commit 4e1c631ec85a8b05ec2a7c0d1805c47ba4f2138d
Author: modeco80 <lily.modeco80@protonmail.ch>
Date:   Wed Mar 5 09:52:00 2008 -0500

    RDK 1.1

diff --git a/Building and Running Singularity RDK 1.1.pdf b/Building and Running Singularity RDK 1.1.pdf
new file mode 100644
index 0000000..a25dc83
Binary files /dev/null and b/Building and Running Singularity RDK 1.1.pdf differ
diff --git a/Singularity RDK 1.1 License.pdf b/Singularity RDK 1.1 License.pdf
new file mode 100644
index 0000000..b452acc
Binary files /dev/null and b/Singularity RDK 1.1 License.pdf differ
diff --git a/base/Applications/AppendFormat/AppendFormat.csproj b/base/Applications/AppendFormat/AppendFormat.csproj
new file mode 100644
index 0000000..284eb64
--- /dev/null
+++ b/base/Applications/AppendFormat/AppendFormat.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>AppendFormat</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="AppendFormat.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/AppendFormat/AppendFormat.sg b/base/Applications/AppendFormat/AppendFormat.sg
new file mode 100644
index 0000000..a882247
--- /dev/null
+++ b/base/Applications/AppendFormat/AppendFormat.sg
@@ -0,0 +1,59 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory( DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return AppendFormat.AppMain(this);
+        }
+    }
+
+    public class AppendFormat 
+    { 
+        public static string ToLegibleString(byte[]! b) 
+        {
+            StringBuilder legible = new StringBuilder();
+            for (int i = 0; i < b.Length; i++) {
+                legible.AppendFormat("{0:x2}", b[i]);
+            }
+            return legible.ToString();
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            byte [] key = new byte[2]; 
+            string s = ToLegibleString(key); 
+            Console.WriteLine("s="+s);         
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Applications.proj b/base/Applications/Applications.proj
new file mode 100644
index 0000000..a9184df
--- /dev/null
+++ b/base/Applications/Applications.proj
@@ -0,0 +1,26 @@
+<!--
+##############################################################################
+
+ Microsoft Research Singularity
+
+ Copyright (c) Microsoft Corporation.  All rights reserved.
+
+ File:   Applications\Applications.proj
+
+ Note:   This file is a convenience project for building all projects under
+         Applications.  This file is not involved in building "distro" projects.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="Runtime\AppRuntime.proj"/>
+    <ProjectReference Include="*\*.proj;*\*.csproj" Exclude="Runtime\*;Pong\Pong.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/Benchmarks/BartokH/Child/BartokHChild.csproj b/base/Applications/Benchmarks/BartokH/Child/BartokHChild.csproj
new file mode 100644
index 0000000..9cc4fa8
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/Child/BartokHChild.csproj
@@ -0,0 +1,43 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>bartokp</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Child.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="..\MSIL\Bartok.Analysis.dll"/>
+    <Reference Include="..\MSIL\Bartok.CfgUtil.dll" />
+    <Reference Include="..\MSIL\Bartok.Convert.dll" />
+    <Reference Include="..\MSIL\Bartok.Datatype.dll" />
+    <Reference Include="..\MSIL\Bartok.DebugInfo.dll" />
+    <Reference Include="..\MSIL\Bartok.Ir.dll" />
+    <Reference Include="..\MSIL\Bartok.Lir.dll" />
+    <Reference Include="..\MSIL\Bartok.Mangle.dll" />
+    <Reference Include="..\MSIL\Bartok.Marshal.dll" />
+    <Reference Include="..\MSIL\Bartok.Opt.dll" />
+    <Reference Include="..\MSIL\Bartok.Regalloc.dll" />
+    <Reference Include="..\MSIL\Bartok.Regreal.dll" />
+    <Reference Include="..\MSIL\Bartok.Utility.dll" />
+    <Reference Include="..\MSIL\Bartok.Cheap.dll" />
+    <Reference Include="..\MSIL\Bartok.Msil.dll" />
+
+    <ProjectReference Include="..\Contracts\BartokHContracts.csproj"/>
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/BartokH/Child/Child.sg b/base/Applications/Benchmarks/BartokH/Child/Child.sg
new file mode 100644
index 0000000..d8c4f15
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/Child/Child.sg
@@ -0,0 +1,397 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BartokP.sg
+//
+//  Note:   Compiler Phase
+//
+
+//#define NONONNULLTYPECHECK  // required on Singularity, no affect on other Windows.
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Endpoint;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+
+using Bartok.Contracts;
+using Bartok.Analysis.Lir;
+using Bartok.Convert;
+using Bartok.Datatype;
+using Bartok.CfgUtil;
+using Bartok.Lir;
+using Bartok.Opt.Lir;
+using Bartok.Utility;
+using Bartok.DebugInfo;
+using Bartok.Regalloc;
+using Bartok.Marshal;
+
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Bartok.Child
+{
+    [Category("WebApp")]
+    internal class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ExtensionContract.Exp:Start> sendRef;
+
+        [BoolParameter("where", Default=false,
+                       HelpMessage="Show what space we are running in")]
+        internal bool doWhere;
+
+        reflective private Parameters();
+
+        internal int AppMain() {
+            return BartokP.AppMain(this);
+        }
+    }
+
+    public class BartokP
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            //            DebugStub.WriteLine("Child::GC Verify enabled");
+            //            AppRuntime.EnableGCVerify = true;
+            //AppRuntime.EnableGCAccounting = true;
+            //DebugStub.WriteLine("Child: Enabled GC Accounting");
+            //DebugStub.WriteLine("Child: Began execution!");
+
+            if (config.doWhere) {
+                DebugStub.WriteLine("BartokP running!");
+            }
+
+            ExtensionContract.Exp ep = config.sendRef.Acquire();
+
+            CompilerPhaseContract.Exp cp = ep as CompilerPhaseContract.Exp;
+
+            if (cp != null) {
+                DoPhase(cp);
+                delete cp;
+                return 0;
+            }
+
+            // Wrong contract type!
+            delete ep;
+            return 1;
+        }
+
+        private static void ReadOpen(CheapState! cs, byte[]! in ExHeap bytes)
+        {
+            uint regionSize;
+            uint region;
+            regionSize = (uint)bytes.Length;
+            unsafe {
+                fixed (byte *pdst = &bytes[0]) {
+                    region = (uint)pdst;
+                    cs.ReadOpen(region, regionSize);
+                }
+            }
+        }
+
+        private static void ReadClose(CheapState! cs)
+        {
+#if false
+            if (cs.oig != null) {
+                DebugStub.WriteLine("--- Stub .Read Close {0,8} bytes {1,5} objects",
+                                    __arglist(cs.read, cs.loadCount));
+            }
+#endif
+            cs.ReadClose();
+        }
+
+        private static void WriteOpen(CheapState! cs, byte[]! in ExHeap bytes)
+        {
+            uint regionSize;
+            uint region;
+            regionSize = (uint)bytes.Length;
+            unsafe {
+                fixed (byte *pdst = &bytes[0]) {
+                    region = (uint)pdst;
+                    cs.WriteOpen(region, regionSize);
+                }
+            }
+        }
+
+        private static void WriteClose(CheapState! cs)
+        {
+#if false
+            if (cs.oig != null) {
+                DebugStub.WriteLine("--- Stub .WriteClose {0,8} bytes {1,5} objects",
+                                    __arglist(cs.used, cs.oig.m_currentCount));
+            }
+#endif
+            cs.WriteClose();
+        }
+
+        private static void DoPhase(CompilerPhaseContract.Exp! cp)
+        {
+            GraphColoringReal gcr;
+            CheapState! cs = new CheapState(0, false);
+
+            CheapMarshal.InitTypes();
+
+            // Track statics before they can be replicated in a method call.
+            RegisterX86.TrackAsGlobal(cs);
+            OpCodesX86.TrackAsGlobal(cs);
+
+            cp.SendReadyToInit();
+            bool halt = false;
+#if USE_SWITCH_RECEIVE
+            switch receive
+            {
+                case cp.InitPhaseReq(byte[]! in ExHeap buffer):
+                    RegDesc regs;
+                    CallConv conv;
+                    AbstractTarget target;
+                    GlobalLayoutData globalLayoutData;
+                    int pageSize;
+                    int stackThreshhold;
+                    bool isNoisy;
+                    CSRT runtime;
+                    StageControlProxy controls;
+
+                    beg = Processor.GetCycleCount();
+                    ReadOpen(cs, buffer);
+                    RegDesc.CheapRead(cs, out regs);
+                    CallConv.CheapRead(cs, out conv);
+                    AbstractTarget.CheapRead(cs, out target);
+                    GlobalLayoutData.CheapRead(cs, out globalLayoutData);
+                    cs.Read(out pageSize);
+                    cs.Read(out stackThreshhold);
+                    cs.Read(out isNoisy);
+                    CSRT.CheapRead(cs, out runtime);
+                    StageControlProxy.CheapRead(cs, out controls);
+                    ReadClose(cs);
+
+                    DebugStub.AddToPerfCounter(1, Processor.GetCycleCount() - beg);
+
+                    CSRT.runtime = runtime;
+                    if (controls != null) {
+                        controls.SetValues();
+                    }
+
+                    if (globalLayoutData != null) {
+                        RepInfo.LayoutInfoFactory = globalLayoutData.LayoutInfoFactory;
+                        RepInfo.SetX86Layout();
+                    }
+
+                    target.TrackAsGlobal(cs);
+                    regs.TrackAsGlobal(cs);
+                    conv.TrackAsGlobal(cs);
+                    runtime.TrackAsGlobal(cs);
+                    cs.DumpGlobal("chld");
+
+#if false
+                    DebugStub.WriteLine("-------- GraphColoring::Stub Init -----");
+#endif
+
+                    gcr = new GraphColoringReal(regs,
+                                                conv,
+                                                target,
+                                                globalLayoutData,
+                                                pageSize,
+                                                stackThreshhold,
+                                                isNoisy);
+
+                    beg = Processor.GetCycleCount();
+                    WriteOpen(cs, buffer);
+                    WriteClose(cs);
+                    DebugStub.AddToPerfCounter(2, Processor.GetCycleCount() - beg);
+                    cp.SendInitPhaseRsp(buffer);
+                    break;
+                case cp.ChannelClosed():
+                    Console.WriteLine("Compiler channel closed unexpectedly before init.");
+                    return;
+            }
+#else
+            byte[]! in ExHeap buffer;
+            cp.RecvInitPhaseReq(out buffer);
+
+            RegDesc regs;
+            CallConv conv;
+            AbstractTarget target;
+            GlobalLayoutData globalLayoutData;
+            int pageSize;
+            int stackThreshhold;
+            bool isNoisy;
+            CSRT runtime;
+            StageControlProxy controls;
+
+            ulong beg = Processor.GetCycleCount();
+            ReadOpen(cs, buffer);
+            RegDesc.CheapRead(cs, out regs);
+            CallConv.CheapRead(cs, out conv);
+            AbstractTarget.CheapRead(cs, out target);
+            GlobalLayoutData.CheapRead(cs, out globalLayoutData);
+            cs.Read(out pageSize);
+            cs.Read(out stackThreshhold);
+            cs.Read(out isNoisy);
+            CSRT.CheapRead(cs, out runtime);
+            StageControlProxy.CheapRead(cs, out controls);
+            ReadClose(cs);
+
+            DebugStub.AddToPerfCounter(1, Processor.GetCycleCount() - beg);
+
+            CSRT.runtime = runtime;
+            if (controls != null) {
+                controls.SetValues();
+            }
+
+            if (globalLayoutData != null) {
+                RepInfo.LayoutInfoFactory = globalLayoutData.LayoutInfoFactory;
+                RepInfo.SetX86Layout();
+            }
+
+            //            DebugStub.WriteLine(":: Chld Targ Globals");
+            ((!)target).TrackAsGlobal(cs);
+            //            DebugStub.WriteLine(":: Chld Regs Globals");
+            ((!)regs).TrackAsGlobal(cs);
+            //            DebugStub.WriteLine(":: Chld Conv Globals");
+            ((!)conv).TrackAsGlobal(cs);
+            //            DebugStub.WriteLine(":: Chld CSRT Globals");
+            ((!)runtime).TrackAsGlobal(cs);
+
+            // cs.DumpGlobal("chld");
+
+#if false
+            DebugStub.WriteLine("-------- GraphColoring::Stub Init -----");
+#endif
+
+            gcr = new GraphColoringReal(regs,
+                                        conv,
+                                        target,
+                                        globalLayoutData,
+                                        pageSize,
+                                        stackThreshhold,
+                                        isNoisy);
+
+            beg = Processor.GetCycleCount();
+            WriteOpen(cs, buffer);
+            WriteClose(cs);
+            DebugStub.AddToPerfCounter(2, Processor.GetCycleCount() - beg);
+            cp.SendInitPhaseRsp(buffer);
+#endif
+
+            while (!halt) {
+#if USE_SWITCH_RECEIVE
+                switch receive
+                {
+                    case cp.GetPhaseNameReq():
+                        char[]! in ExHeap name = (!)Bitter.FromString(gcr.PhaseName);
+                        cp.SendGetPhaseNameRsp(name);
+                        break;
+
+                    case cp.ProcessFunctionReq(byte[]! in ExHeap buffer):
+                        FunctionDef f;
+                        ChooseRepResult r;
+
+                        beg = Processor.GetCycleCount();
+                        ReadOpen(cs, buffer);
+                        FunctionDef.CheapRead(cs, out f);
+                        ChooseRepResult.CheapRead(cs, out r);
+                        ReadClose(cs);
+                        DebugStub.AddToPerfCounter(1, Processor.GetCycleCount() - beg);
+
+                        gcr.Go(f, r);
+
+                        beg = Processor.GetCycleCount();
+                        WriteOpen(cs, buffer);
+                        if (f != null) {
+                            OperandArray.CheapWrite(cs, f.actualArgs);
+                            LirBasicBlock.CheapWrite(cs, f.prolog);
+                            LirBasicBlock.CheapWrite(cs, f.epilog);
+                            LirBasicBlock.CheapWrite(cs, f.unwind);
+                            cs.Write(f.omitFramePointer);
+                            cs.Write(f.spillSlotCount);
+                            Operand.CheapWrite(cs, f.stackSlotMap);
+                            SequencedCfg.CheapWrite(cs, f.code);
+                            OperandArray.CheapWrite(cs, f.pinned);
+                            OperandArray.CheapWrite(cs, f.formals);
+                            Operand.CheapWrite(cs, f.ret);
+                        }
+                        WriteClose(cs);
+                        DebugStub.AddToPerfCounter(2, Processor.GetCycleCount() - beg);
+                        cp.SendProcessFunctionRsp(buffer);
+                        break;
+
+                    case cp.TermPhaseReq():
+                        gcr.Term();
+                        cp.SendTermPhaseRsp();
+                        halt = true;
+                        break;
+
+                    case cp.ChannelClosed():
+                        halt = true;
+                        Console.WriteLine("Compiler channel closed unexpectedly.");
+                        break;
+                }
+#else
+                int which;
+
+                cp.RecvRequest(out which, out buffer);
+                if (which == (int)RequestKind.ProcessFunction) {
+                    FunctionDef f;
+                    ChooseRepResult r;
+
+                    beg = Processor.GetCycleCount();
+                    ReadOpen(cs, buffer);
+                    FunctionDef.CheapRead(cs, out f);
+                    ChooseRepResult.CheapRead(cs, out r);
+                    ReadClose(cs);
+                    DebugStub.AddToPerfCounter(1, Processor.GetCycleCount() - beg);
+
+#if DEBUG_FUNCTION_CALLS
+                    DebugStub.WriteLine();
+                    DebugStub.WriteLine("*** {0} ***", __arglist(((!)f).name.ToString()));
+#endif
+                    gcr.Go(f, r);
+
+                    beg = Processor.GetCycleCount();
+                    WriteOpen(cs, buffer);
+                    if (f != null) {
+                        OperandArray.CheapWrite(cs, f.actualArgs);
+                        LirBasicBlock.CheapWrite(cs, f.prolog);
+                        LirBasicBlock.CheapWrite(cs, f.epilog);
+                        LirBasicBlock.CheapWrite(cs, f.unwind);
+                        cs.Write(f.omitFramePointer);
+                        cs.Write(f.spillSlotCount);
+                        Operand.CheapWrite(cs, f.stackSlotMap);
+                        SequencedCfg.CheapWrite(cs, f.code);
+                        OperandArray.CheapWrite(cs, f.pinned);
+                        OperandArray.CheapWrite(cs, f.formals);
+                        Operand.CheapWrite(cs, f.ret);
+                    }
+                    WriteClose(cs);
+                    DebugStub.AddToPerfCounter(2, Processor.GetCycleCount() - beg);
+#if DEBUG_FUNCTION_CALLS
+                    DebugStub.WriteLine("--- {0} ---", __arglist(((!)f).name.ToString()));
+                    DebugStub.WriteLine();
+#endif
+                }
+                else if (which == (int)RequestKind.Terminate) {
+                    gcr.Term();
+                    halt = true;
+                }
+                else {
+                    DebugStub.WriteLine("Unknown request: {0}", __arglist(which));
+                }
+                cp.SendResponse(buffer);
+#endif
+            }
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/BartokH/Contracts/BartokHContracts.csproj b/base/Applications/Benchmarks/BartokH/Contracts/BartokHContracts.csproj
new file mode 100644
index 0000000..6f7a166
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/Contracts/BartokHContracts.csproj
@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Bartok.Contracts</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CompilerPhaseContract.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/BartokH/Contracts/CompilerPhaseContract.sg b/base/Applications/Benchmarks/BartokH/Contracts/CompilerPhaseContract.sg
new file mode 100644
index 0000000..4284674
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/Contracts/CompilerPhaseContract.sg
@@ -0,0 +1,69 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CompilerPhaseContract.sg
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Endpoint;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Extending;
+
+namespace Bartok.Contracts
+{
+    public enum RequestKind {
+        GetPhaseName    = 1,
+        ProcessFunction = 2,
+        Terminate   = 3,
+    };
+
+    public contract CompilerPhaseContract : ExtensionContract
+    {
+        in  message InitPhaseReq(byte[]! in ExHeap buffer);
+        out message InitPhaseRsp(byte[]! in ExHeap buffer);
+
+#if USE_SWITCH_RECEIVE
+        in  message GetPhaseNameReq();
+        out message GetPhaseNameRsp(char[]! in ExHeap name);
+
+        in  message ProcessFunctionReq(byte[]! in ExHeap buffer);
+        out message ProcessFunctionRsp(byte[]! in ExHeap buffer);
+
+        in  message TermPhaseReq();
+        out message TermPhaseRsp();
+#else
+        in  message Request(int which, byte[]! in ExHeap buffer);
+        out message Response(byte[]! in ExHeap buffer);
+#endif
+
+        out message ReadyToInit();
+
+        override state Start : one {
+            ReadyToInit! -> PreInit;
+        }
+
+        state PreInit : one {
+            InitPhaseReq? -> InitPhaseRsp! -> Running;
+        }
+
+        state Running : one {
+#if USE_SWITCH_RECEIVE
+            GetPhaseNameReq? -> GetPhaseNameRsp! -> Running;
+            ProcessFunctionReq? -> ProcessFunctionRsp! -> Running;
+            TermPhaseReq? -> TermPhaseRsp! -> End;
+#else
+            Request? -> Response! -> Running;
+#endif
+        }
+
+        state End: ;
+    }
+}
diff --git a/base/Applications/Benchmarks/BartokH/host/Bartok.cs b/base/Applications/Benchmarks/BartokH/host/Bartok.cs
new file mode 100644
index 0000000..52dc058
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/host/Bartok.cs
@@ -0,0 +1,1559 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define NONONNULLTYPECHECK  // required on Singularity, no affect on other Windows.
+
+namespace Bartok {
+
+  using System;
+  using System.IO;
+  using System.Text;
+  using System.Collections;
+  using Bartok.Utility;
+  using Bartok.Datatype;
+  using Bartok.CfgUtil;
+  using Bartok.Ir;
+  using Bartok.Lir;
+  using Bartok.Analysis;
+  using Bartok.Opt.IrCleanup;
+  using Bartok.Opt.Ir;
+  using Bartok.Opt.Lir;
+  using Bartok.Opt;
+  using Bartok.Regalloc;
+  using Bartok.Opt.Ssa;
+  using Bartok.Backend;
+
+#if ON_SINGULARITY
+  using Microsoft.Singularity;
+#endif
+
+  //
+  // Bartok.cs
+  //
+  // Main entry point for compiler
+
+  // "public class Bartok {..}" breaks the namespace lookup of Bartok.*
+  // Is this a bug?
+  public class BartokClass {
+
+      public static long CHECK_COUNT = 0;
+      public static long CHECK_COUNT_LOWER = 0;
+
+      public static int Main(String[] args) {
+#if ON_SINGULARITY
+          // AppRuntime.EnableGCVerify = false;
+          // DebugStub.WriteLine("Bartok Host: Enabled GC Verifier");
+          // AppRuntime.EnableGCAccounting = true;
+          // DebugStub.WriteLine("Bartok Host: Enabled GC Accounting");
+#endif
+          Bartok.MSIL.MetaDataUtil.Configure(new MetaDataOutput());
+
+          try {
+              ProcessCmdLine(args);
+              if((fileNames.Count == 0) && (linkNames.Count == 0)) {
+                  CHECK_COUNT++;
+                  CHECK_COUNT_LOWER++;
+
+                  PrintUsage();
+                  Util.Error("\nno files to process...aborting.");
+                  Util.Exit(-11);
+              }
+
+              if(StageControl.AtomicSupport) {
+                  StageControl.TryAllSupport = true;
+              }
+
+              Util.Message(NoiseLevel.PerPhase,
+                           "fileNames = "
+                           + new CollectionFormatter(fileNames));
+              Util.Message(NoiseLevel.PerPhase,
+                           "refFileNames = "
+                           + new CollectionFormatter(refFileNames));
+              Util.Message(NoiseLevel.PerPhase,
+                           "libDirNames = "
+                           + new CollectionFormatter(libDirNames));
+              Util.Message(NoiseLevel.PerPhase,
+                           "outputDirName = " + outputDirName);
+
+              if (overrideNames.Count > 0) {
+                  Util.Message(NoiseLevel.PerPhase,
+                               "overrideNames = "
+                               + new CollectionFormatter(overrideNames));
+              }
+              if (entryPoints.Count > 0) {
+                  Util.Message(NoiseLevel.PerPhase,
+                               "entryPoints = "
+                               + new CollectionFormatter(entryPoints));
+              }
+
+              // Create helper data structures
+              DateTime startTime = Util.startTime;
+              bool fLoadDebugInfo = StageControl.SymbolicDebug;
+              StageControl.BartokLinkPhase = false;
+              if (StageControl.CompileOnly) {
+                  // separate compilation
+                  foreach (String fileName in fileNames) {
+                      String outputName =
+                          ComputeOutputName(fileName, outputDirName);
+                      ArrayList loadFileNames = new ArrayList(1);
+                      loadFileNames.Add(fileName);
+                      String shortName = GetShortName(fileName).ToLower();
+
+                      // we need to compile mscorlib.dll together with
+                      // system.dll
+                      bool fDefineOverride = shortName.Equals("mscorlib.dll");
+
+                      TypeData typeData = new TypeData();
+                      CompileFile(typeData, loadFileNames, refFileNames,
+                                  overrideNames, overrideDefNames,
+                                  fDefineOverride, outputName,
+                                  startTime, fLoadDebugInfo);
+                  }
+              } else {
+                  // Create output root name.
+                  if (outputRootName == null) {
+                      outputRootName = (String) fileNames[0];
+                  }
+
+                  // strip off extension, if there is one.
+                  int dotIndex = outputRootName.LastIndexOf('.');
+                  if (dotIndex != -1) {
+                      String ext = outputRootName.Substring(dotIndex + 1);
+                      if (ext.Equals("dll") || ext.Equals("obj")
+                          || ext.Equals("exe")) {
+                          outputRootName =
+                              outputRootName.Substring(0, dotIndex);
+                      }
+                  }
+
+                  bool fDefineOverride = StageControl.WholeProgram;
+                  TypeData typeData = new TypeData();
+                  String objFileName =
+                      CompileFile(typeData, fileNames, refFileNames,
+                                  overrideNames, overrideDefNames, fDefineOverride,
+                                  outputRootName, startTime, fLoadDebugInfo);
+                  linkNames.Add(objFileName);
+
+#if DO_LINK
+                  StageControl.BartokLinkPhase = true;
+                  BartokLinker bartokLinker = new BartokLinker();
+                  typeData = StageControl.WholeProgram ? typeData : null;
+                  bartokLinker.Link(typeData, fileNames, linkNames,
+                                    refFileNames, overrideNames, overrideDefNames,
+                                    libDirNames,
+                                    entryPoints, initializerSkips,
+                                    outputRootName);
+#endif
+              }
+          } catch(AbortException) {
+              // Abort code already dumped the stack
+              Util.Exit(-1);
+          } catch(Exception e) {
+              Util.Error("Internal uncaught {0} exception", e);
+              Util.Exit(-1);
+          }
+          Util.Message(NoiseLevel.PerPhase,
+                       "STATIC COUNT IS: " + CHECK_COUNT);
+          Util.Message(NoiseLevel.PerPhase,
+                       "STATIC LOWER IS: " + CHECK_COUNT_LOWER);
+          return 0;
+      }
+
+      private static String CompileFile(TypeData typeData,
+                                        ArrayList fileNames,
+                                        ArrayList refFileNames,
+                                        ArrayList overrideNames,
+                                        ArrayList overrideDefNames,
+                                        bool fDefineOverride,
+                                        String outputName,
+                                        DateTime startTime,
+                                        bool fLoadDebugInfo) {
+          ConvertMsil2Ir(fileNames, refFileNames, overrideNames,
+                         overrideDefNames, fDefineOverride, startTime,
+                         fLoadDebugInfo, typeData);
+
+          CHECK_COUNT++;
+          CHECK_COUNT_LOWER++;
+
+
+#if SELF_PROFILING
+          System.GC.Collect();
+          long memoryUsage = System.GC.GetTotalMemory(false);
+          Util.Message("memory usage: " + memoryUsage);
+#endif
+
+          if (entryPoints.Count > 0) {
+              Util.Message(NoiseLevel.PerPhase,
+                           "entryPoints = "
+                           + new CollectionFormatter(entryPoints));
+          }
+          if(!StageControl.CompileOnly && (entryPoints.Count == 0)) {
+              Util.Abort("No entry points found");
+          }
+
+          typeData.ComputeEntryMethod(entryPoints);
+          Util.Assert(typeData.EntryPoints.Count == entryPoints.Count);
+
+          // register all global analysis
+          AnalysisRegistry analysisRegistry = RegisterAnalysis(typeData);
+
+          // Create a series of phases that are each applied to the
+          // whole program.
+          Bartok.Ir.PhaseList phases = new Bartok.Ir.PhaseList("ir");
+
+          CHECK_COUNT--;
+          CHECK_COUNT_LOWER--;
+
+          AddPhases(phases, analysisRegistry, outputName, typeData);
+
+          Util.Message(phases.ComponentPhases.ToString());
+          if (StageControl.DumpContainers) {
+              phases.Add(new TypeDataPrettyPhase("After IR:"));
+          }
+          Bartok.Opt.IrCleanup.Statistics.Reset(typeData);
+          BartokList phaseNames = phases.ComponentPhases;
+          foreach(Object phaseObj in phaseNames) {
+              if(!(phaseObj is string)) {
+                  Util.Warn("Not string: {0}X",
+                            phaseObj.ToString());
+                  continue;
+              }
+              string phaseName = (string)phaseObj;
+              if(phaseName.IndexOf(' ') != -1) {
+                  Util.Warn("Phase has a space in name: {0}", phaseName);
+              }
+          }
+          foreach(string phaseName in StageControl.disabledPhaseNames) {
+              if(phaseNames.Contains(phaseName)) {
+                  continue;
+              }
+              if(StageControl.disabledPhaseNamesFound.Contains(phaseName)) {
+                  continue;
+              }
+              Util.Abort("Couldn't find phase: " + phaseName);
+          }
+          phases.Go(typeData);
+
+          Bartok.Opt.IrCleanup.Statistics.Summary();
+
+#if SELF_PROFILING
+          memoryUsage = System.GC.GetTotalMemory(false);
+          Util.Message("memory usage: " + memoryUsage);
+#endif
+
+          // backend phases:
+          Util.Message("outputRootName = " + outputName);
+
+          String objFileName = LirPhases.run(typeData, fileNames, outputName,
+                                             StageControl.GenObjFile);
+          System.GC.Collect();
+          Util.Message("End of Bartok: " + GC.GetTotalMemory(false));
+          return objFileName;
+      }
+
+      private static void ConvertMsil2Ir(ArrayList fileNames,
+                                         ArrayList refFileNames,
+                                         ArrayList overrideNames,
+                                         ArrayList overrideDefNames,
+                                         bool fDefineOverride,
+                                         DateTime startTime,
+                                         bool fLoadDebugInfo,
+                                         TypeData typeData) {
+          // Remove redundant fileNames
+          // Remove refFileNames that are redundant with fileNames
+          for(int i=0; i<fileNames.Count; ++i) {
+#if ON_SINGULARITY
+              String fileI = ((String)fileNames[i]).ToLower();
+#else
+              String fileI = Path.GetFullPath((String) fileNames[i]).ToLower();
+#endif
+              for(int j=i+1; j<fileNames.Count; ++j) {
+#if ON_SINGULARITY
+                  String fileJ =((String) fileNames[j]).ToLower();
+#else
+                  String fileJ =
+                      Path.GetFullPath((String) fileNames[j]).ToLower();
+#endif
+                  if(fileI == fileJ) {
+                      Util.Warn("Removing redundant input {0} from command line",
+                                fileNames[j]);
+                      fileNames.RemoveAt(j);
+                  }
+              }
+
+              for(int j=0; j<refFileNames.Count; ++j) {
+                  String fileJ = MSIL.MetaDataResolver.ResolveFileName
+                      (libDirNames, (String) refFileNames[j]);
+                  if(fileJ == null) {
+                      // Future failure in MetaDataResolver will have a better
+                      // error message so move on.
+                      continue;
+                  }
+                  fileJ = fileJ.ToLower();
+
+                  if(fileI == fileJ) {
+                      Util.Warn("Removing redundant reference {0} (with a code input) from command line",
+                                refFileNames[j]);
+                      refFileNames.RemoveAt(j);
+                  }
+              }
+
+          }
+
+          // Remove redundant refFileNames (may be redundant with fileNames
+          // or other refFileNames)
+          for(int i=0; i<refFileNames.Count; ++i) {
+              String fileI = MSIL.MetaDataResolver.ResolveFileName
+                  (libDirNames, (String) refFileNames[i]);
+              if(fileI == null) {
+                  // Future failure in MetaDataResolver will have a better
+                  // error message so move on.
+                  continue;
+              }
+              fileI = fileI.ToLower();
+
+              for(int j=i+1; j<refFileNames.Count; ++j) {
+                  String fileJ = MSIL.MetaDataResolver.ResolveFileName
+                      (libDirNames, (String) refFileNames[j]);
+                  if(fileJ == null) {
+                      // Future failure in MetaDataResolver will have a better
+                      // error message so move on.
+                      continue;
+                  }
+                  fileJ = fileJ.ToLower();
+
+                  if(fileI == fileJ) {
+                      Util.Warn("Removing redundant reference {0} from command line",
+                                refFileNames[j]);
+                      refFileNames.RemoveAt(j);
+                  }
+              }
+          }
+
+          bool fTranslateTryAll = StageControl.TryAllSupport;
+          bool fTranslateAtomic = StageControl.AtomicSupport;
+          bool fMsilMessages = Verbosity.level >= NoiseLevel.PerPhase;
+
+          Bartok.MSIL.MetaDataResolver libResolver =
+              new Bartok.MSIL.MetaDataResolver(refFileNames, libDirNames,
+                                               startTime, fLoadDebugInfo,
+                                               fMsilMessages);
+          Bartok.MSIL.MetaDataResolver overrideResolver;
+          if (fDefineOverride) {
+              // load code
+              overrideResolver =
+                  new Bartok.MSIL.MetaDataResolver(overrideNames,
+                                                   startTime,
+                                                   fLoadDebugInfo,
+                                                   fTranslateTryAll,
+                                                   fTranslateAtomic,
+                                                   fMsilMessages);
+          } else {
+              // don't load code
+              overrideResolver =
+                  new Bartok.MSIL.MetaDataResolver(overrideNames,
+                                                   libDirNames,
+                                                   startTime, fLoadDebugInfo,
+                                                   fMsilMessages);
+          }
+          Bartok.MSIL.MetaDataResolver overrideDefResolver =
+              new Bartok.MSIL.MetaDataResolver(overrideDefNames, startTime,
+                                               fLoadDebugInfo,
+                                               fTranslateTryAll,
+                                               fTranslateAtomic,
+                                               fMsilMessages);
+          Bartok.MSIL.MetaDataResolver loadResolver =
+              new Bartok.MSIL.MetaDataResolver(fileNames, startTime,
+                                               fLoadDebugInfo,
+                                               fTranslateTryAll,
+                                               fTranslateAtomic,
+                                               fMsilMessages);
+          Bartok.MSIL.MetaDataResolver[] resolvers =
+              new Bartok.MSIL.MetaDataResolver[] {
+                  libResolver, overrideResolver, overrideDefResolver,
+                  loadResolver
+              };
+          Bartok.MSIL.MetaDataResolver.ResolveCustomAttributes(resolvers);
+          MetaDataParser parser =
+              new MetaDataParser(entryPoints.Count == 0 ? entryPoints : null);
+          Util.TimestampMessage(NoiseLevel.PerPhase,
+                                "translating from MSIL");
+          parser.Parse(loadResolver, overrideResolver,
+                       overrideDefResolver, libResolver,
+                       typeData, fDefineOverride, false);
+
+          Util.TimestampMessage(NoiseLevel.PerPhase,
+                                "finished translating");
+      }
+
+      private static AnalysisRegistry RegisterAnalysis(TypeData typeData) {
+          AnalysisRegistry analysisRegistry = new AnalysisRegistry(typeData);
+          analysisRegistry.RegisterAnalysis(VirtualCallAnalysis.makeFactory());
+          return analysisRegistry;
+      }
+
+      private static void AddPhases(Bartok.Ir.PhaseList phases,
+                                    AnalysisRegistry analysisRegistry,
+                                    String outputName,
+                                    TypeData typeData) {
+          if (StageControl.PrintContainers) {
+              phases.Add(new TypeDataPrintPhase("After parse:"));
+          }
+          if (StageControl.DumpContainers) {
+              phases.Add(new TypeDataPrettyPhase("After parse:"));
+          }
+          if (StageControl.SingSharpTemplateRemover) {
+              phases.Add(new SingSharpTemplateRemover());
+          }
+          if (StageControl.RuntimeMods) {
+              phases.Add(new RuntimeMods());
+          }
+          if (StageControl.IrMultiPropSimple) {
+              phases.Add(new IrMultiPropSimple("System.GC"));
+          }
+          if (StageControl.IrDeadAssignmentSimple1) {
+              phases.Add(new IrDeadAssignmentSimplePhase("System.GC"));
+          }
+          if (StageControl.IrTreeShake) {
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          /*
+          phases.Add
+              (new DynamicCount
+                  ("VirtualCallsStart",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CallVirtual,
+                        Operator.OpCodes.InterfaceCall),
+                   DynamicCount.Granularity.PerSite));
+          */
+
+          /*
+          phases.Add
+              (new DynamicCount
+                  ("ASCstart",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CheckArrayStore,
+                        Operator.OpCodes.CheckVectorStore),
+                   DynamicCount.Granularity.PerSite));
+          */
+
+          if (StageControl.PtrAnalysis) {
+              phases.Add(PtrTypeSimpleSystem.CreateAnalysis());
+              phases.Add(PtrTypeHierarchySystem.CreateAnalysis());
+              phases.Add(PtrTypeSetSystem.CreateAnalysis());
+          }
+
+          // create wrapper that insert calls to leaveGCSafeState and
+          // enterGCSafeState.
+          phases.Add(new CreateEntryPointWrapper());
+
+          // trap ValueType.Equals and override it by compiler generated
+          // routines.
+          if (StageControl.IrOverrideValueTypeEquals) {
+              phases.Add(new Convert.ValueTypeEquals());
+          }
+
+          if (StageControl.LimitedReflection) {
+              phases.Add(new Convert.OverrideVTableInit());
+          }
+
+          if (StageControl.IrConvertSizeofPrimitive) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.SizeofPrimitive;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          /* SPOONS: region related phases:
+          // A temporary pass that cleans up the scratch objects so that the
+          // DemandAnalysis is not confused by the randomness that the tree
+          // shaker leaves behind.
+          phases.Add(new CleanScratch());
+
+          // Build a "Foo_layout" for each class "Foo"; other setup required
+          // by DemandAnalysis.
+          phases.Add(new LayoutBuilder());
+
+          // Perform first- and last-use analysis; add explicit region
+          // variables and effects.
+          phases.Add(new DemandAnalysis());
+
+          // Print the code
+          phases.Add(new TypeDataPrettyPhase("After Demand:"));
+          */
+
+          // Perform first- and last-use analysis; add explicit region
+          // variables and effects.
+
+          // must happen after DemandAnalysis, but before any inlining /
+          // rearranging basic blocks or calls.
+#if !VC
+          if(StageControl.TryAllSupport) {
+              phases.Add(new Bartok.Convert.PropagateLogging(analysisRegistry));
+              phases.Add(new TypeDataDummyPhase());
+          }
+#endif
+
+          if (StageControl.IrScanCallEffects) {
+              phases.Add(new IrScanCallEffects());
+          }
+
+          if(StageControl.DumpInheritance) {
+              phases.Add(new DumpInheritancePhase(StageControl.DumpInheritanceFile));
+          }
+
+#if PHX_TODO
+          phases.Add(new TypeDataToPhoenix());
+#endif
+          phases.Add(new TypeInit(initializerSkips));
+
+          if (StageControl.InstrumentCalls) {
+              phases.Add(new InstrumentCalls());
+          }
+
+          if (StageControl.IrStoreChecks) {
+              phases.Add(new IrStoreCheckElim());
+          }
+          if (StageControl.BuildC2Mods
+              && StageControl.UnmanagedStrings) {
+              phases.Add(new IrUnmanagedStrings());
+          }
+          phases.Add(IrCleanup.Create());
+          if (StageControl.BuildC2Mods
+              && StageControl.IdentifyAsMethods) {
+              phases.Add(new IrIdentifyAsMethods());
+          }
+
+          if (StageControl.WholeProgram
+              && StageControl.IrDeadAssignmentSimpleFormals
+              && StageControl.IrTreeShake) {
+              phases.Add(new IrDeadAssignmentSimpleFormalsPhase());
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          phases.Add(new Convert.IrInsertDelegate());
+
+          IrFieldAnalysis fieldAnalysis = null;
+          if (StageControl.GCType ==
+              StageControl.ReferenceCountingCollector &&
+              StageControl.RCCollectorOptRCSubsumed &&
+              StageControl.RCCollectorOptRCSubsumedByROFields) {
+              IrFieldAnalysis.FieldFilter filter =
+                  new IrFieldAnalysis.RCAproposFieldFilter();
+              fieldAnalysis = new IrFieldAnalysis(true, filter);
+              phases.Add(fieldAnalysis);
+          }
+
+          if(StageControl.IrInlineConstructor) {
+              phases.Add(new Convert.ToMir(Convert.ToMir.Mask.Constructor));
+          }
+          // When only one class implements an interface, replace the interface
+          // with the class.
+          if (StageControl.IrInterfaceElim && StageControl.WholeProgram) {
+              phases.Add(new InterfaceElim());
+          }
+
+          if (StageControl.IrSimpleInliner) {
+              phases.Add(new IrSimpleInliner(new IrInline(), false, false, false));
+          } else if (StageControl.IrAttributeInliner) {
+              // inline methods that has [inline] attributes.
+              phases.Add(new IrSimpleInliner(new IrInline(), false, false));
+          }
+
+          if (StageControl.FailAfterInliner) {
+              phases.Add(new FailPhase());
+          }
+
+          if (StageControl.IrMultiPropSimple) {
+              phases.Add(new IrMultiPropSimple());
+          }
+          if (StageControl.IrSuppressExnEdges) {
+              phases.Add(new IrSuppressExnEdges());
+          }
+          if (StageControl.IrLoadStoreOpt) {
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+          }
+          if (StageControl.DevirtualizeCall) {
+              phases.Add(new IrDevirtualizeCall(analysisRegistry));
+          }
+
+          if (StageControl.IrSimpleInliner &&
+              StageControl.IrInlinerDoIncreaseSize) {
+              phases.Add(new IrSimpleInliner(new IrInline(), true, false, false));
+          }
+
+          if (StageControl.LazyTypeInits) {
+              phases.Add(new TypeInit(initializerSkips, true));
+          }
+
+          // Eliminate unnecessary instanceOf/check casts.   Only makes
+          // 2 passes by punting back edges.
+          if (StageControl.IrTypeTestElimPunt) {
+              phases.Add(new TypeTestElimPunt());
+          }
+
+          // Eliminate unnecessary instanceOf/check casts - full iterative
+          // analysis.   More expensive than the above analysis, but yields
+          // little improvement in practice.
+          if (StageControl.IrTypeTestElim) {
+              phases.Add(new TypeTestElim());
+          }
+
+          // Deletes all CheckCasts and instanceOf IDisposable for sake of
+          // experimentation.  Normally not enabled, as it is unsafe.
+
+          if (StageControl.IrDeleteCheckCasts) {
+              phases.Add(new DeleteCheckCast());
+          }
+
+          if (StageControl.IrConvertOpt) {
+              phases.Add(new IrConvertOpt());
+              phases.Add(new IrDeadAssignmentSimplePhase());
+              phases.Add(new IrReverseCopyProp());
+          }
+
+          // Just do thread analysis once.
+          IrLockedFields locks = null;
+          if (StageControl.ExtendThreadFieldsABCD ||
+              StageControl.SsaNullCheckGlobalThreaded) {
+
+              if (StageControl.IrTreeShake) {
+                  phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                             dynamicLoads,
+                                             StageControl.WholeProgram,
+                                             analysisRegistry));
+              }
+
+              if(StageControl.OptimisticLocking) {
+                  locks = new ClassIrLockedFields(analysisRegistry);
+              } else {
+                  locks = new IrLockedFields(analysisRegistry);
+              }
+              phases.Add(locks);
+          }
+
+          // Array bounds check elimination
+          if (StageControl.ABCD) {
+              phases.Add(new ABCD(analysisRegistry, locks));
+          }
+
+          if (StageControl.IrConvertArrayBounds) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.CheckVectorBounds;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrConvertInferface) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.InterfaceCall;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrConvertSimpleArrayAccess) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.SimpleArrayAccess;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrCloneLoopHeader) {
+              phases.Add(new IrCloneLoopHeader());
+              phases.Add(new IrJumpElim());
+              phases.Add(new IrMultiPropSimple());
+          }
+
+          if (StageControl.SsaOpts) {
+              if (StageControl.SsaNullCheckGlobalThreaded) {
+                  phases.Add(SSAPhase.Create(analysisRegistry, locks));
+              } else {
+                  phases.Add(SSAPhase.Create());
+              }
+          }
+
+          if(locks != null) {
+              locks = null;
+          }
+
+          // IrInsertStructCopy phase insert a StructCopy() method
+          // to each struct type, and lower struct Id operators
+          // to a call to StructCopy() method.
+          phases.Add(new Convert.IrInsertStructCopy());
+
+#if !VC
+          if(StageControl.TryAllSupport) {
+              phases.Add(new IrInsertLogging());
+          }
+
+          if(StageControl.TryAllSupport &&
+             StageControl.AtomicSupportUpdateEnlistOptFlow) {
+              // without the IrLoadStoreOpt here, EnlistIndirects
+              // generated by [Store]StructFields can't be moved.
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+              phases.Add(new IrInsertUpdateEnlistments());
+              // otherwise CSE misses things that it should be eliminating
+              phases.Add(new IrMultiPropSimple());
+          }
+
+          if (StageControl.TryAllSupport &&
+              StageControl.IrKeepManager) {
+              phases.Add(new IrKeepManager(analysisRegistry));
+          }
+#endif
+
+          if(StageControl.IrStructVectorOperations) {
+              phases.Add(new IrStruct(true));
+          }
+
+          if (StageControl.IrLoadStoreOpt) {
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+          }
+
+#if !VC
+          if (StageControl.TryAllSupport &&
+              StageControl.AtomicSupportUpdateEnlistOpt) {
+              phases.Add(new IrSimpleAvoidUpgrade());
+          }
+#endif
+
+          if (StageControl.IrConvertComplexArrayAccess) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.ComplexArrayAccess;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrConvertExpandedArrayAccess) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.ExpandedArrayAccess;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.ArraySupportOptimizePass && StageControl.SsaOpts) {
+              phases.Add(SSAPhase.Create());
+          }
+
+#if !VC
+          if (StageControl.TryAllSupport &&
+              StageControl.TryAllSupportOptimizePass &&
+              StageControl.SsaOpts) {
+              phases.Add(SSAPhase.Create());
+          }
+#endif
+
+          if (StageControl.IrInitStaticField) {
+              phases.Add(new IrInitStaticField());
+          }
+
+          if (StageControl.LazyTypeInits
+              && StageControl.TypeInitRemoveEmptyCctors) {
+              phases.Add(new TypeInit(initializerSkips, true));
+          }
+
+          if (StageControl.GCType ==
+              StageControl.ReferenceCountingCollector) {
+              phases.Add(new IrStructRCUpdate());
+          }
+
+          if (StageControl.GCType ==
+              StageControl.DeferredReferenceCountingCollector) {
+              phases.Add(new IrStructDRCUpdate());
+          }
+
+          if (StageControl.IrTreeShake && StageControl.IrTreeShakeLate) {
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          if (StageControl.TypedReference) {
+              phases.Add(new Convert.ToMir(Convert.ToMir.Mask.Vararg1));
+
+              // All of vararg1 must finish before vararg2, so we wrap vararg2
+              // in a typedata phase to enforce that.
+              phases.Add(new TypeDataMethodPhase
+                  (new Convert.ToMir(Convert.ToMir.Mask.Vararg2)));
+          }
+
+          /*
+          // We do not know where all of the calls will be because lowering can
+          // introduce calls.  We make a best guess here.  If we moved all
+          // call-generating lowering to HIR (via ToMir or equivalent), then
+          // this could be easily done.  We are currently missing calls for the
+          // following:
+          // - pinvoke, stubs, etc
+          // - some arithmetic conversions
+          // - casts - can't add because not all are calls
+          // - RC, tryall, atomic
+          // - others?
+          phases.Add
+              (new DynamicCount
+                  ("Calls",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.Call,
+                        Operator.OpCodes.CallIndirect,
+                        Operator.OpCodes.CallVirtual,
+                        Operator.OpCodes.InterfaceCall,
+                        Operator.OpCodes.MonitorEnter,
+                        Operator.OpCodes.MonitorExit,
+                        Operator.OpCodes.IndirectToData,
+                        Operator.OpCodes.CustomGetSize,
+                        Operator.OpCodes.CheckVectorStore,
+                        Operator.OpCodes.CheckVectorElementAddress,
+                        Operator.OpCodes.InitVector,
+                        Operator.OpCodes.CheckArrayStore,
+                        Operator.OpCodes.CheckArrayElementAddress,
+                        Operator.OpCodes.InitArray,
+                        Operator.OpCodes.InitType,
+                        Operator.OpCodes.GetITable,
+                        Operator.OpCodes.NewObject,
+                        Operator.OpCodes.NewVector,
+                        Operator.OpCodes.NewArray),
+                   DynamicCount.Granularity.Global));
+          phases.Add(new TypeDataDummyPhase());
+          phases.Add
+              (new DynamicCount
+                  ("VirtualCallsEnd",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CallVirtual,
+                        Operator.OpCodes.InterfaceCall),
+                   DynamicCount.Granularity.PerSite));
+
+          phases.Add
+              (new DynamicCount
+                  ("ASCend",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CheckArrayStore,
+                        Operator.OpCodes.CheckVectorStore),
+                   DynamicCount.Granularity.PerSite));
+          phases.Add(new TypeDataDummyPhase());
+
+          phases.Add
+              (new DynamicCount
+                  ("WB",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.LocWriteBarrier),
+                   DynamicCount.Granularity.Global));
+          phases.Add(new TypeDataDummyPhase());
+          */
+
+          if (StageControl.WholeProgram && StageControl.OptRuntimeData) {
+              phases.Add(new RuntimeData());
+          }
+
+          if (StageControl.IrConvertArrayOpt) {
+              phases.Add(new IrConvertArrayOpt());
+          }
+
+          // insert write barrier after chooserep so we know the size of
+          // of objects. This is needed because we try to remove write
+          // barrier when we store to the young generation, however,
+          // big objects are in the old generation even though it is
+          // newly created. Therefore, we need to know object size to
+          // know if it is a big object.
+          if (StageControl.InsertWriteBarrier) {
+              phases.Add(new IrWriteBarrier());
+              phases.Add(new Convert.ToMir
+                  (Convert.ToMir.Mask.ConvertWriteBarrier));
+          }
+
+          // convert type tests and sizeof effect to Mir
+          Convert.ToMir.Mask typeMask = Convert.ToMir.Mask.CheckCast
+                                        | Convert.ToMir.Mask.Sizeof;
+          if (!(StageControl.GCType ==
+              StageControl.ReferenceCountingCollector ||
+              StageControl.GCType ==
+              StageControl.DeferredReferenceCountingCollector)) {
+              typeMask |= Convert.ToMir.Mask.GetCurrentThread;
+          }
+          if (StageControl.TypedReference) {
+              typeMask |= Convert.ToMir.Mask.TypedRef;
+          }
+          phases.Add(new Convert.ToMir(typeMask));
+
+          if (StageControl.IrSimpleInliner) {
+              phases.Add(new IrSimpleInliner(new IrInline(), false, true,
+                                             true, 0, 0, 0));
+          }
+
+           if(StageControl.TypeInitElim) {
+               phases.Add(new IrTypeInitElim(analysisRegistry));
+           }
+
+          if (StageControl.IrRemoveDoubleCmp) {
+              phases.Add(new IrCmpElim());
+          }
+
+          if (StageControl.IrArrayBaseLength) {
+              phases.Add(new IrArrayBaseLength());
+              phases.Add(new IrDeadAssignmentSimplePhase());
+          }
+
+          if (StageControl.IrInitTypeInliner &&
+              StageControl.LazyTypeInits) {
+              phases.Add(new IrInitTypeInliner(typeData, new IrInline()));
+          }
+
+          if (StageControl.GCType ==
+              StageControl.ReferenceCountingCollector) {
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "Before RC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              phases.Add(new IrRCUpdate());
+
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After RC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+              if (StageControl.RCCollectorOptImmortals) {
+                  phases.Add(new IrImmortalObjectRCUpdates());
+              }
+              if (StageControl.RCCollectorOptRCSubsumed) {
+                  IrSimpleThreadEscape threadLocalObjects = null;
+                  if (StageControl.RCCollectorOptThreadLocalAnalysis) {
+                      IrLockedFields threadSafeFields = null;
+                      if (StageControl.WholeProgram &&
+                          StageControl.
+                          RCCollectorOptRCSubsumedByTSFields) {
+                          threadSafeFields =
+                              new IrLockedFields(analysisRegistry);
+                          phases.Add(threadSafeFields);
+                      }
+                      threadLocalObjects =
+                          new IrSimpleThreadEscape(analysisRegistry,
+                                                   threadSafeFields);
+                      phases.Add(threadLocalObjects);
+                  }
+                  IrRCSubsumedRCUpdates rcSubsumption =
+                      new IrRCSubsumedRCUpdates(analysisRegistry,
+                                                fieldAnalysis,
+                                                threadLocalObjects);
+                  phases.Add(rcSubsumption);
+              }
+              if (StageControl.RCCollectorOptCoalescingUpdates) {
+                  phases.Add(new IrBBLocalCoalesceRCUpdates());
+              }
+              if (StageControl.
+                  RCCollectorOptStaticAcyclicRefTypeUpdates) {
+                  phases.Add(new IrAcyclicRefTypeRCUpdates());
+              }
+              if (StageControl.RCCollectorOptNonNullRCUpdates) {
+                  phases.Add(SSAPhase.NullCheckAnalysis());
+              }
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After RC Optimizations";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.RCUpdate |
+                  Convert.ToMir.Mask.GetCurrentThread;
+              phases.Add(new Convert.ToMir(mask));
+              if (StageControl.RCCollectorOptInlineRCUpdates &&
+                  StageControl.IrSimpleInliner) {
+                  phases.Add(new IrSimpleInliner(new IrInline(),
+                                                 true,
+                                                 false,
+                                                 true));
+              }
+              phases.Add(new TypeDataDummyPhase());
+          }
+
+          if (StageControl.GCType ==
+              StageControl.DeferredReferenceCountingCollector) {
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "Before DRC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              phases.Add(new IrDRCUpdate());
+
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After DRC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+              if (StageControl.RCCollectorOptImmortals) {
+                  phases.Add(new IrImmortalObjectRCUpdates());
+              }
+              if (StageControl.RCCollectorOptCoalescingUpdates) {
+                  phases.Add(new IrBBLocalCoalesceRCUpdates());
+              }
+              if (StageControl.
+                  RCCollectorOptStaticAcyclicRefTypeUpdates) {
+                  phases.Add(new IrAcyclicRefTypeRCUpdates());
+              }
+              if (StageControl.RCCollectorOptNonNullRCUpdates) {
+                  phases.Add(SSAPhase.NullCheckAnalysis());
+              }
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After DRC Optimizations";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.RCUpdate |
+                  Convert.ToMir.Mask.GetCurrentThread;
+              phases.Add(new Convert.ToMir(mask));
+              if (StageControl.RCCollectorOptInlineRCUpdates &&
+                  StageControl.IrSimpleInliner) {
+                  phases.Add(new IrSimpleInliner(new IrInline(),
+                                                 true,
+                                                 false,
+                                                 true));
+              }
+              phases.Add(new TypeDataDummyPhase());
+          }
+
+
+#if !VC
+          if(StageControl.TryAllSupport &&
+             StageControl.TryAllDecomposeOpt) {
+              phases.Add(new IrDecomposeTransMemChecks(analysisRegistry));
+              // IrDecomposeTransMemChecks emits GetCurrentThread ops
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.GetCurrentThread;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.TryAllSupport &&
+              StageControl.IrConvertTryAll) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.TryAll;
+              phases.Add(new Convert.ToMir(mask));
+              if (StageControl.IrSimpleInliner) {
+                  phases.Add(new IrSimpleInliner(new IrInline(),
+                                                 true,
+                                                 false));
+              }
+          }
+#endif
+
+          // The inliners may inline some of the methods that handle special
+          // MSIL opcodes, adding in instructions like Id<Struct> that we
+          // don't expect to see this late in the lowering.  Add one more
+          // scan of the code to remove them.
+          phases.Add(new Convert.IrInsertStructCopy());
+
+          if (StageControl.IrTreeShake && StageControl.IrTreeShakeLate) {
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          if (StageControl.PtrAnalysis) {
+              phases.Add(PtrTypeSimpleSystem.CreateAnalysis());
+              phases.Add(PtrTypeHierarchySystem.CreateAnalysis());
+              phases.Add(PtrTypeSetSystem.CreateAnalysis());
+          }
+
+          if (StageControl.PrintContainers) {
+              phases.Add(new TypeDataPrintPhase("end of HIR:"));
+          }
+      }
+
+      public static ArrayList fileNames;
+      public static ArrayList refFileNames;
+      public static ArrayList libDirNames;
+      private static ArrayList outputDirNames;
+      public static String outputDirName;
+      public static ArrayList overrideNames;
+      public static ArrayList overrideDefNames;
+      public static String outputRootName;
+      public static ArrayList entryPoints;
+      public static ArrayList linkNames;
+      private static ArrayList initializerSkips;
+      private static ArrayList dynamicLoads;
+      private static bool alreadyPrintedUsage = false;
+
+      private static String StripName(String fileName) {
+          // strip off extension, if there is one.
+          int dotIndex = fileName.LastIndexOf('.');
+          if (dotIndex != -1) {
+              String ext = fileName.Substring(dotIndex + 1);
+              if (ext.Equals("dll") || ext.Equals("obj")
+                  || ext.Equals("exe")) {
+                  fileName = fileName.Substring(0, dotIndex);
+              }
+          }
+          return fileName;
+      }
+
+      private static String GetShortName(String fileName) {
+          int charindex = Math.Max(fileName.LastIndexOf('/'),
+              fileName.LastIndexOf('\\'));
+          String shortName = (charindex >= 0)
+              ? fileName.Substring(charindex + 1)
+              : fileName;
+          return shortName;
+      }
+
+      private static String GetDirName(String fileName) {
+          int charindex = Math.Max(fileName.LastIndexOf('/'),
+                                   fileName.LastIndexOf('\\'));
+          String dirName = (charindex >= 0)
+              ? fileName.Substring(0, charindex + 1)
+              : "";
+          return dirName;
+      }
+
+      private static String ComputeOutputName(String inputFileName,
+                                              String outputDirName) {
+          String fileName = Path.GetFileNameWithoutExtension(inputFileName);
+          String outputName = outputDirName + '\\' + fileName;
+          return outputName;
+      }
+
+      private static void ProcessCmdLine(String[] args) {
+          fileNames = new ArrayList();
+          refFileNames = new ArrayList();
+          libDirNames = new ArrayList();
+          overrideNames = new ArrayList();
+          overrideDefNames = new ArrayList();
+          outputDirNames = new ArrayList();
+          entryPoints = new ArrayList();
+          initializerSkips = new ArrayList();
+          linkNames = new ArrayList();
+          dynamicLoads = new ArrayList();
+          int index = 0;
+#if ON_SINGULARITY
+          index = 1;
+#endif
+          while (index < args.Length) {
+              String argument = args[index];
+              if ((argument[0] == '-') || (argument[0] == '/')) {
+                  String option = argument.Substring(1);
+                  ProcessOption(argument, option, args, ref index);
+              } else {
+                  index++;
+                  fileNames.Add(argument);
+              }
+          }
+          switch (outputDirNames.Count) {
+            case 0: {
+                outputDirName = ".\\debug";
+                break;
+            }
+            case 1: {
+                outputDirName = (String)outputDirNames[0];
+                break;
+            }
+            default: {
+                Util.Error("Error: specified multiple output directories {0}",
+                           new CollectionFormatter(outputDirNames));
+                break;
+            }
+          }
+
+          if((StageControl.GCType == StageControl.ReferenceCountingCollector)
+             && StageControl.StructInheritance) {
+              Util.Abort("Error: RC Collector code has not been updated to "
+                         + "handle struct inheritance");
+          }
+          if((StageControl.GCType ==
+             StageControl.DeferredReferenceCountingCollector)
+             && StageControl.StructInheritance) {
+              Util.Abort("Error: Deferred RC Collector code has not been updated to "
+                         + "handle struct inheritance");
+          }
+      }
+
+      private static void ProcessOption(String argument, String option,
+                                        String[] args, ref int index) {
+          String loweredOption = option.ToLower();
+          String optionValue;
+
+          if (IsOption(args, option, loweredOption, "entry:",
+                       ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(entryPoints, optionValue);
+          } else if (IsOption(args, option, loweredOption, "reference:",
+                              ref index, out optionValue)
+                     || IsOption(args, option, loweredOption, "r:",
+                                 ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(refFileNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "bartoklink:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(linkNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "override:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(overrideNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "overridedef:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(overrideDefNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "lib:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(libDirNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "out:",
+                              ref index, out optionValue)) {
+              outputRootName = optionValue;
+          } else if (IsOption(args, option, loweredOption, "outdir:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(outputDirNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "skip:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(initializerSkips, optionValue);
+          } else if (IsOption(args, option, loweredOption, "substitute:",
+                              ref index, out optionValue)) {
+              StageControl.substituteString = optionValue;
+          } else if (IsOption(args, option, loweredOption, "disable:",
+                              ref index, out optionValue)) {
+              StageControl.disabledPhaseNames.Add(optionValue);
+          } else if (IsOption(args, option, loweredOption, "dynamicload:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(dynamicLoads, optionValue);
+          } else if (IsOption(args, option, loweredOption, "features:",
+                              ref index, out optionValue)) {
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + "," + optionValue;
+          } else if (IsOption(args, option, loweredOption, "noisymethod:",
+                              ref index, out optionValue)) {
+              StageControl.noisyMethodNames.Add(optionValue);
+              //Util.Message("noisyMethodNames="
+              //             + StageControl.noisyMethodNames);
+          } else if (IsOption(args, option, loweredOption, "debugmethod:",
+                              ref index, out optionValue)) {
+              StageControl.debugMethodNames.Add(optionValue);
+              StageControl.noisyMethodNames.Add(optionValue);
+              //Util.Message("debugMethodNames="
+              //             + StageControl.debugMethodNames);
+          } else if (IsOption(args, option, loweredOption, "verbosity:",
+                              ref index, out optionValue)) {
+              Verbosity.FromString(optionValue);
+          } else if (IsOption(args, option, loweredOption, "marksweepgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.MarkSweepCollector;
+              StageControl.GCLargeObjectSize = 2040;
+              StageControl.InlineSegregatedFreeList = true;
+              StageControl.InsertWriteBarrier = false;
+          } else if (IsOption(args, option, loweredOption, "semispacegc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.SemispaceCollector;
+              StageControl.InsertWriteBarrier = true;
+          } else if (IsOption(args, option, loweredOption, "slidinggc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.SlidingCollector;
+              StageControl.InsertWriteBarrier = true;
+          } else if (IsOption(args, option, loweredOption, "adaptivecopyinggc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.AdaptiveCopyingCollector;
+              StageControl.InsertWriteBarrier = true;
+          } else if (IsOption(args, option, loweredOption,
+                              "referencecountinggc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.ReferenceCountingCollector;
+              StageControl.InsertWriteBarrier = false;
+              StageControl.GCInlineAllocations = false;
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + ",ReferenceCountingGC";
+              if (StageControl.RCCollectorVerifyRefCounts) {
+                  StageControl.UseVTableBits = true;
+                  StageControl.mixinConditionals =
+                      StageControl.mixinConditionals +
+                      ",ReferenceCountingGCVerification";
+              }
+          } else if (IsOption
+                     (args, option, loweredOption, "deferredreferencecountinggc",
+                      ref index, out optionValue)) {
+
+              StageControl.GCType = StageControl.DeferredReferenceCountingCollector;
+              StageControl.InsertWriteBarrier = false;
+              StageControl.GCInlineAllocations = false;
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + ",DeferredReferenceCountingGC";
+              if (StageControl.RCCollectorVerifyRefCounts) {
+                  StageControl.UseVTableBits = true;
+                  StageControl.mixinConditionals =
+                      StageControl.mixinConditionals +
+                      ",DeferredReferenceCountingGCVerification";
+              }
+          } else if (IsOption(args, option, loweredOption, "concurrentmsgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.ConcurrentMSCollector;
+              StageControl.GCLargeObjectSize = 2040;
+              StageControl.Wb = StageControl.WbCMS;
+              StageControl.GCInlineAllocations = false;
+              StageControl.InlineSegregatedFreeList = true;
+              StageControl.PreWriteBarrier = true;
+              StageControl.InsertWriteBarrier = true;
+              StageControl.GCInlineWriteBarrier = false;
+              StageControl.GCWriteBarrierTracksStaticFields = true;
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + ",ConcurrentMSGC";
+          } else if (IsOption(args, option, loweredOption, "nullgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.NullCollector;
+              StageControl.InsertWriteBarrier = false;
+          } else if (IsOption(args, option, loweredOption, "atomicrcgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.AtomicRCCollector;
+              StageControl.GCLargeObjectSize = 2040;
+              StageControl.Wb = StageControl.WbARC;
+              StageControl.GCInlineAllocations = false;
+              StageControl.InlineSegregatedFreeList = true;
+              StageControl.InsertWriteBarrier = true;
+              StageControl.GCInlineWriteBarrier = false;
+              StageControl.GCWriteBarrierTracksStaticFields = true;
+          } else if (IsOption(args, option, loweredOption, "minopt",
+                              ref index, out optionValue)) {
+              StageControl.SsaOpts = false;
+              StageControl.IrInterfaceElim = false;
+              StageControl.DevirtualizeCall = false;
+              StageControl.IrTypeTestElimPunt = false;
+              StageControl.IrTypeTestElim = false;
+              StageControl.IrSimpleInliner = false;
+
+              // IR clean up optimizations
+              StageControl.IrDeadAssignmentSimple2 = false;
+              StageControl.IrCleanupStructOperations = false;
+              StageControl.IrShortCircuitBBlocks = false;
+              StageControl.IrTreeShakeLate = false;
+              StageControl.IrArrayLoadStoreOpt = false;
+              StageControl.IrConvertSimpleArrayAccess = false;
+
+              // from the backend
+              StageControl.RegAllocCoalesce = false;
+              StageControl.RegAllocSpill = StageControl.SpillOptimizeSinglePass;
+              StageControl.OptLirCompactify = false;
+              StageControl.OptLirGlobalConstantProp = false;
+              StageControl.OptLirLocalConstantProp = true;
+              StageControl.OptLirImproveCC = false;
+              StageControl.OptLirPeephole = false;
+              StageControl.OptLirReverseCSE = false;
+              StageControl.OptLirGlobalCopyProp = false;
+              StageControl.OptLirLocalCopyProp = true;
+              StageControl.LayoutLoopHeaderLast = false;
+
+              if (StageControl.SymbolicDebug) {
+                  StageControl.OptimizeLocals = false;
+              }
+          } else if (IsOption(args, option, loweredOption, "nohiropt",
+                              ref index, out optionValue)) {
+              StageControl.ABCD = false;
+              StageControl.DevirtualizeCall = false;
+              StageControl.IdentifyAsMethods = false;
+              StageControl.IrAttributeInliner = false;
+              StageControl.IrBBLocalCopyProp = false;
+              StageControl.IrCleanup = false;
+              StageControl.IrCleanupStructOperations = false;
+              StageControl.IrCloneLoopHeader = false;
+              StageControl.IrConvertOpt = false;
+              StageControl.IrDeadAssignmentSimple1 = false;
+              StageControl.IrDeadAssignmentSimple2 = false;
+              StageControl.IrInitStaticField = false;
+              StageControl.IrInterfaceElim = false;
+              StageControl.IrJumpElim = false;
+              StageControl.IrLoadStoreOpt = false;
+              StageControl.IrMultiPropSimple = false;
+              StageControl.IrPeepholeNull = false;
+              StageControl.IrRemoveDoubleCmp = false;
+              StageControl.IrReverseCopyProp = false;
+              StageControl.IrShortCircuitBBlocks = false;
+              StageControl.IrSimpleInliner = false;
+              StageControl.IrStoreChecks = false;
+              StageControl.IrTreeShakeLate = false;
+              StageControl.IrTypeTestElimPunt = false;
+              StageControl.SsaArraySimple = false;
+              StageControl.SsaDeadCode = false;
+              StageControl.SsaLoopInv = false;
+              StageControl.SsaNullCheck = false;
+              StageControl.SsaOpts = false;
+              StageControl.TypeInitRemoveEmptyCctors = false;
+              StageControl.UnmanagedStrings = false;
+          } else if (IsOption(args, option, loweredOption, "singularity",
+                              ref index, out optionValue)) {
+              StageControl.SingSharpTemplateRemover = true;
+              StageControl.DisablePInvoke = true;
+              StageControl.StrictEcma = true;
+              StageControl.CustomAllocatorTypes = true;
+              StageControl.SurrogateBoxing = true;
+              StageControl.StructInheritance = true;
+              StageControl.IrTreeShakeCreatePointedToStructs = true;
+              StageControl.IrTreeShakeLate = false; // not tested
+              StageControl.TypeInitRemoveEmptyCctors = false; // not tested
+              StageControl.CheckNoHeapAllocation = true;
+          } else if (IsOption(args, option, loweredOption, "verbosehelp",
+                              ref index, out optionValue)) {
+              PrintUsage();
+              StageControl.PrintUsage();
+          } else if (IsOption(args, option, loweredOption, "verbosehelpalpha",
+                              ref index, out optionValue)) {
+              PrintUsage();
+              StageControl.PrintUsageAlpha();
+          } else if (IsOption(args, option, loweredOption, "x86",
+                              ref index, out optionValue)) {
+              StageControl.TargetArch = StageControl.X86;
+              StageControl.Target64Bit = false;
+          } else if (IsOption(args, option, loweredOption, "x64",
+                              ref index, out optionValue)) {
+              StageControl.TargetArch = StageControl.X64;
+              StageControl.Target64Bit = true;
+          } else if (IsOption(args, option, loweredOption, "help",
+                              ref index, out optionValue)
+                     || IsOption(args, option, loweredOption, "?",
+                                 ref index, out optionValue)) {
+              PrintUsage();
+          }  else if (IsOption
+                     (args, option, loweredOption, "centralpt",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.CentralPT;
+          } else if (IsOption
+                     (args, option, loweredOption, "centralpthimem",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.CentralPTHimem;
+          } else if (IsOption
+                     (args, option, loweredOption, "flatdistributedpt",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.FlatDistributedPT;
+          } else if (IsOption
+                     (args, option, loweredOption, "flatdistributedtestpt",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.FlatDistributedPTTest;
+          } else if (StageControl.SetOptionFromCommandLine(loweredOption)) {
+              index++;
+          } else if (loweredOption.StartsWith("stagecontrol")) {
+              Util.AbortUserCE("/stagecontrol no longer supported; "
+                               + "use the option directly");
+          } else {
+              Util.AbortUserCE("Unknown option: " + option);
+          }
+      }
+
+      private static bool IsOption(String[] args,
+                                   String option, String loweredOption,
+                                   String possibleOptionName,
+                                   ref int index, out String optionValue) {
+          if(possibleOptionName.EndsWith(":")) {
+              if(loweredOption.StartsWith(possibleOptionName)) {
+                  index++;
+                  if(option.Length == possibleOptionName.Length) {
+                      // case: "/option: value"
+                      optionValue = args[index++];
+                  } else {
+                      // case: "/option:value"
+                      optionValue = option.Substring(possibleOptionName.Length);
+                  }
+                  return true;
+              }
+          } else {
+              if(loweredOption == possibleOptionName) {
+                  index++;
+                  optionValue = null;
+                  return true;
+              }
+          }
+
+          optionValue = null;
+          return false;
+      }
+
+      private static void AddSemicolonDelimitedNames(ArrayList names,
+                                                     String argument) {
+          int index = 0;
+          StringBuilder buf = new StringBuilder();
+          while (index < argument.Length) {
+              if (argument[index] != ';') {
+                  buf.Append(argument[index]);
+                  index++;
+              }
+              else {
+                  if (buf.Length > 0) {
+                      names.Add(buf.ToString());
+                      buf = new StringBuilder();
+                  }
+                  index++;
+              }
+          }
+          names.Add(buf.ToString());
+      }
+
+      public static void PrintUsage() {
+          if (alreadyPrintedUsage) {
+              return;
+          }
+          alreadyPrintedUsage = true;
+          Util.Message(
+@"Usage:
+    bartok [options] files
+
+Bartok main options (case insensitive):
+    /entry: <method1>;<method2>;...    specify entry points
+    /reference: <file1>;<file2>;...    reference metadata from assembly files
+    /r: <file1>;<file2>;...            short form of /reference:
+    /bartoklink: <file1>;<file2>;...   reference precompiled object files
+    /override: <file1>;<file2>;...     files overriding /r: metadata
+    /lib: <dir1>;<dir2>;...            additional dirs to search for references
+    /out: <file>                       output file name
+    /outdir: <dir>                     dir for output .exe, asm, obj, etc.
+                                        (defaults to .\\debug)
+    /skip: <type1>;<type2>;...         specify type initializers to disable
+                                        if building static ordering
+    /substitute:<oldname1>=<newname1>, rename TypeRefs before performing lookup
+     <oldname2>=<newname2>,...
+    /disable:<phasename>               disable a phase
+    /dynamicload:<typename>            make type available for dynamic loading
+    /features:<???>                    << TODO >>
+    /noisymethod:<methname>            enable noisy output for meth
+    /debugmethod:<methname>            enable debug+noisy output for meth
+    /verbosity:<noiselevel>            set output level {Silence,PerPhase,
+                                        PerClass,PerMethod,PerBlock,
+                                        PerInstruction} (defaults to PerPhase)
+    /marksweepgc                       compile for mark-sweep collector
+    /semispacegc                       compile for semispace collector
+    /slidinggc                         compile for sliding collector
+    /adaptivecopyinggc                 compile for semispace-sliding hybrid
+                                        collector
+    /referencecountinggc               compile for reference counting collector
+    /deferredreferencecountinggc       compile for deferred reference counting collector
+    /concurrentmsgc                    compile for concurrent mark-sweep
+                                        collector
+    /nullgc                            compile for no collector
+    /minopt                            disable most optimizations
+    /nohiropt                          disable all HIR optimizations
+    /singularity                       set default Singularity options
+    /verbosehelp                       help message including stage control
+                                        options by category
+    /verbosehelpalpha                  help message including stage control
+                                        options in alphabetical order
+    /help or /?                        help message");
+      }
+  }
+
+  internal class MetaDataOutput : Bartok.MSIL.IMetaDataOutput {
+      public TextWriter Log { get { return Util.Log; } }
+      public TextWriter ErrorOut { get { return Util.ErrorOut; } }
+      public TextWriter WarnOut { get { return Util.WarnOut; } }
+
+      public void Error(string msg)
+      {
+          Util.Error(msg);
+      }
+
+      public void Error(string format, params Object[] objs)
+      {
+          Util.Error(format, objs);
+      }
+
+      public void ErrorDetail(string msg)
+      {
+          Util.ErrorDetail(msg);
+      }
+
+      public void Warn(string msg)
+      {
+          Util.Warn(msg);
+      }
+
+      public void Warn(string format, params Object[] objs)
+      {
+          Util.Warn(format, objs);
+      }
+
+      public void WarnDetail(string msg)
+      {
+          Util.WarnDetail(msg);
+      }
+
+      public void Message(string msg)
+      {
+          Util.Message(msg);
+      }
+  }
+}
diff --git a/base/Applications/Benchmarks/BartokH/host/BartokHHost.csproj b/base/Applications/Benchmarks/BartokH/host/BartokHHost.csproj
new file mode 100644
index 0000000..00f16d1
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/host/BartokHHost.csproj
@@ -0,0 +1,48 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>bartok</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Bartok.cs" />
+    <Compile Include="Proxy.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="..\MSIL\Bartok.Analysis.dll" />
+    <Reference Include="..\MSIL\Bartok.Backend.dll" />
+    <Reference Include="..\MSIL\Bartok.CfgUtil.dll" />
+    <Reference Include="..\MSIL\Bartok.Coff.dll" />
+    <Reference Include="..\MSIL\Bartok.Convert.dll" />
+    <Reference Include="..\MSIL\Bartok.Datatype.dll" />
+    <Reference Include="..\MSIL\Bartok.DebugInfo.dll" />
+    <Reference Include="..\MSIL\Bartok.Encode.dll" />
+    <Reference Include="..\MSIL\Bartok.Ir.dll" />
+    <Reference Include="..\MSIL\Bartok.Lir.dll" />
+    <Reference Include="..\MSIL\Bartok.Mangle.dll" />
+    <Reference Include="..\MSIL\Bartok.MSIL.dll" />
+    <Reference Include="..\MSIL\Bartok.Opt.dll" />
+    <Reference Include="..\MSIL\Bartok.Profile.dll" />
+    <Reference Include="..\MSIL\Bartok.Regalloc.dll" />
+    <Reference Include="..\MSIL\Bartok.Tables.dll" />
+    <Reference Include="..\MSIL\Bartok.Utility.dll" />
+    <Reference Include="..\MSIL\Bartok.Cheap.dll" />
+    <Reference Include="..\MSIL\Bartok.Marshal.dll" />
+    <Reference Include="..\MSIL\Bartok.Regreal.dll" />
+
+    <ProjectReference Include="..\Contracts\BartokHContracts.csproj"/>
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/BartokH/host/Proxy.sg b/base/Applications/Benchmarks/BartokH/host/Proxy.sg
new file mode 100644
index 0000000..a15127a
--- /dev/null
+++ b/base/Applications/Benchmarks/BartokH/host/Proxy.sg
@@ -0,0 +1,392 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Proxy.sg
+//
+//  Note:   Compiler Phase
+//
+
+//#define DO_LOCAL
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Endpoint;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+
+using Bartok.Contracts;
+using Bartok.Analysis.Lir;
+using Bartok.Convert;
+using Bartok.Datatype;
+using Bartok.CfgUtil;
+using Bartok.Lir;
+using Bartok.Opt.Lir;
+using Bartok.Utility;
+using Bartok.DebugInfo;
+using Bartok.Regalloc;
+using Bartok.Marshal;
+using Bartok.Regalloc;
+
+namespace Bartok.Regalloc
+{
+    public class GraphColoring : Phase{
+        private CheapState! cs;
+        private VContainer<byte> bufferData;
+#if DO_LOCAL
+        private GraphColoringReal gcr;
+#else
+        private TRef<CompilerPhaseContract.Imp:Running> child;
+#endif
+
+        private static void ReadOpen(CheapState! cs, byte[]! in ExHeap bytes)
+        {
+            uint regionSize;
+            uint region;
+            regionSize = (uint)bytes.Length;
+            unsafe {
+                fixed (byte *pdst = &bytes[0]) {
+                    region = (uint)pdst;
+                    cs.ReadOpen(region, regionSize);
+                }
+            }
+        }
+
+        private static void ReadClose(CheapState! cs)
+        {
+#if false
+            if (cs.oig != null) {
+                DebugStub.WriteLine("--- Proxy.Read Close {0,8} bytes {1,5} objects",
+                                    __arglist(cs.read, cs.loadCount));
+            }
+#endif
+            cs.ReadClose();
+        }
+
+        private static void WriteOpen(CheapState! cs, byte[]! in ExHeap bytes)
+        {
+            uint regionSize;
+            uint region;
+            regionSize = (uint)bytes.Length;
+            unsafe {
+                fixed (byte *pdst = &bytes[0]) {
+                    region = (uint)pdst;
+                    cs.WriteOpen(region, regionSize);
+                }
+            }
+        }
+
+        private static void WriteClose(CheapState! cs)
+        {
+#if false
+            if (cs.oig != null) {
+                DebugStub.WriteLine("--- Proxy.WriteClose {0,8} bytes {1,5} objects",
+                                    __arglist(cs.used, cs.oig.m_currentCount));
+            }
+#endif
+            cs.WriteClose();
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public GraphColoring(RegDesc regs, CallConv conv, AbstractTarget target,
+                             GlobalLayoutData globalLayoutData,
+                             int pageSize, int stackThreshhold,
+                             bool isNoisy)
+        {
+            CheapMarshal.InitTypes();
+
+            cs = new CheapState(0, true);
+            base();
+#if false
+
+            Console.WriteLine("-------- GraphColoring Init -----");
+            DebugStub.WriteLine("-------- GraphColoring::Proxy Init -----");
+#endif
+
+#if DO_LOCAL
+            gcr = new GraphColoringReal(regs,
+                                        conv,
+                                        target,
+                                        globalLayoutData,
+                                        pageSize,
+                                        stackThreshhold,
+                                        isNoisy);
+#else // !DO_LOCAL
+            // Make a new channel.
+            CompilerPhaseContract.Imp! cp;
+            CompilerPhaseContract.Exp! ep;
+            CompilerPhaseContract.NewChannel(out cp, out ep);
+
+            // Start up our child
+            string[] args = new string[3];
+            args[0] = "BartokP.x86";
+            args[1] = "-where";
+            args[2] = "!";
+            Process cproc = new Process(args, (Endpoint * in ExHeap)ep);
+
+            // set the where parameter to true
+            ParameterCode code;
+            code = cproc.SetStartupBoolArg(0, true);
+            if (code != ParameterCode.Success){
+                Console.WriteLine("unable to set bool index 0. error={0}", code);
+                delete cp;
+                return;
+            }
+
+            byte[]! in ExHeap bytes = (!)new [ExHeap] byte [2 * 1024 * 1024];
+
+            cproc.Start();
+
+            // Track statics before they can be replicated in a method call.
+            RegisterX86.TrackAsGlobal(cs);
+            OpCodesX86.TrackAsGlobal(cs);
+
+            cp.RecvReadyToInit();
+
+            StageControlProxy controls = new StageControlProxy();
+            controls.GetValues();
+
+            ulong beg = Processor.GetCycleCount();
+            WriteOpen(cs, bytes);
+            RegDesc.CheapWrite(cs, regs);
+            CallConv.CheapWrite(cs, conv);
+            AbstractTarget.CheapWrite(cs, target);
+            GlobalLayoutData.CheapWrite(cs, globalLayoutData);
+            cs.Write(pageSize);
+            cs.Write(stackThreshhold);
+            cs.Write(isNoisy);
+            CSRT.CheapWrite(cs, CSRT.runtime);
+            StageControlProxy.CheapWrite(cs, controls);
+            WriteClose(cs);
+            DebugStub.AddToPerfCounter(0, Processor.GetCycleCount() - beg);
+
+            //DebugStub.WriteLine(":: Host Targ Globals");
+            target.TrackAsGlobal(cs);
+            //DebugStub.WriteLine(":: Host Regs Globals");
+            regs.TrackAsGlobal(cs);
+            //DebugStub.WriteLine(":: Host Conv Globals");
+            conv.TrackAsGlobal(cs);
+            //DebugStub.WriteLine(":: Host CSRT Globals");
+            CSRT.runtime.TrackAsGlobal(cs);
+
+            //cs.DumpGlobal("host");
+
+            cp.SendInitPhaseReq(bytes);
+#if USE_SWITCH_RECEIVE
+            switch receive
+            {
+                case cp.InitPhaseRsp(byte[]! in ExHeap obytes):
+                    ReadOpen(cs, obytes);
+                    ReadClose(cs);
+                    bufferData = new VContainer<byte> (obytes);
+                    child = new TRef<CompilerPhaseContract.Imp:Running>(cp);
+                    return;
+                case cp.ChannelClosed():
+                    Console.WriteLine("Child closed channel!");
+                    throw new Exception("Child closed channel!");
+            }
+#else
+            byte[]! in ExHeap obytes;
+            cp.RecvInitPhaseRsp(out obytes);
+            ReadOpen(cs, obytes);
+            ReadClose(cs);
+            bufferData = new VContainer<byte> (obytes);
+            child = new TRef<CompilerPhaseContract.Imp:Running>(cp);
+#endif
+#endif // !DO_LOCAL
+        }
+
+        private string GetPhaseName()
+        {
+#if DO_LOCAL
+            return gcr.PhaseName;
+#else // !DO_LOCAL
+            if (child == null) {
+                Console.WriteLine("!!! Internal Error!");
+                return "<error>";
+            }
+
+#if USE_SWITCH_RECEIVE
+            CompilerPhaseContract.Imp! cp = child.Acquire();
+
+            cp.SendGetPhaseNameReq();
+            switch receive
+            {
+                case cp.GetPhaseNameRsp(char[]! in ExHeap name):
+                    string ph = Bitter.ToString(name);
+                    child.Release(cp);
+                    delete name;
+                    return ph;
+                case cp.ChannelClosed():
+                    Console.WriteLine("Child closed channel!");
+                    throw new Exception("Child closed channel!");
+            }
+#else
+            return "[regalloc]";
+#endif
+#endif // !DO_LOCAL
+        }
+
+        public override string PhaseName
+        {
+            get {
+                return GetPhaseName();
+            }
+        }
+
+        public override void Term()
+        {
+#if DO_LOCAL
+            gcr.Term();
+#else // !DO_LOCAL
+            if (child == null) {
+                Console.WriteLine("!!! Internal Error!");
+                return;
+            }
+
+#if USE_SWITCH_RECEIVE
+            CompilerPhaseContract.Imp! cp = child.Acquire();
+
+            cp.SendTermPhaseReq();
+            switch receive
+            {
+                case cp.TermPhaseRsp():
+                    ReadOpen(cs, obytes);
+                    ReadClose(cs);
+                    child.Release(cp);
+                    return;
+                case cp.ChannelClosed():
+                    Console.WriteLine("Child closed channel!");
+                    throw new Exception("Child closed channel!");
+            }
+#else
+            if (bufferData == null) {
+                Console.WriteLine("!!! Internal Error!");
+                return;
+            }
+
+            CompilerPhaseContract.Imp! cp = child.Acquire();
+            byte[]! in ExHeap bytes = bufferData.Acquire();
+            WriteOpen(cs, bytes);
+            WriteClose(cs);
+            cp.SendRequest((int)RequestKind.Terminate, bytes);
+            cp.RecvResponse(out bytes);
+            ReadOpen(cs, bytes);
+            ReadClose(cs);
+            bufferData.Release(bytes);
+            child.Release(cp);
+#endif
+#endif // !DO_LOCAL
+        }
+
+        protected override void run(FunctionDef f, object r)
+        {
+#if DO_LOCAL
+            gcr.Go(f, r);
+#else // !DO_LOCAL
+            if (child == null || bufferData == null || f == null || r == null) {
+                Console.WriteLine("!!! Internal Error!");
+                return;
+            }
+
+#if false
+            Console.WriteLine("-------- GraphColoring Run {0} -----", f.ToString());
+#endif
+
+            CompilerPhaseContract.Imp! cp = child.Acquire();
+            byte[]! in ExHeap bytes = bufferData.Acquire();
+
+            ulong beg = Processor.GetCycleCount();
+            WriteOpen(cs, bytes);
+            FunctionDef.CheapWrite(cs, f);
+            ChooseRepResult.CheapWrite(cs, (ChooseRepResult)r);
+            WriteClose(cs);
+            DebugStub.AddToPerfCounter(0, Processor.GetCycleCount() - beg);
+
+#if USE_SWITCH_RECEIVE
+            cp.SendProcessFunctionReq(bytes);
+            switch receive
+            {
+                case cp.ProcessFunctionRsp(obytes):
+                    beg = Processor.GetCycleCount();
+                    ReadOpen(cs, obytes);
+                    OperandArray.CheapRead(cs, out f.actualArgs);
+                    LirBasicBlock.CheapRead(cs, out f.prolog);
+                    LirBasicBlock.CheapRead(cs, out f.epilog);
+                    LirBasicBlock.CheapRead(cs, out f.unwind);
+                    cs.Read(out f.omitFramePointer);
+                    cs.Read(out f.spillSlotCount);
+                    Operand.CheapRead(cs, out f.stackSlotMap);
+                    SequencedCfg.CheapRead(cs, out f.code);
+                    OperandArray.CheapRead(cs, out f.pinned);
+                    OperandArray.CheapRead(cs, out f.formals);
+                    Operand.CheapRead(cs, out f.ret);
+                    ReadClose(cs);
+                    DebugStub.AddToPerfCounter(3, Processor.GetCycleCount() - beg);
+
+                    bufferData.Release(obytes);
+                    child.Release(cp);
+                    return;
+
+                case cp.ChannelClosed():
+                    Console.WriteLine("Child closed channel!");
+                    throw new Exception("Child closed channel!");
+            }
+#else
+            cp.SendRequest((int)RequestKind.ProcessFunction, bytes);
+            cp.RecvResponse(out bytes);
+
+            beg = Processor.GetCycleCount();
+            ReadOpen(cs, bytes);
+            OperandArray.CheapRead(cs, out f.actualArgs);
+            LirBasicBlock.CheapRead(cs, out f.prolog);
+            LirBasicBlock.CheapRead(cs, out f.epilog);
+            LirBasicBlock.CheapRead(cs, out f.unwind);
+            cs.Read(out f.omitFramePointer);
+            cs.Read(out f.spillSlotCount);
+            Operand.CheapRead(cs, out f.stackSlotMap);
+            SequencedCfg.CheapRead(cs, out f.code);
+            OperandArray.CheapRead(cs, out f.pinned);
+            OperandArray.CheapRead(cs, out f.formals);
+            Operand.CheapRead(cs, out f.ret);
+            ReadClose(cs);
+            DebugStub.AddToPerfCounter(3, Processor.GetCycleCount() - beg);
+
+            bufferData.Release(bytes);
+            child.Release(cp);
+#endif
+#endif // !DO_LOCAL
+        }
+
+#if TIMING
+        private const string componentName = "Back End Coloring";
+        private static int componentId;
+        private const string allocFunctionName = "Back End Coloring allocFunction";
+        private static int allocFunctionId;
+        private const string deadCodeName = "Back End Coloring dead code elimination";
+        private static int deadCodeId;
+        private const string copyPropName = "Back End Coloring copy propagation";
+        private static int copyPropId;
+        private const string coalesceName = "Back End Coloring coalescing";
+        private static int coalesceId;
+        private const string interferenceName = "Back End Coloring interference";
+        private static int interferenceId;
+        private const string colorAndSpillName = "Back End Coloring ColorAndSpill";
+        private static int colorAndSpillId;
+        private const string coloringName = "Back End Coloring Coloring";
+        private static int coloringId;
+#endif
+    } /* class GraphColoring */
+}
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Analysis.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Analysis.dll
new file mode 100644
index 0000000..5049227
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Analysis.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Analysis.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Analysis.pdb
new file mode 100644
index 0000000..35e4bf3
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Analysis.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Backend.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Backend.dll
new file mode 100644
index 0000000..535c600
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Backend.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Backend.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Backend.pdb
new file mode 100644
index 0000000..27f1b84
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Backend.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.CfgUtil.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.CfgUtil.dll
new file mode 100644
index 0000000..512bba1
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.CfgUtil.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.CfgUtil.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.CfgUtil.pdb
new file mode 100644
index 0000000..80d2018
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.CfgUtil.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Cheap.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Cheap.dll
new file mode 100644
index 0000000..9dd951e
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Cheap.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Cheap.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Cheap.pdb
new file mode 100644
index 0000000..48f438a
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Cheap.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Coff.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Coff.dll
new file mode 100644
index 0000000..4976de4
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Coff.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Coff.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Coff.pdb
new file mode 100644
index 0000000..fe11439
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Coff.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Convert.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Convert.dll
new file mode 100644
index 0000000..ce7a174
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Convert.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Convert.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Convert.pdb
new file mode 100644
index 0000000..994861c
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Convert.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Datatype.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Datatype.dll
new file mode 100644
index 0000000..b36dadd
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Datatype.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Datatype.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Datatype.pdb
new file mode 100644
index 0000000..02d8276
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Datatype.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.DebugInfo.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.DebugInfo.dll
new file mode 100644
index 0000000..5d7a962
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.DebugInfo.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.DebugInfo.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.DebugInfo.pdb
new file mode 100644
index 0000000..b79fc31
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.DebugInfo.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Encode.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Encode.dll
new file mode 100644
index 0000000..85fb9b2
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Encode.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Encode.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Encode.pdb
new file mode 100644
index 0000000..cba2032
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Encode.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Ir.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Ir.dll
new file mode 100644
index 0000000..fa413fa
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Ir.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Ir.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Ir.pdb
new file mode 100644
index 0000000..15507f2
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Ir.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Lir.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Lir.dll
new file mode 100644
index 0000000..d6acec1
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Lir.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Lir.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Lir.pdb
new file mode 100644
index 0000000..b49d630
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Lir.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.MSIL.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.MSIL.dll
new file mode 100644
index 0000000..2ce8101
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.MSIL.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.MSIL.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.MSIL.pdb
new file mode 100644
index 0000000..727f8a4
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.MSIL.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Mangle.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Mangle.dll
new file mode 100644
index 0000000..0df01c5
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Mangle.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Mangle.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Mangle.pdb
new file mode 100644
index 0000000..55c9193
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Mangle.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Marshal.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Marshal.dll
new file mode 100644
index 0000000..94ca79c
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Marshal.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Marshal.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Marshal.pdb
new file mode 100644
index 0000000..412b8ea
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Marshal.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Opt.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Opt.dll
new file mode 100644
index 0000000..90158a6
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Opt.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Opt.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Opt.pdb
new file mode 100644
index 0000000..578ae1f
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Opt.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Profile.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Profile.dll
new file mode 100644
index 0000000..3cdc7a3
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Profile.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Profile.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Profile.pdb
new file mode 100644
index 0000000..07f6d0b
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Profile.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Proxy.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Proxy.pdb
new file mode 100644
index 0000000..21432fc
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Proxy.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Regalloc.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regalloc.dll
new file mode 100644
index 0000000..a81ee5b
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regalloc.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Regalloc.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regalloc.pdb
new file mode 100644
index 0000000..4c6a2d3
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regalloc.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Regreal.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regreal.dll
new file mode 100644
index 0000000..64f9591
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regreal.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Regreal.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regreal.pdb
new file mode 100644
index 0000000..b56f699
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regreal.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Regstub.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regstub.dll
new file mode 100644
index 0000000..56e87e5
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regstub.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Regstub.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regstub.pdb
new file mode 100644
index 0000000..12cd1eb
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Regstub.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Tables.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Tables.dll
new file mode 100644
index 0000000..2b6df5f
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Tables.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Tables.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Tables.pdb
new file mode 100644
index 0000000..64589d1
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Tables.pdb differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Utility.dll b/base/Applications/Benchmarks/BartokH/msil/Bartok.Utility.dll
new file mode 100644
index 0000000..68a9dba
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Utility.dll differ
diff --git a/base/Applications/Benchmarks/BartokH/msil/Bartok.Utility.pdb b/base/Applications/Benchmarks/BartokH/msil/Bartok.Utility.pdb
new file mode 100644
index 0000000..6a4dfa6
Binary files /dev/null and b/base/Applications/Benchmarks/BartokH/msil/Bartok.Utility.pdb differ
diff --git a/base/Applications/Benchmarks/Benchmarks.proj b/base/Applications/Benchmarks/Benchmarks.proj
new file mode 100644
index 0000000..d3e437e
--- /dev/null
+++ b/base/Applications/Benchmarks/Benchmarks.proj
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <ItemGroup>
+    <ProjectReference Include="*\*.csproj;*\*.proj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+  
+</Project>
diff --git a/base/Applications/Benchmarks/CreateProcess/CreateProcess.cs b/base/Applications/Benchmarks/CreateProcess/CreateProcess.cs
new file mode 100644
index 0000000..545647c
--- /dev/null
+++ b/base/Applications/Benchmarks/CreateProcess/CreateProcess.cs
@@ -0,0 +1,431 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CreateProcess.cs
+//
+//  Note:   Singularity micro-benchmark program.
+//
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+using System;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications 
+{
+    [ConsoleCategory(HelpMessage="CreateProcess benchmark test", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "q", Default=false, HelpMessage="Quiet Mode.")]
+        internal bool quietMode;
+
+        [LongParameter( "r", Default=1, HelpMessage="Repetition count.")]
+        internal long repetitions;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return CreateProcessTest.AppMain(this);
+        }
+    }
+
+    //
+    // The goal of this test is to time how long it takes to
+    // create a process.
+    //
+    public class CreateProcessTest
+    {
+        private static bool AtRing3;
+
+#if x64_PERF
+        [CLSCompliant(false)]
+        public struct PerfEvtSel
+        {
+            // Bits and Flags
+            public const uint CNT_MASK  = 0xff000000;
+            public const uint INV       = 0x00800000;
+            public const uint EN        = 0x00400000;
+            public const uint INT       = 0x00100000;
+            public const uint PC        = 0x00080000;
+            public const uint E         = 0x00040000;
+            public const uint OS        = 0x00020000;
+            public const uint USR       = 0x00010000;
+            public const uint UNIT_MASK = 0x0000ff00;
+            public const uint SELECTOR  = 0x000000ff;
+
+            // Common setting: Count all, but don't interrupt,
+            public const uint COUNT     = (EN | PC | OS | USR);
+
+            // Selector values.
+            public const uint DtlbL1MissL2Hit                   = 0x45; // Speculative
+            public const uint DtlbL1MissL2Miss                  = 0x46; // Speculative
+            public const uint CyclesNotHalted                   = 0x76;
+            public const uint RequestsToL2Cache                 = 0x7d;
+            public const uint ItlbL1MissL2Hit                   = 0x84;
+            public const uint ItlbL1MissL2Miss                  = 0x85;
+            public const uint RetiredInstructions               = 0xc0;
+            public const uint RetiredBranchInstructions         = 0xc2;
+            public const uint RetiredBranchesMispredicted       = 0xc3;
+            public const uint RetiredBranchesTaken              = 0xc4;
+            public const uint CyclesInterruptsMasked            = 0xcd;
+            public const uint CyclesInterruptsBlocked           = 0xce;
+        }
+
+        public static void Reset(uint pmc, ulong value)
+        {
+            // Clear the event selector.
+            Processor.WriteMsr(0xc0010000 + pmc, 0);
+            // Clear the performance counter.
+            Processor.WriteMsr(0xc0010004 + pmc, 0);
+            // Enable the event selector.
+            Processor.WriteMsr(0xc0010000 + pmc, value);
+        }
+
+        public static string EvtSelToString(ulong value)
+        {
+            switch (value & 0xff) {
+                case PerfEvtSel.DtlbL1MissL2Hit:            return "DTLB_L2_Hit";
+                case PerfEvtSel.DtlbL1MissL2Miss:           return "DTBL_L2_Miss";
+                case PerfEvtSel.CyclesNotHalted:            return "CyclesNotHalted";
+                case PerfEvtSel.RequestsToL2Cache:          return "TLB_L2_Requests";
+                case PerfEvtSel.ItlbL1MissL2Hit:            return "ITLB_L2_Hit";
+                case PerfEvtSel.ItlbL1MissL2Miss:           return "ITLB_L2_Miss";
+                case PerfEvtSel.RetiredInstructions:        return "Retired_Inst.";
+                case PerfEvtSel.RetiredBranchInstructions:  return "Branches";
+                case PerfEvtSel.RetiredBranchesMispredicted:return "Br_Mispredicted";
+                case PerfEvtSel.RetiredBranchesTaken:       return "Br_Taken";
+                case PerfEvtSel.CyclesInterruptsMasked:     return "Ints_Masked (cyc)";
+                case PerfEvtSel.CyclesInterruptsBlocked:    return "Ints_Blocked (cyc)";
+                default:
+                    return String.Format("{0:x16}", value);
+            }
+        }
+
+        private static ulong x64_i0, x64_p0;
+        private static ulong x64_i1, x64_p1;
+        private static ulong x64_i2, x64_p2;
+        private static ulong x64_i3, x64_p3;
+#endif
+
+        private static void DualWriteLine(string message)
+        {
+            Console.WriteLine(message);
+            DebugStub.WriteLine(message);
+        }
+
+        public struct PerfSnap
+        {
+            private bool disabled;
+            private long begCycleCount;
+            private long endCycleCount;
+            private long begSwitchCount;
+            private long endSwitchCount;
+            private long begInterruptCount;
+            private long endInterruptCount;
+            private long begKernelGcCount;
+            private long endKernelGcCount;
+            private long begProcessGcCount;
+            private long endProcessGcCount;
+            private long iterations;
+            private ulong begAllocatedCount;
+            private ulong begAllocatedBytes;
+            private ulong begFreedCount;
+            private ulong begFreedBytes;
+            private ulong endAllocatedCount;
+            private ulong endAllocatedBytes;
+            private ulong endFreedCount;
+            private ulong endFreedBytes;
+            private ulong begStackGets;
+            private ulong begStackRets;
+            private ulong endStackGets;
+            private ulong endStackRets;
+
+
+            public long Cycles      { get { return endCycleCount - begCycleCount; } }
+            public long Interrupts  { get { return endInterruptCount - begInterruptCount; } }
+            public long Switches    { get { return endSwitchCount - begSwitchCount; } }
+            public long KernelGCs   { get { return endKernelGcCount - begKernelGcCount; } }
+            public long ProcessGCs  { get { return endProcessGcCount - begProcessGcCount; } }
+            public ulong AllocatedCount { get { return endAllocatedCount-begAllocatedCount; } }
+            public ulong AllocatedBytes { get { return endAllocatedBytes-begAllocatedBytes; } }
+            public ulong FreedCount { get { return endFreedCount - begFreedCount; } }
+            public ulong FreedBytes { get { return endFreedBytes - begFreedBytes; } }
+            public ulong StackGets { get { return endStackGets - begStackGets; } }
+            public ulong StackRets { get { return endStackRets - begStackRets; } }
+
+            public void Start()
+            {
+                if (!AtRing3) {
+                    disabled = Processor.DisableInterrupts();
+                }
+
+                int collectorCount;
+                long collectorMillis;
+                long collectorBytes;
+                GC.PerformanceCounters(out collectorCount,
+                                       out collectorMillis,
+                                       out collectorBytes);
+
+                ulong stackGets;
+                ulong stackRets;
+                StackService.GetUsageStatistics(out stackGets,
+                                                out stackRets);
+                begStackGets = stackGets;
+                begStackRets = stackRets;
+
+                ulong allocatedCount;
+                ulong allocatedBytes;
+                ulong freedCount;
+                ulong freedBytes;
+                PageTableService.GetUsageStatistics(out allocatedCount,
+                                                    out allocatedBytes,
+                                                    out freedCount,
+                                                    out freedBytes);
+                begAllocatedCount = allocatedCount;
+                begAllocatedBytes = allocatedBytes;
+                begFreedCount = freedCount;
+                begFreedBytes = freedBytes;
+
+                begInterruptCount = ProcessService.GetKernelInterruptCount();
+                begSwitchCount = ProcessService.GetContextSwitchCount();
+                begKernelGcCount = ProcessService.GetKernelGcCount();
+                begProcessGcCount = collectorCount;
+
+#if x64_PERF
+                // Set up for perf counting
+                if (!AtRing3) {
+                    // Reset the performance counters to what we're interested in.
+                    Reset(0, PerfEvtSel.COUNT | PerfEvtSel.CyclesNotHalted);
+                    Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                    Reset(2, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchInstructions);
+                    Reset(3, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+                } else {
+                    // We're not allowed to reset the perf counters, so take note
+                    // of their current values; we will subtract from this later.
+                    x64_i0 = Processor.ReadPmc(0);
+                    x64_i1 = Processor.ReadPmc(1);
+                    x64_i2 = Processor.ReadPmc(2);
+                    x64_i3 = Processor.ReadPmc(3);
+                }
+#endif
+
+                begCycleCount = unchecked((long)Processor.CycleCount);
+            }
+
+            public void Finish(long iterations)
+            {
+                endCycleCount = unchecked((long)Processor.CycleCount);
+
+#if X64_PERF
+                x64_p0 = Processor.ReadPmc(0);
+                x64_p1 = Processor.ReadPmc(1);
+                x64_p2 = Processor.ReadPmc(2);
+                x64_p3 = Processor.ReadPmc(3);
+#endif
+
+                endInterruptCount = ProcessService.GetKernelInterruptCount();
+                endSwitchCount = ProcessService.GetContextSwitchCount();
+                endKernelGcCount = ProcessService.GetKernelGcCount();
+
+                int collectorCount;
+                long collectorMillis;
+                long collectorBytes;
+                GC.PerformanceCounters(out collectorCount,
+                                       out collectorMillis,
+                                       out collectorBytes);
+                endProcessGcCount = collectorCount;
+
+                ulong allocatedCount;
+                ulong allocatedBytes;
+                ulong freedCount;
+                ulong freedBytes;
+                PageTableService.GetUsageStatistics(out allocatedCount,
+                                                    out allocatedBytes,
+                                                    out freedCount,
+                                                    out freedBytes);
+                endAllocatedCount = allocatedCount;
+                endAllocatedBytes = allocatedBytes;
+                endFreedCount = freedCount;
+                endFreedBytes = freedBytes;
+
+                ulong stackGets;
+                ulong stackRets;
+                StackService.GetUsageStatistics(out stackGets,
+                                                out stackRets);
+                endStackGets = stackGets;
+                endStackRets = stackRets;
+
+                if (!AtRing3) {
+                    Processor.RestoreInterrupts(disabled);
+                }
+
+                this.iterations = iterations;
+            }
+
+            public void Display(string name)
+            {
+                DualWriteLine(
+                    String.Format("{0,-16} {1,6:d} x{2,8:d} ={3,12:d} " +
+                                  "[swi={4,6:d} int={5,3:d} gc={6:d}/{7:d}]",
+                                  name,
+                                  iterations,
+                                  Cycles / iterations,
+                                  Cycles,
+                                  Switches,
+                                  Interrupts,
+                                  KernelGCs,
+                                  ProcessGCs)
+                    );
+
+
+                if (AllocatedCount != 0 || FreedCount != 0 || StackGets != 0) {
+                    DualWriteLine(
+                        string.Format(
+                            "                       " +
+                            "[alloc={0,4:d}/{1,8:x} free={2,4:d}/{3,8:x} " +
+                            "stack={4,4:d}/{5,4:d}]",
+                            AllocatedCount,
+                            AllocatedBytes,
+                            FreedCount,
+                            FreedBytes,
+                            StackGets,
+                            StackRets)
+                        );
+                }
+
+#if x64_PERF
+                if (!AtRing3) {
+                    // Read off the current MSR values and turn them
+                    // into nice labels
+                    ulong e0 = Processor.ReadMsr(0xc0010000);
+                    ulong e1 = Processor.ReadMsr(0xc0010001);
+                    ulong e2 = Processor.ReadMsr(0xc0010002);
+                    ulong e3 = Processor.ReadMsr(0xc0010003);
+
+                    DualWriteLine(
+                        String.Format("evt: {0,16} {1,16} {2,16} {3,16}",
+                                      EvtSelToString(e0),
+                                      EvtSelToString(e1),
+                                      EvtSelToString(e2),
+                                      EvtSelToString(e3)));
+                } else {
+                    // Subtract from the initial perf-counter values to
+                    // get the delta we want
+                    x64_p0 -= x64_i0;
+                    x64_p1 -= x64_i1;
+                    x64_p2 -= x64_i2;
+                    x64_p3 -= x64_i3;
+                }
+
+                DualWriteLine(
+                    String.Format("pmc: {0:d16} {1:d16} {2:d16} {3:d16} {4:d16}\n\n",
+                                  Cycles, x64_p0, x64_p1, x64_p2, x64_p3));
+#endif
+            }
+        }
+
+
+        internal static int AppMain(Parameters! config)
+        {
+            bool runQuiet = config.quietMode;
+            long repetitions = config.repetitions; 
+
+            Console.Write("\nProcess creation test\n\n");
+            string [] arguments;
+            for (long i = 0; i < repetitions; i++) {
+                arguments = new string[2];
+                arguments[0] = "testpe.x86";
+                arguments[1] = "!"; // Special flag to not notify debugger.
+                TimeProcess(arguments, runQuiet);
+            }
+            return 0;
+        }
+
+        public static void TimeProcess(String[]! args, bool runQuiet)
+        {
+            ulong baseline;
+            ulong created;
+            ulong started;
+            ulong exited;
+            Process process = null;
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                ProcessService.Waypoint0();
+                baseline = Processor.CycleCount;
+
+                //
+                // Time process creation.
+                //
+                ProcessService.Waypoint(1500);
+                process = new Process(args);
+                created = Processor.CycleCount;
+
+                //
+                // Time process start.
+                //
+                ProcessService.Waypoint(1501);
+
+                process.Start();
+                started = Processor.CycleCount;
+
+                ProcessService.Waypoint(1502);
+                //
+                // Time process execution.
+                //
+                process.Join();
+                ProcessService.Waypoint(1503);
+                exited = Processor.CycleCount;
+            }
+            finally {
+                snap.Finish(1);
+            }
+
+            snap.Display("CreateProc");
+
+            ProcessService.Waypoint(1504);
+            process.Dispose(true);
+            ProcessService.Waypoint(1505);
+            ProcessService.WaypointDump();
+
+
+            if (runQuiet) {
+                return;
+            }
+
+            //
+            // Tell the world.
+            //
+            Console.WriteLine();
+            Console.WriteLine("Tested process: {0}", args[0]);
+            Console.WriteLine("Create process: {0,15:d} cycles", created - baseline);
+            Console.WriteLine("Start process:  {0,15:d} cycles", started - created);
+            Console.WriteLine("Run process:    {0,15:d} cycles", exited - started);
+            Console.WriteLine("Total:          {0,15:d} cycles", exited - baseline);
+            Console.WriteLine("Process.Create: {0,15:d} cycles", started - baseline);
+            Console.WriteLine();
+            Console.WriteLine();
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/CreateProcess/CreateProcess.csproj b/base/Applications/Benchmarks/CreateProcess/CreateProcess.csproj
new file mode 100644
index 0000000..d1d0b64
--- /dev/null
+++ b/base/Applications/Benchmarks/CreateProcess/CreateProcess.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CreateProcess</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CreateProcess.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/SharedHeap/SharedHeapBench.cs b/base/Applications/Benchmarks/SharedHeap/SharedHeapBench.cs
new file mode 100644
index 0000000..d0f9695
--- /dev/null
+++ b/base/Applications/Benchmarks/SharedHeap/SharedHeapBench.cs
@@ -0,0 +1,107 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SharedHeapBench.cs
+//
+//  Note:   Singularity micro-benchmark program.
+//
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+using System;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(HelpMessage="Show attributes associated with a file", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "q", Default=false, HelpMessage="Quiet Mode.")]
+        internal bool quietMode;
+
+        [LongParameter( "r", Default=1, HelpMessage="Repetition count.")]
+        internal long repetitions;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SharedHeapBench.AppMain(this);
+        }
+    }
+    //
+    // The goal of this test is to time how long it takes to
+    // create a process.
+    //
+    public class SharedHeapBench
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            int iterations = 10000;
+
+            Console.Write("\nTime alloc/free ops in the shared heap\n\n");
+
+            TimeCycle(10, iterations);
+
+            Thread.Sleep(1000);
+
+            TimeCycle(100, iterations);
+
+            Thread.Sleep(1000);
+
+            TimeCycle(1000, iterations);
+
+            Thread.Sleep(1000);
+
+            TimeCycle(10000, iterations);
+
+            return 0;
+        }
+
+        //
+        // The goal of this routine is to focus on the shared heap operations
+        // themselves.  So we allocate and then free the same amount of memory
+        // repeatedly, which (for small region allocations) won't cause us to
+        // go to the Page manager in steady state.
+        //
+        public static void TimeCycle(int bytes, int iterations)
+        {
+
+            ulong before = Processor.CycleCount;
+
+            for (int loop = 0; loop < iterations; loop++) {
+                    SharedHeapService.Allocation *mem;
+
+                    mem = (SharedHeapService.Allocation *)
+                        SharedHeapService.Allocate((UIntPtr)bytes, typeof(byte).GetSystemType(), 0);
+                    SharedHeapService.Free(mem);
+            }
+
+            ulong after = Processor.CycleCount;
+
+            //
+            // Tell the world.
+            //
+            Console.Write("\nTested {0} alloc/free iterations of {1} bytes\n",
+                          iterations, bytes);
+            Console.Write("Total cycles: {0}\n", after - before);
+            Console.Write("\n\n");
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/SharedHeap/SharedHeapBench.csproj b/base/Applications/Benchmarks/SharedHeap/SharedHeapBench.csproj
new file mode 100644
index 0000000..488507b
--- /dev/null
+++ b/base/Applications/Benchmarks/SharedHeap/SharedHeapBench.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SharedHeapBench</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SharedHeapBench.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/SingBench/BenchChild/BenchChild.sg b/base/Applications/Benchmarks/SingBench/BenchChild/BenchChild.sg
new file mode 100644
index 0000000..e80ec6c
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/BenchChild/BenchChild.sg
@@ -0,0 +1,118 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BenchChild.sg
+//
+//  Note:   Simple ping-pong second child process
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Endpoint;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+
+namespace Microsoft.Singularity.Applications.Singbench
+{
+    [Category("WebApp")]
+    internal  class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ExtensionContract.Exp:Start> sendRef;
+
+        [BoolParameter("where", Default=false, HelpMessage="Show what space we are running in")]
+        internal bool doWhere; 
+        
+        reflective private Parameters();
+        
+        internal int AppMain() {
+            return BenchChild.AppMain(this);
+        }
+    }
+
+    public class BenchChild
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            if (config.doWhere) {
+                if (Processor.AtKernelPrivilege()) {
+                    DualWriteLine("Benchchild running at KERNEL privilege");
+                } else {
+                    DualWriteLine("Benchchild running at USER privilege");
+                }
+            }
+
+            ExtensionContract.Exp ep = (config.sendRef).Acquire();
+            
+
+            SendTestContract.Exp simpleConn = ep as SendTestContract.Exp;
+            
+            if (simpleConn != null) {
+                DoSimpleTest(simpleConn);
+            }
+
+            BufferTestContract.Exp bufferConn = ep as BufferTestContract.Exp;
+
+            if (bufferConn != null) {
+                DoBufferTest(bufferConn);
+            }
+
+            // Wrong contract type!
+            delete ep;
+            return 0; 
+        }
+
+        private static void DoSimpleTest(SendTestContract.Exp! conn)
+        {
+            conn.SendTestReady();
+            int arg;
+
+            while(true) {
+                conn.RecvReq(out arg);
+
+                if (arg == -1) {
+                    return;
+                }
+
+                conn.SendResp(arg);
+            }
+        }
+
+        private static void DoBufferTest(BufferTestContract.Exp! conn)
+        {
+            int arg;
+            byte[]! in ExHeap buffer;
+
+            conn.SendBufferReady();
+
+            while (true) {
+                conn.RecvReq(out arg, out buffer);
+                conn.SendResp(buffer);
+                if (arg == 0) {
+                    return;
+                }
+            }
+        }
+
+        private static void DualWriteLine(string message)
+        {
+            Console.WriteLine(message);
+            DebugStub.WriteLine(message);
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/SingBench/BenchChild/SingBenchChild.csproj b/base/Applications/Benchmarks/SingBench/BenchChild/SingBenchChild.csproj
new file mode 100644
index 0000000..7a6e884
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/BenchChild/SingBenchChild.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>benchchild</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="BenchChild.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Contracts\SingBench.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/SingBench/Contracts/ChannelTestContract.sg b/base/Applications/Benchmarks/SingBench/Contracts/ChannelTestContract.sg
new file mode 100644
index 0000000..4f9447a
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/Contracts/ChannelTestContract.sg
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MemoryContract.sg
+//  Note:   Contract definition for the memory diagnostic module
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Endpoint;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Extending;
+
+namespace Microsoft.Singularity.Applications.Singbench
+{
+    public contract SendTestContract : ExtensionContract
+    {
+        in  message Req(int x);
+        out message Resp(int x);
+
+        out message TestReady();
+
+        override state Start : TestReady! -> ReadyState;
+        state ReadyState : Req? -> Resp! -> ReadyState;
+    }
+
+    public contract BufferTestContract : ExtensionContract
+    {
+        in  message Req(int remain, byte[]! in ExHeap buffer);
+        out message Resp(byte[]! in ExHeap buffer);
+
+        out message BufferReady();
+
+        override state Start : BufferReady! -> ReadyState;
+        state ReadyState : Req? -> Resp! -> ReadyState;
+    }
+}
diff --git a/base/Applications/Benchmarks/SingBench/Contracts/SingBench.Contracts.csproj b/base/Applications/Benchmarks/SingBench/Contracts/SingBench.Contracts.csproj
new file mode 100644
index 0000000..f20c244
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/Contracts/SingBench.Contracts.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>SingBench.Contracts</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ChannelTestContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/SingBench/SingBench.proj b/base/Applications/Benchmarks/SingBench/SingBench.proj
new file mode 100644
index 0000000..e267a9d
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/SingBench.proj
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <ItemGroup>
+    <ProjectReference Include="*\*.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/Benchmarks/SingBench/SingBench/PerfSnap.sg b/base/Applications/Benchmarks/SingBench/SingBench/PerfSnap.sg
new file mode 100644
index 0000000..11eb7ab
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/SingBench/PerfSnap.sg
@@ -0,0 +1,293 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PerfSnap.sg
+//
+//  Note:   Performance measurer for Singularity Benchmark
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Applications.Singbench
+{
+    public struct PerfSnap
+    {
+        // Global options for all instances
+        static bool xmlOutput = false;
+        static bool atRing3   = false;
+
+        private bool disabled;
+        private long begCycleCount;
+        private long endCycleCount;
+        private long begSwitchCount;
+        private long endSwitchCount;
+        private long begInterruptCount;
+        private long endInterruptCount;
+        private long begKernelGcCount;
+        private long endKernelGcCount;
+        private long begProcessGcCount;
+        private long endProcessGcCount;
+        private long iterations;
+        private ulong begAllocatedCount;
+        private ulong begAllocatedBytes;
+        private ulong begFreedCount;
+        private ulong begFreedBytes;
+        private ulong endAllocatedCount;
+        private ulong endAllocatedBytes;
+        private ulong endFreedCount;
+        private ulong endFreedBytes;
+        private ulong begStackGets;
+        private ulong begStackRets;
+        private ulong endStackGets;
+        private ulong endStackRets;
+
+
+        public long Cycles      { get { return endCycleCount - begCycleCount; } }
+        public long Interrupts  { get { return endInterruptCount - begInterruptCount; } }
+        public long Switches    { get { return endSwitchCount - begSwitchCount; } }
+        public long KernelGCs   { get { return endKernelGcCount - begKernelGcCount; } }
+        public long ProcessGCs  { get { return endProcessGcCount - begProcessGcCount; } }
+        public ulong AllocatedCount { get { return endAllocatedCount-begAllocatedCount; } }
+        public ulong AllocatedBytes { get { return endAllocatedBytes-begAllocatedBytes; } }
+        public ulong FreedCount { get { return endFreedCount - begFreedCount; } }
+        public ulong FreedBytes { get { return endFreedBytes - begFreedBytes; } }
+        public ulong StackGets { get { return endStackGets - begStackGets; } }
+        public ulong StackRets { get { return endStackRets - begStackRets; } }
+
+        public void Start()
+        {
+            if (!atRing3) {
+                disabled = Processor.DisableInterrupts();
+                // flush out pending IO interrupts
+                Thread.Yield();
+                Thread.Yield();
+                Thread.Yield();
+                Thread.Yield();
+                Thread.Yield();
+            }
+
+            int collectorCount;
+            long collectorMillis;
+            long collectorBytes;
+            GC.PerformanceCounters(out collectorCount,
+                                   out collectorMillis,
+                                   out collectorBytes);
+
+            ulong stackGets;
+            ulong stackRets;
+            StackService.GetUsageStatistics(out stackGets,
+                                            out stackRets);
+            begStackGets = stackGets;
+            begStackRets = stackRets;
+
+            ulong allocatedCount;
+            ulong allocatedBytes;
+            ulong freedCount;
+            ulong freedBytes;
+            PageTableService.GetUsageStatistics(out allocatedCount,
+                                                out allocatedBytes,
+                                                out freedCount,
+                                                out freedBytes);
+            begAllocatedCount = allocatedCount;
+            begAllocatedBytes = allocatedBytes;
+            begFreedCount = freedCount;
+            begFreedBytes = freedBytes;
+
+            begInterruptCount = ProcessService.GetKernelInterruptCount();
+            begSwitchCount = ProcessService.GetContextSwitchCount();
+            begKernelGcCount = ProcessService.GetKernelGcCount();
+            begProcessGcCount = collectorCount;
+
+#if x64_PERF
+            // Set up for perf counting
+            if (!atRing3) {
+                // Reset the performance counters to what we're interested in.
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.CyclesNotHalted);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchInstructions);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+            } else {
+                // We're not allowed to reset the perf counters, so take note
+                // of their current values; we will subtract from this later.
+                x64_i0 = Processor.ReadPmc(0);
+                x64_i1 = Processor.ReadPmc(1);
+                x64_i2 = Processor.ReadPmc(2);
+                x64_i3 = Processor.ReadPmc(3);
+            }
+#endif
+
+            begCycleCount = unchecked((long)Processor.CycleCount);
+        }
+
+        public void Finish(long iterations)
+        {
+            endCycleCount = unchecked((long)Processor.CycleCount);
+
+#if X64_PERF
+            x64_p0 = Processor.ReadPmc(0);
+            x64_p1 = Processor.ReadPmc(1);
+            x64_p2 = Processor.ReadPmc(2);
+            x64_p3 = Processor.ReadPmc(3);
+#endif
+
+            endInterruptCount = ProcessService.GetKernelInterruptCount();
+            endSwitchCount = ProcessService.GetContextSwitchCount();
+            endKernelGcCount = ProcessService.GetKernelGcCount();
+
+            int collectorCount;
+            long collectorMillis;
+            long collectorBytes;
+            GC.PerformanceCounters(out collectorCount,
+                                   out collectorMillis,
+                                   out collectorBytes);
+            endProcessGcCount = collectorCount;
+
+            ulong allocatedCount;
+            ulong allocatedBytes;
+            ulong freedCount;
+            ulong freedBytes;
+            PageTableService.GetUsageStatistics(out allocatedCount,
+                                                out allocatedBytes,
+                                                out freedCount,
+                                                out freedBytes);
+            endAllocatedCount = allocatedCount;
+            endAllocatedBytes = allocatedBytes;
+            endFreedCount = freedCount;
+            endFreedBytes = freedBytes;
+
+            ulong stackGets;
+            ulong stackRets;
+            StackService.GetUsageStatistics(out stackGets,
+                                            out stackRets);
+            endStackGets = stackGets;
+            endStackRets = stackRets;
+
+            if (!atRing3) {
+                Processor.RestoreInterrupts(disabled);
+            }
+
+            this.iterations = iterations;
+        }
+
+        public void Display(string name)
+        {
+            if (xmlOutput) {
+                DisplayXml(name);
+            } else {
+                DisplayText(name);
+            }
+        }
+
+        private static void WriteXmlValue(string name, long value)
+        {
+            DualWriteLine(
+                String.Format(" <Measurement> <name> {0} </name> <value> {1:d} </value> </Measurement>", name, value)
+                );
+        }
+
+        private static void WriteXmlValue(string name, ulong value)
+        {
+            DualWriteLine(
+                String.Format(" <Measurement> <name> {0} </name> <value> {1:d} </value> </Measurement>", name, value)
+                );
+        }
+
+        private void DisplayXml(string name)
+        {
+            DualWriteLine(
+                String.Format("<Microbenchmark Name=\"{0}\">", name)
+                );
+            WriteXmlValue("CyclesPerIteration", Cycles / iterations);
+            WriteXmlValue("Cycles", Cycles);
+            WriteXmlValue("Iterations", iterations);
+            WriteXmlValue("Switches", Switches);
+            WriteXmlValue("Interrupts", Interrupts);
+            WriteXmlValue("KernelGCs", KernelGCs);
+            WriteXmlValue("ProcessGCs", ProcessGCs);
+            WriteXmlValue("AllocationCount", AllocatedCount);
+            WriteXmlValue("AllocationBytes", AllocatedBytes);
+            WriteXmlValue("FreedCount", FreedCount);
+            WriteXmlValue("FreedBytes", FreedBytes);
+            WriteXmlValue("StackGetCount", StackGets);
+            WriteXmlValue("StackReturnCount", StackRets);
+            DualWriteLine("</Microbenchmark>");
+        }
+
+        private void DisplayText(string name)
+        {
+            DualWriteLine(
+                String.Format("{0,-16} {1,6:d} x{2,8:d} ={3,12:d} " +
+                              "[swi={4,6:d} int={5,3:d} gc={6:d}/{7:d}]",
+                              name,
+                              iterations,
+                              Cycles / iterations,
+                              Cycles,
+                              Switches,
+                              Interrupts,
+                              KernelGCs,
+                              ProcessGCs)
+                );
+
+            if (AllocatedCount > 1 || FreedCount > 1 || StackGets > 1) {
+                DualWriteLine(
+                    string.Format(
+                        "                       " +
+                        "[alloc={0,4:d}/{1,8:x} free={2,4:d}/{3,8:x} " +
+                        "stack={4,4:d}/{5,4:d}]",
+                        AllocatedCount,
+                        AllocatedBytes,
+                        FreedCount,
+                        FreedBytes,
+                        StackGets,
+                        StackRets)
+                    );
+            }
+
+#if x64_PERF
+            if (!atRing3) {
+                // Read off the current MSR values and turn them
+                // into nice labels
+                ulong e0 = Processor.ReadMsr(0xc0010000);
+                ulong e1 = Processor.ReadMsr(0xc0010001);
+                ulong e2 = Processor.ReadMsr(0xc0010002);
+                ulong e3 = Processor.ReadMsr(0xc0010003);
+
+                DualWriteLine(
+                    String.Format("evt: {0,16} {1,16} {2,16} {3,16}",
+                                  EvtSelToString(e0),
+                                  EvtSelToString(e1),
+                                  EvtSelToString(e2),
+                                  EvtSelToString(e3)));
+            } else {
+                // Subtract from the initial perf-counter values to
+                // get the delta we want
+                x64_p0 -= x64_i0;
+                x64_p1 -= x64_i1;
+                x64_p2 -= x64_i2;
+                x64_p3 -= x64_i3;
+            }
+
+            DualWriteLine(
+                String.Format("pmc: {0:d16} {1:d16} {2:d16} {3:d16} {4:d16}\n\n",
+                              Cycles, x64_p0, x64_p1, x64_p2, x64_p3));
+#endif
+        }
+
+        private static void DualWriteLine(string message)
+        {
+            Console.WriteLine(message);
+            DebugStub.WriteLine(message);
+        }
+
+        public static void SetOptions(bool ring3, bool doXmlOutput)
+        {
+            PerfSnap.atRing3   = ring3;
+            PerfSnap.xmlOutput = doXmlOutput;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/SingBench/SingBench/SingBench.sg b/base/Applications/Benchmarks/SingBench/SingBench/SingBench.sg
new file mode 100644
index 0000000..899b93c
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/SingBench/SingBench.sg
@@ -0,0 +1,1434 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SingBench.sg
+//
+//  Note:   Benchmark suite for Singularity primitives
+//
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Endpoint;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Singbench
+{
+    [ConsoleCategory(HelpMessage="Singularity Benchmark Application", DefaultAction=true)]
+    internal sealed class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<MemoryContract.Imp:Start> memoryRef;
+
+        [BoolParameter( "b", Default=false , HelpMessage="Break at start of tests.")]
+        internal bool breakIn;
+
+        [BoolParameter( "n", Default=true , HelpMessage="No GC between tests.")]
+        internal bool allowGC;
+
+        [BoolParameter( "w", Default=false , HelpMessage="Wait for key press between tests.")]
+        internal bool pauseForKeys;
+
+        [BoolParameter( "x", Default=false , HelpMessage="XML output.")]
+        internal bool xmlOutput;
+
+        [LongParameter( "i", Default=10000 , HelpMessage="Iterate tests <n> times.")]
+        internal long iterations;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SingBench.AppMain(this);
+        }
+    }
+
+    public class SingBench
+    {
+        private static bool atRing3;
+
+#if x64_PERF
+        [CLSCompliant(false)]
+        public struct PerfEvtSel
+        {
+            // Bits and Flags
+            public const uint CNT_MASK  = 0xff000000;
+            public const uint INV       = 0x00800000;
+            public const uint EN        = 0x00400000;
+            public const uint INT       = 0x00100000;
+            public const uint PC        = 0x00080000;
+            public const uint E         = 0x00040000;
+            public const uint OS        = 0x00020000;
+            public const uint USR       = 0x00010000;
+            public const uint UNIT_MASK = 0x0000ff00;
+            public const uint SELECTOR  = 0x000000ff;
+
+            // Common setting: Count all, but don't interrupt,
+            public const uint COUNT     = (EN | PC | OS | USR);
+
+            // Selector values.
+            public const uint DtlbL1MissL2Hit                   = 0x45; // Speculative
+            public const uint DtlbL1MissL2Miss                  = 0x46; // Speculative
+            public const uint CyclesNotHalted                   = 0x76;
+            public const uint RequestsToL2Cache                 = 0x7d;
+            public const uint ItlbL1MissL2Hit                   = 0x84;
+            public const uint ItlbL1MissL2Miss                  = 0x85;
+            public const uint RetiredInstructions               = 0xc0;
+            public const uint RetiredBranchInstructions         = 0xc2;
+            public const uint RetiredBranchesMispredicted       = 0xc3;
+            public const uint RetiredBranchesTaken              = 0xc4;
+            public const uint CyclesInterruptsMasked            = 0xcd;
+            public const uint CyclesInterruptsBlocked           = 0xce;
+        }
+
+        public static void Reset(uint pmc, ulong value)
+        {
+            // Clear the event selector.
+            Processor.WriteMsr(0xc0010000 + pmc, 0);
+            // Clear the performance counter.
+            Processor.WriteMsr(0xc0010004 + pmc, 0);
+            // Enable the event selector.
+            Processor.WriteMsr(0xc0010000 + pmc, value);
+        }
+
+        public static string EvtSelToString(ulong value)
+        {
+            switch (value & 0xff) {
+                case PerfEvtSel.DtlbL1MissL2Hit:            return "DTLB_L2_Hit";
+                case PerfEvtSel.DtlbL1MissL2Miss:           return "DTBL_L2_Miss";
+                case PerfEvtSel.CyclesNotHalted:            return "CyclesNotHalted";
+                case PerfEvtSel.RequestsToL2Cache:          return "TLB_L2_Requests";
+                case PerfEvtSel.ItlbL1MissL2Hit:            return "ITLB_L2_Hit";
+                case PerfEvtSel.ItlbL1MissL2Miss:           return "ITLB_L2_Miss";
+                case PerfEvtSel.RetiredInstructions:        return "Retired_Inst.";
+                case PerfEvtSel.RetiredBranchInstructions:  return "Branches";
+                case PerfEvtSel.RetiredBranchesMispredicted:return "Br_Mispredicted";
+                case PerfEvtSel.RetiredBranchesTaken:       return "Br_Taken";
+                case PerfEvtSel.CyclesInterruptsMasked:     return "Ints_Masked (cyc)";
+                case PerfEvtSel.CyclesInterruptsBlocked:    return "Ints_Blocked (cyc)";
+                default:
+                    return String.Format("{0:x16}", value);
+            }
+        }
+
+        private static ulong x64_i0, x64_p0;
+        private static ulong x64_i1, x64_p1;
+        private static ulong x64_i2, x64_p2;
+        private static ulong x64_i3, x64_p3;
+#endif
+
+        private static void DualWriteLine(string message)
+        {
+            Console.WriteLine(message);
+            DebugStub.WriteLine(message);
+        }
+
+        private static int peerIterations;
+        private static AutoResetEvent peerReady;
+        private static AutoResetEvent peerBegin;
+        private static AutoResetEvent peerFinish;
+
+        private static AutoResetEvent waitPerfEvent1;
+        private static AutoResetEvent waitPerfEvent2;
+
+        private static long startWaitPerfClock;
+        private static ulong startCount;
+        private static ulong endCount;
+
+        private static bool allowGC      = false;
+        private static bool pauseForKeys = false;
+        private static bool breakIn      = false;
+
+
+        //////////////////////////////////////////////// CycleCount Read Test.
+        //
+        public static void DoGetCycleCountPerf(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    Processor.GetCycleCount();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("Read CC");
+        }
+
+        /////////////////////////////////////////////////// Interlocked Tests.
+        //
+        public static void DoInterlockedIncrementPerf(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                int test = 0;
+                for (int i = 0; i < iterations; i++) {
+                    Interlocked.Increment(ref test);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("Lock Inc");
+        }
+
+        public static void DoInterlockedExchangeSucceedPerf(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                int test = 0;
+                for (int i = 0; i < iterations; i++) {
+                    Interlocked.CompareExchange(ref test, 0, 0);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("Lock Ex Succ");
+        }
+
+        public static void DoInterlockedExchangeFailPerf(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                int test = 0;
+                for (int i = 0; i < iterations; i++) {
+                    Interlocked.CompareExchange(ref test, 0, 1);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("Lock Ex Fail");
+        }
+
+        ////////////////////////////////////////////// Interrupt Disable Test.
+        //
+        public static void DoDisableIrqPerf(int iterations)
+        {
+            if (atRing3) {
+                // Skip this test; it would cause us to fault.
+                return;
+            }
+
+            PerfSnap snap = new PerfSnap();
+
+            bool saved = Processor.DisableInterrupts();
+            System.Diagnostics.Debug.Assert(saved == true);
+
+            try {
+                snap.Start();
+                for (int i = 0; i < iterations; i++) {
+                    Processor.RestoreInterrupts(saved);
+                    saved = Processor.DisableInterrupts();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+                Processor.RestoreInterrupts(saved);
+            }
+
+            snap.Display("Irq SVE/RSTR");
+        }
+
+        //////////////////////////////////////////////////////////// ABI Test.
+        //
+        public static void DoAbiPerf(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    Thread.NativeNoOp();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+            snap.Display("Nothing");
+
+            if (breakIn) {
+                DebugStub.Break();
+            }
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    // This ought to be approximately a minimal ABI call
+                    // Thread.SpinWait(0);
+                    // XXX Thread.SpinWait doesn't traverse ABI for the time
+                    // being.
+                    //DebugStub.Break();
+                    ProcessService.GetCyclesPerSecond();
+                    //DebugStub.Break();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("ABI Call");
+
+#if false
+            ulong min = UInt64.MaxValue;
+            ulong max = UInt64.MinValue;
+            ulong beg = UInt64.MinValue;
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    // This ought to be approximately a minimal ABI call
+                    // Thread.SpinWait(0);
+                    // XXX Thread.SpinWait doesn't traverse ABI for the time
+                    // being.
+                    beg = Processor.CycleCount;
+                    ProcessService.GetCyclesPerSecond();
+                    beg = Processor.CycleCount - beg;
+                    if (max < beg) {
+                        max = beg;
+                    }
+                    if (min > beg) {
+                        min = beg;
+                    }
+                    if (i == 50) {
+                        max = beg;
+                    }
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("ABI Call 2");
+            Console.WriteLine("beg:{0,12:d}, min:{1,12:d}, max:{2,12:d}",
+                              beg, min, max);
+#endif
+            ProcessService.GetCyclesPerSecond();
+        }
+
+        /////////////////////////////////////////////////// DateTime.Now.
+        //
+        public static void DoDateTimeNow(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+            DateTime now = new DateTime();
+
+            snap.Start();
+            for (int i = 0; i < iterations; i++) {
+                now = DateTime.Now;
+            }
+            snap.Finish(iterations);
+            snap.Display("DateTime.Now");
+
+            if (now.Ticks == 0) {
+                Console.WriteLine("It's the end of the world as we know it.");
+            }
+        }
+
+        /////////////////////////////////////////////////// Thread Yield Test.
+        //
+        public static void DoYieldPerf(int iterations)
+        {
+            ulong before, after;
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    Thread.Yield();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("Yield");
+
+            Console.WriteLine("Measuring Thread.Yield() breakdown");
+            for (int i = 0; i < iterations; i++) {
+                ProcessService.Waypoint0();
+                Thread.Yield();
+                ProcessService.WaypointDone();
+                if (i == 512) {
+                    ProcessService.WaypointDump();
+                }
+            }
+        }
+
+        /////////////////////////////////////////////////////// Wait/Set Test.
+        //
+        private static void WaitPerfThread()
+        {
+            int iterations = peerIterations;
+            peerReady.Set();
+
+            for (int i = 0; i < iterations; i++) {
+                waitPerfEvent1.WaitOne();
+                //DebugStub.Break();
+                waitPerfEvent2.Set();
+            }
+        }
+
+        public static void DoWaitPerf(int iterations)
+        {
+            int doit = iterations / 2;
+            peerIterations = doit;
+            waitPerfEvent1  = new AutoResetEvent(false);
+            waitPerfEvent2  = new AutoResetEvent(false);
+
+            Thread peer = new Thread(new ThreadStart(WaitPerfThread));
+            peer.Start();
+            peerReady.WaitOne();
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < doit; i++) {
+                    //DebugStub.Break();
+                    waitPerfEvent1.Set();
+                    waitPerfEvent2.WaitOne();
+                    //DebugStub.Break();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            peer.Join();
+            snap.Display("Wait/Set");
+        }
+
+        /////////////////////////////////////////// Receive Performance Tests.
+        //
+        public contract ReceivePerfTest
+        {
+            in  message Req(int x);
+            out message Resp(int x);
+
+            state Start: Req? -> Resp! -> Start;
+        }
+
+        private static TRef<ReceivePerfTest.Exp:Start> receivePerfEndpoint;
+
+        private static void ReceivePerfThread()
+        {
+            ReceivePerfTest.Exp e1 = receivePerfEndpoint.Acquire();
+            int arg;
+
+            peerReady.Set();
+
+            for (;;) {
+                e1.RecvReq(out arg);
+                if (arg == -1) {
+                    break;
+                }
+                e1.SendResp(arg);
+            }
+
+            delete e1;
+        }
+
+        public static void DoReceivePerf(int iterations)
+        {
+            int doit = iterations / 2;
+
+            // Make a new channel.
+            ReceivePerfTest.Imp! e2;
+            ReceivePerfTest.Exp! e1;
+            ReceivePerfTest.NewChannel(out e2, out e1);
+
+            // Transfer ownership of endpoint to peer thread.
+            receivePerfEndpoint = new TRef<ReceivePerfTest.Exp:Start>(e1);
+
+            // Create our peer thread.
+            Thread peer = new Thread(new ThreadStart(ReceivePerfThread));
+            peer.Start();
+            peerReady.WaitOne();
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+
+            if (breakIn) { 
+                DebugStub.Break();
+            }
+
+            try {
+                int arg;
+                for (int i = 0; i < doit; i++) {
+                    arg = i;
+                    e2.SendReq(arg);
+                    e2.RecvResp(out arg);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            e2.SendReq(-1);
+            delete e2;
+            peer.Join();
+
+            snap.Display("Send/Recv");
+        }
+
+        ////////////////////////////// Receive Performance Tests with buffer
+        //
+        public contract ReceivePerf2Test
+        {
+            in  message Req(int remain, byte[]! in ExHeap buffer);
+            out message Resp(byte[]! in ExHeap buffer);
+
+            state Start: Req? -> Resp! -> Start;
+        }
+
+        private static TRef<ReceivePerf2Test.Exp:Start> receivePerf2Endpoint;
+
+        private static void ReceivePerf2Thread()
+        {
+            ReceivePerf2Test.Exp e1 = receivePerf2Endpoint.Acquire();
+            int arg;
+            byte[]! in ExHeap buffer;
+
+            peerReady.Set();
+
+            for (;;) {
+                e1.RecvReq(out arg, out buffer);
+                e1.SendResp(buffer);
+                if (arg == 0) {
+                    break;
+                }
+            }
+
+            delete e1;
+        }
+
+        public static void DoReceivePerf2(int iterations, int messageBytes)
+        {
+            // Make a new channel.
+            ReceivePerf2Test.Imp! e2;
+            ReceivePerf2Test.Exp! e1;
+            ReceivePerf2Test.NewChannel(out e2, out e1);
+
+            // Transfer ownership of endpoint to peer thread.
+            receivePerf2Endpoint = new TRef<ReceivePerf2Test.Exp:Start>(e1);
+
+            // Create our peer thread.
+            Thread peer = new Thread(new ThreadStart(ReceivePerf2Thread));
+            peer.Start();
+            peerReady.WaitOne();
+
+            byte[]! in ExHeap buffer = new [ExHeap] byte[messageBytes];
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+
+            if (breakIn) { 
+                DebugStub.Break();
+            }
+
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    e2.SendReq(iterations - i - 1, buffer);
+                    e2.RecvResp(out buffer);
+                }
+            }
+            finally {
+                // Factor of two for one-sided send-receive only
+                snap.Finish(2 * iterations);
+                delete buffer;
+            }
+
+            delete e2;
+            peer.Join();
+
+            if (messageBytes < 1024) {
+                snap.Display(String.Format("Send/RecvB-{0}", messageBytes));
+            }
+            else {
+                snap.Display(String.Format("Send/RecvB-{0}K",
+                                           messageBytes / 1024));
+            }
+        }
+
+        /////////////////////////////////////////// Child-Receive performance tests
+        //
+        public static void DoChildReceivePerf(int iterations)
+        {
+            int doit = iterations / 2;
+
+            // Make a new channel.
+            SendTestContract.Imp! childImp;
+            SendTestContract.Exp! childExp;
+            SendTestContract.NewChannel(out childImp, out childExp);
+
+            // Start up our child
+            string[] args = new string[3];
+            args[0] = "BenchChild.x86";
+            args[1] = "-where";
+            args[2] = "!";
+            Process child = new Process(args, (Endpoint * in ExHeap)childExp);
+            
+            // set the where parameter to true 
+            ParameterCode code; 
+            code = child.SetStartupBoolArg(0, true); 
+            if (code != ParameterCode.Success){ 
+                Console.WriteLine("unable to set bool index 0. error={0}", code); 
+                delete childImp; 
+                return; 
+            }
+            
+            child.Start();
+
+            childImp.RecvTestReady();
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                int arg;
+                for (int i = 0; i < doit; i++) {
+                    arg = i;
+                    childImp.SendReq(arg);
+                    childImp.RecvResp(out arg);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            childImp.SendReq(-1);
+            delete childImp;
+            child.Join();
+
+            snap.Display("CHILD S/R");
+        }
+
+        ////////////////////////////// Child send-receive performance test
+        //
+        public static void DoChildReceivePerf2(int iterations, int messageBytes)
+        {
+            // Make a new channel.
+            BufferTestContract.Imp! childImp;
+            BufferTestContract.Exp! childExp;
+            BufferTestContract.NewChannel(out childImp, out childExp);
+
+            // Start up our child
+            string[] args = new string[2];
+            args[0] = "BenchChild.x86";
+            args[1] = "!";
+            Process child = new Process(args, (Endpoint * in ExHeap)childExp);
+            child.Start();
+
+            childImp.RecvBufferReady();
+
+            byte[]! in ExHeap buffer = new [ExHeap] byte[messageBytes];
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    childImp.SendReq(iterations - i - 1, buffer);
+                    childImp.RecvResp(out buffer);
+                }
+            }
+            finally {
+                // Factor of two for one-sided send-receive only
+                snap.Finish(2 * iterations);
+                delete buffer;
+            }
+
+            delete childImp;
+            child.Join();
+
+            if (messageBytes < 1024) {
+                snap.Display(String.Format("Child S/RB-{0}", messageBytes));
+            }
+            else {
+                snap.Display(String.Format("Child S/RB-{0}K",
+                                           messageBytes / 1024));
+            }
+        }
+
+        //////////////////////////////////////////// Switch Performance Tests.
+        //
+        public contract SwitchPerfTest
+        {
+            in  message Req(int x);
+            out message Resp(int x);
+
+            state Start: Req? -> Resp! -> Start;
+        }
+
+        private static TRef<SwitchPerfTest.Exp:Start> switchPerfEndpoint;
+
+        public static void SwitchPerfThread()
+        {
+            SwitchPerfTest.Exp e = switchPerfEndpoint.Acquire();
+            ESet<SwitchPerfTest.Exp:Start> s = new ESet<SwitchPerfTest.Exp:Start>();
+            s.Add(e);
+
+            peerReady.Set();
+
+            for (int i = 0; i != -1;) {
+                switch receive
+                {
+                    case ep.Req(arg) in s:
+                        i = arg;
+                        if (i != -1) {
+                            ep.SendResp(i);
+                        }
+                        s.Add(ep);
+                        break;
+                    case ep.ChannelClosed() in s:
+                        s.Add(ep);
+                        break;
+                }
+            }
+            s.Dispose();
+        }
+
+        public static void DoSwitchPerf(int iterations)
+        {
+            int doit = iterations / 2;
+
+            // Make a new channel.
+            SwitchPerfTest.Imp! e;
+            SwitchPerfTest.Exp! p;
+            SwitchPerfTest.NewChannel(out e, out p);
+
+            // Transfer ownership of endpoint to peer thread.
+            switchPerfEndpoint = new TRef<SwitchPerfTest.Exp:Start>(p);
+
+            // Create our peer thread.
+            Thread peer = new Thread(new ThreadStart(SwitchPerfThread));
+            peer.Start();
+            peerReady.WaitOne();
+
+            if (breakIn) {
+                DebugStub.Break();
+            }
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+
+            ESet<SwitchPerfTest.Imp:Start> s = new ESet<SwitchPerfTest.Imp:Start>();
+
+            try {
+                e.SendReq(0);
+                s.Add(e);
+                for (int i = 0; i < doit; i++) {
+                    switch receive
+                    {
+                        case ep.Resp(arg) in s:
+                            i = arg;
+                            if (i == doit -1) {
+                                ep.SendReq(-1);
+                            }
+                            else {
+                                ep.SendReq(i + 1);
+                            }
+                            s.Add(ep);
+                            break;
+                        case ep.ChannelClosed() in s:
+                            delete ep;
+                            break;
+                    }
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+                s.Dispose();
+            }
+
+            peer.Join();
+
+            snap.Display("Send/Switch");
+        }
+
+        //////////////////////////////////////////// Create Directory Channel.
+        //
+        public static void DoPageAllocPerf(int iterations)
+        {
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    UIntPtr addr = PageTableService.Allocate(0x1000);
+                    PageTableService.Free(addr, 0x1000);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("PageAlloc");
+        }
+
+        ////////////////////////////////////////////////////// Create Channel.
+        //
+        public static void DoChannelCreatePerf(int iterations)
+        {
+            // Make a new channel.
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    SwitchPerfTest.Imp! e2;
+                    SwitchPerfTest.Exp! e1;
+                    SwitchPerfTest.NewChannel(out e2, out e1);
+                    delete e1;
+                    delete e2;
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("CreateChan");
+        }
+
+        //////////////////////////////////////////// Create Directory Channel.
+        //
+        public static void DoNamespaceChannelPerf(int iterations)
+        {
+            // Make a new channel.
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    // get NS endpoint
+                    DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+                    delete ns;
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+
+            snap.Display("NameChan");
+        }
+
+        /////////////////////////////////////////// Connect Through Directory.
+        //
+        public static void DoBindPerf(int iterations)
+        {
+            // Make a new channel.
+            PerfSnap snap = new PerfSnap();
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    MemoryContract.Exp! exp;
+                    MemoryContract.Imp! imp;
+                    MemoryContract.NewChannel(out imp, out exp);
+                    ErrorCode error;
+                    try {
+                        SdsUtils.Bind(MemoryContract.ModuleName, ns, exp, out error);
+                    }
+                    finally {
+                    }
+                    delete imp;
+                }
+            }
+            finally {
+                delete ns;
+                snap.Finish(iterations);
+            }
+            snap.Display("NameBind");
+        }
+
+        /////////////////////////////////////////// TRef acquire/release test.
+        //
+        public static void DoTRefPerf(int iterations)
+        {
+            // Make a new channel.
+            PerfSnap snap = new PerfSnap();
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            TRef<DirectoryServiceContract.Imp:Start> t = new TRef<DirectoryServiceContract.Imp:Start>(ns);
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                DirectoryServiceContract.Imp n = t.Acquire();
+                t.Release(n);
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+            snap.Display("Acquire/rel");
+        }
+
+        //////////////////////////////////////////////////////////////////////
+
+        private contract SelectTest {
+            in message A();
+            in message B();
+            in message C();
+            out message Ack();
+
+            state Start: one {
+                A? -> Ack! -> Start;
+                B? -> Ack! -> Start;
+                C? -> Ack! -> Start;
+            }
+        }
+
+        private static TRef<SelectTest.Imp:Start>[] impEndpoints;
+
+        const int NSELECT=99; // must be a multiple of 3
+        const int SELECT_ITERATIONS = 1000;
+
+        public static void SelectThread()
+        {
+            for (int i = 0; i < SELECT_ITERATIONS; i++) {
+                for (int j = 0; j < NSELECT; j+=3) {
+                    SelectTest.Imp imp = ((!)impEndpoints[j]).Acquire();
+
+                    imp.SendA();
+
+                    ((!)impEndpoints[j]).Release(imp);
+                }
+
+                for (int j = 1; j < NSELECT; j+=3) {
+                    SelectTest.Imp imp = ((!)impEndpoints[j]).Acquire();
+
+                    imp.SendB();
+
+                    ((!)impEndpoints[j]).Release(imp);
+                }
+
+                for (int j = 2; j < NSELECT; j+=3) {
+                    SelectTest.Imp imp = ((!)impEndpoints[j]).Acquire();
+
+                    imp.SendC();
+
+                    ((!)impEndpoints[j]).Release(imp);
+                }
+
+                for (int j = 0; j < NSELECT; j++) {
+                    SelectTest.Imp imp = ((!)impEndpoints[j]).Acquire();
+
+                    imp.RecvAck();
+
+                    ((!)impEndpoints[j]).Release(imp);
+                }
+            }
+
+            for (int i = 0; i < NSELECT; i++) {
+                SelectTest.Imp ep = ((!)impEndpoints[i]).Acquire();
+                delete ep;
+            }
+        }
+
+        private static void ActuallySelect(SelectTest.Exp! a,
+                                           SelectTest.Exp! b,
+                                           SelectTest.Exp! c,
+                                           int expect,
+                                           ref bool failed)
+        {
+            int got;
+            switch receive {
+                case c.RecvA():
+                    c.SendAck();
+                    got = 0;
+                    break;
+
+                case a.RecvB() && b.RecvC():
+                    a.SendAck();
+                    b.SendAck();
+                    got = 1;
+                    break;
+
+                case a.RecvA() && b.RecvC():
+                    a.SendAck();
+                    b.SendAck();
+                    got = 2;
+                    break;
+
+                case unsatisfiable:
+                    got = -1;
+                    break;
+            }
+
+            //Console.WriteLine("[1] expected {0}, got {1}", expect, got);
+            if (expect != got) {
+                failed = true;
+            }
+        }
+
+        public static int DoSelectB()
+        {
+            TRef<SelectTest.Exp:Start>[] expEndpoints = new TRef<SelectTest.Exp:Start>[NSELECT];
+            impEndpoints = new TRef<SelectTest.Imp:Start> [NSELECT];
+
+            for (int i = 0; i < NSELECT; i++) {
+                SelectTest.Imp! imp;
+                SelectTest.Exp! exp;
+                SelectTest.NewChannel(out imp, out exp);
+                expEndpoints[i] = new TRef<SelectTest.Exp:Start>(exp);
+                impEndpoints[i] = new TRef<SelectTest.Imp:Start>(imp);
+            }
+
+            Thread t1 = new Thread(new ThreadStart(SelectThread));
+            t1.Start();
+
+            bool failed = false;
+            for (int i = 0; i < SELECT_ITERATIONS; i++) {
+                for(int j = 0; j < NSELECT-2; j++) {
+                    SelectTest.Exp a = ((!)expEndpoints[j+0]).Acquire();
+                    SelectTest.Exp b = ((!)expEndpoints[j+1]).Acquire();
+                    SelectTest.Exp c = ((!)expEndpoints[j+2]).Acquire();
+
+                    ActuallySelect(a, b, c, 0, ref failed);
+
+                    ((!)expEndpoints[j+0]).Release(a);
+                    ((!)expEndpoints[j+1]).Release(b);
+                    ((!)expEndpoints[j+2]).Release(c);
+                }
+            }
+
+            if (failed) {
+                Console.WriteLine("[1] Done (FAILED).");
+                return 1;
+            }
+            else {
+                Console.WriteLine("[1] Done (Success).");
+                return 0;
+            }
+        }
+
+        private static void ActuallySelect(ESet<SelectTest.Exp:Start> eset,
+                                           int expect,
+                                           ref bool failed)
+        {
+            if (eset == null) return;
+
+            int got;
+            switch receive {
+                case a.RecvA() in eset:
+                    got = 0;
+                    a.SendAck();
+                    eset.Add(a);
+                    break;
+
+                case b.RecvB() in eset:
+                    got = 1;
+                    b.SendAck();
+                    eset.Add(b);
+                    break;
+
+                case c.RecvC() in eset:
+                    got = 2;
+                    c.SendAck();
+                    eset.Add(c);
+                    break;
+
+                case unsatisfiable:
+                    got = -1;
+                    break;
+            }
+
+            //            Console.WriteLine("[1] expected {0}, got {1}", expect, got);
+            if (expect != got) {
+                //Console.WriteLine("[1] expected {0}, got {1}", expect, got);
+                failed = true;
+            }
+        }
+
+        public static int DoSelectSet()
+        {
+            int i;
+
+            Console.WriteLine("Measuring performance of set select ...");
+
+            impEndpoints = new TRef<SelectTest.Imp:Start> [NSELECT];
+
+            ESet<SelectTest.Exp:Start> eset = new ESet<SelectTest.Exp:Start>();
+
+            for (i = 0; i < NSELECT; i++) {
+                SelectTest.Imp! imp;
+                SelectTest.Exp! exp;
+                SelectTest.NewChannel(out imp, out exp);
+                impEndpoints[i] = new TRef<SelectTest.Imp:Start>(imp);
+
+                eset.Add(exp);
+            }
+
+            Console.WriteLine("  Created set of {0} endpoints", NSELECT);
+
+            Thread t1 = new Thread(new ThreadStart(SelectThread));
+
+            Console.WriteLine("  Starting client thread");
+            t1.Start();
+
+            bool failed = false;
+
+            Console.WriteLine("  Starting server loop - {0} iterations", SELECT_ITERATIONS);
+            for (i = 0 ; i < SELECT_ITERATIONS; i++) {
+                ActuallySelect(eset, 0, ref failed);
+                ActuallySelect(eset, 0, ref failed);
+                ActuallySelect(eset, 0, ref failed);
+                ActuallySelect(eset, 1, ref failed);
+                ActuallySelect(eset, 2, ref failed);
+                ActuallySelect(eset, 0, ref failed);
+                ActuallySelect(eset, 2, ref failed);
+                ActuallySelect(eset, 0, ref failed);
+                ActuallySelect(eset, 2, ref failed);
+                ActuallySelect(eset, 0, ref failed);
+                ActuallySelect(eset, 1, ref failed);
+                ActuallySelect(eset, 2, ref failed);
+                // ActuallySelect(eset, -1, ref failed);
+            }
+            eset.Dispose();
+            if (failed) {
+                Console.WriteLine("[1] Done (FAILED).");
+                return 1;
+            }
+            else {
+                Console.WriteLine("[1] Done (Success).");
+                return 0;
+            }
+        }
+
+        //////////////////////////////////////////// Switch Performance Tests.
+        //
+        public static void ChildThread()
+        {
+        }
+
+        public static void DoThreadPerf(int iterations)
+        {
+            ThreadStart start = new ThreadStart(ChildThread);
+
+            if (breakIn) {
+                DebugStub.Break();
+            }
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    Thread peer = new Thread(start);
+                    peer.Start();
+                    peer.Join();
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+            snap.Display("CreateThread");
+        }
+
+        ///////////////////////////////////////////////// Process Create Test.
+        //
+        public static void DoCreateProcess(int iterations)
+        {
+            ulong baseline = 0;
+            ulong created = 0;
+            ulong started = 0;
+            ulong exited = 0;
+            Process[] process = new Process[iterations];
+
+            string[] args = new string[2];
+            args[0] = "testpe.x86";
+            args[1] = "!"; // Special flag to not notify debugger.
+
+            PerfSnap snap = new PerfSnap();
+
+            snap.Start();
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    baseline = Processor.CycleCount;
+
+                    //
+                    // Time process creation.
+                    //
+                    process[i] = new Process(args);
+                    created = Processor.CycleCount;
+
+                    //
+                    // Time process start.
+                    //
+                    ((!)process[i]).Start();
+                    started = Processor.CycleCount;
+
+                    //
+                    // Time process execution.
+                    //
+                    ((!)process[i]).Join();
+                    exited = Processor.CycleCount;
+                }
+            }
+            finally {
+                snap.Finish(iterations);
+            }
+            snap.Display("CreateProc");
+
+            for (int i = 0; i < iterations; i++) {
+                if (process[i] != null) {
+                    ((!)process[i]).Dispose(true);
+                }
+            }
+
+            //
+            // Tell the world.
+            //
+            DualWriteLine(String.Format("  Tested process: {0}", args[0]));
+            DualWriteLine(String.Format("    Create process: {0,15:d} cycles", created - baseline));
+            DualWriteLine(String.Format("    Start process:  {0,15:d} cycles", started - created));
+            DualWriteLine(String.Format("    Run process:    {0,15:d} cycles", exited - started));
+            DualWriteLine(String.Format("    Total:          {0,15:d} cycles", exited - baseline));
+            DualWriteLine(String.Format("    Process.Create: {0,15:d} cycles", started - baseline));
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        public static int GetTrace()
+        {
+            Tracing.LogEntry * lstart;
+            Tracing.LogEntry * llimit;
+            Tracing.LogEntry ** lhead;
+            byte * tstart;
+            byte * tlimit;
+            byte ** thead;
+
+            Tracing.GetTracingHeaders(out lstart, out llimit, out lhead,
+                                      out tstart, out tlimit, out thead);
+            Console.WriteLine("Log:  {0:X} {1:X}, {2:X}, {3:X}",
+                              (UIntPtr)lstart, (UIntPtr)llimit, (UIntPtr)lhead, (UIntPtr)(*lhead));
+            Console.WriteLine("Text: {0:X} {1:X}, {2:X}, {3:X}",
+                              (UIntPtr)tstart, (UIntPtr)tlimit, (UIntPtr)thead, (UIntPtr)(*thead));
+            return 0;
+        }
+
+        public static void ClearEnvironment(MemoryContract.Imp:ReadyState! imp)
+        {
+            if (allowGC) {
+#if false
+                long nothing;
+                // We don't do this for now because we can't
+                // guarantee the concurrent GC running in the
+                // kernel has finished.
+                imp.SendCollectGarbage();
+                imp.RecvMemory(out nothing);
+#endif
+                GC.Collect();
+            }
+        }
+
+        public static void Pause()
+        {
+            if (pauseForKeys) {
+                Console.WriteLine("Press any key to continue.");
+                Console.Read();
+            }
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            int iterations = (int) config.iterations;
+
+            // Temporaries for command-line parsing
+            bool xmlOutput = config.xmlOutput;
+            allowGC = config.allowGC;
+            pauseForKeys = config.pauseForKeys;
+            breakIn = config.breakIn; 
+            
+            if (Processor.AtKernelPrivilege()) {
+                atRing3 = false;
+                DualWriteLine("Singbench running at KERNEL privilege");
+            } else {
+                atRing3 = true;
+                DualWriteLine("Singbench running at USER privilege");
+            }
+
+            peerReady = new AutoResetEvent(false);
+            peerBegin = new AutoResetEvent(false);
+            peerFinish = new AutoResetEvent(false);
+
+            MemoryContract.Imp impMem = config.memoryRef.Acquire(); 
+            if (impMem == null) {
+                throw new ApplicationException("Error: Unable to bind to " +
+                                               MemoryContract.ModuleName);
+            }
+
+            impMem.RecvReady(); 
+            
+            PerfSnap.SetOptions(atRing3, xmlOutput);
+
+            GetTrace();
+
+            Console.WriteLine("Benchmarks: entered");
+
+            try {
+                ClearEnvironment(impMem);
+                DoGetCycleCountPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoInterlockedIncrementPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoInterlockedExchangeSucceedPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoInterlockedExchangeFailPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoDisableIrqPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoAbiPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoDateTimeNow(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoYieldPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoWaitPerf(1000);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoReceivePerf(1000);
+                Pause();
+
+                for (int i = 1; i <= 65536; i *= 2) {
+                    ClearEnvironment(impMem);
+                    DoReceivePerf2(iterations, i);
+                Pause();
+                }
+
+                // Child-channel tests
+                ClearEnvironment(impMem);
+                DoChildReceivePerf(1000);
+                Pause();
+
+
+                for (int i = 1; i <= 65536; i *= 2) {
+                    ClearEnvironment(impMem);
+                    DoChildReceivePerf2(iterations, i);
+                Pause();
+                }
+
+                ClearEnvironment(impMem);
+                DoSwitchPerf(1000);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoPageAllocPerf(1000);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoThreadPerf(100);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoChannelCreatePerf(1000);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoNamespaceChannelPerf(100);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoTRefPerf(iterations);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoBindPerf(1000);
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoCreateProcess(10);
+
+#if false
+                Pause();
+                // select receive code currently explodes with a null pattern
+                //DoChannelPerf(1000, false);
+                // Pause();
+
+                Console.WriteLine("Skipping select recv test");
+                //DoChannelPerf(1000, true);
+                // Pause();
+                Console.WriteLine("Skipping select recv / alloc test");
+
+                //DoSelectSet();
+                // Pause();
+                Console.WriteLine("Skipping select set test");
+
+                ClearEnvironment(impMem);
+                DoSelectB();
+                Pause();
+
+                ClearEnvironment(impMem);
+                DoSelectSet();
+#endif
+
+            } catch (Exception e) {
+                Console.WriteLine("Caught {0}", e.Message);
+                // How do I work out where an exception was thrown from these days?
+                //Console.WriteLine(e.StackTrace);
+                delete impMem;
+                return 1;
+            }
+            delete impMem;
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/SingBench/SingBench/SingBenchApp.csproj b/base/Applications/Benchmarks/SingBench/SingBench/SingBenchApp.csproj
new file mode 100644
index 0000000..d4dbf6a
--- /dev/null
+++ b/base/Applications/Benchmarks/SingBench/SingBench/SingBenchApp.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>singbench</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="PerfSnap.sg" />
+    <Compile Include="SingBench.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="..\Contracts\SingBench.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/README.txt b/base/Applications/Benchmarks/SpecWeb99/webfiles/README.txt
new file mode 100644
index 0000000..ffe575c
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/README.txt
@@ -0,0 +1,29 @@
+From: Mark Aiken
+Sent: Sunday, October 16, 2005 4:19 PM
+To: Chris Hawblitzel
+Subject: Running SPECweb
+
+Here is how to run webfiles:
+
+On Windows:
+in Applications\Benchmarks\SpecWeb99\webfiles type
+"msb"
+
+On Singularity:
+
+First run:
+- "mkfs /dev/vol2"
+- "fsmount /dev/vol2 /fs -n" [no caching]
+- "wafgen99 -v 10 /fs" [Generates lots of files]
+- "fsunmount"
+- reboot to clear the log.
+
+Second boot:
+- "fsmount /dev/vol2 /fs"
+- "webfiles -r:60"
+
+Alternatively, to run an fixed benchmark size, use the -f:X, forced
+iteration, parameter:
+- "webfiles -f:20000"
+
+
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/random.cs b/base/Applications/Benchmarks/SpecWeb99/webfiles/random.cs
new file mode 100644
index 0000000..b386e31
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/random.cs
@@ -0,0 +1,355 @@
+#define NO_ZIPF_SPIKE
+
+/*
+ *  (C)1997 Standard Performance Evaluation Corporation (SPEC)
+ *
+ *  This suite contains code acquired from several sources who
+ *  understand and agree with SPEC's goal of creating fair and
+ *  objective benchmarks to measure computer performance.
+ *
+ *  This copyright notice is placed here only to protect SPEC in the
+ *  event the source is misused in any manner that is contrary to
+ *  the spirit, the goals and the intent of SPEC.
+ *
+ *  The source code is provided to the user or company under the
+ *  license agreement for the SPEC Benchmark Suite for this suite.
+ */
+
+/*****************************************************************
+ *                                                               *
+ *  Copyright 1991,1992  Legato Systems, Inc.                *
+ *  Copyright 1991,1992  Auspex Systems, Inc.                *
+ *  Copyright 1991,1992  Data General Corporation            *
+ *  Copyright 1991,1992  Digital Equipment Corporation       *
+ *  Copyright 1991,1992  Interphase Corporation              *
+ *  Copyright 1991,1992  Sun Microsystems, Inc.              *
+ *                                                               *
+ *****************************************************************/
+
+/*
+ * ---------------------- laddis_c_rnd.c ---------------------
+ *
+ *      Random number generator.
+ *
+ *.Exported_routines
+ *      double  Spec_random  (RandomState *theState);
+ *      long    Spec_nrandom (RandomState *theState);
+ *      void    Spec_srandom (RandomState *theState, int seed);
+ *
+ *.Local_routines
+ *      None
+ *
+ *.Revision_History
+ *  06-Nov-05   Convert to Sing#
+ *  24-May-97   Chan-Nui        Re-write to make thread-safe
+ *  28-Nov-91   Teelucksingh    ANSI C
+ *  01-Aug-91   Wiryaman    laddis_srandom() and laddis_random()whee
+ *                  now use spec_srand() and spec_rand()
+ *                  instead of srandom() and random().
+ *      17-Apr-91       Wittle      Created.
+ */
+
+/*
+ * Here's the source for the random number generator that SPEC uses.
+ * The function to be called is "spec_rand" which returns an integer
+ * between 1 and MAX_INT-1.
+ *
+ */
+
+
+/*****************************************************************************
+ * UNIFORM Distribution                                                      *
+ *****************************************************************************/
+using System;
+using Singularity.Application.SPECWeb99;
+
+//using Microsoft.Singularity.Math;
+//using Microsoft.Singularity;
+//using Microsoft.Singularity.Directory;
+//using Microsoft.Singularity.V1.Services;
+//using Microsoft.Singularity.Io;
+#if SINGULARITY
+using Microsoft.Contracts;
+#endif
+
+namespace Singularity.Application.SPECWeb99.WebFiles
+{
+    public class Random
+    {
+        public const int A_MULTIPLIER = 16807;
+        public const int M_MODULUS    = 2147483647; /* (2**31)-1 */
+        public const int Q_QUOTIENT   = 127773;     /* 2147483647 / 16807 */
+        public const int R_REMAINDER  = 2836;       /* 2147483647 % 16807 */
+        /*
+        * Compute the next random number.
+        */
+        public class RandomState
+        {
+            public int val;
+
+            public RandomState(int val)
+            {
+                this.val = val;
+            }
+        }
+
+        public class ZipfState
+        {
+            public RandomState rstate;
+            public int size;
+            public double []table;
+
+#if SINGULARITY
+            [NotDelayed]
+#endif
+            public ZipfState (RandomState rstate, int size)
+            {
+                this.size   = size;
+                this.rstate = rstate;
+                table= new double[size+1];
+                if (table == null) {
+                    Console.WriteLine("ZipfState constructor: can't create {0} entries for table",
+                                       size+1);
+                }
+            }
+        } // ZipfState
+
+
+#if STATIC_NORMAL_DIST
+        public class NormalState {
+            public RandomState rstate;
+            public int size;
+            public int []table;
+        };
+#else
+        public class NormalState {
+            public RandomState rstate;
+            public double mean, stddev, y2;
+            public bool use_last;
+        };
+#endif
+
+        public double Spec_random(RandomState /*!*/ theState)
+        /* See "Random Number Generators: Good Ones Are Hard To Find", */
+        /*     Park & Miller, CACM 31#10 October 1988 pages 1192-1201. */
+        /***********************************************************/
+        /* THIS IMPLEMENTATION REQUIRES AT LEAST 32 BIT INTEGERS ! */
+        /***********************************************************/
+        {
+            int lo;
+            int hi;
+            int test;
+
+            hi = theState.val / Q_QUOTIENT;
+            lo = theState.val % Q_QUOTIENT;
+            test = A_MULTIPLIER * lo - R_REMAINDER * hi;
+            if (test > 0) {
+                theState.val = test;
+            } else {
+                theState.val = test + M_MODULUS;
+            }
+            return((float) theState.val / M_MODULUS);
+        }
+
+        /*
+        * Seed the random number generator.
+        */
+        public void Spec_srandom( RandomState /*!*/ theState, int seed ) {
+            theState.val = seed;
+        }
+
+        /*
+        * Returns a random number.
+        */
+        public int Spec_nrandom( RandomState/*!*/ theState ) {
+            Spec_random(theState);
+            return(theState.val);
+        }
+
+        /*****************************************************************************
+        * ZIPF Distribution                                                         *
+        *****************************************************************************/
+
+        public ZipfState spec_zipf_setup(RandomState rstate, int size, double Z)
+        {
+            int     i;
+            double zipf_sum;
+
+            ZipfState theState = new ZipfState(rstate,  size);
+            if (theState == null) return null;
+
+            /* compute zipf values for samples 1-n */
+            for (i = 1; i <= size; i++) {
+                theState.table[i] = Math.Pow(((double)1.0/((double)i)), Z);
+                //theState.table[i] = 1;   // SPL TOTAL HACK until POW works!!
+            }
+
+            /* sum the values so we can compute probabilities. */
+            /* at the same time, make the values cumulative */
+            zipf_sum = 0.0;
+            for (i = 1; i <= size; i++) {
+                zipf_sum += theState.table[i] ;
+                theState.table[i] = zipf_sum;
+            }
+            theState.table[size] = 0.0;
+            theState.table[0] = 0.0;
+
+            /* compute probability values by dividing by the sum. */
+            /* also reverse the table so we have values starting at 1.0 */
+            /*  and descending to 0.0  (this is what spec_zipf needs) */
+            for (i = 0; i < size; i++) {
+                theState.table[i] = 1.0 - (theState.table[i]/zipf_sum);
+            }
+
+
+            return theState;
+        }
+
+        private void spec_zipf_free( ZipfState/*!*/ theState) {
+            if (theState.table != null) {
+                theState.table = null;
+            }
+        }
+
+        public int spec_zipf(ZipfState/*!*/ theState) {
+            double  r;
+            int     i;
+
+#if NO_ZIPF_SPIKE
+            do{
+#endif
+                r = Spec_random(theState.rstate);
+                i = 0;
+                while (r < theState.table[i]) {
+                    i++;
+                }
+#if NO_ZIPF_SPIKE
+            } while (i>theState.size);
+#endif
+            return i-1;
+        }
+
+
+
+
+#if STATIC_NORMAL_DIST
+/* Right now, mean and stddev are ignored.  If someone has a good function to
+   generate the cdf for normal distributions, let me know... */
+/* size=20, mean = 10, stddev = 3.5, will generate numbers from 0 to 20 */
+NormalState spec_normal_setup(, RandomState rstate, double mean, double stddev) {
+
+double normal_dist[] = {
+    0.002137432,
+    0.005064024,
+    0.011135458,
+    0.022750062,
+    0.043238098,
+    0.076563771,
+    0.126549006,
+    0.19568292,
+    0.283854542,
+    0.387548544,
+    0.5,
+    0.612451456,
+    0.716145458,
+    0.80431708,
+    0.873450994,
+    0.923436229,
+    0.956761902,
+    0.977249938,
+    0.988864542,
+    0.994935976,
+    1
+};
+    int i, index = 0;
+
+    theState.size   = 1000;
+    theState.rstate = rstate;
+
+    theState.table=(int *)malloc(sizeof(int)*(theState.size+1));
+    if (theState.table == NULL) {
+    fprintf(stderr, "spec_normal_setup: can't malloc %d bytes for table\n",
+        sizeof(double)*theState.size);
+    exit (1);
+    }
+
+    for (i = 0; i < theState.size; i++) {
+    if ((double)i / (double)theState.size > normal_dist[index]) {
+        index++;
+    }
+    theState.table[i] = index;
+    }
+
+    return theState;
+}
+
+void spec_normal_free(NormalState theState) {
+    if (theState.table) {
+    free(theState.table);
+    }
+}
+
+int spec_nnormal(NormalState theState) {
+    int rval = spec_nrandom(theState.rstate.val);
+    rval = rval % theState.size;
+    return theState.table[rval];
+}
+
+#else
+
+/* Guts of this routine are based on: */
+/* boxmuller.c           Implements the Polar form of the Box-Muller
+                         Transformation
+
+                      (c) Copyright 1994, Everett F. Carter Jr.
+                          Permission is granted by the author to use
+                          this software for any application provided this
+                          copyright notice is preserved.
+
+*/
+
+    private NormalState spec_normal_setup(NormalState/*!*/ theState,
+                                          RandomState/*!*/ rstate,
+                                          double mean,
+                                          double stddev)
+    {
+        theState.mean = mean;
+        theState.stddev = stddev;
+        theState.rstate = rstate;
+        theState.use_last = false;
+        return null;
+    }
+
+    void spec_normal_free(NormalState theState)
+    {
+    }
+
+    private double Spec_normal(NormalState/*!*/ theState)
+    {
+        double x1, x2, w, y1;
+
+        if (theState.use_last ) {                 /* use value from previous call */
+            y1 = theState.y2;
+        }
+        else {
+            do {
+                x1 = 2.0 * Spec_random(theState.rstate) - 1.0;
+                x2 = 2.0 * Spec_random(theState.rstate) - 1.0;
+                w = x1 * x1 + x2 * x2;
+            } while ( w >= 1.0 );
+
+            w = Math.Sqrt( (-2.0 * Math.Log( w ) ) / w );
+            y1 = x1 * w;
+            theState.y2 = x2 * w;
+        }
+        theState.use_last = !(theState.use_last);
+        return( theState.mean + y1 * theState.stddev );
+    }
+
+    private int spec_nnormal(NormalState/*!*/ theState)
+    {
+        return (int)(Spec_normal(theState));
+    }
+#endif
+    } //random
+} //namespace
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/urlcache.cs b/base/Applications/Benchmarks/SpecWeb99/webfiles/urlcache.cs
new file mode 100644
index 0000000..eceaf47
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/urlcache.cs
@@ -0,0 +1,99 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text;
+
+namespace Singularity.Application.SPECWeb99.WebFiles
+{
+    class Cache {
+        private const bool verbose = false;
+        private UrlSet cache;
+        private UrlSet free;
+        private int size;
+
+        public Cache(int cacheSize, int deckSize)
+        {
+            cache = new UrlSet(cacheSize);
+            free = new UrlSet(deckSize);
+            this.size = cacheSize;
+        }
+
+        public FileSpec GetUrl(Client/*!*/ client, int id) {
+            // first check the local cache
+            // then see if anyone else is generating the  global
+
+            if (cache.pos > 0) {
+                return cache.urls[--cache.pos];
+            }
+
+            // return local free to global free pool
+
+            client.globalLock.WaitOne();
+            while (free.pos > 0) {
+                if (client.freeDeck.pos >= client.freeDeck.urls.Length) {
+                    //Console.WriteLine(" too many free slots!");
+                    free.urls[--free.pos] = null;
+                    //DebugStub.Break();
+                    free.pos--;
+                }
+                else {
+                    client.freeDeck.urls[client.freeDeck.pos++] =
+                        free.urls[--free.pos];
+                }
+            }
+
+            // now see if there are any urls available
+            // if not either wait on or generate the global deck
+
+            while (client.urlDeck.pos == 0){
+                if (client.generatingUrls == false) {
+                    //Console.WriteLine("Generating cache");
+                    UrlSet temp = client.urlDeck;
+                    client.urlDeck = client.spareDeck;
+                    client.spareDeck = temp;
+                    client.generatingUrls = true;
+                    client.syncLock.WaitOne();
+                    client.globalLock.ReleaseMutex();
+                    client.GenerateFileSpecs();
+                    client.globalLock.WaitOne();
+                    client.generatingUrls = false;
+                    client.syncLock.ReleaseMutex();
+                }
+                else {
+                    //Console.WriteLine("Waiting for cache");
+                    client.globalLock.ReleaseMutex();
+                    client.syncLock.WaitOne();
+                    client.syncLock.ReleaseMutex();
+                    client.globalLock.WaitOne();
+                }
+            }
+
+            // the global deck is ok -- prime our cache
+
+            if (client.urlDeck.pos > 0 ) {
+                for (int i =0; i < cache.urls.Length && (client.urlDeck.pos > 0); i++) {
+                    cache.urls[cache.pos++] =
+                        client.urlDeck.urls[--client.urlDeck.pos];
+                }
+            }
+            client.globalLock.ReleaseMutex();
+            return cache.urls[--cache.pos];
+        }
+
+        public void FreeUrl(FileSpec url) {
+            if (free.pos+1 >= free.urls.Length) {
+                //Console.WriteLine("free cache full! de-allocating");
+                url = null;
+                return;
+            }
+            free.urls[free.pos++] = url;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/webfiles.cs b/base/Applications/Benchmarks/SpecWeb99/webfiles/webfiles.cs
new file mode 100644
index 0000000..d4ce537
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/webfiles.cs
@@ -0,0 +1,1088 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//-----------------------------------------------------------------------
+// Simulate the file reading portion of the specweb99 test suite
+//    randomly pick files from the content generated by wafgen99
+//    read them from disk
+//-----------------------------------------------------------------------
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+#if SINGULARITY
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using FileSystem.Utils;
+using Singularity.Application.SPECWeb99;
+using Microsoft.Contracts;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+#endif
+
+namespace Singularity.Application.SPECWeb99.WebFiles
+{
+    class Defaults
+    {
+        internal const string Root          = "/fs";
+        internal const string RelativePath  = "file_set";
+        internal const int    BlockSize     = 16384;
+        internal const int    Connections   = 10;
+        internal const int    RunSeconds    = 10;
+        internal const int    WarmUpSeconds = 2;
+    };
+
+#if SINGULARITY
+    [ConsoleCategory(HelpMessage="Null Disk r/w performance test", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter( "b", Default=Defaults.BlockSize, HelpMessage="Block Size to be read.")]
+        internal long blockSize;
+
+        [LongParameter( "c", Default=Defaults.Connections, HelpMessage="Set number of connections to simulate.")]
+        internal long connections;
+
+        [LongParameter( "f", Default=0, HelpMessage="Forced iterations.")]
+        internal long forcedIterations;
+
+        [LongParameter( "k", Default=-1, HelpMessage="Restrict files to this class number.")]
+        internal long classSizeNum;
+
+        [LongParameter( "r", Default=Defaults.RunSeconds, HelpMessage="Run time in seconds.")]
+        internal long runTime;
+
+        [LongParameter( "t", Default=1, HelpMessage="Number of threads to use/")]
+        internal long numThreads;
+
+        [LongParameter( "v", Default=0, HelpMessage="Verbosity level")]
+        internal long verbose;
+
+        [LongParameter( "w", Default=Defaults.WarmUpSeconds, HelpMessage="Warmup time in seconds.")]
+        internal long rampTime;
+
+        [BoolParameter( "x", Default=false, HelpMessage="no read -- just bind")]
+        internal bool testMode;
+
+        [StringParameter("directory", Mandatory=true, Position = 0, Default = Defaults.Root, HelpMessage="path to find wafgen99 data")]
+        internal string contentPrefix;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SpecMain.AppMain(this);
+          }
+    }
+#endif
+#if !SINGULARITY
+    class FileReader {
+        //const uint FILE_FLAG_NO_BUFFERING = 0x20000000;
+        const uint FILE_FLAG_NO_BUFFERING = 0;
+        const uint GENERIC_READ = 0x80000000;
+        const uint OPEN_EXISTING = 3;
+        IntPtr handle;
+
+        [DllImport("kernel32", SetLastError=true)]
+        private static extern unsafe IntPtr CreateFile(
+            string FileName,                    // file name
+            uint DesiredAccess,                 // access mode
+            uint ShareMode,                     // share mode
+            uint SecurityAttributes,            // Security Attributes
+            uint CreationDisposition,           // how to create
+            uint FlagsAndAttributes,            // file attributes
+            int hTemplateFile                   // handle to template file
+            );
+
+        [DllImport("kernel32", SetLastError=true)]
+        private static extern unsafe bool ReadFile(
+            IntPtr hFile,                       // handle to file
+            void* pBuffer,                      // data buffer
+            int NumberOfBytesToRead,            // number of bytes to read
+            int* pNumberOfBytesRead,            // number of bytes read
+            int Overlapped                      // overlapped buffer
+            );
+
+        [DllImport("kernel32", SetLastError=true)]
+        private static extern unsafe bool CloseHandle(
+            IntPtr hObject                      // handle to object
+            );
+
+        [DllImport("kernel32", SetLastError=true)]
+        private static extern unsafe uint GetFileSize(
+            IntPtr hObject,                     // handle to object
+            uint *pFileSizeHigh                 // receives high 32-bits of file size.
+            );
+
+        public bool Open(string FileName) {
+            // open the existing file for reading
+            handle = CreateFile(
+                FileName,
+                GENERIC_READ,
+                0,
+                0,
+                OPEN_EXISTING,
+                FILE_FLAG_NO_BUFFERING,
+                0);
+
+            if (handle != IntPtr.Zero && handle != ((IntPtr) (-1)) ) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        public unsafe int Read(byte[] buffer, int index, int count) {
+            int n = 0;
+            fixed (byte* p = buffer) {
+                if (!ReadFile(handle, p + index, count, &n, 0)) {
+                    return 0;
+                }
+            }
+            return n;
+        }
+
+        public bool Close() {
+            // close file handle
+            return CloseHandle(handle);
+        }
+
+        public unsafe int Size() {
+            return (int)GetFileSize(handle, null);
+        }
+    }
+#endif
+
+    public class FileSpec
+    {
+        public int dirNum, classNum, fileNum;
+        public long size;
+    }
+
+    public class UrlSet
+    {
+        public int pos;
+        public FileSpec[] urls;
+
+        public UrlSet(int size)
+        {
+            pos = 0;
+            urls = new FileSpec[size];
+        }
+    }
+
+    public class Client
+    {
+        //////////////////////////////////
+        // Constants
+        private const int    FILES_PER_CLASS       = 9;
+        private const int    MAX_PATH              = 256;
+        private const int    LINESIZE              = 64;
+        private const int    MARKER_FREQ           = 4096;
+        private const int    BUF_SIZE              = 1024*1024; /* 1MB */
+        private  const int   MAX_DECK              = 1000;
+        //////////////////////////////////
+        // Pseudo-constants
+        private static readonly int[] FILE_ORDER = {4,3,5,2,6,1,7,8,0};
+        private static readonly int[] CLASS_BASE_SIZE = {1024, 10240, 102400, 1024000};
+        private static readonly double[] CLASS_PROB = {0.35, 0.50, 0.14, 0.01};
+        private static readonly int MAX_CLASS_COUNT = CLASS_BASE_SIZE.Length;
+
+        //////////////////////////////////
+        // static variables
+        public static string pathPrefix   = "";
+        public static int [] fileBucket;
+
+        //////////////////////////////////
+        // Instance variables
+        public Random.RandomState randomState;
+        public bool     generatingUrls;
+        public Mutex    globalLock;
+        public Mutex    syncLock;
+        public UrlSet   urlDeck;
+        public UrlSet   freeDeck;
+        public UrlSet   spareDeck;
+#if SINGULARITY
+        public static TRef<DirectoryServiceContract.Imp:Ready> namespaceRootT;
+        private long    fileCount    = 0;
+        private long    repeatCount  = 0;
+        private bool    dumpTable    = false;
+#else
+      /// <summary>
+      ///  will not work for multiple threads!!!
+      /// </summary>
+       private static FileReader reader = new FileReader();
+#endif
+        private long    dirCount     = 0;
+        private static long    blockSize    = 0;
+        private long    totalSize    = 0;
+        private long    fileSizeNum  = 0;
+        private long    classSizeNum = 0;
+        private long    threadNum    = 1;
+        private long    verbose      = 0;
+        private bool    testMode = false;
+        private int     runTime;
+        private int     rampTime;
+        private int     forcedIterations;
+
+        private LocalState[] workerLocalStates;
+        private StringBuilder sb;
+        public static WorkerState     currentState;
+
+        Random.ZipfState zipfDir;
+        Random.ZipfState zipfFile;
+        Random rand;
+
+        public enum WorkerState
+        {
+            Start = 0,
+            Rampup = 1,
+            Run = 2,
+            Done = 3,
+        }
+
+        // per-thread state
+        private class LocalState
+        {
+            public WorkerState State;
+#if SINGULARITY
+            public DateTime StartTime;
+#endif
+            public long bindCount;
+            public TimeSpan bindTime;
+            public long readCount;
+            public TimeSpan readTime;
+            public TimeSpan totalTime;
+            public long bytesRead;
+            public int forcedIterations;
+
+            public LocalState(int forcedIterations)
+            {
+                bytesRead = 0;
+                bindTime = new TimeSpan(0);
+                readTime = new TimeSpan(0);
+                totalTime = new TimeSpan(0);
+
+                readCount = 0;
+                bindCount = 0;
+                this.forcedIterations = forcedIterations;
+            }
+        }
+
+#if SINGULARITY
+        [NotDelayed]
+#endif
+        public Client(string/*!*/ prefix, long dir,
+                      long bSize, long fSize,
+                      long threads, long verbose,
+                      long cSize, bool test,
+                      int rampTime, int runTime,
+                      int forcedIterations)
+        {
+            dirCount        = dir;
+            pathPrefix      = prefix;
+            fileSizeNum     = fSize;
+            threadNum       = threads;
+            classSizeNum    = cSize;
+            blockSize       = bSize;
+            this.verbose    = verbose;
+            testMode        = test;
+            this.rampTime   = rampTime;
+            this.runTime    = runTime;
+            this.forcedIterations = forcedIterations;
+
+            globalLock      = new Mutex();
+            syncLock        = new Mutex();
+            urlDeck         = new UrlSet(MAX_DECK);
+            freeDeck        = new UrlSet(MAX_DECK);
+            spareDeck       = new UrlSet(MAX_DECK);
+            fileBucket      = new int [FILES_PER_CLASS];
+            sb              = new StringBuilder(512);
+
+            if (sb == null) throw new Exception (" could not allocate memory for string builder");
+#if SINGULARITY
+            namespaceRootT = new TRef<DirectoryServiceContract.Imp:Ready>(
+                DirectoryService.NewClientEndpoint());
+#else
+#endif
+            workerLocalStates = new LocalState[threads];
+
+            if (workerLocalStates == null) {
+                throw new Exception ("unable to alloc workerstats");
+            }
+        }
+
+        //------------------------------------------------------------------
+        // ReadFile
+        //  open and read its content of fileName
+        //  throw the content away (no copying, no converting etc...)
+        //------------------------------------------------------------------
+
+        //  FIXFIX  way this is called is rather bizarre.
+        // a Client spawns LocalWorker objects that call back to this
+        // function. Should be moved into the LoadWorker class
+
+ #if SINGULARITY
+        private byte[]/*!*/ in ExHeap ReadFile(string/*!*/ fileName,
+                [Claims] byte[]/*!*/ in ExHeap inBuf,
+                ref LocalState local
+                )
+        {
+            if (local == null) {
+                Console.WriteLine("ReadFile:  local state is null!");
+                return inBuf;
+            }
+
+            FileContract.Imp conn = null;
+            DateTime start;
+            DateTime beginTotal;
+            TimeSpan btime = new TimeSpan(0);
+
+            beginTotal = DateTime.Now;
+
+            // only perform timing while in the run state
+
+            DirectoryServiceContract.Imp:Ready! ds = Client.namespaceRootT.Acquire();
+            ErrorCode errorCode = ErrorCode.Unknown;
+            try {
+                if (currentState == WorkerState.Run) {
+                    start = DateTime.Now;
+                    conn = FileUtils.OpenFile(fileName, ds, out errorCode);
+                    btime = DateTime.Now - start;
+                    local.bindTime += btime;
+                    local.bindCount++;
+                } else {
+                    conn = FileUtils.OpenFile(fileName, ds, out errorCode);
+                }
+            }
+            finally {
+                Client.namespaceRootT.Release(ds);
+            }
+
+            if (conn == null) {
+                Console.WriteLine("Failed to open file '{0}' code={1}",fileName, SdsUtils.ErrorCodeToString(errorCode));
+                throw new Exception(" file missing");
+                return inBuf;
+            }
+
+            try {
+                int error  = 0;
+                long filePos  = 0;
+                long  bytesRead = 0;
+
+                start = DateTime.Now;
+
+                while (!testMode) {
+                    conn.SendRead(inBuf, 0, filePos, inBuf.Length);
+                    conn.RecvAckRead(out inBuf, out bytesRead, out error);
+                    local.readCount++;
+                    if (error != 0) {
+                        throw new Exception(" Encountered error while reading " + fileName);
+                        break;
+                    }
+                    if (bytesRead == 0) break;
+                    filePos += bytesRead;
+                }
+
+                if (currentState == WorkerState.Run) {
+                    local.bytesRead += filePos;
+                    TimeSpan x =  DateTime.Now - start;
+                    local.readTime += x;
+                }
+            }
+            finally {
+                delete conn;
+            }
+
+            if (currentState == WorkerState.Run) {
+                local.totalTime += DateTime.Now - beginTotal;
+            }
+            return inBuf;
+        }
+#endif
+
+        ///
+        /// generate a new "deck" of random files
+        ///
+        public void GenerateFileSpecs()
+        {
+            FileSpec fs;
+
+            double totalProb = 0.0;
+
+
+            UrlSet fr = freeDeck;
+            UrlSet sp = spareDeck;
+
+            //
+            // Ensure the spare deck is fully allocated
+            //     if there are any elements in the free pool use them
+            //     otherwise we need a new allocations
+            //
+            globalLock.WaitOne();
+#if verbose
+            Console.WriteLine("gendeck: {0} freed slots spare={1},",
+                fr.pos,sp.pos,urlDeck.pos);
+            //DebugStub.Break();
+#endif
+            // fill up the spare deck.  Start with using
+            // items from the free deck. If none are available
+            // allocate them.
+
+            // NOTE allocation should mostly happen during the initialization phase
+
+            for (int i=0; i < fr.urls.Length; i++){
+                if (fr.pos == 0 ) {
+                    //if ( sp.urls[i] != null) DebugStub.Break();
+                    sp.urls[i] = new FileSpec();
+                    if (sp.urls[i] == null) {
+                        throw new Exception ("no memory!");
+                    }
+                    // spit out diagnostics if we are allocating during the run phase
+                    if (currentState == WorkerState.Run)  Console.Write(" @{0}",i);
+                }
+                else {
+                    sp.urls[i] = fr.urls[--fr.pos];
+                }
+            }
+            globalLock.ReleaseMutex();
+
+            // Now that we have a spare deck with the needed number of items
+            // fill in their values according to spec.
+
+            // The loop immediately below will generate s set of files conforming to the
+            // requested probabilities but will not be random.
+
+            for (int classNo = 0; classNo  < MAX_CLASS_COUNT; classNo++) {
+                totalProb += CLASS_PROB[classNo];
+                while (sp.pos < totalProb * sp.urls.Length) {
+                    fs = sp.urls[sp.pos++];
+                    if (fs == null) {
+                        throw new Exception(" spare[" + sp.pos + "] is null!");
+                    }
+                    fs.classNum = classNo;
+                    fs.fileNum  = FILE_ORDER[rand.spec_zipf(zipfFile)];
+                    fs.dirNum   = rand.spec_zipf(zipfDir);
+
+                    fs.size = CLASS_BASE_SIZE[fs.classNum] * (fs.fileNum +1) / 10;
+
+                    if (verbose > 4) {
+                        sb.Length = 0; //reset the buffer
+                        sb.Append(pathPrefix);
+                        sb.Append("/dir");
+                        sb.Append(fs.dirNum.ToString("d05"));
+                        sb.Append("/class");
+                        sb.Append(fs.classNum);
+                        sb.Append("_");
+                        sb.Append(fs.fileNum);
+                        Console.WriteLine("size {0} file={1}",fs.size,sb.ToString());
+                    }
+                }
+                if (verbose > 1) {
+                    Console.WriteLine("Generating class[{0}] prob={1:f2} urlCount={2}",
+                        classNo, CLASS_PROB[classNo], sp.pos);
+                }
+            }
+
+            /* Randomize deck */
+            for (int i = 0; i < sp.pos ;  i++) {
+                int pos = rand.Spec_nrandom(randomState) % (sp.pos - i);
+                FileSpec obj  = sp.urls[sp.pos- i - 1];
+                sp.urls[sp.pos - i - 1] = sp.urls[pos];
+                sp.urls[pos] = obj;
+            }
+        }
+
+        //------------------------------------------------------------------
+        // Generate Load
+        //  creates the random list of files to be done every iteration
+        //  Reads contents of entire file for every file in the list
+        //  This list is generated so we can see if each loop has identical timings
+        //------------------------------------------------------------------
+        private class LoadWorker
+        {
+            private Client hostClient;
+            private LocalState localState;
+#if SINGULARITY
+            private readonly ArrayList fs;
+#endif
+            private StringBuilder sb;
+            private int readSize;
+            private Cache cache;
+            private int id; // local thread index
+
+            public LoadWorker(Client parent, ref LocalState localState, int readSize, int id)
+            {
+                hostClient      = parent;
+                this.localState = localState;
+                sb              = new StringBuilder(512);
+                this.readSize   = readSize;
+                cache           = new Cache(20, 20 *2);
+                this.id         = id;
+            }
+#if SINGULARITY
+            public byte []/*!*/ in ExHeap ProcessUrl(
+                                       FileSpec fileSpec,
+                                       [Claims] byte []/*!*/ in ExHeap buf) {
+#else
+            public void ProcessUrl(FileSpec fileSpec, byte[] buf, ref LocalState local ) {
+#endif
+                if (fileSpec == null) throw new Exception ("Attempting to read from null fileSpec");
+#if SINGULARITY
+                sb.Length = 0; //reset the buffer
+                sb.Append(pathPrefix);
+                sb.Append("/dir");
+                sb.Append(fileSpec.dirNum.ToString("d05"));
+                sb.Append("/class");
+                sb.Append(fileSpec.classNum);
+                sb.Append("_");
+                sb.Append(fileSpec.fileNum);
+                string path = sb.ToString();
+
+                if (hostClient.verbose > 2) {
+                    Console.WriteLine("reading {0}", path);
+                }
+                buf = hostClient.ReadFile(path, buf, ref localState);
+#else
+                sb.Length = 0; //reset the buffer
+                sb.Append(pathPrefix);
+                sb.Append("\\dir");
+                sb.Append(fileSpec.dirNum.ToString("d05"));
+                sb.Append("\\class");
+                sb.Append(fileSpec.classNum);
+                sb.Append("_");
+                sb.Append(fileSpec.fileNum);
+                string path = sb.ToString();
+
+                int error = 0;
+                //Console.Write(".");
+                DateTime beginTotal = DateTime.Now;
+                if (!reader.Open(path)) {
+                    Console.WriteLine("open failed: {0}", path);
+                    throw new Exception("open failure: "+path);
+                }
+
+                DateTime beginRead = DateTime.Now;
+                for (long pos = 0; pos < fileSpec.size;) {
+                    int bytes = reader.Read(buf, 0, buf.Length);
+                    //Console.Write(".");
+                    if (bytes == 0) {
+                        Console.WriteLine("bytes read={0}, error={1} pos={2}",
+                            bytes, error, pos);
+                        break;
+                    }
+                    pos += bytes;
+                    //if  (pos != fileSpec.size) throw new Exception (" wrong size pos=" + pos + " bytes=" + bytes);
+                }
+                reader.Close();
+                if (currentState == WorkerState.Run) {
+                    DateTime end = DateTime.Now;
+                    local.totalTime += end - beginTotal;
+                    local.bindTime += beginRead - beginTotal;
+                    local.readTime += end - beginRead ;
+                    local.bytesRead += fileSpec.size;
+                }
+#endif
+                Client.fileBucket[fileSpec.fileNum]++;
+                path = null;
+#if SINGULARITY
+                return buf;
+#endif
+            }
+
+            public void RunLoad()
+            {
+#if SINGULARITY
+                byte [] in ExHeap buf = new[ExHeap] byte[readSize];
+#else
+                // Allocate one one buffer for all operations
+                byte[] buf = new byte [blockSize];
+#endif
+                // if loop we've been told to quit, but run at least the forcedIterations.
+                for (int iterations = 0;; iterations++) {
+                    if (iterations >= localState.forcedIterations &&
+                        localState.State == WorkerState.Done) {
+                        break;
+                    }
+
+                    FileSpec fs  = cache.GetUrl(hostClient,id);
+#if SINGULARITY
+                    buf = ProcessUrl(fs, buf);
+#else
+                    ProcessUrl(fs,buf, ref localState);
+#endif
+                    cache.FreeUrl(fs);
+                }
+#if SINGULARITY
+                delete buf;
+#endif
+            }
+        }
+
+        public void InitializeGlobalState()
+        {
+            // the following initialization is taken from  specweb99/load_generate and client.c
+            rand = new Random();
+            int first_seed = 2;
+            randomState = new Random.RandomState(first_seed);
+            zipfDir = rand.spec_zipf_setup(randomState, (int)dirCount, 1.0);
+            zipfFile = rand.spec_zipf_setup(randomState, FILES_PER_CLASS, 1.0);
+            generatingUrls = false;
+        }
+
+        public long GatherStats(out long totalFiles)
+        {
+            long total = 0;
+            totalFiles = 0;
+            Console.WriteLine("Thread stats:");
+            for (int i = 0; i < threadNum; i++) {
+                LocalState temp = workerLocalStates[i];
+                if (temp != null) {
+                    double  t1 = (double)temp.totalTime.Ticks / TimeSpan.TicksPerSecond;
+                    double  t2 = (double)temp.bindTime.Ticks / TimeSpan.TicksPerSecond;
+                    double  t3 = (double)temp.readTime.Ticks / TimeSpan.TicksPerSecond;
+                    string summ = String.Format(
+                        " [{0}] Total: {1:f3} bind: {2:f3}, read: {3:f3} bytes: {4}",
+                        i, t1, t2, t3, temp.bytesRead);
+                    Console.WriteLine(summ);
+#if SINGULARITY
+                    DebugStub.Print(summ);
+#endif // SINGULARITY
+                    //Console.WriteLine(" bind count ={0}, read count ={1}",temp.bindCount, temp.readCount);
+                   total += temp.bytesRead;
+                   totalFiles += temp.bindCount;
+                }
+            }
+            return total;
+        }
+
+        ///
+        /// Main load generation routine
+        /// manages Global state machine  via timers etc.
+        public void GenerateLoad()
+        {
+            totalSize = 0;
+            double megaBytes;
+            InitializeGlobalState();
+
+            //if (testMode) return;
+            totalSize *= threadNum;
+            //megaBytes = ( (double) (totalSize) / (double) (1024*1024) );
+
+#if SINGULARITY
+            long startIrqCount;
+            long startSwitchCount;
+            long startKernelGcCount;
+            int  startGcCount;
+            long startGcMillis;
+            long startGcBytes;
+            long endGcMillis;
+            long endGcBytes;
+            TimeSpan startTime;
+            TimeSpan endTime;
+#else
+            DateTime startTime;
+            DateTime endTime;
+#endif
+
+            //DateTime globalStartTime = ProcessService.GetUpTime();
+
+            // Create all the workers
+            LoadWorker[] workers = new LoadWorker[threadNum];
+            Thread[] threads = new Thread[threadNum];
+
+            for (int i = 0; i < threadNum; i++) {
+                workerLocalStates[i] = new LocalState(forcedIterations);
+                workers[i] = new LoadWorker(this, ref workerLocalStates[i],(int) blockSize,i);
+            }
+
+            // Create the threads
+            for (int i = 0; i < threadNum; i++) {
+                LocalState temp = workerLocalStates[i];
+                if (temp != null) temp.State = WorkerState.Rampup;
+                threads[i] = new Thread(new ThreadStart(workers[i].RunLoad));
+            }
+
+            if (rampTime != 0) {
+                // ramp-up time isn't part of benchmark.
+
+                Console.WriteLine("Entering Rampup state");
+                // Run all the threads
+                currentState = WorkerState.Rampup;
+                for (int i = 0; i < threadNum; i++) {
+                    Thread t = threads[i];
+                    /*^ assume t!= null; ^*/
+                    t.Start();
+                }
+
+                // sleep for some time and change states from Rampup to Run
+                Thread.Sleep(rampTime*1000);
+                Console.WriteLine("\nEntering Run state");
+                globalLock.WaitOne();
+
+                // start perf counting after we have the lock
+#if SINGULARITY
+                GC.PerformanceCounters(out startGcCount,
+                                       out startGcMillis,
+                                       out startGcBytes);
+
+                startTime = ProcessService.GetUpTime();
+                startIrqCount = ProcessService.GetKernelInterruptCount();
+                startSwitchCount = ProcessService.GetContextSwitchCount();
+                startKernelGcCount = ProcessService.GetKernelGcCount();
+#else
+                startTime = DateTime.Now;
+#endif
+            }
+            else {
+                // ramp-up time is part of benchmark.
+#if SINGULARITY
+                GC.PerformanceCounters(out startGcCount,
+                                       out startGcMillis,
+                                       out startGcBytes);
+
+                startTime = ProcessService.GetUpTime();
+                startIrqCount = ProcessService.GetKernelInterruptCount();
+                startSwitchCount = ProcessService.GetContextSwitchCount();
+                startKernelGcCount = ProcessService.GetKernelGcCount();
+#else
+                startTime = DateTime.Now;
+#endif
+
+                Console.WriteLine("Starting threads");
+                // Run all the threads
+                currentState = WorkerState.Rampup;
+                for (int i = 0; i < threadNum; i++) {
+                    Thread t = threads[i];
+                    /*^ assume t!= null; ^*/
+                    t.Start();
+                }
+
+                // sleep for some time and change states from Rampup to Run
+                Thread.Sleep(rampTime*1000);
+                Console.WriteLine("\nEntering Run state");
+                globalLock.WaitOne();
+            }
+
+            // Workers are ready to run.
+            currentState = WorkerState.Run;
+
+            for (int i = 0; i < threadNum; i++) {
+                LocalState temp = workerLocalStates[i];
+                if (temp != null) temp.State = WorkerState.Run;
+            }
+            globalLock.ReleaseMutex();
+
+
+            // sleep for some time and change states from Run to Done
+            Thread.Sleep(runTime*1000);
+            globalLock.WaitOne();
+            currentState = WorkerState.Done;
+            for (int i = 0; i < threadNum; i++) {
+                LocalState temp = workerLocalStates[i];
+                if (temp != null) temp.State = WorkerState.Done;
+            }
+            globalLock.ReleaseMutex();
+
+#if SINGULARITY
+            bool wasActive = Monitoring.isActive();
+            if  (wasActive) Console.WriteLine("May want to reset Monitoring state -- was active");
+            Monitoring.setActive(false);
+            // Wait for all the threads to complete
+            for (int i = 0 ; i < threadNum; i++) {
+                Thread t = threads[i];
+                /*^ assume t!= null; ^*/
+                t.Join();
+            }
+#endif
+
+            // should stats happen before or after thread join?
+            long totalFiles;
+            long totalBytes = GatherStats(out totalFiles);
+
+            megaBytes = ( (double) (totalBytes) / (double) (1024*1024) );
+
+#if SINGULARITY
+            int endGcCount;
+            endTime = ProcessService.GetUpTime();
+            GC.PerformanceCounters(out endGcCount,
+                                    out endGcMillis,
+                                    out endGcBytes);
+#else
+           endTime = DateTime.Now;
+#endif
+
+
+            TimeSpan elapsed = endTime - startTime;
+            double delta = (double)elapsed.Ticks / TimeSpan.TicksPerSecond;
+            string summ =
+                String.Format(
+                    "Class:{0:d} Block:{1:d} Elapsed: {2:f2} MBps: {3:f3}, Files/s: {4:f3}",
+                    classSizeNum,
+                    blockSize,
+                    delta,
+                    (double)(megaBytes / delta),
+                    (double)(totalFiles / delta));
+
+#if SINGULARITY
+            string info =
+                String.Format(
+                    "[AppGC:- cnt:{0} bytes:{1} Kern:- ints:{2} swi:{3} gcs:{4}]",
+                    endGcCount - startGcCount,
+                    endGcBytes - startGcBytes,
+                    ProcessService.GetKernelInterruptCount() - startIrqCount,
+                    ProcessService.GetContextSwitchCount() - startSwitchCount,
+                    ProcessService.GetKernelGcCount() - startKernelGcCount);
+#else
+            string info = "not implemented";
+#endif
+            if (verbose > 0 ) {
+                Console.WriteLine();
+                Console.WriteLine(summ);
+                Console.WriteLine(info);
+            }
+
+
+            if (verbose > 1 ) {
+                long ftotal = 0;
+                for (int i=0; i < 9; i++) {
+                    ftotal += fileBucket[i];
+                }
+
+                Console.WriteLine("Actual Zipf file distribution:");
+                for (int i=0; i < 9; i++) {
+                    double foo = (double) (fileBucket[i] * 100) / (double) ftotal;
+                    Console.WriteLine("   FileBucket[{0}] = {1:d6}. %={2:f2}",
+                        i, fileBucket[i], foo);
+                }
+            }
+#if SINGULARITY
+            DebugStub.WriteLine(summ);
+            DebugStub.WriteLine(info);
+#endif
+       }
+    } // client
+
+    public class SpecMain
+    {
+        //--------------------------------------------------
+        //--------------------------------------------------
+        private static int ConnectionsToDirectories(int conns)
+        {
+            return ((int) (25 + (((400000.0 / 122000.0) * conns)/5.0)));
+        }
+
+        static bool ParseNumber(string/*!*/ arg,
+                                string/*!*/ name,
+                                out long value)
+        {
+            // arg should look like "[-][A-z]:[0-9]*"
+            if (arg.Length >= 4)
+            {
+                try
+                {
+                    value = Int64.Parse(arg.Substring(3));
+                    return true;
+                }
+                catch (FormatException)
+                {Console.WriteLine("format ex"); }
+                catch (OverflowException)
+                {Console.WriteLine("overflow ex");}
+            }
+            Console.WriteLine("Could not parse {0}, {1}", name,arg.Substring(3));
+            value = 0;
+            return false;
+        }
+
+        private static void Usage()
+        {
+            Console.WriteLine("Usage: specweb99 client [options] content-root");
+            Console.WriteLine("  randomly read files generated by wafgen99");
+            Console.WriteLine("Options:");
+            Console.WriteLine(
+                "  /b:<n>      Block Size to be read [{0}].",
+                Defaults.WarmUpSeconds
+                );
+            Console.WriteLine(
+                "  /c:<n>      Set number of connections to simulate [{0}].",
+                Defaults.Connections
+                );
+            Console.WriteLine("  /k:<n>      Restrict files to this class number.");
+            Console.WriteLine("  /f:<n>      Forced iterations [0].");
+            Console.WriteLine("  /r:<n>      run time in seconds [{0}].",
+                              Defaults.RunSeconds);
+            Console.WriteLine("  /t:<n>      Number of threads to use [1].");
+            Console.WriteLine("  /x          no read -- just bind");
+            Console.WriteLine("  /w:<n>      warmup time in seconds[5.]");
+        }
+
+#if SINGULARITY
+        internal static int AppMain(Parameters! config)
+        {
+
+            long dirCount           = (long) (ConnectionsToDirectories((int)config.connections) -1 ); //zero based
+            long blockSize          = config.blockSize;
+            long fileSizeNum        = -1;
+            long classSizeNum       = config.classSizeNum;
+            long verbose            = config.verbose;
+            long numThreads         = config.numThreads;
+            bool testMode           = config.testMode;
+            long runTime            = config.runTime;
+            long rampTime           = config.rampTime;
+            long forcedIterations   = config.forcedIterations;
+            string contentPrefix    = config.contentPrefix + "/" + Defaults.RelativePath;
+            if (forcedIterations != 0) {
+                rampTime = 0;
+                runTime = 0;
+            }
+            Console.WriteLine(" args: content=" + contentPrefix +" dir=" + dirCount + " block size="+blockSize);
+            Console.WriteLine("       verbose="+verbose+" FileSizeNum="+fileSizeNum+" ClassSizeNum="+classSizeNum);
+            Console.WriteLine("       threads="+numThreads+" forcedIterations="+forcedIterations);
+            //DateTime start = DateTime.Now;
+
+            Client c = new Client(contentPrefix, dirCount,  blockSize, fileSizeNum,
+                                  numThreads, verbose, classSizeNum,
+                                  testMode, (int) rampTime, (int)runTime,
+                                  (int)forcedIterations);
+
+            if (c != null ) {
+                c.GenerateLoad();
+            }
+
+            //TimeSpan elapsed = DateTime.Now - beginRunTime;
+            //Console.WriteLine("Elapsed time: "+elapsed);
+            return 0;
+
+        }
+#else
+        //--------------------------------------------------
+        // Windows Main routine
+        //--------------------------------------------------
+        public static int Main(string[]/*!*/ args)
+        {
+            string contentPrefix = Defaults.Root;
+            long dirCount     = (long) (ConnectionsToDirectories(Defaults.Connections) -1); //zero based
+            long blockSize    = Defaults.Connections;
+            long fileSizeNum  = -1;
+            long classSizeNum  = -1;
+            long verbose = 1;
+            long numThreads = 1;
+            bool testMode = false;
+            long runTime = Defaults.RunSeconds;
+            long rampTime  = Defaults.WarmUpSeconds;
+            long forcedIterations = 0;
+
+            // Temporaries for command-line parsing
+            bool  needHelp = args.Length == 0;
+
+            int i;
+            for (i = 1; i < args.Length; i++)
+            {
+                string/*!*/ arg = (string /*!*/) args[i];
+
+                if (arg.Length < 2 ||  (arg[0] != '-' && arg[0] != '/') )
+                {
+                    Console.WriteLine("Invalid argument: {0}", arg);
+                    Usage();
+                    return -1;
+                }
+
+                switch (Char.ToLower(arg[1]))
+                {
+                    case '?':
+                    case 'h':
+                        needHelp = true;
+                        break;
+                    case 'b':
+                        ParseNumber(arg, "block size", out blockSize);
+                        break;
+                    case 'c':
+                        long connections;
+                        ParseNumber(arg, "# of connections", out connections);
+                        dirCount = (long) (ConnectionsToDirectories((int)connections) -1 ); //zero based
+
+                        break;
+                    case 'f':
+                        ParseNumber(arg, "# of forced iterations", out forcedIterations);
+                        rampTime = 0;
+                        runTime = 0;
+                        break;
+                    case 'k':
+                        ParseNumber(arg, "class number (size) to be read", out classSizeNum);
+                        break;
+                    case 'r':
+                        ParseNumber(arg, "Run time", out runTime);
+                        break;
+                    case 't':
+#if SINGULARITY
+                        ParseNumber(arg, "number of threads to use", out numThreads);
+#else
+                        Console.WriteLine("Multi-thread not spported on NT -- ignoring");
+#endif
+                        break;
+                    case 'v':
+                        ParseNumber(arg, "verbosity level", out verbose);
+                        break;
+                    case 'w':
+                        ParseNumber(arg, "Warmup time", out rampTime);
+                        break;
+                    case 'x':
+                        testMode = true;
+                        break;
+                    default:
+                        contentPrefix = arg;
+                        break;
+                }
+            } // for args
+
+            contentPrefix += "/" + Defaults.RelativePath;
+
+            if (needHelp) {
+                Usage();
+                return -1;
+            }
+
+            Console.WriteLine(" args: content=" + contentPrefix +" dir=" + dirCount + " block size="+blockSize);
+            Console.WriteLine("       verbose="+verbose+" FileSizeNum="+fileSizeNum+" ClassSizeNum="+classSizeNum);
+            Console.WriteLine("       threads="+numThreads+" forcedIterations="+forcedIterations);
+            //DateTime start = DateTime.Now;
+
+            Client c = new Client(contentPrefix, dirCount,  blockSize, fileSizeNum,
+                                  numThreads, verbose, classSizeNum,
+                                  testMode, (int) rampTime, (int)runTime,
+                                  (int)forcedIterations);
+
+            if (c != null ) {
+                c.GenerateLoad();
+            }
+
+            //TimeSpan elapsed = DateTime.Now - beginRunTime;
+            //Console.WriteLine("Elapsed time: "+elapsed);
+            return 0;
+        } // main
+#endif
+    } //specmain class
+} //namespace
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/webfiles.csproj b/base/Applications/Benchmarks/SpecWeb99/webfiles/webfiles.csproj
new file mode 100644
index 0000000..409751f
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/webfiles.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>webfiles</AssemblyName>
+    <NoNullCheck>true</NoNullCheck>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="webfiles.cs" />
+    <Compile Include="random.cs" />
+    <Compile Include="urlcache.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/xwebfile.init.script b/base/Applications/Benchmarks/SpecWeb99/webfiles/xwebfile.init.script
new file mode 100644
index 0000000..8d8b886
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/xwebfile.init.script
@@ -0,0 +1,11 @@
+clear
+mkfs '/dev/vol0.2'
+fsmount '/dev/vol0.2' '/fs' '-n'
+wafgen99 '-v' '60' '/fs'
+clear
+echo '=============================================================================='
+echo 'When fsunmount says that the volume has been unmounted, initialization is
+echo 'complete. You must manually reset the machine to start the xwebfile benchmark.'
+echo '=============================================================================='
+echo 'fsunmount:'
+fsunmount
diff --git a/base/Applications/Benchmarks/SpecWeb99/webfiles/xwebfile.script b/base/Applications/Benchmarks/SpecWeb99/webfiles/xwebfile.script
new file mode 100644
index 0000000..c40fee9
--- /dev/null
+++ b/base/Applications/Benchmarks/SpecWeb99/webfiles/xwebfile.script
@@ -0,0 +1,5 @@
+clear
+fsmount '/dev/vol0.2' '/fs'
+perfcnt '-g'
+webfiles '-f:50000'
+perfcnt '-s'
diff --git a/base/Applications/Benchmarks/bartok/Bartok.cs b/base/Applications/Benchmarks/bartok/Bartok.cs
new file mode 100644
index 0000000..138bfff
--- /dev/null
+++ b/base/Applications/Benchmarks/bartok/Bartok.cs
@@ -0,0 +1,1557 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define NONONNULLTYPECHECK  // required on Singularity, no affect on other Windows.
+
+namespace Bartok {
+
+  using System;
+  using System.IO;
+  using System.Text;
+  using System.Collections;
+  using Bartok.Utility;
+  using Bartok.Datatype;
+  using Bartok.CfgUtil;
+  using Bartok.Ir;
+  using Bartok.Lir;
+  using Bartok.Analysis;
+  using Bartok.Opt.IrCleanup;
+  using Bartok.Opt.Ir;
+  using Bartok.Opt.Lir;
+  using Bartok.Opt;
+  using Bartok.Regalloc;
+  using Bartok.Opt.Ssa;
+  using Bartok.Backend;
+
+#if ON_SINGULARITY
+  using Microsoft.Singularity;
+#endif
+
+  //
+  // Bartok.cs
+  //
+  // Main entry point for compiler
+
+  // "public class Bartok {..}" breaks the namespace lookup of Bartok.*
+  // Is this a bug?
+  public class BartokClass {
+
+      public static long CHECK_COUNT = 0;
+      public static long CHECK_COUNT_LOWER = 0;
+
+      public static int Main(String[] args) {
+#if ON_SINGULARITY
+          //          AppRuntime.EnableGCVerify = true;
+          //          DebugStub.WriteLine("Bartok: Enabled GC Verifier");
+#endif
+          Bartok.MSIL.MetaDataUtil.Configure(new MetaDataOutput());
+
+          try {
+              ProcessCmdLine(args);
+              if((fileNames.Count == 0) && (linkNames.Count == 0)) {
+                  CHECK_COUNT++;
+                  CHECK_COUNT_LOWER++;
+
+                  PrintUsage();
+                  Util.Error("\nno files to process...aborting.");
+                  Util.Exit(-11);
+              }
+
+              if(StageControl.AtomicSupport) {
+                  StageControl.TryAllSupport = true;
+              }
+
+              Util.Message(NoiseLevel.PerPhase,
+                           "fileNames = "
+                           + new CollectionFormatter(fileNames));
+              Util.Message(NoiseLevel.PerPhase,
+                           "refFileNames = "
+                           + new CollectionFormatter(refFileNames));
+              Util.Message(NoiseLevel.PerPhase,
+                           "libDirNames = "
+                           + new CollectionFormatter(libDirNames));
+              Util.Message(NoiseLevel.PerPhase,
+                           "outputDirName = " + outputDirName);
+
+              if (overrideNames.Count > 0) {
+                  Util.Message(NoiseLevel.PerPhase,
+                               "overrideNames = "
+                               + new CollectionFormatter(overrideNames));
+              }
+              if (entryPoints.Count > 0) {
+                  Util.Message(NoiseLevel.PerPhase,
+                               "entryPoints = "
+                               + new CollectionFormatter(entryPoints));
+              }
+
+              // Create helper data structures
+              DateTime startTime = Util.startTime;
+              bool fLoadDebugInfo = StageControl.SymbolicDebug;
+              StageControl.BartokLinkPhase = false;
+              if (StageControl.CompileOnly) {
+                  // separate compilation
+                  foreach (String fileName in fileNames) {
+                      String outputName =
+                          ComputeOutputName(fileName, outputDirName);
+                      ArrayList loadFileNames = new ArrayList(1);
+                      loadFileNames.Add(fileName);
+                      String shortName = GetShortName(fileName).ToLower();
+
+                      // we need to compile mscorlib.dll together with
+                      // system.dll
+                      bool fDefineOverride = shortName.Equals("mscorlib.dll");
+
+                      TypeData typeData = new TypeData();
+                      CompileFile(typeData, loadFileNames, refFileNames,
+                                  overrideNames, overrideDefNames,
+                                  fDefineOverride, outputName,
+                                  startTime, fLoadDebugInfo);
+                  }
+              } else {
+                  // Create output root name.
+                  if (outputRootName == null) {
+                      outputRootName = (String) fileNames[0];
+                  }
+
+                  // strip off extension, if there is one.
+                  int dotIndex = outputRootName.LastIndexOf('.');
+                  if (dotIndex != -1) {
+                      String ext = outputRootName.Substring(dotIndex + 1);
+                      if (ext.Equals("dll") || ext.Equals("obj")
+                          || ext.Equals("exe")) {
+                          outputRootName =
+                              outputRootName.Substring(0, dotIndex);
+                      }
+                  }
+
+                  bool fDefineOverride = StageControl.WholeProgram;
+                  TypeData typeData = new TypeData();
+                  String objFileName =
+                      CompileFile(typeData, fileNames, refFileNames,
+                                  overrideNames, overrideDefNames, fDefineOverride,
+                                  outputRootName, startTime, fLoadDebugInfo);
+                  linkNames.Add(objFileName);
+
+                  StageControl.BartokLinkPhase = true;
+#if DO_LINK
+                  BartokLinker bartokLinker = new BartokLinker();
+                  typeData = StageControl.WholeProgram ? typeData : null;
+                  bartokLinker.Link(typeData, fileNames, linkNames,
+                                    refFileNames, overrideNames, overrideDefNames,
+                                    libDirNames,
+                                    entryPoints, initializerSkips,
+                                    outputRootName);
+#endif
+              }
+          } catch(AbortException) {
+              // Abort code already dumped the stack
+              Util.Exit(-1);
+          } catch(Exception e) {
+              Util.Error("Internal uncaught {0} exception", e);
+              Util.Exit(-1);
+          }
+          Util.Message(NoiseLevel.PerPhase,
+                       "STATIC COUNT IS: " + CHECK_COUNT);
+          Util.Message(NoiseLevel.PerPhase,
+                       "STATIC LOWER IS: " + CHECK_COUNT_LOWER);
+          return 0;
+      }
+
+      private static String CompileFile(TypeData typeData,
+                                        ArrayList fileNames,
+                                        ArrayList refFileNames,
+                                        ArrayList overrideNames,
+                                        ArrayList overrideDefNames,
+                                        bool fDefineOverride,
+                                        String outputName,
+                                        DateTime startTime,
+                                        bool fLoadDebugInfo) {
+          ConvertMsil2Ir(fileNames, refFileNames, overrideNames,
+                         overrideDefNames, fDefineOverride, startTime,
+                         fLoadDebugInfo, typeData);
+
+          CHECK_COUNT++;
+          CHECK_COUNT_LOWER++;
+
+
+#if SELF_PROFILING
+          System.GC.Collect();
+          long memoryUsage = System.GC.GetTotalMemory(false);
+          Util.Message("memory usage: " + memoryUsage);
+#endif
+
+          if (entryPoints.Count > 0) {
+              Util.Message(NoiseLevel.PerPhase,
+                           "entryPoints = "
+                           + new CollectionFormatter(entryPoints));
+          }
+          if(!StageControl.CompileOnly && (entryPoints.Count == 0)) {
+              Util.Abort("No entry points found");
+          }
+
+          typeData.ComputeEntryMethod(entryPoints);
+          Util.Assert(typeData.EntryPoints.Count == entryPoints.Count);
+
+          // register all global analysis
+          AnalysisRegistry analysisRegistry = RegisterAnalysis(typeData);
+
+          // Create a series of phases that are each applied to the
+          // whole program.
+          Bartok.Ir.PhaseList phases = new Bartok.Ir.PhaseList("ir");
+
+          CHECK_COUNT--;
+          CHECK_COUNT_LOWER--;
+
+          AddPhases(phases, analysisRegistry, outputName, typeData);
+
+          Util.Message(phases.ComponentPhases.ToString());
+          if (StageControl.DumpContainers) {
+              phases.Add(new TypeDataPrettyPhase("After IR:"));
+          }
+          Bartok.Opt.IrCleanup.Statistics.Reset(typeData);
+          BartokList phaseNames = phases.ComponentPhases;
+          foreach(Object phaseObj in phaseNames) {
+              if(!(phaseObj is string)) {
+                  Util.Warn("Not string: {0}X",
+                            phaseObj.ToString());
+                  continue;
+              }
+              string phaseName = (string)phaseObj;
+              if(phaseName.IndexOf(' ') != -1) {
+                  Util.Warn("Phase has a space in name: {0}", phaseName);
+              }
+          }
+          foreach(string phaseName in StageControl.disabledPhaseNames) {
+              if(phaseNames.Contains(phaseName)) {
+                  continue;
+              }
+              if(StageControl.disabledPhaseNamesFound.Contains(phaseName)) {
+                  continue;
+              }
+              Util.Abort("Couldn't find phase: " + phaseName);
+          }
+          phases.Go(typeData);
+
+          Bartok.Opt.IrCleanup.Statistics.Summary();
+
+#if SELF_PROFILING
+          memoryUsage = System.GC.GetTotalMemory(false);
+          Util.Message("memory usage: " + memoryUsage);
+#endif
+
+          // backend phases:
+          Util.Message("outputRootName = " + outputName);
+
+          String objFileName = LirPhases.run(typeData, fileNames, outputName,
+                                             StageControl.GenObjFile);
+          System.GC.Collect();
+          Util.Message("End of Bartok: " + GC.GetTotalMemory(false));
+          return objFileName;
+      }
+
+      private static void ConvertMsil2Ir(ArrayList fileNames,
+                                         ArrayList refFileNames,
+                                         ArrayList overrideNames,
+                                         ArrayList overrideDefNames,
+                                         bool fDefineOverride,
+                                         DateTime startTime,
+                                         bool fLoadDebugInfo,
+                                         TypeData typeData) {
+          // Remove redundant fileNames
+          // Remove refFileNames that are redundant with fileNames
+          for(int i=0; i<fileNames.Count; ++i) {
+#if ON_SINGULARITY
+              String fileI = ((String)fileNames[i]).ToLower();
+#else
+              String fileI = Path.GetFullPath((String) fileNames[i]).ToLower();
+#endif
+              for(int j=i+1; j<fileNames.Count; ++j) {
+#if ON_SINGULARITY
+                  String fileJ =((String) fileNames[j]).ToLower();
+#else
+                  String fileJ =
+                      Path.GetFullPath((String) fileNames[j]).ToLower();
+#endif
+                  if(fileI == fileJ) {
+                      Util.Warn("Removing redundant input {0} from command line",
+                                fileNames[j]);
+                      fileNames.RemoveAt(j);
+                  }
+              }
+
+              for(int j=0; j<refFileNames.Count; ++j) {
+                  String fileJ = MSIL.MetaDataResolver.ResolveFileName
+                      (libDirNames, (String) refFileNames[j]);
+                  if(fileJ == null) {
+                      // Future failure in MetaDataResolver will have a better
+                      // error message so move on.
+                      continue;
+                  }
+                  fileJ = fileJ.ToLower();
+
+                  if(fileI == fileJ) {
+                      Util.Warn("Removing redundant reference {0} (with a code input) from command line",
+                                refFileNames[j]);
+                      refFileNames.RemoveAt(j);
+                  }
+              }
+
+          }
+
+          // Remove redundant refFileNames (may be redundant with fileNames
+          // or other refFileNames)
+          for(int i=0; i<refFileNames.Count; ++i) {
+              String fileI = MSIL.MetaDataResolver.ResolveFileName
+                  (libDirNames, (String) refFileNames[i]);
+              if(fileI == null) {
+                  // Future failure in MetaDataResolver will have a better
+                  // error message so move on.
+                  continue;
+              }
+              fileI = fileI.ToLower();
+
+              for(int j=i+1; j<refFileNames.Count; ++j) {
+                  String fileJ = MSIL.MetaDataResolver.ResolveFileName
+                      (libDirNames, (String) refFileNames[j]);
+                  if(fileJ == null) {
+                      // Future failure in MetaDataResolver will have a better
+                      // error message so move on.
+                      continue;
+                  }
+                  fileJ = fileJ.ToLower();
+
+                  if(fileI == fileJ) {
+                      Util.Warn("Removing redundant reference {0} from command line",
+                                refFileNames[j]);
+                      refFileNames.RemoveAt(j);
+                  }
+              }
+          }
+
+          bool fTranslateTryAll = StageControl.TryAllSupport;
+          bool fTranslateAtomic = StageControl.AtomicSupport;
+          bool fMsilMessages = Verbosity.level >= NoiseLevel.PerPhase;
+
+          Bartok.MSIL.MetaDataResolver libResolver =
+              new Bartok.MSIL.MetaDataResolver(refFileNames, libDirNames,
+                                               startTime, fLoadDebugInfo,
+                                               fMsilMessages);
+          Bartok.MSIL.MetaDataResolver overrideResolver;
+          if (fDefineOverride) {
+              // load code
+              overrideResolver =
+                  new Bartok.MSIL.MetaDataResolver(overrideNames,
+                                                   startTime,
+                                                   fLoadDebugInfo,
+                                                   fTranslateTryAll,
+                                                   fTranslateAtomic,
+                                                   fMsilMessages);
+          } else {
+              // don't load code
+              overrideResolver =
+                  new Bartok.MSIL.MetaDataResolver(overrideNames,
+                                                   libDirNames,
+                                                   startTime, fLoadDebugInfo,
+                                                   fMsilMessages);
+          }
+          Bartok.MSIL.MetaDataResolver overrideDefResolver =
+              new Bartok.MSIL.MetaDataResolver(overrideDefNames, startTime,
+                                               fLoadDebugInfo,
+                                               fTranslateTryAll,
+                                               fTranslateAtomic,
+                                               fMsilMessages);
+          Bartok.MSIL.MetaDataResolver loadResolver =
+              new Bartok.MSIL.MetaDataResolver(fileNames, startTime,
+                                               fLoadDebugInfo,
+                                               fTranslateTryAll,
+                                               fTranslateAtomic,
+                                               fMsilMessages);
+          Bartok.MSIL.MetaDataResolver[] resolvers =
+              new Bartok.MSIL.MetaDataResolver[] {
+                  libResolver, overrideResolver, overrideDefResolver,
+                  loadResolver
+              };
+          Bartok.MSIL.MetaDataResolver.ResolveCustomAttributes(resolvers);
+          MetaDataParser parser =
+              new MetaDataParser(entryPoints.Count == 0 ? entryPoints : null);
+          Util.TimestampMessage(NoiseLevel.PerPhase,
+                                "translating from MSIL");
+          parser.Parse(loadResolver, overrideResolver,
+                       overrideDefResolver, libResolver,
+                       typeData, fDefineOverride, false);
+
+          Util.TimestampMessage(NoiseLevel.PerPhase,
+                                "finished translating");
+      }
+
+      private static AnalysisRegistry RegisterAnalysis(TypeData typeData) {
+          AnalysisRegistry analysisRegistry = new AnalysisRegistry(typeData);
+          analysisRegistry.RegisterAnalysis(VirtualCallAnalysis.makeFactory());
+          return analysisRegistry;
+      }
+
+      private static void AddPhases(Bartok.Ir.PhaseList phases,
+                                    AnalysisRegistry analysisRegistry,
+                                    String outputName,
+                                    TypeData typeData) {
+          if (StageControl.PrintContainers) {
+              phases.Add(new TypeDataPrintPhase("After parse:"));
+          }
+          if (StageControl.DumpContainers) {
+              phases.Add(new TypeDataPrettyPhase("After parse:"));
+          }
+          if (StageControl.SingSharpTemplateRemover) {
+              phases.Add(new SingSharpTemplateRemover());
+          }
+          if (StageControl.RuntimeMods) {
+              phases.Add(new RuntimeMods());
+          }
+          if (StageControl.IrMultiPropSimple) {
+              phases.Add(new IrMultiPropSimple("System.GC"));
+          }
+          if (StageControl.IrDeadAssignmentSimple1) {
+              phases.Add(new IrDeadAssignmentSimplePhase("System.GC"));
+          }
+          if (StageControl.IrTreeShake) {
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          /*
+          phases.Add
+              (new DynamicCount
+                  ("VirtualCallsStart",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CallVirtual,
+                        Operator.OpCodes.InterfaceCall),
+                   DynamicCount.Granularity.PerSite));
+          */
+
+          /*
+          phases.Add
+              (new DynamicCount
+                  ("ASCstart",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CheckArrayStore,
+                        Operator.OpCodes.CheckVectorStore),
+                   DynamicCount.Granularity.PerSite));
+          */
+
+          if (StageControl.PtrAnalysis) {
+              phases.Add(PtrTypeSimpleSystem.CreateAnalysis());
+              phases.Add(PtrTypeHierarchySystem.CreateAnalysis());
+              phases.Add(PtrTypeSetSystem.CreateAnalysis());
+          }
+
+          // create wrapper that insert calls to leaveGCSafeState and
+          // enterGCSafeState.
+          phases.Add(new CreateEntryPointWrapper());
+
+          // trap ValueType.Equals and override it by compiler generated
+          // routines.
+          if (StageControl.IrOverrideValueTypeEquals) {
+              phases.Add(new Convert.ValueTypeEquals());
+          }
+
+          if (StageControl.LimitedReflection) {
+              phases.Add(new Convert.OverrideVTableInit());
+          }
+
+          if (StageControl.IrConvertSizeofPrimitive) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.SizeofPrimitive;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          /* SPOONS: region related phases:
+          // A temporary pass that cleans up the scratch objects so that the
+          // DemandAnalysis is not confused by the randomness that the tree
+          // shaker leaves behind.
+          phases.Add(new CleanScratch());
+
+          // Build a "Foo_layout" for each class "Foo"; other setup required
+          // by DemandAnalysis.
+          phases.Add(new LayoutBuilder());
+
+          // Perform first- and last-use analysis; add explicit region
+          // variables and effects.
+          phases.Add(new DemandAnalysis());
+
+          // Print the code
+          phases.Add(new TypeDataPrettyPhase("After Demand:"));
+          */
+
+          // Perform first- and last-use analaysis; add explicit region
+          // variables and effects.
+
+          // must happen after DemandAnalysis, but before any inlining /
+          // rearranging basic blocks or calls.
+#if !VC
+          if(StageControl.TryAllSupport) {
+              phases.Add(new Bartok.Convert.PropagateLogging(analysisRegistry));
+              phases.Add(new TypeDataDummyPhase());
+          }
+#endif
+
+          if (StageControl.IrScanCallEffects) {
+              phases.Add(new IrScanCallEffects());
+          }
+
+          if(StageControl.DumpInheritance) {
+              phases.Add(new DumpInheritancePhase(StageControl.DumpInheritanceFile));
+          }
+
+#if PHX_TODO
+          phases.Add(new TypeDataToPhoenix());
+#endif
+          phases.Add(new TypeInit(initializerSkips));
+
+          if (StageControl.InstrumentCalls) {
+              phases.Add(new InstrumentCalls());
+          }
+
+          if (StageControl.IrStoreChecks) {
+              phases.Add(new IrStoreCheckElim());
+          }
+          if (StageControl.BuildC2Mods
+              && StageControl.UnmanagedStrings) {
+              phases.Add(new IrUnmanagedStrings());
+          }
+          phases.Add(IrCleanup.Create());
+          if (StageControl.BuildC2Mods
+              && StageControl.IdentifyAsMethods) {
+              phases.Add(new IrIdentifyAsMethods());
+          }
+
+          if (StageControl.WholeProgram
+              && StageControl.IrDeadAssignmentSimpleFormals
+              && StageControl.IrTreeShake) {
+              phases.Add(new IrDeadAssignmentSimpleFormalsPhase());
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          phases.Add(new Convert.IrInsertDelegate());
+
+          IrFieldAnalysis fieldAnalysis = null;
+          if (StageControl.GCType ==
+              StageControl.ReferenceCountingCollector &&
+              StageControl.RCCollectorOptRCSubsumed &&
+              StageControl.RCCollectorOptRCSubsumedByROFields) {
+              IrFieldAnalysis.FieldFilter filter =
+                  new IrFieldAnalysis.RCAproposFieldFilter();
+              fieldAnalysis = new IrFieldAnalysis(true, filter);
+              phases.Add(fieldAnalysis);
+          }
+
+          if(StageControl.IrInlineConstructor) {
+              phases.Add(new Convert.ToMir(Convert.ToMir.Mask.Constructor));
+          }
+          // When only one class implements an interface, replace the interface
+          // with the class.
+          if (StageControl.IrInterfaceElim && StageControl.WholeProgram) {
+              phases.Add(new InterfaceElim());
+          }
+
+          if (StageControl.IrSimpleInliner) {
+              phases.Add(new IrSimpleInliner(new IrInline(), false, false, false));
+          } else if (StageControl.IrAttributeInliner) {
+              // inline methods that has [inline] attributes.
+              phases.Add(new IrSimpleInliner(new IrInline(), false, false));
+          }
+
+          if (StageControl.FailAfterInliner) {
+              phases.Add(new FailPhase());
+          }
+
+          if (StageControl.IrMultiPropSimple) {
+              phases.Add(new IrMultiPropSimple());
+          }
+          if (StageControl.IrSuppressExnEdges) {
+              phases.Add(new IrSuppressExnEdges());
+          }
+          if (StageControl.IrLoadStoreOpt) {
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+          }
+          if (StageControl.DevirtualizeCall) {
+              phases.Add(new IrDevirtualizeCall(analysisRegistry));
+          }
+
+          if (StageControl.IrSimpleInliner &&
+              StageControl.IrInlinerDoIncreaseSize) {
+              phases.Add(new IrSimpleInliner(new IrInline(), true, false, false));
+          }
+
+          if (StageControl.LazyTypeInits) {
+              phases.Add(new TypeInit(initializerSkips, true));
+          }
+
+          // Eliminate unnecessary instanceOf/check casts.   Only makes
+          // 2 passes by punting back edges.
+          if (StageControl.IrTypeTestElimPunt) {
+              phases.Add(new TypeTestElimPunt());
+          }
+
+          // Eliminate unnecessary instanceOf/check casts - full iterative
+          // analysis.   More expensive than the above analysis, but yields
+          // little improvement in practice.
+          if (StageControl.IrTypeTestElim) {
+              phases.Add(new TypeTestElim());
+          }
+
+          // Deletes all CheckCasts and instanceOf IDisposable for sake of
+          // experimentation.  Normally not enabled, as it is unsafe.
+
+          if (StageControl.IrDeleteCheckCasts) {
+              phases.Add(new DeleteCheckCast());
+          }
+
+          if (StageControl.IrConvertOpt) {
+              phases.Add(new IrConvertOpt());
+              phases.Add(new IrDeadAssignmentSimplePhase());
+              phases.Add(new IrReverseCopyProp());
+          }
+
+          // Just do thread analysis once.
+          IrLockedFields locks = null;
+          if (StageControl.ExtendThreadFieldsABCD ||
+              StageControl.SsaNullCheckGlobalThreaded) {
+
+              if (StageControl.IrTreeShake) {
+                  phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                             dynamicLoads,
+                                             StageControl.WholeProgram,
+                                             analysisRegistry));
+              }
+
+              if(StageControl.OptimisticLocking) {
+                  locks = new ClassIrLockedFields(analysisRegistry);
+              } else {
+                  locks = new IrLockedFields(analysisRegistry);
+              }
+              phases.Add(locks);
+          }
+
+          // Array bounds check elimination
+          if (StageControl.ABCD) {
+              phases.Add(new ABCD(analysisRegistry, locks));
+          }
+
+          if (StageControl.IrConvertArrayBounds) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.CheckVectorBounds;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrConvertInferface) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.InterfaceCall;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrConvertSimpleArrayAccess) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.SimpleArrayAccess;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrCloneLoopHeader) {
+              phases.Add(new IrCloneLoopHeader());
+              phases.Add(new IrJumpElim());
+              phases.Add(new IrMultiPropSimple());
+          }
+
+          if (StageControl.SsaOpts) {
+              if (StageControl.SsaNullCheckGlobalThreaded) {
+                  phases.Add(SSAPhase.Create(analysisRegistry, locks));
+              } else {
+                  phases.Add(SSAPhase.Create());
+              }
+          }
+
+          if(locks != null) {
+              locks = null;
+          }
+
+          // IrInsertStructCopy phase insert a StructCopy() method
+          // to each struct type, and lower struct Id operators
+          // to a call to StructCopy() method.
+          phases.Add(new Convert.IrInsertStructCopy());
+
+#if !VC
+          if(StageControl.TryAllSupport) {
+              phases.Add(new IrInsertLogging());
+          }
+
+          if(StageControl.TryAllSupport &&
+             StageControl.AtomicSupportUpdateEnlistOptFlow) {
+              // without the IrLoadStoreOpt here, EnlistIndirects
+              // generated by [Store]StructFields can't be moved.
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+              phases.Add(new IrInsertUpdateEnlistments());
+              // otherwise CSE misses things that it should be eliminating
+              phases.Add(new IrMultiPropSimple());
+          }
+
+          if (StageControl.TryAllSupport &&
+              StageControl.IrKeepManager) {
+              phases.Add(new IrKeepManager(analysisRegistry));
+          }
+#endif
+
+          if(StageControl.IrStructVectorOperations) {
+              phases.Add(new IrStruct(true));
+          }
+
+          if (StageControl.IrLoadStoreOpt) {
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+          }
+
+#if !VC
+          if (StageControl.TryAllSupport &&
+              StageControl.AtomicSupportUpdateEnlistOpt) {
+              phases.Add(new IrSimpleAvoidUpgrade());
+          }
+#endif
+
+          if (StageControl.IrConvertComplexArrayAccess) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.ComplexArrayAccess;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.IrConvertExpandedArrayAccess) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.ExpandedArrayAccess;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.ArraySupportOptimizePass && StageControl.SsaOpts) {
+              phases.Add(SSAPhase.Create());
+          }
+
+#if !VC
+          if (StageControl.TryAllSupport &&
+              StageControl.TryAllSupportOptimizePass &&
+              StageControl.SsaOpts) {
+              phases.Add(SSAPhase.Create());
+          }
+#endif
+
+          if (StageControl.IrInitStaticField) {
+              phases.Add(new IrInitStaticField());
+          }
+
+          if (StageControl.LazyTypeInits
+              && StageControl.TypeInitRemoveEmptyCctors) {
+              phases.Add(new TypeInit(initializerSkips, true));
+          }
+
+          if (StageControl.GCType ==
+              StageControl.ReferenceCountingCollector) {
+              phases.Add(new IrStructRCUpdate());
+          }
+
+          if (StageControl.GCType ==
+              StageControl.DeferredReferenceCountingCollector) {
+              phases.Add(new IrStructDRCUpdate());
+          }
+
+          if (StageControl.IrTreeShake && StageControl.IrTreeShakeLate) {
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          if (StageControl.TypedReference) {
+              phases.Add(new Convert.ToMir(Convert.ToMir.Mask.Vararg1));
+
+              // All of vararg1 must finish before vararg2, so we wrap vararg2
+              // in a typedata phase to enforce that.
+              phases.Add(new TypeDataMethodPhase
+                  (new Convert.ToMir(Convert.ToMir.Mask.Vararg2)));
+          }
+
+          /*
+          // We do not know where all of the calls will be because lowering can
+          // introduce calls.  We make a best guess here.  If we moved all
+          // call-generating lowering to HIR (via ToMir or equivalent), then
+          // this could be easily done.  We are currently missing calls for the
+          // following:
+          // - pinvoke, stubs, etc
+          // - some arithmetic conversions
+          // - casts - can't add because not all are calls
+          // - RC, tryall, atomic
+          // - others?
+          phases.Add
+              (new DynamicCount
+                  ("Calls",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.Call,
+                        Operator.OpCodes.CallIndirect,
+                        Operator.OpCodes.CallVirtual,
+                        Operator.OpCodes.InterfaceCall,
+                        Operator.OpCodes.MonitorEnter,
+                        Operator.OpCodes.MonitorExit,
+                        Operator.OpCodes.IndirectToData,
+                        Operator.OpCodes.CustomGetSize,
+                        Operator.OpCodes.CheckVectorStore,
+                        Operator.OpCodes.CheckVectorElementAddress,
+                        Operator.OpCodes.InitVector,
+                        Operator.OpCodes.CheckArrayStore,
+                        Operator.OpCodes.CheckArrayElementAddress,
+                        Operator.OpCodes.InitArray,
+                        Operator.OpCodes.InitType,
+                        Operator.OpCodes.GetITable,
+                        Operator.OpCodes.NewObject,
+                        Operator.OpCodes.NewVector,
+                        Operator.OpCodes.NewArray),
+                   DynamicCount.Granularity.Global));
+          phases.Add(new TypeDataDummyPhase());
+          phases.Add
+              (new DynamicCount
+                  ("VirtualCallsEnd",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CallVirtual,
+                        Operator.OpCodes.InterfaceCall),
+                   DynamicCount.Granularity.PerSite));
+
+          phases.Add
+              (new DynamicCount
+                  ("ASCend",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.CheckArrayStore,
+                        Operator.OpCodes.CheckVectorStore),
+                   DynamicCount.Granularity.PerSite));
+          phases.Add(new TypeDataDummyPhase());
+
+          phases.Add
+              (new DynamicCount
+                  ("WB",
+                   new DynamicCount.OpcodeFilter
+                       (Operator.OpCodes.LocWriteBarrier),
+                   DynamicCount.Granularity.Global));
+          phases.Add(new TypeDataDummyPhase());
+          */
+
+          if (StageControl.WholeProgram && StageControl.OptRuntimeData) {
+              phases.Add(new RuntimeData());
+          }
+
+          if (StageControl.IrConvertArrayOpt) {
+              phases.Add(new IrConvertArrayOpt());
+          }
+
+          // insert write barrier after chooserep so we know the size of
+          // of objects. This is needed because we try to remove write
+          // barrier when we store to the young generation, however,
+          // big objects are in the old generation even though it is
+          // newly created. Therefore, we need to know object size to
+          // know if it is a big object.
+          if (StageControl.InsertWriteBarrier) {
+              phases.Add(new IrWriteBarrier());
+              phases.Add(new Convert.ToMir
+                  (Convert.ToMir.Mask.ConvertWriteBarrier));
+          }
+
+          // convert type tests and sizeof effect to Mir
+          Convert.ToMir.Mask typeMask = Convert.ToMir.Mask.CheckCast
+                                        | Convert.ToMir.Mask.Sizeof;
+          if (!(StageControl.GCType ==
+              StageControl.ReferenceCountingCollector ||
+              StageControl.GCType ==
+              StageControl.DeferredReferenceCountingCollector)) {
+              typeMask |= Convert.ToMir.Mask.GetCurrentThread;
+          }
+          if (StageControl.TypedReference) {
+              typeMask |= Convert.ToMir.Mask.TypedRef;
+          }
+          phases.Add(new Convert.ToMir(typeMask));
+
+          if (StageControl.IrSimpleInliner) {
+              phases.Add(new IrSimpleInliner(new IrInline(), false, true,
+                                             true, 0, 0, 0));
+          }
+
+           if(StageControl.TypeInitElim) {
+               phases.Add(new IrTypeInitElim(analysisRegistry));
+           }
+
+          if (StageControl.IrRemoveDoubleCmp) {
+              phases.Add(new IrCmpElim());
+          }
+
+          if (StageControl.IrArrayBaseLength) {
+              phases.Add(new IrArrayBaseLength());
+              phases.Add(new IrDeadAssignmentSimplePhase());
+          }
+
+          if (StageControl.IrInitTypeInliner &&
+              StageControl.LazyTypeInits) {
+              phases.Add(new IrInitTypeInliner(typeData, new IrInline()));
+          }
+
+          if (StageControl.GCType ==
+              StageControl.ReferenceCountingCollector) {
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "Before RC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              phases.Add(new IrRCUpdate());
+
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After RC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+              if (StageControl.RCCollectorOptImmortals) {
+                  phases.Add(new IrImmortalObjectRCUpdates());
+              }
+              if (StageControl.RCCollectorOptRCSubsumed) {
+                  IrSimpleThreadEscape threadLocalObjects = null;
+                  if (StageControl.RCCollectorOptThreadLocalAnalysis) {
+                      IrLockedFields threadSafeFields = null;
+                      if (StageControl.WholeProgram &&
+                          StageControl.
+                          RCCollectorOptRCSubsumedByTSFields) {
+                          threadSafeFields =
+                              new IrLockedFields(analysisRegistry);
+                          phases.Add(threadSafeFields);
+                      }
+                      threadLocalObjects =
+                          new IrSimpleThreadEscape(analysisRegistry,
+                                                   threadSafeFields);
+                      phases.Add(threadLocalObjects);
+                  }
+                  IrRCSubsumedRCUpdates rcSubsumption =
+                      new IrRCSubsumedRCUpdates(analysisRegistry,
+                                                fieldAnalysis,
+                                                threadLocalObjects);
+                  phases.Add(rcSubsumption);
+              }
+              if (StageControl.RCCollectorOptCoalescingUpdates) {
+                  phases.Add(new IrBBLocalCoalesceRCUpdates());
+              }
+              if (StageControl.
+                  RCCollectorOptStaticAcyclicRefTypeUpdates) {
+                  phases.Add(new IrAcyclicRefTypeRCUpdates());
+              }
+              if (StageControl.RCCollectorOptNonNullRCUpdates) {
+                  phases.Add(SSAPhase.NullCheckAnalysis());
+              }
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After RC Optimizations";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.RCUpdate |
+                  Convert.ToMir.Mask.GetCurrentThread;
+              phases.Add(new Convert.ToMir(mask));
+              if (StageControl.RCCollectorOptInlineRCUpdates &&
+                  StageControl.IrSimpleInliner) {
+                  phases.Add(new IrSimpleInliner(new IrInline(),
+                                                 true,
+                                                 false,
+                                                 true));
+              }
+              phases.Add(new TypeDataDummyPhase());
+          }
+
+          if (StageControl.GCType ==
+              StageControl.DeferredReferenceCountingCollector) {
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "Before DRC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              phases.Add(new IrDRCUpdate());
+
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After DRC Update Injection";
+                  phases.Add(new IrBBStats(message));
+              }
+              if (StageControl.RCCollectorOptImmortals) {
+                  phases.Add(new IrImmortalObjectRCUpdates());
+              }
+              if (StageControl.RCCollectorOptCoalescingUpdates) {
+                  phases.Add(new IrBBLocalCoalesceRCUpdates());
+              }
+              if (StageControl.
+                  RCCollectorOptStaticAcyclicRefTypeUpdates) {
+                  phases.Add(new IrAcyclicRefTypeRCUpdates());
+              }
+              if (StageControl.RCCollectorOptNonNullRCUpdates) {
+                  phases.Add(SSAPhase.NullCheckAnalysis());
+              }
+              if (StageControl.RCCollectorShowStatistics) {
+                  String message = "After DRC Optimizations";
+                  phases.Add(new IrBBStats(message));
+              }
+
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.RCUpdate |
+                  Convert.ToMir.Mask.GetCurrentThread;
+              phases.Add(new Convert.ToMir(mask));
+              if (StageControl.RCCollectorOptInlineRCUpdates &&
+                  StageControl.IrSimpleInliner) {
+                  phases.Add(new IrSimpleInliner(new IrInline(),
+                                                 true,
+                                                 false,
+                                                 true));
+              }
+              phases.Add(new TypeDataDummyPhase());
+          }
+
+
+#if !VC
+          if(StageControl.TryAllSupport &&
+             StageControl.TryAllDecomposeOpt) {
+              phases.Add(new IrDecomposeTransMemChecks(analysisRegistry));
+              // IrDecomposeTransMemChecks emits GetCurrentThread ops
+              phases.Add(new IrLoadStoreOpt(analysisRegistry));
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.GetCurrentThread;
+              phases.Add(new Convert.ToMir(mask));
+          }
+
+          if (StageControl.TryAllSupport &&
+              StageControl.IrConvertTryAll) {
+              Convert.ToMir.Mask mask = Convert.ToMir.Mask.TryAll;
+              phases.Add(new Convert.ToMir(mask));
+              if (StageControl.IrSimpleInliner) {
+                  phases.Add(new IrSimpleInliner(new IrInline(),
+                                                 true,
+                                                 false));
+              }
+          }
+#endif
+
+          // The inliners may inline some of the methods that handle special
+          // MSIL opcodes, adding in instructions like Id<Struct> that we
+          // don't expect to see this late in the lowering.  Add one more
+          // scan of the code to remove them.
+          phases.Add(new Convert.IrInsertStructCopy());
+
+          if (StageControl.IrTreeShake && StageControl.IrTreeShakeLate) {
+              phases.Add(new IrTreeShake(typeData.EntryPoints,
+                                         dynamicLoads,
+                                         StageControl.WholeProgram,
+                                         analysisRegistry));
+          }
+
+          if (StageControl.PtrAnalysis) {
+              phases.Add(PtrTypeSimpleSystem.CreateAnalysis());
+              phases.Add(PtrTypeHierarchySystem.CreateAnalysis());
+              phases.Add(PtrTypeSetSystem.CreateAnalysis());
+          }
+
+          if (StageControl.PrintContainers) {
+              phases.Add(new TypeDataPrintPhase("end of HIR:"));
+          }
+      }
+
+      public static ArrayList fileNames;
+      public static ArrayList refFileNames;
+      public static ArrayList libDirNames;
+      private static ArrayList outputDirNames;
+      public static String outputDirName;
+      public static ArrayList overrideNames;
+      public static ArrayList overrideDefNames;
+      public static String outputRootName;
+      public static ArrayList entryPoints;
+      public static ArrayList linkNames;
+      private static ArrayList initializerSkips;
+      private static ArrayList dynamicLoads;
+      private static bool alreadyPrintedUsage = false;
+
+      private static String StripName(String fileName) {
+          // strip off extension, if there is one.
+          int dotIndex = fileName.LastIndexOf('.');
+          if (dotIndex != -1) {
+              String ext = fileName.Substring(dotIndex + 1);
+              if (ext.Equals("dll") || ext.Equals("obj")
+                  || ext.Equals("exe")) {
+                  fileName = fileName.Substring(0, dotIndex);
+              }
+          }
+          return fileName;
+      }
+
+      private static String GetShortName(String fileName) {
+          int charindex = Math.Max(fileName.LastIndexOf('/'),
+              fileName.LastIndexOf('\\'));
+          String shortName = (charindex >= 0)
+              ? fileName.Substring(charindex + 1)
+              : fileName;
+          return shortName;
+      }
+
+      private static String GetDirName(String fileName) {
+          int charindex = Math.Max(fileName.LastIndexOf('/'),
+                                   fileName.LastIndexOf('\\'));
+          String dirName = (charindex >= 0)
+              ? fileName.Substring(0, charindex + 1)
+              : "";
+          return dirName;
+      }
+
+      private static String ComputeOutputName(String inputFileName,
+                                              String outputDirName) {
+          String fileName = Path.GetFileNameWithoutExtension(inputFileName);
+          String outputName = outputDirName + '\\' + fileName;
+          return outputName;
+      }
+
+      private static void ProcessCmdLine(String[] args) {
+          fileNames = new ArrayList();
+          refFileNames = new ArrayList();
+          libDirNames = new ArrayList();
+          overrideNames = new ArrayList();
+          overrideDefNames = new ArrayList();
+          outputDirNames = new ArrayList();
+          entryPoints = new ArrayList();
+          initializerSkips = new ArrayList();
+          linkNames = new ArrayList();
+          dynamicLoads = new ArrayList();
+          int index = 0;
+#if ON_SINGULARITY
+          index = 1;
+#endif
+          while (index < args.Length) {
+              String argument = args[index];
+              if ((argument[0] == '-') || (argument[0] == '/')) {
+                  String option = argument.Substring(1);
+                  ProcessOption(argument, option, args, ref index);
+              } else {
+                  index++;
+                  fileNames.Add(argument);
+              }
+          }
+          switch (outputDirNames.Count) {
+            case 0: {
+                outputDirName = ".\\debug";
+                break;
+            }
+            case 1: {
+                outputDirName = (String)outputDirNames[0];
+                break;
+            }
+            default: {
+                Util.Error("Error: specified multiple output directories {0}",
+                           new CollectionFormatter(outputDirNames));
+                break;
+            }
+          }
+
+          if((StageControl.GCType == StageControl.ReferenceCountingCollector)
+             && StageControl.StructInheritance) {
+              Util.Abort("Error: RC Collector code has not been updated to "
+                         + "handle struct inheritance");
+          }
+          if((StageControl.GCType ==
+             StageControl.DeferredReferenceCountingCollector)
+             && StageControl.StructInheritance) {
+              Util.Abort("Error: Deferred RC Collector code has not been updated to "
+                         + "handle struct inheritance");
+          }
+      }
+
+      private static void ProcessOption(String argument, String option,
+                                        String[] args, ref int index) {
+          String loweredOption = option.ToLower();
+          String optionValue;
+
+          if (IsOption(args, option, loweredOption, "entry:",
+                       ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(entryPoints, optionValue);
+          } else if (IsOption(args, option, loweredOption, "reference:",
+                              ref index, out optionValue)
+                     || IsOption(args, option, loweredOption, "r:",
+                                 ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(refFileNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "bartoklink:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(linkNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "override:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(overrideNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "overridedef:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(overrideDefNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "lib:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(libDirNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "out:",
+                              ref index, out optionValue)) {
+              outputRootName = optionValue;
+          } else if (IsOption(args, option, loweredOption, "outdir:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(outputDirNames, optionValue);
+          } else if (IsOption(args, option, loweredOption, "skip:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(initializerSkips, optionValue);
+          } else if (IsOption(args, option, loweredOption, "substitute:",
+                              ref index, out optionValue)) {
+              StageControl.substituteString = optionValue;
+          } else if (IsOption(args, option, loweredOption, "disable:",
+                              ref index, out optionValue)) {
+              StageControl.disabledPhaseNames.Add(optionValue);
+          } else if (IsOption(args, option, loweredOption, "dynamicload:",
+                              ref index, out optionValue)) {
+              AddSemicolonDelimitedNames(dynamicLoads, optionValue);
+          } else if (IsOption(args, option, loweredOption, "features:",
+                              ref index, out optionValue)) {
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + "," + optionValue;
+          } else if (IsOption(args, option, loweredOption, "noisymethod:",
+                              ref index, out optionValue)) {
+              StageControl.noisyMethodNames.Add(optionValue);
+              //Util.Message("noisyMethodNames="
+              //             + StageControl.noisyMethodNames);
+          } else if (IsOption(args, option, loweredOption, "debugmethod:",
+                              ref index, out optionValue)) {
+              StageControl.debugMethodNames.Add(optionValue);
+              StageControl.noisyMethodNames.Add(optionValue);
+              //Util.Message("debugMethodNames="
+              //             + StageControl.debugMethodNames);
+          } else if (IsOption(args, option, loweredOption, "verbosity:",
+                              ref index, out optionValue)) {
+              Verbosity.FromString(optionValue);
+          } else if (IsOption(args, option, loweredOption, "marksweepgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.MarkSweepCollector;
+              StageControl.GCLargeObjectSize = 2040;
+              StageControl.InlineSegregatedFreeList = true;
+              StageControl.InsertWriteBarrier = false;
+          } else if (IsOption(args, option, loweredOption, "semispacegc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.SemispaceCollector;
+              StageControl.InsertWriteBarrier = true;
+          } else if (IsOption(args, option, loweredOption, "slidinggc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.SlidingCollector;
+              StageControl.InsertWriteBarrier = true;
+          } else if (IsOption(args, option, loweredOption, "adaptivecopyinggc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.AdaptiveCopyingCollector;
+              StageControl.InsertWriteBarrier = true;
+          } else if (IsOption(args, option, loweredOption,
+                              "referencecountinggc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.ReferenceCountingCollector;
+              StageControl.InsertWriteBarrier = false;
+              StageControl.GCInlineAllocations = false;
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + ",ReferenceCountingGC";
+              if (StageControl.RCCollectorVerifyRefCounts) {
+                  StageControl.UseVTableBits = true;
+                  StageControl.mixinConditionals =
+                      StageControl.mixinConditionals +
+                      ",ReferenceCountingGCVerification";
+              }
+          } else if (IsOption
+                     (args, option, loweredOption, "deferredreferencecountinggc",
+                      ref index, out optionValue)) {
+
+              StageControl.GCType = StageControl.DeferredReferenceCountingCollector;
+              StageControl.InsertWriteBarrier = false;
+              StageControl.GCInlineAllocations = false;
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + ",DeferredReferenceCountingGC";
+              if (StageControl.RCCollectorVerifyRefCounts) {
+                  StageControl.UseVTableBits = true;
+                  StageControl.mixinConditionals =
+                      StageControl.mixinConditionals +
+                      ",DeferredReferenceCountingGCVerification";
+              }
+          } else if (IsOption(args, option, loweredOption, "concurrentmsgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.ConcurrentMSCollector;
+              StageControl.GCLargeObjectSize = 2040;
+              StageControl.Wb = StageControl.WbCMS;
+              StageControl.GCInlineAllocations = false;
+              StageControl.InlineSegregatedFreeList = true;
+              StageControl.PreWriteBarrier = true;
+              StageControl.InsertWriteBarrier = true;
+              StageControl.GCInlineWriteBarrier = false;
+              StageControl.GCWriteBarrierTracksStaticFields = true;
+              StageControl.mixinConditionals =
+                  StageControl.mixinConditionals + ",ConcurrentMSGC";
+          } else if (IsOption(args, option, loweredOption, "nullgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.NullCollector;
+              StageControl.InsertWriteBarrier = false;
+          } else if (IsOption(args, option, loweredOption, "atomicrcgc",
+                              ref index, out optionValue)) {
+              StageControl.GCType = StageControl.AtomicRCCollector;
+              StageControl.GCLargeObjectSize = 2040;
+              StageControl.Wb = StageControl.WbARC;
+              StageControl.GCInlineAllocations = false;
+              StageControl.InlineSegregatedFreeList = true;
+              StageControl.InsertWriteBarrier = true;
+              StageControl.GCInlineWriteBarrier = false;
+              StageControl.GCWriteBarrierTracksStaticFields = true;
+          } else if (IsOption(args, option, loweredOption, "minopt",
+                              ref index, out optionValue)) {
+              StageControl.SsaOpts = false;
+              StageControl.IrInterfaceElim = false;
+              StageControl.DevirtualizeCall = false;
+              StageControl.IrTypeTestElimPunt = false;
+              StageControl.IrTypeTestElim = false;
+              StageControl.IrSimpleInliner = false;
+
+              // IR clean up optimizations
+              StageControl.IrDeadAssignmentSimple2 = false;
+              StageControl.IrCleanupStructOperations = false;
+              StageControl.IrShortCircuitBBlocks = false;
+              StageControl.IrTreeShakeLate = false;
+              StageControl.IrArrayLoadStoreOpt = false;
+              StageControl.IrConvertSimpleArrayAccess = false;
+
+              // from the backend
+              StageControl.RegAllocCoalesce = false;
+              StageControl.RegAllocSpill = StageControl.SpillOptimizeSinglePass;
+              StageControl.OptLirCompactify = false;
+              StageControl.OptLirGlobalConstantProp = false;
+              StageControl.OptLirLocalConstantProp = true;
+              StageControl.OptLirImproveCC = false;
+              StageControl.OptLirPeephole = false;
+              StageControl.OptLirReverseCSE = false;
+              StageControl.OptLirGlobalCopyProp = false;
+              StageControl.OptLirLocalCopyProp = true;
+              StageControl.LayoutLoopHeaderLast = false;
+
+              if (StageControl.SymbolicDebug) {
+                  StageControl.OptimizeLocals = false;
+              }
+          } else if (IsOption(args, option, loweredOption, "nohiropt",
+                              ref index, out optionValue)) {
+              StageControl.ABCD = false;
+              StageControl.DevirtualizeCall = false;
+              StageControl.IdentifyAsMethods = false;
+              StageControl.IrAttributeInliner = false;
+              StageControl.IrBBLocalCopyProp = false;
+              StageControl.IrCleanup = false;
+              StageControl.IrCleanupStructOperations = false;
+              StageControl.IrCloneLoopHeader = false;
+              StageControl.IrConvertOpt = false;
+              StageControl.IrDeadAssignmentSimple1 = false;
+              StageControl.IrDeadAssignmentSimple2 = false;
+              StageControl.IrInitStaticField = false;
+              StageControl.IrInterfaceElim = false;
+              StageControl.IrJumpElim = false;
+              StageControl.IrLoadStoreOpt = false;
+              StageControl.IrMultiPropSimple = false;
+              StageControl.IrPeepholeNull = false;
+              StageControl.IrRemoveDoubleCmp = false;
+              StageControl.IrReverseCopyProp = false;
+              StageControl.IrShortCircuitBBlocks = false;
+              StageControl.IrSimpleInliner = false;
+              StageControl.IrStoreChecks = false;
+              StageControl.IrTreeShakeLate = false;
+              StageControl.IrTypeTestElimPunt = false;
+              StageControl.SsaArraySimple = false;
+              StageControl.SsaDeadCode = false;
+              StageControl.SsaLoopInv = false;
+              StageControl.SsaNullCheck = false;
+              StageControl.SsaOpts = false;
+              StageControl.TypeInitRemoveEmptyCctors = false;
+              StageControl.UnmanagedStrings = false;
+          } else if (IsOption(args, option, loweredOption, "singularity",
+                              ref index, out optionValue)) {
+              StageControl.SingSharpTemplateRemover = true;
+              StageControl.DisablePInvoke = true;
+              StageControl.StrictEcma = true;
+              StageControl.CustomAllocatorTypes = true;
+              StageControl.SurrogateBoxing = true;
+              StageControl.StructInheritance = true;
+              StageControl.IrTreeShakeCreatePointedToStructs = true;
+              StageControl.IrTreeShakeLate = false; // not tested
+              StageControl.TypeInitRemoveEmptyCctors = false; // not tested
+              StageControl.CheckNoHeapAllocation = true;
+          } else if (IsOption(args, option, loweredOption, "verbosehelp",
+                              ref index, out optionValue)) {
+              PrintUsage();
+              StageControl.PrintUsage();
+          } else if (IsOption(args, option, loweredOption, "verbosehelpalpha",
+                              ref index, out optionValue)) {
+              PrintUsage();
+              StageControl.PrintUsageAlpha();
+          } else if (IsOption(args, option, loweredOption, "x86",
+                              ref index, out optionValue)) {
+              StageControl.TargetArch = StageControl.X86;
+              StageControl.Target64Bit = false;
+          } else if (IsOption(args, option, loweredOption, "x64",
+                              ref index, out optionValue)) {
+              StageControl.TargetArch = StageControl.X64;
+              StageControl.Target64Bit = true;
+          } else if (IsOption(args, option, loweredOption, "help",
+                              ref index, out optionValue)
+                     || IsOption(args, option, loweredOption, "?",
+                                 ref index, out optionValue)) {
+              PrintUsage();
+          }  else if (IsOption
+                     (args, option, loweredOption, "centralpt",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.CentralPT;
+          } else if (IsOption
+                     (args, option, loweredOption, "centralpthimem",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.CentralPTHimem;
+          } else if (IsOption
+                     (args, option, loweredOption, "flatdistributedpt",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.FlatDistributedPT;
+          } else if (IsOption
+                     (args, option, loweredOption, "flatdistributedtestpt",
+                      ref index, out optionValue)) {
+                  StageControl.PTType = StageControl.FlatDistributedPTTest;
+          } else if (StageControl.SetOptionFromCommandLine(loweredOption)) {
+              index++;
+          } else if (loweredOption.StartsWith("stagecontrol")) {
+              Util.AbortUserCE("/stagecontrol no longer supported; "
+                               + "use the option directly");
+          } else {
+              Util.AbortUserCE("Unknown option: " + option);
+          }
+      }
+
+      private static bool IsOption(String[] args,
+                                   String option, String loweredOption,
+                                   String possibleOptionName,
+                                   ref int index, out String optionValue) {
+          if(possibleOptionName.EndsWith(":")) {
+              if(loweredOption.StartsWith(possibleOptionName)) {
+                  index++;
+                  if(option.Length == possibleOptionName.Length) {
+                      // case: "/option: value"
+                      optionValue = args[index++];
+                  } else {
+                      // case: "/option:value"
+                      optionValue = option.Substring(possibleOptionName.Length);
+                  }
+                  return true;
+              }
+          } else {
+              if(loweredOption == possibleOptionName) {
+                  index++;
+                  optionValue = null;
+                  return true;
+              }
+          }
+
+          optionValue = null;
+          return false;
+      }
+
+      private static void AddSemicolonDelimitedNames(ArrayList names,
+                                                     String argument) {
+          int index = 0;
+          StringBuilder buf = new StringBuilder();
+          while (index < argument.Length) {
+              if (argument[index] != ';') {
+                  buf.Append(argument[index]);
+                  index++;
+              }
+              else {
+                  if (buf.Length > 0) {
+                      names.Add(buf.ToString());
+                      buf = new StringBuilder();
+                  }
+                  index++;
+              }
+          }
+          names.Add(buf.ToString());
+      }
+
+      public static void PrintUsage() {
+          if (alreadyPrintedUsage) {
+              return;
+          }
+          alreadyPrintedUsage = true;
+          Util.Message(
+@"Usage:
+    bartok [options] files
+
+Bartok main options (case insensitive):
+    /entry: <method1>;<method2>;...    specify entry points
+    /reference: <file1>;<file2>;...    reference metadata from assembly files
+    /r: <file1>;<file2>;...            short form of /reference:
+    /bartoklink: <file1>;<file2>;...   reference precompiled object files
+    /override: <file1>;<file2>;...     files overriding /r: metadata
+    /lib: <dir1>;<dir2>;...            additional dirs to search for references
+    /out: <file>                       output file name
+    /outdir: <dir>                     dir for output .exe, asm, obj, etc.
+                                        (defaults to .\\debug)
+    /skip: <type1>;<type2>;...         specify type initializers to disable
+                                        if building static ordering
+    /substitute:<oldname1>=<newname1>, rename TypeRefs before performing lookup
+     <oldname2>=<newname2>,...
+    /disable:<phasename>               disable a phase
+    /dynamicload:<typename>            make type available for dynamic loading
+    /features:<???>                    << TODO >>
+    /noisymethod:<methname>            enable noisy output for meth
+    /debugmethod:<methname>            enable debug+noisy output for meth
+    /verbosity:<noiselevel>            set output level {Silence,PerPhase,
+                                        PerClass,PerMethod,PerBlock,
+                                        PerInstruction} (defaults to PerPhase)
+    /marksweepgc                       compile for mark-sweep collector
+    /semispacegc                       compile for semispace collector
+    /slidinggc                         compile for sliding collector
+    /adaptivecopyinggc                 compile for semispace-sliding hybrid
+                                        collector
+    /referencecountinggc               compile for reference counting collector
+    /deferredreferencecountinggc       compile for deferred reference counting collector
+    /concurrentmsgc                    compile for concurrent mark-sweep
+                                        collector
+    /nullgc                            compile for no collector
+    /minopt                            disable most optimizations
+    /nohiropt                          disable all HIR optimizations
+    /singularity                       set default Singularity options
+    /verbosehelp                       help message including stage control
+                                        options by category
+    /verbosehelpalpha                  help message including stage control
+                                        options in alphabetical order
+    /help or /?                        help message");
+      }
+  }
+
+  internal class MetaDataOutput : Bartok.MSIL.IMetaDataOutput {
+      public TextWriter Log { get { return Util.Log; } }
+      public TextWriter ErrorOut { get { return Util.ErrorOut; } }
+      public TextWriter WarnOut { get { return Util.WarnOut; } }
+
+      public void Error(string msg)
+      {
+          Util.Error(msg);
+      }
+
+      public void Error(string format, params Object[] objs)
+      {
+          Util.Error(format, objs);
+      }
+
+      public void ErrorDetail(string msg)
+      {
+          Util.ErrorDetail(msg);
+      }
+
+      public void Warn(string msg)
+      {
+          Util.Warn(msg);
+      }
+
+      public void Warn(string format, params Object[] objs)
+      {
+          Util.Warn(format, objs);
+      }
+
+      public void WarnDetail(string msg)
+      {
+          Util.WarnDetail(msg);
+      }
+
+      public void Message(string msg)
+      {
+          Util.Message(msg);
+      }
+  }
+}
diff --git a/base/Applications/Benchmarks/bartok/BartokBenchmark.csproj b/base/Applications/Benchmarks/bartok/BartokBenchmark.csproj
new file mode 100644
index 0000000..9d610b7
--- /dev/null
+++ b/base/Applications/Benchmarks/bartok/BartokBenchmark.csproj
@@ -0,0 +1,62 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\YourApp\YourApp.csproj
+
+Note:   This is the template for a basic console app.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  Provide the relative walk-up path to $(SINGULARITY_ROOT)\Paths.targets.
+  This is annoying, but is necessary in order to get VS builds to work,
+  without requiring that you set environment variables for VS.
+  -->
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>Bartok</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DefineConstants>ON_SINGULARITY</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Bartok.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Declare references to the projects you need, for example: -->
+
+    <Reference Include="msil\Bartok.Analysis.dll"/>
+    <Reference Include="msil\Bartok.Backend.dll"/>
+    <Reference Include="msil\Bartok.CfgUtil.dll"/>
+    <Reference Include="msil\Bartok.Coff.dll"/>
+    <Reference Include="msil\Bartok.Convert.dll"/>
+    <Reference Include="msil\Bartok.Datatype.dll"/>
+    <Reference Include="msil\Bartok.DebugInfo.dll"/>
+    <Reference Include="msil\Bartok.Encode.dll"/>
+    <Reference Include="msil\Bartok.Ir.dll"/>
+    <Reference Include="msil\Bartok.Lir.dll"/>
+    <Reference Include="msil\Bartok.Mangle.dll"/>
+    <Reference Include="msil\Bartok.MSIL.dll"/>
+    <Reference Include="msil\Bartok.Opt.dll"/>
+    <Reference Include="msil\Bartok.Profile.dll"/>
+    <Reference Include="msil\Bartok.Regalloc.dll"/>
+    <Reference Include="msil\Bartok.Tables.dll"/>
+    <Reference Include="msil\Bartok.Utility.dll"/>
+    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj"/>
+    </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Benchmarks/bartok/kernel/Diagnostics.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.Contracts.dll
new file mode 100644
index 0000000..c110da3
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Diagnostics.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.Contracts.pdb
new file mode 100644
index 0000000..955101f
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Diagnostics.dll b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.dll
new file mode 100644
index 0000000..a324a15
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Diagnostics.pdb b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.pdb
new file mode 100644
index 0000000..cbcd9d1
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Diagnostics.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Directory.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/Directory.Contracts.dll
new file mode 100644
index 0000000..324e6d7
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Directory.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Directory.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/Directory.Contracts.pdb
new file mode 100644
index 0000000..39dc5df
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Directory.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Directory.dll b/base/Applications/Benchmarks/bartok/kernel/Directory.dll
new file mode 100644
index 0000000..6017ee2
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Directory.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Directory.pdb b/base/Applications/Benchmarks/bartok/kernel/Directory.pdb
new file mode 100644
index 0000000..c4515bd
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Directory.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Drivers.dll b/base/Applications/Benchmarks/bartok/kernel/Drivers.dll
new file mode 100644
index 0000000..c37ac1d
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Drivers.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Drivers.pdb b/base/Applications/Benchmarks/bartok/kernel/Drivers.pdb
new file mode 100644
index 0000000..2a98a38
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Drivers.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/FileSystem.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/FileSystem.Contracts.dll
new file mode 100644
index 0000000..b41267f
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/FileSystem.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/FileSystem.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/FileSystem.Contracts.pdb
new file mode 100644
index 0000000..68e7e6c
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/FileSystem.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Hal.LegacyPC.dll b/base/Applications/Benchmarks/bartok/kernel/Hal.LegacyPC.dll
new file mode 100644
index 0000000..34808a8
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Hal.LegacyPC.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Hal.LegacyPC.pdb b/base/Applications/Benchmarks/bartok/kernel/Hal.LegacyPC.pdb
new file mode 100644
index 0000000..1b8ed56
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Hal.LegacyPC.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Hypercall.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/Hypercall.Contracts.dll
new file mode 100644
index 0000000..962406c
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Hypercall.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Hypercall.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/Hypercall.Contracts.pdb
new file mode 100644
index 0000000..aa3b935
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Hypercall.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Hypercall.dll b/base/Applications/Benchmarks/bartok/kernel/Hypercall.dll
new file mode 100644
index 0000000..69c79d6
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Hypercall.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Hypercall.pdb b/base/Applications/Benchmarks/bartok/kernel/Hypercall.pdb
new file mode 100644
index 0000000..add584c
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Hypercall.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/ILHelpers.dll b/base/Applications/Benchmarks/bartok/kernel/ILHelpers.dll
new file mode 100644
index 0000000..853b9bc
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/ILHelpers.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/ILHelpers.pdb b/base/Applications/Benchmarks/bartok/kernel/ILHelpers.pdb
new file mode 100644
index 0000000..461e888
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/ILHelpers.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Io.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/Io.Contracts.dll
new file mode 100644
index 0000000..34a285b
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Io.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Io.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/Io.Contracts.pdb
new file mode 100644
index 0000000..f529bdd
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Io.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/IoSystem.dll b/base/Applications/Benchmarks/bartok/kernel/IoSystem.dll
new file mode 100644
index 0000000..6278c92
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/IoSystem.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/IoSystem.pdb b/base/Applications/Benchmarks/bartok/kernel/IoSystem.pdb
new file mode 100644
index 0000000..e9cf95c
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/IoSystem.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Loader.dll b/base/Applications/Benchmarks/bartok/kernel/Loader.dll
new file mode 100644
index 0000000..6091c42
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Loader.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Loader.pdb b/base/Applications/Benchmarks/bartok/kernel/Loader.pdb
new file mode 100644
index 0000000..3ac2c5a
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Loader.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Microsoft.SingSharp.Runtime.dll b/base/Applications/Benchmarks/bartok/kernel/Microsoft.SingSharp.Runtime.dll
new file mode 100644
index 0000000..182dadc
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Microsoft.SingSharp.Runtime.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Microsoft.SingSharp.Runtime.pdb b/base/Applications/Benchmarks/bartok/kernel/Microsoft.SingSharp.Runtime.pdb
new file mode 100644
index 0000000..0661fd0
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Microsoft.SingSharp.Runtime.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Security.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/Security.Contracts.dll
new file mode 100644
index 0000000..619e938
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Security.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Security.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/Security.Contracts.pdb
new file mode 100644
index 0000000..0d44de1
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Security.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Security.dll b/base/Applications/Benchmarks/bartok/kernel/Security.dll
new file mode 100644
index 0000000..b782740
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Security.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Security.pdb b/base/Applications/Benchmarks/bartok/kernel/Security.pdb
new file mode 100644
index 0000000..7c19321
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Security.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/SecurityService.dll b/base/Applications/Benchmarks/bartok/kernel/SecurityService.dll
new file mode 100644
index 0000000..74efcab
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/SecurityService.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/SecurityService.pdb b/base/Applications/Benchmarks/bartok/kernel/SecurityService.pdb
new file mode 100644
index 0000000..e7119d9
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/SecurityService.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Stress.Contracts.dll b/base/Applications/Benchmarks/bartok/kernel/Stress.Contracts.dll
new file mode 100644
index 0000000..4b61a18
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Stress.Contracts.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Stress.Contracts.pdb b/base/Applications/Benchmarks/bartok/kernel/Stress.Contracts.pdb
new file mode 100644
index 0000000..01b462e
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Stress.Contracts.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Stress.dll b/base/Applications/Benchmarks/bartok/kernel/Stress.dll
new file mode 100644
index 0000000..cf32fbd
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Stress.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/Stress.pdb b/base/Applications/Benchmarks/bartok/kernel/Stress.pdb
new file mode 100644
index 0000000..6395486
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/Stress.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/System.Compiler.Runtime.dll b/base/Applications/Benchmarks/bartok/kernel/System.Compiler.Runtime.dll
new file mode 100644
index 0000000..2e8511b
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/System.Compiler.Runtime.dll differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/System.Compiler.Runtime.pdb b/base/Applications/Benchmarks/bartok/kernel/System.Compiler.Runtime.pdb
new file mode 100644
index 0000000..dd77d31
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/System.Compiler.Runtime.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/kernel.exe b/base/Applications/Benchmarks/bartok/kernel/kernel.exe
new file mode 100644
index 0000000..6de7c18
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/kernel.exe differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/kernel.pdb b/base/Applications/Benchmarks/bartok/kernel/kernel.pdb
new file mode 100644
index 0000000..3d37732
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/kernel/kernel.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/kernel/test.cmd b/base/Applications/Benchmarks/bartok/kernel/test.cmd
new file mode 100644
index 0000000..c8bbd2d
--- /dev/null
+++ b/base/Applications/Benchmarks/bartok/kernel/test.cmd
@@ -0,0 +1,5 @@
+@rmdir /q /s obj 2>nul
+@mkdir obj
+@del log 2>nul
+
+bartok.exe /Singularity /verbosity:silence /LinkedStacksRequireExternalBound=true /GCInlineAllocations=false /GCInlineWriteBarrier=false /UseSegmentRegister=true /OmitFramePointer=false /SymbolicDebug=true /DebugInline=true /IrSimpleInliner=false /UnnameTracedPtrs=true /Warnings=true /WholeProgram=true /GenCoffLineNumber=false /MarkSweepGC /minopt /IrSimpleInliner=false /out: obj\kernel.obj /outdir: obj kernel.exe Diagnostics.dll Hypercall.dll Loader.dll Directory.dll Stress.dll IoSystem.dll Hal.LegacyPC.dll System.Compiler.Runtime.dll ILHelpers.dll Microsoft.SingSharp.Runtime.dll Diagnostics.Contracts.dll Hypercall.Contracts.dll Directory.Contracts.dll FileSystem.Contracts.dll Io.Contracts.dll Stress.Contracts.dll Drivers.dll Security.Contracts.dll Security.dll SecurityService.dll
diff --git a/base/Applications/Benchmarks/bartok/kernel/xbartok.script b/base/Applications/Benchmarks/bartok/kernel/xbartok.script
new file mode 100644
index 0000000..d228631
--- /dev/null
+++ b/base/Applications/Benchmarks/bartok/kernel/xbartok.script
@@ -0,0 +1,4 @@
+clear
+perfcnt '-g'
+bartok '/Singularity' '/verbosity:PerPhase' '/LinkedStacksRequireExternalBound=true' '/LinkedStacksDumpBounds=true' '/BackEndComments=true' '/GCInlineAllocations=false' '/GCInlineWriteBarrier=false' '/LinkedStacks=true' '/UseSegmentRegister=true' '/OmitFramePointer=false' '/SymbolicDebug=true' '/DebugInline=true' '/UnnameTracedPtrs=true' '/Warnings=true' '/WholeProgram=true' '/GenCoffLineNumber=false' '/MarkSweepGC' '/minopt' '/IrSimpleInliner=false' '/DumpMethodSizes=false' '/LinkedStacksTrace=false' '/LinkedStacksDumpBounds=false' '/LinkedStacksDumpEntryPointBounds=false' '/out:' '\init\kernel.obj' '/outdir:' '\init' '\init\kernel.exe' '\init\Diagnostics.dll' '\init\Loader.dll' '\init\Directory.dll' '\init\Stress.dll' '\init\IoSystem.dll' '\init\Hal.LegacyPC.dll' '\init\System.Compiler.Runtime.dll' '\init\ILHelpers.dll' '\init\Microsoft.SingSharp.Runtime.dll' '\init\Diagnostics.Contracts.dll' '\init\Directory.Contracts.dll' '\init\FileSystem.Contracts.dll' '\init\Io.Contracts.dll' '\init\Stress.Contracts.dll' '\init\drivers.dll' '\init\Security.Contracts.dll' '\init\Security.dll' '\init\Security.Service.dll'
+perfcnt
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Analysis.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Analysis.dll
new file mode 100644
index 0000000..ad77e57
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Analysis.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Analysis.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Analysis.pdb
new file mode 100644
index 0000000..91a6364
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Analysis.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Backend.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Backend.dll
new file mode 100644
index 0000000..6c6b6a4
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Backend.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Backend.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Backend.pdb
new file mode 100644
index 0000000..8290412
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Backend.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.CfgUtil.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.CfgUtil.dll
new file mode 100644
index 0000000..cbd7f2a
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.CfgUtil.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.CfgUtil.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.CfgUtil.pdb
new file mode 100644
index 0000000..afe07cd
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.CfgUtil.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Coff.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Coff.dll
new file mode 100644
index 0000000..566f09d
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Coff.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Coff.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Coff.pdb
new file mode 100644
index 0000000..db6145e
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Coff.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Convert.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Convert.dll
new file mode 100644
index 0000000..0689e53
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Convert.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Convert.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Convert.pdb
new file mode 100644
index 0000000..82714b2
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Convert.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Datatype.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Datatype.dll
new file mode 100644
index 0000000..1f87802
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Datatype.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Datatype.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Datatype.pdb
new file mode 100644
index 0000000..192a02d
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Datatype.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.DebugInfo.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.DebugInfo.dll
new file mode 100644
index 0000000..a90246e
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.DebugInfo.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.DebugInfo.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.DebugInfo.pdb
new file mode 100644
index 0000000..3dfa377
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.DebugInfo.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Encode.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Encode.dll
new file mode 100644
index 0000000..2b2bb0d
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Encode.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Encode.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Encode.pdb
new file mode 100644
index 0000000..8348722
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Encode.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Ir.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Ir.dll
new file mode 100644
index 0000000..1302eb7
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Ir.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Ir.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Ir.pdb
new file mode 100644
index 0000000..2a0b027
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Ir.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Lir.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Lir.dll
new file mode 100644
index 0000000..3a76816
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Lir.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Lir.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Lir.pdb
new file mode 100644
index 0000000..cefe573
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Lir.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.MSIL.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.MSIL.dll
new file mode 100644
index 0000000..14d3911
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.MSIL.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.MSIL.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.MSIL.pdb
new file mode 100644
index 0000000..ccc1973
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.MSIL.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Mangle.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Mangle.dll
new file mode 100644
index 0000000..b24109d
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Mangle.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Mangle.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Mangle.pdb
new file mode 100644
index 0000000..ee3587c
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Mangle.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Opt.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Opt.dll
new file mode 100644
index 0000000..0832b85
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Opt.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Opt.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Opt.pdb
new file mode 100644
index 0000000..4fe153f
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Opt.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Profile.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Profile.dll
new file mode 100644
index 0000000..51c5ed5
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Profile.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Profile.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Profile.pdb
new file mode 100644
index 0000000..2a85b46
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Profile.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Regalloc.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Regalloc.dll
new file mode 100644
index 0000000..bd5059e
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Regalloc.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Regalloc.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Regalloc.pdb
new file mode 100644
index 0000000..10fcc94
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Regalloc.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Runtime.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Runtime.dll
new file mode 100644
index 0000000..8f0a1ae
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Runtime.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Runtime.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Runtime.pdb
new file mode 100644
index 0000000..eaf779f
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Runtime.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.SystemExtension.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.SystemExtension.dll
new file mode 100644
index 0000000..a67e204
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.SystemExtension.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.SystemExtension.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.SystemExtension.pdb
new file mode 100644
index 0000000..e6f6105
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.SystemExtension.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Tables.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Tables.dll
new file mode 100644
index 0000000..18bf6c9
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Tables.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Tables.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Tables.pdb
new file mode 100644
index 0000000..10da284
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Tables.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Utility.dll b/base/Applications/Benchmarks/bartok/msil/Bartok.Utility.dll
new file mode 100644
index 0000000..dcbdb4e
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Utility.dll differ
diff --git a/base/Applications/Benchmarks/bartok/msil/Bartok.Utility.pdb b/base/Applications/Benchmarks/bartok/msil/Bartok.Utility.pdb
new file mode 100644
index 0000000..f7c9950
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/Bartok.Utility.pdb differ
diff --git a/base/Applications/Benchmarks/bartok/msil/bartok.exe b/base/Applications/Benchmarks/bartok/msil/bartok.exe
new file mode 100644
index 0000000..e703037
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/bartok.exe differ
diff --git a/base/Applications/Benchmarks/bartok/msil/bartok.pdb b/base/Applications/Benchmarks/bartok/msil/bartok.pdb
new file mode 100644
index 0000000..6b2fdf8
Binary files /dev/null and b/base/Applications/Benchmarks/bartok/msil/bartok.pdb differ
diff --git a/base/Applications/Benchmarks/diskreadperf/diskreadperf.csproj b/base/Applications/Benchmarks/diskreadperf/diskreadperf.csproj
new file mode 100644
index 0000000..776bf4c
--- /dev/null
+++ b/base/Applications/Benchmarks/diskreadperf/diskreadperf.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>diskreadperf</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="diskreadperf.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/diskreadperf/diskreadperf.sg b/base/Applications/Benchmarks/diskreadperf/diskreadperf.sg
new file mode 100644
index 0000000..5846768
--- /dev/null
+++ b/base/Applications/Benchmarks/diskreadperf/diskreadperf.sg
@@ -0,0 +1,189 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   diskread.cs
+//
+//  Note:
+//
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications 
+{
+    [ConsoleCategory(HelpMessage="Raw disk read performance test", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "device", Mandatory=true, Position=0 , HelpMessage="Raw device to read")]
+        internal string deviceName;
+
+        [LongParameter( "mb", Default=10, HelpMessage="Megabytes to read.")]
+        internal long numMB;
+
+        [LongParameter( "chunk", Default=65536, HelpMessage="Chunk size for each read.")]
+        internal long chunkSize;
+
+        [LongParameter( "r", Default=1, HelpMessage="Repetition count.")]
+        internal long repetitions;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return DiskRead.AppMain(this);
+        }
+    }
+
+    public class DiskRead
+    {
+        public static DiskDeviceContract.Imp:Ready OpenDevice(String! devname)
+        {
+            DiskDeviceContract.Exp! exp;
+            DiskDeviceContract.Imp! imp;
+            DiskDeviceContract.NewChannel(out imp, out exp);
+            DirectoryServiceContract.Imp ns;
+
+            // get NS endpoint
+            ns = DirectoryService.NewClientEndpoint();
+            bool success = false;
+            ErrorCode error; 
+            success = SdsUtils.Bind(devname, ns, exp, out error);
+            if (!success)
+            {
+                Console.WriteLine("Bind of {0} failed\n", devname);
+                delete imp;
+                delete ns;
+                return null;
+            }
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    Console.WriteLine("{0} does not support DiskDevice", devname);
+                    delete imp;
+                    delete ns;
+                    return null;
+                case imp.ChannelClosed():
+                    Console.WriteLine("DiskDevice channel to {0} closed unexpectedly", devname);
+                    delete imp;
+                    delete ns;
+                    return null;
+            }
+
+            delete ns;
+            return imp;
+        }
+
+        public static bool StringToNumber(String! s, out ulong num)
+        {
+            char [] arr;
+
+            if (s.Length == 0)
+            {
+                num = 0;
+                return false;
+            }
+
+            arr = s.ToCharArray();
+            foreach (char c in arr)
+            {
+                if (! Char.IsDigit(c))
+                {
+                    num = 0;
+                    return false;
+                }
+            }
+            num = (ulong) int.Parse(s);
+            return true;
+        }
+
+
+        private static void  DisplayPerf(long ticks, long cycles, ulong numMB, ulong chunkSize)
+        {
+            double elapsed   = ticks / 10000000.0;
+            double opsPerSec = numMB * 1024 * 1024 / (elapsed * chunkSize);
+            double mbPerSec  = numMB / elapsed;
+            Console.WriteLine("Ops/s: {0:f2}  MB/s: {1:f2}  Elapsed: {2:f2}",
+                              opsPerSec, mbPerSec, elapsed);
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            long numMB = config.numMB;
+            long chunkSize = config.chunkSize; 
+            long iters = config.repetitions;
+
+            DiskDeviceContract.Imp imp;
+            string! devName = config.deviceName;
+
+            imp = OpenDevice(devName);
+            if (null == imp) {
+                return 1;
+            }
+
+            for (long i = 0; i < iters; i++)
+            {
+                long startIrqCount = ProcessService.GetKernelInterruptCount();
+                long startSwitchCount = ProcessService.GetContextSwitchCount();
+                long startKernelGcCount = ProcessService.GetKernelGcCount();
+                int  startGcCount;
+                long startGcMillis;
+                long startGcBytes;
+                GC.PerformanceCounters(out startGcCount,
+                                       out startGcMillis,
+                                       out startGcBytes);
+
+                long cycles;
+                long ticks;
+
+                imp.SendReadPerf( (int) numMB, (int) chunkSize);
+                imp.RecvAckReadPerf(out cycles, out ticks);
+
+
+                int  endGcCount;
+                long endGcMillis;
+                long endGcBytes;
+                GC.PerformanceCounters(out endGcCount,
+                                       out endGcMillis,
+                                       out endGcBytes);
+
+                DisplayPerf(ticks, cycles, (ulong) numMB, (ulong)chunkSize);
+                Console.WriteLine("[AppGC :- cnt {0} bytes {1} Kern: ints {2} swi {3} gcs {4}]",
+                endGcCount - startGcCount,
+                endGcBytes - startGcBytes,
+                ProcessService.GetKernelInterruptCount() - startIrqCount,
+                ProcessService.GetContextSwitchCount() - startSwitchCount,
+                ProcessService.GetKernelGcCount() - startKernelGcCount);
+            }
+
+            delete imp;
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/diskrw/diskrw.csproj b/base/Applications/Benchmarks/diskrw/diskrw.csproj
new file mode 100644
index 0000000..e5c28e6
--- /dev/null
+++ b/base/Applications/Benchmarks/diskrw/diskrw.csproj
@@ -0,0 +1,28 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>diskrw</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="diskrw.sg" />
+    <Compile Include="srandom.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/diskrw/diskrw.sg b/base/Applications/Benchmarks/diskrw/diskrw.sg
new file mode 100644
index 0000000..5912f83
--- /dev/null
+++ b/base/Applications/Benchmarks/diskrw/diskrw.sg
@@ -0,0 +1,376 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   diskrw.sg
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Benchmarks.DiskRW 
+{
+    [ConsoleCategory(HelpMessage="Disk r/w performance test", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter( "device", Mandatory=true, Position=0 , HelpMessage="Device to read/write")]
+        internal string deviceName;
+
+        [LongParameter( "b", Default=0, Mandatory=true, HelpMessage="Set block size to <n> bytes.")]
+        internal long blockBytes;
+
+        [LongParameter( "g", Default=1, HelpMessage="Repeat test n times.")]
+        internal long repeatCount;
+
+        [LongParameter( "l", Default=0, HelpMessage="Fix disk size limit at <n> megabytes.")]
+        internal long diskLimitMB;
+
+        [LongParameter( "m", Default=0, HelpMessage="Perform test with <n> megabytes of data.")]
+        internal long dataMB;
+
+        [LongParameter( "n", Default=0, HelpMessage="Perform test with <n> blocks of data.")]
+        internal long blockCount;
+
+        [LongParameter( "p", Default=0, HelpMessage="Pause <n> seconds between iterations")]
+        internal long pauseSecs;
+
+        [BoolParameter( "r", Default=false, HelpMessage="Perform disk read test.")]
+        internal bool doRead ;
+
+        [BoolParameter( "w", Default=false, HelpMessage="Perform disk write test.")]
+        internal bool doWrite;
+
+        [BoolParameter( "x", Default=false, HelpMessage="Perform test with random I/O offsets.")]
+        internal bool randomIO;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return DiskBenchmark.AppMain(this);
+        }
+    }
+    
+    public class DiskBenchmark
+    {
+        private const uint BytesPerSector = 512;
+        private const uint SectorsPerMB = 1024 * 1024 / BytesPerSector;
+
+        public static DiskDeviceContract.Imp:Ready OpenDevice(String! devname)
+        {
+            DiskDeviceContract.Exp! exp;
+            DiskDeviceContract.Imp! imp;
+            DiskDeviceContract.NewChannel(out imp, out exp);
+            DirectoryServiceContract.Imp ns;
+
+            ErrorCode errorOut;
+            // get NS endpoint
+            ns = DirectoryService.NewClientEndpoint();
+            bool success;
+            success  = SdsUtils.Bind(devname,ns, exp, out errorOut);
+            if (!success)
+            {
+                Console.WriteLine("Bind of {0} failed. Reason:{1}\n",
+                                 devname, SdsUtils.ErrorCodeToString(errorOut));
+                delete imp;
+                delete ns;
+                return null;
+            }
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    Console.WriteLine("{0} does not support DiskDevice", devname);
+                    delete imp;
+                    delete ns;
+                    return null;
+                case imp.ChannelClosed():
+                    Console.WriteLine("DiskDevice channel to {0} closed unexpectedly", devname);
+                    delete imp;
+                    delete ns;
+                    return null;
+            }
+
+            delete ns;
+            return imp;
+        }
+
+        private static ulong GetRandomOffset(SRandom! rng,
+                                             ulong    diskSectorCount,
+                                             ulong    blockBytes)
+        {
+            ulong maxBlock = diskSectorCount * 512 / blockBytes;
+            ulong offset = 0;
+            for (int i = 0; i < 64; i += 30)
+            {
+                offset ^= (ulong)(rng.Next() << i);
+            }
+            offset &= 0x7fffffffffffffff;
+            offset %= maxBlock;
+            return offset * blockBytes;
+        }
+
+        private static void DisplayPerf(bool     didRead,
+                                        bool     didRandom,
+                                        TimeSpan elapsed,
+                                        ulong    blockCount,
+                                        ulong    blockBytes,
+                                        ulong    nextOffset)
+        {
+            double delta = (double)elapsed.Ticks / TimeSpan.TicksPerSecond;
+            double ops   = (double)blockCount / delta;
+
+            string output = String.Format(
+                "{0}{1} {2} {3} Ops/s: {4:f2}  MB/s: {5:f2}  Elapsed: {6:f2}  Check: {7:x}",
+                didRandom ? "R" : "S",
+                didRead ? "R" : "W",
+                blockBytes,
+                blockCount,
+                ops,
+                ops * blockBytes / (1024.0 * 1024.0),
+                delta,
+                nextOffset);
+
+            Console.WriteLine(output);
+            DebugStub.WriteLine(output);
+        }
+
+        public static int DoDevice(string! deviceName,
+                                   int     runNumber,
+                                   ulong   blockCount,
+                                   ulong   blockBytes,
+                                   ulong   diskLimitMB,
+                                   bool    doRandom,
+                                   bool    doRead)
+        {
+            //
+            // Open device
+            //
+            DiskDeviceContract.Imp imp = OpenDevice(deviceName);
+            if (null == imp)
+            {
+                Console.WriteLine("Could not open {0}", deviceName);
+                return 1;
+            }
+
+            //
+            // Get disk size
+            //
+            ulong diskSectorCount;
+
+            imp.SendGetSectorCount();
+            switch receive
+            {
+                case imp.AckGetSectorCount(sectorCount):
+                diskSectorCount = sectorCount;
+                break;
+                case imp.ChannelClosed():
+                    Console.WriteLine("Channel closed unexpectedly");
+                    throw new Exception("Unexpected channel close");
+            }
+
+            // Constrain disk size if user requested
+            if (diskLimitMB != 0 &&
+                diskSectorCount > diskLimitMB * SectorsPerMB)
+            {
+                diskSectorCount = diskLimitMB * SectorsPerMB;
+            }
+            diskLimitMB = diskSectorCount / SectorsPerMB;
+
+            // Constrain block count if it overflows available blocks
+            if (blockCount * blockBytes > diskSectorCount * BytesPerSector)
+            {
+                blockCount = diskSectorCount * BytesPerSector / blockBytes;
+            }
+
+            if (runNumber == 0)
+            {
+                Console.WriteLine("# Type:  {0} {1}",
+                                  doRandom ? "Random" : "Sequential",
+                                  doRead ? "Read" : "Write");
+                Console.WriteLine("# Disk:  {0} MB",
+                                  diskSectorCount / SectorsPerMB);
+                Console.WriteLine("# Limit: {0} MB", diskLimitMB);
+                Console.WriteLine("# Work:  {0:f2} MB",
+                                  blockCount * blockBytes / (1024.0 * 1024.0));
+                Console.WriteLine("# Ops:   {0}", blockCount);
+            }
+
+            byte[] in ExHeap buffer = new [ExHeap] byte [blockBytes];
+
+            SRandom rng = new SRandom();
+
+            ulong diskPos = 0;
+            if (doRandom)
+            {
+                diskPos = GetRandomOffset(rng, diskSectorCount, blockBytes);
+            }
+
+            long startIrqCount = ProcessService.GetKernelInterruptCount();
+            long startSwitchCount = ProcessService.GetContextSwitchCount();
+            long startKernelGcCount = ProcessService.GetKernelGcCount();
+            int  startGcCount;
+            long startGcMillis;
+            long startGcBytes;
+            GC.PerformanceCounters(out startGcCount,
+                                   out startGcMillis,
+                                   out startGcBytes);
+
+            TimeSpan startTime = ProcessService.GetUpTime();
+
+            for (ulong i = 0; i < blockCount; i++)
+            {
+                ulong sector = diskPos / BytesPerSector;
+
+                byte[]! in ExHeap outBuffer;
+                if (doRead)
+                {
+                    imp.SendRead(buffer, 0, blockBytes, sector);
+                    imp.RecvAckRead(out outBuffer);
+                }
+                else
+                {
+                    imp.SendWrite(buffer, 0, blockBytes, sector);
+                    imp.RecvAckWrite(out outBuffer);
+                }
+                buffer = outBuffer;
+
+                if (doRandom)
+                {
+                    diskPos =
+                        GetRandomOffset(rng, diskSectorCount, blockBytes);
+                }
+                else
+                {
+                    diskPos += blockBytes;
+                }
+            }
+            TimeSpan endTime = ProcessService.GetUpTime();
+
+            delete buffer;
+            delete imp;
+
+            DisplayPerf(doRead, doRandom, endTime - startTime,
+                        blockCount, blockBytes, diskPos);
+
+            int  endGcCount;
+            long endGcMillis;
+            long endGcBytes;
+            GC.PerformanceCounters(out endGcCount,
+                                   out endGcMillis,
+                                   out endGcBytes);
+
+            Console.WriteLine("[AppGC :- cnt {0} bytes {1} Kern: ints {2} swi {3} gcs {4}]",
+                endGcCount - startGcCount,
+                endGcBytes - startGcBytes,
+                ProcessService.GetKernelInterruptCount() - startIrqCount,
+                ProcessService.GetContextSwitchCount() - startSwitchCount,
+                ProcessService.GetKernelGcCount() - startKernelGcCount);
+
+            return 0;
+        }
+
+        public static bool ParseNumber(string! arg,
+                                       string! name,
+                                       out ulong value)
+        {
+            // arg should look like "[-/][A-z]:[0-9]"
+            if (arg.Length >= 4)
+            {
+                try
+                {
+                    value = UInt64.Parse(arg.Substring(3));
+                    return true;
+                }
+                catch (FormatException)
+                {}
+                catch (OverflowException)
+                {}
+            }
+            Console.WriteLine("Could not parse {0}", name);
+            value = 0;
+            return false;
+        }
+
+        static void Usage()
+        {
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            string deviceName   = config.deviceName;
+            ulong  blockBytes   = (ulong) config.blockBytes;
+            ulong  blockCount   = (ulong) config.blockCount;
+            ulong  diskLimitMB  = (ulong) config.diskLimitMB;
+            ulong  repeatCount  = (ulong) config.repeatCount;
+            ulong  pauseSecs    = (ulong) config.pauseSecs;
+            bool   randomIO     = config.randomIO;
+            bool   diskReadTest = false;
+            bool  doWrite       = config.doWrite;
+            bool  doRead        = config.doRead;
+            ulong dataMB        = (ulong) config.dataMB;
+
+            if (blockBytes < 512 || (blockBytes & (blockBytes - 1)) != 0)
+            {
+                Console.WriteLine("Block size must be a power of two greater than or equal to 512.");
+                Usage();
+                return -1;
+            }
+
+            if (doRead == doWrite)
+            {
+                Console.WriteLine("Need to specify either read or write test.");
+                Usage();
+                return -1;
+            }
+            else if (doRead)
+            {
+                diskReadTest = true;
+            }
+
+            if (dataMB != 0)
+            {
+                blockCount = dataMB * 1024 * 1024 / blockBytes;
+            }
+
+            for (int run = 0; run < (int)repeatCount; run++)
+            {
+                if (run != 0)
+                    System.Threading.Thread.Sleep(1000 * (int)pauseSecs);
+                Tracing.Log(Tracing.Debug, "Starting diskrw run {0}",
+                            (UIntPtr) run);
+                if (DoDevice(deviceName, run, blockCount, blockBytes,
+                             diskLimitMB, randomIO, diskReadTest) != 0)
+                {
+                    return -1;
+                }
+                Tracing.Log(Tracing.Debug, "Ending diskrw run {0}",
+                            (UIntPtr) run);
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/diskrw/srandom.sg b/base/Applications/Benchmarks/diskrw/srandom.sg
new file mode 100644
index 0000000..8752efe
--- /dev/null
+++ b/base/Applications/Benchmarks/diskrw/srandom.sg
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+using System;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Applications.Benchmarks.DiskRW
+{
+    /// <summary>
+    /// Low-cost Integer random number generator.  The
+    /// implementation is based on the description of Park and
+    /// Miller's RNG on page 278 of Numerical Recipes in C, 2nd
+    /// Edition, by Press, Teukolsky, Vetterling, and Flannery.
+    ///
+    /// The same random number generator is used for our disk
+    /// benchmarks on other platforms.
+    /// </summary>
+    public class SRandom
+    {
+        public const int Maximum = 0x7fffffffu;
+
+        const ulong m = 2147483647;
+        const ulong a = 16807;
+        const uint  initialValue = 0x23456789;
+        uint last;
+
+        public SRandom()
+        {
+            Reset();
+        }
+
+        [Delayed]
+        public void Reset()
+        {
+            last = initialValue;
+        }
+
+        public int Next()
+        {
+            // Use 64-bit multiplication to preserve high bits.
+            ulong tmp = (a * last) % m;
+            last = (uint) tmp;
+            return (int)(last & Maximum);
+        }
+
+        public static void Check()
+        {
+            const int test_iterations = 10000000;
+            SRandom r    = new SRandom();
+            int     hash = 0;
+            for (int i = 0; i < test_iterations; i++)
+            {
+                int n = r.Next();
+                System.Diagnostics.Debug.Assert(n != 0);
+                hash ^= n;
+            }
+            Console.Write("xor sum 1...{0} = {1}\n", test_iterations, hash);
+            System.Diagnostics.Debug.Assert(hash == 1080076236);
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/diskrwnull/diskrw.sg b/base/Applications/Benchmarks/diskrwnull/diskrw.sg
new file mode 100644
index 0000000..78bb024
--- /dev/null
+++ b/base/Applications/Benchmarks/diskrwnull/diskrw.sg
@@ -0,0 +1,357 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   diskrw.sg
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using System.Threading;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Benchmarks.DiskRWNull
+{
+    [ConsoleCategory(HelpMessage="Null Disk r/w performance test", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter( "device", Mandatory=true, Position=0 , HelpMessage="Device to read/write")]
+        internal string deviceName;
+
+        [LongParameter( "b", Default=0, HelpMessage="Set block size to <n> bytes.")]
+        internal long blockBytes;
+
+        [LongParameter( "g", Default=1, HelpMessage="Repeat test n times.")]
+        internal long repeatCount;
+
+        [LongParameter( "l", Default=0, HelpMessage="Fix disk size limit at <n> megabytes.")]
+        internal long diskLimitMB;
+
+        [LongParameter( "m", Default=0, HelpMessage="Perform test with <n> megabytes of data.")]
+        internal long dataMB;
+
+        [LongParameter( "n", Default=0, HelpMessage="Perform test with <n> blocks of data.")]
+        internal long blockCount;
+
+        [LongParameter( "p", Default=0, HelpMessage="Pause <n> seconds between iterations")]
+        internal long pauseSecs;
+
+        [BoolParameter( "r", Default=false, HelpMessage="Perform disk read test.")]
+        internal bool doRead ;
+
+        [BoolParameter( "w", Default=false, HelpMessage="Perform disk write test.")]
+        internal bool doWrite;
+
+        [BoolParameter( "x", Default=false, HelpMessage="Perform test with random I/O offsets.")]
+        internal bool randomIO;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return DiskBenchmark.AppMain(this);
+          }
+    }
+    contract Hack
+    {
+        message Hak();
+        state HACK : one { Hak? -> Hak! -> HACK; }
+    }
+
+    public class DiskBenchmark
+    {
+        static TRef<Hack.Imp:HACK> himp;
+        static TRef<Hack.Exp:HACK> hexp;
+
+        private const uint BytesPerSector = 512;
+        private const uint SectorsPerMB = 1024 * 1024 / BytesPerSector;
+
+        private static ulong GetRandomOffset(SRandom! rng,
+                                             ulong    diskSectorCount,
+                                             ulong    blockBytes)
+        {
+            ulong maxBlock = diskSectorCount * 512 / blockBytes;
+            ulong offset = 0;
+            for (int i = 0; i < 64; i += 30)
+            {
+                offset ^= (ulong)(rng.Next() << i);
+            }
+            offset &= 0x7fffffffffffffff;
+            offset %= maxBlock;
+            return offset * blockBytes;
+        }
+
+        private static void DisplayPerf(bool     didRead,
+                                        bool     didRandom,
+                                        TimeSpan elapsed,
+                                        ulong    blockCount,
+                                        ulong    blockBytes,
+                                        ulong    nextOffset)
+        {
+            double delta = (double)elapsed.Ticks / TimeSpan.TicksPerSecond;
+            double ops   = (double)blockCount / delta;
+
+            Console.Write("{0}{1}.{2} ",
+                          didRandom ? "R" : "S",
+                          didRead ? "R" : "W",
+                          blockBytes);
+
+            Console.WriteLine("Ops/s: {0:f2}  MB/s: {1:f2}  Elapsed: {2:f2}  Check: {3:x}",
+                              ops, ops * blockBytes / (1024.0 * 1024.0),
+                              delta, nextOffset);
+        }
+
+        public static int DoDevice(string! deviceName,
+                                   int     runNumber,
+                                   ulong   blockCount,
+                                   ulong   blockBytes,
+                                   ulong   diskLimitMB,
+                                   bool    doRandom,
+                                   bool    doRead)
+        {
+
+            for(int i = 0; i < 4000; i++)
+            {
+                Hack.Imp! imp;
+                Hack.Exp! exp;
+                Hack.NewChannel(out imp, out exp);
+                delete imp;
+                delete exp;
+            }
+            ulong diskSectorCount = 4000000;
+
+            // Constrain disk size if user requested
+            if (diskLimitMB != 0 &&
+                diskSectorCount > diskLimitMB * SectorsPerMB)
+            {
+                diskSectorCount = diskLimitMB * SectorsPerMB;
+            }
+            diskLimitMB = diskSectorCount / SectorsPerMB;
+
+            // Constrain block count if it overflows available blocks
+            if (blockCount * blockBytes > diskSectorCount * BytesPerSector)
+            {
+                blockCount = diskSectorCount * BytesPerSector / blockBytes;
+            }
+
+            if (runNumber == 0)
+            {
+                Console.WriteLine("# Type:  {0} {1}",
+                                  doRandom ? "Random" : "Sequential",
+                                  doRead ? "Read" : "Write");
+                Console.WriteLine("# Disk:  {0} MB",
+                                  diskSectorCount / SectorsPerMB);
+                Console.WriteLine("# Limit: {0} MB", diskLimitMB);
+                Console.WriteLine("# Work:  {0:f2} MB",
+                                  blockCount * blockBytes / (1024.0 * 1024.0));
+                Console.WriteLine("# Ops:   {0}", blockCount);
+            }
+
+            byte[] in ExHeap buffer = new [ExHeap] byte [blockBytes];
+
+            SRandom rng = new SRandom();
+
+            ulong diskPos = 0;
+            if (doRandom)
+            {
+                diskPos = GetRandomOffset(rng, diskSectorCount, blockBytes);
+            }
+
+            long startIrqCount = ProcessService.GetKernelInterruptCount();
+            long startSwitchCount = ProcessService.GetContextSwitchCount();
+            long startKernelGcCount = ProcessService.GetKernelGcCount();
+            int  startGcCount;
+            long startGcMillis;
+            long startGcBytes;
+            GC.PerformanceCounters(out startGcCount,
+                                   out startGcMillis,
+                                   out startGcBytes);
+
+            Hack.Imp! imph = himp.Acquire();
+            Hack.Exp! exph = hexp.Acquire();
+
+            /***/
+            ESet<Hack.Exp:HACK> eset = new ESet<Hack.Exp:HACK>();
+            eset.Add(exph);
+            /***/
+
+            TimeSpan startTime = ProcessService.GetUpTime();
+
+            for (ulong i = 0; i < blockCount; i++)
+            {
+                byte[]! in ExHeap outBuffer;
+                if (doRead)
+                {
+                    //ProcessService.GetUpTime();
+
+                    //imph.SendHak();
+                    //switch receive { case exph.Hak(): exph.SendHak(); break; case unsatisfiable: throw new System.Exception(); }
+                    //imph.RecvHak();
+
+                    /***/
+                    imph.SendHak();
+                    switch receive { case ep.Hak() in eset: ep.SendHak(); eset.Add(ep); break; case unsatisfiable: throw new System.Exception(); }
+                    imph.RecvHak();
+                    /***/
+
+                    //imph.SendHak(); exph.RecvHak(); exph.SendHak(); imph.RecvHak();
+
+                    outBuffer = buffer;
+                }
+                else
+                {
+                    outBuffer = buffer;
+                }
+                buffer = outBuffer;
+
+                if (doRandom)
+                {
+                    diskPos =
+                        GetRandomOffset(rng, diskSectorCount, blockBytes);
+                }
+                else
+                {
+                    diskPos += blockBytes;
+                }
+            }
+            TimeSpan endTime = ProcessService.GetUpTime();
+
+            /***/
+            imph.SendHak();
+            switch receive { case ep.Hak() in eset: ep.SendHak(); hexp.Release(ep); break; case unsatisfiable: throw new System.Exception(); }
+            imph.RecvHak();
+            himp.Release(imph);
+            eset.Dispose();
+            /***/
+
+            //hexp.Release(exph);
+            //himp.Release(imph);
+
+            delete buffer;
+
+            DisplayPerf(doRead, doRandom, endTime - startTime,
+                        blockCount, blockBytes, diskPos);
+
+            int  endGcCount;
+            long endGcMillis;
+            long endGcBytes;
+            GC.PerformanceCounters(out endGcCount,
+                                   out endGcMillis,
+                                   out endGcBytes);
+
+            Console.WriteLine("[AppGC :- cnt {0} bytes {1} Kern: ints {2} swi {3} gcs {4}/{5}]",
+                endGcCount - startGcCount,
+                endGcBytes - startGcBytes,
+                ProcessService.GetKernelInterruptCount() - startIrqCount,
+                ProcessService.GetContextSwitchCount() - startSwitchCount,
+                ProcessService.GetKernelGcCount() - startKernelGcCount,
+                ProcessService.GetKernelGcCount());
+
+            return 0;
+        }
+
+        public static bool ParseNumber(string! arg,
+                                       string! name,
+                                       out ulong value)
+        {
+            // arg should look like "[-/][A-z]:[0-9]"
+            if (arg.Length >= 4)
+            {
+                try
+                {
+                    value = UInt64.Parse(arg.Substring(3));
+                    return true;
+                }
+                catch (FormatException)
+                {}
+                catch (OverflowException)
+                {}
+            }
+            Console.WriteLine("Could not parse {0}", name);
+            value = 0;
+            return false;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            string deviceName   = config.deviceName;
+            ulong  blockBytes   = (ulong) config.blockBytes;
+            ulong  blockCount   = (ulong) config.blockCount;
+            ulong  diskLimitMB  = (ulong) config.diskLimitMB;
+            ulong  repeatCount  = (ulong) config.repeatCount;
+            ulong  pauseSecs    = (ulong) config.pauseSecs;
+            ulong dataMB        = (ulong) config.dataMB;
+            bool  doWrite       = config.doRead;
+            bool  doRead        = config.doWrite;
+            bool   randomIO     = config.randomIO;
+
+            bool   diskReadTest = false;
+
+            Hack.Imp! imp;
+            Hack.Exp! exp;
+            Hack.NewChannel(out imp, out exp);
+            himp = new TRef<Hack.Imp:HACK>(imp);
+            hexp = new TRef<Hack.Exp:HACK>(exp);
+
+           
+            if (blockBytes < 512 || (blockBytes & (blockBytes - 1)) != 0)
+            {
+                Console.WriteLine("Block size must be a power of two greater than or equal to 512.");
+                return -1;
+            }
+
+            if (doRead == doWrite)
+            {
+                Console.WriteLine("Need to specify either read or write test.");
+                return -1;
+            }
+            else if (doRead)
+            {
+                diskReadTest = true;
+            }
+
+            if (dataMB != 0)
+            {
+                blockCount = dataMB * 1024 * 1024 / blockBytes;
+            }
+
+            for (int run = 0; run < (int)repeatCount; run++)
+            {
+                if (run != 0)
+                    System.Threading.Thread.Sleep(1000 * (int)pauseSecs);
+                Tracing.Log(Tracing.Debug, "Starting diskrw run {0}",
+                            (UIntPtr) run);
+                if (DoDevice(deviceName, run, blockCount, blockBytes,
+                             diskLimitMB, randomIO, diskReadTest) != 0)
+                {
+                    return -1;
+                }
+                Tracing.Log(Tracing.Debug, "Ending diskrw run {0}",
+                            (UIntPtr) run);
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/diskrwnull/diskrwnull.csproj b/base/Applications/Benchmarks/diskrwnull/diskrwnull.csproj
new file mode 100644
index 0000000..43dd557
--- /dev/null
+++ b/base/Applications/Benchmarks/diskrwnull/diskrwnull.csproj
@@ -0,0 +1,28 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>diskrwnull</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="diskrw.sg" />
+    <Compile Include="srandom.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/diskrwnull/srandom.sg b/base/Applications/Benchmarks/diskrwnull/srandom.sg
new file mode 100644
index 0000000..eb09ac7
--- /dev/null
+++ b/base/Applications/Benchmarks/diskrwnull/srandom.sg
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+using System;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Applications.Benchmarks.DiskRWNull
+{
+    /// <summary>
+    /// Low-cost Integer random number generator.  The
+    /// implementation is based on the description of Park and
+    /// Miller's RNG on page 278 of Numerical Recipes in C, 2nd
+    /// Edition, by Press, Teukolsky, Vetterling, and Flannery.
+    ///
+    /// The same random number generator is used for our disk
+    /// benchmarks on other platforms.
+    /// </summary>
+    public class SRandom
+    {
+        public const int Maximum = 0x7fffffffu;
+
+        const ulong m = 2147483647;
+        const ulong a = 16807;
+        const uint  initialValue = 0x23456789;
+        uint last;
+
+        public SRandom()
+        {
+            Reset();
+        }
+
+        [Delayed]
+        public void Reset()
+        {
+            last = initialValue;
+        }
+
+        public int Next()
+        {
+            // Use 64-bit multiplication to preserve high bits.
+            ulong tmp = (a * last) % m;
+            last = (uint) tmp;
+            return (int)(last & Maximum);
+        }
+
+        public static void Check()
+        {
+            const int test_iterations = 10000000;
+            SRandom r    = new SRandom();
+            int     hash = 0;
+            for (int i = 0; i < test_iterations; i++)
+            {
+                int n = r.Next();
+                System.Diagnostics.Debug.Assert(n != 0);
+                hash ^= n;
+            }
+            Console.Write("xor sum 1...{0} = {1}\n", test_iterations, hash);
+            System.Diagnostics.Debug.Assert(hash == 1080076236);
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/perfcnt/perfcnt.csproj b/base/Applications/Benchmarks/perfcnt/perfcnt.csproj
new file mode 100644
index 0000000..c95bc4a
--- /dev/null
+++ b/base/Applications/Benchmarks/perfcnt/perfcnt.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>perfcnt</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="perfcnt.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/perfcnt/perfcnt.sg b/base/Applications/Benchmarks/perfcnt/perfcnt.sg
new file mode 100644
index 0000000..55a5abe
--- /dev/null
+++ b/base/Applications/Benchmarks/perfcnt/perfcnt.sg
@@ -0,0 +1,439 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Perfcnt.cs
+//
+
+using Microsoft.Singularity.Processor;
+using System;
+using System.Runtime.CompilerServices;
+using System.Globalization;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="HW performance counter utility", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "k", Default=false, HelpMessage="Configure for kompute-bound counting.")]
+        internal bool doComputeBound;
+
+        [BoolParameter( "g", Default=false, HelpMessage="Configure for general counting.")]
+        internal bool doGeneral;
+
+        [BoolParameter( "i", Default=false, HelpMessage="Configure for I/O counting.")]
+        internal bool doIO;
+
+        [BoolParameter( "t", Default=false, HelpMessage="Configure for TLB counting.")]
+        internal bool doTLB;
+
+        [BoolParameter( "d", Default=false, HelpMessage="Configure for Data Cache counting.")]
+        internal bool doCache;
+
+        [BoolParameter( ".", Default=false, HelpMessage="Simple test.")]
+        internal bool doDot;
+
+        [BoolParameter( ",", Default=false, HelpMessage="Simple test.")]
+        internal bool doComma;
+
+        [BoolParameter( "z", Default=false, HelpMessage="Simple test.")]
+        internal bool doZ;
+
+        [BoolParameter( "s", Default=false, HelpMessage="Show counters.")]
+        internal bool doShow;
+
+        [BoolParameter( "b", Default=false, HelpMessage="Configure for branch counting.")]
+        internal bool doBranch;
+
+        [LongParameter( "e", Default=-1, HelpMessage="Configure performance counter 'n'.")]
+        internal long eventCounter;
+
+        [LongParameter( "ev", Default=-1, HelpMessage="Configure event value 'v'.")]
+        internal long eventValue;
+
+        [LongParameter( "p", Default=-1, HelpMessage="Read performance counter 'n'.")]
+        internal long counterReg;
+
+        [LongParameter( "c", Default=-1, HelpMessage="Read CPUID function 'n'.")]
+        internal long cpuidReg;
+
+        [LongParameter( "w", Default=-1, HelpMessage="Write 'v' to MSR 'n'.")]
+        internal long writeReg;
+
+        [LongParameter( "wv", Default=-1, HelpMessage="Write 'v' to MSR 'n'.")]
+        internal long writeValue;
+
+        [LongParameter( "r", Default=-1, HelpMessage="Read MSR 'n'.")]
+        internal long msrReg;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Perfcnt.AppMain(this);
+        }
+    }
+
+    [CLSCompliant(false)]
+    public struct PerfEvtSel
+    {
+        // Bits and Flags
+        public const uint CNT_MASK  = 0xff000000;
+        public const uint INV       = 0x00800000;
+        public const uint EN        = 0x00400000;
+        public const uint INT       = 0x00100000;
+        public const uint PC        = 0x00080000;
+        public const uint E         = 0x00040000;
+        public const uint OS        = 0x00020000;
+        public const uint USR       = 0x00010000;
+        public const uint UNIT_MASK = 0x0000ff00;
+        public const uint SELECTOR  = 0x000000ff;
+
+        // Common setting: Count all, but don't interrupt,
+        public const uint COUNT     = (EN | PC | OS | USR);
+        // public const uint COUNT     = (EN | PC | E | OS | USR);
+
+        // Selector values.
+        public const uint DCacheRefillFromL2OrSys           = 0x42; // Speculative
+        public const uint DCacheRefillFromSystem            = 0x43; // Speculative
+        public const uint DtlbL1MissL2Hit                   = 0x45; // Speculative
+        public const uint DtlbL1MissL2Miss                  = 0x46; // Speculative
+        public const uint CyclesNotHalted                   = 0x76; // No E
+        public const uint RequestsToL2Cache                 = 0x7d;
+        public const uint L2CacheMiss                       = 0x7e;
+        public const uint ItlbL1MissL2Hit                   = 0x84;
+        public const uint ItlbL1MissL2Miss                  = 0x85;
+        public const uint RetiredInstructions               = 0xc0; // No E
+        public const uint RetiredBranchInstructions         = 0xc2; // No E
+        public const uint RetiredBranchesMispredicted       = 0xc3; // No E
+        public const uint RetiredBranchesTaken              = 0xc4; // No E
+        public const uint CyclesInterruptsMasked            = 0xcd; // No E
+        public const uint CyclesInterruptsBlocked           = 0xce; // No E
+    }
+
+    public class Perfcnt
+    {
+        public static bool IsIntel;
+        public static bool IsAmd;
+
+        public static ulong Parse(string! value)
+        {
+            if (value.StartsWith("0x") || value.StartsWith("0X")) {
+                return System.UInt64.Parse(value, NumberStyles.AllowHexSpecifier);
+            }
+            else {
+                return System.UInt64.Parse(value);
+            }
+        }
+
+        public static void Reset(uint pmc, ulong value)
+        {
+            if (IsAmd) {
+                // Clear the event selector.
+                Processor.WriteMsr(0xc0010000 + pmc, 0);
+                // Clear the performance counter.
+                Processor.WriteMsr(0xc0010004 + pmc, 0);
+                // Enable the event selector.
+                Processor.WriteMsr(0xc0010000 + pmc, value);
+            }
+        }
+
+        public static void ResetGlobalPerfCounters()
+        {
+            DebugStub.WritePerfCounter(0, 0);
+            DebugStub.WritePerfCounter(1, 0);
+            DebugStub.WritePerfCounter(2, 0);
+            DebugStub.WritePerfCounter(3, 0);
+        }
+
+        public static void Clear()
+        {
+            Console.WriteLine("Clearing counters to zero.");
+            ResetGlobalPerfCounters();
+            if (IsAmd) {
+                for (uint pmc = 0; pmc < 4; pmc++) {
+                    Processor.WriteMsr(0xc0010004 + pmc, 0);
+                }
+            }
+            DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+        }
+
+        public static string EvtSelToString(ulong value)
+        {
+            switch (value & 0xff) {
+                case PerfEvtSel.DCacheRefillFromL2OrSys:    return "DCache_Refill_L2";
+                case PerfEvtSel.DCacheRefillFromSystem:     return "DCache_Refill_Sys";
+                case PerfEvtSel.DtlbL1MissL2Hit:            return "DTLB_L2_Hit";
+                case PerfEvtSel.DtlbL1MissL2Miss:           return "DTBL_L2_Miss";
+                case PerfEvtSel.CyclesNotHalted:            return "CyclesNotHalted";
+                case PerfEvtSel.RequestsToL2Cache:
+                    if ((value & 0x400) != 0) {
+                        return "TLB_L2_Requests";
+                    }
+                    return "Req_L2_Cache";
+                case PerfEvtSel.L2CacheMiss:
+                    if ((value & 0x400) != 0) {
+                        return "TLB_L2_Miss";
+                    }
+                    return "L2_Cache_Miss";
+                case PerfEvtSel.ItlbL1MissL2Hit:            return "ITLB_L2_Hit";
+                case PerfEvtSel.ItlbL1MissL2Miss:           return "ITLB_L2_Miss";
+                case PerfEvtSel.RetiredInstructions:        return "Retired_Inst.";
+                case PerfEvtSel.RetiredBranchInstructions:  return "Branches";
+                case PerfEvtSel.RetiredBranchesMispredicted:return "Br_Mispredicted";
+                case PerfEvtSel.RetiredBranchesTaken:       return "Br_Taken";
+                case PerfEvtSel.CyclesInterruptsMasked:     return "Ints_Masked (cyc)";
+                case PerfEvtSel.CyclesInterruptsBlocked:    return "Ints_Blocked (cyc)";
+                default:
+                    return String.Format("{0:x16}", value);
+            }
+        }
+
+        public static void DumpNow(bool config)
+        {
+            ulong b0 = DebugStub.ReadPerfCounter(7);
+            ulong t0 = Processor.GetCycleCount();
+            ulong e0 = Processor.ReadMsr(0xc0010000);
+            ulong e1 = Processor.ReadMsr(0xc0010001);
+            ulong e2 = Processor.ReadMsr(0xc0010002);
+            ulong e3 = Processor.ReadMsr(0xc0010003);
+            ulong p0 = Processor.ReadPmc(0);
+            ulong p1 = Processor.ReadPmc(1);
+            ulong p2 = Processor.ReadPmc(2);
+            ulong p3 = Processor.ReadPmc(3);
+            ulong z0 = DebugStub.ReadPerfCounter(0);
+            ulong z1 = DebugStub.ReadPerfCounter(1);
+            ulong z2 = DebugStub.ReadPerfCounter(2);
+            ulong z3 = DebugStub.ReadPerfCounter(3);
+
+
+            t0 = t0 - b0;
+
+            if (config) {
+                Console.WriteLine("evt: {0:x16} {1:x16} {2:x16} {3:x16}", e0, e1, e2, e3);
+            }
+
+            Console.WriteLine("evt: {0,16} {1,16} {2,16} {3,16}",
+                              EvtSelToString(e0),
+                              EvtSelToString(e1),
+                              EvtSelToString(e2),
+                              EvtSelToString(e3));
+            Console.WriteLine("pmc: {0:d16} {1:d16} {2:d16} {3:d16}",
+                              p0, p1, p2, p3);
+            Console.WriteLine("pfc: {0:d16} {1:d16} {2:d16} {3:d16}",
+                              z0, z1, z2, z3);
+
+            DebugStub.WriteLine("evt: {0,16} {1,16} {2,16} {3,16} {4,16}",
+                                __arglist("Cycles",
+                                          EvtSelToString(e0),
+                                          EvtSelToString(e1),
+                                          EvtSelToString(e2),
+                                          EvtSelToString(e3)));
+            DebugStub.WriteLine("pmc: {0:d16} {1:d16} {2:d16} {3:d16} {4:d16}",
+                                __arglist(t0, p0, p1, p2, p3));
+            DebugStub.WriteLine("pfc: {0:d16} {1:d16} {2:d16} {3:d16} {4:d16}",
+                                __arglist(z0 + z1 + z2 + z3, z0, z1, z2, z3));
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            // Temporaries for command-line parsing
+            uint eax;
+            uint ebx;
+            uint ecx;
+            uint edx;
+
+            Processor.ReadCpuid(0, out eax, out ebx, out ecx, out edx);
+            if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69) {
+                IsIntel = true;
+            }
+            else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65) {
+                IsAmd = true;
+            }
+
+            uint reg;
+            ulong val;
+
+            if (config.eventCounter != -1) { // program event selector N.
+                reg = (uint) config.eventCounter;
+                val = (ulong) config.eventValue;
+                if (config.eventValue == -1) {
+                    Console.WriteLine("Must specify both -en and -ev to configure an event.");
+                    return -1;
+                }
+                Reset(reg, val);
+                Console.WriteLine("Reset pmc{0}:{1:x16}", reg, val);
+            }
+
+
+            if (config.counterReg != -1) { // read performance counter.
+                reg = (uint)config.counterReg;
+                val = Processor.ReadPmc(reg);
+                Console.WriteLine("read pmc{0}:{1:x16}", reg, val);
+            }
+
+            if (config.doBranch) {   // configure for branch evaluation.
+                ResetGlobalPerfCounters();
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchInstructions);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchesMispredicted);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchesTaken);
+                DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+            }
+
+
+            if (config.doComputeBound) {    // configure for compute-bound tasks.
+                ResetGlobalPerfCounters();
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchInstructions);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.L2CacheMiss | 0x300);
+                DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+            }
+
+            if (config.doGeneral) {   // configure for General evaluation.
+                ResetGlobalPerfCounters();
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.CyclesNotHalted);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.CyclesInterruptsMasked);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+                DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+            }
+
+            if (config.doIO) {   // configure for I/O counting.
+                ResetGlobalPerfCounters();
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.CyclesNotHalted);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.CyclesInterruptsMasked);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.CyclesInterruptsBlocked);
+                DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+            }
+
+            if (config.doTLB) {   // configure for TLB counting.
+                // Just count TLB page walks on L2 Cache.
+                ResetGlobalPerfCounters();
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.L2CacheMiss | 0x400);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.DtlbL1MissL2Hit);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.DtlbL1MissL2Miss);
+                DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+            }
+
+            if (config.doCache) {   // Data Cache
+                // Just count TLB page walks on L2 Cache.
+                ResetGlobalPerfCounters();
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x300);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.L2CacheMiss | 0x300);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.DCacheRefillFromSystem | 0x1f00);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.DCacheRefillFromL2OrSys);
+                DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+            }
+
+            if (config.cpuidReg != -1) {   // read cpuid.
+                reg = (uint)config.cpuidReg;
+                uint v0;
+                uint v1;
+                uint v2;
+                uint v3;
+                Processor.ReadCpuid(reg, out v0, out v1, out v2, out v3);
+                Console.WriteLine("read cpuid{0:x8}:{1:x8}.{2:x8}.{3:x8}.{4:x8}",
+                                  reg, v0, v1, v2, v3);
+            }
+
+            if (config.msrReg != -1) {   // read msr.
+                reg = (uint)config.msrReg;
+                if (reg == 0) {
+                    Console.WriteLine("Invalid read msr: {0}", reg);
+                }
+                else {
+                    val = Processor.ReadMsr(reg);
+                    Console.WriteLine("read msr{0:x8}:{1:x16}", reg, val);
+                }
+            }
+
+            if (config.writeReg != -1 ) { // write msr.
+                if (config.writeValue == -1) {
+                    Console.WriteLine("Invalid write msr: reg={0:x}, value{1:x}", config.writeReg, config.writeValue);
+                    return -1;
+                }
+                reg = (uint)config.writeReg;
+                val = (ulong) config.writeValue;
+                Console.WriteLine("write msr{0:x8}:{1:x16}", reg, val);
+                Processor.WriteMsr(reg, val);
+            }
+
+            if (config.doDot) { //Simple test.
+                Clear();
+                int yy = 0;
+                int sign = 0;
+                for (int zz = 0; zz < 100000; zz++) {
+                    sign *= -1;
+                    yy = yy + sign;
+                }
+                DumpNow(true);
+            }
+
+            if (config.doComma) { //Simple test.
+                Clear();
+                int yy = 0;
+                int sign = 0;
+                for (int zz = 0; zz < 100000; zz++) {
+                    sign *= -1;
+                    yy = yy + sign;
+                }
+                Thread.Sleep(2);
+                DumpNow(true);
+            }
+
+            if (config.doZ) { //Simplest test.
+                // Clear the event selectors.
+                Processor.WriteMsr(0xc0010000, 0);
+                Processor.WriteMsr(0xc0010001, 0);
+                // Clear the performance counters.
+                Processor.WriteMsr(0xc0010004, 0);
+                Processor.WriteMsr(0xc0010005, 0);
+                // Enable the event selectors.
+                Processor.WriteMsr(0xc0010000, 0x4f00c0);
+                Processor.WriteMsr(0xc0010001, 0x4f00c2);
+
+                int yy = 0;
+                int sign = 1;
+                for (int zz = 0; zz < 100000; zz++) {
+                    sign *= -1;
+                    yy = yy + sign;
+                }
+
+                ulong p0 = Processor.ReadPmc(0);
+                ulong p1 = Processor.ReadPmc(1);
+                Console.WriteLine("retired instrcts: {0}", p0);
+                Console.WriteLine("retired branches: {0}", p1);
+            }
+
+            if (false /* FIXFIX need a really long check here */) {
+                DumpNow(false);
+            }
+
+            if (config.doShow /* FIXFIX need a really long check here */) {
+                DumpNow(false);
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/AssemblyInfo.cs b/base/Applications/Benchmarks/sharpSAT/AssemblyInfo.cs
new file mode 100644
index 0000000..f2358ca
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+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("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation.  All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/base/Applications/Benchmarks/sharpSAT/base_solver.cs b/base/Applications/Benchmarks/sharpSAT/base_solver.cs
new file mode 100644
index 0000000..f2ef7f8
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/base_solver.cs
@@ -0,0 +1,7855 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//#define CHECK
+#define GEN_RESOLVE_TRACE
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    /// <summary>
+    /// Summary description for Class1.
+    /// </summary>
+
+    public class SharpSATSolver : SATCommon
+    {
+        public SolverStats      stats;
+        internal SATHook        hook;
+        internal SolverParams   parameters;
+
+        private int             unique_id;  //the unique id seen so far for the nodes
+        private IntVector       active_area;
+
+        //private Process currentProcess          = Process.GetCurrentProcess();
+        internal VarVector      variables       = new VarVector(4);
+        internal ClsVector      clauses         = new ClsVector(4);
+        private ObjVector       watched_clauses = new ObjVector(4);
+        private IntVector       free_clauses    = new IntVector(4);
+
+        internal IntVector      original_clauses= new IntVector(4);
+
+        private NodeHashMap     node_hash       = new NodeHashMap();
+        private FreeList        free_nodes;
+        private IntVector       zero_ref_nodes  = new IntVector(4);
+        private int             constant_one;
+
+        private MyHashtable     node_to_pi_hash = new MyHashtable();
+        internal IntVector      primary_inputs  = new IntVector(4);
+
+        private ObjVector       asgn_stack      = new ObjVector(4);
+        private int             dlevel          = 0;
+        private Queue           implication_queue = new Queue();
+        private IntVector       conflict_array  = new IntVector(4);
+        private IntVector       learned_clause  = new IntVector(4);
+
+        private IntVector       conflict_clauses= new IntVector(128);
+        private IntVector       ordered_vars    = new IntVector(4);
+        private int             max_score_pos   = 0;
+
+        private IntVector       temporary_clauses= new IntVector(16);
+        private ResolutionTrace rtrace          = null;
+
+        [Microsoft.Contracts.NotDelayed]
+        internal SharpSATSolver()
+        {
+            stats               = new SolverStats(true);
+            parameters          = new SolverParams(true);
+            rtrace              = new ResolutionTrace(this);
+            variables           = new VarVector(4);
+            asgn_stack          = new ObjVector(4);
+            watched_clauses     = new ObjVector(4);
+            free_nodes          = new FreeList(variables);
+            //create Variable Num. 0: Constant 1
+            int s               = new_node(NodeType.CONSTANT, INVALID, INVALID);
+            sharp_assert (s == 0);
+            asgn_stack.push_back            (new IntVector(4)); //for decision level 0
+            constant_one        = s;
+            primary_inputs      = new IntVector(4);
+
+            stats.num_free_branch_vars  = 0;    //i.e. signal 0 doesn't count;
+            stats.num_free_variables    = 0;
+            stats.next_restart  = parameters.first_restart;
+            stats.next_gc       = parameters.gc_period;
+            stats.next_decay    = parameters.decay_period;
+
+            active_area         = new IntVector(128);
+            reasoning_flag  = alloc_flag();
+            marked_flag     = alloc_flag();
+            branchable_flag = alloc_flag();
+            in_cl_flag      = alloc_flag();
+            in_cl_sign_flag = alloc_flag();
+            active_flag     = alloc_flag();
+        }
+
+        int canonical(int s)
+        {
+            bool invert = false;
+            int r;
+            for (r = s; variable(NODE_ID(r)).canonical != INVALID; r = variable(NODE_ID(r)).canonical)
+                if (IS_NEGATED(s))
+                    invert = !invert;
+            if (invert)
+                return NEGATE (r) ;
+            else
+                return r;
+        }
+
+        internal int var_value (int i)      { return variable(i).varValue; }
+        internal void var_set_value (int i, short v) { variable(i).varValue = v; }
+        internal int var_dlevel (int i)     { return variable(i).dlevel; }
+        internal Variable variable (int i ) { return /*(Variable)*/ variables[i]; }
+        internal Variable node (int sig)        { return variable(VID(sig)); }
+        internal int num_variables()            { return variables.size() - 1; }
+        internal int lit_value (int s)      { return var_value(VID(s)) ^ SIGN(s);}
+        internal Clause clause(int idx)     { return /*(Clause)*/ clauses[idx]; }
+        internal IntVector watched_by(int svar ) { return (IntVector) watched_clauses[svar]; }
+        internal IntVector assignment_stack (int l) { return (IntVector) asgn_stack[l]; }
+        internal ObjVector assignment_stack(){ return asgn_stack; }
+        internal int num_pi()               { return primary_inputs.size(); }
+        internal int pi(int n)              { return primary_inputs[n]; }
+        internal bool is_pi (int n)         { return node(n).is_pi(); }
+        internal bool is_gate (int n)           { return node(n).is_gate(); }
+        internal int one()                  { return constant_one; }
+        internal int zero()                 { return NEGATE(constant_one); }
+        internal int signal_of(int vid)     { return vid + vid; }
+        internal int node_to_pi(int s)      { return (int) node_to_pi_hash[NON_NEGATED(s)]; }
+        internal NodeType node_type (int s) { return node(s).type; }
+        internal int pi_var_value(int k)    { return variable(pi(k)).varValue; }
+        internal bool is_pure_clause_based()    { return num_variables() == stats.num_cls_vars; }
+        internal int d_level()              { return dlevel; }
+
+        internal double session_cpu_time()  { return get_cpu_time() - stats.start_cpu_time; }
+        internal double total_cpu_time()        { return stats.total_cpu_time; }
+
+        internal void enable_rtrace(bool e) { rtrace.enable_trace(e); }
+
+        #region GID_MANAGEMENT
+
+        private int allocated_gid;
+
+        internal int volatile_gid()         { return 0; }
+
+        internal int alloc_gid ()
+        {
+            for (ushort i=1; i<= WORD_WIDTH; ++i)
+                if (is_gid_allocated(i) == false)
+                {
+                    allocated_gid |= (ushort) (1 << (i-1));
+                    return i;
+                }
+            fatal();
+            return volatile_gid();
+        }
+
+        internal void free_gid (int gid)
+        {
+            sharp_assert (gid > 0 && gid <= WORD_WIDTH);
+            if (is_gid_allocated(gid)==false)
+            {
+                fatal();
+            }
+            allocated_gid &= (~(1<< (gid-1)));
+        }
+
+        internal bool is_gid_allocated(int gid)
+        {
+            if (gid==volatile_gid())
+                return true;
+            sharp_assert (gid<= WORD_WIDTH && gid > 0);
+            if ((allocated_gid & (1 << (gid -1))) != 0)
+                return true;
+            return false;
+        }
+
+        #endregion
+
+        #region VAR_FLAG_MANAGEMENT
+
+        private int allocated_flag = 0;
+
+        internal int alloc_flag()
+        {
+            for (int i=0; i< WORD_WIDTH; ++i)
+            {
+                if ((allocated_flag & (1 << i)) == 0)
+                {
+                    allocated_flag |= (1<<i);
+                    return i;
+                }
+            }
+            fatal();
+            return 0;
+        }
+
+        internal void dealloc_flag (int idx)
+        {
+            sharp_assert((allocated_flag &(1<<idx)) != 0);
+            allocated_flag &= (~(1<<idx));
+        }
+
+        internal void free_flag(int idx)
+        {
+            dealloc_flag(idx);
+            clear_flag_for_all(idx);
+        }
+
+        internal void set_flag_for_all (int idx)
+        {
+            for (int i=0; i< variables.size();  ++i)
+                variable(i).set_flag(idx);
+        }
+
+        internal void clear_flag_for_all(int idx)
+        {
+            for (int i=0; i< variables.size(); ++i)
+                variable(i).clear_flag(idx);
+        }
+        internal bool is_flag_set (int s, int f)
+        {
+            return node(s).flag(f);
+        }
+
+        private int reasoning_flag  ;
+        private int marked_flag     ;
+        private int branchable_flag ;
+        private int in_cl_flag      ;
+        private int in_cl_sign_flag ;
+        private int active_flag     ;
+
+        internal bool is_reasoning(Variable v)      { return v.flag(reasoning_flag); }
+        internal void set_reasoning(Variable v)     { v.set_flag(reasoning_flag); }
+        internal void clear_reasoning(Variable v)   { v.clear_flag(reasoning_flag); }
+
+        internal bool is_active(Variable v)         { return v.flag(active_flag); }
+        internal void set_active(Variable v)        { v.set_flag(active_flag); }
+        internal void clear_active(Variable v)      { v.clear_flag(active_flag); }
+
+        internal bool is_branchable(Variable v)     { return v.flag(branchable_flag); }
+        internal void set_branchable(Variable v)    { v.set_flag(branchable_flag); }
+        internal void clear_branchable(Variable v)  { v.clear_flag(branchable_flag); }
+
+        internal bool is_marked(Variable v)     { return v.flag(marked_flag); }
+        internal void set_marked(Variable v)    { v.set_flag(marked_flag); }
+        internal void clear_marked(Variable v)  { v.clear_flag(marked_flag); }
+        #endregion
+
+
+        private void include_cl_in_reasoning (int cl_id)
+        {
+            Clause cl = clause(cl_id);
+            if (cl.num_lits > 1)
+            {
+                int max_idx = -1, max2_idx = -1, max_dl = -1, max2_dl = -1;
+                for (int i=0; i< cl.num_lits; ++i)
+                {
+                    int dl = var_dlevel(cl.literal(i) >> 1);
+                    if (dl < 0 || (lit_value(cl.literal(i)) == 1) ) //non-0 variable, so make it the highest possible dl
+                        dl = num_variables() + 1;
+                    if (dl > max_dl)
+                    {
+                        max2_idx = max_idx;
+                        max_idx = i;
+                        max2_dl = max_dl;
+                        max_dl = dl;
+                    }
+                    else if (dl > max2_dl)
+                    {
+                        max2_idx = i;
+                        max2_dl = dl;
+                    }
+                }
+                //the invariance: Literal 0 and 1 are watched
+                int temp = cl.literal(0);
+                cl.literals[0] = cl.literal(max_idx);
+                cl.literals[max_idx] = temp;
+                int svar = cl.literal(0);
+                watched_by(svar).push_back ( cl_id + cl_id );
+                if (max2_idx == 0)
+                    max2_idx = max_idx;
+                temp = cl.literal(1);
+                cl.literals[1] = cl.literal(max2_idx);
+                cl.literals[max2_idx] = temp;
+                svar = cl.literal(1);
+                watched_by(svar).push_back ( cl_id + cl_id + 1);
+            }
+        }
+
+        void remove_cl_from_reasoning (int cl_id)
+        {
+            Clause cl = clause(cl_id);
+            sharp_assert (cl.num_lits > 1);
+            for (int k=0; k < 2; ++k)
+            { //two watched
+                int lit = cl.literal(k);
+                IntVector watch = watched_by(lit);
+                int i, sz;
+                for (i=0, sz = watch.size(); i < sz; ++i)
+                {
+                    if (( watch[i] >> 1) == cl_id)
+                    { //found it
+                        watch[i] = watch.back;
+                        watch.pop_back();
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void incr_lits_count (int lit)
+        {
+            if ((lit & 1) == 1)
+                ++ variable (VID(lit)).lits_count_1;
+            else
+                ++ variable (VID(lit)).lits_count_0;
+        }
+
+        private void decr_lits_count (int lit)
+        {
+            if ((lit & 1) == 1)
+                -- variable (VID(lit)).lits_count_1;
+            else
+                -- variable (VID(lit)).lits_count_0;
+        }
+
+        private int get_free_clause_id()
+        {
+            int cl_id;
+            if (!free_clauses.empty())
+            {
+                cl_id = free_clauses.back;
+                free_clauses.pop_back();
+                clauses[cl_id] = new Clause();
+            }
+            else
+            {
+                cl_id = clauses.size();
+                clauses.push_back (new Clause());
+            }
+            return cl_id;
+        }
+
+        private int add_clause_to_db (int [] lits, ClType tp, ushort gflag)
+        {
+            sharp_assert (lits.Length > 0);
+            int cl_id = get_free_clause_id();
+            Clause cl = clause(cl_id);
+            cl.init( tp, lits, gflag, unique_id ++);
+
+//          Console.Write("{0} :", cl_id);
+//          for (int i=0; i< lits.Length; ++i)
+//              Console.Write ("{0} ", lits[i]);
+//          Console.WriteLine ("");
+
+            for (int i=0; i< cl.num_lits; ++i )
+            {
+                incr_lits_count (cl.literal(i));
+                reference (cl.literal(i));
+            }
+
+            if (tp == ClType.ORIGINAL)
+            {
+                ++ stats.num_orig_clauses;
+                original_clauses.push_back(cl_id);
+                stats.num_orig_literals += lits.Length;
+            }
+            else if (tp == ClType.CONFLICT)
+            {
+                ++ stats.num_learned_clauses;
+                conflict_clauses.push_back (cl_id);
+                stats.num_learned_literals += lits.Length;
+            }
+            include_cl_in_reasoning (cl_id);
+
+            return cl_id;
+        }
+
+        internal int add_new_implication (int [] reasons, int implied_lit)
+        {
+            if (reasons == null)
+            {
+                reasons = new int[dlevel];
+                for (int i=0; i< reasons.Length; ++i)
+                    reasons[i] = (assignment_stack(i+1)[0]^1);
+            }
+
+            for (int i =0; i< reasons.Length; ++i)
+                sharp_assert (lit_value(reasons[i]) == 0);
+            sharp_assert (var_value(VID(implied_lit)) == UNKNOWN);
+
+            int cl_id = get_free_clause_id();
+
+            Clause cl = clause(cl_id);
+            int [] lits = new int [1 + reasons.Length];
+            Array.Copy(reasons,lits,reasons.Length);
+            lits[reasons.Length] = implied_lit;
+
+            cl.init( ClType.TEMP, lits, 0, unique_id ++);
+            temporary_clauses.push_back(cl_id);
+
+            queue_implication(implied_lit, cl_id, ImpType.CLAUSE);
+            return cl_id;
+        }
+
+        internal int merge_clause_group(int g2, int g1)
+        {
+            for (int i=0, sz=clauses.size(); i<sz; ++i)
+            {
+                if (clause(i) != null && clause(i).gid(g1))
+                {
+                    clause(i).clear_gid(g1);
+                    clause(i).set_gid(g2);
+                }
+            }
+            free_gid (g1);
+            return g2;
+        }
+
+        internal void delete_clause_group (int g)
+        {
+            reset();
+            bool[] remove = new bool [clauses.size()];
+            for (int i=0; i< clauses.size(); ++i)
+            {
+                remove[i] = false;
+                if (clause(i) != null)
+                    remove[i] = clause(i).gid(g);
+            }
+            delete_clauses(remove);
+            free_gid (g);
+        }
+
+//      void delete_clause(int cl_id)
+//      {
+//          Clause cl = clause(cl_id);
+//          if (cl.num_lits> 1)
+//              remove_cl_from_reasoning (cl_id);
+//
+//
+//          for (int i=0; i< cl.num_lits; ++i)
+//              -- variable(cl.literal(i)>> 1).lits_count[cl.literal(i) & 1];
+//
+//          ++stats.num_deleted_clauses;
+//          stats.num_deleted_literals += cl.num_lits;
+//          if (cl.type == ClType.ORIGINAL)
+//          {
+//              --stats.num_orig_clauses;
+//              stats.num_orig_literals -= cl.num_lits;
+//              //              for (int j=0, n = clause(cl_id).num_lits; j < n ; ++j)
+//              //                  deref (clause(cl_id).literal(j));
+//          }
+//          else
+//          {
+//              sharp_assert (cl.type == ClType.CONFLICT);
+//              --stats.num_learned_clauses;
+//              stats.num_learned_literals -= cl.num_lits;
+//          }
+//          //cl.type = ClType.DELETED;
+//          clauses[cl_id] = null;
+//          free_clauses.push_back(cl_id);
+//      }
+
+        void clean_up()
+        {
+            reset();
+            bool [] remove = new bool [clauses.size()];
+            for (int i=0; i< clauses.size(); ++i)
+            {
+                Clause cl = clause(i);
+                if (cl != null && cl.type == ClType.CONFLICT)
+                    remove[i] = true; //to be deleted
+                else
+                    remove[i] = false;
+            }
+            delete_clauses(remove, false);
+            rtrace.reset();
+        }
+
+        //convert all variables to primary inputs
+        internal void convert_vars_to_pi ()
+        {
+            for (int i=0; i< variables.size(); ++i)
+            {
+                if (variable(i).type == NodeType.VARIABLE)
+                {
+                    int id = num_pi();
+                    int s = i + i;
+                    node(s).type = NodeType.PI;
+                    primary_inputs.push_back(s);
+                    node_to_pi_hash[s] = id;
+                }
+            }
+        }
+
+        void delete_clauses(bool [] removes)
+        {
+            delete_clauses(removes, true);
+//          Console.Write ("Remove : ");
+//          for (int i=0; i< removes.Length; ++i)
+//              if (removes[i])
+//                  Console.Write("{0} ", i);
+//          Console.WriteLine("");
+        }
+
+        void delete_clauses(bool[] removes, bool delete_original)
+        {
+            for (int i=1; i< variables.size(); ++i)
+            {
+                //Variable var = variable(i);
+                for (int k=0; k< 2; ++k)
+                {
+                    IntVector w = watched_by(i + i + k);
+                    for (int j=0; j< w.size(); ++j)
+                        if ( removes[(w[j] >> 1)])
+                        {
+                            w[j] = w.back;
+                            w.pop_back();
+                            --j;
+                        }
+                }
+            }
+
+            for (int i=0; i< temporary_clauses.size(); ++i)
+            {
+                int cl_id = temporary_clauses[i];
+                bool can_delete = true;
+                foreach (int lit in clause(cl_id).literals)
+                {
+                    if (variable(VID(lit)).antecedent.type == ImpType.CLAUSE &&
+                        variable(VID(lit)).antecedent.index == cl_id)
+                    {
+                        can_delete = false;
+                        break;
+                    }
+                }
+                if (can_delete)
+                {
+                    clauses[cl_id] = null;
+                    temporary_clauses[i] = temporary_clauses.back;
+                    temporary_clauses.pop_back();
+                    --i;
+                }
+            }
+
+            for (int i=0; i< removes.Length; ++i)
+            {
+                Clause cl = clause(i);
+                if (cl == null || removes[i] == false)
+                    continue;
+
+                ++ stats.num_deleted_clauses;
+                stats.num_deleted_literals += cl.num_lits;
+
+                for (int j=0; j< cl.num_lits; ++j)
+                {
+                    decr_lits_count(cl.literal(j));
+                    deref ( cl.literal(j));
+                }
+
+                if (cl.type == ClType.ORIGINAL)
+                {
+                    --stats.num_orig_clauses;
+                    stats.num_orig_literals -= cl.num_lits;
+                }
+                else if  (cl.type == ClType.CONFLICT)
+                {
+                    --stats.num_learned_clauses;
+                    stats.num_learned_literals -= cl.num_lits;
+                }
+                //cl.type = ClType.DELETED;
+                clauses[i] = null;
+                free_clauses.push_back(i);
+            }
+
+            IntVector temp = new IntVector(128);
+            for (int i=0; i< conflict_clauses.size(); ++i)
+            {
+                int cl_id = conflict_clauses[i];
+                if (clause(cl_id) != null)
+                {
+                    sharp_assert (clause(cl_id).type == ClType.CONFLICT);
+                    temp.push_back (cl_id);
+                }
+            }
+            conflict_clauses = temp;
+
+            if (delete_original)
+            {
+                stats.active_area_changed = true;
+                IntVector temp1 = new IntVector(16);
+                for (int i=0; i< original_clauses.size(); ++i)
+                {
+                    int cl_id = original_clauses[i];
+                    if (!removes[cl_id])
+                        temp1.push_back(cl_id);
+                }
+                original_clauses = temp1;
+            }
+        }
+
+
+        internal int constraint (int sig)
+        {
+            if (sig == one())   //don't constraint constants
+                return 0;
+            else if (sig == zero())
+            {
+                stats.constraint_zero ++;
+                return -1;
+            }
+            int gid = alloc_gid();
+            int[] cls = new int[1];
+            cls[0] = sig;
+            add_clause(cls, gid, false);
+            return gid;
+        }
+
+        internal void release_constraint (int gid)
+        {
+            if (gid <= 0)
+            {
+                if (gid < 0)
+                    stats.constraint_zero --;
+                return;
+            }
+            sharp_assert (is_gid_allocated(gid));
+            int orig = stats.num_orig_clauses;
+            delete_clause_group (gid);
+            sharp_assert (orig == stats.num_orig_clauses + 1);
+        }
+
+        int find_max_dl(int cl_id) { return find_max_dl (clause(cl_id)); }
+
+        int find_max_dl (Clause cl)
+        {
+            int max_dl = 0;
+
+            for (int i=0; i< cl.num_lits; ++i)
+            {
+                int lit = cl.literal(i);
+                if (variable(lit>>1).dlevel > max_dl)
+                    max_dl = variable(lit>>1).dlevel;
+            }
+            return max_dl;
+        }
+
+        int find_unit_lit(int cl_id) { return find_unit_lit (clause(cl_id)); }
+        int find_unit_lit (Clause cl)
+        {
+            if (cl == null)
+                throw new Exception ("Null Clause");
+            if (!is_unit(cl))
+                return 0;
+            int v1 = var_value(cl.literal(0)>>1);
+            if (v1 == UNKNOWN)
+                return cl.literal(0);
+            else
+                return cl.literal(1);
+        }
+
+        bool is_conflicting (int cl_id) { return is_conflicting (clause(cl_id)); }
+
+        bool is_conflicting(Clause cl)
+        {
+            if (lit_value(cl.literal(0)) == 0 &&
+                ( cl.num_lits == 1 || lit_value(cl.literal(1)) == 0) )
+                return true;
+            return false;
+        }
+
+        bool is_satisfied (int cl_id )  { return is_satisfied (clause(cl_id)); }
+
+        bool is_satisfied(Clause cl)
+        {
+            for (int i=0; i< cl.num_lits; ++i)
+                if (lit_value(cl.literal(i)) == 1)
+                    return true;
+            return false;
+        }
+
+        bool is_unit (int cl_id) { return is_unit(clause(cl_id)); }
+
+        bool is_unit(Clause cl)
+        {
+            if (cl.num_lits == 1)
+            {
+                if (var_value(cl.literal(0)>>1) == UNKNOWN)
+                    return true;
+                else
+                    return false;
+            }
+            else
+            {
+                int v1 = var_value(cl.literal(0)>>1);
+                int l1 = lit_value(cl.literal(0));
+                int v2 = var_value(cl.literal(1)>>1);
+                int l2 = lit_value(cl.literal(1));
+                if ((v1 == UNKNOWN && l2 == 0) ||
+                    (v2 == UNKNOWN && l1 == 0))
+                    return true;
+                else
+                    return false;
+            }
+        }
+
+        int find_free_node_index(int i1, int i2)
+        {
+            //find a free node index that is larger than the index of i1 and i2
+            int at_least;
+            if (i1 == INVALID || i2 == INVALID)
+            {
+                sharp_assert (i1 == INVALID && i2 == INVALID);
+                at_least = -1;
+            }
+            else
+                at_least = (i1>i2)? (i1>> 1): (i2>> 1);
+
+            int idx = free_nodes.find_greater_than (at_least);
+            int vid;
+            if (idx < 0)
+            {
+                //can't find it, so enlarge the node array
+                variables.push_back(new Variable());
+                watched_clauses.push_back (new IntVector(4));
+                watched_clauses.push_back (new IntVector(4));
+                vid = variables.size() - 1;
+            }
+            else
+                vid = idx;
+            sharp_assert (vid > at_least);
+            return vid;
+        }
+
+        internal int add_variable()
+        {
+            ++ stats.num_cls_vars;
+            int sig = new_node (NodeType.VARIABLE, INVALID, INVALID);
+            return VID(sig);
+        }
+
+        internal void set_num_variables(int k)
+        {
+            while ( num_variables() < k)
+                add_variable();
+        }
+
+        void sort_var_score ()
+        {
+            int nvar = ordered_vars.size();
+            int [] scores = new int [nvar];
+            int [] ordered = new int [nvar];
+            for (int i=0; i< ordered_vars.size(); ++i)
+            {
+                scores[i] = variable(ordered_vars[i]).score();
+                ordered[i] = ordered_vars[i];
+            }
+
+            Array.Sort(scores, ordered);
+            for (int i=0; i< nvar; ++i)  //reverse it
+                ordered_vars[i] = ordered[nvar - i - 1];
+
+            for (int i=0; i< nvar; ++i)
+            {
+                int vid = ordered_vars[i];
+                variable(vid).ordered_pos = i;
+            }
+            max_score_pos = 0;
+            for (int i=1; i< ordered_vars.size(); ++i)
+                sharp_assert (variable(ordered_vars[i]).score() <= variable(ordered_vars[i-1]).score());
+        }
+
+        void incr_score (int svar)
+        {
+            if (SIGN(svar) == 0)
+                ++ variable(VID(svar)).score_0;
+            else
+                ++ variable(VID(svar)).score_1;
+        }
+
+        void incr_var_score( int svar)
+        {
+            int vid = VID(svar);
+            //int sign = SIGN(svar);
+            int old_score = variable(vid).score();
+            incr_score (svar);
+            int new_score = variable(vid).score();
+            if (old_score == new_score)
+                return;
+
+            int pos = variable(vid).ordered_pos;
+            int orig_pos = pos;
+            sharp_assert (ordered_vars[pos] == vid);
+            int bubble_step = 0x400;
+            for (pos = orig_pos - bubble_step; pos >= 0; pos -= bubble_step)
+                if (variable(ordered_vars[pos]).score() >= new_score)
+                    break;
+            pos += bubble_step;
+            for ( bubble_step = (bubble_step >> 1); bubble_step > 0; bubble_step = (bubble_step >> 1))
+            {
+                if ( pos - bubble_step >= 0)
+                {
+                    if (variable(ordered_vars[pos - bubble_step]).score() < new_score)
+                        pos -= bubble_step;
+                }
+            }
+            //now found the position, do a swap
+            ordered_vars[orig_pos] = ordered_vars[pos];
+            variable(ordered_vars[orig_pos]).ordered_pos = orig_pos;
+
+            ordered_vars[pos] = vid;
+            variable(ordered_vars[pos]).ordered_pos = pos;
+#if CHECK
+            for (int i=0; i< ordered_vars.size(); ++i)
+            {
+                sharp_assert (i==0 || variable(ordered_vars[i]).score() <= variable(ordered_vars[i - 1]).score());
+                sharp_assert (variable(ordered_vars[i]).ordered_pos == i);
+            }
+#endif
+        }
+
+        int new_node(NodeType tp, int i1, int i2)
+        {
+            int vid = find_free_node_index(i1, i2);
+            Variable n = variable(vid);
+
+            n.clear_all_flag();
+            n.clear_all_gid();
+
+            clear_marked(n);
+            n.set_flag(branchable_flag);
+            n.clear_flag(in_cl_flag);
+            n.clear_flag(in_cl_sign_flag);
+            n.clear_flag(reasoning_flag);
+
+            n.type          = tp;
+            n.left          = i1;
+            n.right         = i2;
+            n.canonical     = INVALID;
+            n.ref_count     = 0;
+            n.lits_count_0  = 0;
+            n.lits_count_1  = 0;
+            n.uid           = unique_id ++;
+
+            n.score_0       = 0;
+            n.score_1       = 0;
+            n.asgn_pos      = -1;
+
+            n.varValue      = UNKNOWN;
+            n.antecedent    = -1;
+            n.dlevel        = -1;
+            n.outputs.clear();
+
+            ++ stats.num_free_variables;
+            ++ stats.num_free_branch_vars;
+
+            if (tp == NodeType.AND || tp == NodeType.XOR)
+            {
+                set_reasoning(n);
+                make_node_consistent(vid + vid);
+                if (tp == NodeType.AND)
+                {
+                    n.score_0 += 1;
+                    n.score_1 += 2;
+                    ++node(i1).score_0;
+                    ++node(i1).score_1;
+                    ++node(i2).score_0;
+                    ++node(i2).score_1;
+                }
+                else
+                {
+                    sharp_assert (tp == NodeType.XOR);
+                    n.score_0 += 2;
+                    n.score_1 += 2;
+                    node(i1).score_0 += 2;
+                    node(i1).score_1 += 2;
+                    node(i2).score_0 += 2;
+                    node(i2).score_1 += 2;
+                }
+            }
+            return vid + vid;
+        }
+
+        int [] remove_dup_literals(int [] orig_lits)
+        {
+            bool redundant = false;
+            IntVector literals = new IntVector(4);
+            for (int i=0; i< orig_lits.Length; ++i)
+            {
+                int l = orig_lits[i];
+                if (l == 0) //i.e. constant 1
+                {
+                    redundant = true;
+                    break;
+                }
+                else if ( l == 1) //i.e. constant 0
+                    continue;
+
+                Variable var = variable(l >>1);
+                if (var.flag(in_cl_flag) == false)   //never occurred
+                {
+                    var.set_flag(in_cl_flag);
+                    if (IS_NEGATED(l))
+                        var.set_flag(in_cl_sign_flag);
+                    else
+                        var.clear_flag(in_cl_sign_flag);
+                    literals.push_back(l);
+                }
+                else if (var.flag(in_cl_sign_flag) == IS_NEGATED(l)) //same phase
+                    continue;
+                else
+                    redundant = true;
+            }
+            //reset back
+            for (int i=0; i< orig_lits.Length; ++i)
+            {
+                variable(VID(orig_lits[i])).clear_flag(in_cl_flag);
+                variable(VID(orig_lits[i])).clear_flag(in_cl_sign_flag);
+            }
+            if (redundant)
+                return null;
+            return literals.ToArray();
+        }
+
+        int add_clause_do_implication ( int [] lits, ClType tp, ushort gflag)
+        {
+            int cl_id = add_clause_to_db( lits, tp, gflag);
+
+            if (stats.been_reset == false) // may cause implication
+            {
+                Clause cl = clause(cl_id);
+                if (is_conflicting(cl))
+                {
+                    int dl = find_max_dl(cl);
+                    backtrack(dl-1);
+                }
+                if (dlevel >= 0)
+                {
+                    int unit = find_unit_lit(cl);
+                    if (unit != 0)
+                    {
+                        int l = find_max_dl(cl);
+                        if (l < dlevel)
+                            backtrack(l);
+                        queue_implication(unit, cl_id, ImpType.CLAUSE);
+                    }
+                }
+                else
+                    stats.outcome = SATStatus.UNSATISFIABLE;
+            }
+            return cl_id;
+        }
+
+        int add_clause_with_gflag ( int[] orig_lits, ClType tp, ushort gflag, bool do_check )
+        {
+            sharp_assert (conflict_array.empty());
+
+            int[] lits;
+            if (do_check)
+                lits = remove_dup_literals(orig_lits);
+            else
+                lits = orig_lits;
+
+            if (lits == null)
+                throw new Exception (" A clause contain a literal and its negation");
+            else if (lits.Length == 0)
+                throw new Exception("An empty clause occurred in the original clauses");
+
+            int cl_id = add_clause_do_implication ( lits, tp, gflag);
+            return cl_id;
+        }
+
+        int add_blocking_clause (int [] lits, int gid)
+        {
+            ushort gflag = 0;
+            if (gid > 0)
+                gflag = (ushort)(1<<(gid-1));
+            foreach(int lit in lits)
+                sharp_assert (is_active(node(lit)));
+            return add_clause_with_gflag (lits, ClType.BLOCKING, gflag, true);
+        }
+
+        internal int add_clause (int [] lits)
+        {
+            return add_clause (lits, 0, true);
+        }
+
+        internal int add_clause (int [] lits, int gid)
+        {
+            return add_clause (lits, gid, true) ;
+        }
+
+        internal int add_clause (int [] lits, int gid, bool do_check)
+        {
+            ushort gflag = 0;
+            if (gid > 0)
+                gflag = (ushort)(1<<(gid-1));
+            foreach(int lit in lits)
+            {
+                if (!is_active(node(lit)))
+                {
+                    stats.active_area_changed = true;
+                    break;
+                }
+            }
+            return add_clause_with_gflag (lits, ClType.ORIGINAL, gflag, do_check);
+        }
+
+        int add_learned_clause(int[] lits, ushort gflag)
+        {
+            int cl_id = add_clause_to_db( lits, ClType.CONFLICT,  gflag);
+            rtrace_record_resolve_process (clause(cl_id).uid);
+            return cl_id;
+        }
+
+        internal void set_branchable(int vid, bool br)
+        {
+            sharp_assert ( !stats.is_solving );
+            Variable var = variable(vid);
+            if (br && !is_branchable(var))
+            {
+                set_branchable(var);
+                if (var_value(vid) == UNKNOWN)
+                    ++ stats.num_free_branch_vars;
+            }
+            else if ( !br && is_branchable(var))
+            {
+                clear_branchable(var);
+                if (var_value(vid) == UNKNOWN)
+                    -- stats.num_free_branch_vars;
+            }
+        }
+
+        internal void restart()
+        {
+            conflict_array.clear();
+            implication_queue.Clear();
+            if (dlevel > 0)
+                backtrack(0);
+            ++stats.num_restarts;
+        }
+
+        void run_garbage_collection()
+        {
+            bool[] remove = new bool [clauses.size()];
+            for (int i=0; i< remove.Length; ++i)
+                remove[i] = false;
+
+            int headcount = conflict_clauses.size() / parameters.gc_head_tail_ratio;
+            for (int i=0; i< headcount; ++i)
+            {
+                int cl_id = conflict_clauses[i];
+                Clause cl = clause(cl_id);
+                sharp_assert (cl.type == ClType.CONFLICT);
+                if (cl.activity > parameters.gc_head_threshold)
+                    continue;
+                int num_0 = 0;
+                for (int j=0; j< cl.num_lits; ++j)
+                    if (lit_value(cl.literal(j)) == 0)
+                        ++ num_0;
+                if (cl.num_lits - num_0 < parameters.gc_head_length)
+                    continue;
+                remove[cl_id] = true;
+            }
+            for (int i=headcount; i< conflict_clauses.size(); ++i)
+            {
+                int cl_id = conflict_clauses[i];
+                Clause cl = clause(cl_id);
+                sharp_assert (cl.type == ClType.CONFLICT);
+                if (cl.activity > parameters.gc_tail_threshold)
+                    continue;
+                int num_0 = 0;
+                for (int j=0; j< cl.num_lits; ++j)
+                    if (lit_value(cl.literal(j)) == 0)
+                        ++ num_0;
+                if (cl.num_lits - num_0 < parameters.gc_tail_length)
+                    continue;
+                remove[cl_id] = true;
+            }
+
+            delete_clauses(remove, false);
+            ++ stats.num_garbage_collections;
+        }
+
+        void decay_variable_score()
+        {
+            for(int i=1, sz = variables.size(); i<sz; ++i)
+            {
+                Variable var = variable(i);
+                var.score_0 = (short)(var.score_0 >> 1);
+                var.score_1 = (short)(var.score_1 >> 1);
+            }
+        }
+
+        void run_periodic_functions()
+        {
+            //a. restart
+            if (parameters.enable_restart && stats.num_backtracks > stats.next_restart)
+            {
+                //System.Console.Write ("-");
+                stats.next_restart = stats.num_backtracks + parameters.restart_period;
+                restart();
+            }
+            //b. delete clauses
+            if (parameters.enable_gc && stats.num_backtracks > stats.next_gc)
+            {
+                //System.Console.Write ("*");
+                stats.next_gc = stats.num_backtracks + parameters.gc_period;
+                run_garbage_collection();
+            }
+            //c. decay variable score
+            if (stats.num_backtracks > stats.next_decay)
+            {
+                stats.next_decay = stats.num_backtracks + parameters.decay_period;
+                decay_variable_score();
+            }
+        }
+
+        internal void make_decision (int svar)
+        {
+            sharp_assert(implication_queue.Count == 0);
+            sharp_assert (svar > 0 && var_value(svar>>1) == UNKNOWN);
+            ++ dlevel;
+
+            sharp_assert (stats.max_dlevel == asgn_stack.size() - 1);
+            if (dlevel > stats.max_dlevel)
+                stats.max_dlevel = dlevel;
+            if (asgn_stack.size() <= dlevel)
+                asgn_stack.push_back (new IntVector(32) );
+
+            queue_implication(svar, -1, ImpType.NONE);
+            ++ stats.num_decisions;
+        }
+
+        bool make_branch_decision()
+        {
+            if (implication_queue.Count != 0)
+                return ((( Implication)(implication_queue.Peek())).lit > 1 );
+
+            if (stats.num_free_branch_vars == 0)
+                return false;
+
+            int svar = 0;
+
+            for ( ; max_score_pos < ordered_vars.size(); ++ max_score_pos )
+            {
+                int vid = ordered_vars[max_score_pos];
+                if (variable(vid).varValue == UNKNOWN && is_branchable(variable(vid)))
+                {
+                    if (variable(vid).score_0 > variable(vid).score_1)
+                        svar = vid + vid;
+                    else
+                        svar = vid + vid + 1;
+                    break;
+                }
+            }
+            if (svar == 0)  //even if still free branch, if all clauses are satisfied, then ok.
+                return false;
+
+            if (hook != null)
+                hook.OnCaseSplit(svar);
+
+            sharp_assert (is_active(node(svar)));
+            make_decision(svar);
+            return true;
+        }
+
+
+        void real_solve()
+        {
+            stats.outcome = SATStatus.UNDETERMINED;
+
+            while (true)
+            {
+                if (get_cpu_time() - stats.start_cpu_time > parameters.time_limit)
+                {
+                    stats.outcome = SATStatus.TIME_OUT;
+                    return;
+                }
+                if (stats.is_mem_out)
+                {
+                    stats.outcome = SATStatus.MEM_OUT;
+                    return;
+                }
+
+                run_periodic_functions();
+
+                bool can_branch = make_branch_decision();
+                if (!can_branch)
+                {
+                    stats.outcome = SATStatus.SATISFIABLE;
+                    return;
+                }
+
+                while(deduce() == false)
+                    resolve_conflicts();
+
+                //after above loop, the solver will stabilize in a decision level
+                //with no conflict and implication. If this level is -1 then unsat
+                if (dlevel < 0)
+                {
+                    stats.outcome = SATStatus.UNSATISFIABLE;
+                    return;
+                }
+                if (hook != null)
+                    hook.OnBCP ();
+            }
+        }
+
+        internal void reset ()
+        {
+            if ( stats.been_reset == false)
+            {
+                if (dlevel >= 0)
+                    backtrack( -1 );
+                dlevel = 0;
+                stats.outcome = SATStatus.UNDETERMINED;
+                stats.been_reset = true;
+            }
+        }
+
+        double get_cpu_time ()
+        {
+            /*
+            currentProcess.Refresh();
+            TimeSpan cputime = currentProcess.TotalProcessorTime;
+            return cputime.Hours * 3600 + cputime.Seconds + cputime.Milliseconds / 1000.0;
+            */
+            return DateTime.Now.Ticks / 1e7;
+        }
+
+        void init ()
+        {
+            if (!stats.active_area_changed)
+                return;
+            //so, we need to figure out new active area
+            for (int i=0; i< active_area.size(); ++i)
+            {
+                Variable var = node(active_area[i]);
+                var.clear_flag(reasoning_flag);
+                clear_active(var);
+            }
+            active_area.clear();
+
+            for (int i=0; i< original_clauses.size(); ++i)
+            {
+                int cl_id = original_clauses[i];
+                Clause cl = clause(cl_id);
+                foreach (int lit in cl.literals)
+                {
+                    if (!node(lit).flag(active_flag))
+                    {
+                        active_area.push_back(NON_NEGATED(lit));
+                        set_active(node(lit));
+                    }
+                }
+            }
+            mark_transitive_fanins(active_area, active_flag);
+
+            ordered_vars.clear();
+            for (int i=0; i< active_area.size(); ++i)
+            {
+                int vid = VID(active_area[i]);
+                Variable var = variable(vid);
+                sharp_assert (var.flag(active_flag));
+                if (is_branchable(var)) //add it into vars for branching
+                {
+                    var.score_0 = variable(i).lits_count_0;
+                    var.score_1 = variable(i).lits_count_1;
+                    var.ordered_pos = ordered_vars.size();
+                    ordered_vars.push_back(vid);
+                }
+                if (var.is_gate())
+                    var.set_flag(reasoning_flag);
+                else
+                    var.clear_flag(reasoning_flag);
+            }
+        }
+
+        internal SATStatus solve()
+        {
+            if (stats.constraint_zero > 0)
+            {
+                stats.outcome = SATStatus.UNSATISFIABLE;
+                return stats.outcome;
+            }
+
+            stats.start_cpu_time = get_cpu_time();
+
+            init();
+
+            //enable_rtrace(true);
+            sharp_assert (stats.is_solving == false);
+            stats.is_solving = true;
+
+            if (stats.been_reset == true)
+                preprocess();
+
+            stats.been_reset = false;
+
+            if (dlevel < 0)
+                stats.outcome = SATStatus.UNSATISFIABLE;
+            else
+                real_solve();
+
+            stats.finish_cpu_time = get_cpu_time();
+            stats.total_cpu_time += stats.finish_cpu_time - stats.start_cpu_time;
+            ++ stats.num_rounds;
+            stats.is_solving = false;
+
+            //rtrace.dump_trace("trace");
+            //if (stats.outcome == SATStatus.UNSATISFIABLE)
+            //  dump_unsat_core("core.cnf");
+            return stats.outcome;
+        }
+
+        void preprocess()
+        {
+            sharp_assert (dlevel == 0);
+            for (int i=0; i< clauses.size(); ++i)
+            {
+                Clause cl = clause(i);
+                if (cl == null)
+                    continue;
+                if (is_conflicting(cl))
+                    queue_conflict(i, ImpType.CLAUSE);
+                else
+                {
+                    int unit = find_unit_lit(cl);
+                    if (unit != 0)
+                        queue_implication(unit, i, ImpType.CLAUSE);
+                }
+            }
+
+            if (deduce() == false)
+            {
+                resolve_conflicts();
+                sharp_assert ( dlevel < 0);
+                stats.outcome = SATStatus.UNSATISFIABLE;
+            }
+        }
+
+
+        void mark_involved_var(int vid)
+        {
+            Variable var = variable(vid);
+            if (is_marked(var) == false)
+            {
+                set_marked(var);
+                if (var.dlevel == dlevel)
+                    ++ stats.marked_current_dl;
+                else
+                    learned_clause.push_back(vid + vid + var_value(vid));
+            }
+        }
+
+        void rtrace_add_resolvent(int uid)
+        {
+#if GEN_RESOLVE_TRACE
+            rtrace.add_reason(uid);
+#endif
+        }
+
+        void rtrace_add_resolvent(int uid, int r)
+        {
+#if GEN_RESOLVE_TRACE
+            rtrace.add_reason(uid + (r << UIDSHIFT));
+#endif
+        }
+
+        void rtrace_record_resolve_process (int uid)
+        {
+#if GEN_RESOLVE_TRACE
+            rtrace.set_resolvent (uid);
+#endif
+        }
+
+        void rtrace_gen_empty_clause(Antecedent conf)
+        {
+#if GEN_RESOLVE_TRACE
+            sharp_assert ( stats.marked_current_dl == 0);
+            sharp_assert (dlevel == 0);
+
+            mark_conflict(conf) ;
+            IntVector assignments = assignment_stack(dlevel);
+            for (int i = assignments.size() - 1; i >= 0; --i)
+            {
+                int lit = assignments[i];
+                int vid = (lit >> 1);
+                Variable var = variable(vid);
+                if (is_marked(var))
+                {
+                    mark_reason (vid);
+                    clear_marked(var);
+                    -- stats.marked_current_dl;
+                }
+            }
+            sharp_assert ( stats.marked_current_dl == 0);
+            sharp_assert ( learned_clause.size() == 0);
+
+            //now record the generation process
+            rtrace.set_empty_resolvents();
+#endif
+        }
+
+
+        ushort mark_conflict(Antecedent conf)
+        {
+            // return the group flag of id of type
+            switch(conf.type)
+            {
+                case ImpType.CLAUSE:    //implied by a clause
+                {
+                    Clause cl = clause(conf.index);
+                    for (int i=0; i< cl.num_lits; ++i)
+                        mark_involved_var(VID(cl.literal(i)));
+
+                    rtrace_add_resolvent (cl.uid);
+                    ++cl.activity;
+                    return cl.gflag;
+                }
+                case ImpType.PB:    //implied by a pseudo boolean constraint
+                {
+                    fatal();
+                    break;
+                }
+                case ImpType.NODE:      //implied by a combinational gate
+                {
+                    int r = node_mark_conflict(conf.index);
+                    Variable nd = variable(conf.index);
+                    rtrace_add_resolvent (nd.uid, r);
+                    return nd.gflag;
+                }
+                default:
+                    sharp_assert(false);
+                    break;
+            }
+            return 0;
+        }
+
+        ushort mark_reason(int vid)
+        {
+            Variable var = variable(vid);
+            Antecedent ante = var.antecedent;
+            switch(ante.type)
+            {
+                case ImpType.CLAUSE:    //implied by a clause
+                {
+                    Clause cl = clause(ante.index);
+
+                    for (int i=0; i< cl.num_lits; ++i)
+                        if ((cl.literal(i)>>1) != vid)
+                            mark_involved_var(cl.literal(i) >> 1);
+                    rtrace_add_resolvent (cl.uid);
+                    ++cl.activity;
+                    return cl.gflag;
+                }
+                case ImpType.PB:    //implied by a pseudo boolean constraint
+                {
+                    fatal();
+                    break;
+                }
+                case ImpType.NODE:      //implied by a combinational gate
+                {
+                    int r = node_mark_reason(vid);
+                    Variable nd = variable(ante.index);
+                    rtrace_add_resolvent (nd.uid, r);
+                    return nd.gflag;
+                }
+                default:
+                    sharp_assert(false);
+                    break;
+            }
+            fatal();
+            return 0;
+        }
+
+        /*
+         * return value: which clause is responsible
+         * a == i0, b == i1, c == out
+         * for AND
+         * 1: (a + c')
+         * 2: (b + c')
+         * 3: (a' + b' + c)
+         * for XOR
+         * 4: (a' + b + c)
+         * 5: (a + b' + c)
+         * 6: (a + b + c')
+         * 7: (a' + b' + c')
+         */
+        int node_mark_conflict(int vid)
+        {
+            Variable n = variable(vid);
+            sharp_assert (var_value(vid) != UNKNOWN);
+            mark_involved_var( vid );
+
+            int r = 0;
+            int i0 = n.left;
+            int vid0 = NODE_ID(i0);
+            int i1 = n.right;
+            int vid1 = NODE_ID(i1);
+            if (n.type == NodeType.AND)
+            {
+                if (var_value(vid) == 0)
+                {
+                    sharp_assert (lit_value(i0) == 1);
+                    sharp_assert (lit_value(i1) == 1);
+                    mark_involved_var( vid0 );
+                    mark_involved_var( vid1 );
+                    r = 3;
+                }
+                else
+                { //var value == 1
+                    sharp_assert (lit_value(i0) == 0 || lit_value(i1) == 0);
+                    if (lit_value(i0) != 0)
+                    {
+                        mark_involved_var( vid1 );
+                        r = 2;
+                    }
+                    else if (lit_value(i1) != 0)
+                    {
+                        mark_involved_var( vid0 );
+                        r = 1;
+                    }
+                    else
+                    {
+                        sharp_assert (variable(vid0).dlevel == variable(vid1).dlevel);
+                        if (variable(vid0).asgn_pos < variable(vid1).asgn_pos)
+                        {
+                            mark_involved_var( vid0 );
+                            r = 1;
+                        }
+                        else
+                        {
+                            mark_involved_var( vid1 );
+                            r = 2;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                sharp_assert (n.type == NodeType.XOR);
+                sharp_assert (lit_value(i0) == 0 || lit_value(i0) == 1);
+                sharp_assert (lit_value(i1) == 0 || lit_value(i1) == 1);
+                sharp_assert ((lit_value(i0) ^ lit_value(i1)) != var_value(vid));
+                mark_involved_var( vid0 );
+                mark_involved_var( vid1 );
+#if GEN_RESOLVE_TRACE
+                int va = lit_value(i0);
+                int vb = lit_value(i1);
+                int vc = var_value(vid);
+                if (va == 1 && vb == 0 && vc == 0)
+                    r = 4;
+                else if (va == 0 && vb == 1 && vc == 0)
+                    r = 5;
+                else if (va == 0 && vb == 0 && vc == 1)
+                    r = 6;
+                else
+                {
+                    sharp_assert (va == 1 && vb == 1 && vc == 1);
+                    r = 7;
+                }
+#endif
+            }
+            return r;
+        }
+
+        int node_mark_reason(int vid)
+        {
+            sharp_assert (variable(vid).antecedent.type == ImpType.NODE);
+            int ante = variable(vid).antecedent.index;
+
+            int r = 0;
+            Variable n = variable(ante);
+            int i0 = n.input(0);
+            int vid0 = NODE_ID(i0);
+            int i1 = n.input(1);
+            int vid1 = NODE_ID(i1);
+
+            if (n.type == NodeType.AND)
+            {
+                if (vid == ante)
+                { //by itself, so it's propagation, the reason is it's input
+                    if (var_value(vid) == 1)
+                    {
+                        sharp_assert (lit_value(i0) == 1);
+                        sharp_assert (lit_value(i1) == 1);
+                        mark_involved_var( vid0 );
+                        mark_involved_var( vid1 );
+                        r = 3;
+                    }
+                    else
+                    {
+                        sharp_assert (lit_value(i0) == 0 || lit_value(i1) == 0);
+                        if (lit_value(i0) != 0)
+                        {
+                            mark_involved_var( vid1 );
+                            r = 2;
+                        }
+                        else if (lit_value(i1) != 0)
+                        {
+                            mark_involved_var( vid0 );
+                            r = 1;
+                        }
+                        else
+                        {
+                            sharp_assert (var_dlevel(vid0) == var_dlevel(vid1));
+                            if (variable(vid0).asgn_pos < variable(vid1).asgn_pos)
+                            {
+                                mark_involved_var( vid0 );
+                                r = 1;
+                            }
+                            else
+                            {
+                                mark_involved_var( vid1 );
+                                r = 2;
+                            }
+                        }
+                    }
+                }
+                else
+                { //it's justification, the reason is it's output (ante), and maybe the other input of ante
+                    int other_vid;
+                    int other_input;
+                    int self_input;
+
+                    sharp_assert (vid0 == vid || vid1 == vid);
+                    if (vid0 == vid)
+                    {
+                        other_vid = vid1;
+                        other_input = i1;
+                        self_input = i0;
+                        r = 1;
+                    }
+                    else
+                    {
+                        other_vid = vid0;
+                        other_input = i0;
+                        self_input = i1;
+                        r = 2;
+                    }
+                    if (lit_value(self_input) == 1)
+                    {
+                        sharp_assert (var_value(ante) == 1);
+                        mark_involved_var( ante );
+                    }
+                    else
+                    {
+                        sharp_assert (var_value(ante) == 0);
+                        sharp_assert (lit_value(other_input) == 1);
+                        mark_involved_var( ante );
+                        mark_involved_var( other_vid );
+                        r = 3;
+                    }
+                }
+            }
+            else
+            {
+                sharp_assert (n.type == NodeType.XOR);
+                if (ante == vid)
+                {
+                    mark_involved_var( vid0 );
+                    mark_involved_var( vid1 );
+#if GEN_RESOLVE_TRACE
+                    int va = lit_value(i0);
+                    int vb = lit_value(i1);
+                    int vc = var_value(ante);
+                    if (vc == 1)
+                    {
+                        if (va == 1 && vb == 0)
+                            r = 4;
+                        else
+                        {
+                            sharp_assert (va == 0 && vb == 1);
+                            r = 5;
+                        }
+                    }
+                    else
+                    {
+                        if (va == 0 && vb == 0)
+                            r = 6;
+                        else
+                        {
+                            sharp_assert (va == 1 && vb == 1);
+                            r = 7;
+                        }
+                    }
+#endif
+                }
+                else
+                {
+                    mark_involved_var( ante );
+                    sharp_assert (vid0 == vid || vid1 == vid);
+                    if (vid0 == vid)
+                        mark_involved_var( vid1 );
+                    else
+                        mark_involved_var( vid0 );
+#if GEN_RESOLVE_TRACE
+                    int va = lit_value(i0);
+                    //int vb = lit_value(i1);
+                    int vc = var_value(ante);
+                    if (vc == 0)
+                    {
+                        if (va == 0)
+                            r = 4;
+                        else
+                            r = 5;
+                    }
+                    else
+                    {
+                        if (va == 0)
+                            r = 6;
+                        else
+                            r = 7;
+                    }
+#endif
+                }
+            }
+            return r;
+        }
+
+        void resolve_conflicts()
+        {
+            sharp_assert (!conflict_array.empty());
+            sharp_assert (implication_queue.Count == 0);
+            sharp_assert ( stats.marked_current_dl == 0 );
+            sharp_assert ( learned_clause.empty() );
+
+            ++ stats.num_conflicts;
+
+            if (dlevel == 0)
+            {
+                rtrace_gen_empty_clause(conflict_array[0]);
+                backtrack(-1);
+                conflict_array.clear();
+                return;
+            }
+
+            ushort gflag = 0;
+
+            Antecedent conf = (Antecedent) conflict_array[0];
+
+            for (int i=1, sz = conflict_array.size(); i< sz; ++i)
+            {
+                if ( ((Antecedent)conflict_array[i]).type == ImpType.NODE)
+                {
+                    conf = (Antecedent) conflict_array[i];
+                    break;
+                }
+            }
+
+            gflag |= mark_conflict(conf);
+
+            sharp_assert (stats.marked_current_dl > 1);
+
+            IntVector assignments = assignment_stack(dlevel);
+            for (int i = assignments.size() - 1; i >= 0; --i)
+            {
+                int lit = assignments[i];
+                int vid = (lit >> 1);
+                Variable var = variable(vid);
+
+                if (!is_marked(var))
+                    continue;
+
+                if (stats.marked_current_dl == 1)
+                {
+                    learned_clause.push_back(lit^1);
+                    break;
+                }
+                else
+                {
+                    gflag |= mark_reason (vid);
+                    clear_marked(var);
+                    -- stats.marked_current_dl;
+                }
+            }
+            sharp_assert ( stats.marked_current_dl == 1);
+
+            int sharp_assert_level = 0;
+            int sharp_assert_lit = learned_clause.back;
+            sharp_assert (lit_value(sharp_assert_lit) == 0);
+            clear_marked(node(sharp_assert_lit));
+            -- stats.marked_current_dl;
+
+            for (int i = 0; i < learned_clause.size() - 1; ++i)
+            {
+                int lit = learned_clause[i];
+                incr_var_score (lit);
+                sharp_assert (lit_value(lit) == 0);
+
+                Variable var = variable(lit>>1);
+                sharp_assert (is_marked(var));
+                clear_marked(var);
+                if (var.dlevel > sharp_assert_level)
+                    sharp_assert_level = var.dlevel;
+            }
+            backtrack(sharp_assert_level);
+
+            int cl_id = add_learned_clause(learned_clause.ToArray(), gflag);
+            learned_clause.clear();
+            sharp_assert (is_unit(cl_id));
+            queue_implication(sharp_assert_lit, cl_id, ImpType.CLAUSE);
+            conflict_array.clear();
+        }
+
+
+        void queue_conflict (int ante, ImpType type)
+        {
+            Antecedent antecedent = new Antecedent(type, ante);
+            conflict_array.push_back ((int) antecedent);
+        }
+
+        void queue_implication(int lit, int ante, ImpType type)
+        {
+            if (is_active(node(lit))) //it is in the active area
+            {
+                Implication imp = new Implication();
+                imp.lit = lit;
+                imp.ante.type = type;
+                imp.ante.index = ante;
+                implication_queue.Enqueue (imp);
+            }
+        }
+
+        bool deduce()
+        {
+            while (implication_queue.Count != 0 && conflict_array.empty())
+            {
+                Implication imp = (Implication) implication_queue.Dequeue();
+                int lit = imp.lit;
+                int vid = lit>> 1;
+                if(var_value(vid) == UNKNOWN)
+                {
+                    propagate_implication ( imp );
+                    variable(vid).asgn_pos = assignment_stack(dlevel).size();
+                    assignment_stack(dlevel).push_back(lit);
+                }
+                else
+                {
+                    if (lit_value(lit) == 0)    //conflict
+                        queue_conflict(imp.ante.index, imp.ante.type);
+                }
+#if CHECK
+                for (int i=0; i< clauses.size(); ++i)
+                {
+                    Clause cl = clause(i);
+                    if (cl != null && is_conflicting(i))
+                        sharp_assert (!conflict_array.empty());
+                }
+#endif
+            }
+            if (!conflict_array.empty())
+            {
+                implication_queue.Clear();
+                return false;
+            }
+            return true;
+        }
+
+        void propagate_implication (Implication imp)
+        {
+            int vid = imp.lit>> 1;
+
+            Variable var = variable(vid);
+            sharp_assert (var_value(vid) == UNKNOWN);
+
+            var.dlevel = dlevel;
+            var.antecedent = imp.ante;
+
+            var_set_value (vid, (short) (1 - (imp.lit&1)));
+
+            set_svar_value(imp.lit);
+
+            ++ stats.num_implications ;
+            -- stats.num_free_variables;
+            if (is_branchable(var))
+                -- stats.num_free_branch_vars;
+        }
+
+        void unset_variable(int v)
+        {
+            if (v == 0) return;
+            Variable var = variable(v);
+            var.dlevel      = -1;
+            var.antecedent  = -1;
+            var.asgn_pos    = -1;
+            var_set_value (v, UNKNOWN);
+            ++ stats.num_free_variables;
+            if (is_branchable(var))
+            {
+                ++ stats.num_free_branch_vars;
+                if (var.ordered_pos < max_score_pos)
+                    max_score_pos = var.ordered_pos;
+            }
+        }
+
+        void backtrack(int blevel)
+        {
+            sharp_assert(blevel < dlevel);
+            implication_queue.Clear();
+
+            for (int i= dlevel; i> blevel; --i)
+            {
+                IntVector assignments = assignment_stack(i);
+                for (int j=assignments.size()-1 ; j>=0; --j)
+                    unset_variable (assignments[j]>>1);
+                assignment_stack(i).clear();
+            }
+
+            dlevel = blevel;
+            ++ stats.num_backtracks;
+
+            if (hook != null)
+                hook.OnBacktrack(blevel);
+        }
+
+        void set_svar_value(int s)
+        {
+            //Implication On the Network
+            Variable var = variable(VID(s));
+            //propagate forward
+            for (int i=0; i< var.outputs.size(); ++i)
+                make_node_consistent(var.output(i));
+            //justify backward
+            make_node_consistent(s);
+
+            //Implication On the clauses
+            IntVector watched = watched_by (s ^ 1); //the neg watched
+            for (int i=0; i< watched.size(); ++i)
+            {
+                int cl_idx = (watched[i] >> 1);
+                int w_idx = (watched[i] & 1);
+                Clause cl = clause(cl_idx);
+                int[] lits = cl.literals;
+                sharp_assert (lits[w_idx] == (s ^ 1));
+                int other_watch_lit = lits[1 - w_idx];
+                int other_value = lit_value(other_watch_lit);
+                if (other_value == 0)
+                {
+                    sharp_assert (variable(other_watch_lit>> 1).dlevel == dlevel);
+                    queue_conflict(cl_idx, ImpType.CLAUSE);
+                }
+                else if (other_value != 1)
+                {
+                    int j;
+                    for (j=2; j< cl.num_lits; ++j)
+                        if (lit_value(lits[j]) != 0)
+                            break;
+                    if (j < cl.num_lits)
+                    { //found another non-0 lit
+                        int temp = lits[j];
+                        lits[j] = lits[w_idx];
+                        lits[w_idx] = temp;
+                        watched_by(temp).push_back(cl_idx + cl_idx + w_idx);
+                        watched[i] = watched.back;
+                        watched.pop_back();
+                        -- i;
+                    }
+                    else
+                        queue_implication(other_watch_lit, cl_idx, ImpType.CLAUSE);
+                }
+            }
+        }
+
+        internal int new_pi()
+        {
+            int s = new_node( NodeType.PI, INVALID, INVALID);
+            primary_inputs.push_back(s);
+            node_to_pi_hash[s] = primary_inputs.size() - 1;
+            return s;
+        }
+
+        internal int nth_pi(int n)
+        {
+            while (num_pi() <= n)
+                new_pi();
+            return pi(n);
+        }
+
+
+        internal int left_child (int s) { return node(s).left; }
+        internal int right_child (int s){ return node(s).right; }
+
+        internal int band (int i1, int i2)
+        {
+            int l = canonical (i1);
+            int r = canonical (i2);
+            int result =  create( NodeType.AND, l, r );
+            //          dump_file.WriteLine ("{0} = AND {1} {2}", result, i1, i2);
+            return result;
+        }
+
+        internal int bxor (int i1, int i2)
+        {
+            int l = canonical (i1);
+            int r = canonical (i2);
+            int result = create( NodeType.XOR, l, r );
+            //          dump_file.WriteLine ("{0} = XOR {1} {2}", result, i1, i2);
+            return result;
+        }
+
+        internal int  bor  (int i1, int i2) { return NEGATE( band( NEGATE(i1), NEGATE(i2)) );}
+        internal int    bequ (int i1, int i2)   { return NEGATE( bxor( i1, i2 ));}
+        internal int    bimp (int i1, int i2)   { return bor (NEGATE(i1), i2);}
+        internal int    bnot (int i)            { return NEGATE(i); }
+
+        /*
+          Create a node. Don't do recursive optimization. But do lookup and simplification
+          if possible.
+         */
+        int create_op_node(NodeType op, int i1, int i2)
+        {
+            if (op == NodeType.AND)
+            {
+                if (i1 == zero() || i2 == zero() || i1 == NEGATE(i2))
+                    return zero();
+                if (i1 == one())
+                    return i2;
+                if (i2 == one())
+                    return i1;
+                if (i1 == i2)
+                    return i1;
+            }
+            else
+            {
+                sharp_assert (op == NodeType.XOR);
+                if (i1 == zero())
+                    return i2;
+                if (i1 == one())
+                    return NEGATE(i2);
+                if (i2 == zero())
+                    return i1;
+                if (i2 == one())
+                    return NEGATE(i1);
+                if (i1 == i2)
+                    return zero();
+                if (i1 == NEGATE(i2))
+                    return one();
+            }
+
+            int r = node_hash.lookup(op, i1, i2);
+            if (r != INVALID)
+                return r;
+
+            r = create_op_node2(op, i1, i2);
+
+            return r;
+        }
+
+        /*
+          create an op node, Do recursive optimization and other possible optimizations
+         */
+        int create (NodeType op, int i1, int i2)
+        {
+            if (op == NodeType.AND)
+            {
+                if (i1 == zero() || i2 == zero() || i1 == NEGATE(i2))
+                    return zero();
+                if (i1 == one())
+                    return i2;
+                if (i2 == one())
+                    return i1;
+                if (i1 == i2)
+                    return i1;
+            }
+            else
+            {
+                sharp_assert (op == NodeType.XOR);
+                if (i1 == zero())
+                    return i2;
+                if (i1 == one())
+                    return NEGATE(i2);
+                if (i2 == zero())
+                    return i1;
+                if (i2 == one())
+                    return NEGATE(i1);
+                if (i1 == i2)
+                    return zero();
+                if (i1 == NEGATE(i2))
+                    return one();
+            }
+
+            int r = node_hash.lookup(op, i1, i2);
+
+            if (r != INVALID)
+                return r;
+
+            //          r = create_op_node2(op, i1, i2);
+            if ( is_pi(i1) && is_pi(i2))
+                r = create_op_node2(op, i1, i2);
+            else if (is_pi(i1) || is_pi(i2))
+                r = create_op_node3(op, i1, i2);
+            else
+                r = create_op_node4(op, i1, i2);
+
+            return r;
+        }
+
+        int get_signature4(NodeType op, int l, int r)
+        {
+            int sig = 0;
+            int ll = node(l).left;
+            int lr = node(l).right;
+
+            int rl = node(r).left;
+            int rr = node(r).right;
+
+            sharp_assert ( ll < lr );
+            sharp_assert ( rl < rr );
+            sharp_assert ( ll < rl || ll == rl ); // to reduce lookup table size
+
+            if (IS_NEGATED(ll))         sig |= (1<<0);
+            if (IS_NEGATED(lr))         sig |= (1<<1);
+            if (IS_NEGATED(rl))         sig |= (1<<2);
+            if (IS_NEGATED(rr))         sig |= (1<<3);
+            if (IS_NEGATED(l))          sig |= (1<<4);
+            if (IS_NEGATED(r))          sig |= (1<<5);
+            if (node(l).type == NodeType.XOR)   sig |= (1<<6);
+            if (node(r).type == NodeType.XOR)   sig |= (1<<7);
+            if (op == NodeType.XOR)         sig |= (1<<8);
+
+            int v_ll = NODE_ID( ll );
+            int v_lr = NODE_ID( lr );
+            int v_rl = NODE_ID( rl );
+            int v_rr = NODE_ID( rr );
+
+            if (v_lr < v_rl)        sig |= (0 << 9);    //a < b < c < d
+            else if (v_lr == v_rl)  sig |= (1 << 9);    //a < b = c < d
+            else if (v_lr < v_rr)
+            {
+                if (v_ll < v_rl )   sig |= (2 << 9);        //a < c < b < d
+                else            sig |= (3 << 9);    //a = c < b < d
+            }
+            else if (v_lr == v_rr)
+            {
+                if (v_ll < v_rl )   sig |= (4 << 9);        //a < c < b = d
+                else            sig |= (5 << 9);    //a = c < b = d
+            }
+            else
+            { // v_lr > v_rr
+                if (v_ll < v_rl )   sig |= (6 << 9);        //a < c < d < b
+                else            sig |= (7 << 9);    //a = c < d < b
+            }
+            return sig;
+        }
+
+        int  get_signature3(NodeType op, int l, int r)
+        {
+            //Functions that contains 3 operands:
+            //it is assumed that the structure is like this:
+            //               o
+            //             l    (op)  r
+            //        ll (op1) lr
+            int sig = 0;
+            sharp_assert (!is_pi(l));
+            sharp_assert (is_pi(r));
+            int ll = node(l).left;
+            int lr = node(l).right;
+
+            sharp_assert (ll < lr);
+
+            if (IS_NEGATED(ll))         sig |= (1<<0);
+            if (IS_NEGATED(lr))         sig |= (1<<1);
+            if (IS_NEGATED(l))          sig |= (1<<2);
+            if (IS_NEGATED(r))          sig |= (1<<3);
+            if (node(l).type == NodeType.XOR)   sig |= (1<<4);
+            if (op == NodeType.XOR)         sig |= (1<<5);
+
+            int v_r = NODE_ID(r);
+            int v_ll = NODE_ID(ll);
+            int v_lr = NODE_ID(lr);
+
+            if (v_r > v_lr )        sig |= (0 << 6);    //a < b < c
+            else if (v_r == v_lr )  sig |= (1 << 6);    //a < b = c
+            else if (v_ll < v_r )   sig |= (2 << 6);    //a < c < b
+            else if (v_ll == v_r )  sig |= (3 << 6);    //a = c < b
+            else            sig |= (4 << 6);    //c < a < b
+
+            return sig;
+        }
+
+        /*
+          Create an op node and add it to hash table.
+          Just do it, don't do lookup or simplification
+         */
+        int create_op_node2(NodeType op, int i1, int i2)
+        {
+            sharp_assert (op == NodeType.AND || op == NodeType.XOR);
+
+            // do need to make it canonical
+            //1. left input always has smaller index than right
+            if (i1 > i2)
+            {
+                int temp = i1;
+                i1 = i2;
+                i2 = temp;
+            }
+            //2. For XOR gate, both of its input must be in positive phase
+            bool do_NEGATE = false;
+            if (op == NodeType.XOR)
+            {
+                if (IS_NEGATED(i1))
+                {
+                    i1 = NEGATE(i1);
+                    do_NEGATE = !do_NEGATE;
+                }
+                if (IS_NEGATED(i2))
+                {
+                    i2 = NEGATE(i2);
+                    do_NEGATE = !do_NEGATE;
+                }
+            }
+
+            int o = new_node(op, i1, i2);
+            sharp_assert (o > i1 && o > i2);
+
+            node(i1).outputs.push_back(o);      //i.e. the sign is 0: Left child
+            node(i2).outputs.push_back(NEGATE(o));  //i.e. the sign is 1: Right child
+            reference (i1);
+            reference (i2);
+
+            //add it to the hash
+            node_hash.insert( o, op, i1, i2);
+
+            //return the actual result
+            if (do_NEGATE)
+                o = NEGATE(o);
+
+            return o;
+        }
+
+        /*
+          Create a node, one of its inputs is a PI
+         */
+        int create_op_node3(NodeType op, int i1, int i2)
+        {
+            if (is_pi(i1))
+            {
+                sharp_assert (!is_pi(i2));
+                int temp = i2;
+                i2 = i1;
+                i1 = temp;
+            }
+
+            int sig = get_signature3(op, i1, i2);
+            int r = look_up_3_input_node ( op, i1, i2, sig);
+            return r;
+        }
+
+        /*
+          Create a node, none of its inputs is PI
+         */
+        int create_op_node4(NodeType op, int i1, int i2)
+        {
+            if (node(i1).left > node(i2).left)
+            {
+                int temp = i1;
+                i1 = i2;
+                i2 = temp;
+            }
+
+            int sig = get_signature4(op, i1, i2);
+            int r = look_up_4_input_node ( op, i1, i2, sig);
+            return r;
+        }
+
+        /*
+          Merge two ints, always keep the one() with smaller index
+         */
+        int merge (int i1, int i2)
+        {
+            return real_merge(canonical(i1), canonical(i2));
+        }
+
+        int real_merge(int i1, int i2)
+        {
+            if (i1 == i2)
+                return i1;
+            else if (i1 == NEGATE(i2))
+                return INVALID;
+
+            if (i1 > i2)
+            {
+                int temp = i2;
+                i2 = i1;
+                i1 = temp;
+            }
+
+            for (int i=0; i< node(i2).outputs.size(); ++i)
+            {
+                int o = node(i2).output(i);
+                int output = NON_NEGATED (o);
+                int l_r = SIGN(o); //the left or the right input
+                int other_input = node(output).input(1 - l_r);
+                if (node(output).input(l_r) == i2)
+                {
+                    int r_node = create (node(output).type, i1, other_input);
+                    real_merge(r_node, output);
+                }
+                else
+                {
+                    sharp_assert (node(output).input(l_r) == NEGATE(i2));
+                    int r_node = create (node(output).type, NEGATE(i1), other_input);
+                    real_merge(r_node, output);
+                }
+            }
+
+            node(i2).outputs.clear();
+
+            if (IS_NEGATED(i2))
+                node(i2).canonical = NEGATE(i1);
+            else
+                node(i2).canonical = i1;
+
+            return i1;
+        }
+
+        internal void reference(int lit)
+        {
+            variable(lit>>1).ref_count ++;
+        }
+
+        internal void deref (int lit)
+        {
+            //          if (--variable(VID (lit)).ref_count != 0)
+            //              return;
+            //
+            //          IntVector to_be_processed = new IntVector(16);
+            //          to_be_processed.push_back(VID (lit));
+            //          for (int i=0; i< to_be_processed.size(); ++i)
+            //          {
+            //              int vid = to_be_processed[i];
+            //              Variable var = variable(vid);
+            //              if (var.is_gate())
+            //              {
+            //                  for (int j=0; j< 2; ++j)
+            //                  {
+            //                      int vin = (j==0)? VID(var.left): VID(var.right);
+            //                      Variable var_in =  variable(vin);
+            //                      int size = var_in.outputs.size();
+            //                      for (int k=0; k< size; ++k)
+            //                      {
+            //                          if (VID(var_in.output(k)) == vid)
+            //                          {
+            //                              var_in.outputs[k] = var_in.outputs.back;
+            //                              var_in.outputs.pop_back();
+            //                              break;
+            //                          }
+            //                      }
+            //                      sharp_assert (size > var_in.outputs.size());
+            //                      if ( --var_in.ref_count == 0)
+            //                          to_be_processed.push_back(vin);
+            //                  }
+            //              }
+            //          }
+            //          free_nodes.add (to_be_processed);
+        }
+        /*
+          Compose: i.e. replace some ints with other ints
+          input : the output node and the replacement correspondence
+          output: the result of the composition
+         */
+        internal int compose ( int output, int [] orig, int [] replace)
+        {
+            sharp_assert (orig.Length == replace.Length);
+
+            if (node(output).type == NodeType.CONSTANT)
+                return output;
+
+            MyHashtable sig_map = new MyHashtable();
+            for (int i=0; i< orig.Length; ++i)
+            {
+                int s_orig = orig[i];
+                int s_new = replace[i];
+                if (IS_NEGATED(s_orig))
+                {
+                    s_orig = NEGATE(s_orig);
+                    s_new = NEGATE(s_new);
+                }
+                sig_map[s_orig] = s_new;
+            }
+            return real_compose(canonical(output), sig_map);
+        }
+
+        int real_compose(int old, MyHashtable sig_map )
+        {
+            int result;
+
+            bool invert = false;
+
+            if (IS_NEGATED(old))
+            {
+                old = NEGATE(old);
+                invert = true;
+            }
+            object item = sig_map[old];
+            if (item != null)
+                result = (int) item;
+            else
+            {
+                if (is_pi(old))     //so, if a pi is not replaced, use it as is
+                    result  = old;
+                else
+                {
+                    int left = real_compose(node(old).left, sig_map);
+                    int right = real_compose(node(old).right, sig_map);
+                    result = create(node(old).type, left, right);
+                    sig_map[old] = result;
+                }
+            }
+            return (invert ? NEGATE(result): result);
+        }
+
+        internal int gen_interpolant_from_clauses(int gid1, int gid2)
+        {
+            clean_up();
+            rtrace.enable_trace(true);
+            SATStatus status = solve();
+            rtrace.enable_trace(false);
+            reset();
+
+            if (status != SATStatus.UNSATISFIABLE)
+                return -1;
+            return rtrace.gen_interpolant_from_clauses (gid1, gid2);
+        }
+
+        internal int gen_interpolant_from_signals(int s1, int s2)
+        {
+            clean_up();
+
+            int gid = alloc_gid();
+            int [] cl1 = new int [] {s1};
+            int c_1 = add_clause(cl1, gid);
+            int [] cl2 = new int [] {s2};
+            int c_2 = add_clause(cl2, gid);
+
+            rtrace.enable_trace(true);
+            SATStatus status = solve();
+            rtrace.enable_trace(false);
+            reset();
+
+            int r;
+            if (status != SATStatus.UNSATISFIABLE)
+                r =  -1;
+            else
+                r = rtrace.gen_interpolant_from_signals (s1, c_1, s2, c_2);
+            delete_clause_group(gid);
+            return r;
+        }
+
+        // gretay - change start
+        internal int gen_interpolant_from_signals_ex(int s1, int s2)
+        {
+            // don't cleanup because conflict clauses
+            //clean_up();
+
+            int gid = alloc_gid();
+            int [] cl1 = new int [] {s1};
+            int c_1 = add_clause(cl1, gid, false);
+            int [] cl2 = new int [] {s2};
+            int c_2 = add_clause(cl2, gid, false);
+
+            rtrace.enable_trace(true);
+            SATStatus status = solve();
+            rtrace.enable_trace(false);
+            reset();
+
+            int r;
+            if (status != SATStatus.UNSATISFIABLE)
+                r =  -1;
+            else
+                r = rtrace.gen_interpolant_from_signals_ex (s1, c_1, s2, c_2, c_cls_id.ToArray(), c_interp.ToArray());
+            return r;
+        }
+
+        Hashtable interpolants = new Hashtable();  // maps clause_uid to signal that describes the interpolant provided for that clause
+        IntVector c_cls_id = new IntVector(4);
+        IntVector c_interp = new IntVector(4);
+
+        public bool has_interpolant(int cl_uid)
+        {
+            return interpolants.Contains(cl_uid);
+        }
+        public void set_interpolant(int cl_uid, int interp)
+        {
+            Debug.Assert(!has_interpolant(cl_uid));
+            interpolants[cl_uid] = interp;
+            c_cls_id.push_back(cl_uid);
+            c_interp.push_back(interp);
+        }
+        public int  get_interpolant_by_clause_uid(int cl_uid)
+        {
+            Debug.Assert(has_interpolant(cl_uid));
+            return (int) interpolants[cl_uid];
+        }
+        // end gretay - change end
+
+        internal UnsatCore gen_unsat_core ()
+        {
+            clean_up();
+            rtrace.enable_trace(true);
+            SATStatus status = solve();
+            rtrace.enable_trace(false);
+
+            if (status != SATStatus.UNSATISFIABLE)
+                return null;
+
+            MyHashtable hash = rtrace.generate_unsat_core();
+            UnsatCore core = new UnsatCore();
+            IntVector core_cls = new IntVector(4);
+            IntVector core_nodes = new IntVector(4);
+            for (int i=0; i< clauses.size(); ++i)
+            {
+                Clause cl = clause(i);
+                if (cl == null)
+                    continue;
+                if (hash.Contains(cl.uid))
+                {
+                    sharp_assert (cl.type == ClType.ORIGINAL);
+                    core_cls.push_back (i);
+                }
+            }
+            for (int i=1; i < variables.size(); ++i)
+            {
+                Variable v = variable(i);
+                if (hash.Contains(v.uid))
+                {
+                    sharp_assert (v.type == NodeType.AND || v.type == NodeType.XOR);
+                    core_nodes.push_back ( i + i);
+                }
+            }
+            core.core_clauses = core_cls.ToArray();
+            core.core_nodes = core_nodes.ToArray();
+            return core;
+        }
+
+        void dump_unsat_core( string filename)
+        {
+            StreamWriter writer = new StreamWriter(filename);
+            UnsatCore core = gen_unsat_core();
+
+            writer.WriteLine ("p cnf {0} {1} ", num_variables() , core.core_clauses.Length);
+            foreach (int cl_id in core.core_clauses)
+            {
+                foreach (int lit in clause(cl_id).literals)
+                {
+                    if ((lit & 1) == 1)
+                        writer.Write("-");
+                    writer.Write ("{0} ", lit>>1);
+                }
+                writer.WriteLine ("0");
+            }
+            writer.Close();
+            if (core.core_nodes.Length != 0)
+            {
+                Console.WriteLine ("Warning: Contains Nodes in the UNSAT core " );
+                foreach (int s in core.core_nodes)
+                {
+                    Console.Write ("{0} ", s);
+                }
+                Console.WriteLine("");
+            }
+        }
+
+        internal void dump_node (StreamWriter wt, int s)
+        {
+            int flag = alloc_flag();
+            mark_transitive_fanins(s, flag);
+            for (int i=1; i< variables.size(); ++i)
+            {
+                Variable var = variable(i);
+                if (var.flag(flag))
+                {
+                    switch (var.type)
+                    {
+                        case NodeType.PI:
+                            wt.WriteLine("{0} = PI", i + i);
+                            break;
+                        case NodeType.AND:
+                            wt.WriteLine("{0} = AND {1} {2}", i + i, var.left, var.right);
+                            break;
+                        case NodeType.XOR:
+                            wt.WriteLine("{0} = XOR {1} {2}", i + i, var.left, var.right);
+                            break;
+                    }
+                }
+            }
+            free_flag(flag);
+        }
+
+        internal int get_structure (SharpSATSolver solver, int output)
+        {
+            int f = solver.alloc_flag();
+            solver.mark_transitive_fanins(output,f);
+            int [] lookup = new int [solver.variables.size() * 2];
+            for (int i=0; i< lookup.Length; ++i)
+                lookup[i] = -1;
+            for (int i=1; i< solver.variables.size(); ++i)
+            {
+                Variable var = solver.variable(i);
+                if (!var.flag(f))
+                    continue;
+                int l = var.left;
+                int r = var.right;
+                int s ;
+                switch(var.type)
+                {
+                    case NodeType.AND:
+                        sharp_assert (solver.node(l).flag(f));
+                        sharp_assert (solver.node(r).flag(f));
+                        sharp_assert (lookup[l] != -1);
+                        sharp_assert (lookup[r] != -1);
+                        s = band(lookup[l], lookup[r]);
+                        //                      sharp_assert (node(s).left == lookup[l]);
+                        //                      sharp_assert (node(s).right == lookup[r]);
+                        lookup[i + i] = s;
+                        lookup[i + i + 1] = s ^ 1;
+                        break;
+                    case NodeType.XOR:
+                        sharp_assert (solver.node(l).flag(f));
+                        sharp_assert (solver.node(r).flag(f));
+                        sharp_assert (lookup[l] != -1);
+                        sharp_assert (lookup[r] != -1);
+                        s = bxor(lookup[l], lookup[r]);
+                        //                      sharp_assert (node(s).left == lookup[l]);
+                        //                      sharp_assert (node(s).right == lookup[r]);
+                        lookup[i + i] = s;
+                        lookup[i + i + 1] = s ^ 1;
+                        break;
+                    case NodeType.PI:
+                        s = new_pi();
+                        lookup[i + i] = s;
+                        lookup[i + i + 1] = s ^ 1;
+                        break;
+                    default:
+                        sharp_assert(false);
+                        break;
+                }
+            }
+            return lookup[output];
+        }
+
+        internal void dump_original_clauses ( StreamWriter wt )
+        {
+//          IntVector originals = new IntVector(128);
+//          foreach (object k in original_clauses.Keys)
+//              originals.push_back((int)k);
+//          originals.sort();
+            for (int i=0; i< original_clauses.size(); ++i)
+            {
+                int cl_id = original_clauses[i];
+                sharp_assert (clause(cl_id).type == ClType.ORIGINAL);
+                wt.Write ("{0} = CL", i);
+                foreach (int lit in clause(cl_id).literals)
+                    wt.Write(" {0}", lit);
+                wt.Write("\n");
+            }
+        }
+        /* =========================================================================
+
+        Simulation Etc. on the Boolean Network
+
+           ========================================================================= */
+        internal IntVector mark_transitive_fanouts(int s, int flag_id)
+        {
+            IntVector to_be_processed = new IntVector(64);
+            to_be_processed.push_back(s);
+            node(s).set_flag(flag_id);
+            for (int i = 0; i< to_be_processed.size(); ++i)
+            {
+                Variable nd = node (to_be_processed[i]);
+                for (int j=0, sz = nd.outputs.size(); j < sz;  ++j)
+                    if (node(nd.output(j)).flag(flag_id) == false)
+                    {
+                        node(nd.output(j)).set_flag(flag_id);
+                        to_be_processed.push_back(nd.output(j));
+                    }
+            }
+            return to_be_processed;
+        }
+
+        internal IntVector find_transitive_fanins  (int s)
+        {
+            int flag = alloc_flag();
+            IntVector result = mark_transitive_fanins(s, flag);
+            free_flag(flag);
+            return result;
+        }
+
+        internal IntVector mark_transitive_fanins(IntVector to_be_processed, int flag_id)
+        {
+            for (int i = 0, sz = to_be_processed.size(); i < sz; ++i)
+            {
+                Variable nd = node (to_be_processed[i]);
+                nd.set_flag(flag_id);
+            }
+            for (int i = 0; i< to_be_processed.size(); ++i)
+            {
+                Variable nd = node (to_be_processed[i]);
+                if (nd.left == INVALID || nd.right == INVALID)
+                {
+                    sharp_assert (nd.left == INVALID && nd.right == INVALID);
+                    continue;
+                }
+                if (node(nd.left).flag(flag_id) == false)
+                {
+                    node(nd.left).set_flag(flag_id);
+                    to_be_processed.push_back(nd.left);
+                }
+                if (node(nd.right).flag(flag_id) == false)
+                {
+                    node(nd.right).set_flag(flag_id);
+                    to_be_processed.push_back(nd.right);
+                }
+            }
+            return to_be_processed;
+        }
+
+        internal IntVector mark_transitive_fanins(int s, int flag_id)
+        {
+            sharp_assert (s != INVALID);
+            if (node(s).type == NodeType.CONSTANT)
+                return null;
+            IntVector to_be_processed = new IntVector(4);
+            to_be_processed.push_back(s);
+            node(s).set_flag(flag_id);
+            for (int i = 0; i< to_be_processed.size(); ++i)
+            {
+                Variable nd = node (to_be_processed[i]);
+                if (nd.left == INVALID || nd.right == INVALID)
+                {
+                    sharp_assert (nd.left == INVALID && nd.right == INVALID);
+                    continue;
+                }
+
+                if (node(nd.left).flag(flag_id) == false)
+                {
+                    node(nd.left).set_flag(flag_id);
+                    to_be_processed.push_back(nd.left);
+                }
+                if (node(nd.right).flag(flag_id) == false)
+                {
+                    node(nd.right).set_flag(flag_id);
+                    to_be_processed.push_back(nd.right);
+                }
+            }
+            return to_be_processed;
+        }
+
+        public int [] find_small_model()
+        {
+            return find_small_model_greed();
+        }
+
+        private int [] find_small_model_greed ()
+        {
+            sharp_assert ( stats.outcome == SATStatus.SATISFIABLE);
+            sharp_assert ( stats.num_free_branch_vars == 0);
+            int f = alloc_flag();
+            //1. collect all the lits that needs to be true for clauses
+            for (int i=0; i< clauses.size(); ++i)
+            {
+                if (clauses[i] == null || clauses[i].type == ClType.CONFLICT) //??? is this correct, do we need to satisfy the temp clauses?
+                    continue;
+                bool cls_sat = false;
+                foreach (int lit in clause(i).literals)
+                {
+                    if (lit_value(lit) == 1)
+                    {
+                        variable(VID(lit)).set_flag(f);
+                        cls_sat = true;
+                        break;
+                    }
+                }
+                if (cls_sat == false)
+                {
+                    fatal ("A clause does not contain true lit even though formula is SAT");
+                }
+            }
+            //now traverse the tree in reverse topological order
+            for (int i=variables.size()-1; i > 0 ; --i)
+            {
+                Variable var = variable(i);
+                if (!var.flag(f))
+                    continue;
+                sharp_assert (var_value(i) != UNKNOWN);
+                switch (var.type)
+                {
+                    case NodeType.AND:
+                        if (var_value(i) == 1) //both inputs must be true
+                        {
+                            sharp_assert (lit_value(var.left) == 1);
+                            sharp_assert (lit_value(var.right) == 1);
+                            variable(VID(var.left)).set_flag(f);
+                            variable(VID(var.right)).set_flag(f);
+                        }
+                        else
+                        {
+                            sharp_assert (var_value(i) == 0);
+                            if (lit_value(var.left) == 0)
+                                variable(VID(var.left)).set_flag(f);
+                            else if (lit_value(var.right) == 0)
+                                variable(VID(var.right)).set_flag(f);
+                            else
+                                fatal ("Variable unjustifiable");
+                        }
+                        break;
+                    case NodeType.XOR:
+                        variable(VID(var.left)).set_flag(f);
+                        variable(VID(var.right)).set_flag(f);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            IntVector cube = new IntVector(16);
+            for (int i=0; i< variables.size(); ++i)
+            {
+                if (variable(i).flag(f))
+                {
+                    sharp_assert (var_value(i) != UNKNOWN);
+                    cube.push_back (i + i + 1 - var_value(i));
+                }
+            }
+            free_flag(f);
+            return cube.ToArray();
+        }
+
+        private class EnumQuantification
+        {
+            SharpSATSolver solver;
+
+            IntVector visiting_queue;
+            IntVector blocking_lits;
+            int bound_flag;
+            int visited_flag;
+            int occ_flag ;
+            int sign_flag ;
+            IntVector involved_signals;
+            Hashtable blocking_clauses;
+
+            ObjVector cls_occurrence;
+
+            Variable variable(int vid) { return solver.variable(vid); }
+            Variable node(int lit) { return solver.node(lit); }
+            Clause clause (int id) { return solver.clause(id); }
+            int band (int a, int b) { return solver.band(a, b); }
+            int bor (int a, int b) { return solver.bor(a, b); }
+            int alloc_flag () { return solver.alloc_flag(); }
+
+            [Microsoft.Contracts.NotDelayed]
+            public EnumQuantification(SharpSATSolver sol)
+            {
+                solver = sol;
+                visiting_queue  = new IntVector(128);
+                blocking_lits   = new IntVector(64);
+                involved_signals= new IntVector(128);
+                cls_occurrence  = new ObjVector(128);
+                blocking_clauses= new Hashtable();
+                bound_flag      = solver.alloc_flag();
+                visited_flag    = solver.alloc_flag();
+                occ_flag        = solver.alloc_flag();
+                sign_flag       = solver.alloc_flag();
+            }
+
+            void finalize_quantification ()
+            {
+                solver.free_flag (visited_flag);
+                solver.free_flag(bound_flag);
+                solver.free_flag(occ_flag);
+                solver.free_flag(sign_flag);
+            }
+
+            void init_quantification (int s, int [] bounded, bool block_with_pi_only)
+            {
+
+                involved_signals = solver.find_transitive_fanins(s);
+                if (block_with_pi_only)
+                {
+                    foreach (int sig in bounded)
+                    {
+                        sharp_assert (node(sig).is_pi());
+                        node(sig).set_flag(bound_flag);
+                    }
+                    for (int i=0; i< involved_signals.size(); ++i)
+                    {
+                        Variable var = node(involved_signals[i]);
+                        if (!var.is_pi())
+                            var.set_flag(bound_flag);
+                    }
+                }
+                else
+                {
+                    foreach (int sig in bounded)
+                    {
+                        sharp_assert (node(sig).is_pi());
+                        solver.mark_transitive_fanouts(sig,bound_flag);
+                    }
+                }
+
+                cls_occurrence = new ObjVector(solver.variables.size());
+                for (int i = 0; i< involved_signals.size(); ++i)
+                    cls_occurrence[VID(involved_signals[i])] = new IntVector(4);
+            }
+
+            int build_balanced_or (int [] signals, int start, int end)
+            {
+                if (signals.Length == 0)
+                    return solver.zero();
+                else if (start == end)
+                    return signals[start];
+                else
+                {
+                    int middle = (end - start) /2 + start;
+                    int s1 = build_balanced_or(signals, start, middle);
+                    int s2 = build_balanced_or(signals, middle + 1, end);
+                    return bor (s1, s2);
+                }
+            }
+
+            int build_balanced_and (int [] signals, int start, int end)
+            {
+                if (signals.Length == 0)
+                    return solver.one();
+                else if (start == end)
+                    return signals[start];
+                else
+                {
+                    int middle = (end - start) /2 + start;
+                    int s1 = build_balanced_and(signals, start, middle);
+                    int s2 = build_balanced_and(signals, middle + 1, end);
+                    return band (s1, s2);
+                }
+            }
+
+            int build_struct_balanced (IntVector cls_ids)
+            {
+                int [] cl_sigs = new int[cls_ids.size()];
+                for (int i=0; i< cls_ids.size(); ++i)
+                {
+                    int [] lits = clause(cls_ids[i]).literals;
+                    cl_sigs[i] = build_balanced_or ( lits, 0, lits.Length - 1);
+                }
+                int result = build_balanced_and(cl_sigs, 0, cl_sigs.Length - 1);
+                return result;
+            }
+
+
+            int build_struct (IntVector cls)
+            {
+                //return build_struct_simple(cls);
+                return build_struct_balanced (cls);
+            }
+
+            int build_struct_simple(IntVector cls)
+            {
+                int sig = solver.one();
+                for (int i=0; i< cls.size(); ++i)
+                {
+                    int s = solver.zero();
+                    foreach (int lit in clause(cls[i]).literals)
+                        s = bor(s, lit);
+                    sig = band(sig, s);
+                }
+                return sig;
+            }
+
+            static IntVector intersect (IntVector a, IntVector b)
+            {
+                IntVector result = new IntVector(4);
+                for (int i=0, j=0; i< a.size() && j < b.size(); )
+                {
+                    if (a[i] < b[j])
+                        ++ i;
+                    else if (a [i] > b[j])
+                        ++ j;
+                    else
+                    {
+                        result.push_back (a[i]);
+                        ++i;
+                        ++j;
+                    }
+                }
+                return result;
+            }
+
+            IntVector resolve (IntVector a, int [] b)
+            {
+                IntVector result = new IntVector(b.Length - 1);
+                sharp_assert (a.size() == b.Length);
+                foreach (int lit in b)
+                {
+                    Variable var = variable (VID(lit));
+                    var.set_flag (occ_flag);
+                    if (IS_NEGATED(lit))
+                        var.set_flag (sign_flag);
+                }
+                for (int i=0; i< a.size(); ++i)
+                {
+                    int lit = a[i];
+                    Variable var = variable (VID(lit));
+                    sharp_assert (var.flag(occ_flag));
+                    if (var.flag(sign_flag) == IS_NEGATED(lit))
+                        result.push_back(lit);
+                    var.clear_flag (occ_flag);
+                    var.clear_flag (sign_flag);
+                }
+                if (result.size() == a.size() - 1)
+                    return result;
+                else
+                    return null;
+            }
+
+            bool subsume (IntVector a, int [] b)
+            {
+                sharp_assert (a.size() < b.Length);
+                for (int i=0; i< a.size(); ++i)
+                {
+                    int lit = a[i];
+                    Variable var = variable (VID(lit));
+                    var.set_flag (occ_flag);
+                    if (IS_NEGATED(lit))
+                        var.set_flag (sign_flag);
+                }
+                int same_lit = 0;
+                int same_var = 0;
+                foreach (int lit in b)
+                {
+                    Variable var = variable (VID(lit));
+                    if (var.flag(occ_flag))
+                    {
+                        same_var ++;
+                        if (IS_NEGATED(lit) == var.flag(sign_flag))
+                            same_lit ++;
+                        var.clear_flag (occ_flag);
+                        var.clear_flag (sign_flag);
+                    }
+                }
+                sharp_assert (same_var == a.size());
+                return (same_lit == same_var);
+            }
+
+            void remove_blocking (int cl_id)
+            {
+                blocking_clauses.Remove(cl_id);
+                foreach (int lit in solver.clause(cl_id).literals)
+                {
+                    int vid = VID(lit);
+                    IntVector occur = (IntVector)cls_occurrence[vid];
+                    int i;
+                    for (i=0; occur[i] != cl_id; ++i);
+                    for ( i = i + 1; i < occur.size(); ++i )
+                        occur[i-1] = occur[i];
+                    occur.pop_back();
+                }
+
+                Clause cl = solver.clause(cl_id);
+                if (cl.num_lits> 1)
+                    solver.remove_cl_from_reasoning (cl_id);
+
+
+                for (int i=0; i< cl.num_lits; ++i)
+                    solver.decr_lits_count(cl.literal(i));
+
+                ++ solver.stats.num_deleted_clauses;
+                solver.stats.num_deleted_literals += cl.num_lits;
+                solver.clauses[cl_id] = null;
+                solver.free_clauses.push_back(cl_id);
+            }
+
+            void add_blocking (int gid)
+            {
+                int cl_id = solver.add_blocking_clause(blocking_lits.ToArray(), gid);
+                for (int i=0; i< blocking_lits.size(); ++i)
+                {
+                    int lit = blocking_lits[i];
+                    IntVector occ_array = (IntVector) cls_occurrence[VID(lit)];
+                    occ_array.push_back(cl_id);
+                    //bubble down
+                    for (int j=occ_array.size()-2; j >= 0; --j)
+                    {
+                        if (occ_array[j] > cl_id)
+                        {
+                            occ_array[j+1] = occ_array[j];
+                            occ_array[j] = cl_id;
+                        }
+                        else
+                            break;
+                    }
+                }
+                blocking_clauses.Add(cl_id, null);
+            }
+
+            int n_tab = 1;
+            void tab () { for (int i=0; i< n_tab; ++i) Console.Write("  "); }
+
+            void dump_lits (int [] a)
+            {
+                IntVector cp = new IntVector (4);
+                foreach (int lit in a)
+                    cp.push_back(lit);
+                cp.sort();
+                for (int i=0; i< cp.size(); ++i)
+                    Console.Write ("{0}{1}", IS_NEGATED(cp[i])?" -":" +", VID(cp[i]));
+                Console.WriteLine("");
+            }
+
+            void dump_lits (IntVector a)
+            {
+                IntVector cp = new IntVector (4);
+                for (int i=0; i< a.size(); ++i)
+                    cp.push_back(a[i]);
+                cp.sort();
+                for (int i=0; i< cp.size(); ++i)
+                    Console.Write ("{0}{1}", IS_NEGATED(cp[i])?" -":" +", VID(cp[i]));
+                Console.WriteLine("");
+            }
+
+            void try_reduce()
+            {
+                if (blocking_lits.size() == 0)
+                    return;
+//              tab(); System.Console.Write ("Try to Reduce ");dump_lits(blocking_lit); ++ n_tab;
+
+                IntVector common = new IntVector((IntVector) cls_occurrence[VID(blocking_lits[0])]);
+                for (int i=1; i< blocking_lits.size(); ++i)
+                {
+                    int vid = VID(blocking_lits[i]);
+                    IntVector next = (IntVector) cls_occurrence[vid];
+                    common = intersect (common, next);
+                }
+                bool resolved = false;
+                for (int i=0; i< common.size(); ++i)
+                {
+                    int cl_id = common[i];
+                    int [] lits = solver.clause(cl_id).literals;
+                    sharp_assert (lits.Length >= blocking_lits.size());
+                    if (lits.Length > blocking_lits.size())
+                    {
+                        if (subsume (blocking_lits, lits))
+                        {
+//                          tab();Console.Write ("Subsume CL:{0} ->", cl_id); dump_lits(lits);
+                            remove_blocking (cl_id);
+                        }
+                    }
+                    else
+                    {
+                        IntVector r = resolve (blocking_lits, lits);
+                        if (r != null)
+                        {
+//                          tab();Console.Write ("Resolve CL:{0} ->", cl_id); dump_lits(lits);
+                            resolved = true;
+                            blocking_lits = r;
+                            remove_blocking (cl_id);
+                            break;
+                        }
+                    }
+                }
+                if (resolved)
+                    try_reduce();
+                //-- n_tab;
+            }
+
+            bool find_blocking_cls (int s)
+            {
+                blocking_lits.clear();
+                visiting_queue.clear();
+                SATStatus status = solver.solve();
+                if (status == SATStatus.UNSATISFIABLE)
+                    return false;
+                sharp_assert (status == SATStatus.SATISFIABLE);
+                int vid = VID(s);
+                visiting_queue.push_back( vid );
+                variable(vid).set_flag(visited_flag);
+                for (int i=0; i< visiting_queue.size(); ++i)
+                {
+                    vid = visiting_queue[i];
+                    Variable var = variable(vid);
+                    if (!var.flag(bound_flag)) //so it doesn't depends on bounded vars.
+                        blocking_lits.push_back(vid + vid + solver.var_value(vid));
+                    else
+                    {
+                        if (var.type == NodeType.PI)
+                            continue;
+                        if (var.type == NodeType.AND && solver.var_value(vid) == 0)
+                        {
+                            int l;
+                            if (solver.lit_value(var.left) != 0)
+                                l = var.right;
+                            else if (solver.lit_value(var.right) != 0)
+                                l = var.left;
+                            else
+                            { // both inputs are 0
+                                if (node(var.left).flag(visited_flag))
+                                    l = var.left;
+                                else if (node(var.right).flag(visited_flag))
+                                    l = var.right;
+                                else //neither has been visited
+                                    l = var.left;
+                            }
+                            if (!node(l).flag(visited_flag))
+                            {
+                                node(l).set_flag(visited_flag);
+                                visiting_queue.push_back(VID(l));
+                            }
+                        }
+                        else
+                        {
+                            sharp_assert (var.type == NodeType.XOR || var.type == NodeType.AND);
+                            int l = var.left;
+                            if (!node(l).flag(visited_flag))
+                            {
+                                node(l).set_flag(visited_flag);
+                                visiting_queue.push_back(VID(l));
+                            }
+                            l = var.right;
+                            if (!node(l).flag(visited_flag))
+                            {
+                                node(l).set_flag(visited_flag);
+                                visiting_queue.push_back(VID(l));
+                            }
+                        }
+                    }
+                }
+                for (int i=0; i< visiting_queue.size(); ++i)
+                    variable(visiting_queue[i]).clear_flag(visited_flag);
+                return true;
+            }
+
+            public int enum_exist_quantify (int s, int [] bounded, bool block_with_pi_only)
+            {
+                int c = solver.constraint(s);
+                int block_gid = solver.alloc_gid();
+                init_quantification(s, bounded, block_with_pi_only);
+                bool empty_cl = false;
+                int total_solution = 0;
+                //int total_clauses;
+                while (find_blocking_cls(s))
+                {
+                    //solver.restart();
+                    ++ total_solution;
+                    try_reduce();
+                    if (blocking_lits.size() == 0)
+                    { //blocking clause size 0, i.e. no literal
+                        empty_cl = true;
+                        break;
+                    }
+                    else
+                        add_blocking(block_gid);
+                }
+                solver.release_constraint(c);
+                int r;
+                if (empty_cl)
+                    r = solver.zero();
+                else if (blocking_clauses.Count == 0)
+                    r = solver.one();
+                else
+                {
+                    IntVector blocking = new IntVector(4);
+                    foreach (object k in blocking_clauses.Keys)
+                        blocking.push_back((int)k);
+                    //total_clauses = blocking.size();
+                    r = build_struct (blocking);
+                }
+                solver.delete_clause_group(block_gid);
+                finalize_quantification();
+//              Console.WriteLine ("Enum {0} solutions, total blocking clauses {1}", total_solution, total_clauses);
+                return solver.bnot(r);
+            }
+
+            public int enum_exist_quantify_dumb (int s, int [] bounded, bool with_pi_only)
+            {
+                if (node(s).type == NodeType.CONSTANT)
+                    return s;
+
+                int c = solver.constraint(s);
+                int block_gid = solver.alloc_gid();
+                init_quantification(s, bounded, with_pi_only);
+                bool empty_cl = false;
+                IntVector blocking = new IntVector(16);
+                while (find_blocking_cls(s))
+                {
+                    if (blocking_lits.size() == 0)
+                    { //blocking clause size 0, i.e. no literal
+                        empty_cl = true;
+                        break;
+                    }
+                    else
+                    {
+                        int cl_id = solver.add_blocking_clause(blocking_lits.ToArray(), block_gid);
+                        blocking.push_back(cl_id);
+                    }
+                }
+                solver.release_constraint(c);
+                int r;
+                if (empty_cl)
+                    r = solver.zero();
+                else if (blocking.size() == 0)
+                    r = solver.one();
+                else
+                    r = build_struct (blocking);
+                solver.delete_clause_group(block_gid);
+                finalize_quantification();
+                return solver.bnot(r);
+            }
+        }
+
+        public int enum_exist_quantify_smart (int s, int [] bounded)
+        {
+            if (node(s).type == NodeType.CONSTANT)
+                return s;
+
+            EnumQuantification quant = new EnumQuantification(this);
+            int r = quant.enum_exist_quantify (s, bounded, false);
+            return r;
+        }
+
+        public int enum_exist_quantify_dumb (int s, int [] bounded)
+        {
+            EnumQuantification quant = new EnumQuantification(this);
+            int r = quant.enum_exist_quantify_dumb (s, bounded, false);
+            return r;
+        }
+
+        public int expand_exist_quantify (int s, int [] bounded)
+        {
+            int flag = alloc_flag();
+            mark_transitive_fanins(s, flag);
+            int result = s;
+            foreach (int input in bounded)
+            {
+                sharp_assert (node(input).is_pi());
+                int [] orig = { input };
+                int [] replace = { zero() };
+                int cofactor_i = compose(result, orig, replace);
+                replace = new int [] { one () };
+                int cofactor_ip = compose(result, orig, replace);
+                result = bor (cofactor_i, cofactor_ip);
+            }
+            free_flag(flag);
+            return result;
+        }
+
+        #region NODE_CONSISTENCY_LOOKUP
+        void make_node_consistent (int s)
+        {
+            Variable n = node(s);
+            if (!is_reasoning(n))
+                return;
+
+            int output = NON_NEGATED(s);
+            int input0 = n.left;
+            int input1 = n.right;
+
+            int signature;
+            signature = lit_value(output);
+            signature = (signature << 2);
+            signature |= lit_value(input0);
+            signature = (signature << 2);
+            signature |= lit_value(input1);
+
+            if (n.type == NodeType.AND)
+            {
+                switch(signature)
+                {
+                    case 34:    //100010     : x0x
+                    case 35:    //100011     : x0x
+                    case 50:    //110010     : x0x
+                    case 51:    //110011     : x0x
+                    case 40:    //101000     : xx0
+                    case 44:    //101100     : xx0
+                    case 56:    //111000     : xx0
+                    case 60:    //111100     : xx0
+                    case 36:    //100100     : x10
+                    case 52:    //110100     : x10
+                    case 33:    //100001     : x01
+                    case 49:    //110001     : x01
+                    case 32:    //100000     : x00
+                    case 48:    //110000     : x00
+                        queue_implication(output^1, VID (output), ImpType.NODE);
+                        break;
+                    case 37:    //100101     : x11
+                    case 53:    //110101     : x11
+                        queue_implication(output, VID (output), ImpType.NODE);
+                        break;
+                    case 6:     //000110     : 01x
+                    case 7:     //000111     : 01x
+                        queue_implication(input1^1, VID (output), ImpType.NODE);
+                        break;
+                    case 13:    //001101     : 0x1
+                    case 9:     //001001     : 0x1
+                        queue_implication(input0^1, VID (output), ImpType.NODE);
+                        break;
+                    case 22:    //010110     : 11x
+                    case 23:    //010111     : 11x
+                        queue_implication(input1, VID (output), ImpType.NODE);
+                        break;
+                    case 29:    //011101     : 1x1
+                    case 25:    //011001     : 1x1
+                        queue_implication(input0, VID (output), ImpType.NODE);
+                        break;
+                    case 30:    //011110     : 1xx
+                    case 31:    //011111     : 1xx
+                    case 26:    //011010     : 1xx
+                    case 27:    //011011     : 1xx
+                        queue_implication(input0, VID (output), ImpType.NODE);
+                        queue_implication(input1, VID (output), ImpType.NODE);
+                        break;
+                    case 18:    //010010     : 10x
+                    case 19:    //010011     : 10x
+                    case 24:    //011000     : 1x0
+                    case 28:    //011100     : 1x0
+
+                    case 17:    //010001     : 101
+                    case 20:    //010100     : 110
+                    case 16:    //010000     : 100
+                    case 5:     //000101     : 011
+                        queue_conflict(VID (output), ImpType.NODE);
+                        break;
+                    case 42:    //101010     : xxx
+                    case 43:    //101011     : xxx
+                    case 46:    //101110     : xxx
+                    case 47:    //101111     : xxx
+
+                    case 58:    //111010     : xxx
+                    case 59:    //111011     : xxx
+                    case 62:    //111110     : xxx
+                    case 63:    //111111     : xxx
+                        break;
+                    case 41:    //101001     : xx1
+                    case 45:    //101101     : xx1
+                    case 57:    //111001     : xx1
+                    case 61:    //111101     : xx1
+
+                    case 38:    //100110     : x1x
+                    case 39:    //100111     : x1x
+                    case 54:    //110110     : x1x
+                    case 55:    //110111     : x1x
+
+                    case 2:     //000010     : 00x
+                    case 3:     //000011     : 00x
+                    case 8:     //001000     : 0x0
+                    case 12:    //001100     : 0x0
+
+                    case 10:    //001010     : 0xx
+                    case 11:    //001011     : 0xx
+                    case 14:    //001110     : 0xx
+                    case 15:    //001111     : 0xx
+
+                    case 21:    //010101     : 111
+                    case 4:     //000100     : 010
+                    case 1:     //000001     : 001
+                    case 0:     //000000     : 000
+                        break;
+                }
+            }
+            else
+            {
+                sharp_assert (n.type == NodeType.XOR);
+                switch(signature)
+                {
+                    case 32:    //100000     : x00
+                    case 48:    //110000     : x00
+                    case 37:    //100101     : x11
+                    case 53:    //110101     : x11
+                        queue_implication(output^1, VID (output), ImpType.NODE);
+                        break;
+                    case 33:    //100001     : x01
+                    case 49:    //110001     : x01
+                    case 36:    //100100     : x10
+                    case 52:    //110100     : x10
+                        queue_implication(output, VID (output), ImpType.NODE);
+                        break;
+                    case 3:     //000011     : 00x
+                    case 2:     //000010     : 00x
+                    case 23:    //010111     : 11x
+                    case 22:    //010110     : 11x
+                        queue_implication(input1^1, VID (output), ImpType.NODE);
+                        break;
+                    case 7:     //000111     : 01x
+                    case 6:     //000110     : 01x
+                    case 19:    //010011     : 10x
+                    case 18:    //010010     : 10x
+                        queue_implication(input1, VID (output), ImpType.NODE);
+                        break;
+                    case 13:    //001101     : 0x1
+                    case 9:     //001001     : 0x1
+                    case 28:    //011100     : 1x0
+                    case 24:    //011000     : 1x0
+                        queue_implication(input0, VID (output), ImpType.NODE);
+                        break;
+                    case 12:    //001100     : 0x0
+                    case 8:     //001000     : 0x0
+                    case 29:    //011101     : 1x1
+                    case 25:    //011001     : 1x1
+                        queue_implication(input0^1, VID (output), ImpType.NODE);
+                        break;
+                    case 1:     //000001     : 001
+                    case 4:     //000100     : 010
+                    case 16:    //010000     : 100
+                    case 21:    //010101     : 111
+                        queue_conflict(VID (output), ImpType.NODE);
+                        break;
+                    case 42:    //101010     : xxx
+                    case 43:    //101011     : xxx
+                    case 46:    //101110     : xxx
+                    case 47:    //101111     : xxx
+                    case 58:    //111010     : xxx
+                    case 59:    //111011     : xxx
+                    case 62:    //111110     : xxx
+                    case 63:    //111111     : xxx
+                        break;
+                    case 41:    //101001     : xx1
+                    case 45:    //101101     : xx1
+                    case 57:    //111001     : xx1
+                    case 61:    //111101     : xx1
+
+                    case 40:    //101000     : xx0
+                    case 44:    //101100     : xx0
+                    case 56:    //111000     : xx0
+                    case 60:    //111100     : xx0
+
+                    case 38:    //100110     : x1x
+                    case 39:    //100111     : x1x
+                    case 54:    //110110     : x1x
+                    case 55:    //110111     : x1x
+
+                    case 34:    //100010     : x0x
+                    case 35:    //100011     : x0x
+                    case 50:    //110010     : x0x
+                    case 51:    //110011     : x0x
+
+                    case 10:    //001010     : 0xx
+                    case 11:    //001011     : 0xx
+                    case 14:    //001110     : 0xx
+                    case 15:    //001111     : 0xx
+
+                    case 26:    //011010     : 1xx
+                    case 27:    //011011     : 1xx
+                    case 30:    //011110     : 1xx
+                    case 31:    //011111     : 1xx
+
+                    case 20:    //010100     : 110
+                    case 17:    //010001     : 101
+                    case 5:     //000101     : 011
+                    case 0:     //000000     : 000
+                        break;
+                }
+            }
+        }
+        #endregion
+        #region CANONICAL_TABLE_LOOKUP
+        private static readonly int [] lookup_table_3_inputs =
+            new int[320] {
+                             /* 0 */  0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                             /* 10 */  10, 11, 12, 13, 14, 15, 16, 17, 17, 16,
+                             /* 20 */  17, 16, 16, 17, 18, 19, 19, 18, 19, 18,
+                             /* 30 */  18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+                             /* 40 */  24, 25, 26, 27, 20, 21, 22, 23, 28, 29,
+                             /* 50 */  29, 28, 29, 28, 28, 29, 29, 28, 28, 29,
+                             /* 60 */  28, 29, 29, 28, 30, 31, 32, 32, 31, 30,
+                             /* 70 */  33, 33, 32, 32, 34, 35, 36, 36, 35, 34,
+                             /* 80 */  31, 30, 30, 31, 30, 31, 31, 30, 34, 35,
+                             /* 90 */  35, 34, 35, 34, 34, 35, 31, 30, 37, 38,
+                             /* 100 */  39, 40, 35, 34, 39, 40, 35, 34, 31, 30,
+                             /* 110 */  37, 38, 41, 42, 42, 41, 42, 41, 41, 42,
+                             /* 120 */  42, 41, 41, 42, 41, 42, 42, 41, 43, 44,
+                             /* 130 */  45, 46, 4, 5, 6, 7, 47, 48, 49, 50,
+                             /* 140 */  12, 13, 14, 15, 16, 17, 17, 16, 17, 16,
+                             /* 150 */  16, 17, 18, 19, 19, 18, 19, 18, 18, 19,
+                             /* 160 */  20, 21, 22, 23, 24, 25, 26, 27, 24, 25,
+                             /* 170 */  26, 27, 20, 21, 22, 23, 51, 52, 52, 51,
+                             /* 180 */  52, 51, 51, 52, 52, 51, 51, 52, 51, 52,
+                             /* 190 */  52, 51, 30, 32, 34, 32, 34, 41, 30, 41,
+                             /* 200 */  32, 31, 32, 35, 42, 35, 42, 31, 34, 30,
+                             /* 210 */  30, 34, 30, 34, 34, 30, 31, 35, 35, 31,
+                             /* 220 */  35, 31, 31, 35, 34, 37, 30, 39, 38, 35,
+                             /* 230 */  40, 31, 38, 35, 40, 31, 34, 37, 30, 39,
+                             /* 240 */  33, 36, 36, 33, 36, 33, 33, 36, 36, 33,
+                             /* 250 */  33, 36, 33, 36, 36, 33, 53, 54, 55, 56,
+                             /* 260 */  4, 5, 6, 7, 57, 58, 59, 60, 12, 13,
+                             /* 270 */  14, 15, 16, 17, 17, 16, 17, 16, 16, 17,
+                             /* 280 */  18, 19, 19, 18, 19, 18, 18, 19, 20, 21,
+                             /* 290 */  22, 23, 24, 25, 26, 27, 24, 25, 26, 27,
+                             /* 300 */  20, 21, 22, 23, 61, 62, 62, 61, 62, 61,
+                             /* 310 */  61, 62, 62, 61, 61, 62, 61, 62, 62, 61  };
+        private static readonly int [] lookup_table_4_inputs =
+            new int [4096] {
+                               /* 0 */  0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                               /* 10 */  10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+                               /* 20 */  20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+                               /* 30 */  30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+                               /* 40 */  40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+                               /* 50 */  50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+                               /* 60 */  60, 61, 62, 63, 64, 65, 65, 64, 66, 67,
+                               /* 70 */  67, 66, 68, 69, 69, 68, 70, 71, 71, 70,
+                               /* 80 */  65, 64, 64, 65, 67, 66, 66, 67, 69, 68,
+                               /* 90 */  68, 69, 71, 70, 70, 71, 72, 73, 73, 72,
+                               /* 100 */  74, 75, 75, 74, 76, 77, 77, 76, 78, 79,
+                               /* 110 */  79, 78, 73, 72, 72, 73, 75, 74, 74, 75,
+                               /* 120 */  77, 76, 76, 77, 79, 78, 78, 79, 80, 81,
+                               /* 130 */  82, 83, 84, 85, 86, 87, 84, 85, 86, 87,
+                               /* 140 */  80, 81, 82, 83, 88, 89, 90, 91, 92, 93,
+                               /* 150 */  94, 95, 92, 93, 94, 95, 88, 89, 90, 91,
+                               /* 160 */  84, 85, 86, 87, 80, 81, 82, 83, 80, 81,
+                               /* 170 */  82, 83, 84, 85, 86, 87, 92, 93, 94, 95,
+                               /* 180 */  88, 89, 90, 91, 88, 89, 90, 91, 92, 93,
+                               /* 190 */  94, 95, 96, 97, 97, 96, 98, 99, 99, 98,
+                               /* 200 */  98, 99, 99, 98, 96, 97, 97, 96, 97, 96,
+                               /* 210 */  96, 97, 99, 98, 98, 99, 99, 98, 98, 99,
+                               /* 220 */  97, 96, 96, 97, 98, 99, 99, 98, 96, 97,
+                               /* 230 */  97, 96, 96, 97, 97, 96, 98, 99, 99, 98,
+                               /* 240 */  99, 98, 98, 99, 97, 96, 96, 97, 97, 96,
+                               /* 250 */  96, 97, 99, 98, 98, 99, 100, 101, 102, 103,
+                               /* 260 */  104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+                               /* 270 */  114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+                               /* 280 */  124, 125, 126, 127, 128, 129, 130, 131, 116, 117,
+                               /* 290 */  118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+                               /* 300 */  128, 129, 130, 131, 100, 101, 102, 103, 104, 105,
+                               /* 310 */  106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+                               /* 320 */  132, 133, 133, 132, 134, 135, 135, 134, 136, 137,
+                               /* 330 */  137, 136, 138, 139, 139, 138, 133, 132, 132, 133,
+                               /* 340 */  135, 134, 134, 135, 137, 136, 136, 137, 139, 138,
+                               /* 350 */  138, 139, 133, 132, 132, 133, 135, 134, 134, 135,
+                               /* 360 */  137, 136, 136, 137, 139, 138, 138, 139, 132, 133,
+                               /* 370 */  133, 132, 134, 135, 135, 134, 136, 137, 137, 136,
+                               /* 380 */  138, 139, 139, 138, 140, 141, 142, 143, 144, 145,
+                               /* 390 */  146, 147, 144, 145, 146, 147, 140, 141, 142, 143,
+                               /* 400 */  144, 145, 146, 147, 140, 141, 142, 143, 140, 141,
+                               /* 410 */  142, 143, 144, 145, 146, 147, 144, 145, 146, 147,
+                               /* 420 */  140, 141, 142, 143, 140, 141, 142, 143, 144, 145,
+                               /* 430 */  146, 147, 140, 141, 142, 143, 144, 145, 146, 147,
+                               /* 440 */  144, 145, 146, 147, 140, 141, 142, 143, 148, 149,
+                               /* 450 */  149, 148, 149, 148, 148, 149, 149, 148, 148, 149,
+                               /* 460 */  148, 149, 149, 148, 149, 148, 148, 149, 148, 149,
+                               /* 470 */  149, 148, 148, 149, 149, 148, 149, 148, 148, 149,
+                               /* 480 */  149, 148, 148, 149, 148, 149, 149, 148, 148, 149,
+                               /* 490 */  149, 148, 149, 148, 148, 149, 148, 149, 149, 148,
+                               /* 500 */  149, 148, 148, 149, 149, 148, 148, 149, 148, 149,
+                               /* 510 */  149, 148, 150, 151, 152, 152, 152, 152, 153, 154,
+                               /* 520 */  155, 156, 152, 152, 152, 152, 157, 158, 151, 150,
+                               /* 530 */  159, 159, 160, 160, 154, 153, 156, 155, 161, 161,
+                               /* 540 */  162, 162, 158, 157, 155, 156, 163, 164, 165, 166,
+                               /* 550 */  157, 158, 150, 151, 163, 164, 165, 166, 153, 154,
+                               /* 560 */  167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+                               /* 570 */  177, 178, 179, 180, 181, 182, 151, 150, 150, 151,
+                               /* 580 */  153, 154, 154, 153, 156, 155, 155, 156, 157, 158,
+                               /* 590 */  158, 157, 150, 151, 151, 150, 154, 153, 153, 154,
+                               /* 600 */  155, 156, 156, 155, 158, 157, 157, 158, 183, 184,
+                               /* 610 */  184, 183, 185, 186, 186, 185, 187, 188, 188, 187,
+                               /* 620 */  189, 190, 190, 189, 184, 183, 183, 184, 186, 185,
+                               /* 630 */  185, 186, 188, 187, 187, 188, 190, 189, 189, 190,
+                               /* 640 */  155, 156, 153, 154, 150, 151, 157, 158, 150, 151,
+                               /* 650 */  157, 158, 155, 156, 153, 154, 191, 192, 193, 194,
+                               /* 660 */  195, 196, 197, 198, 195, 196, 197, 198, 191, 192,
+                               /* 670 */  193, 194, 150, 151, 157, 158, 155, 156, 153, 154,
+                               /* 680 */  155, 156, 153, 154, 150, 151, 157, 158, 195, 196,
+                               /* 690 */  197, 198, 191, 192, 193, 194, 191, 192, 193, 194,
+                               /* 700 */  195, 196, 197, 198, 199, 200, 200, 199, 201, 202,
+                               /* 710 */  202, 201, 201, 202, 202, 201, 199, 200, 200, 199,
+                               /* 720 */  200, 199, 199, 200, 202, 201, 201, 202, 202, 201,
+                               /* 730 */  201, 202, 200, 199, 199, 200, 201, 202, 202, 201,
+                               /* 740 */  199, 200, 200, 199, 199, 200, 200, 199, 201, 202,
+                               /* 750 */  202, 201, 202, 201, 201, 202, 200, 199, 199, 200,
+                               /* 760 */  200, 199, 199, 200, 202, 201, 201, 202, 203, 204,
+                               /* 770 */  178, 177, 180, 179, 205, 206, 204, 203, 170, 169,
+                               /* 780 */  172, 171, 206, 205, 207, 208, 169, 170, 171, 172,
+                               /* 790 */  209, 210, 208, 207, 177, 178, 179, 180, 210, 209,
+                               /* 800 */  207, 208, 169, 170, 171, 172, 209, 210, 208, 207,
+                               /* 810 */  177, 178, 179, 180, 210, 209, 203, 204, 178, 177,
+                               /* 820 */  180, 179, 205, 206, 204, 203, 170, 169, 172, 171,
+                               /* 830 */  206, 205, 211, 212, 212, 211, 213, 214, 214, 213,
+                               /* 840 */  215, 216, 216, 215, 217, 218, 218, 217, 212, 211,
+                               /* 850 */  211, 212, 214, 213, 213, 214, 216, 215, 215, 216,
+                               /* 860 */  218, 217, 217, 218, 212, 211, 211, 212, 214, 213,
+                               /* 870 */  213, 214, 216, 215, 215, 216, 218, 217, 217, 218,
+                               /* 880 */  211, 212, 212, 211, 213, 214, 214, 213, 215, 216,
+                               /* 890 */  216, 215, 217, 218, 218, 217, 219, 220, 221, 222,
+                               /* 900 */  223, 224, 225, 226, 223, 224, 225, 226, 219, 220,
+                               /* 910 */  221, 222, 223, 224, 225, 226, 219, 220, 221, 222,
+                               /* 920 */  219, 220, 221, 222, 223, 224, 225, 226, 223, 224,
+                               /* 930 */  225, 226, 219, 220, 221, 222, 219, 220, 221, 222,
+                               /* 940 */  223, 224, 225, 226, 219, 220, 221, 222, 223, 224,
+                               /* 950 */  225, 226, 223, 224, 225, 226, 219, 220, 221, 222,
+                               /* 960 */  227, 228, 228, 227, 228, 227, 227, 228, 228, 227,
+                               /* 970 */  227, 228, 227, 228, 228, 227, 228, 227, 227, 228,
+                               /* 980 */  227, 228, 228, 227, 227, 228, 228, 227, 228, 227,
+                               /* 990 */  227, 228, 228, 227, 227, 228, 227, 228, 228, 227,
+                               /* 1000 */  227, 228, 228, 227, 228, 227, 227, 228, 227, 228,
+                               /* 1010 */  228, 227, 228, 227, 227, 228, 228, 227, 227, 228,
+                               /* 1020 */  227, 228, 228, 227, 229, 230, 231, 232, 233, 234,
+                               /* 1030 */  235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+                               /* 1040 */  16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+                               /* 1050 */  26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+                               /* 1060 */  36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+                               /* 1070 */  46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+                               /* 1080 */  56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+                               /* 1090 */  65, 64, 66, 67, 67, 66, 68, 69, 69, 68,
+                               /* 1100 */  70, 71, 71, 70, 65, 64, 64, 65, 67, 66,
+                               /* 1110 */  66, 67, 69, 68, 68, 69, 71, 70, 70, 71,
+                               /* 1120 */  72, 73, 73, 72, 74, 75, 75, 74, 76, 77,
+                               /* 1130 */  77, 76, 78, 79, 79, 78, 73, 72, 72, 73,
+                               /* 1140 */  75, 74, 74, 75, 77, 76, 76, 77, 79, 78,
+                               /* 1150 */  78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+                               /* 1160 */  84, 85, 86, 87, 80, 81, 82, 83, 88, 89,
+                               /* 1170 */  90, 91, 92, 93, 94, 95, 92, 93, 94, 95,
+                               /* 1180 */  88, 89, 90, 91, 84, 85, 86, 87, 80, 81,
+                               /* 1190 */  82, 83, 80, 81, 82, 83, 84, 85, 86, 87,
+                               /* 1200 */  92, 93, 94, 95, 88, 89, 90, 91, 88, 89,
+                               /* 1210 */  90, 91, 92, 93, 94, 95, 96, 97, 97, 96,
+                               /* 1220 */  98, 99, 99, 98, 98, 99, 99, 98, 96, 97,
+                               /* 1230 */  97, 96, 97, 96, 96, 97, 99, 98, 98, 99,
+                               /* 1240 */  99, 98, 98, 99, 97, 96, 96, 97, 98, 99,
+                               /* 1250 */  99, 98, 96, 97, 97, 96, 96, 97, 97, 96,
+                               /* 1260 */  98, 99, 99, 98, 99, 98, 98, 99, 97, 96,
+                               /* 1270 */  96, 97, 97, 96, 96, 97, 99, 98, 98, 99,
+                               /* 1280 */  100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+                               /* 1290 */  110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+                               /* 1300 */  120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+                               /* 1310 */  130, 131, 116, 117, 118, 119, 120, 121, 122, 123,
+                               /* 1320 */  124, 125, 126, 127, 128, 129, 130, 131, 100, 101,
+                               /* 1330 */  102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+                               /* 1340 */  112, 113, 114, 115, 132, 133, 133, 132, 134, 135,
+                               /* 1350 */  135, 134, 136, 137, 137, 136, 138, 139, 139, 138,
+                               /* 1360 */  133, 132, 132, 133, 135, 134, 134, 135, 137, 136,
+                               /* 1370 */  136, 137, 139, 138, 138, 139, 133, 132, 132, 133,
+                               /* 1380 */  135, 134, 134, 135, 137, 136, 136, 137, 139, 138,
+                               /* 1390 */  138, 139, 132, 133, 133, 132, 134, 135, 135, 134,
+                               /* 1400 */  136, 137, 137, 136, 138, 139, 139, 138, 140, 141,
+                               /* 1410 */  142, 143, 144, 145, 146, 147, 144, 145, 146, 147,
+                               /* 1420 */  140, 141, 142, 143, 144, 145, 146, 147, 140, 141,
+                               /* 1430 */  142, 143, 140, 141, 142, 143, 144, 145, 146, 147,
+                               /* 1440 */  144, 145, 146, 147, 140, 141, 142, 143, 140, 141,
+                               /* 1450 */  142, 143, 144, 145, 146, 147, 140, 141, 142, 143,
+                               /* 1460 */  144, 145, 146, 147, 144, 145, 146, 147, 140, 141,
+                               /* 1470 */  142, 143, 245, 246, 246, 245, 246, 245, 245, 246,
+                               /* 1480 */  246, 245, 245, 246, 245, 246, 246, 245, 246, 245,
+                               /* 1490 */  245, 246, 245, 246, 246, 245, 245, 246, 246, 245,
+                               /* 1500 */  246, 245, 245, 246, 246, 245, 245, 246, 245, 246,
+                               /* 1510 */  246, 245, 245, 246, 246, 245, 246, 245, 245, 246,
+                               /* 1520 */  245, 246, 246, 245, 246, 245, 245, 246, 246, 245,
+                               /* 1530 */  245, 246, 245, 246, 246, 245, 150, 152, 153, 152,
+                               /* 1540 */  152, 151, 152, 154, 155, 152, 157, 152, 152, 156,
+                               /* 1550 */  152, 158, 153, 247, 150, 247, 248, 154, 248, 151,
+                               /* 1560 */  157, 249, 155, 249, 250, 158, 250, 156, 155, 166,
+                               /* 1570 */  157, 164, 165, 156, 163, 158, 150, 166, 153, 164,
+                               /* 1580 */  165, 151, 163, 154, 251, 252, 253, 254, 255, 256,
+                               /* 1590 */  257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
+                               /* 1600 */  153, 150, 150, 153, 151, 154, 154, 151, 157, 155,
+                               /* 1610 */  155, 157, 156, 158, 158, 156, 150, 153, 153, 150,
+                               /* 1620 */  154, 151, 151, 154, 155, 157, 157, 155, 158, 156,
+                               /* 1630 */  156, 158, 185, 184, 184, 185, 183, 186, 186, 183,
+                               /* 1640 */  189, 188, 188, 189, 187, 190, 190, 187, 184, 185,
+                               /* 1650 */  185, 184, 186, 183, 183, 186, 188, 189, 189, 188,
+                               /* 1660 */  190, 187, 187, 190, 155, 151, 157, 154, 150, 156,
+                               /* 1670 */  153, 158, 150, 156, 153, 158, 155, 151, 157, 154,
+                               /* 1680 */  267, 268, 269, 270, 271, 272, 273, 274, 271, 272,
+                               /* 1690 */  273, 274, 267, 268, 269, 270, 150, 156, 153, 158,
+                               /* 1700 */  155, 151, 157, 154, 155, 151, 157, 154, 150, 156,
+                               /* 1710 */  153, 158, 271, 272, 273, 274, 267, 268, 269, 270,
+                               /* 1720 */  267, 268, 269, 270, 271, 272, 273, 274, 201, 200,
+                               /* 1730 */  200, 201, 199, 202, 202, 199, 199, 202, 202, 199,
+                               /* 1740 */  201, 200, 200, 201, 200, 201, 201, 200, 202, 199,
+                               /* 1750 */  199, 202, 202, 199, 199, 202, 200, 201, 201, 200,
+                               /* 1760 */  199, 202, 202, 199, 201, 200, 200, 201, 201, 200,
+                               /* 1770 */  200, 201, 199, 202, 202, 199, 202, 199, 199, 202,
+                               /* 1780 */  200, 201, 201, 200, 200, 201, 201, 200, 202, 199,
+                               /* 1790 */  199, 202, 275, 262, 276, 260, 265, 277, 263, 278,
+                               /* 1800 */  276, 254, 275, 252, 257, 278, 255, 277, 279, 252,
+                               /* 1810 */  280, 254, 255, 281, 257, 282, 280, 260, 279, 262,
+                               /* 1820 */  263, 282, 265, 281, 279, 252, 280, 254, 255, 281,
+                               /* 1830 */  257, 282, 280, 260, 279, 262, 263, 282, 265, 281,
+                               /* 1840 */  275, 262, 276, 260, 265, 277, 263, 278, 276, 254,
+                               /* 1850 */  275, 252, 257, 278, 255, 277, 283, 284, 284, 283,
+                               /* 1860 */  285, 286, 286, 285, 287, 288, 288, 287, 289, 290,
+                               /* 1870 */  290, 289, 284, 283, 283, 284, 286, 285, 285, 286,
+                               /* 1880 */  288, 287, 287, 288, 290, 289, 289, 290, 284, 283,
+                               /* 1890 */  283, 284, 286, 285, 285, 286, 288, 287, 287, 288,
+                               /* 1900 */  290, 289, 289, 290, 283, 284, 284, 283, 285, 286,
+                               /* 1910 */  286, 285, 287, 288, 288, 287, 289, 290, 290, 289,
+                               /* 1920 */  226, 221, 220, 223, 222, 225, 224, 219, 222, 225,
+                               /* 1930 */  224, 219, 226, 221, 220, 223, 222, 225, 224, 219,
+                               /* 1940 */  226, 221, 220, 223, 226, 221, 220, 223, 222, 225,
+                               /* 1950 */  224, 219, 222, 225, 224, 219, 226, 221, 220, 223,
+                               /* 1960 */  226, 221, 220, 223, 222, 225, 224, 219, 226, 221,
+                               /* 1970 */  220, 223, 222, 225, 224, 219, 222, 225, 224, 219,
+                               /* 1980 */  226, 221, 220, 223, 291, 292, 292, 291, 292, 291,
+                               /* 1990 */  291, 292, 292, 291, 291, 292, 291, 292, 292, 291,
+                               /* 2000 */  292, 291, 291, 292, 291, 292, 292, 291, 291, 292,
+                               /* 2010 */  292, 291, 292, 291, 291, 292, 292, 291, 291, 292,
+                               /* 2020 */  291, 292, 292, 291, 291, 292, 292, 291, 292, 291,
+                               /* 2030 */  291, 292, 291, 292, 292, 291, 292, 291, 291, 292,
+                               /* 2040 */  292, 291, 291, 292, 291, 292, 292, 291, 293, 294,
+                               /* 2050 */  152, 152, 295, 296, 152, 152, 152, 152, 297, 298,
+                               /* 2060 */  152, 152, 299, 300, 294, 293, 301, 301, 296, 295,
+                               /* 2070 */  302, 302, 303, 303, 298, 297, 304, 304, 300, 299,
+                               /* 2080 */  295, 296, 163, 164, 293, 294, 163, 164, 165, 166,
+                               /* 2090 */  299, 300, 165, 166, 297, 298, 305, 306, 307, 308,
+                               /* 2100 */  309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
+                               /* 2110 */  319, 320, 294, 293, 293, 294, 296, 295, 295, 296,
+                               /* 2120 */  297, 298, 298, 297, 299, 300, 300, 299, 293, 294,
+                               /* 2130 */  294, 293, 295, 296, 296, 295, 298, 297, 297, 298,
+                               /* 2140 */  300, 299, 299, 300, 321, 322, 322, 321, 323, 324,
+                               /* 2150 */  324, 323, 325, 326, 326, 325, 327, 328, 328, 327,
+                               /* 2160 */  322, 321, 321, 322, 324, 323, 323, 324, 326, 325,
+                               /* 2170 */  325, 326, 328, 327, 327, 328, 295, 296, 297, 298,
+                               /* 2180 */  293, 294, 299, 300, 293, 294, 299, 300, 295, 296,
+                               /* 2190 */  297, 298, 329, 330, 331, 332, 333, 334, 335, 336,
+                               /* 2200 */  333, 334, 335, 336, 329, 330, 331, 332, 293, 294,
+                               /* 2210 */  299, 300, 295, 296, 297, 298, 295, 296, 297, 298,
+                               /* 2220 */  293, 294, 299, 300, 333, 334, 335, 336, 329, 330,
+                               /* 2230 */  331, 332, 329, 330, 331, 332, 333, 334, 335, 336,
+                               /* 2240 */  337, 338, 338, 337, 339, 340, 340, 339, 339, 340,
+                               /* 2250 */  340, 339, 337, 338, 338, 337, 338, 337, 337, 338,
+                               /* 2260 */  340, 339, 339, 340, 340, 339, 339, 340, 338, 337,
+                               /* 2270 */  337, 338, 339, 340, 340, 339, 337, 338, 338, 337,
+                               /* 2280 */  337, 338, 338, 337, 339, 340, 340, 339, 340, 339,
+                               /* 2290 */  339, 340, 338, 337, 337, 338, 338, 337, 337, 338,
+                               /* 2300 */  340, 339, 339, 340, 341, 342, 312, 311, 342, 341,
+                               /* 2310 */  308, 307, 318, 317, 343, 344, 314, 313, 344, 343,
+                               /* 2320 */  345, 346, 307, 308, 346, 345, 311, 312, 313, 314,
+                               /* 2330 */  347, 348, 317, 318, 348, 347, 345, 346, 307, 308,
+                               /* 2340 */  346, 345, 311, 312, 313, 314, 347, 348, 317, 318,
+                               /* 2350 */  348, 347, 341, 342, 312, 311, 342, 341, 308, 307,
+                               /* 2360 */  318, 317, 343, 344, 314, 313, 344, 343, 349, 350,
+                               /* 2370 */  350, 349, 351, 352, 352, 351, 353, 354, 354, 353,
+                               /* 2380 */  355, 356, 356, 355, 350, 349, 349, 350, 352, 351,
+                               /* 2390 */  351, 352, 354, 353, 353, 354, 356, 355, 355, 356,
+                               /* 2400 */  350, 349, 349, 350, 352, 351, 351, 352, 354, 353,
+                               /* 2410 */  353, 354, 356, 355, 355, 356, 349, 350, 350, 349,
+                               /* 2420 */  351, 352, 352, 351, 353, 354, 354, 353, 355, 356,
+                               /* 2430 */  356, 355, 357, 358, 359, 360, 361, 362, 363, 364,
+                               /* 2440 */  361, 362, 363, 364, 357, 358, 359, 360, 361, 362,
+                               /* 2450 */  363, 364, 357, 358, 359, 360, 357, 358, 359, 360,
+                               /* 2460 */  361, 362, 363, 364, 361, 362, 363, 364, 357, 358,
+                               /* 2470 */  359, 360, 357, 358, 359, 360, 361, 362, 363, 364,
+                               /* 2480 */  357, 358, 359, 360, 361, 362, 363, 364, 361, 362,
+                               /* 2490 */  363, 364, 357, 358, 359, 360, 365, 366, 366, 365,
+                               /* 2500 */  366, 365, 365, 366, 366, 365, 365, 366, 365, 366,
+                               /* 2510 */  366, 365, 366, 365, 365, 366, 365, 366, 366, 365,
+                               /* 2520 */  365, 366, 366, 365, 366, 365, 365, 366, 366, 365,
+                               /* 2530 */  365, 366, 365, 366, 366, 365, 365, 366, 366, 365,
+                               /* 2540 */  366, 365, 365, 366, 365, 366, 366, 365, 366, 365,
+                               /* 2550 */  365, 366, 366, 365, 365, 366, 365, 366, 366, 365,
+                               /* 2560 */  165, 152, 152, 152, 152, 166, 152, 152, 152, 152,
+                               /* 2570 */  163, 152, 152, 152, 152, 164, 152, 165, 165, 165,
+                               /* 2580 */  166, 152, 166, 166, 163, 163, 152, 163, 164, 164,
+                               /* 2590 */  164, 152, 152, 166, 163, 164, 165, 152, 163, 164,
+                               /* 2600 */  165, 166, 152, 164, 165, 166, 163, 152, 367, 368,
+                               /* 2610 */  369, 370, 368, 371, 372, 373, 369, 372, 374, 375,
+                               /* 2620 */  370, 373, 375, 376, 152, 165, 165, 152, 166, 152,
+                               /* 2630 */  152, 166, 163, 152, 152, 163, 152, 164, 164, 152,
+                               /* 2640 */  165, 152, 152, 165, 152, 166, 166, 152, 152, 163,
+                               /* 2650 */  163, 152, 164, 152, 152, 164, 370, 164, 164, 370,
+                               /* 2660 */  163, 372, 372, 163, 166, 372, 372, 166, 370, 165,
+                               /* 2670 */  165, 370, 164, 370, 370, 164, 372, 163, 163, 372,
+                               /* 2680 */  372, 166, 166, 372, 165, 370, 370, 165, 152, 166,
+                               /* 2690 */  163, 152, 165, 152, 152, 164, 165, 152, 152, 164,
+                               /* 2700 */  152, 166, 163, 152, 370, 163, 166, 370, 164, 372,
+                               /* 2710 */  372, 165, 164, 372, 372, 165, 370, 163, 166, 370,
+                               /* 2720 */  165, 152, 152, 164, 152, 166, 163, 152, 152, 166,
+                               /* 2730 */  163, 152, 165, 152, 152, 164, 164, 372, 372, 165,
+                               /* 2740 */  370, 163, 166, 370, 370, 163, 166, 370, 164, 372,
+                               /* 2750 */  372, 165, 370, 152, 152, 370, 152, 372, 372, 152,
+                               /* 2760 */  152, 372, 372, 152, 370, 152, 152, 370, 152, 370,
+                               /* 2770 */  370, 152, 372, 152, 152, 372, 372, 152, 152, 372,
+                               /* 2780 */  152, 370, 370, 152, 152, 372, 372, 152, 370, 152,
+                               /* 2790 */  152, 370, 370, 152, 152, 370, 152, 372, 372, 152,
+                               /* 2800 */  372, 152, 152, 372, 152, 370, 370, 152, 152, 370,
+                               /* 2810 */  370, 152, 372, 152, 152, 372, 152, 375, 373, 372,
+                               /* 2820 */  375, 152, 370, 369, 373, 370, 152, 368, 372, 369,
+                               /* 2830 */  368, 152, 377, 368, 369, 370, 368, 377, 372, 373,
+                               /* 2840 */  369, 372, 377, 375, 370, 373, 375, 377, 377, 368,
+                               /* 2850 */  369, 370, 368, 377, 372, 373, 369, 372, 377, 375,
+                               /* 2860 */  370, 373, 375, 377, 152, 375, 373, 372, 375, 152,
+                               /* 2870 */  370, 369, 373, 370, 152, 368, 372, 369, 368, 152,
+                               /* 2880 */  376, 164, 164, 376, 163, 374, 374, 163, 166, 371,
+                               /* 2890 */  371, 166, 367, 165, 165, 367, 164, 376, 376, 164,
+                               /* 2900 */  374, 163, 163, 374, 371, 166, 166, 371, 165, 367,
+                               /* 2910 */  367, 165, 164, 376, 376, 164, 374, 163, 163, 374,
+                               /* 2920 */  371, 166, 166, 371, 165, 367, 367, 165, 376, 164,
+                               /* 2930 */  164, 376, 163, 374, 374, 163, 166, 371, 371, 166,
+                               /* 2940 */  367, 165, 165, 367, 376, 163, 166, 367, 164, 374,
+                               /* 2950 */  371, 165, 164, 374, 371, 165, 376, 163, 166, 367,
+                               /* 2960 */  164, 374, 371, 165, 376, 163, 166, 367, 376, 163,
+                               /* 2970 */  166, 367, 164, 374, 371, 165, 164, 374, 371, 165,
+                               /* 2980 */  376, 163, 166, 367, 376, 163, 166, 367, 164, 374,
+                               /* 2990 */  371, 165, 376, 163, 166, 367, 164, 374, 371, 165,
+                               /* 3000 */  164, 374, 371, 165, 376, 163, 166, 367, 152, 377,
+                               /* 3010 */  377, 152, 377, 152, 152, 377, 377, 152, 152, 377,
+                               /* 3020 */  152, 377, 377, 152, 377, 152, 152, 377, 152, 377,
+                               /* 3030 */  377, 152, 152, 377, 377, 152, 377, 152, 152, 377,
+                               /* 3040 */  377, 152, 152, 377, 152, 377, 377, 152, 152, 377,
+                               /* 3050 */  377, 152, 377, 152, 152, 377, 152, 377, 377, 152,
+                               /* 3060 */  377, 152, 152, 377, 377, 152, 152, 377, 152, 377,
+                               /* 3070 */  377, 152, 378, 379, 380, 381, 382, 383, 384, 385,
+                               /* 3080 */  386, 387, 388, 389, 390, 391, 392, 393, 16, 17,
+                               /* 3090 */  18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+                               /* 3100 */  28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+                               /* 3110 */  38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+                               /* 3120 */  48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+                               /* 3130 */  58, 59, 60, 61, 62, 63, 64, 65, 65, 64,
+                               /* 3140 */  66, 67, 67, 66, 68, 69, 69, 68, 70, 71,
+                               /* 3150 */  71, 70, 65, 64, 64, 65, 67, 66, 66, 67,
+                               /* 3160 */  69, 68, 68, 69, 71, 70, 70, 71, 72, 73,
+                               /* 3170 */  73, 72, 74, 75, 75, 74, 76, 77, 77, 76,
+                               /* 3180 */  78, 79, 79, 78, 73, 72, 72, 73, 75, 74,
+                               /* 3190 */  74, 75, 77, 76, 76, 77, 79, 78, 78, 79,
+                               /* 3200 */  80, 81, 82, 83, 84, 85, 86, 87, 84, 85,
+                               /* 3210 */  86, 87, 80, 81, 82, 83, 88, 89, 90, 91,
+                               /* 3220 */  92, 93, 94, 95, 92, 93, 94, 95, 88, 89,
+                               /* 3230 */  90, 91, 84, 85, 86, 87, 80, 81, 82, 83,
+                               /* 3240 */  80, 81, 82, 83, 84, 85, 86, 87, 92, 93,
+                               /* 3250 */  94, 95, 88, 89, 90, 91, 88, 89, 90, 91,
+                               /* 3260 */  92, 93, 94, 95, 96, 97, 97, 96, 98, 99,
+                               /* 3270 */  99, 98, 98, 99, 99, 98, 96, 97, 97, 96,
+                               /* 3280 */  97, 96, 96, 97, 99, 98, 98, 99, 99, 98,
+                               /* 3290 */  98, 99, 97, 96, 96, 97, 98, 99, 99, 98,
+                               /* 3300 */  96, 97, 97, 96, 96, 97, 97, 96, 98, 99,
+                               /* 3310 */  99, 98, 99, 98, 98, 99, 97, 96, 96, 97,
+                               /* 3320 */  97, 96, 96, 97, 99, 98, 98, 99, 100, 101,
+                               /* 3330 */  102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+                               /* 3340 */  112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+                               /* 3350 */  122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+                               /* 3360 */  116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+                               /* 3370 */  126, 127, 128, 129, 130, 131, 100, 101, 102, 103,
+                               /* 3380 */  104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+                               /* 3390 */  114, 115, 132, 133, 133, 132, 134, 135, 135, 134,
+                               /* 3400 */  136, 137, 137, 136, 138, 139, 139, 138, 133, 132,
+                               /* 3410 */  132, 133, 135, 134, 134, 135, 137, 136, 136, 137,
+                               /* 3420 */  139, 138, 138, 139, 133, 132, 132, 133, 135, 134,
+                               /* 3430 */  134, 135, 137, 136, 136, 137, 139, 138, 138, 139,
+                               /* 3440 */  132, 133, 133, 132, 134, 135, 135, 134, 136, 137,
+                               /* 3450 */  137, 136, 138, 139, 139, 138, 140, 141, 142, 143,
+                               /* 3460 */  144, 145, 146, 147, 144, 145, 146, 147, 140, 141,
+                               /* 3470 */  142, 143, 144, 145, 146, 147, 140, 141, 142, 143,
+                               /* 3480 */  140, 141, 142, 143, 144, 145, 146, 147, 144, 145,
+                               /* 3490 */  146, 147, 140, 141, 142, 143, 140, 141, 142, 143,
+                               /* 3500 */  144, 145, 146, 147, 140, 141, 142, 143, 144, 145,
+                               /* 3510 */  146, 147, 144, 145, 146, 147, 140, 141, 142, 143,
+                               /* 3520 */  394, 395, 395, 394, 395, 394, 394, 395, 395, 394,
+                               /* 3530 */  394, 395, 394, 395, 395, 394, 395, 394, 394, 395,
+                               /* 3540 */  394, 395, 395, 394, 394, 395, 395, 394, 395, 394,
+                               /* 3550 */  394, 395, 395, 394, 394, 395, 394, 395, 395, 394,
+                               /* 3560 */  394, 395, 395, 394, 395, 394, 394, 395, 394, 395,
+                               /* 3570 */  395, 394, 395, 394, 394, 395, 395, 394, 394, 395,
+                               /* 3580 */  394, 395, 395, 394, 396, 152, 397, 152, 152, 398,
+                               /* 3590 */  152, 399, 400, 152, 401, 152, 152, 402, 152, 403,
+                               /* 3600 */  397, 247, 396, 247, 248, 399, 248, 398, 401, 249,
+                               /* 3610 */  400, 249, 250, 403, 250, 402, 400, 166, 401, 164,
+                               /* 3620 */  165, 402, 163, 403, 396, 166, 397, 164, 165, 398,
+                               /* 3630 */  163, 399, 404, 405, 406, 407, 408, 409, 410, 411,
+                               /* 3640 */  412, 413, 414, 415, 416, 417, 418, 419, 397, 396,
+                               /* 3650 */  396, 397, 398, 399, 399, 398, 401, 400, 400, 401,
+                               /* 3660 */  402, 403, 403, 402, 396, 397, 397, 396, 399, 398,
+                               /* 3670 */  398, 399, 400, 401, 401, 400, 403, 402, 402, 403,
+                               /* 3680 */  420, 421, 421, 420, 422, 423, 423, 422, 424, 425,
+                               /* 3690 */  425, 424, 426, 427, 427, 426, 421, 420, 420, 421,
+                               /* 3700 */  423, 422, 422, 423, 425, 424, 424, 425, 427, 426,
+                               /* 3710 */  426, 427, 400, 398, 401, 399, 396, 402, 397, 403,
+                               /* 3720 */  396, 402, 397, 403, 400, 398, 401, 399, 428, 429,
+                               /* 3730 */  430, 431, 432, 433, 434, 435, 432, 433, 434, 435,
+                               /* 3740 */  428, 429, 430, 431, 396, 402, 397, 403, 400, 398,
+                               /* 3750 */  401, 399, 400, 398, 401, 399, 396, 402, 397, 403,
+                               /* 3760 */  432, 433, 434, 435, 428, 429, 430, 431, 428, 429,
+                               /* 3770 */  430, 431, 432, 433, 434, 435, 436, 437, 437, 436,
+                               /* 3780 */  438, 439, 439, 438, 438, 439, 439, 438, 436, 437,
+                               /* 3790 */  437, 436, 437, 436, 436, 437, 439, 438, 438, 439,
+                               /* 3800 */  439, 438, 438, 439, 437, 436, 436, 437, 438, 439,
+                               /* 3810 */  439, 438, 436, 437, 437, 436, 436, 437, 437, 436,
+                               /* 3820 */  438, 439, 439, 438, 439, 438, 438, 439, 437, 436,
+                               /* 3830 */  436, 437, 437, 436, 436, 437, 439, 438, 438, 439,
+                               /* 3840 */  440, 415, 441, 413, 418, 442, 416, 443, 441, 407,
+                               /* 3850 */  440, 405, 410, 443, 408, 442, 444, 405, 445, 407,
+                               /* 3860 */  408, 446, 410, 447, 445, 413, 444, 415, 416, 447,
+                               /* 3870 */  418, 446, 444, 405, 445, 407, 408, 446, 410, 447,
+                               /* 3880 */  445, 413, 444, 415, 416, 447, 418, 446, 440, 415,
+                               /* 3890 */  441, 413, 418, 442, 416, 443, 441, 407, 440, 405,
+                               /* 3900 */  410, 443, 408, 442, 283, 284, 284, 283, 285, 286,
+                               /* 3910 */  286, 285, 287, 288, 288, 287, 289, 290, 290, 289,
+                               /* 3920 */  284, 283, 283, 284, 286, 285, 285, 286, 288, 287,
+                               /* 3930 */  287, 288, 290, 289, 289, 290, 284, 283, 283, 284,
+                               /* 3940 */  286, 285, 285, 286, 288, 287, 287, 288, 290, 289,
+                               /* 3950 */  289, 290, 283, 284, 284, 283, 285, 286, 286, 285,
+                               /* 3960 */  287, 288, 288, 287, 289, 290, 290, 289, 226, 221,
+                               /* 3970 */  220, 223, 222, 225, 224, 219, 222, 225, 224, 219,
+                               /* 3980 */  226, 221, 220, 223, 222, 225, 224, 219, 226, 221,
+                               /* 3990 */  220, 223, 226, 221, 220, 223, 222, 225, 224, 219,
+                               /* 4000 */  222, 225, 224, 219, 226, 221, 220, 223, 226, 221,
+                               /* 4010 */  220, 223, 222, 225, 224, 219, 226, 221, 220, 223,
+                               /* 4020 */  222, 225, 224, 219, 222, 225, 224, 219, 226, 221,
+                               /* 4030 */  220, 223, 448, 449, 449, 448, 449, 448, 448, 449,
+                               /* 4040 */  449, 448, 448, 449, 448, 449, 449, 448, 449, 448,
+                               /* 4050 */  448, 449, 448, 449, 449, 448, 448, 449, 449, 448,
+                               /* 4060 */  449, 448, 448, 449, 449, 448, 448, 449, 448, 449,
+                               /* 4070 */  449, 448, 448, 449, 449, 448, 449, 448, 448, 449,
+                               /* 4080 */  448, 449, 449, 448, 449, 448, 448, 449, 449, 448,
+                               /* 4090 */  448, 449, 448, 449, 449, 448  };
+
+        int look_up_3_input_node (NodeType op, int i1, int i2, int signature)
+        {
+            int ll_nn = NON_NEGATED( node(i1).left );
+            int lr_nn = NON_NEGATED( node(i1).right );
+            int r_nn = NON_NEGATED( i2 );
+
+            int result = INVALID;
+            int idx = lookup_table_3_inputs[signature];
+
+            switch (idx)
+            {
+                case 0: // i1 i2 and i3 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 1: // i1 neg i2 and i3 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 2: // i1 i2 neg and i3 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 3: // i1 neg i2 neg and i3 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 4: // i1 i2 and neg i3 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 5: // i1 neg i2 and neg i3 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 6: // i1 i2 neg and neg i3 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 7: // i1 neg i2 neg and neg i3 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 8: // i1 i2 and i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 9: // i1 neg i2 and i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 10: // i1 i2 neg and i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 11: // i1 neg i2 neg and i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 12: // i1 i2 and neg i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 13: // i1 neg i2 and neg i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 14: // i1 i2 neg and neg i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 15: // i1 neg i2 neg and neg i3 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 16: // i1 i2 xor i3 and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 17: // i1 i2 xor neg i3 and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 18: // i1 i2 xor i3 neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 19: // i1 i2 xor neg i3 neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( r_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 20: // i1 i2 and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 21: // i1 neg i2 and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 22: // i1 i2 neg and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 23: // i1 neg i2 neg and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 24: // i1 i2 and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 25: // i1 neg i2 and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 26: // i1 i2 neg and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 27: // i1 neg i2 neg and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 28: // i1 i2 xor i3 xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = temp1;
+                    break;
+                }
+                case 29: // i1 i2 xor i3 xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, r_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 30: // i1 i2 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 31: // i1 neg i2 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 32: // neg
+                {
+                    result = zero();
+                    break;
+                }
+                case 33: // i2
+                {
+                    result = lr_nn;
+                    break;
+                }
+                case 34: // i1 i2 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 35: // i1 neg i2 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 36: // i2 neg
+                {
+                    result = NEGATE( lr_nn );
+                    break;
+                }
+                case 37: // i1 neg i2 neg and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 38: // i1 i2 neg and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 39: // i1 neg i2 and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 40: // i1 i2 and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, lr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 41: // i1
+                {
+                    result = ll_nn;
+                    break;
+                }
+                case 42: // i1 neg
+                {
+                    result = NEGATE( ll_nn );
+                    break;
+                }
+                case 43: // i1 i3 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, r_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 44: // i1 neg i3 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), r_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 45: // i1 i3 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, r_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 46: // i1 neg i3 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), r_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 47: // i1 i3 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( r_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 48: // i1 neg i3 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( r_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 49: // i1 i3 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( r_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 50: // i1 neg i3 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( r_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 51: // i1 i3 xor i2 xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, r_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 52: // i1 i3 xor i2 xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, r_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 53: // i3 i1 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, r_nn, ll_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 54: // i3 i1 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, r_nn, NEGATE( ll_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 55: // i3 i1 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, r_nn, ll_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 56: // i3 i1 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, r_nn, NEGATE( ll_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 57: // i3 neg i1 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( r_nn ), ll_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 58: // i3 neg i1 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( r_nn ), NEGATE( ll_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 59: // i3 neg i1 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( r_nn ), ll_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 60: // i3 neg i1 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( r_nn ), NEGATE( ll_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 61: // i3 i1 xor i2 xor
+                {
+                    int temp0 = create (NodeType.XOR, r_nn, ll_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 62: // i3 i1 xor i2 xor neg
+                {
+                    int temp0 = create (NodeType.XOR, r_nn, ll_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                default:
+                    throw new Exception ("Unknown Cases");
+            }
+            return result;
+        }
+
+        int look_up_4_input_node (NodeType op, int i1, int i2, int signature)
+        {
+            int ll_nn = NON_NEGATED( node(i1).input(0) );
+            int lr_nn = NON_NEGATED( node(i1).input(1) );
+            int rl_nn = NON_NEGATED( node(i2).input(0) );
+            int rr_nn = NON_NEGATED( node(i2).input(1) );
+
+            int result = INVALID;
+            int idx = lookup_table_4_inputs[signature];
+
+            switch (idx)
+            {
+                case 0: // i1 i2 and i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 1: // i1 neg i2 and i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 2: // i1 i2 neg and i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 3: // i1 neg i2 neg and i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 4: // i1 i2 and i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 5: // i1 neg i2 and i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 6: // i1 i2 neg and i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 7: // i1 neg i2 neg and i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 8: // i1 i2 and i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 9: // i1 neg i2 and i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 10: // i1 i2 neg and i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 11: // i1 neg i2 neg and i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 12: // i1 i2 and i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 13: // i1 neg i2 and i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 14: // i1 i2 neg and i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 15: // i1 neg i2 neg and i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 16: // i1 i2 and neg i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 17: // i1 neg i2 and neg i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 18: // i1 i2 neg and neg i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 19: // i1 neg i2 neg and neg i3 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 20: // i1 i2 and neg i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 21: // i1 neg i2 and neg i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 22: // i1 i2 neg and neg i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 23: // i1 neg i2 neg and neg i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 24: // i1 i2 and neg i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 25: // i1 neg i2 and neg i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 26: // i1 i2 neg and neg i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 27: // i1 neg i2 neg and neg i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 28: // i1 i2 and neg i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 29: // i1 neg i2 and neg i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 30: // i1 i2 neg and neg i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 31: // i1 neg i2 neg and neg i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 32: // i1 i2 and i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 33: // i1 neg i2 and i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 34: // i1 i2 neg and i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 35: // i1 neg i2 neg and i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 36: // i1 i2 and i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 37: // i1 neg i2 and i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 38: // i1 i2 neg and i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 39: // i1 neg i2 neg and i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 40: // i1 i2 and i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 41: // i1 neg i2 and i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 42: // i1 i2 neg and i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 43: // i1 neg i2 neg and i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 44: // i1 i2 and i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 45: // i1 neg i2 and i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 46: // i1 i2 neg and i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 47: // i1 neg i2 neg and i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 48: // i1 i2 and neg i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 49: // i1 neg i2 and neg i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 50: // i1 i2 neg and neg i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 51: // i1 neg i2 neg and neg i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 52: // i1 i2 and neg i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 53: // i1 neg i2 and neg i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 54: // i1 i2 neg and neg i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 55: // i1 neg i2 neg and neg i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 56: // i1 i2 and neg i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 57: // i1 neg i2 and neg i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 58: // i1 i2 neg and neg i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 59: // i1 neg i2 neg and neg i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 60: // i1 i2 and neg i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 61: // i1 neg i2 and neg i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 62: // i1 i2 neg and neg i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 63: // i1 neg i2 neg and neg i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 64: // i1 i2 xor i3 i4 and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 65: // i1 i2 xor neg i3 i4 and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 66: // i1 i2 xor i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 67: // i1 i2 xor neg i3 neg i4 and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 68: // i1 i2 xor i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 69: // i1 i2 xor neg i3 i4 neg and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 70: // i1 i2 xor i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 71: // i1 i2 xor neg i3 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 72: // i1 i2 xor i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 73: // i1 i2 xor neg i3 i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 74: // i1 i2 xor i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 75: // i1 i2 xor neg i3 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 76: // i1 i2 xor i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 77: // i1 i2 xor neg i3 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 78: // i1 i2 xor i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 79: // i1 i2 xor neg i3 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 80: // i1 i2 and i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 81: // i1 neg i2 and i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 82: // i1 i2 neg and i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 83: // i1 neg i2 neg and i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 84: // i1 i2 and i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 85: // i1 neg i2 and i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 86: // i1 i2 neg and i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 87: // i1 neg i2 neg and i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 88: // i1 i2 and neg i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 89: // i1 neg i2 and neg i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 90: // i1 i2 neg and neg i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 91: // i1 neg i2 neg and neg i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 92: // i1 i2 and neg i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 93: // i1 neg i2 and neg i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 94: // i1 i2 neg and neg i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 95: // i1 neg i2 neg and neg i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 96: // i1 i2 xor i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 97: // i1 i2 xor neg i3 i4 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 98: // i1 i2 xor i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 99: // i1 i2 xor neg i3 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 100: // i1 i2 and i3 i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 101: // i1 neg i2 and i3 i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 102: // i1 i2 neg and i3 i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 103: // i1 neg i2 neg and i3 i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 104: // i1 i2 and i3 neg i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 105: // i1 neg i2 and i3 neg i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 106: // i1 i2 neg and i3 neg i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 107: // i1 neg i2 neg and i3 neg i4 and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 108: // i1 i2 and i3 i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 109: // i1 neg i2 and i3 i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 110: // i1 i2 neg and i3 i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 111: // i1 neg i2 neg and i3 i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 112: // i1 i2 and i3 neg i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 113: // i1 neg i2 and i3 neg i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 114: // i1 i2 neg and i3 neg i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 115: // i1 neg i2 neg and i3 neg i4 neg and xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 116: // i1 i2 and i3 i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 117: // i1 neg i2 and i3 i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 118: // i1 i2 neg and i3 i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 119: // i1 neg i2 neg and i3 i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 120: // i1 i2 and i3 neg i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 121: // i1 neg i2 and i3 neg i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 122: // i1 i2 neg and i3 neg i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 123: // i1 neg i2 neg and i3 neg i4 and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 124: // i1 i2 and i3 i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 125: // i1 neg i2 and i3 i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 126: // i1 i2 neg and i3 i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 127: // i1 neg i2 neg and i3 i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 128: // i1 i2 and i3 neg i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 129: // i1 neg i2 and i3 neg i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 130: // i1 i2 neg and i3 neg i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 131: // i1 neg i2 neg and i3 neg i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 132: // i1 i2 xor i3 i4 and xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 133: // i1 i2 xor i3 i4 and xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 134: // i1 i2 xor i3 neg i4 and xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 135: // i1 i2 xor i3 neg i4 and xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 136: // i1 i2 xor i3 i4 neg and xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 137: // i1 i2 xor i3 i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 138: // i1 i2 xor i3 neg i4 neg and xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 139: // i1 i2 xor i3 neg i4 neg and xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 140: // i1 i2 and i3 i4 xor xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 141: // i1 neg i2 and i3 i4 xor xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 142: // i1 i2 neg and i3 i4 xor xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 143: // i1 neg i2 neg and i3 i4 xor xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 144: // i1 i2 and i3 i4 xor xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 145: // i1 neg i2 and i3 i4 xor xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 146: // i1 i2 neg and i3 i4 xor xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 147: // i1 neg i2 neg and i3 i4 xor xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 148: // i1 i2 xor i3 i4 xor xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 149: // i1 i2 xor i3 i4 xor xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 150: // i1 i2 and i4 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 151: // i1 neg i2 and i4 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 152: // neg
+                {
+                    result = zero();
+                    break;
+                }
+                case 153: // i1 i2 neg and i4 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 154: // i1 neg i2 neg and i4 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 155: // i1 i2 and i4 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( rr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 156: // i1 neg i2 and i4 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( rr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 157: // i1 i2 neg and i4 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( rr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 158: // i1 neg i2 neg and i4 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( rr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 159: // i2 i4 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, lr_nn, rr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 160: // i2 neg i4 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 161: // i2 i4 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 162: // i2 neg i4 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 163: // i1 i2 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 164: // i1 neg i2 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 165: // i1 i2 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 166: // i1 neg i2 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 167: // i1 neg i4 neg and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 168: // i1 i4 neg and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 169: // i1 i2 neg and neg i2 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 170: // i1 i2 neg and neg i2 i4 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 171: // i1 i2 and neg i2 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 172: // i1 i2 and neg i2 neg i4 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 173: // i1 neg i4 neg and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 174: // i1 i4 neg and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 175: // i1 neg i4 and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 176: // i1 i4 and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 177: // i1 i2 neg and neg i2 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 178: // i1 i2 neg and neg i2 i4 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 179: // i1 i2 and neg i2 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 180: // i1 i2 and neg i2 neg i4 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 181: // i1 neg i4 and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 182: // i1 i4 and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 183: // i1 i2 xor i2 i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 184: // i1 i2 xor neg i1 i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 185: // i1 i2 xor i1 i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 186: // i1 i2 xor neg i1 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 187: // i1 i2 xor i2 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 188: // i1 i2 xor neg i1 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 189: // i1 i2 xor i1 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 190: // i1 i2 xor neg i1 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 191: // i1 i2 and neg i2 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 192: // i1 neg i2 and neg i2 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 193: // i1 i4 and neg i2 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 194: // i1 neg i4 and neg i2 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 195: // i1 i2 and neg i2 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 196: // i1 neg i2 and neg i2 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 197: // i1 i2 neg and neg i2 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 198: // i1 neg i2 neg and neg i2 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 199: // i1 i2 xor i2 i4 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 200: // i1 i4 xor i2 i4 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 201: // i1 i2 xor i1 i4 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 202: // i1 i2 xor neg i1 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 203: // i1 i4 xor i2 and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 204: // i1 i4 xor neg i2 and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 205: // i1 i4 xor i2 neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 206: // i1 i4 xor neg i2 neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 207: // i1 i4 xor i2 and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 208: // i1 i4 xor neg i2 and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 209: // i1 i4 xor i2 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 210: // i1 i4 xor neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 211: // i2 i4 neg and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 212: // i2 i4 neg and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 213: // i2 neg i4 neg and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 214: // i2 neg i4 neg and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 215: // i2 i4 and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 216: // i2 i4 and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 217: // i2 neg i4 and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 218: // i2 neg i4 and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 219: // i1 neg i2 and i4 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 220: // i1 i2 and i4 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 221: // i1 neg i2 neg and i4 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 222: // i1 i2 neg and i4 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 223: // i1 neg i2 and i4 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 224: // i1 i2 and i4 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 225: // i1 neg i2 neg and i4 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 226: // i1 i2 neg and i4 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 227: // i1 i4 xor
+                {
+                    int temp0 = create_op_node (NodeType.XOR, ll_nn, rr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 228: // i1 i4 xor neg
+                {
+                    int temp0 = create_op_node (NodeType.XOR, ll_nn, rr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 229: // i1 i3 and i2 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 230: // i1 neg i3 and i2 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 231: // i1 i3 and i2 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 232: // i1 neg i3 and i2 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 233: // i1 i3 neg and i2 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 234: // i1 neg i3 neg and i2 i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 235: // i1 i3 neg and i2 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 236: // i1 neg i3 neg and i2 neg i4 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 237: // i1 i3 and i2 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 238: // i1 neg i3 and i2 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 239: // i1 i3 and i2 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 240: // i1 neg i3 and i2 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 241: // i1 i3 neg and i2 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 242: // i1 neg i3 neg and i2 i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 243: // i1 i3 neg and i2 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 244: // i1 neg i3 neg and i2 neg i4 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 245: // i1 i3 xor i2 i4 xor xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 246: // i1 i3 xor i2 i4 xor xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 247: // i1 i4 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, rr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 248: // i1 neg i4 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 249: // i1 i4 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 250: // i1 neg i4 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 251: // i2 neg i4 neg and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 252: // i1 neg i2 and neg i1 i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 253: // i2 i4 neg and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 254: // i1 neg i2 and neg i1 i4 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 255: // i1 i2 and neg i1 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 256: // i2 neg i4 neg and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 257: // i1 i2 and neg i1 neg i4 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 258: // i2 i4 neg and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 259: // i2 neg i4 and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 260: // i1 neg i2 and neg i1 i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 261: // i2 i4 and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 262: // i1 neg i2 and neg i1 i4 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 263: // i1 i2 and neg i1 neg i4 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 264: // i2 neg i4 and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 265: // i1 i2 and neg i1 neg i4 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 266: // i2 i4 and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 267: // i1 i2 and neg i1 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 268: // i1 i4 xor i2 i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, lr_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 269: // i1 i2 neg and neg i1 i4 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 270: // i1 i4 xor i2 neg i4 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( lr_nn ), rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 271: // i1 i2 and neg i1 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 272: // i1 neg i2 and neg i1 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 273: // i1 i2 neg and neg i1 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 274: // i1 neg i2 neg and neg i1 i4 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 275: // i2 i4 xor i1 and
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 276: // i2 i4 xor neg i1 and
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 277: // i2 i4 xor i1 neg and
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( ll_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 278: // i2 i4 xor neg i1 neg and
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 279: // i2 i4 xor i1 and neg
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 280: // i2 i4 xor neg i1 and neg
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 281: // i2 i4 xor i1 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 282: // i2 i4 xor neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, lr_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 283: // i1 i4 neg and i2 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 284: // i1 i4 neg and i2 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 285: // i1 neg i4 neg and i2 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 286: // i1 neg i4 neg and i2 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 287: // i1 i4 and i2 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 288: // i1 i4 and i2 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 289: // i1 neg i4 and i2 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 290: // i1 neg i4 and i2 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 291: // i2 i4 xor
+                {
+                    int temp0 = create_op_node (NodeType.XOR, lr_nn, rr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 292: // i2 i4 xor neg
+                {
+                    int temp0 = create_op_node (NodeType.XOR, lr_nn, rr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 293: // i1 i3 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 294: // i1 neg i3 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 295: // i1 i3 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 296: // i1 neg i3 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 297: // i1 i3 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 298: // i1 neg i3 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 299: // i1 i3 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 300: // i1 neg i3 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 301: // i3 i2 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, rl_nn, lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 302: // i3 neg i2 and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( rl_nn ), lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 303: // i3 i2 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, rl_nn, NEGATE( lr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 304: // i3 neg i2 neg and
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( rl_nn ), NEGATE( lr_nn ) );
+                    result = temp0;
+                    break;
+                }
+                case 305: // i1 neg i3 neg and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 306: // i1 i3 neg and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 307: // i1 i2 neg and neg i3 i2 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 308: // i1 i2 neg and neg i3 neg i2 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 309: // i1 neg i3 and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 310: // i1 i3 and neg i2 and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 311: // i1 i2 neg and neg i3 neg i2 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 312: // i1 i2 neg and neg i3 i2 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create (NodeType.AND, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 313: // i1 i2 and neg i3 i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 314: // i1 i2 and neg i3 neg i2 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 315: // i1 neg i3 neg and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 316: // i1 i3 neg and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 317: // i1 i2 and neg i3 neg i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 318: // i1 i2 and neg i3 i2 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 319: // i1 neg i3 and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 320: // i1 i3 and neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 321: // i1 i2 xor i3 i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 322: // i1 i3 and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 323: // i1 i2 xor i3 neg i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rl_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 324: // i1 i3 neg and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 325: // i1 i3 and neg i1 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 326: // i1 neg i3 and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 327: // i1 i3 neg and neg i1 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 328: // i1 neg i3 neg and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 329: // i1 i2 and neg i3 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 330: // i1 neg i2 and neg i3 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 331: // i1 i3 and neg i3 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 332: // i1 neg i3 and neg i3 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 333: // i1 i3 and neg i3 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 334: // i1 neg i3 and neg i3 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 335: // i1 i3 neg and neg i3 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 336: // i1 neg i3 neg and neg i3 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 337: // i1 i2 xor i3 i2 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 338: // i1 i3 xor i3 i2 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, rl_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 339: // i1 i3 xor i1 i2 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 340: // i1 i3 xor neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 341: // i1 i3 xor i2 and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 342: // i1 i3 xor neg i2 and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 343: // i1 i3 xor i2 neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 344: // i1 i3 xor neg i2 neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 345: // i1 i3 xor i2 and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 346: // i1 i3 xor neg i2 and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), lr_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 347: // i1 i3 xor i2 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 348: // i1 i3 xor neg i2 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 349: // i3 neg i2 and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rl_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 350: // i3 neg i2 and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rl_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 351: // i3 i2 and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, rl_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 352: // i3 i2 and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, rl_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 353: // i3 neg i2 neg and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 354: // i3 neg i2 neg and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rl_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 355: // i3 i2 neg and i1 xor neg
+                {
+                    int temp0 = create (NodeType.AND, rl_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 356: // i3 i2 neg and i1 xor
+                {
+                    int temp0 = create (NodeType.AND, rl_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 357: // i1 neg i2 and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = temp1;
+                    break;
+                }
+                case 358: // i1 i2 and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = temp1;
+                    break;
+                }
+                case 359: // i1 neg i2 neg and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 360: // i1 i2 neg and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 361: // i1 neg i2 and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 362: // i1 i2 and i3 xor neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 363: // i1 neg i2 neg and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = temp1;
+                    break;
+                }
+                case 364: // i1 i2 neg and i3 xor
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.XOR, temp0, rl_nn );
+                    result = temp1;
+                    break;
+                }
+                case 365: // i1 i3 xor
+                {
+                    int temp0 = create_op_node (NodeType.XOR, ll_nn, rl_nn );
+                    result = temp0;
+                    break;
+                }
+                case 366: // i1 i3 xor neg
+                {
+                    int temp0 = create_op_node (NodeType.XOR, ll_nn, rl_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 367: // i1 i2 and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, lr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 368: // i2 neg
+                {
+                    result = NEGATE( lr_nn );
+                    break;
+                }
+                case 369: // i1 neg
+                {
+                    result = NEGATE( ll_nn );
+                    break;
+                }
+                case 370: // i1 i2 xor
+                {
+                    int temp0 = create_op_node (NodeType.XOR, ll_nn, lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 371: // i1 neg i2 and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 372: // i1 i2 xor neg
+                {
+                    int temp0 = create_op_node (NodeType.XOR, ll_nn, lr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 373: // i1
+                {
+                    result = ll_nn;
+                    break;
+                }
+                case 374: // i1 i2 neg and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 375: // i2
+                {
+                    result = lr_nn;
+                    break;
+                }
+                case 376: // i1 neg i2 neg and neg
+                {
+                    int temp0 = create_op_node (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                case 377: //
+                {
+                    result = one();
+                    break;
+                }
+                case 378: // i1 i3 and i4 i2 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 379: // i1 neg i3 and i4 i2 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 380: // i1 i3 and i4 i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 381: // i1 neg i3 and i4 i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 382: // i1 i3 neg and i4 i2 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 383: // i1 neg i3 neg and i4 i2 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 384: // i1 i3 neg and i4 i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 385: // i1 neg i3 neg and i4 i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 386: // i1 i3 and i4 neg i2 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 387: // i1 neg i3 and i4 neg i2 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 388: // i1 i3 and i4 neg i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 389: // i1 neg i3 and i4 neg i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rl_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 390: // i1 i3 neg and i4 neg i2 and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 391: // i1 neg i3 neg and i4 neg i2 and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 392: // i1 i3 neg and i4 neg i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 393: // i1 neg i3 neg and i4 neg i2 neg and and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rl_nn ) );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 394: // i1 i3 xor i4 i2 xor xor
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 395: // i1 i3 xor i4 i2 xor xor neg
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rl_nn );
+                    int temp1 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.XOR, temp0, temp1 );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 396: // i1 i4 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 397: // i1 i4 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 398: // i1 neg i4 and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 399: // i1 neg i4 and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 400: // i1 i4 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 401: // i1 i4 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 402: // i1 neg i4 neg and i2 and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, lr_nn );
+                    result = temp1;
+                    break;
+                }
+                case 403: // i1 neg i4 neg and i2 neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( lr_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 404: // i4 neg i2 neg and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rr_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 405: // i1 i4 and neg i1 neg i2 and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 406: // i4 neg i2 and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 407: // i1 i4 and neg i1 neg i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 408: // i1 neg i4 and neg i1 i2 and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 409: // i4 neg i2 neg and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rr_nn ), NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 410: // i1 neg i4 and neg i1 i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 411: // i4 neg i2 and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 412: // i4 i2 neg and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 413: // i1 i4 and neg i1 neg i2 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 414: // i4 i2 and neg i1 and neg
+                {
+                    int temp0 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 415: // i1 i4 and neg i1 neg i2 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 416: // i1 neg i4 and neg i1 i2 neg and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 417: // i4 i2 neg and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 418: // i1 neg i4 and neg i1 i2 and neg and neg
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = NEGATE( temp2 );
+                    break;
+                }
+                case 419: // i4 i2 and neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 420: // i1 i4 and neg i1 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 421: // i1 i4 and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 422: // i1 i2 xor i4 i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 423: // i1 neg i4 and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), rr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 424: // i1 i4 neg and neg i1 i2 xor and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 425: // i1 i4 neg and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, ll_nn, NEGATE( rr_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 426: // i1 i2 xor i4 neg i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( rr_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 427: // i1 neg i4 neg and neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( rr_nn ) );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 428: // i1 i4 xor i1 i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 429: // i1 i4 xor i4 i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 430: // i1 i4 xor i1 i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 431: // i1 i4 xor i4 i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, rr_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, temp0, NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 432: // i1 i4 xor neg i1 i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 433: // i1 i4 xor neg i1 neg i2 and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 434: // i1 i4 xor neg i1 i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, ll_nn, NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 435: // i1 i4 xor neg i1 neg i2 neg and neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.AND, NEGATE( ll_nn ), NEGATE( lr_nn ) );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 436: // i1 i4 xor i1 i2 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 437: // i1 i4 xor i4 i2 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 438: // i1 i2 xor i4 i2 xor and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp1 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, temp0, temp1 );
+                    result = temp2;
+                    break;
+                }
+                case 439: // i1 i4 xor neg i1 i2 xor neg and
+                {
+                    int temp0 = create (NodeType.XOR, ll_nn, rr_nn );
+                    int temp1 = create (NodeType.XOR, ll_nn, lr_nn );
+                    int temp2 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( temp1 ) );
+                    result = temp2;
+                    break;
+                }
+                case 440: // i4 i2 xor i1 and
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 441: // i4 i2 xor neg i1 and
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = temp1;
+                    break;
+                }
+                case 442: // i4 i2 xor i1 neg and
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( ll_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 443: // i4 i2 xor neg i1 neg and
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = temp1;
+                    break;
+                }
+                case 444: // i4 i2 xor i1 and neg
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 445: // i4 i2 xor neg i1 and neg
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), ll_nn );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 446: // i4 i2 xor i1 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, temp0, NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 447: // i4 i2 xor neg i1 neg and neg
+                {
+                    int temp0 = create (NodeType.XOR, rr_nn, lr_nn );
+                    int temp1 = create_op_node (NodeType.AND, NEGATE( temp0 ), NEGATE( ll_nn ) );
+                    result = NEGATE( temp1 );
+                    break;
+                }
+                case 448: // i4 i2 xor
+                {
+                    int temp0 = create_op_node (NodeType.XOR, rr_nn, lr_nn );
+                    result = temp0;
+                    break;
+                }
+                case 449: // i4 i2 xor neg
+                {
+                    int temp0 = create_op_node (NodeType.XOR, rr_nn, lr_nn );
+                    result = NEGATE( temp0 );
+                    break;
+                }
+                default:
+                    throw new Exception ("Unknown Cases");
+
+            }
+            return result;
+        }
+        #endregion
+
+    }
+}
+
diff --git a/base/Applications/Benchmarks/sharpSAT/basic_classes.cs b/base/Applications/Benchmarks/sharpSAT/basic_classes.cs
new file mode 100644
index 0000000..fa00717
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/basic_classes.cs
@@ -0,0 +1,328 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    public class Variable : SATCommon
+    {
+
+        //public bool       branchable  = true;
+        //public bool       reasoning   = true;
+        private ushort  flags       = 0;
+        public ushort   gflag       = 0;
+
+        public NodeType type        = NodeType.UNKNOWN;
+        public IntVector outputs    = new IntVector(2);
+        public int      left        = INVALID;
+        public int      right       = INVALID;
+        public int      canonical   = INVALID;
+        public int      ref_count   = 0;
+        public short    lits_count_0= 0;
+        public short    lits_count_1= 0;
+        public int      uid         = 0;
+
+        public short    score_0     = 0;
+        public short    score_1     = 0;
+        public int      asgn_pos    = -1;
+        public int      ordered_pos = 0;
+
+        public short    varValue    = UNKNOWN;
+        public Antecedent antecedent= -1;
+        public int      dlevel      = -1;
+
+        public void set_gid (int i)     { gflag |= (ushort) (1<<(i-1));     }
+        public void clear_gid(int i)    { gflag &= (ushort) ~(1<<(i-1));   }
+        public void clear_all_gid()     { gflag = 0; }
+        public bool gid (int i)         { return (( gflag & (ushort) (1<<(i-1))) != 0);   }
+
+        public void clear_all_flag()    { flags = 0; }
+        public void set_flag(int idx)   { flags |= (ushort) (1 << idx); }
+        public void clear_flag(int idx) { flags &= (ushort) (~(1<<idx));}
+        public bool flag(int idx)       { return (flags & (ushort) (1<< idx)) != 0; }
+
+        public int score()              { return (score_0 > score_1? score_0 : score_1); }
+        public int lits_count()         { return lits_count_0 + lits_count_1; }
+        public bool is_pi()             { return type == NodeType.PI; }
+        public bool is_gate()           { return (type == NodeType.AND || type == NodeType.XOR); }
+        public int output(int i)        { return outputs[i];}
+        public int input(int k)         { return (k==0 ? left: right); }
+    }
+
+
+    public class Clause : SATCommon
+    {
+        public ClType   type            = ClType.UNKNOWN;       //indicates the clause type
+        public ushort   gflag           = 0;
+        public int      uid             = 0;
+        public int[]    literals        = null;
+        public int      activity        = 0;
+
+        public void init (ClType tp, int [] lits, ushort gflg, int id)
+        {
+            type = tp;
+            literals = new int[lits.Length];
+            Array.Copy(lits, 0, literals, 0, lits.Length);
+            gflag = gflg;
+            uid = id;
+            activity = 0;
+        }
+
+        public bool gid (int i)
+        {
+            sharp_assert (i>=1 && i<= WORD_WIDTH);
+            return (( gflag & (ushort)(1<<(i-1))) != 0);
+        }
+
+        public void set_gid (int i)
+        {
+            sharp_assert (i>=1 && i<= WORD_WIDTH);
+            gflag |= (ushort)(1<<(i-1));
+        }
+
+        public void clear_gid(int i)
+        {
+            sharp_assert (i>=1 && i<= WORD_WIDTH);
+            gflag &= (ushort)~(1<<(i-1));
+        }
+
+        public int num_lits {   get {return literals.Length; }  }
+
+        public int literal (int n)
+        {
+            return literals[n];
+        }
+    }
+
+    public struct Antecedent
+    {
+        private int anteVal;
+
+        public static implicit operator Antecedent( int v )     { return new Antecedent(v); }
+        public static implicit operator int (Antecedent an) { return an.anteVal; }
+        public Antecedent (int v) { anteVal = v; }
+        public Antecedent (ImpType tp, int index)
+        {
+            anteVal = (index << 3) + (int) tp;
+        }
+        public ImpType type
+        {
+            get { return (ImpType) (anteVal & 0x7); }
+            set
+            {
+                uint a = (uint) anteVal & (~(uint) 0x7);
+                uint b = (uint) value;
+                anteVal =  (int) (a | b);
+                //anteVal = (((uint)anteVal) & (~(uint)0x7)) | (uint) value;
+            }
+        }
+
+        public int index
+        {
+            get { return (anteVal >> 3); }
+            set { anteVal = ((anteVal & 7) | (value << 3)); }
+        }
+    }
+
+    public struct Implication
+    {
+        public int lit;
+        public Antecedent ante;
+    }
+
+    public class NodeHashMap  : SATCommon
+    {
+        private const int XOR_MARK = (1 << 30);
+        private MyHashtable     hash_table = new MyHashtable();
+
+        private class NodeHashMapKey
+        {
+            public int left;
+            public int right;
+            public NodeHashMapKey(int l, int r)
+            {
+                left = l;
+                right = r;
+            }
+            public override int GetHashCode()
+            {
+                long hashcode = left;
+                hashcode <<= 16;
+                hashcode ^= right;
+                int lsig = (int)(hashcode & 0xffffffff);
+                int msig = (int)(hashcode >> 32);
+                return lsig ^ msig;
+            }
+            public override bool Equals(object obj)
+            {
+                NodeHashMapKey other = obj as NodeHashMapKey;
+                if(other == null) return false;
+                return other.left == left && other.right == right;
+            }
+        }
+
+        public int lookup (NodeType op, int i1, int i2)
+        {
+            sharp_assert (op == NodeType.AND || op == NodeType.XOR);
+            //1. left input always has smaller index than right
+            if (i1 > i2)
+            {
+                int temp = i1;
+                i1 = i2;
+                i2 = temp;
+            }
+            //2. For XOR gate, always require both inputs not negated
+            bool do_NEGATE = false;
+            if (op == NodeType.XOR)
+            {
+                if (IS_NEGATED(i1))
+                {
+                    i1 = NEGATE (i1);
+                    do_NEGATE = !do_NEGATE;
+                }
+                if (IS_NEGATED(i2))
+                {
+                    i2 = NEGATE(i2);
+                    do_NEGATE = !do_NEGATE;
+                }
+            }
+            //3. put special mark on the XOR node
+            int l, r;
+            l = i1;
+            r = i2;
+            if (op == NodeType.XOR)
+                l += XOR_MARK;
+            //4. Lookup
+            NodeHashMapKey key = new NodeHashMapKey(l, r);
+//          ulong key = ((ulong)l << 32) + (ulong) r;
+            object item = hash_table[key];
+            if (item == null)
+                return INVALID;
+            int o = (int) item;
+            if (do_NEGATE)
+                o = NEGATE(o);
+            return o;
+        }
+
+        public void insert ( int n, NodeType op, int i1, int i2)
+        {
+            sharp_assert (op == NodeType.AND || op == NodeType.XOR);
+            sharp_assert (i1 < i2);
+            sharp_assert (! (   (op == NodeType.XOR) &&
+                ( IS_NEGATED(i1) || IS_NEGATED(i2) )));
+            sharp_assert (!IS_NEGATED(n));
+
+            int l, r;
+            l = i1;
+            r = i2;
+            if (op == NodeType.XOR)
+                l += XOR_MARK;
+            NodeHashMapKey key = new NodeHashMapKey(l, r);
+//          ulong key = ((ulong)l << 32) + (ulong) r;
+            sharp_assert ( !hash_table.Contains(key));
+            hash_table[key] = n;
+        }
+
+        public void remove ( int n, NodeType op, int i1, int i2)
+        {
+            sharp_assert (op == NodeType.AND || op == NodeType.XOR);
+            sharp_assert (i1 < i2);
+            sharp_assert (! (   (op == NodeType.XOR) &&
+                ( IS_NEGATED(i1) ||  IS_NEGATED(i2) )));
+            sharp_assert ( ! IS_NEGATED(n) );
+            //put special mark on the XOR node
+            int l, r;
+            l = i1;
+            r = i2;
+            if (op == NodeType.XOR)
+                l += XOR_MARK;
+            NodeHashMapKey key = new NodeHashMapKey(l, r);
+//          ulong key = ((ulong)l << 32) + (ulong) r;
+
+            sharp_assert ( (int)hash_table[key] == n);
+            hash_table.Remove(key);
+        }
+    }
+
+
+    class FreeList
+    {
+        VarVector variables;
+        IntVector free_list;
+        int delete_count;
+        const double compact_ratio = 0.5;
+
+        public FreeList (VarVector vars)
+        {
+            free_list = new IntVector(16);
+            variables = vars;
+        }
+
+        public void add (IntVector new_frees)
+        {
+            for (int i=0; i< new_frees.size(); ++i)
+                free_list.push_back(new_frees[i]);
+            free_list.sort();
+        }
+
+        public void delete_index (int idx)
+        {
+            delete_count ++;
+            if ((double)delete_count / (double)free_list.size() > compact_ratio)
+            {
+                IntVector temp = new IntVector(16);
+                for (int i=0; i< free_list.size(); ++i)
+                {
+                    if (idx == i) //just deleted, so won't be in free_list anymore
+                        continue;
+                    if (variables[free_list[i]] == null ||
+                        variables[free_list[i]].type == NodeType.FREE )
+                        temp.push_back(free_list[i]);
+                }
+                free_list = temp;
+            }
+        }
+        public int find_greater_than (int v)
+        {
+            int idx = free_list.binary_search (v);
+            if (idx < 0)
+                idx = ~ idx;
+            else
+                idx ++;
+            for (int i=idx; i < free_list.size(); ++i)
+            {
+                if (variables[free_list[i]] == null ||
+                    variables[free_list[i]].type == NodeType.FREE )
+                {
+                    int r = free_list[i];
+                    delete_index(i);
+                    return r;
+                }
+            }
+            return -1;
+        }
+    }
+
+    public class UnsatCore
+    {
+        public int [] core_clauses;
+        public int [] core_nodes;
+    }
+
+    public class MyHashtable : Hashtable {}
+
+    public interface SATHook
+    {
+        void OnBCP();
+        void OnBacktrack(int blevel);
+        void OnCaseSplit(int svar);
+    }
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/blifparser.cs b/base/Applications/Benchmarks/sharpSAT/blifparser.cs
new file mode 100644
index 0000000..1685e5b
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/blifparser.cs
@@ -0,0 +1,429 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System.Collections;
+using System.Text;
+using System.IO;
+using System;
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    public class NetConst
+    {
+        public const int PI_MASK = 1;
+        public const int PO_MASK = (1 << 1);
+        public const int LATCH_OUT_MASK = (1 << 2);
+        public const int LATCH_IN_MASK = (1 << 3);
+        public const int COMB_MASK = (1 << 4);
+        //private NetConst() {}
+    }
+
+    public enum ELatchDefault
+    {
+        LATCH_0 = 0,
+        LATCH_1 = 1,
+        LATCH_DC = 2,
+        LATCH_X = 3
+    };
+
+    public enum EGateType
+    {
+        G_UNKNOWN,
+        G_NOT,          //o = a'
+        G_AND_11,       //o = ab
+        G_AND_10,       //o = ab'
+        G_AND_01,       //o = a'b
+        G_AND_00,       //o = a'b'
+        G_OR_11,        //o = a+b
+        G_OR_10,        //o = a+b'
+        G_OR_01,        //o = a'+b
+        G_OR_00,        //o = a'+b'
+        G_CONST_1,
+        G_CONST_0,
+        G_WIRE,
+    };
+
+    public class Gate
+    {
+        public int              index       = -1;
+        public EGateType        gate_type   = EGateType.G_UNKNOWN;
+        public string           name;
+        public IntVector        fanins      = new IntVector(2);
+        public IntVector        fanouts     = new IntVector(2);
+        public int              type ;
+        public ELatchDefault    latch_default ;
+        public ObjVector        fanin_names = new ObjVector(1);
+
+        public bool         is_PI()         { return ((type & NetConst.PI_MASK) != 0); }
+        public bool         is_PO()         { return ((type & NetConst.PO_MASK) != 0); }
+        public bool         is_LATCH_IN()   { return ((type & NetConst.LATCH_IN_MASK) != 0); }
+        public bool         is_LATCH()      { return ((type & NetConst.LATCH_OUT_MASK) != 0); }
+        public bool         is_COMB()       { return ((type & NetConst.COMB_MASK) != 0); }
+        public void         set_PI()        { type |= NetConst.PI_MASK; }
+        public void         set_PO()        { type |= NetConst.PO_MASK; }
+        public void         set_LATCH_IN()  { type |= NetConst.LATCH_IN_MASK; }
+        public void         set_LATCH()     { type |= NetConst.LATCH_OUT_MASK; }
+        public void         set_COMB()      { type |= NetConst.COMB_MASK; }
+    }
+
+    class NetList : SATCommon
+    {
+        public string           name;
+        public ObjVector        nodes           = new ObjVector(128);
+        public IntVector        primary_inputs  = new IntVector(4);
+        public IntVector        primary_outputs = new IntVector(4);
+        public IntVector        latches         = new IntVector(4);
+        public IntVector        combs           = new IntVector(4);
+        public IntVector        inputs          = new IntVector(4);     //include PI and latch's outputs
+        public IntVector        outputs         = new IntVector(4); //include PO and latch's inputs
+        public MyHashtable      name2nodeid     = new MyHashtable();
+
+        public Gate node (int k)
+        {
+            return (Gate)nodes[k];
+        }
+
+        Gate new_node(string name)
+        {
+            Gate node = new Gate();
+            node.name = name;;
+            node.index = nodes.size();
+            nodes.push_back(node);
+            name2nodeid[name] = node.index;
+            return node;
+        }
+
+        Gate find_node_by_name(string name)
+        {
+            object o = name2nodeid[name];
+            if (o == null)
+                return null;
+            else
+                return (Gate)nodes[(int)o];
+        }
+
+        Gate create_pi(string name)
+        {
+            Gate n;
+            if ( (n = find_node_by_name(name)) != null)
+            {
+                sharp_assert (n.is_PI());
+                return n;
+            }
+            n = new_node(name);
+            n.set_PI();
+            return n;
+        }
+
+        Gate create_po(string name)
+        {
+            Gate n;
+            if ((n = find_node_by_name(name)) == null)
+                n = new_node(name);
+            n.set_PO();
+            return n;
+        }
+
+        Gate create_latch(string latch_in, string latch_out, ELatchDefault deft)
+        {
+            Gate n;
+            if ((n = find_node_by_name(latch_out)) == null)
+                n = new_node(latch_out);
+            //int id = n.index;
+            sharp_assert (n.fanin_names.empty());
+            n.fanin_names.push_back(latch_in);
+            n.latch_default = deft;
+            n.set_LATCH();
+            return n;
+        }
+
+        Gate create_comb(string name, string [] inputs)
+        {
+            Gate n;
+            if ( (n = find_node_by_name(name)) == null)
+                n = new_node(name);
+            //int id = n.index;
+            sharp_assert (n.fanin_names.empty());
+            foreach (string s in inputs)
+                n.fanin_names.push_back(s);
+            n.set_COMB();
+            return n;
+        }
+
+        static string get_multiple_line (StreamReader input)
+        {
+            string line = null;
+            StringBuilder str = new StringBuilder();
+            while (true)
+            {
+                try
+                {
+                    line = input.ReadLine();
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("The file could not be read:");
+                    Console.WriteLine(e.Message);
+                    fatal();
+                }
+                if (line == null)
+                    return null;
+                if (line.IndexOf('\\') == -1)
+                {
+                    str.Append(line);
+                    return str.ToString();
+                }
+                else
+                    str.Append(line.Replace('\\',' '));
+            }
+        }
+
+        void finalize_construct_network()
+        {
+            for ( int i=0; i< nodes.size(); ++i)
+            {
+                Gate n = node(i);
+                for ( int j=0; j< n.fanin_names.size(); ++j)
+                {
+                    string name = (string)n.fanin_names[j];
+                    Gate pin = find_node_by_name(name);
+                    sharp_assert (pin != null);
+                    n.fanins.push_back(pin.index);
+                    pin.fanouts.push_back(n.index);
+                    if (n.is_LATCH())
+                        pin.set_LATCH_IN();
+                }
+            }
+            for ( int i=0; i< nodes.size(); ++i)
+            {
+                Gate n = node(i);
+                if (n.is_PI())
+                    primary_inputs.push_back(n.index);
+                if (n.is_PI() || n.is_LATCH())
+                    inputs.push_back(n.index);
+                if (n.is_PO())
+                    primary_outputs.push_back(n.index);
+                if (n.is_PO() || n.is_LATCH_IN())
+                    outputs.push_back(n.index);
+                if (n.is_LATCH())
+                    latches.push_back(n.index);
+                if (n.is_COMB())
+                    combs.push_back(n.index);
+            }
+        }
+
+        public void read_blif (string filename)
+        {
+            StreamReader input = null;
+            ObjVector lines = new ObjVector(128);
+            try
+            {
+                input = new StreamReader(filename);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("The file could not be read:");
+                Console.WriteLine(e.Message);
+                fatal();
+            }
+            while (true)
+            {
+                string line = get_multiple_line(input);
+                if (line == null)
+                    break;
+                lines.push_back(line);
+                if (line == ".end")
+                    break;
+            }
+            for ( int i=0; i< lines.size(); ++i)
+            {
+                string line = (string)lines[i];
+                string [] temp_tokens = line.Split(new char[] {' ','\t'});
+                int total_tokens = 0;
+                foreach (string str in temp_tokens)
+                    if (str != String.Empty)
+                        ++ total_tokens;
+                if (total_tokens == 0)
+                    continue;
+                string [] tokens = new string[total_tokens];
+                foreach (string str in temp_tokens)
+                {
+                    if (str != String.Empty)
+                    {
+                        tokens[tokens.Length - total_tokens] = str;
+                        -- total_tokens;
+                    }
+                }
+                string first_token = tokens[0];
+                if (first_token == ".model")
+                {
+                    this.name = tokens[1];
+                }
+                else if (first_token == ".inputs")
+                {
+                    for ( int k=1; k< tokens.Length; ++k)
+                        create_pi(tokens[k]);
+                }
+                else if (first_token == ".outputs")
+                {
+                    for ( int k=1; k< tokens.Length; ++k)
+                        create_po(tokens[k]);
+                }
+                else if (first_token == ".latch")
+                {
+                    sharp_assert (tokens.Length == 3 || tokens.Length == 4);
+                    ELatchDefault dft_v = ELatchDefault.LATCH_X;
+                    if (tokens.Length == 4)
+                    {
+                        string last_token = tokens[3];
+                        sharp_assert (last_token.Length == 1);
+                        dft_v = (ELatchDefault) Int32.Parse(last_token);
+                    }
+                    create_latch(tokens[1], tokens[2], dft_v);
+                }
+                else if (first_token == ".names")
+                {
+                    string [] inputs = new string [tokens.Length - 2];
+                    sharp_assert (inputs.Length == 1 || inputs.Length == 2);
+                    string name = tokens[tokens.Length - 1];
+                    for ( int k=1; k< tokens.Length - 1; ++k)
+                        inputs[k-1] = tokens[k];
+                    Gate node = create_comb(name, inputs);
+
+                    if ((string)lines[i+1] == "1 1" &&
+                        (string)lines[i+2] == "0 1" )
+                    {
+                        node.gate_type = EGateType.G_CONST_1;
+                        i+=2;
+                    }
+                    else if ((string)lines[i+1] == "1 1")
+                    {
+                        warning ("A gate is a wire, sweep first ");
+                        node.gate_type = EGateType.G_WIRE;      ++ i;
+                    }
+                    else if ((string)lines[i+1] == "0 1")
+                    {
+                        node.gate_type = EGateType.G_NOT;   ++ i;
+                    }
+                    else if ((string)lines[i+1] == "11 1")
+                    {
+                        node.gate_type = EGateType.G_AND_11;    ++ i;
+                    }
+                    else if ((string)lines[i+1] == "10 1")
+                    {
+                        node.gate_type = EGateType.G_AND_10;    ++ i;
+                    }
+                    else if ((string)lines[i+1] == "01 1")
+                    {
+                        node.gate_type = EGateType.G_AND_01;    ++ i;
+                    }
+                    else if ((string)lines[i+1] == "00 1")
+                    {
+                        node.gate_type = EGateType.G_AND_00;    ++ i;
+                    }
+                    else if ((string)lines[i+1] == "0- 1" &&
+                        (string)lines[i+2] == "-0 1")
+                    {
+                        node.gate_type = EGateType.G_OR_00; i+=2;
+                    }
+                    else if ((string)lines[i+1] == "0- 1" &&
+                        (string)lines[i+2] == "-1 1")
+                    {
+                        node.gate_type = EGateType.G_OR_01; i+=2;
+                    }
+                    else if ((string)lines[i+1] == "1- 1" &&
+                        (string)lines[i+2] == "-0 1")
+                    {
+                        node.gate_type = EGateType.G_OR_10; i+=2;
+                    }
+                    else if ((string)lines[i+1] == "1- 1" &&
+                        (string)lines[i+2] == "-1 1")
+                    {
+                        node.gate_type = EGateType.G_OR_11; i+=2;
+                    }
+                    else
+                    {
+                        fatal ("Don't know gate type for " + line);
+                    }
+                    sharp_assert ( ((string)lines[i+1])[0] == '.');
+                }
+                else if (first_token == ".end")
+                {
+                    break;
+                }
+                else if (first_token == ".wire_load_slope")
+                {
+                    warning("Warning: Ignoring " + first_token);
+                }
+                else if (first_token[0] == '.')
+                {
+                    fatal (first_token + ": Unable to handle this keyword");
+                }
+            }
+            finalize_construct_network();
+        }
+
+        public void write_blif(string filename)
+        {
+            StreamWriter outfile = new StreamWriter(filename);
+            outfile.WriteLine ( ".model " + this.name );
+
+            outfile.Write ( ".inputs" );
+            for ( int i=0; i< primary_inputs.size(); ++i)
+                outfile.Write ( " " + node(primary_inputs[i]).name) ;
+            outfile.WriteLine ();
+
+            outfile.Write ( ".outputs" );
+            for ( int i=0; i< primary_outputs.size(); ++i)
+                outfile.Write ( " " + node(primary_outputs[i]).name) ;
+            outfile.WriteLine ();
+
+            for ( int i=0; i< latches.size(); ++i)
+            {
+                Gate n = node(latches[i]);
+                outfile.WriteLine ( ".latch " + node(n.fanins[0]).name + " " + n.name + " " + (int) n.latch_default );
+            }
+            for ( int i=0; i< combs.size(); ++i)
+            {
+                Gate n = node(combs[i]);
+                outfile.Write ( ".names");
+                for ( int j=0; j< n.fanins.size(); ++j)
+                    outfile.Write ( " " + node(n.fanins[j]).name);
+                outfile.WriteLine (" " + n.name );
+                if (n.gate_type == EGateType.G_NOT)
+                    outfile.WriteLine ( "0 1" );
+                else if (n.gate_type == EGateType.G_AND_11)
+                    outfile.WriteLine ( "11 1" );
+                else if (n.gate_type == EGateType.G_AND_10)
+                    outfile.WriteLine ( "10 1" );
+                else if (n.gate_type == EGateType.G_AND_01)
+                    outfile.WriteLine ( "01 1" );
+                else if (n.gate_type == EGateType.G_AND_00)
+                    outfile.WriteLine ( "00 1" );
+                else if (n.gate_type == EGateType.G_OR_11)
+                    outfile.WriteLine ( "1- 1" + '\n' + "-1 1" );
+                else if (n.gate_type == EGateType.G_OR_10)
+                    outfile.WriteLine ( "1- 1" + '\n' + "-0 1" );
+                else if (n.gate_type == EGateType.G_OR_01)
+                    outfile.WriteLine ( "0- 1" + '\n' + "-1 1" );
+                else if (n.gate_type == EGateType.G_OR_00)
+                    outfile.WriteLine ( "0- 1" + '\n' + "-0 1" );
+//              else if (n.gate_type == EGateType.G_EQUAL)
+//                  outfile.WriteLine ( "11 1" + '\n' + "00 1" );
+                else if (n.gate_type == EGateType.G_CONST_1)
+                    outfile.WriteLine ( "1 1" + '\n' + "0 1" );
+                else if (n.gate_type == EGateType.G_WIRE)
+                    outfile.WriteLine ( "1 1" + '\n' + "0 0" );
+                else
+                    fatal ("Unknown gate type" );
+            }
+            outfile.WriteLine ( ".end" );
+            outfile.Close();
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/constants.cs b/base/Applications/Benchmarks/sharpSAT/constants.cs
new file mode 100644
index 0000000..9478dd3
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/constants.cs
@@ -0,0 +1,252 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    public class SATCommon
+    {
+        private static void print_stack ()
+        {
+            /* HACKHACK unavailable on Singularity
+            Console.WriteLine("Stack Trace:");
+            StackTrace st = new StackTrace(true);
+            for(int i =0; i< st.FrameCount; i++ )
+            {
+                StackFrame sf = st.GetFrame(i);
+                Console.WriteLine("\t{0}  at File: {1} Line: {2} ",
+                                    sf.GetMethod() ,
+                                    sf.GetFileName(),
+                                    sf.GetFileLineNumber());
+            }
+            */
+        }
+
+        public static void sharp_assert (bool is_true)
+        {
+            if (!is_true)
+            {
+                Console.WriteLine("\nAssertion Failed" );
+                print_stack();
+                System.Environment.Exit(1);
+            }
+
+        }
+
+        public static void warning (string msg)
+        {
+            Console.Write("\nWarning:" );
+            Console.WriteLine(msg);
+        }
+
+        public static void fatal ()
+        {
+            Console.WriteLine("\nFatal Error" );
+            print_stack();
+            System.Environment.Exit(2);
+        }
+
+        public static void fatal (string msg)
+        {
+            Console.WriteLine ("Fatal Error: {0}", msg);
+            print_stack();
+            System.Environment.Exit(2);
+        }
+
+        public static string StatusToString(SATStatus status)
+        {
+            switch (status) {
+                case SATStatus.UNDETERMINED: return "UNDETERMINED";
+                case SATStatus.UNSATISFIABLE: return "UNSATISFIABLE";
+                case SATStatus.SATISFIABLE: return "SATISFIABLE";
+                case SATStatus.TIME_OUT: return "TIME";
+                case SATStatus.MEM_OUT: return "MEM";
+                case SATStatus.ABORTED: return "ABORTED";
+            }
+
+            return "UNKNOWN_RESULT";
+        }
+
+        public static int NEGATE (int s)            { return s^1; }
+        public static int NON_NEGATED (int s)       { return s&(~1);}
+        public static int SIGN (int s)              { return s & 1; }
+        public static int NODE_ID (int s)           { return s >> 1; }
+        public static int VID (int s)               { return s >> 1; }
+        public static bool IS_NEGATED(int s)        { return (s&1) == 1; }
+
+        public const int INVALID        = -1;
+        public const int UNKNOWN        = 2;
+        public const int WORD_WIDTH     = 16;
+        public const int UIDSHIFT       = 27;
+
+    }
+
+    public enum ImpType : sbyte
+    {
+        NONE,
+        CLAUSE,
+        NODE,
+        PB,
+    }
+
+    public enum ClType : sbyte
+    {
+        UNKNOWN,
+        ORIGINAL,
+        CONFLICT,
+        BLOCKING,
+        TEMP,
+        DELETED
+    }
+
+    public enum NodeType : sbyte
+    {
+        UNKNOWN,
+        VARIABLE,
+        CONSTANT,
+        PI,
+        AND,
+        XOR,
+        FREE,
+    }
+
+    public enum SATStatus
+    {
+        UNDETERMINED,
+        UNSATISFIABLE,
+        SATISFIABLE,
+        TIME_OUT,
+        MEM_OUT,
+        ABORTED
+    }
+
+    public struct SolverStats
+    {
+        public bool     been_reset              ;
+        public bool     active_area_changed     ;
+        public int      constraint_zero         ;
+        public bool     is_solving              ;
+        public SATStatus outcome                ;
+        public bool     is_mem_out              ;
+        public double   start_cpu_time          ;
+        public double   finish_cpu_time         ;
+
+        public double   total_cpu_time          ;
+        public int      num_rounds              ;
+        public int      num_free_variables      ;
+        public int      num_free_branch_vars    ;
+        public int      num_decisions           ;
+        public int      num_conflicts           ;
+        public int      num_backtracks          ;
+        public int      max_dlevel              ;
+        public long     num_implications        ;
+
+        public int      num_cls_vars            ;
+        public int      num_orig_clauses        ;
+        public int      num_orig_literals       ;
+        public int      num_learned_clauses     ;
+        public long     num_learned_literals    ;
+        public int      num_deleted_clauses     ;
+        public long     num_deleted_literals    ;
+
+        public int      next_restart;
+        public int      next_gc;
+        public int      next_decay;
+
+        public int      num_restarts;
+        public int      num_garbage_collections;
+
+        public int      marked_current_dl;
+
+        public SolverStats (bool do_init)
+        {
+            //regardless of the input, we have to init
+            been_reset              = true;
+            active_area_changed     = true;
+            constraint_zero         = 0;
+            is_solving              = false;
+            outcome                 = SATStatus.UNDETERMINED;
+            is_mem_out              = false;
+            start_cpu_time          = 0;
+            finish_cpu_time         = 0;
+
+            total_cpu_time          = 0;
+            num_rounds              = 0;
+            num_free_variables      = 0;
+            num_free_branch_vars    = 0;
+            num_decisions           = 0;
+            num_conflicts           = 0;
+            num_backtracks          = 0;
+            max_dlevel              = 0;
+            num_implications        = 0;
+
+            num_cls_vars            = 0;
+            num_orig_clauses        = 0;
+            num_orig_literals       = 0;
+            num_learned_clauses     = 0;
+            num_learned_literals    = 0;
+            num_deleted_clauses     = 0;
+            num_deleted_literals    = 0;
+
+            next_restart            = 0;
+            next_gc                 = 0;
+            next_decay              = 0;
+
+            num_restarts            = 0;
+            num_garbage_collections = 0;
+
+            marked_current_dl       = 0;
+        }
+    }
+
+    public struct SolverParams
+    {
+        public double           time_limit;
+        public long             mem_limit;
+
+        public bool             enable_restart;
+        public int              first_restart;
+        public int              restart_period;
+
+        public bool             enable_gc;
+        public int              gc_period;
+        public int              gc_head_threshold;
+        public int              gc_tail_threshold;
+        public int              gc_head_length;
+        public int              gc_tail_length;
+        public int              gc_head_tail_ratio;
+
+        public int              decay_period;
+
+        //public bool               reason_on_trans_fanin_only;
+
+        public SolverParams (bool init)
+        {
+            time_limit          = 24 * 3600;
+            mem_limit           = 1024 * 1024 * 512;
+
+            enable_restart      = true;
+            first_restart       = 7000;
+            restart_period      = 700;
+
+            enable_gc           = true;
+            gc_period           = 600;
+            gc_head_threshold   = 500;
+            gc_tail_threshold   = 10;
+            gc_head_length      = 6;
+            gc_tail_length      = 45;
+            gc_head_tail_ratio  = 16;
+
+            decay_period        = 40;
+            //reason_on_trans_fanin_only = false;
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/core_extraction.cs b/base/Applications/Benchmarks/sharpSAT/core_extraction.cs
new file mode 100644
index 0000000..a2ed5a5
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/core_extraction.cs
@@ -0,0 +1,927 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    sealed class ResolveNode : SATCommon
+    {
+        public int  uid;
+        public int [] reasons;
+
+        public ResolveNode () {}
+        public ResolveNode (int r, int [] antes)
+        {
+            uid = r;
+            reasons = antes;
+        }
+
+        public int footprint()
+        {
+            return (3 + reasons.Length) * 4;
+        }
+
+        public void Serialize (Stream stream)
+        {
+            stream.Seek (0, SeekOrigin.End);
+            BinaryWriter bw = new BinaryWriter ( stream );
+            bw.Write (uid);
+            bw.Write (reasons.Length);
+            for (int i=0; i< reasons.Length; ++i)
+                bw.Write (reasons[i]);
+            bw.Write ( - reasons.Length);
+            bw.Flush();
+        }
+
+        static public ResolveNode DeSerializeForward (Stream stream)
+        {
+            BinaryReader br = new BinaryReader ( stream );
+            ResolveNode r = new ResolveNode();
+            r.uid = br.ReadInt32();
+            int len = br.ReadInt32();
+            r.reasons = new int [len];
+            for (int i=0; i< r.reasons.Length; ++i)
+                r.reasons[i] = br.ReadInt32();
+            int mlen = br.ReadInt32();
+            sharp_assert (mlen == - len);
+            return r;
+        }
+
+        static public ResolveNode DeSerializeBackward (Stream stream)
+        {
+            BinaryReader br = new BinaryReader ( stream );
+            ResolveNode r = new ResolveNode();
+            stream.Seek( -4, SeekOrigin.Current );
+            int l = br.ReadInt32();
+            sharp_assert (l < 0);
+            stream.Seek( - (-l + 3) * 4, SeekOrigin.Current );
+
+            r.uid = br.ReadInt32();
+            int len = br.ReadInt32();
+            r.reasons = new int [len];
+            for (int i=0; i< r.reasons.Length; ++i)
+                r.reasons[i] = br.ReadInt32();
+            int mlen = br.ReadInt32();
+            sharp_assert (mlen == - len);
+            stream.Seek( - (-l + 3) * 4, SeekOrigin.Current );
+            return r;
+        }
+    }
+
+    class ResolutionTrace : SATCommon
+    {
+        const int A_LOCAL = 1;
+        const int B_LOCAL = 2;
+        const int GLOBAL = (A_LOCAL | B_LOCAL);
+
+        private SharpSATSolver  solver      = null;
+        private bool            enable      = false;
+        private int             cache_limit = 1024 * 1024 * 4; // 4 meg
+        private ResolveNode     empty       = null;
+        private Stream          storage     = new MemoryStream();
+        private string          filename    = "resolution.trace";
+        private IntVector       reasons     = new IntVector(4);
+
+        public ResolutionTrace (SharpSATSolver s )
+        {
+            solver = s;
+        }
+        public void enable_trace (bool e)
+        {
+            enable = e;
+        }
+
+        public void reset()
+        {
+            empty       = null;
+            if (storage != null)
+                storage.Close();
+            storage     = new MemoryStream();
+            reasons     = new IntVector(4);
+        }
+
+        public void set_cache_limit (int sz)
+        {
+            cache_limit = sz;
+        }
+        public void set_temp_file (string fname)
+        {
+            filename = fname;
+        }
+        public void add_reason (int uid)
+        {
+            reasons.push_back(uid);
+        }
+        public void set_resolvent (int uid)
+        {
+            if (enable)
+            {
+                ResolveNode nd = new ResolveNode (uid, reasons.ToArray());
+
+                if (storage is MemoryStream &&
+                    storage.Length + nd.footprint() > cache_limit) //out of cache, so use file
+                {
+                    Stream newstream = new FileStream (filename, FileMode.Create);
+                    MemoryStream memstream = storage as MemoryStream;
+                    byte [] buffer = memstream.ToArray();
+                    newstream.Write (buffer, 0, buffer.Length);
+                    storage = newstream;
+                }
+                nd.Serialize(storage);
+            }
+            reasons.clear();
+        }
+        public void set_empty_resolvents()
+        {
+            empty = new ResolveNode(-1, reasons.ToArray());
+        }
+
+        Clause clause(int cl_id) {
+            return solver.clause(cl_id);
+        }
+
+        public void dump_trace (string fname)
+        {
+            StreamWriter output = new StreamWriter (fname, false);
+            long oldpos = storage.Position;
+            storage.Seek(0, SeekOrigin.Begin);
+            while (storage.Position < storage.Length)
+            {
+                ResolveNode nd = ResolveNode.DeSerializeForward (storage);
+                output.Write ("{0} <== ", nd.uid);
+                foreach (int r in nd.reasons)
+                {
+                    if (is_node(r))
+                        output.Write(" {0}({1)}", node_uid(r), cls_idx(r));
+                    else
+                        output.Write (" {0}", r);
+                }
+                output.Write("\n");
+            }
+            output.Close();
+            storage.Seek (oldpos, SeekOrigin.Begin);
+        }
+
+        public MyHashtable generate_unsat_core()
+        {
+            if (empty == null)
+                fatal ("Not UNSAT, Cannot Generate Core");
+
+            MyHashtable hash = new MyHashtable();
+            foreach (int uid in empty.reasons)
+                hash.Add (uid, null);
+
+            long oldpos = storage.Position;
+            storage.Seek(0, SeekOrigin.End);
+            while (storage.Position > 0)
+            {
+                ResolveNode nd = ResolveNode.DeSerializeBackward (storage);
+                sharp_assert (!is_node(nd.uid));
+                if (hash.Contains (nd.uid))
+                {
+                    foreach (int id in nd.reasons)
+                    {
+                        int uid = id;
+                        if (is_node(id))
+                            uid = node_uid(id);
+                        if (!hash.Contains(uid))
+                            hash.Add (uid, null);
+                    }
+                    hash.Remove (nd.uid);
+                }
+            }
+            storage.Seek (oldpos, SeekOrigin.Begin);
+            return hash;
+        }
+
+        int find_pivot (int [] cl1, int [] cl2)
+        {
+            int [] combined = new int [ cl1.Length + cl2.Length ];
+            Array.Copy (cl1, 0, combined, 0, cl1.Length);
+            Array.Copy (cl2, 0, combined, cl1.Length, cl2.Length);
+            Array.Sort (combined);
+            for (int i=1; i< combined.Length; ++ i)
+                if (combined[i] == (combined[i-1]^1))
+                    return VID(combined[i]);
+            fatal ("No pivot variable? ");
+            return 0;
+        }
+
+        int [] resolve (int [] cl1, int [] cl2)
+        {
+            IntVector result = new IntVector(4);
+            int [] combined = new int [ cl1.Length + cl2.Length ];
+            Array.Copy (cl1, 0, combined, 0, cl1.Length);
+            Array.Copy (cl2, 0, combined, cl1.Length, cl2.Length);
+            Array.Sort (combined);
+
+            for (int i=0; i< combined.Length; ++ i)
+            {
+                if (result.empty())
+                    result.push_back (combined[i]);
+                else if (result.back == combined[i])
+                    continue;
+                else if (result.back == (combined[i] ^ 1))
+                    result.pop_back();
+                else
+                    result.push_back (combined[i]);
+            }
+            return result.ToArray();
+        }
+
+        int distance (int [] cl1, int [] cl2)
+        {
+            int [] combined = new int [ cl1.Length + cl2.Length ];
+            Array.Copy (cl1, 0, combined, 0, cl1.Length);
+            Array.Copy (cl2, 0, combined, cl1.Length, cl2.Length);
+            Array.Sort (combined);
+            int distance = 0;
+            for (int i=1; i< combined.Length; ++ i)
+            {
+                if (combined[i] == (combined[i-1] ^ 1))
+                {
+                    distance ++;
+                    i++;
+                }
+            }
+            return distance;
+        }
+
+        int [][] gen_gate_clause (int vid)
+        {
+            Variable var = solver.variable(vid);
+            int a = var.input(0);
+            int b = var.input(1);
+            int o = vid + vid;
+            sharp_assert (a != INVALID && b != INVALID);
+            int [][] result;
+            if (var.type == NodeType.AND)
+            {
+                result = new int [3][];
+                result[0] = new int [] { a, NEGATE(o)};
+                result[1] = new int [] { b, NEGATE(o)};
+                result[2] = new int [] { NEGATE(a), NEGATE(b), o};
+            }
+            else
+            {
+                sharp_assert (var.type == NodeType.XOR);
+                result = new int [4][];
+                result[0] = new int [] { NEGATE(a), b, o};
+                result[1] = new int [] { a, NEGATE(b), o};
+                result[2] = new int [] { a, b, NEGATE(o)};
+                result[3] = new int [] { NEGATE(a), NEGATE(b), NEGATE(o)};
+            }
+            return result;
+        }
+
+        MyHashtable find_all_involved()
+        {
+            if (empty == null)
+                fatal ("Not UNSAT, Cannot Generate Core");
+
+            MyHashtable hash = new MyHashtable();
+            foreach (int uid in empty.reasons)
+                hash.Add (uid, 1);
+
+            long oldpos = storage.Position;
+            storage.Seek(0, SeekOrigin.End);
+            while (storage.Position > 0)
+            {
+                ResolveNode nd = ResolveNode.DeSerializeBackward (storage);
+                if (hash.Contains (nd.uid))
+                    foreach (int uid in nd.reasons)
+                    {
+                        if (!hash.Contains(uid))
+                            hash[uid] = 1;
+                        else
+                            hash[uid] = (int)hash[uid] + 1;
+                    }
+            }
+            storage.Seek (oldpos, SeekOrigin.Begin);
+            return hash;
+        }
+
+        void prepare_original_clauses (int a_gid, int b_gid, MyHashtable uid2lits, MyHashtable uid2sig, MyHashtable involved, int[] var_flag)
+        {
+            for (int i=0; i< var_flag.Length; ++i)
+                var_flag[i] = 0;
+            for (int i=0; i< solver.clauses.size(); ++i)
+            {
+                Clause cl = clause(i);
+                if (cl == null || !involved.Contains(cl.uid))
+                    continue;
+
+                if (cl.type == ClType.ORIGINAL)
+                {
+                    if (cl.gid(a_gid))
+                    {
+                        sharp_assert (!cl.gid(b_gid));
+                        foreach (int lit in cl.literals)
+                            var_flag [VID(lit)] |= A_LOCAL;
+                    }
+                    else
+                    {
+                        sharp_assert (cl.gid(b_gid));
+                        foreach (int lit in cl.literals)
+                            var_flag [VID(lit)] |= B_LOCAL;
+                    }
+                }
+                uid2lits[cl.uid] = cl.literals;
+            }
+
+            for (int i=0; i< solver.original_clauses.size(); ++i)
+            {
+                Clause cl = clause(solver.original_clauses[i]);
+                sharp_assert (cl != null);
+                sharp_assert (cl.type == ClType.ORIGINAL);
+
+                if (!involved.Contains(cl.uid))
+                    continue;
+
+                int signal;
+                if (cl.gid(a_gid))
+                {
+                    sharp_assert (!cl.gid(b_gid));
+                    signal = solver.zero();
+                    foreach (int lit in cl.literals)
+                    {
+                        if (var_flag[VID(lit)] == GLOBAL)
+                            signal = solver.bor (signal, lit);
+                    }
+                }
+                else
+                {
+                    sharp_assert (cl.gid(b_gid));
+                    signal = solver.one();
+                }
+                uid2sig[cl.uid] = signal;
+            }
+        }
+
+        public int gen_interpolant_from_clauses (int a_gid, int b_gid)
+        {
+            //solver.dump_file = new StreamWriter ("dump_file");
+            //solver.dump_file.WriteLine ("{0} = INIT_VARS", solver.num_variables());
+
+            sharp_assert (solver.is_pure_clause_based());
+            solver.convert_vars_to_pi();
+
+            MyHashtable uid2lits    = new MyHashtable();
+            MyHashtable uid2sig = new MyHashtable();
+            MyHashtable involved    = find_all_involved();
+            int [] var_flag = new int [ solver.variables.size() ];
+            prepare_original_clauses ( a_gid, b_gid, uid2lits, uid2sig, involved, var_flag);
+
+            long oldpos = storage.Position;
+            storage.Seek(0, SeekOrigin.Begin);
+            while (storage.Position < storage.Length)
+            {
+                ResolveNode nd = ResolveNode.DeSerializeForward (storage);
+                if (!involved.Contains (nd.uid))
+                    continue;
+
+                int uid = nd.reasons[0];
+                sharp_assert (involved.Contains(uid));
+                sharp_assert (uid2lits.Contains(uid));
+                sharp_assert (uid2sig.Contains(uid));
+                int [] lits = (int[])uid2lits[uid];
+                int signal = (int)uid2sig[uid];
+
+                int count = (int)involved[uid] - 1 ;
+                if ( count == 0)
+                {
+                    uid2lits.Remove(uid);
+                    uid2sig.Remove(uid);
+                    involved.Remove(uid);
+                }
+                else
+                    involved[uid] = count;
+
+                for (int i=1; i< nd.reasons.Length; ++i)
+                {
+                    uid = nd.reasons[i];
+                    sharp_assert (uid < (1 << 29));
+                    sharp_assert (involved.Contains(uid));
+                    sharp_assert (uid2lits.Contains(uid));
+                    sharp_assert (uid2sig.Contains(uid));
+                    int [] lits1 = (int[]) uid2lits[uid];
+                    int signal1 = (int)uid2sig[uid];
+
+                    count = (int)involved[uid] - 1 ;
+                    if ( count == 0)
+                    {
+                        uid2lits.Remove(uid);
+                        uid2sig.Remove(uid);
+                        involved.Remove(uid);
+                    }
+                    else
+                        involved[uid] = count;
+
+                    int pivot = find_pivot (lits, lits1);
+                    lits = resolve(lits, lits1);
+                    if (var_flag[pivot] == A_LOCAL)
+                        signal = solver.bor (signal, signal1);
+                    else
+                        signal = solver.band (signal, signal1);
+                }
+                if (!uid2lits.Contains(nd.uid))
+                    uid2lits[nd.uid] = lits;
+                sharp_assert (!uid2sig.Contains(nd.uid));
+                uid2sig[nd.uid] = signal;
+
+            }
+            storage.Seek (oldpos, SeekOrigin.Begin);
+        {
+            int uid = empty.reasons[0];
+            sharp_assert (involved.Contains(uid));
+            sharp_assert (uid2lits.Contains(uid));
+            sharp_assert (uid2sig.Contains(uid));
+            int [] lits = (int[])uid2lits[uid];
+            int signal = (int)uid2sig[uid];
+
+            int count = (int)involved[uid] - 1 ;
+            if ( count == 0)
+            {
+                uid2lits.Remove(uid);
+                uid2sig.Remove(uid);
+                involved.Remove(uid);
+            }
+            else
+                involved[uid] = count;
+
+            for (int i=1; i< empty.reasons.Length; ++i)
+            {
+                uid = empty.reasons[i];
+                sharp_assert (involved.Contains(uid));
+                sharp_assert (uid2lits.Contains(uid));
+                sharp_assert (uid2sig.Contains(uid));
+                int [] lits1 = (int[]) uid2lits[uid];
+                int signal1 = (int)uid2sig[uid];
+
+                count = (int)involved[uid] - 1 ;
+                if ( count == 0)
+                {
+                    uid2lits.Remove(uid);
+                    uid2sig.Remove(uid);
+                    involved.Remove(uid);
+                }
+                else
+                    involved[uid] = count;
+
+                int pivot = find_pivot (lits, lits1);
+                lits = resolve(lits, lits1);
+                if (var_flag[pivot] == A_LOCAL)
+                    signal = solver.bor (signal, signal1);
+                else
+                    signal = solver.band (signal, signal1);
+            }
+            sharp_assert (lits.Length == 0);
+            sharp_assert (involved.Count == 0);
+            sharp_assert (uid2lits.Count == 0);
+            sharp_assert (uid2sig.Count == 0);
+            //solver.dump_file.WriteLine ("{0} = CONSTRAINT", signal);
+            //solver.dump_file.Close();
+            return signal;
+        }
+        }
+
+        bool is_node (int uid)
+        {
+            return (uid > (1<<UIDSHIFT));
+        }
+        int node_uid (int uid)
+        {
+            sharp_assert (is_node(uid));
+            return (~(3 << UIDSHIFT)) & uid;
+        }
+        int cls_idx(int uid)
+        {
+            sharp_assert (is_node(uid));
+            return uid >> UIDSHIFT;
+        }
+
+        int not (int s) { return s ^ 1; }
+
+        /* for AND
+        * 1: (a + c')
+        * 2: (b + c')
+        * 3: (a' + b' + c)
+        * for XOR
+        * 4: (a' + b + c)
+        * 5: (a + b' + c)
+        * 6: (a + b + c')
+        * 7: (a' + b' + c')
+        */
+
+        int [] get_cls (int vid, int cl_idx)
+        {
+            int [] result;
+            sharp_assert (solver.is_gate(vid + vid));
+            int a = solver.variable(vid).input(0);
+            int b = solver.variable(vid).input(1);
+            int c = vid + vid;
+            switch(cl_idx)
+            {
+                case 1:
+                    result = new int[]{a, not(c)};
+                    break;
+                case 2:
+                    result = new int[]{b, not(c)};
+                    break;
+                case 3:
+                    result = new int[]{not(a), not(b), c};
+                    break;
+                case 4:
+                    result = new int[]{not(a), b, c};
+                    break;
+                case 5:
+                    result = new int[]{a, not(b), c};
+                    break;
+                case 6:
+                    result = new int[]{a, b, not(c)};
+                    break;
+                case 7:
+                    result = new int[]{not(a), not(b), not(c)};
+                    break;
+                default:
+                    sharp_assert (false);
+                    result = null;
+                    break;
+            }
+            return result;
+        }
+
+        void prepare_original_nodes (int a_flag, int b_flag, MyHashtable uid2lits, MyHashtable uid2sig, MyHashtable involved)
+        {
+            MyHashtable uid2vid = new MyHashtable();
+
+            for (int i=1; i< solver.variables.size(); ++i)
+            {
+                Variable var = solver.variable(i);
+                if (var != null && (var.flag(a_flag) || var.flag(b_flag)))
+                    uid2vid[var.uid] = i;
+            }
+
+            foreach (object obj in involved)
+            {
+                int uid = (int)((DictionaryEntry) obj).Key;
+                if (!is_node(uid) || !uid2vid.Contains(node_uid(uid)))
+                    continue;
+                int nid = node_uid (uid);
+                int cls_id = cls_idx (uid);
+                int vid = (int) uid2vid[nid];
+                int [] lits = get_cls(vid, cls_id);
+                int sig;
+                sharp_assert (solver.variable(vid).flag(a_flag) || solver.variable(vid).flag(b_flag));
+                if (solver.variable(vid).flag(b_flag))
+                    sig = solver.one();
+                else
+                {
+                    sig = solver.zero();
+                    foreach (int lit in lits)
+                    {
+                        sharp_assert (solver.node(lit).flag(a_flag));
+                        if (solver.node(lit).flag(b_flag))
+                            sig = solver.bor(sig, lit);
+                    }
+                }
+                uid2lits[uid] = lits;
+                uid2sig[uid] = sig;
+            }
+        }
+
+        public int gen_interpolant_from_signals (int a_node, int a_cls_id, int b_node, int b_cls_id)
+        {
+            //solver.dump_file = new StreamWriter ("dump_file");
+            //solver.dump_file.WriteLine ("{0} = INIT_VARS", solver.num_variables());
+
+            int a_flag = solver.alloc_flag();
+            int b_flag = solver.alloc_flag();
+            solver.mark_transitive_fanins(a_node, a_flag);
+            solver.mark_transitive_fanins(b_node, b_flag);
+
+            MyHashtable uid2lits    = new MyHashtable();
+            MyHashtable uid2sig = new MyHashtable();
+            MyHashtable involved    = find_all_involved();
+            prepare_original_nodes (a_flag, b_flag, uid2lits, uid2sig, involved);
+            uid2lits[solver.clause(a_cls_id).uid] = solver.clause(a_cls_id).literals;
+            uid2lits[solver.clause(b_cls_id).uid] = solver.clause(b_cls_id).literals;
+            if (solver.node(a_node).flag(b_flag))
+                uid2sig[solver.clause(a_cls_id).uid] = a_node;
+            else
+                uid2sig[solver.clause(a_cls_id).uid] = solver.zero();
+            uid2sig[solver.clause(b_cls_id).uid] = solver.one();
+
+            long oldpos = storage.Position;
+            storage.Seek(0, SeekOrigin.Begin);
+            while (storage.Position < storage.Length)
+            {
+                ResolveNode nd = ResolveNode.DeSerializeForward (storage);
+                if (!involved.Contains (nd.uid))
+                    continue;
+
+                int [] lits;
+                int signal;
+                int uid = nd.reasons[0];
+                sharp_assert (involved.Contains(uid));
+                sharp_assert (uid2sig.Contains(uid));
+                lits = (int[])uid2lits[uid];
+                signal = (int)uid2sig[uid];
+
+                int count = (int)involved[uid] - 1 ;
+                if ( count == 0)
+                {
+                    uid2lits.Remove(uid);
+                    uid2sig.Remove(uid);
+                    involved.Remove(uid);
+                }
+                else
+                    involved[uid] = count;
+
+                for (int i=1; i< nd.reasons.Length; ++i)
+                {
+                    uid = nd.reasons[i];
+                    sharp_assert (uid < (1 << 29));
+                    sharp_assert (involved.Contains(uid));
+                    sharp_assert (uid2lits.Contains(uid));
+                    sharp_assert (uid2sig.Contains(uid));
+                    int [] lits1 = (int[]) uid2lits[uid];
+                    int signal1 = (int)uid2sig[uid];
+
+                    count = (int)involved[uid] - 1 ;
+                    if ( count == 0)
+                    {
+                        uid2lits.Remove(uid);
+                        uid2sig.Remove(uid);
+                        involved.Remove(uid);
+                    }
+                    else
+                        involved[uid] = count;
+
+                    int pivot = find_pivot (lits, lits1);
+                    lits = resolve(lits, lits1);
+                    if (!solver.variable(pivot).flag(b_flag))
+                    {
+                        sharp_assert (solver.variable(pivot).flag(a_flag));
+                        signal = solver.bor (signal, signal1);
+                    }
+                    else
+                        signal = solver.band (signal, signal1);
+                }
+                if (!uid2lits.Contains(nd.uid))
+                    uid2lits[nd.uid] = lits;
+                sharp_assert (!uid2sig.Contains(nd.uid));
+                uid2sig[nd.uid] = signal;
+            }
+            storage.Seek (oldpos, SeekOrigin.Begin);
+        {
+            int uid = empty.reasons[0];
+            sharp_assert (involved.Contains(uid));
+            sharp_assert (uid2lits.Contains(uid));
+            sharp_assert (uid2sig.Contains(uid));
+            int [] lits = (int[])uid2lits[uid];
+            int signal = (int)uid2sig[uid];
+
+            int count = (int)involved[uid] - 1 ;
+            if ( count == 0)
+            {
+                uid2lits.Remove(uid);
+                uid2sig.Remove(uid);
+                involved.Remove(uid);
+            }
+            else
+                involved[uid] = count;
+
+            for (int i=1; i< empty.reasons.Length; ++i)
+            {
+                uid = empty.reasons[i];
+                sharp_assert (involved.Contains(uid));
+                sharp_assert (uid2lits.Contains(uid));
+                sharp_assert (uid2sig.Contains(uid));
+                int [] lits1 = (int[]) uid2lits[uid];
+                int signal1 = (int)uid2sig[uid];
+
+                count = (int)involved[uid] - 1 ;
+                if ( count == 0)
+                {
+                    uid2lits.Remove(uid);
+                    uid2sig.Remove(uid);
+                    involved.Remove(uid);
+                }
+                else
+                    involved[uid] = count;
+
+                int pivot = find_pivot (lits, lits1);
+                lits = resolve(lits, lits1);
+                if (!solver.variable(pivot).flag(b_flag))
+                {
+                    sharp_assert (solver.variable(pivot).flag(a_flag));
+                    signal = solver.bor (signal, signal1);
+                }
+                else
+                    signal = solver.band (signal, signal1);
+            }
+            sharp_assert (lits.Length == 0);
+            sharp_assert (involved.Count == 0);
+            sharp_assert (uid2lits.Count == 0);
+            sharp_assert (uid2sig.Count == 0);
+            //solver.dump_file.WriteLine ("{0} = CONSTRAINT", signal);
+            //solver.dump_file.Close();
+
+            solver.free_flag(a_flag);
+            solver.free_flag(b_flag);
+            return signal;
+        }
+        }
+        // gretay -- change start
+        public int gen_interpolant_from_signals_ex (int a_node, int a_cls_id, int b_node, int b_cls_id, int[] c_cls_id, int[] c_interp)
+        {
+            //solver.dump_file = new StreamWriter ("dump_file");
+            //solver.dump_file.WriteLine ("{0} = INIT_VARS", solver.num_variables());
+
+            int a_flag = solver.alloc_flag();
+            int b_flag = solver.alloc_flag();
+            solver.mark_transitive_fanins(a_node, a_flag);
+            solver.mark_transitive_fanins(b_node, b_flag);
+
+            assert(c_cls_id.Length == c_interp.Length);
+
+            MyHashtable uid2lits    = new MyHashtable();
+            MyHashtable uid2sig = new MyHashtable();
+            MyHashtable involved    = find_all_involved();
+            prepare_original_nodes (a_flag, b_flag, uid2lits, uid2sig, involved);
+
+            // init A info
+            int a_uid = solver.clause(a_cls_id).uid;
+            if (involved.Contains(a_uid))
+            {
+                uid2lits[a_uid] = solver.clause(a_cls_id).literals;
+                int s = solver.zero();
+                foreach (int lit in solver.clause(a_cls_id).literals)
+                {
+                    sharp_assert (solver.node(lit).flag(a_flag));
+                    if (solver.node(lit).flag(b_flag))
+                        s = solver.bor(s, lit);
+                }
+                uid2sig[a_uid] = s;
+                //uid2sig[a_uid] = a_node;
+            }
+            // init B info
+            int b_uid = solver.clause(b_cls_id).uid;
+            if (involved.Contains(b_uid))
+            {
+                uid2lits[b_uid] = solver.clause(b_cls_id).literals;
+                uid2sig[b_uid] = solver.one();
+            }
+            // init C info
+            for (int i = 0; i < c_cls_id.Length; i++ )
+            {
+                Clause cl = solver.clause(c_cls_id[i]);
+                if (involved.Contains(cl.uid))
+                {
+                    uid2lits[cl.uid] = cl.literals;
+                    uid2sig[cl.uid] = c_interp[i];
+                }
+            }
+
+            long oldpos = storage.Position;
+            storage.Seek(0, SeekOrigin.Begin);
+            while (storage.Position < storage.Length)
+            {
+                ResolveNode nd = ResolveNode.DeSerializeForward (storage);
+                if (!involved.Contains (nd.uid))
+                    continue;
+
+                int [] lits;
+                int signal;
+                int uid = nd.reasons[0];
+                sharp_assert (involved.Contains(uid));
+                sharp_assert (uid2sig.Contains(uid));
+                lits = (int[])uid2lits[uid];
+                signal = (int)uid2sig[uid];
+
+                int count = (int)involved[uid] - 1 ;
+                if ( count == 0)
+                {
+                    uid2lits.Remove(uid);
+                    uid2sig.Remove(uid);
+                    involved.Remove(uid);
+                }
+                else
+                    involved[uid] = count;
+
+                for (int i=1; i< nd.reasons.Length; ++i)
+                {
+                    uid = nd.reasons[i];
+                    sharp_assert (uid < (1 << 29));
+                    sharp_assert (involved.Contains(uid));
+                    sharp_assert (uid2lits.Contains(uid));
+                    sharp_assert (uid2sig.Contains(uid));
+                    int [] lits1 = (int[]) uid2lits[uid];
+                    int signal1 = (int)uid2sig[uid];
+
+                    count = (int)involved[uid] - 1 ;
+                    if ( count == 0)
+                    {
+                        uid2lits.Remove(uid);
+                        uid2sig.Remove(uid);
+                        involved.Remove(uid);
+                    }
+                    else
+                        involved[uid] = count;
+
+                    int pivot = find_pivot (lits, lits1);
+                    lits = resolve(lits, lits1);
+                    if ( (solver.variable(pivot).flag(a_flag))
+                        && (!solver.variable(pivot).flag(b_flag)))
+                    {
+                        signal = solver.bor (signal, signal1);
+                    }
+                    else
+                    {
+                        signal = solver.band (signal, signal1);
+                    }
+                }
+                if (!uid2lits.Contains(nd.uid))
+                    uid2lits[nd.uid] = lits;
+                sharp_assert (!uid2sig.Contains(nd.uid));
+                uid2sig[nd.uid] = signal;
+
+            }
+            storage.Seek (oldpos, SeekOrigin.Begin);
+        {
+            int uid = empty.reasons[0];
+            sharp_assert (involved.Contains(uid));
+            sharp_assert (uid2lits.Contains(uid));
+            sharp_assert (uid2sig.Contains(uid));
+            int [] lits = (int[])uid2lits[uid];
+            int signal = (int)uid2sig[uid];
+
+            int count = (int)involved[uid] - 1 ;
+            if ( count == 0)
+            {
+                uid2lits.Remove(uid);
+                uid2sig.Remove(uid);
+                involved.Remove(uid);
+            }
+            else
+                involved[uid] = count;
+
+            for (int i=1; i< empty.reasons.Length; ++i)
+            {
+                uid = empty.reasons[i];
+                sharp_assert (involved.Contains(uid));
+                sharp_assert (uid2lits.Contains(uid));
+                sharp_assert (uid2sig.Contains(uid));
+                int [] lits1 = (int[]) uid2lits[uid];
+                int signal1 = (int)uid2sig[uid];
+
+                count = (int)involved[uid] - 1 ;
+                if ( count == 0)
+                {
+                    uid2lits.Remove(uid);
+                    uid2sig.Remove(uid);
+                    involved.Remove(uid);
+                }
+                else
+                    involved[uid] = count;
+
+                int pivot = find_pivot (lits, lits1);
+                lits = resolve(lits, lits1);
+
+                if ( (solver.variable(pivot).flag(a_flag))
+                    && (!solver.variable(pivot).flag(b_flag)))
+                {
+                    signal = solver.bor (signal, signal1);
+                }
+                else
+                {
+                    signal = solver.band (signal, signal1);
+                }
+            }
+            sharp_assert (lits.Length == 0);
+            sharp_assert (involved.Count == 0);
+            sharp_assert (uid2lits.Count == 0);
+            sharp_assert (uid2sig.Count == 0);
+            //solver.dump_file.WriteLine ("{0} = CONSTRAINT", signal);
+            //solver.dump_file.Close();
+
+            solver.free_flag(a_flag);
+            solver.free_flag(b_flag);
+            //solver.free_flag(c_flag);
+            return signal;
+        }
+        }
+        // gretay -- change end
+
+    }
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/main.cs b/base/Applications/Benchmarks/sharpSAT/main.cs
new file mode 100644
index 0000000..3f4d3a5
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/main.cs
@@ -0,0 +1,699 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text;
+using System.IO;
+using SharpSAT;
+//using Microsoft.Zap;
+namespace SharpSATTest
+{
+    public class SATSolverTests : SATCommon
+    {
+        /* a helper function */
+        static private string getToken(string [] tokens, ref int index)
+        {
+            for (; index < tokens.Length; )
+            {
+                ++index;
+                if (tokens[index - 1] != String.Empty)
+                    return tokens[index -1];
+            }
+            return null;
+        }
+
+        /* this demonstrate the structure interface */
+        static void test_structure_solver (string[] args)
+        {
+            SATSolver solver = new SATSolver();
+            int a = solver.CreatePI();
+            int b = solver.CreatePI();
+            int c = solver.CreatePI();
+            //int d = solver.CreatePI();
+            int xor_a_b = solver.Xor(a, b);
+            int not_a = solver.Not(a);
+            int not_b = solver.Not(b);
+            int and_a_not_b = solver.And (a, not_b);
+            int and_b_not_a = solver.And (b, not_a);
+            int xor_a_b_p = solver.Or(and_a_not_b, and_b_not_a);
+            int miter = solver.Xor(xor_a_b, xor_a_b_p);
+            SATStatus r = solver.TestSAT(miter);
+            System.Console.WriteLine ("Test Right {0}", r.ToString());
+
+            int and_a_b = solver.And (a, b);
+            int xor_a_b_wrong = solver.Or (and_a_not_b, and_a_b);
+            int miter1 = solver.Xor(xor_a_b, xor_a_b_wrong);
+            r = solver.TestSAT(miter1);
+            System.Console.WriteLine ("Test Wrong {0}", r.ToString());
+
+            int and_a_b_c = solver.And (solver.And(a,b), c);
+
+            int flag = solver.AllocFlag ();
+            solver.MarkTransitiveFanins(and_a_b_c, flag);
+            for (int i=0, sz=solver.NumPI(); i< sz; ++i)
+            {
+                int node_id = solver.NthPI(i);
+                bool flagset = solver.IsNodeFlagSet (node_id, flag);
+                if (flagset)
+                    System.Console.WriteLine ("PI {0} is in the transitive fanin", i);
+                else
+                    System.Console.WriteLine ("PI {0} is NOT in the transitive fanin", i);
+            }
+            solver.ClearFlag(flag);
+
+
+            MyHashtable nameMap = new MyHashtable();
+            nameMap.Add(0, "PrimaryIn 0");
+            System.Console.WriteLine(solver.TreeToString(miter1, nameMap));
+            System.Console.WriteLine(solver.TreeToString(xor_a_b, nameMap));
+
+            System.Console.WriteLine ("Press Return...");
+            System.Console.ReadLine();
+        }
+
+        /* this demonstrate the clause interface, it reads in a CNF file and
+         * Solve it, just as a regular SAT solver should do */
+        static void test_clause_solver (string[] args)
+        {
+            SATSolver solver = new SATSolver();
+
+            // NB: on Singularity, args[0] is the exe image name
+            if (args.Length != 2)
+            {
+                System.Console.WriteLine ("Simple SAT Solver using the C# interface");
+                System.Console.WriteLine ("Usage: Solve CNF_file ");
+                return;
+            }
+            StreamReader input = null;
+            try
+            {
+                input = new StreamReader(args[1]);
+            }
+            catch(Exception e)
+            {
+                Console.WriteLine (e.ToString());
+            }
+
+            string line;
+            System.Console.WriteLine ("Solving {0}", args[1]);
+            while (true)
+            {
+                line = input.ReadLine();
+                if (line == null)
+                    break;
+                string [] tokens = line.Split(new char[] {' ','\t'});
+                int index = 0;
+                string token = getToken (tokens, ref index);
+                if (token == "c")
+                    continue;
+                if (token == "p")
+                {
+                    token = getToken (tokens, ref index);
+                    if (token != "cnf")
+                    {
+                        System.Console.WriteLine("Unrecognized Header");
+                        return;
+                    }
+                    else
+                    {
+                        token = getToken (tokens, ref index);
+                        solver.SetNumVariables (int.Parse(token));
+                        continue;
+                    }
+                }
+                else
+                {
+                    ArrayList lits = new ArrayList();
+                    while (token != null && int.Parse(token) != 0)
+                    {
+                        lits.Add (int.Parse(token));
+                        token = getToken (tokens, ref index);
+                    }
+
+
+                    if (lits.Count> 0)
+                    {
+                        int [] clause = new int [lits.Count];
+                        for (int k=0; k< lits.Count; ++k)
+                        {
+                            clause[k] = (int)lits[k];
+                            if (clause[k] > 0)
+                                clause[k] += clause[k];
+                            else
+                                clause[k] = 1 - clause[k] - clause[k];
+                        }
+                        solver.AddClause ( clause );
+                    }
+                }
+            }
+            input.Close();
+            SATStatus result = solver.Solve();
+            if (result == SATStatus.SATISFIABLE)
+            {
+                System.Console.WriteLine ("SAT");
+                for (int i=1; i<= solver.GetNumVariables(); ++i)
+                {
+                    if (solver.VariableValue(i)==1)
+                    {
+                        Console.Write ("{0} ", i);
+                    }
+                    else if (solver.VariableValue(i)==0)
+                    {
+                        Console.Write ("-{0} ", i);
+                    }
+                    else
+                    {
+                        Console.Write ("({0}) ", i);
+                    }
+                    if (i % 10 == 0)
+                    {
+                        Console.WriteLine ("");
+                    }
+                }
+            }
+            else if (result == SATStatus.UNSATISFIABLE)
+                System.Console.WriteLine ("UNSAT");
+
+            System.Console.WriteLine ("Num Variables            {0}", solver.num_variables() );
+            System.Console.WriteLine ("Num Orig. Clauses        {0}", solver.stats.num_orig_clauses );
+            System.Console.WriteLine ("Num Learned Clauses      {0}", solver.stats.num_learned_clauses);
+            System.Console.WriteLine ("Num Learned Literals     {0}", solver.stats.num_learned_literals);
+            System.Console.WriteLine ("Num Garbage Collection   {0}", solver.stats.num_garbage_collections);
+            System.Console.WriteLine ("Num Deleted Clauses      {0}", solver.stats.num_deleted_clauses );
+            System.Console.WriteLine ("Num Deleted Literals     {0}", solver.stats.num_deleted_literals );
+            System.Console.WriteLine ("Num Decisions            {0}", solver.stats.num_decisions );
+            System.Console.WriteLine ("Num Backtracks           {0}", solver.stats.num_backtracks );
+            System.Console.WriteLine ("Num Implications         {0}", solver.stats.num_implications );
+            System.Console.WriteLine ("Total Runtime            {0}", solver.stats.total_cpu_time );
+            System.Console.WriteLine ("Instance is              {0}", SATCommon.StatusToString(result));
+        }
+
+        public static void log_execution(string [] args)
+        {
+            SATSolver solver = new SATSolver();
+            if (args.Length != 1)
+            {
+                System.Console.WriteLine ("Simple SAT Solver using the C# interface");
+                System.Console.WriteLine ("Usage: Solve CNF_file ");
+                return;
+            }
+            FileInfo file = new FileInfo (args[0]);
+            StreamReader input = file.OpenText();
+            string line;
+            IntVector nodes = new IntVector(4);
+            while (true)
+            {
+                line = input.ReadLine();
+                if (line == null)
+                    break;
+                string [] tokens = line.Split(new char[] {' ','\t'});
+                int index = 0;
+                string token = getToken (tokens, ref index);
+                int k = int.Parse (token);
+                token = getToken (tokens, ref index);
+                sharp_assert (token == "=");
+                token = getToken (tokens, ref index);
+                if (token == "INIT_VARS")
+                {
+                    solver.SetNumVariables(k);
+                    solver.ConvertVarsToPI();
+                    nodes.resize ( k + k + 2);
+                    for (int i=0; i < k + k + 2; ++i)
+                        nodes[i] = i;
+                }
+                else if (token == "CONSTRAINT")
+                {
+                    solver.Constraint(nodes[k]);
+                    SATStatus status = solver.Solve();
+                    if (status == SATStatus.UNSATISFIABLE)
+                        Console.WriteLine("UNSAT");
+                    else
+                        Console.WriteLine("SAT");
+                }
+                else if (token == "PI")
+                {
+                    continue;
+                }
+                else if (token == "CL")
+                {
+                    IntVector lits = new IntVector(4);
+                    token = getToken(tokens, ref index);
+                    while ( token != null )
+                    {
+                        lits.push_back (int.Parse(token));
+                        token = getToken(tokens, ref index);
+                    }
+                    solver.AddClause(lits.ToArray());
+                }
+                else if (token == "AND")
+                {
+                    token = getToken (tokens, ref index);
+                    int i1 = int.Parse (token);
+                    token = getToken (tokens, ref index);
+                    int i2 = int.Parse (token);
+                    int r = solver.And (nodes[i1], nodes[i2]);
+                    if (nodes.size() < k + 2)
+                        nodes.resize (k + 2);
+                    nodes[k] = r;
+                    nodes [k ^ 1] = (r^1);
+                }
+                else if (token == "XOR")
+                {
+                    token = getToken (tokens, ref index);
+                    int i1 = int.Parse (token);
+                    token = getToken (tokens, ref index);
+                    int i2 = int.Parse (token);
+                    int r = solver.Xor (nodes[i1], nodes[i2]);
+                    if (nodes.size() < k + 1)
+                        nodes.resize (k + 1);
+                    nodes[k] = r;
+                    nodes [k ^ 1] = (r^1);
+                }
+                else
+                    fatal ("Unrecognized Symbol");
+            }
+        }
+
+        static Random rand;
+
+        static int [] randclause (int begin, int end)
+        {
+            IntVector cls = new IntVector(4);
+            while (cls.empty())
+            {
+                double r = rand.NextDouble();
+                int a = (int) (r * (end - begin)) + begin;
+                r = rand.NextDouble();
+                if (r < 0.5)
+                    a = a + a;
+                else
+                    a = a + a + 1;
+
+                r = rand.NextDouble();
+                int b = (int) (r * (end - begin)) + begin;
+                r = rand.NextDouble();
+                if (r < 0.5)
+                    b = b + b;
+                else
+                    b = b + b + 1;
+
+                r = rand.NextDouble();
+                int c = (int) (r * (end - begin)) + begin;
+                r = rand.NextDouble();
+                if (r < 0.5)
+                    c = c + c;
+                else
+                    c = c + c + 1;
+
+                if ((a>>1) != (b>>1))
+                {
+                    cls.push_back (a);
+                    cls.push_back (b);
+                    if ((a>>1) != (c>>1) && (b>>1) != (c>>1))
+                        cls.push_back (c);
+                }
+                else
+                {
+                    cls.push_back (b);
+                    if ((b>>1) != (c>>1))
+                        cls.push_back (c);
+                }
+            }
+            return cls.ToArray();
+        }
+
+        static bool test_interpolant_clauses (int n_vars, int n_cls, int span, int randseed)
+        {
+            rand = new Random(randseed);
+            int [] [] a_clauses;
+            int [] [] b_clauses;
+            a_clauses = new int [n_cls][];
+            b_clauses = new int [n_cls][];
+            for (int i=0; i< n_cls; ++i)
+                a_clauses[i] = randclause ( 1, n_vars/2 + span);
+            for (int i=0; i< n_cls; ++i)
+                b_clauses[i] = randclause ( n_vars/2 - span, n_vars + 1);
+
+            SATSolver solver = new SATSolver();
+            solver.SetNumVariables(n_vars);
+            int a_gid = solver.AllocGID();
+            int b_gid = solver.AllocGID();
+            //1. Test if A is satisfiable
+            for (int i=0; i< n_cls; ++i)
+                solver.AddClause (a_clauses[i], a_gid);
+            if (solver.Solve() != SATStatus.SATISFIABLE)
+            {
+                Console.Write ("A SAT");
+                return false;
+            }
+            solver.DeleteGroup(a_gid);
+            //1. Test if B is satisfiable
+            for (int i=0; i< n_cls; ++i)
+                solver.AddClause (b_clauses[i], b_gid);
+            if (solver.Solve() != SATStatus.SATISFIABLE)
+            {
+                Console.Write ("B SAT");
+                return false;
+            }
+            //3. Generate Interpolant
+            a_gid = solver.AllocGID();
+            for (int i=0; i< n_cls; ++i)
+                solver.AddClause (a_clauses[i], a_gid);
+            Console.Write("Interpolant ");
+            int interpolant = solver.GenInterpolantFromClauseGroups ( a_gid, b_gid);
+            if (interpolant == -1 )
+            {
+                Console.Write("AB SAT" );
+                return false;
+            }
+            solver.Reference(interpolant);
+            //now test IB Unsatisfiable
+            Console.Write("IB ");
+            solver.DeleteGroup (a_gid);
+            sharp_assert (solver.stats.num_orig_clauses ==  n_cls);
+            int c = solver.Constraint(interpolant);
+            SATStatus status = solver.Solve();
+            if (status != SATStatus.UNSATISFIABLE)
+                sharp_assert (false);
+
+            //4. test AI Satisfiable
+            Console.Write("AI ");
+            solver.DeleteGroup (b_gid);
+            a_gid = solver.AllocGID();
+            for (int i=0; i< n_cls; ++i)
+                solver.AddClause (a_clauses[i], a_gid);
+            status = solver.Solve();
+            if (status != SATStatus.SATISFIABLE)
+                assert(false);
+            //5. test AI' Unsat (i.e. A=>I)
+            Console.Write("AI' ");
+            solver.ReleaseConstraint (c);
+            c = solver.Constraint(solver.Not(interpolant));
+            status = solver.Solve();
+            if (status != SATStatus.UNSATISFIABLE)
+                sharp_assert (false);
+            solver.ReleaseConstraint (c);
+            return true;
+        }
+
+        static int build_struct (SATSolver solver, int [][] clauses)
+        {
+            int sig = solver.one();
+            for (int i=0; i< clauses.Length; ++i)
+            {
+                int s = solver.zero();
+                foreach (int lit in clauses[i])
+                    s = solver.Or(s, lit);
+                sig = solver.And(sig, s);
+            }
+            return sig;
+        }
+
+        static bool test_interpolant_structure (int n_vars, int n_cls, int span, int randseed)
+        {
+            rand = new Random(randseed);
+            int [] [] a_clauses;
+            int [] [] b_clauses;
+            a_clauses = new int [n_cls][];
+            b_clauses = new int [n_cls][];
+            for (int i=0; i< n_cls; ++i)
+                a_clauses[i] = randclause ( 1, n_vars/2 + span);
+            for (int i=0; i< n_cls; ++i)
+                b_clauses[i] = randclause ( n_vars/2 - span, n_vars + 1);
+
+            SATSolver solver = new SATSolver();
+            solver.SetNumVariables(n_vars);
+            solver.ConvertVarsToPI();
+            int s_a = build_struct(solver, a_clauses);
+            int s_b = build_struct(solver, b_clauses);
+            solver.Reference(s_a);
+            solver.Reference(s_b);
+            //1. Test if A is satisfiable
+            int c_a = solver.Constraint(s_a);
+            if (solver.Solve() != SATStatus.SATISFIABLE)
+            {
+                Console.Write ("A SAT");
+                return false;
+            }
+            solver.ReleaseConstraint(c_a);
+            //2. Test if B is satisfiable
+            int c_b = solver.Constraint(s_b);
+            if (solver.Solve() != SATStatus.SATISFIABLE)
+            {
+                Console.Write ("B SAT");
+                return false;
+            }
+            solver.ReleaseConstraint(c_b);
+            //now get interpolant I
+            Console.Write("Interpolant ");
+            int interpolant = solver.GenInterpolantFromSignals ( s_a, s_b);
+            if (interpolant == -1)
+            {
+                Console.Write ("AB SAT");
+                return false;
+            }
+            solver.Reference (interpolant);
+            //3. test IB Unsatisfiable
+            Console.Write("IB ");
+            c_b = solver.Constraint(s_b);
+            int c_i = solver.Constraint(interpolant);
+            SATStatus status = solver.Solve();
+            if (status != SATStatus.UNSATISFIABLE)
+                sharp_assert (false);
+            solver.ReleaseConstraint (c_b);
+            //4. test AI Satisfiable
+            Console.Write("AI ");
+            c_a = solver.Constraint (s_a);
+            status = solver.Solve();
+            if (status != SATStatus.SATISFIABLE)
+                assert(false);
+            //5. test AI' Unsat (i.e. A=>I)
+            Console.Write("AI' ");
+            solver.ReleaseConstraint (c_i);
+            solver.Constraint(solver.Not(interpolant));
+            status = solver.Solve();
+            if (status != SATStatus.UNSATISFIABLE)
+                sharp_assert (false);
+            return true;
+        }
+
+        static int build_irregular_struct (SATSolver solver, int [][] clauses,int randseed)
+        {
+            Random rand = new Random(randseed);
+
+            int sig = solver.one();
+            for (int i=0; i< clauses.Length; ++i)
+            {
+                int s = solver.zero();
+                foreach (int lit in clauses[i])
+                {
+                    if (rand.NextDouble() > 0.2)
+                        s = solver.Or(s, lit);
+                    else
+                        s = solver.Xor(s, lit);
+                }
+
+                if (rand.NextDouble() > 0.15)
+                    sig = solver.And(sig, s);
+                else
+                    sig = solver.Xor(sig, s);
+            }
+            return sig;
+        }
+
+        static bool test_existential_quantification ( int n_cls, int n_vars, int n_qvar, int rseed)
+        {
+            rand = new Random(rseed);
+            int [] [] clauses = new int [n_cls][];
+            for (int i=0; i< n_cls; ++i)
+                clauses[i] = randclause ( 1, n_vars + 1);
+            int [] qvars = new int [n_qvar];
+            for (int i=1; i<= n_qvar; ++i)
+                qvars[i-1] = i + i;
+
+            SATSolver solver = new SATSolver();
+            solver.SetNumVariables(n_vars);
+            solver.ConvertVarsToPI();
+            int s = build_irregular_struct(solver, clauses, 1);
+            int q1 = solver.expand_exist_quantify(s, qvars);
+            //int q2 = solver.enum_exist_quantify(s, qvars);
+            int q2 = solver.enum_exist_quantify_smart(s, qvars);
+
+            SATStatus status = solver.solve();
+            sharp_assert (status == SATStatus.SATISFIABLE);
+            int notequ = solver.Xor(q1, q2);
+            solver.Constraint(notequ);
+            status = solver.Solve();
+            sharp_assert (status == SATStatus.UNSATISFIABLE);
+            return true;
+        }
+
+        public static bool UnitTest()
+        {
+            SATSolver solver = new SATSolver();
+
+            int ab = solver.NthPI(0);
+            int bc = solver.NthPI(1);
+            int ac = solver.NthPI(2);
+
+            int not_ab = solver.Not(ab);
+            int not_bc = solver.Not(bc);
+            solver.Not(ac);
+
+            int fafb = solver.NthPI(3);
+            int not_fafb = solver.Not(fafb);
+
+            int fbfc = solver.NthPI(4);
+            int not_fbfc = solver.Not(fbfc);
+
+            // ((a=b && b != c) || (a!=b && b=c) || (a!=b && a=c)) && f(a)!=f(b) && f(b)!=f(c)
+            int d1 = solver.And(ab, not_bc);
+            int d2 = solver.And(bc, not_ab);
+            int d3 = solver.And(ac, not_ab);
+
+            int c1 = solver.Or(d1,d2);
+            int c2 = solver.Or(c1,d3);
+
+            int c3 = solver.And(c2,not_fafb);
+            int c4 = solver.And(c3, not_fbfc);
+
+            int formula = c4;
+            int[] ret = solver.FindSatAssignment(formula);
+            if(ret == null) return false;
+
+            int[] clause = new int[2];
+            clause[0] = solver.Not(ab);
+            clause[1] = fafb;
+            solver.AddClause(clause);
+            ret = solver.FindSatAssignment(formula);
+            if(ret == null) return false;
+            return true;
+        }
+
+        public static void print_model(int [] m)
+        {
+            Console.WriteLine ("Model Is " );
+            foreach (int e in m)
+            {
+                if ( (e&1) == 1)
+                    Console.Write ("-");
+                Console.Write( (e/2) + " ");
+            }
+            Console.WriteLine("");
+        }
+
+        public static bool test_small_model()
+        {
+            SATSolver solver = new SATSolver();
+
+            int a = solver.NthPI(0);
+            int b = solver.NthPI(1);
+            int c = solver.NthPI(2);
+            int d = solver.NthPI(3);
+
+            int ab = solver.And(a, b);
+            int cd = solver.And(c, d);
+            int abcd = solver.And(ab, cd);
+            int constraint = solver.Constraint(abcd);
+            solver.Solve();
+            int [] model = solver.FindSmallModel();
+            print_model (model);
+            solver.ReleaseConstraint(constraint);
+
+            int not_abcd = solver.Not(abcd);
+            constraint = solver.Constraint(not_abcd);
+            solver.Solve();
+            model = solver.FindSmallModel();
+            print_model (model);
+            solver.ReleaseConstraint(constraint);
+
+            int e = solver.CreatePI();
+            int f = solver.CreatePI();
+            int exf = solver.Xor (e, f);
+            int and_exf_abcd = solver.And(exf, abcd);
+            constraint = solver.Constraint(and_exf_abcd);
+            solver.Solve();
+            model = solver.FindSmallModel();
+            print_model (model);
+            solver.ReleaseConstraint(constraint);
+
+            int not_and_exf_abcd = solver.Not(and_exf_abcd);
+            constraint = solver.Constraint(not_and_exf_abcd);
+            solver.Solve();
+            model = solver.FindSmallModel();
+            print_model (model);
+            solver.ReleaseConstraint(constraint);
+            return true;
+        }
+
+        public static void test_quantification_edge_case ()
+        {
+            int n_cls = 100;
+            int n_vars = 50;
+            int n_qvar = 10;
+            rand = new Random(10);
+            int [] [] clauses = new int [n_cls][];
+            for (int i=0; i< n_cls; ++i)
+                clauses[i] = randclause ( 1, n_vars + 1);
+            int [] qvars = new int [n_qvar];
+            for (int i=1; i<= n_qvar; ++i)
+                qvars[i-1] = i + i;
+
+            SATSolver solver = new SATSolver();
+            solver.SetNumVariables(n_vars);
+            solver.ConvertVarsToPI();
+            build_irregular_struct(solver, clauses, 1);
+
+            int t = solver.GetOne();
+            int f = solver.GetZero();
+            int s1 = solver.And (t, 10);
+            int s2 = solver.And (f, 10);
+            int [] bounded = new int[2];
+            bounded[0] = 2;
+            bounded[1] = 3;
+            int result = solver.EnumExistQuantify (s1, bounded);
+            result = solver.EnumExistQuantify (s2, bounded);
+            Console.WriteLine(result);
+        }
+
+        public static void Main(string [] args)
+        {
+//          bool r = UnitTest();
+//          sharp_assert (r == true);
+//
+//          NetList net = new NetList();
+//          net.read_blif(args[0]);
+//          net.write_blif(args[0] + ".out");
+
+//          test_clause_solver(args);
+//          return;
+//            Console.WriteLine("Test Clause and Structure Based Interpolant Generation");
+//            for (int i=0; i< 100; ++i)
+//            {
+//                Console.Write ("Test {0}\tCLAUSE: ", i);
+//                r = test_interpolant_clauses (100, 200, 45, i) ;
+//                if (r == false)
+//                    Console.Write ("*");
+//                Console.Write("\t STURCT:");
+//                r = test_interpolant_structure (100, 200, 45, i) ;
+//                if (r == false)
+//                    Console.Write ("*");
+//                Console.WriteLine("");
+//            }
+//            for (int i=0 ; i < 100; ++i)
+//            {
+//                Console.WriteLine ("Test {0} ", i);
+//                test_existential_quantification(50, 30, 20, i);
+//            }
+//            test_small_model();
+//            test_quantification_edge_case();
+            test_clause_solver (args);
+        }
+    }
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/sat_solver.cs b/base/Applications/Benchmarks/sharpSAT/sat_solver.cs
new file mode 100644
index 0000000..6516d44
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/sat_solver.cs
@@ -0,0 +1,376 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text;
+using System.IO;
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    //This class implements the C# interface for a SAT solver
+    public class SATSolver : SharpSATSolver
+    {
+        [Microsoft.Contracts.NotDelayed]
+        public SATSolver() {}
+
+        /*
+         * This part is the conventional clause based SAT solver
+         * formula is represented in Conjunctive Normal Form (CNF)
+         * which is a conjunction of clauses, each of which is a
+         * disjunction of literals
+         *
+         * Variables are indexed from 1 up to NumVariables.
+         * The number of variables can be set upfront using
+         * SetNumVariables or dynamically increased in the
+         * solving process. */
+        public double SessionCpuTime ()         { return base.session_cpu_time();}
+
+        public double TotalCpuTime()            { return base.total_cpu_time(); }
+
+
+        #region Managing Clause Database
+
+        #region Managing Clause Groups
+
+        public int AllocGID ()                  { return base.alloc_gid(); }
+
+        public void FreeGID (int gid)           { base.free_gid(gid);}
+
+        public int  MergeGroup (int g1, int g2) { return base.merge_clause_group (g1, g2); }
+
+        public void DeleteGroup (int gid)       { base.delete_clause_group(gid); }
+
+        #endregion
+
+        public void SetNumVariables(int a)      { base.set_num_variables(a); }
+
+        public int GetNumVariables()            { return base.num_variables(); }
+
+        public int AddVariable()                { return base.add_variable(); }
+
+        public int AddClause( int[] lits, int gid, bool do_check)   { return base.add_clause (lits, gid, do_check); }
+
+        public int AddClause ( int[] lits )                         { return base.add_clause (lits, 0, true /*check */); }
+
+        public int AddClause (int[] lits, int gid)                  { return base.add_clause (lits, gid, true /*check */); }
+
+        public int AddClauseNoCheck ( int[] lits )                  { return base.add_clause (lits, 0, false /*check */); }
+
+        public int AddClauseNoCheck ( int[] lits, int gid )         { return base.add_clause (lits, gid, false /*check */);}
+        #endregion
+
+        #region Solving Instance
+
+        public void SetBranchable(int vid)      { base.set_branchable(vid, true); }
+
+        public void UnsetBranchable(int vid)    { base.set_branchable(vid, false); }
+
+        public int VariableValue(int vid)       { return base.var_value(vid); }
+
+        public int LiteralValue(int lit)        { int v = base.lit_value( lit ); return ((v&1) == v)? v: 2; }
+
+        public SATStatus Solve()                { return base.solve(); }
+
+        public SATStatus ContinueSolve()        { return base.solve(); }
+
+        public void Reset()                     { base.reset(); }
+
+        public void Restart()                   { base.restart();}
+        #endregion
+
+        #region Unsat Core and Interpolants
+        //public void EnableTraceGen()          { base.enable_rtrace(true); }
+
+        //public void DisableProofGen()             { base.enable_rtrace(false);}
+
+        // return null if instance is SAT
+        public UnsatCore GenUnsatCore()         { return base.gen_unsat_core(); }
+
+        // return -1 if instance is SAT
+        public int GenInterpolantFromClauseGroups (int a_gid, int b_gid)
+                                                { return base.gen_interpolant_from_clauses(a_gid, b_gid); }
+        // return -1 if and(a,b) is SAT
+        public int GenInterpolantFromSignals    ( int signal_a, int signal_b)
+        {
+            if (signal_a == zero() || signal_b == zero())
+                throw new Exception("One of the Input is Zero for Interpolation");
+            return base.gen_interpolant_from_signals(signal_a, signal_b);
+        }
+
+        // gretay - change start
+        // return -1 if and(a,b) is SAT
+        public int GenInterpolantFromSignalsEx( int signal_a, int signal_b)
+        {
+            if (signal_a == zero() || signal_b == zero())
+                throw new Exception("One of the Input is Zero for Interpolation");
+            return base.gen_interpolant_from_signals_ex(signal_a, signal_b);
+        }
+        public void SetInterpolant(int cl_uid, int i)
+        {
+            base.set_interpolant(cl_uid, i);
+        }
+        // gretay - change end
+
+        #endregion
+
+        /* given two Boolean formulas represented by s1 and s2, return the logic formula
+         * corresponding to AND(s1,s2), OR(s1,s2)... etc
+         */
+        public int  Constraint (int s)          { return base.constraint(s); }
+
+        public void ReleaseConstraint(int c)    { base.release_constraint(c); }
+
+        #region Structure Interface
+        public int  GetOne ()                   { return base.one() ; }
+
+        public int  GetZero ()                  { return base.zero(); }
+
+        public int  CreatePI()                  { return base.new_pi(); }
+
+        public int  NthPI(int n)                { return base.nth_pi(n); }
+
+        public void ConvertVarsToPI()           { base.convert_vars_to_pi(); }
+
+        public int  And(int a, int b)           { return base.band(a, b); }
+
+        public int  Or(int a, int b)            { return base.bor(a, b); }
+
+        public int  Not(int a)                  { return base.bnot(a); }
+
+        public int  Xor(int a, int b)           { return base.bxor(a, b); }
+
+        public int  Equ(int a, int b)           { return base.bequ(a, b); }
+
+        public int  Imp(int a, int b)           { return base.bimp(a, b); }
+
+        public bool IsNegated(int s)            { return IS_NEGATED(s); }
+
+        public int  NonNegated(int s)           { return NON_NEGATED(s); }
+
+        public void Reference(int a)            { base.reference(a); }
+
+        public void Deref(int a)                { base.deref(a); }
+
+        public int  NumPI()                     { return base.num_pi(); }
+
+        public int  PiVarValue (int k)          { return base.pi_var_value(k); }
+
+        //note: start from 0, up to NumPI - 1
+        public int  PrimaryInput(int k)         { return base.nth_pi(k); }
+
+        public int  LeftChild(int sig)          { return base.left_child(sig); }
+
+        public int  RightChild(int sig)         { return base.right_child(sig); }
+
+        public NodeType NdType (int sig)        { return base.node_type(sig); }
+
+        public int  NodeToPI (int sig)          { return base.node_to_pi(sig); }
+
+        public int  AllocFlag ()                        { return base.alloc_flag(); }
+
+        public void ClearFlag(int flag_id)              { base.clear_flag_for_all(flag_id); }
+
+        public bool IsNodeFlagSet(int s, int flag_id)   { return base.is_flag_set(s, flag_id); }
+
+        /* orig[] and replace[] should have the same size. Given a Boolean formula
+         * represented by s, function compose will generate a new Boolean formula
+         * that rename all orig[i] to replace[i] in s.
+         */
+        public int Compose (int s, int [] orig, int [] replace )
+        {
+            return base.compose(s, orig, replace);
+        }
+
+        /* Mark the transitive fanins and fanouts of a signal s. After marking
+         * nodes belong to the fanin/fanout set are marked for the flag. A node
+         * can be tested for whether it belongs to the set using IsNodeFlagSet()
+         */
+
+        public void MarkTransitiveFanins(int s, int flag)
+        {
+            base.mark_transitive_fanins(s, flag);
+        }
+
+        public void MarkTransitiveOuts(int s, int flag)
+        {
+            base.mark_transitive_fanouts(s, flag);
+        }
+        #endregion
+
+        #region TestSAT
+        //two examples of how to use the interface
+
+        /* Test if logic formula represented by s is satisfiable (i.e. exist a
+         * primary inputs assignment such that s evaluate to true.
+         */
+
+        public SATStatus TestSAT (int s)
+        {
+            if (s == GetZero())
+                return SATStatus.UNSATISFIABLE;
+            else if (s == GetOne())
+                return SATStatus.SATISFIABLE;
+
+            int c = Constraint(s);
+            SATStatus status = Solve();
+            ReleaseConstraint (c);
+            return status;
+        }
+
+        /* Test if logic formula represented by s is satisfiable. If it is,
+         * return the satisfiable primary input assignments, otherwise return
+         * null. Notice this function has about the same complexity as
+         * TestSAT(), so you should avoid calling testSAT first and then based
+         * on the result call FindSATAssignment. If you don't know whether s is
+         * satisfiable, call FindSatAssignment directly, and based on the return
+         * value you should know if s is satisfiable or not.
+         */
+        public int[] FindSatAssignment (int s)
+        {
+            int[] pi_values = null;
+
+            if (s == GetZero())
+                return null;
+            else if (s == GetOne())
+            {
+                pi_values = new int[NumPI()];
+                for (int i=0; i< pi_values.Length; ++i)
+                    pi_values[i] = 2;
+                return pi_values;
+            }
+            else
+            {
+                int c = Constraint(s);
+                SATStatus status = Solve();
+                if (status == SATStatus.SATISFIABLE)
+                {
+                    pi_values = new int[NumPI()];
+                    for (int i=0; i< NumPI(); ++i)
+                    {
+                        int l = LiteralValue(PrimaryInput(i));
+                        if (l != 0 && l != 1)
+                            pi_values[i] = 2;
+                        else
+                            pi_values[i] = l;
+                    }
+                }
+                ReleaseConstraint(c);
+                return pi_values;
+            }
+        }
+        #endregion
+
+        public int DecisionLevel()                  { return d_level(); }
+
+        public int [] AssignmentAtLevel(int l ) { return assignment_stack(l).ToArray(); }
+
+        public ObjVector AssignmentStack()          { return assignment_stack(); }
+
+        public void MakeDecision (int svar)     { base.make_decision(svar); }
+
+        public void SetHookObject (SATHook hk)      { base.hook = hk; }
+
+        //(a & b & c => d)   reasons[!a, !b, !c] imply=d
+        // reasons can be null
+        public void AddImplication (int [] reasons, int imply) { base.add_new_implication(reasons, imply); }
+
+        public int EnumExistQuantify (int s, int [] bound) { return base.enum_exist_quantify_smart (s, bound); }
+
+        public int [] FindSmallModel () { return base.find_small_model(); }
+
+        #region ToString Methods
+        /* return the string representation of this particular node
+         */
+        public string ToString (int sig, MyHashtable nameMap)
+        {
+            string result = sig.ToString() + "\t= ";
+            if (IsNegated(sig))
+            {
+                int t = NonNegated(sig);
+                result +=  "Not(" +
+                    t.ToString() + ")\n" +
+                    ToString (t, nameMap);
+            }
+            else
+            {
+                NodeType tp = NdType(sig);
+                switch (tp)
+                {
+                    case NodeType.UNKNOWN:
+                    case NodeType.FREE:
+                    case NodeType.CONSTANT:
+                    case NodeType.VARIABLE:
+                        result += "ERROR";
+                        break;
+                    case NodeType.AND:
+                    case NodeType.XOR:
+                        int l = LeftChild(sig);
+                        int r = RightChild(sig);
+                        string lstr, rstr;
+                        lstr = l.ToString();
+                        rstr = r.ToString();
+
+                        if (tp == NodeType.AND)
+                            result += "AND (" + lstr + ", " + rstr + ")";
+                        else
+                            result += "XOR (" + lstr + ", " + rstr + ")";
+                        break;
+                    case NodeType.PI:
+                        int sig_pi = NodeToPI(sig);
+                        if (sig_pi != -1)
+                        {
+                            if (nameMap.Contains(sig_pi))
+                                result += nameMap[sig_pi];
+                            else
+                                result += "PI" + sig_pi.ToString();
+                        }
+                        else
+                            result += "ERROR";
+                        break;
+                }
+                result += "\n";
+            }
+            return result;
+        }
+
+        /* return the string representation of the whole
+         * tree rooted at this particular node
+         */
+        public string TreeToString (int sig, MyHashtable nameMap)
+        {
+            MyHashtable inqueue = new MyHashtable();
+            Queue todo = new Queue();
+            todo.Enqueue (sig);
+            StringBuilder result = new StringBuilder();
+            while (todo.Count != 0)
+            {
+                int nd = (int)todo.Dequeue();
+                int l = LeftChild(nd);
+                int r = RightChild(nd);
+                NodeType tp = NdType(nd);
+                if (tp == NodeType.AND || tp == NodeType.XOR)
+                {
+                    if (!inqueue.Contains(l))
+                    {
+                        todo.Enqueue(l);
+                        inqueue.Add (l, null);
+                    }
+                    if (!inqueue.Contains(r))
+                    {
+                        todo.Enqueue(r);
+                        inqueue.Add (r, null);
+                    }
+                }
+                result.Append (ToString(nd, nameMap));
+            }
+            return result.ToString();
+        }
+    }
+    #endregion
+}
diff --git a/base/Applications/Benchmarks/sharpSAT/sharpSAT.csproj b/base/Applications/Benchmarks/sharpSAT/sharpSAT.csproj
new file mode 100644
index 0000000..c200a52
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/sharpSAT.csproj
@@ -0,0 +1,40 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>sharpsat</AssemblyName>
+    <DefineConstants>NONULLCHECK</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="base_solver.cs" />
+    <Compile Include="basic_classes.cs" />
+    <Compile Include="blifparser.cs" />
+    <Compile Include="constants.cs" />
+    <Compile Include="core_extraction.cs" />
+    <Compile Include="main.cs" />
+    <Compile Include="sat_solver.cs" />
+    <Compile Include="sharp_stl.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Benchmarks/sharpSAT/sharp_stl.cs b/base/Applications/Benchmarks/sharpSAT/sharp_stl.cs
new file mode 100644
index 0000000..d555666
--- /dev/null
+++ b/base/Applications/Benchmarks/sharpSAT/sharp_stl.cs
@@ -0,0 +1,230 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+//using Microsoft.Zap;
+namespace SharpSAT
+{
+    public class IntVector : SATCommon
+    {
+        private int [] elements;
+        private int numElements;
+
+        [Microsoft.Contracts.NotDelayed]
+        public IntVector(int sz)
+        {
+            numElements = 0;
+            elements = new int[sz];
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public IntVector (IntVector cp)
+        {
+            numElements = cp.numElements;
+            elements = new int[cp.elements.Length];
+            Array.Copy(cp.elements, elements, numElements);
+        }
+
+        public void sort ()
+        {
+            Array.Sort(elements, null, 0, numElements);
+        }
+        public int binary_search(int v)
+        {
+            return Array.BinarySearch(elements,0,numElements,v);
+        }
+
+        public void push_back(int v)
+        {
+            if (numElements == elements.Length)
+            {
+                int [] old = elements;
+                elements = new int [numElements + numElements];
+                Array.Copy (old, elements, numElements);
+            }
+            elements[numElements] = v;
+            ++ numElements;
+        }
+
+        public int[] ToArray()
+        {
+            int [] result = new int [numElements];
+            Array.Copy(elements, result, numElements);
+            return result;
+        }
+
+        public int this [int idx]
+        {
+            get {sharp_assert (idx < numElements); return elements[idx];}
+            set {sharp_assert (idx < numElements); elements[idx] = value;}
+        }
+
+        public void clear()     { numElements = 0; }
+        public void pop_back()  { --numElements; }
+        public int size()       { return numElements; }
+        public void resize (int k )
+        {
+            int l = elements.Length;
+            while (k > l)
+                l += l;
+            if (l > elements.Length)
+            {
+                int [] old = elements;
+                elements = new int [l];
+                Array.Copy (old, elements, numElements);
+            }
+            numElements = k;
+            return;
+        }
+
+        public int back
+        {
+            get { return elements[numElements - 1];   }
+            set { elements[numElements - 1] = value; }
+        }
+        public bool empty()     { return numElements == 0; }
+    }
+
+
+    public class ObjVector
+    {
+        private object [] elements;
+        private int numElements;
+
+        public ObjVector(int n)
+        {
+            numElements = 0;
+            elements = new object [n];
+        }
+
+        public void push_back(object v)
+        {
+            if (numElements == elements.Length)
+            {
+                object [] old = elements;
+                elements = new object [numElements + numElements];
+                Array.Copy (old, elements, numElements);
+            }
+            elements[numElements] = v;
+            ++ numElements;
+        }
+
+        public object this [int idx]
+        {
+            get {return elements[idx];}
+            set {elements[idx] = value;}
+        }
+
+        public void clear()
+        {
+            for (int i=0; i< numElements; ++i)
+                elements[i] = null;
+            numElements = 0;
+        }
+        public void pop_back()  { elements[--numElements] = null; }
+        public int size()       { return numElements; }
+        public object back
+        {
+            get {return elements[numElements - 1];   }
+            set { elements[numElements - 1] = value; }
+        }
+        public bool empty()     { return numElements == 0; }
+    }
+
+    public class ClsVector
+    {
+        private Clause [] elements;
+        private int numElements;
+
+        public ClsVector(int n)
+        {
+            numElements = 0;
+            elements = new Clause [n];
+        }
+
+        public void push_back(Clause v)
+        {
+            if (numElements == elements.Length)
+            {
+                Clause [] old = elements;
+                elements = new Clause [numElements + numElements];
+                Array.Copy (old, elements, numElements);
+            }
+            elements[numElements] = v;
+            ++ numElements;
+        }
+
+        public Clause this [int idx]
+        {
+            get {return elements[idx];}
+            set {elements[idx] = value;}
+        }
+
+        public void clear()
+        {
+            for (int i=0; i< numElements; ++i)
+                elements[i] = null;
+            numElements = 0;
+        }
+        public void pop_back()  { elements[--numElements] = null; }
+        public int size()       { return numElements; }
+        public Clause back
+        {
+            get {return elements[numElements - 1];   }
+            set { elements[numElements - 1] = value; }
+        }
+        public bool empty()     { return numElements == 0; }
+    }
+
+    public class VarVector
+    {
+        private Variable [] elements;
+        private int numElements;
+
+        public VarVector(int n)
+        {
+            numElements = 0;
+            elements = new Variable [n];
+        }
+
+        public void push_back(Variable v)
+        {
+            if (numElements == elements.Length)
+            {
+                Variable [] old = elements;
+                elements = new Variable [numElements + numElements];
+                Array.Copy (old, elements, numElements);
+            }
+            elements[numElements] = v;
+            ++ numElements;
+        }
+
+        public Variable this [int idx]
+        {
+            get {return elements[idx];}
+            set {elements[idx] = value;}
+        }
+
+        public void clear()
+        {
+            for (int i=0; i< numElements; ++i)
+                elements[i] = null;
+            numElements = 0;
+        }
+        public void pop_back()  { elements[--numElements] = null; }
+        public int size()       { return numElements; }
+        public Variable back
+        {
+            get {return elements[numElements - 1];   }
+            set { elements[numElements - 1] = value; }
+        }
+        public bool empty()     { return numElements == 0; }
+    }
+}
diff --git a/base/Applications/CHello/CHello.csproj b/base/Applications/CHello/CHello.csproj
new file mode 100644
index 0000000..63ef4a0
--- /dev/null
+++ b/base/Applications/CHello/CHello.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CHello</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CHello.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/CHello/CHello.sg b/base/Applications/CHello/CHello.sg
new file mode 100644
index 0000000..4af8025
--- /dev/null
+++ b/base/Applications/CHello/CHello.sg
@@ -0,0 +1,77 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CHello.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class CHello
+    {
+
+        public static ServiceContract.Imp OpenDevice(String! devname)
+        {
+            ServiceContract.Exp! exp;
+            ServiceContract.Imp! imp;
+            ServiceContract.NewChannel(out imp, out exp);
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            bool success = false;
+            ns.SendBind(Bitter.FromString2(devname),exp);
+            switch receive
+            {
+                case ns.AckBind():
+                    Console.WriteLine("Received AckBind from namespace.");
+                    success = true;
+                    break;
+                case ns.NakBind(rejected, error):
+                    delete rejected;
+                    Console.WriteLine("Received NakLookup from namespace.");
+                    break;
+                case ns.ChannelClosed():
+                    Console.WriteLine("Channel closed to nameserver.");
+                    break;
+            }
+
+            if (!success)
+            {
+                Console.WriteLine("Bind of {0} failed\n", devname);
+                delete imp;
+                delete ns;
+                return null;
+            }
+
+            delete ns;
+            return imp;
+        }
+
+        public static int Main(String[] args)
+        {
+            Console.WriteLine("Hello World!");
+
+            ServiceContract.Imp device = OpenDevice("/dev/disk0");
+            if (device == null) {
+                Console.WriteLine("Couldn't open disk0");
+                return 1;
+            }
+            delete device;
+            Console.WriteLine("Opened disk0");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/CHello2/CHello2.csproj b/base/Applications/CHello2/CHello2.csproj
new file mode 100644
index 0000000..bd1b041
--- /dev/null
+++ b/base/Applications/CHello2/CHello2.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CHello2</AssemblyName>
+    
+    <!-- mkmani blows up on chello2?? -->
+    <NoManifest>true</NoManifest>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CHello2.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/CHello2/CHello2.sg b/base/Applications/CHello2/CHello2.sg
new file mode 100644
index 0000000..aec2237
--- /dev/null
+++ b/base/Applications/CHello2/CHello2.sg
@@ -0,0 +1,708 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CHello.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class CHello
+    {
+        public static int Main(String[] args)
+        {
+            Console.WriteLine("Hello World!");
+
+			ProtocolTester.UnitTest_LDPC o = new ProtocolTester.UnitTest_LDPC();
+
+			o.Run();
+
+            return 0;
+        }
+    }
+}
+
+namespace Microsoft.SPOT
+{
+    /// <include file='doc\Debug.uex' path='docs/doc[@for="Trace"]/*' />
+    public abstract class Trace
+    {
+        /// <include file='doc\Debug.uex' path='docs/doc[@for="Trace.Print"]/*' />
+        [System.Diagnostics.ConditionalAttribute("TINYCLR_TRACE")]
+        static public void Print( string text )
+        {
+            Debug.Print( text );
+        }
+    }
+
+    /// <include file='doc\Debug.uex' path='docs/doc[@for="Debug"]/*' />
+    public abstract class Debug
+    {
+        static public void Print( string text )
+        {
+            Console.WriteLine( text );
+        }
+
+        static public void DumpBuffer( byte[] buf, bool fCRC, bool fOffset )
+        {
+			if(buf == null) return;
+
+            int offset = 0;
+            int len    = buf.Length;
+
+            while(len > 0)
+            {
+                int row = len > 16 ? 16 : len;
+                int i;
+
+                if(fOffset) Console.Write( "{0:X8}:", offset );
+
+                for(i=0; i<16; i++)
+                {
+                    if(i<row)
+                    {
+                        Console.Write( " {0:X2}", buf[i+offset] );
+                    }
+                    else
+                    {
+                        Console.Write( "   " );
+                    }
+                }
+
+                Console.Write( " " );
+
+                for(i=0; i<row; i++)
+                {
+                    byte c = buf[i+offset];
+
+                    if(c <= 0x1F) c = (byte)'.';
+                    if(c >= 0x7F) c = (byte)'.';
+
+                    Console.Write( "{0}", (char)c );
+                }
+
+                offset += row;
+                len    -= row;
+
+                Console.WriteLine();
+            }
+
+            Console.WriteLine();
+        }
+	}
+
+    public abstract class Math
+    {
+        static System.Random s_rnd = new System.Random();
+
+        static public int Random( int modulo )
+        {
+            return s_rnd.Next( modulo );
+        }
+	}
+}
+
+namespace Microsoft.SPOT.Hardware
+{
+    public abstract class Radio
+    {
+        static public void XorData( byte[]! left, byte[]! right )
+        {
+            for(int i=0; i<left.Length; i++)
+            {
+                left[i] ^= right[i];
+            }
+        }
+	}
+}
+
+namespace Microsoft.DirectBand
+{
+	internal class CreateNonNullArray<T>
+	{
+		T[]! elements;
+    	int  count;
+
+    	public CreateNonNullArray( int n )
+		{
+        	this.elements = new T[n];
+        	this.count	  = 0;
+			base();
+    	}
+
+    	public void InitNext( T elem )
+		{
+        	if(this.count < elements.Length)
+			{
+            	this.elements[this.count++] = elem;
+        	}
+        	else
+			{
+            	throw new InvalidOperationException( "Too many elements initialized" );
+	        }
+    	}
+
+    	public T[]! GetArray()
+		{
+        	if(count != elements.Length)
+			{
+            	throw new InvalidOperationException("Not all elements initialized");
+        	}
+
+        	return this.elements;
+    	}
+	}
+
+    public class LDPC
+    {
+	    public static T[]![]! ConstructArray<T>( int i, int j )
+		{
+	        CreateNonNullArray<T[]!> nna = new CreateNonNullArray<T[]!>( i );
+
+	        for(int k=0; k < i; k++)
+			{
+            	nna.InitNext( new T[j] );
+        	}
+
+        	return nna.GetArray();
+    	}
+
+        static public byte[]![]! Solve( byte[][] dataPackets, byte[][] eccPackets, int[] eccIndex, int totalEccPackets, int totalDataPackets, int missedDataPackets, int receivedEccPackets, int pktLen )
+        {
+            // dataPackets          x0    = actual N - k data packets received (blanks in the missing locations)
+            // eccPackets           rhs   = actual kp EC packets received
+            // eccIndex             gotec = array contains indices of EC packet received
+            // totalEccPackets      M     = total length of EC stream
+            // totalDataPackets     N     = total length of data stream
+            // missedDataPackets    kk    = number of data packets missed
+            // receivedEccPackets   kp    = number of EC packets received
+            //                      AA    = M * N matrix used to get the EC packets at encoder
+
+			if(dataPackets == null) throw new NullReferenceException();
+			if(eccPackets  == null) throw new NullReferenceException();
+			if(eccIndex    == null) throw new NullReferenceException();
+
+            int    maxMN  = (totalEccPackets > totalDataPackets) ? totalEccPackets : totalDataPackets;
+            bool[] pseudo = new bool[maxMN];
+            int    i;
+            int    j;
+            int    k;
+
+            for(i=0; i < maxMN; i +=  5) pseudo[i] = true;
+            for(i=0; i < maxMN; i +=  7) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 13) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 17) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 19) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 33) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 37) pseudo[i] = true;
+
+            //bool[][] A = new bool[receivedEccPackets][];
+            //for(i=0; i < receivedEccPackets; i++)
+            //{
+            //    A[i] = new bool[missedDataPackets];
+            //} // The actual matrix to be inverted (submatrix of AA)
+			bool[]![]! A = ConstructArray<bool>( receivedEccPackets, missedDataPackets );
+
+            int[]! miss = new int[missedDataPackets + 1]; // Indices of the missing data packets
+
+            int c = 0;
+
+            for(i = 0; i < missedDataPackets; i++)
+            {
+                while(c < totalDataPackets && dataPackets[c] != null)
+                {
+                    c++;
+                }
+
+                //Microsoft.SPOT.Debug.Print( "Missing: " + c );
+                miss[i] = c++;
+            }
+            // Get miss array
+            miss[missedDataPackets] = -1;
+
+            for(i=0; i < receivedEccPackets; i++)
+            {
+				byte[] t = eccPackets[i]; if(t == null) throw new NullReferenceException();
+
+				t = (byte[])t.Clone(); if(t == null) throw new NullReferenceException();
+
+                eccPackets[i] = t;
+
+                // What's the actual system we have to solve
+
+                for(j=0; j < missedDataPackets; j++)
+                {
+                    int idx = eccIndex[i] + miss[j];
+
+                    //A[i][j] = AA[eccIndex[i]][miss[j]];
+                    A[i][j] = pseudo[ idx < maxMN ? idx : idx - maxMN ];
+                }
+            }
+
+            for(j = 0; j < totalDataPackets; j++)
+            {
+				byte[] dataPacket = dataPackets[j];
+
+                if(dataPacket != null)
+                {
+                    // Packet j is not a missing packet
+                    for(i = 0; i < receivedEccPackets; i++)
+                    {
+                        int idx = eccIndex[i] + j;
+
+                        if(pseudo[ idx < maxMN ? idx : idx - maxMN ]) /*AA[eccIndex[i]][j]*/
+                        {
+                            //Microsoft.SPOT.Debug.Print( "XOR: eccPackets[" + i + "], dataPackets[" + j + "]" );
+							byte[] eccPacket = eccPackets[i];
+
+							if(eccPacket != null)
+							{
+                            	Microsoft.SPOT.Hardware.Radio.XorData( eccPacket, dataPacket );
+							}
+                        }
+                    }
+                }
+            }
+
+            //DumpMatrix( "Beginning:", A, kp, kk );
+
+            // Now set up some variables and do the LU decomposition
+
+            //byte[][] y    = new byte[missedDataPackets+1][]; // Intermediate solution
+            //byte[][] xhat = new byte[missedDataPackets+1][];
+			//
+			//
+            //for(i=0; i < missedDataPackets+1; i++)
+            //{
+            //    y   [i] = new byte[ pktLen ];
+            //    xhat[i] = new byte[ pktLen ];
+            //}
+			byte[]![]! y    = ConstructArray<byte>( missedDataPackets+1, missedDataPackets+1 );
+			byte[]![]! xhat = ConstructArray<byte>( missedDataPackets+1, missedDataPackets+1 );
+
+            int  i2;
+            int  j2;
+            int  p;
+
+            //DumpMatrix( "Beginning:", A, kp, kk );
+
+            for(k = 0; k < missedDataPackets; k++)
+            {
+                p = k;
+
+                // Find a remaining row with non-zero k-th element
+                while(A[p][k] == false)
+                {
+                    p++;
+
+                    if(p == receivedEccPackets)
+                    {
+                        //Microsoft.SPOT.Debug.Print( "Non-triangular matrix?" );
+                        //return null;
+						throw new Exception( "Non-triangular matrix?" );
+                    }
+                }
+
+
+                if(p != k)
+                {
+                    //Microsoft.SPOT.Debug.Print( "Swap: " + p + " " + k );
+                    // Swap row k and row p
+                    for(j2 = 0; j2 < missedDataPackets; j2++)
+                    {
+                        bool temp = A[k][j2];
+                        A[k][j2]  = A[p][j2];
+                        A[p][j2]  = temp;
+                    }
+
+                    byte[] packetTemp = eccPackets[k];
+                    eccPackets[k]     = eccPackets[p];
+                    eccPackets[p]     = packetTemp;
+
+                    //DumpMatrix( "After:", A, kp, kk );
+                }
+
+                for(i2 = k + 1; i2 < receivedEccPackets; i2++)
+                {
+                    if(A[i2][k] == A[k][k])
+                    {
+                        //Microsoft.SPOT.Debug.Print( "Mix rows: " + i2 + " " + k );
+                        for(j2 = k + 1; j2 < missedDataPackets; j2++)
+                        {
+                            A[i2][j2] ^= A[k][j2];
+                        }
+
+                        //DumpMatrix( "After:", A, kp, kk );
+                    }
+                }
+            }
+            //DumpMatrix( "After:", A, kp, kk );
+
+            //////////////////////////////////////////////////////////
+
+            // Solve Ly = Pb
+
+            for(i2 = 0; i2 < missedDataPackets; i2++)
+            {
+                y[i2] = (byte[]!)eccPackets[i2];
+
+                for(j2 = 0; j2 < i2; j2++)
+                {
+                    //y[i2] = (sbyte) (((y[i2] ^ (A[i2][j2] * y[j2])) & 0x000000ff));
+
+                    if(A[i2][j2])
+                    {
+                        //Microsoft.SPOT.Debug.Print( "XOR: y[" + i2 + "], y[" + j2 + "]" );
+                        Microsoft.SPOT.Hardware.Radio.XorData( y[i2], y[j2] );
+                    }
+                }
+            }
+
+            // Now solve Ux = y
+            for(i2 = missedDataPackets - 1; i2 >= 0; i2--)
+            {
+                xhat[i2] = y[i2];
+
+                for(j2 = i2 + 1; j2 < missedDataPackets; j2++)
+                {
+                    //xhat[i2] = (sbyte) (((xhat[i2] ^ (A[i2][j2] * xhat[j2])) & 0x000000ff));
+                    if(A[i2][j2])
+                    {
+                        //Microsoft.SPOT.Debug.Print( "XOR: xhat[" + i2 + "], xhat[" + j2 + "]" );
+                        Microsoft.SPOT.Hardware.Radio.XorData( xhat[i2], xhat[j2] );
+                    }
+                }
+            }
+
+            for(i2 = 0; i2 < missedDataPackets; i2++)
+            {
+                // Rogue value to indicate non-invertible
+                if(A[i2][i2] == false)
+                {
+                    //return null;
+					throw new Exception( "Non-invertible matrix?" );
+                }
+            }
+
+            return xhat;
+        }
+
+        static public byte[][] GenerateEC( byte[][] dataPackets, int totalEccPackets, int totalDataPackets, int pktLen )
+        {
+            int maxMN = (totalEccPackets > totalDataPackets) ? totalEccPackets : totalDataPackets;
+            int i;
+            int j;
+
+			if(dataPackets == null) throw new NullReferenceException();
+
+            bool[] pseudo = new bool[maxMN];
+
+            for(i=0; i < maxMN; i +=  5) pseudo[i] = true;
+            for(i=0; i < maxMN; i +=  7) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 13) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 17) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 19) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 33) pseudo[i] = true;
+            for(i=0; i < maxMN; i += 37) pseudo[i] = true;
+
+            byte[][] eccPackets = new byte[totalEccPackets][];
+
+            for(i=0; i < totalEccPackets; i++)
+            {
+                eccPackets[i] = new byte[ pktLen ];
+            }
+
+            for(i=0; i < totalEccPackets; i++)
+            {
+                // Generate the EC stream
+
+                for(j=0; j < totalDataPackets; j++)
+                {
+                    //ec[i] = (sbyte) (((ec[i] ^ (AA[i][j] * x[j])) & 0x000000ff));
+
+                    int idx = i + j;
+
+                    if(pseudo[ idx < maxMN ? idx : idx - maxMN ]) /*AA[i][j]*/
+                    {
+						byte[] eccPacket  = eccPackets[i];
+						byte[] dataPacket = dataPackets[j];
+
+						if(eccPacket != null && dataPacket != null)
+						{
+                        	Microsoft.SPOT.Hardware.Radio.XorData( eccPacket, dataPacket );
+						}
+                    }
+                }
+            }
+
+            return eccPackets;
+        }
+	}
+}
+
+namespace ProtocolTester
+{
+    public class UnitTest_LDPC
+    {
+        // main program written by hpleung
+        // Procedure:
+        //      1. Generate Random Data Unit
+        //      2. Generate Error Correction Unit
+        //      3. Inject Errors in The Random Data Unit
+        //      4. Decode
+        //      5. Make sure after decoding data is fully received
+        //      Run it with run.exe nDataPacket nErrorCorrection nPercentageLoss nIteration
+        //
+        public void Run()
+        {
+            //for quick correctness verification
+            Microsoft.SPOT.Debug.Print( "LPDC Test Started" );
+
+//            for(int i=0; i<100; i++)
+//            {
+//                RunPass( 40, 40, 40, 106 );
+//            }
+//            return;
+            for(int nPacketLength=10; nPacketLength <= 120; nPacketLength = nPacketLength + 10)
+            {
+                RunPass( nPacketLength, nPacketLength, 40, 106 );
+            }
+        }
+
+        public void RunPass( int nDataPacketCount, int nErrorCorrectionCount, int nPercentageLoss, int nPacketSize )
+        {
+            byte[][] arrDataPacket            = new byte[nDataPacketCount][];
+            byte[][] arrDataReceived          = new byte[nDataPacketCount][];
+            byte[][] arrErrorCorrectionStream = null;
+            int      nDataLossCount           = 0;
+            int      i;
+
+            //randomly generate some data
+            PopulatePacket( arrDataPacket, nPacketSize );
+
+            for(i=0; i<nDataPacketCount; i++)
+            {
+                Randomize( arrDataPacket[i] );
+            }
+            Microsoft.SPOT.Debug.Print( "Randomly generated packets" );
+
+            //
+            // Now do the encoding
+            //
+            // Generate the full EC stream
+            //
+            arrErrorCorrectionStream = Microsoft.DirectBand.LDPC.GenerateEC( arrDataPacket, nErrorCorrectionCount, nDataPacketCount, nPacketSize );
+			if(arrErrorCorrectionStream == null) throw new NullReferenceException();
+            Microsoft.SPOT.Debug.Print( "Encoding Finished" );
+
+
+            //  we do not like this- we want to make sure we lose
+            //  appropriately the number of packets
+            //  why? Because we want to know exactly how much we lose
+            //  as the cpu utilization depends on the number of packet to correct
+
+            int nPacketToLossFix = (nPercentageLoss * nDataPacketCount) / 100;
+
+#if LDPC_DROPINORDER
+            for(i=0; i<nDataPacketCount; i++)
+            {
+                if(i >= nPacketToLossFix)
+                {
+                    arrDataReceived[i] = arrDataPacket[i];
+                }
+                else
+                {
+                    arrDataReceived[i] = null;
+                }
+            }
+#else
+            int nPacketToGet = nDataPacketCount - nPacketToLossFix;
+            while(nPacketToGet > 0)
+            {
+                i = Microsoft.SPOT.Math.Random( nDataPacketCount - 1 );
+                //Microsoft.SPOT.Debug.Print( "Picked " + i );
+
+                if(arrDataReceived[i] == null)
+                {
+                    arrDataReceived[i] = arrDataPacket[i];
+                    nPacketToGet--;
+                }
+            }
+#endif
+
+            for(i=0; i<nDataPacketCount; i++)
+            {
+                if(arrDataReceived[i] == null)
+                {
+                    nDataLossCount++;
+                }
+            }
+
+
+            Microsoft.SPOT.Debug.Print( "We have simulated Packet receiving with loss " + nDataLossCount );
+
+            // Now we determine how many EC packet we want to receive
+            int nErrorPacketToReceive;
+
+            if(nDataLossCount * 108 > (nDataLossCount + 5) * 100)
+            {
+                nErrorPacketToReceive = (int)((nDataLossCount * 108)/100) ;
+            }
+            else
+            {
+                nErrorPacketToReceive = nDataLossCount + 5;
+            }
+
+            if(nErrorPacketToReceive > nErrorCorrectionCount)
+            {
+                nErrorPacketToReceive = nErrorCorrectionCount;
+            }
+
+            int[]!   arrECPacketReceived = new int [nErrorPacketToReceive];
+            byte[][] arrRHS              = new byte[nErrorPacketToReceive][];
+
+            // Randomly Pick up Error Packets
+            for(i=0; i<arrECPacketReceived.Length;i++)
+            {
+                int nECPacketPositionReceived = GetNextRandomPosition( arrECPacketReceived, i );
+
+                arrRHS             [i] = arrErrorCorrectionStream[nECPacketPositionReceived];
+                arrECPacketReceived[i] =                          nECPacketPositionReceived;
+            }
+
+            Microsoft.SPOT.Debug.Print( "Error Correction Packet Pickup Simulation Done" );
+
+            //--//
+
+            //Now let decode it
+
+            DateTime start = DateTime.Now;
+            byte[]![]! arrCorrectedPackets = Microsoft.DirectBand.LDPC.Solve( arrDataReceived        ,
+                arrRHS                 ,
+                arrECPacketReceived    ,
+                nErrorCorrectionCount  ,
+                nDataPacketCount       ,
+                nDataLossCount         ,
+                nErrorPacketToReceive  ,
+                nPacketSize            );
+
+            TimeSpan totalExecutionTime = DateTime.Now - start;
+            //int calls = Microsoft.SPOT.Hardware.Radio.XorDataCalls;
+            Microsoft.SPOT.Debug.Print( "Data = " + nDataPacketCount + " EC = " + nErrorCorrectionCount  + " Loss = " + nPercentageLoss + " Picked EC = "  + nErrorPacketToReceive  + " Duration: " + totalExecutionTime.ToString() );
+
+            bool bSame = true;
+
+            if(arrCorrectedPackets != null)
+            {
+                //Microsoft.SPOT.Debug.Print( "Cormac Says : All Data Has Been Recovered" );
+
+                int pos = 0;
+
+                for(i=0; i<arrDataPacket.Length; i++)
+                {
+                    if(arrDataReceived[i] == null)
+                    {
+                        if(SameContents( arrCorrectedPackets[pos], arrDataPacket[i] ) == false)
+                        {
+                            Microsoft.SPOT.Debug.Print( "Mismatch: " + i );
+                            Microsoft.SPOT.Debug.DumpBuffer( arrCorrectedPackets[pos], false, true );
+                            Microsoft.SPOT.Debug.DumpBuffer( arrDataPacket      [i  ], false, true );
+                            bSame = false;
+                        }
+
+                        pos++;
+                    }
+                }
+            }
+            else
+            {
+                bSame = false;
+
+                //Microsoft.SPOT.Debug.Print( "Cormac Says: All Data Has not been recovered" );
+            }
+
+            if(bSame)
+            {
+                Microsoft.SPOT.Debug.Print( "SUCCESS --- No Mismatch" );
+            }
+            else
+            {
+                Microsoft.SPOT.Debug.Print( "BUGBUG - We have a mismatch" );
+            }
+
+            //Microsoft.SPOT.Debug.Print( "Total XOR on Packet " + calls );
+            Microsoft.SPOT.Debug.Print( "" );
+        }
+
+        public int GetNextRandomPosition( int[]! arrECPacketReceived, int nFilled )
+        {
+            bool bFound    = false;
+            int  nPosition = 0;
+
+            while(bFound == false)
+            {
+                bFound    = true;
+                nPosition = Microsoft.SPOT.Math.Random( arrECPacketReceived.Length );
+
+                //make sure we did not already picked it
+                for(int i=0;i<nFilled;i++)
+                {
+                    if(arrECPacketReceived[i] == nPosition)
+                    {
+                        bFound = false;
+                        break;
+                    }
+                }
+            }
+
+            return nPosition;
+        }
+
+        public void PopulatePacket( byte[][] arrPacket, int nPacketSize )
+        {
+			if(arrPacket == null) throw new NullReferenceException();
+
+            for(int i=0; i<arrPacket.Length; i++)
+            {
+                arrPacket[i] = new byte[ nPacketSize ];
+            }
+        }
+
+        static int last = 0;
+
+        public void Randomize( byte[] data )
+        {
+			if(data == null) throw new NullReferenceException();
+
+            for(int i=0; i<data.Length; i++)
+            {
+                data[i] = (byte)(last+i);//(byte)Microsoft.SPOT.Math.Random( 255 );
+            }
+            last++;
+        }
+
+        public bool SameContents( byte[] left, byte[] right )
+        {
+			if(left  == null) throw new NullReferenceException();
+			if(right == null) throw new NullReferenceException();
+
+            for(int i=0; i<left.Length; i++)
+            {
+                if(left[i] != right[i]) return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/base/Applications/Cadgen99/Cadgen99.csproj b/base/Applications/Cadgen99/Cadgen99.csproj
new file mode 100644
index 0000000..bc1d84a
--- /dev/null
+++ b/base/Applications/Cadgen99/Cadgen99.csproj
@@ -0,0 +1,28 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Cadgen99</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Cadgen99.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Cadgen99/cadgen99.sg b/base/Applications/Cadgen99/cadgen99.sg
new file mode 100644
index 0000000..cf297c4
--- /dev/null
+++ b/base/Applications/Cadgen99/cadgen99.sg
@@ -0,0 +1,411 @@
+
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   cadgen.sg
+//
+//  Note:
+//     Ported literally SpecWeb99 source code.
+//
+//     Strongly avoid writing programs like this.
+//
+//     This file compiles under CSC for testing on Windows and SGC
+//     on Singularity.
+
+
+using System;
+using System.IO;
+
+
+using FileSystem.Utils;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using System.Text;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Generate the custom ads file for SPECWeb99", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter( "d", Mandatory=true, HelpMessage="Directory in which to gen files")]
+        internal string directory;
+
+        [LongParameter( "e", Mandatory=true, HelpMessage="pttime")]
+        internal long pttime;
+
+        [LongParameter( "t", Mandatory=true, HelpMessage="max number of threads")]
+        internal long maxthread;
+
+        [LongParameter( "exp1", Mandatory=true, HelpMessage="expiredAd1")]
+        internal long expiredAd1;
+
+        [LongParameter( "exp2", Mandatory=true, HelpMessage="expiredAd2")]
+        internal long expiredAd2;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            CadGen99.AppMain(this);
+            return 0;
+        }
+    }
+
+
+///////////////////////////////////////
+// Quick and dirty abstraction of file operations
+//////////////////////////////////////
+
+public class FILE
+{
+    private TRef<FileContract.Imp:Ready>! connRef;
+    private long filePos;
+    private string! path;
+
+    public static FILE CreateFile(string! path)
+    {
+        if (FileUtils.CreateFile(path) != 0) {
+            return null;
+        }
+
+        return OpenFile(path);
+    }
+
+    public static FILE OpenFile(string! path)
+    {
+        FileContract.Imp conn = FileUtils.OpenFile(path);
+
+        if (conn != null) {
+            return new FILE(conn, path);
+        }
+        else {
+            return null;
+        }
+    }
+
+    private FILE([Claims] FileContract.Imp:Ready! conn, string! thePath)
+    {
+        connRef = new TRef<FileContract.Imp:Ready>(conn);
+        filePos = 0;
+        path = thePath;
+        base();
+    }
+
+    public int Write(string! str)
+    {
+        byte[] bytes = Encoding.ASCII.GetBytes(str);
+        return Write(bytes, 0, bytes.Length);
+    }
+
+    public int Write(byte[]! buf, int offset, int length)
+    {
+        FileContract.Imp conn = connRef.Acquire();
+        byte[]! in ExHeap bytes = Bitter.FromByteArray(buf, offset, length);
+
+        try {
+            long bytesWritten;
+            int error;
+            conn.SendWrite(bytes, 0, filePos, bytes.Length);
+            conn.RecvAckWrite(out bytes, out bytesWritten, out error);
+            delete bytes;
+            filePos += bytesWritten;
+
+            if (error != 0) {
+                return 0;
+            }
+        }
+        finally {
+            connRef.Release(conn);
+        }
+
+        return buf.Length;
+    }
+
+    public int Read(byte[]! buf, int offset, int maxLength)
+    {
+        FileContract.Imp conn = connRef.Acquire();
+        byte[]! in ExHeap bytes = new[ExHeap] byte[maxLength];
+
+        try {
+            long bytesRead;
+            int error;
+            conn.SendRead(bytes, 0, filePos, bytes.Length);
+            conn.RecvAckRead(out bytes, out bytesRead, out error);
+
+            filePos += bytesRead;
+
+            if (error != 0) {
+                delete bytes;
+                return 0;
+            }
+
+            Bitter.ToByteArray(bytes, 0, maxLength, buf, offset);
+            delete bytes;
+        }
+        finally {
+            connRef.Release(conn);
+        }
+
+        return buf.Length;
+    }
+
+    public int Size
+    {
+        // TODO
+        get {
+            long size;
+            NodeType nodeType;
+            ErrorCode error;
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+            bool ok  = FileUtils.GetAttributes(path, rootNS, out size, out nodeType, out  error);
+            delete rootNS;
+
+            if (!ok) {
+                throw new Exception("Failed to get attributes");
+            } else {
+                return unchecked((int)size);
+            }
+        }
+    }
+
+    public void Close()
+    {
+        FileContract.Imp conn = connRef.Acquire();
+
+        try {
+            conn.SendClose();
+        }
+        finally {
+            connRef.Release(conn);
+        }
+    }
+}
+
+
+public class CadGen99
+{
+    // Constants from client.h
+    private const int CAD_SEARCH_INTERVAL = 24;
+    private const int CADFILE_ENTRIES     = 360;
+    private const int MAX_CAD_WEIGHT      = 75;
+
+    private const string AdsFile = "Custom.Ads";
+
+    private static void Usage()
+    {
+        Console.WriteLine("cadgen99 -C <directory> -e <pttime> -t <threads> <expiredAd1> <expiredAd2>");
+        Console.WriteLine("All arguments are mandatory.");
+        Console.WriteLine("Expired ads beyond 1 and 2 can be supplied but are ignored per SpecWeb source.");
+        Console.WriteLine("Output written to: <directory>/{0}", AdsFile);
+        Console.WriteLine("NB <directory> better exist.");
+    }
+
+    internal static void AppMain(Parameters! config)
+    {
+
+        string! directory;
+        int pttime        = 0;
+        int maxthread     = 0;
+
+        int [] expired = new int[2];
+
+        pttime      = (int) config.pttime;
+        maxthread   = (int) config.maxthread;
+        expired[0]  = (int) config.expiredAd1;
+        expired[1]  = (int) config.expiredAd2;
+        directory   = config.directory;
+
+        if (pttime == 0) {
+            pttime = 1800;
+        }
+
+        // XXX : cadgen99 uses time(...) which is time in seconds
+        // since since January 1, 1970.  DateTime(1970, 1, 1).
+
+        TimeSpan delta1970 = DateTime.Now - new DateTime(1970, 1, 1);
+        int ts = ((int)delta1970.TotalSeconds) + (pttime * 2);
+        int exp_ts  = ts - 31622400;
+
+        int [] demographic  = new int [CADFILE_ENTRIES];
+        int [] weight       = new int [CADFILE_ENTRIES];
+        int [] minmatch     = new int [CADFILE_ENTRIES];
+        int [] expired_date = new int [CADFILE_ENTRIES];
+
+        //
+        // Cut-and-paste from cadgen99.c with minor edits
+        // (in-place type declarations and commenting out unused variables)
+        //
+        int my_n = CAD_SEARCH_INTERVAL;
+        int match1 = (maxthread + CAD_SEARCH_INTERVAL) % my_n;
+
+        int j;
+        int i;
+        for (j = 0; j<CADFILE_ENTRIES; j++ ) {
+            int k = (j * 10000)%12301;
+            if ( k == 0) k = 12300;
+            int c4 = (k  )     & 0xf;
+            int c3 = (k >> 4)  & 0xf;
+            int c2 = (k >> 8)  & 0xf;
+            // int c1 = (k >> 12) & 0xf;    // XXX not used in test
+
+            int gender =  (k) % 2;
+            if ( gender == 1 ) gender = 0x20000000;
+            else               gender = 0x10000000;
+
+            int age     = (k) % 4;
+            if ( age == 0 ) age = 0x08000000;
+            else if ( age == 1 ) age = 0x04000000;
+            else if ( age == 2 ) age = 0x02000000;
+            else if ( age == 3 ) age = 0x01000000;
+
+            int area    = (c4 + c2) % 4;
+            if ( area == 0 )      area = 0x00800000;
+            else if ( area == 1 ) area = 0x00400000;
+            else if ( area == 2 ) area = 0x00200000;
+            else if ( area == 3 ) area = 0x00100000;
+
+            int interest1 = (c4 + c3) % 10;
+            if (interest1 == 0) interest1 = 0x00080000;
+            if (interest1 == 1) interest1 = 0x00040000;
+            if (interest1 == 2) interest1 = 0x00020000;
+            if (interest1 == 3) interest1 = 0x00010000;
+            if (interest1 == 4) interest1 = 0x00008000;
+            if (interest1 == 5) interest1 = 0x00004000;
+            if (interest1 == 6) interest1 = 0x00002000;
+            if (interest1 == 7) interest1 = 0x00001000;
+            if (interest1 == 8) interest1 = 0x00000800;
+            if (interest1 == 9) interest1 = 0x00000400;
+
+
+            int interest2 = c4 % 10;
+            if (interest2 == 0) interest2 =      0x00000200;
+            else if (interest2 == 1) interest2 = 0x00000100;
+            else if (interest2 == 2) interest2 = 0x00000080;
+            else if (interest2 == 3) interest2 = 0x00000040;
+            else if (interest2 == 4) interest2 = 0x00000010;
+            else if (interest2 == 5) interest2 = 0x00000020;
+            else if (interest2 == 6) interest2 = 0x00000008;
+            else if (interest2 == 7) interest2 = 0x00000004;
+            else if (interest2 == 8) interest2 = 0x00000002;
+            else if (interest2 == 9) interest2 = 0x00000001;
+
+            int combined = gender | age | area | interest1 | interest2;
+            int wts=k*k;
+            wts = wts % 1048576;
+            if (wts == 0) wts = 0x27104;
+            int match = MAX_CAD_WEIGHT;
+
+            demographic[j]  = combined;
+            weight[j]       = wts;
+            minmatch[j]     = match;
+            expired_date[j] = ts;
+        }
+
+        for (j=0; j < CADFILE_ENTRIES; j++) {
+            if (j == match1) {
+                minmatch[j] = 1;
+                weight[j] = 0x3ffff;
+                demographic[j] = demographic[j] | 0x3ff;
+                match1 = match1 + my_n;
+            }
+        }
+
+        /* Mark two ranges as expired */
+        j = expired[0];
+        for (i=0; i<my_n; i++) {
+            if (j > CADFILE_ENTRIES - 1)
+                expired_date[j-CADFILE_ENTRIES] = exp_ts;
+            else
+                expired_date[j] = exp_ts;
+            j = j+1;
+        }
+        j = expired[1];
+        for (i=0; i<my_n; i++) {
+            if (j > CADFILE_ENTRIES - 1)
+                expired_date[j-CADFILE_ENTRIES] = exp_ts;
+            else
+                expired_date[j] = exp_ts;
+            j = j+1;
+        }
+
+        GenerateOutput(directory, demographic, weight, minmatch, expired_date);
+    }
+
+#if SINGULARITY
+
+    private static void GenerateOutput(string /*!*/ directory,
+                                       int [] /*!*/ demographic,
+                                       int [] /*!*/ weight,
+                                       int [] /*!*/ minmatch,
+                                       int [] /*!*/ expired_date)
+    {
+        FILE fp;
+
+        string path;
+        if (directory == "") {
+            path = AdsFile;
+        }
+        else if (directory[directory.Length - 1] == '/') {
+            path = directory + AdsFile;
+        }
+        else {
+            path = directory + "/" + AdsFile;
+        }
+
+        fp = FILE.CreateFile(path);
+        if (fp == null) {
+            Console.WriteLine("Can't open file \"" + path + "\"");
+            return;
+        }
+
+        for (int j = 0; j < CADFILE_ENTRIES; j++) {
+            fp.Write(
+                String.Format("{0,5:d} {1,8:X} {2,8:X} {3,3:d} {4,10:d}\n",
+                              j, demographic[j], weight[j],
+                              minmatch[j], expired_date[j])
+                );
+        }
+        fp.Close();
+    }
+
+#else
+
+    private static void GenerateOutput(string directory,
+                                       int [] demographic,
+                                       int [] weight,
+                                       int [] minmatch,
+                                       int [] expired_date)
+    {
+        for (int j = 0; j < CADFILE_ENTRIES; j++) {
+            Console.WriteLine("{0,5:d} {1,8:X} {2,8:X} {3,3:d} {4,10:d}",
+                              j, demographic[j], weight[j],
+                              minmatch[j], expired_date[j]);
+        }
+    }
+
+#endif
+
+}
+
+#if SINGULARITY
+}
+#endif
diff --git a/base/Applications/ChildPing/ChildPing.csproj b/base/Applications/ChildPing/ChildPing.csproj
new file mode 100644
index 0000000..2dc2914
--- /dev/null
+++ b/base/Applications/ChildPing/ChildPing.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ChildPing</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ChildPing.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/ChildPing/ChildPing.sg b/base/Applications/ChildPing/ChildPing.sg
new file mode 100644
index 0000000..f0846a9
--- /dev/null
+++ b/base/Applications/ChildPing/ChildPing.sg
@@ -0,0 +1,96 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChildPing.sg
+//
+//  Note:   Simple ping-pong test child app #1
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.PingPong.Contracts;
+using System;
+using System.Diagnostics;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Microsoft.Singularity.PingPong
+{
+    [Category("PingPong")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<PingContract.Exp:Start> pingRef;
+
+        reflective private Parameters();
+        
+    }
+
+    public class ChildPing
+    {
+        internal  static int AppMain(Parameters! config)
+        {
+            PingContract.Exp conn = ((!)config.pingRef).Acquire(); 
+            if (conn == null) { 
+                throw new Exception("ChildPing: Unable to acquire handle to the the Ping Contract"); 
+            } 
+            
+#if false 
+            Endpoint * in ExHeap ep = Process.GetStartupEndpoint(0);
+            PingContract.Exp conn = ep as PingContract.Exp;
+            if (conn == null) {
+                // Wrong contract type!
+                delete ep;
+                return;
+            }
+#endif
+            // Start up and connect to the ChildPong image!
+            PongContract.Imp! childImp;
+            PongContract.Exp! childExp;
+            PongContract.NewChannel(out childImp, out childExp);
+
+            string[] args = new string[1];
+            args[0] = "ChildPong.x86";
+            Process child = new Process(args, (Endpoint * in ExHeap)childExp);
+            child.Start();
+
+            childImp.RecvPongReady();
+            conn.SendPingReady();
+
+            try {
+                while (true) {
+                    switch receive {
+                        case conn.StartPingPong(int numReps) :
+                            for (int i = 0; i < numReps; ++i) {
+                                int data;
+                                childImp.SendPing(42);
+                                childImp.RecvPong(out data);
+                            }
+
+                            conn.SendDone();
+                            break;
+
+                        case conn.ChannelClosed():
+                            return -1;
+                    }
+                }
+            }
+            finally {
+                delete conn;
+                delete childImp;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/ChildPong/ChildPong.csproj b/base/Applications/ChildPong/ChildPong.csproj
new file mode 100644
index 0000000..bd474c0
--- /dev/null
+++ b/base/Applications/ChildPong/ChildPong.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ChildPong</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ChildPong.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/ChildPong/ChildPong.sg b/base/Applications/ChildPong/ChildPong.sg
new file mode 100644
index 0000000..2af2bee
--- /dev/null
+++ b/base/Applications/ChildPong/ChildPong.sg
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChildPong.sg
+//
+//  Note:   Simple ping-pong second child process
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.PingPong.Contracts;
+using System;
+using System.Diagnostics;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Microsoft.Singularity.PingPong
+{
+    [Category("PingPong")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<PongContract.Exp:Start> pongRef;
+
+        reflective private Parameters();
+        
+    }
+    
+    public class ChildPong
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            PongContract.Exp conn = ((!)config.pongRef).Acquire(); 
+            if (conn == null) { 
+                throw new Exception("ChildPing: Unable to acquire handle to the the Pong Contract"); 
+            } 
+#if false
+            Endpoint * in ExHeap ep = Process.GetStartupEndpoint(0);
+            PongContract.Exp conn = ep as PongContract.Exp;
+            if (conn == null) {
+                // Wrong contract type!
+                delete ep;
+                return;
+            }
+#endif 
+            conn.SendPongReady();
+
+            try {
+                while(true) {
+                    switch receive {
+                        case conn.Ping(int data):
+                            conn.SendPong(data);
+                            break;
+
+                        case conn.ChannelClosed():
+                            return -1;
+                    }
+                }
+            }
+            finally {
+                delete conn;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Contracts/Counter.Contracts/Counter.Contracts.csproj b/base/Applications/Contracts/Counter.Contracts/Counter.Contracts.csproj
new file mode 100644
index 0000000..89e2d72
--- /dev/null
+++ b/base/Applications/Contracts/Counter.Contracts/Counter.Contracts.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Counter.Contracts</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CounterContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Applications/Contracts/Counter.Contracts/CounterContract.sg b/base/Applications/Contracts/Counter.Contracts/CounterContract.sg
new file mode 100644
index 0000000..abfac1e
--- /dev/null
+++ b/base/Applications/Contracts/Counter.Contracts/CounterContract.sg
@@ -0,0 +1,57 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Contracts\Test.Contracts\CounterContract.sg
+//
+//  Note:
+//
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services
+{
+    contract CounterContract : ServiceContract
+    {
+        public const string ModuleName = "/Counter";
+
+        out message Success();
+
+        in message Increment();
+        out message AckIncrement(int num);
+        out message NakIncrement();
+
+        in message BeginCount();
+        out message Current(int num);
+        in message Next();
+        in message End();
+        out message Terminated();
+
+        override state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            Increment? -> (AckIncrement!
+                           or NakIncrement!
+                          ) -> Ready;
+
+            BeginCount? -> Count;
+        }
+
+        state Count : one {
+            Current! -> AckCount;
+            Terminated! -> Ready;
+        }
+
+        state AckCount : one {
+            Next? -> Count;
+            End? -> Ready;
+        }
+    }
+}
diff --git a/base/Applications/CredentialsControl/CredentialsControl.csproj b/base/Applications/CredentialsControl/CredentialsControl.csproj
new file mode 100644
index 0000000..5cdaf56
--- /dev/null
+++ b/base/Applications/CredentialsControl/CredentialsControl.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>cred</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CredentialsControl.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\CredentialsManager.Contracts\CredentialsManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\CredentialsManager\CredentialsManager.Library.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/CredentialsControl/CredentialsControl.sg b/base/Applications/CredentialsControl/CredentialsControl.sg
new file mode 100644
index 0000000..cd13566
--- /dev/null
+++ b/base/Applications/CredentialsControl/CredentialsControl.sg
@@ -0,0 +1,512 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Applications/CredentialsControl/CredentialsControl.sg
+//
+//  Note:	Command-line tool for controlling the Credentials Manager Service.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Security;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+
+    [ConsoleCategory(DefaultAction=true)]
+    internal class DefaultCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DefaultCommand();
+        
+        internal int AppMain()
+        {
+            Console.WriteLine("Use -? for a list of commands.");
+            return 0;
+        }
+    }
+
+    [ConsoleCategory(Action="add", HelpMessage="Adds credentials (user id and password) to the credentials store.")]
+    internal class AddCredentialsCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal AddCredentialsCommand();
+        
+        [BoolParameter("replace", Mandatory=false, HelpMessage="If specified, will replace existing credentials with the same name.", Default=true)]
+        public bool ReplaceExistingCredentials;
+        
+        [StringParameter("username", Mandatory=true, Position=0, HelpMessage="The [domain\\]username of the credentials.")]
+        public string UserName;
+        
+        [StringParameter("password", Mandatory=true, Position=1, HelpMessage="The password for this account.")]
+        public string Password;
+        
+        [StringParameter("tag", Mandatory=false, HelpMessage="A tag that can be used to distinguish different instances of the same account name.")]
+        public string Tag;
+        
+        [BoolParameter("default", Mandatory=false, HelpMessage="If specified, then the credentials will be registered as the default credentials.", Default=true)]
+        public bool AddDefaultProtocolMapping;
+        
+        internal int AppMain()
+        {
+            try
+            {
+                assert this.UserName != null;
+                assert this.Password != null;
+                
+                if (this.Tag == null)
+                    this.Tag = "";
+                
+                CredentialsManager.AddCredentials(this.UserName, this.Tag, this.Password, this.ReplaceExistingCredentials);
+                Console.WriteLine("Credentials successfully added to credentials store.");
+
+                const string Wildcard = "*";
+
+                if (this.AddDefaultProtocolMapping)
+                {
+                    CredentialsManager.AddProtocolMapping(
+                        Wildcard,
+                        Wildcard,
+                        Wildcard,
+                        Wildcard,
+                        this.UserName,
+                        this.Tag,
+                        true);
+                    Console.WriteLine("Default protocol mapping added.");
+                }
+                
+                return 0;
+                    
+            } catch (Exception! ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="del", HelpMessage="Deletes credentials from the credentials store.")]
+    internal class DeleteCredentialsCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DeleteCredentialsCommand();
+        
+        [StringParameter("username", Mandatory=true, Position=0, HelpMessage="The [domain\\]username of the credentials.")]
+        public string UserName;
+        
+        [StringParameter("tag", Mandatory=false, HelpMessage="A tag that can be used to distinguish different instances of the same account name.")]
+        public string Tag;
+        
+        internal int AppMain()
+        {
+            try {
+                assert this.UserName != null;
+                
+                if (this.Tag == null)
+                    this.Tag = "";
+                    
+                CredentialsManager.DeleteCredentials(this.UserName, this.Tag);
+                Console.WriteLine("Credentials deleted.");
+                return 0;
+
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="delall", HelpMessage="Deletes all credentials from the credentials store.")]
+    internal class DeleteAllCredentialsCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DeleteAllCredentialsCommand();
+        
+        internal int AppMain()
+        {
+            try {
+                
+                CredentialsManager.DeleteAllCredentials();
+                Console.WriteLine("All credentials deleted.");
+                return 0;
+                
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    
+    [ConsoleCategory(Action="list", HelpMessage="Shows a list of the credentials in the credentials store.")]
+    internal class ListCredentialsCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal ListCredentialsCommand();
+        
+        internal int AppMain()
+        {
+            try {
+                
+                CredentialsManagerContract.Imp! manager = CredentialsManager.ConnectService();
+                try {
+                
+                    manager.SendEnumerateCredentials();
+                    
+                    switch receive {
+                        case manager.CredentialsList(list):
+                        
+                            if (list.Length == 0) {
+                                Console.WriteLine("No entries in credentials store.");
+                            } else {
+                        
+                                const string format = "{0,-20} {1,-20}";
+                                
+                                Console.WriteLine(format, "User name", "Tag");
+                                Console.WriteLine(format, "=========", "===");
+                            
+                                for (int i = 0; i < list.Length; i++) {
+                                    expose(list[i]) {
+                                        string! username = Bitter.ToString2(list[i].CredentialsName);
+                                        string! tag = Bitter.ToString2(list[i].Tag);
+                                        Console.WriteLine(format, username, tag);
+                                    }
+                                }
+                            }
+                            
+                            delete list;
+                            return 0;
+                            
+                        case manager.RequestFailed(error):
+                            Util.ShowCredError(error);
+                            return 1;
+                    }
+                } finally {
+                    delete manager;
+                }
+                
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="addmap", HelpMessage="Add a mapping from a protocol tuple to credentials.")]
+    internal class AddProtocolMappingCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal AddProtocolMappingCommand();
+        
+        [StringParameter("app", HelpMessage="The application protocol, such as 'smb' or 'http'.", Mandatory=true, Position=0)]
+        string ApplicationProtocol;
+        
+        [StringParameter("service", HelpMessage="The remote service name, such as 'fooserver.example.com' or '192.168.0.1',", Mandatory=false, Position=1)]
+        string ServiceAddress;
+
+        [StringParameter("authp", HelpMessage="The authentication protocol, such as 'ntlm'.", Mandatory=true, Position=2)]
+        string AuthenticationProtocol;
+        
+        [StringParameter("realm", HelpMessage="The authentication realm, such as 'yourdomain'.", Mandatory=true, Position=3)]
+        string Realm;
+
+        [StringParameter("username", HelpMessage="The username (credentials name) to map to.", Mandatory=true, Position=4)]
+        string CredentialsName;
+        
+        [StringParameter("tag", HelpMessage="The credentials tag, which can be used to disambiguate between credentials with the same name.", Mandatory=false, Position=5, Default="")]
+        string Tag;
+        
+        [BoolParameter("replace", HelpMessage="If specified, then any existing entry will be replaced.", Default=true)]
+        bool ReplaceExistingEntry;
+        
+        internal int AppMain()
+        {
+            try {
+            
+                CredentialsManager.AddProtocolMapping(
+                    this.ApplicationProtocol,
+                    this.ServiceAddress,
+                    this.AuthenticationProtocol,
+                    this.Realm,
+                    this.CredentialsName,
+                    this.Tag,
+                    this.ReplaceExistingEntry);
+                Console.WriteLine("The protocol mapping has been added.");
+                return 0;
+                
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="delmap", HelpMessage="Delete a mapping from a protocol tuple to credentials.")]
+    internal class DeleteProtocolMappingCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DeleteProtocolMappingCommand();
+        
+        [StringParameter("app", HelpMessage="The application protocol, such as 'smb' or 'http'.", Mandatory=true, Position=0)]
+        string ApplicationProtocol;
+        
+        [StringParameter("service", HelpMessage="The remote service name, such as 'fooserver.example.com' or '192.168.0.1',", Mandatory=false, Position=1)]
+        string ServiceAddress;
+
+        [StringParameter("authp", HelpMessage="The authentication protocol, such as 'ntlm'.", Mandatory=true, Position=2)]
+        string AuthenticationProtocol;
+        
+        [StringParameter("realm", HelpMessage="The authentication realm, such as 'yourdomain'.", Mandatory=true, Position=3)]
+        string Realm;
+
+        internal int AppMain()
+        {
+            try {
+                
+                CredentialsManager.DeleteProtocolMapping(
+                    this.ApplicationProtocol,
+                    this.ServiceAddress,
+                    this.AuthenticationProtocol,
+                    this.Realm);
+                Console.WriteLine("The protocol mapping has been deleted.");
+                return 0;
+                
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="delmapall", HelpMessage="Delete all protocol mappings.")]
+    internal class DeleteAllProtocolMappingsCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DeleteAllProtocolMappingsCommand();
+        
+        internal int AppMain()
+        {
+            try {
+                
+                CredentialsManager.DeleteAllProtocolMappings();
+                Console.WriteLine("All protocol mappings have been deleted.");
+                return 0;
+                
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="listmap", HelpMessage="Shows a list of all protocol mappings.")]
+    internal class ListProtocolMappingsCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal ListProtocolMappingsCommand();
+        
+        internal int AppMain()
+        {
+            try {
+                
+                CredentialsManagerContract.Imp! manager = CredentialsManager.ConnectService();
+                try {
+                
+                    manager.SendEnumerateProtocolMappings();
+                    
+                    switch receive {
+                    
+                        case manager.ProtocolMappings(list):
+                            Console.WriteLine("Protocol mappings:");
+                            
+                            const string format = "{0,-10} {1,-10} {2,-10} {3,-10} {4,-10} {5,-10}";
+                            
+                            Console.WriteLine(format, "App Prot.", "Service", "Auth Prot.", "Realm", "Credentials", "Tag");
+                            Console.WriteLine(format, "=========", "=======", "==========", "=====", "===========", "===");
+                                
+                            for (int i = 0; i < list.Length; i++) {
+                                string! applicationProtocol;
+                                string! serviceName;
+                                string! authenticationProtocol;
+                                string! realm;
+                                string! credentialsName;
+                                string! tag;
+                                
+                                expose(list[i]) {
+                                    // expose(list[i].ProtocolTuple) {
+                                        applicationProtocol = Bitter.ToString2(list[i].ProtocolTuple.ApplicationProtocol);
+                                        serviceName = Bitter.ToString2(list[i].ProtocolTuple.ServiceAddress);
+                                        authenticationProtocol = Bitter.ToString2(list[i].ProtocolTuple.AuthenticationProtocol);
+                                        realm = Bitter.ToString2(list[i].ProtocolTuple.Realm);
+                                    // }
+                                    // expose(list[i].CredentialsId) {
+                                        credentialsName = Bitter.ToString2(list[i].CredentialsId.CredentialsName);
+                                        tag = Bitter.ToString2(list[i].CredentialsId.Tag);
+                                    // }
+                                }
+                                
+                                Console.WriteLine(format, 
+                                    applicationProtocol,
+                                    serviceName,
+                                    authenticationProtocol,
+                                    realm,
+                                    credentialsName,
+                                    tag);
+                            }
+                            
+                            delete list;
+                            
+                            return 0;
+                            
+                        case manager.RequestFailed(error):
+                            Util.ShowCredError(error);
+                            return 1;
+                    }
+                            
+                
+                
+                } finally {
+                    delete manager;
+                }
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+    [ConsoleCategory(Action="testmap", HelpMessage="Test a protocol mapping.  Specify a protocol tuple, and the command will show you which credentials would be selected.")]
+    internal class TestProtocolMappingCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter("app", HelpMessage="The application protocol, such as 'smb' or 'http'.", Mandatory=true, Position=0)]
+        string ApplicationProtocol;
+        
+        [StringParameter("service", HelpMessage="The remote service name, such as 'fooserver.example.com' or '192.168.0.1',", Mandatory=true, Position=1)]
+        string ServiceAddress;
+
+        [StringParameter("authp", HelpMessage="The authentication protocol, such as 'ntlm'.", Mandatory=true, Position=2)]
+        string AuthenticationProtocol;
+        
+        [StringParameter("realm", HelpMessage="The authentication realm, such as 'yourdomain'.", Mandatory=true, Position=3)]
+        string Realm;
+
+        reflective internal TestProtocolMappingCommand();
+        
+        internal int AppMain()
+        {
+            try {
+                
+                string! credentialsName;
+                string! tag;
+                
+                Console.WriteLine("Checking:");
+                Console.WriteLine("    Application Protocol     = " + this.ApplicationProtocol);
+                Console.WriteLine("    Service Address          = " + this.ServiceAddress);
+                Console.WriteLine("    Authentication Protocol  = " + this.AuthenticationProtocol);
+                Console.WriteLine("    Authentication Realm     = " + this.Realm);
+                Console.WriteLine("");
+            
+                if (CredentialsManager.FindMatchingProtocolMapping(
+                    this.ApplicationProtocol,
+                    this.ServiceAddress,
+                    this.AuthenticationProtocol,
+                    this.Realm,
+                    true,
+                    out credentialsName,
+                    out tag))
+                {
+                    Console.WriteLine("Credentials selected: {0} {1}", credentialsName, tag);
+                    return 0;
+                } else {
+                    Console.WriteLine("No mappings found that match the specified protocol tuple.");
+                    return 1;
+                }
+                
+            } catch (Exception ex) {
+                Util.ShowException(ex);
+                return -1;
+            }
+        }
+    }
+    
+
+    class Util
+    {		
+        public static void ShowException(Exception! chain)
+        {
+            for (Exception ex = chain; ex != null; ex = ex.InnerException) {
+                Console.WriteLine(ex.GetType().FullName + ": " + ex.Message);
+            }
+        }
+        
+        public static void ShowCredError(CredError error)
+        {
+            Console.WriteLine("Error: " + CredentialsManager.CredErrorToString(error));
+        }
+    }
+}
diff --git a/base/Applications/Date/Date.cs b/base/Applications/Date/Date.cs
new file mode 100644
index 0000000..41f76f6
--- /dev/null
+++ b/base/Applications/Date/Date.cs
@@ -0,0 +1,63 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Date.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(HelpMessage="Show attributes associated with a file", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Date.AppMain(this);
+        }
+    }
+
+    public class Date
+    {
+        private static void ConsoleWriteDateTime(string preamble, DateTime dt)
+        {
+            Console.WriteLine("{0}{1:d4}/{2:d2}/{3:d2} {4:d2}:{5:d2}:{6:d2}.{7:d3}",
+                preamble, dt.Year, dt.Month, dt.Day,
+                dt.Hour, dt.Minute, dt.Second, dt.Millisecond);
+        }
+
+        private static void ConsoleWriteTimeSpan(string preamble, TimeSpan sp)
+        {
+            Console.WriteLine("{0}{1:d5} days {2:d2}:{3:d2}:{4:d2}.{5:d3}",
+                preamble, sp.TotalDays,
+                sp.Hours, sp.Minutes, sp.Seconds, sp.Milliseconds);
+        }
+
+        //[ShellCommand("date", "Display date and time")]
+        internal static int AppMain(Parameters! config)
+        {
+            ConsoleWriteTimeSpan("Kernel: ", ProcessService.GetUpTime());
+            ConsoleWriteDateTime("UTC:    ", DateTime.UtcNow);
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Date/Date.csproj b/base/Applications/Date/Date.csproj
new file mode 100644
index 0000000..4b75e27
--- /dev/null
+++ b/base/Applications/Date/Date.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Date</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Date.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Godot/GOdot.csproj b/base/Applications/Godot/GOdot.csproj
new file mode 100644
index 0000000..0b7b3d1
--- /dev/null
+++ b/base/Applications/Godot/GOdot.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Godot</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Godot.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Godot/Godot.cs b/base/Applications/Godot/Godot.cs
new file mode 100644
index 0000000..d2cf674
--- /dev/null
+++ b/base/Applications/Godot/Godot.cs
@@ -0,0 +1,178 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Godot.cs
+//
+//  Note:   Singularity wait primitives test program.
+//
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(HelpMessage="Show attributes associated with a file", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter( "t", Default=2, HelpMessage="Number of Waiters (threads)")]
+        internal long numberOfWaiters;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Godot.AppMain(this);
+        }
+    }
+    
+    public class Godot
+    {
+        private static Mutex! mutex;
+        private static WaitHandle[]! waiters;
+        private static WaitHandle[]! others;
+        private static String[]! names;
+        private static WaiterThread[] threadDetails;
+        private static Thread[] threads;
+
+        private class WaiterThread {
+            private uint myIndex;
+
+            public WaiterThread(uint index) {
+                myIndex = index;
+            }
+
+            public void Go()
+            {
+                String myName = names[myIndex];
+
+                Console.Write("Enter Thread {0}\n", myName);
+
+                Console.Write("  {0}: signaling auto-reset event\n", myName);
+                ((AutoResetEvent!)waiters[myIndex]).Set();
+
+                for (uint Loop = 0; Loop < 5; Loop++) {
+                    Console.Write("  {0}: waiting for mutex\n", myName);
+                    mutex.WaitOne();
+                    Console.Write("  {0}: got mutex\n", myName);
+
+                    Thread.Sleep(1000);
+
+                    Console.Write("  {0}: releasing mutex\n", myName);
+                    mutex.ReleaseMutex();
+                    Thread.Yield();
+                }
+
+                //
+                // Tell other waiters we're done.
+                //
+                Console.Write("  {0}: signaling manual-reset event\n", myName);
+                ((ManualResetEvent!)others[myIndex]).Set();
+
+                //
+                // Wait for other waiter.
+                //
+                Console.Write("  {0}: waiting for other waiters\n", myName);
+                foreach (WaitHandle! other in others) {
+                    other.WaitOne();
+                }
+                Console.Write("  {0}: heard from other waiters\n", myName);
+
+                Console.Write("Exit Thread {0}\n", myName);
+            }
+        }
+
+        public static void Usage()
+        {
+            Console.WriteLine("\nUsage: godot [NumberOfWaitThreads]\n\n");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            uint numberOfWaiters = (uint) config.numberOfWaiters;
+
+            Console.Write("\nStarting wait test with {0} wait threads\n\n",
+                          numberOfWaiters);
+
+            names = new String[4];
+            names[0] = "Estragon";
+            names[1] = "Vladimir";
+            names[2] = "Lucky";
+            names[3] = "Pozzo";
+
+            //
+            // Create some synchronization primitives to test.
+            //
+            mutex = new Mutex(true);
+            waiters = new WaitHandle[numberOfWaiters];
+            others = new WaitHandle[numberOfWaiters];
+            for (uint Loop = 0; Loop < numberOfWaiters; Loop++) {
+                waiters[Loop] = new AutoResetEvent(false);
+                others[Loop] = new ManualResetEvent(false);
+            }
+
+            Console.Write("Created synchronization primitives\n\n");
+
+            //
+            // Fire up the waiters.
+            //
+            threads = new Thread[numberOfWaiters];
+            threadDetails = new WaiterThread[numberOfWaiters];
+            for (uint Loop = 0; Loop < numberOfWaiters; Loop++) {
+                threadDetails[Loop] = new WaiterThread(Loop);
+                threads[Loop] = new Thread(
+                    new ThreadStart(threadDetails[Loop].Go));
+                ((!)threads[Loop]).Start();
+            }
+
+            //
+            // Wait for the waiters to tell us they're about to start waiting.
+            //
+            Console.Write("Waiting for all waiters to start\n");
+            foreach (WaitHandle! waiter in waiters) {
+                waiter.WaitOne();
+            }
+
+            //
+            // Release the Mutex to the wolves.
+            //
+            Console.Write("About to release mutex\n");
+            mutex.ReleaseMutex();
+            Console.Write("Mutex released\n");
+
+            //
+            // Wait for the threads to die.
+            //
+#if false
+#if NOT_YET
+            Console.Write("Waiting for all waiters to terminate\n");
+            for (uint Loop = 0; Loop < numberOfWaiters; Loop++) {
+                threads[Loop].Join();
+            }
+#else
+            Console.Write("Waiting for 30 sec while threads play\n");
+            Thread.Sleep(30000);
+#endif
+#endif
+
+            Console.Write("Goodbye\n");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Hello/Hello.cs b/base/Applications/Hello/Hello.cs
new file mode 100644
index 0000000..ec68e8e
--- /dev/null
+++ b/base/Applications/Hello/Hello.cs
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Hello.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class Hello
+    {
+        public static int Main(String[] args)
+        {
+            Console.WriteLine("Hello World!");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Hello/Hello.csproj b/base/Applications/Hello/Hello.csproj
new file mode 100644
index 0000000..c9d9812
--- /dev/null
+++ b/base/Applications/Hello/Hello.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Hello</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Hello.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/HelloMp/HelloMp.cs b/base/Applications/HelloMp/HelloMp.cs
new file mode 100644
index 0000000..6ced2be
--- /dev/null
+++ b/base/Applications/HelloMp/HelloMp.cs
@@ -0,0 +1,25 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HelloMp.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class HelloMp
+    {
+        public static int Main(String[] args)
+        {
+            Console.WriteLine("If you see this message, it means you haven't");
+            Console.WriteLine("run Applications/HelloMpAsm/load-hack.cmd");
+            Console.WriteLine("Please run the command AFTER msb Distro\\small.proj");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/HelloMp/HelloMp.csproj b/base/Applications/HelloMp/HelloMp.csproj
new file mode 100644
index 0000000..8867b2a
--- /dev/null
+++ b/base/Applications/HelloMp/HelloMp.csproj
@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>HelloMp</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="HelloMp.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/HelloMpAsm/HelloMpAsm.cpp b/base/Applications/HelloMpAsm/HelloMpAsm.cpp
new file mode 100644
index 0000000..f4cb8ba
--- /dev/null
+++ b/base/Applications/HelloMpAsm/HelloMpAsm.cpp
@@ -0,0 +1,30 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+int main ()
+{
+    __asm {
+        //call printhellomp;
+        // myloop: jmp myloop;
+        // jmp mydone;
+        //printhellomp:
+        mov   ebx, 0xb8000;
+        add   ebx, 7680;
+        mov   [ebx+0], 0x0020;
+        mov   [ebx+1], 0x00e0;
+        mov   [ebx+2], 0x0048;
+        mov   [ebx+3], 0x00e0;
+        mov   [ebx+4], 0x0069;
+        mov   [ebx+5], 0x00e0;
+        mov   [ebx+6], 0x0021;
+        mov   [ebx+7], 0x00e0;
+        mov   [ebx+8], 0x0020;
+        mov   [ebx+9], 0x00e0;
+        // ret;
+        // mydone:
+    }
+    // return 0x9876543;
+}
diff --git a/base/Applications/HelloMpAsm/README b/base/Applications/HelloMpAsm/README
new file mode 100644
index 0000000..00a2466
--- /dev/null
+++ b/base/Applications/HelloMpAsm/README
@@ -0,0 +1,20 @@
+
+Notes:
+
+    HelloMpAsm depends on HelloMp
+
+
+HelloMp.cpp 
+
+    contains the assembly code that prints "Hi!" to the screen
+    directly (through 0xb800 physical address).
+
+build-hellomp.cmd
+
+    Creates obj/HelloMpAsm.exe in local obj/ directory.
+    
+load-hack.cmd
+
+    After building the entire distribution, run load-hack.cmd so that
+    the standard HelloMp executable (HelloMp.x86 from Applications/HelloMp)
+    will be overwritten with HelloMpAsm.exe, then use network boot.
diff --git a/base/Applications/HelloMpAsm/build-hellomp.cmd b/base/Applications/HelloMpAsm/build-hellomp.cmd
new file mode 100644
index 0000000..d99c6c6
--- /dev/null
+++ b/base/Applications/HelloMpAsm/build-hellomp.cmd
@@ -0,0 +1,9 @@
+
+mkdir obj
+
+cl.exe /nologo /c /Oxs /GFy /Gd /Gy /W3 /Zi /Zl /GS- /I..\include /FAsc  /Faobj\HelloMpAsm.lst  /Fdobj\HelloMpAsm.pdb  /Foobj\HelloMpAsm.obj HelloMpAsm.cpp 
+
+link /nologo /out:obj\HelloMpAsm.exe obj\HelloMpAsm.obj /pdb:obj\HelloMpAsm.pdb /map:obj\HelloMpAsm.map  /fixed /entry:main /incremental:no  /machine:ix86 /subsystem:native /ignore:4078 /merge:.rdata=.data /merge:.bss=.data /merge:.data=.text
+
+rename obj\hellompasm.pdb a
+rename obj\a HelloMpAsm.pdb
diff --git a/base/Applications/HelloMpAsm/load-hack.cmd b/base/Applications/HelloMpAsm/load-hack.cmd
new file mode 100644
index 0000000..52f22a9
--- /dev/null
+++ b/base/Applications/HelloMpAsm/load-hack.cmd
@@ -0,0 +1,6 @@
+
+copy obj\HelloMpAsm.exe ..\..\Distro\obj\Prototype.MarkSweep.x86\HelloMp.x86
+
+copy obj\HelloMpAsm.exe ..\..\Distro\obj\Prototype.ApicMP.Min.MarkSweep.Prototype.MarkSweep\Singularity\Binaries\HelloMp.x86
+
+copy obj\HelloMpAsm.exe ..\..\Distro\obj\Debug.ApicMP.Min.MarkSweep.Debug.MarkSweep\Singularity\Binaries\HelloMp.x86
diff --git a/base/Applications/IoLibtest/IoLibTest.csproj b/base/Applications/IoLibtest/IoLibTest.csproj
new file mode 100644
index 0000000..decf47a
--- /dev/null
+++ b/base/Applications/IoLibtest/IoLibTest.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>IoLibTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IoLibTest.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/IoLibtest/IoLibtest.sg b/base/Applications/IoLibtest/IoLibtest.sg
new file mode 100644
index 0000000..bc90132
--- /dev/null
+++ b/base/Applications/IoLibtest/IoLibtest.sg
@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.IO;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class IoLibTest
+    {
+        public static void Main(string[] args)
+        {
+            if (args != null && args.Length >1) {
+                try {
+                    File.Delete(args[1]);
+                } 
+                catch (Exception e) {
+                    Console.WriteLine("error deleting {0}, msg={1}", args[1], e.Message);
+                }
+            }
+            return ; 
+        }
+    }
+}
+
diff --git a/base/Applications/Lisp/Lisp.cs b/base/Applications/Lisp/Lisp.cs
new file mode 100644
index 0000000..c7f0e71
--- /dev/null
+++ b/base/Applications/Lisp/Lisp.cs
@@ -0,0 +1,133 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Lisp.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using ProtoLisp;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringArrayParameter( "args", HelpMessage="arg bucket")]
+        internal string[] args;
+        
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Lisp.AppMain(this);
+        }
+    }
+
+    public class Lisp
+    {
+        // Returns true if the arguments were valid, false for illegal args
+        private static bool GetLispArgs(string[]! args, out bool helpArg, out bool traceArg, out string exprArg)
+        {
+            traceArg = false;
+            helpArg = false;
+            exprArg = "";
+
+            for (int i = 0; i < args.Length; ++i)
+            {
+                string! args_i = (!)args[i];
+
+                if ((args_i.Length > 0) && (args_i[0] == '/'))
+                {
+                    string arg = args_i.Substring(1);
+
+                    if (arg.Equals("trace"))
+                    {
+                        traceArg = true;
+                        continue;
+                    }
+                    else if (arg.Equals("help") || arg.Equals("?"))
+                    {
+                        helpArg = true;
+                        continue;
+                    }
+                }
+                else
+                {
+                    // A non-switch must be the last argument
+                    if (i == (args.Length - 1))
+                    {
+                        exprArg = args_i;
+                        continue;
+                    }
+                }
+
+                // If we fall out, we have illegal arguments.
+                return false;
+            }
+
+            // If we didn't abort, everything was OK
+            return true;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            bool trace, help;
+            string expr;
+            string[] args = config.args; 
+
+            
+            if (args== null || args.Length <= 0)
+            {
+                Console.WriteLine("ProtoLisp interpreter.");
+                Console.WriteLine("Usage: lisp [flags] <lispexpression>");
+                Console.WriteLine("Run \"lisp /help\" or \"lisp /?\" for more details");
+                return 0;
+            }
+
+            bool validUsage = GetLispArgs(args, out help, out trace, out expr);
+
+            if ((!validUsage) || (help))
+            {
+                Console.WriteLine("ProtoLisp is an extremely basic Lisp-like interpreter.\n");
+                Console.WriteLine("Usage: lisp [flags] LISPEXPRESSION\n");
+                Console.WriteLine("Flags:");
+                Console.WriteLine("  /? or /help : Print this message");
+                Console.WriteLine("  /trace : Print verbose traces from the interpreter\n");
+                Console.WriteLine("The following classic Lisp primitives are available:\n");
+                Console.WriteLine("    atom, eq, car, cdr, cons, cond\n");
+                Console.WriteLine("In addition,");
+                Console.WriteLine("  - Variables are lexically scoped, not dynamically scoped.");
+                Console.WriteLine("  - (define X Y) binds the name \"X\" to the value \"Y\"");
+                Console.WriteLine("    in the global context");
+                Console.WriteLine("  - (lambda (ARGLIST) (BODYEXPRESSION)) creates a \"closure\" by");
+                Console.WriteLine("    capturing the ambient lexical scope.");
+                Console.WriteLine("  - (defun NAME (ARGLIST) (BODYEXPR) is sugar for");
+                Console.WriteLine("    (define NAME (lambda (ARGLIST) (BODYEXPR)))\n");
+                Console.WriteLine("  - The arithmetic operators *, +, -, / are available. Math is");
+                Console.WriteLine("    performed with integers.");
+            }
+            else
+            {
+                ProtoLisp.Engine engine = new ProtoLisp.Engine();
+                System.Console.Write(engine.EvalAll(expr, true, trace));
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Lisp/Lisp.csproj b/base/Applications/Lisp/Lisp.csproj
new file mode 100644
index 0000000..e6b9471
--- /dev/null
+++ b/base/Applications/Lisp/Lisp.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Lisp</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Lisp.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\ProtoLisp\ProtoLisp.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Login/Login.csproj b/base/Applications/Login/Login.csproj
new file mode 100644
index 0000000..6b0962f
--- /dev/null
+++ b/base/Applications/Login/Login.csproj
@@ -0,0 +1,33 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Login</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Login.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml\Xml.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Login/Login.sg b/base/Applications/Login/Login.sg
new file mode 100644
index 0000000..53416f8
--- /dev/null
+++ b/base/Applications/Login/Login.sg
@@ -0,0 +1,244 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Text.RegularExpressions;
+using System.Threading;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Configuration;
+
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$truncate-history-privilege.localhost")]
+[assembly: AssertPrivilegeAttribute("$trusted-auth-privilege.localhost")]
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Login
+{
+    [ConsoleCategory(HelpMessage="Login", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Login.AppMain(this);
+        }
+    }
+
+    /// <summary>
+    /// Simple login process implementation.
+    /// Asks the user for its user name and starts a new instance of itself under
+    /// the new role. The new instance invokes the shell.
+    /// </summary>
+
+    // See WaitForChildThread below
+    internal contract WaitForChildContract {
+        out message Finish();
+        state Start: one {Finish! -> Done;}
+        state Done: one {}
+    }
+
+    public class Login
+    {
+        /// <summary>
+        /// Regular expression specifying a valid user name
+        /// </summary>
+        public const string Arc = @"[a-zA-Z1-90_\.]+";
+        /// <summary>
+        /// The name of the shell process
+        /// </summary>
+        public const string Shell = "shell";
+        private Regex! nameRegex = new Regex(Arc);
+
+        internal static int AppMain(Parameters! config)
+        {
+            Login login = new Login();
+            return login.Run();
+        }
+
+        internal int Run()
+        {
+            for(;;){
+                Console.Write("login: ");
+                string line = Console.ReadLine();
+                if (line != null && nameRegex.IsMatch(line)){
+                    return RunShell(line);
+                }
+            }
+        }
+
+        internal int RunShell(string! username)
+        {
+            int exitCode = 0;
+            string path;
+            try {
+                Process process = new Process(Shell, null, username);
+                UnicodePipeContract.Imp! stdInImp;
+                UnicodePipeContract.Exp! stdInExp;
+                UnicodePipeContract.NewChannel(out stdInImp, out stdInExp);
+                UnicodePipeContract.Imp! stdOutImp;
+                UnicodePipeContract.Exp! stdOutExp;
+                UnicodePipeContract.NewChannel(out stdOutImp, out stdOutExp);
+                process.SetStartupEndpoint(0, (Endpoint * in ExHeap) stdInExp);
+                process.SetStartupEndpoint(1, (Endpoint * in ExHeap) stdOutImp);
+                process.Start();
+                exitCode = WaitForShell(process, stdInImp, stdOutExp);
+                if (exitCode != 0) {
+                    Console.WriteLine("-- Exit code: {0}", exitCode);
+                }
+            }
+            catch (ProcessCreateException) {
+                Console.WriteLine("Can't create shell");
+            }
+            catch (Exception e) {
+                Console.Write("Can't start shell: Exception '{0}' caught.", e.Message);
+            }
+            return exitCode;
+        }
+
+        /// <summary>
+        /// Copy and echo characters from shell stdin to job stdin,
+        /// and from job stdout to shell stdout.
+        ///
+        /// Known limitation: if the child process opens
+        /// its own keyboard channel, the shell may never see the control-c
+        /// message.
+        /// </summary>
+        private int WaitForShell(Process! process,
+                                 [Claims] UnicodePipeContract.Imp:READY! childStdIn,
+                                 [Claims] UnicodePipeContract.Exp:READY! childStdOut)
+        {
+            WaitForChildContract.Imp! waitImp;
+            WaitForChildContract.Exp! waitExp;
+            WaitForChildContract.NewChannel(out waitImp, out waitExp);
+
+            PipeLookAhead cinput = ConsoleInput.AcquireInput();
+
+            ESet<UnicodePipeContract.Imp:ACK> childStdInAck =
+                new ESet<UnicodePipeContract.Imp:ACK>();
+            ESet<UnicodePipeContract.Imp:READY> childStdInReady =
+                new ESet<UnicodePipeContract.Imp:READY>();
+            ESet<UnicodePipeContract.Exp:READY> childStdOutReady =
+                    new ESet<UnicodePipeContract.Exp:READY>();
+
+            char[] in ExHeap exChar = new [ExHeap] char[1];
+            try {
+                WaitForChildThread.StartWaiting(process,
+                                                new TRef<WaitForChildContract.Exp:Start>(waitExp));
+
+                childStdInReady.Add(childStdIn);
+                childStdOutReady.Add(childStdOut);
+
+                bool done = false;
+                while (!done) {
+                    // invariant exChar != null && childStdInReady.Head(ep) ||
+                    //           exChar == null && childStdInReady.Empty
+                    switch receive {
+
+                        case cinput.Char(ch) && childStdInReady.Head(ep):
+                            // we have a char and childStdIn is ready
+                            assert exChar != null;
+                            // echo character
+                            //Console.Write(ch);
+                            exChar[0] = (char) ch;
+                            ep.SendWrite(exChar,0,1);
+                            exChar = null;
+                            childStdInAck.Add(ep);
+                            continue;
+
+                        case ep.AckWrite(buffer) in childStdInAck:
+                            assert exChar == null;
+                            exChar = buffer;
+                            childStdInReady.Add(ep);
+                            continue;
+
+                        case waitImp.Finish():
+                            //Console.WriteLine("finish");
+                            done = true;
+                            break;
+
+                        case ep.Write(buffer, index, count) in childStdOutReady:
+                            string s = Bitter.ToString2(buffer, index, count);
+                            Console.Write(s);
+                            ep.SendAckWrite(buffer);
+                            childStdOutReady.Add(ep);
+                            continue;
+
+                        case ep.ChannelClosed() in childStdInAck:
+                            delete ep;
+                            continue;
+
+                        case ep.ChannelClosed() in childStdOutReady:
+                            delete ep;
+                            continue;
+                    }
+                }
+            }
+            finally {
+                childStdInReady.Dispose();
+                childStdInAck.Dispose();
+                childStdOutReady.Dispose();
+                ConsoleInput.ReleaseInput(cinput);
+                delete waitImp;
+                delete exChar;
+            }
+            int exitCode = process.ExitCode;
+            process.Dispose(true);
+            return exitCode;
+        }
+
+        // [Hawblitzel] TODO: better ways to wait on a child process
+        private class WaitForChildThread
+        {
+            private Process! process;
+            private TRef<WaitForChildContract.Exp:Start>! expRef;
+
+            private WaitForChildThread(Process! process,
+                                       TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                this.process = process;
+                this.expRef = expRef;
+                base();
+            }
+
+            public static void StartWaiting(Process process,
+                                            TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                if (process == null) {
+                    WaitForChildContract.Exp exp = expRef.Acquire();
+                    exp.SendFinish();
+                    delete exp;
+                    return;
+                }
+
+                WaitForChildThread wft = new WaitForChildThread(process, expRef);
+                Thread t = new Thread(new ThreadStart(wft.Wait));
+                t.Start();
+            }
+
+            private void Wait()
+            {
+                process.Join();
+                WaitForChildContract.Exp exp = expRef.Acquire();
+                exp.SendFinish();
+                delete exp;
+            }
+        }
+    }
+}
diff --git a/base/Applications/MapPointProxy/Base64Decoder.cs b/base/Applications/MapPointProxy/Base64Decoder.cs
new file mode 100644
index 0000000..f8ca523
--- /dev/null
+++ b/base/Applications/MapPointProxy/Base64Decoder.cs
@@ -0,0 +1,160 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using Microsoft.Contracts;
+
+internal class Base64Decoder
+{
+    private string fSourceStr;
+    private int fCurStrIndex;
+    private bool fDone;
+
+    private int fBits;
+    private int fBitsFilled;
+
+    private const string CharsBase64  = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    private static readonly byte[] MapBase64 = ConstructMapBase64();
+    private const int MaxValidChar = (int)'z';
+    private const byte Invalid = unchecked((byte)-1);
+
+    public Base64Decoder(string! sourceString, int startIndex)
+    {
+        fSourceStr = sourceString;
+        fCurStrIndex = startIndex;
+        fDone = false;
+        Reset();
+    }
+
+    [Delayed]
+    public void Reset()
+    {
+        fBits = 0;
+        fBitsFilled = 0;
+    }
+
+    public byte[] Pump(int maxStrIndex, int maxReturnSize)
+    {
+        if ((fDone) || (fSourceStr == null))
+        {
+            return null;
+        }
+
+        int charsConsumed;
+
+        byte[] retval = InternalPump(fSourceStr, fCurStrIndex, maxStrIndex, maxReturnSize,
+                                     out charsConsumed, out fDone);
+
+        fCurStrIndex += charsConsumed;
+
+        return retval;
+    }
+
+    private byte[] InternalPump(string! sourceStr, int startIndex, int maxIndex, int maxReturnSize,
+                                out int charsConsumed, out bool done)
+    {
+        // walk hex digits pairing them up and shoving the value of each pair into a byte
+        byte[] newChunk = new byte[maxReturnSize];
+        int bytePos = 0;
+        int charPos = startIndex;
+        int b = fBits;
+        int bFilled = fBitsFilled;
+
+        while ( charPos < maxIndex && bytePos < maxReturnSize )
+        {
+            char ch = sourceStr[charPos];
+
+            // end?
+            if ( ch == '=' ) {
+                done = true;
+                break;
+            }
+
+            charPos++;
+
+            // ignore white space
+            if (char.IsWhiteSpace(ch)) {
+                continue;
+            }
+
+            int digit;
+            if ( ch > 122 || ( digit = MapBase64[ch] ) == Invalid ) {
+                throw new Exception("Invalid Base64 character: " + ch);
+            }
+
+            b = ( b << 6 ) | digit;
+            bFilled += 6;
+
+            if ( bFilled >= 8 ) {
+                // get top eight valid bits
+                newChunk[bytePos++] = (byte)( ( b >> ( bFilled - 8 ) ) & 0xFF );
+                bFilled -= 8;
+
+                if ( bytePos == maxReturnSize ) {
+                    break;
+                }
+            }
+        }
+
+        if (bytePos < maxReturnSize)
+        {
+            if ( charPos < maxIndex && sourceStr[charPos] == '=' ) {
+                bFilled = 0;
+
+                // ignore padding chars
+                do {
+                    charPos++;
+                } while ( charPos < maxIndex && sourceStr[charPos] == '=' );
+
+                // ignore whitespace after the padding chars
+                if ( charPos < maxIndex ) {
+                    while ( charPos < maxIndex ) {
+                        if ( ! char.IsWhiteSpace(sourceStr[charPos++]) )
+                            throw new Exception("Invalid Base64 character: " + sourceStr[charPos - 1]);
+                    }
+                }
+            }
+        }
+
+        fBits = b;
+        fBitsFilled = bFilled;
+        charsConsumed = charPos - startIndex;
+
+        if (bytePos < maxReturnSize)
+        {
+            byte[] trimmed = new byte[bytePos];
+            Buffer.BlockCopy(newChunk, 0, trimmed, 0, bytePos);
+            newChunk = trimmed;
+
+            // We ran out of characters, so we're done
+            done = true;
+
+        }
+        else
+        {
+            done = false;
+        }
+
+        return newChunk;
+    }
+
+    private static byte[] ConstructMapBase64()
+    {
+        byte[] mapBase64 = new byte[MaxValidChar + 1];
+
+        for ( int i = 0; i < mapBase64.Length; i++ ) {
+            mapBase64[i]= Invalid;
+        }
+
+        for ( int i = 0; i < CharsBase64.Length; i++ ) {
+            mapBase64[(int)CharsBase64[i]] = (byte)i;
+        }
+
+        return mapBase64;
+    }
+}
diff --git a/base/Applications/MapPointProxy/ByteBuffer.cs b/base/Applications/MapPointProxy/ByteBuffer.cs
new file mode 100644
index 0000000..340c112
--- /dev/null
+++ b/base/Applications/MapPointProxy/ByteBuffer.cs
@@ -0,0 +1,134 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+public class ByteBuffer
+{
+	private byte[] fData;
+	private int fSize; // Amount of fData actually available to the user
+
+	public ByteBuffer(int initialSize)
+	{
+		fData = new byte[initialSize];
+		fSize = initialSize;
+	}
+
+	public ByteBuffer()
+	{
+	}
+
+	public void EnsureSize(int overallSize)
+	{
+		// Asking for less space than you have does nothing
+		if (overallSize < fSize)
+		{
+			return;
+		}
+
+		// Asking for zero when we're empty does nothing
+		if (overallSize == 0)
+		{
+			return;
+		}
+
+		if ((fData == null) || (fData.Length < overallSize))
+		{
+			// Not enough room in our current array. Double until we're big enough.
+			int newSize = (fData == null) ? overallSize : fData.Length;
+			while (newSize < overallSize) { newSize *= 2; }
+			byte[] newBuffer = new byte[newSize];
+
+			if (fData != null)
+			{
+				int bytesToCopy = overallSize < fSize ? overallSize : fSize;
+				Buffer.BlockCopy(fData, 0, newBuffer, 0, bytesToCopy);
+			}
+
+			fData = newBuffer;
+		}
+
+		fSize = overallSize;
+	}
+
+	public void Add(byte[] newData, int offset, int length)
+	{
+		int previousSize = fSize;
+		EnsureSize(previousSize + length);
+		Buffer.BlockCopy(newData, offset, fData, previousSize, length);
+	}
+
+	public void Add(byte newByte)
+	{
+		int previousSize = fSize;
+		EnsureSize(previousSize + 1);
+		fData[previousSize] = newByte;
+	}
+
+	// WARNING; Do not rely on this being accessible across calls to
+	// Add() or EnsureSize()!! Do not index out of bounds!! UNSAFE!
+	public byte[] UnderlyingBuffer
+	{
+		get { return fData; }
+	}
+
+	public byte[] TrimAndCopy(int trimLength)
+	{
+		return TrimAndCopy(0, trimLength);
+	}
+
+	public byte[] TrimAndCopy(int offset, int trimLength)
+	{
+		byte[] retval = new byte[trimLength];
+		Buffer.BlockCopy(fData, offset, retval, 0, trimLength);
+		return retval;
+	}
+
+	public int Size
+	{
+		get
+		{
+			if (fData != null)
+			{
+				return fSize;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+	}
+
+	public byte this[int index]
+	{
+		get 
+		{
+			ValidateIndex(index);
+			return fData[index];
+		}
+
+		set
+		{
+			ValidateIndex(index);
+			fData[index] = value;
+		}
+	}
+
+	private void ValidateIndex(int index)
+	{
+		if (fData == null)
+		{
+			throw new IndexOutOfRangeException("Buffer currently empty");
+		}
+
+		if ((index < 0) || (index >= fSize))
+		{
+			throw new IndexOutOfRangeException();
+		}
+	}
+}
diff --git a/base/Applications/MapPointProxy/HttpAuthenticator.cs b/base/Applications/MapPointProxy/HttpAuthenticator.cs
new file mode 100644
index 0000000..31ffcb1
--- /dev/null
+++ b/base/Applications/MapPointProxy/HttpAuthenticator.cs
@@ -0,0 +1,166 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.Singularity.Crypto;
+
+public class HttpAuthenticator
+{
+    private HttpRequest fRequest;
+    private string fUsername, fPassword;
+    private MD5 fMD5;
+
+    public HttpAuthenticator(HttpRequest request, string username, string password)
+    {
+        fRequest = request;
+        fUsername = username;
+        fPassword = password;
+        fMD5 = new MD5();
+    }
+
+    public HttpResponse GetResponse()
+    {
+        // First try the original request
+        HttpResponse response = fRequest.GetResponse();
+
+        if (response == null)
+        {
+            throw new Exception("Initial HTTP request failed");
+        }
+
+        int status = response.StatusCode;
+
+        if (status != 401)
+        {
+            // No authentication was actually required
+            return response;
+        }
+        else
+        {
+            // Authentication is required. Go spelunking for the crypto challenge.
+            string challenge = response.GetHeader("WWW-Authenticate");
+
+            if (challenge == null)
+            {
+                throw new Exception("401 without a WWW-Authenticate header");
+            }
+
+            if (!challenge.StartsWith("Digest"))
+            {
+                throw new Exception("Invalid WWW-Authenticate header");
+            }
+
+            string realm = GetTaggedQuotedString(challenge, "realm");
+            string nonce = GetTaggedQuotedString(challenge, "nonce");
+            string opaque = GetTaggedQuotedString(challenge, "opaque");
+            string algorithm = GetTaggedQuotedString(challenge, "algorithm");
+
+            if ((algorithm != null) && (!algorithm.ToLower().Equals("md5")))
+            {
+                throw new Exception("Unknown authentication scheme");
+            }
+
+            if ((realm == null) || (nonce == null))
+            {
+                throw new Exception("Missing essential elements of WWW-Challenge");
+            }
+
+            // Compute the crypto response
+            string authResponse = "Digest username=\"" + fUsername +
+                "\",realm=\"" + realm +
+                "\",nonce=\"" + nonce +
+                "\",uri=\"" + fRequest.Resource +
+                "\",response=\"";
+
+            //
+            // The crypto response is specified (RFC 2069) as:
+            //
+            // MD5( concat(A1, ":", B))
+            // where A1 is:  MD5( concat( username, ":", realm, ":", password) )
+            // and B is:     concat( nonce, ":", A2)
+            // and A2 is:    MD5( concat (method, ":", digest-uri) )
+            // Where MD5(X) is a string of hex digits representing the MD5 digest of X.
+            // Got all that?
+            //
+
+            // Form A1 = MD5(username : realm : password)
+            string a1 = MD5(fUsername + ":" + realm + ":" + fPassword);
+
+            // Form A2 = md5(method : digest-uri)
+            string a2 = MD5(fRequest.Method + ":" + fRequest.Resource);
+
+            // Form B = nonce : A2
+            string b = nonce + ":" + a2;
+
+            // Form the unhashed final answer as MD5(A1 : B)
+            authResponse += MD5(a1 + ":" + b) + "\"";
+
+            // Echo the server's opaque string if present.
+            if (opaque != null)
+            {
+                authResponse += ",opaque=\"" + opaque + "\"";
+            }
+
+            fRequest.AddHeader("Authorization", authResponse);
+
+            // Rerun the request
+            response = fRequest.GetResponse();
+
+            if ((response != null) && (response.StatusCode == 401))
+            {
+                // Authentication failed; credentials must be bad
+                throw new Exception("Bad credentials");
+            }
+
+            // Looks like it worked after authentication
+            return response;
+        }
+    }
+
+    private string GetTaggedQuotedString(string! baseString, string tagName)
+    {
+        string tagPreamble = tagName + "=\"";
+        int tagStart = baseString.IndexOf(tagPreamble);
+
+        if (tagStart == -1)
+        {
+            return null;
+        }
+
+        int tagEnd = tagStart + tagPreamble.Length;
+        int quoteEnd = baseString.IndexOf('"', tagEnd);
+
+        if (quoteEnd == -1)
+        {
+            throw new Exception("Malformed tagged+quoted string");
+        }
+
+        return baseString.Substring(tagEnd, quoteEnd - tagEnd);
+    }
+
+    private string MD5(string! hashValue)
+    {
+        byte[] vals = Encoding.ASCII.GetBytes(hashValue);
+        byte[] result = (!)fMD5.Hash(vals);
+        return ToHexString(result);
+    }
+
+    private string ToHexString(byte[]! vals)
+    {
+        string retval = String.Empty;
+
+        for (int i = 0; i < vals.Length; ++i)
+        {
+            retval += vals[i].ToString("x2");
+        }
+
+        return retval;
+    }
+}
diff --git a/base/Applications/MapPointProxy/HttpRequest.cs b/base/Applications/MapPointProxy/HttpRequest.cs
new file mode 100644
index 0000000..df0a214
--- /dev/null
+++ b/base/Applications/MapPointProxy/HttpRequest.cs
@@ -0,0 +1,768 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ * This helper class assists in forming HTTP requests and retrieving the
+ * resulting data.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+public class HttpRequest
+{
+    private string fRequestUri, fHost, fResource, fMethod, fContentType;
+    private int fHostPort;
+    private byte[] fRequestData;
+    private Hashtable fRequestHeaders;
+    private long fTimeout; // Zero for infinite
+
+    // CONSTANTS
+    private static string proxyHost = null;
+    private static int proxyPort = 0;
+    const int readIncrementSize = 1024 * 2; // 2Kbytes
+    const int bodySizeGuess = 5 * 1024; // 5KBytes
+
+    public static void ConfigureProxy(string host, int port)
+    {
+        proxyHost = host;
+        proxyPort = port;
+    }
+
+    public HttpRequest(string! uri)
+    {
+        fRequestUri = uri;
+
+        // Parse the URI into a host-part and a path-part.
+        const string httpPrefix = "http://";
+        if (!uri.StartsWith(httpPrefix))
+        {
+            throw new ArgumentException("URI must begin with 'http://'");
+        }
+
+        int startIndex = httpPrefix.Length;
+        int firstSlash = uri.IndexOf('/',startIndex);
+
+        string fHost;
+        if (firstSlash != -1)
+        {
+            fHost = uri.Substring(startIndex, firstSlash - startIndex);
+            fResource = uri.Substring(firstSlash);
+        }
+        else
+        {
+            // Host is the entire Uri
+            fHost = uri.Substring(startIndex);
+            fResource = String.Empty;
+        }
+
+        int firstColon = fHost.IndexOf(':');
+
+        if (firstColon != -1)
+        {
+            fHostPort = Int32.Parse(fHost.Substring(firstColon + 1));
+        }
+        else
+        {
+            fHostPort = 80; // default
+        }
+
+        this.fRequestHeaders = new Hashtable();
+        this.fMethod = "GET";
+        this.fHost = fHost;
+    }
+
+    public void AddHeader(string! headerName, string headerValue)
+    {
+        fRequestHeaders[headerName] = headerValue;
+    }
+
+    public string Method
+    {
+        get { return fMethod; }
+        set { fMethod = value; }
+    }
+
+    public string ContentType
+    {
+        get { return fContentType; }
+        set { fContentType = value; }
+    }
+
+    public byte[] RequestData
+    {
+        get { return fRequestData; }
+        set { fRequestData = value; }
+    }
+
+    public long Timeout
+    {
+        get { return fTimeout; }
+        set { fTimeout = value; }
+    }
+
+    public string Resource
+    {
+        get { return fResource; }
+    }
+
+    // Perform the HTTP hit and return the result!
+    public HttpResponse GetResponse()
+    {
+        //
+        // Step 1: Connect to the remote server
+        //
+        Socket httpSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream,
+            ProtocolType.Tcp);
+
+        string serverName, requestUri;
+        int serverPort;
+
+        if (proxyPort > 0)
+        {
+            serverName = proxyHost;
+            serverPort = proxyPort;
+            requestUri = fRequestUri; // Use the full URI
+        }
+        else
+        {
+            serverName = fHost;
+            serverPort = fHostPort;
+            requestUri = fResource; // Use just the resource
+        }
+
+        IPAddress serverAddress;
+
+        try
+        {
+            serverAddress = IPAddress.Parse(serverName);
+        }
+        catch(Exception)
+        {
+            // Hostname didn't parse as an IP address; try to resolve it
+            IPHostEntry! entry = (!)Dns.Resolve(serverName);
+            IPAddress[]! addresses = (!)entry.AddressList;
+
+            if (addresses.Length == 0)
+            {
+                throw new Exception("Couldn't resolve host name");
+            }
+
+            serverAddress = addresses[0];
+        }
+
+        IPEndPoint serverEndpoint = new IPEndPoint(serverAddress, serverPort);
+
+        // Connect to the remote server
+        httpSocket.Connect(serverEndpoint);
+
+        //
+        // Step 2: Formulate and transmit the request line and any supporting data
+        //
+        // Send the request line
+        string requestLine = fMethod + " " + requestUri + " HTTP/1.1\r\nHost: " +
+            fHost + "\r\nConnection: Close\r\n";
+
+        // Send an indication of the request data content type and size, if appropriate
+        if (fRequestData != null)
+        {
+            requestLine += "Content-Length: " + fRequestData.Length + "\r\n" +
+                "Content-Type: " + fContentType + "\r\n";
+        }
+
+        // Add any user-specified headers
+        foreach (string! headerName in fRequestHeaders.Keys)
+        {
+            requestLine += headerName + ": " + fRequestHeaders[headerName] + "\r\n";
+        }
+
+        requestLine += "\r\n";
+        byte[] requestBytes = Encoding.ASCII.GetBytes(requestLine);
+        httpSocket.Send(requestBytes);
+
+        // Send any request data
+        if (fRequestData != null)
+        {
+            httpSocket.Send(fRequestData);
+        }
+
+        // Signal we're done sending
+        httpSocket.Shutdown(SocketShutdown.Send);
+
+        //
+        // Step 3: Parse the response line and headers
+        //
+
+        // Pump the response into an HttpHeadersParser
+        ByteBuffer scratchBuffer = new ByteBuffer();
+        HttpHeadersParser headerParser = new HttpHeadersParser(scratchBuffer);
+        bool doneWithout100Continue = false, doneWithHeaders = false;
+        int nextWritePos = 0;
+        HttpResponse response = null;
+
+        do
+        {
+            while(!doneWithHeaders)
+            {
+                // Make 2K available for each read
+                scratchBuffer.EnsureSize(nextWritePos + readIncrementSize);
+                int numReadBytes = httpSocket.Receive(scratchBuffer.UnderlyingBuffer, nextWritePos,
+                    scratchBuffer.Size - nextWritePos, SocketFlags.None);
+
+                if (numReadBytes == 0)
+                {
+                    // We ran out of data before we finished parsing headers.
+                    throw new Exception("Unexpected end of data");
+                }
+
+                nextWritePos += numReadBytes;
+
+                if (headerParser.Pump(nextWritePos))
+                {
+                    // Finished parsing headers!
+                    response = headerParser.GetResponse();
+                    doneWithHeaders = true;
+                }
+            }
+
+            if (response == null)
+            {
+                throw new Exception("HTTP response data unexpectedly null");
+            }
+
+            // Special case: if we see a 100-continue, we want to carefully start
+            // over at the next chunk of data!
+            if (response.StatusCode == 100)
+            {
+                // Switch to a new scratch buffer that will contain the data
+                // following the 100-continue.
+                int remainderBeginning = headerParser.BodyDataOffset;
+                int remainderLength = nextWritePos - remainderBeginning;
+                ByteBuffer newScratch = new ByteBuffer();
+                ByteBuffer oldScratch = scratchBuffer;
+
+                // Reset parsing by creating a new parser
+                headerParser = new HttpHeadersParser(newScratch);
+
+                // Switch over!
+                scratchBuffer = newScratch;
+                nextWritePos = remainderLength;
+
+                if (remainderLength > 0)
+                {
+                    // Copy the beginning of the next data chunk into newScratch
+                    newScratch.EnsureSize(remainderLength);
+                    Buffer.BlockCopy(oldScratch.UnderlyingBuffer, remainderBeginning,
+                        newScratch.UnderlyingBuffer, 0, remainderLength);
+
+                    // Make sure the fragment we were already holding gets pumped in
+                    if (headerParser.Pump(nextWritePos))
+                    {
+                        // Interestingly, we're already done
+                        response = headerParser.GetResponse();
+                        if (response == null)
+                        {
+                            throw new Exception("HTTP response data unexpectedly null");
+                        }
+                        Debug.Assert(response.StatusCode != 100);
+                        doneWithout100Continue = true;
+                    }
+                    else
+                    {
+                        // Go back and carry on
+                        doneWithHeaders = false;
+                    }
+                }
+                else
+                {
+                    // The chunk we were chewing on exactly contained the 100-continue,
+                    // so we definitely need to go back and read some more...
+                    doneWithHeaders = false;
+                }
+            }
+            else
+            {
+                // The response was not 100-continue, so we're all done
+                doneWithout100Continue = true;
+            }
+        }
+        while(!doneWithout100Continue);
+
+        //
+        // Step 4: Process the body data
+        //
+        // Now figure out how we're going to deal with the actual body
+        // of the response. We almost certainly already have an initial
+        // chunk of the body data in the scratchBuffer, since we read the
+        // headers in 2K chunks
+        //
+        int bodyScratchBeginning = headerParser.BodyDataOffset;
+        int scratchBodyLength = nextWritePos - bodyScratchBeginning;
+
+        string transferEncoding = response.GetHeader("Transfer-Encoding");
+        if (transferEncoding != null &&
+            transferEncoding.ToLower().Equals("chunked"))
+        {
+            // Chunked encoding is special: the beginning of the body data
+            // already specifies some chunk information. Run this through our
+            // chunk decoder to straighten it out.
+            byte[] initialBodyChunk = scratchBuffer.TrimAndCopy(bodyScratchBeginning, scratchBodyLength);
+            ChunkedEncodingParser chunkParser = new ChunkedEncodingParser(initialBodyChunk, httpSocket);
+            ByteBuffer bodyData = chunkParser.Run();
+            response.BodyData = bodyData.TrimAndCopy(bodyData.Size);
+        }
+        else
+        {
+            ByteBuffer bodyBuffer;
+
+            // Non-chunked encoding. First, move the beginning of the body
+            // data to a new ByteBuffer for sanity.
+            // Separate out any initial body data into a new ByteBuffer, for sanity
+            int bodySize = (response.ContentLength > 0) ? response.ContentLength : bodySizeGuess;
+
+            // Hard to imagine how this would happen...
+            if (bodySize < scratchBodyLength)
+            {
+                bodySize = scratchBodyLength;
+            }
+
+            bodyBuffer = new ByteBuffer(bodySize);
+            Buffer.BlockCopy(scratchBuffer.UnderlyingBuffer, bodyScratchBeginning,
+                bodyBuffer.UnderlyingBuffer, 0, scratchBodyLength);
+            int nextBodyPos = scratchBodyLength;
+
+            if (response.ContentLength > 0)
+            {
+                // Read until we've gotten exactly the expected number of bytes
+                int bodyDataLeft = response.ContentLength - scratchBodyLength;
+
+                while (bodyDataLeft > 0)
+                {
+                    int numReadBytes = httpSocket.Receive(bodyBuffer.UnderlyingBuffer, nextBodyPos,
+                        bodyDataLeft, SocketFlags.None);
+
+                    if (numReadBytes == 0)
+                    {
+                        throw new Exception("Connection closed unexpectedly");
+                    }
+
+                    nextBodyPos += numReadBytes;
+                    bodyDataLeft -= numReadBytes;
+                }
+            }
+            else
+            {
+                // No indicated ContentLength; Just read until the connection gets closed!
+                int numReadBytes = 0;
+
+                // Read until the remote side closes
+                do
+                {
+                    bodyBuffer.EnsureSize(bodyBuffer.Size + readIncrementSize);
+                    numReadBytes = httpSocket.Receive(bodyBuffer.UnderlyingBuffer, nextBodyPos,
+                        bodyBuffer.Size - nextBodyPos, SocketFlags.None);
+                    nextBodyPos += numReadBytes;
+                }
+                while (numReadBytes > 0);
+            }
+
+            response.BodyData = bodyBuffer.TrimAndCopy(nextBodyPos);
+        }
+
+        // All done!
+        httpSocket.Close();
+
+        return response;
+    }
+
+    private class HttpHeadersParser
+    {
+        // The buffer we are chewing on
+        ByteBuffer fBuffer;
+
+        // The response we are forming
+        private HttpResponse fResponse;
+        private int fContentLength;
+
+        // Working state
+        private State fState;
+        private int fPosition;
+        private int fBufferLimit; // One more than the last usable index in the buffer
+
+        private enum State
+        {
+            BeforeStatusLine,
+            ParsingHeaders,
+            Complete
+        }
+
+        public HttpHeadersParser(ByteBuffer buffer)
+        {
+            fBuffer = buffer;
+            fResponse = new HttpResponse();
+        }
+
+        public bool Pump(int newBufferLimit)
+        {
+            bool allDone = false, outOfRoom = false;
+
+            while ((!allDone) && (!outOfRoom))
+            {
+                PumpInternal(newBufferLimit, out allDone, out outOfRoom);
+            }
+
+            return allDone;
+        }
+
+        private void PumpInternal(int newBufferLimit, out bool allDone, out bool outOfRoom)
+        {
+            fBufferLimit = newBufferLimit;
+
+            if (fState == State.Complete)
+            {
+                // We've already completed
+                allDone = true;
+                outOfRoom = false;
+                return;
+            }
+
+            int CRLFOffset = FindNextCRLF(fPosition, fBufferLimit);
+
+            if (fState == State.BeforeStatusLine)
+            {
+                if (CRLFOffset != -1)
+                {
+                    HandleStatusLine(fPosition, CRLFOffset - fPosition);
+                    fState = State.ParsingHeaders;
+                    fPosition = CRLFOffset + 2;
+                    allDone = false;
+                    outOfRoom = false;
+                    return;
+                }
+                else
+                {
+                    // We couldn't see another CRLF before the end of the
+                    // usable part of the buffer, so we're out of room.
+                    allDone = false;
+                    outOfRoom = true;
+                    return;
+                }
+            }
+            else if (fState == State.ParsingHeaders)
+            {
+                // Special case: if the unprocessed part starts with CRLF it
+                // means we are looking at the end of the headers, since we consume
+                // the trailing CRLF on a single header line when parsing.
+                if (CRLFOffset == fPosition)
+                {
+                    fState = State.Complete;
+                    fPosition += 2;
+                    allDone = true;
+                    outOfRoom = false;
+                    return;
+                }
+                else if (CRLFOffset != -1)
+                {
+                    HandleHeaderLine(fPosition, CRLFOffset - fPosition);
+                    fPosition = CRLFOffset + 2;
+                    allDone = false;
+                    outOfRoom = false;
+                    return;
+                }
+                else
+                {
+                    // We couldn't see another CRLF before the end of the
+                    // usable part of the buffer, so we're out of room.
+                    allDone = false;
+                    outOfRoom = true;
+                    return;
+                }
+            }
+
+            // Someone must have added a state or mucked up the code
+            allDone = false;
+            outOfRoom = false;
+            Debug.Assert(false);
+        }
+
+        public HttpResponse GetResponse()
+        {
+            if (fState == State.Complete)
+            {
+                return fResponse;
+            }
+            else
+            {
+                // Not allowed to have half-baked results!
+                return null;
+            }
+        }
+
+        public int BodyDataOffset
+        {
+            get
+            {
+                if (fState == State.Complete)
+                {
+                    return fPosition;
+                }
+                else
+                {
+                    // No answer if we're not done processing
+                    return -1;
+                }
+            }
+        }
+
+        public int ContentLength
+        {
+            get
+            {
+                if (fState == State.Complete)
+                {
+                    return fContentLength;
+                }
+                else
+                {
+                    // Not available if we're not done processing
+                    return -1;
+                }
+            }
+        }
+
+        private void HandleStatusLine(int startOffset, int length)
+        {
+            string status = Encoding.ASCII.GetString(fBuffer.UnderlyingBuffer, startOffset, length);
+            const string HTTP11 = "HTTP/1.1 ";
+
+            if (!status.StartsWith(HTTP11))
+            {
+                throw new Exception("Response was not HTTP/1.1");
+            }
+
+            int secondSpace = status.IndexOf(' ', HTTP11.Length);
+            string statusString;
+
+            if (secondSpace == -1)
+            {
+                // Assume this means there is a status code with no explanation string
+                statusString = status.Substring(HTTP11.Length);
+            }
+            else
+            {
+                // Grab just the status code
+                statusString = status.Substring(HTTP11.Length, secondSpace - HTTP11.Length);
+            }
+
+            int statusCode = Int32.Parse(statusString);
+            fResponse.StatusCode = statusCode;
+        }
+
+        private void HandleHeaderLine(int startOffset, int length)
+        {
+            string header = Encoding.ASCII.GetString(fBuffer.UnderlyingBuffer, startOffset, length);
+            int firstColon = header.IndexOf(':');
+
+            if (firstColon == -1)
+            {
+                throw new Exception("Malformed header string");
+            }
+
+            string headerName = header.Substring(0, firstColon);
+            string headerValue = header.Substring(firstColon + 1).Trim();
+
+            if (headerName.ToLower().Equals("content-length"))
+            {
+                fContentLength = Int32.Parse(headerValue);
+            }
+            else
+            {
+                fResponse.AddHeader(headerName, headerValue);
+            }
+        }
+
+        private int FindNextCRLF(int startOffset, int limitOffset)
+        {
+            int offset = startOffset;
+
+            while (offset < limitOffset)
+            {
+                if (fBuffer[offset] == (byte)'\r')
+                {
+                    if ((offset + 1 < limitOffset) && (fBuffer[offset + 1] == (byte)'\n'))
+                    {
+                        return offset;
+                    }
+                }
+
+                offset++;
+            }
+
+            return -1;
+        }
+    }
+
+    private class ChunkedEncodingParser
+    {
+        // This buffer is what we start with; it has an initial
+        // fragment of the body data
+        private byte[] fInitialFragment;
+        private int fFragmentOffset; // How far into fInitialFragment we are
+        private Socket fSocket; // Socket to read additional data from
+        private byte[] fSingleByte;
+
+        public ChunkedEncodingParser(byte[] initialFragment, Socket readSocket)
+        {
+            fInitialFragment = initialFragment;
+            fSocket = readSocket;
+            fSingleByte = new byte[1];
+        }
+
+        public ByteBuffer! Run()
+        {
+            ByteBuffer bodyData = new ByteBuffer();
+            int chunkSize = 0;
+
+            while(true)
+            {
+                ByteBuffer! chunkLine = ReadToCRLF();
+                string! chunkString = (!)Encoding.ASCII.GetString(chunkLine.UnderlyingBuffer, 0, chunkLine.Size);
+                chunkString = (!)chunkString.Trim();
+                int firstSemi = chunkString.IndexOf(';');
+
+                if (firstSemi != -1)
+                {
+                    // Use only the portion before the semicolon
+                    chunkSize = Int32.Parse(chunkString.Substring(0, firstSemi),
+                        NumberStyles.AllowHexSpecifier);
+                }
+                else
+                {
+                    // No semicolon; use the entire line
+                    chunkSize = Int32.Parse(chunkString, NumberStyles.AllowHexSpecifier);
+                }
+
+                if (chunkSize == 0)
+                {
+                    // We're done! Don't bother reading the trailer
+                    return bodyData;
+                }
+
+                // Read in the amount indicated by the chunk header. It may take multiple passes
+                // to do this.
+                int writeOffset = bodyData.Size;
+                bodyData.EnsureSize(bodyData.Size + chunkSize);
+
+                while(chunkSize > 0)
+                {
+                    int numBytesRead = MassRead(bodyData.UnderlyingBuffer, writeOffset, chunkSize);
+                    chunkSize -= numBytesRead;
+                    writeOffset += numBytesRead;
+                }
+
+                // Peel off the CRLF that trails a chunk
+                ByteBuffer emptyLine = ReadToCRLF();
+                if (emptyLine.Size != 0)
+                {
+                    throw new Exception("Malformed HTTP/1.1 chunk -- no trailing lone CRLF");
+                }
+            }
+        }
+
+        private ByteBuffer! ReadToCRLF()
+        {
+            ByteBuffer retval = new ByteBuffer();
+            InnerReadToCRLF(retval);
+            return retval;
+        }
+
+        private void InnerReadToCRLF(ByteBuffer buffer) // buffer can be null
+        {
+            // Read characters into buffer until we see a CRLF (don't include)
+            byte nextByte = GetNextByte();
+
+            while(true)
+            {
+                if (nextByte == (byte)'\r')
+                {
+                    nextByte = GetNextByte();
+
+                    if (nextByte == (byte)'\n')
+                    {
+                        // Done
+                        return;
+                    }
+                    else
+                    {
+                        if (buffer != null)
+                        { buffer.Add((byte)'\r'); }
+
+                        // Don't read again; nextByte might
+                        // be the first byte of CRLF.
+                    }
+                }
+                else
+                {
+                    if (buffer != null)
+                    { buffer.Add(nextByte); }
+                    nextByte = GetNextByte();
+                }
+            }
+        }
+
+        private void DiscardToCRLF()
+        {
+            InnerReadToCRLF(null);
+        }
+
+        private byte GetNextByte()
+        {
+            if (fFragmentOffset < fInitialFragment.Length)
+            {
+                return fInitialFragment[fFragmentOffset++];
+            }
+            else
+            {
+                int received = fSocket.Receive(fSingleByte, 0, 1, SocketFlags.None);
+                if (received == 1)
+                {
+                    return fSingleByte[0];
+                }
+                else
+                {
+                    throw new Exception("Connection closed unexpectedly");
+                }
+            }
+        }
+
+        private int MassRead(byte[] buffer, int offset, int maxLength)
+        {
+            if (fFragmentOffset < fInitialFragment.Length)
+            {
+                // Still data left in the original fragment; return as much
+                // of that as possible.
+                int initialFragmentLeft = fInitialFragment.Length - fFragmentOffset;
+                int amountToUse = maxLength <= initialFragmentLeft ? maxLength : initialFragmentLeft;
+                Buffer.BlockCopy(fInitialFragment, fFragmentOffset, buffer, offset, amountToUse);
+                fFragmentOffset += amountToUse;
+                return amountToUse;
+            }
+            else
+            {
+                // No data left in the initial fragment; read from the network.
+                return fSocket.Receive(buffer, offset, maxLength, SocketFlags.None);
+            }
+        }
+    }
+}
diff --git a/base/Applications/MapPointProxy/HttpResponse.cs b/base/Applications/MapPointProxy/HttpResponse.cs
new file mode 100644
index 0000000..ca574f2
--- /dev/null
+++ b/base/Applications/MapPointProxy/HttpResponse.cs
@@ -0,0 +1,63 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System.Collections.Specialized;
+
+public class HttpResponse
+{
+    private string fContentType;
+    private byte[] fBodyData;
+    private StringDictionary fHeaders;
+    private int fStatusCode;
+
+    internal HttpResponse()
+    {
+        fHeaders = new StringDictionary();
+    }
+
+    public int ContentLength
+    {
+        get
+        {
+            if (fBodyData != null)
+            {
+                return fBodyData.Length;
+            }
+            else
+            { return 0; }
+        }
+    }
+
+    public string ContentType
+    {
+        get { return fContentType; }
+        set { fContentType = value; }
+    }
+
+    public byte[] BodyData
+    {
+        get { return fBodyData; }
+        set { fBodyData = value; }
+    }
+
+    public int StatusCode
+    {
+        get { return fStatusCode; }
+        set { fStatusCode = value; }
+    }
+
+    public string GetHeader(string! headerName)
+    {
+        return fHeaders[headerName.ToLower()];
+    }
+
+    public void AddHeader(string! headerName, string! headerValue)
+    {
+        fHeaders[headerName.ToLower()] = headerValue;
+    }
+}
diff --git a/base/Applications/MapPointProxy/MapPointProxy.csproj b/base/Applications/MapPointProxy/MapPointProxy.csproj
new file mode 100644
index 0000000..49a79db
--- /dev/null
+++ b/base/Applications/MapPointProxy/MapPointProxy.csproj
@@ -0,0 +1,43 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>MapPoint</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Base64Decoder.cs" />
+    <Compile Include="ByteBuffer.cs" />
+    <Compile Include="HttpAuthenticator.cs" />
+    <Compile Include="HttpRequest.cs" />
+    <Compile Include="HttpResponse.cs" />
+    <Compile Include="MapPointProxy.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml\Xml.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\MapPointProxy.Contracts\MapPointProxy.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/MapPointProxy/MapPointProxy.sg b/base/Applications/MapPointProxy/MapPointProxy.sg
new file mode 100644
index 0000000..cc9016a
--- /dev/null
+++ b/base/Applications/MapPointProxy/MapPointProxy.sg
@@ -0,0 +1,325 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MapPointProxy.sg
+//
+//  Note:   A simple proxy module for the MapPoint web service
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.MapPointProxy.Contracts;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Xml;
+using System;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Security;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Mappoint proxy service", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "proxy", Mandatory=true, Position=0, HelpMessage="Proxy IP address")]
+        internal string ipAddress;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return MapPointProxy.AppMain(this);
+        }
+    }
+
+    public class MapPointProxy
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            string proxyHost = config.ipAddress;  //null; //"172.31.40.21"; // msr-proxy
+
+            // Configure proxy connection.
+            if (proxyHost != null) {
+                Console.WriteLine("MapPoint: HTTP Proxy: {0} port {1}", proxyHost, 80);
+                Console.WriteLine("MapPoint: Alternate proxy can be set on command line.");
+                HttpRequest.ConfigureProxy(proxyHost, 80);
+            }
+            else {
+                Console.WriteLine("MapPoint: No HTTP Proxy configured.");
+                Console.WriteLine("MapPoint: Proxy can be set on command line.");
+            }
+
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            DirectoryServiceContract.Imp ds = config.nsRef.Acquire();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the Directory Service root");
+            }
+            ds.RecvSuccess();
+
+            try
+            {
+                ds.SendRegister(Bitter.FromString2(MapPointProxyContract.ModuleName), nsImp);
+
+                switch receive
+                {
+                    case ds.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case ds.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        Console.WriteLine("Failed to register the MapPoint proxy module as " +
+                                        MapPointProxyContract.ModuleName);
+                        delete nsExp;
+                        delete rejectedEP;
+                        return -1;
+
+                    case ds.ChannelClosed():
+                        Console.WriteLine("epNS channel closed");
+                        delete nsExp;
+                        return -1;
+                }
+            }
+            finally
+            {
+                delete ds;
+            }
+
+            // Here is the set of client channels we service
+            ESet<MapPointProxyContract.Exp:ReadyState> epSet = new ESet<MapPointProxyContract.Exp:ReadyState>();
+
+            while(true)
+            {
+                switch receive
+                {
+                    // ------------------------------- Requests for new connections
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people top give us MapPointProxyContract.Exp instances
+                            MapPointProxyContract.Exp newMapClient = newEp as MapPointProxyContract.Exp;
+
+                            if (newMapClient == null)
+                            {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else
+                            {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newMapClient.SendMapPointReady();
+                                epSet.Add(newMapClient);
+                            }
+                        }
+                        break;
+
+                        // ------------------------------- Requests on existing connections
+                        //
+                        // Don't forget that we're selecting endpoints
+                        // from the epSet endpoint-set. In each case that we
+                        // receive a message from one of those endpoints, we
+                        // need to remember to put the endpoint back into epSet
+                        // if we want to keep listening to it.
+                        //
+                        case ep.GetMap(char[]! in ExHeap centerLat, char[]! in ExHeap centerLong,
+                                    int zoom, MapPointProxyContract.PushPin[] in ExHeap pushPins) in epSet :
+                            {
+                                string! xml = BuildXml(centerLat, centerLong, zoom, pushPins);
+
+                                delete centerLat;
+                                delete centerLong;
+                                delete pushPins;
+
+                                string base64Data = GetBase64MapData(xml);
+
+                                if (base64Data != null)
+                                {
+                                    ep.SendMapDataBegin();
+                                    Base64Decoder decoder = new Base64Decoder(base64Data, 0);
+                                    byte[] chunk;
+
+                                    while((chunk = decoder.Pump(base64Data.Length, 4096)) != null)
+                                    {
+                                        ep.SendMapDataChunk(Bitter.FromByteArray(chunk));
+                                        ep.RecvAck();
+                                    }
+
+                                    ep.SendDone();
+                                }
+                                else
+                                {
+                                    ep.SendFailed();
+                                }
+
+                                epSet.Add(ep);
+                            }
+                        break;
+
+                    case nsExp.ChannelClosed() && epSet.Empty() :
+                        // The namespace channel is closed and we have no more client
+                        // channels, so pack up and go home.
+                        delete nsExp;
+                        epSet.Dispose();
+                        return -1;
+
+                    case ep.ChannelClosed() in epSet :
+                        // Dispose of channels when our clients close them
+                        delete ep;
+                        break;
+                }
+            }
+            return 0;
+        }
+
+        private static string GetIcon(ref MapPointProxyContract.PushPin pushPin)
+        {
+            expose(pushPin)
+                    {
+                        return Bitter.ToString(pushPin.icon);
+                    }
+        }
+
+        private static string GetLabel(ref MapPointProxyContract.PushPin pushPin)
+        {
+            expose(pushPin)
+                    {
+                        return Bitter.ToString(pushPin.label);
+                    }
+        }
+
+        private static string GetLatitude(ref MapPointProxyContract.PushPin pushPin)
+        {
+            expose(pushPin)
+                    {
+                        return Bitter.ToString(pushPin.latitude);
+                    }
+        }
+
+        private static string GetLongitude(ref MapPointProxyContract.PushPin pushPin)
+        {
+            expose(pushPin)
+                    {
+                        return Bitter.ToString(pushPin.longitude);
+                    }
+        }
+
+        private static string! BuildXml(char[]! in ExHeap centerLat, char[]! in ExHeap centerLong,
+                                        int zoom, MapPointProxyContract.PushPin[] in ExHeap pushPins)
+        {
+            string retval = "<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><soap:Body><GetMap xmlns=\"http://s.mappoint.net/mappoint-30/\"><specification><DataSourceName>MapPoint.NA</DataSourceName><Options><RouteHighlightColor>DefaultColor</RouteHighlightColor><ConstructionDelayHighlightColor>DefaultColor</ConstructionDelayHighlightColor><ConstructionClosureHighlightColor>DefaultColor</ConstructionClosureHighlightColor><Format><Height>500</Height><Width>400</Width></Format><PanHorizontal>0</PanHorizontal><PanVertical>0</PanVertical><Style>DefaultStyle</Style><Zoom>";
+
+            retval += zoom.ToString();
+            retval += "</Zoom></Options><Pushpins>";
+
+            if (pushPins != null)
+            {
+                for (int i = 0; i < pushPins.Length; ++i)
+                {
+                    expose(pushPins[i]) {
+                        MapPointProxyContract.PushPin pushPin = pushPins[i];
+                        retval += "<Pushpin><IconDataSource>MapPoint.Icons</IconDataSource><IconName>";
+
+                        pushPin.UnExpose();
+                        string icon = GetIcon(ref pushPin);
+                        string label = GetLabel(ref pushPin);
+                        string latitude = GetLatitude(ref pushPin);
+                        string longitude = GetLongitude(ref pushPin);
+                        pushPin.Expose();
+                        pushPins[i] = pushPin;
+
+                        if (icon != null)
+                        {
+                            retval += icon;
+                        }
+
+                        retval += "</IconName><Label>";
+
+                        if(label != null)
+                        {
+                            retval += label;
+                        }
+
+                        retval += "</Label><LatLong><Latitude>";
+                        retval += latitude;
+                        retval += "</Latitude><Longitude>";
+                        retval += longitude;
+                        retval += "</Longitude></LatLong><ReturnsHotArea>false</ReturnsHotArea><LabelNearbyRoads>false</LabelNearbyRoads></Pushpin>";
+                    }
+                }
+            }
+
+            retval += "</Pushpins><Views><MapView xsi:type=\"ViewByScale\"><CenterPoint><Latitude>";
+            retval += Bitter.ToString2(centerLat);
+            retval += "</Latitude><Longitude>";
+            retval += Bitter.ToString2(centerLong);
+            retval += "</Longitude></CenterPoint></MapView></Views></specification></GetMap></soap:Body></soap:Envelope>";
+
+            return retval;
+        }
+
+        private static string GetBase64MapData(string! xml)
+        {
+            HttpRequest request = new HttpRequest("http://renderv3.bay.staging.mappoint.net/Render-30/RenderService.asmx");
+
+            request.AddHeader("SOAPAction", "\"http://s.mappoint.net/mappoint-30/GetMap\"");
+            request.ContentType = "text/xml; charset=utf-8";
+            request.RequestData = Encoding.ASCII.GetBytes(xml);
+            request.Method = "POST";
+
+            XmlNode bitsNode = null;
+
+            try
+            {
+                HttpAuthenticator authenticator = new HttpAuthenticator(request, "7356", "0[[{NmN?UU5?U");
+                HttpResponse! response = (!)authenticator.GetResponse();
+
+                XmlReader xmlReader = new XmlReader();
+                ArrayList! nodes = (!)xmlReader.Parse(response.BodyData);
+                bitsNode = ((XmlNode!)nodes[0]).GetNestedChild(new string[]{"soap:Body", "GetMapResponse", "GetMapResult", "MapImage", "MimeData", "Bits"});
+            }
+            catch(Exception)
+            {
+                // Ignore and return null
+            }
+
+            if (bitsNode != null)
+            {
+                return bitsNode.Text;
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/base/Applications/MapPointProxy/README.txt b/base/Applications/MapPointProxy/README.txt
new file mode 100644
index 0000000..8c2b51e
--- /dev/null
+++ b/base/Applications/MapPointProxy/README.txt
@@ -0,0 +1,66 @@
+From: Mark Aiken
+Sent: Wednesday, September 14, 2005 8:29 PM
+Subject: MapPoint (aka Caffeinate Me!) Demo instructions
+
+OK here’s a reprise of the demo instructions to make sure they’re up-to-date:
+
+Build steps (things that are not built by a normal “msb Distro\BVT.proj” at the root)
+- Build Applications\Network
+- Build Applications\WebApps
+- Build Applications\Cassini [after building Applications\Webapps]
+- Build Applications\MapPointProxy
+- Build Applications\SeattleTrafficProxy
+- Don’t forget msb the distro again to recreate the ISO
+
+Singularity machine setup:
+- Be connected to the Internet.
+- Mount the ISO image in the VPC cd-rom drive.
+
+Singularity runtime steps, with direct Internet access:
+  (type at the shell as shown)
+- netstack &
+- ipconfig /dev/nic0 dhcp start
+  [You should see a success message giving Singularity’s IP address]
+- mappoint &
+- seattletraffic &
+- cassini /app:MapDemoWebApp
+  [You should see some startup spew from Cassini]
+
+Singularity runtime step, with http proxy:
+- netstack &
+- ipconfig /dev/nic0 dhcp start
+  [You should see a success message giving Singularity’s IP address]
+- mappoint 157.54.58.20 &
+  [You should replace with address of http proxy, if not on corpnet]
+  [If the demo stalls after displaying "served /MapControl.js", it means
+   the mappoint proxy can't reach mappoint servers (possibly because you
+   have have the wrong http proxy.]
+- seattletraffic &
+- cassini /app:MapDemoWebApp [You should see some startup spew from Cassini]
+
+Client-side steps:
+
+- Open IE
+- Make sure IE is configured correctly to reach the Internet;
+  the VE demos rely on IE being able to fetch image segments from the
+  Internet.
+- Make sure IE is configured correctly to retrieve local content directly
+  from the Singularity box.
+- Go to http://SingularitysIPAddressHere/ve.aspx for the Virtual Earth demo.
+
+Other notes:
+- On some laptops with wireless, it work to boot with PXE assigned to the
+  wireless interface. This may have to do with MAC address spoofing being
+  unsupported over wireless. Use the wired connection instead.
+
+Disclaimers:
+- Responses from the MapPoint staging servers are sometimes up to 15 seconds
+  or so in arriving. Obviously, this is unrelated to Singularity performance.
+  This manifests as a very noticeable delay in rendering the coffee-demo maps.
+- I’ve seen the demos fall over in GC stack walks and in the memory allocator,
+  suggesting we still have heap-corruption issues. For best results, bring up
+  the Singularity machine fresh and present the demo right away to minimize
+  heap pressure.
+- A good strategy is to start the VPC, then pause it (from the menu or by
+  typing right-alt-P), then resume it as you're ready to show the demo (from
+  the menu or by typing right-alt-P).
diff --git a/base/Applications/More/More.cs b/base/Applications/More/More.cs
new file mode 100644
index 0000000..223b1ce
--- /dev/null
+++ b/base/Applications/More/More.cs
@@ -0,0 +1,283 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   More
+//
+//  Note:   A text pager contributed by Valerie See (vsee)
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+
+using Pipe = Microsoft.Singularity.Io.Tty2006;
+using FileSystem.Utils;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Channels;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Display a screen full of text", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [Endpoint]
+        public readonly TRef<KeyboardDeviceContract.Imp:Start> keyboardRef; 
+
+        [StringArrayParameter( "files", HelpMessage="Files to be listed.")]
+        internal string[] fileSet;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return More.AppMain(this);
+        }
+    }
+
+    class More
+    {
+        internal static int pageCounter; 
+        internal static Terminal! terminal; 
+        internal static long fileSize; 
+        internal static long bytesRead; 
+        
+        internal static int GetKey(KeyboardDeviceContract.Imp! keyboard)
+        {
+            keyboard.SendGetKey();
+            switch receive {
+                case keyboard.AckKey(ikey):
+                    return (int) ikey;
+                    break;
+                case keyboard.NakKey():
+                    return -1;
+                    break;
+                case keyboard.ChannelClosed():
+                    Tracing.Log(Tracing.Debug, "Keyboard channel closed");
+                    return -1;
+           }
+           return -1;
+        }
+        
+        [ Conditional("DEBUG_MORE") ]
+        static void DebugPrint(string format, params object [] args)
+        {
+            DebugStub.Print(String.Format(format, args));
+        }
+
+        [ Conditional("DEBUG_MORE") ]
+        static void DebugWriteLine(string format, params object [] args)
+        {
+            DebugPrint(format, args);
+            DebugStub.Print("\n");
+        }
+
+        [ Conditional("DEBUG_MORE") ]
+        static void DebugReadLine()
+        {
+            Console.ReadLine();
+        }
+
+        internal static int AppMain(Parameters! config) {
+            // constants
+
+            //int szLineCount = 0;
+            int displayfile = 0;
+            int consoleWidth = 0;
+            int consoleHeight = 0;
+            pageCounter = 0; 
+            
+            terminal = new Terminal(); 
+            
+            DirectoryServiceContract.Imp dsRoot = (config.nsRef).Acquire(); 
+            if (dsRoot == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+
+            dsRoot.RecvSuccess();
+
+            KeyboardDeviceContract.Imp keyboard = (config.keyboardRef).Acquire(); 
+                if (dsRoot == null) { 
+                throw new Exception("Unable to acquire handle to the keyboard"); 
+            } 
+            keyboard.RecvSuccess();
+
+            // FIXFIX need to dynamically get  window size 
+            consoleHeight = 47; // allow for "activity" line on top of Singularity console....
+            consoleWidth = 79;
+
+            assume config.fileSet != null;
+            string szSrcLine;
+            bool ok; 
+            if (config.fileSet.Length <= 0 ) { 
+                //stdin 
+                while ( (szSrcLine = Console.ReadLine()) != null ) {
+                    ok = PageText(szSrcLine, keyboard, consoleHeight, consoleWidth, true);
+                    if (!ok) break; 
+                } 
+                delete keyboard; 
+                delete dsRoot; 
+                return 0; 
+            } 
+            
+            for (displayfile = 0; displayfile < config.fileSet.Length; displayfile++) {
+                string filename = config.fileSet[displayfile];
+                if (filename == null) continue; 
+
+                // check that file exists
+                ErrorCode error; 
+                NodeType nodeType; 
+                ok  = FileUtils.GetAttributes(filename, dsRoot, out fileSize, out nodeType, out  error);
+                if (ok) {
+                    if ( nodeType == NodeType.IoMemory || nodeType == NodeType.File )  {
+                        // Open file RO for now
+                        FileStream fsInput = new FileStream(dsRoot, filename, FileMode.Open, FileAccess.Read);
+                        StreamReader srInput = new StreamReader(fsInput);
+                        while ((szSrcLine = srInput.ReadLine()) != null)
+                        {
+                            ok = PageText(szSrcLine, keyboard, consoleHeight, consoleWidth, false);
+                            if (!ok) break; 
+                        }
+                        srInput.Close();
+                        fsInput.Close();
+
+                        // Display the file by pages
+                        // TODO: change PageText to return between pages so can recheck for
+                        //       screen dimension changes (?)
+
+                        if (displayfile <= config.fileSet.Length - 2) // offset by 2 due to index offset plus increment hasn't happened yet
+                        {
+                            Console.WriteLine("");
+                            Console.Write("-- <ENTER> for next file --");
+                            int key;
+                            do {
+                                key = Console.Read();
+                                if (key == -1) {
+                                    delete keyboard;
+                                    delete dsRoot; 
+                                    return 0;
+                                }
+                            } while ((char)key != '\n');
+                        }
+                    }
+                    else if (nodeType == NodeType.Directory) {
+                        // check that it's not a directory
+                        Console.WriteLine("\n{0} - is a directory.", filename);
+                    }
+                } // ok 
+                else { 
+                    // not a directory, but file doesn't exist, print error message
+                    Console.WriteLine("\n{0} - file not found.", filename);
+                }
+            }
+            delete keyboard;
+            delete dsRoot; 
+            return 0;
+        }
+
+        //////////////////////////////////////////////////////////////
+        //  Write out prompt and wait for input
+        //  After acquiring the input remove the prompt from the console
+        //////////////////////////////////////////////////////////////
+        
+        static int GetInput( KeyboardDeviceContract.Imp! keyboard, 
+                int PAGELENGTH, bool processingStdin)
+        {
+            double temp = 0; 
+            int counter = 0;
+            int key; 
+            if (processingStdin) {  
+                Console.Write("-- <more> -- ");
+                key = GetKey(keyboard);
+                if ((char)key == '\n' ) Console.Write("\n"); 
+            } else {
+                temp  =  (double) (bytesRead * 100) / (double)fileSize; 
+                Console.Write("-- <more> ({0}%) -- ", (int)temp );
+                key = Console.Read();
+            } 
+            // get rid of the -- <ENTER> line 
+            if ((char)key == '\n' ){ 
+                terminal.GenerateAndSendEscapeSequence(Pipe.EscapeCodes.UP); 
+            }
+            Console.Write("\r"); 
+            terminal.GenerateAndSendEscapeSequence(Pipe.EscapeCodes.ERASE_FROM_CURSOR); 
+            
+            if (key == -1) return -1;
+            switch (Char.ToLower((char)key )) {
+                case 'q':
+                    return -1;
+                default:
+                    if ((char)key == '\n') counter = PAGELENGTH ; // advance by 1
+                    break;
+            }
+            return counter;
+        }
+        
+        // PageText - display text a page at a time
+        static bool PageText(string! workString,  KeyboardDeviceContract.Imp! keyboard, 
+                int PAGELENGTH, int PAGEWIDTH, bool processingStdin)
+        {
+            string[] lines; 
+            
+            int remainder = 0;
+            int linesinline = 0;
+
+            // Split the line into the requisite number of lines
+            // needed based on page width
+            
+            if ( workString.Length <= PAGEWIDTH ) {
+                lines = new string[1];
+                lines[0] = workString; 
+            }
+            else { 
+                int fullLines   = workString.Length / PAGEWIDTH;
+                remainder       = workString.Length % PAGEWIDTH;
+                linesinline     = fullLines; 
+                
+                if (remainder != 0) linesinline++;
+                lines = new string[linesinline];
+                
+                int pos = 0; 
+                for (int i=0; i < fullLines; i++) {
+                    lines[i] = workString.Substring(pos,PAGEWIDTH);
+                    pos += PAGEWIDTH; 
+                }
+                if (remainder != 0) {
+                    lines[fullLines] = workString.Substring(pos);
+                }
+            }
+
+            // write the lines out pausing where necessary
+            for (int i=0; i < lines.Length; i++) {
+                string s = lines[i]; 
+                assert s!= null; 
+                Console.WriteLine(s); 
+                pageCounter++; 
+                bytesRead += s.Length; 
+                if (pageCounter >= PAGELENGTH) {
+                    pageCounter  = GetInput(keyboard, PAGELENGTH, processingStdin); 
+                    if (pageCounter == -1) return false; 
+                }
+            }
+            lines = null; 
+            return true; 
+        } // end of PageText
+    }
+}
diff --git a/base/Applications/More/More.csproj b/base/Applications/More/More.csproj
new file mode 100644
index 0000000..f8e380a
--- /dev/null
+++ b/base/Applications/More/More.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>more</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="More.cs" />
+    <Compile Include="..\Shell\Terminal.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/More/readme.txt b/base/Applications/More/readme.txt
new file mode 100644
index 0000000..a65f6b2
--- /dev/null
+++ b/base/Applications/More/readme.txt
@@ -0,0 +1,33 @@
+More - a simple pager
+
+Syntax: more [filename1 filename2 ... filenameN]
+
+Notes:
+
+This is a very simple version of more. At present,
+it pages on the <ENTER> key (versus spacebar or 
+anything else). It will exit on the "q" or "Q" 
+followed by <ENTER> at the page prompt. Multiple
+files can be given on the command line; however,
+I have not implemented wildcard expansion, so 
+you do actually have to give it the real names
+for now.
+
+It will provide error messages on files that are
+not found or on directories (which in Singularity,
+are acting like "files not found" - today, I have
+left that as is).
+
+The console height and width are being treated as 
+fixed constants for now. Some obvious "to-dos" 
+include:
+
+	TODO: Dynamically determine height/width
+	TODO: Recheck display size between pages 
+	      in case size has changed. (Lower pri).
+	TODO: Implement other functionality like
+	      skipping forward in the file, moving
+	      backward (a' la less), handle wild-
+	      cards in filenames.
+
+5/9/2006
\ No newline at end of file
diff --git a/base/Applications/NameSpace/AtomicTestDSP/AtomicTestDSP.csproj b/base/Applications/NameSpace/AtomicTestDSP/AtomicTestDSP.csproj
new file mode 100644
index 0000000..3271fd2
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/AtomicTestDSP.csproj
@@ -0,0 +1,45 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>AtomicTestDSP</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DirectoryService.sg" />
+    <Compile Include="DirAclCoreSupport.sg" />
+    <Compile Include="DirectoryServiceWorker.sg" />
+    <Compile Include="DirNode.sg" />
+    <Compile Include="IoMemoryNode.sg" />
+    <Compile Include="Node.sg" />
+    <Compile Include="DirPermissions.sg" />
+    <Compile Include="Path.sg" />
+    <Compile Include="Property.sg" />
+    <Compile Include="ProviderNode.sg" />
+    <Compile Include="ResolutionState.sg" />
+    <Compile Include="SbUtils.sg" />
+    <Compile Include="SymLinkNode.sg" />
+    <Compile Include="WorkerFunctions.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/NameSpace/AtomicTestDSP/DirAclCoreSupport.sg b/base/Applications/NameSpace/AtomicTestDSP/DirAclCoreSupport.sg
new file mode 100644
index 0000000..2c86321
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/DirAclCoreSupport.sg
@@ -0,0 +1,101 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirAclCoreSupport.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory
+{
+
+    public class DirAclCoreSupport : IAclCoreSupport
+    {
+        private UTF8Encoding! encoder = new UTF8Encoding();
+        private TRef<DirectoryServiceContract.Imp:Ready> cachedRootNS = null;
+
+        public string GetGroupContents(string! path)
+        {
+            // read the file size
+            if (cachedRootNS == null)
+                cachedRootNS = new TRef<DirectoryServiceContract.Imp:Ready>(
+                                        DirectoryService.NewClientEndpoint());
+            DirectoryServiceContract.Imp:Ready! ns = cachedRootNS.Acquire();
+            byte[] result =  ReadFromFile(path, ns);
+            cachedRootNS.Release(ns);
+            if (result == null)
+                return null;
+            string! subexpression = (!)encoder.GetString(result);
+            return subexpression;
+        }
+
+        private byte[] ReadFromFile(string!path, DirectoryServiceContract.Imp:Ready! ns)
+        {
+            ErrorCode errCode;
+            byte[] result;
+            long size = 0;
+            int readSize = 4096;
+            NodeType nodeType;
+
+            try {
+                bool temp = SdsUtils.GetAttributes(path, ns, out size, out nodeType, out errCode);
+                if (! temp)
+                    // element does not exist or an error has occurred
+                    throw new Exception("Cannot get attributes - " + SdsUtils.ErrorCodeToString(errCode));
+                result = new byte[size];
+                byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                if (result == null || buf == null)
+                    throw new Exception("Cannot allocate memory");
+                FileContract.Imp! fileImp;
+                FileContract.Exp! fileExp;
+                FileContract.NewChannel(out fileImp, out fileExp);
+                bool bindOk = SdsUtils.Bind(path, ns, fileExp, out errCode);
+                if (!bindOk) {
+                    delete fileImp;
+                    throw new Exception("Can't read group - " + SdsUtils.ErrorCodeToString(errCode));
+                }
+                fileImp.RecvSuccess();
+
+                long readOffset = 0;
+                while (true) {
+                    fileImp.SendRead(buf, 0, readOffset, readSize);
+                    switch receive {
+                        case fileImp.AckRead(localbuf,  bytesRead,  error) :
+                            // move the memory
+                            Bitter.ToByteArray(localbuf, 0, (int)bytesRead, result, (int)readOffset);
+                            if (bytesRead == readSize) {
+                                // see if there is more
+                                readOffset += bytesRead;
+                                buf = localbuf;
+                                continue;
+                            }
+                            delete localbuf;
+                            break;
+                        case fileImp.ChannelClosed() :
+                            break;
+                        case unsatisfiable :
+                            break;
+                    }
+                    break;
+                }
+                delete fileImp;
+            } catch (Exception e) {
+                DebugStub.Print("An exception occurred while reading group definition: {0}\n",
+                                __arglist(path));
+                DebugStub.Print("Message: {0}\n", __arglist(e.Message));
+                return null;
+            }
+            return result;
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/DirNode.sg b/base/Applications/NameSpace/AtomicTestDSP/DirNode.sg
new file mode 100644
index 0000000..9d8a066
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/DirNode.sg
@@ -0,0 +1,1162 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirNode.sg
+//
+//  Note: [vjm] First "Atomic" version of the Nameserver.  The
+//  atomic blocks have deliberately been made coarse because of
+//  the recursive nature of all functions.  The recursive
+//  structure of functions means that the entire function body
+//  becomes a part of an atomic block on a recursive call.  This
+//  means that simply "writing" a fine grained looking atomic
+//  block doesn't give us an actual fine-grain atomic block, the
+//  code essentially forces the atomic block to span across the
+//  entire function in the presence of recursion.  The fine
+//  granularity might lead to smaller atomic blocks in the
+//  absence of recursion consequently leading to smaller windows
+//  of contention among concurrent transactions.
+//
+//  Haven't atomized kernel version functions since that "might"
+//  lead to undesirable interactions with other kernel
+//  components.
+//
+
+//#define BREAK_ON_FAILURE
+//#define CHECK_TRAVERSE_ACCESS
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+#if SINGULARITY_PROCESS
+    public class Kernel
+    {
+        public static void Waypoint(int num)
+        {
+        }
+    }
+#endif
+
+    public class DirNode : Node
+    {
+        public readonly SortedList! names;
+        private Hashtable! notificationList;
+        private StringBuilder sb;
+
+        private Mutex! dirMutex;
+
+        public void AcquireLock()
+        {
+            dirMutex.WaitOne();
+        }
+        public void ReleaseLock()
+        {
+            dirMutex.ReleaseMutex();
+        }
+
+        public DirNode(string! name, Node! parent)
+        {
+            names = new SortedList();
+            dirMutex = new Mutex();
+            notificationList = new Hashtable();
+            sb = new StringBuilder(256);
+            base(NodeType.Directory, name, parent);
+        }
+
+        public DirNode(string! name, AclCore! core, IAclPolicy! policy)
+        {
+            names = new SortedList();
+            dirMutex = new Mutex();
+            notificationList = new Hashtable();
+            sb = new StringBuilder(256);
+            base(NodeType.Directory, name, core, policy);
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // begin kernel only functions
+        ///////////////////////////////////////////////////////////////////////////////
+#if !SINGULARITY_PROCESS
+        public bool CreateDirectory(string! name, out ErrorCode error)
+        {
+            error = ErrorCode.NoError;
+            bool success = false;
+            AcquireLock();
+            if (names.ContainsKey(name)) {
+                success = false;
+                error = ErrorCode.AlreadyExists;
+                DebugStub.Break();
+                ReleaseLock();
+                return false;
+            }
+            else {
+                DirNode d = new DirNode(name, this);
+                Tracing.Log(Tracing.Debug,"createDir: parent="+name);
+                names.Add(name,d);
+                HandleNotification(name,NotifyType.Creation);
+                success = true;
+            }
+            ReleaseLock();
+            return success;
+        }
+
+        public bool CreateLink(string! name, string! val)
+        {
+            bool success = false;
+            AcquireLock();
+            if (names.ContainsKey(name)) {
+                success = false;
+#if BREAK_ON_FAILURE
+                DebugStub.Break();
+#endif
+            }
+            else {
+                SymLinkNode sym = new SymLinkNode(val, name, this);
+                names.Add(name,sym);
+                success = true;
+            }
+            ReleaseLock();
+
+            return success;
+        }
+
+        public DirNode FindDirectory(StringBuilder! p)
+        {
+       /*
+            sb.Append("\nFindDirectory ");
+            sb.Append(SbUtils.PathString(p));
+            sb.Append(" at dir ");
+            sb.Append(this.NodeName);
+            DebugStub.WriteLine(sb.ToString());
+            Tracing.Log(Tracing.Debug,sb.ToString());
+        */
+            if (p.Length == 0) {
+                return this;
+            }
+
+            string first = SbUtils.FirstElement(p);
+/*
+            sb.Length = 0;
+            sb.Append("   findDir: p=");
+            sb.Append(p.ToString());
+            sb.Append(" First=");
+            sb.Append(first);
+            DebugStub.WriteLine(sb.ToString());
+*/
+            //DebugStub.Break();
+            if (null == first) {
+                return null;
+            }
+
+            Node n = (Node)this.names[first];
+            if (null == n) {
+                return null;
+            }
+            p = SbUtils.RemoveFirstElement(p);
+/*
+            sb.Length = 0;
+            sb.Append("      afterRemove: p=");
+            sb.Append(p.ToString());
+            sb.Append(" First=");
+            sb.Append(first);
+            DebugStub.WriteLine(sb.ToString());
+*/
+            if (n is DirNode) {
+                return ((DirNode) n).FindDirectory(p);
+            }
+            else {
+                //DebugStub.Break();
+                return null;
+            }
+        }
+
+        /// <returns>
+        /// Special kernel interface for adding in memory images to the namespace.
+        /// </returns>
+        public bool RegisterIoMemory(string! name, IoMemory! ioMemory)
+        {
+            Tracing.Log(Tracing.Debug,"RegisterIoMemory: "+name+" in "+name+" VA:{0} Len:{1}",
+                        ioMemory.VirtualAddress, (UIntPtr)ioMemory.Length);
+
+            if (ioMemory.VirtualAddress == UIntPtr.Zero) {
+                DebugStub.Break();
+            }
+            bool success = false;
+            try {
+                this.AcquireLock();
+                this.names.Add(name, new IoMemoryNode(ioMemory, name, this));
+                success = true;  //success
+            }
+            finally {
+                this.ReleaseLock();
+            }
+            return success;
+        }
+#endif
+        ///////////////////////////////////////////////////////////////////////////////
+        // end kernel only functions
+        ///////////////////////////////////////////////////////////////////////////////
+
+
+        public override bool GetAttributes(StringBuilder! p,
+                                           Principal pr,
+                                           out bool linkFound,
+                                           out ErrorCode error,
+                                           out bool reparse,
+                                           out string link,
+                                           out long length,
+                                           out NodeType nodeType
+                                           )
+        {
+            Kernel.Waypoint(3050);
+
+            atomic {
+                reparse = false;
+                link = null;
+                length = 0;
+                linkFound = false;
+                error = ErrorCode.NoError;
+                nodeType = NodeType.BadNode;
+
+                if (CheckEmpty(p)) {
+
+                    //the user wants the attributes of the directory object
+                    Kernel.Waypoint(3051);
+                    Kernel.Waypoint(3052);
+                    //check read access for this object
+                    if (!CheckAccess(DirPermissions.AccessModeRead, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    nodeType = NodeType.Directory;
+                    return true;
+                }
+
+                // there is more path, continue processing
+                string first = SbUtils.FirstElement(p);
+                if (null == first) {
+                    error = ErrorCode.NotFound;
+                    return false;
+                }
+
+                // can the caller traverse the current node?
+                Kernel.Waypoint(3052);
+#if CHECK_TRAVERSE_ACCESS
+                if (!CheckAccess(DirPermissions.AccessModeTraverse, pr)) {
+                    error = ErrorCode.AccessDenied;
+                    Kernel.Waypoint(3053);
+                    return false;
+                }
+#endif
+                Kernel.Waypoint(3054);
+                Node n = (Node)this.names[first];
+                if (null == n) {
+                    error = ErrorCode.NotFound;
+                    nodeType = NodeType.BadNode;
+                    return false;
+                }
+
+                p = SbUtils.RemoveFirstElement(p);
+                Kernel.Waypoint(3055);
+                bool ok =  n.GetAttributes(p,
+                                      pr,
+                                      out linkFound,
+                                      out error,
+                                      out reparse,
+                                      out link,
+                                      out length,
+                                      out nodeType
+                                      );
+
+                Kernel.Waypoint(3056);
+                return ok;
+            }
+
+        }
+
+        private bool isMatch(string! name, string! pattern)
+        {
+            bool match = false;
+            bool continueMatch = true;
+            string prefix = null;
+            string postfix = null;
+
+            int starPos = pattern.IndexOf("*");
+
+            if (starPos != -1) {
+                if (starPos == 0) {
+                    prefix = null;
+                    postfix = pattern.Substring(1);
+                }
+                else if (starPos == pattern.Length-1) {
+                    prefix = pattern.Substring(0, pattern.Length-1);
+                    postfix = null;
+                }
+                else {
+                    prefix = pattern.Substring(0, starPos);
+                    postfix = pattern.Substring(starPos+1);
+                }
+
+                if (prefix != null) {
+                    if (!name.StartsWith(prefix)) {
+                        continueMatch = false;
+                    }
+                }
+                if (continueMatch && postfix != null) {
+                    if (!name.EndsWith(postfix)) {
+                        continueMatch = false;
+                    }
+                }
+                match = continueMatch;
+            }
+            else if (pattern == name) {
+                match = true;
+            }
+
+            //DebugStub.WriteLine("name={0} pre={1} post={2} match={3}",
+            //                    __arglist(name, prefix, postfix, match));
+            return match;
+        }
+
+        public void HandleNotification(string! name, NotifyType type)
+        {
+            if (notificationList == null) {
+                return;
+            }
+
+            foreach (DictionaryEntry n in notificationList) {
+                string pattern = (string!) n.Key;
+                bool match = isMatch (name,pattern);
+
+                if (match) {
+                    NotifyContract.Imp notifyEP =
+                        ((TRef <NotifyContract.Imp:Notify>!) n.Value).Acquire();
+                    assert notifyEP.InState(NotifyContract.Notify.Value);
+                    notifyEP.SendChangeNotification(Bitter.FromString2(name),type);
+                    // should really be a switch receive
+                    notifyEP.RecvAckChangeNotification();
+                    Tracing.Log(Tracing.Debug,"notifying: pattern="+pattern+" path="+name+" type="+type);
+                    ((TRef <NotifyContract.Imp:Notify>!) n.Value).Release(notifyEP);
+                }
+            } //foreach
+        }
+
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 Principal pr,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 [Claims] ServiceContract.Exp! service)
+        {
+            Tracing.Log(Tracing.Debug, "bind "+ SbUtils.PathString(p));
+            Kernel.Waypoint(3000);
+
+            atomic {
+                success = false;
+                linkFound = false;
+                reparse = false;
+                link = null;
+                error = ErrorCode.NoError;
+
+                if (CheckEmpty(p)) {
+                    //the user wants to bind to a directory object in the namespace
+                    Kernel.Waypoint(3001);
+                    DirectoryServiceContract.Exp dirEP = service as DirectoryServiceContract.Exp;
+                    Kernel.Waypoint(3002);
+                    if (dirEP != null) {
+                        // check Traverse access for both caller and supplied EP
+#if CHECK_TRAVERSE_ACCESS
+                        if (!CheckAccess(DirPermissions.AccessModeTraverse, pr, service)) {
+                            DebugStub.WriteLine("No access to DirectoryService.Bind");
+                            Kernel.Waypoint(3003);
+                            error = ErrorCode.AccessDenied;
+                            return service;
+                        }
+#endif
+                        //Tracing.Log(Tracing.Debug," found '/' starting dir worker");
+                        Kernel.Waypoint(3004);
+
+                        DirectoryServiceWorker.Create(this, dirEP);
+
+                        Kernel.Waypoint(3005);
+                        success = true;
+                        return null;
+                    }
+                    else {
+                        error = ErrorCode.ContractNotSupported;
+                        return service;
+                    }
+                }
+
+                Kernel.Waypoint(3006);
+                Node n = GetNextNode(p, pr, out error);
+                if (null == n) {
+                    return service;
+                }
+
+                Kernel.Waypoint(3009);
+                ServiceContract.Exp sp = n.Bind(p,
+                                                pr,
+                                                out success,
+                                                out linkFound,
+                                                out error,
+                                                out reparse,
+                                                out link, service);
+                Kernel.Waypoint(3010);
+                return sp;
+            }
+        }
+
+
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims] ServiceProviderContract.Imp! sp,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            bool firstFound;
+            Node n;
+
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug,"({1:x8}) Register: path ={0}\n",
+                        SbUtils.PathString(p),(UIntPtr)Kernel.AddressOf(Thread.CurrentThread));
+#endif
+            atomic {
+                reparse = false;
+                linkFound = false;
+                link = null;
+                error = ErrorCode.NoError;
+
+                if (CheckEmpty(p) ) {
+                    error = ErrorCode.NotFound;
+                    return sp;
+                }
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        error = ErrorCode.AlreadyExists;
+                        return sp;
+                    }
+
+                    // check register access for both caller and EP
+                    else if (!CheckAccess(DirPermissions.AccessModeRegister, pr, sp)) {
+                        error = ErrorCode.AccessDenied;
+                        return sp;
+                    }
+                    else {
+                        HandleNotification(name, NotifyType.Creation);
+                        this.names.Add(name, new ProviderNode(sp, name, this));
+                        error = ErrorCode.NoError;
+                        return null;
+                    }
+                }
+                else {
+                    n = GetNextNode(p, pr, out error);
+                    if (n == null) {
+                        return sp;
+                    }
+                    return n.Register(p, pr, sp, out linkFound, out error, out reparse, out link);
+                }
+            }
+
+        }
+
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start Deregister(StringBuilder! p,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            bool firstFound;
+            Node n;
+
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug,"({1:x8}) DeRegister: path ={0}\n",
+                        SbUtils.PathString(p),(UIntPtr)Kernel.AddressOf(Thread.CurrentThread));
+#endif
+            atomic {
+                reparse = false;
+                linkFound = false;
+                link = null;
+                error = ErrorCode.NoError;
+
+                if (CheckEmpty(p) ) {
+                    error = ErrorCode.NotFound;
+                    return null;
+                }
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (!names.ContainsKey(name)) {
+                        error = ErrorCode.NotFound;
+                        return null;
+                    }
+                    // check deregister access of caller
+                    else if (!CheckAccess(DirPermissions.AccessModeDeregister, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return null;
+                    }
+                    else {
+                        HandleNotification(name, NotifyType.Deletion);
+                        n = (Node) names[name];
+                        if (n != null && n is ProviderNode) {
+                            ServiceProviderContract.Imp:Start sp = ((ProviderNode) n).GetServiceEndpoint();
+                            names.Remove(name);
+                            error = ErrorCode.NoError;
+                            return sp;
+                        }
+                        else {
+                            error = ErrorCode.NotProvider;
+                            return null;
+                        }
+                    }
+                }
+                else {
+                    n = GetNextNode(p, pr, out error);
+                    if (n == null) {
+                        return null;
+                    }
+                    return n.Deregister(p, pr, ep, out linkFound, out error, out reparse, out link);
+
+                }
+            }
+            return null;
+        }
+
+        // Local Enumeration Records.  We need this
+        // because we don't want to do ExHeap allocations in an
+        // atomic block (due to the resulting side effects) in
+        // the Enumerate() method below.
+        struct LocalEnumerationRecords
+        {
+            public string Path;
+            public NodeType Type;
+        }
+
+
+        /// <returns>
+        /// The a vector of vectors if success, null, if it fails.
+        /// </returns>
+        public EnumerationRecords[] in ExHeap Enumerate(Principal pr, out ErrorCode error)
+        {
+            error = ErrorCode.Unknown;
+
+            // check read access for directory enumerate
+            if (!CheckAccess(DirPermissions.AccessModeRead, pr)) {
+                error = ErrorCode.AccessDenied;
+                return null;
+            }
+
+            // store the enumeration in a local vector
+            // from within the atomic block, and after the
+            // atomic block succeeds copy the local vector to
+            // the ExHeap buffer that is used to send out the
+            // enumeration
+            EnumerationRecords[] in ExHeap responses;
+
+            LocalEnumerationRecords[] localResponses;
+
+            atomic {
+                error = ErrorCode.Unknown;
+                localResponses = new LocalEnumerationRecords[names.Count];
+
+                for (int i = 0; i < names.Count; i++){
+                    localResponses[i].Path = (!) (string)names.GetKey(i);
+                    localResponses[i].Type = ((!) (Node)names.GetByIndex(i)).Type;
+                }
+            }
+            responses = new [ExHeap] EnumerationRecords[localResponses.Length];
+            for(int i = 0; i < localResponses.Length; i++) {
+                expose (responses[i]) {
+                    delete responses[i].Path; // checker doesn't know its null.
+                    responses[i].Path =
+                        Bitter.FromString2((!) localResponses[i].Path);
+                    responses[i].Type = localResponses[i].Type;
+                }
+            }
+
+            return responses;
+        }
+
+        /// <returns>
+        /// true on success, false, if it fails.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! path,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            //DebugStub.WriteLine(" dir Notify() sb.len={0}, s={1}",__arglist(pathSpec.Length,pathSpec.ToString()));
+            atomic {
+                error = ErrorCode.NoError;
+                linkFound = false;
+                reparse = false;
+                link = null;
+
+                if (path.Length == 0) {
+                    // got it!
+                    DebugStub.Break();
+                    return notifyImp;
+                }
+
+                if (SbUtils.IsTail(path)) {
+                    string! first = (!)SbUtils.FirstElement(path);
+
+                    // check access: can the caller AND dest EP received notifications for this object
+                    if (!CheckAccess(DirPermissions.AccessModeNotify, pr, notifyImp)) {
+                        error = ErrorCode.AccessDenied;
+                        return notifyImp;
+                    }
+                    notifyImp.SendBegin();
+                    TRef <NotifyContract.Imp:Notify> notifyEP =
+                        new TRef <NotifyContract.Imp:Notify> (notifyImp);
+
+                    notificationList.Add(first,notifyEP);
+                    Tracing.Log(Tracing.Debug,"notify: pattern="+first);
+                    return null;
+                }
+                else {
+                    // check access: can the caller traverse the current folder
+#if CHECK_TRAVERSE_ACCESS
+                    if (!CheckAccess(DirPermissions.AccessModeTraverse, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return notifyImp;
+                    }
+#endif
+                    string first = SbUtils.FirstElement(path);
+                    sb.Length = 0;
+                    sb.Append(" dirnode Notify: str=");
+                    sb.Append(path.ToString());
+                    sb.Append(" first = ");
+                    sb.Append(first);
+                    //DebugStub.WriteLine(sb.ToString());
+
+                    Node n = (Node)this.names[first];
+                    if (null == n) {
+                        DebugStub.Break();
+                        return notifyImp;
+                    }
+
+                    path = SbUtils.RemoveFirstElement(path);
+                    return n.Notify(path, pr, pattern,  sendExisting,
+                                    out linkFound, out error, out reparse, out link, notifyImp);
+                }
+
+            }
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return null;
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+
+            atomic {
+                linkFound = false;
+                reparse = false;
+                link = null;
+                error = ErrorCode.NoError;
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        error = ErrorCode.AlreadyExists;
+                        return false;
+                    }
+                    // check write access to parent
+                    if (!CheckAccess(DirPermissions.AccessModeWrite, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    else {
+                        DirNode d = new DirNode(name, this);
+                        Tracing.Log(Tracing.Debug,"createDir: parent="+name);
+                        names.Add(name,d);
+                        // not sure if this is needed
+                        // here, maybe needed only for
+                        // Registering and Deregistering
+                        // services; hence commenting out
+                        // the notification part
+                        //HandleNotification(name, NotifyType.Creation);
+                        return true;
+                    }
+                }
+                else {
+                    // pass the request on to the next node if there is one.
+                    if (CheckEmpty(p)) {
+                        error = ErrorCode.NotFound;
+                        DebugStub.Break();
+                        return false;
+                    }
+                    n = GetNextNode(p, pr, out error);
+                    if (n == null) {
+                        return false;
+                    }
+                    return ((!)n).CreateDirectory(p, pr, out linkFound, out error, out reparse, out link);
+
+                }
+                return false;
+            }
+        }
+
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NoError;
+
+            // since the function implementation (commented out
+            // below) always returns a "false" value and does
+            // not update the system state, we'll simply return
+            // a "false" value here itself
+            return false;
+
+            /*
+            if (SbUtils.IsTail(p)) {
+                    // true files are not supported in the namespace
+                error = ErrorCode.NotImplemented;
+                return false;
+            }
+            else {
+                // pass the request on to the next node if there is one.
+                if (CheckEmpty(p)) {
+                    error = ErrorCode.NotImplemented;
+                    return false;
+                }
+                n = GetNextNode(p, pr, out error);
+                if (n == null) {
+                    return false;
+                }
+                return ((!)n).CreateFile(p, pr, out linkFound, out error, out reparse, out link);
+
+            }
+            return false;
+            */
+        }
+
+        private bool CheckEmpty(StringBuilder! p)
+        {
+            if ( (p.Length == 0)  || ( (p.Length == 1 ) && (p[0] == '/') ) ) {
+                 return true;
+            }
+            return false;
+        }
+
+        private Node GetNextNode(StringBuilder! p, Principal pr, out ErrorCode error)
+        {
+            //DebugStub.Break();
+            string first = SbUtils.FirstElement(p);
+            error = ErrorCode.NoError;
+            if (null == first) {
+                return null;
+            }
+
+            Kernel.Waypoint(3006);
+#if CHECK_TRAVERSE_ACCESS
+            if (!CheckAccess(DirPermissions.AccessModeTraverse, pr)) {
+                Kernel.Waypoint(3007);
+                error = ErrorCode.AccessDenied;
+                return null;
+            }
+#endif
+            Kernel.Waypoint(3008);
+
+            Node n = (Node)this.names[first];
+            if (null == n) {
+                error = ErrorCode.NotFound;
+                return null;
+            }
+
+            SbUtils.RemoveFirstElement(p);
+            return n;
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+            atomic {
+                linkFound = false;
+                link = null;
+                reparse = false;
+                error = ErrorCode.NoError;
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        error = ErrorCode.AlreadyExists;
+                        return false;
+                    }
+                    // check write access to parent
+                    else if (!CheckAccess(DirPermissions.AccessModeWrite, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    else {
+                        SymLinkNode sym = new SymLinkNode(value, name, this);
+                        names.Add(name,sym);
+                        return true;
+                    }
+                }
+                else { //recurse
+                    if (CheckEmpty(p)) {
+                        error = ErrorCode.NotFound;
+                        return false;
+                    }
+                    n = GetNextNode(p, pr, out error);
+                    if (n == null) {
+                        return false;
+                    }
+                    return ((!)n).CreateLink(p, pr, value, out linkFound, out error, out reparse, out link);
+                }
+            }
+        }
+
+        public override bool DeleteDirectory(StringBuilder! p,
+                                             Principal pr,
+                                             out bool linkFound,
+                                             out ErrorCode error,
+                                             out bool reparse,
+                                             out string link
+                                             )
+        {
+            Node n;
+
+            DirNode child;
+
+            atomic {
+                linkFound = false;
+                reparse = false;
+                link = null;
+                error = ErrorCode.NotFound;
+                if (CheckEmpty(p)) {
+                    return false;
+                }
+
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        // check to see if this node has entries
+                        // if so let the caller know
+                        n = GetNextNode(p, pr, out error);
+                        if (n == null) {
+                            return false;
+                        }
+                        if (n is DirNode) {
+                            child = (DirNode) n;
+                            if (child.names.Count != 0) {
+                                DebugStub.WriteLine("Directory is not empty({0})!", __arglist(child.names.Count));
+                                error = ErrorCode.DirectoryNotEmpty;
+                                return false;
+                            }
+                            // check write access to parent
+                            else if (!CheckAccess(DirPermissions.AccessModeWrite, pr)) {
+                                error = ErrorCode.AccessDenied;
+                                return false;
+                            }
+                            // check write access to child
+                            else if (!n.CheckAccess(DirPermissions.AccessModeWrite, pr)) {
+                                error = ErrorCode.AccessDenied;
+                                return false;
+                            }
+                        }
+                        else {
+                            error = ErrorCode.NotDirectory;
+                            return false;
+                        }
+
+                        error = ErrorCode.NoError;
+                        names.Remove(name);
+                        return true;
+                    }
+                    else {
+                        return false;
+                    }
+                }
+
+                n = GetNextNode(p, pr, out error);
+                if (n == null) {
+                    linkFound = false;
+                    reparse = false;
+                    link = null;
+                    return false;
+                }
+                return ((!)n).DeleteDirectory(p, pr, out linkFound, out error, out reparse, out link);
+
+            }
+        }
+
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NotFound;
+
+            // since the function implementation (commented out
+            // below) always returns a "false" value and does
+            // not update the system state, we'll simply return
+            // a "false" value here itself
+            return false;
+
+            /*
+            if (CheckEmpty(p)) {
+                error = ErrorCode.NotFound;
+                return false;
+            }
+            if (SbUtils.IsTail(p)) {
+                string! name = (!)SbUtils.FirstElement(p);
+                if (names.ContainsKey(name)) {
+                    // check write access to parent
+                    if (!CheckAccess(DirPermissions.AccessModeWrite, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    // continue on to actual node for deletion
+                }
+                else {
+                    return false;
+                }
+            }
+
+            n = GetNextNode(p, pr, out error);
+            if (n == null) {
+                return false;
+            }
+            return ((!)n).DeleteFile(p, pr, out linkFound, out error, out reparse, out link);
+            */
+        }
+
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+
+        {
+            Node n;
+
+            //DebugStub.Break();
+
+            atomic {
+                linkFound = false;
+                reparse = false;
+                link = null;
+                error = ErrorCode.NotFound;
+                if (CheckEmpty(p)) {
+                    return false;
+                }
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        //check write access to parent
+                        if (!CheckAccess(DirPermissions.AccessModeWrite, pr)) {
+                            error = ErrorCode.AccessDenied;
+                            return false;
+                        }
+                        error = ErrorCode.NoError;
+                        // this should check whether the node is a link!
+                        names.Remove(name);
+                        return true;
+                    }
+                    else {
+                        return false;
+                    }
+                }
+
+                n = GetNextNode(p, pr, out error);
+                if (n == null) {
+                    linkFound = false;
+                    reparse = false;
+                    link = null;
+                    return false;
+                }
+                return ((!)n).DeleteLink(p, pr, out linkFound, out error, out reparse, out link);
+            }
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                          Principal pr,
+                                          out bool linkFound,
+                                          out ErrorCode error,
+                                          out bool reparse,
+                                          out string link
+                                          )
+
+        {
+            Node n;
+
+            atomic {
+                error = ErrorCode.NotLink;
+                linkFound = false;
+                reparse = false;
+                link = null;
+
+                //DebugStub.Break();
+                if (CheckEmpty(p)) {
+                    return false;
+                }
+
+                n = GetNextNode(p, pr, out error);
+                if (n == null) {
+                    return false;
+                }
+                return ((!)n).GetLinkValue(p, pr, out linkFound, out error, out reparse, out link);
+            }
+        }
+
+
+        public override bool QueryACL(StringBuilder! p,
+                                      Principal pr,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            Node n;
+
+            acl = new Acl();
+
+            atomic {
+                error = ErrorCode.NoError;
+                linkFound = false;
+                reparse = false;
+                link = null;
+                if (CheckEmpty(p)) {
+                    if (CheckAccess(DirPermissions.AccessModeRead, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    acl = this.GetInstanceAcl();
+                    return true;
+                }
+                n = GetNextNode(p, pr, out error);
+                if (n == null) {
+                    return false;
+                }
+                return ((!)n).QueryACL(p, pr, out linkFound, out error, out reparse, out link, out acl);
+            }
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            Node n;
+
+            atomic {
+                linkFound = false;
+                reparse = false;
+                link = null;
+                error = ErrorCode.NoError;
+
+                if (CheckEmpty(p)) {
+                    if (!CheckAccess(DirPermissions.AccessModeSetAcl, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    SetInstanceAcl(acl);
+                    return true;
+                }
+                n = GetNextNode(p, pr, out error);
+                if (n == null) {
+                    return false;
+                }
+                return ((!)n).StoreACL(p, pr, acl, out linkFound, out error, out reparse, out link);
+            }
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/DirPermissions.sg b/base/Applications/NameSpace/AtomicTestDSP/DirPermissions.sg
new file mode 100644
index 0000000..764a2a4
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/DirPermissions.sg
@@ -0,0 +1,42 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirPermissions.sg
+//
+//  Note:
+//
+
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif
+
+{
+    public class DirPermissions
+    {
+        public static readonly AccessMode AccessModeTraverse;        // can pass through
+        public static readonly AccessMode AccessModeRead;            // can read/enumerate
+        public static readonly AccessMode AccessModeWrite;           // can create/write an object
+        public static readonly AccessMode AccessModeSetAcl;          // can modify access control
+        public static readonly AccessMode AccessModeRegister;        // can register
+        public static readonly AccessMode AccessModeDeregister;      // can deregister
+        public static readonly AccessMode AccessModeNotify;          // can receive notifications
+
+        static DirPermissions() {
+            AccessModeTraverse = new AccessMode("traverse");
+            AccessModeRead = new AccessMode("read");
+            AccessModeWrite = new AccessMode("write");
+            AccessModeSetAcl = new AccessMode("setacl");
+            AccessModeRegister = new AccessMode("register");
+            AccessModeDeregister = new AccessMode("deregister");
+            AccessModeNotify = new AccessMode("notify");
+        }
+    }
+}
+
+
diff --git a/base/Applications/NameSpace/AtomicTestDSP/DirectoryService.sg b/base/Applications/NameSpace/AtomicTestDSP/DirectoryService.sg
new file mode 100644
index 0000000..4a0c2f4
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/DirectoryService.sg
@@ -0,0 +1,212 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Directory;
+
+using Microsoft.Singularity.Security;
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Application.DSP
+{
+    public class NameServiceDSP
+    {
+
+        private static DirNode rootDir;
+        private static string mountPoint;
+
+        private static int Register(string! name, [Claims]ServiceProviderContract.Imp! imp)
+        {
+            // acquire namespace endpoint
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+            mountPoint = name;
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(name),imp);
+                switch receive {
+                    case epNS.AckRegister():
+                        break;
+                    case epNS.NakRegister(reject, error):
+                        DebugStub.Break();
+                        delete reject;
+                        return -1;
+                        break;
+                    case epNS.ChannelClosed():
+                        DebugStub.Break();
+                        return -1;
+                        break;
+                    case epNS.NakRegisterReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               ServiceProviderContract.Imp:Start! reject) :
+                        DebugStub.Break();
+                        delete reject;
+                        delete path;
+                        delete rest;
+                        return -1;
+                        break;
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register NakConnect with Nameservice\n");
+                        DebugStub.Break();
+                        return -1;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            return 0;
+        }
+
+        private static int Deregister(string! name)
+        {
+            // acquire namespace endpoint
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+            mountPoint = name;
+
+            try {
+                epNS.SendDeregister(Bitter.FromString2(name));
+                switch receive {
+                    case epNS.AckDeregister(service):
+                        delete service;
+                        break;
+                    case epNS.NakDeregister(error):
+                        DebugStub.Break();
+                        break;
+                    case epNS.ChannelClosed():
+                        DebugStub.Break();
+                        break;
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register NakConnect with Nameservice\n");
+                        DebugStub.Break();
+                        return -1;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            return 0;
+        }
+
+        public static void Initialize()
+        {
+            IAclPolicy _policy = new PathPolicyEngine();
+            InstallAcls(_policy);
+            AclCore _core = new AclCore(null, new DirAclCoreSupport());
+            _core.Disable = true;
+            rootDir = new DirNode("/", _core, _policy);
+        }
+
+
+        // in the fullness of time, we should read the server configuration
+        // from a reified manifest including config information
+        // for now, we will just add a rule to allow **any** access
+        private static void InstallAcls(IAclPolicy! policy)
+        {
+            /*
+            // read the rules section from the config
+            XmlNode node = config.GetChild(PolicyListXmlTag);
+            if (node == null) {
+                return;
+            }
+
+            foreach (XmlNode! rule in node.Children) {
+                if (rule.Name != "rule") {
+                    continue;
+                }
+
+                string! resource = (!)rule.GetAttribute("resource", "");
+                if (resource.Equals("")) {
+                    continue;
+                }
+                string! aclstr = (!)rule.GetAttribute("acl", "");
+                if (aclstr.Equals("")) {
+                    continue;
+                }
+
+                policy.AddRule(resource, aclstr);
+            }
+            */
+            policy.AddRule("/", "{/groups/anyall}");
+        }
+
+        public static void Finalize()
+        {
+            Deregister(mountPoint);
+        }
+
+        public static  void tell(string name)
+        {
+            Console.WriteLine("{0}: <registration path>", name);
+        }
+
+        public static  int  Main(string[]! args)
+        {
+            int status;
+            Initialize();
+
+            if (args.Length < 2) {
+                tell(args[0]);
+                return -1;
+            }
+
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! s;
+            ServiceProviderContract.NewChannel(out imp, out s);
+            status = Register((!)args[1], imp);
+
+            if (status != 0) {
+                delete s;
+                return status;
+            }
+
+             try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        // Listen for new connections
+                        case s.Connect(ServiceContract.Exp:Start! candidate):
+                                DirectoryServiceContract.Exp:Start exp = candidate as DirectoryServiceContract.Exp:Start!;
+                                if (exp != null) {
+                                    s.SendAckConnect();
+                                    DirectoryServiceWorker.Create(rootDir,exp);
+                                }
+                                else s.SendNackConnect(candidate);
+                                break;
+                        case s.ChannelClosed() :
+                            run = false;
+                            Console.WriteLine("Channel Closed. DSP shutting down");
+                            break;
+                        case unsatisfiable:
+                            run = false;
+                            Console.WriteLine("Unsatisfiable. DSP shutting down");
+                            break;
+                    }
+                }
+            }
+            finally {
+            }
+            delete s;
+            Console.WriteLine(" last line of DSP... process should terminate");
+            return 0;
+        }
+   }
+}
+
+
+
+
diff --git a/base/Applications/NameSpace/AtomicTestDSP/DirectoryServiceWorker.sg b/base/Applications/NameSpace/AtomicTestDSP/DirectoryServiceWorker.sg
new file mode 100644
index 0000000..8e26b02
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/DirectoryServiceWorker.sg
@@ -0,0 +1,193 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryServiceWorker.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Directory.WorkerFunctions;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    using SharedHeap = Microsoft.Singularity.Memory.SharedHeap;
+
+    class DirectoryServiceWorker
+    {
+        private TRef<DirectoryServiceContract.Exp:Start> epRef;
+        private DirNode dirNode;
+
+        private DirectoryServiceWorker(DirNode dirNode,
+                                      [Claims] DirectoryServiceContract.Exp:Start! i_ep)
+            requires i_ep.InState(DirectoryServiceContract.Start.Value);
+        {
+            epRef = new TRef<DirectoryServiceContract.Exp:Start>(i_ep);
+            this.dirNode = dirNode;
+            base();
+        }
+
+        private void Start()
+        {
+#if !SINGULARITY_PROCESS
+            Thread thread = Thread.CreateThread(DirectoryService.processForWorkerThreads,
+                                                new ThreadStart(Run));
+#else
+            Thread thread = new Thread (new ThreadStart(Run));
+#endif
+
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+
+        public static void Create(DirNode dirNode,
+                                  [Claims] DirectoryServiceContract.Exp:Start! i_ep)
+        {
+            //
+            // We need to do some trickery to pass the ownership of i_ep to
+            // the thread that will run the worker.
+            // We are currently working on behalf of some user process, but
+            // the worker thread will be a kernel thread.
+            // The transfer has to happen after we released the i_ep into the TRef
+            // but before we acquire the TRef. This is because the Release and Acquire
+            // operations actually cause the endpoint to be dereferenced and that
+            // must happen by the correct owner.
+
+            // The TRef implementation in the kernel now takes care of this.
+
+            DirectoryServiceWorker worker;
+
+            worker = new DirectoryServiceWorker(dirNode, i_ep);
+
+            // Now start the worker, which will acquire the endpoint in the TRef.
+            worker.Start();
+        }
+
+        private void Run()
+        {
+            bool success;
+            int code;
+            char* opt(ExHeap[]) path;
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug,"new thread={0:x8}",(UIntPtr)Kernel.AddressOf(Thread.CurrentThread));
+#endif
+            DirectoryServiceContract.Exp ep = epRef.Acquire();
+
+            epRef = null;
+
+            ep.SendSuccess();
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        case ep.Bind(i_path, i_server) :
+                             WorkerFunctions.DoBind(dirNode, ep, i_path, i_server);
+                             break;
+
+                        case ep.BeginEnumeration() :
+                            WorkerFunctions.DoEnumerate(dirNode, ep);
+                            break;
+
+                        case ep.GetAttributes( char []! in ExHeap i_path) :
+                            WorkerFunctions.DoGetAttributes(dirNode, ep, i_path);
+                            break;
+
+                        case ep.ReadEnumeration() :
+                            WorkerFunctions.DoMore(dirNode, ep);
+                            break;
+
+                        case ep.Notify(i_path, i_pattern, i_sendExisting, i_notifyImp):
+                            WorkerFunctions.DoNotify(dirNode, ep,i_path, i_pattern, i_sendExisting, i_notifyImp);
+                            break;
+
+                        case ep.Register(i_path, i_provider):
+                            WorkerFunctions.DoRegister(dirNode, ep, i_path, i_provider);
+                            break;
+
+                        case ep.EndEnumeration() :
+                            WorkerFunctions.DoStop(dirNode, ep);
+                            break;
+
+                        case ep.Deregister(i_path):
+                            WorkerFunctions.DoDeregister(dirNode, ep, i_path);
+                            break;
+
+                        case ep.CreateDirectory(i_name) :
+                            WorkerFunctions.DoCreateDirectory(dirNode, ep,i_name);
+                            break;
+
+                        case ep.DeleteDirectory(i_name) :
+                            WorkerFunctions.DoDeleteDirectory(dirNode, ep,i_name);
+                            break;
+
+                        case ep.CreateFile( char []! in ExHeap i_name) :
+                            WorkerFunctions.DoCreateFile(dirNode, ep,i_name);
+                            break;
+
+                        case ep.DeleteFile(i_name):
+                            WorkerFunctions.DoDeleteFile(dirNode, ep,i_name);
+                            break;
+
+                        case ep.QueryACL(char[]! in ExHeap i_name):
+                            WorkerFunctions.DoQueryACL(dirNode, ep, i_name);
+                            break;
+
+                        case ep.StoreACL(char[]! in ExHeap i_name, char[] in ExHeap acl):
+                            WorkerFunctions.DoStoreACL(dirNode, ep, i_name, acl);
+                            break;
+
+                       case ep.CreateAndBindFile(char []! in ExHeap i_name, FileContract.Imp:Ready! imp) :
+                            WorkerFunctions.DoCreateAndBindFile(dirNode, ep, i_name, imp);
+                            break;
+
+                        case ep.CreateLink(i_name,i_value) :
+                            WorkerFunctions.DoCreateLink(dirNode, ep,i_name, i_value);
+                            break;
+
+                        case ep.DeleteLink(i_name):
+                            WorkerFunctions.DoDeleteLink(dirNode, ep,i_name);
+                            break;
+
+                        case ep.GetLinkValue(i_name):
+                            WorkerFunctions.DoGetLinkValue(dirNode, ep,i_name);
+                            break;
+
+                        case ep.ChannelClosed():
+#if SINGULARITY_PROCESS
+                            //DebugStub.WriteLine("SDSWorker Thread shutting down");
+#endif
+                            run = false;
+                            break;
+
+                        case unsatisfiable:
+                            DebugStub.Print("NameServiceWorker shutting down\n");
+                            DebugStub.Break();
+                            run = false;
+                            break;
+                    }//switch
+                } //for
+            } //try
+            finally {
+                delete ep;
+            }
+        } //run
+    } //DirectoryServiceWorker class
+} //namespace
diff --git a/base/Applications/NameSpace/AtomicTestDSP/IoMemoryNode.sg b/base/Applications/NameSpace/AtomicTestDSP/IoMemoryNode.sg
new file mode 100644
index 0000000..2e75acc
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/IoMemoryNode.sg
@@ -0,0 +1,377 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoMemoryNode.sg
+//
+//  Note: internal node type used to support IoMemory images
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+
+    public class IoMemoryNode : Node
+    {
+        public IoMemory ioMemory;
+
+        public IoMemoryNode(IoMemory ioMem, string! name, Node! parent)
+        {
+            this.ioMemory = ioMem;
+            base(NodeType.IoMemory, name, parent);
+        }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 Principal pr,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service)
+        {
+            Kernel.Waypoint(3200);
+            reparse = false;
+            link = null;
+            success = false;
+            linkFound = false;
+
+            if (! (p.Length == 0) ){
+                error = ErrorCode.NotFound;
+                return service;
+            }
+
+            // The FileContract needs to be subdivided into Read and Write, then
+            // we can determine which permissions to use here.  For now, it must
+            // be the case that all  uses (if any) of IoMemory objects in the file system
+            // are read-only. [EPW]
+            if (!CheckAccess(DirPermissions.AccessModeRead, pr, service)) {
+                DebugStub.WriteLine("No access to IoMemoryNode.Bind");
+                error = ErrorCode.AccessDenied;
+                return service;
+            }
+
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug, "Starting stream IoMemory writer");
+
+            //send a bind message to the IoMemory FS with the endpoint and the cookie as args.
+            FileContract.Exp:Start fp = service as FileContract.Exp;
+            if (fp == null) {
+                success = false;
+                error = ErrorCode.ContractNotSupported;
+                return service;
+            }
+
+            Kernel.Waypoint(3201);
+
+            IoMemFSContract.Imp:Ready io = Directory.DirectoryService.AcquireIoFS();
+            if (io != null) {
+                Kernel.Waypoint(3202);
+                io.SendConnect(fp, (UIntPtr)ioMemory.VirtualAddress, ioMemory.Length);
+                Kernel.Waypoint(3203);
+                io.RecvAckConnect();
+                Kernel.Waypoint(3204);
+                Directory.DirectoryService.ReleaseIoFS(io);
+                success = true;
+            }
+            else {
+                DebugStub.Break();
+                delete fp;
+                success = false;
+            }
+            Kernel.Waypoint(3205);
+            error = ErrorCode.NoError;
+            return null;
+#endif
+            error = ErrorCode.NotImplemented;
+            return service;
+        }
+
+        /// <returns>
+        /// null on success, the sp argument if it failed.
+        /// </returns>
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            // cannot register over an existing provider
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.NotSupported;
+            return sp;
+        }
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start Deregister(StringBuilder! path,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            link  = null;
+            linkFound = false;
+            reparse = false;
+            error = ErrorCode.NotSupported;
+            if (! (path.Length == 0) ) {
+                return null;
+            }
+
+            // we are being removed
+            // the remove will fail!
+
+            // if we ever allow deregister of IoMemoryNode
+            // do not forget to add an access control check.
+            return null;
+        }
+
+
+        /// <returns>
+        /// if true returns length and node type, otherwise error
+        /// </returns>
+        public override bool GetAttributes(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link,
+                                        out long length,
+                                        out NodeType nodeType
+                                        )
+        {
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NoError;
+            nodeType = NodeType.IoMemory;
+            length = ioMemory.Length;
+            return true;
+        }
+
+
+        /// <returns>
+        /// null on success, the imp argument if it failed.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! pathSpec,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            // this method should never be called
+            error = ErrorCode.NotSupported;
+            reparse = false;
+            link = null;
+            linkFound = false;
+            return notifyImp;
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return null;
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+     }
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+        }
+        public override bool DeleteDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+        }
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+        }
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            return false;
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            linkFound = false;
+            error = ErrorCode.NotLink;
+            reparse = false;
+            link = null;
+            return false;
+        }
+
+        public override bool QueryACL(StringBuilder! p,
+                                      Principal pr,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            linkFound = false;
+            error = ErrorCode.NoError;
+            reparse = false;
+            link = null;
+            acl = new Acl();
+
+            if (CheckAccess(DirPermissions.AccessModeRead, pr)) {
+                error = ErrorCode.AccessDenied;
+                return false;
+            }
+            acl = GetInstanceAcl();
+            return true;
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            linkFound = false;
+            error = ErrorCode.NoError;
+            reparse = false;
+            link = null;
+
+            if (!CheckAccess(DirPermissions.AccessModeSetAcl, pr)) {
+                error = ErrorCode.AccessDenied;
+                return false;
+            }
+
+            SetInstanceAcl(acl);
+            return true;
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/Node.sg b/base/Applications/NameSpace/AtomicTestDSP/Node.sg
new file mode 100644
index 0000000..cd124f5
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/Node.sg
@@ -0,0 +1,314 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Node.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    public abstract class Node
+    {
+        // base class for all node types in name space
+
+        private string nodeName;
+
+        /// <summary>
+        /// The policy object controlling the access to this node
+        /// </summary>
+        private AclCore! core;
+        private IAclPolicy! policy;
+        /// <summary>
+
+        /// ACLs here are not persistent.
+        /// </summary>
+        private Acl acl = Acl.nullAcl;
+        private IAclRule rule = null;
+
+        private readonly NodeType nodeType;
+
+        protected Node(NodeType nodeType, string! name, AclCore! core, IAclPolicy! policy)
+        {
+            this.nodeType = nodeType;
+            this.nodeName = name;
+            this.core = core;
+            this.policy = policy;
+        }
+
+        protected Node(NodeType nodeType, string! name, Node! parent)
+        {
+            this.nodeType = nodeType;
+            this.nodeName = parent.nodeName + "/" + name;
+            this.core = parent.core;
+            this.policy = parent.policy;
+        }
+
+        private Acl GetObjectAcl()
+        {
+            lock (this) {
+                if (acl.val != null) {
+                    if (rule == null || rule.Valid)
+                        return acl;
+                }
+                acl = policy.LookupAndExpand(nodeName, out rule);
+                return acl;
+            }
+        }
+
+        public bool CheckAccess(AccessMode! permission, Principal pr)
+        {
+            Acl acl = GetObjectAcl();
+            return core.CheckAccess(acl, permission, pr);
+        }
+
+        public bool CheckAccess(AccessMode! permission, Principal pr, Endpoint*! in ExHeap ep)
+        {
+            Acl acl = GetObjectAcl();
+            if (!core.CheckAccess(acl, permission, pr))
+                return false;
+            Principal pr2 = AclCore.EndpointPeer(ep);
+            if (pr.Equal(pr2))
+                return true;
+            return core.CheckAccess(acl, permission, AclCore.EndpointPeer(ep));
+        }
+
+        public Acl GetInstanceAcl()
+        {
+            lock (this) {
+                if (rule == null)
+                    return acl;
+            }
+            return Acl.nullAcl;
+        }
+
+        public void SetInstanceAcl(Acl acl)
+        {
+            lock (this) {
+                this.acl = acl;
+                this.rule = null;
+            }
+        }
+
+        public string! FullName { get { return nodeName; } }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public abstract ServiceContract.Exp Bind(StringBuilder! p,
+                                                 Principal pr,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service);
+
+
+        /// CreateAndBindFile
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                                           Principal pr,
+                                                           out bool linkFound,
+                                                           out ErrorCode error,
+                                                           out bool reparse,
+                                                           out string link
+                                                           );
+
+        /// CreateDirectory
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool CreateDirectory(StringBuilder! p,
+                                             Principal pr,
+                                             out bool linkFound,
+                                             out ErrorCode error,
+                                             out bool reparse,
+                                             out string link
+                                             );
+
+        /// CreateFile
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+
+        /// CreateFile
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+        /// DeleteDirectory
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool DeleteDirectory(StringBuilder! p,
+                                             Principal pr,
+                                             out bool linkFound,
+                                             out ErrorCode error,
+                                             out bool reparse,
+                                             out string link
+                                             );
+        /// DeleteFileusing Microsoft.SingSharp;
+
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+
+        /// DeleteLink
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+
+
+        /// GetLinkValue
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool GetLinkValue(StringBuilder! p,
+                                          Principal pr,
+                                          out bool linkFound,
+                                          out ErrorCode error,
+                                          out bool reparse,
+                                          out string link
+                                          );
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public abstract ServiceProviderContract.Imp:Start Deregister(StringBuilder! path,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               );
+
+
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool GetAttributes(StringBuilder! p,
+                                           Principal pr,
+                                           out bool linkFound,
+                                           out ErrorCode error,
+                                           out bool reparse,
+                                           out string link,
+                                           out long length,
+                                           out NodeType nodeType
+                                           );
+
+
+
+        /// <returns>
+        /// null on success, the imp argument if it failed.
+        /// </returns>
+        public abstract NotifyContract.Imp Notify(StringBuilder! pathSpec,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp);
+
+        /// QueryACL
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool QueryACL(StringBuilder! p,
+                                      Principal pr,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      );
+
+
+        /// Register
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      );
+
+        /// StoreACL
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      );
+
+
+        public NodeType Type
+        {
+            get
+            {
+                return this.nodeType;
+            }
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/Path.sg b/base/Applications/NameSpace/AtomicTestDSP/Path.sg
new file mode 100644
index 0000000..8997e32
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/Path.sg
@@ -0,0 +1,84 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Nameserver.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+#if !SINGULARITY_PROCESS 
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif 
+{
+    public class Path
+    {
+        ArrayList elts;
+
+        public Path(String! s)
+        {
+            string[] sa = s.Split("/".ToCharArray());
+            ArrayList elts = this.elts = new ArrayList(sa);
+            elts.RemoveAt(0); // since paths start with a slash, the first one will be empty
+        }
+
+        public bool Empty { get { return this.elts.Count == 0; } }
+
+        public int Length()
+        {
+            return elts.Count;
+        }
+
+        public String StripLast()
+        {
+            int pos = elts.Count - 1;
+            String s = (String)elts[pos];
+            elts.RemoveAt(pos);
+            return s;
+        }
+
+        public void Append(String elt)
+        {
+            elts.Add(elt);
+        }
+
+        public String FirstElement()
+        {
+            return (String)elts[0];
+        }
+
+        public void RemoveFirstElement()
+        {
+            elts.RemoveAt(0);
+        }
+
+        public String! PathString()
+        {
+            String result = "";
+            IEnumerator e = elts.GetEnumerator();
+            while (e.MoveNext()) {
+                result += "/" + e.Current;
+            }
+            return result;
+        }
+
+        public char[]! in ExHeap PathVector()
+        {
+            String result = PathString();
+            return Bitter.FromString2(result);
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/Property.sg b/base/Applications/NameSpace/AtomicTestDSP/Property.sg
new file mode 100644
index 0000000..e0f8ee1
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/Property.sg
@@ -0,0 +1,43 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#if !SINGULARITY_PROCESS 
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif 
+{
+    public class Property
+    {
+        private string name;
+        private byte[] value;
+
+        public Property(string! name, byte[]! value)
+        {
+            this.name = name;
+            this.value = value;
+        }
+
+        public string! Name
+        {
+            get
+            {
+                return (!)name;
+            }
+        }
+
+        public byte[]! Value
+        {
+            get
+            {
+                return (!)value;
+            }
+            set
+            {
+                this.value = value;
+            }
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/ProviderNode.sg b/base/Applications/NameSpace/AtomicTestDSP/ProviderNode.sg
new file mode 100644
index 0000000..bca13b5
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/ProviderNode.sg
@@ -0,0 +1,458 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif
+{
+    // Although there currently are none, there might need to be access control
+    // checks at Bind time.  Certainly, the Bind target can do an access check,
+    // but the Bind intermediary, here, might also make a check.  See the discussion
+    // below.
+
+    public class ProviderNode : Node
+    {
+        public TRef<ServiceProviderContract.Imp:Start>! ServiceEndpoint;
+        private bool isDead;
+
+        public ProviderNode([Claims] ServiceProviderContract.Imp! imp, string! name, Node! parent)
+            requires imp.InState(ServiceProviderContract.Start.Value);
+        {
+            ServiceEndpoint = new TRef<ServiceProviderContract.Imp:Start>(imp);
+            isDead = false;
+            base(NodeType.ServiceProvider, name, parent);
+        }
+
+        public ServiceProviderContract.Imp:Start! GetServiceEndpoint() {
+                      return this.ServiceEndpoint.Acquire();
+        }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 Principal pr,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service)
+        {
+            Kernel.Waypoint(3100);
+
+            reparse = false;
+            link = null;
+            success = false;
+            linkFound = false;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.NotFound;
+                    reparse = true;
+                    link = p.ToString();
+                    return service;
+                }
+            }
+
+            // There continues to be an inconsistency here with access control.
+            // We might do the access control here on Bind, in which case we know
+            // the caller.  However, if we require the access control operation
+            // to be done on the other side of the Connect operation, then that
+            // code doesn't see the original invoker and moreover there is no
+            // appropriate AccessDenied failure on Connect.
+
+            // It seems a little weird to put access controls on the provider
+            // node, since such node are transient, but that is perhaps what we
+            // should do.
+
+            // If we decide to do ACL checks here, figure out how to get the
+            // permissions from the service endpoint!! No access check here until we do.
+
+            /*
+              if (!CheckNodeAccess(???, pr, service)) {
+                DebugStub.WriteLine("No access to bind");
+                error = ErrorCode.AccessDenied;
+                return service;
+            }
+            */
+
+            lock (this) {
+                Kernel.Waypoint(3101);
+                if (isDead) {
+                    success = false;
+                    error = ErrorCode.NotFound;
+                    return service;
+                }
+
+                ServiceProviderContract.Imp ep = this.ServiceEndpoint.Acquire();
+                assert ep.InState(ServiceProviderContract.Start.Value);
+                Tracing.Log(Tracing.Debug, "Connecting to Service Provider");
+                try {
+                    ep.SendConnect(service);
+                    switch receive {
+                        case ep.AckConnect():
+                            success = true;
+                            error = ErrorCode.NoError;
+                            return null;
+                        case ep.NackConnect(rejectedEP):
+                            Tracing.Log(Tracing.Debug,"nak connect ");
+                            // REVIEW what should be returned here?
+                            error = ErrorCode.ContractNotSupported;
+                            return rejectedEP;
+                        case ep.ChannelClosed():
+                            Tracing.Log(Tracing.Debug,"channel closed");
+                            // make this a zombie node
+                            isDead = true;
+                            error = ErrorCode.ChannelClosed;
+                            success = false;
+                            return null;
+                        case unsatisfiable:
+                            Tracing.Log(Tracing.Debug,"Unsatisfiable!!");
+                            error = ErrorCode.Unsatisfiable;
+                            success = false;
+                            return null;
+                    }
+                }
+                finally {
+                    this.ServiceEndpoint.Release(ep);
+                }
+                Kernel.Waypoint(3102);
+            } // lock on node
+        }
+
+        /// <returns>
+        /// null on success, the sp argument if it failed.
+        /// </returns>
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    return sp;
+                }
+            }
+
+            // cannot register over an existing provider
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.NotSupported;
+            return sp;
+        }
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start  Deregister(StringBuilder! p,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            link  = null;
+            linkFound = false;
+            reparse = false;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    return null;
+                }
+            }
+
+            // Add the following access check on Deregister pursuant on the
+            // discussion about access controls on providers above.
+            /*
+              if (!CheckNodeAccess(DirPermissions.AccessModeDeregister, pr, ep)){
+                error = ErrorCode.AccessDenied;
+                return null;
+            }
+            */
+
+            // we are being removed
+            error = ErrorCode.NoError;
+            return this.ServiceEndpoint.Acquire();
+        }
+
+
+        /// <returns>
+        /// if true returns length and node type, otherwise error
+        /// </returns>
+        public override bool GetAttributes(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link,
+                                        out long length,
+                                        out NodeType nodeType
+                                        )
+        {
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    length = 0;
+                    link = p.ToString();
+                    nodeType = NodeType.ServiceProvider;
+                    return false;
+                }
+            }
+
+            linkFound = false;
+            reparse = false;
+            link = p.ToString();
+            nodeType = NodeType.ServiceProvider;
+            length = 0;
+            error = ErrorCode.Unknown;
+            return true;
+        }
+
+
+        /// <returns>
+        /// null on success, the imp argument if it failed.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! p,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    return notifyImp;
+                }
+            }
+            return notifyImp;
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return null;
+        }
+
+        private bool CheckForTraverse (StringBuilder! p,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.Unknown;
+            reparse = false;
+            link = null;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/') ){
+                    // pass thru if it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.NoError;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    if (p[0] == '/')  link = link.Substring(1);
+                    return false;
+                }
+            }
+            return false;
+
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+        public override bool DeleteDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+
+        public override bool QueryACL(StringBuilder! p,
+                                      Principal pr,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            acl = new Acl();
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/ResolutionState.sg b/base/Applications/NameSpace/AtomicTestDSP/ResolutionState.sg
new file mode 100644
index 0000000..0cd0860
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/ResolutionState.sg
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif
+{
+    using System;
+
+    /// <summary>
+    /// This class contains state accumulated during the resolution
+    /// of a namespace path.
+    /// </summary>
+    public class ResolutionState
+    {
+        /// <summary>
+        /// what we have resolved so far (modulo the current namespace provider)
+        /// </summary>
+        private string resolved;
+
+        public ResolutionState()
+        {
+            resolved = "/";
+        }
+
+        public void UpdateResolved(string! current)
+        {
+            if (current.StartsWith("/") || resolved.EndsWith("/"))
+            {
+                resolved = resolved + current;
+            }
+            else
+            {
+                resolved = resolved + "/" + current;
+            }
+        }
+
+        public string! Resolved
+        {
+            get
+            {
+                return (!)resolved;
+            }
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/SbUtils.sg b/base/Applications/NameSpace/AtomicTestDSP/SbUtils.sg
new file mode 100644
index 0000000..f1629ba
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/SbUtils.sg
@@ -0,0 +1,156 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SbUtils.cs
+//          StringBuilder Utility Class
+//  Note:
+//
+
+using System;
+using System.Text; 
+using Microsoft.Singularity.Channels;
+
+#if !SINGULARITY_PROCESS 
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif 
+{
+    public class SbUtils
+    {
+        private const char delimiter = '/'; 
+
+        public static bool IsTail(StringBuilder! sb) 
+        {
+            if (sb.Length <= 1) return false; 
+            int pos = IndexOf(sb,delimiter,1); 
+            if (pos == -1) return true; 
+            return false; 
+        }
+        public static int IndexOf (StringBuilder! sb, char theChar, int startPos)
+        {
+            if (sb.Length == 0) return 0; 
+            for (int i = startPos ; i < sb.Length;  i++) {
+                if (sb[i] == theChar) return i; 
+            }
+            return -1; 
+        }
+
+        public static int LastIndexOf (StringBuilder! sb, char theChar, int startPos)
+        {
+            if (sb.Length == 0) return 0; 
+            for (int i = sb.Length ; i > startPos+1 ; i--) {
+                if (sb[i-1] == theChar) return i; 
+            }
+            return -1; 
+        }
+
+        public static bool Empty (StringBuilder! sb) 
+        { 
+            if ( sb.Length > 0) {
+                return true; 
+            }
+            else {
+                return false; 
+            }
+        }
+
+        public int Length(StringBuilder! sb)
+        {
+            return sb.Length;
+        }
+
+        public static StringBuilder! StripLast(StringBuilder! sb)
+        {
+            int pos = LastIndexOf(sb,delimiter,0); 
+            if ( (pos+1) < sb.Length ) {
+                sb.Length = pos-1; 
+            }
+            else {
+                sb.Length = 0; 
+            }
+            return sb; 
+        }
+        
+       
+        public static StringBuilder! RemoveFirstElement(StringBuilder! sb)
+        {
+            return StripFirst(sb); 
+        }
+        
+        public static StringBuilder! StripFirst(StringBuilder! sb)
+        {
+            if ( sb[0] == delimiter){
+                int pos = IndexOf(sb, delimiter,1);  // just in case it starts with '/'
+                if (  (pos >= 0) && (pos < sb.Length ) ) {
+                    sb.Remove(0,pos); 
+                    return sb; 
+                }
+                sb.Length = 0; 
+                return sb; 
+            }
+            else {
+                int pos = IndexOf(sb,delimiter,0);  // just in case it starts with '/'
+                if (  (pos >= 0) && (pos < sb.Length ) ){
+                    sb.Remove(0,pos); 
+                    return sb; 
+                }
+                sb.Length = 0; 
+                return sb; 
+            }
+       }
+
+        public static void Append(StringBuilder! sb, String! elt)
+        {
+            sb.Append(elt);
+        }
+
+        // Return a st
+        //
+        public static String FirstElement(StringBuilder! sb)
+        {
+            if (sb.Length == 0) return null; 
+            
+            if ( sb[0] == delimiter){
+                int pos = IndexOf(sb,delimiter,1);  
+              
+                // DebugStub.WriteLine("  FindFirst:pos={0},len={1},s={2}",__arglist(pos,sb.Length,sb.ToString())); 
+                //DebugStub.Break(); 
+                if (pos == -1) {
+                    if (sb.Length == 1) return null;  // just the delimiter 
+                    return sb.ToString(1,sb.Length-1); 
+                }
+                if (  (pos > 1) && (pos < sb.Length ) ) {
+                    return sb.ToString(1,pos-1); 
+                }
+                return null; 
+            }
+            else {
+                int pos = IndexOf(sb,delimiter,0); 
+                if (pos == -1) {
+                    return sb.ToString(); 
+                }
+                if ( (pos < sb.Length) && (pos > 0) ){
+                    return sb.ToString(0,pos); 
+                }
+                return null; 
+            }
+        }
+
+        public static String PathString(StringBuilder! sb)
+        {
+            if (sb.Length == 0 ) return null; 
+            return sb.ToString(); 
+        }
+
+        public static char[]! in ExHeap PathVector(StringBuilder! sb)
+        {
+            return Bitter.FromString2(sb.ToString());
+        }
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/SymLinkNode.sg b/base/Applications/NameSpace/AtomicTestDSP/SymLinkNode.sg
new file mode 100644
index 0000000..48b6aea
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/SymLinkNode.sg
@@ -0,0 +1,373 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SymLinkNode.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    // There are no access checks on symbolic links.
+    // In order to read a link, traverse access to the parent is sufficient.
+    // Although one might think that read access to the parent would be more
+    // appropriate here, the nature of the DirectoryService protocol allows anyone
+    // traversing a link to find the link value, hence there is no benefit to
+    // making "reading" of a link more strict.
+
+    public class SymLinkNode : Node
+    {
+        private string symbolicLink;
+
+        public SymLinkNode(string value, string! name, Node! parent)
+        {
+            symbolicLink = value;
+            base(NodeType.SymLink, name, parent);
+        }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 Principal pr,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service)
+        {
+            Kernel.Waypoint(3500);
+            reparse = true;
+            success = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0))
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink;
+            Kernel.Waypoint(3501);
+            return service;
+        }
+
+        /// <returns>
+        /// null on success, the sp argument if it failed.
+        /// </returns>
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            // cannot register over an existing name
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.AlreadyExists;
+            return sp;
+        }
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start  Deregister(StringBuilder! path,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            error = ErrorCode.NotSupported;
+            link  = null;
+            linkFound = false;
+            reparse = false;
+            if (!(path.Length == 0) ) {
+                return null;
+            }
+
+            // cannot be removed
+            return null;
+        }
+
+        /// <returns>
+        /// if true returns length and node type, otherwise error
+        /// </returns>
+        public override bool GetAttributes(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link,
+                                        out long length,
+                                        out NodeType nodeType
+                                        )
+        {
+            Kernel.Waypoint(3700);
+            reparse = true;
+            linkFound = true;
+            length = 0;
+            nodeType = NodeType.SymLink;
+            error = ErrorCode.NoError;
+
+            // this is a traverse operation. There is more left on the path
+            if (! (p.Length == 0)) {
+                link = symbolicLink + SbUtils.PathString(p);
+                return false;
+            }
+
+            // stop here
+            reparse = false;
+            link = symbolicLink;
+            Kernel.Waypoint(3701);
+            return true;
+        }
+
+        /// <returns>
+        /// true on success, false, if it fails.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! pathSpec,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            // this method should never be called
+            error = ErrorCode.NotSupported;
+            reparse = false;
+            link = symbolicLink;
+            linkFound = true;
+            return notifyImp;
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return null;
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            //DebugStub.Break();
+            reparse = true;
+            linkFound = true;
+            link = null;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+
+            return false;
+     }
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+            return false;
+        }
+
+        public override bool DeleteDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0) ) {
+                link = symbolicLink + SbUtils.PathString(p);
+                return false;
+            }
+
+            link = symbolicLink ;
+            error = ErrorCode.NotDirectory;
+            reparse = false;
+            return false;
+        }
+
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+            return false;
+        }
+
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+            return false;
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                        Principal pr,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            // this is a traverse operation
+            if (! (p.Length == 0) )  {
+                link = symbolicLink + SbUtils.PathString(p);
+                return false;
+            }
+            link = symbolicLink;
+            return true;
+        }
+
+        public override bool QueryACL(StringBuilder! p,
+                                      Principal pr,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            reparse = true;
+            acl = new Acl();
+
+            if (! (p.Length == 0))
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink;
+            return false;
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0))
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink;
+            return false;
+        }
+
+    }
+}
diff --git a/base/Applications/NameSpace/AtomicTestDSP/WorkerFunctions.sg b/base/Applications/NameSpace/AtomicTestDSP/WorkerFunctions.sg
new file mode 100644
index 0000000..0a105a6
--- /dev/null
+++ b/base/Applications/NameSpace/AtomicTestDSP/WorkerFunctions.sg
@@ -0,0 +1,1203 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WorkerFunctions.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    using SharedHeap = Microsoft.Singularity.Memory.SharedHeap;
+
+    class WorkerFunctions
+    {
+
+    //------------------------------------------------------------------------------------
+    // Worker functions for DirectoryServiceWorker loop
+    //------------------------------------------------------------------------------------
+
+        public static void DoDeregister(Node! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap i_path)
+        {
+            ErrorCode error;
+            bool reparse;
+            bool linkFound;
+            string link;
+            string prefix;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            string pathCopy = Bitter.ToString2(i_path);
+            Principal pr = AclCore.EndpointPeer(ep);
+
+            try {
+                ServiceProviderContract.Imp:Start  service =
+                    dir.Deregister(new StringBuilder (Bitter.ToString2(i_path)),
+                                   pr,
+                                   ep,
+                                   out linkFound, out error, out reparse, out link);
+
+                if (service != null) {
+                    ep.SendAckDeregister(service);
+                    Tracing.Log(Tracing.Debug,"Register success");
+                    delete i_path;
+                    return;
+                }
+
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeregister(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeregisterReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakDeregister(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakDeregisterReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    //DebugStub.Break();
+                    ep.SendNakDeregister(error);
+                }
+
+            }
+            catch (Exception e) {
+                DebugStub.Print(" Exception {0}\n", __arglist(e.ToString()));
+            }
+            delete i_path;
+        }
+
+    //------------------------------------------------------------------------------------
+    // Directory Enumeration
+    //------------------------------------------------------------------------------------
+        public static void DoEnumerate(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep
+                            )
+        {
+            ErrorCode error;
+            Principal pr = AclCore.EndpointPeer(ep);
+            EnumerationRecords[] in ExHeap results =
+                dir.Enumerate(pr, out error);
+            if (results  == null) ep.SendEnumerationTerminated(ErrorCode.InsufficientResources);
+            else ep.SendEnumerationEntries(results, false);
+        }
+
+        public static void DoMore(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep
+                            )
+        {
+
+            ep.SendEnumerationTerminated(ErrorCode.NotImplemented);
+        }
+
+        public static void DoStop(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep
+                            )
+        {
+
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoRegister(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep ,
+                            [Claims] char[]! in ExHeap i_path,
+                            [Claims] ServiceProviderContract.Imp:Start! i_provider
+                            )
+        {
+            ErrorCode error;
+            bool reparse;
+            bool linkFound;
+            string link;
+            string prefix;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            string pathCopy = Bitter.ToString2(i_path);
+            Principal pr = AclCore.EndpointPeer(ep);
+
+            ServiceProviderContract.Imp reject = null;
+            try {
+                Tracing.Log(Tracing.Debug," Register started");
+                reject = dir.Register(new StringBuilder(Bitter.ToString2(i_path)),
+                                   pr,
+                                   i_provider,
+                                   out linkFound, out error, out reparse, out link);
+
+                Tracing.Log(Tracing.Debug,"Register: linkFound={0}, reparse={1}",
+                            linkFound ? (UIntPtr) 1 : (UIntPtr) 0,
+                            reparse ? (UIntPtr) 1 : (UIntPtr) 0
+                            );
+                if (reject == null) {
+                    ep.SendAckRegister();
+                    Tracing.Log(Tracing.Debug,"Register success");
+                }
+                else {
+                    if  (reparse) {
+                        Tracing.Log(Tracing.Debug,"reparsing "+link);
+                        if (link == null ) {
+                            DebugStub.Break();
+                            ep.SendNakRegister(reject,ErrorCode.Unknown);
+                        }
+                        else {
+                            if (linkFound) {
+                                Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                                exPrefix = Bitter.FromString2(link);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakRegisterReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound,
+                                                        reject);
+                            }
+                            else {
+                                Tracing.Log(Tracing.Debug,"Register(reparse)"+link);
+                                // need to construct prefix from original path
+                                int prefixIndex = pathCopy.IndexOf(link);
+                                if (-1 == prefixIndex) {
+                                    exSuffix = null;
+                                    exPrefix = null;
+                                    DebugStub.Break();
+                                    ep.SendNakRegister(reject, ErrorCode.Unknown);
+                                }
+                                else {
+                                    prefix = pathCopy.Substring(0,prefixIndex);
+                                    exPrefix = Bitter.FromString2(prefix);
+                                    exSuffix = Bitter.FromString2(link);
+                                    ep.SendNakRegisterReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound,
+                                                        reject);
+                                }
+                            }
+                            //DebugStub.Break();
+                            }
+                    } // reparse
+                    else {
+                        Tracing.Log(Tracing.Debug," Bind failure!");
+                        ep.SendNakRegister(reject, error);
+                    }
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print(" Exception {0}\n", __arglist(e.ToString()));
+            }
+            delete i_path;
+            Tracing.Log(Tracing.Debug," register {0}", (reject == null) ? "failed" : "success");
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoNotify(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep ,
+                            [Claims] char[]! in ExHeap i_path,
+                            [Claims] char[]!  in ExHeap i_pattern,
+                            bool sendExisting,
+                            [Claims] NotifyContract.Imp:Start! i_notifyImp
+                            )
+        {
+            bool reparse;
+            string link;
+            ErrorCode error;
+            bool linkFound;
+            string prefix;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            Principal pr = AclCore.EndpointPeer(ep);
+
+
+            string path1 = Bitter.ToString2(i_path);
+            string pattern = Bitter.ToString2(i_pattern);
+            string pathCopy = Bitter.ToString2(i_path);
+
+            delete i_path;
+            delete i_pattern;
+
+            Tracing.Log(Tracing.Debug,"Notify {0} {1} "+path1,pattern);
+            NotifyContract.Imp reject =
+                dir.Notify(new StringBuilder(path1),
+                           pr,
+                           pattern,
+                           sendExisting,
+                           out linkFound,
+                           out error, out reparse, out link, i_notifyImp);
+            if (reject == null) { // success
+                delete reject;
+                ep.SendAckNotify();
+                Tracing.Log(Tracing.Debug,"Notify success");
+            }
+            else {
+                if (reparse) {
+                    if (null == link ) {
+                        ep.SendNakNotify(reject,error);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakNotifyReparse(exPrefix, exSuffix, linkFound, reject);
+                        }
+                        else {
+                            Tracing.Log(Tracing.Debug,"Notify(reparse)"+link);
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakNotify(reject, ErrorCode.Unknown);
+                            }
+                            else {
+                                prefix = pathCopy.Substring(0,prefixIndex);
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakNotifyReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound,
+                                                    reject);
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    Tracing.Log(Tracing.Debug," Bind failure!");
+                    ep.SendNakNotify(reject, error);
+                }
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+
+        public static void DoBind(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep ,
+                            [Claims] char[]! in ExHeap i_path,
+                            [Claims] ServiceContract.Exp:Start! i_server
+                            )
+        {
+            try {
+                bool success;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(i_path);
+                Tracing.Log(Tracing.Debug," lookup started: {0}",pathCopy);
+#if !SINGULARITY_PROCESS
+                Monitoring.Log(Monitoring.Provider.Directory,
+                            (ushort)DirectoryEvent.DoBind,
+                            pathCopy);
+#endif
+                ServiceContract.Exp reject =
+                    dir.Bind(new StringBuilder (pathCopy),
+                             pr,
+                             out success, out linkFound, out error, out reparse, out link, i_server);
+                Tracing.Log(Tracing.Debug," success={0}, linkFound={1}, reparse={2}",
+                            success ? (UIntPtr) 1 : (UIntPtr) 0,
+                            linkFound ? (UIntPtr) 1 : (UIntPtr) 0,
+                            reparse ? (UIntPtr) 1 : (UIntPtr) 0
+                            );
+                if (reject == null && success) { // success
+                    ep.SendAckBind();
+                    Tracing.Log(Tracing.Debug," Bind success");
+                }
+                else {
+                    if  (reparse) {
+                        Tracing.Log(Tracing.Debug,"reparsing "+link);
+                        if (link == null || reject == null) {
+                            DebugStub.Break();
+                            ep.SendNakBind(reject,ErrorCode.Unknown);
+                        }
+                        else {
+                            if (linkFound) {
+                                Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                                exPrefix = Bitter.FromString2(link);
+                                ep.SendNakBindReparse(exPrefix,
+                                                        null,
+                                                        linkFound,
+                                                        reject);
+                            }
+                            else {
+                                Tracing.Log(Tracing.Debug,"Bind(reparse)"+link);
+                                // need to construct prefix from original path
+                                int prefixIndex = pathCopy.IndexOf(link);
+                                if (-1 == prefixIndex) {
+                                    exSuffix = null;
+                                    exPrefix = null;
+                                    DebugStub.Break();
+                                    ep.SendNakBind(reject, ErrorCode.Unknown);
+                                }
+                                else {
+                                    prefix = pathCopy.Substring(0,prefixIndex);
+                                    exPrefix = Bitter.FromString2(prefix);
+                                    exSuffix = Bitter.FromString2(link);
+                                    ep.SendNakBindReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound,
+                                                        reject);
+                                }
+                            }
+                            //DebugStub.Break();
+                            }
+                    } // reparse
+                    else {
+                        Tracing.Log(Tracing.Debug," Bind failure!");
+                        ep.SendNakBind(reject, error);
+                    }
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print(" Exception {0}\n", __arglist(e.ToString()));
+            }
+            delete i_path;
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoGetAttributes(DirNode! dir, DirectoryServiceContract.Exp! ep ,[Claims] char[]! in ExHeap i_path)
+        {
+            bool reparse;
+            string link;
+            ErrorCode error;
+            bool linkFound;
+            string prefix;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            long length;
+            NodeType nodeType;
+            Principal pr = AclCore.EndpointPeer(ep);
+
+            string pathCopy = Bitter.ToString2(i_path);
+            string! path1 = Bitter.ToString2(i_path);
+            delete i_path;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoGetAttributes,
+                        pathCopy);
+#endif
+            bool aSuccess = dir.GetAttributes(new StringBuilder(path1),
+                                pr,
+                                out linkFound,
+                                out error,
+                                out reparse,
+                                out link,
+                                out length,
+                                out nodeType
+                                );
+
+            Tracing.Log(Tracing.Debug,"linkFound={1}, reparse={2}",
+                        linkFound ? (UIntPtr) 1 : (UIntPtr) 0,
+                        reparse ? (UIntPtr) 1 : (UIntPtr) 0
+                        );
+            if (aSuccess) {
+                //if (error != ErrorCode.NoError) DebugStub.Break();
+                ep.SendAckGetAttributes(nodeType,length);
+            }
+            else {
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakGetAttributes(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakGetAttributesReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            Tracing.Log(Tracing.Debug,"GetAttr(reparse)"+link);
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakGetAttributes(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) {
+                                    prefix = pathCopy;
+                                }
+                                else {
+                                    prefix = pathCopy.Substring(0,prefixIndex);
+                                }
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakGetAttributesReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                }
+                else {
+                    ep.SendNakGetAttributes(error);
+                }
+            }
+            Kernel.Waypoint(3401);
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoCreateDirectory(DirNode! dir, DirectoryServiceContract.Exp! ep ,[Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+
+#if SINGULARITY_PROCESS
+                //DebugStub.Break();
+#else
+                Monitoring.Log(Monitoring.Provider.Directory,
+                            (ushort)DirectoryEvent.DoCreateDirectory,
+                            pathCopy);
+
+#endif
+                ok = dir.CreateDirectory(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckCreateDirectory();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakCreateDirectory(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakCreateDirectoryReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakCreateDirectory(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakCreateDirectoryReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    //DebugStub.Break();
+                    ep.SendNakCreateDirectory(error);
+                }
+            }
+            finally {
+            }
+        }
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoCreateFile(DirNode! dir,
+                                        DirectoryServiceContract.Exp! ep,
+                                        [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoCreateFile,
+                        pathCopy);
+#endif
+
+                ok = dir.CreateFile(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckCreateFile();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakCreateFile(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakCreateFileReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakCreateFile(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakCreateFileReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakCreateFile(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoDeleteDirectory( DirNode! dir,  DirectoryServiceContract.Exp! ep ,[Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoDeleteDirectory,
+                        pathCopy);
+#endif
+                ok = dir.DeleteDirectory(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckDeleteDirectory();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeleteDirectory(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeleteDirectoryReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakDeleteDirectory(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakDeleteDirectoryReparse(exPrefix,
+                                                                 exSuffix,
+                                                                 linkFound
+                                                                 );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakDeleteDirectory(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoDeleteFile( DirNode! dir,  DirectoryServiceContract.Exp! ep,
+                                         [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoCreateFile,
+                        pathCopy);
+#endif
+
+                ok = dir.DeleteFile(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckDeleteFile();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeleteFile(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeleteFileReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakDeleteFile(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakDeleteFileReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakDeleteFile(error);
+                }
+            }
+            finally {
+            }
+        }
+
+
+        public static void DoQueryACL( DirNode! dir,
+                                 DirectoryServiceContract.Exp! ep ,
+                                 [Claims] char[]! in ExHeap exPath
+                                 )
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Acl acl;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                string! pathCopy = Bitter.ToString2(exPath);
+
+                delete exPath;
+
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                ok = dir.QueryACL(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link,
+                                    out acl);
+                if (ok) {
+                    ep.SendAckQueryACL(Bitter.FromString(acl.val));
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakQueryACL(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link", link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakQueryACLReparse(exPrefix, exSuffix, linkFound);
+                            return;
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakQueryACL(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakQueryACLReparse(exPrefix,
+                                                          exSuffix,
+                                                          linkFound);
+                                return;
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakQueryACL(error);
+                }
+            }
+            finally {
+            }
+        }
+
+        public static void DoStoreACL( DirNode! dir,
+                                 DirectoryServiceContract.Exp! ep ,
+                                 [Claims] char[]! in ExHeap exPath,
+                                 [Claims] char[]  in ExHeap acl
+                                 )
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                string! pathCopy = Bitter.ToString2(exPath);
+                Acl myacl = new Acl(Bitter.ToString(acl));
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                delete exPath;
+
+                ok = dir.StoreACL(new StringBuilder (pathCopy),
+                                    pr,
+                                    myacl,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if (ok) {
+                    ep.SendAckStoreACL();
+                }
+
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakStoreACL(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link", link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakStoreACLReparse(exPrefix, exSuffix, linkFound, acl);
+                            return;
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakStoreACL(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakStoreACLReparse(exPrefix,
+                                                          exSuffix,
+                                                          linkFound,
+                                                          acl);
+                                return;
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakStoreACL(error);
+                }
+                delete acl;
+            }
+            finally {
+            }
+        }
+
+        public static void DoCreateAndBindFile(DirNode! dir,
+                                         DirectoryServiceContract.Exp! ep ,
+                                         [Claims] char[]! in ExHeap exPath,
+                                         [Claims] FileContract.Imp:Ready! imp
+                                         )
+        {
+            ep.SendNakCreateAndBindFile(imp, ErrorCode.NotImplemented);
+            delete exPath;
+            return;
+        }
+
+    //------------------------------------------------------------------------------------
+    // DeleteLink
+    //------------------------------------------------------------------------------------
+        public static void DoDeleteLink( DirNode! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoDeleteLink,
+                        pathCopy);
+#endif
+                ok = dir.DeleteLink(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckDeleteLink();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeleteLink(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeleteLinkReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakDeleteLink(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakDeleteLinkReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakDeleteLink(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    // GetLinkValue
+    //------------------------------------------------------------------------------------
+        public static void DoGetLinkValue( DirNode! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoGetLinkValue,
+                        pathCopy);
+#endif
+                ok = dir.GetLinkValue(new StringBuilder (pathCopy),
+                                    pr,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    if ( link == null ) {
+                        DebugStub.Break();
+                        ep.SendNakGetLinkValue(ErrorCode.Unknown);
+                        return;
+                    }
+                    ep.SendAckGetLinkValue(Bitter.FromString2(link));
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakGetLinkValue(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakGetLinkValueReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakGetLinkValue(ErrorCode.Unknown);
+                            }
+                            else {
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakGetLinkValueReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound);
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakGetLinkValue(error);
+                }
+            }
+            finally {
+            }
+        }
+
+        public static void DoCreateLink( DirNode! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap exPath,
+                                   [Claims] char[]! in ExHeap exValue
+                                   )
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+                string value = Bitter.ToString2(exValue);
+                delete exValue;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoCreateLink,
+                        pathCopy);
+#endif
+
+                ok = dir.CreateLink(new StringBuilder (pathCopy),
+                                    pr,
+                                    value,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckCreateLink();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakCreateLink(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakCreateLinkReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            int prefixIndex = pathCopy.IndexOf(link);
+                            if (-1 == prefixIndex) {
+                                exSuffix = null;
+                                exPrefix = null;
+                                DebugStub.Break();
+                                ep.SendNakCreateLink(ErrorCode.Unknown);
+                            }
+                            else {
+
+                                if (prefixIndex == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,prefixIndex);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakCreateLinkReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound
+                                                    );
+                            }
+                        }
+                    }
+                } //reparse
+                else {
+                    //DebugStub.Break();
+                    ep.SendNakCreateLink(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    } //WorkerFunctions class
+} //namespace
diff --git a/base/Applications/NameSpace/NakService/NakService.csproj b/base/Applications/NameSpace/NakService/NakService.csproj
new file mode 100644
index 0000000..0ec98ce
--- /dev/null
+++ b/base/Applications/NameSpace/NakService/NakService.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>NakService</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="NakService.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/NameSpace/NakService/NakService.sg b/base/Applications/NameSpace/NakService/NakService.sg
new file mode 100644
index 0000000..20ba1f8
--- /dev/null
+++ b/base/Applications/NameSpace/NakService/NakService.sg
@@ -0,0 +1,196 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NakConnect.sg
+//          Used for testing the namespace service.
+//          register /dev/NakConnect  in the namespace.
+//          will always Nak any Connect requests.
+//  Note:
+//
+using System;
+using System.Runtime.CompilerServices;
+//using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Applications
+{
+    public static class NakConnect
+    {
+        static string hang = "/dev/ChannelHang";
+        static string nakConn = "/dev/NakConnect";
+        static string nakRunning = "/dev/NakRunning";
+        static string closed = "/dev/ChannelClosed";
+
+        private static bool Register(DirectoryServiceContract.Imp! ds,
+                                     string! name,
+                                     [Claims]ServiceProviderContract.Imp! imp)
+        {
+            // acquire namespace endpoint
+
+            ErrorCode errorOut;
+            ServiceProviderContract.Imp:Start  service;
+            bool ok = SdsUtils.Register(name, ds, imp, out errorOut);
+            if (!ok){
+                Console.WriteLine(" Registration of {0} failed. Reason: {1}",
+                                  name,
+                                  SdsUtils.ErrorCodeToString(errorOut)
+                                  );
+
+            }
+            return ok;
+
+     }
+
+        private static  bool  DoDeregister(DirectoryServiceContract.Imp! ds, string! path)
+        {
+            ErrorCode errorOut;
+            ServiceProviderContract.Imp:Start  service;
+            bool ok = SdsUtils.Deregister(path, ds, out service, out errorOut);
+            if (!ok) DebugStub.Break();
+            delete service;
+            return ok;
+        }
+
+        static void Finalize()
+        {
+            Console.WriteLine("NakService Finalizer called.");
+            DebugStub.Break();
+            DirectoryServiceContract.Imp ds = DirectoryService.NewClientEndpoint();
+            try   {
+                DoDeregister(ds, hang);
+                DoDeregister(ds, nakConn);
+                DoDeregister(ds, closed);
+            }
+            finally {
+                delete ds;
+            }
+        }
+
+        static void CleanUp()
+        {
+            Console.WriteLine("NakService Finalizer called.");
+            DirectoryServiceContract.Imp ds = DirectoryService.NewClientEndpoint();
+            try   {
+                DoDeregister(ds, hang);
+                DoDeregister(ds, nakConn);
+                DoDeregister(ds, closed);
+            }
+            finally {
+                delete ds;
+            }
+        }
+
+        public static int Main(String[]! args)
+        {
+
+            DirectoryServiceContract.Imp ds = DirectoryService.NewClientEndpoint();
+
+            // register "/dev/NakConnect" in NS
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! s;
+            ServiceProviderContract.NewChannel(out imp, out s);
+            bool ok = NakConnect.Register(ds, nakConn, imp);
+
+            if (!ok) {
+                delete s;
+                delete ds;
+                return -1;
+            }
+
+            // register "/dev/ChannelHang" in NS
+            // we keep the exp alive but we never listen
+            ServiceProviderContract.Imp! imp3;
+            ServiceProviderContract.Exp! s3;
+            ServiceProviderContract.NewChannel(out imp3, out s3);
+            ok = NakConnect.Register(ds, hang, imp3);
+            if (!ok) {
+                delete s;
+                delete s3;
+                delete ds;
+                return -1;
+            }
+
+            // register "/dev/NakRunning" in NS
+            // we keep the exp alive but we never listen
+            ServiceProviderContract.Imp! imp4;
+            ServiceProviderContract.Exp! s4;
+            ServiceProviderContract.NewChannel(out imp4, out s4);
+            ok = NakConnect.Register(ds, nakRunning, imp4);
+            if (!ok) {
+                delete s;
+                delete s3;
+                delete ds;
+                delete s4;
+                return -1;
+            }
+
+            // register "/dev/ChannelClosed" in NS
+            // we pass the imp on to the NS but close down the exp end
+            ServiceProviderContract.Imp! imp2;
+            ServiceProviderContract.Exp! s2;
+            ServiceProviderContract.NewChannel(out imp2, out s2);
+            ok = NakConnect.Register(ds, closed, imp2);
+
+            delete s2; // ensure channel closed on other end
+
+            if (!ok) {
+                delete s;
+                delete s3;
+                delete s4;
+                delete ds;
+                return -1;
+            }
+
+            // enter loop to receive Connect messages and always return NACK
+
+             try {
+                for (bool run = true; run;) {
+                    switch receive {
+                    // Listen for new connections
+                    case s.Connect(candidate):
+                        Console.WriteLine("Nak Service NACKing....");
+                        s.SendNackConnect(candidate);
+                        break;
+                    case s4.Connect(candidate):
+                        Console.WriteLine("Nak Service NACKing....");
+                        s.SendAckConnect();
+                        delete candidate;
+                        break;
+                    case s.ChannelClosed() :
+                        Console.WriteLine("NakConnect channel closed");
+                        run = false;
+                        break;
+                    case s4.ChannelClosed() : //IsRunning has closed
+                        Console.WriteLine("NakRunning channel closed");
+                        run = false;
+                        break;
+                   }
+                }
+            }
+            finally {
+                CleanUp();
+            }
+            Console.WriteLine("terminating NakService cleanly");
+            delete s;
+            delete s3;
+            delete s4;
+            delete ds;
+            SdsUtils.FlushCache();
+
+            return 0;
+        }
+
+    } // class NakConnect
+}//namespace
diff --git a/base/Applications/NameSpace/NamespaceTests.proj b/base/Applications/NameSpace/NamespaceTests.proj
new file mode 100644
index 0000000..931cf81
--- /dev/null
+++ b/base/Applications/NameSpace/NamespaceTests.proj
@@ -0,0 +1,15 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <ItemGroup>
+    <!-- broken?
+    <ProjectReference Include="AtomicTestDSP\AtomicTestDSP.csproj"/>
+    -->
+    <ProjectReference Include="NakService\NakService.csproj"/>
+    <ProjectReference Include="TestDSP\TestDSP.csproj"/>
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/NameSpace/TestDSP/DirectoryService.sg b/base/Applications/NameSpace/TestDSP/DirectoryService.sg
new file mode 100644
index 0000000..197c858
--- /dev/null
+++ b/base/Applications/NameSpace/TestDSP/DirectoryService.sg
@@ -0,0 +1,232 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Directory;
+
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Application.DSP {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter( "mountPoint", Mandatory=true, Position=0, HelpMessage="Location to mount DSP")]
+        internal string mountPoint;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return NameServiceDSP.AppMain(this);
+        }
+    }
+
+    public class NameServiceDSP
+    {
+
+        private static DirNode! rootDir;
+        private static string! mountPoint;
+
+        private static int Register(string! name, [Claims]ServiceProviderContract.Imp! imp)
+        {
+            // acquire namespace endpoint
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+            mountPoint = name;
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(name),imp);
+                switch receive {
+                    case epNS.AckRegister():
+                        break;
+                    case epNS.NakRegister(reject, error):
+                        DebugStub.Break();
+                        delete reject;
+                        return -1;
+                        break;
+                    case epNS.ChannelClosed():
+                        DebugStub.Break();
+                        return -1;
+                        break;
+                    case epNS.NakRegisterReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               ServiceProviderContract.Imp:Start! reject) :
+                        DebugStub.Break();
+                        delete reject;
+                        delete path;
+                        delete rest;
+                        return -1;
+                        break;
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register NakConnect with Nameservice\n");
+                        DebugStub.Break();
+                        return -1;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            return 0;
+        }
+
+        private static int Deregister(string! name)
+        {
+            // acquire namespace endpoint
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+            mountPoint = name;
+
+            try {
+                epNS.SendDeregister(Bitter.FromString2(name));
+                switch receive {
+                    case epNS.AckDeregister(service):
+                        delete service;
+                        break;
+                    case epNS.NakDeregister(error):
+                        DebugStub.Break();
+                        break;
+                    case epNS.ChannelClosed():
+                        DebugStub.Break();
+                        break;
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register NakConnect with Nameservice\n");
+                        DebugStub.Break();
+                        return -1;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            return 0;
+        }
+
+        public static void Initialize()
+        {
+            NotificationManager.Initialize();
+            NotificationManager.StartNotificationThread();
+
+            ISdsAcl! aclT = new SdsAclImpl();
+            InstallAcls(aclT);
+            AclCore _core = new AclCore(null, new DirAclCoreSupport());
+            rootDir = new DirNode("/", _core, aclT);
+        }
+
+
+        // in the fullness of time, we should read the server configuration
+        // from a reified manifest including config information
+        // for now, we will just add a rule to allow **any** access
+        private static void InstallAcls(ISdsAcl! aclT)
+        {
+            /*
+            // read the rules section from the config
+            XmlNode node = config.GetChild(PolicyListXmlTag);
+            if (node == null) {
+                return;
+            }
+
+            foreach (XmlNode! rule in node.Children) {
+                if (rule.Name != "rule") {
+                    continue;
+                }
+
+                string! resource = (!)rule.GetAttribute("resource", "");
+                if (resource.Equals("")) {
+                    continue;
+                }
+                string! aclstr = (!)rule.GetAttribute("acl", "");
+                if (aclstr.Equals("")) {
+                    continue;
+                }
+
+                policy.AddRule(resource, aclstr);
+            }
+            */
+            //policy.AddRule("/", "{/groups/anyall}");
+            aclT.Set("/", new Acl("{$dsanyrw}|{$dsregister}"));
+        }
+
+        public static void Finalize()
+        {
+            Deregister(mountPoint);
+        }
+
+
+        internal static  int  AppMain(Parameters! config)
+        {
+            int status;
+            Initialize();
+
+
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! s;
+            ServiceProviderContract.NewChannel(out imp, out s);
+            status = Register(config.mountPoint, imp);
+
+            if (status != 0) {
+                delete s;
+                return status;
+            }
+
+             try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        // Listen for new connections
+                        case s.Connect(ServiceContract.Exp:Start! candidate):
+                                DirectoryServiceContract.Exp:Start exp = candidate as DirectoryServiceContract.Exp:Start!;
+                                if (exp != null) {
+                                    s.SendAckConnect();
+                                    DirectoryServiceWorker.Create(rootDir,exp);
+                                }
+                                else s.SendNackConnect(candidate);
+                                break;
+                        case s.ChannelClosed() :
+                            run = false;
+                            Console.WriteLine("Channel Closed. DSP shutting down");
+                            break;
+                        case unsatisfiable:
+                            run = false;
+                            Console.WriteLine("Unsatisfiable. DSP shutting down");
+                            break;
+                    }
+                }
+            }
+            finally {
+            }
+            delete s;
+            Console.WriteLine(" last line of DSP... process should terminate");
+            return 0;
+        }
+   }
+}
+
+
+
+
diff --git a/base/Applications/NameSpace/TestDSP/TestDSP.csproj b/base/Applications/NameSpace/TestDSP/TestDSP.csproj
new file mode 100644
index 0000000..12d5d6e
--- /dev/null
+++ b/base/Applications/NameSpace/TestDSP/TestDSP.csproj
@@ -0,0 +1,46 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>TestDSP</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DirectoryService.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\DirAclCoreSupport.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\DirectoryServiceWorker.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\DirNode.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\IoMemoryNode.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\Node.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\NotificationManager.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\Path.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\Property.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\ProviderNode.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\ResolutionState.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\SbUtils.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\SymLinkNode.sg" />
+    <Compile Include="..\..\..\kernel\Singularity.Directory\WorkerFunctions.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Network/BlastServer/BlastServer.cs b/base/Applications/Network/BlastServer/BlastServer.cs
new file mode 100644
index 0000000..d2d81ab
--- /dev/null
+++ b/base/Applications/Network/BlastServer/BlastServer.cs
@@ -0,0 +1,276 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpBlast.cs
+//
+//  Note:   Simple Singularity test program.
+//
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Collections;
+
+#if SINGULARITY
+using Microsoft.Contracts;
+using System.IO;
+using System.Runtime.InteropServices;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+#endif
+ 
+
+namespace Microsoft.Singularity.Applications.Network
+{
+#if SINGULARITY
+    [ConsoleCategory(HelpMessage="BlastServer TCP data to a ipAddress, port", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<TcpContract.Imp:Start> tcpRef;
+
+
+        [LongParameter( "port", Mandatory=true, Position=0, HelpMessage="port to gulp from ")]
+        internal long port;
+
+
+        [LongParameter( "numBytes", Mandatory=true, Position=1, HelpMessage="Total bytes to send")]
+        internal long numBytes;
+
+
+        [LongParameter( "chunkSize", Mandatory=true, Position=2, HelpMessage="Chunks size to send")]
+        internal long chunkSize;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return BlastServer.AppMain(this);
+        }
+    }
+#endif 
+
+    public class BlastServer
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+        private const int WorkerThreads = 32;
+        private const int MaxWorkItems  = 32 * WorkerThreads;
+        private const string RepeatPattern = "Here is a repeating string of text that serves as content. ";
+
+        ///////////////////////////////////////////////////////////////////////
+        // class variables 
+        ushort      port;
+        uint        numBytes;
+        uint        chunkSize;
+        byte[]      chunkBuffer; 
+        ThreadPool  threadPool;
+        
+        private void DispatchRequest(object dispatchObject)
+        {
+            Console.WriteLine(dispatchObject as string);
+            Console.WriteLine("We should Never get here");
+#if SINGULARITY
+            DebugStub.Break();
+#endif            
+        }
+
+        private void test (object dispatchObject)
+        {
+            Console.Write(dispatchObject as string);
+        }
+        
+        private void Blaster (object sock)
+        {
+            Socket socket = sock as Socket; 
+#if SINGULARITY
+            assert socket != null; 
+#endif            
+            int bytesSent = 0;
+            int iterations =0;
+            
+            
+            uint bytesLeft = numBytes, patternLength = (uint)RepeatPattern.Length;
+            try {
+                while (bytesLeft > 0) {
+                    uint thisPass = chunkSize < bytesLeft ? chunkSize : bytesLeft;
+                    if (thisPass == chunkSize) {
+                        socket.Send(chunkBuffer);
+                    }
+                    else {
+                        byte[] thisPassBuffer = new byte[thisPass]; 
+                        for (uint i = 0; i < thisPass; i++) {
+                            thisPassBuffer [(int)i] = (byte)RepeatPattern[(int)i % (int)patternLength];
+                        }   
+                        socket.Send(thisPassBuffer);
+                    }
+                   bytesLeft -= thisPass;
+                   bytesSent += (int) thisPass;
+                   iterations++;
+                }
+            } catch(ArgumentNullException ae) {
+                Console.WriteLine("ArgumentNullException : {0}", ae.ToString());
+            } catch(SocketException se) {
+                Console.WriteLine("SocketException : {0}", se.ToString());
+            } catch(Exception e) {
+                Console.WriteLine("Unexpected exception : {0}", e.ToString());
+            }
+            //Console.WriteLine("Sent {0} bytes in {1} iterations",bytesSent,iterations); 
+
+            socket.Shutdown(SocketShutdown.Both);
+            socket.Close(); 
+            Thread.Sleep(2);
+        }
+        
+        private void Listen() {
+            Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            socket.Bind(new IPEndPoint(IPAddress.Any, (int)this.port));
+            socket.Listen((int)SocketOptionName.MaxConnections);
+            while (true) {
+                Socket s = socket.Accept();
+                threadPool.QueueUserWorkItem(new ThreadPool.WorkCallback(Blaster), s);
+            }
+        }
+
+#if SINGULARITY
+        [NotDelayed]
+#endif
+        public BlastServer (ushort port, uint numBytes, uint chunkSize)
+        {
+            this.port = port; 
+            this.numBytes = numBytes; 
+            this.chunkSize = chunkSize;
+            
+            chunkBuffer = new byte[chunkSize]; 
+            for (uint i = 0; i < chunkSize; i++) {
+                chunkBuffer [(int)i] = (byte)RepeatPattern[(int)i % (int)RepeatPattern.Length];
+            }
+
+            Console.WriteLine("BlastServer listening on  port {0} for {1} bytes in {2}-byte chunks",
+                              port, numBytes, chunkSize);
+
+            threadPool = new ThreadPool(
+                            WorkerThreads, MaxWorkItems,
+                            new ThreadPool.WorkCallback(DispatchRequest)
+                            );
+#if blee                            
+           for (int i=0; i < 50 ; i++)  {
+                for (int j = 0; j < 40;  j++) {
+                    bool isFull = threadPool.QueueUserWorkItem(new ThreadPool.WorkCallback(test), ".");
+                    while (isFull) {
+                        Thread.Sleep(2); 
+                        isFull = threadPool.QueueUserWorkItem(new ThreadPool.WorkCallback(test), "yes\n");
+                    }
+                }
+                Thread.Sleep(300);
+            }
+#endif 
+        }
+
+        public static void Usage()
+        {
+            Console.WriteLine("blastserver  <port> <numBytes> <chunkSize>");
+        }
+        
+        public void  Shutdown()
+        {
+            threadPool.Shutdown(); 
+        }
+#if SINGULARITY        
+        internal static int AppMain(Parameters! config)
+        {
+        
+            if (config.port  >  65536 || config.port < 0) {
+                Console.WriteLine("Port number out of range: {0}", config.port);
+                return -1;
+            }
+        
+            ushort port = (ushort) config.port; 
+            uint numBytes = (uint) config.numBytes;
+            uint chunkSize = (uint) config.chunkSize;
+            BlastServer bs = new BlastServer( port, numBytes, chunkSize); 
+                    
+            bs.Listen();            
+            bs.Shutdown(); 
+            return 0; 
+        }
+#else         
+        public static int Main(string[] /*!*/ args)
+        {
+            int start = -1;
+            if (args.Length < 4 + start)
+            {
+                Usage();
+                return 1;
+            }
+
+            ushort port;
+
+            try {
+                port = UInt16.Parse(args[1+start]);
+            }
+            catch (FormatException) {
+                Console.WriteLine("Malformed port number: {0}", args[1+start]);
+                return -1;
+            }
+            catch (OverflowException) {
+                Console.WriteLine("Port number out of range: {0}", args[1+start]);
+                return -1;
+            }
+
+            uint numBytes;
+
+            try {
+                numBytes = UInt32.Parse(args[2+start]);
+            }
+
+            catch (FormatException) {
+                Console.WriteLine("Malformed number of bytes: {0}", args[2+start]);
+                return -1;
+            }
+            catch (OverflowException) {
+                Console.WriteLine("Byte count out of range: {0}", args[2+start]);
+                return -1;
+            }
+
+            uint chunkSize;
+
+            try {
+                chunkSize = UInt32.Parse(args[3+start]);
+            }
+            catch (FormatException) {
+                Console.WriteLine("Malformed chunk size: {0}", args[3+start]);
+                return -1;
+            }
+            catch (OverflowException) {
+                Console.WriteLine("Chunk size out of range: {0}", args[3+start]);
+                return -1;
+            }
+            BlastServer bs = new BlastServer( port, numBytes, chunkSize); 
+            
+            bs.Listen();            
+            bs.Shutdown(); 
+            return 0; 
+        }
+#endif        
+    } // end class TcpBlast
+}
diff --git a/base/Applications/Network/BlastServer/BlastServer.csproj b/base/Applications/Network/BlastServer/BlastServer.csproj
new file mode 100644
index 0000000..9bb3d73
--- /dev/null
+++ b/base/Applications/Network/BlastServer/BlastServer.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>BlastServer</AssemblyName>
+    <WarningLevel>1</WarningLevel>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="BlastServer.cs" />
+    <Compile Include="ThreadPool.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/BlastServer/ThreadPool.cs b/base/Applications/Network/BlastServer/ThreadPool.cs
new file mode 100644
index 0000000..7c1f948
--- /dev/null
+++ b/base/Applications/Network/BlastServer/ThreadPool.cs
@@ -0,0 +1,173 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadPool.sg
+//
+//  Note:
+//
+using System;
+using System.Collections;
+using System.Threading;
+#if SINGULARITY
+using Microsoft.Contracts;
+#endif
+
+namespace Microsoft.Singularity.Applications
+{
+    /// <remarks>This class implements a non-Singleton
+    /// threadpool and has a configurable work queue
+    /// size. </remarks>
+    public sealed class ThreadPool
+    {
+        internal class WorkItem {
+            public WorkCallback callback; 
+            public object userObject; 
+            
+            public WorkItem(WorkCallback callback, object userObject)
+            {
+                this.callback   = callback;
+                this.userObject = userObject;
+            }
+        }
+        
+        public delegate void WorkCallback(object userObject);
+
+        Queue /* ! */          workItems; 
+        WorkCallback /* ! */    workCallback;
+        int              maxQueuedItems;
+        volatile int     threadCount;
+        volatile bool    shutdown;
+        ManualResetEvent shutdownEvent;
+
+#if SINGULARITY
+        [NotDelayed]
+#endif
+        public ThreadPool(int maxThreads,
+                               int maxQueuedItems,
+                               WorkCallback/* ! */ workCallback)
+#if SINGULARITY                               
+            requires maxThreads > 0;
+            requires maxQueuedItems > 0;
+            requires maxThreads <= maxQueuedItems;
+#endif            
+        {
+            this.workCallback   = workCallback;
+            this.workItems      = new Queue(maxQueuedItems);
+            this.maxQueuedItems = maxQueuedItems;
+            this.threadCount    = maxThreads;
+            this.shutdown       = false;
+            this.shutdownEvent  = new ManualResetEvent(false);
+#if SINGULARITY
+            base();
+#endif
+            for (int i = 0; i < maxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(WorkerMain));
+                t.Start();
+            }
+        }
+
+        /// <summary>
+        /// Queues call to constructor supplied delegate with
+        /// user supplied object.  If queuing request causes queue to
+        /// become full, false is returned and no further items should
+        /// be enqueued until delegate has been called.
+        /// </summary>
+        public  bool QueueUserWorkItem(object userObject)
+        {
+            bool queueIsFull = false;
+            lock (this) {
+                if (workItems.Count == maxQueuedItems) {
+                    queueIsFull =  true; 
+                }
+                else {
+#if SINGULARITY
+                    assert workItems.Count < maxQueuedItems;
+                    assert shutdown == false;
+#endif
+                    WorkItem work = new WorkItem(this.workCallback, userObject);
+                    workItems.Enqueue(work);
+                    queueIsFull = (workItems.Count == maxQueuedItems);
+                    if (workItems.Count == 1){
+                    }
+                        Monitor.Pulse(this);
+                }
+            }
+            return queueIsFull;
+        }
+
+        /// <summary>
+        /// Queues call to supplied delegate with
+        /// user supplied object.  If queuing request causes queue to
+        /// become full, false is returned and no further items should
+        /// be enqueued until delegate has been called.
+        /// </summary>
+        public  bool QueueUserWorkItem(WorkCallback callback, object userObject)
+        {
+            bool queueIsFull = false;
+            lock (this) {
+                if (workItems.Count == maxQueuedItems) {
+                    queueIsFull =  true; 
+                }
+                else {
+#if SINGULARITY
+                    assert workItems.Count < maxQueuedItems;
+                    assert shutdown == false;
+#endif
+                    WorkItem work = new WorkItem(callback, userObject);
+                    workItems.Enqueue(work);
+                    queueIsFull = (workItems.Count == maxQueuedItems);
+                    if (workItems.Count == 1){
+                    }
+                        Monitor.Pulse(this);
+               }
+            }
+            return queueIsFull;
+        }
+
+        /// <summary>
+        /// Shutdown thread pool instance.  Caller blocks until
+        /// the threads in the pool have finished outstanding
+        /// work items.
+        /// </summary>
+        public void Shutdown()
+        {
+            lock (this) {
+                shutdown = true;
+                Monitor.PulseAll(this);
+            }
+            shutdownEvent.WaitOne();
+        }
+
+        private void WorkerMain()
+        {
+            while (true) {
+                object workItem = null;
+                lock (this) {
+                    while  (workItems.Count == 0 && !shutdown) {
+                        Monitor.Wait(this);
+                    }
+                    if (workItems.Count == 0 && shutdown) {
+                        break;
+                    }
+                    workItem = workItems.Dequeue();
+                }
+                if (workItem != null) {
+                    WorkItem w  = workItem as WorkItem;
+#if SINGULARITY
+                    assert w != null; 
+                    assert w.callback != null;
+#endif
+                    w.callback(w.userObject);
+            }
+
+                if (--threadCount == 0) {
+                    shutdownEvent.Set();
+                }
+            }
+        }
+    }
+}
+
diff --git a/base/Applications/Network/CommandLib/CommandLib.csproj b/base/Applications/Network/CommandLib/CommandLib.csproj
new file mode 100644
index 0000000..b3a41e6
--- /dev/null
+++ b/base/Applications/Network/CommandLib/CommandLib.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>NetworkCommands</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="NetworkCommands.cs" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Applications/Network/CommandLib/NetworkCommands.cs b/base/Applications/Network/CommandLib/NetworkCommands.cs
new file mode 100644
index 0000000..2585f06
--- /dev/null
+++ b/base/Applications/Network/CommandLib/NetworkCommands.cs
@@ -0,0 +1,142 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IpCommands.cs
+//
+//  Note:   Minimal Network Adapter Configuration Tool
+//
+
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+namespace Microsoft.Singularity.Applications.Network
+{
+    public class Utils
+    {
+        public static bool ConnectEndPoint(string! lookupName, [Claims] ServiceContract.Exp! ep)
+        {
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try
+            {
+                ErrorCode errorOut; 
+                bool ok = SdsUtils.Bind(lookupName, epNS, ep, out errorOut);
+                if (!ok) {
+                    return false; 
+                 } 
+                else {
+                    return true; 
+                }
+/*
+                epNS.SendBind(Microsoft.Singularity.Bitter.FromString2(lookupName), ep);
+
+                switch receive
+                {
+                    case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                        // failure
+                        delete rejectedEP;
+                        return false;
+                        break;
+
+                    case epNS.AckBind() :
+                        // success
+                        return true;
+                        break;
+
+                    case epNS.ChannelClosed() :
+                        // failure
+                        return false;
+                }
+*/                
+            }
+            finally
+            {
+                delete epNS;
+            }
+        }
+
+        public static TcpConnectionContract.Imp:ReadyState GetNewTcpEndPoint()
+        {
+            TcpContract.Imp! tcpImp;
+            TcpContract.Exp! tcpExp;
+            TcpContract.NewChannel(out tcpImp, out tcpExp);
+
+            if (ConnectEndPoint(TcpContract.ModuleName, tcpExp))
+            {
+                tcpImp.RecvReady();
+
+                TcpConnectionContract.Imp! connImp;
+                TcpConnectionContract.Exp! connExp;
+                TcpConnectionContract.NewChannel(out connImp, out connExp);
+
+                tcpImp.SendCreateTcpSession(connExp);
+                connImp.RecvReady();
+                delete tcpImp;
+                return connImp;
+            }
+            else
+            {
+                delete tcpImp;
+                return null;
+            }
+        }
+
+        public static UdpConnectionContract.Imp:ReadyState GetNewUdpEndPoint()
+        {
+            UdpContract.Imp! udpImp;
+            UdpContract.Exp! udpExp;
+            UdpContract.NewChannel(out udpImp, out udpExp);
+
+            if (ConnectEndPoint(UdpContract.ModuleName, udpExp))
+            {
+                udpImp.RecvReady();
+
+                UdpConnectionContract.Imp! connImp;
+                UdpConnectionContract.Exp! connExp;
+                UdpConnectionContract.NewChannel(out connImp, out connExp);
+
+                udpImp.SendCreateUdpSession(connExp);
+                connImp.RecvReady();
+                delete udpImp;
+                return connImp;
+            }
+            else
+            {
+                delete udpImp;
+                return null;
+            }
+        }
+        
+        public static void DNSShow(DNSContract.Imp:ReadyState! dnsConn)
+        {
+            string[] prefix = { "Primary", "Secondary" };
+            int key = 0;
+            IPv4[] servers = DNSImpConnection.GetNameServers(dnsConn);
+
+            foreach (IPv4 nameserver in servers)
+            {
+                Console.WriteLine("    {0} name server {1}",
+                                  prefix[key], nameserver);
+                key = 1;
+            }
+
+            if (key == 0)
+            {
+                Console.WriteLine("No DNS servers configured.");
+            }
+        }
+        
+    }
+
+}
diff --git a/base/Applications/Network/DNS/DNS.cs b/base/Applications/Network/DNS/DNS.cs
new file mode 100644
index 0000000..4b33d30
--- /dev/null
+++ b/base/Applications/Network/DNS/DNS.cs
@@ -0,0 +1,369 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DNS.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network 
+{
+    [ConsoleCategory(HelpMessage="Add network routing information", DefaultAction=true)]
+    internal class AddConfig {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DNSContract.Imp:Start> dnsRef;
+
+        [StringArrayParameter( "Servers",  HelpMessage="Servers to to add")]
+        internal string[] servers;
+
+        reflective internal AddConfig();
+
+        internal int AppMain() {
+            DebugStub.Break(); 
+            DNS.Add(this);
+            return 0; 
+        }
+    }
+
+    [ConsoleCategory(Action="show", HelpMessage="Show DNS information")]
+    internal class ShowConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DNSContract.Imp:Start> dnsRef;
+
+        reflective internal ShowConfig();
+
+        internal int AppMain() {
+            return DNS.Show(this);
+        }
+    }
+
+
+    [ConsoleCategory(Action="delete", HelpMessage="Delete DNS information")]
+    internal class DeleteConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DNSContract.Imp:Start> dnsRef;
+
+        [StringArrayParameter( "Servers", Mandatory=true, Position=0,  HelpMessage="Servers to to add")]
+        internal string[] servers;
+
+        reflective internal DeleteConfig();
+
+        internal int AppMain() {
+            DNS.Delete(this);
+            return 0; 
+        }
+    }
+
+  
+    [ConsoleCategory(Action="rotate", HelpMessage="Rotate name servers")]
+    internal class RotateConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DNSContract.Imp:Start> dnsRef;
+
+        reflective internal RotateConfig();
+
+        internal int AppMain() {
+            DNS.Rotate(this);
+            return 0; 
+        }
+    }
+
+
+    [ConsoleCategory(Action="query", HelpMessage="Query DNS information")]
+    internal class QueryConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DNSContract.Imp:Start> dnsRef;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+        
+        [StringParameter( "host", Mandatory=true, Position=0, HelpMessage="host to be queried")]
+        internal string name;
+
+        reflective internal QueryConfig();
+
+        internal int AppMain() {
+            DNS.Query(this);
+            return 0; 
+        }
+    }
+
+    public class DNS
+    {
+        internal static int Add(AddConfig! config)
+        {
+            
+        DebugStub.Break();      
+        
+        if (config.servers == null) { 
+                Console.WriteLine("no servers given"); 
+                return -1;
+            } 
+            
+            DNSContract.Imp dnsConn = config.dnsRef.Acquire(); 
+            if (dnsConn == null) {
+                Console.WriteLine("Could not initialize DNS endpoint.");
+                delete dnsConn; 
+                return 1;
+            }
+            dnsConn.RecvReady();
+                
+                
+           
+            for (int i = 0; i < config.servers.Length; i++)
+            {
+                IPv4 resolver;
+                Console.WriteLine("Resolving {0}", config.servers[i]); 
+
+                if (IPv4.Parse(config.servers[i], out resolver) == false)
+                {
+                    Console.WriteLine("Invalid IP address: {0}", config.servers[i]);
+                }
+
+                dnsConn.SendAddNameServer((uint)resolver);
+                dnsConn.RecvAck();
+            }
+            delete dnsConn; 
+            return 0;
+        }
+
+        internal static int Delete(DeleteConfig! config)
+        {           
+             if (config.servers == null) { 
+                Console.WriteLine("no servers given"); 
+                return -1;
+            } 
+            
+            DNSContract.Imp dnsConn = config.dnsRef.Acquire(); 
+            if (dnsConn == null) {
+                Console.WriteLine("Could not initialize DNS endpoint.");
+                return 1;
+            }
+            dnsConn.RecvReady();
+            
+            for (int i = 0; i < config.servers.Length; i++)
+            {
+                IPv4 resolver;
+                if (IPv4.Parse(config.servers[i], out resolver) == false)
+                {
+                    Console.WriteLine("Invalid IP address: {0}", config.servers[i]);
+                }
+
+                dnsConn.SendRemoveNameServer((uint)resolver);
+                dnsConn.RecvAck();
+            }
+            delete dnsConn; 
+            return 0;
+        }
+
+        private static bool QueryInternal(string! name)
+        {
+            // NOTE use the System.NET APIs here, just to exercise our
+            // port of them. We could also accomplish this by using a
+            // DNS channel.
+            try
+            {
+                System.Net.IPHostEntry hostInfo = System.Net.Dns.GetHostByName(name);
+                if (hostInfo == null) return false;
+
+                IPAddress[] addresses = hostInfo.AddressList;
+                if (addresses == null) return false;
+                String[] aliases = hostInfo.Aliases;
+                if (aliases == null) return false;
+
+                Console.Write("Host names:   ");
+
+                int end = aliases.Length - 1;
+                for (int i = 0; i <= end; i++)
+                {
+                    Console.Write("{0}{1}", aliases[i], (i == end) ? "" : ", ");
+                }
+                Console.Write("\n");
+
+                end = addresses.Length - 1;
+
+                Console.Write("IP addresses: ");
+                for (int i = 0; i <= end; i++)
+                {
+                    Console.Write("{0}{1}", addresses[i], (i == end) ? "" : ", ");
+                }
+                Console.Write("\n");
+
+                return true;
+            }
+            catch(System.Net.Sockets.SocketException)
+            {
+                return false;
+            }
+        }
+
+        internal static int Query(QueryConfig! config)
+        {
+            bool isValid;
+            string name = config.name; 
+            
+            DNSContract.Imp dnsConn = config.dnsRef.Acquire(); 
+            if (dnsConn == null)
+            {
+                Console.WriteLine("Could not initialize DNS endpoint.");
+                return 1;
+            }
+            dnsConn.RecvReady();
+            
+            dnsConn.SendIsValidName(Bitter.FromString(name));
+            dnsConn.RecvIsValid(out isValid);
+
+            if (!isValid)
+            {
+                Console.Write("Invalid name: {0}", name);
+                delete dnsConn;
+                return -1; 
+            }
+
+            if (QueryInternal(name)){
+                delete dnsConn;
+                return -1; 
+            }
+
+            IPContract.Imp ipConn = config.ipRef.Acquire();
+            if (ipConn == null)
+            {
+                Console.WriteLine("Could not initialize IP endpoint.");
+                delete dnsConn;
+                return -1; 
+            }
+
+            try
+            {
+                // Ad-hoc search list
+                char[]! in ExHeap repDomain;
+                ipConn.SendGetDomainName();
+                ipConn.RecvDomainName(out repDomain);
+                string domain = Bitter.ToString(repDomain);
+                delete repDomain;
+
+                if (domain == null)
+                {
+                    Console.WriteLine("Couldn't resolve \"" + name + "\"");
+                    delete dnsConn;
+                    delete ipConn;
+                    return -1; 
+                }
+
+                name = String.Concat(name, ".");
+
+                int index = 0;
+
+                do {
+                    string guess = String.Concat(name, domain.Substring(index));
+
+                    dnsConn.SendIsValidName(Bitter.FromString(guess));
+                    dnsConn.RecvIsValid(out isValid);
+
+                    if (isValid && QueryInternal(guess))
+                    {
+                        delete dnsConn;
+                        delete ipConn;
+                        return -1; 
+                    }
+
+                    index = domain.IndexOf('.', index) + 1;
+                } while (index > 0 && index < domain.Length);
+
+                Console.WriteLine("No IP address found");
+            }
+            finally
+            {   
+            }
+            delete ipConn;
+            delete dnsConn; 
+            return 0; 
+        }
+
+        internal  static int Rotate(RotateConfig! config)
+        {
+            DNSContract.Imp dnsConn = config.dnsRef.Acquire();
+            if (dnsConn == null)
+            {
+                Console.WriteLine("Could not initialize DNS endpoint.");
+                return 1;
+            }
+            dnsConn.RecvReady();
+
+            dnsConn.SendRotateNameServers();
+            dnsConn.RecvAck();
+            delete dnsConn;
+            return 0;
+        }
+
+
+        internal  static int Show(ShowConfig! config)
+        {
+            DNSContract.Imp dnsConn = config.dnsRef.Acquire();
+            if (dnsConn == null)
+            {
+                Console.WriteLine("Could not initialize DNS endpoint.");
+                return 1;
+            }
+            dnsConn.RecvReady();
+
+            Utils.DNSShow(dnsConn);
+            delete dnsConn;
+            return 0;
+        }
+
+
+    } // end class DNS
+
+}
diff --git a/base/Applications/Network/DNS/DNS.csproj b/base/Applications/Network/DNS/DNS.csproj
new file mode 100644
index 0000000..21b4141
--- /dev/null
+++ b/base/Applications/Network/DNS/DNS.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>dns</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DNS.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/DomainName/DomainName.cs b/base/Applications/Network/DomainName/DomainName.cs
new file mode 100644
index 0000000..b3d73b5
--- /dev/null
+++ b/base/Applications/Network/DomainName/DomainName.cs
@@ -0,0 +1,106 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DomainName.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network 
+{
+    [ConsoleCategory(HelpMessage="Delete network routing information", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [StringParameter( "n", Default=null,  HelpMessage="domain name to query")]
+        internal string name;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            DomainName.AppMain(this);
+            return 0; 
+        }
+    }
+    
+    /// <summary>
+    /// Class for configuring Domain Name.
+    /// </summary>
+    public class DomainName
+    {
+        internal static int AppMain(Parameters! config)
+        {
+
+            IPContract.Imp ipConn = config.ipRef.Acquire(); 
+            if (ipConn == null)
+            {
+                Console.WriteLine("Could not initialize IP endpoint.");
+                return 1;
+            }
+            ipConn.RecvReady(); 
+
+            try
+            {
+                if (config.name == null)
+                {
+                    char[]! in ExHeap repDomain;
+                    ipConn.SendGetDomainName();
+                    ipConn.RecvDomainName(out repDomain);
+                    Console.WriteLine(Bitter.ToString2(repDomain));
+                    delete repDomain;
+                }
+                else
+                {
+                    ipConn.SendSetDomainName(Bitter.FromString2(config.name));
+
+                    switch receive
+                    {
+                        case ipConn.Err():
+                            Console.WriteLine("Error setting domain name");
+                            return 1; // failure
+
+                        case ipConn.OK():
+                            Console.WriteLine("Set domain name successfully");
+                            break;
+
+                        case ipConn.ChannelClosed():
+                            Console.WriteLine("Error setting domain name (channel closed)");
+                            return 1; // failure
+                    }
+                }
+            }
+            finally
+            {
+                delete ipConn;
+            }
+
+            return 0; // success
+        }
+    } // end class DomainName
+}
diff --git a/base/Applications/Network/DomainName/DomainName.csproj b/base/Applications/Network/DomainName/DomainName.csproj
new file mode 100644
index 0000000..30524b5
--- /dev/null
+++ b/base/Applications/Network/DomainName/DomainName.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>DomainName</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DomainName.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/HostName/HostName.cs b/base/Applications/Network/HostName/HostName.cs
new file mode 100644
index 0000000..1046f11
--- /dev/null
+++ b/base/Applications/Network/HostName/HostName.cs
@@ -0,0 +1,111 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HostName.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network 
+{
+    [ConsoleCategory(HelpMessage="Delete network routing information", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [StringParameter( "n", Default=null,  HelpMessage="domain name to query")]
+        internal string name;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            HostName.AppMain(this);
+            return 0; 
+        }
+    }
+    /// <summary>
+    /// Class for configuring Host Name.
+    /// </summary>
+    public class HostName
+    {
+        internal static int AppMain(Parameters! config)
+        {
+
+            IPContract.Imp ipConn = (config.ipRef).Acquire(); 
+            if (ipConn == null)
+            {
+                Console.WriteLine("Could not initialize IP endpoint.");
+                return 1;
+            }
+            ipConn.RecvReady();
+            
+            try
+            {
+                if (config.name == null)
+                {
+                    char[]! in ExHeap repHost, repDomain;
+                    ipConn.SendGetHostName();
+                    ipConn.RecvHostName(out repHost);
+
+                    ipConn.SendGetDomainName();
+                    ipConn.RecvDomainName(out repDomain);
+
+                    Console.WriteLine("{0}.{1}", Bitter.ToString(repHost), Bitter.ToString(repDomain));
+                    delete repHost;
+                    delete repDomain;
+                    return 0; // success
+                }
+                else
+                {
+                    ipConn.SendSetHostName(Bitter.FromString2(config.name));
+
+                    switch receive
+                    {
+                        case ipConn.Err() :
+                            Console.WriteLine("Failure setting host name \"{0}\"", config.name);
+                            return 1; // failure;
+
+                        case ipConn.OK() :
+                            Console.WriteLine("Success setting host name");
+                            break;
+
+                        case ipConn.ChannelClosed() :
+                            Console.WriteLine("Failure setting host name \"{0}\" (channel closed)", config.name);
+                            return 1; // failure;
+                    }
+                }
+            }
+            finally
+            {
+                delete ipConn;
+            }
+
+            return 0; // success
+        }
+    } // end class HostName
+}
diff --git a/base/Applications/Network/HostName/HostName.csproj b/base/Applications/Network/HostName/HostName.csproj
new file mode 100644
index 0000000..13f9976
--- /dev/null
+++ b/base/Applications/Network/HostName/HostName.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>hostname</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="HostName.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/IPConfig/IPConfig.cs b/base/Applications/Network/IPConfig/IPConfig.cs
new file mode 100644
index 0000000..2ca6053
--- /dev/null
+++ b/base/Applications/Network/IPConfig/IPConfig.cs
@@ -0,0 +1,393 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPConfig.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network
+{
+    [ConsoleCategory(HelpMessage="Configure nic with IP addresses", DefaultAction=true)]
+    internal class DefaultConfig {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [StringParameter( "device", Mandatory=true, Position=0, HelpMessage="Nic to configure")]
+        internal string device;
+
+        [StringParameter( "address", Mandatory=true, Position=1, HelpMessage="address to give it")]
+        internal string address;
+
+        [StringParameter( "mask", Mandatory=true, Position=2, HelpMessage="mask to use")]
+        internal string mask;
+
+        [StringParameter( "gateway", Mandatory=true, Position=3, HelpMessage="gateway")]
+        internal string gateway;
+
+        reflective internal DefaultConfig();
+
+        internal int AppMain() {
+            return IPConfig.DefaultMain(this);
+        }
+    }
+
+    [ConsoleCategory(Action="show", HelpMessage="SHOW nic' IP configuration" )]
+    internal class ShowConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [Endpoint]
+        public readonly TRef<DNSContract.Imp:Start> dnsRef;
+
+        reflective internal ShowConfig();
+
+        internal int AppMain() {
+            return  IPConfig.Show(this);
+        }
+    }
+
+    [ConsoleCategory(Action="dhcp", HelpMessage="Configure nic via DHCP" )]
+    internal class DhcpConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [StringParameter( "device", Mandatory=true, Position=0, HelpMessage="Nic to configure")]
+        internal string device;
+
+        [StringParameter( "verb", Mandatory=true, Position=1, HelpMessage="verb (start or stop).")]
+        internal string action;
+
+        reflective internal DhcpConfig();
+
+        internal int AppMain() {
+            return  IPConfig.Dhcp(this);
+        }
+    }
+
+    [ConsoleCategory(Action="verify", HelpMessage="check device interface" )]
+    internal class VerifyConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [StringParameter( "device", Mandatory=true, Position=0, HelpMessage="Nic to configure")]
+        internal string device;
+
+        reflective internal VerifyConfig();
+
+        internal int AppMain() {
+            return  IPConfig.Verify(this);
+        }
+    }
+
+    /// <summary>
+    /// Class for interface configuration related commands.
+    /// </summary>
+    public class IPConfig
+    {
+
+        // Marked unsafe for now since checker 
+        // has problems with custom vector access.
+        public static void ShowConfig(IPContract.Imp:ReadyState! ipConn, DNSContract.Imp:ReadyState! dnsConn)
+        {
+            int done = 0;
+            char[]! in ExHeap hostName, domainName;
+
+            ipConn.SendGetHostName();
+            ipConn.RecvHostName(out hostName);
+            ipConn.SendGetDomainName();
+            ipConn.RecvDomainName(out domainName);
+
+            Console.WriteLine("Hostname: {0}.{1}", Bitter.ToString2(hostName), Bitter.ToString2(domainName));
+            delete hostName;
+            delete domainName;
+
+            Console.WriteLine("DNS Servers:");
+
+            try
+            { Utils.DNSShow(dnsConn); }
+            finally
+            {}
+
+            char[][]! in ExHeap ifNames;
+            ipConn.SendGetInterfaces();
+            ipConn.RecvInterfaceList(out ifNames);
+
+            for (int i = 0; i < ifNames.Length; ++i)
+            {
+                CustomVector.Expose(ifNames, i);
+                char[] in ExHeap ifName = ifNames[i];
+                if (ifName == null)
+                    throw new Exception("ifName is null");
+                string! deviceName = Bitter.ToString2(ifName);
+                CustomVector.UnExpose(ifNames, i);
+                ipConn.SendGetInterfaceState(Bitter.FromString2(deviceName));
+                switch receive
+                {
+                    case ipConn.InterfaceNotFound() :
+                        Console.WriteLine("Unexpected error");
+                        break;
+
+                    case ipConn.InterfaceState(InterfaceInfo ifInfo) :
+                        ShowInterface(ifInfo, deviceName);
+                        break;
+
+                    case ipConn.ChannelClosed() :
+                        throw new Exception("ipConn channel closed");
+                }
+
+                done++;
+            }
+
+            delete ifNames;
+
+            if (done == 0)
+                Console.WriteLine("No adapters present.");
+        }
+
+        public static void ConfigureInterface(IPContract.Imp!   ipConn,
+                                              string!           adapterName,
+                                              string!           addressString,
+                                              string!           netmaskString,
+                                              string!           gatewayString)
+        {
+            IPv4 ifAddress, netmask, gateway;
+
+            if (IPv4.Parse(addressString, out ifAddress) == false ||
+                IPv4.Parse(netmaskString, out netmask) == false ||
+                IPv4.Parse(gatewayString, out gateway) == false)
+            {
+                return;
+            }
+
+            ipConn.SendSetInterfaceState(Bitter.FromString2(adapterName),
+                                         (uint)ifAddress, (uint)netmask, (uint)gateway);
+
+            switch receive
+            {
+                case ipConn.InterfaceNotFound() :
+                    Console.WriteLine("No such interface found");
+                    break;
+
+                case ipConn.Err() :
+                    Console.WriteLine("Error occurred setting interface state");
+                    break;
+
+                case ipConn.OK() :
+                    Console.WriteLine("Successfully set interface state");
+                    break;
+            }
+        }
+
+        public static void ShowInterface([Claims] InterfaceInfo ifInfo, string! ifName)
+        {
+            Console.WriteLine("Interface:   {0}", ifName);
+            Console.WriteLine("Adapter:     {0}",
+                              Bitter.ToString(ifInfo.driverName));
+            Console.WriteLine("Version:     {0}",
+                              Bitter.ToString(ifInfo.driverVersion));
+            Console.WriteLine("MAC address: {0}",
+                              ChannelUtils.HardwareAddressToString(ifInfo.hardwareAddress));
+
+            bool found = false;
+
+            delete ifInfo.driverName;
+            delete ifInfo.driverVersion;
+
+            InterfaceIPInfo[] in ExHeap ipConfigs = ifInfo.ipConfigs;
+
+            if (ipConfigs != null) {
+                for (int i = 0; i < ipConfigs.Length; i++)
+                {
+                    InterfaceIPInfo ipc = ipConfigs[i];
+                    Console.WriteLine("   Address: {0,-14}    NetMask: {1, -14}    Gateway: {2, -14}", new IPv4(ipc.address), new IPv4(ipc.netmask), new IPv4(ipc.gateway));
+                    found |= true;
+                }
+                delete ipConfigs;
+            }
+
+            if (found == false)
+                Console.WriteLine("   Not configured.");
+        }
+
+        public static void StartDhcp(IPContract.Imp! ipConn,
+                                     string! adapterName)
+        {
+            ipConn.SendStartDhcp(Bitter.FromString2(adapterName));
+
+            switch receive
+            {
+                case ipConn.InterfaceNotFound() :
+                    Console.WriteLine("No such interface found");
+                    break;
+
+                case ipConn.OK() :
+                    Console.WriteLine("Successfully started DHCP");
+                    break;
+            }
+        }
+
+        public static void StopDhcp(IPContract.Imp! ipConn,
+                                    string! adapterName)
+        {
+            ipConn.SendStopDhcp(Bitter.FromString2(adapterName));
+
+            switch receive
+            {
+                case ipConn.InterfaceNotFound() :
+                    Console.WriteLine("No such interface found");
+                    break;
+
+                case ipConn.OK() :
+                    Console.WriteLine("Successfully stopped DHCP");
+                    break;
+            }
+        }
+
+        internal static int Show(ShowConfig! config) 
+        {
+            IPContract.Imp ipConn = (config.ipRef).Acquire();
+            if (ipConn == null) { 
+                throw new Exception("Unable to acquire handle to the IP network"); 
+            } 
+            ipConn.RecvReady(); 
+            
+            DNSContract.Imp dnsConn = (config.dnsRef).Acquire();
+            if (dnsConn == null)
+            {
+                Console.WriteLine("Could not initialize DNS endpoint.");
+                delete ipConn;
+                return -1;
+            }
+            dnsConn.RecvReady(); 
+
+            ShowConfig(ipConn, dnsConn);
+            delete ipConn;
+            delete dnsConn;
+            return 0; 
+        }
+
+
+        internal static int Dhcp(DhcpConfig! config) 
+        {
+            IPContract.Imp ipConn = (config.ipRef).Acquire();
+            if (ipConn == null) { 
+                throw new Exception("Unable to acquire handle to the IP network"); 
+            } 
+            ipConn.RecvReady(); 
+
+            if (config.action == "start") {
+                StartDhcp(ipConn, config.device);
+            } 
+            else if (config.action == "stop") {
+                StopDhcp(ipConn, config.device);
+            } 
+            else {
+                Console.WriteLine("Unknown dhcp action:{0}", config.action); 
+            }
+            delete ipConn;
+            return 0; 
+        }
+        
+        internal static int Verify(VerifyConfig! config) 
+        {
+            string! arg1 = config.device; 
+            
+            IPContract.Imp ipConn = (config.ipRef).Acquire();
+            if (ipConn == null) { 
+                throw new Exception("Unable to acquire handle to the IP network"); 
+            } 
+            ipConn.RecvReady(); 
+            ipConn.SendGetInterfaceState(Bitter.FromString2(arg1));
+
+            switch receive
+            {
+                case ipConn.InterfaceNotFound() :
+                    Console.WriteLine("Interface not found: \"" + arg1 + "\"");
+                    break;
+
+                case ipConn.InterfaceState(InterfaceInfo ifInfo) :
+                    ShowInterface(ifInfo, arg1);
+                    break;
+
+                case ipConn.ChannelClosed() :
+                    throw new Exception("ipConn channel closed");
+            }
+            delete ipConn;
+            return 0;
+        }
+        
+        internal static int DefaultMain(DefaultConfig! config)
+        {
+
+            IPContract.Imp ipConn = (config.ipRef).Acquire();
+            if (ipConn == null) { 
+                throw new Exception("Unable to acquire handle to the IP network"); 
+            } 
+            ipConn.RecvReady(); 
+            
+            try {
+                ConfigureInterface(ipConn,
+                                   config.device, 
+                                   config.address,
+                                   config.mask, 
+                                   config.gateway);
+                delete ipConn;
+                return 0;
+            }
+            catch(Exception e)
+            {
+                Console.WriteLine("Caught exception: " + e);
+            }
+            finally
+            {
+            }
+            delete ipConn;
+            return 1;
+        }
+    } // end class IPConfig
+}
diff --git a/base/Applications/Network/IPConfig/IPConfig.csproj b/base/Applications/Network/IPConfig/IPConfig.csproj
new file mode 100644
index 0000000..3ed375d
--- /dev/null
+++ b/base/Applications/Network/IPConfig/IPConfig.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ipconfig</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="IPConfig.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/MonNet/MonNet.csproj b/base/Applications/Network/MonNet/MonNet.csproj
new file mode 100644
index 0000000..c12cf3f
--- /dev/null
+++ b/base/Applications/Network/MonNet/MonNet.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>MonNet</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MonNet.sg" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Net.Contracts\Io.Net.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+
+  </ItemGroup>
+  
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/MonNet/MonNet.sg b/base/Applications/Network/MonNet/MonNet.sg
new file mode 100644
index 0000000..bca1e97
--- /dev/null
+++ b/base/Applications/Network/MonNet/MonNet.sg
@@ -0,0 +1,837 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MonNet.cs
+//
+//  Note:   Tool to transfer monitoring log entries over network
+//
+using System;
+
+using System.IO;
+
+using Microsoft.Singularity;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Naming;
+
+using System.Net.IP;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Singularity.Applications.Network;
+using Microsoft.Singularity.Diagnostics.Contracts;
+
+using Microsoft.Singularity.V1.Types;
+
+/* For contract type handle dumping: */
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.FileSystem;
+
+using Thread = System.Threading.Thread;
+
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "help", Default=false, HelpMessage="Display Extended help message.")]
+        internal bool doHelp;
+
+        [StringArrayParameter( "args", HelpMessage="arg bucket")]
+        internal string[] args;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Monnet.AppMain(this);
+        }
+    }
+
+    public class Monnet
+    {
+        public class Proc
+        {
+            public static ProcessContract.Imp:ReadyState BindToProcessDiagnostics()
+            {
+                ProcessContract.Exp! exp;
+                ProcessContract.Imp! imp;
+                ProcessContract.NewChannel(out imp, out exp);
+
+                // get NS endpoint
+                DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+                try
+                {
+                    ErrorCode errorOut;
+                    bool ok = SdsUtils.Bind(ProcessContract.ModuleName, ns, exp, out errorOut);
+                    if (!ok) {
+                        delete imp;
+                        Console.WriteLine("Bind of {0} failed. reason: {1}\n", MemoryContract.ModuleName,SdsUtils.ErrorCodeToString(errorOut) );
+                        if (errorOut == ErrorCode.ChannelClosed)
+                        {
+                            throw new Exception("Encountered a ChannelClosed to NameServer");
+                        }
+                        return null;
+                    }
+                    else {
+                        imp.RecvReady();
+                    }
+                }
+                finally
+                {
+                    delete ns;
+                }
+                return imp;
+            }
+
+            public static int []! GetProcessIDs(ProcessContract.Imp:ReadyState! imp)
+            {
+                int [] ids = null;
+                int[]! in ExHeap xids;
+                imp.SendGetProcessIDs();
+                imp.RecvProcessIDs(out xids);
+                // REVIEW: The kernel process is being returned twice so we're
+                // skipping one of the entries if the process ID matches.
+                int startIndex = 0;
+                if (xids[0] == xids[1])
+                    startIndex++;
+                ids = new int[xids.Length - startIndex];
+                for (int i = startIndex; i < xids.Length; i++)
+                {
+                    ids[i - startIndex] = xids[i];
+                }
+                delete xids;
+                return ids;
+            }
+
+            public static int [] GetProcessThreadIDs(ProcessContract.Imp:ReadyState! imp, int procID)
+            {
+                imp.SendGetProcessThreadIDs(procID);
+                int [] retVal = null;
+
+                switch receive
+                {
+                    case imp.NotFound() :
+                        break;
+
+                    case imp.ProcessThreadIDs(int[]! in ExHeap tids) :
+                        retVal = new int[tids.Length];
+                        for (int i=0; i<tids.Length; i++) {
+                            retVal[i] = tids[i];
+                        }
+                        delete tids;
+                        break;
+
+                    case imp.ChannelClosed() :
+                        throw new Exception("GetProcessThreadIDs: imp channel closed");
+                }
+                return retVal;
+            }
+
+            public static string []! GetProcessNames(ProcessContract.Imp:ReadyState! imp, int []! ids)
+            {
+                string [] names = new string[ids.Length];
+                for (int i = 0; i < ids.Length; i++)
+                {
+                    imp.SendGetProcessName(ids[i]);
+
+                    switch receive
+                    {
+                        case imp.NotFound() :
+                            break;
+
+                        case imp.ProcessName(char[]! in ExHeap procName) :
+                            names[i] = Bitter.ToString(procName);
+                            delete procName;
+                            break;
+
+                        case imp.ChannelClosed() :
+                            throw new Exception("GetProcessNames: imp channel closed");
+                    }
+                }
+                return names;
+            }
+        } // public class Proc
+
+        public enum SysInfoEvent : ushort
+        {
+            CpuSpeed = 1,
+            ContractName = 2,
+            PidInfo = 3,
+            ThreadInfo = 4,
+        }
+        private static Monitoring.LogEntry newSysInfoEvent(SysInfoEvent type)
+        {
+            Monitoring.LogEntry ev = new Monitoring.LogEntry();
+
+            ev.provider = Monitoring.Provider.SysInfo;
+            ev.type = (ushort)type;
+            ev.version = 0;
+            return ev;
+        }
+        private static void postSysInfoEvent(ref Monitoring.LogEntry ev,
+                                             string msg)
+        {
+        if (msg != null) {
+        textlen = System.Text.Encoding.ASCII.GetBytes(msg, 0, msg.Length,
+                                  text, 0);
+        unsafe {
+            ev.text = (byte *)textlen;
+        }
+        }
+
+            int ret = Marshall(ref ev);
+            if (ret != 0) {
+                Console.WriteLine("Error marshalling sysinfo event... continuing anyway");
+            }
+        }
+
+
+        // Add system info (CPU speeds, memory, disks, process
+        // & thread run-downs) to event buffer
+        private static void dumpSysInfo()
+        {
+            Monitoring.LogEntry ev = newSysInfoEvent(SysInfoEvent.CpuSpeed);
+
+            // TODO: foreach CPU...
+            ev.cpu = 0;
+            ulong hz = (ulong)Processor.CyclesPerSecond;
+            ev.arg0 = (uint)hz;
+            ev.arg1 = (uint)(hz >> 32);
+            postSysInfoEvent(ref ev, null);
+
+            dumpContractTypeHandles();
+            dumpPidEntries();
+
+            // TODO: disk ID -> name rundowns
+        }
+
+        private static void dumpPidEntries()
+        {
+            Monitoring.LogEntry ev = newSysInfoEvent(SysInfoEvent.PidInfo);
+            Monitoring.LogEntry ev2 = newSysInfoEvent(SysInfoEvent.ThreadInfo);
+
+            ProcessContract.Imp:ReadyState   pDiag = Proc.BindToProcessDiagnostics();
+
+            if (pDiag == null) {
+            }
+            else {
+                int [] procIds = Proc.GetProcessIDs(pDiag);
+                string [] names = Proc.GetProcessNames(pDiag,procIds);
+
+                for (int i=0; i<procIds.Length; i++) {
+                    ev.arg0 = (uint)procIds[i];
+                    postSysInfoEvent(ref ev,names[i]);
+
+                    int [] threads = Proc.GetProcessThreadIDs(pDiag, procIds[i]);
+                    if (threads != null) {
+                        for (int j=0; j< threads.Length; j++) {
+                            ev2.arg0 = (uint) threads[j];
+                            ev2.arg1 = (uint) procIds[i];
+                            postSysInfoEvent(ref ev2, null);
+                        }
+                    }
+                }
+                delete pDiag;
+            }
+        }
+
+        // list of interesting contracts we dump SystemType handles for
+        private static System.Type []! contractTypes = new System.Type [] {
+            /* NetStack.Contracts.dll */
+            typeof(DNSContract.Exp),
+            typeof(DNSContract.Imp),
+            typeof(IPContract.Exp),
+            typeof(IPContract.Imp),
+            typeof(RoutingContract.Exp),
+            typeof(RoutingContract.Imp),
+            typeof(TcpConnectionContract.Exp),
+            typeof(TcpConnectionContract.Imp),
+            typeof(TcpContract.Exp),
+            typeof(TcpContract.Imp),
+            typeof(UdpConnectionContract.Exp),
+            typeof(UdpConnectionContract.Imp),
+            typeof(UdpContract.Exp),
+            typeof(UdpContract.Imp),
+
+            /* Io.Contracts.dll */
+            typeof(ConsoleDeviceContract.Exp),
+            typeof(ConsoleDeviceContract.Imp),
+            typeof(DeviceContract.Exp),
+            typeof(DeviceContract.Imp),
+            typeof(DiskDeviceContract.Exp),
+            typeof(DiskDeviceContract.Imp),
+            typeof(KeyboardDeviceContract.Exp),
+            typeof(KeyboardDeviceContract.Imp),
+            typeof(PnpContract.Exp),
+            typeof(PnpContract.Imp),
+            typeof(SoundDeviceContract.Exp),
+            typeof(SoundDeviceContract.Imp),
+            typeof(VideoDeviceContract.Exp),
+            typeof(VideoDeviceContract.Imp),
+            typeof(VolumeManagerContract.Exp),
+            typeof(VolumeManagerContract.Imp),
+            typeof(NicDeviceContract.Exp),
+            typeof(NicDeviceContract.Imp),
+            typeof(NicDeviceEventContract.Exp),
+            typeof(NicDeviceEventContract.Imp),
+
+            /* Directory.Contracts.dll */
+            typeof(DirectoryServiceContract.Exp),
+            typeof(DirectoryServiceContract.Imp),
+            typeof(FileContract.Exp),
+            typeof(FileContract.Imp),
+            typeof(NotifyContract.Exp),
+            typeof(NotifyContract.Imp),
+            typeof(ServiceContract.Exp),
+            typeof(ServiceContract.Imp),
+            typeof(ServiceProviderContract.Exp),
+            typeof(ServiceProviderContract.Imp),
+            typeof(Microsoft.Singularity.Extending.ExtensionContract.Exp),
+            typeof(Microsoft.Singularity.Extending.ExtensionContract.Imp),
+
+            /* Security.Contracts.dll */
+            typeof(Microsoft.Singularity.Security.SecurityDiagnosticsContract.Exp),
+            typeof(Microsoft.Singularity.Security.SecurityDiagnosticsContract.Imp),
+
+            /* FileSystem.Contracts.dll */
+            typeof(ThreadPoolControlContract.Exp),
+            typeof(ThreadPoolControlContract.Imp),
+
+            /* Diagnostics.Contracts.dll */
+            typeof(Microsoft.Singularity.Diagnostics.Contracts.ChannelContract.Exp),
+            typeof(Microsoft.Singularity.Diagnostics.Contracts.ChannelContract.Imp),
+            typeof(Microsoft.Singularity.Diagnostics.Contracts.MemoryContract.Exp),
+            typeof(Microsoft.Singularity.Diagnostics.Contracts.MemoryContract.Imp),
+            typeof(Microsoft.Singularity.Diagnostics.Contracts.ProcessContract.Exp),
+            typeof(Microsoft.Singularity.Diagnostics.Contracts.ProcessContract.Imp),
+        };
+
+        private static void dumpContractTypeHandles()
+        {
+            Monitoring.LogEntry ev =newSysInfoEvent(SysInfoEvent.ContractName);
+
+            for (int i=0; i<contractTypes.Length; i++)
+            {
+                System.Type! ty = (System.Type!) contractTypes[i];
+                SystemType st = ty.GetSystemType();
+                string! fullname = (string!)ty.FullName;
+                ev.arg0 = (uint)st.TypeId;
+
+                // trim the enclosing type off the fullname
+                int idx = fullname.LastIndexOf('+');
+                string smallname;
+                if (idx >= 0)
+                    smallname = fullname.Substring(idx+1);
+                else
+                    smallname = fullname;
+
+                postSysInfoEvent(ref ev, smallname);
+            }
+        }
+
+
+        public static byte[]! buf; // event buffer
+        public static int bufoffset; // current position in event buffer
+        public static byte[] text; // buffer for event string
+        public static int textlen; // length of event string
+
+        public static TcpConnectionContract.Imp:Connected!
+        OpenConnection(IPv4 address, ushort port)
+        {
+            TcpConnectionContract.Imp tcpConn = Utils.GetNewTcpEndPoint();
+            if (tcpConn == null) {
+                Console.WriteLine("Could not initialize TCP endpoint.");
+                throw new ArgumentException("Could not initialize TCP endpoint.");
+            }
+
+            Console.Write("Connecting...");
+
+            // Try to connect to the remote host
+            tcpConn.SendConnect((uint)address, port);
+
+            switch receive
+            {
+            case tcpConn.CouldNotConnect(TcpError error) :
+                Console.WriteLine("Failed to connect: TcpError = " + System.Net.Sockets.TcpException.GetMessageForTcpError(error));
+                delete tcpConn;
+                throw new ArgumentException("Failed to connect.");
+                break;
+
+            case tcpConn.OK() :
+                // success;
+                break;
+
+            case tcpConn.ChannelClosed() :
+                // how rude
+                Console.WriteLine("Netstack channel closed unexpectedly");
+                delete tcpConn;
+                throw new ArgumentException("Netstack channel closed unexpectedly");
+                break;
+            }
+
+            Console.WriteLine("Connected");
+            return tcpConn;
+        }
+
+        public static TcpConnectionContract.Imp:Connected
+        SetupNetwork(string sIp, string sPort)
+        {
+            IPv4 host;
+            try
+            {
+                host = IPv4.Parse(sIp);
+            }
+            catch (FormatException e)
+            {
+                Console.WriteLine("{0}: {1}", e, sIp);
+                return null;
+            }
+
+            ushort port;
+            try
+            {
+                port = UInt16.Parse(sPort);
+            }
+            catch (FormatException)
+            {
+                Console.WriteLine("Malformed port number: {0}", sPort);
+                return null;
+            }
+            catch (OverflowException)
+            {
+                Console.WriteLine("Port number out of range: {0}", sPort);
+                return null;
+            }
+
+            TcpConnectionContract.Imp! conn = OpenConnection(host, port);
+
+            return conn;
+        }
+
+
+    // we segment our large buffer into COMMSZ chunks for punting through
+    // to the network stack
+        private static int COMMSZ = 64*1024;  // 64KB
+
+        public static int SendLogBuffer(TcpConnectionContract.Imp! conn)
+        {
+        int sendidx = 0;
+        int sendlen;
+            byte[]! in ExHeap data;
+
+            // copy data to exheap in chunks and send
+            Console.Write("Sending");
+        while (sendidx < bufoffset)
+        {
+        sendlen = Math.Min(COMMSZ, bufoffset - sendidx);
+        data = Bitter.FromByteArray(buf, sendidx, sendlen);
+
+        conn.SendWrite(data);
+        switch receive
+        {
+        case conn.OK() :
+            Console.Write(".");
+            break;
+
+        case conn.CantSend() :
+            Console.WriteLine(": Connection closed unexpectedly (CantSend)");
+            return -1;
+            break;
+
+        case conn.ConnectionClosed():
+            Console.WriteLine(": Connection closed unexpectedly (ConnectionClosed)");
+            return -1;
+            break;
+        }
+
+        sendidx += sendlen;
+        }
+
+        Console.WriteLine("OK");
+        return 0;
+    }
+
+        public static int marshalled; // count of events marshalled
+
+        public static int Marshall(ref Monitoring.LogEntry e)
+        {
+        int tl = (textlen > 0)? textlen : 0;
+            if (sizeof(Monitoring.LogEntry) + bufoffset + tl > buf.Length) {
+                Console.WriteLine("Marshall: buffer full");
+                return -1;
+            }
+
+            unsafe {
+        fixed (byte *bp = &buf[bufoffset]) {
+            /* Use a simple cast */
+            Monitoring.LogEntry *lep = (Monitoring.LogEntry *)bp;
+            *lep = e;
+        }
+            }
+            bufoffset += sizeof(Monitoring.LogEntry);
+
+            if (textlen > 0) {
+                Array.Copy(text, 0, buf, bufoffset, textlen);
+                bufoffset += textlen;
+            }
+            textlen = 0;
+
+            marshalled++;
+            return 0;
+        }
+
+        // Fill event buffer until either duration has passed or
+        // we have maxevents
+        public static int FillEventBuffer(ulong duration, ulong maxevents,
+                      ulong evstart)
+        {
+            int ret = -1;
+            ulong counter = evstart;
+            ulong old_counter = 0;
+            ulong count_lost = 0;
+            ulong sum_lost = 0;
+
+            ulong hz = (ulong)Processor.CyclesPerSecond;
+            ulong now = Processor.CycleCount;
+        ulong end = now + duration * hz;
+
+            ulong evcount = 0;
+
+            Monitoring.LogEntry e = new Monitoring.LogEntry();
+
+        Console.WriteLine("MonNet: collecting with duration={0}secs, maxevents={1}",
+                  duration, maxevents);
+
+            bool done = false;
+            while (!done)
+            {
+                // Get an event
+                while (true)
+        {
+                    ret = -1;
+                    now = Processor.CycleCount;
+                    if (now > end || evcount >= maxevents)
+            {
+                        done = true;
+
+                        if (now > end)
+                            Console.WriteLine("Timed out ({0}ms late)", (now-end)*1000/hz);
+                        if (evcount >= maxevents)
+                            Console.WriteLine("Got enough events");
+                        break;
+                    }
+
+                    unsafe {
+                        ret = Monitoring.GetEntry(ref counter, out e);
+                    }
+                    if (old_counter != counter)
+                    {
+                        count_lost++;
+                        sum_lost += counter - old_counter;
+                        //Console.Write("X{0}", counter - old_counter);
+                    }
+                    old_counter = counter;
+
+                    if (ret == 0) {// Got an event
+                        evcount++;
+                        break;
+                    } else {        // No event to get, sleep and try again
+            // are we just using defaults?
+            if (duration == ((ulong)DEF_DUR) &&
+                maxevents == ((ulong)DEF_MAXEV))
+            {
+                done = true;
+                Console.WriteLine("No more events");
+                break;
+            }
+            else
+            {
+                Thread.Sleep(100);
+            }
+            }
+                }
+                counter++;
+
+                if (ret == 0)
+        {
+            if (e.cycleCount == 0)
+            {
+//          Console.Write('^');
+            evcount--;
+            continue;  // got illegal entry, so try next
+            }
+
+                    // Try to get text buffer for event
+                    if (e.text != null)
+                    {
+                        int size;
+                        unsafe {
+                            assume text != null;
+                            fixed (byte * b = text) {
+                                size = Monitoring.FillTextEntry(e.text, e.cycleCount,
+                                                                b, text.Length);
+                            }
+                        }
+
+                        if (size != 0) // fixup size in event structure
+                        {
+                if (size < 0) // error: dropped text string
+                Console.WriteLine("size={0}", size);
+
+                            unsafe {
+                                e.text = (byte *)size;
+                            }
+                            textlen = size;
+                        }
+                    }
+
+                    // put event in buffer
+                    ret = Marshall(ref e);
+                    if (ret != 0) {
+            Console.WriteLine("BUFFER FULL: exiting EARLY!");
+                        done = true;
+                        break;
+                    }
+                }
+            }
+            Console.WriteLine("Got {0} events", evcount);
+            return ret;
+        }
+
+
+    /* We can't actually "clear" the kernel log; what this does
+     * is find the counter number for the log's current end,
+     * so we can pass it into FillEventBuffer() later. */
+        private static ulong clearLog()
+    {
+        int ret;
+        ulong counter = 0;
+            Monitoring.LogEntry e = new Monitoring.LogEntry();
+        int i = 0;
+
+        while (true)
+        {
+        unsafe {
+            ret = Monitoring.GetEntry(ref counter, out e);
+        }
+        if (ret == 0) {
+            counter++; // got an event; try next one
+        } else {
+            break;  // failed to get an event, we're done
+        }
+
+        /* sanity check */
+        if (i++ > 5000000)
+        {
+            Console.WriteLine("error: clearLog() looped 5000000 times; bailing");
+            break;
+        }
+        }
+
+        return counter;
+    }
+
+
+
+    /************************************************/
+    /* Command line gubbins */
+
+
+    private static int doTransfer(string sIp, string sPort)
+    {
+            int ret;
+
+        // Setup the networking stuff.
+        // austind: due to a race in the netstack, must open the connection
+        // and start sending data on it promptly, otherwise you'll get
+        // a RST and an exception.
+            TcpConnectionContract.Imp conn = SetupNetwork(sIp, sPort);
+            if (conn == null)
+        return -1;
+
+            // Transmit the buffer
+        ret = SendLogBuffer(conn);
+
+            // Tidy up
+            conn.SendClose();
+            delete conn;
+
+        return ret;
+    }
+
+
+    private static int doSlurp(long runTime, long maxevents,
+                   ulong evstart)
+    {
+        // Allocate the buffers
+        buf = new Byte[16<<20]; // should be big enough
+        bufoffset = 0;
+        text = new byte[256];
+        textlen = 0;
+
+        marshalled = 0;     // num events copied to buf
+
+        // Put preamble into buffer
+        dumpSysInfo();
+
+        return FillEventBuffer((ulong)runTime, (ulong)maxevents, evstart);
+    }
+
+
+        public static bool ParseNumber(string/*!*/ arg,
+                       string/*!*/ name,
+                       out long value)
+        {
+            // arg should look like "[-][A-z]:[0-9]*"
+            if (arg.Length >= 4)
+            {
+                try
+                {
+                    value = Int64.Parse(arg.Substring(3));
+                    return true;
+                }
+                catch (FormatException)
+                {Console.WriteLine("format ex"); }
+                catch (OverflowException)
+                {Console.WriteLine("overflow ex");}
+            }
+            Console.WriteLine("Could not parse {0}, {1}", name,arg.Substring(3));
+            value = 0;
+            return false;
+        }
+
+        internal static int usage()
+        {
+            Console.WriteLine("Usage: monnet /d /c /w:WARMUP /e /r:RUNTIME /n:MAXEVENTS /s /t:IP:PORT");
+            Console.WriteLine("  /d           disable logging");
+            Console.WriteLine("  /c           \"clear\" log: ie note current end");
+            Console.WriteLine("  /w:WARMUP    pause for WARMUP seconds");
+            Console.WriteLine("  /e           enable logging");
+            Console.WriteLine("  /r:RUNTIME   set event slurp limit to RUNTIME seconds");
+            Console.WriteLine("  /n:MAXEVENTS set event slurp limit to MAXEVENTS");
+            Console.WriteLine("     (without /r or /n options: slurp until log empty or marshal buffer full)");
+            Console.WriteLine("  /s           slurp events according to limits");
+            Console.WriteLine("  /t:IP:PORT transfer via TCP to IPADDR:PORT");
+            Console.WriteLine("All options can occur in any order, zero or more times");
+            Console.WriteLine("They are executed in order.  Example:");
+            Console.WriteLine("monnet /d /c /w:300 /e /r:300 /s /d /t:10.99.99.1:5000");
+            return -1;
+        }
+
+        private static long DEF_DUR = 999999999; // seconds ie forever
+        private static long DEF_MAXEV = 999999999;
+
+        internal static int AppMain(Parameters! config)
+        {
+            int ret = 0;
+            long runTime = DEF_DUR, maxevents = DEF_MAXEV;
+            ulong evstart = 0;
+            string[] args = config.args;
+
+            if (config.doHelp) return usage();
+
+            if (args == null)
+            {
+                return usage();
+            }
+
+            bool  needHelp = (args.Length == 0);
+
+            int i;
+            for (i = 0; !needHelp && i < args.Length; i++)
+            {
+                string arg = args[i];
+
+                if (arg == null || arg.Length < 2 || (arg[0] != '-' && arg[0] != '/') )
+                {
+                    Console.WriteLine("Invalid argument: {0}", arg);
+                    return usage();
+                }
+
+                long temp;
+                switch (arg[1])
+                {
+        case 'd':
+        case 'e':
+            bool active = (arg[1] == 'e');
+            Console.WriteLine(active?"Enabling logging":"Disabling logging");
+            Monitoring.setActive(active);
+            break;
+
+        case '?':
+        case 'h':
+            needHelp = true;
+            break;
+
+        case 'c':
+            Console.WriteLine("Clearing log");
+            evstart = clearLog();
+            break;
+
+        case 'w':
+            ParseNumber(arg, "Warmup time", out temp);
+            Console.WriteLine("Pausing {0}secs for warmup", temp);
+            Thread.Sleep(((int)temp) * 1000);
+            break;
+
+        case 'r':
+            ParseNumber(arg, "Run time", out runTime);
+            break;
+
+        case 'n':
+            ParseNumber(arg, "Maxevents", out maxevents);
+            break;
+
+        case 's':
+            doSlurp(runTime, maxevents, evstart);
+            break;
+
+        case 't':
+            int colon = arg.IndexOf(':', 3);
+            if (colon < 0)
+            {
+            Console.WriteLine("argument error: missing colon in '{0}': expecting IPADDR:PORT", arg);
+            return usage();
+            }
+            string ipaddr = arg.Substring(3, colon-3);
+            string port = arg.Substring(colon+1);
+            ret = doTransfer(ipaddr, port);
+            if (ret != 0)
+            return ret;
+            break;
+
+        default:
+            Console.WriteLine("Unknown option {0}", arg);
+            needHelp = true;
+            break;
+                }
+            } // for args
+
+            if (needHelp)
+        {
+                return usage();
+            }
+
+            return 0;
+        }
+
+    }
+}
diff --git a/base/Applications/Network/NetworkApps.proj b/base/Applications/Network/NetworkApps.proj
new file mode 100644
index 0000000..6989630
--- /dev/null
+++ b/base/Applications/Network/NetworkApps.proj
@@ -0,0 +1,18 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="BlastServer\BlastServer.csproj"/>
+    <ProjectReference Include="HostName\HostName.csproj"/>
+    <ProjectReference Include="IPConfig\IPConfig.csproj"/>
+    <ProjectReference Include="MonNet\MonNet.csproj"/>
+    <ProjectReference Include="Route\Route.csproj"/>
+    <ProjectReference Include="TcpBlast\TcpBlast.csproj"/>
+    <ProjectReference Include="TcpGulp\TcpGulp.csproj"/>
+    <ProjectReference Include="UdpGulp\UdpGulp.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/Network/NetworkCommand.targets b/base/Applications/Network/NetworkCommand.targets
new file mode 100644
index 0000000..8e2f29e
--- /dev/null
+++ b/base/Applications/Network/NetworkCommand.targets
@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Network\CommandLib\CommandLib.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+
+</Project>
diff --git a/base/Applications/Network/Route/Route.cs b/base/Applications/Network/Route/Route.cs
new file mode 100644
index 0000000..6785575
--- /dev/null
+++ b/base/Applications/Network/Route/Route.cs
@@ -0,0 +1,311 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Route.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network {
+
+    [ConsoleCategory(Action="show", HelpMessage="Show network routing information")]
+    internal class ShowConfig {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<RoutingContract.Imp:Start> routingRef;
+
+        reflective internal ShowConfig();
+
+        internal int AppMain() {
+            return Route.Show(this);
+        }
+    }
+
+    [ConsoleCategory(HelpMessage="Add network routing information",DefaultAction=true)]
+    internal class AddConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<RoutingContract.Imp:Start> routingRef;
+
+        [Endpoint]
+        public readonly TRef<IPContract.Imp:Start> ipRef;
+
+        [StringParameter( "destination", Mandatory=true, Position=0, HelpMessage="destination to be added")]
+        internal string destination;
+
+        [StringParameter( "g", Mandatory=true, Position=1,  HelpMessage="Gateway")]
+        internal string gateway;
+        
+        [StringParameter( "i", Default=null, HelpMessage="ifAddress")]
+        internal string ifAddress;
+
+        reflective internal AddConfig();
+
+        internal int AppMain() {
+             Route.Add(this);
+             return 0; 
+        }
+    }
+
+    [ConsoleCategory(Action="delete", HelpMessage="Show network routing information")]
+    internal class DeleteConfig {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<RoutingContract.Imp:Start> routingRef;
+
+        [StringParameter( "address", Mandatory=true, Position=0, HelpMessage="Address to be deleted")]
+        internal string address;
+
+        [StringParameter( "destination", Mandatory=true, Position=0, HelpMessage="Address to be added")]
+        internal string destination;
+      
+        reflective internal DeleteConfig();
+
+        internal int AppMain() {
+            return Route.Delete(this);
+        }
+    }
+
+    /// <summary>
+    /// Class for routing related configuration.
+    /// </summary>
+    public class Route
+    {
+        internal static int Show(ShowConfig! config)
+        {
+            RouteEntry[] in ExHeap routes;
+
+            RoutingContract.Imp routeConn = (config.routingRef).Acquire();
+            if (routeConn == null) {
+                Console.WriteLine("Could not initialize routing endpoint.");
+                return 1;
+            }
+            routeConn.RecvReady();
+
+            routeConn.SendGetRoutingTable();
+            routeConn.RecvRoutingTable(out routes);
+
+            if (routes == null)
+                throw new Exception("routes is null");
+
+            for (int i = 0; i < routes.Length; i++)
+            {
+                Console.WriteLine("Network           : " + ChannelUtils.NetworkToString(routes[i].network));
+                Console.WriteLine("Gateway           : " + ChannelUtils.AddressToString(routes[i].gateway));
+                Console.WriteLine("Interface address : " + ChannelUtils.AddressToString(routes[i].ifaddr));
+                Console.WriteLine("Metric            : " + routes[i].metric);
+                Console.WriteLine(String.Format("Tag               : {0:x8}\n", routes[i].tag));
+            }
+
+            delete routes;
+            delete routeConn; 
+            return 0; 
+        }
+
+        internal static int Add(AddConfig! config)
+        {
+            IPv4 gateway;
+  
+            RoutingContract.Imp routeConn = (config.routingRef).Acquire();
+            if (routeConn == null) {
+                Console.WriteLine("Could not initialize routing endpoint.");
+                return 1;
+            }
+            routeConn.RecvReady();
+
+            if (IPv4.Parse(config.gateway, out gateway) == false)
+            {
+                Console.WriteLine("Could not parse gateway address.");
+                delete routeConn;
+                return -1;
+            }
+
+            try
+            {
+                // note for some reason the compiler doesn't
+                // realize that ifaddr will definitely be assigned if
+                // we survive the if/switch-receive sequence. Work
+                // around that by initializing.
+                IPv4 ifaddr = new IPv4(0);
+
+                if (config.ifAddress == null)
+                {
+                    routeConn.SendFindHostRoute((uint)gateway);
+
+                    switch receive
+                    {
+                        case routeConn.Route(RouteEntry r) :
+                            ifaddr = new IPv4(r.ifaddr);
+                            break;
+
+                        case routeConn.NoRouteFound() :
+                            Console.WriteLine("No route to gateway.");
+                            delete routeConn;
+                            return -1;
+                            break;
+
+                        case routeConn.ChannelClosed() :
+                            Console.WriteLine("routeConn channel closed.");
+                            throw new Exception("routeConn channel closed.");
+                    }
+                }
+                else if (IPv4.Parse(config.ifAddress, out ifaddr) == false)
+                {
+                    Console.WriteLine("Could not parse interface address.");
+                    delete routeConn; 
+                    return -1;
+                }
+
+                IPContract.Imp ipConn = (config.ipRef).Acquire(); 
+                if (ipConn == null)
+                {
+                    Console.WriteLine("Could not initialize IP endpoint.");
+                    delete routeConn; 
+                    return -1;
+                }
+
+                try
+                {
+                    bool isLocal;
+                    ipConn.SendIsLocalAddress((uint)ifaddr);
+                    ipConn.RecvIsLocal(out isLocal);
+
+                    if (!isLocal)
+                    {
+                        Console.WriteLine("Proposed interface address is not bound to an interface.");
+                        delete routeConn; 
+                        return -1;
+                    }
+                }
+                finally
+                {
+                    delete ipConn;
+                    ipConn = null;
+                }
+
+                IPv4Network destination;
+                if (IPv4Network.Parse(config.destination, out destination) == false)
+                {
+                    Console.WriteLine("Could not parse destination address.");
+                    delete routeConn;
+                    return  -1;
+                }
+
+                NetStack.Contracts.Network nwrk = new NetStack.Contracts.Network();
+                nwrk.network = (uint)destination.Network;
+                nwrk.netmask = (uint)destination.NetMask;
+                routeConn.SendAddRoute(nwrk, (uint)gateway, (uint)ifaddr);
+
+                switch receive
+                {
+                    case routeConn.Err() :
+                        Console.WriteLine("Route could not be added -- it may already exist.");
+                        break;
+
+                    case routeConn.OK() :
+                        Console.WriteLine("Route added successfully");
+                        break;
+
+                    case routeConn.ChannelClosed() :
+                        throw new Exception("routeConn channel closed");
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Exception: {0}", e);
+            }
+            delete routeConn; 
+            return 0;
+        }
+
+        internal static int Delete(DeleteConfig! config)
+        {
+            RoutingContract.Imp routeConn = (config.routingRef).Acquire();
+            if (routeConn == null)
+            {
+                Console.WriteLine("Could not initialize routing endpoint.");
+                return 1;
+            }
+            routeConn.RecvReady();
+
+            IPv4Network destination;
+            if (IPv4Network.Parse(config.destination, out destination) == false)
+            {
+                Console.WriteLine("Could not parse destination address.");
+            }
+
+            Network destNet = ChannelUtils.NetworkToChannelNetwork(destination);
+            routeConn.SendFindSpecificNetRoute(destNet);
+
+            switch receive
+            {
+                case routeConn.NoRouteFound() :
+                    Console.WriteLine("No route for destination.");
+                    delete routeConn; 
+                    return -1;
+
+                case routeConn.Route(RouteEntry r) :
+                    // Do nothing; success.
+                    break;
+
+                case routeConn.ChannelClosed() :
+                    Console.WriteLine("routeConn channel closed.");
+                    throw new Exception("routeConn channel closed.");
+            }
+
+            routeConn.SendDeleteRoute(destNet);
+
+            switch receive
+            {
+                case routeConn.NoRouteFound() :
+                    Console.WriteLine("Unexpected error attempting to delete the route");
+                    break;
+
+                case routeConn.OK() :
+                    Console.WriteLine("Route successfully deleted");
+                    break;
+
+                case routeConn.ChannelClosed() :
+                    Console.WriteLine("routeConn channel closed");
+                    throw new Exception("routeConn channel closed");
+            }
+            delete routeConn; 
+            return 0;
+        }
+    } // end class Route
+}
diff --git a/base/Applications/Network/Route/Route.csproj b/base/Applications/Network/Route/Route.csproj
new file mode 100644
index 0000000..acf4023
--- /dev/null
+++ b/base/Applications/Network/Route/Route.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>route</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Route.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/TcpBlast/TcpBlast.csproj b/base/Applications/Network/TcpBlast/TcpBlast.csproj
new file mode 100644
index 0000000..80cd67d
--- /dev/null
+++ b/base/Applications/Network/TcpBlast/TcpBlast.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>TcpBlast</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="TcpBlast.sg" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/TcpBlast/TcpBlast.sg b/base/Applications/Network/TcpBlast/TcpBlast.sg
new file mode 100644
index 0000000..8925d1d
--- /dev/null
+++ b/base/Applications/Network/TcpBlast/TcpBlast.sg
@@ -0,0 +1,186 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpBlast.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network
+{
+    [ConsoleCategory(HelpMessage="Blast TCP data to a ipAddress, port", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<TcpContract.Imp:Start> tcpRef;
+
+        [StringParameter( "address", Mandatory=true, Position=0, HelpMessage="IP Address to receive from")]
+        internal string address;
+
+
+        [LongParameter( "port", Mandatory=true, Position=1, HelpMessage="port to gulp from ")]
+        internal long port;
+
+
+        [LongParameter( "numBytes", Mandatory=true, Position=2, HelpMessage="Total bytes to send")]
+        internal long numBytes;
+
+
+        [LongParameter( "chunkSize", Mandatory=true, Position=3, HelpMessage="Chunks size to send")]
+        internal long chunkSize;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return TcpBlast.AppMain(this);
+        }
+    }
+
+    public class TcpBlast
+    {
+        private const string RepeatPattern = "Here is a repeating string of text that serves as content. ";
+
+        public static int Blast([Claims] TcpConnectionContract.Imp:ReadyState! tcpConn, 
+            IPv4 address, ushort port, uint numBytes, uint chunkSize)
+        {
+            Console.WriteLine("TcpBlast to {0} at port {1} for {2} bytes in {3}-byte chunks",
+                              address, port, numBytes, chunkSize);
+
+            Console.Write("Connecting...");
+
+            try
+            {
+                // Try to connect to the remote host
+                tcpConn.SendConnect((uint)address, port);
+
+                switch receive
+                {
+                    case tcpConn.CouldNotConnect(TcpError error) :
+                        Console.WriteLine("Failed to connect: TcpError = " + System.Net.Sockets.TcpException.GetMessageForTcpError(error));
+                        delete tcpConn;
+                        return -1;
+                    break;
+
+                    case tcpConn.OK() :
+                        // success;
+                        break;
+
+                    case tcpConn.ChannelClosed() :
+                        // how rude
+                        Console.WriteLine("Netstack channel closed unexpectedly");
+                        delete tcpConn;
+                        return -1;
+                        break;
+                }
+
+                Console.WriteLine("Connected");
+                byte[] in ExHeap buf;
+                uint bytesLeft = numBytes, patternLength = (uint)RepeatPattern.Length;
+
+                while (bytesLeft > 0) {
+                    uint thisPass = chunkSize < bytesLeft ? chunkSize : bytesLeft;
+                    buf = new[ExHeap] byte[thisPass];
+
+                    for (uint i = 0; i < thisPass; i++) {
+                        buf[(int)i] = (byte)RepeatPattern[(int)i % (int)patternLength];
+                    }
+
+                    tcpConn.SendWrite(buf);
+
+                    switch receive
+                    {
+                        case tcpConn.OK() :
+                            break;
+
+                        case tcpConn.CantSend() :
+                            Console.WriteLine("Connection closed unexpectedly");
+                            delete tcpConn;
+                            return -1;
+                            break;
+                    }
+
+                    bytesLeft -= thisPass;
+                }
+
+                tcpConn.SendClose();
+                delete tcpConn;
+                Console.WriteLine("Done");
+            }
+            catch (Exception e) {
+                Console.WriteLine("Unexpected exception: {0}", e);
+            }
+
+            return 0;
+        }
+
+        public static void Usage()
+        {
+            Console.WriteLine("tcpgulp <ipAddress> <port> <numBytes> <chunkSize>");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            IPv4 host;
+            try {
+                host = IPv4.Parse(config.address);
+            }
+            catch (FormatException e) {
+                Console.WriteLine("{0}: {1}", e, config.address);
+                return -1;
+            }
+
+
+            if (config.port  >  65536 || config.port < 0) {
+                Console.WriteLine("Port number out of range: {0}", config.port);
+                return -1;
+            }
+    
+            ushort port = (ushort) config.port; 
+            uint numBytes = (uint) config.numBytes;
+            uint chunkSize = (uint) config.chunkSize;
+
+            TcpContract.Imp tcpConn = (config.tcpRef).Acquire(); 
+            if (tcpConn == null)
+            {
+                Console.WriteLine("Could not initialize TCP endpoint.");
+                return 1;
+            }
+            tcpConn.RecvReady(); 
+            
+            TcpConnectionContract.Imp! connImp;
+            TcpConnectionContract.Exp! connExp;
+            TcpConnectionContract.NewChannel(out connImp, out connExp);
+
+            tcpConn.SendCreateTcpSession(connExp);
+            connImp.RecvReady();
+            delete tcpConn;
+            
+            return Blast(connImp, host, port, numBytes, chunkSize);
+        }
+    } // end class TcpBlast
+}
diff --git a/base/Applications/Network/TcpGulp/TcpGulp.cs b/base/Applications/Network/TcpGulp/TcpGulp.cs
new file mode 100644
index 0000000..5dda84d
--- /dev/null
+++ b/base/Applications/Network/TcpGulp/TcpGulp.cs
@@ -0,0 +1,206 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpGulp.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network
+{
+    [ConsoleCategory(HelpMessage="Blast TCP data to a ipAddress, port", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<TcpContract.Imp:Start> tcpRef;
+
+        [StringParameter( "ipAddress", Mandatory=true, Position=0, HelpMessage="IP Address to send to")]
+        internal string ipAddress;
+
+
+        [StringParameter( "port", Mandatory=true, Position=1, HelpMessage="port to blats")]
+        internal string port;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return TcpGulp.AppMain(this);
+        }
+    }
+
+    public class TcpGulp
+    {
+        public static int Gulp(TcpConnectionContract.Imp:ReadyState! tcpConn, IPv4 address, ushort port)
+        {
+            Console.WriteLine("TcpGulp({0}, {1})", address, port);
+
+            try
+            {
+                // Try to connect to the remote host
+                tcpConn.SendConnect((uint)address, port);
+
+                switch receive
+                {
+                    case tcpConn.CouldNotConnect(TcpError error):
+                    {
+                        Console.WriteLine("Failed to connect: TcpError = " + System.Net.Sockets.TcpException.GetMessageForTcpError(error));
+                        return -1;
+                    }
+                    break;
+
+                    case tcpConn.OK() :
+                        // success;
+                        break;
+
+                    case tcpConn.ChannelClosed() :
+                        // how rude
+                        Console.WriteLine("Netstack channel closed unexpectedly");
+                        return -1;
+                        break;
+                }
+
+                Console.WriteLine("Connected");
+                bool connected = true;
+                int messages = 0; 
+                int bytesRead = 0; 
+                
+                while(connected)
+                {
+                    tcpConn.SendRead();
+
+                    switch receive
+                    {
+                        case tcpConn.Data(byte[]! in ExHeap data) :
+                            //Console.Write('.'); 
+                            messages++; 
+                            bytesRead += data.Length; 
+#if false                            
+                            Console.WriteLine("Read {0} bytes :", data.Length);
+
+                            for(int i = 0; i < data.Length; ++i)
+                            {
+                                if (data[i] < 32)
+                                { Console.Write("<" + (int)data[i] + ">"); }
+                                else
+                                { Console.Write((char)data[i]); }
+                            }
+#endif 
+                            delete data;
+                            break;
+
+                        case tcpConn.ConnectionClosed() :
+                            tcpConn.SendClose(); // Zombie -> Closed
+                            connected = false;
+                            break;
+
+                        case tcpConn.NoMoreData() :
+                            // We're never going to send anything
+                            tcpConn.SendClose(); // SendOnly -> Closed
+                            connected = false;
+                            break;
+
+                        case tcpConn.ChannelClosed() :
+                            // How rude
+                            connected = false;
+                            break;
+                    }
+                }
+
+                Console.WriteLine("\nConnection closed");
+                Console.WriteLine("got {0} messages {1} bytes ",
+                    messages, bytesRead); 
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Unexpected exception: {0}", e);
+            }
+            finally
+            {
+            }
+
+            return 0;
+        }
+
+        public static void Usage()
+        {
+            Console.WriteLine("tcpgulp <ipAddress> <port>");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            IPv4 host;
+
+
+
+            try
+            {
+                host = IPv4.Parse(config.ipAddress);
+            }
+            catch (FormatException e)
+            {
+                Console.WriteLine("{0}: {1}", e, config.ipAddress);
+                return -1;
+            }
+
+            ushort port;
+            try
+            {
+                port = UInt16.Parse(config.port);
+            }
+            catch (FormatException)
+            {
+                Console.WriteLine("Malformed port number: {0}", config.port);
+                return -1;
+            }
+            catch (OverflowException)
+            {
+                Console.WriteLine("Port number out of range: {0}", config.port);
+                return -1;
+            }
+
+            TcpContract.Imp tcpConn = (config.tcpRef).Acquire(); 
+            if (tcpConn == null)
+            {
+                Console.WriteLine("Could not initialize TCP endpoint.");
+                return 1;
+            }
+            tcpConn.RecvReady(); 
+            
+            TcpConnectionContract.Imp! connImp;
+            TcpConnectionContract.Exp! connExp;
+            TcpConnectionContract.NewChannel(out connImp, out connExp);
+
+            tcpConn.SendCreateTcpSession(connExp);
+            connImp.RecvReady();
+            delete tcpConn;
+
+            int result =  Gulp(connImp, host, port);
+            delete connImp;
+            return result; 
+        }
+    } // end class TcpGulp
+}
diff --git a/base/Applications/Network/TcpGulp/TcpGulp.csproj b/base/Applications/Network/TcpGulp/TcpGulp.csproj
new file mode 100644
index 0000000..d3c5c88
--- /dev/null
+++ b/base/Applications/Network/TcpGulp/TcpGulp.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>TcpGulp</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="TcpGulp.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/UdpBlast/UdpBlast.cs b/base/Applications/Network/UdpBlast/UdpBlast.cs
new file mode 100644
index 0000000..817a30e
--- /dev/null
+++ b/base/Applications/Network/UdpBlast/UdpBlast.cs
@@ -0,0 +1,248 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpBlast.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network {
+    [ConsoleCategory(HelpMessage="Send UDP data to and ipAddress and port",
+                     DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<UdpContract.Imp:Start> udpRef;
+
+        [LongParameter("p", Mandatory=false, HelpMessage="Packet size (bytes)", Default = 1500)]
+        internal long packetBytes;
+
+        [LongParameter("r", Mandatory=false, HelpMessage="Transmission rate in bits per second", Default = 64000)]
+        internal long bitsPerSecond;
+
+        [LongParameter("t", Mandatory=false, HelpMessage="Seconds to send packets for", Default = 30)]
+        internal long seconds;
+
+        [BoolParameter("v", Mandatory=false, HelpMessage="Verbose output", Default = true)]
+        internal bool verbose;
+
+        [StringParameter("Address", Mandatory=true, Position=0, HelpMessage="Destination IP Address")]
+        internal string address;
+
+        [LongParameter("port", Mandatory=true, Position=1, HelpMessage="Destination UDP port")]
+        internal long port;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return UdpBlast.AppMain(this);
+        }
+    }
+
+    public class UdpBlast
+    {
+        private const uint FixedHeaderBytes = 42; // Ether + IP + UDP
+
+        private static bool verbose;
+
+        public static void VerboseWriteLine(string format,
+                                            params Object [] args)
+        {
+            string msg = String.Format(format, args);
+            DebugStub.WriteLine(msg);
+            if (verbose) {
+                Console.WriteLine(format, args);
+            }
+        }
+
+        private static void
+        SendPackets(
+            UdpConnectionContract.Imp:ReadyState! udpConn,
+            long   bitsPerSecond,
+            uint   bytesPerPacket,
+            long   durationSeconds
+            )
+        {
+            DateTime startTime  = DateTime.Now;
+            DateTime endTime    = (startTime +
+                                   TimeSpan.FromSeconds(durationSeconds));
+
+            DateTime secondStart = startTime;
+            DateTime secondEnd   = startTime + TimeSpan.FromSeconds(1);
+
+            DateTime now = startTime;
+
+            uint second         = 0;
+            long bitsThisSecond = 0;
+            long totalBits      = 0;
+
+            while (now < endTime) {
+                int pps = 0;
+
+                while (now < secondEnd && bitsThisSecond < bitsPerSecond) {
+                    // XXX: Just bursting packets out for
+                    // now rather than pacing them,
+                    // interested mainly in saturation case.
+                    byte[] in ExHeap pkt;
+                    uint pktSize;
+                    if ((long)bytesPerPacket * 8 < bitsPerSecond - bitsThisSecond) {
+                        pktSize = bytesPerPacket;
+                    }
+                    else {
+                        pktSize = (uint)((bitsPerSecond - bitsThisSecond) / 8);
+                        if (pktSize <= FixedHeaderBytes) {
+                            pktSize = FixedHeaderBytes + 1;
+                        }
+                    }
+                    pkt = new [ExHeap] byte [pktSize - FixedHeaderBytes];
+                    udpConn.SendWrite(pkt);
+                    udpConn.RecvOK();
+                    bitsThisSecond += pktSize * 8;
+                    now = DateTime.Now;
+                    pps++;
+                }
+
+                while (now < secondEnd) {
+                    Thread.Sleep(0);
+                    now = DateTime.Now;
+                }
+
+                TimeSpan tau = secondEnd - secondStart;
+                VerboseWriteLine(
+                    "Round {0} duration(secs) {1:f2} rate (pps) {2} rate (bps) {3:e3}",
+                    second, tau.TotalSeconds,
+                    pps,
+                    bitsThisSecond / tau.TotalSeconds);
+                second++;
+                totalBits      += bitsThisSecond;
+                bitsThisSecond  = 0;
+                secondStart     = now;
+                secondEnd       = now + TimeSpan.FromSeconds(1);
+            }
+
+            Console.WriteLine(
+                "Average rate: {0:e3} bps",
+                totalBits / (now - startTime).TotalSeconds
+                );
+        }
+
+        public static int
+        Blast(
+            [Claims] UdpConnectionContract.Imp:ReadyState! udpConn,
+            IPv4   address,
+            ushort port,
+            long   bitsPerSecond,
+            long   bytesPerPacket,
+            long   durationSeconds
+            )
+        {
+            Console.WriteLine("UdpBlast({0}, {1})", address, port);
+
+            try {
+                udpConn.SendConnectWithAnyLocalEndPoint((uint)address, port);
+
+                switch receive {
+                    case udpConn.OK() :
+                        // success;
+                        Console.WriteLine("Connected");
+                        break;
+
+                    case udpConn.InvalidEndPoint(ip, rejectedPort) :
+                        throw new Exception("udpConn address and port rejected");
+
+                    case udpConn.ChannelClosed() :
+                        throw new Exception("udpConn channel closed");
+                }
+
+                SendPackets(udpConn,
+                            bitsPerSecond,
+                            (uint)bytesPerPacket,
+                            durationSeconds);
+                Console.WriteLine("Closing connection");
+
+                udpConn.SendClose();
+            }
+            catch (Exception e) {
+                Console.WriteLine("Unexpected exception: {0}", e);
+            }
+            finally {
+                delete udpConn;
+            }
+
+            return 0;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            IPv4 host;
+            try {
+                host = IPv4.Parse(config.address);
+            }
+            catch (FormatException e) {
+                Console.WriteLine("{0}: {1}", e, config.address);
+                return -1;
+            }
+
+            if (config.port  >  65536 || config.port < 0) {
+                Console.WriteLine("Port number out of range: {0}", config.port);
+                return -1;
+            }
+            ushort port = (ushort) config.port;
+
+            if ((uint)config.packetBytes < FixedHeaderBytes) {
+                Console.WriteLine("Packet size needs to be larger than fixed header size ({0} bytes)", FixedHeaderBytes);
+                return -1;
+            }
+
+            UdpBlast.verbose = config.verbose;
+
+            UdpContract.Imp udpConn = ((!)config.udpRef).Acquire();
+            if (udpConn == null) {
+                Console.WriteLine("Could not initialize TCP endpoint.");
+                return 1;
+            }
+            udpConn.RecvReady();
+
+            UdpConnectionContract.Imp! connImp;
+            UdpConnectionContract.Exp! connExp;
+            UdpConnectionContract.NewChannel(out connImp, out connExp);
+
+            udpConn.SendCreateUdpSession(connExp);
+            connImp.RecvReady();
+            delete udpConn;
+
+            return Blast(connImp,
+                         host, port,
+                         config.bitsPerSecond,
+                         config.packetBytes,
+                         config.seconds
+                         );
+        }
+    } // end class UdpBlast
+}
diff --git a/base/Applications/Network/UdpBlast/UdpBlast.csproj b/base/Applications/Network/UdpBlast/UdpBlast.csproj
new file mode 100644
index 0000000..368ad66
--- /dev/null
+++ b/base/Applications/Network/UdpBlast/UdpBlast.csproj
@@ -0,0 +1,27 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>UdpBlast</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="UdpBlast.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Network/UdpGulp/UdpGulp.cs b/base/Applications/Network/UdpGulp/UdpGulp.cs
new file mode 100644
index 0000000..e533446
--- /dev/null
+++ b/base/Applications/Network/UdpGulp/UdpGulp.cs
@@ -0,0 +1,189 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpGulp.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Diagnostics;
+using System.Net.IP;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network
+{
+    [ConsoleCategory(HelpMessage="Receive UDP data from a ipAddress, port",
+                     DefaultAction = true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<UdpContract.Imp:Start> udpRef;
+
+        [LongParameter("t", Mandatory = false, HelpMessage = "Seconds to send packets for", Default = 30)]
+        internal long seconds;
+
+        [StringParameter("a", Mandatory = false, HelpMessage = "Local address to bind to.", Default = "0.0.0.0")]
+        internal string address;
+
+        [LongParameter("port", Mandatory = true, Position = 0, HelpMessage = "port to gulp from")]
+        internal long port;
+
+        reflective internal Parameters();
+
+        internal int AppMain()
+        {
+            return UdpGulp.AppMain(this);
+        }
+    }
+
+    public class UdpGulp
+    {
+        private const int FixedHeaderBytes = 42;    // Ether + IP + UDP
+
+        private static void
+        ReceivePackets(
+            UdpConnectionContract.Imp:ReadyState! udpConn,
+            long totalSeconds
+            )
+        {
+            int      bytesThisRound   = 0;
+
+            DateTime now        = DateTime.Now;
+            DateTime epochEnd   = now + TimeSpan.FromSeconds(1);
+            DateTime epochStart = now;
+
+            while (--totalSeconds >= 0) {
+                while (now < epochEnd) {
+                    udpConn.SendPollRead((epochEnd - now).Milliseconds);
+                    switch receive {
+                        case udpConn.NoData() :
+                            // No data to read. This doesn't
+                            // necessarily mean the connection
+                            // is closed.
+                            Thread.Yield();
+                        break;
+                    case udpConn.Data(uint addr, ushort port2,
+                                      byte[]! in ExHeap data):
+                        bytesThisRound += data.Length + FixedHeaderBytes;
+                        delete data;
+                        break;
+                    case udpConn.ChannelClosed():
+                        throw new Exception("udpConn channel closed");
+                    }
+                    now = DateTime.Now;
+                }
+
+                TimeSpan delta = now - epochStart;
+                Console.WriteLine(
+                    "Duration(s) {0:f2} rate(bps) {1:e3} bps",
+                    delta.TotalSeconds,
+                    8.0 * bytesThisRound / delta.TotalSeconds);
+                bytesThisRound = 0;
+                epochStart     = DateTime.Now;
+                epochEnd       = epochStart + TimeSpan.FromSeconds(1);
+            }
+        }
+
+        public static int
+        Gulp([Claims] UdpConnectionContract.Imp:ReadyState! udpConn,
+             IPv4   address,
+             ushort port,
+             long   totalSeconds)
+        {
+            Console.WriteLine("UdpGulp({0}, {1})", address, port);
+
+            try {
+                // Bind local endpoint
+                udpConn.SendBindLocalEndPoint((uint)address, port);
+
+                switch receive {
+                    case udpConn.OK() :
+                        // success;
+                        Console.WriteLine("Connected");
+                        break;
+
+                    case udpConn.InvalidEndPoint(ip, rejectedPort) :
+                        throw new Exception("udpConn address and port rejected");
+
+                    case udpConn.ChannelClosed() :
+                        throw new Exception("udpConn channel closed");
+                }
+
+                ReceivePackets(udpConn, totalSeconds);
+
+                Console.WriteLine("Closing connection");
+                udpConn.SendClose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Unexpected exception: {0}", e);
+            }
+            finally {
+                delete udpConn;
+            }
+            return 0;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            IPv4 host;
+            try {
+                host = IPv4.Parse(config.address);
+            }
+            catch (FormatException e) {
+                Console.WriteLine("{0}: {1}", e, config.address);
+                return -1;
+            }
+
+            if (config.port > 0xffff || config.port < 0) {
+                Console.WriteLine("Port number out of range: {0}",
+                                  config.port);
+                return -1;
+            }
+            ushort port = (ushort) config.port;
+
+            UdpContract.Imp udpConn = (config.udpRef).Acquire();
+            if (udpConn == null) {
+                Console.WriteLine("Could not initialize TCP endpoint.");
+                return 1;
+            }
+
+            Console.WriteLine("Waiting for ready");
+            udpConn.RecvReady();
+
+            UdpConnectionContract.Imp! connImp;
+            UdpConnectionContract.Exp! connExp;
+            UdpConnectionContract.NewChannel(out connImp, out connExp);
+
+            Console.WriteLine("Creating session");
+            udpConn.SendCreateUdpSession(connExp);
+            connImp.RecvReady();
+            delete udpConn;
+            Console.WriteLine("Ready");
+            return Gulp(connImp, host, port, config.seconds);
+        }
+    } // end class UdpGulp
+}
diff --git a/base/Applications/Network/UdpGulp/UdpGulp.csproj b/base/Applications/Network/UdpGulp/UdpGulp.csproj
new file mode 100644
index 0000000..1613eb9
--- /dev/null
+++ b/base/Applications/Network/UdpGulp/UdpGulp.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>UdpGulp</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="UdpGulp.cs" />
+  </ItemGroup>
+
+  <Import Project="..\NetworkCommand.targets" />
+
+</Project>
diff --git a/base/Applications/Paths.targets b/base/Applications/Paths.targets
new file mode 100644
index 0000000..57e0203
--- /dev/null
+++ b/base/Applications/Paths.targets
@@ -0,0 +1,16 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Paths.targets
+#
+#   Note:
+#
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Targets\Paths.targets"/>
+</Project>
diff --git a/base/Applications/PingPongIntTest/PingPongIntTest.csproj b/base/Applications/PingPongIntTest/PingPongIntTest.csproj
new file mode 100644
index 0000000..34ee103
--- /dev/null
+++ b/base/Applications/PingPongIntTest/PingPongIntTest.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>PingPongIntTest</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="PingPongIntTest.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/PingPongIntTest/PingPongIntTest.sg b/base/Applications/PingPongIntTest/PingPongIntTest.sg
new file mode 100644
index 0000000..f937d2d
--- /dev/null
+++ b/base/Applications/PingPongIntTest/PingPongIntTest.sg
@@ -0,0 +1,38 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PingPongIntTest.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Processor;
+
+
+namespace Microsoft.Singularity.Applications
+{
+    public class PingPongIntTest
+    {
+        public static int Main(String[] args)
+        {
+            Console.WriteLine("PingPongIntTest World!");
+
+            //uint a, b, c, d;
+            //Processor.ReadCpuid(0, out a, out b, out c, out d);
+
+            int retval = ProcessService.RunPingPongInt(7);
+            if (retval == 0) {
+                Console.WriteLine("  Retval: {0} -- successful", retval);
+            }
+            else {
+                Console.WriteLine("  Retval: {0} -- fail", retval);
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Play/Play.csproj b/base/Applications/Play/Play.csproj
new file mode 100644
index 0000000..79b6801
--- /dev/null
+++ b/base/Applications/Play/Play.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Play</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+    <ProjectGuid>{C9030FC5-CDB7-4F5B-980C-5B72F8B92232}</ProjectGuid>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Play.sg" />
+    <BinaryResource Include="Resources\*.wav">
+      <ClassName>WavAudio</ClassName>
+      <Namespace>Microsoft.Singularity.Applications</Namespace>
+      <FieldName>Content</FieldName>
+      <OutputAsArray>true</OutputAsArray>
+    </BinaryResource>
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+</Project>
diff --git a/base/Applications/Play/Play.sg b/base/Applications/Play/Play.sg
new file mode 100644
index 0000000..d2b45b0
--- /dev/null
+++ b/base/Applications/Play/Play.sg
@@ -0,0 +1,139 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Play.sg
+//
+//  Note:   Simple audio test program.
+//
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Contracts;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+    
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    // use driver category for now.
+    // Once the appropriate categories have been defined this will need to change
+    // Also waiting for Compile Time reflection to eliminate static constructor etc.
+
+    [ConsoleCategory(DefaultAction=true)]
+    internal  sealed class PlayConfiguration 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<SoundDeviceContract.Imp:Start> ImpRef;
+
+        reflective internal PlayConfiguration();
+
+        internal int AppMain() {
+            return Play.AppMain(this);
+        }
+
+    }
+
+    public class Play
+    {
+        private static SoundDeviceContract.Imp:Ready OpenSoundDevice(PlayConfiguration! config)
+        {
+            // extract imp handed in as part of process creation
+            SoundDeviceContract.Imp! imp = (config.ImpRef).Acquire();
+
+            // get it into the ready state
+            Console.WriteLine("[{0}] Waiting for SB channel.", Thread.CurrentThread.GetThreadId());
+            switch receive
+            {
+                case imp.Success():
+                    Console.WriteLine("[{0}] Got SB channel.", Thread.CurrentThread.GetThreadId());
+                    break;
+                case imp.ContractNotSupported():
+                    delete imp;
+                    throw new Exception("Didn't Get SB channel. (ContractNotSupported)");
+                case imp.ChannelClosed():
+                    delete imp;
+                    throw new Exception("Didn't Get SB channel. (Channel closed)");
+            }
+            return imp;
+        }
+
+        internal static int AppMain(PlayConfiguration! config)
+        {
+            if (WavAudio.Content == null || WavAudio.Content.Length == 0) {
+                Console.WriteLine("No WAV audio to play.");
+                return 1;
+            }
+
+            return DoPlay(config);
+
+            return 0;
+        }
+
+        private static int DoPlay(PlayConfiguration! config) {
+            SoundDeviceContract.Imp audio = OpenSoundDevice(config);
+            if (audio == null) {
+                Console.WriteLine("Couldn't open audio device.");
+                return 2;
+            }
+
+            int threadId = Thread.CurrentThread.GetThreadId();
+
+            assume WavAudio.Content != null;
+
+            try {
+                for (int i = 0; i < WavAudio.Content.Length; i++) {
+                    Console.WriteLine("[{1}] Playing WAV audio {0}.", i, threadId);
+
+                    byte[] wav = (!)WavAudio.Content[i];
+
+                    byte[] in ExHeap buffer = Bitter.FromByteArray(wav);
+
+                        // Copy contents into buffer WavAudio.Content[i]
+
+                        audio.SendPlayWav(buffer);
+                        switch receive
+                        {
+                            case audio.RecvAckPlayWav(oldbuffer):
+                                Console.WriteLine("[{1}] Done playing WAV audio {0}.", i,
+                                                  threadId);
+                            delete oldbuffer;
+                            break;
+
+                        case audio.RecvNakPlayWav(oldbuffer):
+                            Console.WriteLine("[{1}] Failed to play WAV audio {0}.",
+                                              i, threadId);
+                            delete oldbuffer;
+                            break;
+
+                        case audio.ChannelClosed():
+                            Console.WriteLine("[{1}] SoundDevice channel closed unexpectedly {0}.",
+                                                  i, threadId);
+                            return 1;
+                    }
+                }
+            }
+            finally {
+                delete audio;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Play/Resources/wav16m.wav b/base/Applications/Play/Resources/wav16m.wav
new file mode 100644
index 0000000..dd2bbc3
Binary files /dev/null and b/base/Applications/Play/Resources/wav16m.wav differ
diff --git a/base/Applications/Play/Resources/wav16s.wav b/base/Applications/Play/Resources/wav16s.wav
new file mode 100644
index 0000000..92f206c
Binary files /dev/null and b/base/Applications/Play/Resources/wav16s.wav differ
diff --git a/base/Applications/Play/Resources/wav8m.wav b/base/Applications/Play/Resources/wav8m.wav
new file mode 100644
index 0000000..66e3d9d
Binary files /dev/null and b/base/Applications/Play/Resources/wav8m.wav differ
diff --git a/base/Applications/Pong/Pong.cs b/base/Applications/Pong/Pong.cs
new file mode 100644
index 0000000..4049e59
--- /dev/null
+++ b/base/Applications/Pong/Pong.cs
@@ -0,0 +1,663 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Pong.cs
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.GC;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Channels;
+using Keyboard = Microsoft.Singularity.Io.Keyboard;
+
+namespace Microsoft.Singularity.Shell
+{
+    public class Pong
+    {
+        const int screenWidth = 1024;
+        const int screenHeight = 768;
+
+        const int paddleWidth = 16;
+        const int paddleHeight = 128;
+
+        const int ballSize = 8;
+
+        const double paddleSpeed = 0.20;
+        const double ballSpeed = 0.35;
+
+        const double ballStartAngle = Math.PI / 8;
+        const double ballMaxAngle = Math.PI / 3;
+
+        const int screenMinX = 0;
+        const int screenMinY = 0;
+
+        const int screenMaxX = screenMinX + screenWidth - 1;
+        const int screenMaxY = screenMinY + screenHeight - 1;
+
+        const int paddleMin = screenMinY;
+        const int paddleMax = screenMaxY - paddleHeight;
+
+        const int ballMinX = screenMinX + paddleWidth;
+        const int ballMaxX = screenMaxX - paddleWidth - ballSize;
+
+        const int ballMinY = screenMinY;
+        const int ballMaxY = screenMaxY - ballSize;
+
+        const int paddleInit = screenMinY + ((screenHeight - paddleHeight) / 2);
+
+        double ballX = 0.0;
+        double ballY = 0.0;
+        double ballAngle = 0.0;
+
+        int ballDrawX = 0;
+        int ballDrawY = 0;
+
+        double[] paddlesY = new double [2] { paddleInit, paddleInit };
+
+        int[] paddlesDrawX = new int [2] { screenMinX,
+                                           screenMaxX - paddleWidth + 1 };
+
+        int[] paddlesDrawY = new int [2] { paddleInit, paddleInit };
+
+        bool[] inputUp   = new bool [2] { false, false };
+        bool[] inputDown = new bool [2] { false, false };
+
+        int[] scores = new int [2] { 0, 0 };
+
+        int lastWinner = 0;
+
+        bool done = false;
+        bool playing = false;
+
+        ISvgaDevice svga = null;
+
+        Random random = new Random();
+
+        public static KeyboardDeviceContract.Imp OpenKeyboard(string! devName)
+        {
+            KeyboardDeviceContract.Exp! exp;
+            KeyboardDeviceContract.Imp! imp;
+            KeyboardDeviceContract.NewChannel(out imp, out exp);
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            bool success = false;
+            ns.SendBind(Bitter.FromString2(devName),exp);
+            switch receive
+            {
+                case ns.AckBind():
+                    success = true;
+                    break;
+                case ns.NakBind(exp):
+                    delete exp;
+                    break;
+                case ns.ChannelClosed():
+                    break;
+            }
+
+            if (!success)
+            {
+                DebugStub.Print("OpenKeyboard lookup of {0} failed.\n",
+                                __arglist(devName);
+
+                delete imp;
+                delete ns;
+                return null;
+            }
+
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case unsatisfiable:
+                    throw new Exception("Didn't imp.RecvAckConnect");
+                    break;
+            }
+
+            delete ns;
+            return imp;
+        }
+
+
+        public static VideoDeviceContract.Imp OpenVideo(string! devName)
+        {
+            VideoDeviceContract.Exp! exp;
+            VideoDeviceContract.Imp! imp;
+            VideoDeviceContract.NewChannel(out imp, out exp);
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            bool success = false;
+            ns.SendBind(Bitter.FromString2(devName),exp);
+            switch receive
+            {
+                case ns.AckBind():
+                    success = true;
+                    break;
+                case ns.NakBind(reject):
+                    delete reject;
+                    break;
+                case ns.ChannelClosed():
+                    break;
+            }
+
+            if (!success)
+            {
+                DebugStub.Print("OpenVideo lookup of {0} failed.\n",
+                                __arglist(devName));
+
+                delete imp;
+                delete ns;
+                return null;
+            }
+
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case unsatisfiable:
+                    throw new Exception("Didn't imp.RecvAckConnect");
+                    break;
+            }
+
+            delete ns;
+            return imp;
+        }
+
+        public static int Main(string[] args)
+        {
+            VideoDeviceContract.Imp video = OpenVideo("/dev/video");
+
+            Console.WriteLine("Singularity Slide Show Viewer (PID={0})",
+                              ProcessService.GetCurrentProcessId());
+
+            if (video == null)
+            {
+                Console.WriteLine("Can only display slides on a graphic display.");
+                return 1;
+            }
+            if (Slides.Content == null || Slides.Content.Length == 0)
+            {
+                Console.WriteLine("No slides to display.");
+                delete video;
+                return 1;
+            }
+
+            KeyboardDeviceContract.Imp keyboard = OpenKeyboard("/dev/keyboard");
+            if (keyboard == null) {
+                // TODO: show keyboardless slides with timer?
+                delete video;
+                return 1;
+            }
+            int slide = 0;
+
+            byte[] currentSlide = (!)Slides.Content[slide];
+            byte * opt(ExHeap[]) current = new[ExHeap] byte [currentSlide.Length];
+            Bitter.FromByteArray(current, 0, currentSlide.Length,
+                                 currentSlide, 0);
+            video.SendFill(0, 0, 1023, 767, 0);
+            video.RecvAckFill();
+            video.SendBitBltBmp(32, 16, current);
+            video.RecvAckBitBltBmp(out current);
+
+            for (;;)
+            {
+                int x;
+                int y;
+                bool go_back = false;
+                bool go_fore = false;
+                bool go_home = false;
+                bool go_end = false;
+
+                uint key = 0;
+                keyboard.SendGetKey();
+                switch receive
+                {
+                    case keyboard.AckKey(ikey):
+                        key = ikey;
+                        break;
+                    case keyboard.NakKey():
+                        break;
+                    case unsatisfiable:
+                        throw new Exception("Didn't get reply from Keyboard");
+                }
+
+                if (key == 0) {
+                    Tracing.Log(Tracing.Warning, "GetKey failed.");
+                    break;
+                }
+                if ((key & (uint)Keyboard.Qualifiers.KEY_DOWN) == 0)
+                {
+                    continue;
+                }
+                if ((key & (uint)Keyboard.Qualifiers.KEY_MOUSE) == 0)
+                {
+                    char c = (char)(key & (uint)Keyboard.Qualifiers.KEY_BASE_CODE);
+
+                    switch (c)
+                    {
+                        case (char)Keyboard.Keys.ESCAPE:
+                            delete video;
+                            delete keyboard;
+                            delete current;
+                            return 0;
+                        case (char)Keyboard.Keys.HOME:
+                            go_home = true;
+                            break;
+                        case (char)Keyboard.Keys.UP_ARROW:
+                        case (char)Keyboard.Keys.LEFT_ARROW:
+                        case (char)Keyboard.Keys.PAGE_UP:
+                        case '\b':
+                            go_back = true;
+                            break;
+                        case (char)Keyboard.Keys.DOWN_ARROW:
+                        case (char)Keyboard.Keys.RIGHT_ARROW:
+                        case (char)Keyboard.Keys.PAGE_DOWN:
+                        case '\n':
+                        case ' ':
+                            go_fore = true;
+                            break;
+                        case (char)Keyboard.Keys.END:
+                            go_end = true;
+                            break;
+                        default:
+                            continue;
+                    }
+                }
+                else
+                {
+                    if ((key & (uint)Keyboard.Qualifiers.MOUSE_BUTTON_1) != 0)
+                    {
+                        go_fore = true;
+                    }
+                    else if ((key & (uint)Keyboard.Qualifiers.MOUSE_BUTTON_0) != 0)
+                    {
+                        go_back = true;
+                    }
+                    else
+                    {
+                        continue;
+                    }
+                }
+
+                if (go_home)
+                {
+                    slide = 0;
+                }
+                else if (go_fore)
+                {
+                    if (++slide >= Slides.Content.Length)
+                    {
+                        slide = Slides.Content.Length - 1;
+                    }
+                }
+                else if (go_back)
+                {
+                    if (--slide < 0)
+                    {
+                        slide = 0;
+                    }
+                }
+                else if (go_end)
+                {
+                    slide = Slides.Content.Length - 1;
+                }
+
+
+                if (Slides.Content.Length > 0)
+                {
+                    currentSlide = (!)Slides.Content[slide];
+                    if (current.Length < currentSlide.Length) {
+                        delete current;
+                        current = new[ExHeap] byte [currentSlide.Length];
+                    }
+                    Bitter.FromByteArray(current, 0, currentSlide.Length,
+                                         currentSlide, 0);
+                    video.SendFill(0, 0, 1023, 767, 0);
+                    video.RecvAckFill();
+                    video.SendBitBltBmp(32, 16, current);
+                    video.RecvAckBitBltBmp(out current);
+                }
+                else {
+                    video.SendFill(0, 0, 1023, 767, 0);
+                    video.RecvAckFill();
+                }
+            }
+            delete keyboard;
+            delete video;
+            delete current;
+
+            return 0;
+        }
+        public Pong()
+        {
+            svga = IoSystem.FindDeviceWithInterface(typeof(ISvgaDevice))
+                as ISvgaDevice;
+        }
+
+        public void DrawPaddle(int paddle, bool erase)
+        {
+            svga.Fill(paddlesDrawX[paddle],
+                      paddlesDrawY[paddle],
+                      paddlesDrawX[paddle] + paddleWidth - 1,
+                      paddlesDrawY[paddle] + paddleHeight - 1,
+                      erase ? RGB.Black : RGB.Blue);
+        }
+
+        public void RedrawPaddle(int paddle)
+        {
+            if (paddlesDrawY[paddle] != (int) paddlesY[paddle]) {
+                DrawPaddle(paddle, true);
+
+                paddlesDrawY[paddle] = (int) paddlesY[paddle];
+
+                DrawPaddle(paddle, false);
+            }
+        }
+
+        public void MovePaddle(int paddle)
+        {
+            paddlesY[paddle] += GetPaddleState(paddle) * paddleSpeed;
+
+            if (paddlesY[paddle] > paddleMax) {
+                paddlesY[paddle] = paddleMax;
+            }
+            else if (paddlesY[paddle] < paddleMin) {
+                paddlesY[paddle] = paddleMin;
+            }
+
+            RedrawPaddle(paddle);
+        }
+
+        public bool PaddleHit(int paddle)
+        {
+            return ((ballY > paddlesY[paddle] - ballSize) &&
+                    (ballY < paddlesY[paddle] + paddleHeight));
+        }
+
+        public void ResetBall()
+        {
+            ballY = screenMinY + ((screenHeight - ballSize) / 2);
+            ballAngle = (random.NextDouble() * ballStartAngle) -
+                        (ballStartAngle / 2);
+
+            if (lastWinner == 0) {
+                ballX = ballMinX;
+                if (ballAngle < 0) {
+                    ballAngle += 2 * Math.PI;
+                }
+            }
+            else {
+                ballX = ballMaxX;
+                ballAngle += Math.PI;
+            }
+
+            ballDrawX = (int) ballX;
+            ballDrawY = (int) ballY;
+        }
+
+        public void DrawBall(bool erase)
+        {
+            svga.Fill(ballDrawX, ballDrawY,
+                      ballDrawX + ballSize - 1, ballDrawY + ballSize - 1,
+                      erase ? RGB.Black : RGB.Red);
+        }
+
+        public void RedrawBall()
+        {
+            if (ballDrawX != (int) ballX || ballDrawY != (int) ballY) {
+                DrawBall(true);
+
+                ballDrawX = (int) ballX;
+                ballDrawY = (int) ballY;
+
+                DrawBall(false);
+            }
+        }
+
+        public void ReflectBallY(int line)
+        {
+            ballY = (2 * line) - ballY;
+            ballAngle = (2 * Math.PI) - ballAngle;
+        }
+
+        public void SetAngle(int paddle)
+        {
+            // Find out where the ball hit the paddle, from -1 to 1.
+            double ratio = ((ballY + (ballSize / 2)) -
+                            (paddlesY[paddle] + (paddleHeight / 2))) /
+                           ((paddleHeight + ballSize) / 2);
+
+            // Set the new angle accordingly.
+            ballAngle = ratio * ballMaxAngle;
+
+            if (paddle == 0) {
+                if (ballAngle < 0) {
+                    ballAngle += 2 * Math.PI;
+                }
+            }
+            else {
+                ballAngle = Math.PI - ballAngle;
+            }
+        }
+
+        public void MoveBall()
+        {
+            ballY += Math.Sin(ballAngle) * ballSpeed;
+            if (ballY < ballMinY) {
+                ReflectBallY(ballMinY);
+            }
+            else if (ballY > ballMaxY) {
+                ReflectBallY(ballMaxY);
+            }
+
+            ballX += Math.Cos(ballAngle) * ballSpeed;
+            if (ballX < ballMinX) {
+                if (PaddleHit(0)) {
+                    SetAngle(0);
+                }
+                else {
+                    lastWinner = 1;
+                    playing = false;
+                }
+            }
+            else if (ballX > ballMaxX) {
+                if (PaddleHit(1)) {
+                    SetAngle(1);
+                }
+                else {
+                    lastWinner = 0;
+                    playing = false;
+                }
+            }
+
+            RedrawBall();
+        }
+
+        public int GetPaddleState(int paddle)
+        {
+            int result;
+
+            if (inputUp[paddle]) {
+                result = -1;
+            }
+            else if (inputDown[paddle]) {
+                result = 1;
+            }
+            else {
+                result = 0;
+            }
+
+            return result;
+        }
+
+        public void SetStateFromChar(char c, bool @state)
+        {
+            switch (c) {
+                case (char)Keyboard.Keys.UP_ARROW:
+                    inputUp[1] = @state;
+                    break;
+                case (char)Keyboard.Keys.DOWN_ARROW:
+                    inputDown[1] = @state;
+                    break;
+                case 'a':
+                    inputUp[0] = @state;
+                    break;
+                case 'z':
+                    inputDown[0] = @state;
+                    break;
+            }
+        }
+
+        public void GetInput(KeyboardDeviceContract.Imp keyboard)
+        {
+            uint key = 0;
+            keyboard.SendPollKey();
+            switch receive
+            {
+                case keyboard.AckKey(ikey):
+                    key = ikey;
+                    break;
+                case keyboard.NakKey():
+                    key = 0;
+                    break;
+                case unsatisfiable:
+                    throw new Exception("Didn't get reply from Keyboard");
+            }
+
+            char c = (char) (key & (uint) Keyboard.Qualifiers.KEY_BASE_CODE);
+
+            if ((key & (uint) Keyboard.Qualifiers.KEY_DOWN) != 0) {
+                switch (c) {
+                    case (char) Keyboard.Keys.ESCAPE:
+                        done = true;
+                        break;
+                    case ' ':
+                        if (!playing) {
+                            ResetBall();
+                            ClearScreen();
+                            DrawPaddle(0, false);
+                            DrawPaddle(1, false);
+                            DrawBall(false);
+                            playing = true;
+                        }
+                        break;
+                    default:
+                        SetStateFromChar(c, true);
+                        break;
+                }
+            }
+            else if ((key & (uint) Keyboard.Qualifiers.KEY_UP) != 0) {
+                SetStateFromChar(c, false);
+            }
+        }
+
+        public void FillScreen(RGB color)
+        {
+            svga.Fill(screenMinX, screenMinY, screenMaxX, screenMaxY, color);
+        }
+
+        public void ClearScreen()
+        {
+            FillScreen(RGB.Black);
+        }
+
+        public void FlashScreen()
+        {
+            FillScreen(RGB.Red);
+            Sleep(1000);
+            FillScreen(RGB.Green);
+            Sleep(1000);
+            FillScreen(RGB.Blue);
+            Sleep(1000);
+        }
+
+        public void ShowMessage()
+        {
+            ClearScreen();
+
+            for (int i = 0; i < 100; i++) {
+                Console.WriteLine();
+            }
+
+            Console.Write("                                 ");
+            Console.Write("Left: {0,-10}", scores[0]);
+            Console.Write("                                 ");
+            Console.Write("Right: {0,-10}", scores[1]);
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.Write("                                         ");
+            Console.Write("Press space to begin or escape to quit...");
+            Console.WriteLine();
+
+            DrawPaddle(0, false);
+            DrawPaddle(1, false);
+            DrawBall(false);
+        }
+
+        public void Play()
+        {
+            KeyboardDeviceContract.Imp keyboard = Shell.OpenKeyboard("/dev/keyboard");
+
+            Console.CursorHide();
+
+            ShowMessage();
+
+            while (!done) {
+                GetInput(keyboard);
+
+                if (playing) {
+                    MovePaddle(0);
+                    MovePaddle(1);
+                    MoveBall();
+
+                    if (!playing) {
+                        scores[lastWinner]++;
+                        FlashScreen();
+                        ShowMessage();
+                    }
+                }
+
+                Sleep(10);
+            }
+
+            ClearScreen();
+
+            Console.CursorShow();
+        }
+
+        public void Sleep(int multiplier)
+        {
+            for (int j = 0; j < multiplier; j++) {
+                for (int i = 0; i < 10000; i++) {
+                    // Do nothing.
+                }
+            }
+        }
+
+        public static int Run(string[] args)
+        {
+            (new Pong()).Play();
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Pong/Pong.csproj b/base/Applications/Pong/Pong.csproj
new file mode 100644
index 0000000..05b8c3b
--- /dev/null
+++ b/base/Applications/Pong/Pong.csproj
@@ -0,0 +1,21 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->  
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Pong</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Pong.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Pong/Pong.sg b/base/Applications/Pong/Pong.sg
new file mode 100644
index 0000000..f4ea4d8
--- /dev/null
+++ b/base/Applications/Pong/Pong.sg
@@ -0,0 +1,510 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Pong.cs
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.GC;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Channels;
+using Keyboard = Microsoft.Singularity.Io.Keyboard;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class Pong
+    {
+        const uint Black    = 0x000000;
+        const uint Blue     = 0x0000ff;
+        const uint Green    = 0x00ff00;
+        const uint Red      = 0xff0000;
+        const uint White    = 0xffffff;
+
+        const int screenWidth = 1024;
+        const int screenHeight = 768;
+
+        const int paddleWidth = 16;
+        const int paddleHeight = 128;
+
+        const int ballSize = 8;
+
+        const double paddleSpeed = 0.20;
+        const double ballSpeed = 0.35;
+
+        const double ballStartAngle = Math.PI / 8;
+        const double ballMaxAngle = Math.PI / 3;
+
+        const int screenMinX = 0;
+        const int screenMinY = 0;
+
+        const int screenMaxX = screenMinX + screenWidth - 1;
+        const int screenMaxY = screenMinY + screenHeight - 1;
+
+        const int paddleMin = screenMinY;
+        const int paddleMax = screenMaxY - paddleHeight;
+
+        const int ballMinX = screenMinX + paddleWidth;
+        const int ballMaxX = screenMaxX - paddleWidth - ballSize;
+
+        const int ballMinY = screenMinY;
+        const int ballMaxY = screenMaxY - ballSize;
+
+        const int paddleInit = screenMinY + ((screenHeight - paddleHeight) / 2);
+
+        static double ballX = 0.0;
+        static double ballY = 0.0;
+        static double ballAngle = 0.0;
+
+        static int ballDrawX = 0;
+        static int ballDrawY = 0;
+
+        static double[] paddlesY = new double [2] { paddleInit, paddleInit };
+
+        static int[] paddlesDrawX = new int [2] { screenMinX,
+                                                  screenMaxX - paddleWidth + 1 };
+
+        static int[] paddlesDrawY = new int [2] { paddleInit, paddleInit };
+
+        static bool[] inputUp   = new bool [2] { false, false };
+        static bool[] inputDown = new bool [2] { false, false };
+
+        static int[] scores = new int [2] { 0, 0 };
+
+        static int lastWinner = 0;
+
+        static bool done = false;
+        static bool playing = false;
+
+        static Random random = new Random();
+
+        public static KeyboardDeviceContract.Imp:Ready OpenKeyboard(string! devName)
+        {
+            KeyboardDeviceContract.Exp! exp;
+            KeyboardDeviceContract.Imp! imp;
+            KeyboardDeviceContract.NewChannel(out imp, out exp);
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            bool success = false;
+
+            ErrorCode errorOut;
+            bool ok = SdsUtils.Bind(devName, ns, exp, out errorOut);
+            if (!ok) {
+                if (errorOut == ErrorCode.ChannelClosed)
+                {
+                    throw new Exception("Encountered a ChannelClosed while opening Keyboard");
+                }
+            }
+            else {
+                success = true;
+            }
+            /*
+            //            ns.SendBind(Bitter.FromString2(devName),exp);
+            switch receive {
+            case ns.AckBind():
+            success = true;
+            break;
+            case ns.NakBind(rejected,error):
+            delete rejected;
+            break;
+            case ns.ChannelClosed():
+            delete ns;
+            throw new Exception("ns unexpectedly closed");
+            }
+            */
+            if (!success) {
+                DebugStub.WriteLine("OpenKeyboard lookup of {0} failed\n",
+                                    __arglist(devName));
+
+                delete imp;
+                delete ns;
+                return null;
+            }
+
+            switch receive {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    throw new Exception("Contract not supported");
+                case imp.ChannelClosed():
+                    throw new Exception("Didn't imp.RecvActConnect");
+            }
+
+            delete ns;
+            return imp;
+        }
+
+        public static VideoDeviceContract.Imp:Ready OpenVideo(string! devName)
+        {
+            VideoDeviceContract.Exp! exp;
+            VideoDeviceContract.Imp! imp;
+            VideoDeviceContract.NewChannel(out imp, out exp);
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            bool success = false;
+            ns.SendBind(Bitter.FromString2(devName),exp);
+            switch receive {
+                case ns.AckBind():
+                    success = true;
+                    break;
+                case ns.NakBind(rejected, error):
+                    delete rejected;
+                    break;
+                case ns.ChannelClosed():
+                    delete ns;
+                    throw new Exception("ns unexpectedly closed");
+            }
+
+            if (!success) {
+                DebugStub.WriteLine("OpenVideo lookup of {0} failed\n",
+                                    __arglist(devName));
+
+                delete imp;
+                delete ns;
+                return null;
+            }
+
+            switch receive {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    throw new Exception("Contract not supported");
+                case imp.ChannelClosed():
+                    throw new Exception("Didn't imp.RecvActConnect");
+            }
+
+            delete ns;
+            return imp;
+        }
+
+        private static void DrawPaddle(VideoDeviceContract.Imp:Ready! video, int paddle, bool erase)
+        {
+            video.SendFill(paddlesDrawX[paddle],
+                           paddlesDrawY[paddle],
+                           paddlesDrawX[paddle] + paddleWidth - 1,
+                           paddlesDrawY[paddle] + paddleHeight - 1,
+                           erase ? Black : Blue);
+            video.RecvAckFill();
+        }
+
+        private static void RedrawPaddle(VideoDeviceContract.Imp:Ready! video, int paddle)
+        {
+            if (paddlesDrawY[paddle] != (int) paddlesY[paddle]) {
+                DrawPaddle(video, paddle, true);
+
+                paddlesDrawY[paddle] = (int) paddlesY[paddle];
+
+                DrawPaddle(video, paddle, false);
+            }
+        }
+
+        private static void MovePaddle(VideoDeviceContract.Imp:Ready! video, int paddle)
+        {
+            paddlesY[paddle] += GetPaddleState(paddle) * paddleSpeed;
+
+            if (paddlesY[paddle] > paddleMax) {
+                paddlesY[paddle] = paddleMax;
+            }
+            else if (paddlesY[paddle] < paddleMin) {
+                paddlesY[paddle] = paddleMin;
+            }
+
+            RedrawPaddle(video, paddle);
+        }
+
+        private static bool PaddleHit(int paddle)
+        {
+            return ((ballY > paddlesY[paddle] - ballSize) &&
+                    (ballY < paddlesY[paddle] + paddleHeight));
+        }
+
+        private static void ResetBall()
+        {
+            ballY = screenMinY + ((screenHeight - ballSize) / 2);
+            ballAngle = (random.NextDouble() * ballStartAngle) -
+                (ballStartAngle / 2);
+
+            if (lastWinner == 0) {
+                ballX = ballMinX;
+                if (ballAngle < 0) {
+                    ballAngle += 2 * Math.PI;
+                }
+            }
+            else {
+                ballX = ballMaxX;
+                ballAngle += Math.PI;
+            }
+
+            ballDrawX = (int) ballX;
+            ballDrawY = (int) ballY;
+        }
+
+        private static void DrawBall(VideoDeviceContract.Imp:Ready! video, bool erase)
+        {
+            video.SendFill(ballDrawX, ballDrawY,
+                           ballDrawX + ballSize - 1, ballDrawY + ballSize - 1,
+                           erase ? Black : Red);
+            video.RecvAckFill();
+        }
+
+        private static void RedrawBall(VideoDeviceContract.Imp:Ready! video)
+        {
+            if (ballDrawX != (int) ballX || ballDrawY != (int) ballY) {
+                DrawBall(video, true);
+
+                ballDrawX = (int) ballX;
+                ballDrawY = (int) ballY;
+
+                DrawBall(video, false);
+            }
+        }
+
+        private static void ReflectBallY(int line)
+        {
+            ballY = (2 * line) - ballY;
+            ballAngle = (2 * Math.PI) - ballAngle;
+        }
+
+        private static void SetAngle(int paddle)
+        {
+            // Find out where the ball hit the paddle, from -1 to 1.
+            double ratio = ((ballY + (ballSize / 2)) -
+                            (paddlesY[paddle] + (paddleHeight / 2))) /
+                ((paddleHeight + ballSize) / 2);
+
+            // Set the new angle accordingly.
+            ballAngle = ratio * ballMaxAngle;
+
+            if (paddle == 0) {
+                if (ballAngle < 0) {
+                    ballAngle += 2 * Math.PI;
+                }
+            }
+            else {
+                ballAngle = Math.PI - ballAngle;
+            }
+        }
+
+        private static void MoveBall(VideoDeviceContract.Imp:Ready! video)
+        {
+            ballY += Math.Sin(ballAngle) * ballSpeed;
+            if (ballY < ballMinY) {
+                ReflectBallY(ballMinY);
+            }
+            else if (ballY > ballMaxY) {
+                ReflectBallY(ballMaxY);
+            }
+
+            ballX += Math.Cos(ballAngle) * ballSpeed;
+            if (ballX < ballMinX) {
+                if (PaddleHit(0)) {
+                    SetAngle(0);
+                }
+                else {
+                    lastWinner = 1;
+                    playing = false;
+                }
+            }
+            else if (ballX > ballMaxX) {
+                if (PaddleHit(1)) {
+                    SetAngle(1);
+                }
+                else {
+                    lastWinner = 0;
+                    playing = false;
+                }
+            }
+
+            RedrawBall(video);
+        }
+
+        private static int GetPaddleState(int paddle)
+        {
+            if (inputUp[paddle]) {
+                return -1;
+            }
+            else if (inputDown[paddle]) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        private static void SetStateFromChar(char c, bool @state)
+        {
+            switch (c) {
+                case (char)Keyboard.Keys.UP_ARROW:
+                    inputUp[1] = @state;
+                    break;
+                case (char)Keyboard.Keys.DOWN_ARROW:
+                    inputDown[1] = @state;
+                    break;
+                case 'a':
+                    inputUp[0] = @state;
+                    break;
+                case 'z':
+                    inputDown[0] = @state;
+                    break;
+            }
+        }
+
+        private static void FillScreen(VideoDeviceContract.Imp:Ready! video, uint color)
+        {
+            video.SendFill(screenMinX, screenMinY, screenMaxX, screenMaxY, color);
+            video.RecvAckFill();
+        }
+
+        private static void ClearScreen(VideoDeviceContract.Imp:Ready! video)
+        {
+            FillScreen(video, Black);
+        }
+
+        private static void FlashScreen(VideoDeviceContract.Imp:Ready! video)
+        {
+            FillScreen(video, Red);
+            Sleep(1000);
+            FillScreen(video, Green);
+            Sleep(1000);
+            FillScreen(video, Blue);
+            Sleep(1000);
+        }
+
+        private static void ShowMessage(VideoDeviceContract.Imp:Ready! video)
+        {
+            ClearScreen(video);
+
+            for (int i = 0; i < 100; i++) {
+                Console.WriteLine();
+            }
+
+            Console.Write("                                 ");
+            Console.Write("Left: {0,-10}", scores[0]);
+            Console.Write("                                 ");
+            Console.Write("Right: {0,-10}", scores[1]);
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.Write("                                         ");
+            Console.Write("Press space to begin or escape to quit...");
+            Console.WriteLine();
+
+            DrawPaddle(video, 0, false);
+            DrawPaddle(video, 1, false);
+            DrawBall(video, false);
+        }
+
+        private static void Sleep(int multiplier)
+        {
+            for (int j = 0; j < multiplier; j++) {
+                for (int i = 0; i < 10000; i++) {
+                    // Do nothing.
+                }
+            }
+        }
+
+        public static int Main(string[] args)
+        {
+            VideoDeviceContract.Imp video = OpenVideo("/dev/video");
+
+            Console.WriteLine("Singularity Pong (PID={0})",
+                              ProcessService.GetCurrentProcessId());
+
+            if (video == null) {
+                Console.WriteLine("Can only play pong on a graphic display.");
+                return 1;
+            }
+
+            KeyboardDeviceContract.Imp keyboard = OpenKeyboard("/dev/keyboard");
+            if (keyboard == null) {
+                // TODO: show keyboardless slides with timer?
+                delete video;
+                return 1;
+            }
+
+            ShowMessage(video);
+
+            while (!done) {
+                uint key = 0;
+                keyboard.SendPollKey();
+                switch receive
+                {
+                    case keyboard.AckKey(ikey):
+                        key = ikey;
+                        break;
+                    case keyboard.NakKey():
+                        key = 0;
+                        break;
+                    case keyboard.ChannelClosed():
+                        throw new Exception("Didn't get keyboard closed.");
+                }
+
+                char c = (char) (key & (uint) Keyboard.Qualifiers.KEY_BASE_CODE);
+
+                if ((key & (uint) Keyboard.Qualifiers.KEY_DOWN) != 0) {
+                    switch (c) {
+                        case (char) Keyboard.Keys.ESCAPE:
+                            done = true;
+                            break;
+                        case ' ':
+                            if (!playing) {
+                                ResetBall();
+                                ClearScreen(video);
+                                DrawPaddle(video, 0, false);
+                                DrawPaddle(video, 1, false);
+                                DrawBall(video, false);
+                                playing = true;
+                            }
+                            break;
+                        default:
+                            SetStateFromChar(c, true);
+                            break;
+                    }
+                }
+                else if ((key & (uint) Keyboard.Qualifiers.KEY_UP) != 0) {
+                    SetStateFromChar(c, false);
+                }
+
+                if (playing) {
+                    MovePaddle(video, 0);
+                    MovePaddle(video, 1);
+                    MoveBall(video);
+
+                    if (!playing) {
+                        scores[lastWinner]++;
+                        FlashScreen(video);
+                        ShowMessage(video);
+                    }
+                }
+
+                Sleep(10);
+            }
+
+            ClearScreen(video);
+
+            delete keyboard;
+            delete video;
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Runtime/AppRuntime.proj b/base/Applications/Runtime/AppRuntime.proj
new file mode 100644
index 0000000..9baac18
--- /dev/null
+++ b/base/Applications/Runtime/AppRuntime.proj
@@ -0,0 +1,30 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Runtime\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\App.Corlib.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\System.Compiler.Runtime\System.Compiler.Runtime.App.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Corlib.Contracts.csproj" />
+
+<!--    <ProjectReference Include="Corlib.Native.proj" /> -->
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />  
+  
+</Project>
diff --git a/base/Applications/Runtime/Corlib.Native.proj b/base/Applications/Runtime/Corlib.Native.proj
new file mode 100644
index 0000000..adea05c
--- /dev/null
+++ b/base/Applications/Runtime/Corlib.Native.proj
@@ -0,0 +1,337 @@
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <CorlibObjPath>$(APPRUNTIMENATIVEDIR)\Corlib.obj</CorlibObjPath>
+    <BINDIR>$(OBJROOT)\$(OBJRELRUNTIMEDIR)</BINDIR>
+    <CFLAGS>$(CFLAGS) /Gr /I$(BINDIR) /I$(SINGULARITY_ROOT)\boot\include /DSINGULARITY_PROCESS=1</CFLAGS>
+    <AFLAGS>$(AFLAGS) /DSINGULARITY_PROCESS</AFLAGS>
+    <CORLIB_IL>$(APPRUNTIMEDIR)\Corlib.dll</CORLIB_IL>
+    <MASTER>$(SINGULARITY_ROOT)\Kernel</MASTER>
+    <NativeLibPath>$(APPRUNTIMENATIVEDIR)\native.lib</NativeLibPath>
+    <Collector>$(COLLECTOR_APP)</Collector>
+  </PropertyGroup>
+
+
+  <Import Project="$(SINGULARITY_ROOT)\Kernel\GC.targets"/>
+
+
+
+  <PropertyGroup>
+
+    <!-- bartok common flags -->
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /Singularity</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /UnnameTracedPtrs=true</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /OmitFramePointer=false </BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /GCInlineAllocations=false </BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /GCInlineWriteBarrier=false</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /GenCoffLineNumber=false</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /WholeProgram=true</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /Warnings=true </BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /DisablePInvoke=true</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /BackEndComments=true</BARTOK_FLAGS>
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) $(BARTOK_COLLECTOR)</BARTOK_FLAGS>
+
+    <!-- bartok flags for corlib.obj -->
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) </CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /CompileOnly=true </CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /Warnings=true </CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) $(BARTOK_COLLECTOR)</CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /r:$(LIBSDIR)\Singularity.V1.dll</CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /r:$(ILLSDIR)\Console.ill</CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /r:$(APPRUNTIMEDIR)\ILHelpers.dll</CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /out: $(APPRUNTIMENATIVEDIR)\CorLib.obj</CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) /outdir: $(APPRUNTIMENATIVEDIR) </CORLIB_BARTOK_FLAGS>
+    <CORLIB_BARTOK_FLAGS>$(CORLIB_BARTOK_FLAGS) $(APPRUNTIMEDIR)\Corlib.dll </CORLIB_BARTOK_FLAGS>
+
+    <!-- bartok flags for testapp.obj -->
+    <TESTAPP_BARTOK_FLAGS>/verbosity:silence</TESTAPP_BARTOK_FLAGS>
+    <TESTAPP_BARTOK_FLAGS>$(TESTAPP_BARTOK_FLAGS) /GenAsmHeader="$(APPRUNTIMENATIVEDIR)\halclass.inc"</TESTAPP_BARTOK_FLAGS>
+    <TESTAPP_BARTOK_FLAGS>$(TESTAPP_BARTOK_FLAGS) /GenCppHeader="$(APPRUNTIMENATIVEDIR)\halclass.h"</TESTAPP_BARTOK_FLAGS>
+    <TESTAPP_BARTOK_FLAGS>$(TESTAPP_BARTOK_FLAGS) /IrTreeShake=false</TESTAPP_BARTOK_FLAGS>
+    <TESTAPP_BARTOK_FLAGS>$(TESTAPP_BARTOK_FLAGS) /IrTreeShakeLate=false</TESTAPP_BARTOK_FLAGS>
+    <TESTAPP_BARTOK_FLAGS>$(TESTAPP_BARTOK_FLAGS) /out:$(APPRUNTIMENATIVEDIR)\testapp.obj</TESTAPP_BARTOK_FLAGS>
+    <TESTAPP_BARTOK_FLAGS>$(TESTAPP_BARTOK_FLAGS) /outdir:$(APPRUNTIMENATIVEDIR)</TESTAPP_BARTOK_FLAGS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\App.Corlib.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\System.Compiler.Runtime\System.Compiler.Runtime.App.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Corlib.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Singularity.V1\Singularity.V1.csproj"/>
+    <ProjectReference Include="ILHelpers.csproj"/>
+  </ItemGroup>
+
+  <!-- Configuration-sensitive values -->
+  <Choose>
+    <When Condition="'$(Configuration)'=='Prototype'">
+      <PropertyGroup>
+        <BARTOK_FLAGS>$(BARTOK_FLAGS) /IrSimpleInliner=false</BARTOK_FLAGS>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+  <!-- Machine-sensitive values -->
+  <Choose>
+    <When Condition="'$(Machine)'=='x86'">
+      <PropertyGroup>
+        <BARTOK_FLAGS>$(BARTOK_FLAGS) /LinkedStacks=true</BARTOK_FLAGS>
+        <BARTOK_FLAGS>$(BARTOK_FLAGS) /SymbolicDebug=true</BARTOK_FLAGS>
+        <NativeSrcDir>$(MASTER)\Native</NativeSrcDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <NativeIncludes Include="$(NativeSrcDir)\hal.h"/>
+        <NativeSources Include="$(NativeSrcDir)\hal.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\BootInfo.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\IoPort.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Buffer.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Decimal.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\DebugStub.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Math.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Number.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\PEImage.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Processor.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Stacks.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Thread.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Tracing.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\Monitoring.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\halexn.cpp"/>
+        <NativeSources Include="$(NativeSrcDir)\halstack.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\halforgc.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\halasm.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_lldiv.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_llmul.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_llshl.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_llshr.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_llrem.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_memcpy.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_memset.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_ulldiv.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_ulldvrm.asm"/>
+        <NativeSources Include="$(NativeSrcDir)\_ullrem.asm"/>
+      </ItemGroup>
+    </When>
+  </Choose>
+
+
+  <!-- ================================== TARGETS ================================================== -->
+
+  <Target Name="BuildCorlibObj"
+          Inputs="$(CORLIB_IL)"
+          Outputs="$(CorlibObjPath)"
+          DependsOnTargets="BuildDependentProjects"
+        >
+
+    <Message Text="Building Corlib.obj"/>
+    <!-- /GenAsmHeader="$(APPRUNTIMEDIR)\halclass.inc" /GenCppHeader="$(APPRUNTIMEDIR)\halclass.h"  -->
+    <!-- We specify the working directory to work around issues dealing with inheritance of the PATH variable. -->
+    <MakeDir Directories="$(APPRUNTIMENATIVEDIR)"/>
+    <Exec WorkingDirectory="$(BARTOK_DIR)"
+      Command="$(BARTOK) $(BARTOK_FLAGS) $(CORLIB_BARTOK_FLAGS)"/>
+  </Target>
+
+
+
+<!--
+
+############################################################### Native Library
+
+-->
+
+  <!--
+  Note: This target uses batching.  All tasks within the target will be executed, once for each distinct
+  NativeSources item.
+  
+  Notes about dependency checking: In general, we do not attempt to do fine-grained dependency checking
+  on #include dependencies, because:
+      * doing so is error-prone (the dependencies are in the code, not in the project)
+      * we don't have much C++ code, so it compiles fast
+      * nearly all of the C++ files depend on halclass.h, which is generated when any IL changes
+      
+  So we just punt, and declare that all native sources depend on halclass.h (and halclass.inc),
+  and the handful of native header files that we have, which are declared as NativeIncludes items.
+  This means that we are conservative about dependencies; we may rebuild code when it is not strictly
+  necessary, but this is better than not building code that really has changed.
+  
+  This target depends on BuildTestAppObj because that target generates halclass.h / halclass.inc.
+  -->
+  <Target Name="BuildNativeSources"
+          DependsOnTargets="BuildTestAppObj"
+          Inputs="
+            %(NativeSources.identity);
+            @(NativeIncludes);
+            $(APPRUNTIMENATIVEDIR)\halclass.h;
+            $(APPRUNTIMENATIVEDIR)\halclass.inc;
+            "
+          Outputs="$(APPRUNTIMENATIVEDIR)\%(NativeSources.filename).obj"
+          >
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) $(GC_ML_DEFS) /I$(APPRUNTIMENATIVEDIR) /I$(NativeSrcDir) /Fd$(APPRUNTIMENATIVEDIR)\native.pdb /Fo$(APPRUNTIMENATIVEDIR)\%(NativeSources.filename).obj /c %(NativeSources.identity) "
+          Condition="'%(NativeSources.extension)'=='.c' or '%(NativeSources.extension)'=='.cpp'"
+          />
+    <Exec Command="$(AS) $(AFLAGS) $(ACFLAGS) $(GC_ML_DEFS) /I$(APPRUNTIMENATIVEDIR) /I$(NativeSrcDir) /Fo$(APPRUNTIMENATIVEDIR)\%(NativeSources.filename).obj /c %(NativeSources.identity) "
+          Condition="'%(NativeSources.extension)'=='.asm'"/>
+  </Target>
+
+  <Target Name="LinkNativeLib"
+          DependsOnTargets="BuildNativeSources"
+          Inputs="@(NativeSources->'$(APPRUNTIMENATIVEDIR)\%(filename).obj')"
+          Outputs="$(NativeLibPath)">
+    <Message Text="Linking native objects - $(NativeLibPath)"/>
+    <Delete Files="$(NativeLibPath)"/>
+    <Exec Command="$(LIB) /nologo /nod /out:$(NativeLibPath) @(NativeSources->'$(APPRUNTIMENATIVEDIR)\%(filename).obj',' ')"/>
+  </Target>
+
+  <ItemGroup>
+    <NibLib Include="$(APPRUNTIMENATIVEDIR)\native.lib"/>
+    <NibLib Include="$(APPRUNTIMENATIVEDIR)\Singularity.V1.lib"/>
+  </ItemGroup>
+
+  <Target Name="CopyNativeLibToNibLibCache"
+          Inputs="@(NibLib)"
+          Outputs="$(DISTRO_LIB_DIR)\%(NibLib.filename)%(NibLib.extension)"
+          DependsOnTargets="LinkNativeLib;BuildAbiLib">
+    <MakeDir Directories="$(DISTRO_LIB_DIR)"/>
+    <Copy SourceFiles="@(NibLib)" DestinationFolder="$(DISTRO_LIB_DIR)" SkipUnchangedFiles="true"/>
+  </Target>
+
+
+
+
+
+  <!--
+
+  $(OBJDIR)\testapp.exe : testapp.cs \
+  $(OBJDIR)\Corlib.dll \
+  $(ILLSDIR)\singularity.V1.ill \
+  $(OBJDIR)\ILHelpers.dll
+  csc /nologo $(CSFLAGS) $(GC_CSC_DEFS) /nostdlib /warnaserror+ /nowarn:169,649 \
+  /d:SINGULARITY /d:SINGULARITY_PROCESS /D:PTR_SIZE_32 /d:LITTLE_ENDIAN \
+  /d:ENDPOINT_STRUCT \
+  /r:$(OBJDIR)\Corlib.dll \
+  /r:$(LIBSDIR)\Singularity.V1.dll \
+  /r:$(OBJDIR)\ILHelpers.dll \
+  /t:exe \
+  /out:$(OBJDIR)\testapp.exe testapp.cs
+
+  ##############################################################################
+  -->
+
+  <!--
+  <WriteLinesToFile File="$(OBJDIR)\testapp_csc.txt" Lines="
+        /nologo $(CSFLAGS) $(GC_CSC_DEFS) /nostdlib /warnaserror+ /nowarn:169,649
+  /d:SINGULARITY /d:SINGULARITY_PROCESS /D:PTR_SIZE_32 /d:LITTLE_ENDIAN
+  /d:ENDPOINT_STRUCT;
+  @(TESTAPP_EXE_REFS->'/r:%(Identity)',' ');
+  /t:exe
+  /out:$(OBJDIR)\testapp.exe testapp.cs
+  " Overwrite="true"/>
+
+  <Exec Command="$(BUILDDIR)\csc.exe @$(OBJDIR)\testapp_csc.txt"/>
+-->
+
+
+  <ItemGroup>
+    <TestAppReference Include="$(APPRUNTIMEDIR)\Corlib.dll"/>
+    <TestAppReference Include="$(LIBSDIR)\Singularity.V1.dll"/>
+    <TestAppReference Include="$(ILLSDIR)\Console.ill"/>
+    <TestAppReference Include="$(APPRUNTIMEDIR)\ILHelpers.dll"/>
+    <TestAppReference Include="$(APPRUNTIMEDIR)\System.Compiler.Runtime.dll"/>
+    <TestAppReference Include="$(APPRUNTIMEDIR)\Microsoft.SingSharp.Runtime.dll"/>
+  </ItemGroup>
+
+  <Target Name="BuildTestAppIL">
+    <MSBuild Projects="TestApp.csproj" StopOnFirstFailure="$(StopOnFirstFailure)">
+      <Output PropertyName="TestAppILPath" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+    <Message Text="TestAppILPath - $(TestAppILPath)"/>
+  </Target>
+
+  <Target Name="BuildTestAppObj"
+          Inputs="$(TestAppILPath)"
+          Outputs="$(APPRUNTIMENATIVEDIR)\testapp.obj;$(APPRUNTIMENATIVEDIR)\testapp_superObj.obj;$(APPRUNTIMENATIVEDIR)\halclass.inc;$(APPRUNTIMENATIVEDIR)\halclass.h"
+          DependsOnTargets="BuildTestAppIL"
+          >
+    <Message Text="Building testapp.obj"/>
+    <Message Text="  Native reference: %(TestAppReference.identity)"/>
+
+    <Exec Command="PATH $(SINGULARITY_PATH) &amp; $(BARTOK) $(BARTOK_FLAGS) $(TESTAPP_BARTOK_FLAGS) $(TestAppILPath) @(TestAppReference,' ')"/>
+    <!-- > $(OBJDIR)\testapp.log  -->
+  </Target>
+
+  <ItemGroup>
+    <NativeReference Include="$(OBJDIR)\native.lib"/>
+    <NativeReference Include="$(OBJDIR)\testapp.obj"/>
+    <NativeReference Include="$(APPRUNTIMENATIVEDIR)\DebugStub.obj"/>
+    <NativeReference Include="$(APPRUNTIMENATIVEDIR)\Processor.obj"/>
+    <NativeReference Include="$(OBJDIR)\testapp_superObj.obj"/>
+    <NativeReference Include="$(APPRUNTIMENATIVEDIR)\Singularity.V1.lib"/>
+  </ItemGroup>
+
+  <Target Name="LinkTestApp"
+          Inputs="@(NativeReference)"
+          Outputs="$(OBJDIR)\testapp.x86"
+          DependsOnTargets="BuildNativeLib;BuildTestAppObj"
+        >
+    <Message Text="Linking testapp native image"/>
+    <Exec Command="$(LINK) /out:$(OBJDIR)\testapp.x86 /pdb:$(OBJDIR)\testapp.x86.pdb $(LFLAGS) /fixed:no /MAP /base:0x2000000 /entry:RuntimeEntryPoint @(NativeReference,' ')"/>
+  </Target>
+
+
+
+
+
+  <Target Name="BuildDependentProjects">
+    <MSBuild Projects="@(ProjectReference)" StopOnFirstFailure="$(StopOnFirstFailure)"/>
+    <!-- testapp.csproj;      -->
+  </Target>
+
+
+  <Target Name="Build" DependsOnTargets="
+      BuildDependentProjects;
+      BuildCorlibObj;
+      LinkNativeLib;
+      CopyNativeLibToNibLibCache;
+      BuildAbiLib;
+      ">
+  </Target>
+
+  <!-- This builds the PE/COFF unmanaged import library for the app/kernel ABI. -->
+  <Target Name="BuildAbiLib"
+          Inputs="$(SINGULARITY_ROOT)\Kernel\$(SING_DEF_FILE)"
+          Outputs="$(APPRUNTIMENATIVEDIR)\Singularity.V1.lib">
+
+    <Message Text="Building ABI PE/COFF import library - $(APPRUNTIMENATIVEDIR)\Singularity.V1.lib" />
+    <MakeDir Directories="$(APPRUNTIMENATIVEDIR)" />
+
+    <!-- Preprocess it first. -->
+    <Exec Command="$(CC) $(CFLAGS) /EP /TP $(SINGULARITY_ROOT)\Kernel\$(SING_DEF_FILE) &gt; $(APPRUNTIMENATIVEDIR)\$(SING_DEF_FILE)" />
+
+    <Message Text="Validating ABI" />
+    <Exec Command="$(SINGULARITY_ROOT)\Kernel\validabi.cmd $(APPRUNTIMENATIVEDIR)\$(SING_DEF_FILE)" />
+    <Exec Command="$(LIB) /nologo /def:$(APPRUNTIMENATIVEDIR)\$(SING_DEF_FILE) /machine:$(MACHINE) /out:$(APPRUNTIMENATIVEDIR)\Singularity.V1.lib" />
+  </Target>
+
+
+  
+  <Target Name="Clean">
+    <Delete Files="
+      @(NativeSources->'$(APPRUNTIMENATIVEDIR)\%(filename).obj');
+      $(APPRUNTIMENATIVEDIR)\native.lib;
+      $(APPRUNTIMENATIVEDIR)\native.pdb;
+      $(APPRUNTIMENATIVEDIR)\$(SING_DEF_FILE);
+      $(APPRUNTIMENATIVEDIR)\Singularity.V1.lib;
+      $(APPRUNTIMENATIVEDIR)\Singularity.V1.def;
+      $(APPRUNTIMENATIVEDIR)\Singularity.V1.exp;
+      $(APPRUNTIMENATIVEDIR)\testapp.obj;
+      $(APPRUNTIMENATIVEDIR)\testapp_superObj.obj;
+      $(APPRUNTIMENATIVEDIR)\testapp_info.obj;
+      $(APPRUNTIMENATIVEDIR)\halclass.h;
+      $(APPRUNTIMENATIVEDIR)\halclass.inc;
+      $(APPRUNTIMENATIVEDIR)\Corlib.obj;
+      $(APPRUNTIMENATIVEDIR)\Corlib_info.obj;
+      "/>
+  </Target>
+
+</Project>
diff --git a/base/Applications/Runtime/Corlibsg.csproj b/base/Applications/Runtime/Corlibsg.csproj
new file mode 100644
index 0000000..e8a90b5
--- /dev/null
+++ b/base/Applications/Runtime/Corlibsg.csproj
@@ -0,0 +1,41 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>Corlibsg</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Singularity\Io\ConsoleOutput.sg"/>
+    <Compile Include="Singularity\Io\ConsoleInput.sg"/>
+    <Compile Include="Singularity\Io\PipeLookAhead.sg"/>
+    <Compile Include="Singularity\Io\PipeMultiplexer.sg"/>
+    <Compile Include="Singularity\Directory\NameService.sg"/>
+    <Compile Include="System\Process.sg"/>
+    <Compile Include="System\Principal.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\AppRuntime.targets"/>
+
+</Project>
diff --git a/base/Applications/Runtime/ILHelpers.csproj b/base/Applications/Runtime/ILHelpers.csproj
new file mode 100644
index 0000000..3ee4ef6
--- /dev/null
+++ b/base/Applications/Runtime/ILHelpers.csproj
@@ -0,0 +1,55 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+
+  <PropertyGroup>
+    <OutputPath>$(APPRUNTIMEDIR)</OutputPath>
+    <MASTER>$(SINGULARITY_ROOT)\Kernel</MASTER>
+    <OutputAssemblyPath>$(OutputPath)\ILHelpers.dll</OutputAssemblyPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(MASTER)\Bartok\ILHelpers.il"/>
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <OutputItem Include="$(OutputAssemblyPath)">
+      <ExcludeFromNativeReferences>false</ExcludeFromNativeReferences>
+    </OutputItem>
+  </ItemGroup>
+  
+
+  <Target Name="BuildDependentProjects">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Build\BuildKey.proj"/>
+  </Target>
+
+  <Target Name="BuildAssembly"
+          Inputs="@(Compile);$(BUILDDIR)\BuildKey.snk;"
+          Outputs="$(OutputAssemblyPath)"
+          DependsOnTargets="BuildDependentProjects"
+          >
+
+    <Message Text="Building ILHelper"/>
+    <MakeDir Directories="$(OutputPath)"/>
+    <Exec Command="$(ILASM) /quiet /dll /key=$(BUILDDIR)\BuildKey.snk /output=$(OutputPath)\ILHelpers.dll @(Compile,' ')"/>
+
+  </Target>
+
+  <Target Name="Build" DependsOnTargets="BuildAssembly" Outputs="@(OutputItem)"/>
+
+  <Target Name="GetContentItems" Outputs="" />
+
+</Project>
+
diff --git a/base/Applications/Runtime/Singularity/AppRuntime.cs b/base/Applications/Runtime/Singularity/AppRuntime.cs
new file mode 100644
index 0000000..1cee5b6
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/AppRuntime.cs
@@ -0,0 +1,224 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Runtime.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+using Microsoft.Bartok.Runtime;
+
+#if !MINRUNTIME
+    using Microsoft.Singularity.Io;
+#endif
+    using Microsoft.Singularity.V1.Services;
+
+[assembly: AssemblyTitle("Microsoft.Singularity")]
+[assembly: AssemblyProduct("Microsoft Research Singularity Runtime")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyKeyFile("public.snk")]
+[assembly: AssemblyDelaySign(true)]
+
+namespace Microsoft.Singularity
+{
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class AppRuntime
+    {
+        // Note: This function is called by Hal.cpp.
+        [AccessedByRuntime("referenced from hal.cpp")]
+        public static unsafe int AppStart(Type userClass)
+        {
+            System.GCs.Transitions.ThreadStart();
+
+            int result = 0;
+
+            try {
+                Tracing.Log(Tracing.Audit, "Runtime.Main()");
+
+                // Initialize the primitive runtime, which calls the
+                // class constructor for Runtime().
+                VTable.Initialize((RuntimeType)typeof(AppRuntime));
+                /*VTable.ParseArgs(args);*/
+
+                Tracing.Log(Tracing.Audit, "Enabling GC Heap");
+                GC.EnableHeap();
+
+#if !MINRUNTIME
+                ConsoleOutput.Initialize();
+                ConsoleInput.Initialize();
+#endif
+
+                SetDebuggerPresence(DebugService.IsDebuggerPresent());
+
+                int argCount = 0;
+                int argMaxLen = 0;
+                for (;; argCount++) {
+                    int len = ProcessService.GetStartupArg(argCount, null, 0);
+                    if (len == 0) {
+                        break;
+                    }
+                    if (argMaxLen < len) {
+                        argMaxLen = len;
+                    }
+                }
+                char[] argArray = new char [argMaxLen];
+                string[] args = new string[argCount];
+                for (int arg = 0; arg < argCount; arg++) {
+                    fixed (char *argptr = &argArray[0]) {
+                        int len = ProcessService.GetStartupArg(arg,
+                                                               argptr,
+                                                               argArray.Length);
+                        args[arg] = String.StringCTOR(argptr, 0, len);
+                    }
+                }
+
+                if (userClass != null) {
+                    VTable.initType((RuntimeType)userClass);
+                }
+
+                result = CallMain(args);
+                if (!MainReturnsInt()) result = 0;
+                Thread.RemoveThread(Thread.CurrentThread.threadIndex);
+
+                Thread.JoinAll();
+
+#if !MINRUNTIME
+                ConsoleOutput.Finalize();
+                ConsoleInput.Finalize();
+#endif
+                Tracing.Log(Tracing.Audit, "Main thread exited [{0}]",
+                            (UIntPtr)unchecked((uint)result));
+            }
+            catch (Exception e) {
+                Tracing.Log(Tracing.Fatal, "Failed with exception {0}.{1}",
+                            e.GetType().Namespace, e.GetType().Name);
+                Tracing.Log(Tracing.Trace, "Exception message was {0}",
+                            e.ToString());
+                DebugStub.WriteLine("Caught {0}", __arglist(e.Message));
+                result = -1;
+            }
+
+            Tracing.Log(Tracing.Audit, "Runtime shutdown started.");
+            VTable.Shutdown(result);
+            Tracing.Log(Tracing.Audit, "Runtime exiting [{0}]",
+                        (UIntPtr)unchecked((uint)result));
+            return result;
+        }
+
+        [AccessedByRuntime("output to header : defined in hal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(256)]
+        private static extern int CallMain(String[] args);
+
+        [AccessedByRuntime("output to header: defined in hal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(256)]
+        private static extern bool MainReturnsInt();
+
+        [AccessedByRuntime("output to header: defined in hal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(256)]
+        private static extern void SetDebuggerPresence(bool debuggerPresent);
+
+        internal static void Shutdown(int exitCode)
+        {
+            //
+            // Gracefully close down the process.
+            //
+            Tracing.Log(Tracing.Audit, "Runtime.Shutdown({0})",
+                        (UIntPtr)unchecked((uint)exitCode));
+
+            DebugStub.WriteLine("Runtime.Shutdown({0})", __arglist(exitCode));
+
+            VTable.Shutdown(exitCode);
+            Tracing.Log(Tracing.Audit, "Runtime.Shutdown({0}) terminating",
+                        (UIntPtr)unchecked((uint)exitCode));
+            ProcessService.Stop(exitCode);
+        }
+
+        internal static void Stop(int exitCode)
+        {
+            //
+            // Halt the process immediately.
+            //
+            Tracing.Log(Tracing.Audit, "Runtime.Stop({0})",
+                        (UIntPtr)unchecked((uint)exitCode));
+
+            DebugStub.WriteLine("Runtime.Stop({0})", __arglist(exitCode));
+
+            ProcessService.Stop(exitCode);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [NoHeapAllocation]
+        public static UIntPtr AddressOf(Object o)
+        {
+            return Magic.addressOf(o);
+        }
+
+        [NoHeapAllocation]
+        public static UIntPtr SizeOf(Object o)
+        {
+            return System.GCs.ObjectLayout.Sizeof(o);
+        }
+
+        public static void InitType(Type ty)
+        {
+            VTable.initType((RuntimeType) ty);
+        }
+
+        public static void DumpPageTable()
+        {
+            System.GCs.PageTable.Dump("PageTable");
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        public static bool EnableGCVerify
+        {
+            get {
+                return VTable.enableGCVerify;
+            }
+            set {
+                VTable.enableGCVerify = value;
+            }
+        }
+
+        public static bool EnableGCAccounting
+        {
+            get {
+                return VTable.enableGCAccounting;
+            }
+            set {
+                VTable.enableGCAccounting = value;
+                if (value == true) {
+                    System.GCs.MemoryAccounting.Initialize(GC.gcType);
+                }
+            }
+        }
+
+        public static uint GCPerfCounter
+        {
+            get {
+                return System.GC.perfCounter;
+            }
+            set {
+                System.GC.perfCounter = value;
+            }
+        }
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/DebugStub.cs b/base/Applications/Runtime/Singularity/DebugStub.cs
new file mode 100644
index 0000000..af809b2
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/DebugStub.cs
@@ -0,0 +1,337 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Debug.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class DebugStub
+    {
+        /////////////////////////////////////////////////////// Print Methods.
+        //
+        [NoHeapAllocation]
+        public static void Print(byte value)
+        {
+            Print("{0:x2}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(ushort value)
+        {
+            Print("{0:x4}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(uint value)
+        {
+            Print("{0:x8}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(ulong value)
+        {
+            Print("{0:x}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(UIntPtr value)
+        {
+            Print("{0:x8}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(sbyte value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(short value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(int value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(long value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        [NoHeapAllocation]
+        public static void Print(String value)
+        {
+            if (value != null) {
+                Print(value, new ArgIterator());
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void Print(String format, __arglist)
+        {
+            Print(format, new ArgIterator(__arglist));
+        }
+
+#if PAGING
+[AccessedByRuntime("output to header : defined in debugstub.cpp")]
+[MethodImpl(MethodImplOptions.InternalCall)]
+[StackBound(64)]
+[NoHeapAllocation]
+public static extern void Foo();
+//static int ccc = 0;
+#endif
+        [NoHeapAllocation]
+        public static unsafe void Print(String format, ArgIterator args)
+        {
+#if PAGING
+Foo();
+/*
+if (ccc == 0) {
+    DebugStub.Break();
+    ccc = 1;
+}
+*/
+#endif
+            char *buffer;
+            int length;
+            int used = 0;
+
+            DebugService.PrintBegin(out buffer, out length);
+            try {
+                if (buffer != null) {
+                    used = String.LimitedFormatTo(format, args, buffer, length);
+                }
+            }
+            finally {
+                DebugService.PrintComplete(buffer, used);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        [NoHeapAllocation]
+        public static void Write(String value)
+        {
+            if (value != null) {
+                Write(value, new ArgIterator());
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void Write(String format, __arglist)
+        {
+            Write(format, new ArgIterator(__arglist));
+        }
+
+        [NoHeapAllocation]
+        public static unsafe void Write(String format, ArgIterator args)
+        {
+            char *buffer;
+            int length;
+            int used = 0;
+
+            DebugService.PrintBegin(out buffer, out length);
+            try {
+                if (buffer != null) {
+                    used = String.LimitedFormatTo(format, args, buffer, length);
+                }
+            }
+            finally {
+                DebugService.PrintComplete(buffer, used);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [NoHeapAllocation]
+        public static void WriteLine()
+        {
+            WriteLine("", new ArgIterator());
+        }
+
+        [NoHeapAllocation]
+        public static void WriteLine(String value)
+        {
+            if (value != null) {
+                WriteLine(value, new ArgIterator());
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void WriteLine(String format, __arglist)
+        {
+            WriteLine(format, new ArgIterator(__arglist));
+        }
+
+        [NoHeapAllocation]
+        public static unsafe void WriteLine(String format, ArgIterator args)
+        {
+            char *buffer;
+            int length;
+            int used = 0;
+
+            DebugService.PrintBegin(out buffer, out length);
+            try {
+                if (buffer != null) {
+                    used = String.LimitedFormatTo(format, args, buffer, length);
+                    if (used < length) {
+                        buffer[used++] = '\n';
+                    }
+                }
+            }
+            finally {
+                DebugService.PrintComplete(buffer, used);
+            }
+        }
+
+        ////////////////////////////////////////////////////// Assert Methods.
+        //
+        [NoHeapAllocation]
+        public static void NotImplemented()
+        {
+            failAssert("Not implemented.");
+        }
+
+        [NoHeapAllocation]
+        public static void NotImplemented(String msg)
+        {
+            failAssert(/*"Not implemented: "+*/msg);
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void NotReached()
+        {
+            failAssert("Unreachable code reached.");
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void NotReached(String msg)
+        {
+            failAssert(/*"Unreachable code reached: "+*/msg);
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        public static void Assert(bool expr)
+        {
+            if (!expr) {
+                failAssert(null);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        public static void Deny(bool expr)
+        {
+            if (expr) {
+                failAssert(null);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        public static void Assert(bool expr, String s)
+        {
+            if (!expr) {
+                failAssert(s);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void Deny(bool expr, String s)
+        {
+            if (expr) {
+                failAssert(s);
+            }
+        }
+
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        private static void failAssert(String s)
+        {
+            if (s != null) {
+                Print("Assertion failed: {0}", __arglist(s));
+            }
+            else {
+                Print("Assertion failed.");
+            }
+            Break();
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [NoHeapAllocation]
+        public static ulong ReadPerfCounter(uint which)
+        {
+            return DebugService.ReadPerfCounter(which);
+        }
+
+
+        [NoHeapAllocation]
+        public static bool WritePerfCounter(uint which, ulong value)
+        {
+            return DebugService.WritePerfCounter(which, value);
+        }
+
+        [NoHeapAllocation]
+        public static bool AddToPerfCounter(uint which, ulong value)
+        {
+            return DebugService.AddToPerfCounter(which, value);
+        }
+
+        /////////////////////////////////////////////////////// State Methods.
+        //
+#if true
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(638)]
+        [NoHeapAllocation]
+        public static extern void Break();
+#else
+        [NoHeapAllocation]
+        public static void Break()
+        {
+            DebugService.Break();
+        }
+#endif
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/Directory/NameService.sg b/base/Applications/Runtime/Singularity/Directory/NameService.sg
new file mode 100644
index 0000000..1118e59
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Directory/NameService.sg
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryService.sg
+//
+//  Note:
+//
+//      This file provides an implementation of Naming.DirectoryService.NewClientEndpoint
+//  that calls through the ABI to retrieve the name-service channel endpoint.
+//  This is for use by applications; kernel components can call the "real"
+//  DirectoryService class directly.
+//
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Naming;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Directory
+{
+    public class DirectoryService
+    {
+        public static unsafe DirectoryServiceContract.Imp!:Ready NewClientEndpoint()
+        {
+            return (DirectoryServiceContract.Imp!)ProcessService.GetNamespaceEndpoint();
+        }
+   }
+}
diff --git a/base/Applications/Runtime/Singularity/Io/ConsoleInput.sg b/base/Applications/Runtime/Singularity/Io/ConsoleInput.sg
new file mode 100644
index 0000000..20d6e19
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Io/ConsoleInput.sg
@@ -0,0 +1,318 @@
+//////////////////////////////////////////////////////////////////////////////////
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ConsoleInput.sg
+//
+//  Note:   Read a line or a char of the Console
+//
+
+using DirectoryService.Utils;
+using System.GC;
+using System.Runtime.Remoting;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Singularity.V1.Services;
+
+
+namespace Microsoft.Singularity.Io {
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+
+    using System;
+    using System.Text;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    using Microsoft.Singularity.Extending;
+    using Microsoft.Singularity.Runtime;
+    using Microsoft.Singularity.Io;
+    using System.Runtime.InteropServices;
+
+
+
+    public sealed class ConsoleInput /* : ITracked, ISelectable */
+    {
+        private static TContainer<PipeLookAhead> consoleContainer;
+        // protected by TContainer lock.
+        private static char[]! readLineBuffer = new char[16];
+
+        /*
+
+        private char[]! in ExHeap side;
+        private UnicodePipeContract.Exp conn;
+        private int charCount;
+        private int charPos;
+
+        private ConsoleInput([Claims] UnicodePipeContract.Exp? pipe)
+        {
+            this.side = new[ExHeap] char [280];
+            this.charCount = 0;
+            this.charPos = 0;
+            this.conn = pipe;
+
+            base();
+        }
+        */
+
+        private ConsoleInput() {}
+
+        private static UnicodePipeContract.Exp? GetPipe()
+        {
+            UnicodePipeContract.Exp con = null;
+
+            Endpoint * in ExHeap pipeep = Process.GetStartupEndpoint(0);
+            if (pipeep != null) {
+                con = pipeep as UnicodePipeContract.Exp;
+                if (con == null) {
+                    // this cannot possibly work! the process is already started
+#if DEBUG
+                    DebugStub.WriteLine("ConsoleInput: slot 0 is not a pipe.");
+#endif
+                    Process.RetStartupEndpoint(0,pipeep);
+                    return null;
+                }
+                else {
+                    //DebugStub.WriteLine("ConsoleInput: connected to pipe.");
+                    return con;
+                }
+            }
+            return null;
+        }
+
+
+        public static void Initialize()
+        {
+            UnicodePipeContract.Exp pipe = GetPipe();
+            PipeLookAhead bufferedPipe = new PipeLookAhead(pipe, 100);
+            ConsoleInput.consoleContainer = new TContainer<PipeLookAhead>(bufferedPipe);
+        }
+
+        /*
+        public void Dispose()
+        {
+            delete this.side;
+            delete this.conn;
+        }
+
+        void ITracked.Acquire() {
+            Tracing.Log(Tracing.Debug,"ConsoleInput.Acquire");
+        }
+        void ITracked.Release() {
+            Tracing.Log(Tracing.Debug,"ConsoleInput.Release");
+        }
+        void ITracked.Expose() {
+            Tracing.Log(Tracing.Debug,"ConsoleInput.Expose");
+        }
+        void ITracked.UnExpose() {
+            Tracing.Log(Tracing.Debug,"ConsoleInput.UnExpose");
+        }
+        */
+
+        public static void Finalize()
+        {
+#if DEBUG
+            DebugStub.WriteLine("consoleInput: finalizer called");
+#endif
+            //            TContainer<ConsoleInput> chandle = consoleContainer;
+            TContainer<PipeLookAhead> chandle = consoleContainer;
+            consoleContainer = null;
+
+            if (chandle == null) return;
+
+            PipeLookAhead co = chandle.Acquire();
+            co.Dispose();
+        }
+
+        /*
+        private int InternalReadChar()
+        {
+            expose (this) {
+                if (this.conn != null) {
+                    if (this.charCount == 0) {
+                        UnicodePipeContract.Exp pipe = this.conn;
+
+                    tryAgain:
+                        switch receive {
+                            case pipe.Write(buffer,a,b):
+                                if (b == 0) {
+                                    pipe.SendAckWrite(buffer);
+                                    goto tryAgain;
+                                }
+                                if (b == 1) {
+                                    int theChar = (int) buffer[a];
+                                    pipe.SendAckWrite(buffer);
+                                    return theChar;
+                                }
+                                else {
+                                    // switch our buffer with theirs
+                                    pipe.SendAckWrite(this.side);
+                                    this.side = buffer;
+                                    this.charPos = a+1;
+                                    this.charCount = b-1;
+                                    return (int)buffer[a];
+                                }
+
+                            case pipe.ChannelClosed():
+                                return -1;
+                        }
+                    }
+                    else {
+                        // there are more chars in the buffer
+                        int theChar = this.side[this.charPos++];
+                        this.charCount--;
+                        return theChar;
+                    }
+                }
+            } //expose
+            return -1;
+        }
+        */
+
+        public static void Close()
+        {
+        }
+
+        public static int ReadChar()
+        {
+            if (consoleContainer == null) return -1;
+            PipeLookAhead co = consoleContainer.Acquire();
+            int key = co.ReadChar();
+            if (key == -1) {
+                co.Dispose();
+                consoleContainer = null;
+                return key;
+            }
+            consoleContainer.Release(co);
+            return key;
+        } //ReadChar
+
+        ////////////////////////////////////////////////////////
+        //
+        public static string ReadLine()
+        {
+            if (consoleContainer == null) return null;
+            PipeLookAhead bufferedPipe = consoleContainer.Acquire();
+
+            int pos = 0;
+            int key;
+
+            do {
+                key = bufferedPipe.ReadChar();
+                if (key == -1) {
+                    bufferedPipe.Dispose();
+                    consoleContainer = null;
+                    return null;
+                }
+                if (key == '\r') {
+                    // DebugStub.WriteLine("key {0}", key);
+                    continue;
+                }
+                if (key == '\n') {
+                    // DebugStub.WriteLine("key {0}", key);
+                    break;
+                }
+                if (pos+1 >= readLineBuffer.Length){
+                    char[] temp = new char[readLineBuffer.Length *2];
+                    Array.Copy(readLineBuffer,temp,readLineBuffer.Length);
+                    readLineBuffer = temp;
+                }
+                readLineBuffer[pos++] = (char) key;
+                if (key > 31 && key < 126) {
+                    // DebugStub.WriteLine("key {0}", key);
+                }
+            } while (key != -1 );
+
+            string s = new string(readLineBuffer,0,pos);
+            //DebugStub.WriteLine("in: count={0}, s=({1})",__arglist(pos, s));
+
+            consoleContainer.Release(bufferedPipe);
+            return s;
+        } //ReadLine
+
+        /*
+        internal enum ReceiveTag {
+            Any = 1,
+            GetChar = 2,
+        }
+
+        [Selectable((int)ReceiveTag.GetChar)]
+        public void RecvGetChar(out int key) {
+            key = this.InternalReadChar();
+        }
+
+        /// <summary>
+        /// Tests if the message at the head of the queue matches the given tag. If so,
+        /// returns true.
+        ///
+        /// If no match is possible in the future given the current message, possible must
+        /// be set to false.
+        /// Implementations are disallowed from setting possible to true
+        /// so that the context can chain them.
+        ///
+        /// If the underlying object is an endpoint set, it also returns an object that
+        /// serves to extract the endpoint having the match from the set later.
+        ///
+        /// Again, implementations are disallowed from setting match setMatch to null
+        /// so that the context can chain the calls.
+        ///
+        /// </summary>
+        bool ISelectable.HeadMatches(int tag, ref bool possible, ref object setMatch) {
+            // Only handle pipe case
+            expose (this) {
+                if (this.conn != null) {
+                    if (this.charCount == 0) {
+                        UnicodePipeContract.Exp pipe = this.conn;
+
+                        // negative tag is channel closed
+                        int pipeTag = (tag < 0)?tag : UnicodePipeContract.Tags.Write;
+
+                        return pipe.HeadMatches(pipeTag, ref possible, ref setMatch);
+                    }
+                    else {
+                        // there are more chars in the buffer
+                        if (tag < 0) {
+                            // not closed
+                            possible = false;
+                            return false;
+                        }
+                        return true;
+                    }
+                }
+                else {
+                    // no pipe
+                    possible = false;
+                    return false;
+                }
+            } //expose
+        }
+
+        SyncHandle ISelectable.GetWaitHandle() {
+            expose (this) {
+                assert(this.conn != null);
+                return this.conn.GetWaitHandle();
+            }
+        }
+
+        */
+        public static PipeLookAhead! AcquireInput() {
+            assert consoleContainer != null;
+
+            PipeLookAhead bufferedPipe = consoleContainer.Acquire();
+            return bufferedPipe;
+        }
+
+        public static void ReleaseInput([Claims] PipeLookAhead! bufferedPipe) {
+            assert consoleContainer != null;
+
+            consoleContainer.Release(bufferedPipe);
+        }
+
+    } //ConsoleInput
+}//namespace
diff --git a/base/Applications/Runtime/Singularity/Io/ConsoleOutput.sg b/base/Applications/Runtime/Singularity/Io/ConsoleOutput.sg
new file mode 100644
index 0000000..9fbdeb9
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Io/ConsoleOutput.sg
@@ -0,0 +1,461 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ConsoleOutput.sg
+//
+//  Note:   Uses /dev/conout to display console output.
+//
+
+namespace Microsoft.Singularity.Io {
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+
+    using System;
+    using System.Text;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    using System.Runtime.InteropServices;
+
+    public sealed class ConsoleOutput : ITracked
+    {
+        private static TContainer<ConsoleOutput> consoleContainer;
+
+        private struct PipeData : ITracked {
+            public UnicodePipeContract.Imp channel;
+            public void Dispose()
+            {
+                delete channel;
+            }
+            void ITracked.Acquire() {}
+            void ITracked.Release() {}
+            public void Expose() {}
+            public void UnExpose() {}
+
+            public UnicodePipeContract.Imp:READY Swap([Claims] UnicodePipeContract.Imp:READY newPipe) {
+                expose (this) {
+                    UnicodePipeContract.Imp result = this.channel;
+                    this.channel = newPipe;
+                    return result;
+                }
+            }
+        }
+
+        /*
+        private struct DeviceData : ITracked {
+            public ConsoleDeviceContract.Imp:Ready channel;
+            public void Dispose()
+            {
+                delete channel;
+            }
+            void ITracked.Acquire() {}
+            void ITracked.Release() {}
+            public void Expose() {}
+            public void UnExpose() {}
+        }
+        */
+
+        private char[]! in ExHeap side;
+        private PipeData pipe;
+        /*
+        private DeviceData device;
+        */
+        private ConsoleOutput([Claims] UnicodePipeContract.Imp? pipe)
+        {
+            this.side = new[ExHeap] char [280];
+            this.pipe.channel = pipe;
+        }
+
+        private static UnicodePipeContract.Imp GetPipe()
+        {
+            UnicodePipeContract.Imp con = null;
+
+            Endpoint* in ExHeap pipeep = Process.GetStartupEndpoint(1);
+            if (pipeep != null) {
+                con = pipeep as UnicodePipeContract.Imp;
+                if (con == null) {
+                    Process.RetStartupEndpoint(1,pipeep);
+                    return null;
+                }
+                return con;
+            }
+            return null;
+        }
+
+        public static void Initialize()
+        {
+            /*
+            ConsoleDeviceContract.Imp imp = null;
+
+            imp = OpenConsole("/dev/video-text");
+            if (imp == null) {
+                imp = OpenConsole("/dev/conout");
+                if (imp == null) {
+                    DebugStub.Print("Couldn't open console.\n");
+                    return;
+                }
+            }
+            */
+            UnicodePipeContract.Imp pipe = GetPipe();
+            ConsoleOutput co = new ConsoleOutput(pipe);
+            consoleContainer = new TContainer<ConsoleOutput>(co);
+        }
+
+        public void Dispose()
+        {
+            this.pipe.Dispose();
+            // this.device.Dispose();
+            delete this.side;
+        }
+
+        void ITracked.Acquire() {
+            //Tracing.Log(Tracing.Debug,"ConsoleOutput.Acquire");
+        }
+        void ITracked.Release() {
+            //Tracing.Log(Tracing.Debug,"ConsoleOutput.Release");
+        }
+        void ITracked.Expose() {
+            //Tracing.Log(Tracing.Debug,"ConsoleOutput.Expose");
+        }
+        void ITracked.UnExpose() {
+            //Tracing.Log(Tracing.Debug,"ConsoleOutput.UnExpose");
+        }
+
+        public static void Finalize()
+        {
+            TContainer<ConsoleOutput> chandle = consoleContainer;
+            consoleContainer = null;
+
+            if (chandle == null) return;
+
+            ConsoleOutput co = chandle.Acquire();
+            if (co != null) co.Dispose();
+        }
+
+        /*
+        private static ConsoleDeviceContract.Imp
+        OpenConsoleInternal(DirectoryServiceContract.Imp! nsImp,
+                            [Claims] char[]! in ExHeap    deviceName)
+        {
+            ConsoleDeviceContract.Exp! exp;
+            ConsoleDeviceContract.Imp! imp;
+            ConsoleDeviceContract.NewChannel(out imp, out exp);
+
+            nsImp.SendBind(deviceName, exp);
+            switch receive
+            {
+                case nsImp.AckBind():
+                    return imp;
+                    break;
+                case nsImp.NakBind(rejectImp, error):
+                    delete rejectImp;
+                    delete imp;
+                    break;
+                case nsImp.ChannelClosed():
+                    throw new Exception("Channel closed during Console bind.");
+                    delete imp;
+                    break;
+                case nsImp.NakBindReparse(path, rest, linked, backExp):
+                    assert linked == true;
+                    assert rest   == null;
+                    delete backExp;
+                    delete imp;
+
+                    return OpenConsoleInternal(nsImp, path);
+                    break;
+            }
+            return null;
+        }
+
+        private static ConsoleDeviceContract.Imp OpenConsole(string! devName)
+        {
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+            ConsoleDeviceContract.Imp imp =
+                OpenConsoleInternal(ns, Bitter.FromString2(devName));
+            delete ns;
+
+            if (imp != null) {
+                switch receive
+                {
+                    case imp.Success():
+                        break;
+                    case imp.ContractNotSupported():
+                        throw new Exception("ConsoleOutput: ContractNotSupported");
+                        break;
+                    case imp.ChannelClosed():
+                        throw new Exception("ConsoleOutput: ChannelClosed");
+                        break;
+                }
+            }
+            return imp;
+        }
+
+        public static void Clear()
+        {
+            if (consoleContainer == null) return;
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            expose (co) {
+                ConsoleDeviceContract.Imp ep = co.device.channel;
+                if (ep != null)
+                {
+                    ep.SendClear();
+                    switch receive
+                    {
+                    case ep.AckClear():
+                        break;
+                    case ep.NakClear():
+                        break;
+                    case ep.ChannelClosed():
+                        delete ep;
+                        co.device.channel = null;
+                        break;
+                    }
+                }
+            }
+            consoleContainer.Release(co);
+        }
+
+        public static void CursorFlash()
+        {
+            if (consoleContainer == null) return;
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            expose (co) {
+                ConsoleDeviceContract.Imp ep = co.device.channel;
+                if (ep != null) 
+                {
+                    ep.SendCursorFlash();
+                    switch receive
+                    {
+                    case ep.AckCursorFlash():
+                        break;
+                    case ep.NakCursorFlash():
+                        break;
+                    case ep.ChannelClosed():
+                        delete ep;
+                        co.device.channel = null;
+                        break;
+                    }
+                }
+            }
+            consoleContainer.Release(co);
+        }
+
+        public static void CursorHide()
+        {
+            if (consoleContainer == null) return;
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            expose (co) {
+                ConsoleDeviceContract.Imp ep = co.device.channel;
+                if (ep != null) {
+                    ep.SendCursorHide();
+                    switch receive {
+                    case ep.AckCursorHide():
+                        break;
+                    case ep.NakCursorHide():
+                        break;
+                    case ep.ChannelClosed():
+                        delete ep;
+                        co.device.channel = null;
+                        break;
+                    }
+                }
+            }
+            consoleContainer.Release(co);
+        }
+
+        public static void CursorShow()
+        {
+            if (consoleContainer == null) return;
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            expose (co) {
+                ConsoleDeviceContract.Imp ep = co.device.channel;
+                if (ep != null) {
+                    ep.SendCursorShow();
+                    switch receive {
+                    case ep.AckCursorShow():
+                        break;
+                    case ep.NakCursorShow():
+                        break;
+                    case ep.ChannelClosed():
+                        delete ep;
+                        co.device.channel = null;
+                        break;
+                    }
+                }
+            }
+            consoleContainer.Release(co);
+        }
+        */
+
+        public static char[]! in ExHeap Write([Claims] char[]! in ExHeap buffer,
+                                              int index, int count)
+        {
+            if (consoleContainer == null) return buffer;
+            ConsoleOutput co = consoleContainer.Acquire();
+            try {
+                expose (co) {
+                    if (co.pipe.channel != null) {
+                        return Write(buffer, index, count, ref co.pipe);
+                    }
+                    else {
+                        return buffer;
+                    }
+                }
+            }
+            finally {
+                consoleContainer.Release(co);
+            }
+        }
+
+        /*
+        private static char[]! in ExHeap Write([Claims] char[]! in ExHeap buffer,
+                                               int index, int count,
+                                               ref DeviceData device)
+        {
+            expose (device) {
+                ConsoleDeviceContract.Imp channel = device.channel;
+                if (channel != null)
+                {
+                    channel.SendWrite(buffer, index, count);
+                    switch receive {
+                    case channel.AckWrite(localside):
+                        return localside;
+
+                    case channel.NakWrite(localside):
+                        return localside;
+
+                    case channel.ChannelClosed():
+                        delete channel;
+                        device.channel = null;
+                        return new[ExHeap] char[0];
+                    }                      
+                }
+                else {
+                    return buffer;
+                }
+            }
+        }
+        */
+
+        private static char[]! in ExHeap Write([Claims] char[]! in ExHeap buffer,
+                                               int index, int count,
+                                               ref PipeData pipe)
+        {
+            expose (pipe) {
+                UnicodePipeContract.Imp channel = pipe.channel;
+                if (channel != null) {
+                    //                    char[]! in ExHeap buffer=Bitter.FromString2(value);
+                    channel.SendWrite(buffer, index, count);
+                    switch receive { 
+                    case channel.AckWrite(i_buffer):
+                        return i_buffer;
+                    
+                    case channel.ChannelClosed():
+                        delete channel;
+                        pipe.channel = null;
+                        return new[ExHeap] char[0];
+
+                    case unsatisfiable:
+                        DebugStub.Break();
+                        throw new Exception("Pipe unsatisfiable "); 
+                    }
+                }
+                else {
+                    return buffer;
+                }
+            }
+        }
+
+        public static void Write(char[]! buffer, int index, int count)
+        {
+            if (consoleContainer == null) return;
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            expose (co) {
+                char[] in ExHeap side = co.side;
+
+                if (side.Length < count) {
+                    delete side;
+                    co.side = side = new[ExHeap] char [count];
+                }
+
+                for (int i = 0; i < count; i++) {
+                    side[i] = buffer[index + i];
+                }
+
+                if (co.pipe.channel != null) {
+                    co.side = Write(side, index, count, ref co.pipe);
+                }
+                /*
+                else {
+                    co.side = Write(side, index, count, ref co.device);
+                }
+                */
+            }
+            consoleContainer.Release(co);
+        }
+
+        public static void Write(String! value)
+        {
+            if (consoleContainer == null) return;
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            expose (co) {
+
+                char[] in ExHeap side = co.side;
+                if (side.Length < value.Length) {
+                    delete side;
+                    co.side = side = new[ExHeap] char [value.Length];
+                }
+
+                for (int i = 0; i < value.Length; i++) {
+                    side[i] = value[i];
+                }
+
+                if (co.pipe.channel != null) {
+                    co.side = Write(side, 0, value.Length, ref co.pipe);
+                }
+                /*
+                else {
+                    co.side = Write(side, 0, value.Length, ref co.device);
+                }
+                */
+            }
+            consoleContainer.Release(co);
+            return;
+        }
+
+        public static UnicodePipeContract.Imp:READY Swap([Claims] UnicodePipeContract.Imp:READY newOutput) {
+            if (consoleContainer == null) {
+                delete newOutput;
+                return null;
+            }
+
+            ConsoleOutput co = consoleContainer.Acquire();
+
+            UnicodePipeContract.Imp result;
+            expose(co) {
+                result = co.pipe.Swap(newOutput);
+            }
+            consoleContainer.Release(co);
+            return result;
+        }
+
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/Io/IoIrq.cs b/base/Applications/Runtime/Singularity/Io/IoIrq.cs
new file mode 100644
index 0000000..326c90e
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Io/IoIrq.cs
@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoIrq.cs - Process Code
+//
+
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.V1.Threads;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoIrq : IoRange
+    {
+        private readonly byte irq;
+        private InterruptHandle handle;
+
+        internal IoIrq(byte irq)
+        {
+            this.irq = irq;
+        }
+
+        ~IoIrq()
+        {
+            if (handle.id != UIntPtr.Zero)
+            {
+                ReleaseInterrupt();
+            }
+        }
+
+        public byte Irq
+        {
+            get { return irq; }
+        }
+
+        public bool RegisterInterrupt()
+        {
+            InterruptHandle handleOnStack;
+            bool success = InterruptHandle.Create(irq, out handleOnStack);
+            handle = handleOnStack;
+            return success;
+        }
+
+        public bool ReleaseInterrupt()
+        {
+            bool ret = InterruptHandle.Dispose(handle);
+            handle = new InterruptHandle();
+            return ret;
+        }
+
+        public bool WaitForInterrupt()
+        {
+            if (handle.id != UIntPtr.Zero)
+            {
+                return InterruptHandle.Wait(handle);
+            }
+            return false;
+        }
+
+        public void Pulse()
+        {
+            if (handle.id != UIntPtr.Zero)
+            {
+                InterruptHandle.Pulse(handle);
+            }
+        }
+
+        public bool AckInterrupt()
+        {
+            if (handle.id != UIntPtr.Zero)
+            {
+                return InterruptHandle.Ack(handle);
+            }
+            return false;
+        }
+
+        public override string ToString()
+        {
+            return String.Format("IRQ:{0,2:x2}", irq);
+        }
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/Io/PipeLookAhead.sg b/base/Applications/Runtime/Singularity/Io/PipeLookAhead.sg
new file mode 100644
index 0000000..e73c2da
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Io/PipeLookAhead.sg
@@ -0,0 +1,402 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PipeLookAhead.sg
+//
+//  Note:   Implements a selectable abstraction that looks ahead on a pipe channels
+//          for control-C and exports separate logical receivable messages for
+//          non-control-C characters and control-C, effectively allowing one to 
+//          consume Ctrl-C's out of order. 
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Threads;
+using Tty = Microsoft.Singularity.Io.Tty2006;
+
+namespace Microsoft.Singularity.Io {
+
+    public sealed class PipeLookAhead : ITracked, ISelectable {
+
+        private struct CircularBuffer : ITracked {
+
+            private char[]! in ExHeap buffer; // circular buffer
+            private int nextReadIndex;
+            private int nextWriteIndex;
+            private int controlC_Count; // ctrl-c's in buffer
+            private int controlC_Consumed; // ctrl-c's consumed in buffer
+            private int controlZ_Count; // ctrl-z's in buffer
+            private int controlZ_Consumed; // ctrl-z's consumed in buffer
+
+            public bool HasControlC {
+                get { return controlC_Count > 0; }
+            }
+
+            public bool HasControlZ {
+                get { return controlZ_Count > 0; }
+            }
+
+            private int CharsInBuffer {
+                get {
+                    if (nextWriteIndex >= nextReadIndex) {
+                        return nextWriteIndex - nextReadIndex;
+                    }
+                    else {
+                        expose (this) {
+                            return buffer.Length - nextReadIndex + nextWriteIndex;
+                        }
+                    }
+                }
+            }
+
+            public int CharsAvailable {
+                get {
+                    int available = CharsInBuffer - controlC_Consumed - controlZ_Consumed;
+                    return available;
+                }
+            }
+
+            
+            public CircularBuffer(int lookAhead) {
+                this.buffer = new[ExHeap] char[lookAhead+256];
+                this.nextReadIndex = 0;
+                this.nextWriteIndex = 0;
+                this.controlC_Count = 0;
+                this.controlC_Consumed = 0;
+                this.controlZ_Count = 0;
+                this.controlZ_Consumed = 0;
+            }
+
+            private int FreeSpace {
+                get {
+                    // Careful, circular buffer can't be filled completely.
+                    // Need 1 extra space to distinguish full from empty buffer.
+                    expose (this) {
+                        return this.buffer.Length - this.CharsInBuffer - 1;
+                    }
+                }
+            }
+            public void Add(char[]! in ExHeap buffer, int index, int count) {
+                EnsureCapacity(count);
+                for (int i=0; i<count; i++) {
+                    Add(buffer[index++]);
+                }
+            }
+
+            private void Add(char c) {
+                expose (this) {
+                    this.buffer[this.nextWriteIndex++] = c;
+                    if (this.nextWriteIndex == this.buffer.Length) {
+                        this.nextWriteIndex = 0; // wrap around
+                    }
+                    if (c == (int)Tty.ControlCodes.CTRL_C) {
+                        this.controlC_Count++;
+                    }
+                    if (c == (int)Tty.ControlCodes.CTRL_Z) {
+                        this.controlZ_Count++;
+                    }
+                    /*
+                    DebugStub.WriteLine("Add {0} writeIndex={1} readIndex={2}",
+                                        __arglist(c, this.nextWriteIndex,
+                                                  this.nextReadIndex));
+                    */
+                }
+            }
+
+            private void EnsureCapacity(int count) {
+                int freeSpace = this.FreeSpace;
+                int charsBuffered = this.CharsInBuffer;
+
+                if (freeSpace < count) {
+                    expose (this) {
+                        int newSize =  this.buffer.Length + count;
+                        char[] in ExHeap newBuffer = new[ExHeap] char[newSize];
+                        char[] in ExHeap oldBuffer = this.buffer;
+                        if (this.nextWriteIndex >= this.nextReadIndex) {
+                            // copy area between indices
+                            Bitter.Copy(newBuffer, 0, charsBuffered,
+                                        oldBuffer, this.nextReadIndex);
+                        }
+                        else {
+                            // copy areas from read to end and from start to write.
+                            int suffix = this.buffer.Length - this.nextReadIndex;
+                            Bitter.Copy(newBuffer, 0, suffix,
+                                        oldBuffer, this.nextReadIndex);
+                            Bitter.Copy(newBuffer, suffix, this.nextWriteIndex,
+                                        oldBuffer, 0);
+                        }
+                        delete this.buffer;
+                        this.buffer = newBuffer;
+                        this.nextReadIndex = 0;
+                        this.nextWriteIndex = charsBuffered;
+                    }
+                }
+            }
+
+            public void Dispose()
+            {
+                delete this.buffer;
+            }
+
+            void ITracked.Acquire() {}
+            void ITracked.Release() {}
+            void ITracked.Expose() {}
+            void ITracked.UnExpose() {}
+
+            public void GetChar(out char ch) {
+                expose (this) {
+                tryAgain:
+                    assert CharsAvailable > 0;
+                    ch = this.buffer[this.nextReadIndex++];
+                    if (this.nextReadIndex == this.buffer.Length) {
+                        this.nextReadIndex = 0; // wrap around
+                    }
+                    if (ch == (int)Tty.ControlCodes.CTRL_C) {
+                        if (this.controlC_Consumed > 0) {
+                            // filter. already consumed via Ctrl_C
+                            this.controlC_Consumed--;
+                            goto tryAgain;
+                        }
+                        else {
+                            this.controlC_Count--;
+                        }
+                    }
+                    if (ch == (int)Tty.ControlCodes.CTRL_Z) {
+                        if (this.controlZ_Consumed > 0) {
+                            // filter. already consumed via Ctrl_Z
+                            this.controlZ_Consumed--;
+                            goto tryAgain;
+                        }
+                        else {
+                            this.controlZ_Count--;
+                        }
+                    }
+                    /*
+                    char c = ch;
+                    DebugStub.WriteLine("GetChar {0} writeIndex={1} readIndex={2} CtrlC={3} CtrlZ={4} C-Used={5} Z-Used={6}",
+                                        __arglist(c, this.nextWriteIndex,
+                                                  this.nextReadIndex,
+                                                  this.controlC_Count,
+                                                  this.controlZ_Count,
+                                                  this.controlC_Consumed,
+                                                  this.controlZ_Consumed
+                                                  ));
+                    */
+
+                }
+            }
+
+            public void ConsumeControlC() {
+                assert this.controlC_Count > 0;
+                this.controlC_Count--;
+                this.controlC_Consumed++;
+            }
+
+            public void ConsumeControlZ() {
+                assert this.controlZ_Count > 0;
+                this.controlZ_Count--;
+                this.controlZ_Consumed++;
+            }
+        }
+
+        private UnicodePipeContract.Exp pipe; // null when pipe is closed
+
+        private int lookAhead;
+        private CircularBuffer buffer;
+
+        public PipeLookAhead([Claims] UnicodePipeContract.Exp pipe, int lookAhead)
+        {
+            this.pipe = pipe;
+            this.lookAhead = lookAhead;
+            this.buffer = new CircularBuffer(lookAhead);
+        }
+        
+        public void Dispose()
+        {
+            this.buffer.Dispose();
+            delete this.pipe;
+        }
+
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+
+        SyncHandle ISelectable.GetWaitHandle() {
+            expose (this) {
+                // non-null checker was right in pointing out issue if pipe is null.
+                // Design problem: what handle do we return in this case?
+                if (this.pipe != null) {
+                    return this.pipe.GetWaitHandle();
+                }
+                else {
+                    DebugStub.Break();
+                    return new SyncHandle(); // null handle. Could cause null-deref
+                    // should we make kernel tolerate this?
+                }
+            }
+        }
+
+        void ISelectable.ResetWaitSignal() {
+            // dummy
+        }
+
+        private void FillToLookAheadWithoutBlock() 
+        {
+            expose (this) {
+                UnicodePipeContract.Exp pipe = this.pipe;
+                if (pipe == null) return;
+                while (this.buffer.CharsAvailable < this.lookAhead) 
+                {
+                    switch receive {
+                    case pipe.Write(buffer,index,count):
+                        this.buffer.Add(buffer, index, count);
+                        pipe.SendAckWrite(buffer);
+                        break;
+
+                    case pipe.ChannelClosed():
+                        delete pipe;
+                        this.pipe = null;
+                        return;
+
+                    case timeout:
+                        return;
+                    }
+                }
+            } //expose
+        }
+
+        private bool IsClosed {
+            get {
+                expose(this) {
+                    return (this.pipe == null && this.buffer.CharsAvailable==0);
+                }
+            }
+        }
+
+        private bool HasCharacter {
+            get {
+                expose(this) {
+                    return this.buffer.CharsAvailable > 0;
+                }
+            }
+        }
+
+        private int CharsAvailable {
+            get {
+                expose(this) {
+                    return this.buffer.CharsAvailable;
+                }
+            }
+        }
+
+        private bool HasControlC {
+            get {
+                expose(this) {
+                    return this.buffer.HasControlC;
+                }
+            }
+        }
+
+        private bool HasControlZ {
+            get {
+                expose(this) {
+                    return this.buffer.HasControlZ;
+                }
+            }
+        }
+
+        enum SelectTag {
+            ChannelClosed = -1,
+            Any = 1,
+            Char = 2,
+            ControlC = 3,
+            ControlZ = 4,
+        }
+
+        /// <summary>
+        /// blocks until a character is available
+        /// </summary>
+        public int ReadChar() {
+            PipeLookAhead pipe = this;
+            switch receive {
+                case pipe.Char(ch):
+                    return ch;
+                case pipe.ChannelClosed():
+                    return -1;
+            }
+        }
+        
+        public bool HeadMatches(int tag, ref bool possible, ref object setMatch) {
+
+            this.FillToLookAheadWithoutBlock(); 
+
+            switch ((SelectTag)tag) {
+            case SelectTag.ChannelClosed:
+                if (this.IsClosed) {
+                    return true;
+                }
+                if (this.HasCharacter) {
+                    possible = false;
+                }
+                return false;
+
+            case SelectTag.Char:
+                if (this.HasCharacter) {
+                    return true;
+                }
+                if (this.IsClosed) {
+                    possible = false;
+                }
+                return false;
+
+            case SelectTag.ControlC:
+                if (this.HasControlC) {
+                    return true;
+                }
+                if (this.IsClosed) {
+                    possible = false;
+                }
+                return false;
+                
+            case SelectTag.ControlZ:
+                if (this.HasControlZ) {
+                    return true;
+                }
+                if (this.IsClosed) {
+                    possible = false;
+                }
+                return false;
+                
+            }
+            return false;
+        }
+
+        [Selectable((int)SelectTag.Char)]
+        public void RecvChar(out char ch) {
+            expose(this) {
+                this.buffer.GetChar(out ch);
+            }
+        }
+
+        [Selectable((int)SelectTag.ControlC)]
+        public void RecvControlC() {
+            expose(this) {
+                this.buffer.ConsumeControlC();
+            }
+        }
+
+        [Selectable((int)SelectTag.ControlZ)]
+        public void RecvControlZ() {
+            expose(this) {
+                this.buffer.ConsumeControlZ();
+            }
+        }
+
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/Io/PipeMultiplexer.sg b/base/Applications/Runtime/Singularity/Io/PipeMultiplexer.sg
new file mode 100644
index 0000000..c02ada4
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Io/PipeMultiplexer.sg
@@ -0,0 +1,214 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PipeMultiplexer.sg
+//
+//  Note:   Multiplexes any number of input pipes to a single output pipe.
+//          Also features a channel to submit new input pipes.
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Tty = Microsoft.Singularity.Io.Tty2006;
+
+namespace Microsoft.Singularity.Io {
+
+    public contract PipeMultiplexControl {
+        in message NewInput(UnicodePipeContract.Exp:EXPMOVABLE! client);
+        out message Ack();
+
+        state START: NewInput? -> Ack! -> START;
+    }
+
+    /// <summary>
+    /// Allows creating and managing a multiplexer that forwards data from several pipes
+    /// to a single output pipe.
+    /// </summary>
+    public sealed class PipeMultiplexer : ITracked {
+
+        private class PipeThread {
+            TRef<UnicodePipeContract.Exp:READY> initialClientArgument;
+            TRef<UnicodePipeContract.Imp:READY>! threadStartupArgument1;
+            TRef<PipeMultiplexControl.Exp:START>! threadStartupArgument2;
+
+
+            public PipeThread([Claims] UnicodePipeContract.Imp:READY! output,
+                              [Claims] PipeMultiplexControl.Exp:START! control,
+                              [Claims] UnicodePipeContract.Exp:READY? initialClient)
+            {
+                this.threadStartupArgument1 = new TRef<UnicodePipeContract.Imp:READY>(output);
+                this.threadStartupArgument2 = new TRef<PipeMultiplexControl.Exp:START>(control);
+                if (initialClient != null) {
+                    this.initialClientArgument = 
+                        new TRef<UnicodePipeContract.Exp:READY>(initialClient);
+                }
+            }
+
+
+            public void Start() {
+                UnicodePipeContract.Exp:READY? initialClient = null;
+                if (this.initialClientArgument != null) {
+                    initialClient = this.initialClientArgument.Acquire();
+                }
+                MessagePump(this.threadStartupArgument1.Acquire(),
+                            this.threadStartupArgument2.Acquire(),
+                            initialClient);
+            }
+
+
+            private static void MessagePump([Claims] UnicodePipeContract.Imp:READY! output,
+                                            [Claims] PipeMultiplexControl.Exp:START! control,
+                                            [Claims] UnicodePipeContract.Exp:READY? initialClient)
+            {
+                ESet<UnicodePipeContract.Imp:ACK> waitingForOutputAck =
+                    new ESet<UnicodePipeContract.Imp:ACK>();
+
+                ESet<UnicodePipeContract.Exp:ACK> clientWaitingForAck =
+                    new ESet<UnicodePipeContract.Exp:ACK>();
+
+                ESet<UnicodePipeContract.Imp:READY> outputReady =
+                    new ESet<UnicodePipeContract.Imp:READY>();
+
+                ESet<UnicodePipeContract.Exp:READY> clients = 
+                    new ESet<UnicodePipeContract.Exp:READY>();
+
+                if (initialClient != null) {
+                    clients.Add(initialClient);
+                }
+                outputReady.Add(output);
+
+                bool done = false;
+
+                try {
+                    while (!done) {
+                        switch receive {
+
+                        case control.NewInput(client):
+                            //DebugStub.WriteLine("pipe multiplexer new client [{0}]",
+                            //                    __arglist(clients.Count+1));
+                            client.SendMoved();
+                            clients.Add(client);
+                            control.SendAck();
+                            break;
+
+                        case control.ChannelClosed():
+                            //DebugStub.WriteLine("pipe multiplexer control channel closed");
+                            done = true; 
+                            break;
+
+                        case client.Write(buffer, index, count) in clients && 
+                            outputReady.Head(outputEp):
+                            // a client wants to write and the output is ready
+                            //DebugStub.WriteLine("pipe multiplexer [{0}] client writes",
+                            //                    __arglist(clients.Count+1));
+                            outputEp.SendWrite(buffer, index, count);
+                            clientWaitingForAck.Add(client);
+                            waitingForOutputAck.Add(outputEp);
+                            continue;
+
+                        case outputEp.AckWrite(buffer) in waitingForOutputAck &&
+                            clientWaitingForAck.Head(client):
+                            // a client is waiting for ack and output sent us ack
+                            //DebugStub.WriteLine("pipe multiplexer: output Acks");
+                            client.SendAckWrite(buffer);
+                            clients.Add(client);
+                            outputReady.Add(outputEp);
+                            continue;
+
+                        case client.ChannelClosed() in clients:
+                            //DebugStub.WriteLine("pipe multiplexer: client departs");
+                            delete client;
+                            continue;
+
+                        case outputEp.ChannelClosed() in waitingForOutputAck:
+                            DebugStub.WriteLine("pipe multiplexer: output closes");
+                            delete outputEp;
+                            done = true;
+                            break;
+                        }
+                    }
+                }
+                finally {
+                    waitingForOutputAck.Dispose();
+                    outputReady.Dispose();
+                    clientWaitingForAck.Dispose();
+                    clients.Dispose();
+                    delete control;
+                }
+            }
+        }
+
+        /// Can be null when control channel closed
+        private PipeMultiplexControl.Imp:START controlChannel;
+
+        private PipeMultiplexer([Claims] PipeMultiplexControl.Imp:START! control) {
+            this.controlChannel = control;
+        }
+
+        public static PipeMultiplexer!
+        Start([Claims] UnicodePipeContract.Imp:READY! output, 
+              [Claims] UnicodePipeContract.Exp:READY? initialClient)
+        {
+            PipeMultiplexControl.Imp! controlImp;
+            PipeMultiplexControl.Exp! controlExp;
+            PipeMultiplexControl.NewChannel(out controlImp, out controlExp);
+
+            PipeThread pipeThread = new PipeThread(output, controlExp, initialClient);
+
+            Thread t = new Thread(new ThreadStart(pipeThread.Start));
+            t.Start();
+            return new PipeMultiplexer(controlImp);
+        }
+
+        /// <summary>
+        /// Adds a fresh input pipe to the multiplexer and returns the client end.
+        /// </summary>
+        public UnicodePipeContract.Imp:READY FreshClient() {
+            expose (this) {
+                PipeMultiplexControl.Imp control = this.controlChannel;
+                if (control == null) return null; // channel closed
+
+                UnicodePipeContract.Imp! client;
+                UnicodePipeContract.Exp! exp;
+                UnicodePipeContract.NewChannel(out client, out exp, UnicodePipeContract.EXPMOVABLE.Value);
+                control.SendNewInput(exp);
+                switch receive {
+                    case control.Ack():
+                        // put client into correct state:
+
+                        switch receive {
+                        case client.Moved():
+                            return client;
+
+                        case client.ChannelClosed():
+                            delete client;
+                            return null;
+                        }
+
+                    case control.ChannelClosed():
+                        delete control;
+                        delete client;
+                        this.controlChannel = null;
+                        return null;
+                }
+            }
+            
+        }
+
+        public void Dispose()
+        {
+            delete this.controlChannel;
+        }
+        
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/Memory/Stacks.cs b/base/Applications/Runtime/Singularity/Memory/Stacks.cs
new file mode 100644
index 0000000..5388274
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Memory/Stacks.cs
@@ -0,0 +1,161 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Stacks.cs - Primitive stack segment manager
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Memory {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.X86;
+    using Microsoft.Singularity.V1.Services;
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    [RequiredByBartok]
+    internal class Stacks {
+
+        internal static unsafe void Initialize()
+        {
+            DebugStub.Print("Stacks.Initialize() called\n");
+        }
+
+        internal static unsafe void Finalize()
+        {
+            DebugStub.Print("Stacks.Finalize() called\n");
+        }
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack0(); // Copy 0 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack4(); // Copy 4 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack8(); // Copy 8 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack12(); // Copy 12 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack16(); // Copy 16 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack20(); // Copy 20 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack24(); // Copy 24 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack28(); // Copy 28 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack32(); // Copy 32 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack36(); // Copy 36 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack40(); // Copy 40 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack44(); // Copy 44 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack48(); // Copy 48 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack52(); // Copy 52 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack56(); // Copy 56 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack60(); // Copy 60 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [RequiredByBartok]
+        internal static extern void LinkStack64(); // Copy 64 bytes of arguments on stack.
+
+        [ExternalStaticData]
+        internal static byte UnlinkStackBegin;
+
+        [ExternalStaticData]
+        internal static byte UnlinkStackLimit;
+    }
+}
diff --git a/base/Applications/Runtime/Singularity/Naming/NameService.sg b/base/Applications/Runtime/Singularity/Naming/NameService.sg
new file mode 100644
index 0000000..c7ecf1f
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Naming/NameService.sg
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryService.sg
+//
+//  Note:
+//
+//      This file provides an implementation of Directory.DirectoryService.NewClientEndpoint
+//  that calls through the ABI to retrieve the name-service channel endpoint.
+//  This is for use by applications; kernel components can call the "real"
+//  DirectoryService class directly.
+//
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Directory
+{
+    public class DirectoryService
+    {
+        public static unsafe DirectoryServiceContract.Imp!:Ready NewClientEndpoint()
+        {
+            return (DirectoryServiceContract.Imp!)ProcessService.GetNamespaceEndpoint();
+        }
+   }
+}
diff --git a/base/Applications/Runtime/Singularity/Processor.cs b/base/Applications/Runtime/Singularity/Processor.cs
new file mode 100644
index 0000000..9ef1c6f
--- /dev/null
+++ b/base/Applications/Runtime/Singularity/Processor.cs
@@ -0,0 +1,237 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Processor.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    using Microsoft.Singularity.X86;
+    using Microsoft.Singularity.V1.Services;
+
+    [CLSCompliant(false)]
+    [NoCCtor]
+    public class Processor
+    {
+        public static long CyclesPerSecond
+        {
+            [NoHeapAllocation]
+            get { return ProcessService.GetCyclesPerSecond(); }
+        }
+
+        public static ulong CycleCount
+        {
+            [NoHeapAllocation]
+            get { return GetCycleCount(); }
+        }
+
+        //////////////////////////////////////////////////// External Methods.
+        //
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        public static extern ulong GetCycleCount();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern UIntPtr GetFrameEip(UIntPtr ebp);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern UIntPtr GetFrameEbp(UIntPtr ebp);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern UIntPtr GetStackPointer();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern UIntPtr GetFramePointer();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern ThreadContext * GetCurrentThreadContext();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern ProcessorContext * GetCurrentProcessorContext();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern Thread GetCurrentThread();
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void WriteMsr(uint offset,
+                                           ulong value);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern ulong ReadMsr(uint offset);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(64)]
+        [NoHeapAllocation]
+        public static extern void ReadCpuid(uint feature,
+                                            out uint v0,
+                                            out uint v1,
+                                            out uint v2,
+                                            out uint v3);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern ulong ReadPmc(uint offset);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void EnterRing3();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        public static extern bool AtKernelPrivilege();
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        // These methods are currently marked external because they are used
+        // by device drivers.  We need a tool to verify that device drivers
+        // are in fact using them correctly!
+        //
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern bool DisableInterrupts();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void RestoreInterrupts(bool enabled);
+
+        // Use this method for assertions only!
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern bool InterruptsDisabled();
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        // These methods are public and safe to use from any where provided
+        // there's at least 2 call frame on the stack.
+        //
+        [NoHeapAllocation]
+        public static UIntPtr GetCallerEip()
+        {
+            UIntPtr currentFrame = GetFramePointer();
+            UIntPtr callerFrame = GetFrameEbp(currentFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return UIntPtr.Zero;
+            }
+            UIntPtr callersCaller = GetFrameEip(callerFrame);
+            return callersCaller;
+        }
+
+        /// <summary>
+        /// Provides a mini stack trace starting from the caller of the caller
+        /// of this method.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void GetStackEips(out UIntPtr pc1, out UIntPtr pc2, out UIntPtr pc3)
+        {
+            pc1 = UIntPtr.Zero;
+            pc2 = UIntPtr.Zero;
+            pc3 = UIntPtr.Zero;
+
+            UIntPtr currentFrame = GetFramePointer();
+            UIntPtr callerFrame = GetFrameEbp(currentFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return;
+            }
+            pc1 = GetFrameEip(callerFrame);
+            callerFrame = GetFrameEbp(callerFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return;
+            }
+            pc2 = GetFrameEip(callerFrame);
+            callerFrame = GetFrameEbp(callerFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return;
+            }
+            pc3 = GetFrameEip(callerFrame);
+        }
+
+        /// <summary>
+        /// Provides the full stack trace starting from the caller of the caller
+        /// of this method.
+        /// </summary>
+        /// <returns>Eip values in stack array from top to bottom</returns>
+        [NoHeapAllocation]
+        public static void GetStackEips(UIntPtr[] stack)
+        {
+            if (stack == null) {
+                return;
+            }
+            UIntPtr currentFrame = GetFramePointer();
+            UIntPtr callerFrame = GetFrameEbp(currentFrame);
+            for (int index = 0; callerFrame != UIntPtr.Zero && index < stack.Length; index++) {
+                stack[index] = GetFrameEip(callerFrame);
+                callerFrame = GetFrameEbp(callerFrame);
+            }
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Console.cs b/base/Applications/Runtime/System/Console.cs
new file mode 100644
index 0000000..0cd4eb6
--- /dev/null
+++ b/base/Applications/Runtime/System/Console.cs
@@ -0,0 +1,319 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System {
+    using Microsoft.Singularity;
+#if !MINRUNTIME
+    using Microsoft.Singularity.Io;
+#endif
+    using System;
+    using System.Text;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    using System.Runtime.InteropServices;
+
+    // Provides static fields for console input and output.  Use
+    // Console.In for input from the standard input stream (stdin),
+    // Console.Out for output to stdout, and Console.Error
+    // for output to stderr.  If any of those console streams are
+    // redirected from the command line, these streams will be redirected.
+    // A program can also redirect its own output or input with the
+    // SetIn, SetOut, and SetError methods.
+    //
+    // The distinction between Console.Out and Console.Error is useful
+    // for programs that redirect output to a file or a pipe.  Note that
+    // stdout and stderr can be output to different files at the same
+    // time from the DOS command line:
+    //
+    // someProgram 1> out 2> err
+    //
+    //| <include path='docs/doc[@for="Console"]/*' />
+    public sealed class Console
+    {
+        private Console()
+        {
+            throw new NotSupportedException("NotSupported_Constructor");
+        }
+
+        static Console() {
+        }
+
+
+        private static void WriteInternal(char[] buffer, int index, int count)
+        {
+#if !MINRUNTIME
+            ConsoleOutput.Write(buffer, index, count);
+#else
+            for (int i = 0; i < count; i++) {
+                DebugStub.Print(buffer[index + i]);
+            }
+#endif
+        }
+
+        private static void WriteInternal(String value)
+        {
+#if !MINRUNTIME
+            ConsoleOutput.Write(value);
+#else
+            DebugStub.Print(value);
+#endif
+        }
+
+        private static void WriteNewLine()
+        {
+            WriteInternal(Environment.NewLine);
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine"]/*' />
+        public static void WriteLine()
+        {
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine13"]/*' />
+        public static void WriteLine(String value)
+        {
+            WriteInternal(value);
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine1"]/*' />
+        public static void WriteLine(bool value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine2"]/*' />
+        public static void WriteLine(char value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine3"]/*' />
+        public static void WriteLine(char[] buffer)
+        {
+            WriteInternal(buffer, 0, buffer.Length);
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine4"]/*' />
+        public static void WriteLine(char[] buffer, int index, int count)
+        {
+            WriteInternal(buffer, index, count);
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine5"]/*' />
+        public static void WriteLine(decimal value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine6"]/*' />
+        public static void WriteLine(double value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine7"]/*' />
+        public static void WriteLine(float value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine8"]/*' />
+        public static void WriteLine(int value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine9"]/*' />
+        [CLSCompliant(false)]
+        public static void WriteLine(uint value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine10"]/*' />
+        public static void WriteLine(long value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine11"]/*' />
+        [CLSCompliant(false)]
+        public static void WriteLine(ulong value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine12"]/*' />
+        public static void WriteLine(Object value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine14"]/*' />
+        public static void WriteLine(String format, Object arg0)
+        {
+            WriteInternal(String.Format(format, arg0));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine15"]/*' />
+        public static void WriteLine(String format, Object arg0, Object arg1)
+        {
+            WriteInternal(String.Format(format, arg0, arg1));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine16"]/*' />
+        public static void WriteLine(String format, Object arg0, Object arg1, Object arg2)
+        {
+            WriteInternal(String.Format(format, arg0, arg1, arg2));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine18"]/*' />
+        public static void WriteLine(String format, params Object[] args)
+        {
+            WriteInternal(String.Format(format, args));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.Write"]/*' />
+        public static void Write(String format, Object arg0)
+        {
+            WriteInternal(String.Format(format, arg0));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write1"]/*' />
+        public static void Write(String format, Object arg0, Object arg1)
+        {
+            WriteInternal(String.Format(format, arg0, arg1));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write2"]/*' />
+        public static void Write(String format, Object arg0, Object arg1, Object arg2)
+        {
+            WriteInternal(String.Format(format, arg0, arg1, arg2));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write4"]/*' />
+        public static void Write(String format, params Object[] args)
+        {
+            WriteInternal(String.Format(format, args));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write5"]/*' />
+        public static void Write(bool value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write6"]/*' />
+        public static void Write(char value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write7"]/*' />
+        public static void Write(char[] buffer)
+        {
+            WriteInternal(buffer, 0, buffer.Length);
+        }
+
+        //| <include path='docs/doc[@for="Console.Write8"]/*' />
+        public static void Write(char[] buffer, int index, int count)
+        {
+            WriteInternal(buffer, index, count);
+        }
+
+        //| <include path='docs/doc[@for="Console.Write9"]/*' />
+        public static void Write(double value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write10"]/*' />
+        public static void Write(decimal value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write11"]/*' />
+        public static void Write(float value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write12"]/*' />
+        public static void Write(int value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write13"]/*' />
+        [CLSCompliant(false)]
+        public static void Write(uint value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write14"]/*' />
+        public static void Write(long value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write15"]/*' />
+        [CLSCompliant(false)]
+        public static void Write(ulong value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write16"]/*' />
+        public static void Write(Object value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write17"]/*' />
+        public static void Write(String value)
+        {
+            WriteInternal(value);
+        }
+
+        public static int Read()
+        {
+#if !MINRUNTIME
+            return ConsoleInput.ReadChar(); 
+#else
+            return -1;
+#endif
+        }
+        public static string ReadLine()
+        {
+#if !MINRUNTIME
+            return ConsoleInput.ReadLine();
+#else
+            return "";
+#endif
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/DateTime.cs b/base/Applications/Runtime/System/DateTime.cs
new file mode 100644
index 0000000..72ccac3
--- /dev/null
+++ b/base/Applications/Runtime/System/DateTime.cs
@@ -0,0 +1,783 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Threading;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using CultureInfo = System.Globalization.CultureInfo;
+    using Microsoft.Singularity.V1.Services;
+
+    // This value type represents a date and time.  Every DateTime
+    // object has a private field (Ticks) of type Int64 that stores the
+    // date and time as the number of 100 nanosecond intervals since
+    // 12:00 AM January 1, year 1 A.D. in the proleptic Gregorian Calendar.
+    //
+    // DateTime spans from 1 A.D. to ~29247 A.D.
+    //
+    // For a description of various calendar issues, look at
+    //
+    // Calendar Studies web site, at
+    // http://serendipity.nofadz.com/hermetic/cal_stud.htm.
+    //
+    //
+    // Warning about 2 digit years
+    // As a temporary hack until we get new DateTime <;->; String code,
+    // some systems won't be able to round trip dates less than 1930.  This
+    // is because we're using OleAut's string parsing routines, which look
+    // at your computer's default short date string format, which uses 2 digit
+    // years on most computers.  To fix this, go to Control Panel ->; Regional
+    // Settings ->; Date and change the short date style to something like
+    // "M/d/yyyy" (specifying four digits for the year).
+    //
+    //| <include path='docs/doc[@for="DateTime"]/*' />
+    [StructLayout(LayoutKind.Auto)]
+    public struct DateTime : IComparable, IFormattable
+    {
+        // Number of 100ns ticks per time unit
+        public const long TicksPerMillisecond = 10000;
+        public const long TicksPerSecond = TicksPerMillisecond * 1000;
+        public const long TicksPerMinute = TicksPerSecond * 60;
+        public const long TicksPerHour = TicksPerMinute * 60;
+        public const long TicksPerDay = TicksPerHour * 24;
+
+        // Number of milliseconds per time unit
+        private const int MillisPerSecond = 1000;
+        private const int MillisPerMinute = MillisPerSecond * 60;
+        private const int MillisPerHour = MillisPerMinute * 60;
+        private const int MillisPerDay = MillisPerHour * 24;
+
+        // Number of days in a non-leap year
+        private const int DaysPerYear = 365;
+        // Number of days in 4 years
+        private const int DaysPer4Years = DaysPerYear * 4 + 1;
+        // Number of days in 100 years
+        private const int DaysPer100Years = DaysPer4Years * 25 - 1;
+        // Number of days in 400 years
+        private const int DaysPer400Years = DaysPer100Years * 4 + 1;
+
+        // Number of days from 1/1/0001 to 12/31/1600
+        private const int DaysTo1601 = DaysPer400Years * 4;
+        // Number of days from 1/1/0001 to 12/30/1899
+        private const int DaysTo1899 = DaysPer400Years * 4 + DaysPer100Years * 3 - 367;
+        // Number of days from 1/1/0001 to 12/31/9999
+        private const int DaysTo10000 = DaysPer400Years * 25 - 366;
+
+        private const long MinTicks = 0;
+        private const long MaxTicks = DaysTo10000 * TicksPerDay - 1;
+        private const long MaxMillis = (long)DaysTo10000 * MillisPerDay;
+
+        private const long FileTimeOffset = DaysTo1601 * TicksPerDay;
+
+        private const int DatePartYear = 0;
+        private const int DatePartDayOfYear = 1;
+        private const int DatePartMonth = 2;
+        private const int DatePartDay = 3;
+
+        private static readonly int[] DaysToMonth365 = {
+            0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
+        private static readonly int[] DaysToMonth366 = {
+            0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366};
+
+        //| <include path='docs/doc[@for="DateTime.MinValue"]/*' />
+        public static readonly DateTime MinValue = new DateTime(MinTicks);
+        //| <include path='docs/doc[@for="DateTime.MaxValue"]/*' />
+        public static readonly DateTime MaxValue = new DateTime(MaxTicks);
+
+        //
+        // NOTE yslin: Before the time zone is introduced, ticks is based on 1/1/0001 local time.
+        //
+        private long ticks;
+
+        // Constructs a DateTime from a tick count. The ticks
+        // argument specifies the date as the number of 100-nanosecond intervals
+        // that have elapsed since 1/1/0001 12:00am.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime"]/*' />
+        public DateTime(long ticks) {
+            if (ticks < MinTicks || ticks > MaxTicks)
+                throw new ArgumentOutOfRangeException("ticks", "ArgumentOutOfRange_DateTimeBadTicks");
+            this.ticks = ticks;
+        }
+
+        [NoHeapAllocation]
+        private DateTime(long ticksFound, int ignoreMe) {
+            this.ticks = ticksFound;
+            if ((ulong)ticks>(ulong)MaxTicks) {
+                if (ticks>MaxTicks) {
+                    ticks = MaxTicks;
+                } else {
+                    ticks = MinTicks;
+                }
+            }
+        }
+
+        // Constructs a DateTime from a given year, month, and day. The
+        // time-of-day of the resulting DateTime is always midnight.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime1"]/*' />
+        public DateTime(int year, int month, int day) {
+            ticks = DateToTicks(year, month, day);
+        }
+
+        // Constructs a DateTime from a given year, month, day, hour,
+        // minute, and second.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime3"]/*' />
+        public DateTime(int year, int month, int day, int hour, int minute, int second) {
+            ticks = DateToTicks(year, month, day) + TimeToTicks(hour, minute, second);
+        }
+
+        // Constructs a DateTime from a given year, month, day, hour,
+        // minute, and second.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime5"]/*' />
+        public DateTime(int year, int month, int day, int hour, int minute, int second, int millisecond) {
+            ticks = DateToTicks(year, month, day) + TimeToTicks(hour, minute, second);
+            if (millisecond < 0 || millisecond >= MillisPerSecond) {
+                throw new ArgumentOutOfRangeException("millisecond", String.Format("ArgumentOutOfRange_Range", 0, MillisPerSecond - 1));
+            }
+            ticks += millisecond * TicksPerMillisecond;
+            if (ticks < MinTicks || ticks > MaxTicks)
+                throw new ArgumentException("Arg_DateTimeRange");
+        }
+
+        // Returns the DateTime resulting from adding the given
+        // TimeSpan to this DateTime.
+        //
+        //| <include path='docs/doc[@for="DateTime.Add"]/*' />
+        public DateTime Add(TimeSpan value) {
+            return new DateTime(ticks + value._ticks);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // time units to this DateTime.
+        private DateTime Add(long value, int scale) {
+            long millis = value * scale;
+            if (millis <= -MaxMillis || millis >= MaxMillis) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_AddValue");
+            }
+            return new DateTime(ticks + millis * TicksPerMillisecond);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // days to this DateTime. The result is computed by rounding the
+        // fractional number of days given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddDays"]/*' />
+        public DateTime AddDays(long value) {
+            return Add(value, MillisPerDay);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // hours to this DateTime. The result is computed by rounding the
+        // fractional number of hours given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddHours"]/*' />
+        public DateTime AddHours(long value) {
+            return Add(value, MillisPerHour);
+        }
+
+        // Returns the DateTime resulting from the given number of
+        // milliseconds to this DateTime. The result is computed by rounding
+        // the number of milliseconds given by value to the nearest integer,
+        // and adding that interval to this DateTime. The value
+        // argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddMilliseconds"]/*' />
+        public DateTime AddMilliseconds(long value) {
+            return Add(value, 1);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // minutes to this DateTime. The result is computed by rounding the
+        // fractional number of minutes given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddMinutes"]/*' />
+        public DateTime AddMinutes(long value) {
+            return Add(value, MillisPerMinute);
+        }
+
+        // Returns the DateTime resulting from adding the given number of
+        // months to this DateTime. The result is computed by incrementing
+        // (or decrementing) the year and month parts of this DateTime by
+        // months months, and, if required, adjusting the day part of the
+        // resulting date downwards to the last day of the resulting month in the
+        // resulting year. The time-of-day part of the result is the same as the
+        // time-of-day part of this DateTime.
+        //
+        // In more precise terms, considering this DateTime to be of the
+        // form y / m / d + t, where y is the
+        // year, m is the month, d is the day, and t is the
+        // time-of-day, the result is y1 / m1 / d1 + t,
+        // where y1 and m1 are computed by adding months months
+        // to y and m, and d1 is the largest value less than
+        // or equal to d that denotes a valid day in month m1 of year
+        // y1.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddMonths"]/*' />
+        public DateTime AddMonths(int months) {
+            if (months < -120000 || months > 120000) throw new ArgumentOutOfRangeException("months", "ArgumentOutOfRange_DateTimeBadMonths");
+            int y = GetDatePart(DatePartYear);
+            int m = GetDatePart(DatePartMonth);
+            int d = GetDatePart(DatePartDay);
+            int i = m - 1 + months;
+            if (i >= 0) {
+                m = i % 12 + 1;
+                y = y + i / 12;
+            }
+            else {
+                m = 12 + (i + 1) % 12;
+                y = y + (i - 11) / 12;
+            }
+            int days = DaysInMonth(y, m);
+            if (d > days) d = days;
+            return new DateTime(DateToTicks(y, m, d) + ticks % TicksPerDay);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // seconds to this DateTime. The result is computed by rounding the
+        // fractional number of seconds given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddSeconds"]/*' />
+        public DateTime AddSeconds(long value) {
+            return Add(value, MillisPerSecond);
+        }
+
+        // Returns the DateTime resulting from adding the given number of
+        // 100-nanosecond ticks to this DateTime. The value argument
+        // is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddTicks"]/*' />
+        public DateTime AddTicks(long value) {
+            return new DateTime(ticks + value);
+        }
+
+        // Returns the DateTime resulting from adding the given number of
+        // years to this DateTime. The result is computed by incrementing
+        // (or decrementing) the year part of this DateTime by value
+        // years. If the month and day of this DateTime is 2/29, and if the
+        // resulting year is not a leap year, the month and day of the resulting
+        // DateTime becomes 2/28. Otherwise, the month, day, and time-of-day
+        // parts of the result are the same as those of this DateTime.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddYears"]/*' />
+        public DateTime AddYears(int value) {
+            return AddMonths(value * 12);
+        }
+
+
+
+        // Compares two DateTime values, returning an integer that indicates
+        // their relationship.
+        //
+        //| <include path='docs/doc[@for="DateTime.Compare"]/*' />
+        [NoHeapAllocation]
+        public static int Compare(DateTime t1, DateTime t2) {
+            if (t1.ticks > t2.ticks) return 1;
+            if (t1.ticks < t2.ticks) return -1;
+            return 0;
+        }
+
+        // Compares this DateTime to a given object. This method provides an
+        // implementation of the IComparable interface. The object
+        // argument must be another DateTime, or otherwise an exception
+        // occurs.  Null is considered less than any instance.
+        //
+        // Returns a value less than zero if this  object
+        //| <include path='docs/doc[@for="DateTime.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) return 1;
+            if (!(value is DateTime)) {
+                throw new ArgumentException("Arg_MustBeDateTime");
+            }
+
+            long t = ((DateTime)value).ticks;
+            if (ticks > t) return 1;
+            if (ticks < t) return -1;
+            return 0;
+        }
+
+        // Returns the tick count corresponding to the given year, month, and day.
+        // Will check the if the parameters are valid.
+        private static long DateToTicks(int year, int month, int day) {
+            if (year >= 1 && year <= 9999 && month >= 1 && month <= 12) {
+                int[] days = IsLeapYear(year)? DaysToMonth366: DaysToMonth365;
+                if (day >= 1 && day <= days[month] - days[month - 1]) {
+                    int y = year - 1;
+                    int n = y * 365 + y / 4 - y / 100 + y / 400 + days[month - 1] + day - 1;
+                    return n * TicksPerDay;
+                }
+            }
+            throw new ArgumentOutOfRangeException("ArgumentOutOfRange_BadYearMonthDay");
+        }
+
+        // Return the tick count corresponding to the given hour, minute, second.
+        // Will check the if the parameters are valid.
+        private static long TimeToTicks(int hour, int minute, int second)
+        {
+            //TimeSpan.TimeToTicks is a family access function which does no error checking, so
+            //we need to put some error checking out here.
+            if (hour >= 0 && hour < 24 && minute >= 0 && minute < 60 && second >=0 && second < 60)
+            {
+                return (TimeSpan.TimeToTicks(hour, minute, second));
+            }
+            throw new ArgumentOutOfRangeException("ArgumentOutOfRange_BadHourMinuteSecond");
+        }
+
+        // Returns the number of days in the month given by the year and
+        // month arguments.
+        //
+        //| <include path='docs/doc[@for="DateTime.DaysInMonth"]/*' />
+        public static int DaysInMonth(int year, int month) {
+            if (month < 1 || month > 12) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Month");
+            int[] days = IsLeapYear(year)? DaysToMonth366: DaysToMonth365;
+            return days[month] - days[month - 1];
+        }
+
+        // Checks if this DateTime is equal to a given object. Returns
+        // true if the given object is a boxed DateTime and its value
+        // is equal to the value of this DateTime. Returns false
+        // otherwise.
+        //
+        //| <include path='docs/doc[@for="DateTime.Equals"]/*' />
+        public override bool Equals(Object value) {
+            if (value is DateTime) {
+                return ticks == ((DateTime)value).ticks;
+            }
+            return false;
+        }
+
+        // Compares two DateTime values for equality. Returns true if
+        // the two DateTime values are equal, or false if they are
+        // not equal.
+        //
+        //| <include path='docs/doc[@for="DateTime.Equals1"]/*' />
+        [NoHeapAllocation]
+        public static bool Equals(DateTime t1, DateTime t2) {
+            return t1.ticks == t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.FromFileTimeUtc"]/*' />
+        public static DateTime FromFileTimeUtc(long fileTime) {
+            if (fileTime < 0)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_FileTimeInvalid");
+
+            // This is the ticks in Universal time for this fileTime.
+            long universalTicks = fileTime + FileTimeOffset;
+            return new DateTime(universalTicks);
+        }
+
+        // Returns the date part of this DateTime. The resulting value
+        // corresponds to this DateTime with the time-of-day part set to
+        // zero (midnight).
+        //
+        //| <include path='docs/doc[@for="DateTime.Date"]/*' />
+        public DateTime Date {
+            get { return new DateTime(ticks - ticks % TicksPerDay); }
+        }
+
+        // Returns a given date part of this DateTime. This method is used
+        // to compute the year, day-of-year, month, or day part.
+        [NoHeapAllocation]
+        private int GetDatePart(int part) {
+            // n = number of days since 1/1/0001
+            int n = (int)(ticks / TicksPerDay);
+            // y400 = number of whole 400-year periods since 1/1/0001
+            int y400 = n / DaysPer400Years;
+            // n = day number within 400-year period
+            n -= y400 * DaysPer400Years;
+            // y100 = number of whole 100-year periods within 400-year period
+            int y100 = n / DaysPer100Years;
+            // Last 100-year period has an extra day, so decrement result if 4
+            if (y100 == 4) y100 = 3;
+            // n = day number within 100-year period
+            n -= y100 * DaysPer100Years;
+            // y4 = number of whole 4-year periods within 100-year period
+            int y4 = n / DaysPer4Years;
+            // n = day number within 4-year period
+            n -= y4 * DaysPer4Years;
+            // y1 = number of whole years within 4-year period
+            int y1 = n / DaysPerYear;
+            // Last year has an extra day, so decrement result if 4
+            if (y1 == 4) y1 = 3;
+            // If year was requested, compute and return it
+            if (part == DatePartYear) {
+                return y400 * 400 + y100 * 100 + y4 * 4 + y1 + 1;
+            }
+            // n = day number within year
+            n -= y1 * DaysPerYear;
+            // If day-of-year was requested, return it
+            if (part == DatePartDayOfYear) return n + 1;
+            // Leap year calculation looks different from IsLeapYear since y1, y4,
+            // and y100 are relative to year 1, not year 0
+            bool leapYear = y1 == 3 && (y4 != 24 || y100 == 3);
+            int[] days = leapYear? DaysToMonth366: DaysToMonth365;
+            // All months have less than 32 days, so n >> 5 is a good conservative
+            // estimate for the month
+            int m = n >> 5 + 1;
+            // m = 1-based month number
+            while (n >= days[m]) m++;
+            // If month was requested, return it
+            if (part == DatePartMonth) return m;
+            // Return 1-based day-of-month
+            return n - days[m - 1] + 1;
+        }
+
+        // Returns the day-of-month part of this DateTime. The returned
+        // value is an integer between 1 and 31.
+        //
+        //| <include path='docs/doc[@for="DateTime.Day"]/*' />
+        public int Day {
+            [NoHeapAllocation]
+            get { return GetDatePart(DatePartDay); }
+        }
+
+        // Returns the day-of-week part of this DateTime. The returned value
+        // is an integer between 0 and 6, where 0 indicates Sunday, 1 indicates
+        // Monday, 2 indicates Tuesday, 3 indicates Wednesday, 4 indicates
+        // Thursday, 5 indicates Friday, and 6 indicates Saturday.
+        //
+        //| <include path='docs/doc[@for="DateTime.DayOfWeek"]/*' />
+        public DayOfWeek DayOfWeek {
+            [NoHeapAllocation]
+            get { return (DayOfWeek)((ticks / TicksPerDay + 1) % 7); }
+        }
+
+        // Returns the day-of-year part of this DateTime. The returned value
+        // is an integer between 1 and 366.
+        //
+        //| <include path='docs/doc[@for="DateTime.DayOfYear"]/*' />
+        public int DayOfYear {
+            [NoHeapAllocation]
+            get { return GetDatePart(DatePartDayOfYear); }
+        }
+
+        // Returns the hash code for this DateTime.
+        //
+        //| <include path='docs/doc[@for="DateTime.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (int)ticks ^ (int)(ticks >> 32);
+        }
+
+        // Returns the hour part of this DateTime. The returned value is an
+        // integer between 0 and 23.
+        //
+        //| <include path='docs/doc[@for="DateTime.Hour"]/*' />
+        public int Hour {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerHour) % 24); }
+        }
+
+        // Returns the millisecond part of this DateTime. The returned value
+        // is an integer between 0 and 999.
+        //
+        //| <include path='docs/doc[@for="DateTime.Millisecond"]/*' />
+        public int Millisecond {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerMillisecond) % 1000); }
+        }
+
+        // Returns the minute part of this DateTime. The returned value is
+        // an integer between 0 and 59.
+        //
+        //| <include path='docs/doc[@for="DateTime.Minute"]/*' />
+        public int Minute {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerMinute) % 60); }
+        }
+
+        // Returns the month part of this DateTime. The returned value is an
+        // integer between 1 and 12.
+        //
+        //| <include path='docs/doc[@for="DateTime.Month"]/*' />
+        public int Month {
+            [NoHeapAllocation]
+            get { return GetDatePart(DatePartMonth); }
+        }
+
+        [NoHeapAllocation]
+        private static DateTime GetUtcTime()
+        {
+            return ProcessService.GetUtcTime();
+        }
+
+        // Returns a DateTime representing the current date and time. The
+        // resolution of the returned value depends on the system timer. For
+        // Windows NT 3.5 and later the timer resolution is approximately 10ms,
+        // for Windows NT 3.1 it is approximately 16ms, and for Windows 95 and 98
+        // it is approximately 55ms.
+        //
+        //| <include path='docs/doc[@for="DateTime.Now"]/*' />
+        public static DateTime Now {
+            [NoHeapAllocation]
+            get { return GetUtcTime(); }
+        }
+
+        //| <include path='docs/doc[@for="DateTime.UtcNow"]/*' />
+        public static DateTime UtcNow {
+            [NoHeapAllocation]
+            get { return GetUtcTime(); }
+        }
+
+        public static DateTime BootTime {
+            get { return Now - ProcessService.GetUpTime(); }
+        }
+
+        // Returns the second part of this DateTime. The returned value is
+        // an integer between 0 and 59.
+        //
+        //| <include path='docs/doc[@for="DateTime.Second"]/*' />
+        public int Second {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerSecond) % 60); }
+        }
+
+        // Returns the tick count for this DateTime. The returned value is
+        // the number of 100-nanosecond intervals that have elapsed since 1/1/0001
+        // 12:00am.
+        //
+        //| <include path='docs/doc[@for="DateTime.Ticks"]/*' />
+        public long Ticks {
+            [NoHeapAllocation]
+            get { return ticks; }
+        }
+
+        // Returns the time-of-day part of this DateTime. The returned value
+        // is a TimeSpan that indicates the time elapsed since midnight.
+        //
+        //| <include path='docs/doc[@for="DateTime.TimeOfDay"]/*' />
+        public TimeSpan TimeOfDay {
+            get { return new TimeSpan(ticks % TicksPerDay); }
+        }
+
+        // Returns a DateTime representing the current date. The date part
+        // of the returned value is the current date, and the time-of-day part of
+        // the returned value is zero (midnight).
+        //
+        //| <include path='docs/doc[@for="DateTime.Today"]/*' />
+        public static DateTime Today {
+            get {
+                long ticks = Now.Ticks;
+                return new DateTime(ticks - ticks % TicksPerDay);
+            }
+        }
+
+        // Returns the year part of this DateTime. The returned value is an
+        // integer between 1 and 9999.
+        //
+        //| <include path='docs/doc[@for="DateTime.Year"]/*' />
+        public int Year {
+            [NoHeapAllocation]
+            get { return GetDatePart(DatePartYear); }
+        }
+
+        // Checks whether a given year is a leap year. This method returns true if
+        // year is a leap year, or false if not.
+        //
+        //| <include path='docs/doc[@for="DateTime.IsLeapYear"]/*' />
+        [NoHeapAllocation]
+        public static bool IsLeapYear(int year) {
+            return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0);
+        }
+
+        // Constructs a DateTime from a string. The string must specify a
+        // date and optionally a time in a culture-specific or universal format.
+        // Leading and trailing whitespace characters are allowed.
+        //
+        //| <include path='docs/doc[@for="DateTime.Parse"]/*' />
+        public static DateTime Parse(String s) {
+            throw new Exception("Parse not supported in Bartok");
+        }
+
+        // Constructs a DateTime from a string. The string must specify a
+        // date and optionally a time in a culture-specific or universal format.
+        // Leading and trailing whitespace characters are allowed.
+        //
+        //| <include path='docs/doc[@for="DateTime.ParseExact"]/*' />
+        public static DateTime ParseExact(String s, String format) {
+            throw new Exception("Parse not supported in Bartok");
+        }
+
+        //| <include path='docs/doc[@for="DateTime.Subtract"]/*' />
+        public TimeSpan Subtract(DateTime value) {
+            return new TimeSpan(ticks - value.ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.Subtract1"]/*' />
+        public DateTime Subtract(TimeSpan value) {
+            return new DateTime(ticks - value._ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToFileTimeUtc"]/*' />
+        public long ToFileTimeUtc() {
+            long t = this.ticks - FileTimeOffset;
+            if (t < 0) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_FileTimeInvalid");
+            return t;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToLongDateString"]/*' />
+        public String ToLongDateString() {
+            return (ToString("D"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToLongTimeString"]/*' />
+        public String ToLongTimeString() {
+            return (ToString("T"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToShortDateString"]/*' />
+        public String ToShortDateString() {
+            return (ToString("d"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToShortTimeString"]/*' />
+        public String ToShortTimeString() {
+            return (ToString("t"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToString3"]/*' />
+        public String ToString(String format) {
+            // US-centric representation for now, until we have proper
+            // globalization in Singularity.
+            //
+            // The only special support here is for RFC1123 ("R" / "r")
+            if (format != null && (format.Equals("R") || format.Equals("r"))) {
+                return String.Format("{0:s}, {1:d02} {2:s} {3:d} {4:d02}:{5:d02}:{6:d02} GMT",
+                                     GetShortWeekday(), Day, GetShortMonth(), Year,
+                                     Hour, Minute, Second);
+            } else {
+                return String.Format("{0:d}/{1:d}/{2:d} {3:d}:{4:d}:{5:d}",
+                                     Month, Day, Year, Hour, Minute, Second);
+            }
+        }
+
+        public DateTime ToLocalTime() {
+            long tickCount = this.ticks;
+            return new DateTime(tickCount);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToUniversalTime"]/*' />
+        public DateTime ToUniversalTime() {
+            long tickCount = this.ticks;
+            return new DateTime(tickCount);
+        }
+
+
+        //| <include path='docs/doc[@for="DateTime.operatorADD"]/*' />
+        public static DateTime operator +(DateTime d, TimeSpan t) {
+            return new DateTime(d.ticks + t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorSUB"]/*' />
+        public static DateTime operator -(DateTime d, TimeSpan t) {
+            return new DateTime(d.ticks - t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorSUB1"]/*' />
+        public static TimeSpan operator -(DateTime d1, DateTime d2) {
+            return new TimeSpan(d1.ticks - d2.ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorEQ"]/*' />
+        [NoHeapAllocation]
+        public static bool operator ==(DateTime d1, DateTime d2) {
+            return d1.ticks == d2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorNE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator !=(DateTime d1, DateTime d2) {
+            return d1.ticks != d2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorLT"]/*' />
+        [NoHeapAllocation]
+        public static bool operator <(DateTime t1, DateTime t2) {
+            return t1.ticks < t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorLE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator <=(DateTime t1, DateTime t2) {
+            return t1.ticks <= t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorGT"]/*' />
+        [NoHeapAllocation]
+        public static bool operator >(DateTime t1, DateTime t2) {
+            return t1.ticks > t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorGE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator >=(DateTime t1, DateTime t2) {
+            return t1.ticks >= t2.ticks;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="DateTime.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.DateTime;
+        }
+
+        private string GetShortWeekday()
+        {
+            // Hardcoded USA-English until we support globalization
+            switch(DayOfWeek) {
+                case DayOfWeek.Monday : return "Mon";
+                case DayOfWeek.Tuesday : return "Tue";
+                case DayOfWeek.Wednesday : return "Wed";
+                case DayOfWeek.Thursday : return "Thu";
+                case DayOfWeek.Friday : return "Fri";
+                case DayOfWeek.Saturday : return "Sat";
+                case DayOfWeek.Sunday : return "Sun";
+            }
+
+            return null;
+        }
+
+        private string GetShortMonth()
+        {
+            // Hardcoded USA-English until we support globalization
+            switch(Month) {
+                case 1 : return "Jan";
+                case 2 : return "Feb";
+                case 3 : return "Mar";
+                case 4 : return "Apr";
+                case 5 : return "May";
+                case 6 : return "Jun";
+                case 7 : return "Jul";
+                case 8 : return "Aug";
+                case 9 : return "Sep";
+                case 10 : return "Oct";
+                case 11 : return "Nov";
+                case 12 : return "Dec";
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Environment.cs b/base/Applications/Runtime/System/Environment.cs
new file mode 100644
index 0000000..9eb2883
--- /dev/null
+++ b/base/Applications/Runtime/System/Environment.cs
@@ -0,0 +1,73 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: Environment
+**
+**
+** Purpose: Provides some basic access to some environment
+** functionality.
+**
+** Date: March 3, 2000
+**
+============================================================*/
+namespace System {
+    using System.Globalization;
+    using System.Collections;
+    using System.Text;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Reflection;
+    using System.Diagnostics;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Services;
+
+    //| <include path='docs/doc[@for="Environment"]/*' />
+    public sealed class Environment {
+
+        private Environment() {}              // Prevent from begin created
+
+        /*==================================TickCount===================================
+        **Action: Gets the number of ticks since the system was started.
+        **Returns: The number of ticks since the system was started.
+        **Arguments: None
+        **Exceptions: None
+        ==============================================================================*/
+        //| <include path='docs/doc[@for="Environment.TickCount"]/*' />
+        public static int TickCount {
+            get {
+                return unchecked((int)(ProcessService.GetUpTime().Ticks / 10000));
+            }
+        }
+
+        /*===================================NewLine====================================
+        **Action: A property which returns the appropriate newline string for the given
+        **        platform.
+        **Returns: \r\n on Win32.
+        **Arguments: None.
+        **Exceptions: None.
+        ==============================================================================*/
+        //| <include path='docs/doc[@for="Environment.NewLine"]/*' />
+        public static String NewLine {
+            get {
+                return "\r\n";
+            }
+        }
+
+        //| <include path='docs/doc[@for="Environment.Exit"]/*' />
+        public static void Exit(int exitCode) {
+            ProcessService.Stop(exitCode);
+        }
+
+        //
+        public static String StackTrace
+        {
+            get {
+                return "<no.stack.trace";
+            }
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Principal.sg b/base/Applications/Runtime/System/Principal.sg
new file mode 100644
index 0000000..5337411
--- /dev/null
+++ b/base/Applications/Runtime/System/Principal.sg
@@ -0,0 +1,65 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using Microsoft.Singularity.V1.Security;
+    using Microsoft.Singularity.Channels;
+
+    /// <summary>
+    /// A Principal struct is a representation of a principal.
+    /// There are methods here to retrieve the Principal of a process
+    /// and to resolve the principal name of a Principal.
+    /// See the security library for methods to evaluate whether
+    /// Principals satisfy ACLs.
+    /// </summary>
+
+    // This is the process library version of Principal.sg.  The
+    // kernel side is similar, but has additional methods and constructors.
+
+    // This struct layers PrincipalHandle to hide the ABI type from clients.
+
+    public struct Principal
+    {
+        private readonly PrincipalHandle handle;
+
+        internal Principal(PrincipalHandle h)
+        {
+            this.handle = h;
+        }
+
+        public Principal(Endpoint*! in ExHeap ep)
+        {
+            this.handle = ep->PeerPrincipalHandle;
+        }
+
+        public static Principal Self()
+        {
+            return new Principal(PrincipalHandle.SelfPrincipalHandle());
+        }
+
+        public static Principal EndpointPeer(Endpoint*! in ExHeap ep)
+        {
+            return new Principal(ep->PeerPrincipalHandle);
+        }
+
+        public static string ExpandAclIndirection (string! name)
+        {
+            return PrincipalHandle.ExpandAclIndirection(name);
+        }
+
+        public ulong Val { get { return this.handle.val; } }
+
+        public bool Equal(Principal p) { return (this.Val == p.Val); }
+
+        public string! GetName()
+        {
+            return (!)PrincipalHandle.GetPrincipalName(this.handle);
+        }
+    }
+}
+
+
diff --git a/base/Applications/Runtime/System/Process.sg b/base/Applications/Runtime/System/Process.sg
new file mode 100644
index 0000000..ceab039
--- /dev/null
+++ b/base/Applications/Runtime/System/Process.sg
@@ -0,0 +1,591 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Process.sg
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.V1.Processes;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Types;
+
+namespace System
+{
+
+    [CLSCompliant(false)]
+    public sealed class Process
+    {
+        private ProcessHandle handle;
+
+        // Retrieve an endpoint passed as a parameter to this process.
+        //
+        public static unsafe Endpoint* in ExHeap GetStartupEndpoint(int arg)
+        {
+            SharedHeapService.Allocation* alloc =
+                ProcessService.GetStartupEndpoint(arg);
+            Endpoint* in ExHeap ep = (Endpoint* in ExHeap)alloc;
+            return ep;
+        }
+
+        // Retrieve an endpoint passed as a parameter to this process.
+        //
+        public static unsafe void RetStartupEndpoint(int arg,
+                                                     [Claims] Endpoint* in ExHeap ep)
+        {
+            ProcessService.SetStartupEndpoint(arg, (SharedHeapService.Allocation*)ep);
+        }
+
+#region Methods about current process
+        public static int GetStartupBoolArgCount()
+        {
+            return ProcessService.GetStartupBoolArgCount();
+        }
+
+        public static int GetStartupLongArgCount()
+        {
+            return ProcessService.GetStartupLongArgCount();
+        }
+
+        public static int GetStartupStringArgCount()
+        {
+            return ProcessService.GetStartupStringArgCount();
+        }
+
+        public static int GetStartupStringArrayArgCount()
+        {
+            return ProcessService.GetStartupStringArrayArgCount();
+        }
+
+        public static ParameterCode GetStartupLongArg(int index, out long value)
+        {
+            return ProcessService.GetStartupLongArg(index, out value);
+        }
+
+        public static ParameterCode GetStartupBoolArg(int index, out bool value)
+        {
+            return ProcessService.GetStartupBoolArg(index, out value);
+        }
+
+        public static unsafe ParameterCode GetStartupStringArrayArg(int index, out string[] arguments)
+        {
+            int count;
+            int totalCharCount;
+            ParameterCode code = ProcessService.GetStartupStringArrayArg(index,
+                                                                         null,
+                                                                         null,
+                                                                         out count,
+                                                                         out totalCharCount);
+            //Review for now NotSet is ignored and we return a string[1] below
+            if (code != ParameterCode.Success && code != ParameterCode.NotSet) {
+                arguments = new string[0];
+                return code;
+            }
+            if (count == 0) {
+                arguments = new string[0];
+                return ParameterCode.Success;
+            }
+
+            // Note: totalCharCount+1 because if we have an array of empty strings,
+            // the totalCharCount is 0 and then we can't take the address of &argArray[0] !
+            char[] argArray = new char [totalCharCount+1];
+            int [] intArray = new int[count];
+            fixed (int *intptr = &intArray[0]) {
+                fixed (char *argptr = &argArray[0]) {
+                    ProcessService.GetStartupStringArrayArg(index,
+                                                            argptr,
+                                                            intptr,
+                                                            out count,
+                                                            out totalCharCount);
+                    // now reconstruct the string array from the flattened char array
+                    arguments = new string[count];
+                    int offset = 0;
+                    for (int i = 0; i < count; i++) {
+                        arguments[i] = String.StringCTOR(
+                            argptr, offset, intptr[i]);
+                        offset += intptr[i];
+                    }
+                }
+            }
+            return ParameterCode.Success;
+        }
+
+        public static unsafe ParameterCode GetStartupStringArg(int arg, out string value)
+        {
+            int len = 0;
+            ParameterCode code = ProcessService.GetStartupStringArg(arg, null, ref len);
+            if (code != ParameterCode.Success) {
+                value = null;
+                return code;
+            }
+            if ( len == 0 ) {
+                // should this be "" or null?
+                value = null;
+                return ParameterCode.Success;
+            }
+            char[] argArray = new char [len];
+            fixed (char *argptr = &argArray[0]) {
+                ProcessService.GetStartupStringArg(arg,
+                                                   argptr,
+                                                   ref len);
+                value = String.StringCTOR(argptr, 0, len);
+                return ParameterCode.Success;
+            }
+        }
+#endregion
+
+#region Methods about other processes
+        public  ParameterCode SetStartupLongArg(int index, long value)
+        {
+            ParameterCode p =
+                ProcessHandle.SetStartupLongArg(handle, index,  value);
+            GC.KeepAlive(this);
+            return p;
+        }
+
+        public  ParameterCode SetStartupBoolArg(int index, bool value)
+        {
+            ParameterCode p =
+                ProcessHandle.SetStartupBoolArg(handle, index,  value);
+            GC.KeepAlive(this);
+            return p;
+        }
+
+        public  unsafe ParameterCode SetStartupStringArrayArg(int index, string[]! strings)
+        {
+            ParameterCode p;
+            if (strings.Length > 0) {
+                int[]! lengths;
+                char[]! chars;
+
+                FlattenStringArray(strings, out lengths, out chars);
+                fixed (char *charptr = &chars[0]) {
+                    fixed (int *intptr = &lengths[0]) {
+                        p = ProcessHandle.SetStartupStringArrayArg(handle,
+                                                                   index,
+                                                                   charptr,
+                                                                   intptr,
+                                                                   strings.Length);
+                    }
+                }
+            }
+            else {
+                p = ProcessHandle.SetStartupStringArrayArg(handle,
+                                                           index,
+                                                           null,
+                                                           null,
+                                                           strings.Length);
+            }
+            GC.KeepAlive(this);
+            return p;
+        }
+
+        public  unsafe ParameterCode SetStartupStringArg(int index, string value)
+        {
+            ParameterCode p;
+            if (value != null && value.Length != 0) {
+                // String.m_firstChar is not accessible to sgc (defined in corlib)
+                // need to copy until the kernel and system are compiled
+                // with the same compiler
+                char[] c = new char[value.Length];
+                for (int i=0; i < value.Length; i++){
+                    c[i] = value[i];
+                }
+                fixed ( char *argptr = &c[0] ) {
+                    p = ProcessHandle.SetStartupStringArg(handle, index, argptr, value.Length);
+                }
+            }
+            // set "null"
+            else p = ProcessHandle.SetStartupStringArg(handle, index, null, 0);
+            GC.KeepAlive(this);
+            return p;
+        }
+
+#endregion
+        // In order to pass the arguments to the kernel, we first need to
+        // flatten the arguments parameter from an array of strings to
+        // an array of characters (containing the contents of the strings).
+        private static unsafe void FlattenStringArray(string[]! arguments,
+                                                       out int[]! argLengths,
+                                                       out char[]! argVector)
+        {
+            int totalCharacters = 0;
+
+            int len = arguments.Length;
+            for (int arg = 0; arg < len; arg++) {
+                string argstring = arguments[arg];
+                if (argstring == null) continue;
+                totalCharacters += argstring.Length;
+            }
+
+            argVector = new char[totalCharacters + 1];
+            argLengths = new int[len];
+
+            int offset = 0;
+            for (int arg = 0; arg < len; arg++) {
+                string argstring = arguments[arg];
+                if (argstring == null) {
+                    argLengths[arg] = 0;
+                    continue;
+                }
+                int alen = argstring.Length;
+                argstring.CopyTo(0, argVector, offset, alen);
+                offset += alen;
+                argLengths[arg] = alen;
+            }
+        }
+
+
+        // In order to pass the arguments to the kernel, we first need to
+        // flatten the arguments parameter from an array of strings to
+        // an array of characters (containing the contents of the strings).
+        private static unsafe void FlattenArgs(string[]! arguments,
+                                               String role,
+                                               out int[]! argLengths,
+                                               out char[]! argVector,
+                                               out char[]! roleVector,
+                                               out int roleLength)
+        {
+
+            FlattenStringArray(arguments, out argLengths, out argVector);
+
+            // package the role parameters (if present)
+            if (role != null) {
+                roleLength = role.Length;
+                roleVector = new char[roleLength];
+                role.CopyTo(0, roleVector, 0, roleLength);
+            }
+            else {
+                roleLength = 0;
+                roleVector = new char[1];
+            }
+        }
+
+        /// <summary>
+        /// Given 2 system types generate and initialize the two endpoints of
+        /// a channel. The imp side will be set in the processes startup endpoint array
+        /// at position "index". The exp side will be bound to a service based on global policy
+        /// </summary>
+        public unsafe  bool BindToService(SystemType impType,
+                                      SystemType  expType,
+                                      string! contract,
+                                      int startState,
+                                      int index)
+        {
+            // convert string to char* and length
+            char [] strChar = new char[contract.Length];
+            assert strChar != null;
+            contract.CopyTo(0, strChar, 0, contract.Length);
+
+            fixed ( char *strptr = &strChar[0] ) {
+
+                bool b = ProcessHandle.BindToService(handle,
+                                                     impType,
+                                                     expType,
+                                                     strptr,
+                                                     contract.Length,
+                                                     startState,
+                                                     index);
+                GC.KeepAlive(this);
+                return b;
+                }
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public unsafe Process(String! cmd,
+                              String action,
+                              String role)
+        {
+
+            char[]! cmdVector;
+            char[]! actionVector;
+            char[]! roleVector;
+
+            int cmdLength;
+            int actionLength;
+            int roleLength;
+
+            // package the command named parameter
+                cmdLength = cmd.Length;
+                cmdVector = new char[cmdLength];
+                cmd.CopyTo(0, cmdVector, 0, cmdLength);
+
+            // package the action parameter(if present)
+            if (action != null) {
+                actionLength = action.Length;
+                actionVector = new char[actionLength];
+                action.CopyTo(0, actionVector, 0, actionLength);
+            }
+            else {
+                actionLength = 0;
+                actionVector = new char[1];
+            }
+
+            // package the role parameters (if present)
+            if (role != null) {
+                roleLength = role.Length;
+                roleVector = new char[roleLength];
+                role.CopyTo(0, roleVector, 0, roleLength);
+            }
+            else {
+                roleLength = 0;
+                roleVector = new char[1];
+            }
+
+            fixed (char *cmdptr = &cmdVector[0]) {
+                fixed (char *act = &actionVector[0]) {
+                    fixed (char *rols = &roleVector[0]) {
+                        ProcessHandle handleOnStack;
+                        ProcessHandle.Create(cmdptr, cmdLength,
+                                             act, actionLength,
+                                             rols, roleLength,
+                                             out handleOnStack);
+                        handle = handleOnStack;
+                    }
+                }
+            }
+            if (handle.id == 0) {
+                throw new ProcessCreateException();
+            }
+            GC.KeepAlive(this);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public unsafe Process(String[]! arguments,
+                              String role,
+                              int endpointCount)
+        {
+            int[]!  argLengths;
+            char[]! argVector;
+            char[]! roleVector;
+            int roleLength;
+
+            FlattenArgs(arguments, role,
+                        out argLengths, out argVector, out roleVector, out roleLength);
+
+            fixed (char *args = &argVector[0]) {
+                fixed (int *lens = &argLengths[0]) {
+                    fixed (char *rols = &roleVector[0]) {
+                        ProcessHandle handleOnStack;
+                        ProcessHandle.Create(args, lens, arguments.Length,
+                                             rols, roleLength, endpointCount,
+                                             out handleOnStack);
+                        handle = handleOnStack;
+                    }
+                }
+            }
+
+            if (handle.id == 0) {
+                throw new ProcessCreateException();
+            }
+            GC.KeepAlive(this);
+            ProcessService.Waypoint(573);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public unsafe Process(String[]! arguments,
+                              String role,
+                              [Claims] Endpoint* in ExHeap endpoint)
+            : this((!)arguments[0], null, null)
+        {
+            ProcessHandle.SetStartupEndpoint(handle, 0,
+                                             (SharedHeapService.Allocation *)endpoint);
+            GC.KeepAlive(this);
+            ProcessService.Waypoint(574);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public unsafe Process(String[]! arguments,
+                              [Claims] Endpoint* in ExHeap exp)
+            : this(arguments, null, exp)
+        {
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public unsafe Process(String[]! arguments,
+                              String roll)
+            : this(arguments, roll, 0)
+        {
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public unsafe Process(String[]! arguments)
+            : this(arguments, null, 0)
+        {
+        }
+
+        /// <summary>
+        /// Finalizer is responsible for freeing handle that keeps corresponding
+        /// kernel AutoResetEvent object live.
+        /// </summary>
+        ~Process() {
+            Dispose(false);
+        }
+
+        public unsafe bool SetStartupEndpoint(int index,
+                                              [Claims] Endpoint * in ExHeap endpoint)
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool b = ProcessHandle.SetStartupEndpoint(handle, index,
+                                                    (SharedHeapService.Allocation *)endpoint);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        public void Dispose(bool explicitDisposing)
+        {
+            if (handle.id != 0) {
+                ProcessHandle.Dispose(handle);
+                handle = new ProcessHandle();
+            }
+        }
+
+        public void Start()
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool unstarted = ProcessHandle.Start(handle);
+            GC.KeepAlive(this);
+            if (!unstarted) {
+                throw new ProcessStateException("started");
+            }
+        }
+
+        public void Join()
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool started;
+            ProcessHandle.Join(handle, out started);
+            GC.KeepAlive(this);
+            if (!started) {
+                throw new ProcessStateException("unstarted");
+            }
+        }
+
+        public bool Join(TimeSpan timeout)
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool started;
+            bool joined = ProcessHandle.Join(handle, timeout, out started);
+            GC.KeepAlive(this);
+            if (!started) {
+                throw new ProcessStateException("unstarted");
+            }
+            return joined;
+        }
+
+        public bool Join(SchedulerTime stop)
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool started;
+            bool joined = ProcessHandle.Join(handle, stop, out started);
+            GC.KeepAlive(this);
+            if (!started) {
+                throw new ProcessStateException("unstarted");
+            }
+            return joined;
+        }
+
+        public void Suspend(bool recursive)
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool started = ProcessHandle.Suspend(handle, recursive);
+            GC.KeepAlive(this);
+            if (!started) {
+                throw new ProcessStateException("unstarted");
+            }
+        }
+
+        public void Resume(bool recursive)
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            bool started = ProcessHandle.Resume(handle, recursive);
+            GC.KeepAlive(this);
+            if (!started) {
+                throw new ProcessStateException("unstarted");
+            }
+        }
+
+        public void Stop()
+        {
+            Stop((int) ProcessExitCode.StopDefault);
+        }
+
+        public void Stop(int exitcode)
+        {
+            if (handle.id == 0) {
+                throw new ProcessStateException("disposed");
+            }
+            ProcessHandle.Stop(handle, exitcode);
+            GC.KeepAlive(this);
+        }
+
+        public int Id
+        {
+            get {
+                int i =
+                    (handle.id != 0) ? ProcessHandle.GetProcessId(handle) : 0;
+                GC.KeepAlive(this);
+                return i;
+            }
+        }
+
+        public Principal Principal
+        {
+            get
+            {
+                if (handle.id == 0)
+                {
+                    throw new ProcessStateException("disposed");
+                }
+                Principal p =
+                    new Principal(ProcessHandle.GetPrincipalHandle(handle));
+                GC.KeepAlive(this);
+                return p;
+            }
+        }
+
+        public int ExitCode
+        {
+            get {
+                int i =
+                    (handle.id != 0) ? ProcessHandle.GetExitCode(handle) : 0;
+                GC.KeepAlive(this);
+                return i;
+            }
+        }
+
+        public ProcessState State {
+            get {
+                ProcessState p =
+                    (handle.id != 0) ? ProcessHandle.GetState(handle) : ProcessState.Stopped;
+                GC.KeepAlive(this);
+                return p;
+            }
+        }
+
+    }
+}
diff --git a/base/Applications/Runtime/System/ProcessCreateException.cs b/base/Applications/Runtime/System/ProcessCreateException.cs
new file mode 100644
index 0000000..2f4635f
--- /dev/null
+++ b/base/Applications/Runtime/System/ProcessCreateException.cs
@@ -0,0 +1,24 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public class ProcessCreateException : SystemException
+    {
+        public ProcessCreateException() : base("Arg_ProcessCreateException")
+        {
+        }
+
+        public ProcessCreateException(String message) : base(message)
+        {
+        }
+
+        public ProcessCreateException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Threading/AutoResetEvent.cs b/base/Applications/Runtime/System/Threading/AutoResetEvent.cs
new file mode 100644
index 0000000..39996fa
--- /dev/null
+++ b/base/Applications/Runtime/System/Threading/AutoResetEvent.cs
@@ -0,0 +1,114 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Threading {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.V1.Services;
+
+    //| <include path='docs/doc[@for="AutoResetEvent"]/*' />
+    [CLSCompliant(false)]
+    public sealed class AutoResetEvent : WaitHandle
+    {
+        private AutoResetEventHandle handle;
+
+        //| <include path='docs/doc[@for="AutoResetEvent.AutoResetEvent2"]/*' />
+        public AutoResetEvent(bool initialState)
+        {
+            AutoResetEventHandle handleOnStack;
+            if (!AutoResetEventHandle.Create(initialState, out handleOnStack)) {
+                throw new HandleCreateException();
+            }
+            handle = handleOnStack;
+        }
+
+        /// <summary>
+        /// Finalizer is responsible for freeing handle that keeps corresponding
+        /// kernel AutoResetEvent object live.
+        /// </summary>
+        ~AutoResetEvent() {
+            if (this.handle.id != 0) {
+                AutoResetEventHandle.Dispose(this.handle);
+                this.handle = new AutoResetEventHandle();
+            }
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEvent.Reset"]/*' />
+        public void Reset()
+        {
+            AutoResetEventHandle.Reset(handle);
+            GC.KeepAlive(this);
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEvent.Set"]/*' />
+        public void Set()
+        {
+            AutoResetEventHandle.Set(handle);
+            GC.KeepAlive(this);
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEvent.SetAll"]/*' />
+        public void SetAll()
+        {
+            AutoResetEventHandle.SetAll(handle);
+            GC.KeepAlive(this);
+        }
+
+        internal void SetNoGC()
+        {
+            AutoResetEventHandle.SetNoGC(handle);
+            GC.KeepAlive(this);
+        }
+
+        protected override SyncHandle Handle{
+            get {
+                return handle;
+            }
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne"]/*' />
+        public override bool WaitOne(TimeSpan timeout)
+        {
+            bool b = SyncHandle.WaitOne(handle, timeout);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne1"]/*' />
+        public override bool WaitOne(SchedulerTime stop)
+        {
+            bool b = SyncHandle.WaitOne(handle, stop);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="SyncHandle.WaitOne2"]/*' />
+        public override bool WaitOne()
+        {
+            bool b = SyncHandle.WaitOne(handle);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        internal bool WaitOneNoGC()
+        {
+            bool b = SyncHandle.WaitOneNoGC(handle);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEventHandle.Dispose"]/*' />
+        protected override void Dispose(bool explicitDisposing)
+        {
+            if (handle.id != 0) {
+                AutoResetEventHandle.Dispose(handle);
+                handle = new AutoResetEventHandle();
+            }
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Threading/ManualResetEvent.cs b/base/Applications/Runtime/System/Threading/ManualResetEvent.cs
new file mode 100644
index 0000000..3452d2c
--- /dev/null
+++ b/base/Applications/Runtime/System/Threading/ManualResetEvent.cs
@@ -0,0 +1,95 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Threading {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.V1.Services;
+
+    //| <include path='docs/doc[@for="ManualResetEvent"]/*' />
+    [CLSCompliant(false)]
+    public sealed class ManualResetEvent : WaitHandle
+    {
+        private ManualResetEventHandle handle;
+
+        //| <include path='docs/doc[@for="ManualResetEvent.ManualResetEvent2"]/*' />
+        public ManualResetEvent(bool initialState)
+        {
+            ManualResetEventHandle handleOnStack;
+            if (!ManualResetEventHandle.Create(initialState, out handleOnStack)) {
+                throw new HandleCreateException();
+            }
+            handle = handleOnStack;
+        }
+
+        /// <summary>
+        /// Finalizer is responsible for freeing handle that keeps corresponding
+        /// kernel object live.
+        /// </summary>
+        ~ManualResetEvent() {
+            if (this.handle.id != 0) {
+                ManualResetEventHandle.Dispose(this.handle);
+                this.handle = new ManualResetEventHandle();
+            }
+        }
+
+        //| <include path='docs/doc[@for="ManualResetEvent.Reset"]/*' />
+        public void Reset()
+        {
+            ManualResetEventHandle.Reset(handle);
+            GC.KeepAlive(this);
+        }
+
+        //| <include path='docs/doc[@for="ManualResetEvent.Set"]/*' />
+        public bool Set()
+        {
+            bool b = ManualResetEventHandle.Set(handle);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        protected override SyncHandle Handle{
+            get {
+                return handle;
+            }
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne"]/*' />
+        public override bool WaitOne(TimeSpan timeout)
+        {
+            bool b = SyncHandle.WaitOne(handle, timeout);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne1"]/*' />
+        public override bool WaitOne(SchedulerTime stop)
+        {
+            bool b = SyncHandle.WaitOne(handle, stop);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="SyncHandle.WaitOne2"]/*' />
+        public override bool WaitOne()
+        {
+            bool b = SyncHandle.WaitOne(handle);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="ManualResetEventHandle.Dispose"]/*' />
+        protected override void Dispose(bool explicitDisposing)
+        {
+            if (handle.id != 0) {
+                ManualResetEventHandle.Dispose(handle);
+                handle = new ManualResetEventHandle();
+            }
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Threading/Mutex.cs b/base/Applications/Runtime/System/Threading/Mutex.cs
new file mode 100644
index 0000000..b2bdc31
--- /dev/null
+++ b/base/Applications/Runtime/System/Threading/Mutex.cs
@@ -0,0 +1,117 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Threading
+{
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.V1.Services;
+
+    //| <include path='docs/doc[@for="Mutex"]/*' />
+    [CLSCompliant(false)]
+    public sealed class Mutex : WaitHandle
+    {
+        private MutexHandle handle;
+
+        //| <include path='docs/doc[@for="Mutex.Mutex2"]/*' />
+        public Mutex(bool initiallyOwned)
+        {
+            MutexHandle handleOnStack;
+            if (!MutexHandle.Create(initiallyOwned, out handleOnStack)) {
+                throw new HandleCreateException();
+            }
+            handle = handleOnStack;
+        }
+
+        //| <include path='docs/doc[@for="Mutex.Mutex3"]/*' />
+        public Mutex()
+        {
+            MutexHandle handleOnStack;
+            if (!MutexHandle.Create(false, out handleOnStack)) {
+                throw new HandleCreateException();
+            }
+            handle = handleOnStack;
+        }
+
+        /// <summary>
+        /// Finalizer is responsible for freeing handle that keeps corresponding
+        /// kernel AutoResetEvent object live.
+        /// </summary>
+        ~Mutex() {
+            if (this.handle.id != 0) {
+                MutexHandle.Dispose(this.handle);
+                this.handle = new MutexHandle();
+            }
+        }
+
+        public bool AcquireMutex()
+        {
+            return WaitOne();
+        }
+
+        public bool AcquireMutex(SchedulerTime stop)
+        {
+            return WaitOne(stop);
+        }
+
+
+        //| <include path='docs/doc[@for="Mutex.ReleaseMutex"]/*' />
+        public void ReleaseMutex()
+        {
+            MutexHandle.Release(handle);
+            GC.KeepAlive(this);
+        }
+
+        // Called by monitor to see if its lock is held by the current thread.
+        internal bool IsOwnedByCurrentThread()
+        {
+            bool b = MutexHandle.IsOwnedByCurrentThread(handle);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        protected override SyncHandle Handle{
+            get {
+                return handle;
+            }
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne"]/*' />
+        public override bool WaitOne(TimeSpan timeout)
+        {
+            bool b = SyncHandle.WaitOne(handle, timeout);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne1"]/*' />
+        public override bool WaitOne(SchedulerTime stop)
+        {
+            bool b = SyncHandle.WaitOne(handle, stop);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="SyncHandle.WaitOne2"]/*' />
+        public override bool WaitOne()
+        {
+            bool b = SyncHandle.WaitOne(handle);
+            GC.KeepAlive(this);
+            return b;
+        }
+
+        //| <include path='docs/doc[@for="MutexHandle.Dispose"]/*' />
+        protected override void Dispose(bool explicitDisposing)
+        {
+            if (handle.id != 0) {
+                MutexHandle.Dispose(handle);
+                handle = new MutexHandle();
+            }
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Threading/Thread.cs b/base/Applications/Runtime/System/Threading/Thread.cs
new file mode 100644
index 0000000..976233f
--- /dev/null
+++ b/base/Applications/Runtime/System/Threading/Thread.cs
@@ -0,0 +1,1165 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+// #define DEBUG_SWITCH
+
+namespace System.Threading
+{
+    using System.Threading;
+    using System.Runtime.InteropServices;
+    using System;
+    using System.Diagnostics;
+    using System.GCs;
+    using System.Globalization;
+    using System.Collections;
+    using System.Runtime.CompilerServices;
+
+    using Microsoft.Bartok.Runtime;
+
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.X86;
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.V1.Threads;
+
+    //| <include path='docs/doc[@for="Thread"]/*' />
+    [CCtorIsRunDuringStartup]
+    [StructLayout(LayoutKind.Sequential)]
+    [CLSCompliant(false)]
+    [RequiredByBartok]
+    public sealed class Thread
+    {
+        // Singularity specific fields
+        // Need CPU context
+        // Need stack
+
+        // Bartok specific fields
+        [RequiredByBartok] // Thread-specific alloc heap
+        internal SegregatedFreeList segregatedFreeList;
+        [RequiredByBartok] // Thread-specific bump allocator
+        internal BumpAllocator bumpAllocator;
+
+        internal AutoResetEvent processGcEvent;
+
+        private AutoResetEvent autoEvent;
+        private ManualResetEvent joinEvent;
+
+        internal Thread blockingCctorThread;
+
+        // Singularity specific fields
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        internal unsafe ThreadContext * context;
+        internal ThreadHandle threadHandle;
+
+        // Most recently thrown exception object that the thread
+        // did not catch at all (i.e. that propagated to the bottom
+        // of the stack or to a kernel/process boundary without
+        // encountering an appropriate catch clause).
+        private Exception lastUncaughtException;
+
+        private bool ignoredByJoinAll; // for "service" threads
+
+        private Object m_ExceptionStateInfo;            // Exception info latched to the thread on a thread abort
+
+        // Bartok specific fields
+        internal Thread nextThread; // Link for linked lists of threads
+
+        // This array is of length 1 and contains a queue item for this
+        // thread.  It allows WaitOne and the scheduler to add this thread
+        // to their queues without allocating memory.
+        internal ThreadQueueItem[] singleQueueItem;
+
+        // MultiUseWord (object header) fields.
+        internal UIntPtr externalMultiUseObjAllocListHead;
+        internal UIntPtr externalMultiUseObjAllocListTail;
+
+        // Bartok specific fields
+        internal int threadIndex;
+        private ThreadStart     threadStart;
+        private ThreadState     threadState;
+        internal int waitingCriticalSectionDepth;
+        internal Object waitingObject; // Not used, but useful for debugging
+
+        [RequiredByBartok]
+        internal TryAllManager tryAllManager;
+
+        private static bool closing;
+        private static long totalArrayAllocations;
+        private static long totalArrayBytesAllocated;
+        private static long totalBytes;
+        private static long totalStructBytesAllocated;
+
+        internal static Thread[] threadTable;
+        private static SpinLock threadTableLock;
+
+        private static LocalDataStore localDataStore;
+
+        internal static Thread initialThread;
+
+        // This is used by the Bartok backend. When Bartok tries to generate
+        // callback stub for delegate, it checks to see if it is
+        // ThreadProc, if it is not, Bartok adds leaveGCSafeState and
+        // enterGCSafeState around the delegate call.
+        [RequiredByBartok]
+        private unsafe delegate uint ThreadProc(void *param);
+
+        /*=========================================================================
+        ** This manager is responsible for storing the global data that is
+        ** shared amongst all the thread local stores.
+        =========================================================================*/
+        static private LocalDataStoreMgr m_LocalDataStoreMgr;
+
+        internal const int maxThreads = 1024; // Must be power of 2 >= 64
+        private static int threadIndexGenerator;
+
+        /*=========================================================================
+        ** Creates a new Thread object which will begin execution at
+        ** start.ThreadStart on a new thread when the Start method is called.
+        **
+        ** Exceptions: ArgumentNullException if start == null.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.Thread"]/*' />
+        public unsafe Thread(ThreadStart start)
+        {
+            Tracing.Log(Tracing.Audit, "Application Thread()");
+
+            if (start == null) {
+                throw new ArgumentNullException("start");
+            }
+
+            threadIndex = -1;
+            threadState = ThreadState.Unstarted;
+            threadStart = start;
+
+            // Create the event for the thread to wait upon
+            autoEvent = new AutoResetEvent(false);
+            joinEvent = new ManualResetEvent(false);
+            processGcEvent = new AutoResetEvent(false);
+            singleQueueItem = new ThreadQueueItem [1] { new ThreadQueueItem(this) };
+
+            // Find a usable entry in the thread table
+            bool disabled = Processor.DisableInterrupts();
+            Thread.threadTableLock.Acquire(CurrentThread);
+            try {
+                for (int i = 0; i < threadTable.Length; i++) {
+                    int index = (threadIndexGenerator + i) % threadTable.Length;
+                    if (threadTable[index] == null) {
+                        threadTable[index] = this;
+                        this.threadIndex = index;
+                        threadIndexGenerator = index + 1;
+                        // NB: We call this once, afterwards the GC visitor calls it.
+                        break;
+                    }
+                }
+            } finally {
+                Thread.threadTableLock.Release(CurrentThread);
+                Processor.RestoreInterrupts(disabled);
+            }
+
+            VTable.Assert(threadIndex >= 0, "Out of thread slots!");
+
+            //MemoryBarrier();
+
+            // Must check closing after being insert into table to avoid race condition.
+            if (closing) {
+                threadState = ThreadState.Stopped;
+                joinEvent.Set();
+                Tracing.Log(Tracing.Warning, "Aborting: Runtime closing.");
+                return;
+            }
+
+            ThreadHandle handleOnStack;
+            UIntPtr threadContext;
+            if (!ThreadHandle.Create(threadIndex,
+                                     new ContainerHandle(),
+                                     out handleOnStack,
+                                     out threadContext)) {
+                Tracing.Log(Tracing.Warning, "Aborting: ThreadHandle.Create failed.");
+                threadState = ThreadState.Stopped;
+                joinEvent.Set();
+                return;
+            }
+            this.threadHandle = handleOnStack;
+            this.context = (ThreadContext *) threadContext;
+            this.context->threadIndex = unchecked((ushort) threadIndex);
+            this.context->UpdateAfterGC(this);
+        }
+
+
+
+        /// <summary>
+        /// Finalizer is responsible for freeing handle that keeps corresponding
+        /// kernel object live.
+        /// </summary>
+        ~Thread() {
+            if (this.threadHandle.id != 0) {
+                ThreadHandle.Dispose(this.threadHandle);
+                this.threadHandle = new ThreadHandle();
+            }
+        }
+
+        /*=========================================================================
+        ** Spawns off a new thread which will begin executing at the ThreadStart
+        ** method on the IThreadable interface passed in the constructor. Once the
+        ** thread is dead, it cannot be restarted with another call to Start.
+        **
+        ** Exceptions: ThreadStateException if the thread has already been started.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.Start"]/*' />
+        public void Start()
+        {
+            lock ((Object) this) {
+                if (closing) {
+                    throw new ThreadStateException("Cannot start thread when closing");
+                }
+
+                ThreadState oldState = threadState;
+                if (oldState != ThreadState.Unstarted) {
+                    throw new ThreadStateException("Cannot start thread in state "+oldState);
+                }
+
+                threadState = ThreadState.Running;
+
+                // Tell the GC that we have created the thread
+                GC.NewThreadNotification(this, false);
+
+                ThreadHandle.Start(threadHandle);
+                GC.KeepAlive(this);
+            }
+        }
+
+        // HalInitContext sets ThreadStub as the first process code to be
+        // executed in a new thread context.
+        [AccessedByRuntime("referenced from hal.cpp")]
+        private static unsafe void ThreadStub(int threadIndex)
+        {
+            Transitions.ThreadStart();
+            GC.ThreadStartNotification(threadIndex);
+            Thread currentThread = threadTable[threadIndex];
+            if (AddThread(threadIndex)) {
+                Tracing.Log(Tracing.Audit, "ThreadStub(atid={0}) Entered",
+                            (UIntPtr)unchecked((uint)threadIndex));
+
+                ThreadStart startFun = currentThread.threadStart;
+
+                try {
+                    startFun();
+                } catch (Exception e) {
+                    DebugStub.WriteLine("Thread {0} failed with exception {1}\n",
+                                        __arglist(threadIndex, e));
+                    currentThread.lastUncaughtException = e;
+                    VTable.Assert(e == null, "Thread "+threadIndex+
+                                  " failed with exception "+e);
+                }
+                Tracing.Log(Tracing.Audit, "ThreadStub(atid={0}) Exiting",
+                            (UIntPtr)unchecked((uint)threadIndex));
+            }
+
+            currentThread.joinEvent.Set();
+            RemoveThread(threadIndex);
+            GC.DeadThreadNotification(currentThread);
+
+            bool disabled = Processor.DisableInterrupts();
+            // this is a dangerous locking strategy as the transition code
+            // may decide it needs to wake up another thread.
+            Thread.threadTableLock.Acquire(currentThread);
+            try {
+                Transitions.ThreadEnd(threadIndex);
+                // You may not do any calls out of proc after this point!
+                threadTable[threadIndex] = null;
+                Transitions.DeadThreadNotification(threadIndex);
+            } finally {
+                Thread.threadTableLock.Release(currentThread);
+                Processor.RestoreInterrupts(disabled);
+            }
+        }
+
+        /*====================================================================
+         * Support for service threads.  Service threads should not count
+         * towards keeping a process alive.  When all non-service threads
+         * have terminated, the service threads are asked to stop themselves
+         * so the process can terminate gracefully.
+         *===================================================================*/
+
+        // The number of non-service threads running in the process
+        private static int threadCount;
+        private static Object notificationTableObject;
+        private static Object[] notificationTable;
+
+        public delegate void StopServiceNotice();
+
+        public void MakeServiceThread(StopServiceNotice notification)
+        {
+            Tracing.Log(Tracing.Audit, "MakeServiceThread {0}",
+                        (UIntPtr) threadIndex);
+            if (this != Thread.CurrentThread) {
+                throw new Exception("Only the thread itself may call MakeServiceThread");
+            }
+            if (notificationTable == null) {
+                int tableSize = threadTable.Length;
+                Interlocked.CompareExchange(ref notificationTableObject,
+                                            new Object[tableSize],
+                                            null);
+                notificationTable = (Object[]) notificationTableObject;
+            }
+            Tracing.Log(Tracing.Audit, "  previous notification: {0:x8}",
+                        Magic.addressOf(notificationTable[threadIndex]));
+            // BUGBUG: Should have been Interlocked.Exchange, but that
+            // doesn't work due to a Bartok codegen bug.
+            Object oldNotification = notificationTable[threadIndex];
+            while (Interlocked.CompareExchange(ref notificationTable[threadIndex], notification, oldNotification) != oldNotification) {
+                oldNotification = notificationTable[threadIndex];
+            }
+            if (oldNotification == null) {
+                // We made the thread a service thread for the first time.
+                if (Interlocked.Decrement(ref threadCount) == 0) {
+                    NotifyServiceThreads();
+                }
+            }
+            VTable.Assert(threadCount >= 0);
+        }
+
+        public void ClearServiceThread(Thread thread)
+        {
+            Tracing.Log(Tracing.Audit, "ClearServiceThread");
+            if (this != Thread.CurrentThread) {
+                throw new Exception("Only the thread itself may call ClearServiceThread");
+            }
+            if (notificationTable == null) {
+                return;
+            }
+            if (Interlocked.Exchange(ref notificationTable[threadIndex],
+                                     null) != null) {
+                // We cleared the notification
+                Interlocked.Increment(ref threadCount);
+            }
+            VTable.Assert(threadCount >= 0);
+        }
+
+        private static bool AddThread(int index)
+        {
+            Tracing.Log(Tracing.Audit, "AddThread {0} ({1})",
+                        (UIntPtr) index, (UIntPtr) threadCount);
+            VTable.Assert(threadCount >= 0);
+            if (Interlocked.Increment(ref threadCount) == 1 &&
+                notificationTable != null) {
+                // The thread was started after we started sending out
+                // notifications, so indicate that the thread should not
+                // really be started
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        internal static void RemoveThread(int index)
+        {
+            Tracing.Log(Tracing.Audit, "RemoveThread {0} ({1})",
+                        (UIntPtr) index, (UIntPtr) threadCount);
+            if (Interlocked.Decrement(ref threadCount) == 0) {
+                NotifyServiceThreads();
+            }
+            VTable.Assert(threadCount >= 0);
+        }
+
+        private static void NotifyServiceThreads()
+        {
+            Tracing.Log(Tracing.Audit, "NotifyServiceThreads");
+            if (notificationTable == null) {
+                return;
+            }
+            for (int i = 0; i < notificationTable.Length; i++) {
+                if (notificationTable[i] != null) {
+                    Tracing.Log(Tracing.Audit, "  Notifying thread {0}",
+                                (UIntPtr) i);
+                    ((StopServiceNotice)notificationTable[i])();
+                }
+            }
+        }
+
+
+        /*=========================================================================
+        ** Returns true if the thread has been started and is not dead.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.IsAlive"]/*' />
+        public bool IsAlive {
+            [NoHeapAllocation]
+            get { return (threadState != ThreadState.Unstarted &&
+                          threadState != ThreadState.Stopped); }
+        }
+
+
+        /*=========================================================================
+        ** Waits for the thread to die.
+        **
+        ** Exceptions: ThreadStateException if the thread has not been started yet.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.Join"]/*' />
+        public void Join()
+        {
+            Join(SchedulerTime.MaxValue);
+        }
+
+        /*=========================================================================
+        ** Waits for the thread to die or for timeout milliseconds to elapse.
+        ** Returns true if the thread died, or false if the wait timed out.
+        **
+        ** Exceptions: ArgumentException if timeout < 0.
+        **             ThreadStateException if the thread has not been started yet.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.Join2"]/*' />
+        public bool Join(TimeSpan timeout)
+        {
+            if (threadState == ThreadState.Unstarted) {
+                throw new ThreadStateException();
+            }
+            return joinEvent.WaitOne(timeout);
+        }
+
+        public bool Join(SchedulerTime timeout)
+        {
+            if (threadState == ThreadState.Unstarted) {
+                throw new ThreadStateException();
+            }
+            return joinEvent.WaitOne(timeout);
+        }
+
+        internal static bool JoinAll()
+        {
+            // To avoid races, join all does the following:
+            // 1) Wait for all known peer threads to terminate.
+            // 2) Set the closing flag to disallow creating of new threads.
+            // 3) Wait for any threads that have started in the mean time.
+
+            for (uint iteration = 0; iteration < 2; iteration++) {
+                for (int i = 0; i < threadTable.Length; i++) {
+                    Thread thread = null;
+
+                    bool disabled = Processor.DisableInterrupts();
+                    Thread.threadTableLock.Acquire(CurrentThread);
+                    try {
+                        thread = threadTable[i];
+                    }
+                    finally {
+                        Thread.threadTableLock.Release(CurrentThread);
+                        Processor.RestoreInterrupts(disabled);
+                    }
+
+                    if (thread != null &&
+                        thread != CurrentThread &&
+                        thread.threadState != ThreadState.Unstarted &&
+                        !thread.ignoredByJoinAll) {
+                        thread.Join();
+                    }
+                }
+                closing = true;
+            }
+            return true;
+        }
+
+        /*=========================================================================
+        ** Suspends the current thread for timeout milliseconds. If timeout == 0,
+        ** forces the thread to give up the remainder of its timeslice.
+        **
+        ** Exceptions: ArgumentException if timeout < 0.
+        =========================================================================*/
+
+        public static void Sleep(int milliseconds)
+        {
+            Sleep(TimeSpan.FromMilliseconds(milliseconds));
+        }
+
+        //| <include path='docs/doc[@for="Thread.Sleep"]/*' />
+        public static void Sleep(TimeSpan timeout)
+        {
+            ThreadHandle.Sleep(timeout);
+        }
+
+        /* wait for a length of time proportional to 'iterations'.  Each iteration is should
+           only take a few machine instructions.  Calling this API is preferable to coding
+           an explicit busy loop because the hardware can be informed that it is busy waiting. */
+
+        //| <include path='docs/doc[@for="Thread.SpinWait"]/*' />
+        [NoHeapAllocation]
+        public static void SpinWait(int iterations)
+        {
+            for (int i = iterations; i > 0; i--) {
+                // Ensure that the optimizer doesn't remove this
+                NativeNoOp();
+            }
+        }
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void NativeNoOp();
+
+        internal static int GetCurrentProcessIndex() {
+            return ProcessService.GetCurrentProcessId();
+        }
+
+        internal bool WaitForMonitor(SchedulerTime timeOut)
+        {
+            return autoEvent.WaitOne(timeOut);
+        }
+
+        internal bool WaitForEvent(SchedulerTime timeOut)
+        {
+            DebugStub.Break();
+            return autoEvent.WaitOne(timeOut);
+        }
+
+        internal bool WaitForEvent(TimeSpan timeout)
+        {
+            DebugStub.Break();
+            return autoEvent.WaitOne(timeout);
+        }
+
+        internal static unsafe bool WaitForGCEvent(int currentThreadIndex)
+        {
+            AutoResetEvent are =
+                threadTable[currentThreadIndex].processGcEvent;
+            // BUGBUG: The restoration of the gcState should be taken
+            // care of by the compiler.
+            return are.WaitOneNoGC();
+        }
+
+        internal void SignalMonitor()
+        {
+            autoEvent.Set();
+        }
+
+        internal void SignalEvent()
+        {
+            DebugStub.Break();
+            autoEvent.Set();
+        }
+
+        [Inline]
+        internal static void SignalGCEvent(int currentThreadIndex,
+                                           int threadIndex)
+        {
+            SignalGCEvent(threadIndex);
+        }
+
+        internal static unsafe void SignalGCEvent(int threadIndex)
+        {
+            Thread thread = threadTable[threadIndex];
+            if (thread == null) {
+                return;
+            }
+            thread.processGcEvent.SetNoGC();
+        }
+
+        //| <include path='docs/doc[@for="Thread.CurrentThread"]/*' />
+        public static Thread CurrentThread
+        {
+            [NoHeapAllocation]
+            [NoStackLinkCheck]
+            get {
+                return Processor.GetCurrentThread();
+            }
+        }
+
+        internal ThreadHandle Handle
+        {
+            [NoHeapAllocation]
+            get { return threadHandle; }
+        }
+
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        private static Thread GetCurrentThreadNative()
+        {
+            return Processor.GetCurrentThread();
+        }
+
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        internal static int GetCurrentThreadIndex()
+        {
+            return Processor.GetCurrentThread().threadIndex;
+        }
+
+        /*=========================================================================
+        ** Return the thread state as a consistent set of bits.  This is more
+        ** general then IsAlive or IsBackground.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.ThreadState"]/*' />
+        public ThreadState ThreadState
+        {
+            [NoHeapAllocation]
+            get { return threadState; }
+        }
+
+        [NoHeapAllocation]
+        public int GetThreadId()
+        {
+            return threadIndex;
+        }
+
+        /*=========================================================================
+        ** Allocates an un-named data slot. The slot is allocated on ALL the
+        ** threads.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.AllocateDataSlot"]/*' />
+        public static LocalDataStoreSlot AllocateDataSlot()
+        {
+            return m_LocalDataStoreMgr.AllocateDataSlot();
+        }
+
+        /*=========================================================================
+        ** Allocates a named data slot. The slot is allocated on ALL the
+        ** threads.  Named data slots are "public" and can be manipulated by
+        ** anyone.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.AllocateNamedDataSlot"]/*' />
+        public static LocalDataStoreSlot AllocateNamedDataSlot(String name)
+        {
+            return m_LocalDataStoreMgr.AllocateNamedDataSlot(name);
+        }
+
+        /*=========================================================================
+        ** Looks up a named data slot. If the name has not been used, a new slot is
+        ** allocated.  Named data slots are "public" and can be manipulated by
+        ** anyone.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.GetNamedDataSlot"]/*' />
+        public static LocalDataStoreSlot GetNamedDataSlot(String name)
+        {
+            return m_LocalDataStoreMgr.GetNamedDataSlot(name);
+        }
+
+        /*=========================================================================
+        ** Frees a named data slot. The slot is allocated on ALL the
+        ** threads.  Named data slots are "public" and can be manipulated by
+        ** anyone.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.FreeNamedDataSlot"]/*' />
+        public static void FreeNamedDataSlot(String name)
+        {
+            m_LocalDataStoreMgr.FreeNamedDataSlot(name);
+        }
+
+        /*=========================================================================
+        ** Retrieves the value from the specified slot on the current thread.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.GetData"]/*' />
+        public static Object GetData(LocalDataStoreSlot slot)
+        {
+            m_LocalDataStoreMgr.ValidateSlot(slot);
+
+            if (localDataStore != null) {
+                return localDataStore.GetData(slot);
+            }
+            return null;
+        }
+
+        /*=========================================================================
+        ** Sets the data in the specified slot on the currently running thread.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="Thread.SetData"]/*' />
+        public static void SetData(LocalDataStoreSlot slot, Object data)
+        {
+            // Create new DLS if one hasn't been created for this thread.
+            if (localDataStore == null) {
+                localDataStore = m_LocalDataStoreMgr.CreateLocalDataStore();
+            }
+            localDataStore.SetData(slot, data);
+        }
+
+        /*=============================================================*/
+
+        internal Object ExceptionState
+        {
+            [NoHeapAllocation]
+            get { return m_ExceptionStateInfo;}
+            [NoHeapAllocation]
+            set { m_ExceptionStateInfo = value;}
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis()
+        {
+            threadStart = null;
+            m_Priority = 0;
+        }
+#endif
+        /*=========================================================================
+        ** Volatile Read & Write and MemoryBarrier methods.
+        ** Provides the ability to read and write values ensuring that the values
+        ** are read/written each time they are accessed.
+        =========================================================================*/
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern byte VolatileRead(ref byte address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern short VolatileRead(ref short address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead2"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern int VolatileRead(ref int address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead3"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern long VolatileRead(ref long address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead4"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern sbyte VolatileRead(ref sbyte address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead5"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern ushort VolatileRead(ref ushort address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead6"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern uint VolatileRead(ref uint address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead7"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern IntPtr VolatileRead(ref IntPtr address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead8"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern UIntPtr VolatileRead(ref UIntPtr address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead9"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern ulong VolatileRead(ref ulong address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead10"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern float VolatileRead(ref float address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead11"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern double VolatileRead(ref double address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead12"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern Object VolatileRead(ref Object address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref byte address, byte value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref short address, short value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite2"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref int address, int value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite3"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref long address, long value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite4"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref sbyte address, sbyte value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite5"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref ushort address, ushort value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite6"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref uint address, uint value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite7"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref IntPtr address, IntPtr value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite8"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref UIntPtr address, UIntPtr value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite9"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref ulong address, ulong value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite10"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref float address, float value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite11"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref double address, double value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite12"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref Object address, Object value);
+
+        //| <include path='docs/doc[@for="Thread.MemoryBarrier"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void MemoryBarrier();
+
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static unsafe extern Thread HalGetThread();
+
+        [NoHeapAllocation]
+        public static void Yield()
+        {
+            ThreadHandle.Yield();
+        }
+
+        [NoHeapAllocation]
+        public bool IsStopped()
+        {
+            return (threadState == ThreadState.Stopped);
+        }
+
+        [PreInitRefCounts]
+        static unsafe Thread()
+        {
+            threadIndexGenerator = 1;
+
+            // Enable Thread.CurrentThread as soon as we can!
+            initialThread = Magic.toThread(BootstrapMemory.Allocate(typeof(Thread)));
+            initialThread.threadState = ThreadState.Running;
+            initialThread.threadIndex = 0;
+
+            // Allocate tables for thread management
+            threadTable = (Thread[])
+                BootstrapMemory.Allocate(typeof(Thread[]), maxThreads);
+
+            // Initialize the thread and event tables
+            threadTable[initialThread.threadIndex] = initialThread;
+            initialThread.context = Processor.GetCurrentThreadContext();
+            initialThread.context->threadIndex =
+                unchecked((ushort) initialThread.threadIndex);
+            initialThread.context->UpdateAfterGC(initialThread);
+
+            Tracing.Log(Tracing.Debug, "InitialThread={0:x8}",
+                        Magic.addressOf(initialThread));
+        }
+
+        internal static unsafe void FinishInitializeThread()
+        {
+            int threadIndex = initialThread.threadIndex;
+            // Get the GC ready for initialThread
+            Transitions.RuntimeInitialized();
+            Transitions.ThreadStart();
+            initialThread.processGcEvent = new AutoResetEvent(false);
+            initialThread.autoEvent = new AutoResetEvent(false);
+            initialThread.joinEvent = new ManualResetEvent(false);
+            initialThread.singleQueueItem =
+                new ThreadQueueItem [1] { new ThreadQueueItem(initialThread) };
+            // Use CurrentThread to find our initial handle:
+            VTable.Assert(initialThread == CurrentThread);
+            initialThread.threadHandle = ThreadHandle.CurrentThread();
+            // Instantiate the static variable that needs to be initialized
+            m_LocalDataStoreMgr = new LocalDataStoreMgr();
+            AddThread(threadIndex);
+        }
+
+        public TimeSpan ExecutionTime
+        {
+            get {
+                TimeSpan t = ThreadHandle.GetExecutionTime(threadHandle);
+                GC.KeepAlive(this);
+                return t;
+            }
+        }
+
+        internal static
+        void VisitBootstrapData(GCs.NonNullReferenceVisitor visitor)
+        {
+            visitor.VisitReferenceFields(Thread.initialThread);
+            visitor.VisitReferenceFields(Thread.threadTable);
+        }
+
+        internal static unsafe void UpdateAfterGC()
+        {
+            // Update all the thread pointers in the thread contexts
+            for (int i = 0; i < threadTable.Length; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    thread.context->UpdateAfterGC(thread);
+                }
+            }
+        }
+
+        // Cache for ABI synchronization
+        private SyncHandle[] syncHandles;
+        internal SyncHandle[] GetSyncHandles(int length)
+        {
+            if (syncHandles == null ||
+                syncHandles.Length < length) {
+
+                syncHandles = new SyncHandle[length + 8];
+            }
+            return syncHandles;
+        }
+
+
+        // Caches for Select synchronization
+        // We use stacks, because selectable abstractions might
+        // internally implement HeadMatches using select receive
+        // which is called from within an outer select.
+        // NOTE however that internal selects should never block
+        // (use timeout)
+        private Stack selectBoolsStack;
+        private Stack selectObjectsStack;
+        private Stack selectSyncHandlesStack;
+
+        public bool[] PopSelectBools(int size)
+        {
+            if (selectBoolsStack == null) {
+                selectBoolsStack = new Stack();
+            }
+            if (selectBoolsStack.Count == 0) {
+                return new bool [size];
+            }
+            bool[] selectBools = (bool[])selectBoolsStack.Pop();
+            if (selectBools.Length < size) {
+                return new bool [size];
+            }
+            return selectBools;
+        }
+
+        public void PushSelectBools(bool[] cache) {
+            selectBoolsStack.Push(cache);
+        }
+
+        public ISelectable[] PopSelectObjects(int size)
+        {
+            if (selectObjectsStack == null) {
+                selectObjectsStack = new Stack();
+            }
+            if (selectObjectsStack.Count == 0) {
+                return new ISelectable [size];
+            }
+            ISelectable[] selectObjects = (ISelectable[])selectObjectsStack.Pop();
+            if (selectObjects.Length < size) {
+                return new ISelectable [size];
+            }
+            return selectObjects;
+        }
+        public void PushSelectObjects(ISelectable[] cache) {
+            selectObjectsStack.Push(cache);
+        }
+
+        public SyncHandle[] PopSelectSyncHandles(int size)
+        {
+            if (selectSyncHandlesStack == null) {
+                selectSyncHandlesStack = new Stack();
+            }
+            if (selectSyncHandlesStack.Count == 0) {
+                return new SyncHandle [size];
+            }
+            SyncHandle[] selectSyncHandles = (SyncHandle[])selectSyncHandlesStack.Pop();
+            if (selectSyncHandles.Length < size) {
+                return new SyncHandle [size];
+            }
+            return selectSyncHandles;
+        }
+        public void PushSelectSyncHandles(SyncHandle[] cache) {
+            selectSyncHandlesStack.Push(cache);
+        }
+
+
+
+        // Given a frame's range in memory (its esp/ebp), check whether
+        // the frame contains the top transition record.  If so,
+        // prepare for making a transition from process mode back
+        // to kernel mode.
+        [AccessedByRuntime("referenced from halasm.asm")]
+        [NoStackLinkCheck] // We don't want to throw an exception here;
+            // Therefore, we cannot risk allocating stack segments,
+            // and we should only call other NoStackLinkCheck functions (XXX).
+        internal static unsafe UIntPtr CheckKernelProcessBoundary(UIntPtr esp, UIntPtr ebp, Exception exn)
+        {
+            ThreadContext *context = Processor.GetCurrentThreadContext();
+            CallStack.TransitionRecord *topMarker = context->kernelMarkers;
+            CallStack.TransitionRecord *secondMarker = context->stackMarkers;
+            UIntPtr topMarkerPtr = (UIntPtr) topMarker;
+            // If the top marker is in our frame, we've reached a boundary:
+            if (esp < topMarkerPtr && topMarkerPtr <= ebp) {
+                context->uncaughtFlag = true;
+                Thread.CurrentThread.lastUncaughtException = exn;
+                Processor.GetCurrentThreadContext()->SetKernelMode();
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        // Most recently thrown exception object that the thread
+        // did not catch at all (i.e. that propagated to the bottom
+        // of the stack without encountering an appropriate catch clause).
+        public Exception LastUncaughtException
+        {
+            [NoHeapAllocation]
+            get {
+                return lastUncaughtException;
+            }
+        }
+
+        // Tell JoinAll not to block waiting for this thread to exit.
+        // Some special threads (e.g. the finalizer thread) need to run
+        // only as long as there are other threads running, and should
+        // not be considered by JoinAll.
+        [NoHeapAllocation]
+        internal void SetIgnoredByJoinAll()
+        {
+            ignoredByJoinAll = true;
+        }
+    }
+
+    // This class is designed to support queues whose enqueue,
+    // dequeue, and remove operations do not allocate memory.
+    // This feature is useful when writing code that needs to
+    // do such operations with interrupts off.
+    [CLSCompliant(false)]
+    public class ThreadQueue
+    {
+        private ThreadQueueItem head = null;
+        private ThreadQueueItem tail = null;
+
+        [NoHeapAllocation]
+        public void Enqueue(ThreadQueueItem item)
+        {
+            VTable.Assert(item.Next == null);
+            VTable.Assert(item.Prev == null);
+            VTable.Assert(item.Queue == null);
+
+            item.Queue = this;
+            item.Prev = tail;
+
+            if (tail != null) {
+                VTable.Assert(tail.Next == null);
+                tail.Next = item;
+            } else {
+                VTable.Assert(head == null);
+                head = item;
+            }
+
+            tail = item;
+        }
+
+        [NoHeapAllocation]
+        public ThreadQueueItem Dequeue()
+        {
+            ThreadQueueItem item = head;
+
+            if (item != null) {
+                Remove(item);
+            }
+
+            return item;
+        }
+
+        [NoHeapAllocation]
+        public void Remove(ThreadQueueItem item)
+        {
+            VTable.Assert(item.Queue == this);
+
+            if (item.Next != null) {
+                item.Next.Prev = item.Prev;
+            } else {
+                VTable.Assert(item == tail);
+                tail = item.Prev;
+            }
+
+            if (item.Prev != null) {
+                item.Prev.Next = item.Next;
+            } else {
+                VTable.Assert(item == head);
+                head = item.Next;
+            }
+
+            item.Next = null;
+            item.Prev = null;
+            item.Queue = null;
+        }
+
+        [NoHeapAllocation]
+        public bool IsEmpty()
+        {
+            return (head == null);
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class ThreadQueueItem
+    {
+        public readonly Thread Thread = null;
+
+        public ThreadQueueItem Next = null;
+        public ThreadQueueItem Prev = null;
+
+        public ThreadQueue Queue = null;
+
+        public ThreadQueueItem(Thread thread)
+        {
+            Thread = thread;
+        }
+
+        [NoHeapAllocation]
+        public void Remove()
+        {
+            if (Queue != null) {
+                Queue.Remove(this);
+            }
+
+            VTable.Assert(Next == null);
+            VTable.Assert(Prev == null);
+            VTable.Assert(Queue == null);
+        }
+    }
+}
diff --git a/base/Applications/Runtime/System/Threading/Timeout.cs b/base/Applications/Runtime/System/Threading/Timeout.cs
new file mode 100644
index 0000000..c670431
--- /dev/null
+++ b/base/Applications/Runtime/System/Threading/Timeout.cs
@@ -0,0 +1,25 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Threading {
+    using System.Threading;
+    using System;
+    // A constant used by methods that take a timeout (Object.Wait, Thread.Sleep
+    // etc) to indicate that no timeout should occur.
+    //
+    // @todo: this should become an enum.
+    //| <include path='docs/doc[@for="Timeout"]/*' />
+    public sealed class Timeout
+    {
+        private Timeout()
+        {
+        }
+
+        //| <include path='docs/doc[@for="Timeout.Infinite"]/*' />
+        public static readonly TimeSpan Infinite = TimeSpan.Infinite;
+    }
+
+}
diff --git a/base/Applications/Runtime/System/Threading/WaitHandle.cs b/base/Applications/Runtime/System/Threading/WaitHandle.cs
new file mode 100644
index 0000000..b2f1b06
--- /dev/null
+++ b/base/Applications/Runtime/System/Threading/WaitHandle.cs
@@ -0,0 +1,119 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: WaitHandle    (this name is NOT definitive)
+**
+**
+** Purpose: Class to represent all synchronization objects in the runtime (that allow multiple wait)
+**
+** Date: August, 1999
+**
+=============================================================================*/
+
+namespace System.Threading {
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using System.Collections;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.V1.Services;
+
+    //| <include path='docs/doc[@for="WaitHandle"]/*' />
+    [CLSCompliant(false)]
+    public abstract class WaitHandle : IDisposable
+    {
+        //| <include path='docs/doc[@for="WaitHandle.WaitTimeout"]/*' />
+        public const int WaitTimeout = -1;
+
+        protected WaitHandle()
+        {
+        }
+
+        protected abstract SyncHandle Handle{
+            get;
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne"]/*' />
+        public abstract bool WaitOne(TimeSpan timeout);
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne1"]/*' />
+        public abstract bool WaitOne(SchedulerTime stop);
+
+        [Obsolete("Do not use DateTime for scheduling. It is meaningless. Use SchedulerTime")]
+        public bool WaitOne(DateTime stop) {
+            SchedulerTime st = SchedulerTime.MinValue + (stop - DateTime.BootTime);
+            return WaitOne(st);
+        }
+
+        //| <include path='docs/doc[@for="SyncHandle.WaitOne2"]/*' />
+        public abstract bool WaitOne();
+
+        //| <include path='docs/doc[@for="WaitHandleHandle.WaitAny"]/*' />
+        public static unsafe int WaitAny(WaitHandle[] waitHandles,
+                                         TimeSpan timeout)
+        {
+            SyncHandle[] handles = Thread.CurrentThread.GetSyncHandles(waitHandles.Length);
+            for (int i = 0; i < waitHandles.Length; i++) {
+                handles[i] = waitHandles[i].Handle;
+            }
+            fixed (SyncHandle *array = &handles[0]) {
+                return SyncHandle.WaitAny(array, waitHandles.Length, timeout);
+            }
+        }
+
+        //| <include path='docs/doc[@for="WaitHandleHandle.WaitAny"]/*' />
+        public static unsafe int WaitAny(WaitHandle[] waitHandles,
+                                         SchedulerTime stop)
+        {
+            SyncHandle[] handles = Thread.CurrentThread.GetSyncHandles(waitHandles.Length);
+            for (int i = 0; i < waitHandles.Length; i++) {
+                handles[i] = waitHandles[i].Handle;
+            }
+            fixed (SyncHandle *array = &handles[0]) {
+                return SyncHandle.WaitAny(array, waitHandles.Length, stop);
+            }
+        }
+
+        //| <include path='docs/doc[@for="WaitHandleHandle.WaitAny2"]/*' />
+        public static unsafe int WaitAny(WaitHandle[] waitHandles)
+        {
+            SyncHandle[] handles = Thread.CurrentThread.GetSyncHandles(waitHandles.Length);
+            for (int i = 0; i < waitHandles.Length; i++) {
+                handles[i] = waitHandles[i].Handle;
+            }
+            fixed (SyncHandle *array = &handles[0]) {
+                return SyncHandle.WaitAny(array, waitHandles.Length);
+            }
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.Dispose"]/*' />
+        protected abstract void Dispose(bool explicitDisposing);
+
+        //| <include path='docs/doc[@for="WaitHandle.Close"]/*' />
+        public virtual void Close()
+        {
+            Dispose(true);
+            GC.nativeSuppressFinalize(this);
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.IDisposable.Dispose"]/*' />
+        /// <internalonly/>
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+            GC.nativeSuppressFinalize(this);
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.Finalize"]/*' />
+        ~WaitHandle()
+        {
+            Dispose(false);
+        }
+
+    }
+}
diff --git a/base/Applications/Runtime/TestApp.csproj b/base/Applications/Runtime/TestApp.csproj
new file mode 100644
index 0000000..812cb39
--- /dev/null
+++ b/base/Applications/Runtime/TestApp.csproj
@@ -0,0 +1,43 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>testapp</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <OutputPath>$(APPRUNTIMEDIR)</OutputPath>
+    <Language>C#</Language>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="testapp.cs"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Runtime\Corlibsg.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets"/>
+
+  <!--
+  <Target Name="AfterBuild"
+          DependsOnTargets="CompileNative">
+  </Target>
+  -->
+
+</Project>
+
diff --git a/base/Applications/Runtime/testapp.cs b/base/Applications/Runtime/testapp.cs
new file mode 100644
index 0000000..8486a53
--- /dev/null
+++ b/base/Applications/Runtime/testapp.cs
@@ -0,0 +1,34 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   testapp.cs
+//
+//  Note:   This file contains the main entry point for the C#
+//          portion of Singularity.
+//
+using Microsoft.Singularity;
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Microsoft.Singularity
+{
+    public class Iltest
+    {
+        public static int Main(String[] args)
+        {
+            int i = 10;
+            long l = 100;
+            byte b = 1;
+
+            DebugStub.Print("Hello from TestApp.cs\n");
+            DebugStub.Print("byte: {0}, int: {1}, long: {2}\n",
+                            __arglist(b, i, l));
+
+            return 999;
+        }
+    }
+}
diff --git a/base/Applications/SeattleTrafficProxy/SeattleTrafficProxy.csproj b/base/Applications/SeattleTrafficProxy/SeattleTrafficProxy.csproj
new file mode 100644
index 0000000..bd0b639
--- /dev/null
+++ b/base/Applications/SeattleTrafficProxy/SeattleTrafficProxy.csproj
@@ -0,0 +1,39 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SeattleTraffic</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <Compile Include="SeattleTrafficProxy.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml\Xml.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\SeattleTrafficProxy.Contracts\SeattleTrafficProxy.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/SeattleTrafficProxy/SeattleTrafficProxy.sg b/base/Applications/SeattleTrafficProxy/SeattleTrafficProxy.sg
new file mode 100644
index 0000000..9e7e376
--- /dev/null
+++ b/base/Applications/SeattleTrafficProxy/SeattleTrafficProxy.sg
@@ -0,0 +1,250 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SeattleTrafficProxy.sg
+//
+//  Note:   A simple proxy module for the Seattle Traffic web service
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.SeattleTrafficProxy.Contracts;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Xml;
+using System;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Mappoint proxy service", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SeattleTrafficProxy.AppMain(this);
+        }
+    }
+
+    public class SeattleTrafficProxy
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            ds.RecvSuccess();
+            
+            
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            try
+            {
+                ds.SendRegister(Bitter.FromString2(SeattleTrafficProxyContract.ModuleName), nsImp);
+
+                switch receive
+                {
+                    case ds.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case ds.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        Console.WriteLine("Failed to register the SeattleTraffic proxy module as " +
+                                        SeattleTrafficProxyContract.ModuleName);
+                        delete nsExp;
+                        delete rejectedEP;
+                        return -1;
+
+                    case ds.ChannelClosed():
+                        Console.WriteLine("ds channel closed");
+                        delete nsExp;
+                        return -1;
+                }
+            }
+            finally
+            {
+                delete ds;
+            }
+
+            // Here is the set of client channels we service
+            ESet<SeattleTrafficProxyContract.Exp:ReadyState> epSet = new ESet<SeattleTrafficProxyContract.Exp:ReadyState>();
+
+            while(true)
+            {
+                switch receive
+                {
+                    // ------------------------------- Requests for new connections
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people top give us SeattleTrafficProxyContract.Exp instances
+                            SeattleTrafficProxyContract.Exp newClient = newEp as SeattleTrafficProxyContract.Exp;
+
+                            if (newClient == null)
+                            {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else
+                            {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newClient.SendReady();
+                                epSet.Add(newClient);
+                            }
+                        }
+                        break;
+
+                        // ------------------------------- Requests on existing connections
+                        //
+                        // Don't forget that we're selecting endpoints
+                        // from the epSet endpoint-set. In each case that we
+                        // receive a message from one of those endpoints, we
+                        // need to remember to put the endpoint back into epSet
+                        // if we want to keep listening to it.
+                        //
+                    case ep.GetTraffic() in epSet:
+                        {
+                            Console.WriteLine("SeattleTrafficProxy - received a GetTraffic request");
+                            TrafficInfo[]! in ExHeap trafficInfo = LookupTraffic();
+                            ep.SendTraffic(trafficInfo);
+                            epSet.Add(ep);
+                        }
+                        break;
+                        
+                    case nsExp.ChannelClosed() && epSet.Empty() :
+                        // The namespace channel is closed and we have no more client
+                        // channels, so pack up and go home.
+                        delete nsExp;
+                        epSet.Dispose();
+                        return -1;
+
+                    case ep.ChannelClosed() in epSet :
+                        // Dispose of channels when our clients close them
+                        delete ep;
+                        break;
+                }
+            }
+            return 0;
+        }
+        
+        //
+        // HACK: LookupTraffic - This should leverage the Bayesian prediction work
+        // done by Eric Horvitz to retrieve traffic bottleneck times.
+        //
+        private static TrafficInfo[]! in ExHeap LookupTraffic()
+        {
+		    // HACK: Disable until ready.
+		    /* 
+		    try
+		    {
+			    using(WebClient webclient = new WebClient())
+			    {
+				    // Download traffic data
+				    // TODO: Only download every five minutes.
+				    webclient.DownloadFile(@"http://www.adapt.msresearch.us/smartphlow/Desktop/tip02.dat", "tip02.dat");
+			    }
+			    // Parse data
+			    byte [] rawTraffic = ParseTipFile("tip02.dat");
+    		
+			    // Generate the results for the client.
+			    // TODO: Add more value to the traffic response.
+			    TrafficInfo[]! in ExHeap trafficInfo = BuildTrafficInfo(rawTraffic);
+			    return trafficInfo;
+		    }
+		    catch (Exception ex)
+		    {
+		    }
+		    */
+    		
+            TrafficInfo[]! in ExHeap trafficInfo = new[ExHeap] TrafficInfo[12];
+            
+            // West side
+            
+            // 520 WB at Montlake
+            trafficInfo[0].minUntilFree = 6;
+            trafficInfo[0].latitude = 47.64574f;
+            trafficInfo[0].longitude = -122.30687f;
+            // 520 EB at Montlake
+            trafficInfo[1].minUntilFree = 30;
+            trafficInfo[1].latitude = 47.64314f;
+            trafficInfo[1].longitude = -122.30634f;
+            // 5 SB at Lake Union
+            trafficInfo[2].minUntilFree = 12;
+            trafficInfo[2].latitude = 47.63600f;
+            trafficInfo[2].longitude = -122.32949f;
+            // 5 NB at Lake Union
+            trafficInfo[3].minUntilFree = 27;
+            trafficInfo[3].latitude = 47.63519f;
+            trafficInfo[3].longitude = -122.32143f;
+
+            // East side
+            
+            // 520 WB at bridge
+            trafficInfo[4].minUntilFree = 51;
+            trafficInfo[4].latitude = 47.64571f;
+            trafficInfo[4].longitude = -122.21226f;
+            // 520 EB at bridge
+            trafficInfo[5].minUntilFree = 0;
+            trafficInfo[5].latitude = 47.63983f;
+            trafficInfo[5].longitude = -122.20965f;
+            // 520 EB at Redmond
+            trafficInfo[6].minUntilFree = 22;
+            trafficInfo[6].latitude = 47.66538f;
+            trafficInfo[6].longitude = -122.11552f;
+            // 520 WB at Redmond
+            trafficInfo[7].minUntilFree = 0;
+            trafficInfo[7].latitude = 47.66986f;
+            trafficInfo[7].longitude = -122.13050f;
+            
+            // 405 N in Bellevue
+            trafficInfo[8].minUntilFree = 39;
+            trafficInfo[8].latitude = 47.60998f;
+            trafficInfo[8].longitude = -122.18467f;
+            // 405 S in Bellevue
+            trafficInfo[9].minUntilFree = 16;
+            trafficInfo[9].latitude = 47.61012f;
+            trafficInfo[9].longitude = -122.19992f;
+            // 405 N in Kirkland
+            trafficInfo[10].minUntilFree = 14;
+            trafficInfo[10].latitude = 47.66809f;
+            trafficInfo[10].longitude = -122.18236f;
+            // 405 S in Kirkland
+            trafficInfo[11].minUntilFree = 9;
+            trafficInfo[11].latitude = 47.66761f;
+            trafficInfo[11].longitude = -122.19861f;
+            
+            return trafficInfo;
+        }
+    }
+}
diff --git a/base/Applications/Security/CryptoBvt/CryptoBvt.cs b/base/Applications/Security/CryptoBvt/CryptoBvt.cs
new file mode 100644
index 0000000..85bc78d
--- /dev/null
+++ b/base/Applications/Security/CryptoBvt/CryptoBvt.cs
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CryptoBvt.cs
+//
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CryptoBvt
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            MD4Test.VerifyKnownDigests();
+            DesTest.RunTests();
+        }
+    }
+
+    class Util
+    {
+        public const string HexDigits = "0123456789abcdef";
+
+        public static string! ByteArrayToString(byte[]! buffer, int index, int length)
+        {
+            StringBuilder sb = new StringBuilder(length * 2);
+            for (int i = 0; i < length; i++)
+            {
+                byte b = buffer[index + i];
+                sb.Append(HexDigits[b >> 4]);
+                sb.Append(HexDigits[b & 0xf]);
+            }
+            return sb.ToString();
+        }
+
+        public static string! ByteArrayToStringHex(byte[]! buffer)
+        {
+            return ByteArrayToString(buffer, 0, buffer.Length);
+        }
+    }
+}
diff --git a/base/Applications/Security/CryptoBvt/CryptoBvt.csproj b/base/Applications/Security/CryptoBvt/CryptoBvt.csproj
new file mode 100644
index 0000000..b94cdc2
--- /dev/null
+++ b/base/Applications/Security/CryptoBvt/CryptoBvt.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Cryptobvt</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CryptoBvt.cs" />
+    <Compile Include="MD4Test.cs" />
+    <Compile Include="DesTest.cs" />
+    <Compile Include="Util.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Crypto\Crypto.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Security/CryptoBvt/DesTest.cs b/base/Applications/Security/CryptoBvt/DesTest.cs
new file mode 100644
index 0000000..6aec86b
--- /dev/null
+++ b/base/Applications/Security/CryptoBvt/DesTest.cs
@@ -0,0 +1,332 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DesTest.cs
+//
+//
+
+using System;
+using System.Security.Cryptography;
+
+interface IDes
+{
+    void EncryptBlock(byte[] key, byte[] input, byte[] output);
+    void DecryptBlock(byte[] key, byte[] input, byte[] output);
+}
+
+class ManagedDes : IDes
+{
+    public void EncryptBlock(byte[] key, byte[] input, byte[] output)
+    {
+        Des.EncryptDecrypt(key, input, output, true);
+    }
+
+    public void DecryptBlock(byte[] key, byte[] input, byte[] output)
+    {
+        Des.EncryptDecrypt(key, input, output, false);
+    }
+}
+
+class DesTest
+{
+    public static void RunTests()
+    {
+        IDes![]! implementations = {
+            new ManagedDes(),
+            // no other implementations are available on Singularity yet
+        };
+
+        TestKnownCiphers(implementations);
+
+        TestInterop(implementations);
+
+        foreach (IDes! des in implementations)
+        {
+            TestRandomCiphers(des);
+        }
+
+        Console.WriteLine("DES TEST: All tests complete.");
+    }
+
+    static void TestRandomCiphers(IDes! des)
+    {
+        Console.WriteLine("DES TEST: Testing implementation '{0}' for roundtrip encrypt/decrypt.", des.GetType().Name);
+        int tickStarted = Environment.TickCount;
+        int tickStopped;
+        int cipherCount = 0;
+
+        Random random = new Random();
+
+        for (; ; )
+        {
+            for (int pass = 0; pass < 0x100; pass++)
+            {
+                byte[] key = new byte[8];
+                for (int i = 0; i < 8; i++)
+                    key[i] = (byte)random.Next(0, 0x100);
+
+                byte[] message = new byte[8];
+                for (int i = 0; i < 8; i++)
+                    message[i] = (byte)random.Next(0, 0x100);
+
+                byte[] cipher = new byte[8];
+                byte[] roundtrip_clear = new byte[8];
+                des.EncryptBlock(key, message, cipher);
+                cipherCount++;
+                des.DecryptBlock(key, cipher, roundtrip_clear);
+                cipherCount++;
+
+                if (Util.CompareArraySpans(message, 0, roundtrip_clear, 0, 8) != 0)
+                {
+                    Console.WriteLine("DES ERROR: DES implementation '{0}' FAILED an encrypt/decrypt roundtrip test.", des.GetType().Name);
+                    Console.WriteLine("    key:                " + Util.ByteArrayToStringHex(key));
+                    Console.WriteLine("    clear text (input): " + Util.ByteArrayToStringHex(message));
+                    Console.WriteLine("    cipher text:        " + Util.ByteArrayToStringHex(cipher));
+                    Console.WriteLine("    clear text (output): " + Util.ByteArrayToStringHex(roundtrip_clear));
+                    return;
+                }
+            }
+
+            int now = Environment.TickCount;
+            int elapsed = now - tickStarted;
+
+            if (elapsed > 5000)
+            {
+                tickStopped = now;
+                break;
+            }
+        }
+
+        Console.WriteLine("    PASSED.");
+        if (cipherCount > 0)
+        {
+            int totalElapsedMs = tickStopped - tickStarted;
+            double ciphersPerSecond = cipherCount / ((double)totalElapsedMs) * 1000.0;
+            Console.WriteLine("    Approx ciphers/sec: {0}", ciphersPerSecond);
+        }
+    }
+
+    static void TestInterop(IDes![]! imps)
+    {
+        Console.WriteLine("TEST: Testing interoperability between different implementations.");
+        Random random = new Random();
+        int failureCount = 0;
+
+        for (int pass = 0; pass < 10; pass++)
+        {
+            byte[] key = new byte[8];
+            for (int i = 0; i < 8; i++)
+                key[i] = (byte)random.Next(0, 0x100);
+
+            byte[] message = new byte[8];
+            for (int i = 0; i < 8; i++)
+                message[i] = (byte)random.Next(0, 0x100);
+
+            for (int i = 0; i < imps.Length; i++)
+            {
+                for (int j = 0; j < imps.Length; j++)
+                {
+                    IDes! encrypt = imps[i];
+                    IDes! decrypt = imps[j];
+                    byte[] cipher = new byte[message.Length];
+                    byte[] clear = new byte[message.Length];
+                    encrypt.EncryptBlock(key, message, cipher);
+                    decrypt.DecryptBlock(key, cipher, clear);
+
+                    int c = Util.CompareArraySpans(message, 0, clear, 0, message.Length);
+                    if (c != 0)
+                    {
+                        Console.WriteLine("DECRYPTED VALUES ARE DIFFERENT!");
+                        Console.WriteLine("Encryptor: " + encrypt.GetType().FullName);
+                        Console.WriteLine("Decryptor: " + decrypt.GetType().FullName);
+                        Console.WriteLine("Clear text:");
+                        Util.DumpBuffer(message);
+                        Console.WriteLine("Cipher text:");
+                        Util.DumpBuffer(cipher);
+                        Console.WriteLine("Output text");
+                        Util.DumpBuffer(clear);
+                        failureCount++;
+
+                        i = imps.Length; break;
+                    }
+                    else
+                    {
+                        // Console.WriteLine("TEST: encrypt {0,-20} decrypt {1,-20} - ok", encrypt.GetType().Name, decrypt.GetType().Name));
+                    }
+                }
+            }
+        }
+
+        if (failureCount == 0)
+        {
+            Console.WriteLine("    PASSED: All interoperability tests succeeded.");
+        }
+        else
+        {
+            Console.WriteLine("    FAILED: At least one interop test failed.");
+        }
+    }
+
+    static void EmitRandomKnownCiphers()
+    {
+        Random random = new Random();
+
+        Console.WriteLine("static readonly KnownCipher[] _knownCiphers = {");
+        for (int i = 0; i < 0x20; i++)
+        {
+            byte[] key = new byte[8];
+            random.NextBytes(key);
+
+            byte[] message = new byte[8];
+            random.NextBytes(message);
+
+            byte[] cipher = new byte[8];
+            Des.Encrypt(key, message, cipher);
+
+            Console.WriteLine("new KnownCipher(\"{0}\", \"{1}\", \"{2}\"),",
+                Util.ByteArrayToStringHex(key),
+                Util.ByteArrayToStringHex(message),
+                Util.ByteArrayToStringHex(cipher));
+        }
+        Console.WriteLine("}");
+    }
+
+    /// <summary>
+    /// This method verifies that a DES implementation correctly encrypts and decrypts all of the
+    /// values in the table of known ciphers.
+    /// </summary>
+    /// <param name="des">The implementation to test.</param>
+    static void TestKnownCiphers(IDes![]! implementations)
+    {
+        Console.WriteLine("TEST: Testing all DES implementations against {0} known ciphers:", _knownCiphers.Length);
+        foreach (IDes! des in implementations)
+        {
+            string! implementationName = (!)des.GetType().Name;
+
+            bool passed = true;
+
+            foreach (KnownCipher known in _knownCiphers)
+            {
+                byte[] cipher = new byte[8];
+                des.EncryptBlock(known.Key, known.ClearText, cipher);
+
+                if (Util.CompareArraySpans(cipher, 0, known.Cipher, 0, 8) != 0)
+                {
+                    Console.WriteLine("*** DES implementation '{0}' FAILED to correctly ENCIPHER a block.", implementationName);
+                    Console.WriteLine("    key:                     " + Util.ByteArrayToStringHex(known.Key));
+                    Console.WriteLine("    clear text:              " + Util.ByteArrayToStringHex(known.ClearText));
+                    Console.WriteLine("    known good cipher text:  " + Util.ByteArrayToStringHex(known.Cipher));
+                    Console.WriteLine("    failed cipher text:      " + Util.ByteArrayToStringHex(cipher));
+                    passed = false;
+                    break;
+                }
+
+                byte[] cleartext = new byte[8];
+                des.DecryptBlock(known.Key, known.Cipher, cleartext);
+
+                if (Util.CompareArraySpans(cipher, 0, known.Cipher, 0, 8) != 0)
+                {
+                    Console.WriteLine("*** DES implementation '{0}' FAILED to correctly DECIPHER a block.", implementationName);
+                    Console.WriteLine("    key:                    " + Util.ByteArrayToStringHex(known.Key));
+                    Console.WriteLine("    cipher text:            " + Util.ByteArrayToStringHex(known.ClearText));
+                    Console.WriteLine("    known good clear text:  " + Util.ByteArrayToStringHex(known.Cipher));
+                    Console.WriteLine("    failed clear text:      " + Util.ByteArrayToStringHex(cipher));
+                    passed = false;
+                    break;
+                }
+            }
+
+            if (passed)
+            {
+                Console.WriteLine("    PASSED: " + implementationName);
+            }
+            else
+            {
+                Console.WriteLine("    FAILED: " + implementationName);
+            }
+        }
+    }
+
+#if false
+    void TestPerformance(DesImplementation[] imps)
+    {
+        Console.WriteLine("TEST: Estimating performance of implementations:");
+
+        Random random = new Random();
+
+        foreach (DesImplementation des in imps)
+        {
+            byte[] key = new byte[0];
+            random.NextBytes(key);
+
+            byte[] cleartext = new byte[0];
+        }
+    }
+#endif
+
+    struct KnownCipher
+    {
+        public KnownCipher(string! key, string! cleartext, string! cipher)
+            : this(
+            Util.HexStringToByteArray(key),
+            Util.HexStringToByteArray(cleartext),
+            Util.HexStringToByteArray(cipher))
+        {
+        }
+
+        public KnownCipher(byte[]! key, byte[]! cleartext, byte[]! cipher)
+        {
+            this.Key = key;
+            this.ClearText = cleartext;
+            this.Cipher = cipher;
+        }
+
+        public readonly byte[]! Key;
+        public readonly byte[]! ClearText;
+        public readonly byte[]! Cipher;
+    }
+
+
+    static readonly KnownCipher[] _knownCiphers =
+        {
+            new KnownCipher("26e9fc83852311d8", "e1402d0f9442d85c", "c0e394fd6490aa0f"),
+            new KnownCipher("c95e9d039d732b6c", "2eee2417b69692a8", "bcb78b4a1215d78a"),
+            new KnownCipher("7b331146c590b1d3", "6e376932bb2c030f", "555127f9a4111092"),
+            new KnownCipher("e83a28ea550972b3", "be905596fff9224b", "f9656d3ec8fbab2d"),
+            new KnownCipher("ae85936030929638", "adc9946509f9b101", "6b90762b582cad2d"),
+            new KnownCipher("eb142f7b6da75271", "c05e88353b1ad474", "349b95d1d20d26c1"),
+            new KnownCipher("141d833598a2df55", "a4f03d8b740ca9c4", "74507d68be5a8638"),
+            new KnownCipher("df53abeacaa7de06", "3222a0d10961fd92", "c366707e826f47f1"),
+            new KnownCipher("f52050eb757b6948", "35d9d77c6ac7fdb4", "738b39e892f934fd"),
+            new KnownCipher("b5c356e76ee9aa6d", "3f7d0376020e4c42", "3b85c78032007603"),
+            new KnownCipher("f3aa9654bbbd4f63", "ea63b4f0d0619c6a", "75609fcade3f50a3"),
+            new KnownCipher("25ec1b450b15240b", "75e3acf777f24627", "72021f00c2d5d1ba"),
+            new KnownCipher("8d9489bf31a8f8f8", "74f2fd0b35ba9cdd", "47b36b2a63ee1625"),
+            new KnownCipher("e1985116f20637dd", "868aded81057ecf7", "0ef7b7b9e9253675"),
+            new KnownCipher("1c8d623bd7dd397c", "f322d1181818d6bb", "5d9e33944c860522"),
+            new KnownCipher("46cf16dea1303487", "5cac38a6ca1fe81d", "b665aef92e365f88"),
+            new KnownCipher("0605eea757600504", "5ed422d0351fc46e", "744b0036d03d4d9b"),
+            new KnownCipher("b4229141400d56ec", "59dadf2ba493b2d4", "c480de721320b5a8"),
+            new KnownCipher("3ab31212292f63e5", "c9127fcc0d64523d", "d45e4fd7fbe7b1fe"),
+            new KnownCipher("e7caf2a78ea6dcf8", "af024d7d81da5fcb", "37e340853ffde534"),
+            new KnownCipher("224e95810cb24485", "beab772d8d89def5", "f5f9847dd156ab1b"),
+            new KnownCipher("88a143daa10a4693", "d6196327e1e664ef", "e752f30bd985b91e"),
+            new KnownCipher("b3b4aabfced03135", "856de9e22eaf6b26", "627247191de4454e"),
+            new KnownCipher("2358f4e096852a17", "0801aaf24e1da3d7", "55da1f2d460c0d43"),
+            new KnownCipher("47887ad8de1e26b7", "6f0e543321636427", "e04edfab22c74acc"),
+            new KnownCipher("ae3c0389f283592d", "8a93b7cd263ee668", "50889aa8dbafb44c"),
+            new KnownCipher("c9119ba635924704", "313c708731f6f6a4", "7637d6adbc64209a"),
+            new KnownCipher("9c834311191ae5c3", "2f4c4e4b67599130", "6ba0e036c4584386"),
+            new KnownCipher("28eb6a10c8bef21c", "f5fe57b512d1fc93", "e0a4ff1c86883af1"),
+            new KnownCipher("9d1330a2fbd44fae", "2cd777e843fc9dd7", "54091b5227549171"),
+            new KnownCipher("aa3f5f468ce5dcdd", "91261c1ac32fb05d", "dd5fe1a60c3fa9ed"),
+            new KnownCipher("50bbae5428ef3553", "9bbbe3f04709d9f8", "ad28c355c1b48107"),
+        };
+
+
+
+
+}
diff --git a/base/Applications/Security/CryptoBvt/MD4Test.cs b/base/Applications/Security/CryptoBvt/MD4Test.cs
new file mode 100644
index 0000000..85929bb
--- /dev/null
+++ b/base/Applications/Security/CryptoBvt/MD4Test.cs
@@ -0,0 +1,185 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MD4Test.cs
+//
+//
+
+using System;
+using System.Text;
+using System.Security.Cryptography;
+
+public static class MD4Test
+{
+
+    public static void GenerateKnownDigests()
+    {
+        Random random = new Random();
+
+        for (int i = 0; i < 0x40; i++)
+        {
+            int length = (random.Next() % 50) + 50;
+            byte[]! message = new byte[length];
+            random.NextBytes(message);
+
+            byte[]! digest = (!)(byte[])MD4Context.GetDigest(message);
+
+            Console.WriteLine("new KnownBinaryDigest(\"{0}\", \"{1}\");",
+                Util.ByteArrayToStringHex(digest),
+                Util.ByteArrayToStringHex(message));
+        }
+    }
+
+    struct KnownBinaryDigest
+    {
+        public readonly string Digest;
+        public readonly string HexMessage;
+
+        public KnownBinaryDigest(string digest, string message)
+        {
+            this.Digest = digest;
+            this.HexMessage = message;
+        }
+    }
+
+    struct KnownStringDigest
+    {
+        public readonly string Digest;
+        public readonly string TextMessage;
+
+        public KnownStringDigest(string digest, string message)
+        {
+            this.Digest = digest;
+            this.TextMessage = message;
+        }
+    }
+
+    #region Known Digests
+
+    static readonly KnownBinaryDigest[] _knownBinaryDigests =
+    {
+        new KnownBinaryDigest("f0bfce358c94b997446f92418a8ff037", "c07a95c4781606e4c60ddc8bf99e43ffc5c597e745f1ba55d5166a3c36006d39dc09eddb2c41f18d7a92f056f9afb90513c510882e4650"),
+        new KnownBinaryDigest("a2a637a9435062b1a0ea99da79b43b30", "bf3fef62acc9aec5a0a3aef0b167d283d40a6cb300635c255c642870efe40a96b91e1bec518ee0b0e42ab65601c953abf38cb424d99cce5ce3ca0548a03dd6bb991736934ce5314529bccfd5ad0523"),
+        new KnownBinaryDigest("20642ecf402a801b63a84d6bee5c5214", "107d7d6230e5bd1d4fbf098789980fa654fabdea92bf5f0d5b6efb1ccdf8afdda6713723c0748bb35919448cdcaabc91ac2881b2483901511d6f07c1eaa04f56102be1"),
+        new KnownBinaryDigest("3db0ec870748f4ce621e7f0390c14e47", "61ece5df6f0990787bd230b0b26a70a477fc946c70e605516dc9c8b8c9ed7cb0c8a52fc043a2423ea888d54b3f560f8030abdf139774a67be69472a540d7ae8d567fe8"),
+        new KnownBinaryDigest("ba47a68179ae71f3bdec8076d3616daa", "3aaf60d5ba55c4e710ba1117ba48881e0e681954feb4d9ae2f9cfdd1d947f4bf6d0245804a0a5941b0bf6a2b825bebf84f907fee65940e85d5b1a51d58f20ec8c651a9b70207d3030ed8a33f49ad2cd4b1058149c8065ad9f4c0aa98653ce9bdb0a1"),
+        new KnownBinaryDigest("8e3f46b580f612f6689820d6edccb4c0", "31b134f547bc7bdf8cf0ce3b2785d06b5271c500bff7cfc2425c3b9ed2efe68ea848fb227d10398c4c26cde92584821294d0964ceba1a639e271b2ea81dd0d9d0a4093df8aadee413738b4982ae59dbeda280901589aa306a2c1400b5d"),
+        new KnownBinaryDigest("6d9c5f91951d6910434748c9d8ee16cf", "0b6f1930dfe5f0a288e6e25414b2ed0d0efcd4f31058d30b44709c8d3dc86de2e3e82d457ffa06b7ce37a0221f0385f01995b243376a3eb29b0deb6f486365bf79ff712c84a78d14f61c25d9b8"),
+        new KnownBinaryDigest("90b25ee968b17d38d2c42681b1fd2276", "ec40eaac73a8162aaa79a97ba9710e976f6bd2e1a91f92586b72079e4d1b4465f9ea21ab849cf0bca84e55f78209fd1c055fadba06d706cdad924001a177dd8f3544"),
+        new KnownBinaryDigest("06a45aff14d1ec4af4d2cd0345bfed35", "bf4f6312d37a15385bca9bd56274ea98ed6e8a5e22e354fef15bee1b3171c6c23e873ecca24cd93ff19eab0312bcde8db6dfef20aae55fdbfb6420788bf907"),
+        new KnownBinaryDigest("98dd4304516ecb0238525c249faac59c", "04d896da351df5a1944a6c843851ec357c61645281a517592863d03d2b61b3f797c1ff3926035798e94e8c6078dba3aa78ebfb2a94b5685ec13db2d14db875329775ec7651b20e7809cc683319b7e04dc026"),
+        new KnownBinaryDigest("06d39ef7b937a9a607703136d4adf64b", "40668962e258a078e851864b31d859c803ee2c58c6dc8220c84c3545095c651126f335cc0d120a1eb13a26278380375abfeedd5e"),
+        new KnownBinaryDigest("e30551d3ede1ef4bed2666ed88d49bd2", "cdfe63e3689996235a6e8beb75243ea38dbaf0e40da78bb65a9c4814da861a7f067d59f4d2e8a57874fb56cc9a3c0e5bf9b73133ec7a862673ac89cb518148d4530ce5f7cb49d1a51578701250bf1c1e8eec1b2355e6938bf633"),
+        new KnownBinaryDigest("e08f1c0e503f1daf4a0814bde5a472b4", "255ed926f2b282788d561690afe68b1d740a73d5b48f6a3d6565247e6d79590197c8ab463c517d5fcd468fc7785b6b3dc9c81f81835dcc96f49bc08c8e030b14fd15f8e73a44e1228d13086d00a3c50afae6b4a459d87d"),
+        new KnownBinaryDigest("5926283b00d681d5773aa905d7e236ad", "fb1552a090f0d1c93b7ac96262840385e7fcf36f555f9550d6b692a74f66ba2597beeb25f240919c423e3186d962a875e32fbd5de40ee59c7f01cada5d297ad5bfa4cba399dd93a76b562c172d0f"),
+        new KnownBinaryDigest("b8caab8210e57bfa49dc96a4141c3fb8", "740e1cc31fa95d4089d94fa6f076b73e18c35cc6349704dc069c15f28de1ce6e6f8a55cc41665b2b626341ca4a37a230b3181453d14942dc093fbd82936bb3a70be0376520ebfdb2673164d1553a92cffae43e75cd"),
+        new KnownBinaryDigest("ab526921f32a481ef9a4221423c55717", "9d254879c201a8d897f6b09abf69003c10c81a61eba0e57187cfadee88ae2c3ed99043111da628fc098f996d21bb7b28cebdd4755b6c8efd40d7f2f253ba4fe8c972c02e26ee1e699f1e585c06774fcb"),
+        new KnownBinaryDigest("49adde580b63efa72da477d9ba4ed6c5", "841fcbdab6e36d0245d046b435a84e3fb0a3aefa4c02e09e6ad63c1432f6c887269ecf9b840e128f522ce01dd8b46a75091c56d4a1d007823f2c6fe0a659cf4f08bf8e97d8b2bba1901fa82021c2c6b56cc70a15a0f4"),
+        new KnownBinaryDigest("7b9ec86447f0fff3416705a7c8502a50", "55964d5c579e32e8f95c91151826d29c5661b4438128e7607c66ba74de4fbaaf13d938008b5663035e36afc490acad8e992ab4b3ebb1642dafecdff0e4bd09aaa1e2013feed21000fdb0e44a7922d0d0b82bdbb49b07c362740a509e76721fa12c05"),
+        new KnownBinaryDigest("4d571a449807de18c896d5518c8314e7", "aeab6e9fc619b3b53acc1ab48c1c0f38b8e1550f9a1e9fcae482728a8b91421d740021254a8b159be75188955a56c382663a67bfd7f6878f0ba4bb44a7292aa98afc3f8c"),
+        new KnownBinaryDigest("d1e3ad29b4df00d0e2e82ad7843dc4da", "eaed2cccba27499509708dbeef23502a82467e789119a6cfd1f3bd27df0b5d1636877b4d3af31dce3efa02342e85b705da7f07b6c11469d1475cfbc66922b6fe12768768a803ef8f28af39971672a14b"),
+        new KnownBinaryDigest("d81d2be81edf8af4cced6942238f6415", "b74c6003a755221ea905ddf856641c430421b7fd4f5dd78f788d11dbd1bbd5baaf8ab1d556fa6b21654afefd1196d24b1c541250ea4dec5a75d08b1943474cee2f2248ccb247ed0ab69598055fd97de1bbc6"),
+        new KnownBinaryDigest("b448014e40d44a7e620431061b420de3", "7da985d0619d575f856e51de1efd0fcdee4d0598d466079a55b5e7fa9c53a95d7d88cf45aa52e62e5ae8689b64b779074f0b8e94b52dea16a1ea7aacb55dc331c5f361962dca229c67d73decfd6c359e3bdf"),
+        new KnownBinaryDigest("9768dc037ed3ce03f1d22724f5db2774", "90c515a84f9db8a4bfd73a78fd2437d67055e3da85e8f22cdef0fd1934b5dc70d6b2326caf4b11f8742563c42c5e3fc8c696c448580524a8d2e8ca5fa09f6f0afbc9a24bf1ca262544ea665f852d007fb035529e"),
+        new KnownBinaryDigest("245fefc023958a857f6d76db50c3efd1", "9418d18d8a99c781b257d4b658c963bcf4d6fb709f046d9ec422a4e84aaf6b4dd11a66b1d1bd67315fa3919291a92c649dc2bb5f562e5090aa32c867"),
+        new KnownBinaryDigest("a500920a9ae3817d1c6816b3fcf6479f", "de3603ec87e53e62b1eb376eca10fc72da0d1bf5404b88f30bf6a2c9d6069ef4ff3c806d8ea609c4ee01ebd784f08b1d541dd024ad72b493ae0fe09142748cab4c426f8e908ee3340457073e5fb06e1b"),
+        new KnownBinaryDigest("38c80b639c54953c6c906e921ddada60", "8575b8367a478d88ecbf7ec578817975408a4280fd8cc53a9b20556b7534fda0c526bdffd375d2fae206a4cf646f8bd58dc91f252c9a6df8af7e9a59f12212b8c1ddff52c47aa1cab8479ef6e8f5d52c957fddac14d7742a"),
+        new KnownBinaryDigest("cd38041178d9fb3ba75d5f96e304988f", "c44f55da7808c0f4eb0e876f38111327546de4fc760fbaa86dc4724466a4e969d599ff2a4bf0403fde02fce74ebd5c6dca84bf6a8f2e41b495ad6db3967b8d47241d"),
+        new KnownBinaryDigest("58bfac3ac5f74300c3c70b6e2ba4e376", "9f12e8dc642ca51e7413d25ab068047ae1e47ed9a7584a959e828ca96274b5c23023bd5be1a75a3dea10cda1c252bd4b9101ab63a543f346c753"),
+        new KnownBinaryDigest("fc4d0efd7403af20e26f7846c9d3d35d", "e1a0fcbbff5d0f2a8caba8983a8941ef968aa8d24cc5411761c8521ded3076938e69799ded54ce44b328309fe96871d964535cbc1f80f1"),
+        new KnownBinaryDigest("86db265b01b99746cb3b14aa438191c4", "5ee55a360bf23d5c35150ad010a30142bc641f2395a12ef85778b999d4b9740d785d3e08fa9738c0ebd36ad35ea1c8c0521900bb61cd86bdb761df9239a388"),
+        new KnownBinaryDigest("c3fb7c36e5c7e95d79315e222a90f1e4", "a1fd57b365f948242b5e38c1375a9ab5b0f846bab9b8abaad6815198b8a587474bef32604a155a59d1db8f0395c4865cc72ae2405dcec1e851addce4a7"),
+        new KnownBinaryDigest("0ae97f2485f43dafea128cab4481dd6c", "6b86d6f1764727396b9b9eede8dd29a81512faf4d08ec347ea7d2d4a0e9c3875b1216f082ca34d3e348dbe47a16fe5e3bea997c9e9b2dfddc38e06f919dd2ace62283cc66d207b71c4bcbf42cf7ca57b974a8b65046e8cff4292459d9d54245762f0"),
+        new KnownBinaryDigest("74180625f0e3b027bc5a31af7ab79377", "79331e759d2d26052df29c0e46e98b61cf52c5c9f39c3d84dbdbded46f9768dfde972c4878d4ed38de695e0ca583ffb411f354049d26f0ddf59a9ac24f5295968abd2faebc43e8fb658ceb8a3d30df57db29"),
+        new KnownBinaryDigest("598f0f4c89c5b9b55eb71b73b776d00b", "7c426341b8a74e52de3a2ae88bd4c882e85450f7cd0b599f113b669fc5bb42e6268f1953267b77076ef109c13aa35fb675aef6038b31f571e9c4307d41ae8d23f743c2fcbb745b6ddd4889dc0198656ddbb02a"),
+        new KnownBinaryDigest("cdb03c829486120b7f77fdb1c9b8ad8c", "c43f5bf499a86a624af9c6bf64e6c9f6e063fa0053892542a7196f505ec3a19084765fb8e8ce62130af922e382ca771bce6e8c77b52ac33b19184d803819038657353bed87100e1200e7f6596641c0dda15481f0372adb59b3249ecf81e1daf0f69c"),
+        new KnownBinaryDigest("ee324b754479fe1f0eac727532b90008", "4d8f8993be607976cd3369d4d85870dee398124f2d59e13a63723e911e0d0662cab5734d18c0c390bdb30e26494fc6771103f758e34c5ef3ae4f304c21e857c02d070a23e422c622d482"),
+        new KnownBinaryDigest("7d6db0dbba1dbea008746ede376c2c5f", "7a4bbbf013abc6801b15ae7e7d577f9fc890776ed55b4ef84245a292ee3cd48361bae3a8f35f1ca05b683caa7f888ccc6583fe925c13bc1ffdc2adce093391"),
+        new KnownBinaryDigest("fe7f9dab6ec7de2f87444b4023dbf5a2", "412a1dc273d7ac6873d7136c1ea378b9b8d62d6b3e42264dfdc4ab30b14e9727d75d69556bc9598ed6951f85005000594af416320625a0fe03cfc4ae2b7c"),
+        new KnownBinaryDigest("11b24c3637f7c9026cd1e3ea9e51c1e4", "2540eb95c13a234eee7d9e94a823a14dadc451e5bd376421b1bd6a519c04aa625adef94514ba3e1e26a527b46790f7db628217ead996f9eddbcae404cfd1b2e9d33c39ca295b38f38533bf1710b0ba20c58fef19edc089c4e40c6a4ad6"),
+        new KnownBinaryDigest("daf7697812aa4bdf35210439c83fc5d5", "4e55f33ee12b572db206492364a6d7e2dd2a10c33e40e298fb12b375e51cf1ee1c4ae46923d2ce8ec998dde8d0c95be2ed022f3f3913fc0e725b42ce78e14795155a0719"),
+        new KnownBinaryDigest("ec9c52bf6541e44e2f591ac088c416ff", "6dbe0a5b81f9a663fac831b7d087e2edb1b5094ed6f6c88f0016e75047d275c2411f804424e3b71955aa78931017a75a65a763a5fdcbec76f57a5b6b12551b27526f75b0079ec8cefdf0f82b7e357fe86f8deba06ecfc476330a4fa9884c06ff8e51"),
+        new KnownBinaryDigest("155e56998c8a6f255221c841706d3d9f", "a0a2f653c6df95a80dd2c0f8bffb72fb856a7bb882aafe7dfd4f1e46b0e9f89d2cf5de46783924c0d927b7a473118fae155081951298bdf6a379"),
+        new KnownBinaryDigest("279a54a10ad9ce5766c80f9aa68556f1", "77c04ff724d922cbca1c2c834b45badf5af35a0aebbf6f305f67638b9337e8a2ffe3ad00893093ca5046c592e8cd364f57b96302486f6ab7501e97bc759737923389846798ba562a5f90b9a4fadd4892311333dad4e55a8f78f5af6a98d654b8"),
+        new KnownBinaryDigest("16d60d34d9250a5d7ab8e810a4dce9a0", "325f5f49ceb69d6338a2b8b5c6bc73d6058a62635cbe4d2ff4efa30aeb92893b0095c87de849635d96779c42a1dab2383c93934cf255b173113055df139277a5197db430f4f5eebc2704cce5220a8d193c6acd57ff3c48abe4546cb8f3834904"),
+        new KnownBinaryDigest("01c4c8a06a5cb85947f79faee6e888c9", "f6282425824347a5d624ed88cc5107a23ba3a8c420a6dd34084ba08935c8a3bbc8e52ce169f4b92686b128185b2317026415b8e0a03fdf4f4bf01d36a3be6f0e8032bfe625253947e9813e6e7ec4d9e5349d24200fc31a8906dc9578d68282c841"),
+        new KnownBinaryDigest("f052aea84646daf743e894cdf39de7f8", "97286431dd3fdc71f61f0071d18617380206994ffebd1835e0488fc07066fe762c632db08003bfe4449dccfb89940b0e619e807c2ef21bda102e5094af1b018f2089456d5966"),
+        new KnownBinaryDigest("9f0b66eff9c7e1aff8c0364a33df09f5", "ff47b50b60f01dac4c3d805fd1e68248394852a052b22a34289c3cdaff4e9eb5fae7803578e6baeaf38104572fbc30a89d410b2507c6644d1c80e2c4b342adfd9ecb64e9664dcf538d68acd0add3056c6c933dbd4379ad3382"),
+        new KnownBinaryDigest("e5b8d8b5ba714a335cac91297713b40e", "18f804f636b0d407b8635746424f71b8979f19939f497a76581f04f0b9251e30663235d74e9631fcfca61aa2142551ee4b8ae10e1aef93cf7d8d9e17ace34d"),
+        new KnownBinaryDigest("efc78f3593004050862070a900b1f0cb", "4527df0f1a9a69006d1d97f92ed76132ce16a42e440f16779e6559c1f8194f1858865dec4641d3b121e0a0fc579aa0a52b6c49953f1e4f35116770b540a80854cd7ea0a87a75eb8c42f30d"),
+        new KnownBinaryDigest("dd0faf606a4a99562a59f5eddf9109d1", "6e1a1f04c4b3958ccfbad9393727dbded01e7078d84c2ed9faf82bb680bd534c10ebc7f7486cf08c127c8413a5667052990dbb2382958b21eb460acb88df0b12668c284c60e496642ee3665bc81b349388d81d72012fc97b60a50b01622404337071ac"),
+        new KnownBinaryDigest("4e51172bc8aea5c5cabb4d14eb0a5357", "3e24f2b57757f59f2e2f59d0117743b0c1981137c3acebbad8940109df32eb566e1c5463e668fba93a2a4d304b3bf0ebe15471d75f7555913837dce255ebc0fc440262f522dfca599d67fc985fbb"),
+        new KnownBinaryDigest("6590509a2a5a94afe6d6f417232c4464", "9da416288ac013f7f8c7c32bae8b19534f6a50eb49d9fbc8018a173af778bc317cc83f3e3fc2353b310b692d5eb41bce8314ad2e0fd025c3a84d2700a9d9ff800a91ae"),
+        new KnownBinaryDigest("c3b8b6368323e3ba4d72186527bd308b", "4cdb148c3515ba3d70cd6a4d6e49b6e3cb8e22aca27b95f19b3492580ce923cd053581a8ff20f9f916e853dbe3da925f221bb47c6f0243d14522f10083613186aa9c4838c70de3aa952896ba27ba0ec0a13235f034"),
+        new KnownBinaryDigest("f6321f1c7a026655dd110a958b651712", "5d02f2b063dd2ff876b4b6cc3046925a9714380ae7466c88aa8b14305f502c4052043f454517aa067b9cb1e2035a89c72e479a20b82abf16966905d8c8fe982688757a2c074c14806a31"),
+        new KnownBinaryDigest("ec4f3d19e1ed7f0fbf973b2f52c38828", "4a958a854f014c0117b60b88274528aedc11d13d7c048b598ddf5dc0e1331ab6869b74810ce4b6d77cfc80707ced52e7df9e386e98f412460930f770a38c20e49b54028cd0a6a2f75bfac1"),
+        new KnownBinaryDigest("0932e93d6d46614616890e7488297535", "831bdca08d76e043fbac1d91882d78dbec4633efdc9cd428ebc51638fb40129d3392c3ee5357e22dabdce9ef367003a22dc60a15c7d2a3e646b4b5c75fa848ba99805ef56a8a889563054300b3e5f17ac2740a3435fcd560efdca79ea21bce"),
+        new KnownBinaryDigest("cde8caa572037238bc679984e47992a8", "942e55b6110d38a33d75b2c28ea33361c33a05ea9d13849daafd068de2eaf247373f6c84903a69b43c67f6c04a13d14ca946db6816e36680a9b80c1307aac053826a8b4f36aed188d051ae351c"),
+        new KnownBinaryDigest("59d402089b2cce628d9472afa258bce4", "53962cb9e49c0e8a3153d8ebdad82e56ac91a6a33edf888215fa755297c5353063e56476e74dc62444f73937774bd3f95a7aa41c8f798673"),
+        new KnownBinaryDigest("de4927482c6025bc9924f98779e0e766", "a9a3e927bcf36b1da787f573b86e5ecb815e46a5510bca267cf81c2018a1ea5ff1683daadcfd8803cd19cfc3de85a10c46510d1b3fcdbc9ed9c3abc3d74b05069d96814f31b4ee"),
+        new KnownBinaryDigest("e11d15ca495150953358d9a5581d2ee4", "d542d8373b0648f65710dac693ce1f23ac9ed01952c52c8214c925470351da91638946fcf58562d27ab46cc7713e72cf765ea392e3d4320f"),
+        new KnownBinaryDigest("cca1c646dd4f5b01bbf8ec6beae60767", "562272e100f2053548630a88232d273bfd9e9d596511d65656d1a5ae48ad8e5636e69f62f0f17ac2679128da684653307c56e53595b6b1444c1c8a2f4c56ec9ad5b3513d"),
+        new KnownBinaryDigest("923fe6402e076748bc2de6e8a031d75b", "c44b0c24daf2d3e8fbed107d7431f1c858c17f345a16d3664a7510a58d05b4f416a3b70ad911bac4dd5c502e7ab1d825fad27cf2d10833ae77a5d964e12e5af6391b67d17a"),
+        new KnownBinaryDigest("1b5dbdb642bfda82e4388b93e9ddfcbe", "ee4706bb57fec5a5ec999debaabb88c2230e6f0992333756e2af015af45f4a06aa13e335ec16b134e8d2b940c7f6839f6e77f859617054bb10b0d8a7fd6bb08c4f964096d752d50c5d"),
+        new KnownBinaryDigest("7c9c416a29c3928dd66e94868f7ef6d3", "21c07af68eeb2b62eb7d67f0a53abf28253c3d09377c222cf131b6edc71ba1ebfc264e94411921ed7b9a7f32255ef005d7af2d99ce5303a49e4d055d343e9ad0dc"),
+    };
+
+    /// <summary>
+    /// These digests are from RFC 1320.
+    /// </summary>
+    static readonly KnownStringDigest[] _knownStringDigests =
+    {
+        new KnownStringDigest("31d6cfe0d16ae931b73c59d7e0c089c0", ""),
+        new KnownStringDigest("bde52cb31de33e46245e05fbdbd6fb24", "a"),
+        new KnownStringDigest("a448017aaf21d8525fc10ae87aa6729d", "abc"),
+        new KnownStringDigest("d9130a8164549fe818874806e1c7014b", "message digest"),
+        new KnownStringDigest("d79e1c308aa5bbcdeea8ed63df412da9", "abcdefghijklmnopqrstuvwxyz"),
+        new KnownStringDigest("043f8582f241db351ce627e153e7f0e4", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"),
+        new KnownStringDigest("e33b4ddc9c38f2199c3e7b164fcc0536", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"),
+    };
+
+    #endregion
+
+    public static void VerifyKnownDigests()
+    {
+        foreach (KnownBinaryDigest known in _knownBinaryDigests)
+        {
+            byte[]! message = Util.HexStringToByteArray(known.HexMessage);
+            byte[]! knownDigest = Util.HexStringToByteArray(known.Digest);
+            byte[]! computedDigest = (!)MD4Context.GetDigest(message).ToArray();
+
+            if (Util.CompareArraySpans(knownDigest, 0, computedDigest, 0, MD4Context.DigestLength) != 0)
+            {
+                Console.WriteLine("*** DIGESTS DIFFER! ***");
+                Console.WriteLine("Known digest: " + knownDigest);
+                Console.WriteLine("Computed digest: " + computedDigest);
+                Console.WriteLine("MD4 BVT FAILED.");
+                return;
+            }
+        }
+
+        foreach (KnownStringDigest known in _knownStringDigests)
+        {
+            byte[]! message = Encoding.ASCII.GetBytes(known.TextMessage);
+            byte[]! knownDigest = Util.HexStringToByteArray(known.Digest);
+            byte[]! computedDigest = (!)MD4Context.GetDigest(message).ToArray();
+
+            if (Util.CompareArraySpans(knownDigest, 0, computedDigest, 0, MD4Context.DigestLength) != 0)
+            {
+                Console.WriteLine("*** DIGESTS DIFFER! ***");
+                Console.WriteLine("Message:           " + known.TextMessage);
+                Console.WriteLine("Known digest:      " + knownDigest);
+                Console.WriteLine("Computed digest:   " + computedDigest);
+                Console.WriteLine("MD4 BVT FAILED.");
+                return;
+            }
+        }
+
+        Console.WriteLine("PASSED: MD4 BVT");
+        Console.WriteLine("Verified {0} known string digests.", _knownStringDigests.Length);
+        Console.WriteLine("Verified {0} known binary digests.", _knownBinaryDigests.Length);
+    }
+}
diff --git a/base/Applications/Security/CryptoBvt/Util.cs b/base/Applications/Security/CryptoBvt/Util.cs
new file mode 100644
index 0000000..6ee0854
--- /dev/null
+++ b/base/Applications/Security/CryptoBvt/Util.cs
@@ -0,0 +1,134 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Util.cs
+//
+//
+
+using System;
+using System.Text;
+
+class Util
+{
+    public const string HexDigits = "0123456789abcdef";
+
+    public static string! ByteArrayToStringHex(byte[]! buffer, int index, int length)
+    {
+        StringBuilder sb = new StringBuilder(length * 2);
+        for (int i = 0; i < length; i++)
+        {
+            byte b = buffer[index + i];
+            sb.Append(HexDigits[b >> 4]);
+            sb.Append(HexDigits[b & 0xf]);
+        }
+        return sb.ToString();
+    }
+
+    public static string! ByteArrayToStringHex(byte[]! buffer)
+    {
+        return ByteArrayToStringHex(buffer, 0, buffer.Length);
+    }
+
+    static byte CharToHex(char c)
+    {
+        if (c >= '0' && c <= '9')
+            return (byte)(c - '0');
+        if (c >= 'a' && c <= 'f')
+            return (byte)(c - 'a' + 10);
+        if (c >= 'A' && c <= 'F')
+            return (byte)(c - 'A' + 10);
+        throw new ArgumentException("Invalid hex char");
+    }
+
+    public static byte[]! HexStringToByteArray(string! str)
+    {
+        if ((str.Length % 2) != 0)
+            throw new Exception("Input string cannot be odd in length.");
+
+        byte[] result = new byte[str.Length / 2];
+        for (int i = 0; i < result.Length; i++)
+        {
+            byte high = CharToHex(str[i * 2]);
+            byte low = CharToHex(str[i * 2 + 1]);
+            result[i] = (byte)((high << 4) | low);
+        }
+
+        return result;
+    }
+
+    public static int CompareArraySpans(byte[]! array1, int offset1, byte[]! array2, int offset2, int length)
+    {
+        for (int i = 0; i < length; i++)
+        {
+            byte element1 = array1[i];
+            byte element2 = array2[i];
+            if (element1 < element2)
+                return -1;
+            if (element1 > element2)
+                return 1;
+        }
+
+        return 0;
+    }
+
+
+        public static void DumpBuffer(byte[]! buffer)
+        {
+            DumpBuffer(buffer, 0, buffer.Length);
+        }
+
+        public static void DumpBuffer(byte[]! buffer, int index, int length)
+        {
+            StringBuilder line = new StringBuilder();
+
+            for (int i = 0; i < length; i += 0x10)
+            {
+                line.Length = 0;
+                line.AppendFormat("{0:x04}: ", i);
+
+                for (int j = 0; j < 0x10; j++)
+                {
+
+                    if (i + j < length)
+                    {
+                        line.Append(" ");
+                        byte b = buffer[index + i + j];
+                        line.Append((Char)HexDigits[b >> 4]);
+                        line.Append((Char)HexDigits[b & 0xf]);
+                    }
+                    else
+                    {
+                        line.Append("   ");
+                    }
+                }
+
+                line.Append(" : ");
+                for (int j = 0; j < 0x10; j++)
+                {
+
+                    if (i + j < length)
+                    {
+                        byte b = buffer[index + i + j];
+                        if (b >= 32 && b <= 127)
+                        {
+                            line.Append((Char)b);
+                        }
+                        else
+                        {
+                            line.Append(".");
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                Console.WriteLine(line.ToString());
+            }
+        }
+
+}
diff --git a/base/Applications/Security/bvt/PerfSnap.sg b/base/Applications/Security/bvt/PerfSnap.sg
new file mode 100644
index 0000000..b1c3871
--- /dev/null
+++ b/base/Applications/Security/bvt/PerfSnap.sg
@@ -0,0 +1,286 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PerfSnap.sg
+//
+//  Note:   Performance measurer for Singularity Benchmark
+//
+
+using System;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Applications
+{
+    public struct PerfSnap
+    {
+        // Global options for all instances
+        static bool xmlOutput = false;
+        static bool atRing3   = false;
+
+        private bool disabled;
+        private long begCycleCount;
+        private long endCycleCount;
+        private long begSwitchCount;
+        private long endSwitchCount;
+        private long begInterruptCount;
+        private long endInterruptCount;
+        private long begKernelGcCount;
+        private long endKernelGcCount;
+        private long begProcessGcCount;
+        private long endProcessGcCount;
+        private long iterations;
+        private ulong begAllocatedCount;
+        private ulong begAllocatedBytes;
+        private ulong begFreedCount;
+        private ulong begFreedBytes;
+        private ulong endAllocatedCount;
+        private ulong endAllocatedBytes;
+        private ulong endFreedCount;
+        private ulong endFreedBytes;
+        private ulong begStackGets;
+        private ulong begStackRets;
+        private ulong endStackGets;
+        private ulong endStackRets;
+
+
+        public long Cycles      { get { return endCycleCount - begCycleCount; } }
+        public long Interrupts  { get { return endInterruptCount - begInterruptCount; } }
+        public long Switches    { get { return endSwitchCount - begSwitchCount; } }
+        public long KernelGCs   { get { return endKernelGcCount - begKernelGcCount; } }
+        public long ProcessGCs  { get { return endProcessGcCount - begProcessGcCount; } }
+        public ulong AllocatedCount { get { return endAllocatedCount-begAllocatedCount; } }
+        public ulong AllocatedBytes { get { return endAllocatedBytes-begAllocatedBytes; } }
+        public ulong FreedCount { get { return endFreedCount - begFreedCount; } }
+        public ulong FreedBytes { get { return endFreedBytes - begFreedBytes; } }
+        public ulong StackGets { get { return endStackGets - begStackGets; } }
+        public ulong StackRets { get { return endStackRets - begStackRets; } }
+
+        public void Start()
+        {
+            if (!atRing3) {
+                disabled = Processor.DisableInterrupts();
+            }
+
+            int collectorCount;
+            long collectorMillis;
+            long collectorBytes;
+            GC.PerformanceCounters(out collectorCount,
+                                   out collectorMillis,
+                                   out collectorBytes);
+
+            ulong stackGets;
+            ulong stackRets;
+            StackService.GetUsageStatistics(out stackGets,
+                                            out stackRets);
+            begStackGets = stackGets;
+            begStackRets = stackRets;
+
+            ulong allocatedCount;
+            ulong allocatedBytes;
+            ulong freedCount;
+            ulong freedBytes;
+            PageTableService.GetUsageStatistics(out allocatedCount,
+                                                out allocatedBytes,
+                                                out freedCount,
+                                                out freedBytes);
+            begAllocatedCount = allocatedCount;
+            begAllocatedBytes = allocatedBytes;
+            begFreedCount = freedCount;
+            begFreedBytes = freedBytes;
+
+            begInterruptCount = ProcessService.GetKernelInterruptCount();
+            begSwitchCount = ProcessService.GetContextSwitchCount();
+            begKernelGcCount = ProcessService.GetKernelGcCount();
+            begProcessGcCount = collectorCount;
+
+#if x64_PERF
+            // Set up for perf counting
+            if (!atRing3) {
+                // Reset the performance counters to what we're interested in.
+                Reset(0, PerfEvtSel.COUNT | PerfEvtSel.CyclesNotHalted);
+                Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+                Reset(2, PerfEvtSel.COUNT | PerfEvtSel.RetiredBranchInstructions);
+                Reset(3, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+            } else {
+                // We're not allowed to reset the perf counters, so take note
+                // of their current values; we will subtract from this later.
+                x64_i0 = Processor.ReadPmc(0);
+                x64_i1 = Processor.ReadPmc(1);
+                x64_i2 = Processor.ReadPmc(2);
+                x64_i3 = Processor.ReadPmc(3);
+            }
+#endif
+
+            begCycleCount = unchecked((long)Processor.CycleCount);
+        }
+
+        public void Finish(long iterations)
+        {
+            endCycleCount = unchecked((long)Processor.CycleCount);
+
+#if X64_PERF
+            x64_p0 = Processor.ReadPmc(0);
+            x64_p1 = Processor.ReadPmc(1);
+            x64_p2 = Processor.ReadPmc(2);
+            x64_p3 = Processor.ReadPmc(3);
+#endif
+
+            endInterruptCount = ProcessService.GetKernelInterruptCount();
+            endSwitchCount = ProcessService.GetContextSwitchCount();
+            endKernelGcCount = ProcessService.GetKernelGcCount();
+
+            int collectorCount;
+            long collectorMillis;
+            long collectorBytes;
+            GC.PerformanceCounters(out collectorCount,
+                                   out collectorMillis,
+                                   out collectorBytes);
+            endProcessGcCount = collectorCount;
+
+            ulong allocatedCount;
+            ulong allocatedBytes;
+            ulong freedCount;
+            ulong freedBytes;
+            PageTableService.GetUsageStatistics(out allocatedCount,
+                                                out allocatedBytes,
+                                                out freedCount,
+                                                out freedBytes);
+            endAllocatedCount = allocatedCount;
+            endAllocatedBytes = allocatedBytes;
+            endFreedCount = freedCount;
+            endFreedBytes = freedBytes;
+
+            ulong stackGets;
+            ulong stackRets;
+            StackService.GetUsageStatistics(out stackGets,
+                                            out stackRets);
+            endStackGets = stackGets;
+            endStackRets = stackRets;
+
+            if (!atRing3) {
+                Processor.RestoreInterrupts(disabled);
+            }
+
+            this.iterations = iterations;
+        }
+
+        public void Display(string name)
+        {
+            if (xmlOutput) {
+                DisplayXml(name);
+            } else {
+                DisplayText(name);
+            }
+        }
+
+        private static void WriteXmlValue(string name, long value)
+        {
+            DualWriteLine(
+                String.Format(" <Measurement> <name> {0} </name> <value> {1:d} </value> </Measurement>", name, value)
+                );
+        }
+
+        private static void WriteXmlValue(string name, ulong value)
+        {
+            DualWriteLine(
+                String.Format(" <Measurement> <name> {0} </name> <value> {1:d} </value> </Measurement>", name, value)
+                );
+        }
+
+        private void DisplayXml(string name)
+        {
+            DualWriteLine(
+                String.Format("<Microbenchmark Name=\"{0}\">", name)
+                );
+            WriteXmlValue("CyclesPerIteration", Cycles / iterations);
+            WriteXmlValue("Cycles", Cycles);
+            WriteXmlValue("Iterations", iterations);
+            WriteXmlValue("Switches", Switches);
+            WriteXmlValue("Interrupts", Interrupts);
+            WriteXmlValue("KernelGCs", KernelGCs);
+            WriteXmlValue("ProcessGCs", ProcessGCs);
+            WriteXmlValue("AllocationCount", AllocatedCount);
+            WriteXmlValue("AllocationBytes", AllocatedBytes);
+            WriteXmlValue("FreedCount", FreedCount);
+            WriteXmlValue("FreedBytes", FreedBytes);
+            WriteXmlValue("StackGetCount", StackGets);
+            WriteXmlValue("StackReturnCount", StackRets);
+            DualWriteLine("</Microbenchmark>");
+        }
+
+        private void DisplayText(string name)
+        {
+            DualWriteLine(
+                String.Format("{0,-16} {1,6:d} x{2,8:d} ={3,12:d} " +
+                              "[swi={4,6:d} int={5,3:d} gc={6:d}/{7:d}]",
+                              name,
+                              iterations,
+                              Cycles / iterations,
+                              Cycles,
+                              Switches,
+                              Interrupts,
+                              KernelGCs,
+                              ProcessGCs)
+                );
+
+            if (AllocatedCount > 1 || FreedCount > 1 || StackGets > 1) {
+                DualWriteLine(
+                    string.Format(
+                        "                       " +
+                        "[alloc={0,4:d}/{1,8:x} free={2,4:d}/{3,8:x} " +
+                        "stack={4,4:d}/{5,4:d}]",
+                        AllocatedCount,
+                        AllocatedBytes,
+                        FreedCount,
+                        FreedBytes,
+                        StackGets,
+                        StackRets)
+                    );
+            }
+
+#if x64_PERF
+            if (!atRing3) {
+                // Read off the current MSR values and turn them
+                // into nice labels
+                ulong e0 = Processor.ReadMsr(0xc0010000);
+                ulong e1 = Processor.ReadMsr(0xc0010001);
+                ulong e2 = Processor.ReadMsr(0xc0010002);
+                ulong e3 = Processor.ReadMsr(0xc0010003);
+
+                DualWriteLine(
+                    String.Format("evt: {0,16} {1,16} {2,16} {3,16}",
+                                  EvtSelToString(e0),
+                                  EvtSelToString(e1),
+                                  EvtSelToString(e2),
+                                  EvtSelToString(e3)));
+            } else {
+                // Subtract from the initial perf-counter values to
+                // get the delta we want
+                x64_p0 -= x64_i0;
+                x64_p1 -= x64_i1;
+                x64_p2 -= x64_i2;
+                x64_p3 -= x64_i3;
+            }
+
+            DualWriteLine(
+                String.Format("pmc: {0:d16} {1:d16} {2:d16} {3:d16} {4:d16}\n\n",
+                              Cycles, x64_p0, x64_p1, x64_p2, x64_p3));
+#endif
+        }
+
+        private static void DualWriteLine(string message)
+        {
+            Console.WriteLine(message);
+            DebugStub.WriteLine(message);
+        }
+
+        public static void SetOptions(bool ring3, bool doXmlOutput)
+        {
+            PerfSnap.atRing3   = ring3;
+            PerfSnap.xmlOutput = doXmlOutput;
+        }
+    }
+}
diff --git a/base/Applications/Security/bvt/SecBVT.sg b/base/Applications/Security/bvt/SecBVT.sg
new file mode 100644
index 0000000..0c47f27
--- /dev/null
+++ b/base/Applications/Security/bvt/SecBVT.sg
@@ -0,0 +1,284 @@
+//////////////////////////////////////////////////////////////////////$
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SecBVT.cs
+//
+//  Note:   Singularity access control micro-benchmark program.
+//
+
+using System;
+using System.Collections;
+using System.Text;
+using Microsoft.Contracts;
+
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.AccessControl;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Configuration;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$test-privilege.localhost")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<KeyboardDeviceContract.Imp:Start> ImpRef;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SecBVT.AppMain(this);
+        }
+    }
+
+
+    /*
+     * This is a simple program to test access control functionality.using Microsoft.Singularity.Security;
+
+     *
+     * It tests:
+     *   a)   Run the test under a role to ensure that roles work.
+     *   b)   Endpoint functionality
+     *          b1)  Obtaining the principal ids of channel endpoints.
+     *          b2)  Obtaining the principal names of channel endpoints
+     *   c)   That the acl cache implementation still works.
+     *   d)   Basic ACL/SecurityService functionality.a-zA-Z1-90_
+     */
+
+    public class SecBVT
+    {
+
+        AclCore! aclCore;
+        AclConverter! converter;
+        Parameters! config;
+
+        SecBVT (Parameters! _config) {
+            config = _config;
+            AclCore _aclCore = new AclCore(null, new MyAclCoreSupport());
+            aclCore = _aclCore;
+            converter = _aclCore.Converter;
+        }
+
+        private static void DualWriteLine(string message)
+        {
+            Console.WriteLine(message);
+            DebugStub.WriteLine(message);
+        }
+
+        private static void DualWrite(string message)
+        {
+            Console.Write(message);
+            DebugStub.Print(message);
+        }
+
+        private static void DualWrite1(string format, string! s1)
+        {
+            Console.Write(format, s1);
+            DebugStub.Print(format, __arglist(s1));
+        }
+
+        private static void DualWrite2(string format, string! s1, string! s2)
+        {
+            Console.Write(format, s1, s2);
+            DebugStub.Print(format, __arglist(s1,s2));
+        }
+
+        private static void DualWrite3(string format, string! s1, string! s2, string! s3)
+        {
+            Console.Write(format, s1, s2, s3);
+            DebugStub.Print(format, __arglist(s1,s2,s3));
+        }
+
+        private static void DualWrite4(string format, string! s1, string! s2, string! s3, string! s4)
+        {
+            Console.Write(format, s1, s2, s3, s4);
+            DebugStub.Print(format, __arglist(s1,s2,s3,s4));
+        }
+
+        internal static int AppMain(Parameters! _config)
+        {
+            SecBVT test = new SecBVT(_config);
+            test.EndpointTest();
+            test.SimpleAclTest();
+            test.FullAclTest();
+            test.CachePerfTest();
+            return 0;
+        }
+
+        private void EndpointTest()
+        {
+            DualWriteLine("[Running endpoint test]");
+
+            KeyboardDeviceContract.Imp! chan = config.ImpRef.Acquire();
+            Principal p = AclCore.EndpointPeer(chan);
+            config.ImpRef.Release(chan);
+
+            Principal self = Principal.Self();
+            DualWrite2("Our ep: id={0}, name={1}\n", (!)(self.Val.ToString()), self.GetName());
+            DualWrite2("Peer ep: id={0}, name={1}\n", (!)(p.Val.ToString()), p.GetName());
+        }
+
+        public class MyAclCoreSupport: IAclCoreSupport
+        {
+            Hashtable expnTable;
+
+            [NotDelayed]
+            public MyAclCoreSupport() {
+                expnTable = new Hashtable();
+                base();
+                expnTable["/test-exp-1"] = "{$any}+(test1|test2|test3|test4|SecBVT.!)";
+                expnTable["/test-exp-2a"] = "test5|test6|test7|test8";
+                expnTable["/test-exp-2b"] = "test9|test10|test11|test12";
+                expnTable["/test-exp-2c"] = "test13|test14|test15|test16|(SecBVT.!)";
+                expnTable["/test-exp-2"] = "{$any}+({/test-exp-2c})";
+                expnTable["/test-exp-3"] = "{$any}+({/test-exp-2a}|{/test-exp-2b}|{/test-exp-2c})";
+            }
+
+            public string Expand(string! path)
+            {
+                return (string) expnTable[path];
+            }
+        }
+
+        private void SimpleAclTest()
+        {
+            DualWriteLine("[Running endpoint test]");
+
+            KeyboardDeviceContract.Imp! chan = config.ImpRef.Acquire();
+            Principal p = AclCore.EndpointPeer(chan);
+            config.ImpRef.Release(chan);
+
+            string[] resources = new string[]{"{$any}",
+                                              "{$anyuser}"};
+            bool[] correct = new bool[]{true, false};
+
+            int i = 0;
+            foreach (string! resource in resources)
+            {
+
+                bool result = aclCore.CheckAccess(resource, null, p);
+
+                DualWrite4("Acl: {0}, Principal: {1}, Result: {2} ... {3}\n",
+                                    resource, p.GetName(), result.ToString(),
+                                    (result==correct[i])?"OK":"failed");
+                i++;
+            }
+        }
+
+        private void FullAclTest()
+        {
+            DualWriteLine("[Running full ACL test]");
+
+            Principal p = Principal.Self();
+            AccessMode mode = new AccessMode("write");
+            string[] resources = new string[]{"{$anyall}",
+                                              "{$anyuserall}",
+                                              "{$any}@(write|read)",
+                                              "{$any}@write",
+                                              "{$any}@read",
+                                              "{$any}+{$test-privilege}@!",
+                                              "{$any}+{$test-privilege}@read",
+                                              "{$any}+{$test-privilege}@write",
+                                              "!@!+!+{$test-privilege}@!",
+                                              "!@!(+!)*+{$test-privilege}@!",
+                                              "!@!(+!)*+!.microsoft.com@!",
+                                              "!@!(+!)*+!.adobe.com@!",
+                                              "{/test-exp-3}@!",
+                                              "{$dsanyrw}|{$dsregister}"
+            };
+
+            bool[] correct = new bool[]{true,   // {"{$anyall}",
+                                        false,  // "{$anyuserall}",
+                                        true,   // "{$any}@write|read",
+                                        true,   // "{$any}@write",
+                                        false,  // "{$any}@read",
+                                        true,   // "{$any}+{$test-privilege}@!",
+                                        false,  // "{$any}+{$test-privilege}@read",
+                                        true,   // "{$any}+{$test-privilege}@write",
+                                        true,   // "!+!+{$test-privilege}@!",
+                                        true,   // "!(+!)*+{$test-privilege}@!",
+                                        true,   // "!(+!)*+!.microsoft.com@!",
+                                        false,  // "!(+!)*+!.adobe.com@!"
+                                        true,   // "{/test-exp-3}@!"
+                                        true    // "{$dsanyrw}|{$dsregister}"
+            };
+
+            DualWrite(String.Format("Principal: {0}\n", p.GetName()));
+            DualWrite(String.Format("Mode: {0}\n", mode.Val));
+            int i = 0;
+            foreach (string! resource in resources)
+            {
+                bool result = aclCore.CheckAccessBody(resource, mode, p);
+                DualWrite3(
+                    "Acl: {0}, Result: {1} ... {2}\n",
+                    resource, result.ToString(), (result==correct[i++])?"OK":"failed");
+            }
+        }
+
+        private void CachePerfTest()
+        {
+            DualWriteLine("[Running cache performance test]");
+
+            Principal p = Principal.Self();
+            AccessMode mode = new AccessMode("write");
+            string[] resources = new string[]{"{$anyuserall}",
+                                              "{$any}+{$test-privilege}@write",
+                                              "!@!(+!)*+!.microsoft.com@!",
+                                              //{$any}+(foo|bar|baz|brot|waste|waste1|waste2|SecBVT.!)@write",
+                                              //"{/test-exp-1}@!",
+                                              //"{/test-exp-2}@!",
+                                              //"{/test-exp-3}@!",
+                                              //"{$any}+Failure.!@write",
+                                              "{$dsanyrw}",
+                                              "{$dsanyrw}|{$dsregister}"
+            };
+            foreach (string! resource in resources)
+            {
+                int nSubExprs = 0;
+                string! aclConv = converter.ConvertTest(resource, out nSubExprs);
+                DualWrite1("Acl: {0}\n", resource);
+                DualWrite3("TopLength: {0}, ConvLength: {1}, nSubExprs {2}\n",
+                           resource.Length.ToString(), aclConv.Length.ToString(), nSubExprs.ToString());
+
+                for (AclCore.CacheLevel level = AclCore.CacheLevel.All;
+                                       level <= AclCore.CacheLevel.None; level++) {
+
+                    aclCore.ClearStats();
+                    aclCore.SetCacheLevel(level);
+                    PerfSnap snap = new PerfSnap();
+                    // warm cache
+                    aclCore.CheckAccessBody(resource, mode, p);
+                    snap.Start();
+                    try {
+                        for (int i=0; i<1000; i++) {
+                            aclCore.CheckAccessBody(resource, mode, p);
+                        }
+                    }
+                    finally {
+                        snap.Finish(1000);
+                    }
+                    snap.Display(String.Format("CheckAccess({0})", level.ToString()));
+                }
+            }
+            aclCore.SetCacheLevel(AclCore.CacheLevel.All);
+        }
+    }
+}
diff --git a/base/Applications/Security/bvt/bvt.csproj b/base/Applications/Security/bvt/bvt.csproj
new file mode 100644
index 0000000..4522470
--- /dev/null
+++ b/base/Applications/Security/bvt/bvt.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>secbvt</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SecBVT.sg" />
+    <Compile Include="PerfSnap.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Security/cachetest/CacheTest.csproj b/base/Applications/Security/cachetest/CacheTest.csproj
new file mode 100644
index 0000000..c37329a
--- /dev/null
+++ b/base/Applications/Security/cachetest/CacheTest.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CacheTest</AssemblyName>
+    <KERNELDIR>..\..\..\Kernel</KERNELDIR>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CacheTest.sg" />
+    <Compile Include="$(KERNELDIR)\Singularity.Security\AccessControl\Cache.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Security/cachetest/CacheTest.sg b/base/Applications/Security/cachetest/CacheTest.sg
new file mode 100644
index 0000000..88db3d5
--- /dev/null
+++ b/base/Applications/Security/cachetest/CacheTest.sg
@@ -0,0 +1,108 @@
+//////////////////////////////////////////////////////////////////////$
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CacheTest.sg
+//
+//  Note:   Test function of Cache.sg module.
+// 
+  
+using System;
+using System.Text;
+using Microsoft.Singularity.Security.AccessControl;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return CacheTest.AppMain(this);
+        }
+    }
+
+
+    public class CacheTest
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            Cache cache = new Cache(10, (15*60), 25, "");
+
+            Console.WriteLine("Populating cache ...");
+            cache.AddEntry("removeMe", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("removeMe2", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("a", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("b", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("c", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("d", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("e", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("f" ,new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("g", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("h", new ICacheValue(cache, DateTime.MaxValue));
+
+            Console.Write(DumpCacheToString(cache));
+            Console.Write("Next add should remove \"removeMe*\" entries ...");
+            cache.AddEntry("i", new ICacheValue(cache, DateTime.MaxValue));
+
+            string[] keys = new string[]{"a", "b", "c", "d", "e", "f", "g", "h", "i"};
+            bool ok = true;
+            if (cache.GetEntry("RemoveMe") != null ||
+                             cache.GetEntry("RemoveMe1") != null)
+                ok = false;
+            else {
+                for (int i=0; i < keys.Length; i++) {
+                    if (cache.GetEntry((!)(keys[i])) == null)
+                        ok = false;
+                }
+            }
+            if (ok)
+                Console.WriteLine(" OK");
+            else
+                Console.WriteLine(" FAILED!");
+
+            Console.Write("Testing LRU, accessing: ");
+
+            Random r = new Random();
+
+            for (int i = 0; i < keys.Length; i++)
+            {
+                int n = r.Next() % keys.Length;
+                Console.Write(((i==0)? "" : ", ") + keys[n]);
+                cache.GetEntry((!)keys[n]);
+            }
+            Console.WriteLine();
+            Console.Write(DumpCacheToString(cache));
+
+            Console.WriteLine("Adding more, to provoke another pruning");
+            cache.AddEntry("y", new ICacheValue(cache, DateTime.MaxValue));
+            cache.AddEntry("z", new ICacheValue(cache, DateTime.MaxValue));
+            Console.Write(DumpCacheToString(cache));
+            return 0; 
+        }
+
+        private static string! DumpCacheToString(Cache! cache)
+        {
+            StringBuilder sb = new StringBuilder();
+            cache.DumpCache(sb);
+            return sb.ToString();
+        }
+    }
+}
diff --git a/base/Applications/Security/security.proj b/base/Applications/Security/security.proj
new file mode 100644
index 0000000..39754cf
--- /dev/null
+++ b/base/Applications/Security/security.proj
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup>
+    <ProjectReference Include="*/*.csproj"/>
+  </ItemGroup>
+
+  <Target Name="Build">
+    <MSBuild Projects="@(ProjectReference)"/>
+  </Target>
+
+</Project>
diff --git a/base/Applications/Security/stats/SecStats.sg b/base/Applications/Security/stats/SecStats.sg
new file mode 100644
index 0000000..5a5e0cf
--- /dev/null
+++ b/base/Applications/Security/stats/SecStats.sg
@@ -0,0 +1,79 @@
+//////////////////////////////////////////////////////////////////////$
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SecStats.sg
+//
+//  Note:   Singularity micro-benchmark program.
+//
+using System;
+using System.Collections;
+using System.Text;
+using System.Threading;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "c", Default=false, HelpMessage="Clean")]
+        internal bool doClear;
+
+        [BoolParameter( "d", Default=false, HelpMessage="Disable Kernel Stats")]
+        internal bool doDisable;
+
+        [BoolParameter( "e", Default=false, HelpMessage="Enable Kernel Stats")]
+        internal bool doEnable;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return StatisticsTool.AppMain(this);
+        }
+    }
+
+    public class StatisticsTool
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            SecurityDiagnostics sd = new SecurityDiagnostics();
+
+            string s = sd.GetStatistics();
+            Console.Write(s);
+
+            if (config.doClear) {
+                sd.ClearStatistics();
+                Console.Write("Statistics cleared.\n");
+            } else if (config.doDisable) {
+                sd.Disable(true);
+                Console.Write("Kernel ACL checks disabled.\n");
+            } else if (config.doEnable) {
+                sd.Disable(false);
+                Console.Write("Kernel ACL checks enabled.\n");
+            }
+            return 0;
+        }
+    }
+}
+
diff --git a/base/Applications/Security/stats/stats.csproj b/base/Applications/Security/stats/stats.csproj
new file mode 100644
index 0000000..66c74c0
--- /dev/null
+++ b/base/Applications/Security/stats/stats.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>secstats</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SecStats.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\SecurityDiagnostics.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Seditor/SEditor.cs b/base/Applications/Seditor/SEditor.cs
new file mode 100644
index 0000000..7efeeff
--- /dev/null
+++ b/base/Applications/Seditor/SEditor.cs
@@ -0,0 +1,1678 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using DirectoryService.Utils;
+using FileSystem.Utils;
+using System;
+using System.Collections;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.ParseNumbers;
+
+using Microsoft.Singularity;
+using System.IO;
+
+using System.GC;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Diagnostics;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+using DirectoryServices.Utils;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications 
+{
+    [ConsoleCategory(HelpMessage="Stream Editor", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter( "filename", Mandatory=true, Position=0, HelpMessage="Name of file.")]
+        internal string fileName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+             SEditor.AppMain(this);
+             return 0;
+        }
+    }
+    public class SEditor
+    {
+        internal static void AppMain(Parameters! config)
+        {
+            // constants
+            string EditorName = "SEditor";
+            int szLineCount = 0;
+            int nIndex = 0;
+
+            //FOR DEBUG
+            // Console.WriteLine("Number of cmd line params = {0}", args.Length);
+            
+            // FOR DEBUG
+            // Console.WriteLine("args[1] is {0}", args[1]);
+            string filename = config.fileName;
+
+            string szSrcLine;
+            ArrayList szContents = new ArrayList();
+
+            if (File.Exists(filename)) {
+                FileStream fsInput = new FileStream(filename, FileMode.Open, FileAccess.Read);
+                StreamReader srInput = new StreamReader(fsInput);
+                while ((szSrcLine = srInput.ReadLine()) != null) {
+                    szContents.Add(szSrcLine);
+                    // FOR DEBUG
+                    // Console.WriteLine("{0}", szSrcLine);
+                    // Console.ReadLine();
+                    // END DEBUG
+                }
+                srInput.Close();
+                fsInput.Close();
+
+                // Display number of lines loaded
+                szLineCount = szContents.Count;
+                Console.WriteLine("* Number of lines read from {0} was {1}", filename, szLineCount);
+
+                // FOR DEBUG ONLY: display contents of file
+                // for (nIndex = 0; nIndex < szContents.Count; nIndex++) {
+                // write line to console with numbering
+                //    Console.WriteLine("{0}: {1}", (nIndex + 1), szContents[nIndex]);
+                // }
+            }
+            else if (System.IO.Directory.Exists(filename)) { // check that it's not a directory
+                Console.WriteLine("Exiting: {0} is a directory.", filename);
+                Console.WriteLine("Syntax: {0} filename", EditorName);
+                return;
+            }
+            else { // not a directory, but file doesn't exist, so create it
+                Console.WriteLine("* Creating new file.");
+            }
+
+            // Command parser - this is the main program loop
+            Parser(szContents, nIndex, filename);
+        } // end Main
+
+
+        // Parse incoming commands
+        static void Parser(ArrayList szArray, int pIndex, string InputFileName)
+        {
+            //FOR DEBUG
+            // Console.WriteLine("* Parser called.");
+            // Console.WriteLine("* Current line index is {0}," pIndex);
+            Console.Write("* ");
+            string ParserInput;
+            string ParserInputFirstChar;
+            string BackupFileName = "";
+            int tempIndex = 0;
+            ArrayList tempArray = new ArrayList();
+            bool IsTextUpdated = false;
+            int tempSize = 0;
+
+            // build proper backup file name - look for extension if it exists, and replace it with (or add to) ".bak"
+            if (Path.HasExtension(InputFileName) && (Path.GetExtension(InputFileName) != ".bak")) { // has an extension other than .bak
+                BackupFileName = Path.ChangeExtension(InputFileName, ".bak");
+            }
+            else if (Path.HasExtension(InputFileName) && (Path.GetExtension(InputFileName) == ".bak")) { // .bak already in use, use something else
+                Console.WriteLine("{0} ends in .bak - using .ba2 for backup files...", InputFileName);
+                Console.Write("* ");
+                BackupFileName = Path.ChangeExtension(InputFileName, ".ba2");
+            }
+            else { // no extension, so add one
+                BackupFileName = InputFileName + ".bak";
+            }
+
+            while (((ParserInput = GetConsoleInput()) != "q") && (ParserInput != "Q") && (ParserInput != null)) {
+                if (ParserInput != "") {
+                    //FOR DEBUG
+                    //Console.WriteLine("* Input was {0}", ParserInput);
+                    //Console.Write("* ");
+
+                    // ParserInputFirstChar = Convert.ToString(ParserInput[0]);
+                    ParserInputFirstChar = ParserInput[0].ToString();
+                }
+                else {
+                    Console.Write("* ");
+                    continue;
+                }
+
+                // Simple switch based parsing of commands
+                switch (ParserInputFirstChar) {
+                    case "h":
+                    case "H":
+                    case "?":
+                        Console.WriteLine("* Commands available are:");
+                        Console.WriteLine("*   ?, (h | H) - prints this message");
+                        Console.WriteLine("*   [number] - start editing at line [number]");
+                        Console.WriteLine("*   (a | A) - append lines at end of file");
+                        Console.WriteLine("*   (c | C)[num1],[num2],[destnum] - copy lines from num1 to num2 to dest num");
+                        Console.WriteLine("*   (d | D); (d | D)[num]; (d | D)[num1],[num2] - delete current line, ");
+                        Console.WriteLine("*      line at num, lines from num1 to num2");
+                        Console.WriteLine("*   (e | E) - exit, saving changes");
+                        Console.WriteLine("*   (i | I); (i | I)[num] - insert line above current line, or above line num");
+                        Console.WriteLine("*   (l | L); (l | L)[num]; (l | L)[num1],[num2] - list the whole file, ");
+                        Console.WriteLine("*      list the line at num, list the lines from num1 to num2");
+                        Console.WriteLine("*   (m | M)[num1],[num2],[destnum] - move lines from num1 to num2 to dest num");
+                        Console.WriteLine("*   (n | N) - print current line number (location in file)");
+                        Console.WriteLine("*   (p | P) - same as l, only displays one page at a time.");
+                        Console.WriteLine("*   (q | Q) - quit, saving no changes since last write");
+                        Console.WriteLine("*   (r | R)[num1],([num2] | ?),[searchstr]^[replacestr] - replace");
+                        Console.WriteLine("*      searchstr with replacestr. If ? is used as second param, sub is prompted");
+                        Console.WriteLine("*   (s | S)[num1],([num2] | ?),[searchstr] - search for searchstr. ");
+                        Console.WriteLine("*      If ? is used as second param, occurrence is displayed with prompt");
+                        Console.WriteLine("*      until accepted with y, Y, or newline.");
+                        Console.WriteLine("*   (t | T)[num],[filename] - insert contents of filename above line num.");
+                        Console.WriteLine("*   (w | W) - write contents of memory to filename. Original contents will be");
+                        Console.WriteLine("*      backed up as for exit command.");
+                        break;
+                    case "a":
+                    case "A":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for AppendAtEOF()");
+
+                        tempSize = szArray.Count;
+
+                        tempArray = AppendAtEOF(szArray);
+
+                        if (tempArray.Count > tempSize) { // array has grown, so assume text modified
+                            IsTextUpdated = true;
+                        }
+
+                        szArray = tempArray;
+                        pIndex = tempArray.Count;       // move line pointer to the end of the file
+
+                        break;
+                    case "c":
+                    case "C":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for CopyLines()");
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text available to copy - new empty file");
+                        }
+                        else {
+                            tempArray = CopyLines(szArray, ParserInput, pIndex);
+
+                            if (szArray.Count != pIndex) { // assume the array has changed, ergo text modified
+                                IsTextUpdated = true;
+                            }
+
+                            szArray = tempArray;
+                        }
+
+                        break;
+                    case "d":
+                    case "D":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for DeleteLines()");
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text available to delete - new empty file");
+                        }
+                        else {
+                            tempArray = DeleteLines(szArray, ParserInput, pIndex);
+
+                            if (szArray.Count != pIndex) { // assume the array has changed, ergo text modified
+                                IsTextUpdated = true;
+                            }
+
+                            szArray = tempArray;
+
+                            tempIndex = szArray.Count;
+
+                            if (tempIndex < pIndex) { // deletion has reduced line count below pIndex - reset the pointer
+                                pIndex = tempIndex;
+                            }
+                        }
+
+                        break;
+                    case "e":
+                    case "E":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for Exit ...");
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text to save, exiting without write.");
+                            return;
+                        }
+                        else {
+                            Console.WriteLine("* Exiting....");
+                            EditorWrite(szArray, InputFileName, BackupFileName);
+                            return;
+                        }
+
+                        break;
+                    case "i":
+                    case "I":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for InsertAtLine()");
+
+                        // Insert is a special case. The line pointer for the file needs to move
+                        // to the point of insertion if an argument is given, so we will parse that
+                        // here and pass the results, since we need to get the updated array back.
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No lines to insert above - new empty file");
+                        }
+                        else {
+                            Regex shortr = new Regex(@"^[iI](?<1>\d+)", RegexOptions.Compiled);
+                            Match shortm;
+                            shortm = shortr.Match(ParserInput);
+                            Group shortg1 = shortm.Groups[1];
+
+                            if ((ParserInput == "i") || (ParserInput == "i")) {  //insert above current line pointer pIndex
+                                InsertAtLine(szArray, pIndex);
+                                IsTextUpdated = true;
+                            }
+                            else if (shortm.Success) { // we have one line number
+                                //FOR DEBUG
+                                //Console.WriteLine("Line number {0}", shortm.Groups[1]);
+
+                                // write out line
+                                Capture shortc1 = shortg1.Captures[0];
+
+                                // tempIndex = Convert.ToInt32(shortc1.Value);
+                                tempIndex = Int32.Parse(shortc1.Value);
+                                if (tempIndex >= 1 && tempIndex <= szArray.Count) { // check for line numbers in range of file
+                                    pIndex = tempIndex; // update pIndex
+                                    InsertAtLine(szArray, pIndex);
+                                    IsTextUpdated = true;
+                                }
+                                else {
+                                    Console.WriteLine("* Line number {0} out of range. File length is {1}", tempIndex, szArray.Count);
+                                }
+
+                            }
+                            else {
+                                Console.WriteLine("Invalid match");
+                            }
+                        }
+                        break;
+                    case "l":
+                    case "L":
+                        // FOR DEBUG
+                        //Console.WriteLine("* Input was for ListText()");
+
+                        tempIndex = ListText(szArray, ParserInput, pIndex);
+                        if (tempIndex != -1) { // update current line number if list command moved the pointer
+                            pIndex = tempIndex;
+                        }
+                        break;
+                    case "m":
+                    case "M":
+                        //FOR DEBUG
+                        //Console.WriteLine("* Input was for MoveLines()");
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text available to move - new empty file");
+                        }
+                        else {
+                            tempArray = MoveLines(szArray, ParserInput, pIndex);
+
+                            szArray = tempArray;
+
+                            IsTextUpdated = true;
+                        }
+                        break;
+                    case "n":
+                    case "N":
+                        //FOR DEBUG
+                        // Console.WriteLine("* Input was for PrintLineNumber()");
+
+                        Console.WriteLine("* {0}", pIndex);
+                        break;
+                    case "p":
+                    case "P":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for PageText()");
+
+                        tempIndex = PageText(szArray, ParserInput, pIndex);
+                        if (tempIndex != -1) { // update current line number if list command moved the pointer
+                            pIndex = tempIndex;
+                        }
+
+                        break;
+                    case "r":
+                    case "R":
+                        //FOR DEBUG
+                        // Console.WriteLine("* Input was for ReplaceText()");
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text available to replace");
+                        }
+                        else {
+                            tempArray = ReplaceText(szArray, ParserInput, pIndex);
+                            szArray = tempArray;
+                            IsTextUpdated = true;
+                        }
+                        break;
+                    case "s":
+                    case "S":
+                        //FOR DEBUG
+                        // Console.WriteLine("* Input was for SearchForText()");
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text available to search");
+                        }
+                        else {
+                            tempIndex = SearchForText(szArray, ParserInput, pIndex);
+                            if (tempIndex != -1) { // update current line number if list command moved the pointer
+                                pIndex = tempIndex;
+                            }
+                        }
+                        break;
+                    case "t":
+                    case "T":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for TransferText()");
+
+                        tempArray = TransferText(szArray, ParserInput);
+
+                        if (szArray.Count != pIndex) { // assume the array has changed, ergo text modified
+                            IsTextUpdated = true;
+                        }
+
+                        szArray = tempArray;
+
+                        break;
+                    case "w":
+                    case "W":
+                        // FOR DEBUG
+                        // Console.WriteLine("* Input was for WriteTextToFile()");
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No text to save.");
+                        }
+                        else {
+                            EditorWrite(szArray, InputFileName, BackupFileName);
+                            IsTextUpdated = false;
+                        }
+
+                        break;
+                    case "":
+                        break;
+                    default:
+                        int LineNumber = 0;
+
+                        if (szArray.Count == 0) {
+                            Console.WriteLine("* No lines to edit at - new empty file");
+                            break;
+                        }
+                        else {
+
+                            try {
+                                // LineNumber = Convert.ToInt32(ParserInput);
+                                LineNumber = Int32.Parse(ParserInput);
+                            }
+                            catch (System.ArgumentNullException) {
+                                Console.WriteLine("String is null.");
+                                break;
+                            }
+                            catch (System.FormatException) {
+                                Console.WriteLine("* Unrecognized command");
+                                break;
+                            }
+                            catch (System.OverflowException) {
+                                Console.WriteLine("* Overflow in string to int conversion.");
+                                break;
+                            }
+                        }
+
+                        //FOR DEBUG
+                        // Console.WriteLine("* Input was for EditAtLine() - line {0}", LineNumber);
+
+                        // update line pointer to LineNumber
+                        pIndex = LineNumber;
+
+                        tempArray = EditAtLine(szArray, pIndex);
+
+                        szArray = tempArray;
+
+                        IsTextUpdated = true;
+
+                        break;
+                }
+                Console.Write("* ");
+            }
+            if (IsTextUpdated == true) { // ask them if they really wanted to quit without writing text out
+                Console.WriteLine("* WARNING: modified text not saved.");
+                Console.Write("* Save? (Y/N) ");
+
+                string SaveReply = GetConsoleInput();
+                // string SaveReplyFirstChar = Convert.ToString(SaveReply[0]);
+                if (SaveReply != "") {
+                    string SaveReplyFirstChar = SaveReply[0].ToString();
+                    switch (SaveReplyFirstChar) {
+                        case "y":
+                        case "Y":
+                            Console.WriteLine("* Exiting....");
+                            EditorWrite(szArray, InputFileName, BackupFileName);
+                            break;
+                        default:
+                            Console.WriteLine("* Exiting without save.");
+                            break;
+                    }
+                }
+                else {
+                    Console.WriteLine("* Exiting without save.");
+                }
+            }
+
+        } // end of Parser
+
+
+        // ListText - returns updated list pointer as int
+        static int ListText(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Regex fullr = new Regex(@"^[lL](?<1>\d+),(?<2>\d+)", RegexOptions.Compiled);
+            Regex shortr = new Regex(@"^[lL](?<1>\d+)", RegexOptions.Compiled);
+            Match fullm;
+            Match shortm;
+            int listSuccess = 0;
+            int PAGEWIDTH = 72;  // allow for line numbers in printouts - up to 99,999.
+                                 // TODO: adjust line number range dynamically for large files
+            int tempwidth = 0;
+            string workstring = "";
+            string tempstring = "";
+            int remainder = 0;
+            int division = 0;
+            int linesinline = 0;
+            int leftinstring = 0;
+            int lowLine = 0;
+            int hiLine = 0;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            fullm = fullr.Match(ParserInput);
+            shortm = shortr.Match(ParserInput);
+            Group fullg1 = fullm.Groups[1];
+            Group fullg2 = fullm.Groups[2];
+            Group shortg1 = shortm.Groups[1];
+
+            if (fullm.Success)  { // we think we have two line numbers, set lowLine and hiLine accordingly
+
+                //FOR DEBUG
+                //Console.WriteLine("First line number {0}, last line number {1}", fullm.Groups[1], fullm.Groups[2]);
+
+                Capture fullc1 = fullg1.Captures[0];
+                Capture fullc2 = fullg2.Captures[0];
+
+                // int lowLine = Convert.ToInt32(fullc1.Value);
+                lowLine = Int32.Parse(fullc1.Value) - 1; // offset by one to allow for difference in starting point...
+
+                // int hiLine = Convert.ToInt32(fullc2.Value);
+                hiLine = Int32.Parse(fullc2.Value);     // but leave this one alone, due to the loop
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 0 && lowLine <= szArray.Count) && (hiLine >= 0 && hiLine <= szArray.Count)) {
+                // continue on to listing...
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to list, or line out of range.");
+                    Console.WriteLine("*   lnum1,num2 where num1 <= num2 and num2 <= length of file.");
+                    Console.WriteLine("*   File length is {0}.", szArray.Count);
+                    listSuccess = -1;
+                    return listSuccess;
+                }
+            }
+            else if (shortm.Success) { // we have one line number
+                //FOR DEBUG
+                //Console.WriteLine("Line number {0}", shortm.Groups[1]);
+
+                // write out line
+                Capture shortc1 = shortg1.Captures[0];
+
+                // nIndex = Convert.ToInt32(shortc1.Value);
+                nIndex = Int32.Parse(shortc1.Value);
+
+                if (nIndex >= 1 && nIndex <= szArray.Count) { // check for line numbers in range of file
+                    lowLine = nIndex - 1;
+                    hiLine = nIndex;
+                    // proceed to listing
+                }
+                else {
+                    Console.WriteLine("* Line number {0} out of range. File length is {1}", nIndex, szArray.Count);
+                    listSuccess = -1;
+                    return listSuccess;
+                }
+            }
+            else if ((ParserInput == "l") || (ParserInput == "L")) {  // set lowLine = 0, hiLine = szArray.Count
+                lowLine = 0;
+                hiLine = szArray.Count;
+            }
+            else {
+                Console.WriteLine("Invalid match");
+                listSuccess = -1;
+                return listSuccess;
+            }
+
+            // print out buffer contents between lowLine and hiLine
+            for (nIndex = lowLine; nIndex < hiLine; nIndex++)
+            {
+                workstring = szArray[nIndex].ToString();
+                tempwidth = workstring.Length;
+                if (tempwidth > PAGEWIDTH)
+                {
+                    //FOR DEBUG
+                    //Console.WriteLine(" need to break up line length");
+                    while (division != 1)
+                    {
+                        linesinline++;
+                        division = tempwidth / PAGEWIDTH;
+                        remainder = tempwidth % PAGEWIDTH;
+                        tempwidth = tempwidth - PAGEWIDTH;
+                        //FOR DEBUG
+                        //Console.WriteLine("remainder = {0}, division = {1}, tempwidth = {2}, linesinline = {3}", remainder, division, tempwidth, linesinline);
+                        //Console.ReadLine();
+                    }
+                    if (remainder != 0)
+                    {
+                        linesinline++;
+                        //FOR DEBUG
+                        //Console.WriteLine("remainder = {0}, division = {1}, tempwidth = {2}, linesinline = {3}", remainder, division, tempwidth, linesinline);
+                        //Console.ReadLine();
+                    }
+                    leftinstring = workstring.Length;
+                    while (linesinline > 0)
+                    {
+                        if (leftinstring >= PAGEWIDTH)
+                        {
+                            tempstring = workstring.Substring(workstring.Length - leftinstring, PAGEWIDTH);
+                        }
+                        else
+                        {
+                            tempstring = workstring.Substring(workstring.Length - leftinstring, remainder);
+                        }
+                        Console.WriteLine("{0,5}: {1}", (nIndex + 1), tempstring);
+                        linesinline--;
+                        if (leftinstring > PAGEWIDTH)
+                        {
+                            leftinstring = leftinstring - PAGEWIDTH;
+                        }
+                    }
+
+                    // rezero worker constants
+                    remainder = 0;
+                    division = 0;
+                    linesinline = 0;
+                    leftinstring = 0;
+                    listSuccess = 1;
+                }
+                else
+                {
+                    Console.WriteLine("{0,5}: {1}", (nIndex + 1), szArray[nIndex]);
+                }
+
+                listSuccess = 1;
+            }
+
+            if (listSuccess == 1) {
+               return nIndex; // paging worked
+            }
+            else {            // note: you should never get here 
+               return -1;     // bad arguments, don't move line pointer
+            }
+        } // end of ListText
+
+        // CopyLines() - returns updated ArrayList with copies done, or the original ArrayList
+        static ArrayList CopyLines(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Queue copyQueue = new Queue();
+            Regex copyr = new Regex(@"^[cC](?<1>\d+),(?<2>\d+),(?<3>\d+)", RegexOptions.Compiled);
+            Match copym;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            copym = copyr.Match(ParserInput);
+            Group copyg1 = copym.Groups[1];
+            Group copyg2 = copym.Groups[2];
+            Group copyg3 = copym.Groups[3];
+
+            if (copym.Success) { // we think we have two line numbers and a dest number
+                //FOR DEBUG
+                //Console.WriteLine("First line number {0}, last line number {1}, dest {2}", copym.Groups[1], copym.Groups[2], copym.Groups[3]);
+
+                //Put array elements to be copied into copyQueue
+                Capture copyc1 = copyg1.Captures[0]; // first line of copy
+                Capture copyc2 = copyg2.Captures[0]; // last line of copy
+
+                // int lowLine = Convert.ToInt32(copyc1.Value);
+                int lowLine = Int32.Parse(copyc1.Value);
+
+                // int hiLine = Convert.ToInt32(copyc2.Value);
+                int hiLine = Int32.Parse(copyc2.Value);
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 1 && lowLine <= szArray.Count) && (hiLine >= 1 && hiLine <= szArray.Count)) {
+                    for (nIndex = lowLine; nIndex <= hiLine; nIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+
+                        copyQueue.Enqueue(szArray[nIndex - 1]);
+                    }
+
+                    // check dest num valid
+                    Capture copyc3 = copyg3.Captures[0];
+
+                    // int destLine = Convert.ToInt32(copyc3.Value);
+                    int destLine = Int32.Parse(copyc3.Value);
+
+                    if (destLine >= 1 && destLine <= szArray.Count) {
+                        // insert copyQueue at point dest in szArray
+                        // note that due to the indexing offset you need to decrement destLine by 1 here
+                        szArray.InsertRange(destLine - 1, copyQueue);
+                    }
+                    else if (destLine > szArray.Count) { // ask them if they want the copy at the end of the file
+                        Console.Write("* Copy past end of file - do you want block appended? (y/n) ");
+                        string appendReply = GetConsoleInput();
+                        // string appendReplyFirstChar = Convert.ToString(appendReply[0]);
+                        if (appendReply != "") {
+                            string appendReplyFirstChar = appendReply[0].ToString();
+                            switch (appendReplyFirstChar) {
+                                case "y":
+                                case "Y":
+                                    szArray.AddRange(copyQueue);
+                                    break;
+                                default:
+                                    Console.WriteLine("* Aborting copy.");
+                                    break;
+                            }
+                        }
+                        else {
+                            Console.WriteLine("* Aborting copy.");
+                        }
+                     }
+                     else {
+                        Console.WriteLine("* Invalid copy destination.");
+                        Console.WriteLine("*   cnum1,num2,dest where num1 <= num2, num2 and dest <= length of file.");
+                        Console.WriteLine("*   File length is {0}.", szArray.Count);
+                     }
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to copy, or line out of range.");
+                    Console.WriteLine("*   cnum1,num2 where num1 <= num2, num2 and dest <= length of file.");
+                    Console.WriteLine("*   File length is {0}.", szArray.Count);
+                }
+
+              return szArray; // c[num1,num2,dest] worked
+            }
+            else {
+                Console.WriteLine("Invalid match");
+                return szArray;
+            }
+        } // end of CopyLines
+
+        // DeleteLines() - returns updated ArrayList with deletes done, or the original ArrayList
+        static ArrayList DeleteLines(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Regex fullr = new Regex(@"^[dD](?<1>\d+),(?<2>\d+)", RegexOptions.Compiled);
+            Regex shortr = new Regex(@"^[dD](?<1>\d+)", RegexOptions.Compiled);
+            Match fullm;
+            Match shortm;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            fullm = fullr.Match(ParserInput);
+            shortm = shortr.Match(ParserInput);
+            Group fullg1 = fullm.Groups[1];
+            Group fullg2 = fullm.Groups[2];
+            Group shortg1 = shortm.Groups[1];
+
+            if ((ParserInput == "d") || (ParserInput == "D")) {  // delete line at current nIndex (which means subtracting 1)
+                szArray.RemoveAt(nIndex - 1);
+
+                return szArray;
+            }
+            else if (fullm.Success) { // we think we have two line numbers
+                //FOR DEBUG
+                //Console.WriteLine("First line number {0}, last line number {1}", fullm.Groups[1], fullm.Groups[2]);
+
+                //delete lines between first and second numbers
+                Capture fullc1 = fullg1.Captures[0];
+                Capture fullc2 = fullg2.Captures[0];
+
+                // int lowLine = Convert.ToInt32(fullc1.Value);
+                int lowLine = Int32.Parse(fullc1.Value);
+
+                // int hiLine = Convert.ToInt32(fullc2.Value);
+                int hiLine = Int32.Parse(fullc2.Value);
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 1 && lowLine <= szArray.Count) && (hiLine >= 1 && hiLine <= szArray.Count) && ((hiLine - lowLine) != 0)) {
+                    szArray.RemoveRange(lowLine - 1, ((hiLine - lowLine) + 1));
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to list, or line out of range.");
+                    Console.WriteLine("*   dnum1,num2 where num1 <= num2 and num2 <= length of file.");
+                    Console.WriteLine("*   File length is {0}.", szArray.Count);
+                }
+                return szArray; // end of d[num1,num]
+            }
+            else if (shortm.Success) { // we have one line number
+                //FOR DEBUG
+                //Console.WriteLine("Line number {0}", shortm.Groups[1]);
+
+                // delete line
+                Capture shortc1 = shortg1.Captures[0];
+
+                // nIndex = Convert.ToInt32(shortc1.Value);
+                nIndex = Int32.Parse(shortc1.Value);
+
+                if (nIndex >= 1 && nIndex <= szArray.Count) { // check for line numbers in range of file
+                    szArray.RemoveAt(nIndex - 1);
+                }
+                else {
+                    Console.WriteLine("* Line number {0} out of range. File length is {1}", nIndex, szArray.Count);
+                    return szArray;
+                }
+                return szArray;
+            }
+            else {
+                Console.WriteLine("Invalid match");
+                return szArray;
+            }
+        } // end of DeleteLines
+
+        // EditAtLine() - edit the line at nIndex in szArray. Since we know the line number, we don't have
+        //                to parse ParserInput here.
+        static ArrayList EditAtLine(ArrayList szArray, int nIndex)
+        {
+            Queue editQueue = new Queue();
+
+            if (nIndex >= 1 && nIndex <= szArray.Count) { // check that line number is in range of file
+                Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+                Console.Write("> ");
+                string editInput = GetConsoleInput();
+                if (editInput == "") {
+                    return szArray;
+                }
+                else {
+                    editQueue.Enqueue(editInput);
+                    szArray.RemoveAt(nIndex - 1);
+                    szArray.InsertRange(nIndex - 1, editQueue);
+                }
+            }
+            else {
+                Console.WriteLine("* Line number {0} out of range. File length is {1}", nIndex, szArray.Count);
+            }
+            return szArray;
+        } // end of EditAtLine
+
+
+        // InsertAtLine() - insert line(s) above nIndex in szArray. Since we know the line number, we don't have
+        //                to parse ParserInput here.
+        static ArrayList InsertAtLine(ArrayList szArray, int nIndex)
+        {
+            Queue insertQueue = new Queue();
+            string insertInput = null;
+
+            Console.WriteLine("* Inserting text above {0}: {1}", nIndex, szArray[nIndex - 1]);
+            Console.WriteLine("* Press ^^ to end input.");
+
+            while (insertInput != "^^") { // Double carat ^^ ends input - would have used control char, but need tty to understand them....
+                Console.Write("> ");
+                insertInput = GetConsoleInput();
+                if (insertInput != "^^") {
+                    insertQueue.Enqueue(insertInput);
+                }
+            }
+            szArray.InsertRange(nIndex - 1, insertQueue);
+            return szArray;
+        } // end of InsertAtLine
+
+        // AppendAtEOF() - append line(s) below current end of szArray. Since we are appending, we don't have
+        //                to parse ParserInput here.
+        static ArrayList AppendAtEOF(ArrayList szArray)
+        {
+            Queue appendQueue = new Queue();
+            string appendInput = null;
+
+            Console.WriteLine("* Appending text at EOF - Press ^^ to end input.");
+
+            while (appendInput != "^^") { // ^^ ends input
+                Console.Write("> ");
+                appendInput = GetConsoleInput();
+                if (appendInput != "^^") {
+                    appendQueue.Enqueue(appendInput);
+                }
+            }
+            szArray.AddRange(appendQueue);
+            return szArray;
+        } // end of AppendAtEOF()
+
+        // MoveLines() - returns updated ArrayList with moves done, or the original ArrayList
+        static ArrayList MoveLines(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Queue moveQueue = new Queue();
+            Regex mover = new Regex(@"^[mM](?<1>\d+),(?<2>\d+),(?<3>\d+)", RegexOptions.Compiled);
+            Match movem;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            movem = mover.Match(ParserInput);
+            Group moveg1 = movem.Groups[1];
+            Group moveg2 = movem.Groups[2];
+            Group moveg3 = movem.Groups[3];
+
+            if (movem.Success) { // we think we have two line numbers and a dest number
+                //FOR DEBUG
+                // Console.WriteLine("First line number {0}, last line number {1}, dest {2}", movem.Groups[1], movem.Groups[2], movem.Groups[3]);
+
+                //Put array elements to be moved into moveQueue
+                Capture movec1 = moveg1.Captures[0]; // first line of move
+                Capture movec2 = moveg2.Captures[0]; // last line of move
+
+                // int lowLine = Convert.ToInt32(movec1.Value);
+                int lowLine = Int32.Parse(movec1.Value);
+
+                // int hiLine = Convert.ToInt32(movec2.Value);
+                int hiLine = Int32.Parse(movec2.Value);
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 1 && lowLine <= szArray.Count) && (hiLine >= 1 && hiLine <= szArray.Count)) {
+                    for (nIndex = lowLine; nIndex <= hiLine; nIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+
+                        moveQueue.Enqueue(szArray[nIndex - 1]);
+                    }
+
+                    // check dest num valid
+                    // However, you can't overlap - dest must either be before the block you're moving, or after it.
+                    Capture movec3 = moveg3.Captures[0];
+
+                    // int destLine = Convert.ToInt32(movec3.Value);
+                    int destLine = Int32.Parse(movec3.Value);
+
+                    if ((destLine >= 1 && destLine <= szArray.Count) && ((destLine < lowLine) || (destLine) > hiLine)) {
+                        // insert moveQueue at point dest in szArray
+                        // note that due to the indexing offset you need to decrement destLine by 1 here
+                        szArray.InsertRange(destLine - 1, moveQueue);
+
+                        // once the insertion is complete, then you can delete the lines from the original
+                        // however, need to be careful about seeing what happened to the original lines - they
+                        // may have moved their indexes in the array depending on where you did the insertion
+                        if (destLine > hiLine) { // indexes stayed the same for the original block - delete it
+                            szArray.RemoveRange(lowLine - 1, ((hiLine - lowLine) + 1));
+                        }
+                        else { // destLine above lowLine, need to adjust
+                            int padLine = hiLine - lowLine;
+                            szArray.RemoveRange((lowLine + padLine), ((hiLine - lowLine) + 1));
+                        }
+                    }
+                    else if (destLine > szArray.Count) { // ask them if they want the move at the end of the file
+                        Console.Write("* Move past end of file - do you want block appended? (y/n) ");
+                        string appendReply = GetConsoleInput();
+                        // string appendReplyFirstChar = Convert.ToString(appendReply[0]);
+                        if (appendReply != "") {
+                            string appendReplyFirstChar = appendReply[0].ToString();
+                            switch (appendReplyFirstChar) {
+                                case "y":
+                                case "Y":
+                                    szArray.AddRange(moveQueue);
+                                    // we don't have to worry about the index adjustment here - we can just remove the lines
+                                    // from their original location
+                                    szArray.RemoveRange(lowLine - 1, ((hiLine - lowLine) + 1));
+                                    break;
+                                default:
+                                    Console.WriteLine("* Aborting move.");
+                                    break;
+                            }
+                        }
+                        else {
+                            Console.WriteLine("* Aborting move.");
+                        }
+                   }
+                   else {
+                        Console.WriteLine("* Invalid move destination.");
+                        Console.WriteLine("*   mnum1,num2,dest where num1 <= num2, num2 and dest <= length of file,");
+                        Console.WriteLine("*   but dest not within num1 - num2 range.");
+                        Console.WriteLine("*   File length is {0}.", szArray.Count);
+                   }
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to move, or line out of range.");
+                    Console.WriteLine("*   mnum1,num2 where num1 <= num2, num2 and dest <= length of file,");
+                    Console.WriteLine("*   but dest not within num1 - num2 range.");
+                    Console.WriteLine("*   File length is {0}.", szArray.Count);
+                }
+                return szArray; // m[num1,num2,dest] worked
+            }
+            else {
+                Console.WriteLine("Invalid match");
+                return szArray;
+            }
+        } // end of MoveLines
+
+        // SearchForText() - returns updated list pointer, since we're not modifying any text
+        static int SearchForText(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Regex closedsearchr = new Regex(@"^[sS](?<1>\d+),(?<2>\d+),(?<3>.+)", RegexOptions.Compiled);
+            Regex opensearchr = new Regex(@"^[sS](?<1>\d+),\?,(?<2>.+)", RegexOptions.Compiled);
+            Match closedsearchm;
+            Match opensearchm;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            closedsearchm = closedsearchr.Match(ParserInput);
+            opensearchm = opensearchr.Match(ParserInput);
+            Group closedsearchg1 = closedsearchm.Groups[1];
+            Group closedsearchg2 = closedsearchm.Groups[2];
+            Group closedsearchg3 = closedsearchm.Groups[3];
+            Group opensearchg1 = opensearchm.Groups[1];
+            Group opensearchg2 = opensearchm.Groups[2];
+            int searchSuccess = 0;
+
+            if (closedsearchm.Success) { // we think we have two line numbers and a search string
+                //FOR DEBUG
+                // Console.WriteLine("First line number {0}, last line number {1}, string {2}", closedsearchm.Groups[1], closedsearchm.Groups[2], closedsearchm.Groups[3]);
+
+                Capture closedsearchc1 = closedsearchg1.Captures[0];
+                Capture closedsearchc2 = closedsearchg2.Captures[0];
+                Capture closedsearchc3 = closedsearchg3.Captures[0];
+
+                // int lowLine = Convert.ToInt32(closedsearchc1.Value);
+                int lowLine = Int32.Parse(closedsearchc1.Value);
+
+                // int hiLine = Convert.ToInt32(closedsearchc2.Value);
+                int hiLine = Int32.Parse(closedsearchc2.Value);
+
+                Regex searchstringr = new Regex(Regex.Escape(closedsearchc3.Value));
+                Match searchstringm;
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 1 && lowLine <= szArray.Count) && (hiLine >= 1 && hiLine <= szArray.Count)) {
+                    for (nIndex = lowLine; nIndex <= hiLine; nIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+
+                        // search for the searchstring in the current line
+                        // searchstringm = searchstringr.Match(Regex.Escape(Convert.ToString(szArray[nIndex - 1])));
+                        searchstringm = searchstringr.Match(Regex.Escape(szArray[nIndex - 1].ToString()));
+                        if (searchstringm.Success) { // found a match
+                            Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+                            searchSuccess = 1;
+                            break;
+                        }
+                        else { // no match found
+                            //FOR DEBUG
+                            // Console.WriteLine("* No match found");
+                            searchSuccess = -1;
+                        }
+                    }
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to search, or line out of range.");
+                    Console.WriteLine("*  snum1,[num2 | ?],string where num1 <= num2 and");
+                    Console.WriteLine("*  num2 <= length of file. File length is {0}", szArray.Count);
+                    searchSuccess = -1;
+                }
+
+                if (searchSuccess == 1) {
+                    return nIndex;
+                }
+                else {
+                    Console.WriteLine("* No match found");
+                    return -1;
+                }
+            }
+            else if (opensearchm.Success) { // we have a starting line number and a string
+                //FOR DEBUG
+                // Console.WriteLine("First line number {0}, last line number {1}, string {2}", closedsearchm.Groups[1], closedsearchm.Groups[2], closedsearchm.Groups[3]);
+
+                Capture opensearchc1 = opensearchg1.Captures[0];
+                Capture opensearchc2 = opensearchg2.Captures[0];
+
+                // int lowLine = Convert.ToInt32(opensearchc1.Value);
+                int lowLine = Int32.Parse(opensearchc1.Value);
+
+                Regex searchstringr = new Regex(Regex.Escape(opensearchc2.Value));
+                Match searchstringm;
+
+                // test for start number out of range
+                if (lowLine >= 1 && lowLine <= szArray.Count) {
+                    for (nIndex = lowLine; nIndex <= szArray.Count; nIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+
+                        // search for the searchstring in the current line
+                        // searchstringm = searchstringr.Match(Regex.Escape(Convert.ToString(szArray[nIndex - 1])));
+                        searchstringm = searchstringr.Match(Regex.Escape(szArray[nIndex - 1].ToString()));
+                        if (searchstringm.Success) { // found a match
+                            Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+                            Console.Write("O.K.? ");
+                            string searchReply = GetConsoleInput();
+                            if (searchReply == "") {
+                                searchSuccess = 1;
+                            }
+                            else {
+                                // string searchReplyFirstChar = Convert.ToString(searchReply[0]);
+                                string searchReplyFirstChar = searchReply[0].ToString();
+                                switch (searchReplyFirstChar) {
+                                    case "y":
+                                    case "Y":
+                                        searchSuccess = 1;
+                                        break;
+                                    default:
+                                        searchSuccess = -1;
+                                        break;
+                                }
+                            }
+                            if (searchSuccess == 1) { // found a match, so stop looking (break from the for loop)
+                                break;
+                            }
+                        }
+                        else { // no match found
+                            //FOR DEBUG
+                            // Console.WriteLine("* No match found");
+                            searchSuccess = -1;
+                        }
+                    }
+                } else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to search, or line out of range.");
+                    Console.WriteLine("*  snum1,[num2 | ?],string where num1 <= num2 and");
+                    Console.WriteLine("*  num2 <= length of file. File length is {0}", szArray.Count);
+                    searchSuccess = -1;
+                }
+
+                if (searchSuccess == 1) {
+                    return nIndex;
+                }
+                else {
+                    Console.WriteLine("* No match found");
+                    return -1;
+                }
+            }
+            else { // bad match to initial parse of command args
+                Console.WriteLine("* Malformed arguments to search, or line out of range.");
+                Console.WriteLine("*  snum1,[num2 | ?],string where num1 <= num2 and");
+                Console.WriteLine("*  num2 <= length of file. File length is {0}", szArray.Count);
+                return -1;
+            }
+        } // end of SearchForText
+
+        // ReplaceText() - returns updated list pointer, since we're not modifying any text
+        static ArrayList ReplaceText(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Regex closedreplacer = new Regex(@"^[rR](?<1>\d+),(?<2>\d+),(?<3>.+)\^(?<4>.+)", RegexOptions.Compiled);
+            Regex openreplacer = new Regex(@"^[rR](?<1>\d+),\?,(?<2>.+)\^(?<3>.+)", RegexOptions.Compiled);
+            Match closedreplacem;
+            Match openreplacem;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            closedreplacem = closedreplacer.Match(ParserInput);
+            openreplacem = openreplacer.Match(ParserInput);
+            Group closedreplaceg1 = closedreplacem.Groups[1];
+            Group closedreplaceg2 = closedreplacem.Groups[2];
+            Group closedreplaceg3 = closedreplacem.Groups[3];
+            Group closedreplaceg4 = closedreplacem.Groups[4];
+            Group openreplaceg1 = openreplacem.Groups[1];
+            Group openreplaceg2 = openreplacem.Groups[2];
+            Group openreplaceg3 = openreplacem.Groups[3];
+
+            if (closedreplacem.Success) { // we think we have two line numbers, a search string, and a replace string
+                //FOR DEBUG
+                // Console.WriteLine("First line number {0}, last line number {1}, string {2}, string {3}", closedreplacem.Groups[1], closedreplacem.Groups[2], closedreplacem.Groups[3], closedreplacem.Groups[4]);
+
+                Capture closedreplacec1 = closedreplaceg1.Captures[0];
+                Capture closedreplacec2 = closedreplaceg2.Captures[0];
+                Capture closedreplacec3 = closedreplaceg3.Captures[0];
+                Capture closedreplacec4 = closedreplaceg4.Captures[0];
+
+                // int lowLine = Convert.ToInt32(closedreplacec1.Value);
+                int lowLine = Int32.Parse(closedreplacec1.Value);
+
+                // int hiLine = Convert.ToInt32(closedreplacec2.Value);
+                int hiLine = Int32.Parse(closedreplacec2.Value);
+
+                Regex searchstringr = new Regex(Regex.Escape(closedreplacec3.Value));
+                // Match searchstringm;
+                Regex replacestringr = new Regex(Regex.Escape(closedreplacec4.Value));
+                string replaceresult = null;
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 1 && lowLine <= szArray.Count) && (hiLine >= 1 && hiLine <= szArray.Count)) {
+                    for (nIndex = lowLine; nIndex <= hiLine; nIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+
+                        // search for the searchstring in the current line and replace it with the replacement string if found
+                        // replaceresult = Regex.Replace(Convert.ToString(szArray[nIndex - 1]), Convert.ToString(searchstringr), Convert.ToString(replacestringr));
+                        replaceresult = Regex.Replace(szArray[nIndex - 1].ToString(), searchstringr.ToString(), replacestringr.ToString());
+                        Queue replaceQueue = new Queue();
+                        replaceQueue.Enqueue(replaceresult);
+                        szArray.InsertRange(nIndex - 1, replaceQueue);
+                        szArray.RemoveAt(nIndex);
+                    }
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to replace, or line out of range.");
+                    Console.WriteLine("*  rnum1,[num2 | ?],string,string where num1 <= num2 and");
+                    Console.WriteLine("*  num2 <= length of file. File length is {0}", szArray.Count);
+                }
+
+                return szArray;
+            }
+            else if (openreplacem.Success) { // we have a starting line number, a search string and a replace string
+                //FOR DEBUG
+                // Console.WriteLine("First line number {0}, string {1}, string {2}", openreplacem.Groups[1], openreplacem.Groups[2], openreplacem.Groups[3]);
+
+                Capture openreplacec1 = openreplaceg1.Captures[0];
+                Capture openreplacec2 = openreplaceg2.Captures[0];
+                Capture openreplacec3 = openreplaceg3.Captures[0];
+
+                // int lowLine = Convert.ToInt32(openreplacec1.Value);
+                int lowLine = Int32.Parse(openreplacec1.Value);
+
+                Regex searchstringr = new Regex(Regex.Escape(openreplacec2.Value));
+                Match searchstringm;
+                Regex replacestringr = new Regex(Regex.Escape(openreplacec3.Value));
+                string replaceresult = null;
+
+                // test for start number out of range
+                if (lowLine >= 1 && lowLine <= szArray.Count) {
+                    for (nIndex = lowLine; nIndex <= szArray.Count; nIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+
+                        // search for the searchstring in the current line
+                        // searchstringm = searchstringr.Match(Regex.Escape(Convert.ToString(szArray[nIndex - 1])));
+                        searchstringm = searchstringr.Match(Regex.Escape(szArray[nIndex - 1].ToString()));
+                        if (searchstringm.Success) { // found a match
+                            Console.WriteLine("{0}: {1}", nIndex, szArray[nIndex - 1]);
+                            Console.Write("O.K.? ");
+                            string replaceReply = GetConsoleInput();
+                            if (replaceReply == "") {
+                                // replaceresult = Regex.Replace(Convert.ToString(szArray[nIndex - 1]), Convert.ToString(searchstringr), Convert.ToString(replacestringr));
+                                replaceresult = Regex.Replace(szArray[nIndex - 1].ToString(), searchstringr.ToString(), replacestringr.ToString());
+                                Queue replaceQueue = new Queue();
+                                replaceQueue.Enqueue(replaceresult);
+                                szArray.InsertRange(nIndex - 1, replaceQueue);
+                                szArray.RemoveAt(nIndex);
+                            }
+                            else {
+                                // string replaceReplyFirstChar = Convert.ToString(replaceReply[0]);
+                                string replaceReplyFirstChar = replaceReply[0].ToString();
+                                switch (replaceReplyFirstChar) {
+                                    case "y":
+                                    case "Y":
+                                        // replaceresult = Regex.Replace(Convert.ToString(szArray[nIndex - 1]), Convert.ToString(searchstringr), Convert.ToString(replacestringr));
+                                        replaceresult = Regex.Replace(szArray[nIndex - 1].ToString(), searchstringr.ToString(), replacestringr.ToString());
+                                        Queue replaceQueue = new Queue();
+                                        replaceQueue.Enqueue(replaceresult);
+                                        szArray.InsertRange(nIndex - 1, replaceQueue);
+                                        szArray.RemoveAt(nIndex);
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+                        else { // no match found
+                            //FOR DEBUG
+                            // Console.WriteLine("* No match found");
+                        }
+                    }
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to replace, or line out of range.");
+                    Console.WriteLine("*  rnum1,[num2 | ?],string,string where num1 <= num2 and");
+                    Console.WriteLine("*  num2 <= length of file. File length is {0}", szArray.Count);
+                }
+                return szArray;
+            }
+            else { // bad match to initial parse of command args
+                Console.WriteLine("* Malformed arguments to replace, or line out of range.");
+                Console.WriteLine("*  rnum1,[num2 | ?],string,string where num1 <= num2 and");
+                Console.WriteLine("*  num2 <= length of file. File length is {0}", szArray.Count);
+                return szArray;
+            }
+        } // end of ReplaceText
+
+        static void EditorWrite(ArrayList szArray, string InputFileName, string BackupFileName)
+        {
+            int pIndex = 0;
+
+            // check to see if file exists at all, first - if it doesn't,
+            // we have to create it, but don't have to back it up.
+
+            if (File.Exists(InputFileName)) { // it does exist, ergo we need to back it up
+                // Test to see if the backup file exists, if it does, delete it (to clear it)
+                if (File.Exists(BackupFileName)) {
+                    File.Delete(BackupFileName);
+                }
+
+                // Then, copy the original file to one with bak at the end
+                File.Copy(InputFileName, BackupFileName, true);
+
+                // Then delete the original file (to clear it)
+                File.Delete(InputFileName);
+
+                // Then write out the contents of the buffer to our InputFileName
+                FileStream fsOutput = new FileStream(InputFileName, FileMode.Create, FileAccess.Write);
+                StreamWriter srOutput = new StreamWriter(fsOutput);
+                for (pIndex = 0; pIndex < szArray.Count; pIndex++) {
+                    //FOR DEBUG
+                    // Console.WriteLine("* pIndex = {0}, line = {1}", pIndex, szArray[pIndex]);
+
+                    srOutput.WriteLine(szArray[pIndex]);
+                }
+                srOutput.Close();
+                fsOutput.Close();
+                return;
+            }
+            else {   // file didn't exist, so create it, and don't back it up
+                FileStream fsOutput = new FileStream(InputFileName, FileMode.Create, FileAccess.Write);
+                StreamWriter srOutput = new StreamWriter(fsOutput);
+                for (pIndex = 0; pIndex < szArray.Count; pIndex++) {
+                    srOutput.WriteLine(szArray[pIndex]);
+                }
+                srOutput.Close();
+                fsOutput.Close();
+                return;
+            }
+        } // end of EditorWrite();
+
+        // PageText - returns updated list pointer as int
+        static int PageText(ArrayList szArray, string ParserInput, int nIndex)
+        {
+            Regex fullr = new Regex(@"^[pP](?<1>\d+),(?<2>\d+)", RegexOptions.Compiled);
+            Regex shortr = new Regex(@"^[pP](?<1>\d+)", RegexOptions.Compiled);
+            Match fullm;
+            Match shortm;
+            int listSuccess = 0;
+            int pageCounter = 0;
+            string pageReply = "";
+            string pageReplyFirstChar = "";
+            int PAGELENGTH = 47; // allow for Singularity "activity" line at top of console
+            int PAGEWIDTH = 72;  // allow for line numbers in printouts - up to 99,999.
+                                 // TODO: adjust line number range dynamically for large files
+            int tempwidth = 0;
+            string workstring = "";
+            string tempstring = "";
+            int remainder = 0;
+            int division = 0;
+            int linesinline = 0;
+            int leftinstring = 0;
+            int lowLine = 0;
+            int hiLine = 0;
+
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            fullm = fullr.Match(ParserInput);
+            shortm = shortr.Match(ParserInput);
+            Group fullg1 = fullm.Groups[1];
+            Group fullg2 = fullm.Groups[2];
+            Group shortg1 = shortm.Groups[1];
+
+            if (fullm.Success)  { // we think we have two line numbers, set lowLine and hiLine accordingly
+
+                //FOR DEBUG
+                //Console.WriteLine("First line number {0}, last line number {1}", fullm.Groups[1], fullm.Groups[2]);
+
+                Capture fullc1 = fullg1.Captures[0];
+                Capture fullc2 = fullg2.Captures[0];
+
+                // int lowLine = Convert.ToInt32(fullc1.Value);
+                lowLine = Int32.Parse(fullc1.Value) - 1; // offset by one to allow for difference in starting point...
+
+                // int hiLine = Convert.ToInt32(fullc2.Value);
+                hiLine = Int32.Parse(fullc2.Value);     // but leave this one alone, due to the loop
+
+                // test for numbers out of range or out of order
+                if ((lowLine <= hiLine) && (lowLine >= 0 && lowLine <= szArray.Count) && (hiLine >= 0 && hiLine <= szArray.Count)) {
+                // continue on to listing...
+                }
+                else { // bad arguments
+                    Console.WriteLine("* Malformed arguments to page, or line out of range.");
+                    Console.WriteLine("*   pnum1,num2 where num1 <= num2 and num2 <= length of file.");
+                    Console.WriteLine("*   File length is {0}.", szArray.Count);
+                    listSuccess = -1;
+                    return listSuccess;
+                }
+            }
+            else if (shortm.Success) { // we have one line number
+                //FOR DEBUG
+                //Console.WriteLine("Line number {0}", shortm.Groups[1]);
+
+                // write out line
+                Capture shortc1 = shortg1.Captures[0];
+
+                // nIndex = Convert.ToInt32(shortc1.Value);
+                nIndex = Int32.Parse(shortc1.Value);
+
+                if (nIndex >= 1 && nIndex <= szArray.Count) { // check for line numbers in range of file
+                    lowLine = nIndex - 1;
+                    hiLine = nIndex;
+                    // proceed to listing
+                }
+                else {
+                    Console.WriteLine("* Line number {0} out of range. File length is {1}", nIndex, szArray.Count);
+                    listSuccess = -1;
+                    return listSuccess;
+                }
+            }
+            else if ((ParserInput == "p") || (ParserInput == "P")) {  // set lowLine = 0, hiLine = szArray.Count
+                lowLine = 0;
+                hiLine = szArray.Count;
+            }
+            else {
+                Console.WriteLine("Invalid match");
+                listSuccess = -1;
+                return listSuccess;
+            }
+
+            // print out buffer contents between lowLine and hiLine by pages
+            for (nIndex = lowLine; nIndex < hiLine; nIndex++)
+            {
+                workstring = szArray[nIndex].ToString();
+                tempwidth = workstring.Length;
+                if (tempwidth > PAGEWIDTH)
+                {
+                    //FOR DEBUG
+                    //Console.WriteLine(" need to break up line length");
+                    while (division != 1)
+                    {
+                        linesinline++;
+                        division = tempwidth / PAGEWIDTH;
+                        remainder = tempwidth % PAGEWIDTH;
+                        tempwidth = tempwidth - PAGEWIDTH;
+                        //FOR DEBUG
+                        //Console.WriteLine("remainder = {0}, division = {1}, tempwidth = {2}, linesinline = {3}", remainder, division, tempwidth, linesinline);
+                        //Console.ReadLine();
+                    }
+                    if (remainder != 0)
+                    {
+                        linesinline++;
+                        //FOR DEBUG
+                        //Console.WriteLine("remainder = {0}, division = {1}, tempwidth = {2}, linesinline = {3}", remainder, division, tempwidth, linesinline);
+                        //Console.ReadLine();
+                    }
+                    if (linesinline < (PAGELENGTH - pageCounter))
+                    { // room to print the whole wrapped line
+                        leftinstring = workstring.Length;
+                        while (linesinline > 0)
+                        {
+                            if (leftinstring >= PAGEWIDTH)
+                            {
+                                tempstring = workstring.Substring(workstring.Length - leftinstring, PAGEWIDTH);
+                            }
+                            else
+                            {
+                                tempstring = workstring.Substring(workstring.Length - leftinstring, remainder);
+                            }
+
+                            Console.WriteLine("{0,5}: {1}", (nIndex + 1), tempstring);
+                            pageCounter++;
+                            linesinline--;
+                            if (leftinstring > PAGEWIDTH)
+                            {
+                                leftinstring = leftinstring - PAGEWIDTH;
+                            }
+                        }
+                    }
+                    else if (pageCounter <= PAGELENGTH)
+                    { // less than PAGELENGTH, but not enough room to print the whole wrapped line
+                        leftinstring = workstring.Length;
+                        while (linesinline > 0)
+                        {
+                            if (leftinstring >= PAGEWIDTH)
+                            {
+                                tempstring = workstring.Substring(workstring.Length - leftinstring, PAGEWIDTH);
+                            }
+                            else
+                            {
+                                tempstring = workstring.Substring(workstring.Length - leftinstring, remainder);
+                            }
+
+                            Console.WriteLine("{0,5}: {1}", (nIndex + 1), tempstring);
+                            pageCounter++;
+                            linesinline--;
+                            if (leftinstring > PAGEWIDTH)
+                            {
+                                leftinstring = leftinstring - PAGEWIDTH;
+                            }
+                            if (pageCounter > PAGELENGTH)
+                            {
+                                pageCounter = 0;
+                                Console.Write("-- <ENTER> -- ");
+                                pageReply = GetConsoleInput();
+                                if (pageReply != "")
+                                {
+                                    //pageReplyFirstChar = Convert.ToString(pageReply[0]);
+                                    pageReplyFirstChar = pageReply[0].ToString();
+                                    switch (pageReplyFirstChar)
+                                    {
+                                        case "q":
+                                        case "Q":
+                                            return nIndex + 1;
+                                        default:
+                                            if (leftinstring >= PAGEWIDTH)
+                                            {
+                                                tempstring = workstring.Substring(workstring.Length - leftinstring, PAGEWIDTH);
+                                            }
+                                            else
+                                            {
+                                                tempstring = workstring.Substring(workstring.Length - leftinstring, remainder);
+                                            }
+                                            Console.WriteLine("{0,5}: {1}", (nIndex + 1), tempstring);
+                                            pageCounter++;
+                                            linesinline--;
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    // rezero worker constants
+                    remainder = 0;
+                    division = 0;
+                    linesinline = 0;
+                    leftinstring = 0;
+                    listSuccess = 1;
+                }
+                else
+                {
+                    Console.WriteLine("{0,5}: {1}", (nIndex + 1), szArray[nIndex]);
+
+                    if (pageCounter < PAGELENGTH)
+                    {
+                        pageCounter++;
+                    }
+                    else
+                    {
+                        pageCounter = 0;
+                        Console.Write("-- <ENTER> -- ");
+                        pageReply = GetConsoleInput();
+                        if (pageReply != "")
+                        {
+                            //pageReplyFirstChar = Convert.ToString(pageReply[0]);
+                            pageReplyFirstChar = pageReply[0].ToString();
+                            switch (pageReplyFirstChar)
+                            {
+                                case "q":
+                                case "Q":
+                                    return nIndex + 1;
+                                default:
+                                    break;
+                            }
+                        }
+                    }
+                listSuccess = 1;
+                }
+            }
+
+            if (listSuccess == 1) {
+               return nIndex; // paging worked
+            }
+            else {            // note that you should never get here  
+               return -1;     // bad arguments, don't move line pointer
+            }
+        } // end of PageText
+
+        // TransferText() - returns updated ArrayList with content merged in from external file, or the original ArrayList
+        static ArrayList TransferText(ArrayList szArray, string ParserInput)
+        {
+            Queue transferQueue = new Queue();
+            Regex transferr = new Regex(@"^[tT](?<1>\d+),(?<2>.+)", RegexOptions.Compiled);
+            Match transferm;
+
+            //FOR DEBUGGING
+            //Console.WriteLine("Current line number is {0}", nIndex);
+
+            transferm = transferr.Match(ParserInput);
+            Group transferg1 = transferm.Groups[1];
+            Group transferg2 = transferm.Groups[2];
+
+            if (transferm.Success)  { // we think we have a line number and a filename of some sort
+                //FOR DEBUG
+                // Console.WriteLine("First line number {0}, filename {1}", transferm.Groups[1], transferm.Groups[2]);
+
+                //Put file contents to be copied into transferQueue
+                Capture transferc1 = transferg1.Captures[0]; // insertion point
+
+                // int lowLine = Convert.ToInt32(transferc1.Value);
+                int lowLine = Int32.Parse(transferc1.Value);
+
+                Capture transferc2 = transferg2.Captures[0]; // filename
+                // string TransferFileName = Convert.ToString(transferc2.Value);
+                string TransferFileName = transferc2.Value.ToString();
+
+                if (File.Exists(TransferFileName)) { // file exists, so read it into a buffer
+                    string TransferLine;
+                    ArrayList transferContents = new ArrayList();
+                    FileStream fsInput = new FileStream(TransferFileName, FileMode.Open, FileAccess.Read);
+                    StreamReader srInput = new StreamReader(fsInput);
+                    while ((TransferLine = srInput.ReadLine()) != null) {
+                        transferContents.Add(TransferLine);
+                    }
+                    srInput.Close();
+                    fsInput.Close();
+                    for (int transferIndex = 0; transferIndex < transferContents.Count; transferIndex++) {
+                        //FOR DEBUG
+                        // Console.WriteLine("{0}: {1}", transferIndex, transferContents[transferIndex]);
+
+                        transferQueue.Enqueue(transferContents[transferIndex]);
+                    }
+                }
+                else { // file to be merged wasn't there
+                    Console.WriteLine("* File to be merged doesn't exist.");
+                    return szArray;
+                }
+
+                // test for numbers out of range or out of order
+                if (lowLine >= 1 && lowLine <= szArray.Count) { //
+                    szArray.InsertRange(lowLine - 1, transferQueue);
+                    return szArray;
+                }
+                else if (lowLine > szArray.Count) { // check if number is past the end of the file and they want to append
+                    Console.Write("* Transfer past end of file - do you want file appended? (Y/N) ");
+
+                    string appendReply = GetConsoleInput();
+                    // string appendReplyFirstChar = Convert.ToString(appendReply[0]);
+                    if (appendReply != "") {
+                        string appendReplyFirstChar = appendReply[0].ToString();
+                        switch (appendReplyFirstChar) {
+                            case "y":
+                            case "Y":
+                                szArray.AddRange(transferQueue);
+                                break;
+                            default:
+                                Console.WriteLine("* Aborting transfer.");
+                                break;
+                        }
+                    }
+                    else {
+                        Console.WriteLine("* Aborting transfer.");
+                    }
+                    return szArray;
+                }
+                else { // something else is wrong with the insertion point
+                    Console.WriteLine("* Invalid transfer destination.");
+                    Console.WriteLine("*   tnum1, filename where num1 is insertion point and filename");
+                    Console.WriteLine("*   is what is to be inserted. File length is {0}.", szArray.Count);
+                    return szArray;
+                }
+            }
+            else {// bad arguments
+                Console.WriteLine("* Malformed arguments to transfer.");
+                Console.WriteLine("*   tnum1, filename where num1 is insertion point and filename");
+                Console.WriteLine("*   is what is to be inserted. File length is {0}.", szArray.Count);
+                return szArray;
+            }
+        } // end of TransferText
+
+        static string GetConsoleInput() { // filter Console.ReadLine input for backspaces
+            string InputString = "";
+            string InputCheck = "";
+
+            InputString = Console.ReadLine();
+            if (InputString != "") {
+                //FOR DEBUG
+                //Console.WriteLine("* Input was {0}", InputString);
+                //Console.Write("* ");
+                //
+                //for (int i = 0; i < InputString.Length; i++) {
+                //    Console.Write("{0:x}",(int)InputString[i]);
+                //}
+                //Console.Write("* ");
+                // END DEBUG
+
+                // Check for backspace chars and remove them if present, but also delete the character(s) they meant to delete
+                int j = 0;
+                string TempString = "";
+                for (int i = 0; i < InputString.Length; i++) {
+                    if ((int)InputString[i] != 0x08) {
+                        TempString = string.Concat(InputCheck,InputString[i].ToString());
+                        InputCheck = TempString;
+                        j++;
+                    }
+                    else {
+                        InputCheck = InputCheck.Remove(j - 1,1);
+                        j--;
+                    }
+                }
+                //FOR DEBUG
+                //Console.WriteLine("* Check was {0}", InputCheck);
+                //Console.Write("* ");
+                //
+                //for (int i = 0; i < InputCheck.Length; i++) {
+                //    Console.Write("{0:x}",(int)InputCheck[i]);
+                //}
+                //END DEBUG
+
+            }
+            return InputCheck;
+        } // end of GetConsoleInput()
+
+
+    }
+}
+
diff --git a/base/Applications/Seditor/Seditor.csproj b/base/Applications/Seditor/Seditor.csproj
new file mode 100644
index 0000000..2267108
--- /dev/null
+++ b/base/Applications/Seditor/Seditor.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SEditor</AssemblyName>
+    <NoNullCheck>true</NoNullCheck>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SEditor.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Seditor/readme.txt b/base/Applications/Seditor/readme.txt
new file mode 100644
index 0000000..ad02f0a
--- /dev/null
+++ b/base/Applications/Seditor/readme.txt
@@ -0,0 +1,96 @@
+SEditor - a simple Singularity Editor
+
+Syntax: seditor filename
+
+Commands:
+
+?; (h | H) - prints this message
+[number] - start editing at line [number]
+(a | A) - append lines at end of file
+(c | C)[num1],[num2],[destnum] - copy lines from num1 to num2 to dest num
+(d | D); (d | D)[num]; (d | D)[num1],[num2] - delete current line, 
+    line at num, lines from num1 to num2
+(e | E) - exit, saving changes
+(i | I); (i | I)[num] - insert line above current line, or above line num
+(l | L); (l | L)[num]; (l | L)[num1],[num2] - list the whole file, 
+    list the line at num, list the lines from num1 to num2
+(m | M)[num1],[num2],[destnum] - move lines from num1 to num2 to dest num
+(n | N) - print current line number (location in file)
+(p | P) - same as l, only displays one page at a time.
+(q | Q) - quit, saving no changes since last write
+(r | R)[num1],([num2] | ?),[searchstr]^[replacestr] - replace
+    searchstr with replacestr. If ? is used as second param, sub is prompted
+(s | S)[num1],([num2] | ?),[searchstr] - search for searchstr. 
+    If ? is used as second param, occurrence is displayed with prompt
+    until accepted with y, Y, or newline.
+(t | T)[num],filename - insert contents of filename above line num.
+(w | W) - write contents of memory to filename. Original contents will be
+    backed up as for exit command.
+
+Notes:
+
+This is a very simple interactive editor, roughly modelled after the MS-DOS "edlin" program. It requires that you provide it a file name (only one) to edit. If it is a new file (i.e., does not exist), seditor will so inform you and will create the file upon exit, if given an exit or write command. It will provide error messages if the name it is given is not a "file" - i.e., if it is a directory or is otherwise not able to be opened and manipulated. Note that it does not attempt to figure out whether the contents of the file, if it exists, are text or not - so if you give it a binary to edit, be prepared for what will likely be erratic (and certainly untested) behavior.
+
+The console height and width are being treated as fixed constants for the moment. Some obvious "to-dos" include:
+
+	TODO: Dynamically determine height/width
+	TODO: Recheck display size between pages 
+	      in case size has changed. (Lower pri).
+	TODO: Turn it into some sort of "screen" editor (a la' emacs,
+		vi, or edit)
+	TODO: As part of the screen sizing issue - constants were chosen and the 
+	      fields are being formatted to permit up to 99,999 lines before the display
+	      is wrong in the list and print commands. Change this so that it dynamically 
+	      sizes (though if you'd ever _want_ to edit something that large with a 
+              line editor, one might wonder about your sanity ;-)....)
+
+The syntax has been been made simple to parse, though perhaps less obvious to use than that of ed or edlin. The basic form is:
+
+cmd[first line],[second line],[third line]
+
+or 
+
+cmd[first line],[second line | interrogative (i.e. ?)],[search-pat[^replace-pat]]
+
+SEditor retains a line counter, so commands will frequently act on the "current" line if given no other arguments. The "current" line pointer is generally updated in commands that deal with moving around in the buffer, but that don't modify text; see below in the "Details on Commands" section for more information.
+
+Details on Commands, in order:
+
+? or h | H: prints a help message of the form above.
+
+[number]: edit at the line given by number. SEditor will print the line out prior to providing you a prompt of the form "> ". It will accept one line of input, which is terminated when you enter a newline. The line pointer will be set to the line you are editing.
+
+a | A: append lines at the end of the file. If you are editing a "new" file, this is one of the few commands that will permit you to do something meaningful. The line pointer will be set to the "new" end of the file when you execute this command, which is an exception to the general rule noted above that line pointers normally are not reset on actual edit operations.
+
+c | C[num1],[num2],[destination number]: copy the text starting at line num1 and proceeding through line num2 to, and insert it before the line specified by destination number. If you wish to copy text to the end of the file, give it a number that is greater than the number of lines in your buffer. You will be prompted to confirm the copy operation with a message telling you that you are copying past the current end of the file. The copy command does not update the line pointer.
+
+d | D; d | D[num1]; d | D[num1],[num2]: the delete command with no arguments will delete the "current" line (i.e. your current position within the buffer). With one argument, it will delete the line you have specified. With two line numbers separated by a comma (no spaces), it will delete the text starting at num1 and proceeding through the line specified by num2. The delete command will not update the line pointer, unless you have shrunken the file buffer to a point below that of the line pointer, at which point it will be set to the current last line.
+
+e | E: exits, saving any text changed since the last save of the file buffer. If no text has been changed, it will exit without saving text. The original file will be backed up to a file in the same directory with the same filename, but with a different extension - namely, the ".bak" extension. If the backup exists under that name, it will be silently replaced.
+
+i | I; i | I[num]: insert text before either the "current line" (no arguments), or before the line specified by num. If you wish to append text to the end of the file, use the "a" command, as line numbers out of range of the file will produce an error. Note that the "current" line after this command is executed is whatever you named as the point of insertion.
+
+l | L; l | L[num1]; l | L[num1],[num2]: with no arguments, list the entire file (with no paging). With one argument, list the line specified by num1. With two arguments, list the file's contents starting at the line specified by num1 and proceeding through num2. The line pointer will be set to the last line listed.
+
+m | M[num1],[num2],[destination number]: move the text starting at line num1 and proceeding through line num2 to, and insert it before the line specified by destination number. The text you are moving will be deleted from its original position. If you wish to move text to the end of the file, give it a number that is greater than the number of lines in your buffer. You will be prompted to confirm the move operation with a message telling you that you are copying past the current end of the file. The move command does not update the line pointer. 
+
+n | N: print the current line number.
+
+p | P; p | P[num1]; p | P[num1],[num2]: with no arguments, list the entire file (with paging). At each page, you may choose to continue paging by hitting <ENTER>, or you may quit by hitting <q> or <Q>, followed by <ENTER>. With one argument, list the line specified by num1. With two arguments, list the file's contents (with paging) starting at the line specified by num1 and proceeding through num2. The line pointer will be set to the last line listed.
+
+q | Q; quit, saving no changes since last write. If the file has been changed, you will be prompted in case you wish to abort your "quit" and save your changes.
+
+r | R[num1],[num2 | ?],[searchstring]^[replacestring]: search for searchstring, starting at the line specified by num1 and proceeding through num2 (if present), and replace the text described by searchstring with replacestring. If the second argument is "?" (instead of num2), you will be prompted if you want to do the replacement until all of the possible replacements have been queried. The replace command will not update the line pointer.
+
+s | S[num1],[num2 | ?],[searchstring]: search for searchstring, starting at the line specified by num1 and proceeding through num2 (if present. If the second argument is "?" (instead of num2), you will be prompted if this is the correct match. If a match is found, the line pointer will be updated to the line where the match was found.
+
+t | T[num],[filename]: insert the contents of filename above the line specified by num. If you wish to append the contents of the file being merged to the current file contents, specify a line number that is greater than the current number of lines in the file. You will be prompted, in that case, to proceed (or not) with the transfer. The line pointer will not be changed as a result of this command.
+
+w | W: write the contents of the file buffer to a file on disk. The original file will be backed up as for the exit command (e).
+
+
+
+
+
+
+6/20/2006
\ No newline at end of file
diff --git a/base/Applications/ServiceManager/Benchmark/ArgumentJob.sg b/base/Applications/ServiceManager/Benchmark/ArgumentJob.sg
new file mode 100644
index 0000000..140a9a0
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/ArgumentJob.sg
@@ -0,0 +1,113 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\Benchmark\ArgumentJob.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using System.Text;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Services;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    internal class ArgumentJob : Job
+    {
+        public const int    NPatterns = 10;
+        public const int    NSamples = 100;
+        private ulong[]     xchangeRTT = new ulong[NPatterns];
+
+        internal ArgumentJob(BenchmarkServerInfo! info)
+        {
+            base(info);
+        }
+
+        internal override bool Run()
+        {
+            bool success = false;
+
+            BenchmarkContract.Imp:Ready! ep;
+            if (!Bind(out ep)) {
+                goto exit;
+            }
+
+            Console.WriteLine("ArgumentJob start");
+            DebugStub.WriteLine("-- ArgumentJob start");
+
+            for (int i = 0; i < NPatterns; i++) {
+                success = TestArgumentsHelper(ep, i, out xchangeRTT[i]);
+                if (!success) {
+                    goto exit;
+                }
+            }
+
+            ep.SendEndOfBenchmark();
+            switch receive {
+                case ep.AckEnd():
+                    break;
+                case ep.ChannelClosed():
+                    break;
+            }
+            success = true;
+exit:
+            delete ep;
+            return success;
+        }
+
+        private bool TestArgumentsHelper(BenchmarkContract.Imp:Ready! ep,
+                                         int num, out ulong time)
+        {
+            bool    success = false;
+            ulong[] time1 = new ulong[NSamples];
+            ulong[] time2 = new ulong[NSamples];
+            ulong   time3;
+
+            time = 0;
+            for (int i = 0; i < NSamples; i++) {
+                if (!Message.SendReceive(ep, num, out time1[i],
+                                         out time2[i])) {
+                    success = false;
+                    goto exit;
+                }
+            }
+
+            time3 = time2[0] - time1[0];
+            for (int i = 1; i < NSamples; i++) {
+                time3 = (time2[i] - time1[i] + time3) / 2;
+            }
+            time = time3;
+            success = true;
+exit:
+            return success;
+        }
+
+        public override String! ToString()
+        {
+            StringBuilder builder = new StringBuilder();
+
+            builder.Append("-- Arguments Test Result --\n");
+            builder.Append("Average Roundtrip ");
+            builder.Append("with various number of message arguments (");
+            builder.Append(NSamples);
+            builder.Append(" samples):\n");
+
+            builder.Append("Args   Cycle\n");
+            builder.Append("----  -------\n");
+            for (int i = 0; i < NPatterns; i++) {
+                builder.AppendFormat("{0, -4}  ", i);
+                builder.AppendFormat("{0, 7}\n", xchangeRTT[i]);
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/Benchmark/CommunicationJob.sg b/base/Applications/ServiceManager/Benchmark/CommunicationJob.sg
new file mode 100644
index 0000000..0e672e1
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/CommunicationJob.sg
@@ -0,0 +1,128 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\Benchmark\CommunicationJob.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using System.Text;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Services;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    internal class CommunicationJob : Job
+    {
+        private const int   MaxSamples = 100;
+        private ulong[,]   time = new ulong[3, MaxSamples];
+        private ulong       outgoing;
+        private ulong       incoming;
+        private ulong       outTotal;
+        private ulong       inTotal;
+
+        internal CommunicationJob(BenchmarkServerInfo! info)
+        {
+            base(info);
+        }
+
+        internal override bool Run()
+        {
+            bool    success = false;
+            ulong   time1, time2, time3;
+
+            BenchmarkContract.Imp:Ready! ep;
+            if (!base.Bind(out ep)) {
+                success = false;
+                goto exit;
+            }
+
+            Console.WriteLine("CommunicationJob start");
+            DebugStub.WriteLine("-- CommunicationJob start");
+
+            time[0, 0] = Processor.GetCycleCount();
+            ep.SendGetCycleCount();
+            switch receive {
+                case ep.CycleCount(number):
+                    time[2, 0] = Processor.GetCycleCount();
+                    time[1, 0] = number;
+                    break;
+                case ep.ChannelClosed():
+                    Console.WriteLine("ChannelClosed @ comm\n");
+                    success = false;
+                    goto exit;
+                    break;
+            }
+
+            for (int i = 1; i < MaxSamples; i++) {
+                time[0, i] = Processor.GetCycleCount();
+                ep.SendGetCycleCount();
+                switch receive {
+                    case ep.CycleCount(number):
+                        time[2, i] = Processor.GetCycleCount();
+                        time[1, i] = number;
+                        break;
+                    case ep.ChannelClosed():
+                        Console.WriteLine("ChannelClosed @ comm\n");
+                        success = false;
+                        goto exit;
+                        break;
+                }
+            }
+
+            ep.SendEndOfBenchmark();
+            switch receive {
+                case ep.AckEnd():
+                    break;
+                case ep.ChannelClosed():
+                    break;
+            }
+
+            for (int i = 0; i < MaxSamples; i++) {
+                outTotal += (time[1, i] - time[0, i]);
+                inTotal += (time[2, i] - time[1, i]);
+            }
+            outgoing = outTotal / MaxSamples;
+            incoming = inTotal / MaxSamples;
+
+            success = true;
+exit:
+            delete ep;
+            return success;
+        }
+
+        public override String! ToString()
+        {
+            StringBuilder builder = new StringBuilder();
+
+            builder.Append("-- Communication Test Result (");
+            builder.Append(MaxSamples);
+            builder.Append(" samples) --\n");
+            builder.Append("No.  Cycle Count  Cycle Count  Cycle Count\n");
+            builder.Append("---  -----------  -----------  -----------\n");
+            for (int i = 0; i < 10; i++) {
+                builder.AppendFormat("{0, 3}  {1, 11}  {2, 11}  {3, 11}\n",
+                               i, time[0, i], time[1, i], time[2, i]);
+            }
+            builder.Append("\n");
+            builder.Append("Direction   TotalCycles  Average\n");
+            builder.Append("---------   -----------  -------\n");
+            builder.AppendFormat("Outgoing    {0, 11}  {1, 7}\n",
+                                 outTotal, outgoing);
+            builder.AppendFormat("Incoming    {0, 11}  {1, 7}\n",
+                                 inTotal, incoming);
+            builder.AppendFormat("Round-trip  {0, 11}  {1, 7}\n",
+                                 outTotal + inTotal, outgoing + incoming);
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/Benchmark/Job.sg b/base/Applications/ServiceManager/Benchmark/Job.sg
new file mode 100644
index 0000000..04727f0
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/Job.sg
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\Benchmark\Job.sg
+//
+//  Note:
+//
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    internal abstract class Job
+    {
+        internal readonly BenchmarkServerInfo! info;
+
+        internal Job(BenchmarkServerInfo! info)
+        {
+            this.info = info;
+        }
+
+        internal abstract bool Run();
+
+        protected bool Bind(out BenchmarkContract.Imp:Ready! ep)
+        {
+            bool        success = false;
+            ErrorCode   error;
+
+            BenchmarkContract.Imp!          imp;
+            BenchmarkContract.Exp!          exp;
+            DirectoryServiceContract.Imp    ds;
+
+            BenchmarkContract.NewChannel(out imp, out exp);
+            ds = DirectoryService.NewClientEndpoint();
+            if (!SdsUtils.Bind(info.ServiceName, ds, exp, out error))
+            {
+                Console.WriteLine("Binding failed: {0}\n",
+                                  SdsUtils.ErrorCodeToString(error));
+                success = false;
+                goto exit;
+            }
+
+            switch receive
+            {
+                case imp.Success():
+                    success = true;
+                    break;
+                case imp.ChannelClosed():
+                    Console.WriteLine("Job: Channel closed.\n");
+                    success = false;
+                    break;
+            }
+exit:
+            delete ds;
+            ep = imp;
+
+            return success;
+        }
+    } // class
+}
diff --git a/base/Applications/ServiceManager/Benchmark/JobSet.sg b/base/Applications/ServiceManager/Benchmark/JobSet.sg
new file mode 100644
index 0000000..17dd1b5
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/JobSet.sg
@@ -0,0 +1,73 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Applications\ServiceManager\Benchmark\JobSet.sg
+//
+//  Note:   
+//
+using System;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    internal class JobSet
+    {
+        internal static void Start(BenchmarkServerInfo! info,
+                                   TRef<ServiceControlContract.Imp:Ready>! tref)
+        {
+            IList modules = new ArrayList();
+
+            modules.Add(new CommunicationJob(info));
+            modules.Add(new ArgumentJob(info));
+            modules.Add(new MultiThreadJob(info, tref));
+
+            DoJob(modules);
+            Console.WriteLine(info.BinaryName);
+            Console.WriteLine("====================");
+            DebugStub.WriteLine(info.BinaryName);
+            DebugStub.WriteLine("====================");
+            PrintResult(modules);
+
+            modules.Clear();
+        }
+
+        private static void DoJob(IList modules)
+        {
+            Job job;
+
+            if (modules == null) {
+                return;
+            }
+
+            foreach (Object obj in modules) {
+                if (obj != null) {
+                    job = obj as Job;
+                    if (job != null) {
+                        job.Run();
+                    }
+                }
+            }
+        }
+
+        private static void PrintResult(IList modules) {
+            if (modules == null) {
+                return;
+            }
+
+            foreach (Object obj in modules) {
+                if (obj != null) {
+                    Console.WriteLine(obj.ToString());
+                    DebugStub.WriteLine(obj.ToString());
+                }
+            }
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/Benchmark/LogBench.csproj b/base/Applications/ServiceManager/Benchmark/LogBench.csproj
new file mode 100644
index 0000000..232f435
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/LogBench.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>LogBench</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="LogBenchmark.sg" />
+    <Compile Include="ArgumentJob.sg" />
+    <Compile Include="CommunicationJob.sg" />
+    <Compile Include="Job.sg" />
+    <Compile Include="JobSet.sg" />
+    <Compile Include="Message.sg" />
+    <Compile Include="MultiThreadJob.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/ServiceManager/Benchmark/LogBenchmark.sg b/base/Applications/ServiceManager/Benchmark/LogBenchmark.sg
new file mode 100644
index 0000000..c878ba6
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/LogBenchmark.sg
@@ -0,0 +1,310 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\Benchmark\LogBenchmark.sg
+//
+//  Note:
+//
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    [ConsoleCategory(HelpMessage="Benchmark client", DefaultAction=true)]
+    internal class DefaultConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+        
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<ProcessContract.Imp:Start> processRef;
+
+        [Endpoint]
+        public readonly TRef<MemoryContract.Imp:Start> memoryRef;
+
+        [Endpoint]
+        public readonly TRef<ChannelContract.Imp:Start> channelRef;
+
+        reflective internal DefaultConfig();
+
+        internal int AppMain()
+        {
+            return LogBenchmark.DefaultMain(this);
+        }
+    }
+
+    internal sealed class BenchmarkServerInfo
+    {
+        private readonly string!        serviceName;
+        private readonly string!        binaryName;
+        private readonly ServiceType    type;
+
+        internal BenchmarkServerInfo(string! serviceName, string! binaryName,
+                                     ServiceType type)
+        {
+            this.serviceName = serviceName;
+            this.binaryName= binaryName;
+            this.type = type;
+        }
+
+        internal string! ServiceName
+        {
+            get { return serviceName; }
+            private set {}
+        }
+
+        internal string! BinaryName
+        {
+            get { return binaryName; }
+            private set{}
+        }
+
+        internal ServiceType Type
+        {
+            get { return type; }
+            private set{}
+        }
+    }
+
+    internal sealed class LogBenchmark
+    {
+        private BenchmarkServerInfo[] serverList;
+
+        private TRef<ServiceControlContract.Imp:Ready>      serverControlRef;
+        private TRef<ServiceManagementContract.Imp:Ready>   manageRef;
+        private TRef<ProcessContract.Imp:ReadyState>        processRef;
+        private TRef<MemoryContract.Imp:ReadyState>         memoryRef;
+        private TRef<ChannelContract.Imp:ReadyState>        channelRef;
+
+        internal LogBenchmark(BenchmarkServerInfo[] info,
+                              [Claims]ProcessContract.Imp:Start! pep,
+                              [Claims]MemoryContract.Imp:Start! mep,
+                              [Claims]ChannelContract.Imp:Start! cep)
+        {
+            serverList = info;
+            pep.RecvReady();
+            processRef = new TRef<ProcessContract.Imp:ReadyState>(pep);
+            mep.RecvReady();
+            memoryRef = new TRef<MemoryContract.Imp:ReadyState>(mep);
+            cep.RecvReady();
+            channelRef = new TRef<ChannelContract.Imp:ReadyState>(cep);
+        }
+
+        internal void Start()
+        {
+            ServiceControlContract.Imp:Ready! control;
+
+            foreach (BenchmarkServerInfo server in serverList) {
+                if (server == null) {
+                    continue;
+                }
+                
+                // Launch the benchmark server
+                if (!StartService(server)) {
+                    return;
+                }
+
+                // Wait for the server registered.
+                Thread.Sleep(2000);
+
+                // Start the evaluation
+                JobSet.Start(server, serverControlRef);
+
+                // shutdown server
+                if (!StopService()) {
+                    return;
+                }
+                Thread.Sleep(2000);
+            }
+        }
+
+        private bool StartService(BenchmarkServerInfo! info)
+        {
+            bool success = false;
+
+            ServiceInfo* in ExHeap serviceInfo;
+            ServiceManagementContract.Imp!  ep;
+            ServiceControlContract.Imp!     client;
+            ServiceControlContract.Exp!     server;
+
+            Console.Write("Starting service: " + info.ServiceName + " ...");
+            GetEndpoint(out ep);
+            ep.RecvSuccess();
+
+            Console.Write(".");
+            ServiceControlContract.NewChannel(out client, out server);
+            serviceInfo = new [ExHeap] ServiceInfo(0,
+                                                   info.ServiceName,
+                                                   info.BinaryName,
+                                                   info.Type);
+            ep.SendBind(serviceInfo, server);
+            switch receive {
+                case ep.AckBind():
+                {
+                    break;
+                }
+                case ep.NotFound(rejected):
+                {
+                    delete rejected;
+                    Console.WriteLine("Doesn't exist.");
+                    goto exit;
+                    break;
+                }
+                case ep.PermissionDenied(rejected):
+                {
+                    delete rejected;
+                    Console.WriteLine("Permission denied");
+                    goto exit;
+                    break;
+                }
+            }
+
+            client.RecvSuccess();
+            client.SendStartService();
+            switch receive {
+                case client.RecvAckStartService():
+                {
+                    Console.WriteLine(" done.");
+                    success = true;
+                    break;
+                }
+                case client.NakStartService(error):
+                {
+                    Console.WriteLine(" error: " + error);
+                    break;
+                }
+                case client.ChannelClosed():
+                {
+                    Console.WriteLine(" Channel is closed.");
+                    break;
+                }
+            }
+
+exit:
+            if (success) {
+                serverControlRef =
+                    new TRef<ServiceControlContract.Imp:Ready>(client);
+                manageRef =
+                    new TRef<ServiceManagementContract.Imp:Ready>(ep);
+            }
+            else {
+                delete client;
+                delete ep;
+            }
+            return success;
+        }
+
+        private bool StopService()
+        {
+            bool success = false;
+            ServiceControlContract.Imp! client;
+
+            Console.Write("Stopping service ...");
+
+            client = serverControlRef.Acquire();
+            client.SendStopService();
+            switch receive {
+                case client.AckStopService():
+                {
+                    Console.WriteLine(" done.");
+                    success = true;
+                    break;
+                }
+                case client.NakStopService(error):
+                {
+                    Console.WriteLine(" error: " + error);
+                    break;
+                }
+                case unsatisfiable:
+                {
+                    break;
+                }
+            }
+            delete client;
+            delete manageRef.Acquire();
+            return success;
+        }
+
+        private void GetEndpoint(out ServiceManagementContract.Imp! ep)
+        {
+            ErrorCode error;
+            DirectoryServiceContract.Imp ds;
+            ServiceManagementContract.Exp! scServer;
+            ServiceManagementContract.NewChannel(out ep, out scServer);
+
+            ds = DirectoryService.NewClientEndpoint();
+            SdsUtils.Bind(ServiceManagementContract.ModuleName,
+                          ds,
+                          scServer, out error);
+            delete ds;
+        }
+
+        internal static int DefaultMain(DefaultConfig! config)
+        {
+            LogBenchmark bench;
+            BenchmarkServerInfo[] serverInfo = new BenchmarkServerInfo[4] {
+                new BenchmarkServerInfo("RBench", "RBenchWorker",
+                                        ServiceType.Default),
+                new BenchmarkServerInfo("RBench", "RBenchWorker",
+                                        ServiceType.Resilient),
+                new BenchmarkServerInfo("RBench", "RBenchHoisted",
+                                        ServiceType.Default),
+                new BenchmarkServerInfo("RBench", "RBenchHoisted",
+                                        ServiceType.Resilient),
+            };
+
+            StringBuilder   builder = new StringBuilder();
+            ulong[]         time = new ulong[4];
+            Object          obj;
+
+            for (int i = 0; i < 4; i++) {
+                time[i] = 0;
+            }
+            for (int i = 0; i < 100; i++) {
+                time[0] += Processor.GetCycleCount();
+                obj = new Object();
+                time[1] += Processor.GetCycleCount();
+                obj.ToString();
+                time[2] += Processor.GetCycleCount();
+                obj.ToString();
+                time[3] += Processor.GetCycleCount();
+            }
+            for (int i = 0; i < 4; i++) {
+                time[i] /= 100;
+            }
+            builder.AppendFormat("New object: {0}\n", time[1] - time[0]);
+            builder.AppendFormat("ToString1:  {0}\n", time[2] - time[1]);
+            builder.AppendFormat("ToString2:  {0}\n", time[3] - time[2]);
+
+            Console.WriteLine(builder.ToString());
+            DebugStub.WriteLine(builder.ToString());
+
+            bench = new LogBenchmark(serverInfo,
+                                     config.processRef.Acquire(),
+                                     config.memoryRef.Acquire(),
+                                     config.channelRef.Acquire());
+            bench.Start();
+ 
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/Benchmark/Message.sg b/base/Applications/ServiceManager/Benchmark/Message.sg
new file mode 100644
index 0000000..ea3184c
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/Message.sg
@@ -0,0 +1,150 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\Benchmark\Message.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using System.Text;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    internal class Message
+    {
+        private const int       MaxArguments = 9;
+        private static int[]    n = new int[MaxArguments];
+
+        static Message()
+        {
+            Random r = new Random();
+            for (int i = 0; i < MaxArguments; i++) {
+                n[i] = r.Next();
+            }
+        }
+
+        internal static bool SendReceive(BenchmarkContract.Imp:Ready! ep,
+                                         int num,
+                                         out ulong time1,
+                                         out ulong time2)
+        {
+            bool success = false;
+            
+            time1 = 0;
+            time2 = 0;
+            if (n == null) {
+                return false;
+            }
+
+            switch (num) {
+                case 0:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendNull();
+                    break;
+                case 1:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendOne(n[0]);
+                    break;
+                case 2:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendTwo(n[0], n[1]);
+                    break;
+                case 3:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendThree(n[0], n[1], n[2]);
+                    break;
+                case 4:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendFour(n[0], n[1], n[2], n[3]);
+                    break;
+                case 5:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendFive(n[0], n[1], n[2], n[3], n[4]);
+                    break;
+                case 6:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendSix(n[0], n[1], n[2], n[3], n[4], n[5]);
+                    break;
+                case 7:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendSeven(n[0], n[1], n[2], n[3], n[4], n[5], n[6]);
+                    break;
+                case 8:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendEight(n[0], n[1], n[2], n[3], n[4], n[5], n[6],
+                                 n[7]);
+                    break;
+                case 9:
+                    time1 = Processor.GetCycleCount();
+                    ep.SendNine(n[0], n[1], n[2], n[3], n[4], n[5], n[6],
+                                n[7], n[8]);
+                    break;
+                default:
+                    time1 = 0;
+                    time2 = 0;
+                    return false;
+                    break;
+            }
+
+            switch receive {
+                case ep.AckNull():
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckOne(num1):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckTwo(num1, num2):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckThree(num1, num2, num3):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckFour(num1, num2, num3, num4):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckFive(num1, num2, num3, num4, num5):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckSix(num1, num2, num3, num4, num5, num6):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckSeven(num1, num2, num3, num4, num5, num6, num7):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckEight(num1, num2, num3, num4, num5, num6, num7,
+                                 num8):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.AckNine(num1, num2, num3, num4, num5, num6, num7,
+                                num8, num9):
+                    time2 = Processor.GetCycleCount();
+                    success = true;
+                    break;
+                case ep.ChannelClosed():
+                    Console.WriteLine("Job: Server channel closed.\n");
+                    success = false;
+                    break;
+            }
+            return success;
+        }
+ 
+    } // class
+}
diff --git a/base/Applications/ServiceManager/Benchmark/MultiThreadJob.sg b/base/Applications/ServiceManager/Benchmark/MultiThreadJob.sg
new file mode 100644
index 0000000..32fac44
--- /dev/null
+++ b/base/Applications/ServiceManager/Benchmark/MultiThreadJob.sg
@@ -0,0 +1,325 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\Benchmark\MultiThreadJob.sg
+//
+//  Note:
+//
+using System;
+using System.Collections;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    internal sealed class RandomJob : Job
+    {
+        private readonly int    id;
+        private bool            keepAlive;
+        private ulong           messageCount;
+        private ulong           firstHalf;
+        private Thread          thread;
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal RandomJob(BenchmarkServerInfo! info, int tid)
+        {
+            base(info);
+            this.id = tid;
+            thread = new Thread(new ThreadStart(this.RunThread));
+        }
+
+        internal override bool Run()
+        {
+            thread.Start();
+            return true;
+        }
+
+        internal void Join()
+        {
+            thread.Join();
+        }
+
+        internal void Join(int timeout)
+        {
+            thread.Join(new TimeSpan(0, 0, 0, timeout));
+        }
+
+        internal void RunThread()
+        {
+            ulong   time1;
+            ulong   time2;
+
+            DebugStub.Print("RandomJob {0} start\n", __arglist(id));
+
+            BenchmarkContract.Imp:Ready! imp;
+            if (!Bind(out imp)) {
+                goto exit;
+            }
+            
+            messageCount = 0;
+            keepAlive = true;
+            while (keepAlive) {
+                imp.SendNull();
+                switch receive {
+                    case imp.AckNull():
+                        break;
+                    case unsatisfiable:
+                        goto exit;
+                        break;
+                }
+                messageCount += 2;
+            }
+
+            /*
+            imp.SendEndOfBenchmark();
+            switch receive {
+                case imp.AckEnd():
+                    break;
+                case imp.ChannelClosed():
+                    break;
+            }
+            */
+exit:
+            delete imp;
+            DebugStub.Print("RandomJob {0} stop\n", __arglist(id));
+        }
+
+        internal void Stop()
+        {
+            keepAlive = false;
+        }
+
+        internal void SwitchRecord()
+        {
+            firstHalf = messageCount;
+        }
+
+        internal ulong MessageCount
+        {
+            get { return messageCount; }
+            private set {}
+        }
+
+        internal ulong FirstHalf
+        {
+            get { return firstHalf; }
+            private set{}
+        }
+
+        internal ulong SecondHalf
+        {
+            get {return messageCount - firstHalf; }
+            private set{}
+        }
+    }
+
+    internal sealed class MultiThreadJob : Job
+    {
+        private const int   Order = 4;
+        private const int   NSamples = 10;
+        private ulong[,]     firstHalf = new ulong[Order, NSamples];
+        private ulong[,]     totalMessages = new ulong[Order, NSamples];
+        private ArrayList   jobList;
+
+        private TRef<ServiceControlContract.Imp:Ready> serverRef;
+
+        internal MultiThreadJob(BenchmarkServerInfo! info,
+                                TRef<ServiceControlContract.Imp:Ready>! tref)
+        {
+            base(info);
+            this.jobList = new ArrayList();
+            this.serverRef = tref;
+        }
+
+        internal override bool Run()
+        {
+            bool success = false;
+
+            Console.WriteLine("MultiThreadJob start");
+            DebugStub.WriteLine("-- MultiThreadJob start");
+
+            for (int i = 0; i < Order; i++) {
+                for (int j = 0; j < NSamples; j++) {
+                    CreateJobs(1 << i);
+                    StartJobs();
+                    Thread.Sleep(5000);
+
+                    Start2ndHalf();
+                    if (base.info.Type == ServiceType.Resilient) {
+                        success = RestartService();
+                    }
+                    else {
+                        DummyOperation();
+                        success = true;
+                    }
+                    Thread.Sleep(5000);
+                    DebugStub.WriteLine("Stop jobs...");
+                    StopJobs();
+                    CollectResults(i, j);
+                    DebugStub.WriteLine("Delete jobs...");
+                    DeleteJobs();
+                    if (!success) {
+                        break;
+                    }
+                    Thread.Sleep(2000);
+                }
+            }
+            return success;
+        }
+
+        private void CreateJobs(int numberOfJobs)
+        {
+            RandomJob   job;
+
+            for (int i = 0; i < numberOfJobs; i++) {
+                job = new RandomJob(base.info, i);
+                jobList.Add(job);
+            }
+        }
+
+        private void StartJobs()
+        {
+            RandomJob job;
+
+            foreach (Object obj in jobList) {
+                if (obj != null) {
+                    job = obj as RandomJob;
+                    if (job != null) {
+                        job.Run();
+                    }
+                }
+            }
+        }
+
+        private void Start2ndHalf()
+        {
+            RandomJob job;
+
+            foreach (Object obj in jobList) {
+                if (obj != null) {
+                    job = obj as RandomJob;
+                    if (job != null) {
+                        job.SwitchRecord();
+                    }
+                }
+            }
+        }
+
+        private void StopJobs()
+        {
+            RandomJob job;
+
+            foreach (Object obj in jobList) {
+                if (obj != null) {
+                    job = obj as RandomJob;
+                    if (job != null) {
+                        job.Stop();
+                    }
+                }
+            }
+
+            foreach (Object obj in jobList) {
+                if (obj != null) {
+                    job = obj as RandomJob;
+                    if (job != null) {
+                        job.Join(2000);
+                    }
+                }
+            }
+        }
+
+        private void DeleteJobs()
+        {
+            jobList.Clear();
+        }
+
+        private bool RestartService()
+        {
+            bool success = false;
+
+            ServiceControlContract.Imp:Ready! ep;
+
+            ep = serverRef.Acquire();
+            ep.SendRestartService();
+            switch receive {
+                case ep.AckRestartService():
+                {
+                    success = true;
+                    break;
+                }
+                case ep.ChannelClosed():
+                {
+                    success = false;
+                    break;
+                }
+            }
+            serverRef.Release(ep);
+            return success;
+        }
+
+        private void DummyOperation()
+        {
+            ServiceControlContract.Imp:Ready! ep;
+            ep = serverRef.Acquire();
+            ep.SendStopPoll();
+            switch receive {
+                case ep.AckStopPoll():
+                    break;
+                case ep.ChannelClosed():
+                    break;
+            }
+            serverRef.Release(ep);
+        }
+
+        private void CollectResults(int order, int sample)
+        {
+            RandomJob job;
+
+            foreach (Object obj in jobList) {
+                if (obj != null) {
+                    job = obj as RandomJob;
+                    if (job != null) {
+                        firstHalf[order, sample] = job.FirstHalf;
+                        totalMessages[order, sample] = job.MessageCount;
+                    }
+                }
+            }
+        }
+
+        public override String! ToString()
+        {
+            ulong half, total;
+            StringBuilder builder = new StringBuilder();
+
+            builder.Append("-- MultiThread Test (100 samples for each)");
+            builder.Append("(5 seconds for each half) --\n");
+            builder.Append("Client(s)  FirstHalf  SecondHalf   Total\n");
+            builder.Append("---------  ---------  ----------  -------\n");
+            for (int i = 0; i < Order; i++) {
+                half = 0;
+                total = 0;
+                for (int j = 0; j < NSamples; j++) {
+                    half += firstHalf[i, j];
+                    total += totalMessages[i, j];
+                }
+                half /= NSamples;
+                total /= NSamples;
+
+                builder.AppendFormat("{0, -9}  {1, 9}  {2, 10}  {3, 7}\n",
+                                     1 << i, half, total - half, total);
+            }
+            builder.Append("\n");
+            return builder.ToString();
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/Count/Count.csproj b/base/Applications/ServiceManager/Count/Count.csproj
new file mode 100644
index 0000000..19ab1cc
--- /dev/null
+++ b/base/Applications/ServiceManager/Count/Count.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Count</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Count.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/ServiceManager/Count/Count.sg b/base/Applications/ServiceManager/Count/Count.sg
new file mode 100644
index 0000000..b89b678
--- /dev/null
+++ b/base/Applications/ServiceManager/Count/Count.sg
@@ -0,0 +1,89 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Applications\ServiceManager\CountUp\CountUp.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Services;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Counter client", DefaultAction=true)]
+    internal class DefaultConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+        
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter("interval", Position=0, Default=500)]
+        internal long interval;
+
+        reflective internal DefaultConfig();
+
+        internal int AppMain()
+        {
+            return CountUp.DefaultMain(this);
+        }
+    }
+
+    public class CountUp
+    {
+        internal static int DefaultMain(DefaultConfig! config)
+        {
+            bool next;
+            ErrorCode error;
+            DirectoryServiceContract.Imp ds;
+            CounterContract.Imp! ep;
+            CounterContract.Exp! server;
+            CounterContract.NewChannel(out ep, out server);
+
+            ds = DirectoryService.NewClientEndpoint();
+            SdsUtils.Bind(CounterContract.ModuleName, ds, server, out error);
+
+            ep.RecvSuccess();
+
+            Console.WriteLine("Start count");
+            ep.SendBeginCount();
+            do {
+                switch receive {
+                    case ep.RecvCurrent(number):
+                        Console.WriteLine("Count: " + number);
+                        Thread.Sleep((int)config.interval);
+                        ep.SendNext();
+                        next = true;
+                        break;
+                    case ep.RecvTerminated():
+                        Console.WriteLine("Terminated...");
+                        next = false;
+                        break;
+                    case ep.ChannelClosed():
+                        Console.WriteLine("Channel closed...");
+                        next = false;
+                        break;
+                }
+            } while (next);
+
+            delete ds;
+            delete ep;
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/Replace/ReplaceGame.csproj b/base/Applications/ServiceManager/Replace/ReplaceGame.csproj
new file mode 100644
index 0000000..122bc57
--- /dev/null
+++ b/base/Applications/ServiceManager/Replace/ReplaceGame.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ReplaceGame</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ReplaceGame.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/ServiceManager/Replace/ReplaceGame.sg b/base/Applications/ServiceManager/Replace/ReplaceGame.sg
new file mode 100644
index 0000000..6f2ad8e
--- /dev/null
+++ b/base/Applications/ServiceManager/Replace/ReplaceGame.sg
@@ -0,0 +1,399 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Applications\ServiceManager\Replace\ReplaceGame.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Replace Game Client", DefaultAction=true)]
+    internal class DefaultConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+        
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter("interval", Default=500)]
+        internal long interval;
+
+        [BoolParameter("test", Default=true)]
+        internal bool test;
+
+        reflective internal DefaultConfig();
+
+        internal int AppMain()
+        {
+            return ReplaceGame.DefaultMain(this);
+        }
+    }
+
+    internal sealed class ReplaceGame
+    {
+        private const int   DefaultCount = 50;
+        private int         count;
+        private String![]!  names;
+        private int         self;
+        private Random!     random;
+
+        private const int   NumberOfActions = 4;
+        private enum        Action : int { Overwrite, Protect, Score, Pose };
+
+        private static TRef<ServiceControlContract.Imp:Ready>!       controlRef;
+        private static TRef<ServiceManagementContract.Imp:Ready>!    manageRef;
+
+        internal ReplaceGame(String![]! competitors, int self)
+        {
+            this.count = DefaultCount;
+            this.names = competitors;
+            this.self = self;
+            Thread.Sleep(1);    // To get a different seed
+            this.random = new Random();
+        }
+
+        internal void Run()
+        {
+            int                     action;
+            GamePlayerContract.Imp! ep;
+
+            if (!Connect(out ep)) {
+                goto exit;
+            }
+
+            switch receive {
+                case ep.Success():
+                    break;
+                case unsatisfiable:
+                    goto exit;
+                    break;
+            }
+
+            Score(ep);
+            Console.WriteLine(names[self] + " start!!");
+            try {
+                while (count-- > 0) {
+                    action = random.Next(NumberOfActions);
+                    switch ((Action)action) {
+                        case Action.Overwrite:
+                            Console.WriteLine(names[self] + " overwrite");
+                            Overwrite(ep);
+                            break;
+                        case Action.Protect:
+                            Console.WriteLine(names[self] + " protect");
+                            Protect(ep);
+                            break;
+                        case Action.Score:
+                            Console.WriteLine(names[self] + " score");
+                            Score(ep);
+                            break;
+                        case Action.Pose:
+                            Pose();
+                            break;
+                    }
+                }
+                Console.WriteLine(names[self] + " end!!");
+                Score(ep);
+            }
+            catch (Exception e) {
+                DebugStub.Print(e.ToString());
+            }
+exit:
+            delete ep;
+        }
+
+        private void Overwrite(GamePlayerContract.Imp:Ready! ep)
+        {
+            int pos = -1;
+            DebugStub.Print("Enter overwrite\n");
+
+            ep.SendSearch(Bitter.FromString2(GetSomeone()));
+            switch receive {
+                case ep.AckSearch(position):
+                    pos = position;
+                    break;
+                case ep.ChannelClosed():
+                    //throw new ChannelClosedException();
+                    break;
+            }
+
+            if (pos >= 0) {
+                ep.SendOverwrite(Bitter.FromString2(names[self]), pos);
+                switch receive {
+                    case ep.AckOverwrite():
+                        break;
+                    case ep.ChannelClosed():
+                        //throw new ChannelClosedException();
+                        break;
+                }
+            }
+            DebugStub.Print("Exit overwrite\n");
+        }
+
+        private void Protect(GamePlayerContract.Imp:Ready! ep)
+        {
+            int pos = -1;
+            ep.SendSearch(Bitter.FromString2(names[self]));
+            switch receive {
+                case ep.AckSearch(position):
+                    pos = position;
+                    break;
+                case ep.ChannelClosed():
+                    //throw new ChannelClosedException();
+                    break;
+            }
+            if (pos >= 0) {
+                ep.SendProtect(pos);
+                switch receive {
+                    case ep.AckProtect():
+                        break;
+                    case ep.ChannelClosed():
+                        //throw new ChannelClosedException();
+                        break;
+                }
+            }
+        }
+
+        private void Score(GamePlayerContract.Imp:Ready! ep)
+        {
+            ep.SendScore(Bitter.FromString2(names[self]));
+            switch receive {
+                case ep.AckScore(score):
+                    Console.Write("{0, -10} : {1}\n", names[self], score);
+                    break;
+                case ep.ChannelClosed():
+                    //throw new ChannelClosedException();
+                    break;
+            }
+        }
+
+        private void Pose()
+        {
+            Thread.Sleep(100);
+        }
+
+        private String! GetSomeone()
+        {
+            int index;
+            do {
+                index = random.Next(names.Length);
+            } while (index == self);
+            return names[index];
+        }
+ 
+        internal bool Connect(out GamePlayerContract.Imp! ep)
+        {
+            DirectoryServiceContract.Imp!   ds;
+            GamePlayerContract.Imp!         imp;
+            GamePlayerContract.Exp!         exp;
+            ErrorCode                       error;
+ 
+            ds = DirectoryService.NewClientEndpoint();
+            GamePlayerContract.NewChannel(out imp, out exp);
+            SdsUtils.Bind(GamePlayerContract.ModuleName, ds, exp, out error);
+            ep = imp;
+            delete ds;
+            return (error == ErrorCode.NoError);
+        }
+
+        //--------------------------------------------------------------------
+        //  Test Code
+        //--------------------------------------------------------------------
+
+        private static bool StartService()
+        {
+            bool success = false;
+
+            ServiceInfo* in ExHeap          serviceInfo;
+            ServiceManagementContract.Imp!  ep;
+            ServiceControlContract.Imp!     imp;
+            ServiceControlContract.Exp!     exp;
+
+            Console.Write("Starting service: " +
+                          GamePlayerContract.ModuleName + " ...");
+            GetEndpoint(out ep);
+            ep.RecvSuccess();
+
+            ServiceControlContract.NewChannel(out imp, out exp);
+            serviceInfo = new [ExHeap] ServiceInfo(0,
+                                                   GamePlayerContract.ModuleName,
+                                                   GamePlayerContract.ModuleName,
+                                                   ServiceType.Resilient);
+            ep.SendBind(serviceInfo, exp);
+            switch receive {
+                case ep.AckBind():
+                {
+                    break;
+                }
+                case ep.NotFound(rejected):
+                {
+                    delete rejected;
+                    Console.WriteLine("Doesn't exist.");
+                    goto exit;
+                    break;
+                }
+                case ep.PermissionDenied(rejected):
+                {
+                    delete rejected;
+                    Console.WriteLine("Permission denied");
+                    goto exit;
+                    break;
+                }
+            }
+
+            imp.RecvSuccess();
+            imp.SendStartService();
+            switch receive {
+                case imp.RecvAckStartService():
+                {
+                    Console.WriteLine(" done.");
+                    success = true;
+                    break;
+                }
+                case imp.NakStartService(error):
+                {
+                    Console.WriteLine(" error: " + error);
+                    break;
+                }
+                case imp.ChannelClosed():
+                {
+                    Console.WriteLine(" Channel is closed.");
+                    break;
+                }
+            }
+
+exit:
+            if (success) {
+                controlRef =
+                    new TRef<ServiceControlContract.Imp:Ready>(imp);
+                manageRef =
+                    new TRef<ServiceManagementContract.Imp:Ready>(ep);
+            }
+            else {
+                delete imp;
+                delete ep;
+            }
+            return success;
+        }
+
+        private static bool RestartService()
+        {
+            bool success = false;
+            ServiceControlContract.Imp:Ready! ep;
+
+            ep = controlRef.Acquire();
+            ep.SendRestartService();
+            switch receive {
+                case ep.AckRestartService():
+                {
+                    success = true;
+                    break;
+                }
+                case ep.ChannelClosed():
+                {
+                    success = false;
+                    break;
+                }
+            }
+            controlRef.Release(ep);
+            return success;
+        }
+
+        private static bool StopService()
+        {
+            bool success = false;
+            ServiceControlContract.Imp:Ready!   ep;
+
+            Console.Write("Stopping service ...");
+
+            ep = controlRef.Acquire();
+            ep.SendStopService();
+            switch receive {
+                case ep.AckStopService():
+                {
+                    Console.WriteLine(" done.");
+                    success = true;
+                    break;
+                }
+                case ep.NakStopService(error):
+                {
+                    Console.WriteLine(" error: " + error);
+                    break;
+                }
+            }
+            delete ep;
+            delete manageRef.Acquire();
+            return success;
+        }
+
+        private static void GetEndpoint(out ServiceManagementContract.Imp! ep)
+        {
+            ErrorCode error;
+            DirectoryServiceContract.Imp ds;
+            ServiceManagementContract.Exp! scServer;
+            ServiceManagementContract.NewChannel(out ep, out scServer);
+
+            DebugStub.Print("GetEndpoint\n");
+            ds = DirectoryService.NewClientEndpoint();
+            SdsUtils.Bind(ServiceManagementContract.ModuleName, ds, scServer,
+                          out error);
+            DebugStub.Print("GetEndpoint: {0}\n", __arglist((int)error));
+            delete ds;
+        }
+
+
+        internal static int DefaultMain(DefaultConfig! config)
+        {
+            // bang! bang! bang!
+            String![]!      names = new String![4] {"Microsoft", "Google", "Yahoo", "Apple"};
+            ReplaceGame![]! game = new ReplaceGame![4];
+            Thread![]!      players = new Thread![4];
+
+            if (config.test) {
+                StartService();
+                Thread.Sleep(2000);
+            }
+
+            for (int i = 0; i < 4; i++) {
+                game[i] = new ReplaceGame(names, i);
+                players[i] = new Thread(new ThreadStart(game[i].Run));
+            }
+            foreach (Thread! player in players) {
+                player.Start();
+            }
+
+            if (config.test) {
+                Thread.Sleep(8000);
+                RestartService();
+            }
+
+            foreach (Thread! player in players) {
+                player.Join();
+            }
+
+            if (config.test) {
+                StopService();
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/SMSClient/SMSClient.cs b/base/Applications/ServiceManager/SMSClient/SMSClient.cs
new file mode 100644
index 0000000..ae62b40
--- /dev/null
+++ b/base/Applications/ServiceManager/SMSClient/SMSClient.cs
@@ -0,0 +1,313 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Applications\ServiceManager\SMSClient\SMSClient.sg
+//
+//  Note:   Service Manager client program
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Contracts;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.ServiceManager;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    [ConsoleCategory(HelpMessage="Service management client", DefaultAction=true)]
+    internal class DefaultConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DefaultConfig();
+
+        internal int AppMain()
+        {
+            return SMSClient.DefaultMain(this);
+        }
+    }
+
+    [ConsoleCategory(Action="start", HelpMessage="Start a service")]
+    internal class StartConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter("service", Mandatory=true, Position=0)]
+        internal string service;
+
+        [StringParameter("type", Mandatory=false, Position=1)]
+        internal string type;
+
+        reflective internal StartConfig();
+
+        internal int AppMain()
+        {
+            return SMSClient.StartService(this);
+        }
+    }
+
+    [ConsoleCategory(Action="stop", HelpMessage="Stop a service")]
+    internal class StopConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        //[StringParameter("service", Mandatory=true, Position=0)]
+        //internal string service;
+
+        [LongParameter("id", Mandatory=true, Position=0)]
+        internal long id;
+
+        reflective internal StopConfig();
+
+        internal int AppMain()
+        {
+            return SMSClient.StopService(this);
+        }
+    }
+
+    [ConsoleCategory(Action="restart", HelpMessage="Restart a service")]
+    internal class RestartConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter("service", Mandatory=true, Position=0)]
+        internal string service;
+
+        reflective internal RestartConfig();
+
+        internal int AppMain()
+        {
+            return SMSClient.RestartService(this);
+        }
+    }
+
+    [ConsoleCategory(Action="list", HelpMessage="Show a list of services")]
+    internal class ListConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal ListConfig();
+
+        internal int AppMain()
+        {
+            return SMSClient.ListServices(this);
+        }
+    }
+
+    public class SMSClient
+    {
+        private static void GetEndpoint(out ServiceManagementContract.Imp! ep)
+        {
+            ErrorCode error;
+            DirectoryServiceContract.Imp    ds;
+            ServiceManagementContract.Exp!  scServer;
+            ServiceManagementContract.NewChannel(out ep, out scServer);
+
+            ds = DirectoryService.NewClientEndpoint();
+            SdsUtils.Bind(ServiceManagementContract.ModuleName, ds,
+                          scServer, out error);
+            delete ds;
+        }
+
+        internal static int StartService(StartConfig! config)
+        {
+            int         res = 1;
+            ServiceType type = ServiceType.Unknown;
+            ServiceInfo* in ExHeap          info;
+            ServiceManagementContract.Imp!  ep;
+            ServiceControlContract.Imp!     client;
+            ServiceControlContract.Exp!     server;
+
+            switch (config.type)
+            {
+                case "Resilient":
+                    type = ServiceType.Resilient;
+                    break;
+                case "Default":
+                    type = ServiceType.Default;
+                    break;
+                default:
+                    type = ServiceType.Default;
+                    break;
+            }
+
+            Console.Write("Starting service: " + config.service + " ... ");
+            GetEndpoint(out ep);
+            ep.RecvSuccess();
+
+            ServiceControlContract.NewChannel(out client, out server);
+            info = new[ExHeap] ServiceInfo(0, config.service, config.service,
+                                           type);
+            ep.SendBind(info, server);
+            switch receive {
+                case ep.AckBind():
+                    break;
+                case ep.NotFound(rejected):
+                    delete rejected;
+                    Console.WriteLine("Doesn't exist.");
+                    goto exit;
+                    break;
+                case ep.PermissionDenied(rejected):
+                    delete rejected;
+                    Console.WriteLine("Permission denied");
+                    goto exit;
+                    break;
+            }
+
+            client.RecvSuccess();
+            client.SendStartService();
+            switch receive {
+                case client.RecvAckStartService():
+                    Console.WriteLine("done.");
+                    res = 0;
+                    break;
+                case client.NakStartService(error):
+                    Console.WriteLine("Error code: " + error);
+                    break;
+                case client.ChannelClosed():
+                    Console.WriteLine("Channel is closed.");
+                    break;
+            }
+exit:
+            delete client;
+            delete ep;
+            return res;
+        }
+
+        internal static int StopService(StopConfig! config)
+        {
+            int res = 1;
+            ServiceManagementContract.Imp!  ep;
+            ServiceControlContract.Imp!     client;
+            ServiceControlContract.Exp!     server;
+
+            Console.Write("Stopping service: " + config.id + " ... ");
+            GetEndpoint(out ep);
+            ep.RecvSuccess();
+
+            ServiceControlContract.NewChannel(out client, out server);
+            ep.SendGetControl((int)config.id, server);
+            switch receive {
+                case ep.RecvAckGetControl():
+                    break;
+                case ep.NotFound(rejected):
+                    delete rejected;
+                    Console.WriteLine("Doesn't exist.");
+                    goto exit;
+                    break;
+                case ep.PermissionDenied(rejected):
+                    delete rejected;
+                    Console.WriteLine("Permission denied");
+                    goto exit;
+                    break;
+                case ep.TryAgain(rejected):
+                    delete rejected;
+                    Console.WriteLine("Busy!");
+                    goto exit;
+                    break;
+            }
+
+            client.RecvSuccess();
+            client.SendStopService();
+            switch receive {
+                case client.AckStopService():
+                    Console.WriteLine("done.");
+                    res = 0;
+                    break;
+                case client.NakStopService(error):
+                    Console.WriteLine("Error code: " + error);
+                    break;
+            }
+exit:
+            delete client;
+            delete ep;
+            return res;
+        }
+
+        internal static int RestartService(RestartConfig! config)
+        {
+            Console.WriteLine("-- Sorry, not implemented yet.");
+            return 1;
+        }
+
+        internal static int ListServices(ListConfig! config)
+        {
+            bool    next = false;
+            int     count = 0;
+            ServiceManagementContract.Imp! ep;
+
+            GetEndpoint(out ep);
+            ep.RecvSuccess();
+            ep.SendBeginEnumeration();
+
+            Console.WriteLine();
+            Console.WriteLine("PID Task Name");
+            Console.WriteLine("=== ===================");
+            do {
+                switch receive {
+                    case ep.RecvCurrent(info):
+                        ++count;
+                        Console.WriteLine("{0,3} {1,-19}",
+                                          info->Id, info->Name);
+                        delete info;
+                        ep.SendMoveNext();
+                        next = true;
+                        break;
+                    case ep.RecvEnumerationTerminated():
+                        next = false;
+                        break;
+                    case ep.ChannelClosed():
+                        next = false;
+                        break;
+                }
+            } while (next);
+            Console.WriteLine();
+            Console.WriteLine(count + " services are found.");
+
+            delete ep;
+            return 0;
+        }
+
+        internal static int DefaultMain(DefaultConfig! config)
+        {
+            Console.WriteLine("Usage: svconf <command> [name] [type]");
+            Console.WriteLine("  @start     Start the service");
+            Console.WriteLine("  @stop      Stop the service");
+            //Console.WriteLine("  @restart   Restart the service");
+            Console.WriteLine("  @list      Show a list of running services");
+            Console.WriteLine("  type: Default or Resilient");
+
+            return 0;
+        }
+    }
+}
+
diff --git a/base/Applications/ServiceManager/SMSClient/SMSClient.csproj b/base/Applications/ServiceManager/SMSClient/SMSClient.csproj
new file mode 100644
index 0000000..8f459c7
--- /dev/null
+++ b/base/Applications/ServiceManager/SMSClient/SMSClient.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>svconf</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SMSClient.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/ServiceManager/ServiceManager.proj b/base/Applications/ServiceManager/ServiceManager.proj
new file mode 100644
index 0000000..3185c57
--- /dev/null
+++ b/base/Applications/ServiceManager/ServiceManager.proj
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <ItemGroup>
+    <ProjectReference Include="*/*.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/ServiceManager/TryEnter/Main.sg b/base/Applications/ServiceManager/TryEnter/Main.sg
new file mode 100644
index 0000000..c5d18f7
--- /dev/null
+++ b/base/Applications/ServiceManager/TryEnter/Main.sg
@@ -0,0 +1,110 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.ServiceManager
+{
+    [ConsoleCategory(HelpMessage="TryEnter Test", DefaultAction=true)]
+    internal class DefaultConfig
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+        
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DefaultConfig();
+
+        internal int AppMain()
+        {
+            return Main.AppMain(this);
+        }
+    }
+
+
+    internal class Worker
+    {
+        private Main!   parent;
+        private int     id;
+
+        internal Worker(Main! parent, int id)
+        {
+            this.parent = parent;
+            this.id = id;
+        }
+
+        internal void Run()
+        {
+            Console.WriteLine("Thread {0} start\n", id);
+            for (int i = 0; i < 10; i++) {
+                parent.Enter(id);
+                Thread.Sleep(100);
+            }
+            Console.WriteLine("Thread {0} end\n", id);
+        }
+    }
+
+    internal class Main
+    {
+        private Object! mutex = new Object();
+        private int     count = 0;
+
+        public void Start(int number)
+            requires number >= 0;
+        {
+            Thread![]   thread = new Thread![number];
+            Worker[]    worker = new Worker[number];
+
+            for (int i = 0; i < number; i++) {
+                worker[i] = new Worker(this, i);
+                thread[i] = new Thread(new ThreadStart(worker[i].Run));
+            }
+
+            for (int i = 0; i < number; i++) {
+                thread[i].Start();
+            }
+
+            for (int i = 0; i < number; i++) {
+                thread[i].Join();
+            }
+        }
+
+        internal void Enter(int id)
+        {
+            assert mutex != null;
+
+            Console.WriteLine("{0} try enter", id);
+            if (!Monitor.TryEnter(mutex)) {
+                // Never reached here
+                Console.WriteLine("{0} couldn't get monitor", id);
+                ++count;
+                return;
+            }
+            Console.WriteLine("{0} got monitor", id);
+            Thread.Sleep(1000);
+            Monitor.Exit(mutex);
+            Console.WriteLine("{0} exit (count: {1})", id, count);
+        }
+
+        internal static int AppMain(DefaultConfig! config)
+        {
+            new Main().Start(4);
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/ServiceManager/TryEnter/TryEnterTest.csproj b/base/Applications/ServiceManager/TryEnter/TryEnterTest.csproj
new file mode 100644
index 0000000..594c18d
--- /dev/null
+++ b/base/Applications/ServiceManager/TryEnter/TryEnterTest.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>TryEnterTest</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Main.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Shell/Breaker.cs b/base/Applications/Shell/Breaker.cs
new file mode 100644
index 0000000..91921c7
--- /dev/null
+++ b/base/Applications/Shell/Breaker.cs
@@ -0,0 +1,65 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Breaker.cs
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class Breaker
+    {
+        private static Object ToObject(StringBuilder sb)
+        {
+            return (Object)sb;
+        }
+
+        public static void Break(int how)
+        {
+            if (how == 2) {
+                Console.WriteLine("Breaking into kernel debugger with write to page zero.");
+                DebugStub.WriteLine("About to write to page zero.");
+                StringBuilder sb = new StringBuilder(128);
+                Object o = ToObject(sb);
+                unsafe {
+                    byte *buffer = null;
+                    *buffer = 0xff;
+                }
+                sb = new StringBuilder(256);
+                DebugStub.WriteLine("sb={0}, o={1}", __arglist(sb, o));
+            }
+            else if (how == 1) {
+                Console.WriteLine("Breaking into kernel debugger with read from page zero.");
+                DebugStub.WriteLine("About to read from page zero.");
+                StringBuilder sb = new StringBuilder(128);
+                Object o = ToObject(sb);
+                byte b;
+                unsafe {
+                    byte *buffer = null;
+                    b = *buffer;
+                }
+                sb = new StringBuilder(256);
+                DebugStub.WriteLine("sb={0}, o={1}, b={2}", __arglist(sb, o, b));
+            }
+            else if (how == 2) {
+                Console.WriteLine("Breaking into kernel debugger.");
+                DebugStub.WriteLine("About to break into kernel debugger");
+                StringBuilder sb = new StringBuilder(128);
+                Object o = ToObject(sb);
+
+                DebugStub.Break();
+                sb = new StringBuilder(256);
+                DebugStub.WriteLine("sb={0}, o={1}", __arglist(sb, o));
+            }
+        }
+    }
+}
diff --git a/base/Applications/Shell/Logo.bmp b/base/Applications/Shell/Logo.bmp
new file mode 100644
index 0000000..45f448d
Binary files /dev/null and b/base/Applications/Shell/Logo.bmp differ
diff --git a/base/Applications/Shell/Manifest.sg b/base/Applications/Shell/Manifest.sg
new file mode 100644
index 0000000..165ef5a
--- /dev/null
+++ b/base/Applications/Shell/Manifest.sg
@@ -0,0 +1,292 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Manifest.cs
+//
+//  Note:   Creates and binds endpoints using a manifest.
+//
+
+using System;
+using System.Text;
+using System.Collections;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Applications
+{
+
+    /// <summary>
+    /// This is a placeholder class for an application's manifest.
+    /// At present the application manifest is represented by a hashtable.
+    /// The hashtable has several important properties:
+    ///  - name: the name of the application
+    ///  - path: path to the application executable
+    /// </summary>
+    public class Manifest
+    {
+        /// <summary>
+        /// We treat the application manifest as a collection of
+        /// key, value pairs.
+        /// </summary>
+
+
+        private Hashtable! data = new Hashtable();
+        private const string pipeContract = "Microsoft.Singularity.Io.UnicodePipeContract"; 
+        
+        private string name;
+        private string path;
+
+        private readonly XmlNode!       applicationNode;
+        private readonly XmlNode!       processNode;
+        private readonly XmlNode        actionNode;
+        private readonly XmlNode        categoriesNode;
+        private readonly XmlNode        stringParametersNode;
+        private readonly XmlNode        stringArrayParametersNode;
+        private readonly XmlNode        longParametersNode;
+        private readonly XmlNode        boolParametersNode;
+        private static StringBuilder    sb; 
+
+        /// <summary>
+        /// Create a manifest object from the given xml representation
+        /// </summary>
+
+        [Microsoft.Contracts.NotDelayed]
+        public Manifest(byte[] xml)
+        {
+            XmlReader! reader = new XmlReader(xml);
+            XmlNode! doc = (!)reader.Parse();
+
+            this(doc);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        private Manifest(XmlNode! doc)
+        {
+            XmlNode app = (!)doc.GetChild("application");
+            name = app["name"];
+            XmlNode proc = null;
+            foreach (XmlNode! process in app.Children) {
+                if (process.Name != "process") {
+                    continue;
+                }
+                if (process.GetAttribute("main", "false") == "true") {
+                    path = process["path"];
+                    proc = process;
+                    break;
+                }
+            }
+            applicationNode = (!)app;
+            XmlNode! processNode = this.processNode = (!)proc;
+            base();
+            
+            categoriesNode = processNode.GetChild("categories");
+            
+            if (categoriesNode != null) {
+                    return;
+            }
+            else {
+                DebugStub.WriteLine("::: no category");
+            }
+        }
+
+        public XmlNode GetCategoriesNode()
+        {
+            return categoriesNode; 
+        }
+
+
+        public void SetProperty(object! name, object value)
+        {
+            data[name] = value;
+        }
+
+        public string Name
+        {
+            get {
+                return name;
+            }
+        }
+
+        public string Path
+        {
+            get {
+                return path;
+            }
+        }
+
+        public  string  GetHelpMessage(XmlNode categoryNode)
+        {
+                return categoryNode == null?  null :  categoryNode.GetAttribute("HelpMessage", null);
+        }
+        
+        
+        // given an action find the corresponding category node
+        public  XmlNode GetCategoryNode(string actionName) {
+            if (categoriesNode == null) {
+                //Console.WriteLine("GetCategoryNode: no categories!");
+                return null; 
+            }
+            if (actionName == null) {
+                // return the 1st one if there is one
+                //Console.WriteLine("GetCategoryNode: Selecting default!");
+                XmlNode n = categoriesNode.GetChild("category");
+                if (n == null) { 
+                        return null; 
+               } 
+               else return n; 
+            }
+            else {
+                foreach (XmlNode! c in categoriesNode.Children) {
+                    string a = c.GetAttribute("Action",null);
+                    //Console.WriteLine("action= {0}.",a);
+                    if ( a != null && a == actionName) {
+                        //Console.WriteLine("found a match for action {0}",actionName); 
+                        return c; 
+                    }
+                }
+                return null; 
+            }
+        }
+        
+        public  XmlNode GetBoolParameterNode(XmlNode! category)
+        {
+            return category.GetChild("BoolParameters");
+        }
+
+        public  XmlNode GetStringArrayParameterNode(XmlNode! category)
+        {
+            return category.GetChild("StringArrayParameters");
+        }
+
+        public  XmlNode GetStringParameterNode(XmlNode! category)
+        {
+            return category.GetChild("StringParameters");
+        }
+
+        public  XmlNode GetLongParameterNode(XmlNode! category)
+        {
+            return category.GetChild("LongParameters");
+        }
+        
+        public bool HasParameters() 
+        {
+            return (categoriesNode != null);
+        }
+
+#if false
+        public void ShowParameters()
+        {
+            if (categoryNode == null) {
+                Console.WriteLine("::: no category");
+                return; 
+            }  
+            if (stringParametersNode == null) {
+                Console.WriteLine("::: no strings");
+            }  
+            if (longParametersNode == null) {
+                Console.WriteLine("::: no integers");
+            }  
+        }
+#endif 
+        public int SetEndpoints(Process process, string action, bool show)
+        {
+            // walk the XmlTree looking endpoints
+            // these will be used by the binder to setup and transfer to
+            // the starting process much like what is done for drivers
+
+            XmlNode categoryNode = GetCategoryNode(action); 
+            //Console.WriteLine(" Set endpoints"); 
+            if (categoryNode == null) {
+                Console.WriteLine("No endpoints in console app!"); 
+                //DebugStub.Break(); 
+                return 0;
+            }
+
+            XmlNode endpoints = categoryNode.GetChild("endpoints");
+            if (endpoints == null) {
+                //DebugStub.Break(); 
+                return 0;
+            }
+            int endpointCount = endpoints.GetAttribute("length", 0);
+            if (endpointCount == 0) {
+                DebugStub.Break(); 
+                return 0;
+            }
+
+            //fill in ep set
+            foreach (XmlNode! endpoint in endpoints.Children) {
+                string! contract
+                    = (!)endpoint.GetAttribute("contractName", "");
+                int index = endpoint.GetAttribute("id", -1);
+
+                if (endpoint.Name == "endpoint") {
+                    // FIXFIX -- if it is a pipe ignore it for now
+                    if (show) {
+                        Console.WriteLine(" endpoint: {0}", contract); 
+                    } 
+                    else {
+                        if (contract != pipeContract) {
+                            // get a pre-bound generic endpoint to a service from the
+                            // resource tracker
+                            if (process == null) {
+                                throw new Exception("Process arg was null.");
+                            }
+                            if (!Binder.BindServiceUser(process, index, contract, endpoint)) {
+                                return -1;
+                            }
+                        }
+                        else { 
+                            DebugStub.WriteLine("shell.manifest.SetEndpoints: skipping pipe at {0}", __arglist(index));
+                        } 
+                    }
+                }
+            }
+            return endpointCount;
+        }
+        
+#if false
+        public override string! ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.AppendFormat("<application name=\"{0}\">", Name);
+
+            // the main executable
+            sb.AppendFormat("<process main=\"true\" path=\"{0}\"/>", Path);
+
+            foreach(DataItem item in data.Values) {
+                if (item.Directory == null) {
+                    sb.AppendFormat("<data name=\"{0}\" value=\"{1}\"/>",
+                                    item.Name, item.Value);
+                }
+                else {
+                    sb.AppendFormat("<data namespace=\"{0}\" name=\"{1}\" value=\"{2}\"/>",
+                                    item.Directory, item.Name, item.Value);
+                }
+            }
+
+            sb.Append("</process>");
+            sb.Append("</application>");
+            sb.Append("<signature>");
+            sb.Append("</signature>");
+
+            return sb.ToString();
+        }
+
+        public byte[] Serialize()
+        {
+            return (new UTF8Encoding()).GetBytes(ToString());
+        }
+#endif
+    }
+}
diff --git a/base/Applications/Shell/Parser.cs b/base/Applications/Shell/Parser.cs
new file mode 100644
index 0000000..83311d2
--- /dev/null
+++ b/base/Applications/Shell/Parser.cs
@@ -0,0 +1,233 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text.RegularExpressions;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Applications
+{
+    /**
+     * This is a general lr parser driver.
+     * Parses the programming by first lexing it into a number
+     * of tokens for a token stack. Then parser then pops tokens off
+     * this stack, consults the parse tables and push the corresponding
+     * nonterminals and states on the operand stack. This is the same
+     * algorithm from the dragon book with some tweaks to support optional
+     * tokens (i.e. newlines).
+     **/
+    abstract class Parser
+    {
+        private const int END_INPUT_MARKER_ID = 2;
+
+        protected abstract Action[,]! ActionTable { get; }
+        protected abstract State[,]! GotoTable { get; }
+        protected abstract Production[]! ProductionTable { get; }
+        protected abstract TokenType[]! TokenList { get; }
+
+
+        public class ParseException : Exception
+        {
+            public ParseException(Token! token, string! error)
+                : base("Parse error on line " + token.lineNumber + ", char " + token.charIndex + ": " + error) { }
+        }
+
+        public Object Parse(string! input)
+        {
+            Stack leftStack = new Stack();
+            leftStack.Push(new State(0));
+
+            ArrayList list = Lex(ref input);
+            list.Reverse(); //could return a stack out of lex instead
+            Stack rightStack = new Stack(list);
+            while (rightStack.Count != 0) {
+                State st = (State!)leftStack.Pop();
+                Token tok = (Token!)rightStack.Pop();
+                Action action = ActionTable[st.id, tok.id];
+                while (tok.optional && action == null && rightStack.Count != 0) {
+                    tok = (Token!)rightStack.Pop();
+                    action = ActionTable[st.id, tok.id];
+                }
+
+                if (action == null) {
+                    if (tok.id == END_INPUT_MARKER_ID) {
+                        throw new ParseException(tok, " unexpected EOF");
+                    }
+                    throw new ParseException(tok, "'" + tok.value + "' unexpected input");
+                }
+
+                if (action.type == ActionType.SHIFT) {
+                    leftStack.Push(st);
+                    leftStack.Push(tok);
+                    leftStack.Push(new State(action.stateOrProduction));
+                } else if (action.type == ActionType.REDUCE) {
+                    Production production = (!)ProductionTable[action.stateOrProduction];
+                    Object value = production.Reduction(leftStack);
+                    StackElement topLeft = (StackElement)leftStack.Pop();
+                    State previousState;
+                    if (topLeft is State) {
+                        previousState = (State)topLeft;
+                    } else {
+                        leftStack.Push(topLeft);
+                        previousState = st; /* took an epsilon transition */
+                    }
+                    State nextState = GotoTable[previousState.id, production.NonterminalType];
+                    if (nextState == null) throw new Exception("missing state");
+                    leftStack.Push(previousState);
+                    leftStack.Push(new Nonterminal(production.NonterminalType, value));
+                    leftStack.Push(nextState);
+                    rightStack.Push(tok);
+                } else if (action.type == ActionType.ACCEPT) {
+                    break;
+                }
+            }
+            Nonterminal result = (Nonterminal!)leftStack.Pop();
+            return result.value;
+        }
+
+        private static int CountOccurrences(string! input, char c, out int last)
+        {
+            int count = 0;
+            last = -1;
+            for (int i = 0; i < input.Length; ++i) {
+                if (c == input[i]) {
+                    ++count;
+                    last = i;
+                }
+            }
+            return count;
+        }
+
+        private static bool IsNewLine(char t) { return t == '\n'; }
+        public ArrayList! Lex(ref string! input)
+        {
+            ArrayList tokens = new ArrayList();
+            int lineNumber = 1;
+            int charIndex = 1;
+        outer:
+            while (input.Length != 0) {
+                foreach (TokenType! spec in TokenList) {
+                    Match! match = (!)spec.Regex.Match(input);
+                    if (match == null || !match.Success) continue;
+                    input = input.Remove(0, ((!)match.Value).Length);
+                    if (spec.Lexer != null) {
+                        Token token = new Token(spec.Type, match.Value, lineNumber, charIndex);
+                        spec.Lexer(token);
+                        if (token.value != null)
+                            tokens.Add(token);
+                    } else {
+                        tokens.Add(new Token(spec.Type, match.Value, lineNumber, charIndex));
+                    }
+                    int lastIndex;
+                    int occurrences = CountOccurrences(match.Value, '\n', out lastIndex);
+                    if (occurrences > 0) {
+                        lineNumber += occurrences;
+                        charIndex = match.Value.Length - (lastIndex + 1);
+                    } else {
+                        charIndex += match.Value.Length;
+                    }
+                    goto outer;
+                }
+                throw new Exception("unknown input: " + input);
+            }
+            tokens.Add(new Token(END_INPUT_MARKER_ID, null, lineNumber, charIndex));
+            return tokens;
+        }
+
+        public delegate Object Reducer(Stack! stack);
+        public delegate void Lexer(Token! tok);
+
+        public class Production
+        {
+            public readonly int NonterminalType;
+            public readonly Reducer Reduction;
+            public Production(int nonterminalType, [Delayed] Reducer reduction)
+            {
+                this.NonterminalType = nonterminalType;
+                this.Reduction = reduction;
+            }
+        }
+
+        public class StackElement
+        {
+            public readonly int id;
+            public Object value;
+            public StackElement(int id) { this.id = id; }
+            public override string! ToString()
+            {
+                return id.ToString();
+            }
+        }
+        public class State : StackElement
+        {
+            public State(int number) : base(number) { }
+
+        }
+        public class Token : StackElement
+        {
+            public readonly int lineNumber;
+            public readonly int charIndex;
+            public bool optional = false;
+            public Token(int type, Object value, int lineNumber, int charIndex)
+                : base(type)
+            {
+                this.value = value;
+                this.lineNumber = lineNumber;
+                this.charIndex = charIndex;
+                this.optional = optional;
+            }
+
+            public override string! ToString()
+            {
+                return value + ":" + id;
+            }
+        }
+        private class Nonterminal : StackElement
+        {
+            public Nonterminal(int type, Object value) : base(type) { this.value = value; }
+        }
+
+        public enum ActionType { SHIFT, REDUCE, ACCEPT }
+        public class Action
+        {
+            public ActionType type;
+            public int stateOrProduction;
+            public Action(ActionType type, int stateOrProduction)
+            {
+                this.type = type; this.stateOrProduction = stateOrProduction;
+            }
+            public override int GetHashCode()
+            {
+                return type.GetHashCode() ^ stateOrProduction.GetHashCode();
+            }
+            public override bool Equals(object obj)
+            {
+                Action that = obj as Action;
+                if (that == null) return false;
+                return this.type == that.type && this.stateOrProduction == that.stateOrProduction;
+            }
+
+            public override string! ToString()
+            {
+                return type + " " + stateOrProduction;
+            }
+        }
+
+        protected class TokenType
+        {
+            public readonly int Type;
+            public readonly Regex! Regex;
+            public readonly Lexer Lexer;
+            public TokenType(int type, Regex regex, [Delayed] Lexer lexer)
+            {
+                this.Type = type; this.Regex = (!)regex; this.Lexer = lexer;
+            }
+        }
+    }
+}
diff --git a/base/Applications/Shell/README.txt b/base/Applications/Shell/README.txt
new file mode 100644
index 0000000..b05f2d2
--- /dev/null
+++ b/base/Applications/Shell/README.txt
@@ -0,0 +1,198 @@
+Scripting Documentation 
+-----------------------
+This document provides a brief introduction to the script facilities of the shell.
+
+
+Command line arguments
+----------------------
+Variables can be passed to a script from the command line and accessed with
+$num where num is the number of the shell script variable. The number of
+command line variables is given by the $# variable.
+
+
+Comments
+--------
+Text following a # on a line is deemed a comment.
+
+
+Data types
+----------
+At the moment, the shell only supports primitive types such as integers, booleans, and strings.
+
+
+Variables
+---------
+Variables can be assigned to with a simple assignment construct.
+For instance, a = 'bc' assigns the string 'bc' to the variable a.
+Variables can be referenced by preceding the name with $ (e.q. echo $a)
+or with ${name} to separate the reference from surround text such as
+b = "surrounding${var}text". References to variables that have not been
+previously assigned are considered an error. An error message is printed
+and script execution is halted.
+
+
+Operators
+---------
+
+integer: *, / , %, +, -
+string: . (concatenation)
+boolean: ||, &&, !
+comparison: <, <=, ==, >=, >. 
+
+The integer operations coerce the
+operand types to ints. Therefore, "5" + "9" will call
+Int32.ParseInt() on both of these arguments. If one of the operands
+to an integer operator is boolean than true is converted to 1
+and false is converted to 0.
+
+String operators will call ToString on the value for an operand.
+
+Boolean operators: coerce operand types to booleans. In the case
+of integers, an integer equal to 0 is false while all other values
+are equivalent to true. For strings, a value is only coercible
+if it is either one of Boolean.TrueString (true) or Boolean.FalseString (false)
+(case-insensitive). 
+
+
+Comparison:
+Currently, comparison operators coerce both operands to the type of the left operand
+using the methods described thus far. 
+Stricter and more sensible typing may be implemented in the future.
+
+
+Expressions
+-----------
+Expressions can be constructed from variables, any of the basic primitive
+types and the set of operators. 
+
+
+Control Flow
+------------
+Language currently supports if, if-else, and while. The conditions to these constructs
+are arbitrary expressions that successfully evaluate to a boolean value. Bracing of the statements
+for these constructs is required to eliminate ambiguity.
+
+
+Commands
+--------
+Unfortunately, commands currently consist of a sequence of alpha-numeric words, a string
+literal, interpolation, or integer ending in a new line. Therefore and non-alpha-numeric characters (i.e. %)
+must be either placed in a string or interpolation. Hopefully, this will eventually change.
+
+
+Exit and Exit codes
+-----------
+The exit status of the last command is given by the $? variable.
+The built-in exit command takes optionally one integer argument indicating
+the exit code of the script execution. If no argument is specified, the status
+of the last executed command is returned. If no argument is given and no
+commands have been executed, then 0 is returned. This exit builtin differs from
+that of the shell prompt. That version performs a shutdown while this
+exits the script.
+
+
+
+Grammar
+-------
+SCRIPT => STMT_LIST
+
+STMT_LIST => STMT
+	| STMT STMT_LIST
+
+STMT => while( E ) { STMT_LIST }
+	| if( E ) { STMT_LIST }
+	| if( E ) { STMT_LIST } else { STMT_LIST }
+	| var = E newline
+
+
+E => integer_literal | string_literal | bool_literal | variable_reference | interpolation 
+    | E + E | E - E | E * E | E % E |
+    | E < E | E <= E | E == E | E >= E | E > E
+    | E . E 
+    | E && E | E || E | !E
+
+
+COMMAND_LINE=> COMMAND_LIST newline
+
+COMMAND_LIST => COM
+	| COM COMMAND_LIST
+
+COM =>  word
+	| variable_reference
+	| integer_literal
+	| string_literal
+        | interpolation
+
+Example (test script from Shell.sg )
+------------------------------------
+echo $2 #echo second argument
+decho $2
+echo number of arguments '=' $#
+decho number of arguments '=' $#
+				
+echo last command exit code '=' $?
+decho last command exit code '=' $?
+if (true) {
+	variable = false
+	if ($variable) { 
+		var2 = true
+		echo broken conditional 
+		decho broken conditional 
+	} 
+	else { 
+		var2 = true
+		output1 = "bet${variable}ween"
+		echo $output1
+		decho $output1
+	}
+	#some comments #
+	#
+	decho var2 is $var2
+	add = -2 + 4
+	echo '-2 + 4 =' $add
+	decho '-2 + 4 =' $add
+
+	mod = 6 % 5
+	echo '6 % 5 =' $mod
+	decho '6 % 5 =' $mod
+
+	div = 10 / 5
+	echo '10 / 5 =' $div
+	decho '10 / 5 =' $div
+					
+	mult = 2 * 5
+	echo '2 * 5=' $mult
+	decho '2 * 5=' $mult
+				
+	var1 = 5
+	var2 = 6
+					
+	if($var1 < $var2){ 
+		decho $var1 is less than $var2  
+		two = 1
+		power = 10
+		echo starting loop
+		decho starting loop
+		while($power > 0){
+			two = $(two) * 2
+			power = $power - 1
+		}
+		output2 = "2^10 = $two"
+		echo $output2
+		decho $output2
+	}
+	if ($var1 > $var2) {
+		echo $var2 is less than $var1
+		decho $var2 is less than $var1 
+	}
+	else {
+		output3 = 'var1' . " is " . $var1
+		echo $output3
+		decho $output3
+	}
+	var = "test"
+	if ("test" == $var) {
+		echo string compare success
+		decho string compare success
+	}	 
+}
\ No newline at end of file
diff --git a/base/Applications/Shell/ScriptEngine.cs b/base/Applications/Shell/ScriptEngine.cs
new file mode 100644
index 0000000..cf7005f
--- /dev/null
+++ b/base/Applications/Shell/ScriptEngine.cs
@@ -0,0 +1,726 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Text;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Applications
+{
+    /**
+     * Provides a reasonable script engine implementation.
+     * This engine is composed of two distinct parts: the parser
+     * and the interpreter. Parser.cs and ScriptParser.cs provide
+     * the parsing functionality. Parser.cs is the general handwritten slr
+     * driver while ScriptParser contains the automatically generated
+     * parse tables and semantic action functions for productions
+     * and lex operations of this specific scripting language. This file
+     * provides the interpretation mechanism that runs over an ast produced
+     * by the parser.
+     **/
+    class ScriptEngine
+    {
+        private String script;
+        private Block parsedScript;
+        public const String LAST_COMMAND_EXIT_SYMBOL = "?";
+        public const String NUM_ARGUMENTS_SYM = "#";
+        public delegate int CommandLineRunner(ShellControl! shellControl,
+                                              String[] commandLine,
+                                              bool isBackground);
+
+        private CommandLineRunner runner;
+
+
+        public static int Run(String script, ShellControl! shellControl, CommandLineRunner runner)
+        {
+            return Run(script, shellControl, runner, null);
+        }
+
+        public static int Run(String script, ShellControl! shellControl,
+                              CommandLineRunner runner, String[] arguments)
+        {
+            ScriptEngine engine = new ScriptEngine(script, runner);
+            try {
+                engine.Parse();
+            } catch (Parser.ParseException e) {
+                Console.WriteLine(e.Message);
+                return -1;
+            } catch (Exception e) {
+                Console.WriteLine(e.Message);
+                return -1;
+            }
+
+            try {
+                return engine.Run(shellControl, arguments);
+            } catch (Interpretation.InterpretationException e) {
+                Console.WriteLine(e.Message);
+            } catch (ScriptException e) {
+                Console.WriteLine(e.Message);
+            } catch (Exception e) {
+                Console.WriteLine(e.Message);
+            }
+            return -1;
+        }
+
+
+        private ScriptEngine(String script, CommandLineRunner runner)
+        {
+            this.script = script;
+            this.runner = runner;
+        }
+
+        private void Parse()
+        {
+            ScriptParser parser = new ScriptParser();
+            parsedScript = (Block)parser.Parse(script);
+
+        }
+
+        private int Run(ShellControl! shellControl, String[] arguments)
+        {
+            Interpretation interp = new Interpretation(runner, arguments);
+            parsedScript.Interpret(shellControl, interp);
+            return interp.ExitCode;
+        }
+
+        public class ScriptException : Exception
+        {
+            public ScriptException(String message) : base(message) { }
+        }
+
+        public class Interpretation
+        {
+            public static readonly object! undefinedObj = new Object();
+            private Hashtable! symbolTable;
+            private bool exit = false;
+
+            [NotDelayed]
+            public Interpretation(CommandLineRunner runner, String[] arguments)
+            {
+                this.runner = runner;
+                symbolTable = new Hashtable();
+                base();
+                int i = 0;
+                if (arguments != null) {
+                    for (; i < arguments.Length; ++i) {
+                        SetSymbol(i.ToString(), arguments[i]);
+                    }
+                }
+                SetSymbol(NUM_ARGUMENTS_SYM, i);
+            }
+
+            public int ExitCode
+            {
+                get {
+                    Object exitCode = LookupSymbol(LAST_COMMAND_EXIT_SYMBOL);
+                    if (exitCode == null) { return 0; }
+                    return (Int32) exitCode;
+                }
+                set { SetSymbol(LAST_COMMAND_EXIT_SYMBOL, value); }
+            }
+
+            public bool Exit
+            {
+                get { return exit; }
+                set { exit = value; }
+            }
+
+            public CommandLineRunner runner;
+
+            public object! LookupSymbol(string! symbol)
+            {
+                Object value = symbolTable[symbol];
+                if (value == null) {
+                    return undefinedObj;
+                }
+                return value;
+            }
+            public void SetSymbol(string! key, Object value)
+            {
+                symbolTable[key] = value;
+            }
+
+            public class InterpretationException : Exception
+            {
+                public InterpretationException(String message) : base(message) { }
+            }
+
+            public class UndefinedVariableException : InterpretationException
+            {
+                public UndefinedVariableException(String variable)
+                    : base("Use of undefined variable: " + variable) { }
+            }
+
+            public class TypeConversionException : InterpretationException
+            {
+                public TypeConversionException(String value, String type)
+                    : base("Could not convert " + value + " to type: " + type) { }
+            }
+
+            public class UnknownTypeException : InterpretationException
+            {
+                public UnknownTypeException(String type)
+                    : base("Unknown type" + type) { }
+            }
+
+            public class DivideByZeroException : InterpretationException
+            {
+                public DivideByZeroException() : base("Division by zero undefined.") { }
+            }
+
+
+        }
+        public abstract class Element { }
+
+        public abstract class Expression : Element
+        {
+            public abstract object! GetValue(Interpretation! interp);
+            public abstract string! StringValue(Interpretation! interp);
+            public abstract int IntValue(Interpretation! interp);
+            public abstract bool BoolValue(Interpretation! interp);
+            public bool IsIntLike() { return true; }
+            public bool IsBoolLike() { return true; }
+            public bool IsStringLike() { return true; }
+        }
+
+        public class VariableReference : Expression
+        {
+            String variable;
+            public VariableReference(String variable)
+            {
+                this.variable = variable;
+            }
+            public override object! GetValue(Interpretation! interp)
+            {
+                object value = interp.LookupSymbol(variable);
+                if (value == Interpretation.undefinedObj)
+                    throw new Interpretation.UndefinedVariableException(variable);
+                return value;
+            }
+
+            public override string! StringValue(Interpretation! interp)
+            {
+                object value = GetValue(interp);
+                return value.ToString();
+            }
+
+            public override int IntValue(Interpretation! interp)
+            {
+                Object value = GetValue(interp);
+                if (value is String) {
+                    return Int32.Parse((String)value);
+                } else if (value is Int32) {
+                    return (int)value;
+                } else if (value is bool) {
+                    return ((bool)value) ? 1 : 0;
+                }
+                throw new Interpretation.UnknownTypeException(value.GetType().ToString());
+            }
+
+            public override bool BoolValue(Interpretation! interp)
+            {
+                Object value = GetValue(interp);
+                if (value is String) {
+                    try {
+                        return Boolean.Parse((String)value);
+                    } catch (FormatException) {
+                        throw new Interpretation.TypeConversionException((String)value, "bool");
+                    }
+
+                } else if (value is Int32) {
+
+                    return ((int)value) == 0 ? true : false;
+                } else if (value is Boolean) {
+                    return (bool)value;
+                }
+                throw new Interpretation.UnknownTypeException(value.GetType().ToString());
+            }
+        }
+
+        public abstract class IntegerExpression : Expression
+        {
+            public override object! GetValue(Interpretation! interp) { return IntValue(interp); }
+            public override string! StringValue(Interpretation! interp)
+            {
+                int value = IntValue(interp);
+                return value.ToString();
+            }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                int value = IntValue(interp);
+                return value == 0 ? true : false;
+            }
+        }
+
+        public class IntegerLiteral : IntegerExpression
+        {
+            private int value;
+            public IntegerLiteral(int value)
+            {
+                this.value = value;
+            }
+            public override int IntValue(Interpretation! interp) { return value; }
+        }
+        public abstract class IntegerBinaryExpression : IntegerExpression
+        {
+            public Expression left;
+            public Expression right;
+            protected IntegerBinaryExpression(Expression left, Expression right)
+            {
+                this.left = left; this.right = right;
+            }
+        }
+        public class Add : IntegerBinaryExpression
+        {
+            public Add(Expression left, Expression right) : base(left, right) { }
+            public override int IntValue(Interpretation! interp)
+            {
+                return left.IntValue(interp) + right.IntValue(interp);
+            }
+        }
+        public class Subtract : IntegerBinaryExpression
+        {
+            public Subtract(Expression left, Expression right) : base(left, right) { }
+            public override int IntValue(Interpretation! interp)
+            {
+                return left.IntValue(interp) - right.IntValue(interp);
+            }
+        }
+
+        public class Multiply : IntegerBinaryExpression
+        {
+            public Multiply(Expression left, Expression right) : base(left, right) { }
+            public override int IntValue(Interpretation! interp)
+            {
+                return left.IntValue(interp) * right.IntValue(interp);
+            }
+        }
+
+        public class Divide : IntegerBinaryExpression
+        {
+            public Divide(Expression left, Expression right) : base(left, right) { }
+            public override int IntValue(Interpretation! interp)
+            {
+                int leftVal = left.IntValue(interp);
+                int rightVal = right.IntValue(interp);
+                if (rightVal == 0) {
+                    throw new DivideByZeroException();
+                }
+                return leftVal / rightVal;
+
+            }
+        }
+
+        public class Mod : IntegerBinaryExpression
+        {
+            public Mod(Expression left, Expression right) : base(left, right) { }
+            public override int IntValue(Interpretation! interp)
+            {
+                return left.IntValue(interp) % right.IntValue(interp);
+            }
+        }
+        public abstract class BooleanExpression : Expression
+        {
+            public override object! GetValue(Interpretation! interp) { return BoolValue(interp); }
+            public override int IntValue(Interpretation! interp)
+            {
+                bool value = BoolValue(interp);
+                return value ? 1 : 0;
+            }
+            public override string! StringValue(Interpretation! interp)
+            {
+                bool value = BoolValue(interp);
+                return value.ToString();
+            }
+        }
+
+        public class BooleanLiteral : BooleanExpression
+        {
+            bool value;
+            public BooleanLiteral(bool value)
+            {
+                this.value = value;
+            }
+            public override bool BoolValue(Interpretation! interp) { return value; }
+
+        }
+        public abstract class BooleanBinaryExpression : BooleanExpression
+        {
+            protected Expression left;
+            protected Expression right;
+            public BooleanBinaryExpression(Expression left, Expression right)
+            {
+                this.left = left; this.right = right;
+            }
+            protected int CompareOperands(Interpretation! interp)
+            {
+                return CompareTo(left.GetValue(interp), right, interp);
+            }
+            private static int CompareTo(Object left, Expression e, Interpretation! interp)
+            {
+                if (left == null) {
+                    if (e == null) { return 0; }
+                    return -1;
+                }
+                if (e == null) { return 1; }
+                if (left is String) {
+                    return ((String)left).CompareTo(e.StringValue(interp));
+                } else if (left is int) {
+                    return ((int)left).CompareTo(e.IntValue(interp));
+                } else if (left is Boolean) {
+                    return ((Boolean)left).CompareTo(e.BoolValue(interp));
+                }
+                throw new Interpretation.UnknownTypeException("unsupported type");
+            }
+        }
+        public class And : BooleanBinaryExpression
+        {
+            public And(Expression left, Expression right) : base(left, right) { }
+
+            public override bool BoolValue(Interpretation! interp)
+            {
+                return left.BoolValue(interp) && right.BoolValue(interp);
+            }
+        }
+
+        public class Or : BooleanBinaryExpression
+        {
+            public Or(Expression left, Expression right) : base(left, right) { }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                return left.BoolValue(interp) || right.BoolValue(interp);
+            }
+        }
+
+        public class Less : BooleanBinaryExpression
+        {
+            public Less(Expression left, Expression right) : base(left, right) { }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                int compare = CompareOperands(interp);
+                return compare < 0;
+            }
+        }
+
+        public class LessEqual : BooleanBinaryExpression
+        {
+            public LessEqual(Expression left, Expression right) : base(left, right) { }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                int compare = CompareOperands(interp);
+                return compare < 0 || compare == 0;
+            }
+        }
+
+        public class Equal : BooleanBinaryExpression
+        {
+            public Equal(Expression left, Expression right) : base(left, right) { }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                int compare = CompareOperands(interp);
+                return compare == 0;
+            }
+        }
+
+        public class Greater : BooleanBinaryExpression
+        {
+            public Greater(Expression left, Expression right) : base(left, right) { }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                int compare = CompareOperands(interp);
+                return compare > 0;
+            }
+        }
+
+        public class GreaterEqual : BooleanBinaryExpression
+        {
+            public GreaterEqual(Expression left, Expression right) : base(left, right) { }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                int compare = CompareOperands(interp);
+                return compare == 0 || compare > 0;
+            }
+        }
+
+
+        public class Negate : BooleanExpression
+        {
+            Expression expr;
+            public Negate(Expression expr)
+            {
+                this.expr = expr;
+            }
+            public override bool BoolValue(Interpretation! interp)
+            {
+                return !expr.BoolValue(interp);
+            }
+        }
+
+        public abstract class StringExpression : Expression
+        {
+            public override object! GetValue(Interpretation! interp)
+            {
+                return StringValue(interp);
+            }
+            public override int IntValue(Interpretation! interp)
+            {
+                String value = StringValue(interp);
+                try {
+                    return Int32.Parse(value);
+                } catch (FormatException) {
+                    throw new Interpretation.TypeConversionException(value, "String");
+                }
+            }
+
+            public override bool BoolValue(Interpretation! interp)
+            {
+                String value = StringValue(interp);
+                try {
+                    return Boolean.Parse(value);
+                } catch (FormatException) {
+                    throw new Interpretation.TypeConversionException(value, "String");
+                }
+            }
+        }
+        private static Regex whitespace = new Regex(@"\s+");
+
+        public class StringInterpolation : StringExpression
+        {
+            private ArrayList interpolationElems;
+            private static Regex escaped_dollar = new Regex(@"\\\$");
+
+            private static String[]! Split(string! interpolation)
+            {
+                ArrayList chunks = new ArrayList();
+                char last = (char) -1;
+                int lastIndex = 0;
+                for (int i = 0; i < interpolation.Length;  last = interpolation[i], ++i) {
+                    if (interpolation[i] == '$' && last != '\\') {
+                        chunks.Add(interpolation.Substring(lastIndex, i - lastIndex));
+                        lastIndex = i + 1;
+                    }
+                }
+                chunks.Add((lastIndex < interpolation.Length - 1 ? interpolation.Substring(lastIndex) : ""));
+                String[] strings = new string[chunks.Count];
+                chunks.CopyTo(strings);
+                return strings;
+            }
+
+            [NotDelayed]
+            public StringInterpolation(string! interpolation)
+            {
+                interpolationElems = new ArrayList();
+                String[] split = Split(interpolation);
+                if (split[0] != "") {
+                    //replace escaped $ and add
+                    interpolationElems.Add(new StringLiteral(escaped_dollar.Replace(split[0], "$")));
+                }
+                for (int i = 1; i < split.Length; ++i) {
+                    string var, rest;
+                    string! split_i = (!)split[i];
+                    if (split_i[0] == '{') {
+                        int index = split_i.IndexOf('}');
+                        if (index == -1) {
+                            throw new ScriptException("Unmatched left brace in " + interpolation);
+                        }
+                        var = split_i.Substring(1, index - 1);
+                        rest = index + 1 < split_i.Length ? split_i.Substring(index + 1) : "";
+                    } else {
+                        Match m = whitespace.Match(split_i);
+                        assert m != null;
+                        int index = m.Success ? m.Index : split_i.Length;
+                        var = split_i.Substring(0, index);
+                        rest = index + 1 < split_i.Length ? split_i.Substring(index + 1) : "";
+                    }
+                    //didn't replace escaped dollar signs in variable, bad syntax anyway.
+                    interpolationElems.Add(new VariableReference(var));
+                    if (rest != "") {
+                        interpolationElems.Add(new StringLiteral(escaped_dollar.Replace(rest, "$")));
+
+                    }
+                }
+            }
+
+            public override string! StringValue(Interpretation! interp)
+            {
+                StringBuilder sb = new StringBuilder();
+                foreach (Expression! elem in interpolationElems) {
+                    sb.Append(elem.StringValue(interp));
+                }
+                return sb.ToString();
+            }
+        }
+        public class StringLiteral : StringExpression
+        {
+            private string literal;
+            public StringLiteral(String literal)
+            {
+                this.literal = literal;
+            }
+            public override string! StringValue(Interpretation! interp)
+            {
+                return literal;
+
+            }
+        }
+
+        public class Concat : StringExpression
+        {
+            private Expression left;
+            private Expression right;
+            public Concat(Expression left, Expression right)
+            {
+                this.left = left; this.right = right;
+            }
+
+            public override string! StringValue(Interpretation! interp)
+            {
+                return left.StringValue(interp) + right.StringValue(interp);
+            }
+        }
+
+        public abstract class Statement : Element
+        {
+            public abstract void Interpret(ShellControl! shellControl, Interpretation! interp);
+        }
+
+        public class Assign : Statement
+        {
+            String variable;
+            Expression expression;
+            public Assign(String variable, Expression expression)
+            {
+                this.variable = variable; this.expression = expression;
+            }
+            public override void Interpret(ShellControl! shellControl, Interpretation! interp)
+            {
+                Object value = expression.GetValue(interp);
+                if (interp != null)
+                    interp.SetSymbol(variable, value);
+            }
+        }
+        public class If : Statement
+        {
+            Expression condition;
+            Block block;
+            public If(Expression condition, Block block)
+            {
+                this.condition = condition; this.block = block;
+            }
+            public override void Interpret(ShellControl! shellControl, Interpretation! interp)
+            {
+                if (condition.BoolValue(interp)) {
+                    block.Interpret(shellControl, interp);
+                }
+            }
+        }
+        public class IfThenElse : Statement
+        {
+            Expression condition;
+            Block trueBlock;
+            Block falseBlock;
+            public IfThenElse(Expression condition, Block trueBlock, Block falseBlock)
+            {
+                this.condition = condition; this.trueBlock = trueBlock; this.falseBlock = falseBlock;
+            }
+            public override void Interpret(ShellControl! shellControl, Interpretation! interp)
+            {
+                if (condition.BoolValue(interp)) {
+                    trueBlock.Interpret(shellControl, interp);
+                } else {
+                    falseBlock.Interpret(shellControl, interp);
+                }
+            }
+        }
+
+        public class While : Statement
+        {
+            Expression condition;
+            Block block;
+            public While(Expression condition, Block block)
+            {
+                this.condition = condition; this.block = block;
+            }
+            public override void Interpret(ShellControl! shellControl, Interpretation! interp)
+            {
+                while (condition.BoolValue(interp)) {
+                    block.Interpret(shellControl, interp);
+                    if (interp.Exit) break;
+                }
+            }
+        }
+        public class Block : Statement
+        {
+            ArrayList statements;
+            public Block(ArrayList statements)
+            {
+                this.statements = statements;
+            }
+            public override void Interpret(ShellControl! shellControl, Interpretation! interp)
+            {
+                foreach (Statement statement in statements) {
+                    if (statement != null)
+                        statement.Interpret(shellControl, interp);
+                    if (interp.Exit) break;
+                }
+            }
+            public override string! ToString()
+            {
+                throw new ScriptException("The method or operation is not implemented.");
+            }
+        }
+
+        public class Command : Statement
+        {
+            public ArrayList commandLine;
+            bool async;
+
+            public Command(ArrayList commandLine) : this(commandLine, false) { }
+            public Command(ArrayList commandLine, bool async)
+            {
+                this.commandLine = commandLine;
+                this.async = async;
+            }
+            public override void Interpret(ShellControl! shellControl, Interpretation! interp)
+            {
+                String[] arguments = new String[commandLine.Count];
+                int i = 0;
+                //Console.WriteLine("Interpret Command");
+                foreach (Expression! e in commandLine) {
+                    string arg = e.StringValue(interp);
+                    //Console.WriteLine("  CMD[{0}]: {1}", i, arg);
+                    arguments[i++] = arg;
+                }
+                if (i != 0 && ((!)arguments[0]).Trim() == "exit") {
+                    if (arguments.Length >= 2) {
+                        try {
+                            int exitCode = Int32.Parse(arguments[1]);
+                            interp.ExitCode = exitCode;
+                        } catch (FormatException) {
+                            throw new Interpretation.TypeConversionException((String)arguments[1], "integer");
+                        }
+                    }
+                    interp.Exit = true;
+                } else {
+                    try {
+                        int exitCode = interp.runner(shellControl, arguments, async);
+                        interp.ExitCode = exitCode;
+                    }
+                    catch (FileNotFoundException) {
+                        interp.Exit = true;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/base/Applications/Shell/Shell.csproj b/base/Applications/Shell/Shell.csproj
new file mode 100644
index 0000000..f3c3159
--- /dev/null
+++ b/base/Applications/Shell/Shell.csproj
@@ -0,0 +1,46 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>Shell</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Shell.sg"/>
+    <Compile Include="Terminal.sg"/>
+    <Compile Include="ScriptEngine.cs"/>
+    <Compile Include="Parser.cs"/>
+    <Compile Include="Breaker.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml2\Singularity.Xml2.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Manifest\Manifest.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+
+    <LanguageFile Include="script.lang">
+      <Namespace>Microsoft.Singularity.Applications</Namespace>
+      <ClassName>ScriptParser</ClassName>
+    </LanguageFile>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Shell/Shell.sg b/base/Applications/Shell/Shell.sg
new file mode 100644
index 0000000..89b909b
--- /dev/null
+++ b/base/Applications/Shell/Shell.sg
@@ -0,0 +1,2098 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Shell.cs
+//
+//  Note:
+//
+
+using DirectoryService.Utils;
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.GC;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+using DirectoryServices.Utils;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Processes;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Keyboard = Microsoft.Singularity.Io.Keyboard;
+using Tty = Microsoft.Singularity.Io.Tty2006;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using System.IO;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Shell", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringArrayParameter( "filename", HelpMessage="the bucket")]
+        internal string[] args;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Shell.AppMain(this);
+        }
+    }
+
+    // See WaitForChildThread below
+    internal contract WaitForChildContract {
+        out message Finish();
+        state Start: one {Finish! -> Done;}
+        state Done: one {}
+    }
+
+    public enum ShellEvent : ushort
+    {
+        RunCommand = 1
+    }
+
+    internal class Dir
+    {
+        private static TRef<DirectoryServiceContract.Imp:Ready>       m_epNS = null;
+
+        public static DirectoryServiceContract.Imp:Ready! GetDirectoryServiceContract()
+        {
+            if (m_epNS == null) {
+                m_epNS = new TRef<DirectoryServiceContract.Imp:Ready>(DirectoryService.NewClientEndpoint());
+            }
+
+            return m_epNS.Acquire();
+        }
+
+        public static void ReleaseDirectoryServiceContract([Claims] DirectoryServiceContract.Imp:Ready! imp)
+        {
+                m_epNS.Release(imp);
+        }
+    }
+
+    public class InvalidPathException : Exception
+    {
+        public InvalidPathException(string! message)
+            : base(message)
+        {}
+    }
+
+    public class Ls
+    {
+        internal static void SplitPath(string! filePath,
+                                       out string! dirPath,
+                                       out string! fileName)
+        {
+            string[] parts = filePath.Split('/');
+            if ((parts == null) || (parts.Length == 0)) {
+                // Not even a leading slash? Bah!
+                throw new InvalidPathException(String.Format("The path '{0}' is invalid.", filePath));
+            }
+
+            // The previous implementation allowed "dir hardware" to be interpreted as "dir /hardware".
+            if (parts.Length == 1) {
+                dirPath = "/";
+                fileName = (!)parts[0];
+                return;
+            }
+
+            fileName = (!)parts[parts.Length-1];
+
+            // The directory path is the full path minus
+            // the trailing leaf part
+            // need to special case Directory Service root. Need to return "/" as dirPath
+            int len = (filePath.Length - fileName.Length - 1) > 0? filePath.Length - fileName.Length - 1 : 1;
+            dirPath = filePath.Substring(0, len);
+        }
+
+        private static int Find(string! path, string! pattern, DirectoryServiceContract.Imp:Start! ds)
+        {
+            try {
+                ErrorCode errorOut;
+                EnumerationRecords[] in ExHeap responses =
+                    SdsUtils.EnumerateDirectory(ds, out errorOut);
+                if (null == responses) {
+                    Console.WriteLine("Find ({0}) failed. reason:{1}",
+                        "/", SdsUtils.ErrorCodeToString(errorOut));
+                    return -1;
+                }
+                else {
+                    for (int i = 0; i < responses.Length; i++) {
+                        string displayName;
+                        expose (responses[i]) {
+                            string name = Bitter.ToString2(responses[i].Path);
+                            if (!SdsUtils.IsMatch(name, pattern)) {
+                                continue;
+                            }
+
+                            displayName = name;
+                            string type;
+                            switch (responses[i].Type) {
+                                case NodeType.Directory :
+                                    type = "<dir> ";
+                                    break;
+                                case NodeType.File :
+                                    type = "<file>";
+                                    break;
+                                case NodeType.IoMemory :
+                                    type = "<mem> ";
+                                    break;
+                                case NodeType.ServiceProvider :
+                                    type = "<chan>";
+                                    break;
+                                case NodeType.SymLink :
+                                    type = "<link>";
+                                    break;
+                                case NodeType.BadNode :
+                                    type = "<bad> ";
+                                    break;
+                                default:
+                                    type = "<none>";
+                                    break;
+                            }
+                            if (responses[i].Type == NodeType.Directory) {
+                                displayName = displayName + "/";
+                            }
+                            else if (responses[i].Type == NodeType.SymLink) {
+                                // If it's a symbolic link, show the destination.
+                                displayName = displayName + "@";
+                                ErrorCode linkErrorCode;
+                                string linkValue;
+                                if (SdsUtils.GetLinkValue(name, ds, out linkValue, out linkErrorCode)) {
+                                    displayName = displayName.PadRight(16) + " " + linkValue;
+                                } else {
+                                    Console.WriteLine("Failed to query link '{0}': {1}", name, SdsUtils.ErrorCodeToString(linkErrorCode));
+                                }
+                            }
+                            Console.WriteLine(" {0} {1}", type, displayName);
+                        }
+                    }
+                    delete responses;
+                    return 0;
+               }
+            }
+            finally {
+            }
+        }
+
+        public static int ListAndSort(string! path)
+        {
+            string !file;
+            string !dir;
+            string pattern;
+
+            SplitPath(path, out dir, out file);
+
+            if ( file.IndexOf("*") != -1) {
+                pattern = file;
+            }
+            else {
+                dir = path;
+                pattern = "*";
+            }
+            DirectoryServiceContract.Imp epNS = Dir.GetDirectoryServiceContract();
+
+            DirectoryServiceContract.Imp! dirClient;
+            DirectoryServiceContract.Exp! dirServer;
+            DirectoryServiceContract.NewChannel(out dirClient, out dirServer);
+            ErrorCode errorOut;
+
+            bool ok = SdsUtils.Bind((!)dir, epNS, dirServer, out errorOut);
+            if (!ok) {
+                Console.WriteLine("Bind to '{0}' failed. reason: {1}",
+                                  dir, SdsUtils.ErrorCodeToString(errorOut));
+                delete dirClient;
+                Dir.ReleaseDirectoryServiceContract(epNS);
+                return -1;
+            }
+            dirClient.RecvSuccess();
+
+            Find(dir, pattern, dirClient);
+            delete dirClient;
+            Dir.ReleaseDirectoryServiceContract(epNS);
+            return 0;
+        }
+    }
+
+    public abstract class Job {
+        private string! commandLine;
+        protected TRef<UnicodePipeContract.Imp:READY>! stdinCell;
+        public readonly int Id;
+
+        private static int IdGenerator = 0;
+
+        public string Name {
+            get { return commandLine; }
+        }
+
+        protected Job(string! command, [Claims] UnicodePipeContract.Imp:READY! stdin) {
+            this.commandLine = command;
+            this.stdinCell = new TRef<UnicodePipeContract.Imp:READY>(stdin);
+            this.Id = IdGenerator++;
+        }
+
+        public UnicodePipeContract.Imp:READY! AcquireStdin() {
+            return this.stdinCell.Acquire();
+        }
+
+        public void ReleaseStdin([Claims] UnicodePipeContract.Imp:READY! stdin) {
+            this.stdinCell.Release(stdin);
+        }
+
+
+        public string StatusName {
+            get {
+                switch (this.Status) {
+                case ProcessState.Stopped:
+                    return "Stopped";
+                case ProcessState.Suspended:
+                    return "Suspended";
+                case ProcessState.Active:
+                    return "Active";
+                default:
+                    return "Unknown";
+                }
+            }
+        }
+
+        public ProcessState Status {
+            get {
+                Process p = this.Process;
+                if (p == null) {
+                    return ProcessState.Stopped;
+                }
+                return p.State;
+            }
+        }
+
+        public int ExitCode {
+            get {
+                Process p = this.Process;
+                if (p == null) {
+                    return 0;
+                }
+                return p.ExitCode;
+            }
+        }
+
+        public virtual void Dispose() {
+        }
+
+        public abstract Process Process { get; }
+
+        public void Stop() {
+            Process p = this.Process;
+            if (p != null) {
+                p.Stop();
+            }
+        }
+
+        public void Suspend() {
+            Process p = this.Process;
+            if (p != null) {
+                p.Suspend(false);
+            }
+        }
+
+        public void Resume() {
+            Process p = this.Process;
+            if (p != null) {
+                p.Resume(false);
+            }
+        }
+    }
+
+    public class SingleProcessJob : Job {
+
+        Process process;
+
+        private static string! CommandLineString(string[]! command)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach(string s in command) {
+                sb.Append(s);
+                sb.Append(' ');
+            }
+            return sb.ToString();
+        }
+
+        public SingleProcessJob(string[]! command, Process p,
+                                [Claims] UnicodePipeContract.Imp:READY! stdin)
+            : base(CommandLineString(command), stdin)
+        {
+            this.process = p;
+        }
+
+        public override Process Process {
+            get { return this.process; }
+        }
+
+        public override void Dispose() {
+            Process p = this.process;
+            if (p != null) {
+                p.Dispose(true);
+            }
+            base.Dispose();
+        }
+    }
+
+    public class PipeJob : Job {
+        Process[]! processes ;
+
+        public PipeJob(string! command,
+                       [Claims] UnicodePipeContract.Imp:READY! stdin,
+                       Process[]! processes)
+            : base(command, stdin)
+        {
+            this.processes = processes;
+        }
+
+        public override Process Process {
+            get {
+                int c = processes.Length;
+                if (c <= 0) return null;
+
+                return (Process)this.processes[c-1];
+            }
+        }
+
+        public override void Dispose() {
+            foreach (Process! p in this.processes) {
+                p.Dispose(true);
+            }
+            base.Dispose();
+        }
+    }
+
+    public class ShellControl : ITracked {
+
+        PipeMultiplexer! outputControl;
+        Hashtable! jobs; // maps ints to jobs
+
+        public ShellControl([Claims] PipeMultiplexer! outputControl) {
+            this.outputControl = outputControl;
+            this.jobs = new Hashtable();
+        }
+
+        public UnicodePipeContract.Imp:READY FreshStdout() {
+            expose(this) {
+                return this.outputControl.FreshClient();
+            }
+        }
+
+        private void RemoveStoppedJobs() {
+            ArrayList toRemove = new ArrayList();
+            foreach (int i in jobs.Keys) {
+                Job job = (Job)this.jobs[i];
+                assert job != null;
+                if (job.Status == ProcessState.Stopped) {
+                    job.Dispose();
+                    toRemove.Add(i);
+                }
+            }
+            foreach (int i in toRemove) {
+                Console.WriteLine("[{0}] Done.", i);
+                this.jobs.Remove(i);
+            }
+        }
+        /// <summary>
+        /// Provides enumeration of non-exited jobs
+        /// </summary>
+        public IEnumerator GetEnumerator() {
+            RemoveStoppedJobs();
+            return this.jobs.Keys.GetEnumerator();
+        }
+
+        public Job this[int i] {
+            get {
+                return (Job)this.jobs[i];
+            }
+        }
+
+        public void Add(Job! job) {
+            jobs[job.Id] = job;
+        }
+
+        public void Dispose()
+        {
+            this.outputControl.Dispose();
+        }
+
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+    }
+
+    public class Shell
+    {
+        // Exit Codes:
+        internal const int EXIT_AND_RESTART     = 0x1fff;
+        internal const int EXIT_AND_SHUTDOWN    = 0x1ffe;
+        internal const int EXIT_AND_WARMBOOT    = 0x1ffd;
+        internal const int EXIT_AND_HALT        = 0x1ffc;
+
+        private static Terminal         terminal;
+        private static ParameterProcessor       parameters;
+        private static ArrayList localPackages = null;
+        private static bool done = false;
+        private static bool             insertMode      = true;
+        private static int              curpos          = 0;
+        private static int              totalChars      = 0;
+        private static StringBuilder    buildString;
+
+        private class ShellCommand
+        {
+            public string Name;
+            public string Description;
+            public CommandStart Run;
+
+            public ShellCommand(string name, string description, CommandStart run)
+            {
+                Name = name;
+                Description = description;
+                Run = run;
+            }
+
+            override public string! ToString()
+            {
+                return "[ShellCommand(" + Name + ", " + Description + "]";
+            }
+        }
+
+        ////////////////////////////////////////////////////// Shell Commands.
+        //
+        private delegate int CommandStart(ShellControl! shellControl, string[]! args);
+
+        private static ShellCommand[] commands =
+        {
+            // Please insert new commands in alphabetical order!
+            //
+            new ShellCommand("bg", "Background a stopped job",
+                             new CommandStart(DoBg)),
+            new ShellCommand("break", "Break into the kernel debugger",
+                             new CommandStart(DoBreak)),
+            new ShellCommand("bvt", "Basic verification test",
+                             new CommandStart(DoBvt)),
+            new ShellCommand("clear", "Clear screen",
+                             new CommandStart(DoClear)),
+            new ShellCommand("date", "Display date and time",
+                             new CommandStart(DoDate)),
+            new ShellCommand("decho", "Echo inputs to debugger",
+                             new CommandStart(DoDecho)),
+            new ShellCommand("dir", "Display contents of name space",
+                             new CommandStart(DoDir)),
+            new ShellCommand("echo", "Echo inputs to console",
+                             new CommandStart(DoEcho)),
+            new ShellCommand("exit", "Exit shell",
+                             new CommandStart(DoShutdown)),
+            new ShellCommand("fg", "Foreground a stopped or background job",
+                             new CommandStart(DoFg)),
+            new ShellCommand("_gcstress", "Stress garbage collector",
+                             new CommandStart(DoGcStress)),
+            new ShellCommand("help", "Display help message",
+                             new CommandStart(DoHelp)),
+            new ShellCommand("jobs", "List jobs",
+                             new CommandStart(DoJobs)),
+            new ShellCommand("reboot", "Reboot computer",
+                             new CommandStart(DoReboot)),
+            new ShellCommand("script", "Run script file",
+                             new CommandStart(DoScript)),
+            new ShellCommand("shutdown", "Shut down computer",
+                             new CommandStart(DoShutdown)),
+            new ShellCommand("start", "Start process with independent I/O",
+                             new CommandStart(DoStart)),
+            new ShellCommand("testscript","Test scripting engine",
+                             new CommandStart(DoTestScript)),
+            new ShellCommand("warmboot", "Warm reboot computer",
+                             new CommandStart(DoWarmBoot)),
+            //
+            // Please insert new commands in alphabetical order!
+        };
+
+        public static int DoBreak(ShellControl! shellControl, string[]! args)
+        {
+            Console.WriteLine("Breaking into kernel debugger.");
+            if (args.Length == 2 && args[1] == "-w") {
+                Breaker.Break(2);
+            }
+            else if (args.Length == 2 && args[1] == "-r") {
+                Breaker.Break(1);
+            }
+            else if (args.Length == 2 && args[1] == "-b") {
+                Breaker.Break(01);
+            }
+            else {
+                DebugStub.WriteLine("About to break into kernel debugger");
+                DebugStub.Break();
+            }
+
+            bool iflag = Processor.DisableInterrupts();
+            Processor.RestoreInterrupts(iflag);
+            Console.WriteLine("First line after break.");
+            Console.WriteLine("Second line after break.");
+            Console.WriteLine("Third line after break.");
+
+            return 0;
+        }
+
+        public static int DoClear(ShellControl! shellControl, string[]! args)
+        {
+            terminal.GenerateAndSendEscapeSequence(Tty.EscapeCodes.CLEAR_SCREEN);
+            return 0;
+        }
+
+        private static void ConsoleWriteDateTime(string preamble, DateTime dt)
+        {
+            Console.WriteLine("{0}{1:d4}/{2:d2}/{3:d2} {4:d2}:{5:d2}:{6:d2}.{7:d3}",
+                              preamble, dt.Year, dt.Month, dt.Day,
+                              dt.Hour, dt.Minute, dt.Second, dt.Millisecond);
+        }
+
+        private static void ConsoleWriteDateTime(string preamble, TimeSpan sp)
+        {
+            Console.WriteLine("{0}{1}", preamble, sp.ToString());
+
+        }
+
+        public static int DoDate(ShellControl! shellControl, string[]! args)
+        {
+            ConsoleWriteDateTime("Kernel: ", ProcessService.GetUpTime());
+            ConsoleWriteDateTime("UTC:    ", DateTime.UtcNow);
+            return 0;
+        }
+
+        private static String Concat(String[]! args, int startIndex)
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = startIndex; i < args.Length; ++i) {
+                sb.Append(args[i] + (i == (args.Length - 1) ? "" : " "));
+            }
+            return sb.ToString();
+        }
+
+        public static int DoDecho(ShellControl! shellControl, string[]! args)
+        {
+            DebugStub.WriteLine("{0}", __arglist(Concat(args, 1)));
+            return 0;
+        }
+
+        public static int DoDir(ShellControl! shellControl, string[]! args)
+        {
+            int ret = 0;
+
+            if (args.Length == 1) {
+                ret = Ls.ListAndSort("/");
+            }
+            else {
+                for (int arg = 1; arg < args.Length; arg++) {
+                    ret = Ls.ListAndSort((!)args[arg]);
+                    if (ret != 0) {
+                        Console.WriteLine("Returned: {0}", ret);
+                        break;
+                    }
+                }
+            }
+            return ret;
+        }
+
+        public static int DoEcho(ShellControl! shellControl, string[]! args)
+        {
+            Console.WriteLine(Concat(args, 1));
+            return 0;
+        }
+
+        public static int DoScript(ShellControl! shellControl, string[]! args)
+        {
+            int exitCode = 0;
+            long size;
+            NodeType nodeType;
+            FileContract.Imp file;
+            ErrorCode errorOut;
+
+            if (args.Length < 2) {
+                Console.WriteLine("usage: script <filename>");
+                return -1;
+            }
+
+            DirectoryServiceContract.Imp! rootNS = Dir.GetDirectoryServiceContract();
+            bool ok  = FileUtils.GetAttributes((!)args[1], rootNS,
+                                               out size, out nodeType, out  errorOut);
+            if (!ok) {
+                Console.WriteLine("File not found.");
+                Dir.ReleaseDirectoryServiceContract(rootNS);
+                return 1;
+            }
+            file = FileUtils.OpenFile((!)args[1], rootNS);
+            Dir.ReleaseDirectoryServiceContract(rootNS);
+            if (file == null) {
+                return -1;
+            }
+
+            byte* opt(ExHeap[]) buf = new [ExHeap] byte[size];
+            file.SendRead(buf, 0, 0, size);
+
+            switch receive{
+            case file.AckRead(_buf, bytesRead, error):
+                buf = _buf;
+                break;
+            case file.ChannelClosed():
+                Console.WriteLine("Could not read file.");
+                delete file;
+                return 1;
+            }
+            delete file;
+
+            String script = Bitter.ToString2(buf);
+#if DUMP_SCRIPT_CONTENTS_TO_SCREEN
+            Console.WriteLine("Script===============================");
+            Console.WriteLine(script);
+            Console.WriteLine("============================EndScript");
+#endif
+            exitCode = ScriptEngine.Run(script, shellControl,
+                                        new ScriptEngine.CommandLineRunner(RunCommand));
+            delete buf;
+            return exitCode;
+        }
+
+        public static int DoStart(ShellControl! shellControl, string[]! args)
+        {
+            String[] commandLine = new String[args.Length - 1];
+            Array.Copy(args, 1, commandLine, 0, commandLine.Length);
+            return RunCommand(shellControl, commandLine, false);
+        }
+
+        public static int DoTestScript(ShellControl! shellControl, string[]! args){
+             String script =
+                @"
+                echo $2 #echo second argument
+                decho $2
+                echo number of arguments '=' $#
+                decho number of arguments '=' $#
+
+                echo last command exit code '=' $?
+                decho last command exit code '=' $?
+
+                type &
+                echo appear before type output
+
+                if (true) {
+                    variable = false
+                    if ($variable) {
+                        var2 = true
+                        echo broken conditional
+                        decho broken conditional
+                    }
+                    else {
+                        var2 = true
+                        output1 = ""bet${variable}ween""
+                        echo $output1
+                        decho $output1
+                    }
+                    #some comments #
+                    #
+                    decho var2 is $var2
+                    add = -2 + 4
+                    echo '-2 + 4 =' $add
+                    decho '-2 + 4 =' $add
+
+                    mod = 6 % 5
+                    echo '6 % 5 =' $mod
+                    decho '6 % 5 =' $mod
+
+                    div = 10 / 5
+                    echo '10 / 5 =' $div
+                    decho '10 / 5 =' $div
+
+                    mult = 2 * 5
+                    echo '2 * 5=' $mult
+                    decho '2 * 5=' $mult
+
+                    var1 = 5
+                    var2 = 6
+
+                    if($var1 < $var2){
+                        echo $var1 is less than $var2
+                        decho $var1 is less than $var2
+                        two = 1
+                        power = 10
+                        echo starting loop
+                        decho starting loop
+                        while($power > 0){
+                            two = $(two) * 2
+                            power = $power - 1
+                        }
+                        output2 = ""2^10 = $two""
+                        echo $output2
+                        decho $output2
+                    }
+                    if ($var1 > $var2) {
+                        echo $var2 is less than $var1
+                        decho $var2 is less than $var1
+                    }
+                    else {
+                        output3 = 'var1' . "" is "" . $var1
+                        echo $output3
+                        decho $output3
+                    }
+                    var = ""test""
+                    if (""test"" == $var) {
+                        echo string compare success
+                        decho string compare success
+                    }
+                    exit
+                }
+                echo should not display
+                decho should not display
+                exit -1
+                ";
+
+            return ScriptEngine.Run(
+                    script,
+                    shellControl,
+                    new ScriptEngine.CommandLineRunner(RunCommand),
+                    new String[] {"script", "testscript", "arg"}
+            );
+
+        }
+
+        private static void GcStressVariableSizeObjects()
+        {
+            const uint maxItemBytes = 65535;
+            const uint maxAllocatedBytes = 1000000;
+            byte dummy = 0;
+
+            Console.Write("Running variable size object test.");
+
+            DateTime start     = DateTime.Now;
+            TimeSpan duration  = TimeSpan.FromSeconds(10);
+            TimeSpan oneSecond = TimeSpan.FromSeconds(1);
+
+            Queue q = new Queue();
+            while (DateTime.Now - start < duration)
+            {
+                DateTime roundStart = DateTime.Now;
+                uint iterations = 0;
+                while (DateTime.Now - roundStart < oneSecond)
+                {
+                    uint allocatedBytes = 0;
+                    uint i = 17u * iterations;
+                    while (allocatedBytes < maxAllocatedBytes)
+                    {
+                        uint itemBytes = 1u + (uint)((433777u * i) % maxItemBytes);
+                        allocatedBytes += itemBytes;
+                        i++;
+                        byte [] data = new byte[itemBytes];
+                        data[0] = 0xff;
+                        q.Enqueue(data);
+                    }
+
+                    while (q.Count != 0)
+                    {
+                        byte [] data = (byte []!) q.Dequeue();
+                        dummy ^= data[0];
+                    }
+                    iterations ++;
+                }
+                Console.Write(" {0}", iterations, dummy);
+            }
+            Console.Write("\n");
+        }
+
+        private static void GcStressFixedSizeObjects()
+        {
+            const int itemCount = 1024;
+            const int itemBytes = 1024;
+
+            Console.Write("Running fixed size object test.");
+
+            byte dummy = 0;
+
+            DateTime start     = DateTime.Now;
+            TimeSpan duration  = TimeSpan.FromSeconds(10);
+            TimeSpan oneSecond = TimeSpan.FromSeconds(1);
+            Queue q = new Queue();
+            while (DateTime.Now - start < duration)
+            {
+                DateTime roundStart = DateTime.Now;
+                int iterations = 0;
+                while (DateTime.Now - roundStart < oneSecond)
+                {
+                    for (int i = 0; i < itemCount; i++)
+                    {
+                        byte [] data = new byte[itemBytes];
+                        // Debug.Assert(data[0] == 0);
+                        data[0] = 0xff;
+                        q.Enqueue(data);
+                    }
+
+                    for (int i = 0; i < itemCount; i++)
+                    {
+                        byte [] data = (byte []!) q.Dequeue();
+                        // Debug.Assert(data[0] == 0xff);
+                        dummy ^= data[0];
+                    }
+                    iterations ++;
+                }
+                Console.Write(" {0}", iterations, dummy);
+            }
+            Console.Write("\n");
+        }
+
+        public static int DoGcStress(ShellControl! shellControl, string[]! args)
+        {
+            GcStressFixedSizeObjects();
+            GcStressVariableSizeObjects();
+            return 0;
+        }
+
+        public static int DoHelp(ShellControl! shellControl, string[]! args)
+        {
+            Console.WriteLine("Singularity shell commands:");
+
+            int max = 0;
+            foreach (ShellCommand! command in commands) {
+                int length = command.Name.Length;
+                if (length > max) {
+                    max = length;
+                }
+            }
+
+            foreach (ShellCommand! command in commands) {
+                Console.Write("  {0}", command.Name);
+                for (int i = command.Name.Length; i < max; i++) {
+                    Console.Write(" ");
+                }
+                Console.WriteLine(" - {0}", command.Description);
+            }
+            return 0;
+        }
+
+        public static int DoJobs(ShellControl! shellControl, string[]! args)
+        {
+            foreach (int i in shellControl) {
+                Job job = shellControl[i];
+                assert job != null;
+                string status = job.StatusName;
+                Console.WriteLine("[{0}] {1,10} {2,40}", i, status, job.Name);
+            }
+            return 0;
+        }
+
+        public static int DoFg(ShellControl! shellControl, string[]! args)
+        {
+            if (args == null || args.Length != 2) {
+                Console.WriteLine("Usage: fg <jobnumber>");
+                return 1;
+            }
+            int jobnum = Int32.Parse(args[1]);
+
+            Job job = shellControl[jobnum];
+
+            if (job == null) {
+                Console.WriteLine("Nonexistent job {0}", jobnum);
+                return 1;
+            }
+            if (job.Status == ProcessState.Suspended) {
+                job.Resume();
+            }
+            return WaitForJob(job);
+        }
+
+        public static int DoBg(ShellControl! shellControl, string[]! args)
+        {
+            if (args == null || args.Length != 2) {
+                Console.WriteLine("Usage: bg <jobnumber>");
+                return 1;
+            }
+            int jobnum = Int32.Parse(args[1]);
+
+            Job job = shellControl[jobnum];
+
+            if (job == null) {
+                Console.WriteLine("Nonexistent job {0}", jobnum);
+                return 1;
+            }
+            job.Resume();
+            return 0;
+        }
+
+        public static int DoReboot(ShellControl! shellControl, string[]! args)
+        {
+            DebugStub.WriteLine("Shell rebooting.");
+            done = true;
+            return EXIT_AND_RESTART;
+        }
+
+        public static int DoShutdown(ShellControl! shellControl, string[]! args)
+        {
+            DebugStub.WriteLine("Shell shutting down.");
+            done = true;
+            return EXIT_AND_SHUTDOWN;
+        }
+
+        public static int DoWarmBoot(ShellControl! shellControl, string[]! args)
+        {
+            DebugStub.WriteLine("Shell restarting for warm boot.");
+            done = true;
+            return EXIT_AND_WARMBOOT;
+        }
+
+        // Runs each step of the BVT.
+        public static int Bvt(ShellControl! shellControl, int count)
+        {
+            Console.WriteLine("BVT BootCount={0}", count);
+            DebugStub.WriteLine("BVT BootCount={0}", __arglist(count));
+            String script;
+
+            if (count == 0) {
+                script = @"
+                    msg = '[BVT 0.0] Running page table test.'
+                    echo $msg
+                    decho $msg
+
+                    msg = '[BVT 0.1] Running Pnp test.'
+                    echo $msg
+                    decho $msg
+                    if (false) {
+                        pnp
+                        pnp
+                        pnp
+                    }
+
+                    msg = '[BVT 0.2] Running channel test.'
+                    echo $msg
+                    decho $msg
+                    channeldemo
+                    channeldemo
+                    channeldemo
+
+                    msg = '[BVT 0.3] Running ram disk contents test.'
+                    echo $msg
+                    decho $msg
+                    if (false) {
+                        disk
+                        disk
+                        disk
+                    }
+
+                    msg = '[BVT 0.4] Running sound driver test.'
+                    echo $msg
+                    decho $msg
+                    play
+                    play
+                    play
+
+                    msg = '[BVT 0.5] Running select test.'
+                    echo $msg
+                    decho $msg
+                    select
+                    select
+                    select
+
+                    msg = '[BVT 0.6] Running thread test.'
+                    echo $msg
+                    decho $msg
+                    threadtest
+                    threadtest
+                    threadtest
+
+                    msg = '[BVT 0.7] Running mptxofy test.'
+                    echo $msg
+                    decho $msg
+                    if (false) {
+                        mptxofy
+                    }
+
+                    msg = '[BVT 0.8] Running tasklist.'
+                    echo $msg
+                    decho $msg
+                    tasklist
+
+                    msg = '[BVT 0.9] Running dir test.'
+                    echo $msg
+                    decho $msg
+                    dir
+                    dir '/init'
+
+                    msg = '[BVT 0.10] Running exception test.'
+                    echo $msg
+                    decho $msg
+                    throw
+                    throwwithlinkstack
+
+                    msg = '[BVT 0.11 Running suspend/stop test.'
+                    echo $msg
+                    decho $msg
+                    arg1 = '(& p2 (* 9999999 print 2 delay 2 ) wall )'
+                    arg2 = ' (* 5 print 1 delay 2 ) suspend p2'
+                    arg3 = ' (* 5 print 1 delay 2 ) resume p2'
+                    arg4 = ' (* 5 print 1 delay 2 ) stop p2'
+                    arg5 = ' (* 5 print 1 delay 2 )'
+                    arg = $arg1 . $arg2 . $arg3 . $arg4 . $arg5
+                    kptest $arg
+
+                    msg = '[BVT 0.12] Running singbench test.'
+                    echo $msg
+                    decho $msg
+                    singbench
+
+                    msg = '[BVT 0.13] Running monitor test.'
+                    echo $msg
+                    decho $msg
+                    monitortest
+
+                    msg = '[BVT 0.14] Running warmboot test.'
+                    echo $msg
+                    decho $msg
+                    warmboot
+                    ";
+            }
+            else if (count == 1) {
+                script = @"
+                    msg = '[BVT 1.0] Running page table test.'
+                    echo $msg
+                    decho $msg
+
+                    msg = '[BVT 1.1] Running ram disk contents test.'
+                    echo $msg
+                    decho $msg
+                    if (false) {
+                        disk
+                    }
+
+                    msg = '[BVT 1.2] Running sound driver test.'
+                    echo $msg
+                    decho $msg
+                    play
+
+                    msg = '[BVT 1.3] Running tasklist.'
+                    echo $msg
+                    decho $msg
+                    tasklist
+
+                    msg = '[BVT 1.4] Running dir test.'
+                    echo $msg
+                    decho $msg
+                    dir
+                    dir '/init'
+
+                    msg = '[BVT 1.5] Running warmboot test.'
+                    echo $msg
+                    decho $msg
+                    warmboot
+                    ";
+            }
+            else {
+                script = @"
+                    msg = '[BVT 2.0] Running page table test.'
+                    echo $msg
+                    decho $msg
+
+                    msg = '[BVT 2.1] Running shutdown test.'
+                    echo $msg
+                    decho $msg
+                    shutdown
+                    ";
+            }
+            return ScriptEngine.Run(script, shellControl, new ScriptEngine.CommandLineRunner(RunCommand));
+        }
+
+        public static int DoBvt(ShellControl! shellControl, string[]! args)
+        {
+#if false
+            // A sleezy way of avoiding confusion for new users,
+            // added very late in the day for the first RDK
+            // release.
+
+            if (!File.Exists("/init/tasklist")) {
+                Console.WriteLine("A BVT capable distro is not installed.");
+                Console.WriteLine("The system should be built with a Distro that is a superset of Distro\\BVT.proj");
+                return -1;
+            }
+#endif // false
+            return Bvt(shellControl, (int)ProcessService.GetKernelBootCount());
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        public static void ReplaceOldCommandString(string! newCommand, int oldCommandLength)
+        {
+            // erase the old string
+            while (oldCommandLength-- > 0)
+            {
+                Console.Write("\b");
+            }
+            terminal.GenerateAndSendEscapeSequence(Tty.EscapeCodes.ERASE_FROM_CURSOR);
+
+            // and draw the new one
+            Console.Write(newCommand);
+            curpos = newCommand.Length;
+            totalChars = newCommand.Length;
+        }
+
+
+        private static ArrayList! StringToCharArrayList(string! s)
+        {
+            ArrayList al = new ArrayList();
+
+            for(int i=0; i < s.Length; i++) {
+                al.Add(s[i]);
+            }
+            return al;
+        }
+
+        private static String! CharArrayToString(ArrayList arr)
+        {
+            if (arr == null) return "";
+            return CharArrayToString(arr, 0, arr.Count);
+        }
+
+        private static String! CharArrayToString(ArrayList arr, int start, int len)
+        {
+            if (arr == null) return "";
+
+            assert start >= 0;
+            assert start+len <= arr.Count;
+
+            if (buildString == null) {
+                buildString = new StringBuilder(1024);
+            }
+
+            buildString.Length = 0;
+            for (int i=start; i < start+len; i++){
+                buildString.Append((char)(!)arr[i]);
+            }
+            return buildString.ToString();
+        }
+
+        private static bool IncrementCurpos()
+        {
+            if (++curpos > totalChars) {
+                curpos = totalChars;
+                return false;
+            }
+            return true;
+        }
+
+        private static bool DecrementCurpos()
+        {
+            if (--curpos < 0) {
+                curpos = 0;
+                return false;
+            }
+            return true;
+        }
+
+
+        private static void DecrementTotalChars()
+        {
+            if (--totalChars < 0) {
+                totalChars = 0;
+            }
+                }
+
+        private static void ShowHistory(ArrayList! a) {
+            DebugStub.WriteLine("showHistory: count={0}", __arglist(a.Count));
+            if (a.Count == 0) return;
+
+            for (int i=0; i < a.Count; i++){
+                DebugStub.WriteLine(CharArrayToString((ArrayList)a[i]));
+            }
+        }
+
+        public static String! GetCommand(String prompt, ArrayList! history)
+        {
+            int     key                     = 0;
+            bool    inEscapeSequence        = false;
+            ArrayList historyWorkingCopy    = new ArrayList();
+            ArrayList command               = new ArrayList();
+            Tty.EscapeCodes code;
+            int repeat;
+
+            // need to make a deep copy of the history now that the elements are
+            // array lists
+            for (int i=0; i< history.Count; i++){
+                historyWorkingCopy.Add(new ArrayList((ArrayList!) history[i]));
+            }
+
+            historyWorkingCopy.Add(command);
+            int historyCurrentSpot = historyWorkingCopy.Count - 1;
+            curpos      = 0;
+            totalChars  = 0;
+
+            Console.WriteLine();
+            Console.Write(prompt);
+
+            for (;;) {
+                key = Console.Read();
+                if (key == -1) {
+                    Console.WriteLine("tty EOF reached!");
+                    return "";
+                }
+
+                char c = (char)key;
+                //DebugStub.WriteLine("key={0:x}, char={1}",__arglist(key, c));
+                if ( c ==  (char) 0x1b) {
+                     inEscapeSequence = true;
+                     terminal.Reset();
+                     continue;
+                        }
+                if (inEscapeSequence) {
+                    inEscapeSequence = terminal.ProcessEscape(c, out code, out repeat);
+                    if (inEscapeSequence) continue;
+
+                    if (code == Tty.EscapeCodes.UP) {
+                        if (history.Count == 0) {
+                            continue;
+                        }
+                        if (historyCurrentSpot == 0) {
+                            continue;
+                        }
+
+                        // now we can move up one row in the history
+                        ArrayList al = (ArrayList!)historyWorkingCopy[historyCurrentSpot];
+                        int count = al.Count;
+                        historyCurrentSpot--;
+                        ArrayList alNew = (ArrayList)historyWorkingCopy[historyCurrentSpot];
+                        string s = CharArrayToString(alNew);
+                        ReplaceOldCommandString(s, count);
+                    }
+                    else if (code == Tty.EscapeCodes.DOWN)
+                    {
+                        // if we're at the bottom of the history, don't move, but
+                        // otherwise, move down one
+                        if (history.Count == 0) {
+                            continue;
+                        }
+                        if (historyCurrentSpot == historyWorkingCopy.Count - 1) {
+                            continue;
+                        }
+
+                        // now we can move down one row in the history
+                        int count = ((ArrayList!)historyWorkingCopy[historyCurrentSpot]).Count;
+                        historyCurrentSpot++;
+                        ReplaceOldCommandString(CharArrayToString((ArrayList)historyWorkingCopy[historyCurrentSpot]), count);
+                    }
+                    else if (code == Tty.EscapeCodes.LEFT) {
+                        // adjust the cursor
+                        if ( DecrementCurpos()) {
+                            terminal.GenerateAndSendEscapeSequence(Tty.EscapeCodes.LEFT);
+                        }
+                    }
+                    else if (code == Tty.EscapeCodes.RIGHT) {
+                        if ( IncrementCurpos() ) {
+                            terminal.GenerateAndSendEscapeSequence(Tty.EscapeCodes.RIGHT);
+                    }
+                    }
+                    else if (code == Tty.EscapeCodes.INSERT) {
+                        //toggle insert mode
+                        if(insertMode == true) {
+                            insertMode = false;
+                            terminal.SetCursorSize('2');
+                        }
+                        else {
+                            insertMode = true;
+                            terminal.SetCursorSize('1');
+                        }
+                        DebugStub.WriteLine("Insert mode: {0}",__arglist(insertMode));
+                    }
+                } // escape sequence
+
+                else if (c == '\b') {
+                    int len = ((ArrayList!)historyWorkingCopy[historyCurrentSpot]).Count;
+                    if (len > 0 && curpos > 0 ){
+                        len = len -1;
+                        DecrementCurpos();
+                        DecrementTotalChars();
+                        ((ArrayList!)historyWorkingCopy[historyCurrentSpot]).RemoveAt(curpos);
+                        Console.Write(c);
+                        // re-write any chars after the deleted one
+                        int num = len - curpos;
+                        if (num > 0) {
+                            string rest =
+                                CharArrayToString((ArrayList)historyWorkingCopy[historyCurrentSpot],
+                                                  curpos, num);
+                            Console.Write(rest);
+                            terminal.GenerateAndSendEscapeSequence(Tty.EscapeCodes.ERASE_FROM_CURSOR);
+                            buildString.Length = 0;
+                            for (int i=0; i < num; i++) {
+                                buildString.Append('\b');
+                        }
+                            Console.Write(buildString.ToString());
+                    }
+                        else {
+                            terminal.GenerateAndSendEscapeSequence(Tty.EscapeCodes.ERASE_FROM_CURSOR);
+                }
+                    }
+                }
+                else if (c == '\n') {
+                    Console.WriteLine();
+
+                    if ( ((ArrayList!)historyWorkingCopy[historyCurrentSpot]).Count != 0)
+                    {
+                        return CharArrayToString((ArrayList!)historyWorkingCopy[historyCurrentSpot]);
+                    }
+                    Console.Write(prompt);
+                }
+                else {
+                    // Only use the character if it's in the printable ASCII range
+                    if ((c >= 32) && (c <= 126)) // SPACE to "~"
+                    {
+
+                        if (insertMode) {
+                            ArrayList a = (ArrayList!)historyWorkingCopy[historyCurrentSpot];
+                            string s = CharArrayToString(a, curpos, a.Count - curpos);
+                            a.Insert(curpos, c);
+                            Console.Write(c);
+                            Console.Write(s);
+                            string x = "";
+                            for (int i=0; i < s.Length; i++){
+                                x = x + '\b';
+                            }
+                            Console.Write(x);
+                            totalChars++;
+                            curpos++;
+                            //curpos++;
+                        }
+                        else {
+                            if (curpos < totalChars) {
+                                ((ArrayList!)historyWorkingCopy[historyCurrentSpot])[curpos++] = c;
+                            }
+                            else {
+                                ((ArrayList!)historyWorkingCopy[historyCurrentSpot]).Insert(curpos++, c);
+                                totalChars++;
+                            }
+                        Console.Write(c);
+                        }
+
+                    }
+                    // else ignore it
+                }
+            }
+        }
+
+        private static ShellCommand FindCommand(string input)
+        {
+            foreach (ShellCommand! command in commands) {
+                if (command.Name == input) {
+                    return command;
+                }
+            }
+            return null;
+        }
+
+        private static bool IsScript(string name, out string scriptName)
+        {
+            ErrorCode errorOut;
+            NodeType nodeType;
+            long length;
+
+            if (name == null) {
+                scriptName = null;
+                return false;
+            }
+            DirectoryServiceContract.Imp! ds = Dir.GetDirectoryServiceContract();
+            scriptName = "/init/"+name+".script";
+            bool ok = SdsUtils.GetAttributes(scriptName, ds, out length, out nodeType, out errorOut);
+            Dir.ReleaseDirectoryServiceContract(ds);
+            return ok;
+        }
+
+        public static int RunCommand(ShellControl! shellControl,
+                                     String[] commandLine,
+                                     bool isBackground
+                                     )
+        {
+            DirectoryServiceContract.Imp ds;
+            int exitCode = 0;
+            string path;
+            if (commandLine == null || commandLine.Length == 0) {
+                return exitCode;
+            }
+            ShellCommand command = FindCommand(commandLine[0]);
+            if (command != null) {
+                try {
+                    exitCode = command.Run(shellControl, commandLine);
+                } catch (Exception ex) {
+                    Console.WriteLine("Exception: " + ex.Message);
+                    exitCode = -1;
+                }
+            }
+            else if (IsScript(commandLine[0], out path) ) {
+                String[]! scriptArgs = new String[commandLine.Length + 1];
+                Array.Copy(commandLine, 0, scriptArgs, 1, commandLine.Length);
+                scriptArgs[0] = "script";
+                scriptArgs[1] = path;
+                exitCode = DoScript(shellControl, scriptArgs);
+            }
+            else {
+                try {
+                    UnicodePipeContract.Imp:READY childStdout = shellControl.FreshStdout();
+                    if (childStdout == null) {
+                        // output multiplexer dead (which means that we shouldn't use Console.WriteLine
+                        DebugStub.WriteLine("-- Can't get new output pipe");
+                        return -1;
+                    }
+
+                    Process process;
+                    string action = null;
+
+                    ds = Dir.GetDirectoryServiceContract();
+                    Manifest manifest = Binder.LoadManifest(ds, commandLine[0]);
+                    Dir.ReleaseDirectoryServiceContract(ds);
+
+                    if (manifest != null) {
+                        if (manifest.HasParameters()) {
+                            //Console.WriteLine("Has parameters");
+                            bool ok = parameters.ProcessParameters(commandLine,
+                                     manifest, out process, out action);
+                            if (!ok) {
+                                delete childStdout;
+                                return -1;
+                            }
+                            else {
+                                assert process != null;
+                                int result = manifest.SetEndpoints(process, action, false);
+                                if (result < 0) {
+                                    Console.WriteLine("Unable to set all endpoints for this process.");
+                                    delete childStdout;
+                                    return -1;
+                                }
+                            }
+                        }
+                        else {
+                            //DebugStub.WriteLine("manifest has no parameters");
+                            //Console.WriteLine("manifest has no parameters");
+                            process = new Process(commandLine, null, 2);
+                        }
+                    }
+                    else {
+                        Console.WriteLine("'{0}' is not a command or has no manifest",
+                                          commandLine[0]);
+                        delete childStdout;
+
+                        throw new System.IO.FileNotFoundException(commandLine[0]);
+                    }
+
+                    UnicodePipeContract.Imp! stdinImp;
+                    UnicodePipeContract.Exp! stdinExp;
+                    UnicodePipeContract.NewChannel(out stdinImp, out stdinExp);
+
+                    SingleProcessJob job = new SingleProcessJob(commandLine, process, stdinImp);
+
+                    if (manifest != null && manifest.HasParameters() ) {
+                        int stdinIndex = manifest.GetInputPipeIndex(action, "data");
+                        if ( stdinIndex  == -1) {
+                            Console.WriteLine(" no stdin data pipe specified in manifest");
+                            delete stdinExp;
+                        }
+                        else process.SetStartupEndpoint(stdinIndex, (Endpoint * in ExHeap) stdinExp);
+
+                        int stdoutIndex = manifest.GetOutputPipeIndex(action, "data");
+                        if ( stdoutIndex  == -1) {
+                            Console.WriteLine(" no stdout data pipe specified in manifest");
+                            delete childStdout;
+                        }
+                        else process.SetStartupEndpoint(stdoutIndex, (Endpoint * in ExHeap) childStdout);
+                    }
+                    else {
+                        process.SetStartupEndpoint(0, (Endpoint * in ExHeap) stdinExp);
+                        process.SetStartupEndpoint(1, (Endpoint * in ExHeap) childStdout);
+                    }
+                    shellControl.Add(job);
+
+                    process.Start();
+                    if (!isBackground){
+                        exitCode = WaitForJob(job);
+                        if (exitCode != 0) {
+                            Console.WriteLine("-- Exit code: {0}",
+                                                        exitCode);
+                        }
+                    }
+                }
+                catch (ProcessCreateException) {
+                    Console.Write("Unsupported command: {0}", commandLine[0]);
+                }
+                catch (FileNotFoundException fe) {
+                    throw fe;
+                }
+                catch (Exception e) {
+                    Console.Write("Can't start {0}: Exception '{1}' caught.",
+                                  commandLine[0], e.Message);
+                }
+            }
+            return exitCode;
+        }
+
+        /// <summary>
+        /// Copy and echo characters from shell stdin to job stdin.
+        /// Wait for either the job to exit gracefully, or for the user
+        /// to press control-c or control-z.
+        ///
+        /// Known limitation: if the child process opens
+        /// its own keyboard channel, the shell may never see the control-c
+        /// message.
+        /// </summary>
+        private static int WaitForJob(Job! job)
+        {
+            WaitForChildContract.Imp! imp;
+            WaitForChildContract.Exp! exp;
+            WaitForChildContract.NewChannel(out imp, out exp);
+
+            PipeLookAhead cinput = ConsoleInput.AcquireInput();
+            UnicodePipeContract.Imp! childStdIn = job.AcquireStdin();
+
+            ESet<UnicodePipeContract.Imp:ACK> childStdInAck =
+                new ESet<UnicodePipeContract.Imp:ACK>();
+            ESet<UnicodePipeContract.Imp:READY> childStdInReady =
+                new ESet<UnicodePipeContract.Imp:READY>();
+
+            char[] in ExHeap exChar = new [ExHeap] char[1];
+            try {
+                WaitForChildThread.StartWaiting(job.Process,
+                                                new TRef<WaitForChildContract.Exp:Start>(exp));
+
+                childStdInReady.Add(childStdIn);
+
+                while (true) {
+                    // invariant exChar != null && childStdInReady.Head(ep) ||
+                    //           exChar == null && childStdInReady.Empty
+                    switch receive {
+
+                        case cinput.ControlC():
+                            job.Stop();
+                            job.Dispose();
+                            return 0;
+
+                        case cinput.ControlZ() && childStdInReady.Head(ep):
+                            job.Suspend();
+                            job.ReleaseStdin(ep);
+                            return 0;
+
+                        case cinput.Char(ch) && childStdInReady.Head(ep):
+                            // we have a char and childStdin is ready
+                            assert exChar != null;
+                            // echo character
+                            Console.Write(ch);
+                            exChar[0] = (char) ch;
+                            ep.SendWrite(exChar,0,1);
+                            exChar = null;
+                            childStdInAck.Add(ep);
+                            continue;
+
+                        case ep.AckWrite(buffer) in childStdInAck:
+                            assert exChar == null;
+                            exChar = buffer;
+                            childStdInReady.Add(ep);
+                            continue;
+
+                        case imp.Finish():
+                            //Console.WriteLine("finish");
+                            int exitCode = job.ExitCode;
+                            job.Dispose();
+                            return exitCode;
+
+                        case ep.ChannelClosed() in childStdInAck:
+                            delete ep;
+                            continue;
+                    }
+                }
+            }
+            finally {
+                childStdInReady.Dispose();
+                childStdInAck.Dispose();
+                ConsoleInput.ReleaseInput(cinput);
+                delete imp;
+                delete exChar;
+            }
+        }
+
+        // [Hawblitzel] TODO: better ways to wait on a child process
+        private class WaitForChildThread
+        {
+            private Process! process;
+            private TRef<WaitForChildContract.Exp:Start>! expRef;
+
+            private WaitForChildThread(Process! process,
+                                       TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                this.process = process;
+                this.expRef = expRef;
+                base();
+            }
+
+            public static void StartWaiting(Process process,
+                                            TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                if (process == null) {
+                    WaitForChildContract.Exp exp = expRef.Acquire();
+                    exp.SendFinish();
+                    delete exp;
+                    return;
+                }
+
+                WaitForChildThread wft = new WaitForChildThread(process, expRef);
+                Thread t = new Thread(new ThreadStart(wft.Wait));
+                t.Start();
+            }
+
+            private void Wait()
+            {
+                process.Join();
+                WaitForChildContract.Exp exp = expRef.Acquire();
+                exp.SendFinish();
+                delete exp;
+            }
+        }
+
+
+        // kinda dumb...
+        private static bool CommandLineSyntaxCheck(string! commandLine)
+        {
+            int quoteCount = 0;
+            for (int i = 0; i < commandLine.Length; i++) {
+                if (commandLine[i] == '\'') {
+                    quoteCount++;
+                }
+            }
+
+            return (quoteCount % 2 == 0);
+        }
+
+        private static bool InSeparators(char c, char []! separators)
+        {
+            for (int i = 0; i < separators.Length; i++)
+            {
+                if (separators[i] == c)
+                    return true;
+            }
+            return false;
+        }
+
+        private static ArrayList! Tokenize(string! input, int last,
+                                           char []! separators)
+        {
+            ArrayList tokens = new ArrayList();
+
+            for (int i = 0; i <= last;)
+            {
+                // Skip separators
+                while (i <= last && InSeparators(input[i], separators))
+                {
+                    i++;
+                }
+
+                if (i > last)
+                    break;
+
+                // Try to slurp word
+                int start = i;
+                while (i <= last &&
+                       !InSeparators(input[i], separators) &&
+                       input[i] != '\'')
+                {
+                    i++;
+                }
+                if (i != start)
+                {
+                    tokens.Add(input.Substring(start, i - start));
+                }
+
+                // Skip separators
+                while (i <= last && InSeparators(input[i], separators))
+                {
+                    i++;
+                }
+
+                if (i > last)
+                    break;
+
+                // Try to quoted slurp word
+                if (input[i] == '\'')
+                {
+                    start = i;
+                    i++;
+                    while (i <= last && input[i] != '\'')
+                    {
+                        i++;
+                    }
+
+                    if (i <= last && input[i] == '\'')
+                    {
+                        tokens.Add(input.Substring(start + 1, i - start - 1));
+                        i++;
+                    }
+                    else
+                    {
+                        tokens.Add(input.Substring(start, i - start));
+                        i++;
+                    }
+                }
+            } // end for
+
+            return tokens;
+        }
+
+        private static void BreakCommandLine(string!       input,
+                                             char []!      separators,
+                                             out string    command,
+                                             out string[]! commandArguments,
+                                             out bool      isBackground)
+        {
+            isBackground = false;
+
+            if (!CommandLineSyntaxCheck(input)) {
+                command = "";
+                commandArguments = new string[0];
+                return;
+            }
+
+            // Scan for trailing ampersand first
+            int last = input.Length - 1;
+            while (last > 0 && InSeparators(input[last], separators))
+            {
+                last--;
+            }
+
+            if (input[last] == '&')
+            {
+                isBackground = true;
+                last--;
+            }
+
+            ArrayList tokens = Tokenize(input, last, separators);
+
+            if (tokens.Count == 0)
+            {
+                command = "";
+                commandArguments = new string[0];
+                isBackground = false;
+                return;
+            }
+
+            command = (string) tokens[0];
+            commandArguments = new string [tokens.Count];
+            for (int i = 0; i < tokens.Count; i++)
+            {
+                commandArguments[i] = (string) tokens[i];
+            }
+        }
+
+        public static int RunPipe(ShellControl! shellControl, string! input)
+        {
+            DirectoryServiceContract.Imp ds;
+            int last = input.Length - 1;
+            ArrayList tokens = Tokenize(input, last, new char[] {'|'});
+            string [] commands = new string [tokens.Count];
+            for (int i = 0; i < tokens.Count; i++)
+            {
+                commands[i] = (string) tokens[i];
+                DebugStub.WriteLine("Command : {0}",__arglist(commands[i]));
+            }
+
+            UnicodePipeContract.Imp! pipeStdin;
+            UnicodePipeContract.Exp! nonNullNextStdin;
+
+            UnicodePipeContract.NewChannel(out pipeStdin, out nonNullNextStdin);
+
+            UnicodePipeContract.Exp nextStdin = nonNullNextStdin;
+
+            Process[] processes = new Process[tokens.Count];
+            // Start up each link process.
+
+            string commandName;
+            string[]! commandArguments;
+            bool isBackground = false;
+            Process process = null;
+            Process child = null;
+            string action = null;;
+
+            for (int i = 0; i < tokens.Count; i++) {
+                if (commands[i] != null) {
+
+                    UnicodePipeContract.Imp childStdout;
+                    UnicodePipeContract.Exp childStdoutExp;
+
+                    if (i == tokens.Count - 1) {
+                        // last process, hook up to output multiplexer
+                        childStdout = shellControl.FreshStdout();
+                        childStdoutExp = null;
+                    }
+                    else {
+                        UnicodePipeContract.Imp! nonNullChildImp;
+                        UnicodePipeContract.Exp! nonNullChildExp;
+                        UnicodePipeContract.NewChannel(out nonNullChildImp, out nonNullChildExp);
+                        childStdout = nonNullChildImp;
+                        childStdoutExp = nonNullChildExp;
+                    }
+
+                    BreakCommandLine((!)commands[i], new char[] {' '},
+                                    out commandName, out commandArguments,
+                                    out isBackground);
+
+                    try {
+                        //-------------------
+                        ds = Dir.GetDirectoryServiceContract();
+                        Manifest manifest = Binder.LoadManifest(ds, commandName);
+                        Dir.ReleaseDirectoryServiceContract(ds);
+                        if (manifest != null) {
+                            if (manifest.HasParameters()) {
+                                bool ok = parameters.ProcessParameters(commandArguments,
+                                        manifest, out child, out action);
+
+                                if (!ok)  {
+                                    delete childStdout;
+                                    delete childStdoutExp;
+                                    delete pipeStdin;
+                                    delete nextStdin;
+                                    return -1;
+                                }
+                                assert child != null;
+                                manifest.SetEndpoints(child, action, false);
+                            }
+                            else {
+                                DebugStub.WriteLine("manifest has no parameters");
+                                child = new Process(commandArguments, null, 2);
+                            }
+                        }
+                        else {
+                            Console.WriteLine("'{0}' is not a command or has no manifest",commandArguments[0]);
+                            //process = new Process(commandLine, null, 2);
+                            delete childStdout;
+                            delete childStdoutExp;
+                            delete pipeStdin;
+                            delete nextStdin;
+                            return -1;
+                        }
+                        //--------------------
+
+                        //Process child = new Process(commandArguments, null, 2);
+                        process = child;
+                        processes[i] = process;
+                        // Console.WriteLine("Starting the Process {0}, arg count={1}.",
+                        //                   commandArguments[0],commandArguments.Length );
+
+                        int stdinIndex = manifest.GetInputPipeIndex(action, "data");
+                        if ( stdinIndex  == -1) {
+                            Console.WriteLine(" no stdin data pipe specified in manifest");
+                            delete nextStdin;
+                        }
+                        else child.SetStartupEndpoint(stdinIndex, (Endpoint * in ExHeap) nextStdin);
+
+                        int stdoutIndex = manifest.GetOutputPipeIndex(action, "data");
+                        if ( stdoutIndex  == -1) {
+                            Console.WriteLine(" no stdout data pipe specified in manifest");
+                            delete childStdout;
+                        }
+                        else child.SetStartupEndpoint(stdoutIndex, (Endpoint * in ExHeap) childStdout);
+
+                        child.Start();
+                    }
+                    catch (ProcessCreateException) {
+                        Console.Write("Unsupported command: {0}", commandArguments);
+                        delete nextStdin;
+                        delete childStdout;
+                        delete childStdoutExp;
+                        delete pipeStdin;
+                        return -1;
+                    }
+                    catch (Exception e) {
+                        Console.Write("Can't start {0}: Exception '{1}' caught.", commandArguments,
+                                      e.Message);
+                        delete nextStdin;
+                        delete childStdout;
+                        delete childStdoutExp;
+                        delete pipeStdin;
+                        return -1;
+                    }
+
+                    nextStdin = childStdoutExp;
+                }
+            }
+            assert nextStdin == null;
+
+            PipeJob job = new PipeJob(input, pipeStdin, processes);
+            shellControl.Add(job);
+
+            int exitCode;
+            if (job.Process != null && !isBackground)
+            {
+                exitCode = WaitForJob(job);
+                // DebugStub.WriteLine("pipe: wait ended");
+
+                if (exitCode != 0) {
+                    Console.WriteLine("-- Exit code: {0}",
+                                                exitCode);
+                }
+                return exitCode;
+            }
+            else {
+                return 0;
+            }
+        }
+
+
+        private static bool HasPipes(string! input)
+        {
+            if (input.IndexOf('|',0) == -1 ) return false;
+            else {
+                return true;
+            }
+        }
+
+        private static ShellControl! StartOutputPipeThread() {
+            UnicodePipeContract.Exp! newOutputExp;
+            UnicodePipeContract.Imp! newOutputImp;
+            UnicodePipeContract.NewChannel(out newOutputImp, out newOutputExp);
+
+            UnicodePipeContract.Imp stdOut = ConsoleOutput.Swap(newOutputImp);
+            if (stdOut == null) {
+                DebugStub.WriteLine("Shell not connected to a pipe output!");
+                throw new ApplicationException("Can't go on");
+            }
+            PipeMultiplexer pm = PipeMultiplexer.Start(stdOut, newOutputExp);
+            return new ShellControl(pm);
+        }
+        private static bool Compare(ArrayList! al, string! s)
+        {
+            if (al.Count != s.Length) return false;
+            for (int i=0; i < s.Length; i++) {
+                if ( (char)(!)al[i] != s[i] ) return false;
+            }
+            return true;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            int exitCode = 0;
+
+            terminal = new Terminal();
+            Binder.Initialize();
+            parameters = new ParameterProcessor();
+
+            Console.WriteLine("Singularity Shell (PID={0})",
+                              ProcessService.GetCurrentProcessId());
+
+
+            ShellControl! shellControl =
+                StartOutputPipeThread();
+
+            string prompt = "Singularity>";
+            string loginName = Principal.Self().GetName();
+            int i = loginName.IndexOf('+');
+            int j = loginName.IndexOf('@');
+            if (i > 0 && j > 0 && i > j) {
+                prompt = String.Format("Singularity ({0})>", loginName.Substring(j+1, i-(j+1)));
+            }
+
+            try {
+                Console.WriteLine();
+                Console.WriteLine("Type `help' to get a list of valid commands.");
+                ArrayList history = new ArrayList();
+
+                if (config.args != null ) {
+                    //String[]! scriptArgs = new String[config.args.Length - 1];
+                    //Array.Copy(config.args, 1, scriptArgs, 0, scriptArgs.Length);
+
+                    try {
+                        exitCode = RunCommand(shellControl, config.args, false);
+                    }
+                    catch (FileNotFoundException) {
+                    }
+
+                    if (done) {
+                        // we pretend we didn't connect to the keyboard.
+                    }
+                }
+
+                // At startup, run the script 'startup.script'.
+                DoScript(shellControl, new string[] { "script", "/init/startup.script" });
+
+                while (!done) {
+                    DebugStub.WriteLine("--- Singularity Shell Prompt ---");
+                    Tracing.Log(Tracing.Warning, "--- Singularity Shell Prompt ---");
+                    String inputs = GetCommand(prompt, history);
+                    if (inputs.Length == 0) {
+                        continue;
+                    }
+
+                    Monitoring.Log(Monitoring.Provider.Shell,
+                                   (ushort)ShellEvent.RunCommand,
+                                   inputs);
+
+                    if (history.Count != 0 ) {
+                        bool same =  Compare ((ArrayList!)history[history.Count - 1], inputs);
+                        if (!same) {
+                            history.Add(StringToCharArrayList(inputs));
+                        }
+                    }
+                    else {
+                            history.Add(StringToCharArrayList(inputs));
+                    }
+                    string commandName;
+                    string[]! commandArguments;
+                    bool isBackground;
+
+                    //Ask for the pipe
+                    if (HasPipes(inputs)) {
+                        RunPipe(shellControl, inputs);
+                    }
+                    else {
+                        BreakCommandLine(inputs, new char[] {' '},
+                                     out commandName, out commandArguments,
+                                     out isBackground);
+                        try {
+                            exitCode = RunCommand(shellControl, commandArguments, isBackground);
+                        }
+                        catch (FileNotFoundException) {
+                            // No action needed, expected if user mistypes
+                            // command.
+                        }
+                    }
+
+                }
+            }
+            catch (Exception e) {
+                Console.WriteLine("Caught {0}", e.Message);
+                return 1;
+            }
+            finally {
+                shellControl.Dispose();
+            }
+
+            Console.WriteLine("Shell (PID={0}) Terminating w/ 0x{1:x4}.",
+                              ProcessService.GetCurrentProcessId(),
+                              exitCode);
+            DebugStub.WriteLine("Shell exiting w/ {0}.", __arglist(exitCode));
+            return exitCode;
+        }
+    }
+}
diff --git a/base/Applications/Shell/Terminal.sg b/base/Applications/Shell/Terminal.sg
new file mode 100644
index 0000000..fc4f8dc
--- /dev/null
+++ b/base/Applications/Shell/Terminal.sg
@@ -0,0 +1,283 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Shell.cs
+//
+//  Note:
+//
+
+using System;
+//using Microsoft.Singularity;
+//using Microsoft.SingSharp;
+using Pipe = Microsoft.Singularity.Io.Tty2006;
+
+namespace Microsoft.Singularity.Applications
+{   
+    
+    class Terminal
+    {   
+        private     bool    openBracketSeen;
+        private     string  numberString; 
+        private     bool    haveNumber;
+        private     bool    inNumber; 
+        private     int     repeat; 
+        private     string  history;  //debug remove
+
+        public Terminal()
+        {
+            openBracketSeen     = false; 
+            inNumber            = false;
+            haveNumber          = false; 
+            numberString        = ""; 
+            history             = ""; 
+        }
+        
+        public void Reset()
+        {
+            openBracketSeen     = false; 
+            inNumber            = false;
+            haveNumber          = false; 
+            history             = ""; 
+            numberString        = ""; 
+        }
+        
+        public bool ProcessEscape(char c, out Pipe.EscapeCodes code, out int repeat)
+        {
+            code = Pipe.EscapeCodes.NOCODE; 
+            repeat = 1; 
+            bool notProcessed = false; 
+            
+            history = history + c; 
+            //DebugStub.WriteLine("esc: processing({0}. history={1})",__arglist(c, history));
+            
+            if (Char.IsWhiteSpace(c)) {
+                code = Pipe.EscapeCodes.NOCODE; 
+                return true; 
+            }
+            
+            if ( c == '[') {
+                Reset(); 
+                openBracketSeen = true; 
+                code = Pipe.EscapeCodes.NOCODE; 
+                return true; 
+            }
+            
+            if (Char.IsNumber(c) ) {
+                if (!inNumber){
+                    inNumber = true; 
+                }
+                numberString = numberString +c; 
+                return true; 
+            } 
+            
+            if (Char.IsLetter(c)) {
+                if (inNumber) {
+                    inNumber = false; 
+                    haveNumber = true; 
+                    repeat = int.Parse(numberString);
+                }
+                switch (c) {
+                case 'A': 
+                    code = Pipe.EscapeCodes.UP;
+                    break;
+                case 'B': 
+                    code = Pipe.EscapeCodes.DOWN;
+                    break;
+                case 'C': 
+                    code = Pipe.EscapeCodes.RIGHT;
+                    break;
+                case 'D': 
+                    code = Pipe.EscapeCodes.LEFT;
+                    break;
+                case 'K':
+                    code = Pipe.EscapeCodes.ERASE_FROM_CURSOR; 
+                    break; 
+                case 'S':
+                    code = Pipe.EscapeCodes.SET_CURSOR_SIZE; 
+                    break; 
+                case 'J':
+                    if (haveNumber) {
+                        if (repeat == 2) {
+                            code = Pipe.EscapeCodes.CLEAR_SCREEN; 
+                        }
+                    }
+                    break; 
+                default: 
+                    //DebugStub.Break(); 
+                    notProcessed = true;
+                    break;
+                }
+                if (notProcessed) {
+                    return true; 
+                }
+                else {
+                    Reset(); 
+                    return false; 
+                }
+                
+            }
+            else if ( c == '~' ) {
+                DebugStub.WriteLine("term: ~ seen. inNumber={0}", __arglist(inNumber)); 
+                if (inNumber) {
+                    inNumber = false; 
+                    haveNumber = true; 
+                    int num  = int.Parse(numberString);
+                    DebugStub.WriteLine("term: Number={0}", __arglist(num)); 
+                    switch (num) {
+                    case 1: 
+                        code = Pipe.EscapeCodes.HOME;
+                        break; 
+                    case 2: 
+                        code = Pipe.EscapeCodes.INSERT;
+                        break; 
+                    case 3: 
+                        code = Pipe.EscapeCodes.DELETE;
+                        break; 
+                    case 4: 
+                        code = Pipe.EscapeCodes.END;
+                        break; 
+                    case 5: 
+                        code = Pipe.EscapeCodes.PAGE_UP;
+                        break; 
+                    case 6: 
+                        code = Pipe.EscapeCodes.PAGE_DOWN;
+                        break; 
+                    default: 
+                        notProcessed = true; 
+                        break; 
+                    }
+                    if (notProcessed) {
+                        return true; 
+                    }
+                    else {
+                        Reset(); 
+                        return false; 
+                    }
+                }
+                // hit ~ but not processing a number?
+                DebugStub.Break(); 
+            }
+            return false; 
+        }
+        
+        private  Pipe.EscapeCodes GetCodeFromSequence(char[]! sequence)
+        {
+            int pos, num, qual;
+            string numString= "";
+            string qualString= "";
+            bool qualifierEncountered = false; 
+            num = 0; 
+            
+            assert sequence[0] ==  '[';
+            for (pos=1; pos < sequence.Length; pos++) {
+                if (sequence[pos] == ';') {
+                    // handle qualifier 
+                    qualifierEncountered = true; 
+                    continue; 
+                }
+                if (sequence[pos] =='~') {
+                    //end of sequence
+                    break;
+                }
+                if (qualifierEncountered) { 
+                    qualString = qualString + sequence[pos];
+                }
+                else {
+                    numString = numString + sequence[pos];
+                }
+            }
+            try { 
+                num = int.Parse(numString);
+                if (qualifierEncountered) {
+#if false
+                    qual = int.Parse(qualString); 
+                    DebugStub.WriteLine("shell: key qualifier encountered {0} in sequence ",
+                        __arglist(qual)); 
+#endif 
+                }
+            } 
+            catch (Exception e) {
+                Console.WriteLine("Exception encountered: {0}", e.ToString()); 
+            }
+            return (Pipe.EscapeCodes) num;
+
+        }
+
+        public  void SetCursorSize(char size)
+        {
+           char[] buffer = new char[10];
+           int pos;
+
+           if (buffer != null) {
+                buffer[0] = (char) 0x1b;
+                buffer[1] = '[';
+                pos = 2;
+                buffer[pos++] = size; 
+                buffer[pos++] = 'S'; 
+                Console.Write(buffer,0,pos);
+           }
+        }
+        
+        public  void GenerateAndSendEscapeSequence(Pipe.EscapeCodes code)
+        {
+           char[] buffer = new char[10];
+           int pos;
+
+           if (buffer != null) {
+                buffer[0] = (char) 0x1b;
+                buffer[1] = '[';
+                pos = 2;
+                switch (code) {
+                    case Pipe.EscapeCodes.PAGE_UP:
+                        buffer[pos++] = '5';
+                        buffer[pos++] = '~';
+                        break;
+                    case Pipe.EscapeCodes.PAGE_DOWN:
+                        buffer[pos++] = '6';
+                        buffer[pos++] = '~';
+                        break;
+                    case Pipe.EscapeCodes.UP:
+                        buffer[pos++] = 'A';
+                        break;
+                    case Pipe.EscapeCodes.DOWN:
+                        buffer[pos++] = 'B';
+                        break;
+                    case Pipe.EscapeCodes.LEFT:
+                        buffer[pos++] = 'D';
+                        break;
+                    case Pipe.EscapeCodes.RIGHT:
+                        buffer[pos++] = 'C';
+                        break;
+                    case Pipe.EscapeCodes.ERASE_FROM_CURSOR:
+                        buffer[pos++] = 'K';
+                        break;
+                    case Pipe.EscapeCodes.CLEAR_SCREEN:
+                        buffer[pos++] = '2';
+                        buffer[pos++] = 'J';
+                        break;
+                    case Pipe.EscapeCodes.HOME:
+                        buffer[pos++] = '1';
+                        buffer[pos++] = '~';
+                        break;
+                    case Pipe.EscapeCodes.END:
+                        buffer[pos++] = '4';
+                        buffer[pos++] = '~';
+                        break;
+                    case Pipe.EscapeCodes.INSERT:
+                        buffer[pos++] = '2';
+                        buffer[pos++] = '~';
+                        break;
+                    case Pipe.EscapeCodes.DELETE:
+                        buffer[pos++] = '~';
+                        buffer[pos++] = '3';
+                        break;
+                }
+
+                Console.Write(buffer,0,pos);
+            }
+        }
+    }
+}
diff --git a/base/Applications/Shell/clock0.bmp b/base/Applications/Shell/clock0.bmp
new file mode 100644
index 0000000..1f7bd82
Binary files /dev/null and b/base/Applications/Shell/clock0.bmp differ
diff --git a/base/Applications/Shell/clock2.bmp b/base/Applications/Shell/clock2.bmp
new file mode 100644
index 0000000..3c2c0b0
Binary files /dev/null and b/base/Applications/Shell/clock2.bmp differ
diff --git a/base/Applications/Shell/clock4.bmp b/base/Applications/Shell/clock4.bmp
new file mode 100644
index 0000000..6f6d794
Binary files /dev/null and b/base/Applications/Shell/clock4.bmp differ
diff --git a/base/Applications/Shell/clock6.bmp b/base/Applications/Shell/clock6.bmp
new file mode 100644
index 0000000..34c006f
Binary files /dev/null and b/base/Applications/Shell/clock6.bmp differ
diff --git a/base/Applications/Shell/script.lang b/base/Applications/Shell/script.lang
new file mode 100644
index 0000000..6ecde28
--- /dev/null
+++ b/base/Applications/Shell/script.lang
@@ -0,0 +1,309 @@
+
+[fields] 
+{
+	bool TRACE = false;
+}
+
+[init]
+{
+
+
+}
+
+[tokens]
+{
+    if := "^if" 
+    else := "^else"
+    while := "^while"
+    bool := "^(true|false)"
+    equals_compare := "^=="
+    
+    lt := "^<"
+    le := "^<="
+    gt := "^>"
+    ge := "^>="
+    semicolon := "^;"
+    integer := "^-?\d+"
+    interp := "^""(([^\\""\r\n])|(\\.))*"""
+    { tok.value = ((String) tok.value).Replace("\"",""); }
+    
+    
+    string  := "^'([^'])*'"
+    { tok.value = ((String) tok.value).Replace("'",""); }
+    
+    comment := "^#.*"
+    { tok.value = null; }
+
+    word := "^\w+"
+    div := "^/"
+    equals := "^="
+    plus := "^\+"
+    mult := "^\*"
+    mod := "^%"
+    concat := "^\."
+    and := "^&&"
+    ampersand := "^&"
+    or :=  "^\|\|"
+    not := "^\!"
+    lparen := "^\("
+    rparen := "^\)"
+    lbrace := "^{"
+    rbrace := "^}"
+    minus := "^-"
+    
+    reference := "^((\$\w+)|(\$\(\w+\))|(\$\?)|(\$\(\?\))|(\$#)|(\$\(#\)))"
+    {  
+	   tok.value = ((String) tok.value).Replace("$","");
+	   tok.value =((String) tok.value).Replace("(","");
+	   tok.value = ((String) tok.value).Replace(")","");
+    }
+	
+    newline := "^\n"
+    { tok.optional = true; }
+	
+    whitespace := "^[ \f\r\t\v]+"
+    { tok.value = null; }
+	
+	lparen rparen > not
+	lparen rparen not > mult div mod
+	not lparen rparen mult div mod > plus minus concat and or
+}
+
+
+[grammar]
+{	
+	S => STMT_LIST:list
+	{
+		if(TRACE) Console.WriteLine("Reducing statement list to programm");
+		value = new ScriptEngine.Block((ArrayList) list);
+	}
+	
+	STMT_LIST => epsilon
+	{ 
+	  if(TRACE) Console.WriteLine("Rsmt epsilon");
+	  value  = new ArrayList();
+	 }
+	 
+	STMT_LIST => STMT:stmt  STMT_LIST:list 
+	{  
+		if(TRACE) Console.WriteLine("Reduction: adding statement to statement list");
+		((ArrayList) list).Insert(0,stmt);
+		value = list;
+	}
+
+	STMT => if lparen E:cond rparen lbrace STMT_LIST:stmts rbrace
+	{
+		if(TRACE) Console.WriteLine("Reducing if");
+		value = new ScriptEngine.If((ScriptEngine.Expression) cond, new ScriptEngine.Block((ArrayList) stmts));
+	}
+	STMT => if lparen E:cond rparen lbrace STMT_LIST:trueBranch rbrace else lbrace STMT_LIST:falseBranch rbrace 
+	{
+		if(TRACE) Console.WriteLine("Reducing if then else");
+		value = new ScriptEngine.IfThenElse((ScriptEngine.Expression) cond, new ScriptEngine.Block((ArrayList) trueBranch), new ScriptEngine.Block((ArrayList) falseBranch));
+	}
+	
+	STMT => while lparen E:cond rparen lbrace STMT_LIST:block rbrace
+	{
+		if(TRACE) Console.WriteLine("Reducing while loop");
+		value = new ScriptEngine.While((ScriptEngine.Expression) cond, new ScriptEngine.Block((ArrayList) block));	
+	}
+	
+	STMT => word:var equals E:expr newline	
+	{
+		if(TRACE) Console.WriteLine("Reducing assignment: " + var + "= " + expr);
+		value = new ScriptEngine.Assign((String) var, (ScriptEngine.Expression) expr);
+	}
+	
+	STMT => COMMAND:comm 
+	{
+		if(TRACE) Console.WriteLine("Reducing command list to statement: " + comm);
+		value = new ScriptEngine.Command((ArrayList) comm);
+	}
+	
+	STMT => ASYNC_COMMAND:comm 
+	{
+		if(TRACE) Console.WriteLine("Reducing command list to statement: " + comm);
+		value = new ScriptEngine.Command((ArrayList) comm, true);
+	}
+
+
+	COMMAND => COMM:elem COMM_LIST:list newline
+	{
+		if(TRACE) Console.WriteLine("reducing command list to command");
+		((ArrayList) list).Insert(0,elem);
+		value = list;
+	}
+
+
+	ASYNC_COMMAND => COMM:elem COMM_LIST:list ampersand newline
+	{
+		if(TRACE) Console.WriteLine("reducing command list to command");
+		((ArrayList) list).Insert(0,elem);
+		value = list;
+	}
+
+	
+	
+	COMM_LIST =>  COMM:elem COMM_LIST:list
+	{
+        ArrayList rest = (ArrayList)list;
+		if(TRACE) {
+           Console.WriteLine("reducing commlist: '{0}'", elem);
+           int i=0;
+           foreach (object o in rest) {
+              Console.WriteLine("  [{0}] = {1}", i++, o);
+           }
+        }
+		rest.Insert(0,elem);
+		value = list;
+	}
+	
+	COMM_LIST => epsilon
+	{ 
+		value = new ArrayList(); 
+	}
+	
+	COMM => reference:varRef
+	{   
+		if(TRACE) Console.WriteLine("Reducing variable in command reference: '{0}'", varRef);
+		value = new ScriptEngine.VariableReference((String) varRef);
+	}
+
+	COMM => interp:str
+	{
+		if(TRACE) Console.WriteLine("Reducing interp: '{0}'", str);
+        value = new ScriptEngine.StringInterpolation((String) str); 
+    }
+
+	COMM => string:str
+	{ 
+		if(TRACE) Console.WriteLine("Reducing string: '{0}'", str);
+        value = new ScriptEngine.StringLiteral((String) str); 
+    }
+
+	COMM => word:w
+	{
+		if(TRACE) Console.WriteLine("Reducing command word: '{0}'", w);
+		value = new ScriptEngine.StringLiteral((String) w);
+	}
+
+	COMM => integer:integer
+	{ value = new ScriptEngine.IntegerLiteral(Int32.Parse((String) integer)); }
+
+
+	
+	E => lparen E:e rparen
+	{ value = e; }
+	
+	E => integer:intString
+	{ 
+		if(TRACE) Console.WriteLine("Reducing integer literal expression: " + intString);
+		value = new ScriptEngine.IntegerLiteral(Int32.Parse((String) intString)); 
+	}
+	
+	E => interp:interp
+	{ value = new ScriptEngine.StringInterpolation((String) interp); }
+	E => string:strVal
+	{ 
+		if(TRACE) Console.WriteLine("Reducing string literal expression: " + strVal);
+		value = new ScriptEngine.StringLiteral((String) strVal); 
+	}
+	
+	E => bool:boolVal
+	{ 
+		if(TRACE) Console.WriteLine("reducing bool literal expression");
+		value = new ScriptEngine.BooleanLiteral(Boolean.Parse((String) boolVal));
+	}
+	
+	E => reference:varRef
+	{
+		value = new ScriptEngine.VariableReference((String) varRef);
+	}
+	
+	E => E:e1 and E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean and");
+		value = new ScriptEngine.And((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	
+	E => E:e1 or E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean or");
+		value = new ScriptEngine.Or((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	
+	E => E:e1 lt E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean less");
+		value = new ScriptEngine.Less((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	
+	E => E:e1 le E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean less than or equal");
+		value = new ScriptEngine.LessEqual((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	
+	E => E:e1 equals_compare E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean ==");
+		value = new ScriptEngine.Equal((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	
+	E => E:e1 gt E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean greater");
+		value = new ScriptEngine.Greater((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	E => E:e1 ge E:e2
+	{
+		if(TRACE) Console.WriteLine("reducing to boolean greater than or equal");
+		value = new ScriptEngine.GreaterEqual((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}	
+	
+	E => not E:e1
+	{ 
+		if(TRACE) Console.WriteLine("reducing to boolean and");
+		value = new ScriptEngine.Negate((ScriptEngine.Expression) e1);
+	}
+	
+	E => reference:varRef
+	{ 
+		if(TRACE) Console.WriteLine("Reducing expression variable reference");
+		value = new ScriptEngine.VariableReference((String) varRef);
+	}
+	
+	E => E:e1 plus E:e2
+	{ 
+		if(TRACE) Console.WriteLine("Reducing plus");
+		value = new ScriptEngine.Add((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+      }
+
+	E => E:e1 minus E:e2
+	{ 
+		if(TRACE) Console.WriteLine("Reducing minus");
+		value = new ScriptEngine.Subtract((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+      }
+	
+	E => E:e1 mult E:e2
+	{ 
+		if(TRACE) Console.WriteLine("Reducing multiply");
+		value = new ScriptEngine.Multiply((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	E => E:e1 mod E:e2
+	{ 
+		if(TRACE) Console.WriteLine("Reducing modulus");
+		value = new ScriptEngine.Mod((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+
+	E => E:e1 div E:e2
+	{ 
+		if(TRACE) Console.WriteLine("Reducing divide");
+		value = new ScriptEngine.Divide((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);
+	}
+	E => E:e1 concat E:e2
+	{ 
+		value = new ScriptEngine.Concat((ScriptEngine.Expression) e1, (ScriptEngine.Expression) e2);	
+	}
+
+}
\ No newline at end of file
diff --git a/base/Applications/Sleep/Sleep.cs b/base/Applications/Sleep/Sleep.cs
new file mode 100644
index 0000000..8b5014a
--- /dev/null
+++ b/base/Applications/Sleep/Sleep.cs
@@ -0,0 +1,93 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Sleep.cs
+//
+//  Note:   Shell utility to pause execution.
+//
+
+using System;
+using System.Threading;
+// using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications 
+{
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter( "seconds", Mandatory=true, Position=0, HelpMessage="seconds")]
+        internal long seconds;
+
+        [BoolParameter( "m", Default=false , HelpMessage="treat time as milliseconds")]
+        internal bool doMilli;
+
+        [BoolParameter( "v", Default=false , HelpMessage="verbose output")]
+        internal bool doVerbose;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Sleep.AppMain(this);
+        }
+    }
+    
+    public class Sleep
+    {
+        private static void ConsoleWriteDateTime(string preamble, DateTime dt)
+        {
+            Console.WriteLine("{0}{1:d4}/{2:d2}/{3:d2} {4:d2}:{5:d2}:{6:d2}.{7:d3}",
+                              preamble, dt.Year, dt.Month, dt.Day,
+                              dt.Hour, dt.Minute, dt.Second, dt.Millisecond);
+        }
+
+        private static void ConsoleWriteDateTime(string preamble, TimeSpan sp)
+        {
+            Console.WriteLine("{0}{1}", preamble, sp.ToString());
+
+        }
+
+
+        private static void DoDate(string pre)
+        {
+            Console.WriteLine(pre + "cycles: {0}", Processor.CycleCount );
+            ConsoleWriteDateTime(pre , DateTime.UtcNow);
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+             try {
+                uint seconds = (uint) config.seconds; 
+                
+                if(config.doVerbose) DoDate(" pre  ");
+                if (config.doMilli)  {
+                    Thread.Sleep(TimeSpan.FromMilliseconds(seconds));
+                }
+                else {
+                    Thread.Sleep(TimeSpan.FromSeconds(seconds));
+                }
+                if(config.doVerbose) DoDate(" post ");
+                return 0;
+            }
+            catch (ArgumentOutOfRangeException) {     // From Thread.Sleep
+                Console.WriteLine("Value too large :- \"{0}\"", config.seconds);
+            }
+            return 1;
+        }
+    }
+}
diff --git a/base/Applications/Sleep/Sleep.csproj b/base/Applications/Sleep/Sleep.csproj
new file mode 100644
index 0000000..0059bf9
--- /dev/null
+++ b/base/Applications/Sleep/Sleep.csproj
@@ -0,0 +1,27 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Sleep</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Sleep.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Slides/DemoDeck.ppt b/base/Applications/Slides/DemoDeck.ppt
new file mode 100644
index 0000000..016306a
Binary files /dev/null and b/base/Applications/Slides/DemoDeck.ppt differ
diff --git a/base/Applications/Slides/EndOfShow.bmp b/base/Applications/Slides/EndOfShow.bmp
new file mode 100644
index 0000000..42f8b89
Binary files /dev/null and b/base/Applications/Slides/EndOfShow.bmp differ
diff --git a/base/Applications/Slides/Resources.cpp b/base/Applications/Slides/Resources.cpp
new file mode 100644
index 0000000..65e4917
--- /dev/null
+++ b/base/Applications/Slides/Resources.cpp
@@ -0,0 +1,13 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Stub
+//
+//
+#include "hal.h"
+
+#include "Content.cpp"
diff --git a/base/Applications/Slides/Slide.bmp b/base/Applications/Slides/Slide.bmp
new file mode 100644
index 0000000..42f8b89
Binary files /dev/null and b/base/Applications/Slides/Slide.bmp differ
diff --git a/base/Applications/Slides/Slide1.BMP b/base/Applications/Slides/Slide1.BMP
new file mode 100644
index 0000000..9a60239
Binary files /dev/null and b/base/Applications/Slides/Slide1.BMP differ
diff --git a/base/Applications/Slides/Slide2.BMP b/base/Applications/Slides/Slide2.BMP
new file mode 100644
index 0000000..5054ee5
Binary files /dev/null and b/base/Applications/Slides/Slide2.BMP differ
diff --git a/base/Applications/Slides/Slide3.BMP b/base/Applications/Slides/Slide3.BMP
new file mode 100644
index 0000000..c3aef2d
Binary files /dev/null and b/base/Applications/Slides/Slide3.BMP differ
diff --git a/base/Applications/Slides/Slide4.BMP b/base/Applications/Slides/Slide4.BMP
new file mode 100644
index 0000000..97207bd
Binary files /dev/null and b/base/Applications/Slides/Slide4.BMP differ
diff --git a/base/Applications/Slides/Slide5.BMP b/base/Applications/Slides/Slide5.BMP
new file mode 100644
index 0000000..7532878
Binary files /dev/null and b/base/Applications/Slides/Slide5.BMP differ
diff --git a/base/Applications/Slides/Slides.csproj b/base/Applications/Slides/Slides.csproj
new file mode 100644
index 0000000..d5bf87c
--- /dev/null
+++ b/base/Applications/Slides/Slides.csproj
@@ -0,0 +1,36 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Slides</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Slides.sg" />
+    <BinaryResource Include="Slide.bmp">
+      <ClassName>Slides</ClassName>
+      <Namespace>Microsoft.Singularity.Applications</Namespace>
+      <FieldName>Content</FieldName>
+      <OutputAsArray>true</OutputAsArray>
+    </BinaryResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Slides/Slides.sg b/base/Applications/Slides/Slides.sg
new file mode 100644
index 0000000..d9766c4
--- /dev/null
+++ b/base/Applications/Slides/Slides.sg
@@ -0,0 +1,502 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   slides.cs
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.GC;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Channels;
+using Keyboard = Microsoft.Singularity.Io.Keyboard;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class SlideShow
+    {
+        public static KeyboardDeviceContract.Imp:Ready OpenKeyboard(string! devName)
+        {
+            KeyboardDeviceContract.Exp! exp;
+            KeyboardDeviceContract.Imp! imp;
+            KeyboardDeviceContract.NewChannel(out imp, out exp);
+
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            ErrorCode errorOut;
+            if (SdsUtils.Bind(devName, ns, exp, out errorOut)) {
+                switch receive {
+                    case imp.Success():
+                        break;
+                    case imp.ContractNotSupported():
+                        throw new Exception("Contract not supported");
+                    case imp.ChannelClosed():
+                        throw new Exception("Didn't imp.RecvActConnect");
+                }
+                delete ns;
+                return imp;
+            }
+
+            if (errorOut == ErrorCode.ChannelClosed)
+            {
+                // Why is this a special case?
+                throw new Exception("Encountered a ChannelClosed while opening Keyboard");
+            }
+            DebugStub.WriteLine(
+                "OpenKeyboard lookup of {0} failed ({1})\n",
+                __arglist(devName, SdsUtils.ErrorCodeToString(errorOut))
+                );
+
+            delete imp;
+            delete ns;
+            return null;
+        }
+
+        public static VideoDeviceContract.Imp:Ready OpenVideo(string! devName)
+        {
+            VideoDeviceContract.Exp! exp;
+            VideoDeviceContract.Imp! imp;
+            VideoDeviceContract.NewChannel(out imp, out exp);
+
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            ErrorCode errorCode;
+            if (SdsUtils.Bind(devName, ns, exp, out errorCode)) {
+                switch receive {
+                    case imp.Success():
+                        break;
+                    case imp.ContractNotSupported():
+                        throw new Exception("Contract not supported");
+                    case imp.ChannelClosed():
+                        throw new Exception("Didn't imp.RecvActConnect");
+                }
+                delete ns;
+                return imp;
+            }
+
+            DebugStub.WriteLine(
+                "OpenVideo lookup of {0} failed : {1}\n",
+                __arglist(devName, SdsUtils.ErrorCodeToString(errorCode))
+                );
+            delete imp;
+            delete ns;
+            return null;
+        }
+
+        public static int Main(string[] args)
+        {
+            Console.WriteLine("{0,13:f6}", (double)1.0);
+            Console.WriteLine("{0,13:f6}", (double)10.0);
+            Console.WriteLine("{0,13:f6}", (double)100.0);
+            Console.WriteLine("{0,13:f6}", (double)1000.0);
+            Console.WriteLine("{0,13:f6}", (double)10000.0);
+            Console.WriteLine("{0,13:f6}", (double)100000.0);
+            Console.WriteLine("{0,13:f6}", (double)0.1);
+            Console.WriteLine("{0,13:f6}", (double)0.01);
+            Console.WriteLine("{0,13:f6}", (double)0.001);
+            Console.WriteLine("{0,13:f6}", (double)0.0001);
+            Console.WriteLine("{0,13:f6}", (double)0.00001);
+            Console.WriteLine("{0,13:f6}", (double)0.000001);
+
+            VideoDeviceContract.Imp video = OpenVideo("/dev/video");
+
+            Console.WriteLine("Singularity Slide Show Viewer (PID={0})",
+                              ProcessService.GetCurrentProcessId());
+            DebugStub.WriteLine("Singularity Slide Show Viewer (PID={0})",
+                                __arglist(ProcessService.GetCurrentProcessId()));
+
+            if (video == null) {
+                Console.WriteLine("Can only display slides on a graphic display.");
+                return 1;
+            }
+            if (Slides.Content == null || Slides.Content.Length == 0) {
+                Console.WriteLine("No slides to display.");
+                delete video;
+                return 1;
+            }
+
+            KeyboardDeviceContract.Imp keyboard = OpenKeyboard("/dev/keyboard");
+            if (keyboard == null) {
+                // TODO: show keyboardless slides with timer?
+                delete video;
+                return 1;
+            }
+            int slide = 0;
+
+            byte[] currentSlide = (!)Slides.Content[slide];
+            byte[]! in ExHeap current = new[ExHeap] byte [currentSlide.Length];
+            Bitter.FromByteArray(current, 0, currentSlide.Length,
+                                 currentSlide, 0);
+            video.SendFill(0, 0, 1023, 767, 0);
+            video.RecvAckFill();
+            video.SendBitBltBmp(32, 16, current);
+            video.RecvAckBitBltBmp(out current);
+
+            try {
+                for (;;) {
+                    int x;
+                    int y;
+                    bool go_back = false;
+                    bool go_fore = false;
+                    bool go_home = false;
+                    bool go_end = false;
+
+                    uint key = 0;
+                    keyboard.SendGetKey();
+                    switch receive {
+                        case keyboard.AckKey(ikey):
+                            key = ikey;
+                            break;
+                        case keyboard.NakKey():
+                            break;
+                        case keyboard.ChannelClosed():
+                            throw new Exception("Didn't get reply from Keyboard");
+                    }
+
+                    if (key == 0) {
+                        Console.WriteLine("GetKey failed, try typing `start slides'.");
+                        DebugStub.WriteLine("GetKey failed.");
+                        Tracing.Log(Tracing.Warning, "GetKey failed.");
+                        break;
+                    }
+                    if ((key & (uint)Keyboard.Qualifiers.KEY_DOWN) == 0) {
+                        continue;
+                    }
+                    if ((key & (uint)Keyboard.Qualifiers.KEY_MOUSE) == 0) {
+                        char c = (char)(key & (uint)Keyboard.Qualifiers.KEY_BASE_CODE);
+
+                        switch (c) {
+                            case (char)Keyboard.Keys.ESCAPE:
+                                delete video;
+                                delete keyboard;
+                                delete current;
+                                return 0;
+                            case (char)Keyboard.Keys.HOME:
+                                go_home = true;
+                                break;
+                            case (char)Keyboard.Keys.UP_ARROW:
+                            case (char)Keyboard.Keys.LEFT_ARROW:
+                            case (char)Keyboard.Keys.PAGE_UP:
+                            case '\b':
+                                go_back = true;
+                                break;
+                            case (char)Keyboard.Keys.DOWN_ARROW:
+                            case (char)Keyboard.Keys.RIGHT_ARROW:
+                            case (char)Keyboard.Keys.PAGE_DOWN:
+                            case '\n':
+                            case ' ':
+                                go_fore = true;
+                                break;
+                            case (char)Keyboard.Keys.END:
+                                go_end = true;
+                                break;
+                            default:
+                                continue;
+                        }
+                    }
+                    else {
+                        if ((key & (uint)Keyboard.Qualifiers.MOUSE_BUTTON_1) != 0) {
+                            go_fore = true;
+                        }
+                        else if ((key & (uint)Keyboard.Qualifiers.MOUSE_BUTTON_0) != 0) {
+                            go_back = true;
+                        }
+                        else {
+                            continue;
+                        }
+                    }
+
+                    if (go_home) {
+                        slide = 0;
+                        currentSlide = (!)Slides.Content[slide];
+                    }
+                    else if (go_fore) {
+                        ++slide;
+                        if (slide >= Slides.Content.Length) {
+                            slide = Slides.Content.Length;
+                            currentSlide = (!)EndOfShow.Content[0];
+                        }
+                        else {
+                            currentSlide = (!)Slides.Content[slide];
+                        }
+                    }
+                    else if (go_back) {
+                        if (--slide < 0) {
+                            slide = 0;
+                        }
+                        currentSlide = (!)Slides.Content[slide];
+                    }
+                    else if (go_end) {
+                        slide = Slides.Content.Length;
+                        currentSlide = (!)EndOfShow.Content[0];
+                    }
+
+                    if (current.Length < currentSlide.Length) {
+                        delete current;
+                        current = new[ExHeap] byte [currentSlide.Length];
+                    }
+                    Bitter.FromByteArray(current, 0, currentSlide.Length,
+                                         currentSlide, 0);
+                    video.SendFill(0, 0, 1023, 767, 0);
+                    video.RecvAckFill();
+                    video.SendBitBltBmp(32, 16, current);
+                    video.RecvAckBitBltBmp(out current);
+                }
+            }
+            catch (Exception e) {
+                DebugStub.WriteLine("Caught exception: {0}", __arglist(e));
+            }
+
+            delete keyboard;
+            delete video;
+            delete current;
+
+            return 0;
+        }
+    }
+
+    public class EndOfShow {
+        public static readonly byte[][]! Content = {
+            new byte[] {
+                0x42,0x4d,0x0e,0x10,0x00,0x00,0x00,0x00,
+                0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00,
+                0x00,0x00,0x67,0x00,0x00,0x00,0x0d,0x00,
+                0x00,0x00,0x01,0x00,0x18,0x00,0x00,0x00,
+                0x00,0xff,0xd8,0x0f,0x00,0x00,0x00,0x00,
+                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x00,0x00,0x00,0x00,0x00,0x00,0x98,0xff,
+                0x00,0x00,0x00,0x98,0xff,0x00,0x00,0x00,
+                0xfe,0xff,0x00,0x00,0x00,0xfa,0xff,0xff,
+                0xff,0xff,0xfe,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+                0xfa,0xff,0x00,0x00,0x00,0xfd,0xff,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfa,0xff,0x00,0x00,
+                0x00,0xfd,0xff,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0xfc,
+                0xff,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0xfd,0xff,0xff,0xff,0xff,0xf9,0xff,
+                0x00,0x00,0x00,0xfd,0xff,0xff,0xff,0xff,
+                0xfd,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0xfd,0xff,0xff,0xff,0xff,0xfc,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfd,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xf9,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfd,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfe,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfd,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfb,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfd,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfe,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfb,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfd,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfe,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfd,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfb,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfd,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfd,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfd,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xf9,0xff,0x00,0x00,0x00,0xfe,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xf9,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfe,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfb,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfe,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xf7,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfe,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfe,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xf3,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfe,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfe,0xff,0x00,0x00,
+                0x00,0x15,0x00,0xff,0xff,0xff,0x00,0x00,
+                0x00,0xff,0xff,0xff,0x00,0x00,0x00,0xff,
+                0xff,0xff,0x00,0x00,0x00,0xff,0xff,0xff,
+                0xfa,0xff,0x00,0x00,0x00,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xf9,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfd,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfd,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfb,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfd,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfa,0xff,0x00,
+                0x00,0x00,0xfd,0xff,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfd,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfe,
+                0xff,0x00,0x00,0x00,0xfb,0xff,0xff,0xff,
+                0xff,0xfa,0xff,0x00,0x00,0x00,0xfd,0xff,
+                0xff,0xff,0xff,0xfd,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfd,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfe,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfd,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x15,0x00,0xff,0xff,0xff,0x00,0x00,0x00,
+                0xff,0xff,0xff,0x00,0x00,0x00,0xff,0xff,
+                0xff,0x00,0x00,0x00,0xff,0xff,0xff,0xfa,
+                0xff,0x00,0x00,0x00,0xfe,0xff,0x00,0x00,
+                0x00,0xfa,0xff,0xff,0xff,0xff,0xfe,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfd,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfe,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfb,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfd,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfe,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfb,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfa,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfe,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfe,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfd,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfb,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfa,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfe,0xff,0x00,0x00,
+                0x00,0x15,0x00,0xff,0xff,0xff,0x00,0x00,
+                0x00,0xff,0xff,0xff,0x00,0x00,0x00,0xff,
+                0xff,0xff,0x00,0x00,0x00,0xff,0xff,0xff,
+                0xfa,0xff,0x00,0x00,0x00,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xf9,
+                0xff,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfe,0xff,0x00,
+                0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xfb,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfd,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfb,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfe,
+                0xff,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfd,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfb,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfe,0xff,0x00,0x00,0x00,0xfe,0xff,
+                0xff,0xff,0xff,0xfe,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x09,0x00,0xff,0xff,
+                0xff,0x00,0x00,0x00,0xff,0xff,0xff,0xfd,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xfd,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xfb,0xff,0x00,0x00,0x00,
+                0xfe,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xf9,0xff,0x00,0x00,0x00,0x06,
+                0x00,0xff,0xff,0xff,0x00,0x00,0x00,0xfe,
+                0xff,0xff,0xff,0xff,0xfc,0xff,0x00,0x00,
+                0x00,0xfe,0xff,0xff,0xff,0xff,0x06,0x00,
+                0x00,0x00,0x00,0xff,0xff,0xff,0xfa,0xff,
+                0x00,0x00,0x00,0xfd,0xff,0xff,0xff,0xff,
+                0xfe,0xff,0x00,0x00,0x00,0xfd,0xff,0xff,
+                0xff,0xff,0xfb,0xff,0x00,0x00,0x00,0xfd,
+                0xff,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfe,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfd,0xff,0x00,0x00,0x00,0xfe,0xff,0xff,
+                0xff,0xff,0x06,0x00,0x00,0x00,0x00,0xff,
+                0xff,0xff,0xfd,0xff,0x00,0x00,0x00,0xfd,
+                0xff,0xff,0xff,0xff,0xf9,0xff,0x00,0x00,
+                0x00,0xfd,0xff,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x06,0x00,0xff,0xff,0xff,
+                0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+                0xfc,0xff,0x00,0x00,0x00,0xfd,0xff,0xff,
+                0xff,0xff,0xfe,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xfd,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfd,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfb,0xff,0x00,0x00,0x00,0xfe,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xee,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xf4,0xff,0x00,0x00,0x00,0x03,0x00,
+                0xff,0xff,0xff,0xf4,0xff,0x00,0x00,0x00,
+                0x03,0x00,0xff,0xff,0xff,0xf7,0xff,0x00,
+                0x00,0x00,0x03,0x00,0xff,0xff,0xff,0xed,
+                0xff,0x00,0x00,0x00,0x03,0x00,0xff,0xff,
+                0xff,0xe6,0xff,0x00,0x00,0x00,0xfe,0xff,
+                0x00,0x00,0x00,0xfa,0xff,0xff,0xff,0xff,
+                0xf3,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xf3,0xff,0x00,0x00,0x00,0xfe,
+                0xff,0xff,0xff,0xff,0xf6,0xff,0x00,0x00,
+                0x00,0x03,0x00,0xff,0xff,0xff,0xfe,0xff,
+                0x00,0x00,0x00,0x03,0x00,0xff,0xff,0xff,
+                0xfa,0xff,0x00,0x00,0x00,0x03,0x00,0xff,
+                0xff,0xff,0xed,0xff,0x00,0x00,0x00,0x03,
+                0x00,0xff,0xff,0xff,0xe6,0xff,0x00,0x00,
+                0x00,0x98,0xff,0x00,0x00,0x00,0x98,0xff,
+                0x00,0x00,0x00,
+            },
+        };
+    }
+}
diff --git a/base/Applications/TaskList/TaskList.csproj b/base/Applications/TaskList/TaskList.csproj
new file mode 100644
index 0000000..ce0f69e
--- /dev/null
+++ b/base/Applications/TaskList/TaskList.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>TaskList</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="TaskList.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/TaskList/TaskList.sg b/base/Applications/TaskList/TaskList.sg
new file mode 100644
index 0000000..b936a2a
--- /dev/null
+++ b/base/Applications/TaskList/TaskList.sg
@@ -0,0 +1,431 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TaskList.cs
+//
+//  Note:   Simple Windows XP-like TaskList program.
+//
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Tasklist [options]  Displays XP-like task information",
+                     DefaultAction=true)]
+    internal sealed class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<ProcessContract.Imp:Start> processRef;
+
+        [Endpoint]
+        public readonly TRef<MemoryContract.Imp:Start> memoryRef;
+
+        [Endpoint]
+        public readonly TRef<ChannelContract.Imp:Start> channelRef;
+
+        [BoolParameter( "d", Default=false , HelpMessage="Dumps output and PageTable to Debugger.")]
+        internal bool dumpTable;
+
+        [BoolParameter( "c", Default=false , HelpMessage="Displays channels per process.")]
+        internal bool displayChannels;
+
+        [BoolParameter( "t", Default=false , HelpMessage="Displays ThreadIds per process.")]
+        internal bool displayThreads;
+
+        [LongParameter( "r", Default=-1, HelpMessage="Repeat every <n> seconds")]
+        internal long pauseSeconds;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return TaskList.AppMain(this);
+        }
+    }
+
+    public class TaskList
+    {
+        public class ProcessData
+        {
+            public int id;
+            public string name;
+            public long memBytes;
+            public long peakMemBytes;
+            public long commMemBlocks;
+            public long commMemBytes;
+            public long handlePages;
+            public int[] tids; 
+            
+            public ProcessData() {
+                tids = null; 
+            }
+        }
+
+        public class ChannelData
+        {
+            public int ChannelId;
+            public int ImpProcessId;
+            public int ExpProcessId;
+            public int MessagesDeliveredToImp;
+            public int MessagesDeliveredToExp;
+        }
+
+        public static int []! GetProcessIDs(ProcessContract.Imp:ReadyState! imp)
+        {
+            int [] ids = null;
+            int[]! in ExHeap xids;
+            imp.SendGetProcessIDs();
+            imp.RecvProcessIDs(out xids);
+            // REVIEW: The kernel process is being returned twice so we're
+            // skipping one of the entries if the process ID matches.
+            int startIndex = 0;
+            if (xids[0] == xids[1])
+                startIndex++;
+            ids = new int[xids.Length - startIndex];
+            for (int i = startIndex; i < xids.Length; i++)
+            {
+                ids[i - startIndex] = xids[i];
+            }
+            delete xids;
+            return ids;
+        }
+
+        public static int [] GetProcessThreadIDs(ProcessContract.Imp:ReadyState! imp, int procID)
+        {
+            imp.SendGetProcessThreadIDs(procID);
+            int [] retVal = null; 
+            
+            switch receive
+            {
+                case imp.NotFound() :
+                    break;
+
+                case imp.ProcessThreadIDs(int[]! in ExHeap tids) :
+                    retVal = new int[tids.Length];
+                    for (int i=0; i<tids.Length; i++) {
+                        retVal[i] = tids[i]; 
+                    } 
+                    delete tids;
+                    break;
+
+                case imp.ChannelClosed() :
+                    throw new Exception("GetProcessThreadIDs: imp channel closed");
+            }
+            return retVal; 
+        } 
+
+        public static string []! GetProcessNames(ProcessContract.Imp:ReadyState! imp, int []! ids)
+        {
+            string [] names = new string[ids.Length];
+            for (int i = 0; i < ids.Length; i++)
+            {
+                imp.SendGetProcessName(ids[i]);
+
+                switch receive
+                {
+                    case imp.NotFound() :
+                        break;
+
+                    case imp.ProcessName(char[]! in ExHeap procName) :
+                        names[i] = Bitter.ToString(procName);
+                        delete procName;
+                        break;
+
+                    case imp.ChannelClosed() :
+                        throw new Exception("GetProcessNames: imp channel closed");
+                }
+            }
+            return names;
+        }
+
+        public static void GetMemoryUsage(MemoryContract.Imp:ReadyState! imp, ProcessData[]! processData)
+        {
+            for (int i = 0; i < processData.Length; i++)
+            {
+                ProcessData! pd = (!)processData[i];
+                imp.SendGetProcessUsedMemory(pd.id);
+                imp.RecvMemory(out pd.memBytes);
+
+                imp.SendGetProcessPeakMemory(pd.id);
+                imp.RecvMemory(out pd.peakMemBytes);
+
+                imp.SendProcessUsedCommunicationHeap(pd.id);
+                imp.RecvBlocksAndTotal(out pd.commMemBlocks, out pd.commMemBytes);
+
+                imp.SendGetProcessHandlePages(pd.id);
+                imp.RecvPages(out pd.handlePages);
+            }
+        }
+
+        internal static ProcessData[]! GetProcessData(Parameters! config)
+        {
+            ProcessContract.Imp imp = config.processRef.Acquire(); 
+            if (imp == null)
+            {
+                throw new ApplicationException("Error: Unable to bind to " + ProcessContract.ModuleName);
+            }
+            int [] ids = GetProcessIDs(imp);
+            string [] names = GetProcessNames(imp, ids);
+            
+
+            ProcessData [] processData= new ProcessData[ids.Length];
+            for (int i = 0; i < ids.Length; i++)
+            {
+                ProcessData! pd = new ProcessData();
+                pd.id = ids[i];
+                pd.name = names[i];
+                pd.tids = GetProcessThreadIDs(imp, ids[i]); 
+                processData[i] = pd;
+            }
+
+            config.processRef.Release(imp);
+
+            MemoryContract.Imp impMem = config.memoryRef.Acquire();
+            if (impMem == null)
+            {
+                throw new ApplicationException("Error: Unable to bind to " + MemoryContract.ModuleName);
+            }
+            GetMemoryUsage(impMem, processData);
+
+            config.memoryRef.Release(impMem);
+
+            return processData;
+        }
+
+        internal static ChannelData []! GetChannelData(ProcessData [] processData, Parameters! config)
+        {
+            ChannelContract.Imp imp = config.channelRef.Acquire();
+            if (imp == null)
+            {
+                throw new ApplicationException("Error: Unable to bind to " + ChannelContract.ModuleName);
+            }
+
+            ChannelInfo[]! in ExHeap channels;
+            imp.SendGetChannels();
+            imp.RecvChannels(out channels);
+
+            ChannelData [] channelData = new ChannelData[channels.Length];
+            for (int i = 0; i < channels.Length; i++)
+            {
+                ChannelData cd = new ChannelData();
+                channelData[i] = cd;
+
+                cd.ChannelId = channels[i].ChannelId;
+                cd.ImpProcessId = channels[i].ImpProcessId;
+                cd.ExpProcessId = channels[i].ExpProcessId;
+                cd.MessagesDeliveredToImp = channels[i].MessagesDeliveredToImp;
+                cd.MessagesDeliveredToExp = channels[i].MessagesDeliveredToExp;
+            }
+            config.channelRef.Release(imp);
+            delete channels;
+
+            return channelData;
+        }
+
+        public static ArrayList! GetImportedChannels(ChannelData[]! channelData, int processId)
+        {
+            ArrayList channelList = new ArrayList();
+            for (int i = 0; i < channelData.Length; i++)
+            {
+                ChannelData cd = channelData[i];
+                if (cd == null) continue;
+                if (cd.ImpProcessId == processId)
+                {
+                    channelList.Add(channelData[i]);
+                }
+            }
+            return channelList;
+        }
+
+        public static ArrayList! GetExportedChannels(ChannelData[]! channelData, int processId)
+        {
+            ArrayList channelList = new ArrayList();
+            for (int i = 0; i < channelData.Length; i++)
+            {
+                ChannelData cd = channelData[i];
+                if (cd == null) continue;
+                if (cd.ExpProcessId == processId)
+                {
+                    channelList.Add(channelData[i]);
+                }
+            }
+            return channelList;
+        }
+
+        public static bool ParseNumber(string! arg,
+                                       string! name,
+                                       out uint value)
+        {
+            // arg should look like "[-/][A-z]:[0-9]"
+            if (arg.Length >= 4)
+            {
+                try
+                {
+                    value = UInt32.Parse(arg.Substring(3));
+                    return true;
+                }
+                catch (FormatException)
+                {}
+                catch (OverflowException)
+                {}
+            }
+            Console.WriteLine("Could not parse {0}", name);
+            value = 0;
+            return false;
+        }
+
+        /// <summary>
+        /// Use this method to write output to both the screen and the debugger if toDebugger is true.
+        /// </summary>
+        public static void WriteLine(bool toDebugger, string format, params object[] args) {
+            string s = String.Format(format, args);
+            Console.WriteLine(s);
+            if (toDebugger) {
+                DebugStub.WriteLine(s);
+            }
+        } 
+
+        public static void WriteLine(bool toDebugger) {
+            Console.WriteLine();
+            if (toDebugger) {
+                DebugStub.WriteLine();
+            }
+        } 
+
+        internal static int AppMain(Parameters! config)
+        {
+            ProcessData [] processData;
+            ChannelData [] channelData;
+
+            // Set the default options
+            bool displayChannels = config.displayChannels;
+            bool displayThreads = config.displayThreads;
+            bool dumpTable = config.dumpTable; 
+            int pauseSeconds = (int) config.pauseSeconds;
+
+
+            ProcessContract.Imp imp1 = config.processRef.Acquire(); 
+            imp1.RecvReady();
+            config.processRef.Release(imp1); 
+
+            MemoryContract.Imp imp2 = config.memoryRef.Acquire(); 
+            imp2.RecvReady();
+            config.memoryRef.Release(imp2); 
+
+            ChannelContract.Imp imp3 = config.channelRef.Acquire(); 
+            imp3.RecvReady();
+            config.channelRef.Release(imp3); 
+            
+            do
+            {
+                // Retrieve the process and channel data
+                try
+                {
+                    processData = GetProcessData(config);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error retrieving process data.");
+                    Console.WriteLine(ex.ToString());
+                    return 1;
+                }
+                try
+                {
+                    channelData = GetChannelData(processData,config);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error retrieving channel data.");
+                    Console.WriteLine(ex.ToString());
+                    return 1;
+                }
+
+                // Prep for display
+                Hashtable processName = new Hashtable(processData.Length);
+                for (int i = 0; i < processData.Length; i++)
+                {
+                    ProcessData pd = processData[i];
+                    if (pd == null) continue;
+                    processName.Add(pd.id, pd.name);
+                }
+
+                // Display the results
+                Console.WriteLine();
+                WriteLine(dumpTable, "PID Task Name           Mem Usage Peak Mem Shared Mem Chan Imp Exp HP ");
+                WriteLine(dumpTable, "=== =================== ========= ======== ========== ======== === ===");
+
+                for (int i = 0; i < processData.Length; i++)
+                {
+                    ProcessData pd = processData[i];
+                    if (pd == null) continue;
+
+                    ArrayList importedChannels = GetImportedChannels(channelData, pd.id);
+                    ArrayList exportedChannels = GetExportedChannels(channelData, pd.id);
+
+                    WriteLine(dumpTable, "{0,3} {1,-19} {2,7} K {3,6} K {4,8} K {5,8} {6,3} {7,3}", pd.id,
+                                             pd.name, pd.memBytes / 1024, pd.peakMemBytes / 1024,
+                                             pd.commMemBytes / 1024, importedChannels.Count, exportedChannels.Count,
+                                             pd.handlePages);
+
+                    if (displayThreads) {
+                        if (pd.tids != null && pd.tids.Length > 0) {
+                            for (int j = 0; j < pd.tids.Length; j++) {
+                                WriteLine(dumpTable, "     tid -> {0}",pd.tids[j]); 
+                            }
+                        }
+                    }
+                    
+                    if (displayChannels)
+                    {
+                        // First display the imports
+                        for (int j = 0; j < importedChannels.Count; j++)
+                        {
+                            ChannelData data = (ChannelData!) importedChannels[j];
+                            WriteLine(dumpTable, "     -> {0} (cid={1}, msgs={2})",
+                                      processName[data.ExpProcessId], data.ChannelId, data.MessagesDeliveredToImp);
+                        }
+                        // Then display the exports
+                        for (int j = 0; j < exportedChannels.Count; j++)
+                        {
+                            ChannelData data = (ChannelData!) exportedChannels[j];
+                            WriteLine(dumpTable, "     <- {0} (cid={1}, msgs={2})",
+                                      processName[data.ImpProcessId], data.ChannelId, data.MessagesDeliveredToExp);
+                        }
+                    }
+                }
+                if (dumpTable) {
+                    AppRuntime.DumpPageTable(); 
+                }
+                if (pauseSeconds > 0) {
+                    Thread.Sleep(1000 * (int)pauseSeconds);
+                }
+            } while (pauseSeconds >= 0);
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/TaskTimes/TaskTimes.csproj b/base/Applications/TaskTimes/TaskTimes.csproj
new file mode 100644
index 0000000..4c252fc
--- /dev/null
+++ b/base/Applications/TaskTimes/TaskTimes.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>TaskTimes</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="TaskTimes.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/TaskTimes/TaskTimes.sg b/base/Applications/TaskTimes/TaskTimes.sg
new file mode 100644
index 0000000..f118d54
--- /dev/null
+++ b/base/Applications/TaskTimes/TaskTimes.sg
@@ -0,0 +1,656 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TaskList.cs
+//
+//  Note:   Simple Windows XP-like TaskList program.
+//
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="TaskTimes:  Displays snapshot of cpu times for all processes",
+                     DefaultAction=true)]
+    internal sealed class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<ProcessContract.Imp:Start> processRef;
+
+        [BoolParameter( "f", Default=false , HelpMessage="run forever")]
+        internal bool doForever;
+
+        [BoolParameter( "s", Default=false , HelpMessage="Summary Mode")]
+        internal bool doSummary;
+
+        [BoolParameter( "v", Default=false , HelpMessage="Verbose output")]
+        internal bool doVerbose;
+
+        [BoolParameter( "q", Default=false , HelpMessage="Quiet Mode (debug output only)")]
+        internal bool doQuiet;
+
+        [LongParameter( "r", Default=1, HelpMessage="Repeat every n seconds")]
+        internal long monitorSeconds;
+
+        [LongParameter( "i", Default=1, HelpMessage="Perform n iterations")]
+        internal long iterationCount;
+
+        [LongParameter( "w", Default=0, HelpMessage="warmup time in seconds")]
+        internal long warmupSeconds;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return TaskTimes.AppMain(this);
+        }
+    }
+
+    public class TaskTimes
+    {
+        public class ProcessData
+        {
+            public int id;
+            public string name;
+            public long memBytes;
+            public long peakMemBytes;
+            public long commMemBlocks;
+            public long commMemBytes;
+            public long handlePages;
+            public int[] tids; 
+            public long totalTime;
+            public long deadThreadTime;
+            public long deadThreadCount;
+            public int gcCount; 
+            public long gcTotalTime; 
+            public long gcTotalBytes; 
+           
+            public ProcessData() {
+                tids = null; 
+            }
+        }
+
+        public class ChannelData
+        {
+            public int ChannelId;
+            public int ImpProcessId;
+            public int ExpProcessId;
+            public int MessagesDeliveredToImp;
+            public int MessagesDeliveredToExp;
+        }
+
+        public static int []! GetProcessIDs(ProcessContract.Imp:ReadyState! imp)
+        {
+            int [] ids = null;
+            int[]! in ExHeap xids;
+            imp.SendGetProcessIDs();
+            imp.RecvProcessIDs(out xids);
+            // REVIEW: The kernel process is being returned twice so we're
+            // skipping one of the entries if the process ID matches.
+            int startIndex = 0;
+            if (xids[0] == xids[1])
+                startIndex++;
+            ids = new int[xids.Length - startIndex];
+            for (int i = startIndex; i < xids.Length; i++)
+            {
+                ids[i - startIndex] = xids[i];
+            }
+            delete xids;
+            return ids;
+        }
+
+        public static int [] GetProcessThreadIDs(ProcessContract.Imp:ReadyState! imp, int procID)
+        {
+            imp.SendGetProcessThreadIDs(procID);
+            int [] retVal = null; 
+            
+            switch receive
+            {
+                case imp.NotFound() :
+                    break;
+
+                case imp.ProcessThreadIDs(int[]! in ExHeap tids) :
+                    retVal = new int[tids.Length];
+                    for (int i=0; i<tids.Length; i++) {
+                        retVal[i] = tids[i]; 
+                    } 
+                    delete tids;
+                    break;
+
+                case imp.ChannelClosed() :
+                    throw new Exception("GetProcessThreadIDs: imp channel closed");
+            }
+            return retVal; 
+        } 
+
+
+        public static void GetProcessInfo(ProcessContract.Imp:ReadyState! imp, 
+                            ProcessData[]! processData
+                            )
+        {
+            for (int i = 0; i < processData.Length; i++) {
+                ProcessData! pd = (!)processData[i];
+                imp.SendGetProcessTimes(pd.id);
+                imp.RecvProcessTimes(out pd.totalTime, out pd.deadThreadTime, out pd.deadThreadCount);
+                imp.SendGetProcessGcStats(pd.id);
+                imp.RecvProcessGcStats(out pd.gcCount, out pd.gcTotalTime, out pd.gcTotalBytes);
+            }
+        } 
+
+        public static string []! GetProcessNames(ProcessContract.Imp:ReadyState! imp, int []! ids)
+        {
+            string [] names = new string[ids.Length];
+            for (int i = 0; i < ids.Length; i++)
+            {
+                imp.SendGetProcessName(ids[i]);
+
+                switch receive
+                {
+                    case imp.NotFound() :
+                        break;
+
+                    case imp.ProcessName(char[]! in ExHeap procName) :
+                        names[i] = Bitter.ToString(procName);
+                        delete procName;
+                        break;
+
+                    case imp.ChannelClosed() :
+                        throw new Exception("GetProcessNames: imp channel closed");
+                }
+            }
+            return names;
+        }
+
+        public static void GetMemoryUsage(MemoryContract.Imp:ReadyState! imp, ProcessData[]! processData)
+        {
+            for (int i = 0; i < processData.Length; i++)
+            {
+                ProcessData! pd = (!)processData[i];
+                imp.SendGetProcessUsedMemory(pd.id);
+                imp.RecvMemory(out pd.memBytes);
+
+                imp.SendGetProcessPeakMemory(pd.id);
+                imp.RecvMemory(out pd.peakMemBytes);
+
+                imp.SendProcessUsedCommunicationHeap(pd.id);
+                imp.RecvBlocksAndTotal(out pd.commMemBlocks, out pd.commMemBytes);
+
+                imp.SendGetProcessHandlePages(pd.id);
+                imp.RecvPages(out pd.handlePages);
+            }
+        }
+
+        public static ProcessData[]! GetProcessData(ProcessContract.Imp:ReadyState! imp)
+        {
+            int [] ids = GetProcessIDs(imp);
+            string [] names = GetProcessNames(imp, ids);
+            
+
+            ProcessData [] processData= new ProcessData[ids.Length];
+            for (int i = 0; i < ids.Length; i++)
+            {
+                ProcessData! pd = new ProcessData();
+                pd.id = ids[i];
+                pd.name = names[i];
+                pd.tids = GetProcessThreadIDs(imp, ids[i]); 
+                processData[i] = pd;
+            }
+            
+            GetProcessInfo(imp, processData); 
+
+            return processData;
+        }
+
+
+        public static bool ParseNumber(string! arg,
+                                       string! name,
+                                       out uint value)
+        {
+            // arg should look like "[-/][A-z]:[0-9]"
+            if (arg.Length >= 4)
+            {
+                try
+                {
+                    value = UInt32.Parse(arg.Substring(3));
+                    return true;
+                }
+                catch (FormatException)
+                {}
+                catch (OverflowException)
+                {}
+            }
+            Console.WriteLine("Could not parse {0}", name);
+            value = 0;
+            return false;
+        }
+
+        public static void PrintUsage()
+        {
+            Console.WriteLine();
+            Console.WriteLine("TaskTimes [options]");
+            Console.WriteLine();
+            Console.WriteLine("Options:");
+            Console.WriteLine("    /?      Displays this help/usage.");
+            Console.WriteLine("    /d      Output to debugger.");
+            Console.WriteLine("    /f      iterate forever");
+            Console.WriteLine("    /i:<n>  iterate <n> times.");
+            Console.WriteLine("    /q      Quiet mode (no console)");
+            Console.WriteLine("    /r:<n>  run (monitor) for <n> seconds.");
+            Console.WriteLine("    /s      summary mode)");
+        }
+
+        /// <summary>
+        /// Use this method to write output to both the screen and the debugger if toDebugger is true.
+        /// </summary>
+        public static void WriteLine(bool toDebugger, bool toDisplay, string format, params object[] args) {
+            string s = String.Format(format, args);
+            if (toDisplay)  Console.WriteLine(s);
+            if (toDebugger) DebugStub.WriteLine(s);
+        } 
+
+        public static void WriteLine(bool toDebugger, bool toDisplay) {
+            if (toDisplay)  Console.WriteLine();
+            if (toDebugger) DebugStub.WriteLine();
+        } 
+
+
+        public static void Write(bool toDebugger, bool toDisplay, string format, params object[] args) {
+            string s = String.Format(format, args);
+            if (toDisplay)  Console.Write(s);
+            if (toDebugger) DebugStub.Write(s);
+        } 
+
+    [CLSCompliant(false)]
+    public struct PerfEvtSel
+    {
+        // Bits and Flags
+        public const uint CNT_MASK  = 0xff000000;
+        public const uint INV       = 0x00800000;
+        public const uint EN        = 0x00400000;
+        public const uint INT       = 0x00100000;
+        public const uint PC        = 0x00080000;
+        public const uint E         = 0x00040000;
+        public const uint OS        = 0x00020000;
+        public const uint USR       = 0x00010000;
+        public const uint UNIT_MASK = 0x0000ff00;
+        public const uint SELECTOR  = 0x000000ff;
+
+        // Common setting: Count all, but don't interrupt,
+        public const uint COUNT     = (EN | PC | OS | USR);
+        // public const uint COUNT     = (EN | PC | E | OS | USR);
+
+        // Selector values.
+        public const uint DCacheRefillFromL2OrSys           = 0x42; // Speculative
+        public const uint DCacheRefillFromSystem            = 0x43; // Speculative
+        public const uint DtlbL1MissL2Hit                   = 0x45; // Speculative
+        public const uint DtlbL1MissL2Miss                  = 0x46; // Speculative
+        public const uint CyclesNotHalted                   = 0x76; // No E
+        public const uint RequestsToL2Cache                 = 0x7d;
+        public const uint L2CacheMiss                       = 0x7e;
+        public const uint ItlbL1MissL2Hit                   = 0x84;
+        public const uint ItlbL1MissL2Miss                  = 0x85;
+        public const uint RetiredInstructions               = 0xc0; // No E
+        public const uint RetiredBranchInstructions         = 0xc2; // No E
+        public const uint RetiredBranchesMispredicted       = 0xc3; // No E
+        public const uint RetiredBranchesTaken              = 0xc4; // No E
+        public const uint CyclesInterruptsMasked            = 0xcd; // No E
+        public const uint CyclesInterruptsBlocked           = 0xce; // No E
+
+        public ulong value; // Required so Bartok doesn't die.
+
+        public static string ToString(ulong value)
+        {
+            switch (value & 0xff) {
+                case PerfEvtSel.DCacheRefillFromL2OrSys:    return "DCache_Refill_L2";
+                case PerfEvtSel.DCacheRefillFromSystem:     return "DCache_Refill_Sys";
+                case PerfEvtSel.DtlbL1MissL2Hit:            return "DTLB_L2_Hit";
+                case PerfEvtSel.DtlbL1MissL2Miss:           return "DTBL_L2_Miss";
+                case PerfEvtSel.CyclesNotHalted:            return "CyclesNotHalted";
+                case PerfEvtSel.RequestsToL2Cache:
+                    if ((value & 0x400) != 0) {
+                        return "TLB_L2_Requests";
+                    }
+                    return "Req_L2_Cache";
+                case PerfEvtSel.L2CacheMiss:
+                    if ((value & 0x400) != 0) {
+                        return "TLB_L2_Miss";
+                    }
+                    return "L2_Cache_Miss";
+                case PerfEvtSel.ItlbL1MissL2Hit:            return "ITLB_L2_Hit";
+                case PerfEvtSel.ItlbL1MissL2Miss:           return "ITLB_L2_Miss";
+                case PerfEvtSel.RetiredInstructions:        return "Retired_Inst.";
+                case PerfEvtSel.RetiredBranchInstructions:  return "Branches";
+                case PerfEvtSel.RetiredBranchesMispredicted:return "Br_Mispredicted";
+                case PerfEvtSel.RetiredBranchesTaken:       return "Br_Taken";
+                case PerfEvtSel.CyclesInterruptsMasked:     return "Ints_Masked (cyc)";
+                case PerfEvtSel.CyclesInterruptsBlocked:    return "Ints_Blocked (cyc)";
+                default:
+                    return String.Format("{0:x16}", value);
+            }
+        }
+    }
+		
+		private static void InitializeCounters ()
+		{
+            Reset(0, PerfEvtSel.COUNT | PerfEvtSel.CyclesNotHalted);
+            Reset(1, PerfEvtSel.COUNT | PerfEvtSel.RetiredInstructions);
+            Reset(2, PerfEvtSel.COUNT | PerfEvtSel.CyclesInterruptsMasked);
+            Reset(3, PerfEvtSel.COUNT | PerfEvtSel.RequestsToL2Cache | 0x400);
+            DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+		}
+
+        internal static bool IsAmd()
+        {
+            uint eax;
+            uint ebx;
+            uint ecx;
+            uint edx;
+            Processor.ReadCpuid(0, out eax, out ebx, out ecx, out edx);
+            return (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65);
+        }
+
+		internal static void ReportCounters(bool dumpTable, bool toDisplay)
+        {
+            // Read the AMD and Singularity performance counters.
+            ulong b0 = 0;
+            ulong t0 = 0;
+            ulong e0 = 0;
+            ulong e1 = 0;
+            ulong e2 = 0;
+            ulong e3 = 0;
+            ulong p0 = 0;
+            ulong p1 = 0;
+            ulong p2 = 0;
+            //ulong p3 = 0;
+            ulong z0 = 0;
+            ulong z1 = 0;
+            ulong z2 = 0;
+            ulong z3 = 0;
+            ulong z4 = 0;
+            ulong z5 = 0;
+            ulong z6 = 0;
+            if (IsAmd()) {
+                b0 = DebugStub.ReadPerfCounter(7);
+                t0 = Processor.GetCycleCount();
+                e0 = Processor.ReadMsr(0xc0010000);
+                e1 = Processor.ReadMsr(0xc0010001);
+                e2 = Processor.ReadMsr(0xc0010002);
+                e3 = Processor.ReadMsr(0xc0010003);
+                p0 = Processor.ReadPmc(0);
+                p1 = Processor.ReadPmc(1);
+                p2 = Processor.ReadPmc(2);
+                //	p3 = Processor.ReadPmc(3);
+            }
+            else {
+                b0 = DebugStub.ReadPerfCounter(7);
+                t0 = Processor.GetCycleCount();
+            }
+            z0 = DebugStub.ReadPerfCounter(0);
+            z1 = DebugStub.ReadPerfCounter(1);
+            z2 = DebugStub.ReadPerfCounter(2);
+            z3 = DebugStub.ReadPerfCounter(3);
+            z4 = DebugStub.ReadPerfCounter(4);
+            z5 = DebugStub.ReadPerfCounter(5);
+            z6 = DebugStub.ReadPerfCounter(6);
+
+            t0 = t0 - b0;
+            WriteLine(false, false, "\nevt: {0,16} {1,16} {2,16} {3,16} {4,16}\n",
+                    "Cycles",
+                    PerfEvtSel.ToString(e0),
+                    PerfEvtSel.ToString(e1),
+                    PerfEvtSel.ToString(e2),
+                    PerfEvtSel.ToString(e3));
+			// t0= cycles 
+			// p0= cycles not halted
+			// p1= cycles retired 
+			// p2= cycles interrupt not masked 
+            WriteLine(dumpTable,toDisplay,
+                    "       cycles={0,16}\n"+
+                    "    notHalted={1,16}(%{2:f2})\n"+
+                    "      retired={3,16}(%{4:f2})\n"+
+                    "   int masked={5,16}(%{6:f2})\n"+
+                    "cycles halted={7,16}(%{8:f2})",
+                    t0, 
+                    p0, 
+                    (double) (p0) / (double) (t0),
+                    p1, 
+                    (double) (p1) / (double) (t0),
+                    p2,
+                    (double) (p2) / (double) (t0),
+                    (t0-p0),
+                    (double) (t0-p0) / (double) (t0)
+            );
+            
+            WriteLine(false,false, "pfc: {0,16} {1,16} {2,16} {3,16} {4,16} {5,16} {6,16} {7,16}\n",
+                    z0 + z1 + z2 + z3 + z4 + z5 + z6,
+                    z0, z1, z2, z3, z4, z5, z6);
+            if (!IsAmd()) {
+                WriteLine(dumpTable,toDisplay, "Intel processor, PMC values will be zero.\n");
+            }
+        }
+
+
+        internal static void Reset(uint pmc, ulong value)
+        {
+            if (IsAmd()) {
+                // Clear the event selector.
+                Processor.WriteMsr(0xc0010000 + pmc, 0);
+                // Clear the performance counter.
+                Processor.WriteMsr(0xc0010004 + pmc, 0);
+                // Enable the event selector.
+                Processor.WriteMsr(0xc0010000 + pmc, value);
+            }
+        }
+
+		internal static void ResetPerfCounters()
+		{
+            DebugStub.WritePerfCounter(0, 0);
+            DebugStub.WritePerfCounter(1, 0);
+            DebugStub.WritePerfCounter(2, 0);
+            DebugStub.WritePerfCounter(3, 0);
+            DebugStub.WritePerfCounter(4, 0);
+            DebugStub.WritePerfCounter(5, 0);
+            DebugStub.WritePerfCounter(6, 0);
+            DebugStub.WritePerfCounter(7, 0);
+
+            if (IsAmd()) {
+                for (uint pmc = 0; pmc < 4; pmc++) {
+                    Processor.WriteMsr(0xc0010004 + pmc, 0);
+                }
+            }
+            DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+		}
+        internal static int AppMain(Parameters! config)
+        {
+            ProcessData [] processData;
+            ProcessData [] processData2;
+
+            // Set the default options
+            bool dumpTable = false; 
+            int monitorSeconds = (int) config.monitorSeconds;
+            bool toDisplay = !config.doQuiet; 
+            
+            bool summaryMode = config.doSummary; 
+            bool doForever = config.doForever; 
+            bool doVerbose = config.doVerbose; 
+            int iterationCount = (int) config.iterationCount;
+            int warmupSeconds = (int) config.warmupSeconds;
+            string pattern = "###,##0.00"; 
+            string pattern2 = "###,###,##0.00"; 
+            string percentPattern = "#0.00";
+
+
+            ProcessContract.Imp imp = ((!)config.processRef).Acquire(); 
+            imp.RecvReady();
+			
+			// set up performance counters to get  halted/retired instructions etc. 
+			if (doVerbose) InitializeCounters(); 
+			
+            Thread.Sleep(warmupSeconds * 1000); 
+            do
+            {
+                TimeSpan startTime = ProcessService.GetUpTime();
+                long startIrqCount = ProcessService.GetKernelInterruptCount();
+                long startSwitchCount = ProcessService.GetContextSwitchCount();
+
+                // Retrieve the process  data
+                try
+                {
+                    processData = GetProcessData(imp);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error retrieving process data.");
+                    Console.WriteLine(ex.ToString());
+                    return 1;
+                }
+                
+                if (doVerbose) ResetPerfCounters(); 
+
+                Thread.Sleep(monitorSeconds * 1000); 
+                
+                // Retrieve the process  data
+                try
+                {
+                    processData2 = GetProcessData(imp);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error retrieving process data.");
+                    Console.WriteLine(ex.ToString());
+                    return 1;
+                }
+                TimeSpan endTime =  ProcessService.GetUpTime(); 
+                
+               double actualSpan =  (double) ((endTime - startTime).TotalMilliseconds); 
+               if (!summaryMode) {
+                    WriteLine (dumpTable,toDisplay, "TaskTimes: now:{0}, span={1}ms  int={2}, swi={3}",
+                        endTime.Ticks, 
+                        actualSpan,
+                        ProcessService.GetKernelInterruptCount() - startIrqCount,
+                        ProcessService.GetContextSwitchCount() - startSwitchCount); 
+               }
+                // Prep for display
+                Hashtable processName = new Hashtable(processData.Length);
+                for (int i = 0; i < processData.Length; i++)
+                {
+                    ProcessData pd = processData[i];
+                    if (pd == null) continue;
+                    processName.Add(pd.id, pd);
+                }
+
+                // Display the results
+                if (!summaryMode)  {
+                Console.WriteLine();
+                    WriteLine(dumpTable, toDisplay,  "PID Task Name           deltaTotal    deltaGC %total  %GC  GCs GcBytes(K)      total(ms)     dead(ms) dead thd");
+                    WriteLine(dumpTable, toDisplay, "=== =================== ========== ========== ===== ===== ==== ========== ============== ============== ====");
+                }
+                double totalPercent = 0; 
+                //long  durationMs =  monitorSeconds*1000;
+                double  durationMs =  actualSpan;
+                double deltaGcTime; 
+                double percentGc; 
+                double totalTime; 
+                double deadTime; 
+                double deltaTotal;
+                double deltaDead;
+                int deltaGcCount; 
+                long deltaGcBytes;
+                
+                for (int i = 0; i < processData2.Length; i++)
+                {
+                    ProcessData pd2 = processData2[i];
+                    if (pd2 == null) continue;
+
+                    totalTime = (double)pd2.totalTime / DateTime.TicksPerMillisecond; 
+                    deadTime  = (double)pd2.deadThreadTime / DateTime.TicksPerMillisecond; 
+                    
+                    double percent = 0; 
+                    ProcessData p = (ProcessData) processName[pd2.id]; 
+                    if (p == null) {
+                        // this process is not in the 1st snapshot
+                        deltaGcBytes = pd2.gcTotalBytes; 
+                        deltaGcCount = pd2.gcCount; 
+                        deltaGcTime =  deltaGcCount == 0 ? 0 :
+                            (double) pd2.gcTotalTime /DateTime.TicksPerMillisecond; 
+                        percent = durationMs == 0 ? 0 : (double) (totalTime / durationMs)  * 100 ; 
+                        deltaTotal = totalTime; 
+                        //deltaDead = deadTime; 
+                    } 
+                    else {
+                        if (p.name != pd2.name) DebugStub.Break(); 
+                        deltaTotal = (double)((pd2.totalTime - p.totalTime) /DateTime.TicksPerMillisecond); 
+                        //deltaDead  = (double)((pd2.deadThreadTime - p.deadThreadTime) / (TimeSpan.TicksPerSecond/1000)); 
+                        percent =  durationMs == 0 ?  0 : (double) (deltaTotal / durationMs)  * 100; 
+                        deltaGcCount = pd2.gcCount - p.gcCount; 
+                        deltaGcTime = deltaGcCount == 0 ? 0 :
+                            (double)(pd2.gcTotalTime - p.gcTotalTime) /DateTime.TicksPerMillisecond; 
+                        deltaGcBytes = pd2.gcTotalBytes - p.gcTotalBytes;
+
+                    }
+                    // percent of overall time spent in the GC in this process 
+                    //percentGc =  durationMs == 0  ? 0 : (deltaGcTime / durationMs) * 100; 
+                    
+                    //percent of time of this process spent in GC 
+                    percentGc =  deltaTotal == 0  ? 0 : (deltaGcTime / deltaTotal) * 100; 
+                    if (summaryMode) {
+                        Write(dumpTable, toDisplay, " {0}:{1}% ",pd2.name,percent.ToString(percentPattern)); 
+                    } 
+                    else {
+                        WriteLine(dumpTable, toDisplay, "{0,3} {1,-19} {2,10} {3,10} {4,5} {5,5} {6,4} {7,10} {8,14} {9,14} {10,4}", 
+                                            pd2.id,  
+                                            pd2.name, 
+                                            deltaTotal.ToString(pattern), 
+                                            deltaGcTime.ToString(pattern),
+                                            percent.ToString(percentPattern), 
+                                            percentGc.ToString(percentPattern),
+                                            deltaGcCount,
+                                            deltaGcBytes / 1024,  
+                                            totalTime.ToString(pattern2),
+                                            deadTime.ToString(pattern2),
+                                            pd2.deadThreadCount
+                                            ) ;
+                    }
+                    totalPercent += percent; 
+                }
+                
+                if (!summaryMode) { 
+                    WriteLine(dumpTable, toDisplay, "                                              ======");
+                    WriteLine(dumpTable, toDisplay,"                                               {0,5} accounted for",totalPercent.ToString("00.00")); 
+                }
+                else {
+                    WriteLine(dumpTable,toDisplay,";"); 
+                }
+                
+                if (doVerbose) ReportCounters(dumpTable, toDisplay);
+                
+            } while (--iterationCount > 0 ||  doForever);
+            delete imp; 
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Telnetd/Connection.sg b/base/Applications/Telnetd/Connection.sg
new file mode 100644
index 0000000..8d31283
--- /dev/null
+++ b/base/Applications/Telnetd/Connection.sg
@@ -0,0 +1,200 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Telnetd.cs
+//
+//  Note:   Simple Singularity telnet daemon.
+//
+
+namespace Microsoft.Singularity.Telnetd
+{
+    using System;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Threading;
+
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Io;
+
+    internal sealed class Connection
+    {
+        const byte IAC = 255;                   // telnet "interpret as command" escape
+        const byte CODE_WILL = 251;             // telnet commands
+        const byte CODE_WONT = 252;
+        const byte CODE_DO = 253;
+        const byte CODE_DONT = 254;
+        const byte OPTION_ECHO = 0x01;          // telnet command options
+        const byte OPTION_SUPPRESSGA = 0x03;
+
+        private Socket socket;
+        private Process process;
+        private TRef<UnicodePipeContract.Imp:READY> m_stdinImp;
+        
+        public Connection(Socket socket)
+        {
+            this.socket = socket;
+        }
+        
+        public void Start()
+        {
+            ThreadStart threadStart = new ThreadStart(Run);
+            Thread thread = new Thread(threadStart);
+            thread.Start();
+        }
+        
+        private void Run()
+        {
+            // Send options and welcome message to the client
+            SendCommand(IAC, CODE_DONT, OPTION_ECHO);
+            SendCommand(IAC, CODE_WILL, OPTION_SUPPRESSGA);
+            Send("Microsoft Singularity Telnet Daemon\r\n\r\n");
+
+            // Start a shell process with redirected IO
+            string[] commands = new string[] { "shell" };
+            process = new Process(commands, null, 2);
+            if (process == null) {
+                Console.WriteLine("Singularity Telnet Daemon - failed to exec shell.");
+                return;
+            }
+
+            UnicodePipeContract.Imp! stdinImp;
+            UnicodePipeContract.Exp! stdinExp;
+            UnicodePipeContract.NewChannel(out stdinImp, out stdinExp);
+
+            UnicodePipeContract.Imp! stdoutImp;
+            UnicodePipeContract.Exp! stdoutExp;
+            UnicodePipeContract.NewChannel(out stdoutImp, out stdoutExp);
+
+            process.SetStartupEndpoint(0, (Endpoint * in ExHeap) stdinExp);
+            process.SetStartupEndpoint(1, (Endpoint * in ExHeap) stdoutImp);
+            process.Start();
+
+            // Kick off another thread that will pump the data from the socket to shell stdin
+            m_stdinImp = new TRef<UnicodePipeContract.Imp:READY>(stdinImp);
+            ThreadStart threadStart = new ThreadStart(WaitOnSocket);
+            Thread thread = new Thread(threadStart);
+            thread.Start();
+
+            // Process all output from the shell
+            bool abort = false;
+            while (!abort)
+            {
+                switch receive {
+                    case stdoutExp.Write(buffer, offset, count):
+                        Send(buffer, offset, count);
+                        stdoutExp.SendAckWrite(buffer);
+                        break;
+                    case stdoutExp.ChannelClosed():
+                        Console.WriteLine("Singularity Telnet Daemon - ending connection.");
+                        abort = true;
+                        break;
+                }
+            }
+
+            delete stdoutExp;
+            socket.Close();
+        }
+
+        private void WaitOnSocket()
+        {
+            UnicodePipeContract.Imp:READY! stdinImp = m_stdinImp.Acquire();
+            byte[] localBuffer = new byte[256];
+            bool abort = false;
+            while (!abort)
+            {
+                try {
+                    int count = socket.Receive(localBuffer);
+#if DebugTracingOn
+                    DebugStub.Write("Receive " + count + "b:");
+                    for (int i = 0; i < count; i++) {
+                        DebugStub.Write(" " + localBuffer[i]);
+                    }
+                    DebugStub.WriteLine();
+#endif
+
+                    if (count > 0) {
+                        // REVIEW: If we only care about ASCII we have the same sized buffers...
+                        char[] in ExHeap buffer = new [ExHeap] char[localBuffer.Length];
+                        int dataCount = 0;
+                        for (int i = 0; i < count; i++) {
+                            if (localBuffer[i] == IAC) {
+                                i += 2; // TODO: Handle split 3 byte sequences and other forms
+                                continue;
+                            }
+                            buffer[dataCount] = (char)localBuffer[i];
+                            dataCount++;
+                        }
+
+                        // Send the data and wait for acknowledgement
+                        stdinImp.SendWrite(buffer, 0, dataCount);
+                        switch receive {
+                            case stdinImp.AckWrite(returnedBuffer):
+                                delete returnedBuffer;
+                                break;
+                            case stdinImp.ChannelClosed():
+                                abort = true;
+                                break;
+                        }
+                    }
+                }
+                catch (SocketException) {
+                    Console.WriteLine("Socket Exception on input thread");
+                    abort = true;
+                }
+            }
+            delete stdinImp;
+            socket.Close();
+        }
+        
+        // Send - encode and sends
+        private void Send(char[]! in ExHeap buffer, int offset, int count)
+        {
+            // REVIEW: it's silly to copy the buffer locally because it's going to a socket
+            char[] localBuffer = new char[count];
+            for (int i = 0; i < count; i++) {
+                localBuffer[i] = buffer[offset + i];
+            }
+            byte[] encodedBuffer = Encoding.ASCII.GetBytes(localBuffer);
+            SendRawBytes(encodedBuffer, 0, encodedBuffer.Length);
+        }
+
+        // Send - encode and sends
+        private void Send(string! s)
+        {
+            byte[] buffer = Encoding.ASCII.GetBytes(s);
+            SendRawBytes(buffer, 0, buffer.Length);
+        }
+
+        // SendCommand - assembles and sends the standard three byte command
+        private void SendCommand(byte iac, byte code, byte option)
+        {
+            byte[] buffer = new byte[] { iac, code, option };
+            SendRawBytes(buffer, 0, buffer.Length);
+        }
+
+        // SendRawBytes - base function for sending already encoded data to client
+        private void SendRawBytes(byte[] buffer, int offset, int count)
+        {
+#if DebugTracingOn
+            DebugStub.Write("Send " + count + "b:");
+            for (int i = 0; i < count; i++) {
+                DebugStub.Write(" " + buffer[offset + i]);
+            }
+            DebugStub.WriteLine();
+#endif
+            if (count <= 0) {
+                return;
+            }
+            try {
+                socket.Send(buffer, offset, count, SocketFlags.None);
+            }
+            catch (SocketException) {
+                Console.WriteLine("Socket Exception writing string.");
+            }
+        }
+    }
+}
diff --git a/base/Applications/Telnetd/Listener.sg b/base/Applications/Telnetd/Listener.sg
new file mode 100644
index 0000000..a979e02
--- /dev/null
+++ b/base/Applications/Telnetd/Listener.sg
@@ -0,0 +1,57 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Telnetd.cs
+//
+//  Note:   Simple Singularity telnet daemon.
+//
+
+namespace Microsoft.Singularity.Telnetd
+{
+    using System;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Threading;
+
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Io;
+
+    internal sealed class Listener
+    {
+        private int port;
+        private bool shutdownInProgress;
+        private Socket socket;
+        
+        public Listener(int port)
+        {
+            this.port = port;
+        }
+        
+        public void Start()
+        {
+            try {
+                socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                socket.Bind(new IPEndPoint(IPAddress.Any, port));
+                socket.Listen((int)SocketOptionName.MaxConnections);
+            }
+            catch (SocketException) {
+                Console.WriteLine("SocketException during Listen");
+            }
+        }
+        
+        public Socket Accept()
+        {
+            try {
+                return socket.Accept();
+            }
+            catch (SocketException) {
+                Console.WriteLine("SocketException during Accept.");
+                return null;
+            }
+        }
+    }
+}
diff --git a/base/Applications/Telnetd/Telnetd.sg b/base/Applications/Telnetd/Telnetd.sg
new file mode 100644
index 0000000..349bbca
--- /dev/null
+++ b/base/Applications/Telnetd/Telnetd.sg
@@ -0,0 +1,71 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Telnetd.cs
+//
+//  Note:   Simple Singularity telnet daemon
+//
+
+// TODO:
+// - Graceful server shutdown?
+// - non-null syntax
+// - catch all appropriate exceptions
+// - remove debugging traces
+// - limit the number of simultaneous telnet sessions?
+// - handle "exit" in shell gracefully
+// - handle "client disconnect" gracefully
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Telnetd
+{
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Telnetd.AppMain(this);
+        }
+    }
+
+
+    public sealed class Telnetd
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            Console.WriteLine("Singularity Telnet Daemon - starting.");
+            Listener listener = new Listener(23);
+            listener.Start();
+            while (true)
+            {
+                Socket socket = listener.Accept();
+                Console.WriteLine("Singularity Telnet Daemon - accepting connection");
+                Connection connection = new Connection(socket);
+                connection.Start();
+            }
+            Console.WriteLine("Singularity Telnet Daemon - stopping.");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Telnetd/telnetd.csproj b/base/Applications/Telnetd/telnetd.csproj
new file mode 100644
index 0000000..801d352
--- /dev/null
+++ b/base/Applications/Telnetd/telnetd.csproj
@@ -0,0 +1,42 @@
+<!--
+##############################################################################
+#
+# Copyright (c) Microsoft Corporation.   All rights reserved.
+#
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Telnetd</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Connection.sg" />
+    <Compile Include="Listener.sg" />
+    <Compile Include="Telnetd.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Web\System.Web.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Crypto\Crypto.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\CLRProfiler\CLRProfiler.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/Bartok/Bug00013/Bug00013.cs b/base/Applications/Tests/Bartok/Bug00013/Bug00013.cs
new file mode 100644
index 0000000..f368011
--- /dev/null
+++ b/base/Applications/Tests/Bartok/Bug00013/Bug00013.cs
@@ -0,0 +1,771 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// Some sort of threads/locking test.
+// See usage for parameter.
+// DebubPrintSpinLock was in the Marmot runtime.
+
+using System;
+using System.Threading;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace MarmotBugs {
+    [ConsoleCategory(HelpMessage="Show attributes associated with a file", DefaultAction=true)]
+    internal class Parameters {
+    
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter( "t", Default=1,  HelpMessage="threads")]
+        internal long threads;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            Bug00013.AppMain(this);
+            return 0;
+        }
+    }
+
+  class DebugPrintSpin {
+      private static Object locker = new Object();
+      public static void Lock() {
+          //    Class_java_lang_Thread *currentThread = CurrentThread();
+          //    currentThread->f_isAwaitingDebugPrintSpinLock = true;
+          System.Threading.Monitor.Enter(locker);
+          //    DebugPrintCriticalSectionHolder = currentThread;
+          //    currentThread->f_isAwaitingDebugPrintSpinLock = false;
+      }
+      public static void Unlock() {
+          //    DebugPrintCriticalSectionHolder = NULL;
+          System.Threading.Monitor.Exit(locker);
+      }
+  }
+
+  class Bug00013 { //: Runnable {
+
+      static int totalThreads = Int32.MaxValue;
+
+      const bool    wasteSpace  = true;
+      const bool    showPended  = false;
+
+      const int        maxLinks    =   10;
+      const int        maxThreads  =   10;
+      const int        maxActive   =    4;
+      const int        nodeTraverse=   50;
+      const int        linkTraverse=  500;
+
+      const int        newThreads  =    2; //10;
+      const int        newNodes    =  100;
+      const int        newLinks    =  700;
+      const int        newRejects  = 1000;
+
+      // conversion filler
+      public static void DebugDumpThreadAnchorTable(int i) {}
+      private static void DebugBreak() {
+          Assert(false, "DebugBreak");
+      }
+      private static void Assert(bool b) {
+          Assert(b, "Assertion failed");
+      }
+      private static void Assert(bool b, String s) {
+          if(!b) {
+              DebugPrintSpin.Lock();
+              Console.WriteLine(s);
+              Console.WriteLine("Failed Bug00013");
+              DebugPrintSpin.Unlock();
+              Environment.Exit(1);
+          }
+      }
+      // end conversion
+
+      void nonsyncv() {
+      lock (this) {
+          DebugPrintSpin.Lock();
+          Console.WriteLine("within nonsyncv()");
+          DebugDumpThreadAnchorTable(4);
+          DebugPrintSpin.Unlock();
+      }
+      }
+
+      [System.Runtime.CompilerServices.MethodImpl
+      (System.Runtime.CompilerServices.MethodImplOptions.Synchronized)]
+      void syncv() {
+          DebugPrintSpin.Lock();
+          Console.WriteLine("within syncv()");
+          DebugDumpThreadAnchorTable(4);
+          DebugPrintSpin.Unlock();
+      }
+
+      static void nonsyncs() {
+      lock (ClassBug00013) {
+          DebugPrintSpin.Lock();
+          Console.WriteLine("within nonsyncs()");
+          DebugDumpThreadAnchorTable(4);
+          DebugPrintSpin.Unlock();
+      }
+      }
+
+      [System.Runtime.CompilerServices.MethodImpl
+      (System.Runtime.CompilerServices.MethodImplOptions.Synchronized)]
+      static void syncs() {
+          DebugPrintSpin.Lock();
+          Console.WriteLine("within syncs()");
+          DebugDumpThreadAnchorTable(4);
+          DebugPrintSpin.Unlock();
+      }
+
+      static void usage() {
+          Console.WriteLine("usage:  Bug00013 [total_threads]");
+          Environment.Exit(1);
+      }
+
+      internal static void AppMain(Parameters! config) 
+      {
+          totalThreads = (int)config.threads;
+
+          undeadThreadids = new int[2*maxThreads];
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine("Bug00013.Main()");
+          DebugDumpThreadAnchorTable(4);
+          DebugPrintSpin.Unlock();
+
+          Object Lock = new Object();
+          Bug00013.Lock = Lock;
+          DebugPrintSpin.Lock();
+          Console.Write("Bug00013.Lock = ");
+          Console.WriteLine(Lock.GetHashCode());
+          DebugPrintSpin.Unlock();
+
+          anchor = new Bug00013();
+          DebugPrintSpin.Lock();
+          Console.Write("Bug00013.Type = ");
+          Console.WriteLine(anchor.GetType());
+          DebugPrintSpin.Unlock();
+
+          ClassBug00013 = anchor.GetType();
+          DebugPrintSpin.Lock();
+          Console.Write("Bug00013.class = ");
+          Console.WriteLine(ClassBug00013.GetHashCode());
+          DebugPrintSpin.Unlock();
+
+          bug13Type = anchor.GetType();
+          linksType = anchor.links.GetType();
+
+          //==================================================================
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.WriteLine("//======================================" +
+                                  "=======================================");
+          Console.WriteLine();
+          Console.WriteLine("before nonsyncv()");
+          DebugPrintSpin.Unlock();
+
+          anchor.nonsyncv();
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine("after  nonsyncv()");
+          DebugPrintSpin.Unlock();
+
+          //==================================================================
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.WriteLine("//======================================" +
+                                  "=======================================");
+          Console.WriteLine();
+          Console.WriteLine("before syncv()");
+          DebugPrintSpin.Unlock();
+
+          anchor.syncv();
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine("after  syncv()");
+          DebugPrintSpin.Unlock();
+
+          //==================================================================
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.WriteLine("//======================================" +
+                                  "=======================================");
+          Console.WriteLine();
+          Console.WriteLine("before nonsyncs()");
+          DebugPrintSpin.Unlock();
+
+          nonsyncs();
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine("after  nonsyncs()");
+          DebugPrintSpin.Unlock();
+
+          //==================================================================
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.WriteLine("//======================================" +
+                                  "=======================================");
+          Console.WriteLine();
+          Console.WriteLine("before syncs()");
+          DebugPrintSpin.Unlock();
+
+          syncs();
+
+          DebugPrintSpin.Lock();
+          Console.WriteLine("after  syncs()");
+          DebugPrintSpin.Unlock();
+
+          //==================================================================
+
+          Thread newThread = new Thread(new ThreadStart(anchor.run));
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.WriteLine("//======================================" +
+                                  "=======================================");
+          Console.WriteLine();
+          Console.Write("newThread = ");
+          Console.WriteLine(newThread.GetHashCode());
+          DebugPrintSpin.Unlock();
+
+          /*
+          new WatchDog().start();
+          try {
+              Thread.sleep(1000);
+          } catch(InterruptedException e) {
+          }
+          /**/
+
+          newThread.Start();
+
+          deadman = System.DateTime.Now;
+          for (;;) {
+              //try {
+                  Thread.Sleep(25000);
+                  //} catch(ThreadInterruptedException) {
+                  //DebugPrintSpin.Lock();
+                  //Console.WriteLine("!");
+                  //DebugPrintSpin.Unlock();
+                  // }
+              lock (Lock) {
+                  DebugPrintSpin.Lock();
+                  long deadms = (System.DateTime.Now - deadman).Milliseconds;
+                  if (deadms > 100000) {
+                      Console.WriteLine();
+                      Console.WriteLine("Bug00013.Main()"
+                                              + "  deadman expired");
+                      DebugDumpThreadAnchorTable(4);
+                      DebugBreak();
+                  } else {
+                      Console.WriteLine();
+                      Console.Write(" ?<0,");
+                      Console.Write(numThreadsAlive);
+                      Console.Write(",");
+                      Console.Write(numThreadsActive);
+                      DebugPrintUndead();
+                      Console.Write("> ");
+                  }
+                  DebugPrintSpin.Unlock();
+                  if (numThreadsAlive == 0) break;
+              }
+          }
+          Console.WriteLine("Passed Bug00013");
+      }
+
+      Bug00013() {
+          lock (Lock) {
+              nodeid = nodeidGenerator++;
+          }
+          nodename = ("Node" + nodeid);
+          links = new Bug00013[maxLinks];
+      }
+
+      /*
+      public override String ToString() {
+          if (nodename != null) return(nodename);
+          return(base.ToString());
+      }
+      */
+
+      public void run() {
+          int myNumThreadsAlive;
+          int myNumThreadsActive;
+          lock (Lock) {
+              Assert(numThreadsAlive >= 0,
+                     "run()  numThreadsAlive should be >= 0");
+              Assert(numThreadsActive >= 0,
+                     "run()  numThreadsActive should be >= 0");
+              numThreadsAlive++;
+              myNumThreadsAlive = numThreadsAlive;
+              numThreadsActive++;
+              myNumThreadsActive = numThreadsActive;
+              threadid = ++threadidGenerator;
+              recordUndead();
+          }
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.Write("T+<");
+          Console.Write(threadid);
+          Console.Write(",");
+          Console.Write(myNumThreadsAlive);
+          Console.Write(",");
+          Console.Write(myNumThreadsActive);
+          Console.Write("> ");
+          DebugPrintSpin.Unlock();
+          if ((myNumThreadsAlive <= maxThreads)
+               && (threadid < totalThreads)) {
+              bool conflict = false;
+              lock (this) {
+                  if (random == null) {
+                      random = new Random();
+                  } else {
+                      conflict = true;
+                  }
+              }
+              if (!conflict) {
+                  traversalLimit = nodeTraverse;
+                  Bug00013 last = this;
+                  Bug00013 next = this;
+                  Bug00013 node = new Bug00013();
+                  anchor.addLink(this, node);
+
+                  for (int i=0; i<newThreads; i++) {
+                      traversalLimit = nodeTraverse;
+                      int strides = 0;
+                      for (int j=0; j<newNodes; j++) {
+                          recordUndead();
+                          node = new Bug00013();
+                          if (wasteSpace) {
+                              while (newNodes
+                                     < newRejects*random.NextDouble()) {
+                                  Object ooo = new int[1057];
+                                  node = new Bug00013();
+                              }
+                          }
+                          strides = 100 + (int)(1000*random.NextDouble());
+                          last = traverse(last, strides);
+                          while (!addLink(last, node)) {
+                              strides = 100 + (int)(1000*random.NextDouble());
+                              last = traverse(last, strides);
+                          }
+                          strides = 100 + (int)(1000*random.NextDouble());
+                          next = traverse(next, strides);
+                          while (!addLink(next, node)) {
+                              strides = 100 + (int)(1000*random.NextDouble());
+                              next = traverse(next, strides);
+                          }
+                      }
+                      DebugPrintSpin.Lock();
+                      Console.Write("n");
+                      Console.Write(threadid);
+                      DebugPrintSpin.Unlock();
+                      traversalLimit = linkTraverse;
+                      for (int j=4*newNodes; j<newLinks; j += 2) {
+                          last = traverse(last, strides);
+                          next = traverse(next, strides);
+                          while (!addLink(last, next)) {
+                              strides = 100 + (int)(1000*random.NextDouble());
+                              last = traverse(last, strides);
+                              strides = 100 + (int)(1000*random.NextDouble());
+                              next = traverse(next, strides);
+                          }
+                      }
+                      DebugPrintSpin.Lock();
+                      Console.Write("l");
+                      Console.Write(threadid);
+                      DebugPrintSpin.Unlock();
+
+                      Thread newThread = new Thread(new ThreadStart(last.run));
+                      DebugPrintSpin.Lock();
+                      Console.Write("t");
+                      Console.Write(threadid);
+                      DebugPrintSpin.Unlock();
+                      newThread.Start();
+                  }
+              }
+          }
+          lock (Lock) {
+              recordUndead();
+              Assert(numThreadsAlive > 0,
+                     "run()  numThreadsAlive should be > 0");
+              Assert(numThreadsActive > 0,
+                     "run()  numThreadsActive should be > 0");
+              numThreadsAlive--;
+              myNumThreadsAlive = numThreadsAlive;
+              numThreadsActive--;
+              myNumThreadsActive = numThreadsActive;
+          }
+          DebugPrintSpin.Lock();
+          Console.WriteLine();
+          Console.Write("T-<");
+          Console.Write(threadid);
+          Console.Write(",");
+          Console.Write(myNumThreadsAlive);
+          Console.Write(",");
+          Console.Write(myNumThreadsActive);
+          Console.Write("> ");
+          DebugPrintSpin.Unlock();
+          notifyPending();
+      }
+
+      Bug00013 traverse(Bug00013 node, int numStrides) {
+          lock (Lock) {
+              recordUndead();
+          }
+          for (int i=0; i<numStrides; i++) {
+              Assert(traversalsLeft >= 0);
+              if (traversalsLeft > traversalLimit) {
+                  traversalsLeft = traversalLimit;
+              }
+              if (traversalsLeft == 0) {
+                  bool pended = false;
+                  int myNumThreadsAlive;
+                  int myNumThreadsActive;
+                  lock (Lock) {
+                      Assert(numThreadsActive > 0);
+                      Assert(nextPending == null);
+                      if ((numThreadsActive > maxActive)
+                          || (pendingQueue != null)) {
+                          pended = showPended;
+                          isPending = true;
+                          if (pendingQueue != null) {
+                              Bug00013 pend = pendingQueue;
+                              for (;;) {
+                                  Bug00013 curr = pend;
+                                  pend = curr.nextPending;
+                                  if (pend == null) {
+                                      curr.nextPending = this;
+                                      break;
+                                  }
+                              }
+                          } else {
+                              pendingQueue = this;
+                          }
+                      }
+                      numThreadsActive--;
+                      myNumThreadsAlive = numThreadsAlive;
+                      myNumThreadsActive = numThreadsActive;
+                  }
+                  if (pended) {
+                      DebugPrintSpin.Lock();
+                      Console.WriteLine();
+                      Console.Write("T_<");
+                      Console.Write(threadid);
+                      Console.Write(",");
+                      Console.Write(myNumThreadsAlive);
+                      Console.Write(",");
+                      Console.Write(myNumThreadsActive);
+                      Console.Write("> ");
+                      DebugPrintSpin.Unlock();
+                  }
+                  notifyPending();
+                  lock (this) {
+                      while (isPending) {
+                          //try {
+                              Monitor.Wait(this);
+                              //} catch(ThreadInterruptedException) {}
+                      }
+                      Assert(nextPending == null);
+                  }
+                  lock (Lock) {
+                      Assert(numThreadsAlive > 0,
+                             "run()  numThreadsAlive should be > 0");
+                      Assert(numThreadsActive >= 0,
+                             "run()  numThreadsActive should be >= 0");
+                      myNumThreadsAlive = numThreadsAlive;
+                      numThreadsActive++;
+                      myNumThreadsActive = numThreadsActive;
+                      recordUndead();
+                  }
+                  if (pended) {
+                      DebugPrintSpin.Lock();
+                      Console.WriteLine();
+                      Console.Write("T=<");
+                      Console.Write(threadid);
+                      Console.Write(",");
+                      Console.Write(myNumThreadsAlive);
+                      Console.Write(",");
+                      Console.Write(myNumThreadsActive);
+                      Console.Write("< ");
+                      DebugPrintSpin.Unlock();
+                  }
+                  traversalsLeft = traversalLimit;
+              }
+              traversalsLeft--;
+              lock (node) {
+                  if (node.numLinks > 0) {
+                      int link = (int)(node.numLinks*random.NextDouble());
+                      Assert(link >= 0,
+                             "traverse()  selected link should be nonnegative");
+                      Assert(link < node.numLinks,
+                             "traverse()  selected link should be < numLinks");
+                      if (node.links[link] == null) {
+                          DebugPrintSpin.Lock();
+                          Console.WriteLine("BUG at link "+link);
+                          for (int ii = 0; ii < node.numLinks; ii++) {
+                              Console.WriteLine("link["+ii+"] is "
+                                                      +node.links[ii]);
+                          }
+                          Console.WriteLine("link["+link+"] is "
+                                                  +node.links[link]);
+                          DebugPrintSpin.Unlock();
+                      }
+                      Assert(node.links[link] != null,
+                             "traverse()  selected link should not be null");
+                      node = node.links[link];
+                  }
+              }
+          }
+          return(node);
+      }
+
+      bool addLink(Bug00013 last, Bug00013 next) {
+          Assert(last != null, "addlink()  last should not be null");
+          Assert(next != null, "addlink()  next should not be null");
+          if (last == next) return(false);
+          bool lastLinked = false;
+          int lastLinks;
+          bool nextLinked = false;
+          int nextLinks;
+          lock (last) {
+              checkConsistency();
+              if (last.numLinks < maxLinks) {
+                  lastLinked = true;
+                  for (int i=0; i<last.numLinks; i++) {
+                      if (last.links[i] == next) {
+                          lastLinked = false;
+                          break;
+                      }
+                  }
+                  if (lastLinked) {
+                      last.links[last.numLinks++] = next;
+                      lastLinks = last.numLinks;
+                  }
+              }
+              checkConsistency();
+          }
+          if (!lastLinked) {
+              //  last can't take another link
+              //  or these two nodes are already linked
+              return(false);
+          }
+          lock (next) {
+              checkConsistency();
+              if (next.numLinks < maxLinks) {
+                  nextLinked = true;
+                  for (int i=0; i<next.numLinks; i++) {
+                      Assert(next.links[i] != last,
+                             "addlink()  should not already be linked to last");
+                  }
+                  next.links[next.numLinks++] = last;
+                  nextLinks = next.numLinks;
+              }
+              checkConsistency();
+          }
+          if (nextLinked) {
+              return(true);
+          }
+          lock (last) {
+              checkConsistency();
+              Assert(last.numLinks>0, "addlink()  last.numLinks should be > 0");
+              last.numLinks--;
+              for (int i=0; i<last.numLinks; i++) {
+                  if (last.links[i] == next) {
+                      last.links[i] = last.links[last.numLinks];
+                      break;
+                  }
+              }
+              last.links[last.numLinks] = null;
+              checkConsistency();
+          }
+          return(false);
+      }
+
+      void notifyPending() {
+          lock (Lock) {
+              Bug00013 firstPending = pendingQueue;
+              if ((firstPending != null) && (numThreadsActive < maxActive)) {
+                  pendingQueue = firstPending.nextPending;
+                  firstPending.nextPending = null;
+                  lock (firstPending) {
+                      firstPending.isPending = false;
+                      Monitor.PulseAll(firstPending);
+                  }
+              }
+          }
+      }
+
+      void recordUndead() {
+          if (threadid == 0) DebugBreak();
+          deadman = System.DateTime.Now;
+          for (int i=0; i<numUndeadThreadids; i++) {
+              if (undeadThreadids[i] == threadid) {
+                  return;
+              }
+              if (undeadThreadids[i] > threadid) {
+                  if (numUndeadThreadids == undeadThreadids.Length) {
+                      numUndeadThreadids--;
+                  }
+                  for (int j=numUndeadThreadids; j>i; j--) {
+                      undeadThreadids[j] = undeadThreadids[j-1];
+                  }
+                  undeadThreadids[i] = threadid;
+                  numUndeadThreadids++;
+                  return;
+              }
+          }
+          if (numUndeadThreadids == undeadThreadids.Length) return;
+          undeadThreadids[numUndeadThreadids++] = threadid;
+      }
+
+      static void DebugPrintUndead() {
+          char sep = ':';
+          for (int i=0; i<numUndeadThreadids; i++) {
+              Console.Write(sep);
+              Console.Write(undeadThreadids[i]);
+              sep = ',';
+          }
+          numUndeadThreadids = 0;
+      }
+
+      private void checkConsistency() {
+          bool locked = false;
+          if (this.GetType() != bug13Type) {
+              if (!locked) {
+                  DebugPrintSpin.Lock();
+                  Console.WriteLine();
+                  Console.Write("Bug00013 ");
+                  Console.Write(this);
+                  Console.WriteLine(":");
+                  locked = true;
+              }
+              Console.Write("    vtable ");
+              Console.Write(this.GetType());
+              Console.Write(" s/b ");
+              Console.Write(bug13Type);
+              Console.WriteLine();
+          }
+          if (links.GetType() != linksType) {
+              if (!locked) {
+                  DebugPrintSpin.Lock();
+                  Console.WriteLine();
+                  Console.Write("Bug00013 ");
+                  Console.Write(this);
+                  Console.WriteLine(":");
+                  locked = true;
+              }
+              Console.Write("    links.vtable ");
+              Console.Write(links.GetType());
+              Console.Write(" s/b ");
+              Console.Write(linksType);
+              Console.WriteLine();
+          }
+          if (links.Length != maxLinks) {
+              if (!locked) {
+                  DebugPrintSpin.Lock();
+                  Console.WriteLine();
+                  Console.Write("Bug00013 ");
+                  Console.Write(this);
+                  Console.WriteLine(":");
+                  locked = true;
+              }
+              Console.Write("    links.Length ");
+              Console.Write(links.Length);
+              Console.Write(" s/b ");
+              Console.Write(maxLinks);
+              Console.WriteLine();
+          }
+          for (int i=0; i<links.Length; i++) {
+              if (links[i] == null) continue;
+              if (links[i].GetType() != bug13Type) {
+                  if (!locked) {
+                      DebugPrintSpin.Lock();
+                      Console.WriteLine();
+                      Console.Write("Bug00013 ");
+                      Console.Write(this);
+                      Console.WriteLine(":");
+                      locked = true;
+                  }
+                  Console.Write("    links[");
+                  Console.Write(i);
+                  Console.Write("].vtable ");
+                  Console.Write(this.GetType());
+                  Console.Write(" s/b ");
+                  Console.Write(bug13Type);
+                  Console.WriteLine();
+              }
+          }
+          if (locked) {
+              DebugBreak();
+              DebugPrintSpin.Unlock();
+          }
+      }
+
+      //  node fields
+
+      int                     nodeid;
+      String                  nodename;
+      int                     numLinks;
+      Bug00013[]              links;
+
+      //  thread/runnable fields
+
+      int                     threadid;
+      Random                  random;
+      int                     traversalLimit;
+      int                     traversalsLeft;
+      bool                 isPending;
+      Bug00013                nextPending;
+
+      //  global/statics
+
+      static Bug00013         anchor;
+
+      static Object           Lock;
+      static int              nodeidGenerator;
+      static int              threadidGenerator;
+      static int              numThreadsAlive;
+      static int              numThreadsActive;
+      static DateTime         deadman;
+      static Type             ClassBug00013;
+      static Bug00013         pendingQueue;
+      static int              numUndeadThreadids;
+      static int[]            undeadThreadids;
+
+      static Type             bug13Type;
+      static Type             linksType;
+  }
+
+  class WatchDog { // : Thread {
+      WatchDog() {} //: base("WatchDog") {}
+
+      public void run() {
+          DebugPrintSpin.Lock();
+          Console.WriteLine("WatchDog sleeping");
+          DebugPrintSpin.Unlock();
+          //try {
+              Thread.Sleep(200000);
+              //} catch(ThreadInterruptedException) {
+              //DebugPrintSpin.Lock();
+              //Console.WriteLine("!");
+              //DebugPrintSpin.Unlock();
+              //}
+          DebugPrintSpin.Lock();
+          Console.WriteLine("WatchDog awake");
+          Bug00013.DebugDumpThreadAnchorTable(4);
+          Console.WriteLine("WatchDog exiting");
+          DebugPrintSpin.Unlock();
+      }
+  }
+}
diff --git a/base/Applications/Tests/Bartok/Bug00013/Bug00013.csproj b/base/Applications/Tests/Bartok/Bug00013/Bug00013.csproj
new file mode 100644
index 0000000..ea9f8bf
--- /dev/null
+++ b/base/Applications/Tests/Bartok/Bug00013/Bug00013.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>Bug00013</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <NoNullCheck>true</NoNullCheck>
+    <NoWarn>219</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Bug00013.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/Bartok/muwatomic/muwatomic.cs b/base/Applications/Tests/Bartok/muwatomic/muwatomic.cs
new file mode 100644
index 0000000..9041fd1
--- /dev/null
+++ b/base/Applications/Tests/Bartok/muwatomic/muwatomic.cs
@@ -0,0 +1,147 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace AtomicTest {
+  using System;
+
+  internal class Test : Object {
+      internal int x;
+  }
+
+  public class muw {
+
+      public volatile static Object o2;
+      public volatile static Object o3;
+
+      public static void Main(String[] args) {
+          bool forceGC = true;
+
+          foreach (String arg in args) {
+              if(arg.Equals("nogc")) {
+                  forceGC = false;
+              }
+          }
+
+          for (int i = 0; i < 10; i ++) {
+              Test lo1 = new Test();
+              Test lo2 = new Test();
+              Test lo3 = new Test();
+              Test lo4 = new Test();
+              Test lock_only = new Test();
+              int h;
+
+              int h_in1 = 0;
+              int h_in2 = 0;
+              int v = 0;
+
+              h = lo3.GetHashCode();
+              h = lo4.GetHashCode();
+          
+              // Read from non-inflated objects
+              Console.WriteLine("\n\nReading in an atomic block");
+              try {
+                  v = lo1.x;
+                  v = lo2.x;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Read-modify-write non-inflated objects
+              Console.WriteLine("\n\nRead-modify-write in an atomic block");
+              try {
+                  lo1.x ++;
+                  lo2.x ++;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Read from objects whose multi-use-word is in use
+              Console.WriteLine("\n\nRead from object with multi-use-word in use");
+              try {
+                  v = lo3.x;
+                  v = lo4.x;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Read-modify-write objects whose multi-use-word is in use
+              Console.WriteLine("\n\nRead-modify-write from object with multi-use-word in use");
+              try {
+                  lo3.x ++;
+                  lo4.x ++;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Trigger inflation within a read-modify-write atomic block
+              Console.WriteLine("\n\nTrigger inflation in a read-modify-write atomic block");
+              try {
+                  lo1.x ++;
+                  h_in1 = lo1.GetHashCode();
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Trigger inflation within a read-only atomic block
+              Console.WriteLine("\n\nTrigger inflation in a read-only atomic block");
+              try {
+                  v = lo2.x;
+                  h_in2 = lo2.GetHashCode();
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Read an inflated object
+              Console.WriteLine("\n\nReading from an inflated object in an atomic block");
+              try {
+                  v = lo1.x;
+                  v = lo2.x;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              // Read-modify-write an inflated object
+              Console.WriteLine("\n\nRead-modify-write an inflated object in an atomic block");
+              try {
+                  v = lo1.x++;
+                  v = lo2.x++;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+          
+              // Read-modify-write an inflated object
+              Console.WriteLine("\n\nRead-modify-write an inflated object in an atomic block");
+              try {
+                  v = lo1.x++;
+                  v = lo2.x++;
+                  if (forceGC) {
+                      GC.Collect();
+                  }
+              } catch (AtomicFakeException) {
+              }
+
+              h = lo1.GetHashCode();
+              Console.WriteLine("\n\nDiff on lo1.GetHashCode() = " + (h-h_in1));
+              h = lo2.GetHashCode();
+              Console.WriteLine("Diff on lo2.GetHashCode() = " + (h-h_in2));
+          }
+      }
+  }
+}
diff --git a/base/Applications/Tests/Bartok/muwatomic/muwatomic.csproj b/base/Applications/Tests/Bartok/muwatomic/muwatomic.csproj
new file mode 100644
index 0000000..a880347
--- /dev/null
+++ b/base/Applications/Tests/Bartok/muwatomic/muwatomic.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>muwatomic</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <NoNullCheck>true</NoNullCheck>
+    <NoWarn>219</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="muwatomic.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/Bartok/readme.txt b/base/Applications/Tests/Bartok/readme.txt
new file mode 100644
index 0000000..a5d6b2d
--- /dev/null
+++ b/base/Applications/Tests/Bartok/readme.txt
@@ -0,0 +1 @@
+These tests are copied from the Bartok source tree.
\ No newline at end of file
diff --git a/base/Applications/Tests/Bartok/tree/tree.cs b/base/Applications/Tests/Bartok/tree/tree.cs
new file mode 100644
index 0000000..05c2cf0
--- /dev/null
+++ b/base/Applications/Tests/Bartok/tree/tree.cs
@@ -0,0 +1,813 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// The tree implementation comes from Maurice Herlihy's SXM implementation.
+//
+// Use the command line to set the number of threads and operations, to
+// optionally wrap each operation in an atomic or try_all block, and to require
+// deterministic output for automated testing.
+
+namespace Test {
+
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using System;
+    using Microsoft.Contracts;
+
+    public enum RunKind { Direct, Atomic, TryAll };
+
+    public class Config {
+
+        // Create deterministic output for bvt
+        public static bool DETERMINISTIC = false;
+
+        // Kind of concurrent control to use
+        public static RunKind KIND;
+
+        // Number of threads to run
+        public static int THREADS        = 1;
+
+        // Number of successful operations per thread (-1 => loop forever)
+        public static int OP_COUNT       = 10000; 
+
+        // Range of key values, 0..KEY_SPACE_MASK
+        public static int KEY_SPACE_MASK = 0xffff;
+
+        // Workload mix, should sum to 0x100
+        public static int LOOKUP_FRAC    = 0xc0;
+        public static int REMOVE_FRAC    = 0x20;
+        public static int INSERT_FRAC    = 0x20;
+    }
+
+    // RBTree benchmark originally from Maurice Herlihy's SXM.
+
+    public class RBTree 
+    {
+        public enum Color {BLACK, RED};
+
+        public static int INITIAL_SIZE = Config.KEY_SPACE_MASK / 2;
+        
+        protected RBNode root;
+        //  sentinelNode is convenient way of indicating a leaf node.
+
+        public static RBNode sentinelNode; 
+        
+        public int Shadow = 0;
+
+        public int Actual() {
+            return ActualFrom(root);
+        }
+
+        public int ActualFrom(RBNode r) {
+            if (r == sentinelNode) { 
+                return 0;
+            } else {
+                return r.Value + ActualFrom(r.Left) + ActualFrom(r.Right);
+            }
+        }
+
+        ///<remark>
+        /// Initializes the tree shared by all the threads.
+        /// </remark>
+        [NotDelayed]
+        public RBTree() 
+        {
+            // set up the sentinel node. the sentinel node is the key to a successful
+            // implementation and for understanding the red-black tree properties.
+            sentinelNode        = new RBNode();
+            sentinelNode.Left   = null;
+            sentinelNode.Right  = null;
+            sentinelNode.Parent = null;
+            sentinelNode.Color  = Color.BLACK;
+            root                = sentinelNode;
+            this.root.Value = Int32.MinValue;
+            this.root.Color = Color.BLACK;
+            int size = 0;
+            Object o = new Object();
+            Random random = new Random(o.GetHashCode());
+            while (size < INITIAL_SIZE) 
+                {
+                    int n = random.Next();
+                    //                    int v = (n >> 8) & 0xfff;
+                    int v = (n >> 8) & Config.KEY_SPACE_MASK;
+                    if ((bool)Insert(v)) {
+                        size++;
+                        Shadow += v;
+                    }
+                }
+        }
+
+        /// <remarks>
+        /// Inserts an element into the integer set, if it is not already present.
+        /// </remarks>
+        public bool Insert(int key)
+        {
+            // traverse tree - find where node belongs
+            RBNode temp	= root;
+            RBNode parent = null;
+
+            while(temp != sentinelNode)
+                {	// find Parent
+                    parent = temp;
+                    if ( key == temp.Value) 
+                        {
+                            return false;
+                        } 
+                    else if (key > temp.Value) 
+                        {
+                            temp = temp.Right;
+                        } 
+                    else 
+                        {
+                            temp = temp.Left;
+                        }
+                }
+			
+            // setup node
+            RBNode node         =   new RBNode();
+            node.Parent         =   parent;
+            node.Value 	        =   key;
+            node.Left           =   sentinelNode;
+            node.Right          =   sentinelNode;
+
+            // insert node into tree starting at parent's location
+            if(node.Parent != null)	
+                {
+                    if (node.Value > node.Parent.Value) 
+                        {
+                            node.Parent.Right = node;
+                        }
+                    else
+                        node.Parent.Left = node;
+                }
+            else
+                root = node;					// first node added
+
+            RestoreAfterInsert(node);           // restore red-black properties
+            return true;
+        }
+  
+        /// <remarks>
+        /// Tests whether item is present.
+        /// </remarks>
+        /// <returns> whether the item was present</returns>
+        public bool Contains(int key)
+        {
+            RBNode node = root;     // begin at root
+            bool result = false;
+            
+            // traverse tree until node is found
+            while(node != sentinelNode)
+                {
+                    if (key == node.Value) 
+                        {
+                            result = true;
+                            break;
+                        } 
+                    else if (key < node.Value) 
+                        {
+                            node = node.Left;
+                        } 
+                    else 
+                        {
+                            node = node.Right;
+                        }
+                }
+            return result;
+        }
+  
+        /// <remarks>
+        /// Remove item if present.
+        /// </remarks>
+        /// <returns> whether the item was removed</returns>
+        public bool Remove(int key)
+        {
+            // find node
+            RBNode node;
+
+            node = root;
+            while(node != sentinelNode)
+                {
+                    if (key == node.Value) 
+                        {
+                            break;
+                        } 
+                    else if (key < node.Value) 
+                        {
+                            node = node.Left;
+                        } 
+                    else 
+                        {
+                            node = node.Right;
+                        }
+                }
+
+            if(node == sentinelNode)
+                return false;				// key not found
+
+            Delete(node);
+            return true;
+        }
+
+		
+        /// <summary>
+        /// Delete a node
+        /// </summary>
+        /// <param name="z">node to be deleted</param>
+        private void Delete(RBNode z)
+        {
+            // A node to be deleted will be: 
+            //		1. a leaf with no children
+            //		2. have one child
+            //		3. have two children
+            // If the deleted node is red, the red black properties still hold.
+            // If the deleted node is black, the tree needs rebalancing
+
+            RBNode x;
+            RBNode y;					// work node 
+
+            // find the replacement node (the successor to x) - the node one with 
+            // at *most* one child. 
+            if(z.Left == sentinelNode || z.Right == sentinelNode) 
+                y = z;						// node has sentinel as a child
+            else 
+                {
+                    // z has two children, find replacement node which will 
+                    // be the leftmost node greater than z
+                    y = z.Right;				        // traverse right subtree	
+                    while(y.Left != sentinelNode)		// to find next node in sequence
+                        y = y.Left;
+                }
+
+            // at this point, y contains the replacement node. Its content will be copied 
+            // to the values in the node to be deleted
+
+            // x (y's only child) is the node that will be linked to y's old parent. 
+            if(y.Left != sentinelNode)
+                x = y.Left;					
+            else
+                x = y.Right;					
+
+            // replace x's parent with y's parent and
+            // link x to proper subtree in parent
+            // this removes y from the chain
+            x.Parent = y.Parent;
+            if(y.Parent != null)
+                if(y == y.Parent.Left)
+                    y.Parent.Left = x;
+                else
+                    y.Parent.Right = x; // missing enlist for update
+            else
+                root = x;			// make x the root node
+
+            // copy the values from y (the replacement node) to the node being deleted.
+            // note: this effectively deletes the node. 
+            if(y != z) 
+                {
+                    z.Value	= y.Value;
+                }
+
+            if(y.Color == Color.BLACK)
+                RestoreAfterDelete(x);
+        }
+
+        ///<summary>
+        /// RestoreAfterDelete
+        /// Deletions from red-black trees may destroy the red-black 
+        /// properties. Examine the tree and restore. Rotations are normally 
+        /// required to restore it
+        ///</summary>
+        private void RestoreAfterDelete(RBNode x)
+        {
+            // maintain Red-Black tree balance after deleting node 			
+
+            RBNode y;
+
+            while(x != root && x.Color == Color.BLACK) 
+                {
+                    if(x == x.Parent.Left)			// determine sub tree from parent
+                        {
+                            y = x.Parent.Right;			// y is x's sibling 
+                            if(y.Color == Color.RED) 
+                                {	// x is black, y is red - make both black and rotate
+                                    y.Color			= Color.BLACK;
+                                    x.Parent.Color	= Color.RED;
+                                    RotateLeft(x.Parent);
+                                    y = x.Parent.Right;
+                                }
+                            if(y.Left.Color == Color.BLACK && 
+                               y.Right.Color == Color.BLACK) 
+                                {	// children are both black
+                                    y.Color = Color.RED;		// change parent to red
+                                    x = x.Parent;					// move up the tree
+                                } 
+                            else 
+                                {
+                                    if(y.Right.Color == Color.BLACK) 
+                                        {
+                                            y.Left.Color	= Color.BLACK;
+                                            y.Color			= Color.RED;
+                                            RotateRight(y);
+                                            y				= x.Parent.Right;
+                                        }
+                                    y.Color			= x.Parent.Color;
+                                    x.Parent.Color	= Color.BLACK;
+                                    y.Right.Color	= Color.BLACK;
+                                    RotateLeft(x.Parent);
+                                    x = root;
+                                }
+                        } 
+                    else 
+                        {	// right subtree - same as code above with right and left swapped
+                            y = x.Parent.Left;
+                            if(y.Color == Color.RED) 
+                                {
+                                    y.Color			= Color.BLACK;
+                                    x.Parent.Color	= Color.RED;
+                                    RotateRight (x.Parent);
+                                    y = x.Parent.Left;
+                                }
+                            if(y.Right.Color == Color.BLACK && 
+                               y.Left.Color == Color.BLACK) 
+                                {
+                                    y.Color = Color.RED;
+                                    x		= x.Parent;
+                                } 
+                            else 
+                                {
+                                    if(y.Left.Color == Color.BLACK) 
+                                        {
+                                            y.Right.Color	= Color.BLACK;
+                                            y.Color			= Color.RED;
+                                            RotateLeft(y);
+                                            y				= x.Parent.Left;
+                                        }
+                                    y.Color			= x.Parent.Color;
+                                    x.Parent.Color	= Color.BLACK;
+                                    y.Left.Color	= Color.BLACK;
+                                    RotateRight(x.Parent);
+                                    x = root;
+                                }
+                        }
+                }
+            x.Color = Color.BLACK;
+        }
+
+        private void RestoreAfterInsert(RBNode x)
+        {   
+            RBNode y;
+
+            // maintain red-black tree properties after adding x
+            while(x != root && x.Parent.Color == Color.RED)
+                {
+                    // Parent node is .Colored red; 
+                    if(x.Parent == x.Parent.Parent.Left)	// determine traversal path			
+                        {										// is it on the Left or Right subtree?
+                            y = x.Parent.Parent.Right;			// get uncle
+                            if(y!= null && y.Color == Color.RED)
+                                {	// uncle is red; change x's Parent and uncle to black
+                                    x.Parent.Color			= Color.BLACK;
+                                    y.Color					= Color.BLACK;
+                                    // grandparent must be red. Why? Every red node that is not 
+                                    // a leaf has only black children 
+                                    x.Parent.Parent.Color	= Color.RED;	
+                                    x						= x.Parent.Parent;	// continue loop with grandparent
+                                }	
+                            else
+                                {
+                                    // uncle is black; determine if x is greater than Parent
+                                    if(x == x.Parent.Right) 
+                                        {	// yes, x is greater than Parent; rotate Left
+                                            // make x a Left child
+                                            x = x.Parent;
+                                            RotateLeft(x);
+                                        }
+                                    // no, x is less than Parent
+                                    x.Parent.Color			= Color.BLACK;	// make Parent black
+                                    x.Parent.Parent.Color	= Color.RED;		// make grandparent black
+                                    RotateRight(x.Parent.Parent);					// rotate right
+                                }
+                        }
+                    else
+                        {	// x's Parent is on the Right subtree
+                            // this code is the same as above with "Left" and "Right" swapped
+                            y = x.Parent.Parent.Left;
+                            if(y!= null && y.Color == Color.RED)
+                                {
+                                    x.Parent.Color			= Color.BLACK;
+                                    y.Color					= Color.BLACK;
+                                    x.Parent.Parent.Color	= Color.RED;
+                                    x						= x.Parent.Parent;
+                                }
+                            else
+                                {
+                                    if(x == x.Parent.Left)
+                                        {
+                                            x = x.Parent;
+                                            RotateRight(x);
+                                        }
+                                    x.Parent.Color			= Color.BLACK;
+                                    x.Parent.Parent.Color	= Color.RED;
+                                    RotateLeft(x.Parent.Parent);
+                                }
+                        }																													
+                }
+            root.Color = Color.BLACK;		// root should always be black
+        }
+
+        ///<summary>
+        /// RotateLeft
+        /// Rebalance the tree by rotating the nodes to the left
+        ///</summary>
+        public void RotateLeft(RBNode x)
+        {
+            // pushing node x down and to the Left to balance the tree. x's Right child (y)
+            // replaces x (since y > x), and y's Left child becomes x's Right child 
+            // (since it's < y but > x).
+            
+            RBNode y = x.Right;			// get x's Right node, this becomes y
+
+            // set x's Right link
+            x.Right = y.Left;					// y's Left child's becomes x's Right child
+
+            // modify parents
+            if(y.Left != sentinelNode) 
+                y.Left.Parent = x;				// sets y's Left Parent to x
+
+            if(y != sentinelNode)
+                y.Parent = x.Parent;			// set y's Parent to x's Parent
+
+            if(x.Parent != null)		
+                {	// determine which side of its Parent x was on
+                    if(x == x.Parent.Left)			
+                        x.Parent.Left = y;			// set Left Parent to y
+                    else
+                        x.Parent.Right = y;			// set Right Parent to y
+                } 
+            else 
+                root = y;						// at root, set it to y
+
+            // link x and y 
+            y.Left = x;							// put x on y's Left 
+            if(x != sentinelNode)						// set y as x's Parent
+                x.Parent = y;		
+        }
+
+        ///<summary>
+        /// RotateRight
+        /// Rebalance the tree by rotating the nodes to the right
+        ///</summary>
+        public void RotateRight(RBNode x)
+        {
+            // pushing node x down and to the Right to balance the tree. x's Left child (y)
+            // replaces x (since x < y), and y's Right child becomes x's Left child 
+            // (since it's < x but > y).
+            
+            RBNode y = x.Left;			// get x's Left node, this becomes y
+
+            // set x's Right link
+            x.Left = y.Right;					// y's Right child becomes x's Left child
+
+            // modify parents
+            if(y.Right != sentinelNode) 
+                y.Right.Parent = x;				// sets y's Right Parent to x
+
+            if(y != sentinelNode)
+                y.Parent = x.Parent;			// set y's Parent to x's Parent
+
+            if(x.Parent != null)				// null=root, could also have used root
+                {	// determine which side of its Parent x was on
+                    if(x == x.Parent.Right)			
+                        x.Parent.Right = y;			// set Right Parent to y
+                    else
+                        x.Parent.Left = y;			// set Left Parent to y
+                } 
+            else 
+                root = y;						// at root, set it to y
+
+            // link x and y 
+            y.Right = x;						// put x on y's Right
+            if(x != sentinelNode)				// set y as x's Parent
+                x.Parent = y;		
+        }	
+
+        private int CountBlackNodes(RBNode root) 
+        {
+            if (sentinelNode == root)
+                return 0;
+            int me = (root.Color == Color.BLACK) ? 1 : 0;
+            RBNode left = (sentinelNode == root.Left)
+                ? sentinelNode 
+                : root.Left;
+            return me + CountBlackNodes(left);
+        }
+
+        private int Count(RBNode root) 
+        {
+            if (root == sentinelNode)
+                return 0;
+            return 1 + Count(root.Left) + Count(root.Right);
+
+        }
+
+        private void RecursiveValidate(RBNode root, int blackNodes, int soFar) 
+        {
+            // Empty sub-tree is vacuously OK
+            if (sentinelNode == root)
+                return;
+
+            Color rootcolor = root.Color;
+            soFar += ((Color.BLACK == rootcolor) ? 1 : 0);
+            root.Marked = true;
+
+            // Check left side
+            RBNode left = root.Left;
+            if (sentinelNode != left) 
+                {
+                    if (left.Color == Color.RED && rootcolor == Color.RED) 
+                        {
+                            Console.WriteLine("Two consecutive red nodes!");
+                            return;
+                        }
+                    if (left.Value >= root.Value) 
+                        {
+                            Console.WriteLine("Tree values out of order!");
+                            return;
+                        }
+                    if (left.Marked) 
+                        {
+                            Console.WriteLine("Cycle in tree structure!");
+                            return;
+                        }
+                    RecursiveValidate(left, blackNodes, soFar);
+                }
+
+            // Check right side
+            RBNode right = root.Right;
+            if (sentinelNode != right) 
+                {
+                    if (right.Color == Color.RED && rootcolor == Color.RED) 
+                        {
+                            Console.WriteLine("Two consecutive red nodes!");
+                            return;
+                        }
+                    if (right.Value <= root.Value) 
+                        {
+                            Console.WriteLine("Tree values out of order!");
+                            return;
+                        }
+                    if (right.Marked) 
+                        {
+                            Console.WriteLine("Cycle in tree structure!");
+                            return;
+                        }
+                    RecursiveValidate(right, blackNodes, soFar);
+                }
+
+            // Check black node count
+            if (sentinelNode == root.Left || sentinelNode == root.Right) 
+                {
+                    if (soFar != blackNodes) 
+                        {
+                            Console.WriteLine("Variable number of black nodes to leaves!");
+                            return;
+                        }
+                }
+
+            // Everything checks out if we get this far.
+            return;
+        }
+
+        public class RBNode
+        {
+            /** creates new tree node **/
+            internal int Value = 0;
+            internal Color Color = Color.RED;
+            internal bool Marked;
+            internal RBNode Parent;
+            internal RBNode Left;
+            internal RBNode Right;
+        }
+    }
+
+    class STMTest {
+
+        static Object o = new Object();
+
+        public static void ThreadLoop() {
+            Random random = new Random();
+            int my_shadow = 0;
+            RBTree t = STMTest.t;
+            bool r;
+            int i;
+
+            try {
+            for (i = 0 ; ((Config.OP_COUNT == -1) || (i < Config.OP_COUNT)); i ++) {
+                int n = random.Next();
+                int v = (n >> 8) & Config.KEY_SPACE_MASK;
+
+                r = false;
+                if ((n & 0xff) < Config.LOOKUP_FRAC) {
+                    if (Config.KIND == RunKind.Atomic) {
+                        try {
+                            r = t.Contains(v);
+                        } catch (AtomicFakeException) { }
+                    } else if (Config.KIND == RunKind.TryAll) {
+                        try {
+                            r = t.Contains(v);
+                        } catch (TryAllFakeException) { }
+                    } else {
+                        r = t.Contains(v);
+                    }
+                } else if ((n & 0xff) < (Config.LOOKUP_FRAC + Config.REMOVE_FRAC)) {
+                    if (Config.KIND == RunKind.Atomic) {
+                        try {
+                            r = t.Remove(v);
+                        } catch (AtomicFakeException) { }
+                    } else if (Config.KIND == RunKind.TryAll) {
+                        try {
+                            r = t.Remove(v);
+                        } catch (TryAllFakeException) { }
+                    } else {
+                        r = t.Remove(v);
+                    }
+                    if (r) my_shadow -= v;
+                } else {
+                    if (Config.KIND == RunKind.Atomic) {
+                        try {
+                            r = t.Insert(v);
+                        } catch (AtomicFakeException) { }
+                    } else if (Config.KIND == RunKind.TryAll) {
+                        try {
+                            r = t.Insert(v);
+                        } catch (TryAllFakeException) { }
+                    } else {
+                        r = t.Insert(v);
+                    }
+                    if (r) my_shadow += v;
+                }
+            }
+            } catch (Exception e) {
+                lock (o) {
+                    Console.WriteLine("Failed with " + e);
+                }
+                throw e;
+            }
+
+            lock (o) {
+                t.Shadow += my_shadow;
+            }
+        }
+
+        static RBTree t;
+
+        private static void Usage(String error) {
+            Console.WriteLine(
+@"Usage:
+   tree [-t n] [-n n] [-k <RunKind>] [-d]
+
+   -t n
+      Use n threads.
+
+   -n n
+      Perform n operations on each thread.
+      Runs forever if set to -1.
+
+   -k RunKind
+      Specify if operation kind should be ""atomic"", ""tryall"", or ""direct"".
+
+   -d
+      Use deterministic output (for automated testing).");
+
+            throw new Exception("Illegal input: " + error);
+        }
+
+        private static String NextArg(string[] args, ref int nextArg) {
+            if (nextArg >= args.Length) {
+                Usage("missing argument");
+            }
+            return args[nextArg++];
+        }
+
+        private static int NextArgInt(string[] args, ref int nextArg, int min) {
+            try {
+                int x = Int32.Parse(NextArg(args, ref nextArg));
+                if(x < min) {
+                    Usage("parameter " + (nextArg-1) + " should be >= " + min);
+                }
+                return x;
+            } catch(FormatException) {
+                Usage("illegal format in parameter " + (nextArg-1));
+                return 0;
+            } catch(OverflowException) {
+                Usage("overflow in parameter " + (nextArg-1));
+                return 0;
+            }
+        }
+
+        public static void Main(string[] args) {
+
+            if (Config.LOOKUP_FRAC + Config.REMOVE_FRAC + Config.INSERT_FRAC != 0x100) {
+                throw new Exception("Operations fractions should sum to 0x100\n");
+            }
+
+            int argIndex = 0;
+            if(argIndex < args.Length) {
+                if ((String.Compare(args[0], "tree", true) == 0)
+                    || (String.Compare(args[0], "tree.exe", true) == 0)
+                    || (String.Compare(args[0], "tree.x86", true) == 0)) {
+                    argIndex++;
+                }
+            }
+
+            // Read config options
+            while (argIndex < args.Length) {
+                String arg = NextArg(args, ref argIndex);
+                switch (arg) {
+                  case "tree":
+                  case "tree.exe":
+                  case "tree.x86": {
+                      // TODO: SINGULARITY: Don't want to see executable name
+                      break;
+                  }
+                  case "-t": {
+                      Config.THREADS = NextArgInt(args, ref argIndex, 0);
+                      break;
+                  }
+                  case "-n": {
+                      Config.OP_COUNT = NextArgInt(args, ref argIndex, -1);
+                      break;
+                  }
+                  case "-k": {
+                      switch (NextArg(args, ref argIndex)) {
+                        case "atomic": {
+                            Config.KIND = RunKind.Atomic;
+                            break;
+                        }
+                        case "tryall": {
+                            Config.KIND = RunKind.TryAll;
+                            break;
+                        }
+                        case "direct": {
+                            Config.KIND = RunKind.Direct;
+                            break;
+                        }
+                        default: {
+                            Usage("Unexpected kind " + args[2]);
+                            break;
+                        }
+                      }
+                      break;
+                  }
+                  case "-d": {
+                      Config.DETERMINISTIC = true;
+                      break;
+                  }
+                  default: {
+                      Usage("unknown parameter: " + arg);
+                      break;
+                  }
+                }
+            }
+
+            // Initialise the tree
+            t = new RBTree();
+
+            // Start the threads
+
+            // TODO: SINGULARITY: Implement Thread.Name
+            // Thread.CurrentThread.Name = "Main";
+
+            Thread[] threads = new Thread[Config.THREADS];
+            for (int i = 0; i < Config.THREADS; i ++) {
+                threads[i] = new Thread (new ThreadStart (ThreadLoop));
+                
+                // TODO: SINGULARITY: Implement Thread.Name
+                // threads[i].Name = "swapping-thread-" + i;
+
+                threads[i].Start();
+            }
+
+            // Wait for the threads to complete
+            for (int i = 0; i < Config.THREADS; i ++) {
+                threads[i].Join();
+            }
+
+            // Check that dead-reckoned sums agree with what we get 
+            // traversing the tree
+            int s = t.Shadow;
+            int a = t.Actual();
+
+            if (Config.DETERMINISTIC) {
+                Console.WriteLine("Shadow - Actual = " + (s - a));
+            } else {
+                Console.WriteLine("Shadow = " + s);
+                Console.WriteLine("Actual = " + a);
+            }
+
+            if (s != a) {
+                throw new Exception("Mismatch");
+            }
+        }
+    }
+}
diff --git a/base/Applications/Tests/Bartok/tree/tree.csproj b/base/Applications/Tests/Bartok/tree/tree.csproj
new file mode 100644
index 0000000..4b6058d
--- /dev/null
+++ b/base/Applications/Tests/Bartok/tree/tree.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>tree</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <NoNullCheck>true</NoNullCheck>
+    <APP_CODEGEN>/codegen:/AtomicSupport=true /codegen:/TryAllSupport=true /codegen:/TryAllSupportLoadStoreOpt=true /codegen:/TryAllSupportSsaNullCheck=true /codegen:/TryAllSupportOptimizePass=true /codegen:/TryAllDecomposeOpt=true /codegen:/IrArrayLoadStoreOpt=false</APP_CODEGEN>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="tree.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/CLink/CLink.csproj b/base/Applications/Tests/CLink/CLink.csproj
new file mode 100644
index 0000000..aa8e4bb
--- /dev/null
+++ b/base/Applications/Tests/CLink/CLink.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CLink</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CLink.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/CLink/CLink.sg b/base/Applications/Tests/CLink/CLink.sg
new file mode 100644
index 0000000..d99162f
--- /dev/null
+++ b/base/Applications/Tests/CLink/CLink.sg
@@ -0,0 +1,79 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CLink.sg
+//
+//  Note:   Simple ping-pong second child process
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.PingPong.Contracts;
+using System;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class CLink
+    {
+        public static int Main(string[]! args)
+        {
+            if (args.Length != 2) {
+                Console.WriteLine("CLink  : Missing identifier arg.");
+                return 1;
+            }
+            string id = args[1];
+
+            Endpoint * in ExHeap ein = Process.GetStartupEndpoint(0);
+            PongContract.Exp cin = ein as PongContract.Exp;
+            if (cin == null) {
+                delete ein;
+                Console.WriteLine("CLink{0,2}: Missing incoming PongContract endpoint.", id);
+                return 2;
+            }
+            Endpoint * in ExHeap eout = Process.GetStartupEndpoint(1);
+            PongContract.Imp cout = eout as PongContract.Imp;
+            if (cout == null) {
+                delete eout;
+                delete cin;
+                Console.WriteLine("CLink{0,2}: Missing outgoing PongContract endpoint.", id);
+                return 3;
+            }
+
+            Console.WriteLine("CLink{0,2}: Waiting for child ready...", id);
+            cout.RecvPongReady();
+
+            Console.WriteLine("CLink{0,2}: Ready...", id);
+            cin.SendPongReady();
+
+            try {
+                while(true) {
+                    switch receive {
+                        case cin.Ping(int data):
+                            Console.WriteLine("CLink{0,2}: Ping({1}) to Ping...", id, data);
+                            cout.SendPing(data + 10);
+                            cout.RecvPong(out data);
+                            Console.WriteLine("CLink{0,2}: Pong({1}) to Pong...", id, data);
+                            cin.SendPong(data + 100);
+                            break;
+
+                        case cin.ChannelClosed():
+                            return 0;
+                    }
+                }
+            }
+            finally {
+                delete cin;
+                delete cout;
+            }
+            Console.WriteLine("CLink{0:d2}: Exiting.", id);
+            return 3;
+        }
+    }
+}
diff --git a/base/Applications/Tests/CPing/CPing.csproj b/base/Applications/Tests/CPing/CPing.csproj
new file mode 100644
index 0000000..8c6307c
--- /dev/null
+++ b/base/Applications/Tests/CPing/CPing.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CPing</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CPing.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/CPing/CPing.sg b/base/Applications/Tests/CPing/CPing.sg
new file mode 100644
index 0000000..5d29262
--- /dev/null
+++ b/base/Applications/Tests/CPing/CPing.sg
@@ -0,0 +1,94 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CPing.sg
+//
+//  Note:   Simple ping-pong test child app #1
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.PingPong.Contracts;
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class CPing
+    {
+        public static int Main(String[]! args)
+        {
+            int links = 0;
+            if (args.Length == 2) {
+                links = Int32.Parse(args[1]);
+            }
+            if (args.Length > 1 && links == 0) {
+                Console.WriteLine("Usage:\n" +
+                                  "    ping [links]\n" +
+                                  "Summary\n" +
+                                  "    Starts one cpong process and 'links' clink processes.");
+                return 1;
+            }
+
+            // Start up the pong process.
+            PongContract.Imp! pongImp;
+            PongContract.Exp! pongExp;
+
+            PongContract.NewChannel(out pongImp, out pongExp);
+
+            Console.WriteLine("CPing  : Starting cpong.");
+
+            string[] cargs = new string[1];
+            cargs[0] = "CPong.x86";
+            Process child = new Process(cargs, null, 1);
+            child.SetStartupEndpoint(0, (Endpoint * in ExHeap)pongExp);
+            child.Start();
+
+            // Start up each link process.
+            for (int i = 0; i < links; i++) {
+                PongContract.Imp! linkImp;
+                PongContract.Exp! linkExp;
+
+                PongContract.NewChannel(out linkImp, out linkExp);
+
+                Console.WriteLine("CPing  : Starting clink[{0}].", i);
+                cargs = new string[2];
+                cargs[0] = "CLink.x86";
+                cargs[1] = i.ToString();
+
+                child = new Process(cargs, null, 2);
+                child.SetStartupEndpoint(0, (Endpoint * in ExHeap)linkExp);
+                child.SetStartupEndpoint(1, (Endpoint * in ExHeap)pongImp);
+                child.Start();
+
+                pongImp = linkImp;
+            }
+
+            Console.WriteLine("CPing  : Waiting for cpong.");
+            pongImp.RecvPongReady();
+
+            try {
+                for (int i = 1; i <= 5; ++i) {
+                    int data = i * 1000;
+                    Console.WriteLine("CPing  : Ping({0}).", data);
+                    pongImp.SendPing(data);
+                    pongImp.RecvPong(out data);
+                    Console.WriteLine("CPing  : Pong({0}).", data);
+                }
+                Console.WriteLine("CPing  : Finished.");
+                return 0;
+            }
+            finally {
+                delete pongImp;
+            }
+            return 1;
+        }
+    }
+}
diff --git a/base/Applications/Tests/CPong/CPong.csproj b/base/Applications/Tests/CPong/CPong.csproj
new file mode 100644
index 0000000..71d1a3a
--- /dev/null
+++ b/base/Applications/Tests/CPong/CPong.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CPong</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CPong.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/CPong/CPong.sg b/base/Applications/Tests/CPong/CPong.sg
new file mode 100644
index 0000000..40e1fe3
--- /dev/null
+++ b/base/Applications/Tests/CPong/CPong.sg
@@ -0,0 +1,58 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CPong.sg
+//
+//  Note:   Simple ping-pong second child process
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.PingPong.Contracts;
+using System;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class CPong
+    {
+        public static int Main()
+        {
+            Endpoint * in ExHeap ep = Process.GetStartupEndpoint(0);
+            PongContract.Exp conn = ep as PongContract.Exp;
+            if (conn == null) {
+                delete ep;
+                Console.WriteLine("CPong  : Missing PongContract endpoint.");
+                return 2;
+            }
+
+            Console.WriteLine("CPong  : Ready...");
+            conn.SendPongReady();
+
+            try {
+                while(true) {
+                    switch receive {
+                        case conn.Ping(int data):
+                            Console.WriteLine("CPong  : Ping({0}) to Pong...", data);
+                            conn.SendPong(data + 1);
+                            break;
+
+                        case conn.ChannelClosed():
+                            return 0;
+                    }
+                }
+            }
+            finally {
+                delete conn;
+            }
+            Console.WriteLine("CPong  : Exiting...");
+            return 3;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Cast/Cast.cs b/base/Applications/Tests/Cast/Cast.cs
new file mode 100644
index 0000000..6fb0ab5
--- /dev/null
+++ b/base/Applications/Tests/Cast/Cast.cs
@@ -0,0 +1,113 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Cast.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Cast.AppMain(this);
+        }
+    }
+
+    public class Cast
+    {
+        private class CastTest
+        {
+            int value;
+        }
+
+        private class CastTestChild : CastTest
+        {
+        }
+
+        private static bool TestIs(CastTest c)
+        {
+            return c is CastTestChild;
+        }
+
+        private static bool TestTypeOf(CastTest! c)
+        {
+            return c.GetType() == typeof(CastTestChild);
+        }
+
+        private static CastTestChild TestAs(CastTest c)
+        {
+            return c as CastTestChild;
+        }
+
+        private static CastTestChild TestCast(CastTest c)
+        {
+            return (CastTestChild)c;
+        }
+
+        //[ShellCommand("cast", "Test speed of cast operations")]
+        internal static int AppMain(Parameters! config)
+        {
+            Console.WriteLine("CPU TSC as reference for delay yields:");
+
+            ulong beg;
+            ulong end;
+
+            CastTest c = new CastTestChild();
+
+            Console.Write("Testing Is:   ");
+            beg = Processor.CycleCount;
+            for (int i = 0; i < 1000; i++) {
+                TestIs(c);
+            }
+            end = Processor.CycleCount;
+            Console.WriteLine("{0,15}", (end - beg) / 1000);
+
+            Console.Write("Testing Typeof:   ");
+            beg = Processor.CycleCount;
+            for (int i = 0; i < 1000; i++) {
+                TestTypeOf(c);
+            }
+            end = Processor.CycleCount;
+            Console.WriteLine("{0,15}", (end - beg) / 1000);
+
+            Console.Write("Testing As:   ");
+            beg = Processor.CycleCount;
+            for (int i = 0; i < 1000; i++) {
+                TestAs(c);
+            }
+            end = Processor.CycleCount;
+            Console.WriteLine("{0,15}", (end - beg) / 1000);
+
+            Console.Write("Testing Cast: ");
+            beg = Processor.CycleCount;
+            for (int i = 0; i < 1000; i++) {
+                TestCast(c);
+            }
+            end = Processor.CycleCount;
+            Console.WriteLine("{0,15}", (end - beg) / 1000);
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Cast/cast.csproj b/base/Applications/Tests/Cast/cast.csproj
new file mode 100644
index 0000000..b04eca4
--- /dev/null
+++ b/base/Applications/Tests/Cast/cast.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Cast</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Cast.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/ChannelDemo/ChannelDemo.csproj b/base/Applications/Tests/ChannelDemo/ChannelDemo.csproj
new file mode 100644
index 0000000..480c35d
--- /dev/null
+++ b/base/Applications/Tests/ChannelDemo/ChannelDemo.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\ChannelDemo\ChannelDemo.csproj
+
+Note:   Tests channel I/O
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>ChannelDemo</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ChannelDemo.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Declare references to the projects you need, for example: -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/ChannelDemo/ChannelDemo.sg b/base/Applications/Tests/ChannelDemo/ChannelDemo.sg
new file mode 100644
index 0000000..4ec717b
--- /dev/null
+++ b/base/Applications/Tests/ChannelDemo/ChannelDemo.sg
@@ -0,0 +1,156 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelDemo.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ChannelDemo.AppMain(this);
+        }
+    }
+
+    public class ChannelDemo
+    {
+        public contract ChannelTest {
+            in message Hi(int x);
+            out message Ack();
+
+            state Start: Hi? -> Ack! -> Start;
+        }
+
+        private static TRef<ChannelTest.Exp:Start>! endpoint1;
+        private static TRef<ChannelTest.Imp:Start>! endpoint2;
+
+
+        public static void ChannelThread1()
+        {
+            ChannelTest.Exp e1 = endpoint1.Acquire();
+
+            for (int i = 1; i <= 3; i++) {
+                Console.WriteLine("Thread 1 receiving message {0}...", i);
+                DebugStub.Print("Thread 1 receiving message {0}...\n", __arglist(i));
+
+                int len;
+                e1.RecvHi(out len);
+                e1.SendAck();
+
+                Console.WriteLine("Thread 1 received Hi message {0}.", len);
+                DebugStub.Print("Thread 1 received Hi message {0}.\n", __arglist(len));
+            }
+
+            delete e1;
+        }
+
+        public static void ChannelThread2()
+        {
+            ChannelTest.Imp e2 = endpoint2.Acquire();
+            Console.WriteLine("Thread 2 sending message 1...");
+            DebugStub.Print("Thread 2 sending message 1...\n");
+            e2.SendHi(1);
+            e2.RecvAck();
+
+            Thread.Yield();
+
+            Console.WriteLine("Thread 2 sending message 2...");
+            DebugStub.Print("Thread 2 sending message 2...\n");
+            e2.SendHi(2);
+            e2.RecvAck();
+
+            Console.WriteLine("Thread 2 sending message 3...");
+            DebugStub.Print("Thread 2 sending message 3...\n");
+            e2.SendHi(3);
+            e2.RecvAck();
+
+            delete e2;
+        }
+
+        static TimeSpan TwoSecondTimeout = new TimeSpan(0, 0, 0, 2);
+
+        public static void TimeoutDemo() {
+            ChannelTest.Exp! exp;
+            ChannelTest.Imp! imp;
+            ChannelTest.NewChannel(out imp, out exp);
+
+            Console.WriteLine("Timeout test");
+            Console.WriteLine("Time now: {0}", DateTime.Now);
+            Console.WriteLine("Timeout: {0}", TwoSecondTimeout);
+
+            switch receive {
+            case exp.Hi(x):
+                Console.WriteLine("Got Hi, but shouldn't have");
+                DebugService.Break();
+                break;
+
+            case timeout(TwoSecondTimeout):
+                Console.WriteLine("Got timeout");
+                Console.WriteLine("Time now: {0}", DateTime.Now);
+                break;
+            }
+            delete exp;
+            delete imp;
+        }
+
+        
+        //[ShellCommand("channel", "Run channel demo")]
+        internal static int AppMain(Parameters! config)
+        {
+            // Now test timeout feature
+            TimeoutDemo();
+
+            // Make a new channel.
+            ChannelTest.Imp! e2;
+            ChannelTest.Exp! e1;
+
+            ChannelTest.NewChannel(out e2, out e1);
+
+            // Endpoints are initially owned by the creating thread.
+            // We're going to transfer ownership to other threads, so
+            // we release them here.
+            endpoint1 = new TRef<ChannelTest.Exp:Start>(e1);
+            endpoint2 = new TRef<ChannelTest.Imp:Start>(e2);
+
+            // Create our two threads.
+            Thread t1 = new Thread(new ThreadStart(ChannelThread1));
+            t1.Start();
+
+            Thread t2 = new Thread(new ThreadStart(ChannelThread2));
+            t2.Start();
+
+            // Yield a bunch of times to give our threads a chance to
+            // do their work.
+            for (int i = 0; i < 10; i++) {
+                Thread.Yield();
+            }
+
+            return 0;
+        }
+    }
+}
+
diff --git a/base/Applications/Tests/ChannelPerf/ChannelPerf.csproj b/base/Applications/Tests/ChannelPerf/ChannelPerf.csproj
new file mode 100644
index 0000000..eebc476
--- /dev/null
+++ b/base/Applications/Tests/ChannelPerf/ChannelPerf.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ChannelPerf</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ChannelPerf.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/ChannelPerf/ChannelPerf.sg b/base/Applications/Tests/ChannelPerf/ChannelPerf.sg
new file mode 100644
index 0000000..3a22208
--- /dev/null
+++ b/base/Applications/Tests/ChannelPerf/ChannelPerf.sg
@@ -0,0 +1,203 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelPerf.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter( "count", Position=0, Default=1000, HelpMessage="count")]
+        internal long count;
+
+        [BoolParameter( "a", Default=false, HelpMessage="Do Allocation")]
+        internal bool doAlloc;
+
+        [BoolParameter( "t", Default=false, HelpMessage="Do ThreadCount2 test")]
+        internal bool doThread2;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ChannelPerf.AppMain(this);
+        }
+    }
+
+    public class ChannelPerf
+    {
+        public contract ChannelPerfTest {
+            message Req(int x);
+            message Resp(int x);
+
+            state Start: Req? -> Resp! -> Start;
+        }
+
+        private static TRef<ChannelPerfTest.Exp:Start>! cpendpoint1;
+        private static TRef<ChannelPerfTest.Imp:Start>! cpendpoint2;
+
+        public static void ChannelPerfThread1()
+        {
+            ChannelPerfTest.Exp e1 = cpendpoint1.Acquire();
+            int arg;
+
+            while (true) {
+                e1.RecvReq(out arg);
+                if (arg == -1) break;
+                e1.SendResp(arg);
+            }
+
+            delete e1;
+        }
+
+        public static void ChannelPerfThread3( int count, bool doAlloc )
+        {
+            ChannelPerfTest.Imp e2 = cpendpoint2.Acquire();
+            int arg;
+            int num = count;
+            byte [] foo;
+
+            int collectorCountStart;
+            long collectorMillisStart, collectorBytesStart;
+
+            int collectorCountEnd;
+            long collectorMillisEnd, collectorBytesEnd;
+
+            Console.WriteLine("Sending/(switch) recving {0} messages ...", num);
+            if (doAlloc)
+                Console.WriteLine(" will do allocation ");
+
+            ulong before = Processor.CycleCount;
+            GC.PerformanceCounters(out  collectorCountStart, out collectorMillisStart, out collectorBytesStart);
+
+            for (int i = 0; i < num; i++) {
+                arg = i;
+                e2.SendReq(arg);
+                switch receive
+                {
+                    case e2.Resp(reply):
+                        if (doAlloc)
+                        {
+                            foo = new byte[20000];
+                            foo[1] = 0x3; // keep the compiler happy
+                        }
+                        break;
+                    case e2.ChannelClosed():
+                        throw new Exception("Didn't e2.Resp(arg)");
+                        break;
+                }
+            }
+
+            GC.PerformanceCounters( out collectorCountEnd, out collectorMillisEnd, out collectorBytesEnd);
+            ulong after = Processor.CycleCount;
+            Console.WriteLine("Done sending messages ...");
+            e2.SendReq(-1);
+            delete e2;
+            Console.WriteLine("Elapsed cycles {0}", after - before);
+            Console.WriteLine("Cycles/RPC {0}", (after - before)/(ulong)num);
+
+            Console.WriteLine(" num GCs:{0}, milli={1}, bytes={2}\n",
+                              (collectorCountEnd - collectorCountStart),
+                              (collectorMillisEnd - collectorMillisStart),
+                              (collectorBytesEnd - collectorBytesStart)
+                              );
+        }
+
+        public static void ChannelPerfThread2()
+        {
+            ChannelPerfTest.Imp e2 = cpendpoint2.Acquire();
+            int arg;
+            const int num = 1000;
+            int collectorCountStart;
+            long collectorMillisStart, collectorBytesStart;
+
+            int collectorCountEnd;
+            long collectorMillisEnd, collectorBytesEnd;
+
+            Console.WriteLine("Sending/recving {0} messages ...", num);
+            GC.PerformanceCounters(out  collectorCountStart, out collectorMillisStart, out collectorBytesStart);
+
+            Console.WriteLine(" Start: num GCs:{0}, milli={1}, bytes={2}\n",
+                              collectorCountStart,
+                              collectorMillisStart,
+                              collectorBytesStart
+                              );
+
+            ulong before = Processor.CycleCount;
+            for (int i = 0; i < num; i++) {
+                arg = i;
+                e2.SendReq(arg);
+                e2.RecvResp(out arg);
+            }
+
+            GC.PerformanceCounters( out collectorCountEnd, out collectorMillisEnd, out collectorBytesEnd);
+
+            ulong after = Processor.CycleCount;
+            Console.WriteLine("Done sending messages ...");
+            e2.SendReq(-1);
+            delete e2;
+            Console.WriteLine("Elapsed cycles {0}", after - before);
+            Console.WriteLine("Cycles/RPC {0}", (after - before)/num);
+            Console.WriteLine(" num GCs:{0}, milli={1}, bytes={2}\n",
+                              (collectorCountEnd - collectorCountStart),
+                              (collectorMillisEnd - collectorMillisStart),
+                              (collectorBytesEnd - collectorBytesStart)
+                              );
+
+        }
+
+        //[ShellCommand("channelperf", "Measure channel performance")]
+        internal static int AppMain(Parameters! config)
+        {
+
+            bool doAlloc = config.doAlloc;
+            int count = (int) config.count;
+
+            // Make a new channel.
+            ChannelPerfTest.Imp! e2;
+            ChannelPerfTest.Exp! e1;
+
+            ChannelPerfTest.NewChannel(out e2, out e1);
+
+            // Endpoints are initially owned by the creating thread.
+            // We're going to transfer ownership to other threads, so
+            // we release them here.
+            cpendpoint1 = new TRef<ChannelPerfTest.Exp:Start>(e1);
+            cpendpoint2 = new TRef<ChannelPerfTest.Imp:Start>(e2);
+
+            // Create our two threads.
+            Thread t1 = new Thread(new ThreadStart(ChannelPerfThread1));
+            t1.Start();
+
+            //Thread t2 = new Thread(new ThreadStart(ChannelPerfThread2));
+            //t2.Start();
+
+            // Actually just call into Thread2 so we don't have to sit here
+            // twiddling our thumbs! :-)
+
+            if (config.doThread2) ChannelPerfThread2();
+            else  ChannelPerfThread3(count,doAlloc);
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/ClockTest/ClockTest.cs b/base/Applications/Tests/ClockTest/ClockTest.cs
new file mode 100644
index 0000000..ecb655c
--- /dev/null
+++ b/base/Applications/Tests/ClockTest/ClockTest.cs
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ClockTest.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ClockTest.AppMain(this);
+        }
+    }
+
+    public class ClockTest
+    {
+        //[ShellCommand("clocktest", "Run clock test")]
+        internal static int AppMain(Parameters! config)
+        {
+            Console.WriteLine("CPU TSC as reference for delay yields:");
+
+            for (uint divisor = 512; divisor > 0; divisor >>= 1) {
+                ulong deltaTSC = (ulong) (ProcessService.GetCyclesPerSecond() / divisor);
+
+                long  endKernelTicks = 0;
+                ulong endTSC;
+
+                long  startKernelTicks = ProcessService.GetUpTime().Ticks;
+                ulong startTSC = (ulong) (ProcessService.GetCycleCount());
+
+                ulong finalTSC = startTSC + deltaTSC;
+
+                do {
+                    endKernelTicks = ProcessService.GetUpTime().Ticks;
+                    endTSC = (ulong) (ProcessService.GetCycleCount());
+                } while (endTSC < finalTSC);
+
+                long usKernel = (endKernelTicks - startKernelTicks) / 10;
+                ulong usTSC   = 1000000u * (endTSC - startTSC) / (ulong) (ProcessService.GetCyclesPerSecond());
+                Console.Write(" Target {0,7} us  TSC {1,7} us  HW {2,7} us\n",
+                              1000000 / divisor, (int)usTSC, (int)usKernel);
+            }
+
+            Console.WriteLine("\nHW Clock as reference for delay yields:");
+            for (uint divisor = 512; divisor > 0; divisor >>= 1) {
+                long  endKernelTicks = 0;
+                ulong endTSC;
+
+                long  startKernelTicks = ProcessService.GetUpTime().Ticks;
+                ulong startTSC = (ulong) (ProcessService.GetCycleCount());
+
+                long finalKernelTicks = startKernelTicks + 10000000 / divisor;
+
+                do {
+                    endKernelTicks = ProcessService.GetUpTime().Ticks;
+                    endTSC = (ulong) (ProcessService.GetCycleCount());
+                } while (endKernelTicks < finalKernelTicks);
+
+                long usKernel = (endKernelTicks - startKernelTicks) / 10;
+                ulong usTSC   = 1000000u * (endTSC - startTSC) / (ulong) (ProcessService.GetCyclesPerSecond());
+                Console.Write(" Target {0,7} us  TSC {1,7} us  HW {2,7} us\n",
+                              1000000 / divisor, (int)usTSC, (int)usKernel);
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/ClockTest/ClockTest.csproj b/base/Applications/Tests/ClockTest/ClockTest.csproj
new file mode 100644
index 0000000..6ed035d
--- /dev/null
+++ b/base/Applications/Tests/ClockTest/ClockTest.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ClockTest</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ClockTest.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/Collect/Collect.cs b/base/Applications/Tests/Collect/Collect.cs
new file mode 100644
index 0000000..1a7b1ad
--- /dev/null
+++ b/base/Applications/Tests/Collect/Collect.cs
@@ -0,0 +1,146 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Collect.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "set", Default=false, HelpMessage="Run set test.")]
+        internal bool doSetTest;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Collect.AppMain(this);
+        }
+    }
+
+    public class Collect
+    {
+        class LinkedList
+        {
+            private LinkedList next;
+            private LinkedList prev;
+            public int value;
+            private byte[]! data;
+
+            private LinkedList(int i, [Delayed] LinkedList _prev)
+            {
+                prev = _prev;
+                value = i;
+
+                if (i <= 1)
+                {
+                    next = null;
+                }
+                else
+                {
+                    next = new LinkedList(i - 1, this);
+                }
+                data = new byte [24576 + 1024 * i];
+            }
+
+            ~LinkedList()
+            {
+                DebugStub.Print("Finalizer called for Value={0}.\n", __arglist(value));
+            }
+
+            public void Print()
+            {
+                Console.WriteLine("Print {0}", value);
+            }
+
+            public void PrintNext()
+            {
+                Console.WriteLine("Linked Data: [{0} items]", value);
+                PrintNext(value);
+            }
+
+            private void PrintNext(int _value)
+                requires next != null;
+            {
+                Console.WriteLine("  Value = {0} [Next] {1}, {2} bytes payload",
+                    value, next.value, data.Length);
+                if (next.value != _value)
+                {
+                    next.PrintNext(_value);
+                }
+            }
+
+            public void PrintPrev()
+            {
+                Console.WriteLine("PrintPrev {0}", value);
+                PrintPrev(value);
+            }
+
+            private void PrintPrev(int _value)
+                requires prev != null;
+            {
+                Console.WriteLine("  Value = {0} [Prev] {1}", value, prev.value);
+                if (prev.value != _value)
+                {
+                    prev.PrintPrev(_value);
+                }
+            }
+
+            private LinkedList! Last()
+            {
+                if (next != null)
+                {
+                    return next.Last();
+                }
+                return this;
+            }
+
+            public static LinkedList! CreateCycle(int links)
+            {
+                LinkedList root = new LinkedList(links, null);
+                LinkedList last = root.Last();
+
+                root.prev = last;
+                last.next = root;
+
+                return root;
+            }
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            LinkedList root = LinkedList.CreateCycle(4);
+            root.PrintNext();
+            root = null;
+
+            Console.WriteLine();
+
+            Console.WriteLine("Collecting garbage [before heap: {0,8} bytes]",
+                GC.GetTotalMemory(false));
+            GC.Collect();
+            Console.WriteLine("Collecting garbage [after heap:  {0,8} bytes]",
+                GC.GetTotalMemory(false));
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Collect/Collect.csproj b/base/Applications/Tests/Collect/Collect.csproj
new file mode 100644
index 0000000..4f47838
--- /dev/null
+++ b/base/Applications/Tests/Collect/Collect.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Collect</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Collect.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/ConsoleDemo/ConsoleDemo.csproj b/base/Applications/Tests/ConsoleDemo/ConsoleDemo.csproj
new file mode 100644
index 0000000..6a85612
--- /dev/null
+++ b/base/Applications/Tests/ConsoleDemo/ConsoleDemo.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ConsoleDemo</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ConsoleDemo.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/ConsoleDemo/ConsoleDemo.sg b/base/Applications/Tests/ConsoleDemo/ConsoleDemo.sg
new file mode 100644
index 0000000..6dae956
--- /dev/null
+++ b/base/Applications/Tests/ConsoleDemo/ConsoleDemo.sg
@@ -0,0 +1,385 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelDemo.cs
+//
+//  Note:   Simple Singularity test program.
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Tests {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ConsoleDemo.AppMain(this);
+        }
+    }
+
+    public class ConsoleDemo
+    {
+        private static ConsoleDeviceContract.Imp
+        OpenConsoleInternal(DirectoryServiceContract.Imp! nsImp,
+                            [Claims] char[]! in ExHeap    deviceName)
+        {
+            ConsoleDeviceContract.Exp! exp;
+            ConsoleDeviceContract.Imp! imp;
+            ConsoleDeviceContract.NewChannel(out imp, out exp);
+
+            nsImp.SendBind(deviceName, exp);
+            switch receive
+            {
+                case nsImp.AckBind():
+                    return imp;
+                    break;
+                case nsImp.NakBind(rejectImp, error):
+                    delete rejectImp;
+                    delete imp;
+                    break;
+                case nsImp.ChannelClosed():
+                    throw new Exception("Channel closed during Console bind.");
+                    delete imp;
+                    break;
+                case nsImp.NakBindReparse(path, rest, linked, backExp):
+                    assert linked == true;
+                    assert rest   == null;
+                    delete backExp;
+                    delete imp;
+
+                    return OpenConsoleInternal(nsImp, path);
+                    break;
+            }
+            return null;
+        }
+
+        private static ConsoleDeviceContract.Imp OpenConsole(string! devName)
+        {
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+            ConsoleDeviceContract.Imp imp =
+                OpenConsoleInternal(ns, Bitter.FromString2(devName));
+            delete ns;
+
+            if (imp != null) {
+                switch receive
+                {
+                    case imp.Success():
+                        break;
+                    case imp.ContractNotSupported():
+                        throw new Exception("ConsoleOutput: ContractNotSupported");
+                        break;
+                    case imp.ChannelClosed():
+                        throw new Exception("ConsoleOutput: ChannelClosed");
+                        break;
+                }
+            }
+            return imp;
+        }
+
+        private static void ConsoleWrite(ConsoleDeviceContract.Imp! imp,
+                                         string! message)
+        {
+            char[]! in ExHeap m = Bitter.FromString2(message);
+            imp.SendWrite(m, 0, m.Length);
+            imp.RecvAckWrite(out m);
+            delete m;
+        }
+
+        private static void DrawLine(ConsoleDeviceContract.Imp! imp,
+                                     int x1, int y1, int x2, int y2,
+                                     char c)
+        {
+            int dx = x2 - x1;
+            int dy = y2 - y1;
+
+            if (dx == 0) {
+                if (dy == 0) {
+                    imp.SendPutCharAt(c, x1, y1);
+                    imp.RecvAckPutCharAt();
+                    return;
+                }
+
+                dy = dy / Math.Abs(dy);
+                for (int y = y1; y != y2; y += dy) {
+                    imp.SendPutCharAt(c, x1, y);
+                    imp.RecvAckPutCharAt();
+                }
+                return;
+            }
+            else if (dy == 0) {
+                dx = dx / Math.Abs(dx);
+                for (int x = x1; x != x2; x += dx) {
+                    imp.SendPutCharAt(c, x, y1);
+                    imp.RecvAckPutCharAt();
+                }
+                return;
+            }
+
+            if (dx < 0) dx = -dx;
+            if (dy < 0) dy = -dy;
+
+            double scale = 0;
+            int end     = 0;
+            if (dx > dy) {
+                scale = 1.0 / (double)dx;
+                end = dx;
+            }
+            else {
+                scale = 1.0 / (double)dy;
+                end   = dy;
+            }
+            for (int i = 0; i < end; i++) {
+                double x = (x1 * i * scale) + (x2 * (end - i - 1) * scale);
+                double y = (y1 *i* scale) + (y2 * (end - i - 1) * scale);
+                imp.SendPutCharAt(c, (int)x, (int)y);
+                imp.RecvAckPutCharAt();
+            }
+        }
+
+        private static void BoxDemo(ConsoleDeviceContract.Imp! imp,
+                                    int columns, int rows)
+        {
+            int cc = columns / 2;
+            int cr = rows / 2;
+            int edge = Math.Min(cc, cr);
+            for (int i = 0 ; i < edge; i++) {
+                DrawLine(imp, cc - i, cr - i, cc - i, cr + i, '*');
+                DrawLine(imp, cc - i, cr + i, cc + i, cr + i, '*');
+                DrawLine(imp, cc + i, cr + i, cc + i, cr - i, '*');
+                DrawLine(imp, cc + i, cr - i, cc - i, cr - i, '*');
+                Thread.Sleep(TimeSpan.FromMilliseconds(20));
+                DrawLine(imp, cc - i, cr - i, cc - i, cr + i, ' ');
+                DrawLine(imp, cc - i, cr + i, cc + i, cr + i, ' ');
+                DrawLine(imp, cc + i, cr + i, cc + i, cr - i, ' ');
+                DrawLine(imp, cc + i, cr - i, cc - i, cr - i, ' ');
+            }
+        }
+
+        private static void SpinBoxDemo(ConsoleDeviceContract.Imp! imp,
+                                    int columns, int rows)
+        {
+            const int twoPiSteps = 16;
+            int cc = columns / 2;
+            int cr = rows / 2;
+            int r = 2 * Math.Min(cc, cr) / 3;
+            double tau = 2 * Math.PI / twoPiSteps;
+            for (int i = 0 ; i < 5 * twoPiSteps; i++) {
+                double theta = i * tau;
+                int x = (int)(r * Math.Sin(theta));
+                int y = (int)(r * Math.Cos(theta));
+                DrawLine(imp, cc + x, cr + y, cc + y, cr - x, 'O');
+                DrawLine(imp, cc + y, cr - x, cc - x, cr - y, 'O');
+                DrawLine(imp, cc - x, cr - y, cc - y, cr + x, 'O');
+                DrawLine(imp, cc - y, cr + x, cc + x, cr + y, 'O');
+                Thread.Sleep(TimeSpan.FromMilliseconds(20));
+                DrawLine(imp, cc + x, cr + y, cc + y, cr - x, ' ');
+                DrawLine(imp, cc + y, cr - x, cc - x, cr - y, ' ');
+                DrawLine(imp, cc - x, cr - y, cc - y, cr + x, ' ');
+                DrawLine(imp, cc - y, cr + x, cc + x, cr + y, ' ');
+            }
+        }
+
+        private static void AnnounceDemo(ConsoleDeviceContract.Imp! imp,
+                                         string! title)
+        {
+            Thread.Sleep(TimeSpan.FromSeconds(3));
+            imp.SendClear();
+            imp.RecvAckClear();
+            imp.SendSetCursorPosition(0, 1); // Avoid top line for thread state
+            imp.RecvAckSetCursorPosition();
+            char []! in ExHeap buffer = Bitter.FromString2(title);
+            imp.SendWrite(buffer, 0, title.Length);
+            imp.RecvAckWrite(out buffer);
+            delete buffer;
+            Thread.Sleep(TimeSpan.FromSeconds(1));
+        }
+
+        private static void RunDemo(ConsoleDeviceContract.Imp! imp)
+        {
+            // This is just a quick placeholder that shows
+            // we can write at arbitrary points on the screen.
+
+            AnnounceDemo(imp, "Text positioning demo (diagonal 2:1)");
+
+            int columns, rows;
+            imp.SendGetDisplayDimensions();
+            imp.RecvDisplayDimensions(out columns, out rows);
+
+            int oldColumn, oldRow;
+            imp.SendGetCursorPosition();
+            imp.RecvCursorPosition(out oldColumn, out oldRow);
+
+            char []! in ExHeap message = Bitter.FromString2("Hello World");
+
+            for (int i = 2; i < 11; i++) {
+                imp.SendSetCursorPosition(2 * i, i);
+                imp.RecvAckSetCursorPosition();
+                imp.SendWrite(message, 0, message.Length);
+                imp.RecvAckWrite(out message);
+            }
+            Thread.Sleep(TimeSpan.FromMilliseconds(3000));
+            delete message;
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Testing PutCharAt(). Cursor here...");
+
+            for (int i = 0; i < columns; i++) {
+                imp.SendPutCharAt('#', i, 0);
+                imp.RecvAckPutCharAt();
+                imp.SendPutCharAt('#', i, rows - 1);
+                imp.RecvAckPutCharAt();
+                Thread.Sleep(TimeSpan.FromMilliseconds(10));
+            }
+            for (int i = 0; i < rows; i++) {
+                imp.SendPutCharAt('#', 0, i);
+                imp.RecvAckPutCharAt();
+                imp.SendPutCharAt('#', columns - 1, i);
+                imp.RecvAckPutCharAt();
+                Thread.Sleep(TimeSpan.FromMilliseconds(10));
+            }
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Testing SetCursorSize(Large)...");
+
+            imp.SendSetCursorSize(CursorSize.Large);
+            switch receive {
+                case imp.AckSetCursorSize():
+                    ConsoleWrite(imp, "okay");
+                    break;
+                case imp.NotSupported():
+                    ConsoleWrite(imp, "not supported");
+                    break;
+            }
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Testing SetCursorSize(Small)...");
+
+            imp.SendSetCursorSize(CursorSize.Small);
+            switch receive {
+                case imp.AckSetCursorSize():
+                    Console.Write("okay");
+                    break;
+                case imp.NotSupported():
+                    Console.Write("not supported");
+                    break;
+            }
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Testing SetCursorPosition()/PutChar().  Cursor moving.");
+
+            imp.SendSetCursorPosition(columns / 2, rows / 2);
+            imp.RecvAckSetCursorPosition();
+
+            imp.SendCursorShow();
+            imp.RecvAckCursorShow();
+            for (int i = 0; i < columns; i++) {
+                imp.SendSetCursorPosition(i, rows / 2);
+                imp.RecvAckSetCursorPosition();
+                imp.SendPutChar('>');
+                imp.RecvAckPutChar();
+                Thread.Sleep(TimeSpan.FromMilliseconds(10));
+            }
+            for (int i = 0; i < columns; i++) {
+                imp.SendSetCursorPosition(columns - i - 1, rows / 2);
+                imp.RecvAckSetCursorPosition();
+                imp.SendPutChar('<');
+                imp.RecvAckPutChar();
+                Thread.Sleep(TimeSpan.FromMilliseconds(10));
+            }
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Testing ClearCursorToEndOfLine().");
+
+            for (int c = 0; c < columns; c++) {
+                for (int r = 0; r < 10; r++) {
+                    imp.SendPutCharAt('A', c, r + 3);
+                    imp.RecvAckPutCharAt();
+                }
+            }
+            for (int r = 0; r < 5; r++) {
+                imp.SendSetCursorPosition(columns - r - 1, r + 3);
+                imp.RecvAckSetCursorPosition();
+                imp.SendClearCursorToEndOfLine();
+                imp.RecvAckClearCursorToEndOfLine();
+                Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+            }
+            for (int r = 5; r < 10; r++) {
+                imp.SendSetCursorPosition(columns - 10 + r, r + 3);
+                imp.RecvAckSetCursorPosition();
+                imp.SendClearCursorToEndOfLine();
+                imp.RecvAckClearCursorToEndOfLine();
+                Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+            }
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Cursor is about to be hidden and boxes drawn.");
+
+            imp.SendCursorHide();
+            imp.RecvAckCursorHide();
+
+            BoxDemo(imp, columns, rows);
+
+            // ---------------------------------------------------------------
+
+            AnnounceDemo(imp, "Spinning Box demo.");
+
+            SpinBoxDemo(imp, columns, rows);
+
+            // ---------------------------------------------------------------
+
+            imp.SendCursorShow();
+            imp.RecvAckCursorShow();
+
+            imp.SendClear();
+            imp.RecvAckClear();
+
+            imp.SendSetCursorPosition(oldColumn, oldRow);
+            imp.RecvAckSetCursorPosition();
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            foreach (string s in new string [] { "/dev/video-text",
+                                                 "/dev/conout" }) {
+                ConsoleDeviceContract.Imp imp = OpenConsole((!)s);
+                if (imp != null) {
+                    Console.WriteLine("Opened {0}\n", s);
+                    RunDemo(imp);
+                    delete imp;
+                    break;
+                }
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/DumpPages/DumpPages.cs b/base/Applications/Tests/DumpPages/DumpPages.cs
new file mode 100644
index 0000000..b38a6d4
--- /dev/null
+++ b/base/Applications/Tests/DumpPages/DumpPages.cs
@@ -0,0 +1,24 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DumpPages.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class DumpPages
+    {
+        //[ShellCommand("dump", "Dump page table")]
+        public static int Main(String[] args)
+        {
+            AppRuntime.DumpPageTable();
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/DumpPages/DumpPages.csproj b/base/Applications/Tests/DumpPages/DumpPages.csproj
new file mode 100644
index 0000000..3b29a89
--- /dev/null
+++ b/base/Applications/Tests/DumpPages/DumpPages.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\DumpPages\DumpPages.csproj
+
+Note:   DumpPages test
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>DumpPages</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DumpPages.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/GcStress/GcStress.csproj b/base/Applications/Tests/GcStress/GcStress.csproj
new file mode 100644
index 0000000..e779eb4
--- /dev/null
+++ b/base/Applications/Tests/GcStress/GcStress.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Cast</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="GCStress.sg" />
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Stress\GcStress.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Stress.Contracts\Stress.Contracts.csproj"/>
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/GcStress/GcStress.sg b/base/Applications/Tests/GcStress/GcStress.sg
new file mode 100644
index 0000000..afedb9d
--- /dev/null
+++ b/base/Applications/Tests/GcStress/GcStress.sg
@@ -0,0 +1,177 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   GcStress.sg
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Stress.Contracts;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "kernel", Default=false, HelpMessage="Run kernel test.")]
+        internal bool doKernelTest;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return GcStress.AppMain(this);
+        }
+    }
+    
+    public class GcStress : Microsoft.Singularity.Stress.GcStress
+    {
+        override protected void Print(string! s)
+        {
+            Console.Write(s);
+        }
+
+        //[ShellCommand("gcstress", "Stress garbage collector")]
+        internal static int AppMain(Parameters! config)
+        {
+            const int ARGS_START = 1;
+
+            if (!config.doKernelTest)
+            {
+                new GcStress().Run();
+            }
+            else {
+                DirectoryServiceContract.Imp! epNS = DirectoryService.NewClientEndpoint();
+
+                try
+                {
+                    StressContract.Imp! imp;
+                    StressContract.Exp! exp;
+                    StressContract.NewChannel(out imp, out exp);
+                    
+                    ErrorCode errorOut; 
+                    bool ok = SdsUtils.Bind(StressContract.ModuleName, epNS, exp, out errorOut);
+                    if (!ok) {
+                        Console.Write("failure on lookup of name " + StressContract.ModuleName
+                                      + "reason: " + SdsUtils.ErrorCodeToString(errorOut));
+                    delete imp;
+                    if (errorOut == ErrorCode.ChannelClosed) 
+                    {
+                        throw new Exception("Encountered a ChannelClosed");
+                    }
+                    return 1;
+                   } 
+                   else {
+                        switch receive
+                        {
+                            case imp.Ready() :
+                                break;
+                            case imp.ContractNotSupported() :
+                                Console.Write("failure: contract not supported");
+                                delete imp;
+                                return 1;
+                            case imp.ChannelClosed() :
+                                Console.Write("failure: channel closed prematurely");
+                                delete imp;
+                                return 1;
+                        }
+                        imp.SendGcStress();
+                        while (true)
+                        {
+                            switch receive
+                            {
+                                case imp.Print(char[] in ExHeap s) :
+                                    Console.Write(Bitter.ToString(s));
+                                    imp.SendAckPrint();
+                                    delete s;
+                                    break;
+
+                                case imp.GcStressDone() :
+                                    delete imp;
+                                    return 0;
+
+                                case imp.ChannelClosed() :
+                                    delete imp;
+                                    return 0;
+                            }
+                        }
+                    }
+/* 
+//                    epNS.SendBind(Bitter.FromString2(StressContract.ModuleName), exp);
+
+                    switch receive
+                    {
+                        case epNS.NakBind(rejected, error) :
+                            // failure
+                            Console.Write("failure on lookup of name " + StressContract.ModuleName);
+                            delete imp;
+                            delete rejected;
+                            return 1;
+
+                        case epNS.AckBind() :
+                            // success
+                            switch receive
+                            {
+                                case imp.Ready() :
+                                    break;
+                                case imp.ContractNotSupported() :
+                                    Console.Write("failure: contract not supported");
+                                    delete imp;
+                                    return 1;
+                                case imp.ChannelClosed() :
+                                    Console.Write("failure: channel closed prematurely");
+                                    delete imp;
+                                    return 1;
+                            }
+                            imp.SendGcStress();
+                            while (true)
+                            {
+                                switch receive
+                                {
+                                    case imp.Print(char[] in ExHeap s) :
+                                        Console.Write(Bitter.ToString(s));
+                                        imp.SendAckPrint();
+                                        delete s;
+                                        break;
+
+                                    case imp.GcStressDone() :
+                                        delete imp;
+                                        return 0;
+
+                                    case imp.ChannelClosed() :
+                                        delete imp;
+                                        return 0;
+                                }
+                            }
+                        case epNS.ChannelClosed() :
+                            throw new Exception("epNS channel closed");
+                    }
+*/                    
+                }
+                finally
+                {
+                    delete epNS;
+                }
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Hog/Hog.cs b/base/Applications/Tests/Hog/Hog.cs
new file mode 100644
index 0000000..d7820cf
--- /dev/null
+++ b/base/Applications/Tests/Hog/Hog.cs
@@ -0,0 +1,61 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Hog.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Hog.AppMain(this);
+        }
+    }
+
+    public class Hog
+    {
+        public static void HogFunction()
+        {
+            int i = 0;
+            while (true) {
+                if ((i % 10000000) == 0) {
+                    Console.Write(".");
+                }
+                i++;
+            }
+        }
+
+        //[ShellCommand("hog", "Run processor hog")]
+        internal static int AppMain(Parameters! config)
+        {
+            Console.WriteLine("Starting a hog...");
+
+            Thread hog = new Thread(new ThreadStart(HogFunction));
+            hog.Start();
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Hog/Hog.csproj b/base/Applications/Tests/Hog/Hog.csproj
new file mode 100644
index 0000000..5c72a92
--- /dev/null
+++ b/base/Applications/Tests/Hog/Hog.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Hog</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Hog.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/KPTest/KPTest.csproj b/base/Applications/Tests/KPTest/KPTest.csproj
new file mode 100644
index 0000000..679c07a
--- /dev/null
+++ b/base/Applications/Tests/KPTest/KPTest.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\KPTest\KPTest.csproj
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>KPTest</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoNullChecks>true</NoNullChecks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="KPTest.sg"/>
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Stress\KPTestBase.sg"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Stress.Contracts\Stress.Contracts.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/KPTest/KPTest.sg b/base/Applications/Tests/KPTest/KPTest.sg
new file mode 100644
index 0000000..0a61118
--- /dev/null
+++ b/base/Applications/Tests/KPTest/KPTest.sg
@@ -0,0 +1,223 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   KPTest.sg
+//
+//  Note:   Tests the kernel-process boundary.
+//
+//  Feel free to add more commands to this file.
+
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Stress.Contracts;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "help", Default=false, HelpMessage="Display Extended help message.")]
+        internal bool doHelp;
+
+        [StringArrayParameter( "args", HelpMessage="arg bucket")]
+        internal string[] args;
+        
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return KPTest.AppMain(this);
+        }
+    }
+    
+    public class KPTest : Microsoft.Singularity.Stress.KPTestBase
+    {
+        static Hashtable! processes = new Hashtable(); // maps strings to Processes
+
+        internal static int AppMain(Parameters! config)
+        {
+            assume config.args != null;
+            string[] args; 
+            if(config.doHelp) {
+                Console.WriteLine("usage:");
+                Console.WriteLine("  kptest command1 ... commandn");
+                Console.WriteLine("where each command is one of:");
+                Console.WriteLine("  print s         {print s; ...remaining commands...;}");
+                Console.WriteLine("  print- s        {...remaining commands...; print s}");
+                Console.WriteLine("  print^ s        {print s; ...remaining commands...; print s}");
+                Console.WriteLine("  catch s         {try {...remaining commands...} catch(Exception) {print s}}");
+                Console.WriteLine("  finally s       {try {...remaining commands...} finally {print s}}");
+                Console.WriteLine("  break           {break; ...remaining commands...; break}");
+                Console.WriteLine("  kernel          {enter kernel; ...remaining commands...; leave kernel");
+                Console.WriteLine("  frames n        {make n stack frames; ...remaining commands...; free frames}");
+                Console.WriteLine("  throw           {throw ArgumentException}");
+                Console.WriteLine("  throwstop       {throw ProcessStopException} (kernel only)");
+                Console.WriteLine("  delay n         {for i=1 to n {compute} ...remaining commands...}");
+                Console.WriteLine("  sleep n         {sleep n milliseconds ...remaining commands...}");
+                Console.WriteLine("  yield           {yield; ...remaining commands...}");
+                Console.WriteLine("  wall            {block forever}");
+                Console.WriteLine("  (* n ... )      {repeat n {...}; ...remaining commands...}}");
+                Console.WriteLine("  (| ... )        {new thread(...); ...remaining commands...}} (process only)");
+                Console.WriteLine("  (& s ... )      {new proc s(...); ...remaining commands...}} (process only)");
+                Console.WriteLine("  suspend s       {suspend proc s; ...remaining commands...} (process only)");
+                Console.WriteLine("  resume s        {resume proc s; ...remaining commands...} (process only)");
+                Console.WriteLine("  stop s          {stop proc s; ...remaining commands...} (process only)");
+                Console.WriteLine("where s is any string and n is any nonnegative integer");
+                Console.WriteLine("example: kptest print hello catch foo frames 1000 kernel finally bar throw");
+                Console.WriteLine("example: kptest print 1 (& p print hi delay 100 print bye ) delay 50 stop p");
+                Console.WriteLine("example: kptest 'print 1 (& p print hi delay 100 print bye ) delay 50 stop p'");
+                return 0;
+            }
+            else if (config.args.Length == 1) {
+                // Turn a single quoted string into a list of arguments.
+                // Beware: this doesn't handle multiple spaces between commands.
+                string foo = config.args[0] ;
+                assert foo != null; 
+                args = foo.Split(new char[] {' '});
+            }
+            else args = config.args; 
+            
+            Console.WriteLine("return value: {0:x}", new KPTest().Go(args, 0));
+            return 0;
+        }
+
+        public KPTest()
+        {
+        }
+
+        private string[] args;
+
+        private KPTest(String[]! args)
+        {
+            this.args = args;
+        }
+        
+        private void Run()
+            requires this.args != null;
+        {
+            Console.WriteLine("new thread running");
+            Console.WriteLine("thread return value: {0:x}", Go(args, 0));
+        }
+
+        public override uint Go(string[]! args, int i)
+        {
+            if (i >= args.Length) return 0x12345678;
+            string arg = args[i];
+            if (arg == "kernel" || arg == "_kernel")
+            {
+                ArgList* in ExHeap exArgs = null;
+                for(int j = args.Length - 1; j >= 0; j--)
+                {
+                    exArgs = new[ExHeap] ArgList(Bitter.FromString(args[j]), exArgs);
+                }
+
+                if (arg == "kernel")
+                {
+                    Console.WriteLine("calling kernel");
+                }
+                unsafe
+                {
+                    uint r = Microsoft.Singularity.V1.Stress.StressDirect.KPTest((SharedHeapService.Allocation*) exArgs, i + 1);
+                    if (arg == "kernel")
+                    {
+                        Console.WriteLine("returned from kernel");
+                    }
+                    return r;
+                }
+            }
+            else if (arg == "(|")
+            {
+                int rParen = FindClosingRParen((!) args, i + 1);
+                string[] before = new string[rParen - (i + 1)];
+                Array.Copy(args, i + 1, before, 0, before.Length);
+                string[] after = new string[args.Length - (rParen + 1)];
+                Array.Copy(args, rParen + 1, after, 0, after.Length);
+                new Thread(new ThreadStart(new KPTest(before).Run)).Start();
+                return Go(after, 0);
+            }
+            else if (arg == "(&")
+            {
+                string! name = (!)args[i + 1];
+                int rParen = FindClosingRParen((!) args, i + 2);
+                string[] before = new string[rParen - (i + 2) + 1];
+                before[0] = "kptest";
+                Array.Copy(args, i + 2, before, 1, before.Length - 1);
+                string[] after = new string[args.Length - (rParen + 1)];
+                Array.Copy(args, rParen + 1, after, 0, after.Length);
+                Process p = new Process(before);
+                processes[name] = p;
+                p.Start();
+                return Go(after, 0);
+            }
+            else if (arg == "suspend" || arg == "_suspend")
+            {
+                string! name = (!)args[i + 1];
+                Process! p = (!)(processes[name] as Process);
+                if (arg == "suspend")
+                {
+                    Console.WriteLine("suspending " + name);
+                }
+                p.Suspend(false);
+                if (arg == "suspend")
+                {
+                    Console.WriteLine("suspended " + name);
+                }
+                return Go(args, i + 2);
+            }
+            else if (arg == "resume" || arg == "_resume")
+            {
+                string! name = (!)args[i + 1];
+                Process! p = (!)(processes[name] as Process);
+                if (arg == "resume")
+                {
+                    Console.WriteLine("resuming " + name);
+                }
+                p.Resume(false);
+                if (arg == "resume")
+                {
+                    Console.WriteLine("resumed " + name);
+                }
+                return Go(args, i + 2);
+            }
+            else if (arg == "stop" || arg == "_stop")
+            {
+                string! name = (!)args[i + 1];
+                Process! p = (!)(processes[name] as Process);
+                if (arg == "stop")
+                {
+                    Console.WriteLine("stopping " + name);
+                }
+                p.Stop();
+                if (arg == "stop")
+                {
+                    Console.WriteLine("stopped " + name);
+                }
+                return Go(args, i + 2);
+            }
+            else
+            {
+                return base.Go(args, i);
+            }
+        }
+    }
+}
diff --git a/base/Applications/Tests/KPTest/StressLib.cs b/base/Applications/Tests/KPTest/StressLib.cs
new file mode 100644
index 0000000..1f7162d
--- /dev/null
+++ b/base/Applications/Tests/KPTest/StressLib.cs
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   KPTest.sg
+//
+//  Note:   Tests the kernel-process boundary.
+//
+//  Feel free to add more commands to this file.
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Stress;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Stress
+{
+    public class StressDirect
+    {
+        [OutsideGCDomain]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe uint KPTest(SharedHeapService.Allocation* sharedArgs, int i);
+    }
+}
diff --git a/base/Applications/Tests/Keys/Keys.csproj b/base/Applications/Tests/Keys/Keys.csproj
new file mode 100644
index 0000000..3be0e1b
--- /dev/null
+++ b/base/Applications/Tests/Keys/Keys.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Keys</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Keys.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/Keys/Keys.sg b/base/Applications/Tests/Keys/Keys.sg
new file mode 100644
index 0000000..edbc2bc
--- /dev/null
+++ b/base/Applications/Tests/Keys/Keys.sg
@@ -0,0 +1,140 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Keys.sg
+//
+//  Note:   Simple Singularity test program.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+
+using Keyboard = Microsoft.Singularity.Io.Keyboard;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class Keys
+    {
+        //[ShellCommand("keys", "Test keyboard")]
+        public static int Main(String[] args)
+        {
+            Console.WriteLine("Press a mouse button to exit.");
+
+            KeyboardDeviceContract.Imp keyboard = OpenKeyboard("/dev/keyboard");
+            if (keyboard == null) return -1;
+
+            for (;;) {
+                int x;
+                int y;
+                uint key = 0;
+                keyboard.SendGetKey();
+                switch receive
+                {
+                    case keyboard.AckKey(ikey):
+                        key = ikey;
+                        break;
+                    case keyboard.NakKey():
+                        break;
+                    case keyboard.ChannelClosed():
+                        throw new Exception("Didn't get reply from Keyboard");
+                }
+
+                if (key == 0) {
+                    Tracing.Log(Tracing.Warning, "GetKey failed.");
+                    break;
+                }
+                if ((key & (uint)Keyboard.Qualifiers.KEY_DOWN) == 0) {
+                    continue;
+                }
+
+                if ((key & (uint)Keyboard.Qualifiers.KEY_MOUSE) != 0) {
+                    if ((key & (uint)Keyboard.Qualifiers.MOUSE_BUTTON_ALL) != 0) {
+                        break;
+                    }
+                }
+
+#if DO_MOUSE
+                mouse.GetPosition(out x, out y);
+                Console.WriteLine("{0,8:x8}:{1,4},{2,4}", key, x, y);
+#endif
+                Console.Write(key);
+            }
+
+            delete keyboard;
+
+            return 0;
+        }
+
+        private static KeyboardDeviceContract.Imp:Ready
+        OpenKeyboardInternal(DirectoryServiceContract.Imp!        nsImp,
+                             [Claims] char[]! in ExHeap           devName)
+        {
+            KeyboardDeviceContract.Exp! keyExp;
+            KeyboardDeviceContract.Imp! keyImp;
+            KeyboardDeviceContract.NewChannel(out keyImp, out keyExp);
+
+            nsImp.SendBind(devName, keyExp);
+            switch receive
+            {
+                case nsImp.AckBind():
+                    return keyImp;
+                    break;
+                case nsImp.NakBind(rejected, error):
+                    delete rejected;
+                    delete keyImp;
+                    break;
+                case nsImp.ChannelClosed():
+                    throw new Exception("Didn't Keyboard.RecvAckConnect");
+                    delete keyImp;
+                    break;
+                case nsImp.NakBindReparse(path, rest, linkFound, backExp):
+                    assert linkFound == true;
+                    assert rest      == null;
+
+                    delete backExp;
+                    delete keyImp;
+
+                    return OpenKeyboardInternal(nsImp, path);
+                    break;
+            }
+            return null;
+        }
+
+        public static KeyboardDeviceContract.Imp:Ready
+        OpenKeyboard(string! devName)
+        {
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            KeyboardDeviceContract.Imp imp =
+                OpenKeyboardInternal(ns, Bitter.FromString2(devName));
+            delete ns;
+
+            if (imp == null) {
+                DebugStub.Print("OpenKeyboard lookup of {0} failed.\n", __arglist(devName));
+                return null;
+            }
+
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    throw new Exception("Didn't imp.RecvAckConnect: ContractNotSupported");
+                    break;
+                case imp.ChannelClosed():
+                    throw new Exception("Channel closed unexpectedly");
+                    break;
+            }
+            return imp;
+        }
+    }
+}
diff --git a/base/Applications/Tests/MathTest/MathTest.cs b/base/Applications/Tests/MathTest/MathTest.cs
new file mode 100644
index 0000000..5507df3
--- /dev/null
+++ b/base/Applications/Tests/MathTest/MathTest.cs
@@ -0,0 +1,79 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MathTest.cs
+//
+using System;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class MathTest
+    {
+        private static void spec_zipf_setup(int size, double Z)
+        {
+            Console.WriteLine("spec_zipf_setup size={0}",size);
+            for (int i = 1; i <= size; i++) {
+                // compute zipf values for samples 1-n.
+
+                double d0 = 1.0 / (double)i;
+                double d1 = Math.Pow(d0, Z);
+                Console.WriteLine("pow({0,9:f6}, {1,9:f6})={2,9:f6}", d0, Z, d1);
+            }
+        }
+
+        //[ShellCommand("mathtest", "Run simple math tests.")]
+        public static int Main()
+        {
+            double x1 = Math.PI / 4;
+            double x2 = 0.50;
+
+            Console.WriteLine("Asin ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Asin(x1), 0.903339);
+            Console.WriteLine("Acos ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Acos(x1), 0.667457);
+            Console.WriteLine("Sin  ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Sin(x1), 0.707107);
+            Console.WriteLine("Cos  ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Cos(x1), 0.707107);
+            Console.WriteLine("Tan  ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Tan(x1), 1.000000);
+            Console.WriteLine("Atan ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Atan(x1), 0.665774);
+            Console.WriteLine("Atan2({0,9:f6}, {1,9:f6}) = {2,9:f6} : {3,9:f6}",
+                              x1, x2, Math.Atan2(x1, x2), 1.003885);
+            Console.WriteLine("Abs  ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Abs(x1), 0.785398);
+            Console.WriteLine("Sqrt ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Sqrt(x1), 0.886227);
+            Console.WriteLine("Log  ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Log(x1), -0.241564);
+            Console.WriteLine("Log10({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Log10(x1), -0.104910);
+            Console.WriteLine("Pow  ({0,9:f6}, {1,9:f6}) = {2,9:f6} : {3,9:f6}",
+                              x1, x2, Math.Pow(x1, x2), 0.886227);
+            Console.WriteLine("Fmod ({0,9:f6}, {1,9:f6}) = {2,9:f6} : {3,9:f6}",
+                              x1, x2, Math.Mod(x1, x2), 0.285398);
+            Console.WriteLine("Floor({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Floor(x1), 0.000000);
+            Console.WriteLine("Ceil ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Ceiling(x1), 1.000000);
+            Console.WriteLine("Round({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Round(x1), 1.000000);
+            Console.WriteLine("Round({0,9:f6}, {1})         = {2,9:f6} : {3,9:f6}",
+                              (double)Math.PI, 2, Math.Round(Math.PI, 2), 3.14, 999, 99);
+            Console.WriteLine("Sinh ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Sinh(x1), 0.868671);
+            Console.WriteLine("Tanh ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Tanh(x1), 0.655794);
+            Console.WriteLine("Cosh ({0,9:f6})            = {1,9:f6} : {2,9:f6}",
+                              x1, Math.Cosh(x1), 1.324609);
+
+            spec_zipf_setup(24, 1.0);
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/MathTest/MathTest.csproj b/base/Applications/Tests/MathTest/MathTest.csproj
new file mode 100644
index 0000000..9ba6bfa
--- /dev/null
+++ b/base/Applications/Tests/MathTest/MathTest.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>MathTest</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="MathTest.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/MonitorTest/MonitorTest.cs b/base/Applications/Tests/MonitorTest/MonitorTest.cs
new file mode 100644
index 0000000..ce98728
--- /dev/null
+++ b/base/Applications/Tests/MonitorTest/MonitorTest.cs
@@ -0,0 +1,63 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MonitorTest.cs
+//
+//  Note:   Some basic tests of the monitor code.
+//
+
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.UnitTest;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return MonitorTest.AppMain(this);
+        }
+    }
+
+    public class MonitorTest
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            for (int i = 0; i < 2; i++) {
+                UnitTest.Add("Many Threads PulseAll",
+                             new UnitTest.TestDelegate(PulseAllTest.ManyThreadsTest));
+
+                UnitTest.Add("Few Threads Pulse",
+                             new UnitTest.TestDelegate(PulseAllTest.FewThreadsTest));
+
+                UnitTest.Add("Low-density Pulse",
+                             new UnitTest.TestDelegate(PulseTest.LowDensityTest));
+                UnitTest.Add("Medium-density Pulse",
+                             new UnitTest.TestDelegate(PulseTest.MediumDensityTest));
+                UnitTest.Add("High-density Pulse",
+                             new UnitTest.TestDelegate(PulseTest.HighDensityTest));
+            }
+            return ((UnitTest.Run(true) == UnitTest.Result.Passed) &&
+                    Assert.Failures == 0) ? 0 : 1;
+        }
+    }
+}
diff --git a/base/Applications/Tests/MonitorTest/MonitorTest.csproj b/base/Applications/Tests/MonitorTest/MonitorTest.csproj
new file mode 100644
index 0000000..24f633c
--- /dev/null
+++ b/base/Applications/Tests/MonitorTest/MonitorTest.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\MonitorTest\MonitorTest.csproj
+
+Note:   MonitorTest test
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>MonitorTest</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MonitorTest.cs"/>
+    <Compile Include="PulseTest.cs"/>
+    <Compile Include="PulseAllTest.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\UnitTest\UnitTestLib.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/MonitorTest/PulseAllTest.cs b/base/Applications/Tests/MonitorTest/PulseAllTest.cs
new file mode 100644
index 0000000..3216b04
--- /dev/null
+++ b/base/Applications/Tests/MonitorTest/PulseAllTest.cs
@@ -0,0 +1,178 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PulseTest.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.UnitTest;
+
+namespace Microsoft.Singularity.Applications
+{
+    /// <remarks>
+    /// A test of Monitor.PulseAll.  A collection of threads waits on
+    /// a single monitor for a pulse all.
+    /// </remarks>
+    internal sealed class PulseAllTest
+    {
+        int waiterCount    = 50;
+        int timeoutSeconds = 2;
+
+        int  passedBarrier = 0;
+        bool waiterRunning = false;
+        volatile bool timedOut      = false;
+        volatile bool stop          = false;
+        volatile int  generation    = 0;
+
+        ManualResetEvent! controllerReady = new ManualResetEvent(false);
+        ManualResetEvent! finishedEvent   = new ManualResetEvent(false);
+        AutoResetEvent!   barrierEvent    = new AutoResetEvent(false);
+        object!           monitor         = new object();
+        bool []!          visited;
+
+        private static void Yield()
+        {
+#if SINGULARITY
+            Thread.Yield();
+#else
+            Thread.Sleep(0);
+#endif
+        }
+
+        public void WatchdogThreadMain()
+        {
+            TimeSpan delta = TimeSpan.FromSeconds(timeoutSeconds);
+
+            int now  = this.generation;
+            int last = 0;
+            do {
+                last = now;
+                if (finishedEvent.WaitOne(delta)) {
+                    return;
+                }
+                Yield();
+                now = this.generation;
+            } while (last != now);
+
+            DebugStub.Break();
+
+            this.timedOut = true;
+        }
+
+        public void ControllerThreadMain()
+        {
+            const int iterations = 1000;
+
+            const int YieldFudge = 50;
+
+            // Signal worker threads to start
+            controllerReady.Set();
+            Yield();
+
+            for (int i = 1; i <= iterations; i++) {
+                barrierEvent.WaitOne();
+                // There is a potential
+                // race between the last thread reaching the barrier
+                // setting the barrierEvent and reaching the Monitor.Wait
+                // call.  By yielding a few times we should give the
+                // thread enough time to get there.
+                for (int n = 0; n < YieldFudge; n++)
+                    Yield();
+                lock (this.monitor) {
+                    // Reset check state
+                    this.passedBarrier = 0;
+                    for (int j = 0; j < visited.Length; j++) {
+                        visited[j] = false;
+                    }
+
+                    // Set stop flag if end is reached
+                    this.stop = (i == iterations);
+
+                    // Wake up waiters
+                    Monitor.PulseAll(this.monitor);
+                }
+            }
+            finishedEvent.Set();
+        }
+
+        public void WaiterThreadMain()
+        {
+            while (!stop) {
+                Monitor.Enter(this.monitor);
+                try {
+                    Assert.True(waiterRunning == false,
+                                "Two waiters have monitor.");
+                    waiterRunning = true;
+
+                    Assert.False(this.visited[this.passedBarrier],
+                                 "Thread already reached barrier.");
+                    this.visited[this.passedBarrier] = true;
+
+                    this.passedBarrier++;
+                    this.generation++;
+
+                    Assert.LessOrEqual(this.passedBarrier, waiterCount,
+                                       "More waiters passed barrier than expected.");
+
+                    if (this.passedBarrier == this.waiterCount) {
+                        barrierEvent.Set();
+                    }
+
+                    this.waiterRunning = false;
+                    Monitor.Wait(this.monitor);
+                    this.waiterRunning = true;
+                }
+                finally {
+                    this.waiterRunning = false;
+                    Monitor.Exit(this.monitor);
+                }
+            }
+        }
+
+        public void RunTest()
+        {
+            Thread watchdog =
+                new Thread(new ThreadStart(WatchdogThreadMain));
+            Thread controller =
+                new Thread(new ThreadStart(ControllerThreadMain));
+
+            watchdog.Start();
+            controller.Start();
+
+            controllerReady.WaitOne();
+            for (int i = 0; i < waiterCount; i++) {
+                Thread t = new Thread(new ThreadStart(WaiterThreadMain));
+                t.Start();
+            }
+
+            while (!controller.Join(TimeSpan.FromMilliseconds(100))) {
+                Assert.False(this.timedOut, "Timed out!");
+            }
+            watchdog.Join();
+        }
+
+        public PulseAllTest(int threadCount, int timeoutSeconds)
+        {
+            this.waiterCount    = threadCount;
+            this.timeoutSeconds = timeoutSeconds;
+            this.visited        = new bool [threadCount];
+        }
+
+        public static void FewThreadsTest()
+        {
+            (new PulseAllTest(8, 2)).RunTest();
+        }
+
+        public static void ManyThreadsTest()
+        {
+            (new PulseAllTest(50, 2)).RunTest();
+        }
+    }
+}
diff --git a/base/Applications/Tests/MonitorTest/PulseTest.cs b/base/Applications/Tests/MonitorTest/PulseTest.cs
new file mode 100644
index 0000000..94f4f6a
--- /dev/null
+++ b/base/Applications/Tests/MonitorTest/PulseTest.cs
@@ -0,0 +1,211 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PulseTest.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.UnitTest;
+
+namespace Microsoft.Singularity.Applications
+{
+    /// <remarks>
+    /// A class for testing Monitor.Pulse.
+    ///
+    /// <para> This class creates a group of monitors (Node class) that
+    /// a collection of threads then enters, spins, pulses, and exits.
+    /// </para>
+    /// </remarks>
+    internal sealed class PulseTest
+    {
+        internal class Node
+        {
+            volatile bool inVisit = false;
+
+            internal void BeginVisit()
+            {
+                Monitor.Enter(this);
+                Assert.False(inVisit, "Node is visited by two threads");
+                inVisit = true;
+            }
+
+            internal void EndVisit()
+            {
+                Assert.True(inVisit, "Unpaired visit ending");
+                Monitor.Pulse(this);
+                inVisit = false;
+                Monitor.Exit(this);
+            }
+        }
+
+        internal sealed class VisitPath
+        {
+            int[]! path;
+            int    remainLength;
+            int    cycles;
+
+            internal VisitPath(int pathLength)
+            {
+                this.path         = new int[pathLength];
+                this.remainLength = pathLength;
+                this.cycles       = 0;
+            }
+
+            internal void Initialize()
+            {
+                // This is a separate method so
+                // we can compile compatibly on Win32.  SGC wants
+                // the Sing# specific NonDelayed attribute otherwise.
+                for (int i = 0; i < this.remainLength; i++) {
+                    this.path[i] = i;
+                }
+            }
+
+            internal int Pick(int randomNumber)
+            {
+                int n = randomNumber % this.remainLength;
+                int r = this.path[n];
+
+                this.remainLength--;
+                this.path[r] = this.path[this.remainLength];
+                this.path[this.remainLength] = r;
+
+                if (this.remainLength == 0) {
+                    this.cycles++;
+                    this.remainLength = this.path.Length;
+                }
+                return r;
+            }
+
+            internal int Cycles { get { return this.cycles; } }
+        }
+
+        private Node[]! nodes;
+        private readonly int threadCount;
+        private readonly int maxCycles;
+        private volatile int startedCount;
+        private volatile int finishedCount;
+        private volatile int generation;
+        private ManualResetEvent! finishedEvent;
+
+        private static void Yield()
+        {
+#if SINGULARITY
+            Thread.Yield();
+#else
+            Thread.Sleep(0);
+#endif
+        }
+
+        internal void VisitorThreadMain()
+        {
+            // Wait until all other threads have started
+            int threadNumber;
+            lock (this) {
+                threadNumber = startedCount++;
+            }
+            while (startedCount != this.threadCount) {
+                Yield();
+            }
+
+            Random rng     = new Random(threadNumber);
+            VisitPath path = new VisitPath(this.nodes.Length);
+            path.Initialize();
+
+            while (path.Cycles != this.maxCycles) {
+                // Select a node previously unvisited in this cycle
+                Node/*!*/ n =  /*^(!)^*/ nodes[path.Pick(rng.Next())];
+                n.BeginVisit();
+
+                // Yield up to number of threads to give other
+                // threads a chance to run
+                int yieldCount = rng.Next(this.threadCount);
+                while (yieldCount-- > 0)
+                    Yield();
+
+                n.EndVisit();
+                // Console.Write("[{0}]", threadNumber);
+                this.generation++;
+            }
+
+            lock (this) {
+                this.finishedCount++;
+                if (this.finishedCount == this.threadCount) {
+                    this.finishedEvent.Set();
+                }
+            }
+        }
+
+        private void WatchdogThreadMain()
+        {
+            int last = this.generation;
+            for (;;) {
+                Thread.Sleep(TimeSpan.FromSeconds(5));
+                if (this.finishedCount == this.threadCount) {
+                    return;
+                }
+                int now = this.generation;
+                Assert.True(last != now, "Deadlock detected.");
+                last = now;
+            }
+        }
+
+        internal PulseTest(int numberOfNodes, int numberOfThreads, int iterations)
+        {
+            this.nodes = new Node[numberOfNodes];
+            this.threadCount   = numberOfThreads;
+            this.maxCycles     = iterations;
+            this.startedCount  = 0;
+            this.finishedCount = 0;
+            this.finishedEvent = new ManualResetEvent(false);
+        }
+
+        private void Initialize()
+        {
+            for (int i = 0; i < nodes.Length; i++) {
+                nodes[i] = new Node();
+            }
+        }
+
+        internal void RunTest()
+        {
+            for (int i = 0; i < this.threadCount; i++) {
+                (new Thread(new ThreadStart(VisitorThreadMain))).Start();
+            }
+            Thread watchdog = new Thread(new ThreadStart(WatchdogThreadMain));
+            watchdog.Start();
+
+            finishedEvent.WaitOne();
+            watchdog.Join();
+            Assert.True(Assert.Failures == 0, "Failures within threads.");
+        }
+
+        internal static void LowDensityTest()
+        {
+            PulseTest p = new PulseTest(128, 17, 20);
+            p.Initialize();
+            p.RunTest();
+        }
+
+        internal static void MediumDensityTest()
+        {
+            PulseTest p = new PulseTest(32, 32, 20);
+            p.Initialize();
+            p.RunTest();
+        }
+
+        internal static void HighDensityTest()
+        {
+            PulseTest p = new PulseTest(4, 128, 20);
+            p.Initialize();
+            p.RunTest();
+        }
+    }
+}
diff --git a/base/Applications/Tests/Ntlm/NtlmUnitTest.csproj b/base/Applications/Tests/Ntlm/NtlmUnitTest.csproj
new file mode 100644
index 0000000..0340e5b
--- /dev/null
+++ b/base/Applications/Tests/Ntlm/NtlmUnitTest.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <PropertyGroup>
+    <ProjectGuid>{3F9845B1-E3A1-40DD-96E5-AFD900858FA4}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>NtlmUnitTest</AssemblyName>
+    <WarningLevel>4</WarningLevel>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="NtlmUnitTest.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Ntlm\Ntlm.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\CredentialsManager\CredentialsManager.Library.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\CredentialsManager.Contracts\CredentialsManager.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Crypto\Crypto.csproj"/>
+    
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/Ntlm/NtlmUnitTest.sg b/base/Applications/Tests/Ntlm/NtlmUnitTest.sg
new file mode 100644
index 0000000..8fec4a9
--- /dev/null
+++ b/base/Applications/Tests/Ntlm/NtlmUnitTest.sg
@@ -0,0 +1,757 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NtlmSupplicant.cs
+//
+//  Note:
+//
+//		This app is a unit test for the NTLM authentication library.  It can
+//		be run in two modes: local, and remote.
+//
+//		In local mode, the program runs through a hard-coded list of known
+//		NTLM inputs (password and challenge) and outputs (NT and LM response).
+//		It uses the known inputs and computes the outputs, then compares the
+//		known (desired) outputs and compares them with the actual, computed
+//		outputs.  If a difference is detected, then the NTLM implementation
+//		is broken.
+//
+//		In remote mode, this program uses TCP/IP to communicate with a Windows 
+//		machine, which must be running the NtlmWinHost program.  (NtlmWinHost
+//		lives in Singularity/Windows/UnitTests.)  NtlmWinHost listens for TCP/IP
+//		connections from NtlmUnitTest, receives NTLM Negotiate requests, and
+//		performs an NTLM exchange.  The user must specify a valid account name
+//		and password.  "Valid" means that the account name and password are
+//		known to (or resolvable by) the Windows host machine.  Typically, this
+//		is a test account created on the Windows machine, NOT your Corpnet
+//		domain credentials!
+//
+//
+////////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.Diagnostics;
+using System.Net.IP;
+using System.Net;
+using System.Text;
+using System.Net.Sockets;
+
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Security;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using System.Security.Protocols.Ntlm;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+[ConsoleCategory(HelpMessage="Runs offline BVT for NTLM authentication library", DefaultAction=true)]
+internal class DefaultCommand
+{
+    [InputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+    [OutputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;	
+	
+    reflective internal DefaultCommand();
+    
+    static void WriteLine(string! line)
+    {
+		DebugStub.WriteLine(line);
+		Console.WriteLine(line);
+    }
+    
+    static void WriteLine(string! format, params object[]! list)
+    {
+		WriteLine(String.Format(format, list));
+    }
+
+    internal int AppMain()
+    {      
+		Console.WriteLine("Checking known responses:");
+		
+		int failureCount = 0;
+		
+		foreach (NtlmKnownResponse known in KnownResponses)
+		{
+			string! line = String.Format("password:  {0,-20}  challenge: {1}  LM response: {2}  NT response: {3}",
+				"'" + known.Password + "'",
+				known.Challenge,
+				known.LmResponse,
+				known.NtResponse);
+			WriteLine(line);
+				
+			byte[]! known_challenge = Util.HexStringToByteArray(known.Challenge);
+			byte[]! known_lm_response = Util.HexStringToByteArray(known.LmResponse);
+			byte[]! known_nt_response = Util.HexStringToByteArray(known.NtResponse);
+			
+			byte[]! computed_lm_response = NtlmSupplicant.ComputeLmResponse(known_challenge, known.Password);
+			byte[]! computed_nt_response = NtlmSupplicant.ComputeNtResponse(known_challenge, known.Password);
+			
+			if (Util.CompareArraySpans(known_lm_response, computed_lm_response) != 0) {
+				WriteLine("    FAILURE: Computed LM response differs: " + Util.ByteArrayToString(computed_lm_response));
+				failureCount++;
+			}
+			
+			if (Util.CompareArraySpans(known_nt_response, computed_nt_response) != 0) {
+				WriteLine("    FAILURE: Computed NT response differs: " + Util.ByteArrayToString(computed_lm_response));
+				failureCount++;
+			}
+		}
+		
+		if (failureCount == 0) {
+			WriteLine("All computed responses match known good values.  Test passes.");
+			return 0;
+		} else {
+			WriteLine("Failures: " + failureCount);
+			return -1;
+		}
+	}
+	
+	static NtlmKnownResponse[] KnownResponses = {
+		// These were generated using the @gen command, below.
+new NtlmKnownResponse("2c87546b170c54bf", "Z_bE`", "16b291e268a4e19a23b36eeeb685c02260391bc2827fc05d", "43f56c81a2805383a7622fe0c170ad659b04f25dbeedd6a6"),
+new NtlmKnownResponse("8fd1f7048f3dee73", "Z_bE`", "c2d6e331411a109341a9ba76d10506d03b262fcf3f473e9d", "cbc03bbe559766a6807db7b9d60c68d26a795c5a20a2a016"),
+new NtlmKnownResponse("22abc82a344df2de", "Z_bE`", "931fa8a43c90dc2797f0335b8882c4f5593444cf3dc1b643", "652e822eaa467371770180fdc771d1dddff1cd902f144c74"),
+new NtlmKnownResponse("c3a7fe9867b8c99e", "Z_bE`", "daa43f8730d593d7a4f6cfe542fb2e28102fa87b84365267", "0f8a1c55eda6cb21908be3d165011616a141e0d36af3e9d4"),
+new NtlmKnownResponse("1b08c97f49cb7c01", "ra%Z)ZE&},t", "142b2855d2786061ab295d14e39f871473d949df16536005", "0cfc316813c5423f927fe9892ccaaa451068224648afcbeb"),
+new NtlmKnownResponse("ed3c7bdf9575a770", "ra%Z)ZE&},t", "c1f1055ae66caf6eecc70b191b006536ed7e1337abafe85f", "d2149ecb23779f255774559bc6b09a40da0b67f764a7fc61"),
+new NtlmKnownResponse("0dbc57d708580cb0", "ra%Z)ZE&},t", "ba09f4b51d59efba03e931788c5914dc06fc578b9e85d090", "812298742928dcd6711b4c932108897528e45dbca9463a40"),
+new NtlmKnownResponse("89dfd5090d601936", "ra%Z)ZE&},t", "ce82f6b3341f1cdd425bdf44953bf83452fd0efa25360264", "e99a1428fd64d46cb9e771bba3aaf315f5fb8c8780cd37a6"),
+new NtlmKnownResponse("4f9c3bc7b0ba63d4", "$gdqN", "4b21b010c976506aecd6da792faa4e6efd7083e5b953de5f", "bbec0eb714b01e4146dcc538215d2ebe011d0f209b2da2d3"),
+new NtlmKnownResponse("7928722e5955a64b", "$gdqN", "01e1b5ef4bfcf849521454e5b5d2942b181951c33efe3473", "2f763a9ee207803bad0011081a3d25332b044822b2cf00a1"),
+new NtlmKnownResponse("dec3fb19f56af673", "$gdqN", "ff555fc0302beb74f637ccbe6e17e8ce65a3861552512d6c", "c369bf569205073d7aecdb02df6cf3977e9dda975f5bbce0"),
+new NtlmKnownResponse("f48d2345b489b2eb", "$gdqN", "40a4e20fa00d72a301f856a658ef0ff642b2d89a633567ef", "f9c74c29211779384b699da935e5570bdb4ae6d4457767df"),
+new NtlmKnownResponse("b565ac97df07c48f", "THdY7]>;", "41fa9c2d34c75683135620def7a5e3c3aeb7320d21bd6148", "ebe810de662ab1a09d5b25f4f671ec1be89710b874c3185f"),
+new NtlmKnownResponse("df2dffc0c489e4a6", "THdY7]>;", "8a1e615c5b0d0a1de96094b5fa165c7461aa496f0cc25267", "00620bb34513503d449999a55e587b84ce87fd9a7b972549"),
+new NtlmKnownResponse("c8d323961e1fef75", "THdY7]>;", "6a99cd29b2bfdbf78d594aafca00a612408de2fd0de1065c", "c8b651d08eb804c63ebd18d26f5b70522b6a0f38936771ee"),
+new NtlmKnownResponse("869bcae8ebaf9d1a", "THdY7]>;", "5efdb0fcac134c8a7db9a5716c923d6414439975052947ab", "259fee21ae873b1b5316a8bac744ebc361a9b08e20287d5e"),
+new NtlmKnownResponse("d55cb32bcd058815", "k7!;p'QCb", "151a0d8ee9d3c57f4e150caf18f0b9fcfff69d67e5ea5cf8", "d09d2158bf15e85bde1cc2972bb3439cdff15cab1c460d5c"),
+new NtlmKnownResponse("d36d84bb2d967536", "k7!;p'QCb", "96d5a808abdfe8cc19c9e8623af7f11208d176d5190c0fa9", "5f541049ac3a839126da2321d0109d301e3a4513fdb98689"),
+new NtlmKnownResponse("10433cdba4308fe4", "k7!;p'QCb", "d6b4d9da498c332f3be34e4ad3d6559ad606c4d39573258f", "1d2020a20240db913bf8d7722ca208eb08c11dcbd1e1158e"),
+new NtlmKnownResponse("17f649df5cecbe9d", "k7!;p'QCb", "b25e6ab956567240b86916024c7d5b7a047ef706f1549245", "e2ca8cd6f3d54aabc961552da96b9c575fb60de8a72ccde7"),
+new NtlmKnownResponse("cec55fd6db3096ed", "F;VgA", "b18e9cc93374068a20957c5c8b72be0fd8fa5a0f1c16caf2", "9e12c04257e01bd265bd587967ce27b77e7ac6426b0be1f0"),
+new NtlmKnownResponse("9fa98f13cad14983", "F;VgA", "a5578f61bdfc14b353754c81cff647364605146c9756d3ea", "64e796cbceb4fc5514370b4aa7b40cfc8c9ffb63acb78cca"),
+new NtlmKnownResponse("11a5cdce13d6bba8", "F;VgA", "fd7bc9bcf082d0afdd7894fe530bf59e2911a2297095f7e3", "49f4ed6fe661adaab06b235bb119da63e9f0d2c15d4e0703"),
+new NtlmKnownResponse("b8e6aee684c54ce2", "F;VgA", "f5234fdcdf683d4a11b0379a36dec631566b7a0ec22dec60", "dffd5accafddebcb55dffd0662a57eef238aadea67ef96c8"),
+new NtlmKnownResponse("4e2956a0504822ed", "bKKMk?B", "451ada0c60f1e1b397463a1784349ad93b46071e6d38acce", "7519f4aac3c0ad7bf26d9a482712efddceeb2fec4ac3d049"),
+new NtlmKnownResponse("54b356a4c5f447f7", "bKKMk?B", "cabbf9c6952bf1fad2b6347c371613cd0be114a6d8677f1c", "606b433725d633065d1cb883cef1f88c3e95af1a75bd5b28"),
+new NtlmKnownResponse("0ab71df482af69da", "bKKMk?B", "913b755617905bd71d0fa0db6e6ed6c77bc601cb4ac420b1", "488537a0be68c967ba7641c84675789253f3fec251f09b78"),
+new NtlmKnownResponse("5dac9f155cd20743", "bKKMk?B", "68a4c94dab62058e1eb00f473a379130ae9339dcc9cd3a1e", "90e0baad7052eb4a4e8be6afed9a0e3fb38ea2d6c366c546"),
+new NtlmKnownResponse("70c4c091d16ea71c", "HOvO)@", "0756c8011d61e60e483ada98e28668833e60e0f530acc1dd", "5f95ae24a78bad77dda82ae72e25d09feb8a958f3941de0f"),
+new NtlmKnownResponse("7f6d7d6cc5b060db", "HOvO)@", "2402df78a95018e8db8fc9dae83acb8a7add3846aec0cd32", "e021108fe5b8cc86d1244b2f5dc8a98b4a7bd82a1c11f0a8"),
+new NtlmKnownResponse("9ec07c43a3a80c91", "HOvO)@", "993145b5aa6197cbc03b0652d41b43b4f03f2a446cb846a5", "5690852bdf3e17719632dcaee3002b408e531232061e8681"),
+new NtlmKnownResponse("82ab135456745d77", "HOvO)@", "a3c8bd4330a288d41e4da989145855192fde833ce7e1fea4", "a7d72d0c0c604a0062fcd646bd1fd47cedb9bfa0e6c95ffb"),
+	
+	};
+}
+
+[ConsoleCategory(Action="gen", HelpMessage="Generates a bunch of random hashes and passwords, and computes and displays the NT and LM responses.")]
+internal class GenerateCommand
+{
+    [InputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+    [OutputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;	
+	
+	[LongParameter("count", Mandatory=false, Default=8, HelpMessage="The number of hashes to generate.")]
+	public long IterationCount;
+	
+    reflective internal GenerateCommand();
+
+    internal int AppMain()
+    {
+		StringBuilder buf = new StringBuilder();
+		Random rand = new Random();
+		
+		Console.WriteLine("NtlmKnownResponse[] KnownResponses = {");
+		
+		for (int i = 0; i < this.IterationCount; i++)
+		{
+			buf.Length = 0;
+			
+			int pwlength = 4 + rand.Next(8);
+			for (int j = 0; j < pwlength; j++) {
+				char c = (char)(rand.Next(32, 126));
+				if (c == '\\' || c == '"')
+					c = '?';
+				buf.Append(c);
+			}
+			
+			string! password = buf.ToString();
+			
+			// Use the same password with 4 different challenges.
+			
+			for (int j = 0; j < 4; j++) {
+				byte[]! challenge = new byte[8];
+				rand.NextBytes(challenge);
+			
+				byte[]! lm_response = NtlmSupplicant.ComputeLmResponse(challenge, password);
+				byte[]! nt_response = NtlmSupplicant.ComputeNtResponse(challenge, password);
+				
+				string! line = String.Format("new NtlmKnownResponse(\"{0}\", \"{1}\", \"{2}\", \"{3}\"),",
+					Util.ByteArrayToString(challenge),
+					EscapeString(password),
+					Util.ByteArrayToString(lm_response),
+					Util.ByteArrayToString(nt_response));
+					
+				Console.WriteLine(line);
+				DebugStub.WriteLine(line);
+			}
+		}
+		Console.WriteLine("};");
+
+        return 0;
+	}
+	
+	static string! EscapeString(string! str)
+	{
+		return str.Replace(@"\", @"\\");
+	}
+}
+
+
+
+struct NtlmKnownResponse
+{
+	public NtlmKnownResponse(string! challenge, string! password, string! lm_response, string! nt_response)
+	{
+		this.Challenge = challenge;
+		this.Password = password;
+		this.NtResponse = nt_response;
+		this.LmResponse = lm_response;
+	}
+	
+	public string! Challenge;
+	public string! Password;
+	public string! NtResponse;
+	public string! LmResponse;
+}
+
+
+
+class Util
+{
+	public static byte[]! HexStringToByteArray(string! str)
+	{
+		if ((str.Length % 2) != 0)
+			throw new Exception("Input string cannot be odd in length.");
+
+		byte[]! result = new byte[str.Length / 2];
+		for (int i = 0; i < result.Length; i++)
+		{
+			byte high = CharToHex(str[i * 2]);
+			byte low = CharToHex(str[i * 2 + 1]);
+			result[i] = (byte)((high << 4) | low);
+		}
+
+		return result;
+	}
+
+    static byte CharToHex(char c)
+    {
+        if (c >= '0' && c <= '9')
+            return (byte)(c - '0');
+        if (c >= 'a' && c <= 'f')
+            return (byte)(c - 'a' + 10);
+        if (c >= 'A' && c <= 'F')
+            return (byte)(c - 'A' + 10);
+        throw new ArgumentException("Invalid hex char");
+    }
+
+	public static string! ByteArrayToString(byte[]! buffer)
+	{
+		return ByteArrayToString(buffer, 0, buffer.Length);
+	}
+	
+	const string HexDigits = "0123456789abcdef";
+	
+    public static string! ByteArrayToString(byte[]! buffer, int index, int length)
+    {
+        StringBuilder sb = new StringBuilder(length * 2);
+        for (int i = 0; i < length; i++)
+        {
+            byte b = buffer[index + i];
+            sb.Append(HexDigits[b >> 4]);
+            sb.Append(HexDigits[b & 0xf]);
+        }
+        return sb.ToString();
+    }
+
+	public static void ShowException(Exception! chain)
+	{
+		Exception current = chain;
+		while (current != null)
+		{
+			Console.WriteLine("{0}: {1}", current.GetType().FullName, current.Message);
+			current = current.InnerException;
+		}
+	}
+
+	public static int CompareArraySpans(byte[]! array1, byte[]! array2)
+	{
+		return CompareArraySpans(array1, 0, array2, 0, array1.Length);
+	}
+
+	public static int CompareArraySpans(byte[]! array1, int offset1, byte[]! array2, int offset2, int length)
+	{
+		for (int i = 0; i < length; i++)
+		{
+			byte element1 = array1[offset1 + i];
+			byte element2 = array2[offset2 + i];
+			if (element1 < element2)
+				return -1;
+			if (element1 > element2)
+				return 1;
+		}
+
+		return 0;
+	}
+
+}
+
+[ConsoleCategory(Action="remote", HelpMessage="Attempts to connect to a remote Windows host (running NtlmTestServer.exe) and authenticates using NTLM.")]
+internal class RemoteAuthTestCommand
+{
+	reflective internal RemoteAuthTestCommand();
+	
+    [InputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+    [OutputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;	
+	
+	[StringParameter("server", Mandatory=true, HelpMessage="The remote server name or IP address.")]
+	public string ServerName;
+	
+	[StringParameter("user", Mandatory=true, HelpMessage="The [domain\\]username to use.")]
+	public string UserName;
+	
+	[StringParameter("password", Mandatory=true, HelpMessage="The password to use.", Default="Z@n%zilNaga")]
+	public string Password;
+	
+	[LongParameter("count", Mandatory=false, Default=1, HelpMessage="The number of iterations to perform.")]
+	public long IterationCount;
+	
+	[StringParameter("hostdomain", Mandatory=false, Default="WORKGROUP", HelpMessage="Specifies the domain name of the client computer.  Default is WORKGROUP.")]
+	public string ClientMachineDomainName;
+	
+	[StringParameter("workstation", Mandatory=false, Default="SINGULARITY", HelpMessage="Specifies the name of the local client machine.  Default is SINGULARITY.")]	
+	public string Workstation;
+
+	internal int AppMain()
+	{
+		// Split the username into domain\username, if the user has specified domain name.
+		string! username = this.UserName;
+		string! domain;
+		int index = username.IndexOf('\\');
+		if (index != -1) {
+			domain = username.Substring(0, index);
+			username = username.Substring(index + 1);
+		} else {
+			domain = ".";
+		}
+		
+		string! password = this.Password;
+		
+		// First, connect to BVT test server.
+		// The sole purpose of the server is to test NTLMSSP messages.
+		
+		
+		try {
+			// Bartok is failing on Dns.GetLocalHostAddresses
+			/*
+			IPHostEntry! he = (!)Dns.GetHostByName(this.ServerName);
+			IPAddress[]! addresses = (!)he.AddressList;
+			*/
+			IPv4 addr = IPv4.Parse(this.ServerName);
+			IPAddress[]! addresses = { new IPAddress(addr) };
+			
+			if (addresses.Length == 0) {
+				Console.WriteLine("Resolution failed; no address.");
+				return -1;
+			}
+			
+			using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+			{
+				// -XXX- Work around a bug in NetStack regarding quick reuse of TCP tuples
+				Random rand = new Random();
+				IPEndPoint local = new IPEndPoint(IPAddress.Any, 1000 + rand.Next(1000));
+				socket.Bind(local);
+				
+				bool connected = false;
+				
+				foreach (IPAddress address_null in addresses)
+				{
+					IPAddress! address = (!)address_null;
+					Console.WriteLine("Connecting: " + address.ToString());
+					IPEndPoint ep = new IPEndPoint(address, NtlmUnitTestProtocol.TcpPort);
+					
+					try {
+						socket.Connect(ep);
+						Console.WriteLine("Connected.");
+						connected = true;
+					} catch(Exception ex) {
+						Console.WriteLine("Connection failed.");
+						Util.ShowException(ex);
+						connected = false;
+					}
+					
+					if (connected)
+						break;
+				}
+				
+				if (!connected) {
+					Console.WriteLine("Failed to connect to server.");
+					return -1;
+				}
+				
+				
+				for (int iteration = 0; iteration < IterationCount; iteration++) {
+					if (IterationCount > 1)
+						Console.WriteLine("[Iteration {0}/{1}]", iteration, IterationCount.ToString());
+					
+					try {
+					
+						Console.WriteLine("    Sending NEGOTIATE");
+						
+						byte[]! negotiate = NtlmSupplicant.GetNegotiate(
+							NtlmNegotiateFlags.None,
+							this.ClientMachineDomainName,
+							this.Workstation);
+							
+						NtlmUnitTestProtocol.SendMessage(socket, TestMessageType.Negotiate, negotiate);
+						
+						Console.WriteLine("    Waiting for CHALLENGE");
+						
+						byte[]! challenge = NtlmUnitTestProtocol.ReceiveExpectedMessage(socket, TestMessageType.Challenge);
+
+						byte[]! response = NtlmSupplicant.GetResponse(
+							challenge,
+							domain,
+							username,
+							this.Workstation,
+							password);						
+						
+						Console.WriteLine("    Sending RESPONSE");
+						
+						NtlmUnitTestProtocol.SendMessage(socket, TestMessageType.Response, response);
+						
+						Console.WriteLine("    Waiting RESULT");
+						
+						byte[]! resultBuffer = NtlmUnitTestProtocol.ReceiveExpectedMessage(socket, TestMessageType.Result);
+						
+						Console.WriteLine("    Received RESULT:");
+						ref ResultMessage result = ref resultBuffer[0];
+						string! resulttext = Encoding.Unicode.GetString(resultBuffer, sizeof(ResultMessage), resultBuffer.Length - sizeof(ResultMessage));
+						
+						if (result.Succeeded != 0) {
+							Console.WriteLine("       Succeeded = TRUE");
+						} else {
+							Console.WriteLine("       Succeeded = FALSE");
+						}						
+						Console.WriteLine("       Message: " + resulttext);
+						
+					} catch(Exception ex) {
+						Console.WriteLine("Exception occurred during test.");
+						Util.ShowException(ex);
+					}
+				}
+				
+			}
+			
+			return 0;
+		} catch(Exception ex) {
+			Console.WriteLine("Exception occurred during test.");
+			Util.ShowException(ex);
+			return -1;
+		}
+		
+		
+	}
+}
+
+[ConsoleCategory(Action="remote-cm", HelpMessage="Attempts to connect to a remote Windows host (running NtlmTestServer.exe) and authenticates using NTLM via the Credentials Manager service.")]
+internal class RemoteAuthTestCredMgrCommand
+{
+	reflective internal RemoteAuthTestCredMgrCommand();
+	
+    [InputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+    [OutputEndpoint("data")]
+    public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;	
+	
+	[StringParameter("server", Mandatory=false, HelpMessage="The remote server name or IP address.")]
+	public string ServerName;
+	
+	[StringParameter("credentials", Mandatory=true, HelpMessage="The credentials to use, such as [domain\\]user.")]
+	public string CredentialsName;
+	
+	[StringParameter("tag", Mandatory=false, HelpMessage="The credentials tag, if necessary.")]
+	public string CredentialsTag;
+	
+	[LongParameter("count", Mandatory=false, Default=1, HelpMessage="The number of iterations to perform.")]
+	public long IterationCount;
+
+	internal int AppMain()
+	{
+		// First, connect to BVT test server.
+		// The sole purpose of the server is to test NTLMSSP messages.
+		
+	    string! credentialsName = this.CredentialsName;
+	    string! credentialsTag = this.CredentialsTag != null ? this.CredentialsTag : "";
+	    
+		try {
+			// Bartok is failing on Dns.GetLocalHostAddresses
+			/*
+			IPHostEntry! he = (!)Dns.GetHostByName(this.ServerName);
+			IPAddress[]! addresses = (!)he.AddressList;
+			*/
+			IPv4 addr = IPv4.Parse(this.ServerName);
+			IPAddress[]! addresses = { new IPAddress(addr) };
+			
+			if (addresses.Length == 0) {
+				Console.WriteLine("Resolution failed; no address.");
+				return -1;
+			}
+			
+			using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+			{
+				// -XXX- Work around a bug in NetStack regarding quick reuse of TCP tuples
+				Random rand = new Random();
+				IPEndPoint local = new IPEndPoint(IPAddress.Any, 1000 + rand.Next(1000));
+				socket.Bind(local);
+				
+				bool connected = false;
+				
+				foreach (IPAddress address_null in addresses)
+				{
+					IPAddress! address = (!)address_null;
+					Console.WriteLine("Connecting: " + address.ToString());
+					IPEndPoint ep = new IPEndPoint(address, NtlmUnitTestProtocol.TcpPort);
+					
+					try {
+						socket.Connect(ep);
+						Console.WriteLine("Connected.");
+						connected = true;
+					} catch(Exception ex) {
+						Console.WriteLine("Connection failed.");
+						Util.ShowException(ex);
+						connected = false;
+					}
+					
+					if (connected)
+						break;
+				}
+				
+				if (!connected) {
+					Console.WriteLine("Failed to connect to server.");
+					return -1;
+				}
+				
+				
+				for (int iteration = 0; iteration < IterationCount; iteration++) {
+					if (IterationCount > 1)
+						Console.WriteLine("[Iteration {0}/{1}]", iteration, IterationCount.ToString());
+					
+					try {
+					
+					    Console.WriteLine("Acquiring security context");
+					    GssSupplicantContract.Imp! supplicant;
+					    GssSupplicantContract.Exp! supplicant_exp;
+					    GssSupplicantContract.NewChannel(out supplicant, out supplicant_exp);
+					    
+					    CredentialsManager.CreateSupplicant(
+					        AuthenticationProtocolNames.Ntlm,
+					        credentialsName,
+					        credentialsTag,
+					        supplicant_exp);
+                        try {
+                        
+                        Console.WriteLine("    Getting NEGOTIATE from security context");
+                        byte[]! negotiate;
+                        switch receive {
+                            case supplicant.FirstToken(token):
+                                // Console.WriteLine("    Received first token from security context");
+                                negotiate = Bitter.ToByteArray(token);
+                                delete token;
+                                break;
+                                
+                            case supplicant.NeedFirstToken():
+                                throw new Exception("Received unexpected token from security context (NeedFirstToken)");
+                        }
+                        
+						Console.WriteLine("    Sending NEGOTIATE");
+						
+						NtlmUnitTestProtocol.SendMessage(socket, TestMessageType.Negotiate, negotiate);
+						
+						Console.WriteLine("    Waiting for CHALLENGE");
+						
+						byte[]! challenge = NtlmUnitTestProtocol.ReceiveExpectedMessage(socket, TestMessageType.Challenge);
+
+                        Console.WriteLine("    Sending challenge to security context");
+                        supplicant.SendAcceptToken(Bitter.FromByteArray(challenge));
+                        
+                        Console.WriteLine("    Waiting for response from security context");
+                        
+                        byte[]! response;
+                        switch receive {
+                            case supplicant.CompleteWithToken(token):
+                                // Console.WriteLine("    Received token from security context, and authentication is complete");
+                                response = Bitter.ToByteArray(token);
+                                delete token;
+                                break;
+                                
+                            case supplicant.Complete():
+                                throw new Exception("Security context returned unexpected message (Complete)");
+                                
+                            case supplicant.ContinueNeeded(token):
+                                delete token;
+                                throw new Exception("Security context returned unexpected message(ContinueNeeded)");
+                                
+                            case supplicant.AuthenticationFailed(error):
+                                throw new Exception("Security context returned unexpected message (AuthenticationFailed): " + CredentialsManager.GssErrorCodeToString(error));
+                        }
+                        
+						Console.WriteLine("    Sending RESPONSE");
+						
+						NtlmUnitTestProtocol.SendMessage(socket, TestMessageType.Response, response);
+						
+						Console.WriteLine("    Waiting RESULT");
+						
+						byte[]! resultBuffer = NtlmUnitTestProtocol.ReceiveExpectedMessage(socket, TestMessageType.Result);
+						
+						Console.WriteLine("    Received RESULT:");
+						ref ResultMessage result = ref resultBuffer[0];
+						string! resulttext = Encoding.Unicode.GetString(resultBuffer, sizeof(ResultMessage), resultBuffer.Length - sizeof(ResultMessage));
+						
+						if (result.Succeeded != 0) {
+							Console.WriteLine("       Succeeded = TRUE");
+						} else {
+							Console.WriteLine("       Succeeded = FALSE");
+						}						
+						Console.WriteLine("       Message: " + resulttext);
+						
+						} finally {
+						    delete supplicant;
+						}
+						
+					} catch(Exception ex) {
+						Console.WriteLine("Exception occurred during test.");
+						Util.ShowException(ex);
+					}
+				}
+				
+			}
+			
+			return 0;
+		} catch(Exception ex) {
+			Console.WriteLine("Exception occurred during test.");
+			Util.ShowException(ex);
+			return -1;
+		}
+		
+		
+	}
+}
+
+class NtlmUnitTestProtocol
+{
+	public const int TcpPort = 720;
+	
+	public static void SendMessage(Socket! socket, TestMessageType type, byte[]! payload)
+	{
+		byte[]! headerBuffer = new byte[sizeof(TestMessageHeader)];
+		ref TestMessageHeader header = ref headerBuffer[0];
+		header.TotalLength = (uint)(sizeof(TestMessageHeader) + payload.Length);
+		header.MessageType = (uint)type;
+		
+		socket.Send(headerBuffer);
+		
+		socket.Send(payload);
+	}
+	
+	public static byte[]! ReceiveExpectedMessage(Socket! socket, TestMessageType type)
+	{
+		TestMessageType actualType;
+		byte[]! msg = ReceiveMessage(socket, out actualType);
+		if (actualType != type) {
+			Console.WriteLine("Received message, but its type is not the expected type!");
+			Console.WriteLine("Received type {0}, wanted type {1}", actualType, type);
+			throw new Exception("Invalid message received.");
+		}
+		return msg;
+	}
+	
+	public static byte[]! ReceiveMessage(Socket! socket, out TestMessageType type)
+	{
+		byte[]! headerBuffer = new byte[sizeof(TestMessageHeader)];
+		
+		int length = socket.Receive(headerBuffer, sizeof(TestMessageHeader), SocketFlags.None);
+		if (length == 0) {
+			throw new Exception("Server has closed socket.");
+		}
+		
+		if (length < sizeof(TestMessageHeader)) {
+			throw new Exception("Received short data from server.");
+		}
+		ref TestMessageHeader header = ref headerBuffer[0];
+		
+		if (header.TotalLength < sizeof(TestMessageHeader)) {
+			throw new Exception("Received invalid header from server (length is too short)");
+		}
+		
+		if (header.TotalLength > 0x10000) {
+			throw new Exception("Received excessively large message from server.");
+		}
+		
+		int bodyLength = (int)(header.TotalLength - sizeof(TestMessageHeader));
+		byte[]! body = new byte[bodyLength];
+		
+		length = socket.Receive(body, bodyLength, SocketFlags.None);
+		if (length == 0)
+			throw new Exception("Server has closed socket.");
+		
+		if (length < bodyLength)
+			throw new Exception("Received short data (payload) from server.");
+		
+		type = (TestMessageType)header.MessageType;
+		return body;
+	}
+}
+
+enum TestMessageType
+{
+	Negotiate = 1,
+	Challenge = 2,
+	Response = 3,
+	Result = 4,	
+}
+
+[StructLayout(LayoutKind.Sequential)]
+pointerfree struct ResultMessage
+{
+	public int Succeeded;
+	// unicode string of error follows, no nul terminator
+}
+
+[StructLayout(LayoutKind.Sequential)]
+pointerfree struct TestMessageHeader
+{
+	public uint TotalLength;
+	public uint MessageType;
+}
+
diff --git a/base/Applications/Tests/Null/Null.cs b/base/Applications/Tests/Null/Null.cs
new file mode 100644
index 0000000..66a5507
--- /dev/null
+++ b/base/Applications/Tests/Null/Null.cs
@@ -0,0 +1,49 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Null.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Null.AppMain(this);
+        }
+    }
+    public class Null
+    {
+        //[ShellCommand("null", "Test null reference access")]
+        internal static int AppMain(Parameters! config)
+        {
+            DebugStub.Print("Calling null.ToString\n");
+            Object obj = null;
+            String s = obj.ToString();
+            DebugStub.Print("Output: " + s);
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Null/Null.csproj b/base/Applications/Tests/Null/Null.csproj
new file mode 100644
index 0000000..7c38cae
--- /dev/null
+++ b/base/Applications/Tests/Null/Null.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Null</AssemblyName>
+    <NoNullCheck>true</NoNullCheck>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Null.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/Recursion/Recursion.cs b/base/Applications/Tests/Recursion/Recursion.cs
new file mode 100644
index 0000000..a899560
--- /dev/null
+++ b/base/Applications/Tests/Recursion/Recursion.cs
@@ -0,0 +1,67 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Recursion.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Recursion.AppMain(this);
+        }
+    }
+    public class Recursion
+    {
+        public static void RecursiveMethod(int i)
+        {
+            if (i > 0) {
+                if ((i % 10) == 0) {
+                    Console.WriteLine("Down: {0}", i);
+                }
+
+                RecursiveMethod(i - 1);
+
+                if ((i % 10) == 0) {
+                    Console.WriteLine("Up:   {0}", i);
+                }
+            }
+        }
+
+        public static void RecursiveThreadMethod()
+        {
+            RecursiveMethod(500);
+        }
+
+        //[ShellCommand("recur", "Run recursive thread demo")]
+        internal static int AppMain(Parameters! config)
+        {
+            Thread t1 = new Thread(new ThreadStart(RecursiveThreadMethod));
+            t1.Start();
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Recursion/Recursion.csproj b/base/Applications/Tests/Recursion/Recursion.csproj
new file mode 100644
index 0000000..bac2607
--- /dev/null
+++ b/base/Applications/Tests/Recursion/Recursion.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Recursion</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Recursion.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/SDSTest/SDSTest.csproj b/base/Applications/Tests/SDSTest/SDSTest.csproj
new file mode 100644
index 0000000..469edf6
--- /dev/null
+++ b/base/Applications/Tests/SDSTest/SDSTest.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\SDSTest\SDSTest.csproj
+
+Note:   SDSTest test
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>SDSTest</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SDSTest.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/SDSTest/SDSTest.sg b/base/Applications/Tests/SDSTest/SDSTest.sg
new file mode 100644
index 0000000..f9c0355
--- /dev/null
+++ b/base/Applications/Tests/SDSTest/SDSTest.sg
@@ -0,0 +1,566 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SDSTest.sg
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Configuration;
+
+using Microsoft.Contracts;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Test SIP-based Directory Service", DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "mountPoint", Mandatory=true, Position=0, HelpMessage="Location of dsp to test")]
+        internal string mountPoint;
+
+        [BoolParameter( "debug", Default=false, HelpMessage="Send results to debugger")]
+        internal bool printDebug;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return DirectoryMain.AppMain(this);
+        }
+    }
+
+
+    public contract Dummy : ServiceContract
+    {
+        out message Garbage();
+
+        override state Start: one
+        {
+            Garbage! -> End;
+        }
+        state End: one {}
+    }
+
+    public class DirectoryServiceTests
+    {
+        public int passCount;
+        public int failCount;
+        private bool nakLoaded;
+        private bool dspLoaded;
+        private bool doDebug; 
+
+        public DirectoryServiceTests (bool nakLoaded, bool dspLoaded, bool doDebug)
+        {
+            failCount = 0;
+            passCount = 0;
+            this.nakLoaded = nakLoaded;
+            this.dspLoaded= dspLoaded;
+            this.doDebug = doDebug;
+        }
+
+        public void CheckError( string! verb, string path, ErrorCode expected, ErrorCode actual, bool ok)
+        {   if (ok){
+                //Console.WriteLine("{0} on {1} was successful.", verb, path);
+            }
+            if (expected != actual) {
+                failCount++;
+                string s = String.Format("FAIL: {0} on {1}. expected={2}, actual={3}. ok={4}",
+                    verb,
+                    path,
+                    SdsUtils.ErrorCodeToString(expected),
+                    SdsUtils.ErrorCodeToString(actual),
+                    ok ? "true" : "false"
+                    );
+                Console.WriteLine(s); 
+                if (doDebug) DebugStub.WriteLine(s); 
+                //DebugStub.Break();
+            }
+            else {
+                passCount++;
+                string s = String.Format("PASS: {0} on {1} ({2}) ok={3}.",
+                    verb,
+                    path,
+                    SdsUtils.ErrorCodeToString(expected),
+                    ok ? "true" : "false"
+                    );
+                Console.WriteLine(s); 
+                if (doDebug) DebugStub.WriteLine(s); 
+            }
+        }
+
+        public void CheckError( string! verb, string path, NodeType expected, NodeType actual, bool ok)
+        {   if (ok){
+                //Console.WriteLine("{0} on {1} was successful.", verb, path);
+            }
+            if (expected != actual) {
+                failCount++;
+                Console.WriteLine("FAIL: {0} on {1}. expected={2}, actual={3}. ok={4}",
+                    verb,
+                    path,
+                    SdsUtils.NodeTypeToString(expected),
+                    SdsUtils.NodeTypeToString(actual),
+                    ok ? "true" : "false"
+                    );
+            }
+            else {
+                passCount++;
+                Console.WriteLine("PASS: {0} on {1} ({2}) ok={3}.",
+                    verb,
+                    path,
+                    SdsUtils.NodeTypeToString(expected),
+                    ok ? "true" : "false"
+                    );
+            }
+        }
+
+        public bool DoCreateDirectory(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.CreateDirectory(path, ds, out errorOut);
+            CheckError("CreateDirectory", path, expected, errorOut, ok);
+            return ok;
+        }
+
+        public void DoDeleteDirectory(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.DeleteDirectory(path, ds, out errorOut);
+            CheckError("DeleteDirectory", path, expected, errorOut, ok);
+        }
+
+        public void DoCreateLink(DirectoryServiceContract.Imp! ds, string! path, string! value, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.CreateLink(path, value, ds, out errorOut);
+            CheckError("CreateLink", path, expected, errorOut, ok);
+        }
+
+        public void DoGetLink(DirectoryServiceContract.Imp! ds, string! path, string expectedValue, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            string linkValue;
+            bool ok = SdsUtils.GetLinkValue(path, ds, out linkValue, out errorOut);
+            CheckError("GetLinkValue", path, expected, errorOut, ok);
+            if (ok) {
+                if (expectedValue != linkValue){
+                    Console.WriteLine("    expected({0}) got({1})", expectedValue, linkValue);
+                }
+            }
+        }
+
+        public bool DoBind(DirectoryServiceContract.Imp! ds, string! path,
+                           [Claims]ServiceContract.Exp! exp, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            string linkValue;
+            bool ok = SdsUtils.Bind(path, ds, exp, out errorOut);
+            CheckError("Bind", path, expected, errorOut, ok);
+            return ok;
+        }
+
+        //simulate FileOpen in FsUtils
+        public bool  DoBind(string! path,
+                           [Claims]ServiceContract.Exp! exp, ErrorCode expected)
+        {
+
+            DirectoryServiceContract.Imp! ds = DirectoryService.NewClientEndpoint();
+            ErrorCode errorOut;
+            string linkValue;
+            bool ok = SdsUtils.Bind(path, ds, exp, out errorOut);
+            CheckError("Bind", path, expected, errorOut, ok);
+            delete ds;
+            return ok;
+        }
+
+        public void DoDeleteLink(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.DeleteLink(path, ds, out errorOut);
+            CheckError("DeleteLink", path, expected, errorOut, ok);
+        }
+
+        public void DoRegister(DirectoryServiceContract.Imp! ds,
+                               string! path,
+                               [Claims] ServiceProviderContract.Imp! service,
+                               ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.Register(path, ds, service, out errorOut);
+            CheckError("Register", path, expected, errorOut, ok);
+        }
+
+        public void DoDeregister(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            ServiceProviderContract.Imp:Start  service;
+
+            bool ok = SdsUtils.Deregister(path, ds, out service, out errorOut);
+            CheckError("Deregister", path, expected, errorOut, ok);
+            delete service;
+        }
+
+        public void DoGetAttributes(DirectoryServiceContract.Imp! ds,
+                                    string! path,
+                                    ErrorCode expected,
+                                    NodeType expectedNodeType)
+        {
+            ErrorCode errorOut;
+            long length;
+            NodeType nodeType;
+
+            bool ok = SdsUtils.GetAttributes(path, ds, out length, out nodeType, out errorOut);
+            CheckError("GetAttributes", path, expectedNodeType, nodeType, ok);
+            CheckError("GetAttributes", path, expected, errorOut, ok);
+        }
+
+        public void AttributesTests(DirectoryServiceContract.Imp! ds)
+        {
+            DoCreateDirectory(ds, "/d1", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d2", ErrorCode.NoError);
+            DoCreateLink(ds, "/d1/Link1", "/d2", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d1/Link1/d2", ErrorCode.NoError);
+
+            DoGetAttributes(ds, "/d1", ErrorCode.NoError, NodeType.Directory);
+            DoGetAttributes(ds, "/d1/Link1", ErrorCode.NoError, NodeType.SymLink);
+            DoGetAttributes(ds, "/init/testpe/testpe.x86", ErrorCode.NoError, NodeType.IoMemory);
+            DoGetAttributes(ds, "/stress", ErrorCode.NoError, NodeType.ServiceProvider);
+            DoGetAttributes(ds, "/d1/Link1/d2", ErrorCode.NoError, NodeType.Directory);
+            DoGetAttributes(ds, "/d1/garbage", ErrorCode.NotFound, NodeType.BadNode);
+
+            DoDeleteLink(ds, "/d1/Link1",ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d1", ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d2/d2", ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d2", ErrorCode.NoError);
+        }
+
+        public void ProviderTests(DirectoryServiceContract.Imp! ds)
+        {
+
+            ServiceProviderContract.Imp! c1;
+            ServiceProviderContract.Exp! s1;
+            ServiceProviderContract.NewChannel(out c1, out s1);
+
+            ServiceProviderContract.Imp! c2;
+            ServiceProviderContract.Exp! s2;
+            ServiceProviderContract.NewChannel(out c2, out s2);
+
+            ServiceProviderContract.Imp! c3;
+            ServiceProviderContract.Exp! s3;
+            ServiceProviderContract.NewChannel(out c3, out s3);
+
+            DoRegister(ds, "/dev/sp1", c1, ErrorCode.NoError);
+            DoRegister(ds, "/dev/sp1", c2, ErrorCode.AlreadyExists);
+            DoRegister(ds, "/notFound/sp1", c3, ErrorCode.NotFound);
+            DoDeregister(ds, "/dev/sp1", ErrorCode.NoError);
+
+            // manipulate providers within an SDS  provider (DSP)
+            if (dspLoaded) {
+                ServiceProviderContract.Imp! c4;
+                ServiceProviderContract.Exp! s4;
+                ServiceProviderContract.NewChannel(out c4, out s4);
+
+                ServiceProviderContract.Imp! c5;
+                ServiceProviderContract.Exp! s5;
+                ServiceProviderContract.NewChannel(out c5, out s5);
+
+                ServiceProviderContract.Imp! c6;
+                ServiceProviderContract.Exp! s6;
+                ServiceProviderContract.NewChannel(out c6, out s6);
+
+                DoRegister(ds, "/dsp/sp1", c4, ErrorCode.NoError);
+                DoRegister(ds, "/dsp/sp1", c5, ErrorCode.AlreadyExists);
+                DoDeregister(ds, "/dsp/sp1", ErrorCode.NoError);
+                DoCreateDirectory(ds, "/dsp/dir1", ErrorCode.NoError);
+                DoRegister(ds, "/dsp/dir1/sp1", c6, ErrorCode.NoError);
+                DoDeregister(ds, "/dsp/dir1/sp1", ErrorCode.NoError);
+                DoDeleteDirectory(ds, "/dsp/dir1", ErrorCode.NoError);
+                delete s4;
+                delete s5;
+                delete s6;
+            }
+            delete s1;
+            delete s2;
+            delete s3;
+         }
+
+        public int DirectoryTests(DirectoryServiceContract.Imp! ds)
+        {
+            // create and delete directories with and without symbolic links
+
+            //create and delete some directories
+            DoCreateDirectory(ds, "/d1", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d1", ErrorCode.AlreadyExists);
+            DoCreateDirectory(ds, "/d2", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d1/d1", ErrorCode.NoError);
+
+
+            // add a symbolic link to the mix
+            DoCreateLink(ds, "/d1/Link1", "/d2", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d1/Link1/d2", ErrorCode.NoError);
+
+            DoDeleteDirectory(ds, "/d1/Link1/d2", ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d1/Link1/d2", ErrorCode.NotFound);
+
+            // create a link to a link
+            DoCreateLink(ds, "/d1/LinkToLink", "/d2/Link1", ErrorCode.NoError);
+            DoCreateLink(ds, "/d2/Link1", "/d3", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d3", ErrorCode.NoError);
+            DoCreateDirectory(ds, "/d1/LinkToLink/d3", ErrorCode.NoError);
+
+            // try and delete a non-empty directory
+            DoDeleteDirectory(ds, "/d1", ErrorCode.DirectoryNotEmpty);
+
+            // Attempt to delete non directories
+
+            //service provider
+            DoDeleteDirectory(ds, "/stress", ErrorCode.NotDirectory);
+            //link
+            DoDeleteDirectory(ds, "/d2/Link1", ErrorCode.NotDirectory);
+            //IoMemory
+            DoDeleteDirectory(ds, "/init/testpe/manifest", ErrorCode.NotDirectory);
+
+
+            // clean up residual files
+            DoDeleteDirectory(ds, "/d1/d1", ErrorCode.NoError);
+            DoDeleteLink(ds, "/d1/Link1",ErrorCode.NoError);
+            DoDeleteLink(ds, "/d1/LinkToLink",ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d1", ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d1", ErrorCode.NotFound);
+
+            DoDeleteLink(ds, "/d2/Link1",ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d2", ErrorCode.NoError);
+
+            DoDeleteDirectory(ds, "/d3/d3", ErrorCode.NoError);
+            DoDeleteDirectory(ds, "/d3", ErrorCode.NoError);
+
+            return 0;
+        }
+
+        public void LinkTests(DirectoryServiceContract.Imp! ds)
+        {
+            DoCreateLink(ds, "/d2/Link1", "/d3", ErrorCode.NotFound);  // no /dir1
+            DoCreateDirectory(ds, "/d2", ErrorCode.NoError);
+            DoCreateLink(ds, "/d2/Link1", "/d3", ErrorCode.NoError);
+            DoCreateLink(ds, "/d2/Link1", "/d3", ErrorCode.AlreadyExists);
+
+            DoGetLink(ds, "/d2/Link1", "/d3", ErrorCode.NoError);
+            DoGetLink(ds, "/d2", "", ErrorCode.NotLink);
+            DoDeleteLink(ds, "/d2/Link1",ErrorCode.NoError);
+            DoDeleteLink(ds, "/d2/Link1",ErrorCode.NotFound);
+
+            DoDeleteDirectory(ds, "/d2", ErrorCode.NoError);
+
+            if (dspLoaded) {
+                DoCreateLink(ds, "/dsp/rootlink", "/d2", ErrorCode.NoError);
+                DoCreateLink(ds, "/dsp/rootlink", "/d2", ErrorCode.AlreadyExists);
+                DoCreateDirectory(ds, "/dsp/d1", ErrorCode.NoError);
+                DoCreateLink(ds, "/dsp/d1/Link1", "/d2", ErrorCode.NoError);
+                DoDeleteLink(ds, "/dsp/d1/Link1",ErrorCode.NoError);
+                DoDeleteLink(ds, "/dsp/rootlink",ErrorCode.NoError);
+                DoDeleteDirectory(ds, "dsp/d1", ErrorCode.NoError);
+            }
+        }
+
+         public void BindTests(DirectoryServiceContract.Imp! ds)
+         {
+            // try to bind to the various node types within the root dsp
+
+            FileContract.Imp! fc;
+            FileContract.Exp! fs;
+
+            ServiceProviderContract.Imp! sc;
+            ServiceProviderContract.Exp! ss;
+
+            DirectoryServiceContract.Imp! imp;
+            DirectoryServiceContract.Exp! exp;
+
+            Dummy.Imp! dC;
+            Dummy.Exp! dS;
+
+            FileContract.NewChannel(out fc, out fs);
+            DoBind(ds,"/init/testpe/testpe.x86",fs,ErrorCode.NoError);
+            delete fc;
+
+            Dummy.NewChannel(out dC, out dS);
+            DoBind(ds,"/init/testpe/testpe.x86",dS,ErrorCode.ContractNotSupported);
+            delete dC;
+
+            DirectoryServiceContract.NewChannel(out imp , out exp);
+            DoBind(ds,"/init/testpe/testpe.x86",exp,ErrorCode.ContractNotSupported);
+            delete imp;
+
+            DoCreateLink(ds, "/link", "/init", ErrorCode.NoError);
+            FileContract.NewChannel(out fc, out fs);
+            DoBind(ds,"/link/testpe/testpe.x86",fs,ErrorCode.NoError);
+            delete fc;
+            DoDeleteLink(ds, "/link", ErrorCode.NoError);
+
+            FileContract.NewChannel(out fc, out fs);
+            // bind to dir with File
+            DoBind(ds,"/init",fs,ErrorCode.ContractNotSupported);
+            delete fc;
+
+            FileContract.NewChannel(out fc, out fs);
+            //bind to ServiceProvider with File
+            DoBind(ds,"/FsCtrl",fs,ErrorCode.ContractNotSupported);
+            delete fc;
+
+            FileContract.NewChannel(out fc, out fs);
+
+            delete fc;
+            delete fs;
+
+            //ServiceProvider.NewChannel(out sc, out ss);
+            // try binding to a dir with all the other types
+            // bind through links
+            if (dspLoaded) {
+                DoCreateDirectory(ds, "/dsp/BindTest", ErrorCode.NoError);
+                DoCreateLink(ds, "/dsp/BindTest/link", "/BindTest/d2", ErrorCode.NoError);
+                DoCreateDirectory(ds, "/dsp/BindTest/d1", ErrorCode.NoError);
+                DoCreateDirectory(ds, "/dsp/BindTest/d2", ErrorCode.NoError);
+
+                DirectoryServiceContract.NewChannel(out imp, out exp);
+                DoBind(ds,"/dsp/BindTest/d1",exp,ErrorCode.NoError);
+                delete imp;
+
+                DirectoryServiceContract.NewChannel(out imp, out exp);
+                DoBind(ds,"/dsp/BindTest/link",exp,ErrorCode.NoError);
+                delete imp;
+
+                //DoCreateLink(ds, "/dsp/d1/link", "/d2", ErrorCode.NoError);
+
+
+                DoDeleteLink(ds, "/dsp/BindTest/link",ErrorCode.NoError);
+                //DoDeleteLink(ds, "/dsp/d1/link",ErrorCode.NoError);
+                DoDeleteDirectory(ds, "/dsp/BindTest/d1", ErrorCode.NoError);
+                DoDeleteDirectory(ds, "/dsp/BindTest/d2", ErrorCode.NoError);
+                DoDeleteDirectory(ds, "/dsp/BindTest",ErrorCode.NoError);
+           }
+            if (nakLoaded) {
+                // attempt to bind to nak service
+                // attempt to bind to a closed channel
+            }
+         }
+    }
+
+    public class DirectoryMain
+    {
+        private static Process LoadProcess(string[]! arguments)
+        {
+            try {
+                Process  process = new Process(arguments);
+                if (process == null) {
+                    Console.WriteLine("Unable to create process {0}",arguments[0]);
+                    return null;
+                }
+                else {
+                    process.Start();
+                    return process;
+                }
+            }
+            catch (ProcessCreateException) {
+                    Console.WriteLine("Unable to create process {0}",arguments[0]);
+            }
+            return null;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            Process dsp = null;
+            ErrorCode errorOut;
+
+            if (config.nsRef == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            DirectoryServiceContract.Imp ds = config.nsRef.Acquire(); 
+
+            ds.RecvSuccess();
+
+            // see if the test DSP is loaded by attempting to bind to it
+            // if not present load it
+
+            bool ok;
+            ///
+            /// FIXFIX SdsUtils FlushCache needs to be re-implemented
+            ///  in order for us to be able to wait for NakService termination
+            ///
+
+            DirectoryServiceContract.Imp! dspImp;
+            DirectoryServiceContract.Exp! dspExp;
+            DirectoryServiceContract.NewChannel(out dspImp, out dspExp);
+
+            string dspMountPoint = config.mountPoint; 
+            ok = SdsUtils.Bind(dspMountPoint, ds, dspExp, out errorOut);
+            delete dspImp;
+
+            bool dspLoaded = false;
+            if (!ok) {
+                Console.WriteLine(" unable to bind to {0}. Reason={1}", 
+                    dspMountPoint, SdsUtils.ErrorCodeToString(errorOut));
+                    delete ds;
+                return 1; 
+            }
+            else dspLoaded = true;
+
+            DirectoryServiceTests t = new DirectoryServiceTests(false ,dspLoaded, config.printDebug);
+
+            try {
+                t.DirectoryTests(ds);
+                t.AttributesTests(ds);
+                t.ProviderTests(ds);
+                t.LinkTests(ds);
+                t.BindTests(ds);
+
+                Console.WriteLine(" pass={0}, fail={1}", t.passCount, t.failCount);
+
+
+                //Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+
+                if (dsp != null) {
+                    t.DoDeregister(ds,dspMountPoint, ErrorCode.NoError);
+                }
+                delete ds;
+
+                //Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+
+                if (dsp != null) {
+                    dsp.Join();
+                }
+            }
+            finally {
+            }
+            return 0;
+        }
+
+        private static void Usage(string name)
+        {
+            Console.WriteLine("{0} <filename> creates a directory.",name);
+        }
+    } // class Test
+}
diff --git a/base/Applications/Tests/SdsTiming/SdsTiming.csproj b/base/Applications/Tests/SdsTiming/SdsTiming.csproj
new file mode 100644
index 0000000..c4e85d6
--- /dev/null
+++ b/base/Applications/Tests/SdsTiming/SdsTiming.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SdsTiming</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SdsTiming.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/SdsTiming/SdsTiming.sg b/base/Applications/Tests/SdsTiming/SdsTiming.sg
new file mode 100644
index 0000000..a4784af
--- /dev/null
+++ b/base/Applications/Tests/SdsTiming/SdsTiming.sg
@@ -0,0 +1,428 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SDSTest.sg
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+
+namespace Microsoft.Singularity.Applications
+{
+    public contract Dummy : ServiceContract
+    {
+        out message Garbage();
+
+        override state Start: one
+        {
+            Garbage! -> End;
+        }
+        state End: one {}
+    }
+
+    public class DirectoryServiceTests
+    {
+        private const int ITERATIONS = 10000;
+
+        public int passCount;
+        public int failCount;
+        private bool nakLoaded;
+        private bool dspLoaded;
+
+
+        public DirectoryServiceTests (bool nakLoaded, bool dspLoaded)
+        {
+            failCount = 0;
+            passCount = 0;
+            this.nakLoaded = nakLoaded;
+            this.dspLoaded= dspLoaded;
+        }
+
+        public void CheckError( string! verb, string path, ErrorCode expected, ErrorCode actual, bool ok)
+        {   if (ok){
+                //Console.WriteLine("{0} on {1} was successful.", verb, path);
+            }
+            if (expected != actual) {
+                failCount++;
+                Console.WriteLine("FAIL: {0} on {1}. expected={2}, actual={3}. ok={4}",
+                    verb,
+                    path,
+                    SdsUtils.ErrorCodeToString(expected),
+                    SdsUtils.ErrorCodeToString(actual),
+                    ok ? "true" : "false"
+                    );
+                //DebugStub.Break();
+            }
+            else {
+                passCount++;
+                if (false) {
+                    Console.WriteLine("PASS: {0} on {1} ({2}) ok={3}.",
+                        verb,
+                        path,
+                        SdsUtils.ErrorCodeToString(expected),
+                        ok ? "true" : "false"
+                        );
+                }
+            }
+        }
+
+        public void CheckError( string! verb, string path, NodeType expected, NodeType actual, bool ok)
+        {   if (ok){
+                //Console.WriteLine("{0} on {1} was successful.", verb, path);
+            }
+            if (expected != actual) {
+                failCount++;
+                Console.WriteLine("FAIL: {0} on {1}. expected={2}, actual={3}. ok={4}",
+                    verb,
+                    path,
+                    SdsUtils.NodeTypeToString(expected),
+                    SdsUtils.NodeTypeToString(actual),
+                    ok ? "true" : "false"
+                    );
+            }
+            else {
+                passCount++;
+                Console.WriteLine("PASS: {0} on {1} ({2}) ok={3}.",
+                    verb,
+                    path,
+                    SdsUtils.NodeTypeToString(expected),
+                    ok ? "true" : "false"
+                    );
+            }
+        }
+
+        public bool DoCreateDirectory(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.CreateDirectory(path, ds, out errorOut);
+            CheckError("CreateDirectory", path, expected, errorOut, ok);
+            return ok;
+        }
+
+        public void DoDeleteDirectory(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.DeleteDirectory(path, ds, out errorOut);
+            CheckError("DeleteDirectory", path, expected, errorOut, ok);
+        }
+
+        public void DoCreateLink(DirectoryServiceContract.Imp! ds, string! path, string! value, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.CreateLink(path, value, ds, out errorOut);
+            CheckError("CreateLink", path, expected, errorOut, ok);
+        }
+
+        public void DoGetLink(DirectoryServiceContract.Imp! ds, string! path, string expectedValue, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            string linkValue;
+            bool ok = SdsUtils.GetLinkValue(path, ds, out linkValue, out errorOut);
+            CheckError("GetLinkValue", path, expected, errorOut, ok);
+            if (ok) {
+                if (expectedValue != linkValue){
+                    Console.WriteLine("    expected({0}) got({1})", expectedValue, linkValue);
+                }
+            }
+        }
+
+        public bool DoBind(DirectoryServiceContract.Imp! ds, string! path,
+                           [Claims]ServiceContract.Exp! exp, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            string linkValue;
+            bool ok = SdsUtils.Bind(path, ds, exp, out errorOut);
+            CheckError("Bind", path, expected, errorOut, ok);
+            return ok;
+        }
+
+        //simulate FileOpen in FsUtils
+        public bool  DoBind(string! path,
+                           [Claims]ServiceContract.Exp! exp, ErrorCode expected)
+        {
+
+            DirectoryServiceContract.Imp! ds = DirectoryService.NewClientEndpoint();
+            ErrorCode errorOut;
+            string linkValue;
+            bool ok = SdsUtils.Bind(path, ds, exp, out errorOut);
+            CheckError("Bind", path, expected, errorOut, ok);
+            delete ds;
+            return ok;
+        }
+
+        public void DoDeleteLink(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.DeleteLink(path, ds, out errorOut);
+            CheckError("DeleteLink", path, expected, errorOut, ok);
+        }
+
+        public void DoRegister(DirectoryServiceContract.Imp! ds,
+                               string! path,
+                               [Claims] ServiceProviderContract.Imp! service,
+                               ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            bool ok = SdsUtils.Register(path, ds, service, out errorOut);
+            CheckError("Register", path, expected, errorOut, ok);
+        }
+
+        public void DoDeregister(DirectoryServiceContract.Imp! ds, string! path, ErrorCode expected)
+        {
+            ErrorCode errorOut;
+            ServiceProviderContract.Imp:Start  service;
+
+            bool ok = SdsUtils.Deregister(path, ds, out service, out errorOut);
+            CheckError("Deregister", path, expected, errorOut, ok);
+            delete service;
+        }
+
+        public void DoGetAttributes(DirectoryServiceContract.Imp! ds,
+                                    string! path,
+                                    ErrorCode expected,
+                                    NodeType expectedNodeType)
+        {
+            ErrorCode errorOut;
+            long length;
+            NodeType nodeType;
+
+            bool ok = SdsUtils.GetAttributes(path, ds, out length, out nodeType, out errorOut);
+            CheckError("GetAttributes", path, expectedNodeType, nodeType, ok);
+            CheckError("GetAttributes", path, expected, errorOut, ok);
+        }
+
+         public void BindTimeTests(DirectoryServiceContract.Imp! ds)
+         {
+            // try to bind to the various node types within the root dsp
+
+            FileContract.Imp! fc;
+            FileContract.Exp! fs;
+
+            ServiceProviderContract.Imp! sc;
+            ServiceProviderContract.Exp! ss;
+
+            DirectoryServiceContract.Imp! imp;
+            DirectoryServiceContract.Exp! exp;
+
+            DirectoryServiceContract.Imp! dspImp;
+            DirectoryServiceContract.Exp! dspExp;
+
+            DirectoryServiceContract.Imp! dspDirImp;
+            DirectoryServiceContract.Exp! dspDirExp;
+
+            Dummy.Imp! dC;
+            Dummy.Exp! dS;
+
+            TimeSpan start;
+            TimeSpan end;
+            TimeSpan elapsed;
+
+            DebugStub.WriteLine("\nstart get DirectoryService endpoint");
+            start = ProcessService.GetUpTime();
+            for ( int i = 0; i < ITERATIONS; i++) {
+                DirectoryServiceContract.Imp! d = DirectoryService.NewClientEndpoint();
+                delete d;
+            }
+            end = ProcessService.GetUpTime();
+            elapsed = end - start;
+            Console.WriteLine("\nBind DirectoryService.newEndpoint count={0} time={1}",
+                ITERATIONS, elapsed);
+
+            ///
+
+            DebugStub.WriteLine("\nstart bind to /init/testpe/testpe.x86");
+            start = ProcessService.GetUpTime();
+            for ( int i = 0; i < ITERATIONS; i++) {
+                FileContract.NewChannel(out fc, out fs);
+                DoBind(ds,"/init/testpe/testpe.x86",fs,ErrorCode.NoError);
+                delete fc;
+            }
+            end = ProcessService.GetUpTime();
+            elapsed = end - start;
+            Console.WriteLine("\nBind /init/testpe/testpe.x86 count={0} time={1}",
+                ITERATIONS, elapsed);
+
+            ///
+            if (dspLoaded) {
+                DebugStub.WriteLine("\nstart bind to /dsp");
+                start = ProcessService.GetUpTime();
+                for ( int i = 0; i < ITERATIONS; i++) {
+                    DirectoryServiceContract.NewChannel(out dspImp, out dspExp);
+                    DoBind(ds,"/dsp",dspExp,ErrorCode.NoError);
+                    delete dspImp;
+                }
+                end = ProcessService.GetUpTime();
+                elapsed = end - start;
+                Console.WriteLine("\nBind /dsp count={0} time={1}",
+                    ITERATIONS, elapsed);
+
+                /// create sub directory and bind to it
+
+                DirectoryServiceContract.NewChannel(out dspImp, out dspExp);
+                bool haveDsp = DoBind(ds,"/dsp",dspExp,ErrorCode.NoError);
+                bool haveDir = DoCreateDirectory(ds, "/dsp/bindtime", ErrorCode.NoError);
+                if (haveDir && haveDsp) {
+                    DebugStub.WriteLine("\nstart bind to /dsp/bindtime");
+                    start = ProcessService.GetUpTime();
+                    for ( int i = 0; i < ITERATIONS; i++) {
+                        DirectoryServiceContract.NewChannel(out dspDirImp, out dspDirExp);
+                        DoBind(ds,"/dsp/bindtime",dspDirExp,ErrorCode.NoError);
+                        delete dspDirImp;
+                    }
+                    end = ProcessService.GetUpTime();
+                    elapsed = end - start;
+                    Console.WriteLine("\nBind /dsp/bindtime via root count={0} time={1}",
+                        ITERATIONS, elapsed);
+
+                    /// now from the mount point
+
+                    DebugStub.WriteLine("\nstart bind to /dsp/bindtime via mountpoint");
+                    dspImp.RecvSuccess();
+                    start = ProcessService.GetUpTime();
+                    for ( int i = 0; i < ITERATIONS; i++) {
+                        DirectoryServiceContract.NewChannel(out dspDirImp, out dspDirExp);
+                        DoBind(dspImp,"/bindtime",dspDirExp,ErrorCode.NoError);
+                        delete dspDirImp;
+                    }
+                    end = ProcessService.GetUpTime();
+                    elapsed = end - start;
+                    Console.WriteLine("\nBind /dsp/bindtime via mountpoint count={0} time={1}",
+                        ITERATIONS, elapsed);
+
+               }
+               delete dspImp;
+            }
+
+            DebugStub.WriteLine("start bind to /init/testpe/testpe.x86 with NoAllocateAttribute ds");
+            TimeSpan s2 = ProcessService.GetUpTime();
+            for ( int i = 0; i < ITERATIONS; i++) {
+                FileContract.NewChannel(out fc, out fs);
+                DoBind("/init/testpe/testpe.x86",fs,ErrorCode.NoError);
+                delete fc;
+            }
+            TimeSpan e2 = ProcessService.GetUpTime();
+            TimeSpan elapsed2 = e2 -s2;
+            Console.WriteLine("Bind testpe.x86 count={0} time={1}",
+                ITERATIONS, elapsed2);
+
+            DebugStub.WriteLine("start directory  to /init/testpe");
+            TimeSpan s3 = ProcessService.GetUpTime();
+            for ( int i = 0; i < ITERATIONS; i++) {
+                DirectoryServiceContract.NewChannel(out imp, out exp);
+                DoBind("/init/testpe",exp,ErrorCode.NoError);
+                delete imp;
+            }
+
+            TimeSpan e3 = ProcessService.GetUpTime();
+            TimeSpan elapsed3 = e3 -s3;
+            Console.WriteLine("Bind dir count={0} time={1}",
+                ITERATIONS, elapsed3);
+        }
+
+    }
+
+    public class DirectoryMain
+    {
+        private static Process LoadProcess(string[]! arguments)
+        {
+            try {
+                Process  process = new Process(arguments);
+                if (process == null) {
+                    Console.WriteLine("Unable to create process {0}",arguments[0]);
+                    return null;
+                }
+                else {
+                    process.Start();
+                    return process;
+                }
+            }
+            catch (ProcessCreateException) {
+                    Console.WriteLine("Unable to create process {0}",arguments[0]);
+            }
+            return null;
+        }
+
+        public static int Main(string[]! args)
+        {
+            Process dsp = null;
+            ErrorCode errorOut;
+
+            string dspName = "TestDSP.x86";
+            string dspMountPoint = "/dsp";
+
+            DirectoryServiceContract.Imp! ds = DirectoryService.NewClientEndpoint();
+
+            // see if the test DSP is loaded by attempting to bind to it
+            // if not present load it
+
+            bool ok;
+            bool nakLoaded = false;
+            DirectoryServiceContract.Imp! dspImp;
+            DirectoryServiceContract.Exp! dspExp;
+            DirectoryServiceContract.NewChannel(out dspImp, out dspExp);
+
+            ok = SdsUtils.Bind(dspMountPoint, ds, dspExp, out errorOut);
+            delete dspImp;
+
+            bool dspLoaded = false;
+            if (!ok) {
+                Console.WriteLine("Bind to {0} Failed. reason:{1} Will attempt to load {2}",
+                                  dspMountPoint,
+                                  SdsUtils.ErrorCodeToString(errorOut),
+                                  dspName
+                                  );
+                string [] arguments2 = new string[2];
+                arguments2[0] = dspName;
+                arguments2[1] = dspMountPoint;
+                dsp = LoadProcess(arguments2);
+                if (dsp == null) {
+                    Console.WriteLine("unable to load {0}",dspName);
+                    dspLoaded = false;
+                }
+            }
+            else dspLoaded = true;
+
+            DirectoryServiceTests t = new DirectoryServiceTests(nakLoaded ,dspLoaded);
+
+            try {
+
+                t.BindTimeTests(ds);
+                Console.WriteLine(" pass={0}, fail={1}", t.passCount, t.failCount);
+
+
+                //Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+
+                if (dsp != null) {
+                    t.DoDeregister(ds,dspMountPoint, ErrorCode.NoError);
+                }
+
+                delete ds;
+
+                //Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+
+
+                if (dsp != null) {
+                    dsp.Join();
+                }
+            }
+            finally {
+            }
+            return 0;
+        }
+
+        private static void Usage(string name)
+        {
+            Console.WriteLine("{0} <filename> creates a directory.",name);
+        }
+    } // class Test
+}
diff --git a/base/Applications/Tests/Select/Select.csproj b/base/Applications/Tests/Select/Select.csproj
new file mode 100644
index 0000000..2352fe8
--- /dev/null
+++ b/base/Applications/Tests/Select/Select.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\Select\Select.csproj
+
+Note:   Tests "select receive".
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>select</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <NoNullCheck>true</NoNullCheck>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Select.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/Select/Select.sg b/base/Applications/Tests/Select/Select.sg
new file mode 100644
index 0000000..a0a7fdf
--- /dev/null
+++ b/base/Applications/Tests/Select/Select.sg
@@ -0,0 +1,467 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Select.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "set", Default=false, HelpMessage="Run set test.")]
+        internal bool doSetTest;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Select.AppMain(this);
+        }
+    }
+    
+    public class Select
+    {
+        private contract SelectTest {
+            in message A();
+            in message B();
+            in message C();
+            out message Ack();
+
+            state Start: one {
+                A? -> Ack! -> Start;
+                B? -> Ack! -> Start;
+                C? -> Ack! -> Start;
+            }
+        }
+
+        private static TRef<SelectTest.Imp:Start>[] impEndpoints;
+
+
+        public static void SelectThread()
+        {
+            SelectTest.Imp[] channel = new SelectTest.Imp [3];
+            for (int i = 0; i < 3; i++) {
+                channel[i] = impEndpoints[i].Acquire();
+            }
+
+            channel[2].SendA();
+            channel[2].RecvAck();
+
+            channel[2].SendA();
+            channel[2].RecvAck();
+
+            channel[2].SendA();
+            channel[2].RecvAck();
+
+            channel[1].SendC();
+            channel[0].SendB();
+            channel[1].RecvAck();
+            channel[0].RecvAck();
+
+            channel[0].SendA();
+            channel[1].SendC();
+            channel[0].RecvAck();
+            channel[1].RecvAck();
+
+            channel[1].SendC();
+            channel[0].SendA();
+
+            channel[0].RecvAck();
+            channel[1].RecvAck();
+
+            channel[0].SendB();
+            channel[1].SendA();
+            channel[2].SendC();
+
+            delete channel[0];
+            delete channel[1];
+            delete channel[2];
+        }
+
+        //[ShellCommand("selectb", "Run select test")]
+        public static int DoSelect()
+        {
+            SelectTest.Exp[] expEndpoints = new SelectTest.Exp [3];
+            impEndpoints = new TRef<SelectTest.Imp:Start> [3];
+
+            for (int i = 0; i < 3; i++) {
+                SelectTest.Imp! imp;
+                SelectTest.Exp! exp;
+                SelectTest.NewChannel(out imp, out exp);
+                expEndpoints[i] = exp;
+                impEndpoints[i] = new TRef<SelectTest.Imp:Start>(imp);
+            }
+
+            Thread t1 = new Thread(new ThreadStart(SelectThread));
+            t1.Start();
+
+            SelectTest.Exp a = expEndpoints[0];
+            SelectTest.Exp b = expEndpoints[1];
+            SelectTest.Exp c = expEndpoints[2];
+
+            bool failed = false;
+            ActuallySelect(a, b, c, 0, ref failed);
+            ActuallySelect(a, b, c, 0, ref failed);
+            ActuallySelect(a, b, c, 0, ref failed);
+            ActuallySelect(a, b, c, 1, ref failed);
+            ActuallySelect(a, b, c, 2, ref failed);
+            ActuallySelect(a, b, c, 2, ref failed);
+            ActuallySelect(a, b, c, -1, ref failed);
+
+            if (failed) {
+                Console.WriteLine("[1] Done (FAILED).");
+                return 1;
+            }
+            else {
+                Console.WriteLine("[1] Done (Success).");
+                return 0;
+            }
+        }
+
+        private static void ActuallySelect(SelectTest.Exp a,
+                                           SelectTest.Exp b,
+                                           SelectTest.Exp c,
+                                           int expect,
+                                           ref bool failed)
+        {
+            int got;
+            switch receive {
+                case c.RecvA():
+                    c.SendAck();
+                    got = 0;
+                    break;
+
+                case a.RecvB() && b.RecvC():
+                    a.SendAck();
+                    b.SendAck();
+                    got = 1;
+                    break;
+
+                case a.RecvA() && b.RecvC():
+                    a.SendAck();
+                    b.SendAck();
+                    got = 2;
+                    break;
+
+                case unsatisfiable:
+                    got = -1;
+                    break;
+            }
+
+            Console.WriteLine("[1] expected {0}, got {1}", expect, got);
+            if (expect != got) {
+                failed = true;
+            }
+        }
+
+        private static void ActuallySelect(ESet<SelectTest.Exp:Start> eset,
+                                           int expect,
+                                           ref bool failed)
+        {
+            int got;
+            switch receive {
+                case a.RecvA() in eset:
+                    got = 0;
+                    a.SendAck();
+                    eset.Add(a);
+                    break;
+
+                case b.RecvB() in eset:
+                    got = 1;
+                    b.SendAck();
+                    eset.Add(b);
+                    break;
+
+                case c.RecvC() in eset:
+                    got = 2;
+                    c.SendAck();
+                    eset.Add(c);
+                    break;
+
+                case unsatisfiable:
+                    got = -1;
+                    break;
+            }
+
+            Console.WriteLine("[1] expected {0}, got {1}", expect, got);
+            if (expect != got) {
+                failed = true;
+            }
+        }
+
+        public static int DoSelectSet()
+        {
+            SelectTest.Exp[] expEndpoints = new SelectTest.Exp [3];
+            impEndpoints = new TRef<SelectTest.Imp:Start> [3];
+
+            for (int i = 0; i < 3; i++) {
+                SelectTest.Imp! imp;
+                SelectTest.Exp! exp;
+                SelectTest.NewChannel(out imp, out exp);
+                expEndpoints[i] = exp;
+                impEndpoints[i] = new TRef<SelectTest.Imp:Start>(imp);
+            }
+
+            Thread t1 = new Thread(new ThreadStart(SelectThread));
+            t1.Start();
+
+            SelectTest.Exp a = expEndpoints[0];
+            SelectTest.Exp b = expEndpoints[1];
+            SelectTest.Exp c = expEndpoints[2];
+
+            ESet<SelectTest.Exp:Start> eset = new ESet<SelectTest.Exp:Start>();
+            eset.Add(a);
+            eset.Add(b);
+            eset.Add(c);
+
+            bool failed = false;
+            ActuallySelect(eset, 0, ref failed);
+            ActuallySelect(eset, 0, ref failed);
+            ActuallySelect(eset, 0, ref failed);
+            ActuallySelect(eset, 1, ref failed);
+            ActuallySelect(eset, 2, ref failed);
+            ActuallySelect(eset, 0, ref failed);
+            ActuallySelect(eset, 2, ref failed);
+            ActuallySelect(eset, 0, ref failed);
+            ActuallySelect(eset, 2, ref failed);
+            ActuallySelect(eset, 0, ref failed);
+            ActuallySelect(eset, 1, ref failed);
+            ActuallySelect(eset, 2, ref failed);
+            ActuallySelect(eset, -1, ref failed);
+
+            if (failed) {
+                Console.WriteLine("[1] Done (FAILED).");
+                return 1;
+            }
+            else {
+                Console.WriteLine("[1] Done (Success).");
+                return 0;
+            }
+        }
+
+        /*
+        //[ShellCommand("select", "Run select test")]
+        public static int DoSelect()
+        {
+            SelectTest.Exp[] expEndpoints = new SelectTest.Exp [3];
+            impEndpoints = new TRef<SelectTest.Imp:Start> [3];
+
+            for (int i = 0; i < 3; i++) {
+                SelectTest.Imp! imp;
+                SelectTest.Exp! exp;
+                SelectTest.NewChannel(out imp, out exp);
+                expEndpoints[i] = exp;
+                impEndpoints[i] = new TRef<SelectTest.Imp:Start>(imp);
+            }
+
+            Thread t1 = new Thread(new ThreadStart(SelectThread));
+            t1.Start();
+
+            int[][] patterns = new int[3][];
+            patterns[0] = new int [] { 0, 0, SelectTest.Tags.A };
+            patterns[1] = new int [] { SelectTest.Tags.B, SelectTest.Tags.C, 0 };
+            patterns[2] = new int [] { SelectTest.Tags.A, SelectTest.Tags.C, 0 };
+
+            ISelectable[] selects = new ISelectable[3];
+            for (int i = 0; i<3; i++) {
+                selects[i] = expEndpoints[i];
+            }
+
+            object setMatch;
+            int i1 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i1);
+
+            expEndpoints[2].RecvA();
+            expEndpoints[2].SendAck();
+
+            int i2 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i2);
+
+            expEndpoints[2].RecvA();
+            expEndpoints[2].SendAck();
+
+            int i3 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i3);
+
+            expEndpoints[2].RecvA();
+            expEndpoints[2].SendAck();
+
+            int i4 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 1.)", i4);
+
+            expEndpoints[0].RecvB();
+            expEndpoints[1].RecvC();
+            expEndpoints[0].SendAck();
+            expEndpoints[1].SendAck();
+
+            int i5 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 2.)", i5);
+
+            expEndpoints[0].RecvA();
+            expEndpoints[1].RecvC();
+            expEndpoints[0].SendAck();
+            expEndpoints[1].SendAck();
+
+            int i6 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 2.)", i6);
+
+            expEndpoints[0].RecvA();
+            expEndpoints[1].RecvC();
+            expEndpoints[0].SendAck();
+            expEndpoints[1].SendAck();
+
+            int i7 = Endpoint.Select(patterns, selects, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected -1.)", i7);
+
+            Console.WriteLine("[1] Done.");
+            return 0;
+        }
+
+
+        //[ShellCommand("selectset", "Run select set test")]
+        public static int DoSelectSet()
+        {
+            SelectTest.Exp[] expEndpoints = new SelectTest.Exp [3];
+            impEndpoints = new TRef<SelectTest.Imp:Start> [3];
+
+            for (int i = 0; i < 3; i++) {
+                SelectTest.Imp! imp;
+                SelectTest.Exp! exp;
+                SelectTest.NewChannel(out imp, out exp);
+                expEndpoints[i] = exp;
+                impEndpoints[i] = new TRef<SelectTest.Imp:Start>(imp);
+            }
+
+            Thread t1 = new Thread(new ThreadStart(SelectThread));
+            t1.Start();
+
+            int[][] patterns = new int[3][];
+            patterns[0] = new int [] { SelectTest.Tags.A };
+            patterns[1] = new int [] { SelectTest.Tags.B };
+            patterns[2] = new int [] { SelectTest.Tags.C };
+
+            ESet<SelectTest.Exp:Start> eset = new ESet<SelectTest.Exp:Start>();
+            eset.Add(expEndpoints[0]);
+            eset.Add(expEndpoints[1]);
+            eset.Add(expEndpoints[2]);
+
+            ISelectable[] selectEPs = new ISelectable[1]{eset};
+
+            object setMatch;
+            int i1 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i1);
+
+            SetRecvA(setMatch, eset);
+
+            int i2 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i2);
+
+            SetRecvA(setMatch, eset);
+
+            int i3 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i3);
+
+            SetRecvA(setMatch, eset);
+
+            int i4 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 1.)", i4);
+
+            SetRecvB(setMatch, eset);
+
+            int i5 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 2.)", i5);
+
+            SetRecvC(setMatch, eset);
+
+            int i6 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i6);
+
+            SetRecvA(setMatch, eset);
+
+            int i7 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected 2.)", i7);
+
+            SetRecvC(setMatch, eset);
+
+            int i8 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected 0.)", i8);
+
+            SetRecvA(setMatch, eset);
+
+            int i9 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected 2.)", i9);
+
+            SetRecvC(setMatch, eset);
+
+            int i10 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected 0.)", i10);
+
+            SetRecvA(setMatch, eset);
+
+            int i11 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected 1.)", i11);
+
+            SetRecvB(setMatch, eset);
+
+            int i12 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected 2.)", i12);
+
+            SetRecvC(setMatch, eset);
+
+            int i13 = Endpoint.Select(patterns, selectEPs, out setMatch);
+            Console.WriteLine("[1] Got {0}! (Expected -1.)", i13);
+
+            Console.WriteLine("[1] Done.");
+            return 0;
+        }
+
+        private static void SetRecvA(object match, ESet<SelectTest.Exp:Start> eset) {
+            SelectTest.Exp exp = eset.Extract(match);
+            exp.RecvA();
+            exp.SendAck();
+            eset.Add(exp);
+        }
+
+        private static void SetRecvB(object match, ESet<SelectTest.Exp:Start> eset) {
+            SelectTest.Exp exp = eset.Extract(match);
+            exp.RecvB();
+            exp.SendAck();
+            eset.Add(exp);
+        }
+
+        private static void SetRecvC(object match, ESet<SelectTest.Exp:Start> eset) {
+            SelectTest.Exp exp = eset.Extract(match);
+            exp.RecvC();
+            exp.SendAck();
+            eset.Add(exp);
+        }
+        */
+
+        internal static int AppMain(Parameters! config)
+        {
+            const int ARGS_START = 1;
+
+            if (config.doSetTest) return DoSelectSet();
+            return DoSelect();
+        }
+    }
+}
diff --git a/base/Applications/Tests/SharedHeapTest/SharedHeapTest.cs b/base/Applications/Tests/SharedHeapTest/SharedHeapTest.cs
new file mode 100644
index 0000000..b58b396
--- /dev/null
+++ b/base/Applications/Tests/SharedHeapTest/SharedHeapTest.cs
@@ -0,0 +1,347 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SharedHeapTest.cs
+//
+//  Note: User-mode test program for calling shared heap through the ABI.
+//
+using Microsoft.Singularity.V1.Services;
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            SharedHeapTest.AppMain(this);
+            return 0;
+        }
+    }
+
+    unsafe public class SharedHeapTest
+    {
+        //
+        // Note: The integrity check relies on there being one bit in each byte
+        // to represent the owning concurrent allocation slot, so the number of
+        // concurrent allocations can't exceed 8.
+        //
+        private const uint ConcurrentAllocations = 8;
+        private SharedHeapService.Allocation*[]! mem;
+
+        Random! random = new Random();
+
+        internal static void AppMain(Parameters! config)
+        {
+            SharedHeapTest test = new SharedHeapTest();
+
+            uint Iterations = 10;
+
+            Console.WriteLine("Starting Shared Heap Test\n");
+            test.StartUp();
+            for (uint loop = 0; loop < Iterations; loop++) {
+                test.Perturb();
+                if (test.Check() == false) {
+                    break;
+                }
+            }
+        }
+
+        private SharedHeapTest() {
+            //
+            // Create an array to hold our concurrent allocations.
+            //
+            this.mem = new SharedHeapService.Allocation*[ConcurrentAllocations];
+        }
+
+        public static void Usage()
+        {
+            Console.WriteLine("Usage: sharedheap [Iterations]\n");
+        }
+
+        public void StartUp()
+        {
+            //
+            // Allocating a bunch of randomly sized things.
+            //
+            for (uint loop = 0; loop < ConcurrentAllocations; loop++) {
+                AllocRandomSizedThingy(loop);
+                if (CheckForValue(loop, 0) == true) {
+                    Console.WriteLine("Passed zero-fill test.\n");
+                } else {
+                    Console.WriteLine("Failed zero-fill test.\n");
+                }
+                FillWithValue(loop, (byte)(1 << (int)loop));
+            }
+        }
+
+        public bool Check()
+        {
+            //
+            // Check all allocations for expected bit settings.
+            //
+            Console.WriteLine("--------\n");
+            Console.WriteLine("Integrity Check\n");
+
+            for (uint loop = 0; loop < ConcurrentAllocations; loop++) {
+                if (CheckBits(loop, (byte)(1 << (int)loop)) == false) {
+                    return false;
+                }
+            }
+
+            Console.WriteLine("--------\n");
+            return true;
+        }
+
+        public void Perturb()
+        {
+            //
+            // Pick an element slot to use and an action to take.
+            //
+            uint which = (uint)random.Next(ConcurrentAllocations);
+            uint action = (uint)random.Next(3);
+
+            //
+            // Free up the slot.
+            //
+            Console.WriteLine("--------\n");
+            Console.WriteLine(
+                "Freeing region: Data = {0}, Size = {1}.\n",
+                SharedHeapService.GetData(this.mem[which]),
+                SharedHeapService.GetSize(this.mem[which]));
+
+            ClearBits(which, (byte)(1 << (int)which));
+            SharedHeapService.Free(this.mem[which]);
+
+            Console.WriteLine("--------\n");
+
+            //
+            // Play around.
+            //
+            switch(action) {
+                case 0:
+                    //
+                    // Allocate something new.
+                    //
+                    Console.WriteLine("Allocation Test\n");
+                    AllocRandomSizedThingy(which);
+                    if (CheckForValue(which, 0) == true) {
+                        Console.WriteLine("Passed zero-fill test.\n");
+                    } else {
+                        Console.WriteLine("Failed zero-fill test.\n");
+                    }
+
+                    //
+                    // Store bit corresponding to slot number in each
+                    // data byte.  Used to check integrity later.
+                    //
+                    FillWithValue(which, (byte)(1 << (int)which));
+                    break;
+
+                case 1:
+                    //
+                    // Split an element in two.  Use the slot we freed
+                    // up above to hold the split-off piece.
+                    //
+                    Console.WriteLine("Split Test\n");
+
+                    //
+                    // Pick a region to split.
+                    //
+                    uint split;
+                    do {
+                        split = (uint)random.Next(ConcurrentAllocations);
+                    } while (split == which);
+
+                    Console.Write(
+                        "Splitting region: Data = {0}, Size = {1}",
+                        SharedHeapService.GetData(this.mem[split]),
+                        SharedHeapService.GetSize(this.mem[split]));
+                    UIntPtr offset = (UIntPtr)random.Next(
+                        1,
+                        (int)SharedHeapService.GetSize(this.mem[split]));
+                    Console.WriteLine(" in two at offset {0}.\n", offset);
+
+                    this.mem[which] = SharedHeapService.Split(
+                        this.mem[split],
+                        offset);
+
+                    Console.WriteLine(
+                        "Revised region: Data = {0}, Size = {1}.\n",
+                        SharedHeapService.GetData(this.mem[split]),
+                        SharedHeapService.GetSize(this.mem[split]));
+
+                    Console.WriteLine(
+                        "New region: Data = {0}, Size = {1}.\n",
+                        SharedHeapService.GetData(this.mem[which]),
+                        SharedHeapService.GetSize(this.mem[which]));
+
+                    //
+                    // Remove bit corresponding to the slot of the original
+                    // region from the split-off data.  Likewise, add the
+                    // bit corresponding to the slot number of the split-off
+                    // region to the split-off data.
+                    //
+                    ClearBits(which, (byte)(1 << (int)split));
+                    SetBits(which, (byte)(1 << (int)which));
+
+                    break;
+
+                case 2:
+                    //
+                    // Share part of a region.  Use the slot we freed
+                    // up above to hold the shared piece.
+                    //
+                    Console.WriteLine("Share Test\n");
+
+                    //
+                    // Pick a region to share.
+                    //
+                    uint share;
+                    do {
+                        share = (uint)random.Next(ConcurrentAllocations);
+                    } while (share == which);
+
+                    Console.Write(
+                        "Sharing region: Data = {0}, Size = {1}",
+                        SharedHeapService.GetData(this.mem[share]),
+                        SharedHeapService.GetSize(this.mem[share]));
+                    UIntPtr start = (UIntPtr)random.Next(
+                        1,
+                        (int)SharedHeapService.GetSize(this.mem[share]));
+                    Console.WriteLine(" starting at offset {0}.\n", start);
+
+                    this.mem[which] = SharedHeapService.Share(
+                        this.mem[share],
+                        start, SharedHeapService.GetSize(this.mem[share]));
+
+                    Console.WriteLine(
+                        "Original region: Data = {0}, Size = {1}.\n",
+                        SharedHeapService.GetData(this.mem[share]),
+                        SharedHeapService.GetSize(this.mem[share]));
+
+                    Console.WriteLine(
+                        "New region: Data = {0}, Size = {1}.\n",
+                        SharedHeapService.GetData(this.mem[which]),
+                        SharedHeapService.GetSize(this.mem[which]));
+
+                    //
+                    // Modify each data byte in the shared region to include
+                    // the bit corresponding to the slot number of the new
+                    // shared allocation handle.
+                    //
+                    SetBits(which, (byte)(1 << (int)which));
+
+                    break;
+            }
+        }
+
+        private void AllocRandomSizedThingy(uint index)
+        {
+            // REVIEW: We can't ask the system for the PageSize?
+            // Hardcoded to 2 * Pages.PageSize.
+            UIntPtr size = (UIntPtr)random.Next(1, 8192);
+
+            this.mem[index] = SharedHeapService.Allocate(size, typeof(byte).GetSystemType(), 0);
+
+            Console.WriteLine("Allocated region: Data = {0}, Size = {1}.\n",
+                              SharedHeapService.GetData(this.mem[index]),
+                              SharedHeapService.GetSize(this.mem[index]));
+        }
+
+        private void FillWithValue(uint index, byte value)
+        {
+            UIntPtr data = SharedHeapService.GetData(this.mem[index]);
+            UIntPtr size = SharedHeapService.GetSize(this.mem[index]);
+
+            for (UIntPtr address = data; address < data + size; address++) {
+                *(byte *)address = value;
+            }
+
+            return;
+        }
+
+        private bool CheckForValue(uint index, byte value)
+        {
+            UIntPtr data = SharedHeapService.GetData(this.mem[index]);
+            UIntPtr size = SharedHeapService.GetSize(this.mem[index]);
+            bool status = true;
+
+            for (UIntPtr address = data; address < data + size; address++) {
+                if (*(byte *)address != value) {
+                    status = false;
+                    Console.Write("Wrong value {0} at address {1}.\n",
+                                      *(byte *)address, address);
+                    Console.Write("Should be {0}.\n", value);
+                }
+            }
+
+            return status;
+        }
+
+        private void SetBits(uint index, byte bit)
+        {
+            UIntPtr data = SharedHeapService.GetData(this.mem[index]);
+            UIntPtr size = SharedHeapService.GetSize(this.mem[index]);
+
+            for (UIntPtr address = data; address < data + size; address++) {
+                *(byte *)address |= bit;
+            }
+
+            return;
+        }
+
+        private void ClearBits(uint index, byte bit)
+        {
+            UIntPtr data = SharedHeapService.GetData(this.mem[index]);
+            UIntPtr size = SharedHeapService.GetSize(this.mem[index]);
+
+            for (UIntPtr address = data; address < data + size; address++) {
+                *(byte *)address &= (byte)~bit;
+            }
+
+            return;
+        }
+
+        private bool CheckBits(uint index, byte bit)
+        {
+            UIntPtr data = SharedHeapService.GetData(this.mem[index]);
+            UIntPtr size = SharedHeapService.GetSize(this.mem[index]);
+            bool status = true;
+
+            for (UIntPtr address = data; address < data + size; address++) {
+                if ((*(byte *)address & bit) != bit) {
+                    status = false;
+                    Console.WriteLine("Bad value {0} at address {1}.\n",
+                                      *(byte *)address, address);
+                    //
+                    // Stop at one to prevent huge output.
+                    //
+                    break;
+                }
+            }
+
+            return status;
+        }
+    }
+}
+
diff --git a/base/Applications/Tests/SharedHeapTest/SharedHeapTest.csproj b/base/Applications/Tests/SharedHeapTest/SharedHeapTest.csproj
new file mode 100644
index 0000000..152f994
--- /dev/null
+++ b/base/Applications/Tests/SharedHeapTest/SharedHeapTest.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SharedHeapTest</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SharedHeapTest.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/SmpTest/ForkTest.sg b/base/Applications/Tests/SmpTest/ForkTest.sg
new file mode 100644
index 0000000..773bc11
--- /dev/null
+++ b/base/Applications/Tests/SmpTest/ForkTest.sg
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HeapTest.cs
+//
+//  Note:   Allocate strings and encourage GCs
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+
+using Microsoft.Singularity.UnitTest;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class ForkTest
+    {
+        static readonly string []! ProcessArgs = new string[] { "testpe.x86" };
+        static readonly TimeSpan ProcessTimeout = TimeSpan.FromSeconds(10);
+        const int IterationsPerThread = 64;
+
+        static object! monitor = new object();
+        static AutoResetEvent! exitEvent = new AutoResetEvent(false);
+        static int threadCount;
+
+        private static void ThreadMain()
+        {
+            lock (ForkTest.monitor) {
+                ForkTest.threadCount++;
+            }
+
+            for (int i = 0; i < IterationsPerThread; i++) {
+                Process process = new Process(ForkTest.ProcessArgs);
+                process.Start();
+                Assert.True(process.Join(ProcessTimeout),
+                            "Failed to join process.");
+            }
+
+            lock (ForkTest.monitor) {
+                ForkTest.threadCount--;
+                if (ForkTest.threadCount == 0) {
+                    ForkTest.exitEvent.Set();
+                }
+            }
+        }
+
+        public static void Run()
+        {
+            ForkTest.monitor     = new object();
+            ForkTest.exitEvent   = new AutoResetEvent(false);
+            ForkTest.threadCount = 0;
+
+            for (int i = 0; i < Settings.MaxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(ThreadMain));
+                t.Start();
+            }
+            ForkTest.exitEvent.WaitOne();
+        }
+    }
+}
diff --git a/base/Applications/Tests/SmpTest/HeapTest.sg b/base/Applications/Tests/SmpTest/HeapTest.sg
new file mode 100644
index 0000000..0bf3177
--- /dev/null
+++ b/base/Applications/Tests/SmpTest/HeapTest.sg
@@ -0,0 +1,74 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HeapTest.sg
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class HeapTest
+    {
+        // GC threshold is around 8MB.
+        private const  long TotalToAllocate    = 8L * 1024 * 1024 * 1024;
+        private const  int LargeStringLength   = 1023;
+        private const  int SmallStringLength   = 64;
+
+        private static object!   monitor;
+        private static int       threadCount = 0;
+        private static AutoResetEvent! exitEvent;
+        private static int       stringLength;
+        private static int       allocationsPerThread = 0;
+
+        private static void ThreadMain()
+        {
+            lock (HeapTest.monitor) {
+                HeapTest.threadCount++;
+            }
+
+            for (int i = 0; i < HeapTest.allocationsPerThread; i++) {
+                new String('a', HeapTest.stringLength);
+            }
+
+            lock (HeapTest.monitor) {
+                HeapTest.threadCount--;
+                if (HeapTest.threadCount == 0) {
+                    HeapTest.exitEvent.Set();
+                }
+            }
+        }
+
+        private static void Test(int stringLength)
+        {
+            HeapTest.monitor     = new object();
+            HeapTest.exitEvent   = new AutoResetEvent(false);
+            HeapTest.threadCount = 0;
+            HeapTest.stringLength = stringLength;
+            HeapTest.allocationsPerThread = unchecked((int)(TotalToAllocate / (Settings.MaxThreads * stringLength)));
+
+            for (int i = 0; i < Settings.MaxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(ThreadMain));
+                t.Start();
+            }
+            HeapTest.exitEvent.WaitOne();
+        }
+
+        public static void TestLargeAllocs()
+        {
+            Test(LargeStringLength);
+        }
+
+        public static void TestSmallAllocs()
+        {
+            Test(SmallStringLength);
+        }
+    }
+}
diff --git a/base/Applications/Tests/SmpTest/Settings.sg b/base/Applications/Tests/SmpTest/Settings.sg
new file mode 100644
index 0000000..183ec15
--- /dev/null
+++ b/base/Applications/Tests/SmpTest/Settings.sg
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Settings.sg
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Applications
+{
+    class Settings
+    {
+        public const int MaxThreads = 8;
+    }
+}
diff --git a/base/Applications/Tests/SmpTest/SmpTest.csproj b/base/Applications/Tests/SmpTest/SmpTest.csproj
new file mode 100644
index 0000000..e505a9a
--- /dev/null
+++ b/base/Applications/Tests/SmpTest/SmpTest.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SmpTest</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ForkTest.sg" />
+    <Compile Include="HeapTest.sg" />
+    <Compile Include="Settings.sg" />
+    <Compile Include="SmpTest.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\UnitTest\UnitTestLib.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/SmpTest/SmpTest.sg b/base/Applications/Tests/SmpTest/SmpTest.sg
new file mode 100644
index 0000000..fd35956
--- /dev/null
+++ b/base/Applications/Tests/SmpTest/SmpTest.sg
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SmpTest.cs
+//
+//  Note:   Some basic tests of system code on SMP.
+//
+
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.UnitTest;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SmpTest.AppMain(this);
+        }
+    }
+
+    public class SmpTest
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            UnitTest.Add("process creation",
+                         new UnitTest.TestDelegate(ForkTest.Run));
+
+            UnitTest.Add("heap and GC (large allocations)",
+                         new UnitTest.TestDelegate(HeapTest.TestLargeAllocs));
+
+            UnitTest.Add("heap and GC (small allocations)",
+                         new UnitTest.TestDelegate(HeapTest.TestSmallAllocs));
+
+            UnitTest.Add("process creation",
+                         new UnitTest.TestDelegate(ForkTest.Run));
+
+            return ((UnitTest.Run(true) == UnitTest.Result.Passed) &&
+                    Assert.Failures == 0) ? 0 : 1;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Sync/Sync.cs b/base/Applications/Tests/Sync/Sync.cs
new file mode 100644
index 0000000..e08b986
--- /dev/null
+++ b/base/Applications/Tests/Sync/Sync.cs
@@ -0,0 +1,144 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Sync.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Sync.AppMain(this);
+        }
+    }
+
+    public class Sync
+    {
+        private static Mutex! mutex;
+        private static AutoResetEvent! autoResetEvent;
+        private static ManualResetEvent! manualResetEvent;
+        private static AutoResetEvent! syncEvent;
+
+        public static void SyncThread()
+        {
+            Console.WriteLine("[2] Acquiring mutex...");
+            mutex.WaitOne();
+            Console.WriteLine("[2] Mutex acquired!");
+            mutex.ReleaseMutex();
+            Console.WriteLine("[2] Mutex released.");
+
+            Thread.Yield();
+            Thread.Yield();
+            Thread.Yield();
+            Thread.Yield();
+            Thread.Yield();
+
+            Console.WriteLine("[2] Setting event.");
+            autoResetEvent.Set();
+
+            Thread.Yield();
+            Thread.Yield();
+            Thread.Yield();
+            Thread.Yield();
+            Thread.Yield();
+
+            Console.WriteLine("[2] Waiting for notification...");
+            syncEvent.WaitOne();
+
+            Console.WriteLine("[2] Setting event.");
+            autoResetEvent.Set();
+
+            Console.WriteLine("[2] Waiting for notification...");
+            syncEvent.WaitOne();
+
+            Console.WriteLine("[2] Setting manual event.");
+            manualResetEvent.Set();
+        }
+
+        //[ShellCommand("sync", "Run synchronization test")]
+        internal static int AppMain(Parameters! config)
+        {
+            mutex = new Mutex();
+            autoResetEvent = new AutoResetEvent(false);
+            manualResetEvent = new ManualResetEvent(true);
+            syncEvent = new AutoResetEvent(false);
+
+            Thread t1 = new Thread(new ThreadStart(SyncThread));
+            t1.Start();
+
+            Console.WriteLine("[1] Acquiring mutex...");
+            mutex.WaitOne();
+            Console.WriteLine("[1] Mutex acquired!");
+            Console.WriteLine("[1] Releasing mutex...");
+            mutex.ReleaseMutex();
+            Console.WriteLine("[1] Mutex released.");
+
+            Console.WriteLine("[1] Acquiring mutex...");
+            mutex.WaitOne();
+            Console.WriteLine("[1] Mutex acquired!");
+            Console.WriteLine("[1] Yielding (1/3).");
+            Thread.Yield();
+            Console.WriteLine("[1] Yielding (2/3).");
+            Thread.Yield();
+            Console.WriteLine("[1] Yielding (3/3).");
+            Thread.Yield();
+            Console.WriteLine("[1] Releasing mutex...");
+            mutex.ReleaseMutex();
+            Console.WriteLine("[1] Mutex released.");
+
+            Console.WriteLine("[1] Waiting on event.");
+            autoResetEvent.WaitOne();
+            Console.WriteLine("[1] Event set!");
+
+            Console.WriteLine("[1] Setting sync event.");
+            syncEvent.Set();
+
+            Console.WriteLine("[1] Waiting on event.");
+            autoResetEvent.WaitOne();
+            Console.WriteLine("[1] Event set!");
+
+            Console.WriteLine("[1] Waiting on manual event.");
+            manualResetEvent.WaitOne();
+            Console.WriteLine("[1] Event set!");
+
+            Console.WriteLine("[1] Resetting manual event.");
+            manualResetEvent.Reset();
+
+            Console.WriteLine("[1] Setting sync event.");
+            syncEvent.Set();
+
+            Console.WriteLine("[1] Waiting on manual event.");
+            manualResetEvent.WaitOne();
+            Console.WriteLine("[1] Event set!");
+
+            Console.WriteLine("[1] Waiting on manual event.");
+            manualResetEvent.WaitOne();
+            Console.WriteLine("[1] Event set!");
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Sync/Sync.csproj b/base/Applications/Tests/Sync/Sync.csproj
new file mode 100644
index 0000000..792e275
--- /dev/null
+++ b/base/Applications/Tests/Sync/Sync.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Sync</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Sync.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/ThreadTest/ThreadTest.cs b/base/Applications/Tests/ThreadTest/ThreadTest.cs
new file mode 100644
index 0000000..6bc837a
--- /dev/null
+++ b/base/Applications/Tests/ThreadTest/ThreadTest.cs
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadTest.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ThreadTest.AppMain(this);
+        }
+    }
+    
+    public class ThreadTest
+    {
+        public static void FirstThreadMethod()
+        {
+            Console.WriteLine("First thread!");
+            DebugStub.Print("First thread!\n");
+
+            for (int i = 0; i < 10; i++) {
+                Console.WriteLine("[0] ...    ");
+                Thread.Yield();
+            }
+
+            Console.WriteLine("First thread done!");
+            DebugStub.Print("First thread done!\n");
+        }
+
+        public static void SecondThreadMethod()
+        {
+            Console.WriteLine("Second thread!");
+            DebugStub.Print("Second thread!\n");
+
+            for (int i = 0; i < 10; i++)
+            {
+                Console.WriteLine("    ... [1]");
+                Thread.Yield();
+            }
+
+            Console.WriteLine("Second thread done!");
+            DebugStub.Print("Second thread done!\n");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            Thread t1 = new Thread(new ThreadStart(FirstThreadMethod));
+            Thread t2 = new Thread(new ThreadStart(SecondThreadMethod));
+
+            Console.WriteLine("Starting first thread.");
+            t1.Start();
+            Console.WriteLine("Started first thread.");
+
+            Console.WriteLine("Starting second thread.");
+            t2.Start();
+            Console.WriteLine("Started second thread.");
+
+            for (int i = 0; i < 30; i++)
+            {
+                Thread.Yield();
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/ThreadTest/ThreadTest.csproj b/base/Applications/Tests/ThreadTest/ThreadTest.csproj
new file mode 100644
index 0000000..72547ff
--- /dev/null
+++ b/base/Applications/Tests/ThreadTest/ThreadTest.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\ThreadTest\ThreadTest.csproj
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>ThreadTest</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ThreadTest.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/Throw/Throw.cs b/base/Applications/Tests/Throw/Throw.cs
new file mode 100644
index 0000000..8b12881
--- /dev/null
+++ b/base/Applications/Tests/Throw/Throw.cs
@@ -0,0 +1,61 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Throw.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Throw.AppMain(this);
+        }
+    }
+    
+    public class Throw
+    {
+        //[ShellCommand("throw", "Throw an exception")]
+        internal static int AppMain(Parameters! config)
+        {
+            string args = "something"; 
+            
+            try
+            {
+                DebugStub.Print("About to throw exception\n");
+                if (args == null)
+                {
+                    throw new ArgumentNullException("ArgNullException");
+                }
+                throw new ApplicationException("AppException");
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Caught exception {0}", e);
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Throw/Throw.csproj b/base/Applications/Tests/Throw/Throw.csproj
new file mode 100644
index 0000000..35a18eb
--- /dev/null
+++ b/base/Applications/Tests/Throw/Throw.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\Throw\Throw.csproj
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>Throw</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Throw.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/ThrowWithLinkStack/ThrowWithLinkStack.cs b/base/Applications/Tests/ThrowWithLinkStack/ThrowWithLinkStack.cs
new file mode 100644
index 0000000..65d7281
--- /dev/null
+++ b/base/Applications/Tests/ThrowWithLinkStack/ThrowWithLinkStack.cs
@@ -0,0 +1,61 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThrowWithLinkStack.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using Microsoft.Singularity.V1.Services;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ThrowWithLinkStack.AppMain(this);
+        }
+    }
+
+    public class ThrowWithLinkStack
+    {
+        //[ShellCommand("throwWithLinkStack", "Throw an exception with link stack")]
+        internal static int AppMain(Parameters! config)
+        {
+            try
+            {
+                DebugStub.Print("About to throw exception\n");
+                Throw();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Throw with Link Stack Caught exception {0}", e);
+            }
+            return 0;
+        }
+
+        [RequireStackLink]
+        public static int Throw() {
+                throw new ApplicationException("AppException");
+        }
+    }
+}
diff --git a/base/Applications/Tests/ThrowWithLinkStack/ThrowWithLinkStack.csproj b/base/Applications/Tests/ThrowWithLinkStack/ThrowWithLinkStack.csproj
new file mode 100644
index 0000000..636987f
--- /dev/null
+++ b/base/Applications/Tests/ThrowWithLinkStack/ThrowWithLinkStack.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\ThrowWithLinkStack\ThrowWithLinkStack.csproj
+
+Note:   
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>ThrowWithLinkStack</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ThrowWithLinkStack.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/UnitTestTest/UnitTestTest.cs b/base/Applications/Tests/UnitTestTest/UnitTestTest.cs
new file mode 100644
index 0000000..70a0651
--- /dev/null
+++ b/base/Applications/Tests/UnitTestTest/UnitTestTest.cs
@@ -0,0 +1,216 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UnitTestTest.cs
+//
+//  Note:   A test of the Unit testing code.
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.Singularity.UnitTest;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Test.AppMain(this);
+        }
+    }
+    public class Test
+    {
+        private static void SimpleChecks()
+        {
+            Assert.True(true, "Expected true");
+            Assert.False(false, "Expected false");
+            Assert.Null(null, "Expected null");
+
+            object low  = (object)0;
+            object high = (object)1;
+            Assert.NonNull(low, "Expected non-null value");
+            Assert.SameObject(low, low, "Expected same object");
+            Assert.NotSameObject(low, new object(),
+                                 "Expected different objects");
+            Assert.Equal(low, low,
+                         "Expected equal objects");
+            Assert.NotEqual(low, high, "Expected unequal objects.");
+
+        }
+
+        // -------------------------------------------------------------------
+        // Byte tests
+        //
+        // Generics would be handy here,
+        // but are not crucial as the overloads for binary
+        // operators are script generated so we expect them to work
+        // irrespective of type.
+
+        internal delegate void BinaryOp(byte a, byte b, string msg);
+
+        internal class WrappedBinaryOp
+        {
+            byte first;
+            byte second;
+            string! message;
+            BinaryOp! op;
+
+            internal WrappedBinaryOp(byte      first,
+                                     byte      second,
+                                     string!   message,
+                                     BinaryOp! op)
+            {
+                this.first   = first;
+                this.second  = second;
+                this.message = message;
+                this.op      = op;
+            }
+
+            public void Dispatch()
+            {
+                op(first, second, message);
+            }
+        }
+
+        private static void TestBadByteOperations()
+        {
+            ArrayList ops = new ArrayList();
+
+            int oldPasses = Assert.Passes;
+            int oldFailures = Assert.Failures;
+
+            ops.Add(new WrappedBinaryOp(0, 1, "Equal",
+                                     new BinaryOp(Assert.Equal)));
+            ops.Add(new WrappedBinaryOp(0, 1, "Greater",
+                                     new BinaryOp(Assert.Greater)));
+            ops.Add(new WrappedBinaryOp(0, 0, "Greater",
+                                     new BinaryOp(Assert.Greater)));
+            ops.Add(new WrappedBinaryOp(0, 1, "GreaterOrEqual",
+                                     new BinaryOp(Assert.GreaterOrEqual)));
+            ops.Add(new WrappedBinaryOp(1, 0, "Less",
+                                     new BinaryOp(Assert.Less)));
+            ops.Add(new WrappedBinaryOp(0, 0, "Less",
+                                     new BinaryOp(Assert.Less)));
+            ops.Add(new WrappedBinaryOp(1, 0, "LessOrEqual",
+                                     new BinaryOp(Assert.LessOrEqual)));
+
+            foreach (WrappedBinaryOp! op in ops) {
+                bool missedException = false;
+                try {
+                    op.Dispatch();
+                    missedException = true;
+                }
+                catch (FailedAssertionException) {
+                    missedException = false;
+                }
+                if (missedException) {
+                    throw new
+                        FailedAssertionException("Unexpected test pass.");
+                }
+            }
+            Assert.Equal(oldPasses, Assert.Passes, "Assert Passes");
+            Assert.Equal(oldFailures + 7, Assert.Failures, "Assert Failures");
+        }
+
+        private static void TestByteOperations()
+        {
+            int oldPasses = Assert.Passes;
+            Assert.Equal((byte)0, (byte)0, "byte Equal Test");
+            Assert.Greater((byte)1, (byte)0, "byte Greater Test");
+            Assert.GreaterOrEqual((byte)1, (byte)0,
+                                  "byte GreaterOrEqual Test");
+            Assert.GreaterOrEqual((byte)0, (byte)0,
+                                  "byte GreaterOrEqual Test 2");
+            Assert.Less((byte)0, (byte)1, "byte Less Test");
+            Assert.LessOrEqual((byte)0, (byte)1,
+                                  "byte LessOrEqual Test");
+            Assert.LessOrEqual((byte)0, (byte)0,
+                               "byte LessOrEqual Test 2");
+            Assert.Equal(oldPasses + 7, Assert.Passes, "Assert Passes");
+        }
+
+        private static void TestWatchDog()
+        {
+            const int deferrals       = 20;
+            TimeSpan  deferPeriod     = TimeSpan.FromMilliseconds(250);
+            TimeSpan  halfDeferPeriod =
+                TimeSpan.FromTicks(deferPeriod.Ticks / 2);
+
+            WatchDogTimer wd = new WatchDogTimer(deferPeriod);
+
+            wd.Start();
+            Assert.True(wd.Running, "Watch dog failed to start");
+
+            wd.Stop();
+            Assert.False(wd.Running, "Watch dog failed to stop");
+
+            wd.Start();
+            Assert.True(wd.Running, "Watch dog failed to restart");
+
+            Thread.Sleep(halfDeferPeriod);
+
+            for (int i = 0; i < deferrals; i++) {
+                wd.Defer();
+                Thread.Sleep(halfDeferPeriod);
+                Assert.True(wd.Running,
+                            "Watch dog timer stopped unexpectedly.");
+            }
+
+            // About to deliberately timeout watchdog
+            // so announce upcoming assertion failure from watchdog.
+            UnitTest.ExpectNextAssertionFails();
+            Thread.Sleep(deferPeriod);
+            Thread.Sleep(deferPeriod);
+            UnitTest.ExpectNextAssertionPasses();
+
+            Assert.False(wd.Running, "Watch dog timer did not timeout.");
+
+            wd.Start();
+            wd.Start();
+            wd.Start();
+            wd.Stop();
+            wd.Stop();
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            UnitTest.Add("SimpleChecks",
+                         new UnitTest.TestDelegate(SimpleChecks));
+            UnitTest.Add("TestByteOperations",
+                         new UnitTest.TestDelegate(TestByteOperations));
+            UnitTest.Add("TestBadByteOperations",
+                         new UnitTest.TestDelegate(TestBadByteOperations));
+            if (UnitTest.Run(true) != UnitTest.Result.Passed)
+                return -1;
+
+            UnitTest.Clear();
+
+            // The following test "fails" because
+            // it needs to see the watchdog timeout.
+            UnitTest.Add("TestWatchDog",
+                         new UnitTest.TestDelegate(TestWatchDog));
+            UnitTest.Run(true);
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/UnitTestTest/UnitTestTest.csproj b/base/Applications/Tests/UnitTestTest/UnitTestTest.csproj
new file mode 100644
index 0000000..70b8670
--- /dev/null
+++ b/base/Applications/Tests/UnitTestTest/UnitTestTest.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\Tests\UnitTestTest\UnitTestTest.csproj
+
+Note:   UnitTestTest test
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>UnitTestTest</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="UnitTestTest.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\UnitTest\UnitTestLib.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/Tests/VQTest/VQTest.csproj b/base/Applications/Tests/VQTest/VQTest.csproj
new file mode 100644
index 0000000..d591489
--- /dev/null
+++ b/base/Applications/Tests/VQTest/VQTest.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>VQTest</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="VQTest.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/VQTest/VQTest.sg b/base/Applications/Tests/VQTest/VQTest.sg
new file mode 100644
index 0000000..cb529ab
--- /dev/null
+++ b/base/Applications/Tests/VQTest/VQTest.sg
@@ -0,0 +1,96 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            Test.AppMain(this);
+            return 0;
+        }
+    }
+    
+    class Test {
+
+        const int NUM = 21;
+
+        internal static void AppMain(Parameters! config) {
+
+            VectorQueue<int> vq1 = new VectorQueue<int>();
+            VectorQueue<int> vq2 = new VectorQueue<int>();
+
+            for (int i=0; i<=Test.NUM; i++) {
+                int[] in ExHeap v = new[ExHeap] int[i];
+                vq1.AddTail(v);
+            }
+
+            Console.WriteLine("0..{0}", Test.NUM);
+
+            while (!vq1.Empty) {
+                int[] in ExHeap v = (!)vq1.ExtractHead();
+                Console.Write("  {0}", v.Length);
+                vq2.AddHead(v);
+            }
+
+            Console.WriteLine();
+            Console.WriteLine("{0}..0", Test.NUM);
+
+            while (!vq2.Empty) {
+                int[] in ExHeap v = (!)vq2.ExtractHead();
+                Console.Write("  {0}", v.Length);
+                vq1.AddTail(v);
+            }
+
+            Console.WriteLine();
+            Console.WriteLine("0..{0}", Test.NUM);
+
+            while (!vq1.Empty) {
+                int[] in ExHeap v = (!)vq1.ExtractTail();
+                Console.Write("  {0}", v.Length);
+                vq2.AddHead(v);
+            }
+
+            Console.WriteLine();
+            Console.WriteLine("0..{0}", Test.NUM);
+
+            while (!vq2.Empty) {
+                int[] in ExHeap v = (!)vq2.ExtractTail();
+                Console.Write("  {0}", v.Length);
+                delete v;
+            }
+
+            TContainer<VectorQueue<int>> tc1 = new TContainer<VectorQueue<int>>(vq1);
+
+            vq2.Dispose();
+
+            ThrowAway(tc1);
+        }
+
+        private static void ThrowAway(TContainer<VectorQueue<int>>! tc) {
+
+            VectorQueue<int> vq = tc.Acquire();
+
+            vq.Dispose();
+        }
+    }
+}
diff --git a/base/Applications/Tests/Varargs/Varargs.csproj b/base/Applications/Tests/Varargs/Varargs.csproj
new file mode 100644
index 0000000..fb263b6
--- /dev/null
+++ b/base/Applications/Tests/Varargs/Varargs.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Varargs</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Varargs.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/Varargs/Varargs.sg b/base/Applications/Tests/Varargs/Varargs.sg
new file mode 100644
index 0000000..d7f566a
--- /dev/null
+++ b/base/Applications/Tests/Varargs/Varargs.sg
@@ -0,0 +1,105 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Varargs.sg
+//
+//  Note:   Test __arglist parameters
+//
+using System;
+using System.Text;
+
+namespace Microsoft.Singularity.Applications
+{
+    public class Varargs
+    {
+        public static int Main(String[]! args)
+        {
+            string name = "VarArgs.x86";
+            int len = 1; 
+            int code = Printf("Invoked command with name '%s' and %d arguments", __arglist(name, len));
+            Console.WriteLine("Varargs exiting.");
+            return code;
+        }
+
+        public static int Printf(string! fmt, __arglist) {
+            return Decode(fmt, __arglist);
+        }
+
+        public static int Decode(string! fmt, RuntimeArgumentHandle art) {
+
+            StringBuilder sb = new StringBuilder();
+            ArgIterator ai = new ArgIterator(art);
+
+            int length = fmt.Length;
+            for (int index = 0; index < length; index++) {
+
+                char c = fmt[index];
+
+                if (c == '%') {
+                    index++;
+                    if (index < length) {
+                        c = fmt[index];
+                        switch (c) {
+                        case '%':
+                            sb.Append('%');
+                            break;
+                        case 's':
+                            if (ai.GetRemainingCount() > 0) {
+                                TypedReference tr = ai.GetNextArg();
+                                Type t = __reftype(tr);
+                                if (t == typeof(string)) {
+                                    string s = __refvalue(tr, string);
+                                    sb.Append(s);
+                                }
+                                else {
+                                    Console.WriteLine("Invalid argument for %s: {0}", t.ToString());
+                                    return 1;
+                                }
+                            }
+                            else {
+                                Console.WriteLine("Insufficient number of arguments for %s");
+                                return 1;
+                            }
+                            break;
+
+                        case 'd':
+                            if (ai.GetRemainingCount() > 0) {
+                                TypedReference tr = ai.GetNextArg();
+                                Type t = __reftype(tr);
+                                if (t == typeof(int)) {
+                                    int i = __refvalue(tr, int);
+                                    sb.Append(i.ToString());
+                                }
+                                else {
+                                    Console.WriteLine("Invalid argument for %i: {0}", t.ToString());
+                                    return 1;
+                                }
+                            }
+                            else {
+                                Console.WriteLine("Insufficient number of arguments for %i");
+                                return 1;
+                            }
+                            break;
+
+                        default:
+                            Console.WriteLine("Unknown format directive %{0}", c);
+                            return 1;
+                        }
+                    }
+                    else {
+                        Console.WriteLine("Error in format: end of string after %");
+                        return -1;
+                    }
+                }
+                else {
+                    sb.Append(c);
+                }
+            }
+            Console.WriteLine(sb.ToString());
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Verify/Verify.cs b/base/Applications/Tests/Verify/Verify.cs
new file mode 100644
index 0000000..d676e45
--- /dev/null
+++ b/base/Applications/Tests/Verify/Verify.cs
@@ -0,0 +1,47 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Verify.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Verify.AppMain(this);
+        }
+    }
+    
+    public class Verify
+    {
+        //[ShellCommand("verify", "Run heap verification test")]
+        internal static int AppMain(Parameters! config)
+        {
+            GC.Verify();
+            Console.WriteLine("Verification finished.\n");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/Tests/Verify/Verify.csproj b/base/Applications/Tests/Verify/Verify.csproj
new file mode 100644
index 0000000..daee4e4
--- /dev/null
+++ b/base/Applications/Tests/Verify/Verify.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Verify</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Verify.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/Wait/Wait.cs b/base/Applications/Tests/Wait/Wait.cs
new file mode 100644
index 0000000..c7ecb18
--- /dev/null
+++ b/base/Applications/Tests/Wait/Wait.cs
@@ -0,0 +1,141 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Wait.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Wait.AppMain(this);
+        }
+    }
+    
+    public class Wait
+    {
+        private static WaitHandle[]! handles;
+        private static AutoResetEvent! syncEvent1;
+        private static AutoResetEvent! syncEvent2;
+
+        public static void WaitThread()
+        {
+            Console.WriteLine("[2] Waiting for [1].");
+            syncEvent1.WaitOne();
+
+            syncEvent2.Set();
+
+            Console.WriteLine("[2] Acquiring mutex.");
+            ((!)handles[2]).WaitOne();
+
+            Console.WriteLine("[2] Releasing mutex.");
+            ((Mutex!) handles[2]).ReleaseMutex();
+
+            syncEvent2.Set();
+
+            Console.WriteLine("[2] Waiting for [1].");
+            syncEvent1.WaitOne();
+
+            Console.WriteLine("[2] Setting 0.");
+            ((AutoResetEvent!) handles[0]).Set();
+
+            Console.WriteLine("[2] Waiting for [1].");
+            syncEvent1.WaitOne();
+
+            Console.WriteLine("[2] Setting 1.");
+            ((ManualResetEvent!) handles[1]).Set();
+
+            Console.WriteLine("[2] Waiting for [1].");
+            syncEvent1.WaitOne();
+
+            Console.WriteLine("[2] Setting 0.");
+            ((AutoResetEvent!) handles[0]).Set();
+
+            Console.WriteLine("[2] Yielding.");
+
+            Console.WriteLine("[2] Setting 1.");
+            ((ManualResetEvent!) handles[1]).Set();
+
+            Console.WriteLine("[2] Done.");
+        }
+
+        //[ShellCommand("wait", "Run wait any/all test")]
+        internal static int AppMain(Parameters! config)
+        {
+            AutoResetEvent auto = new AutoResetEvent(false);
+            ManualResetEvent manual = new ManualResetEvent(false);
+            Mutex mutex = new Mutex();
+
+            handles = new WaitHandle [3] { auto, manual, mutex };
+            syncEvent1 = new AutoResetEvent(false);
+            syncEvent2 = new AutoResetEvent(false);
+
+            Thread t1 = new Thread(new ThreadStart(WaitThread));
+            t1.Start();
+
+            Console.WriteLine("[1] Waiting...");
+            int i1 = WaitHandle.WaitAny(handles);
+            Console.WriteLine("[1] Got {0}!  (Expected 2.)", i1);
+
+            syncEvent1.Set();
+
+            Console.WriteLine("[1] Waiting for [2].");
+            syncEvent2.WaitOne();
+
+            Console.WriteLine("[1] Releasing mutex.");
+            mutex.ReleaseMutex();
+
+            Console.WriteLine("[1] Waiting for [2].");
+            syncEvent2.WaitOne();
+
+            handles = new WaitHandle [2] { auto, manual };
+
+            syncEvent1.Set();
+
+            Console.WriteLine("[1] Wait any...");
+            int i2 = WaitHandle.WaitAny(handles);
+            Console.WriteLine("[1] Got {0}!  (Expected 0.)", i2);
+
+            syncEvent1.Set();
+
+            Console.WriteLine("[1] Wait any...");
+            int i3 = WaitHandle.WaitAny(handles);
+            Console.WriteLine("[1] Got {0}!  (Expected 1.)", i3);
+
+            syncEvent1.Set();
+
+            Console.WriteLine("[1] Wait all...");
+            foreach (WaitHandle! handle in handles) {
+                handle.WaitOne();
+            }
+            Console.WriteLine("[1] Got all!");
+
+            Console.WriteLine("[1] Done!");
+            return 0;
+
+        }
+    }
+}
diff --git a/base/Applications/Tests/Wait/Wait.csproj b/base/Applications/Tests/Wait/Wait.csproj
new file mode 100644
index 0000000..74c6707
--- /dev/null
+++ b/base/Applications/Tests/Wait/Wait.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Wait</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Wait.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Tests/WaitTest/WaitTest.cs b/base/Applications/Tests/WaitTest/WaitTest.cs
new file mode 100644
index 0000000..4045917
--- /dev/null
+++ b/base/Applications/Tests/WaitTest/WaitTest.cs
@@ -0,0 +1,125 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WaitTest.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using System;
+using System.Threading;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return WaitTest.AppMain(this);
+        }
+    }
+    
+    public class WaitTest
+    {
+        //[ShellCommand("waittest", "Execute demo for non-infinite waiting")]
+        internal static int AppMain(Parameters! config) {
+            Console.WriteLine("Testing float and threads.");
+            Console.Write("Still testing float and threads.");
+            Console.WriteLine();
+            TestFloat();
+            Thread t1 = new Thread(new ThreadStart(WaitThreadOne));
+            Thread t2 = new Thread(new ThreadStart(WaitThreadTwo));
+
+            t1.Start();
+            t2.Start();
+
+            Console.WriteLine("Main Thread sleeping 6 seconds for test completion");
+#if DEBUG_SLEEP
+            ulong u1 = Processor.CycleCount;
+#endif
+            Thread.Sleep(TimeSpan.FromMilliseconds(6000));
+#if DEBUG_SLEEP
+            ulong u2 = Processor.CycleCount;
+#endif
+            Console.WriteLine("Main Thread waking and exiting");
+#if DEBUG_SLEEP
+            Console.WriteLine("  u1    = {0,14}", u1);
+            Console.WriteLine("  u2    = {0,14}", u2);
+            Console.WriteLine("  u2-u1 = {0,14}", u2 - u1);
+            Console.WriteLine("  u2-u1 = {0,14} ms", ((u2 - u1) * 1000) / Processor.CyclesPerSecond);
+#endif
+
+            return 0;
+        }
+
+        public static void TestFloat()
+        {
+            ulong v;
+            float f = (float)2.0;
+            v = BitConverter.SingleToUInt32Bits((float)1.0);
+            Console.WriteLine("   1.0 {0:x16}", v);
+            v = BitConverter.SingleToUInt32Bits(f);
+            Console.WriteLine("   2.0 {0:x16}", v);
+            v = BitConverter.SingleToUInt32Bits((float)10.0);
+            Console.WriteLine("  10.0 {0:x16}", v);
+            v = BitConverter.DoubleToUInt64Bits(1.0);
+            Console.WriteLine("   1.0 {0:x16}", v);
+            v = BitConverter.DoubleToUInt64Bits(f);
+            Console.WriteLine("   2.0 {0:x16}", v);
+            v = BitConverter.DoubleToUInt64Bits(10.0);
+            Console.WriteLine("  10.0 {0:x16}", v);
+
+            if (f >= 1.0) {
+                Console.WriteLine("  f >= 1.0");
+            }
+            if (f <= 10.0) {
+                Console.WriteLine("  f <= 10.0");
+            }
+        }
+
+        public static void WaitThreadOne() {
+            Console.WriteLine("Starting Wait Thread One");
+            TestFloat();
+
+#if DONT
+            Queue q = new Queue();
+            Console.WriteLine("Queue: {0}\n", q);
+#endif
+
+            for(int i=0; i < 5; i++) {
+                Console.WriteLine("Thread One About To Sleep " + ProcessService.GetUpTime().Ticks);
+                Thread.Sleep(TimeSpan.FromMilliseconds(1000));
+                Console.WriteLine("Thread One Waking Up " + ProcessService.GetUpTime().Ticks);
+
+            }
+            Console.WriteLine("Wait Thread One Exiting");
+        }
+        public static void WaitThreadTwo() {
+            Console.WriteLine("Starting Wait Thread Two");
+            for(int i=0; i < 10; i++) {
+                Console.WriteLine("Thread Two About To Sleep " + ProcessService.GetUpTime().Ticks);
+                Thread.Sleep(TimeSpan.FromMilliseconds(30));
+                Console.WriteLine("Thread Two Waking Up " + ProcessService.GetUpTime().Ticks);
+
+            }
+            Console.WriteLine("Wait Thread Two Exiting");
+        }
+    }
+}
diff --git a/base/Applications/Tests/WaitTest/WaitTest.csproj b/base/Applications/Tests/WaitTest/WaitTest.csproj
new file mode 100644
index 0000000..210a00d
--- /dev/null
+++ b/base/Applications/Tests/WaitTest/WaitTest.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>WaitTest</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="WaitTest.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/TftpClient/TftpClient.csproj b/base/Applications/TftpClient/TftpClient.csproj
new file mode 100644
index 0000000..63c607d
--- /dev/null
+++ b/base/Applications/TftpClient/TftpClient.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+#
+# Copyright (c) Microsoft Corporation.   All rights reserved.
+#
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>tftp</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="tftp.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+</Project>
diff --git a/base/Applications/TftpClient/tftp.cs b/base/Applications/TftpClient/tftp.cs
new file mode 100644
index 0000000..80d7210
--- /dev/null
+++ b/base/Applications/TftpClient/tftp.cs
@@ -0,0 +1,424 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TftpClient.cs
+//
+//  Note:
+//
+
+using System;
+using System.Net.Sockets;
+using System.Net;
+using System.Text;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using FileSystem.Utils;
+
+namespace Microsoft.Singularity.Applications
+{
+    internal enum TftpOpcode : ushort
+    {
+        RRQ=1, WRQ=2, DATA=3, ACK=4, ERROR=5
+    };
+
+    internal struct TftpHdr
+    {
+        public TftpOpcode Opcode;
+        public ushort Arg;
+
+        public TftpHdr(byte[]! buffer, int offset)
+        {
+            Opcode = (TftpOpcode)((ushort)buffer[offset+0] << 8 | buffer[offset+1]);
+            Arg    = (ushort)((ushort)buffer[offset+2] << 8 | buffer[offset+3]);
+            //              UnMarshal(buffer, offset);
+        }
+        public void Marshal(byte[]! buffer, int offset)
+        {
+            buffer[offset+0] = (byte)((ushort)Opcode>>8 & 0xff);
+            buffer[offset+1] = (byte)((ushort)Opcode>>0 & 0xff);
+            buffer[offset+2] = (byte)(Arg>>8 & 0xff);
+            buffer[offset+3] = (byte)(Arg>>0 & 0xff);
+        }
+        public void UnMarshal(byte[]! buffer, int offset)
+        {
+            Opcode = (TftpOpcode)((ushort)buffer[offset+0] << 8 | buffer[offset+1]);
+            Arg    = (ushort)((ushort)buffer[offset+2] << 8 | buffer[offset+3]);
+        }
+    };
+
+     public class TftpClient
+    {
+        Socket! s;
+
+        public TftpClient(IPAddress! server)
+        {
+            Socket s = this.s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            IPEndPoint ep = new System.Net.IPEndPoint(server, 69);
+            Console.Write("EP= {0}\n", ep);
+            // Connect here
+            s.Connect(ep);
+        }
+
+        static int BuildRequest(byte[]! packet, TftpOpcode op, string! filename)
+        {
+            TftpHdr hdr = new TftpHdr();
+            byte[] tmp;
+
+            hdr.Opcode = op;
+            hdr.Marshal(packet, 0);
+            int off = 2;
+            tmp = Encoding.ASCII.GetBytes(filename);
+            tmp.CopyTo(packet, off);
+            off += tmp.Length;
+            packet[off++] = 0;
+            tmp = Encoding.ASCII.GetBytes("octet");
+            tmp.CopyTo(packet, off);
+            off += tmp.Length;
+            packet[off++] = 0;
+            Console.WriteLine("Done");
+            return off;
+        }
+
+        public string Get(string! filename, string localName, bool verboseMode)
+        {
+            TftpHdr hdr = new TftpHdr();
+            byte[] request;
+            byte[] reply = new byte[8192];
+            int success;
+            FileContract.Imp persistHandle = null ;
+            long curPos = 0 ;
+            int len;
+            int rc;
+
+            if (null != localName)
+            {
+                Console.WriteLine ("Creating file "+localName);
+                success = FileUtils.CreateFile(localName);
+                if (0 == success) {
+                    persistHandle = FileUtils.OpenFile(localName);
+                    if (null == persistHandle){
+                        Console.WriteLine("unable to open file " + localName);
+                        return "";
+                    }
+                }
+                else {
+                    Console.WriteLine("unable to create file " + localName);
+                    return "";
+                }
+            }
+
+            request = new byte[4 + 512];
+
+            len = BuildRequest(request, TftpOpcode.RRQ, filename);
+            bool done = false;
+            hdr.UnMarshal(request, 0);
+            rc = s.Send(request, len, SocketFlags.None);
+            if (verboseMode) Console.WriteLine("Sent RRQ rc={0}", rc);
+
+            byte []! in ExHeap buf = new[ExHeap] byte[512];
+            //string str = null;
+            int count = 0;
+            int lastBlock = -1;
+            while (!done)
+            {
+                //Socket.Select(listenList, null, null, 1000);
+                if (s.Poll(1000000, SelectMode.SelectRead))
+                {
+                    rc = s.Receive(reply);
+                    if (verboseMode) Console.WriteLine("Receive rc={0}", rc);
+                    if (rc >= 4)
+                    {
+                        TftpHdr rh = new TftpHdr(reply, 0);
+                        //Console.WriteLine("Opcode {0} Arg {1} rc={2} curPos={3}", rh.Opcode, rh.Arg, rc, curPos);
+                        if (rh.Arg == lastBlock)
+                                Console.WriteLine(" duplicate block? block ="+rh.Arg);
+                        lastBlock = rh.Arg;
+                        if (rh.Opcode == TftpOpcode.DATA)
+                        {
+                            if (!verboseMode)
+                            {
+                                Console.Write(".");
+                                if (count++ > 50)
+                                {
+                                    count = 0;
+                                    Console.Write("\n");
+                                }
+                            }
+                            else
+                            {
+                                //str = Encoding.ASCII.GetString(reply, 4, rc-4);
+                                //Console.WriteLine("pos="+curPos+" str="+str);
+                                //str = null;
+                            }
+                            if (persistHandle != null)
+                            {
+                                Bitter.FromByteArray(buf,0,rc-4,reply,4);
+                                persistHandle.SendWrite(buf,0,curPos,rc-4);
+                                switch receive
+                                {
+                                    case persistHandle.AckWrite( _buf, bytesWritten,  error) :
+                                        buf = _buf;
+                                        curPos = rh.Arg * 512;
+                                        break;
+                                    case persistHandle.ChannelClosed() :
+                                        Console.WriteLine("File handle closed. Quitting");
+                                        delete persistHandle;
+                                        return null;
+                                        break;
+                                    case unsatisfiable:
+                                        Console.WriteLine("receive is unsatisfiable. Quitting");
+                                        delete persistHandle;
+                                        return null;
+                                        break;
+                                }
+                            }
+                        }
+                        // Build new ack packet - acts as REQ for next block
+                        hdr.Opcode = TftpOpcode.ACK;
+                        hdr.Arg = rh.Arg;
+                        hdr.Marshal(request, 0);
+                        len = 4;
+                    }
+                    if (rc < 512+4) done = true;
+                }
+                else
+                {
+                    //Console.WriteLine("poll for data failed!");
+                    //return null;
+                }
+                rc = s.Send(request, len, SocketFlags.None);
+                if (verboseMode)Console.WriteLine("Sent {0} {1}  rc {2}", hdr.Opcode, hdr.Arg, rc);
+                //Thread.Sleep(1000);
+            }
+            if (persistHandle != null)
+            {
+                Console.WriteLine("Closing EP handle via delete");
+                delete persistHandle;
+            }
+            delete buf;
+            return null;
+        }
+
+        public string Put(string! filename, string localName)
+        {
+            TftpHdr hdr = new TftpHdr();
+            byte[] request;
+            byte[] reply = new byte[8192];
+            byte []! in ExHeap buf;
+            FileContract.Imp  fileHandle = null ;
+
+            int len;
+            int rc;
+            long fileLength =0;
+            NodeType nodeType; 
+            ErrorCode errorOut; 
+
+            if (null != localName)
+            {
+                DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+                bool ok  = FileUtils.GetAttributes(localName, rootNS, out fileLength, out nodeType, out  errorOut);
+                delete rootNS; 
+                
+                if (!ok)
+                {
+                    Console.WriteLine("Unable to open file ({0}) for send. reason:{1}",
+                        localName, SdsUtils.ErrorCodeToString(errorOut)
+                        );
+                    return null;
+                }
+
+                fileHandle = FileUtils.OpenFile(localName);
+                if (null == fileHandle)
+                {
+                    Console.WriteLine("Unable to open file "+localName+" for send");
+                    return null;
+                }
+            }
+            request = new byte[4 + 512];
+
+            len = BuildRequest(request, TftpOpcode.WRQ, filename);
+            int pos = 0;
+            bool done = false;
+
+            rc = s.Send(request, len, SocketFlags.None);
+            Console.WriteLine("Sent WRQ rc={0}", rc);
+
+            buf = new[ExHeap] byte[512];
+            int threshold = 20;
+            int waitCount = 0;
+            Console.WriteLine(" file size =" + fileLength);
+            while (!done)
+            {
+                //Socket.Select(listenList, null, null, 1000);
+                if (s.Poll(100000, SelectMode.SelectRead))
+                {
+                    rc = s.Receive(reply);
+                    Console.WriteLine("Receive rc={0}", rc);
+                    if (rc >= 4)
+                    {
+                        TftpHdr rh = new TftpHdr(reply, 0);
+                        Console.WriteLine("PUT: Opcode {0} Arg {1}", rh.Opcode, rh.Arg);
+
+                        if (rh.Opcode == TftpOpcode.ACK)
+                        {
+                            int datalen;
+                            int error;
+                            long bytesRead;
+                            Console.WriteLine("ACK for block {0}, pos={1}", rh.Arg,pos);
+                            waitCount = 0;
+                            if (pos >= fileLength)
+                            {
+                                Console.WriteLine(" here");
+                                bytesRead = 0;
+                            }
+                            else
+                            {
+                if (fileHandle == null)
+                    throw new Exception("fileHandle is null when I want to SendRead");
+                                fileHandle.SendRead(buf, 0, pos, 512);
+                                fileHandle.RecvAckRead(out buf, out bytesRead, out error);
+                                if (error != 0) DebugStub.Break();
+
+                                // If we get an ack we can send the next block
+                                pos = (rh.Arg+1) * 512;
+                            }
+                             // Build new DATA packet
+                            hdr.Opcode = TftpOpcode.DATA;
+                            hdr.Arg = rh.Arg;
+                            hdr.Arg++;
+                            hdr.Marshal(request, 0);
+                            datalen = Math.Min(512, (int)bytesRead);
+                            if (datalen < 512) done = true;
+                            //Encoding.ASCII.GetBytes(contents, pos, datalen, request, 4);
+                            Bitter.ToByteArray(buf,0,datalen,request,4);
+                            len = 4 + datalen;
+                        }
+                        else
+                        {
+                            Console.WriteLine("NOT AN ACK!\n");
+                            DebugStub.Break();
+                        }
+                    }
+                    rc = s.Send(request, len, SocketFlags.None);
+                    Console.WriteLine("Sent {0} {1}  rc {2}", hdr.Opcode, hdr.Arg, rc);
+                }
+                else
+                {
+                    Console.WriteLine("Waiting.");
+                    waitCount++;
+                    if (waitCount > threshold)
+                    {
+                        Console.WriteLine (" exceeded timeout threshold");
+                        done = true;
+                        break;
+                    }
+                }
+                //Thread.Sleep(1000);
+            }
+            Console.WriteLine("Done");
+            delete buf;
+            if (fileHandle != null)
+                delete fileHandle;
+            return null;
+        }
+
+        private static IPAddress GetServerAddress(string server)
+        {
+            try
+            {
+                return IPAddress.Parse(server);
+            }
+            catch
+            {}
+
+            try {
+                IPHostEntry he = Dns.GetHostByName(server);
+                return he.AddressList[0];
+            }
+            catch
+            {}
+            return null;
+        }
+
+        private static void Usage()
+        {
+            Console.WriteLine("Usage: tftpclient <server> [-i] <put|get> <getfilename> [ <putfilename> ]");
+        }
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static int Main(string[]! args)
+        {
+            bool verboseMode = false;
+            String localName, remoteName;
+            if (args.Length < 4 || args.Length > 6)
+            {
+                Usage();
+                return 1;
+            }
+
+            IPAddress server = GetServerAddress(args[1]);
+            if (server == null)
+            {
+                Console.WriteLine("Could not find server : {0}", args[1]);
+                return 2;
+            }
+
+            int pos =2;
+            if (args[pos] == "-v")
+            {
+                verboseMode = true;
+                pos++;
+            }
+
+            bool doGet;
+            switch (args[pos])
+            {
+                case "get":
+                    doGet = true;
+                    break;
+                case "put":
+                    doGet = false;
+                    break;
+                default:
+                    Usage();
+                    return -1;
+            }
+            pos++;
+            remoteName = (!)args[pos];
+            pos++;
+            localName = null;
+            if (pos >= args.Length)
+            {
+                Console.WriteLine("no destination given");
+            }
+            else
+            {
+                localName = args[pos];
+            }
+            Console.WriteLine("doGet="+doGet+" src="+remoteName+" dest="+localName);
+            TftpClient tftpClient = new TftpClient(server);
+            if (doGet)
+            {
+                string contents = tftpClient.Get(remoteName,localName,verboseMode);
+                if (verboseMode) Console.WriteLine("Contents:\n{0}", contents);
+            }
+            else
+            {
+                //put
+                tftpClient.Put(remoteName,localName);
+            }
+            return 0;
+        } // end Main
+    } // end class TftpClient
+} // end namespace Microsoft.Singularity.Shell
diff --git a/base/Applications/Transforms/AppTransforms.csproj b/base/Applications/Transforms/AppTransforms.csproj
new file mode 100644
index 0000000..be09bfa
--- /dev/null
+++ b/base/Applications/Transforms/AppTransforms.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>ConsoleTransform</AssemblyName>
+<!--    <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences> -->
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ConsoleTransform.sg" />
+    <Compile Include="WebAppTransform.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Applications/Transforms/ConsoleTransform.sg b/base/Applications/Transforms/ConsoleTransform.sg
new file mode 100644
index 0000000..61355eb
--- /dev/null
+++ b/base/Applications/Transforms/ConsoleTransform.sg
@@ -0,0 +1,167 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DriverResourceTransform.sg
+//
+//  Creates startup boilerplate code from Resource descriptions.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.V1.Services;
+using System;
+
+namespace Microsoft.Singularity.Applications{
+
+    transform ApplicationResourceTransform
+        where $EndpointType : unmanaged struct, Endpoint, ITracked
+        where $EpAttr : EndpointAttribute
+    {
+        [ConsoleCategory(*, DefaultAction=true)]
+        internal class $DefaultCategory
+        {
+            // only match, don't implement
+            internal $DefaultCategory();
+
+            internal int AppMain();
+
+            // Single entry point
+            generate public static int Main(string[] args) {
+#if SHOW_ARGS
+                if (args != null) {
+                    foreach(string arg in args) {
+                        DebugStub.WriteLine("startup argument '{0}'", __arglist(arg));
+                    }
+                }
+#endif
+                if (args == null || args.Length < 2) {
+                    $DefaultCategory config = new $DefaultCategory();
+                    return config.AppMain();
+                }
+
+                string action = args[1];
+                forall (; $Action in $$NamedCategories ;) {
+                    if ($Action.$name == action) {
+                        $Action config = new $Action();
+                        return config.AppMain();
+                    }
+                }
+                throw new Exception(String.Format("Unrecognized action {0}", action));
+            }
+        }
+
+        [ConsoleCategory(*, Action=$name)]
+        internal class $$NamedCategories {
+            // only match, don't implement
+            internal $$NamedCategories();
+
+            internal int AppMain();
+        }
+
+        [ConsoleCategory(*)]
+        internal class $$Categories {
+
+            [$EpAttr(*)]
+            TRef<$EndpointType,$State> $$endpoints;
+
+            [StringParameter(*)]
+            string $$strings;
+
+            [StringArrayParameter(*)]
+            string[] $$stringArrays;
+
+            [LongParameter(*)]
+            long $$longs;
+
+            [BoolParameter(*)]
+            bool $$bools;
+
+            //            [NotDelayed]
+            implement internal $$Categories() {
+                //DebugStub.WriteLine("ConsoleCategory action '{0}' applied", __arglist(this.GetType().ToString()));
+
+                int index;
+                ParameterCode code;
+
+                index = 0;
+                forall ( ; $s in $$strings ; ) {
+                    string stringParam;
+                    code = Process.GetStartupStringArg(index, out stringParam);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup string array {0}. code={1}", index, code));
+                    }
+                    this.$s = stringParam;
+                    //DebugStub.WriteLine("got string {0}=({1})",__arglist(index, $s));
+                    ++index;
+                }
+
+                index = 0;
+                forall ( ; $sa in $$stringArrays ; ) {
+                    string[] stringArrayParam;
+                    code = Process.GetStartupStringArrayArg(index, out stringArrayParam );
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup string {0}. code={1}", index, code));
+                    }
+                    this.$sa = stringArrayParam;
+                    //DebugStub.WriteLine("got string {0}=({1})",__arglist(index, $s));
+                    ++index;
+                }
+
+                index = 0;
+                forall ( ; $l in $$longs ; ) {
+                    long longArg;
+                    code = ProcessService.GetStartupLongArg(index, out longArg);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup integer {0}. code={1}", index, code));
+                    }
+                    this.$l = longArg;
+                    //DebugStub.WriteLine("got long {0}=({1})",__arglist(index, $l));
+                    ++index;
+                }
+
+                index = 0;
+                forall ( ; $b in $$bools ; ) {
+                    bool b;
+                    code = ProcessService.GetStartupBoolArg(index, out b);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup bool {0}. code={1}", index, code));
+                    }
+                    this.$b = b;
+                    //DebugStub.WriteLine("got bool {0}=({1})",__arglist(index, b));
+                    ++index;
+                }
+                index = 0;
+                forall ( ; $e in $$endpoints; ){
+                    if ( index == 0  || index == 1) {
+                        //DebugStub.WriteLine("transform skipping pipe at {0}",__arglist(index));
+                    }
+                    else {
+                        $e.$EndpointType* in ExHeap opt($e.$State) ep = Process.GetStartupEndpoint(index)
+                            as $e.$EndpointType* in ExHeap opt($e.$State);
+                        if (ep == null) {
+                            throw new ArgumentException(String.Format("missing startup endpoint {0}", index));
+                        }
+                        $e = new TRef<$e.$EndpointType, $e.$State> (ep);
+                        //DebugStub.WriteLine("getting endpoint at {0}",__arglist(index));
+                    }
+                    ++index;
+
+                }
+
+            }
+
+            // Category specific entry point
+            internal int AppMain();
+
+        }
+
+    }
+}
diff --git a/base/Applications/Transforms/WebAppTransform.sg b/base/Applications/Transforms/WebAppTransform.sg
new file mode 100644
index 0000000..f2de8fe
--- /dev/null
+++ b/base/Applications/Transforms/WebAppTransform.sg
@@ -0,0 +1,129 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WebAppTransform.sg
+//
+//  Creates startup boilerplate code from Resource descriptions for processes started by cassini.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.V1.Services;
+using System;
+
+namespace Microsoft.Singularity.Applications{
+
+    transform WebAppResourceTransform
+        where $EndpointType : unmanaged struct, Endpoint, ITracked
+    {
+        [Category(*)]
+        class $Arguments  {
+
+            [Endpoint(*)]
+            TRef<$EndpointType,$State> $$endpoints;
+
+            [StringParameter(_, _, _)]
+            string $$strings;
+
+            [StringArrayParameter(_, _, _)]
+            string[] $$stringArrays;
+
+            [LongParameter(_, _, _)]
+            long $$longs;
+
+            [BoolParameter(_, _, _)]
+            bool $$bools;
+
+            implement private $Arguments() {
+#if DEBUG
+                DebugStub.WriteLine("WebAppTransform applied");
+#endif
+
+                int index;
+                ParameterCode code;
+
+                index = 0;
+                forall ( ; $s in $$strings ; ) {
+                    string stringArg;
+                    code = Process.GetStartupStringArg(index, out stringArg);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup string array {0}. code={1}", index, code));
+                    }
+                    this.$s = stringArg;
+                    //DebugStub.WriteLine("got string {0}=({1})",__arglist(index, $s));
+                    ++index;
+                }
+
+                index = 0;
+                forall ( ; $sa in $$stringArrays ; ) {
+                    string[] stringArrayArg;
+                    code = Process.GetStartupStringArrayArg(index, out stringArrayArg );
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup string {0}. code={1}", index, code));
+                    }
+                    this.$sa = stringArrayArg;
+                    //DebugStub.WriteLine("got string {0}=({1})",__arglist(index, $s));
+                    ++index;
+                }
+
+                index = 0;
+                forall ( ; $l in $$longs ; ) {
+                    long longArg;
+                    code = ProcessService.GetStartupLongArg(index, out longArg);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup integer {0}. code={1}", index, code));
+                    }
+                    this.$l = longArg;
+                    //DebugStub.WriteLine("got long {0}=({1})",__arglist(index, $l));
+                    ++index;
+                }
+
+                index = 0;
+                forall ( ; $b in $$bools ; ) {
+                    bool b;
+                    code = ProcessService.GetStartupBoolArg(index, out b);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup bool {0}. code={1}", index, code));
+                    }
+                    this.$b = b;
+                    //DebugStub.WriteLine("got bool {0}=({1})",__arglist(index, b));
+                    ++index;
+                }
+                index = 0;
+                forall ( ; $e in $$endpoints; ){
+                    $e.$EndpointType* in ExHeap opt($e.$State) ep = Process.GetStartupEndpoint(index)
+                        as $e.$EndpointType* in ExHeap opt($e.$State);
+                    if (ep == null) {
+                        throw new ArgumentException(String.Format("missing startup endpoint {0}", index));
+                    }
+                    $e = new TRef<$e.$EndpointType, $e.$State> (ep);
+#if DEBUG
+                    DebugStub.WriteLine("getting endpoint at {0}",__arglist(index));
+#endif
+                    ++index;
+                }
+            }
+
+            generate public static int Main() {
+                $Arguments args = new $Arguments();
+
+                return $Application.AppMain(args);
+            }
+
+        }
+
+        class $Application {
+
+            internal static int AppMain($Arguments! args);
+
+        }
+    }
+}
diff --git a/base/Applications/TypeTest/TypeTest.cs b/base/Applications/TypeTest/TypeTest.cs
new file mode 100644
index 0000000..20c668a
--- /dev/null
+++ b/base/Applications/TypeTest/TypeTest.cs
@@ -0,0 +1,214 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TypeTest.cs
+//
+//  Note:   Simple Singularity test program.
+//
+using Microsoft.Singularity.V1.Services;
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+
+using System.Reflection;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "help", Default=false, HelpMessage="Display Extended help message.")]
+        internal bool doHelp;
+        
+        [StringParameter( "path", Position=0, Mandatory=true)]
+        internal string nsPath;
+
+        [LongParameter( "contract", Position=1, Mandatory=true)]
+        internal long contractNum;
+        
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return TypeTest.AppMain(this);
+        }
+    }
+
+    contract DummyContract : ServiceContract {
+    }
+
+    rep struct TestStruct {
+        int x;
+        int y;
+
+        public TestStruct(int a, int b) { x = a; y = b; }
+    }
+
+    public class NS : ITracked {
+        
+        DirectoryServiceContract.Imp:Ready! ns;
+
+        public NS() {
+            this.ns = DirectoryService.NewClientEndpoint();
+            base();
+        }
+
+        public ServiceContract.Exp Bind(string! path, [Claims] ServiceContract.Exp! ep) 
+        {
+            char[] in ExHeap p = Bitter.FromString2(path);
+
+            expose (this) {
+                ns.SendBind(p, ep);
+                switch receive {
+                case ns.AckBind():
+                    return null;
+
+                case ns.NakBind(reject, error):
+                    return reject;
+
+                case ns.ChannelClosed():
+                    throw new Exception("ns channel closed");
+                }
+            }
+        }
+
+        public void Dispose() {
+            delete this.ns;
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+    }
+
+    public class TypeTest
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            if (config.doHelp) {
+                Console.WriteLine("typetest <nspath> contract-num");
+                Console.WriteLine("  where contract-nums are:");
+                Console.WriteLine("  0 SoundDeviceContract");
+                Console.WriteLine("  1 DiskDeviceContract");
+                Console.WriteLine("  2 DummyContract");
+                Console.WriteLine("  3 Downcast Imp contract");
+                return 1;
+            }
+
+            int contractNum = (int) config.contractNum; 
+
+            NS ns = new NS();
+
+            string path = (!)config.nsPath;
+            Console.WriteLine("Trying to lookup {0} with contract {1}", path, contractNum);
+
+            ServiceContract.Exp reject;
+
+            switch (contractNum) {
+            case 0:
+                {
+                    Console.WriteLine("Allocating SoundDevice Channel");
+                    SoundDeviceContract.Exp! exp;
+                    SoundDeviceContract.Imp! imp;
+                    SoundDeviceContract.NewChannel(out imp, out exp);
+                    reject = ns.Bind(path, exp);
+                    delete imp;
+                    break;
+                }
+            case 1:
+                {
+                    Console.WriteLine("Allocating DiskDevice Channel");
+                    DiskDeviceContract.Exp! exp;
+                    DiskDeviceContract.Imp! imp;
+                    DiskDeviceContract.NewChannel(out imp, out exp);
+                    reject = ns.Bind(path, exp);
+                    delete imp;
+                    break;
+                }
+            case 2:
+                {
+                    Console.WriteLine("Allocating Channel");
+                    DummyContract.Exp! exp;
+                    DummyContract.Imp! imp;
+                    DummyContract.NewChannel(out imp, out exp);
+                    reject = ns.Bind(path, exp);
+                    delete imp;
+                    break;
+                }
+            case 3:
+                {
+                    Console.WriteLine("Doing Imp cast test");
+                    DummyContract.Exp! exp;
+                    DummyContract.Imp! imp;
+                    DummyContract.NewChannel(out imp, out exp);
+                    Endpoint! upcast = imp;
+
+                    DummyContract.Imp imp2 = upcast as DummyContract.Imp;
+                    if (imp2 == null) {
+                        Console.WriteLine("Downcast to Imp failed");
+                    }
+                    else {
+                        Console.WriteLine("Downcast to Imp succeeded");
+                    }
+                    DiskDeviceContract.Imp imp3 = upcast as DiskDeviceContract.Imp;
+                    if (imp3 == null) {
+                        Console.WriteLine("Downcast to bad Imp failed (GOOD)");
+                    }
+                    else {
+                        Console.WriteLine("Downcast to bad Imp succeeded (BAD)");
+                    }
+
+                    DummyContract.Exp exp4 = upcast as DummyContract.Exp;
+                    if (exp4 == null) {
+                        Console.WriteLine("Downcast to Exp failed (GOOD)");
+                    }
+                    else {
+                        Console.WriteLine("Downcast to Exp succeeded (BAD)");
+                    }
+                    delete exp;
+                    delete imp;
+                    reject = null;
+                    break;
+                    
+                }
+            default:
+                Console.WriteLine("Unsupported contract {0}", contractNum);
+                reject = null;
+                break;
+            }
+
+            if (reject == null) {
+                Console.WriteLine("Bind succeeded!");
+            }
+            else {
+                Console.WriteLine("Bind failed!");
+                delete reject;
+            }
+
+            ns.Dispose();
+
+            Console.WriteLine("TypeTest exiting.");
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/TypeTest/TypeTest.csproj b/base/Applications/TypeTest/TypeTest.csproj
new file mode 100644
index 0000000..473bf0e
--- /dev/null
+++ b/base/Applications/TypeTest/TypeTest.csproj
@@ -0,0 +1,22 @@
+<!--
+##############################################################################
+#
+# Copyright (c) Microsoft Corporation.   All rights reserved.
+#
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>TypeTest</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="TypeTest.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+</Project>
diff --git a/base/Applications/Upfgen99/upfgen99.csproj b/base/Applications/Upfgen99/upfgen99.csproj
new file mode 100644
index 0000000..5cf1946
--- /dev/null
+++ b/base/Applications/Upfgen99/upfgen99.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Upfgen99</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Upfgen99.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/Upfgen99/upfgen99.sg b/base/Applications/Upfgen99/upfgen99.sg
new file mode 100644
index 0000000..f7ed5aa
--- /dev/null
+++ b/base/Applications/Upfgen99/upfgen99.sg
@@ -0,0 +1,467 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   upfgen.sg
+//
+//  Note:
+//     Ported literally SpecWeb99 source code.
+//
+//     Strongly avoid writing programs like this.
+//
+//     This file compiles under CSC for testing on Windows and SGC
+//     on Singularity.
+
+
+using System;
+using System.IO;
+
+#if SINGULARITY
+
+using FileSystem.Utils;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using System.Text;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Generate files for Specweb. Output goes to directory/user.Personality", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter( "n", Mandatory=true, HelpMessage="Max Load")]
+        internal long maxLoad;
+  
+        [LongParameter( "t", Mandatory=true, HelpMessage="Number of Threads")]
+        internal long threads;
+
+        [StringParameter( "c", Mandatory=true,  HelpMessage="directory.")]
+        internal string directory;
+        
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            UpfGen99.AppMain(this);
+            return 0;
+        }
+    }
+
+    ///////////////////////////////////////
+    // Quick and dirty abstraction of file operations
+    //////////////////////////////////////
+
+    public class FILE
+    {
+        private TRef<FileContract.Imp:Ready>! connRef;
+        private long filePos;
+        private string! path;
+
+        public static FILE CreateFile(string! path)
+        {
+            if (FileUtils.CreateFile(path) != 0) {
+                return null;
+            }
+
+            return OpenFile(path);
+        }
+
+        public static FILE OpenFile(string! path)
+        {
+            FileContract.Imp conn = FileUtils.OpenFile(path);
+
+            if (conn != null) {
+                return new FILE(conn, path);
+            }
+            else {
+                return null;
+            }
+        }
+
+        private FILE([Claims] FileContract.Imp:Ready! conn, string! thePath)
+        {
+            connRef = new TRef<FileContract.Imp:Ready>(conn);
+            filePos = 0;
+            path = thePath;
+            base();
+        }
+
+        public int Write(string! str)
+        {
+            byte[] bytes = Encoding.ASCII.GetBytes(str);
+            return Write(bytes, 0, bytes.Length);
+        }
+
+        public int Write(byte[]! buf, int offset, int length)
+        {
+            FileContract.Imp conn = connRef.Acquire();
+            byte[]! in ExHeap bytes = Bitter.FromByteArray(buf, offset, length);
+
+            try {
+                long bytesWritten;
+                int error;
+                conn.SendWrite(bytes, 0, filePos, bytes.Length);
+                conn.RecvAckWrite(out bytes, out bytesWritten, out error);
+                delete bytes;
+                filePos += bytesWritten;
+
+                if (error != 0) {
+                    return 0;
+                }
+            }
+            finally {
+                connRef.Release(conn);
+            }
+
+            return buf.Length;
+        }
+
+        public int Read(byte[]! buf, int offset, int maxLength)
+        {
+            FileContract.Imp conn = connRef.Acquire();
+            byte[]! in ExHeap bytes = new[ExHeap] byte[maxLength];
+
+            try {
+                long bytesRead;
+                int error;
+                conn.SendRead(bytes, 0, filePos, bytes.Length);
+                conn.RecvAckRead(out bytes, out bytesRead, out error);
+
+                filePos += bytesRead;
+
+                if (error != 0) {
+                    delete bytes;
+                    return 0;
+                }
+
+                Bitter.ToByteArray(bytes, 0, maxLength, buf, offset);
+                delete bytes;
+            }
+            finally {
+                connRef.Release(conn);
+            }
+
+            return buf.Length;
+        }
+
+        public int Size
+        {
+            // TODO
+            get {
+                long size;
+                NodeType nodeType;
+                ErrorCode error; 
+
+                DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+                bool ok  = FileUtils.GetAttributes(path, rootNS, out size, out nodeType, out  error);
+                delete rootNS; 
+
+                if (!ok) {
+                    throw new Exception("Failed to get attributes");
+                } else {
+                    return unchecked((int)size);
+                }
+            }
+        }
+
+        public void Close()
+        {
+            FileContract.Imp conn = connRef.Acquire();
+
+            try {
+                conn.SendClose();
+            }
+            finally {
+                connRef.Release(conn);
+            }
+        }
+    }
+
+    #else
+namespace Microsoft.Singularity.Applications
+{
+    public class FILE
+    {
+        public static FILE CreateFile(string filename)
+        {
+            return (filename != null) ? new FILE() : null;
+        }
+
+        public void Write(string msg)
+        {
+            Console.Write(msg);
+        }
+
+        public void Close()
+        {
+        }
+    }
+
+    #endif // SINGULARITY
+
+    public class UpfGen99
+    {
+        // Constants from client.h
+        private const int CADFILE_ENTRIES = 360;
+        private const string UserFile = "User.Personality";
+
+        private static void Usage()
+        {
+            Console.WriteLine("upfgen99 -C <directory> -n maxload -t <threads>");
+            Console.WriteLine("All arguments are mandatory.");
+            Console.WriteLine("Output written to: <directory>/{0}", UserFile);
+            Console.WriteLine("NB <directory> better exist.");
+        }
+
+#if  SINGULARITY
+        internal static void AppMain(Parameters! config)
+        {
+
+            string /*!*/ directory = (!)config.directory;
+            int maxload    = (int) config.maxLoad;         // Unsigned in upfgen99.c
+            int maxthread  = (int) config.threads;         // Unsigned in upfgen99.c
+
+
+            if (maxthread <= 0) {
+                Usage();
+                return;
+            }
+
+            if (maxthread > maxload) {
+                maxload = maxthread;
+            }
+
+            string path;
+            if (directory == "") {
+                path = UserFile;
+            }
+            else if (directory[directory.Length - 1] == '/') {
+                path = directory + UserFile;
+            }
+            else {
+                path = directory + "/" + UserFile;
+            }
+
+            FILE file = FILE.CreateFile(path);
+            if (file == null) {
+                Console.WriteLine("Can't create file \"" + path + "\"");
+                return;
+            }
+
+            // Cut-and-pasted from upfgen99.c
+
+            for (int j = 0; j < maxload; j++ ) {
+                int k = ((j % CADFILE_ENTRIES) * 10000)%12301;
+                if ( k == 0) k = 12300;
+                int c4 = k        & 0xf;
+                int c3 = (k >> 4)  & 0xf;
+                int c2 = (k >> 8)  & 0xf;
+                // int c1 = (k >> 12) & 0xf; // XXX: not used
+
+                int gender =  (k) % 2;
+                if ( gender == 1 ) gender = 0x20000000;
+                else           gender = 0x10000000;
+
+                int age     = (k) % 4;
+                if ( age == 0 ) age = 0x08000000;
+                else if ( age == 1 ) age = 0x04000000;
+                else if ( age == 2 ) age = 0x02000000;
+                else if ( age == 3 ) age = 0x01000000;
+
+                int area    = (c4 + c2) % 4;
+                if ( area == 0 )      area = 0x00800000;
+                else if ( area == 1 ) area = 0x00400000;
+                else if ( area == 2 ) area = 0x00200000;
+                else if ( area == 3 ) area = 0x00100000;
+
+                int interest1 = (c4 + c3) % 10;
+                if (interest1 == 0) interest1 = 0x00080000;
+                if (interest1 == 1) interest1 = 0x00040000;
+                if (interest1 == 2) interest1 = 0x00020000;
+                if (interest1 == 3) interest1 = 0x00010000;
+                if (interest1 == 4) interest1 = 0x00008000;
+                if (interest1 == 5) interest1 = 0x00004000;
+                if (interest1 == 6) interest1 = 0x00002000;
+                if (interest1 == 7) interest1 = 0x00001000;
+                if (interest1 == 8) interest1 = 0x00000800;
+                if (interest1 == 9) interest1 = 0x00000400;
+
+                int interest2 = c4 % 10;
+                if (interest2 == 0) interest2 =      0x00000200;
+                else if (interest2 == 1) interest2 = 0x00000100;
+                else if (interest2 == 2) interest2 = 0x00000080;
+                else if (interest2 == 3) interest2 = 0x00000040;
+                else if (interest2 == 4) interest2 = 0x00000020;
+                else if (interest2 == 5) interest2 = 0x00000010;
+                else if (interest2 == 6) interest2 = 0x00000008;
+                else if (interest2 == 7) interest2 = 0x00000004;
+                else if (interest2 == 8) interest2 = 0x00000002;
+                else if (interest2 == 9) interest2 = 0x00000001;
+
+                int combined = gender | age | area | interest1 | interest2;
+
+                file.Write(String.Format("{0,5:d} {1,8:X}\n", j, combined));
+            }
+            file.Close();
+        }
+#else
+        public static void Main(string[] /*!*/ args)
+        {
+    #if SINGULARITY
+            const int ArgsStart = 1;
+    #else
+            const int ArgsStart = 0;
+    #endif
+
+            if (args == null || args.Length < (ArgsStart + 6)) {
+                Console.WriteLine("Expecting 6 arguments, got {0}.",
+                                args.Length - ArgsStart);
+                Usage();
+                return;
+            }
+
+            string /*!*/ directory = "";
+            int maxload    = 0;         // Unsigned in upfgen99.c
+            int maxthread  = 0;         // Unsigned in upfgen99.c
+            bool needHelp  = false;
+
+            int i;
+            for (i = ArgsStart; i < args.Length; i++) {
+                string /*!*/ arg = /*^ (!)^*/ args[i];
+                if (arg.Length < 2 || (arg[0] != '-' && arg[0] != '/')) {
+                    break;
+                }
+
+                if (args.Length - i >= 2) {
+                    string /*!*/ optArg = /*^ (!)^*/ args[++i];
+                    // Parameterized arguments
+                    switch (Char.ToLower(arg[1])) {
+                        case 'c':
+                            directory = optArg;
+                            break;
+                        case 'n':
+                            try {
+                                maxload = Int32.Parse(optArg);
+                            }
+                            catch (Exception) {
+                                Console.WriteLine("Invalid maxload: ", optArg);
+                                return;
+                            }
+                            break;
+                        case 't':
+                            try {
+                                maxthread = Int32.Parse(optArg);
+                            }
+                            catch (Exception) {
+                                Console.WriteLine("Invalid maxthread: ", optArg);
+                                return;
+                            }
+                            break;
+                    }
+                } else {
+                    // Flag arguments
+                    needHelp = true;
+                }
+            }
+
+            if (maxthread == 0 || needHelp == true) {
+                Usage();
+                return;
+            }
+
+            if (maxthread > maxload) {
+                maxload = maxthread;
+            }
+
+            string path;
+            if (directory == "") {
+                path = UserFile;
+            }
+            else if (directory[directory.Length - 1] == '/') {
+                path = directory + UserFile;
+            }
+            else {
+                path = directory + "/" + UserFile;
+            }
+
+            FILE file = FILE.CreateFile(path);
+            if (file == null) {
+                Console.WriteLine("Can't create file \"" + path + "\"");
+                return;
+            }
+
+            // Cut-and-pasted from upfgen99.c
+
+            for (int j = 0; j < maxload; j++ ) {
+                int k = ((j % CADFILE_ENTRIES) * 10000)%12301;
+                if ( k == 0) k = 12300;
+                int c4 = k        & 0xf;
+                int c3 = (k >> 4)  & 0xf;
+                int c2 = (k >> 8)  & 0xf;
+                // int c1 = (k >> 12) & 0xf; // XXX: not used
+
+                int gender =  (k) % 2;
+                if ( gender == 1 ) gender = 0x20000000;
+                else           gender = 0x10000000;
+
+                int age     = (k) % 4;
+                if ( age == 0 ) age = 0x08000000;
+                else if ( age == 1 ) age = 0x04000000;
+                else if ( age == 2 ) age = 0x02000000;
+                else if ( age == 3 ) age = 0x01000000;
+
+                int area    = (c4 + c2) % 4;
+                if ( area == 0 )      area = 0x00800000;
+                else if ( area == 1 ) area = 0x00400000;
+                else if ( area == 2 ) area = 0x00200000;
+                else if ( area == 3 ) area = 0x00100000;
+
+                int interest1 = (c4 + c3) % 10;
+                if (interest1 == 0) interest1 = 0x00080000;
+                if (interest1 == 1) interest1 = 0x00040000;
+                if (interest1 == 2) interest1 = 0x00020000;
+                if (interest1 == 3) interest1 = 0x00010000;
+                if (interest1 == 4) interest1 = 0x00008000;
+                if (interest1 == 5) interest1 = 0x00004000;
+                if (interest1 == 6) interest1 = 0x00002000;
+                if (interest1 == 7) interest1 = 0x00001000;
+                if (interest1 == 8) interest1 = 0x00000800;
+                if (interest1 == 9) interest1 = 0x00000400;
+
+                int interest2 = c4 % 10;
+                if (interest2 == 0) interest2 =      0x00000200;
+                else if (interest2 == 1) interest2 = 0x00000100;
+                else if (interest2 == 2) interest2 = 0x00000080;
+                else if (interest2 == 3) interest2 = 0x00000040;
+                else if (interest2 == 4) interest2 = 0x00000020;
+                else if (interest2 == 5) interest2 = 0x00000010;
+                else if (interest2 == 6) interest2 = 0x00000008;
+                else if (interest2 == 7) interest2 = 0x00000004;
+                else if (interest2 == 8) interest2 = 0x00000002;
+                else if (interest2 == 9) interest2 = 0x00000001;
+
+                int combined = gender | age | area | interest1 | interest2;
+
+                file.Write(String.Format("{0,5:d} {1,8:X}\n", j, combined));
+            }
+            file.Close();
+        }
+
+#endif
+    }
+}
diff --git a/base/Applications/WebApps/Browser/Browser.csproj b/base/Applications/WebApps/Browser/Browser.csproj
new file mode 100644
index 0000000..ea65e15
--- /dev/null
+++ b/base/Applications/WebApps/Browser/Browser.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>BrowserWebApp</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Browser.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="..\Driver\WebAppDriver.csproj" />
+    <ProjectReference Include="..\FSUtils\WebAppFSUtils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/Browser/Browser.sg b/base/Applications/WebApps/Browser/Browser.sg
new file mode 100644
index 0000000..5b01537
--- /dev/null
+++ b/base/Applications/WebApps/Browser/Browser.sg
@@ -0,0 +1,106 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Browser.sg
+//
+//  Note:   The Browser web app (serves files and supports browsing)
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Text;
+using System.Web;
+using FileSystem.Utils;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Microsoft.Singularity.WebApps
+{
+    [Category("WebApp")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<WebAppContract.Exp:Start> webAppRef;
+
+        [StringParameter( "prefix", Position=0, Default=null, HelpMessage="prefix")]
+        internal string prefix;
+
+        reflective private Parameters();
+    }
+
+    public class BrowserWebApp : IWebApp
+    {
+        private string pathPrefix = null;
+        private TRef<DirectoryServiceContract.Imp:Ready>! epNS;
+
+        public BrowserWebApp(string prefix)
+        {
+            pathPrefix = prefix;
+            epNS = new TRef<DirectoryServiceContract.Imp:Ready>(DirectoryService.NewClientEndpoint());
+        }
+
+        public void ProcessRequest(IHttpRequest! request)
+        {
+            // The Singularity WebServer uses QueryStrings to express the file to be
+            // browsed.  But Cassini uses the UriPath.  (In the Singularity WebServer,
+            // the UriPath indicates which application should service the request).
+            // Try to support both conventions:
+            string uri = request.GetQueryString();
+
+            if ((uri == null) || (uri.Length == 0)) {
+                uri = request.GetUriPath();
+                if ((uri == null) || (uri.Length == 0)) {
+                    uri = "/";
+                }
+            }
+
+            if (pathPrefix != null) {
+                uri = pathPrefix + uri;
+            }
+
+            DirectoryServiceContract.Imp:Ready! nsImp = epNS.Acquire();
+
+            try {
+                WebAppFSUtils.ServeFSPath(uri, request, nsImp);
+            }
+            finally {
+                epNS.Release(nsImp);
+            }
+        }
+
+        // ======================================================
+        // The code below gets used when this webapp is compiled
+        // to a stand-alone executable
+        internal static int AppMain(Parameters! config)
+        {
+            WebAppContract.Exp conn = (config.webAppRef).Acquire();
+            if (conn == null) {
+                // Wrong contract type!
+                return -1;
+            }
+
+            conn.SendWebAppReady();
+
+            string prefix = config.prefix;
+
+            BrowserWebApp webApp = new BrowserWebApp(prefix);
+            Driver.ServiceChannel(webApp, conn);
+            delete conn;
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/WebApps/Diagnostics/Diagnostics.sg b/base/Applications/WebApps/Diagnostics/Diagnostics.sg
new file mode 100644
index 0000000..094900a
--- /dev/null
+++ b/base/Applications/WebApps/Diagnostics/Diagnostics.sg
@@ -0,0 +1,579 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Diagnostics.sg
+//
+//  Note:   The Singularity Diagnostics web application
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using Microsoft.Singularity.PingPong.Contracts;
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+using System.Web;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Microsoft.Singularity.WebApps
+{
+    [Category("WebApp")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<WebAppContract.Exp:Start> webAppRef;
+
+#if false 
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+#endif 
+        reflective private Parameters();
+    }
+    
+    public class DiagnosticsWebApp : IWebApp
+    {
+        private TRef<ChannelContract.Imp:ReadyState> m_ChanConn;
+        private TRef<ProcessContract.Imp:ReadyState> m_ProcConn;
+        private TRef<MemoryContract.Imp:ReadyState> m_MemConn;
+        private TRef<PingContract.Imp:PendingState> m_PingConn;
+
+        private class ProcPairInfo
+        {
+            public int numChannels;
+            public int numMessages;
+        }
+
+        private Hashtable m_ProcPairInfoTable; // State from the last snapshot
+
+        public DiagnosticsWebApp()
+        {
+            ChannelContract.Imp! impChanConn;
+            ChannelContract.Exp! expChanConn;
+            ChannelContract.NewChannel(out impChanConn, out expChanConn);
+
+            ProcessContract.Imp! impProcConn;
+            ProcessContract.Exp! expProcConn;
+            ProcessContract.NewChannel(out impProcConn, out expProcConn);
+
+            MemoryContract.Imp! impMemConn;
+            MemoryContract.Exp! expMemConn;
+            MemoryContract.NewChannel(out impMemConn, out expMemConn);
+
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try
+            {
+                // Look up the general Diagnostics contract (this will go away!)
+                epNS.SendBind(Bitter.FromString2(ChannelContract.ModuleName), expChanConn);
+                switch receive
+                {
+                    case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                        delete impChanConn;
+                        delete rejectedEP;
+                        break;
+
+                    case epNS.AckBind() :
+                        impChanConn.RecvReady();
+                        m_ChanConn = new TRef<ChannelContract.Imp:ReadyState>(impChanConn);
+                        // success
+                        break;
+
+                    case epNS.ChannelClosed() :
+                        throw new Exception("epNS channel closed");
+                }
+
+                // Look up the specific diagnostic modules we need
+                epNS.SendBind(Bitter.FromString2(ProcessContract.ModuleName), expProcConn);
+
+                switch receive
+                {
+                    case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                        delete impProcConn;
+                        delete rejectedEP;
+                        break;
+
+                    case epNS.AckBind() :
+                        impProcConn.RecvReady();
+                        m_ProcConn = new TRef<ProcessContract.Imp:ReadyState>(impProcConn);
+                        // success
+                        break;
+
+                    case epNS.ChannelClosed() :
+                        throw new Exception("epNS channel closed");
+                }
+
+                epNS.SendBind(Bitter.FromString2(MemoryContract.ModuleName), expMemConn);
+
+                switch receive
+                {
+                    case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                        delete impMemConn;
+                        delete rejectedEP;
+                        break;
+
+                    case epNS.AckBind() :
+                        impMemConn.RecvReady();
+                        m_MemConn = new TRef<MemoryContract.Imp:ReadyState>(impMemConn);
+                        // success
+                        break;
+
+                    case epNS.ChannelClosed() :
+                        throw new Exception("epNS channel closed");
+                }
+            }
+            finally
+            {
+                delete epNS;
+            }
+
+            // Spawn the Ping child process so we can do simulated IPC bursts
+            PingContract.Imp! childImp;
+            PingContract.Exp! childExp;
+            PingContract.NewChannel(out childImp, out childExp);
+
+            string[] args = new string[1];
+            args[0] = "ChildPing.x86";
+            Process child = new Process(args, (Endpoint * in ExHeap)childExp);
+            child.Start();
+
+            childImp.RecvPingReady();
+            childImp.SendStartPingPong(1);
+            m_PingConn = new TRef<PingContract.Imp:PendingState>(childImp);
+        }
+
+        public void ProcessRequest(IHttpRequest! request)
+        {
+            if (m_ChanConn == null)
+            {
+                ReportInternalError(request, "No channel to the channel diagnostic module");
+            }
+            else if (m_ProcConn == null)
+            {
+                ReportInternalError(request, "No channel to the process diagnostic module");
+            }
+            else if (m_MemConn == null)
+            {
+                ReportInternalError(request, "No channel to the memory diagnostic module");
+            }
+            else if (m_PingConn == null)
+            {
+                ReportInternalError(request, "No channel to the pingpong child apps");
+            }
+            else
+            {
+                ChannelContract.Imp impChanConn = m_ChanConn.Acquire();
+                ProcessContract.Imp impProcConn = m_ProcConn.Acquire();
+                MemoryContract.Imp impMemConn = m_MemConn.Acquire();
+                PingContract.Imp impPingConn = m_PingConn.Acquire();
+
+                Console.Write("1");
+
+                try
+                {
+                    string uri = request.GetUriPath();
+
+                    if (uri.EndsWith("diagram.png"))
+                    {
+                        // Serve the image
+                        request.SendStatus(200, "OK");
+                        request.SendHeader("Content-type", "image/jpeg");
+                        request.SendBodyData(DiagnosticImage.ImageData);
+                    }
+                    else if (uri.IndexOf("pingpong") > 0)
+                    {
+                        Console.Write("2");
+
+                        string queryString = request.GetQueryString();
+                        int numReps = 10000;
+
+                        if (queryString != null)
+                        {
+                            string paramPreamble = "numreps=";
+                            int preambleIndex = queryString.IndexOf(paramPreamble);
+
+                            if (preambleIndex != -1)
+                            {
+                                int nextParamIndex = queryString.IndexOf(';', preambleIndex);
+                                string numRepsStr;
+                                int start = preambleIndex + paramPreamble.Length;
+
+                                if (nextParamIndex == -1)
+                                {
+                                    numRepsStr = queryString.Substring(start);
+                                }
+                                else
+                                {
+                                    numRepsStr = queryString.Substring(start, nextParamIndex - start);
+                                }
+
+                                numReps = Int32.Parse(numRepsStr);
+                            }
+                        }
+
+                        // Start the ping-pong exchange
+                        impPingConn.RecvDone();
+                        impPingConn.SendStartPingPong(numReps);
+
+                        // Serve the reply
+                        request.SendStatus(200, "OK");
+                        request.SendHeader("Content-type", "text/plain");
+                        request.SendBodyData(Encoding.ASCII.GetBytes("Started " + numReps + " ping-pong exchanges."));
+                    }
+                    else if (uri.IndexOf("dumpheap") > 0)
+                    {
+                        Console.Write("4");
+                        ServeHeapDump(impMemConn, request);
+                    }
+                    else
+                    {
+                        Console.Write("<");
+                        ServeMasterPage(impChanConn, impProcConn, impMemConn, request);
+                        Console.Write(">");
+                    }
+
+                }
+                catch(Exception e)
+                {
+                    ReportInternalError(request, "Caught an exception: " + e);
+                }
+                finally
+                {
+                    m_PingConn.Release(impPingConn);
+                    m_MemConn.Release(impMemConn);
+                    m_ProcConn.Release(impProcConn);
+                    m_ChanConn.Release(impChanConn);
+                }
+            }
+
+            request.Done();
+        }
+
+
+        private void ServeMasterPage(ChannelContract.Imp:ReadyState! impChanConn,
+                                     ProcessContract.Imp:ReadyState! impProcConn,
+                                     MemoryContract.Imp:ReadyState! impMemConn,
+                                     IHttpRequest! request)
+        {
+            // Serve the master page
+
+            // -----------------------------------------------
+            // First, get all our data in order.
+            long maxMemory, usedMemory, freeMemory;
+            long totalCommBlocks, totalCommBytes;
+
+            Console.Write("3");
+            impMemConn.SendGetFreeMemory();
+            Console.Write("a");
+            impMemConn.RecvMemory(out freeMemory);
+            Console.Write("b");
+            impMemConn.SendGetUsedMemory();
+            Console.Write("c");
+            impMemConn.RecvMemory(out usedMemory);
+            Console.Write("d");
+            impMemConn.SendGetMaxMemory();
+            Console.Write("e");
+            impMemConn.RecvMemory(out maxMemory);
+            Console.Write("f");
+            impMemConn.SendTotalUsedCommunicationHeap();
+            Console.Write("g");
+            impMemConn.RecvBlocksAndTotal(out totalCommBlocks, out totalCommBytes);
+            Console.Write("4");
+
+            // This structure hashes process 2-tuples to the
+            // ProcPairInfo structure. The key
+            // is "procA:procB", using the process names,
+            // with the lower-ID process on the left.
+            Hashtable procPairTable = new Hashtable();
+
+            // This table lets us look up process names
+            Hashtable procNames = new Hashtable();
+
+            // Fill in the name table
+            int[]! in ExHeap procIDs;
+            impProcConn.SendGetProcessIDs();
+            impProcConn.RecvProcessIDs(out procIDs);
+            Console.Write("5");
+
+            try
+            {
+                for (int i = 0; i < procIDs.Length; ++i)
+                {
+                    impProcConn.SendGetProcessName(procIDs[i]);
+
+                    switch receive
+                    {
+                        case impProcConn.NotFound() :
+                            // Do nothing; go to the next ID
+                            break;
+
+                        case impProcConn.ProcessName(char[]! in ExHeap procName) :
+                            // Drop the name into the table
+                            int procID = procIDs[i];
+                            string valCopy = Bitter.ToString(procName);
+                            delete procName;
+                            procNames[procID] = valCopy;
+                            break;
+
+                        case impProcConn.ChannelClosed():
+                            throw new Exception("impProcConn channel closed");
+                    }
+                }
+            }
+            finally
+            {
+                delete procIDs;
+            }
+            Console.Write("6");
+
+            // Now fill in the table of channels
+            ChannelInfo[]! in ExHeap channels;
+            impChanConn.SendGetChannels();
+            impChanConn.RecvChannels(out channels);
+            Console.Write("7");
+
+            try
+            {
+                for (int i = 0; i < channels.Length; i++)
+                {
+                    int leftProcID, rightProcID;
+                    string leftProcName, rightProcName;
+
+                    // Ignore loop channels for now
+                    if (channels[i].ImpProcessId != channels[i].ExpProcessId)
+                    {
+                        if (channels[i].ImpProcessId < channels[i].ExpProcessId)
+                        {
+                            leftProcID = channels[i].ImpProcessId;
+                            rightProcID = channels[i].ExpProcessId;
+                        }
+                        else
+                        {
+                            leftProcID = channels[i].ExpProcessId;
+                            rightProcID = channels[i].ImpProcessId;
+                        }
+
+                        leftProcName = procNames[leftProcID] as string;
+                        rightProcName = procNames[rightProcID] as string;
+
+                        if ((leftProcName != null) && (rightProcName != null))
+                        {
+                            string compoundName = leftProcName + ":" + rightProcName;
+                            ProcPairInfo pairInfo = procPairTable[compoundName] as ProcPairInfo;
+
+                            if (pairInfo == null)
+                            {
+                                pairInfo = new ProcPairInfo();
+                            }
+
+                            // Add to the list of channels between these processes
+                            pairInfo.numChannels++;
+                            pairInfo.numMessages += channels[i].MessagesDeliveredToExp + channels[i].MessagesDeliveredToImp;
+                            procPairTable[compoundName] = pairInfo;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                // This is done below, where we dump the channels; uncomment this if we get rid of that HTML.
+                //delete channels;
+            }
+            Console.Write("8");
+
+            // -----------------------------------------------
+            // Now generate the page.
+            request.SendStatus(200, "OK");
+            request.SendHeader("Content-type", "text/html");
+            request.SendHeader("charset", "utf-8");
+
+            Console.Write("9");
+
+            // Serve up the canned page preamble. This leaves us in a <script> context.
+            request.SendBodyData(MasterPage.HTMLData);
+
+            // Drop in Javascript statements to drive the dynamic portions of the page
+
+            foreach (string! pairName in procPairTable.Keys)
+            {
+                ProcPairInfo info = (ProcPairInfo!)procPairTable[pairName];
+                ProcPairInfo prevInfo = null;
+
+                if (m_ProcPairInfoTable != null) // might be first run
+                {
+                    prevInfo = m_ProcPairInfoTable[pairName] as ProcPairInfo; // might be null
+                }
+
+                int msgDelta;
+
+                if (prevInfo != null)
+                {
+                    msgDelta = info.numMessages - prevInfo.numMessages;
+                }
+                else
+                {
+                    msgDelta = info.numMessages;
+                }
+
+                // The scaling value of 3 means that 1,000 tops out the thermometer; change as
+                // appropriate!
+                double scaledValue = (msgDelta <= 0
+                                      ? 0
+                                      : 3 * (Math.Sqrt(msgDelta)));
+
+                int roundedValue = (int)scaledValue;
+
+                if (roundedValue < 80)
+                {
+                    request.SendBodyData(Encoding.ASCII.GetBytes("setThermometerValue(\"" + pairName + "\", \"" + roundedValue + "%\");\n"));
+                }
+                else
+                {
+                    request.SendBodyData(Encoding.ASCII.GetBytes("setThermometerToOverflow(\"" + pairName + "\", \"" + roundedValue + "%\");\n"));
+                }
+
+                request.SendBodyData(Encoding.ASCII.GetBytes("setThermometerLabel(\"" + pairName + "\", \"(" + info.numMessages + " / " + info.numChannels + ")\");\n"));
+            }
+
+            // Stash our new snapshot for next time
+            m_ProcPairInfoTable = procPairTable;
+
+            // Push data into the memory thermometer
+            request.SendBodyData(Encoding.ASCII.GetBytes("setThermometerValue(\"usedMemory\", \"" + ((usedMemory * 100) / freeMemory) + "%\");\n"));
+            request.SendBodyData(Encoding.ASCII.GetBytes("setThermometerLabel(\"usedMemory\", \"(" + usedMemory + " of " + maxMemory + " used, " + freeMemory + " bytes free)\");\n"));
+
+            // Don't forget to close out the <script> context
+            request.SendBodyData(Encoding.ASCII.GetBytes("</script>"));
+
+            //
+            // Preserve some of the old-style HTML tables for now...
+            //
+
+            // Send total amount of communication heap blocks and memory
+            request.SendBodyData(Encoding.ASCII.GetBytes("<hr><h1>Communication heap used</h1><table border=2>"));
+            request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>Total blocks</td><td>" + totalCommBlocks + "</td></tr>"));
+            request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>Total bytes</td><td>" + totalCommBytes + "</td></tr>"));
+
+            request.SendBodyData(Encoding.ASCII.GetBytes("</table>"));
+
+            // Dump the table of processes with their names
+            request.SendBodyData(Encoding.ASCII.GetBytes("<hr><h1>Processes</h1><table border=2>"));
+            request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>PID</td><td>Image</td></tr>"));
+            foreach (int procId in procNames.Keys)
+            {
+                string procName = (string)procNames[procId];
+                request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>" + procId + "</td><td>" + procName + "</td></tr>"));
+            }
+            request.SendBodyData(Encoding.ASCII.GetBytes("</table>"));
+
+
+            // Dump the table of channels that exist at the moment
+            request.SendBodyData(Encoding.ASCII.GetBytes("<hr><h1>Channels</h1><table border=2>"));
+            request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>CID</td><td>Exp PID</td><td>Imp PID</td><td>Exp Bytes</td><td>Imp Bytes</td></tr>"));
+
+            for (int i = 0; i < channels.Length; i++)
+            {
+                request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>"+
+                                                             channels[i].ChannelId+
+                                                             "</td><td>"+
+                                                             channels[i].ExpProcessId+
+                                                             "</td><td>"+
+                                                             channels[i].ImpProcessId+
+                                                             "</td><td>"+
+                                                             channels[i].MessagesDeliveredToExp+
+                                                             "</td><td>"+
+                                                             channels[i].MessagesDeliveredToImp+
+                                                             "</td></tr>"));
+            }
+
+            // Don't forget this...
+            delete channels;
+
+            request.SendBodyData(Encoding.ASCII.GetBytes("</table></body></html>"));
+        }
+
+        private void ServeHeapDump(MemoryContract.Imp:ReadyState! impMemConn,
+                                   IHttpRequest! request)
+        {
+            request.SendStatus(200, "OK");
+            request.SendHeader("Content-type", "text/html");
+            request.SendHeader("charset", "utf-8");
+
+            request.SendBodyData(Encoding.ASCII.GetBytes("<html><head><title>ExHeap dump</title></head><body><h1>ExHeap Dump</h1><table border=2><tr><td>Ptr</td><td>PID</td><td>Type</td><td>Size</td></tr>"));
+
+            Hashtable procCounts = new Hashtable();
+            MemoryContract.BlockInfo[]! in ExHeap dump;
+
+            impMemConn.SendDumpExHeap();
+            impMemConn.RecvExHeapDump(out dump);
+
+            for (int i = 0; i < dump.Length; i++)
+            {
+                string text = String.Format("<tr><td>{0:x}</td><td>{1}</td><td>{2:x}</td><td>{3}</td></tr>", dump[i].ptrVal, dump[i].ownerProcID, dump[i].type, dump[i].size);
+                request.SendBodyData(Encoding.ASCII.GetBytes(text));
+                object count = procCounts[dump[i].ownerProcID];
+
+                if (count == null)
+                {
+                    procCounts[dump[i].ownerProcID] = 1;
+                }
+                else
+                {
+                    procCounts[dump[i].ownerProcID] = ((int)count) + 1;
+                }
+            }
+
+            delete dump;
+
+            request.SendBodyData(Encoding.ASCII.GetBytes("</table><hr><h1>Totals by ProcID</h1><table border=2><tr><td>ProcID</td><td>Total Blocks</td></tr>"));
+
+            foreach (DictionaryEntry entry in procCounts)
+            {
+                request.SendBodyData(Encoding.ASCII.GetBytes("<tr><td>" + entry.Key + "</td><td>" + entry.Value + "</td></tr>"));
+            }
+
+            request.SendBodyData(Encoding.ASCII.GetBytes("</table></body></html>"));
+        }
+
+        // ======================================================
+        // The code below gets used when this webapp is compiled
+        // to a stand-alone executable
+        internal static int AppMain(Parameters! config)
+        {
+            //Endpoint * in ExHeap ep = Process.GetStartupEndpoint(0);
+            WebAppContract.Exp conn = (config.webAppRef).Acquire();
+            if (conn == null) {
+                // Wrong contract type!
+                return -1;
+            }
+
+            conn.SendWebAppReady();
+            DiagnosticsWebApp webApp = new DiagnosticsWebApp();
+            Driver.ServiceChannel(webApp, conn);
+            delete conn;
+            return 0;
+        }
+
+        private void ReportInternalError(IHttpRequest! request, string! description)
+        {
+            request.SendStatus(500, "Internal Error");
+            request.SendHeader("Content-type", "text/plain");
+            request.SendHeader("charset", "utf-8");
+            request.SendBodyData(Encoding.ASCII.GetBytes(description));
+        }
+
+    }
+}
diff --git a/base/Applications/WebApps/Diagnostics/DiagnosticsWebApp.csproj b/base/Applications/WebApps/Diagnostics/DiagnosticsWebApp.csproj
new file mode 100644
index 0000000..6593ced
--- /dev/null
+++ b/base/Applications/WebApps/Diagnostics/DiagnosticsWebApp.csproj
@@ -0,0 +1,44 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>DiagnosticsWebApp</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Diagnostics.sg" />
+    
+    <BinaryResource Include="diagram.png">
+      <ClassName>DiagnosticImage</ClassName>
+      <Namespace>Microsoft.Singularity.WebApps</Namespace>
+      <FieldName>ImageData</FieldName>
+    </BinaryResource>
+    
+    <BinaryResource Include="MasterPage.htm">
+      <ClassName>MasterPage</ClassName>
+      <Namespace>Microsoft.Singularity.WebApps</Namespace>
+      <FieldName>HTMLData</FieldName>
+    </BinaryResource>
+    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="..\Driver\WebAppDriver.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/Diagnostics/MasterPage.htm b/base/Applications/WebApps/Diagnostics/MasterPage.htm
new file mode 100644
index 0000000..476540a
--- /dev/null
+++ b/base/Applications/WebApps/Diagnostics/MasterPage.htm
@@ -0,0 +1,161 @@
+<html>
+<head>
+<title>Singularity Diagnostics</title>
+
+<style type="text/css">
+div.smallThermometer
+{
+  border: 1px dashed #808080;
+  background-color: white; // Color of the thermometer background
+  font-size: 1pt;
+}
+
+div.smallThermometerInner
+{
+  background-color: green; // Color of the inner "mercury"
+}
+
+div.smallThermometerOverflow
+{
+  border: 1px inset black;
+  background-color: yellow; // Color of the thermometer background
+  font-size: 1pt;
+}
+
+div.smallThermometerInnerOverflow
+{
+  background-color: red; // Color of the inner "mercury"
+}
+
+span.smallThermometer
+{
+  font-size: 8pt;
+}
+
+div.largeThermometer
+{
+  border: 3px ridge #a0a0a0;
+  background-color: green; // Color of the thermometer background
+  font-size: 1pt;
+}
+
+div.largeThermometerInner
+{
+  background-color: red; // Color of the inner "mercury"
+  border: 1px inset black
+}
+
+span.largeThermometer
+{
+  font-size: 12pt;
+}
+
+</style>
+
+<script  language="JavaScript">
+function getThermometerHtml(className, name, position, xpos, ypos, width, height)
+{
+  return "<div class=\"" + className + "Enclose\" style=\"" +
+    "position:" + position +
+    "; top:" + ypos +
+    "; left:" + xpos +
+    "\">" +
+      "<div id=\"" + name + "\" class=\"" + className + "\" style=\"" +
+      "position:relative; left:0px; top:0px;font-size: 1pt;" +
+      " HEIGHT:" + height +
+      "; WIDTH:" + width +
+      "\">" +
+          "<div id=\"innerrect\" class =\"" + className + "Inner\" " +
+          "style=\"position:relative; left:0px; top:0px; width:0%; height:100%\"></div>" +
+      "</div>" +
+    "<span class =\"" + className + "\" id=\"" + name + "Label\"></span></div>";
+}
+
+function setThermometerToOverflow(name, percentage)
+{
+  try
+  {
+    setThermometerValue(name, percentage);
+    document.all[name].className = document.all[name].className + "Overflow";
+    document.all[name].all["innerrect"].className = document.all[name].all["innerrect"].className + "Overflow";
+  }
+  catch(e)
+  {
+    // Ignore all exceptions in case the requested thermometer doesn't exist!
+  }
+}
+
+function setThermometerValue(name, percentage)
+{
+  try
+  {
+    document.all[name].all["innerrect"].style.width = percentage;
+  }
+  catch(e)
+  {
+    // Ignore all exceptions in case the requested thermometer doesn't exist!
+  }
+}
+
+function setThermometerLabel(name, text)
+{
+  try
+  {
+    document.all[name + "Label"].innerHTML = text;
+  }
+  catch(e)
+  {
+    // Ignore all exceptions in case the requested thermometer doesn't exist!
+  }
+}
+
+</script>
+
+<body">
+<META HTTP-EQUIV="REFRESH" CONTENT="5">
+
+<h1>IPC State</h1>
+<div style="position:relative">
+<img src="diagram.png">
+
+<script>
+/*
+ *
+ * HERE IS THE LIST OF ALL THE THERMOMETER WIDGETS THAT OVERLAP THE DIAGRAM!!
+ * All the coordinates are relative to the origin of the diagram image.
+ *
+ */
+document.writeln(getThermometerHtml("smallThermometer", "kernel:legacykeyboard.x86", "absolute", "40px", "70px", "50px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "kernel:shell.x86", "absolute", "155px", "70px", "50px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "kernel:cassini.x86", "absolute", "270px", "70px", "50px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "kernel:diagnosticswebapp.x86", "absolute", "380px", "70px", "50px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "childping.x86:childpong.x86", "absolute", "495px", "70px", "50px", "10px"));
+
+document.writeln(getThermometerHtml("smallThermometer", "kernel:volmgr.x86", "absolute", "40px", "185px", "50px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "kernel:sb16.x86", "absolute", "270px", "185px", "50px", "10px"));
+
+document.writeln(getThermometerHtml("smallThermometer", "legacykeyboard.x86:shell.x86", "absolute", "65px", "-10px", "40px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "shell.x86:cassini.x86", "absolute", "180px", "-10px", "40px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "cassini.x86:diagnosticswebapp.x86", "absolute", "295px", "-10px", "40px", "10px"));
+document.writeln(getThermometerHtml("smallThermometer", "diagnosticswebapp.x86:childping.x86", "absolute", "410px", "-10px", "40px", "10px"));
+
+</script>
+</div>
+
+<hr>
+
+<h1>Memory State</h1>
+
+<script>
+// The xpos and ypos args don't matter for a thermometer with "static" (normal-flow) positioning.
+document.writeln(getThermometerHtml("largeThermometer", "usedMemory", "static", 0, 0, "200px", "25px"));
+</script>
+
+<span id="memoryText">
+</span>
+
+<script>
+/*
+ * HERE IS WHERE DYNAMICALLY GENERATED STATEMENTS FOR POKING THE THERMOMETER
+ * VALUES GO!! The web application generates content from here on down.
+ */
diff --git a/base/Applications/WebApps/Diagnostics/diagram.png b/base/Applications/WebApps/Diagnostics/diagram.png
new file mode 100644
index 0000000..063d452
Binary files /dev/null and b/base/Applications/WebApps/Diagnostics/diagram.png differ
diff --git a/base/Applications/WebApps/Diagnostics/diagram.vsd b/base/Applications/WebApps/Diagnostics/diagram.vsd
new file mode 100644
index 0000000..3444e49
Binary files /dev/null and b/base/Applications/WebApps/Diagnostics/diagram.vsd differ
diff --git a/base/Applications/WebApps/Driver/Driver.sg b/base/Applications/WebApps/Driver/Driver.sg
new file mode 100644
index 0000000..df4a7b7
--- /dev/null
+++ b/base/Applications/WebApps/Driver/Driver.sg
@@ -0,0 +1,84 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Driver.sg
+//
+//  Note:   The common driver-code for web apps that are compiled to standalone
+//          executables
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Web;
+using System.Threading;
+
+namespace Microsoft.Singularity.WebApps
+{
+    public class Driver
+    {
+#if THREAD_POOL
+        private const int workerThreads = 16;
+        private const int maxWorkItems = workerThreads * 128;
+#endif
+
+        internal class ThreadHelper
+        {
+            private IHttpRequest! m_Request;
+            private IWebApp! m_WebApp;
+
+            public ThreadHelper(IWebApp! webApp, IHttpRequest! request)
+            {
+                m_Request = request;
+                m_WebApp = webApp;
+            }
+
+            public void Run()
+            {
+                m_WebApp.ProcessRequest(m_Request);
+            }
+        }
+
+        public static void ServiceChannel(IWebApp! webApp, WebAppContract.Exp:ProcessingState! conn)
+        {
+#if THREAD_POOL
+            WebAppsThreadPool threadPool =
+                new WebAppsThreadPool(workerThreads, maxWorkItems);
+#endif
+
+            while (true)
+            {
+                switch receive
+                {
+                    case conn.Process(HttpRequestContract.Imp:Start! newConn) :
+                    {
+                        // Wrap the new connection
+                        RemoteHttpRequest request = new RemoteHttpRequest(newConn);
+                        ThreadHelper threadHelper = new ThreadHelper(webApp, request);
+
+                        // Service the request on a new thread
+#if THREAD_POOL
+                        threadPool.QueueUserWorkItem(
+                            new ThreadStart(threadHelper.Run));
+#else
+                        Thread newThread = new Thread(new ThreadStart(threadHelper.Run));
+                        newThread.Start();
+#endif
+
+                        // Ack
+                        conn.SendOK();
+                    }
+                    break;
+                    case conn.ChannelClosed():
+                        return;
+                }
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebApps/Driver/WebAppDriver.csproj b/base/Applications/WebApps/Driver/WebAppDriver.csproj
new file mode 100644
index 0000000..9e31692
--- /dev/null
+++ b/base/Applications/WebApps/Driver/WebAppDriver.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>WebAppDriver</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Driver.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/Driver/WebAppsThreadPool.sg b/base/Applications/WebApps/Driver/WebAppsThreadPool.sg
new file mode 100644
index 0000000..2f2cff0
--- /dev/null
+++ b/base/Applications/WebApps/Driver/WebAppsThreadPool.sg
@@ -0,0 +1,118 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WebAppsThreadPool.sg
+//
+//  Note: adapted from CassiniThreadPool.sg
+//
+
+#if THREAD_POOL
+
+using System.Collections;
+using System.Threading;
+
+namespace Microsoft.Singularity.WebApps
+{
+    /// <remarks>This class implements a non-Singleton
+    /// threadpool and has a configurable work queue
+    /// size. </remarks>
+    internal sealed class WebAppsThreadPool
+    {
+        object!                           monitor;
+        Queue!                            commands; // Queue of ThreadStart
+        int                               queuedItems;
+        readonly int                      maxQueuedItems;
+        volatile int                      threadCount;
+        volatile bool                     shutdown;
+        ManualResetEvent!                 shutdownEvent;
+
+        [Microsoft.Contracts.NotDelayed]
+        internal WebAppsThreadPool(int maxThreads, int maxQueuedItems)
+            requires maxThreads > 0;
+            requires maxQueuedItems > 0;
+            requires maxThreads <= maxQueuedItems;
+        {
+            this.monitor          = new object();
+            this.commands         = new Queue();
+            this.queuedItems      = 0;
+            this.maxQueuedItems   = maxQueuedItems;
+            this.threadCount      = maxThreads;
+            this.shutdown         = false;
+            this.shutdownEvent    = new ManualResetEvent(false);
+
+            base();
+
+            for (int i = 0; i < maxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(WorkerMain));
+                t.Start();
+            }
+        }
+
+        /// <summary> Queues call to constructor supplied
+        /// delegate with user supplied object.  This method
+        /// blocks if maximum queue size is reached.  </summary>
+        internal void QueueUserWorkItem(ThreadStart! command)
+        {
+            Monitor.Enter(this.monitor);
+            while (this.queuedItems == this.maxQueuedItems) {
+                Monitor.Wait(this.monitor);
+            }
+            commands.Enqueue(command);
+            this.queuedItems++;
+            Monitor.Pulse(this.monitor);
+            Monitor.Exit(this.monitor);
+        }
+
+        private void WorkerMain()
+        {
+            while (true) {
+                ThreadStart command;
+                lock (this.monitor) {
+                    while (queuedItems == 0 && !shutdown) {
+                        Monitor.Wait(this.monitor);
+                    }
+
+                    if (queuedItems == 0 && shutdown) {
+                        break;
+                    }
+
+                    command = (ThreadStart) (commands.Dequeue());
+                    assert(command != null);
+
+                    if (this.queuedItems-- == this.maxQueuedItems) {
+                        Monitor.Pulse(this.monitor);
+                    }
+                }
+                command();
+            }
+
+            lock (this.monitor) {
+                if (--this.threadCount == 0) {
+                    shutdownEvent.Set();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Shutdown thread pool instance.  Caller blocks until
+        /// the threads in the pool have finished outstanding
+        /// work items.
+        /// </summary>
+        internal void Shutdown()
+        {
+            lock (this.monitor) {
+                shutdown = true;
+                Monitor.PulseAll(this.monitor);
+            }
+
+            shutdownEvent.WaitOne();
+
+            Microsoft.Singularity.DebugStub.Assert(commands.Count == 0);
+        }
+    }
+}
+
+#endif // THREAD_POOL
diff --git a/base/Applications/WebApps/FSUtils/WebAppFSUtils.csproj b/base/Applications/WebApps/FSUtils/WebAppFSUtils.csproj
new file mode 100644
index 0000000..2e09235
--- /dev/null
+++ b/base/Applications/WebApps/FSUtils/WebAppFSUtils.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>WebAppFSUtils</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="WebAppFSUtils.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/FSUtils/WebAppFSUtils.sg b/base/Applications/WebApps/FSUtils/WebAppFSUtils.sg
new file mode 100644
index 0000000..bfc6c80
--- /dev/null
+++ b/base/Applications/WebApps/FSUtils/WebAppFSUtils.sg
@@ -0,0 +1,294 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WebAppFSUtils.sg
+//
+//  Note:   File system operations for general use by webapps
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Text;
+using System.Web;
+using FileSystem.Utils;
+
+namespace Microsoft.Singularity.WebApps
+{
+    public class WebAppFSUtils
+    {
+        private const string NoSuchPathPreamble =
+        "<html><head><title>No such path</title></head><body><h1 align=\"center\">No such path as \"";
+        private const string NoSuchPathPostamble = "\"</h1></body></html>";
+
+        private const string PathIsFilePreamble =
+        "<html><head><title>Path is file</title></head><body><h1 align=\"center\">Path \"";
+        private const string PathIsFilePostamble = "\" is a file</h1></body></html>";
+
+        private const string DirListingPreamble =
+        "<html><head><title>Directory Listing</title></head><body><h1>Directory Listing</h1>";
+        private const string DirListingPostamble = "</body></html>";
+
+        private const string NSListingPreamble =
+        "<html><head><title>Directory Listing</title></head><body><h1>Directory Listing</h1>";
+        private const string NSListingPostamble = "</body></html>";
+
+        private const string ErrorPreamble =
+        "<html><head><title>Error</title></head><body>";
+
+        private const string ErrorPostamble = "</body></html>";
+
+        public static void ServeFSPath(string! path, IHttpRequest! request,
+                                       DirectoryServiceContract.Imp:Ready! nsImp)
+        {
+            ulong startCycles, endCycles;
+
+            startCycles = Processor.CycleCount;
+            // First check if this is a file
+            FileContract.Imp:Ready fileChan = FileUtils.OpenFile(path, nsImp);
+            endCycles = Processor.CycleCount;
+
+            if ((endCycles - startCycles) > (ulong)((ulong)Processor.CyclesPerSecond / (ulong)5000)) {
+                //DebugStub.WriteLine("Slow file open");
+            }
+
+            if (fileChan != null) {
+                startCycles = Processor.CycleCount;
+                ServeFile(fileChan, request);
+                delete fileChan;
+                endCycles = Processor.CycleCount;
+
+                if ((endCycles - startCycles) > (ulong)((ulong)Processor.CyclesPerSecond / (ulong)5000)) {
+                    //DebugStub.WriteLine("Slow file read");
+                }
+                return;
+            }
+
+
+            // Fallback: can this path be enumerated via the namespace?
+            if (IsValidNSPath(path, nsImp)) {
+                ServeNSListing(path, request, nsImp);
+            }
+            else {
+                // OK, we give up
+                request.SendStatus(404, "Not Found");
+                request.SendHeader("Content-type", "text/html");
+                request.SendBodyData(Encoding.ASCII.GetBytes(NoSuchPathPreamble));
+                request.SendBodyData(Encoding.ASCII.GetBytes(path));
+                request.SendBodyData(Encoding.ASCII.GetBytes(NoSuchPathPostamble));
+                request.Done();
+            }
+        }
+
+        public static void ServeFile(FileContract.Imp:Ready! fileImp, IHttpRequest! request)
+        {
+            request.SendStatus(200, "OK");
+            TransmitFileContents(fileImp, request);
+            request.Done();
+        }
+
+        public static void TransmitFileContents(FileContract.Imp:Ready! fileImp, IHttpRequest! request)
+        {
+            long readSize = 1024 * 64;
+            long readOffset = 0;
+            bool keepReading = true;
+
+            do {
+                byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                fileImp.SendRead(buf, 0, readOffset, readSize);
+
+                switch receive {
+                    case fileImp.AckRead( _buf, long bytesRead, int error) :
+                        if ((error != 0) || (_buf == null)) {
+                            if (_buf != null)
+                            { delete _buf; }
+
+                            keepReading = false;
+                        }
+                        else {
+                            byte[]! in ExHeap original = _buf;
+
+                            if (bytesRead > 0) {
+                                if (bytesRead < readSize) {
+                                    // We must be at the end of the file; the FS only
+                                    // filled in part of our supplied block.
+                                    // Discard the remainder of the block.
+                                    byte[]! in ExHeap remainder = Bitter.SplitOff(ref original, (int)bytesRead);
+                                    delete remainder;
+                                }
+
+                                request.SendBodyData(original);
+                                readOffset += bytesRead;
+                            } else {
+                                // By coincidence, our previous read took us to
+                                // exactly the end of the file. We should
+                                // optimize this away somehow
+                                delete original;
+                            }
+
+                            if (bytesRead < readSize) {
+                                // We're at the end
+                                keepReading = false;
+                            }
+                        }
+                        break;
+
+                    case fileImp.ChannelClosed() :
+                        keepReading = false;
+                        break;
+                }
+            } while(keepReading);
+        }
+
+        public static void ServeNSListing(string! path, IHttpRequest! request,
+                                          DirectoryServiceContract.Imp:Ready! nsImp)
+        {
+            ArrayList! listing;
+            ErrorCode errorOut;
+            long length;
+            NodeType nodeType;
+            bool ok;
+
+            int rc = GetNSListing(path, nsImp, out listing);
+
+            if (rc != 0) {
+                request.SendStatus(500, "Error code " + rc + " while generating listing");
+                request.SendHeader("Content-type", "text/html");
+                request.SendBodyData(Encoding.ASCII.GetBytes(ErrorPreamble));
+                request.SendBodyData(Encoding.ASCII.GetBytes("Error code " + rc + " while generating listing"));
+                request.SendBodyData(Encoding.ASCII.GetBytes(ErrorPostamble));
+                request.Done();
+            }
+            else {
+                request.SendStatus(200, "OK");
+                request.SendHeader("Content-type", "text/html");
+                request.SendBodyData(Encoding.ASCII.GetBytes(NSListingPreamble));
+
+                request.SendBodyData(Encoding.ASCII.GetBytes("<b> Listing for \"" + path + "\":</b><p>"));
+
+                foreach(string! subPath in listing) {
+                    string name;
+                    if (path == "/") name = subPath;
+                    else  name = path + "/" +subPath;
+                    ok = SdsUtils.GetAttributes(name, nsImp, out length, out nodeType, out errorOut);
+                    if (!ok) {
+                        // No hyperlink
+                        request.SendBodyData(Encoding.ASCII.GetBytes(subPath + "(ERROR)<br/>"));
+                    }
+                    else  {
+                        if (nodeType == NodeType.File) {
+                            // Hyperlink + file info
+                            request.SendBodyData(Encoding.ASCII.GetBytes(
+                                                        GetNodeTypeString(nodeType) +
+                                                        "<a href=\"" + name + "\">" + subPath + "</a> " +
+                                                         " (" + length + ")<br/>"));
+                        }
+                        else   { // if (nodeType == NodeType.Directory) {
+                                // Hyperlink + directory info
+                                request.SendBodyData(Encoding.ASCII.GetBytes(
+                                                            GetNodeTypeString(nodeType) +
+                                                            "<a href=\"" + name + "\">[" + subPath + "]</a>"
+                                                            + "<br/>"));
+                        }
+                    }
+                }
+
+                request.SendBodyData(Encoding.ASCII.GetBytes("</p>" + NSListingPostamble));
+                request.Done();
+            }
+        }
+
+        private static string GetNodeTypeString(NodeType nodeType)
+        {
+            const string startVal = "(";
+            const string endVal = ")";
+            string retval = startVal;
+
+                switch (nodeType) {
+                    case NodeType.File:
+                        retval += "N";
+                        break;
+                    case NodeType.Directory:
+                        retval += "D";
+                        break;
+                    case NodeType.SymLink:
+                        retval += "L";
+                        break;
+                    case NodeType.ServiceProvider:
+                        retval += "S";
+                        break;
+                    case NodeType.IoMemory:
+                        retval += "I";
+                        break;
+                    case NodeType.BadNode:
+                        retval += "BAD";
+                        break;
+                }
+
+            if (retval.Equals(startVal)) {
+                return String.Empty;
+            }
+            else {
+                return retval + endVal;
+            }
+        }
+
+        private static bool IsValidNSPath(string! path, DirectoryServiceContract.Imp:Ready! nsImp)
+        {
+            NodeType nodeType;
+            long size;
+            ErrorCode error;
+
+            return FileUtils.GetAttributes(path, nsImp, out size, out nodeType, out  error);
+        }
+
+
+        // Returns 0 on success; if return val != 0, outparam is null
+        private static int GetNSListing(string! path, DirectoryServiceContract.Imp:Ready! nsImp,
+                                        out ArrayList! listing)
+        {
+            listing = new ArrayList();
+            ErrorCode errorOut;
+
+            DirectoryServiceContract.Imp! dirImp;
+            DirectoryServiceContract.Exp! dirExp;
+            DirectoryServiceContract.NewChannel(out dirImp, out dirExp);
+
+            bool ok  =  SdsUtils.Bind(path, nsImp, dirExp, out errorOut);
+            if (!ok) {
+                delete dirImp;
+                return -1;  //unable to bind to requested dir
+            }
+            dirImp.RecvSuccess();
+
+            EnumerationRecords[] in ExHeap responses =
+                SdsUtils.EnumerateDirectory (dirImp, out errorOut);
+
+            delete dirImp;
+            if (null == responses) {
+                return -1;
+            }
+            else {
+                for (int i=0; i < responses.Length; i++){
+                    string name;
+                    expose (responses[i]) {
+                        name = Bitter.ToString2(responses[i].Path);
+                        listing.Add(name);
+                    }
+                    Console.WriteLine(name);
+                }
+                delete responses;
+                return 0;
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebApps/Hello/Hello.sg b/base/Applications/WebApps/Hello/Hello.sg
new file mode 100644
index 0000000..0f5f3c5
--- /dev/null
+++ b/base/Applications/WebApps/Hello/Hello.sg
@@ -0,0 +1,68 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Hello.sg
+//
+//  Note:   The Hello World web application
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Text;
+using System.Web;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Microsoft.Singularity.WebApps
+{
+    [Category("WebApp")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<WebAppContract.Exp:Start> webAppRef;
+
+        reflective private Parameters();
+    }
+
+    public class HelloWebApp : IWebApp
+    {
+        public void ProcessRequest(IHttpRequest! request)
+        {
+            request.SendStatus(200, "OK");
+            request.SendHeader("Content-type", "text/html");
+            request.SendHeader("charset", "utf-8");
+            string html = "<html><head>Placeholder</head><body><h1>Hello, World</h1></body></html>";
+            request.SendBodyData(Encoding.ASCII.GetBytes(html));
+            request.Done();
+        }
+
+        // ======================================================
+        // The code below gets used when this webapp is compiled
+        // to a stand-alone executable
+        internal static int AppMain(Parameters! config)
+        {
+            WebAppContract.Exp conn = (config.webAppRef).Acquire(); 
+            if (conn == null) {
+                // Wrong contract type!
+                return -1;
+            }
+
+            conn.SendWebAppReady();
+            HelloWebApp webApp = new HelloWebApp();
+            Driver.ServiceChannel(webApp, conn);
+            delete conn;
+            return 0; 
+        }
+    }
+}
diff --git a/base/Applications/WebApps/Hello/HelloWebApp.csproj b/base/Applications/WebApps/Hello/HelloWebApp.csproj
new file mode 100644
index 0000000..a88d728
--- /dev/null
+++ b/base/Applications/WebApps/Hello/HelloWebApp.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>HelloWebApp</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Hello.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="..\Driver\WebAppDriver.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/SPECweb99/CachedFile.sg b/base/Applications/WebApps/SPECweb99/CachedFile.sg
new file mode 100644
index 0000000..d25ab1c
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/CachedFile.sg
@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CachedFile.sg
+//
+//  Note: CachedFile is intended to hold copies of Custom.Ads
+//  and User.Profiles in memory.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Io;
+using System.Text;
+using System.Threading;
+using System.Web;
+using FileSystem.Utils;
+using System.Net.IP;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.WebApps
+{
+    public class CachedFile
+    {
+        string  filename;
+        byte[]  filedata;
+        uint    fileMaxBytes;
+
+        internal CachedFile(string! theFilename, uint maxBytes)
+        {
+            this.filename      = theFilename;
+            this.fileMaxBytes  = maxBytes;
+        }
+
+        public bool Refresh()
+        {
+            lock (this) {
+                FileContract.Imp conn;
+                conn = FileUtils.OpenFile(filename);
+
+                if (conn == null) {
+                    Console.WriteLine("CachedFile: Failed to open {0}", filename);
+                    return false;
+                }
+
+                try {
+                    byte[]! in ExHeap bytes = new [ExHeap] byte [fileMaxBytes];
+                    long bytesRead;
+                    int  error;
+                    conn.SendRead(bytes,
+                                  /* buffer offset */0,
+                                  /* file offset */0,
+                                  bytes.Length);
+                    conn.RecvAckRead(out bytes, out bytesRead, out error);
+
+                    if (error != 0) {
+                        delete bytes;
+                        return false;
+                    }
+
+                    filedata = Bitter.ToByteArray(bytes);
+                    delete bytes;
+                    return true;
+                }
+                finally {
+                    delete conn;
+                }
+            }
+        }
+
+        // Caller should not hold onto this outside of method of use.
+        // "borrows"
+        public byte[] FileData
+        {
+            get { lock (this) { return filedata; } }
+        }
+    }
+}
diff --git a/base/Applications/WebApps/SPECweb99/README.txt b/base/Applications/WebApps/SPECweb99/README.txt
new file mode 100644
index 0000000..be4295e
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/README.txt
@@ -0,0 +1,47 @@
+From: Mark Aiken
+Sent: Sunday, October 16, 2005 4:19 PM
+To: Chris Hawblitzel
+Subject: Running SPECweb
+
+Here is how to run SPECweb:
+
+Build:
+- Applications\Wafgen99
+- Applications\Network
+- Applications\WebApps
+- Applications\Cassini
+- Distro
+
+On Windows:
+Run \\maiken\pub\SPECweb99.exe. Install as "prime client"
+Copy the rc.sing file into "c:\SPECweb99"
+Edit the attached file to point to your Singularity machine
+(you will need to get a DHCP lease as described below, first.
+The DHCP server should give you the same address on subsequent runs)
+Run "c:\SPECweb99\client -Z"
+Separately:
+- "cd c:\SPECweb99"
+- "shrc"
+- "specperl manager rc.sing"
+
+
+On Singularity:
+
+First run:
+- "mkfs /dev/vol0.2"
+- "fsmount /dev/vol0.2 /fs -n"
+- "wafgen99 -v 10 /fs" [Generates lots of files]
+- "fsunmount"
+- reboot to clear the log
+
+Notes:
+- Use /dev/diskN instead of /dev/vol0.N if you want to use an unpartitioned disk.
+- If want to support a maximum of 50 clients, use -v 50 instead of -v 10.
+
+Subsequently:
+- "fsmount /dev/vol0.2 /fs" [can take a while]
+- "ipconfig /dev/nic0 dhcp start"
+- "Cassini /app:SPECWeb99WebApp.x86 &"
+or
+- "Cassinin /app:SPECWeb99WebApp.x86 &"
+
diff --git a/base/Applications/WebApps/SPECweb99/SPECWeb99.csproj b/base/Applications/WebApps/SPECweb99/SPECWeb99.csproj
new file mode 100644
index 0000000..0198007
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/SPECWeb99.csproj
@@ -0,0 +1,43 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>SPECWeb99</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CachedFile.sg" />
+    <Compile Include="SPECWeb99.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Manifest\Manifest.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml2\Singularity.Xml2.csproj" />
+    <ProjectReference Include="..\Driver\WebAppDriver.csproj" />
+    <ProjectReference Include="..\FSUtils\WebAppFSUtils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/SPECweb99/SPECWeb99.sg b/base/Applications/WebApps/SPECweb99/SPECWeb99.sg
new file mode 100644
index 0000000..4fe089e
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/SPECWeb99.sg
@@ -0,0 +1,1825 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SPECWeb99.sg
+//
+//  Note:   The SPECWeb99 web app
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using System.Text;
+using System.Threading;
+using System.Web;
+using FileSystem.Utils;
+using System.Net.IP;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Contracts;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(WebAppResourceTransform))]
+
+namespace Microsoft.Singularity.WebApps
+{
+    [Category("WebApp")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<WebAppContract.Exp:Start> webAppRef;
+
+#if false
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+#endif
+        reflective private Parameters();
+    }
+
+    public class SPECWeb99WebApp : IWebApp
+    {
+        private const string ContentDir       = "/fs/specweb";
+        private const string PostLogFile      = ContentDir + "/sing_dyn/postlog";
+        private const string CustomAdsDir     = ContentDir + "/sing_dyn";
+        private const string CustomAdsFile    = CustomAdsDir + "/Custom.Ads";
+        private const string UserPersonalityDir  = ContentDir + "/sing_dyn";
+        private const string UserPersonalityFile = UserPersonalityDir + "/User.Personality";
+
+        private const string CookieHeaderName     = "Cookie";
+        private const string CookiePushHeaderName = "Set-Cookie";
+
+        private const uint GENDER_MASK    = 0x30000000;
+        private const uint AGE_GROUP_MASK = 0x0f000000;
+        private const uint REGION_MASK    = 0x00f00000;
+        private const uint INTEREST1_MASK = 0x000ffc00;
+        private const uint INTEREST2_MASK = 0x000003ff;
+
+        private const int CustomAdsLines            = 360;
+        private const int CustomAdsLineLength       = 39; // Including \n
+        private const int CustomAdsFileBytes        = CustomAdsLines * CustomAdsLineLength;
+        private const int UserPersonalityLines      = 360;
+        private const int UserPersonalityLineLength = 15; // Including \n
+        private const int UserPersonalityFileBytes  = UserPersonalityLines * UserPersonalityLineLength;
+
+        private const long PostLogHeaderSize = 11; // Including \n
+        private const long PostLogRecordSize = 139; // Including \n
+
+        private const int SubstitutionPatternLength = 48; // <!WEB99CAD><IMG SRC="/file_set/dirNNNNN/classX_Y
+        private const int SubstituteNum1Pos = 34;         // 0123456789012345678901234567890123^          ^ ^
+        private const int SubstituteNum2Pos = 45;         // 012345678901234567890123456789012345678901234| |
+        private const int SubstituteNum3Pos = 47;         // 01234567890123456789012345678901234567890123456|
+
+        private byte[] HtmlPreamble1, HtmlPreamble2, HtmlPreamble3, HtmlPostamble;
+        private byte[] PostLogInitData;
+        private byte[] MatchPattern;
+
+        private struct CustomAdsRecord
+        { public uint demographics, weightings, minmatch, expiry; }
+
+        private CachedFile! userPersonalityFile;
+        private CachedFile! customAdsFile;
+        private Parameters! config;
+
+        // Used for TaskTimes.
+        private ProcessData [] processData;
+        private ProcessData [] processData2;
+        private TimeSpan startTime;
+        private TimeSpan endTime;
+        private TRef<ProcessContract.Imp:ReadyState> processRef;
+
+
+        private TRef<DirectoryServiceContract.Imp:Ready> epNS;
+
+        // HACKHACK to accelerate fetching from the filesystem, we pre-form a pool of
+        // connections directly to the FS. But in order to do that, we need to know where
+        // the filesystem is mounted. Currently, we hardcode that.
+        private Queue! fsContractPool = new Queue(); // lock on the queue object for consistency
+        private const string FSMountPoint = "/fs/";
+
+
+        [NotDelayed]
+        internal SPECWeb99WebApp(Parameters! config)
+        {
+            HtmlPreamble1 = Encoding.ASCII.GetBytes("<html>\n<head><title>SPECweb99 Dynamic GET & POST Test</title></head>\n<body>\n<p>SERVER_SOFTWARE = Singularity Cassini web server\n<p>REMOTE_ADDR = ");
+            HtmlPreamble2 = Encoding.ASCII.GetBytes("\n<p>SCRIPT_NAME = SPECWeb99WebApp\n<p>QUERY_STRING = ");
+            HtmlPreamble3 = Encoding.ASCII.GetBytes("\n<pre>\n");
+            HtmlPostamble = Encoding.ASCII.GetBytes("\n</pre>\n</body></html>\n");
+
+            PostLogInitData = Encoding.ASCII.GetBytes("         0\n");
+
+            MatchPattern = Encoding.ASCII.GetBytes("<!WEB99CAD><IMG SRC=\"/file_set/dir");
+
+            customAdsFile = new CachedFile(CustomAdsFile, CustomAdsFileBytes);
+            userPersonalityFile  = new CachedFile(UserPersonalityFile, UserPersonalityFileBytes);
+            this.config = config;
+
+            base();
+            assert PostLogInitData.Length == (int)PostLogHeaderSize;
+            start = DateTime.Now;
+
+            // Get a new directory service contract
+            epNS = new TRef<DirectoryServiceContract.Imp:Ready>(DirectoryService.NewClientEndpoint());
+            processRef = new TRef<ProcessContract.Imp:ReadyState>(GetProcessChannel());
+        }
+
+        private ProcessContract.Imp:ReadyState! GetProcessChannel()
+        {
+            DirectoryServiceContract.Imp:Ready nsImp = epNS.Acquire();
+            try {
+                ProcessContract.Imp! dsImp;
+                ProcessContract.Exp! dsExp;
+                ProcessContract.NewChannel(out dsImp, out dsExp);
+                ErrorCode errorOut = ErrorCode.NoError;
+                bool bound = SdsUtils.BindDSP(ProcessContract.ModuleName, nsImp, dsExp, out errorOut);
+
+                if (!bound) {
+                    delete dsImp;
+                    throw new Exception("Failed to bind to filesystem prefix");
+                }
+                else {
+                    dsImp.RecvReady();
+                    return dsImp;
+                }
+            }
+            finally {
+                epNS.Release(nsImp);
+            }
+        }
+
+        private void RecycleFSChannel([Claims] DirectoryServiceContract.Imp:Ready! dsImp)
+        {
+            lock (fsContractPool) {
+                fsContractPool.Enqueue(new TRef<DirectoryServiceContract.Imp:Ready> (dsImp));
+                Monitor.Pulse(fsContractPool);
+            }
+        }
+
+        private DirectoryServiceContract.Imp:Ready! GetFSChannel()
+        {
+            ulong startCycles = Processor.CycleCount;
+            ulong endCycles, ms;
+
+            lock(fsContractPool) {
+                endCycles = Processor.CycleCount;
+                ms = ((endCycles - startCycles) * 1000ul) / (ulong)Processor.CyclesPerSecond;
+
+                if (ms > 5) {
+                    //DebugStub.WriteLine("Contention for file contracts queue: {0}",
+                    //__arglist(ms));
+                }
+
+                if (fsContractPool.Count > 0) {
+                    return ((TRef<DirectoryServiceContract.Imp:Ready>!)fsContractPool.Dequeue()).Acquire();
+                }
+            }
+
+            // All FS channels are in use; make a new one
+            startCycles = Processor.CycleCount;
+            DirectoryServiceContract.Imp:Ready nsImp = epNS.Acquire();
+
+            endCycles = Processor.CycleCount;
+            ms = ((endCycles - startCycles) * 1000ul) / (ulong)Processor.CyclesPerSecond;
+
+            if (ms > 5) {
+                //DebugStub.WriteLine("Contention for master namespace contract: {0}",
+                //__arglist(ms));
+            }
+
+            try {
+                DirectoryServiceContract.Imp! dsImp;
+                DirectoryServiceContract.Exp! dsExp;
+                DirectoryServiceContract.NewChannel(out dsImp, out dsExp);
+                ErrorCode errorOut = ErrorCode.NoError;
+                bool bound = SdsUtils.BindDSP(FSMountPoint, nsImp, dsExp, out errorOut);
+
+                if (!bound) {
+                    delete dsImp;
+                    throw new Exception("Failed to bind to filesystem prefix");
+                }
+                else {
+                    dsImp.RecvSuccess();
+                    return dsImp;
+                }
+            }
+            finally {
+                epNS.Release(nsImp);
+            }
+        }
+
+        private FileContract.Imp OpenFile(string! filePath)
+        {
+            //
+            // Take advantage of our cached FS connections for all requests
+            // heading for the file system
+            //
+            if (filePath.IndexOf(FSMountPoint) == 0) {
+                string suffix = filePath.Substring(FSMountPoint.Length,
+                                                   filePath.Length - FSMountPoint.Length);
+
+                DirectoryServiceContract.Imp:Ready! nsImp = GetFSChannel();
+
+                try {
+                    return FileUtils.OpenFile(suffix, nsImp);
+                }
+                finally {
+                    RecycleFSChannel(nsImp);
+                }
+            } else {
+                return FileUtils.OpenFile(filePath);
+            }
+        }
+
+        DateTime start;
+        bool isRecording = false;
+        bool isDone = false;
+        public void ProcessRequest(IHttpRequest! request)
+        {
+            string uri = request.GetUriPath();
+
+            if ((uri == null) || (uri.Length == 0)) {
+                uri = "/";
+            }
+
+            if (uri == "/dynamic-content") {
+                HandleDynamicRequest(request);
+            } else {
+                // Treat as a request for a static file
+
+                if (uri.IndexOf(FSMountPoint) == 0) {
+                    string suffix = uri.Substring(FSMountPoint.Length, uri.Length - FSMountPoint.Length);
+                    // Serve using a FS contract from the pool
+                    DirectoryServiceContract.Imp:Ready! nsImp = GetFSChannel(); // blocks
+
+                    try {
+                        WebAppFSUtils.ServeFSPath(suffix, request, nsImp);
+                    }
+                    finally {
+                        RecycleFSChannel(nsImp);
+                    }
+
+                } else {
+                    // Serve with the single, general-purpose directory service channel
+                    DebugStub.Break(); // TODO remove me
+                    DirectoryServiceContract.Imp:Ready! nsImp = epNS.Acquire(); // blocks
+
+                    try {
+                        WebAppFSUtils.ServeFSPath(uri, request, nsImp);
+                    }
+                    finally {
+                        epNS.Release(nsImp);
+                    }
+                }
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        // Helper code
+        //
+        private void WriteErrorResponse(IHttpRequest! request, int error, string! message)
+        {
+            switch (error) {
+                case 400:
+                    request.SendStatus(error, "Bad Request");
+                    break;
+                case 404:
+                    request.SendStatus(error, "Not Found");
+                    break;
+                case 500:
+                    request.SendStatus(error, "Internal Server Error");
+                    break;
+                default:
+                    request.SendStatus(error, "Error");
+                    break;
+            }
+            request.SendHeader("Content-type", "text/html");
+
+            request.SendBodyData(HtmlPreamble1);
+            request.SendBodyData(Encoding.ASCII.GetBytes(request.GetRemoteAddress()));
+            request.SendBodyData(HtmlPreamble2);
+
+            string queryString = request.GetQueryString();
+
+            if (queryString != null) {
+                request.SendBodyData(Encoding.ASCII.GetBytes(queryString));
+            } else {
+                request.SendBodyData(Encoding.ASCII.GetBytes("<no query string supplied>"));
+            }
+
+            request.SendBodyData(HtmlPreamble3);
+
+            if ((message != null) && (message.Length > 0)) {
+                request.SendBodyData(Encoding.ASCII.GetBytes(message));
+            }
+            WriteResponseHtmlPostamble(request);
+        }
+
+        private void WriteResponseHtmlPreamble(IHttpRequest! request)
+        {
+            request.SendStatus(200, "OK");
+            request.SendHeader("Content-type", "text/html");
+
+            request.SendBodyData(HtmlPreamble1);
+            request.SendBodyData(Encoding.ASCII.GetBytes(request.GetRemoteAddress()));
+            request.SendBodyData(HtmlPreamble2);
+
+            string queryString = request.GetQueryString();
+
+            if (queryString != null) {
+                request.SendBodyData(Encoding.ASCII.GetBytes(queryString));
+            } else {
+                request.SendBodyData(Encoding.ASCII.GetBytes("<no query string supplied>"));
+            }
+
+            request.SendBodyData(HtmlPreamble3);
+        }
+
+        private void WriteResponseHtmlPostamble(IHttpRequest! request)
+        {
+            request.SendBodyData(HtmlPostamble);
+        }
+
+        private void WriteMessageResponse(IHttpRequest! request, string! message)
+        {
+            WriteResponseHtmlPreamble(request);
+
+            if ((message != null) && (message.Length > 0)) {
+                request.SendBodyData(Encoding.ASCII.GetBytes(message));
+            }
+
+            WriteResponseHtmlPostamble(request);
+        }
+
+        private void WriteFileResponse(IHttpRequest! request, string! filePath)
+        {
+            FileContract.Imp fileImp = OpenFile(filePath);
+
+            if (fileImp != null) {
+                WriteFileResponse(request, fileImp);
+                delete fileImp;
+            }
+            else {
+                WriteErrorResponse(request, 404, "Couldn't open file: " + filePath);
+            }
+        }
+
+        private void WriteFileResponse(IHttpRequest! request, FileContract.Imp! fileImp)
+        {
+            WriteResponseHtmlPreamble(request);
+            WebAppFSUtils.TransmitFileContents(fileImp, request);
+            WriteResponseHtmlPostamble(request);
+        }
+
+        private void HandleDynamicRequest(IHttpRequest! request)
+        {
+            string verb = request.GetVerb();
+
+            if (verb == "GET") {
+                HandleGET(request);
+            }
+            else if (verb == "POST") {
+                HandlePOST(request);
+            }
+            else {
+                WriteErrorResponse(request, 400, "Unknown HTTP verb: " + verb);
+            }
+
+            request.Done();
+        }
+
+        private bool ParseCookie(string! cookie, out uint myUser, out uint lastAd,
+                                 out string rejectString)
+        {
+            const string cookiePreamble = "my_cookie=user_id=";
+            const string lastAdPreamble = "last_ad=";
+
+            rejectString = null;
+            myUser = 0;
+            lastAd = 0;
+
+            if (! cookie.StartsWith(cookiePreamble)) {
+                rejectString = "Invalid cookie format (bad preamble): \"" + cookie + "\"";
+                return false;
+            }
+
+            int nextAmp = cookie.IndexOf('&', cookiePreamble.Length);
+
+            if (nextAmp == -1) {
+                rejectString = "Invalid cookie format (no ampersand): \"" + cookie + "\"";
+                return false;
+            }
+
+            string myUserStr = cookie.Substring(cookiePreamble.Length, nextAmp - cookiePreamble.Length);
+
+            try {
+                myUser = UInt32.Parse(myUserStr);
+            }
+            catch (Exception) {
+                rejectString = "Invalid cookie format (bad user_id value): \"" + cookie + "\"";
+                return false;
+            }
+
+            string remainderStr = cookie.Substring(nextAmp + 1);
+
+            if (!remainderStr.StartsWith(lastAdPreamble)) {
+                rejectString = "Invalid cookie format (no last_ad field): \"" + cookie + "\"";
+                return false;
+            }
+
+            try {
+                lastAd = UInt32.Parse(remainderStr.Substring(lastAdPreamble.Length));
+            }
+            catch (Exception) {
+                rejectString = "Invalid cookie format (bad last_ad value): \"" + cookie + "\"";
+                return false;
+            }
+
+            return true;
+        }
+
+        private uint Get1970Time()
+        {
+            TimeSpan delta1970 = DateTime.Now - new DateTime(1970, 1, 1);
+            return (uint)delta1970.TotalSeconds;
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        // Dynamic GET
+        //
+
+        private void HandleGET(IHttpRequest! request)
+        {
+            const string commandPrefix = "command/";
+            string queryString = request.GetQueryString();
+
+            if ((queryString != null) && (queryString.Length > 0)) {
+                if (queryString.StartsWith(commandPrefix)) {
+                    HandleCommand(request, queryString.Substring(commandPrefix.Length));
+                } else {
+                    // We must serve the file corresponding to
+                    // the queryString. We may or may not have to
+                    // perform substitution, depending on whether
+                    // a cookie is provided.
+                    string filePath = String.Format("{0}{1}", ContentDir, queryString);
+                    string cookie = request.GetHeader(CookieHeaderName);
+
+                    if ((cookie == null) || (cookie.Length == 0)) {
+                        // Just serve the file normally
+                        WriteFileResponse(request, filePath);
+                    } else {
+                        HandleSubstitution(request, filePath, cookie);
+                    }
+                }
+            } else {
+                WriteErrorResponse(request, 400,
+                                   "A query string is required with a GET operation");
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        // Housekeeping commands
+        //
+
+        // Validate string only contains integers
+        private static string CheckDigits(string s)
+        {
+            if (s == null) return null;
+            for (int i = 0; i < s.Length; i++) {
+                if (s[i] < '0' || s[i] > '9') {
+                    return null;
+                }
+            }
+            return s;
+        }
+
+        private bool RunCommand(string[]! commandLine, StringBuilder! output)
+        {
+            try {
+                // Load the manifest for the given command
+                DirectoryServiceContract.Imp ds = epNS.Acquire();
+                Manifest manifest = Binder.LoadManifest(ds, commandLine[0]);
+                epNS.Release(ds);
+
+                if (manifest == null) {
+                    return false; // bad command
+                }
+
+                Process process;
+
+                if (manifest.HasParameters()) {
+                    ParameterProcessor processor = new ParameterProcessor();
+                    string action;
+
+                    if (!processor.ProcessParameters(commandLine,
+                                                     manifest, out process, out action)) {
+                        // bad command line
+                        return false;
+                    }
+
+                    if (manifest.SetEndpoints(process, action, false) < 0) {
+                        // couldn't prepare service endpoints
+                        return false;
+                    }
+                } else {
+                    process = new Process(commandLine, null, 2);
+                }
+
+                if (process == null) {
+                    // Failed to create the process object
+                    return false;
+                }
+
+                // Feed the process do-nothing input and output pipes
+                UnicodePipeContract.Imp! stdInImp, stdOutImp;
+                UnicodePipeContract.Exp! stdInExp, stdOutExp;
+
+                UnicodePipeContract.NewChannel(out stdInImp, out stdInExp);
+                UnicodePipeContract.NewChannel(out stdOutImp, out stdOutExp);
+
+                process.SetStartupEndpoint(0, (Endpoint * in ExHeap) stdInExp);
+                process.SetStartupEndpoint(1, (Endpoint * in ExHeap) stdOutImp);
+
+                process.Start();
+
+                // Capture the process output (this also prevents the child
+                // from hanging trying to write to the console)
+                bool stillAlive = true;
+
+                while (stillAlive) {
+                    switch receive {
+                        case stdOutExp.Write(char[]! in ExHeap buffer, offset, count) :
+                            output.Append(Bitter.ToString2(buffer, offset, count));
+                            stdOutExp.SendAckWrite(buffer);
+                            break;
+
+                        case unsatisfiable:
+                            stillAlive = false;
+                            break;
+                    }
+                }
+
+                process.Join();
+                process.Dispose(true);
+
+                delete stdInImp;
+                delete stdOutExp;
+
+                return true;
+            }
+            catch (ProcessCreateException) {
+                return false;
+            }
+        }
+
+        private void HandleReset(IHttpRequest! request, string[]! arguments)
+        {
+            string maxLoad    = null;
+            string pointTime  = null;
+            string maxThreads = null;
+            string expired1   = null;
+            string expired2   = null;
+            string urlRoot    = null;
+
+            for (int i = 0; i < arguments.Length; i++) {
+                int remain =  arguments.Length - i - 1;
+
+                // All values are key-value, except expiry list which
+                // has two values.  If there's not at least one argument
+                // it's a bogus request.
+                if (remain == 0)
+                    break;
+
+                if (arguments[i] == "maxload") {
+                    maxLoad = CheckDigits(arguments[++i]);
+                    if (maxLoad == null) {
+                        WriteErrorResponse(request, 400, "Bad 'maxload' element in GET request");
+                        return;
+                    }
+                }
+                else if (arguments[i] == "pttime") {
+                    pointTime = CheckDigits(arguments[++i]);
+                    if (pointTime == null) {
+                        WriteErrorResponse(request, 400, "Bad 'pttime' in element GET request");
+                        return;
+                    }
+                }
+                else if (arguments[i] == "maxthread") {
+                    maxThreads = CheckDigits(arguments[++i]);
+                    if (maxThreads == null) {
+                        WriteErrorResponse(request, 400, "Bad 'maxthread' in element GET request");
+                        return;
+                    }
+                }
+                else if (arguments[i] == "exp") {
+                    if (remain < 2) {
+                        WriteErrorResponse(request, 400, "Bad 'expired_list' element in GET request");
+                        return;
+                    }
+                    expired1 = CheckDigits(arguments[++i]);
+                    if (expired1 == null) {
+                        WriteErrorResponse(request, 400, "Bad 'expired_list[0]' element in GET request");
+                        return;
+                    }
+                    expired2 = CheckDigits(arguments[++i]);
+                    if (expired2 == null) {
+                        WriteErrorResponse(request, 400, "Bad 'expired_list[1]' element in GET request");
+                        return;
+                    }
+                }
+                else if (arguments[i] == "urlroot") {
+                    urlRoot = arguments[++i];
+                }
+            }
+
+            if (maxLoad == null) {
+                WriteErrorResponse(request, 400, "Missing 'maxload' element in GET request.");
+                return;
+            }
+            else if (pointTime == null) {
+                WriteErrorResponse(request, 400, "Missing 'pttime' element in GET  request.");
+                return;
+            }
+            else if (maxThreads == null) {
+                WriteErrorResponse(request, 400, "Missing 'maxthreads' element in GET request.");
+                return;
+            }
+            else if ((expired1 == null) || (expired2 == null)) {
+                WriteErrorResponse(request, 400, "Missing 'expired_list' element in GET request.");
+                return;
+            }
+            else if (urlRoot == null) {
+                WriteErrorResponse(request, 400, "Missing 'url_root' element in GET request.");
+                return;
+            }
+
+            // These are allowed to fail
+            DirectoryUtils.CreateDirectory(CustomAdsDir);
+            FileUtils.DeleteFile(CustomAdsFile);
+
+            string []! cadgen = new string[] { "cadgen99",
+                                               "-d=" + CustomAdsDir,
+                                               "-e=" + pointTime,
+                                               "-t=" + maxThreads,
+                                               "-exp1=" + expired1,
+                                               "-exp2=" + expired2};
+
+            StringBuilder capturedOutput = new StringBuilder();
+
+            if (RunCommand(cadgen, capturedOutput) == false) {
+                WriteErrorResponse(request, 500, "Failed to run cadgen:\n\n" +
+                                   capturedOutput.ToString());
+                return;
+            }
+
+            if (!customAdsFile.Refresh()) {
+                WriteErrorResponse(request, 500, "Failed to load ads file");
+                return;
+            }
+
+            if (((!)customAdsFile.FileData).Length < CustomAdsFileBytes) {
+                WriteErrorResponse(request, 500, "Custom ads file was too small after generation");
+                return;
+            }
+
+            // It's OK for these to fail
+            DirectoryUtils.CreateDirectory(UserPersonalityDir);
+            FileUtils.DeleteFile(UserPersonalityFile);
+
+            string []! upfgen = new string[] {"/init/upfgen99",
+                                              "-c=" + UserPersonalityDir,
+                                              "-n=" + maxLoad,
+                                              "-t=" + maxThreads};
+
+            capturedOutput = new StringBuilder();
+
+            if (RunCommand(upfgen, capturedOutput) == false) {
+                WriteErrorResponse(request, 500, "Failed to run upfgen:\n\n" +
+                                   capturedOutput.ToString());
+                return;
+            }
+
+            if (!userPersonalityFile.Refresh()) {
+                WriteErrorResponse(request, 500, "Failed to load user personality file");
+                return;
+            }
+
+            if (!ResetPostLog()) {
+                WriteErrorResponse(request, 500, "Failed to reset the PostLog file");
+                return;
+            }
+
+            // Signal success with a blank message page
+            WriteMessageResponse(request, "");
+
+            // As the last part of reset, we set up the performance counters.
+
+            DebugStub.WriteLine("SPECweb99: Started Benchmark");
+
+            ProcessContract.Imp imp = processRef.Acquire();
+            processData = GetProcessData(imp);
+            processRef.Release(imp);
+            startTime =  ProcessService.GetUpTime();
+
+#if CAPTURE_PERFORMANCE_COUNTERS
+            for (uint u = 0; u < 16; u++) {
+                DebugStub.WritePerfCounter(0, 0);
+            }
+
+            if (IsAmd()) {
+                for (uint pmc = 0; pmc < 4; pmc++) {
+                    Processor.WriteMsr(0xc0010004 + pmc, 0);
+                }
+            }
+            DebugStub.WritePerfCounter(7, Processor.GetCycleCount());
+#endif
+        }
+
+        private static bool IsAmd()
+        {
+            uint eax;
+            uint ebx;
+            uint ecx;
+            uint edx;
+            Processor.ReadCpuid(0, out eax, out ebx, out ecx, out edx);
+            return (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65);
+        }
+
+        private static void MyWrite(IHttpRequest! request, string! msg, params Object[]! args)
+        {
+            String text = String.Format(msg, args);
+            request.SendBodyData(Encoding.ASCII.GetBytes(text));
+        }
+
+        private void HandleFinish(IHttpRequest! request, string[]! arguments)
+        {
+            request.SendStatus(200, "OK");
+            request.SendHeader("Content-type", "text/plain");
+
+#if CAPTURE_PERFORMANCE_COUNTERS
+            // Read the AMD and Singularity performance counters.
+            ulong b0 = 0;
+            ulong t0 = 0;
+            ulong e0 = 0;
+            ulong e1 = 0;
+            ulong e2 = 0;
+            ulong e3 = 0;
+            ulong p0 = 0;
+            ulong p1 = 0;
+            ulong p2 = 0;
+            ulong p3 = 0;
+            ulong z0 = 0;
+            ulong z1 = 0;
+            ulong z2 = 0;
+            ulong z3 = 0;
+            ulong z4 = 0;
+            ulong z5 = 0;
+            ulong z6 = 0;
+            ulong z8 = 0;
+            ulong z9 = 0;
+            ulong z10 = 0;
+            ulong z11 = 0;
+            ulong z12 = 0;
+            ulong z13 = 0;
+            ulong z14 = 0;
+            ulong z15 = 0;
+            if (IsAmd()) {
+                b0 = DebugStub.ReadPerfCounter(7);
+                t0 = Processor.GetCycleCount();
+                e0 = Processor.ReadMsr(0xc0010000);
+                e1 = Processor.ReadMsr(0xc0010001);
+                e2 = Processor.ReadMsr(0xc0010002);
+                e3 = Processor.ReadMsr(0xc0010003);
+                p0 = Processor.ReadPmc(0);
+                p1 = Processor.ReadPmc(1);
+                p2 = Processor.ReadPmc(2);
+                p3 = Processor.ReadPmc(3);
+            }
+            else {
+                b0 = DebugStub.ReadPerfCounter(7);
+                t0 = Processor.GetCycleCount();
+            }
+            z0 = DebugStub.ReadPerfCounter(0);
+            z1 = DebugStub.ReadPerfCounter(1);
+            z2 = DebugStub.ReadPerfCounter(2);
+            z3 = DebugStub.ReadPerfCounter(3);
+            z4 = DebugStub.ReadPerfCounter(4);
+            z5 = DebugStub.ReadPerfCounter(5);
+            z6 = DebugStub.ReadPerfCounter(6);
+            z8 = DebugStub.ReadPerfCounter(8);
+            z9 = DebugStub.ReadPerfCounter(9);
+            z10 = DebugStub.ReadPerfCounter(10);
+            z11 = DebugStub.ReadPerfCounter(11);
+            z12 = DebugStub.ReadPerfCounter(12);
+            z13 = DebugStub.ReadPerfCounter(13);
+            z14 = DebugStub.ReadPerfCounter(14);
+            z15 = DebugStub.ReadPerfCounter(15);
+
+            endTime =  ProcessService.GetUpTime();
+            ProcessContract.Imp imp = processRef.Acquire();
+            processData2 = GetProcessData(imp);
+            processRef.Release(imp);
+
+
+            t0 = t0 - b0;
+            z5 += z8 + z9 + z10 + z11 + z12 + z13;
+
+            ulong n0 = t0;
+            if ((e0 & 0xff) == PerfEvtSel.CyclesNotHalted) {
+                n0 = p0;
+            }
+            else if ((e1 & 0xff) == PerfEvtSel.CyclesNotHalted) {
+                n0 = p1;
+            }
+            else if ((e2 & 0xff) == PerfEvtSel.CyclesNotHalted) {
+                n0 = p2;
+            }
+            else if ((e3 & 0xff) == PerfEvtSel.CyclesNotHalted) {
+                n0 = p3;
+            }
+
+            MyWrite(request, "{0,20}: {1,16}  {2,16}\n", "Cycles", t0, n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    PerfEvtSel.ToString(e0),
+                    (p0 * 100.0) / t0,
+                    (p0 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    PerfEvtSel.ToString(e1),
+                    (p1 * 100.0) / t0,
+                    (p1 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    PerfEvtSel.ToString(e2),
+                    (p2 * 100.0) / t0,
+                    (p2 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    PerfEvtSel.ToString(e3),
+                    (p3 * 100.0) / t0,
+                    (p3 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "App GC",
+                    (z5 * 100.0) / t0,
+                    (z5 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "SpecWeb GC",
+                    (z8 * 100.0) / t0,
+                    (z8 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "Cassini GC",
+                    (z9 * 100.0) / t0,
+                    (z9 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "NetStack GC",
+                    (z10 * 100.0) / t0,
+                    (z10 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "NIC GC",
+                    (z11 * 100.0) / t0,
+                    (z11 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "FS GC",
+                    (z12 * 100.0) / t0,
+                    (z12 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "Disk GC",
+                    (z13 * 100.0) / t0,
+                    (z13 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16:f3}% {2,16:f3}%\n",
+                    "Kernel GC",
+                    (z6 * 100.0) / t0,
+                    (z6 * 100.0) / n0);
+            MyWrite(request, "{0,20}: {1,16}\n", "FAT Found", z0);
+            MyWrite(request, "{0,20}: {1,16}\n", "FAT In Use", z1);
+            MyWrite(request, "{0,20}: {1,16}\n", "FAT Miss Free", z2);
+            MyWrite(request, "{0,20}: {1,16}\n", "FAT Miss Evict", z3);
+            MyWrite(request, "{0,20}: {1,16}\n", "Threads", z4);
+            MyWrite(request, "{0,20}: {1,16}\n", "PerfCounter 14", z14);
+            MyWrite(request, "{0,20}: {1,16}\n", "PerfCounter 15", z15);
+
+            if (!IsAmd()) {
+                MyWrite(request, "Intel processor, PMC values will be zero.\n");
+            }
+#endif
+
+            // Prep for display
+            if (this.processData != null) {
+                Hashtable processName = new Hashtable(processData.Length);
+                for (int i = 0; i < processData.Length; i++) {
+                    ProcessData pd = processData[i];
+                    if (pd == null) {
+                        continue;
+                    }
+                    processName.Add(pd.id, pd);
+                }
+
+                // Display the results
+                double actualSpan =  (double) ((endTime - startTime).TotalMilliseconds);
+                MyWrite(request, "\n");
+                MyWrite(request, "PID Task Name            total(ms) % tot\n");
+                MyWrite(request, "=== =================== ========== =====\n");
+                double totalPercent = 0;
+                //long  durationMs =  monitorSeconds*1000;
+                double  durationMs =  actualSpan;
+                double totalTime;
+                double deltaTotal;
+                string pattern = "###,##0.00";
+                string percentPattern = "#0.00";
+
+                for (int i = 0; i < processData2.Length; i++) {
+                    ProcessData pd2 = processData2[i];
+                    if (pd2 == null) {
+                        continue;
+                    }
+
+                    totalTime = (double)pd2.totalTime;
+
+                    double percent = 0;
+                    ProcessData p = (ProcessData) processName[pd2.id];
+                    if (p != null) {
+                        if (p.name == pd2.name) {
+                            totalTime -= p.totalTime;
+                        }
+                    }
+
+                    totalTime /= DateTime.TicksPerMillisecond;
+
+                    percent = durationMs == 0 ? 0 : (double) (totalTime / durationMs)  * 100 ;
+
+                    //percent of time of this process spent in GC
+                    if (totalTime > 0) {
+                        MyWrite(request, "{0,3} {1,-19} {2,10} {3,5}\n",
+                                pd2.id,
+                                pd2.name,
+                                totalTime.ToString(pattern),
+                                percent.ToString(percentPattern));
+                        totalPercent += percent;
+                    }
+                }
+
+                MyWrite(request, "                                              ======\n");
+                MyWrite(request, "                                               {0,5} accounted for\n",
+                        totalPercent.ToString("00.00"));
+            }
+            DebugStub.WriteLine("SPECweb99: Finished Benchmark");
+        }
+
+        private void HandleCommand(IHttpRequest! request, string! command)
+        {
+            if (command == "Fetch") {
+                // Lock on this to protect the PostLog
+                lock (this) {
+                    FileContract.Imp fileImp = OpenFile(PostLogFile);
+
+                    if (fileImp != null) {
+                        WriteFileResponse(request, fileImp);
+                        delete fileImp;
+                    }
+                    else {
+                        WriteErrorResponse(request, 404, "Error opening PostLog file");
+                    }
+                }
+            }
+            else if (command.StartsWith("Reset&")) {
+                HandleReset(request,
+                            command.Split(new char [] { '&', '=', ',' }));
+            }
+            else if (command.StartsWith("Finish")) {
+                HandleFinish(request,
+                             command.Split(new char [] { '&', '=', ',' }));
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        // Dynamic POST support
+        //
+
+        private void HandlePOST(IHttpRequest! request)
+        {
+            string cookie = request.GetHeader(CookieHeaderName);
+
+            if ((cookie == null) || (cookie.Length == 0)) {
+                WriteErrorResponse(request, 400, "POST requires a 'Cookie' header");
+                return;
+            }
+
+            byte[] bodyData = request.GetBodyData();
+
+            if ((bodyData == null) || (bodyData.Length == 0)) {
+                WriteErrorResponse(request, 400, "POST requires body data");
+                return;
+            }
+
+            //
+            // Parse the POST data
+            //
+            string urlRoot = null;
+            int dirNum = -1, classNum = -1, fileNum = -1, clientNum = -1;
+            string body = Encoding.ASCII.GetString(bodyData);
+            string[] fragments = body.Split(new char[] { '=', '&' } );
+
+            for (int i = 0; i < fragments.Length; i += 2) {
+                if (fragments[i] == "urlroot") {
+                    urlRoot = fragments[i + 1];
+                }
+                else if (fragments[i] == "dir") {
+                    try {
+                        dirNum = Int32.Parse(fragments[i + 1]);
+                    }
+                    catch (Exception) {
+                        WriteErrorResponse(request, 400, "Bad 'dir' element in POST data");
+                        return;
+                    }
+                }
+                else if (fragments[i] == "class") {
+                    try {
+                        classNum = Int32.Parse(fragments[i + 1]);
+                    }
+                    catch (Exception) {
+                        WriteErrorResponse(request, 400, "Bad 'class' element in POST data");
+                        return;
+                    }
+                }
+                else if (fragments[i] == "num") {
+                    try {
+                        fileNum = Int32.Parse(fragments[i + 1]);
+                    }
+                    catch (Exception) {
+                        WriteErrorResponse(request, 400, "Bad 'num' element in POST data");
+                        return;
+                    }
+
+                }
+                else if (fragments[i] == "client") {
+                    try {
+                        clientNum = Int32.Parse(fragments[i + 1]);
+                    }
+                    catch (Exception) {
+                        WriteErrorResponse(request, 400, "Bad 'client' element in POST data");
+                        return;
+                    }
+                }
+                else {
+                    WriteErrorResponse(request, 400, "Invalid POST data item \"" + fragments[i] + "\"");
+                    return;
+                }
+            }
+
+            if (urlRoot == null) {
+                WriteErrorResponse(request, 400, "Missing 'urlroot' item in POST data");
+                return;
+            }
+            else if (dirNum == -1) {
+                WriteErrorResponse(request, 400, "Missing 'dir' item in POST data");
+                return;
+            }
+            else if (classNum == -1) {
+                WriteErrorResponse(request, 400, "Missing 'class' item in POST data");
+                return;
+            }
+            else if (fileNum == -1) {
+                WriteErrorResponse(request, 400, "Missing 'num' item in POST data");
+                return;
+            }
+            else if (clientNum == -1) {
+                WriteErrorResponse(request, 400, "Missing 'client' item in POST data");
+                return;
+            }
+
+            //
+            // Parse the cookie data
+            //
+            string cookieReject;
+            uint myCookie, lastAd;
+
+            if (!ParseCookie(cookie, out myCookie, out lastAd, out cookieReject)) {
+                WriteErrorResponse(request, 400, (!)cookieReject);
+                return;
+            }
+
+            string filePath = String.Format("{0}{1}dir{2}/class{3}_{4}", ContentDir, urlRoot,
+                                            dirNum.ToString("d05"), classNum, fileNum);
+
+            // Write out all the parsed data
+            if (!AppendToPostLog((uint)dirNum, (uint)classNum, (uint)fileNum,
+                                 (uint)clientNum, filePath, (uint)myCookie)) {
+                WriteErrorResponse(request, 400, "Error writing to PostLog file");
+                return;
+            }
+
+            FileContract.Imp fileImp = OpenFile(filePath);
+
+            if(fileImp != null) {
+                request.SendHeader(CookiePushHeaderName, "my_cookie=" + myCookie.ToString());
+                WriteFileResponse(request, fileImp);
+                delete fileImp;
+            } else {
+                WriteErrorResponse(request, 404, "Couldn't open file: \"" + filePath + "\"");
+                return;
+            }
+        }
+
+        private bool ResetPostLog()
+        {
+            lock (this) {
+                // OK to ignore the result of this; the file
+                // may not exist.
+                FileUtils.DeleteFile(PostLogFile);
+
+                if (FileUtils.CreateFile(PostLogFile) != 0) {
+                    return false;
+                }
+
+                FileContract.Imp fileImp = OpenFile(PostLogFile);
+
+                if (fileImp == null) {
+                    return false;
+                }
+
+                try {
+                    long written = FileUtils.Write(fileImp, 0, PostLogInitData);
+
+                    if (written < PostLogInitData.Length) {
+                        return false;
+                    }
+                } finally {
+                    delete fileImp;
+                }
+            }
+
+            return true;
+        }
+
+        private bool AppendToPostLog(uint dirNum, uint classNum, uint fileNum,
+                                     uint clientNum, string fileName, uint cookieNum)
+        {
+            lock (this) {
+                FileContract.Imp fileImp = OpenFile(PostLogFile);
+
+                if (fileImp == null) {
+                    return false;
+                }
+
+                try {
+                    // First, read in the header so we can increment the record count
+                    byte[] header = new byte[PostLogHeaderSize];
+                    if (FileUtils.Read(fileImp, 0,PostLogHeaderSize , 0, header) != PostLogHeaderSize) {
+                        return false;
+                    }
+
+                    int numExistingRecords;
+
+                    try {
+                        numExistingRecords = Int32.Parse(
+                            Encoding.ASCII.GetString(header, 0, PostLogHeaderSize - 1));
+                    }
+                    catch(Exception) {
+                        return false;
+                    }
+
+                    // Increment the record count and rewrite the header
+                    string newHeaderStr = String.Format("{0,10}\n", numExistingRecords + 1);
+                    byte[] newHeader = Encoding.ASCII.GetBytes(newHeaderStr);
+                    assert newHeader.Length == (int)PostLogHeaderSize;
+
+                    if (FileUtils.Write(fileImp, 0, newHeader) != PostLogHeaderSize) {
+                        return false;
+                    }
+
+                    // Write a new record to the appropriate offset in the file
+                    long newRecordOffset = (numExistingRecords * PostLogRecordSize) + PostLogHeaderSize;
+                    string newEntryStr = String.Format(
+                        "{0,10} {1,10} {2,10} {3,5} {4,2} {5,2} {6,10} {7,-60} {8,10} {9,10}\n",
+                        numExistingRecords + 1, Get1970Time(), ProcessService.GetCurrentProcessId(),
+                        dirNum, classNum, fileNum, clientNum, fileName, ProcessService.GetCurrentProcessId(),
+                        cookieNum);
+
+                    byte[] newEntry = Encoding.ASCII.GetBytes(newEntryStr);
+                    assert newEntry.Length == (int)PostLogRecordSize;
+
+                    if (FileUtils.Write(fileImp, newRecordOffset, newEntry) != PostLogRecordSize) {
+                        return false;
+                    }
+                }
+                finally {
+                    delete fileImp;
+                }
+            }
+
+            return true;
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        // Substitution / ad-rotation support
+        //
+
+        private void SubstituteAt(byte[]! in ExHeap buffer, int offset, uint adId)
+        {
+            assert offset + SubstitutionPatternLength <= buffer.Length;
+            string! num1 = (!)(adId / 36).ToString("d05");
+            string! num2 = (!)((adId % 36) / 9).ToString();
+            string! num3 = (!)(adId % 9).ToString();
+
+            for (int i = 0; i < 5; i++) {
+                buffer[offset + SubstituteNum1Pos + i] = (byte)num1[i];
+            }
+
+            buffer[offset + SubstituteNum2Pos] = (byte)num2[0]; // should be a single char
+            buffer[offset + SubstituteNum3Pos] = (byte)num3[0]; // ditto
+        }
+
+        private int SubstituteInBlock(byte[]! in ExHeap buffer, uint maxBytes, uint adId)
+        {
+            // NOTE the idea here is to find the randomly placed
+            // markers in the file block and doctor them. The only
+            // difficulty arises if there is a match of the prefix
+            // of our search pattern at the end of a block (that is,
+            // the pattern to match straddles a block boundary).
+            // As a naive solution to this, if we detect such a case, we
+            // return an amount to step back in the file so the next block
+            // will contain the entire match-pattern. If we were smarter
+            // we could keep state between invocations, instead.
+            int startMatch = 0;
+            int matchDepth = 0;
+            int matchPatternLength = MatchPattern.Length;
+
+            // Make this unsafe to skip the insane overhead of non-hoisted
+            // ExHeap vector accesses
+            unsafe {
+                fixed (byte *pSrc = &buffer[0]) {
+                    fixed (byte *pMatch = &MatchPattern[0]) {
+                        while (startMatch < maxBytes) {
+                            if (pSrc[startMatch] == pMatch[0]) {
+                                do {
+                                    ++matchDepth;
+
+                                    if (matchDepth == matchPatternLength) {
+                                        // Found a match!
+                                        SubstituteAt(buffer, startMatch, adId);
+                                    }
+
+                                    if (startMatch + matchDepth >= maxBytes) {
+                                        // We were in the middle of a match
+                                        // but hit the end of the buffer.
+                                        // Step back by one disk sector
+                                        return 512;
+                                    }
+                                } while (pSrc[startMatch + matchDepth] == pMatch[matchDepth]);
+
+                                startMatch += matchDepth;
+                                matchDepth = 0;
+                            }
+                            else {
+                                startMatch++;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        private void WriteSubstitutedFile(IHttpRequest! request,
+                                          string! filePath, uint adId)
+        {
+            FileContract.Imp fileImp = OpenFile(filePath);
+
+            if (fileImp == null) {
+                WriteErrorResponse(request, 404, "Couldn't open file " + filePath);
+                return;
+            }
+
+            WriteResponseHtmlPreamble(request);
+
+            try {
+                long readSize = 1024 * 16; // 16KB
+                long readOffset = 0;
+                bool keepReading = true;
+
+                do {
+                    byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                    fileImp.SendRead(buf, 0, readOffset, readSize);
+
+                    switch receive {
+                        case fileImp.AckRead( _buf, long bytesRead, int error) :
+                            if ((error != 0) || (_buf == null)) {
+                                if (_buf != null)
+                                { delete _buf; }
+
+                                keepReading = false;
+                            }
+                            else {
+                                byte[]! in ExHeap original = _buf;
+                                bool atEnd = (bytesRead < readSize);
+
+                                if (bytesRead > 0) {
+                                    int stepBack = SubstituteInBlock(original, (uint)bytesRead, adId);
+
+                                    // Ignore any partial matches that occur at the very
+                                    // end of the file
+                                    if (atEnd) {
+                                        stepBack = 0;
+                                    }
+
+                                    if ((stepBack > 0) || (bytesRead < readSize)) {
+                                        // Discard the excess portion of the block
+                                        delete
+                                            Bitter.SplitOff(
+                                                ref original,
+                                                (int)(bytesRead - stepBack)
+                                                );
+                                    }
+
+                                    request.SendBodyData(original);
+                                    readOffset += (bytesRead - stepBack);
+                                } else {
+                                    // By coincidence, our previous read took us to
+                                    // exactly the end of the file. We should
+                                    // optimize this away somehow
+                                    delete original;
+                                }
+
+                                keepReading = !atEnd;
+                            }
+                            break;
+
+                        case fileImp.ChannelClosed() :
+                            keepReading = false;
+                            break;
+                    }
+                } while(keepReading);
+            }
+            finally {
+                delete fileImp;
+            }
+
+            WriteResponseHtmlPostamble(request);
+        }
+
+
+        private bool RetrieveAdData(uint adIndex, out uint demographics,
+                                    out uint weightings, out uint minMatch,
+                                    out uint expiry)
+        {
+            demographics = weightings = minMatch = expiry = 0;
+
+            byte[] fileData = customAdsFile.FileData;
+
+            if (fileData == null) {
+                return false;
+            }
+
+            if (fileData.Length < CustomAdsFileBytes) {
+                return false;
+            }
+
+            try {
+                int startLine = (int)adIndex * (int)CustomAdsLineLength;
+
+                // debug!
+                string wholeLine = Encoding.ASCII.GetString(fileData, startLine, CustomAdsLineLength);
+
+                if (wholeLine == null) {
+                    DebugStub.Break();
+                }
+
+                string demoStr = Encoding.ASCII.GetString(fileData, startLine + 6, 8);
+                string weightStr = Encoding.ASCII.GetString(fileData, startLine + 15, 8);
+                string minMatchStr = Encoding.ASCII.GetString(fileData, startLine + 24, 3);
+                string expiryStr = Encoding.ASCII.GetString(fileData, startLine + 28, 10);
+
+                demographics = UInt32.Parse(demoStr,
+                                            System.Globalization.NumberStyles.AllowHexSpecifier |
+                                            System.Globalization.NumberStyles.AllowLeadingWhite);
+
+                weightings = UInt32.Parse(weightStr,
+                                          System.Globalization.NumberStyles.AllowHexSpecifier |
+                                          System.Globalization.NumberStyles.AllowLeadingWhite);
+
+                minMatch = UInt32.Parse(minMatchStr, System.Globalization.NumberStyles.AllowLeadingWhite);
+                expiry = UInt32.Parse(expiryStr, System.Globalization.NumberStyles.AllowLeadingWhite);
+            }
+            catch (Exception) {
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool RetrieveUserPersonality(uint userIndex, out uint demographics)
+        {
+            demographics = 0;
+            byte[] fileData = userPersonalityFile.FileData;
+
+            if (fileData == null) {
+                return false;
+            }
+
+            if (fileData.Length < UserPersonalityFileBytes) {
+                return false;
+            }
+
+            try {
+                int startLine = (int)userIndex * (int)UserPersonalityLineLength;
+
+                // debug!
+                string wholeLine = Encoding.ASCII.GetString(fileData, startLine,
+                                                            UserPersonalityLineLength);
+
+                if (wholeLine == null) {
+                    DebugStub.Break();
+                }
+
+                string demoStr = Encoding.ASCII.GetString(fileData, startLine + 6, 8);
+
+                demographics = UInt32.Parse(demoStr,
+                                            System.Globalization.NumberStyles.AllowHexSpecifier |
+                                            System.Globalization.NumberStyles.AllowLeadingWhite);
+            }
+            catch (Exception) {
+                return false;
+            }
+
+            return true;
+        }
+
+        private uint GenderWt(uint demVal)
+        { return (demVal & 0x000f0000) >> 16; }
+
+        private uint AgeGroupWt(uint demVal)
+        { return (demVal & 0x0000f000) >> 12; }
+
+        private uint RegionWt(uint demVal)
+        { return (demVal & 0x00000f00) >> 8; }
+
+        private uint InterestWt(uint demVal)
+        { return (demVal & 0x000000f0) >> 4; }
+
+        private uint Interest2Wt(uint demVal)
+        { return (demVal & 0x0000000f); }
+
+        private void HandleSubstitution(IHttpRequest! request,
+                                        string! filePath, string! cookie)
+        {
+            bool isSmallFile =
+                (filePath.IndexOf("class1") != -1) ||
+                (filePath.IndexOf("class2") != -1);
+
+            string cookieReject;
+            uint userId, lastAd;
+
+            if (! ParseCookie(cookie, out userId, out lastAd, out cookieReject)) {
+                WriteErrorResponse(request, 400, (!)cookieReject);
+                return;
+            }
+
+            if (userId < 10000) {
+                WriteErrorResponse(request, 400, "UserID was less than 10,000");
+                return;
+            }
+
+            uint userIndex = userId - 10000;
+            uint userPersonality;
+            uint adIndex = lastAd + 1;
+
+            if (adIndex >= CustomAdsLines) {
+                adIndex = 0;
+            }
+
+            if (!RetrieveUserPersonality(userIndex, out userPersonality)) {
+                // BUGBUG: the spec is unclear here; there is no adId to use.
+                request.SendHeader(CookiePushHeaderName,
+                                   "found_cookie=Ad_Id=-1&Ad_weight=00&Expired=1");
+                WriteFileResponse(request, filePath);
+            }
+
+            uint adWeight = 0;
+            bool expired = false;
+
+            while (adIndex != lastAd) {
+                adWeight = 0;
+                expired = false;
+                uint adDemographics, weightings, minMatch, expiry;
+
+                bool gotAd = RetrieveAdData(adIndex, out adDemographics,
+                                            out weightings, out minMatch, out expiry);
+                assert gotAd; // we checked the cached adfile above
+
+                uint combinedDemographics = userPersonality & adDemographics;
+
+                if ( (combinedDemographics & GENDER_MASK) != 0 ) {
+                    adWeight = adWeight + GenderWt(adDemographics);
+                }
+
+                if ( (combinedDemographics & AGE_GROUP_MASK) != 0 ) {
+                    adWeight = adWeight + AgeGroupWt(adDemographics);
+                }
+
+                if ( (combinedDemographics & REGION_MASK) != 0 ) {
+                    adWeight = adWeight + RegionWt(adDemographics);
+                }
+
+                if ( (combinedDemographics & INTEREST1_MASK) != 0 ) {
+                    adWeight = adWeight + InterestWt(adDemographics);
+                }
+
+                if ( (combinedDemographics & INTEREST2_MASK) != 0 ) {
+                    adWeight = adWeight + Interest2Wt(adDemographics);
+                }
+
+                if ( adWeight >= minMatch ) {
+                    // Found an acceptable match
+                    uint now1970Delta = Get1970Time();
+
+                    if (now1970Delta > expiry) {
+                        expired = true;
+                    }
+
+                    request.SendHeader(CookiePushHeaderName,
+                                       "found_cookie=Ad_id=" + adIndex +
+                                       "&Ad_weight=" + adWeight +
+                                       "&Expired=" + (expired ? "1" : "0"));
+
+                    if (isSmallFile) {
+                        WriteSubstitutedFile(request, filePath, adIndex);
+                        return;
+                    }
+                    else {
+                        WriteFileResponse(request, filePath);
+                        return;
+                    }
+                }
+
+                adIndex++;
+                if (adIndex >= CustomAdsLines) {
+                    adIndex = 0; // wrap around
+                }
+            }
+
+            request.SendHeader(CookiePushHeaderName,
+                               "found_cookie=Ad_id=" + adIndex +
+                               "&Ad_weight=" + adWeight +
+                               "&Expired=" + (expired ? "1" : "0"));
+
+            if (isSmallFile) {
+                WriteSubstitutedFile(request, filePath, adIndex);
+            }
+            else {
+                WriteFileResponse(request, filePath);
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        // The code below gets used when this webapp is compiled
+        // to a stand-alone executable
+        //
+
+        internal static int AppMain(Parameters! config)
+        {
+            WebAppContract.Exp conn = config.webAppRef.Acquire();
+            conn.SendWebAppReady();
+
+            SPECWeb99WebApp webApp = new SPECWeb99WebApp(config);
+            Driver.ServiceChannel(webApp, conn);
+            delete conn;
+            return 0;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        // Code used to retrieve thread times.
+        //
+        public class ProcessData
+        {
+            public int id;
+            public string name;
+            public long memBytes;
+            public long peakMemBytes;
+            public long commMemBlocks;
+            public long commMemBytes;
+            public long handlePages;
+            public int[] tids;
+            public long totalTime;
+            public long deadThreadTime;
+            public long deadThreadCount;
+            public int gcCount;
+            public long gcTotalTime;
+            public long gcTotalBytes;
+
+            public ProcessData() {
+                tids = null;
+            }
+        }
+
+        public static int []! GetProcessIDs(ProcessContract.Imp:ReadyState! imp)
+        {
+            int [] ids = null;
+            int[]! in ExHeap xids;
+            imp.SendGetProcessIDs();
+            imp.RecvProcessIDs(out xids);
+            // REVIEW: The kernel process is being returned twice so we're
+            // skipping one of the entries if the process ID matches.
+            int startIndex = 0;
+            if (xids[0] == xids[1])
+                startIndex++;
+            ids = new int[xids.Length - startIndex];
+            for (int i = startIndex; i < xids.Length; i++)
+            {
+                ids[i - startIndex] = xids[i];
+            }
+            delete xids;
+            return ids;
+        }
+
+        public static int [] GetProcessThreadIDs(ProcessContract.Imp:ReadyState! imp, int procID)
+        {
+            imp.SendGetProcessThreadIDs(procID);
+            int [] retVal = null;
+
+            switch receive
+            {
+                case imp.NotFound() :
+                    break;
+
+                case imp.ProcessThreadIDs(int[]! in ExHeap tids) :
+                    retVal = new int[tids.Length];
+                    for (int i=0; i<tids.Length; i++) {
+                        retVal[i] = tids[i];
+                    }
+                    delete tids;
+                    break;
+
+                case imp.ChannelClosed() :
+                    throw new Exception("GetProcessThreadIDs: imp channel closed");
+            }
+            return retVal;
+        }
+
+
+        public static void GetProcessInfo(ProcessContract.Imp:ReadyState! imp,
+                            ProcessData[]! processData
+                            )
+        {
+            for (int i = 0; i < processData.Length; i++) {
+                ProcessData! pd = (!)processData[i];
+                imp.SendGetProcessTimes(pd.id);
+                imp.RecvProcessTimes(out pd.totalTime, out pd.deadThreadTime, out pd.deadThreadCount);
+                pd.totalTime += pd.deadThreadTime;
+                imp.SendGetProcessGcStats(pd.id);
+                imp.RecvProcessGcStats(out pd.gcCount, out pd.gcTotalTime, out pd.gcTotalBytes);
+            }
+        }
+
+        public static string []! GetProcessNames(ProcessContract.Imp:ReadyState! imp, int []! ids)
+        {
+            string [] names = new string[ids.Length];
+            for (int i = 0; i < ids.Length; i++)
+            {
+                imp.SendGetProcessName(ids[i]);
+
+                switch receive
+                {
+                    case imp.NotFound() :
+                        break;
+
+                    case imp.ProcessName(char[]! in ExHeap procName) :
+                        names[i] = Bitter.ToString(procName);
+                        delete procName;
+                        break;
+
+                    case imp.ChannelClosed() :
+                        throw new Exception("GetProcessNames: imp channel closed");
+                }
+            }
+            return names;
+        }
+
+        public static void GetMemoryUsage(MemoryContract.Imp:ReadyState! imp, ProcessData[]! processData)
+        {
+            for (int i = 0; i < processData.Length; i++)
+            {
+                ProcessData! pd = (!)processData[i];
+                imp.SendGetProcessUsedMemory(pd.id);
+                imp.RecvMemory(out pd.memBytes);
+
+                imp.SendGetProcessPeakMemory(pd.id);
+                imp.RecvMemory(out pd.peakMemBytes);
+
+                imp.SendProcessUsedCommunicationHeap(pd.id);
+                imp.RecvBlocksAndTotal(out pd.commMemBlocks, out pd.commMemBytes);
+
+                imp.SendGetProcessHandlePages(pd.id);
+                imp.RecvPages(out pd.handlePages);
+            }
+        }
+
+        public static ProcessData[]! GetProcessData(ProcessContract.Imp:ReadyState! imp)
+        {
+            int [] ids = GetProcessIDs(imp);
+            string [] names = GetProcessNames(imp, ids);
+
+
+            ProcessData [] processData= new ProcessData[ids.Length];
+            for (int i = 0; i < ids.Length; i++)
+            {
+                ProcessData! pd = new ProcessData();
+                pd.id = ids[i];
+                pd.name = names[i];
+                pd.tids = GetProcessThreadIDs(imp, ids[i]);
+                processData[i] = pd;
+            }
+
+            GetProcessInfo(imp, processData);
+
+            return processData;
+        }
+    }
+
+    // AMD Performance Counter Code
+
+    [CLSCompliant(false)]
+    public struct PerfEvtSel
+    {
+        // Bits and Flags
+        public const uint CNT_MASK  = 0xff000000;
+        public const uint INV       = 0x00800000;
+        public const uint EN        = 0x00400000;
+        public const uint INT       = 0x00100000;
+        public const uint PC        = 0x00080000;
+        public const uint E         = 0x00040000;
+        public const uint OS        = 0x00020000;
+        public const uint USR       = 0x00010000;
+        public const uint UNIT_MASK = 0x0000ff00;
+        public const uint SELECTOR  = 0x000000ff;
+
+        // Common setting: Count all, but don't interrupt,
+        public const uint COUNT     = (EN | PC | OS | USR);
+        // public const uint COUNT     = (EN | PC | E | OS | USR);
+
+        // Selector values.
+        public const uint DCacheRefillFromL2OrSys           = 0x42; // Speculative
+        public const uint DCacheRefillFromSystem            = 0x43; // Speculative
+        public const uint DtlbL1MissL2Hit                   = 0x45; // Speculative
+        public const uint DtlbL1MissL2Miss                  = 0x46; // Speculative
+        public const uint CyclesNotHalted                   = 0x76; // No E
+        public const uint RequestsToL2Cache                 = 0x7d;
+        public const uint L2CacheMiss                       = 0x7e;
+        public const uint ItlbL1MissL2Hit                   = 0x84;
+        public const uint ItlbL1MissL2Miss                  = 0x85;
+        public const uint RetiredInstructions               = 0xc0; // No E
+        public const uint RetiredBranchInstructions         = 0xc2; // No E
+        public const uint RetiredBranchesMispredicted       = 0xc3; // No E
+        public const uint RetiredBranchesTaken              = 0xc4; // No E
+        public const uint CyclesInterruptsMasked            = 0xcd; // No E
+        public const uint CyclesInterruptsBlocked           = 0xce; // No E
+
+        public ulong value; // Required so Bartok doesn't die.
+
+        public static string ToString(ulong value)
+        {
+            switch (value & 0xff) {
+                case PerfEvtSel.DCacheRefillFromL2OrSys:    return "DCache_Refill_L2";
+                case PerfEvtSel.DCacheRefillFromSystem:     return "DCache_Refill_Sys";
+                case PerfEvtSel.DtlbL1MissL2Hit:            return "DTLB_L2_Hit";
+                case PerfEvtSel.DtlbL1MissL2Miss:           return "DTBL_L2_Miss";
+                case PerfEvtSel.CyclesNotHalted:            return "CyclesNotHalted";
+                case PerfEvtSel.RequestsToL2Cache:
+                    if ((value & 0x400) != 0) {
+                        return "TLB_L2_Requests";
+                    }
+                    return "Req_L2_Cache";
+                case PerfEvtSel.L2CacheMiss:
+                    if ((value & 0x400) != 0) {
+                        return "TLB_L2_Miss";
+                    }
+                    return "L2_Cache_Miss";
+                case PerfEvtSel.ItlbL1MissL2Hit:            return "ITLB_L2_Hit";
+                case PerfEvtSel.ItlbL1MissL2Miss:           return "ITLB_L2_Miss";
+                case PerfEvtSel.RetiredInstructions:        return "Retired_Inst.";
+                case PerfEvtSel.RetiredBranchInstructions:  return "Branches";
+                case PerfEvtSel.RetiredBranchesMispredicted:return "Br_Mispredicted";
+                case PerfEvtSel.RetiredBranchesTaken:       return "Br_Taken";
+                case PerfEvtSel.CyclesInterruptsMasked:     return "Ints_Masked (cyc)";
+                case PerfEvtSel.CyclesInterruptsBlocked:    return "Ints_Blocked (cyc)";
+                default:
+                    return String.Format("{0:x16}", value);
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebApps/SPECweb99/SPECWeb99_app.csproj b/base/Applications/WebApps/SPECweb99/SPECWeb99_app.csproj
new file mode 100644
index 0000000..603e06d
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/SPECWeb99_app.csproj
@@ -0,0 +1,43 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SPECWeb99</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="CachedFile.sg" />
+    <Compile Include="SPECWeb99.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Manifest\Manifest.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml2\Singularity.Xml2.csproj" />
+    <ProjectReference Include="..\Driver\WebAppDriver.csproj" />
+    <ProjectReference Include="..\FSUtils\WebAppFSUtils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/SPECweb99/client.exe b/base/Applications/WebApps/SPECweb99/client.exe
new file mode 100644
index 0000000..325ffad
Binary files /dev/null and b/base/Applications/WebApps/SPECweb99/client.exe differ
diff --git a/base/Applications/WebApps/SPECweb99/manager b/base/Applications/WebApps/SPECweb99/manager
new file mode 100644
index 0000000..cb0c58c
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/manager
@@ -0,0 +1,2474 @@
+#!/usr/local/bin/perl
+#
+#
+# (C) 1997 Standard Performance Evaluation Corporation
+#
+#    Revised 06/05/98 - Paula
+#    Added support for Custom Ad Rotation model: Dynamic GET w/Cookie
+#    Created 3 Dynamic URLS to support POST, GET, and GET w/cookie
+#    will default to use DYNAMIC_ROOT (POST) if others not specified
+#    Add percentage for GET w/cookie to loadload data.  Also fixed
+#    defaults for other percentages and changed lg_proc and lg_num to
+#    use actual test values to avoid configuration description errors.
+#
+#    Revised 09/23/98 - Paula, Keti, Yea-Cheng
+#	Ketii:	   Added client logging option; use -l option to invoke.
+#       Yea-Cheng: Improved post log validation to check for serialization 
+#                  across all clients not just within each client (ie. check 
+#                  that the record id increases after each entry).  This is 
+#		   in keeping with the 2.1.2 SUT run rule where the result of 
+#		   any dynamic request must be visible to any client on any
+#		   subsequent dynamic request.
+#	Paula:     Added urlroot to list of parameters passed on Reset command,
+#		   this will be used in WEB98_INC processing.
+#		   Updated parameters used for dynamic script designation - 
+#		   allow use of 4 separate RC parameters to specify COMMAND's,
+#		   simple dynamic GET's, dynamic GET's for Custom Ad Rotation 
+#	           model and POST's
+#		   Add minor bug fixes.
+#
+#    Revised 02/01/99 - Yea-Cheng
+#    Support the new SIMULTANEOUS_CONNECTIONS in the rc file. LOAD_VALUES and 
+#    PROCS are no more supported. In the rc file, a client can be configured 
+#    as name(port)[speed].
+#
+#
+#    SIMULTANEOUS_CONNECTIONS replaces LOAD_VALUES in the sense that the 
+#    number of connections will be distributed among all the clients as the 
+#    requested workload of a client. The speed of a client will be taken 
+#    into consideration when calculating the workload distribution. On a 
+#    client system, there will be as many number of processes/threads 
+#    created as the requested workload. Each of these processes/threads 
+#    will send requests to the SUT in a contiguous manner. 
+#
+#    Support the new USER_LINE_SPEED, and USER_SPEED_LIMIT in the rc file. 
+#    Every Client process/thread will not start another operation until enough 
+#    time has elapsed so that all the bytes received from the SUT can be 
+#    transmitted over the user dial up line. The speed of the dialup line
+#    (USER_LINE_SPEED) will determine that elapsed time. The connection to 
+#    the SUT will remain open for that period of time.
+#  
+#    Based on the average size of SPECweb fileset files, at the user
+#    dialup line speed of 400000bits/secs, each connection can get about
+#    3 OPS/sec. SIMULTANEOUS_CONNECTIONS will therefore determine the scope 
+#    of the file_set directories every client will access in a single run.
+#
+#    Process the new result data: rate, rate2, and aggregate_bytes.
+#    Report the new result in terms of the number of simultaneous connections,
+#    the aggregate bit rate, the throughput, and the statistical 
+#    distributions of bit rates in raw, ascii, and screen formats. 
+#
+#    Other changes: unlink 'post.log' file before fetching it from the server.
+#    
+#    Revised 2/24/99 - Ruth Morgenstein
+#    Changed the way run data from each point is passed around.  There
+#    used to be 3 pieces of data in the 'config' structure (connections,
+#    throughput, and avg. response).  There's more data than that, so
+#    I replaced those 3 fields with an associative array containing
+#    all the relevant data.  Having this array, makes it easy to change
+#    what data gets passed around.
+#
+#
+#    Revised 2/26/99 - Ruth Morgenstein
+#    Added code to support ITERATIONS.  For each point in SIMULTANEOUS_
+#    CONNECTIONS, it will be repeated ITERATIONS times.  Each group if
+#    ITERATIONS is a separate test.  For each group, WARMUP_TIME done
+#    before the 1st point and the new parameter RAMPUP_TIME is done
+#    before iterations 2 through n.
+#    
+#    The reported result is the median value.
+#
+#    Revised 3/11/99 - Ruth Morgenstein
+#    Add checking for required values to make sure the test will be valid.
+#    Added -C flag, to make all required values conforming
+#    Added validation code to check all paths for GETs and POSTS
+#    Changed SPECweb98 to SPECweb99 in ASCII output
+#    Better error reporting
+#    
+#
+#    
+
+
+require 5.005;
+use Getopt::Std;
+use IO::Select;
+use Time::localtime;
+use LWP::UserAgent;
+
+
+use strict;
+use IO::Socket;
+use IO::File;
+use Compress::Zlib;
+use MIME::Base64;
+use Cwd;
+use WebClient;
+
+sub Log;
+sub client_log; 
+
+##############################################################################
+# Set up global variables
+##############################################################################
+
+use vars qw ($perfcnt);
+
+use vars qw(@info @config_files %formatter $default_config_file $output_dir);
+
+$default_config_file = "rc";
+
+use vars qw(@info @config_files %formatter $default_config_file
+	    $MAX_ERROR_RATE $MIX_TOLERANCE $MIN_WARMUP_TIME $MIN_CONFORM_PCT 
+	    $REQ_ITERATIONS 
+	    $REQ_RUN_TIME 
+	    $REQ_RAMPUP_TIME 
+	    $REQ_RAMPDOWN_TIME
+	    $REQ_DYNAMIC_CONTENT 
+	    $REQ_DYNAMIC_POST 
+	    $REQ_DYNAMIC_CAD_GET
+	    $REQ_DYNAMIC_CGI_GET 
+	    $REQ_REQUESTS_PER_KEEP_ALIVE
+	    $REQ_PERCENT_KEEP_ALIVE_REQUESTS 
+	    $REQ_ABORTIVE_CLOSE
+	    $REQ_USER_LINE_SPEED 
+	    $REQ_USER_SPEED_LIMIT 
+	    $REQ_MAX_FILE
+	    $REQ_WAIT_BETWEEN_POINTS
+	    $ERROR_CHECK_RANGE 
+	    $FILES_PER_CLASS
+	    $MB_PER_DIRECTORY);
+
+
+$MAX_ERROR_RATE    = .0104999999;  # dependant upon %.3f formatting
+$MIX_TOLERANCE     = .1049999999;  # dependant upon %.3f formatting
+$MIN_WARMUP_TIME   = 1200;
+$MIN_CONFORM_PCT   = 95;
+
+$REQ_ITERATIONS    = 3;
+$REQ_RUN_TIME      = 1200;
+$REQ_RAMPUP_TIME   = 300;
+$REQ_RAMPDOWN_TIME   = 300;
+$REQ_DYNAMIC_CONTENT = 0.3;
+$REQ_DYNAMIC_POST = 0.16;
+$REQ_DYNAMIC_CAD_GET = 0.42;
+$REQ_DYNAMIC_CGI_GET = .005;
+$REQ_REQUESTS_PER_KEEP_ALIVE = 10;
+$REQ_PERCENT_KEEP_ALIVE_REQUESTS = 0.7;
+$REQ_ABORTIVE_CLOSE = 0;
+$REQ_USER_LINE_SPEED = 400000;
+$REQ_USER_SPEED_LIMIT = 320000;
+$REQ_MAX_FILE = 8;
+$REQ_WAIT_BETWEEN_POINTS = 0;
+
+$ERROR_CHECK_RANGE = .25;
+$FILES_PER_CLASS = 9;
+$MB_PER_DIRECTORY = 4.88;
+
+use vars qw($verbose $output_types @output_types $ignore_errors $compliant
+	    $rawformat $logclient $file_num $test_time $version $rcs_version
+	    $max_load @configs $short_version $details);
+use vars qw( @network_fields
+	     @clients_fields @bm_config_fields @notes_fields );
+
+
+&init_output;
+
+@info = (
+    @network_fields,
+    @clients_fields,
+    @bm_config_fields,
+    @notes_fields,
+);
+
+$verbose = 10;
+$output_types="";
+$logclient = 1;	
+$details = 0;
+
+$test_time = time;
+$version = "99-v1.0";
+($short_version)= $version =~ m/([\d.]+-)/;
+$rcs_version = q#$Id: manager,v 1.30 1999/06/29 20:30:12 ruth Exp $#;
+
+
+#
+# A note on the @configs data structures.
+#
+# @configs is an array of inputs and results from each config file.
+#   A config file can either be an "rc" file that gets used to run a test,
+#   or a raw file that gets read in for post-processing.
+# We typically operate on 1 $config within @configs at a time
+#
+# Each $config a reference to a hash containing inputs and results from a
+# series of points
+# 
+# Each $config hash has a key for each input from the rc file.  For example,
+#  $config->{'WARMUP_TIME'} is used to hold the WARMUP_TIME that was input
+#  from the rc file.  In addition, there are 2 substructures, used to hold
+#  output data from the test:
+#         'results'
+#         'errors'
+# 
+# The 'results' key contains an array, @results, with each element of the array
+# representing the results from an individual run within the series of
+# tests.
+# Each array element $results in the @results array contains an array, with each
+# entry as the following
+#    $results[0]    %run_stats - hash of statistics from the point
+#    $results[1]    $run_number - (this ought match the index of @results)
+#    $results[2]    $unused field
+#    $results[3]    @class_results - per class rollup info
+#    $results[4]    @errors - errors for this run
+#
+#
+# The %run_stats contains the following keys:
+#  connections, invalid, conforming, conform_pct, throughput,
+#  ops_per_thread, response, bitrate, cum_conformance
+#
+# So, to roll things up, here's an example of getting to a run stat, for the
+# 5th point in a test
+# $config->{'results'}[4][0]{'conforming'}
+#
+# My advice:  use lots of temporaries    
+#
+#  -- Ruth                  
+
+if (! exists $ENV{'SPEC'}) {
+    die "\nERROR: environement variable \$SPEC not defined.\n" .
+	"Do \". shrc\" in sh or \"shrc.bat\" from NT to setup SPEC environment\n\n";
+}
+
+
+if (! -e "$ENV{'SPEC'}/bin/fonts") {
+    die "\nERROR: SPEC environment not properly installed.\n" .
+	"Can't find \$SPEC/bin/fonts directory\n\n";
+}
+    
+
+# Make sure the results directory exists
+$output_dir = "results/";
+mkdir $output_dir, 0755 if ! -d $output_dir;
+
+# Initialize HTTP useragent
+my $ua = new LWP::UserAgent;
+$ua->agent("SPECweb/$short_version " . $ua->agent);
+
+# Open up the log file
+my $file_num = &find_next_number($output_dir);
+my $log_file = "res.$file_num";
+open (LOG, ">$output_dir$log_file") || 
+    die "Can't open log file '$log_file': $!\n";
+select((select(LOG),$|=1)[0]);  # Unbuffer LOG file
+
+
+Log (10, "\nOpened logfile $output_dir$log_file\n");
+
+#    die "
+#$ENV{'SPEC'}/bin/fonts") if exists $ENV{'SPEC'};
+
+sub usage {
+    print <<EOT;
+Usage: $0 [options] [option=val...] [file...] 
+    -v   #       verbosity level
+    -o   types   Produce output in the specified types
+    -I           Do not abort on certain classes of errors
+    -R           files are reformatted and not used as config files
+    -l           Turn off client logging in log-client.nnn file
+    -C           set all parameters need for a compliant run
+    -D           turn on details in the ASCII output
+EOT
+    exit 1;
+}
+
+sub parse_arguments {
+    my %opts;
+    my $rc = getopts("Iv:c:d:ho:RlCD", \%opts);
+    &usage if $opts{'h'} || !$rc;
+
+    push (@config_files, $opts{'c'})  if defined $opts{'c'};
+    $verbose           = $opts{'v'}   if defined $opts{'v'};
+    $output_types      = $opts{'o'}   if defined $opts{'o'};
+    $ignore_errors     = 1            if defined $opts{'I'};
+    $rawformat         = 1            if defined $opts{'R'};
+    $logclient         = 0            if defined $opts{'l'};
+    $compliant         = 1            if defined $opts{'C'};
+    $details           = 1	      if defined $opts{'D'};
+
+
+    @config_files = grep(!m/=/, @ARGV);
+    @ARGV = grep(m/=/, @ARGV);
+}
+
+parse_arguments();
+
+#open log file for client summaries if user specified this option
+if ($logclient) {
+    my $cllog_file = "log-client.$file_num";
+    open (CLLOG, ">$output_dir$cllog_file") || die "Can't open client log file '$cllog_file': $!\n";
+    select((select(CLLOG),$|=1)[0]);  # Unbuffer client log file
+    Log (10, "\nOpened client logfile $output_dir$cllog_file\n");
+}
+
+
+# These are the valid formatters, to add a new formatter just write the
+# function and add it here.
+$formatter{'asc'}     = \&write_asc;
+$formatter{'screen'}  = \&write_screen;
+$formatter{'raw'}     = \&write_raw;
+
+# If no config file was specified, use the efault
+push (@config_files, $default_config_file) if (!@config_files);
+
+# Rawformat is the process of taking a .raw file and outputting any of
+# the defined output formats.  This is used so that people don't have
+# to create all of the different outputs they desire at once.  They can
+# produce any output from a .raw file.  Also useful for fixing up
+# incorrect notes and things.
+
+if ($rawformat) {
+    # for all of the files (not actually config files) specified on the
+    # command line
+    for my $config_file (@config_files) {
+	local(*FILE);
+	open (FILE, "<$config_file") || die "Cannot open '$config_file'";
+	my @foo=();
+	# Grab the raw data out of the file
+	while (<FILE>) {
+	    push (@foo, $_) if /^(%% )?BEGIN SPECWEB99/ .. /^(%% )?END SPECWEB99/;
+	}
+	close(FILE);
+
+	if ($#foo < 0) {
+	    print STDERR "******\n$config_file is not a valid raw file\n";
+	    next;
+	}
+
+	# strip any comment and character escaping that might have been
+	# done.  We comment for Postscript and PDF and escape for HTML.
+	@foo = grep(!m/(%% )?(BEGIN|END) SPECWEB99/, @foo);
+	grep(s/^\s*%%\s*//, @foo);
+	grep(s/\&lt;/</g, @foo);
+	grep(s/\&gt;/>/g, @foo);
+	grep(s/\&amp;/\&/g, @foo);
+
+	# Read in the config file, we use a special option to mark this
+	# as a read of a raw file.
+	my $config = config_read(\@foo, 1);
+
+	my ($num) = $config_file =~ m/^.*\.(\d+)\.raw$/;
+	&do_outputs($config, $num, $output_dir);
+    
+    }
+    # If rawformatting that's all we do
+    exit (0);
+}
+
+# Read in and parse all the config files and find the maximum load value
+$max_load = 0;
+for (@config_files) {
+    my ($req, $res, $url);
+
+    #as we read each config file, we save its info as an entry in @configs
+    my $config = config_read($_);
+    push (@configs, $config);
+
+    # Make sure that for each config file, we can actually do all the
+    # operations (Static GET, Dyn GET, Dyn CGI GET, Dyn CAD GET, Dyn POST)
+    Log(5, "\nValidating all paths for $config->{'FILENAME'}\n");
+    &verify_all_HTTP_operations($config);
+    Log(5, "\n");
+}
+
+
+# Run all of the separate config files
+for my $config (@configs) {
+
+#    &validate_config($config);
+    #For multiple iterations, monkey with the SIMULTANEOUS CONNECTIONS
+    #parameter to make separate tests for each point
+    if ($config->{'ITERATIONS'} > 1) {
+	my @saved_connections_list = @{$config->{'SIMULTANEOUS_CONNECTIONS'}};
+	foreach my $point (@saved_connections_list) {
+	    $config->{'results'} = [];
+	    $config->{'errors'} = [];
+	    &validate_config($config);
+
+	    @{$config->{'SIMULTANEOUS_CONNECTIONS'}} = ();
+	    for (my $i = 0; $i < $config->{'ITERATIONS'}; $i++) {
+		push (@{$config->{'SIMULTANEOUS_CONNECTIONS'}} ,$point);
+	    }
+	    run_all ($config);
+	    &do_outputs($config, $file_num, $output_dir);
+	    $file_num++;
+	}
+    }
+        
+    #If single iteration, then just run all the points -- this is really
+    #just a testing mode, not something that can be done in a submittable test
+    else {
+	&validate_config($config);
+	run_all($config);
+	&do_outputs($config, $file_num, $output_dir);
+	$file_num++;
+    }
+}
+
+##############################################################################
+# Config file routines
+##############################################################################
+
+# Initialize configuration file to have default values
+sub config_init {
+    Log(30, 'init_config\n');
+    my $config = {};
+
+    &set_required_parameters($config);
+
+    $config->{'SIMULTANEOUS_CONNECTIONS'} =  10;
+    $config->{'SUCCESSIVE_SPEED_LIMITS'} = 0;
+    $config->{'LOAD_FILL'}           =   0;
+    $config->{'CLIENTS'}             = 'client1';
+    $config->{'URL_ROOT'}            = 'http://server/spec/file_set';
+    $config->{'DYNAMIC_ROOT'}        = 'http://server/spec/cgi-bin/dynamic?';
+    $config->{'DYN_CMD_SCRIPT'}      = '';
+    $config->{'DYN_GET_SCRIPT'}      = '';
+    $config->{'DYN_CAD_SCRIPT'}      = '';
+    $config->{'DYN_CGI_SCRIPT'}      = '';
+    $config->{'DYN_POST_SCRIPT'}     = '';
+    $config->{'HTTP_PROTOCOL'}       = '';
+
+    $config->{'SERVER'}              = "server";
+    $config->{'OUTPUT_NAME'}         = "output";
+#    $config->{'LOG_SUFFIX'}          = ".err";
+    $config->{'WAIT_TO_BEGIN'}       = 5;
+    $config->{'WAIT_BETWEEN_POINTS'} = 0;
+    $config->{'OUTPUT_TYPE'}         = "all";
+    $config->{'Volume'}              = '--';
+    $config->{'Issue'}               = '--';
+    $config->{'Page'}                = '--';
+    $config->{'munge_date'}          = 1;
+#    $config->{'detail'}		     = 1;  #Turn on more data in ASCII
+
+    for (@info) {
+	$config->{$_->[1]} = '';
+    }
+
+    return $config;
+}
+
+
+
+sub set_required_parameters {
+    my ($config) = @_;
+
+    $config->{'USER_LINE_SPEED'}     =  $REQ_USER_LINE_SPEED;
+    $config->{'USER_SPEED_LIMIT'}    =  $REQ_USER_SPEED_LIMIT;
+    $config->{'RUN_TIME'}            = $REQ_RUN_TIME;
+    $config->{'RAMPDOWN_TIME'}       =  $REQ_RAMPDOWN_TIME;
+    $config->{'RAMPUP_TIME'}         =  $REQ_RAMPUP_TIME;
+    $config->{'DYNAMIC_CONTENT'}     = $REQ_DYNAMIC_CONTENT;
+    $config->{'DYNAMIC_POST'}        = $REQ_DYNAMIC_POST;
+    $config->{'DYNAMIC_CAD_GET'}     = $REQ_DYNAMIC_CAD_GET;
+    $config->{'DYNAMIC_CGI_GET'}     = $REQ_DYNAMIC_CGI_GET;
+    $config->{'REQUESTS_PER_KEEP_ALIVE'} = $REQ_REQUESTS_PER_KEEP_ALIVE;  
+    $config->{'PERCENT_KEEP_ALIVE_REQUESTS'} =$REQ_PERCENT_KEEP_ALIVE_REQUESTS; 
+    $config->{'MAX_FILE'}            = $REQ_MAX_FILE;
+    $config->{'ABORTIVE_CLOSE'}      = $REQ_ABORTIVE_CLOSE;
+    $config->{'ITERATIONS'}      = $REQ_ITERATIONS;
+    $config->{'WAIT_BETWEEN_POINTS'}      = $REQ_WAIT_BETWEEN_POINTS;
+    
+
+    $config->{'WARMUP_TIME'}         = $MIN_WARMUP_TIME if $config->{'WARMUP_TIME'} < $MIN_WARMUP_TIME;
+
+}
+# Read in a configuration file
+#     $file may be a filename or an reference to the array containing
+#     the file.
+sub config_read {
+    my($file, $rawread) = @_;
+    my ($key, $value, $num, @lines);
+
+    Log(30, "Reading Config file\n");
+
+    # Initializes the default values for the config file.
+    my $hash = config_init();
+
+    # If it's an array then just use it, otherwise read in the file.
+    if (ref($file) eq "ARRAY") {
+	@lines = @$file;
+    } else {
+	$hash->{'FILENAME'} = $file;
+	my $fh = new IO::File "< $file";
+	die "Can't open file '$file': $!\n" if (!defined $fh);
+	@lines = $fh->getlines;
+	$fh->close;
+    }
+
+    # Put any option=val arguments at the bottom so they override the
+    # values in the config file.
+    push (@lines, @ARGV);
+    my @rawlines = grep(!m/^\s*[#;]>/, @lines);
+
+
+    # If we are reading a .raw file, we need to define some values so
+    # that they won't be interpreted as errors
+    if ($rawread) {
+	for (qw(median_index median_results metric
+		test_time WORK_DIR FILENAME MAX_LOAD version
+		total_speed rcs_version rawconfig)) {
+	    $hash->{$_} = '--';
+	}
+	$hash->{'results'} = [];
+	$hash->{'errors'}  = [];
+    } 
+
+    # Parse the actual file
+    for (@lines) {
+	if (m/^\s*$/ || m/^\s*[#;]/) {
+	    # Comments and blank lines are ignored
+	} elsif (m/^\s*(\S+)\s*=\s*"(.*)"\s*$/ || 
+		 m/^\s*(\S+)\s*=\s*(.*\S)\s*$/ ||
+		 m/^\s*(\S+)\s*=\s*(.*)/){
+	    # key=value, key="value" are accepted
+	    ($key, $value) = ($1, $2);
+
+	    # Check to see if the key is in the form of label### these
+	    # are treated specially
+	    $num = -1;
+	    if ($key =~ m/(.*\D)(\d+)/) {
+		($key, $num) = ($1, $2);
+	    }
+
+	    # If the key is results then we have to parse the line to
+	    # fill out our data
+	    if ($key eq "results") {
+		# Make sure we have somewhere to put the data
+		if (!defined $hash->{'results'}[$num]) {
+		    $hash->{'results'}[$num] = [];
+		    $hash->{'results'}[$num][0] = {};    # %run_stats
+		    $hash->{'results'}[$num][1] = $num;  # $run_num
+		    $hash->{'results'}[$num][2] = "unused_field";
+		    $hash->{'results'}[$num][3] = [];    # @class_results
+		    $hash->{'results'}[$num][4] = [];    # @errors
+		}
+
+
+
+		# For quick reference
+		my $res = $hash->{'results'}[$num];
+		# Find out our subkey so we can put the data in the
+		# right place
+		my ($subkey, $val);
+		if (($subkey, $val) = $value =~ m/(\S+)\s+(.*)/) {
+		    #find error strings
+		    if ($subkey eq "error") {
+			push (@{$res->[4]},  $val) ;
+		    }
+		    #find per class statistics
+		    elsif ($subkey eq "class") {
+			my ($class_num, $class_name, $class_data) = 
+			    $val =~ m/^(\d+)\s+"(.*)"\s+(.*)/;
+			$res->[3][$class_num] = [ $class_name, split(" ", $class_data) ];
+		    }
+		    else {
+			# all the rest are other result statistics
+			$res->[0]{$subkey} = $val;
+		    }
+
+		} else {
+		    Log(10, "Can't parse line: $_\n");
+		    next;
+		}
+	    } elsif (!defined $hash->{$key}) {
+		# We make sure that there aren't any typos by only
+		# accepting keys which we have defined for the user
+		$num = '' if ($num == -1);
+		Log(10, "Key '$key$num' is unknown.  Ignoring.\n");
+	    } else {
+		# If it was in the form label### assign the value to
+		# the correct index in the entry, otherwise just assign
+		# the value.
+		#if ($num ne "") {
+		if ($num != -1) {
+		    if (ref($hash->{$key}) ne "ARRAY") {
+			$hash->{$key} = [$hash->{$key}];
+		    }
+		    $hash->{$key}->[$num] = $value;
+		} else {
+		    $hash->{$key} = $value;
+		}
+	    }
+	} else {
+	    Log(10, "Can't parse $.: $_\n");
+	}
+    }
+
+    $hash->{'metric'} = 'SPECweb99';
+
+    if (!$rawread) {
+	chomp(@rawlines); chomp(@rawlines);
+	my $rawtxt = join("\n", @rawlines);
+	my $cmptxt = Compress::Zlib::memGzip($rawtxt);
+	my $md5txt = encode_base64($cmptxt);
+	$hash->{'rawconfig'} = [ split("\n", $md5txt) ];
+    }
+
+
+    # Fix up a bunch of values
+	
+    &finalize_config($hash,[qw(SIMULTANEOUS_CONNECTIONS CLIENTS)]) if !$rawread;
+
+    # If $compliant asked for, then change the parameters to valid values
+    if ($compliant && !$rawread) {
+	Log (10, "\nSetting all required parameters to legal values\n\n");
+	&set_required_parameters($hash);
+    }
+
+    # Any descriptive information which doesn't have a label gets
+    # assigned two dashes
+    for (@info) {
+	my $key = $_->[1];
+	$hash->{$key} = "--" if ($hash->{$key} =~ /^\s*$/);
+    }
+
+    # The 'errors' field in @notes_field in @info shouldn't
+    # get preloaded with '--'.  We want it to be an array
+    delete $hash->{'errors'} if !$rawread;
+
+    return $hash;
+}
+
+# Fix up the data from the config file
+sub finalize_config {
+    Log(30, "finalize_config\n");
+    my ($hash, $multi) = @_;
+    my ($key, %load, $step, $fudge_step, $fudge, $num, $bad, $i);
+
+    # Turn multi-valued entries into an arrays so we can fetch data out easily
+    for $key (@$multi) {
+	if (ref($hash->{$key}) eq "") {
+	    $hash->{$key} = [grep(!/^\s*$/, split(/ |,/, $hash->{$key}))];
+	}
+    }
+    $hash->{'OUTPUT_TYPES'} = 
+	join (",", grep(!/^\s*$/, split(/ |,/, $hash->{'OUTPUT_TYPES'})));
+
+    # Make sure we have version information
+    $hash->{'version'}    =$version     if !defined $hash->{'version'};
+    $hash->{'rcs_version'}=$rcs_version if !defined $hash->{'rcs_version'};
+
+    # Check to see if MSL and TIME_WAIT were RFC compliant
+    ($hash->{'msl'})       = $hash->{'msl'}       =~ /(\d+)/;
+    ($hash->{'time_wait'}) = $hash->{'time_wait'} =~ /(\d+)/;
+    $hash->{'msl'}       .= ' (Non RFC1122)' if $hash->{'msl'} < 120;
+    $hash->{'time_wait'} .= ' (Non RFC1122)' if $hash->{'time_wait'} < 240 || 
+					$hash->{'time_wait'}/$hash->{'msl'} < 2;
+
+
+    # Record where this took place
+    $hash->{'WORK_DIR'}  =cwd if ($hash->{'WORK_DIR'} eq "");
+
+    # Set individual DYN parameters if the 1-size-fits-all DYNAMIC_ROOT was used
+    if ($hash->{'DYN_GET_SCRIPT'} eq '') {
+	$hash->{'DYN_GET_SCRIPT'} = $hash->{'DYNAMIC_ROOT'} 
+    }
+    if ($hash->{'DYN_CAD_SCRIPT'} eq '') {
+	$hash->{'DYN_CAD_SCRIPT'} = $hash->{'DYNAMIC_ROOT'} 
+    }
+    if ($hash->{'DYN_POST_SCRIPT'} eq '') {
+	$hash->{'DYN_POST_SCRIPT'} = $hash->{'DYNAMIC_ROOT'} 
+    }
+    if ($hash->{'DYN_CMD_SCRIPT'} eq '') {
+	$hash->{'DYN_CMD_SCRIPT'} = $hash->{'DYNAMIC_ROOT'} 
+    }
+    # Get rid of the '?' and anything following it
+    ($hash->{'DYN_CMD_SCRIPT'} = $hash->{'DYN_CMD_SCRIPT'}) =~ s/\?.*$//;
+    print "$hash->{'DYN_CMD_SCRIPT'} \n";
+
+    # This code is from before we had reasonable RAMP_DOWN values
+    # Set some really long value for WAIT_BETWEEN_POINTS.  Hopefully to
+    # allow all of the sockets to shut down gracefully.
+#    if ($hash->{'WAIT_BETWEEN_POINTS'} eq "" && $hash->{'time_wait'} > 0) {
+#	$hash->{'WAIT_BETWEEN_POINTS'} = $hash->{'time_wait'};
+#    }
+
+
+    #expand any ranges in simultaneous_connections string and store list
+    @{$hash->{'SIMULTANEOUS_CONNECTIONS'}} =
+	&expand_ranges(@{$hash->{'SIMULTANEOUS_CONNECTIONS'}});
+
+    $hash->{'MAX_LOAD'} = &max(@{$hash->{'SIMULTANEOUS_CONNECTIONS'}});
+
+    # Make sure that we have 10 evenly spaced points
+    %load = map {$_ => 1} @{$hash->{'SIMULTANEOUS_CONNECTIONS'}};
+    my $max = $hash->{'MAX_LOAD'};
+
+
+        if ($max < 10 && $hash->{'LOAD_FILL'}) {
+	Log(5, "Can't make 10 evenly spaced points for a load of less than 10\n");
+    }
+
+    # Store the load in order 
+    @{$hash->{'SIMULTANEOUS_CONNECTIONS'}} = sort { $a <=> $b } keys %load;
+    $hash->{'test_time'} = $test_time;
+
+    # Parse the client names.  See if they've overridden the port to
+    # connect to, or if they've specified a relative speed rating
+    $hash->{'clients_parsed'} = [];
+    $hash->{'total_speed'} = 0;
+
+    Log(10, "\nCLIENT LIST: \n");
+    $i = 1;
+    for (@{$hash->{'CLIENTS'}}) {
+	my ($name, $port, $speed, $host);
+	($port)  = m/\((\d*)\)/;           # ()
+	($speed) = m/\[([\d.]*)\]/;        # []
+	($host)  = m/\{([^<{([\])}>]*)\}/; # {}
+	($name)  = m/^([^<{([\])}>]+)/;
+	$speed = 1 if $speed eq "" || $speed <= 0;
+        Log(10, "  Client $i: name=$name, port=$port, speed=$speed, host=$host\n");
+	$hash->{'total_speed'} += $speed;
+	push (@{$hash->{'clients_parsed'}}, [$name, $port, $speed, $host]);
+	$i++;
+    }
+}
+
+##############################################################################
+# Do the actual runs
+##############################################################################
+
+sub run_all {
+    Log(30, "run_all\n");
+    my ($config) = @_;
+    #my (@values)   = &expand_ranges(@{$config->{'SIMULTANEOUS_CONNECTIONS'}});
+    my (@values)   = @{$config->{'SIMULTANEOUS_CONNECTIONS'}};
+    my $num_runs  = 1;
+    my $max_run   = @values;
+
+#    my @results;
+
+    # Do a run for each requested load value
+    for (my $i = 0; $i < @values; $i++)  {
+	my $load = $values[$i];
+#    while (@values) {
+#	my $load = shift @values;
+        my $date = &date;
+
+	#for multiple iterations, the 1st point does a long warmup,
+	#and the rest of the points do a short rampup
+	
+
+	my $test_warmup = $config->{'WARMUP_TIME'};
+	my ($tmp_string) = "Point $num_runs";
+
+	if ($config->{'ITERATIONS'} > 1 ) {
+	    $tmp_string = "Iteration $num_runs of $config->{'ITERATIONS'}";
+	    if ( $i > 0) {
+		$test_warmup = $config->{'RAMPUP_TIME'};
+	    }
+	}
+
+	$tmp_string = sprintf("\n%s with load of %d connections\n%s\n",
+			      $tmp_string, $load, $date);
+	
+	Log (10, $tmp_string);
+	&client_log($tmp_string) if $logclient;
+
+	my $num_clients = @{$config->{'CLIENTS'}};
+	Log 101, <<EOT;
+=============================================================================
+Number of clients        = $num_clients
+Simultaneous Connections = $load
+Warm-up time (seconds)   = $test_warmup
+Run time (seconds)       = $config->{'RUN_TIME'}
+EOT
+
+	my $rc = run_one($config, $load, $num_runs++, $test_warmup);
+	if (!defined $rc) {
+	    &Log(10, "Error running with load of $load\n");
+	    return undef if !$ignore_errors;
+	}
+	if (@values) {
+	    &Log(20, "Waiting for $config->{'WAIT_BETWEEN_POINTS'} seconds between points\n");
+	    sleep ($config->{'WAIT_BETWEEN_POINTS'});
+	}
+    }
+
+    &validate_results($config);
+
+
+    #Log(10, "Finding median result\n");
+    ($config->{'median_index'},$config->{'median_results'}) = 
+	&find_median_result($config);
+
+#    my(%med_run_stats)= %{$config->{'results'}[$config->{'median_index'}][0]};
+    
+#    $config->{'bm_requested_conn'} = $med_run_stats{'requested_conn'};
+#    $config->{'bm_fileset_size'} = $MB_PER_DIRECTORY * 
+#	&dirs_from_load($config, $med_run_stats{'requested_conn'});
+
+}
+
+
+# Run one data point
+sub run_one {
+    Log(30, "run_one\n");
+    my ($config, $load, $num, $test_warmup) = @_;
+    my ($i, $j, $exe, $hostname, $client, @clients);
+    my (%tmp, $tmp, @errors, $class);
+    my ($ts, $ts1, $ts2);
+
+    my $num_clients = @{$config->{'CLIENTS'}};
+    my $total_speed = $config->{'total_speed'};
+
+    my $client_num = 0;
+    my $expired_list = '' ;
+    my @client_loads;
+
+
+    #Calculate the total load with regard to the weightings
+    my $total_load;
+    my $wtload = 0;
+    
+    for my $data (@{$config->{'clients_parsed'}}) {
+	my ($hostname, $port, $speed, $clients_server) = @$data;
+	my $client_load = int ($load * ($speed/$total_speed));
+	if ($client_load > $wtload) {
+	    $wtload = $client_load;
+	}
+	
+	$total_load += $client_load;
+	push (@client_loads, $client_load);
+	next if $client_load <= 0;
+    }
+    my $maxthread = $num_clients * $wtload;
+    
+    # If the total load is not evenly divisible by the clients
+    # and their weightings, then distribute the extra processes
+    my $delta_load = $load  - $total_load;
+    for (; $delta_load > 0; $delta_load--) {
+	@client_loads[$delta_load]++;
+    }
+    
+    # Initialize the POST and Get w/Cookie data on the server if necessary
+    if ($config->{'DYNAMIC_POST'} > 0 || $config->{'DYNAMIC_CAD_GET'} > 0 ) {
+	my ($req, $res, $dynamic_url);
+
+	$ts = time;
+	$ts1 = $ts % 360;
+	$ts2 = $ts1 + 100;
+	if ($ts2 > 359) {
+	    $ts = $ts2 - 360;
+	    $ts2 = $ts1;
+	    $ts1 = $ts;
+	}
+	$expired_list = $ts1 . ',' . $ts2;
+
+	# For the command/Reset, we don't want any other argument pieces
+	# so delete everything after the first '?' and append the command.
+	$dynamic_url = $config->{'DYN_CMD_SCRIPT'};
+        $dynamic_url  =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+
+
+	my $pttime = $config->{'RUN_TIME'} + $test_warmup + $config->{'RAMPDOWN_TIME'};
+	my $tmp_url_root = $config->{'URL_ROOT'};
+	$tmp_url_root =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+	$req = new HTTP::Request 'GET' => $dynamic_url . 
+	   '?command/Reset' . '&maxload=' . $max_load . '&pttime=' . $pttime .  '&maxthread=' . $maxthread . '&exp=' . $expired_list . '&urlroot=' . $tmp_url_root;
+	$req->header('Accept' => '*/*');
+	$res = $ua->request($req);
+	if (!$res->is_success) {
+	    die "Can't reset POST log on server, make sure cgi script\n" .
+		"DYNAMIC_ROOT (or DYN_CMD_SCRIPT) is configured correctly!\n" .
+		"Error: " . $res->code . " " . $res->message, "\n";
+	}
+    } 
+
+    # Open and initialize each client
+    my $data;
+    my $clientnum = 0;
+    for my $data (@{$config->{'clients_parsed'}}) {
+	my ($hostname, $port, $speed, $clients_server) = @$data;
+	if ($clients_server eq '') {
+	    $clients_server = $config->{'SERVER'};
+	}
+	$port   = 'specweb(2222)'    if $port  eq "";
+        my $client_load = shift (@client_loads);
+
+	next if $client_load <= 0;
+	Log(30, "Opening client '$hostname'\n");
+	my $client = WebClient->new(PeerAddr => $hostname,
+				    PeerPort => $port,
+				    Proto    => 'tcp');
+	die "Can't open socket to '$hostname'\n" if (!defined $client);
+
+	# If the hostname has already been seen, then add a modifier to
+	# the end in the hopes that we can make unique names.
+	my $tmp = $hostname;
+	if ($tmp{$tmp}++) {
+	    $tmp .= "-".$tmp{$tmp}++;
+	}
+
+	# Wait until this client is ready and that the version of the
+	# daemon on each client matches this manager script
+	wait_until_ready([ $client ]);
+	if ($client->identity() ne "SPEC-WEB-$version") {
+	    die "Client $client_num($hostname) is not running version $version of the SPEC daemon!\n";
+	}
+
+	# Configure this client
+	my $max_dir = dirs_from_load($config, $load);
+	my $tmp_url_root        = $config->{'URL_ROOT'};
+	my $tmp_dyn_post_script = $config->{'DYN_POST_SCRIPT'};
+	my $tmp_dyn_get_script  = $config->{'DYN_GET_SCRIPT'};
+	my $tmp_dyn_cad_script  = $config->{'DYN_CAD_SCRIPT'};
+	my $tmp_dyn_cgi_script  = $config->{'DYN_CGI_SCRIPT'};
+	$tmp_url_root        =~ s/\@\@SERVER\@\@/$clients_server/e;
+	$tmp_dyn_post_script =~ s/\@\@SERVER\@\@/$clients_server/e;
+	$tmp_dyn_get_script  =~ s/\@\@SERVER\@\@/$clients_server/e;
+	$tmp_dyn_cad_script  =~ s/\@\@SERVER\@\@/$clients_server/e;
+	$tmp_dyn_cgi_script  =~ s/\@\@SERVER\@\@/$clients_server/e;
+	$client->workload99   ($tmp_url_root, 
+			       $tmp_dyn_post_script, 
+			       $tmp_dyn_get_script, 
+			       $tmp_dyn_cad_script, 
+			       $tmp_dyn_cgi_script, 
+			       $max_dir, 
+			       $config->{'MAX_FILE'}, 
+			       $config->{'DYNAMIC_CONTENT'}, 
+			       $config->{'DYNAMIC_POST'}, 
+			       $config->{'DYNAMIC_CAD_GET'}, 
+			       $config->{'DYNAMIC_CGI_GET'}, 
+			       $config->{'PERCENT_KEEP_ALIVE_REQUESTS'}, 
+			       $config->{'REQUESTS_PER_KEEP_ALIVE'}, 
+			       $config->{'USER_LINE_SPEED'}, 
+			       $config->{'USER_SPEED_LIMIT'}, 
+			       $expired_list, 
+			       "class0", "0.35", 
+			       "class1", "0.50", 
+			       "class2", "0.14", 
+			       "class3", "0.01");
+
+	$client->set_server   ($config->{'SERVER'});
+	$client->set_client   ($tmp);
+	$client->set_clientnum($clientnum++);
+	$client->set_runtime  ($config->{'RUN_TIME'});
+	$client->set_rampup   ($test_warmup);;
+	$client->set_rampdown ($config->{'RAMPDOWN_TIME'}) if $config->{'RAMPDOWN_TIME'};
+	$client->set_abortive_close ($config->{'ABORTIVE_CLOSE'}) if ($config->{'ABORTIVE_CLOSE'});
+	$client->set_loadgen  ($client_load);
+        # set the load in terms of OPS/sec:
+	$client->set_load (($config->{'USER_LINE_SPEED'}/122000)*$client_load);
+	my $protocol = $config->{'HTTP_PROTOCOL'};
+	if ($protocol =~ s#.*/##) {
+	    $protocol *= 10;
+	    $client->set_http_protocol($protocol);
+	} else {
+	    die "Can't use HTTP_PROTOCOL '$config->{'HTTP_PROTOCOL'}'\n";
+	}
+	$client->srandom      (2331 + 256*$client_num++);
+#       $client->workload     ('workload');
+	$client->init         ();
+	$client->set_auto_advance(1);
+	push (@clients, $client);
+    }
+
+
+
+
+    wait_until_ready(\@clients);
+    sleep($config->{'WAIT_TO_BEGIN'});
+
+    # At this point in time all of the clients are ready to run.  So we
+    # just send the comand to kick them off.
+    for (@clients) {
+	$_->dorampup();
+    }
+    wait_until_ready(\@clients);
+
+    # Everybody is running now, queue up a few commands to run fetch
+    # the results and then disconnect from the client.
+    for (@clients) {
+	$_->wait_advance('Result');
+	$_->fetch_results();
+	$_->quit();
+    }
+    wait_until_ready(\@clients);
+
+    # OKAY -- we're all done running this point/iteration, now
+
+	# For the command/Finish, we don't want any other argument pieces
+	# so delete everything after the first '?' and append the command.
+    if ($config->{'DYNAMIC_POST'} > 0 || $config->{'DYNAMIC_CAD_GET'} > 0 ) {
+	my ($req, $res, $dynamic_url);
+	$dynamic_url = $config->{'DYN_CMD_SCRIPT'};
+        $dynamic_url  =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+	$req = new HTTP::Request 'GET' => $dynamic_url . 
+	   '?command/Finish';
+	$req->header('Accept' => '*/*');
+	$res = $ua->request($req);
+	if (!$res->is_success) {
+	    die "Can't issue Finish on server\n";
+	}
+    $perfcnt = $res->content;
+    print $res->content . "\n";
+    } 
+
+    # Check to see that the post log looks okay
+    my ($server_post_count_ref,$post_errors_ref);
+    if ($config->{'DYNAMIC_POST'} > 0) {
+	($server_post_count_ref,$post_errors_ref) = 
+	    &validate_post_log($config, $num);
+	push (@errors, @$post_errors_ref);
+    }
+
+    # For each of the clients, sum all of the results for each class.
+    my $cl_results   = [];
+    my $lg_res    = [];
+    my $successive_speed_limits = [];
+    my $speed_limit_string;
+    my $lg_cum_res = [];
+    my $total_cum = [];
+    my $total_missing_ops;
+
+    my %run_stats;
+
+    #Initialize min_bitrate to max possible speed
+    $run_stats{'min_bitrate'} = $config->{'USER_LINE_SPEED'} + 1000;
+
+    # Get results from each client
+    for (@clients) {
+	&client_log( "\n***** Client:  $_->{'client'}\n") if $logclient;
+
+        $lg_res = $_->{'lg_results'};
+
+	my(%client_run_stats);
+
+	# Load generator status info
+	$client_run_stats{'requested_conn'} = $_->loadgen();
+	$client_run_stats{'conforming'} = $lg_res->[1];
+	$client_run_stats{'invalid_conn'}=$client_run_stats{'requested_conn'} - 
+	    $lg_res->[0];
+
+	$client_run_stats{'min_bitrate'} = $lg_res->[2] * 8;
+	$client_run_stats{'mean_bitrate'} = $lg_res->[3] * 8;
+	$client_run_stats{'max_bitrate'} = $lg_res->[4] * 8;
+
+	$run_stats{'requested_conn'} += $client_run_stats{'requested_conn'};
+	$run_stats{'conforming'} += $client_run_stats{'conforming'};
+	$run_stats{'invalid_conn'} += $client_run_stats{'invalid_conn'};
+
+	if ($client_run_stats{'min_bitrate'}  < $run_stats{'min_bitrate'}) {
+	    $run_stats{'min_bitrate'} = $client_run_stats{'min_bitrate'};
+	}
+	if ($client_run_stats{'max_bitrate'}  > $run_stats{'max_bitrate'}) {
+	    $run_stats{'max_bitrate'} = $client_run_stats{'max_bitrate'};
+	}
+
+
+	# Look for generators that have 0 ops (i.e. 0 good, 0 bad);
+	my (%no_ops, @opkeys, @text_results);
+	@text_results = split (/\n/, $_->text_results());
+	for (@text_results) {
+#	    Log 130, "$_\n";
+	    # pattern: 602 generator class time time2 good bad ...
+	    if (m/^602 (\d+) \d+ \d+ \d+ 0 0/) {
+		$no_ops{$1} = 1;
+	    }
+	}
+	@opkeys = keys (%no_ops);
+	$client_run_stats{'gens_missing_class_ops'} = @opkeys;
+	$run_stats{'gens_missing_class_ops'} += @opkeys;
+
+
+	# Cumulative conformance data
+        $lg_cum_res = $_->{'lg_cum_results'};
+	for (my $i = 0; $i < @$lg_cum_res; $i++) {
+	    $client_run_stats{'cum_conformance'} .= 
+		sprintf("%6.2f ", 
+			($lg_cum_res->[$i] / 
+			 $client_run_stats{'requested_conn'})*100.0);
+            $total_cum->[$i] += $lg_cum_res->[$i];
+	}
+
+	# Successive speed limit string
+        $successive_speed_limits = $_->{'successive_speed_limits'};
+	if (! $config->{'successive_speed_limits'}) {
+	    $config->{'SUCCESSIVE_SPEED_LIMITS'}= [@{$successive_speed_limits}];
+	    $speed_limit_string = sprintf "@{$successive_speed_limits}";
+	}
+
+	# Total up per class results
+	my $tmp = $_->results();
+
+	for ($class = 0; $class < @$tmp; $class++) {
+	    $cl_results->[$class] = [] if !defined($cl_results->[$class]);
+
+	    # Don't subtotal name and probability fields
+	    $cl_results->[$class][0] = $tmp->[$class][0];
+	    $cl_results->[$class][1] = $tmp->[$class][1];
+
+
+	    # Subtotal all the other stats
+	    for ($j = 2; $j < @{$tmp->[$class]}; $j++) {
+		$cl_results->[$class][$j] = 0 
+		    if !defined($cl_results->[$class][$j]);
+		$cl_results->[$class][$j] += $tmp->[$class][$j];
+	    }
+	}
+
+	#Printout class results for this client
+	my (@misc_results) = 
+	    &printout_class_results ($tmp, $config->{'RUN_TIME'},$num,"CLIENT");
+	
+	
+	for (qw(response bitrate throughput)) {
+	    $client_run_stats{$_} = shift @misc_results;
+	}
+	push (@errors, @misc_results);
+
+	#Prinout summary infor for this client
+	printout_summary( \%client_run_stats, $speed_limit_string, 
+			 $config->{'USER_SPEED_LIMIT'},"CLIENT");
+
+
+
+	&client_log("ERRORS FOUND\n" . join("\n", @misc_results) . "\n\n") 
+	    if (@misc_results);
+	&client_log ("=============================================================================\n");
+
+	undef $_;
+    } #end of for (@clients)
+
+    # Printout class results for this run
+    my (@misc_results) = &printout_class_results($cl_results, 
+						 $config->{'RUN_TIME'}, 
+						 $num, "TOTALS");
+    #Save return values and errors
+    for (qw(response bitrate throughput)) {
+	$run_stats{$_} = shift @misc_results;
+    }
+    push (@errors, @misc_results);
+
+    # Check to see if the posts per class match what's in the post.log
+    if ($config->{'DYNAMIC_POST'} > 0) {
+	my (@server_post_count) = @$server_post_count_ref;
+	for ($class = 0; $class < @server_post_count; $class++) {
+	    my $difference = $cl_results->[$class][6] - 
+		$server_post_count[$class]; 
+	    # The server isn't allowed to have more posts than were submitted
+	    if ($difference < 0) {
+		push (@errors,
+		      sprintf "Iteration $num: The server post.log recorded %d too many POSTS in class %d",
+		      abs($difference), $class);
+	    }
+	    # The server is allowed to have less, up to the MAX_ERROR_RATE percent.
+	    elsif ($difference / $cl_results->[$class][6] > $MAX_ERROR_RATE) {
+		push (@errors,
+		      sprintf "Iteration $num:  %.1f%% of class %d POSTS missing in post.log.",
+		      100 * $difference / $cl_results->[$class][6], $class);
+	    }
+	    
+#	    if ($cl_results->[$class][6] != $server_post_count[$class]) {
+#		push (@errors, 
+#		      sprintf "Iteration $num: The server saw %d instead of %d class %d POST transactions",
+#		      $server_post_count[$class], $cl_results->[$class][6], 
+#		      $class);
+#	    }
+	}
+    }
+
+    # Make the conformance stirng
+    for (my $i = 0; $i < @$total_cum; $i++) {
+	$run_stats{'cum_conformance'}  .= 
+	    sprintf("%6.2f ", 
+		    ($total_cum->[$i] /
+		     $run_stats{'requested_conn'})*100.0);
+    }
+
+    # Printout summary info for this run
+    printout_summary( \%run_stats, $speed_limit_string, 
+		         $config->{'USER_SPEED_LIMIT'}, "TOTALS");
+
+    # A few more error checks
+    if ($run_stats{'invalid_conn'} > 0) {
+	push (@errors,
+	      sprintf "Iteration $num: $run_stats{'invalid_conn'} invalid connections found");
+	push (@errors,
+	      sprintf ("             %d from load generators with 0 requests in a class or classes", 
+		       $run_stats{'gens_missing_class_ops'}));
+	push (@errors,
+	      sprintf ("             %d from load generators with > %.1f%% errors in a class or classes", 
+	$run_stats{'invalid_conn'} -  $run_stats{'gens_missing_class_ops'},
+	$MAX_ERROR_RATE * 100));
+
+    }
+
+    if ($run_stats{'conform_pct'} < $MIN_CONFORM_PCT) {
+	push (@errors,
+	      sprintf "Iteration $num: %% conforming connections is %.1f%% must be >= %.1f%%",
+	      $run_stats{'conform_pct'}, $MIN_CONFORM_PCT);
+
+    }
+    
+    # Save the errors off so that we can peruse them later.
+    $config->{'results'} = [] if !defined $config->{'results'};
+    push (@{$config->{'results'}}, 
+	  [ { %run_stats },		#%run_stats
+	   $num - 1,			#$num is 1-based 
+	   "unused field",		#place-holder, if we need it
+	   $cl_results,			#class results stuff
+	   [ @errors ] ]);		#@errors
+
+    &Log (101, "ERRORS FOUND\n" . join("\n", @errors) . "\n\n") if (@errors);
+    &Log (101, "=============================================================================\n");
+
+    return 1;
+}
+
+
+# This is called to validate whether the inputs in the config file will
+# generate a valid test
+sub validate_config {
+    my ($config) = @_;
+    my (@errors);
+
+
+    push (@errors, &validate_req('RUN_TIME', $config->{'RUN_TIME'}));
+    push (@errors, &validate_req('RAMPUP_TIME', $config->{'RAMPUP_TIME'}));
+    push (@errors, &validate_req('ITERATIONS', $config->{'ITERATIONS'}));
+    push (@errors, &validate_req('RAMPDOWN_TIME', $config->{'RAMPDOWN_TIME'}));
+    push (@errors, &validate_req('DYNAMIC_CONTENT', $config->{'DYNAMIC_CONTENT'}));
+    push (@errors, &validate_req('DYNAMIC_POST', $config->{'DYNAMIC_POST'}));
+    push (@errors, &validate_req('DYNAMIC_CAD_GET', $config->{'DYNAMIC_CAD_GET'}));
+    push (@errors, &validate_req('DYNAMIC_CGI_GET', $config->{'DYNAMIC_CGI_GET'}));
+    push (@errors, &validate_req('REQUESTS_PER_KEEP_ALIVE', $config->{'REQUESTS_PER_KEEP_ALIVE'}));
+    push (@errors, &validate_req('PERCENT_KEEP_ALIVE_REQUESTS', $config->{'PERCENT_KEEP_ALIVE_REQUESTS'}));
+    push (@errors, &validate_req('ABORTIVE_CLOSE', $config->{'ABORTIVE_CLOSE'}));
+    push (@errors, &validate_req('USER_LINE_SPEED', $config->{'USER_LINE_SPEED'}));
+    push (@errors, &validate_req('USER_SPEED_LIMIT', $config->{'USER_SPEED_LIMIT'}));
+    push (@errors, &validate_req('MAX_FILE', $config->{'MAX_FILE'}));
+    push (@errors, &validate_req('WAIT_BETWEEN_POINTS', $config->{'WAIT_BETWEEN_POINTS'}));
+
+
+    # check for reportable values for warmup and runtime
+    if ($config->{'WARMUP_TIME'} < $MIN_WARMUP_TIME) {
+	push (@errors, 
+	    sprintf "Invalid test: WARMUP_TIME is %d, must be greater than %d",
+		    $config->{'WARMUP_TIME'}, $MIN_WARMUP_TIME);
+    }
+
+
+    if (@errors) {
+	push (@{$config->{'errors'}}, @errors);
+	my $errorstring = "\nWARNING: RUN WILL BE INVALID\n" . 
+	    join ("\n", @errors) . "\n\n";
+	&Log(10, $errorstring);
+    }
+
+    # Check the validity of USER_SPEED_LIMIT versus USER_LINE_SPEED
+    if ($config->{'USER_SPEED_LIMIT'} > $config->{'USER_LINE_SPEED'} ) {
+       die "Fatal error: USER_SPEED_LIMIT cannot be larger than USER_LINE_SPEED!\n";
+    }
+
+}
+
+sub validate_req {
+    my ($varname, $input_value) = @_;
+
+    # Create the $REQ_varname variable and find out its value
+    my $REQ_varname = '$REQ_' . $varname;
+    my $REQ_value =  eval $REQ_varname; 
+
+    #Test it against the input, and return an error string if not equal
+    if ($REQ_value != $input_value) {
+	return "Invalid test: $varname is $input_value, must be $REQ_value";
+    }
+    return;
+}
+
+
+
+
+
+# This is called to validate the results of the entire run for this
+# config file.  It uses the error data calculated for each data point
+# in run_one
+sub validate_results {
+    &Log(30, "validate_results\n");
+    my ($config) = @_;
+    my ($num, $idxname, $peakidx, $peak, $min, $max, $tmp);
+    my (@invalid_mix, @invalid_errors);
+    my (@results) = @{$config->{'results'}};
+    my (@test_errors) = ();
+    my %conform_cxn;
+
+
+
+    #@{$config->{'errors'}} = ();        #MC: initialize to no errors
+
+    &Log(10, scalar(@{$config->{'results'}}) . " data points\n");
+
+    #Look through all of the results
+    my ($i);
+    for ($i = 0; $i < @results; $i++) {
+	#Test for errors
+	my @run_errors = @{$results[$i][4]};
+	if (@run_errors ) {
+	    push (@test_errors, "\n");
+	    push (@test_errors, @run_errors);
+	}
+    }
+
+    push (@{$config->{'errors'}},  @test_errors);
+
+    # Return a list of the errors -- why? nobody checks the return value
+    #return @{$config->{'errors'}};;
+}
+
+#check the post log for any errors -- done after every point
+sub validate_post_log {
+
+    my ($config, $iteration) = @_;
+    my @errors = ();
+
+    # Fetch the POST data on the server if necessary
+    my @server_post_count;
+
+    my ($req, $res, $real_count, $reference_count, $dynamic_url);
+
+    unlink('post.log');
+    
+    # For the command/Fetch, we don't want any other argument pieces
+    # so delete everything after the first '?' and append the command.
+    $dynamic_url = $config->{'DYN_CMD_SCRIPT'};
+    $dynamic_url  =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+    
+    $req = new HTTP::Request 'GET' => $dynamic_url . '?command/Fetch';
+    $req->header('Accept' => '*/*');
+    $res = $ua->request($req, 'post.log');
+    if (!$res->is_success) {
+	die "Can't fetch POST log from server, make sure cgi script\n" .
+	    "DYNAMIC_ROOT (or DYN_CMD_SCRIPT) is configured correctly!\n" .
+		"Error: " . $res->code . " " . $res->message, "\n";
+    }
+    if (open(FILE, "<post.log")) {
+	my $lastseen = 0;
+	my $errorseen = 0;
+	my $seen_pre = 0;
+	while (<FILE>) {
+	    if (!$seen_pre) {
+		$seen_pre = 1 if m/^<pre>/;
+		next;
+	    } elsif (m#^</pre>#) {
+		     $seen_pre = 0;
+		     next;
+		 } elsif (m#^\s*$#) {
+			  next;
+		      } elsif (m#^\s*(\d+)\s*$#) {
+			       $reference_count = $1;
+			       next;
+			   }
+	    $real_count++;
+	    my ($count, $ts, $pid1, $dir, $class, $num, $client, $query, $pid2, $cookie) = split;
+	    warn "POST Log contains inconsistent data!\n" if ($pid1 != $pid2);
+	    if (!$errorseen && $lastseen >= $count) {
+		$errorseen=1;
+		push (@errors, 
+		      "Iteration $iteration: out of order entry in log\n");
+	    } else {
+		$lastseen = $count;
+	    }
+	    $server_post_count[$class]++;
+	}
+    } else {
+	die "Can't open POST log we fetched from server 'post.log': $!\n";
+    }
+    if ($reference_count != $real_count) {
+	push (@errors, 
+	      "Iteration $iteration: Number of POST requests in log inconsistant\n");
+    }
+    return \@server_post_count, \@errors;
+}
+
+
+# This simply loops until all of the clients are in the 'Ready' state.
+sub wait_until_ready {
+    my ($clients, $state) = @_;
+    $state = 'Ready' if $state eq '';
+    my $ready = 0;
+    while (!$ready) {
+	$ready = 1;
+	for (@$clients) {
+	    if ($_->state() ne $state) {
+		$ready = 0;
+		event_loop($clients);
+		last;
+	    }
+	}
+    }
+}
+
+# This checks to see which clients are active, and selects on them.
+sub event_loop {
+    my ($clients) = @_;
+    my $sel_read   = IO::Select->new();
+    my $sel_write  = IO::Select->new();
+    my %sock_to_client;
+    for (@$clients) {
+	my $sock = $_->sock();
+	$sel_read->add($_->sock())  if $_->need_read();
+	$sel_write->add($_->sock()) if $_->need_write();
+	$sock_to_client{$sock} = $_;
+    }
+    my ($reads, $writes, $errors) = $sel_read->select($sel_write, undef);
+    for (@$reads) {
+	$sock_to_client{$_}->handle_read();
+    }
+    for (@$writes) {
+	$sock_to_client{$_}->handle_write();
+    }
+}
+
+sub dirs_from_load {
+    my ($config, $load) = @_;
+
+    # 122000 is the average size of reply per SPECweb99 request
+    my $opsps = ($config->{'USER_LINE_SPEED'}/122000) * $load;
+    return int(25+($opsps/5));
+}
+
+
+#the @results are passed in -- an index number for the median one is returned
+sub find_median_result {
+
+    my ($config) = @_;
+    my @sorted_results = sort results_sort @{$config->{'results'}};
+    my $median_index = $#sorted_results / 2;
+
+
+    return 
+	$sorted_results[$median_index][1], 
+	$sorted_results[$median_index][0]{'conforming'};
+}
+
+
+
+
+##############################################################################
+# Helper functions
+##############################################################################
+
+# Try one of each test operation to make sure it works -- die if any
+# are broken.
+# Note:  This is the ONLY place where the custom ad scan/replacement scheme
+# is verified.
+# Another note:  we set $config->{'HTTP_PROTOCOL'} in here with the return
+#   protocol from the 1st GET (if not specified in the rc file, that is)
+sub verify_all_HTTP_operations {
+
+    my($config) = @_;
+    my($url);
+
+    my($thiserror, $errors, $res);
+
+    my $tmp_url_root = $config->{'URL_ROOT'};
+    $tmp_url_root =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+    $max_load =  $config->{'MAX_LOAD'} if $config->{'MAX_LOAD'} > $max_load;
+
+    if ($config->{'DYNAMIC_POST'} > 0 || $config->{'DYNAMIC_CAD_GET'} > 0 ) {
+	my $tmp_dyn_cmd_script = $config->{'DYN_CMD_SCRIPT'};
+	$tmp_dyn_cmd_script =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+	($res, $thiserror) = &HTTP_operation 
+	    ("Reset command",
+	     $tmp_dyn_cmd_script . '?command/Reset' . '&maxload=' . $max_load .
+	     '&pttime=' . 100 .  '&maxthread=' . 100 . '&exp=' . 
+	     '1,100' . '&urlroot=' . $tmp_url_root ,
+	     'dynreset.out');
+	
+	if ($thiserror) {
+	    Log (1, $thiserror);
+	    $errors++;
+	}
+    }
+
+
+    if ($config->{'DYNAMIC_POST'} > 0 || $config->{'DYNAMIC_CAD_GET'} > 0 ) {
+	my $tmp_dyn_cmd_script = $config->{'DYN_CMD_SCRIPT'};
+	$tmp_dyn_cmd_script =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+	($res, $thiserror) = &HTTP_operation 
+	    ("Finish command", $tmp_dyn_cmd_script . '?command/Finish');
+	
+	if ($thiserror) {
+	    Log (1, $thiserror);
+	    $errors++;
+	}
+    }
+
+
+    my($filenum) = int(rand($FILES_PER_CLASS - 1)); 
+    $url = sprintf ("/file_set/dir%05d/class3_$filenum",
+		    &dirs_from_load($config, $config->{'MAX_LOAD'})-1);
+
+
+    # Static GET
+    ($res, $thiserror) = &HTTP_operation("static GET", 
+				    $tmp_url_root . $url,
+				    'staticget.out');
+    if ($thiserror) {
+	Log (1, $thiserror);
+	$errors++;
+    }
+
+    #Decide whether we need HTTP 1.0 or 1.1
+    if ($config->{'HTTP_PROTOCOL'} eq '') {
+	$config->{'HTTP_PROTOCOL'} = $res->protocol();
+	#print "HTTP_PROTOCOL = $config->{'HTTP_PROTOCOL'}\n";
+    }
+
+    # Switch to shorter files!
+    $url =~ s/class3/class1/;
+
+    # Dynamic GET
+    my $tmp_dyn_get_script = $config->{'DYN_GET_SCRIPT'};
+    $tmp_dyn_get_script .= '?' if !($tmp_dyn_get_script =~ m/\?/);
+    $tmp_dyn_get_script =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+    if ($config->{'DYNAMIC_CONTENT'} > 0) {
+	($res, $thiserror) = &HTTP_operation("dynamic GET", 
+					       $tmp_dyn_get_script . $url,
+					       'dynget.out');
+	if ($thiserror) {
+	    Log (1, $thiserror);
+	    $errors++;
+	}
+    }
+
+
+    # Dynamic CGI GET
+    my $tmp_dyn_cgi_script = $config->{'DYN_CGI_SCRIPT'};
+    $tmp_dyn_cgi_script =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+    $tmp_dyn_cgi_script .= '?' if !($tmp_dyn_cgi_script =~ m/\?/);
+    if ($config->{'DYNAMIC_CGI_GET'} > 0) {
+	($res, $thiserror) = &HTTP_operation("dynamic CGI GET", 
+			     $tmp_dyn_cgi_script . $url,
+			     'dyncgiget.out');
+	if ($thiserror) {
+	    Log (1, $thiserror);
+	    $errors++;
+	}
+    }
+
+    my ($filename) = 'dyncadget.out';
+    # Dynamic Custom Ad GET
+    my $tmp_dyn_cad_script = $config->{'DYN_CAD_SCRIPT'};
+    $tmp_dyn_cad_script =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+    $tmp_dyn_cad_script .= '?' if !($tmp_dyn_cad_script =~ m/\?/);
+    if ($config->{'DYNAMIC_CAD_GET'} > 0) {
+	my ($old_errors) = $errors;
+	($res, $thiserror) = &HTTP_operation("dynamic custom ad (CAD) GET", 
+					     $tmp_dyn_cad_script . $url,
+					     $filename);
+
+	if ($thiserror) {
+	    Log (1, $thiserror);
+	    $errors++;
+	}
+
+
+	# From the cookie, figure out the expected n, x, and y values
+	my ($adid, $en, $ex, $ey, $fn, $fx, $fy, $ct, $found, $sep);
+	my $headers = $res->headers_as_string();
+
+	if ($headers =~ m/Set-Cookie.*Ad_id=(\d+)/) {
+	    $adid = $1;
+	    $en = sprintf( "%05d", int($adid/36));
+	    $ex = int(($adid % 36) / 9);
+	    $ey = int($adid % 9);
+	}
+	
+	if (open(FILE, "<$filename")) {
+	    while (<FILE>) {
+		#Note:  on NT, the headers show up in the file, not in
+		#headers-as-string() method
+		if (undef($adid) && m/Set-Cookie.*Ad_id=(\d+)/) {
+		    $adid = $1;
+		    $en = sprintf( "%05d", int($adid/36));
+		    $ex = int(($adid % 36) / 9);
+		    $ey = int($adid % 9);
+		}
+
+		    
+		if (m#<!WEB99CAD><IMG SRC="(\S+)"><!/WEB99CAD>#) {
+		    $found = $1;
+		    $ct++;
+		    if ($1 =~ m/(\S{1})class/) {
+			$sep = $1;
+		    }
+		    else {
+			Log (1, "  **ERROR**:  Bizarre stuff found in WEBCAD string\n\n$_\n");
+			$errors++;
+		    }
+		    my($expected) =sprintf("%sfile_set%sdir%5s%sclass%01d_%01d",
+					   $sep,$sep,$en,$sep,$ex,$ey);
+
+		    if ($expected ne $found) {
+			Log (1,  "ERROR: Substitution in Custom Ad scan is incorrect\n Expected: $expected Found: $found\n");
+			$errors++
+		    }
+		}
+	    }
+	    close FILE;
+
+	    if (undef($adid)) {
+		Log (1, "  **ERROR**:  No Set-Cookie header returned -- Header string:\n\n$headers\n");
+		$errors++;
+	    }
+		
+	    elsif ($ct == 0) {
+		Log(1,  "  **ERROR**:  No Custom Ad substitution was found -- see runrules for information on the WEB99CAD string substitution\n");
+		$errors++
+	    }
+	}
+	else {
+	    Log(1, " **ERROR**:  Can't open $filename fetched from dynamic CAD GET of $!\n");
+	    $errors++
+	}
+	
+	if ($old_errors < $errors) {
+	    Log(1, "    NOTE:  errors in Custom Ad Rotation may be caused by" .
+		" problems in \n command/Reset.  Check that upfgen and cadgen" .
+		" get run correctly\n");
+	}
+    }
+
+    # Dynamic post
+    my $tmp_dyn_post_script = $config->{'DYN_POST_SCRIPT'};
+    $tmp_dyn_post_script =~ s/\@\@SERVER\@\@/$config->{'SERVER'}/e;
+    $tmp_dyn_post_script .= '?' if !($tmp_dyn_post_script =~ m/\?/);
+    if ($config->{'DYNAMIC_POST'} > 0) {
+	($res, $thiserror) = &HTTP_operation("dynamic POST",
+				    $tmp_dyn_post_script . $url,
+				    'dynpost.out');
+
+	if ($thiserror) {
+	    Log (1, $thiserror);
+	    $errors++;
+	}
+
+	my ($server_pcount) = 0;
+	my($pcount_ref, $errors_ref) = &validate_post_log($config, "pre test");
+	for (@$pcount_ref) {$server_pcount += $_};
+	if ($server_pcount != 1) {
+	    Log(1, "  **ERROR**:  There should only be 1 post log entry;" .
+		"$server_pcount" .
+		" were found\n");
+	    Log(1, "    NOTE:  errors in dynamic POST may be caused by" .
+		" problems in \n command/Reset.  Check that the post.log" .
+		" gets zeroed correctly\n");
+	    $errors++;
+	}
+
+
+    }
+
+    die "\n\n****** FATAL ERRORS FOUND *******\n\n" if $errors;
+}
+
+# Code for doing HTTP operations from manager
+sub HTTP_operation {
+    my ($operation, $url, $output_file) = @_;
+    my($req, $res, $error);
+
+    Log(5, "\n  Checking $operation with '$url'\n");
+
+    if ($operation =~ m/POST/i) {
+	$req = new HTTP::Request 'POST' => $url . "f";
+	my($urlroot) = ($url =~ m#\?(.*file_set/)#);
+	$req->content("class=1&client=2&dir=00004&num=3&urlroot=$urlroot");
+    }
+    else {
+	$req = new HTTP::Request 'GET' => $url;
+    }
+    
+    $req->header('Accept' => '*/*');
+    
+    if ($operation =~ m/CAD/i || $operation =~ m/POST/i) {
+	$req->header('Cookie'=> "my_cookie=user_id=10001&last_ad=20");
+    }
+    $res = $ua->request($req,$output_file);
+    if (!$res->is_success) {
+	if ($operation =~ m/static/i) {
+	    $error .=  "  **ERROR**:" . 
+		"Can't fetch file $url with a $operation request\n" .
+		    "Did WAFGEN generate a large enough fileset?\n" .
+			"Error: " . $res->code . " " . $res->message .  "\n";
+	}
+	else {
+	    $error .=  "  **ERROR**:" .
+		" Can't fetch file $url with a $operation request\n" .
+		    "Is DYNAMIC_ROOT (or DYN_xxx_SCRIPT) configured " .
+			" correctly?\n" .
+			    "Error: " . $res->code . " " 
+				. $res->message .  "\n";
+	}
+	return $res, $error;
+    }
+
+    if ($operation =~ m/Reset/i) {
+	return $res, $error;
+    }
+    if ($operation =~ m/Finish/i) {
+	return $res, $error;
+    }
+
+    my($fileset_string);
+    if (open(FILE, "<$output_file")) {
+	while (<FILE>) {
+	    if (m/\d+\s+(file_set.*class.*)/){
+		$fileset_string = $1;
+		last;
+	    }
+	}
+	if  (!$fileset_string ) {
+	    $error .= "  **ERROR**:  Improper file returned.  See " .
+		"$output_file for returned text\n";
+	}
+    }
+    else {
+	$error .= "Can't open $output_file to check $operation: $!\n";
+    }
+
+	
+    return $res, $error;
+    
+}
+
+
+# Printout the class summary tables.  The first table has the mix,
+# op count, and response time information.  The 2nd table has bitrate
+# information.
+# This routine works for both the per-client and per-iteration printouts
+# Also, check for per-class errors:
+#		1) Mix problems (only for entire iteration)
+#               2) Error rate (for each client)
+sub printout_class_results {
+    my ($cl_res_array, $runtime, $runnum, $output_type) = @_;
+
+# Set this (and change the label ) to the confidence interval you
+# desire:
+#   my $CHI_SQR = 2.71;           # chi-sqr value for 90%   CI
+#   my $CHI_SQR = 3.84;           # chi-sqr value for 95%   CI
+#   my $CHI_SQR = 5.02;           # chi-sqr value for 97.5% CI
+#   my $CHI_SQR = 6.63;           # chi-sqr value for 99%   CI
+    my $CHI_SQR = 7.88;          # chi-sqr value for 99.5% CI
+    
+    my (@subtotals, $mix_str, $rate_str, $total_wtd_abr, @errors);
+
+    $subtotals[0] = $cl_res_array->[0][0];
+    $subtotals[1] = -10101;	#The probability subtotal is meaningless
+
+
+    # Subtotal all the classes, then save in the xxx_T variables
+    for (my $class = 0; $class < @$cl_res_array; $class++) {
+	for (my $j = 2; $j < @{$cl_res_array->[$class]}; $j++) {
+	    $subtotals[$j] += $cl_res_array->[$class][$j];
+	}
+    }
+    my ($name_T, $prob_T, $time_T, $time2_T, $good_T, $bad_T, $post_T, 
+	$rate_T, $rate2_T, $slow_rate_T, $aggregate_bytes_T) = @subtotals;
+
+
+    # Calculate the aggregate bit-rate
+    my $throughput_T = $runtime?$good_T / $runtime:0;
+    my $aggregate_rate_T = $throughput_T ? 
+	$aggregate_bytes_T / ($time_T/1000) : 0;
+    # convert into bits/sec
+    $aggregate_rate_T *= 8;
+
+
+    # Build $mix_str with basic class mix information
+    $mix_str = "
+-------------------------+-----------------+--------------------------+------
+	     M  I  X     | O P   C O U N T | MEAN RESPONSE TIME Ms/Op | Total
+Class     Target  Actual | Success   Error |     Mean   StdDev 95% CI |  Time
+-------------------------+-----------------+--------------------------+------
+";
+
+
+    #Build $rate_str with bit-rte information
+    $rate_str .= "
+-------+--------------------------------+------------------+--------------------
+       |Individual OP Bit Rate(bits/sec)| Aggregate Bit    | Weighted ABR
+Class  |        Mean      StdDev 95% CI | Rate  (bits/sec) |      (%)
+-------+--------------------------------+------------------+--------------------
+";
+
+
+    # Go through each class, calculating and printing stats for the 2 tables
+    for (my $class = 0; $class < @$cl_res_array; $class++) {
+	my ($name, $prob, $time, $time2, $good, $bad, $post, $rate, 
+	    $rate2, $slow_rate, $aggregate_bytes) = @{$cl_res_array->[$class]};
+
+	# Stats for response times
+	my $stddev     = 0;
+	my $confidence = 0;
+	my $mean       = 0;
+
+	# Stats for bit rates
+	my $stddev_rate     = 0;
+	my $confidence_rate = 0;
+	my $mean_rate       = 0;
+	my $abr             = 0;
+	my $weighted_abr    = 0;
+
+
+	my $actual_mix= $good_T ? $good/$good_T : 0 ;
+	my $class_time = $time_T ? $time/$time_T : 0;
+
+	if ($good > 0) {
+	    $mean = $time / $good;
+
+	    $mean_rate = $rate / $good;
+            # convert into bits/sec
+            $mean_rate *= 8;
+            $abr = ($aggregate_bytes / ($time/1000)) * 8.0;
+            $weighted_abr = $abr * $class_time;
+            $total_wtd_abr += $weighted_abr;
+	}
+
+	if ($good > 1) {
+	    $stddev     = sqrt(($time2 - ($time*$time)/$good) / ($good - 1));
+	    $confidence = sqrt($CHI_SQR * $stddev / $good);
+
+	    $stddev_rate = sqrt(($rate2 - ($rate*$rate)/$good) / ($good - 1));
+            # convert into bits/sec
+            $stddev_rate *= 8;
+	    $confidence_rate = sqrt($CHI_SQR * $stddev_rate / $good);
+
+	}
+
+	# Check for per-class error rate problems
+	# NOTE:  this is the only place where Class 3 error rates are checked
+	# Classes 0-2 are checked in the client on a per load-generator
+	# per-class basis.  If the error rate is too high, the load-gen is
+	# marked as invalid.
+	# Class 3 is such a small portion, a single error could invalidate
+	# a load-gen, so class 3 errors rates are calculated for each client.
+	if ($output_type eq "CLIENT") {
+	    if ($good && $bad / ($bad+$good) > $MAX_ERROR_RATE) {
+		push (@errors, 
+		      sprintf "Iteration $runnum: error rate for class %s is %.1f%%, must be <= %.1f%%",
+		      $name, 100 * $bad/($bad+$good),  $MAX_ERROR_RATE * 100);
+	    }
+	}
+
+
+	# Check for errors on the whole run
+	elsif ($output_type eq "TOTALS") {
+	    # Mix problems for each class
+	    if ($actual_mix < $prob * (1 - $MIX_TOLERANCE) ||
+		$actual_mix > $prob * (1 + $MIX_TOLERANCE)) {
+
+		push (@errors, 
+		      sprintf "Iteration $runnum: mix for class %s is %.3f, must be between %.3f and %.3f",
+		      $name, $actual_mix,
+		      $prob * (1 - $MIX_TOLERANCE),
+		      $prob * (1 + $MIX_TOLERANCE));
+	    }
+	}
+
+	$mix_str.=sprintf ("%-12s %5.3f %5.3f | %7d %7d | %8.2f %8.2f %6.2f |%5.1f%%\n",
+			   $name, $prob, $actual_mix, $good, $bad, $mean, 
+			   $stddev, $confidence, $class_time*100.0);
+
+	$rate_str .= sprintf ("%-6s | %11.2f %11.2f %6.2f |  %11.2f     | %11.2f(%3.2f)\n",
+			      $name, $mean_rate, $stddev_rate, $confidence_rate,
+			      $abr, $weighted_abr, 
+			      ($aggregate_rate_T ? $weighted_abr/$aggregate_rate_T : 0)*100);
+    }
+
+
+    # Calculate and print the totals for the 2 tables
+    my $stddev_T     = 0;
+    my $confidence_T = 0;
+    my $mean_T       = 0;
+    my $error_pct_T  = 0;
+
+    if ($good_T > 0) {
+	$mean_T = $time_T / $good_T;
+	$error_pct_T = ($bad_T / ($bad_T+$good_T)) * 100;
+    }
+    if ($good_T > 1) {
+	$stddev_T =sqrt(($time2_T - ($time_T*$time_T)/$good_T) / ($good_T - 1));
+	$confidence_T = sqrt($CHI_SQR * $stddev_T / $good_T);
+    }
+    
+
+    $mix_str .= sprintf "-------------------------+-----------------+--------------------------+------
+			 | %7d %7d | %8.2f %8.2f %6.2f |\n\n", 
+	$good_T, $bad_T, $mean_T, $stddev_T, $confidence_T;
+    
+    $rate_str .= sprintf "-------+--------------------------------+------------------+--------------------
+       |                                |                  | %11.2f(%3.2f) 
+", 
+	   $total_wtd_abr, 
+	   ($aggregate_rate_T ? $total_wtd_abr/$aggregate_rate_T : 0 )*100;
+    
+    
+
+    # Print out mix table and rate table
+
+    if ($output_type eq "ASCII") { return ($mix_str . $rate_str) }
+
+    if ($logclient && $output_type eq "CLIENT") {
+	&client_log($mix_str . $rate_str);
+    }
+    &Log(101, $mix_str . $rate_str) if $output_type eq "TOTALS";
+ 
+    return $mean_T, $aggregate_rate_T, $throughput_T, @errors;
+
+    
+
+}
+
+
+#
+#
+# Summary information for a client or run
+#
+sub printout_summary {
+    my ($run_stats, $speed_limit_string, $user_speed_limit, $output_type) = @_;
+
+    $run_stats->{'conform_pct'} = 
+	100 * $run_stats->{'conforming'}/$run_stats->{'requested_conn'};
+
+    $run_stats->{'ops_per_thread'} = $run_stats->{'throughput'} /
+	$run_stats->{'requested_conn'};
+
+
+
+
+    my ($str2) = sprintf "
+             |            | total   | ops/sec/| 
+             |  SPECweb99 | ops/sec | loadgen | msec/op
+-------------+------------+---------+---------+---------
+RESULTS      |   %6d   |  %6d |  %4.2f   |  %5.1f 
+
+        
+             |           |           |           |  conforming*
+             | requested |  valid    |  invalid  |    (conf %) 
+-------------+-----------+-----------+-----------+----------------
+SIMULTANEOUS | %7d   | %7d   | %7d   | %7d (%6.2f%%)
+CONNECTIONS  |           |           |           |
+* a conforming connection is one that operates faster than 320K bit/sec
+
+
+             |  mean   |  min    |  max   
+-------------+---------+---------+--------               
+AGGREGATE    |         |         |
+BITRATES     | %6d  | %6d  | %6d                         
+(bits/sec)   |         |         |                                
+                                                               
+
+-------------------------------------------------------------------------
+Percentage of simultaneous connections conforming at various speed limits
+--------------------------+----------------------------------------------
+Successive Speed Limits : |  %s
+Cumulative Conformance %: |  %s
+--------------------------+----------------------------------------------
+
+",
+    $run_stats->{'conforming'},
+    $run_stats->{'throughput'},
+    $run_stats->{'ops_per_thread'},
+    $run_stats->{'response'},
+
+    $run_stats->{'requested_conn'},
+    $run_stats->{'requested_conn'} -     $run_stats->{'invalid_conn'},
+    $run_stats->{'invalid_conn'},
+    $run_stats->{'conforming'},
+    $run_stats->{'conform_pct'},
+
+
+    $run_stats->{'bitrate'},
+    $run_stats->{'min_bitrate'},
+    $run_stats->{'max_bitrate'},
+    $speed_limit_string,
+    $run_stats->{'cum_conformance'};
+
+   my($str) = sprintf "
+
+RESULTS:  %6d SPECweb99 
+
+BITRATES(bits/sec):  avg = %6d    min =%6d     max = %6d 
+
+THROUGHPUTS: ops/sec = %6d    ops/sec/loadgen = %4.2f    msec/op = %6.1f 
+
+SIMULTANEOUS_CONNECTIONS: 
+ %6d requested %6d invalid %6d (%.2f%) conforming at %d bits/sec
+
+-------------------------------------------------------------------------
+Percentage of simultaneous connections conforming at various speed limits
+--------------------------+----------------------------------------------
+Successive Speed Limits : |  %s
+Cumulative Conformance %: |  %s
+--------------------------+----------------------------------------------
+
+",
+    $run_stats->{'conforming'},
+    $run_stats->{'bitrate'},
+    $run_stats->{'min_bitrate'},
+    $run_stats->{'max_bitrate'},
+    $run_stats->{'throughput'},
+    $run_stats->{'ops_per_thread'},
+    $run_stats->{'response'},
+
+    $run_stats->{'requested_conn'},
+    $run_stats->{'invalid_conn'},
+    $run_stats->{'conforming'},
+    $run_stats->{'conform_pct'},
+    $user_speed_limit,
+
+    $speed_limit_string,
+    $run_stats->{'cum_conformance'};
+
+    # Print out mix table and rate table
+    return $str2 if $output_type eq "ASCII";
+    &client_log($str2) if $logclient && $output_type eq "CLIENT";
+    &Log(101, $str2) if $output_type eq "TOTALS";
+
+}
+
+
+##############################################################################
+# Utility functions
+##############################################################################
+
+sub Log {
+    my ($level, @data) = @_;
+    my ($type, @output);
+    my $log_output    = "";
+    my $screen_output = "";
+    for (@data) {
+	$type = ref($_);
+	if ($type eq "ARRAY") {
+	    if ($verbose >= $level) {
+		$screen_output .= join ("", @$_);
+		$log_output    .= join ("", @$_);
+	    } elsif ($level >= 100) {
+		$screen_output .= $_ if $verbose + 100 >= $level;
+		$log_output    .= join ("", @$_);
+	    }
+	} elsif ($type eq "SCALAR") {
+	    if ($verbose >= $level) {
+		$screen_output .= $$_;
+		$log_output    .= $$_;
+	    } elsif ($level >= 100) {
+		$screen_output .= $_ if $verbose + 100 >= $level;
+		$log_output    .= $$_;
+	    }
+	} else {
+	    if ($verbose >= $level) {
+		$screen_output .= $_;
+		$log_output    .= $_;
+	    } elsif ($level >= 100) {
+		$screen_output .= $_ if $verbose + 100 >= $level;
+		$log_output    .= $_;
+	    }
+	}
+    }
+    print     $screen_output;
+    print LOG $log_output;
+}
+
+sub client_log {
+    my (@data) = @_;
+    my ($type, @output);
+    my $log_output    = "";
+    for (@data) {
+	$type = ref($_);
+	if ($type eq "ARRAY") {
+            $log_output    .= join ("", @$_);
+	} elsif ($type eq "SCALAR") {
+	    $log_output    .= $$_;
+	} else {
+	    $log_output    .= $_;
+	}
+    }
+    print CLLOG $log_output;
+}
+
+sub max {
+    my ($val) = @_;
+    for (@_) {
+	$val = $_ if $_ > $val;
+    }
+    return $val;
+}
+
+# This expands strings in the form of M or M-N or M-NxO into a complete
+# list of the values they represent.  1-3 would be 1,2,3 and 1-5x2
+# would be 1,3,5
+sub expand_ranges {
+    my (@data) = @_;
+    my (@rc, $start, $stop, $step, $i);
+
+    for (@data) {
+	if (($start, $stop, $step) = m/^(\d+)-(\d+)x(\d+)$/) {
+	    for ($i = $start; $i <= $stop; $i+=$step) {
+		push (@rc, $i);
+	    }
+	} elsif (($start, $stop) = m/^(\d+)-(\d+)$/) {
+	    for ($i = $start; $i <= $stop; $i++) {
+		push (@rc, $i);
+	    }
+	} else {
+	    push (@rc, $_);
+	}
+    }
+    @rc;
+}
+
+# Return the date (Note that this doesn't have time time zone in it,
+# but I'm not sure if we are that concerned about it
+sub date {
+    my ($result);
+    chomp($result = &ctime(time));
+    return $result;
+}
+
+# Given an list of choices, choose the one that matches the first few
+# characters.  Ambiguous and non-matching strings return undef.
+sub choose_string {
+    my ($string, @choices) = @_;
+    my (@matches) = grep (m/^$string/, @choices);
+    return undef if @matches != 1;
+    return $matches[0];
+}
+
+# resolve_choices takes a string containing a comma separated list of
+# choices and returns the choices from valid_outputs that match.  The
+# choices in required_outputs are added automatically.
+sub resolve_choices {
+    my($temp, $valid_outputs, $required_outputs) = @_;
+    my @temp = split(/\s*[,\s]\s*/, $temp);
+    my %temp;
+    my @output_types = ();
+
+    for (@$required_outputs) {
+	push (@output_types, $_) if (!$temp{$_}++);
+    }
+
+    for (@temp) {
+	$temp = &choose_string ($_, @$valid_outputs, "all");
+	if ($temp eq "all") {
+	    for (@$valid_outputs) {
+		if (!$temp{$_}++) {
+		    push (@output_types, $_);
+		}
+	    }
+	} elsif (!defined $temp) {
+	    Log(0, "Don't know how to output type '$_'\n");
+	} else {
+	    if (!$temp{$_}++) {
+		push (@output_types, $_);
+	    }
+	}
+    }
+    push (@output_types, $valid_outputs->[0]) if (!@output_types);
+    @output_types;
+}
+
+# Find the largest 3 digit numbered file in the directory and return a
+# 3 digit string of the next number.  Used to output numbered log files.  
+sub find_next_number {
+    local (*DIR);
+    my($path) = @_;
+    my (@files, $max);
+    opendir (DIR, $path) || die "Can't open directory '$path': $!\n";
+    @files = readdir(DIR);
+    closedir (DIR);
+    $max = 0;
+    for (@files) {
+	$max = $1 if ((m/^(\d{3})\./ || m/\.(\d{3})$/ || m/\.(\d{3})\./) && $max < $1 );
+    }
+    if ($max < 0) {
+	$max = "000";
+    } else {
+	$max = sprintf ("%03d", $max+1);
+    }
+    $max;
+}
+
+#For 2 $results, compares 'conforming' -- if equal, then compares 'throughput'
+sub results_sort {
+    my ($res) = $a->[0]{'conforming'} <=> $b->[0]{'conforming'};
+    return $res if $res != 0;
+    return $a->[0]{'throughput'} <=> $b->[0]{'throughput'};
+}
+
+##############################################################################
+# Formatting functions
+##############################################################################
+
+# All formatting functions build the output file in a string which they
+# return.  If a filename is specified, then they also output to a file.
+
+# do_outputs, figures out what types are needed and calls the appropriate
+#  functions
+
+sub do_outputs {
+
+
+
+    my ($config, $file_num, $output_dir) = @_;
+
+    # Fill in some benchmark stats for the output
+    my(%med_run_stats)= %{$config->{'results'}[$config->{'median_index'}][0]};
+    $config->{'bm_requested_conn'} = $med_run_stats{'requested_conn'};
+    $config->{'bm_fileset_size'} = $MB_PER_DIRECTORY * 
+	&dirs_from_load($config, $med_run_stats{'requested_conn'});
+
+    my $outsel=($output_types ne "")?$output_types:$config->{'OUTPUT_TYPE'};
+    my @types=&resolve_choices($outsel, [ sort keys %formatter ], ['screen', 'raw']);
+
+    # Output the results
+    for (@types) {
+	my $name   = "$output_dir$config->{'OUTPUT_NAME'}.$file_num.$_";
+	my $output = &{$formatter{$_}}($config);
+
+	next if $_ eq 'screen';
+
+	my $fh = new IO::File ">$name";
+	&Log (10, "Writing '$name'\n");
+	if (!defined $fh) {
+	    &Log (0, "Cannot create '$name': $!\n");
+	    exit (1);
+	}
+	print $fh $output;
+	$fh->close();
+    }
+}
+
+sub init_output {
+    @network_fields = (
+		    [ 'MSL (sec)',           'msl'            ],
+		    [ 'Time-Wait (sec)',     'time_wait'      ],
+    );
+    @clients_fields = (
+		    [ '# of Clients',        'lg_num'         ],
+    );
+    @bm_config_fields = (
+ 		    [ 'Requested Connections', 'bm_requested_conn' ],
+		    [ 'Fileset Size (MB)',     'bm_fileset_size' ],
+    );
+    @notes_fields = (
+		[ 'Errors',                 'errors',         ],
+    );
+    return 0;
+}
+
+
+# .raw files are to look at the raw data and to re-format into the
+# other formats.
+sub write_raw {
+    my ($config, $output_name) = @_;
+    my $rc = "";
+
+    # Header for a raw file
+    $rc .= "BEGIN SPECWEB99 1.00\n";
+#    for (qw( peak_index peak_load peak_throughput peak_response peak_size )) {
+#       $rc .= "$_= $config->{$_}\n";
+#    }
+
+    # Print out the results
+    my $num = "000";
+    for (@{$config->{'results'}}) {
+	my(%run_stats) = %{$_->[0]};
+	my($statname);
+	foreach $statname (sort keys %run_stats) {
+	    $rc .= "results$num = $statname $run_stats{$statname}\n";
+	}
+
+	my $class = 0;
+	for (@{$_->[3]}) {
+	    my ($name, @rest) = @$_;
+	    $rc .= "results$num = class      $class \"$name\" ". join(" ", @rest). "\n";
+	    $class++;
+	}
+	for (@{$_->[4]}) {
+	    $rc .= "results$num = error      $_\n";
+	}
+	$num++;
+    }
+
+    # Print out the entire configuration array
+    for my $key (sort keys %$config) {
+	if ($key eq 'results' || $key eq 'clients_parsed') {
+	    # except these, results is done above, and clients_parsed would
+	    # need similar logic, but really isn't worth it.  If we
+	    # *really* need it we can regenerate it
+	} elsif (ref($config->{$key}) eq "ARRAY") {
+	    # arrays are output as numbered lines
+	    my $num = "000";
+	    for (@{$config->{$key}}) {
+		$rc .= "$key$num = $_\n";
+		$num++;
+	    }
+	} elsif ($config->{$key} ne "--" && $config->{$key} !~ /^\s*$/) {
+	    # Don't print out lines with no values
+	    $rc .= "$key = $config->{$key}\n";
+	}
+    }
+    # Trailer to mark the end of the raw data
+    $rc .= "END SPECWEB99 1.00\n";
+
+    return $rc;
+}
+
+# write_screen  Just writes the ASCII output to the screen.  Used to
+# output the results during the run
+sub write_screen {
+    print &write_asc($_[0]);
+}
+
+# Produces an ASCII formatted listing.
+sub write_asc {
+    my ($config) = @_;
+    my (@results) = @{$config->{'results'}};
+    my (@errors)  = @{$config->{'errors'}} if $config->{'errors'};
+    my $rc = "";
+
+    # Make sure we mark runs invalid
+    my $invalid_string = (@errors)?"INVALID TEST":"";
+
+
+    my $successive_speed_limits = [];
+    $successive_speed_limits = $config->{'SUCCESSIVE_SPEED_LIMITS'};
+    my $speed_limit_string = sprintf "@{$successive_speed_limits}";
+
+    # Banner
+    $rc .= sprintf <<EOT, $config->{'median_results'};
+			       SPECweb99 Result
+
+===============================================================================
+							||
+ %-45.45s          ||   %6d SPECweb99
+ %-45.45s          ||        $invalid_string
+							||
+===============================================================================
+
+PERFORMANCE
+
+               |  Conforming Simultaneous
+   Iteration   |       Connections
+---------------+----------------------------
+EOT
+
+    for (my $i = 0; $i < @results; $i++) {
+	my ($conforming) = $results[$i][0]->{'conforming'};
+	$rc .= sprintf("     %2d        |      %7d\n", $i+1, $conforming);
+    }
+	
+    $rc .= "---------------+----------------------------\n";
+    $rc .= sprintf("    Median     |      %7d\n",  $config->{'median_results'});
+    $rc .= "\n";
+		  
+
+
+    ### Use actual test values - so no mismatch occurs ###
+    $config->{'lg_num'} = scalar(@{$config->{'CLIENTS'}});
+
+    my $width = 79;
+    $rc .= '=' x $width . "\n";
+    my $title = "Notes/Tuning information";
+    $rc .= ' ' x int(($width - length($title))/2) . $title . "\n";
+
+    for my $info ( @notes_fields ) {
+	my ($name, $key) = @$info;
+	my $val = $config->{$key};
+	my @vals = ();
+	next if $val eq '' || $val eq '--' || (ref($val) eq 'ARRAY' && @$val == 0);
+	$rc .= "\n$name\n";
+	if (ref($val) eq 'ARRAY') {
+	    for (@$val) {
+		push (@vals, split("\n", $_));
+	    }
+	} else {
+	    @vals = split("\n", $val);
+	}
+	for (@vals) {
+	    $rc .= "    $_\n";
+	}
+    }
+
+    $rc .= <<EOT; 
+
+===============================================================================
+
+Test Run Details
+ 
+    Run    Conforming  Percent  |  Throughput  Response ops/sec/  Kbits/
+    Num    Connections Conform  |  ops/sec     msec     loadgen   sec
+EOT
+
+    # Print out the data points we've collected
+    for (my $i = 0; $i < @results; $i++) {
+	my(%run_stats) = %{$results[$i][0]};
+	$rc .= sprintf ("  %2s %2d   %6d     %7.1f%%   |  %7.1f     %7.1f   %5.2f     %5.1f\n", 
+			
+			$i == $config->{'median_index'} ? "=>" : "  ",
+			$i+1,
+			$run_stats{'conforming'}, 
+			$run_stats{'conform_pct'}, $run_stats{'throughput'},
+			$run_stats{'response'}, $run_stats{'ops_per_thread'},
+			$run_stats{'bitrate'} / 1000);
+    }
+
+	$rc .= sprintf("Performance Counters:\n");
+    $rc .= sprintf ("%s\n", $perfcnt);
+
+    if ($details) {
+	$rc .= sprintf <<EOT, $speed_limit_string;
+
+
+                    Cumulative Conformance % Chart
+
+    Run  Conforming    |  Percent of connections conforming at various speeds
+    Num  Connections   |  %s
+-----------------------+---------------------------------------------------\n
+EOT
+
+	for (my $i = 0; $i < @results; $i++) {
+	    my(%run_stats) = %{$results[$i][0]};
+	    $rc .= sprintf ("  %2s %2d   %5d        |   %s\n",
+			    $i == $config->{'median_index'} ? "=>" : "  ",
+			    $i + 1,
+			    $run_stats{'conforming'}, 
+			    $run_stats{'cum_conformance'});
+	}    
+    $rc .= "\n\n";
+    }
+
+    if ($details) {
+	#Write results for individual tests 
+	for (my $i = 0; $i < @results; $i++) {
+	    $rc .= sprintf("\n\nResults From Iteration %d\n", $i+1);
+	    my (@class_results) = @{$results[$i][3]};
+	    $rc .= &printout_class_results( \@class_results,
+					   $config->{'RUN_TIME'}, $i + 1,
+					   "ASCII");
+	    my(%run_stats) = %{$results[$i][0]};
+	    $rc .= &printout_summary(\%run_stats, $speed_limit_string, 
+				     $config->{'USER_SPEED_LIMIT'}, "ASCII");
+	}
+    }
+
+    return $rc;
+}
+
+sub firstof($) {
+    my ($val) = @_;
+    $val = $val->[0] if (ref($val) eq 'ARRAY');
+    return $val;
+}
diff --git a/base/Applications/WebApps/SPECweb99/rc b/base/Applications/WebApps/SPECweb99/rc
new file mode 100644
index 0000000..bb0ba9c
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/rc
@@ -0,0 +1,219 @@
+#
+# NB Singularity testing: search-replace "galenh-sut" in this document
+# with the IP address of your SUT machine.
+#
+
+###############################################################################
+#                                                                             #
+#                    Test parameters for SPECweb99                            #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+#
+# Changeable Benchmark Configuration Parameters
+#
+###############################################################################
+
+# SIMULTANEOUS_CONNECTIONS sets the number of load generators for the
+# tests to be run.  You may specify one value or a list of values.
+# manager will run a separate test for each value in the list.  During
+# each test, N measurements will be taken, where N is the value assigned
+# to ITERATIONS.  If you use a list, each value results in a separate
+# test with its own output files, unless ITERATIONS=1.  When
+# ITERATIONS=1, all the values in SIMULTANEOUS_CONNECTIONS get reported
+# in a single set of output files.  This is for testing and tuning
+# purposes only.  For reporting purposes ITERATIONS must be set to 3.
+# The form <first>-<last>x<increment> can be used to run a series of
+# tests starting at <first>, ending at <last> and incrementing by
+# <increment>.
+
+SIMULTANEOUS_CONNECTIONS="200"
+#SIMULTANEOUS_CONNECTIONS="5-65x15"
+#SIMULTANEOUS_CONNECTIONS="10-100x10 85 95 98"
+
+# CLIENTS: client-name(port)[speed]{servername}
+# SERVER: server-name as seen by the prime-client
+
+# You may use multiple network adapters in a client by specifying that client
+# multiple times with different {servername} settings and using the
+# @@SERVER@@ form of URL_ROOT. For example:
+#   CLIENTS=box1{sut-fddi1} box1{sut-fddi2}
+# The speed setting gives relative speed of each
+# client and the port setting is the port through which the prime-client
+# communicates with that client. For example:
+#   CLIENTS=client1[2] client2(2223)
+# client1 is twice as fast as client2, client2 will open port 2223 to
+# receive its messages from the prime client.
+
+CLIENTS=localhost
+#CLIENTS=sc5 sc6 sc7 sc8 sc9 sc10 sc11 sc12 sc13 sc14 sc15 sc16 sc17 sc18 sc20 sc23 sc24 sc25 sc26 sc28 sc29 sc30 sc31 sc32
+
+SERVER=172.31.43.157
+
+URL_ROOT=http://172.31.43.157/fs/SPECWEB
+DYNAMIC_ROOT=http://172.31.43.157/dynamic-content
+DYN_CMD_SCRIPT=http://172.31.43.157/dynamic-content
+DYN_CGI_SCRIPT=http://172.31.43.157/dynamic-content
+
+# URL_ROOT is the URL for the directory that contains "file_set". For
+# example, if your file_set directory is in the web-server root then use
+# "URL_ROOT=http://server1" (where server1 is the name of your web
+# server).  If you built the file_set in a directory named "specweb99"
+# then use "URL_ROOT=http://server1/specweb99". To use multi-adapter
+# clients use: URL_ROOT=http://@@SERVER@@/specweb99
+
+
+# DYNAMIC_ROOT or DYN_GET_SCRIPT, DYN_CAD_SCRIPT, DYN_POST_SCRIPT,
+#         DYN_CMD_SCRIPT
+# The URL of the dynamic program(s) (e.g. CGI executable, ISAPI
+# module, NSAPI module, etc).  If your file_set directory is not in the
+# web-server root then add a question mark and the URL to the directory
+# that contains file_set.
+#
+# For example, if file_set is in a directory
+# named "specweb99" then you would use
+# "DYNAMIC_ROOT=http://server1/cgi-bin/specweb99-cgi.pl?/specweb99".
+#
+# You may also use separate URL's for each class of DYNAMIC operation
+# supported: POST, standard dynamic GET, custom ad rotation (CAD) GET
+# and Commands (fetch, reset).  You may set any or all of the 4 separate
+# variables.  The unset variables will default to DYNAMIC_ROOT.
+#
+
+#DYN_POST_SCRIPT=http://specsut/post/specweb99.dll
+#DYN_CAD_SCRIPT=http://sut/spec99/specweb99cad.dll
+#DYN_GET_SCRIPT=http://server1/spec/cgi-bin/specweb99-cgi.pl
+
+
+# You must specify the URL for DYN_CGI_SCRIPT that is a CGI-based
+# implementation of the standard dynamic GET.  This will not default to
+# DYNAMIC_ROOT.
+
+#DYN_CGI_SCRIPT=http://server1/spec/cgi-bin/specweb99-cgi.pl
+
+# HTTP_PROTOCOL is used to specify HTTP version 1.0 or 1.1.  If you
+# leave this commented out then <I>manager</I> makes a connection to
+# your web server to determine what version of the protocol to use.  You
+# can set the HTTP_PROTOCOL variable in order to force SPECweb99 to use
+# a particular version of HTTP.  The valid settings are "HTTP/1.0" or
+# "HTTP/1.1".
+
+#HTTP_PROTOCOL="HTTP/1.1"
+#HTTP_PROTOCOL="HTTP/1.0"
+
+# WARMUP_TIME is the amount of time in seconds to run to get to steady
+# state prior to the 1st measurement in the test.  This time is intended
+# to warm up any caches before taking a measurement.  The minimum legal
+# value is 1200 seconds.
+
+WARMUP_TIME=60
+
+# WAIT_TO_BEGIN is the time to sleep in seconds before starting each
+# iteration. This delay is taken after the prime client tells the
+# clients about the workload and before telling them to start working.
+# If test startup isn't synchronizing properly, this might need to be
+# increased.
+
+WAIT_TO_BEGIN=5
+
+# All outputs get put in ./results/<OUTPUT_NAME>.nnn.xxx where nnn is an
+# ascending test number and xxx is the output format type (i.e. raw, ps,
+# pdf, asc, html).
+
+OUTPUT_NAME="output"
+
+###############################################################################
+#
+# Configuration Description - set these parameters to describe the test.
+# These settings will show up in the reports
+#
+###############################################################################
+
+#Network
+
+msl=30
+time_wait=60
+
+###############################################################################
+#
+# Benchmark Constants - any change to these will lead to an invalid result
+#
+###############################################################################
+#
+#  you cannot change these without invalidating benchmark results
+#
+
+#
+#
+
+# "warmup" time before 2nd through nth iteration of the test
+RAMPUP_TIME="30"
+
+# measurement time for each iteration (default = 1200)</DD>
+RUN_TIME="180"
+
+# time after each iteration of the test (default = 300)</DD>
+RAMPDOWN_TIME="30"
+
+# number of times to repeat the measurement (default = 3)</DD>
+ITERATIONS=1
+
+#
+# Mix parameters - control the percentage of requests of each type.  Set
+#    values between 0 and 1.
+#
+
+
+# Percent of overall dynamic requests (default = 0.3 for 30% dynamic requests)
+
+DYNAMIC_CONTENT=0.3
+
+# Percent of dynamic requests that are posts (default = 0.16).
+
+DYNAMIC_POST=0.16
+
+# Percent of dynamic requests that are Custom Ad Rotation GETS (default = .42)
+
+DYNAMIC_CAD_GET=.42
+
+# Percent of dynamic requests that are  GETs calling the CGI code
+# (default = .005)
+
+DYNAMIC_CGI_GET=.005
+
+# Number of files each in each class
+
+MAX_FILE=8
+
+# Emulation of user dialup line. SPEED in bits/sec.
+# Target line speed to emulate in bits/second (default = 400000)</DD>
+
+USER_LINE_SPEED=400000
+
+# Speed in bits/second below which a connection is deemed too slow.  For
+# a valid test, 95% of the connections must operate faster than the
+# USER_SPEED_LIMIT (default = 320000)
+
+USER_SPEED_LIMIT=320000
+
+# REQUESTS_PER_KEEP_ALIVE is the average number of HTTP requests to do
+# per "keep-alive" HTTP connection.  For example, if a connection
+# randomly selects 5 requests to keep alive it will open a connection to
+# the web server, request a page, read the server response, do this
+# request+read 4 more times, and then close the socket connection.  Each
+# of the 5 GETs on that socket will be for different URLs. (default =
+# 10)
+
+REQUESTS_PER_KEEP_ALIVE=10
+
+# PERCENT_KEEP_ALIVE_REQUETS is the percentage of GETs that to retrieve
+# via "keep-alive" connections.  Note that this is NOT the percentage of
+# connections that will have the keep-alive header. (default = 0.7)
+
+PERCENT_KEEP_ALIVE_REQUESTS=0.7
+
+# Set ABORTIVE_CLOSE to 0 or 1 to indicate whether or not to use
+# abortive closes.  (default = 0)
+
+ABORTIVE_CLOSE=0
diff --git a/base/Applications/WebApps/SPECweb99/rc.sing b/base/Applications/WebApps/SPECweb99/rc.sing
new file mode 100644
index 0000000..b37455c
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/rc.sing
@@ -0,0 +1,292 @@
+
+###############################################################################
+#                                                                             #
+#                    Test parameters for SPECweb99                            #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+#
+# Changeable Benchmark Configuration Parameters
+#
+###############################################################################
+
+# SIMULTANEOUS_CONNECTIONS sets the number of load generators for the
+# tests to be run.  You may specify one value or a list of values.
+# manager will run a separate test for each value in the list.  During
+# each test, N measurements will be taken, where N is the value assigned
+# to ITERATIONS.  If you use a list, each value results in a separate
+# test with its own output files, unless ITERATIONS=1.  When
+# ITERATIONS=1, all the values in SIMULTANEOUS_CONNECTIONS get reported
+# in a single set of output files.  This is for testing and tuning
+# purposes only.  For reporting purposes ITERATIONS must be set to 3.
+# The form <first>-<last>x<increment> can be used to run a series of
+# tests starting at <first>, ending at <last> and incrementing by
+# <increment>.
+
+SIMULTANEOUS_CONNECTIONS="10"
+#SIMULTANEOUS_CONNECTIONS="5-65x15"
+#SIMULTANEOUS_CONNECTIONS="10-100x10 85 95 98"
+
+# CLIENTS: client-name(port)[speed]{servername}
+# SERVER: server-name as seen by the prime-client
+
+# You may use multiple network adapters in a client by specifying that client
+# multiple times with different {servername} settings and using the
+# @@SERVER@@ form of URL_ROOT. For example:
+# 	CLIENTS=box1{sut-fddi1} box1{sut-fddi2}
+# The speed setting gives relative speed of each
+# client and the port setting is the port through which the prime-client
+# communicates with that client. For example: 
+# 	CLIENTS=client1[2] client2(2223)
+# client1 is twice as fast as client2, client2 will open port 2223 to
+# receive its messages from the prime client.
+
+CLIENTS=localhost
+SERVER=172.31.43.73
+
+# URL_ROOT is the URL for the directory that contains "file_set". For
+# example, if your file_set directory is in the web-server root then use
+# "URL_ROOT=http://server1" (where server1 is the name of your web
+# server).  If you built the file_set in a directory named "specweb99"
+# then use "URL_ROOT=http://server1/specweb99". To use multi-adapter
+# clients use: URL_ROOT=http://@@SERVER@@/specweb99
+
+URL_ROOT=http://172.31.43.73/fs
+
+
+# DYNAMIC_ROOT or DYN_GET_SCRIPT, DYN_CAD_SCRIPT, DYN_POST_SCRIPT, 
+#         DYN_CMD_SCRIPT
+# The URL of the dynamic program(s) (e.g. CGI executable, ISAPI
+# module, NSAPI module, etc).  If your file_set directory is not in the
+# web-server root then add a question mark and the URL to the directory
+# that contains file_set.
+# 
+# For example, if file_set is in a directory
+# named "specweb99" then you would use
+# "DYNAMIC_ROOT=http://server1/cgi-bin/specweb99-cgi.pl?/specweb99".
+# 
+# You may also use separate URL's for each class of DYNAMIC operation
+# supported: POST, standard dynamic GET, custom ad rotation (CAD) GET
+# and Commands (fetch, reset).  You may set any or all of the 4 separate
+# variables.  The unset variables will default to DYNAMIC_ROOT.
+#
+
+DYNAMIC_ROOT=http://172.31.43.73/spec/cgi-bin/specweb99-cgi.pl
+
+DYN_GET_SCRIPT=http://172.31.43.73/dynamic-content
+DYN_CAD_SCRIPT=http://172.31.43.73/dynamic-content
+DYN_POST_SCRIPT=http://172.31.43.73/dynamic-content
+DYN_CMD_SCRIPT=http://172.31.43.73/dynamic-content
+
+
+# You must specify the URL for DYN_CGI_SCRIPT that is a CGI-based
+# implementation of the standard dynamic GET.  This will not default to
+# DYNAMIC_ROOT.
+
+DYN_CGI_SCRIPT=http://172.31.43.73/spec/cgi-bin/specweb99-cgi.pl
+
+# HTTP_PROTOCOL is used to specify HTTP version 1.0 or 1.1.  If you
+# leave this commented out then <I>manager</I> makes a connection to
+# your web server to determine what version of the protocol to use.  You
+# can set the HTTP_PROTOCOL variable in order to force SPECweb99 to use
+# a particular version of HTTP.  The valid settings are "HTTP/1.0" or
+# "HTTP/1.1".
+
+#HTTP_PROTOCOL="HTTP/1.1"
+#HTTP_PROTOCOL="HTTP/1.0"
+
+# WARMUP_TIME is the amount of time in seconds to run to get to steady
+# state prior to the 1st measurement in the test.  This time is intended
+# to warm up any caches before taking a measurement.  The minimum legal
+# value is 1200 seconds.
+
+WARMUP_TIME=60
+
+# WAIT_TO_BEGIN is the time to sleep in seconds before starting each
+# iteration. This delay is taken after the prime client tells the
+# clients about the workload and before telling them to start working.
+# If test startup isn't synchronizing properly, this might need to be
+# increased.
+
+WAIT_TO_BEGIN=5
+
+# All outputs get put in ./results/<OUTPUT_NAME>.nnn.xxx where nnn is an
+# ascending test number and xxx is the output format type (i.e. raw, ps,
+# pdf, asc, html).
+
+OUTPUT_NAME="output"
+
+
+###############################################################################
+#
+# Configuration Description - set these parameters to describe the test.
+# These settings will show up in the reports
+#
+###############################################################################
+
+
+#Server Hardware
+
+hw_vendor="Some Texas Company"
+hw_model="Kowabunga 2000"
+hw_cpu="60 Hz PDP-11"
+hw_ncpu=13
+hw_pcache="16KBI+16KBD on chip"
+hw_scache="1MB(I+D) off chip"
+hw_ocache="16MB(I+D) off chip per CPU pair"
+hw_memory="7 GB"
+hw_disk="3 CDRW, 10 9GB SCSI AB-CD01 "
+hw_controllers="1 IDE KURU-2000"
+hw_other="1 Everready Bunny"
+
+#Availability Dates
+
+hw_avail="Dec-1999"
+http_avail="Jan-2000"
+os_avail="Jun-1997"
+software_avail="Jan-2001"
+
+#HTTP Software
+
+sw_vendor="Software House of Horrors"
+sw_http="WebServer 12.0"
+sw_api="Fast CGI"
+http_cache="WebSpeedup 0.12"
+http_logmode="Uncommon Log Format"
+
+#Other Software
+
+sw_os="MS-DOS 2.1"
+sw_file="NFS"
+sw_other="Quake II"
+
+
+#Test Sponsor
+
+test_date="Dec-1901"
+tester_name="Some Texas Company"
+license_num=-1
+
+#Network
+
+net_nctrls=100
+net_controller="3 Proteon ISA Microbit & 97 MultiCom Ethernet"
+net_nnets=100
+net_net="3 Microbit & 97 Ethernet"
+net_speed="1Mb/s & 10Mb/s"
+msl=30
+time_wait=60
+net_mtu=1500
+
+#Clients (i.e. Load Generators)
+
+#lg_num=This field is derived from the client list
+lg_model="PackardBell 286i"
+lg_cpu="1.28Mhz 8088+"
+lg_ncpu=1
+lg_memory="64KB"
+lg_netctrlr="Hayes Internal"
+lg_os="Disk O.S."
+lg_compiler="TurboPascal"
+
+
+#Notes
+# any of the notes can be multi-line by using the nnn suffix
+
+notes_sut000="I overclocked this machine"
+notes_sut001="I learned how to do it on the Internet"
+notes_os000="Tuning parameters:"
+notes_os001="  superboost=1"
+notes_os002="  megacache_size=9009009009"
+notes_http=
+notes_api=
+notes_software=
+notes_hardware=
+notes_net=
+notes_client=
+notes="I'd like to teach the world to sing"
+
+
+###############################################################################
+#
+# Benchmark Constants - any change to these will lead to an invalid result
+#
+###############################################################################
+#
+#  you cannot change these without invalidating benchmark results
+#
+
+#
+#
+
+# "warmup" time before 2nd through nth iteration of the test 
+RAMPUP_TIME="300"
+
+# measurement time for each iteration (default = 1200)</DD>
+RUN_TIME="60"
+
+# time after each iteration of the test (default = 300)</DD>
+RAMPDOWN_TIME="300"
+
+# number of times to repeat the measurement (default = 3)</DD>
+ITERATIONS=1
+
+#
+# Mix parameters - control the percentage of requests of each type.  Set
+#    values between 0 and 1.
+#
+
+
+# Percent of overall dynamic requests (default = 0.3 for 30% dynamic requests)
+
+DYNAMIC_CONTENT=0
+
+# Percent of dynamic requests that are posts (default = 0.16).
+
+DYNAMIC_POST=0
+
+# Percent of dynamic requests that are Custom Ad Rotation GETS (default = .42)
+
+DYNAMIC_CAD_GET=0
+
+# Percent of dynamic requests that are  GETs calling the CGI code 
+# (default = .005)
+
+DYNAMIC_CGI_GET=0
+
+# Number of files each in each class
+
+MAX_FILE=8
+
+# Emulation of user dialup line. SPEED in bits/sec.
+# Target line speed to emulate in bits/second (default = 400000)</DD>
+
+USER_LINE_SPEED=400000
+
+# Speed in bits/second below which a connection is deemed too slow.  For
+# a valid test, 95% of the connections must operate faster than the
+# USER_SPEED_LIMIT (default = 320000)
+
+USER_SPEED_LIMIT=320000
+
+# REQUESTS_PER_KEEP_ALIVE is the average number of HTTP requests to do
+# per "keep-alive" HTTP connection.  For example, if a connection
+# randomly selects 5 requests to keep alive it will open a connection to
+# the web server, request a page, read the server response, do this
+# request+read 4 more times, and then close the socket connection.  Each
+# of the 5 GETs on that socket will be for different URLs. (default =
+# 10)
+
+REQUESTS_PER_KEEP_ALIVE=10
+
+# PERCENT_KEEP_ALIVE_REQUETS is the percentage of GETs that to retrieve
+# via "keep-alive" connections.  Note that this is NOT the percentage of
+# connections that will have the keep-alive header. (default = 0.7)
+
+PERCENT_KEEP_ALIVE_REQUESTS=0.7
+
+# Set ABORTIVE_CLOSE to 0 or 1 to indicate whether or not to use
+# abortive closes.  (default = 0)
+
+ABORTIVE_CLOSE=0
diff --git a/base/Applications/WebApps/SPECweb99/specweb.cmd b/base/Applications/WebApps/SPECweb99/specweb.cmd
new file mode 100644
index 0000000..620b3eb
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/specweb.cmd
@@ -0,0 +1,25 @@
+cd %SINGULARITY_ROOT%
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Applications\Cadgen99
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Applications\Upfgen99
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Applications\Network
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Applications\WebApps
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Applications\Cassini
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Applications\Benchmarks\Perfcnt
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%\Distro
+nmake
+if errorlevel 1 goto exit
+cd %SINGULARITY_ROOT%
diff --git a/base/Applications/WebApps/SPECweb99/startup.script b/base/Applications/WebApps/SPECweb99/startup.script
new file mode 100644
index 0000000..722912e
--- /dev/null
+++ b/base/Applications/WebApps/SPECweb99/startup.script
@@ -0,0 +1,18 @@
+# This script gets run whenever Shell starts.
+# For now, this is a crude approximation of a startup environment.
+# In the short-term, this is mostly useful for automating testing a sequence of commands.
+# Such as:
+
+# ipconfig '/dev/nic0' '192.168.0.80' '255.255.255.0' '192.168.0.1'
+# ipconfig '@dhcp' '/dev/nic0' 'start'
+# cred '@add' '.\test' 'some-password-here'
+# net '@mount' '/distro' '\\192.168.0.12\distro'
+
+# '-c:128'
+fatcontrol '@mount' '-c:700' '-d:4096' '-f:4096' '/dev/vol0.1' '/fs'
+ipconfig '@dhcp' '/dev/nic0' 'start'
+ipconfig '@show'
+perfcnt '-g'
+# '-v'
+cassini '-app=SPECWeb99WebApp.x86' &
+
diff --git a/base/Applications/WebApps/Spew/Spew.csproj b/base/Applications/WebApps/Spew/Spew.csproj
new file mode 100644
index 0000000..311f446
--- /dev/null
+++ b/base/Applications/WebApps/Spew/Spew.csproj
@@ -0,0 +1,33 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SpewWebApp</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Spew.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="..\Driver\WebAppDriver.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/WebApps/Spew/Spew.sg b/base/Applications/WebApps/Spew/Spew.sg
new file mode 100644
index 0000000..d616c2a
--- /dev/null
+++ b/base/Applications/WebApps/Spew/Spew.sg
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Spew.sg
+//
+//  Note:   The Spew web app (serves files and supports browsing)
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Text;
+using System.Web;
+using FileSystem.Utils;
+
+namespace Microsoft.Singularity.WebApps
+{
+    public class SpewWebApp : IWebApp
+    {
+        private const string RepeatPattern = "Here is a repeating string of text that serves as content. ";
+
+        public void ProcessRequest(IHttpRequest! request)
+        {
+            string query = request.GetQueryString();
+            int numBytes = 0, chunkSize = 5840; // 1460 * 4
+
+            ExtractQueryParamNumValue("numBytes", query, ref numBytes);
+            ExtractQueryParamNumValue("chunkSize", query, ref chunkSize);
+
+            request.SendStatus(200, "OK");
+            request.SendHeader("Content-type", "text/plain");
+
+            if (numBytes == 0) {
+                request.SendBodyData(Encoding.ASCII.GetBytes("Specify a 'numBytes' query param, and optionally a 'chunkSize' query param!"));
+                request.Done();
+
+            } else {
+                byte[]! in ExHeap buf;
+                int bytesWritten = 0, patternLength = RepeatPattern.Length;
+
+                while (bytesWritten < numBytes) {
+                    int bytesLeft = numBytes - bytesWritten;
+                    int thisPass = chunkSize < bytesLeft ? chunkSize : bytesLeft;
+                    buf = new[ExHeap] byte[thisPass];
+
+                    for (int i = 0; i < thisPass; i++) {
+                        buf[i] = (byte)RepeatPattern[i % patternLength];
+                    }
+
+                    request.SendBodyData(buf);
+                    bytesWritten += thisPass;
+                }
+
+                request.Done();
+            }
+        }
+
+        private bool ExtractQueryParamNumValue(string! paramName, string queryString, ref int outVal)
+        {
+            if (queryString == null) {
+                return false;
+            }
+
+            int start = queryString.IndexOf(paramName + "=");
+
+            if (start == -1) {
+                return false;
+            }
+
+            start += paramName.Length + 1;
+            int end = queryString.IndexOf("&", start);
+            string val;
+
+            if (end == -1) {
+                val = queryString.Substring(start);
+            }
+            else {
+                val = queryString.Substring(start, end - start);
+            }
+
+            try {
+                outVal = Int32.Parse(val);
+                return true;
+            }
+            catch (Exception) {
+                return false;
+            }
+        }
+
+
+        // ======================================================
+        // The code below gets used when this webapp is compiled
+        // to a stand-alone executable
+        public static void Main(string[]! args)
+        {
+            Endpoint * in ExHeap ep = Process.GetStartupEndpoint(0);
+            WebAppContract.Exp conn = ep as WebAppContract.Exp;
+            if (conn == null) {
+                // Wrong contract type!
+                delete ep;
+                return;
+            }
+
+            conn.SendWebAppReady();
+
+            SpewWebApp webApp = new SpewWebApp();
+            Driver.ServiceChannel(webApp, conn);
+            delete conn;
+        }
+    }
+}
diff --git a/base/Applications/WebApps/WebApps.proj b/base/Applications/WebApps/WebApps.proj
new file mode 100644
index 0000000..3c623d1
--- /dev/null
+++ b/base/Applications/WebApps/WebApps.proj
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <ItemGroup>
+    <ProjectReference Include="*\*.*proj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/WebServer/Application.sg b/base/Applications/WebServer/Application.sg
new file mode 100644
index 0000000..58072a6
--- /dev/null
+++ b/base/Applications/WebServer/Application.sg
@@ -0,0 +1,238 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Dispatcher.sg
+//
+//  Note:
+//     This file holds the Singularity-specific web app dispatcher that knows
+//     how to invoke web apps under Singularity.
+//
+
+using System;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Diagnostics;
+using System.Web;
+
+namespace Microsoft.Singularity.WebServer
+{
+    internal sealed class Application
+    {
+        private static Hashtable applications = new Hashtable();
+
+        public static Application FindOrCreateApplication(Request! request)
+        {
+            // For now, we have an extremely lame way of mapping from a request
+            // to the appropriate application.  We simply take the FilePath
+            // after the leading slash.  That better be the name of a launchable
+            // application.
+            //
+            // TODO: Eventually this will be based on manifests and the mapping
+            // configuration of the WebServer, passed to the WebServer at
+            // startup.
+
+            string filePath = request.GetFilePath();
+            string appName = filePath.Substring(1);
+
+            Application app = (Application) applications[appName];
+
+            if (app == null) {
+                // No races around inserting unstarted applications into the hashtable.
+                lock (applications) {
+                    // Perhaps it's there now.
+                    app = (Application) applications[appName];
+                    if (app == null) {
+                        app = new Application(appName);
+
+                        // Regardless of whether the app starts successfully,
+                        // record it in our set of applications.
+                        app.Start();
+                        applications[appName] = app;
+                    }
+                }
+            }
+            // If an app failed to start, we keep it in the hashtable so we
+            // don't keep re-trying on every client request.
+            return ((app != null && app.started)
+                    ? app
+                    : null);
+        }
+
+        private TRef<WebAppContract.Imp:ProcessingState> wrapAppConn;
+        private string! name;
+        private bool    started;
+
+        // statistics
+        private ulong totalServed = 0;
+        private ulong totalTime = 0;
+
+        public Application(string! name)
+        {
+            this.name = name;
+            this.started = false;
+            base();
+        }
+
+        public void Process(Request! request)
+        {
+            ulong startTime = Processor.CycleCount;
+
+            // Make a local request object
+            IHttpRequest localRequest = new LocalHttpRequest(request);
+
+            HttpRequestContract.Imp! reqConnImp;
+            HttpRequestContract.Exp! reqConnExp;
+            HttpRequestContract.NewChannel(out reqConnImp, out reqConnExp);
+
+            WebAppContract.Imp appConn = wrapAppConn.Acquire();
+
+            try {
+                // Start processing this request
+                appConn.SendProcess(reqConnImp);
+                appConn.RecvOK();
+            }
+            finally {
+                wrapAppConn.Release(appConn);
+            }
+
+            // Start servicing the request contract
+            RequestExporter.ServiceRequestChannel(localRequest, reqConnExp);
+
+            // Clean up
+            delete reqConnExp;
+
+            request.CloseConnection();
+
+            totalServed++;
+            totalTime += Processor.CycleCount - startTime;
+        }
+
+        public void Start()
+        {
+            string[] args = new string[1];
+
+            args[0] = name;
+
+            WebAppContract.Imp! appConnImp;
+            WebAppContract.Exp! appConnExp;
+            WebAppContract.NewChannel(out appConnImp, out appConnExp);
+
+            try {
+                Process child = new Process(args, (Endpoint * in ExHeap) appConnExp);
+                child.Start();
+                appConnImp.RecvWebAppReady();
+                wrapAppConn = new TRef<WebAppContract.Imp:ProcessingState>(appConnImp);
+            }
+            catch (Exception) {
+                // TODO: The exception story of Singularity needs work.  For now,
+                // just record the fact that this app won't start.
+                return;
+            }
+            started = true;
+        }
+
+        internal class RequestExporter
+        {
+            public static void ServiceRequestChannel(IHttpRequest! request, HttpRequestContract.Exp! conn)
+            {
+                bool done = false;
+
+                while(!done) {
+                    switch receive {
+                        case conn.GetUriPath() :
+                            conn.SendUriPath(Bitter.FromString2(request.GetUriPath()));
+                            break;
+
+                        case conn.GetQueryString() :
+                            conn.SendQueryString(Bitter.FromString(request.GetQueryString()));
+                            break;
+
+                        case conn.GetVerb() :
+                            conn.SendVerb(Bitter.FromString(request.GetVerb()));
+                            break;
+
+                        case conn.GetHeader(char[]! in ExHeap headerChars) :
+                            string headerName = Bitter.ToString(headerChars);
+                            delete headerChars;
+                            string headerVal = request.GetHeader(headerName);
+                            if (headerVal != null) {
+                                conn.SendHeaderValue(Bitter.FromString(headerVal));
+                            } else {
+                                conn.SendHeaderValue(null);
+                            }
+                            break;
+
+                        case conn.GetBody() :
+                            byte[] bodyData = request.GetBodyData();
+
+                            if (bodyData != null) {
+                                conn.SendBodyData(Bitter.FromByteArray(bodyData));
+                            } else {
+                                conn.SendBodyData(null);
+                            }
+                            break;
+
+                        case conn.GetRemoteAddress() :
+                            conn.SendRemoteAddress(Bitter.FromString(request.GetRemoteAddress()));
+                            break;
+
+                        case conn.SendStatus(int code, char[]! in ExHeap descChars) :
+                        {
+                            string description = Bitter.ToString(descChars);
+                            delete descChars;
+                            request.SendStatus(code, description);
+                            conn.SendOK();
+                        }
+                        break;
+
+                        case conn.SendHeader(char[]! in ExHeap nameChars, char[]! in ExHeap valChars) :
+                        {
+                            string name = Bitter.ToString(nameChars);
+                            delete nameChars;
+
+                            string value = Bitter.ToString(valChars);
+                            delete valChars;
+
+                            request.SendHeader(name, value);
+                            conn.SendOK();
+                        }
+                        break;
+
+                        case conn.SendBodyData(byte[]! in ExHeap dataBytes) :
+                        {
+                            request.SendBodyData(dataBytes);
+                            conn.SendOK();
+                        }
+                        break;
+
+                        case conn.Done() :
+                            request.Done();
+                            done = true;
+                            break;
+
+                        case conn.ChannelClosed() :
+                            // This is unexpected
+                            DebugStub.Break();
+                            done = true;
+                            break;
+
+                        case unsatisfiable :
+                            // This is even more unexpected
+                            DebugStub.Break();
+                            done = true;
+                            break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebServer/ByteParser.sg b/base/Applications/WebServer/ByteParser.sg
new file mode 100644
index 0000000..1a524a1
--- /dev/null
+++ b/base/Applications/WebServer/ByteParser.sg
@@ -0,0 +1,57 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+    using System;
+    using System.Collections;
+    using System.Text;
+
+    internal sealed class ByteParser
+    {
+        private byte[] bytes;
+        private int pos;
+
+        public ByteParser(byte[]! bytes)
+        {
+            this.bytes = bytes;
+            this.pos = 0;
+        }
+
+        public int CurrentOffset
+        {
+            get { 
+                return pos; 
+            }
+        }
+
+        public ByteString ReadLine()
+        {
+            ByteString line = null;
+
+            for (int i = pos; i < bytes.Length; i++) {
+                if (bytes[i] == (byte)'\n') {
+                    int len = i-pos;
+                    if (len > 0 && bytes[i-1] == (byte)'\r') {
+                        len--;
+                    }
+
+                    line = new ByteString(bytes, pos, len);
+                    pos = i+1;
+                    return line;
+                }
+            }
+
+            if (pos < bytes.Length) {
+                line = new ByteString(bytes, pos, bytes.Length-pos);
+            }
+
+            pos = bytes.Length;
+            return line;
+        }
+    }
+}
diff --git a/base/Applications/WebServer/ByteString.sg b/base/Applications/WebServer/ByteString.sg
new file mode 100644
index 0000000..d1cab9d
--- /dev/null
+++ b/base/Applications/WebServer/ByteString.sg
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+    using System;
+    using System.Collections;
+    using System.Text;
+
+    internal sealed class ByteString
+    {
+        private byte[] bytes;
+        private int offset;
+        private int length;
+
+        public ByteString(byte[] bytes, int offset, int length)
+        {
+            this.bytes = bytes;
+            this.offset = offset;
+            this.length = length;
+        }
+
+        public byte[] Bytes
+        { 
+            get { 
+                return bytes; 
+            } 
+        }
+
+        public bool IsEmpty 
+        { 
+            get { 
+                return (bytes == null || length == 0); 
+            }  
+        }
+
+        public int Length 
+        { 
+            get {
+                return length; 
+            } 
+        }
+
+        public int Offset
+        { 
+            get { 
+                return offset; 
+            } 
+        }
+
+        public byte this[int index]
+        {
+            get {
+                return bytes[offset+index];
+            }
+        }
+
+        public String GetString()
+        {
+            return GetString(Encoding.UTF8);
+        }
+
+        public String GetString(Encoding enc)
+        {
+            if (IsEmpty) {
+                return String.Empty;
+            }
+            return enc.GetString(bytes, offset, length);
+        }
+
+        public byte[] GetBytes()
+        {
+            byte[] newBytes = new byte[length];
+            if (length > 0) {
+                Buffer.BlockCopy(bytes, offset, newBytes, 0, length);
+            }
+            return newBytes;
+        }
+
+        public int IndexOf(char ch)
+        {
+            return IndexOf(ch, 0);
+        }
+
+        public int IndexOf(char ch, int offset)
+        {
+            for (int i = offset; i < length; i++) {
+                if (this[i] == (byte)ch) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        public ByteString Substring(int offset)
+        {
+            return Substring(offset, length-offset);
+        }
+
+        public ByteString Substring(int offset, int len)
+        {
+            return new ByteString(bytes, this.offset+offset, len);
+        }
+
+        public ByteString[] Split(char sep)
+        {
+            ArrayList list = new ArrayList();
+
+            int pos = 0;
+            while (pos < length) {
+                int i = IndexOf(sep, pos);
+                if (i < 0) {
+                    break;
+                }
+
+                list.Add(Substring(pos, i-pos));
+                pos = i+1;
+
+                while (this[pos] == (byte)sep && pos < length) {
+                    pos++;
+                }
+            }
+
+            if (pos < length) {
+                list.Add(Substring(pos));
+            }
+
+            int n = list.Count;
+            ByteString[] result = new ByteString[n];
+            
+            for (int i = 0; i < n; i++) {
+                result[i] = (ByteString)list[i];
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/base/Applications/WebServer/CommandLine.sg b/base/Applications/WebServer/CommandLine.sg
new file mode 100644
index 0000000..05152e6
--- /dev/null
+++ b/base/Applications/WebServer/CommandLine.sg
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using Microsoft.Contracts;
+
+    /// <summary>
+    /// </summary>
+    internal sealed class CommandLine
+    {
+        private string[] arguments;
+        private IDictionary options;
+        private bool showHelp;
+
+        [NotDelayed]
+        public CommandLine(string[]! args)
+        {
+            ArrayList argList = new ArrayList();
+
+            for (int i = 0; i < args.Length; i++) {
+                string! args_i = (!)args[i];
+                char c = args_i[0];
+                if ((c != '/') && (c != '-')) {
+                    argList.Add(args_i);
+                }
+                else {
+                    int index = args_i.IndexOf(':');
+                    if (index == -1) {
+                        string option = args_i.Substring(1);
+                        if ((String.Compare(option, "help", true) == 0) ||
+                            option.Equals("?")) {
+                            showHelp = true;
+                        }
+                        else {
+                            Options[option] = String.Empty;
+                        }
+                    }
+                    else {
+                        Options[args_i.Substring(1, index - 1)] = args_i.Substring(index + 1);
+                    }
+                }
+            }
+            arguments = (string[])argList.ToArray(typeof(string));
+        }
+
+        public string[] Arguments
+        {
+            get {
+                return arguments;
+            }
+        }
+
+        public IDictionary/*!*/ Options
+        {
+            get {
+                if (options == null) {
+                    options = new Hashtable();
+                }
+                return options;
+            }
+        }
+
+        public bool ShowHelp
+        {
+            get {
+                return showHelp;
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebServer/Connection.sg b/base/Applications/WebServer/Connection.sg
new file mode 100644
index 0000000..30757ed
--- /dev/null
+++ b/base/Applications/WebServer/Connection.sg
@@ -0,0 +1,246 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Threading;
+    using System.Web;
+
+    // Singularity
+    using Microsoft.SingSharp;
+    using Microsoft.SingSharp.Runtime;
+    using Microsoft.Singularity.Channels;
+    //
+
+    internal sealed class Connection
+    {
+        private Listener! listener;
+        private Socket socket;
+
+        public Connection(Listener! listener, Socket! socket)
+        {
+            this.listener = listener;
+            this.socket = socket;
+            base();
+        }
+
+        public bool Connected
+        {
+            get {
+                return socket.Connected;
+            }
+        }
+
+        public bool IsLocal
+        {
+            get {
+                string remoteIP = RemoteIP;
+
+                if (remoteIP.Equals("127.0.0.1")) {
+                    return true;
+                }
+
+                if (listener.ClientIP.Equals(remoteIP)) {
+                    return true;
+                }
+
+                //return false;
+                return true;
+            }
+        }
+
+        public string! LocalIP
+        {
+            get {
+                IPEndPoint endPoint = (IPEndPoint)socket.LocalEndPoint;
+                if ((endPoint != null) && (endPoint.Address != null)) {
+                    return (!)endPoint.Address.ToString();
+                }
+                else {
+                    return "127.0.0.1";
+                }
+            }
+        }
+
+        public string! RemoteIP
+        {
+            get {
+                IPEndPoint endPoint = (IPEndPoint)socket.RemoteEndPoint;
+                if ((endPoint != null) && (endPoint.Address != null)) {
+                    return (!)endPoint.Address.ToString();
+                }
+                else {
+                    // REVIEW: Is this correct? If RemoteEndPoint is not
+                    //         set, we end up returning 127.0.0.1 which is
+                    //         treated as localhost, and may not be what
+                    //         we want.
+                    return "127.0.0.1";
+                }
+            }
+        }
+
+        public int ListenerPort
+        {
+            get {
+                return listener.Port;
+            }
+        }
+
+        public void Close()
+        {
+            try {
+                if (socket != null) // ROTORTODO
+                {
+                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Close();
+                }
+            }
+            catch {
+            }
+            finally {
+                socket = null;
+            }
+        }
+
+        private static String! MakeResponseHeaders(int statusCode, String moreHeaders, int contentLength, bool keepAlive)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("HTTP/1.1 " + statusCode + " " + HttpWorkerRequest.GetStatusDescription(statusCode) + "\r\n");
+            sb.Append("Server: Microsoft VisualStudio .NET WebServer/" + Messages.VersionString + "\r\n");
+            sb.Append("Date: " + DateTime.Now.ToUniversalTime().ToString("R") + "\r\n");
+            if (contentLength >= 0)
+                sb.Append("Content-Length: " + contentLength + "\r\n");
+            if (moreHeaders != null)
+                sb.Append(moreHeaders);
+            if (!keepAlive)
+                sb.Append("Connection: Close\r\n");
+            sb.Append("\r\n");
+
+            return sb.ToString();
+        }
+
+        public byte[] ReadRequestBytes(int maxBytes)
+        {
+            try {
+                if (WaitForRequestBytes() == 0) {
+                    return null;
+                }
+
+                int numBytes = socket.Available;
+                if (numBytes > maxBytes)
+                    numBytes = maxBytes;
+
+                int numReceived = 0;
+                byte[] buffer = new byte[numBytes];
+
+                if (numBytes > 0) {
+                    numReceived = socket.Receive(buffer, 0, numBytes, SocketFlags.None);
+                }
+
+                if (numReceived < numBytes) {
+                    byte[] tempBuffer = new byte[numReceived];
+
+                    if (numReceived > 0) {
+                        Buffer.BlockCopy(buffer, 0, tempBuffer, 0, numReceived);
+                    }
+
+                    buffer = tempBuffer;
+                }
+
+                return buffer;
+            }
+            catch {
+                return null;
+            }
+        }
+
+        public void Write100Continue()
+        {
+            WriteEntireResponseFromString(100, null, null, true);
+        }
+
+        public void WriteBody(byte[] data, int offset, int length)
+        {
+            socket.Send(data, offset, length, SocketFlags.None);
+        }
+
+        public void WriteBody([Claims] byte[]! in ExHeap data)
+        {
+            socket.Send(data, SocketFlags.None);
+        }
+
+        public void WriteEntireResponseFromString(int statusCode, String extraHeaders, String body, bool keepAlive)
+        {
+            try {
+                int bodyLength = (body != null) ? Encoding.UTF8.GetByteCount(body) : 0;
+                string headers = MakeResponseHeaders(statusCode, extraHeaders, bodyLength, keepAlive);
+
+                socket.Send(Encoding.UTF8.GetBytes(headers + body));
+            }
+            catch (SocketException) {
+            }
+            finally {
+                if (!keepAlive) {
+                    Close();
+                }
+            }
+        }
+
+        public void WriteErrorAndClose(int statusCode, string message)
+        {
+            string body = Messages.FormatErrorMessageBody(statusCode);
+            if (message != null && message.Length > 0) {
+                body += "\r\n<!--\r\n" + message + "\r\n-->";
+            }
+            WriteEntireResponseFromString(statusCode, null, body, false);
+        }
+
+        public void WriteErrorAndClose(int statusCode)
+        {
+            WriteErrorAndClose(statusCode, null);
+        }
+
+        public int WaitForRequestBytes()
+        {
+            int availBytes = 0;
+
+            try {
+                if (socket.Available == 0) {
+                    // poll until there is data
+                    socket.Poll(100000 /* 100ms */, SelectMode.SelectRead);
+                    if (socket.Available == 0 && socket.Connected) {
+                        socket.Poll(10000000 /* 10sec */, SelectMode.SelectRead);
+                    }
+                }
+
+                availBytes = socket.Available;
+            }
+            catch {
+            }
+
+            return availBytes;
+        }
+
+        public void WriteHeaders(int statusCode, String extraHeaders)
+        {
+            string headers = MakeResponseHeaders(statusCode, extraHeaders, -1, false);
+
+            try {
+                socket.Send(Encoding.UTF8.GetBytes(headers));
+            }
+            catch (SocketException) {
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebServer/Listener.sg b/base/Applications/WebServer/Listener.sg
new file mode 100644
index 0000000..9abb8a6
--- /dev/null
+++ b/base/Applications/WebServer/Listener.sg
@@ -0,0 +1,192 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using System.IO;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Threading;
+    using System.Runtime.InteropServices;
+    using System.Web;
+
+    internal sealed class Listener
+    {
+        /* =======================
+           The original version of Cassini uses the .NET thread pool to run
+           certain methods. There is currently no thread pool available on Singularity,
+           so I adapted Cassini to spin up threads on demand instead. These helper
+           objects assist with this; we could go back and remove them when
+           thread pools become available, if we wanted.
+           ======================= */
+
+        internal abstract class ThreadObject
+        {
+            protected abstract void Run();
+
+            public void Start()
+            {
+                ThreadStart threadStart = new ThreadStart(Run);
+                Thread selfThread = new Thread(threadStart);
+                selfThread.Start();
+            }
+        }
+
+        internal class AcceptThread : ThreadObject
+        {
+            private Listener! listener;
+            private Socket! socket;
+
+            public AcceptThread(Listener! listener, Socket! socket)
+            {
+                this.listener = listener;
+                this.socket = socket;
+                base();
+            }
+
+            protected override void Run()
+            {
+                listener.OnSocketAccept(socket);
+            }
+        }
+
+        internal class StartThread : ThreadObject
+        {
+            private Listener! listener;
+
+            public StartThread(Listener! listener)
+            {
+                this.listener = listener;
+                base();
+            }
+
+            protected override void Run()
+            {
+                listener.OnStart();
+            }
+        }
+
+        /* =======================
+           end helper objects
+           ======================= */
+
+
+        private int port;
+        private string! clientIP;
+
+        private bool shutdownInProgress;
+
+        private Socket socket;
+
+        public Listener(int port, string! clientIP)
+        {
+            this.port = port;
+            this.clientIP = clientIP;
+            base();
+        }
+
+        public int Port
+        {
+            get {
+                return port;
+            }
+        }
+
+        public string! ClientIP
+        {
+            get {
+                return clientIP;
+            }
+        }
+
+        public string! RootUrl
+        {
+            get {
+                if (port != 80) {
+                    return "http://localhost:" + port;
+                }
+                else {
+                    return "http://localhost";
+                }
+            }
+        }
+
+        //
+        // Socket listening
+        //
+
+        public void Start()
+        {
+            socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            socket.Bind(new IPEndPoint(IPAddress.Any, port));
+            socket.Listen((int)SocketOptionName.MaxConnections);
+
+            //ThreadPool.QueueUserWorkItem(_onStart);
+            (new StartThread(this)).Start();
+        }
+
+        public void Stop()
+        {
+            shutdownInProgress = true;
+
+            try {
+                if (socket != null) {
+                    socket.Shutdown(SocketShutdown.Both);
+                    socket.Close();
+                }
+            }
+            catch {
+            }
+            finally {
+                socket = null;
+            }
+        }
+
+        protected void OnSocketAccept(Socket! acceptedSocket)
+        {
+            if (!shutdownInProgress) {
+                Connection conn =  new Connection(this, acceptedSocket);
+
+                // wait for at least some input
+                if (conn.WaitForRequestBytes() == 0) {
+                    conn.WriteErrorAndClose(400);   // Bad Request
+                    return;
+                }
+
+                // Suck the request off the connection and process it.
+                Request request = new Request(conn);
+                request.Process();
+
+#if GCPROFILE
+                // This isn't necessary.  But it's very convenient if a GC follows processing
+                // each (single-threaded) request.
+                GC.Collect();
+#endif
+            }
+        }
+
+        protected void OnStart()
+        {
+            while (!shutdownInProgress) {
+                try {
+                    if (socket != null) // ROTORTODO
+                    {
+                        Socket requestingSocket = socket.Accept();
+                        //ThreadPool.QueueUserWorkItem(_onSocketAccept, socket);
+                        (new AcceptThread(this, requestingSocket)).Start();
+                    }
+                }
+                catch {
+                    Thread.Sleep(100);
+                }
+            }
+        }
+    }
+}
diff --git a/base/Applications/WebServer/LocalHttpRequest.sg b/base/Applications/WebServer/LocalHttpRequest.sg
new file mode 100644
index 0000000..20d4068
--- /dev/null
+++ b/base/Applications/WebServer/LocalHttpRequest.sg
@@ -0,0 +1,102 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RemoteHttpRequest.sg
+//
+//  Note:
+//    This file wraps a WebServer's Request object so it is callable through
+//    the Microsoft.Singularity.WebApps.IHttpRequest interface that web
+//    applications understand.
+//    regular object.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.WebApps;
+using System.Web;
+
+namespace Microsoft.Singularity.WebServer
+{
+    internal sealed class LocalHttpRequest : IHttpRequest
+    {
+        private Request! request;
+
+        internal LocalHttpRequest(Request! request)
+        {
+            this.request = request;
+            base();
+        }
+
+        public string! GetUriPath()
+        { return (!)request.GetUriPath(); }
+
+        public string GetQueryString()
+        { return request.GetQueryString(); }
+
+        public string GetVerb()
+        { return request.GetHttpVerbName(); }
+
+        public string GetHeader(string! headerName)
+        {
+            int knownIndex = HttpWorkerRequest.GetKnownRequestHeaderIndex(headerName);
+
+            if (knownIndex > 0) {
+                return request.GetKnownRequestHeader(knownIndex);
+            } else {
+                return request.GetUnknownRequestHeader(headerName);
+            }
+        }
+
+        public string! GetRemoteAddress()
+        { return request.GetRemoteAddress(); }
+
+        // Caller should not modify this buffer!
+        public byte[] GetBodyData()
+        {
+            // NOTE We don't currently deal with the
+            // possibility that there is more body data not
+            // yet read in.
+            assert request.IsEntireEntityBodyIsPreloaded();
+            return request.GetPreloadedEntityBody();
+        }
+
+        public void SendStatus(int code, string! description)
+        { request.SendStatus(code, description); }
+
+        public void SendHeader(string! name, string! value)
+        {
+            int index = HttpWorkerRequest.GetKnownResponseHeaderIndex(name);
+
+            if (index == -1) {
+                request.SendUnknownResponseHeader(name, value);
+            }
+            else {
+                request.SendKnownResponseHeader(index, value);
+            }
+        }
+
+        public void SendBodyData(byte[]! data)
+        {
+            request.SendResponseFromMemory(data, data.Length);
+            request.FlushResponse(false); // always transmit immediately
+        }
+
+        public void SendBodyData([Claims] byte[]! in ExHeap data)
+        {
+            request.SendResponseFromMemory(data);
+            request.FlushResponse(false); // always transmit immediately
+        }
+
+        public void Done()
+        {
+            request.FlushResponse(true);
+            request.EndOfRequest();
+        }
+    }
+}
diff --git a/base/Applications/WebServer/Main.sg b/base/Applications/WebServer/Main.sg
new file mode 100644
index 0000000..8481753
--- /dev/null
+++ b/base/Applications/WebServer/Main.sg
@@ -0,0 +1,145 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+#if GCPROFILE
+    using Microsoft.Singularity.Diagnostics;
+#endif
+
+    using System;
+    using System.Web;
+    using System.Diagnostics;
+    using System.Globalization;
+
+    // Establish a port and listen on it.  This is the base of the Server.
+
+    public sealed class HttpServer
+    {
+        public static int Main(string[]! args)
+        {
+#if GCPROFILE
+            // Before we do anything else, start profiling.  Eventually, the profiler
+            // should be injected by the OS at process launch, based on config.  If
+            // this means compiling a different version of the binary for that purpose,
+            // it should cache the extra binary.
+            CLRProfiler.StartProfiling();
+#endif
+            CommandLine commandLine = new CommandLine(args);
+
+            bool silent = (commandLine.Options["silent"] != null);
+
+            if (!silent && commandLine.ShowHelp) {
+                ShowUsage();
+                return 0;
+            }
+
+            // The server is started with mapping information from requests
+            // to applications.  Initially, we will ignore the map and
+            // do a default map based on the UriPath.  But eventually this
+            // is where the configuration and appmodel will be introduced.
+
+            // TODO: establish non-default mappings from requests to apps.
+            string mapping = (string)commandLine.Options["mapping"];
+            if (mapping != null) {
+                mapping = mapping.Trim();
+            }
+            if ((mapping == null) || (mapping.Length == 0)) {
+                mapping = "/";
+            }
+            else {
+                // TODO: validate that mapping points somewhere useful.
+            }
+
+            int port = 0;
+            string portText = (string)commandLine.Options["port"];
+            if (portText != null) {
+                portText = portText.Trim();
+            }
+            if ((portText != null) && (portText.Length != 0)) {
+                try {
+                    port = Int32.Parse(portText);
+                    if ((port < 1) || (port > 65535)) {
+                        if (!silent) {
+                            ShowUsage();
+                        }
+                        return -1;
+                    }
+                }
+                catch {
+                    if (!silent) {
+                        ShowMessage("Invalid port '" + portText + "'");
+                    }
+                    return -3;
+                }
+            }
+            else {
+                port = 80;
+            }
+
+            // clientIP was added so that we could test using Cassini remotely on
+            // lab machines. This now allows the client to be localhost or clientIP.
+            string clientIP = (string)commandLine.Options["client"];
+            if (clientIP != null) {
+                clientIP = clientIP.Trim();
+            }
+            if ((clientIP == null) || (clientIP.Length == 0)) {
+                clientIP = "localhost";
+            }
+
+
+            // ====================
+            // Start listening
+            // ===================
+
+            try {
+                Listener listener = new Listener(port, clientIP);
+                listener.Start();
+
+                String s1 = String.Format(Environment.NewLine +
+                                          "Running Web Server on port {0}." + Environment.NewLine,
+                                           port);
+                Console.WriteLine(s1);
+            }
+            catch (Exception ex) {
+                if (!silent) {
+                    ShowMessage("Error opening port " + port + ": " + ex.Message);
+                }
+                return -5;
+            }
+
+            return 0;
+
+            // TODO: There is no support for stopping the server, beyond process
+            // death.  Do we need a more orderly notion, or should all the different
+            // processes observe disconnected channels and do their own thing?
+            // 
+            // Add support for this server to stop listening and terminate its
+            // process; assume that no additional protocol is required.
+        }
+
+        private static void ShowUsage()
+        {
+            string usageString;
+
+            usageString = "Invalid usage.\n\n";
+            usageString += "WebServer [options]\n";
+            usageString += "Options:\n";
+            usageString += "  [-port:<port>]\n";
+            usageString += "  [-silent]\n";
+            usageString += "  [-mapping:<mappingInformation>]\n";
+            usageString += "  [-client:<clientIP>]\n";
+
+            ShowMessage(usageString);
+        }
+
+        private static void ShowMessage(String msg)
+        {
+            Console.WriteLine("Singularity Web Server:\n" + msg);
+        }
+    }
+}
diff --git a/base/Applications/WebServer/Messages.sg b/base/Applications/WebServer/Messages.sg
new file mode 100644
index 0000000..a89060c
--- /dev/null
+++ b/base/Applications/WebServer/Messages.sg
@@ -0,0 +1,67 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using System.Text;
+    using System.Web;
+
+    internal sealed class Messages {
+
+        private const String httpErrorFormat1 =
+@"<html>
+    <head>
+        <title>{0}</title>
+";
+
+        public static String VersionString = "1.0"; //typeof(Server).Assembly.GetName().Version.ToString();
+
+        private const String httpStyle =
+@"        <style>
+            body {font-family:""Verdana"";font-weight:normal;font-size: 8pt;color:black;}
+            p {font-family:""Verdana"";font-weight:normal;color:black;margin-top: -5px}
+            b {font-family:""Verdana"";font-weight:bold;color:black;margin-top: -5px}
+            h1 { font-family:""Verdana"";font-weight:normal;font-size:18pt;color:red }
+            h2 { font-family:""Verdana"";font-weight:normal;font-size:14pt;color:maroon }
+            pre {font-family:""Lucida Console"";font-size: 8pt}
+            .marker {font-weight: bold; color: black;text-decoration: none;}
+            .version {color: gray;}
+            .error {margin-bottom: 10px;}
+            .expandable { text-decoration:underline; font-weight:bold; color:navy; cursor:hand; }
+        </style>
+";
+
+        private static String httpErrorFormat2 =
+@"    </head>
+    <body bgcolor=""white"">
+
+            <span><h1>Server Error in Application.<hr width=100% size=1 color=silver></h1>
+
+            <h2> <i>HTTP Error {0} - {1}.</i> </h2></span>
+
+            <hr width=100% size=1 color=silver>
+
+            <b>Version Information:</b>&nbsp;Visual Web Developer Web Server " + VersionString + @"
+
+            </font>
+
+    </body>
+</html>
+";
+
+        public static String FormatErrorMessageBody(int statusCode)
+        {
+            string desc = HttpWorkerRequest.GetStatusDescription(statusCode);
+
+            return String.Format(httpErrorFormat1, new object[] {desc}) +
+                   httpStyle +
+                   String.Format(httpErrorFormat2, new object[] {statusCode, desc});
+        }
+    }
+}
diff --git a/base/Applications/WebServer/Request.sg b/base/Applications/WebServer/Request.sg
new file mode 100644
index 0000000..7b2dab1
--- /dev/null
+++ b/base/Applications/WebServer/Request.sg
@@ -0,0 +1,649 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Singularity.WebServer
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Security;
+    using System.Text;
+    using System.Threading;
+    using System.Globalization;
+    using System.Web;
+
+    // Singularity
+    using Microsoft.SingSharp;
+    using Microsoft.SingSharp.Runtime;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.WebApps;
+    using Microsoft.Contracts;
+    //
+
+    /* Event types local to this provider */
+    internal enum WebServerEvent : ushort
+    {
+        ProcessRequest = 1
+    }
+
+    internal sealed class Request
+    {
+        // Statistics
+        private static ulong totalServed = 0;
+        private static ulong totalTime = 0;
+
+        private const int MaxChunkLength = 64 * 1024;
+        private Connection! connection;
+
+        private Application application;
+
+        // raw request data
+        private const int maxHeaderBytes = 32*1024;
+        private byte[] headerBytes;
+        private int startHeadersOffset;
+        private int endHeadersOffset;
+        private ArrayList headerBytesStrings;
+
+        // parsed request data
+        private string verb;
+        private string url;
+        private string protocol;
+
+        private string path;
+        private string filePath;
+        private string pathInfo;
+        private string queryString;
+        private byte[] queryStringBytes;
+
+        private int contentLength;
+        private int preloadedContentLength;
+        private byte[] preloadedContent;
+
+        private string allRawHeaders;
+        private string[][] unknownRequestHeaders;
+        private string[] knownRequestHeaders;
+        private bool specialCaseStaticFileHeaders;
+
+        // cached response
+        private bool headersSent;
+        private int responseStatus;
+        private StringBuilder responseHeadersBuilder;
+        private ArrayList responseBodyBytes;
+
+        internal Request(Connection! connection)
+        {
+            this.connection = connection;
+            base();
+        }
+
+        internal void Process()
+        {
+            ReadAllHeaders();
+
+            // Limit to local requests only
+            if (!connection.IsLocal) {
+                connection.WriteErrorAndClose(403);
+                return;
+            }
+
+            if (headerBytes == null || endHeadersOffset < 0 ||
+                headerBytesStrings == null || headerBytesStrings.Count == 0) {
+                connection.WriteErrorAndClose(400);
+                return;
+            }
+
+            if (!ParseRequestLine()) {
+                return; // ParseRequestLine() has closed the connection
+            }
+
+            Monitoring.Log(Monitoring.Provider.WebServer,
+                           (ushort)WebServerEvent.ProcessRequest,
+                           this.GetUriPath());
+
+            ParseHeaders();
+
+            ParsePostedContent();
+
+            if (verb == "POST" && contentLength > 0 && preloadedContentLength < contentLength) {
+                connection.Write100Continue();
+            }
+
+            PrepareResponse();
+
+            // Time the following block and report it as the request processing time
+            {
+                ulong startTime = Processor.CycleCount;
+
+                // Find or create an application that can service this request.
+                application = Application.FindOrCreateApplication(this);
+
+                if (application == null) {
+                    connection.WriteErrorAndClose(404);
+                } else {
+                    application.Process(this);
+                }
+
+                ulong elapsed = Processor.CycleCount - startTime;
+                Console.WriteLine("served \"" + GetFilePath() + "\" in " + elapsed + " cycles");
+
+                totalServed++;
+                totalTime += elapsed;
+            }
+        }
+
+        private bool TryReadAllHeaders()
+        {
+            // read the first packet (up to 32K)
+            byte[] headerBytesRead = connection.ReadRequestBytes(maxHeaderBytes);
+
+            if (headerBytesRead == null || headerBytesRead.Length == 0)
+                return false;
+
+            if (headerBytes != null) {
+                // previous partial read
+                int len = headerBytesRead.Length + headerBytes.Length;
+                if (len > maxHeaderBytes)
+                    return false;
+
+                byte[] bytes = new byte[len];
+                Buffer.BlockCopy(headerBytes, 0, bytes, 0, headerBytes.Length);
+                Buffer.BlockCopy(headerBytesRead, 0, bytes, headerBytes.Length, headerBytesRead.Length);
+                headerBytes = bytes;
+            }
+            else {
+                headerBytes = headerBytesRead;
+            }
+
+            // start parsing
+            startHeadersOffset = -1;
+            endHeadersOffset = -1;
+            headerBytesStrings = new ArrayList();
+
+            // find the end of headers
+            ByteParser parser = new ByteParser(headerBytes);
+
+            for (;;) {
+                ByteString line = parser.ReadLine();
+
+                if (line == null) {
+                    break;
+                }
+
+                if (startHeadersOffset < 0) {
+                    startHeadersOffset = parser.CurrentOffset;
+                }
+
+                if (line.IsEmpty) {
+                    endHeadersOffset = parser.CurrentOffset;
+                    break;
+                }
+
+                headerBytesStrings.Add(line);
+            }
+
+            return true;
+        }
+
+        private void ReadAllHeaders()
+        {
+            headerBytes = null;
+
+            do {
+                if (!TryReadAllHeaders()) {
+                    // something bad happened
+                    break;
+                }
+            }
+            while (endHeadersOffset < 0); // found \r\n\r\n
+        }
+
+        private bool ParseRequestLine()
+        {
+            ByteString requestLine = (ByteString)headerBytesStrings[0];
+            ByteString[] elems = requestLine.Split(' ');
+
+            if (elems == null || elems.Length < 2 || elems.Length > 3) {
+                connection.WriteErrorAndClose(400);
+                return false;
+            }
+
+            verb = elems[0].GetString();
+
+            ByteString urlBytes = elems[1];
+            url = urlBytes.GetString();
+
+            if (elems.Length == 3) {
+                protocol = elems[2].GetString();
+            }
+            else {
+                protocol = "HTTP/1.0";
+            }
+
+            // query string
+
+            int iqs = urlBytes.IndexOf('?');
+            if (iqs > 0) {
+                queryStringBytes = urlBytes.Substring(iqs+1).GetBytes();
+            }
+            else {
+                queryStringBytes = new byte[0];
+            }
+
+            iqs = url.IndexOf('?');
+            if (iqs > 0) {
+                path = url.Substring(0, iqs);
+                queryString = url.Substring(iqs+1);
+            }
+            else {
+                path = url;
+                queryStringBytes = new byte[0];
+            }
+
+            // url-decode path
+
+            if (path.IndexOf('%') >= 0) {
+                path = HttpUtility.UrlDecode(path, Encoding.UTF8);
+            }
+
+            // path info
+
+            int lastDot = path.LastIndexOf('.');
+            int lastSlh = path.LastIndexOf('/');
+
+            if (lastDot >= 0 && lastSlh >= 0 && lastDot < lastSlh && lastSlh < path.Length - 1) {
+                int ipi = path.IndexOf('/', lastDot);
+                filePath = path.Substring(0, ipi);
+                pathInfo = path.Substring(ipi);
+            }
+            else {
+                filePath = path;
+                pathInfo = String.Empty;
+            }
+
+            return true;
+        }
+
+        private void ParseHeaders()
+        {
+            knownRequestHeaders = new string[HttpWorkerRequest.RequestHeaderMaximum];
+
+            // construct unknown headers as array list of name1,value1,...
+            ArrayList headers = new ArrayList();
+
+            for (int i = 1; i < headerBytesStrings.Count; i++) {
+                string s = ((ByteString)headerBytesStrings[i]).GetString();
+
+                int c = s.IndexOf(':');
+
+                if (c >= 0) {
+                    string name = s.Substring(0, c).Trim();
+                    string value = s.Substring(c + 1).Trim();
+
+                    // remember
+                    int knownIndex = HttpWorkerRequest.GetKnownRequestHeaderIndex(name);
+                    if (knownIndex >= 0) {
+                        knownRequestHeaders[knownIndex] = value;
+                    }
+                    else {
+                        headers.Add(name);
+                        headers.Add(value);
+                    }
+                }
+            }
+
+            // copy to array unknown headers
+
+            int n = headers.Count / 2;
+            unknownRequestHeaders = new string[n][];
+            int j = 0;
+
+            for (int i = 0; i < n; i++) {
+                unknownRequestHeaders[i] = new string[2];
+                unknownRequestHeaders[i][0] = (string)headers[j++];
+                unknownRequestHeaders[i][1] = (string)headers[j++];
+            }
+
+            // remember all raw headers as one string
+
+            if (headerBytesStrings.Count > 1) {
+                allRawHeaders = Encoding.UTF8.GetString(headerBytes, startHeadersOffset, endHeadersOffset-startHeadersOffset);
+            }
+            else {
+                allRawHeaders = String.Empty;
+            }
+        }
+
+        private void ParsePostedContent()
+        {
+            contentLength = 0;
+            preloadedContentLength = 0;
+
+            string contentLengthValue = knownRequestHeaders[HttpWorkerRequest.HeaderContentLength];
+            if (contentLengthValue != null) {
+                try {
+                    contentLength = Int32.Parse(contentLengthValue);
+                }
+                catch {
+                }
+            }
+
+            if (headerBytes.Length > endHeadersOffset) {
+                preloadedContentLength = headerBytes.Length - endHeadersOffset;
+
+                if (preloadedContentLength > contentLength && contentLength > 0)
+                    preloadedContentLength = contentLength; // don't read more than the content-length
+
+                preloadedContent = new byte[preloadedContentLength];
+                Buffer.BlockCopy(headerBytes, endHeadersOffset, preloadedContent, 0, preloadedContentLength);
+            }
+        }
+
+        private void PrepareResponse()
+        {
+            headersSent = false;
+            responseStatus = 200;
+            responseHeadersBuilder = new StringBuilder();
+            responseBodyBytes = new ArrayList();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // Implementation of HttpWorkerRequest
+
+        internal string! GetUriPath()
+        {
+            return path;
+        }
+
+        internal string GetQueryString()
+        {
+            return queryString;
+        }
+
+        internal byte[] GetQueryStringRawBytes()
+        {
+            return queryStringBytes;
+        }
+
+        internal string GetRawUrl()
+        {
+            return url;
+        }
+
+        internal string GetHttpVerbName()
+        {
+            return verb;
+        }
+
+        internal string GetHttpVersion()
+        {
+            return protocol;
+        }
+
+        internal string GetRemoteAddress()
+        {
+            return connection.RemoteIP;
+        }
+
+        internal int GetRemotePort()
+        {
+            return 0;
+        }
+
+        internal string GetLocalAddress()
+        {
+            return connection.LocalIP;
+        }
+
+        internal string GetServerName()
+        {
+            string localAddress = GetLocalAddress();
+            if (localAddress.Equals("127.0.0.1")) {
+                return "localhost";
+            }
+            return localAddress;
+        }
+
+        internal int GetLocalPort()
+        {
+            return connection.ListenerPort;
+        }
+
+        internal string GetFilePath()
+        {
+            return filePath;
+        }
+
+        internal string GetPathInfo()
+        {
+            return pathInfo;
+        }
+
+        internal byte[] GetPreloadedEntityBody()
+        {
+            return preloadedContent;
+        }
+
+        [ Microsoft.Contracts.Pure ]
+        internal bool IsEntireEntityBodyIsPreloaded()
+        {
+            return (contentLength == preloadedContentLength);
+        }
+
+        internal int ReadEntityBody(byte[] buffer, int size)
+        {
+            int bytesRead = 0;
+            byte[] bytes = connection.ReadRequestBytes(size);
+
+            if (bytes != null && bytes.Length > 0) {
+                bytesRead = bytes.Length;
+                Buffer.BlockCopy(bytes, 0, buffer, 0, bytesRead);
+            }
+
+            return bytesRead;
+        }
+
+        internal string GetKnownRequestHeader(int index)
+        {
+            return knownRequestHeaders[index];
+        }
+
+        internal string GetUnknownRequestHeader(string name)
+        {
+            int n = unknownRequestHeaders.Length;
+
+            for (int i = 0; i < n; i++) {
+                if (string.Compare(name, unknownRequestHeaders[i][0], true) == 0) {
+                    return unknownRequestHeaders[i][1];
+                }
+            }
+
+            return null;
+        }
+
+        internal string[][] GetUnknownRequestHeaders()
+        {
+            return unknownRequestHeaders;
+        }
+
+        // TODO: No support for user-based security yet.
+        internal IntPtr GetUserToken()
+        {
+            // impersonation token
+            return IntPtr.Zero;
+        }
+
+        internal string GetServerVariable(string name)
+        {
+            string s = String.Empty;
+
+            switch (name) {
+                case "ALL_RAW":
+                    s = allRawHeaders;
+                    break;
+
+                case "SERVER_PROTOCOL":
+                    s = protocol;
+                    break;
+
+                case "AUTH_TYPE":
+                    if (GetUserToken() != IntPtr.Zero)
+                        s = "NTLM";
+                    break;
+            }
+
+            return s;
+        }
+
+        internal void SendStatus(int statusCode, string statusDescription)
+        {
+            responseStatus = statusCode;
+        }
+
+        internal void SendKnownResponseHeader(int index, string value)
+        {
+            if (headersSent) {
+                return;
+            }
+
+            switch (index) {
+                case HttpWorkerRequest.HeaderServer:
+                case HttpWorkerRequest.HeaderDate:
+                case HttpWorkerRequest.HeaderConnection:
+                    // ignore these
+                    return;
+                case HttpWorkerRequest.HeaderAcceptRanges:
+                    if (value == "bytes") {
+                        // use this header to detect when we're processing a static file
+                        specialCaseStaticFileHeaders = true;
+                        return;
+                    }
+                    break;
+                case HttpWorkerRequest.HeaderExpires:
+                case HttpWorkerRequest.HeaderLastModified:
+                    if (specialCaseStaticFileHeaders) {
+                        // NOTE: Ignore these for static files. These are generated
+                        //       by the StaticFileHandler, but they shouldn't be.
+                        return;
+                    }
+                    break;
+            }
+
+            responseHeadersBuilder.Append(HttpWorkerRequest.GetKnownResponseHeaderName(index));
+            responseHeadersBuilder.Append(": ");
+            responseHeadersBuilder.Append(value);
+            responseHeadersBuilder.Append("\r\n");
+        }
+
+        internal void SendUnknownResponseHeader(string name, string value)
+        {
+            if (headersSent)
+                return;
+
+            responseHeadersBuilder.Append(name);
+            responseHeadersBuilder.Append(": ");
+            responseHeadersBuilder.Append(value);
+            responseHeadersBuilder.Append("\r\n");
+        }
+
+        internal void SendCalculatedContentLength(int contentLength)
+        {
+            if (!headersSent) {
+                responseHeadersBuilder.Append("Content-Length: ");
+                responseHeadersBuilder.Append(contentLength);
+                responseHeadersBuilder.Append("\r\n");
+            }
+        }
+
+        internal bool HeadersSent()
+        {
+            return headersSent;
+        }
+
+        internal bool IsClientConnected()
+        {
+            return connection.Connected;
+        }
+
+        internal void CloseConnection()
+        {
+            connection.Close();
+        }
+
+        internal void SendResponseFromMemory(byte[] data, int length)
+        {
+            if (length > 0) {
+                byte[] bytes = new byte[length];
+                Buffer.BlockCopy(data, 0, bytes, 0, length);
+                responseBodyBytes.Add(bytes);
+            }
+        }
+
+        internal void SendResponseFromMemory([Claims] byte[]! in ExHeap data)
+        {
+            VContainer<byte> container = new VContainer<byte>(data);
+            responseBodyBytes.Add(container);
+        }
+
+        internal void FlushResponse(bool finalFlush)
+        {
+            try {
+
+                if (!headersSent) {
+                    connection.WriteHeaders(responseStatus, responseHeadersBuilder.ToString());
+                    headersSent = true;
+                }
+
+                for (int i = 0; i < responseBodyBytes.Count; i++) {
+                    byte[] bytes = responseBodyBytes[i] as byte[];
+                    VContainer<byte> container = responseBodyBytes[i] as VContainer<byte>;
+
+                    if (bytes != null) {
+                        connection.WriteBody(bytes, 0, bytes.Length);
+                    } else if (container != null) {
+                        byte[]! in ExHeap exBytes = container.Acquire();
+                        responseBodyBytes[i] = null;
+                        connection.WriteBody(exBytes);
+                    } else {
+                        Debug.Assert(false);
+                    }
+                }
+            }
+            catch(SocketException) {
+                // If the socket throws an exception, abort trying to write the
+                // rest of the body.
+            }
+            finally {
+                // Clean up in case an exception caused us to abort partway through
+                headersSent = true;
+
+                for (int i = 0; i < responseBodyBytes.Count; i++) {
+                    VContainer<byte> container = responseBodyBytes[i] as VContainer<byte>;
+
+                    if (container != null) {
+                        byte[]! in ExHeap exBytes = container.Acquire();
+                        delete exBytes;
+                        responseBodyBytes[i] = null;
+                    }
+                }
+            }
+
+            responseBodyBytes = new ArrayList();
+
+            if (finalFlush) {
+                connection.Close();
+            }
+        }
+
+        internal void EndOfRequest()
+        {
+            FlushResponse(true);
+        }
+    }
+}
diff --git a/base/Applications/WebServer/WebServer.csproj b/base/Applications/WebServer/WebServer.csproj
new file mode 100644
index 0000000..f526f8a
--- /dev/null
+++ b/base/Applications/WebServer/WebServer.csproj
@@ -0,0 +1,48 @@
+<!--
+##############################################################################
+#
+# Copyright (c) Microsoft Corporation.   All rights reserved.
+#
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>WebServer</AssemblyName>
+    <NoWarn>2614,2637,2638,2613,2639</NoWarn>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Application.sg" />
+    <Compile Include="ByteParser.sg" />
+    <Compile Include="ByteString.sg" />
+    <Compile Include="CommandLine.sg" />
+    <Compile Include="Connection.sg" />
+    <Compile Include="Listener.sg" />
+    <Compile Include="LocalHttpRequest.sg" />
+    <Compile Include="Main.sg" />
+    <Compile Include="Messages.sg" />
+    <Compile Include="Request.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Web\System.Web.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Crypto\Crypto.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\CLRProfiler\CLRProfiler.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/cassini/ByteParser.cs b/base/Applications/cassini/ByteParser.cs
new file mode 100644
index 0000000..bbbf7e1
--- /dev/null
+++ b/base/Applications/cassini/ByteParser.cs
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Text;
+
+    internal sealed class ByteParser {
+        private byte[] _bytes;
+        private int _pos;
+
+        public ByteParser(byte[] bytes) {
+            _bytes = bytes;
+            _pos = 0;
+        }
+
+        public int CurrentOffset {
+            get { 
+                return _pos; 
+            }
+        }
+
+        public ByteString ReadLine() {
+            ByteString line = null;
+
+            for (int i = _pos; i < _bytes.Length; i++) {
+                if (_bytes[i] == (byte)'\n') {
+                    int len = i-_pos;
+                    if (len > 0 && _bytes[i-1] == (byte)'\r') {
+                        len--;
+                    }
+
+                    line = new ByteString(_bytes, _pos, len);
+                    _pos = i+1;
+                    return line;
+                }
+            }
+
+            if (_pos < _bytes.Length) {
+                line = new ByteString(_bytes, _pos, _bytes.Length-_pos);
+            }
+
+            _pos = _bytes.Length;
+            return line;
+        }
+    }
+}
diff --git a/base/Applications/cassini/ByteString.cs b/base/Applications/cassini/ByteString.cs
new file mode 100644
index 0000000..cd53543
--- /dev/null
+++ b/base/Applications/cassini/ByteString.cs
@@ -0,0 +1,127 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Text;
+
+    internal sealed class ByteString {
+        private byte[] _bytes;
+        private int _offset;
+        private int _length;
+
+        public ByteString(byte[] bytes, int offset, int length) {
+            _bytes = bytes;
+            _offset = offset;
+            _length = length;
+        }
+
+        public byte[] Bytes { 
+            get { 
+                return _bytes; 
+            } 
+        }
+
+        public bool IsEmpty { 
+            get { 
+                return (_bytes == null || _length == 0); 
+            }  
+        }
+
+        public int Length { 
+            get {
+                return _length; 
+            } 
+        }
+
+        public int Offset { 
+            get { 
+                return _offset; 
+            } 
+        }
+
+        public byte this[int index] {
+            get {
+                return _bytes[_offset+index];
+            }
+        }
+
+        public String GetString() {
+            return GetString(Encoding.UTF8);
+        }
+
+        public String GetString(Encoding enc) {
+            if (IsEmpty) {
+                return String.Empty;
+            }
+            return enc.GetString(_bytes, _offset, _length);
+        }
+
+        public byte[] GetBytes() {
+            byte[] bytes = new byte[_length];
+            if (_length > 0) {
+                Buffer.BlockCopy(_bytes, _offset, bytes, 0, _length);
+            }
+            return bytes;
+        }
+
+        public int IndexOf(char ch) {
+            return IndexOf(ch, 0);
+        }
+
+        public int IndexOf(char ch, int offset) {
+            for (int i = offset; i < _length; i++) {
+                if (this[i] == (byte)ch) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        public ByteString Substring(int offset) {
+            return Substring(offset, _length-offset);
+        }
+
+        public ByteString Substring(int offset, int len) {
+            return new ByteString(_bytes, _offset+offset, len);
+        }
+
+        public ByteString[] Split(char sep) {
+            ArrayList list = new ArrayList();
+
+            int pos = 0;
+            while (pos < _length) {
+                int i = IndexOf(sep, pos);
+                if (i < 0) {
+                    break;
+                }
+
+                list.Add(Substring(pos, i-pos));
+                pos = i+1;
+
+                while (this[pos] == (byte)sep && pos < _length) {
+                    pos++;
+                }
+            }
+
+            if (pos < _length) {
+                list.Add(Substring(pos));
+            }
+
+            int n = list.Count;
+            ByteString[] result = new ByteString[n];
+            
+            for (int i = 0; i < n; i++) {
+                result[i] = (ByteString)list[i];
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/base/Applications/cassini/Cassini.csproj b/base/Applications/cassini/Cassini.csproj
new file mode 100644
index 0000000..33687f3
--- /dev/null
+++ b/base/Applications/cassini/Cassini.csproj
@@ -0,0 +1,53 @@
+<!--
+##############################################################################
+#
+# Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>cassini</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <!-- TODO: Make null-clean -->
+    <NoWarn>2614,2637,2638,2613,2639</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ByteParser.cs" />
+    <Compile Include="ByteString.cs" />
+    <!-- <Compile Include="CommandLine.cs"/> -->
+    <Compile Include="Connection.cs" />
+    <Compile Include="Host.cs" />
+    <Compile Include="Main.cs" />
+    <Compile Include="Messages.cs" />
+    <Compile Include="Request.cs" />
+    <Compile Include="Server.cs" />
+
+    <!-- Singularity-specific sources -->
+    <Compile Include="Singularity\LocalHttpRequest.cs" />
+    <Compile Include="Singularity\Dispatcher.sg" />
+    <Compile Include="Singularity\DummyMarshalHttpRequest.cs" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\MapPointProxy.Contracts\MapPointProxy.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\SeattleTrafficProxy.Contracts\SeattleTrafficProxy.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\PingPong.Contracts\PingPong.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Web\System.Web.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\WebApps\WebAppsLib.csproj" />
+    <ProjectReference Include="..\WebApps\Driver\WebAppDriver.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+</Project>
diff --git a/base/Applications/cassini/CommandLine.cs b/base/Applications/cassini/CommandLine.cs
new file mode 100644
index 0000000..5fafd0b
--- /dev/null
+++ b/base/Applications/cassini/CommandLine.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebServer {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using Microsoft.Contracts;
+
+    /// <summary>
+    /// </summary>
+    public sealed class CommandLine {
+
+        private string[] _arguments;
+        private IDictionary _options;
+        private bool _showHelp;
+
+        [NotDelayed]
+        public CommandLine(string[]! args) {
+            ArrayList argList = new ArrayList();
+
+            for (int i = 0; i < args.Length; i++) {
+                string! args_i = (!)args[i];
+                char c = args_i[0];
+                if ((c != '/') && (c != '-')) {
+                    argList.Add(args_i);
+                }
+                else {
+                    int index = args_i.IndexOf(':');
+                    if (index == -1) {
+                        string option = args_i.Substring(1);
+                        if ((String.Compare(option, "help", true) == 0) ||
+                            option.Equals("?")) {
+                            _showHelp = true;
+                        }
+                        else {
+                            Options[option] = String.Empty;
+                        }
+                    }
+                    else {
+                        Options[args_i.Substring(1, index - 1)] = args_i.Substring(index + 1);
+                    }
+                }
+            }
+            _arguments = (string[])argList.ToArray(typeof(string));
+        }
+
+        public string[] Arguments {
+            get {
+                return _arguments;
+            }
+        }
+
+        public IDictionary/*!*/ Options {
+            get {
+                if (_options == null) {
+                    _options = new Hashtable();
+                }
+                return _options;
+            }
+        }
+
+        public bool ShowHelp {
+            get {
+                return _showHelp;
+            }
+        }
+    }
+}
diff --git a/base/Applications/cassini/Connection.cs b/base/Applications/cassini/Connection.cs
new file mode 100644
index 0000000..d5567d8
--- /dev/null
+++ b/base/Applications/cassini/Connection.cs
@@ -0,0 +1,225 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Threading;
+    using System.Web;
+
+    // Singularity
+    using Microsoft.SingSharp;
+    using Microsoft.SingSharp.Runtime;
+    using Microsoft.Singularity.Channels;
+    //
+
+    internal sealed class Connection  {
+        private Server _server;
+        private Socket _socket;
+
+        private static string _localServerIP;
+        private static string _clientIP;
+
+        public Connection(Server server, Socket socket, string clientIP) {
+            _server = server;
+            _socket = socket;
+            _clientIP = clientIP;
+        }
+
+        public bool Connected {
+            get {
+                return _socket.Connected;
+            }
+        }
+
+        public bool IsLocal {
+            get {
+                string remoteIP = RemoteIP;
+
+                if (remoteIP.Equals("127.0.0.1")) {
+                    return true;
+                }
+
+                if (_clientIP.Equals(remoteIP)) {
+                    return true;
+                }
+
+                //return false;
+                return true;
+            }
+        }
+
+        public string! LocalIP {
+            get {
+                IPEndPoint endPoint = (IPEndPoint)_socket.LocalEndPoint;
+                if ((endPoint != null) && (endPoint.Address != null)) {
+                    return (!)endPoint.Address.ToString();
+                }
+                else {
+                    return "127.0.0.1";
+                }
+            }
+        }
+
+        public string! RemoteIP {
+            get {
+                IPEndPoint endPoint = (IPEndPoint)_socket.RemoteEndPoint;
+                if ((endPoint != null) && (endPoint.Address != null)) {
+                    return (!)endPoint.Address.ToString();
+                }
+                else {
+                    // REVIEW: Is this correct? If RemoteEndPoint is not
+                    //         set, we end up returning 127.0.0.1 which is
+                    //         treated as localhost, and may not be what
+                    //         we want.
+                    return "127.0.0.1";
+                }
+            }
+        }
+
+        public void Close() {
+            try {
+                if (_socket != null) // ROTORTODO
+                {
+                    _socket.Shutdown(SocketShutdown.Both);
+                    _socket.Close();
+                }
+            }
+            catch {
+            }
+            finally {
+                _socket = null;
+            }
+        }
+
+        private static String! MakeResponseHeaders(int statusCode, String moreHeaders, int contentLength, bool keepAlive) {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("HTTP/1.1 " + statusCode + " " + HttpWorkerRequest.GetStatusDescription(statusCode) + "\r\n");
+            sb.Append("Server: Microsoft VisualStudio .NET WebServer/" + Messages.VersionString + "\r\n");
+            sb.Append("Date: " + DateTime.Now.ToUniversalTime().ToString("R") + "\r\n");
+            if (contentLength >= 0)
+                sb.Append("Content-Length: " + contentLength + "\r\n");
+            if (moreHeaders != null)
+                sb.Append(moreHeaders);
+            if (!keepAlive)
+                sb.Append("Connection: Close\r\n");
+            sb.Append("\r\n");
+
+            return sb.ToString();
+        }
+
+        public byte[] ReadRequestBytes(int maxBytes) {
+            try {
+                if (WaitForRequestBytes() == 0) {
+                    return null;
+                }
+
+                int numBytes = _socket.Available;
+                if (numBytes > maxBytes)
+                    numBytes = maxBytes;
+
+                int numReceived = 0;
+                byte[] buffer = new byte[numBytes];
+
+                if (numBytes > 0) {
+                    numReceived = _socket.Receive(buffer, 0, numBytes, SocketFlags.None);
+                }
+
+                if (numReceived < numBytes) {
+                    byte[] tempBuffer = new byte[numReceived];
+
+                    if (numReceived > 0) {
+                        Buffer.BlockCopy(buffer, 0, tempBuffer, 0, numReceived);
+                    }
+
+                    buffer = tempBuffer;
+                }
+
+                return buffer;
+            }
+            catch {
+                return null;
+            }
+        }
+
+        public void Write100Continue() {
+            WriteEntireResponseFromString(100, null, null, true);
+        }
+
+        public void WriteBody(byte[] data, int offset, int length) {
+            _socket.Send(data, offset, length, SocketFlags.None);
+        }
+
+        public void WriteBody([Claims] byte[]! in ExHeap data)
+        {
+            _socket.Send(data, SocketFlags.None);
+        }
+
+        public void WriteEntireResponseFromString(int statusCode, String extraHeaders, String body, bool keepAlive) {
+            try {
+                int bodyLength = (body != null) ? Encoding.UTF8.GetByteCount(body) : 0;
+                string headers = MakeResponseHeaders(statusCode, extraHeaders, bodyLength, keepAlive);
+
+                _socket.Send(Encoding.UTF8.GetBytes(headers + body));
+            }
+            catch (SocketException) {
+            }
+            finally {
+                if (!keepAlive) {
+                    Close();
+                }
+            }
+        }
+
+        public void WriteErrorAndClose(int statusCode, string message) {
+            string body = Messages.FormatErrorMessageBody(statusCode, _server.VirtualPath);
+            if (message != null && message.Length > 0) {
+                body += "\r\n<!--\r\n" + message + "\r\n-->";
+            }
+            WriteEntireResponseFromString(statusCode, null, body, false);
+        }
+
+        public void WriteErrorAndClose(int statusCode) {
+            WriteErrorAndClose(statusCode, null);
+        }
+
+        public int WaitForRequestBytes() {
+            int availBytes = 0;
+
+            try {
+                if (_socket.Available == 0) {
+                    // poll until there is data
+                    _socket.Poll(100000 /* 100ms */, SelectMode.SelectRead);
+                    if (_socket.Available == 0 && _socket.Connected) {
+                        _socket.Poll(10000000 /* 10sec */, SelectMode.SelectRead);
+                    }
+                }
+
+                availBytes = _socket.Available;
+            }
+            catch {
+            }
+
+            return availBytes;
+        }
+
+        public void WriteHeaders(int statusCode, String extraHeaders) {
+            string headers = MakeResponseHeaders(statusCode, extraHeaders, -1, false);
+
+            try {
+                _socket.Send(Encoding.UTF8.GetBytes(headers));
+            }
+            catch (SocketException) {
+            }
+        }
+    }
+}
diff --git a/base/Applications/cassini/Host.cs b/base/Applications/cassini/Host.cs
new file mode 100644
index 0000000..07ded66
--- /dev/null
+++ b/base/Applications/cassini/Host.cs
@@ -0,0 +1,138 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Threading;
+    using System.Web.Hosting;
+
+    internal sealed class Host : IRegisteredObject {
+        private Server _server;
+
+        private int _port;
+        private string _virtualPath;
+        private string _lowerCasedVirtualPath;
+        private string _lowerCasedVirtualPathWithTrailingSlash;
+        private string _physicalPath;
+        private string _physicalClientScriptPath;
+        private string _lowerCasedClientScriptPathWithTrailingSlash;
+
+        public void Configure(Server server, int port, string virtualPath, string physicalPath, string clientScriptVirtualPath, string clientScriptPath) {
+            _server = server;
+
+            _port = port;
+            _virtualPath = virtualPath;
+            _lowerCasedVirtualPath = _virtualPath.ToLower();
+            _lowerCasedVirtualPathWithTrailingSlash = virtualPath.EndsWith("/") ? virtualPath : virtualPath + "/";
+            _lowerCasedVirtualPathWithTrailingSlash = _lowerCasedVirtualPathWithTrailingSlash.ToLower();
+            _physicalPath = physicalPath;
+            _physicalClientScriptPath = clientScriptPath + "\\";
+            _lowerCasedClientScriptPathWithTrailingSlash = (clientScriptVirtualPath + "/").ToLower();
+        }
+
+        public void ProcessRequest(Connection conn) {
+            Request request = new Request(this, conn);
+            request.Process();
+        }
+
+        public void Shutdown() {
+        }
+
+
+        void IRegisteredObject.Stop(bool immediate) {
+            if (_server != null)
+                _server.HostStopped();
+        }
+
+        public string NormalizedClientScriptPath {
+            get {
+                return _lowerCasedClientScriptPathWithTrailingSlash;
+            }
+        }
+
+        public string NormalizedVirtualPath {
+            get {
+                return _lowerCasedVirtualPathWithTrailingSlash;
+            }
+        }
+
+        public string PhysicalClientScriptPath {
+            get {
+                return _physicalClientScriptPath;
+            }
+        }
+
+        public string PhysicalPath {
+            get {
+                return _physicalPath;
+            }
+        }
+
+        public int Port {
+            get {
+                return _port;
+            }
+        }
+
+        public string VirtualPath {
+            get {
+                return _virtualPath;
+            }
+        }
+
+        public bool IsVirtualPathInApp(String path) {
+            bool isClientScriptPath;
+            return IsVirtualPathInApp(path, out isClientScriptPath);
+        }
+
+        public bool IsVirtualPathInApp(String path, out bool isClientScriptPath) {
+            isClientScriptPath = false;
+
+            if (path == null) {
+                return false;
+            }
+
+            if (_virtualPath == "/" && path.StartsWith("/")) {
+                if (path.StartsWith(_lowerCasedClientScriptPathWithTrailingSlash))
+                    isClientScriptPath = true;
+                return true;
+            }
+
+            path = path.ToLower();
+
+            if (path.StartsWith(_lowerCasedVirtualPathWithTrailingSlash)) {
+                return true;
+            }
+
+            if (path == _lowerCasedVirtualPath) {
+                return true;
+            }
+
+            if (path.StartsWith(_lowerCasedClientScriptPathWithTrailingSlash)) {
+                isClientScriptPath = true;
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool IsVirtualPathAppPath(String path) {
+            if (path == null) {
+                return false;
+            }
+
+            path = path.ToLower();
+            return (path == _lowerCasedVirtualPath || path == _lowerCasedVirtualPathWithTrailingSlash);
+        }
+    }
+}
diff --git a/base/Applications/cassini/Main.cs b/base/Applications/cassini/Main.cs
new file mode 100644
index 0000000..ffcf6a6
--- /dev/null
+++ b/base/Applications/cassini/Main.cs
@@ -0,0 +1,238 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Diagnostics;
+using Microsoft.VisualStudio.WebHost;
+using System.Globalization;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.VisualStudio.WebServer {
+
+
+    [ConsoleCategory(HelpMessage="cassini [options] A web server",
+                     DefaultAction=true)]
+    internal sealed class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter( "v", Default=false , HelpMessage="Verbose")]
+        internal bool verbose;
+
+        [BoolParameter( "s", Default=false , HelpMessage="Silent")]
+        internal bool silent;
+
+        [BoolParameter( "quitURL", Default=false , HelpMessage="Allow special URL to terminate")]
+        internal bool quitURL;
+
+        [StringParameter( "port", Default=null , HelpMessage="Port ID to listen to")]
+        internal string portString;
+
+        [StringParameter( "vpath", Default="", HelpMessage="Root of Virtual Path")]
+        internal string virtualPath;
+
+        [StringParameter( "client", Default="", HelpMessage="Client IP")]
+        internal string client;
+
+        [StringParameter( "apparg", Default="", HelpMessage="Arg to pass to client app")]
+        internal string appArg;
+
+        [StringParameter( "app", Mandatory=true, Default="", HelpMessage="Name of the app to run")]
+        internal string app;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return WebServerApp.AppMain(this);
+        }
+    }
+
+    public sealed class WebServerApp {
+
+        internal static int AppMain(Parameters! config) {
+            bool verbose = config.verbose;
+            bool silent =  config.silent;
+
+            string virtualPath = config.virtualPath;
+            if (virtualPath != null) {
+                virtualPath = virtualPath.Trim();
+            }
+            if ((virtualPath == null) || (virtualPath.Length == 0)) {
+                virtualPath = "/";
+            }
+            else {
+                if (virtualPath.StartsWith("/") == false) {
+                    if (!silent) {
+                        ShowUsage();
+                    }
+                    return -1;
+                }
+            }
+
+            string physicalPath = "\\";
+            /*
+              HACKHACK FIXME: the file system is not wired up
+              in Singularity; avoid using it!
+
+            string physicalPath = (string)commandLine.Options["path"];
+            if (physicalPath != null) {
+                physicalPath = physicalPath.Trim();
+            }
+            if ((physicalPath == null) || (physicalPath.Length == 0)) {
+                if (!silent) {
+                    ShowUsage();
+                }
+                return -1;
+            }
+            else {
+                if (Directory.Exists(physicalPath) == false) {
+                    if (!silent) {
+                        ShowMessage("The physical path '"+ physicalPath + "' does not exist!");
+                    }
+                    return -2;
+                }
+
+                // added this to resolve paths like "."
+                physicalPath = Path.GetFullPath(physicalPath);
+            }
+            */
+
+            int port = 0;
+            string portText = config.portString;
+            if (portText != null) {
+                portText = portText.Trim();
+            }
+            if ((portText != null) && (portText.Length != 0)) {
+                try {
+                    port = Int32.Parse(portText);
+                    if ((port < 1) || (port > 65535)) {
+                        if (!silent) {
+                            ShowUsage();
+                        }
+                        return -1;
+                    }
+                }
+                catch {
+                    if (!silent) {
+                        ShowMessage("Invalid port '" + portText + "'");
+                    }
+                    return -3;
+                }
+            }
+            else {
+                port = 80;
+            }
+
+            // clientIP was added so that we could test using Cassini remotely on
+            // lab machines. This now allows the client to be localhost or clientIP.
+            string clientIP = config.client;
+            if (clientIP != null) {
+                clientIP = clientIP.Trim();
+            }
+            if ((clientIP == null) || (clientIP.Length == 0)) {
+                clientIP = "localhost";
+            }
+
+            //
+            // Singularity-specific initialization
+            //
+            string webApp = config.app;
+            bool quitURL = config.quitURL;
+
+            // FIXME: should generalize this so more than one arg can be passed to
+            // the webapp!
+            string[] appArgs = null;
+
+            if (config.appArg != null) {
+                appArgs = new string[1];
+                appArgs[0] = config.appArg;
+            }
+
+            if ((webApp == null) || (webApp.Length == 0)) {
+                webApp = "HelloWebApp.x86";
+            }
+
+            webApp.Trim();
+
+            if (!Dispatcher.Initialize(webApp, appArgs, verbose, quitURL))
+            {
+                if (!silent) {
+                    ShowMessage("Invalid web application name \"" + webApp + "\"");
+                    return -5;
+                }
+            }
+
+            // ====================
+            // Actually start the server below
+            // ===================
+
+            try {
+                Server server = new Server(port, virtualPath, physicalPath, clientIP);
+                server.Start();
+
+                String s1 = String.Format(  Environment.NewLine +
+                                        "Running Web Server on port {0}." + Environment.NewLine + Environment.NewLine +
+                                        "Application '{1}' is mapped to '{2}'." + Environment.NewLine + Environment.NewLine,
+                                        port, virtualPath, physicalPath);
+                String s2 = String.Format(  "http://localhost:{0}{1}",
+                                            port, virtualPath);
+                if (!s2.EndsWith("/"))
+                    s2 += "/";
+                Console.WriteLine(s1+s2+Environment.NewLine);
+
+                // Currently no console-read support in Singularity. Run forever!
+                //Console.WriteLine("Hit Enter to stop the server");
+                //Console.ReadLine();
+                //server.Stop();
+            }
+            catch (Exception ex) {
+                if (!silent) {
+                    ShowMessage("Error opening port " + port + ": " + ex.Message);
+                }
+                return -5;
+            }
+
+            return 0;
+        }
+
+        private static void ShowUsage() {
+            string usageString;
+
+            usageString = "Invalid usage.\n\n";
+            usageString += "cassini [options]\n";
+            usageString += "Options:\n";
+            usageString += "  -app:<application>       run application.\n";
+            usageString += "  -apparg:<argument>       supply argument to application.\n";
+            usageString += "  -path:<physicalpath>\n";
+            usageString += "  -port:<port>\n";
+            usageString += "  -quitURL                 quit if URL ending in \"quit\" is received.\n";
+            usageString += "  [-silent]\n";
+            usageString += "  [-verbose]               show files served\n";
+            usageString += "  [-vpath:<virtualpath>]\n";
+            usageString += "  [-client:<clientIP>]\n";
+
+            ShowMessage(usageString);
+        }
+
+        private static void ShowMessage(String msg) {
+            Console.WriteLine("Visual Web Developer Web Server:\n" + msg);
+        }
+    }
+}
diff --git a/base/Applications/cassini/Messages.cs b/base/Applications/cassini/Messages.cs
new file mode 100644
index 0000000..bc81004
--- /dev/null
+++ b/base/Applications/cassini/Messages.cs
@@ -0,0 +1,66 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using System.Text;
+    using System.Web;
+
+    internal class Messages {
+
+        private const String _httpErrorFormat1 =
+@"<html>
+    <head>
+        <title>{0}</title>
+";
+
+        public static String VersionString = "1.0"; //typeof(Server).Assembly.GetName().Version.ToString();
+
+        private const String _httpStyle =
+@"        <style>
+            body {font-family:""Verdana"";font-weight:normal;font-size: 8pt;color:black;}
+            p {font-family:""Verdana"";font-weight:normal;color:black;margin-top: -5px}
+            b {font-family:""Verdana"";font-weight:bold;color:black;margin-top: -5px}
+            h1 { font-family:""Verdana"";font-weight:normal;font-size:18pt;color:red }
+            h2 { font-family:""Verdana"";font-weight:normal;font-size:14pt;color:maroon }
+            pre {font-family:""Lucida Console"";font-size: 8pt}
+            .marker {font-weight: bold; color: black;text-decoration: none;}
+            .version {color: gray;}
+            .error {margin-bottom: 10px;}
+            .expandable { text-decoration:underline; font-weight:bold; color:navy; cursor:hand; }
+        </style>
+";
+
+        private static String _httpErrorFormat2 =
+@"    </head>
+    <body bgcolor=""white"">
+
+            <span><h1>Server Error in '{0}' Application.<hr width=100% size=1 color=silver></h1>
+
+            <h2> <i>HTTP Error {1} - {2}.</i> </h2></span>
+
+            <hr width=100% size=1 color=silver>
+
+            <b>Version Information:</b>&nbsp;Visual Web Developer Web Server " + VersionString + @"
+
+            </font>
+
+    </body>
+</html>
+";
+
+        public static String FormatErrorMessageBody(int statusCode, String appName) {
+            string desc = HttpWorkerRequest.GetStatusDescription(statusCode);
+
+            return String.Format(_httpErrorFormat1, new object[] {desc}) +
+                   _httpStyle +
+                   String.Format(_httpErrorFormat2, new object[] {appName, statusCode, desc});
+        }
+    }
+}
diff --git a/base/Applications/cassini/Request.cs b/base/Applications/cassini/Request.cs
new file mode 100644
index 0000000..0cbbe13
--- /dev/null
+++ b/base/Applications/cassini/Request.cs
@@ -0,0 +1,659 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Security;
+    using System.Text;
+    using System.Threading;
+    using System.Globalization;
+    using System.Web;
+    using System.Web.Hosting;
+
+    // Singularity
+    using Microsoft.SingSharp;
+    using Microsoft.Contracts;
+    using Microsoft.SingSharp.Runtime;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity;
+    //
+
+    /* Event types local to this provider */
+    public enum CassiniEvent : ushort
+    {
+        ProcessRequest = 1
+    }
+
+    internal sealed class Request : SimpleWorkerRequest {
+        private const int MaxChunkLength = 64 * 1024;
+
+        private Host! _host;
+        private Connection! _connection;
+
+        // raw request data
+        private const int maxHeaderBytes = 32*1024;
+        private byte[] _headerBytes;
+        private int _startHeadersOffset;
+        private int _endHeadersOffset;
+        private ArrayList _headerByteStrings;
+
+        // parsed request data
+        private string _verb;
+        private string _url;
+        private string _prot;
+
+        private string _path;
+        private string _filePath;
+        private new string _pathInfo;
+        private string _pathTranslated;
+        private new string _queryString;
+        private byte[] _queryStringBytes;
+
+        private int _contentLength;
+        private int _preloadedContentLength;
+        private byte[] _preloadedContent;
+
+        private string _allRawHeaders;
+        private string[][] _unknownRequestHeaders;
+        private string[] _knownRequestHeaders;
+        private bool _specialCaseStaticFileHeaders;
+
+        // cached response
+        private bool _headersSent;
+        private int _responseStatus;
+        private StringBuilder _responseHeadersBuilder;
+        private ArrayList _responseBodyBytes;
+
+        public Request(Host! host, Connection! connection)
+        {
+            _host = host;
+            _connection = connection;
+            base(String.Empty, String.Empty, String.Empty, String.Empty, null);
+        }
+
+        public void Process() {
+            ReadAllHeaders();
+
+            // Limit to local requests only
+            if (!_connection.IsLocal) {
+                _connection.WriteErrorAndClose(403);
+                return;
+            }
+
+            if (_headerBytes == null || _endHeadersOffset < 0 ||
+                _headerByteStrings == null || _headerByteStrings.Count == 0) {
+                _connection.WriteErrorAndClose(400);
+                return;
+            }
+
+            if (!ParseRequestLine()) {
+                return; // ParseRequestLine() has closed the connection
+            }
+
+            Monitoring.Log(Monitoring.Provider.Cassini,
+                           (ushort)CassiniEvent.ProcessRequest,
+                           this.GetUriPath());
+
+            // Check if the path is not well formed or is not for the current app
+            bool isClientScriptPath = false;
+            if (!_host.IsVirtualPathInApp(_path, out isClientScriptPath)) {
+                _connection.WriteErrorAndClose(404);
+                return;
+            }
+
+            ParseHeaders();
+
+            ParsePostedContent();
+
+            string expectHeader = GetKnownRequestHeader(HeaderExpect);
+
+            if (_verb == "POST" &&
+                _contentLength > 0 &&
+                _preloadedContentLength < _contentLength &&
+                expectHeader != null &&
+                expectHeader.ToLower().IndexOf("100-continue") >= 0) {
+
+                // Client is expecting 100-continue
+                _connection.Write100Continue();
+            }
+
+            PrepareResponse();
+
+            // Hand over the request to be processed
+            Dispatcher.DispatchRequest(this);
+        }
+
+        private bool TryReadAllHeaders() {
+            // read the first packet (up to 32K)
+            byte[] headerBytes = _connection.ReadRequestBytes(maxHeaderBytes);
+
+            if (headerBytes == null || headerBytes.Length == 0)
+                return false;
+
+            if (_headerBytes != null) {
+                // previous partial read
+                int len = headerBytes.Length + _headerBytes.Length;
+                if (len > maxHeaderBytes)
+                    return false;
+
+                byte[] bytes = new byte[len];
+                Buffer.BlockCopy(_headerBytes, 0, bytes, 0, _headerBytes.Length);
+                Buffer.BlockCopy(headerBytes, 0, bytes, _headerBytes.Length, headerBytes.Length);
+                _headerBytes = bytes;
+            }
+            else {
+                _headerBytes = headerBytes;
+            }
+
+            // start parsing
+            _startHeadersOffset = -1;
+            _endHeadersOffset = -1;
+            _headerByteStrings = new ArrayList();
+
+            // find the end of headers
+            ByteParser parser = new ByteParser(_headerBytes);
+
+            for (;;) {
+                ByteString line = parser.ReadLine();
+
+                if (line == null) {
+                    break;
+                }
+
+                if (_startHeadersOffset < 0) {
+                    _startHeadersOffset = parser.CurrentOffset;
+                }
+
+                if (line.IsEmpty) {
+                    _endHeadersOffset = parser.CurrentOffset;
+                    break;
+                }
+
+                _headerByteStrings.Add(line);
+            }
+
+            return true;
+        }
+
+        private void ReadAllHeaders() {
+            _headerBytes = null;
+
+            do {
+                if (!TryReadAllHeaders()) {
+                    // something bad happened
+                    break;
+                }
+            }
+            while (_endHeadersOffset < 0); // found \r\n\r\n
+        }
+
+        private bool ParseRequestLine() {
+            ByteString requestLine = (ByteString)_headerByteStrings[0];
+            ByteString[] elems = requestLine.Split(' ');
+
+            if (elems == null || elems.Length < 2 || elems.Length > 3) {
+                _connection.WriteErrorAndClose(400);
+                return false;
+            }
+
+            _verb = elems[0].GetString();
+
+            ByteString urlBytes = elems[1];
+            _url = urlBytes.GetString();
+
+            if (elems.Length == 3) {
+                _prot = elems[2].GetString();
+            }
+            else {
+                _prot = "HTTP/1.0";
+            }
+
+            // query string
+
+            int iqs = urlBytes.IndexOf('?');
+            if (iqs > 0) {
+                _queryStringBytes = urlBytes.Substring(iqs+1).GetBytes();
+            }
+            else {
+                _queryStringBytes = new byte[0];
+            }
+
+            iqs = _url.IndexOf('?');
+            if (iqs > 0) {
+                _path = _url.Substring(0, iqs);
+                _queryString = _url.Substring(iqs+1);
+            }
+            else {
+                _path = _url;
+                _queryStringBytes = new byte[0];
+            }
+
+            // url-decode path
+
+            if (_path.IndexOf('%') >= 0) {
+                _path = HttpUtility.UrlDecode(_path, Encoding.UTF8);
+            }
+
+            // path info
+
+            int lastDot = _path.LastIndexOf('.');
+            int lastSlh = _path.LastIndexOf('/');
+
+            if (lastDot >= 0 && lastSlh >= 0 && lastDot < lastSlh && lastSlh < _path.Length - 1) {
+                int ipi = _path.IndexOf('/', lastDot);
+                _filePath = _path.Substring(0, ipi);
+                _pathInfo = _path.Substring(ipi);
+            }
+            else {
+                _filePath = _path;
+                _pathInfo = String.Empty;
+            }
+
+            _pathTranslated = MapPath(_filePath);
+
+            return true;
+        }
+
+        private void ParseHeaders() {
+            _knownRequestHeaders = new string[RequestHeaderMaximum];
+
+            // construct unknown headers as array list of name1,value1,...
+            ArrayList headers = new ArrayList();
+
+            for (int i = 1; i < _headerByteStrings.Count; i++) {
+                string s = ((ByteString)_headerByteStrings[i]).GetString();
+
+                int c = s.IndexOf(':');
+
+                if (c >= 0) {
+                    string name = s.Substring(0, c).Trim();
+                    string value = s.Substring(c + 1).Trim();
+
+                    // remember
+                    int knownIndex = GetKnownRequestHeaderIndex(name);
+                    if (knownIndex >= 0) {
+                        _knownRequestHeaders[knownIndex] = value;
+                    }
+                    else {
+                        headers.Add(name);
+                        headers.Add(value);
+                    }
+                }
+            }
+
+            // copy to array unknown headers
+
+            int n = headers.Count / 2;
+            _unknownRequestHeaders = new string[n][];
+            int j = 0;
+
+            for (int i = 0; i < n; i++) {
+                _unknownRequestHeaders[i] = new string[2];
+                _unknownRequestHeaders[i][0] = (string)headers[j++];
+                _unknownRequestHeaders[i][1] = (string)headers[j++];
+            }
+
+            // remember all raw headers as one string
+
+            if (_headerByteStrings.Count > 1) {
+                _allRawHeaders = Encoding.UTF8.GetString(_headerBytes, _startHeadersOffset, _endHeadersOffset-_startHeadersOffset);
+            }
+            else {
+                _allRawHeaders = String.Empty;
+            }
+        }
+
+        private void ParsePostedContent() {
+            _contentLength = 0;
+            _preloadedContentLength = 0;
+
+            string contentLengthValue = _knownRequestHeaders[HttpWorkerRequest.HeaderContentLength];
+            if (contentLengthValue != null) {
+                try {
+                    _contentLength = Int32.Parse(contentLengthValue);
+                }
+                catch {
+                }
+            }
+
+            if (_headerBytes.Length > _endHeadersOffset) {
+                _preloadedContentLength = _headerBytes.Length - _endHeadersOffset;
+
+                if (_preloadedContentLength > _contentLength && _contentLength > 0)
+                    _preloadedContentLength = _contentLength; // don't read more than the content-length
+
+                _preloadedContent = new byte[_preloadedContentLength];
+                Buffer.BlockCopy(_headerBytes, _endHeadersOffset, _preloadedContent, 0, _preloadedContentLength);
+            }
+        }
+
+        private void PrepareResponse() {
+            _headersSent = false;
+            _responseStatus = 200;
+            _responseHeadersBuilder = new StringBuilder();
+            _responseBodyBytes = new ArrayList();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // Implementation of HttpWorkerRequest
+
+        public override string GetUriPath() {
+            return _path;
+        }
+
+        public override string GetQueryString() {
+            return _queryString;
+        }
+
+        public override byte[] GetQueryStringRawBytes() {
+            return _queryStringBytes;
+        }
+
+        public override string GetRawUrl() {
+            return _url;
+        }
+
+        public override string GetHttpVerbName() {
+            return _verb;
+        }
+
+        public override string GetHttpVersion() {
+            return _prot;
+        }
+
+        public override string GetRemoteAddress() {
+            return _connection.RemoteIP;
+        }
+
+        public override int GetRemotePort() {
+            return 0;
+        }
+
+        public override string GetLocalAddress() {
+            return _connection.LocalIP;
+        }
+
+        public override string GetServerName() {
+            string localAddress = GetLocalAddress();
+            if (localAddress.Equals("127.0.0.1")) {
+                return "localhost";
+            }
+            return localAddress;
+        }
+
+        public override int GetLocalPort() {
+            return _host.Port;
+        }
+
+        public override string GetFilePath() {
+            return _filePath;
+        }
+
+        public override string GetFilePathTranslated() {
+            return _pathTranslated;
+        }
+
+        public override string GetPathInfo() {
+            return _pathInfo;
+        }
+
+        public override string GetAppPath() {
+            return _host.VirtualPath;
+        }
+
+        public override string GetAppPathTranslated() {
+            return _host.PhysicalPath;
+        }
+
+        public override byte[] GetPreloadedEntityBody() {
+            return _preloadedContent;
+        }
+
+        [Pure]
+        public override bool IsEntireEntityBodyIsPreloaded() {
+            return (_contentLength == _preloadedContentLength);
+        }
+
+        public override int ReadEntityBody(byte[] buffer, int size)  {
+            int bytesRead = 0;
+            byte[] bytes = _connection.ReadRequestBytes(size);
+
+            if (bytes != null && bytes.Length > 0) {
+                bytesRead = bytes.Length;
+                Buffer.BlockCopy(bytes, 0, buffer, 0, bytesRead);
+            }
+
+            return bytesRead;
+        }
+
+        public override string GetKnownRequestHeader(int index)  {
+            return _knownRequestHeaders[index];
+        }
+
+        public override string GetUnknownRequestHeader(string name) {
+            int n = _unknownRequestHeaders.Length;
+
+            for (int i = 0; i < n; i++) {
+                if (string.Compare(name, _unknownRequestHeaders[i][0], true) == 0) {
+                    return _unknownRequestHeaders[i][1];
+                }
+            }
+
+            return null;
+        }
+
+        public override string[][] GetUnknownRequestHeaders() {
+            return _unknownRequestHeaders;
+        }
+
+        public override string GetServerVariable(string name) {
+            string s = String.Empty;
+
+            switch (name) {
+                case "ALL_RAW":
+                    s = _allRawHeaders;
+                    break;
+
+                case "SERVER_PROTOCOL":
+                    s = _prot;
+                    break;
+
+                case "AUTH_TYPE":
+                    if (GetUserToken() != IntPtr.Zero)
+                        s = "NTLM";
+                    break;
+            }
+
+            return s;
+        }
+
+        public override string MapPath(string path) {
+            string mappedPath = String.Empty;
+            bool isClientScriptPath = false;
+
+            if (path == null || path.Length == 0 || path.Equals("/")) {
+            // asking for the site root
+                if (_host.VirtualPath == "/") {
+                    // app at the site root
+                    mappedPath = _host.PhysicalPath;
+                }
+                else {
+                    // unknown site root - don't point to app root to avoid double config inclusion
+                    mappedPath = "c:\\"; //Environment.SystemDirectory;
+                }
+            }
+            else if (_host.IsVirtualPathAppPath(path)) {
+                // application path
+                mappedPath = _host.PhysicalPath;
+            }
+            else if (_host.IsVirtualPathInApp(path, out isClientScriptPath)) {
+                if (isClientScriptPath) {
+                    mappedPath = _host.PhysicalClientScriptPath + path.Substring(_host.NormalizedClientScriptPath.Length);
+                }
+                else {
+                    // inside app but not the app path itself
+                    mappedPath = _host.PhysicalPath + path.Substring(_host.NormalizedVirtualPath.Length);
+                }
+            }
+            else {
+                // outside of app -- make relative to app path
+                if (path.StartsWith("/")) {
+                    mappedPath = _host.PhysicalPath + path.Substring(1);
+                }
+                else {
+                    mappedPath = _host.PhysicalPath + path;
+                }
+            }
+
+            mappedPath = mappedPath.Replace('/', '\\');
+
+            if (mappedPath.EndsWith("\\") && !mappedPath.EndsWith(":\\")) {
+                mappedPath = mappedPath.Substring(0, mappedPath.Length-1);
+            }
+
+            return mappedPath;
+        }
+
+        public override void SendStatus(int statusCode, string statusDescription) {
+            _responseStatus = statusCode;
+        }
+
+        public override void SendKnownResponseHeader(int index, string value) {
+            if (_headersSent) {
+                return;
+            }
+
+            switch (index) {
+                case HttpWorkerRequest.HeaderServer:
+                case HttpWorkerRequest.HeaderDate:
+                case HttpWorkerRequest.HeaderConnection:
+                    // ignore these
+                    return;
+                case HttpWorkerRequest.HeaderAcceptRanges:
+                    if (value == "bytes") {
+                        // use this header to detect when we're processing a static file
+                        _specialCaseStaticFileHeaders = true;
+                        return;
+                    }
+                    break;
+                case HttpWorkerRequest.HeaderExpires:
+                case HttpWorkerRequest.HeaderLastModified:
+                    if (_specialCaseStaticFileHeaders) {
+                        // NOTE: Ignore these for static files. These are generated
+                        //       by the StaticFileHandler, but they shouldn't be.
+                        return;
+                    }
+                    break;
+            }
+
+            _responseHeadersBuilder.Append(GetKnownResponseHeaderName(index));
+            _responseHeadersBuilder.Append(": ");
+            _responseHeadersBuilder.Append(value);
+            _responseHeadersBuilder.Append("\r\n");
+        }
+
+        public override void SendUnknownResponseHeader(string name, string value) {
+            if (_headersSent)
+                return;
+
+            _responseHeadersBuilder.Append(name);
+            _responseHeadersBuilder.Append(": ");
+            _responseHeadersBuilder.Append(value);
+            _responseHeadersBuilder.Append("\r\n");
+        }
+
+        public override void SendCalculatedContentLength(int contentLength) {
+            if (!_headersSent) {
+                _responseHeadersBuilder.Append("Content-Length: ");
+                _responseHeadersBuilder.Append(contentLength);
+                _responseHeadersBuilder.Append("\r\n");
+            }
+        }
+
+        public override bool HeadersSent() {
+            return _headersSent;
+        }
+
+        public override bool IsClientConnected() {
+            return _connection.Connected;
+        }
+
+        public override void CloseConnection() {
+            _connection.Close();
+        }
+
+        public override void SendResponseFromMemory(byte[] data, int length) {
+            if (length > 0) {
+                byte[] bytes = new byte[length];
+                Buffer.BlockCopy(data, 0, bytes, 0, length);
+                _responseBodyBytes.Add(bytes);
+            }
+        }
+
+        public void SendResponseFromMemory([Claims] byte[]! in ExHeap data) {
+            VContainer<byte> container = new VContainer<byte>(data);
+            _responseBodyBytes.Add(container);
+        }
+
+        public override void FlushResponse(bool finalFlush) {
+            try {
+
+                if (!_headersSent) {
+                    _connection.WriteHeaders(_responseStatus, _responseHeadersBuilder.ToString());
+                    _headersSent = true;
+                }
+
+                for (int i = 0; i < _responseBodyBytes.Count; i++) {
+                    byte[] bytes = _responseBodyBytes[i] as byte[];
+                    VContainer<byte> container = _responseBodyBytes[i] as VContainer<byte>;
+
+                    if (bytes != null) {
+                        _connection.WriteBody(bytes, 0, bytes.Length);
+                    } else if (container != null) {
+                        byte[]! in ExHeap exBytes = container.Acquire();
+                        _responseBodyBytes[i] = null;
+                        _connection.WriteBody(exBytes);
+                    } else {
+                        Debug.Assert(false);
+                    }
+                }
+            }
+            catch(SocketException) {
+                // If the socket throws an exception, abort trying to write the
+                // rest of the body.
+            }
+            finally {
+                // Clean up in case an exception caused us to abort partway through
+                _headersSent = true;
+
+                for (int i = 0; i < _responseBodyBytes.Count; i++) {
+                    VContainer<byte> container = _responseBodyBytes[i] as VContainer<byte>;
+
+                    if (container != null) {
+                        byte[]! in ExHeap exBytes = container.Acquire();
+                        delete exBytes;
+                        _responseBodyBytes[i] = null;
+                    }
+                }
+            }
+
+            _responseBodyBytes = new ArrayList();
+
+            if (finalFlush) {
+                _connection.Close();
+            }
+        }
+
+        public override void EndOfRequest() {
+            FlushResponse(true);
+        }
+    }
+}
diff --git a/base/Applications/cassini/Server.cs b/base/Applications/cassini/Server.cs
new file mode 100644
index 0000000..fcddc75
--- /dev/null
+++ b/base/Applications/cassini/Server.cs
@@ -0,0 +1,277 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//   Information Contained Herein is Proprietary and Confidential.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.WebHost {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using System.IO;
+    using System.Net;
+    using System.Net.Sockets;
+    using System.Threading;
+    using System.Runtime.InteropServices;
+    using System.Web.Hosting;
+
+    public class Server : SimpleApplicationHost {
+
+        /* =======================
+           The original version of Cassini uses the .NET thread pool to run
+           certain methods. There is currently no thread pool available on Singularity,
+           so I adapted Cassini to spin up threads on demand instead. These helper
+           objects assist with this; we could go back and remove them when
+           thread pools become available, if we wanted.
+           ======================= */
+
+        internal abstract class ThreadObject
+        {
+            protected abstract void Run();
+
+            public void Start()
+            {
+                ThreadStart threadStart = new ThreadStart(Run);
+                Thread selfThread = new Thread(threadStart);
+                selfThread.Start();
+            }
+
+#if THREAD_POOL
+            public ThreadStart NewThreadStart()
+            {
+                return new ThreadStart(Run);
+            }
+#endif
+        }
+
+        internal class AcceptThread : ThreadObject {
+            private Server _server;
+            private Socket _socket;
+
+            public AcceptThread(Server server, Socket socket)
+            {
+                _server = server;
+                _socket = socket;
+            }
+
+            protected override void Run()
+            {
+                _server.OnSocketAccept(_socket);
+            }
+        }
+
+        internal class StartThread : ThreadObject {
+            private Server _server;
+
+            public StartThread(Server server)
+            {
+                _server = server;
+            }
+
+            protected override void Run()
+            {
+                _server.OnStart();
+            }
+        }
+
+        /* =======================
+           end helper objects
+           ======================= */
+
+
+        private int _port;
+        private string _virtualPath;
+        private string _physicalPath;
+        private string _clientIP;
+
+        //private WaitCallback _onStart;
+        //private WaitCallback _onSocketAccept;
+
+        private bool _shutdownInProgress;
+
+        private Socket _socket;
+        private Host _host;
+
+        private IntPtr _processToken;
+        private String _processUser;
+
+#if THREAD_POOL
+        private CassiniThreadPool threadPool;
+        private const int workerThreads = 16;
+        private const int maxWorkItems = workerThreads * 128;
+#endif
+
+        public Server(int port, string virtualPath, string physicalPath, string clientIP) : base(virtualPath, physicalPath) {
+            _port = port;
+            _virtualPath = virtualPath;
+            _clientIP = clientIP;
+
+            string directorySeparatorString = new string(Path.DirectorySeparatorChar, 1);
+            _physicalPath = physicalPath.EndsWith(directorySeparatorString) ? physicalPath : physicalPath + directorySeparatorString;
+            //_onSocketAccept = new WaitCallback(OnSocketAccept);
+            //_onStart = new WaitCallback(OnStart);
+#if THREAD_POOL
+            threadPool = new CassiniThreadPool(workerThreads, maxWorkItems);
+#endif
+        }
+
+        /*
+        // MarshalByRefObject override
+        public override object InitializeLifetimeService() {
+            // never expire the license
+            return null;
+        }
+        */
+
+        public int Port {
+            get {
+                return _port;
+            }
+        }
+
+        public string RootUrl {
+            get {
+                if (_port != 80) {
+                    return "http://localhost:" + _port + _virtualPath;
+                }
+                else {
+                    return "http://localhost" + _virtualPath;
+                }
+            }
+        }
+
+        //
+        // Process identity
+        //
+
+        private const int TOKEN_ALL_ACCESS   = 0x000f01ff;
+        private const int TOKEN_EXECUTE      = 0x00020000;
+        private const int TOKEN_READ         = 0x00020008;
+        private const int TOKEN_IMPERSONATE  = 0x00000004;
+
+        public IntPtr GetProcessToken() {
+            return _processToken;
+        }
+
+        public String GetProcessUser() {
+            return _processUser;
+        }
+
+        //
+        // Socket listening
+        //
+
+        public void Start() {
+            _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _socket.Bind(new IPEndPoint(IPAddress.Any, _port));
+            _socket.Listen((int)SocketOptionName.MaxConnections);
+
+            //ThreadPool.QueueUserWorkItem(_onStart);
+            (new StartThread(this)).Start();
+        }
+
+        public void Stop() {
+            _shutdownInProgress = true;
+
+            try {
+                if (_socket != null) {
+                    _socket.Shutdown(SocketShutdown.Both);
+                    _socket.Close();
+                }
+            }
+            catch {
+            }
+            finally {
+                _socket = null;
+            }
+
+            try {
+                if (_host != null) {
+                    _host.Shutdown();
+                }
+
+                while (_host != null) {
+                    Thread.Sleep(100);
+                }
+            }
+            catch {
+            }
+            finally {
+                _host = null;
+            }
+        }
+
+        protected void OnSocketAccept(object acceptedSocket) {
+            if (!_shutdownInProgress) {
+                Connection conn =  new Connection(this, (Socket)acceptedSocket, _clientIP);
+
+                // wait for at least some input
+                if (conn.WaitForRequestBytes() == 0) {
+                    conn.WriteErrorAndClose(400);
+                    return;
+                }
+
+                // find or create host
+                Host host = GetHost();
+                if (host == null) {
+                    conn.WriteErrorAndClose(500);
+                    return;
+                }
+
+#if FEATURE_PAL && DEBUG // ROTORTODO
+                Console.WriteLine("Process request at " + conn.LocalIP + " from " + conn.RemoteIP);
+#endif
+
+                // process request in worker app domain
+                host.ProcessRequest(conn);
+            }
+        }
+
+        protected void OnStart() {
+            while (!_shutdownInProgress) {
+                try {
+                    if (_socket != null) // ROTORTODO
+                    {
+                        Socket socket = _socket.Accept();
+                        //ThreadPool.QueueUserWorkItem(_onSocketAccept, socket);
+#if THREAD_POOL
+                        //ThreadPool.QueueUserWorkItem(_onSocketAccept, socket);
+                        threadPool.QueueUserWorkItem(
+                            new AcceptThread(this, socket).NewThreadStart());
+#else
+                        (new AcceptThread(this, socket)).Start();
+#endif
+                    }
+                }
+                catch {
+                    Thread.Sleep(100);
+                }
+            }
+        }
+
+        private Host GetHost() {
+            if (_shutdownInProgress)
+                return null;
+
+            Host host = _host;
+
+            if (host == null) {
+                lock (this) {
+                    if (_host == null) {
+                        _host = new Host();
+                        _host.Configure(this, _port, _virtualPath, _physicalPath, ClientScriptVirtualPath, ClientScriptPath);
+                    }
+
+                    host = _host;
+                }
+            }
+
+            return host;
+        }
+
+        internal void HostStopped() {
+            _host = null;
+        }
+    }
+}
diff --git a/base/Applications/cassini/Singularity/CassiniThreadPool.sg b/base/Applications/cassini/Singularity/CassiniThreadPool.sg
new file mode 100644
index 0000000..973f4d5
--- /dev/null
+++ b/base/Applications/cassini/Singularity/CassiniThreadPool.sg
@@ -0,0 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CassiniThreadPool.sg
+//
+//  Note: adapted from FatThreadPool.sg
+//
+
+#if THREAD_POOL
+
+using System.Collections;
+using System.Threading;
+
+namespace Microsoft.VisualStudio.WebHost
+{
+    /// <remarks>This class implements a non-Singleton
+    /// threadpool and has a configurable work queue
+    /// size. </remarks>
+    internal sealed class CassiniThreadPool
+    {
+        object                            monitor;
+        Queue                             commands; // Queue of ThreadStart
+        int                               queuedItems;
+        readonly int                      maxQueuedItems;
+        volatile int                      threadCount;
+        volatile bool                     shutdown;
+        ManualResetEvent                  shutdownEvent;
+
+        [Microsoft.Contracts.NotDelayed]
+        internal CassiniThreadPool(int maxThreads, int maxQueuedItems)
+            requires maxThreads > 0;
+            requires maxQueuedItems > 0;
+            requires maxThreads <= maxQueuedItems;
+        {
+            this.monitor          = new object();
+            this.commands         = new Queue();
+            this.queuedItems      = 0;
+            this.maxQueuedItems   = maxQueuedItems;
+            this.threadCount      = maxThreads;
+            this.shutdown         = false;
+            this.shutdownEvent    = new ManualResetEvent(false);
+
+            for (int i = 0; i < maxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(WorkerMain));
+                t.Start();
+            }
+        }
+
+        /// <summary> Queues call to constructor supplied
+        /// delegate with user supplied object.  This method
+        /// blocks if maximum queue size is reached.  </summary>
+        internal void QueueUserWorkItem(ThreadStart! command)
+        {
+            Monitor.Enter(this.monitor);
+            while (this.queuedItems == this.maxQueuedItems) {
+                Monitor.Wait(this.monitor);
+            }
+            commands.Enqueue(command);
+            this.queuedItems++;
+            Monitor.Pulse(this.monitor);
+            Monitor.Exit(this.monitor);
+        }
+
+        private void WorkerMain()
+        {
+            while (true) {
+                ThreadStart command;
+                lock (this.monitor) {
+                    while (queuedItems == 0 && !shutdown) {
+                        Monitor.Wait(this.monitor);
+                    }
+
+                    if (queuedItems == 0 && shutdown) {
+                        break;
+                    }
+
+                    command = (ThreadStart) (commands.Dequeue());
+                    assert(command != null);
+
+                    if (this.queuedItems-- == this.maxQueuedItems) {
+                        Monitor.Pulse(this.monitor);
+                    }
+                }
+                command();
+            }
+
+            lock (this.monitor) {
+                if (--this.threadCount == 0) {
+                    shutdownEvent.Set();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Shutdown thread pool instance.  Caller blocks until
+        /// the threads in the pool have finished outstanding
+        /// work items.
+        /// </summary>
+        internal void Shutdown()
+        {
+            lock (this.monitor) {
+                shutdown = true;
+                Monitor.PulseAll(this.monitor);
+            }
+
+            shutdownEvent.WaitOne();
+
+            Microsoft.Singularity.DebugStub.Assert(commands.Count == 0);
+        }
+    }
+}
+
+#endif // THREAD_POOL
diff --git a/base/Applications/cassini/Singularity/Dispatcher.sg b/base/Applications/cassini/Singularity/Dispatcher.sg
new file mode 100644
index 0000000..7488757
--- /dev/null
+++ b/base/Applications/cassini/Singularity/Dispatcher.sg
@@ -0,0 +1,257 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Dispatcher.sg
+//
+//  Note:
+//     This file holds the Singularity-specific web app dispatcher that knows
+//     how to invoke web apps under Singularity.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.WebApps;
+using Microsoft.Singularity.WebApps.Contracts;
+using System.Diagnostics;
+using System.Web;
+
+namespace Microsoft.VisualStudio.WebHost
+{
+    internal class Dispatcher
+    {
+        private static TRef<WebAppContract.Imp:ProcessingState> m_AppConn;
+        private static bool  m_quitUrl;
+        private static bool  m_verbose;
+        private static string[] m_childArgs;
+
+        private static ulong m_TotalLocalTime = 0;
+        private static ulong m_TotalRemoteTime = 0;
+        private static ulong m_TotalLocalHits = 0;
+        private static ulong m_TotalRemoteHits = 0;
+
+        private const string QUIT_URI = "quit";
+
+        public static void DispatchRequest(Request! request)
+        {
+            string uriPath = request.GetUriPath();
+            if (m_quitUrl && uriPath.Length >= QUIT_URI.Length &&
+                uriPath.Substring(uriPath.Length - QUIT_URI.Length) == QUIT_URI)
+            {
+                request.CloseConnection();
+                ProcessService.Stop(0);
+            }
+
+            // Make the appropriate request object
+            IHttpRequest localRequest = new LocalHttpRequest(request);
+
+            ulong started = Processor.CycleCount;
+
+            // Call out-of-proc (usual case)
+            HttpRequestContract.Imp! reqConnImp;
+            HttpRequestContract.Exp! reqConnExp;
+            HttpRequestContract.NewChannel(out reqConnImp, out reqConnExp);
+
+            WebAppContract.Imp appConn = m_AppConn.Acquire();
+
+            try
+            {
+                // Start processing this request
+                appConn.SendProcess(reqConnImp);
+
+                switch receive {
+                    case appConn.OK():
+                        break;
+
+                    case appConn.ChannelClosed():
+                        Console.WriteLine("Child died, attempting to restart.");
+                        delete appConn;
+                        appConn = StartChild();
+                        break;
+                }
+            }
+            finally
+            {
+                m_AppConn.Release(appConn);
+            }
+
+            // Start servicing the request contract
+            RequestExporter.ServiceRequestChannel(localRequest, reqConnExp);
+
+            // Clean up
+            delete reqConnExp;
+
+            ulong elapsed = Processor.CycleCount - started;
+            if (m_verbose) Console.WriteLine("served \"" + request.GetUriPath() + "\" in " + elapsed + " cycles");
+
+            ++m_TotalRemoteHits;
+
+            if (m_TotalRemoteHits > 1)
+            {
+                m_TotalRemoteTime += elapsed;
+                //Console.WriteLine("Average remote time: " + m_TotalRemoteTime / (m_TotalRemoteHits - 1));
+            }
+            else
+            {
+                //Console.WriteLine("First remote hit (cold cache)");
+            }
+
+            request.CloseConnection();
+        }
+
+        public static WebAppContract.Imp:ProcessingState StartChild()
+        {
+            // Start up the webapp so it's ready to respond to requests
+            WebAppContract.Imp! appConnImp;
+            WebAppContract.Exp! appConnExp;
+            WebAppContract.NewChannel(out appConnImp, out appConnExp);
+            
+            // REVIEW. should really inspect the manifest and determine what 
+            // endpoints are needed by the child process.  For example,specweb99
+            // now needs both the WebAppContract and a directory service contract
+            Process child = new Process(m_childArgs, (Endpoint * in ExHeap)appConnExp);
+            child.Start();
+            appConnImp.RecvWebAppReady();
+
+            return appConnImp;
+        }
+
+        public static bool Initialize(string!  appName,
+                                      string[] appArgs,
+                                      bool     verbose,
+                                      bool     quitUrl)
+        {
+            m_quitUrl = quitUrl;
+            m_verbose  = verbose;
+
+            // Start up the webapp so it's ready to respond to requests
+            string[] args;
+
+            if (appArgs != null) {
+                args = new string[1 + appArgs.Length];
+                args[0] = appName;
+
+                for (int i = 0; i < appArgs.Length; ++i) {
+                    args[i + 1] = appArgs[i];
+                }
+            } else {
+                args = new string[1];
+                args[0] = appName;
+            }
+            m_childArgs = args;
+
+            WebAppContract.Imp! appConnImp = StartChild();
+            if (appConnImp == null) {
+                throw new Exception(String.Format("Could not create process {0}",args[0])); 
+            }
+
+            m_AppConn = new TRef<WebAppContract.Imp:ProcessingState>(appConnImp);
+
+            return true;
+        }
+
+        internal class RequestExporter
+        {
+            public static void ServiceRequestChannel(IHttpRequest! request,
+                                                     HttpRequestContract.Exp:Start
+                                                     opt(HttpRequestContract.Completed)! conn)
+            {
+                bool done = false;
+
+                while(!done)
+                {
+                    switch receive
+                    {
+                        case conn.GetUriPath() :
+                            conn.SendUriPath(Bitter.FromString2(request.GetUriPath()));
+                            break;
+
+                        case conn.GetQueryString() :
+                            conn.SendQueryString(Bitter.FromString(request.GetQueryString()));
+                            break;
+
+                        case conn.GetVerb() :
+                            conn.SendVerb(Bitter.FromString2(request.GetVerb()));
+                            break;
+
+                        case conn.GetHeader(char[]! in ExHeap headerChars) :
+                            string headerName = Bitter.ToString(headerChars);
+                            delete headerChars;
+                            string headerVal = request.GetHeader(headerName);
+                            if (headerVal != null) {
+                                conn.SendHeaderValue(Bitter.FromString(headerVal));
+                            } else {
+                                conn.SendHeaderValue(null);
+                            }
+                            break;
+
+                        case conn.GetBody() :
+                            byte[] bodyData = request.GetBodyData();
+
+                            if (bodyData != null) {
+                                conn.SendBodyData(Bitter.FromByteArray(bodyData));
+                            } else {
+                                conn.SendBodyData(null);
+                            }
+                            break;
+
+                        case conn.GetRemoteAddress() :
+                            conn.SendRemoteAddress(Bitter.FromString(request.GetRemoteAddress()));
+                            break;
+
+                        case conn.SendStatus(int code, char[]! in ExHeap descChars) :
+                        {
+                            string description = Bitter.ToString(descChars);
+                            delete descChars;
+                            request.SendStatus(code, description);
+                            conn.SendOK();
+                        }
+                        break;
+
+                        case conn.SendHeader(char[]! in ExHeap nameChars, char[]! in ExHeap valChars) :
+                        {
+                            string name = Bitter.ToString(nameChars);
+                            delete nameChars;
+
+                            string value = Bitter.ToString(valChars);
+                            delete valChars;
+
+                            request.SendHeader(name, value);
+                            conn.SendOK();
+                        }
+                        break;
+
+                        case conn.SendBodyData(byte[]! in ExHeap dataBytes) :
+                        {
+                            request.SendBodyData(dataBytes);
+                            conn.SendOK();
+                        }
+                        break;
+
+                        case conn.Done() :
+                            request.Done();
+                            done = true;
+                            break;
+
+                        case conn.ChannelClosed() :
+                            request.Done();
+                            done = true;
+                            break;
+
+                        case unsatisfiable :
+                            // This is even more unexpected
+                            DebugStub.Break();
+                            done = true;
+                            break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/base/Applications/cassini/Singularity/DummyMarshalHttpRequest.cs b/base/Applications/cassini/Singularity/DummyMarshalHttpRequest.cs
new file mode 100644
index 0000000..e5f8a4a
--- /dev/null
+++ b/base/Applications/cassini/Singularity/DummyMarshalHttpRequest.cs
@@ -0,0 +1,159 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RemoteHttpRequest.sg
+//
+//  Note:
+//    This file wraps a cassini Request object so it is callable through
+//    the Microsoft.Singularity.WebApps.IHttpRequest interface that web
+//    applications understand.
+//
+//    As an added twist, this object simulates the data marshalling that
+//    is normally required to use channels.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.WebApps;
+using System.Web;
+
+namespace Microsoft.VisualStudio.WebHost
+{
+    internal class DummyMarshallHttpRequest : IHttpRequest
+    {
+        private Request m_Req;
+        public ulong m_TotalSharedAllocTime;
+        public ulong m_TotalSharedCharCopyTime;
+        public ulong m_TotalSharedByteCopyTime;
+        public ulong m_TotalNativeTime;
+        public ulong m_TotalSharedDeleteTime;
+
+        internal DummyMarshallHttpRequest(Request request)
+        {
+            m_Req = request;
+            m_TotalSharedAllocTime = 0;
+            m_TotalSharedCharCopyTime = 0;
+            m_TotalSharedCharCopyTime = 0;
+            m_TotalNativeTime = 0;
+            m_TotalSharedDeleteTime = 0;
+        }
+
+        private string! MarshallString(string str)
+        {
+            if (str == null) return "";
+
+            ulong start = Processor.CycleCount;
+            char[] in ExHeap marshalled = new[ExHeap] char[str.Length];
+            m_TotalSharedAllocTime += Processor.CycleCount - start;
+
+            start = Processor.CycleCount;
+            int length = str.Length;
+            for (int i = 0; i < length; ++i)
+            { marshalled[i] = str[i]; }
+            m_TotalSharedCharCopyTime += Processor.CycleCount - start;
+
+            start = Processor.CycleCount;
+            string reborn = Bitter.ToString2(marshalled);
+            m_TotalNativeTime += Processor.CycleCount - start;
+
+            start = Processor.CycleCount;
+            delete marshalled;
+            m_TotalSharedDeleteTime += Processor.CycleCount - start;
+
+            return reborn;
+        }
+
+        private byte[]! MarshallBytes(byte[]! bytes)
+        {
+            ulong start = Processor.CycleCount;
+            byte* opt(ExHeap[]) marshalled = new[ExHeap] byte[bytes.Length];
+            m_TotalSharedAllocTime += Processor.CycleCount - start;
+
+            start = Processor.CycleCount;
+            int length = bytes.Length;
+            for (int i = 0; i < length; ++i)
+            { marshalled[i] = bytes[i]; }
+            m_TotalSharedByteCopyTime += Processor.CycleCount - start;
+
+            start = Processor.CycleCount;
+            byte[] reborn = Bitter.ToByteArray(marshalled);
+            m_TotalNativeTime += Processor.CycleCount - start;
+
+            start = Processor.CycleCount;
+            delete marshalled;
+            m_TotalSharedDeleteTime += Processor.CycleCount - start;
+
+            return reborn;
+        }
+
+        public string! GetUriPath()
+        { return MarshallString(m_Req.GetUriPath()); }
+
+        public string GetQueryString()
+        { return MarshallString(m_Req.GetQueryString()); }
+
+        public string GetVerb()
+        { return MarshallString(m_Req.GetHttpVerbName()); }
+
+        public string! GetRemoteAddress()
+        { return MarshallString(m_Req.GetRemoteAddress()); }
+
+        public byte[] GetBodyData()
+        { return MarshallBytes(m_Req.GetPreloadedEntityBody()); }
+
+        public string GetHeader(string! headerName)
+        {
+            int knownIndex = HttpWorkerRequest.GetKnownRequestHeaderIndex(headerName);
+
+            if (knownIndex > 0) {
+                return MarshallString(m_Req.GetKnownRequestHeader(knownIndex));
+            } else {
+                return MarshallString(m_Req.GetUnknownRequestHeader(headerName));
+            }
+        }
+
+        public void SendStatus(int code, string! description)
+        { m_Req.SendStatus(code, MarshallString(description)); }
+
+        public void SendHeader(string! name, string! value)
+        {
+            int index = HttpWorkerRequest.GetKnownResponseHeaderIndex(name);
+
+            name = MarshallString(name);
+            value = MarshallString(value);
+
+            if (index == -1)
+            {
+                m_Req.SendUnknownResponseHeader(name, value);
+            }
+            else
+            {
+                m_Req.SendKnownResponseHeader(index, value);
+            }
+        }
+
+        public void SendBodyData(byte[]! data)
+        {
+            byte[] reborn = MarshallBytes(data);
+            m_Req.SendResponseFromMemory(reborn, reborn.Length);
+        }
+
+        public void SendBodyData([Claims] byte[]! in ExHeap data)
+        {
+            m_Req.SendResponseFromMemory(Bitter.ToByteArray(data), data.Length);
+            delete data;
+        }
+
+        public void Done()
+        {
+            m_Req.FlushResponse(true);
+            m_Req.EndOfRequest();
+        }
+    }
+}
diff --git a/base/Applications/cassini/Singularity/LocalHttpRequest.cs b/base/Applications/cassini/Singularity/LocalHttpRequest.cs
new file mode 100644
index 0000000..6096ebb
--- /dev/null
+++ b/base/Applications/cassini/Singularity/LocalHttpRequest.cs
@@ -0,0 +1,169 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RemoteHttpRequest.sg
+//
+//  Note:
+//    This file wraps a cassini Request object so it is callable through
+//    the Microsoft.Singularity.WebApps.IHttpRequest interface that web
+//    applications understand.
+//    regular object.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.WebApps;
+using System.Web;
+using System.Threading;
+
+namespace Microsoft.VisualStudio.WebHost
+{
+    internal class LocalHttpRequest : IHttpRequest
+    {
+        private Request m_Req;
+        private byte[] cachedBodyData = null;
+        private Mutex bodyDataMutex = new Mutex();
+
+        internal LocalHttpRequest(Request request)
+        {
+            m_Req = request;
+        }
+
+        public string! GetUriPath()
+        { return (!)m_Req.GetUriPath(); }
+
+        public string GetQueryString()
+        { return m_Req.GetQueryString(); }
+
+        public string GetVerb()
+        { return m_Req.GetHttpVerbName(); }
+
+        public string GetHeader(string! headerName)
+        {
+            int knownIndex = HttpWorkerRequest.GetKnownRequestHeaderIndex(headerName);
+
+            if (knownIndex > 0) {
+                return m_Req.GetKnownRequestHeader(knownIndex);
+            } else {
+                return m_Req.GetUnknownRequestHeader(headerName);
+            }
+        }
+
+        public string! GetRemoteAddress()
+        { return m_Req.GetRemoteAddress(); }
+
+        // Caller should not modify this buffer!
+        public byte[] GetBodyData()
+        {
+            if (m_Req.IsEntireEntityBodyIsPreloaded()) {
+                // Return a copy of the preloaded body and trust the
+                // caller not to monkey with it.
+                return m_Req.GetPreloadedEntityBody();
+            } else {
+
+                int totalBodyLength = m_Req.GetTotalEntityBodyLength();
+
+                if (totalBodyLength == 0) {
+                    return null; // No body expected at all
+                }
+                // Else there is body data that wasn't received as part of
+                // the initial request.
+
+                if (cachedBodyData == null) {
+                    try {
+                        bodyDataMutex.AcquireMutex();
+
+                        if (cachedBodyData != null) {
+                            // Someone loaded this concurrently to us
+                            return cachedBodyData;
+                        }
+
+                        byte[] preloadedBody = m_Req.GetPreloadedEntityBody();
+                        int preloadedLength = m_Req.GetPreloadedEntityBodyLength();
+                        byte[] body = new byte[totalBodyLength];
+
+                        if ((preloadedLength > 0) && (preloadedBody != null)) {
+                            // First copy the cached portion
+                            Buffer.BlockCopy(preloadedBody, 0,
+                                             body, 0, preloadedLength);
+                        } else {
+                            assert ((preloadedBody == null) && (preloadedLength == 0));
+                        }
+
+                        // Now read in any remainder
+                        int remainder = totalBodyLength - preloadedLength;
+                        assert remainder > 0; // Tested earlier
+
+                        while (remainder > 0) {
+                            int readBytes = m_Req.ReadEntityBody(body, totalBodyLength - remainder,
+                                                                 remainder);
+
+                            if (readBytes == 0) {
+                                // Body wasn't as long as we were expecting for some
+                                // reason! This could be because the remote client
+                                // lied to us in the headers. Truncate the cached
+                                // data to the actual body size.
+                                byte[] shortBody = new byte[totalBodyLength - remainder];
+                                Array.Copy(body, 0, shortBody, 0, totalBodyLength - remainder);
+                                body = shortBody;
+                                remainder = 0; // No more data will be forthcoming
+                            } else {
+                                remainder -= readBytes;
+                            }
+                        }
+
+                        // Stash this for other callers
+                        cachedBodyData = body;
+                    }
+                    finally {
+                        bodyDataMutex.ReleaseMutex();
+                    }
+                }
+                // else we previously cached the body data.
+
+                return cachedBodyData;
+            }
+        }
+
+        public void SendStatus(int code, string! description)
+        { m_Req.SendStatus(code, description); }
+
+        public void SendHeader(string! name, string! value)
+        {
+            int index = HttpWorkerRequest.GetKnownResponseHeaderIndex(name);
+
+            if (index == -1)
+            {
+                m_Req.SendUnknownResponseHeader(name, value);
+            }
+            else
+            {
+                m_Req.SendKnownResponseHeader(index, value);
+            }
+        }
+
+        public void SendBodyData(byte[]! data)
+        {
+            m_Req.SendResponseFromMemory(data, data.Length);
+            m_Req.FlushResponse(false); // always transmit immediately
+        }
+
+        public void SendBodyData([Claims] byte[]! in ExHeap data)
+        {
+            m_Req.SendResponseFromMemory(data);
+            m_Req.FlushResponse(false); // always transmit immediately
+        }
+
+        public void Done()
+        {
+            m_Req.FlushResponse(true);
+            m_Req.EndOfRequest();
+        }
+    }
+}
diff --git a/base/Applications/echo/echo.csproj b/base/Applications/echo/echo.csproj
new file mode 100644
index 0000000..c478117
--- /dev/null
+++ b/base/Applications/echo/echo.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>echo.sg</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="echo.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/echo/echo.sg b/base/Applications/echo/echo.sg
new file mode 100644
index 0000000..318e7c8
--- /dev/null
+++ b/base/Applications/echo/echo.sg
@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Echo.cs
+//
+//  Note:   Singularity pipe test program.
+//
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Echo stdin to stdout", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Echo.AppMain(this);
+        }
+    }
+
+    public class Echo
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            while (true) {
+                string a = Console.ReadLine();
+                if (a == null) {
+                    break; 
+                } 
+                Console.WriteLine(a);
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/iso9660/Iso9660.proj b/base/Applications/iso9660/Iso9660.proj
new file mode 100644
index 0000000..b015e98
--- /dev/null
+++ b/base/Applications/iso9660/Iso9660.proj
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <ItemGroup>
+    <ProjectReference Include="cddump\cddump.csproj"/>
+    <ProjectReference Include="cdmount\cdmount.csproj"/>
+    <ProjectReference Include="cdunmount\cdunmount.csproj"/>    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Applications/iso9660/cddump/cddump.csproj b/base/Applications/iso9660/cddump/cddump.csproj
new file mode 100644
index 0000000..712e378
--- /dev/null
+++ b/base/Applications/iso9660/cddump/cddump.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>cddump</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="cddump.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/iso9660/cddump/cddump.sg b/base/Applications/iso9660/cddump/cddump.sg
new file mode 100644
index 0000000..0222b15
--- /dev/null
+++ b/base/Applications/iso9660/cddump/cddump.sg
@@ -0,0 +1,160 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   cddump.sg
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Channels;
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Iso9660.CDDump
+{
+    [ConsoleCategory(HelpMessage="Dump CD device", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "devName", Mandatory=true, Position=0, HelpMessage="Name of device.")]
+        internal string device;
+        
+        [LongParameter( "blocks", Mandatory=true, Position=1, HelpMessage="Number of blocks to dump.")]
+        internal long blocks;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Iso9660.AppMain(this);
+        }
+    }
+
+    public class Iso9660
+    {
+        private static void dump (byte[]! in ExHeap data)
+        {
+            string s = "0000:  00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00  ................";
+                     // 0123456789012345678901234567890123456789012345678901234567890123456789012
+            string h = "0123456789abcdef";
+
+            char []str; str = new char[72]; for (int n = 0; n < 72; n++) str[n] = s[n];
+            char []hex; hex = new char[16]; for (int n = 0; n < 16; n++) hex[n] = h[n];
+
+            for (int i = 0; i < 2048; i += 16) {
+                if ((i > 0) && (i % 128 == 0)) {
+                    Console.WriteLine ("-- more --\r");
+                    int key = Console.Read();
+                    if (key != ' ' && key != '\n')
+                        break;
+                }
+                int z = i/256;
+                int y = i%256;
+
+                str[0] = hex[z/16];
+                str[1] = hex[z%16];
+
+                str[2] = hex[y/16];
+                str[3] = hex[y%16];
+
+                for (int j = 0; j < 16; j++) {
+                    int x = data[i+j] & 255;
+
+                    str[7+3*j] = hex[x/16];
+                    str[8+3*j] = hex[x%16];
+
+                    str[56+j] = (31 < x && x < 127)? (char)x: '.';
+                }
+                string dmp = ""; for (int n = 0; n < 72; n++) dmp += str[n];
+
+                Console.WriteLine (dmp);
+            }
+        }
+
+        public static DiskDeviceContract.Imp:Ready OpenDevice(DirectoryServiceContract.Imp:Ready! ns, String! devname)
+        {
+            DiskDeviceContract.Exp! exp;
+            DiskDeviceContract.Imp! imp;
+            DiskDeviceContract.NewChannel(out imp, out exp);
+
+            ErrorCode errorOut;
+            bool success;
+            success  = SdsUtils.Bind(devname,ns, exp, out errorOut);
+            if (!success)
+            {
+                Console.WriteLine("Bind of {0} failed. Reason:{1}\n",
+                                 devname, SdsUtils.ErrorCodeToString(errorOut));
+                delete imp;
+                return null;
+            }
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    Console.WriteLine("{0} does not support DiskDevice", devname);
+                    delete imp;
+                    return null;
+                case imp.ChannelClosed():
+                    Console.WriteLine("DiskDevice channel to {0} closed unexpectedly", devname);
+                    delete imp;
+                    return null;
+            }
+
+            return imp;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ulong n = (ulong) config.blocks; 
+            
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            
+            ds.RecvSuccess();
+
+            DiskDeviceContract.Imp disk = OpenDevice (ds, config.device);
+            if (disk == null) {
+                delete ds; 
+                return 1;
+            }
+
+            byte[] in ExHeap buffer = new [ExHeap] byte [2048];
+            disk.SendRead (buffer, 0, 2048, n);
+
+            byte[]! in ExHeap data;
+            disk.RecvAckRead (out data);
+
+            dump (data);
+
+            delete data;
+            delete disk;
+            delete ds; 
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/iso9660/cdmount/cdmount.csproj b/base/Applications/iso9660/cdmount/cdmount.csproj
new file mode 100644
index 0000000..7bb6e02
--- /dev/null
+++ b/base/Applications/iso9660/cdmount/cdmount.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>cdmount</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="cdmount.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/iso9660/cdmount/cdmount.sg b/base/Applications/iso9660/cdmount/cdmount.sg
new file mode 100644
index 0000000..c82d1de
--- /dev/null
+++ b/base/Applications/iso9660/cdmount/cdmount.sg
@@ -0,0 +1,138 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Mount  CD device", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "devName", Mandatory=true, Position=0, HelpMessage="Name of device.")]
+        internal string device;
+
+        [StringParameter( "location", Mandatory=true, Position=1, HelpMessage="Mount Location.")]
+        internal string location;
+
+        [BoolParameter( "s", Default=false, HelpMessage="Silent.")]
+        internal bool silent;
+        
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return CdMount.AppMain(this);
+        }
+    }
+
+    public class CdMount
+    { 
+        public static void WriteLineWrapper(string format, params object[] args) {
+            if (!silent) {
+                Console.WriteLine(format, args);
+            }
+        }
+        
+        public static void WriteWrapper(string format, params object[] args) {
+            if (!silent) {
+                Console.Write(format, args);
+            }
+        }
+        
+        
+        public static bool silent = false;
+        public const string ControlLocation = "/CdCtrl";
+        
+        internal static int AppMain(Parameters! config)
+        {
+            String! rawDevice; 
+            String! location; 
+            
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            ds.RecvSuccess();
+            
+            rawDevice = config.device; 
+            location  = config.location; 
+            
+            WriteLineWrapper(" Mounting " + rawDevice + " at " + 
+                location);
+            
+                        
+            Iso9660ServiceControlContract.Imp! controlClient;
+            Iso9660ServiceControlContract.Exp! controlServer;
+            Iso9660ServiceControlContract.NewChannel(
+                out controlClient, out controlServer);
+            
+            ErrorCode errorOut; 
+            bool ok = SdsUtils.Bind(ControlLocation, ds, controlServer, out errorOut);
+            if (!ok) {
+                    Console.WriteLine("Bind failed on " + ControlLocation);
+                    Console.WriteLine("Is iso9660 complied and running?");
+                    delete controlClient; 
+                    delete ds; 
+                    return 0; 
+            } 
+            controlClient.RecvSuccess();
+           
+            WriteLineWrapper("Initializing...");
+            controlClient.SendInitialize(Bitter.FromString2(rawDevice));
+            switch receive {
+                case controlClient.NackInitialize():
+                    Console.WriteLine("Initialize failed. :(");
+                    delete ds; 
+                    delete controlClient; 
+                    return -1;
+                    break;
+                case controlClient.AckInitialize():
+                    WriteWrapper("Initialize succeeded;");
+                    break;
+                case controlClient.ChannelClosed():
+                    throw new Exception("controlClient channel closed");
+            }
+            
+            WriteLineWrapper(" sending mount...");
+            controlClient.SendMount(Bitter.FromString2(location));
+            switch receive {
+                case controlClient.NackMount():
+                    Console.WriteLine("Mount failed. :(");
+                    break;
+                case controlClient.AckMount():
+                    Console.WriteLine("Mount succeeded.");
+                    break;
+                case controlClient.ChannelClosed():
+                    throw new Exception("controlClient channel closed");
+            }
+            
+            delete ds; 
+            delete controlClient; 
+            
+            return 0;
+        }
+	}
+}
diff --git a/base/Applications/iso9660/cdunmount/cdunmount.csproj b/base/Applications/iso9660/cdunmount/cdunmount.csproj
new file mode 100644
index 0000000..3912e9d
--- /dev/null
+++ b/base/Applications/iso9660/cdunmount/cdunmount.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>cdunmount</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="cdunmount.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/iso9660/cdunmount/cdunmount.sg b/base/Applications/iso9660/cdunmount/cdunmount.sg
new file mode 100644
index 0000000..a9f75c4
--- /dev/null
+++ b/base/Applications/iso9660/cdunmount/cdunmount.sg
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Mount  CD device", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [BoolParameter( "s", Default=false, HelpMessage="Silent.")]
+        internal bool silent;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return CdUnmount.AppMain(this);
+        }
+    }
+    
+    public class CdUnmount
+    { 
+        public static void WriteLineWrapper(string format, params object[] args) {
+            if (!silent) {
+                Console.WriteLine(format, args);
+            }
+        }
+        
+        public static void WriteWrapper(string format, params object[] args) {
+            if (!silent) {
+                Console.Write(format, args);
+            }
+        }
+        
+        
+        public static bool silent = false;
+        public const string ControlLocation = "/CdCtrl";
+        internal static int AppMain(Parameters! config)
+        {
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            
+            ds.RecvSuccess();
+
+            silent = config.silent;
+            
+            Iso9660ServiceControlContract.Imp! controlClient;
+            Iso9660ServiceControlContract.Exp! controlServer;
+            Iso9660ServiceControlContract.NewChannel(
+                out controlClient, out controlServer);
+            
+            ErrorCode errorOut; 
+            bool ok = SdsUtils.Bind(ControlLocation, ds, controlServer, out errorOut);
+            if (!ok) {
+                    delete controlClient; 
+                    delete ds;
+                    WriteLineWrapper("Error binding to " + ControlLocation + " reason " 
+                                + SdsUtils.ErrorCodeToString(errorOut) );
+                    return 0; 
+            } 
+            else {
+                    WriteLineWrapper("Bind of "+ControlLocation+
+                        " succeeded!");
+            }
+            
+            controlClient.RecvSuccess();
+           
+            WriteLineWrapper("Unmounting...");
+            controlClient.SendUnmount();
+            switch receive {
+                case controlClient.NackUnmount():
+                    Console.WriteLine("Unmount failed. :(");
+                    delete ds; 
+                    delete controlClient; 
+                    return -1;
+                    break;
+                case controlClient.AckUnmount():
+                    Console.WriteLine("Unmount succeeded.");
+                    break;
+                case controlClient.ChannelClosed():
+                    throw new Exception("controlClient channel closed");
+            }
+            
+            delete ds; 
+            delete controlClient;
+            
+            WriteWrapper("Restarting Iso9660...");
+            Process p = new Process(new string[] {"iso9660"});
+            p.Start();
+            p.Dispose(true);
+            WriteLineWrapper("done.");
+            
+            return 0;
+        }
+	}
+}
diff --git a/base/Applications/jobtest/JobTest.sg b/base/Applications/jobtest/JobTest.sg
new file mode 100644
index 0000000..d1e5ec0
--- /dev/null
+++ b/base/Applications/jobtest/JobTest.sg
@@ -0,0 +1,221 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Echo.cs
+//
+//  Note:   Singularity pipe test program.
+//
+using System;
+using System.Collections;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.ConsoleApplications;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Echo stdin to stdout", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Echo.AppMain(this);
+        }
+    }
+
+    public class Echo
+    {
+            // kinda dumb...
+        private static bool CommandLineSyntaxCheck(string! commandLine)
+        {
+            int quoteCount = 0;
+            for (int i = 0; i < commandLine.Length; i++) {
+                if (commandLine[i] == '\'') {
+                    quoteCount++;
+                }
+            }
+
+            return (quoteCount % 2 == 0);
+        }
+
+        private static bool InSeparators(char c, char []! separators)
+        {
+            for (int i = 0; i < separators.Length; i++)
+            {
+                if (separators[i] == c)
+                    return true;
+            }
+            return false;
+        }
+
+        private static ArrayList! Tokenize(string! input, int last,
+                                           char []! separators)
+        {
+            ArrayList tokens = new ArrayList();
+
+            for (int i = 0; i <= last;)
+            {
+                // Skip separators
+                while (i <= last && InSeparators(input[i], separators))
+                {
+                    i++;
+                }
+
+                if (i > last)
+                    break;
+
+                // Try to slurp word
+                int start = i;
+                while (i <= last &&
+                       !InSeparators(input[i], separators) &&
+                       input[i] != '\'')
+                {
+                    i++;
+                }
+                if (i != start)
+                {
+                    tokens.Add(input.Substring(start, i - start));
+                }
+
+                // Skip separators
+                while (i <= last && InSeparators(input[i], separators))
+                {
+                    i++;
+                }
+
+                if (i > last)
+                    break;
+
+                // Try to quoted slurp word
+                if (input[i] == '\'')
+                {
+                    start = i;
+                    i++;
+                    while (i <= last && input[i] != '\'')
+                    {
+                        i++;
+                    }
+
+                    if (i <= last && input[i] == '\'')
+                    {
+                        tokens.Add(input.Substring(start + 1, i - start - 1));
+                        i++;
+                    }
+                    else
+                    {
+                        tokens.Add(input.Substring(start, i - start));
+                        i++;
+                    }
+                }
+            } // end for
+
+            return tokens;
+        }
+
+        private static void BreakCommandLine(string!       input,
+                                             char []!      separators,
+                                             out string    command,
+                                             out string[]! commandArguments,
+                                             out bool      isBackground)
+        {
+            isBackground = false;
+
+            if (!CommandLineSyntaxCheck(input)) {
+                command = "";
+                commandArguments = new string[0];
+                return;
+            }
+
+            // Scan for trailing ampersand first
+            int last = input.Length - 1;
+            while (last > 0 && InSeparators(input[last], separators))
+            {
+                last--;
+            }
+
+            if (input[last] == '&')
+            {
+                isBackground = true;
+                last--;
+            }
+
+            ArrayList tokens = Tokenize(input, last, separators);
+
+            if (tokens.Count == 0)
+            {
+                command = "";
+                commandArguments = new string[0];
+                isBackground = false;
+                return;
+            }
+
+            command = (string) tokens[0];
+            commandArguments = new string [tokens.Count];
+            for (int i = 0; i < tokens.Count; i++)
+            {
+                commandArguments[i] = (string) tokens[i];
+            }
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            string commandName;
+            string[]! commandArguments; 
+            bool isBackground; 
+   
+            DirectoryServiceContract.Imp ds = config.nsRef.Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            ds.RecvSuccess();
+            assert ds.InState(DirectoryServiceContract.Ready.Value);
+           
+            JobControl  jobControl =  ConsoleJob.StartOutputPipeThread();
+            ParameterProcessor parameterProcessor = new ParameterProcessor();
+
+            while (true) {
+                Console.Write("enter job>");
+                string a = Console.ReadLine();
+                if (a == null || a == "q") {
+                    break; 
+                } 
+                if (a == "") continue;
+                
+                BreakCommandLine(a, new char[] {' '},
+                                out commandName, out commandArguments,
+                                out isBackground);
+
+                ConsoleJob job = new ConsoleJob(); 
+                if (job.CreateProcess(ds, jobControl, commandArguments, parameterProcessor)) { 
+                    job.Start(); 
+                    if (!isBackground) job.WaitForJob();
+                }
+                job.Dispose();
+                Console.WriteLine(a);
+            }
+            jobControl.Dispose();
+            delete ds;
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/jobtest/jobtest.csproj b/base/Applications/jobtest/jobtest.csproj
new file mode 100644
index 0000000..63333bd
--- /dev/null
+++ b/base/Applications/jobtest/jobtest.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>jobtest</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="JobTest.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Manifest\Manifest.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml2\Singularity.Xml2.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/perf/Perf.csproj b/base/Applications/perf/Perf.csproj
new file mode 100644
index 0000000..51c7b3b
--- /dev/null
+++ b/base/Applications/perf/Perf.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Perf</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Perf.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+</Project>
diff --git a/base/Applications/perf/Perf.sg b/base/Applications/perf/Perf.sg
new file mode 100644
index 0000000..d80e887
--- /dev/null
+++ b/base/Applications/perf/Perf.sg
@@ -0,0 +1,133 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TaskList.cs
+//
+//  Note:   Simple Windows XP-like TaskList program.
+//
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="get a snapshot of channel stats",
+                     DefaultAction=true)]
+    internal sealed class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<ChannelContract.Imp:Start> channelRef;
+
+        [LongParameter( "r", Default=-1, HelpMessage="Repeat every <n> seconds")]
+        internal long pauseSeconds;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Perf.AppMain(this);
+        }
+    }
+    public class Perf
+    {
+
+        public struct ChannelStats 
+        {
+            public long msgs; 
+            public long bytes; 
+            public long channelsCreated; 
+        }
+        
+
+        public static ChannelStats GetChannelStats(ChannelContract.Imp! imp)
+        {
+            imp.SendGetChannelStats();
+            ChannelStats c;
+            imp.RecvChannelStats(out c.msgs,  out c.bytes, out c.channelsCreated);
+            return c;
+        }
+
+        /// <summary>
+        /// Use this method to write output to both the screen and the debugger if toDebugger is true.
+        /// </summary>
+        public static void WriteLine(bool toDebugger, string format, params object[] args) {
+            string s = String.Format(format, args);
+            Console.WriteLine(s);
+            if (toDebugger) {
+                DebugStub.WriteLine(s);
+            }
+        } 
+
+        public static void WriteLine(bool toDebugger) {
+            Console.WriteLine();
+            if (toDebugger) {
+                DebugStub.WriteLine();
+            }
+        } 
+
+        internal static int AppMain(Parameters! config)
+        {
+            ChannelStats stats;
+
+            // Set the default options
+            int pauseSeconds = (int) config.pauseSeconds;
+            bool dumpTable = false; 
+
+            ChannelContract.Imp imp = config.channelRef.Acquire(); 
+            imp.RecvReady();
+
+            do
+            {
+                long startSwitchCount;
+                startSwitchCount = ProcessService.GetContextSwitchCount();
+
+                long threadCount = ProcessService.GetThreadsCreatedCount(); 
+                
+                try
+                {
+                    stats = GetChannelStats(imp);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error retrieving channel data.");
+                    Console.WriteLine(ex.ToString());
+                    return 1;
+                }
+
+                // Display the results
+                long avg = stats.bytes / stats.msgs; 
+                Console.WriteLine();
+                WriteLine(dumpTable, "swi= {0}, msgsSent={1}, threadsCreated={2}, bytesSent={3}K, channelsCreated={4}, avg bytes/msg={5}.",
+                     startSwitchCount, stats.msgs, threadCount, stats.bytes/1024, stats.channelsCreated, avg);
+
+                if (pauseSeconds >= 0 ) Thread.Sleep(pauseSeconds * 1000); 
+                
+          } while (pauseSeconds >= 0);
+            delete imp;
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/procmeminfo/ProcMemInfo.csproj b/base/Applications/procmeminfo/ProcMemInfo.csproj
new file mode 100644
index 0000000..a319cf0
--- /dev/null
+++ b/base/Applications/procmeminfo/ProcMemInfo.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ProcMemInfo</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ProcMemInfo.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/procmeminfo/ProcMemInfo.sg b/base/Applications/procmeminfo/ProcMemInfo.sg
new file mode 100644
index 0000000..16532c6
--- /dev/null
+++ b/base/Applications/procmeminfo/ProcMemInfo.sg
@@ -0,0 +1,650 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcMemInfo.cs
+//
+//
+//  Note:   Simple Windows XP-like ProcMemInfo program.
+//
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage=
+                     "ProcMemInfo [options] Display Processor Cache info",
+                     DefaultAction=true)]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [Endpoint]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<ProcMemInfoContract.Imp:Start> pmInfoRef;
+
+        [BoolParameter( "d", Default=true , HelpMessage=
+                        "Dumps output and PageTable to Debugger.")]
+        internal bool dumpTable;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return ProcMemInfo.AppMain(this);
+        }
+    }
+
+    public class ProcMemInfo
+    {
+        // Check if processor is Intel/AMD
+        internal static bool isIntel(uint ebx, uint ecx, uint edx)
+        {
+            if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        // Check if processor is Intel/AMD
+        internal static bool isAMD(uint ebx, uint ecx, uint edx)
+        {
+            if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        // Call CPUID with all possible inputs (EAX=1-5,8000_0001-8000_000A)
+        internal static void DoTestAllCpuId(Parameters! config)
+        {
+            bool dumpTable = config.dumpTable;
+            uint v0, v1, v2, v3;
+
+            WriteLine(dumpTable, "\n");
+            WriteLine(dumpTable, "----------------------------------------");
+            WriteLine(dumpTable, "TESTING ALL CPUID     ");
+            WriteLine(dumpTable, "----------------------------------------\n");
+
+            for (uint i = 0; i < 6; i++) {
+                Processor.ReadCpuid(i, out v0, out v1, out v2, out v3);
+                WriteLine(dumpTable, "{0:x8} : {1:x8}.{2:x8}.{3:x8}.{4:x8}",
+                          i, v0, v1, v2, v3);
+            }
+            for (uint i = 0x80000000; i < 0x80000010; i++) {
+                Processor.ReadCpuid(i, out v0, out v1, out v2, out v3);
+                WriteLine(dumpTable, "{0:x8} : {1:x8}.{2:x8}.{3:x8}.{4:x8}",
+                          i, v0, v1, v2, v3);
+            }
+            WriteLine(dumpTable, "\n");
+        }
+
+        // Get AMD Processor Cache Information
+        internal static void GetAmdInfo(Parameters! config)
+        {
+            bool dumpTable = config.dumpTable;
+            uint v0, v1, v2, v3;
+
+            WriteLine(dumpTable, "\n");
+            WriteLine(dumpTable, "----------------------------------------");
+            WriteLine(dumpTable, "PROCESSOR CACHE INFORMATION (from CPUID)");
+            WriteLine(dumpTable, "----------------------------------------\n");
+
+            // Call CPUID with Input EAX=1, 8000_0005H and 8000_0006H
+            GetAmdInput1(config);
+            GetAmdInput85(config);
+            GetAmdInput86(config);
+        }
+
+        // EAX = 1
+        //   a : Processor Signature
+        //   b : Initial APIC ID, CLFLUSH Size, Brand ID
+        //   c : Reserved
+        //   d : Standard Feature support
+        internal static void GetAmdInput1(Parameters! config)
+        {
+            uint a, b, c, d;
+            uint eax = 1;
+            bool dumpTable = config.dumpTable;
+
+            Processor.ReadCpuid(eax, out a, out b, out c, out d);
+
+            // -------------------------------------- output EAX
+            uint stepping = (a & 0x0000000f);
+            uint model    = (a & 0x000000f0) >> 4;
+            uint family   = (a & 0x00000f00) >> 8;
+            uint xModel   = (a & 0x000f0000) >> 16;
+            uint xFamily  = (a & 0x0ff00000) >> 20;
+
+            // from AMD, CPUID manual:
+            // computing effective family/model computation
+            uint effFamily = family;
+            if (family == 0x0f) {
+                effFamily = (xFamily + family);
+            }
+            uint effModel = model;
+            if (family == 0x0f) {
+                effModel = (xModel << 4) + model;
+            }
+
+            /// -------------------------------------- output EBX
+            uint brandId = (b & 0x000000ff);
+            uint clflush = (b & 0x0000ff00) >> 8;
+            uint apicId  = (b & 0xff000000) >> 24;
+
+            Write(dumpTable, "\nInput EAX={0:x8} ", eax);
+            Write(dumpTable,"output:{1:x8}.{2:x8}.{3:x8}.{4:x8}\n\n",
+                  eax, a, b, c, d);
+
+            if (a == 0 && b == 0 && c == 0 && d == 0) {
+                return;
+            }
+
+            WriteLine(dumpTable, "  Output EAX:");
+            WriteLine(dumpTable, "      Stepping  {0}", stepping);
+            WriteLine(dumpTable, "      Model     {0}", model);
+            WriteLine(dumpTable, "      Family    {0}", family);
+            WriteLine(dumpTable, "      xModel    {0}", xModel);
+            WriteLine(dumpTable, "      xFamily   {0}", xFamily);
+            WriteLine(dumpTable, "      effFamily {0}", effFamily);
+            WriteLine(dumpTable, "      effModel  {0}", effModel);
+            WriteLine(dumpTable, "  Output EBX:");
+            WriteLine(dumpTable, "      Brand Id      {0}", brandId);
+            WriteLine(dumpTable, "      CLFLUSH Size  {0}", clflush);
+            WriteLine(dumpTable, "      APIC ID       {0}", apicId);
+
+            // -------------------------------------- output EDX
+            WriteLine(dumpTable, "  Output EDX:");
+            Write(dumpTable, "      ");
+            if ((d & 0x1) > 0)       { Write(dumpTable, "x87  "); }
+            if ((d & 0x2) > 0)       { Write(dumpTable, "VME  "); }
+            if ((d & 0x4) > 0)       { Write(dumpTable, "DBG  "); }
+            if ((d & 0x8) > 0)       { Write(dumpTable, "PSE  "); }
+            if ((d & 0x10) > 0)      { Write(dumpTable, "TSC  "); }
+            if ((d & 0x20) > 0)      { Write(dumpTable, "MSR  "); }
+            if ((d & 0x40) > 0)      { Write(dumpTable, "PAE  "); }
+            if ((d & 0x80) > 0)      { Write(dumpTable, "MCE  "); }
+            Write(dumpTable, "\n      ");
+            if ((d & 0x100) > 0)     { Write(dumpTable, "CX8  "); }
+            if ((d & 0x200) > 0)     { Write(dumpTable, "APIC "); }
+            if ((d & 0x200) > 0)     { Write(dumpTable, "R0   "); }
+            if ((d & 0x800) > 0)     { Write(dumpTable, "SEP  "); }
+            if ((d & 0x1000) > 0)    { Write(dumpTable, "MTRR "); }
+            if ((d & 0x2000) > 0)    { Write(dumpTable, "PGE  "); }
+            if ((d & 0x4000) > 0)    { Write(dumpTable, "MCA  "); }
+            if ((d & 0x8000) > 0)    { Write(dumpTable, "CMOV "); }
+            Write(dumpTable, "\n      ");
+            if ((d & 0x10000) > 0)   { Write(dumpTable, "PAT  "); }
+            if ((d & 0x20000) > 0)   { Write(dumpTable, "P36  "); }
+            if ((d & 0x40000) > 0)   { Write(dumpTable, "R1   "); }
+            if ((d & 0x80000) > 0)   { Write(dumpTable, "CFL  "); }
+            if ((d & 0x100000) > 0)  { Write(dumpTable, "R2   "); }
+            if ((d & 0x200000) > 0)  { Write(dumpTable, "R3   "); }
+            if ((d & 0x400000) > 0)  { Write(dumpTable, "R4   "); }
+            if ((d & 0x800000) > 0)  { Write(dumpTable, "MMX  "); }
+            Write(dumpTable, "\n      ");
+            if ((d & 0x1000000) > 0) { Write(dumpTable, "FXSR "); }
+            if ((d & 0x2000000) > 0) { Write(dumpTable, "SSE  "); }
+            if ((d & 0x4000000) > 0) { Write(dumpTable, "SSE2 "); }
+            if ((d & 0x8000000) > 0) { Write(dumpTable, "R5   "); }
+            if ((d & 0x10000000) > 0){ Write(dumpTable, "R6   "); }
+            if ((d & 0x20000000) > 0){ Write(dumpTable, "R7   "); }
+            if ((d & 0x40000000) > 0){ Write(dumpTable, "R8   "); }
+            if ((d & 0x80000000) > 0){ Write(dumpTable, "R9   "); }
+            Write(dumpTable, "\n");
+        }
+
+        // EAX = 8000_0005
+        //   a : TLB Bits for 2 MB and 4MB
+        //   b : TLB Bits for 4 KB
+        //   c : L1 Data Cache Bits
+        //   d : L1 Instruction Cache Bits
+        internal static void GetAmdInput85(Parameters! config)
+        {
+            uint a, b, c, d;
+            uint eax = 0x80000005;
+            bool dumpTable = config.dumpTable;
+
+            Processor.ReadCpuid(eax, out a, out b, out c, out d);
+
+            Write(dumpTable, "\nInput EAX={0:x8} ", eax);
+            Write(dumpTable,"output:{1:x8}.{2:x8}.{3:x8}.{4:x8}\n\n",
+                  eax, a, b, c, d);
+
+            if (a == 0 && b == 0 && c == 0 && d == 0) {
+                return;
+            }
+
+            uint a1 = (a & 0x000000ff) >> 0;
+            uint a2 = (a & 0x0000ff00) >> 8;
+            uint a3 = (a & 0x00ff0000) >> 16;
+            uint a4 = (a & 0xff000000) >> 24;
+
+            uint b1 = (b & 0x000000ff) >> 0;
+            uint b2 = (b & 0x0000ff00) >> 8;
+            uint b3 = (b & 0x00ff0000) >> 16;
+            uint b4 = (b & 0xff000000) >> 24;
+
+            uint c1 = (c & 0x000000ff) >> 0;
+            uint c2 = (c & 0x0000ff00) >> 8;
+            uint c3 = (c & 0x00ff0000) >> 16;
+            uint c4 = (c & 0xff000000) >> 24;
+
+            uint d1 = (d & 0x000000ff) >> 0;
+            uint d2 = (d & 0x0000ff00) >> 8;
+            uint d3 = (d & 0x00ff0000) >> 16;
+            uint d4 = (d & 0xff000000) >> 24;
+
+
+            // -------------------------------------- output EAX
+            WriteLine(dumpTable, "  Output EAX:");
+            WriteLine(dumpTable, "    2MB Inst TLB, Entries  {0}", a1);
+            WriteLine(dumpTable, "    2MB Inst TLB, Assctvy  {0}", Assoc(a2));
+            WriteLine(dumpTable, "    2MB Data TLB, Entries  {0}", a3);
+            WriteLine(dumpTable, "    2MB Data TLB, Assctvy  {0}", Assoc(a4));
+
+            // -------------------------------------- output EBX
+            WriteLine(dumpTable, "  Output EBX:");
+            WriteLine(dumpTable, "    4KB Inst TLB, Entries  {0}", b1);
+            WriteLine(dumpTable, "    4KB Inst TLB, Assctvy  {0}", Assoc(b2));
+            WriteLine(dumpTable, "    4KB Data TLB, Entries  {0}", b3);
+            WriteLine(dumpTable, "    4KB Data TLB, Assctvy  {0}", Assoc(b4));
+
+            // -------------------------------------- output ECX
+            WriteLine(dumpTable, "  Output ECX:");
+            WriteLine(dumpTable, "    L1 Data, Line Size     {0}", c1);
+            WriteLine(dumpTable, "    L1 Data, Lines/Tag     {0}", c2);
+            WriteLine(dumpTable, "    L1 Data, Assctvy       {0}", Assoc(c3));
+            WriteLine(dumpTable, "    L1 Data, Size (KB)     {0}", c4);
+
+            // -------------------------------------- output EDX
+            WriteLine(dumpTable, "  Output EDX:");
+            WriteLine(dumpTable, "    L1 Inst , Line Size    {0}", d1);
+            WriteLine(dumpTable, "    L1 Inst , Lines/Tag    {0}", d2);
+            WriteLine(dumpTable, "    L1 Inst , Assctvy      {0}", Assoc(d3));
+            WriteLine(dumpTable, "    L1 Inst , Size (KB)    {0}", d4);
+        }
+
+        // Convert associativity code to associativity in string
+        internal static string Assoc(uint associativity)
+        {
+            switch (associativity) {
+              case    0: return "Reserved";             break;
+              case    1: return "Direct Mapped";        break;
+              case 0xff: return "Fully Assoc";          break;
+              default  :
+                return string.Format("{0}-way", associativity);
+                break;
+            }
+        }
+
+        // Similar to Assoc() but specific for L2 cache
+        internal static string AssocL2(uint associativity)
+        {
+            switch (associativity) {
+              case    0: return "Off/Disabled";  break;
+              case    1: return "Direct Mapped"; break;
+              case 0x02: return "2-way";         break;
+              case 0x04: return "4-way";         break;
+              case 0x06: return "8-way";         break;
+              case 0x08: return "16-way";        break;
+              case 0x0f: return "Fully Assoc";   break;
+              default  :
+                return "Reserved (disabled?)";
+                break;
+            }
+        }
+
+        // Check if L2 is reserved according to the associativity code
+        internal static bool IsL2Reserved(uint associativity)
+        {
+            switch (associativity)
+            {
+              case    0:
+              case    1:
+              case 0x02:
+              case 0x04:
+              case 0x06:
+              case 0x08:
+              case 0x0f:
+                return false;
+                break;
+              default  :
+                return true;
+                break;
+            }
+        }
+
+        // EAX = 8000_0006
+        //   a : L2 TLB Bits for 2 MB / 4 MB pages
+        //   b : L2 TLB Bits for 4 KB
+        //   c : L2 Cache Bits
+        //   d : reserved
+        internal static void GetAmdInput86(Parameters! config)
+        {
+            uint a, b, c, d;
+            uint eax = 0x80000006;
+
+            bool dumpTable = config.dumpTable;
+
+            Processor.ReadCpuid(eax, out a, out b, out c, out d);
+
+            uint a1 = (a & 0x000000ff) >> 0;
+            uint a2 = (a & 0x0000ff00) >> 8;
+            uint a3 = (a & 0x00ff0000) >> 16;
+            uint a4 = (a & 0xff000000) >> 24;
+
+            uint b1 = (b & 0x000000ff) >> 0;
+            uint b2 = (b & 0x0000ff00) >> 8;
+            uint b3 = (b & 0x00ff0000) >> 16;
+            uint b4 = (b & 0xff000000) >> 24;
+
+            uint c1 = (c & 0x000000ff) >> 0;
+            uint c2 = (c & 0x0000ff00) >> 8;
+            uint c3 = (c & 0x00ff0000) >> 16;
+            uint c4 = (c & 0xff000000) >> 24;
+
+            Write(dumpTable, "\nInput EAX={0:x8} ", eax);
+            Write(dumpTable,"output:{1:x8}.{2:x8}.{3:x8}.{4:x8}\n\n",
+                  eax, a, b, c, d);
+
+            if (a == 0 && b == 0 && c == 0 && d == 0) {
+                return;
+            }
+
+            // -------------------------------------- output EAX
+            WriteLine(dumpTable, "  Output EAX:");
+            if (a2 == 0) {
+                WriteLine(dumpTable, "    2MB L2 Inst TLB is disabled");
+            }
+            else if (IsL2Reserved(a2)) {
+                WriteLine(dumpTable, "    2MB L2 Inst TLB is reserved");
+            }
+            else {
+                WriteLine(dumpTable, "    2MB L2 Inst TLB, Entries   {0}", a1);
+                WriteLine(dumpTable, "    2MB L2 Inst TLB, Assctvy   {0}",
+                          AssocL2(a2));
+            }
+            if (a4 == 0) {
+                WriteLine(dumpTable, "    2MB L2 Data TLB is disabled");
+            }
+            else if (IsL2Reserved(a4)) {
+                WriteLine(dumpTable, "    2MB L2 Inst TLB is reserved");
+            }
+            else {
+                WriteLine(dumpTable, "    2MB L2 Data TLB, Entries   {0}", a3);
+                WriteLine(dumpTable, "    2MB L2 Data TLB, Assctvy   {0}",
+                          AssocL2(a4));
+            }
+
+            // -------------------------------------- output EBX
+            WriteLine(dumpTable, "  Output EBX:");
+            if (b2 == 0) {
+                WriteLine(dumpTable, "    4KB L2 Inst TLB is disabled");
+            }
+            else if (IsL2Reserved(b2)) {
+                WriteLine(dumpTable, "    4KB L2 Inst TLB is reserved");
+            }
+            else {
+                WriteLine(dumpTable, "    4KB L2 Inst TLB, Entries  {0}", b1);
+                WriteLine(dumpTable, "    4KB L2 Inst TLB, Assctvy  {0}",
+                          AssocL2(b2));
+            }
+            if (b4 == 0) {
+                WriteLine(dumpTable, "    4KB L2 Data TLB is disabled");
+            }
+            else if (IsL2Reserved(b4))
+            {
+                WriteLine(dumpTable, "    4KB L2 Data TLB is reserved");
+            }
+            else
+            {
+                WriteLine(dumpTable, "    4KB L2 Data TLB, Entries   {0}", b3);
+                WriteLine(dumpTable, "    4KB L2 Data TLB, Assctvy   {0}",
+                          AssocL2(b4));
+            }
+
+            // -------------------------------------- output ECX
+            WriteLine(dumpTable, "  Output ECX:");
+            if (c3 == 0)
+            {
+                WriteLine(dumpTable, "    L2 Cache is disabled");
+            }
+            else if (IsL2Reserved(c3))
+            {
+                WriteLine(dumpTable, "    L2 Cache is reserved");
+            }
+            else
+            {
+                WriteLine(dumpTable, "    L2, Line Size              {0}", c1);
+                WriteLine(dumpTable, "    L2, Lines Per Tag          {0}", c2);
+                WriteLine(dumpTable, "    L2, Associativity          {0}", c3);
+                WriteLine(dumpTable, "    L2, Size (KB)              {0}", c4);
+            }
+        }
+
+        // Call GetCPUID
+        internal static void DoTestGetCpuId(Parameters! config)
+        {
+            bool intel = false, amd = false;
+            uint a, b, c, d;
+
+            Processor.ReadCpuid(0, out a, out b, out c, out d);
+            intel = isIntel(b, c, d);
+            amd = isAMD(b, c, d);
+
+            if (intel) {
+                // haryadi: I haven't implemented Intel config yet
+                // GetIntelInfo(config);
+            }
+            else if (amd) {
+                GetAmdInfo(config);
+            }
+        }
+
+        // Get Processor and Memory Affinity
+        internal static void DoTestGetAffinity(Parameters! config)
+        {
+            bool dumpTable = config.dumpTable;
+            ProcMemInfoContract.ProcessorAffinity[] in ExHeap processors;
+            ProcMemInfoContract.MemoryAffinity[] in ExHeap memories;
+
+            ProcMemInfoContract.Imp imp = config.pmInfoRef.Acquire();
+            if (imp == null) {
+                throw new ApplicationException("Error: Unable to bind to " +
+                                               ProcMemInfoContract.ModuleName);
+            }
+
+            imp.SendGetProcessorAffinity();
+            imp.RecvResultProcessorAffinity(out processors);
+
+            imp.SendGetMemoryAffinity();
+            imp.RecvResultMemoryAffinity(out memories);
+
+            WriteLine(dumpTable, "\n");
+            WriteLine(dumpTable, "----------------------------------------");
+            WriteLine(dumpTable, "PROCESSOR AFFINITY INFORMATION");
+            WriteLine(dumpTable, "----------------------------------------\n");
+
+            if (processors == null) {
+                WriteLine(dumpTable, "There is no Processor Affinity info!");
+            }
+            else {
+                WriteLine(dumpTable, "Found {0} processors\n",
+                          processors.Length);
+
+                for (int i = 0; i < processors.Length; i++) {
+                    WriteLine(dumpTable, "Processor #{0}", i);
+                    WriteLine(dumpTable, "    domain     : {0}",
+                              processors[i].domain);
+                    WriteLine(dumpTable, "    apicId     : {0}",
+                              processors[i].apicId);
+                    WriteLine(dumpTable, "    flagIgnore : {0}\n",
+                              processors[i].flagIgnore);
+                }
+            }
+
+            WriteLine(dumpTable, "\n");
+            WriteLine(dumpTable, "----------------------------------------");
+            WriteLine(dumpTable, "MEMORY AFFINITY INFORMATION");
+            WriteLine(dumpTable, "----------------------------------------\n");
+
+            if (memories == null) {
+                WriteLine(dumpTable, "There is no Memory Affinity info!");
+            }
+            else {
+                WriteLine(dumpTable, "Found {0} memory\n", memories.Length);
+
+                for (int i = 0; i < memories.Length; i++) {
+                    WriteLine(dumpTable, "Memory #{0}", i);
+                    WriteLine(dumpTable, "    domain      : {0}",
+                              memories[i].domain);
+                    WriteLine(dumpTable, "    baseAddress : {0} {1}",
+                              GetBigAddr(memories[i].baseAddress),
+                              GetBigAddrStr(memories[i].baseAddress));
+                    WriteLine(dumpTable, "    endAddress  : {0} {1}",
+                              GetBigAddr(memories[i].endAddress),
+                              GetBigAddrStr(memories[i].endAddress));
+                    WriteLine(dumpTable, "    memorySize  : {0} {1}",
+                              GetBigAddr(memories[i].memorySize),
+                              GetBigAddrStr(memories[i].memorySize));
+                    WriteLine(dumpTable, "    flagIgnore  : {0}",
+                              memories[i].flagIgnore);
+                    WriteLine(dumpTable, "    flagHotPlug : {0}",
+                              memories[i].flagHotPluggable);
+                    WriteLine(dumpTable, "    flagNonVoltl: {0}\n",
+                              memories[i].flagNonVolatile);
+                }
+            }
+            delete processors;
+            delete memories;
+            config.pmInfoRef.Release(imp);
+            return;
+        }
+
+        internal static ulong GetBigAddr(ulong address)
+        {
+            ulong KB = 1024;
+            ulong MB = KB * KB;
+            ulong GB = KB * KB * KB;
+
+            if (address > GB) {
+                return address / GB;
+            }
+            else if (address > MB) {
+                return address / MB;
+            }
+            else if (address > KB) {
+                return address / KB;
+            }
+            else {
+                return address;
+            }
+        }
+
+        internal static string GetBigAddrStr(ulong address)
+        {
+            ulong KB = 1024;
+            ulong MB = KB * KB;
+            ulong GB = KB * KB * KB;
+
+            if (address > GB) {
+                return "GB";
+            }
+            else if (address > MB) {
+                return "MB";
+            }
+            else if (address > KB) {
+                return "KB";
+            }
+            else {
+                return "B";
+            }
+        }
+
+        // Main
+        internal static int AppMain(Parameters! config)
+        {
+            // Set the default options
+            bool dumpTable = config.dumpTable;
+
+            WriteLine(dumpTable, "\nWelcome to ProcMemInfo ... \n\n");
+
+            // Test if ProcMemInfoContract is okay
+            ProcMemInfoContract.Imp imp3 = config.pmInfoRef.Acquire();
+            imp3.RecvReady();
+            config.pmInfoRef.Release(imp3);
+
+            try {
+                DoTestGetAffinity(config);
+                DoTestGetCpuId (config);
+                DoTestAllCpuId (config);
+            } catch (Exception ex) {
+                Console.WriteLine("Error .");
+                Console.WriteLine(ex.ToString());
+                return 1;
+            }
+
+            return 0;
+        }
+
+
+        /// <summary>
+        /// Use this method to write output to both the screen and the
+        /// debugger if toDebugger is true.
+        /// </summary>
+        public static void WriteLine(bool toDebugger, string format,
+                                     params object[] args) {
+            string s = String.Format(format, args);
+            Console.WriteLine(s);
+            if (toDebugger) {
+                DebugStub.WriteLine(s);
+            }
+        }
+
+        public static void Write(bool toDebugger, string format,
+                                 params object[] args) {
+            string s = String.Format(format, args);
+            Console.Write(s);
+            if (toDebugger) {
+                DebugStub.Write(s);
+            }
+        }
+
+        public static void WriteLine(bool toDebugger) {
+            Console.WriteLine();
+            if (toDebugger) {
+                DebugStub.WriteLine();
+            }
+        }
+
+    } // end of ProcMemInfo class
+} // end of Singularity.Applications
+
+
+
diff --git a/base/Applications/ptest/ptest.csproj b/base/Applications/ptest/ptest.csproj
new file mode 100644
index 0000000..19d0e0a
--- /dev/null
+++ b/base/Applications/ptest/ptest.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\ptest\ptest.csproj
+
+Note:   Test parameter matching code
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>ptest</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ptest.sg"/>
+    <BinaryResource Include="..\Play\Resources\*.wav">
+      <FieldName>Content</FieldName>
+      <ClassName>WavAudio</ClassName>
+      <Namespace>Microsoft.Singularity.Applications</Namespace>
+      <OutputAsArray>true</OutputAsArray>
+    </BinaryResource>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/Applications/ptest/ptest.sg b/base/Applications/ptest/ptest.sg
new file mode 100644
index 0000000..681a642
--- /dev/null
+++ b/base/Applications/ptest/ptest.sg
@@ -0,0 +1,231 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ptest.sg
+//
+//  Note:   test parameter matching code 
+//
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace app
+    {
+        [ConsoleCategory(HelpMessage="Parameter test program.", 
+                         DefaultAction=true)]
+        internal class PlayConfiguration 
+        {
+            private const string help1 = "this is a help message"; 
+            private const string helpForever = "this is a help for forever"; 
+            private const string helpNumThreads = "Number Of Threads to start"; 
+            private const string helpIsBool = "this is a help for isBool"; 
+
+            [InputEndpoint("data")]
+            //[Endpoint]
+            public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+            [OutputEndpoint("data")]
+            //[Endpoint]
+            public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+            [Endpoint]
+            public readonly TRef<SoundDeviceContract.Imp:Start> ImpRef;
+
+            [StringParameter( "filename", Mandatory=false, Default="hello world")]
+            internal string foo4;
+
+            [StringArrayParameter( "EverythingElse", Mandatory=false)]
+            internal string[] Args;
+
+            [StringParameter( "filename", Mandatory=false, Default="/fs/init", Position=0)]
+            internal string file;
+
+            [StringParameter( "string2", Mandatory=false)]
+            internal string string2;
+
+            [LongParameter( "numThreads", Mandatory=true, Default=1, HelpMessage=helpNumThreads)]
+            internal long numThreads;
+
+            [LongParameter( "numThreads2", Mandatory=false, Default=32, Position=1)]
+            internal long numThreads2;
+
+            [BoolParameter( "isBool", Mandatory=false, Default=false, HelpMessage=helpIsBool) ]
+            internal  bool isBool;
+
+            [BoolParameter( "isBool2", Mandatory=false, Default=true)]
+            internal  bool isBool2;
+
+            [BoolParameter( "forever", Mandatory=false, Default=false, HelpMessage=helpForever) ]
+            internal  bool forever;
+
+            reflective internal PlayConfiguration();
+
+            internal int AppMain() {
+                return Play.AppMain(this);
+            }
+        }
+
+
+        [ConsoleCategory(Action="action1", HelpMessage="Test action1.")]
+        internal class Action1
+        {
+            [InputEndpoint("data")]
+            public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+            [OutputEndpoint("data")]
+            public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+            [LongParameter( "count", HelpMessage="count", Default=1)]
+            internal long count;
+
+            [NotDelayed]
+            reflective internal Action1();
+
+            internal int AppMain() {
+                Console.WriteLine("Action1 invoked: count = {0}", count);
+                return 0;
+            }
+        }
+
+
+    // End of [TODO] marker
+
+    public class Play
+    {
+        private static SoundDeviceContract.Imp:Ready OpenSoundDevice(PlayConfiguration! config)
+        {
+            // extract imp handed in as part of process creation
+            SoundDeviceContract.Imp! imp = (config.ImpRef).Acquire();
+
+            // get it into the ready state
+            Console.WriteLine("[{0}] Waiting for SB channel.", Thread.CurrentThread.GetThreadId());
+            switch receive
+            {
+                case imp.Success():
+                    Console.WriteLine("[{0}] Got SB channel.", Thread.CurrentThread.GetThreadId());
+                    break;
+                case imp.ContractNotSupported():
+                    delete imp;
+                    throw new Exception("Didn't Get SB channel. (ContractNotSupported)");
+                case imp.ChannelClosed():
+                    delete imp;
+                    throw new Exception("Didn't Get SB channel. (Channel closed)");
+            }
+            return imp;
+        }
+
+        internal static int AppMain(PlayConfiguration! config)
+        {
+            Console.WriteLine("isBool ={0}", config.isBool); 
+            Console.WriteLine("isBool2 ={0}", config.isBool2); 
+            Console.WriteLine("forever ={0}", config.forever); 
+            Console.WriteLine("foo4 ={0}", config.foo4); 
+            Console.WriteLine("numThreads ={0}", config.numThreads); 
+            Console.WriteLine("numThreads2 ={0}", config.numThreads2); 
+            Console.WriteLine("string2 ={0}", config.string2); 
+    
+            string[] s = config.Args; 
+            if (s != null) {
+                for (int i=0; i< s.Length; i++) {
+                    Console.WriteLine("EverythingElse[{0}]={1}",i,s[i]);
+                } 
+            } 
+    
+            if (config.string2 == null) {
+                Console.WriteLine("string 2 is null (default)"); 
+            }
+            if (WavAudio.Content == null || WavAudio.Content.Length == 0) {
+                Console.WriteLine("No WAV audio to play.");
+                return 1;
+            }
+
+             if ( config.numThreads > 0 ) {
+                for (int i=0; i < config.numThreads; i++) {
+                    Thread t = new Thread(new ThreadStart(new Play(config).DoPlayThread));
+                    t.Start();
+                }
+             
+            }
+            else {
+                return DoPlay(config);
+            }
+
+            return 0;
+        }
+
+        PlayConfiguration! config;
+        private Play(PlayConfiguration! config) {
+            this.config = config;
+        }
+
+        public void DoPlayThread() {
+            DoPlay(this.config);
+        }
+
+        static int DoPlay(PlayConfiguration! config) {
+            SoundDeviceContract.Imp audio = OpenSoundDevice(config);
+            if (audio == null) {
+                Console.WriteLine("Couldn't open audio device.");
+                return 2;
+            }
+
+            int threadId = Thread.CurrentThread.GetThreadId();
+
+            assume WavAudio.Content != null;
+
+            try {
+                for (int i = 0; i < WavAudio.Content.Length; i++) {
+                    Console.WriteLine("[{1}] Playing WAV audio {0}.", i, threadId);
+
+                    byte[] wav = (!)WavAudio.Content[i];
+
+                    byte[] in ExHeap buffer = Bitter.FromByteArray(wav);
+
+                        // Copy contents into buffer WavAudio.Content[i]
+
+                        audio.SendPlayWav(buffer);
+                        switch receive
+                        {
+                            case audio.RecvAckPlayWav(oldbuffer):
+                                Console.WriteLine("[{1}] Done playing WAV audio {0}.", i,
+                                                  threadId);
+                            delete oldbuffer;
+                            break;
+
+                        case audio.RecvNakPlayWav(oldbuffer):
+                            Console.WriteLine("[{1}] Failed to play WAV audio {0}.",
+                                              i, threadId);
+                            delete oldbuffer;
+                            break;
+
+                        case audio.ChannelClosed():
+                            Console.WriteLine("[{1}] SoundDevice channel closed unexpectedly {0}.",
+                                                  i, threadId);
+                            return 1;
+                    }
+                }
+            }
+            finally {
+                delete audio;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Applications/tty/tty.csproj b/base/Applications/tty/tty.csproj
new file mode 100644
index 0000000..6e3f7fd
--- /dev/null
+++ b/base/Applications/tty/tty.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>tty</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="tty.sg" />
+    <Compile Include="..\Shell\Terminal.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+
+</Project>
diff --git a/base/Applications/tty/tty.sg b/base/Applications/tty/tty.sg
new file mode 100644
index 0000000..dd0768b
--- /dev/null
+++ b/base/Applications/tty/tty.sg
@@ -0,0 +1,648 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Tty.sg
+//
+//  Note:  tty 2006 Terminal Emulation program 
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Keyboard = Microsoft.Singularity.Io.Keyboard;
+using Pipe = Microsoft.Singularity.Io.Tty2006;
+
+namespace Microsoft.Singularity.Applications
+{
+    // See WaitForChildThread below
+    internal contract WaitForChildContract {
+        out message Finish();
+        state Start: one {Finish! -> Done;}
+        state Done: one {}
+    }
+
+    public class Tty
+    {
+        private static TRef<KeyboardDeviceContract.Imp:Ready> keyboardRef; 
+        private static TRef<ConsoleDeviceContract.Imp:Ready> consoleRef; 
+        private static TRef<UnicodePipeContract.Imp:READY> inputEp; 
+        private static TRef<UnicodePipeContract.Exp:READY> outputEp; 
+        private static char[] modTable;
+        private static Process process; 
+        private static Terminal terminal;
+
+        private static void InitModTable()
+        {
+            modTable = new char[8]; 
+            modTable[1] = '1'; 
+            modTable[2] = '2'; 
+            modTable[3] = '3'; 
+            modTable[4] = '4'; 
+            modTable[5] = '5'; 
+            modTable[6] = '6'; 
+            modTable[7] = '7'; 
+        }
+
+        public static KeyboardDeviceContract.Imp OpenKeyboard(string! devName,
+                                                              DirectoryServiceContract.Imp! ns)
+        {
+            // get NS endpoint
+            KeyboardDeviceContract.Exp! exp;
+            KeyboardDeviceContract.Imp! imp;
+            KeyboardDeviceContract.NewChannel(out imp, out exp);
+
+            ErrorCode errorOut; 
+            bool ok = SdsUtils.Bind(devName, ns, exp, out errorOut );
+
+            if (!ok) {
+                DebugStub.WriteLine("Console Input: OpenKeyboard lookup of {0} failed.",
+                                __arglist(devName));
+                if (imp != null) delete imp; 
+                return null;
+            }
+            assert imp != null; 
+            
+            switch receive
+            {
+                case imp.Success():
+                    break;
+                case imp.ContractNotSupported():
+                    throw new Exception("ConsoleInput: Contract not supported");
+                    break;
+                case imp.ChannelClosed():
+                    throw new Exception("ConsoleInput: Didn't imp.RecvActConnect");
+                    break;
+            }
+            return imp;
+        }
+
+        private static ConsoleDeviceContract.Imp OpenConsole(string! devName,
+                                                             DirectoryServiceContract.Imp! ns)
+        {
+            ConsoleDeviceContract.Exp! exp;
+            ConsoleDeviceContract.Imp! imp;
+            ConsoleDeviceContract.NewChannel(out imp, out exp);
+            ErrorCode errorOut; 
+            
+            bool ok = SdsUtils.Bind(devName, ns, exp, out errorOut); 
+            
+            if (!ok) {
+                DebugStub.WriteLine("Console Input: OpenConsole lookup of {0} failed.",
+                                __arglist(devName));
+                if (imp != null) delete imp; 
+                return null;
+            }
+           
+            if (imp != null) {
+                switch receive
+                {
+                    case imp.Success():
+                        break;
+                    case imp.ContractNotSupported():
+                        throw new Exception("ConsoleOutput: ContractNotSupported");
+                        break;
+                    case imp.ChannelClosed():
+                        throw new Exception("ConsoleOutput: ChannelClosed");
+                        break;
+                }
+            }
+            return imp;
+        }
+      
+        private static char[]!  in ExHeap ProcessKey(uint key, [Claims] char[] in ExHeap buffer, out int len)
+        {
+            len = 0; 
+            if (buffer == null) {
+                buffer = new [ExHeap] char [10]; 
+            }
+            
+            assert buffer.Length != 0; 
+            
+            //Console.WriteLine("processKey:{0:x}",key); 
+            char c = (char)(key & (uint)Keyboard.Qualifiers.KEY_BASE_CODE);
+            if ( (key & (uint)Keyboard.Qualifiers.KEY_CTRL) != 0  &&  (c == 'c')) {
+                        len = 1; 
+                        buffer[0] = (char) Pipe.ControlCodes.CTRL_C;  // ctrl-X
+                        DebugStub.WriteLine("tty: CTRL_C detected");
+                    } else if ( (key & (uint)Keyboard.Qualifiers.KEY_CTRL) != 0  && c == 'z') {
+                        len = 1; 
+                        buffer[0] = (char) Pipe.ControlCodes.CTRL_Z;  // ctrl-X
+                        DebugStub.WriteLine("tty: CTRL_Z detected");
+                    }
+            else if (c == '\b') {
+                len = 1; 
+                buffer[0] = c;
+            }
+            else if (c == '\n') {
+                len = 1; 
+                buffer[0] = c;
+                // echo
+                // Console.WriteLine();
+            }
+            else { 
+                // Only use the character if it's in the printable ASCII range
+                if ((c >= 32) && (c <= 126)) // SPACE to "~"
+                {
+                    //Console.WriteLine("char={0}:{1:x}",c,key);
+                    len = 1; 
+                    buffer[0] = c; 
+                    // echo
+                    // Console.Write(c);
+                }
+                else if (( c >= Keyboard.Keys.PAGE_UP) && (c <= Keyboard.Keys.DELETE ) ) {
+                    //Console.WriteLine("tty: generating esc sequence for:{0:x}",key); 
+                    buffer[0] = (char) 0x1b;
+                    buffer[1] = '[';
+                    int pos = 2; 
+                    
+                    switch ((int) c) {
+                        case Keyboard.Keys.PAGE_UP: 
+                            buffer[pos++] = '5';
+                            buffer[pos++] = '~';
+                            break; 
+                        case Keyboard.Keys.PAGE_DOWN: 
+                            buffer[pos++] = '6';
+                            buffer[pos++] = '~';
+                            break; 
+                        case Keyboard.Keys.UP_ARROW: 
+                            buffer[pos++] = 'A';
+                            break; 
+                        case Keyboard.Keys.DOWN_ARROW: 
+                            buffer[pos++] = 'B';
+                            break; 
+                        case Keyboard.Keys.LEFT_ARROW: 
+                            buffer[pos++] = 'D';
+                            break; 
+                        case Keyboard.Keys.RIGHT_ARROW: 
+                            buffer[pos++] = 'C';
+                            break; 
+                        case Keyboard.Keys.HOME: 
+                            buffer[pos++] = '1';
+                            buffer[pos++] = '~';
+                            break; 
+                        case Keyboard.Keys.END:
+                            buffer[pos++] = '4';
+                            buffer[pos++] = '~';
+                            break; 
+                        case Keyboard.Keys.INSERT: 
+                            buffer[pos++] = '2';
+                            buffer[pos++] = '~';
+                            break; 
+                        case Keyboard.Keys.DELETE: 
+                            buffer[pos++] = '3';
+                            buffer[pos++] = '~';
+                            break; 
+                    }
+                    len  = pos;
+#if false                    
+                    DebugStub.Write("tty: esc seq ="); 
+                    for (int i=0; i< len; i++){
+                        DebugStub.Write(" {0}",__arglist(buffer[i]));
+                    }
+                    DebugStub.WriteLine(""); 
+#endif                     
+                }
+            }
+            
+            return buffer;  
+        }
+
+        private static void InputWorkerThread() 
+        {
+            UnicodePipeContract.Imp! stdinImp =  inputEp.Acquire(); 
+            KeyboardDeviceContract.Imp:Ready! keyboard = keyboardRef.Acquire(); 
+            char[] in ExHeap buffer = new [ExHeap] char [10]; 
+            
+            WaitForChildContract.Imp! imp;
+            WaitForChildContract.Exp! exp;
+            WaitForChildContract.NewChannel(out imp, out exp);
+
+            new Thread(new ThreadStart(new WaitForChildThread(
+                process, new TRef<WaitForChildContract.Exp:Start>(exp))
+                .Wait)).Start();
+
+            uint key = 0;
+            while (true) {
+                keyboard.SendGetKey();
+                switch receive {
+                    case imp.Finish():
+                        delete buffer;
+                        goto done; 
+                    case keyboard.AckKey(ikey):
+                        key = ikey;
+                        break;
+                    case keyboard.NakKey():
+                        break;
+                    case keyboard.ChannelClosed():
+                        Tracing.Log(Tracing.Debug, "Keyboard channel closed");
+                        delete buffer;
+                        goto done;
+
+                }
+                //DebugStub.WriteLine("input:{0:x}",__arglist(key)); 
+
+                // process key
+                if ((key & (uint)Keyboard.Qualifiers.KEY_DOWN) == 0) {
+                    continue;
+                }
+                if ((key & (uint)Keyboard.Qualifiers.KEY_MOUSE) != 0) {
+                    continue;
+                }
+ 
+                int len; 
+                buffer = ProcessKey(key, buffer, out len);
+                
+                if (len > 0) {
+                    stdinImp.SendWrite(buffer,0,len);
+                    
+                    switch receive {
+                    case stdinImp.AckWrite(i_buffer):
+                        buffer = i_buffer; 
+                        break;
+                    case stdinImp.ChannelClosed():
+                        DebugStub.WriteLine("tty: stdin closed");
+                        Tracing.Log(Tracing.Debug, "stdin channel closed");
+                        DebugStub.Break();  //this should not happen! 
+                        goto done;
+                    }
+                }
+                
+            }
+        done:
+            delete stdinImp;
+            delete keyboard;
+            delete imp; 
+        }
+
+        ///////////////////
+        // process escape sequence embedded in output buffer
+        // pos is the index of the escape character in the buffer
+        private static char[] escBuf; 
+        
+        private static int HandleEscape(ConsoleDeviceContract.Imp! console,
+                                         char[]! in ExHeap buffer, int pos, int len)
+        {
+            Pipe.EscapeCodes  code;      
+            int column, row, repeat;
+            
+            int i; 
+            terminal.Reset(); 
+            repeat = 0;
+            
+            code = Pipe.EscapeCodes.NOCODE; 
+            
+            int limit;
+            if ( pos + len < buffer.Length ) limit = pos + len; 
+            else limit = buffer.Length;
+            for (i=pos; i < limit; i++) {
+                bool more = terminal.ProcessEscape(buffer[i], out code, out repeat); 
+                if (!more) break; 
+            }
+            
+            switch (code) {
+            case Pipe.EscapeCodes.UP:
+                console.SendGetCursorPosition();
+                console.RecvCursorPosition(out column, out row);
+                if (row > 0) {
+					console.SendSetCursorPosition(column, row-1);
+					console.RecvAckSetCursorPosition();
+					//DebugStub.WriteLine("tty: up received. shifting from row {0}, col {1}",__arglist(row, column));
+                } else {
+					DebugStub.WriteLine("tty: cannot move up; already at top");
+                }
+                break;
+            case Pipe.EscapeCodes.LEFT:
+                console.SendGetCursorPosition();
+                console.RecvCursorPosition(out column, out row);
+                if (column > 0) {
+					console.SendSetCursorPosition(column-1, row);
+					console.RecvAckSetCursorPosition();
+					//DebugStub.WriteLine("tty: left received. shifting from row {0}, col {1}",__arglist(row, column));
+                } else if (row > 0) {
+					// Move up one row and to the end.
+					console.SendSetCursorPosition(_console_columns - 1, row - 1);
+					console.RecvAckSetCursorPosition();
+                } else {
+					DebugStub.WriteLine("tty: already at origin, cannot move left");
+                }
+                break;
+            case Pipe.EscapeCodes.RIGHT:
+                //DebugStub.WriteLine("tty: right received");
+                console.SendGetCursorPosition();
+                console.RecvCursorPosition(out column, out row);
+                if (column+1 < _console_columns) {
+	                console.SendSetCursorPosition(column+1, row);
+		            console.RecvAckSetCursorPosition();
+		        } else if (row+1 < _console_rows) {
+					console.SendSetCursorPosition(0, row+1);
+					console.RecvAckSetCursorPosition();
+		        } else {
+					DebugStub.WriteLine("tty: already at end of screen!");
+				}
+                break;
+            case Pipe.EscapeCodes.ERASE_FROM_CURSOR:
+                //DebugStub.WriteLine("tty: ERASE FROM CURSOR received");
+                console.SendClearCursorToEndOfLine(); 
+                console.RecvAckClearCursorToEndOfLine(); 
+                break; 
+            case Pipe.EscapeCodes.CLEAR_SCREEN:
+                console.SendClear();
+                console.RecvAckClear();
+                break; 
+            case Pipe.EscapeCodes.SET_CURSOR_SIZE:
+                //DebugStub.WriteLine("tty: ERASE FROM CURSOR received");
+                bool ignore = false; 
+                Microsoft.Singularity.Io.CursorSize  size = Microsoft.Singularity.Io.CursorSize.Small; 
+                switch (repeat) {
+                case 1: 
+                    size = Microsoft.Singularity.Io.CursorSize.Small;
+                    break; 
+                case 2:
+                    size = Microsoft.Singularity.Io.CursorSize.Large;
+                    break; 
+                default: 
+                    break; 
+                    ignore = true; 
+                }
+                if (!ignore) {
+                    console.SendSetCursorSize(size); 
+                    switch receive {
+                    case console.AckSetCursorSize():
+                        break; 
+                    case console.NotSupported(): 
+                        break; 
+                    }
+                }
+                break; 
+            case Pipe.EscapeCodes.NOCODE: 
+                break;
+            }
+            return i;
+        }
+        
+        private static void OutputWorkerThread() 
+        {
+            UnicodePipeContract.Exp! stdoutExp = outputEp.Acquire(); 
+            ConsoleDeviceContract.Imp! console = consoleRef.Acquire();
+
+            bool pipeActive  = true; 
+            int pos; 
+            int newPos = 0;
+            
+            try { 
+                while (pipeActive) {
+                    switch receive {
+                        case stdoutExp.Write(buffer, index, count):
+                            // inspect each key looking for escape sequences
+                            // if any are found split up the buffer logically into
+                            // 3 parts (pre, escape, and post). All three will need to be 
+                            // sent separately. 
+                            // Need to ensure the correct buffer gets back to the caller
+                            assert buffer.Length >= (index + count);
+                            for (pos=0; pos < count; pos++) {
+                                if (buffer[pos+index] == (char) 0x1b) break; 
+                            }
+                            int pre; 
+                            int post; 
+                            if (pos != count) {
+                                if (pos == 0 && count == 1) {
+                                    // ignore single escape char -- should never be sent
+                                    pre = 0; 
+                                    post = 0; 
+                                }
+                                else { 
+                                     newPos = HandleEscape(console,buffer,pos+1, count);  
+                                     pre = pos - index; 
+                                     post = (pos+count-1) - newPos; 
+                                } 
+                                
+                                if (pre != 0) {
+                                    char [] in ExHeap preBuf = new [ExHeap] char [pre]; 
+                                    for (int i=0; i< pre; i++) {
+                                        preBuf[i] = buffer[index+i];
+                                    }
+                                        // write all chars before 
+                                    console.SendWrite(preBuf, 0, pre);
+                                    
+                                    switch receive {
+                                    case console.AckWrite(localside): 
+                                        // performing a partial write need to save the buffer 
+                                        delete localside;
+                                        break;
+                                        
+                                    case console.NakWrite(localside):
+                                        // Unicode contract has no negative ack
+                                        stdoutExp.SendAckWrite(localside);
+                                        break;
+
+                                    case console.ChannelClosed():
+                                        pipeActive = false; 
+                                        break;
+                                    }
+                                }
+                                
+                                if (post != 0) {
+                                    char [] in ExHeap postBuf = new [ExHeap] char [post]; 
+                                    for (int i=0; i< post; i++) {
+                                        postBuf[i] = buffer[newPos+i];
+                                    }
+                                    console.SendWrite(postBuf, 0, newPos);
+                                    switch receive {
+                                    case console.AckWrite(localside):
+                                        delete localside;
+                                        break;
+                                        
+                                    case console.NakWrite(localside):
+                                        // Unicode contract has no negative ack
+                                        stdoutExp.SendAckWrite(localside);
+                                        break;
+
+                                    case console.ChannelClosed():
+                                        pipeActive = false; 
+                                        break;
+                                    } 
+                                } 
+                                stdoutExp.SendAckWrite(buffer);
+                            }  // escape sequence 
+
+                            else { 
+                            console.SendWrite(buffer, index, count);
+                            switch receive {
+                            case console.AckWrite(localside):
+                                stdoutExp.SendAckWrite(localside);
+                                break;
+                                
+                            case console.NakWrite(localside):
+                                // Unicode contract has no negative ack
+                                stdoutExp.SendAckWrite(localside);
+                                break;
+
+                            case console.ChannelClosed():
+                                pipeActive = false; 
+                                break;
+                            }                      
+                            }     
+                            break;
+                        case stdoutExp.ChannelClosed():
+                            pipeActive = false; 
+                            break;
+                    }
+                }
+            }
+            finally {
+                delete stdoutExp;
+                delete console;
+            }
+        }
+
+        private static int RunShellProcess(String[] args)
+        {
+            assert args != null; 
+            assert args[0] != null; 
+            
+            DebugStub.WriteLine("Starting {0}, argcount={1}", __arglist( args[0], args.Length));
+            Console.WriteLine("Starting {0}, argcount={1}", args[0], args.Length);
+            // create shell process with stdin/out bound to us
+            //process = new Process(args, null, 2);
+            process = new Process((!)args[0], null, null); 
+         
+            UnicodePipeContract.Imp! stdinImp;
+            UnicodePipeContract.Exp! stdinExp;
+            UnicodePipeContract.NewChannel(out stdinImp, out stdinExp);
+            
+            UnicodePipeContract.Imp! stdoutImp;
+            UnicodePipeContract.Exp! stdoutExp;
+            UnicodePipeContract.NewChannel(out stdoutImp, out stdoutExp);
+
+            process.SetStartupEndpoint(0, (Endpoint * in ExHeap) stdinExp);
+            // hack
+            process.SetStartupEndpoint(1, (Endpoint * in ExHeap) stdoutImp);
+            
+            // new style pass in args via StringArrayParameter
+            if (args.Length > 1) {
+                    String[]! shellArgs = new String[args.Length - 1];
+                    Array.Copy(args, 1, shellArgs, 0, shellArgs.Length);
+                    process.SetStartupStringArrayArg(0, shellArgs);
+            }
+            
+            process.Start();
+
+            // start our output thread
+            // We need a multiplexer, if we want to echo input characters in tty.
+            UnicodePipeContract.Imp! localStdoutImp;
+            UnicodePipeContract.Exp! localStdoutExp;
+            UnicodePipeContract.NewChannel(out localStdoutImp, out localStdoutExp);
+
+            PipeMultiplexer! pm = PipeMultiplexer.Start(localStdoutImp, stdoutExp);
+            
+            inputEp = new TRef<UnicodePipeContract.Imp:READY> (stdinImp);
+            outputEp = new TRef<UnicodePipeContract.Exp:READY> (localStdoutExp);
+
+            // Connect our own console output to the output multiplexer
+            UnicodePipeContract.Imp ttyStdout = pm.FreshClient();
+            UnicodePipeContract.Imp oldStdout = ConsoleOutput.Swap(ttyStdout);
+            // oldStdout is likely null, because the tty does not get a stdout on startup
+            delete oldStdout;
+
+            // start up output thread to handle input and output 
+           
+            ThreadStart output = new ThreadStart(OutputWorkerThread); 
+            Thread outThread = new Thread(output);
+            outThread.Start();
+
+            // run input copier on this thread
+            InputWorkerThread();
+            // dispose the pipe multiplexer. This should shut down the output thread
+            pm.Dispose();
+
+            outThread.Join();
+            return process.ExitCode; 
+        }
+
+        // [Hawblitzel] TODO: better ways to wait on a child process
+        private class WaitForChildThread
+        {
+            private Process! process;
+            private TRef<WaitForChildContract.Exp:Start>! expRef;
+
+            internal WaitForChildThread(Process! process, TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                this.process = process;
+                this.expRef = expRef;
+                base();
+            }
+
+            internal void Wait()
+            {
+                process.Join();
+                WaitForChildContract.Exp exp = expRef.Acquire();
+                exp.SendFinish();
+                delete exp;
+            }
+        }
+        
+        public static int Main(String[] args)
+        {
+            // TODO: get ns from startup endpoints
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+            // get access to the real keyboard
+            KeyboardDeviceContract.Imp keyboard = OpenKeyboard("/dev/keyboard", ns); 
+            if (keyboard == null) {
+                DebugStub.WriteLine("Console Input: Couldn't open keyboard.");
+                DebugStub.Break(); 
+                delete ns;
+                return -1;
+            } 
+            ConsoleDeviceContract.Imp console;
+            console = OpenConsole("/dev/video-text", ns);
+            if (console == null) {
+                console = OpenConsole("/dev/conout", ns);
+                if (console == null) {
+                    DebugStub.WriteLine("Couldn't open console.\n");
+                    DebugStub.Break(); 
+                    delete keyboard;
+                    delete ns;
+                    return -1;
+                }
+            }
+            delete ns;
+            
+            // Query the size of the display.
+            // This is useful later on.
+            console.SendGetDisplayDimensions();
+            int columns;
+            int rows;
+            console.RecvDisplayDimensions(out columns, out rows);
+            _console_columns = columns;
+            _console_rows = rows;
+            
+            terminal = new Terminal(); 
+            InitModTable(); 
+            keyboardRef = new TRef<KeyboardDeviceContract.Imp:Ready>(keyboard);
+            consoleRef = new TRef<ConsoleDeviceContract.Imp:Ready>(console);
+            
+            string [] shellArgs; 
+            if (args == null || args.Length < 2) {  
+                shellArgs = new string[1]; 
+                shellArgs[0] = "shell"; 
+            }
+            else {
+                shellArgs = new string[args.Length -1];
+                Array.Copy(args, 1, shellArgs, 0, shellArgs.Length);
+            }
+            int code = RunShellProcess(shellArgs); 
+
+            return code; 
+        }
+        
+        static int _console_columns;
+        static int _console_rows;
+    } //Tty
+    
+}//namespace
diff --git a/base/Applications/utilities/Utilities.proj b/base/Applications/utilities/Utilities.proj
new file mode 100644
index 0000000..bca8cb5
--- /dev/null
+++ b/base/Applications/utilities/Utilities.proj
@@ -0,0 +1,10 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="*/*.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+</Project>
diff --git a/base/Applications/utilities/attr/attr.csproj b/base/Applications/utilities/attr/attr.csproj
new file mode 100644
index 0000000..521e8eb
--- /dev/null
+++ b/base/Applications/utilities/attr/attr.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>attr</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="attr.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/attr/attr.sg b/base/Applications/utilities/attr/attr.sg
new file mode 100644
index 0000000..5925245
--- /dev/null
+++ b/base/Applications/utilities/attr/attr.sg
@@ -0,0 +1,89 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Attr.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Show attributes associated with a file", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "filename", Mandatory=true, Position=0, HelpMessage="Name of file.")]
+        internal string fileName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsAttributes.AppMain(this);
+        }
+    }
+
+    public class FsAttributes
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            long size;
+            NodeType nodeType; 
+
+            DirectoryServiceContract.Imp rootNS = (config.nsRef).Acquire(); 
+            if (rootNS == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            
+            rootNS.RecvSuccess();
+
+            ErrorCode error; 
+            bool ok  = FileUtils.GetAttributes(config.fileName, rootNS, out size, out nodeType, out  error);
+            delete rootNS; 
+
+            if (ok) {
+                Console.WriteLine("GetAttributes for " + config.fileName);
+                Console.WriteLine("  Size: " + size);
+                Console.WriteLine("  NodeType: {0}", SdsUtils.NodeTypeToString(nodeType) );
+                return 0; 
+            }
+            else {
+                Console.WriteLine(" Attr for ({0}) failed. reason:{1}",
+                    config.fileName, SdsUtils.ErrorCodeToString(error) ); 
+            }
+            return -1;
+        }
+
+        private static void Usage()
+        {
+            Console.WriteLine("type <filename>  displays output of file on console.");
+        }
+    } // class Test
+}
diff --git a/base/Applications/utilities/cat/cat.csproj b/base/Applications/utilities/cat/cat.csproj
new file mode 100644
index 0000000..4abcad3
--- /dev/null
+++ b/base/Applications/utilities/cat/cat.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>cat</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="cat.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/cat/cat.sg b/base/Applications/utilities/cat/cat.sg
new file mode 100644
index 0000000..e43d513
--- /dev/null
+++ b/base/Applications/utilities/cat/cat.sg
@@ -0,0 +1,115 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Type.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Write contents of file to stdout", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "filename", Mandatory=true, Position=0, HelpMessage="Name of file.")]
+        internal string fileName;
+
+        [BoolParameter( "q", Default=false, HelpMessage="Quiet Mode: read file but do not write to stdout")]
+        internal bool quietMode;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Type.AppMain(this);
+        }
+    }
+
+    public class Type
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            string fileName;
+            FileContract.Imp fileImp;
+            long readSize = 512;
+            long readOffset = 0;
+            byte* opt(ExHeap[]) buf = new[ExHeap] byte[readSize];
+
+            byte [] bytes = new byte[readSize];
+
+            DirectoryServiceContract.Imp rootNS = (config.nsRef).Acquire(); 
+            if (rootNS == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            
+            rootNS.RecvSuccess();
+
+            fileImp = FileUtils.OpenFile(config.fileName, rootNS);
+            delete rootNS; 
+
+            if (fileImp == null){
+                delete buf;
+                Console.WriteLine("Unable to open file " + config.fileName);
+                return 1;
+            }
+
+            do
+            {
+                fileImp.SendRead(buf, 0, readOffset, readSize);
+                switch receive
+                {
+                    case fileImp.AckRead( _buf,  bytesRead,  error) :
+                        if (error != 0)
+                            Console.WriteLine("Got Error "+error);
+                        buf = _buf;
+                        Bitter.ToByteArray(buf,0,(int) bytesRead,bytes,0);
+                        string str = Encoding.ASCII.GetString(bytes, 0,(int)bytesRead);
+                        if (!config.quietMode) Console.Write(str);
+                        readOffset += bytesRead;
+                        if (bytesRead < readSize) {
+                            delete buf;
+                            goto end;
+                        }
+                        break;
+                    case fileImp.ChannelClosed() :
+                        goto end;
+                        break;
+                    case unsatisfiable :
+                        goto end;
+                        break;
+                }
+            } while (true);
+end:        delete fileImp;
+            return 0;
+        }
+
+    } // class Type
+}
diff --git a/base/Applications/utilities/createfile/createfile.csproj b/base/Applications/utilities/createfile/createfile.csproj
new file mode 100644
index 0000000..bded2bf
--- /dev/null
+++ b/base/Applications/utilities/createfile/createfile.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>createfile</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="createfile.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/createfile/createfile.sg b/base/Applications/utilities/createfile/createfile.sg
new file mode 100644
index 0000000..9e66258
--- /dev/null
+++ b/base/Applications/utilities/createfile/createfile.sg
@@ -0,0 +1,206 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   createfile.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using FileSystem.Utils;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="create a new file", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter("filename", Mandatory = true, Position = 0, HelpMessage = "Name of file to create")]
+        internal string fileName;
+
+        [StringParameter("c", Default = null, Mandatory = false, HelpMessage = "Initial contents of file as a text string")]
+        internal string contentsString;
+
+        [StringParameter("x", Default = null, Mandatory = false, HelpMessage = "Initial contents of file as a sequence of hexadecimal bytes, such as 000FA8")]
+        internal string contentsHexString;
+
+        [LongParameter("s", Default = 0, Mandatory = false,
+         HelpMessage = "Size of file. Specified contents will be repeated to fill it, or all zero bits will be used if no pattern is specified.")]
+        internal long fileSize;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsCreateFile.AppMain(this);
+        }
+    }
+
+    public class FsCreateFile
+    {
+        internal static bool CreateFile(string! fileName, DirectoryServiceContract.Imp! ds)
+        {
+            ErrorCode error;
+            FileUtils.CreateFile(fileName, ds, out error);
+            bool ok = (error == ErrorCode.NoError);
+            if (!ok) {
+                Console.WriteLine(" File ({0}) create failed. reason:{1}",
+                    fileName, SdsUtils.ErrorCodeToString(error) );
+            }
+            return ok;
+        }
+
+        internal static bool WriteToFile(string! fileName, byte[]! data, long size)
+        {
+            if (size == 0) return true;
+
+            ErrorCode error;
+            FileContract.Imp:Ready fileClient = null;
+            try {
+                fileClient = FileUtils.OpenFile(fileName, out error);
+                if (error != ErrorCode.NoError) {
+                    Console.WriteLine(" File ({0}) open failed. reason:{1}",
+                        fileName, SdsUtils.ErrorCodeToString(error) );
+                    return false;
+                }
+
+                long i;
+                for (i=0; i < size/data.Length; i++) {
+                    FileUtils.Write((!)fileClient, data.Length * i, data);
+                }
+                if ((size % data.Length) > 0) {
+                    FileUtils.Write((!)fileClient, 0, (int)(size % data.Length), data.Length * i, data);
+                }
+
+                return true;
+            }
+            finally {
+                delete fileClient;
+            }
+        }
+
+        private static byte HexUpperCharToByte(char hexChar)
+        {
+            if (Char.IsDigit(hexChar)) {
+                return (byte)(int.Parse(new String(hexChar, 1)));
+            }
+            else {
+                switch(hexChar) {
+                    case 'A': return 10;
+                    case 'B': return 11;
+                    case 'C': return 12;
+                    case 'D': return 13;
+                    case 'E': return 14;
+                    case 'F': return 15;
+                }
+                throw new FormatException(String.Format("Invalid hex character '{0}'", hexChar));
+            }
+        }
+
+        private static byte[]! HexStringToBytes(string! hex)
+        {
+            foreach (char c in " \t\r\n") {
+                hex = hex.Replace(new String(c,1), "");
+            }
+            hex = hex.ToUpper();
+            if (hex.Length == 0) {
+                throw new FormatException("Hex byte string should not be empty.");
+            }
+            if ((hex.Length % 2) != 0) {
+                throw new FormatException("Hex byte string should contain an even number of digits.");
+            }
+
+            byte[]! result = new byte[hex.Length / 2];
+            for(int i=0; i < result.Length; i++) {
+                result[i] = (byte)(HexUpperCharToByte(hex[2*i]) * 16  +
+                                   HexUpperCharToByte(hex[2*i + 1]));
+            }
+            return result;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            if (config.contentsString != null && config.contentsHexString != null) {
+                Console.WriteLine("Can only specify at most one of the options -c or -x.");
+                return -1;
+            }
+
+            DirectoryServiceContract.Imp ds = config.nsRef.Acquire();
+            if (ds == null) {
+                Console.WriteLine("Unable to acquire handle to the Directory Service root");
+                return -1;
+            }
+            ds.RecvSuccess();
+
+            // Check if the file already exists
+            ErrorCode error;
+            long length;
+            NodeType nodeType;
+            SdsUtils.GetAttributes((!)config.fileName, ds, out length, out nodeType, out error);
+            if (error != ErrorCode.NotFound) {
+                Console.WriteLine("Cannot create file. File already exists.");
+                delete ds;
+                return -1;
+            }
+
+            try {
+                byte[]! data = new byte[0];
+                if (config.contentsString != null) {
+                    data = Encoding.UTF8.GetBytes(config.contentsString);
+                }
+                else if (config.contentsHexString != null) {
+                    data = HexStringToBytes(config.contentsHexString);
+                }
+
+                long fileSize = config.fileSize;
+
+                if (fileSize > 0 && data.Length == 0) {
+                    // Fill in with zero bits
+                    data = new byte[1];
+                    data[0] = 0;
+                }
+
+                if (!CreateFile(config.fileName, ds)) {
+                    return -1;
+                }
+                if (!WriteToFile(config.fileName, data, fileSize)) {
+                    return -1;
+                }
+            }
+            catch (FormatException ex) {
+                Console.WriteLine("Invalid parameter format: " + ex.Message + ".");
+                return -1;
+            }
+            finally {
+                delete ds;
+            }
+            return 0;
+        }
+    } // class Test
+}
diff --git a/base/Applications/utilities/delete/Delete.csproj b/base/Applications/utilities/delete/Delete.csproj
new file mode 100644
index 0000000..7e25119
--- /dev/null
+++ b/base/Applications/utilities/delete/Delete.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>delete</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="delete.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/delete/delete.sg b/base/Applications/utilities/delete/delete.sg
new file mode 100644
index 0000000..66866a0
--- /dev/null
+++ b/base/Applications/utilities/delete/delete.sg
@@ -0,0 +1,142 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Delete.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="delete named file", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "filename", Mandatory=true, Position=0, HelpMessage="Name of file.")]
+        internal string fileName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsDelete.AppMain(this);
+        }
+    }
+
+    public class FsDelete
+    {
+        internal static bool DeleteFile(string! fileName, DirectoryServiceContract.Imp! ds)
+        {
+            ErrorCode error;
+            FileUtils.DeleteFile(fileName, ds, out error);
+            bool ok = (error == ErrorCode.NoError);
+            if (!ok) {
+                Console.WriteLine(" File ({0}) delete failed. reason:{1}",
+                    fileName, SdsUtils.ErrorCodeToString(error) );
+            }
+            return ok;
+        }
+
+        internal static bool DeleteLink(string! fileName, DirectoryServiceContract.Imp! ds)
+        {
+            ErrorCode error;
+            bool ok = SdsUtils.DeleteLink(fileName, ds, out error);
+            if (!ok) {
+                Console.WriteLine(" Symbolic Link ({0}) delete failed. reason:{1}",
+                    fileName, SdsUtils.ErrorCodeToString(error) );
+            }
+#if DEBUG
+            else {
+                DebugStub.Break();
+            }
+#endif
+            return ok;
+        }
+
+        internal static bool DeleteDirectory(string! fileName, DirectoryServiceContract.Imp! ds)
+        {
+            ErrorCode error;
+            bool ok = SdsUtils.DeleteDirectory(fileName, ds, out error);
+            if (!ok) {
+                Console.WriteLine("Delete of directory ({0})  failed. reason:{1}",
+                    fileName, SdsUtils.ErrorCodeToString(error) );
+            }
+            return ok;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the Directory Service root");
+            }
+
+            ds.RecvSuccess();
+
+            // see what kind of entity the path points to.
+            ErrorCode error;
+            NodeType nodeType;
+            long size;
+            bool ok  = SdsUtils.GetAttributes(config.fileName, ds, out size, out nodeType, out  error);
+
+            if (!ok) {
+                Console.WriteLine(" File ({0}) not found. reason:{1}",
+                    config.fileName, SdsUtils.ErrorCodeToString(error) );
+#if DEBUG
+                DebugStub.Break();
+#endif
+                delete ds;
+                return -1;
+            }
+
+            bool success = false;
+            switch (nodeType) {
+                case NodeType.File:
+                    success = DeleteFile(config.fileName, ds);
+                    break;
+                case NodeType.Directory:
+                    success = DeleteDirectory(config.fileName, ds);
+                    break;
+                case NodeType.SymLink:
+                    Console.WriteLine("Warning delete link in /fs will hand system");
+                    success = DeleteLink(config.fileName, ds);
+                    break;
+                default:
+                    Console.WriteLine(" File ({0}) is of type '({1}). Unable to delete",
+                        config.fileName, SdsUtils.NodeTypeToString(nodeType) );
+                    success = false;
+                    break;
+            }
+
+            delete ds;
+            return success ? 0 : 1;
+        }
+    } // class Test
+}
diff --git a/base/Applications/utilities/deregister/Deregister.csproj b/base/Applications/utilities/deregister/Deregister.csproj
new file mode 100644
index 0000000..c435026
--- /dev/null
+++ b/base/Applications/utilities/deregister/Deregister.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Deregister</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Deregister.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/deregister/deregister.sg b/base/Applications/utilities/deregister/deregister.sg
new file mode 100644
index 0000000..2b2bba9
--- /dev/null
+++ b/base/Applications/utilities/deregister/deregister.sg
@@ -0,0 +1,78 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  Note:
+//
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using System.Diagnostics;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Security;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "path", Position=0, Mandatory=true)]
+        internal string nsPath;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return Deregister.AppMain(this);
+        }
+    }
+    class Deregister
+    {
+        internal static int AppMain(Parameters! config)
+        {
+
+            ErrorCode errorOut;
+            ServiceProviderContract.Imp:Start  service;
+
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the Directory Service root");
+            }
+            ds.RecvSuccess();
+
+            bool ok = SdsUtils.Deregister(config.nsPath, ds, out service, out errorOut);
+            delete service;
+            delete ds;
+
+            if (!ok) {
+                Console.WriteLine(" {0} of {1} failed. reason:{2}",
+                                  "deregister", config.nsPath, SdsUtils.ErrorCodeToString(errorOut));
+                return -1;
+            }
+            return 0;
+        }
+    }//Deregister
+}//namespace
diff --git a/base/Applications/utilities/getacl/getacl.csproj b/base/Applications/utilities/getacl/getacl.csproj
new file mode 100644
index 0000000..bedcd27
--- /dev/null
+++ b/base/Applications/utilities/getacl/getacl.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>GetAcl</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="GetAcl.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.AclUtils\DirectoryService.AclUtils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/getacl/getacl.sg b/base/Applications/utilities/getacl/getacl.sg
new file mode 100644
index 0000000..d37e8f6
--- /dev/null
+++ b/base/Applications/utilities/getacl/getacl.sg
@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   getacl.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Security.SDS;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Examine an acl", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "PathName", Mandatory=true, Position=0, HelpMessage="PathName argument.")]
+        internal string pathName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsGetAcl.AppMain(this);
+        }
+    }
+
+    public class FsGetAcl
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            DirectoryServiceContract.Imp ds = ((!)config.nsRef).Acquire();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the Directory Service root");
+            }
+
+            ds.RecvSuccess();
+
+            ErrorCode errorOut;
+            Acl acl;
+            bool ok = SdsUtilsAcl.QueryACL((!)config.pathName, false, ds, out acl, out errorOut);
+            if (ok) {
+                if (acl.Node == null)
+                    Console.WriteLine("(null)");
+                else
+                    Console.WriteLine(acl.Node);
+                if (acl.Descendant == null)
+                    Console.WriteLine("(null)");
+                else
+                    Console.WriteLine(acl.Descendant);
+            }
+
+            else Console.WriteLine("getacl failed. reason({0})",SdsUtils.ErrorCodeToString(errorOut));
+
+            delete ds;
+            return ok ? 0 : 1;
+        }
+
+    } // class Test
+}
diff --git a/base/Applications/utilities/geteacl/geteacl.csproj b/base/Applications/utilities/geteacl/geteacl.csproj
new file mode 100644
index 0000000..c77fdcf
--- /dev/null
+++ b/base/Applications/utilities/geteacl/geteacl.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>GetEAcl</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="GetEAcl.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.AclUtils\DirectoryService.AclUtils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/geteacl/geteacl.sg b/base/Applications/utilities/geteacl/geteacl.sg
new file mode 100644
index 0000000..23b2b46
--- /dev/null
+++ b/base/Applications/utilities/geteacl/geteacl.sg
@@ -0,0 +1,83 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   geteacl.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Security.SDS;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Examine an effective acl", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "PathName", Mandatory=true, Position=0, HelpMessage="PathName argument.")]
+        internal string pathName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsGetEffectiveAcl.AppMain(this);
+        }
+    }
+
+    public class FsGetEffectiveAcl
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            DirectoryServiceContract.Imp ds = ((!)config.nsRef).Acquire();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the Directory Service root");
+            }
+
+            ds.RecvSuccess();
+
+            ErrorCode errorOut;
+            Acl acl;
+            bool ok = SdsUtilsAcl.QueryACL((!)config.pathName, true, ds, out acl, out errorOut);
+            if (ok) {
+                if (acl.Node == null)
+                    Console.WriteLine("(null)");
+                else
+                    Console.WriteLine(acl.Node);
+            }
+
+            else Console.WriteLine("geteacl failed. reason({0})",SdsUtils.ErrorCodeToString(errorOut));
+
+            delete ds;
+            return ok ? 0 : 1;
+        }
+
+    } // class Test
+}
diff --git a/base/Applications/utilities/getsymlink/getsymlink.csproj b/base/Applications/utilities/getsymlink/getsymlink.csproj
new file mode 100644
index 0000000..c8b4c1d
--- /dev/null
+++ b/base/Applications/utilities/getsymlink/getsymlink.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>getsymlink</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="getsymlink.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/getsymlink/getsymlink.sg b/base/Applications/utilities/getsymlink/getsymlink.sg
new file mode 100644
index 0000000..2cbe84c
--- /dev/null
+++ b/base/Applications/utilities/getsymlink/getsymlink.sg
@@ -0,0 +1,85 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Getsymlink.sg
+//
+//  Note:
+//
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "path", Position=0, Mandatory=true)]
+        internal string nsPath;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return GetSymLink.AppMain(this);
+        }
+    }
+
+    class GetSymLink 
+    {
+        private static void tell()
+        {
+            Console.WriteLine("Getsymlink <link name>.");
+            Console.WriteLine("    returns value of link located at <link name>");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+
+            ErrorCode errorOut;
+            string link; 
+            
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            ds.RecvSuccess();
+
+            bool ok = SdsUtils.GetLinkValue(config.nsPath, ds, out link, out errorOut);
+
+            if (!ok) {
+                Console.WriteLine("{0} ({1}) failed. reason: {2}\n", 
+                                   "getsymlink", config.nsPath, SdsUtils.ErrorCodeToString(errorOut) );
+                delete ds;
+                return -1;
+            }
+            
+            Console.WriteLine("Link: {0} -> {1}", config.nsPath,link); 
+            delete ds; 
+            return 0;
+        }
+    }//SymbolicLink
+}//namespace
diff --git a/base/Applications/utilities/mkdir/mkdir.csproj b/base/Applications/utilities/mkdir/mkdir.csproj
new file mode 100644
index 0000000..5a4932f
--- /dev/null
+++ b/base/Applications/utilities/mkdir/mkdir.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>mkdir</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="mkdir.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/mkdir/mkdir.sg b/base/Applications/utilities/mkdir/mkdir.sg
new file mode 100644
index 0000000..ce8a9f5
--- /dev/null
+++ b/base/Applications/utilities/mkdir/mkdir.sg
@@ -0,0 +1,74 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   mkdir.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Create a Directory", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "DirName", Mandatory=true, Position=0, HelpMessage="Name of directory.")]
+        internal string dirName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsMakeDirectory.AppMain(this);
+        }
+    }
+
+    public class FsMakeDirectory
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            
+            ds.RecvSuccess();
+    
+            ErrorCode errorOut; 
+            bool ok = SdsUtils.CreateDirectory(config.dirName, ds, out errorOut); 
+            if (ok) Console.WriteLine(config.dirName+" was created."); 
+            else Console.WriteLine("create failed. reason({0})",SdsUtils.ErrorCodeToString(errorOut));
+            
+            delete ds; 
+            return ok ? 0 : 1; 
+        }
+
+    } // class Test 
+}
diff --git a/base/Applications/utilities/rmdir/rmdir.csproj b/base/Applications/utilities/rmdir/rmdir.csproj
new file mode 100644
index 0000000..ae7d2b8
--- /dev/null
+++ b/base/Applications/utilities/rmdir/rmdir.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>rmdir</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="rmdir.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/rmdir/rmdir.sg b/base/Applications/utilities/rmdir/rmdir.sg
new file mode 100644
index 0000000..e505255
--- /dev/null
+++ b/base/Applications/utilities/rmdir/rmdir.sg
@@ -0,0 +1,74 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   mkdir.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Create a Directory", DefaultAction=true)]
+    internal class Parameters 
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "DirName", Mandatory=true, Position=0, HelpMessage="Name of directory.")]
+        internal string dirName;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsDeleteDirectory.AppMain(this);
+        }
+    }
+
+    public class FsDeleteDirectory
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            ErrorCode errorOut; 
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            ds.RecvSuccess();
+            
+            bool ok = SdsUtils.DeleteDirectory(config.dirName, ds, out errorOut); 
+            if (ok) Console.WriteLine(config.dirName+" was deleted."); 
+            else Console.WriteLine("delete failed. reason({0})",SdsUtils.ErrorCodeToString(errorOut));
+            
+            delete ds; 
+            return  ok ? 0 : 1; 
+        }
+
+    } // class Test 
+}
+
diff --git a/base/Applications/utilities/setacl/setacl.csproj b/base/Applications/utilities/setacl/setacl.csproj
new file mode 100644
index 0000000..5842cc0
--- /dev/null
+++ b/base/Applications/utilities/setacl/setacl.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SetAcl</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SetAcl.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.AclUtils\DirectoryService.AclUtils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/setacl/setacl.sg b/base/Applications/utilities/setacl/setacl.sg
new file mode 100644
index 0000000..74925c9
--- /dev/null
+++ b/base/Applications/utilities/setacl/setacl.sg
@@ -0,0 +1,126 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   setacl.sg
+//
+//  Note:
+//
+
+using FileSystem.Utils;
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Security.SDS;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Set an acl", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "Options", Mandatory=true, Position=0,
+                          HelpMessage="Options argument (/N /D /C /CN /CD).")]
+        internal string options;
+
+        [StringParameter( "PathName", Mandatory=true, Position=1, HelpMessage="PathName argument.")]
+        internal string pathName;
+
+
+        [StringParameter( "Pattern", Mandatory=false, Position=2, HelpMessage="Pattern argument.")]
+        internal string pattern;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return FsSetAcl.AppMain(this);
+        }
+    }
+
+    public class FsSetAcl
+    {
+        internal static int AppMain(Parameters! config)
+        {
+            if (config.options == "/H") {
+                Console.WriteLine("Usage: setacl option path [pattern]");
+                Console.WriteLine("Possible options are (\"old\" is old acl entry:");
+                Console.WriteLine("   /C  - set acl to <null, null>");
+                Console.WriteLine("   /N  - set acl to <arg, old.Descendant>");
+                Console.WriteLine("   /D  - set acl to <old.Node, arg>");
+                Console.WriteLine("   /CN - set acl to <pattern, old.Descendant>");
+                Console.WriteLine("   /CD - set acl to <old.Node, null>");
+                return 0;
+            }
+            if ((config.options == "/D" || config.options == "/N") && config.pattern == null) {
+                Console.WriteLine("Expected pattern argument.");
+                return 1;
+            }
+
+            DirectoryServiceContract.Imp ds = ((!)config.nsRef).Acquire();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the Directory Service root");
+            }
+
+            ds.RecvSuccess();
+
+            try {
+                ErrorCode errorOut;
+                Acl acl;
+                bool ok = SdsUtilsAcl.QueryACL((!)config.pathName, false, ds, out acl, out errorOut);
+                if (! ok) {
+                    Console.WriteLine("setacl failed. reason({0})",SdsUtils.ErrorCodeToString(errorOut));
+                    return 1;
+                }
+
+                Acl newacl;
+                if (config.options == "/C") {
+                    newacl = new Acl(null, null);
+                } else if (config.options == "/N") {
+                    newacl = new Acl(config.pattern, acl.Descendant);
+                } else if (config.options == "/D") {
+                    newacl = new Acl(acl.Node, config.pattern);
+                } else if (config.options == "/CN") {
+                    newacl = new Acl(null, acl.Descendant);
+                } else if (config.options == "/CD") {
+                    newacl = new Acl(acl.Node, null);
+                } else {
+                    Console.WriteLine("Unrecognized option.");
+                    return 1;
+                }
+
+                ok = SdsUtilsAcl.StoreACL(config.pathName, newacl, ds, out errorOut);
+                if (ok) Console.WriteLine("Acl for "+config.pathName+" was set.");
+                else Console.WriteLine("setacl failed. reason({0})",SdsUtils.ErrorCodeToString(errorOut));
+
+                return ok ? 0 : 1;
+            }
+            finally {
+                delete ds;
+            }
+        }
+
+    } // class Test
+}
diff --git a/base/Applications/utilities/symlink/symlink.csproj b/base/Applications/utilities/symlink/symlink.csproj
new file mode 100644
index 0000000..00c330e
--- /dev/null
+++ b/base/Applications/utilities/symlink/symlink.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>symlink</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="symlink.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/utilities/symlink/symlink.sg b/base/Applications/utilities/symlink/symlink.sg
new file mode 100644
index 0000000..cdd1442
--- /dev/null
+++ b/base/Applications/utilities/symlink/symlink.sg
@@ -0,0 +1,156 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   symlink.sg
+//
+//  Note:
+//
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using System.Diagnostics;
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications {
+    [ConsoleCategory(DefaultAction=true)]
+    internal class Parameters {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [StringParameter( "link", Position=0, Mandatory=true)]
+        internal string symPath;
+
+        [StringParameter( "value", Position=1, Mandatory=true)]
+        internal string symValue;
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            return SymbolicLink.AppMain(this);
+        }
+    }
+
+    public class SymbolicLink
+    {
+        private static int symlink(DirectoryServiceContract.Imp:Ready! rootNS, string! dir, string! name, string! link)
+        {
+           int result = -1;
+
+            DirectoryServiceContract.Imp! dirImp;
+            DirectoryServiceContract.Exp! dirExp;
+            DirectoryServiceContract.NewChannel(out dirImp, out dirExp);
+
+            ErrorCode errorOut;
+            bool ok = SdsUtils.Bind(dir, rootNS, dirExp, out errorOut);
+            if (!ok) {
+                Console.WriteLine("Bind of {0} failed. reason: {1}\n",
+                                   dir,SdsUtils.ErrorCodeToString(errorOut) );
+                delete dirImp;
+                return -1;
+            }
+            else {
+                result = 0;
+            }
+
+            switch receive {
+                case dirImp.Success() :
+                    break;
+                case dirImp.ChannelClosed() :
+                    delete dirImp;
+                    return -1;
+                    break;
+                case unsatisfiable :
+                    delete dirImp;
+                    return -2;
+                    break;
+            }
+
+
+            //Console.WriteLine("creating link in dir "+dir+" with name="+name+" whose value="+link);
+            dirImp.SendCreateLink(Bitter.FromString2(name),Bitter.FromString2(link));
+            switch receive
+            {
+                case dirImp.AckCreateLink() :
+                    result = 0;
+                    break;
+                case dirImp.NakCreateLink(error) :
+                    DebugStub.Break();
+                    break;
+                case dirImp.ChannelClosed():
+                    throw new Exception("Channel closed unexpectedly");
+            }
+
+            delete dirImp;
+            return result;
+        } //symlink
+
+
+        private static void tell()
+        {
+            Console.WriteLine("symlink <link name>  <link value>");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+
+            string[] parts = null;
+            //FIXFIX xxx is needed to make null checker happy
+            string xxx = config.symPath;
+            if (xxx != null)
+                parts = xxx.Split('/');
+
+            if ( (parts == null) || (parts.Length == 0) )
+            {
+                Console.WriteLine(" no delimiter");
+                return -1;
+            }
+
+            string name = parts[parts.Length-1];
+            if ( name == null)
+            {
+                Console.WriteLine(" no delimiter");
+                return -1;
+            }
+            string dirName = "";
+            for (int i = (parts[0] == "") ? 1 : 0;
+                i < parts.Length-1; i++) {
+                dirName = dirName + "/" + parts[i];
+            }
+
+            Console.WriteLine("creating link in dir "+dirName+" with name="+name+" whose value="+config.symValue);
+
+            DirectoryServiceContract.Imp ds = (config.nsRef).Acquire(); 
+            if (ds == null) { 
+                throw new Exception("Unable to acquire handle to the Directory Service root"); 
+            } 
+            ds.RecvSuccess();
+    
+            int status = symlink(ds, dirName, name, config.symValue);
+            //Console.WriteLine(args[0] + " returned " + status);
+            delete ds;
+            return status;
+        }
+    }//SymbolicLink
+}//namespace
diff --git a/base/Applications/wafgen99/wafgen99.csproj b/base/Applications/wafgen99/wafgen99.csproj
new file mode 100644
index 0000000..bfacb7f
--- /dev/null
+++ b/base/Applications/wafgen99/wafgen99.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Wafgen99</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Wafgen99.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Applications/wafgen99/wafgen99.sg b/base/Applications/wafgen99/wafgen99.sg
new file mode 100644
index 0000000..999531e
--- /dev/null
+++ b/base/Applications/wafgen99/wafgen99.sg
@@ -0,0 +1,659 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//
+// Ported from SpecWeb99 source code by Mark Aiken
+//
+
+using FileSystem.Utils;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+///////////////////////////////////////
+// Quick and dirty abstraction of file operations
+//////////////////////////////////////
+using Microsoft.Contracts;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications
+{
+    [ConsoleCategory(HelpMessage="Generate files for Specweb", DefaultAction=true)]
+    internal class Parameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Exp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Start> nsRef;
+
+        [BoolParameter( "v", Default=false, HelpMessage="verbose")]
+        internal bool doVerbose;
+
+        [BoolParameter( "V", Default=false, HelpMessage="validate only")]
+        internal bool doValidateOnly;
+
+        [BoolParameter( "t", Default=false, HelpMessage="test mode")]
+        internal bool doTestMode;
+
+        [BoolParameter( "p", Default=false, HelpMessage="Purge files on exit")]
+        internal bool doCleanup;
+
+        [LongParameter( "n",  Default=9, HelpMessage="Files per class")]
+        internal long filesPerClass;
+
+        [LongParameter( "c", Default=10, HelpMessage="Number of connections")]
+        internal long connections;
+
+        [StringParameter( "directory", Mandatory=true, Position=0, HelpMessage="directory.")]
+        internal string directory;
+
+
+        reflective internal Parameters();
+
+        internal int AppMain() {
+            WafGen99.AppMain(this);
+            return 0;
+        }
+    }
+
+    public class FILE
+    {
+        static private VContainer<byte>! workBuffer;
+
+        private TRef<FileContract.Imp:Ready>! connRef;
+        private long filePos;
+        private string! path;
+
+        public static FILE CreateFile(string! path)
+        {
+            if (FileUtils.CreateFile(path) != 0) {
+                return null;
+            }
+
+            return OpenFile(path);
+        }
+
+        public static FILE OpenFile(string! path)
+        {
+            FileContract.Imp conn = FileUtils.OpenFile(path);
+
+            if (conn != null) {
+                return new FILE(conn, path);
+            }
+            else {
+                return null;
+            }
+        }
+
+        static FILE()
+        {
+            workBuffer  = new VContainer<byte>(new [ExHeap] byte[2 * 1024 * 1024]);
+        }
+
+        private FILE([Claims] FileContract.Imp:Ready! conn, string! thePath)
+        {
+            connRef     = new TRef<FileContract.Imp:Ready>(conn);
+            filePos     = 0;
+            path        = thePath;
+            base();
+        }
+
+        public int Write(string! str)
+        {
+            byte[] bytes = Encoding.ASCII.GetBytes(str);
+            return Write(bytes, 0, bytes.Length);
+        }
+
+        public int Write(byte[]! buf, int offset, int length)
+        {
+            FileContract.Imp conn = connRef.Acquire();
+            byte[]! in ExHeap wbuf = workBuffer.Acquire();
+            if (length > wbuf.Length) {
+                DebugStub.Print("workbuf resize {0} -> {1} (write)\n",
+                                __arglist(wbuf.Length, length));
+                delete wbuf;
+                wbuf = new [ExHeap] byte [length];
+            }
+            Bitter.FromByteArray(wbuf, 0, length, buf, offset);
+
+            try {
+                long bytesWritten;
+                int error;
+                conn.SendWrite(wbuf, 0, filePos, length);
+                conn.RecvAckWrite(out wbuf, out bytesWritten, out error);
+                workBuffer.Release(wbuf);
+
+                filePos += bytesWritten;
+                if (error == 0) {
+                    return (int)bytesWritten;
+                }
+                else {
+                    throw new Exception("Write failed");
+                }
+            }
+            finally {
+                connRef.Release(conn);
+            }
+            return 0;
+        }
+
+        public int Read(byte[]! buf, int offset, int length)
+        {
+            FileContract.Imp conn = connRef.Acquire();
+            byte[]! in ExHeap bytes = workBuffer.Acquire();
+
+            if (length > bytes.Length) {
+                DebugStub.Print("workbuf resize {0} -> {1} (read)\n",
+                                __arglist(bytes.Length, length));
+                delete bytes;
+                bytes = new [ExHeap] byte [length];
+            }
+
+            try {
+                long bytesRead;
+                int error;
+                conn.SendRead(bytes, 0, filePos, length);
+                conn.RecvAckRead(out bytes, out bytesRead, out error);
+
+                filePos += bytesRead;
+
+                if (error == 0) {
+                    Bitter.ToByteArray(bytes, 0, length, buf, offset);
+                    workBuffer.Release(bytes);
+                    return (int)bytesRead;
+                }
+                else {
+                    workBuffer.Release(bytes);
+                    throw new Exception("Read failed");
+                    return 0;
+                }
+            }
+            finally {
+                connRef.Release(conn);
+            }
+        }
+
+        public int Size
+        {
+            // TODO
+            get {
+                long size;
+                NodeType nodeType;
+                ErrorCode error;
+
+                DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+                bool ok  = FileUtils.GetAttributes(path, rootNS, out size, out nodeType, out  error);
+                delete rootNS;
+
+                if (!ok) {
+                    throw new Exception("Failed to get attributes");
+                } else {
+                    return unchecked((int)size);
+                }
+            }
+        }
+
+        public void Close()
+        {
+            FileContract.Imp conn = connRef.Acquire();
+
+            try {
+                conn.SendClose();
+            }
+            finally {
+                connRef.Release(conn);
+            }
+        }
+    }
+
+    ///////////////////////////////////////
+    // The content generator / verifier
+    //////////////////////////////////////
+
+    public class WafGen99
+    {
+        //////////////////////////////////
+        // Constants
+        private const int    MAX_PATH              = 256;
+        private const int    LINESIZE              = 64;
+        private const int    MARKER_FREQ           = 4096;
+        private const int    BUF_SIZE              = 1024*1024; /* 1MB */
+        private const string topDirName            = "file_set";
+
+        //////////////////////////////////
+        // Pseudo-constants
+        private static readonly int[]!  CLASS_BASE_SIZE = {1024, 10240, 102400, 1024000};
+        private static readonly int MAX_CLASS_COUNT = CLASS_BASE_SIZE.Length;
+
+        //////////////////////////////////
+        // Instance variables
+        private bool verbose = false;
+        private bool testMode = false;
+        private byte[]! buf;
+        private string baseDir;
+        private readonly int filesPerClass;
+
+        public WafGen99(bool   verb,
+                        bool   test,
+                        string theBase,
+                        int    filesPerClass)
+        {
+            buf = new byte[BUF_SIZE];
+            base();
+            verbose = verb;
+            testMode = test;
+            this.filesPerClass = filesPerClass;
+            baseDir = theBase;
+        }
+
+        private static byte GetTestValue(int index)
+        {
+            string pattern = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+            return (byte) pattern[index % pattern.Length];
+        }
+
+        // Returns false on error
+        private bool CreateFile(int classNum, int num, int size, string! name, string! path)
+        {
+            FILE fp;
+
+            int initialSize = size;
+
+            int[] incLocations = new int[MAX_CLASS_COUNT * filesPerClass * 10];
+            int markerCt;
+            int includes;
+            int includeCt;
+            int markersPerInclude;
+
+            if (verbose) {
+                Console.WriteLine("Creating  {0} [ {1} bytes ]", name, size);
+            }
+
+            // Try to open the file
+            fp = FILE.CreateFile(path);
+
+            if (fp == null) {
+                Console.WriteLine("Can't open file '" + path + "'");
+                return false;
+            }
+
+            // Write a header line
+            size -= fp.Write(String.Format("{0,9:d} {1}\n", size, name));
+
+            markerCt = size / MARKER_FREQ + 1;
+            includeCt = size / (4096*4) + 1;
+
+            if (classNum == 0) {
+                includeCt = 0;
+            }
+            else if (classNum == 1) {
+                includeCt = 1;
+            }
+            else if (classNum == 2) {
+                includeCt = 2;
+            }
+            else {
+                includeCt = 0;
+            }
+
+            Random rand = new Random();
+
+            if (includeCt > 0) {
+                markersPerInclude = markerCt / includeCt;
+
+                for (int i = 0; i < includeCt; i++) {
+                    /* The replacements can't cover up the implanted validation
+                    characters -- they will always just after a marker*/
+                    incLocations[i] = rand.Next(markersPerInclude * i, markersPerInclude * (i+1) - 1);
+
+                    if (incLocations[i] > markerCt) {
+                        incLocations[i] = markerCt;
+                    }
+                }
+            }
+
+            includes = 0;
+            markerCt = 0;
+
+            int pos = 0;
+            int nameOffset = 0;
+
+            for (int i = 0; i < size; i++) {
+                if (!testMode && (i % MARKER_FREQ == 0)) {
+                    buf[pos++] = ((byte)name[nameOffset++]);
+
+                    if ((includes < includeCt) && (incLocations[includes] == markerCt)) {
+                        includes++;
+                        string markerStr = String.Format("<!WEB99CAD><IMG SRC=\"/file_set/dirNNNNN/classX_Y\"><!/WEB99CAD>\n");
+                        int encodedBytes = Encoding.ASCII.GetBytes(markerStr, 0, markerStr.Length, buf, pos);
+                        i += encodedBytes;
+                        pos += encodedBytes;
+                    }
+
+                    markerCt++;
+
+                    if (nameOffset == name.Length) {
+                        nameOffset = 0;
+                    }
+                }
+                else if (i % LINESIZE == LINESIZE - 1) {
+                    buf[pos++] = (byte)'\n';
+                }
+                else if (testMode) {
+                    buf[pos++] = GetTestValue(i);
+                }
+                else {
+                    buf[pos++] = (byte)rand.Next(33,125);
+                }
+
+                if (pos >= BUF_SIZE) {
+                    fp.Write(buf, 0, pos);
+                    pos = 0;
+                }
+            }
+
+            if (pos > 0) {
+                fp.Write(buf, 0, pos);
+            }
+
+            fp.Close();
+
+            if (!ValidateFile(classNum, num, initialSize, name, path)) {
+                DebugStub.Break();
+                ValidateFile(classNum, num, initialSize, name, path);
+                return false;
+            }
+
+            return true;
+        }
+
+        // returns false on failure
+        bool ValidateFile(int classNum, int fileNum, int size, string! name, string! path)
+        {
+            FILE fp;
+
+            if (verbose) {
+                Console.WriteLine("Verifying {0} [ {1} bytes ]", name, size);
+            }
+
+            fp = FILE.OpenFile(path);
+
+            if (fp == null) {
+                Console.WriteLine("Couldn't open file '" + path + "'");
+                return false;
+            }
+
+            if (fp.Size != size) {
+                Console.WriteLine("{0}: Incorrect file size (expected {1} bytes, have {2} bytes).", name, size, fp.Size);
+                return false;
+            }
+
+            string valString = String.Format("{0,9:d} {1}\n", size, name);
+            int headerSize = valString.Length;
+
+            // Read the file header
+            fp.Read(buf, 0, headerSize);
+            string readString = Encoding.ASCII.GetString(buf, 0, headerSize);
+
+            if (valString != readString) {
+                Console.WriteLine("{0}: Header for file is incorrect", name);
+                return false;
+            }
+
+            int curBufSize = fp.Read(buf, 0, BUF_SIZE);
+            int offset = 0, nameOffset = 0;
+
+            // Examine every byte in the file in this loop
+            for (int i = 0; i < size - headerSize; i++) {
+                if (!testMode && (i % MARKER_FREQ == 0)) {
+                    if (buf[i - offset] != name[nameOffset++]) {
+                        Console.WriteLine("{0}:Validation data incorrect at offset {1}", name, headerSize + offset + i);
+                        fp.Close();
+                        return false;
+                    }
+
+                    if (nameOffset == name.Length) {
+                        nameOffset = 0;
+                    }
+                }
+                else if (i % LINESIZE == LINESIZE - 1) {
+                    if (buf[i - offset] != '\n') {
+                        Console.WriteLine("{0}:Missing newline at offset {1}", name, headerSize + offset + i);
+                        fp.Close();
+                        return false;
+                    }
+                }
+                else if (testMode) {
+                    byte expected = GetTestValue(i);
+                    if (buf[i - offset] != expected) {
+                        Console.WriteLine("{0}:Bad byte value at offset {1} ({2} != {3})", name, headerSize + offset + i, buf[i - offset], expected);
+                        fp.Close();
+                        return false;
+                    }
+                }
+
+                if (i >= curBufSize) {
+                    offset += curBufSize;
+                    curBufSize = fp.Read(buf, 0, BUF_SIZE);
+
+                    if (curBufSize <= 0) {
+                        Console.WriteLine("{0}: Error reading from file", path);
+                        fp.Close();
+                        return false;
+                    }
+                }
+            }
+
+            fp.Close();
+            return true;
+        }
+
+        private struct FileSpec
+        {
+            public string name, fullPath;
+            public int size, classNum, fileNum;
+        }
+
+        private string[]! MakeDirList(int startDir, int endDir)
+        {
+            int numDirs = endDir - startDir;
+            string[] retval = new string[numDirs];
+
+            for(int dir = startDir; dir < endDir; dir++) {
+                retval[dir - startDir] = String.Format("{0}/dir{1}", topDirName, dir.ToString("d05"));
+            }
+
+            return retval;
+        }
+
+        private FileSpec[]! MakeFileList(string[]! dirs)
+        {
+            FileSpec[] retval = new FileSpec[MAX_CLASS_COUNT * filesPerClass * dirs.Length];
+            int idx = 0;
+
+            foreach (string dirName in dirs) {
+                for (int classNum = 0; classNum < MAX_CLASS_COUNT; classNum++) {
+                    for (int num = 0; num < filesPerClass; num++) {
+                        int size = (CLASS_BASE_SIZE[classNum] * (num+1)) / 10;
+
+                        retval[idx] = new FileSpec();
+                        retval[idx].name = String.Format("{0}/class{1,1:d}_{2,1:d}", dirName, classNum, num);
+                        retval[idx].fullPath = String.Format("{0}/{1}", baseDir, retval[idx].name);
+                        retval[idx].classNum = classNum;
+                        retval[idx].fileNum = num;
+                        retval[idx].size = size;
+                        idx++;
+                    }
+                }
+            }
+
+            return retval;
+        }
+
+        // Returns false on failure
+        private bool CreateFiles(int startDir, int endDir)
+        {
+            string topDirectory = String.Format("{0}/{1}", baseDir, topDirName);
+
+            if (DirectoryUtils.CreateDirectory(topDirectory) != 0) {
+                Console.WriteLine("Couldn't mkdir '" + topDirectory + "'");
+                return false;
+            }
+
+            string[]! dirs = MakeDirList(startDir, endDir);
+
+            foreach (string relPath in dirs) {
+                string fullPath = String.Format("{0}/{1}", baseDir, relPath);
+                if (DirectoryUtils.CreateDirectory(fullPath) != 0) {
+                    Console.WriteLine("Couldn't mkdir '" + fullPath + "'");
+                    return false;
+                }
+            }
+
+            FileSpec[]! files = MakeFileList(dirs);
+
+            foreach (FileSpec spec in files) {
+                if (!CreateFile(spec.classNum, spec.fileNum, spec.size, (!)spec.name, (!)spec.fullPath)) {
+                    Console.WriteLine("Couldn't make file '" + spec.fullPath + "'");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        // Returns false on failure
+        private bool ValidateFiles(int startDir, int endDir)
+        {
+            string[]! dirs = MakeDirList(startDir, endDir);
+            FileSpec[]! files = MakeFileList(dirs);
+
+            foreach (FileSpec spec in files) {
+                if (!ValidateFile(spec.classNum, spec.fileNum, spec.size, (!)spec.name, (!)spec.fullPath)) {
+                    Console.WriteLine("Validation failed for file '" + spec.fullPath + "'");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool Cleanup(int startDir, int endDir)
+        {
+            bool success = true;
+            string[]! dirs = MakeDirList(startDir, endDir);
+
+            FileSpec[]! files = MakeFileList(dirs);
+            foreach (FileSpec spec in files) {
+                int error = FileUtils.DeleteFile((!)spec.fullPath);
+                if (error != 0) {
+                    Console.WriteLine("Failed to delete {0} (error {1})",
+                                      spec.fullPath, error);
+                    success = false;
+                }
+            }
+
+            foreach (string! relPath in dirs) {
+                string fullPath = baseDir + "/" + relPath;
+                int error = DirectoryUtils.DeleteDirectory(fullPath);
+                if (error != 0) {
+                    Console.WriteLine("Failed to delete {0} (error {1})",
+                                      fullPath, error);
+                    success = false;
+                }
+            }
+
+            do {
+                string topDirectory = String.Format("{0}/{1}", baseDir, topDirName);
+                int error = DirectoryUtils.DeleteDirectory(topDirectory);
+                if (error != 0) {
+                    Console.WriteLine("Failed to delete {0} (error {1})",
+                                      topDirectory, error);
+                    success = false;
+                }
+            } while (false);
+
+            return success;
+        }
+
+        private static int ConnectionsToDirectories(int conns)
+        {
+            return ((int) (25 + (((400000.0 / 122000.0) * conns)/5.0)));
+        }
+
+        private static void Usage()
+        {
+            Console.WriteLine("wafgen99: A static-content fileset generator for SpecWEB99");
+            Console.WriteLine("          ported by Mark Aiken");
+            Console.WriteLine("");
+            Console.WriteLine("wafgen99 [-v] [-V] [-t] [connectionCount] targetDir");
+            Console.WriteLine("  -v : Verbose output");
+            Console.WriteLine("  -V : Validate files only (no generation)");
+            Console.WriteLine("  -t : Test mode; no random characters in generated files");
+            Console.WriteLine("  targetDir : Location to hold the fileset");
+        }
+
+        internal static void AppMain(Parameters! config)
+        {
+
+            bool verbose = config.doVerbose;
+            bool testmode = config.doTestMode;
+            bool validateOnly = config.doValidateOnly;
+            string basePath = config.directory;
+
+            int connectionCount = (int)config.connections;
+            int filesPerClass   = (int)config.filesPerClass;
+
+            if (testmode && validateOnly) {
+                Console.WriteLine("Test mode is incompatible with validate-only mode");
+                Usage();
+                return;
+            }
+
+            if (basePath == null) {
+                Console.WriteLine("No target path specified");
+                Usage();
+                return;
+            }
+
+            WafGen99 waf =
+                new WafGen99(verbose, testmode, basePath, filesPerClass);
+
+            int directoryCount = ConnectionsToDirectories(connectionCount);
+            if (!validateOnly) {
+                if (!waf.CreateFiles(0, directoryCount)) {
+                    Console.WriteLine("Failed to create all files.");
+                    return;
+                }
+            }
+
+            if (!waf.ValidateFiles(0, directoryCount)) {
+                Console.WriteLine("Validation failed.");
+                return;
+            }
+
+            if (config.doCleanup && !waf.Cleanup(0, directoryCount)) {
+                Console.WriteLine("Clean up failed.");
+                return;
+            }
+
+            Console.WriteLine("Success.");
+        }
+    }
+}
diff --git a/base/Contracts/Contracts.App.proj b/base/Contracts/Contracts.App.proj
new file mode 100644
index 0000000..8f50455
--- /dev/null
+++ b/base/Contracts/Contracts.App.proj
@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <ItemGroup>
+    <!-- app contracts -->
+    <ProjectReference Include="Directory.Contracts\Directory.Contracts.csproj"/>
+    <ProjectReference Include="Diagnostics.Contracts\Diagnostics.Contracts.csproj"/>
+    <ProjectReference Include="FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="Io.Contracts\Io.Contracts.csproj"/>
+    <ProjectReference Include="Io.Net.Contracts\Io.Net.Contracts.csproj"/>
+    <ProjectReference Include="Diagnostics.Contracts\Diagnostics.Contracts.csproj"/>
+    <ProjectReference Include="Stress.Contracts\Stress.Contracts.csproj"/>
+    <ProjectReference Include="Security.Contracts\Security.Contracts.csproj"/>
+    <ProjectReference Include="NetStack.Contracts\NetStack.Contracts.csproj"/>
+    <ProjectReference Include="WebApps.Contracts\WebApps.Contracts.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Contracts/Contracts.Kernel.proj b/base/Contracts/Contracts.Kernel.proj
new file mode 100644
index 0000000..7b5e334
--- /dev/null
+++ b/base/Contracts/Contracts.Kernel.proj
@@ -0,0 +1,18 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="Directory.Contracts\Directory.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="Diagnostics.Contracts\Diagnostics.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="FileSystem.Contracts\FileSystem.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="Io.Contracts\Io.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="NetStack.Contracts\NetStack.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="Stress.Contracts\Stress.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="Security.Contracts\Security.Contracts.Kernel.csproj"/>
+
+    <ProjectReference Include="WebApps.Contracts\WebApps.Contracts.Kernel.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Contracts/Counter.Contracts/Counter.Contracts.csproj b/base/Contracts/Counter.Contracts/Counter.Contracts.csproj
new file mode 100644
index 0000000..9ae1ab5
--- /dev/null
+++ b/base/Contracts/Counter.Contracts/Counter.Contracts.csproj
@@ -0,0 +1,30 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Counter.Contracts\Counter.Contracts.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Counter.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="$(SINGULARITY_ROOT)\Applications\Contracts\Counter.Contracts\CounterContract.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Contracts/CredentialsManager.Contracts/CredentialsManager.Contracts.csproj b/base/Contracts/CredentialsManager.Contracts/CredentialsManager.Contracts.csproj
new file mode 100644
index 0000000..8bce0a9
--- /dev/null
+++ b/base/Contracts/CredentialsManager.Contracts/CredentialsManager.Contracts.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\CredentialsManager.Contracts\CredentialsManager.Contracts.Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>CredentialsManager.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CredentialsManagerContract.sg" />
+    <Compile Include="GssSupplicantContract.sg" />
+    <Compile Include="NtlmSupplicantContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Contracts/CredentialsManager.Contracts/CredentialsManagerContract.sg b/base/Contracts/CredentialsManager.Contracts/CredentialsManagerContract.sg
new file mode 100644
index 0000000..e98a18d
--- /dev/null
+++ b/base/Contracts/CredentialsManager.Contracts/CredentialsManagerContract.sg
@@ -0,0 +1,210 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Security
+{
+	// This structure describes a "protocol context" or a "protocol tuple".
+	// This captures (roughly) the parameters that are relevant to security
+	// that a client application uses.
+	//
+	public rep struct ProtocolTuple : ITracked
+	{
+		// The protocol that is specific to the application in question.
+		// For example, "smb" or "http" or "ftp".
+		public char[]! in ExHeap ApplicationProtocol;
+		
+		// The address of the remote service or application, who will be
+		// authenticating the client application.  In this context, "address"
+		// can be any protocol-specific identifier of a remote peer.
+		// This includes addresses such as DNS names, IPv4 and IPv6 addresses,
+		// converted to text.
+		// For example, "products.redmond.corp.microsoft.com" or "192.168.1.1"
+		// or any other protocol-specific identifier of a remote principal.
+		public char[]! in ExHeap ServiceAddress;
+		
+		// The security protocol that the client wishes to use.
+		// For example, "ntlm" or "kerberos" or "spnego".
+		public char[]! in ExHeap AuthenticationProtocol;
+		
+		// The name of the remote security realm.  For NTLM, this is a domain name,
+		// e.g. "redmond".  For Kerberos, this is a domain name, e.g.
+		// "redmond.corp.microsoft.com".
+		public char[]! in ExHeap Realm;
+	}
+	
+	public rep struct CredentialsId : ITracked
+	{
+		public char[]! in ExHeap CredentialsName;
+		public char[]! in ExHeap Tag;
+	}
+
+	public rep struct ProtocolMapping : ITracked
+	{
+		public ProtocolTuple ProtocolTuple;
+		public CredentialsId CredentialsId;
+	}
+
+	public contract CredentialsManagerContract : ServiceContract
+	{
+		public const string ChannelPath = "/dev/credentials-manager";
+
+		public const string ProtocolFieldWildcard = "*";
+		
+		//
+		// Adds the specified credentials to the credentials store.
+		//
+		// The tag value can be used to disambiguate different instances of the same credentials.
+		// For example, the username ".\Administrator" might be used at three different machines,
+		// each of which have different passwords.  If the tag value is null, it is treated as
+		// an empty string.
+		//
+		in message AddCredentials(CredentialsId id, char[]! in ExHeap password, bool replace);
+
+		//
+		// Removes the specified credentials from the credentials store.  The username and tag
+		// value must match exactly the values provided previously in a call to AddCredentials.
+		// If the tag value is null, it is treated as an empty string.
+		//
+		in message DeleteCredentials(CredentialsId id);
+		
+		//
+		// Deletes all credentials in the credentials store.
+		//
+		in message DeleteAllCredentials();
+
+		//
+		// Enumerates the list of all credentials in the credentials store.
+		//		
+		in message EnumerateCredentials();
+		out message CredentialsList(CredentialsId[]! in ExHeap list);
+
+		//
+		// Adds a new mapping of a protocol tuple to credentials.
+		//
+		// Some of the fields of the protocol mapping ID support wildcards.
+		// To do so, the field should be set to "*".
+		// This allows the protocol mapping to apply to all contexts that match.
+		//
+		in message AddProtocolMapping(ProtocolTuple tuple, CredentialsId credentials, bool replace);
+		
+		//
+		// Deletes a specific protocol mapping.  The protocol mapping ID must match
+		// exactly an entry previously added using the AddProtocolMapping request.
+		// Wildcards (fields using "*") are not interpreted.
+		//
+		in message DeleteProtocolMapping(ProtocolTuple tuple);
+
+		//
+		// Deletes all protocol mappings.
+		//			
+		in message DeleteAllProtocolMappings();
+
+		//
+		// Searches the set of all protocol mappings for an entry that best matches
+		// a specific protocol mapping.
+		//
+		in message FindMatchingProtocolMapping(ProtocolTuple tuple, bool useWildcards);
+		out message NoMatchingProtocolMapping();
+		out message MatchingProtocolMapping(CredentialsId credentials);
+
+		//
+		// Queries the list of all protocol mappings.
+		//
+		in message EnumerateProtocolMappings();
+		out message ProtocolMappings(ProtocolMapping[]! in ExHeap mappings);
+			
+		// This message requests that the credentials manager create an instance of a security
+		// protocol (identified by name), using the endpoint provided by the import holder.
+		// This allows the import holder to choose the channel contract, which allows a
+		// single protocol implementation to support more than one channel contract.
+		// In response to this request, the credentials manager creates an instance of the
+		// protocol (if possible).
+		in message CreateSupplicant(
+			char[]! in ExHeap authenticationProtocol,
+			CredentialsId credentials,
+			ServiceContract.Exp:Start! exp);
+		
+		// This request is similar to CreateSupplicant, but it also performs a protocol
+		// tuple look-up, since this is anticipated to be a common usage of the CM.
+		in message CreateSupplicantForProtocol(
+			ProtocolTuple protocol,
+			ServiceContract.Exp:Start! exp);
+		out message AckCreateSupplicantForProtocol(CredentialsId credentialsSelected);
+
+		// Generic response messages.
+		// These are used when there is no request-specific data to return.
+		out message Ok();
+		out message RequestFailed(CredError error);
+
+
+		out message Success();
+
+		override state Start : one
+		{
+			Success! -> Ready;
+		}
+		
+		state Ready : one
+		{
+			AddCredentials? -> (Ok! or RequestFailed!) -> Ready;
+			DeleteCredentials? -> (Ok! or RequestFailed!) -> Ready;
+			DeleteAllCredentials? -> (Ok! or RequestFailed!) -> Ready;
+			
+			EnumerateCredentials? -> (CredentialsList! or RequestFailed!) -> Ready;
+			EnumerateProtocolMappings? -> (ProtocolMappings! or RequestFailed!) -> Ready;
+			
+			FindMatchingProtocolMapping? -> (MatchingProtocolMapping! or RequestFailed!) -> Ready;
+
+			AddProtocolMapping? -> (Ok! or RequestFailed!) -> Ready;
+			DeleteProtocolMapping? -> (Ok! or RequestFailed!) -> Ready;
+			DeleteAllProtocolMappings? -> (Ok! or RequestFailed!) -> Ready;
+			
+			CreateSupplicant? -> (Ok! or RequestFailed!) -> Ready;
+			CreateSupplicantForProtocol? -> (AckCreateSupplicantForProtocol! or RequestFailed!) -> Ready;
+		}	
+	}
+	
+	/// <summary>Strings that are appropriate for passing to CreateSupplicant.</summary>
+	public sealed /* static */ class AuthenticationProtocolNames
+	{
+		public const string Ntlm = "ntlm";
+		
+		// not yet implemented
+		public const string Kerberos = "kerberos";
+		
+		// not yet implemented
+		public const string HttpMD5 = "http-md5";
+	}
+
+
+	/// <summary>Error codes for the requests of the CredentialsManagerContract.</summary>	
+	public enum CredError
+	{
+		NoError = 0,
+		InternalError,
+		NoMatchingCredentials,
+		NoMatchingAuthenticationProtocol,
+		NoEntryFound,
+		ContractNotSupported,
+		MatchingEntryExists,
+		InvalidArguments,
+		EvidenceTypeNotSupported,
+	}
+}
+
+
diff --git a/base/Contracts/CredentialsManager.Contracts/GssSupplicantContract.sg b/base/Contracts/CredentialsManager.Contracts/GssSupplicantContract.sg
new file mode 100644
index 0000000..219bf5b
--- /dev/null
+++ b/base/Contracts/CredentialsManager.Contracts/GssSupplicantContract.sg
@@ -0,0 +1,154 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts/CredentialsManager.Contracts/GssSupplicantContract.sg
+//
+//  Note:	Defines a contract for use with authentication protocols that 
+//			use the GSSAPI model for exchanging tokens between clients and
+//			servers.
+//
+
+using System;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Security
+{
+	/**
+	<summary>
+		<para>
+			This contract represents an active authentication session.  It is modeled after
+			the GSS API, which is a standard API for performing authentication exchanges.
+			(See RFC 2078.)  However, this contract models only the behavior of a supplicant
+			(a client who wishes to prove its identity), not that of an authenticator.
+		</para>
+
+		<para>
+			This contract is analogous to an SSPI session in Win32.  See InitializeSecurityContext
+			and friends.
+		</para>
+		
+		<para>
+			In general, applications hold the import endpoint of this contract, while
+			implementations of authentication protocols, implemented in the Credentials
+			Manager Service, hold the export side.  The channel is bound using the
+			CreateSupplicant or CreateSupplicantForProtocol requests of the
+			CredentialsManagerContract.  Applications ferry opaque authentication tokens
+			between the local supplicant and the remote network service until both sides
+			decide that authentication has succeeded, or one side decides that authentication
+			has failed.  Applications should not interpret or modify the contents of the tokens.
+		</para>
+		
+		<para>
+			Authentication protocols vary in the number of messages sent, in which side sends
+			the first message, and in which side sends the last message.  This contract supports
+			all message patterns.  The supplicant sends the first message to the client application,
+			and that first message indicates whether the supplicant sends the first token,
+			(supplicant sends FirstToken to application), or expects the network service to send
+			the first token (supplicant sends NeedFirstToken).
+		</para>
+		
+		<para>
+			Currently, the only implementor of this contract is the NTLM authentication
+			protocol.  However, it is intended that SPNEGO, Kerberos, etc. will eventually
+			implement this contract as well.
+		</para>
+		
+		<para>
+			This contract should be expanded to allow applications to negotiate standard
+			GSS options, such as integrity / confidentiality services, etc.  For now,
+			it models only authentication (identification).
+		</para>
+	</summary>
+	*/
+	public contract GssSupplicantContract : ServiceContract
+	{
+		/// <summary>
+		/// If the supplicant sends this as the first message out of the Start state,
+		/// then the supplicant expects the remote network service to be the first to
+		/// send an authentication token.
+		/// </summary>
+		out message NeedFirstToken();
+		out message FirstToken(byte[]! in ExHeap token);
+		
+		override state Start : one
+		{
+			NeedFirstToken! -> WaitingForToken;
+			FirstToken! -> WaitingForToken;
+		}
+
+		state WaitingForToken : one
+		{
+			AcceptToken? -> ProcessingToken;
+		}
+
+		// The application sends this message to the supplicant when it has received
+		// an authentication token from the remote network service.  The supplicant
+		// will process the token, and will either decide that authentication has
+		// succeeded, or failed, or that another token must be sent to the network
+		// service (ContinueNeeded).
+		in message AcceptToken(byte[]! in ExHeap token);
+		
+		// The supplicant sends this message in response to AcceptToken when the
+		// supplicant needs to send a message to the remote network service.
+		// The application should send the message, using whatever network transport
+		// is appropriate.  Then the application should receive the next authentication
+		// token from the network service, and should forward the token to this
+		// supplicant.
+		out message ContinueNeeded(byte[]! in ExHeap token);
+		
+		// The supplicant sends this message in response to AcceptToken when the
+		// supplicant has processed the last message in the authentication exchange,
+		// and has decided that authentication has succeeded, and has a token it
+		// needs to transmit to the remote network service.  The application should
+		// transmit the token to the remote network service, and should consider
+		// authentication to be complete.
+		out message CompleteWithToken(byte[]! in ExHeap token);
+		
+		// The supplicant sends this message in response to AcceptToken when the
+		// supplicant has processed the last message in the authentication exchange,
+		// and has decided that authentication has succeeded, and there is no need
+		// to send another token to the remote network service.  The application
+		// should consider authentication to be complete.
+		out message Complete();
+		
+		// The supplicant sends this message in response to AcceptToken when the
+		// supplicant has decided that authentication has failed.
+		out message AuthenticationFailed(GssErrorCode error);
+		
+		state ProcessingToken : one
+		{
+			AuthenticationFailed! -> Failed;
+			ContinueNeeded! -> WaitingForToken;
+			Complete! -> Succeeded;
+			CompleteWithToken! -> Succeeded;
+		}
+		
+		state Succeeded : one
+		{
+		}
+		
+		state Failed : one
+		{
+		}
+		
+	}
+	
+	public enum GssErrorCode
+	{
+		None = 0,
+		
+		/// <summary>The server refused the request, for some unspecified reason.</summary>
+		ServerRefusedAuthentication,
+
+		InternalError,
+		
+		// Add more error codes here, as appropriate, once GSS support is fleshed out more.
+	}
+}
diff --git a/base/Contracts/CredentialsManager.Contracts/NtlmSupplicantContract.sg b/base/Contracts/CredentialsManager.Contracts/NtlmSupplicantContract.sg
new file mode 100644
index 0000000..fdeefaf
--- /dev/null
+++ b/base/Contracts/CredentialsManager.Contracts/NtlmSupplicantContract.sg
@@ -0,0 +1,47 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts/CredentialsManager.Contracts/NtlmSupplicantContract.sg
+//
+//  Note:	Defines the contract for using the NTLM authentication protocol,
+//			in "legacy" mode.
+//
+
+using System;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Security
+{
+	// This contract models an NTLM (legacy, not NTLMSSP) supplicant.
+	public contract NtlmSupplicantContract : ServiceContract
+	{
+		in message GetResponse(byte[]! in ExHeap challenge, NtlmResponseType type);
+		out message Response(byte[]! in ExHeap response);
+		out message RequestFailed(CredError error);
+		
+		override state Start : one
+		{
+			Success! -> Ready;
+		}
+		
+		out message Success();
+		
+		state Ready : one
+		{
+			GetResponse? -> (Response! or RequestFailed!) -> Ready;
+		}
+	}
+	
+	public enum NtlmResponseType
+	{
+		LanMan,
+		WindowsNt,
+	}
+}
diff --git a/base/Contracts/Diagnostics.Contracts/ChannelContract.sg b/base/Contracts/Diagnostics.Contracts/ChannelContract.sg
new file mode 100644
index 0000000..28d396e
--- /dev/null
+++ b/base/Contracts/Diagnostics.Contracts/ChannelContract.sg
@@ -0,0 +1,48 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelContract.sg
+//  Note:   Contract definition for the Singularity Channel diagnostics service
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Diagnostics.Contracts
+{
+    public rep struct ChannelInfo {
+        public int ChannelId;
+        public int ImpProcessId;
+        public int ExpProcessId;
+        public int MessagesDeliveredToImp;
+        public int MessagesDeliveredToExp;
+    }
+
+    public contract ChannelContract : ServiceContract
+    {
+        public const string ModuleName = "/channel-diagnostics";
+
+        // Signal our identity
+        out message Ready();
+
+        in message GetChannels();
+        out message Channels(ChannelInfo[]! in ExHeap channels);
+
+        in message GetChannelStats();
+        out message ChannelStats(long msgsSent, long bytesSent, long channelsCreated);
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            GetChannels? -> Channels! -> ReadyState;
+            GetChannelStats? -> ChannelStats! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/Diagnostics.Contracts/Diagnostics.Contracts.Kernel.csproj b/base/Contracts/Diagnostics.Contracts/Diagnostics.Contracts.Kernel.csproj
new file mode 100644
index 0000000..bf89087
--- /dev/null
+++ b/base/Contracts/Diagnostics.Contracts/Diagnostics.Contracts.Kernel.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Diagnostics.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ChannelContract.sg" />
+    <Compile Include="MemoryContract.sg" />
+    <Compile Include="ProcessContract.sg" />
+    <Compile Include="ProcMemInfoContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+</Project>
diff --git a/base/Contracts/Diagnostics.Contracts/Diagnostics.Contracts.csproj b/base/Contracts/Diagnostics.Contracts/Diagnostics.Contracts.csproj
new file mode 100644
index 0000000..4225326
--- /dev/null
+++ b/base/Contracts/Diagnostics.Contracts/Diagnostics.Contracts.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\Diagnostics.Contract\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Diagnostics.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ChannelContract.sg" />
+    <Compile Include="MemoryContract.sg" />
+    <Compile Include="ProcessContract.sg" />
+    <Compile Include="ProcMemInfoContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
+
diff --git a/base/Contracts/Diagnostics.Contracts/MemoryContract.sg b/base/Contracts/Diagnostics.Contracts/MemoryContract.sg
new file mode 100644
index 0000000..790ee52
--- /dev/null
+++ b/base/Contracts/Diagnostics.Contracts/MemoryContract.sg
@@ -0,0 +1,72 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MemoryContract.sg
+//  Note:   Contract definition for the memory diagnostic module
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Diagnostics.Contracts
+{
+    public contract MemoryContract : ServiceContract
+    {
+        // The name you should use to look up this module using the NameServer.
+        public const string ModuleName = "/memory-diagnostics";
+
+        public rep struct BlockInfo {
+            public long ptrVal;
+            public long size;
+            public long type;
+            public int ownerProcID;
+        }
+
+        // Signal our identity
+        out message Ready();
+
+        // Retrieve memory statistics
+        in message GetUsedMemory();
+        in message GetFreeMemory();
+        in message GetMaxMemory();
+        out message Memory(long bytes);
+
+        // Process specific memory statistics
+        in message GetProcessUsedMemory(int processId);
+        in message GetProcessPeakMemory(int processId);
+        in message GetProcessHandlePages(int processId);
+        out message Pages(long pages);
+
+        // Communication heap statistics
+        in message TotalUsedCommunicationHeap();
+        in message ProcessUsedCommunicationHeap(int processId);
+        out message BlocksAndTotal(long blocks, long bytes);
+        in message DumpExHeap();
+        out message ExHeapDump(BlockInfo[]! in ExHeap dump);
+
+        // Force a kernel GC
+        in message CollectGarbage();
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            GetUsedMemory? -> Memory! -> ReadyState;
+            GetFreeMemory? -> Memory! -> ReadyState;
+            GetMaxMemory? -> Memory! -> ReadyState;
+            GetProcessUsedMemory? -> Memory! -> ReadyState;
+            GetProcessPeakMemory? -> Memory! -> ReadyState;
+            GetProcessHandlePages? -> Pages! -> ReadyState;
+            TotalUsedCommunicationHeap? -> BlocksAndTotal! -> ReadyState;
+            ProcessUsedCommunicationHeap? -> BlocksAndTotal! -> ReadyState;
+            DumpExHeap? -> ExHeapDump! -> ReadyState;
+            CollectGarbage? -> Memory! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/Diagnostics.Contracts/ProcMemInfoContract.sg b/base/Contracts/Diagnostics.Contracts/ProcMemInfoContract.sg
new file mode 100644
index 0000000..6de2600
--- /dev/null
+++ b/base/Contracts/Diagnostics.Contracts/ProcMemInfoContract.sg
@@ -0,0 +1,61 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcMemInfoContract.sg
+//  Note:   Contract definition for the memory diagnostic module
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+using Microsoft.Singularity.Hal;
+
+namespace Microsoft.Singularity.Diagnostics.Contracts
+{
+    public contract ProcMemInfoContract : ServiceContract
+    {
+        // The name you should use to look up this module using the NameServer.
+        public const string ModuleName = "/procmeminfo-diagnostics";
+
+        public rep struct ProcessorAffinity
+        {
+            public uint domain;
+            public uint apicId;
+            public uint flagIgnore;
+        }
+
+        public rep struct MemoryAffinity
+        {
+            public uint  domain;
+            public ulong baseAddress;
+            public ulong endAddress;
+            public ulong memorySize;
+            public uint  flagIgnore;
+            public uint  flagHotPluggable;
+            public uint  flagNonVolatile;
+        }
+
+        // Signal our identity
+        out message Ready();
+        in  message GetProcessorAffinity();
+        out message ResultProcessorAffinity(ProcessorAffinity[]
+                                                in ExHeap processors);
+        in  message GetMemoryAffinity();
+        out message ResultMemoryAffinity(MemoryAffinity[]
+                                         in ExHeap memories);
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            GetProcessorAffinity? -> ResultProcessorAffinity! -> ReadyState;
+            GetMemoryAffinity? -> ResultMemoryAffinity! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/Diagnostics.Contracts/ProcessContract.sg b/base/Contracts/Diagnostics.Contracts/ProcessContract.sg
new file mode 100644
index 0000000..9c4b249
--- /dev/null
+++ b/base/Contracts/Diagnostics.Contracts/ProcessContract.sg
@@ -0,0 +1,61 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcessContract.sg
+//  Note:   Contract definition for the process diagnostic module
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Diagnostics.Contracts
+{
+    public contract ProcessContract : ServiceContract
+    {
+        // The name you should use to look up this module using the NameServer.
+        public const string ModuleName = "/process-diagnostics";
+
+        // Signal our identity
+        out message Ready();
+
+        // Retrieve the list of processes
+        in message GetProcessIDs();
+        out message ProcessIDs(int[]! in ExHeap IDs);
+
+        // Retrieve a process name
+        in message GetProcessName(int procID);
+        out message ProcessName(char[]! in ExHeap procName);
+
+        // Retrieve the threadID set for a given a process 
+        in message GetProcessThreadIDs(int procID);
+        out message ProcessThreadIDs(int[]! in ExHeap tids);
+
+        // Retrieve the process times for a given process  
+        in message GetProcessTimes(int procID);
+        out message ProcessTimes(long totalTime, long deadThreadTime, long deadThreadCount);
+
+        // Retrieve the stats for a given Process   
+        in message GetProcessGcStats(int procID);
+        out message ProcessGcStats(int count, long time, long bytes);
+
+        // Process not found
+        out message NotFound();
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            GetProcessIDs? -> ProcessIDs! -> ReadyState;
+            GetProcessThreadIDs? -> (ProcessThreadIDs! or NotFound!) -> ReadyState;
+            GetProcessTimes? -> (ProcessTimes! or NotFound!) -> ReadyState;
+            GetProcessGcStats? -> (ProcessGcStats! or NotFound!) -> ReadyState;
+            GetProcessName? -> (ProcessName! or NotFound!) -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/Directory.Contracts/Directory.Contracts.Kernel.csproj b/base/Contracts/Directory.Contracts/Directory.Contracts.Kernel.csproj
new file mode 100644
index 0000000..c1d2aeb
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/Directory.Contracts.Kernel.csproj
@@ -0,0 +1,38 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Directory.Contracts</AssemblyName>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DummyInstantiations.sg" />
+    <Compile Include="ExtensionContract.sg" />
+    <Compile Include="DirectoryServiceContract.sg" />
+    <Compile Include="NotifyContract.sg" />
+    <Compile Include="ServiceContract.sg" />
+    <Compile Include="ServiceProviderContract.sg" />
+    <Compile Include="FileContract.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Kernel.Contracts.csproj"/>
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.Kernel.csproj" />
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+</Project>
diff --git a/base/Contracts/Directory.Contracts/Directory.Contracts.csproj b/base/Contracts/Directory.Contracts/Directory.Contracts.csproj
new file mode 100644
index 0000000..a2686fd
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/Directory.Contracts.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Directory.Contract\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Directory.Contracts</AssemblyName>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DummyInstantiations.sg"/>
+    <Compile Include="ExtensionContract.sg"/>
+    <Compile Include="DirectoryServiceContract.sg"/>
+    <Compile Include="NotifyContract.sg"/>
+    <Compile Include="ServiceContract.sg"/>
+    <Compile Include="ServiceProviderContract.sg"/>
+    <Compile Include="FileContract.sg"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Corlib.Contracts.csproj"/>
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj"/>
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets"/>
+</Project>
diff --git a/base/Contracts/Directory.Contracts/DirectoryServiceContract.sg b/base/Contracts/Directory.Contracts/DirectoryServiceContract.sg
new file mode 100644
index 0000000..997298a
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/DirectoryServiceContract.sg
@@ -0,0 +1,331 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryServiceContract.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Directory
+{
+    // enumeration of possible errors reported by any operation
+    public enum ErrorCode : uint
+    {
+        NoError                 = 0,
+        AccessDenied            = 1,
+        AlreadyExists           = 2,
+        BadArguments            = 3,
+        ContractNotSupported    = 4,
+        DirectoryNotEmpty       = 5,
+        NotFound                = 6,
+        ChannelClosed           = 7,
+        Unsatisfiable           = 8,
+        NotImplemented          = 9,
+        NotSupported            = 10,
+        CapacityReached         = 11,
+        InsufficientResources   = 12,
+        DirectoryFull           = 13,
+        NotDirectory            = 14,
+        NotLink                 = 15,
+        NotProvider             = 16,
+        NotFile                 = 17,
+        IsOpen                  = 18,
+        Unknown                 = 99,
+    }
+
+    // enumeration of the existing node types found in the namespace
+    // implementation and the filesystem
+    public enum NodeType
+    {
+        Directory               = 1,
+        File                    = 2,
+        IoMemory                = 4,
+        ServiceProvider         = 8,
+        SymLink                 = 16,
+        BadNode                 = 32,
+    }
+
+    // a REP struct used to return responses to find or notify.
+    public rep struct EnumerationRecords : ITracked
+    {
+        public char[]! in ExHeap Path; // short name within a directory
+        public NodeType Type; // its type
+    }
+
+    public contract DirectoryServiceContract : ServiceContract
+    {
+
+        // REPARSE MESSAGES
+        // used for 2 different scenarios: DirectoryProvider and SymLink traversal
+        //  DirectoryProvider:
+        //      path=new directoryProvider to bind to to continue traversal
+        //      rest=suffix(P): the remainder of the initial path not yet parsed.
+        //  SymLink
+        //      path=contents of the symbolic link
+        //      rest=suffix(P): the remainder of the initial path not yet parsed.
+
+
+        // attempt to bind to an service exp endpoint
+        in     message Bind(char[]! in ExHeap path,
+                            ServiceContract.Exp:Start! exp);
+        out    message AckBind();
+        // attempt to return unused endpoint if possible
+        out    message NakBind(ServiceContract.Exp:Start exp,
+                               ErrorCode code);
+        out    message NakBindReparse(char[]! in ExHeap path,
+                               char[] in ExHeap rest,
+                               bool linkFound,
+                               ServiceContract.Exp:Start! exp);
+
+        // Find path and notify caller of any changes matching pattern over
+        // the imp endpoint supplied.
+        in     message Notify(char[]! in ExHeap path,
+                              char[]! in ExHeap pattern,
+                              bool sendExisting,
+                              NotifyContract.Imp:Start! imp);
+        out    message AckNotify();
+        out    message NakNotify(NotifyContract.Imp:Start! imp,
+                                 ErrorCode error);
+        out    message NakNotifyReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               NotifyContract.Imp:Start imp);
+
+        // Enumerate the contents of the current directory
+        in     message BeginEnumeration();
+        in     message ReadEnumeration();
+        in     message EndEnumeration();
+
+        out    message EnumerationEntries (EnumerationRecords[]! in ExHeap results, bool moreEntries);
+        out    message EnumerationTerminated(ErrorCode error);
+
+        // given a path return its nodetype and if meaningful its length
+        in     message GetAttributes(char []! in ExHeap path);
+        out    message AckGetAttributes(NodeType type, long size);
+        out    message NakGetAttributes(ErrorCode code);
+        out    message NakGetAttributesReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+
+        // given a path return the associated ACL if present
+        in     message QueryACL(char []! in ExHeap path, bool effective);
+        out    message AckQueryACL(char[] in ExHeap nodePattern, char[] in ExHeap descendantPattern);
+        out    message NakQueryACL(ErrorCode code);
+        out    message NakQueryACLReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+
+        // Greater permissions needed for ops below
+
+        // register a service's name serviceProvider endpoint with the SDS
+        in     message Register(char[]! in ExHeap path,
+                                ServiceProviderContract.Imp:Start! imp);
+        out    message AckRegister();
+        out    message NakRegister(ServiceProviderContract.Imp:Start imp,
+                                     ErrorCode error);
+        out    message NakRegisterReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               ServiceProviderContract.Imp:Start! imp);
+
+        // Deregister a service's name from the SDS
+        in     message Deregister(char[]! in ExHeap path);
+        out    message AckDeregister(ServiceProviderContract.Imp:Start! imp);   // return deregistered endpoint
+        out    message NakDeregister(ErrorCode error);
+        out    message NakDeregisterReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+
+        // create dirName within the current directory
+        // the current directory is the one bound on this channel
+        in     message CreateDirectory(char []! in ExHeap dirName);
+        out    message AckCreateDirectory();
+        out    message NakCreateDirectory(ErrorCode code);
+        out    message NakCreateDirectoryReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+        // delete dirName within the current directory
+        // the current directory is the one bound on this channel
+        in     message DeleteDirectory(char []! in ExHeap dirName);
+        out    message AckDeleteDirectory();
+        out    message NakDeleteDirectory(ErrorCode code);
+        out    message NakDeleteDirectoryReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+        // create file within the current directory
+        // the current directory is the one bound on this channel
+        // file creation only applies to the FS
+        in     message CreateFile(char []! in ExHeap fileName);
+        out    message AckCreateFile();
+        out    message NakCreateFile(ErrorCode code);
+        out    message NakCreateFileReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+        // create and "open" or bind to fileName within the current directory
+        // the current directory is the one bound on this channel
+        // this is common enough pattern to supply an optimization
+        in     message CreateAndBindFile(char []! in ExHeap fileName,
+                                         FileContract.Exp:Start! exp);
+        out    message AckCreateAndBindFile();
+        out    message NakCreateAndBindFile(FileContract.Exp:Start! exp,
+                                            ErrorCode code);
+
+        // delete fileName within the current directory
+        // the current directory is the one bound on this channel
+        in     message DeleteFile(char []! in ExHeap fileName);
+        out    message AckDeleteFile();
+        out    message NakDeleteFile(ErrorCode code);
+        out    message NakDeleteFileReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+        // for the given path and permission, return the associated ACL if present
+
+        in     message StoreACL(char []! in ExHeap fileName,
+                    char[] in ExHeap nodePattern, char[] in ExHeap descendantPattern);
+        out    message AckStoreACL();
+        out    message NakStoreACL(ErrorCode code);
+        out    message NakStoreACLReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+        // create a symlink node at linkPath with value linkValue
+        // Upon traversal linkPath will be returned to client
+        // it is up to the client to interpret and re-submit bind
+        // see reparse messages below.
+
+        in     message CreateLink(char []! in ExHeap linkPath,
+                         char []! in ExHeap linkValue );
+        out    message AckCreateLink();
+        out    message NakCreateLink(ErrorCode code);
+        out    message NakCreateLinkReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+        // delete symlink node at linkPath
+        in     message DeleteLink(char []! in ExHeap linkPath);
+        out    message AckDeleteLink();
+        out    message NakDeleteLink(ErrorCode code);
+        out    message NakDeleteLinkReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+        // Get symlink value
+        in     message GetLinkValue(char []! in ExHeap linkPath);
+        out    message AckGetLinkValue(char []! in ExHeap linkPath);
+        out    message NakGetLinkValue(ErrorCode code);
+        out    message NakGetLinkValueReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+
+        out    message Success();
+
+        ////////////////////////////////////////////////////////
+        // State  Machine
+        ////////////////////////////////////////////////////////
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Enumerate : one {
+            EnumerationTerminated!  -> Ready;
+            EnumerationEntries! -> EnumerateAck;
+        }
+
+        state EnumerateAck : one {
+            ReadEnumeration? -> Enumerate;
+             EndEnumeration? -> Ready;
+        }
+
+
+        state Ready: one
+        {
+            Bind? ->                (AckBind!
+                                     or NakBind!
+                                     or NakBindReparse!
+                                    ) -> Ready;
+
+            BeginEnumeration? ->     Enumerate;
+
+            CreateAndBindFile? ->   (AckCreateAndBindFile!
+                                     or NakCreateAndBindFile!
+                                    ) -> Ready;
+
+            CreateDirectory? ->     (AckCreateDirectory!
+                                     or NakCreateDirectory!
+                                     or NakCreateDirectoryReparse!
+                                    ) -> Ready;
+
+            CreateFile? ->          (AckCreateFile!
+                                     or NakCreateFile!
+                                     or NakCreateFileReparse!
+                                    ) -> Ready;
+
+            CreateLink? ->          (AckCreateLink!
+                                     or NakCreateLink!
+                                     or NakCreateLinkReparse!
+                                    ) -> Ready;
+
+
+            DeleteDirectory? ->     (AckDeleteDirectory!
+                                     or NakDeleteDirectory!
+                                     or NakDeleteDirectoryReparse!
+                                    ) -> Ready;
+
+            DeleteFile? ->          (AckDeleteFile!
+                                     or NakDeleteFile!
+                                     or NakDeleteFileReparse!
+                                    ) -> Ready;
+
+            DeleteLink? ->          (AckDeleteLink!
+                                     or NakDeleteLink!
+                                     or NakDeleteLinkReparse!
+                                    ) -> Ready;
+
+            Deregister? ->          (AckDeregister!
+                                     or NakDeregister!
+                                     or NakDeregisterReparse!
+                                    ) -> Ready;
+
+
+            GetAttributes? ->       (AckGetAttributes!
+                                      or NakGetAttributes!
+                                      or NakGetAttributesReparse!
+                                    ) -> Ready;
+
+            GetLinkValue? ->          (AckGetLinkValue!
+                                     or NakGetLinkValue!
+                                     or NakGetLinkValueReparse!
+                                    ) -> Ready;
+            Notify? ->              (AckNotify!
+                                     or NakNotify!
+                                     or NakNotifyReparse!
+                                    ) -> Ready;
+
+            QueryACL? ->            (AckQueryACL!
+                                     or NakQueryACL!
+                                     or NakQueryACLReparse!
+                                     ) -> Ready;
+
+            Register? ->            (AckRegister!
+                                     or NakRegister!
+                                     or NakRegisterReparse!
+                                    ) -> Ready;
+
+            StoreACL? ->            (AckStoreACL!
+                                     or NakStoreACL!
+                                     or NakStoreACLReparse!
+                                     ) -> Ready;
+       }
+   }
+}
diff --git a/base/Contracts/Directory.Contracts/DummyInstantiations.sg b/base/Contracts/Directory.Contracts/DummyInstantiations.sg
new file mode 100644
index 0000000..6bda742
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/DummyInstantiations.sg
@@ -0,0 +1,33 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//   Microsoft Research Singularity
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//   File:   Contracts\Directory.Contract\DummyInstantiations.sg
+//
+//   Note:   This file forces instantiation and thus definition of some
+//           commonly used TRefs in order for them to be defined in a canonical
+//           place. Otherwise, it is possible for separate compilation to 
+//	    cause multiple definitions of these instances to appear.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+namespace Dummy {
+
+    using Microsoft.Singularity.Directory;
+    using Microsoft.Singularity.Extending;
+    using Microsoft.Singularity.Channels;
+
+    class DummyInstances {
+        public TRef<DirectoryServiceContract.Imp:Start> dummy1;  
+        public TRef<DirectoryServiceContract.Exp:Start> dummy2;  
+        public TRef<DirectoryServiceContract.Imp:Ready> dummy3;  
+        public TRef<DirectoryServiceContract.Exp:Ready> dummy4;  
+
+        public TRef<ServiceProviderContract.Imp:Start> dummy5;  
+        public TRef<ServiceProviderContract.Exp:Start> dummy6;  
+        public TRef<ExtensionContract.Imp:Start> dummy7;  
+        public TRef<ExtensionContract.Exp:Start> dummy8;  
+    }
+}
diff --git a/base/Contracts/Directory.Contracts/ExtensionContract.sg b/base/Contracts/Directory.Contracts/ExtensionContract.sg
new file mode 100644
index 0000000..ba1c044
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/ExtensionContract.sg
@@ -0,0 +1,35 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ExtensionContract.sg
+//
+
+// This is the base contract to be used, and overridden by, every
+// system extension loaded as a child process.
+
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Extending
+{
+    public contract ExtensionContract : ServiceContract
+    {
+        in message Shutdown();     // Shutdown the extension gracefully.
+        out message AckShutdown();
+        out message NakShutdown();
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one
+        {
+            Shutdown? -> (AckShutdown! or NakShutdown!) -> Ready;
+            // AckShutdown should really go to done.
+        }
+    }
+}
diff --git a/base/Contracts/Directory.Contracts/FileContract.sg b/base/Contracts/Directory.Contracts/FileContract.sg
new file mode 100644
index 0000000..8347fbb
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/FileContract.sg
@@ -0,0 +1,41 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FileContract.sg
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory {
+    contract FileContract : ServiceContract {
+        out message Success();
+    
+        in message Read(byte []! in ExHeap buf, long bufOffset, 
+                        long fileOffset, long maxLength);
+        out message AckRead(byte []! in ExHeap buf, long bytesRead, int error);
+        
+        in message Write(byte []! in ExHeap buf, long bufOffset, 
+                         long fileOffset, long maxLength);
+        out message AckWrite(byte []! in ExHeap buf, long bytesWritten, 
+                             int error);
+        
+        in message Close();
+        out message AckClose();
+        
+        override state Start: one {
+            Success! -> Ready;
+        }
+        
+        state Ready: one {
+            Read? ->  AckRead! -> Ready;
+            Write? -> AckWrite! -> Ready;
+            Close? -> AckClose! -> Ready;
+        }
+    }
+}
\ No newline at end of file
diff --git a/base/Contracts/Directory.Contracts/NotifyContract.sg b/base/Contracts/Directory.Contracts/NotifyContract.sg
new file mode 100644
index 0000000..1c3dbd3
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/NotifyContract.sg
@@ -0,0 +1,34 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:  NotifyContract.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Directory
+{
+    public enum NotifyType 
+    {
+        Creation, 
+        Deletion,
+        Modification
+    }
+
+    public contract NotifyContract
+    {
+        in  message Begin(); 
+ 
+        in message ChangeNotification(char []! in ExHeap path, NotifyType type); 
+        out  message AckChangeNotification(); 
+      
+        state Start : Begin? -> Notify; 
+                  
+        state Notify : ChangeNotification? -> NotifyAck;
+        state NotifyAck: AckChangeNotification! -> Notify; 
+    }
+}
diff --git a/base/Contracts/Directory.Contracts/ServiceContract.sg b/base/Contracts/Directory.Contracts/ServiceContract.sg
new file mode 100644
index 0000000..2a0c7e3
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/ServiceContract.sg
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceContract.sg
+//
+
+// This is the base contract to be used, and overridden by, every Service
+// participating in the Directory
+
+namespace Microsoft.Singularity.Directory
+{
+     public contract ServiceContract
+     {
+        out message ContractNotSupported();
+
+        state Start: one
+        {
+            ContractNotSupported! -> DoneState;
+        }
+        state DoneState: one {}
+     }
+
+}
diff --git a/base/Contracts/Directory.Contracts/ServiceProviderContract.sg b/base/Contracts/Directory.Contracts/ServiceProviderContract.sg
new file mode 100644
index 0000000..0297d7a
--- /dev/null
+++ b/base/Contracts/Directory.Contracts/ServiceProviderContract.sg
@@ -0,0 +1,32 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceProviderContract.sg
+//
+
+//
+// Every leaf in the Directory communicates to a service by connecting through this contract 
+//
+
+namespace Microsoft.Singularity.Directory
+{
+    contract ServiceProviderContract
+    {
+        in  message Connect(ServiceContract.Exp:Start! exp);
+        out message AckConnect();
+        out message NackConnect(ServiceContract.Exp:Start exp);
+        // return the unconnected endpoint if possible.
+        
+        state Start: Connect? ->  Ack; 
+        
+        state Ack: one 
+        {
+            AckConnect!  -> Start;
+            NackConnect! -> Start;
+        }
+    }
+ }
+
diff --git a/base/Contracts/FileSystem.Contracts/FileSystem.Contracts.Kernel.csproj b/base/Contracts/FileSystem.Contracts/FileSystem.Contracts.Kernel.csproj
new file mode 100644
index 0000000..ab01d54
--- /dev/null
+++ b/base/Contracts/FileSystem.Contracts/FileSystem.Contracts.Kernel.csproj
@@ -0,0 +1,30 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\FileSystem.Contracts\FileSystem.Contracts.Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  <PropertyGroup>
+    <AssemblyName>FileSystem.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Iso9660ServiceControlContract.sg" />
+    <Compile Include="ThreadPoolControlContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+</Project>
diff --git a/base/Contracts/FileSystem.Contracts/FileSystem.Contracts.csproj b/base/Contracts/FileSystem.Contracts/FileSystem.Contracts.csproj
new file mode 100644
index 0000000..ead38e7
--- /dev/null
+++ b/base/Contracts/FileSystem.Contracts/FileSystem.Contracts.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\FileSystem.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>FileSystem.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Iso9660ServiceControlContract.sg"/>
+    <Compile Include="ThreadPoolControlContract.sg"/>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets"/>
+
+</Project>
diff --git a/base/Contracts/FileSystem.Contracts/Iso9660ServiceControlContract.sg b/base/Contracts/FileSystem.Contracts/Iso9660ServiceControlContract.sg
new file mode 100644
index 0000000..890bce9
--- /dev/null
+++ b/base/Contracts/FileSystem.Contracts/Iso9660ServiceControlContract.sg
@@ -0,0 +1,40 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.FileSystem {
+	public contract Iso9660ServiceControlContract : ServiceContract {
+		
+		in message Initialize(char[] in ExHeap device);
+		out message AckInitialize();
+		out message NackInitialize();
+
+		in message Mount(char[] in ExHeap location);
+		out message AckMount();
+		out message NackMount();
+		
+		in message Unmount();
+		out message AckUnmount();
+		out message NackUnmount();
+		
+		out message Success();
+		
+		override state Start : one {
+			Success! -> Ready;
+		}
+		
+		state Ready : one {
+		    Initialize? -> (AckInitialize! or NackInitialize!) -> Ready;
+		    Mount? -> (AckMount! or NackMount!) -> Ready;
+		    Unmount? -> (AckUnmount! or NackUnmount!) -> Ready;
+		}
+	}
+}
diff --git a/base/Contracts/FileSystem.Contracts/ThreadPoolControlContract.sg b/base/Contracts/FileSystem.Contracts/ThreadPoolControlContract.sg
new file mode 100644
index 0000000..f1ac641
--- /dev/null
+++ b/base/Contracts/FileSystem.Contracts/ThreadPoolControlContract.sg
@@ -0,0 +1,23 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.FileSystem {
+    public contract ThreadPoolControlContract {
+        in message TrackEndpoint();
+        out message AckTrackEndpoint();
+        
+        in message Terminate();
+        out message AckTerminate();
+        
+        state Start : one {
+            TrackEndpoint? -> AckTrackEndpoint! -> Start;
+            Terminate? -> AckTerminate! -> Start;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Contracts/ConsoleDeviceContract.sg b/base/Contracts/Io.Contracts/ConsoleDeviceContract.sg
new file mode 100644
index 0000000..b5fd146
--- /dev/null
+++ b/base/Contracts/Io.Contracts/ConsoleDeviceContract.sg
@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ConsoleDeviceContract.sg - Contract between apps and text video devices
+//
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public enum CursorSize : byte {
+        Small = 1,
+        Large = 2
+    }
+
+    public contract ConsoleDeviceContract : DeviceContract {
+
+        in message Clear();
+        out message AckClear();
+        out message NakClear();
+
+        in message GetDisplayDimensions();
+        out message DisplayDimensions(int columns, int rows);
+
+        in message GetCursorPosition();
+        out message CursorPosition(int column, int row);
+
+        in message SetCursorPosition(int column, int row);
+        out message AckSetCursorPosition();
+        out message InvalidPosition();
+
+        in message SetCursorSize(CursorSize cursorSize);
+        out message AckSetCursorSize();
+        out message NotSupported();
+
+        in message Write(char[]! in ExHeap buffer, int offset, int count);
+        out message AckWrite(char[]! in ExHeap buffer);
+        out message NakWrite(char[]! in ExHeap buffer);
+
+        in message PutChar(char c);
+        out message AckPutChar();
+
+        in message PutCharAt(char c, int column, int row);
+        out message AckPutCharAt();
+
+        in message ClearCursorToEndOfLine();
+        out message AckClearCursorToEndOfLine();
+
+        in message CursorFlash();
+        out message AckCursorFlash();
+        out message NakCursorFlash();
+
+        in message CursorHide();
+        out message AckCursorHide();
+        out message NakCursorHide();
+
+        in message CursorShow();
+        out message AckCursorShow();
+        out message NakCursorShow();
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one {
+            Clear? -> (AckClear! or NakClear!) -> Ready;
+            GetDisplayDimensions? -> DisplayDimensions! -> Ready;
+            GetCursorPosition? -> CursorPosition! -> Ready;
+            SetCursorPosition? -> (AckSetCursorPosition! or InvalidPosition!) -> Ready;
+            SetCursorSize? -> (AckSetCursorSize! or NotSupported!) -> Ready;
+            Write? -> (AckWrite! or NakWrite!) -> Ready;
+            PutChar? -> AckPutChar! -> Ready;
+            PutCharAt? -> (AckPutCharAt! or InvalidPosition!) -> Ready;
+            ClearCursorToEndOfLine? -> AckClearCursorToEndOfLine! -> Ready;
+            CursorFlash? -> (AckCursorFlash! or NakCursorFlash!) -> Ready;
+            CursorHide? -> (AckCursorHide! or NakCursorHide!) -> Ready;
+            CursorShow? -> (AckCursorShow! or NakCursorShow!) -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Contracts/DeviceContract.sg b/base/Contracts/Io.Contracts/DeviceContract.sg
new file mode 100644
index 0000000..0607468
--- /dev/null
+++ b/base/Contracts/Io.Contracts/DeviceContract.sg
@@ -0,0 +1,24 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DeviceContract.sg
+//
+
+using System;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract DeviceContract : ServiceContract
+    {
+    }
+}
diff --git a/base/Contracts/Io.Contracts/DiskContract.sg b/base/Contracts/Io.Contracts/DiskContract.sg
new file mode 100644
index 0000000..2730356
--- /dev/null
+++ b/base/Contracts/Io.Contracts/DiskContract.sg
@@ -0,0 +1,151 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IdeDiskContract.cs
+//
+//  Defines Message contracts for communications over channels with the Disk Device Driver
+
+using System;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public enum DiskAttributes : uint {
+        ReadOnly  = 0x01,
+        Removable = 0x02,
+    }
+
+    public contract DiskDeviceContract : DeviceContract
+    {
+            in  message GetDeviceName();
+            out message AckGetDeviceName(char* opt(ExHeap[])data);
+
+            /// <summary>
+            /// Retrieve sector offset of first sector on disk or partition.
+            /// </summary>
+            in message GetStartSector();
+            out message AckGetStartSector(ulong startSector);
+
+            /// <summary>
+            /// Retrieve number of sectors available on drive or partition.
+            /// </summary>
+            in  message GetSectorCount();
+            out message AckGetSectorCount(ulong sectorCount);
+
+            /// <summary>
+            /// Query for system identifier from partition table for
+            /// partition.  This method is only applicable to partitioned
+            /// drives.
+            /// </summary>
+            in  message GetSystemId();
+            out message SystemId(byte systemId);
+            out message NoSystemId();
+
+            in  message GetDiskAttributes();
+            out message AckGetDiskAttributes(DiskAttributes flags);
+
+            /// <summary>
+            /// Read data from disk.
+            /// <parameter name="sectorId">Relative sector on disk or partition to read data from. </parameter>
+            /// </summary>
+            in  message Read(byte []! in ExHeap data,
+                             ulong offset,
+                             ulong length,
+                             ulong sectorId);
+            out message AckRead(byte []! in ExHeap data);
+            out message NakRead();
+
+            /// <summary>
+            /// Write data to disk.
+            /// <parameter name="sectorId">Relative sector on disk or partition to write data to. </parameter>
+            /// </summary>
+            in  message Write(byte []! in ExHeap data,
+                              ulong offset,
+                              ulong length,
+                              ulong sectorId);
+            out message AckWrite(byte []! in ExHeap data);
+            out message NakWrite();
+
+            in  message NoOp();
+            out message AckNoOp();
+
+            in  message ReadPerf(int numMB, int chunkSize);
+            out message AckReadPerf(long cycles, long ticks);
+
+            out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one
+        {
+            GetDeviceName?      -> DoGetDeviceName;
+            GetDiskAttributes?  -> DoGetDiskAttributes;
+            GetStartSector?     -> DoGetStartSector;
+            GetSectorCount?     -> DoGetSectorCount;
+            GetSystemId?        -> DoGetSystemId;
+            Read?               -> DoRead;
+            Write?              -> DoWrite;
+            NoOp?               -> DoNoOp;
+            ReadPerf?           -> DoReadPerf;
+        }
+
+        state DoGetDeviceName: one
+        {
+            AckGetDeviceName! -> Ready;
+        }
+
+        state DoGetDiskAttributes: one
+        {
+            AckGetDiskAttributes! -> Ready;
+        }
+
+        state DoGetStartSector: one
+        {
+            AckGetStartSector! -> Ready;
+        }
+
+        state DoGetSectorCount: one
+        {
+            AckGetSectorCount! -> Ready;
+        }
+
+        state DoGetSystemId: one
+        {
+            SystemId!   -> Ready;
+            NoSystemId! -> Ready;
+        }
+
+        state DoRead: one
+        {
+            AckRead! -> Ready;
+            NakRead! -> Ready;
+        }
+        state DoReadPerf: one
+        {
+            AckReadPerf! -> Ready;
+        }
+
+        state DoWrite: one
+        {
+            AckWrite! -> Ready;
+            NakWrite! -> Ready;
+        }
+
+        state DoNoOp: one
+        {
+            AckNoOp! -> Ready;
+        }
+    }
+
+}
diff --git a/base/Contracts/Io.Contracts/Io.Contracts.Kernel.csproj b/base/Contracts/Io.Contracts/Io.Contracts.Kernel.csproj
new file mode 100644
index 0000000..65aa4f6
--- /dev/null
+++ b/base/Contracts/Io.Contracts/Io.Contracts.Kernel.csproj
@@ -0,0 +1,45 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Io.Contracts\Io.Contracts.Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Io.Contracts</AssemblyName>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ConsoleDeviceContract.sg" />
+    <Compile Include="DeviceContract.sg" />
+    <Compile Include="DiskContract.sg" />
+    <Compile Include="KeyboardDeviceContract.sg" />
+    <Compile Include="PnpContract.sg" />
+    <Compile Include="UnicodePipeContract.sg" />
+    <Compile Include="VideoDeviceContract.sg" />
+    <Compile Include="VolumeManagerContract.sg" />
+<!--    <Compile Include="..\IoSystem.Contracts\IoSystemContracts.sg"/> -->
+    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.Kernel.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+</Project>
diff --git a/base/Contracts/Io.Contracts/Io.Contracts.csproj b/base/Contracts/Io.Contracts/Io.Contracts.csproj
new file mode 100644
index 0000000..5769564
--- /dev/null
+++ b/base/Contracts/Io.Contracts/Io.Contracts.csproj
@@ -0,0 +1,47 @@
+
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Io.Contracts\Io.Contracts.App.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Io.Contracts</AssemblyName>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ConsoleDeviceContract.sg" />
+    <Compile Include="DeviceContract.sg" />
+    <Compile Include="DiskContract.sg" />
+    <Compile Include="KeyboardDeviceContract.sg" />
+    <Compile Include="PnpContract.sg" />
+    <Compile Include="SoundDeviceContract.sg" />
+    <Compile Include="UnicodePipeContract.sg" />
+    <Compile Include="VideoDeviceContract.sg" />
+    <Compile Include="VolumeManagerContract.sg" />
+
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj" />
+  
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
+
diff --git a/base/Contracts/Io.Contracts/KeyboardDeviceContract.sg b/base/Contracts/Io.Contracts/KeyboardDeviceContract.sg
new file mode 100644
index 0000000..3db8834
--- /dev/null
+++ b/base/Contracts/Io.Contracts/KeyboardDeviceContract.sg
@@ -0,0 +1,122 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   KeyboardDeviceContract.sg - Contract between apps and keyboards.
+//
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract KeyboardDeviceContract : DeviceContract {
+        in message GetKey();
+        in message PollKey();
+
+        out message AckKey(uint key);
+        out message NakKey();
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one {
+            GetKey? -> Waiting;
+            PollKey? -> (AckKey! or NakKey!) -> Ready;
+        }
+
+        state Waiting: one {
+            AckKey! -> Ready;
+            NakKey! -> Ready;
+        }
+    }
+}
+
+namespace Microsoft.Singularity.Io.Keyboard
+{
+    [Flags]
+    [CLSCompliant(false)]
+    public enum Qualifiers {
+        KEY_MOUSE           = 0x40000000,
+        KEY_UP              = 0x20000000,
+        KEY_DOWN            = 0x10000000,
+
+        KEY_MODIFIERS       = 0x0f000000,
+        KEY_SHIFT           = 0x08000000,
+        KEY_CTRL            = 0x04000000,
+        KEY_ALT             = 0x02000000,
+        KEY_WINDOWS         = 0x01000000,
+
+        KEY_EXTENDED        = 0x00800000,
+        KEY_SHIFTED         = 0x00020000,
+        KEY_NUMPAD          = 0x00010000,
+        KEY_ALT_CODE        = 0x0000ff00,
+        KEY_BASE_CODE       = 0x000000ff,
+
+        MOUSE_ALIVE         = 0x00000008,
+        MOUSE_BUTTON_0      = 0x00000001,
+        MOUSE_BUTTON_1      = 0x00000002,
+        MOUSE_BUTTON_2      = 0x00000004,
+        MOUSE_BUTTON_ALL    = 0x00000007,
+    }
+
+    public enum Keys {
+        ESCAPE      = 0x1b,
+
+        PAGE_UP     = 0x80,
+        PAGE_DOWN   = 0x81,
+
+        UP_ARROW    = 0x82,
+        DOWN_ARROW  = 0x83,
+        LEFT_ARROW  = 0x84,
+        RIGHT_ARROW = 0x85,
+
+        HOME        = 0x86,
+        END         = 0x87,
+
+        INSERT      = 0x88,
+        DELETE      = 0x89,
+
+        CAPS_LOCK   = 0x90,
+        LEFT_SHIFT  = 0x91,
+        RIGHT_SHIFT = 0x92,
+        LEFT_CTRL   = 0x93,
+        RIGHT_CTRL  = 0x94,
+        LEFT_ALT    = 0x95,
+        RIGHT_ALT   = 0x96,
+        LEFT_WINDOWS = 0x97,
+        RIGHT_WINDOWS = 0x98,
+
+        MENU        = 0x99,
+
+        PRINT_SCRN  = 0x9a,
+        SCROLL_LOCK = 0x9b,
+        NUM_LOCK    = 0x9c,
+        BREAK       = 0x9d,
+        SYS_REQ     = 0x9e,
+
+        F1          = 0xa1,
+        F2          = 0xa2,
+        F3          = 0xa3,
+        F4          = 0xa4,
+        F5          = 0xa5,
+        F6          = 0xa6,
+        F7          = 0xa7,
+        F8          = 0xa8,
+        F9          = 0xa9,
+        F10         = 0xaa,
+        F11         = 0xab,
+        F12         = 0xac,
+    }
+
+}
+
diff --git a/base/Contracts/Io.Contracts/PnpContract.sg b/base/Contracts/Io.Contracts/PnpContract.sg
new file mode 100644
index 0000000..dc26a54
--- /dev/null
+++ b/base/Contracts/Io.Contracts/PnpContract.sg
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PnpContract.sg - Contract between I/O System and Device.
+//
+
+using System;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract PnpContract {
+        in message Initialize();
+        out message AckInitialize();
+        out message NakInitialize();
+
+        in message Connect(DeviceContract.Exp:Start! eDevice);
+        out message AckConnect();
+        out message NakConnect();
+
+        in message Finalize();
+        out message AckFinalize();
+        out message NakFinalize();
+
+        state Start: one {
+            Initialize? -> DoInitialize;
+        }
+
+        state DoInitialize: one {
+            AckInitialize! -> Initialized;
+            NakInitialize! -> Start;
+        }
+
+        state Initialized: one {
+            Connect? -> DoConnect;
+            Finalize? -> DoFinalize;
+        }
+
+        state DoConnect: one {
+            AckConnect! -> Initialized;
+            NakConnect! -> Initialized;
+        }
+
+        state DoFinalize: one {
+            AckFinalize! -> End;
+            NakFinalize! -> Initialized;
+        }
+
+        state End: {
+        }
+    }
+}
diff --git a/base/Contracts/Io.Contracts/SoundDeviceContract.sg b/base/Contracts/Io.Contracts/SoundDeviceContract.sg
new file mode 100644
index 0000000..3dfe8fb
--- /dev/null
+++ b/base/Contracts/Io.Contracts/SoundDeviceContract.sg
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SoundDeviceContract.sg - Contract between apps and sound devices
+//
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract SoundDeviceContract : DeviceContract {
+        in message PlayPcm(byte* opt(ExHeap[]) buffer,
+                           int offset,
+                           int length,
+                           ushort sampleRate,
+                           bool stereo,
+                           bool signed,
+                           bool eightBit);
+        out message AckPlayPcm(byte[]! in ExHeap buffer);
+        out message NakPlayPcm(byte[]! in ExHeap buffer);
+
+        in message PlayWav(byte[]! in ExHeap buffer);
+        out message AckPlayWav(byte[]! in ExHeap buffer);
+        out message NakPlayWav(byte[]! in ExHeap buffer);
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one {
+            PlayPcm? -> (AckPlayPcm! or NakPlayPcm!) -> Ready;
+            PlayWav? -> (AckPlayWav! or NakPlayWav!) -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Contracts/UnicodePipeContract.sg b/base/Contracts/Io.Contracts/UnicodePipeContract.sg
new file mode 100644
index 0000000..e9b1883
--- /dev/null
+++ b/base/Contracts/Io.Contracts/UnicodePipeContract.sg
@@ -0,0 +1,92 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UnicodePipeContract.sg - Contract between processes for STDIO pipes
+//
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Naming;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract UnicodePipeContract
+    {
+        in message Write(char[]! in ExHeap buffer, int offset, int count);
+        out message AckWrite(char[]! in ExHeap buffer);
+        
+        // start state
+        state READY : Write? -> ACK;
+        state ACK : AckWrite! -> READY;
+
+        // For sending an Exp side pipe initially, create channel in this state
+        // NewChannel(out imp, out exp, UnicodePipeContract.EXPMOVABLE.Value);
+        state EXPMOVABLE : Moved! -> READY;
+        out message Moved();
+
+    }
+}
+
+namespace Microsoft.Singularity.Io.Tty2006
+{
+    public enum Modifiers {
+        SHIFT       = 1,
+        CTRL        = 2,
+        ALT         = 4
+    }
+    
+    public enum ControlCodes {
+        CTRL_C      = 0x3,
+        CTRL_Z      = 26,
+    }
+    
+    public enum EscapeCodes {
+        HOME        = 1,
+        INSERT      = 2,
+        DELETE      = 3,
+        END         = 4,
+        PAGE_UP     = 5,
+        PAGE_DOWN   = 6,
+        CENTER      = 7,
+        BACKSPACE   = 8,
+        TAB         = 9,
+        ENTER       = 10,
+        ESCAPE      = 11,
+        F1          = 12,
+        F2          = 13,
+        F3          = 14,
+        F4          = 15,
+        F5          = 16,
+        F6          = 17,
+        F7          = 18,
+        F8          = 19,
+        F9          = 20,
+        F10         = 21,
+        F11         = 22,
+        F12         = 23,
+        F13         = 24,
+        F14         = 25,
+        F15         = 26,
+        F16         = 27,
+        F17         = 28,
+        F18         = 29,
+        F19         = 30,
+        F20         = 31,
+        SPACE       = 32,
+        UP          = 33,
+        DOWN        = 34,
+        RIGHT       = 35,
+        LEFT        = 36,
+        ERASE_FROM_CURSOR   = 100,
+        SET_CURSOR_SIZE     = 101,
+        CLEAR_SCREEN        = 102,
+        NOCODE              = 999,
+    }
+}   
diff --git a/base/Contracts/Io.Contracts/VideoDeviceContract.sg b/base/Contracts/Io.Contracts/VideoDeviceContract.sg
new file mode 100644
index 0000000..f0f19da
--- /dev/null
+++ b/base/Contracts/Io.Contracts/VideoDeviceContract.sg
@@ -0,0 +1,66 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   VideoDeviceContract.sg - Contract between apps and video devices
+//
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract VideoDeviceContract : DeviceContract {
+
+        in message Plot(int x, int y, uint color32);
+        out message AckPlot();
+        out message NakPlot();
+
+        in message Fill(int x1, int y1, int x2, int y2, uint color32);
+        out message AckFill();
+        out message NakFill();
+
+#if false
+        in message BitBltChr(int x, int y, int width, int height,
+                             byte[]! in ExHeap buffer, int offset, int scanWidth,
+                             uint color32, uint background32);
+        out message AckBitBltChr(byte[]! in ExHeap buffer);
+        out message NakBitBltChr(byte[]! in ExHeap buffer);
+#endif
+
+        in message BitBltBmp(int x, int y, byte[]! in ExHeap buffer);
+        out message AckBitBltBmp(byte[]! in ExHeap buffer);
+        out message NakBitBltBmp(byte[]! in ExHeap buffer);
+
+        in message BitBltPng(int x, int y, byte[]! in ExHeap buffer);
+        out message AckBitBltPng(byte[]! in ExHeap buffer);
+        out message NakBitBltPng(byte[]! in ExHeap buffer);
+
+        in message Scroll(int left, int top, int right, int bottom, int dy);
+        out message AckScroll();
+        out message NakScroll();
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one {
+            Plot? -> (AckPlot! or NakPlot!) -> Ready;
+            Fill? -> (AckFill! or NakFill!) -> Ready;
+#if false
+            BitBltChr? -> (AckBitBltChr! or NakBitBltChr!) -> Ready;
+#endif
+            BitBltBmp? -> (AckBitBltBmp! or NakBitBltBmp!) -> Ready;
+            BitBltPng? -> (AckBitBltPng! or NakBitBltPng!) -> Ready;
+            Scroll? -> (AckScroll! or NakScroll!) -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Contracts/VolumeManagerContract.sg b/base/Contracts/Io.Contracts/VolumeManagerContract.sg
new file mode 100644
index 0000000..ac757bf
--- /dev/null
+++ b/base/Contracts/Io.Contracts/VolumeManagerContract.sg
@@ -0,0 +1,46 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Io
+{
+    public contract VolumeManagerContract: ServiceContract
+    {
+        in     message RegisterDisk(char[]! in ExHeap name);
+        out    message AckRegisterDisk();
+        out    message NakRegisterDisk();
+
+        in     message DeregisterDisk(char[]! in ExHeap name);
+        out    message AckDeregisterDisk();
+        out    message NakDeregisterDisk();
+
+        out    message Connect(DiskDeviceContract.Exp:Start! exp, byte systemId, ulong startSector, ulong sectorCount);
+        in     message AckConnect();
+        in     message NakConnect(DiskDeviceContract.Exp:Start exp);
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one
+        {
+            RegisterDisk? -> RegisterAck;
+        }
+
+        state RegisterAck: one
+        {
+            AckRegisterDisk! -> Accept;
+            NakRegisterDisk! ;
+        }
+        state Accept: one
+        {
+            Connect! -> ( AckConnect? or NakConnect?) -> Accept;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Net.Contracts/Io.Net.Contracts.csproj b/base/Contracts/Io.Net.Contracts/Io.Net.Contracts.csproj
new file mode 100644
index 0000000..4780576
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/Io.Net.Contracts.csproj
@@ -0,0 +1,44 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Io.Net.Contracts\Io.Net.Contracts.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Io.Net.Contracts</AssemblyName>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="NicDeviceEventContract.sg" />
+    <Compile Include="NicDeviceContract.sg" />
+    <Compile Include="NicDeviceProperties.sg" />
+    <Compile Include="Packet.sg" />
+    <Compile Include="PacketFifo.sg" />
+    <Compile Include="PacketFragment.sg" />
+
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+    <ProjectReference Include="..\Io.Contracts\Io.Contracts.csproj" />
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj" />
+  
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
+
diff --git a/base/Contracts/Io.Net.Contracts/NicDeviceContract.sg b/base/Contracts/Io.Net.Contracts/NicDeviceContract.sg
new file mode 100644
index 0000000..0db6e2c
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/NicDeviceContract.sg
@@ -0,0 +1,111 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NicDeviceContract.sg
+//
+
+namespace Microsoft.Singularity.Io.Net
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using Microsoft.Contracts;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Io;
+
+    public contract NicDeviceContract : DeviceContract
+    {
+        // START messages
+        out message Success();
+
+        // READY messages
+        in message GetDeviceProperties(NicDeviceProperties*! in ExHeap props);
+        out message DeviceProperties(NicDeviceProperties*! in ExHeap props);
+
+        in  message ConfigureIO();
+        out message AckConfigureIO();
+
+        // IO_CONFIGURE_X messages
+        //
+        // Return success or specific error
+        in  message RegisterForEvents(NicDeviceEventContract.Exp:READY! ep);
+
+        in  message SetChecksumProperties(ChecksumSupport properties);
+        out message UnsupportedChecksumProperties();
+
+        in  message StartIO();
+        out message AckStartIO();
+
+        // IO_RUNNING messages
+
+        in message GiveTxPacketsToDevice(PacketFifo*! in ExHeap packetFifo);
+        out message TakeTxPacketsFromDevice(PacketFifo*! in ExHeap packetFifo);
+
+        in message GiveRxPacketsToDevice(PacketFifo*! in ExHeap packetFifo);
+        out message TakeRxPacketsFromDevice(PacketFifo*! in ExHeap packetFifo);
+
+        in  message StopIO();
+        out message AckStopIO();
+
+        override state Start: one
+        {
+            Success! -> READY;
+        }
+
+        state READY: one
+        {
+            GetDeviceProperties? -> DeviceProperties! ->
+            ConfigureIO?         -> AckConfigureIO!   ->
+            IO_CONFIGURE_BEGIN;
+        }
+
+        //
+        // Configuration states
+        //
+        // We're expecting a sequence of configuration messages.
+        // If a configuration step fails the configuration
+        // process must be restarted.  This makes the
+        // implementation very clean for the sending and
+        // receiving parties.  Programs should not be be
+        // failing at any stage as they've completed the READY
+        // queries and have all of the pertinent information on hand.
+        //
+        state IO_CONFIGURE_BEGIN: one
+        {
+            RegisterForEvents? -> IO_CONFIGURE_0;
+        }
+        state IO_CONFIGURE_0: one
+        {
+            Success! -> IO_CONFIGURE_1;
+        }
+        state IO_CONFIGURE_1: one
+        {
+            SetChecksumProperties?  -> IO_CONFIGURE_2;
+            ConfigureIO?            -> IO_CONFIGURE_BEGIN;
+        }
+        state IO_CONFIGURE_2: one
+        {
+            UnsupportedChecksumProperties! -> IO_CONFIGURE_BEGIN;
+            Success! -> IO_CONFIGURED;
+        }
+        state IO_CONFIGURED: one
+        {
+            ConfigureIO?            -> IO_CONFIGURE_BEGIN;
+            StartIO?                -> AckStartIO! -> IO_RUNNING;
+        }
+
+        //
+        // Running state
+        //
+        state IO_RUNNING: one
+        {
+            GiveTxPacketsToDevice? -> TakeTxPacketsFromDevice! -> IO_RUNNING;
+            GiveRxPacketsToDevice? -> TakeRxPacketsFromDevice! -> IO_RUNNING;
+            StopIO? -> AckStopIO! -> IO_CONFIGURED;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Net.Contracts/NicDeviceEventContract.sg b/base/Contracts/Io.Net.Contracts/NicDeviceEventContract.sg
new file mode 100644
index 0000000..c08f521
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/NicDeviceEventContract.sg
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NicDeviceEventContract.sg
+//
+
+namespace Microsoft.Singularity.Io.Net
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Io;
+
+    public enum NicEventType : uint
+    {
+        NoEvent       = 0,
+        ReceiveEvent  = 1u << 0,
+        TransmitEvent = 1u << 1,
+        LinkEvent     = 1u << 2,
+    }
+
+    public contract NicDeviceEventContract
+    {
+        out message Success();
+
+        out message NicDeviceEvent(NicEventType eventType);
+        in  message AckNicDeviceEvent();
+
+        state READY : one
+        {
+            Success! -> RUNNING;
+        }
+
+        state RUNNING : one
+        {
+            NicDeviceEvent! -> AckNicDeviceEvent? -> RUNNING;
+        }
+    }
+}
diff --git a/base/Contracts/Io.Net.Contracts/NicDeviceProperties.sg b/base/Contracts/Io.Net.Contracts/NicDeviceProperties.sg
new file mode 100644
index 0000000..cfea264
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/NicDeviceProperties.sg
@@ -0,0 +1,61 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NicDeviceProperties.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Io.Net
+{
+    public enum MacType : uint
+    {
+        Ethernet = 1,
+        // ATM
+        // FDDI
+    }
+
+    public enum ChecksumSupport : uint
+    {
+        None           = 0,
+        Ip4Receive     = 1u << 0,
+        Ip4Transmit    = 1u << 1,
+        Udp4Receive    = 1u << 2,
+        Udp4Transmit   = 1u << 3,
+        Tcp4Receive    = 1u << 4,
+        Tcp4Transmit   = 1u << 5,
+        AllIp4Receive  = (Ip4Receive | Udp4Receive | Tcp4Receive),
+        AllIp4Transmit = (Ip4Transmit | Udp4Transmit | Tcp4Transmit),
+        AllIp4         = (AllIp4Receive | AllIp4Transmit),
+        Ip6Receive     = 1u << 6,
+        Ip6Transmit    = 1u << 7,
+        Udp6Receive    = 1u << 8,
+        Udp6Transmit   = 1u << 9,
+        Tcp6Receive    = 1u << 10,
+        Tcp6Transmit   = 1u << 11,
+        AllIp6Receive  = (Ip6Receive | Udp6Receive | Tcp6Receive),
+        AllIp6Transmit = (Ip6Transmit | Udp6Transmit | Tcp6Transmit),
+        AllIp6         = (AllIp6Receive | AllIp6Transmit),
+    }
+
+    public rep struct NicDeviceProperties : ITracked
+    {
+        public char [] in ExHeap DriverName;
+        public char [] in ExHeap DriverVersion;
+
+        public MacType           MacType;
+        public byte [] in ExHeap MacAddress;
+
+        public ChecksumSupport   ChecksumSupport;
+
+        public int               MtuBytes;
+        public int               MaxTxPacketsInDevice;
+        public int               MaxTxFragmentsPerPacket;
+        public int               MaxRxPacketsInDevice;
+        public int               MaxRxFragmentsPerPacket;
+    }
+}
diff --git a/base/Contracts/Io.Net.Contracts/Packet.sg b/base/Contracts/Io.Net.Contracts/Packet.sg
new file mode 100644
index 0000000..3eabf29
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/Packet.sg
@@ -0,0 +1,246 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PacketFragment.sg
+//
+
+namespace Microsoft.Singularity.Io.Net
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using Microsoft.Contracts;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity.Channels;
+
+    public enum FromDeviceFlags : ushort
+    {
+        TransmitSuccess  = 0x001,
+        TransmitError    = 0x002,
+        ReceiveSuccess   = 0x004,
+        ReceiveError     = 0x008,
+        BadIp4Checksum   = 0x010,
+        BadUdp4Checksum  = 0x020,
+        BadTcp4Checksum  = 0x040,
+        GoodUdp4Checksum = 0x080,
+        GoodTcp4Checksum = 0x100,
+    };
+
+    public enum ToDeviceFlags : ushort
+    {
+        RequestIp4Checksum  = 1,
+        RequestUdp4Checksum = 2,
+        RequestTcp4Checksum = 4,
+    };
+
+    public rep struct Packet : ITracked
+    {
+        private PacketFragment[]! in ExHeap fragments;
+        private ToDeviceFlags   toDeviceFlags;
+        private FromDeviceFlags fromDeviceFlags;
+
+        public Packet(int fragments)
+        {
+            this.toDeviceFlags   = 0;
+            this.fromDeviceFlags = 0;
+
+            this.fragments = new [ExHeap] PacketFragment[fragments];
+        }
+
+        public Packet(byte[]! packetBytes)
+            : this(1)
+        {
+            expose (this.fragments[0]) {
+                this.fragments[0].Set(packetBytes, 0, packetBytes.Length);
+            }
+        }
+
+        public Packet([Claims] byte[]! in ExHeap thePacket)
+            : this(1)
+        {
+            expose (this.fragments[0]) {
+                this.fragments[0].Set(thePacket, 0, thePacket.Length);
+            }
+        }
+
+        public ToDeviceFlags ToDeviceFlags
+        {
+            get { return toDeviceFlags; }
+            set { toDeviceFlags = value; }
+        }
+
+        public FromDeviceFlags FromDeviceFlags
+        {
+            get { return fromDeviceFlags; }
+            set { fromDeviceFlags = value; }
+        }
+
+        [Pure]
+        public int GetLength()
+        {
+            int total = 0;
+            expose (this) {
+                for (int i = 0; i < this.fragments.Length; i++) {
+                    expose (this.fragments[i]) {
+                        total += this.fragments[i].Length;
+                    }
+                }
+            }
+            return total;
+        }
+
+        [Pure]
+        public byte[]! ToByteArray()
+        {
+            byte[]! buffer = new byte[this.GetLength()];
+            this.ToByteArray(buffer);
+            return buffer;
+        }
+
+        public void ToByteArray(byte[]! buffer)
+        {
+            expose (this) {
+                int done = 0;
+                for (int i = 0; i < this.FragmentCount; i++) {
+                    expose (this.fragments[i]) {
+                        done += this.fragments[i].Copy(buffer, done);
+                    }
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            delete this.fragments;
+        }
+
+        //        [Pure]
+        public int FragmentCount
+        {
+            get {
+                expose (this) {
+                    return this.fragments.Length;
+                }
+            }
+        }
+
+        //        [Pure]
+        public void GetFragmentRange(int         fragment,
+                                     out UIntPtr virtualAddr,
+                                     out int     lengthBytes)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].GetFragmentRange(out virtualAddr,
+                                                              out lengthBytes);
+                }
+            }
+        }
+
+        public UIntPtr GetFragmentVirtualAddress(int fragment)
+        {
+            UIntPtr virtualAddress;
+            int     length;
+            GetFragmentRange(fragment, out virtualAddress, out length);
+            return virtualAddress;
+        }
+
+        public void SetFragmentLength(int fragment, int length)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    assert (length >= 0 &&
+                            length <= this.fragments[fragment].Capacity);
+                    this.fragments[fragment].Length = length;
+                }
+            }
+        }
+
+        public void UnsetFragmentLength(int fragment)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].Length =
+                        this.fragments[fragment].Capacity;
+                }
+            }
+        }
+
+        public void UnsetFragmentLengths()
+        {
+            expose (this) {
+                for (int i = 0; i < this.FragmentCount; i++) {
+                    UnsetFragmentLength(i);
+                }
+            }
+        }
+
+        public void SetFragment(int fragment,
+                                [Claims] byte []! in ExHeap buffer,
+                                int bufferStart,
+                                int bufferLength)
+            requires fragment >= 0 && fragment <= this.FragmentCount;
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].Set(buffer,
+                                                 bufferStart,
+                                                 bufferLength);
+                }
+            }
+        }
+
+        public void SetFragment(int fragment,
+                                [Claims] byte []! in ExHeap buffer)
+            requires fragment >= 0 && fragment < this.FragmentCount;
+        {
+            SetFragment(fragment, buffer, 0, buffer.Length);
+        }
+
+        public void SetFragment(int fragment, byte []! buffer)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].Set(buffer, 0, buffer.Length);
+                }
+            }
+        }
+
+        public void SetFragment(int      fragment,
+                                byte []! buffer,
+                                int      offset,
+                                int      length)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].Set(buffer, offset, length);
+                }
+            }
+        }
+
+        public void SetFragment(int fragment,
+                                IoMemory! region,
+                                UIntPtr offset,
+                                UIntPtr length)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].Set(region, offset, length);
+                }
+            }
+        }
+
+        public void AppendToFragment(int fragment, byte value)
+        {
+            expose (this) {
+                expose (this.fragments[fragment]) {
+                    this.fragments[fragment].Append(value);
+                }
+            }
+        }
+    }
+}
diff --git a/base/Contracts/Io.Net.Contracts/PacketFifo.sg b/base/Contracts/Io.Net.Contracts/PacketFifo.sg
new file mode 100644
index 0000000..55539f0
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/PacketFifo.sg
@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PacketFifo.sg
+//
+
+namespace Microsoft.Singularity.Io.Net
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using Microsoft.Contracts;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+
+    public rep struct PacketFifo : ITracked
+    {
+        private Packet*[]! in ExHeap packets;
+        private int head;
+        private int length;
+
+        public PacketFifo(int capacity)
+        {
+            this.packets = new [ExHeap] Packet* [capacity];
+            this.head   = 0;
+            this.length = 0;
+        }
+
+        public int Capacity
+        {
+            get { expose (this) { return this.packets.Length; } }
+        }
+
+        public int Count
+        {
+            get { expose (this) { return this.length; } }
+        }
+
+        public void Push([Claims] Packet*! in ExHeap p)
+            requires this.Count < this.Capacity;
+        {
+            expose (this) {
+                int index = this.head;
+                expose (this.packets[index]) {
+                    assert this.packets[index] == null;
+                    delete this.packets[index];
+                    this.packets[index] = p;
+                }
+                this.head = (this.head + 1) % this.Capacity;
+                this.length++;
+            }
+        }
+
+        public void Push(PacketFifo*! in ExHeap donor, int count)
+            requires this.Count + count <= this.Capacity;
+        {
+            count = Math.Min(donor->Count, count);
+            while (count-- > 0) {
+                this.Push(donor->Pop());
+            }
+        }
+
+        public void Push(PacketFifo*! in ExHeap donor)
+            requires this.Count + donor->Count <= this.Capacity;
+        {
+            Push(donor, donor->Count);
+        }
+
+        public Packet*! in ExHeap Pop()
+            requires this.Count > 0;
+        {
+            expose (this) {
+                Packet*! in ExHeap packet;
+                int index = (this.Capacity + this.head - this.length) % this.Capacity;
+                expose (this.packets[index]) {
+                    packet = (!)packets[index];
+                    this.packets[index] = null;
+                }
+                this.length--;
+                return packet;
+            }
+        }
+    }
+}
diff --git a/base/Contracts/Io.Net.Contracts/PacketFragment.sg b/base/Contracts/Io.Net.Contracts/PacketFragment.sg
new file mode 100644
index 0000000..d980cf8
--- /dev/null
+++ b/base/Contracts/Io.Net.Contracts/PacketFragment.sg
@@ -0,0 +1,186 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PacketFragment.sg
+//
+
+namespace Microsoft.Singularity.Io.Net
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using Microsoft.Contracts;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+
+    public rep struct PacketFragment : ITracked
+    {
+        byte [] in ExHeap data;
+        int  start;  // start position of live data in fragment
+        int  length; // end position of live data in fragment
+
+        public void Set(byte[]! buffer, int bufferStart, int bufferBytes)
+            requires bufferStart + bufferBytes <= buffer.Length;
+            requires bufferStart >= 0;
+            requires bufferBytes > 0;
+        {
+            expose (this) {
+                if (this.data == null || this.data.Length < bufferBytes) {
+                    delete this.data;
+                    this.data = new [ExHeap] byte [bufferBytes];
+                }
+                this.start  = 0;
+                this.length = bufferBytes;
+                Bitter.FromByteArray(this.data, 0, bufferBytes,
+                                     buffer, bufferStart);
+            }
+        }
+
+        public void Set([Claims] byte[]! in ExHeap buffer,
+                        int bufferStart,
+                        int bufferLength)
+            requires bufferStart + bufferLength <= buffer.Length;
+            requires bufferStart >= 0;
+            requires bufferLength >= 0;
+        {
+            expose (this) {
+                if (this.data == null || bufferLength >= this.data.Length) {
+                    delete this.data;
+                    this.data   = buffer;
+                    this.start  = bufferStart;
+                    this.length = bufferLength;
+                }
+                else {
+                    Bitter.Copy(this.data, 0, bufferLength,
+                                buffer, bufferStart);
+                    this.start  = 0;
+                    this.length = bufferLength;
+                    delete buffer;
+                }
+            }
+        }
+
+        public void Set(IoMemory! region, UIntPtr offset, UIntPtr length)
+        {
+            expose (this) {
+                this.start  = 0;
+                this.length = (int)length.ToUInt32();
+                assert this.length <= this.Capacity;
+                Bitter.FromIoMemory(this.data, this.start, this.length,
+                                    region, (int)offset.ToUInt32());
+            }
+        }
+
+        public int Length
+        {
+            get { expose (this) { return this.length; } }
+            set {
+                expose (this) {
+                    assert value <= this.Capacity;
+                    this.length = value;
+                }
+            }
+        }
+
+        //        [Pure]
+        public int Capacity
+        {
+            get {
+                expose (this) {
+                    return this.data == null ? 0 : this.data.Length;
+                }
+            }
+        }
+
+        //        [Pure]
+        internal int Start
+        {
+            get { expose (this) { return this.start; } }
+        }
+
+        //        [Pure]
+        public bool HasData
+        {
+            get { expose (this) { return this.data != null; } }
+        }
+
+        public void TrimHead(int bytesToTrim)
+            requires bytesToTrim <= this.Length;
+            ensures Length == old(Length) - bytesToTrim;
+            ensures this.Start == old(this.Start) + bytesToTrim;
+        {
+            expose (this) {
+                this.start  += bytesToTrim;
+                this.length -= bytesToTrim;
+            }
+        }
+
+        public void TrimTail(int bytesToTrim)
+            requires bytesToTrim <= this.Length;
+            ensures Length == old(Length) - bytesToTrim;
+        {
+            expose (this) {
+                this.length -= bytesToTrim;
+            }
+        }
+
+        public void Untrim()
+        {
+            expose (this) {
+                this.start = 0;
+                this.length = this.Capacity;
+            }
+        }
+
+        [Pure]
+        public void GetFragmentRange(out UIntPtr virtualAddr,
+                                     out int lengthBytes)
+        {
+            expose (this) {
+                if (this.data != null) {
+                    virtualAddr = Bitter.ToAddress(this.data, this.start);
+                    lengthBytes = this.length;
+                }
+                else {
+                    virtualAddr = UIntPtr.Zero;
+                    lengthBytes = 0;
+                }
+            }
+        }
+
+        public int Copy(byte[]! destination, int offset)
+            requires offset >= 0 && offset < destination.Length;
+            requires destination.Length - offset >= this.Length;
+        {
+            expose (this) {
+                if (this.data != null) {
+                    Bitter.ToByteArray(this.data, this.start, this.length,
+                                       destination, offset);
+                    return this.length;
+                }
+                else {
+                    return 0;
+                }
+            }
+        }
+
+        public void Append(byte value)
+            requires this.Start + this.Length < this.Capacity;
+        {
+            expose (this) {
+                assert this.data != null;
+                this.data[this.start + this.length] = value;
+                this.length++;
+            }
+        }
+
+        public void Dispose()
+        {
+            delete this.data;
+            this.data = null;
+        }
+    }
+}
diff --git a/base/Contracts/MapPointProxy.Contracts/MapPointProxy.Contracts.csproj b/base/Contracts/MapPointProxy.Contracts/MapPointProxy.Contracts.csproj
new file mode 100644
index 0000000..575962d
--- /dev/null
+++ b/base/Contracts/MapPointProxy.Contracts/MapPointProxy.Contracts.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\MapPointProxy.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>MapPointProxy.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MapPointProxyContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Contracts/MapPointProxy.Contracts/MapPointProxyContract.sg b/base/Contracts/MapPointProxy.Contracts/MapPointProxyContract.sg
new file mode 100644
index 0000000..a95b38b
--- /dev/null
+++ b/base/Contracts/MapPointProxy.Contracts/MapPointProxyContract.sg
@@ -0,0 +1,58 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MapPointProxyContract.sg
+//  Note:   Contract for a ChildMapPointProxy process
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+
+namespace Microsoft.Singularity.MapPointProxy.Contracts
+{
+    public contract MapPointProxyContract : ExtensionContract
+    {
+        public rep struct PushPin : ITracked
+        {
+            // Everything as character vectors; the coordinates
+            // are floating-point
+            public char[] in ExHeap latitude;
+            public char[] in ExHeap longitude;
+            public char[] in ExHeap icon;
+            public char[] in ExHeap label;
+        }
+
+        public const string ModuleName = "/dev/MapPointProxy";
+
+        in message GetMap(char[]! in ExHeap centerLat, char[]! in ExHeap centerLong,
+                          int zoom, PushPin[] in ExHeap pushPins);
+        in message Ack();
+
+        out message MapPointReady();
+        out message MapDataBegin();
+        out message MapDataChunk(byte[]! in ExHeap chunkData);
+        out message Done();
+        out message Failed();
+
+        override state Start : MapPointReady! -> ReadyState;
+
+        state ReadyState : GetMap? -> MapResult;
+
+        state MapResult : one
+        {
+            MapDataBegin! -> SendingState;
+            Failed! -> ReadyState;
+        }
+
+        state SendingState : one
+        {
+            MapDataChunk! -> Ack? -> SendingState;
+            Done! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/Directory.sg b/base/Contracts/NameSpace.Contracts/Directory.sg
new file mode 100644
index 0000000..7333f1d
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/Directory.sg
@@ -0,0 +1,122 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory {
+    contract DirectoryServiceContract : ServiceContract {
+
+        // Flag values (used in AckAttributes)
+        public enum FileFlags
+        {
+            File      = 128,
+            SymLink   = 64,
+            Directory = 16,
+            Hidden    = 2,    //will we ever support this? 
+            ReadOnly  = 1,    //will we ever support this? 
+        }
+
+        out     message Success();
+
+        ////////////////////////////////////////////////////////
+        // Directory-related messages 
+        ////////////////////////////////////////////////////////
+        in      message CreateDirectory(char []! in ExHeap dirName);
+        out     message AckCreateDirectory();
+        out     message NakCreateDirectory(ErrorCode code);
+
+        in      message CreateAndBindDirectory(char []! in ExHeap dirName, DirectoryServiceContract.Imp:Ready! imp);
+        out     message AckCreateAndBindDirectory();
+        out     message NakCreateAndBindDirectory(ErrorCode code,DirectoryServiceContract.Imp:Ready imp);
+
+        in      message BindDirectory(char []! in ExHeap dirName, DirectoryServiceContract.Imp:Ready! imp);
+        out     message AckBindDirectory();
+        out     message NakBindDirectory(ErrorCode code,DirectoryServiceContract.Imp:Ready imp);
+
+        in      message DeleteDirectory(char []! in ExHeap dirName);
+        out     message AckDeleteDirectory();
+        out     message NakDeleteDirectory(ErrorCode code);
+
+        ////////////////////////////////////////////////////////
+        // File-related messages 
+        ////////////////////////////////////////////////////////
+        in      message CreateFile(char []! in ExHeap fileName);
+        out     message AckCreateFile();
+        out     message NakCreateFile(ErrorCode code);
+
+        in      message CreateAndBindFile(char []! in ExHeap fileName, FileContract.Imp:Ready! imp);
+        out     message AckCreateAndBindFile();
+        out     message NakCreateAndBindFile(ErrorCode code,FileContract.Imp:Ready imp);
+
+        in      message BindFile(char []! in ExHeap fileName, FileContract.Imp:Ready! imp);
+        out     message AckBindFile();
+        out     message NakBindFile(ErrorCode code,FileContract.Imp:Ready imp);
+
+        in      message DeleteFile(char []! in ExHeap fileName);
+        out     message AckDeleteFile();
+        out     message NakDeleteFile(ErrorCode code);
+
+        in      message Attributes(char []! in ExHeap fileName);
+        out     message AckAttributes(long size, uint flags, long linkFlags);
+        out     message NakFileAttributes(ErrorCode code);
+        
+        ////////////////////////////////////////////////////////
+        // Security-related messages 
+        ////////////////////////////////////////////////////////
+        in      message QueryACL(char []! in ExHeap fileName, 
+                    byte[]! in ExHeap permission);
+        out     message AckQueryACL(byte[]! in ExHeap acl);
+        out     message NakQueryACL(ErrorCode code);
+
+        in      message StoreACL(char []! in ExHeap fileName, 
+                    byte[]! in ExHeap permission, 
+                    byte[]! in ExHeap acl);
+        out     message AckStoreACL();
+        out     message NakStoreACL(ErrorCode code);
+        
+        ////////////////////////////////////////////////////////
+        // SymbolicLink-related messages 
+        ////////////////////////////////////////////////////////
+        in      message CreateLink(char []! in ExHeap linkPath, char []! in ExHeap linkValue );
+        out     message AckCreateLink(); 
+        out     message NakCreateLink(ErrorCode code); 
+ 
+        in      message DeleteLink(char []! in ExHeap linkPath);
+        out     message AckDeleteLink(); 
+        out     message NakDeleteLink(ErrorCode code); 
+
+        in      message Close();
+        out     message AckClose();
+
+        
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one {
+            CreateDirectory? ->     (AckCreateDirectory! or NakCreateDirectory!) -> Ready;
+            CreateAndBindDirectory? ->  (AckCreateAndBindDirectory! or NakCreateAndBindDirectory!) -> Ready;
+            BindDirectory? ->       (AckBindDirectory! or NakBindDirectory!) -> Ready;
+            DeleteDirectory? ->     (AckDeleteDirectory! or NakDeleteDirectory!) -> Ready;
+
+            CreateFile? ->          (AckCreateFile! or NakCreateFile!) -> Ready;
+            CreateAndBindFile? ->   (AckCreateAndBindFile! or NakCreateAndBindFile!) -> Ready;
+            BindFile? ->            (AckBindFile! or NakBindFile!) -> Ready;
+            DeleteFile? ->          (AckDeleteFile! or NakDeleteFile!) -> Ready;
+            Attributes? ->      (AckAttributes! or NakFileAttributes!)   -> Ready;
+          
+            QueryACL? ->            (AckQueryACL! or NakQueryACL!) -> Ready;
+            StoreACL? ->            (AckStoreACL! or NakStoreACL!) -> Ready;
+ 
+            CreateLink? ->          (AckCreateLink! or NakCreateLink!) -> Ready;
+            DeleteLink? ->          (AckDeleteLink! or NakDeleteLink!) -> Ready;
+
+            Close? -> AckClose! ->  Ready;
+        }
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/DirectoryContract.sg b/base/Contracts/NameSpace.Contracts/DirectoryContract.sg
new file mode 100644
index 0000000..7e8b846
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/DirectoryContract.sg
@@ -0,0 +1,262 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryServiceContract.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Directory
+{
+    // enumeration of possible errors reported by any operation 
+    public enum ErrorCode : uint
+    {
+        AccessDenied,
+        AlreadyExists, 
+        BadArguments,
+        ContractNotSupported,
+        DirectoryNotEmpty,
+        DoesNotExist, 
+        NotFound,
+        NotImplemented,
+    }
+    
+    // enumeration of the existing node types found in the namespace  
+    // implementation and the filesystem
+    public enum NodeType
+    {
+        Dir,
+        File,
+        IoMemory,
+        ServiceProvider,
+        SymLink,
+    }
+
+    // a REP struct used to return responses to find or notify.
+    public rep struct FindResponse : ITracked
+    {
+        public char[]! in ExHeap Path; // short name within a directory 
+        public NodeType Type; // its type
+    }
+        
+    public contract DirectoryServiceContract : ServiceContract
+    {
+
+        // attempt to bind to a service exp endpoint 
+        in     message Bind(char[]! in ExHeap path, 
+                            ServiceContract.Exp:Start! exp); 
+        out    message AckBind();
+        // attempt to return unused endpoint if possible
+        out    message NakBind(ErrorCode code,
+                               ServiceContract.Exp:Start! exp );
+       
+        // Find path and notify caller of any changes matching pattern over
+        // the imp endpoint supplied. 
+        in     message Notify(char[]! in ExHeap path,char[]! in ExHeap pattern, 
+                              NotifyContract.Imp:Start! imp);  
+        out    message AckNotify(); 
+        out    message NakNotify(NotifyContract.Imp:Start! imp,
+                                 ErrorCode error); 
+                                 
+        // Find path and return all elements matching pattern 
+        in     message Find(char[]! in ExHeap path,char[]! in ExHeap pattern);
+        out    message AckFind (FindResponse[]! in ExHeap results);
+        out    message NakFind(ErrorCode error); 
+
+        // Find path and return all elements matching pattern A
+        // AND notify of all changes over the imp endpoint supplied.
+        // this should solve any  potential race conditions if  
+        in     message FindAndNotify(char[]! in ExHeap path,
+                            char[]! in ExHeap pattern,
+                            NotifyContract.Imp:Start! imp);  
+        out    message AckFindAndNotify (FindResponse[]! in ExHeap results);
+        out    message NakFindAndNotify(NotifyContract.Imp:Start! imp,
+                                        ErrorCode error); 
+
+        // given a path return its nodetype and if meaningful its length
+        in      message Attributes(char []! in ExHeap path);
+        out     message AckAttributes(NodeType type, long size);
+        out     message NakAttributes(ErrorCode code);
+
+        // given a path return the associated ACL if present 
+        in      message QueryACL(char []! in ExHeap path, 
+                    byte[]! in ExHeap permission);
+        out     message AckQueryACL(byte[]! in ExHeap acl);
+        out     message NakQueryACL(ErrorCode code);
+
+        
+        // Greater permissions needed for ops below
+
+        // register a service's name serviceProvider endpoint with the SDS 
+        in     message Register(char[]! in ExHeap path, 
+                                ServiceProviderContract.Imp:Start! imp);
+        out    message AckRegister();
+        out    message NakRegister(ServiceProviderContract.Imp:Start imp,
+                                     ErrorCode error);
+
+        // create dirName within the current directory 
+        // the current directory is the one bound on this channel
+        in      message CreateDirectory(char []! in ExHeap dirName);
+        out     message AckCreateDirectory();
+        out     message NakCreateDirectory(ErrorCode code);
+
+        // delete dirName within the current directory 
+        // the current directory is the one bound on this channel
+        in      message DeleteDirectory(char []! in ExHeap dirName);
+        out     message AckDeleteDirectory();
+        out     message NakDeleteDirectory(ErrorCode code);
+
+        // create file within the current directory 
+        // the current directory is the one bound on this channel
+        // file creation only applies to the FS 
+        in      message CreateFile(char []! in ExHeap fileName);
+        out     message AckCreateFile();
+        out     message NakCreateFile(ErrorCode code);
+
+        // create and "open" or bind to fileName within the current directory 
+        // the current directory is the one bound on this channel
+        // this is common enough pattern to supply an optimization 
+        in      message CreateAndBindFile(char []! in ExHeap fileName,
+                         FileContract.Imp:Ready! imp);
+        out     message AckCreateAndBindFile();
+        out     message NakCreateAndBindFile(ErrorCode code,
+                         FileContract.Imp:Ready imp);
+
+        // delete fileName within the current directory 
+        // the current directory is the one bound on this channel
+        in      message DeleteFile(char []! in ExHeap fileName);
+        out     message AckDeleteFile();
+        out     message NakDeleteFile(ErrorCode code);
+
+        // for the given path and permission, return the associated ACL if present
+
+        in      message StoreACL(char []! in ExHeap fileName, 
+                    byte[]! in ExHeap permission, 
+                    byte[]! in ExHeap acl);
+        out     message AckStoreACL();
+        out     message NakStoreACL(ErrorCode code);
+        
+        // create a symlink node at linkPath with value linkValue
+        // Upon traversal linkPath will be returned to client 
+        // it is up to the client to interpret and re-submit bind
+        // see reparse messages below. 
+        
+        in      message CreateLink(char []! in ExHeap linkPath,
+                         char []! in ExHeap linkValue );
+        out     message AckCreateLink(); 
+        out     message NakCreateLink(ErrorCode code); 
+
+        // delete symlink node at linkPath
+        in      message DeleteLink(char []! in ExHeap linkPath);
+        out     message AckDeleteLink();
+        out     message NakDeleteLink(ErrorCode code); 
+
+        // REPARSE MESSAGES 
+        // used for 2 different scenarios: DirectoryProvider and SymLink traversal
+        //  DirectoryProvider: 
+        //      path=new directoryProvider to bind to to continue traversal
+        //      rest=suffix(P): the remainder of the initial path not yet parsed. 
+        //  SymLink
+        //      path=contents of the symbolic link
+        //      rest=suffix(P): the remainder of the initial path not yet parsed. 
+        out    message NakBindReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               ServiceContract.Exp:Start! exp); 
+       
+        out    message NakNotifyReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               NotifyContract.Imp:Start imp); 
+
+        out    message NakFindAndNotifyReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound,
+                               NotifyContract.Imp:Start imp); 
+
+        out    message NakFindReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               bool linkFound);
+
+        out    message NakRegisterReparse(char[]! in ExHeap path,
+                               char[]! in ExHeap rest,
+                               ServiceProviderContract.Imp:Start imp); 
+                               
+        out message Success();
+
+        ////////////////////////////////////////////////////////
+        // State  Machine
+        ////////////////////////////////////////////////////////
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+        state Ready: one
+        {
+            Bind? ->                (AckBind! 
+                                     or NakBind!  
+                                     or NakBindReparse!
+                                    ) -> Ready;
+                                          
+            Find? ->                (AckFind! 
+                                     or NakFind! 
+                                     or NakFindReparse!
+                                    ) -> Ready; 
+
+            FindAndNotify? ->       (AckFindAndNotify! 
+                                     or NakFindAndNotify! 
+                                     or NakFindAndNotifyReparse!
+                                    ) -> Ready; 
+
+            
+            Notify? ->              (AckNotify! 
+                                     or NakNotify! 
+                                     or NakNotifyReparse! 
+                                    ) -> Ready; 
+
+            Register? ->            (AckRegister! 
+                                     or NakRegister! 
+                                     or NakRegisterReparse!
+                                    ) -> Ready;
+
+            CreateDirectory? ->     (AckCreateDirectory! 
+                                     or NakCreateDirectory!
+                                    ) -> Ready;
+                                    
+            DeleteDirectory? ->     (AckDeleteDirectory! 
+                                     or NakDeleteDirectory!
+                                    ) -> Ready;
+
+            CreateFile? ->          (AckCreateFile! 
+                                     or NakCreateFile!
+                                    ) -> Ready;
+                                     
+            CreateAndBindFile? ->   (AckCreateAndBindFile! 
+                                     or NakCreateAndBindFile!
+                                    ) -> Ready;
+                                    
+            DeleteFile? ->          (AckDeleteFile! 
+                                     or NakDeleteFile!
+                                    ) -> Ready;
+                                    
+            Attributes? ->          (AckAttributes! 
+                                      or NakAttributes!
+                                    ) -> Ready;
+          
+            QueryACL? ->            (AckQueryACL! or NakQueryACL!) -> Ready;
+            StoreACL? ->            (AckStoreACL! or NakStoreACL!) -> Ready;
+ 
+            CreateLink? ->          (AckCreateLink! 
+                                     or NakCreateLink!
+                                    ) -> Ready;
+                                    
+            DeleteLink? ->          (AckDeleteLink! 
+                                     or NakDeleteLink!
+                                    ) -> Ready;
+       }
+   } 
+}
diff --git a/base/Contracts/NameSpace.Contracts/ExtensionContract.sg b/base/Contracts/NameSpace.Contracts/ExtensionContract.sg
new file mode 100644
index 0000000..ba1c044
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/ExtensionContract.sg
@@ -0,0 +1,35 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ExtensionContract.sg
+//
+
+// This is the base contract to be used, and overridden by, every
+// system extension loaded as a child process.
+
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Extending
+{
+    public contract ExtensionContract : ServiceContract
+    {
+        in message Shutdown();     // Shutdown the extension gracefully.
+        out message AckShutdown();
+        out message NakShutdown();
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one
+        {
+            Shutdown? -> (AckShutdown! or NakShutdown!) -> Ready;
+            // AckShutdown should really go to done.
+        }
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/FSDirectoryServiceContract.sg b/base/Contracts/NameSpace.Contracts/FSDirectoryServiceContract.sg
new file mode 100644
index 0000000..5306c6d
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/FSDirectoryServiceContract.sg
@@ -0,0 +1,94 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory {
+    contract DirectoryServiceContract : ServiceContract {
+        // Flag values (used in AckAttributes)
+        public enum FileFlags
+        {
+            Normal    = 128,
+            Directory = 16,
+            Hidden    = 2,
+            ReadOnly  = 1,
+        }
+
+        out     message Success();
+
+        in      message Bind(char[]! in ExHeap path, ServiceContract.Exp:Start! exp); 
+        out     message AckBind();
+        out     message NakBind(ServiceContract.Exp:Start exp); // return unconnected endpoint
+
+        in      message CreateDirectory(char []! in ExHeap dirName);
+        out     message AckCreateDirectory();
+        out     message NakCreateDirectory();
+
+        in      message DeleteDirectory(char []! in ExHeap dirName);
+        out     message AckDeleteDirectory();
+        out     message NakDeleteDirectory();
+
+        in      message CreateFile(char []! in ExHeap fileName);
+        out     message AckCreateFile();
+        out     message NakCreateFile();
+
+        in      message DeleteFile(char []! in ExHeap fileName);
+        out     message AckDeleteFile();
+        out     message NakDeleteFile();
+
+        in      message Attributes(char []! in ExHeap fileName);
+        out     message AckAttributes(long size, uint flags, long linkFlags);
+        out     message NakAttributes();
+        
+        in      message QueryACL(char []! in ExHeap fileName, 
+                    byte[]! in ExHeap permission);
+        out     message AckQueryACL(byte[]! in ExHeap acl);
+        out     message NakQueryACL();
+
+        in      message StoreACL(char []! in ExHeap fileName, 
+                    byte[]! in ExHeap permission, 
+                    byte[]! in ExHeap acl);
+        out     message AckStoreACL();
+        out     message NakStoreACL();
+        
+        in      message CreateLink(char []! in ExHeap linkPath, char []! in ExHeap linkValue );
+        out     message AckCreateLink();
+        out     message NakCreateLink();
+
+        in      message DeleteLink(char []! in ExHeap linkPath);
+        out     message AckDeleteLink();
+        out     message NakDeleteLink();
+
+        in      message Close();
+        out     message AckClose();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready: one {
+            Bind? ->                ( AckBind! or NakBind!) -> Ready;
+
+            CreateDirectory? ->     ( AckCreateDirectory! or NakCreateDirectory! ) -> Ready;
+            DeleteDirectory? ->     ( AckDeleteDirectory! or NakDeleteDirectory! ) -> Ready;
+
+            CreateFile? ->          (AckCreateFile! or NakCreateFile!) -> Ready;
+            DeleteFile? ->          ( AckDeleteFile! or NakDeleteFile!) -> Ready;
+
+            Attributes? ->      (AckAttributes! or NakAttributes!)   -> Ready;
+            
+            QueryACL? ->            (AckQueryACL! or NakQueryACL!) -> Ready;
+            StoreACL? ->            (AckStoreACL! or NakStoreACL!) -> Ready;
+
+            CreateLink? ->          ( AckCreateLink! or NakCreateLink! ) -> Ready;
+            DeleteLink? ->          ( AckDeleteLink! or NakDeleteLink! ) -> Ready;
+
+            Close? -> AckClose! ->  Ready;
+        }
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/FileContract.sg b/base/Contracts/NameSpace.Contracts/FileContract.sg
new file mode 100644
index 0000000..cde5e70
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/FileContract.sg
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory {
+    contract FileContract : ServiceContract {
+        out message Success();
+    
+        in message Read(byte []! in ExHeap buf, long bufOffset, 
+                        long fileOffset, long maxLength);
+        out message AckRead(byte []! in ExHeap buf, long bytesRead, int error);
+        
+        in message Write(byte []! in ExHeap buf, long bufOffset, 
+                         long fileOffset, long maxLength);
+        out message AckWrite(byte []! in ExHeap buf, long bytesWritten, 
+                             int error);
+        
+        in message Close();
+        out message AckClose();
+        
+        override state Start: one {
+            Success! -> Ready;
+        }
+        
+        state Ready: one {
+            Read? ->  AckRead! -> Ready;
+            Write? -> AckWrite! -> Ready;
+            Close? -> AckClose! -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/FsFileServiceContract.sg b/base/Contracts/NameSpace.Contracts/FsFileServiceContract.sg
new file mode 100644
index 0000000..06eeb67
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/FsFileServiceContract.sg
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory {
+    contract FileContract : ServiceContract {
+        out message Success();
+    
+        in message Read(byte []! in ExHeap buf, long bufOffset, 
+            long fileOffset, long maxLength);
+        out message AckRead(byte []! in ExHeap buf, long bytesRead, int error);
+        
+        in message Write(byte []! in ExHeap buf, long bufOffset, 
+            long fileOffset, long maxLength);
+        out message AckWrite(byte []! in ExHeap buf, long bytesWritten, 
+            int error);
+        
+        in message Close();
+        out message AckClose();
+        
+        override state Start: one {
+            Success! -> Ready;
+        }
+        
+        state Ready: one {
+            Read? ->  AckRead! -> Ready;
+            Write? -> AckWrite! -> Ready;
+            Close? -> AckClose! -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/NameSpace.Contracts.csproj b/base/Contracts/NameSpace.Contracts/NameSpace.Contracts.csproj
new file mode 100644
index 0000000..cd81a7c
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/NameSpace.Contracts.csproj
@@ -0,0 +1,39 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Directory.Contracts</AssemblyName>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ExtensionContract.sg" />
+    <Compile Include="NotifyContract.sg" />
+    <Compile Include="ServiceContract.sg" />
+    <Compile Include="ServiceProviderContract.sg" />
+    <Compile Include="FsFileServiceContract.sg" />
+    <Compile Include="FsDirectoryServiceContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Corlib.Contracts.csproj"/>
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj"/>
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets"/>
+</Project>
diff --git a/base/Contracts/NameSpace.Contracts/NameSpaceContract.sg b/base/Contracts/NameSpace.Contracts/NameSpaceContract.sg
new file mode 100644
index 0000000..61584dc
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/NameSpaceContract.sg
@@ -0,0 +1,59 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryServiceContract.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Directory
+{
+    public enum NodeType
+    {
+        Inner       = 0,
+        Dir         = 1,
+        Provider    = 2,
+        SymLink     = 3,
+        File        = 4,
+        IoMemory    = 5,
+    }
+
+    public rep struct FindResponse : ITracked
+    {
+        public char[]! in ExHeap Path;
+        public NodeType Type;
+    }
+
+    public contract DirectoryServiceContract : ServiceContract
+    {
+        // ReadOnly part
+
+        in     message Bind(char[]! in ExHeap path, ServiceContract.Exp:Start! exp);
+        out    message AckBind();
+        out    message NakBind(ServiceContract.Exp:Start exp); // return unconnected endpoint
+
+        in     message Notify(char[]! in ExHeap pathSpec, NotifyContract.Imp:Start! imp);
+        out    message AckNotify();
+        out    message NakNotify(NotifyContract.Imp:Start! imp); // return unconnected endpoint
+
+        in     message Find(char[]! in ExHeap pathSpec, char[]! in ExHeap pattern);
+        out    message AckFind(FindResponse[]! in ExHeap results);
+        out    message NakFind();
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+        state Ready: one
+        {
+            Bind? ->    ( AckBind! or NakBind!  ) -> Ready;
+            Find? ->    ( AckFind! or NakFind!  ) -> Ready;
+            Notify? ->  ( AckNotify! or NakNotify! ) -> Ready;
+       }
+   }
+}
diff --git a/base/Contracts/NameSpace.Contracts/NameSpaceWriteContract.sg b/base/Contracts/NameSpace.Contracts/NameSpaceWriteContract.sg
new file mode 100644
index 0000000..32ad06a
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/NameSpaceWriteContract.sg
@@ -0,0 +1,87 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryServiceContract.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Directory
+{
+    public contract DirectoryServiceContract : ServiceContract
+    {
+        // ReadOnly part
+
+        in     message Bind(char[]! in ExHeap path, ServiceContract.Exp:Start! exp); 
+        out    message AckBind();
+        out    message NakBind(ServiceContract.Exp:Start exp); // return unconnected endpoint
+        out    message NakBindReparse( char[]! in ExHeap linkValue, ServiceContract.Exp:Start! exp); 
+
+        in     message Notify(char[]! in ExHeap pathSpec, NotifyContract.Imp:Start! imp);  
+        out    message AckNotify(); 
+        out    message NakNotify(NotifyContract.Imp:Start! imp); // return unconnected endpoint
+        out    message NakNotifyReparse(char []! in ExHeap symlink, NotifyContract.Imp:Start! imp); // return unconnected endpoint
+
+        in     message Find(char[]! in ExHeap path, char[]! in ExHeap pattern);
+        out    message AckFind (FindResponse[]! in ExHeap results);
+        out    message NakFind(); 
+
+
+        // ReadWrite part 
+
+        in     message Register(char[]! in ExHeap path, ServiceProviderContract.Imp:Start! imp);
+        out    message AckRegister();
+        out    message NakRegister(ServiceProviderContract.Imp:Start imp);     // return unconnected endpoint
+
+        in     message Deregister(char[]! in ExHeap path);
+        out    message AckDeregister(ServiceProviderContract.Imp:Start! imp);   // return deregistered endpoint
+        out    message NakDeregister();
+
+        in     message RegisterNameProvider(char[]! in ExHeap path, DirectoryServiceContract.Imp:Ready! imp);
+        out    message AckRegisterNameProvider();
+        out    message NackRegisterNameProvider(DirectoryServiceContract.Imp:Ready! imp);     // return unconnected endpoint
+
+        in     message DeregisterNameProvider(char[]! in ExHeap path);
+        out    message AckDeregisterNameProvider(DirectoryServiceContract.Imp:Ready! imp);   // return deregistered endpoint
+        out    message NackDeregisterNameProvider();
+
+        //
+        // FindFirst/FindNext: code= 0 more entries, 1 no more entries 
+        //
+        in     message FindFirst(char[]! in ExHeap prefix); 
+        out    message AckFindFirst(char[] in ExHeap path, int code); 
+        out    message NakFindFirst(); 
+
+        in     message FindNext(char[]! in ExHeap prefix, 
+                                char[]! in ExHeap previous); 
+
+        out    message AckFindNext(char[] in ExHeap path,
+                                   int code); 
+
+        out    message NakFindNext(); 
+
+        out message Success();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+        state Ready: one
+        {
+            Bind? ->                    ( AckBind! or NakBind!  or NakBindReparse!) -> Ready;
+            Find? ->                    ( AckFind! or NakFind! ) -> Ready; 
+            Notify? ->                  ( AckNotify! or NakNotify! or NakNotifyReparse! ) -> Ready; 
+
+            FindNext? ->                ( AckFindNext! or NakFindNext! ) -> Ready;
+            FindFirst? ->               ( AckFindFirst! or NakFindFirst!) -> Ready;
+
+            Register? ->                ( AckRegister! or NakRegister! ) -> Ready;
+            Deregister? ->              ( AckDeregister! or NakDeregister! ) -> Ready;
+            RegisterNameProvider? ->    ( AckRegisterNameProvider! or NackRegisterNameProvider! ) -> Ready;
+            DeregisterNameProvider? ->  ( AckDeregisterNameProvider! or NackDeregisterNameProvider! ) -> Ready;
+       }
+   } 
+}
diff --git a/base/Contracts/NameSpace.Contracts/NotifyContract.sg b/base/Contracts/NameSpace.Contracts/NotifyContract.sg
new file mode 100644
index 0000000..1c3dbd3
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/NotifyContract.sg
@@ -0,0 +1,34 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:  NotifyContract.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Directory
+{
+    public enum NotifyType 
+    {
+        Creation, 
+        Deletion,
+        Modification
+    }
+
+    public contract NotifyContract
+    {
+        in  message Begin(); 
+ 
+        in message ChangeNotification(char []! in ExHeap path, NotifyType type); 
+        out  message AckChangeNotification(); 
+      
+        state Start : Begin? -> Notify; 
+                  
+        state Notify : ChangeNotification? -> NotifyAck;
+        state NotifyAck: AckChangeNotification! -> Notify; 
+    }
+}
diff --git a/base/Contracts/NameSpace.Contracts/ServiceContract.sg b/base/Contracts/NameSpace.Contracts/ServiceContract.sg
new file mode 100644
index 0000000..5c1b665
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/ServiceContract.sg
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceContract.sg
+//
+
+// This is the base contract to be used, and overridden by, every Service
+// participating in the Directory
+
+namespace Microsoft.Singularity.Directory
+{
+     public contract ServiceContract
+     {
+        out message ContractNotSupported();
+
+        state Start: one
+        {
+            ContractNotSupported! -> Done;
+        }
+        state Done: one {}
+     }
+
+}
diff --git a/base/Contracts/NameSpace.Contracts/ServiceProviderContract.sg b/base/Contracts/NameSpace.Contracts/ServiceProviderContract.sg
new file mode 100644
index 0000000..0297d7a
--- /dev/null
+++ b/base/Contracts/NameSpace.Contracts/ServiceProviderContract.sg
@@ -0,0 +1,32 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceProviderContract.sg
+//
+
+//
+// Every leaf in the Directory communicates to a service by connecting through this contract 
+//
+
+namespace Microsoft.Singularity.Directory
+{
+    contract ServiceProviderContract
+    {
+        in  message Connect(ServiceContract.Exp:Start! exp);
+        out message AckConnect();
+        out message NackConnect(ServiceContract.Exp:Start exp);
+        // return the unconnected endpoint if possible.
+        
+        state Start: Connect? ->  Ack; 
+        
+        state Ack: one 
+        {
+            AckConnect!  -> Start;
+            NackConnect! -> Start;
+        }
+    }
+ }
+
diff --git a/base/Contracts/NetStack.Contracts/DNSContract.sg b/base/Contracts/NetStack.Contracts/DNSContract.sg
new file mode 100644
index 0000000..62f6063
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/DNSContract.sg
@@ -0,0 +1,58 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DNSContract.gs
+//  Note:   Contract definition for interacting with the DNS Module
+//
+
+// note This is all IPv4 flavored for now.
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace NetStack.Contracts
+{
+    public contract DNSContract : ServiceContract
+    {
+        // This is the name under which the DNS module registers with the
+        // name server
+        public const string ModuleName = "/dev/dns";
+
+        // Response messages
+        out message NotFound();
+        out message AddressList(uint[] in ExHeap addresses);
+        out message DNSResults(uint[] in ExHeap addresses, char[][] in ExHeap names);
+        out message IsValid(bool valid);
+        out message Address(uint address);
+        out message Ack();
+
+        // Request messages
+        in message AddNameServer(uint address);
+        in message RemoveNameServer(uint address);
+        in message RotateNameServers();
+        in message GetNameServers();
+        in message GetCurrentNameServer();
+        in message IsValidName(char[] in ExHeap name);
+
+        // host can be a host's textual name or the string of an address
+        in message Resolve(char[] in ExHeap host);
+
+        out message Ready();
+        override state Start : Ready! -> ReadyState;
+
+        state ReadyState : one
+        {
+            AddNameServer? -> Ack! -> ReadyState;
+            RemoveNameServer? -> Ack! -> ReadyState;
+            RotateNameServers? -> Ack! -> ReadyState;
+
+            GetCurrentNameServer? -> Address! -> ReadyState;
+            GetNameServers? -> AddressList! -> ReadyState;
+            Resolve? -> (NotFound! or DNSResults!) -> ReadyState;
+            IsValidName? -> IsValid! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/NetStack.Contracts/IPContract.sg b/base/Contracts/NetStack.Contracts/IPContract.sg
new file mode 100644
index 0000000..91df741
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/IPContract.sg
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPContract.gs
+//  Note:   Contract definition for interacting with the IP Module
+//
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using System;
+
+namespace NetStack.Contracts
+{
+    // 6-bye Ethernet address
+    public rep struct HardwareAddress
+    {
+        public byte b0, b1, b2, b3, b4, b5;
+
+        public void Set(byte bt0, byte bt1, byte bt2, byte bt3, byte bt4, byte bt5)
+        {
+            b0 = bt0;
+            b1 = bt1;
+            b2 = bt2;
+            b3 = bt3;
+            b4 = bt4;
+            b5 = bt5;
+        }
+
+        public void Set(byte[]! bytes)
+        {
+            if (bytes.Length != 6)
+            {
+                throw new ArgumentException("Invalid array length in HardwareAddress()");
+            }
+
+            b0 = bytes[0];
+            b1 = bytes[1];
+            b2 = bytes[2];
+            b3 = bytes[3];
+            b4 = bytes[4];
+            b5 = bytes[5];
+        }
+    }
+
+    // IP configuration information
+    public rep struct InterfaceIPInfo
+    {
+        public uint address;
+        public uint netmask;
+        public uint gateway;
+    }
+
+    // Information for a network interface.
+    // A single interface can have multiple IP configurations.
+    public rep struct InterfaceInfo : ITracked
+    {
+        public char[] in ExHeap driverName; // Friendly name, not programmatic name
+        public char[] in ExHeap driverVersion;
+        public uint linkSpeed;
+        public HardwareAddress hardwareAddress;
+        public InterfaceIPInfo[] in ExHeap ipConfigs; // Zero or more IP configs
+    }
+
+    public contract IPContract : ServiceContract
+    {
+        // This is the name under which the IP module registers itself with
+        // the name server
+        public const string ModuleName = "/dev/ip";
+
+        // Response messages
+        out message InterfaceList(char[][]! in ExHeap names);
+        out message InterfaceState(InterfaceInfo ifInfo);
+        out message HostName(char[]! in ExHeap hostname);
+        out message DomainName(char[]! in ExHeap domainName);
+        out message Running(bool isRunning);
+        out message IsLocal(bool isLocal);
+        out message InterfaceNotFound();
+        out message Err();
+        out message OK();
+
+        // General configuration
+        in message GetDomainName();
+        in message SetDomainName(char[]! in ExHeap name);
+        in message GetHostName();
+        in message SetHostName(char[]! in ExHeap name);
+        in message IsLocalAddress(uint addr);
+        in message Test();
+
+        // Interface configuration
+        in message StartDhcp(char[]! in ExHeap interfaceName);
+        in message StopDhcp(char[]! in ExHeap interfaceName);
+        in message IsRunningDhcp(char[]! in ExHeap interfaceName);
+        in message GetInterfaces();
+        in message SetInterfaceState(char[]! in ExHeap interfaceName, uint address, uint netMask, uint gateway);
+        in message GetInterfaceState(char[]! in ExHeap interfaceName);
+
+        out message Ready();
+        override state Start : Ready! -> ReadyState;
+
+        state ReadyState : one
+        {
+            GetDomainName? -> DomainName! -> ReadyState;
+            SetDomainName? -> (Err! or OK!) -> ReadyState;
+            GetHostName? -> HostName! -> ReadyState;
+            SetHostName? -> (Err! or OK!) -> ReadyState;
+            IsLocalAddress? -> IsLocal! -> ReadyState;
+
+            StartDhcp? -> (InterfaceNotFound! or OK!) -> ReadyState;
+            StopDhcp? -> (InterfaceNotFound! or OK!) -> ReadyState;
+            IsRunningDhcp? -> (InterfaceNotFound! or Running!) -> ReadyState;
+
+            GetInterfaces? -> InterfaceList! -> ReadyState;
+            SetInterfaceState? -> (InterfaceNotFound! or Err! or OK!) -> ReadyState;
+            GetInterfaceState? -> (InterfaceNotFound! or InterfaceState!) -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/NetStack.Contracts/NetStack.Contracts.Kernel.csproj b/base/Contracts/NetStack.Contracts/NetStack.Contracts.Kernel.csproj
new file mode 100644
index 0000000..6a55bcc
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/NetStack.Contracts.Kernel.csproj
@@ -0,0 +1,38 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\NetStack.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>NetStack.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DNSContract.sg" />
+    <Compile Include="IPContract.sg" />
+    <Compile Include="RoutingContract.sg" />
+    <Compile Include="TCPConnectionContract.sg" />
+    <Compile Include="TCPContract.sg" />
+    <Compile Include="UDPConnectionContract.sg" />
+    <Compile Include="UDPContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+
+</Project>
diff --git a/base/Contracts/NetStack.Contracts/NetStack.Contracts.csproj b/base/Contracts/NetStack.Contracts/NetStack.Contracts.csproj
new file mode 100644
index 0000000..74f9453
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/NetStack.Contracts.csproj
@@ -0,0 +1,38 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\NetStack.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>NetStack.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DNSContract.sg" />
+    <Compile Include="IPContract.sg" />
+    <Compile Include="RoutingContract.sg" />
+    <Compile Include="TCPConnectionContract.sg" />
+    <Compile Include="TCPContract.sg" />
+    <Compile Include="UDPConnectionContract.sg" />
+    <Compile Include="UDPContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Contracts/NetStack.Contracts/RoutingContract.sg b/base/Contracts/NetStack.Contracts/RoutingContract.sg
new file mode 100644
index 0000000..0dbc12b
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/RoutingContract.sg
@@ -0,0 +1,75 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RoutingContract.gs
+//  Note:   Contract definition for interacting with the IP Routing module
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace NetStack.Contracts
+{
+    public rep struct Network
+    {
+        public uint network;
+        public uint netmask;
+    }
+
+    public rep struct RouteEntry
+    {
+        public Network network;
+        public uint gateway;
+        public uint ifaddr;
+        public uint metric;
+        public uint tag;
+    }
+
+    public contract RoutingContract : ServiceContract
+    {
+        // This is the name under which the routing module
+        // registers itself with the name server.
+        public const string ModuleName = "/dev/routing";
+
+        // Response messages
+        out message RoutingTable(RouteEntry[] in ExHeap routes);
+        out message Err();
+        out message NoRouteFound();
+        out message Route(RouteEntry route);
+        out message OK();
+
+        // Request messages
+        in message GetRoutingTable();
+        in message AddRoute(Network dest, uint gateway, uint ifaddr);
+
+        in message DeleteRoute(Network dest);
+
+        // Find routes towards the indicated destination or network
+        in message FindHostRoute(uint dest);
+        in message FindNetRoute(Network dest);
+
+        // Find a route specific to this target host
+        in message FindSpecificHostRoute(uint dest);
+
+        // Find a route to this exact network
+        in message FindSpecificNetRoute(Network dest);
+
+        out message Ready();
+        override state Start : Ready! -> ReadyState;
+
+        state ReadyState : one
+        {
+            GetRoutingTable? -> RoutingTable! -> ReadyState;
+            AddRoute? -> (Err! or OK!) -> ReadyState;
+            DeleteRoute? -> (NoRouteFound! or OK!) -> ReadyState;
+
+            FindHostRoute? -> (Route! or NoRouteFound!) -> ReadyState;
+            FindNetRoute? -> (Route! or NoRouteFound!) -> ReadyState;
+            FindSpecificHostRoute? -> (Route! or NoRouteFound!) -> ReadyState;
+            FindSpecificNetRoute? -> (Route! or NoRouteFound!) -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/NetStack.Contracts/TCPConnectionContract.sg b/base/Contracts/NetStack.Contracts/TCPConnectionContract.sg
new file mode 100644
index 0000000..7bbd077
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/TCPConnectionContract.sg
@@ -0,0 +1,259 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpConnectionContract.sg
+//  Note:   Contract definition for TCP channels
+//
+
+using Microsoft.Singularity.Channels;
+using System;
+
+namespace NetStack.Contracts
+{
+	public enum TcpError
+	{
+		Unknown = 1,
+		AlreadyConnected,		// this connection is already in use
+		Refused,				// the receiving host actively refused the connection
+		Reset,					// the connection was reset
+		Timeout,				// no response was received
+		ProtocolViolation,		// we received a TCP segment that is not acceptable in the current state
+		ResourcesExhausted,		// out of memory, etc.
+		Closed,					// remote peer has closed socket
+	}
+	
+    public contract TcpConnectionContract
+    {
+    
+    
+        // Requests
+        in message Connect(uint dstIP, ushort dstPort);
+        in message BindLocalEndPoint(uint dstIP, ushort dstPort);
+
+        //
+        // Initial state; there is a gratuitous Ready message to
+        // ensure the Exp side has been connected before it accepts
+        // any messages.
+        //
+        out message Ready();
+
+        state Start : Ready! -> ReadyState;
+
+        state ReadyState : one
+        {
+            Connect? -> ConnectResult; // Can connect without binding first
+            BindLocalEndPoint? -> BindResult; // Can't listen without binding first
+            Close? -> Closed;
+        }
+
+        //
+        // Binding to a local endpoint
+        //
+        state BindResult : one
+        {
+            OK! -> Bound;
+            InvalidEndPoint! -> ReadyState;
+        }
+
+        in message Listen(int backlog);
+
+        state Bound : one
+        {
+            Listen? -> ListenResult;
+            Connect? -> ConnectResult;
+            Close? -> Closed;
+        }
+
+        //
+        // Attempts to connect to a remote host
+        //
+        out message OK();
+        out message CouldNotConnect(TcpError error);
+
+        state ConnectResult : one
+        {
+            CouldNotConnect! -> ReadyState;
+            OK! -> Connected;
+        }
+
+        //
+        // Attempts to listen for inbound connections
+        //
+        out message CouldNotListen();
+
+        state ListenResult : one
+        {
+            CouldNotListen! -> ReadyState;
+            OK! -> Listening;
+        }
+
+        out message InvalidEndPoint();
+
+        in message GetLocalAddress();
+        in message GetLocalPort();
+        in message Accept(TcpConnectionContract.Exp:PreConnected! newConnection);
+        in message IsSessionAvailable(); // Is there a new session waiting to be serviced?
+
+        out message IPAddress(uint ip);
+        out message Port(ushort port);
+        out message SessionIsAvailable(bool isAvailable);
+
+        state Listening : one
+        {
+            GetLocalAddress? -> IPAddress! -> Listening;
+            GetLocalPort? -> Port! -> Listening;
+            IsSessionAvailable? -> SessionIsAvailable! -> Listening;
+            Accept? -> OK! -> Listening; // Blocks until a connection is received
+
+            Close? -> Closed;
+        }
+
+        //
+        // The pre-connected state exists so we can confirm that the endpoint
+        // has been wired to the NetStack before accepting messages on it
+        //
+        state PreConnected : Ready! -> Connected;
+
+        //
+        // Operations on an established connection
+        //
+
+        // Requests
+        in message Read(); // Read as much data as possible without blocking
+        in message PollRead(int timeout); // Wait up to timeout ms for data
+        in message IsDataAvailable(); // Is there queued data that can be read immediately?
+        in message Write(byte[]! in ExHeap data);
+        in message Close(); // Performs a non-blocking but graceful shutdown
+        in message Abort(); // Performs an immediate, hard close (unsent data is discarded)
+        in message GetRemoteAddress();
+        in message GetRemotePort();
+        in message DoneSending();
+        in message DoneReceiving();
+
+        // Response messages
+        out message ConnectionClosed(); // Connection has been shut down
+        out message NoData(); // There was nothing to read
+        out message NoMoreData(); // Will never be more data
+        out message CantSend(); // Remote side refuses more data
+        out message Data(byte[]! in ExHeap data);
+        out message DataIsAvailable(bool isAvailable);
+
+        state Connected : one
+        {
+            Read? -> ReadResult;
+            PollRead? -> PollReadResult;
+            Write? -> WriteResult;
+
+            IsDataAvailable? -> (DataIsAvailable!) -> Connected;
+            GetLocalAddress? -> IPAddress! -> Connected;
+            GetLocalPort? -> Port! -> Connected;
+            GetRemoteAddress? -> IPAddress! -> Connected;
+            GetRemotePort? -> Port! -> Connected;
+
+            DoneSending? -> ReceiveOnly;
+            DoneReceiving? -> SendOnly;
+            Close? -> Closed;
+            Abort? -> Closed;
+        }
+
+        state ReadResult : one
+        {
+            Data! -> Connected;
+            // This indicates that there will never be any more
+            // data, but that sending is still allowed
+            NoMoreData! -> SendOnly;
+            // This indicates that sending has been closed by the
+            // remote side
+            ConnectionClosed! -> Zombie;
+        }
+
+        state PollReadResult : one
+        {
+            Data! -> Connected;
+            // No data available within the poll window; try again
+            NoData! -> Connected;
+            NoMoreData! -> SendOnly;
+            ConnectionClosed! -> Zombie;
+        }
+
+        state WriteResult : one
+        {
+            OK! -> Connected;
+            // This indicates that writing has been closed by the
+            // remote side, but reading is still allowed.
+            CantSend! -> ReceiveOnly;
+        }
+
+        //
+        // Operations on a receive-only connection (send side has been closed)
+        //
+        state ReceiveOnly : one
+        {
+            Read? -> ROReadResult;
+            PollRead? -> ROPollReadResult;
+
+            IsDataAvailable? -> (DataIsAvailable!) -> ReceiveOnly;
+            GetLocalAddress? -> IPAddress! -> ReceiveOnly;
+            GetLocalPort? -> Port! -> ReceiveOnly;
+            GetRemoteAddress? -> IPAddress! -> ReceiveOnly;
+            GetRemotePort? -> Port! -> ReceiveOnly;
+
+            DoneReceiving? -> Zombie;
+            Close? -> Closed;
+            Abort? -> Closed;
+        }
+
+        state ROReadResult : one
+        {
+            Data! -> ReceiveOnly;
+            // If there is no more data, there's nothing more to do.
+            NoMoreData! -> Zombie;
+        }
+
+        state ROPollReadResult : one
+        {
+            Data! -> ReceiveOnly;
+            NoData! -> ReceiveOnly;
+            NoMoreData! -> Zombie;
+        }
+
+        //
+        // Operations on a send-only connection (receive side has been closed)
+        //
+        state SendOnly : one
+        {
+            Write? -> SOWriteResult;
+
+            GetLocalAddress? -> IPAddress! -> SendOnly;
+            GetLocalPort? -> Port! -> SendOnly;
+            GetRemoteAddress? -> IPAddress! -> SendOnly;
+            GetRemotePort? -> Port! -> SendOnly;
+
+            DoneSending? -> Zombie;
+            Close? -> Closed;
+            Abort? -> Closed;
+        }
+
+        state SOWriteResult : one
+        {
+            OK! -> SendOnly;
+            // Remote side refuses further data
+            CantSend! -> Zombie;
+        }
+
+        //
+        // Zombied connection (nothing left to do but user hasn't explicitly
+        // closed yet)
+        //
+        state Zombie : one
+        {
+            Close? -> Closed; // Wrap up gracefully
+            Abort? -> Closed; // Drop any unsent data
+        }
+
+        state Closed : {} // Nothing is acceptable here
+    }
+}
diff --git a/base/Contracts/NetStack.Contracts/TCPContract.sg b/base/Contracts/NetStack.Contracts/TCPContract.sg
new file mode 100644
index 0000000..228017f
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/TCPContract.sg
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpContract.sg
+//  Note:   Contract definition for TCP channels
+//
+
+using Microsoft.Singularity.Directory;
+
+namespace NetStack.Contracts
+{
+    public contract TcpContract : ServiceContract
+    {
+        // The name you should use to look up this module using the NameServer.
+        public const string ModuleName = "/dev/tcp";
+
+        // Signal our identity
+        out message Ready();
+
+        // Create a new TCP connection
+        in message CreateTcpSession(TcpConnectionContract.Exp:Start! endpoint);
+        out message Ack();
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            CreateTcpSession? -> Ack! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/NetStack.Contracts/UDPConnectionContract.sg b/base/Contracts/NetStack.Contracts/UDPConnectionContract.sg
new file mode 100644
index 0000000..5cd1cc8
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/UDPConnectionContract.sg
@@ -0,0 +1,129 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpConnectionContract.sg
+//
+//
+//  Note:   Contract definition for UDP channels
+//
+//          UDP is ugly because of WriteTo and arbitrarily timed binds.
+//
+
+using Microsoft.Singularity.Channels;
+using System;
+
+namespace NetStack.Contracts
+{
+    public contract UdpConnectionContract
+    {
+        // Requests
+        in message BindLocalEndPoint(uint srcIP, ushort srcPort);
+        in message ConnectWithAnyLocalEndPoint(uint dstIP, ushort dstPort);
+        in message Connect(uint srcIP, ushort srcPort, uint dstIP, ushort dstPort);
+        in message Write(byte[]! in ExHeap data);
+        in message WriteTo(uint dstIP, ushort dstPort, byte[]! in ExHeap data);
+        in message Read();                  // Read one packet
+        in message PollRead(int timeoutMillis);
+        in message PollSelectRead(int timeoutMillis);
+        in message PollSelectWrite(int timeoutMillis);
+        in message Close();
+
+        in message GetLocalAddress();
+        in message GetLocalPort();
+        in message GetRemoteAddress();
+        in message GetRemotePort();
+
+        // Responses
+        out message OK();
+        out message InvalidEndPoint(uint ip, ushort port);
+        out message DataTooLarge();
+        out message NoData(); // There was nothing to read
+        out message Data(uint srcAddr, ushort srcPort, byte[]! in ExHeap data);
+        out message IPAddress(uint ip);
+        out message Port(ushort port);
+        out message PollSelectResult(bool success);
+
+        //
+        // Initial state. We use an initial "Ready" message to confirm
+        // that the endpoint is connected before it receives any
+        // requests.
+        //
+        out message Ready();
+        state Start : Ready! -> ReadyState;
+
+        state ReadyState : one
+        {
+            WriteTo? -> (OK! or InvalidEndPoint! or DataTooLarge!) -> Start;
+
+            PollSelectRead?  -> PollSelectResult! -> Connected;
+            PollSelectWrite? -> PollSelectResult! -> Connected;
+
+            Connect? -> ConnectResult;
+            ConnectWithAnyLocalEndPoint? -> ConnectResult;
+            BindLocalEndPoint? -> BindResult;
+            Close? -> Closed;
+        }
+
+        //
+        // State following WriteTo with unbound session
+        //
+        state ConnectResult : one
+        {
+            OK! -> Connected;
+            InvalidEndPoint! -> Start;
+        }
+
+        state BindResult : one
+        {
+            OK! -> LocallyBound;
+            InvalidEndPoint! -> Start;
+        }
+
+        state ConnectFromLocallyBoundResult : one
+        {
+            OK! -> Connected;
+            InvalidEndPoint! -> LocallyBound;
+        }
+
+        state Connected : one
+        {
+            Write? -> (OK! or DataTooLarge!) -> Connected;
+            WriteTo? -> (OK! or InvalidEndPoint! or DataTooLarge!) -> Connected;
+            Read? -> Data! -> Connected;
+            PollRead? -> (Data! or NoData!) -> Connected;
+
+            PollSelectRead?  -> PollSelectResult! -> Connected;
+            PollSelectWrite? -> PollSelectResult! -> Connected;
+
+            Close? -> Closed;
+
+            GetLocalAddress?  -> IPAddress! -> Connected;
+            GetLocalPort?     -> Port!      -> Connected;
+            GetRemoteAddress? -> IPAddress! -> Connected;
+            GetRemotePort?    -> Port!      -> Connected;
+        }
+
+        state LocallyBound : one
+        {
+            WriteTo? -> (OK! or InvalidEndPoint! or DataTooLarge!) -> LocallyBound;
+            Connect? -> ConnectFromLocallyBoundResult;
+            Read? -> Data! -> LocallyBound;
+            PollRead? -> (Data! or NoData!) -> LocallyBound;
+
+            PollSelectRead?  -> PollSelectResult! -> LocallyBound;
+            PollSelectWrite? -> PollSelectResult! -> LocallyBound;
+
+            Close? -> Closed;
+
+            GetLocalAddress?  -> IPAddress! -> LocallyBound;
+            GetLocalPort?     -> Port!      -> LocallyBound;
+            GetRemoteAddress? -> IPAddress! -> LocallyBound;
+            GetRemotePort?    -> Port!      -> LocallyBound;
+        }
+
+        state Closed : {} // Nothing is acceptable here
+    }
+}
diff --git a/base/Contracts/NetStack.Contracts/UDPContract.sg b/base/Contracts/NetStack.Contracts/UDPContract.sg
new file mode 100644
index 0000000..d4aaa81
--- /dev/null
+++ b/base/Contracts/NetStack.Contracts/UDPContract.sg
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UDPContract.sg
+//
+//  Note:   Contract definition for UDP channels
+//
+
+using Microsoft.Singularity.Directory;
+
+namespace NetStack.Contracts
+{
+    public contract UdpContract : ServiceContract
+    {
+        // The name you should use to look up this module using the NameServer.
+        public const string ModuleName = "/dev/udp";
+
+        // Signal our identity
+        out message Ready();
+
+        // Create a new UDP connection
+        in message CreateUdpSession(UdpConnectionContract.Exp:Start! endpoint);
+        out message Ack();
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            CreateUdpSession? -> Ack! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/PingPong.Contracts/PingContract.sg b/base/Contracts/PingPong.Contracts/PingContract.sg
new file mode 100644
index 0000000..e414d9b
--- /dev/null
+++ b/base/Contracts/PingPong.Contracts/PingContract.sg
@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PingContract.sg
+//  Note:   Contract for a ChildPing process
+//
+
+using System;
+using Microsoft.Singularity.Extending;
+
+namespace Microsoft.Singularity.PingPong.Contracts
+{
+    public contract PingContract : ExtensionContract
+    {
+        in message StartPingPong(int numRepeats);
+
+        out message PingReady();
+        out message Done();
+
+        override state Start : PingReady! -> ReadyState;
+        state ReadyState : StartPingPong? -> PendingState;
+        state PendingState: Done! -> ReadyState;
+    }
+}
diff --git a/base/Contracts/PingPong.Contracts/PingPong.Contracts.csproj b/base/Contracts/PingPong.Contracts/PingPong.Contracts.csproj
new file mode 100644
index 0000000..fefe840
--- /dev/null
+++ b/base/Contracts/PingPong.Contracts/PingPong.Contracts.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\PingPong.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>PingPong.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="PingContract.sg" />
+    <Compile Include="PongContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Contracts/PingPong.Contracts/PongContract.sg b/base/Contracts/PingPong.Contracts/PongContract.sg
new file mode 100644
index 0000000..3b8c34f
--- /dev/null
+++ b/base/Contracts/PingPong.Contracts/PongContract.sg
@@ -0,0 +1,26 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PongContract.sg
+//  Note:   Contract definition for the ChildPong process
+//
+
+using System;
+using Microsoft.Singularity.Extending;
+
+namespace Microsoft.Singularity.PingPong.Contracts
+{
+    public contract PongContract : ExtensionContract
+    {
+        in message Ping(int data);
+        out message Pong(int data);
+
+        out message PongReady();
+
+        override state Start : PongReady! -> ReadyState;
+        state ReadyState : Ping? -> Pong! -> ReadyState;
+    }
+}
diff --git a/base/Contracts/SeattleTrafficProxy.Contracts/SeattleTrafficProxy.Contracts.csproj b/base/Contracts/SeattleTrafficProxy.Contracts/SeattleTrafficProxy.Contracts.csproj
new file mode 100644
index 0000000..9605561
--- /dev/null
+++ b/base/Contracts/SeattleTrafficProxy.Contracts/SeattleTrafficProxy.Contracts.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\SeattleTrafficProxy.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>SeattleTrafficProxy.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SeattleTrafficProxyContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
\ No newline at end of file
diff --git a/base/Contracts/SeattleTrafficProxy.Contracts/SeattleTrafficProxyContract.sg b/base/Contracts/SeattleTrafficProxy.Contracts/SeattleTrafficProxyContract.sg
new file mode 100644
index 0000000..e2e68ca
--- /dev/null
+++ b/base/Contracts/SeattleTrafficProxy.Contracts/SeattleTrafficProxyContract.sg
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SeattleTrafficProxyContract.sg
+//  Note:   Contract definition for the Seattle Traffic service
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.SeattleTrafficProxy.Contracts
+{
+    public rep struct TrafficInfo {
+        // There is a lot of traffic data. For now, we'll just provide
+        // the bottlenecks and the approximate lat/long for their center.
+        public int minUntilFree;    // estimate of time until the bottleneck clears
+        public float latitude;
+        public float longitude;
+    }
+
+    public contract SeattleTrafficProxyContract : ServiceContract
+    {
+        public const string ModuleName = "/dev/SeattleTrafficProxy";
+
+        // Signal our identity
+        out message Ready();
+
+        in message GetTraffic();
+        out message Traffic(TrafficInfo[]! in ExHeap trafficInfo);
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            GetTraffic? -> Traffic! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/Security.Contracts/Security.Contracts.Kernel.csproj b/base/Contracts/Security.Contracts/Security.Contracts.Kernel.csproj
new file mode 100644
index 0000000..a379307
--- /dev/null
+++ b/base/Contracts/Security.Contracts/Security.Contracts.Kernel.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Security.Contracts\Security.Contracts.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Security.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SecurityDiagnosticsContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+    
+</Project>
diff --git a/base/Contracts/Security.Contracts/Security.Contracts.csproj b/base/Contracts/Security.Contracts/Security.Contracts.csproj
new file mode 100644
index 0000000..cdfa18e
--- /dev/null
+++ b/base/Contracts/Security.Contracts/Security.Contracts.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Security.Contracts\Security.Contracts.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Security.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SecurityDiagnosticsContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Contracts/Security.Contracts/SecurityDiagnosticsContract.sg b/base/Contracts/Security.Contracts/SecurityDiagnosticsContract.sg
new file mode 100644
index 0000000..8f9f406
--- /dev/null
+++ b/base/Contracts/Security.Contracts/SecurityDiagnosticsContract.sg
@@ -0,0 +1,52 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity.Directory;
+    using Microsoft.Singularity.Channels;
+
+    public contract SecurityDiagnosticsContract : ServiceContract
+    {
+        public const string ModuleName="/securitydiag";
+
+        /// <summary>
+        /// Tell the client the channel is ready.
+        /// </summary>
+        out message Ready();
+
+        /// <summary>
+        /// Get a principal name from a principal
+        /// </summary>
+        //in message GetName(long principalId);
+        //out message AckGetName(char[]! in ExHeap principalName);
+
+        in message GetStatistics();
+        out message GetStatisticsAck(char[]! in ExHeap stats);
+
+        in message ClearStatistics();
+        out message Ack();
+
+        in message FlushCaches();
+
+        // make sure to remove this!!
+        in message Disable(bool yes);
+
+
+        override state Start: Ready! -> ReadyState;
+
+        state ReadyState : one
+        {
+            //GetName? -> AckGetName! -> ReadyState;
+            ClearStatistics? -> Ack! -> ReadyState;
+            GetStatistics? -> GetStatisticsAck! -> ReadyState;
+            FlushCaches? -> Ack! -> ReadyState;
+            Disable? -> Ack! -> ReadyState;
+        }
+    }
+}
+
diff --git a/base/Contracts/ServiceManager.Contracts/BenchmarkContract.sg b/base/Contracts/ServiceManager.Contracts/BenchmarkContract.sg
new file mode 100644
index 0000000..2826ba3
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/BenchmarkContract.sg
@@ -0,0 +1,75 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services
+{
+    contract BenchmarkContract : ServiceContract
+    {
+        public const string ModuleName = "/RBench";
+        public const string ModuleNameProxy = "/RBenchProxy";
+
+        out message Success();
+
+        in message GetCycleCount();
+        out message CycleCount(ulong cycle);
+
+        in message Null();
+        out message AckNull();
+
+        in message One(int arg);
+        out message AckOne(int arg);
+
+        in message Two(int arg1, int arg2);
+        out message AckTwo(int arg1, int arg2);
+
+        in message Three(int arg1, int arg2, int arg3);
+        out message AckThree(int arg1, int arg2, int arg3);
+
+        in message Four(int arg1, int arg2, int arg3, int arg4);
+        out message AckFour(int arg1, int arg2, int arg3, int arg4);
+
+        in message Five(int arg1, int arg2, int arg3, int arg4, int arg5);
+        out message AckFive(int arg1, int arg2, int arg3, int arg4, int arg5);
+
+        in message Six(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6);
+        out message AckSix(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6);
+
+        in message Seven(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7);
+        out message AckSeven(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7);
+
+        in message Eight(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8);
+        out message AckEight(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8);
+
+        in message Nine(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+        out message AckNine(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+
+        in message EndOfBenchmark();
+        out message AckEnd();
+
+        override state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            GetCycleCount? -> CycleCount! -> Ready;
+            Null? -> AckNull! -> Ready;
+            One? -> AckOne! -> Ready;
+            Two? -> AckTwo! -> Ready;
+            Three? -> AckThree! -> Ready;
+            Four? -> AckFour! -> Ready;
+            Five? -> AckFive! -> Ready;
+            Six? -> AckSix! -> Ready;
+            Seven? -> AckSeven! -> Ready;
+            Eight? -> AckEight! -> Ready;
+            Nine? -> AckNine! -> Ready;
+            EndOfBenchmark? -> AckEnd!;
+        }
+    }
+}
diff --git a/base/Contracts/ServiceManager.Contracts/GameContract.sg b/base/Contracts/ServiceManager.Contracts/GameContract.sg
new file mode 100644
index 0000000..5bbb03d
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/GameContract.sg
@@ -0,0 +1,84 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts/ServiceManager.Contracts/GameContract.sg
+//
+//  Note:   String replace game contract
+//
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.ServiceManager
+{
+    public contract GamePlayerContract : ServiceContract
+    {
+        public const String ModuleName = "ReplaceGame";
+
+        out message Success();
+
+        in  message Search(char[]! in ExHeap query);
+        in  message Overwrite(char[]! in ExHeap replacement, int position);
+        in  message Protect(int position);
+        in  message Score(char[]! in ExHeap query);
+
+        out message AckSearch(int position);
+        out message AckOverwrite();
+        out message AckProtect();
+        out message AckScore(int score);
+
+        override state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            Search? -> AckSearch! -> Action;
+            Score? -> AckScore! /* -> Truncate */ -> Ready;
+        }
+
+        state Action : one {
+            Overwrite? -> AckOverwrite! /* -> Snapshot */ -> Ready;
+            Protect? -> AckProtect! /* -> Truncate */ -> Ready;
+        }
+    }
+
+    public contract GameContract : ServiceContract
+    {
+        public const String ModuleName = "GameMaster";
+
+        out message Success();
+
+        in  message NewGame();
+        in  message Entry(GamePlayerContract.Exp:Start! player, int gameId);
+        in  message StartGame();
+        in  message EndGame();
+
+        out message AckNewGame(int gameId);
+        out message NakNewGame();
+        out message AckEntry();
+        out message NakEntry(GamePlayerContract.Exp:Start player);
+        out message AckStartGame();
+        out message AckEndGame();
+
+        override state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            NewGame? -> AckGameMaster;
+        }
+
+        state AckGameMaster : one {
+            AckNewGame! -> Play;
+            NakNewGame! -> Ready;
+        }
+
+        state Play : one {
+            Entry? -> (AckEntry! or NakEntry!) -> Play;
+            StartGame? -> AckStartGame! -> EndGame? -> AckEndGame! -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/ServiceManager.Contracts/ManagedServiceContract.sg b/base/Contracts/ServiceManager.Contracts/ManagedServiceContract.sg
new file mode 100644
index 0000000..5063159
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/ManagedServiceContract.sg
@@ -0,0 +1,85 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts\ServiceManager.Contracts\ServiceContract.sg
+//
+//  Note:   For service providers managed by Service Manager
+//
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.ServiceManager
+{
+    public contract ManagedServiceContract
+    {
+        out message Success();
+        out message Busy();
+        
+        in message Knock();
+        out message Alive();
+
+        in message StartService();
+        out message AckStartService();
+        out message NakStartService();
+
+        in message StopService();
+        out message AckStopService();
+
+        in message RestartService();
+        out message AckRestartService();
+
+        // Restart the service process
+        in message Restart();
+        out message AckRestart();
+
+        // Stop the service process
+        in message Stop();
+        out message AckStop();
+
+        state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            Knock? -> Alive! -> Ready;
+            StartService? -> (AckStartService! or NakStartService!) -> Ready;
+            RestartService? -> (AckRestartService! or Busy!) -> Ready;
+            StopService? -> (AckStopService! or Busy!) -> Ready;
+            Restart? -> AckRestart! -> Ready;
+
+            Stop? -> AckStop! -> Ready;
+        }
+    }
+
+    public contract ManagedProxyContract
+    {
+        out message Success();
+
+        in  message RequestRecovery();
+        out message AckRecovery(DirectoryServiceContract.Exp:Start! directory,
+                                ServiceProxyContract.Exp:Start! proxy);
+        out message NakRecovery();
+
+        in  message RequestDSRecovery();
+        out message AckDSRecovery(DirectoryServiceContract.Exp:Start! proxy);
+        out message NakDSRecovery();
+
+        // reports the end of recovery process to service manager
+        in  message EndOfRecovery();
+        out message AckEndOfRecovery();
+
+        state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            RequestRecovery? -> (AckRecovery! or NakRecovery!) -> Ready;
+            RequestDSRecovery? -> (AckDSRecovery! or NakDSRecovery!) -> Ready;
+            EndOfRecovery? -> AckEndOfRecovery! -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/ServiceManager.Contracts/ServiceControlContract.sg b/base/Contracts/ServiceManager.Contracts/ServiceControlContract.sg
new file mode 100644
index 0000000..f1448cb
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/ServiceControlContract.sg
@@ -0,0 +1,79 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts\ServiceManager.Contracts\ServiceControlContracts.sg
+//
+//  Note:   SMS-clients contract
+//
+using Microsoft.Singsharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.ServiceManager
+{
+    public enum ServiceError : uint
+    {
+        None = 0,
+
+        ChannelClosed,
+        NotFound,
+        PermissionDenied,
+        TryAgain,
+
+        Unknown = 0xFFFFFFFF
+    }
+
+    public contract ServiceControlContract
+    {
+        out message Success();
+
+        in message StartService();
+        out message AckStartService();
+        out message NakStartService(ServiceError err);
+
+        in message StopService();
+        out message AckStopService();
+        out message NakStopService(ServiceError err);
+
+        in message RestartService();
+        out message AckRestartService();
+        out message NakRestartService(ServiceError err);
+
+        in message StartPoll(int interval);
+        out message AckStartPoll();
+        out message NakStartPoll(ServiceError err);
+
+        in message StopPoll();
+        out message AckStopPoll();
+        out message NakStopPoll(ServiceError err);
+
+        state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            StartService? ->        (AckStartService!
+                                     or NakStartService!
+                                    ) -> Ready;
+
+            StopService? ->         (AckStopService!
+                                     or NakStopService!
+                                    ) -> Ready;
+
+            RestartService? ->      (AckRestartService!
+                                     or NakRestartService!
+                                    ) -> Ready;
+
+            StartPoll? ->           (AckStartPoll!
+                                     or NakStartPoll!
+                                    ) -> Ready;
+
+            StopPoll? ->            (AckStopPoll!
+                                     or NakStopPoll!
+                                    ) -> Ready;
+        }
+    }
+}
diff --git a/base/Contracts/ServiceManager.Contracts/ServiceManagementContract.sg b/base/Contracts/ServiceManager.Contracts/ServiceManagementContract.sg
new file mode 100644
index 0000000..bb578f2
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/ServiceManagementContract.sg
@@ -0,0 +1,126 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts\ServiceManager.Contracts\ServiceManagementContracts.sg
+//
+//  Note:   SMS-clients contract
+//
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.ServiceManager
+{
+    public rep struct ServiceInfo : ITracked
+    {
+        private char[]! in ExHeap name;
+        private char[]! in ExHeap binary;
+        public int Id;
+        public ServiceType Type;
+
+        public ServiceInfo(int id, string! name, string! binary,
+                           ServiceType type)
+        {
+            Id = id;
+            this.name = Bitter.FromString2(name);
+            this.binary = Bitter.FromString2(binary);
+            this.Type = type;
+        }
+
+        public string! Name
+        {
+            get
+            {
+                expose (this) {
+                    return Bitter.ToString2(name);
+                }
+            }
+            private set {}
+        }
+
+        public string! Binary
+        {
+            get
+            { 
+                expose (this) {
+                    return Bitter.ToString2(binary);
+                }
+            }
+            private set {}
+        }
+    }
+
+    public enum ServiceType : uint
+    {
+        Unknown,
+        Default,
+        Resilient,
+    }
+
+    public contract ServiceManagementContract : ServiceContract
+    {
+        public const string ModuleName = "/services";
+
+        out message Success();
+
+        out message NotFound(ServiceControlContract.Exp:Start! ep);
+        out message PermissionDenied(ServiceControlContract.Exp:Start! ep);
+        out message TryAgain(ServiceControlContract.Exp:Start! ep);
+
+        in message Bind(ServiceInfo*! in ExHeap info, ServiceControlContract.Exp:Start! ep);
+        out message AckBind();
+
+        in message GetControl(int id, ServiceControlContract.Exp:Start! ep);
+        out message AckGetControl();
+
+        in message Unbind(int id);
+        out message AckUnbind(ServiceControlContract.Exp:Start! ep);
+        out message ControlNotFound();
+        out message ServiceNotFound();
+        out message ControlPermissionDenied();
+
+        in message BeginEnumeration();
+        in message MoveNext();
+        in message EndEnumeration();
+        out message EnumerationTerminated();
+        out message Current(ServiceInfo*! in ExHeap info);
+
+        override state Start : one {
+            Success! -> Ready;
+        }
+
+        state Enumerate : one {
+            EnumerationTerminated! -> Ready;
+            Current! -> EnumerateAck;
+        }
+
+        state EnumerateAck : one {
+            MoveNext? -> Enumerate;
+            EndEnumeration? -> Ready;
+        }
+
+        state Ready : one {
+            Bind? ->        (AckBind!
+                             or NotFound!
+                             or PermissionDenied!
+                            ) -> Ready;
+
+            GetControl? ->  (AckGetControl!
+                             or NotFound!
+                             or PermissionDenied!
+                             or TryAgain!
+                            ) -> Ready;
+
+            Unbind? ->      (AckUnbind!
+                             or ControlNotFound!
+                             or ServiceNotFound!
+                             or ControlPermissionDenied!
+                            ) -> Ready;
+
+            BeginEnumeration? -> Enumerate;
+        }
+    }
+}
diff --git a/base/Contracts/ServiceManager.Contracts/ServiceManager.Contracts.csproj b/base/Contracts/ServiceManager.Contracts/ServiceManager.Contracts.csproj
new file mode 100644
index 0000000..cc3820f
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/ServiceManager.Contracts.csproj
@@ -0,0 +1,40 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>ServiceManager.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ManagedServiceContract.sg" />
+    <Compile Include="ServiceControlContract.sg" />
+    <Compile Include="ServiceManagementContract.sg" />
+    <Compile Include="ThreadTerminationContract.sg" />
+    <Compile Include="BenchmarkContract.sg" />
+    <Compile Include="ServiceProxyContract.sg" />
+    <Compile Include="GameContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Contracts/ServiceManager.Contracts/ServiceProxyContract.sg b/base/Contracts/ServiceManager.Contracts/ServiceProxyContract.sg
new file mode 100644
index 0000000..9985972
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/ServiceProxyContract.sg
@@ -0,0 +1,203 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Contracts\ServiceManager.Contracts\ProxyContract.sg
+//
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.ServiceManager
+{
+    public rep struct Persistent : ITracked {
+    }
+
+    public contract ServiceProxyContract
+    {
+        out message Success();
+
+        //---------------------------------------------------------------------
+        //      Directory Service Imitation
+        //---------------------------------------------------------------------
+
+        ///
+        /// Registers the path to the root directory service.
+        ///
+        in  message Register(char[]! in ExHeap path,
+                             ServiceProviderContract.Imp:Start! imp);
+        out message AckRegister();
+        out message NakRegister(ServiceProviderContract.Imp:Start imp,
+                                ErrorCode error);
+
+        ///
+        /// De-registers the path from the root directory service.
+        ///
+        in  message Deregister(char[]! in ExHeap path);
+        out message AckDeregister(ServiceProviderContract.Imp:Start! imp);
+        out message NakDeregister(ErrorCode error);
+
+        //---------------------------------------------------------------------
+        //      Persistent Memory
+        //---------------------------------------------------------------------
+
+        in  message Allocate(Persistent in ExHeap obj);
+        out message AckAllocate(ulong objectId);
+        out message NakAllocate(Persistent in ExHeap obj);
+        in  message Deallocate(ulong objectId);
+        out message AckDeallocate();
+        out message NakDeallocate();
+
+        in  message AcquireObject(ulong objectId);
+        out message AckAcquireObject(Persistent in ExHeap obj);
+        out message NakAcquireObject();
+        in  message ReleaseObject(Persistent in ExHeap obj);
+        out message AckReleaseObject();
+        out message NakReleaseObject();
+
+        in  message Upload(byte[]! in ExHeap data);
+        out message AckUpload();
+        in  message Download();
+        out message AckDownload(byte[]! in ExHeap data);
+        out message NakDownload();
+
+        //---------------------------------------------------------------------
+        //      Snapshot facility
+        //---------------------------------------------------------------------
+
+        ///
+        /// Synchronizes journalets to the nearest checkpoints.
+        ///
+        in  message Suspend();
+        //in  message Suspend(char[]! in ExHeap path);
+        out message AckSuspend(int generation);
+
+        ///
+        /// Resumes journalets
+        ///
+        in  message Resume(int generation);
+        //in  message Resume(char[]! in ExHeap path);
+        out message AckResume();
+
+        ///
+        /// Updates the master copy
+        ///
+        in  message Update(int generation);
+        out message AckUpdate();
+
+        state Start : one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            Register? -> (AckRegister! or NakRegister!) -> Ready;
+            Deregister? -> (AckDeregister! or NakDeregister!) -> Ready;
+
+            Allocate? -> (AckAllocate! or NakAllocate!) -> Ready;
+            Deallocate? -> (AckDeallocate! or NakDeallocate!) -> Ready;
+            AcquireObject? -> (AckAcquireObject! or NakAcquireObject!) -> Ready;
+            ReleaseObject? -> (AckReleaseObject! or NakReleaseObject!) -> Ready;
+
+            Upload? -> AckUpload! -> Ready;
+            Download? -> (AckDownload! or NakDownload!) -> Ready;
+
+            Suspend? -> AckSuspend! -> Ready;
+            Resume? -> AckResume! -> Ready;
+            Update? -> AckUpdate! -> Ready;
+        }
+    }
+
+    public contract CPTestContract
+    {
+        out message Success();
+
+        in  message Read1();
+        in  message Read2();
+        in  message Write1(char[] in ExHeap message);
+        in  message Write2(char[] in ExHeap message);
+        in  message Write3(char[] in ExHeap message);
+        in  message Write4(char[] in ExHeap message);
+        out message AckRead1(char[] in ExHeap message);
+        out message AckRead2(char[] in ExHeap message);
+        out message AckWrite1();
+        out message AckWrite2();
+        out message AckWrite3();
+
+        state Start : one {
+            Success! -> CP1;
+        }
+
+        state CP1 : one {
+            Read1? -> AckRead1! -> Write1? -> AckWrite1! -> CP2;
+        }
+
+        state CP2 : one {
+            Write2? -> Write3? -> AckWrite2! -> CP3;
+        }
+
+        state CP3 : one {
+            Read2? -> AckRead2! -> Write4? -> AckWrite3! -> CP1;
+        }
+    }
+
+    /*
+    public sealed class PRef<T> where T : unmanaged struct, ITracked
+    {
+        unsafe T* ExHeap obj;
+        Mutex mutex;
+
+        public PRef([Claims] T* ExHeap! i_obj)
+        {
+            if (i_obj == null) {
+                throw new ArgumentNullException("PRef must be initialized" +
+                                                " with a non-null value!");
+            }
+            ep = master.Acquire();
+            ep.SendAllocate(i_obj);
+            ep.RecvAckAllocate(p_obj);
+            i_obj->Release();
+            obj = i_obj;
+            this.mutex = new Mutex();
+        }
+
+        public T* ExHeap! Acquire()
+        {
+            this.mutex.WaitOne();
+            T* ExHeap elem = this.obj;
+            if (elem == null) {
+                throw new ApplicaionException("thread already holds TRef!");
+            }
+            ep.SendAcquire(this);
+            ep.RecvAckAcquire(elem);
+            this.obj = null;
+            return elem;
+        }
+
+        public void Release([Claims] T* ExHeap! newObj)
+        {
+            if (newObj == null) {
+                throw new ArgumentNullException("TRef must be released" +
+                                                " with a non-null value!");
+            }
+            newObj->Release();
+            obj = newObj;
+            this.mutex.ReleaseMutex();
+        }
+
+        ~PRef()
+        {
+            T* ExHeap toDelete = this.obj;
+            if (toDelete != null) {
+                this.obj = null;
+                unsafe {
+                    toDelete->Dispose();
+                }
+                delete toDelete;
+            }
+        }
+    }
+    */
+}
diff --git a/base/Contracts/ServiceManager.Contracts/ThreadTerminationContract.sg b/base/Contracts/ServiceManager.Contracts/ThreadTerminationContract.sg
new file mode 100644
index 0000000..30011cf
--- /dev/null
+++ b/base/Contracts/ServiceManager.Contracts/ThreadTerminationContract.sg
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Services
+{
+    public contract ThreadTerminationContract
+    {
+        in message Stop();
+        out message AckStop();
+        
+        state Start : one {
+            Stop? -> AckStop! -> Start;
+        }
+    }
+}
diff --git a/base/Contracts/Stress.Contracts/Stress.Contracts.Kernel.csproj b/base/Contracts/Stress.Contracts/Stress.Contracts.Kernel.csproj
new file mode 100644
index 0000000..35f09fe
--- /dev/null
+++ b/base/Contracts/Stress.Contracts/Stress.Contracts.Kernel.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Stress.Contracts\Stress.Contracts.Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Stress.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="StressContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelContractsLibrary.targets" />
+</Project>
diff --git a/base/Contracts/Stress.Contracts/Stress.Contracts.csproj b/base/Contracts/Stress.Contracts/Stress.Contracts.csproj
new file mode 100644
index 0000000..ad9a9c3
--- /dev/null
+++ b/base/Contracts/Stress.Contracts/Stress.Contracts.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Contracts\Stress.Contracts\Stress.Contracts.Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Stress.Contracts</AssemblyName>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="StressContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Contracts/Stress.Contracts/StressContract.sg b/base/Contracts/Stress.Contracts/StressContract.sg
new file mode 100644
index 0000000..fce941e
--- /dev/null
+++ b/base/Contracts/Stress.Contracts/StressContract.sg
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressContract.sg
+//  Note:   Contract definition for the stress diagnostics
+//
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Stress.Contracts
+{
+    public rep struct ArgList : ITracked
+    {
+        public char[] in ExHeap arg;
+        public ArgList* in ExHeap next;
+
+        public ArgList([Claims] char[] in ExHeap arg, [Claims] ArgList* in ExHeap next)
+        {
+            this.arg = arg;
+            this.next = next;
+        }
+    }
+
+    public contract StressContract : ServiceContract
+    {
+        // The name you should use to look up this module using the NameServer.
+        public const string ModuleName = "/stress";
+
+        // Signal our identity
+        out message Ready();
+
+        // Send printable results back to client during a stress test
+        out message Print(char* opt(ExHeap[]) s);
+        in message AckPrint();
+
+        // Stress the garbage collector, send printable results
+        in message GcStress();
+        out message GcStressDone();
+
+        override state Start : one
+        {
+            Ready! -> ReadyState;
+        }
+
+        state ReadyState : one
+        {
+            // GcStress? -> (Print! -> AckPrint?)* -> GcStressDone! -> ReadyState;
+            GcStress? -> GcStressState;
+        }
+
+        state GcStressState : one
+        {
+            Print! -> AckPrint? -> GcStressState;
+            GcStressDone! -> ReadyState;
+        }
+    }
+}
diff --git a/base/Contracts/WebApps.Contracts/HttpRequestContract.sg b/base/Contracts/WebApps.Contracts/HttpRequestContract.sg
new file mode 100644
index 0000000..17dd60e
--- /dev/null
+++ b/base/Contracts/WebApps.Contracts/HttpRequestContract.sg
@@ -0,0 +1,60 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HttpRequestContract.sg
+//  Note:   Contract definition for HTTP requests processed by web apps
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.WebApps.Contracts
+{
+    public contract HttpRequestContract
+    {
+        // Information requests
+        in message GetUriPath(); // e.g., "/foo/bar.html"
+        in message GetQueryString();
+        in message GetVerb(); // e.g., "GET"
+        in message GetHeader(char[]! in ExHeap name);
+        in message GetBody();
+        in message GetRemoteAddress();
+
+        // Response-data pushes
+        in message SendStatus(int code, char[]! in ExHeap description);
+        in message SendHeader(char[]! in ExHeap name, char[]! in ExHeap value); // Can call repeatedly
+        in message SendBodyData(byte[]! in ExHeap data); // Can call repeatedly
+
+        in message Done();
+
+        // Responses
+        out message UriPath(char[]! in ExHeap vPath);
+        out message QueryString(char[] in ExHeap queryString);
+        out message Verb(char[]! in ExHeap verb);
+        out message HeaderValue(char[] in ExHeap val);
+        out message BodyData(byte[] in ExHeap body);
+        out message RemoteAddress(char[]! in ExHeap address);
+        out message OK();
+
+        state Start : one
+        {
+            GetUriPath? -> UriPath! -> Start;
+            GetQueryString? -> QueryString! -> Start;
+            GetVerb? -> Verb! -> Start;
+            GetHeader? -> HeaderValue! -> Start;
+            GetBody? -> BodyData! -> Start;
+            GetRemoteAddress? -> RemoteAddress! -> Start;
+
+            SendStatus? -> OK! -> Start;
+            SendHeader? -> OK! -> Start;
+            SendBodyData? -> OK! -> Start;
+
+            Done? -> Completed;
+        }
+
+        state Completed : {} // Nothing is permissible here
+    }
+}
diff --git a/base/Contracts/WebApps.Contracts/WebAppContract.sg b/base/Contracts/WebApps.Contracts/WebAppContract.sg
new file mode 100644
index 0000000..e4a745c
--- /dev/null
+++ b/base/Contracts/WebApps.Contracts/WebAppContract.sg
@@ -0,0 +1,30 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WebAppContract.sg
+//  Note:   Contract definition for web applications
+//
+
+using System;
+using Microsoft.Singularity.Extending;
+
+namespace Microsoft.Singularity.WebApps.Contracts
+{
+    public contract WebAppContract : ExtensionContract
+    {
+        //
+        // The WebApp contract simply lets the web app receive
+        // requests to process new HttpRequests. Each one
+        // is represented by a dedicated channel.
+        //
+        in message Process(HttpRequestContract.Imp:Start! requestEP);
+        out message WebAppReady();
+        out message OK();
+
+        override state Start : WebAppReady! -> ProcessingState;
+        state ProcessingState : Process? -> OK! -> ProcessingState;
+    }
+}
diff --git a/base/Contracts/WebApps.Contracts/WebApps.Contracts.Kernel.csproj b/base/Contracts/WebApps.Contracts/WebApps.Contracts.Kernel.csproj
new file mode 100644
index 0000000..150ec68
--- /dev/null
+++ b/base/Contracts/WebApps.Contracts/WebApps.Contracts.Kernel.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\WebApps.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>WebApps.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="WebAppContract.sg" />
+    <Compile Include="HttpRequestContract.sg" />
+    <ProjectReference Include="..\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+
+</Project>
diff --git a/base/Contracts/WebApps.Contracts/WebApps.Contracts.csproj b/base/Contracts/WebApps.Contracts/WebApps.Contracts.csproj
new file mode 100644
index 0000000..9363247
--- /dev/null
+++ b/base/Contracts/WebApps.Contracts/WebApps.Contracts.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Contracts\WebApps.Contracts\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>WebApps.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <GenerateContractMap>true</GenerateContractMap>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="WebAppContract.sg" />
+    <Compile Include="HttpRequestContract.sg" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Distro/BVT.proj b/base/Distro/BVT.proj
new file mode 100644
index 0000000..8c59274
--- /dev/null
+++ b/base/Distro/BVT.proj
@@ -0,0 +1,46 @@
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <DistroName Condition="'$(DistroName)'==''">BVT</DistroName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Apps -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\tty\tty.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Shell\Shell.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Login\Login.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Slides\Slides.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Tasklist\Tasklist.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\ProcMemInfo\ProcMemInfo.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\CredentialsControl\CredentialsControl.csproj"/>
+
+    <!-- Benchmarks -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Benchmarks\SingBench\SingBench\SingBenchApp.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Benchmarks\SingBench\BenchChild\SingBenchChild.csproj"/>
+
+    <!-- Tests -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Tests\**\*.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Play\Play.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\ptest\ptest.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\PingPongIntTest\PingPongIntTest.csproj"/>
+
+    <!-- Drivers -->
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\Disk\Disk.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\LegacyKeyboard\LegacyKeyboard.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\Network\Tulip\Tulip.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\Network\nForce4_MSIL\nForce4_MSIL.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\VolumeManager\VolumeManager.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\SB16\SB16.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\S3Trio64\S3Trio64.csproj"/>
+
+    <!-- Services -->
+    <Application Include="$(SINGULARITY_ROOT)\Services\Services.proj"/>
+
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Distro.targets"/>
+
+</Project>
diff --git a/base/Distro/Files/README.TXT b/base/Distro/Files/README.TXT
new file mode 100644
index 0000000..b215be2
--- /dev/null
+++ b/base/Distro/Files/README.TXT
@@ -0,0 +1,4 @@
+Singularity/Files Readme.TXT
+============================
+Files in this directory are copied directly from the build environment without
+any modification.
diff --git a/base/Distro/LegacyPCDistro.xml b/base/Distro/LegacyPCDistro.xml
new file mode 100644
index 0000000..21f4a7e
--- /dev/null
+++ b/base/Distro/LegacyPCDistro.xml
@@ -0,0 +1,85 @@
+<distribution name="LegacyPC">
+
+ <driverRegistryConfig>
+  <remove>
+   <driver name="S3Trio64" />
+  </remove>
+  <ordering>
+   <provides signature="/pci/06/01/10de/0050" name="NvPciLpc" />
+   <follows  signature="/pci/02/00" name="NvPciLpc" />
+   <follows  signature="/pci/01/01/10de" name="NvPciLpc" />
+  </ordering>
+ </driverRegistryConfig>
+
+ <namingConventions>
+  <name contract="Microsoft.Singularity.Io.DiskDeviceContract" nsName="/dev/disk" allowMultiple="True"  />
+  <name contract="Microsoft.Singularity.Io.Net.NicDeviceContract" nsName="/dev/nic" allowMultiple="True" />
+  <name contract="Microsoft.Singularity.Io.VolumeManagerContract" nsName="/dev/volmgr" />
+  <name contract="Microsoft.Singularity.Io.KeyboardDeviceContract" nsName="/dev/keyboard" />
+  <name contract="HalConsole" nsName="/dev/conout" />
+  <name contract="Microsoft.Singularity.Io.SoundDeviceContract" nsName="/dev/audio" />
+  <name contract="Microsoft.Singularity.Io.VideoDeviceContract" nsName="/dev/video" />
+  <name contract="Microsoft.Singularity.Io.ConsoleDeviceContract" nsName="/dev/video-text" />
+  <name contract="Microsoft.Singularity.Directory.DirectoryServiceContract" nsName="/" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.ChannelContract" nsName="/channel-diagnostics" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.MemoryContract" nsName="/memory-diagnostics" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.ProcessContract" nsName="/process-diagnostics" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.ProcMemInfoContract" nsName="/procmeminfo-diagnostics" />
+  <name contract="NetStack.Contracts.IPContract" nsName="/dev/ip" />
+  <name contract="NetStack.Contracts.UdpContract" nsName="/dev/udp" />
+  <name contract="NetStack.Contracts.TcpContract" nsName="/dev/tcp" />
+  <name contract="NetStack.Contracts.DNSContract" nsName="/dev/dns" />
+  <name contract="NetStack.Contracts.RoutingContract" nsName="/dev/routing" />
+ </namingConventions>
+
+ <initConfig>
+   <groups>
+     <group path="/groups/path" description="!(.!)*" />
+     <group path="/groups/userrole" description="login@!" />
+     <group path="/groups/anyperm" description="@!" />
+     <group path="/groups/app" description="{path}|{userrole}" />
+     <group path="/groups/anyall" description="{app}(+{app})*{anyperm}" />
+   </groups>
+   <authpolicy>
+     <subexpr name="$user" expansion="{$trusted-auth-privilege}@!" />
+     <subexpr name="$app" expansion="!|{$user}" />
+     <subexpr name="$any" expansion="{$app}(+!)*" />
+     <subexpr name="$anyuser" expansion="{$user}(+!)*" />
+     <subexpr name="$anyuserall" expansion="{$anyuser}@!" />
+     <subexpr name="$dsregister" expansion="(({$any}+)*{$register-privilege})@register" />
+     <subexpr name="$dsanyrw" expansion="{$any}@(read|write|notify)" />
+     <subexpr name="$dsanyacl" expansion="{$any}@(setacl)" />
+     <subexpr name="$anyall" expansion="{$any}@!" />
+     <authority name="$truncate-history-privilege" acl="singularity.microsoft.com" />
+     <authority name="$trusted-auth-privilege" acl="singularity.microsoft.com" />
+     <authority name="$register-privilege" acl="singularity.microsoft.com" />
+     <authority name="$test-privilege" acl="singularity.microsoft.com" />
+   </authpolicy>
+   <acls>
+     <acl path="/" this="{$dsanyrw}|{$dsregister}" />
+     <acl path="/acltest" this="{$dsanyrw}" inherited="{$dsanyrw}|{$dsanysetacl}"/>
+   </acls>
+ </initConfig>
+
+ <processConfig>
+    <policy separateAddressSpace="True" />
+    <processSet name="Orphangroup" kernelDomain="false" set="benchchild" />
+ </processConfig>
+
+ <serviceConfig>
+   <service name="FatClientManager" binary="FatClientManager" mode="unmanaged"/>
+   <service name="iso9660" binary="iso9660" mode="unmanaged" />
+   <service name="netstack" binary="netstack" mode="unmanaged" />
+   <service name="SmbClientManager" binary="SmbClientManager" mode="unmanaged" />
+   <service name="CredentialsManager" binary="CredentialsManager" mode="unmanaged" />
+ </serviceConfig>
+
+ <bootScript>
+  <folders>
+   <folder name="Singularity\Binaries" />
+   <folder name="Singularity\Files" />
+   <folder name="Singularity\Scripts" />
+  </folders>
+ </bootScript>
+
+</distribution>
diff --git a/base/Distro/SPECweb99.proj b/base/Distro/SPECweb99.proj
new file mode 100644
index 0000000..be534b7
--- /dev/null
+++ b/base/Distro/SPECweb99.proj
@@ -0,0 +1,57 @@
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <DistroName Condition="'$(DistroName)'==''">SPECweb99</DistroName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Apps -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\tty\tty.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Shell\Shell.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Login\Login.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Slides\Slides.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Tasklist\Tasklist.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\ProcMemInfo\ProcMemInfo.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\CredentialsControl\CredentialsControl.csproj"/>
+
+    <!-- SpecWeb99 specific -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Cassini\Cassini.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Cadgen99\Cadgen99.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Network\**\*.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Upfgen99\Upfgen99.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Utilities\**\*.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Wafgen99\Wafgen99.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\WebApps\**\*.csproj"/>
+
+    <!-- Benchmarks -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Benchmarks\SingBench\SingBench\SingBenchApp.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Benchmarks\SingBench\BenchChild\SingBenchChild.csproj"/>
+
+    <!-- Tests -->
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Tests\**\*.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Play\Play.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\ptest\ptest.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\PingPongIntTest\PingPongIntTest.csproj"/>
+
+    <!-- Drivers -->
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\**\*.csproj"
+                 Exclude="$(SINGULARITY_ROOT)\Drivers\**\Network\nForce4\*.csproj"/>
+
+    <!-- Services -->
+    <Application Include="$(SINGULARITY_ROOT)\Services\CredentialsManager\CredentialsManagerService.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Fat\Control\FatControl.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Fat\ClientManager\FatClientManager.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Iso9660\Iso9660.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\NetStack\NetStackService.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\ServiceManager\ServiceManager.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Smb\Client\SmbClient.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Smb\ClientService\SmbClientService.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Smb\Control\Smb.Control.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Distro.targets"/>
+
+</Project>
diff --git a/base/Distro/Scripts/bb.script b/base/Distro/Scripts/bb.script
new file mode 100644
index 0000000..5aebf67
--- /dev/null
+++ b/base/Distro/Scripts/bb.script
@@ -0,0 +1,70 @@
+#
+# A script for automated asplos protection domain benchmark.
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+
+#mkfs '/dev/vol0.2'
+#if (!($? == 0)) {
+#   echo 'bb: mkfs /dev/vol0.2 failed.'
+#   decho 'bb: mkfs /dev/vol0.2 failed.'
+#   exit
+#}
+#
+#fsmount '/dev/vol0.2' '/fs'
+#if (!($? == 0)) {
+#   echo 'bb: fsmount /dev/vol0.2 failed.'
+#   decho 'bb: fsmount /dev/vol0.2 failed.'
+#   exit
+#}
+
+testpe '!+'
+tasklist '-d'
+
+i = 0
+while ($i < 10) {
+    clear
+    echo 'bb: bartok-'$i
+    decho 'bb: bartok-'$i
+    perfcnt '-k'
+    if (!($? == 0)) {
+       echo 'bb: perfcnt -k failed.'
+       decho 'bb: perfcnt -k failed.'
+       exit
+    }
+
+    bartok '/Singularity' '/verbosity:silence' '/LinkedStacksRequireExternalBound=true' '/LinkedStacksDumpBounds=true' '/BackEndComments=true' '/GCInlineAllocations=false' '/GCInlineWriteBarrier=false' '/LinkedStacks=true' '/UseSegmentRegister=true' '/OmitFramePointer=false' '/SymbolicDebug=true' '/DebugInline=true' '/UnnameTracedPtrs=true' '/Warnings=true' '/WholeProgram=true' '/GenCoffLineNumber=false' '/MarkSweepGC' '/minopt' '/IrSimpleInliner=false' '/DumpMethodSizes=false' '/LinkedStacksTrace=false' '/LinkedStacksDumpBounds=false' '/LinkedStacksDumpEntryPointBounds=false' '/out:' '\blackhole\kernel.obj' '/outdir:' '\blackhole' '/lib:' '\init' '\init\kernel.exe' '\init\Diagnostics.Contracts.dll' '\init\Diagnostics.dll' '\init\Directory.Contracts.dll' '\init\Directory.dll' '\init\Drivers.dll' '\init\FileSystem.Contracts.dll' '\init\Hal.LegacyPC.dll' '\init\ILHelpers.dll' '\init\Io.Contracts.dll' '\init\IoSystem.dll' '\init\Loader.dll' '\init\Microsoft.SingSharp.Runtime.dll' '\init\Security.Contracts.dll' '\init\SecurityService.dll' '\init\Security.dll' '\init\Stress.Contracts.dll' '\init\Stress.dll' '\init\System.Compiler.Runtime.dll'
+    if (!($? == 0)) {
+       echo 'bb: bartok failed.'
+       decho 'bb: bartok failed.'
+       exit
+    }
+
+    perfcnt '-s'
+    tasklist '-d'
+    if (!($? == 0)) {
+       echo 'bb: perfcnt failed.'
+       decho 'bb: perfcnt failed.'
+       exit
+    }
+#    delete '/fs/kernel.obj'
+#    delete '/fs/kernel_info.obj'
+#    delete '/fs/kernel_superobj.obj'
+    i = $i + 1
+}
+
+testpe '!-'
+
+echo 'bb: finished with bartok'
+decho 'bb: finished with bartok'
+
+shutdown
+
+# Magic exit code to shut machine down,
+# taken from Kernel\Singularity\BootInfo.cs:
+#
+# 0x1fff (8191) = EXIT_AND_RESTART
+# 0x1ffe (8190) = EXIT_AND_SHUTDOWN
+# 0x1ffd (8189) = EXIT_AND_WARMBOOT
+# 0x1ffc (8188) = EXIT_AND_HALT
+exit 8188
diff --git a/base/Distro/Scripts/bench.script b/base/Distro/Scripts/bench.script
new file mode 100644
index 0000000..0467e97
--- /dev/null
+++ b/base/Distro/Scripts/bench.script
@@ -0,0 +1,15 @@
+# This script is used by the daily performance tester to
+# generate measurements.  The performance tester reads the
+# output from the debugger.  Feel free to add additional tests
+# to this file, but make sure they report their output in the
+# same XML output as singbench does when invoked with -x and
+# write their output to the debugger as well as the screen.
+
+i = 0
+while ($i < 20) {
+    singbench '-x'
+    i = $i + 1
+}
+
+shutdown
+
diff --git a/base/Distro/Scripts/bvt.0.script b/base/Distro/Scripts/bvt.0.script
new file mode 100644
index 0000000..dc23f5b
--- /dev/null
+++ b/base/Distro/Scripts/bvt.0.script
@@ -0,0 +1,96 @@
+msg = '[BVT 0.0] Running page table test.'
+echo $msg
+decho $msg
+dumppages
+
+msg = '[BVT 0.1] Running Pnp test.'
+echo $msg
+decho $msg
+if (false) {
+    pnp
+    pnp
+    pnp
+}
+dumppages
+
+msg = '[BVT 0.2] Running channel test.'
+echo $msg
+decho $msg
+channeldemo
+channeldemo
+channeldemo
+dumppages
+
+msg = '[BVT 0.3] Running ram disk contents test.'
+echo $msg
+decho $msg
+if (false) {
+    disk
+    disk
+    disk
+}
+dumppages
+
+msg = '[BVT 0.4] Running sound driver test.'
+echo $msg
+decho $msg
+play
+play
+play
+dumppages
+
+msg = '[BVT 0.5] Running select test.'
+echo $msg
+decho $msg
+select
+select
+select
+dumppages
+
+msg = '[BVT 0.6] Running thread test.'
+echo $msg
+decho $msg
+threadtest
+threadtest
+threadtest
+dumppages
+
+msg = '[BVT 0.7] Running mptxofy test.'
+echo $msg
+decho $msg
+if (false) {
+    mptxofy
+}
+
+msg = '[BVT 0.8] Running tasklist.'
+echo $msg
+decho $msg
+tasklist
+dumppages
+
+msg = '[BVT 0.9] Running exception test.'
+echo $msg
+decho $msg
+throw
+throwwithlinkstack
+
+msg = '[BVT .10] Running suspend/stop test.'
+echo $msg
+decho $msg
+arg1 = '(& p2 (* 9999999 print 2 delay 2 ) wall )'
+arg2 = ' (* 5 print 1 delay 2 ) suspend p2'
+arg3 = ' (* 5 print 1 delay 2 ) resume p2'
+arg4 = ' (* 5 print 1 delay 2 ) stop p2'
+arg5 = ' (* 5 print 1 delay 2 )'
+arg = $arg1 . $arg2 . $arg3 . $arg4 . $arg5
+kptest $arg
+
+msg = '[BVT 0.11] Running singbench test.'
+echo $msg
+decho $msg
+singbench
+
+msg = '[BVT 0.12] Running warmboot test.'
+echo $msg
+decho $msg
+warmboot
diff --git a/base/Distro/Scripts/bvt.1.script b/base/Distro/Scripts/bvt.1.script
new file mode 100644
index 0000000..f601c9a
--- /dev/null
+++ b/base/Distro/Scripts/bvt.1.script
@@ -0,0 +1,29 @@
+msg = '[BVT 1.0] Running page table test.'
+echo $msg
+decho $msg
+dumppages
+
+msg = '[BVT 1.1] Running ram disk contents test.'
+echo $msg
+decho $msg
+if (false) {
+    disk
+}
+dumppages
+
+msg = '[BVT 1.2] Running sound driver test.'
+echo $msg
+decho $msg
+play
+dumppages
+
+msg = '[BVT 0.8] Running tasklist.'
+echo $msg
+decho $msg
+tasklist
+dumppages
+
+msg = '[BVT 1.3] Running warmboot test.'
+echo $msg
+decho $msg
+warmboot
diff --git a/base/Distro/Scripts/bvt.2.script b/base/Distro/Scripts/bvt.2.script
new file mode 100644
index 0000000..b5f5884
--- /dev/null
+++ b/base/Distro/Scripts/bvt.2.script
@@ -0,0 +1,9 @@
+msg = '[BVT 2.0] Running page table test.'
+echo $msg
+decho $msg
+dumppages
+
+msg = '[BVT 2.1] Running shutdown test.'
+echo $msg
+decho $msg
+shutdown
diff --git a/base/Distro/Scripts/iobench.script b/base/Distro/Scripts/iobench.script
new file mode 100644
index 0000000..fca1284
--- /dev/null
+++ b/base/Distro/Scripts/iobench.script
@@ -0,0 +1,14 @@
+#
+# A script for automated disk benchmark.
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+
+diskrw '/b:512' '/n:16384' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:1024' '/n:16384' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:2048' '/n:16384' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:4096' '/n:16384' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:8192' '/n:8192' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:16384' '/n:8192' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:32768' '/n:8192' '/g:5' '/r' '/dev/vol0.0'
+diskrw '/b:65536' '/n:8192' '/g:5' '/r' '/dev/vol0.0'
diff --git a/base/Distro/Scripts/specweb99.script b/base/Distro/Scripts/specweb99.script
new file mode 100644
index 0000000..e9ffd24
--- /dev/null
+++ b/base/Distro/Scripts/specweb99.script
@@ -0,0 +1,50 @@
+#
+# A script for automated specweb99 testing.
+#
+# Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+
+#
+# Wait just to be sure netstack has spun up.  This script is most likely
+# run from boot.
+sleep 5
+
+mkfs '/dev/vol0.1'
+if (!($? == 0)) {
+   decho 'mkfs failed.'
+   exit
+}
+
+fsmount '/dev/vol0.1' '/fs'
+if (!($? == 0)) {
+   decho 'fsmount failed.'
+   exit
+}
+
+wafgen99 70 '/fs'
+if (!($? == 0)) {
+   decho 'wafgen99 failed.'
+   exit
+}
+
+# Note quotes around non-alphanumeric /dev/nic0
+# Script engine expects alphanumerics or quoted values for external
+# commands.
+ipconfig '/dev/nic0' dhcp start
+decho 'ipconfig returned ' $?
+
+# Start cassini in foreground.  It should
+# block until it receives a quit URL.
+cassini '-quitURL' '-app:SPECWeb99WebApp'
+decho 'cassini returned ' $?
+
+ipconfig '/dev/nic0' dhcp stop
+
+# Magic exit code to shut machine down,
+# taken from Kernel\Singularity\BootInfo.cs:
+#
+# 0x1fff (8191) = EXIT_AND_RESTART
+# 0x1ffe (8190) = EXIT_AND_SHUTDOWN
+# 0x1ffd (8189) = EXIT_AND_WARMBOOT
+# 0x1ffc (8188) = EXIT_AND_HALT
+exit 8188
diff --git a/base/Distro/Scripts/startup.script b/base/Distro/Scripts/startup.script
new file mode 100644
index 0000000..e33d70b
--- /dev/null
+++ b/base/Distro/Scripts/startup.script
@@ -0,0 +1,11 @@
+# This script gets run whenever Shell starts.
+# For now, this is a crude approximation of a startup environment.
+# In the short-term, this is mostly useful for automating testing a sequence of commands.
+# Such as:
+
+# ipconfig '/dev/nic0' '192.168.0.80' '255.255.255.0' '192.168.0.1'
+# ipconfig '@dhcp' '/dev/nic0' 'start'
+# cred '@add' '.\test' 'some-password-here'
+# net '@mount' '/distro' '\\192.168.0.12\distro'
+
+echo 'Welcome to Singularity'
diff --git a/base/Distro/Scripts/xbench.script b/base/Distro/Scripts/xbench.script
new file mode 100644
index 0000000..ccd8471
--- /dev/null
+++ b/base/Distro/Scripts/xbench.script
@@ -0,0 +1,65 @@
+#
+# A script for automated asplos protection domain benchmark.
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+
+i = 0
+while ($i < 10) {
+    clear
+    echo 'xb: singbench-'$i
+    decho 'xb: singbench-'$i
+    perfcnt '-g'
+    singbench
+    i = $i + 1
+}
+
+clear
+echo 'xb: createprocess-1'
+decho 'xb: createprocess-1'
+perfcnt '-g'
+createprocess '-q' '-r:9'
+
+i = 0
+while ($i < 10) {
+    clear
+    echo 'xb: bartok-'$i
+    decho 'xb: bartok-'$i
+    perfcnt '-g'
+    bartok '/Singularity' '/verbosity:PerPhase' '/LinkedStacksRequireExternalBound=true' '/LinkedStacksDumpBounds=true' '/BackEndComments=true' '/GCInlineAllocations=false' '/GCInlineWriteBarrier=false' '/LinkedStacks=true' '/UseSegmentRegister=true' '/OmitFramePointer=false' '/SymbolicDebug=true' '/DebugInline=true' '/UnnameTracedPtrs=true' '/Warnings=true' '/WholeProgram=true' '/GenCoffLineNumber=false' '/MarkSweepGC' '/minopt' '/IrSimpleInliner=false' '/DumpMethodSizes=false' '/LinkedStacksTrace=false' '/LinkedStacksDumpBounds=false' '/LinkedStacksDumpEntryPointBounds=false' '/out:' '\init\kernel.obj' '/outdir:' '\init' '\init\kernel.exe' '\init\Diagnostics.dll' '\init\Loader.dll' '\init\Directory.dll' '\init\Stress.dll' '\init\IoSystem.dll' '\init\Hal.LegacyPC.dll' '\init\System.Compiler.Runtime.dll' '\init\ILHelpers.dll' '\init\Microsoft.SingSharp.Runtime.dll' '\init\Diagnostics.Contracts.dll' '\init\Directory.Contracts.dll' '\init\FileSystem.Contracts.dll' '\init\Io.Contracts.dll' '\init\Stress.Contracts.dll' '\init\drivers.dll' '\init\Security.Contracts.dll' '\init\Security.dll' '\init\Security.Service.dll'
+    perfcnt
+    i = $i + 1
+}
+
+echo 'xb: finished with bartok'
+decho 'xb: finished with bartok'
+
+clear
+echo 'Mounting /dev/vol0.2'
+fsmount '/dev/vol0.2' '/fs'
+
+i = 0
+while ($i < 10) {
+    clear
+    echo 'xb: webfiles-'$i
+    decho 'xb: webfiles-'$i
+    perfcnt '-g'
+    webfiles '-f:50000'
+    perfcnt
+    i = $i + 1
+}
+
+clear
+echo 'xb: finished with webfiles'
+decho 'xb: finished with webfiles'
+
+shutdown
+
+# Magic exit code to shut machine down,
+# taken from Kernel\Singularity\BootInfo.cs:
+#
+# 0x1fff (8191) = EXIT_AND_RESTART
+# 0x1ffe (8190) = EXIT_AND_SHUTDOWN
+# 0x1ffd (8189) = EXIT_AND_WARMBOOT
+# 0x1ffc (8188) = EXIT_AND_HALT
+exit 8188
diff --git a/base/Distro/SlideDistro.xml b/base/Distro/SlideDistro.xml
new file mode 100644
index 0000000..147e798
--- /dev/null
+++ b/base/Distro/SlideDistro.xml
@@ -0,0 +1,71 @@
+<distribution name="LegacyPC">
+
+ <driverRegistryConfig>
+  <include>
+   <driver identity="internal" />
+   <driver identity="Hal" />
+   <driver identity="VolMgr" />
+   <device signature="/pnp/PNP0A03" />
+   <device signature="/pnp/PNPB003" />
+   <device signature="/pnp/PNP0303" />
+   <device signature="/pci/02/00/1011/0009" />
+   <device signature="/pci/03/00/5333/8811" />
+   <device signature="/pci/01/01/8086/7111" />
+   <device signature="/pci/06/01/10de/0050" />
+   <device signature="/ide/controller" />
+   <driver identity="" />
+   <driver identity="S3Trio64" />
+  </include>
+  <ordering>
+   <provides signature="/pci/06/01/10de/0050" name="NvPciLpc" />
+   <follows  signature="/pci/02/00" name="NvPciLpc" />
+   <follows  signature="/pci/01/01/10de" name="NvPciLpc" />
+  </ordering>
+ </driverRegistryConfig>
+
+ <namingConventions>
+  <name contract="Microsoft.Singularity.Io.DiskDeviceContract" nsName="/dev/disk" allowMultiple="True" limit="3" />
+  <name contract="Microsoft.Singularity.Io.Net.NicDeviceContract" nsName="/dev/nic" allowMultiple="True" />
+  <name contract="Microsoft.Singularity.Io.VolumeManagerContract" nsName="/dev/volmgr" />
+  <name contract="Microsoft.Singularity.Io.KeyboardDeviceContract" nsName="/dev/keyboard" />
+  <name contract="HalConsole" nsName="/dev/conout" />
+  <name contract="Microsoft.Singularity.Io.SoundDeviceContract" nsName="/dev/audio" />
+  <name contract="Microsoft.Singularity.Io.VideoDeviceContract" nsName="/dev/video" />
+  <name contract="Microsoft.Singularity.Io.ConsoleDeviceContract" nsName="/dev/video-text" />
+  <name contract="Microsoft.Singularity.Directory.DirectoryServiceContract" nsName="/" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.ChannelContract" nsName="/channel-diagnostics" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.MemoryContract" nsName="/memory-diagnostics" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.ProcessContract" nsName="/process-diagnostics" />
+  <name contract="Microsoft.Singularity.Diagnostics.Contracts.ProcMemInfoContract" nsName="/procmeminfo-diagnostics" />
+ </namingConventions>
+
+ <initConfig>
+   <groups>
+     <group path="/groups/path" description="/.(/.)*" />
+     <group path="/groups/role" description="(@{path})*" />
+     <group path="/groups/app" description="{path}{role}" />
+     <group path="/groups/any" description="{app}(+{app})*" />
+     <group path="/groups/installer" description="/kernel+/init/installer" />
+     <group path="/groups/aydan/test/one" description="{/groups/path}" />
+     <group path="/groups/aydan/test/two" description="{one}{/groups/role}" />
+   </groups>
+   <rules>
+     <rule resource="/*" permission="*" acl="{/groups/any}" />
+   </rules>
+   <acls>
+     <acl resource="/restricted" permission="list" acl="{/groups/installer}" />
+     <acl resource="/init/testapp" permission="*" acl="{groups/any}|%owner%" />
+   </acls>
+ </initConfig>
+
+ <bootScript>
+  <folders>
+   <folder name="Singularity\Applications" />
+   <folder name="Singularity\Drivers" />
+   <folder name="Singularity\Kernel" />
+   <folder name="Singularity\Files" />
+   <folder name="Singularity\Services" />
+  </folders>
+ </bootScript>
+
+</distribution>
diff --git a/base/Distro/Small.proj b/base/Distro/Small.proj
new file mode 100644
index 0000000..249d069
--- /dev/null
+++ b/base/Distro/Small.proj
@@ -0,0 +1,29 @@
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <DistroName>Small</DistroName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Shell\Shell.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\tty\tty.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Network\IPConfig\IPConfig.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\ServiceManager\SMSClient\SMSClient.csproj"/>
+
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\Disk\Disk.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\Network\Tulip\Tulip.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\Network\nForce4_MSIL\nForce4_MSIL.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\VolumeManager\VolumeManager.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\LegacyKeyboard\LegacyKeyboard.csproj"/>    
+    
+    <Application Include="$(SINGULARITY_ROOT)\Services\NetStack\NetStackService.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Iso9660\Iso9660.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\ServiceManager\ServiceManager.csproj"/>
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Distro.targets"/>
+
+</Project>
diff --git a/base/Distro/Tiny.proj b/base/Distro/Tiny.proj
new file mode 100644
index 0000000..75542db
--- /dev/null
+++ b/base/Distro/Tiny.proj
@@ -0,0 +1,20 @@
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <DistroName>Tiny</DistroName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\Shell\Shell.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\tty\tty.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\VolumeManager\VolumeManager.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\LegacyKeyboard\LegacyKeyboard.csproj"/>    
+    <Application Include="$(SINGULARITY_ROOT)\Services\ServiceManager\ServiceManager.csproj"/>
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Distro.targets"/>
+
+</Project>
diff --git a/base/Distro/World.proj b/base/Distro/World.proj
new file mode 100644
index 0000000..9422775
--- /dev/null
+++ b/base/Distro/World.proj
@@ -0,0 +1,21 @@
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <DistroName>World</DistroName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Application Include="$(SINGULARITY_ROOT)\Applications\**\*.csproj"
+                 Exclude="$(SINGULARITY_ROOT)\Applications\**\Namespace\AtomicTestDSP\AtomicTestDSP.csproj;$(SINGULARITY_ROOT)\Applications\**\CHello2\CHello2.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Drivers\**\*.csproj"
+                 Exclude="$(SINGULARITY_ROOT)\Drivers\**\Network\nForce4\*.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Libraries\**\*.csproj"/>
+    <Application Include="$(SINGULARITY_ROOT)\Services\Services.proj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Distro.targets"/>
+
+</Project>
diff --git a/base/Drivers/Disk/BusMasterDma.cs b/base/Drivers/Disk/BusMasterDma.cs
new file mode 100644
index 0000000..db95623
--- /dev/null
+++ b/base/Drivers/Disk/BusMasterDma.cs
@@ -0,0 +1,362 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BusMasterDma.cs
+//
+// See "Programming Interface for Bus Master IDE Controller"
+// or  www.t13.org  1510D Draft "ATA/ATAPI Host Adapters Standard(ATA - Adapter)"
+
+/*
+    1. Software prepares a PRD Table in host memory.
+    2. Software provides the starting address of the PRD Table by loading the PRD Table
+            Pointer Register.
+        Setting of the Read/Write Control bit specifies the direction of the data transfer.
+        Clearing the Interrupt and Error bits in the ATA Bus Master Status register
+            to zero readies the adapter for a data transfer.
+    3. Software issues the appropriate DMA transfer command to the device.
+    4. Software initiates the bus master function by writing a one to the Start bit
+        in the ATA Bus Master Command Register for the appropriate channel.
+    5. The adapter transfers data to/from host memory responding to DMA requests from the ATA device.`
+*/
+
+//#define DEBUG_BUS_MASTER_DMA
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Runtime.CompilerServices;  //StructAlign attribute
+using System.Runtime.InteropServices;   //structLayout attribute
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Drivers.IDE;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Drivers.IDE
+{
+    [CLSCompliant(false)]
+    public class BusMasterDma
+    {
+        enum BmState
+        {
+            BmIdle = 0,
+            BmPrepared ,
+            BmArmed,
+            BmDisarmed,
+        }
+
+        public const int PRD_BYTES_PER_ENTRY = 8;
+        public const int PRD_ALIGNMENT       = 4096;
+        public const int PRD_MAX_ENTRIES     = 4096 / PRD_BYTES_PER_ENTRY;
+
+        // BusMaster Status Bits
+        private const byte BUSMASTER_STATUS_MASK_DEVICE1_DMA_OK     =   0x40;
+        private const byte BUSMASTER_STATUS_MASK_DEVICE0_DMA_OK     =   0x20;
+        private const byte BUSMASTER_STATUS_MASK_INTERRUPT          =   0x04;
+        private const byte BUSMASTER_STATUS_MASK_ERROR              =   0x02;
+        private const byte BUSMASTER_STATUS_MASK_ACTIVE             =   0x01;
+
+        //BusMaster Control bits
+        private const byte BUSMASTER_CONTROL_MASK_WRITE             = 0x08;
+        private const byte BUSMASTER_CONTROL_MASK_START             = 0x01;
+        private const byte BUSMASTER_CONTROL_MASK_STOP              = 0x00;
+
+        private IoPort commandPort;
+        private IoPort statusPort;
+        private IoPort prdPort;
+        private IoMemory prdRegion;
+
+        private IdeConfig ideConfigHandle;
+        private bool runningVPC;
+
+        private BmState busMasterState;   // the state we think the BusMaster it is in
+
+        const byte PrdTableTerminate = 0x80;
+
+        public  BusMasterDma(IdeConfig! ideConfig)
+        {
+            ideConfigHandle = ideConfig;
+
+            // Set up BusMaster ports for this controller
+            // <command, status, PRD table>
+            commandPort = ideConfig.DmaBase.PortAtOffset(0, 1, Access.ReadWrite);
+            statusPort  = ideConfig.DmaBase.PortAtOffset(2, 1, Access.ReadWrite);
+            prdPort     = ideConfig.DmaBase.PortAtOffset(4, 4, Access.ReadWrite);
+            // PRD needs to be 4-byte aligned and within one 4k page.
+            prdRegion   =
+                IoMemory.AllocatePhysical(PRD_MAX_ENTRIES * PRD_BYTES_PER_ENTRY,
+                                          PRD_ALIGNMENT);
+        } // BusMasterInitialize
+
+        public void Uninitialize ()
+        {
+            commandPort = null; //???
+        }
+
+        public void Setup ()
+        {
+        }
+
+        public void BmPrepareController (IdeRequest! ideRequest)
+        {
+            // Perform steps 1 and 2 above: set up PRD, clear
+            // error snd interrupt
+
+            // Init. Scatter Gather List Register
+            uint thePrd = FillPrdTable(ideRequest);
+            prdPort.Write32(thePrd);
+
+            // Clear Errors
+            byte status = (byte) (BUSMASTER_STATUS_MASK_INTERRUPT | BUSMASTER_STATUS_MASK_ERROR);
+            statusPort.Write8(status);
+
+            return;
+        } // BmPrepareController
+
+        public void SetVirtualized()
+        {
+            runningVPC = true;
+            return;
+        }
+
+        public int Arm (IdeRequest! ideRequest)
+        {
+            byte value = BUSMASTER_CONTROL_MASK_START;
+
+            if (ideRequest.Command == IdeCmdType.Read) {
+                value |=  BUSMASTER_CONTROL_MASK_WRITE;
+            }
+            commandPort.Write8(value);  // enable BM
+            return 0;
+        } // BmArm
+
+        public byte GetStatus()
+        {
+            byte status = statusPort.Read8();
+            return status;
+        }
+
+        public bool InterruptHigh()
+        {
+            //probe the status register to see if we have been interrupted
+            byte status = statusPort.Read8();
+            if ( (status & (byte) BUSMASTER_STATUS_MASK_INTERRUPT) == 0 ) {
+                return false;
+            }
+            return true;
+
+        }
+        public void Disarm ()
+        {
+            //According to the "Programming Interface for Bus Master IDE Controller"
+            // 1) reset the Start/Stop bit in command register
+            // 2) read controller status
+            // 3) read drive status
+            //  to determine if the xfer completed successfully.
+
+            commandPort.Write8(BUSMASTER_CONTROL_MASK_STOP);  // disable BM
+            //Tracing.Log(Tracing.Debug," stop: fullstatus ={0:x}\n",(UIntPtr)ideConfigHandle.IdeController.ReadFullStatus());
+            byte status = GetStatus();
+            if ( (status & (byte)BUSMASTER_STATUS_MASK_INTERRUPT) == 0  ) {
+                Tracing.Log(Tracing.Debug,"BusMaster.Disarm: interrupt line not set {0}!\n",(UIntPtr) status);
+                DebugStub.Break();
+            }
+
+            if ( (status & (byte)BUSMASTER_STATUS_MASK_ERROR) > 0  ) {
+                Tracing.Log(Tracing.Debug,"BusMaster.Disarm: error!!!!\n",(UIntPtr) status);
+                DebugStub.Break();
+            }
+
+            status = (byte) (BUSMASTER_STATUS_MASK_INTERRUPT | BUSMASTER_STATUS_MASK_ERROR);
+            statusPort.Write8( status);  // clear interrupt BM
+
+            //Tracing.Log(Tracing.Debug,"cntlr status   ={0:x}\n",(UIntPtr)ideConfigHandle.IdeController.ReadFullStatus());
+            //Tracing.Log(Tracing.Debug,"bm status : {0:x}",(UIntPtr) statusPort.Read8());
+        } // BmDisarm
+
+        [ System.Diagnostics.Conditional("DEBUG_BUS_MASTER_DMA") ]
+        public void DumpPrd()
+        {
+            for (int i=0; i < PRD_MAX_ENTRIES; i++) {
+                uint address;
+                uint length;
+                bool eot;
+
+                ReadPrdEntry(i, out address, out length, out eot);
+                Tracing.Log(Tracing.Debug,
+                            "prd[{0}]: {1:x8} {2:x4}\n",
+                            (UIntPtr) i,
+                            (UIntPtr) address,
+                            (UIntPtr) length);
+                if (eot) {
+                    Tracing.Log(Tracing.Debug, "prd[{0}]: EOT\n", (UIntPtr) i);
+                    break;
+                }
+            }
+        }
+
+        private uint FillPrdTable(IdeRequest! ideRequest)
+        {
+            // given a memory address and a length generate
+            // a Physical Region Descriptor Table (PDRT) to be used
+            // in a IDE busmaster DMA transfer
+
+            //a PRDT table is an array of PRD entries, each 8 bytes in
+            //length. There is no count associated with this structure
+            // Bit 7 of the last byte of the last entry signifies the
+            //end of the table
+
+            // PRD (Physical Region Descriptor)
+            // the first 4 bytes of a PRD specify the memory address
+            // Bytes 5 and 6 (16 bits) specify the length.
+            // At most a PRD can specify a transfer of 64KB.
+            // The memory specified by a PRD cannot cross a 64KB boundary
+            // Any transfer that would cross such a boundary needs to be
+            // split into to separate PRDs
+
+            uint addr = (uint)((UIntPtr)ideRequest.BufferAddress + ideRequest.BufferOffset);
+            uint len  = (uint)ideRequest.Length;
+
+            // Write a bad entry at the end
+            WritePrdEntry(PRD_MAX_ENTRIES - 1, 0, 0xbad1, true);
+
+            uint baseAddr = addr;
+            uint bytesToMap = len;
+            int i = 0;
+            while (0 != bytesToMap) {
+                uint did = WritePrdChunk(i, baseAddr, bytesToMap);
+                baseAddr   += did;
+                bytesToMap -= did;
+                i++;
+            }
+
+            // DEBUG CHECK
+            uint computedLen = 0 ;
+            bool eotFound   = false;
+            for (i = 0; i < PRD_MAX_ENTRIES; i++) {
+                uint dummy;
+                uint length;
+                bool eot;
+                ReadPrdEntry(i, out dummy, out length, out eot);
+                computedLen = computedLen + length;
+                if (eot) {
+                    eotFound = true;
+                    break;
+                }
+            }
+
+            if (computedLen != len || !eotFound) {
+                throw new ApplicationException("PRD length mismatch");
+            }
+            DumpPrd();
+
+            return (uint) prdRegion.PhysicalAddress.Value;
+        }
+
+        private UIntPtr Get64KLimit(UIntPtr a)
+        {
+            const uint count = 0x10000;
+            return (a.ToUInt32() + count) & ~(count - 1u);
+        }
+
+        // Write a descriptor for up to 64K of user data.  Write stops on
+        // 64K boundaries or discontinuity in physical memory.
+        //
+        // Returns the number of bytes written into PRD.
+        private uint WritePrdChunk(int     prdIndex,
+                                   UIntPtr baseVA,
+                                   uint    baseVALength)
+        {
+            UIntPtr basePA;
+            UIntPtr bytesOnPage;
+
+            if (!DeviceService.GetDmaPhysicalAddress(baseVA,
+                                                     out basePA,
+                                                     out bytesOnPage)) {
+                throw new ApplicationException(
+                    "Bad physical address translation"
+                    );
+            }
+
+            UIntPtr basePALimit = Get64KLimit(basePA);
+            if (basePALimit > basePA + baseVALength) {
+                basePALimit = basePA + baseVALength;
+            }
+
+            UIntPtr expectedPA = basePA + bytesOnPage;
+            baseVA += bytesOnPage;
+            while (expectedPA < basePALimit) {
+                UIntPtr currentPA;
+                if (!DeviceService.GetDmaPhysicalAddress(baseVA,
+                                                         out currentPA,
+                                                         out bytesOnPage)) {
+                    throw new ApplicationException(
+                        "Bad physical address translation"
+                        );
+                }
+                if (currentPA != expectedPA) {
+                    // Physical page discontinuity
+                    break;
+                }
+                expectedPA = currentPA + bytesOnPage;
+                baseVA     = baseVA + bytesOnPage;
+            }
+
+            if (expectedPA < basePALimit) {
+                basePALimit = expectedPA;
+            }
+
+            uint done = (basePALimit - basePA).ToUInt32();
+
+            WritePrdEntry(prdIndex,
+                          basePA.ToUInt32(),
+                          (ushort) (done & 0xffff),
+                          done == baseVALength);
+
+            return done;
+        }
+
+        private void
+        WritePrdEntry(int  index,
+                      uint addr,
+                      uint length,
+                      bool endOfTable)
+            requires length != 0 && length <= 0x10000;
+        {
+            // PRD structure in octets:
+            // - 0:3 baseAddress
+            // - 4:5 length
+            // - 6:6 reserved
+            // - 7:7 end of table
+            int baseOffset = index * PRD_BYTES_PER_ENTRY;
+            this.prdRegion.Write32(baseOffset,
+                                   ByteOrder.HostToLittleEndian(addr));
+            ushort slen = (ushort)(length & 0xffffu); // 0 == 64K
+            this.prdRegion.Write16(baseOffset + 4,
+                                   ByteOrder.HostToLittleEndian(slen));
+            this.prdRegion.Write8(baseOffset + 7,
+                                  endOfTable ? PrdTableTerminate : (byte)0);
+        }
+
+        private void
+        ReadPrdEntry(int      index,
+                     out uint addr,
+                     out uint length,
+                     out bool endOfTable)
+        {
+            int baseOffset = index * PRD_BYTES_PER_ENTRY;
+            addr = ByteOrder.LittleEndianToHost(
+                this.prdRegion.Read32(baseOffset)
+                );
+            ushort slen = ByteOrder.LittleEndianToHost(
+                this.prdRegion.Read16(baseOffset + 4)
+                );
+            length = (slen == 0) ? 0x10000u : (uint)slen;
+            byte end   = this.prdRegion.Read8(baseOffset + 7);
+            endOfTable = (end == PrdTableTerminate);
+        }
+    } // BusMaster Class
+}//namespace
diff --git a/base/Drivers/Disk/Disk.csproj b/base/Drivers/Disk/Disk.csproj
new file mode 100644
index 0000000..4697eae
--- /dev/null
+++ b/base/Drivers/Disk/Disk.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>DiskDrive</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ATA6.cs" />
+    <Compile Include="BusMasterDma.cs" />
+    <Compile Include="DiskDriver.sg" />
+    <Compile Include="IdeController.cs" />
+    <Compile Include="IdeDisk.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/Disk/DiskDriver.sg b/base/Drivers/Disk/DiskDriver.sg
new file mode 100644
index 0000000..fc9f75b
--- /dev/null
+++ b/base/Drivers/Disk/DiskDriver.sg
@@ -0,0 +1,162 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IdeController.cs
+//
+//  Base Classes and Interfaces for interacting with ATA
+//
+//  References used:
+//  "AT Attachment Interface with Extension (ATA-2)", Revision 4c, DRAFT
+//          09/03/97, ISO Working Group T13, http://www.t13.org/
+//
+//  "AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS)", Revision 0, DRAFT
+//          08/17/04, ISO Working Group T13, http://www.t13.org/
+//
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Drivers.IDE;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Extending;
+
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Drivers.IDE
+{
+    // create the resource object for LTR to fill in
+    [DriverCategory]
+    [Signature("/ata/controller")]
+    [EnumeratesDevice("/ata/disk")]
+    [EnumeratesDevice("/ata/atapi/...")]
+    public class DiskResources : DriverCategoryDeclaration
+    {
+        [IoIrqRange(0, Default = 0x0e, Shared = true)]
+        public readonly IoIrqRange irq;
+
+        // [TODO] do all of these need to be shared?
+        [IoPortRange(1, Default = 0x01f0, Length = 0x08, Shared = true)]
+        public readonly IoPortRange command;
+
+        [IoPortRange(2, Default = 0x03f4, Length = 0x04, Shared = true)]
+        public readonly IoPortRange control;
+
+        [IoPortRange(3, Default = 0xffa0, Length = 0x08, Shared = true)]
+        public readonly IoPortRange dma;
+
+        [ExtensionEndpoint]
+        public readonly TRef<ExtensionContract.Exp:Start> extension;
+
+        [ServiceEndpoint(typeof(DiskDeviceContract))]
+        public readonly TRef<ServiceProviderContract.Exp:Start> service;
+
+        [Endpoint]
+        public readonly TRef<VolumeManagerContract.Imp:Start> volman;
+
+        // This should have a custom attribute.
+        public static DiskResources Values;
+
+        // LTR will create the rest of this class:
+
+        // LTR creates a private constructor so that the app writer can't
+        // instantiate objects of this class
+        private DiskResources()
+        {
+            // endpoint initialization
+            extension = new TRef<ExtensionContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(0) as ExtensionContract.Exp));
+            service = new TRef<ServiceProviderContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(1) as ServiceProviderContract.Exp));
+            volman = new TRef<VolumeManagerContract.Imp:Start>
+                ((!)(Process.GetStartupEndpoint(2) as VolumeManagerContract.Imp));
+
+            // Io Resource initialization
+            IoConfig! config = (!)IoConfig.GetConfig();
+            DebugStub.Print("Disk Config: {0}\n", __arglist(config.ToPrint()));
+
+            // dynamic resources
+            irq = (IoIrqRange)config.DynamicRanges[0];
+            command = (IoPortRange)config.DynamicRanges[1];
+            control = (IoPortRange)config.DynamicRanges[2];
+            dma = (IoPortRange)config.DynamicRanges[3];
+        }
+
+        // LTR creates the static constructor to initialize the singleton.
+        static DiskResources()
+        {
+            Values = new DiskResources();
+        }
+    }
+
+    public class DiskDriverControl
+    {
+        private static IoConfig       config;
+        private static IdeController  controller;
+        private static IdeDisk        disk;
+        private static IdeDiskConfig  diskConfig;
+        private static IdeDiskConfig  slaveDiskConfig;
+
+        public static void SetMasterDiskConfig(IdeDiskConfig config)
+        {
+            diskConfig = config;
+        }
+        public static void SetSlaveDiskConfig(IdeDiskConfig config)
+        {
+            slaveDiskConfig = config;
+        }
+
+        public static int Main(String![]! args)
+        {
+            string! instance = args[2];
+            DebugStub.Print("Disk {0}: Irq={1}\n",
+                            __arglist(
+                                instance,
+                                DiskResources.Values.irq.ToString()));
+
+            // Create the Controller
+            controller = IdeController.Create(DiskResources.Values, args[2]);
+            controller.Initialize();
+
+            ExtensionContract.Exp! extension = DiskResources.Values.extension.Acquire();
+            ServiceProviderContract.Exp! service = DiskResources.Values.service.Acquire();
+            VolumeManagerContract.Imp! volman = DiskResources.Values.volman.Acquire();
+
+            //Create the disk
+            if (diskConfig == null) {
+                if (slaveDiskConfig != null) {
+                    diskConfig = slaveDiskConfig;
+                    Console.WriteLine(" Using slave disk configuration.");
+                    DebugStub.Print("Using slave disk configuration.\n");
+                }
+            }
+            if (diskConfig == null) {
+                Console.WriteLine(" Master disk configuration not found.");
+                DebugStub.Print("Master disk configuration not found.\n");
+                delete service;
+                delete extension;
+                delete volman;
+            }
+            else {
+                disk = new IdeDisk(diskConfig, instance);
+                disk.Run(extension, service, volman);
+            }
+
+            if (disk != null) {
+                disk.Finalize();
+            }
+
+            controller.Finalize();
+            return 0;
+        }
+
+    }
+}
diff --git a/base/Drivers/Disk/IdeController.cs b/base/Drivers/Disk/IdeController.cs
new file mode 100644
index 0000000..2da446e
--- /dev/null
+++ b/base/Drivers/Disk/IdeController.cs
@@ -0,0 +1,720 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IdeController.cs
+//
+//  Base Classes and Interfaces for interacting with ATA
+//
+//  References used:
+//  "AT Attachment Interface with Extension (ATA-2)", Revision 4c, DRAFT
+//          09/03/97, ISO Working Group T13, http://www.t13.org/
+//
+//  "AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS)", Revision 0, DRAFT
+//          08/17/04, ISO Working Group T13, http://www.t13.org/
+//
+
+#define DEBUG_SHARED_IRQ
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Drivers.IDE;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Drivers.IDE
+{
+    public enum IdeSet
+    {
+        IDE_SET_READ_AHEAD = 0,
+        IDE_UNSET_READ_AHEAD,
+        IDE_SET_MULTIPLE,
+        IDE_SET_NO_REVERT,
+        IDE_SET_WRITE_CACHE,
+        IDE_SET_MAX_PIO,
+        IDE_SET_MAX_UDMA,
+    };
+
+    [CLSCompliant(false)]
+    public class IdeController
+    {
+        public const int        PollLoopCount = 10000;
+        public string!          ControllerNameInternal;
+        private bool            busMasterDmaAvailable;
+        private IoPort[]!       CommandBlock;
+        private IoPort[]!       ControlBlock;
+        private IdeConfig!      ideConfigHandle;
+        private String!         instanceName;
+        private IdeDiskConfig   ideDisk1Config;
+        private IdeDiskConfig   ideDisk2Config;
+        private Thread          irqWorker;
+        private bool            irqWorkerStop;
+        private bool            initialized;
+        private volatile bool   commandPending = false;
+        private volatile bool   identifyPending = false;
+        private byte            pollStatus = 0;
+        private int             cyclesPerReadStatus;
+        private int             delay400ns;
+        public volatile bool    CatchBug;
+        public volatile int     CatchCount;
+
+        public string ControllerName
+        {
+            get { return ControllerNameInternal; }
+        }
+
+        public void SetCommandPending(bool val)
+        {
+            commandPending = val;
+            //Tracing.Log(Tracing.Debug," Command pending set to {0}", commandPending ? "true" : "false");
+        }
+
+        public IdeConfig GetConfig()
+        {
+            return ideConfigHandle;
+        }
+
+        public bool GetCommandPending()
+        {
+            //Tracing.Log(Tracing.Debug," Command pending set to {0}", commandPending ? "true" : "false");
+            return commandPending;
+        }
+
+        public void SetIdentifyInProgress(bool value)
+        {
+            identifyPending = value;
+        }
+
+        public bool GetIdentifyInProgress()
+        {
+            return identifyPending;
+        }
+
+        public ushort ReadDataPort()
+        {
+            return ((!)CommandBlock[0]).Read16();
+        }
+
+        public void WriteDataPort(ushort value)
+        {
+            ((!)CommandBlock[0]).Write16(value);
+        }
+
+        public byte ReadErrorPort()
+        {
+            return ((!)CommandBlock[1]).Read8();
+        }
+
+        public void WriteFeaturesPort(byte value)
+        {
+            ((!)CommandBlock[1]).Write8(value);
+        }
+
+        public byte ReadSectorCountPort()
+        {
+            return ((!)CommandBlock[2]).Read8();
+        }
+
+        public void WriteSectorCountPort(byte value)
+        {
+            ((!)CommandBlock[2]).Write8(value);
+        }
+
+        public byte ReadLBALowPort()
+        {
+            return ((!)CommandBlock[3]).Read8();
+        }
+        public void WriteLBALowPort(byte value)
+        {
+            ((!)CommandBlock[3]).Write8(value);
+        }
+
+        public byte ReadLBAMidPort()
+        {
+            return ((!)CommandBlock[4]).Read8();
+        }
+        public void WriteLBAMidPort(byte value)
+        {
+            ((!)CommandBlock[4]).Write8(value);
+        }
+
+        public byte ReadLBAHighPort()
+        {
+            return ((!)CommandBlock[5]).Read8();
+        }
+        public void WriteLBAHighPort(byte value)
+        {
+            ((!)CommandBlock[5]).Write8(value);
+        }
+
+        public byte ReadDeviceHeadPort()
+        {
+            return ((!)CommandBlock[6]).Read8();
+        }
+
+        public void WriteDeviceHeadPort(byte value)
+        {
+            ((!)CommandBlock[6]).Write8(value);
+        }
+
+        public byte ReadStatusPort()
+        {
+            return ((!)CommandBlock[7]).Read8();
+        }
+
+        public int ReadFullStatus()
+        {
+            byte nStatus = ReadAlternateStatusPort();
+            if ((nStatus & (byte)ATA6.IdeStatus.ERR) > 0) {
+                return (int)(nStatus | (((int)ReadErrorPort()) << 8));
+            }
+            return (int)nStatus;
+
+        }
+
+        public void WriteCommandPort(byte value)
+        {
+            ((!)CommandBlock[7]).Write8(value);
+        }
+
+        public byte ReadAlternateStatusPort()
+        {
+            return ((!)ControlBlock[2]).Read8();
+        }
+
+        public void WriteControlPort(byte value)
+        {
+            ((!)ControlBlock[2]).Write8(value);
+        }
+
+#if false
+        public IoPort DataPort;
+        public IoPort ErrorPort;
+        public IoPort SectorCountPort;
+        public IoPort LBAlowPort;
+        public IoPort LBAmidPort;
+        public IoPort LBAhighPort;
+        public IoPort DeviceHeadPort;
+        public IoPort StatusPort;
+        public IoPort CommandPort;
+#endif
+        private IdeController(DiskResources! resources, string! instanceName)
+        {
+            DebugStub.Print("Entering IdeController\n");
+            delay400ns = CalculateDelay400nsCount();
+
+            this.ideConfigHandle = new IdeConfig(resources.irq,
+                                                 resources.command,
+                                                 resources.control,
+                                                 true,
+                                                 resources.dma,
+                                                 this);
+
+            this.instanceName = instanceName;
+            IoPort[]! CommandBlock = this.CommandBlock = new IoPort[8];
+            IoPort[]! ControlBlock = this.ControlBlock = new IoPort[8];
+            ControllerNameInternal = String.Empty;
+
+            IoPortRange commandPorts = resources.command;
+            IoPortRange controlPorts = resources.control;
+
+            CommandBlock[0] = commandPorts.PortAtOffset(0, 2, Access.ReadWrite); //Data Port 16bits
+            CommandBlock[1] = commandPorts.PortAtOffset(1, 1, Access.ReadWrite); //Error Port
+            CommandBlock[2] = commandPorts.PortAtOffset(2, 1, Access.ReadWrite); //SectorCount
+            CommandBlock[3] = commandPorts.PortAtOffset(3, 1, Access.ReadWrite); //LBA low
+            CommandBlock[4] = commandPorts.PortAtOffset(4, 1, Access.ReadWrite); //LBA mid
+            CommandBlock[5] = commandPorts.PortAtOffset(5, 1, Access.ReadWrite); //LBA high
+            CommandBlock[6] = commandPorts.PortAtOffset(6, 1, Access.ReadWrite); //DeviceHead
+            CommandBlock[7] = commandPorts.PortAtOffset(7, 1, Access.ReadWrite); //Status & command
+/*
+            DataPort        = commandPorts.PortAtOffset(0, 2, Access.ReadWrite); //Data Port 16bits
+            ErrorPort       = commandPorts.PortAtOffset(1, 1, Access.Read);      //Error Port
+            SectorCountPort = commandPorts.PortAtOffset(2, 1, Access.ReadWrite); //SectorCount
+            LBAlowPort      = commandPorts.PortAtOffset(3, 1, Access.ReadWrite); //LBA low
+            LBAmidPort      = commandPorts.PortAtOffset(4, 1, Access.ReadWrite); //LBA mid
+            LBAhighPort     = commandPorts.PortAtOffset(5, 1, Access.ReadWrite); //LBA high
+            DeviceHeadPort  = commandPorts.PortAtOffset(6, 1, Access.ReadWrite); //DeviceHead
+            StatusPort      = commandPorts.PortAtOffset(7, 1, Access.Read);      //Status
+            CommandPort      commandPorts.PortAtOffset(7, 1, Access.Write);     //Command
+*/
+
+            ControlBlock[2] = controlPorts.PortAtOffset(2, 2, Access.ReadWrite);
+        }
+
+        internal static IdeController! Create(DiskResources! resources, string! instanceName)
+        {
+            IdeController controller = new IdeController(resources, instanceName);
+
+            controller.ResetController();
+            IdeConfig! ideConfigHandle = controller.ideConfigHandle;
+
+            if (ideConfigHandle.UseDma) {
+                ideConfigHandle.BusMasterDma = new BusMasterDma(ideConfigHandle);
+                controller.busMasterDmaAvailable = true;
+
+                controller.ControllerNameInternal =
+                        String.Format("controller at 0x{0:x4},BM@0x{1:x4},IRQ={2}",
+                        ideConfigHandle.CommandBase,
+                        ideConfigHandle.DmaBase,
+                        ideConfigHandle.Interrupt);
+
+                //
+                // Set up Interrupt handling
+                //
+                ideConfigHandle.CommandEndEvent = new AutoResetEvent(false);
+                ideConfigHandle.IdentifyEndEvent = new AutoResetEvent(false);
+
+
+                ideConfigHandle.Irq = (!)ideConfigHandle.Interrupt.IrqAtOffset(0);
+                ideConfigHandle.Irq.RegisterInterrupt();
+
+                controller.irqWorker     = new Thread(new ThreadStart(controller.IrqWorkerMain));
+                controller.irqWorkerStop = false;
+                controller.irqWorker.Start();
+                controller.initialized = true;
+            }
+            else {
+                controller.busMasterDmaAvailable = false;
+                controller.ControllerNameInternal = String.Format("PIO IDE controller at 0x{0:x4},{1:x4}",
+                    ideConfigHandle.CommandBase, ideConfigHandle.ControlBase);
+            }
+            return controller;
+        }
+
+        public void Initialize()
+        {
+            Tracing.Log(Tracing.Debug,"Ide Controller Bus: initialize");
+        }
+
+        public void Finalize()
+        {
+            try {
+                irqWorkerStop = true;
+                ideConfigHandle.Irq.Pulse();    // Wake up irqWorker
+                irqWorker.Join();
+                ideConfigHandle.Irq.ReleaseInterrupt();
+            }
+            finally {
+            }
+        }
+
+        public void ResetController()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                // Post the software reset bit
+                WriteControlPort(ATA6.DeviceControlSRST);
+
+                // a 5ns delay is needed after issuing the reset and before
+                // issuing the next command
+                int spin = delay400ns * 30;
+                Tracing.Log(Tracing.Debug," spin value for 5 microSeconds ="+spin);
+                Thread.SpinWait(spin);
+
+                WriteControlPort(0);
+
+                //the spec says you need to wait 2ms here.
+                // my experience has been > 100ms are needed to recognize Seagate drives
+                Thread.Sleep(TimeSpan.FromMilliseconds(125));
+
+                if (!PollBSY(false)) {
+                    Tracing.Log(Tracing.Debug,
+                                "IDE Controller: controller Reset Aborted, No Drives Present or responding.\n");
+                }
+                FindDisks();
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        } //resetcontroller
+
+        private void FindDisks()
+        {
+            // Device 0 now must post to the Error Register
+            byte errorBits;
+            errorBits = ReadErrorPort();
+            //Tracing.Log(Tracing.Debug,"IDE controller: controller Reset finished, Error reg: 0x{0:x2}\n", errorBits);
+            DebugStub.Print("  IDE Reset: {0:x2}\n", __arglist(errorBits));
+
+            if ((errorBits & 0x1) > 0 && ReadLBALowPort() == 1 ) {
+                DebugStub.Print("  IDE Master Signature {0:x2} {1:x2}\n",
+                                __arglist(ReadLBAMidPort(), ReadLBAHighPort()));
+                if (ReadLBAMidPort() == 0 && ReadLBAHighPort() == 0) {
+                    DebugStub.Print("    IDE Found Master Disk\n");
+                    ideDisk1Config = new IdeDiskConfig(ideConfigHandle, 0, instanceName, false);
+                    //SOSP hack
+                    DiskDriverControl.SetMasterDiskConfig(ideDisk1Config);
+
+                }
+                else if (ReadLBAMidPort() == 0x14 && ReadLBAHighPort() == 0xEB) {
+                    DebugStub.Print("    IDE Found Master ATAPI16 Device\n");
+                    ideDisk1Config = new IdeDiskConfig(ideConfigHandle, 0, instanceName, true);
+                    //SOSP hack
+                    DiskDriverControl.SetMasterDiskConfig(ideDisk1Config);
+                }
+                else {
+                    DebugStub.Print("    IDE Unknown Master Signature {0:x2} {1:x2}\n",
+                                    __arglist(ReadLBAMidPort(), ReadLBAHighPort()));
+                    Tracing.Log(Tracing.Debug,"IDEcontroller: Master device has unknown signature 0x{0:x2} 0x{1:x2}.\n",
+                        (UIntPtr) ReadLBAMidPort(), (UIntPtr) ReadLBAHighPort());
+                }
+            }
+            else {
+                DebugStub.Print("IDEcontroller: Master is missing\n");
+                Tracing.Log(Tracing.Debug,"IDEcontroller: Master is missing");
+            }
+
+            //
+            //  Slave Device
+            //
+
+            SelectDevice(1, false);
+            if (!PollDRDY(true)) {
+                DebugStub.Print("IDEcontroller: Slave is missing\n");
+                Tracing.Log(Tracing.Debug,"IdeController: Slave is missing");
+                return;
+            }
+            if (ReadSectorCountPort() == 1 && ReadLBALowPort() == 1) {
+                if ((errorBits & 0x80) != 0) {
+                    Tracing.Log(Tracing.Debug,"IdeController: Slave device reports failure.\n");
+                }
+                else {
+                    DebugStub.Print("  IDE Slave Signature {0:x2} {1:x2}\n",
+                                    __arglist(ReadLBAMidPort(), ReadLBAHighPort()));
+                    if (ReadLBAMidPort() == 0 && ReadLBAHighPort() == 0) {
+                        DebugStub.Print("    IDE Found Slave Disk\n");
+                        ideDisk2Config = new IdeDiskConfig(ideConfigHandle, 1, instanceName, false);
+                        //SOSP hack
+                        DiskDriverControl.SetSlaveDiskConfig(ideDisk2Config);
+                    }
+                    else if (ReadLBAMidPort() == 0x14 && ReadLBAHighPort() == 0xEB) {
+                        DebugStub.Print("    IDE Found Slave ATAPI16 Device\n");
+                        ideDisk2Config = new IdeDiskConfig(ideConfigHandle, 1, instanceName, true);
+                        //SOSP hack
+                        DiskDriverControl.SetSlaveDiskConfig(ideDisk2Config);
+                    }
+                    else {
+                        DebugStub.Print("    IDE Unknown Slave Signature {0:x2} {1:x2}\n",
+                                        __arglist(ReadLBAMidPort(), ReadLBAHighPort()));
+                        Tracing.Log(Tracing.Debug,"Controller: Slave device has unknown signature 0x{0:x2} 0x{1:x2}.\n",
+                            (UIntPtr) ReadLBAMidPort(), (UIntPtr) ReadLBAHighPort());
+                    }
+                }
+            }
+            else {
+                DebugStub.Print("IDEcontroller: Slave is missing\n");
+                Tracing.Log(Tracing.Debug,"IdeController: Slave is missing.\n");
+            }
+        }
+
+        private void IrqWorkerMain()
+        {
+            Tracing.Log(Tracing.Audit, "Start of worker thread.");
+            byte status;
+            int  countSpurious = 0;
+            while (irqWorkerStop == false) {
+                ideConfigHandle.Irq.WaitForInterrupt();
+
+                bool iflag = Processor.DisableInterrupts();
+                bool doNotAck = false;
+#if DEBUG_SHARED_IRQ
+                //Tracing.Log(Tracing.Debug, "Interrupt signaled.");
+#endif // DEBUG_SHARED_IRQ
+                try {
+
+                    Tracing.Log(Tracing.Debug,"wakeup {0:x}",
+                        ideConfigHandle.BusMasterDma.InterruptHigh() ? (UIntPtr) 1 : (UIntPtr) 0 );
+
+                    //
+                    // "The IDE Driver is required to do a read of the [BM] controller status
+                    //  register after receiving an interrupt. If the status register returns with the
+                    //  Interrupt bit set then the driver knows the IDE device generated the interrupt
+                    //  (important for shared interrupts)"
+
+                    if (!ideConfigHandle.BusMasterDma.InterruptHigh()) {
+                        //DebugStub.Break();
+                        doNotAck = true ;
+                    }
+                    else {
+                        if (CatchBug) {
+                            Tracing.Log(Tracing.Debug,"CatchCount ={0}",(UIntPtr) CatchCount);
+                            if (CatchCount-- <= 0) {
+                                //DebugStub.Break();
+                                 CatchBug = false;
+                            }
+                        }
+                        status = ReadStatusPort();
+                        if ((status & 0x1) > 0 ) {
+                            Tracing.Log(Tracing.Debug,"ERROR: status={0}",(UIntPtr) status);
+                            DebugStub.Break(); //error
+                        }
+                        if (((status & (byte)ATA6.IdeStatus.DRDY) == 0) ||
+                            ((status & (byte)ATA6.IdeStatus.ERR) != 0) )
+                            {
+                                ATA6.DebugQueryStatus(this);
+                            }
+
+                        //Tracing.Log(Tracing.Debug," IrqW status {0:x}",(UIntPtr) status);
+                        ideConfigHandle.BusMasterDma.Disarm();
+
+                        if (GetCommandPending()) {
+                            SetCommandPending(false);
+                            ideConfigHandle.CommandEndEvent.Set();
+                            //Tracing.Log(Tracing.Debug,"setting CommandEndEvent");
+                        }
+                        else if (GetIdentifyInProgress()) {
+                            SetIdentifyInProgress(false);
+                            ideConfigHandle.IdentifyEndEvent.Set();
+                        }
+                        else {
+                            Tracing.Log(Tracing.Debug,
+                                        "   Spurious IDE interrupt on {0}\n",
+                                        ControllerNameInternal);
+                            if ( countSpurious++ > 50) {
+                                DebugStub.Break();
+                            }
+                        }
+                    }
+                }
+                finally {
+                    if (!doNotAck) {
+                        ideConfigHandle.Irq.AckInterrupt();
+#if DEBUG_SHARED_IRQ
+                        Tracing.Log(Tracing.Debug,"ACKing {0}",
+                        ControllerNameInternal);
+#endif //DEBUG_SHARED_IRQ
+                    }
+                    else {
+#if DEBUG_SHARED_IRQ
+                        Tracing.Log(Tracing.Debug,"NACKing {0}",
+                                    ControllerNameInternal);
+#endif //DEBUG_SHARED_IRQ
+                    }
+                    Processor.RestoreInterrupts(iflag);
+                }
+            }
+        }
+        public bool PollBSY(bool level)
+        {
+            Delay400ns();
+
+            // FIXFIX PollLoopCount is a somewhat arbitrary number
+            // > 2000 is needed to make SET_FEATURES work on real HW
+            for (int i = 0; i < PollLoopCount; i++) {
+                pollStatus = ReadStatusPort();
+                if (level  && (pollStatus & (byte)ATA6.IdeStatus.BSY) > 0) {
+                    return true;
+                }
+                if (!level && (pollStatus & (byte)ATA6.IdeStatus.BSY) == 0) {
+                    return true;
+                }
+            }
+            Tracing.Log(Tracing.Debug," BSY failed to post in 400ns");
+            return false;
+        }
+
+        public bool PollDRDY(bool level)
+        {
+            // FIXFIX PollLoopCount is a somewhat arbitrary number
+            // > 2000 is needed to make SET_FEATURES work on real HW
+            // level, true = high (1), false = low (0)
+            for (int i = 0; i < PollLoopCount; i++)
+            {
+                byte pollStatus = ReadStatusPort();
+                if (level  && (pollStatus & (byte)ATA6.IdeStatus.DRDY) > 0) {
+                    return true;
+                }
+                if (!level && (pollStatus & (byte)ATA6.IdeStatus.DRDY) == 0) {
+                    return true;
+                }
+            }
+            Tracing.Log(Tracing.Debug," DRDY failed to post in 400ns");
+            return false;
+        }
+
+        public bool PollDRQ(bool level)
+        {
+            // level, true = high (1), false = low (0)
+
+            Delay400ns();
+
+            pollStatus = ReadStatusPort();
+            if (level &&  (pollStatus & (byte)ATA6.IdeStatus.DRQ) > 0) {
+                return true;
+            }
+            if (!level && (pollStatus & (byte)ATA6.IdeStatus.DRQ) == 0) {
+                return true;
+            }
+            Tracing.Log(Tracing.Debug," DRQ failed to post in 400ns");
+            return false;
+        }
+
+        public const byte IDE_FEATURE_ENABLE_WRITE_CACHE = 0x02;   // Enable write caching.
+        public const byte IDE_FEATURE_SET_TRANSFER_MODE  = 0x03;   // Set the transfer mode.
+        public const byte IDE_FEATURE_ENABLE_READ_AHEAD  = 0xAA;   // Enable read look ahead.
+        public const byte IDE_FEATURE_DISABLE_READ_AHEAD = 0x55;   // Disable read look ahead.
+        public const byte IDE_FEATURE_DISABLE_DEFAULTS   = 0x66;   // Disable revert to defaults on reset.
+
+        public const byte IDE_MODE_SET_PIO_FLOW_CONTROL  = 0x08;   // page 176
+        public const byte IDE_MODE_SET_ULTRA_DMA         = 0x40;   // page 176
+
+
+        public bool IssueSet(IdeSet setType, ref IdentifyDeviceInformation ident)
+        {
+            ushort usFullStatus;
+            byte nMode =0;
+
+            bool iflag = Processor.DisableInterrupts();
+            if (!PollBSY(false)) {
+                ATA6.DebugQueryStatus(this);
+                DebugStub.Break();
+            }
+            try {
+                switch (setType)
+                {
+                    case IdeSet.IDE_SET_MULTIPLE:
+                        //AddTrace(GetPC(), ReadFullStatus());
+                        //WriteSectorCountPort(m_nMaxBlockTransfer);
+                        break;
+
+                    case IdeSet.IDE_SET_MAX_UDMA:
+                        nMode = (byte)((ident.UltraDmaSupported) ?
+                                            ident.HighestUltraDmaMode : (byte) 0);
+                        WriteFeaturesPort(IDE_FEATURE_SET_TRANSFER_MODE);
+                        WriteSectorCountPort((byte)(IDE_MODE_SET_ULTRA_DMA | nMode));
+                        WriteCommandPort((byte)ATA6.IdeCommand.SetFeature);
+                        break;
+
+                    case IdeSet.IDE_SET_READ_AHEAD:
+                        //AddTrace(GetPC(), ReadFullStatus());
+                        WriteFeaturesPort(IDE_FEATURE_ENABLE_READ_AHEAD);
+                        break;
+
+                    case IdeSet.IDE_UNSET_READ_AHEAD:
+                        //AddTrace(GetPC(), ReadFullStatus());
+                        WriteFeaturesPort(IDE_FEATURE_DISABLE_READ_AHEAD);
+                        break;
+
+                    case IdeSet.IDE_SET_WRITE_CACHE:
+                        //AddTrace(GetPC(), ReadFullStatus());
+                        WriteFeaturesPort(IDE_FEATURE_ENABLE_WRITE_CACHE);
+                        break;
+
+                    case IdeSet.IDE_SET_NO_REVERT:
+                        //AddTrace(GetPC(), ReadFullStatus());
+                        WriteFeaturesPort(IDE_FEATURE_DISABLE_DEFAULTS);
+                        break;
+
+                }
+
+                WriteCommandPort((byte)ATA6.IdeCommand.SetFeature);
+                if (!PollBSY(false)) {
+                    ATA6.DebugQueryStatus(this);
+                    DebugStub.Break();
+                }
+                byte status1 = ReadStatusPort();
+                Tracing.Log(Tracing.Debug,"status={0}",(UIntPtr)status1);
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            return true;
+        }
+
+        public void Delay400ns()
+        {
+            Thread.SpinWait(delay400ns);
+        }
+
+        public void SelectDevice(int device, bool atapi)
+        {
+            // REVIEW should we be caching the last setting to avoid
+            // lots of io port reading/writing?
+            byte val = 0;
+
+            if (device > 0) {
+                val = ATA6.DriveSelect;
+            }
+            if (atapi) {
+                val |= (byte) ATA6.IdeCommand.AtapiPacket;
+            }
+            // REVIEW  what is the minimum requirement ?
+            //PollBSY(false);  // wait for bus to be idle
+            WriteDeviceHeadPort(val);
+            //PollBSY(false);  // wait for bus to be idle
+        }
+
+        // This doesn't work, need to fix it some how.
+        public SortedList Enumerate()
+        {
+            SortedList found = new SortedList();
+            if (ideDisk1Config != null) {
+                found.Add("/Disk1", ideDisk1Config);
+            }
+            if (ideDisk2Config != null) {
+                found.Add("/Disk2", ideDisk2Config);
+            }
+            return found;
+        }
+
+        private static int CalculateDelay400nsCount()
+        {
+            ulong cyclesPerSecond = (ulong)Processor.CyclesPerSecond;
+            ulong cycleCountStart;
+            ulong cycleCountEnd;
+            int spinCount = 1000;
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                cycleCountStart = Processor.CycleCount;
+                Thread.SpinWait(spinCount);
+                cycleCountEnd   = Processor.CycleCount;
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            ulong cycles   = cycleCountEnd - cycleCountStart;
+            ulong iCount   = cycles / (ulong)spinCount;
+            ulong cp100NS  = cyclesPerSecond / 10000000; //cycles per 100ns
+            if (cp100NS < 1) {
+                DebugStub.Print(" slow machine!! setting cp100NS to 1 \n");
+                cp100NS = 1;
+            }
+
+            int delay400nsCount = (int) ((cp100NS/iCount) *4); //loop iterations needed for 400ns
+            if (delay400nsCount < 100 ) {
+                //delay400nsCount = 100;  //FIXFIX:  hack for VPC; CycleCount is not virtual!
+                DebugStub.Print("  VPC: setting delay400 spin count to {0}\n",
+                                __arglist(delay400nsCount));
+            }
+
+            // now check
+            iflag = Processor.DisableInterrupts();
+            ulong s = Processor.CycleCount;
+            Thread.SpinWait(delay400nsCount);
+            ulong e = Processor.CycleCount;
+            Processor.RestoreInterrupts(iflag);
+
+            DebugStub.Print("  CyclesPerSecond={0}, cyclesPer100ns={1},cyclesPerLoop={2} Delay loopCount={3}\n",
+                            __arglist((ulong)cyclesPerSecond,
+                                      (ulong)cp100NS,
+                                      (ulong)iCount,
+                                      (ulong)delay400nsCount));
+
+            DebugStub.Print("  delay400 took {0} instructions or ~{1} nanoseconds\n",
+                            __arglist((ulong)(e-s),
+                                      (ulong)(((e-s)/cp100NS))* 100 ));
+
+            return delay400nsCount;
+        }
+    }
+}
diff --git a/base/Drivers/Disk/IdeDisk.sg b/base/Drivers/Disk/IdeDisk.sg
new file mode 100644
index 0000000..ba6a5ba
--- /dev/null
+++ b/base/Drivers/Disk/IdeDisk.sg
@@ -0,0 +1,909 @@
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IdeDisk.cs
+//
+//  Base Classes and Interfaces for  ATA Disk devices
+//
+//  References used:
+//  "AT Attachment Interface with Extension (ATA-2)", Revision 4c, DRAFT
+//          09/03/97, ISO Working Group T13, http://www.t13.org/
+//
+
+// #define DEBUG_LBA48
+#define DEBUG_SHARED_IRQ
+
+using System;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using System.Runtime.CompilerServices;  //StructAlign attribute
+using System.Runtime.InteropServices;   //structLayout attribute
+using Allocation = Microsoft.Singularity.Memory.SharedHeap.Allocation;
+using System.GCs;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Extending;
+
+namespace Microsoft.Singularity.Drivers.IDE
+{
+    public enum IdeCmdType
+    {
+        Read  = 0,
+        Write = 1,
+    }
+
+    [CLSCompliant(false)]
+    public class IdeRequest
+    {
+        public const int SECTOR_SIZE = 512;
+
+        // make fields private and add properties??
+        // performance difference should optimize away
+        public ulong        SectorNumber;
+    //\ public byte* opt(ExHeap[]) Buffer;
+        public UIntPtr      BufferOffset;
+        public byte *       BufferAddress;
+        public UIntPtr      BufferLength;
+        public UIntPtr      Length;
+        public IdeCmdType   Command;
+
+        public IdeRequest()
+        {
+        }
+
+        public void Set(ulong sector,
+                        byte* opt(ExHeap[])! buffer,
+                        UIntPtr bufferOffset,
+                        UIntPtr len,
+                        IdeCmdType command)
+        {
+            this.SectorNumber  = sector;
+        //\ this.Buffer        = buffer;
+            this.Length        = len;
+            this.Command       = command;
+            this.BufferOffset  = bufferOffset;
+
+            this.BufferLength  = (UIntPtr)buffer.Length;
+
+            unsafe { this.BufferAddress = (byte*) &buffer[0]; }
+        }
+
+        public IdeRequest(ulong sector,
+                          byte[]! buffer,
+                          UIntPtr bufferOffset,
+                          UIntPtr len,
+                          IdeCmdType command)
+        {
+            this.SectorNumber  = sector;
+            this.Length        = len;
+            this.Command       = command;
+            this.BufferOffset  = bufferOffset;
+
+            this.BufferLength  = (UIntPtr)buffer.Length;
+
+            unsafe { this.BufferAddress = (byte*) &buffer[0]; }
+        }
+    }
+
+
+    #region IdeDisk
+    public class IdeDisk
+    {
+        public const int    MAX_LBA28_SECTOR_COUNT = 256;
+        public const int    MAX_LBA48_SECTOR_COUNT = 65536;
+        public const byte   IDE_MODE_SET_ULTRA_DMA = 0x40;   // page 176
+        public const byte   IDE_FEATURE_SET_TRANSFER_MODE  = 0x03;   // Set the transfer mode.
+
+        private string      deviceName;
+        private string      registeredName;   //with Directory
+        private string      strDevSel;
+        private byte        devsel;
+        private bool        atapi;
+        private IdentifyDeviceInformation ident;
+        private bool        present = false;
+        private IdeRequest  ideRequest;
+        private IdeConfig   ideConfigHandle;
+        private string      ideInstanceName;
+        private IdeDiskConfig ideDiskConfig;
+        private IdeController controller;
+        private int         maxSectorCount;   // camel case privates?
+        private byte        readCommand;
+        private byte        writeCommand;
+        private int         diskId;
+        private static int  diskIdGenerator = 0;
+
+        [CLSCompliant(false)]
+        private enum DiskIoEvent : ushort
+        {
+            Start = 0, // +1 if this is a write // Seems excessively economical - make explicit?
+            End   = 2, // +1 if this is a write
+            NewDiskName = 4,
+            NewDiskId = 5,
+        }
+
+        private class DiskConnectionState
+        {
+            public const int NoSystemId = 0xffff;   // Whole disk
+
+            private int   systemId;
+            private ulong startSector;
+            private ulong sectorCount;
+
+            public DiskConnectionState(int sysId, ulong start, ulong count)
+            {
+                this.systemId    = sysId;
+                this.startSector = start;
+                this.sectorCount = count;
+            }
+
+            public DiskConnectionState(ulong start, ulong count)
+                : this(NoSystemId, start, count)
+            {
+            }
+
+            public DiskAttributes DiskAttributes
+            {
+                get { return 0; }
+            }
+
+            public int SystemId
+            {
+                get { return this.systemId; }
+            }
+
+            public ulong StartSector
+            {
+                get { return this.startSector; }
+            }
+
+            public ulong SectorCount
+            {
+                get { return this.sectorCount; }
+            }
+        }
+
+        // [TODO] need to set up connection to VolumeManager
+
+        // [TODO] do we still need ideDiskConfig.DeviceName field,
+        // now that this driver no longer needs to know its public name?
+
+        public void Finalize()
+        {
+            Tracing.Log(Tracing.Debug," Ide Disk: Finalize");
+        }
+
+        public void Run([Claims] ExtensionContract.Exp!             extension,
+                        [Claims] ServiceProviderContract.Exp:Start! service,
+                        [Claims] VolumeManagerContract.Imp:Start!   volman)
+        {
+        //\ Tracing.Log(Tracing.Debug," Ide Disk: initialize\n");
+            this.ideRequest  = new IdeRequest();
+
+            if (!this.present) {
+                delete extension;
+                delete service;
+                delete volman;
+                return;
+            }
+
+            this.registeredName = this.ideDiskConfig.DeviceName;
+
+            Tracing.Log(Tracing.Debug,"found VolMgr, awaiting Success");
+            DebugStub.Print("Waiting for VolMgr to ack.\n");
+            switch receive {
+                case volman.Success():
+                    Tracing.Log(Tracing.Debug,"Should be in ready state");
+                    break;
+                case volman.ContractNotSupported():
+                    Tracing.Log(Tracing.Debug,"volman is not a volume manager");
+                    delete extension;
+                    delete service;
+                    delete volman;
+                    return;
+                case volman.ChannelClosed() :
+                    Tracing.Log(Tracing.Debug,"volman has closed channel");
+                    delete extension;
+                    delete service;
+                    delete volman;
+                    return;
+            }
+            DebugStub.Print("Connected to VolMgr.\n");
+
+            SetUdmaMode();
+
+            // copy disk name to SharedHeap
+            Tracing.Log(Tracing.Debug,"Registering disk {0}", this.registeredName);
+            assert volman.InState(VolumeManagerContract.Ready.Value);
+            if (!this.atapi) // Assume CD-ROM (ie., no MBR, partitions) if Atapi
+                volman.SendRegisterDisk(Bitter.FromString2(this.registeredName));
+
+            Tracing.Log(Tracing.Audit, "Starting diskMsgPump.");
+
+            extension.SendSuccess();
+
+            // create a set of all client endpoints connected to the device
+            EMap<DiskDeviceContract.Exp:Ready,DiskConnectionState!> clients =
+                    new EMap<DiskDeviceContract.Exp:Ready,DiskConnectionState!>();
+
+            // These sets will only ever contain one thing, but they are here to
+            // save memory, since this avoids boxing these endpoints
+            // once per iteration.
+            ESet<ServiceProviderContract.Exp:Start> serviceproviders =
+                    new ESet<ServiceProviderContract.Exp:Start>();
+            serviceproviders.Add(service);
+            ESet<VolumeManagerContract.Imp:RegisterAck> volumemanagers1 =
+                    new ESet<VolumeManagerContract.Imp:RegisterAck>();
+            volumemanagers1.Add(volman);
+            ESet<VolumeManagerContract.Imp:Accept> volumemanagers2 =
+                    new ESet<VolumeManagerContract.Imp:Accept>();
+            ESet<ExtensionContract.Exp:Ready> extensions =
+                    new ESet<ExtensionContract.Exp:Ready>();
+            extensions.Add(extension);
+
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        // Listen for new connections
+                        case sp.Connect(candidate) in serviceproviders:
+                            DiskDeviceContract.Exp newClient = candidate as DiskDeviceContract.Exp;
+                            if (newClient != null) {
+                                newClient.SendSuccess();
+                                // switching to use lba48 numbers
+                                DiskConnectionState! conn = new DiskConnectionState(0, this.ident.MaxLBASectors);
+                                clients.Add(newClient, conn);
+                                sp.SendAckConnect();
+                            }
+                            else {
+                                sp.SendNackConnect(candidate);
+                            }
+                            serviceproviders.Add(sp);
+                            break;
+
+                        case sp.ChannelClosed() in serviceproviders:
+                            delete sp;
+                            break;
+
+                        // Listen for client departure
+                        case ep.ChannelClosed() in clients~>connState:
+                            Tracing.Log(Tracing.Debug, "Client channel closes.");
+                            delete ep;
+                        //\ IdeDisk.DumpGCStats();
+                            break;
+
+                        // Listen for extension parent
+                        case ext.Shutdown() in extensions:
+                            ext.SendAckShutdown();
+                            delete ext;
+                            run = false;
+                            break;
+
+                        case ext.ChannelClosed() in extensions:
+                            delete ext;
+                            break;
+
+                        //Listen for messages on Volume Manager
+                        case vm.Connect(candidate, systemId, start, count) in volumemanagers2:
+                            DiskDeviceContract.Exp newClient = candidate as DiskDeviceContract.Exp;
+                            if (newClient != null) {
+                                newClient.SendSuccess();
+                                DiskConnectionState! conn = new DiskConnectionState(systemId, start, count);
+                                clients.Add(newClient,conn);
+                                vm.SendAckConnect();
+                            }
+                            else {
+                                vm.SendNakConnect(candidate);
+                            }
+                            volumemanagers2.Add(vm);
+                            break;
+
+                        case vm.ChannelClosed() in volumemanagers2:
+                            delete vm;
+                            break;
+
+                        case vm.AckRegisterDisk() in volumemanagers1:
+                            Tracing.Log(Tracing.Debug,"volman has accepted the disk");
+                            // transition vm into Accept state
+                            assert vm.InState(VolumeManagerContract.Accept.Value);
+                            volumemanagers2.Add(vm);
+                            break;
+
+                        case vm.NakRegisterDisk() in volumemanagers1:
+                            Tracing.Log(Tracing.Debug,"volman did not want to register our disk");
+                            delete vm;
+                            break;
+
+                        case vm.ChannelClosed() in volumemanagers1:
+                            Tracing.Log(Tracing.Debug,"volman has closed channel");
+                            delete vm;
+                            break;
+
+
+                        // Listen for client requests
+                        case ep.GetDeviceName()in clients~>connState:
+                            char[] in ExHeap blee = Bitter.FromString(GetDeviceName());
+                            ep.SendAckGetDeviceName(blee);
+                            clients.Add(ep,connState);
+                            break;
+
+                        case ep.GetDiskAttributes() in clients~>connState:
+                            ep.SendAckGetDiskAttributes(connState.DiskAttributes);
+                            clients.Add(ep, connState);
+                            break;
+
+                        case ep.GetStartSector() in clients~>connState:
+                            ep.SendAckGetStartSector(connState.StartSector);
+                            clients.Add(ep, connState);
+                            break;
+
+                        case ep.GetSectorCount() in clients~>connState:
+                            ep.SendAckGetSectorCount(connState.SectorCount);
+                            clients.Add(ep, connState);
+                            break;
+
+                        case ep.GetSystemId() in clients~>connState:
+                            int systemId = connState.SystemId;
+                            if (systemId != DiskConnectionState.NoSystemId) {
+                                ep.SendSystemId((byte)systemId);
+                            }
+                            else {
+                                ep.SendNoSystemId();
+                            }
+                            clients.Add(ep, connState);
+                            break;
+
+                        case ep.Write(data, offset, length, sectorId) in clients~>connState:
+
+                            if (data == null) {
+                                Tracing.Log(Tracing.Debug,"data buffer is null!!!\n");
+                                ep.SendNakWrite();
+                            }
+                            else if (this.atapi) { // assume CD-ROM
+                                Tracing.Log(Tracing.Debug,"can't write to atapi cdrom\n");
+                                delete data;
+                                ep.SendNakWrite();
+                            }
+                            else {
+                                //byte* addr;
+                                //unsafe { addr = (byte*) &data[0]; }
+
+                                Tracing.Log(Tracing.Debug,"write: sector={0} len={1}",sectorId,length);
+                                ReadWrite(true, data, offset, length, sectorId, connState);
+                                ep.SendAckWrite(data);
+                            }
+                            clients.Add(ep, connState);
+                            Tracing.Log(Tracing.Debug,"write: ends.");
+                            break;
+
+                        case ep.NoOp()in clients~>connState:
+                            //DebugStub.Break();
+                            ep.SendAckNoOp();
+                            clients.Add(ep, connState);
+                            break;
+
+                        case ep.Read(data, offset, length, sectorId) in clients~>connState:
+                            if (data == null) {
+                                Tracing.Log(Tracing.Debug,"data buffer is null!!!\n");
+                                ep.SendNakRead();
+                            }
+                            else {
+                                //byte* addr;
+                                //unsafe { addr = (byte*) &data[0]; }
+
+                                Tracing.Log(Tracing.Debug,"read: sector={0} len={1}", sectorId, length);
+                                ReadWrite(false, data, offset, length, sectorId, connState);
+                                ep.SendAckRead(data);
+                            }
+
+                            clients.Add(ep, connState);
+                            Tracing.Log(Tracing.Debug,"read: ends.");
+                            break;
+
+                        case ep.ReadPerf(numMB, chunkSize) in clients~>connState:
+                            {
+                            long cycles;
+                            long ticks;
+                            ReadPerf(numMB, chunkSize, out cycles, out ticks, connState);
+                            ep.SendAckReadPerf(cycles, ticks);
+                            clients.Add(ep, connState);
+                            break;
+                            }
+
+                        // If all else fails....
+                        case clients.Empty() && serviceproviders.Empty() && volumemanagers1.Empty() && volumemanagers2.Empty() && extensions.Empty():
+                            Tracing.Log(Tracing.Debug, "Disk driver has no more connections");
+                            run = false;
+                            break;
+                    }//switch receive
+                }//for
+            }
+            finally {
+                Tracing.Log(Tracing.Debug, "diskMsgPump exiting.");
+                clients.Dispose();
+                serviceproviders.Dispose();
+                extensions.Dispose();
+                volumemanagers1.Dispose();
+                volumemanagers2.Dispose();
+            }
+        }
+
+        [NotDelayed]
+        public IdeDisk(IdeDiskConfig! config, string! instanceName)
+        {
+            DebugStub.Print("IdeDisk: {0}\n", __arglist(instanceName));
+
+            this.ideDiskConfig = config;
+            this.ideInstanceName = instanceName;
+            this.ideConfigHandle = config.ControllerConfig;
+            this.controller = config.ControllerConfig.IdeController;
+            this.devsel = config.DiskNumber;
+            this.atapi = config.Atapi;
+
+            if (this.devsel == 0) {
+                this.strDevSel = "master";
+            }
+            else {
+                this.strDevSel = "slave";
+                this.devsel = ATA6.DriveSelect;
+            }
+
+            try {
+                this.ident = ATA6.GetDeviceIdentification(this.controller, this.devsel, this.atapi);
+            }
+            catch {
+                Tracing.Log(Tracing.Debug," GetDeviceIdentification failed!\n");
+                this.present = false;
+                return;
+            }
+
+            if (!this.ident.LBASupported) {
+                Tracing.Log(Tracing.Debug,"IdeDisk: Device ({0}) missing or does not support LBA.\n",
+                      this.controller.ControllerName);
+                Console.WriteLine("IdeDisk: Device ({0}) missing or does not support LBA.\n",
+                      this.controller.ControllerName);
+                this.present = false;
+                this.deviceName = String.Format("IdeDisk: Device ({0}) {1} missing or not supported.\n",
+                    this.strDevSel, this.controller.ControllerName);
+                return;
+            }
+
+            if (this.ident.LBA48Enabled) {
+                this.maxSectorCount = MAX_LBA48_SECTOR_COUNT;
+                this.readCommand  = (byte) ATA6.IdeCommand.ReadDmaExt;
+                this.writeCommand = (byte) ATA6.IdeCommand.WriteDmaExt;
+            }
+            else {
+                this.maxSectorCount = MAX_LBA28_SECTOR_COUNT;
+                this.readCommand  = (byte) ATA6.IdeCommand.ReadDmaRetry;
+                this.writeCommand = (byte) ATA6.IdeCommand.WriteDmaRetry;
+            }
+            this.present = true;
+            if (this.ident.ModelNumber == "Virtual HD" ||
+                this.ident.ModelNumber == "Virtual CD") {
+                this.ideDiskConfig.ControllerConfig.BusMasterDma.SetVirtualized();
+            }
+
+            this.deviceName = String.Format("IdeDisk {0} ser {1} {2} MB",
+                this.ident.ModelNumber,
+                this.ident.SerialNumber,
+                (this.ident.MaxLBASectors>>11));
+
+            this.diskId = ++IdeDisk.diskIdGenerator;
+
+            announceDrive();
+
+            Monitoring.Log(Monitoring.Provider.DiskIo,
+                           (ushort)DiskIoEvent.NewDiskName, instanceName);
+            Monitoring.Log(Monitoring.Provider.DiskIo,
+                           (ushort)DiskIoEvent.NewDiskId, 0,
+                           (uint)this.diskId, 0, 0, 0, 0);
+        }
+
+        private void dumpStatus(int start, int now)
+        {
+            byte        status;
+            status      = this.controller.ReadStatusPort();
+
+            // [LEVI] we timed out and the interrupt occurred.  This implies that we did
+            // not get scheduled in a timely way.  Note this and keep on going
+
+            if  ( start+1 == now) {
+                Console.WriteLine("ideDisk: timeout; status={0:x},expected INT={1}, actual={2}",
+                     status, start+1, now);
+                DebugStub.WriteLine("ideDisk: timeout; status={0:x},expected INT={1}, actual={2}",
+                     __arglist(status, start+1, now));
+                return;
+            }
+
+            byte control,  sectorCount;
+            ATA6.DebugQueryStatus(this.controller);
+            byte bmStatus = this.ideConfigHandle.BusMasterDma.GetStatus();
+            Tracing.Log(Tracing.Debug,"BusMaster status={0:x2}\n",(UIntPtr) bmStatus);
+            sectorCount = this.controller.ReadSectorCountPort();
+            Tracing.Log(Tracing.Debug," status={0:x} count={1:x}",(UIntPtr) status,(UIntPtr) sectorCount);
+            DebugStub.Break();
+        }
+
+        private void ShowOffsetAndCount()
+        {
+            byte lbaLow2  = 0;
+            byte lbaMid2  = 0;
+            byte lbaHigh2 = 0;
+
+            this.controller.WriteControlPort(0);
+            byte lbaLow =  this.controller.ReadLBALowPort();
+            byte lbaMid =  this.controller.ReadLBAMidPort();
+            byte lbaHigh = this.controller.ReadLBAHighPort();
+
+            if (this.ident.LBA48Enabled) {
+
+                // Write High Order Bit to Control Register
+                // so we can probe the "previous" elements of the LBA queue
+                this.controller.WriteControlPort(ATA6.DeviceControlHOB);
+                lbaLow2 =  this.controller.ReadLBALowPort();
+                this.controller.WriteControlPort(ATA6.DeviceControlHOB);
+                lbaMid2 =  this.controller.ReadLBAMidPort();
+                this.controller.WriteControlPort(ATA6.DeviceControlHOB);
+                lbaHigh2 = this.controller.ReadLBAHighPort();
+
+                DebugStub.WriteLine("LBA={0:x2},{1:x2},{2:x2}, {3:x2},{4:x2},{5:x2}",
+                                __arglist(lbaHigh2,lbaMid2,lbaLow2,lbaHigh,lbaMid,lbaLow));
+            }
+
+
+        }
+
+        private void IssueOffsetAndCount(ulong SectorOffset,short sectorCount)
+        {
+            uint sectors = (uint) sectorCount;
+            if (sectorCount > this.maxSectorCount) {
+                throw new Exception("IDE Disk: too many sectors");
+            }
+            if (sectorCount == this.maxSectorCount) {
+                sectorCount = 0; // read all sectors
+            }
+
+            if (this.ident.LBA48Enabled) {
+                // 48 bit addresses are formed by pushing 2 sets of values into the
+                // LBA registers: See ATA-6 spec and beyond
+
+                this.controller.WriteSectorCountPort ((byte)((sectors >>  8) & 0xff));
+                this.controller.WriteLBALowPort ((byte)((SectorOffset >> 24) & 0xff));
+                this.controller.WriteLBAMidPort ((byte)((SectorOffset >> 32) & 0xff));
+                this.controller.WriteLBAHighPort((byte)((SectorOffset >> 40) & 0xff));
+
+                this.controller.WriteSectorCountPort ((byte)((sectors >>  0) & 0xff));
+                this.controller.WriteLBALowPort ((byte)((SectorOffset >>  0) & 0xff));
+                this.controller.WriteLBAMidPort ((byte)((SectorOffset >>  8) & 0xff));
+                this.controller.WriteLBAHighPort((byte)((SectorOffset >> 16) & 0xff));
+
+                this.controller.WriteDeviceHeadPort((byte)(this.devsel | 0x40 )); //use LBA
+            }
+            else {
+                this.controller.WriteSectorCountPort ((byte)((sectors >>  0) & 0xff));
+                this.controller.WriteLBALowPort ((byte)((SectorOffset >>  0) & 0xff));
+                this.controller.WriteLBAMidPort ((byte)((SectorOffset >>  8) & 0xff));
+                this.controller.WriteLBAHighPort((byte)((SectorOffset >> 16) & 0xff));
+                this.controller.WriteDeviceHeadPort((byte)(this.devsel | 0x40 | (byte)(SectorOffset >> 24)));   // Doesn't (SectorOffset >> 24) collide with devsel (0|1) if Non-Zero?
+            }
+#if DEBUG_LBA48
+            DebugStub.WriteLine("IDE offset={0}, count ={1}",__arglist(SectorOffset,sectors));
+            ShowOffsetAndCount();
+#endif
+            //Tracing.Log(Tracing.Debug," {0:x} sectorId={1}",(UIntPtr) this.controller.ReadFullStatus(),(UIntPtr)SectorOffset);
+
+        }
+
+
+        private int ReadPerf(int      numMB,
+                             int      chunkSize,
+                             out long cycles,
+                             out long ticks,
+                             DiskConnectionState! conn)
+        {
+            long endCycles;
+            long endClock;
+            long startCycles;
+            long startClock;
+
+            int sectors = numMB * 1024 * (1024 / IdeRequest.SECTOR_SIZE);
+            int sectorsPerChunk = chunkSize / IdeRequest.SECTOR_SIZE;
+
+            byte* opt(ExHeap[]) perfBuffer = new [ExHeap] byte[chunkSize];
+
+            try
+            {
+                startCycles = ProcessService.GetCycleCount();
+                startClock  = ProcessService.GetUpTime().Ticks;
+
+                int i = 0;
+                while (i < sectors)
+                {
+                    ReadWrite(false, perfBuffer, 0, (UIntPtr) chunkSize, (ulong)i, conn);
+                    i += sectorsPerChunk;
+                }
+
+                endCycles = ProcessService.GetCycleCount();
+                endClock  = ProcessService.GetUpTime().Ticks;
+            }
+            finally
+            {
+                delete perfBuffer;
+            }
+
+            cycles = endCycles - startCycles;
+            ticks = endClock - startClock;
+
+            return 0;
+        }
+
+        private static ushort evt2ushort(DiskIoEvent evt, bool offset)
+        {
+            return (ushort)(((ushort)evt) + (offset? 1 : 0));
+        }
+
+        private int ReadWrite( bool doWrite,
+                               byte[]! in ExHeap  buffer,
+                               UIntPtr bufferOffset,
+                               UIntPtr length,
+                               ulong sector,
+                               DiskConnectionState! conn)
+        {
+            ushort temp;
+            ulong sectorId;
+            IdeCmdType ideCmdType;
+            byte controllerCommand;
+            uint dataStart;
+            uint bufferStart;
+
+            //if (true) return 0 ;   //use for testing overhead
+
+            // checks
+            unsafe {
+                bufferStart = (uint)&buffer[0];
+                dataStart =  bufferStart + (uint)bufferOffset;
+
+                if ((dataStart & 0x03) != 0) {
+                    DebugStub.Break();
+                    throw new Exception("IDE ReadWrite: Impermissible buffer (not 4-byte aligned)");
+                }
+            }
+
+            if ((int)length % IdeRequest.SECTOR_SIZE != 0) {
+                DebugStub.Break();
+                throw new Exception("IDE ReadWrite: Impermissible buffer (not in sector-size chunks)");
+            }
+
+            ulong numSectors = (ulong)length / IdeRequest.SECTOR_SIZE;
+
+            if (sector > conn.SectorCount) {
+                throw new Exception("IDE ReadWrite: Sector start out of Bounds.");
+            }
+
+            if ((sector + numSectors) > conn.SectorCount) {
+                throw new Exception("IDE ReadWrite: Sector operation out of Bounds.");
+            }
+
+            sectorId = sector + conn.StartSector;
+
+            if (sectorId >= this.ident.MaxLBASectors) {
+                throw new Exception("IDE ReadWrite: Sector out of Bounds.");
+            }
+
+            if ((length + bufferOffset) > (UIntPtr)buffer.Length) {
+                throw new Exception("IDE ReadWrite: length + offset exceeds array bounds");
+            }
+
+            if (length > (UIntPtr) (IdeRequest.SECTOR_SIZE * this.maxSectorCount)) {
+                throw new Exception("IDE ReadWrite: Length exceeds MAX_SECTORS");
+            }
+
+            // Reduce branch count w/ Interrupts Off (and total branch count as well).
+            if (doWrite) {
+                ideCmdType = IdeCmdType.Write;
+                controllerCommand = this.writeCommand;
+            }
+            else {
+                ideCmdType = IdeCmdType.Read;
+                controllerCommand = this.readCommand;
+            }
+
+            //Tracing.Log(Tracing.Debug,"pre cmds {0:x}",
+            //            (UIntPtr) this.controller.ReadFullStatus());
+
+            lock (this) {
+                if (!this.present) {
+                    DebugStub.Break();
+                    throw new Exception("IDE ReadWrite: Device Not Present");
+                }
+
+                //
+                // perform operation
+                //
+                this.ideRequest.Set((ulong)sectorId,buffer,bufferOffset, length, ideCmdType);
+
+                int startCount;
+                bool iflag = Processor.DisableInterrupts();
+                try {
+                    unsafe {
+                    Monitoring.Log(Monitoring.Provider.DiskIo,
+                                   IdeDisk.evt2ushort(DiskIoEvent.Start, doWrite), 0,
+                                   (uint)sectorId, (uint)length, (uint)this.diskId,
+                                   (uint)this.ideRequest.BufferAddress, 0);
+                    }
+
+                    startCount = DeviceService.GetIrqCount((byte)this.ideConfigHandle.Interrupt.Irq);
+                    //Tracing.Log(Tracing.Debug,"pre cmd int={0}",(UIntPtr) startCount);
+                    this.controller.SetCommandPending(true);
+                    this.controller.SelectDevice(this.devsel, this.atapi); //set master or slave
+                    this.controller.PollDRDY(true);            //Wait for Device to indicate ready.
+
+                    this.ideConfigHandle.BusMasterDma.BmPrepareController(this.ideRequest); //setup PRD
+                    if (!this.atapi) {
+                        this.IssueOffsetAndCount(sectorId,(short) (length >> 9)); //setup LBA
+                        this.controller.WriteCommandPort(controllerCommand);
+                    }
+                    else {
+                        this.controller.WriteCommandPort((byte) ATA6.IdeCommand.AtapiPacket);
+
+                        this.controller.WriteFeaturesPort((byte) ATA6.Atapi.DMA);
+
+                        this.controller.WriteLBAHighPort ((byte)(length >> 8));
+                        this.controller.WriteLBAMidPort  ((byte)(length >> 0));
+
+                        // set-up the CDB (Command Descriptor Block)
+
+                        byte []cdb; cdb = new byte[10];
+
+                        cdb[0] = (byte)ATA6.Atapi.Read;
+                        cdb[1] = 0; // LUN
+
+                        cdb[2] = (byte)(sectorId >> 24);
+                        cdb[3] = (byte)(sectorId >> 16);
+                        cdb[4] = (byte)(sectorId >>  8);
+                        cdb[5] = (byte)(sectorId >>  0);
+
+                        cdb[6] = 0; // Reserved
+
+                        cdb[7] = (byte)(length >> (11 + 8));
+                        cdb[8] = (byte)(length >> (11 + 0));
+
+                        cdb[9] = 0; // Control
+
+                        for (int i = 0; i < 10; i += 2) {
+                            ushort x = cdb[i+1]; x <<= 8; x |= cdb[i];
+
+                            this.controller.WriteDataPort (x);
+                        }
+                        this.controller.WriteDataPort (0); // controller needs 12-byte cdb
+                    }
+
+                    // DMA protocol Check_Status State
+                    // After dma command has been issued the host must read the status register.
+                    // Before doing so it must wait 400ns.
+
+                    this.controller.Delay400ns();         // mandatory delay for controller commands
+
+                    //Tracing.Log(Tracing.Debug,"post cmds status={0:x}",
+                    //            (UIntPtr) this.controller.ReadFullStatus());
+
+                    this.controller.ReadFullStatus();
+                    this.ideConfigHandle.BusMasterDma.Arm(this.ideRequest);
+
+                //\ ATA6.DebugQueryStatus(this.controller);
+
+                    int currentCount = DeviceService.GetIrqCount((byte)this.ideConfigHandle.Interrupt.Irq);
+                    Debug.Assert(currentCount == startCount);
+                }
+                finally {
+                    Tracing.Log(Tracing.Debug, "enabling interrupts for {0}",
+                                this.controller.ControllerNameInternal);
+                    Processor.RestoreInterrupts(iflag);
+                }
+
+                bool success = false;
+                success = this.ideConfigHandle.CommandEndEvent.WaitOne(TimeSpan.FromMilliseconds(1000));
+                int c  = DeviceService.GetIrqCount((byte)this.ideConfigHandle.Interrupt.Irq);
+                Tracing.Log(Tracing.Debug,"post wait int={0}, expected={1}",(UIntPtr) c, (uint) (startCount +1) );
+#if DEBUG_SHARED_IRQ
+                Tracing.Log(Tracing.Debug,"read completes on {0}, numInterrupts={1}\n",
+                            this.controller.ControllerNameInternal,
+                            (UIntPtr) (c - startCount)
+                            );
+#endif //DEBUG_SHARED_IRQ
+
+                unsafe {
+                    Monitoring.Log(Monitoring.Provider.DiskIo,
+                                   IdeDisk.evt2ushort(DiskIoEvent.End, doWrite), 0,
+                                   (uint)sectorId, (uint)length, (uint)this.diskId,
+                                   (uint)this.ideRequest.BufferAddress, 0);
+                }
+
+                if (!success) {
+                    dumpStatus(startCount, c);
+                }
+                if ((c - startCount) != 1) {
+                    this.controller.CatchBug = true;
+                    this.controller.CatchCount =  (c-startCount);
+                    Tracing.Log(Tracing.Debug," ^^^^^^ TRYING To Catch COUNT={0} ^^^^",
+                                (UIntPtr) this.controller.CatchCount);
+                //\ DebugStub.Break();
+                }
+                return 0;
+            } //lock
+        }
+
+        private static void DumpGCStats()
+        {
+            int count;
+            long millis;
+            long bytes;
+            GC.PerformanceCounters(out count, out millis, out bytes);
+            Console.WriteLine("Disk GC stats - count {0} millis {1} bytes {2}", count, millis, bytes);
+        }
+
+        private ulong GetSectorCount()
+        {
+            if (!this.present) {
+                throw new Exception("IDE Disk: Device Not Present");
+            }
+            return this.ident.MaxLBASectors;
+        }
+
+        private String GetDeviceName()
+        {
+            if (!this.present) {
+                throw new Exception("IDE Disk: Device Not Present");
+            }
+
+            return this.deviceName;
+        }
+
+        private void SetUdmaMode()
+        {
+            if  (atapi) return;
+            if (!ident.UltraDmaSupported) return;
+
+            this.controller.IssueSet(IdeSet.IDE_SET_MAX_UDMA, ref this.ident);
+            this.controller.IssueSet(IdeSet.IDE_SET_READ_AHEAD, ref this.ident);
+            // let's see what we get back once we have set it...
+            try {
+                this.ident = ATA6.GetDeviceIdentification(this.controller, this.devsel, this.atapi);
+            }
+            catch {
+                Tracing.Log(Tracing.Debug, " GetDeviceIdentification failed!\n");
+                this.present = false;
+                return;
+            }
+        }
+
+        private void announceDrive()    // was Parameterized, Why? (ref IdentifyDeviceInformation ident)
+        {
+            Tracing.Log(Tracing.Debug,"IdeDisk: id {0}, present={1}\n",
+                        this.deviceName,
+                        (UIntPtr) (this.present ? 1: 0));
+
+            Console.WriteLine("  IdeDisk: id={0}", this.deviceName);
+            Console.WriteLine("  IdeDisk: {0}" ,this.controller.ControllerName);
+            Console.WriteLine("  IdeDisk: LBA48={0}, UDMA={1},MaxSectors={2}",
+                              this.ident.LBA48Enabled,
+                              this.ident.UltraDmaSupported ? this.ident.HighestUltraDmaMode : (byte)0,
+                              this.ident.MaxLBASectors
+                              );
+#if false
+            for (ushort i = 8; i > 3; i--) {
+                if ((this.ident.MajorVersion  & ( 1 << i)) > 0) {
+                    DebugStub.Print("Device supports ATA {0}\n",__arglist(i));
+                    break;
+                }
+            }
+#endif
+        }
+    }
+    #endregion
+}
diff --git a/base/Drivers/Disk/ata6.cs b/base/Drivers/Disk/ata6.cs
new file mode 100644
index 0000000..f9054c5
--- /dev/null
+++ b/base/Drivers/Disk/ata6.cs
@@ -0,0 +1,587 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ATA6.cs
+//
+//  Base Classes and Interfaces for interacting with ATA
+//
+//  References used:
+//  "AT Attachment with Packet Interface with Extension 6 (ATA/ATAPI-6-)",
+//           ISO Working Group T13, http://www.t13.org/
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Drivers.IDE;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Drivers.IDE
+{
+    [CLSCompliant(false)]
+    public class IdeDiskConfig
+    {
+        public IdeConfig ControllerConfig;
+        public byte     DiskNumber;
+        public bool     Atapi;
+        public String!  DeviceName;
+        public String!  Id;
+
+        public IdeDiskConfig(IdeConfig config, byte num, String! deviceName, bool atapi)
+        {
+            ControllerConfig = config;
+            DiskNumber = num;
+            Atapi = atapi;
+            Id = "/ata/disk";
+            DeviceName = deviceName;
+            // Used to be "/dev/disk0", but now we use the instance name.
+
+            base();
+        }
+    }
+
+    public class IdeConfig
+    {
+        public IoIrqRange       Interrupt;
+        public bool             UseDma;
+        public IoPortRange      DmaBase;
+        public IoPortRange      CommandBase;
+        public IoPortRange      ControlBase;
+        public IdeController!   IdeController;
+        public BusMasterDma     BusMasterDma;
+        public IoIrq/*[!]*/     Irq;
+        public AutoResetEvent/*[!]*/ CommandEndEvent;
+        public AutoResetEvent/*[!]*/ IdentifyEndEvent;
+        public String           Id;
+
+        public IdeConfig(IoIrqRange! interrupt,
+                         IoPortRange! command,
+                         IoPortRange! control,
+                         bool useDma,
+                         IoPortRange! bmBaseAddr,
+                         [Delayed]
+                         IdeController! ideController
+            )
+        {
+            Interrupt       = interrupt;
+            CommandBase     = command;
+            ControlBase     = control;
+            UseDma          = useDma;
+            DmaBase         = bmBaseAddr;
+            IdeController   = ideController;
+
+            Id = "/ata/controller";
+            Tracing.Log(Tracing.Debug,"IdeConfig: INT={1} cmd={2:x4}, ctrl={3:x4}, DMA@{4:x4}\n",
+                        (UIntPtr)interrupt.Irq,
+                        (UIntPtr)command.Port,
+                        (UIntPtr)control.Port,
+                        (UIntPtr)bmBaseAddr.Port);
+        }
+    }
+
+    [CLSCompliant(false)]
+    public struct IdentifyDeviceInformation
+        // Information Returned to host via the IdentifyDeviceInformation command
+    {
+        public bool     RemovableMediaDevice;   // Word 0, Bit 7
+        public bool     RemovableController;    // Word 0, Bit 6
+        public ushort   CylinderCount;          // word 1
+        public ushort   HeadCount;              // word 3
+        public ushort   SectorCountPerTrack;    // Word 6
+        public string   SerialNumber;           // Words 10 to 19
+        public ushort   NumberOfBytesAvailInVendorCommand; // Word 22
+        public string   FirmwareRevision;       // Words 23 to 26
+        public string   ModelNumber;            // Words 27 to 47
+        public bool     SupportsMultiple;       // Word 47, bits 7 to 0 == 0
+        public ushort   MaximumMultipleSectorCount; // Word 47, bits 7 to 0
+
+        public bool     StandbyTimer;           // Word 49, bit 13
+
+        public bool     IORDYSupported;         // Word 49, bit 11
+        public bool     IORDYDisableable;       // Word 49, bit 10
+        public bool     LBASupported;           // Word 49, bit 9
+        public bool     DMASupported;           // Word 49, bit 8
+
+        public bool     Word88Valid;            // Word 53, bit 2
+        public bool     UltraDmaSupported;      // Word 53, bit 2 (same)
+        public bool     Words64to70Valid;       // Word 53, bit 1
+        public bool     Words54to58Valid;       // Word 53, bit 0
+
+        // Words 54-58 are valid if word 53, bit 0 is set.
+
+        public ushort   CurrentLogicalCylinderCount;    // Word 54
+        public ushort   CurrentLogicalHeadCount;        // Word 55
+        public ushort   CurrentLogicalSectorCount;      // Word 56
+        public uint     CurrentCapacityInSectors;       // Word 57-58
+        public bool     MultipleSectorSettingValid;     // Word 59, bits 8
+        public ushort   CurrentSectorCountPerInterrupt; // Word 59
+        public uint     TotalAddressableSectors;        // Word 60-61
+        public ushort   MultiwordDMATransferMode;       // Word 63, 15-8
+        public ushort   MultiwordDMATransferModes;      // Word 63, 7-0
+
+        // Words 64-70 are valid if word 53, bit 1 is set.
+
+        public ushort   PIODMATransferModes; // Word 64, bits 7-0
+        public ushort   MinimumMultiwordDMACycleTime; // in nanoseconds Word 65
+        public ushort   RecommendedMultiwordDMACycleTime; // in nanoseconds Word 66
+        public ushort   MinimumPIOCycleTimeWithFlowControl; // in nanoseconds Word 67
+        public ushort   MinimumPIOCycleTimeWithIORDY; // in nanoseconds Word 68
+
+        public ushort   QueueDepth; // word 75,  value == depth-1
+        public ushort   MajorVersion;  //word 80
+        public ushort   MinorVersion;  //word 81
+
+        public ushort   FeatureSet1Supported;
+        public bool     NOPSupported;  // word 82, bit 14
+        public bool     ReadBufferSupported;  // word 82, bit 13
+        public bool     WriteBufferSupported;  // word 82, bit 12
+        public bool     HostProtectedAreaSupported;  // word 82, bit 10
+        public bool     DeviceResetSupported;  // word 82, bit 9
+        public bool     ServiceInterruptSupported;  // word 82, bit 8
+        public bool     ReleaseInterruptSupported;  // word 82, bit 7
+        public bool     LookAheadSupported;  // word 82, bit 6
+        public bool     WriteCacheSupported;  // word 82, bit 5
+        public bool     PacketSupported;  // word 82, bit 4
+        public bool     PowerManagementSupported;  // word 82, bit 3
+        public bool     RemovableMediaSupported;  // word 82, bit 2
+        public bool     SecurityModeSupported;  // word 82, bit 1
+        public bool     SmartSupported;  // word 82, bit 0
+
+        public ushort   FeatureSet2Supported;
+        public bool     FlushCacheExtSupported;  // word 83, bit 13
+        public bool     FlushCacheSupported;  // word 83, bit 12
+        public bool     DeviceConfigurationOverlaySupported;  // word 83, bit 11
+        public bool     LBA48Supported;  // word 83, bit 10
+        public bool     AutomaticAcousticManagementSupported;  // word 83, bit 9
+        public bool     SetMaxSecuritySupported;  // word 83, bit 8
+        public bool     AddressOffsetrAreaBootSupported;  // word 83, bit 7
+        public bool     SetFeaturesSupported;  // word 83, bit 6
+        public bool     PowerUpInStandbySupported;  // word 83, bit 5
+        public bool     RemovableMediaStatusNotificationSupported;  // word 83, bit 4
+        public bool     APMSupported;  // word 83, bit 3
+        public bool     CFASupported;  // word 83, bit 2
+        public bool     QueuedDMASupported;  // word 83, bit 1
+        public bool     DownloadMicrocodeSupported;  // word 83, bit 0
+
+        public ushort   FeatureSet3Supported;
+        public bool     GeneralPurposeLoggingSupported;  // word 83, bit 5
+        public bool     MediaCardPssThroughSupported;  // word 83, bit 3
+        public bool     MediaSerialNumberSupported;  // word 83, bit 2
+        public bool     SmartSelfTestSupported;  // word 83, bit 1
+        public bool     SmartErrorLogSupported;  // word 83, bit 0
+
+        public bool     EnabledDataValid;   // word 87, bits 15,14 (0x8000)
+
+        public ushort   FeatureSet1Enabled;
+        public bool     NOPEnabled;  // word 85, bit 14
+        public bool     ReadBufferEnabled;  // word 85, bit 13
+        public bool     WriteBufferEnabled;  // word 85, bit 12
+        public bool     HostProtectedAreaEnabled;  // word 85, bit 10
+        public bool     DeviceResetEnabled;  // word 85, bit 9
+        public bool     ServiceInterruptEnabled;  // word 85, bit 8
+        public bool     ReleaseInterruptEnabled;  // word 85, bit 7
+        public bool     LookAheadEnabled;  // word 85, bit 6
+        public bool     WriteCacheEnabled;  // word 85, bit 5
+        public bool     PacketEnabled;  // word 85, bit 4
+        public bool     PowerManagementEnabled;  // word 85, bit 3
+        public bool     RemovableMediaEnabled;  // word 85, bit 2
+        public bool     SecurityModeEnabled;  // word 85, bit 1
+        public bool     SmartEnabled;  // word 85, bit 0
+
+        public ushort   FeatureSet2Enabled;
+        public bool     FlushCacheExtEnabled;  // word 86, bit 13
+        public bool     FlushCacheEnabled;  // word 86, bit 12
+        public bool     DeviceConfigurationOverlayEnabled;  // word 86, bit 11
+        public bool     LBA48Enabled;  // word 86, bit 10
+        public bool     AutomaticAcousticManagementEnabled;  // word 86, bit 9
+        public bool     SetMaxSecurityEnabled;  // word 86, bit 8
+        public bool     AddressOffsetrAreaBootEnabled;  // word 86, bit 7
+        public bool     SetFeaturesEnabled;  // word 86, bit 6
+        public bool     PowerUpInStandbyEnabled;  // word 86, bit 5
+        public bool     RemovableMediaStatusNotificationEnabled;  // word 86, bit 4
+        public bool     APMEnabled;  // word 86, bit 3
+        public bool     CFAEnabled;  // word 86, bit 2
+        public bool     QueuedDMAEnabled;  // word 86, bit 1
+        public bool     DownloadMicrocodeEnabled;  // word 86, bit 0
+
+        public ushort   FeatureSet3Enabled;
+        public bool     GeneralPurposeLoggingEnabled;  // word 87, bit 5
+        public bool     MediaCardPssThroughEnabled;  // word 87, bit 3
+        public bool     MediaSerialNumberEnabled;  // word 87, bit 2
+        public bool     SmartSelfTestEnabled;  // word 87, bit 1
+        public bool     SmartErrorLogEnabled;  // word 87, bit 0
+
+
+        //word 88 UltraDMA
+        public ushort     UltraDmaModes;          //word 88
+        public byte     HighestUltraDmaMode;    // Highest UDMA mode supported;
+        public bool     UltraDmaMode5Selected;  //word 88. bit 13
+        public bool     UltraDmaMode4Selected;  //word 88. bit 12
+        public bool     UltraDmaMode3Selected;  //word 88. bit 11
+        public bool     UltraDmaMode2Selected;  //word 88. bit 10
+        public bool     UltraDmaMode1Selected;  //word 88. bit 9
+        public bool     UltraDmaMode0Selected;  //word 88. bit 8
+
+        public bool     UltraDmaMode5Supported;  //word 88. bit 5
+        public bool     UltraDmaMode4Supported;  //word 88. bit 4
+        public bool     UltraDmaMode3Supported;  //word 88. bit 3
+        public bool     UltraDmaMode2Supported;  //word 88. bit 2
+        public bool     UltraDmaMode1Supported;  //word 88. bit 1
+        public bool     UltraDmaMode0Supported;  //word 88. bit 0
+
+        public ulong    MaxLBASectors;           //words 100-103
+   }
+
+#region ATA6
+    public class ATA6
+    {
+        internal static string WordsToString(ushort[]! DriveData, int Start, int End)
+        {
+            int iter;
+            int length = End - Start;
+            ASCIIEncoding xlate = new ASCIIEncoding();
+            byte[] tempBuffer = new byte[(End - Start) * 2];
+
+            for (iter = 0; iter < length; iter++)
+            {
+                tempBuffer[iter * 2 + 1] = (byte)(DriveData[Start + iter] & (ushort)0xFF);
+                tempBuffer[iter * 2] = (byte)((DriveData[Start + iter] >> 8) & (ushort)0xFF);
+            }
+
+            string ret =  xlate.GetString(tempBuffer);
+
+            if (ret != null) {
+                ret = ret.Trim();
+            }
+
+            return ret;
+        }
+
+        static byte HighestBitSet(ushort uiBits)
+        {
+            ushort uiMask = 0x80;
+            for (ushort nBit = 8; nBit > 0; nBit--, uiMask >>= 1) {
+                if ( (uiBits & uiMask) > 0 ) {
+                    return (byte)nBit;
+                }
+            }
+            return 0;
+        }
+
+        //public static uint    MAX_SUPPORTED_SECTORS = 2048 * 128;
+        //public static uint    MAX_SUPPORTED_SECTORS = 16383 * 16 * 63;
+
+        public static IdentifyDeviceInformation ParseIdentifyInformation(ushort[]! DriveData)
+        {
+            IdentifyDeviceInformation temp = new IdentifyDeviceInformation();
+            temp.RemovableMediaDevice = (DriveData[0] & (1<<7)) > 0;
+            temp.CylinderCount = DriveData[1];
+            temp.HeadCount = DriveData[3];
+            temp.SectorCountPerTrack = DriveData[6];
+            temp.SerialNumber = WordsToString(DriveData, 10, 19);
+            temp.NumberOfBytesAvailInVendorCommand = DriveData[22];
+            temp.FirmwareRevision = WordsToString(DriveData, 23, 26);
+            temp.ModelNumber = WordsToString(DriveData, 27, 46);
+            if ((DriveData[47] & (0xFF)) == 0) {
+                temp.SupportsMultiple = false;
+            }
+            else {
+                temp.SupportsMultiple = true;
+                temp.MaximumMultipleSectorCount = (ushort)(DriveData[47] & 0xFF);
+            }
+
+            temp.StandbyTimer      = ((DriveData[49] & (1 << 13))) > 0;
+            temp.IORDYSupported    = ((DriveData[49] & (1 << 11))) > 0;
+            temp.IORDYDisableable  = ((DriveData[49] & (1 << 10))) > 0;
+            temp.LBASupported      = ((DriveData[49] & (1 << 9)))  > 0;
+            temp.DMASupported      = ((DriveData[49] & (1 << 8)))  > 0;
+            //UltraDMA supported
+            temp.Word88Valid       = ((DriveData[53] & (1 << 2)))  > 0;
+            temp.UltraDmaSupported = temp.Word88Valid;
+            //this bit should always be true unless device is CFA or PCMCIA
+            temp.Words64to70Valid  = ((DriveData[53] & (1 << 1)))  > 0;
+            //obsolete
+            temp.Words54to58Valid = ((DriveData[53] & (1 << 0)))  > 0;
+
+            // word 59:  multiple sector setting
+            temp.MultipleSectorSettingValid = (DriveData[59] & (1 << 8)) > 0;
+            temp.CurrentSectorCountPerInterrupt = (ushort)(DriveData[59] & 0xFF);
+
+            // words 60,61: Total # of addressable sectors (+1)
+            temp.TotalAddressableSectors = ((uint)DriveData[61] << 16) | (uint)DriveData[60];
+#if obsolete
+            if (temp.TotalAddressableSectors > MAX_SUPPORTED_SECTORS) {
+                temp.TotalAddressableSectors = MAX_SUPPORTED_SECTORS;
+            }
+#endif
+            // word 63:  should be 0 if UltraDMA is supported
+            // bit 10: MDMA mode 2 selected
+            // bit 09: MDMA mode 1 selected
+            // bit 08: MDMA mode 0 selected
+
+            // bit 02: MDMA mode 2 supported
+            // bit 01: MDMA mode 1 supported
+            // bit 00: MDMA mode 0 supported
+
+            temp.MultiwordDMATransferMode = (ushort)((DriveData[63] & 0xFF00) >> 8);
+            temp.MultiwordDMATransferModes = (ushort)(DriveData[63] & 0xFF);
+
+            temp.PIODMATransferModes = (ushort)(DriveData[64] & 0xFF);
+            temp.MinimumMultiwordDMACycleTime = DriveData[65];
+            temp.RecommendedMultiwordDMACycleTime = DriveData[66];
+            temp.MinimumPIOCycleTimeWithFlowControl = DriveData[67];
+            temp.MinimumPIOCycleTimeWithIORDY = DriveData[68];
+
+            // value == maximum queue depth -1  (max = 31 +1)
+            temp.QueueDepth = (ushort)(DriveData[75] & 0x1F);
+
+            temp.MajorVersion = DriveData[80];
+            temp.MinorVersion = DriveData[81];
+
+            //Feature sets
+            temp.FeatureSet1Supported = DriveData[82];
+            temp.FeatureSet2Supported = DriveData[83];
+            temp.FeatureSet3Supported = DriveData[84];
+            temp.FeatureSet1Enabled   = DriveData[85];
+            temp.FeatureSet2Enabled   = DriveData[86];
+            temp.FeatureSet3Enabled   = DriveData[87];
+
+            temp.LBA48Supported       = ((DriveData[83] & (1 << 10))) > 0;
+            temp.LBA48Enabled         = ((DriveData[86] & (1 << 10))) > 0;
+
+            temp.QueuedDMASupported   = ((DriveData[83] & (1 << 1)))  > 0;
+            temp.QueuedDMAEnabled     = ((DriveData[86] & (1 << 1)))  > 0;
+
+            if (temp.UltraDmaSupported) {
+                temp.UltraDmaModes = DriveData[88];
+                temp.HighestUltraDmaMode =
+                    (byte) (HighestBitSet((ushort)(temp.UltraDmaModes & 0x3f)) - (byte) 1);
+            }
+            
+            if (temp.LBA48Supported) {
+                temp.MaxLBASectors =  ((ulong)DriveData[103] << 48) 
+                                    | ((ulong)DriveData[102] << 32)
+                                    | ((ulong)DriveData[101] << 16)
+                                    |  (ulong)DriveData[100]; 
+                DebugStub.WriteLine("Disk Device supports LBA 48\n");
+                DebugStub.WriteLine("Total LBA sectors ={0}",__arglist(temp.MaxLBASectors));
+                //controller.WriteCommandPort( (byte) ATA6.IdeCommand.ReadNativeMaxAddressExt);
+                //controller.Delay400ns(); 
+                //DebugStub.WriteLine("ReadNativeMaxAddressExt:");
+                //ShowOffsetAndCount();  
+            }
+            else {
+                temp.MaxLBASectors =  temp.TotalAddressableSectors; 
+            }
+
+            if  (temp.UltraDmaSupported) {
+                DebugStub.WriteLine("Disk Device supports Ultra DMA modes={0:x4},highest={1}",
+                                    __arglist(temp.UltraDmaModes,temp.HighestUltraDmaMode));
+            }
+
+            return temp;
+        }
+
+        public static
+        IdentifyDeviceInformation GetDeviceIdentification(IdeController! controller,
+                                                          int devsel, bool atapi)
+        {
+            ushort[] identifyData = new ushort[256];
+
+            if (!controller.PollBSY(false)) {
+                // should fail here.
+            }
+            controller.SelectDevice(devsel, atapi);
+
+            //DebugStub.Print(" IDE GetDeviceIdentification starting\n");
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                controller.SetIdentifyInProgress(true);
+                controller.PollDRDY(true);
+                byte cmd = (atapi)? (byte)IdeCommand.IdentifyPacketDevice:
+                                    (byte)IdeCommand.IdentifyDevice;
+                controller.WriteCommandPort(cmd); //will post interrupt
+                controller.Delay400ns();
+                Tracing.Log(Tracing.Debug,"status={0}",(UIntPtr) controller.ReadFullStatus());
+                controller.PollDRDY(true); // Device indicates ready.
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            IdeConfig config = controller.GetConfig();
+            bool success = (config != null) && config.IdentifyEndEvent.WaitOne(TimeSpan.FromMilliseconds(250));
+
+            if (!success) {
+                //DebugStub.Break();
+                Tracing.Log(Tracing.Debug," IDE GetDeviceIdentification did NOT receive  interrupt\n");
+                controller.SetIdentifyInProgress(false);
+            }
+
+            //DebugStub.Print(" IDE GetDeviceIdentification received interrupt\n");
+
+            // XXX: We should check for an Error condition here.
+            // XXX: We should check for the ATAPI signature here.
+
+            byte statusBits = controller.ReadAlternateStatusPort();
+            if ((statusBits & (byte)ATA6.IdeStatus.ERR) > 0) {
+                Tracing.Log(Tracing.Debug,"ERR reported in status after IdentifyDevice!\n");
+                DebugStub.Break();
+            }
+
+            for (int i = 0; i < 256; i++) {
+                identifyData[i] = controller.ReadDataPort();
+            }
+
+            IdentifyDeviceInformation ident = ParseIdentifyInformation(identifyData);
+
+////        if (atapi)
+            if (ident.ModelNumber == "Virtual CD") // SECTOR_SIZE is actually 2048
+                ident.MaxLBASectors = 650 * 1024 * 1024 / IdeRequest.SECTOR_SIZE;
+                                                   // for IdeDisk::ReadWrite tests
+            return ident;
+        }
+
+        public static void DebugQueryStatus(IdeController! controller)
+        {
+            byte statusBits = controller.ReadAlternateStatusPort();
+            byte errorBits = controller.ReadErrorPort();
+
+            Tracing.Log(Tracing.Debug,"ATAcontroller: Status Register({0:x2}): ",statusBits);
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte) ATA6.IdeStatus.BSY) > 0)
+                        ? "BSY " : "!bsy ");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.DRDY) > 0)
+                        ? "DRDY " : "!drdy ");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.DWF) > 0)
+                        ? "DWF " : "!dwf ");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.DSC) > 0)
+                        ? "DSC " : "!dsc ");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.DRQ) > 0)
+                        ? "DRQ " : "!drq ");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.CORR) > 0)
+                        ? "CORR " : "!corr ");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.IDX) > 0)
+                        ? "IDX " : "!idx");
+            Tracing.Log(Tracing.Debug, ((statusBits & (byte)ATA6.IdeStatus.ERR) > 0)
+                        ? "ERR " : "!err ");
+            Tracing.Log(Tracing.Debug,"\n");
+
+            Tracing.Log(Tracing.Debug,"ATAcontroller: Error Register:({0:x2}): ",errorBits);
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.UNC) > 0)
+                        ? "UNC " : "!unc ");
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.MC) > 0)
+                        ? "MC " : "!mc ");
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.IDNF) > 0)
+                        ? "IDNF " : "!idnf ");
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.ABRT) > 0)
+                        ? "ABRT " : "!abrt ");
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.MCR) > 0)
+                        ? "MCR " : "!mcr ");
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.TK0NF) > 0)
+                        ? "TK0NF " : "!tk0nf ");
+            Tracing.Log(Tracing.Debug, ((errorBits & (byte)ATA6.IdeError.AMNF) > 0)
+                        ? "AMNF " : "!amnf ");
+            Tracing.Log(Tracing.Debug,"\n");
+
+            ushort lbaLow = controller.ReadLBALowPort();
+            ushort lbaMid = controller.ReadLBAMidPort();
+            ushort lbaHigh = controller.ReadLBAHighPort();
+            Tracing.Log(Tracing.Debug,"LBA={0:x2},{1:x2},{2:x2}\n",
+                        (UIntPtr)lbaHigh, (UIntPtr)lbaMid, (UIntPtr)lbaLow);
+        }
+
+        public enum IdeCommand
+        {
+            Nop                     = 0x00,
+            Read                    = 0x20,
+            ReadNoRetry             = 0x21,
+            ReadLong                = 0x22,
+            ReadLongNoRetry         = 0x23,
+            ReadDmaExt              = 0x25,
+            ReadDmaQueuedExt        = 0x26,
+            ReadNativeMaxAddressExt = 0x27, 
+            Write                   = 0x30,
+            WriteNoRetry            = 0x31,
+            WriteLong               = 0x32,
+            WriteLongNoRetry        = 0x33,
+            WriteDmaExt             = 0x35,
+            WriteDmaQueuedExt       = 0x36,
+            WriteVerify             = 0x3C,
+            ReadVerify              = 0x40,
+            ReadVerifyNoRetry       = 0x41,
+            FormatTrack             = 0x50,
+            Seek                    = 0x70,
+            ExecuteDeviceDiagnostic = 0x90,
+            InitializeDeviceParameters = 0x91,
+            DownloadMicrocode       = 0x92,
+            AtapiPacket             = 0xA0,
+            IdentifyPacketDevice    = 0xA1,
+            ReadMultiple            = 0xC4,
+            WriteMultiple           = 0xC5,
+            SetMultipleMode         = 0xC6,
+            ReadDmaQueued           = 0xC7,
+            ReadDmaRetry            = 0xC8,
+            ReadDmaNoRetry          = 0xC9,
+            WriteDmaRetry           = 0xCA,
+            WriteDmaNoRetry         = 0xCB,
+            WriteDmaQueued          = 0xCC,
+            AcknowledgeMediaChange  = 0xDB,
+            BootPostBoot            = 0xDC,
+            BootPreBoot             = 0xDD,
+            DoorLock                = 0xDE,
+            DoorUnLock              = 0xDF,
+            ReadBuffer              = 0xE4,
+            WriteBuffer             = 0xE8,
+            WriteSame               = 0xE9,
+            IdentifyDevice          = 0xEC,
+            MediaEject              = 0xED,
+            SetFeature              = 0xEF,
+        }
+
+        public enum Atapi : byte
+        {
+            DMA   = 0x01,
+            Read  = 0x28,
+        }
+
+        public enum IdeStatus : byte
+        {
+            BSY   = 0x80,
+            DRDY  = 0x40,
+            DWF   = 0x20,
+            DSC   = 0x10,
+            DRQ   = 0x08,
+            CORR  = 0x04,
+            IDX   = 0x02,
+            ERR   = 0x01,
+        }
+        public enum IdeError
+        {
+            UNC        = 0x40,
+            MC         = 0x20,
+            IDNF       = 0x10,
+            ABRT       = 0x08,
+            MCR        = 0x04,
+            TK0NF      = 0x02,
+            AMNF       = 0x01,
+        }
+        public const byte DriveSelect = 0x10; // Low = Master, High = Slave
+
+        public const bool High = true;
+        public const bool Low = false;
+
+        public const byte DeviceControlSRST = 0x04;
+        public const byte DeviceControlnIEN = 0x02; // note active low
+        
+        // High Order Bit, used to read LBA 48 "previous" values in low,mid,and high port queues
+        public const byte DeviceControlHOB  = 0x80;
+    }
+#endregion
+}
diff --git a/base/Drivers/Drivers.proj b/base/Drivers/Drivers.proj
new file mode 100644
index 0000000..a0986a6
--- /dev/null
+++ b/base/Drivers/Drivers.proj
@@ -0,0 +1,14 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <ItemGroup>
+    <ProjectReference Include="Sb16\Sb16.csproj" />
+    <ProjectReference Include="Transforms\DriverTransform.csproj" />
+    <ProjectReference Include="Disk\Disk.csproj" />
+    <ProjectReference Include="LegacyKeyboard\LegacyKeyboard.csproj" />
+    <ProjectReference Include="Network\Tulip\Tulip.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+
+</Project>
diff --git a/base/Drivers/LegacyKeyboard/LegacyKeyboard.csproj b/base/Drivers/LegacyKeyboard/LegacyKeyboard.csproj
new file mode 100644
index 0000000..715db5a
--- /dev/null
+++ b/base/Drivers/LegacyKeyboard/LegacyKeyboard.csproj
@@ -0,0 +1,26 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>LegacyKeyboard</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="LegacyKeyboard.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/LegacyKeyboard/LegacyKeyboard.sg b/base/Drivers/LegacyKeyboard/LegacyKeyboard.sg
new file mode 100644
index 0000000..c8c4ade
--- /dev/null
+++ b/base/Drivers/LegacyKeyboard/LegacyKeyboard.sg
@@ -0,0 +1,815 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LegacyKeyboard.cs
+//
+//  Note:
+//      /pnp/PNP0303: A0=IO:0060[1] A1=IO:0064[1] A2=IRQ:01
+//
+//  Useful refs:
+//      http://panda.cs.ndsu.nodak.edu/~achapwes/PICmicro/keyboard/atkeyboard.html
+//      http://members.tripod.com/~oldboard/assembly/keyboard_commands.html
+//      http://members.tripod.com/~oldboard/assembly/8042.html
+//
+
+//#define DEBUG_DISPATCH_IO
+//#define DEBUG_IO
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Runtime.CompilerServices;  //StructAlign attribute
+using System.Runtime.InteropServices;   //structLayout attribute
+using System.GCs;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Keyboard;
+using Microsoft.Singularity.Configuration;
+
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+
+namespace Microsoft.Singularity.Drivers.LegacyKeyboard
+{
+    // Should also support PNP0F13: PS/2 Mouse
+    // [Signature("/pnp/PNP0F13")]
+    // [IoIrqRange(0, Default = 0x0c)]
+    // [Follows("/pnp/PNP0303")]
+
+    // create the resource object for LTR to fill in
+    [DriverCategory]
+    [Signature("/pnp/PNP0303")]
+    internal class KeyboardResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x0060, Length = 0x01)]
+        internal IoPortRange keyboard;
+
+        [IoPortRange(1, Default = 0x0064, Length = 0x01)]
+        internal IoPortRange controller;
+
+        [IoIrqRange(2, Default = 0x01)]
+        internal IoIrqRange irq;
+
+        [ExtensionEndpoint]
+        internal TRef<ExtensionContract.Exp:Start> ec;
+
+        [ServiceEndpoint(typeof(KeyboardDeviceContract))]
+        internal TRef<ServiceProviderContract.Exp:Start> kbdsp;
+
+        // This should have a custom attribute.
+        internal static KeyboardResources Values;
+
+        // LTR will create the rest of this class:
+
+        // LTR creates a private constructor so that the app writer can't
+        // instantiate objects of this class
+        private KeyboardResources()
+        {
+            // endpoint initialization
+            ec = new TRef<ExtensionContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(0) as ExtensionContract.Exp));
+            kbdsp = new TRef<ServiceProviderContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(1) as ServiceProviderContract.Exp));
+
+            // Io Resource initialization
+            IoConfig config = (!)IoConfig.GetConfig();
+
+            // dynamic resources
+            keyboard = (IoPortRange)config.DynamicRanges[0];   // LTR from [Index]
+            controller = (IoPortRange)config.DynamicRanges[1];
+            irq = (IoIrqRange)config.DynamicRanges[2];
+
+            base();
+        }
+
+        static KeyboardResources()
+        {
+            Values = new KeyboardResources();
+        }
+    }
+
+    public class KeyboardControl
+    {
+        private static Keyboard8042 device;
+
+        public static int Main(String[] args)
+        {
+#if VERBOSE
+            DebugStub.WriteLine("LegacyKeyboard driver started.");
+            for (int i = 0; i < args.Length; i++) {
+                DebugStub.WriteLine("  {0}. [{1}]", __arglist(i, args[i]));
+            }
+#endif
+
+            // Create the device.
+            device = new Keyboard8042(KeyboardResources.Values);
+            if (!device.Initialize()) {
+                return 1;
+            }
+
+            // get the endpoints and set up the main switch receive
+            ExtensionContract.Exp ec = KeyboardResources.Values.ec.Acquire();
+            ServiceProviderContract.Exp sp = KeyboardResources.Values.kbdsp.Acquire();
+
+            Tracing.Log(Tracing.Audit, "Registered");
+
+            ec.SendSuccess();
+
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        // Listen for new connections
+                        case sp.Connect(candidate):
+                            KeyboardDeviceContract.Exp newClient = candidate as KeyboardDeviceContract.Exp;
+                            if (newClient != null) {
+                                KeyboardChannel.CreateThread(device, newClient);
+                                sp.SendAckConnect();
+                            }
+                            else {
+                                sp.SendNackConnect(candidate);
+                            }
+                            break;
+
+                            // Listen for extension parent
+                        case ec.Shutdown():
+                            ec.SendAckShutdown();
+                            run = false;
+                            break;
+
+                        case sp.ChannelClosed():
+                            Tracing.Log(Tracing.Debug, "Keyboard driver no longer needed.");
+                            run = false;
+                            break;
+                    }
+                }
+            }
+            finally {
+                delete sp;
+                Tracing.Log(Tracing.Debug, "Keyboard finished message pump.");
+            }
+
+            // Close the device
+            device.Finalize();
+
+            Tracing.Log(Tracing.Audit, "Shutdown");
+            delete ec;
+
+            return 0;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  This worker thread processes incoming play requests.
+    //
+    public class KeyboardChannel
+    {
+        private TRef<KeyboardDeviceContract.Exp:Start> epStart;
+        private Keyboard8042! device;
+
+
+        public static void CreateThread(Keyboard8042! device,
+                                        [Claims] KeyboardDeviceContract.Exp:Start! ep)
+        {
+            KeyboardChannel! channel = new KeyboardChannel(device, ep);
+            Thread! thread = new Thread(new ThreadStart(channel.MessagePump));
+            Tracing.Log(Tracing.Audit, "KeyboardChannel starting thread {0:x}",
+                        AppRuntime.AddressOf(thread));
+            thread.Start();
+        }
+
+        private KeyboardChannel(Keyboard8042! device,
+                                [Claims] KeyboardDeviceContract.Exp:Start! ep)
+        {
+            this.device = device;
+            this.epStart = new TRef<KeyboardDeviceContract.Exp:Start>(ep);
+            base();
+        }
+
+        private void MessagePump()
+        {
+            Tracing.Log(Tracing.Debug, "KeyboardChannel.Run entered.");
+            KeyboardDeviceContract.Exp! ep = epStart.Acquire();
+            epStart = null;
+
+            try {
+                ep.SendSuccess();
+
+                for (bool run = true; run;) {
+                    uint key;
+
+                    switch receive {
+                        case ep.GetKey():
+                            Tracing.Log(Tracing.Debug, "GetKey()");
+                            key = device.WaitForKey();
+                            Tracing.Log(Tracing.Debug, "GetKey() => {0:x8}", key);
+                            ep.SendAckKey(key);
+                            break;
+
+                        case ep.ChannelClosed():
+                            Tracing.Log(Tracing.Debug, "peer closed channel.");
+                            run = false;
+                            break;
+                    }
+                }
+            }
+            finally {
+                delete ep;
+            }
+            Tracing.Log(Tracing.Debug, "KeyboardChannel exiting.");
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  Underlying device implementation.
+    //
+    public class Keyboard8042
+    {
+        internal Keyboard8042(KeyboardResources! res)
+        {
+            keyboardPort = res.keyboard.PortAtOffset(0, 1, Access.ReadWrite);
+            controllerPort = res.controller.PortAtOffset(0, 1, Access.ReadWrite);
+            irq = res.irq.IrqAtOffset(0);
+        }
+
+        private IoIrq   irq;
+        private IoPort  keyboardPort;
+        private IoPort  controllerPort;
+        private byte    lastCtrl = 0;
+        private bool    keyboardWorks = false;
+        private bool    mouseWorks = false;
+
+        public bool Initialize()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Tracing.Log(Tracing.Debug, "Registering Interrupt");
+                irq.RegisterInterrupt();
+
+                Tracing.Log(Tracing.Debug, "Initializing Keyboard");
+
+                byte data;
+
+                // Run a keyboard self test.
+                Tracing.Log(Tracing.Debug, "Running controller self test.");
+                Write8042Ctrl(0xaa);
+                data = ReadData();
+                Tracing.Log(Tracing.Debug, "ctrl={0:x} data={1:x}",
+                            lastCtrl, data);
+
+                if (data != 0x55) {
+                    Tracing.Log(Tracing.Debug, "Controller self test failed: {0:x}",
+                                data);
+                    return false;
+                }
+
+                // Enable the keyboard.
+                Tracing.Log(Tracing.Debug, "Enabling keyboard.");
+                Write8042Ctrl(0xae);
+                Empty8042();
+
+                // Test the keyboard.
+                Tracing.Log(Tracing.Debug, "Running controller self test.");
+                Write8042Ctrl(0xab);
+                Thread.SpinWait(10);
+
+                data = ReadData();
+                Tracing.Log(Tracing.Debug, "Keyboard test: {0:x}", data);
+
+                if (data != 0xff) {
+                    keyboardWorks = true;
+                }
+
+                // Reset keyboard, but disable scanning.
+                Tracing.Log(Tracing.Debug, "Resetting keyboard.");
+                Empty8042();
+                // Write8042Ctrl(0xd2);
+                Write8042Data(0xf5);
+                Thread.SpinWait(10);
+
+                // Write the LEDs.
+                Write8042Data(0xed);
+                Write8042Data(0x07);
+
+                // Set to scan set 2.
+                Write8042Data(0xf0);
+                Write8042Data(0x02);
+                Thread.SpinWait(10);
+                data = ReadData();
+                Tracing.Log(Tracing.Debug, "select scanset: {0:x}", data);
+
+#if DONT_MOUSE
+                Tracing.Log(Tracing.Debug, "identify keyboard");
+                byte[] mouse = new byte[10];
+                Write8042Data(0xf2);
+                ReadAndPrintData(mouse);
+#endif
+
+                // Enable IBM Scancode translation
+                //
+                // Under all Microsoft operating systems, all keyboards
+                // actually transmit Scan Code Set 2 values down the wire
+                // from the keyboard to the keyboard port. These values
+                // are translated to Scan Code Set 1 by the i8042 port chip.
+                // The rest of the operating system, and all applications
+                // that handle scan codes expect the values to be from
+                // Scan Code Set 1. Scan Code Set 3 is not used or
+                // for operation of Microsoft operating systems.
+                Write8042Ctrl(0x60);
+#if DONT_USE_INTERRUPTS
+                Write8042Data(0x40);
+#else
+                Write8042Data(0x41);    // Send an interrupt as well.
+#endif
+                Empty8042();
+
+#if DONT_MOUSE
+                // Enable the mouse.
+                Write8042Ctrl(0xa8);
+                Empty8042();
+
+                // Test the mouse.
+                Write8042Ctrl(0xa9);
+                Thread.SpinWait(10);
+
+                data = ReadData();
+                Tracing.Log(Tracing.Debug, "Mouse test: {0:x}", data);
+                if (data != 0xff) {
+                    mouseWorks = true;
+                }
+
+                // Get Mouse settings.
+                Write8042Ctrl(0xd4);
+                Write8042Data(0xe9);
+                ReadAndPrintData(mouse);
+
+                // Enable the mouse.
+                Write8042Ctrl(0xd4);
+                Write8042Data(0xf4);
+
+                Tracing.Log(Tracing.Debug, "Mouse stat={0:x} res={1:x} rate={2:x}",
+                            mouse[0], mouse[1], mouse[2]);
+#endif
+
+                // Enable keyboard scan.
+                Empty8042();
+                Write8042Data(0xf4);
+                Thread.SpinWait(10);
+
+                // Write the LEDs.
+                Write8042Data(0xed);
+                Write8042Data(0x01);
+
+                for (int i = 0; i < 10; i++) {
+                    PollRaw();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+            return keyboardWorks;
+        }
+
+
+        public void Finalize()
+        {
+            irq.ReleaseInterrupt();
+        }
+
+        private void Empty8042()
+        {
+            while (((lastCtrl = controllerPort.Read8()) & 0x01) != 0) {
+                keyboardPort.Read8();
+            }
+            lastCtrl = controllerPort.WaitClear8(0x01);
+        }
+
+        private void Write8042Prep()
+        {
+            lastCtrl = controllerPort.WaitClear8(0x02);
+            Empty8042();
+            Thread.SpinWait(50);
+        }
+
+        private void Write8042Ctrl(byte value)
+        {
+            Write8042Prep();
+            controllerPort.Write8(value);
+        }
+
+        private void Write8042Data(byte value)
+        {
+            Write8042Prep();
+            keyboardPort.Write8(value);
+        }
+
+        private byte ReadData()
+        {
+            if (((lastCtrl = controllerPort.Read8()) & 0x01) == 0) {
+                Tracing.Log(Tracing.Debug, "Waiting for data ready: {0:x}", lastCtrl);
+                lastCtrl = controllerPort.WaitSet8(0x01);
+            }
+            Thread.SpinWait(50);
+            return keyboardPort.Read8();
+        }
+
+        internal void ReadAndPrintData(byte[]! data)
+        {
+            if (((lastCtrl = controllerPort.Read8()) & 0x01) == 0) {
+                Tracing.Log(Tracing.Debug, "Waiting for data ready to print: {0:x}", lastCtrl);
+                lastCtrl = controllerPort.WaitSet8(0x01);
+            }
+
+            for (int i = 0; i < data.Length; i++) {
+                if (((lastCtrl = controllerPort.Read8()) & 0x01) == 0) {
+                    Tracing.Log(Tracing.Debug, "Ctrl {0:x}", lastCtrl);
+                    break;
+                }
+                else {
+                    Tracing.Log(Tracing.Debug, "Ctrl {0:x} : ", lastCtrl);
+                }
+                Thread.SpinWait(200);
+
+                data[i] = keyboardPort.Read8();
+                unchecked {
+                    Tracing.Log(Tracing.Debug, "Data[{0}]: {1:x}",
+                                (UIntPtr)(uint)i,
+                                data[i]);
+                }
+            }
+        }
+
+        [Flags]
+        public enum Modifiers
+        {
+            CAPS_LOCK       = 0x00000001,
+            NUM_LOCK        = 0x00000002,
+
+            SHIFT_LEFT      = 0x00000100,
+            SHIFT_RIGHT     = 0x00000200,
+            SHIFT_ALL       = SHIFT_LEFT | SHIFT_RIGHT,
+            CTRL_LEFT       = 0x00000400,
+            CTRL_RIGHT      = 0x00000800,
+            CTRL_ALL        = CTRL_LEFT | CTRL_RIGHT,
+            ALT_LEFT        = 0x00001000,
+            ALT_RIGHT       = 0x00002000,
+            ALT_ALL         = ALT_LEFT | ALT_RIGHT,
+            WINDOWS_LEFT    = 0x00004000,
+            WINDOWS_RIGHT   = 0x00008000,
+            WINDOWS_ALL     = WINDOWS_LEFT | WINDOWS_RIGHT,
+        }
+
+        private uint keyModifiers = 0;
+
+        private void SetModifier(Modifiers bit, Qualifiers shared, Modifiers all, uint data)
+        {
+            if ((data & (uint)Qualifiers.KEY_UP) != 0) {
+                keyModifiers &= ~(uint)bit;
+                if ((keyModifiers & (uint)all) == 0) {
+                    keyModifiers &= (uint)~shared;
+                }
+            }
+            else {
+                keyModifiers |= (uint)bit | (uint)shared;
+            }
+        }
+
+        private void SetModifier(Modifiers bit, uint data)
+        {
+            if ((data & (uint)Qualifiers.KEY_UP) != 0) {
+                keyModifiers &= ~(uint)bit;
+            }
+            else {
+                keyModifiers |= (uint)bit;
+            }
+        }
+
+        private byte PollRawOneByte()
+        {
+            lastCtrl = controllerPort.WaitSet8(0x01);
+            Thread.SpinWait(50);
+            byte value = keyboardPort.Read8();
+#if DEBUG_IO
+            Tracing.Log(Tracing.Debug, "Data {0:x} [modifiers={1:x}]", value, keyModifiers);
+#endif
+            Thread.SpinWait(50);
+            return value;
+        }
+
+        private uint PollRaw()
+        {
+            if (((lastCtrl = controllerPort.Read8()) & 0x01) == 0) {
+                return 0;
+            }
+
+            if ((lastCtrl & 0x20) != 0) {  // Mouse
+                uint md = PollRawOneByte();
+                md |= (uint)PollRawOneByte() << 8;
+                md |= (uint)PollRawOneByte() << 16;
+
+                return (uint)((uint)Qualifiers.KEY_MOUSE | md);
+            }
+            else {
+                uint data = PollRawOneByte();
+
+                if (data >= 0x00 && data <= 0x5f) {     // Key Down
+                    return (uint)((uint)(data & 0x7f));
+                }
+                else if (data >= 0x80 && data <= 0xdf) { // Key Up
+                    return (uint)((uint)Qualifiers.KEY_UP | (data & 0x7f));
+                }
+                else if (data == 0xe0) {                // Extended
+                    data = PollRawOneByte();
+
+                    if ((data & 0x80) != 0) {
+                        return (uint)((uint)0x80 |
+                                      (uint)Qualifiers.KEY_UP |
+                                      (uint)Qualifiers.KEY_EXTENDED |
+                                      (data & 0x7f));
+                    }
+                    else {
+                        return (uint)((uint)0x80 |
+                                      (uint)Qualifiers.KEY_EXTENDED |
+                                      (data & 0x7f));
+                    }
+                }
+                else if (data == 0xe1) {                // Extended
+                    data = PollRawOneByte();
+                    if ((data & 0x80) != 0) {
+                        return (uint)((uint)0x80 |
+                                      (uint)Qualifiers.KEY_UP |
+                                      (uint)Qualifiers.KEY_EXTENDED |
+                                      (data & 0x7f));
+                    }
+                    else {
+                        return (uint)((uint)0x80 |
+                                      (uint)Qualifiers.KEY_EXTENDED |
+                                      (data & 0x7f));
+                    }
+                }
+                else {
+                    return data;
+                }
+            }
+        }
+
+        public void GetPosition(out int x, out int y)
+        {
+            x = mouseX;
+            y = mouseY;
+        }
+
+        public uint WaitForKey()
+        {
+            uint key = 0;
+
+#if DEBUG_DISPATCH_IO
+            DebugStub.WriteLine("::: Waiting for Keyboard interrupt.");
+#endif
+            irq.WaitForInterrupt();
+
+            try {
+#if DEBUG_DISPATCH_IO
+                DebugStub.WriteLine("::: Keyboard interrupt.");
+#endif
+                Tracing.Log(Tracing.Audit, "Keyboard IRQ");
+                bool iflag = Processor.DisableInterrupts();
+                try {
+                    key = Poll();
+                }
+                finally {
+                    Processor.RestoreInterrupts(iflag);
+                }
+
+#if DEBUG_DISPATCH_IO
+                DebugStub.WriteLine("::: Keyboard interrupt poll: {0:x8}", __arglist(key));
+#endif
+            }
+            finally {
+                irq.AckInterrupt();
+            }
+            return key;
+        }
+
+        public uint Poll()
+        {
+            uint data = PollRaw();
+            if (data == 0) {
+                return 0;
+            }
+
+            // Update the Modifier Flags
+            switch (data & ~(uint)Qualifiers.KEY_UP) {
+                case 0x3a:                                // Caps-Lock
+                    SetModifier(Modifiers.CAPS_LOCK, data);
+                    break;
+                case 0x45:                                // Num Lock
+                    SetModifier(Modifiers.NUM_LOCK, data);
+                    break;
+
+                case 0x2a:                                // Left Shift
+                    SetModifier(Modifiers.SHIFT_LEFT,
+                                Qualifiers.KEY_SHIFT,
+                                Modifiers.SHIFT_ALL, data);
+                    break;
+                case 0x36:                                // Right Shift
+                    SetModifier(Modifiers.SHIFT_RIGHT,
+                                Qualifiers.KEY_SHIFT,
+                                Modifiers.SHIFT_ALL, data);
+                    break;
+                case 0x1d:                                // Left Control
+                    SetModifier(Modifiers.CTRL_LEFT,
+                                Qualifiers.KEY_CTRL,
+                                Modifiers.CTRL_ALL, data);
+                    break;
+                case 0x9d:     // Right Control
+                    SetModifier(Modifiers.CTRL_RIGHT,
+                                Qualifiers.KEY_CTRL,
+                                Modifiers.CTRL_ALL, data);
+                    break;
+                case 0x38:                                // Left Alt
+                    SetModifier(Modifiers.ALT_LEFT,
+                                Qualifiers.KEY_ALT,
+                                Modifiers.ALT_ALL, data);
+                    break;
+                case 0xb8:     // Right Alt
+                    SetModifier(Modifiers.ALT_RIGHT,
+                                Qualifiers.KEY_ALT,
+                                Modifiers.ALT_ALL, data);
+                    break;
+                case 0xdb:     // Left Windows
+                    SetModifier(Modifiers.WINDOWS_LEFT,
+                                Qualifiers.KEY_WINDOWS,
+                                Modifiers.WINDOWS_ALL, data);
+                    break;
+                case 0xdc:     // Right Windows
+                    SetModifier(Modifiers.WINDOWS_RIGHT,
+                                Qualifiers.KEY_WINDOWS,
+                                Modifiers.WINDOWS_ALL, data);
+                    break;
+            }
+
+            // Encode the modifier flags into the data.
+            data |= (keyModifiers & (uint)Qualifiers.KEY_MODIFIERS);
+
+            if ((data & (uint)Qualifiers.KEY_MOUSE) != 0) {
+                // Update the cursor position.
+                // The statements here are somewhat complex because the
+                // hardware returns two 9-bit signed integers.
+                int x = ((int)unchecked((sbyte)((data & 0x10) << 3)) & ~0xff)
+                    | (int)((data >> 8) & 0xff);
+                int y = ((int)unchecked((sbyte)((data & 0x20) << 2)) & ~0xff)
+                    | (int)((data >> 16) & 0xff);
+
+                mouseX = Math.Min(Math.Max(0, mouseX + x), mouseMaxX);
+                mouseY = Math.Min(Math.Max(0, mouseY - y), mouseMaxY);
+
+                // Process the buttons.
+                uint buttons = (data & (uint)Qualifiers.MOUSE_BUTTON_ALL);
+
+                if (mouseButtons != buttons) {
+                    // Button positions changed.
+
+                    uint up = mouseButtons & (buttons ^ (uint)Qualifiers.MOUSE_BUTTON_ALL);
+                    uint dn = (mouseButtons ^ (uint)Qualifiers.MOUSE_BUTTON_ALL) & buttons;
+                    mouseButtons = buttons;
+
+                    if (dn != 0) {
+                        data = (uint)Qualifiers.KEY_DOWN | (uint)Qualifiers.KEY_MOUSE | (uint)dn;
+                    }
+                    else if (up != 0) {
+                        data = (uint)Qualifiers.KEY_UP | (uint)Qualifiers.KEY_MOUSE | (uint)up;
+                    }
+                }
+                return data;
+            }
+            else {
+                if ((data & (uint)Qualifiers.KEY_UP) == 0) {
+                    data |= (uint)Qualifiers.KEY_DOWN;
+                }
+
+                uint scan = 0;
+                if ((data & (uint)Qualifiers.KEY_SHIFT) != 0) {
+                    scan = scanShift[data & 0xff];
+                }
+                if (scan == 0) {
+                    scan = scanNormal[data & 0xff];
+                }
+
+                if (scan == 0) {
+                    Tracing.Log(Tracing.Warning, "Unmapped key: {0:x}", data & 0xff);
+                }
+
+                uint output = (data & (uint)~0xff) | scan;
+
+#if DEBUG_IO
+                Tracing.Log(Tracing.Debug, "output {0:x}", output);
+#endif
+                return output;
+            }
+        }
+
+        private uint mouseButtons = 0;
+        private int mouseX = 0;
+        private int mouseY = 0;
+        private int mouseMaxX = 1024;
+        private int mouseMaxY = 768;
+
+        private char[] scanNormal = new char [0x100]
+        {
+            // 0     1     2     3     4     5     6     7
+            // 8     9     a     b     c     d     e     f
+            '\0', (char)Keys.ESCAPE,  '1',  '2',  '3',  '4',  '5',  '6',     // 0x00..0x07
+            '7' ,  '8',  '9',  '0',  '-',  '=', '\b', '\t',     // 0x08..0x0f
+            'q' ,  'w',  'e',  'r',  't',  'y',  'u',  'i',     // 0x10..0x17
+            'o' ,  'p',  '[',  ']', '\n', (char)Keys.LEFT_CTRL,  'a',  's',     // 0x18..0x1f
+            'd' ,  'f',  'g',  'h',  'j',  'k',  'l',  ';',     // 0x20..0x27
+            '\'',  '`', (char)Keys.LEFT_SHIFT, '\\',  'z',  'x',  'c',  'v',     // 0x28..0x2f
+            'b' ,  'n',  'm',  ',',  '.',  '/', (char)Keys.RIGHT_SHIFT, '\0',     // 0x30..0x37
+            (char)Keys.LEFT_ALT, ' ', (char)Keys.CAPS_LOCK, (char)Keys.F1,
+            (char)Keys.F2, (char)Keys.F3, (char)Keys.F4, (char)Keys.F5,     // 0x38..0x3f
+            (char)Keys.F6, (char)Keys.F7, (char)Keys.F8, (char)Keys.F9,
+            (char)Keys.F10, (char)Keys.NUM_LOCK, '\0', (char)Keys.HOME,     // 0x40..0x47
+            (char)Keys.UP_ARROW, (char)Keys.PAGE_UP, '\0', (char)Keys.LEFT_ARROW,
+            '\0', (char)Keys.RIGHT_ARROW, '\0', (char)Keys.END,     // 0x48..0x4f
+            (char)Keys.DOWN_ARROW, (char)Keys.PAGE_DOWN, (char)Keys.INSERT, (char)Keys.DELETE,
+            (char)Keys.SYS_REQ, '\0', '\0', (char)Keys.F11,     // 0x50..0x57
+            (char)Keys.F12, '\0', '\0', '\0',
+            '\0', '\0', '\0', '\0',     // 0x58..0x5f
+
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x60..0x67
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x68..0x6f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x70..0x77
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x78..0x7f
+
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x80..0x87
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x88..0x8f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x90..0x97
+            '\0', '\0', '\0', '\0', '\n', (char)Keys.RIGHT_CTRL, '\0', '\0',     // 0x98..0x9f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xa0..0xa7
+            '\0', '\0', (Char)0xfff0, '\0', '\0', '\0', '\0', '\0',     // 0xa8..0xaf
+            '\0', '\0', '\0', '\0', '\0',  '/', '\0',  '*',     // 0xb0..0xb7
+            (char)Keys.RIGHT_ALT, '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xb8..0xbf
+            '\0', '\0', '\0', '\0',
+            '\0', (char)Keys.NUM_LOCK, '\0', (char)Keys.HOME,     // 0xc0..0xc7
+            (char)Keys.UP_ARROW, (char)Keys.PAGE_UP, '\0', (char)Keys.LEFT_ARROW,
+            '\0', (char)Keys.RIGHT_ARROW, '\0', (char)Keys.END,     // 0xc8..0xcf
+            (char)Keys.DOWN_ARROW, (char)Keys.PAGE_DOWN, (char)Keys.INSERT, (char)Keys.DELETE,
+            '\0', '\0', '\0', '\0',     // 0xd0..0xd7
+            '\0', '\0', '\0', (char)Keys.LEFT_WINDOWS,
+            (char)Keys.RIGHT_WINDOWS, (char)Keys.MENU, '\0', '\0',     // 0xd8..0xdf
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xe0..0xe7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xe8..0xef
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xf0..0xf7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xf8..0xff
+        };
+
+        private char[] scanShift = new char [0x100]
+        {
+            // 0     1     2     3     4     5     6     7
+            // 8     9     a     b     c     d     e     f
+            '\0', '\0',  '!',  '@',  '#',  '$',  '%',  '^',     // 0x00..0x07
+            '&' ,  '*',  '(',  ')',  '_',  '+', '\b', '\t',     // 0x08..0x0f
+            'Q' ,  'W',  'E',  'R',  'T',  'Y',  'U',  'I',     // 0x10..0x17
+            'O' ,  'P',  '{',  '}', '\n', '\0',  'A',  'S',     // 0x18..0x1f
+            'D' ,  'F',  'G',  'H',  'J',  'K',  'L',  ':',     // 0x20..0x27
+            '\"',  '~', '\0',  '|',  'Z',  'X',  'C',  'V',     // 0x28..0x2f
+            'B' ,  'N',  'M',  '<',  '>',  '?', '\0', '\0',     // 0x30..0x37
+            '\0',  ' ', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x38..0x3f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x40..0x47
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x48..0x4f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x50..0x57
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x58..0x5f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x60..0x67
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x68..0x6f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x70..0x77
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x78..0x7f
+
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x80..0x87
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x88..0x8f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x90..0x97
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0x98..0x9f
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xa0..0xa7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xa8..0xaf
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xb0..0xb7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xb8..0xbf
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xc0..0xc7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xc8..0xcf
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xd0..0xd7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xd8..0xdf
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xe0..0xe7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xe8..0xef
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xf0..0xf7
+            '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',     // 0xf8..0xff
+        };
+    }
+}
diff --git a/base/Drivers/Network/Tulip/Tulip.csproj b/base/Drivers/Network/Tulip/Tulip.csproj
new file mode 100644
index 0000000..75307df
--- /dev/null
+++ b/base/Drivers/Network/Tulip/Tulip.csproj
@@ -0,0 +1,39 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Tulip</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Tulip.sg" />
+    <Compile Include="TulipConstants.cs" />
+    <Compile Include="TulipController.sg" />
+    <Compile Include="TulipDebug.cs" />
+    <Compile Include="TulipDeviceChannel.sg" />
+    <Compile Include="TulipEventRelay.sg" />
+    <Compile Include="TulipResources.sg" />
+    <Compile Include="TulipRxRingBuffer.sg" />
+    <Compile Include="TulipTxRingBuffer.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Drivers.Net\Drivers.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Net.Contracts\Io.Net.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/Network/Tulip/Tulip.sg b/base/Drivers/Network/Tulip/Tulip.sg
new file mode 100644
index 0000000..79cdbc1
--- /dev/null
+++ b/base/Drivers/Network/Tulip/Tulip.sg
@@ -0,0 +1,900 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Tulip.cs
+//
+//  Simple Driver for DEC 21140a PCI Ethernet card.  (as used in Virtual PC)
+//
+//  Useful reference URLs:
+//      http://www.intel.com/design/network/manuals/21140ahm.pdf
+//
+//  TODO:
+//   - MII support
+//   - Loss of Carrier / No Carrier Handling
+//   - Promiscuous mode switching
+//   - Filtering
+//   - Receive Watchdog / Jabber Handling
+//   - Event Counters
+//   - Review why is this driver using I/O ports.
+//
+//  NB: This code is only tested on Virtual PC 2007 and would probably have
+//  error handling issues on real hardware.
+
+using System;
+using System.Threading;
+using System.Diagnostics;
+using System.Collections;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.V1.Services;
+using Drivers.Net;
+using Microsoft.Singularity.Drivers;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal class Tulip
+    {
+        internal const uint MaxRxPackets            = 512;
+        internal const uint MaxTxPackets            = 512;
+        internal const uint MaxRxFragmentsPerPacket = 1;
+        internal const uint MaxTxFragmentsPerPacket = 8;
+        internal const uint MaxRxFragmentsInRing    = MaxRxPackets * MaxRxFragmentsPerPacket;
+        internal const uint MaxTxFragmentsInRing    = MaxTxPackets * MaxTxFragmentsPerPacket;
+        internal const uint MtuBytes = 1514;
+
+        internal const uint SetupFrameBytes    = 192;
+        private const uint  BytesPerDescriptor = 16;
+
+        // MAC address
+        private EthernetAddress macAddress;
+        private uint unit;
+
+        // State for tracking controllers sharing serial rom
+        private static EthernetAddress macBase;
+        private static uint lastUnit = 0;
+
+        // PCI stuff
+        private PciDeviceConfig! config;
+
+        // CSRs
+        private IoPort! csr0;
+        private IoPort! csr1;
+        private IoPort! csr2;
+        private IoPort! csr3;
+        private IoPort! csr4;
+        private IoPort! csr5;
+        private IoPort! csr6;
+        private IoPort! csr7;
+        private IoPort! csr8;
+        private IoPort! csr9;
+        private IoPort! csr10;
+        private IoPort! csr11;
+        private IoPort! csr12;
+        private IoPort! csr15;
+        private IoIrq!  irq;
+
+        private TulipTxRingBuffer! txRing;
+        private TulipRxRingBuffer! rxRing;
+
+        private EthernetAddress ethernetAddress;
+
+        private TulipEventRelay eventRelay;
+
+        private Thread        irqWorker;
+        private volatile uint irqLastStatus;
+        private volatile bool irqWorkerStop;
+        private volatile bool isShutdown = false;
+
+        // Constructor
+        internal Tulip(TulipResources! res)
+        {
+            TulipDebug.Print("Tulip: Initialize() called\n");
+
+            assume res.csr != null;
+            assume res.irq != null;
+
+            csr0  = (!)res.csr.PortAtOffset(0x00, 4, Access.ReadWrite);
+            csr1  = (!)res.csr.PortAtOffset(0x08, 4, Access.Write);
+            csr2  = (!)res.csr.PortAtOffset(0x10, 4, Access.Write);
+            csr3  = (!)res.csr.PortAtOffset(0x18, 4, Access.ReadWrite);
+            csr4  = (!)res.csr.PortAtOffset(0x20, 4, Access.ReadWrite);
+            csr5  = (!)res.csr.PortAtOffset(0x28, 4, Access.ReadWrite);
+            csr6  = (!)res.csr.PortAtOffset(0x30, 4, Access.ReadWrite);
+            csr7  = (!)res.csr.PortAtOffset(0x38, 4, Access.ReadWrite);
+            csr8  = (!)res.csr.PortAtOffset(0x40, 4, Access.Read);
+            csr9  = (!)res.csr.PortAtOffset(0x48, 4, Access.ReadWrite);
+            csr10 = (!)res.csr.PortAtOffset(0x50, 4, Access.Read);
+            csr11 = (!)res.csr.PortAtOffset(0x58, 4, Access.ReadWrite);
+            csr12 = (!)res.csr.PortAtOffset(0x60, 4, Access.ReadWrite);
+            csr15 = (!)res.csr.PortAtOffset(0x78, 4, Access.ReadWrite);
+
+            irq = (!)res.irq.IrqAtOffset(0);
+            TulipDebug.Print("Tulip IRQ {0}\n", __arglist(res.irq.ToString()));
+
+            PciDeviceConfig! config = this.config = (PciDeviceConfig!)IoConfig.GetConfig();
+            Debug.Assert((config.InterruptsEnabled));
+
+            this.txRing = new TulipTxRingBuffer(MaxTxPackets,
+                                                MaxTxFragmentsInRing);
+            this.rxRing = new TulipRxRingBuffer(MaxRxFragmentsInRing);
+        }
+
+        internal void StartIo()
+        {
+            Debug.Assert(irqWorker == null);
+            TulipDebug.Print("StartIo\n");
+
+            if (isShutdown) {
+                return;
+            }
+
+            csr6.Write32(CSR6.MBO | CSR6.HBD | CSR6.PS | (3u << CSR6.TR_ROLL) |
+                         CSR6.ST);
+            WriteStandardSetupFrame();
+
+            // Write CSR6 to start receive and transmit processes
+            //
+            // This is taken from the state remaining after pxeboot.
+            // == 100Mb/s MII/SYM (table 3-43 entry 1000)
+            csr6.Write32(CSR6.MBO | CSR6.HBD | CSR6.PS | (3u << CSR6.TR_ROLL) |
+                         CSR6.ST | CSR6.SR);
+
+            TulipDebug.Print("Programmed CSR values...\n");
+            TulipDebug.PrintCsrs(csr0, csr1, csr2, csr3, csr4, csr5, csr6,
+                                 csr7, csr8, csr9, csr10, csr11, csr12, csr15);
+
+            TulipDebug.Print("CFCS: {0:x4} {1:x4}\n",
+                             __arglist(config.Control, config.Status));
+
+            irqWorkerStop = false;
+            irqWorker     = new Thread(new ThreadStart(this.IrqWorkerMain));
+            irqWorker.Start();
+        }
+
+        internal void StopIo()
+        {
+            if (irqWorker != null) {
+                // Set stop flag, wake-up irqWorker thread, then wait.
+                irqWorkerStop = true;
+                irq.Pulse();
+                irqWorker.Join();
+                irqWorker = null;
+            }
+        }
+
+        internal void Shutdown()
+        {
+            isShutdown = true;
+            StopIo();
+        }
+
+        public bool IsShutdown { get { return isShutdown; } }
+
+        private void InitChains()
+        {
+            TulipDebug.Print("InitChains(rx = {0}, tx = {1})\n",
+                             __arglist(MaxRxFragmentsInRing,
+                                       MaxTxFragmentsInRing));
+
+            // Turn off receive and transmit
+            uint mode = csr6.Read32();
+            mode &= ~(CSR6.SR | CSR6.ST);
+            csr6.Write32(mode);
+
+            this.rxRing.Reset();
+            csr3.Write32(this.rxRing.BaseAddress.ToUInt32());
+
+            this.txRing.Reset();
+            csr4.Write32(this.txRing.BaseAddress.ToUInt32());
+        }
+
+        // Device methods
+        internal void Initialize()
+        {
+            TulipDebug.Print("Tulip: Initialize() called\n");
+
+            // Dump config registers
+            TulipDebug.Print("Initial CSR values...\n");
+            TulipDebug.PrintCsrs(csr0, csr1, csr2, csr3, csr4, csr5, csr6,
+                                 csr7, csr8, csr9, csr10, csr11, csr12, csr15);
+
+            // Perform reset to clear out any state we may have left over
+            // from pxeboot.
+            csr0.Write32(CSR0.SWR);
+
+            TulipDebug.Print("Reset and new CSR values...\n");
+            TulipDebug.PrintCsrs(csr0, csr1, csr2, csr3, csr4, csr5, csr6,
+                                 csr7, csr8, csr9, csr10, csr11, csr12, csr15);
+
+            // Pull Serial Rom and parse data
+            byte[]! srom = PullSRom();
+            TulipDebug.PrintBytes("SROM", srom);
+
+            // Assign mac address.  Note we may have multiple
+            // phy's sharing the same rom and multiple cards and
+            // the below is not foolproof.
+            EthernetAddress macRom = EthernetAddress.ParseBytes(srom, 20);
+            if (macBase != macRom) {
+                macBase = macRom;
+                unit = 0;
+            } else {
+                unit = lastUnit + 1;
+            }
+
+            macAddress = macRom;
+            for (int i = 1; i < unit; i++) {
+                macAddress++;
+            }
+            lastUnit = unit;
+
+            // Register Interrupt
+            if (irq.RegisterInterrupt() == false) {
+                DebugStub.Break();
+            }
+
+            // Figure out PCI cache bits for csr0
+            // Not sure this is sane.
+            uint cls = config.CacheLineSize;
+            uint cacheBits = CSR0.WIE | CSR0.RLE | CSR0.RME;
+            if (cls < 8 || cls > 32) {
+                cls = 0;
+                cacheBits = 0;
+            }
+
+            InitChains();
+
+            // Write CSR0 to set global host bus operating parameters
+            csr0.Write32(cacheBits | CSR0.BAR |
+                         ((cls / 8u) << CSR0.CAL_ROLL) |
+                         (cls << CSR0.PBL_ROLL));
+
+            // This is a debug helper and could be used to switch to
+            // polling mode.
+            //
+            StartPeriodicTimer(TimeSpan.FromMilliseconds(1000));
+
+            // And remember to enable the timer interrupt below CSR7.GPT
+
+            // Write CSR7 to mask unnecessary interrupts
+            csr7.Write32(CSR7.AI | CSR7.RI | CSR7.TI | CSR7.GPT);
+        }
+
+        internal void Finalize()
+        {
+            irq.ReleaseInterrupt();
+
+            // Get worker thread to end main loop.  When it terminates
+            irqWorkerStop = true;
+
+            TulipDebug.Print("Tulip: Finalize() called\n");
+        }
+
+        internal string! Name
+        {
+            get { return "DE2114x Ethernet"; }
+        }
+
+        internal string! Version
+        {
+            get { return "0.1"; }
+        }
+
+        internal EthernetAddress HardwareAddress
+        {
+            get { return macAddress; }
+        }
+
+        internal byte[]! HardwareAddressBytes
+        {
+            get {
+                byte [] tmp = macAddress.GetAddressBytes();
+                if (tmp != null) return tmp;
+                return new byte[6] { 0, 0, 0, 0, 0, 0 };
+            }
+        }
+
+        internal uint LinkSpeed
+        {
+            get { return 10 * 1000 * 1000; }
+        }
+
+        internal EthernetAddress BssId
+        {
+            get { return EthernetAddress.Zero; }
+        }
+
+        private void ReceivePollDemand()
+        {
+            csr2.Write32(1);
+        }
+
+        internal void GetReceivedPackets(PacketFifo*! in ExHeap fifo)
+        {
+            rxRing.Pop(fifo);
+            //            ReceivePollDemand();
+        }
+
+        internal void ReceivePackets(PacketFifo*! in ExHeap fifo)
+            ensures fifo->Count == 0;
+        {
+            rxRing.Push(fifo);
+            ReceivePollDemand();
+        }
+
+        private void TransmitPollDemand()
+        {
+            csr1.Write32(1);
+        }
+
+        internal void GetTransmittedPackets(PacketFifo*! in ExHeap fifo)
+        {
+            txRing.Pop(fifo);
+            TransmitPollDemand();
+        }
+
+        internal void TransmitPackets(PacketFifo*! in ExHeap fifo)
+            ensures fifo->Count == 0;
+        {
+            txRing.Push(fifo);
+            TransmitPollDemand();
+        }
+
+
+        //
+        // IrqWorker thread and related event notification setter
+        //
+
+        internal void SetEventRelay(TulipEventRelay theEventRelay)
+        {
+            eventRelay = theEventRelay;
+        }
+
+        private void StartPeriodicTimer(TimeSpan period)
+        {
+            long ticksPerBit;
+
+            uint mode = csr6.Read32();
+            if ((mode & (CSR6.PS | CSR6.TTM)) != 0) {
+                // 10 MB port
+                ticksPerBit = 2048;
+            } else if ((mode & (CSR6.PS | CSR6.TTM | CSR6.PCS | CSR6.SCR)) ==
+                       (CSR6.PS | CSR6.TTM)) {
+                // 10 MB MII/SYM
+                ticksPerBit = 8192;
+            } else {
+                // 100 MB
+                ticksPerBit = 819;
+            }
+
+            long bv = period.Ticks / ticksPerBit;
+            if (bv > 0xffff)
+                bv = 0xffff;
+
+            csr11.Write32(0x10000 | (uint)bv);
+        }
+
+        private void IrqWorkerMain()
+        {
+            Tracing.Log(Tracing.Debug, "Start worker thread.");
+
+            // Grab IoPorts used locally from instance so other threads
+            // can not use them.
+
+            while (irqWorkerStop == false) {
+                uint status = 0;
+
+                while (status == 0) {
+                    irq.WaitForInterrupt();
+                    status = csr5.Read32() & CSR5.VALID;
+                }
+                DumpCsr5(status);
+                rxRing.DumpOwnership("Interrupt");
+
+                uint tulipEvent = TulipEvent.NoEvent;
+                if ((status & (CSR5.EB|CSR5.FBE)) != 0) {
+                    TulipDebug.Print("Error: csr5.EB = {0} csr5.FBE = {1}\n",
+                                     __arglist(status & CSR5.EB, status & CSR5.FBE));
+                    DebugStub.Break();
+                }
+
+                if ((status & CSR5.RWT) != 0) {
+                }
+
+                if ((status & CSR5.TJT) != 0) {
+                }
+
+                if ((status & CSR5.AIS) != 0) {
+                    txRing.ClearTransmitError();
+                    TransmitPollDemand();
+                }
+
+                if ((status & (CSR5.RI | CSR5.RPS)) != 0) {
+                    tulipEvent |= TulipEvent.ReceiveEvent;
+                }
+
+                if ((status & CSR5.TI) != 0) {
+                    tulipEvent |= TulipEvent.TransmitEvent;
+                }
+
+                // Clear status bits
+                csr5.Write32(status);
+
+                // Enable interrupts
+                //                csr7.Write32(CSR7.AI | CSR7.RI | CSR7.TI );
+
+                // Acknowledge Interrupt
+                irq.AckInterrupt();
+
+                // Announce events
+                if (eventRelay != null) {
+                    eventRelay.ForwardEvent(tulipEvent);
+                }
+            }
+
+            // Perform software reset to stop processing
+            csr0.Write32(CSR0.SWR);
+
+            TulipDebug.Print("Tulip Stopped.");
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_TULIP") ]
+        private static void DumpCsr5(uint v)
+        {
+            v &= CSR5.VALID;
+
+            TulipDebug.Print("CSR5 : {0:x8} ", __arglist(v));
+
+            uint eb = (v >> CSR5.EB_ROLL) & CSR5.EB_MASK;
+            if ((v & CSR5.FBE) != 0) {
+                TulipDebug.Print("Fatal bus error: {0}\n", __arglist(eb));
+                return;
+            }
+
+            uint ts = (v >> CSR5.TS_ROLL) & CSR5.TS_MASK;
+            switch (ts) {
+                case 0: TulipDebug.Print("TS - STOPPED     ");  break;
+                case 1: TulipDebug.Print("TS - RUN (Fetch) ");  break;
+                case 2: TulipDebug.Print("TS - RUN (Wait)  ");  break;
+                case 3: TulipDebug.Print("TS - RUN (Fifo)  ");  break;
+                case 4: TulipDebug.Print("TS - RESERVED    ");  break;
+                case 5: TulipDebug.Print("TS - RUN (Setup) ");  break;
+                case 6: TulipDebug.Print("TS - Suspended   ");  break;
+                case 7: TulipDebug.Print("TS - RUN (Close) ");  break;
+            }
+
+            uint rs = (v >> CSR5.RS_ROLL) & CSR5.RS_MASK;
+            switch (rs) {
+                case 0: TulipDebug.Print("RS - STOPPED     ");  break;
+                case 1: TulipDebug.Print("RS - RUN (Fetch) ");  break;
+                case 2: TulipDebug.Print("RS - RUN (Check) ");  break;
+                case 3: TulipDebug.Print("RS - RUN (Wait)  ");  break;
+                case 4: TulipDebug.Print("RS - Suspended ) ");  break;
+                case 5: TulipDebug.Print("RS - RUN (Close) ");  break;
+                case 6: TulipDebug.Print("RS - RUN (Flush) ");  break;
+                case 7: TulipDebug.Print("RS - RUN (Queue) ");  break;
+            }
+
+            if ((v & CSR5.NIS) != 0) TulipDebug.Print("NIS ");
+            if ((v & CSR5.AIS) != 0) TulipDebug.Print("AIS ");
+            if ((v & CSR5.ERI) != 0) TulipDebug.Print("ERI ");
+            if ((v & CSR5.FBE) != 0) TulipDebug.Print("FBE ");
+            if ((v & CSR5.GTE) != 0) TulipDebug.Print("GTE ");
+            if ((v & CSR5.ETI) != 0) TulipDebug.Print("ETI ");
+            if ((v & CSR5.RWT) != 0) TulipDebug.Print("RWT ");
+            if ((v & CSR5.RPS) != 0) TulipDebug.Print("RPS ");
+            if ((v & CSR5.RU)  != 0) TulipDebug.Print("RU ");
+            if ((v & CSR5.RI)  != 0) TulipDebug.Print("RI ");
+            if ((v & CSR5.UNF) != 0) TulipDebug.Print("UNF ");
+            if ((v & CSR5.TJT) != 0) TulipDebug.Print("TJT ");
+            if ((v & CSR5.TU)  != 0) TulipDebug.Print("TU ");
+            if ((v & CSR5.TPS) != 0) TulipDebug.Print("TPS ");
+            if ((v & CSR5.TI)  != 0) TulipDebug.Print("TI ");
+
+            TulipDebug.Print("\n");
+        }
+
+
+        //
+        // SROM related methods
+        //
+
+        private uint GetSRomAddressWidth()
+        {
+            for (uint i = 6; i < 13; i++) {
+                ushort w = SRomRead16(18u, i);
+                if (w == 0) {
+                    return i - 1;
+                }
+            }
+            return 6;
+        }
+
+        private byte[]! PullSRom()
+        {
+            uint sromWidth = GetSRomAddressWidth();
+
+            byte[] b = new byte[2 << (int)sromWidth];
+
+            for (uint i = 0; i < b.Length; i += 2) {
+                ushort w = SRomRead16(i, sromWidth);
+                b[i]     = (byte) (w >> 8);
+                b[i + 1] = (byte) (w & 0xff);
+            }
+            return b;
+        }
+
+        [System.Diagnostics.Conditional("HAVE_DELAY")]
+        private static void Delay(int kernelTicks)
+        {
+            long expiry = ProcessService.GetUpTime().Ticks + kernelTicks;
+            while (ProcessService.GetUpTime().Ticks < expiry) {
+                Thread.Yield();
+            }
+        }
+
+        // --------------------------------------------------------------------
+        // MII (Based on IEEE802.3-2002 and unreviewed *and* untested).
+
+        private int MiiReadBit()
+        {
+            int result = (csr9.Read32() & CSR9.MDI) != 0 ? 1 : 0;
+
+            csr9.Write32(CSR9.MII);                 Delay(1);
+            csr9.Write32(CSR9.MII | CSR9.MDC);      Delay(1);
+            csr9.Write32(CSR9.MII);                 Delay(1);
+            return result;
+        }
+
+        private int MiiReadBits(int count)
+        {
+            int result = 0;
+            while (count-- > 0) {
+                result  = result << 1;
+                result |= MiiReadBit();
+            }
+            return result;
+        }
+
+        private int MiiRead(int phy, int register)
+            requires phy      <= 31;
+            requires register <= 31;
+        {
+            MiiWriteBits(-1, 32);  // Preamble
+            // 14 bit write, 18bit read
+            MiiWriteBits((6 << 10)  |      // Start read transaction   (2 bits)
+                         (phy << 5) |      // Phy Address              (5 bits)
+                         register, 14);    // Register                 (5 bits)
+            int value = MiiReadBits(18);
+            MiiWriteBits(0, 32);           // Idle
+            return value & 0xffff;
+        }
+
+        private void MiiWriteBit(int bit)
+            requires bit == 0 || bit == 1;
+        {
+            uint data = (uint)(bit * CSR9.MDO);
+            csr9.Write32(data);             Delay(1);
+            csr9.Write32(data | CSR9.MDC);  Delay(1);
+            csr9.Write32(data);             Delay(1);
+        }
+
+        // Write count bits from vector to MII
+        private void MiiWriteBits(int vector, int count)
+            requires count >= 0 && count <= 32;
+        {
+            while (count-- > 0) {
+                MiiWriteBit(vector & 1);
+                vector >>= 1;
+            }
+        }
+
+        private void MiiWrite(int phy, int register, int value)
+            requires phy      <= 31;
+            requires register <= 31;
+            requires value    <= 0xffff;
+        {
+            MiiWriteBits(-1, 32);   // Preamble
+            MiiWriteBits((0x5 << 28) |      // Start write transaction (4 bits)
+                         (phy << 23) |      // Phy Address             (5 bits)
+                         (register << 18) | // Register                (5 bits)
+                         (2 << 16) |        // Turnaround 2 cycles     (2 bits)
+                         value, 32);
+            MiiWriteBits(0, 32);            // Idle
+        }
+
+        // --------------------------------------------------------------------
+        // SROM
+
+        private static ushort CalculateSromCrc(byte[]! srom)
+            requires srom.Length > 126;
+        {
+            // Cut-paste-and-converted directly from SROM 4.09 spec
+            const uint POLY = 0x04C11DB6;
+            const uint DATA_LEN = 126;
+
+            uint crc = 0xffffffff;
+
+            for (uint index = 0; index < DATA_LEN; index++)
+            {
+                byte currentByte = srom[index];
+                for (uint bit = 0; bit < 8; bit++) {
+                    uint Msb = (crc >> 31) & 1;
+                    crc <<= 1;
+                    if ((Msb ^ (currentByte & 1)) != 0) {
+                        crc ^= POLY;
+                        crc |= 0x00000001;
+                    }
+                    currentByte >>= 1;
+                }
+            }
+
+            uint flippedCrc = 0;
+            for (uint i = 0; i < 32; i++) {
+                flippedCrc <<= 1;
+                uint bit = crc & 1;
+                crc >>= 1;
+                flippedCrc += bit;
+            }
+            crc = flippedCrc ^ 0xffffffff;
+            return (ushort)(crc & 0xffff);
+        }
+
+        private static int DumpLeafMedia(byte[]! srom, int offset)
+        {
+            if ((0x80 & (int)srom[offset]) == 0) {
+                TulipDebug.Print("-- Compact format (non-MII)");
+                TulipDebug.Print("   Media code {0:x2} GPR {1:x2} Command {2:x2}{3:x2}\n",
+                                 __arglist(0x3f & (int)srom[offset],
+                                           srom[offset + 1],
+                                           srom[offset + 3],
+                                           srom[offset + 2]));
+                return 4;
+            }
+            else {
+                int length = (0x7f & (int)srom[offset]) + 1;
+                int type   = (int)srom[offset + 1];
+                TulipDebug.Print("--- Extended format (Type {0} Length {1})\n",
+                                 __arglist(type, length));
+
+                if (type == 0x01) {
+                    int gprLength = (int)srom[offset + 3];
+                    int resetLength = (int)srom[offset + 4 + gprLength];
+                    TulipDebug.Print("    MII PHY id = {0:x2} SeqLen {1} ResetLen {2} ",
+                                     __arglist(srom[offset + 2],
+                                               gprLength, resetLength));
+                    int mediaCaps = ((int)srom[offset + 6 + gprLength + resetLength]) * 256 + (int)srom[offset + 5 + gprLength + resetLength];
+                    int nWay      = ((int)srom[offset + 8 + gprLength + resetLength]) * 256 + (int)srom[offset + 7 + gprLength + resetLength];
+                    int fdx      = ((int)srom[offset + 10 + gprLength + resetLength]) * 256 + (int)srom[offset + 9 + gprLength + resetLength];
+                    int ttm      = ((int)srom[offset + 12 + gprLength + resetLength]) * 256 + (int)srom[offset + 11 + gprLength + resetLength];
+                    TulipDebug.Print("mediaCaps {0:x4} nWay {1:x4} fdx {2:x4} ttm {3:x4}\n", __arglist(mediaCaps, nWay, fdx, ttm));
+                }
+                return length;
+            }
+        }
+
+        private static void DumpLeafNode(byte[]! srom, int offset)
+        {
+            TulipDebug.Print("Leaf:\n");
+            TulipDebug.Print("- ConnectionType: {0:x2}{1:x2} GPR: {2:x2} InfoBlocks: {3}\n",
+                             __arglist(srom[offset + 1], srom[offset],
+                                       srom[offset + 2], srom[offset + 3]));
+
+            int infoBlocks = (int)srom[offset + 3];
+            offset += 4;
+            for (int i = 0; i < infoBlocks; i++) {
+                offset += DumpLeafMedia(srom, offset);
+            }
+        }
+
+        private static void DecodeSRom(byte[]! srom)
+        {
+            TulipDebug.Print("SROM ID Block: Vendor {0:x2}{1:x2} Subsystem {2:x2}{3:x2} HwOpts {4:x2} Func0Opts {5:x2} CRC {6:x2}",
+                             __arglist(srom[1], srom[0], srom[3], srom[4],
+                                       srom[15], srom[17], srom[16]));
+
+            TulipDebug.Print("\nSROM Format: {0}\nController Count: {1}",
+                             __arglist(srom[18], srom[19]));
+
+            int controllers = (int)srom[19];
+            TulipDebug.Print("\nMAC address: {0:x2}:{1:x2}:{2:x2}:{3:x2}:{4:x2}:{5:x2}",
+                             __arglist(srom[20], srom[21], srom[22],
+                                       srom[23], srom[24], srom[25])
+                             );
+
+            for (int i = 0; i < controllers; i++) {
+                int offset = 27 + i * 2;
+                TulipDebug.Print("\nController {0} leaf offset {1:x2}{2:x2}\n",
+                                 __arglist(i,
+                                           srom[offset + 1], srom[offset])
+                                 );
+                DumpLeafNode(srom,
+                             ((int)(srom[offset + 1]) << 8) |
+                             (int)(srom[offset]));
+            }
+        }
+
+        private static byte [] SRomReadPreamble = {
+            0x01, 0x31, 0x57, 0x57, 0x51, 0x31
+        };
+
+        private ushort SRomRead16(uint addr, uint addrBits)
+        {
+            // This is taken from section 7-8 in 21140A reference manual. We
+            // deliberately make all delays as 3 ticks since we don't have
+            // sufficient resolution and don't care about 300ns vs 150ns for
+            // the SROM accesses.
+
+            const uint srom_base_cmd = 0x4800;
+
+            // Starting byte address to starting word address
+            addr >>= 1;
+
+            foreach (byte b in SRomReadPreamble)
+            {
+                csr9.Write32(srom_base_cmd | (uint)(b >> 4));    Delay(3);
+                csr9.Write32(srom_base_cmd | (uint)(b & 0x0f));  Delay(3);
+            }
+
+            // Write address to be read
+            for (int i = (int)addrBits - 1; i >= 0; --i) {
+                uint bit = ((uint)addr >> i) & 0x01;
+                bit <<= 2;
+                csr9.Write32(srom_base_cmd | bit | 0x01);        Delay(3);
+                csr9.Write32(srom_base_cmd | bit | 0x03);        Delay(3);
+                csr9.Write32(srom_base_cmd | bit | 0x01);        Delay(3);
+            }
+
+            // Get lsb
+            uint r = 0;
+            for (int i = 7; i >= 0; --i) {
+                csr9.Write32(srom_base_cmd | 0x03);              Delay(3);
+                r |= ((csr9.Read32() & 0x08) >> 3) << i;         Delay(3);
+                csr9.Write32(srom_base_cmd | 0x01);              Delay(3);
+            }
+
+            // Get msb
+            for (int i = 15; i >= 8; --i) {
+                csr9.Write32(srom_base_cmd | 0x03);              Delay(3);
+                r |= ((csr9.Read32() & 0x08) >> 3) << i;         Delay(3);
+                csr9.Write32(srom_base_cmd | 0x01);              Delay(3);
+            }
+
+            // Finish up
+            csr9.Write32(srom_base_cmd);                         Delay(3);
+
+            return (ushort)r;
+        }
+
+        private String ConnectionTypeName(uint connectionType)
+        {
+            switch (connectionType) {
+                case 0x0000: return "10BaseT";
+                case 0x0100: return "10BaseT Nway";
+                case 0x0204: return "10BaseT Full Duplex";
+                case 0x0001: return "BNC";
+                case 0x0003: return "SYM_SRC (100BaseTx)";
+                case 0x0205: return "SYM_SCR";
+                case 0x0006: return "100Base-T4";
+                case 0x0007: return "100Base-FX";
+                case 0x0208: return "100Base-FXFD";
+                case 0x0009: return "MII TP";
+                case 0x020a: return "MII TP (full-dulex)";
+                case 0x000d: return "MII (100Base-Tx)";
+                case 0x020e: return "MII (100Base-Tx full duplex)";
+                case 0x000f: return "MII (100Base-T4";
+                case 0x0010: return "MII (100Base-FX 100Mb/s fiber)";
+                case 0x0211:
+                    return "MII (100Base-FX 100Mb/s fiber full duplex)";
+                case 0x0800: return "Power up AutoSense (dynamic)";
+                case 0x8800: return "Power up AutoSense";
+                case 0xffff: return "No selected media interface";
+                default:
+                    return String.Format("Unknown ({0})", connectionType);
+            }
+        }
+
+        private String MediaCodeName(uint mediaCode)
+        {
+            switch (mediaCode) {
+                case 0: return "TP (10MB/s)";
+                case 1: return "BNC (10MB/s)";
+                case 3: return "SYM_SCR (100Base-Tx)";
+                case 4: return "TP full-duplex";
+                case 5: return "SYM_SCR full-duplex (100Base-Tx)";
+                case 6: return "100Base-T4";
+                case 7: return "100Base-FX";
+                case 8: return "100Base-FXFD";
+                default: return String.Format("Unknown ({1})", mediaCode);
+            }
+        }
+
+        private byte[]! GetEthernetAddressBytes(EthernetAddress address)
+        {
+            byte []! data = (!)address.GetAddressBytes();
+            return data;
+        }
+
+        //
+        // Setup Frame related methods
+        //
+
+        /// <summary>
+        /// Constructs a perfect filtering setup frame buffer.
+        /// </summary>
+        ///
+        /// <param name="addresses">The addresses to be present
+        /// in the perfect filter up to a maximum of 16.</param>
+        private byte[]! MakePerfectFilteringFrame(EthernetAddress[]! addresses)
+            requires addresses.Length <= 16;
+        {
+            //
+            // Ref: pages 4.20-4.23
+            //
+            // Frame has 192 bytes and is laid out thus:
+            //
+            //      <3:0> XX XX a0[1] a0[0]     XX    = don't care
+            //      <7:4> XX XX a0[3] a0[2]     aN    = ethernet address N
+            //     <11:8> XX XX a0[5] a0[4]     aN[i] = i'th byte of address N
+            //    <15:12> XX XX a1[1] a1[0]
+            //    <19:16> XX XX a1[3] a1[2]
+            //    <23:20> XX XX a1[5] a1[4]
+            //  ...
+            //  <183:180> XX XX a15[1] a15[0]
+            //  <187:184> XX XX a15[3] a15[2]
+            //  <191:188> XX XX a15[5] a15[4]
+            //
+            // If there are less than 16 addresses to go in the frame,
+            // addresses should be repeated to fill all 16 slots.
+            //
+            // Frame is generated in little endian ordering.
+            //
+            const int MaxOutIndex = 16;
+            int addressIndex = 0;
+            int outIndex = 0;
+
+            byte []! frame = new byte [SetupFrameBytes]; // 192 bytes
+
+            while (outIndex != MaxOutIndex) {
+                int start = outIndex * 6 * 2;
+                byte []! address = GetEthernetAddressBytes(
+                    addresses[addressIndex]);
+                frame[start + 0] = address[0];
+                frame[start + 1] = address[1];
+                frame[start + 4] = address[2];
+                frame[start + 5] = address[3];
+                frame[start + 8] = address[4];
+                frame[start + 9] = address[5];
+                addressIndex = (addressIndex + 1) % addresses.Length;
+                outIndex ++;
+            }
+            return frame;
+        }
+
+        private bool WriteStandardSetupFrame()
+        {
+            txRing.WriteSetupFrame(
+                MakePerfectFilteringFrame(
+                    new EthernetAddress [] { macAddress,
+                                             EthernetAddress.Broadcast }
+                    ),
+                FilteringType.Perfect
+                );
+            TransmitPollDemand();
+
+            for (int i = 0; i < 100; i++) {
+                if (txRing.PollSetupFrameCompleted()) {
+                    return true;
+                }
+                Thread.Sleep(TimeSpan.FromMilliseconds(5));
+            }
+            DebugStub.Break();
+            return false;
+        }
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipConstants.cs b/base/Drivers/Network/Tulip/TulipConstants.cs
new file mode 100644
index 0000000..e298898
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipConstants.cs
@@ -0,0 +1,199 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipConstants.cs
+//
+//  Simple Driver for DEC 21140a PCI Ethernet card (as used in Virtual PC).
+//
+//  Useful reference URLs:
+//      http://www.intel.com/design/network/manuals/21140ahm.pdf
+//
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal struct RDES0
+    {
+        internal const uint OWN = 1u << 31;    // Own Bit
+        internal const uint FF  = 1u << 30;    // Filtering Fail
+        internal const int  FL_ROLL = 16;      // Frame length
+        internal const uint FL_MASK = 0x3fff;
+        internal const uint ES  = 1u << 15;    // Error Summary
+        internal const uint DE  = 1u << 14;    // Descriptor Error
+        internal const uint DT_S = 0u << 12;   // Data type (serial)
+        internal const uint DT_I = 1u << 12;   // Data type (int/loopback)
+        internal const uint DT_E = 2u << 12;   // Data type (ext/loopback)
+        internal const uint RF  = 1u << 11;    // Runt Frame
+        internal const uint MF  = 1u << 10;    // Multicast Frame
+        internal const uint FS  = 1u << 9;     // First Descriptor
+        internal const uint LS  = 1u << 8;     // Last Descriptor
+        internal const uint TL  = 1u << 7;     // Frame Too Long
+        internal const uint CS  = 1u << 6;     // Collision Seen
+        internal const uint FT  = 1u << 5;     // Frame Type
+        internal const uint RW  = 1u << 4;     // Receive Watchdog
+        internal const uint RE  = 1u << 3;     // Report MII Error
+        internal const uint DB  = 1u << 2;     // Dribbling Bit
+        internal const uint CE  = 1u << 1;     // CRC Error
+        internal const uint ZER = 1u << 0;     // Zero Length
+    }
+
+    internal struct RDES1
+    {
+        internal const uint RER = 1u << 25;    // Receive End of Ring
+        internal const uint RCH = 1u << 24;    // Second address chained
+        internal const uint RBS_MASK  = 0x000007ff;
+        internal const int  RBS2_ROLL = 11;
+    }
+
+    internal struct TDES0
+    {
+        internal const uint OWN        = 1u << 31;   // Own Bit
+        internal const uint ES         = 1u << 15;   // Error Summary
+        internal const uint TO         = 1u << 14;   // Transmit Jabber Timeout
+        internal const uint LO         = 1u << 11;   // Loss of Carrier
+        internal const uint NC         = 1u << 10;   // No Carrier
+        internal const uint LC         = 1u << 9;    // Late Collision
+        internal const uint EC         = 1u << 8;    // Excessive Collisions
+        internal const uint HF         = 1u << 7;    // Heartbeat fail
+        internal const int  CC_ROLL    = 3;          // Collision Count
+        internal const uint CC_MASK    = 0xf;
+        internal const uint LF         = 1u << 2;    // Link Fail Report
+        internal const uint UF         = 1u << 1;    // Underflow Error
+        internal const uint DE         = 1u << 0;    // Deferred
+        internal const uint SETUP_DONE = 0x7fffffff; // Filtering frame done
+    }
+
+    internal struct TDES1
+    {
+        internal const uint IC  = 1u << 31;    // Interrupt on Completion
+        internal const uint LS  = 1u << 30;    // Last Segment
+        internal const uint FS  = 1u << 29;    // First Segment
+        internal const uint FT1 = 1u << 22;    // Filtering type:0
+        internal const uint SET = 1u << 27;    // Setup Packet
+        internal const uint TER = 1u << 25;    // Transmit end of ring
+        internal const uint TCH = 1u << 24;    // Second Address chained
+        internal const uint DPD = 1u << 23;    // Disabled Padding
+        internal const uint FT0 = 1u << 22;    // Filtering type:1
+        internal const uint FT_PERFECT = 0;    // Perfect filtering
+        internal const uint FT_HASH    = FT0;  // Hash filtering
+        internal const uint FT_INVERSE = FT1;  // Inverse filtering
+        internal const uint FT_HASH_ONLY = FT1 | FT0;
+        internal const uint TBS_MASK  = 0x000007ff;
+        internal const int  TBS2_ROLL = 11;
+    }
+
+    internal struct CSR0
+    {
+        internal const uint WIE = 1u << 24;     // Write and Invalidate En.
+        internal const uint RLE = 1u << 23;     // Read Line Enable
+        internal const uint RME = 1u << 21;     // Read Multiple Enable
+        internal const uint DBO = 1u << 20;     // Descriptor Byte Ordering
+        internal const int  TAP_ROLL = 17;      // Transmit Auto. Polling
+        internal const uint TAP_MASK = 0x7;
+        internal const int  CAL_ROLL = 14;      // Cache Alignment
+        internal const uint CAL_MASK = 0x3;
+        internal const int  PBL_ROLL = 8;       // Programmable burst len
+        internal const uint PBL_MASK = 0x1f;
+        internal const int  DSL_ROLL = 2;       // Descriptor Skip len
+        internal const uint BAR = 1u << 1;      // Bus Arbitration
+        internal const uint SWR = 1u << 0;      // Software Reset
+    }
+
+    internal struct CSR5
+    {
+        internal const int  VALID   = 0x0fffffff;
+        internal const int  EB_ROLL = 23;       // Error bits
+        internal const uint EB_MASK = 0x7;
+        internal const uint EB = EB_MASK << EB_ROLL;
+        internal const int  TS_ROLL = 20;       // Transmit Process State
+        internal const uint TS_MASK = 0x7;
+        internal const int  RS_ROLL = 17;       // Receive Process State
+        internal const uint RS_MASK = 0x7;
+        internal const uint NIS = 1u << 16;     // Normal Interrupt Summary
+        internal const uint AIS = 1u << 15;     // Abnormal Interrupt Summary
+        internal const uint ERI = 1u << 14;     // Early Receive Interrupt
+        internal const uint FBE = 1u << 13;     // Fatal Bus Error
+        internal const uint GTE = 1u << 11;     // General Purpose Timer
+        internal const uint ETI = 1u << 10;     // Early Transmit Interrupt
+        internal const uint RWT = 1u << 9;      // Receive Watchdog Timeout
+        internal const uint RPS = 1u << 8;      // Receive Process Stopped
+        internal const uint RU  = 1u << 7;      // Receive Buffer Unavail.
+        internal const uint RI  = 1u << 6;      // Receive Interrupt
+        internal const uint UNF = 1u << 5;      // Transmit Underflow
+        internal const uint TJT = 1u << 3;      // Transmit Jabber Timeout
+        internal const uint TU  = 1u << 2;      // Transmit Buffer Unavail.
+        internal const uint TPS = 1u << 1;      // Transmit Process Stopped
+        internal const uint TI  = 1u << 0;      // Transmit Interrupt
+        internal const uint INTERRUPTS = 0x6fef;
+    }
+
+    internal struct CSR6
+    {
+        internal const uint SC  = 1u << 31;     // Special capture
+        internal const uint RA  = 1u << 30;     // Receive All
+        internal const uint MBO = 1u << 25;     // Must Be One
+        internal const uint SCR = 1u << 24;     // Scrambler Mode
+        internal const uint PCS = 1u << 23;     // PCS Function
+        internal const uint TTM = 1u << 22;     // Transmit Threshold Mode
+        internal const uint SF  = 1u << 21;     // Store and Forward
+        internal const uint HBD = 1u << 19;     // Heartbeat Disable
+        internal const uint PS  = 1u << 18;     // Port Select
+        internal const uint CA  = 1u << 17;     // Capture Effect Enable
+        internal const int  TR_ROLL = 14;       // Threshold Control Bits
+        internal const uint TR_MASK = 0x3;
+        internal const uint ST  = 1u << 13;     // Start/Stop Transmit
+        internal const uint FC  = 1u << 12;     // Force Collision Mode
+        internal const uint OME = 1u << 11;     // Operating Mode (ex/loop)
+        internal const uint OMI = 1u << 10;     // Operating Mode (in/loop)
+        internal const uint FD  = 1u << 9;      // Full-Duplex Mode
+        internal const uint PM  = 1u << 7;      // Pass All Multicast
+        internal const uint PR  = 1u << 6;      // Promiscuous Mode
+        internal const uint SB  = 1u << 5;      // Start/Stop Backoff
+        internal const uint IF  = 1u << 4;      // Inverse Filtering (RO)
+        internal const uint PB  = 1u << 3;      // Pass Bad Frames
+        internal const uint HO  = 1u << 2;      // Hash-Only Filtering (RO)
+        internal const uint SR  = 1u << 1;      // Start/Stop Receive
+        internal const uint HP  = 1u << 0;      // Hash/Perfect Recv (RO)
+    }
+
+    internal struct CSR7
+    {
+        internal const uint NI  = 1u << 16;     // Normal Interrupts
+        internal const uint AI  = 1u << 15;     // Abnormal Interrupts too
+        internal const uint ALL = CSR5.INTERRUPTS;  // All Interrupt bits
+        internal const uint ERE = 1 << 14;      // Early Receive Enable
+        internal const uint FBE = 1 << 13;      // Fatal Bus Error Enable
+        internal const uint GPT = 1 << 11;      // GP Timer Enable
+        internal const uint ETE = 1 << 10;      // Early TX Interrupt
+        internal const uint RW  = 1 << 9;       // RX Watchdog Timeout
+        internal const uint RS  = 1 << 8;       // RX Stop Enable
+        internal const uint RU  = 1 << 7;       // RX Buffer Unavailable En
+        internal const uint RI  = 1 << 6;       // RX Interrupt Enable
+        internal const uint UN  = 1 << 5;       // TX Underflow Interrupt
+        internal const uint TJ  = 1 << 3;       // TX Jabber Timeout enable
+        internal const uint TU  = 1 << 2;       // TX Buffer Unavailable
+        internal const uint TS  = 1 << 1;       // TX Stop Enable
+        internal const uint TI  = 1 << 0;       // TX Interrupt Enable
+    }
+
+    internal struct CSR9
+    {
+        internal const uint MDI = 1u << 19;     // MII Mgmt data in
+        internal const uint MII = 1u << 18;     // MII Mgmt opt mode (set = rd)
+        internal const uint MDO = 1u << 17;     // MII Mgmt write data
+        internal const uint MDC = 1u << 16;     // MII Mgmt clock
+    }
+
+    /// <summary> Filtering types from table 4-8 in 21143ahm.pdf</summary>
+    internal enum FilteringType : byte
+    {
+        Perfect  = 1,
+        Hash     = 2,
+        Inverse  = 3,
+        HashOnly = 4,
+        MinValue = Perfect,
+        MaxValue = HashOnly
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipController.sg b/base/Drivers/Network/Tulip/TulipController.sg
new file mode 100644
index 0000000..143613c
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipController.sg
@@ -0,0 +1,84 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipController.sg
+//
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal class TulipController
+    {
+        public static int DriverMain(TulipResources! resources)
+        {
+            ExtensionContract.Exp! ep = (resources.ec).Acquire();
+            ServiceProviderContract.Exp! sp = (resources.nicsp).Acquire();
+
+            Tulip! device = new Tulip(resources);
+            device.Initialize();
+
+            ep.SendSuccess();
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        case sp.Connect(ServiceContract.Exp:Start! exp):
+                            NicDeviceContract.Exp nd = exp as NicDeviceContract.Exp;
+                            if (nd != null) {
+                                Tracing.Log(Tracing.Debug, "Connect success.");
+                                sp.SendAckConnect();
+                                TulipDeviceChannel.CreateThread(device, nd);
+                            }
+                            else {
+                                Tracing.Log(Tracing.Error, "Connect failed.");
+                                sp.SendNackConnect(exp);
+                            }
+                            break;
+
+                        case sp.ChannelClosed():
+                            device.Shutdown();
+                            run = false;
+                            break;
+
+                        case ep.Shutdown():
+                            device.Shutdown();
+                            ep.SendAckShutdown();
+                            break;
+
+                        case ep.ChannelClosed():
+                            device.Shutdown();
+                            run = false;
+                            break;
+
+                        case unsatisfiable:
+                            DebugStub.Break();
+                            break;
+                    }
+                }
+            }
+            finally {
+                delete ep;
+                delete sp;
+            }
+            return 0;
+        }
+
+        public static int DriverMain(PnicResources! resources)
+        {
+            DebugStub.Break();
+            return 0;
+        }
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipDebug.cs b/base/Drivers/Network/Tulip/TulipDebug.cs
new file mode 100644
index 0000000..1bc6dc3
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipDebug.cs
@@ -0,0 +1,98 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipDebug.cs
+//
+//
+//  Simple Driver for DEC 21140a PCI Ethernet card.  (as used in Virtual PC)
+//
+//  Useful reference URLs:
+//      http://www.intel.com/design/network/manuals/21140ahm.pdf
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    class TulipDebug
+    {
+        [Conditional("DEBUG_TULIP")]
+        internal static void
+        Print(string! format)
+        {
+            DebugStub.Print(format);
+        }
+
+        [Conditional("DEBUG_TULIP")]
+        internal static void
+        Print(string! format, __arglist)
+        {
+            DebugStub.Print(format, new ArgIterator(__arglist));
+        }
+
+        [Conditional("DEBUG_TULIP")]
+        private static void
+        PrintByteRow(byte[]! data, int start, int end)
+        {
+            Print("{0:x8}  ", __arglist(start));
+            for (int j = start; j < end; j++) {
+                Print("{0:x2} ", __arglist(data[j]));
+            }
+            Print("\n");
+        }
+
+        [Conditional("DEBUG_TULIP")]
+        internal static void
+        PrintBytes(string! title, byte[]! data, int start, int length)
+        {
+            Print("{0}\n", __arglist(title));
+            const int bpl = 16;
+
+            int m = start + length - (length % bpl);
+            int n = start + length;
+
+            for (int i = start; i < m; i += bpl) {
+                PrintByteRow(data, i, i + bpl);
+            }
+            if (n != m) {
+                PrintByteRow(data, m, n);
+            }
+        }
+
+        [Conditional("DEBUG_TULIP")]
+        internal static void
+        PrintBytes(string! title, byte[]! data)
+        {
+            PrintBytes(title, data, 0, data.Length);
+        }
+
+        [Conditional("DEBUG_TULIP")]
+        internal static void
+        PrintCsrs(IoPort!  csr0, IoPort!  csr1, IoPort!  csr2, IoPort!  csr3,
+                  IoPort!  csr4, IoPort!  csr5, IoPort!  csr6, IoPort!  csr7,
+                  IoPort!  csr8, IoPort!  csr9, IoPort! csr10, IoPort! csr11,
+                  IoPort! csr12, IoPort! csr15)
+        {
+            Print("CSR0  {0:x8}  CSR3  {1:x8}  CSR4  {2:x8}\n",
+                  __arglist(csr0.Read32(), csr3.Read32(), csr4.Read32()));
+
+            uint status = csr5.Read32();
+            Print("CSR5 {0:x} Bus Error {0:x} TX {1:x} RX {2:x}\n",
+                  __arglist(status,
+                            (status >> CSR5.EB_ROLL) & CSR5.EB_MASK,
+                            (status >> CSR5.TS_ROLL) & CSR5.TS_MASK,
+                            (status >> CSR5.RS_ROLL) & CSR5.RS_MASK
+                            ));
+            Print("CSR6  {0:x8}  CSR7  {1:x8}  CSR8  {2:x8}\n",
+                  __arglist(csr6.Read32(), csr7.Read32(), csr8.Read32()));
+            Print("CSR11 {0:x8}  CSR12 {1:x8}  CSR15 {2:x8}\n",
+                  __arglist(csr11.Read32(), csr12.Read32(), csr15.Read32()));
+        }
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipDeviceChannel.sg b/base/Drivers/Network/Tulip/TulipDeviceChannel.sg
new file mode 100644
index 0000000..ab1a575
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipDeviceChannel.sg
@@ -0,0 +1,171 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipDeviceChannel.sg
+//
+
+using Microsoft.SingSharp;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal class TulipDeviceChannel
+    {
+        Tulip! device;
+        TRef<NicDeviceContract.Exp:Start> channel;
+
+        private TulipDeviceChannel(
+            Tulip! theDevice,
+            [Claims] NicDeviceContract.Exp:Start! channel
+            )
+            ensures this.channel != null;
+        {
+            this.device  = theDevice;
+            this.channel = new TRef<NicDeviceContract.Exp:Start>(channel);
+            base();
+        }
+
+        private bool IoRunningMessageLoop(NicDeviceContract.Exp! ep)
+        {
+            device.StartIo();
+
+            for (;;) {
+                switch receive {
+                    case ep.GiveRxPacketsToDevice(rxFifo):
+                        device.ReceivePackets(rxFifo);
+                        device.GetReceivedPackets(rxFifo);
+                        ep.SendTakeRxPacketsFromDevice(rxFifo);
+                        break;
+
+                    case ep.GiveTxPacketsToDevice(txFifo):
+                        device.TransmitPackets(txFifo);
+                        device.GetTransmittedPackets(txFifo);
+                        ep.SendTakeTxPacketsFromDevice(txFifo);
+                        break;
+
+                    case ep.StopIO():
+                        device.StopIo();
+                        return true;
+
+                    case ep.ChannelClosed():
+                        device.StopIo();
+                        return false;
+                }
+            }
+            return false;
+        }
+
+        private bool IoConfigureMessagePump(NicDeviceContract.Exp! ep)
+        {
+            Tracing.Log(Tracing.Debug,
+                        "Tulip entered {0} state", ep.CurrentState());
+
+            for (;;) {
+                switch receive{
+                    case ep.RegisterForEvents(eventExp):
+                        ep.SendSuccess();
+                        eventExp.SendSuccess();
+                        device.SetEventRelay(
+                            new TulipEventRelay(eventExp)
+                            );
+                        break;
+
+                    case ep.SetChecksumProperties(checksumSupport):
+                        if (checksumSupport == ChecksumSupport.None) {
+                            ep.SendSuccess();
+                        }
+                        else {
+                            ep.SendUnsupportedChecksumProperties();
+                        }
+                        break;
+
+                    case ep.StartIO():
+                        ep.SendAckStartIO();
+                        return IoRunningMessageLoop(ep);
+
+                    case ep.ChannelClosed():
+                        return false;
+
+                    case unsatisfiable:
+                        DebugStub.Break();
+                        break;
+                }
+            }
+
+            return false;
+        }
+
+        private void GetDeviceProperties(NicDeviceProperties*! in ExHeap ndp)
+        {
+            expose (ndp) {
+                delete ndp->DriverName;
+                ndp->DriverName = Bitter.FromString2(device.Name);
+
+                delete ndp->DriverVersion;
+                ndp->DriverVersion = Bitter.FromString2(device.Version);
+
+                ndp->MacType    = MacType.Ethernet;
+                delete ndp->MacAddress;
+                ndp->MacAddress =
+                    Bitter.FromByteArray(device.HardwareAddressBytes);
+
+                ndp->ChecksumSupport         = ChecksumSupport.None;
+                ndp->MtuBytes                = Tulip.MtuBytes;
+                ndp->MaxRxFragmentsPerPacket = Tulip.MaxRxFragmentsPerPacket;
+                ndp->MaxTxFragmentsPerPacket = Tulip.MaxTxFragmentsPerPacket;
+                ndp->MaxRxPacketsInDevice    = Tulip.MaxRxPackets;
+                ndp->MaxTxPacketsInDevice    = Tulip.MaxTxPackets;
+            }
+        }
+
+        private void ReadyMessagePump()
+            requires this.channel != null;
+        {
+            NicDeviceContract.Exp! ep = channel.Acquire();
+            channel = null;
+
+            assert ep.InState(NicDeviceContract.Start.Value);
+            ep.SendSuccess();
+            assert ep.InState(NicDeviceContract.READY.Value);
+
+            try {
+                NicDeviceProperties*! in ExHeap ndp;
+                ep.RecvGetDeviceProperties(out ndp);
+                GetDeviceProperties(ndp);
+                ep.SendDeviceProperties(ndp);
+
+                ep.RecvConfigureIO();
+                ep.SendAckConfigureIO();
+                IoConfigureMessagePump(ep);
+            }
+            catch (Exception e) {
+                DebugStub.Print("Caught exception: {0}\n",
+                                __arglist(e.ToString()));
+            }
+            finally
+            {
+                delete ep;
+            }
+        }
+
+        internal static bool
+        CreateThread(Tulip! tulip, [Claims] NicDeviceContract.Exp:Start! ep)
+        {
+            TulipDeviceChannel tdc = new TulipDeviceChannel(tulip, ep);
+            Thread thread = new Thread(new ThreadStart(tdc.ReadyMessagePump));
+            thread.Start();
+            return true;
+        }
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipEventRelay.sg b/base/Drivers/Network/Tulip/TulipEventRelay.sg
new file mode 100644
index 0000000..2bc856b
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipEventRelay.sg
@@ -0,0 +1,71 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipEventRelay.sg
+//
+//
+//  Note:  Right now this interface waits for acks from the receiver.
+//         This adds an unnecessary context switch.  At some future point
+//         we may be able to have something more akin to a one-way single
+//         buffer-slot notification system, but for now we ack.
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal struct TulipEvent
+    {
+        internal const uint NoEvent       = (uint) NicEventType.NoEvent;
+        internal const uint ReceiveEvent  = (uint) NicEventType.ReceiveEvent;
+        internal const uint TransmitEvent = (uint) NicEventType.TransmitEvent;
+        internal const uint LinkEvent     = (uint) NicEventType.LinkEvent;
+    }
+
+    internal class TulipEventRelay
+    {
+        TRef<NicDeviceEventContract.Exp:RUNNING>! channel;
+        bool channelClosed;
+
+        internal TulipEventRelay([Claims]
+                                 NicDeviceEventContract.Exp:READY! ep)
+        {
+            channel       = new TRef<NicDeviceEventContract.Exp:RUNNING>(ep);
+            channelClosed = false;
+        }
+
+        internal void ForwardEvent(uint tulipEvent)
+        {
+            if (channelClosed)
+            {
+                return;
+            }
+
+            NicDeviceEventContract.Exp! exp = channel.Acquire();
+            exp.SendNicDeviceEvent((NicEventType)tulipEvent);
+            try
+            {
+                exp.RecvAckNicDeviceEvent();
+            }
+            catch (ChannelClosedException)
+            {
+                channelClosed = true;
+            }
+            finally
+            {
+                channel.Release(exp);
+            }
+        }
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipResources.sg b/base/Drivers/Network/Tulip/TulipResources.sg
new file mode 100644
index 0000000..5a16d74
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipResources.sg
@@ -0,0 +1,78 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipResources.cs
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity.Drivers;
+
+[assembly: Transform(typeof(DriverResourceTransform))]
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    // create the resource object for CTR to fill in
+    [DriverCategory]
+    [Signature("pci/ven_1011&dev_0009&cc_0200")] // DEC 21140
+    internal class TulipResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0xec00, Length = 0x80)]
+        internal IoPortRange csr;
+
+        [IoMemoryRange(1, Default = 0xfebff000, Length = 0x1000)]
+        internal IoMemoryRange mem; // this is unused, but we must declare it
+
+        [IoIrqRange(6, Default = 0x0b, Shared = true)]
+        internal IoIrqRange irq;
+
+        [ExtensionEndpoint]
+        internal TRef<ExtensionContract.Exp:Start> ec;
+
+        [ServiceEndpoint(typeof(NicDeviceContract))]
+        internal TRef<ServiceProviderContract.Exp:Start> nicsp;
+
+        internal int DriverMain()
+        {
+            return TulipController.DriverMain(this);
+        }
+    }
+
+    // The driver transform needs to be
+    // revised to pass in the matching signature so the driver can
+    // accommodate for other differences than just ranges (as is
+    // largely the case with the PNIC and Tulip).
+    [DriverCategory]
+    [Signature("pci/ven_11ad&dev_0002&cc_0200")]
+    internal class PnicResources // : DriverCategoryDeclaration HACK!HACK!HACK!
+    {
+        [IoPortRange(0, Default = 0xec00, Length = 0x100)]
+        internal IoPortRange csr;
+
+        [IoMemoryRange(1, Default = 0xfebff000, Length = 0x100)]
+        internal IoMemoryRange mem;
+
+        [IoIrqRange(6, Default = 0x0b, Shared = true)]
+        internal IoIrqRange irq;
+
+        [ExtensionEndpoint]
+        internal TRef<ExtensionContract.Exp:Start> ec;
+
+        [ServiceEndpoint(typeof(NicDeviceContract))]
+        internal TRef<ServiceProviderContract.Exp:Start> nicsp;
+
+#if NOTYET
+        internal int DriverMain()
+        {
+            return TulipController.DriverMain(this);
+        }
+#endif // NOTYET
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipRxRingBuffer.sg b/base/Drivers/Network/Tulip/TulipRxRingBuffer.sg
new file mode 100644
index 0000000..fce3900
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipRxRingBuffer.sg
@@ -0,0 +1,314 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipRxRingBuffer.cs
+//
+//  Notes:
+//
+//  Because the Tulip requires the receive packet length be a
+//  multiple of 4-bytes and there is no way to communicate this
+//  back to the network stack, packets are received into a temporary
+//  memory region and then copied out.
+
+using Microsoft.Contracts;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.V1.Services;
+using System;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal class TulipRxRingBuffer
+    {
+        internal const int MaxFragmentBytes    = 2047;
+        internal const int DescriptorBytes     = 16;
+        internal const int DescriptorAlignment = 4;
+        internal const int PadBytes            = 8; // FCS + round up to 4 byte boundary + 4 byte aligned
+
+        private ExRef<PacketFifo>! rxPackets;
+
+        private IoMemory! descRegion;
+        private IoMemory! padRegion;
+
+        private readonly int capacity;
+        int head;
+        int count;
+
+        internal TulipRxRingBuffer(int maxPackets)
+            requires maxPackets > 0 && IsPowerOf2(maxPackets);
+        {
+            this.descRegion =
+                (!)IoMemory.AllocatePhysical(
+                    new UIntPtr(maxPackets * DescriptorBytes),
+                    DescriptorAlignment
+                    );
+
+            this.padRegion =
+                (!)IoMemory.AllocatePhysical(
+                    new UIntPtr(maxPackets * PadBytes), 0
+                    );
+
+            this.rxPackets = new ExRef<PacketFifo>(
+                new [ExHeap] PacketFifo(maxPackets), true
+                );
+
+            this.capacity   = maxPackets;
+            this.head       = 0;
+            this.count      = 0;
+        }
+
+        internal void Reset()
+            requires this.Count == 0;
+        {
+            this.head = 0;
+            for (int i = 0; i < capacity; i++) {
+                int descBase = i * DescriptorBytes;
+                this.descRegion.Write32(descBase, 0);
+            }
+        }
+
+        private void PushPacket(PacketFifo*! in ExHeap      rxFifo,
+                                [Claims] Packet*! in ExHeap packet)
+            requires packet->FragmentCount == 1;
+            requires packet->GetLength() <= MaxFragmentBytes;
+            ensures this.Count == old(this.Count) + 1;
+            ensures this.Head == (old(this.Head) + 1) % this.Capacity;
+
+        {
+            UIntPtr fragmentVA;
+            int     length;
+
+            packet->GetFragmentRange(0, out fragmentVA, out length);
+
+            // Round down buffer length to multiple of 4 bytes
+            uint rdes1 = ((uint)length & ~0x03u);
+            uint rdes2 = (uint)GetPhysicalAddress(fragmentVA);
+            uint rdes3 = ((uint)this.padRegion.PhysicalAddress.Value +
+                          (uint)(this.head * PadBytes));
+
+            rdes1 |= (PadBytes << RDES1.RBS2_ROLL);
+            if (this.head == this.Capacity - 1) {
+                rdes1 |= RDES1.RER;
+            }
+
+            int offset = this.head * DescriptorBytes;
+            this.descRegion.Write32(offset + 12, rdes3);
+            this.descRegion.Write32(offset +  8, rdes2);
+            this.descRegion.Write32(offset +  4, rdes1);
+            this.descRegion.Write32(offset +  0, RDES0.OWN);
+
+            this.head = (this.head + 1) & (this.Capacity - 1);
+            this.count++;
+
+            rxFifo->Push(packet);
+        }
+
+        internal void Push(PacketFifo*! in ExHeap incoming)
+            requires this.Count + incoming->Count <= this.Capacity;
+            ensures  this.Count == old(this.Count) + old(incoming->Count);
+            ensures  (this.Head ==
+                      (old(this.Head) + old(incoming->Count)) % this.Capacity);
+        {
+            DumpOwnership("+RX Push()");
+            PacketFifo*! in ExHeap rxFifo = this.rxPackets.Acquire();
+            try {
+                while (incoming->Count > 0) {
+                    Packet*! in ExHeap packet = incoming->Pop();
+                    packet->UnsetFragmentLengths();
+                    PushPacket(rxFifo, packet);
+                }
+            }
+            finally {
+                this.rxPackets.Release(rxFifo);
+            }
+            DumpOwnership("-RX Push()");
+        }
+
+        private Packet* in ExHeap PopPacket(PacketFifo*! in ExHeap rxFifo)
+            ensures (this.Count == old(this.Count) - 1 ||
+                     this.Count == old(this.Count));
+        {
+            int descBase = this.Tail * DescriptorBytes;
+            uint rdes0 = this.descRegion.Read32(descBase);
+            if ((rdes0 & RDES0.OWN) == RDES0.OWN) {
+                return null;
+            }
+
+            Packet*! in ExHeap packet = rxFifo->Pop();
+
+            // Length is less FCS that is passed up to anyone
+            uint length = ((rdes0 >> RDES0.FL_ROLL) & RDES0.FL_MASK) - 4;
+            int  packetCapacity = packet->GetLength();
+            if ((packetCapacity % 3) != 0) {
+                // We may have data in second buffer because
+                // packet size was not a multiple of 4.
+                if (length >= (packetCapacity & ~0x3)) {
+                    packet->SetFragmentLength(0, packetCapacity & ~0x3);
+                    int todo = ((int)length - (packetCapacity & ~0x3)) & 0x3;
+                    for (int i = 0; i < todo; i++) {
+                        int srcOffset = this.Tail * PadBytes + i;
+                        packet->AppendToFragment(0, this.padRegion[srcOffset]);
+                    }
+                }
+            }
+
+            bool cropped   = false;
+            uint maxLength = (uint)packet->GetLength();
+            if (length > maxLength) {
+                TulipDebug.Print("RX Packet cropped ({0} > {1})\n",
+                                 __arglist(length, maxLength));
+                cropped = true;
+                length = maxLength;
+            }
+
+            if ((rdes0 & RDES0.ES) != 0) {
+                TulipDebug.Print("RX Error RDES0 = {0:x8}\n",
+                                 __arglist(rdes0));
+                packet->FromDeviceFlags = FromDeviceFlags.ReceiveError;
+            }
+            else if (cropped) {
+                packet->FromDeviceFlags = FromDeviceFlags.ReceiveError;
+            }
+            else {
+                packet->FromDeviceFlags = FromDeviceFlags.ReceiveSuccess;
+            }
+
+            this.count--;
+            return packet;
+        }
+
+        internal void Pop(PacketFifo*! in ExHeap outgoing)
+            ensures this.Count == old(this.Count) - outgoing->Count;
+        {
+            DumpOwnership("+RX Pop");
+            PacketFifo*! in ExHeap rxFifo = this.rxPackets.Acquire();
+            try {
+                while (rxFifo->Count > 0) {
+                    Packet* in ExHeap popped = PopPacket(rxFifo);
+                    if (popped == null)
+                        break;
+                    outgoing->Push(popped);
+                }
+            }
+            finally {
+                this.rxPackets.Release(rxFifo);
+            }
+            DumpOwnership("-RX Pop");
+        }
+
+        private static UIntPtr GetPhysicalAddress(UIntPtr va)
+        {
+            UIntPtr pa;         // Physical address
+            UIntPtr paLeft;     // Bytes remaining on physical page
+            if (!DeviceService.GetDmaPhysicalAddress(va, out pa, out paLeft) ||
+                pa == UIntPtr.Zero ||
+                paLeft < Tulip.MtuBytes) {
+                throw new ApplicationException("Bad DMA pointer");
+            }
+            return pa;
+        }
+
+        internal UIntPtr BaseAddress
+        {
+            get { return this.descRegion.PhysicalAddress.Value; }
+        }
+
+        [Pure]
+        internal int Capacity { get { return this.capacity; } }
+
+        [Pure]
+        internal int Count { get { return this.count; } }
+
+        [Pure]
+        internal int Free { get { return this.capacity - this.count; } }
+
+        [Pure]
+        internal int Head { get { return this.head; } }
+
+        [Pure]
+        internal int Tail
+        {
+            get {
+                return ((this.capacity + this.head - this.count) %
+                        this.capacity);
+            }
+        }
+
+        [Pure]
+        private static bool IsPowerOf2(int n)
+        {
+            return (n > 0) && ((n & (n - 1)) == 0);
+        }
+
+        [Pure]
+        private static bool IsMultipleOf4(int n)
+        {
+            return (n % 4) == 0;
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_TULIP") ]
+        private static void DumpOwnership(int start, int end, bool owned)
+        {
+            TulipDebug.Print(
+                "{0:4}-{1:4} {2}\n",
+                __arglist(start, end, owned ? "OWNED" : "UNOWNED")
+                );
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_TULIP") ]
+        internal void DumpOwnership(string title)
+        {
+            TulipDebug.Print("{0}\n", __arglist(title));
+            PacketFifo*! in ExHeap fifo = this.rxPackets.Acquire();
+            try {
+                assert fifo->Count == this.Count;
+                TulipDebug.Print("Head = {0} Tail = {1} PacketCount = {2}\n",
+                                 __arglist(this.Head, this.Tail,
+                                           fifo->Count));
+
+                bool errorsFound = false;
+
+                uint lastRdes0 = this.descRegion.Read32(0) & RDES0.OWN;
+                int lastStart = 0;
+                for (int i = 1; i < this.Capacity; i++) {
+                    uint rdes0 = this.descRegion.Read32(i * DescriptorBytes);
+                    errorsFound = ((rdes0 & RDES0.ES) != 0);
+
+                    if ((rdes0 & RDES0.OWN) != lastRdes0) {
+                        DumpOwnership(lastStart, i - 1,
+                                      lastRdes0 == RDES0.OWN);
+                        lastStart = i;
+                        lastRdes0 = rdes0 & RDES0.OWN;
+                    }
+                }
+                DumpOwnership(lastStart, this.Capacity - 1,
+                              (lastRdes0 & RDES0.OWN) == RDES0.OWN);
+
+                if (errorsFound) {
+                    for (int i = 0; i < this.Capacity; i++) {
+                        uint rdes0, rdes1, rdes2, rdes3;
+                        rdes0 = this.descRegion.Read32(i * DescriptorBytes);
+                        rdes1 = this.descRegion.Read32(i * DescriptorBytes + 4);
+                        rdes2 = this.descRegion.Read32(i * DescriptorBytes + 8);
+                        rdes3 = this.descRegion.Read32(i * DescriptorBytes + 12);
+                        TulipDebug.Print(
+                            "{0:x4} {1}{2} FL = {3:4} RDES [0]={4:x8} [1]={5:x8} [2]={6:x8} [3]={7:x8}\n",
+                            __arglist(i,
+                                      (rdes0 & RDES0.OWN) != 0 ? "O" : "U",
+                                      (rdes0 & RDES0.ES)  != 0 ? "E" : "0",
+                                      (rdes0 >> RDES0.FL_ROLL) & RDES0.FL_MASK,
+                                      rdes0, rdes1, rdes2, rdes3));
+                    }
+                }
+            }
+            finally {
+                this.rxPackets.Release(fifo);
+            }
+        }
+    }
+}
diff --git a/base/Drivers/Network/Tulip/TulipTxRingBuffer.sg b/base/Drivers/Network/Tulip/TulipTxRingBuffer.sg
new file mode 100644
index 0000000..1664a60
--- /dev/null
+++ b/base/Drivers/Network/Tulip/TulipTxRingBuffer.sg
@@ -0,0 +1,384 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TulipTxRingBuffer.cs
+//
+//  Notes:
+//
+
+using Microsoft.Contracts;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.V1.Services;
+using System;
+
+namespace Microsoft.Singularity.Drivers.Network.Tulip
+{
+    internal class TulipTxRingBuffer
+    {
+        internal const int MaxFragmentBytes       = 2047;
+        internal const int BytesPerDescriptor     = 16;
+        internal const int DescriptorAlignment    = 4;
+        internal const int FragmentsPerDescriptor = 2;
+
+        private ExRef<PacketFifo>! txPackets;
+        private IoMemory!          region;
+        private IoMemory!          setupFrame;
+
+        // Descriptor ring buffer values
+        private readonly int capacity;
+        private int head;
+        private int count;
+
+        internal TulipTxRingBuffer(int packetCount, int fragmentCount)
+            requires packetCount > 0 && IsPowerOf2(packetCount);
+            requires fragmentCount > 0 && IsPowerOf2(fragmentCount);
+            requires fragmentCount >= packetCount;
+        {
+            this.txPackets =
+                new ExRef<PacketFifo>(new [ExHeap] PacketFifo(packetCount),
+                                      true);
+
+            int descriptorCount = fragmentCount / FragmentsPerDescriptor;
+            this.region =
+                (!)IoMemory.AllocatePhysical(
+                    new UIntPtr((uint)(descriptorCount * BytesPerDescriptor)),
+                    DescriptorAlignment
+                    );
+
+            this.setupFrame =
+                (!)IoMemory.AllocatePhysical(Tulip.SetupFrameBytes, 0);
+
+            this.capacity   = descriptorCount;
+            this.head       = 0;
+            this.count      = 0;
+        }
+
+        internal void Reset()
+            requires this.Count == 0;
+        {
+            this.head = 0;
+            for (int i = 0; i < this.region.Length; i += BytesPerDescriptor) {
+                this.region.Write32(i, 0);
+            }
+        }
+
+        [Pure]
+        internal int FreePacketSlots
+        {
+            get {
+                PacketFifo*! in ExHeap txFifo = this.txPackets.Acquire();
+                try {
+                    return txFifo->Capacity - txFifo->Count;
+                }
+                finally {
+                    this.txPackets.Release(txFifo);
+                }
+            }
+        }
+
+        internal void Push(PacketFifo*! in ExHeap incoming)
+            requires incoming->Count <= FreePacketSlots;
+            ensures FreePacketSlots == old(FreePacketSlots) - old(incoming->Count);
+        {
+            PacketFifo*! in ExHeap txFifo = this.txPackets.Acquire();
+            try {
+                while (incoming->Count > 0) {
+                    Packet*! in ExHeap packet = incoming->Pop();
+                    PushPacket(packet);
+                    txFifo->Push(packet);
+                }
+            }
+            finally {
+                this.txPackets.Release(txFifo);
+            }
+        }
+
+        [Pure]
+        internal int DescriptorsRequired(Packet*! in ExHeap packet)
+        {
+            return (packet->FragmentCount + FragmentsPerDescriptor - 1) / FragmentsPerDescriptor;
+        }
+
+        private static void
+        GetFragmentPhysicalAddressAndLength(Packet*! in ExHeap packet,
+                                            int         fragment,
+                                            out uint    phyAddr,
+                                            out uint    length)
+            requires fragment <= packet->FragmentCount;
+        {
+            if (fragment < packet->FragmentCount) {
+                UIntPtr vAddr;
+                int     vLength;
+                packet->GetFragmentRange(fragment, out vAddr, out vLength);
+                phyAddr = GetPhysicalAddress(vAddr).ToUInt32();
+                length  = (uint)vLength;
+            }
+            else {
+                phyAddr = 0;
+                length  = 0;
+            }
+        }
+
+        private void PushPacket(Packet*! in ExHeap packet)
+            requires packet->GetLength() <= Tulip.MtuBytes;
+            requires DescriptorsRequired(packet) + this.Count <= this.Capacity;
+            ensures this.Count == old(this.Count) + DescriptorsRequired(packet);            ensures this.Head == (old(this.Head) + DescriptorsRequired(packet)) % this.Capacity;
+        {
+            int descriptorsRequired = DescriptorsRequired(packet);
+            int startHead           = this.head;
+            int descriptorsDone     = 0;
+
+            while (descriptorsDone < descriptorsRequired) {
+                int fragment = descriptorsDone * FragmentsPerDescriptor;
+                uint tdes2;
+                uint len2;
+
+                GetFragmentPhysicalAddressAndLength(packet, fragment,
+                                                    out tdes2, out len2);
+                uint tdes3;
+                uint len3;
+                GetFragmentPhysicalAddressAndLength(packet, fragment + 1,
+                                                    out tdes3, out len3);
+
+                uint tdes1 = (len2 & TDES1.TBS_MASK);
+                tdes1 |= (len3 & TDES1.TBS_MASK) << TDES1.TBS2_ROLL;
+
+                uint tdes0;
+                if (descriptorsDone == 0) {
+                    tdes0 = 0;
+                    tdes1 |= TDES1.FS;
+                }
+                else {
+                    tdes0 = TDES0.OWN;
+                }
+
+                if (descriptorsDone + 1 == descriptorsRequired) {
+                    tdes1 |= TDES1.LS | TDES1.IC;
+                }
+
+                if (this.head == (this.Capacity - 1)) {
+                    tdes1 |= TDES1.TER;
+                }
+
+                int tdes0Base = this.head * BytesPerDescriptor;
+                this.region.Write32(tdes0Base,      tdes0);
+                this.region.Write32(tdes0Base + 4,  tdes1);
+                this.region.Write32(tdes0Base + 8,  tdes2);
+                this.region.Write32(tdes0Base + 12, tdes3);
+
+                this.head = (this.head + 1) & (this.Capacity - 1);
+                this.count++;
+                descriptorsDone++;
+            }
+
+            // Update ownership of first descriptor last to
+            // avoid race setting up the buffers.  Getting
+            // context switched would be painful otherwise.
+            this.region.Write32(startHead * BytesPerDescriptor, TDES0.OWN);
+        }
+
+        public void Pop(PacketFifo*! in ExHeap outgoing)
+            ensures this.Count >= 0 && this.Count <= old(this.Count);
+        {
+            PacketFifo*! in ExHeap txFifo = this.txPackets.Acquire();
+            try {
+                while (txFifo->Count > 0) {
+                    uint tdes0 = this.region.Read32(this.Tail * BytesPerDescriptor);
+                    if ((tdes0 & TDES0.OWN) == TDES0.OWN) {
+                        break;
+                    } else if ((tdes0 & TDES0.ES) == TDES0.ES) {
+                        // Found an error, clear error for
+                        // retry.
+                        this.region.Write32(this.Tail * BytesPerDescriptor,
+                                            TDES0.OWN);
+                        break;
+                    }
+
+                    Packet*! in ExHeap packet = txFifo->Pop();
+                    packet->FromDeviceFlags = FromDeviceFlags.TransmitSuccess;
+                    this.count -= DescriptorsRequired(packet);
+                    outgoing->Push(packet);
+                }
+            }
+            finally {
+                this.txPackets.Release(txFifo);
+            }
+        }
+
+        internal void ClearTransmitError()
+        {
+            PacketFifo*! in ExHeap txFifo = this.txPackets.Acquire();
+            try {
+                if (txFifo->Count == 0)
+                    return;
+
+                uint tdes0 = this.region.Read32(this.Tail * BytesPerDescriptor);
+                if ((tdes0 & TDES0.ES) == TDES0.ES) {
+                    this.region.Write32(this.Tail * BytesPerDescriptor,
+                                        TDES0.OWN);
+                }
+            }
+            finally {
+                this.txPackets.Release(txFifo);
+            }
+        }
+
+        internal void WriteSetupFrame(byte[]!       setupFrame,
+                                      FilteringType filteringType)
+            requires setupFrame.Length == Tulip.SetupFrameBytes;
+            requires filteringType >= FilteringType.MinValue && filteringType <= FilteringType.MaxValue;
+            requires this.Count == 0;
+            requires this.Head  == 0;
+        {
+            this.setupFrame.Write8(0, setupFrame);
+
+            uint tdes1 = TDES1.SET | (uint)setupFrame.Length;
+            switch (filteringType) {
+                case FilteringType.Perfect:
+                    tdes1 |= TDES1.FT_PERFECT;
+                    break;
+                case FilteringType.Hash:
+                    tdes1 |= TDES1.FT_HASH;
+                    break;
+                case FilteringType.Inverse:
+                    tdes1 |= TDES1.FT_INVERSE;
+                    break;
+                case FilteringType.HashOnly:
+                    tdes1 |= TDES1.FT_HASH_ONLY;
+                    break;
+                default:
+                    DebugStub.Break();
+                    break;
+            }
+
+            this.region.Write32(12, 0);
+            this.region.Write32(8, (uint)this.setupFrame.PhysicalAddress.Value);
+            this.region.Write32(4, tdes1);
+            this.region.Write32(0, TDES0.OWN);
+
+            this.head  = 1;
+            this.count = 1;
+        }
+
+        internal bool PollSetupFrameCompleted()
+            requires this.Count == 1;
+            requires this.Head  == 1;
+        {
+            // NB spec has no timeout, it appears setup frame always completes
+            uint tdes0 = this.region.Read32(0);
+            if (tdes0 == TDES0.SETUP_DONE) {
+                this.count--;
+                return true;
+            }
+            return false;
+        }
+
+        private static UIntPtr GetPhysicalAddress(UIntPtr va)
+        {
+            UIntPtr pa;         // Physical address
+            UIntPtr paLeft;     // Bytes remaining on physical page
+            if (!DeviceService.GetDmaPhysicalAddress(va, out pa, out paLeft) ||
+                pa == UIntPtr.Zero ||
+                paLeft < Tulip.MtuBytes) {
+                throw new ApplicationException("Bad DMA pointer");
+            }
+            return pa;
+        }
+
+        internal UIntPtr BaseAddress
+        {
+            get { return this.region.PhysicalAddress.Value; }
+        }
+
+        [Pure]
+        internal int Capacity { get { return this.capacity; } }
+
+        [Pure]
+        internal int Count { get { return this.count; } }
+
+        [Pure]
+        internal int Free { get { return this.capacity - this.count; } }
+
+        [Pure]
+        internal int Head { get { return this.head; } }
+
+        [Pure]
+        internal int Tail
+        {
+            get {
+                return ((this.capacity + this.head - this.count) %
+                        this.capacity);
+            }
+        }
+
+        [Pure]
+        private static bool IsPowerOf2(int n)
+        {
+            return (n > 0) && ((n & (n - 1)) == 0);
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_TULIP") ]
+        private static void DumpOwnership(int start, int end, bool owned)
+        {
+            TulipDebug.Print(
+                "{0:4}-{1:4} {2}\n",
+                __arglist(start, end, owned ? "OWNED" : "UNOWNED")
+                );
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_TULIP") ]
+        internal void DumpOwnership(string title)
+        {
+            TulipDebug.Print("{0}\n", __arglist(title));
+            PacketFifo*! in ExHeap fifo = this.txPackets.Acquire();
+            try {
+                assert fifo->Count == this.Count;
+                TulipDebug.Print("Head = {0} Tail = {1} PacketCount = {2}\n",
+                                 __arglist(this.Head, this.Tail,
+                                           fifo->Count));
+
+                bool errorsFound = false;
+
+                uint lastTdes0 = this.region.Read32(0) & TDES0.OWN;
+                int lastStart = 0;
+                for (int i = 1; i < this.Capacity; i++) {
+                    uint tdes0 = this.region.Read32(i * BytesPerDescriptor);
+                    errorsFound = ((tdes0 & TDES0.ES) != 0);
+
+                    if ((tdes0 & TDES0.OWN) != lastTdes0) {
+                        DumpOwnership(lastStart, i - 1,
+                                      lastTdes0 == TDES0.OWN);
+                        lastStart = i;
+                        lastTdes0 = tdes0 & TDES0.OWN;
+                    }
+                }
+                DumpOwnership(lastStart, this.Capacity - 1,
+                              (lastTdes0 & TDES0.OWN) == TDES0.OWN);
+
+                if (errorsFound) {
+                    for (int i = 0; i < this.Capacity; i++) {
+                        uint tdes0, tdes1, tdes2, tdes3;
+                        tdes0 = this.region.Read32(i * BytesPerDescriptor);
+                        tdes1 = this.region.Read32(i * BytesPerDescriptor + 4);
+                        tdes2 = this.region.Read32(i * BytesPerDescriptor + 8);
+                        tdes3 = this.region.Read32(i * BytesPerDescriptor + 12);
+                        TulipDebug.Print(
+                            "{0:x4} {1}{2} TDES [0]={3:x8} [1]={4:x8} [2]={5:x8} [3]={6:x8}\n",
+                            __arglist(i,
+                                      (tdes0 & TDES0.OWN) != 0 ? "O" : "U",
+                                      (tdes0 & TDES0.ES)  != 0 ? "E" : "0",
+                                      tdes0, tdes1, tdes2, tdes3));
+                    }
+                }
+            }
+            finally {
+                this.txPackets.Release(fifo);
+            }
+        }
+    }
+}
diff --git a/base/Drivers/Network/nForce4_MSIL/nForce4_MSIL.csproj b/base/Drivers/Network/nForce4_MSIL/nForce4_MSIL.csproj
new file mode 100644
index 0000000..44d9ef8
--- /dev/null
+++ b/base/Drivers/Network/nForce4_MSIL/nForce4_MSIL.csproj
@@ -0,0 +1,31 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<!-- A special project that merely copies the precompiled nForce4 MSIL binary
+to the object directory. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+  
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>nvmac</AssemblyName>
+    <Precompiled>true</Precompiled>
+    <PrecompiledPath>$(PRECOMPILED_NVIDIA_DIR)</PrecompiledPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Drivers.Net\Drivers.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Net.Contracts\Io.Net.Contracts.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/S3Trio64/BitmapFileHeader.cs b/base/Drivers/S3Trio64/BitmapFileHeader.cs
new file mode 100644
index 0000000..7efc926
--- /dev/null
+++ b/base/Drivers/S3Trio64/BitmapFileHeader.cs
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:    BitmapFileHeader.cs
+//
+//  Note:
+//
+#define BUG
+
+using System;
+using System.Runtime.InteropServices;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Io
+{
+#if BUG
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Explicit)]
+    public pointerfree struct BITMAPFILEHEADER {
+        [FieldOffset( 0)] public ushort bfType;
+        [FieldOffset( 2)] public uint bfSize;
+        [FieldOffset( 6)] public ushort bfReserved1;
+        [FieldOffset( 8)] public ushort bfReserved2;
+        [FieldOffset(10)] public int bfOffBits;
+#else
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Sequential, Pack=2)]
+    public pointerfree struct BITMAPFILEHEADER {
+        public ushort bfType;
+        public uint bfSize;
+        public ushort bfReserved1;
+        public ushort bfReserved2;
+        public int bfOffBits;
+#endif
+
+        public static BITMAPFILEHEADER Read(byte[]! in ExHeap buffer,
+                                            int offset, out int used)
+        {
+            if (buffer == null || offset < 0 ||
+                offset + sizeof(BITMAPFILEHEADER) > buffer.Length) {
+                unchecked {
+                    Tracing.Log(Tracing.Error,
+                                "BITMAPFILEHEADER Read(offset={0}, length={1})",
+                                (UIntPtr)(uint)offset,
+                                (UIntPtr)(uint)buffer.Length);
+                }
+                throw new OverflowException("Read source invalid.");
+            }
+
+            used = offset + /*sizeof(BITMAPFILEHEADER)*/ 14;
+
+            ref BITMAPFILEHEADER bmfh = ref buffer[offset];
+            return bmfh;
+        }
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Drivers/S3Trio64/BitmapInfoHeader.cs b/base/Drivers/S3Trio64/BitmapInfoHeader.cs
new file mode 100644
index 0000000..8e67cc9
--- /dev/null
+++ b/base/Drivers/S3Trio64/BitmapInfoHeader.cs
@@ -0,0 +1,88 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BitmapInfoHeader.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Explicit)]
+    public pointerfree struct BITMAPINFOHEADER {
+        [FieldOffset( 0)] public uint     biSize;
+        [FieldOffset( 4)] public int      biWidth;
+        [FieldOffset( 8)] public int      biHeight;
+        [FieldOffset(12)] public ushort   biPlanes;
+        [FieldOffset(14)] public ushort   biBitCount;
+        [FieldOffset(16)] public uint     biCompression;
+        [FieldOffset(20)] public uint     biSizeImage;
+        [FieldOffset(24)] public int      biXPelsPerMeter;
+        [FieldOffset(28)] public int      biYPelsPerMeter;
+        [FieldOffset(30)] public uint     biClrUsed;
+        [FieldOffset(32)] public uint     biClrImportant;
+
+        public static BITMAPINFOHEADER Read(byte[]! in ExHeap buffer,
+                                            int offset, out int used)
+        {
+            if (buffer == null || offset < 0 ||
+                offset + sizeof(BITMAPINFOHEADER) > buffer.Length) {
+                unchecked {
+                    Tracing.Log(Tracing.Error,
+                                "BITMAPINFOHEADER Read(offset={0}, length={1})",
+                                (UIntPtr)(uint)offset,
+                                (UIntPtr)(uint)buffer.Length);
+                }
+                throw new OverflowException("Read source invalid.");
+            }
+
+            used = offset + sizeof(BITMAPINFOHEADER);
+
+            ref BITMAPINFOHEADER bmih = ref buffer[offset];
+            return bmih;
+        }
+
+        public RGB[] ReadPalette(byte[]! in ExHeap buffer, int offset, out int used)
+        {
+            if (biClrUsed == 0 && biBitCount >= 24) {
+                used = offset;
+                return null;
+            }
+
+            int count = (biClrUsed != 0) ? (int)biClrUsed : (1 << biBitCount);
+
+            if (buffer == null || offset < 0 ||
+                offset + count * sizeof(uint) > buffer.Length) {
+                unchecked {
+                    Tracing.Log(Tracing.Error,
+                                "RGB Read(offset={0}, count={1}, length={2}",
+                                (UIntPtr)(uint)offset,
+                                (UIntPtr)(uint)count,
+                                (UIntPtr)(uint)buffer.Length);
+                }
+                throw new OverflowException("Read source invalid.");
+            }
+
+            RGB[] values = new RGB [count];
+            used = offset;
+            offset += sizeof(uint);
+
+            for (int i = 0; i < count; i++) {
+                values[i] = new RGB(buffer[2+offset], buffer[1+offset], buffer[0+offset]);
+                offset += sizeof(uint);
+            }
+            return values;
+        }
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Drivers/S3Trio64/Fonts.sg b/base/Drivers/S3Trio64/Fonts.sg
new file mode 100644
index 0000000..a9938f4
--- /dev/null
+++ b/base/Drivers/S3Trio64/Fonts.sg
@@ -0,0 +1,1054 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fonts.sg
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Drivers.S3Trio64
+{
+    public sealed class Fonts
+    {
+        public static byte[] Font16 = {
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xc3,0xe7,0xff,0xff,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x6c,0xfe,0xfe,0xfe,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x10,0x38,0x7c,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x3c,0x3c,0xe7,0xe7,0xe7,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x3c,0x7e,0xff,0xff,0x7e,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+            0xff,0xff,0xff,0xff,0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x00,0x00,0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00,0x00,0x00,0x00,0x00,
+            0xff,0xff,0xff,0xff,0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x1e,0x0e,0x1a,0x32,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0x66,0x66,0x66,0x3c,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3f,0x33,0x3f,0x30,0x30,0x30,0x30,0x70,0xf0,0xe0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7f,0x63,0x7f,0x63,0x63,0x63,0x63,0x67,0xe7,0xe6,0xc0,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x18,0xdb,0x3c,0xe7,0x3c,0xdb,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfe,0xf8,0xf0,0xe0,0xc0,0x80,0x00,0x00,0x00,0x00,
+            0x00,0x02,0x06,0x0e,0x1e,0x3e,0xfe,0x3e,0x1e,0x0e,0x06,0x02,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x66,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7f,0xdb,0xdb,0xdb,0x7b,0x1b,0x1b,0x1b,0x1b,0x1b,0x00,0x00,0x00,0x00,
+            0x00,0x7c,0xc6,0x60,0x38,0x6c,0xc6,0xc6,0x6c,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x28,0x6c,0xfe,0x6c,0x28,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x10,0x38,0x38,0x7c,0x7c,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xfe,0xfe,0x7c,0x7c,0x38,0x38,0x10,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x3c,0x3c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x66,0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x6c,0x6c,0xfe,0x6c,0x6c,0x6c,0xfe,0x6c,0x6c,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x7c,0xc6,0xc2,0xc0,0x7c,0x06,0x06,0x86,0xc6,0x7c,0x18,0x18,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xc2,0xc6,0x0c,0x18,0x30,0x60,0xc6,0x86,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0x6c,0x38,0x76,0xdc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x0c,0x18,0x30,0x30,0x30,0x30,0x30,0x30,0x18,0x0c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x30,0x18,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x18,0x30,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0xc6,0xc6,0xd6,0xd6,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x38,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0x06,0x0c,0x18,0x30,0x60,0xc0,0xc6,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0x06,0x06,0x3c,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x0c,0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xfc,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x60,0xc0,0xc0,0xfc,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc6,0x06,0x06,0x0c,0x18,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7e,0x06,0x06,0x06,0x0c,0x78,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x06,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x06,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x60,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x60,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0x0c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x66,0x66,0x66,0x66,0xfc,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xf8,0x6c,0x66,0x66,0x66,0x66,0x66,0x66,0x6c,0xf8,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xde,0xc6,0xc6,0x66,0x3a,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x1e,0x0c,0x0c,0x0c,0x0c,0x0c,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xe6,0x66,0x66,0x6c,0x78,0x78,0x6c,0x66,0x66,0xe6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xf0,0x60,0x60,0x60,0x60,0x60,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xee,0xfe,0xfe,0xd6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xd6,0xde,0x7c,0x0c,0x0e,0x00,0x00,
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x6c,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0x60,0x38,0x0c,0x06,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0x7e,0x5a,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x10,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xd6,0xd6,0xd6,0xfe,0xee,0x6c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0x6c,0x7c,0x38,0x38,0x7c,0x6c,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x66,0x66,0x3c,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc6,0x86,0x0c,0x18,0x30,0x60,0xc2,0xc6,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0x02,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00,0x00,0x00,0x00,
+            0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,
+            0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xe0,0x60,0x60,0x78,0x6c,0x66,0x66,0x66,0x66,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc0,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x1c,0x0c,0x0c,0x3c,0x6c,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0xcc,0x78,0x00,
+            0x00,0x00,0xe0,0x60,0x60,0x6c,0x76,0x66,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x06,0x06,0x00,0x0e,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00,
+            0x00,0x00,0xe0,0x60,0x60,0x66,0x6c,0x78,0x78,0x6c,0x66,0xe6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xec,0xfe,0xd6,0xd6,0xd6,0xd6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x1e,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xdc,0x76,0x66,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0x60,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x10,0x30,0x30,0xfc,0x30,0x30,0x30,0x30,0x36,0x1c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x3c,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xd6,0xd6,0xd6,0xfe,0x6c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc6,0x6c,0x38,0x38,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0xf8,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xfe,0xcc,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x0e,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x70,0x18,0x18,0x18,0x0e,0x18,0x18,0x18,0x18,0x70,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xfe,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x0c,0x06,0x7c,0x00,0x00,
+            0x00,0x00,0xcc,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x0c,0x18,0x30,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xcc,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x38,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x3c,0x66,0x60,0x60,0x66,0x3c,0x0c,0x06,0x3c,0x00,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x18,0x3c,0x66,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0xc6,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x38,0x6c,0x38,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x18,0x30,0x60,0x00,0xfe,0x66,0x60,0x7c,0x60,0x60,0x66,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xcc,0x76,0x36,0x7e,0xd8,0xd8,0x6e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3e,0x6c,0xcc,0xcc,0xfe,0xcc,0xcc,0xcc,0xcc,0xce,0x00,0x00,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x30,0x78,0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0x78,0x00,
+            0x00,0xc6,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0xc6,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x18,0x18,0x3c,0x66,0x60,0x60,0x60,0x66,0x3c,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xe6,0xfc,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x3c,0x18,0x7e,0x18,0x7e,0x18,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0xf8,0xcc,0xcc,0xf8,0xc4,0xcc,0xde,0xcc,0xcc,0xcc,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x0e,0x1b,0x18,0x18,0x18,0x7e,0x18,0x18,0x18,0x18,0x18,0xd8,0x70,0x00,0x00,
+            0x00,0x18,0x30,0x60,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x0c,0x18,0x30,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x18,0x30,0x60,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x18,0x30,0x60,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x76,0xdc,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00,
+            0x76,0xdc,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x3c,0x6c,0x6c,0x3e,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x6c,0x38,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x30,0x30,0x00,0x30,0x30,0x60,0xc0,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0x06,0x06,0x06,0x00,0x00,0x00,0x00,0x00,
+            0x00,0xc0,0xc0,0xc2,0xc6,0xcc,0x18,0x30,0x60,0xdc,0x86,0x0c,0x18,0x3e,0x00,0x00,
+            0x00,0xc0,0xc0,0xc2,0xc6,0xcc,0x18,0x30,0x66,0xce,0x9e,0x3e,0x06,0x06,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x18,0x3c,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x36,0x6c,0xd8,0x6c,0x36,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xd8,0x6c,0x36,0x6c,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,
+            0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,
+            0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x3f,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x18,0x18,0x18,0x18,0x18,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x18,0x18,0x18,0x18,0x18,0xff,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+            0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,
+            0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,
+            0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0xd8,0xd8,0xd8,0xdc,0x76,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xd8,0xcc,0xc6,0xc6,0xc6,0xcc,0x00,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xfe,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0xfe,0xc6,0x60,0x30,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7e,0xd8,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xc0,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x76,0xdc,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x7e,0x18,0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0xc6,0xc6,0xc6,0x6c,0x6c,0x6c,0x6c,0xee,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x1e,0x30,0x18,0x0c,0x3e,0x66,0x66,0x66,0x66,0x3c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7e,0xdb,0xdb,0xdb,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x03,0x06,0x7e,0xdb,0xdb,0xf3,0x7e,0x60,0xc0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x1c,0x30,0x60,0x60,0x7c,0x60,0x60,0x60,0x30,0x1c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x00,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x00,0x7e,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x0e,0x1b,0x1b,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x7e,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x6c,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x0f,0x0c,0x0c,0x0c,0x0c,0x0c,0xec,0x6c,0x6c,0x3c,0x1c,0x00,0x00,0x00,0x00,
+            0x00,0xd8,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x70,0xd8,0x30,0x60,0xc8,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        };
+
+        public static byte[] Font14 = {
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x7e,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xc3,0xe7,0xff,0x7e,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x6c,0xfe,0xfe,0xfe,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x10,0x38,0x7c,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x3c,0xe7,0xe7,0xe7,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0xff,0xff,0x7e,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00,0x00,
+            0xff,0xff,0xff,0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x00,0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00,0x00,0x00,0x00,
+            0xff,0xff,0xff,0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x1e,0x0e,0x1a,0x32,0x78,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x3f,0x33,0x3f,0x30,0x30,0x30,0x70,0xf0,0xe0,0x00,0x00,0x00,
+            0x00,0x00,0x7f,0x63,0x7f,0x63,0x63,0x63,0x67,0xe7,0xe6,0xc0,0x00,0x00,
+            0x00,0x00,0x18,0x18,0xdb,0x3c,0xe7,0x3c,0xdb,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x80,0xc0,0xe0,0xf8,0xfe,0xf8,0xe0,0xc0,0x80,0x00,0x00,0x00,
+            0x00,0x00,0x02,0x06,0x0e,0x3e,0xfe,0x3e,0x0e,0x06,0x02,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x66,0x00,0x00,0x00,
+            0x00,0x00,0x7f,0xdb,0xdb,0xdb,0x7b,0x1b,0x1b,0x1b,0x1b,0x00,0x00,0x00,
+            0x00,0x7c,0xc6,0x60,0x38,0x6c,0xc6,0xc6,0x6c,0x38,0x0c,0xc6,0x7c,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x7e,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xfe,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x28,0x6c,0xfe,0x6c,0x28,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x10,0x38,0x38,0x7c,0x7c,0xfe,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0xfe,0xfe,0x7c,0x7c,0x38,0x38,0x10,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x3c,0x3c,0x3c,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x66,0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x6c,0x6c,0xfe,0x6c,0x6c,0x6c,0xfe,0x6c,0x6c,0x00,0x00,0x00,
+            0x18,0x18,0x7c,0xc6,0xc2,0xc0,0x7c,0x06,0x86,0xc6,0x7c,0x18,0x18,0x00,
+            0x00,0x00,0x00,0x00,0xc2,0xc6,0x0c,0x18,0x30,0x66,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0x6c,0x38,0x76,0xdc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x0c,0x18,0x30,0x30,0x30,0x30,0x30,0x18,0x0c,0x00,0x00,0x00,
+            0x00,0x00,0x30,0x18,0x0c,0x0c,0x0c,0x0c,0x0c,0x18,0x30,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xce,0xde,0xf6,0xe6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x38,0x78,0x18,0x18,0x18,0x18,0x18,0x7e,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0x06,0x0c,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0x06,0x06,0x3c,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x0c,0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x0c,0x1e,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xfc,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x60,0xc0,0xc0,0xfc,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc6,0x06,0x0c,0x18,0x30,0x30,0x30,0x30,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7c,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7e,0x06,0x06,0x0c,0x78,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,
+            0x00,0x00,0x06,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x06,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x60,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x60,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0x0c,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x66,0x66,0x66,0xfc,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0xf8,0x6c,0x66,0x66,0x66,0x66,0x66,0x6c,0xf8,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x62,0x66,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x60,0xf0,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xde,0xc6,0x66,0x3a,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x1e,0x0c,0x0c,0x0c,0x0c,0x0c,0xcc,0xcc,0x78,0x00,0x00,0x00,
+            0x00,0x00,0xe6,0x66,0x6c,0x6c,0x78,0x6c,0x6c,0x66,0xe6,0x00,0x00,0x00,
+            0x00,0x00,0xf0,0x60,0x60,0x60,0x60,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xee,0xfe,0xfe,0xd6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xd6,0xde,0x7c,0x0c,0x0e,0x00,0x00,
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x6c,0x66,0x66,0xe6,0x00,0x00,0x00,
+            0x00,0x00,0x7c,0xc6,0xc6,0x60,0x38,0x0c,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0x7e,0x5a,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x10,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xd6,0xd6,0xfe,0x7c,0x6c,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0x6c,0x38,0x38,0x38,0x6c,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x66,0x66,0x3c,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc6,0x8c,0x18,0x30,0x60,0xc2,0xc6,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0x02,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00,0x00,0x00,
+            0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,
+            0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0xe0,0x60,0x60,0x78,0x6c,0x66,0x66,0x66,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x1c,0x0c,0x0c,0x3c,0x6c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0x7c,0x0c,0xcc,0x78,0x00,
+            0x00,0x00,0xe0,0x60,0x60,0x6c,0x76,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x06,0x06,0x00,0x0e,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00,
+            0x00,0x00,0xe0,0x60,0x60,0x66,0x6c,0x78,0x6c,0x66,0xe6,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xec,0xfe,0xd6,0xd6,0xd6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x1e,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xdc,0x76,0x66,0x60,0x60,0xf0,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0x70,0x1c,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x10,0x30,0x30,0xfc,0x30,0x30,0x30,0x36,0x1c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x3c,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xd6,0xd6,0xfe,0x6c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc6,0x6c,0x38,0x38,0x6c,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0xf8,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xfe,0xcc,0x18,0x30,0x66,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0x0e,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x0e,0x00,0x00,0x00,
+            0x00,0x00,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x70,0x18,0x18,0x18,0x0e,0x18,0x18,0x18,0x70,0x00,0x00,0x00,
+            0x00,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66,0x3c,0x0c,0x06,0x7c,0x00,
+            0x00,0x00,0xcc,0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x0c,0x18,0x30,0x00,0x7c,0xc6,0xfe,0xc0,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0xcc,0xcc,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x38,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x3c,0x66,0x60,0x66,0x3c,0x0c,0x06,0x3c,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xfe,0xc0,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0xcc,0xcc,0x00,0x7c,0xc6,0xfe,0xc0,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xfe,0xc0,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x00,0x38,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x18,0x3c,0x66,0x00,0x38,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0xc6,0xc6,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0x00,0x00,0x00,
+            0x38,0x6c,0x38,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0x00,0x00,0x00,
+            0x18,0x30,0x60,0x00,0xfe,0x66,0x60,0x7c,0x60,0x66,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xcc,0x76,0x36,0x7e,0xd8,0xd8,0x6e,0x00,0x00,0x00,
+            0x00,0x00,0x3e,0x6c,0xcc,0xcc,0xfe,0xcc,0xcc,0xcc,0xce,0x00,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x30,0x78,0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x60,0x30,0x18,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0xc6,0xc6,0x00,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0x78,0x00,
+            0x00,0xc6,0xc6,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,
+            0x00,0xc6,0xc6,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x18,0x18,0x3c,0x66,0x60,0x60,0x66,0x3c,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0xe6,0xfc,0x00,0x00,0x00,
+            0x00,0x00,0x66,0x66,0x3c,0x18,0x7e,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,
+            0x00,0xf8,0xcc,0xcc,0xf8,0xc4,0xcc,0xde,0xcc,0xcc,0xc6,0x00,0x00,0x00,
+            0x00,0x0e,0x1b,0x18,0x18,0x18,0x7e,0x18,0x18,0x18,0x18,0xd8,0x70,0x00,
+            0x00,0x18,0x30,0x60,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x0c,0x18,0x30,0x00,0x38,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,
+            0x00,0x18,0x30,0x60,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x18,0x30,0x60,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0x76,0xdc,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,
+            0x76,0xdc,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x3c,0x6c,0x6c,0x3e,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x6c,0x38,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x30,0x30,0x00,0x30,0x30,0x60,0xc6,0xc6,0x7c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0x06,0x06,0x00,0x00,0x00,0x00,
+            0x00,0xc0,0xc0,0xc6,0xcc,0xd8,0x30,0x60,0xdc,0x86,0x0c,0x18,0x3e,0x00,
+            0x00,0xc0,0xc0,0xc6,0xcc,0xd8,0x30,0x66,0xce,0x9e,0x3e,0x06,0x06,0x00,
+            0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x3c,0x3c,0x3c,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x36,0x6c,0xd8,0x6c,0x36,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xd8,0x6c,0x36,0x6c,0xd8,0x00,0x00,0x00,0x00,0x00,
+            0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,
+            0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,
+            0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x37,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x3f,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x18,0x18,0x18,0x18,0x18,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x18,0x18,0x18,0x18,0x18,0xff,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,
+            0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+            0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,
+            0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,
+            0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0xd8,0xd8,0xdc,0x76,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x7c,0xc6,0xfc,0xc6,0xc6,0xfc,0xc0,0xc0,0x40,0x00,
+            0x00,0x00,0xfe,0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xfe,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,
+            0x00,0x00,0xfe,0xc6,0x60,0x30,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7e,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xc0,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x76,0xdc,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x7e,0x18,0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,
+            0x00,0x00,0x38,0x6c,0xc6,0xc6,0xc6,0x6c,0x6c,0x6c,0xee,0x00,0x00,0x00,
+            0x00,0x00,0x1e,0x30,0x18,0x0c,0x3e,0x66,0x66,0x66,0x3c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x7e,0xdb,0xdb,0x7e,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x03,0x06,0x7e,0xdb,0xdb,0xf3,0x7e,0x60,0xc0,0x00,0x00,0x00,
+            0x00,0x00,0x1c,0x30,0x60,0x60,0x7c,0x60,0x60,0x30,0x1c,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,
+            0x00,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0xff,0x00,0x00,0x00,
+            0x00,0x00,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x00,0x7e,0x00,0x00,0x00,
+            0x00,0x00,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x00,0x7e,0x00,0x00,0x00,
+            0x00,0x00,0x0e,0x1b,0x1b,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0x70,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x18,0x00,0x7e,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x76,0xdc,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x38,0x6c,0x6c,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x0f,0x0c,0x0c,0x0c,0x0c,0x0c,0xec,0x6c,0x3c,0x1c,0x00,0x00,0x00,
+            0x00,0xd8,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x70,0xd8,0x30,0x60,0xc8,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        };
+
+        public static byte[] Font8 = {
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x7e,0x81,0xa5,0x81,0xbd,0x99,0x81,0x7e,
+            0x7e,0xff,0xdb,0xff,0xc3,0xe7,0xff,0x7e,
+            0x6c,0xfe,0xfe,0xfe,0x7c,0x38,0x10,0x00,
+            0x10,0x38,0x7c,0xfe,0x7c,0x38,0x10,0x00,
+            0x38,0x7c,0x38,0xfe,0xfe,0x7c,0x38,0x7c,
+            0x10,0x10,0x38,0x7c,0xfe,0x7c,0x38,0x7c,
+            0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00,
+            0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff,
+            0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00,
+            0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff,
+            0x0f,0x07,0x0f,0x7d,0xcc,0xcc,0xcc,0x78,
+            0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x18,
+            0x3f,0x33,0x3f,0x30,0x30,0x70,0xf0,0xe0,
+            0x7f,0x63,0x7f,0x63,0x63,0x67,0xe6,0xc0,
+            0x99,0x5a,0x3c,0xe7,0xe7,0x3c,0x5a,0x99,
+            0x80,0xe0,0xf8,0xfe,0xf8,0xe0,0x80,0x00,
+            0x02,0x0e,0x3e,0xfe,0x3e,0x0e,0x02,0x00,
+            0x18,0x3c,0x7e,0x18,0x18,0x7e,0x3c,0x18,
+            0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x00,
+            0x7f,0xdb,0xdb,0x7b,0x1b,0x1b,0x1b,0x00,
+            0x3e,0x63,0x38,0x6c,0x6c,0x38,0xcc,0x78,
+            0x00,0x00,0x00,0x00,0x7e,0x7e,0x7e,0x00,
+            0x18,0x3c,0x7e,0x18,0x7e,0x3c,0x18,0xff,
+            0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x00,
+            0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,
+            0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00,
+            0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00,
+            0x00,0x00,0xc0,0xc0,0xc0,0xfe,0x00,0x00,
+            0x00,0x24,0x66,0xff,0x66,0x24,0x00,0x00,
+            0x00,0x18,0x3c,0x7e,0xff,0xff,0x00,0x00,
+            0x00,0xff,0xff,0x7e,0x3c,0x18,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x30,0x78,0x78,0x30,0x30,0x00,0x30,0x00,
+            0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,0x00,
+            0x6c,0x6c,0xfe,0x6c,0xfe,0x6c,0x6c,0x00,
+            0x30,0x7c,0xc0,0x78,0x0c,0xf8,0x30,0x00,
+            0x00,0xc6,0xcc,0x18,0x30,0x66,0xc6,0x00,
+            0x38,0x6c,0x38,0x76,0xdc,0xcc,0x76,0x00,
+            0x60,0x60,0xc0,0x00,0x00,0x00,0x00,0x00,
+            0x18,0x30,0x60,0x60,0x60,0x30,0x18,0x00,
+            0x60,0x30,0x18,0x18,0x18,0x30,0x60,0x00,
+            0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,
+            0x00,0x30,0x30,0xfc,0x30,0x30,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x60,
+            0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,
+            0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,
+            0x7c,0xc6,0xce,0xde,0xf6,0xe6,0x7c,0x00,
+            0x30,0x70,0x30,0x30,0x30,0x30,0xfc,0x00,
+            0x78,0xcc,0x0c,0x38,0x60,0xcc,0xfc,0x00,
+            0x78,0xcc,0x0c,0x38,0x0c,0xcc,0x78,0x00,
+            0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x1e,0x00,
+            0xfc,0xc0,0xf8,0x0c,0x0c,0xcc,0x78,0x00,
+            0x38,0x60,0xc0,0xf8,0xcc,0xcc,0x78,0x00,
+            0xfc,0xcc,0x0c,0x18,0x30,0x30,0x30,0x00,
+            0x78,0xcc,0xcc,0x78,0xcc,0xcc,0x78,0x00,
+            0x78,0xcc,0xcc,0x7c,0x0c,0x18,0x70,0x00,
+            0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00,
+            0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x60,
+            0x18,0x30,0x60,0xc0,0x60,0x30,0x18,0x00,
+            0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,
+            0x60,0x30,0x18,0x0c,0x18,0x30,0x60,0x00,
+            0x78,0xcc,0x0c,0x18,0x30,0x00,0x30,0x00,
+            0x7c,0xc6,0xde,0xde,0xde,0xc0,0x78,0x00,
+            0x30,0x78,0xcc,0xcc,0xfc,0xcc,0xcc,0x00,
+            0xfc,0x66,0x66,0x7c,0x66,0x66,0xfc,0x00,
+            0x3c,0x66,0xc0,0xc0,0xc0,0x66,0x3c,0x00,
+            0xf8,0x6c,0x66,0x66,0x66,0x6c,0xf8,0x00,
+            0xfe,0x62,0x68,0x78,0x68,0x62,0xfe,0x00,
+            0xfe,0x62,0x68,0x78,0x68,0x60,0xf0,0x00,
+            0x3c,0x66,0xc0,0xc0,0xce,0x66,0x3e,0x00,
+            0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0x00,
+            0x78,0x30,0x30,0x30,0x30,0x30,0x78,0x00,
+            0x1e,0x0c,0x0c,0x0c,0xcc,0xcc,0x78,0x00,
+            0xe6,0x66,0x6c,0x78,0x6c,0x66,0xe6,0x00,
+            0xf0,0x60,0x60,0x60,0x62,0x66,0xfe,0x00,
+            0xc6,0xee,0xfe,0xfe,0xd6,0xc6,0xc6,0x00,
+            0xc6,0xe6,0xf6,0xde,0xce,0xc6,0xc6,0x00,
+            0x38,0x6c,0xc6,0xc6,0xc6,0x6c,0x38,0x00,
+            0xfc,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00,
+            0x78,0xcc,0xcc,0xcc,0xdc,0x78,0x1c,0x00,
+            0xfc,0x66,0x66,0x7c,0x6c,0x66,0xe6,0x00,
+            0x78,0xcc,0xe0,0x70,0x1c,0xcc,0x78,0x00,
+            0xfc,0xb4,0x30,0x30,0x30,0x30,0x78,0x00,
+            0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfc,0x00,
+            0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x00,
+            0xc6,0xc6,0xc6,0xd6,0xfe,0xee,0xc6,0x00,
+            0xc6,0xc6,0x6c,0x38,0x38,0x6c,0xc6,0x00,
+            0xcc,0xcc,0xcc,0x78,0x30,0x30,0x78,0x00,
+            0xfe,0xc6,0x8c,0x18,0x32,0x66,0xfe,0x00,
+            0x78,0x60,0x60,0x60,0x60,0x60,0x78,0x00,
+            0xc0,0x60,0x30,0x18,0x0c,0x06,0x02,0x00,
+            0x78,0x18,0x18,0x18,0x18,0x18,0x78,0x00,
+            0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
+            0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x78,0x0c,0x7c,0xcc,0x76,0x00,
+            0xe0,0x60,0x60,0x7c,0x66,0x66,0xdc,0x00,
+            0x00,0x00,0x78,0xcc,0xc0,0xcc,0x78,0x00,
+            0x1c,0x0c,0x0c,0x7c,0xcc,0xcc,0x76,0x00,
+            0x00,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00,
+            0x38,0x6c,0x60,0xf0,0x60,0x60,0xf0,0x00,
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0xf8,
+            0xe0,0x60,0x6c,0x76,0x66,0x66,0xe6,0x00,
+            0x30,0x00,0x70,0x30,0x30,0x30,0x78,0x00,
+            0x0c,0x00,0x0c,0x0c,0x0c,0xcc,0xcc,0x78,
+            0xe0,0x60,0x66,0x6c,0x78,0x6c,0xe6,0x00,
+            0x70,0x30,0x30,0x30,0x30,0x30,0x78,0x00,
+            0x00,0x00,0xcc,0xfe,0xfe,0xd6,0xc6,0x00,
+            0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xcc,0x00,
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0x78,0x00,
+            0x00,0x00,0xdc,0x66,0x66,0x7c,0x60,0xf0,
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x1e,
+            0x00,0x00,0xdc,0x76,0x66,0x60,0xf0,0x00,
+            0x00,0x00,0x7c,0xc0,0x78,0x0c,0xf8,0x00,
+            0x10,0x30,0x7c,0x30,0x30,0x34,0x18,0x00,
+            0x00,0x00,0xcc,0xcc,0xcc,0xcc,0x76,0x00,
+            0x00,0x00,0xcc,0xcc,0xcc,0x78,0x30,0x00,
+            0x00,0x00,0xc6,0xd6,0xfe,0xfe,0x6c,0x00,
+            0x00,0x00,0xc6,0x6c,0x38,0x6c,0xc6,0x00,
+            0x00,0x00,0xcc,0xcc,0xcc,0x7c,0x0c,0xf8,
+            0x00,0x00,0xfc,0x98,0x30,0x64,0xfc,0x00,
+            0x1c,0x30,0x30,0xe0,0x30,0x30,0x1c,0x00,
+            0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x00,
+            0xe0,0x30,0x30,0x1c,0x30,0x30,0xe0,0x00,
+            0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,
+            0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0x00,
+            0x78,0xcc,0xc0,0xcc,0x78,0x18,0x0c,0x78,
+            0x00,0xcc,0x00,0xcc,0xcc,0xcc,0x7e,0x00,
+            0x1c,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00,
+            0x7e,0xc3,0x3c,0x06,0x3e,0x66,0x3f,0x00,
+            0xcc,0x00,0x78,0x0c,0x7c,0xcc,0x7e,0x00,
+            0xe0,0x00,0x78,0x0c,0x7c,0xcc,0x7e,0x00,
+            0x30,0x30,0x78,0x0c,0x7c,0xcc,0x7e,0x00,
+            0x00,0x00,0x78,0xc0,0xc0,0x78,0x0c,0x38,
+            0x7e,0xc3,0x3c,0x66,0x7e,0x60,0x3c,0x00,
+            0xcc,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00,
+            0xe0,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00,
+            0xcc,0x00,0x70,0x30,0x30,0x30,0x78,0x00,
+            0x7c,0xc6,0x38,0x18,0x18,0x18,0x3c,0x00,
+            0xe0,0x00,0x70,0x30,0x30,0x30,0x78,0x00,
+            0xc6,0x38,0x6c,0xc6,0xfe,0xc6,0xc6,0x00,
+            0x30,0x30,0x00,0x78,0xcc,0xfc,0xcc,0x00,
+            0x1c,0x00,0xfc,0x60,0x78,0x60,0xfc,0x00,
+            0x00,0x00,0x7f,0x0c,0x7f,0xcc,0x7f,0x00,
+            0x3e,0x6c,0xcc,0xfe,0xcc,0xcc,0xce,0x00,
+            0x78,0xcc,0x00,0x78,0xcc,0xcc,0x78,0x00,
+            0x00,0xcc,0x00,0x78,0xcc,0xcc,0x78,0x00,
+            0x00,0xe0,0x00,0x78,0xcc,0xcc,0x78,0x00,
+            0x78,0xcc,0x00,0xcc,0xcc,0xcc,0x7e,0x00,
+            0x00,0xe0,0x00,0xcc,0xcc,0xcc,0x7e,0x00,
+            0x00,0xcc,0x00,0xcc,0xcc,0x7c,0x0c,0xf8,
+            0xc3,0x18,0x3c,0x66,0x66,0x3c,0x18,0x00,
+            0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0x78,0x00,
+            0x18,0x18,0x7e,0xc0,0xc0,0x7e,0x18,0x18,
+            0x38,0x6c,0x64,0xf0,0x60,0xe6,0xfc,0x00,
+            0xcc,0xcc,0x78,0xfc,0x30,0xfc,0x30,0x30,
+            0xf8,0xcc,0xcc,0xfa,0xc6,0xcf,0xc6,0xc7,
+            0x0e,0x1b,0x18,0x3c,0x18,0x18,0xd8,0x70,
+            0x1c,0x00,0x78,0x0c,0x7c,0xcc,0x7e,0x00,
+            0x38,0x00,0x70,0x30,0x30,0x30,0x78,0x00,
+            0x00,0x1c,0x00,0x78,0xcc,0xcc,0x78,0x00,
+            0x00,0x1c,0x00,0xcc,0xcc,0xcc,0x7e,0x00,
+            0x00,0xf8,0x00,0xf8,0xcc,0xcc,0xcc,0x00,
+            0xfc,0x00,0xcc,0xec,0xfc,0xdc,0xcc,0x00,
+            0x3c,0x6c,0x6c,0x3e,0x00,0x7e,0x00,0x00,
+            0x38,0x6c,0x6c,0x38,0x00,0x7c,0x00,0x00,
+            0x30,0x00,0x30,0x60,0xc0,0xcc,0x78,0x00,
+            0x00,0x00,0x00,0xfc,0xc0,0xc0,0x00,0x00,
+            0x00,0x00,0x00,0xfc,0x0c,0x0c,0x00,0x00,
+            0xc3,0xc6,0xcc,0xde,0x33,0x66,0xcc,0x0f,
+            0xc3,0xc6,0xcc,0xdb,0x37,0x6f,0xcf,0x03,
+            0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x00,
+            0x00,0x33,0x66,0xcc,0x66,0x33,0x00,0x00,
+            0x00,0xcc,0x66,0x33,0x66,0xcc,0x00,0x00,
+            0x22,0x88,0x22,0x88,0x22,0x88,0x22,0x88,
+            0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,
+            0xdb,0x77,0xdb,0xee,0xdb,0x77,0xdb,0xee,
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18,
+            0x18,0x18,0xf8,0x18,0xf8,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0xf6,0x36,0x36,0x36,
+            0x00,0x00,0x00,0x00,0xfe,0x36,0x36,0x36,
+            0x00,0x00,0xf8,0x18,0xf8,0x18,0x18,0x18,
+            0x36,0x36,0xf6,0x06,0xf6,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,
+            0x00,0x00,0xfe,0x06,0xf6,0x36,0x36,0x36,
+            0x36,0x36,0xf6,0x06,0xfe,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0xfe,0x00,0x00,0x00,
+            0x18,0x18,0xf8,0x18,0xf8,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,
+            0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18,
+            0x18,0x18,0x1f,0x18,0x1f,0x18,0x18,0x18,
+            0x36,0x36,0x36,0x36,0x37,0x36,0x36,0x36,
+            0x36,0x36,0x37,0x30,0x3f,0x00,0x00,0x00,
+            0x00,0x00,0x3f,0x30,0x37,0x36,0x36,0x36,
+            0x36,0x36,0xf7,0x00,0xff,0x00,0x00,0x00,
+            0x00,0x00,0xff,0x00,0xf7,0x36,0x36,0x36,
+            0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36,
+            0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,
+            0x36,0x36,0xf7,0x00,0xf7,0x36,0x36,0x36,
+            0x18,0x18,0xff,0x00,0xff,0x00,0x00,0x00,
+            0x36,0x36,0x36,0x36,0xff,0x00,0x00,0x00,
+            0x00,0x00,0xff,0x00,0xff,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0xff,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0x3f,0x00,0x00,0x00,
+            0x18,0x18,0x1f,0x18,0x1f,0x00,0x00,0x00,
+            0x00,0x00,0x1f,0x18,0x1f,0x18,0x18,0x18,
+            0x00,0x00,0x00,0x00,0x3f,0x36,0x36,0x36,
+            0x36,0x36,0x36,0x36,0xff,0x36,0x36,0x36,
+            0x18,0x18,0xff,0x18,0xff,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18,
+            0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+            0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+            0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,
+            0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,
+            0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x76,0xdc,0xc8,0xdc,0x76,0x00,
+            0x00,0x78,0xcc,0xf8,0xcc,0xf8,0xc0,0xc0,
+            0x00,0xfc,0xcc,0xc0,0xc0,0xc0,0xc0,0x00,
+            0x00,0xfe,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,
+            0xfc,0xcc,0x60,0x30,0x60,0xcc,0xfc,0x00,
+            0x00,0x00,0x7e,0xd8,0xd8,0xd8,0x70,0x00,
+            0x00,0x66,0x66,0x66,0x66,0x7c,0x60,0xc0,
+            0x00,0x76,0xdc,0x18,0x18,0x18,0x18,0x00,
+            0xfc,0x30,0x78,0xcc,0xcc,0x78,0x30,0xfc,
+            0x38,0x6c,0xc6,0xfe,0xc6,0x6c,0x38,0x00,
+            0x38,0x6c,0xc6,0xc6,0x6c,0x6c,0xee,0x00,
+            0x1c,0x30,0x18,0x7c,0xcc,0xcc,0x78,0x00,
+            0x00,0x00,0x7e,0xdb,0xdb,0x7e,0x00,0x00,
+            0x06,0x0c,0x7e,0xdb,0xdb,0x7e,0x60,0xc0,
+            0x38,0x60,0xc0,0xf8,0xc0,0x60,0x38,0x00,
+            0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,
+            0x00,0xfc,0x00,0xfc,0x00,0xfc,0x00,0x00,
+            0x30,0x30,0xfc,0x30,0x30,0x00,0xfc,0x00,
+            0x60,0x30,0x18,0x30,0x60,0x00,0xfc,0x00,
+            0x18,0x30,0x60,0x30,0x18,0x00,0xfc,0x00,
+            0x0e,0x1b,0x1b,0x18,0x18,0x18,0x18,0x18,
+            0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0x70,
+            0x30,0x30,0x00,0xfc,0x00,0x30,0x30,0x00,
+            0x00,0x76,0xdc,0x00,0x76,0xdc,0x00,0x00,
+            0x38,0x6c,0x6c,0x38,0x00,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,
+            0x0f,0x0c,0x0c,0x0c,0xec,0x6c,0x3c,0x1c,
+            0x78,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,
+            0x70,0x18,0x30,0x60,0x78,0x00,0x00,0x00,
+            0x00,0x00,0x3c,0x3c,0x3c,0x3c,0x00,0x00,
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        };
+
+        public static byte[] FontData = {
+            // Top...............................................Bottom
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, //   0
+            0x00,0x00,0x7e,0xc3,0x99,0xbd,0x81,0xa5,0x81,0xc3,0x7e,0x00, //   1
+            0x00,0x00,0x7e,0xff,0xe7,0xc3,0xff,0xdb,0xff,0xff,0x7e,0x00, //   2
+            0x00,0x00,0x10,0x38,0x7c,0xfe,0xfe,0xfe,0xee,0x44,0x00,0x00, //   3
+            0x00,0x00,0x00,0x10,0x38,0x7c,0xfe,0xfe,0x7c,0x38,0x10,0x00, //   4
+            0x00,0x00,0x7e,0x18,0x18,0xe7,0xe7,0xff,0x3c,0x3c,0x18,0x00, //   5
+            0x00,0x00,0x7e,0x18,0x18,0x7e,0xff,0xff,0x7e,0x3c,0x18,0x00, //   6
+            0x00,0x00,0x00,0x00,0x3c,0x7e,0x7e,0x3c,0x00,0x00,0x00,0x00, //   7
+            0xff,0xff,0xff,0xff,0xc3,0x81,0x81,0xc3,0xff,0xff,0xff,0xff, //   8
+            0x00,0x00,0x3c,0x7e,0x66,0x42,0x42,0x66,0x7e,0x3c,0x00,0x00, //   9
+            0xff,0xff,0xc3,0x81,0x99,0xbd,0xbd,0x99,0x81,0xc3,0xff,0xff, //  10
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xf8,0x72,0x3a,0x0e,0x3e,0x00, //  11
+            0x00,0x00,0x18,0x18,0x7e,0x18,0x3c,0x66,0x66,0x66,0x3c,0x00, //  12
+            0x00,0x00,0x70,0xf8,0x78,0x18,0x18,0x1f,0x19,0x19,0x1f,0x00, //  13
+            0x00,0xc0,0xe6,0xe7,0x67,0x63,0x63,0x63,0x7f,0x63,0x7f,0x00, //  14
+            0x00,0x00,0x18,0xdb,0x7e,0xe7,0xe7,0x7e,0xdb,0x18,0x00,0x00, //  15
+            0x00,0x00,0x80,0xc0,0xe0,0xf8,0xfe,0xf8,0xe0,0xc0,0x80,0x00, //  16
+            0x00,0x00,0x02,0x06,0x0e,0x3e,0xfe,0x3e,0x0e,0x06,0x02,0x00, //  17
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00, //  18
+            0x00,0x00,0x66,0x66,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x00, //  19
+            0x00,0x00,0x1b,0x1b,0x1b,0x1b,0x7b,0xdb,0xdb,0xdb,0x7f,0x00, //  20
+            0x00,0x7e,0xc6,0x0c,0x3c,0x66,0x66,0x3c,0x30,0x63,0x7e,0x00, //  21
+            0x00,0x00,0xfe,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00, //  22
+            0x00,0x7e,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00, //  23
+            0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00, //  24
+            0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x00, //  25
+            0x00,0x00,0x00,0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00,0x00, //  26
+            0x00,0x00,0x00,0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00,0x00, //  27
+            0x00,0x00,0x00,0x00,0xfe,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00, //  28
+            0x00,0x00,0x00,0x00,0x24,0x66,0xff,0x66,0x24,0x00,0x00,0x00, //  29
+            0x00,0x00,0xfe,0xfe,0x7c,0x7c,0x38,0x38,0x10,0x10,0x00,0x00, //  30
+            0x00,0x00,0x10,0x10,0x38,0x38,0x7c,0x7c,0xfe,0xfe,0x00,0x00, //  31
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, //  32 ' '
+            0x00,0x00,0x30,0x30,0x00,0x30,0x30,0x78,0x78,0x78,0x30,0x00, //  33 '!'
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x24,0x66,0x66,0x66,0x00, //  34 '"'
+            0x00,0x00,0x6c,0x6c,0xfe,0x6c,0x6c,0x6c,0xfe,0x6c,0x6c,0x00, //  35 '#'
+            0x00,0x30,0x30,0xf8,0x0c,0x0c,0x78,0xc0,0xc0,0x7c,0x30,0x30, //  36 '$'
+            0x00,0x00,0x8c,0xcc,0x60,0x30,0x18,0xcc,0xc4,0x00,0x00,0x00, //  37 '%'
+            0x00,0x00,0x76,0xdc,0xcc,0xde,0xfa,0x70,0xd8,0xd8,0x70,0x00, //  38 '&'
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x30,0x30,0x00, //  39 '''
+            0x00,0x00,0x0c,0x18,0x30,0x60,0x60,0x60,0x30,0x18,0x0c,0x00, //  40 '('
+            0x00,0x00,0x60,0x30,0x18,0x0c,0x0c,0x0c,0x18,0x30,0x60,0x00, //  41 ')'
+            0x00,0x00,0x00,0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,0x00, //  42 '*'
+            0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0x00, //  43 '+'
+            0x00,0x60,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, //  44 ','
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00, //  45 '-'
+            0x00,0x00,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, //  46 '.'
+            0x00,0x00,0x80,0xc0,0x60,0x30,0x18,0x0c,0x06,0x02,0x00,0x00, //  47 '/'
+            0x00,0x00,0x7c,0xc6,0xe6,0xf6,0xd6,0xde,0xce,0xc6,0x7c,0x00, //  48 '0'
+            0x00,0x00,0xfc,0x30,0x30,0x30,0x30,0x30,0xf0,0x30,0x10,0x00, //  49 '1'
+            0x00,0x00,0xfc,0xcc,0x60,0x30,0x18,0x0c,0xcc,0xcc,0x78,0x00, //  50 '2'
+            0x00,0x00,0x78,0xcc,0x0c,0x0c,0x38,0x0c,0x0c,0xcc,0x78,0x00, //  51 '3'
+            0x00,0x00,0x1e,0x0c,0x0c,0xfe,0xcc,0x6c,0x3c,0x1c,0x0c,0x00, //  52 '4'
+            0x00,0x00,0x78,0xcc,0x0c,0x0c,0xf8,0xc0,0xc0,0xc0,0xfc,0x00, //  53 '5'
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xf8,0xc0,0xc0,0x60,0x38,0x00, //  54 '6'
+            0x00,0x00,0x30,0x30,0x30,0x18,0x0c,0x06,0xc6,0xc6,0xfe,0x00, //  55 '7'
+            0x00,0x00,0x78,0xcc,0xcc,0xdc,0x78,0xec,0xcc,0xcc,0x78,0x00, //  56 '8'
+            0x00,0x00,0x70,0x30,0x18,0x18,0x7c,0xcc,0xcc,0xcc,0x78,0x00, //  57 '9'
+            0x00,0x00,0x00,0x38,0x38,0x00,0x00,0x38,0x38,0x00,0x00,0x00, //  58 ':'
+            0x00,0x30,0x18,0x38,0x38,0x00,0x00,0x38,0x38,0x00,0x00,0x00, //  59 ';'
+            0x00,0x00,0x0c,0x18,0x30,0x60,0xc0,0x60,0x30,0x18,0x0c,0x00, //  60 '<'
+            0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x7e,0x00,0x00,0x00,0x00, //  61 '='
+            0x00,0x00,0x60,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x60,0x00, //  62 '>'
+            0x00,0x00,0x30,0x30,0x00,0x30,0x30,0x18,0x0c,0xcc,0x78,0x00, //  63 '?'
+            0x00,0x00,0x7c,0xc0,0xc0,0xde,0xde,0xde,0xc6,0xc6,0x7c,0x00, //  64 '@'
+            0x00,0x00,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0x78,0x30,0x00, //  65 'A'
+            0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x66,0x66,0x66,0xfc,0x00, //  66 'B'
+            0x00,0x00,0x3c,0x66,0xc6,0xc0,0xc0,0xc0,0xc6,0x66,0x3c,0x00, //  67 'C'
+            0x00,0x00,0xf8,0x6c,0x66,0x66,0x66,0x66,0x66,0x6c,0xf8,0x00, //  68 'D'
+            0x00,0x00,0xfe,0x62,0x60,0x64,0x7c,0x64,0x60,0x62,0xfe,0x00, //  69 'E'
+            0x00,0x00,0xf0,0x60,0x60,0x64,0x7c,0x64,0x62,0x66,0xfe,0x00, //  70 'F'
+            0x00,0x00,0x3e,0x66,0xc6,0xce,0xc0,0xc0,0xc6,0x66,0x3c,0x00, //  71 'G'
+            0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0xcc,0x00, //  72 'H'
+            0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00, //  73 'I'
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0x0c,0x0c,0x0c,0x0c,0x1e,0x00, //  74 'J'
+            0x00,0x00,0xe6,0x66,0x6c,0x6c,0x78,0x6c,0x6c,0x66,0xe6,0x00, //  75 'K'
+            0x00,0x00,0xfe,0x66,0x66,0x62,0x60,0x60,0x60,0x60,0xf0,0x00, //  76 'L'
+            0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xd6,0xfe,0xfe,0xee,0xc6,0x00, //  77 'M'
+            0x00,0x00,0xc6,0xc6,0xce,0xde,0xfe,0xf6,0xe6,0xc6,0xc6,0x00, //  78 'N'
+            0x00,0x00,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00, //  79 'O'
+            0x00,0x00,0xf0,0x60,0x60,0x60,0x7c,0x66,0x66,0x66,0xfc,0x00, //  80 'P'
+            0x00,0x1e,0x0c,0x7c,0xde,0xce,0xc6,0xc6,0xc6,0x6c,0x38,0x00, //  81 'Q'
+            0x00,0x00,0xe6,0x66,0x66,0x6c,0x7c,0x66,0x66,0x66,0xfc,0x00, //  82 'R'
+            0x00,0x00,0x78,0xcc,0xcc,0x18,0x70,0xc0,0xcc,0xcc,0x78,0x00, //  83 'S'
+            0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0xb4,0xfc,0x00, //  84 'T'
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, //  85 'U'
+            0x00,0x00,0x30,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, //  86 'V'
+            0x00,0x00,0x6c,0x6c,0x6c,0xd6,0xd6,0xc6,0xc6,0xc6,0xc6,0x00, //  87 'W'
+            0x00,0x00,0xcc,0xcc,0xcc,0x78,0x30,0x78,0xcc,0xcc,0xcc,0x00, //  88 'X'
+            0x00,0x00,0x78,0x30,0x30,0x30,0x78,0xcc,0xcc,0xcc,0xcc,0x00, //  89 'Y'
+            0x00,0x00,0xfe,0xc6,0x62,0x60,0x30,0x18,0x8c,0xce,0xfe,0x00, //  90 'Z'
+            0x00,0x00,0x3c,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3c,0x00, //  91 '['
+            0x00,0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,0x00, //  92 '\'
+            0x00,0x00,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00, //  93 ']'
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc6,0x6c,0x38,0x10, //  94 '^'
+            0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, //  95 '_'
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x30,0x30, //  96 '`'
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x78,0x00,0x00,0x00,0x00, //  97 'a'
+            0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xe0,0x00, //  98 'b'
+            0x00,0x00,0x78,0xcc,0xc0,0xc0,0xcc,0x78,0x00,0x00,0x00,0x00, //  99 'c'
+            0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x1c,0x00, // 100 'd'
+            0x00,0x00,0x78,0xcc,0xc0,0xfc,0xcc,0x78,0x00,0x00,0x00,0x00, // 101 'e'
+            0x00,0x00,0xf0,0x60,0x60,0x60,0xf8,0x60,0x60,0x6c,0x38,0x00, // 102 'f'
+            0x78,0xcc,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, // 103 'g'
+            0x00,0x00,0xe6,0x66,0x66,0x66,0x76,0x6c,0x60,0x60,0xe0,0x00, // 104 'h'
+            0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x78,0x00,0x18,0x18,0x00, // 105 'i'
+            0x78,0xcc,0xcc,0x0c,0x0c,0x0c,0x0c,0x3c,0x00,0x0c,0x0c,0x00, // 106 'j'
+            0x00,0x00,0xe6,0x66,0x6c,0x78,0x6c,0x66,0x60,0x60,0xe0,0x00, // 107 'k'
+            0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x00, // 108 'l'
+            0x00,0x00,0xc6,0xd6,0xd6,0xd6,0xd6,0xfc,0x00,0x00,0x00,0x00, // 109 'm'
+            0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xf8,0x00,0x00,0x00,0x00, // 110 'n'
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00, // 111 'o'
+            0xf0,0x60,0x7c,0x66,0x66,0x66,0x66,0xdc,0x00,0x00,0x00,0x00, // 112 'p'
+            0x1e,0x0c,0x7c,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, // 113 'q'
+            0x00,0x00,0xf0,0x60,0x60,0x76,0x6e,0xec,0x00,0x00,0x00,0x00, // 114 'r'
+            0x00,0x00,0x78,0xcc,0x18,0x60,0xcc,0x78,0x00,0x00,0x00,0x00, // 115 's'
+            0x00,0x00,0x38,0x6c,0x60,0x60,0x60,0xfc,0x60,0x20,0x00,0x00, // 116 't'
+            0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,0x00, // 117 'u'
+            0x00,0x00,0x30,0x78,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,0x00, // 118 'v'
+            0x00,0x00,0x6c,0x6c,0xd6,0xd6,0xc6,0xc6,0x00,0x00,0x00,0x00, // 119 'w'
+            0x00,0x00,0xc6,0x6c,0x38,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00, // 120 'x'
+            0xf0,0x18,0x0c,0x3c,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00, // 121 'y'
+            0x00,0x00,0xfc,0xc4,0x60,0x18,0x8c,0xfc,0x00,0x00,0x00,0x00, // 122 'z'
+            0x00,0x00,0x1c,0x30,0x30,0x60,0xc0,0x60,0x30,0x30,0x1c,0x00, // 123 '{'
+            0x00,0x00,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x00, // 124 '|'
+            0x00,0x00,0xe0,0x30,0x30,0x18,0x0c,0x18,0x30,0x30,0xe0,0x00, // 125 '}'
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xda,0x73,0x00, // 126 '~'
+            0x00,0x00,0x00,0xfe,0xc6,0xc6,0x6c,0x38,0x10,0x00,0x00,0x00, // 127
+            0xf0,0x30,0x78,0xcc,0xcc,0xc0,0xc0,0xc0,0xcc,0xcc,0x78,0x00, // 128
+            0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0xcc,0xcc,0x00, // 129
+            0x00,0x00,0x78,0xcc,0xc0,0xfc,0xcc,0x78,0x00,0x30,0x18,0x0c, // 130
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x78,0x00,0xcc,0x78,0x30, // 131
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x78,0x00,0xcc,0xcc,0x00, // 132
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x78,0x00,0x30,0x60,0xc0, // 133
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0xf8,0x38,0x6c,0x6c,0x38, // 134
+            0xf0,0x30,0x78,0xcc,0xc0,0xc0,0xcc,0x78,0x00,0x00,0x00,0x00, // 135
+            0x00,0x00,0x7c,0xc0,0xc0,0xfc,0xcc,0x78,0x00,0xcc,0x78,0x30, // 136
+            0x00,0x00,0x7c,0xc0,0xc0,0xfc,0xcc,0x78,0x00,0xcc,0xcc,0x00, // 137
+            0x00,0x00,0x7c,0xc0,0xc0,0xfc,0xcc,0x78,0x00,0x30,0x60,0xc0, // 138
+            0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x78,0x00,0x6c,0x6c,0x00, // 139
+            0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x78,0x00,0x6c,0x38,0x10, // 140
+            0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x78,0x00,0x18,0x30,0x60, // 141
+            0x00,0x00,0xcc,0xcc,0xfc,0xcc,0xcc,0x78,0x30,0x00,0xcc,0x00, // 142
+            0x00,0x00,0xcc,0xcc,0xfc,0xcc,0xcc,0x78,0x78,0xcc,0xcc,0x78, // 143
+            0x00,0x00,0xfc,0xc4,0xc0,0xf8,0xc0,0xc4,0xfc,0x30,0x18,0x0c, // 144
+            0x00,0x00,0xef,0xd8,0xd8,0x7f,0x1b,0xfe,0x00,0x00,0x00,0x00, // 145
+            0x00,0x00,0xde,0xd8,0xd8,0xd8,0xfe,0xd8,0xd8,0x78,0x3e,0x00, // 146
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0xcc,0x78,0x30, // 147
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0xcc,0xcc,0x00, // 148
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x30,0x60,0xc0, // 149
+            0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0xcc,0x78,0x30, // 150
+            0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x30,0x60,0xc0, // 151
+            0xf0,0x18,0x0c,0x3c,0x66,0x66,0x66,0x66,0x00,0x66,0x66,0x00, // 152
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0xcc, // 153
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0xcc, // 154
+            0x00,0x30,0x30,0x78,0xcc,0xc0,0xc0,0xcc,0x78,0x30,0x30,0x00, // 155
+            0x00,0x00,0xfe,0xc0,0x60,0x60,0xfc,0x60,0x60,0x60,0x66,0x3c, // 156
+            0x00,0x00,0x30,0x30,0xfc,0x30,0xfc,0x78,0xcc,0xcc,0xcc,0xcc, // 157
+            0x00,0x00,0x86,0x8d,0x8c,0x9e,0x88,0xf0,0x88,0x88,0x88,0xf0, // 158
+            0x00,0x00,0x70,0xd8,0x18,0x18,0x18,0x7e,0x18,0x18,0x1b,0x0e, // 159
+            0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x78,0x00,0x30,0x18,0x0c, // 160
+            0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x78,0x00,0x30,0x18,0x0c, // 161
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x30,0x18,0x0c, // 162
+            0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x30,0x18,0x0c, // 163
+            0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xf8,0x00,0xdc,0x76,0x00, // 164
+            0x00,0x00,0xc6,0xc6,0xce,0xde,0xf6,0xe6,0xc6,0x00,0xdc,0x76, // 165
+            0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x7e,0xcc,0xcc,0x78,0x00, // 166
+            0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x78,0xcc,0xcc,0x78,0x00, // 167
+            0x00,0x00,0x78,0xcc,0xc0,0xc0,0x60,0x30,0x00,0x30,0x30,0x00, // 168
+            0x00,0x00,0x00,0xc0,0xc0,0xc0,0xfc,0x00,0x00,0x00,0x00,0x00, // 169
+            0x00,0x00,0x00,0x0c,0x0c,0x0c,0xfc,0x00,0x00,0x00,0x00,0x00, // 170
+            0x00,0x1f,0x0c,0x86,0xc3,0x6e,0x30,0xd8,0xcc,0xc6,0x42,0x00, // 171
+            0x00,0x03,0x3f,0xb3,0xdb,0x6f,0x37,0x78,0x6c,0xe6,0x63,0x00, // 172
+            0x00,0x00,0x30,0x78,0x78,0x78,0x30,0x30,0x00,0x30,0x30,0x00, // 173
+            0x00,0x00,0x33,0x66,0xcc,0xcc,0x66,0x33,0x00,0x00,0x00,0x00, // 174
+            0x00,0x00,0xcc,0x66,0x33,0x33,0x66,0xcc,0x00,0x00,0x00,0x00, // 175
+            0x49,0x92,0x24,0x49,0x92,0x24,0x49,0x92,0x24,0x49,0x92,0x24, // 176
+            0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55, // 177
+            0xb6,0xdb,0x6d,0xb6,0xdb,0x6d,0xb6,0xdb,0x6d,0xb6,0xdb,0x6d, // 178
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, // 179
+            0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18,0x18,0x18, // 180
+            0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0xf8,0x18,0x18,0x18,0x18, // 181
+            0x66,0x66,0x66,0x66,0x66,0x66,0xe6,0x66,0x66,0x66,0x66,0x66, // 182
+            0x66,0x66,0x66,0x66,0x66,0x66,0xfe,0x00,0x00,0x00,0x00,0x00, // 183
+            0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0xf8,0x00,0x00,0x00,0x00, // 184
+            0x66,0x66,0x66,0x66,0xe6,0x06,0x06,0xe6,0x66,0x66,0x66,0x66, // 185
+            0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x66, // 186
+            0x66,0x66,0x66,0x66,0xe6,0x06,0x06,0xfe,0x00,0x00,0x00,0x00, // 187
+            0x00,0x00,0x00,0x00,0xfe,0x06,0x06,0xe6,0x66,0x66,0x66,0x66, // 188
+            0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x66,0x66,0x66,0x66,0x66, // 189
+            0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0xf8,0x18,0x18,0x18,0x18, // 190
+            0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00,0x00,0x00, // 191
+            0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18,0x18,0x18, // 192
+            0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18,0x18,0x18, // 193
+            0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00,0x00,0x00, // 194
+            0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x18, // 195
+            0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00, // 196
+            0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18,0x18,0x18, // 197
+            0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x1f,0x18,0x18,0x18,0x18, // 198
+            0x66,0x66,0x66,0x66,0x66,0x66,0x67,0x66,0x66,0x66,0x66,0x66, // 199
+            0x00,0x00,0x00,0x00,0x7f,0x60,0x60,0x67,0x66,0x66,0x66,0x66, // 200
+            0x66,0x66,0x66,0x66,0x67,0x60,0x60,0x7f,0x00,0x00,0x00,0x00, // 201
+            0x00,0x00,0x00,0x00,0xff,0x00,0x00,0xe7,0x66,0x66,0x66,0x66, // 202
+            0x66,0x66,0x66,0x66,0xe7,0x00,0x00,0xff,0x00,0x00,0x00,0x00, // 203
+            0x66,0x66,0x66,0x66,0x67,0x60,0x60,0x67,0x66,0x66,0x66,0x66, // 204
+            0x00,0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00, // 205
+            0x66,0x66,0x66,0x66,0xe7,0x00,0x00,0xe7,0x66,0x66,0x66,0x66, // 206
+            0x00,0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x18,0x18,0x18,0x18, // 207
+            0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x66,0x66,0x66,0x66,0x66, // 208
+            0x18,0x18,0x18,0x18,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00, // 209
+            0x66,0x66,0x66,0x66,0x66,0x66,0xff,0x00,0x00,0x00,0x00,0x00, // 210
+            0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x66,0x66,0x66,0x66,0x66, // 211
+            0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x1f,0x18,0x18,0x18,0x18, // 212
+            0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x1f,0x00,0x00,0x00,0x00, // 213
+            0x66,0x66,0x66,0x66,0x66,0x66,0x7f,0x00,0x00,0x00,0x00,0x00, // 214
+            0x66,0x66,0x66,0x66,0x66,0x66,0xe7,0x66,0x66,0x66,0x66,0x66, // 215
+            0x18,0x18,0x18,0x18,0xff,0x00,0x00,0xff,0x18,0x18,0x18,0x18, // 216
+            0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18,0x18,0x18, // 217
+            0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,0x00,0x00, // 218
+            0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, // 219
+            0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00, // 220
+            0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0, // 221
+            0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f, // 222
+            0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff, // 223
+            0x00,0x00,0x76,0xde,0xcc,0xcc,0xde,0x76,0x00,0x00,0x00,0x00, // 224
+            0x00,0x60,0xc0,0xf8,0xcc,0xcc,0xcc,0xd8,0xcc,0xcc,0x78,0x00, // 225
+            0x00,0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xcc,0xcc,0xfc,0x00, // 226
+            0x00,0x00,0x66,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0xfe,0x00, // 227
+            0x00,0x00,0xfc,0xc4,0x64,0x60,0x30,0x60,0x64,0xc4,0xfc,0x00, // 228
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xc8,0x7e,0x00,0x00,0x00,0x00, // 229
+            0xc0,0x60,0x7b,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00, // 230
+            0x00,0x00,0x0e,0x18,0x18,0x18,0x18,0xdc,0x76,0x00,0x00,0x00, // 231
+            0x00,0x00,0xfc,0x30,0x78,0xcc,0xcc,0xcc,0x78,0x30,0xfc,0x00, // 232
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0x78,0x00, // 233
+            0x00,0x00,0xee,0x6c,0x6c,0x6c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00, // 234
+            0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x60,0x3c,0x00, // 235
+            0x00,0x00,0x00,0x00,0x6e,0xdb,0xdb,0xdb,0x76,0x00,0x00,0x00, // 236
+            0x00,0x00,0x00,0xc0,0x7c,0xf6,0xd6,0xde,0x7c,0x06,0x00,0x00, // 237
+            0x00,0x00,0x3c,0x60,0xc0,0xc0,0xfc,0xc0,0xc0,0x60,0x3c,0x00, // 238
+            0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00, // 239
+            0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00, // 240
+            0x00,0x00,0x00,0xfc,0x00,0x30,0x30,0xfc,0x30,0x30,0x00,0x00, // 241
+            0x00,0x00,0x00,0xfc,0x00,0x60,0x30,0x18,0x18,0x30,0x60,0x00, // 242
+            0x00,0x00,0x00,0xfc,0x00,0x18,0x30,0x60,0x60,0x30,0x18,0x00, // 243
+            0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1b,0x1b,0x0e,0x00,0x00, // 244
+            0x00,0x00,0x70,0xd8,0xd8,0x18,0x18,0x18,0x18,0x18,0x18,0x18, // 245
+            0x00,0x00,0x00,0x30,0x30,0x00,0xfc,0x00,0x30,0x30,0x00,0x00, // 246
+            0x00,0x00,0x00,0xce,0xdb,0x73,0x00,0xce,0xdb,0x73,0x00,0x00, // 247
+            0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x66,0x66,0x66,0x3c,0x00, // 248
+            0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x1c,0x00,0x00,0x00,0x00, // 249
+            0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00, // 250
+            0x00,0x00,0x0c,0x1c,0x34,0x64,0x44,0x04,0x04,0x04,0x07,0x00, // 251
+            0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x6c,0x6c,0x6c,0xd8,0x00, // 252
+            0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x30,0x18,0x0c,0x78,0x00, // 253
+            0x00,0x00,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x00,0x00, // 254
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 255
+            0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 254 Cursor
+        };
+    }
+}
diff --git a/base/Drivers/S3Trio64/RGB.cs b/base/Drivers/S3Trio64/RGB.cs
new file mode 100644
index 0000000..959f53a
--- /dev/null
+++ b/base/Drivers/S3Trio64/RGB.cs
@@ -0,0 +1,97 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RGB.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public struct RGB
+    {
+        byte    red;
+        byte    green;
+        byte    blue;
+
+        public RGB(byte _red, byte _green, byte _blue)
+        {
+            red = _red;
+            green = _green;
+            blue = _blue;
+        }
+
+        public RGB(uint color32)
+        {
+            red = (byte)((color32 & 0xff0000) >> 16);
+            green = (byte)((color32 & 0x00ff00) >> 8);
+            blue = (byte)((color32 & 0x0000ff) >> 0);
+        }
+
+        public static explicit operator uint (RGB color)
+        {
+            return Compute32(color.red, color.green, color.blue);
+        }
+
+        public static explicit operator ushort (RGB color)
+        {
+            return Compute16(color.red, color.green, color.blue);
+        }
+
+        public static explicit operator byte (RGB color)
+        {
+            return Compute4(color.red, color.green, color.blue);
+        }
+
+        public static byte Compute4(byte red, byte green, byte blue)
+        {
+            byte c = 0;
+
+            if (red > 0x40) {
+                c |= 0x4;
+            }
+            if (green > 0x40) {
+                c |= 0x2;
+            }
+            if (blue > 0x40) {
+                c |= 0x1;
+            }
+            if (red > 0x80 || green > 0x80 || blue > 0x80) {
+                c |= 0x8;
+            }
+            return c;
+        }
+
+        public static ushort Compute16(byte red, byte green, byte blue)
+        {
+            return (ushort)((((ushort)red >> 3) << 11) |
+                            (((ushort)green >> 2) << 5) |
+                            ((ushort)blue >> 3));
+        }
+
+        public static uint Compute32(byte red, byte green, byte blue)
+        {
+            return ((((uint)red) << 16) |
+                    (((uint)green) << 8) |
+                    ((uint)blue));
+        }
+
+        public static readonly RGB White    = new RGB(255, 255, 255);
+        public static readonly RGB Red      = new RGB(255, 0, 0);
+        public static readonly RGB Green    = new RGB(0, 255, 0);
+        public static readonly RGB Blue     = new RGB(0, 0, 255);
+        public static readonly RGB Black    = new RGB(0, 0, 0);
+        public static readonly RGB Gray     = new RGB(127, 127, 127);
+    };
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Drivers/S3Trio64/S3Trio64.csproj b/base/Drivers/S3Trio64/S3Trio64.csproj
new file mode 100644
index 0000000..992301e
--- /dev/null
+++ b/base/Drivers/S3Trio64/S3Trio64.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>S3Trio64</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="S3Trio64.sg" />
+    <Compile Include="Fonts.sg" />
+    <Compile Include="RGB.cs" />
+    <Compile Include="BitmapFileHeader.cs" />
+    <Compile Include="BitmapInfoHeader.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/S3Trio64/S3Trio64.sg b/base/Drivers/S3Trio64/S3Trio64.sg
new file mode 100644
index 0000000..26f93ca
--- /dev/null
+++ b/base/Drivers/S3Trio64/S3Trio64.sg
@@ -0,0 +1,1951 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   S3Trio64.sg
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Configuration.Assemblies;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting;
+using System.Text;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+namespace Microsoft.Singularity.Drivers.S3Trio64
+{
+    // create the resource object for CTR to fill in
+    [DriverCategory]
+    [Signature("pci/ven_5333&dev_8811&cc_0300")]
+    internal class S3TrioResources : DriverCategoryDeclaration
+    {
+        [IoMemoryRange(0, Default = 0xf8000000, Length = 0x400000)]
+        internal IoMemoryRange frameBuffer;
+
+        [IoFixedMemoryRange(Base = 0xb8000, Length = 0x8000, Shared = true)]
+        internal IoMemoryRange textBuffer;
+
+        [IoFixedMemoryRange(Base = 0xa0000, Length = 0x8000, Shared = true)]
+        internal IoMemoryRange fontBuffer;
+
+        [IoFixedPortRange(Base = 0x03c0, Length = 0x20, Shared = true)]
+        internal IoPortRange dev;
+
+        [IoFixedPortRange(Base = 0x4ae8, Length = 0x02)]
+        internal IoPortRange adv;
+
+        [IoFixedPortRange(Base = 0x9ae8, Length = 0x02)]
+        internal IoPortRange gps;
+
+        [ExtensionEndpoint]
+        internal TRef<ExtensionContract.Exp:Start> ec;
+
+        [ServiceEndpoint(typeof(VideoDeviceContract))]
+        internal TRef<ServiceProviderContract.Exp:Start> video;
+
+        [ServiceEndpoint(typeof(ConsoleDeviceContract))]
+        internal TRef<ServiceProviderContract.Exp:Start> console;
+
+        // This should have a custom attribute.
+        internal static S3TrioResources Values;
+
+        // LTR will create the rest of this class:
+
+        // LTR creates a private constructor so that the app writer can't
+        // instantiate objects of this class
+        private S3TrioResources()
+        {
+            // endpoint initialization
+            ec = new TRef<ExtensionContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(0) as ExtensionContract.Exp));
+            video = new TRef<ServiceProviderContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(1) as ServiceProviderContract.Exp));
+            console = new TRef<ServiceProviderContract.Exp:Start>
+                ((!)(Process.GetStartupEndpoint(2) as ServiceProviderContract.Exp));
+
+            // Io Resource initialization
+            IoConfig config = (IoConfig!)IoConfig.GetConfig();
+
+            // dynamic resources
+            frameBuffer = (IoMemoryRange)config.DynamicRanges[0];
+
+            // fixed resources
+            textBuffer = (IoMemoryRange)config.FixedRanges[0];
+            fontBuffer = (IoMemoryRange)config.FixedRanges[1];
+            dev = (IoPortRange)config.FixedRanges[2];
+            adv = (IoPortRange)config.FixedRanges[3];
+            gps = (IoPortRange)config.FixedRanges[4];
+
+            base();
+        }
+
+        static S3TrioResources()
+        {
+            Values = new S3TrioResources();
+        }
+    }
+
+    public class S3Control
+    {
+        private static S3Device device;
+
+        public static int Main(String[] args)
+        {
+            ExtensionContract.Exp! ec = S3TrioResources.Values.ec.Acquire();
+            ServiceProviderContract.Exp! ve = S3TrioResources.Values.video.Acquire();
+            ServiceProviderContract.Exp! te = S3TrioResources.Values.console.Acquire();
+
+            // Create the device
+            device = new S3Device(S3TrioResources.Values);
+            device.Initialize();
+
+            // Signal I/O system that we are initialized.
+            ec.SendSuccess();
+
+            // create a set of all client endpoints connected to the video
+            // interface.
+            ESet<VideoDeviceContract.Exp:Ready> vs
+                = new ESet<VideoDeviceContract.Exp:Ready>();
+            // create a set of all client endpoints connected to the text
+            // interface.
+            ESet<ConsoleDeviceContract.Exp:Ready> ts
+                = new ESet<ConsoleDeviceContract.Exp:Ready>();
+
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        ///////////////////////////////////// I/O System Messages.
+                        case ec.Shutdown():
+                            ec.SendAckShutdown();
+                            run = false;
+                            break;
+
+                            /////////////////////////////// Service Provider Messages.
+                        case ve.Connect(candidate):
+                            VideoDeviceContract.Exp newClient
+                                = candidate as VideoDeviceContract.Exp;
+                            if (newClient != null) {
+                                newClient.SendSuccess();
+                                vs.Add(newClient);
+                                ve.SendAckConnect();
+                            }
+                            else {
+                                ve.SendNackConnect(candidate);
+                            }
+                            break;
+
+                        case te.Connect(candidate):
+                            ConsoleDeviceContract.Exp newClient
+                                = candidate as ConsoleDeviceContract.Exp;
+                            if (newClient != null) {
+                                newClient.SendSuccess();
+                                ts.Add(newClient);
+                                te.SendAckConnect();
+                            }
+                            else {
+                                te.SendNackConnect(candidate);
+                            }
+                            break;
+
+                            ////////////////////////////////// Video Service Messages.
+                        case ep.Plot(x, y, color32) in vs:
+                            device.Plot(x, y, new RGB(color32));
+                            ep.SendAckPlot();
+                            vs.Add(ep);
+                            break;
+
+                        case ep.Fill(x1, y1, x2, y2, color32) in vs:
+                            device.Fill(x1, y1, x2, y2, new RGB(color32));
+                            ep.SendAckFill();
+                            vs.Add(ep);
+                            break;
+
+                        case ep.BitBltBmp(x, y, buffer) in vs:
+                            device.BitBltBmp(x, y, (!)buffer);
+                            ep.SendAckBitBltBmp(buffer);
+                            vs.Add(ep);
+                            break;
+
+                        case ep.BitBltPng(x, y, buffer) in vs:
+                            device.BitBltPng(x, y, (!)buffer);
+                            ep.SendAckBitBltPng(buffer);
+                            vs.Add(ep);
+                            break;
+
+                        case ep.Scroll(x1, y1, x2, y2, dy) in vs:
+                            device.Scroll(x1, y1, x2, y2, dy);
+                            ep.SendAckScroll();
+                            vs.Add(ep);
+                            break;
+
+                        case ep.ChannelClosed() in vs:
+                            Tracing.Log(Tracing.Debug, "Client channel closes.");
+                            delete ep;
+                            break;
+
+                            //////////////////////////////// Console Service Messages.
+                        case ep.Clear() in ts:
+                            device.Window.Clear();
+                            ep.SendAckClear();
+                            ts.Add(ep);
+                            break;
+
+                        case ep.ClearCursorToEndOfLine() in ts:
+                            device.Window.ClearCursorToEndOfLine();
+                            ep.SendAckClearCursorToEndOfLine();
+                            ts.Add(ep);
+                            break;
+
+                        case ep.Write(buffer, offset, count) in ts:
+                            if (offset + count <= buffer.Length) {
+                                device.Window.Write(buffer, offset, count);
+                                ep.SendAckWrite(buffer);
+                            }
+                            else {
+                                ep.SendNakWrite(buffer);
+                            }
+                            ts.Add(ep);
+                            break;
+
+                        case ep.PutChar(c) in ts:
+                            device.Window.PutChar(c);
+                            ep.SendAckPutChar();
+                            ts.Add(ep);
+                            break;
+
+                        case ep.PutCharAt(c, column, row) in ts:
+                            if (device.Window.PutCharAt(c, column, row)) {
+                                ep.SendAckPutCharAt();
+                            }
+                            else {
+                                ep.SendInvalidPosition();
+                            }
+                            ts.Add(ep);
+                            break;
+
+                        case ep.GetDisplayDimensions() in ts:
+                            ep.SendDisplayDimensions(device.Window.TextColumns,
+                                                     device.Window.TextRows);
+                            ts.Add(ep);
+                            break;
+
+                        case ep.GetCursorPosition() in ts:
+                            ep.SendCursorPosition(device.Window.TextColumn,
+                                                  device.Window.TextRow);
+                            ts.Add(ep);
+                            break;
+
+                        case ep.SetCursorPosition(int column, int row) in ts:
+                            if (device.Window.SetTextCursor(column, row)) {
+                                ep.SendAckSetCursorPosition();
+                            }
+                            else {
+                                ep.SendInvalidPosition();
+                            }
+                            ts.Add(ep);
+                            break;
+
+                        case ep.SetCursorSize(cursorSize) in ts:
+                            ep.SendNotSupported();
+                            ts.Add(ep);
+                            break;
+
+                        case ep.CursorFlash() in ts:
+                            device.Window.CursorFlash();
+                            ep.SendAckCursorFlash();
+                            ts.Add(ep);    // add client endpoint back into set.
+                            break;
+
+                        case ep.CursorHide() in ts:
+                            device.Window.CursorHide();
+                            ep.SendAckCursorHide();
+                            ts.Add(ep);    // add client endpoint back into set.
+                            break;
+
+                        case ep.CursorShow() in ts:
+                            device.Window.CursorShow();
+                            ep.SendAckCursorShow();
+                            ts.Add(ep);    // add client endpoint back into set.
+                            break;
+
+                        case ep.ChannelClosed() in ts:
+                            Tracing.Log(Tracing.Debug, "Client channel closes.");
+                            delete ep;
+                            break;
+
+                        case unsatisfiable:
+                            Tracing.Log(Tracing.Debug, "Unsatisfiable.");
+                            run = false;
+                            break;
+                    }
+                }
+            }
+            finally {
+                Tracing.Log(Tracing.Debug, "S3Trio64 finished message pump.");
+            }
+
+            // Close the device
+            device.Finalize();
+
+            Tracing.Log(Tracing.Audit, "Shutdown");
+            delete ec;
+            delete te;
+            delete ve;
+            vs.Dispose();
+            ts.Dispose();
+
+            return 0;
+        }
+    }
+
+    internal delegate void InitMode(S3Device! self);
+
+    internal class S3_VIDEO_MODE
+    {
+        public readonly int BytesPerPixel;
+        public readonly int ScreenWidth;
+        public readonly int ScreenStride;
+        public readonly int ScreenHeight;
+        public readonly int ScreenFrequency;
+        public readonly int Clock;
+        public readonly InitMode Init;
+
+        public S3_VIDEO_MODE(int BPP,int SW,int SH, int SF, int Clk, InitMode I)
+        {
+            BytesPerPixel = BPP;
+            ScreenStride = SW * BPP;
+            ScreenWidth = SW;
+            ScreenHeight = SH;
+            ScreenFrequency = SF;
+            Clock = Clk;
+            Init = I;
+        }
+    }
+
+    public class S3Device
+    {
+        public const ushort ATC_ADDR_REG    = 0x00; // 0x03C0
+        public const ushort ATC_DATA_REG    = 0x01; // 0x03C1
+        public const ushort MISC_OUT_REG    = 0x02; // 0x03C2
+        public const ushort MISC_OUTR_REG   = 0x0C; // 0x03CC
+        public const ushort SEQ_ADDR_REG    = 0x04; // 0x03C4
+        public const ushort SEQ_DATA_REG    = 0x05; // 0x03C5
+        public const ushort DAC_MASK_REG    = 0x06; // 0x03C6
+        public const ushort GRAPH_ADDR_REG  = 0x0E; // 0x03CE
+        public const ushort GRAPH_DATA_REG  = 0x0F; // 0x03CF
+        public const ushort CRT_ADDR_REG    = 0x14; // 0x03D4
+        public const ushort CRT_DATA_REG    = 0x15; // 0x03D5
+        public const ushort SYS_CTRL_REG    = 0x1A; // 0x03DA
+        public const ushort ADV_CTRL_REG    = 0x4AE8;
+        public const ushort GP_STAT_REG     = 0x9AE8;
+
+        private SvgaWindow console;
+        private bool Ready;
+        private S3_VIDEO_MODE ActiveMode;
+        private int AdapterMemorySize;
+        private IoPort! CrtAddrPort;
+        private IoPort! CrtDataPort;
+        private IoPort! GpStatPort;
+        private IoPort! SysCtrlPort;
+        private IoPort! DacMaskPort;
+        private IoPort! SeqAddrPort;
+        private IoPort! SeqDataPort;
+        private IoPort! MiscOutPort;
+        private IoPort! MiscOutRPort;
+        private IoPort! AtcAddrPort;
+        private IoPort! AtcDataPort;
+        private IoPort! AdvCtrlPort;
+        private IoPort! GraphAddrPort;
+        private IoPort! GraphDataPort;
+
+        static S3_VIDEO_MODE[]! Modes = new S3_VIDEO_MODE[3] {
+            new S3_VIDEO_MODE(2,1024,768,60,0xd, new InitMode(set_1024x60Hz_16bpp)),
+            new S3_VIDEO_MODE(2,800,600,60,0xd, new InitMode(set_800x60Hz_16bpp)),
+            new S3_VIDEO_MODE(2,640,400,60,0, new InitMode(set_640x60Hz_16bpp)),
+        };
+
+        private ushort[]! lineBuffer;
+
+        private IoMemory! screenBuffer;   // Screen buffer within PCI-mapped memory.
+        private IoMemory! textBuffer;     // VGA limited text buffer.
+        private IoMemory! fontBuffer;     // VGA limited font buffer.
+
+        internal S3Device(S3TrioResources! res)
+        {
+            // Allow access to first 2MB for device's memory.
+            screenBuffer = (!)res.frameBuffer.MemoryAtOffset(0, 0x400000, Access.ReadWrite);
+            textBuffer = (!)res.textBuffer.MemoryAtOffset(0, 0x8000, true, true);
+            fontBuffer = (!)res.fontBuffer.MemoryAtOffset(0, 0x8000, true, true);
+
+#if DONT
+            DebugStub.WriteLine("S3Trio64 linear buffer at {0:x}",
+                                __arglist((uint)screenBuffer.PhysicalAddress.Value));
+#endif
+
+            AtcAddrPort = (!)res.dev.PortAtOffset(ATC_ADDR_REG, 2, Access.Write);
+            AtcDataPort = (!)res.dev.PortAtOffset(ATC_DATA_REG, 2, Access.ReadWrite);
+            GraphAddrPort = (!)res.dev.PortAtOffset(GRAPH_ADDR_REG, 2, Access.Write);
+            GraphDataPort = (!)res.dev.PortAtOffset(GRAPH_DATA_REG, 2, Access.ReadWrite);
+            CrtAddrPort = (!)res.dev.PortAtOffset(CRT_ADDR_REG, 2, Access.Write);
+            CrtDataPort = (!)res.dev.PortAtOffset(CRT_DATA_REG, 2, Access.ReadWrite);
+            SysCtrlPort = (!)res.dev.PortAtOffset(SYS_CTRL_REG, 2, Access.Read);
+            DacMaskPort = (!)res.dev.PortAtOffset(DAC_MASK_REG, 2, Access.ReadWrite);
+            SeqAddrPort = (!)res.dev.PortAtOffset(SEQ_ADDR_REG, 2, Access.Write);
+            SeqDataPort = (!)res.dev.PortAtOffset(SEQ_DATA_REG, 2, Access.ReadWrite);
+            MiscOutPort = (!)res.dev.PortAtOffset(MISC_OUT_REG, 2, Access.Write);
+            MiscOutRPort = (!)res.dev.PortAtOffset(MISC_OUTR_REG, 2, Access.ReadWrite);
+
+            AdvCtrlPort = (!)res.adv.PortAtOffset(0, 2, Access.ReadWrite);
+            GpStatPort  = (!)res.gps.PortAtOffset(0, 2, Access.Read);
+
+            lineBuffer = new ushort [2048];
+
+            base();
+
+            Ready = true;
+        }
+
+#if DONT_DUMP
+        private static void Dump(IoMemory buffer, int beg, int end)
+        {
+            for (int i = beg; i < end; i += 0x08) {
+                DebugStub.Write("  {0,4:x}: ", __arglist(i));
+                for (int j = i; j < i + 0x08 && j < end; j++) {
+                    byte v = buffer.Read8(j);
+
+                    DebugStub.Write("{0,2:x2} ", __arglist(v));
+                }
+                DebugStub.WriteLine();
+            }
+        }
+
+        private static void DumpRegs(IoPort addr, IoPort data, byte beg, byte end)
+        {
+            for (byte i = beg; i < end; i += 0x10) {
+                DebugStub.Print("  {0}:{1,2:x2} = ", __arglist(addr, i));
+                for (byte j = i; j < i + 0x10 && j < end; j++) {
+                    addr.Write8(j);
+                    byte v = data.Read8();
+
+                    DebugStub.Print("{0,2:x2} ", __arglist(v));
+                }
+                DebugStub.Print("\n");
+            }
+        }
+
+        private static void DumpAtc(IoPort reset,
+                                    IoPort addr, IoPort data,
+                                    byte beg, byte end)
+        {
+            for (byte i = beg; i < end; i += 0x10) {
+                DebugStub.Print("  {0}:{1,2:x2} = ", __arglist(addr, i));
+                for (byte j = i; j < i + 0x10 && j < end; j++) {
+                    reset.Read8();
+                    addr.Write8(j);
+                    byte v = data.Read8();
+
+                    DebugStub.Print("{0,2:x2} ", __arglist(v));
+                }
+                DebugStub.Print("\n");
+            }
+        }
+
+        private void Dump()
+        {
+            DumpRegs(SeqAddrPort, SeqDataPort, 0x00, 0x05);
+            DumpRegs(GraphAddrPort, GraphDataPort, 0x00, 0x09);
+            DumpRegs(CrtAddrPort, CrtDataPort, 0x00, 0x68);
+            DumpAtc(SysCtrlPort, AtcAddrPort, AtcDataPort, 0x00, 0x15);
+            DebugStub.Print("  {0}:{1,2:x2} = {2,2:x2}\n",
+                            __arglist(MiscOutRPort, 0x00, MiscOutRPort.Read8()));
+        }
+#endif
+
+        public void Initialize()
+        {
+#if DONT
+            DebugStub.Print("Initializing S3 Display\n");
+#endif
+
+            ActiveMode = (!)Modes[0];
+
+            S3FindAdapter();
+            S3Initialize();
+
+            Fill(0, 0, ActiveMode.ScreenWidth - 1, ActiveMode.ScreenHeight - 1, RGB.Black);
+
+            console = new SvgaWindow(this, 12, 12,
+                                     ActiveMode.ScreenWidth-13, ActiveMode.ScreenHeight-13);
+
+            console.Write("Singularity S3Trio64 Driver\n");
+            console.Write("");
+            console.Write("");
+            console.Write("");
+        }
+
+        public SvgaWindow! Window
+        {
+            get { return console; }
+        }
+
+        public void Finalize()
+        {
+            Ready = false;
+
+            VgaTextMode();
+
+            textBuffer.Write16(0, 0x1f20, 50 * 80);
+        }
+
+        /*      public static VIDEO_ACCESS_RANGE []S3AccessRanges = new  VIDEO_ACCESS_RANGE[]
+                {
+                {0x000003C0, 0x00000000, 0x00000010, 1, 1, 1, 0}, // 2 Various VGA regs
+                {0x000003D4, 0x00000000, 0x00000008, 1, 1, 1, 0}, // 3 System Control Registers
+                {0x000042E8, 0x00000000, 0x00000002, 1, 1, 0, 0}, // 4 SubSys-Stat/Cntl
+                {0x00004AE8, 0x00000000, 0x00000002, 1, 1, 0, 0}, // 5 AdvFunc-Cntl
+                {0x000082E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 6 Cur-Y
+                {0x000086E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 7 Cur-X
+                {0x00008AE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 8 DestY-AxStp
+                {0x00008EE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 9 DestX-SiaStp
+                {0x000092E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 10 Err-Term
+                {0x000096E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 11 Maj-Axis-Pcnt(Rec-Width)
+                {0x00009AE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 12 Gp-Stat/Cmd
+                {0x00009EE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 13 Short-Stroke
+                {0x0000A2E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 14 Bkgd-Color
+                {0x0000A6E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 15 Frgd-Color
+                {0x0000AAE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 16 Wrt_Mask
+                {0x0000AEE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 17 Rd-Mask
+                {0x0000B6E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 18 Bkgd-Mix
+                {0x0000BAE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 19 Frgd-Mix
+                {0x0000BEE8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 20 Mulitfucn_Cntl
+                {0x0000E2E8, 0x00000000, 0x00000004, 1, 1, 0, 0}, // 21 Pix-Trans
+
+                //
+                // All S3 boards decode more ports than are documented.  If we
+                // don't reserve these extra ports, the PCI arbitrator may grant
+                // one to a PCI device, and thus clobber the S3.
+                //
+                // The aliased ports seem to be any ports where bit 15 is set;
+                // for these, the state of bit 14 is effectively ignored.
+                //
+
+                {0x0000C2E8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 22 Alt Cur-Y
+                {0x0000C6E8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 23 Alt Cur-X
+                {0x0000CAE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 24 Alt DestY-AxStp
+                {0x0000CEE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 25 Alt DestX-SiaStp
+                {0x0000D2E8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 26 Alt Err-Term
+                {0x0000D6E8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 27 Alt Maj-Axis-Pcnt(Rec-Width)
+                {0x0000DAE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 28 Alt Gp-Stat/Cmd
+                {0x0000DEE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 29 Alt Short-Stroke
+                {0x0000E6E8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 30 Alt Frgd-Color
+                {0x0000EAE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 31 Alt Wrt_Mask
+                {0x0000EEE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 32 Alt Rd-Mask
+                {0x0000F6E8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 33 Alt Bkgd-Mix
+                {0x0000FAE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 34 Alt Frgd-Mix
+                {0x0000FEE8, 0x00000000, 0x00000004, 1, 1, 0, 1}, // 35 Alt Mulitfucn_Cntl
+                };*/
+
+        /*****************************************************************************
+         * 864 IoMemory Timing Table(s)
+         ****************************************************************************/
+
+        //
+        //  M parameter values, used in Set864MemoryTiming()
+        //
+        //  access to this table is controlled by constants in Set864MemoryTiming()
+        //  if you change the table make sure you change the constants
+        //
+
+        public static byte[] MParameterTable = new byte[]
+        {
+            //  8 bit color   16 bit color
+            //  60Hz  72Hz    60Hz  72Hz
+
+            0xd8, 0xa8,   0x58, 0x38,   //  640 x 480, 1 Mb frame buffer
+            0x78, 0x58,   0x20, 0x08,   //  800 x 600, 1 Mb frame buffer
+            0x38, 0x28,   0x00, 0x00,   // 1024 x 768, 1 Mb frame buffer
+
+            0xf8, 0xf8,   0xf8, 0xe0,   //  640 x 480, 2 Mb or greater frame buffer
+            0xf8, 0xf8,   0xa8, 0x68,   //  800 x 600, 2 Mb or greater frame buffer
+            0xd8, 0xa0,   0x40, 0x20    // 1024 x 768, 2 Mb or greater frame buffer
+        };
+
+
+        public void S3FindAdapter()
+        {
+#if DONT
+            DebugStub.Print("S3FindAdapter\n");
+#endif
+            // Unlocked the extended registers.
+            CrtAddrPort.Write16(0x4838);
+            CrtAddrPort.Write16(0xA039);
+
+            //
+            // Get the size of the video memory.
+            //
+            CrtAddrPort.Write8(0x36);
+            AdapterMemorySize = (8 - ((CrtDataPort.Read8() >> 5) & 0x7)) * 0x80000;
+        } // end S3FindAdapter()
+
+        private void VideoPortStallExecution(int delay)
+        {
+            // dummy definition
+        }
+
+        private void WaitForGpuIdle()
+        {
+            //verifying that bit 9 of 9AE8H is 0
+            while ((GpStatPort.Read16() & 0x0200) != 0) { }
+        }
+
+        private void S3Initialize()
+        {
+            byte bt;
+
+#if DONT
+            DebugStub.Print("S3Initialize\n");
+#endif
+            // Turn off the screen at the DAC.
+            DacMaskPort.Write8(0x00);
+
+            SeqAddrPort.Write16(0x0100);   // Async Reset
+
+#if DONT
+            DebugStub.Print("S3Initialize 001\n");
+#endif
+            Wait_VSync();
+            //
+            // Wait for vertical sync to make sure that bit 3 of SR1
+            // is not changed to a different value during an active video
+            // period as suggested by S3 errata sheet.
+            //
+
+            IndxOut(SeqAddrPort, new byte[] { 0x03,0x01,0x0F,0x00,0x0e } );
+
+#if DONT
+            DebugStub.Print("S3Initialize 002\n");
+#endif
+            // program graphics controller registers
+            IndxOut(GraphAddrPort, new byte[] { 0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,0xff});
+
+            CrtAddrPort.Write16(0x4838);   // Unlock the S3 specific regs
+            CrtAddrPort.Write16(0xA039);   // Unlock the more S3 specific regs
+            CrtAddrPort.Write16(0x0140);   // Do this before SETCRTC because CRTC streams have to write to 0x4ae8
+            // Enable 8514/a reg access
+
+#if DONT
+            DebugStub.Print("S3Initialize 003\n");
+#endif
+            AdvCtrlPort.Write16(0x0001);
+
+            CrtAddrPort.Write16(0x4838);   // Unlock the S3 specific regs
+            CrtAddrPort.Write16(0xa039);   // Unlock the more S3 specific regs
+
+            CrtAddrPort.Write16(0x0011);   // Unprotect CRTC regs
+
+            ActiveMode.Init(this);
+
+            // Program the CRTC regs
+#if DONT
+            DebugStub.Print("S3Initialize  6\n");
+#endif
+            CrtAddrPort.Write16(0x0042);    // make sure that CR42 is 0 before it
+            // is enabled as a clock select source
+
+            CrtAddrPort.Write16(0x8d31);    // memory configuration reg
+            CrtAddrPort.Write16(0x2033);    // backward compatibility 2 reg
+
+            CrtAddrPort.Write8(0x43);       // extended mode reg
+            bt=CrtDataPort.Read8();         //reset every bit other than 4th bit
+            bt &= 0x10;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write8(0x51);       // extended system control reg 2
+            // use MASKOUT operation to prevent
+            // wiping out the extension bits of
+#if DONT
+            DebugStub.Print("S3Initialize  7\n");
+#endif
+            bt=CrtDataPort.Read8();         // CR13 (logical line width) in 16
+            bt &= 0x30;                     // bit per pixel color mode
+            CrtDataPort.Write8(bt);
+
+#if DONT
+            DebugStub.Print("S3Initialize  7.1\n");
+#endif
+            CrtAddrPort.Write16(0x0025);    // general output port
+
+            //
+            // Set the address for the frame buffer window and set the window
+            // size.
+            //
+
+#if DONT
+            DebugStub.Print("S3Trio64 linear buffer at {0:x}\n",
+                            __arglist((uint)screenBuffer.PhysicalAddress.Value));
+#endif
+
+            CrtAddrPort.Write8(0x59);
+            CrtDataPort.Write8((byte)(screenBuffer.PhysicalAddress.Value >> 24));
+
+            CrtAddrPort.Write8(0x5A);
+            CrtDataPort.Write8((byte)(screenBuffer.PhysicalAddress.Value >> 16));
+
+#if DONT
+            DebugStub.Print("S3Initialize  7.2\n");
+#endif
+
+            // Enable Linear Addressing, and select 4MB window.
+            CrtAddrPort.Write8(0x58);
+            bt=CrtDataPort.Read8();
+            bt &= 0xEC;
+            bt |= 0x13;
+            CrtDataPort.Write8(bt);
+
+#if DONT
+            DebugStub.Print("S3Initialize  7.4\n");
+#endif
+
+
+#if DONT
+            DebugStub.Print("S3Initialize 00\n");
+#endif
+            SysCtrlPort.Read8();        // Prepare to program the ATC
+            if (ActiveMode.ScreenWidth == 640) {
+                AtcOut(AtcAddrPort, new byte[] { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+                                                 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+                                                 0x41,0x00,0x0f,0x00,0x00 } );
+            }
+            else {
+                AtcOut(AtcAddrPort, new byte[] { 0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+                                                 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+                                                 0x01,0x00,0x0f,0x00,0x00 } );
+            }
+
+#if DONT
+            DebugStub.Print("S3Initialize  8\n");
+#endif
+
+            Wait_VSync();
+            //
+            // Wait for vertical sync to make sure that the display
+            // is not reactivated in the middle of a line/frame as suggested
+            // by the S3 errata sheet; not doing this causes the screen to
+            // flash momentarily.
+            //
+
+            SysCtrlPort.Read8();        // Set ATC FF to index
+            AtcAddrPort.Write8(0x20);          // Enable the palette
+
+            CrtAddrPort.Write8(0x45);         // Turn off H/W Graphics Cursor
+            bt=CrtDataPort.Read8();
+            bt &= 0xfe;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write16(0xff0e);      // Set the graphic cursor foreground color
+            CrtAddrPort.Write16(0x000f);      // Set the graphic cursor background color
+
+            CrtAddrPort.Write8(0x3a);         // Set the Misc 1 reg
+            bt=CrtDataPort.Read8();
+            bt &= 0x62;
+            bt |= 0x15;
+            CrtDataPort.Write8(bt);
+#if DONT
+            DebugStub.Print("S3Initialize  9\n");
+#endif
+
+            CrtAddrPort.Write8(0x31);         // Disable 2K X 1K X 4 plane
+            bt=CrtDataPort.Read8();
+            bt &= 0xe4;
+            bt |= 0x08;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write8(0x32);          // Disable multiple pages
+            bt=CrtDataPort.Read8();
+            bt &= 0xbf;
+            CrtDataPort.Write8(bt);
+
+            MiscOutPort.Write8(0xef);         // Set Misc out reg for external clock
+
+            /*Set_Oem_Clock();    // starts : Set the clock*/
+            int ul;
+
+            ul = ActiveMode.Clock;
+            CrtAddrPort.Write8(0x42);
+            CrtDataPort.Write8((byte) ul);
+            /*Set_Oem_Clock();    // ends : Set the clock*/
+
+            VideoPortStallExecution(0x400);     // Wait for the clock to settle down
+            // S3 product alert Synchronization &
+            // Clock Skew.
+#if DONT
+            DebugStub.Print("S3Initialize  10\n");
+#endif
+            Wait_VSync();
+
+            Wait_VSync();
+#if DONT
+            DebugStub.Print("S3Initialize  11\n");
+#endif
+            SeqAddrPort.Write8(0x01);
+            bt = SeqDataPort.Read8();
+            bt &= 0xdf;     //
+            SeqDataPort.Write8(bt);
+
+            VideoPortStallExecution(0x400);     // Wait for about 1 millisecond
+            // for the monitor to settle down
+
+            // Turn on the screen at the DAC.
+            DacMaskPort.Write8(0xFF);
+
+            CrtAddrPort.Write16(0x0038);   // Lock S3 specific regs
+            CrtAddrPort.Write16(0x0039);   // Lock more S3 specific regs
+
+            // EOD
+#if DONT
+            DebugStub.Print("S3Initialize  12\n");
+#endif
+            Set864MemoryTiming();
+#if DONT
+            DebugStub.Print("S3Initialize  13\n");
+#endif
+
+            //////////////////////////////////////////////////////////////////
+            // Unlock the S3 registers,  we need to unlock the registers a second
+            // time since the interpreter has them locked when it returns to us.
+            //
+            CrtAddrPort.Write16(0x4838);
+            CrtAddrPort.Write16(0xA039);
+
+            //////////////////////////////////////////////////////////////////
+            // Warm up the hardware for the new mode, and work around any
+            // BIOS bugs.
+            //
+            //
+            // Make sure 16-bit memory reads/writes are enabled.
+            //
+            CrtAddrPort.Write8(0x31);
+            bt = CrtDataPort.Read8();
+            bt |= 0x04;
+            CrtDataPort.Write8(bt);
+#if DONT
+            DebugStub.Print("S3Initialize  16\n");
+#endif
+
+            //
+            // Set the colours for the built-in S3 pointer.
+            //
+            CrtAddrPort.Write16(0xff0e);
+            CrtAddrPort.Write16(0x000f);
+
+            CrtAddrPort.Write8(0x45);
+            CrtDataPort.Read8();
+
+            CrtAddrPort.Write8(0x4A);
+            CrtDataPort.Write8(0xFF);
+            CrtDataPort.Write8(0xFF);
+            CrtDataPort.Write8(0xFF);
+            CrtDataPort.Write8(0xFF);
+
+            CrtAddrPort.Write8(0x45);
+            CrtDataPort.Read8();
+
+            CrtAddrPort.Write8(0x4B);
+            CrtDataPort.Write8(0x00);
+            CrtDataPort.Write8(0x00);
+            CrtDataPort.Write8(0x00);
+            CrtDataPort.Write8(0x00);
+#if DONT
+            DebugStub.Print("S3Initialize  17\n");
+#endif
+
+            //
+            // Some BIOSes don't disable linear addressing by default, so
+            // make sure we do it here.
+            //
+            WaitForGpuIdle();
+
+            //
+            // Enable the Graphics engine.
+            //
+            CrtAddrPort.Write8(0x40);
+            bt = CrtDataPort.Read8();
+            bt |= 0x01;
+            CrtDataPort.Write8(bt);
+        } // end S3Initialize()
+
+        static public void set_640x60Hz_16bpp(S3Device! self)
+        {
+            self.set_640x60Hz_16bpp();
+        }
+
+        private void IndxOut(IoPort! port, byte beg, byte[]! values)
+        {
+            for (ushort i = 0; i < values.Length; i++) {
+                port.Write16((ushort)(beg + i + ((ushort)values[i] << 8)));
+            }
+        }
+
+        private void IndxOut(IoPort! port, byte[]! values)
+        {
+            IndxOut(port, 0, values);
+        }
+
+        private void AtcOut(IoPort! port, byte[]! values)
+        {
+            for (byte i = 0; i < values.Length; i++) {
+                port.Write8(i);
+                port.Write8(values[i]);
+            }
+        }
+
+        //
+        // VGA indexed register indexes.
+        //
+        private const byte GRAPH_SET_REG        = 0;
+        private const byte GRAPH_ENABLE_REG     = 1;
+        private const byte GRAPH_COMPARE_REG    = 2;
+        private const byte GRAPH_OPERATION_REG  = 3;
+        private const byte GRAPH_READSEL_REG    = 4;
+        private const byte GRAPH_MODE_REG       = 5;
+        private const byte GRAPH_MISC_REG       = 6;
+        private const byte GRAPH_DONTCARE_REG   = 7;
+        private const byte GRAPH_BITMASK_REG    = 8;
+
+        //
+        private void VgaTextMode()
+        {
+            WaitForGpuIdle();
+
+            // Turn off the screen at the DAC.
+            DacMaskPort.Write8(0x00);
+
+            // SetHWMode: S3 VGA
+
+            CrtAddrPort.Write16(0x4838);            // Unlock the S3 regs
+            CrtAddrPort.Write16(0xa539);            // Unlock the SC regs
+
+            CrtAddrPort.Write8(0x40);               // Enable the S3 graphics engine
+            byte bt = CrtDataPort.Read8();
+            bt &= 0xfe;
+            bt |= 0x01;
+            CrtDataPort.Write8(bt);
+
+            AdvCtrlPort.Write16(0x0000);            // reset to normal VGA operation
+
+            CrtAddrPort.Write8(0x40);               // Disable the S3 graphics engine
+            bt = CrtDataPort.Read8();
+            bt &= 0xfe;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write8(0x31);               // Memory Control
+            bt=CrtDataPort.Read8();
+            bt &= 0x75;
+            bt |= 0x85;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write8(0x32);               // Backward Compat 1
+            bt=CrtDataPort.Read8();
+            bt &= 0x40;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write16(0x0033);            // Backward Compat 2
+            CrtAddrPort.Write16(0x0034);            // Backward Compat 3
+            CrtAddrPort.Write16(0x0035);            // CRTC Lock
+
+            CrtAddrPort.Write8(0x3a);               // S3 Misc 1
+            bt=CrtDataPort.Read8();
+            bt &= 0x88;
+            bt |= 0x05;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write16(0x5a3b);            // Data Transfer Exec Pos
+            CrtAddrPort.Write16(0x103c);            // Interlace Retrace start
+            CrtAddrPort.Write16(0x0043);            // Extended Mode
+            CrtAddrPort.Write16(0x0045);            // HW graphics Cursor Mode
+            CrtAddrPort.Write16(0x0046);            // HW graphics Cursor Orig x
+            CrtAddrPort.Write16(0xff47);            // HW graphics Cursor Orig x
+            CrtAddrPort.Write16(0xfc48);            // HW graphics Cursor Orig y
+            CrtAddrPort.Write16(0xff49);            // HW graphics Cursor Orig y
+            CrtAddrPort.Write16(0xff4a);            // HW graphics Cursor Orig y
+            CrtAddrPort.Write16(0xff4b);            // HW graphics Cursor Orig y
+            CrtAddrPort.Write16(0xff4c);            // HW graphics Cursor Orig y
+            CrtAddrPort.Write16(0xff4d);            // HW graphics Cursor Orig y
+            CrtAddrPort.Write16(0xff4e);            // Dsp Start x pixel pos
+            CrtAddrPort.Write16(0xdf4d);            // Dsp Start y pixel pos
+
+            CrtAddrPort.Write8(0x42);               // MODE-CNTL
+            bt=CrtDataPort.Read8();
+            bt &= 0xdf;
+            CrtDataPort.Write8(bt);
+
+            // Disable linear addressing.
+            CrtAddrPort.Write8(0x58);
+            bt = CrtDataPort.Read8();
+            bt &= 0xEC;
+            CrtDataPort.Write8(bt);
+
+            // start sync reset program up sequencer
+            IndxOut(SeqAddrPort, new byte[] { 0x01,0x00,0x03,0x00,0x03 } );
+
+            MiscOutPort.Write8(0x67);
+            GraphAddrPort.Write16(0x0e06);
+
+            //  EndSyncResetCmd
+            SeqAddrPort.Write16(0x0300);
+
+            // Unlock the CTC registers.
+            CrtAddrPort.Write16(0x0E11);
+
+            // Unlocked the extended registers.
+            CrtAddrPort.Write16(0x4838);
+            CrtAddrPort.Write16(0xA039);
+
+            // program crtc registers
+            IndxOut(CrtAddrPort, new byte[] { 0x5F,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+                                              0x00,0x47,0x06,0x07,0x00,0x00,0x01,0x40,
+                                              0x9c,0x0e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+                                              0xFF } );
+            IndxOut(CrtAddrPort, 0x30, new byte[] {0xe1,0x85,0x00,0x00,
+                                                   0x00,0x00,0x02,0x00,
+                                                   0x48,0xa0,0x05,0x5a,
+                                                   0x10 } );
+            IndxOut(CrtAddrPort, 0x40, new byte[] {0x08,0x00,0x08,0x00 } );
+            CrtAddrPort.Write16(0xff4d);
+            IndxOut(CrtAddrPort, 0x50, new byte[] {0x00,0x00,0x00,0x00,
+                                                   0x38,0x00,0x00,0x00,
+                                                   0xc0,0xf8,0x00,0x00,
+                                                   0x80,0x00,0x00,0x00,
+                                                   0x07,0x00,0xa1,0x00,
+                                                   0x00,0x00,0x00,0x00, } );
+
+
+            // prepare atc for writing
+            SysCtrlPort.Read8();
+            AtcOut(AtcAddrPort, new byte[] { 0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+                                             0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+                                             0x04,0x00,0x0F,0x08,0x00 } );
+
+            // program graphics controller registers
+            IndxOut(GraphAddrPort, new byte[] { 0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,0xff});
+
+
+            // Reload the font.
+            LoadFont(Fonts.Font8);
+
+            // Turn on the screen at the DAC.
+            DacMaskPort.Write8(0xFF);
+
+            // Lock the CTC registers.
+            CrtAddrPort.Write16(0x8E11);
+
+            // prepare atc for writing
+            SysCtrlPort.Read8();
+            AtcAddrPort.Write8(0x20);
+        }
+
+        private void LoadFont(byte[]! font)
+        {
+            // Enable A000 Data
+            SeqAddrPort.Write16(0x0100);
+            GraphAddrPort.Write16(0x0204); // Read Map = plane 2
+            GraphAddrPort.Write16(0x0005); // Graphics Mode = read mode 0, write mode 0
+            GraphAddrPort.Write16(0x0406); // A0000 for 64K, not odd/even,
+            SeqAddrPort.Write16(0x0402); // Map Mask = write to plane 2 only
+            SeqAddrPort.Write16(0x0404); // Memory Mode = not odd/even, not full memory
+            SeqAddrPort.Write16(0x0300);  // end sync reset
+
+            int height = font.Length / 256;
+
+            for (int i = 0; i < 256; i++) {
+                for (int j = 0; j < height; j++) {
+                    fontBuffer.Write8(32 * i + j, font[height * i + j]);
+                }
+            }
+
+            // Disable A000 Color
+            SeqAddrPort.Write16(0x0100);
+            GraphAddrPort.Write16(0x0004);
+            GraphAddrPort.Write16(0x1005);
+            GraphAddrPort.Write16(0x0E06);
+            SeqAddrPort.Write16(0x0302);
+            SeqAddrPort.Write16(0x0204);
+            SeqAddrPort.Write16(0x0300);  // end sync reset
+        }
+
+        public void set_640x60Hz_16bpp()
+        {
+            CrtAddrPort.Write16(0xbe3b);   // Data Xfer Execution Position reg
+            CrtAddrPort.Write16(0x1034);   // S3R4 - Backwards Compatibility 3
+
+            IndxOut(CrtAddrPort, new byte[] {
+                0xc3,0x9f,0xa0,0x04,0xa8,0x80,0x0b,0x3e,
+                0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+                0xea,0x0c,0xdf,0x00,0x60,0xe7,0x04,0xab,
+                0xff } );
+
+            CrtAddrPort.Write8(0x51);  // overflow bits for CR13
+            byte bt=CrtDataPort.Read8();//setting 4th bit , resetting 5,6 & 7 th bit
+            bt &= 0x0f;                     // bit 5,4 = 01
+            bt |= 0x10;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write16(0x005d);
+            CrtAddrPort.Write16(0x005e);
+            CrtAddrPort.Write16(0x1050);   // 16 bit pixel length
+            CrtAddrPort.Write16(0x5067);   // mode 10: 16 bit color, 1 VCLK/pixel
+            CrtAddrPort.Write16(0x026d);   // recover pixel on right hand edge in 16 bpp mode
+        }
+
+        static public void set_800x60Hz_16bpp(S3Device! self)
+        {
+            self.set_800x60Hz_16bpp();
+        }
+
+        public void set_800x60Hz_16bpp()
+        {
+            CrtAddrPort.Write16(0xfe3b);   // Data Xfer Execution Position reg
+            CrtAddrPort.Write16(0x1034);   // S3R4 - Backwards Compatibility 3
+
+            IndxOut(CrtAddrPort, new byte[] {
+                0x03,0xc7,0xc8,0x84,0xd4,0x14,0x74,0xf0,
+                0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x58,0x0c,0x57,0xc8,0x00,0x57,0x73,0xe3,
+                0xff } );
+
+            CrtAddrPort.Write8(0x51);  // overflow bits for CR13
+            byte bt=CrtDataPort.Read8(); //  resetting 4,5,6 & 7 th bit
+            bt &= 0x0f;                         // bit 5,4 = 00
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write16(0x015d);
+            CrtAddrPort.Write16(0x005e);
+            CrtAddrPort.Write16(0x9050);   // 16 bit pixel length
+            CrtAddrPort.Write16(0x5067);   // mode 10: 16 bit color, 1 VCLK/pixel
+            CrtAddrPort.Write16(0x026d);   // recover pixel on right hand edge in 16 bpp mode
+        }
+
+        static public void set_1024x60Hz_16bpp(S3Device! self)
+        {
+            self.set_1024x60Hz_16bpp();
+        }
+
+        public void set_1024x60Hz_16bpp()
+        {
+            CrtAddrPort.Write16(0x0034);   // S3R4 - Backwards Compatibility 3
+
+            IndxOut(CrtAddrPort, new byte[] {
+                0x4b,0xff,0x00,0x8c,0x08,0x8a,0x25,0xf5,
+                0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x02,0x0f,0xff,0x00,0x60,0xff,0x21,0xeb,
+                0xff } );
+
+            CrtAddrPort.Write8(0x51);  // overflow bits for CR13
+            byte bt=CrtDataPort.Read8();//setting 4th bit , resetting 5,6 & 7 th bit
+            bt &= 0x0f;                     // bit 5,4 = 01
+            bt |= 0x10;
+            CrtDataPort.Write8(bt);
+
+            CrtAddrPort.Write16(0x355d);
+            CrtAddrPort.Write16(0x005e);
+            CrtAddrPort.Write16(0x1050);   // 16 bit pixel length
+            CrtAddrPort.Write16(0x5067);   // mode 10: 16 bit color, 1 VCLK/pixel
+            CrtAddrPort.Write16(0x026d);   // recover pixel on right hand edge in 16 bpp mode
+        }
+
+        // Wait for the vertical blanking interval on the chip.
+        public void Wait_VSync()
+        {
+            byte bt;
+
+            // It's possible that this routine will get called
+            // when the 911 is in a zombie state, meaning there is no
+            // vertical sync being generated.  This is why we have some long
+            // time out loops here.
+
+            // First wait for getting into vertical blanking.
+
+            for (int i = 0; i < 0x100000; i++) {
+                if ((SysCtrlPort.Read8() & 0x08)!=0) {
+                    break;
+                }
+            }
+
+            //
+            // We are either in a vertical blanking interval or we have timed out.
+            // Wait for the Vertical display interval.
+            // This is done to make sure we exit this routine at the beginning
+            // of a vertical blanking interval, and not in the middle or near
+            // the end of one.
+            //
+            for (int i = 0; i < 0x100000; i++) {
+                if ((SysCtrlPort.Read8() & 0x08)==0) {
+                    break;
+                }
+            }
+
+            //
+            // Now wait to get into the vertical blank interval again.
+            //
+            for (int i = 0; i < 0x100000; i++) {
+                if ((SysCtrlPort.Read8() & 0x08)!=0) {
+                    break;
+                }
+            }
+        }
+
+        public bool Set864MemoryTiming()
+            /*++
+              Routine Description:
+              Sets L, M and N timing parameters, also sets and enables the
+              Start Display FIFO register
+              Arguments:
+              None
+              Return Value:
+              TRUE if success, FALSE if failure
+              --*/
+        {
+
+            int  MIndex, ScreenWidth, failure = 0;
+            ushort data16;
+            byte  data8;
+
+            //
+            // unlock registers
+            //
+            CrtAddrPort.Write16(0x4838);
+            CrtAddrPort.Write16(0xA039);
+
+            //
+            // make sure this is an 864
+            //
+            CrtAddrPort.Write8(0x30);
+            data8 = CrtDataPort.Read8();
+            if ((data8 & 0xf0) != 0xc0)
+                failure = 1;
+
+            //
+            // make sure there is an entry in the M parameter table for this mode
+            //
+            MIndex = (AdapterMemorySize < 0x200000) ? 0 : 12;
+
+            switch (ActiveMode.ScreenWidth)
+            {
+                case 640:
+                    MIndex += 0;
+                    break;
+
+                case 800:
+                    MIndex += 4;
+                    break;
+
+                case 1024:
+                    MIndex += 8;
+                    break;
+
+                default:
+                    failure = 1;
+                    break;
+            }
+
+            switch (ActiveMode.BytesPerPixel)
+            {
+                case 1:
+                    MIndex += 0;
+                    break;
+
+                case 2:
+                    MIndex += 2;
+                    break;
+
+                default:
+                    failure = 1;
+                    break;
+            }
+
+            switch (ActiveMode.ScreenFrequency)
+            {
+                case 60:
+                    MIndex += 0;
+                    break;
+
+                case 72:
+                    MIndex += 1;
+                    break;
+
+                default:
+                    failure = 1;
+                    break;
+            }
+
+            if (failure!=0)
+            {
+                return false;
+            }
+
+            //
+            // set and enable L parameter, 1 Mb frame buffer configurations are
+            // restricted to a 32 bit data path and therefore make twice as many
+            // transfers
+            //
+            ScreenWidth = ActiveMode.ScreenWidth;
+
+            if (AdapterMemorySize < 0x200000)
+                data16 = (ushort) ((ScreenWidth * ActiveMode.BytesPerPixel) / 4);
+            else
+                data16 = (ushort) ((ScreenWidth * ActiveMode.BytesPerPixel) / 8);
+
+            CrtAddrPort.Write8(0x62);
+            CrtDataPort.Write8((byte) (data16 & 0xff));
+            data16 = (ushort)((data16 >> 8) & 0x07);
+
+            CrtAddrPort.Write8(0x61);
+            CrtDataPort.Write8((byte) ((data16 & 0x07) | 0x80));
+
+            //
+            // set Start Display FIFO register
+            //
+            CrtAddrPort.Write8(0x5d);
+            data8 = CrtDataPort.Read8();
+            data16 =(ushort) (data8 & 0x01);
+            data16 <<= 8;
+
+            CrtAddrPort.Write8(0x00);
+            data8 = CrtDataPort.Read8();
+            data16 |= data8;
+            data16 -= 5;        // typical CR3B is CR0 - 5 (with extension bits)
+
+            CrtAddrPort.Write8(0x3b);
+            CrtDataPort.Write8((byte) (data16 & 0xff));
+
+            CrtAddrPort.Write8(0x5d);
+            data8 = CrtDataPort.Read8();
+            data8 &= 0xbf;
+            data8 = (byte)(data8 | (byte) ((data16 & 0x100) >> 2));
+            CrtDataPort.Write8(data8);
+
+            //
+            // enable Start Display FIFO register
+            //
+            CrtAddrPort.Write8(0x34);
+            data8 = CrtDataPort.Read8();
+            data8 |= 0x10;
+            CrtDataPort.Write8(data8);
+
+            //
+            // set M parameter
+            //
+            CrtAddrPort.Write8(0x54);
+            CrtDataPort.Write8((byte) MParameterTable[MIndex]);
+
+            //
+            // set N parameter
+            //
+            CrtAddrPort.Write8(0x60);
+            CrtDataPort.Write8((byte) 0xff);
+
+            return true;
+        }
+
+        public void Plot(int x, int y, RGB color)
+        {
+            if (!Ready) {
+                return;
+            }
+
+            int offset = y * ActiveMode.ScreenStride + x * ActiveMode.BytesPerPixel;
+
+            // The read triggers the latch register.
+            screenBuffer.Write16(offset, (ushort)color);
+
+        }
+
+        public void Fill(int x1, int y1, int x2, int y2, RGB color)
+        {
+            if (!Ready) {
+                return;
+            }
+
+            if (x1 < 0 || x1 >= ActiveMode.ScreenWidth ||
+                x2 < 0 || x2 >= ActiveMode.ScreenWidth ||
+                y1 < 0 || y1 >= ActiveMode.ScreenHeight ||
+                y2 < 0 || y2 >= ActiveMode.ScreenHeight)
+            {
+
+                throw new OverflowException("Draw bounds invalid.");
+            }
+
+            ushort clr = (ushort)color;
+            int pDst = y1 * ActiveMode.ScreenStride + x1 * ActiveMode.BytesPerPixel;
+            for (int y = y1; y <= y2; y++)
+            {
+                screenBuffer.Write16(pDst, clr, x2 - x1 + 1);
+                pDst += ActiveMode.ScreenStride;
+            }
+        }
+
+        public void BitBltChr(int x, int y, int width, int height,
+                              byte[]! buffer, int offset, int ScanWidth,
+                              RGB color, RGB background)
+        {
+            if (!Ready) {
+                return;
+            }
+
+            ushort clr = (ushort)color;
+            ushort bkg = (ushort)background;
+
+            int pSrc = offset;
+            int pDst = (y + height - 1) * ActiveMode.ScreenStride + x * ActiveMode.BytesPerPixel;
+
+            for (int j = 0; j < height; j++)
+            {
+                int pSrcTemp = pSrc;
+
+                for (int i = 0; i < width;)
+                {
+                    byte b = buffer[pSrcTemp++];
+
+                    lineBuffer[i++] = ((b & 0x80) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x40) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x20) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x10) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x08) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x04) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x02) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x01) != 0) ? clr : bkg;
+                }
+                screenBuffer.Write16(pDst, lineBuffer, 0, width);
+
+                pSrc += ScanWidth;
+                pDst -= ActiveMode.ScreenStride;
+            }
+        }
+        private void BitBlt24(int x, int y, int width, int height,
+                              byte[]! in ExHeap buffer, int offset, int ScanWidth)
+
+        {
+            int pDst = (y + height - 1) * ActiveMode.ScreenStride + x * ActiveMode.BytesPerPixel;
+            int pSrc = offset;
+            byte[] raw = new byte[ScanWidth];
+
+            for (int j = 0; j < height; j++)
+            {
+                int pRaw = 0;
+
+                // Decompress first
+                while (pRaw < ScanWidth)
+                {
+                    ushort len = (ushort)(buffer[pSrc] + ((ushort)buffer[pSrc+1] << 8));
+                    pSrc += 2;
+
+                    short val = unchecked((short)len);
+                    if (val < 0)
+                    {
+                        for (int i = 0; i > val; i--)
+                        {
+                            raw[pRaw++] = buffer[pSrc+0];
+                            raw[pRaw++] = buffer[pSrc+1];
+                            raw[pRaw++] = buffer[pSrc+2];
+                        }
+                        pSrc += 3;
+                    }
+                    else
+                    {
+                        for (int i = 0; i < val; i++)
+                        {
+                            raw[pRaw++] = buffer[pSrc++];
+                        }
+                    }
+                }
+
+                // Now draw the decompressed bits.
+                pRaw = 0;
+                for (int i = 0; i < width;)
+                {
+                    lineBuffer[i++] = RGB.Compute16(raw[pRaw+2],
+                                                    raw[pRaw+1],
+                                                    raw[pRaw+0]);
+                    pRaw += 3;
+                }
+
+                screenBuffer.Write16(pDst, lineBuffer, 0, width);
+
+                pDst -= ActiveMode.ScreenStride;
+            }
+        }
+
+        private void BitBlt8(int x, int y, int width, int height,
+                             byte[]! in ExHeap buffer, int offset, int ScanWidth,
+                             ushort[]! palette)
+        {
+            int pDst = (y + height - 1) * ActiveMode.ScreenStride + x * ActiveMode.BytesPerPixel;
+            int pSrc = offset;
+
+            for (int j = 0; j < height; j++)
+            {
+                int pSrcTemp = pSrc;
+
+                for (int i = 0; i < width;)
+                {
+                    lineBuffer[i++] = palette[buffer[pSrcTemp++]];
+                }
+                screenBuffer.Write16(pDst, lineBuffer, 0, width);
+
+                pSrc += ScanWidth;
+                pDst -= ActiveMode.ScreenStride;
+            }
+        }
+
+        private void BitBlt4(int x, int y, int width, int height,
+                             byte[]! in ExHeap buffer, int offset, int ScanWidth,
+                             ushort[]! palette)
+        {
+            int pDst = (y + height - 1) * ActiveMode.ScreenStride + x * ActiveMode.BytesPerPixel;
+            int pSrc = offset;
+
+            for (int j = 0; j < height; j++)
+            {
+                int pSrcTemp = pSrc;
+
+                for (int i = 0; i < width;)
+                {
+                    byte b = buffer[pSrcTemp++];
+
+                    lineBuffer[i++] = palette[b >> 4];
+                    lineBuffer[i++] = palette[b & 0xf];
+                }
+                screenBuffer.Write16(pDst, lineBuffer, 0, width);
+
+                pSrc += ScanWidth;
+                pDst -= ActiveMode.ScreenStride;
+            }
+        }
+
+        public void BitBlt1(int x, int y, int width, int height,
+                            byte[]! in ExHeap buffer, int offset, int ScanWidth,
+                            RGB color, RGB background)
+        {
+            if (!Ready) {
+                return;
+            }
+
+            ushort clr = (ushort)color;
+            ushort bkg = (ushort)background;
+
+            int pSrc = offset;
+            int pDst = (y + height - 1) * ActiveMode.ScreenStride + x * ActiveMode.BytesPerPixel;
+
+            for (int j = 0; j < height; j++)
+            {
+                int pSrcTemp = pSrc;
+
+                for (int i = 0; i < width;)
+                {
+                    byte b = buffer[pSrcTemp++];
+
+                    lineBuffer[i++] = ((b & 0x80) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x40) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x20) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x10) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x08) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x04) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x02) != 0) ? clr : bkg;
+                    lineBuffer[i++] = ((b & 0x01) != 0) ? clr : bkg;
+                }
+                screenBuffer.Write16(pDst, lineBuffer, 0, width);
+
+                pSrc += ScanWidth;
+                pDst -= ActiveMode.ScreenStride;
+            }
+        }
+
+        public void BitBltBmp(int x, int y, byte[]! in ExHeap buffer)
+        {
+            if (!Ready) {
+                return;
+            }
+
+            BITMAPFILEHEADER bfh;
+            BITMAPINFOHEADER bih;
+            int lDelta;
+            int cbScanLine;
+            int used;
+            int offset = 0;
+
+            bfh = BITMAPFILEHEADER.Read(buffer, offset, out used);
+            bih = BITMAPINFOHEADER.Read(buffer, used, out used);
+            RGB[] Palette = bih.ReadPalette(buffer, used, out used);
+
+            if (bih.biWidth == 0 || bih.biHeight == 0)
+            {
+                return;
+            }
+
+            if (x < 0)
+            {
+                x = ActiveMode.ScreenWidth + x - bih.biWidth;
+            }
+            if (y < 0)
+            {
+                y = ActiveMode.ScreenHeight + y - bih.biHeight;
+            }
+
+            if (x < 0 || x + bih.biWidth > ActiveMode.ScreenWidth ||
+                y < 0 || y + bih.biHeight > ActiveMode.ScreenHeight)
+            {
+
+                throw new OverflowException("Draw bounds invalid.");
+            }
+
+            offset = offset + bfh.bfOffBits;
+            used = offset;
+
+            ushort[] palette = null;
+
+            if (Palette != null)
+            {
+                palette = new ushort [Palette.Length];
+                for (int i = 0; i < Palette.Length; i++)
+                {
+                    palette[i] = (ushort)Palette[i];
+                }
+            }
+
+            //
+            // Make sure this is a 1bpp, 4bpp, or 8bpp bitmap.
+            //
+
+            if (bih.biPlanes != 1)
+            {
+                DebugStub.Print("biPlanes != 1");
+                return;
+            }
+
+            cbScanLine = (((bih.biWidth * bih.biBitCount) + 31) & ~31) / 8;
+
+            if (bih.biHeight < 0)
+            {
+                DebugStub.Print("bih.biHeight = {0} < 0\n",
+                                __arglist(bih.biHeight));
+                return;
+            }
+
+#if DONT
+            if (used + cbScanLine * bih.biHeight > buffer.Length) {
+                DebugStub.Print("{0} + {1} * {2} = {3} > {4}\n",
+                                __arglist(used,
+                                          cbScanLine,
+                                          bih.biHeight,
+                                          used + cbScanLine * bih.biHeight,
+                                          buffer.Length));
+
+                throw new OverflowException("Bitmap invalid.");
+            }
+#endif
+
+            if (bih.biBitCount == 1)
+            {
+                BitBlt1(x, y, bih.biWidth, bih.biHeight, buffer, offset, cbScanLine,
+                        RGB.White, RGB.Black);
+            }
+            else if (bih.biBitCount == 4)
+            {
+                assert palette != null;
+                BitBlt4(x, y, bih.biWidth, bih.biHeight, buffer, offset, cbScanLine,
+                        palette);
+            }
+            else if (bih.biBitCount == 8)
+            {
+                assert palette != null;
+                BitBlt8(x, y, bih.biWidth, bih.biHeight, buffer, offset, cbScanLine,
+                        palette);
+            }
+            else if (bih.biBitCount == 24)
+            {
+                BitBlt24(x, y, bih.biWidth, bih.biHeight, buffer, offset, cbScanLine);
+            }
+            else
+            {
+                //
+                // We don't support this type of bitmap.
+                //
+                DebugStub.Print("((bih.biBitCount * bih.biPlanes) <= 4");
+            }
+        }
+
+        public void BitBltPng(int x, int y, byte[]! in ExHeap buffer)
+        {
+            DebugStub.Print("BitBltPng not supported currently.\n");
+        }
+
+        public void Scroll(int x1, int y1, int x2, int y2, int CharHeight)
+        {
+            if (!Ready) {
+                return;
+            }
+
+            if (x1 < 0 || x1 >= ActiveMode.ScreenWidth ||
+                x2 < 0 || x2 >= ActiveMode.ScreenWidth ||
+                y1 < 0 || y1 >= ActiveMode.ScreenHeight ||
+                y2 < 0 || y2 >= ActiveMode.ScreenHeight ||
+                y2 - y1 < CharHeight)
+            {
+
+                throw new OverflowException("Draw bounds invalid.");
+            }
+
+            int width = x2 - x1 + 1;
+            int pDst = y1 * ActiveMode.ScreenStride + x1 * ActiveMode.BytesPerPixel;
+            int pSrc = pDst + ActiveMode.ScreenStride * CharHeight;
+
+            for (int i = y1; i <= y2 - CharHeight; i++)
+            {
+                screenBuffer.Copy16(pSrc, pDst, width);
+
+                pDst += ActiveMode.ScreenStride;
+                pSrc += ActiveMode.ScreenStride;
+            }
+        }
+    }
+
+    public class SvgaWindow
+    {
+        private readonly S3Device screen;
+        private readonly int regionLeft;
+        private readonly int regionTop;
+        private readonly int regionRight;
+        private readonly int regionBottom;
+
+        private int cursorX = 0;
+        private int cursorY = 0;
+        private bool cursorVisible = true;
+        private bool cursorView = true;
+        private RGB foreColor = RGB.White;
+        private RGB backColor = RGB.Black;
+
+        public const int FONT_HEIGHT = 12;
+        public const int FONT_WIDTH = 8;
+
+        [NotDelayed]
+        public SvgaWindow(S3Device! screen, int x1, int y1, int x2, int y2)
+            requires x1 < x2 && y1 < y2;
+        {
+            this.screen = screen;
+
+            regionLeft = x1;
+            regionTop = y1;
+            regionRight = x2;
+            regionBottom = y2;
+
+            cursorX = regionLeft;
+            cursorY = regionTop;
+
+            screen.Fill(regionLeft, regionTop, regionRight, regionBottom, backColor);
+        }
+
+        public void Initialize()
+        {
+        }
+
+        public void Finalize()
+        {
+        }
+
+        public void SetTextColor(RGB color, RGB background)
+        {
+            foreColor = color;
+            backColor = background;
+        }
+
+        public int TextColumn
+        {
+            get { return (cursorX - regionLeft) / FONT_WIDTH; }
+        }
+
+        public int TextRow
+        {
+            get { return (cursorY - regionTop) / FONT_HEIGHT; }
+        }
+
+        public bool SetTextCursor(int column, int row)
+        {
+            if (column >= 0 && column < TextColumns &&
+                row >= 0 && row < TextRows) {
+                bool wasVisible = cursorVisible;
+                CursorHide();
+                cursorX = regionLeft + column * FONT_WIDTH;
+                cursorY = regionTop + row * FONT_HEIGHT;
+                if (wasVisible) {
+                    CursorShow();
+                }
+                return true;
+            }
+            return false;
+        }
+
+        public int TextColumns
+        {
+            get { return (regionRight - regionLeft) / FONT_WIDTH; }
+        }
+
+        public int TextRows
+        {
+            get { return (regionBottom - regionTop) / FONT_HEIGHT; }
+        }
+
+        private void DrawCursor()
+        {
+            cursorView = true;
+            CursorFlash();
+        }
+
+        public void CursorHide()
+        {
+            cursorView = false;
+            CursorFlash();
+            cursorVisible = false;
+        }
+
+        public void CursorShow()
+        {
+            cursorVisible = true;
+            DrawCursor();
+        }
+
+        public void CursorFlash()
+        {
+            if (cursorVisible) {
+                int x = cursorX;
+                int y = cursorY;
+
+                if (x + FONT_WIDTH > regionRight) {
+                    x -= FONT_WIDTH;
+                }
+
+                if (cursorView) {
+                    screen.BitBltChr(x, y, FONT_WIDTH, FONT_HEIGHT,
+                                     Fonts.FontData, 256 * FONT_HEIGHT, 1, foreColor, backColor);
+                }
+                else {
+                    screen.BitBltChr(x, y, FONT_WIDTH, FONT_HEIGHT,
+                                     Fonts.FontData, 32 * FONT_HEIGHT, 1, foreColor, backColor);
+                }
+                cursorView = !cursorView;
+            }
+        }
+
+        public void Clear()
+        {
+            screen.Fill(regionLeft, regionTop, regionRight, regionBottom, backColor);
+            cursorX = regionLeft;
+            cursorY = regionTop;
+            DrawCursor();
+        }
+
+        public void ClearCursorToEndOfLine()
+        {
+            screen.Fill(cursorX, cursorY,
+                        regionRight, cursorY + FONT_HEIGHT,
+                        backColor);
+        }
+
+        public void Write(String! s)
+        {
+            for (int i = 0; i < s.Length; i++) {
+                Write((byte)s[i]);
+            }
+            DrawCursor();
+        }
+
+        public void Write(char[]! in ExHeap buffer, int offset, int count)
+        {
+            while (count-- > 0) {
+                Write((byte)buffer[offset++]);
+            }
+            DrawCursor();
+        }
+
+        public void PutChar(char c)
+        {
+            Write((byte)c);
+            DrawCursor();
+        }
+
+        public bool PutCharAt(char c, int column, int row)
+        {
+            if (column >= 0 && column < TextColumns &&
+                row >= 0 && row < TextRows) {
+                screen.BitBltChr(regionLeft + column * FONT_WIDTH,
+                                 regionTop  + row * FONT_HEIGHT,
+                                 FONT_WIDTH, FONT_HEIGHT,
+                                 Fonts.FontData, c * FONT_HEIGHT, 1,
+                                 foreColor, backColor);
+                return true;
+            }
+            return false;
+        }
+
+        private void Write(byte c)
+        {
+            switch (c) {
+
+                case (byte)'\n':
+                    cursorY += FONT_HEIGHT;
+                    cursorX = regionLeft;
+                    break;
+
+                case (byte)'\r':
+                    screen.Fill(cursorX, cursorY, regionRight,
+                                cursorY + FONT_HEIGHT,
+                                backColor);
+                    cursorX = regionLeft;
+                    break;
+
+                case (byte)'\b':
+                    CursorHide();
+                    cursorX = cursorX - FONT_WIDTH;
+                    CursorShow();
+                    break;
+
+                default:
+                    screen.BitBltChr(cursorX, cursorY, FONT_WIDTH, FONT_HEIGHT,
+                                     Fonts.FontData, c * FONT_HEIGHT, 1, foreColor, backColor);
+
+                    cursorX += FONT_WIDTH;
+                    break;
+            }
+
+            if (cursorX + FONT_WIDTH > regionRight) {
+                cursorY += FONT_HEIGHT;
+                cursorX = regionLeft;
+            }
+
+            if (cursorY + FONT_HEIGHT > regionBottom) {
+                screen.Scroll(regionLeft, regionTop, regionRight, regionBottom,
+                              FONT_HEIGHT);
+                cursorY = cursorY - FONT_HEIGHT;
+                screen.Fill(regionLeft, cursorY, regionRight, regionBottom, backColor);
+            }
+        }
+
+    }
+}
diff --git a/base/Drivers/Sb16/Sb16.csproj b/base/Drivers/Sb16/Sb16.csproj
new file mode 100644
index 0000000..3fb9ec5
--- /dev/null
+++ b/base/Drivers/Sb16/Sb16.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Sb16</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Sb16.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/Sb16/Sb16.sg b/base/Drivers/Sb16/Sb16.sg
new file mode 100644
index 0000000..9790382
--- /dev/null
+++ b/base/Drivers/Sb16/Sb16.sg
@@ -0,0 +1,710 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Sb16.sg
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Runtime.CompilerServices;  //StructAlign attribute
+using System.Runtime.InteropServices;   //structLayout attribute
+using System.GCs;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+using Microsoft.Singularity.Drivers;
+[assembly: Transform(typeof(DriverResourceTransform))]
+
+namespace Microsoft.Singularity.Drivers.Sb16
+{
+    // Declare all resource needs in one place:
+    [DriverCategory]
+    [Signature("/pnp/PNPB003")]
+    internal class Sb16Resources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x0220, Length = 0x10)]
+        internal readonly IoPortRange basePorts;
+
+        [IoPortRange(1, Default = 0x0380, Length = 0x10)]
+        internal readonly IoPortRange gamePorts;
+
+        [IoIrqRange(2, Default = 0x05)]
+        internal readonly IoIrqRange irq;
+
+        [IoDmaRange(3, Default = 0x01)]
+        internal readonly IoDmaRange dma8;
+
+        [IoDmaRange(4, Default = 0x05)]
+        internal readonly IoDmaRange dma16;
+
+        [IoFixedMemoryRange(AddressBits = 24, Alignment = 0x20000, Length = 0x4000)]
+        internal readonly IoMemoryRange fixedMem;
+
+        [ExtensionEndpoint]
+        internal TRef<ExtensionContract.Exp:Start> ec;
+
+        [ServiceEndpoint(typeof(SoundDeviceContract))]
+        internal TRef<ServiceProviderContract.Exp:Start> audiosp;
+
+        internal int DriverMain() {
+            return Sb16Channels.DriverMain(this);
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  The Sb16Channels class has a single message pump that manages messages
+    //  to/from the "/dev" namespace and incoming play requests.
+    //
+    public class Sb16Channels
+    {
+        internal static int DriverMain(Sb16Resources! resources)
+        {
+            // Create and Initialize the device
+            Sb16Device device = new Sb16Device(resources);
+            device.Initialize();
+
+            // get the endpoints and set up the main switch receive
+            ExtensionContract.Exp ec = (resources.ec).Acquire();
+            ServiceProviderContract.Exp sp = (resources.audiosp).Acquire();
+
+            // Signal parent that driver is initialized.
+            Tracing.Log(Tracing.Audit, "Sb16 Registered");
+            ec.SendSuccess();
+
+            // create a set of all client endpoints connected to the sound
+            // device
+            ESet<SoundDeviceContract.Exp:Ready> clients
+                = new ESet<SoundDeviceContract.Exp:Ready>();
+
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        // Listen for new connections
+                        case sp.Connect(candidate):
+                            SoundDeviceContract.Exp newClient = candidate as SoundDeviceContract.Exp;
+                            if (newClient != null) {
+                                newClient.SendSuccess();
+                                clients.Add(newClient);
+                                sp.SendAckConnect();
+                            }
+                            else {
+                                sp.SendNackConnect(candidate);
+                            }
+                            break;
+
+                            // Listen for client requests
+                            case ep.RecvPlayPcm(data, offset, length, sampleRate, stereo, signed,
+                                                eightBit) in clients:
+                                {
+                                    Tracing.Log(Tracing.Debug, "PlayPcm({0:d})",
+                                                (UIntPtr)unchecked((uint)length));
+                                    device.PlayPcm((!)data, offset, length, sampleRate,
+                                                   stereo, signed, eightBit);
+                                    ep.SendAckPlayPcm(data);
+                                    // add client endpoint back into set.
+                                    clients.Add(ep);
+                                    break;
+                                }
+
+                            // Listen for client requests
+                        case ep.RecvPlayWav(data) in clients:
+                            {
+                                Tracing.Log(Tracing.Debug, "PlayWav({0:d}",
+                                            (UIntPtr)unchecked((uint)data.Length));
+                                device.PlayWav(data);
+
+                                ep.SendAckPlayWav(data);
+                                // add client endpoint back into set.
+                                clients.Add(ep);
+                                break;
+                            }
+
+                            // Listen for client departure
+                        case ep.ChannelClosed() in clients:
+                            Tracing.Log(Tracing.Debug, "Client channel closes.");
+                            delete ep;
+                            break;
+
+                            // Listen for extension parent
+                        case ec.Shutdown():
+                            ec.SendAckShutdown();
+                            run = false;
+                            break;
+
+                        case clients.Empty() && sp.ChannelClosed():
+                            Tracing.Log(Tracing.Debug, "Sound driver no longer needed.");
+                            run = false;
+                            break;
+                    }
+                }
+            }
+            finally {
+                Tracing.Log(Tracing.Debug, "Sb16 finished message pump.");
+                delete sp;
+                clients.Dispose();
+            }
+
+            // Close the device
+            device.Finalize();
+
+            Tracing.Log(Tracing.Audit, "Shutdown");
+            delete ec;
+            return 0;
+        }
+    }
+
+    public class Sb16Device
+    {
+        private const ushort    BUFSIZE = 0x4000;
+        private const ushort    HALFBUFSIZE = BUFSIZE / 2;
+
+        private IoIrq!          irq;
+        private Thread          irqWorker;
+        private bool            irqWorkerStop;
+        private AutoResetEvent! playEndEvent;
+
+        private IoDma!          dma8;
+        private IoDma!          dma16;
+        private IoMemory!       fixedBuffer;
+
+        private IoPort!         resetPort;
+        private IoPort!         readDataPort;
+        private IoPort!         writePort;
+        private IoPort!         readStatPort;
+        private IoPort!         intAck16Port;
+        private IoPort!         mixAddrPort;
+        private IoPort!         mixDataPort;
+
+        // Variables re-used for each play request.
+        private unsafe SharedHeapService.Allocation *    pcmData;
+        private int             pcmLeft = 0;
+        private int             pcmOffset = 0;
+
+        /*[invariant ((pcmData == null) ||
+          (0 <= pcmOffset && pcmOffset + pcmLeft <= pcmData.Length));]*/
+
+        private ushort          samplesPerSec;
+        private int             halfBufOffset = 0;
+        /*[invariant (halfBufOffset == 0 || halfBufOffset == HALFBUFSIZE);]*/
+
+        private bool            done = true;
+        private bool            exit = false;
+        private ushort          dspVersion = 0;
+
+        const ushort MIX_ADDR_REG       = 0x04; // MIXER CHIP REGISTER ADDRESS PORT : WRITE
+        const ushort MIX_DATA_REG       = 0x05; // MIXER CHIP DATA ADDRESS PORT : READ/WRITE
+        const ushort DSP_RESET_REG      = 0x06; // DSP RESET : WRITE
+        const ushort DSP_READ_DATA_REG  = 0x0A; // DSP READ DATA PORT   : READ
+        const ushort DSP_WRITE_REG      = 0x0C; // DSP WRITE COMMAND/DATA PORT  : READ/WRITE
+        const ushort DSP_READ_STAT_REG  = 0x0E; // DSP READ BUFFER STATUS PORT  : READ
+        const ushort DSP_INT_ACK16_REG  = 0x0F; // Interrupt Ack Port 16bit :READ
+
+        private const byte DSPREADY = 0xAA;// code for DSP READY
+
+        private enum DspMode
+        {
+            STEREO    = 0x20, // Stereo bit.
+            SIGNED    = 0x10, // Signed bit.
+            NORMAL    = 0x00, // Neither stereo nor signed.
+        }
+
+        private enum DspCommand
+        {
+            SETSAMPRATE     = 0x41, // Set sample rate ( only available in 4.xx)
+            PROGAUTOINIT16  = 0xb6, // program 16 bit digital input output
+            PROGAUTOINIT8   = 0xc6, // program 8 bit digital input output
+            SPKRON          = 0xd1, // turn speaker on
+            SPKROFF         = 0xd3, // turn off speaker
+            EXITAUTOINIT16  = 0xd9, // exit 16-bit auto init DMA mode
+            EXITAUTOINIT8   = 0xda, // exit 8 bit auto init DMA mode
+            GETDSPVERSION   = 0xe1, // Get DSP version number
+        }
+
+        private enum DspRegisters
+        {
+            IntStatPort = 0x82,
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+        internal Sb16Device(Sb16Resources! res)
+        {
+            // Ranges[0]: Fixed I/O Port bas=0220 len=10  0220..022f
+            // Ranges[1]: Fixed I/O Port bas=0380 len=10  0380..038f
+            // Ranges[2]: IRQ 5
+            // Ranges[3]: DMA 1 - 8-bit DMA
+            // Ranges[4]: DMA 5 - 16-bit DMA
+
+            playEndEvent = new AutoResetEvent(false);
+
+            assume res.irq != null;
+            assume res.dma8 != null;
+            assume res.dma16 != null;
+            assume res.fixedMem != null;
+            assume res.basePorts != null;
+
+            // get Irq and Dma channels from the resources
+            irq = (!)res.irq.IrqAtOffset(0);
+            dma8 = (!)res.dma8.DmaAtOffset(0);
+            dma16 = (!)res.dma16.DmaAtOffset(0);
+
+            mixAddrPort  = (!)res.basePorts.PortAtOffset(MIX_ADDR_REG, 1,
+                                                         Access.Write);
+            mixDataPort  = (!)res.basePorts.PortAtOffset(MIX_DATA_REG, 1,
+                                                         Access.ReadWrite);
+            resetPort    = (!)res.basePorts.PortAtOffset(DSP_RESET_REG, 1,
+                                                         Access.Write);
+            readDataPort = (!)res.basePorts.PortAtOffset(DSP_READ_DATA_REG, 1,
+                                                         Access.Read);
+            writePort    = (!)res.basePorts.PortAtOffset(DSP_WRITE_REG, 1,
+                                                         Access.ReadWrite);
+            readStatPort = (!)res.basePorts.PortAtOffset(DSP_READ_STAT_REG, 1,
+                                                         Access.Read);
+            intAck16Port = (!)res.basePorts.PortAtOffset(DSP_INT_ACK16_REG, 1,
+                                                         Access.Read);
+
+            base();
+
+            // Now get the fixed memory region out of the resources:
+            fixedBuffer = (!)res.fixedMem.MemoryAtOffset(0, BUFSIZE,
+                                                         true, true);
+
+        }
+
+        public void Initialize()
+        {
+            Tracing.Log(Tracing.Debug, "Initialize");
+
+            Tracing.Log(Tracing.Debug, "Fixed Buffer: {0,8:x8}",
+                        fixedBuffer.PhysicalAddress.Value);
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                irq.RegisterInterrupt();
+
+                DspReset();
+                DspWrite(DspCommand.SPKRON);
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            irqWorker     = new Thread(new ThreadStart(IrqWorkerPump));
+            irqWorkerStop = false;
+            irqWorker.Start();
+        }
+
+        public void Finalize()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                DspWrite(DspCommand.SPKROFF);
+                irqWorkerStop = true;
+                irq.ReleaseInterrupt();
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+#if CAN_JOIN
+            if (irqWorker != null) {
+                irqWorker.Join();
+                irqWorker = null;
+            }
+#endif
+        }
+
+        public void PlayWav(byte[]! in ExHeap data)
+        {
+            if (data.Length < 64) {
+                Tracing.Log(Tracing.Warning, "File too short for WAV");
+                return;
+            }
+
+            if (data[0] != 'R' || data[1] != 'I' || data[2] != 'F' || data[3] != 'F' ||
+                data[8] != 'W' || data[9] != 'A' || data[10] != 'V' || data[11] != 'E' ||
+                data[12] != 'f' || data[13] != 'm' || data[14] != 't' || data[15] != ' ' ||
+                data[20] != 1 || data[21] != 0) {
+                Tracing.Log(Tracing.Warning, "No WAVE signature");
+                return;
+            }
+
+            ushort numChannels = Bitter.ToUInt16(data, 22);
+            ushort samplesPerSec = (ushort)Bitter.ToUInt32(data, 24);
+            ushort bitsPerSample = Bitter.ToUInt16(data, 34);
+
+            if ((numChannels != 1 && numChannels != 2) ||
+                (samplesPerSec > 48000) ||
+                (bitsPerSample != 8 && bitsPerSample != 16)) {
+                Tracing.Log(Tracing.Warning, "Unrecognized WAV fmt parameters.");
+                return;
+            }
+
+            for (int offset = 12;;) {
+                if (data.Length < offset + 8) {
+                    Tracing.Log(Tracing.Warning, "Malformed WAV file at {0}.",
+                                (UIntPtr)offset);
+                    return;
+                }
+
+                if (data[offset] == 'd' &&
+                    data[offset+1] == 'a' &&
+                    data[offset+2] == 't' &&
+                    data[offset+3] == 'a') {
+
+                    PlayPcm(data,
+                            offset + 8,
+                            Bitter.ToInt32(data, offset + 4),
+                            samplesPerSec,
+                            numChannels == 2,
+                            bitsPerSample != 8,
+                            bitsPerSample == 8);
+                    return;
+                }
+
+                offset += 8 + Bitter.ToInt32(data, offset + 4);
+            }
+        }
+
+        public unsafe void PlayPcm(byte[]! in ExHeap buffer,
+                                   int offset,
+                                   int length,
+                                   ushort sampleRate,
+                                   bool stereo,
+                                   bool signed,
+                                   bool eightBit)
+            /*[requires offset >= 0 && offset + length <= data.Length;]*/
+        {
+            Tracing.Log(Tracing.Debug, "buff.Length={0}, offset={1}, length={2} ={3}",
+                        (UIntPtr)unchecked((uint)buffer.Length),
+                        (UIntPtr)unchecked((uint)offset),
+                        (UIntPtr)unchecked((uint)length),
+                        (UIntPtr)unchecked((uint)offset + length));
+
+            done = false;
+            exit = false;
+
+            pcmData = (Allocation *)buffer;
+            pcmOffset = offset;
+            pcmLeft = length;
+            samplesPerSec = sampleRate;
+
+            if (eightBit) {
+                Tracing.Log(Tracing.Debug, "Playing 8-bit sound (byte={0}, {1} Hz, {2})",
+                            (UIntPtr)length, sampleRate, (UIntPtr)(stereo ? 2 : 1));
+                PlayDmaAutoInit8(stereo, signed);
+            }
+            else {
+                Tracing.Log(Tracing.Debug, "Playing 16-bit sound (byte={0}, {1} Hz, {2})",
+                            (UIntPtr)length, sampleRate, (UIntPtr)(stereo ? 2 : 1));
+                PlayDmaAutoInit16(stereo, signed);
+            }
+
+            playEndEvent.WaitOne();
+        }
+
+        private void PlayDmaAutoInit8(bool stereo, bool signed)
+        {
+            halfBufOffset = 0;
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                dma8.DisableChannel(); //Disable DMA channel while programming it
+                dma8.SetControlByteMask(IoDma.Settings.SingleMode |
+                                        IoDma.Settings.AddressIncrement |
+                                        IoDma.Settings.AutoInit |
+                                        IoDma.Settings.ReadTransfer);
+                dma8.ClearFlipFlop(); //Clear Flip-Flop [ref]swap clear and control statement
+                dma8.SetControlByte(); //Put into 8-bit Single Cycle mode
+                dma8.SetBuffer(fixedBuffer);
+                dma8.SetTransferLength(BUFSIZE - 1);
+                dma8.EnableChannel(); //enable DMA channelFillBuffer();
+
+                DspWrite(DspCommand.SETSAMPRATE);
+                DspWriteBig(samplesPerSec);
+
+                done = FillHalfBuffer();
+                DspWrite(DspCommand.PROGAUTOINIT8);
+                DspWriteBMode(stereo, signed);
+                DspWriteLittle(HALFBUFSIZE - 1);
+
+                if (done) {
+                    DspWrite(DspCommand.EXITAUTOINIT8);
+                    exit = true;
+                }
+                else {
+                    done = FillHalfBuffer();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        private void PlayDmaAutoInit16(bool stereo, bool signed)
+        {
+            halfBufOffset = 0;
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                dma16.DisableChannel(); //Disable DMA channel while programming it
+                dma16.SetControlByteMask(IoDma.Settings.SingleMode |
+                                         IoDma.Settings.AddressIncrement |
+                                         IoDma.Settings.AutoInit |
+                                         IoDma.Settings.ReadTransfer);
+                dma16.ClearFlipFlop(); //Clear Flip-Flop [ref]swap clear and control statement
+                dma16.SetControlByte(); //Put into 8-bit Single Cycle mode
+                dma16.SetBuffer(fixedBuffer);
+                dma16.SetTransferLength((BUFSIZE / 2) - 1);
+                dma16.EnableChannel(); //enable DMA channelFillBuffer();
+
+                DspWrite(DspCommand.SETSAMPRATE);
+                DspWriteBig(samplesPerSec);
+
+                done = FillHalfBuffer();
+                DspWrite(DspCommand.PROGAUTOINIT16);
+                DspWriteBMode(stereo, signed);
+                DspWriteLittle((HALFBUFSIZE / 2) - 1);
+
+                if (done) {
+                    DspWrite(DspCommand.EXITAUTOINIT16);
+                    exit = true;
+                }
+                else {
+                    done = FillHalfBuffer();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        private unsafe bool FillHalfBuffer()
+        {
+            //transfer data from snddat.Sound to Buffer
+            int use = Math.Min(pcmLeft, HALFBUFSIZE);
+            if (use != 0) {
+                byte[] in ExHeap buffer = (byte[] in ExHeap)pcmData;
+
+                Bitter.ToIoMemory(buffer, pcmOffset, use,
+                                  fixedBuffer, halfBufOffset);
+
+
+                if (use < HALFBUFSIZE) {
+                    // Pad with empty sound as needed.
+                    fixedBuffer.Write8(halfBufOffset + use, 0, HALFBUFSIZE - use);
+                }
+
+                pcmOffset += use;
+                pcmLeft -= use;
+
+                if (halfBufOffset > 0) {
+                    halfBufOffset = 0;
+                }
+                else {
+                    halfBufOffset = HALFBUFSIZE;
+                }
+            }
+            Tracing.Log(Tracing.Debug,
+                        "offset:{0,6}, left:{1,6}, use:{2,5}, buffer:{3,5}",
+                        (UIntPtr)unchecked((uint)pcmOffset),
+                        (UIntPtr)unchecked((uint)pcmLeft),
+                        (UIntPtr)unchecked((uint)use),
+                        (UIntPtr)unchecked((uint)halfBufOffset));
+            return (use < HALFBUFSIZE);
+        }
+
+        private void IrqWorkerPump()
+        {
+            //  When this IRQ is signaled, there may be two half-buffers
+            //  at play.  The first just finished (thus triggering the IRQ);
+            //  the second is going out the DSP as we process.
+            //  If the done flag is set, the last half-buffer has been filled.
+            //  If the exit flag is set, then this *IS* the last half-buffer.
+            //
+            Tracing.Log(Tracing.Audit, "Start worker thread.");
+            while (irqWorkerStop == false) {
+                irq.WaitForInterrupt();
+
+                if (irqWorkerStop) { break; }
+
+                bool iflag = Processor.DisableInterrupts();
+                try {
+                    byte bt = (byte)ReadMixPort((byte)DspRegisters.IntStatPort);
+                    bt &= 0x7u;
+
+                    if (bt == 1) {
+                        readStatPort.Read8();
+                        if (exit) {
+                            playEndEvent.Set();
+                            continue;
+                        }
+                        if (done) {
+                            DspWrite(DspCommand.EXITAUTOINIT8);
+                            exit = true;
+                        }
+                    }
+                    else if (bt == 2) {
+                        intAck16Port.Read8();
+                        if (exit) {
+                            playEndEvent.Set();
+                            continue;
+                        }
+                        if (done) {
+                            DspWrite(DspCommand.EXITAUTOINIT16);
+                            exit = true;
+                        }
+                    }
+                    else if (irqWorkerStop == false) {
+                        Tracing.Log(Tracing.Error, "Interrupt status {0}", bt);
+                        DebugStub.Break();
+                    }
+
+                    done = FillHalfBuffer();
+                }
+                finally {
+                    irq.AckInterrupt();
+                    Processor.RestoreInterrupts(iflag);
+                }
+            }
+        }
+
+#region DSP
+
+        private void DspWaitForData()
+        {
+            for (int i = 0; i < 100; i++) {
+                if ((readStatPort.Read8() & 0x80)!=0) {
+                    return;
+                }
+            }
+            Tracing.Log(Tracing.Error, "DSP Data Avail FAILED");
+            DebugStub.Break();
+        }
+
+        private byte DspRead()
+        {
+            DspWaitForData(); // wait for data to be available
+            return readDataPort.Read8();
+        }
+
+        private void DspGetVersion()
+        {
+            byte VersionMaj;
+            byte VersionMin;
+
+            DspWrite(DspCommand.GETDSPVERSION); //send instruction
+            DspWaitForData(); //wait for dsp to flag u for instruction
+
+            VersionMaj = DspRead();
+            VersionMin = DspRead();
+
+            dspVersion = (ushort)((VersionMaj << 8) | VersionMin);
+            Tracing.Log(Tracing.Debug, "Hardware Version : {0:x4}", dspVersion);
+        }
+
+        private bool DspReset()
+        {
+            resetPort.Write8(0x01);
+            Thread.SpinWait(10000);
+            resetPort.Write8(0x00);
+
+            for (int i = 0; i < 0xffff; i++) {
+                DspWaitForData();
+                byte bt = DspRead();
+
+                if (bt == DSPREADY) {
+                    DspGetVersion();
+                    return true;
+                }
+                else {
+                    Tracing.Log(Tracing.Warning, "BT {0} is not DSP_READY", bt);
+                }
+            }
+
+            return false;
+        }
+
+        private void DspWait()
+        {
+            for (int i = 0; i < 100; i++) {
+                if ((writePort.Read8() & 0x80)==0) {
+                    return;
+                }
+            }
+            Tracing.Log(Tracing.Error, "DSP Wait FAlLED.");
+            DebugStub.Break();
+
+        }
+
+        private void DspWrite(DspCommand cmd)
+        {
+            DspWait();
+            writePort.Write8((byte)cmd);
+        }
+
+        private void DspWriteBMode(bool stereo, bool signed)
+        {
+            DspWait();
+            DspMode mode = DspMode.NORMAL;
+            if (stereo) {
+                mode |= DspMode.STEREO;
+            }
+            if (signed) {
+                mode |= DspMode.SIGNED;
+            }
+
+            writePort.Write8((byte)mode);
+        }
+
+        // Little-endian write.
+        private void DspWriteLittle(ushort value)
+        {
+            DspWait();
+            writePort.Write8((byte)(value & 0xff));
+            DspWait();
+            writePort.Write8((byte)(value >> 8));
+        }
+
+        // Big-endian write.
+        private void DspWriteBig(ushort value)
+        {
+            DspWait();
+            writePort.Write8((byte)(value >> 8));
+            DspWait();
+            writePort.Write8((byte)(value & 0xff));
+        }
+
+        private void WriteMixPort(byte Add,byte data)
+        {
+            mixAddrPort.Write8(Add);
+            mixDataPort.Write8(data);
+        }
+
+        private byte ReadMixPort(byte Add)
+        {
+            mixAddrPort.Write8(Add);
+            return mixDataPort.Read8();
+        }
+
+#endregion // DSP
+    }
+}
diff --git a/base/Drivers/Transforms/DriverTransform.csproj b/base/Drivers/Transforms/DriverTransform.csproj
new file mode 100644
index 0000000..fa8ef7c
--- /dev/null
+++ b/base/Drivers/Transforms/DriverTransform.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputPath>$(DRIVDIR)</OutputPath>
+    <OutputType>Library</OutputType>
+    <AssemblyName>DriverTransform</AssemblyName>
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DriverTransform.sg"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets"/>
+
+</Project>
diff --git a/base/Drivers/Transforms/DriverTransform.sg b/base/Drivers/Transforms/DriverTransform.sg
new file mode 100644
index 0000000..7182e8c
--- /dev/null
+++ b/base/Drivers/Transforms/DriverTransform.sg
@@ -0,0 +1,148 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DriverResourceTransform.sg
+//
+//  Creates startup boilerplate code from Resource descriptions.
+//
+using Microsoft.Contracts;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using System;
+
+namespace Microsoft.Singularity.Drivers{
+
+    transform DriverResourceTransform
+            where $IoRangeType : IoRange
+            where $IoFixedRangeType : IoRange
+            where $IoRangeAttribute : IoRangeAttribute
+            where $IoFixedRangeAttribute : IoFixedRangeAttribute
+            where $EndpointType : unmanaged struct, Endpoint, ITracked
+    {
+        [Signature($signature)]
+        internal class $$DriverResources : DriverCategoryDeclaration
+        {
+            [$IoRangeAttribute($index, *)]
+            internal $IoRangeType $$ioranges;
+
+            [$IoFixedRangeAttribute(*)]
+            internal $IoFixedRangeType $$iofixedranges;
+
+            [ExtensionEndpoint(*)]
+            internal TRef<ExtensionContract.Exp:Start> $$extensions;
+
+            [ServiceEndpoint(*)]
+            internal TRef<ServiceProviderContract.Exp:Start> $$providers;
+
+            [Endpoint(*)]
+            TRef<$EndpointType,$State> $$endpoints;
+
+            internal int DriverMain();
+
+            // TODO: Move initialization
+            // into a common routine rather than duplicating it
+            // in all driver resource classes.
+            generate public $$DriverResources(IoConfig! config)
+            {
+                Tracing.Log(Tracing.Debug, "Config: {0}", config.ToPrint());
+
+                int index = 0;
+                forall ( ; $e in $$extensions; ){
+                    ExtensionContract.Exp:Start ep = Process.GetStartupEndpoint(index)
+                        as ExtensionContract.Exp;
+                    if (ep == null) {
+                        throw new ArgumentException(String.Format("missing startup endpoint {0}", index));
+                    }
+                    $e = new TRef<ExtensionContract.Exp:Start> (ep);
+                    ++index;
+                }
+
+                forall ( ; $sp in $$providers ; ) {
+                    ServiceProviderContract.Exp:Start ep = Process.GetStartupEndpoint(index)
+                        as ServiceProviderContract.Exp;
+                    if (ep == null) {
+                        throw new ArgumentException(String.Format("missing startup endpoint {0}", index));
+                    }
+                    $sp = new TRef<ServiceProviderContract.Exp:Start> (ep);
+                    ++index;
+                }
+
+                assume config.DynamicRanges != null;
+                forall ($cindex = 0; $f in $$ioranges; $cindex++) {
+                    $f = ($f.$IoRangeType) config.DynamicRanges[(int)(object)$f.$index];
+                }
+
+                assume config.FixedRanges != null;
+                forall ($cindex = 0; $f in $$iofixedranges; $cindex++) {
+                    $f = ($f.$IoFixedRangeType) config.FixedRanges[$cindex];
+                }
+                index = 0;
+                forall ( ; $e in $$endpoints; ){
+                    if ( index == 0  || index == 1) {
+                        DebugStub.WriteLine("transform skipping pipe at {0}",__arglist(index));
+                    }
+                    else {
+                        $e.$EndpointType* in ExHeap opt($e.$State) ep = Process.GetStartupEndpoint(index)
+                            as $e.$EndpointType* in ExHeap opt($e.$State);
+                        if (ep == null) {
+                            throw new ArgumentException(String.Format("missing startup endpoint {0}", index));
+                        }
+                        $e = new TRef<$e.$EndpointType, $e.$State> (ep);
+                        DebugStub.WriteLine("getting endpoint at {0}",__arglist(index));
+                    }
+                    ++index;
+                }
+            }
+        }
+
+        generate internal class DriverEntry
+        {
+            static int Main(string [] args)
+            {
+                if (args == null) {
+                    DebugStub.WriteLine("DriverTransform: args are null?!");
+                    DebugStub.Break();
+                    return -1;
+                }
+                
+                if (args.Length < 5) {
+                    DebugStub.WriteLine("DriverTransform: too few arguments!");
+                    DebugStub.Break();
+                    return -1;
+                }
+
+                IoConfig! config  = (!)IoConfig.GetConfig();
+                DebugStub.Assert((!)args[3] == "-signature");
+                string! signature = (!)args[4];
+
+                // DebugStub.WriteLine("DriverTransform: searching for resources matching signature: " + signature);
+
+                forall( ; $DriverResource in $$DriverResources; ) {
+                    if ($DriverResource.$signature == signature || String.Compare($DriverResource.$signature, signature, true) == 0) {
+                        // DebugStub.WriteLine("DriverTransform: selected implementation in class " + typeof($DriverResource).FullName);
+                        $DriverResource d = new $DriverResource(config);
+                        return d.DriverMain();
+                    }
+                }
+                
+                DebugStub.WriteLine("ERROR: Process driver was started, but the device ID provided did not match any implementation in this executable.");
+                DebugStub.WriteLine("    Device ID selected: " + signature);
+                DebugStub.WriteLine("This executable contains implementations matching the following device IDs:");
+                forall( ; $DriverResource in $$DriverResources; ) {
+                    DebugStub.WriteLine("    " + $DriverResource.$signature + " in class " + typeof($DriverResource).FullName);
+                }
+                DebugStub.Break();
+                
+                return -1;
+            }
+        }
+    }
+}
diff --git a/base/Drivers/VolumeManager/VolumeManager.csproj b/base/Drivers/VolumeManager/VolumeManager.csproj
new file mode 100644
index 0000000..f6517c3
--- /dev/null
+++ b/base/Drivers/VolumeManager/VolumeManager.csproj
@@ -0,0 +1,27 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>VolMgr</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="disk.sg" />
+    <Compile Include="volmgr.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\DriverCategory.targets" />
+
+</Project>
diff --git a/base/Drivers/VolumeManager/disk.sg b/base/Drivers/VolumeManager/disk.sg
new file mode 100644
index 0000000..9c0fa82
--- /dev/null
+++ b/base/Drivers/VolumeManager/disk.sg
@@ -0,0 +1,356 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   VolMgr.cs
+//
+//  Reads and manages volumes and Partitions on the system
+//
+//  Useful links:
+//     http://www.ata-atapi.com/hiwtab.htm
+//     http://www.win.tue.nl/~aeb/partitions/
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+
+namespace Microsoft.Singularity.Drivers.VolumeManager
+{
+    [StructLayout(LayoutKind.Sequential, Pack=4)]
+    internal pointerfree struct PartitionDescriptor
+    {
+        public  byte   BootIndicator;
+        private byte   chsStartHead;
+        private byte   chsStartSector;
+        private byte   chsStartCylinder;
+        public  byte   SystemId;
+        private byte   chsEndHead;
+        private byte   chsEndSector;
+        private byte   chsEndCylinder;
+        private uint   leStartSector;
+        private uint   leTotalSector;
+
+        private static byte GetChsSector(byte sectorByte)
+        {
+            return (byte)(sectorByte & 0x3f);
+        }
+
+        private static ushort GetChsCylinder(byte sectorByte,
+                                             byte cylinderByte)
+        {
+            return (ushort)
+                ((((int)sectorByte & 0xc0) << 2) + (int)cylinderByte);
+        }
+
+        public byte ChsStartHead
+        {
+            get { return chsStartHead; }
+        }
+
+        public byte ChsStartSector
+        {
+            get { return GetChsSector(chsStartSector); }
+        }
+
+        public ushort ChsStartCylinder
+        {
+            get { return GetChsCylinder(chsStartSector, chsStartCylinder); }
+        }
+
+        public byte ChsEndHead
+        {
+            get { return chsEndHead; }
+        }
+
+        public byte ChsEndSector
+        {
+            get { return GetChsSector(chsEndSector); }
+        }
+
+        public ushort ChsEndCylinder
+        {
+            get { return GetChsCylinder(chsEndSector, chsEndCylinder); }
+        }
+
+        public uint StartSector
+        {
+            get { return ByteOrder.LittleEndianToHost(leStartSector); }
+            set { leStartSector = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        public uint TotalSector
+        {
+            get { return ByteOrder.LittleEndianToHost(leTotalSector); }
+            set { leTotalSector = ByteOrder.HostToLittleEndian(value); }
+        }
+    }
+
+    public class Disk
+    {
+        public const byte SystemIdFat16Extended    = 0x05;
+        public const byte SystemIdFat32ExtendedLba = 0x0f;
+
+        public const byte Byte510Signature = 0x55;
+        public const byte Byte511Signature = 0xaa;
+
+        public const int  Descriptor0Offset = 0x1be;
+        public const int  DescriptorSize    = 16;
+        public const int  DescriptorMax     = 4;
+
+        public const int  BytesPerSector    = 512;
+
+        private String diskName;
+        private ArrayList partitions;   // Holds boxed PartitionDescriptor's
+        private TRef<VolumeManagerContract.Exp:Accept> VolExp;
+
+        public void MakeTRef([Claims]VolumeManagerContract.Exp:Accept! imp)
+                  requires imp.InState(VolumeManagerContract.Accept.Value);
+        {
+            VolExp = new TRef<VolumeManagerContract.Exp:Accept> (imp);
+        }
+
+        public VolumeManagerContract.Exp:Accept! AcquireTRef()
+        {
+            assert VolExp != null;
+            VolumeManagerContract.Exp:Accept exp = VolExp.Acquire();
+            VolExp = null;
+            return exp;
+        }
+
+        internal int PartitionCount
+        {
+            get { return (partitions == null) ? 0 : partitions.Count; }
+        }
+
+        internal bool GetPartition(int partitionId,
+                                   out PartitionDescriptor pd)
+        {
+            if (partitions != null && partitionId < partitions.Count) {
+                pd = (PartitionDescriptor) (!)partitions[partitionId];
+                return true;
+            }
+            pd = new PartitionDescriptor();
+            return false;
+        }
+
+        private static byte[] in ExHeap
+        ReadSector(DiskDeviceContract.Imp:Ready! imp, ulong sectorNumber)
+        {
+            byte[]! in ExHeap outBuffer = new [ExHeap] byte[BytesPerSector];
+            imp.SendRead(outBuffer, 0, BytesPerSector, sectorNumber);
+            switch receive {
+                case imp.RecvAckRead(inBuffer):
+                    return inBuffer;
+                case imp.RecvNakRead():
+                    return null;
+                case imp.ChannelClosed():
+                    Console.WriteLine("Disk closed channel on volume manager.");
+                    return null;
+            }
+        }
+
+        public bool Initialize(string! diskName)
+        {
+            this.diskName = diskName;
+            DiskDeviceContract.Imp imp;
+
+            // Open a connection to the disk
+            imp = OpenDisk(diskName);
+            if (imp == null) {
+                return false;
+            }
+
+            byte[] in ExHeap mbrBuffer = ReadSector(imp, 0);
+            try {
+                if (mbrBuffer != null) {
+                    try {
+                        partitions = ParseMasterBootRecord(imp, mbrBuffer);
+                    }
+                    finally {
+                        delete mbrBuffer;
+                    }
+                }
+                else {
+                    throw new Exception("Didn't get AckRead on MBR");
+                }
+            }
+            finally {
+                delete imp;
+            }
+
+            return true;
+        }
+
+        public static ArrayList
+        ParseMasterBootRecord(DiskDeviceContract.Imp:Ready! imp,
+                              byte[]! in ExHeap             mbrRecord)
+        {
+            // validate signature
+            Tracing.Log(Tracing.Debug,"Signature = {0:x2}{1:x2}\n",
+                        (UIntPtr)mbrRecord[510], (UIntPtr)mbrRecord[511]);
+            if (mbrRecord[510] != Byte510Signature ||
+                mbrRecord[511] != Byte511Signature) {
+                DebugStub.Print("Bad MBR signature ({0:x2}{1:x2})\n",
+                                __arglist(mbrRecord[510], mbrRecord[511]));
+                return null;   //not found
+            }
+
+            DebugStub.Print("MBR signature ({0:x2}{1:x2})\n",
+                            __arglist(mbrRecord[510], mbrRecord[511]));
+
+            ArrayList partitions = new ArrayList(4);
+
+            for (int i = 0; i < DescriptorMax; i++) {
+                ref PartitionDescriptor r = ref mbrRecord[Descriptor0Offset + i * DescriptorSize];
+
+                Tracing.Log(Tracing.Debug,
+                            "Partition: boot={0:x2}, StartSector={1}, Total={2}\n",
+                            r.BootIndicator, r.StartSector, r.TotalSector);
+                DebugStub.Print("  Partition: boot={0:x2}, StartSector={1}, Total={2} (CHS {3}.{4}.{5}--{6}.{7}.{8})\n",
+                                __arglist(r.BootIndicator,
+                                          r.StartSector,
+                                          r.TotalSector,
+                                          r.ChsStartCylinder,
+                                          r.ChsStartHead,
+                                          r.ChsStartSector,
+                                          r.ChsEndCylinder,
+                                          r.ChsEndHead,
+                                          r.ChsEndSector
+                                          ));
+
+                if (r.SystemId == SystemIdFat16Extended ||
+                    r.SystemId == SystemIdFat32ExtendedLba) {
+                    FetchAndParseExtendedPartition(imp, ref r, partitions);
+                }
+                else if (r.TotalSector != 0) {
+                    partitions.Add(r);
+                }
+            }
+
+            int count = 0;
+            foreach (Object o in partitions) {
+                PartitionDescriptor pd = (PartitionDescriptor) (!)o;
+                // The next non-null cast should be redundant because of
+                // assertion, but is required to silence compiler.
+                Console.WriteLine("  Partition {0}, system={1}, start={2}, count = {3}",
+                                  count++,
+                                  pd.SystemId, pd.StartSector, pd.TotalSector);
+            }
+
+            return partitions;
+        }
+
+        private static void
+        FetchAndParseExtendedPartition(DiskDeviceContract.Imp:Ready! imp,
+                                       ref PartitionDescriptor parent,
+                                       ArrayList! partitions)
+        {
+            DebugStub.Write("  Extended Partition system={0}, start={1}, count = {2}\n",
+                            __arglist(parent.SystemId,
+                                      parent.StartSector,
+                                      parent.TotalSector));
+
+            byte [] in ExHeap buffer = ReadSector(imp, (ulong)parent.StartSector);
+            if (buffer != null) {
+                try {
+                    ParseExtendedPartition(imp, ref parent, buffer, partitions);
+                }
+                finally {
+                    delete buffer;
+                }
+            }
+        }
+
+        private static void
+        ParseExtendedPartition(DiskDeviceContract.Imp:Ready! imp,
+                               ref PartitionDescriptor       parent,
+                               byte []! in ExHeap            sector,
+                               ArrayList!                    partitions)
+        {
+            // Check signature
+            if (sector[510] != Byte510Signature ||
+                sector[511] != Byte511Signature) {
+                DebugStub.Print("Bad Extended Partition signature {0:x2}{1:x2}\n",
+                                __arglist(sector[510], sector[511]));
+                return;
+            }
+
+            // Check first descriptor matches parent
+            ref PartitionDescriptor self = ref sector[Descriptor0Offset];
+
+            if (self.TotalSector == 0) {
+                DebugStub.Print("Zero sectors for extended partitions");
+                return;
+            }
+
+            self.StartSector += parent.StartSector;
+            partitions.Add(self);
+
+            // Check if second descriptor is also an extended partition
+            ref PartitionDescriptor child = ref sector[Descriptor0Offset + DescriptorSize];
+            if ((child.SystemId == SystemIdFat32ExtendedLba ||
+                 child.SystemId == SystemIdFat16Extended) &&
+                child.TotalSector != 0)
+            {
+                child.StartSector += parent.StartSector;
+                FetchAndParseExtendedPartition(imp, ref child, partitions);
+            }
+        }
+
+        private DiskDeviceContract.Imp:Ready OpenDisk(string! devName)
+        {
+            DiskDeviceContract.Exp! exp;
+            DiskDeviceContract.Imp! imp;
+            DiskDeviceContract.NewChannel(out imp, out exp);
+
+            // get NS endpoint
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+
+            DebugStub.Print("Attempting to bind to {0}\n", __arglist(devName));
+
+            bool success = false;
+            ns.SendBind(Bitter.FromString2(devName),exp);
+            switch receive {
+                case ns.AckBind():
+                    DebugStub.Print("VolMgr: Bound to {0}.\n", __arglist(devName));
+                    success = true;
+                    break;
+                case ns.NakBind(rejected, error):
+                    DebugStub.Print("VolMgr: Failed to bind to {0}.\n", __arglist(devName));
+                    delete rejected;
+                    break;
+                case unsatisfiable:
+                    throw new Exception("Didn't Disk.RecvAckBind or Disk.RecvNakBind");
+                    break;
+            }
+
+            if (!success) {
+                Tracing.Log(Tracing.Debug,"OpenDisk lookup of {0} failed\n",devName);
+                delete imp;
+                delete ns;
+                return null;
+            }
+
+            switch receive {
+                case imp.Success():
+                    break;
+                case unsatisfiable:
+                    throw new Exception("Didn't Disk.RecvSuccess");
+                    break;
+            }
+
+            delete ns;
+            return imp;
+        }  //OpenDisk
+    } //
+} //namespace class
diff --git a/base/Drivers/VolumeManager/volmgr.sg b/base/Drivers/VolumeManager/volmgr.sg
new file mode 100644
index 0000000..77e328e
--- /dev/null
+++ b/base/Drivers/VolumeManager/volmgr.sg
@@ -0,0 +1,407 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   VolMgr.cs
+//
+//  Reads and manages volumes and partitions on the system
+//
+//  Useful links:
+//     http://www.ata-atapi.com/hiwtab.htm
+//     http://www.win.tue.nl/~aeb/partitions/
+
+using System;
+using System.Threading;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.V1.Services;
+
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Drivers.VolumeManager
+{
+    public class VolumeManagerMain
+    {
+    }
+
+    public class VolumeManager
+    {
+        private static VolMgr volMgr;
+        private static TRef <NotifyContract.Exp:Start>! notificationExp;
+
+        private  static void NotifyPump()
+        {
+            NotifyContract.Exp exp = notificationExp.Acquire();
+            exp.RecvBegin();
+
+            while (true) {
+                switch receive {
+                    case exp.ChangeNotification(i_path,i_type):
+                        Console.WriteLine("VolMgr: notified of {0} for {1}",
+                                          i_type,
+                                          Bitter.ToString2(i_path));
+                        exp.SendAckChangeNotification();
+                        delete i_path;
+                        continue;
+
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register VolMgr with Nameservice\n");
+                        DebugStub.Break();
+                        break;
+                }
+            }
+
+            notificationExp.Release(exp);
+        }
+
+        public static int Main(string[] args)
+        {
+            volMgr = new VolMgr();
+            //register volume manager with the name space.
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! s;
+            ServiceProviderContract.NewChannel(out imp, out s);
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2("/dev/volmgr"),imp);
+                switch receive {
+                    case epNS.AckRegister():
+                        break;
+
+                    case epNS.NakRegister(rejected, error):
+                        delete rejected;
+                        DebugStub.Break();
+                        break;
+
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register VolMgr with Nameservice\n");
+                        DebugStub.Break();
+                        delete s;
+                        return -1;
+                }
+
+                // spin up a thread to handle notifications
+                NotifyContract.Imp! notifyImp;
+                NotifyContract.Exp! notifyExp;
+                NotifyContract.NewChannel(out notifyImp, out notifyExp);
+
+                notificationExp = new TRef <NotifyContract.Exp:Start> (notifyExp) ;
+                Thread! thread = new Thread(new ThreadStart(NotifyPump));
+                if (thread != null) {
+                    thread.Start();
+                }
+
+                epNS.SendNotify(Bitter.FromString2("/dev/disk"),
+                                Bitter.FromString2("*"),
+                                false,
+                                notifyImp);
+                switch receive {
+                    case epNS.AckNotify():
+                        break;
+
+                    case epNS.NakNotify (rejectedEP, error):
+                        DebugStub.Break();
+                        delete rejectedEP;
+                        break;
+
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register Notify \n");
+                        DebugStub.Break();
+                        delete s;
+                        return -1;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            volMgrPump(s,volMgr);
+            delete s;
+            volMgr.Finalize();
+            return 0;
+        }
+
+        private static void volMgrPump(ServiceProviderContract.Exp:Start! volMgrSP,
+                                       VolMgr! volMgr)
+        {
+            //Holds EPs for the VolumeManager contract that have been connected but have not registered
+            ESet<VolumeManagerContract.Exp:Ready> clients
+                = new ESet<VolumeManagerContract.Exp:Ready>();
+
+            //State needed to complete an Accept message
+            EMap<VolumeManagerContract.Exp:Accept,Volume!> diskReplyMap
+                = new EMap<VolumeManagerContract.Exp:Accept,Volume!>();
+
+            //Associates a particular /dev/volX  service provider in the NS with a Volume Object
+            EMap<ServiceProviderContract.Exp:Start, Volume!> volEpMap
+                = new EMap<ServiceProviderContract.Exp:Start,Volume!>();
+
+            for (bool run = true; run;) {
+                switch receive {
+                    // listen for CONNECT messages for volMgr from NS
+                    case volMgrSP.Connect(candidate):
+                        VolumeManagerContract.Exp newClient = candidate as VolumeManagerContract.Exp;
+
+                        if (newClient != null) {
+                            newClient.SendSuccess();
+                            clients.Add(newClient);
+                            volMgrSP.SendAckConnect();
+#if VERBOSE
+                            DebugStub.WriteLine("VolMgr client accepted");
+#endif
+                        }
+                        else {
+                            volMgrSP.SendNackConnect(candidate);
+                        }
+                        break;
+
+                        //listen for REGISTER Messages on connections added to ESet above
+                    case diskEp.RegisterDisk(name) in clients:
+#if VERBOSE
+                        DebugStub.WriteLine("VolMgr received Register");
+#endif
+                        Disk d = volMgr.Register(name);
+                        delete name;
+
+                        if (null != d) {
+                            int count = d.PartitionCount;
+                            for (int i = 0; i < count; i++) {
+                                ServiceProviderContract.Exp:Start! volSp;
+                                Volume vol = volMgr.CreateVolume(d, i, out volSp);
+#if VERBOSE
+                                DebugStub.WriteLine("VolMgr adding to map");
+#endif
+                                volEpMap.Add(volSp,vol);
+                            }
+
+                            diskEp.SendAckRegisterDisk();
+                            //store diskEp. to disk in the disk object for connect messages
+                            d.MakeTRef(diskEp);
+                        }
+                        else {
+                            diskEp.SendNakRegisterDisk();
+                            delete diskEp;
+                        }
+                        break;
+
+                        // listen to new CONNECT messages for "/dev/volX" from NS (lookup)
+                    case nsClient.Connect(candidate) in volEpMap~>vol:
+#if VERBOSE
+                        DebugStub.WriteLine("connecting to disk!");
+#endif
+                        DiskDeviceContract.Exp diskExp = candidate as DiskDeviceContract.Exp;
+
+                        // Vol -> Disk -> TRef<VolumeManagerContract>
+                        VolumeManagerContract.Exp! volExp = vol.VolumeDisk.AcquireTRef();
+
+                        if (diskExp != null) {
+                            assert volExp.InState(VolumeManagerContract.Accept.Value);
+                            // Send Connect message with base and bound
+                            volExp.SendConnect(diskExp, vol.SystemId, vol.StartSector, vol.SectorCount);
+                            assert nsClient.InState(ServiceProviderContract.Ack.Value);
+                            vol.AttachClientChannel(nsClient);
+                            diskReplyMap.Add(volExp, vol);
+                        } else {
+                            delete volExp;
+                            delete candidate;
+                            delete nsClient;
+                        }
+                        break;
+
+                    case diskEp.AckConnect() in diskReplyMap~>vol:
+#if VERBOSE
+                        DebugStub.WriteLine("VolMgrPump: received ACK from disk connect");
+#endif
+                        ServiceProviderContract.Exp volExp = vol.DetachClientChannel();
+                        volExp.SendAckConnect();
+                        assert volExp.InState(VolumeManagerContract.Start.Value);
+                        volEpMap.Add(volExp,vol);
+                        vol.VolumeDisk.MakeTRef(diskEp);
+                        break;
+
+                    case diskEp.NakConnect(endpoint) in diskReplyMap~>vol:
+#if VERBOSE
+                        DebugStub.WriteLine("VolMgrPump: received NAK from disk connect");
+#endif
+                        ServiceProviderContract.Exp volExp = vol.DetachClientChannel();
+                        volExp.SendNackConnect(endpoint);
+                        assert volExp.InState(VolumeManagerContract.Start.Value);
+                        volEpMap.Add(volExp,vol);
+                        vol.VolumeDisk.MakeTRef(diskEp);
+                        break;
+
+                    case unsatisfiable:
+#if VERBOSE
+                        DebugStub.WriteLine("NS: client ServiceProvider gone! ");
+#endif
+                        run = false;
+                        break;
+                } //receive
+            }//for
+
+            volEpMap.Dispose();
+            clients.Dispose();
+            diskReplyMap.Dispose();
+        }//pump
+    } //VolumeManager
+
+
+    public class Volume
+    {
+        private TRef<ServiceProviderContract.Exp:Ack> VolumeSpRef;
+        public  Disk!  VolumeDisk;
+        private byte   systemId;
+        private ulong  startSector;
+        private ulong  totalSector;
+        public  String Name;
+
+        public byte SystemId
+        {
+            get { return systemId; }
+        }
+
+        public ulong StartSector
+        {
+            get { return startSector; }
+        }
+
+        public ulong SectorCount
+        {
+            get { return totalSector; }
+        }
+
+        public void AttachClientChannel([Claims]ServiceProviderContract.Exp:Ack! exp)
+            requires exp.InState(ServiceProviderContract.Ack.Value);
+        {
+            VolumeSpRef= new TRef<ServiceProviderContract.Exp:Ack> (exp);
+        }
+
+        public ServiceProviderContract.Exp:Ack! DetachClientChannel() {
+            TRef<ServiceProviderContract.Exp:Ack> spref = this.VolumeSpRef;
+
+            if (spref == null) {
+                DebugStub.Break();
+                throw new ApplicationException("Volume not attached to any client");
+            }
+            this.VolumeSpRef = null;
+            return spref.Acquire();
+        }
+
+        public Volume(Disk! disk,
+                      int partitionId,
+                      String! name,
+                      out ServiceProviderContract.Exp:Start! server)
+        {
+            VolumeDisk = disk;
+            PartitionDescriptor pd;
+            if (disk.GetPartition(partitionId, out pd) == true) {
+                systemId    = pd.SystemId;
+                startSector = pd.StartSector;
+                totalSector = pd.TotalSector;
+            }
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! exp;
+            ServiceProviderContract.NewChannel(out imp, out exp);
+            server = exp;
+            Name = name;
+
+            base();
+
+            // when the driver is a process  this will go away
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+            try {
+                epNS.SendRegister(Bitter.FromString2(name),imp);
+                switch receive {
+                    case epNS.AckRegister():
+                        break;
+                    case epNS.NakRegister(rejected, error):
+                        DebugStub.Break();
+                        delete rejected;
+                        break;
+                    case unsatisfiable:
+                        Tracing.Log(Tracing.Debug,"unable to register VolMgr with Nameservice\n");
+                        DebugStub.Break();
+                        break;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+        }
+
+        public void Finalize ()
+        {
+        }
+
+    } //Volume
+
+    public class VolMgr
+    {
+        SortedList! disks;
+        SortedList! volumes;
+        int volumeCount;
+
+        public Disk Register(char[]! in ExHeap heapName)
+        {
+            string! name = Bitter.ToString2(heapName);
+
+            Disk d = new Disk();
+            if  (null == d) {
+                return d;
+            }
+            if (d.Initialize(name)) {
+                Console.WriteLine("Registered disk {0}.", name);
+#if VERBOSE
+                DebugStub.WriteLine("Registered disk {0}.", __arglist(name));
+#endif
+                disks.Add(name,d);
+            }
+            else {
+                Console.WriteLine("Failed to register disk {0}.", name);
+#if VERBOSE
+                DebugStub.WriteLine("Failed to register disk {0}.", __arglist(name));
+#endif
+                d = null;
+            }
+            return d;
+        }
+
+        public Volume! CreateVolume(Disk! disk,
+                                    int partitionId,
+                                    out ServiceProviderContract.Exp:Start! server)
+        {
+            // cons up the global system-wide name
+            string name = String.Format("/dev/vol{0}.{1}",
+                                        disks.Count - 1, partitionId);
+#if VERBOSE
+            //DebugStub.WriteLine("adding volume {0}", __arglist(name));
+#endif
+            Volume vol = new Volume(disk,partitionId, name, out server);
+            volumes.Add(name,vol);
+            return vol;
+        }
+
+        public VolMgr()
+        {
+            disks   = new SortedList();
+            volumes = new SortedList();
+        }
+
+        public void Finalize()
+        {
+            disks.Clear();
+            volumes.Clear();
+            volumeCount = 0;
+        }
+    }
+}
diff --git a/base/Interfaces/Bartok/ASCIIEncoding.csi b/base/Interfaces/Bartok/ASCIIEncoding.csi
new file mode 100644
index 0000000..687e9d8
--- /dev/null
+++ b/base/Interfaces/Bartok/ASCIIEncoding.csi
@@ -0,0 +1,30 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Text {
+    [RequiredByBartok]
+    public class ASCIIEncoding : Encoding
+    {
+        public ASCIIEncoding();
+
+        public override int GetByteCount(char[] chars, int index, int count);
+        public override int GetByteCount(String chars);
+        public override int GetBytes(char[] chars, int charIndex, int charCount,
+                                     byte[] bytes, int byteIndex);
+        public override int GetBytes(String chars, int charIndex, int charCount,
+                                     byte[] bytes, int byteIndex);
+        public override int GetCharCount(byte[] bytes, int index, int count);
+        public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+                                     char[] chars, int charIndex);
+        public override String GetString(byte[] bytes);
+        public override String GetString(byte[] bytes, int byteIndex, int byteCount);
+        public override int GetMaxByteCount(int charCount);
+        public override int GetMaxCharCount(int byteCount);
+    }
+}
diff --git a/base/Interfaces/Bartok/ArgIterator.csi b/base/Interfaces/Bartok/ArgIterator.csi
new file mode 100644
index 0000000..67b48a4
--- /dev/null
+++ b/base/Interfaces/Bartok/ArgIterator.csi
@@ -0,0 +1,21 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct ArgIterator
+    {
+#if !DONT_DO_BARTOK
+        private IntPtr * NextArg;
+        private int RemainingArgs;
+#endif
+
+        public ArgIterator(RuntimeArgumentHandle arglist);
+        public int GetRemainingCount();
+        public TypedReference GetNextArg();
+        public RuntimeTypeHandle GetNextArgType();
+    }
+}
diff --git a/base/Interfaces/Bartok/ArrayHelper.csi b/base/Interfaces/Bartok/ArrayHelper.csi
new file mode 100644
index 0000000..aaa5b3c
--- /dev/null
+++ b/base/Interfaces/Bartok/ArrayHelper.csi
@@ -0,0 +1,52 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace System {
+    [RequiredByBartok]
+    internal class ArrayHelper {
+
+        [RequiredByBartok]
+        public static void CopyBoolUp(bool[] srcArray, int srcOffset, bool[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyCharUp(char[] srcArray, int srcOffset, char[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyInt8Up(sbyte[] srcArray, int srcOffset, sbyte[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyInt16Up(short[] srcArray, int srcOffset, short[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyInt32Up(int[] srcArray, int srcOffset, int[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyInt64Up(long[] srcArray, int srcOffset, long[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyUInt8Up(byte[] srcArray, int srcOffset, byte[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyUInt16Up(ushort[] srcArray, int srcOffset, ushort[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyUInt32Up(uint[] srcArray, int srcOffset, uint[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyUInt64Up(ulong[] srcArray, int srcOffset, ulong[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyFloat32Up(float[] srcArray, int srcOffset, float[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void CopyFloat64Up(double[] srcArray, int srcOffset, double[] dstArray, int dstOffset, int length);
+
+        [RequiredByBartok]
+        public static void InitArray(Array srcArray, Array dstArray);
+    }
+}
diff --git a/base/Interfaces/Bartok/Assembly.csi b/base/Interfaces/Bartok/Assembly.csi
new file mode 100644
index 0000000..751b647
--- /dev/null
+++ b/base/Interfaces/Bartok/Assembly.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+using System.Runtime.CompilerServices;
+namespace System.Reflection {
+
+    //| <include file='doc\Assembly.uex' path='docs/doc[@for="Assembly"]/*' />
+    [RequiredByBartok]
+    public class Assembly
+    {
+    }
+}
+
diff --git a/base/Interfaces/Bartok/BREAKDOWN.TXT b/base/Interfaces/Bartok/BREAKDOWN.TXT
new file mode 100644
index 0000000..b2070ed
--- /dev/null
+++ b/base/Interfaces/Bartok/BREAKDOWN.TXT
@@ -0,0 +1,36 @@
+Runtime Services:
+=================
+GC.csi
+StringBuilder.csi
+Thread.csi
+RuntimeType.csi
+Math.csi
+
+Exceptions:
+===========
+ArgumentOutOfRangeException.csi
+ArithmeticException.csi
+DivideByZeroException.csi
+IndexOutOfRangeException.csi
+InvalidCastException.csi
+NullReferenceException.csi
+OutOfMemoryException.csi
+OverflowException.csi
+StackOverflowException.csi
+SystemException.csi
+
+Interfaces
+==========
+ICollection.csi
+IList.csi
+
+Unknown:
+========
+ArgIterator.csi
+ASCIIEncoding.csi
+Assembly.csi
+Encoding.csi
+Marshal.csi
+Module.csi
+RuntimeFieldHandle.csi
+RuntimeMethodHandle.csi
diff --git a/base/Interfaces/Bartok/Bartok.csi b/base/Interfaces/Bartok/Bartok.csi
new file mode 100644
index 0000000..eb579eb
--- /dev/null
+++ b/base/Interfaces/Bartok/Bartok.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Bartok.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Bartok/Bartok.csproj b/base/Interfaces/Bartok/Bartok.csproj
new file mode 100644
index 0000000..8f8be76
--- /dev/null
+++ b/base/Interfaces/Bartok/Bartok.csproj
@@ -0,0 +1,70 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Bartok\Bartok.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Bartok</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+
+    <Compile Include="ArrayHelper.csi" />
+    <Compile Include="ArgIterator.csi" />
+    <Compile Include="ASCIIEncoding.csi" />
+    <Compile Include="Assembly.csi" />
+    <Compile Include="BartokRT.csi" />
+    <Compile Include="Encoding.csi" />
+    <Compile Include="CallStack.csi" />
+    <Compile Include="Collector.csi" />
+    <Compile Include="ConcurrentMSCollector.csi" />
+    <Compile Include="GC.csi" />
+<!-- <Compile Include="ICollection.csi"/> -->
+<!-- <Compile Include="IList.csi"/> -->
+    <Compile Include="MarkSweepCollector.csi" />
+    <Compile Include="Marshal.csi" />
+    <Compile Include="Math.csi" />
+    <Compile Include="Module.csi" />
+    <Compile Include="PageTable.csi" />
+    <Compile Include="RuntimeFieldHandle.csi" />
+    <Compile Include="RuntimeMethodHandle.csi" />
+<!-- <Compile Include="RuntimeType.csi"/> -->
+    <Compile Include="StackHeight.csi" />
+    <Compile Include="StaticData.csi" />
+    <Compile Include="StringBuilder.csi" />
+    <Compile Include="Thread.csi" />
+    <Compile Include="Transitions.csi" />
+    <Compile Include="TryAll.csi" />
+    <Compile Include="TryAllException.csi" />
+    <Compile Include="VarargList.csi" />
+    <Compile Include="Win32.csi" />
+    <Compile Include="WriteBarrierCMS.csi" />
+
+    <Compile Include="Bartok.csi" />
+
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+    <ProjectReference Include="..\Baseattrs\Baseattrs.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Bartok/BartokRT.csi b/base/Interfaces/Bartok/BartokRT.csi
new file mode 100644
index 0000000..260d59e
--- /dev/null
+++ b/base/Interfaces/Bartok/BartokRT.csi
@@ -0,0 +1,68 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// This code is included in both Bartok compiler and mscorlibOverride builds
+// so that constants can be shared.
+
+using System;
+using System.Runtime.InteropServices;
+
+//#define DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+
+namespace Microsoft.Bartok.Runtime {
+#if DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+    public enum StructuralType {
+        None            = 0x00,
+        Reference       = 0x01,
+        UntracedPointer = 0x02,
+        Struct          = 0x03,
+        Bool            = 0x04,
+        Char            = 0x05,
+        Int8            = 0x06,
+        Int16           = 0x07,
+        Int32           = 0x08,
+        Int64           = 0x09,
+        UInt8           = 0x0a,
+        UInt16          = 0x0b,
+        UInt32          = 0x0c,
+        UInt64          = 0x0d,
+        Float32         = 0x0e,
+        Float64         = 0x0f,
+        IntPtr          = 0x10,
+        UIntPtr         = 0x11,
+        Void            = 0x12,
+    };
+#endif
+
+    public enum GCType{
+        AdaptiveCopyingCollector    = 0x00,
+        MarkSweepCollector          = 0x01,
+        SemispaceCollector          = 0x02,
+        SlidingCollector            = 0x03,
+        ReferenceCountingCollector  = 0x04,
+        ConcurrentMSCollector       = 0x05,
+    };
+
+    public class Constants {
+        public const int TypeTestDisplaySize;
+        public const int TypeTestDisplayPosCache;
+        public const bool TypeTestDisplayIncludesObject;
+        public const int TypeTestDisplayObjectOffset;
+
+        // Workaround for lack of enum printing in Bartok
+        public static string[] StructuralTypeNames;
+
+        // BUGBUG: what about entry for structs?
+        public int[] arrayOfStride;
+    };
+
+#if DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+    public enum TypeInitState {
+        Ready = 1,
+        Running = 2,
+        Failed = 3,
+        Completed =4
+    };
+#endif
+}
diff --git a/base/Interfaces/Bartok/CallStack.csi b/base/Interfaces/Bartok/CallStack.csi
new file mode 100644
index 0000000..5dac4e8
--- /dev/null
+++ b/base/Interfaces/Bartok/CallStack.csi
@@ -0,0 +1,27 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace System.GCs
+{
+    [RequiredByBartok]
+    public class CallStack
+    {
+        [RequiredByBartok]
+        private static int callSiteTableCount;
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        private static UIntPtr *codeBaseStartTable;
+        [RequiredByBartok]
+        private static UIntPtr **returnAddressToCallSiteSetNumbers;
+        [RequiredByBartok]
+        private static int **callSiteSetCount;
+        [RequiredByBartok]
+        private static ushort **callSetSiteNumberToIndex;
+        [RequiredByBartok]
+        private static uint **activationDescriptorTable;
+    }
+}
diff --git a/base/Interfaces/Bartok/Collector.csi b/base/Interfaces/Bartok/Collector.csi
new file mode 100644
index 0000000..ebde2f4
--- /dev/null
+++ b/base/Interfaces/Bartok/Collector.csi
@@ -0,0 +1,14 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.GCs {
+
+    [RequiredByBartok]
+    public class Collector
+    {
+    }
+
+}
diff --git a/base/Interfaces/Bartok/ConcurrentMSCollector.csi b/base/Interfaces/Bartok/ConcurrentMSCollector.csi
new file mode 100644
index 0000000..3a8fef0
--- /dev/null
+++ b/base/Interfaces/Bartok/ConcurrentMSCollector.csi
@@ -0,0 +1,18 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+#if SINGULARITY
+using Microsoft.Singularity.Scheduling;
+#endif
+
+namespace System.GCs {
+
+    [RequiredByBartok]
+    public class ConcurrentMSCollector : Collector
+    {
+    }
+}
diff --git a/base/Interfaces/Bartok/Encoding.csi b/base/Interfaces/Bartok/Encoding.csi
new file mode 100644
index 0000000..13951e6
--- /dev/null
+++ b/base/Interfaces/Bartok/Encoding.csi
@@ -0,0 +1,62 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Text {
+    [RequiredByBartok]
+    public abstract class Encoding
+    {
+        public Encoding();
+        protected Encoding(int codePage);
+        public static byte[] Convert(Encoding srcEncoding, Encoding dstEncoding,
+                                     byte[] bytes);
+        public static byte[] Convert(Encoding srcEncoding, Encoding dstEncoding,
+                                     byte[] bytes, int index, int count);
+        public virtual byte[] GetPreamble();
+        public static Encoding ASCII { get; }
+
+        public virtual int GetByteCount(char[] chars);
+        public virtual int GetByteCount(String s);
+        public abstract int GetByteCount(char[] chars, int index, int count);
+        [RequiredByBartok]
+        public virtual byte[] GetBytes(char[] chars);
+        public virtual byte[] GetBytes(char[] chars, int index, int count);
+        public abstract int GetBytes(char[] chars, int charIndex, int charCount,
+                                     byte[] bytes, int byteIndex);
+        public virtual byte[] GetBytes(String s);
+        [RequiredByBartok]
+        public virtual int GetBytes(String s, int charIndex, int charCount,
+                                    byte[] bytes, int byteIndex);
+        public virtual int GetCharCount(byte[] bytes);
+        public abstract int GetCharCount(byte[] bytes, int index, int count);
+
+        [RequiredByBartok]
+        public virtual char[] GetChars(byte[] bytes);
+        public virtual char[] GetChars(byte[] bytes, int index, int count);
+        public abstract int GetChars(byte[] bytes, int byteIndex, int byteCount,
+                                     char[] chars, int charIndex);
+        public static Encoding Default { get; }
+#if DONT
+        public virtual Decoder GetDecoder();
+        public virtual Encoder GetEncoder();
+#endif
+
+        public abstract int GetMaxByteCount(int charCount);
+        public abstract int GetMaxCharCount(int byteCount);
+        [RequiredByBartok]
+        public virtual String GetString(byte[] bytes);
+        public virtual String GetString(byte[] bytes, int index, int count);
+
+        public static Encoding Unicode { get; }
+        public static Encoding BigEndianUnicode { get; }
+        public static Encoding UTF8 { get; }
+
+        public override bool Equals(Object value);
+        public override int GetHashCode();
+    }
+}
diff --git a/base/Interfaces/Bartok/GC.csi b/base/Interfaces/Bartok/GC.csi
new file mode 100644
index 0000000..785a7e4
--- /dev/null
+++ b/base/Interfaces/Bartok/GC.csi
@@ -0,0 +1,38 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using Bartok.Runtime;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace System
+{
+    // The GC has only static members and doesn't require the serializable
+    // keyword.
+
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    public sealed class GC
+    {
+        public static void Collect();
+        public static void Verify();
+        public static void Collect(int generation);
+        public static int GetGeneration(Object obj);
+        public static int MaxGeneration { get; }
+        public static void KeepAlive(Object obj);
+        public static void WaitForPendingFinalizers();
+        public static long GetTotalMemory(bool forceFullCollection);
+        public static void SuppressFinalize(Object obj);
+        public static void ReRegisterForFinalize(Object obj);
+
+        [RequiredByBartok]
+        internal static Object AllocateObject(VTable vtable);
+        [RequiredByBartok]
+        internal static Array AllocateVector(VTable vtable, int numElements);
+        [RequiredByBartok]
+        internal static Array AllocateArray(VTable vtable, int rank, int totalElements);
+        [RequiredByBartok]
+        internal static String AllocateString(int stringLength);
+    }
+}
diff --git a/base/Interfaces/Bartok/MarkSweepCollector.csi b/base/Interfaces/Bartok/MarkSweepCollector.csi
new file mode 100644
index 0000000..3a803bd
--- /dev/null
+++ b/base/Interfaces/Bartok/MarkSweepCollector.csi
@@ -0,0 +1,14 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace System.GCs {
+
+    [RequiredByBartok]
+    public class MarkSweepCollector : Collector
+    {
+    }
+}
diff --git a/base/Interfaces/Bartok/Marshal.csi b/base/Interfaces/Bartok/Marshal.csi
new file mode 100644
index 0000000..b89ee7f
--- /dev/null
+++ b/base/Interfaces/Bartok/Marshal.csi
@@ -0,0 +1,21 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Runtime.InteropServices {
+    public sealed class Marshal
+    {
+        [RequiredByBartok]
+        public static IntPtr AllocHGlobal(int cb);
+        [RequiredByBartok]
+        public static void FreeHGlobal(IntPtr hglobal);
+
+        public static int SizeOf(Object structure);
+        public static int SizeOf(Type t);
+    }
+}
diff --git a/base/Interfaces/Bartok/Math.csi b/base/Interfaces/Bartok/Math.csi
new file mode 100644
index 0000000..31606b9
--- /dev/null
+++ b/base/Interfaces/Bartok/Math.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [CCtorIsRunDuringStartup]
+    public sealed class Math {
+
+        public const double PI;
+        public const double E;
+
+    }
+}
diff --git a/base/Interfaces/Bartok/Module.csi b/base/Interfaces/Bartok/Module.csi
new file mode 100644
index 0000000..3e1174a
--- /dev/null
+++ b/base/Interfaces/Bartok/Module.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Reflection {
+    //| <include file='doc\Module.uex' path='docs/doc[@for="Module"]/*' />
+    [RequiredByBartok]
+    public class Module
+    {
+    }
+}
diff --git a/base/Interfaces/Bartok/PageTable.csi b/base/Interfaces/Bartok/PageTable.csi
new file mode 100644
index 0000000..bf2287c
--- /dev/null
+++ b/base/Interfaces/Bartok/PageTable.csi
@@ -0,0 +1,15 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.GCs {
+
+    [RequiredByBartok]
+    public class PageTable {
+
+        private static unsafe byte *halOwner;
+    }
+}
diff --git a/base/Interfaces/Bartok/RuntimeFieldHandle.csi b/base/Interfaces/Bartok/RuntimeFieldHandle.csi
new file mode 100644
index 0000000..02fc4d1
--- /dev/null
+++ b/base/Interfaces/Bartok/RuntimeFieldHandle.csi
@@ -0,0 +1,23 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    //  This value type is used for making classlib type safe.
+    //
+    //  SECURITY : m_ptr cannot be set to anything other than null by untrusted
+    //  code.
+    //
+    //  This corresponds to EE FieldDesc.
+    //| <include file='doc\RuntimeFieldHandle.uex' path='docs/doc[@for="RuntimeFieldHandle"]/*' />
+    public struct RuntimeFieldHandle
+    {
+#if !DONT_DO_BARTOK
+        private int value;
+#endif
+        //| <include file='doc\RuntimeFieldHandle.uex' path='docs/doc[@for="RuntimeFieldHandle.Value"]/*' />
+        public IntPtr Value { get; }
+    }
+}
diff --git a/base/Interfaces/Bartok/RuntimeMethodHandle.csi b/base/Interfaces/Bartok/RuntimeMethodHandle.csi
new file mode 100644
index 0000000..4a5247e
--- /dev/null
+++ b/base/Interfaces/Bartok/RuntimeMethodHandle.csi
@@ -0,0 +1,31 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    //  This value type is used for making classlib type safe.
+    //
+    //  SECURITY : m_ptr cannot be set to anything other than null by untrusted
+    //  code.
+    //
+    //  This corresponds to EE MethodDesc.
+    //| <include file='doc\RuntimeMethodHandle.uex' path='docs/doc[@for="RuntimeMethodHandle"]/*' />
+    public struct RuntimeMethodHandle
+    {
+#if !DONT_DO_BARTOK
+        private int value;
+#endif
+        //| <include file='doc\RuntimeMethodHandle.uex' path='docs/doc[@for="RuntimeMethodHandle.Value"]/*' />
+        public IntPtr Value {
+            get;
+        }
+
+        //| <include file='doc\RuntimeMethodHandle.uex' path='docs/doc[@for="RuntimeMethodHandle.GetFunctionPointer"]/*' />
+        public System.IntPtr GetFunctionPointer();
+    }
+}
diff --git a/base/Interfaces/Bartok/RuntimeType.csi b/base/Interfaces/Bartok/RuntimeType.csi
new file mode 100644
index 0000000..c8a742a
--- /dev/null
+++ b/base/Interfaces/Bartok/RuntimeType.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using Bartok.Runtime;
+
+namespace System {
+
+    internal sealed class RuntimeType
+    {
+        internal TypeInitState cctorState;
+    }
+}
diff --git a/base/Interfaces/Bartok/StackHeight.csi b/base/Interfaces/Bartok/StackHeight.csi
new file mode 100644
index 0000000..4cf1e05
--- /dev/null
+++ b/base/Interfaces/Bartok/StackHeight.csi
@@ -0,0 +1,63 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.GCs;
+using System.Runtime.CompilerServices;
+
+namespace System {
+  /// <summary>
+  /// Abstraction for information about the stack height.  This is currently
+  /// only used by the logging undo code for determining if a pointer write
+  /// occurred in stack space allocated after the tryall section began.
+  ///
+  /// StackHeight does not record information about the call stack.
+  ///
+  /// The current implementation is hardwired to a stack model where the stack
+  /// is a single contiguous piece of memory that grows by putting smaller
+  /// values into the stack pointer.
+  /// </summary>
+  [RequiredByBartok]
+  public struct StackHeight {
+      /// <summary>
+      /// Interpret the pointer as a stack pointer to determine the stack
+      /// height.
+      /// </summary>
+      /// <param name="stackPointer">Pointer into the stack.</param>
+      /// <returns>The stack height of the location pointed to by the
+      /// argument.</returns>
+      public StackHeight(UIntPtr stackPointer);
+
+      /// <summary>
+      /// Interpret the pointer as a stack pointer to determine the stack
+      /// height.
+      /// </summary>
+      /// <param name="stackPointer">Pointer into the stack.</param>
+      /// <returns>The stack height of the location pointed to by the
+      /// argument.</returns>
+      public static explicit operator StackHeight(UIntPtr stackPointer);
+
+      /// <summary>
+      /// Get the current stack height.
+      /// </summary>
+      /// <returns>The current stack height.</returns>
+      //[Intrinsic]
+      // [MethodImplAttribute(MethodImplOptions.PublicCall)]
+      public static StackHeight GetStackHeight();
+
+      /// <summary>
+      /// Check if the first stack height represents a deeper location on the
+      /// stack.
+      /// </summary>
+      /// <param name="first">The first stack height to compare.</param>
+      /// <param name="second">The second stack height to compare.</param>
+      /// <returns>True iff the first height is deeper in the stack than the
+      /// second height.</returns>
+      public static bool Deeper(StackHeight first, StackHeight second);
+
+      /// <summary>
+      /// The value of the stack pointer when the stack height was taken.
+      /// </summary>
+      private UIntPtr stackPointer;
+  }
+}
diff --git a/base/Interfaces/Bartok/StaticData.csi b/base/Interfaces/Bartok/StaticData.csi
new file mode 100644
index 0000000..9baf70a
--- /dev/null
+++ b/base/Interfaces/Bartok/StaticData.csi
@@ -0,0 +1,25 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.GCs
+{
+    [RequiredByBartok]
+    internal unsafe class StaticData
+    {
+        [RequiredByBartok]	
+        private static int sectionCount;
+        [RequiredByBartok]
+        private static UIntPtr **dataSectionEnd; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static UIntPtr **dataSectionBase; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static UIntPtr **roDataSectionEnd; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static UIntPtr **roDataSectionBase; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static uint **staticDataPointerBitMap; // unmanaged uint*[]
+    }
+}
diff --git a/base/Interfaces/Bartok/StringBuilder.csi b/base/Interfaces/Bartok/StringBuilder.csi
new file mode 100644
index 0000000..3949aba
--- /dev/null
+++ b/base/Interfaces/Bartok/StringBuilder.csi
@@ -0,0 +1,38 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Text {
+
+    // This class represents a mutable string.  It is convenient for situations in
+    // which it is desirable to modify a string, perhaps by removing, replacing, or
+    // inserting characters, without creating a new String subsequent to
+    // each modification.
+    //
+    // The methods contained within this class do not return a new StringBuilder
+    // object unless specified otherwise.  This class may be used in conjunction with the String
+    // class to carry out modifications upon strings.
+    //
+    // When passing null into a constructor in VJ and VC, the null
+    // should be explicitly type cast.
+    // For Example:
+    // StringBuilder sb1 = new StringBuilder((StringBuilder)null);
+    // StringBuilder sb2 = new StringBuilder((String)null);
+    // Console.WriteLine(sb1);
+    // Console.WriteLine(sb2);
+    //
+    //| <include file='doc\StringBuilder.uex' path='docs/doc[@for="StringBuilder"]/*' />
+    [RequiredByBartok]
+    public sealed class StringBuilder {
+        [RequiredByBartok]
+        internal String m_StringValue;
+    }
+}
+
+
+
diff --git a/base/Interfaces/Bartok/Thread.csi b/base/Interfaces/Bartok/Thread.csi
new file mode 100644
index 0000000..9756f85
--- /dev/null
+++ b/base/Interfaces/Bartok/Thread.csi
@@ -0,0 +1,47 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.GCs;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    public sealed class Thread
+    {
+        // These fields store the base and limit for the bottommost
+        // stack chunk for this thread.  If the thread is executing,
+        // the current base and limit are stored in the processor
+        // context structure; when the thread is switched out, those
+        // values are stored here.
+        internal UIntPtr asmStackBase;
+        internal UIntPtr asmStackLimit;
+
+        internal UIntPtr asmWriteBarrierOverflow; // Slot for overflow
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        internal unsafe void *asmWriteBarrierPtr; // Used in dynamic WB
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        internal unsafe void *asmWriteBarrierPtrLimit;
+
+        [RequiredByBartok]
+        private static void setLastError();
+
+        [RequiredByBartok]
+        private static Thread GetCurrentThreadNative();
+
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        private static int GetCurrentThreadIndex();
+
+        [RequiredByBartok]
+        private unsafe delegate uint ThreadProc(void *param);
+    }
+}
+
+
+
diff --git a/base/Interfaces/Bartok/Transitions.csi b/base/Interfaces/Bartok/Transitions.csi
new file mode 100644
index 0000000..627e943
--- /dev/null
+++ b/base/Interfaces/Bartok/Transitions.csi
@@ -0,0 +1,32 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace System.GCs {
+
+    internal class Transitions
+    {
+
+        [RequiredByBartok]
+        internal static void EntryIntoManagedSpace();
+
+        [RequiredByBartok]
+        internal static void ReturnFromManagedSpace();
+
+        [RequiredByBartok]
+        internal static void ReturnFromManagedSpaceNoCallerTransition();
+
+        // For the LoadFunction stub for PInvoke methods
+        [RequiredByBartok]
+        internal static void EnterLoadFunctionStub();
+
+        // For the LoadFunction stub for PInvoke methods
+        [RequiredByBartok]
+        internal static void LeaveLoadFunctionStub();
+
+    }
+
+}
diff --git a/base/Interfaces/Bartok/TryAll.csi b/base/Interfaces/Bartok/TryAll.csi
new file mode 100644
index 0000000..dc0de29
--- /dev/null
+++ b/base/Interfaces/Bartok/TryAll.csi
@@ -0,0 +1,537 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+/*
+
+This class provides the run-time support for "try_all { ... }" blocks
+(i.e. exception handlers with roll-back) and for "atomic { ... }"
+blocks implemented over STM.
+
+Overview
+--------
+
+Static methods on TryAllManager provide the entry points from compiled
+code.  The per-thread TryAllManager objects that are passed in are
+instantiated the first time a thread invokes startTryAll.
+
+NB : for most entry points there are variants that take a
+TryAllManager and variants that look up the TryAllManager from the
+current thread.  The former are used when
+StageControlOptions.TryAllOptimisePass is enabled (intended to be the
+default).  The latter are there for performance comparisons.
+
+Names in this file reflect the try_all origin of the code.  In
+practice a try_all is simply an atomic block that (a) doesn't enlist
+the objects that it works on and therefore can't fail with
+AtomicIsInvalidException and, (b) doesn't catch
+AtomicIsInvalidException and use that to prompt automatic
+re-execution.
+
+The external entry points are as follows:
+
+ - startTryAll  - start a new try_all / atomic
+
+ - commit       - attempt to commit the current try_all / atomic
+
+ - abort        - abort the current try_all / atomic
+
+ - validate     - validate the current atomic
+
+ - Enlist[X]for[Y] where X is in {Addr, Indirect, Obj} and Y is in {Read, Update}
+                - Add the specified item to the set for read-only access or
+                  read-write access in the current atomic block.  "Obj"
+                  operations take an object reference.  "Addr" operations take
+                  the address of a static field.  "Indirect" operations take
+                  an arbitrary address and byte size.
+
+ - Log*         - Log the current contents of the specified data before it
+                  may be updated.  Variants specify ref/val (whether the
+                  data being updated is a reference type or a value type)
+                  and heap/indirect (whether the data is identified by
+                  an object & offset (object == null for statics), or
+                  by a pointer).
+
+ - RegisterForUndo - Register a call-back for execution during an
+                  abort.  See Shinnar et al's paper for a discussion
+                  of the semantics: currently the heap is rolled back
+                  to the point of registration, then the call-back
+                  executes, then roll-back continues.  If the
+                  call-back raises an exception then it itself is
+                  rolled back and the exception silently dropped.
+
+The caller must guarantee that:
+
+ - commit / abort / validate / enlist* / log* are only invoked when there is
+   an active try_all or atomic.
+
+ - before a data item is read, an enlist-for-read or enlist-for-update
+   has been issued that covers it (since the earliest active
+   startTryAll on that manager).
+
+ - before a data item is updated, an enlist-for-update has been issued
+   that covers it (since the earliest active startTryAll on that
+   manager) and a log call has been made for the item (since the most
+   recent active startTryAllOnThatManager).
+
+ - within an atomic block, a AtomicIsInvalidException will
+   propagate to the edge of an atomic block and cause abort to be
+   called.
+
+The roll-back code here is, of course, largely derived from the
+try_all implementation by Avraham Shinnar, David Tarditi, Mark Plesko
+and Bjarne Steensgaard.
+
+
+tharris, 10 May 2005
+
+*/
+
+
+// Verbose runtime tracing
+//#define ENABLE_LOG_TRACING
+
+// Verbose tracing during GC
+//#define ENABLE_GC_TRACING
+
+// Trace to an in-memory buffer, not stdout
+//#define BUFFER_LOG
+
+// Profile operation counts
+#define ENABLE_PROFILING
+
+// Profile individual call sites (needs /StageControl.
+//#define ENABLE_PER_CALL_SITE_PROFILING
+
+// Occasionally pretend atomic blocks are invalid
+//#define SHAKE
+
+// Use hashing to attempt to filter duplicate udpate log entries
+#define HASHING
+
+// Test EnlistForRead calls as EnlistForUpdate
+//#define ALWAYS_OPEN_FOR_UPDATE
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    [RequiredByBartok]
+    public class AtomicException : Exception {}
+
+    //----------------------------------------------------------------------
+    //
+    // AtomicIsInvalidException is the sole way that invalidity is signalled:
+    // we assume that transactions generally execute and commit without conflict
+    // and so take a bigger hit on dealing with invalid exceptions in order to
+    // avoid testing against boolean results.
+    //
+    // Code must be prepared to deal with AtomicIsInvalidException being raised
+    // until the point where the status field is set to ChosenCommit.
+    //
+    // If building a non-blocking implementation we could throw
+    // AtomicIsInvalidException in asynchronously.
+
+    public sealed class AtomicIsInvalidException : AtomicException {}
+
+    // This Interface allows programs to define manual actions to be taken to
+    // recover during a tryall abort. See also TryAllManager.RegisterForUndo
+
+    public interface IUndo {
+        // Note that when Undo is called, accessible memory should be in the same
+        // state as it was when RegisterForUndo was called.
+        void Undo();
+    }
+
+    // A method marked as NoLoggingForUndo will not have logging code
+    // inserted even if called from a logging context
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class
+                    | AttributeTargets.Struct | AttributeTargets.Constructor
+                    | AttributeTargets.Method,
+                    Inherited = false)]
+    public sealed class NoLoggingForUndoAttribute: Attribute {}
+
+    // A method marked as NonTransactional may NOT be called from a
+    // transactional context.  This is statically checked by
+    // convert\PropagateLogging.cs
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class
+                    | AttributeTargets.Struct | AttributeTargets.Constructor
+                    | AttributeTargets.Method,
+                    Inherited = false)]
+    public sealed class NonTransactableAttribute: Attribute {}
+
+    //----------------------------------------------------------------------
+    //
+    // This is the main class that implements the runtime support for tryall
+    // clauses.  Just about all functions called from outside the class are
+    // static, and they just call the current thread's local version of the
+    // function.
+
+    //----------------------------------------------------------------------
+    //
+    // This is the main class that implements the runtime support for tryall
+    // clauses.  Just about all functions called from outside the class are
+    // static, and they just call the current thread's local version of the
+    // function.
+
+    [NoLoggingForUndo]
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    public sealed class TryAllManager {
+        //----------------------------------------------------------------------
+        //
+        // Start, validate, commit, abort, end
+        //
+        // These are expected to be called "start, validate*, commit"
+        // for transactions that attempt to commit, or "start, validate*,
+        // abort" for transactions that decide to abort.  Validation is
+        // performed in commit, so explicit calls are needed only to detect
+        // if a transaction is looping.  "end" is used internally in "commit"
+        // and "abort" so is not called explicitly.
+
+        public static void RegisterForUndo(IUndo ua);
+
+        [RequiredByBartok]
+        private static Object objForStaticEnlists;
+
+        [RequiredByBartok]
+        [NoLoggingForUndoAttribute]
+        internal static void StartTryAll(StackHeight stackHeight);
+
+        [RequiredByBartok]
+        [NoLoggingForUndoAttribute]
+        internal static void StartTryAll(StackHeight stackHeight,
+                                         TryAllManager m);
+
+        [RequiredByBartok]
+        [NoLoggingForUndoAttribute]
+        internal static void StartAtomic(StackHeight stackHeight);
+
+        [RequiredByBartok]
+        [NoLoggingForUndoAttribute]
+        internal static void StartAtomic(StackHeight stackHeight,
+                                         TryAllManager m);
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void CommitTryAll();
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void CommitTryAll(TryAllManager m);
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void CommitAtomic();
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void CommitAtomic(TryAllManager m);
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void AbortTryAll();
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void AbortTryAll(TryAllManager m);
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void AbortAtomic();
+
+        [RequiredByBartok]
+        [NoLoggingForUndo]
+        internal static void AbortAtomic(TryAllManager m);
+
+        [RequiredByBartok]
+        [NoLoggingForUndoAttribute]
+        internal static void ValidateEnlistments();
+
+        [RequiredByBartok]
+        [NoLoggingForUndoAttribute]
+        internal static void ValidateEnlistments(TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnsureLogMemoryForUpdateLog(uint bytesNeeded);
+
+        [RequiredByBartok]
+        internal static void EnsureLogMemoryForUpdateLog(uint bytesNeeded,
+                                                         TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnsureLogMemoryForReadEnlistmentLog(uint bytesNeeded);
+
+        [RequiredByBartok]
+        internal static void EnsureLogMemoryForReadEnlistmentLog(uint bytesNeeded,
+                                                                 TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnsureLogMemoryForUpdateEnlistmentLog(uint bytesNeeded);
+
+        [RequiredByBartok]
+        internal static void EnsureLogMemoryForUpdateEnlistmentLog(uint bytesNeeded,
+                                                                   TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForRead(Object obj);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForReadFast(Object obj);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForRead(Object obj,
+                                              TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForReadFast(Object obj,
+                                                  TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForRead(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForReadFast(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForRead(UIntPtr pobj,
+                                               TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForReadFast(UIntPtr pobj,
+                                                   TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForRead(UIntPtr ptr,
+                                                   UIntPtr byteSize);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForReadFast(UIntPtr ptr,
+                                                       UIntPtr byteSize);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForRead(UIntPtr ptr,
+                                                   UIntPtr byteSize,
+                                                   TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForReadFast(UIntPtr ptr,
+                                                       UIntPtr byteSize,
+                                                       TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForUpdate(Object obj);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForUpdateFast(Object obj);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForUpdate(Object obj,
+                                                TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistObjForUpdateFast(Object obj,
+                                                    TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistNewObjForUpdate(Object obj);
+
+        [RequiredByBartok]
+        internal static void EnlistNewObjForUpdateFast(Object obj);
+
+        [RequiredByBartok]
+        internal static void EnlistNewObjForUpdate(Object obj,
+                                                   TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistNewObjForUpdateFast(Object obj,
+                                                       TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForUpdate(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForUpdateFast(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForUpdate(UIntPtr pobj,
+                                                 TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistAddrForUpdateFast(UIntPtr pobj,
+                                                     TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForUpdate(UIntPtr ptr,
+                                                     UIntPtr byteSize);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForUpdateFast(UIntPtr ptr,
+                                                         UIntPtr byteSize);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForUpdate(UIntPtr ptr,
+                                                     UIntPtr byteSize,
+                                                     TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void EnlistIndirectForUpdateFast(UIntPtr ptr,
+                                                         UIntPtr byteSize,
+                                                         TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogValHeapMultiple(Object obj,
+                                                UIntPtr off,
+                                                UIntPtr size);
+
+        [RequiredByBartok]
+        internal static void LogValHeapMultipleFast(Object obj,
+                                                    UIntPtr off,
+                                                    UIntPtr size);
+
+        [RequiredByBartok]
+        internal static void LogValHeapMultiple(Object obj,
+                                                UIntPtr off,
+                                                UIntPtr size,
+                                                TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogValHeapMultipleFast(Object obj,
+                                                    UIntPtr off,
+                                                    UIntPtr size,
+                                                    TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogValHeap(Object obj,
+                                        UIntPtr off);
+
+        [RequiredByBartok]
+        internal static void LogValHeapFast(Object obj,
+                                            UIntPtr off);
+
+        [RequiredByBartok]
+        internal static void LogValHeap(Object obj,
+                                        UIntPtr off,
+                                        TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogValHeapFast(Object obj,
+                                            UIntPtr off,
+                                            TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogValStatic(UIntPtr addr);
+
+        [RequiredByBartok]
+        internal static void LogValStaticFast(UIntPtr addr);
+
+        [RequiredByBartok]
+        internal static void LogValStatic(UIntPtr addr,
+                                          TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogValStaticFast(UIntPtr addr,
+                                              TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogRefHeap(Object obj,
+                                        UIntPtr off);
+
+        [RequiredByBartok]
+        internal static void LogRefStatic(UIntPtr addr);
+
+        [RequiredByBartok]
+        internal static void LogRefHeapFast(Object obj,
+                                            UIntPtr off);
+
+        [RequiredByBartok]
+        internal static void LogRefStaticFast(UIntPtr addr);
+
+        [RequiredByBartok]
+        internal static void LogRefHeap(Object obj,
+                                        UIntPtr off,
+                                        TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogRefStatic(UIntPtr addr,
+                                          TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogRefHeapFast(Object obj,
+                                            UIntPtr off,
+                                            TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogRefStaticFast(UIntPtr addr,
+                                              TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogIndirectRef(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void LogIndirectRefFast(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void LogIndirectRef(UIntPtr pobj,
+                                            TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogIndirectRefFast(UIntPtr pobj,
+                                                TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogIndirectValMultiple(UIntPtr pobj,
+                                                    UIntPtr size);
+
+        [RequiredByBartok]
+        internal static void LogIndirectValMultipleFast(UIntPtr pobj,
+                                                        UIntPtr size);
+
+        [RequiredByBartok]
+        internal static void LogIndirectValMultiple(UIntPtr pobj,
+                                                    UIntPtr size,
+                                                    TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogIndirectValMultipleFast(UIntPtr pobj,
+                                                        UIntPtr size,
+                                                        TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogIndirectVal(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void LogIndirectValFast(UIntPtr pobj);
+
+        [RequiredByBartok]
+        internal static void LogIndirectVal(UIntPtr pobj,
+                                            TryAllManager m);
+
+        [RequiredByBartok]
+        internal static void LogIndirectValFast(UIntPtr pobj,
+                                                TryAllManager m);
+
+        //----------------------------------------------------------------------
+
+        public static bool InTryAll {
+            get;
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Per-call-site profiling.
+        //
+        // If /TryAllPerCallSiteProfiling is enabled then Bartok will generate calls
+        // to UnsafeSetCallSite just before each Enlist* or Log* instruction.  This
+        // call supplies an integer value that uniquely identifies the call sit.
+        //
+        // The Enlist* and Log* operations are responsible for calling CountAsLogged
+        // if they write to the log.
+        //
+        // The counting is best effort because a single shared call site ID
+        // is kept at runtime and shared count arrays are used.  This code is
+        // intended for single-threaded use when developing optimizations to
+        // reduce the calls made onto Enlist* and Log* functions.
+
+        [RequiredByBartok]
+        public static void UnsafeSetCallSite(int i);
+    }
+}
diff --git a/base/Interfaces/Bartok/TryAllException.csi b/base/Interfaces/Bartok/TryAllException.csi
new file mode 100644
index 0000000..8203571
--- /dev/null
+++ b/base/Interfaces/Bartok/TryAllException.csi
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+namespace System {
+  public sealed class TryAllFakeException : Exception {}
+  public sealed class AtomicFakeException : Exception {}
+}
diff --git a/base/Interfaces/Bartok/VarargList.csi b/base/Interfaces/Bartok/VarargList.csi
new file mode 100644
index 0000000..6122adc
--- /dev/null
+++ b/base/Interfaces/Bartok/VarargList.csi
@@ -0,0 +1,19 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+namespace System
+{
+    [RequiredByBartok]
+    public struct VarargList
+    {
+#if !DONT_DO_BARTOK
+        private int count;
+#endif
+        [RequiredByBartok]
+        private static VarargList Create(int count);
+    }
+}
diff --git a/base/Interfaces/Bartok/Win32.csi b/base/Interfaces/Bartok/Win32.csi
new file mode 100644
index 0000000..11efad7
--- /dev/null
+++ b/base/Interfaces/Bartok/Win32.csi
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Win32 {
+    [RequiredByBartok]
+    public class Win32Native
+    {
+        public Win32Native();
+
+        public void Nothing();
+    }
+}
+
diff --git a/base/Interfaces/Bartok/WriteBarrierCMS.csi b/base/Interfaces/Bartok/WriteBarrierCMS.csi
new file mode 100644
index 0000000..19b2746
--- /dev/null
+++ b/base/Interfaces/Bartok/WriteBarrierCMS.csi
@@ -0,0 +1,16 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    internal unsafe class WriteBarrierCMS {
+
+        internal static unsafe void ObjWriteBarrier(Object obj); 
+
+        internal static unsafe void LocWriteBarrier(UIntPtr *addr,
+                                                    UIntPtr value);
+
+    }
+
+}
diff --git a/base/Interfaces/Baseattrs/AccessedThroughPropertyAttribute.csi b/base/Interfaces/Baseattrs/AccessedThroughPropertyAttribute.csi
new file mode 100644
index 0000000..4d8dbef
--- /dev/null
+++ b/base/Interfaces/Baseattrs/AccessedThroughPropertyAttribute.csi
@@ -0,0 +1,20 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\AccessedThroughPropertyAttribute.uex' path='docs/doc[@for="AccessedThroughPropertyAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field)]
+    public sealed class AccessedThroughPropertyAttribute : Attribute
+    {
+        //| <include file='doc\AccessedThroughPropertyAttribute.uex' path='docs/doc[@for="AccessedThroughPropertyAttribute.AccessedThroughPropertyAttribute"]/*' />
+        public AccessedThroughPropertyAttribute(string propertyName);
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/AssemblyFileVersionAttribute.csi b/base/Interfaces/Baseattrs/AssemblyFileVersionAttribute.csi
new file mode 100644
index 0000000..c25038f
--- /dev/null
+++ b/base/Interfaces/Baseattrs/AssemblyFileVersionAttribute.csi
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  AssemblyFileVersionAttribute
+**
+**
+** Purpose: Instructs a compiler to use a particular
+**          file version number for this assembly.
+**
+** Date:  December 8, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.Reflection {
+
+    //| <include file='doc\AssemblyFileVersionAttribute.uex' path='docs/doc[@for="AssemblyFileVersionAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyFileVersionAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyFileVersionAttribute.uex' path='docs/doc[@for="AssemblyFileVersionAttribute.AssemblyFileVersionAttribute"]/*' />
+        public AssemblyFileVersionAttribute(String version);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/AssemblyReflectionAttributes.csi b/base/Interfaces/Baseattrs/AssemblyReflectionAttributes.csi
new file mode 100644
index 0000000..7cc3220
--- /dev/null
+++ b/base/Interfaces/Baseattrs/AssemblyReflectionAttributes.csi
@@ -0,0 +1,91 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** File: AssemblyReflectionAttributes.cool
+**
+**
+** Purpose: For Assembly-related reflection custom attributes.
+**
+** Date: April 12, 2000
+**
+=============================================================================*/
+
+using System;
+
+namespace System.Reflection {
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyCopyrightAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyCopyrightAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyCopyrightAttribute.AssemblyCopyrightAttribute"]/*' />
+        public AssemblyCopyrightAttribute(String copyright);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyTrademarkAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyTrademarkAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyTrademarkAttribute.AssemblyTrademarkAttribute"]/*' />
+        public AssemblyTrademarkAttribute(String trademark);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyProductAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyProductAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyProductAttribute.AssemblyProductAttribute"]/*' />
+        public AssemblyProductAttribute(String product);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyCompanyAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyCompanyAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyCompanyAttribute.AssemblyCompanyAttribute"]/*' />
+        public AssemblyCompanyAttribute(String company);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyDescriptionAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyDescriptionAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyDescriptionAttribute.AssemblyDescriptionAttribute"]/*' />
+        public AssemblyDescriptionAttribute(String description);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyTitleAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyTitleAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyTitleAttribute.AssemblyTitleAttribute"]/*' />
+        public AssemblyTitleAttribute(String title);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyConfigurationAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyConfigurationAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyConfigurationAttribute.AssemblyConfigurationAttribute"]/*' />
+        public AssemblyConfigurationAttribute(String configuration);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyDefaultAliasAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyDefaultAliasAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyDefaultAliasAttribute.AssemblyDefaultAliasAttribute"]/*' />
+        public AssemblyDefaultAliasAttribute(String defaultAlias);
+    }
+
+    //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyInformationalVersionAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyInformationalVersionAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyReflectionAttributes.uex' path='docs/doc[@for="AssemblyInformationalVersionAttribute.AssemblyInformationalVersionAttribute"]/*' />
+        public AssemblyInformationalVersionAttribute(String informationalVersion);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/BaseAttrs.csi b/base/Interfaces/Baseattrs/BaseAttrs.csi
new file mode 100644
index 0000000..9fab0ae
--- /dev/null
+++ b/base/Interfaces/Baseattrs/BaseAttrs.csi
@@ -0,0 +1,16 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BaseAttrs.csi
+//
+//  Note:
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Baseattrs/Baseattrs.csproj b/base/Interfaces/Baseattrs/Baseattrs.csproj
new file mode 100644
index 0000000..c9156bd
--- /dev/null
+++ b/base/Interfaces/Baseattrs/Baseattrs.csproj
@@ -0,0 +1,57 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\BaseAttrs\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Baseattrs</AssemblyName>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+    <OutputType>Library</OutputType>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="AccessedThroughPropertyAttribute.csi" />
+    <Compile Include="AssemblyFileVersionAttribute.csi" />
+    <Compile Include="AssemblyReflectionAttributes.csi" />
+    <Compile Include="CLSCompliantAttribute.csi" />
+    <Compile Include="CompilerGlobalScopeAttribute.csi" />
+    <Compile Include="ConditionalAttribute.csi" />
+    <Compile Include="CustomConstantAttribute.csi" />
+    <Compile Include="DateTimeConstantAttribute.csi" />
+    <Compile Include="DebuggerAttributes.csi" />
+    <Compile Include="DecimalConstantAttribute.csi" />
+    <Compile Include="DiscardableAttribute.csi" />
+    <Compile Include="IndexerNameAttribute.csi" />
+    <Compile Include="InteropServices.csi" />
+    <Compile Include="IsVolatile.csi" />
+    <Compile Include="LayoutKind.csi" />
+    <Compile Include="MethodImplAttribute.csi" />
+    <Compile Include="NeutralResourcesLanguageAttribute.csi" />
+    <Compile Include="ObsoleteAttribute.csi" />
+    <Compile Include="ParamArrayAttribute.csi" />
+    <Compile Include="RequiredAttributeAttribute.csi" />
+    <Compile Include="SatelliteContractVersionAttribute.csi" />
+    <Compile Include="SecurityAttributes.csi" />
+    <Compile Include="ThreadStaticAttribute.csi" />
+    <Compile Include="BaseAttrs.csi" />
+    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Baseattrs/CLSCompliantAttribute.csi b/base/Interfaces/Baseattrs/CLSCompliantAttribute.csi
new file mode 100644
index 0000000..49f57ba
--- /dev/null
+++ b/base/Interfaces/Baseattrs/CLSCompliantAttribute.csi
@@ -0,0 +1,25 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: CLSCompliantAttribute
+**
+**
+** Purpose: Container for assemblies.
+**
+** Date: Jan 28, 2000
+**
+=============================================================================*/
+
+namespace System {
+    //| <include file='doc\CLSCompliantAttribute.uex' path='docs/doc[@for="CLSCompliantAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.All, Inherited=true, AllowMultiple=false)]
+    public sealed class CLSCompliantAttribute : Attribute
+    {
+        //| <include file='doc\CLSCompliantAttribute.uex' path='docs/doc[@for="CLSCompliantAttribute.CLSCompliantAttribute"]/*' />
+        public CLSCompliantAttribute (bool isCompliant);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/CompilerGlobalScopeAttribute.csi b/base/Interfaces/Baseattrs/CompilerGlobalScopeAttribute.csi
new file mode 100644
index 0000000..902b47e
--- /dev/null
+++ b/base/Interfaces/Baseattrs/CompilerGlobalScopeAttribute.csi
@@ -0,0 +1,30 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  CompilerGlobalScopeAttribute
+**
+**
+** Purpose: Attribute used to communicate to the VS7 debugger
+**          that a class should be treated as if it has
+**          global scope.
+**
+** Date:  Aug 09, 2000
+**
+===========================================================*/
+
+
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\CompilerGlobalScopeAttribute.uex' path='docs/doc[@for="CompilerGlobalScopeAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class)]
+    public class CompilerGlobalScopeAttribute : Attribute
+    {
+       //| <include file='doc\CompilerGlobalScopeAttribute.uex' path='docs/doc[@for="CompilerGlobalScopeAttribute.CompilerGlobalScopeAttribute"]/*' />
+       public CompilerGlobalScopeAttribute ();
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/ConditionalAttribute.csi b/base/Interfaces/Baseattrs/ConditionalAttribute.csi
new file mode 100644
index 0000000..c18384c
--- /dev/null
+++ b/base/Interfaces/Baseattrs/ConditionalAttribute.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+using System;
+
+namespace System.Diagnostics {
+    //| <include file='doc\ConditionalAttribute.uex' path='docs/doc[@for="ConditionalAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple=true)]
+    public sealed class ConditionalAttribute : Attribute
+    {
+    //| <include file='doc\ConditionalAttribute.uex' path='docs/doc[@for="ConditionalAttribute.ConditionalAttribute"]/*' />
+        public ConditionalAttribute(String conditionString);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/CustomConstantAttribute.csi b/base/Interfaces/Baseattrs/CustomConstantAttribute.csi
new file mode 100644
index 0000000..01a3146
--- /dev/null
+++ b/base/Interfaces/Baseattrs/CustomConstantAttribute.csi
@@ -0,0 +1,14 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\CustomConstantAttribute.uex' path='docs/doc[@for="CustomConstantAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter, Inherited=false)]
+    public abstract class CustomConstantAttribute : Attribute
+    {
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/DateTimeConstantAttribute.csi b/base/Interfaces/Baseattrs/DateTimeConstantAttribute.csi
new file mode 100644
index 0000000..e2df0fa
--- /dev/null
+++ b/base/Interfaces/Baseattrs/DateTimeConstantAttribute.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\DateTimeConstantAttribute.uex' path='docs/doc[@for="DateTimeConstantAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter, Inherited=false)]
+    public sealed class DateTimeConstantAttribute : CustomConstantAttribute
+    {
+        //| <include file='doc\DateTimeConstantAttribute.uex' path='docs/doc[@for="DateTimeConstantAttribute.DateTimeConstantAttribute"]/*' />
+        public DateTimeConstantAttribute(long ticks);
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/DebuggerAttributes.csi b/base/Interfaces/Baseattrs/DebuggerAttributes.csi
new file mode 100644
index 0000000..cbbe3a0
--- /dev/null
+++ b/base/Interfaces/Baseattrs/DebuggerAttributes.csi
@@ -0,0 +1,57 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  DebuggerAttributes
+**
+**
+** Purpose: Attributes for debugger
+**
+** Date:  Feb 01, 2000
+**
+===========================================================*/
+
+namespace System.Diagnostics {
+    //| <include file='doc\DebuggerAttributes.uex' path='docs/doc[@for="DebuggerStepThroughAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class |
+                    AttributeTargets.Struct |
+                    AttributeTargets.Method |
+                    AttributeTargets.Constructor, Inherited = false)]
+    public sealed class DebuggerStepThroughAttribute : Attribute
+    {
+        //| <include file='doc\DebuggerAttributes.uex' path='docs/doc[@for="DebuggerStepThroughAttribute.DebuggerStepThroughAttribute"]/*' />
+        public DebuggerStepThroughAttribute();
+    }
+
+    //| <include file='doc\DebuggerAttributes.uex' path='docs/doc[@for="DebuggerHiddenAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Method |
+                    AttributeTargets.Property |
+                    AttributeTargets.Constructor, Inherited = false)]
+    public sealed class DebuggerHiddenAttribute : Attribute
+    {
+       //| <include file='doc\DebuggerAttributes.uex' path='docs/doc[@for="DebuggerHiddenAttribute.DebuggerHiddenAttribute"]/*' />
+       public DebuggerHiddenAttribute();
+    }
+
+   // Attribute class used by the compiler to mark modules.
+    // If present, then debugging information for everything in the
+   // assembly was generated by the compiler, and will be preserved
+   // by the Runtime so that the debugger can provide full functionality
+   // in the case of JIT attach. If not present, then the compiler may
+   // or may not have included debugging information, and the Runtime
+   // won't preserve the debugging info, which will make debugging after
+   // a JIT attach difficult.
+    //| <include file='doc\DebuggerAttributes.uex' path='docs/doc[@for="DebuggableAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly|
+                    AttributeTargets.Module, AllowMultiple = false)]
+    public sealed class DebuggableAttribute : Attribute
+    {
+        //| <include file='doc\DebuggerAttributes.uex' path='docs/doc[@for="DebuggableAttribute.DebuggableAttribute"]/*' />
+        public DebuggableAttribute(bool isJITTrackingEnabled,
+                                   bool isJITOptimizerDisabled);
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/DecimalConstantAttribute.csi b/base/Interfaces/Baseattrs/DecimalConstantAttribute.csi
new file mode 100644
index 0000000..bf0bab0
--- /dev/null
+++ b/base/Interfaces/Baseattrs/DecimalConstantAttribute.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\DecimalConstantAttribute.uex' path='docs/doc[@for="DecimalConstantAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field |
+                    AttributeTargets.Parameter, Inherited=false)]
+    [CLSCompliant(false)]
+    public sealed class DecimalConstantAttribute : Attribute
+    {
+        //| <include file='doc\DecimalConstantAttribute.uex' path='docs/doc[@for="DecimalConstantAttribute.DecimalConstantAttribute"]/*' />
+        public DecimalConstantAttribute(byte scale, byte sign, uint hi, uint mid, uint low);
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/DiscardableAttribute.csi b/base/Interfaces/Baseattrs/DiscardableAttribute.csi
new file mode 100644
index 0000000..d52504c
--- /dev/null
+++ b/base/Interfaces/Baseattrs/DiscardableAttribute.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+    // Custom attribute to indicating a TypeDef is a discardable attribute
+    //| <include file='doc\DiscardableAttribute.uex' path='docs/doc[@for="DiscardableAttribute"]/*' />
+    public class DiscardableAttribute : Attribute
+    {
+        //| <include file='doc\DiscardableAttribute.uex' path='docs/doc[@for="DiscardableAttribute.DiscardableAttribute"]/*' />
+        public DiscardableAttribute();
+    }
+}
diff --git a/base/Interfaces/Baseattrs/IndexerNameAttribute.csi b/base/Interfaces/Baseattrs/IndexerNameAttribute.csi
new file mode 100644
index 0000000..70d36ce
--- /dev/null
+++ b/base/Interfaces/Baseattrs/IndexerNameAttribute.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\IndexerNameAttribute.uex' path='docs/doc[@for="IndexerNameAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Property, Inherited = true)]
+    public sealed class IndexerNameAttribute: Attribute
+    {
+        //| <include file='doc\IndexerNameAttribute.uex' path='docs/doc[@for="IndexerNameAttribute.IndexerNameAttribute"]/*' />
+        public IndexerNameAttribute(String indexerName);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/InteropServices.csi b/base/Interfaces/Baseattrs/InteropServices.csi
new file mode 100644
index 0000000..6b736e7
--- /dev/null
+++ b/base/Interfaces/Baseattrs/InteropServices.csi
@@ -0,0 +1,89 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace System.Runtime.InteropServices {
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="GuidAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly |
+                    AttributeTargets.Interface |
+                    AttributeTargets.Class |
+                    AttributeTargets.Enum |
+                    AttributeTargets.Struct |
+                    AttributeTargets.Delegate, Inherited = false)]
+    public sealed class GuidAttribute : Attribute
+    {
+        public GuidAttribute(String guid);
+    }
+
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="InAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    public sealed class InAttribute : Attribute
+    {
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="InAttribute.InAttribute"]/*' />
+        public InAttribute();
+    }
+
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="OutAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    public sealed class OutAttribute : Attribute
+    {
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="OutAttribute.OutAttribute"]/*' />
+        public OutAttribute();
+    }
+
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="OptionalAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    public sealed class OptionalAttribute : Attribute
+    {
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="OptionalAttribute.OptionalAttribute"]/*' />
+        public OptionalAttribute();
+    }
+
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="StructLayoutAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class |
+                    AttributeTargets.Struct, Inherited = false)]
+    public sealed class StructLayoutAttribute : Attribute
+    {
+        public StructLayoutAttribute(LayoutKind layoutKind);
+
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="StructLayoutAttribute.StructLayoutAttribute1"]/*' />
+        public StructLayoutAttribute(short layoutKind);
+
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="StructLayoutAttribute.Pack"]/*' />
+        public int  Pack;
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="StructLayoutAttribute.Size"]/*' />
+        public int  Size;
+    }
+
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="FieldOffsetAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field, Inherited = false)]
+    public sealed class FieldOffsetAttribute : Attribute
+    {
+        public FieldOffsetAttribute(int offset);
+    }
+
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="ComCompatibleVersionAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    public sealed class ComCompatibleVersionAttribute : Attribute
+    {
+        //| <include file='doc\Attributes.uex' path='docs/doc[@for="ComCompatibleVersionAttribute.ComCompatibleVersionAttribute"]/*' />
+        public ComCompatibleVersionAttribute(int major, int minor, int build, int revision);
+    }
+
+    public enum GCOption {
+        NONE = 0,
+        GCFRIEND = 1,
+        NOGC = 2,
+        NOSTGC = 3,
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
+    public sealed class GCAnnotationAttribute : Attribute {
+        public GCAnnotationAttribute(GCOption options );
+    }
+}
diff --git a/base/Interfaces/Baseattrs/IsVolatile.csi b/base/Interfaces/Baseattrs/IsVolatile.csi
new file mode 100644
index 0000000..34d0c0f
--- /dev/null
+++ b/base/Interfaces/Baseattrs/IsVolatile.csi
@@ -0,0 +1,13 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    //| <include path='docs/doc[@for="IsVolatile"]/*' />
+    public sealed class IsVolatile
+    {
+    }
+}
+
diff --git a/base/Interfaces/Baseattrs/LayoutKind.csi b/base/Interfaces/Baseattrs/LayoutKind.csi
new file mode 100644
index 0000000..70a2d70
--- /dev/null
+++ b/base/Interfaces/Baseattrs/LayoutKind.csi
@@ -0,0 +1,22 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace System.Runtime.InteropServices {
+    // Used in the StructLayoutAttribute class
+    //| <include file='doc\LayoutKind.uex' path='docs/doc[@for="LayoutKind"]/*' />
+    public enum LayoutKind
+    {
+        //| <include file='doc\LayoutKind.uex' path='docs/doc[@for="LayoutKind.Sequential"]/*' />
+        Sequential      = 0, // 0x00000008,
+        //| <include file='doc\LayoutKind.uex' path='docs/doc[@for="LayoutKind.Explicit"]/*' />
+        Explicit        = 2, // 0x00000010,
+        //| <include file='doc\LayoutKind.uex' path='docs/doc[@for="LayoutKind.Auto"]/*' />
+        Auto            = 3, // 0x00000000,
+    }
+}
diff --git a/base/Interfaces/Baseattrs/MethodImplAttribute.csi b/base/Interfaces/Baseattrs/MethodImplAttribute.csi
new file mode 100644
index 0000000..d0d1628
--- /dev/null
+++ b/base/Interfaces/Baseattrs/MethodImplAttribute.csi
@@ -0,0 +1,44 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+    // This Enum matches the miImpl flags defined in corhdr.h. It is used to specify
+    // certain method properties.
+
+    //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplOptions"]/*' />
+    [Flags]
+    public enum MethodImplOptions
+    {
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplOptions.Unmanaged"]/*' />
+        Unmanaged       =   0x0004,
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplOptions.ForwardRef"]/*' />
+        ForwardRef      =   0x0010,
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplOptions.InternalCall"]/*' />
+        InternalCall    =   0x1000,
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplOptions.Synchronized"]/*' />
+        Synchronized    =   0x0020,
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplOptions.NoInlining"]/*' />
+        NoInlining      =   0x0008,
+    }
+
+    // Custom attribute to specify additional method properties.
+    //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor, Inherited = false)]
+    sealed public class MethodImplAttribute : Attribute
+    {
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplAttribute.MethodImplAttribute"]/*' />
+        public MethodImplAttribute(MethodImplOptions methodImplOptions);
+
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplAttribute.MethodImplAttribute1"]/*' />
+        public MethodImplAttribute(short value);
+
+        //| <include file='doc\MethodImplAttribute.uex' path='docs/doc[@for="MethodImplAttribute.MethodImplAttribute2"]/*' />
+        public MethodImplAttribute();
+    }
+}
diff --git a/base/Interfaces/Baseattrs/NeutralResourcesLanguageAttribute.csi b/base/Interfaces/Baseattrs/NeutralResourcesLanguageAttribute.csi
new file mode 100644
index 0000000..07107b2
--- /dev/null
+++ b/base/Interfaces/Baseattrs/NeutralResourcesLanguageAttribute.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Resources {
+
+    //| <include file='doc\NeutralResourcesLanguageAttribute.uex' path='docs/doc[@for="NeutralResourcesLanguageAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class NeutralResourcesLanguageAttribute : Attribute
+    {
+        //| <include file='doc\NeutralResourcesLanguageAttribute.uex' path='docs/doc[@for="NeutralResourcesLanguageAttribute.NeutralResourcesLanguageAttribute"]/*' />
+        public NeutralResourcesLanguageAttribute(String cultureName);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/ObsoleteAttribute.csi b/base/Interfaces/Baseattrs/ObsoleteAttribute.csi
new file mode 100644
index 0000000..13e3046
--- /dev/null
+++ b/base/Interfaces/Baseattrs/ObsoleteAttribute.csi
@@ -0,0 +1,43 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  ObsoleteAttribute
+**
+**
+** Purpose: Attribute for functions, etc that will be removed.
+**
+** Date:  September 22, 1999
+**
+===========================================================*/
+namespace System {
+
+    // This attribute is attached to members that are not to be used any longer.
+    // Message is some human readable explanation of what to use
+    // Error indicates if the compiler should treat usage of such a method as an
+    //   error. (this would be used if the actual implementation of the obsolete
+    //   method's implementation had changed).
+    //
+    // Issue: do we need to be able to localize this message string?
+    //
+    //| <include file='doc\ObsoleteAttribute.uex' path='docs/doc[@for="ObsoleteAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum |
+                    AttributeTargets.Interface | AttributeTargets.Constructor |
+                    AttributeTargets.Method| AttributeTargets.Property  |
+                    AttributeTargets.Field | AttributeTargets.Event |
+                    AttributeTargets.Delegate, Inherited = false)]
+    public sealed class ObsoleteAttribute : Attribute
+    {
+        //| <include file='doc\ObsoleteAttribute.uex' path='docs/doc[@for="ObsoleteAttribute.ObsoleteAttribute"]/*' />
+        public ObsoleteAttribute();
+
+        //| <include file='doc\ObsoleteAttribute.uex' path='docs/doc[@for="ObsoleteAttribute.ObsoleteAttribute1"]/*' />
+        public ObsoleteAttribute(String message);
+
+        //| <include file='doc\ObsoleteAttribute.uex' path='docs/doc[@for="ObsoleteAttribute.ObsoleteAttribute2"]/*' />
+        public ObsoleteAttribute(String message, bool error);
+    }
+}
diff --git a/base/Interfaces/Baseattrs/ParamArrayAttribute.csi b/base/Interfaces/Baseattrs/ParamArrayAttribute.csi
new file mode 100644
index 0000000..613490f
--- /dev/null
+++ b/base/Interfaces/Baseattrs/ParamArrayAttribute.csi
@@ -0,0 +1,26 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ParamArrayAttribute
+**
+**
+** Purpose: Container for assemblies.
+**
+** Date: Mar 01, 2000
+**
+=============================================================================*/
+namespace System
+{
+//This class contains only static members and does not need to be serializable
+   //| <include file='doc\ParamArrayAttribute.uex' path='docs/doc[@for="ParamArrayAttribute"]/*' />
+   [AttributeUsage(AttributeTargets.Parameter, Inherited=true, AllowMultiple=false)]
+   public sealed class ParamArrayAttribute : Attribute
+   {
+      //| <include file='doc\ParamArrayAttribute.uex' path='docs/doc[@for="ParamArrayAttribute.ParamArrayAttribute"]/*' />
+      public ParamArrayAttribute ();
+   }
+}
diff --git a/base/Interfaces/Baseattrs/RequiredAttributeAttribute.csi b/base/Interfaces/Baseattrs/RequiredAttributeAttribute.csi
new file mode 100644
index 0000000..7e6c61f
--- /dev/null
+++ b/base/Interfaces/Baseattrs/RequiredAttributeAttribute.csi
@@ -0,0 +1,21 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+using System;
+
+namespace System.Runtime.CompilerServices
+{
+    //| <include file='doc\RequiredAttributeAttribute.uex' path='docs/doc[@for="RequiredAttributeAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Interface,
+                    AllowMultiple=false, Inherited=false)]
+    public sealed class RequiredAttributeAttribute : Attribute
+    {
+        //| <include file='doc\RequiredAttributeAttribute.uex' path='docs/doc[@for="RequiredAttributeAttribute.RequiredAttributeAttribute"]/*' />
+        public RequiredAttributeAttribute (Type requiredContract);
+
+        //| <include file='doc\RequiredAttributeAttribute.uex' path='docs/doc[@for="RequiredAttributeAttribute.RequiredContract"]/*' />
+        public Type RequiredContract { get; }
+    }
+}
diff --git a/base/Interfaces/Baseattrs/SatelliteContractVersionAttribute.csi b/base/Interfaces/Baseattrs/SatelliteContractVersionAttribute.csi
new file mode 100644
index 0000000..7dfbff3
--- /dev/null
+++ b/base/Interfaces/Baseattrs/SatelliteContractVersionAttribute.csi
@@ -0,0 +1,32 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  SatelliteContractVersionAttribute
+**
+**
+** Purpose: Specifies which version of a satellite assembly
+**          the ResourceManager should ask for.
+**
+** Date:  December 8, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.Resources {
+
+    //| <include file='doc\SatelliteContractVersionAttribute.uex' path='docs/doc[@for="SatelliteContractVersionAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class SatelliteContractVersionAttribute : Attribute
+    {
+        //| <include file='doc\SatelliteContractVersionAttribute.uex' path='docs/doc[@for="SatelliteContractVersionAttribute.SatelliteContractVersionAttribute"]/*' />
+        public SatelliteContractVersionAttribute(String version);
+
+        //| <include file='doc\SatelliteContractVersionAttribute.uex' path='docs/doc[@for="SatelliteContractVersionAttribute.Version"]/*' />
+        public String Version { get; }
+    }
+}
diff --git a/base/Interfaces/Baseattrs/SecurityAttributes.csi b/base/Interfaces/Baseattrs/SecurityAttributes.csi
new file mode 100644
index 0000000..5983740
--- /dev/null
+++ b/base/Interfaces/Baseattrs/SecurityAttributes.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Security
+{
+    // UnverifiableCodeAttribute:
+    //  Indicates that the target module contains unverifiable code.
+    //| <include file='doc\Attributes.uex' path='docs/doc[@for="UnverifiableCodeAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Module, AllowMultiple = true, Inherited = false )]
+    sealed public class UnverifiableCodeAttribute : System.Attribute
+    {
+    }
+}
diff --git a/base/Interfaces/Baseattrs/ThreadStaticAttribute.csi b/base/Interfaces/Baseattrs/ThreadStaticAttribute.csi
new file mode 100644
index 0000000..f4d0223
--- /dev/null
+++ b/base/Interfaces/Baseattrs/ThreadStaticAttribute.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** File:        ThreadStaticAttribute.cool
+**
+** Author(s):   Tarun Anand    (TarunA)
+**
+** Purpose:     Custom attribute to indicate that the field should be treated
+**              as a static relative to a thread.
+**
+**
+** Date:        Jan 18, 2000
+**
+===========================================================*/
+namespace System {
+
+    //| <include file='doc\ThreadStaticAttribute.uex' path='docs/doc[@for="ThreadStaticAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field, Inherited = false)]
+    public class  ThreadStaticAttribute : Attribute
+    {
+        //| <include file='doc\ThreadStaticAttribute.uex' path='docs/doc[@for="ThreadStaticAttribute.ThreadStaticAttribute"]/*' />
+        public ThreadStaticAttribute();
+    }
+}
diff --git a/base/Interfaces/Basetypes/ArgumentException.csi b/base/Interfaces/Basetypes/ArgumentException.csi
new file mode 100644
index 0000000..12bdb14
--- /dev/null
+++ b/base/Interfaces/Basetypes/ArgumentException.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArgumentException
+**
+**
+** Purpose: Exception class for invalid arguments to a method.
+**
+** Date: March 24, 1998
+**
+=============================================================================*/
+
+using System;
+
+namespace System {
+
+    // The ArgumentException is thrown when an argument does not meet
+    // the contract of the method.  Ideally it should give a meaningful error
+    // message describing what was wrong and which parameter is incorrect.
+    //
+    //| <include file='doc\ArgumentException.uex' path='docs/doc[@for="ArgumentException"]/*' />
+    public class ArgumentException : SystemException {
+        public ArgumentException();
+        public ArgumentException(String message);
+        public ArgumentException(String message, Exception innerException);
+        public ArgumentException(String message, String paramName, Exception innerException);
+        public ArgumentException(String message, String paramName);
+    }
+}
diff --git a/base/Interfaces/Basetypes/ArgumentNullException.csi b/base/Interfaces/Basetypes/ArgumentNullException.csi
new file mode 100644
index 0000000..803b15c
--- /dev/null
+++ b/base/Interfaces/Basetypes/ArgumentNullException.csi
@@ -0,0 +1,21 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System {
+
+    // The ArgumentException is thrown when an argument
+    // is null when it shouldn't be.
+    //
+    //| <include file='doc\ArgumentNullException.uex' path='docs/doc[@for="ArgumentNullException"]/*' />
+    public class ArgumentNullException : ArgumentException
+    {
+        public ArgumentNullException();
+        public ArgumentNullException(String paramName);
+        public ArgumentNullException(String paramName, String message);
+    }
+}
diff --git a/base/Interfaces/Basetypes/ArgumentOutOfRangeException.csi b/base/Interfaces/Basetypes/ArgumentOutOfRangeException.csi
new file mode 100644
index 0000000..874493b
--- /dev/null
+++ b/base/Interfaces/Basetypes/ArgumentOutOfRangeException.csi
@@ -0,0 +1,26 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    // The ArgumentOutOfRangeException is thrown when an argument
+    // is outside the legal range for that argument.  This may often be caused
+    // by
+    //
+    //| <include file='doc\ArgumentOutOfRangeException.uex' path='docs/doc[@for="ArgumentOutOfRangeException"]/*' />
+    [RequiredByBartok]
+    public class ArgumentOutOfRangeException : ArgumentException {
+
+        public ArgumentOutOfRangeException();
+        public ArgumentOutOfRangeException(String paramName);
+        public ArgumentOutOfRangeException(String paramName, String message);
+        public ArgumentOutOfRangeException(String paramName,
+                                           Object actualValue, String message);
+    }
+}
diff --git a/base/Interfaces/Basetypes/ArithmeticException.csi b/base/Interfaces/Basetypes/ArithmeticException.csi
new file mode 100644
index 0000000..4a39b73
--- /dev/null
+++ b/base/Interfaces/Basetypes/ArithmeticException.csi
@@ -0,0 +1,26 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArithmeticException
+**
+**
+** Purpose: Exception class for bad arithmetic conditions!
+**
+** Date: March 17, 1998
+**
+=============================================================================*/
+using System.Runtime.CompilerServices;
+
+namespace System {
+    [RequiredByBartok]
+    public class ArithmeticException : SystemException
+    {
+        public ArithmeticException();
+        public ArithmeticException(String message);
+        public ArithmeticException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Array.csi b/base/Interfaces/Basetypes/Array.csi
new file mode 100644
index 0000000..e56205b
--- /dev/null
+++ b/base/Interfaces/Basetypes/Array.csi
@@ -0,0 +1,141 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Collections;
+
+namespace System
+{
+    public abstract class Array : ICloneable, ICollection, IEnumerable, IList
+    {
+        // IEnumerable
+        public virtual IEnumerator GetEnumerator();
+
+        // ICollection (from IList)
+        public int Count { get; }
+
+        // IList
+        public Object this[int index] {
+            get;
+            set;
+        }
+        public int Add(Object value);
+        public bool Contains(Object value);
+        public void Clear();
+        public int IndexOf(Object value);
+        public void Insert(int index, Object value);
+        public void Remove(Object value);
+        public void RemoveAt(int index);
+
+        // Array
+        public static Array CreateInstance(Type elementType, int length);
+        public static Array CreateInstance(Type elementType, int length1, int length2);
+        public static Array CreateInstance(Type elementType,
+                                           int length1, int length2, int length3);
+
+        public static Array CreateInstance(Type elementType, params int[] lengths);
+        public static Array CreateInstance(Type elementType, params long[] lengths);
+
+        public static void Copy(bool[] srcArray, int srcOffset,
+                                bool[] dstArray, int dstOffset, int length);
+        public static void Copy(char[] srcArray, int srcOffset,
+                                char[] dstArray, int dstOffset, int length);
+        public static void Copy(sbyte[] srcArray, int srcOffset,
+                                sbyte[] dstArray, int dstOffset, int length);
+        public static void Copy(short[] srcArray, int srcOffset,
+                                short[] dstArray, int dstOffset, int length);
+        public static void Copy(int[] srcArray, int srcOffset,
+                                int[] dstArray, int dstOffset, int length);
+        public static void Copy(long[] srcArray, int srcOffset,
+                                long[] dstArray, int dstOffset, int length);
+        public static void Copy(byte[] srcArray, int srcOffset,
+                                byte[] dstArray, int dstOffset, int length);
+        public static void Copy(ushort[] srcArray, int srcOffset,
+                                ushort[] dstArray, int dstOffset, int length);
+        public static void Copy(uint[] srcArray, int srcOffset,
+                                uint[] dstArray, int dstOffset, int length);
+        public static void Copy(ulong[] srcArray, int srcOffset,
+                                ulong[] dstArray, int dstOffset, int length);
+        public static void Copy(float[] srcArray, int srcOffset,
+                                float[] dstArray, int dstOffset, int length);
+        public static void Copy(double[] srcArray, int srcOffset,
+                                double[] dstArray, int dstOffset, int length);
+        public static void Copy(Object[] srcArray, int srcOffset,
+                                Object[] dstArray, int dstOffset, int length);
+        public static void Copy(Array sourceArray, Array destinationArray, int length);
+        public static void Copy(Array sourceArray, Array destinationArray, long length);
+        public static void Copy(Array sourceArray, int sourceIndex,
+                                Array destinationArray, int destinationIndex, int length);
+
+        public static void Clear(Array array, int index, int length);
+
+        public Object GetValue(params int[] indices);
+        public Object GetValue(int index);
+        public Object GetValue(int index1, int index2);
+        public Object GetValue(int index1, int index2, int index3);
+
+        public Object GetValue(long index);
+        public Object GetValue(long index1, long index2);
+        public Object GetValue(long index1, long index2, long index3);
+        public Object GetValue(params long[] indices);
+
+        public void SetValue(Object value,int index);
+        public void SetValue(Object value,int index1, int index2);
+        public void SetValue(Object value,int index1, int index2, int index3);
+        public void SetValue(Object value,params int[] indices);
+
+        public void SetValue(Object value, long index);
+        public void SetValue(Object value, long index1, long index2);
+        public void SetValue(Object value, long index1, long index2, long index3);
+        public void SetValue(Object value, params long[] indices);
+
+        public int GetLength(int dimension);
+        public long GetLongLength(int dimension);
+
+        public int Length { get; }
+        public long LongLength { get; }
+
+        public int Rank { get; }
+
+        public int GetUpperBound(int dimension);
+        public int GetLowerBound(int dimension);
+
+        public virtual Object SyncRoot { get; }
+        public virtual bool IsReadOnly { get; }
+        public virtual bool IsFixedSize { get; }
+        public virtual bool IsSynchronized { get; }
+
+        public virtual Object Clone();
+
+        public static int BinarySearch(Array array, Object value);
+        public static int BinarySearch(Array array, int index, int length, Object value);
+        public static int BinarySearch(Array array, Object value, IComparer comparer);
+        public static int BinarySearch(Array array, int index, int length, Object value, IComparer comparer);
+
+        public virtual void CopyTo(Array array, int index);
+        public virtual void CopyTo(Array array, long index);
+
+        public static int IndexOf(Array array, Object value);
+        public static int IndexOf(Array array, Object value, int startIndex);
+        public static int IndexOf(Array array, Object value, int startIndex, int count);
+
+        public static int LastIndexOf(Array array, Object value);
+        public static int LastIndexOf(Array array, Object value, int startIndex);
+        public static int LastIndexOf(Array array, Object value, int startIndex, int count);
+
+        public static void Reverse(Array array);
+        public static void Reverse(Array array, int index, int length);
+
+        public static void Sort(Array array);
+        public static void Sort(Array keys, Array items);
+        public static void Sort(Array array, int index, int length);
+        public static void Sort(Array keys, Array items, int index, int length);
+        public static void Sort(Array array, IComparer comparer);
+        public static void Sort(Array keys, Array items, IComparer comparer);
+        public static void Sort(Array array, int index, int length, IComparer comparer);
+        public static void Sort(Array keys, Array items, int index, int length, IComparer comparer);
+        public void Initialize();
+    }
+}
diff --git a/base/Interfaces/Basetypes/AssemblyAttributes.csi b/base/Interfaces/Basetypes/AssemblyAttributes.csi
new file mode 100644
index 0000000..f07b3d4
--- /dev/null
+++ b/base/Interfaces/Basetypes/AssemblyAttributes.csi
@@ -0,0 +1,92 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** File: AssemblyAttributes
+**
+**
+** Purpose: For Assembly-related custom attributes.
+**
+** Date: April 12, 2000
+**
+=============================================================================*/
+
+using System;
+
+namespace System.Reflection {
+    public enum AssemblyHashAlgorithm
+    {
+        //| <include file='doc\AssemblyHashAlgorithm.uex' path='docs/doc[@for="AssemblyHashAlgorithm.None"]/*' />
+        None        = 0,
+        //| <include file='doc\AssemblyHashAlgorithm.uex' path='docs/doc[@for="AssemblyHashAlgorithm.MD5"]/*' />
+        MD5         = 0x8003,
+        //| <include file='doc\AssemblyHashAlgorithm.uex' path='docs/doc[@for="AssemblyHashAlgorithm.SHA1"]/*' />
+        SHA1        = 0x8004
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyCultureAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyCultureAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyCultureAttribute.AssemblyCultureAttribute"]/*' />
+        public AssemblyCultureAttribute(String culture);
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyVersionAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyVersionAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyVersionAttribute.AssemblyVersionAttribute"]/*' />
+        public AssemblyVersionAttribute(String version);
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyKeyFileAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyKeyFileAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyKeyFileAttribute.AssemblyKeyFileAttribute"]/*' />
+        public AssemblyKeyFileAttribute(String keyFile);
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyKeyNameAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyKeyNameAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyKeyNameAttribute.AssemblyKeyNameAttribute"]/*' />
+        public AssemblyKeyNameAttribute(String keyName);
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyDelaySignAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyDelaySignAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyDelaySignAttribute.AssemblyDelaySignAttribute"]/*' />
+        public AssemblyDelaySignAttribute(bool delaySign);
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyAlgorithmIdAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyAlgorithmIdAttribute : Attribute
+    {
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyAlgorithmIdAttribute.AssemblyAlgorithmIdAttribute"]/*' />
+        public AssemblyAlgorithmIdAttribute(AssemblyHashAlgorithm algorithmId);
+    }
+
+    //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyFlagsAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyFlagsAttribute : Attribute
+    {
+#if false
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyFlagsAttribute.AssemblyFlagsAttribute"]/*' />
+        [CLSCompliant(false)]
+        public AssemblyFlagsAttribute(uint flags);
+#endif
+
+        //| <include file='doc\AssemblyAttributes.uex' path='docs/doc[@for="AssemblyFlagsAttribute.AssemblyFlagsAttribute1"]/*' />
+        public AssemblyFlagsAttribute(int assemblyFlags);
+    }
+}
+
diff --git a/base/Interfaces/Basetypes/Attribute.csi b/base/Interfaces/Basetypes/Attribute.csi
new file mode 100644
index 0000000..d28345d
--- /dev/null
+++ b/base/Interfaces/Basetypes/Attribute.csi
@@ -0,0 +1,27 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Attribute
+**
+**
+** Purpose: The class used as an attribute to denote that
+**          another class can be used as an attribute.
+**
+** Date:  December 7, 1999
+**
+===========================================================*/
+using System;
+
+namespace System {
+
+    //| <include file='doc\Attribute.uex' path='docs/doc[@for="Attribute"]/*' />
+    [AttributeUsageAttribute(AttributeTargets.All, Inherited = true, AllowMultiple=false)] // Base class for all attributes
+    public abstract class Attribute {
+        //| <include file='doc\Attribute.uex' path='docs/doc[@for="Attribute.Attribute"]/*' />
+        protected Attribute();
+    }
+}
diff --git a/base/Interfaces/Basetypes/AttributeTargets.csi b/base/Interfaces/Basetypes/AttributeTargets.csi
new file mode 100644
index 0000000..e51af85
--- /dev/null
+++ b/base/Interfaces/Basetypes/AttributeTargets.csi
@@ -0,0 +1,52 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+using System;
+
+namespace System {
+
+    // Enum used to indicate all the elements of the
+    // VOS it is valid to attach this element to.
+    //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets"]/*' />
+    [Flags]
+    public enum AttributeTargets
+    {
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Assembly"]/*' />
+        Assembly      = 0x0001,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Module"]/*' />
+        Module        = 0x0002,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Class"]/*' />
+        Class         = 0x0004,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Struct"]/*' />
+        Struct        = 0x0008,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Enum"]/*' />
+        Enum          = 0x0010,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Constructor"]/*' />
+        Constructor   = 0x0020,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Method"]/*' />
+        Method        = 0x0040,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Property"]/*' />
+        Property      = 0x0080,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Field"]/*' />
+        Field         = 0x0100,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Event"]/*' />
+        Event         = 0x0200,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Interface"]/*' />
+        Interface     = 0x0400,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Parameter"]/*' />
+        Parameter     = 0x0800,
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.Delegate"]/*' />
+        Delegate      = 0x1000,
+
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.ReturnValue"]/*' />
+        ReturnValue   = 0x2000,
+
+        //| <include file='doc\AttributeTargets.uex' path='docs/doc[@for="AttributeTargets.All"]/*' />
+        All           = Assembly | Module   | Class | Struct | Enum      | Constructor |
+                        Method   | Property | Field | Event  | Interface | Parameter   | Delegate | ReturnValue,
+    }
+}
diff --git a/base/Interfaces/Basetypes/AttributeUsageAttribute.csi b/base/Interfaces/Basetypes/AttributeUsageAttribute.csi
new file mode 100644
index 0000000..2e87859
--- /dev/null
+++ b/base/Interfaces/Basetypes/AttributeUsageAttribute.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  AttributeUsageAttribute
+**
+**
+** Purpose: The class denotes how to specify the usage of an attribute
+**
+** Date:  December 7, 1999
+**
+===========================================================*/
+namespace System {
+
+    /* By default, attributes are inherited and multiple attributes are not allowed */
+    //| <include file='doc\AttributeUsageAttribute.uex' path='docs/doc[@for="AttributeUsageAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class, Inherited = true)]
+    public sealed class AttributeUsageAttribute : Attribute
+    {
+       //Constructors
+        //| <include file='doc\AttributeUsageAttribute.uex' path='docs/doc[@for="AttributeUsageAttribute.AttributeUsageAttribute"]/*' />
+        public AttributeUsageAttribute(AttributeTargets validOn);
+
+        //| <include file='doc\AttributeUsageAttribute.uex' path='docs/doc[@for="AttributeUsageAttribute.AllowMultiple"]/*' />
+        public bool AllowMultiple { set; }
+
+        //| <include file='doc\AttributeUsageAttribute.uex' path='docs/doc[@for="AttributeUsageAttribute.Inherited"]/*' />
+        public bool Inherited { set; }
+    }
+}
diff --git a/base/Interfaces/Basetypes/BREAKDOWN.TXT b/base/Interfaces/Basetypes/BREAKDOWN.TXT
new file mode 100644
index 0000000..387203d
--- /dev/null
+++ b/base/Interfaces/Basetypes/BREAKDOWN.TXT
@@ -0,0 +1,55 @@
+Basic Types:
+============
+Array.csi
+Boolean.csi
+Byte.csi
+Char.csi
+DateTime.csi
+Decimal.csi
+Delegate.csi
+Double.csi
+Enum.csi
+Exception.csi
+Int16.csi
+Int32.csi
+Int64.csi
+IntPtr.csi
+Monitor.csi
+Object.csi
+RuntimeTypeHandle.csi
+SByte.csi
+Single.csi
+String.csi
+Type.csi
+UInt16.csi
+UInt32.csi
+UInt64.csi
+UIntPtr.csi
+ValueType.csi
+
+Interfaces:
+===========
+ICloneable.csi
+IComparable.csi
+IComparer.csi
+IDisposable.csi
+IEnumerable.csi
+IEnumerator.csi
+IFormattable.csi
+
+Custom Attributes:
+==================
+Attribute.csi
+AttributeTargets.csi
+AttributeUsageAttribute.csi
+DefaultMemberAttribute.csi
+FlagsAttribute.csi
+
+Embellishments:
+===============
+MulticastDelegate.csi
+RuntimeArgumentHandle.csi
+TimeSpan.csi
+TypeCode.csi
+TypedReference.csi
+
diff --git a/base/Interfaces/Basetypes/BartokAttributes.csi b/base/Interfaces/Basetypes/BartokAttributes.csi
new file mode 100644
index 0000000..946ba58
--- /dev/null
+++ b/base/Interfaces/Basetypes/BartokAttributes.csi
@@ -0,0 +1,226 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace Microsoft.Bartok.Options {
+
+#if false
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method|
+                    AttributeTargets.Property)]
+    public sealed class InlineAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method|
+                    AttributeTargets.Property)]
+    public sealed class NoInlineAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class DisableBoundsChecksAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Interface|
+                    AttributeTargets.Class|
+                    AttributeTargets.Struct,
+                    Inherited=false)]
+    public sealed class CCtorIsRunDuringStartupAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Interface|
+                    AttributeTargets.Class|
+                    AttributeTargets.Struct,
+                    Inherited=false)]
+    public sealed class NoCCtorAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Interface|
+                    AttributeTargets.Method|
+                    AttributeTargets.Field,
+                    Inherited=false)]
+    public sealed class AccessedByRuntimeAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method|
+                    AttributeTargets.Property)]
+    public class AccessPointOnlyAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Field)]
+    public sealed class ExternalStaticDataAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Struct)]
+    public sealed class StructAlignAttribute : Attribute {
+        public StructAlignAttribute(int align);
+    }
+
+    [AttributeUsage(AttributeTargets.Method,
+                    Inherited=false)]
+    public sealed class StackBoundAttribute: Attribute {
+        public StackBoundAttribute(int bound);
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class StackLinkCheckAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Property|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class NoStackLinkCheckAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Property|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class NoStackOverflowCheckAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Field|
+                    AttributeTargets.Method|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class IntrinsicAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Field)]
+    public sealed class InlineVectorAttribute : Attribute {
+        public InlineVectorAttribute(int numElements);
+    }
+
+    // This attribute is used to mark method that needs pushStackMark
+    // and popStackMark around calls to it.
+    [AttributeUsage(AttributeTargets.Method,
+                    Inherited=false)]
+    public sealed class AbiEntryAttribute: Attribute {
+    }
+
+    /// <summary>
+    /// This attribute must be placed on override types that override the class
+    /// constructor.  It is a compile-time error if the attribute is missing
+    /// during an override.  It is also a compile-time error if it exists and
+    /// either the original or the override type does not have a class
+    /// constructor.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Interface)]
+    public sealed class OverrideCctorAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute is placed on override types to delete the built-in class
+    /// constructor.  Using this is better than overriding with an empty method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Interface)]
+    public sealed class DeleteCctorAttribute : Attribute {
+    }
+#endif
+
+#if true
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Enum)]
+    public sealed class MixinAttribute : Attribute {
+        internal Type option;
+        public MixinAttribute(Type type);
+    }
+
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Enum,
+                    AllowMultiple=true)]
+    public sealed class MixinConditionalAttribute : Attribute {
+        internal String option;
+        public MixinConditionalAttribute(String option);
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Property|
+                    AttributeTargets.Field)]
+    public sealed class MixinOverrideAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Property)]
+    public sealed class MixinExtendAttribute : Attribute {
+        internal String option;
+        public MixinExtendAttribute(String option);
+    }
+#endif
+
+#if false
+    // There are at least three reasons why one would need to prevent
+    // the automatic insertion of vanilla reference counting (RC) code
+    // into the body of a method, property or constructor:
+    //
+    //     1. To suppress reference counting before a reference to
+    //        the installed GC is set up.
+    //
+    //     2. Methods that directly manipulate reference counts such
+    //        as allocation routines.
+    //
+    //     3. To suppress the insertion of RC code into code bodies
+    //        that may be directly or indirectly invoked from the
+    //        IncrementRefCount or DecrementRefCount methods of the
+    //        reference counting collector.
+    //
+    // The IrRCUpdate compiler phase can be made to skip code bodies for
+    // any of the above reasons by affixing one of two special attributes
+    // to their declarations. Currently, the [PreInitRefCounts] attribute
+    // is used to mark code that could be invoked before the GC gets set
+    // up and that, in its absence, may cause the IrRCUpdate phase to
+    // insert RC increment and decrement code. The [ManualRefCounts]
+    // attribute models cases in which the code writer takes the onus of
+    // maintaining consistent reference counts.
+    //
+    // The reason for separating the preinitialization case from the
+    // other two is because special RC updates, which test for
+    // initialization of the GC before incrementing or decrementing the
+    // reference counts, could still have been inserted into code bodies
+    // marked as [PreInitRefCounts]. However, if the same code body is
+    // called after initialization, such updates may slow down the
+    // common case. This provides an optimization opportunity for the
+    // compiler in which a method f marked with [PreInitRefCounts] could
+    // be cloned into a version f' that contains plain RC code and that
+    // is actually called wherever a non-[PreInitRefCounts] method such
+    // as g calls f.
+    //
+    // If a method h has the [ManualRefCounts] attribute and if reference
+    // counts are directly read or written in h, then the code must either
+    // be also marked as [NoInline] or must only be called from methods
+    // that also have the [ManualRefCounts] attribute. This is because if
+    // h were inlined into a method in which reference counting is on by
+    // default, the injected RC code may cause the reference counts
+    // to become inconsistent.
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Property)]
+    public sealed class PreInitRefCountsAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Property)]
+    public sealed class ManualRefCountsAttribute: Attribute {
+    }
+#endif
+}
diff --git a/base/Interfaces/Basetypes/BartokRT.csi b/base/Interfaces/Basetypes/BartokRT.csi
new file mode 100644
index 0000000..43dac59
--- /dev/null
+++ b/base/Interfaces/Basetypes/BartokRT.csi
@@ -0,0 +1,43 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// This code is included in both Bartok compiler and mscorlibOverride builds
+// so that constants can be shared.
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Bartok.Runtime {
+#if !DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+    public enum StructuralType {
+        None            = 0x00,
+        Reference       = 0x01,
+        UntracedPointer = 0x02,
+        Struct          = 0x03,
+        Bool            = 0x04,
+        Char            = 0x05,
+        Int8            = 0x06,
+        Int16           = 0x07,
+        Int32           = 0x08,
+        Int64           = 0x09,
+        UInt8           = 0x0a,
+        UInt16          = 0x0b,
+        UInt32          = 0x0c,
+        UInt64          = 0x0d,
+        Float32         = 0x0e,
+        Float64         = 0x0f,
+        IntPtr          = 0x10,
+        UIntPtr         = 0x11,
+        Void            = 0x12,
+    };
+
+    public enum TypeInitState {
+        Ready = 1,
+        Running = 2,
+        Failed = 3,
+        Completed =4
+    };
+#endif
+}
diff --git a/base/Interfaces/Basetypes/BaseTypes.csi b/base/Interfaces/Basetypes/BaseTypes.csi
new file mode 100644
index 0000000..3b5df32
--- /dev/null
+++ b/base/Interfaces/Basetypes/BaseTypes.csi
@@ -0,0 +1,16 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BaseTypes.csi
+//
+//  Note:
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Basetypes/Basetypes.csproj b/base/Interfaces/Basetypes/Basetypes.csproj
new file mode 100644
index 0000000..4978490
--- /dev/null
+++ b/base/Interfaces/Basetypes/Basetypes.csproj
@@ -0,0 +1,103 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\BaseTypes\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Basetypes</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdLib>true</NoStdLib>
+    <InterfaceAssemblyIsKey>true</InterfaceAssemblyIsKey>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <Compile Include="ArgumentException.csi" />
+    <Compile Include="ArgumentNullException.csi" />
+    <Compile Include="ArgumentOutOfRangeException.csi" />
+    <Compile Include="ArithmeticException.csi" />
+    <Compile Include="DivideByZeroException.csi" />
+    <Compile Include="Exception.csi" />
+    <Compile Include="IndexOutOfRangeException.csi" />
+    <Compile Include="InvalidCastException.csi" />
+    <Compile Include="InvalidOperationException.csi" />
+    <Compile Include="NullReferenceException.csi" />
+    <Compile Include="OutOfMemoryException.csi" />
+    <Compile Include="OverflowException.csi" />
+    <Compile Include="StackOverflowException.csi" />
+    <Compile Include="SystemException.csi" />
+
+    <Compile Include="ICloneable.csi" />
+    <Compile Include="ICollection.csi" />
+    <Compile Include="IComparable.csi" />
+    <Compile Include="IComparer.csi" />
+    <Compile Include="IDisposable.csi" />
+    <Compile Include="IEnumerable.csi" />
+    <Compile Include="IEnumerator.csi" />
+    <Compile Include="IFormattable.csi" />
+    <Compile Include="IList.csi" />
+
+    <Compile Include="AssemblyAttributes.csi" />
+    <Compile Include="Attribute.csi" />
+    <Compile Include="AttributeTargets.csi" />
+    <Compile Include="AttributeUsageAttribute.csi" />
+    <Compile Include="CompilerServicesAttributes.csi" />
+    <Compile Include="DefaultMemberAttribute.csi" />
+    <Compile Include="FlagsAttribute.csi" />
+
+    <Compile Include="Array.csi" />
+    <Compile Include="Boolean.csi" />
+    <Compile Include="Byte.csi" />
+    <Compile Include="Char.csi" />
+    <Compile Include="DateTime.csi" />
+    <Compile Include="Decimal.csi" />
+    <Compile Include="Delegate.csi" />
+    <Compile Include="Double.csi" />
+    <Compile Include="Enum.csi" />
+    <Compile Include="Int16.csi" />
+    <Compile Include="Int32.csi" />
+    <Compile Include="Int64.csi" />
+    <Compile Include="IntPtr.csi" />
+    <Compile Include="Monitor.csi" />
+    <Compile Include="MulticastDelegate.csi" />
+    <Compile Include="Object.csi" />
+    <Compile Include="RuntimeArgumentHandle.csi" />
+    <Compile Include="RuntimeTypeHandle.csi" />
+    <Compile Include="SByte.csi" />
+    <Compile Include="SchedulerTime.csi" />
+    <Compile Include="Single.csi" />
+    <Compile Include="String.csi" />
+    <Compile Include="TimeSpan.csi" />
+    <Compile Include="Type.csi" />
+    <Compile Include="TypeCode.csi" />
+    <Compile Include="TypedReference.csi" />
+    <Compile Include="UInt16.csi" />
+    <Compile Include="UInt32.csi" />
+    <Compile Include="UInt64.csi" />
+    <Compile Include="UIntPtr.csi" />
+    <Compile Include="ValueType.csi" />
+
+    <Compile Include="RuntimeType.csi" />
+    <Compile Include="VTable.csi" />
+    <Compile Include="BartokRT.csi" />
+    <Compile Include="BartokAttributes.csi" />
+
+    <Compile Include="BaseTypes.csi" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Basetypes/Boolean.csi b/base/Interfaces/Basetypes/Boolean.csi
new file mode 100644
index 0000000..e62184b
--- /dev/null
+++ b/base/Interfaces/Basetypes/Boolean.csi
@@ -0,0 +1,25 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct Boolean : IComparable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public static readonly String TrueString;
+        public static readonly String FalseString;
+
+        public override int GetHashCode();
+        public override bool Equals(Object obj);
+        public override String ToString();
+
+        public int CompareTo(Object obj);
+
+        public static bool Parse (String value);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Byte.csi b/base/Interfaces/Basetypes/Byte.csi
new file mode 100644
index 0000000..f470989
--- /dev/null
+++ b/base/Interfaces/Basetypes/Byte.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct Byte : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const byte MaxValue;
+        public const byte MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static byte Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Char.csi b/base/Interfaces/Basetypes/Char.csi
new file mode 100644
index 0000000..deba8c7
--- /dev/null
+++ b/base/Interfaces/Basetypes/Char.csi
@@ -0,0 +1,59 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct Char : IComparable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const char MaxValue;
+        public const char MinValue;
+
+        public override int GetHashCode();
+        public override bool Equals(Object obj);
+        public override String ToString();
+
+        public int CompareTo(Object value);
+
+        public static String ToString(char c);
+
+        public static char Parse(String s);
+
+        public static bool IsDigit(char c);
+        public static bool IsLetter(char c);
+        public static bool IsWhiteSpace(char c);
+        public static bool IsUpper(char c);
+        public static bool IsLower(char c);
+        public static bool IsPunctuation(char c);
+        public static bool IsLetterOrDigit(char c);
+        public static bool IsControl(char c);
+        public static bool IsNumber(char c);
+        public static bool IsSeparator(char c);
+        public static bool IsSurrogate(char c);
+        public static bool IsSymbol(char c);
+
+        public static char ToUpper(char c);
+        public static char ToLower(char c);
+
+        public static bool IsControl(String s, int index);
+        public static bool IsDigit(String s, int index);
+        public static bool IsLetter(String s, int index);
+        public static bool IsLetterOrDigit(String s, int index);
+        public static bool IsLower(String s, int index);
+        public static bool IsNumber(String s, int index);
+        public static bool IsPunctuation (String s, int index);
+        public static bool IsSeparator(String s, int index);
+        public static bool IsSurrogate(String s, int index);
+        public static bool IsSymbol(String s, int index);
+        public static bool IsUpper(String s, int index);
+        public static bool IsWhiteSpace(String s, int index);
+
+        public static double GetNumericValue(char c);
+        public static double GetNumericValue(String s, int index);
+    }
+}
diff --git a/base/Interfaces/Basetypes/CompilerServicesAttributes.csi b/base/Interfaces/Basetypes/CompilerServicesAttributes.csi
new file mode 100644
index 0000000..423cf83
--- /dev/null
+++ b/base/Interfaces/Basetypes/CompilerServicesAttributes.csi
@@ -0,0 +1,166 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.Runtime.CompilerServices {
+
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Interface|
+                    AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Field,
+                    Inherited=false)]
+    [RequiredByBartok]
+    public sealed class AccessedByRuntimeAttribute: Attribute {
+    public AccessedByRuntimeAttribute(String option);
+    }
+
+    [AttributeUsage(AttributeTargets.Interface|
+                    AttributeTargets.Class|
+                    AttributeTargets.Struct, Inherited=false)]
+    public sealed class CCtorIsRunDuringStartupAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Field)]
+    public sealed class ExternalStaticDataAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method)]
+    public sealed class NoHeapAllocationAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method|
+                    AttributeTargets.Property)]
+    public sealed class InlineAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Property,
+                    Inherited=false)]
+    public sealed class IntrinsicAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method|
+                    AttributeTargets.Property)]
+    public sealed class NoInlineAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Struct)]
+    internal sealed class InlineCopyAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method)]
+    internal sealed class DisableBoundsChecksAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Constructor|
+                    AttributeTargets.Method)]
+    internal sealed class DisableNullChecksAttribute: Attribute {
+
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class NoStackLinkCheckAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class NoStackLinkCheckTransAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class NoStackOverflowCheckAttribute: Attribute {
+    }
+
+#if false
+    // These attributes are used for Bjarne's Mixins.
+    //
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Enum)]
+    public sealed class MixinAttribute : Attribute {
+        public MixinAttribute(Type type);
+    }
+
+    [AttributeUsage(AttributeTargets.Class|
+                    AttributeTargets.Struct|
+                    AttributeTargets.Enum,
+                    AllowMultiple=true)]
+    public sealed class MixinConditionalAttribute : Attribute {
+        public MixinConditionalAttribute(String option);
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Property|
+                    AttributeTargets.Field)]
+    public sealed class MixinOverrideAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Property)]
+    public sealed class MixinExtendAttribute : Attribute {
+        public MixinExtendAttribute(String option);
+    }
+#endif
+
+    // This attribute is used to mark method that needs pushStackMark
+    // and popStackMark around calls to it.
+    [AttributeUsage(AttributeTargets.Method,
+                    Inherited=false)]
+    [RequiredByBartok]
+    public sealed class OutsideGCDomainAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor|
+                    AttributeTargets.Field,
+                    Inherited=false)]
+    public sealed class ProvidedByOverrideAttribute: Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Struct)]
+    public sealed class StructAlignAttribute : Attribute {
+        public StructAlignAttribute(int align);
+    }
+
+    [AttributeUsage(AttributeTargets.Method,
+                    Inherited=false)]
+    public sealed class StackBoundAttribute: Attribute {
+        public StackBoundAttribute(int bound);
+    }
+
+    [AttributeUsage(AttributeTargets.Method|
+                    AttributeTargets.Constructor,
+                    Inherited=false)]
+    public sealed class StackLinkCheckAttribute: Attribute {
+    }
+
+    // This attribute is used to mark type/field/methods that are required
+    // by Bartok compiler.
+    [AttributeUsage(AttributeTargets.Class |
+                    AttributeTargets.Struct |
+                    AttributeTargets.Enum |
+                    AttributeTargets.Interface |
+                    AttributeTargets.Delegate |
+                    AttributeTargets.Method |
+                    AttributeTargets.Field,
+                    Inherited=false)]
+    public sealed class RequiredByBartokAttribute: Attribute {
+    }
+
+}
diff --git a/base/Interfaces/Basetypes/DateTime.csi b/base/Interfaces/Basetypes/DateTime.csi
new file mode 100644
index 0000000..b7f9be9
--- /dev/null
+++ b/base/Interfaces/Basetypes/DateTime.csi
@@ -0,0 +1,79 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct DateTime : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public static readonly DateTime MinValue;
+        public static readonly DateTime MaxValue;
+
+        public DateTime(long ticks);
+        public DateTime(int year, int month, int day);
+        public DateTime(int year, int month, int day, int hour, int minute, int second);
+        public DateTime(int year, int month, int day, int hour, int minute, int second, int millisecond);
+
+        public DateTime Add(TimeSpan value);
+        public DateTime AddDays(int value);
+        public DateTime AddHours(int value);
+        public DateTime AddMilliseconds(int value);
+        public DateTime AddMinutes(int value);
+        public DateTime AddMonths(int months);
+        public DateTime AddSeconds(int value);
+        public DateTime AddTicks(long value);
+        public DateTime AddYears(int value);
+        public TimeSpan Subtract(DateTime value);
+        public DateTime Subtract(TimeSpan value);
+
+        public static int Compare(DateTime t1, DateTime t2);
+
+        public int CompareTo(Object value);
+
+        public static int DaysInMonth(int year, int month);
+
+        public override bool Equals(Object value);
+        public override int GetHashCode();
+        public override String ToString();
+        public String ToString(String format);
+
+        public static bool Equals(DateTime t1, DateTime t2);
+
+        public static DateTime FromFileTimeUtc(long fileTime);
+
+        public DateTime Date { get; }
+        public int Day { get; }
+        public int Hour { get; }
+        public int Millisecond { get; }
+        public int Minute { get; }
+        public int Month { get; }
+        public static DateTime UtcNow { get; }
+        public int Second { get; }
+        public long Ticks { get; }
+        public TimeSpan TimeOfDay { get; }
+        public static DateTime Today { get; }
+        public int Year { get; }
+
+        public static bool IsLeapYear(int year);
+
+        public String ToLongDateString();
+        public String ToLongTimeString();
+        public String ToShortDateString();
+        public String ToShortTimeString();
+
+        public static DateTime operator +(DateTime d, TimeSpan t);
+        public static DateTime operator -(DateTime d, TimeSpan t);
+        public static TimeSpan operator -(DateTime d1, DateTime d2);
+        public static bool operator ==(DateTime d1, DateTime d2);
+        public static bool operator !=(DateTime d1, DateTime d2);
+        public static bool operator <(DateTime t1, DateTime t2);
+        public static bool operator <=(DateTime t1, DateTime t2);
+        public static bool operator >(DateTime t1, DateTime t2);
+        public static bool operator >=(DateTime t1, DateTime t2);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Decimal.csi b/base/Interfaces/Basetypes/Decimal.csi
new file mode 100644
index 0000000..5fba87a
--- /dev/null
+++ b/base/Interfaces/Basetypes/Decimal.csi
@@ -0,0 +1,111 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct Decimal : IFormattable, IComparable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const Decimal Zero;
+        public const Decimal One;
+        public const Decimal MinusOne;
+        public const Decimal MaxValue;
+        public const Decimal MinValue;
+
+        public Decimal(int value);
+        public Decimal(uint value);
+        public Decimal(long value);
+        public Decimal(ulong value);
+        public Decimal(float value);
+        public Decimal(double value);
+        public Decimal(int[] bits);
+        public Decimal(int lo, int mid, int hi, bool isNegative, byte scale);
+
+        public static long ToOACurrency(Decimal value);
+        public static Decimal FromOACurrency(long cy);
+
+        public static int Compare(Decimal d1, Decimal d2);
+
+        public int CompareTo(Object value);
+
+        public static bool Equals(Decimal d1, Decimal d2);
+        public override bool Equals(Object value);
+
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static Decimal Parse(String s);
+
+        public static int[] GetBits(Decimal d);
+
+        public static Decimal Add(Decimal d1, Decimal d2);
+        public static Decimal Divide(Decimal d1, Decimal d2);
+        public static Decimal Floor(Decimal d);
+        public static Decimal Remainder(Decimal d1, Decimal d2);
+        public static Decimal Multiply(Decimal d1, Decimal d2);
+        public static Decimal Negate(Decimal d);
+        public static Decimal Round(Decimal d1, int decimals);
+        public static Decimal Subtract(Decimal d1, Decimal d2);
+        public static Decimal Truncate(Decimal d);
+
+        public static byte ToByte(Decimal value);
+        public static sbyte ToSByte(Decimal value);
+        public static short ToInt16(Decimal value);
+        public static double ToDouble(Decimal d);
+        public static int ToInt32(Decimal d);
+        public static long ToInt64(Decimal d);
+        public static ushort ToUInt16(Decimal value);
+        public static uint ToUInt32(Decimal d);
+        public static ulong ToUInt64(Decimal d);
+        public static float ToSingle(Decimal d);
+
+        public static implicit operator Decimal(byte value);
+        public static implicit operator Decimal(sbyte value);
+        public static implicit operator Decimal(short value);
+        public static implicit operator Decimal(ushort value);
+        public static implicit operator Decimal(char value);
+        public static implicit operator Decimal(int value);
+        public static implicit operator Decimal(uint value);
+        public static implicit operator Decimal(long value);
+        public static implicit operator Decimal(ulong value);
+        public static explicit operator Decimal(float value);
+        public static explicit operator Decimal(double value);
+
+        public static explicit operator byte(Decimal value);
+        public static explicit operator sbyte(Decimal value);
+        public static explicit operator char(Decimal value);
+        public static explicit operator short(Decimal value);
+        public static explicit operator ushort(Decimal value);
+        public static explicit operator int(Decimal value);
+        public static explicit operator uint(Decimal value);
+        public static explicit operator long(Decimal value);
+        public static explicit operator ulong(Decimal value);
+        public static explicit operator float(Decimal value);
+        public static explicit operator double(Decimal value);
+
+        public static Decimal operator +(Decimal d);
+        public static Decimal operator -(Decimal d);
+        public static Decimal operator ++(Decimal d);
+        public static Decimal operator --(Decimal d);
+        public static Decimal operator +(Decimal d1, Decimal d2);
+        public static Decimal operator -(Decimal d1, Decimal d2);
+        public static Decimal operator *(Decimal d1, Decimal d2);
+        public static Decimal operator /(Decimal d1, Decimal d2);
+        public static Decimal operator %(Decimal d1, Decimal d2);
+
+        public static bool operator ==(Decimal d1, Decimal d2);
+        public static bool operator !=(Decimal d1, Decimal d2);
+        public static bool operator <(Decimal d1, Decimal d2);
+        public static bool operator <=(Decimal d1, Decimal d2);
+        public static bool operator >(Decimal d1, Decimal d2);
+        public static bool operator >=(Decimal d1, Decimal d2);
+    }
+}
diff --git a/base/Interfaces/Basetypes/DefaultMemberAttribute.csi b/base/Interfaces/Basetypes/DefaultMemberAttribute.csi
new file mode 100644
index 0000000..5d61eb0
--- /dev/null
+++ b/base/Interfaces/Basetypes/DefaultMemberAttribute.csi
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// DefaultMemberAttribute is defines the Member of a Type that is the "default"
+//  member used by Type.InvokeMember.  The default member is simply a name given
+//  to a type.
+//
+// Date: Oct 99
+//
+
+using System;
+
+namespace System.Reflection {
+
+    //| <include file='doc\DefaultMemberAttribute.uex' path='docs/doc[@for="DefaultMemberAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
+    public sealed class DefaultMemberAttribute : Attribute
+    {
+        // You must provide the name of the member, this is required
+        //| <include file='doc\DefaultMemberAttribute.uex' path='docs/doc[@for="DefaultMemberAttribute.DefaultMemberAttribute"]/*' />
+        public DefaultMemberAttribute(String memberName);
+
+    }
+}
diff --git a/base/Interfaces/Basetypes/Delegate.csi b/base/Interfaces/Basetypes/Delegate.csi
new file mode 100644
index 0000000..3d08713
--- /dev/null
+++ b/base/Interfaces/Basetypes/Delegate.csi
@@ -0,0 +1,58 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    public abstract class Delegate : ICloneable
+    {
+        protected Delegate(Object target, String method);
+        protected Delegate(Type target, String method);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+
+        public static Delegate Combine(Delegate a, Delegate b);
+        public static Delegate Combine(Delegate[] delegates);
+
+        public virtual Delegate[] GetInvocationList();
+
+        public Object Target { get; }
+
+        public static Delegate Remove(Delegate source, Delegate value);
+        public static Delegate RemoveAll(Delegate source, Delegate value);
+
+        protected virtual Delegate CombineImpl(Delegate d);
+        protected virtual Delegate RemoveImpl(Delegate d);
+
+        public virtual Object Clone();
+
+        public static Delegate CreateDelegate(Type type, Object target, String method);
+        public static Delegate CreateDelegate(Type type, Object target, String method, bool ignoreCase);
+        public static Delegate CreateDelegate(Type type, Type target, String method);
+
+        public static bool operator ==(Delegate d1, Delegate d2);
+        public static bool operator != (Delegate d1, Delegate d2);
+
+#if !DONT_DO_BARTOK
+        [RequiredByBartok]
+        private static IntPtr GetCodePtr(Delegate d,IntPtr callBackStub);
+
+        [RequiredByBartok]
+        private static Delegate IdxToDelegate(int idx);
+
+        [RequiredByBartok]
+        private IntPtr _methodPtr;
+
+        [RequiredByBartok]
+        private Object _target;
+
+        [RequiredByBartok]
+        private IntPtr _methodPtrAux;
+#endif
+    }
+}
diff --git a/base/Interfaces/Basetypes/DivideByZeroException.csi b/base/Interfaces/Basetypes/DivideByZeroException.csi
new file mode 100644
index 0000000..8c70903
--- /dev/null
+++ b/base/Interfaces/Basetypes/DivideByZeroException.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System {
+    [RequiredByBartok]
+    public class DivideByZeroException : ArithmeticException {
+        DivideByZeroException();
+    }
+}
diff --git a/base/Interfaces/Basetypes/Double.csi b/base/Interfaces/Basetypes/Double.csi
new file mode 100644
index 0000000..f2bc6e6
--- /dev/null
+++ b/base/Interfaces/Basetypes/Double.csi
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct Double : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const double MinValue;
+        public const double MaxValue;
+        public const double Epsilon;
+        public const double NegativeInfinity;
+        public const double PositiveInfinity;
+        public const double NaN;
+
+        public static bool IsInfinity(double d);
+        public static bool IsPositiveInfinity(double d);
+        public static bool IsNegativeInfinity(double d);
+        public static bool IsNaN(double d);
+
+        public static double ToDouble(byte[] buffer);
+
+        public static void GetBytes(double value, byte[] buffer);
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static double Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Enum.csi b/base/Interfaces/Basetypes/Enum.csi
new file mode 100644
index 0000000..7c10421
--- /dev/null
+++ b/base/Interfaces/Basetypes/Enum.csi
@@ -0,0 +1,39 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public abstract class Enum : ValueType, IComparable, IFormattable
+    {
+        public String ToString(String format);
+        public static Object Parse(Type enumType, String value);
+        public static Object Parse(Type enumType, String value, bool ignoreCase);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public static Type GetUnderlyingType(Type enumType);
+        public static Array GetValues(Type enumType);
+        public static String GetName(Type enumType, Object value);
+        public static String[] GetNames(Type enumType);
+
+        public static Object ToObject(Type enumType, Object value);
+
+        public static bool IsDefined(Type enumType,Object value);
+
+        public int CompareTo(Object target);
+
+        public static Object ToObject(Type enumType, sbyte value);
+        public static Object ToObject(Type enumType, short value);
+        public static Object ToObject(Type enumType, int value);
+        public static Object ToObject(Type enumType, byte value);
+        public static Object ToObject(Type enumType, ushort value);
+        public static Object ToObject(Type enumType, uint value);
+        public static Object ToObject(Type enumType, long value);
+        public static Object ToObject(Type enumType, ulong value);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Exception.csi b/base/Interfaces/Basetypes/Exception.csi
new file mode 100644
index 0000000..4830e0f
--- /dev/null
+++ b/base/Interfaces/Basetypes/Exception.csi
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    [RequiredByBartok]
+    public class Exception
+    {
+        public Exception();
+        public Exception(String message);
+        public Exception(String message, Exception innerException);
+
+        public virtual String Message { get; }
+
+        public virtual Exception GetBaseException();
+
+        public Exception InnerException { get; }
+        public virtual String StackTrace { get; }
+        public virtual String HelpLink { get; set; }
+        public virtual String Source { get; set; }
+
+        public override String ToString();
+    }
+}
diff --git a/base/Interfaces/Basetypes/FlagsAttribute.csi b/base/Interfaces/Basetypes/FlagsAttribute.csi
new file mode 100644
index 0000000..45583f6
--- /dev/null
+++ b/base/Interfaces/Basetypes/FlagsAttribute.csi
@@ -0,0 +1,23 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace System {
+
+    // Custom attribute to indicate that the enum
+    // should be treated as a bitfield (or set of flags).
+    // An IDE may use this information to provide a richer
+    // development experience.
+    //| <include file='doc\FlagsAttribute.uex' path='docs/doc[@for="FlagsAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Enum, Inherited = false)]
+    public class FlagsAttribute : Attribute
+    {
+        //| <include file='doc\FlagsAttribute.uex' path='docs/doc[@for="FlagsAttribute.FlagsAttribute"]/*' />
+        public FlagsAttribute();
+    }
+}
diff --git a/base/Interfaces/Basetypes/ICloneable.csi b/base/Interfaces/Basetypes/ICloneable.csi
new file mode 100644
index 0000000..bbdb2df
--- /dev/null
+++ b/base/Interfaces/Basetypes/ICloneable.csi
@@ -0,0 +1,13 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public interface ICloneable
+    {
+        Object Clone();
+    }
+}
diff --git a/base/Interfaces/Basetypes/ICollection.csi b/base/Interfaces/Basetypes/ICollection.csi
new file mode 100644
index 0000000..9910c07
--- /dev/null
+++ b/base/Interfaces/Basetypes/ICollection.csi
@@ -0,0 +1,20 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // Base interface for all collections, defining enumerators, size, and
+    // synchronization methods.
+    public interface ICollection : IEnumerable
+    {
+        void CopyTo(Array array, int index);
+
+        int Count { get; }
+        Object SyncRoot { get; }
+        bool IsSynchronized { get; }
+    }
+}
diff --git a/base/Interfaces/Basetypes/IComparable.csi b/base/Interfaces/Basetypes/IComparable.csi
new file mode 100644
index 0000000..f2399d0
--- /dev/null
+++ b/base/Interfaces/Basetypes/IComparable.csi
@@ -0,0 +1,13 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public interface IComparable
+    {
+        int CompareTo(Object obj);
+    }
+}
diff --git a/base/Interfaces/Basetypes/IComparer.csi b/base/Interfaces/Basetypes/IComparer.csi
new file mode 100644
index 0000000..0439a9a
--- /dev/null
+++ b/base/Interfaces/Basetypes/IComparer.csi
@@ -0,0 +1,34 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IComparer
+**
+**
+** Purpose: Interface for comparing two Objects.
+**
+** Date:  September 25, 1999
+**
+===========================================================*/
+
+using System;
+
+namespace System.Collections {
+
+    // The IComparer interface implements a method that compares two objects. It is
+    // used in conjunction with the Sort and BinarySearch methods on
+    // the Array and List classes.
+    //
+    //| <include file='doc\IComparer.uex' path='docs/doc[@for="IComparer"]/*' />
+    public interface IComparer {
+        // Compares two objects. An implementation of this method must return a
+        // value less than zero if x is less than y, zero if x is equal to y, or a
+        // value greater than zero if x is greater than y.
+        //
+        //| <include file='doc\IComparer.uex' path='docs/doc[@for="IComparer.Compare"]/*' />
+        int Compare(Object x, Object y);
+    }
+}
diff --git a/base/Interfaces/Basetypes/IDisposable.csi b/base/Interfaces/Basetypes/IDisposable.csi
new file mode 100644
index 0000000..77f66e1
--- /dev/null
+++ b/base/Interfaces/Basetypes/IDisposable.csi
@@ -0,0 +1,12 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public interface IDisposable {
+        void Dispose();
+    }
+}
diff --git a/base/Interfaces/Basetypes/IEnumerable.csi b/base/Interfaces/Basetypes/IEnumerable.csi
new file mode 100644
index 0000000..eaf4e13
--- /dev/null
+++ b/base/Interfaces/Basetypes/IEnumerable.csi
@@ -0,0 +1,13 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Collections
+{
+    public interface IEnumerable
+    {
+        IEnumerator GetEnumerator();
+    }
+}
diff --git a/base/Interfaces/Basetypes/IEnumerator.csi b/base/Interfaces/Basetypes/IEnumerator.csi
new file mode 100644
index 0000000..76c3506
--- /dev/null
+++ b/base/Interfaces/Basetypes/IEnumerator.csi
@@ -0,0 +1,55 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IEnumerator
+**
+**
+** Purpose: Base interface for all enumerators.
+**
+** Date:  June 14, 1999
+**
+===========================================================*/
+
+using System;
+
+namespace System.Collections {
+    // Base interface for all enumerators, providing a simple approach
+    // to iterating over a collection.
+    //| <include file='doc\IEnumerator.uex' path='docs/doc[@for="IEnumerator"]/*' />
+    public interface IEnumerator
+    {
+    // Interfaces are not serializable
+        // Advances the enumerator to the next element of the enumeration and
+        // returns a boolean indicating whether an element is available. Upon
+        // creation, an enumerator is conceptually positioned before the first
+        // element of the enumeration, and the first call to MoveNext
+        // brings the first element of the enumeration into view.
+        //
+        //| <include file='doc\IEnumerator.uex' path='docs/doc[@for="IEnumerator.MoveNext"]/*' />
+        bool MoveNext();
+
+        // Returns the current element of the enumeration. The returned value is
+        // undefined before the first call to MoveNext and following a
+        // call to MoveNext that returned false. Multiple calls to
+        // GetCurrent with no intervening calls to MoveNext
+        // will return the same object.
+        //
+        //| <include file='doc\IEnumerator.uex' path='docs/doc[@for="IEnumerator.Current"]/*' />
+        Object Current {
+            get;
+        }
+
+        // Resets the enumerator to the beginning of the enumeration, starting over.
+        // The preferred behavior for Reset is to return the exact same enumeration.
+        // This means if you modify the underlying collection then call Reset, your
+        // IEnumerator will be invalid, just as it would have been if you had called
+        // MoveNext or Current.
+        //
+        //| <include file='doc\IEnumerator.uex' path='docs/doc[@for="IEnumerator.Reset"]/*' />
+        void Reset();
+    }
+}
diff --git a/base/Interfaces/Basetypes/IFormattable.csi b/base/Interfaces/Basetypes/IFormattable.csi
new file mode 100644
index 0000000..27cdfc2
--- /dev/null
+++ b/base/Interfaces/Basetypes/IFormattable.csi
@@ -0,0 +1,13 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public interface IFormattable
+    {
+        String ToString(String format);
+    }
+}
diff --git a/base/Interfaces/Basetypes/IList.csi b/base/Interfaces/Basetypes/IList.csi
new file mode 100644
index 0000000..5280338
--- /dev/null
+++ b/base/Interfaces/Basetypes/IList.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+
+    // An IList is an ordered collection of objects.  The exact ordering
+    // is up to the implementation of the list, ranging from a sorted
+    // order to insertion order.
+    public interface IList : ICollection
+    {
+        Object this[int index] {
+            get;
+            set;
+        }
+
+        int Add(Object value);
+        bool Contains(Object value);
+        void Clear();
+
+        bool IsReadOnly { get; }
+        bool IsFixedSize { get; }
+
+        int IndexOf(Object value);
+        void Insert(int index, Object value);
+        void Remove(Object value);
+        void RemoveAt(int index);
+    }
+}
diff --git a/base/Interfaces/Basetypes/IndexOutOfRangeException.csi b/base/Interfaces/Basetypes/IndexOutOfRangeException.csi
new file mode 100644
index 0000000..564c82d
--- /dev/null
+++ b/base/Interfaces/Basetypes/IndexOutOfRangeException.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+    [RequiredByBartok]
+    public sealed class IndexOutOfRangeException : SystemException {
+        public IndexOutOfRangeException();
+        public IndexOutOfRangeException(String message);
+        public IndexOutOfRangeException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Int16.csi b/base/Interfaces/Basetypes/Int16.csi
new file mode 100644
index 0000000..8776ca3
--- /dev/null
+++ b/base/Interfaces/Basetypes/Int16.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct Int16 : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const short MaxValue;
+        public const short MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static short Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Int32.csi b/base/Interfaces/Basetypes/Int32.csi
new file mode 100644
index 0000000..c41284f
--- /dev/null
+++ b/base/Interfaces/Basetypes/Int32.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct Int32 : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const int MaxValue;
+        public const int MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static int Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Int64.csi b/base/Interfaces/Basetypes/Int64.csi
new file mode 100644
index 0000000..65c5ce9
--- /dev/null
+++ b/base/Interfaces/Basetypes/Int64.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct Int64 : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const long MaxValue;
+        public const long MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static long Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/IntPtr.csi b/base/Interfaces/Basetypes/IntPtr.csi
new file mode 100644
index 0000000..a84a932
--- /dev/null
+++ b/base/Interfaces/Basetypes/IntPtr.csi
@@ -0,0 +1,47 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    public struct IntPtr
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public static readonly IntPtr Zero;
+        public static readonly int Size;
+
+        public IntPtr(int value);
+        public IntPtr(long value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public int ToInt32();
+        public long ToInt64();
+
+        public static explicit operator UIntPtr (IntPtr value);
+        public static explicit operator IntPtr (int value);
+        public static explicit operator IntPtr (long value);
+        public static explicit operator int (IntPtr  value);
+        public static explicit operator long (IntPtr  value);
+        public static bool operator == (IntPtr value1, IntPtr value2);
+        public static bool operator != (IntPtr value1, IntPtr value2);
+
+        public static IntPtr operator - (IntPtr value1, IntPtr value2);
+        public static IntPtr operator - (IntPtr value1, int value2);
+        public static IntPtr operator -- (IntPtr value);
+        public static IntPtr operator + (IntPtr value1, IntPtr value2);
+        public static IntPtr operator ++ (IntPtr value);
+        public static bool operator < (IntPtr value1, IntPtr value2);
+        public static bool operator > (IntPtr value1, IntPtr value2);
+        public static bool operator <= (IntPtr value1, IntPtr value2);
+        public static bool operator >= (IntPtr value1, IntPtr value2);
+    }
+}
diff --git a/base/Interfaces/Basetypes/InvalidCastException.csi b/base/Interfaces/Basetypes/InvalidCastException.csi
new file mode 100644
index 0000000..048ef98
--- /dev/null
+++ b/base/Interfaces/Basetypes/InvalidCastException.csi
@@ -0,0 +1,14 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System {
+
+    public class InvalidCastException : SystemException {
+        public InvalidCastException();
+        public InvalidCastException(String message);
+        public InvalidCastException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/InvalidOperationException.csi b/base/Interfaces/Basetypes/InvalidOperationException.csi
new file mode 100644
index 0000000..6dd24f7
--- /dev/null
+++ b/base/Interfaces/Basetypes/InvalidOperationException.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System {
+
+    public class InvalidOperationException : SystemException
+    {
+        public InvalidOperationException();
+        public InvalidOperationException(String message);
+        public InvalidOperationException(String message, Exception innerException);
+    }
+}
+
diff --git a/base/Interfaces/Basetypes/Monitor.csi b/base/Interfaces/Basetypes/Monitor.csi
new file mode 100644
index 0000000..70db99a
--- /dev/null
+++ b/base/Interfaces/Basetypes/Monitor.csi
@@ -0,0 +1,24 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Threading
+{
+    public sealed class Monitor
+    {
+        public static void Enter(Object obj);
+        public static void Exit(Object obj);
+        public static bool TryEnter(Object obj);
+        public static bool TryEnter(Object obj, int millisecondsTimeout);
+        public static bool TryEnter(Object obj, TimeSpan timeout);
+        public static bool Wait(Object obj, int millisecondsTimeout, bool exitContext);
+        public static bool Wait(Object obj, TimeSpan timeout, bool exitContext);
+        public static bool Wait(Object obj, int millisecondsTimeout);
+        public static bool Wait(Object obj, TimeSpan timeout);
+        public static bool Wait(Object obj);
+        public static void Pulse(Object obj);
+        public static void PulseAll(Object obj);
+    }
+}
diff --git a/base/Interfaces/Basetypes/MulticastDelegate.csi b/base/Interfaces/Basetypes/MulticastDelegate.csi
new file mode 100644
index 0000000..de9d78a
--- /dev/null
+++ b/base/Interfaces/Basetypes/MulticastDelegate.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    public abstract class MulticastDelegate : Delegate
+    {
+        protected MulticastDelegate(Object target,String method);
+        protected MulticastDelegate(Type target, String method);
+
+        public override sealed bool Equals(Object obj);
+
+        protected override sealed Delegate CombineImpl(Delegate follow);
+        protected override sealed Delegate RemoveImpl(Delegate value);
+
+        public override sealed Delegate[] GetInvocationList();
+
+        public static bool operator ==(MulticastDelegate d1, MulticastDelegate d2);
+        public static bool operator !=(MulticastDelegate d1, MulticastDelegate d2);
+
+        public override sealed int GetHashCode();
+#if !DONT_DO_BARTOK
+        [RequiredByBartok]
+        private MulticastDelegate _prev;
+#endif
+
+    }
+}
diff --git a/base/Interfaces/Basetypes/NullReferenceException.csi b/base/Interfaces/Basetypes/NullReferenceException.csi
new file mode 100644
index 0000000..7c397fa
--- /dev/null
+++ b/base/Interfaces/Basetypes/NullReferenceException.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+    [RequiredByBartok]
+    public class NullReferenceException : SystemException {
+        public NullReferenceException();
+        public NullReferenceException(String message);
+        public NullReferenceException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Object.csi b/base/Interfaces/Basetypes/Object.csi
new file mode 100644
index 0000000..4abfb36
--- /dev/null
+++ b/base/Interfaces/Basetypes/Object.csi
@@ -0,0 +1,82 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+using Microsoft.Bartok.Runtime;
+
+namespace Microsoft.Bartok.Runtime
+{
+
+    [RequiredByBartok]
+    internal struct PreHeader {
+	// declare a dummy field so that struct size won't be zero
+	int dummy;
+    }
+
+    internal struct PostHeader {
+	[AccessedByRuntime("accessed from halexn.cpp")]
+	System.VTable vtableObject;
+	static int Size;
+    }
+
+}
+
+namespace System
+{
+    [CCtorIsRunDuringStartup]
+    public class Object
+    {
+        public Object();
+
+#if !DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+        [RequiredByBartok]
+        ~Object();
+#endif
+
+        public virtual String ToString();
+        [RequiredByBartok]
+        public virtual bool Equals(Object obj);
+        public virtual int GetHashCode();
+
+        public static bool Equals(Object objA, Object objB);
+        public static bool ReferenceEquals (Object objA, Object objB);
+
+        public Type GetType();
+
+        protected Object MemberwiseClone();
+
+#if !DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+        public PreHeader  preHeader;
+        public PostHeader postHeader;
+
+        public VTable vtable { get; }
+
+        public static int HEADER_POINTERS { get; }
+        public static int HEADER_BYTES { get; }
+        public static int VTABLE_OFFSET { get; }
+        public uint NUM_REFS { get; set; }
+
+        public int GetSyncBlockIndex();
+        public bool GcMark(bool flag);
+        public bool GcMark();
+
+        public UIntPtr GetHeader(int index);
+        // public UIntPtr GetHeader(int index, UIntPtr mask);
+        public void SetHeader(int index, UIntPtr val);
+        public bool ExchangeHeader(int index, UIntPtr val, UIntPtr oldVal);
+        // public void SetHeader(int index, UIntPtr mask, UIntPtr val);
+
+        public int SyncBlockIndex { get; set; }
+#endif
+    }
+
+#if DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+    public sealed class VTable {
+    }
+#endif
+
+}
diff --git a/base/Interfaces/Basetypes/OutOfMemoryException.csi b/base/Interfaces/Basetypes/OutOfMemoryException.csi
new file mode 100644
index 0000000..96032d8
--- /dev/null
+++ b/base/Interfaces/Basetypes/OutOfMemoryException.csi
@@ -0,0 +1,14 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System {
+
+    public class OutOfMemoryException : SystemException {
+        public OutOfMemoryException();
+        public OutOfMemoryException(String message);
+        public OutOfMemoryException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/OverflowException.csi b/base/Interfaces/Basetypes/OverflowException.csi
new file mode 100644
index 0000000..29fe3ca
--- /dev/null
+++ b/base/Interfaces/Basetypes/OverflowException.csi
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+    [RequiredByBartok]
+    public class OverflowException : ArithmeticException {
+        public OverflowException();
+        public OverflowException(String message);
+        public OverflowException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/RuntimeArgumentHandle.csi b/base/Interfaces/Basetypes/RuntimeArgumentHandle.csi
new file mode 100644
index 0000000..e8bed1a
--- /dev/null
+++ b/base/Interfaces/Basetypes/RuntimeArgumentHandle.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct RuntimeArgumentHandle
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+    }
+}
diff --git a/base/Interfaces/Basetypes/RuntimeType.csi b/base/Interfaces/Basetypes/RuntimeType.csi
new file mode 100644
index 0000000..c2c6108
--- /dev/null
+++ b/base/Interfaces/Basetypes/RuntimeType.csi
@@ -0,0 +1,128 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// __RuntimeType is the basic Type object representing classes as found in the
+//      system.  This type is never creatable by users, only by the system itself.
+//      The public structure is known about by the runtime. __RuntimeXXX classes
+//      are created only once per object in the system and support == comparisons.
+//
+// Date: March 98
+//
+
+using Microsoft.Bartok.Runtime;
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace System {
+
+#if !DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+    [CCtorIsRunDuringStartup]
+    public sealed class RuntimeType : Type, ICloneable
+    {
+        public readonly RuntimeType baseType;
+        public readonly System.RuntimeType[] interfaces;
+        public readonly StructuralType arrayOf;
+        public readonly RuntimeType elementType;
+        public readonly int rank;
+        public readonly VTable classVtable;
+
+        public TypeInitState cctorState;
+
+        // Prevent from begin created
+        public RuntimeType();
+
+        // Given a class handle, this will return the class for that handle.
+        public unsafe static Type GetTypeFromHandleImpl(RuntimeTypeHandle handle);
+
+        // Return the name of the class.  The name does not contain the namespace.
+        public override String Name {
+            get;
+        }
+
+        public override int GetHashCode();
+
+        // Return the name of the class.  The name does not contain the namespace.
+        public override String ToString();
+
+        // Return the fully qualified name.  The name does contain the namespace.
+        public override String FullName {
+            get;
+        }
+
+        // Return the name space.
+        public override String Directory
+        {
+            get;
+        }
+
+        // Returns the base class for a class.  If this is an interface or has
+        // no base class null is returned.  Object is the only Type that does not
+        // have a base class.
+        public override Type BaseType {
+            get;
+        }
+
+
+        public override int GetArrayRank();
+
+        // GetInterfaces
+        // This method will return all of the interfaces implemented by a
+        //  class
+        public override Type[] GetInterfaces();
+
+        ////////////////////////////////////////////////////////////////////////////////
+        //
+        // Attributes
+        //
+        //   The attributes are all treated as read-only properties on a class.  Most of
+        //  these boolean properties have flag values defined in this class and act like
+        //  a bit mask of attributes.  There are also a set of boolean properties that
+        //  relate to the classes relationship to other classes and to the state of the
+        //  class inside the runtime.
+        //
+        ////////////////////////////////////////////////////////////////////////////////
+
+        // Public routine to determine if this class represents an Array
+        protected override bool IsArrayImpl();
+
+        // Public routine to determine if this class represents a primitive type
+        protected override bool IsPrimitiveImpl();
+
+        public bool IsVector {
+            get;
+        }
+
+        public bool IsRectangleArray {
+            get;
+        }
+
+        public override Type GetElementType();
+
+        protected override bool HasElementTypeImpl();
+
+        // Return the underlying Type that represents the IReflect Object.  For expando object,
+        // this is the (Object) IReflectInstance.GetType().  For Type object it is this.
+        public override Type UnderlyingSystemType {
+            get;
+        }
+
+        //
+        // ICloneable Implementation
+        //
+
+        // RuntimeType's are unique in the system, so the only thing that we should do to clone them is
+        // return the current instance.
+        public Object Clone();
+
+        public override bool IsSubclassOf(Type c);
+    }
+#endif
+}
diff --git a/base/Interfaces/Basetypes/RuntimeTypeHandle.csi b/base/Interfaces/Basetypes/RuntimeTypeHandle.csi
new file mode 100644
index 0000000..eb685a6
--- /dev/null
+++ b/base/Interfaces/Basetypes/RuntimeTypeHandle.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct RuntimeTypeHandle
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+    }
+}
diff --git a/base/Interfaces/Basetypes/SByte.csi b/base/Interfaces/Basetypes/SByte.csi
new file mode 100644
index 0000000..369f103
--- /dev/null
+++ b/base/Interfaces/Basetypes/SByte.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct SByte : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const sbyte MaxValue;
+        public const sbyte MinValue;
+
+        public int CompareTo(Object obj);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static sbyte Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/SchedulerTime.csi b/base/Interfaces/Basetypes/SchedulerTime.csi
new file mode 100644
index 0000000..119b986
--- /dev/null
+++ b/base/Interfaces/Basetypes/SchedulerTime.csi
@@ -0,0 +1,92 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    // This value type represents an absolute time on the scheduler timeline,
+    // which is kernel time increasing monotonically and independently of 
+    // the world time the machine thinks it is on. 
+    // The reason to separate world time and scheduler time is that world time can
+    // change at any time due to users changing the time and date, or due to
+    // adjustments for accuracy or daylight-savings.
+    //
+    public struct SchedulerTime : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public static readonly SchedulerTime MinValue;
+        public static readonly SchedulerTime MaxValue;
+
+        public SchedulerTime(long ticks);
+        public SchedulerTime(int year, int month, int day);
+        public SchedulerTime(int year, int month, int day, int hour, int minute, int second);
+        public SchedulerTime(int year, int month, int day, int hour, int minute, int second, int millisecond);
+
+        public SchedulerTime Add(TimeSpan value);
+        public SchedulerTime AddDays(int value);
+        public SchedulerTime AddHours(int value);
+        public SchedulerTime AddMilliseconds(int value);
+        public SchedulerTime AddMinutes(int value);
+        public SchedulerTime AddMonths(int months);
+        public SchedulerTime AddSeconds(int value);
+        public SchedulerTime AddTicks(long value);
+        public SchedulerTime AddYears(int value);
+        public TimeSpan Subtract(SchedulerTime value);
+        public SchedulerTime Subtract(TimeSpan value);
+
+        public static int Compare(SchedulerTime t1, SchedulerTime t2);
+
+        public int CompareTo(Object value);
+
+#if false
+        public static int DaysInMonth(int year, int month);
+#endif
+
+        public override bool Equals(Object value);
+        public override int GetHashCode();
+        public override String ToString();
+        public String ToString(String format);
+
+        public static bool Equals(SchedulerTime t1, SchedulerTime t2);
+
+        public static SchedulerTime Now { get; }
+
+#if false        
+        public static SchedulerTime FromFileTimeUtc(long fileTime);
+
+        public SchedulerTime Date { get; }
+        public int Day { get; }
+        public int Hour { get; }
+        public int Millisecond { get; }
+        public int Minute { get; }
+        public int Month { get; }
+        public static SchedulerTime UtcNow { get; }
+        public int Second { get; }
+        public long Ticks { get; }
+        public TimeSpan TimeOfDay { get; }
+        public static SchedulerTime Today { get; }
+        public int Year { get; }
+
+        public static bool IsLeapYear(int year);
+
+        public String ToLongDateString();
+        public String ToLongTimeString();
+        public String ToShortDateString();
+        public String ToShortTimeString();
+#endif
+
+        public static SchedulerTime operator +(SchedulerTime d, TimeSpan t);
+        public static SchedulerTime operator -(SchedulerTime d, TimeSpan t);
+        public static TimeSpan operator -(SchedulerTime d1, SchedulerTime d2);
+        public static bool operator ==(SchedulerTime d1, SchedulerTime d2);
+        public static bool operator !=(SchedulerTime d1, SchedulerTime d2);
+        public static bool operator <(SchedulerTime t1, SchedulerTime t2);
+        public static bool operator <=(SchedulerTime t1, SchedulerTime t2);
+        public static bool operator >(SchedulerTime t1, SchedulerTime t2);
+        public static bool operator >=(SchedulerTime t1, SchedulerTime t2);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Single.csi b/base/Interfaces/Basetypes/Single.csi
new file mode 100644
index 0000000..459f07d
--- /dev/null
+++ b/base/Interfaces/Basetypes/Single.csi
@@ -0,0 +1,40 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System {
+    public struct Single : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const float MinValue;
+        public const float Epsilon;
+        public const float MaxValue;
+        public const float PositiveInfinity;
+        public const float NegativeInfinity;
+        public const float NaN;
+
+        public static bool IsInfinity(float f);
+        public static bool IsPositiveInfinity(float f);
+        public static bool IsNegativeInfinity(float f);
+        public static bool IsNaN(float f);
+
+        public static float ToSingle(byte[] buffer);
+
+        public static void GetBytes(float value, byte[] buffer);
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static float Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/StackOverflowException.csi b/base/Interfaces/Basetypes/StackOverflowException.csi
new file mode 100644
index 0000000..08478dc
--- /dev/null
+++ b/base/Interfaces/Basetypes/StackOverflowException.csi
@@ -0,0 +1,14 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System {
+
+    public sealed class StackOverflowException : SystemException {
+        public StackOverflowException();
+        public StackOverflowException(String message);
+        public StackOverflowException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/String.csi b/base/Interfaces/Basetypes/String.csi
new file mode 100644
index 0000000..cdc6b39
--- /dev/null
+++ b/base/Interfaces/Basetypes/String.csi
@@ -0,0 +1,145 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    [CCtorIsRunDuringStartup]
+    public sealed class String : IComparable, ICloneable
+    {
+        public static readonly String Empty;
+
+        public String(char [] value, int startIndex, int length);
+        public String(char [] value);
+        public String(char c, int count);
+
+        public static String Join(String separator, String[] value);
+        public static String Join(String separator, String[] value, int startIndex, int count);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public bool Equals(String value);
+        public static bool Equals(String a, String b);
+
+        public static bool operator == (String a, String b);
+        public static bool operator != (String a, String b);
+
+        public char this[int index] { get; }
+
+        public void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count);
+
+        public char[] ToCharArray();
+        public char[] ToCharArray(int startIndex, int length);
+
+        public int Length { get; }
+
+        public String[] Split(params char [] separator);
+        public String[] Split(char[] separator, int count);
+
+        public String Substring (int startIndex);
+        public String Substring (int startIndex, int length);
+
+        public static String StringCTOR(char[] value, int startIndex, int length);
+        public static String StringCTOR(char[] value);
+        public static String StringCTOR(char c, int count);
+
+        public String Trim(params char[] trimChars);
+        public String TrimStart(params char[] trimChars);
+        public String TrimEnd(params char[] trimChars);
+
+        public static int Compare(String strA, String strB);
+        public static int Compare(String strA, String strB, bool ignoreCase);
+        public static int Compare(String strA, int indexA, String strB, int indexB, int length);
+        public static int Compare(String strA, int indexA, String strB, int indexB, int length, bool ignoreCase);
+
+        public int CompareTo(Object value);
+        public int CompareTo(String strB);
+
+        public static int CompareOrdinal(String strA, String strB);
+        public static int CompareOrdinal(String strA, int indexA, String strB, int indexB, int length);
+
+        public bool EndsWith(String value);
+
+        public int IndexOf(char value);
+        public int IndexOf(char value, int startIndex);
+        public int IndexOf(char value, int startIndex, int count);
+
+        public int IndexOfAny(char [] anyOf);
+        public int IndexOfAny(char [] anyOf, int startIndex);
+        public int IndexOfAny(char [] anyOf, int startIndex, int count);
+
+        public int IndexOf(String value);
+        public int IndexOf(String value, int startIndex);
+        public int IndexOf(String value, int startIndex, int count);
+
+        public int LastIndexOf(char value);
+        public int LastIndexOf(char value, int startIndex);
+        public int LastIndexOf(char value, int startIndex, int count);
+
+        public int LastIndexOfAny(char [] anyOf);
+        public int LastIndexOfAny(char [] anyOf, int startIndex);
+        public int LastIndexOfAny(char [] anyOf, int startIndex, int count);
+
+        public int LastIndexOf(String value);
+        public int LastIndexOf(String value, int startIndex);
+        public int LastIndexOf(String value, int startIndex, int count);
+
+        public String PadLeft(int totalWidth);
+        public String PadLeft(int totalWidth, char paddingChar);
+
+        public String PadRight(int totalWidth);
+        public String PadRight(int totalWidth, char paddingChar);
+
+        public String ToLower();
+        public String ToUpper();
+
+        public Object Clone();
+
+        public String Trim();
+        public String Insert(int startIndex, String value);
+        public String Replace(char oldChar, char newChar);
+        public String Replace(String oldValue, String newValue);
+        public String Remove(int startIndex, int count);
+
+        public static String Format(String format, Object arg0);
+        public static String Format(String format, Object arg0, Object arg1);
+        public static String Format(String format, Object arg0, Object arg1, Object arg2);
+        public static String Format(String format, params Object[] args);
+
+        public static String Copy (String str);
+
+        public static String Concat(Object arg0);
+        public static String Concat(Object arg0, Object arg1);
+        public static String Concat(Object arg0, Object arg1, Object arg2);
+        public static String Concat(params Object[] args);
+        public static String Concat(String str0, String str1);
+        public static String Concat(String str0, String str1, String str2);
+        public static String Concat(String str0, String str1, String str2, String str3);
+
+        public static String Concat(object obj0, object obj1, object obj2,
+                                    object obj3, string obj4, string obj5,
+                                    string obj6, string obj7);
+        public static String Concat(params String[] values);
+
+        public static String Intern(String str);
+
+        public static String IsInterned(String str);
+
+#if !DONT_DO_BARTOK
+        private static String[] internedStringConstants;
+
+        [RequiredByBartok] 
+        private int  m_arrayLength;
+        [AccessedByRuntime("referenced from c++")] 
+        private int  m_stringLength;
+        [AccessedByRuntime("referenced from c++")] 
+        private char m_firstChar;
+#endif
+    }
+}
diff --git a/base/Interfaces/Basetypes/SystemException.csi b/base/Interfaces/Basetypes/SystemException.csi
new file mode 100644
index 0000000..997fb6b
--- /dev/null
+++ b/base/Interfaces/Basetypes/SystemException.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System {
+
+    public class SystemException : Exception
+    {
+        public SystemException();
+        public SystemException(String message);
+        public SystemException(String message, Exception innerException);
+    }
+}
diff --git a/base/Interfaces/Basetypes/TimeSpan.csi b/base/Interfaces/Basetypes/TimeSpan.csi
new file mode 100644
index 0000000..328930d
--- /dev/null
+++ b/base/Interfaces/Basetypes/TimeSpan.csi
@@ -0,0 +1,77 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public struct TimeSpan : IComparable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const long TicksPerMillisecond;
+        public const long TicksPerSecond;
+        public const long TicksPerMinute;
+        public const long TicksPerHour;
+        public const long TicksPerDay;
+
+        public static readonly TimeSpan Zero;
+        public static readonly TimeSpan MaxValue;
+        public static readonly TimeSpan MinValue;
+
+        public TimeSpan(long ticks);
+        public TimeSpan(int hours, int minutes, int seconds);
+        public TimeSpan(int days, int hours, int minutes, int seconds);
+        public TimeSpan(int days, int hours, int minutes, int seconds, int milliseconds);
+
+        public long Ticks { get; }
+        public int Days { get; }
+        public int Hours { get; }
+        public int Milliseconds { get; }
+        public int Minutes { get; }
+        public int Seconds { get; }
+        public double TotalDays { get; }
+        public double TotalHours { get; }
+        public double TotalMilliseconds { get; }
+        public double TotalMinutes { get; }
+        public double TotalSeconds { get; }
+
+        public static int Compare(TimeSpan t1, TimeSpan t2);
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object value);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public static bool Equals(TimeSpan t1, TimeSpan t2);
+
+        public static TimeSpan FromDays(double value);
+        public static TimeSpan FromHours(double value);
+        public static TimeSpan FromMilliseconds(double value);
+        public static TimeSpan FromMinutes(double value);
+        public static TimeSpan FromSeconds(double value);
+        public static TimeSpan FromTicks(long value);
+
+        public static TimeSpan Parse(String s);
+
+        public TimeSpan Duration();
+        public TimeSpan Negate();
+        public TimeSpan Add(TimeSpan ts);
+        public TimeSpan Subtract(TimeSpan ts);
+
+        public static TimeSpan operator -(TimeSpan t);
+        public static TimeSpan operator -(TimeSpan t1, TimeSpan t2);
+        public static TimeSpan operator +(TimeSpan t);
+        public static TimeSpan operator +(TimeSpan t1, TimeSpan t2);
+
+        public static bool operator ==(TimeSpan t1, TimeSpan t2);
+        public static bool operator !=(TimeSpan t1, TimeSpan t2);
+        public static bool operator <(TimeSpan t1, TimeSpan t2);
+        public static bool operator <=(TimeSpan t1, TimeSpan t2);
+        public static bool operator >(TimeSpan t1, TimeSpan t2);
+        public static bool operator >=(TimeSpan t1, TimeSpan t2);
+    }
+}
diff --git a/base/Interfaces/Basetypes/Type.csi b/base/Interfaces/Basetypes/Type.csi
new file mode 100644
index 0000000..c7abd10
--- /dev/null
+++ b/base/Interfaces/Basetypes/Type.csi
@@ -0,0 +1,86 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    public abstract class Type
+    {
+        public static readonly char Delimiter;
+
+        public readonly static Type[] EmptyTypes;
+
+        protected Type();
+
+        public static TypeCode GetTypeCode(Type type);
+        public static Type GetTypeFromHandle(RuntimeTypeHandle handle);
+
+        public abstract String Name { get; }
+        public abstract String FullName { get; }
+        public abstract String Directory { get; }
+
+        public virtual int GetArrayRank();
+
+        public abstract Type BaseType { get; }
+        public abstract Type[] GetInterfaces();
+
+        public bool IsNotPublic { get; }
+        public bool IsPublic { get; }
+        public bool IsNestedPublic { get; }
+        public bool IsNestedPrivate { get; }
+        public bool IsNestedFamily { get; }
+        public bool IsNestedAssembly { get; }
+        public bool IsNestedFamANDAssem { get; }
+        public bool IsNestedFamORAssem{ get; }
+
+        public bool IsAutoLayout { get; }
+        public bool IsLayoutSequential { get; }
+        public bool IsExplicitLayout { get; }
+
+        public bool IsClass { get; }
+        public bool IsInterface { get; }
+        public bool IsValueType { get; }
+
+        public bool IsAbstract { get; }
+        public bool IsSealed { get; }
+        public bool IsEnum { get; }
+        public bool IsSpecialName { get; }
+        public bool IsImport { get; }
+
+        public bool IsAnsiClass { get; }
+        public bool IsUnicodeClass { get; }
+        public bool IsAutoClass { get; }
+
+        public bool IsArray { get; }
+
+        public bool IsPrimitive { get; }
+        public bool HasElementType { get; }
+
+        protected virtual bool IsValueTypeImpl();
+        protected abstract bool IsArrayImpl();
+        protected abstract bool IsPrimitiveImpl();
+
+        public abstract Type GetElementType();
+        protected abstract bool HasElementTypeImpl();
+
+        public abstract Type UnderlyingSystemType { get; }
+
+        public virtual bool IsSubclassOf(Type c);
+
+        public override String ToString();
+
+        public static Type[] GetTypeArray(Object[] args);
+
+        public override bool Equals(Object o);
+
+        public bool Equals(Type o);
+
+        public override int GetHashCode();
+    }
+}
diff --git a/base/Interfaces/Basetypes/TypeCode.csi b/base/Interfaces/Basetypes/TypeCode.csi
new file mode 100644
index 0000000..08c76ab
--- /dev/null
+++ b/base/Interfaces/Basetypes/TypeCode.csi
@@ -0,0 +1,30 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public enum TypeCode
+    {
+        Empty = 0,
+        Object = 1,
+
+        Boolean = 3,
+        Char = 4,
+        SByte = 5,
+        Byte = 6,
+        Int16 = 7,
+        UInt16 = 8,
+        Int32 = 9,
+        UInt32 = 10,
+        Int64 = 11,
+        UInt64 = 12,
+        Single = 13,
+        Double = 14,
+        Decimal = 15,
+        DateTime = 16,
+        String = 18,
+    }
+}
diff --git a/base/Interfaces/Basetypes/TypedReference.csi b/base/Interfaces/Basetypes/TypedReference.csi
new file mode 100644
index 0000000..748d94a
--- /dev/null
+++ b/base/Interfaces/Basetypes/TypedReference.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    public struct TypedReference
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public static Object ToObject(TypedReference value);
+
+        public override int GetHashCode();
+        public override bool Equals(Object o);
+
+        public static Type GetTargetType(TypedReference value);
+        public static RuntimeTypeHandle TargetTypeToken(TypedReference value);
+
+        public static void SetTypedReference(TypedReference target,
+                                             Object value);
+        [RequiredByBartok]
+        public static TypedReference MakeRefAny(IntPtr value, RuntimeType type);
+        [RequiredByBartok]
+        public static RuntimeTypeHandle RefAnyType(TypedReference tr);
+        [RequiredByBartok]
+        public static IntPtr RefAnyValue(TypedReference tr, RuntimeType type);
+    }
+}
diff --git a/base/Interfaces/Basetypes/UInt16.csi b/base/Interfaces/Basetypes/UInt16.csi
new file mode 100644
index 0000000..de5be0c
--- /dev/null
+++ b/base/Interfaces/Basetypes/UInt16.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct UInt16 : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const ushort MaxValue;
+        public const ushort MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static ushort Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/UInt32.csi b/base/Interfaces/Basetypes/UInt32.csi
new file mode 100644
index 0000000..d71f877
--- /dev/null
+++ b/base/Interfaces/Basetypes/UInt32.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct UInt32 : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const uint MaxValue;
+        public const uint MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static uint Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/UInt64.csi b/base/Interfaces/Basetypes/UInt64.csi
new file mode 100644
index 0000000..93c5382
--- /dev/null
+++ b/base/Interfaces/Basetypes/UInt64.csi
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Globalization;
+
+namespace System
+{
+    public struct UInt64 : IComparable, IFormattable
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+        public const ulong MaxValue;
+        public const ulong MinValue;
+
+        public int CompareTo(Object value);
+
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+
+        public String ToString(String format);
+        public static ulong Parse(String s);
+    }
+}
diff --git a/base/Interfaces/Basetypes/UIntPtr.csi b/base/Interfaces/Basetypes/UIntPtr.csi
new file mode 100644
index 0000000..b2ad028
--- /dev/null
+++ b/base/Interfaces/Basetypes/UIntPtr.csi
@@ -0,0 +1,104 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    public struct UIntPtr
+    {
+#if !DONT_DO_BARTOK
+        private int m_value;
+#endif
+
+        public static readonly UIntPtr Zero;
+        public static readonly int Size;
+
+        [NoHeapAllocation]
+        public UIntPtr(uint value);
+        [NoHeapAllocation]
+        public UIntPtr(int value);
+        [NoHeapAllocation]
+        public UIntPtr(ulong value);
+        [NoHeapAllocation]
+        public unsafe UIntPtr(void* value);
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        [NoHeapAllocation]
+        public uint ToUInt32();
+        [NoHeapAllocation]
+        public ulong ToUInt64();
+        public override String ToString();
+        public String ToString(String format);
+        [NoHeapAllocation]
+        public static explicit operator IntPtr (UIntPtr value);
+        [NoHeapAllocation]
+        public static implicit operator UIntPtr (uint value);
+        [NoHeapAllocation]
+        public static implicit operator UIntPtr (ulong value);
+        [NoHeapAllocation]
+        public static explicit operator uint (UIntPtr  value);
+        [NoHeapAllocation]
+        public static explicit operator ulong (UIntPtr  value);
+        [NoHeapAllocation]
+        public static unsafe explicit operator UIntPtr (void* value);
+        [NoHeapAllocation]
+        public static unsafe explicit operator void* (UIntPtr value);
+
+        [NoHeapAllocation]
+        public static bool operator == (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static bool operator != (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator - (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator - (UIntPtr value1, uint value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator - (UIntPtr value1, int value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator -- (UIntPtr value);
+        [NoHeapAllocation]
+        public static UIntPtr operator + (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator + (UIntPtr value1, uint value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator + (UIntPtr value1, int value2);
+        [NoHeapAllocation]
+        public static unsafe sbyte * operator + (sbyte *value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static unsafe short * operator + (short *value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static unsafe short * operator - (short *value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator ++ (UIntPtr value);
+        [NoHeapAllocation]
+        public static UIntPtr operator * (UIntPtr value1, uint value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator / (UIntPtr value1, uint value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator >> (UIntPtr value, int shift);
+        [NoHeapAllocation]
+        public static UIntPtr operator << (UIntPtr value, int shift);
+        [NoHeapAllocation]
+        public static uint operator & (UIntPtr value1, uint value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator & (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator | (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static UIntPtr operator ~ (UIntPtr value);
+        [NoHeapAllocation]
+        public static bool operator < (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static bool operator > (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static bool operator <= (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public static bool operator >= (UIntPtr value1, UIntPtr value2);
+        [NoHeapAllocation]
+        public unsafe void* ToPointer();
+    }
+}
diff --git a/base/Interfaces/Basetypes/ValueType.csi b/base/Interfaces/Basetypes/ValueType.csi
new file mode 100644
index 0000000..4f872a5
--- /dev/null
+++ b/base/Interfaces/Basetypes/ValueType.csi
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public abstract class ValueType
+    {
+        public override bool Equals(Object obj);
+        public override int GetHashCode();
+        public override String ToString();
+    }
+}
diff --git a/base/Interfaces/Basetypes/Vtable.csi b/base/Interfaces/Basetypes/Vtable.csi
new file mode 100644
index 0000000..cd6c2d0
--- /dev/null
+++ b/base/Interfaces/Basetypes/Vtable.csi
@@ -0,0 +1,273 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using Microsoft.Bartok.Runtime;
+using Microsoft.Singularity;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System;
+
+namespace System {
+
+#if !DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+    public struct InterfaceInfo {
+        public System.RuntimeType type;
+        public IntPtr offset;
+    }
+
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    public sealed class VTable {
+        public readonly StructuralType arrayOf;
+        public readonly VTable arrayElementClass;
+        public readonly int arrayElementSize;
+        public readonly InterfaceInfo[] interfaces;
+        public readonly uint baseLength;
+        public readonly uint baseAlignment;
+        public readonly UIntPtr pointerTrackingMask;
+        public readonly StructuralType structuralView;
+        public readonly RuntimeType vtableType;
+        public readonly int marshalSize;
+
+        public static bool runtimeInitialized;
+
+        // [MethodImplAttribute(MethodImplOptions.InternalCall)] :: Created by Bartok.
+        [RequiredByBartok]
+        private static void Initialize();
+
+        static public void Initialize(RuntimeType mainType);
+
+        public static Object InitObjectAt(UIntPtr addr, VTable vtable);
+
+        public static Object InitObjectAt(UIntPtr addr, VTable vtable, uint count);
+
+        public static Object InitObjectAt(UIntPtr addr, Type t);
+
+        public static Object InitObjectAt(UIntPtr addr, Type t, uint count);
+
+        static VTable();
+
+        public static void checkNonNull(object obj);
+
+        [RequiredByBartok]
+        public static void checkUnbox(object obj, int structuralType);
+        [RequiredByBartok]
+        public static void checkArrayStore(object obj1,object obj2);
+
+        [RequiredByBartok]
+        public static void checkArrayElementAddress(RuntimeType ty,
+                                                    object obj);
+
+        public static bool isValidAssignment(RuntimeType ty,RuntimeType objTy);
+
+        public static bool isValidAssignmentMedium(RuntimeType ty,
+                                                   RuntimeType objTy);
+
+        [RequiredByBartok]
+        public static Object isInstanceOf(RuntimeType ty,object obj);
+
+        [RequiredByBartok]
+        public static void checkClassCast(RuntimeType ty,object obj);
+
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfNonNullExact(VTable v,
+                                                           Object obj,
+                                                           int vtargetDepth);
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfExact(VTable v,
+                                                    Object obj,
+                                                    int vtargetDepth);
+
+        [RequiredByBartok]
+        public static Object newIsInstanceOfNonNullSimple(VTable v,
+                                                          Object obj,
+                                                          int vtargetDepth);
+
+        [RequiredByBartok]
+        public static Object newIsInstanceOfSimple(VTable v,
+                                                   Object obj,
+                                                   int vtargetDepth);
+
+        [RequiredByBartok]
+        public static Object newIsInstanceOfNonNullComplex(VTable v,
+                                                           Object obj,
+                                                           int vtargetDepth);
+
+        [RequiredByBartok]
+        public static Object newIsInstanceOfComplex(VTable v,
+                                                    Object obj,
+                                                    int vtargetDepth);
+
+        public static void newCheckClassCast(VTable v,
+                                             object obj,
+                                             int vtargetDepth,
+                                             bool mayBeNull,
+                                             bool mustBeExact,
+                                             bool alwaysSimple);
+
+        [RequiredByBartok]
+        internal static void newCheckClassCastNonNullExact(VTable v,
+                                                           object obj,
+                                                           int vtargetDepth);
+
+        [RequiredByBartok]
+        internal static void newCheckClassCastExact(VTable v,
+                                                    object obj,
+                                                    int vtargetDepth);
+
+        [RequiredByBartok]
+        public static void newCheckClassCastNonNullSimple(VTable v,
+                                                          object obj,
+                                                          int vtargetDepth);
+
+        [RequiredByBartok]
+        public static void newCheckClassCastSimple(VTable v,
+                                                   object obj,
+                                                   int vtargetDepth);
+
+        [RequiredByBartok]
+        public static void newCheckClassCastNonNullComplex(VTable v,
+                                                           object obj,
+                                                           int vtargetDepth);
+
+        [RequiredByBartok]
+        public static void newCheckClassCastComplex(VTable v,
+                                                    object obj,
+                                                    int vtargetDepth);
+
+        // Bartok intrinsics
+        public static UIntPtr addressOf(Object o);
+        public static Object fromAddress(UIntPtr v);
+        //        public static Thread toThread(Object o);
+        public static VTable toVTable(Object o);
+        public static Array toArray(Object o);
+        public static String toString(Object o);
+        public static RuntimeType toRuntimeType(Object o);
+        public static Type toType(Object o);
+
+        public static void calli(System.UIntPtr p);
+        public static void calli(System.UIntPtr p, System.UIntPtr v);
+
+        public static ulong mulUIntUIntToULong(uint x, uint y);
+
+        public static void callFinalizer(Object o);
+
+        [RequiredByBartok]
+        public static void initType(RuntimeType ty);
+
+        public static void throwNewClassCastException();
+        public static void throwNewArgumentOutOfRangeException();
+        [RequiredByBartok]
+        public static void throwNewIndexOutOfRangeException();
+        [RequiredByBartok]
+        public static void throwNewStringIndexOutOfRangeException();
+        public static void throwNewArrayTypeMismatchException();
+        [RequiredByBartok]
+        public static void throwNewOverflowException();
+        [RequiredByBartok]
+        public static void throwNewDivideByZeroException();
+        [RequiredByBartok]
+        public static void throwNewArithmeticException();
+
+        [RequiredByBartok]
+        public static IntPtr interfaceOffset(VTable v,RuntimeType ty);
+
+        public static void gcFromAllocate();
+
+        public static void structZero(object dest,int size);
+
+        [RequiredByBartok]
+        public static int doubleToInt(double d);
+        [RequiredByBartok]
+        public static long doubleToLong(double d);
+        [RequiredByBartok]
+        public static int floatToInt(float f);
+        [RequiredByBartok]
+        public static long floatToLong(float  f);
+        [RequiredByBartok]
+        public static int checkedDoubleToInt(double d);
+        [RequiredByBartok]
+        public static long checkedDoubleToLong(double d);
+        [RequiredByBartok]
+        public static int checkedFloatToInt(float f);
+        [RequiredByBartok]
+        public static long checkedFloatToLong(float  f);
+        [RequiredByBartok]
+        public static float floatRem(float f1, float f2);
+        [RequiredByBartok]
+        public static double doubleRem(double d1, double d2);
+        [RequiredByBartok]
+        static public long mulOverflowSigned64Bit(long x,long y);
+        [RequiredByBartok]
+        static public ulong mulOverflowUnsigned64Bit(ulong x,ulong y);
+        [RequiredByBartok]
+        static public ulong mulUnsigned64Bit(ulong x,ulong y);
+
+        public const bool enableLibraryOptions;
+        public static bool enableDebugPrint;
+        public static bool enableGCVerify;
+        public static bool enableGCTiming;
+        public static bool enableDumpSyncBlocks;
+        public static bool enableDumpInterface;
+        [RequiredByBartok]
+        public static bool useLinkedStack;
+
+        public static bool EnableLibraryNotImplemented();
+        public static bool EnableLibraryAsserts();
+        public static void NotImplemented();
+        public static void NotImplemented(String msg);
+        public static void NotReached();
+        public static void NotReached(String msg);
+
+        public static void Assert(bool expr);
+        public static void Deny(bool expr);
+        public static void AssertForRedundant(bool expr);
+        public static void DenyForRedundant(bool expr);
+        public static void Assert(bool expr, String s);
+        public static void Deny(bool expr, String s);
+
+        [RequiredByBartok]
+        static public void DebugPrint(String s);
+        static public void DebugPrint(byte b);
+        static public void DebugPrint(int i);
+        static public void DebugPrint(long l);
+        static public void DebugPrint(ulong l);
+        static public void DebugPrint(int i, int width);
+        static public void DebugPrint(long l, int width);
+        static public void DebugPrint(ulong l, int width);
+        static public void DebugPrint(bool b);
+        static public void DebugDump(object o);
+        static public void DebugBreak();
+        static public void DebugBreakSilent();
+        // static public void DebugTrap(ref X86ThreadContext context, bool firstChance);
+        static public void DebugStack();
+        static public bool DebugPoll();
+
+        static public void Kill(int action);
+
+        static public UIntPtr CommandLine();
+
+        static public bool IsExceptionHandler(Type t,Exception e);
+
+	[RequiredByBartok]
+        static public void Shutdown();
+
+        static public void TerminateByException(Exception e);
+
+        static public void DumpException(Exception e);
+
+        ////////////////////////////////////////////////////////////// Memcpy.
+        //
+        public unsafe static void memcpy(byte* src, int srcIndex, byte[] dest,
+                                         int destIndex, int len);
+        public static void memcpy(byte[] src, int srcIndex, byte* dest,
+                                  int destIndex, int len);
+        public unsafe static void memcpyimpl(byte* src, byte* dest, uint len);
+        public unsafe static void memcpyimpl(byte* src, byte* dest, int len);
+    }
+#endif // !DONT_INCLUDE_TEMPORARY_STUFF_FOR_GC
+}
diff --git a/base/Interfaces/Collections/ArrayList.csi b/base/Interfaces/Collections/ArrayList.csi
new file mode 100644
index 0000000..c3aa6ff
--- /dev/null
+++ b/base/Interfaces/Collections/ArrayList.csi
@@ -0,0 +1,89 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // Implements a variable-size List that uses an array of objects to store the
+    // elements. A ArrayList has a capacity, which is the allocated length
+    // of the internal array. As elements are added to a ArrayList, the capacity
+    // of the ArrayList is automatically increased as required by reallocating the
+    // internal array.
+    public class ArrayList : IList, ICloneable
+    {
+        public ArrayList();
+        public ArrayList(int capacity);
+        public ArrayList(ICollection c);
+
+        public virtual int Capacity { get; set; }
+        public virtual int Count { get; }
+        public virtual bool IsFixedSize { get; }
+        public virtual bool IsReadOnly { get; }
+        public virtual bool IsSynchronized { get; }
+        public virtual Object SyncRoot { get; }
+        public virtual Object this[int index] { get; set; }
+
+        public static ArrayList Adapter(IList list);
+
+        public static IList FixedSize(IList list);
+        public static ArrayList FixedSize(ArrayList list);
+
+        public static IList ReadOnly(IList list);
+        public static ArrayList ReadOnly(ArrayList list);
+
+        public static IList Synchronized(IList list);
+        public static ArrayList Synchronized(ArrayList list);
+
+        public virtual int Add(Object value);
+        public virtual void AddRange(ICollection c);
+        public virtual int BinarySearch(int index, int count, Object value, IComparer comparer);
+        public virtual int BinarySearch(Object value);
+        public virtual int BinarySearch(Object value, IComparer comparer);
+        public virtual void Clear();
+        public virtual Object Clone();
+        public virtual bool Contains(Object item);
+
+        public virtual void CopyTo(Array array);
+        public virtual void CopyTo(Array array, int arrayIndex);
+        public virtual void CopyTo(int index, Array array, int arrayIndex, int count);
+
+        public virtual IEnumerator GetEnumerator();
+        public virtual IEnumerator GetEnumerator(int index, int count);
+
+        public virtual int IndexOf(Object value);
+        public virtual int IndexOf(Object value, int startIndex);
+        public virtual int IndexOf(Object value, int startIndex, int count);
+
+        public virtual void Insert(int index, Object value);
+        public virtual void InsertRange(int index, ICollection c);
+
+        public virtual int LastIndexOf(Object value);
+        public virtual int LastIndexOf(Object value, int startIndex);
+        public virtual int LastIndexOf(Object value, int startIndex, int count);
+
+        public virtual void Remove(Object obj);
+        public virtual void RemoveAt(int index);
+        public virtual void RemoveRange(int index, int count);
+
+        public static ArrayList Repeat(Object value, int count);
+
+        public virtual void Reverse();
+        public virtual void Reverse(int index, int count);
+
+        public virtual void SetRange(int index, ICollection c);
+
+        public virtual ArrayList GetRange(int index, int count);
+
+        public virtual void Sort();
+        public virtual void Sort(IComparer comparer);
+        public virtual void Sort(int index, int count, IComparer comparer);
+
+        public virtual Object[] ToArray();
+        public virtual Array ToArray(Type type);
+
+        public virtual void TrimToSize();
+    }
+}
diff --git a/base/Interfaces/Collections/BitArray.csi b/base/Interfaces/Collections/BitArray.csi
new file mode 100644
index 0000000..f47f953
--- /dev/null
+++ b/base/Interfaces/Collections/BitArray.csi
@@ -0,0 +1,47 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Diagnostics;
+
+namespace System.Collections {
+    // A vector of bits.  Use this to store bits efficiently, without having to do bit
+    // shifting yourself.
+    public sealed class BitArray : ICollection, ICloneable {
+        public BitArray(int length);
+        public BitArray(int length, bool defaultValue);
+        public BitArray(byte[] bytes);
+        public BitArray(bool[] values);
+        public BitArray(int[] values);
+        public BitArray(BitArray bits);
+
+        public bool this[int index] { get; set; }
+
+        public bool Get(int index);
+        public void Set(int index, bool value);
+        public void SetAll(bool value);
+        public BitArray And(BitArray value);
+        public BitArray Or(BitArray value);
+        public BitArray Xor(BitArray value);
+        public BitArray Not();
+
+        public int Length { get; set; }
+
+        public void CopyTo(Array array, int index);
+
+        public int Count { get; }
+
+        public Object Clone();
+
+        public Object SyncRoot { get; }
+
+        public bool IsReadOnly { get; }
+
+        public bool IsSynchronized { get; }
+
+        public IEnumerator GetEnumerator();
+    }
+}
diff --git a/base/Interfaces/Collections/CaseInsensitiveComparer.csi b/base/Interfaces/Collections/CaseInsensitiveComparer.csi
new file mode 100644
index 0000000..ab02120
--- /dev/null
+++ b/base/Interfaces/Collections/CaseInsensitiveComparer.csi
@@ -0,0 +1,20 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Globalization;
+
+namespace System.Collections {
+    public class CaseInsensitiveComparer : IComparer {
+        public static readonly CaseInsensitiveComparer Default;
+
+        public CaseInsensitiveComparer();
+
+        public static CaseInsensitiveComparer DefaultInvariant { get; }
+
+        public int Compare(Object a, Object b);
+    }
+}
diff --git a/base/Interfaces/Collections/CaseInsensitiveHashCodeProvider.csi b/base/Interfaces/Collections/CaseInsensitiveHashCodeProvider.csi
new file mode 100644
index 0000000..5e1f3ca
--- /dev/null
+++ b/base/Interfaces/Collections/CaseInsensitiveHashCodeProvider.csi
@@ -0,0 +1,21 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Globalization;
+
+namespace System.Collections {
+    public class CaseInsensitiveHashCodeProvider : IHashCodeProvider {
+
+        public static readonly CaseInsensitiveHashCodeProvider Default;
+
+        public CaseInsensitiveHashCodeProvider();
+
+        public static CaseInsensitiveHashCodeProvider DefaultInvariant { get; }
+
+        public int GetHashCode(Object obj);
+    }
+}
diff --git a/base/Interfaces/Collections/CollectionBase.csi b/base/Interfaces/Collections/CollectionBase.csi
new file mode 100644
index 0000000..7eb626a
--- /dev/null
+++ b/base/Interfaces/Collections/CollectionBase.csi
@@ -0,0 +1,49 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System.Collections {
+    // Useful base class for typed read/write collections where items derive from object
+    public abstract class CollectionBase : IList {
+        ArrayList list;
+
+        protected ArrayList InnerList { get; }
+
+        protected IList List { get; }
+
+        public int Count { get; }
+
+        public void Clear();
+        public void RemoveAt(int index);
+
+        bool IList.IsReadOnly { get; }
+        bool IList.IsFixedSize { get; }
+        bool ICollection.IsSynchronized { get; }
+        Object ICollection.SyncRoot { get; }
+        void ICollection.CopyTo(Array array, int index);
+
+        Object IList.this[int index] { get; set; }
+        bool IList.Contains(Object value);
+        int IList.Add(Object value);
+        void IList.Remove(Object value);
+        int IList.IndexOf(Object value);
+        void IList.Insert(int index, Object value);
+
+        public IEnumerator GetEnumerator();
+
+        protected virtual void OnSet(int index, Object oldValue, Object newValue);
+        protected virtual void OnInsert(int index, Object value);
+        protected virtual void OnClear();
+        protected virtual void OnRemove(int index, Object value);
+        protected virtual void OnValidate(Object value);
+        protected virtual void OnSetComplete(int index, Object oldValue, Object newValue);
+        protected virtual void OnInsertComplete(int index, Object value);
+        protected virtual void OnClearComplete();
+        protected virtual void OnRemoveComplete(int index, Object value);
+    }
+}
diff --git a/base/Interfaces/Collections/Collections.csi b/base/Interfaces/Collections/Collections.csi
new file mode 100644
index 0000000..e4a7d67
--- /dev/null
+++ b/base/Interfaces/Collections/Collections.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Collections.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Collections/Collections.csproj b/base/Interfaces/Collections/Collections.csproj
new file mode 100644
index 0000000..cdf4079
--- /dev/null
+++ b/base/Interfaces/Collections/Collections.csproj
@@ -0,0 +1,50 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Collections\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Collections</AssemblyName>
+    <OutputType>Library</OutputType>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ArrayList.csi" />
+    <Compile Include="BitArray.csi" />
+    <Compile Include="CaseInsensitiveComparer.csi" />
+    <Compile Include="CaseInsensitiveHashCodeProvider.csi" />
+    <Compile Include="Comparer.csi" />
+    <Compile Include="DictionaryEntry.csi" />
+    <Compile Include="Hashtable.csi" />
+    <Compile Include="IDictionary.csi" />
+    <Compile Include="IDictionaryEnumerator.csi" />
+    <Compile Include="IHashCodeProvider.csi" />
+    <Compile Include="Queue.csi" />
+    <Compile Include="SortedList.csi" />
+    <Compile Include="Stack.csi" />
+    <Compile Include="Collections.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+    <ProjectReference Include="..\Baseattrs\Baseattrs.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Collections/Comparer.csi b/base/Interfaces/Collections/Comparer.csi
new file mode 100644
index 0000000..81f8d06
--- /dev/null
+++ b/base/Interfaces/Collections/Comparer.csi
@@ -0,0 +1,19 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Globalization;
+
+namespace System.Collections {
+
+    public sealed class Comparer : IComparer
+    {
+        public static readonly Comparer Default;
+
+        public Comparer();
+        public int Compare(Object a, Object b);
+    }
+}
diff --git a/base/Interfaces/Collections/DictionaryBase.csi b/base/Interfaces/Collections/DictionaryBase.csi
new file mode 100644
index 0000000..36de998
--- /dev/null
+++ b/base/Interfaces/Collections/DictionaryBase.csi
@@ -0,0 +1,50 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System.Collections {
+    // Useful base class for typed read/write collections where items derive from object
+    public abstract class DictionaryBase : IDictionary {
+        Hashtable hashtable;
+
+        protected Hashtable InnerHashtable { get; }
+        protected IDictionary Dictionary { get; }
+        public int Count { get; }
+        bool IDictionary.IsReadOnly { get; }
+        bool IDictionary.IsFixedSize { get; }
+        bool ICollection.IsSynchronized { get; }
+        ICollection IDictionary.Keys { get; }
+        Object ICollection.SyncRoot { get; }
+        ICollection IDictionary.Values { get; }
+
+        public void CopyTo(Array array, int index);
+
+        object IDictionary.this[object key] { get; set; }
+
+        bool IDictionary.Contains(object key);
+        void IDictionary.Add(object key, object value);
+        void IDictionary.Remove(object key);
+
+        public void Clear();
+
+        public IDictionaryEnumerator GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator();
+
+        protected virtual object OnGet(object key, object currentValue);
+        protected virtual void OnSet(object key, object oldValue, object newValue);
+        protected virtual void OnInsert(object key, object value);
+        protected virtual void OnClear();
+        protected virtual void OnRemove(object key, object value);
+        protected virtual void OnValidate(object key, object value);
+        protected virtual void OnSetComplete(object key, object oldValue, object newValue);
+        protected virtual void OnInsertComplete(object key, object value);
+        protected virtual void OnClearComplete();
+        protected virtual void OnRemoveComplete(object key, object value);
+    }
+}
diff --git a/base/Interfaces/Collections/DictionaryEntry.csi b/base/Interfaces/Collections/DictionaryEntry.csi
new file mode 100644
index 0000000..40bf1fb
--- /dev/null
+++ b/base/Interfaces/Collections/DictionaryEntry.csi
@@ -0,0 +1,23 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // A DictionaryEntry holds a key and a value from a dictionary.
+    // It is returned by IDictionaryEnumerator::GetEntry().
+    public struct DictionaryEntry
+    {
+#if !DONT_DO_BARTOK
+        private int value;
+#endif
+
+        public DictionaryEntry(Object key, Object value);
+
+        public Object Key { get; set; }
+        public Object Value { get; set; }
+    }
+}
diff --git a/base/Interfaces/Collections/Hashtable.csi b/base/Interfaces/Collections/Hashtable.csi
new file mode 100644
index 0000000..44bf7ec
--- /dev/null
+++ b/base/Interfaces/Collections/Hashtable.csi
@@ -0,0 +1,62 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+    // The Hashtable class represents a dictionary of associated keys and
+    // values with constant lookup time.
+
+    public class Hashtable : IDictionary, ICloneable
+    {
+        protected IHashCodeProvider hcp { get; set; }
+        protected IComparer comparer { get; set; }
+
+        public Hashtable();
+        public Hashtable(int capacity);
+        public Hashtable(int capacity, float loadFactor);
+        public Hashtable(int capacity, float loadFactor, IHashCodeProvider hcp, IComparer comparer);
+        public Hashtable(IHashCodeProvider hcp, IComparer comparer);
+        public Hashtable(int capacity, IHashCodeProvider hcp, IComparer comparer);
+        public Hashtable(IDictionary d);
+        public Hashtable(IDictionary d, float loadFactor);
+        public Hashtable(IDictionary d, IHashCodeProvider hcp, IComparer comparer);
+        public Hashtable(IDictionary d, float loadFactor, IHashCodeProvider hcp, IComparer comparer);
+
+        public virtual void Add(Object key, Object value);
+        public virtual void Clear();
+        public virtual Object Clone();
+        public virtual bool Contains(Object key);
+        public virtual bool ContainsKey(Object key);
+        public virtual bool ContainsValue(Object value);
+        public virtual void CopyTo(Array array, int arrayIndex);
+
+        public virtual Object this[Object key] { get; set; }
+
+        IEnumerator IEnumerable.GetEnumerator();
+        public virtual IDictionaryEnumerator GetEnumerator();
+
+        protected virtual int GetHash(Object key);
+
+        public virtual bool IsReadOnly { get; }
+        public virtual bool IsFixedSize { get; }
+        public virtual bool IsSynchronized { get; }
+
+        protected virtual bool KeyEquals(Object item, Object key);
+
+        public virtual ICollection Keys { get; }
+        public virtual ICollection Values { get; }
+
+        public virtual void Remove(Object key);
+
+        public virtual Object SyncRoot { get; }
+        public virtual int Count { get; }
+
+        public static Hashtable Synchronized(Hashtable table);
+    }
+}
diff --git a/base/Interfaces/Collections/IDictionary.csi b/base/Interfaces/Collections/IDictionary.csi
new file mode 100644
index 0000000..fbaa6b7
--- /dev/null
+++ b/base/Interfaces/Collections/IDictionary.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // An IDictionary is a possibly unordered set of key-value pairs.
+    // Keys can be any non-null object.  Values can be any object.
+    // You can look up a value in an IDictionary via the default indexed
+    // property, Items.
+    public interface IDictionary : ICollection
+    {
+        Object this[Object key] { get; set; }
+
+        ICollection Keys { get; }
+
+        ICollection Values { get; }
+
+        bool Contains(Object key);
+        void Add(Object key, Object value);
+        void Clear();
+
+        bool IsReadOnly { get; }
+        bool IsFixedSize { get; }
+
+        new IDictionaryEnumerator GetEnumerator();
+
+        void Remove(Object key);
+    }
+}
diff --git a/base/Interfaces/Collections/IDictionaryEnumerator.csi b/base/Interfaces/Collections/IDictionaryEnumerator.csi
new file mode 100644
index 0000000..3d0ce70
--- /dev/null
+++ b/base/Interfaces/Collections/IDictionaryEnumerator.csi
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // This interface represents an enumerator that allows sequential access to the
+    // elements of a dictionary. Upon creation, an enumerator is conceptually
+    // positioned before the first element of the enumeration. The first call to the
+    // MoveNext method brings the first element of the enumeration into view,
+    // and each successive call to MoveNext brings the next element into
+    // view until MoveNext returns false, indicating that there are no more
+    // elements to enumerate. Following each call to MoveNext, the
+    // Key and Value methods are used to obtain the key and
+    // value of the element currently in view. The values returned by calls to
+    // Key and Value are undefined before the first call to
+    // MoveNext and following a call to MoveNext that returned false.
+    // Enumerators are typically used in while loops of the form
+    //
+    public interface IDictionaryEnumerator : IEnumerator
+    {
+        Object Key { get; }
+        Object Value { get; }
+        DictionaryEntry Entry { get; }
+    }
+}
diff --git a/base/Interfaces/Collections/IHashCodeProvider.csi b/base/Interfaces/Collections/IHashCodeProvider.csi
new file mode 100644
index 0000000..a4a974e
--- /dev/null
+++ b/base/Interfaces/Collections/IHashCodeProvider.csi
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+
+    // Provides a mechanism for a hash table user to override the default
+    // GetHashCode() function on Objects, providing their own hash function.
+
+    public interface IHashCodeProvider
+    {
+        int GetHashCode(Object obj);
+    }
+}
diff --git a/base/Interfaces/Collections/Queue.csi b/base/Interfaces/Collections/Queue.csi
new file mode 100644
index 0000000..79f42a7
--- /dev/null
+++ b/base/Interfaces/Collections/Queue.csi
@@ -0,0 +1,42 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // A simple Queue of objects.  Internally it is implemented as a circular
+    // buffer, so Enqueue can be O(n).  Dequeue is O(1).
+    public class Queue : ICollection, ICloneable {
+
+        public Queue();
+        public Queue(int capacity);
+        public Queue(int capacity, float growFactor);
+        public Queue(ICollection col);
+
+        public virtual int Count { get; }
+
+        public virtual Object Clone();
+
+        public virtual bool IsSynchronized { get; }
+
+        public virtual Object SyncRoot { get; }
+
+        public virtual void Clear();
+        public virtual void CopyTo(Array array, int index);
+        public virtual void Enqueue(Object obj);
+
+        public virtual IEnumerator GetEnumerator();
+
+        public virtual Object Dequeue();
+        public virtual Object Peek();
+        public static Queue Synchronized(Queue queue);
+        public virtual bool Contains(Object obj);
+
+        public virtual Object[] ToArray();
+
+        public virtual void TrimToSize();
+    }
+}
diff --git a/base/Interfaces/Collections/ReadOnlyCollectionBase.csi b/base/Interfaces/Collections/ReadOnlyCollectionBase.csi
new file mode 100644
index 0000000..ca6288c
--- /dev/null
+++ b/base/Interfaces/Collections/ReadOnlyCollectionBase.csi
@@ -0,0 +1,27 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System.Collections {
+
+    public abstract class ReadOnlyCollectionBase : ICollection {
+        ArrayList list;
+
+        protected ArrayList InnerList { get; }
+
+        public int Count { get; }
+
+        bool ICollection.IsSynchronized { get; }
+
+        object ICollection.SyncRoot { get; }
+
+        void ICollection.CopyTo(Array array, int index);
+        public IEnumerator GetEnumerator();
+    }
+
+}
diff --git a/base/Interfaces/Collections/SortedList.csi b/base/Interfaces/Collections/SortedList.csi
new file mode 100644
index 0000000..0d840f1
--- /dev/null
+++ b/base/Interfaces/Collections/SortedList.csi
@@ -0,0 +1,81 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // The SortedList class implements a sorted list of keys and values. Entries in
+    // a sorted list are sorted by their keys and are accessible both by key and by
+    // index. The keys of a sorted list can be ordered either according to a
+    // specific IComparer implementation given when the sorted list is
+    // instantiated, or according to the IComparable implementation provided
+    // by the keys themselves. In either case, a sorted list does not allow entries
+    // with duplicate keys.
+
+    public class SortedList : IDictionary, ICloneable
+    {
+        public SortedList();
+        public SortedList(int initialCapacity);
+        public SortedList(IComparer comparer);
+        public SortedList(IComparer comparer, int capacity);
+        public SortedList(IDictionary d);
+        public SortedList(IDictionary d, IComparer comparer);
+
+        public virtual void Add(Object key, Object value);
+
+        public virtual int Capacity {
+            get;
+            set;
+        }
+
+        public virtual int Count { get; }
+
+        public virtual ICollection Keys { get; }
+        public virtual ICollection Values { get; }
+
+        public virtual bool IsReadOnly { get; }
+        public virtual bool IsFixedSize { get; }
+        public virtual bool IsSynchronized { get; }
+
+        public virtual Object SyncRoot { get; }
+
+        public virtual void Clear();
+
+        public virtual Object Clone();
+
+        public virtual bool Contains(Object key);
+        public virtual bool ContainsKey(Object key);
+        public virtual bool ContainsValue(Object value);
+
+        public virtual void CopyTo(Array array, int arrayIndex);
+
+        public virtual Object GetByIndex(int index);
+
+        IEnumerator IEnumerable.GetEnumerator();
+
+        public virtual IDictionaryEnumerator GetEnumerator();
+
+        public virtual Object GetKey(int index);
+        public virtual IList GetKeyList();
+        public virtual IList GetValueList();
+
+        public virtual Object this[Object key] {
+            get;
+            set;
+        }
+
+        public virtual int IndexOfKey(Object key);
+        public virtual int IndexOfValue(Object value);
+
+        public virtual void RemoveAt(int index);
+        public virtual void Remove(Object key);
+
+        public virtual void SetByIndex(int index, Object value);
+
+        public static SortedList Synchronized(SortedList list);
+        public virtual void TrimToSize();
+    }
+}
diff --git a/base/Interfaces/Collections/Stack.csi b/base/Interfaces/Collections/Stack.csi
new file mode 100644
index 0000000..55f497f
--- /dev/null
+++ b/base/Interfaces/Collections/Stack.csi
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace System.Collections {
+    // A simple stack of objects.  Internally it is implemented as an array,
+    // so Push can be O(n).  Pop is O(1).
+
+    public class Stack : ICollection, ICloneable {
+        public Stack();
+        public Stack(int initialCapacity);
+        public Stack(ICollection col);
+
+        public virtual int Count { get; }
+        public virtual bool IsSynchronized { get; }
+        public virtual Object SyncRoot { get; }
+
+        public virtual void Clear();
+        public virtual Object Clone();
+        public virtual bool Contains(Object obj);
+        public virtual void CopyTo(Array array, int index);
+        public virtual IEnumerator GetEnumerator();
+        public virtual Object Peek();
+        public virtual Object Pop();
+        public virtual void Push(Object obj);
+        public static Stack Synchronized(Stack stack);
+        public virtual Object[] ToArray();
+    }
+}
diff --git a/base/Interfaces/Console/Console.csproj b/base/Interfaces/Console/Console.csproj
new file mode 100644
index 0000000..405aeed
--- /dev/null
+++ b/base/Interfaces/Console/Console.csproj
@@ -0,0 +1,38 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Console\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <NoStdlib>true</NoStdlib>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AssemblyName>Console</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ConsoleOutput.csi" />
+    <Compile Include="ConsoleInput.csi" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+
+</Project>
diff --git a/base/Interfaces/Console/ConsoleInput.csi b/base/Interfaces/Console/ConsoleInput.csi
new file mode 100644
index 0000000..bbbfc6b
--- /dev/null
+++ b/base/Interfaces/Console/ConsoleInput.csi
@@ -0,0 +1,31 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ConsoleInput.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Io
+{
+    public class ConsoleInput
+    {
+        static public void Initialize();
+        new static public void Finalize();
+
+        public static string ReadLine();
+        public static int ReadChar();
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Interfaces/Console/ConsoleOutput.csi b/base/Interfaces/Console/ConsoleOutput.csi
new file mode 100644
index 0000000..d87be5e
--- /dev/null
+++ b/base/Interfaces/Console/ConsoleOutput.csi
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ConsoleOutput.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Io
+{
+    public class ConsoleOutput
+    {
+        static public void Initialize();
+        new static public void Finalize();
+
+        public static void Write(String value);
+        public static void Write(char[] buffer, int index, int count);
+
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Interfaces/Diagnostics/Diagnostics.csi b/base/Interfaces/Diagnostics/Diagnostics.csi
new file mode 100644
index 0000000..a8008a1
--- /dev/null
+++ b/base/Interfaces/Diagnostics/Diagnostics.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Diagnostics.csi
+//
+//  Note:
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    public class DiagnosticsModule
+    {
+        static public void Initialize();
+    }
+} // namespace Microsoft.Singularity.Diagnostics
diff --git a/base/Interfaces/Diagnostics/Diagnostics.csproj b/base/Interfaces/Diagnostics/Diagnostics.csproj
new file mode 100644
index 0000000..e82ef25
--- /dev/null
+++ b/base/Interfaces/Diagnostics/Diagnostics.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Diagnostics\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Diagnostics</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Diagnostics.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Directory/Directory.csi b/base/Interfaces/Directory/Directory.csi
new file mode 100644
index 0000000..2b7b856
--- /dev/null
+++ b/base/Interfaces/Directory/Directory.csi
@@ -0,0 +1,48 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Security;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Directory
+{
+    public class DirNode
+    {
+    }
+
+    public class DirectoryService
+    {
+        // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        public static unsafe SharedHeap.Allocation * NewClientEndpointEx();
+
+        //
+        // Kernel only interfaces.
+        //
+
+        public static bool CreateDirectory(DirNode dirNode, string path);
+        public static bool CreateSymbolicLink(DirNode dirNode, string path, string link);
+        public static DirNode FindDirectory(string dirName, bool createIfNull);
+
+        public static void Initialize(XmlNode config);
+        public static void StartNotificationThread();
+
+        public static bool RegisterIoMemory(DirNode node, string name, IoMemory ioMem);
+    }
+} // namespace Microsoft.Singularity.Naming
diff --git a/base/Interfaces/Directory/Directory.csproj b/base/Interfaces/Directory/Directory.csproj
new file mode 100644
index 0000000..1bbbd37
--- /dev/null
+++ b/base/Interfaces/Directory/Directory.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Directory\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Directory</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Directory.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Kernel\Kernel.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Xml\Xml.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Security\Security.csproj" />
+    <ProjectReference Include="..\Collections\Collections.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Directory/Sharedheap.csi b/base/Interfaces/Directory/Sharedheap.csi
new file mode 100644
index 0000000..5f0f5c7
--- /dev/null
+++ b/base/Interfaces/Directory/Sharedheap.csi
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SharedHeap.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Memory
+{
+    public class SharedHeap
+    {
+        public static unsafe Allocation *Allocate(  // Returns new region.
+            UIntPtr bytes,  // Number of bytes to allocate.
+            UIntPtr type,  // Type information.
+            uint alignment,  // Allocation alignment requirement.
+            ref AllocationOwner owner);
+
+        public static unsafe void Free(
+            Allocation *allocation,  // Allocated region to be freed.
+            ref AllocationOwner owner);  // Current owner of allocation.
+
+        public struct Allocation {
+        }
+
+        public struct AllocationOwner {
+        }
+    }
+}
+
diff --git a/base/Interfaces/Drivers/Drivers.csi b/base/Interfaces/Drivers/Drivers.csi
new file mode 100644
index 0000000..b155429
--- /dev/null
+++ b/base/Interfaces/Drivers/Drivers.csi
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Drivers.csi
+//
+//  Note:   PnP Device Type Registration and Base Initialization.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Drivers
+{
+    public class Devices
+    {
+        public static void RegisterPnpResources();
+        public static void RegisterInternalDrivers();
+    }
+}
diff --git a/base/Interfaces/Drivers/Drivers.csproj b/base/Interfaces/Drivers/Drivers.csproj
new file mode 100644
index 0000000..39750df
--- /dev/null
+++ b/base/Interfaces/Drivers/Drivers.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Drivers\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Drivers</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Drivers.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Hal/Hal.csproj b/base/Interfaces/Hal/Hal.csproj
new file mode 100644
index 0000000..de89e54
--- /dev/null
+++ b/base/Interfaces/Hal/Hal.csproj
@@ -0,0 +1,44 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Hal\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Hal</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="HalTimer.csi" />
+    <Compile Include="HalClock.csi" />
+    <Compile Include="HalDevices.csi" />
+    <Compile Include="HalPic.csi" />
+    <Compile Include="HalScreen.csi" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+    <ProjectReference Include="Processor.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Hal/HalClock.csi b/base/Interfaces/Hal/HalClock.csi
new file mode 100644
index 0000000..c216d56
--- /dev/null
+++ b/base/Interfaces/Hal/HalClock.csi
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: HalDevices.csi
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalClock
+    {
+        public HalClock();
+
+        /// <summary>
+        /// Notification that system has received and processed clock
+        /// interrupt.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt();
+
+        /// <summary>Get the time elapsed since booting.
+        /// <returns>Ticks of 100ns of uptime. </returns>
+        /// </summary>
+        [NoHeapAllocation]
+        public long GetKernelTicks();
+
+        /// <summary>
+        /// Notification that processor is resuming from halted state.
+        /// Provides clock to re-sync if it uses the CPU timestamp counter.
+        /// </summary>
+        [NoHeapAllocation]
+        public void CpuResumeFromHaltEvent();
+
+        /// <summary>Get time from Real-Time Clock.</summary>
+        /// <returns>The number of 100-nanosecond intervals that
+        /// have elapsed since 12:00 A.M., January 1, 0001.
+        /// </returns>
+        [NoHeapAllocation]
+        public long GetRtcTime();
+
+        /// <summary>Set time of Real-Time Clock.</summary>
+        /// <param name="rtcTime">The number of 100-nanosecond intervals
+        /// that have elapsed since 12:00 A.M., January 1, 0001.
+        /// </param>
+        public void SetRtcTime(long rtcTicks);
+    }
+}
diff --git a/base/Interfaces/Hal/HalDevices.csi b/base/Interfaces/Hal/HalDevices.csi
new file mode 100644
index 0000000..c025553
--- /dev/null
+++ b/base/Interfaces/Hal/HalDevices.csi
@@ -0,0 +1,60 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: HalDevices.csi
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalDevices
+    {
+        public static void Initialize(Processor rootProcessor);
+
+        new public static void Finalize();
+
+        [NoHeapAllocation]
+        public static void EnableIoInterrupt(byte irq);
+
+        [NoHeapAllocation]
+        public static void DisableIoInterrupt(byte irq);
+
+        [NoHeapAllocation]
+        public static bool InternalInterrupt(byte interrupt);
+
+        [NoHeapAllocation]
+        public static byte GetMaximumIrq();
+
+        [NoHeapAllocation]
+        public static int GetProcessorCount();
+
+        public static void StartApProcessors();
+
+        [NoHeapAllocation]
+        public static void FreezeProcessors();
+
+        [NoHeapAllocation]
+        public static void SendFixedIPI(byte vector, int from, int to);
+
+        [NoHeapAllocation]
+        public static void BroadcastFixedIPI(byte vector, bool includeSelf);
+
+        [NoHeapAllocation]
+        public static void ClearFixedIPI();
+    }
+}
diff --git a/base/Interfaces/Hal/HalPic.csi b/base/Interfaces/Hal/HalPic.csi
new file mode 100644
index 0000000..b1473e1
--- /dev/null
+++ b/base/Interfaces/Hal/HalPic.csi
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalPic.csi
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalPic
+    {
+        /// <summary>
+        /// Maximum valid IRQ property.  On legacy PC systems this value is
+        /// 15.  On APIC PC systems this number will usually be larger.
+        /// </summary>
+        public byte MaximumIrq
+        {
+            [NoHeapAllocation] get;
+        }
+
+        /// <summary>
+        /// Convert interrupt vector to interrupt request line.
+        /// </summary>
+        [NoHeapAllocation]
+        public byte InterruptToIrq(byte interrupt);
+
+        /// <summary>
+        /// Convert interrupt request line to interrupt vector.
+        /// </summary>
+        [NoHeapAllocation]
+        public byte IrqToInterrupt(byte irq);
+
+        /// <summary>
+        /// Acknowledge the interrupt request.  (EOI)
+        /// </summary>
+        [NoHeapAllocation]
+        public void AckIrq(byte irq);
+
+        /// <summary>
+        /// Enable interrupt request by removing mask.
+        /// </summary>
+        [NoHeapAllocation]
+        public void EnableIrq(byte irq);
+
+        /// <summary>
+        /// Disable interrupt request by applying mask.
+        /// </summary>
+        [NoHeapAllocation]
+        public void DisableIrq(byte irq);
+
+        /// <summary>
+        /// Acknowledge and mask interrupt.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt(byte interrupt);
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Interfaces/Hal/HalScreen.csi b/base/Interfaces/Hal/HalScreen.csi
new file mode 100644
index 0000000..06e37c0
--- /dev/null
+++ b/base/Interfaces/Hal/HalScreen.csi
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalScreen.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalScreen
+    {
+        private HalScreen();
+
+        [NoHeapAllocation]
+        public void Clear();
+
+        [NoHeapAllocation]
+        public void GetDisplayDimensions(out int columns, out int rows);
+
+        [NoHeapAllocation]
+        public void GetCursorPosition(out int column, out int row);
+
+        [NoHeapAllocation]
+        public bool SetCursorPosition(int column, int row);
+
+        [NoHeapAllocation]
+        public void SetCursorSizeLarge();
+
+        [NoHeapAllocation]
+        public void SetCursorSizeSmall();
+
+        [NoHeapAllocation]
+        public void Write(byte[] buffer, int offset, int count);
+
+        [NoHeapAllocation]
+        public void PutChar(char c);
+
+        [NoHeapAllocation]
+        public bool PutCharAt(char c, int column, int row);
+
+        [NoHeapAllocation]
+        public void ClearCursorToEndOfLine();
+
+        [NoHeapAllocation]
+        public void CursorFlash();
+
+        [NoHeapAllocation]
+        public void CursorHide();
+
+        [NoHeapAllocation]
+        public void CursorShow();
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Interfaces/Hal/HalTimer.csi b/base/Interfaces/Hal/HalTimer.csi
new file mode 100644
index 0000000..6f827be
--- /dev/null
+++ b/base/Interfaces/Hal/HalTimer.csi
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalTimer.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalTimer
+    {
+        /// <summary>
+        /// Clear interrupt associated with timer.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt();
+
+        /// <value>
+        /// Maximum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MaxInterruptInterval {
+            [NoHeapAllocation]
+            get;
+        }
+
+        /// <value>
+        /// Minimum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MinInterruptInterval {
+            [NoHeapAllocation]
+            get;
+        }
+
+        /// <value>
+        /// Granularity of interrupt timeout (in units of 100ns).
+        /// </value>
+        public long InterruptIntervalGranularity {
+            [NoHeapAllocation]
+            get;
+        }
+
+        /// <summary>
+        /// Set relative time of next interrupt.
+        ///
+        /// <param name="delta">Relative time of next interrupt in units
+        /// of 100ns.  The time should be with the range between
+        /// from <c>SetNextInterruptMinDelta</c> to
+        /// <c>SetNextInterruptMaxDelta</c></param>.
+        /// <returns> true on success.</returns>
+        /// </summary>
+        [NoHeapAllocation]
+        public bool SetNextInterrupt(long delta);
+    }
+
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Interfaces/Hal/Processor.csi b/base/Interfaces/Hal/Processor.csi
new file mode 100644
index 0000000..4c99fc3
--- /dev/null
+++ b/base/Interfaces/Hal/Processor.csi
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Processor.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity
+{
+    public class Processor
+    {
+    }
+}
diff --git a/base/Interfaces/Hal/Processor.csproj b/base/Interfaces/Hal/Processor.csproj
new file mode 100644
index 0000000..57532b7
--- /dev/null
+++ b/base/Interfaces/Hal/Processor.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Processor\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Processor</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Processor.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Hypercall/Hypercall.csi b/base/Interfaces/Hypercall/Hypercall.csi
new file mode 100644
index 0000000..04a2e16
--- /dev/null
+++ b/base/Interfaces/Hypercall/Hypercall.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Diagnostics.csi
+//
+//  Note:
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Hypercall
+{
+    public class ConnectionService
+    {
+        static public void Initialize();
+    }
+} // namespace Microsoft.Singularity.Hypercall
diff --git a/base/Interfaces/Hypercall/Hypercall.csproj b/base/Interfaces/Hypercall/Hypercall.csproj
new file mode 100644
index 0000000..832a91f
--- /dev/null
+++ b/base/Interfaces/Hypercall/Hypercall.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Hypercall\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Hypercall</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Hypercall.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Interfaces.proj b/base/Interfaces/Interfaces.proj
new file mode 100644
index 0000000..d536690
--- /dev/null
+++ b/base/Interfaces/Interfaces.proj
@@ -0,0 +1,48 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\BaseAttrs\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <ItemGroup>
+    <!-- The following interfaces are exported by kernel.exe and imported by kernel assemblies. -->
+    <ProjectReference Include="Baseattrs\Baseattrs.csproj" />
+    <ProjectReference Include="Basetypes\Basetypes.csproj" />
+    <ProjectReference Include="Bartok\Bartok.csproj" />
+    <ProjectReference Include="Collections\Collections.csproj" />
+    <ProjectReference Include="Console\Console.csproj" />
+    <ProjectReference Include="Memory\Memory.csproj" />
+    
+    <!-- The following interfaces are imported by kernel.exe and exported by kernel assemblies. -->    
+    <ProjectReference Include="Diagnostics\Diagnostics.csproj" />
+    <ProjectReference Include="Directory\Directory.csproj" />
+    <ProjectReference Include="Drivers\Drivers.csproj" />
+    <ProjectReference Include="Hal\Hal.csproj" />
+    <ProjectReference Include="Hypercall\Hypercall.csproj" />
+    <ProjectReference Include="IoSystem\IoSystem.csproj" />
+    <ProjectReference Include="Kernel\Kernel.csproj" />
+    <ProjectReference Include="Loader\Loader.csproj" />
+    <!-- <ProjectReference Include="Scheduling\Scheduling.csproj"/> -->
+    <ProjectReference Include="NVidiaDrivers\NVidiaDrivers.csproj" />
+    <ProjectReference Include="Security\Security.csproj" />
+    <ProjectReference Include="Shell\Shell.csproj" />
+    <ProjectReference Include="Singularity.V1\Singularity.V1.csproj" />
+    <ProjectReference Include="Stress\Stress.csproj" />
+    <ProjectReference Include="Xml\Xml.csproj" />
+    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+
+</Project>
diff --git a/base/Interfaces/IoSystem/IoConfig.csi b/base/Interfaces/IoSystem/IoConfig.csi
new file mode 100644
index 0000000..eff36c8
--- /dev/null
+++ b/base/Interfaces/IoSystem/IoConfig.csi
@@ -0,0 +1,52 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoConfig.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Io
+{
+    public abstract class IoConfig
+    {
+        public String[] Ids;
+        public String Id { get; }
+        public IoRange[]    Ranges;
+
+        public abstract string ToPrint();
+    }
+
+    public abstract class IoRange
+    {
+    }
+
+    public class IoMemory
+    {
+    }
+}
+
+namespace System.Threading
+{
+    public class AutoResetEvent
+    {
+    }
+}
+
+namespace Microsoft.Singularity.Xml
+{
+    public class XmlNode
+    {
+    }
+}
diff --git a/base/Interfaces/IoSystem/IoConfig.csproj b/base/Interfaces/IoSystem/IoConfig.csproj
new file mode 100644
index 0000000..1c160b8
--- /dev/null
+++ b/base/Interfaces/IoSystem/IoConfig.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\IoSystem\IoConfig.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>IoConfig</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IoConfig.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/IoSystem/IoIrq.csi b/base/Interfaces/IoSystem/IoIrq.csi
new file mode 100644
index 0000000..052122a
--- /dev/null
+++ b/base/Interfaces/IoSystem/IoIrq.csi
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoIrq.csi
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Microsoft.Singularity.Io
+{
+    public sealed class IoIrq
+    {
+        [NoHeapAllocation]
+        public static void SignalInterrupt(byte irq);
+
+        public IoIrq(byte irq);
+
+        public byte Irq
+        {
+            [NoHeapAllocation]
+            get;
+        }
+
+        public bool RegisterInterrupt();
+        public bool ReleaseInterrupt();
+
+        public bool WaitForInterrupt();
+        public bool WaitForInterrupt(TimeSpan timeout);
+        public void Pulse();
+        public bool AckInterrupt();
+
+        public override string ToString();
+    }
+}
diff --git a/base/Interfaces/IoSystem/IoSystem.csi b/base/Interfaces/IoSystem/IoSystem.csi
new file mode 100644
index 0000000..d8ccfc3
--- /dev/null
+++ b/base/Interfaces/IoSystem/IoSystem.csi
@@ -0,0 +1,58 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoSystem.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Memory;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Io
+{
+    public interface IDevice
+    {
+        void Initialize();
+        void Finalize();
+    }
+
+    public delegate IDevice IoDeviceCreate(IoConfig config,
+                                            String instanceName);
+
+    public class IoSystem
+    {
+        public static void Initialize(XmlNode config);
+        new public static void Finalize();
+
+        public static bool RegisterKernelDriver(Type type,
+                                                IoDeviceCreate creator);
+
+        // device management
+        public static void RegisterDrivers();
+        public static void ActivateDrivers();
+        // hal only device management:
+        public static IoConfig YieldResources(string signature, Type type);
+        // debug only method:
+        public static void Dump(bool detailed);
+
+        // initialize other subsystems:
+        public static void InitializeDirectoryService();
+        public static void InitializeVolumeManager();
+        public static void InitializeServiceManager(XmlNode config);
+
+        public static IoMemory FindFileImage(string command);
+        public static IoMemory FindFileImage(string command, SharedHeap.Allocation* ep);
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Interfaces/IoSystem/IoSystem.csproj b/base/Interfaces/IoSystem/IoSystem.csproj
new file mode 100644
index 0000000..2bcbeec
--- /dev/null
+++ b/base/Interfaces/IoSystem/IoSystem.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\IoSystem\IoSystem.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>IoSystem</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IoIrq.csi" />
+    <Compile Include="IoSystem.csi" />
+    
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Collections\Collections.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="IoConfig.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Kernel/IoMemory.csi b/base/Interfaces/Kernel/IoMemory.csi
new file mode 100644
index 0000000..e3cc8ad
--- /dev/null
+++ b/base/Interfaces/Kernel/IoMemory.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Process.csi
+//
+//  Note:   Forward declaration of the Process class.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Io
+{
+    public class IoMemory
+    {
+    }
+}
diff --git a/base/Interfaces/Kernel/Kernel.csi b/base/Interfaces/Kernel/Kernel.csi
new file mode 100644
index 0000000..0dd1391
--- /dev/null
+++ b/base/Interfaces/Kernel/Kernel.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Kernel/Kernel.csproj b/base/Interfaces/Kernel/Kernel.csproj
new file mode 100644
index 0000000..472dddb
--- /dev/null
+++ b/base/Interfaces/Kernel/Kernel.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Kernel\Kernel.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Kernel</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IoMemory.csi" />
+    <Compile Include="Kernel.csi" />
+    <Compile Include="Process.csi" />
+    <Compile Include="PerfCounters.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Kernel/PerfCounters.csi b/base/Interfaces/Kernel/PerfCounters.csi
new file mode 100644
index 0000000..4666fa7
--- /dev/null
+++ b/base/Interfaces/Kernel/PerfCounters.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PerfCounter.csi
+//
+//  Note:   Forward declaration of the PerfCounter class.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity
+{
+    public class PerfCounters
+    {
+    }
+}
diff --git a/base/Interfaces/Kernel/Process.csi b/base/Interfaces/Kernel/Process.csi
new file mode 100644
index 0000000..3c6c797
--- /dev/null
+++ b/base/Interfaces/Kernel/Process.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Process.csi
+//
+//  Note:   Forward declaration of the Process class.
+//          
+//////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity
+{
+    public class Process
+    {
+    }
+}
diff --git a/base/Interfaces/Loader/Binder.csi b/base/Interfaces/Loader/Binder.csi
new file mode 100644
index 0000000..4e49f21
--- /dev/null
+++ b/base/Interfaces/Loader/Binder.csi
@@ -0,0 +1,52 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Binder.csi
+//
+//  Note:   Interface definition for the Binder classs
+//
+//////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Collections;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.V1.Types;
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+namespace Microsoft.Singularity.Loader
+{
+    public class Binder
+    {
+        public static IoMemory GetSystemManifest();
+
+        /// <summary>
+        /// Load an executable
+        /// </summary>
+
+        public static void Initialize(XmlNode config);
+        public static IoMemory LoadImage(Process parent, String application, out Manifest man);
+        public static IoMemory LoadRawImage(string folderName, string exeName);
+
+        /// <summary>
+        /// Used to create a new channel from  system types
+        /// creates channel enpoints
+        ///    inserts imp at index in the process startup endpoint set
+        ///    binds exp according to global policy
+        /// </summary>
+
+        public static bool BindToService(
+            Process process,
+            SystemType impType,
+            SystemType expType,
+            string contract,
+            int startState,
+            int index);
+    }
+}
+
diff --git a/base/Interfaces/Loader/Loader.csi b/base/Interfaces/Loader/Loader.csi
new file mode 100644
index 0000000..075a0c8
--- /dev/null
+++ b/base/Interfaces/Loader/Loader.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Loader.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Loader/Loader.csproj b/base/Interfaces/Loader/Loader.csproj
new file mode 100644
index 0000000..33b810e
--- /dev/null
+++ b/base/Interfaces/Loader/Loader.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Loader\Loader.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Loader</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Binder.csi" />
+    <Compile Include="Loader.csi" />
+    <Compile Include="Manifest.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj" />
+    <ProjectReference Include="..\IoSystem\IoConfig.csproj" />
+    <ProjectReference Include="..\Kernel\Kernel.csproj" />
+    <ProjectReference Include="..\Singularity.V1\Singularity.V1.csproj" />
+
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Loader/Manifest.csi b/base/Interfaces/Loader/Manifest.csi
new file mode 100644
index 0000000..ff7d76f
--- /dev/null
+++ b/base/Interfaces/Loader/Manifest.csi
@@ -0,0 +1,26 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Loader
+{
+    public class Manifest
+    {
+        public Manifest(string name, string path);
+
+        public byte[] Serialize();
+        public int SetEndpoints(Process process, string action);
+        public string Name { get; }
+        public string Path { get; }
+        public bool GetParameterCounts(string action,
+                                       out int boolCount, 
+                                       out int longCount, 
+                                       out int stringCount, 
+                                       out int stringArrayCount); 
+    }
+}
diff --git a/base/Interfaces/Memory/Memory.csi b/base/Interfaces/Memory/Memory.csi
new file mode 100644
index 0000000..0a76865
--- /dev/null
+++ b/base/Interfaces/Memory/Memory.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Memory.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Memory/Memory.csproj b/base/Interfaces/Memory/Memory.csproj
new file mode 100644
index 0000000..bc0e0c2
--- /dev/null
+++ b/base/Interfaces/Memory/Memory.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Memory\Memory.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Memory</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Memory.csi" />
+    <Compile Include="SharedHeap.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Memory/SharedHeap.csi b/base/Interfaces/Memory/SharedHeap.csi
new file mode 100644
index 0000000..5f0f5c7
--- /dev/null
+++ b/base/Interfaces/Memory/SharedHeap.csi
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SharedHeap.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Memory
+{
+    public class SharedHeap
+    {
+        public static unsafe Allocation *Allocate(  // Returns new region.
+            UIntPtr bytes,  // Number of bytes to allocate.
+            UIntPtr type,  // Type information.
+            uint alignment,  // Allocation alignment requirement.
+            ref AllocationOwner owner);
+
+        public static unsafe void Free(
+            Allocation *allocation,  // Allocated region to be freed.
+            ref AllocationOwner owner);  // Current owner of allocation.
+
+        public struct Allocation {
+        }
+
+        public struct AllocationOwner {
+        }
+    }
+}
+
diff --git a/base/Interfaces/NVidiaDrivers/NVidiaDrivers.csi b/base/Interfaces/NVidiaDrivers/NVidiaDrivers.csi
new file mode 100644
index 0000000..c119c5b
--- /dev/null
+++ b/base/Interfaces/NVidiaDrivers/NVidiaDrivers.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NVidiaDrivers.csi
+//
+//  Note:   Driver interfaces for NVidia drivers.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Drivers
+{
+    public class NvPciLpcBridge
+    {
+        public static void Register();
+    }
+}
diff --git a/base/Interfaces/NVidiaDrivers/NVidiaDrivers.csproj b/base/Interfaces/NVidiaDrivers/NVidiaDrivers.csproj
new file mode 100644
index 0000000..3993314
--- /dev/null
+++ b/base/Interfaces/NVidiaDrivers/NVidiaDrivers.csproj
@@ -0,0 +1,30 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>NVidiaDrivers</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="NVidiaDrivers.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Naming/Directory.csi b/base/Interfaces/Naming/Directory.csi
new file mode 100644
index 0000000..2721fb9
--- /dev/null
+++ b/base/Interfaces/Naming/Directory.csi
@@ -0,0 +1,41 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Directory
+{
+    public class DirNode
+    {
+    }
+
+    public class DirectoryService
+    {
+        // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        public static unsafe SharedHeap.Allocation * NewClientEndpointEx();
+        public static unsafe SharedHeap.Allocation * NewClientWriteEndpointEx();
+
+        //
+        // Kernel only interfaces.
+        //
+
+        public static bool CreateDirectory(DirNode dirNode, string path);
+        public static bool CreateSymbolicLink(DirNode dirNode, string path, string link);
+        public static DirNode FindDirectory(string dirName, bool createIfNull);
+        public static void Initialize(XmlNode config);
+        public static bool RegisterIoMemory(DirNode node, string name, IoMemory ioMem);
+    }
+} // namespace Microsoft.Singularity.Directory
diff --git a/base/Interfaces/Naming/Directory.csproj b/base/Interfaces/Naming/Directory.csproj
new file mode 100644
index 0000000..d579e39
--- /dev/null
+++ b/base/Interfaces/Naming/Directory.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Directory</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Directory.csi" />
+
+    <ProjectReference Include="SharedHeap.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Kernel\Kernel.csproj" />
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Xml\Xml.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Collections\Collections.csproj" />    
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Naming/Naming.csi b/base/Interfaces/Naming/Naming.csi
new file mode 100644
index 0000000..2721fb9
--- /dev/null
+++ b/base/Interfaces/Naming/Naming.csi
@@ -0,0 +1,41 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Directory
+{
+    public class DirNode
+    {
+    }
+
+    public class DirectoryService
+    {
+        // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        public static unsafe SharedHeap.Allocation * NewClientEndpointEx();
+        public static unsafe SharedHeap.Allocation * NewClientWriteEndpointEx();
+
+        //
+        // Kernel only interfaces.
+        //
+
+        public static bool CreateDirectory(DirNode dirNode, string path);
+        public static bool CreateSymbolicLink(DirNode dirNode, string path, string link);
+        public static DirNode FindDirectory(string dirName, bool createIfNull);
+        public static void Initialize(XmlNode config);
+        public static bool RegisterIoMemory(DirNode node, string name, IoMemory ioMem);
+    }
+} // namespace Microsoft.Singularity.Directory
diff --git a/base/Interfaces/Naming/SharedHeap.csproj b/base/Interfaces/Naming/SharedHeap.csproj
new file mode 100644
index 0000000..3801a7e
--- /dev/null
+++ b/base/Interfaces/Naming/SharedHeap.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>SharedHeap</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SharedHeap.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Kernel\Kernel.csproj" />
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Collections\Collections.csproj" />    
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Naming/Sharedheap.csi b/base/Interfaces/Naming/Sharedheap.csi
new file mode 100644
index 0000000..5f0f5c7
--- /dev/null
+++ b/base/Interfaces/Naming/Sharedheap.csi
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SharedHeap.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Memory
+{
+    public class SharedHeap
+    {
+        public static unsafe Allocation *Allocate(  // Returns new region.
+            UIntPtr bytes,  // Number of bytes to allocate.
+            UIntPtr type,  // Type information.
+            uint alignment,  // Allocation alignment requirement.
+            ref AllocationOwner owner);
+
+        public static unsafe void Free(
+            Allocation *allocation,  // Allocated region to be freed.
+            ref AllocationOwner owner);  // Current owner of allocation.
+
+        public struct Allocation {
+        }
+
+        public struct AllocationOwner {
+        }
+    }
+}
+
diff --git a/base/Interfaces/Scheduling/Scheduler.csi b/base/Interfaces/Scheduling/Scheduler.csi
new file mode 100644
index 0000000..290adc1
--- /dev/null
+++ b/base/Interfaces/Scheduling/Scheduler.csi
@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Scheduler.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Scheduling
+{
+    public class Scheduler
+    {
+        public static void Initialize();
+        public static void Start();
+        public static void Finalize();
+
+        // Methods inherited from old IScheduler.
+
+        public static ISchedulerThread CreateSchedulerThread(Thread thread);
+        public static ISchedulerProcessor CreateSchedulerProcessor(Processor processor);
+        public static ISchedulerActivity CreateSchedulerActivity();
+        public static ISchedulerCpuReservation ReserveCpu(ISchedulerActivity activity,
+                                                          CpuResourceAmount amount,
+                                                          TimeSpan period);
+        public static bool NextThread(out Thread nextThread);
+        public static bool ShouldReschedule();
+
+        /// <summary>
+        /// Note that as tasks now contain resource accounting, there is
+        /// no need to pass out the resource usage from the scheduler.
+        /// For consistency we'll still pass it out of the Task API at least
+        /// until instantaneous usage is fixed.
+        /// </summary>
+        /// <returns>Returns true if admitted.</returns>
+        public static bool BeginConstraint(Hashtable resourceEstimates,
+                                           SchedulerTime deadline,
+                                           ISchedulerTask taskToEnd,
+                                           out ISchedulerTask schedulerTask);
+        public static void BeginDelayedConstraint(Hashtable resourceEstimates,
+                                                  TimeSpan relativeDeadline,
+                                                  ISchedulerTask taskToEnd,
+                                                  out ISchedulerTask schedulerTask);
+        public static bool EndConstraint(ISchedulerTask taskToEnd);
+    }
+}
+
diff --git a/base/Interfaces/Scheduling/Scheduling.csproj b/base/Interfaces/Scheduling/Scheduling.csproj
new file mode 100644
index 0000000..409669e
--- /dev/null
+++ b/base/Interfaces/Scheduling/Scheduling.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Scheduling\Scheduling.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Scheduling</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Scheduler.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Security/Principal.csi b/base/Interfaces/Security/Principal.csi
new file mode 100644
index 0000000..82e74d2
--- /dev/null
+++ b/base/Interfaces/Security/Principal.csi
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace Microsoft.Singularity.Security
+{
+    public struct Principal
+    {
+        public static Principal Self();
+        public static string ExpandAclIndirection(string name);
+
+        public ulong  Val { get; }
+        public bool   Equal(Principal p);
+        public string GetName();
+    }
+}
+
diff --git a/base/Interfaces/Security/PrincipalImpl.csi b/base/Interfaces/Security/PrincipalImpl.csi
new file mode 100644
index 0000000..62b4088
--- /dev/null
+++ b/base/Interfaces/Security/PrincipalImpl.csi
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Io;
+
+// This is a kernel-only interface
+
+namespace Microsoft.Singularity.Security
+{
+    public struct PrincipalImpl
+    {
+        public static Principal Self();
+        public static Principal MakePrincipal(ulong id);
+           // this is a kernel-only constructor for the type Principal
+
+        public static void      Initialize(XmlNode config);
+        public static Principal NewInvocation(Principal parent, Manifest manifest, string role, IoMemory rawImage);
+        public static void      Dispose(Principal pr);
+
+        public static string    ExpandAclIndirection(string name);
+
+        public static void      RegisterAclCore(Object core);
+           // "core" is really an AclCore object
+        public static void      Export();
+    }
+}
+
diff --git a/base/Interfaces/Security/Security.csi b/base/Interfaces/Security/Security.csi
new file mode 100644
index 0000000..adc4965
--- /dev/null
+++ b/base/Interfaces/Security/Security.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Security.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Security/Security.csproj b/base/Interfaces/Security/Security.csproj
new file mode 100644
index 0000000..1225bea
--- /dev/null
+++ b/base/Interfaces/Security/Security.csproj
@@ -0,0 +1,39 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Drivers\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Security</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Security.csi" />
+    <Compile Include="Principal.csi" />
+    <Compile Include="PrincipalImpl.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Kernel\Kernel.csproj" />
+    <ProjectReference Include="..\Loader\Loader.csproj" />
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Xml\Xml.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Collections\Collections.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Shell/Shell.csi b/base/Interfaces/Shell/Shell.csi
new file mode 100644
index 0000000..6261149
--- /dev/null
+++ b/base/Interfaces/Shell/Shell.csi
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Shell.csi
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Shell
+{
+    public class Shell
+    {
+        public static int ShellMain(String[] args);
+    }
+}
+
diff --git a/base/Interfaces/Shell/Shell.csproj b/base/Interfaces/Shell/Shell.csproj
new file mode 100644
index 0000000..f05c0e6
--- /dev/null
+++ b/base/Interfaces/Shell/Shell.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Shell\Shell.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Shell</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Shell.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Singularity.V1/Processes/ProcessHandle.csi b/base/Interfaces/Singularity.V1/Processes/ProcessHandle.csi
new file mode 100644
index 0000000..6dc63ba
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Processes/ProcessHandle.csi
@@ -0,0 +1,125 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: ProcessHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Types;
+using Microsoft.Singularity.V1.Security;
+
+namespace Microsoft.Singularity.V1.Processes
+{
+    public enum ProcessState {
+        Active,
+        Suspended,
+        Stopped,
+    }
+
+    public struct ProcessHandle
+    {
+        public readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static bool Create(char *args,
+                                  int *argLengths,
+                                  int argCount,
+                                  char *role,
+                                  int roleLength,
+                                  int endpointCount,
+                                  out ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Create(char *processName,  //args[0]
+                                  int  processNameLength,
+                                  char *action,
+                                  int  actionLength,
+                                  char *role,
+                                  int roleLength,
+                                  out ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static bool SetStartupEndpoint(ProcessHandle handle,
+                                              int index,
+                                              SharedHeapService.Allocation * endpoint);
+
+        [NoHeapAllocation]
+        public static void Dispose(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Start(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static void Join(ProcessHandle handle, out bool started);
+
+        [NoHeapAllocation]
+        public static bool Join(ProcessHandle handle,
+                                TimeSpan timeout,
+                                out bool started);
+
+        [NoHeapAllocation]
+        public static bool Join(ProcessHandle handle,
+                                SchedulerTime stop,
+                                out bool started);
+
+        [NoHeapAllocation]
+        public static bool Suspend(ProcessHandle handle, bool recursive);
+
+        [NoHeapAllocation]
+        public static bool Resume(ProcessHandle handle, bool recursive);
+
+        [NoHeapAllocation]
+        public static void Stop(ProcessHandle handle, int exitcode);
+
+        [NoHeapAllocation]
+        public static void SuspendBarrier();
+
+        [NoHeapAllocation]
+        public static int GetProcessId(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static int GetExitCode(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static PrincipalHandle GetPrincipalHandle(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static ProcessState GetState(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static unsafe ParameterCode SetStartupStringArrayArg(
+                                                ProcessHandle handle,
+                                                int index,
+                                                char *args,
+                                                int *argLengths,
+                                                int argCount);
+
+        [NoHeapAllocation]
+        public static bool BindToService(ProcessHandle handle,
+                                        SystemType impType,
+                                        SystemType expType,
+                                        char *contract,
+                                        int  contractLen,
+                                        int startState,
+                                        int index);
+
+
+        [NoHeapAllocation]
+        public static unsafe ParameterCode SetStartupStringArg(ProcessHandle handle, int arg, char * input, int length);
+
+        [NoHeapAllocation]
+        public static ParameterCode SetStartupLongArg(ProcessHandle handle, int index, long value);
+
+
+        [NoHeapAllocation]
+        public static ParameterCode SetStartupBoolArg(ProcessHandle handle, int index, bool value);
+
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Security/PrincipalHandle.csi b/base/Interfaces/Singularity.V1/Security/PrincipalHandle.csi
new file mode 100644
index 0000000..ec5dc61
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Security/PrincipalHandle.csi
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: PrincipalHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Security
+{
+    public struct PrincipalHandle
+    {
+        public readonly ulong val;
+        public static PrincipalHandle SelfPrincipalHandle();
+        public static string GetPrincipalName(PrincipalHandle handle);
+        public static string ExpandAclIndirection(string name);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/ChannelService.csi b/base/Interfaces/Singularity.V1/Services/ChannelService.csi
new file mode 100644
index 0000000..0edd4a5
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/ChannelService.csi
@@ -0,0 +1,185 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelService.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Security;
+using Microsoft.Singularity.V1.Threads;
+using Microsoft.Singularity.V1.Types;
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+
+namespace Microsoft.Singularity.V1.Services
+{
+    [CLSCompliant(false)]
+    unsafe public struct EndpointCore
+    {
+
+        /// <summary>
+        /// Used to allocate a channel endpoint. The size must be correctly computed by
+        /// the trusted caller (currently trusted code NewChannel)
+        /// </summary>
+        [NoHeapAllocation]
+        public static Allocation* /*EndpointCore* opt(ExHeap)!*/
+        Allocate(uint size, SystemType st);
+
+        /// <summary>
+        /// Closes this end of the channel and frees associated resources, EXCEPT the block
+        /// of memory for this endpoint. It must be released by the caller. Sing# does this
+        /// for the programmer.
+        /// Returns true for success, false for failure.
+        /// </summary>
+        [NoHeapAllocation]
+        public static bool Dispose(ref EndpointCore endpoint);
+
+        /// <summary>
+        /// Deallocates this end of the channel. If other end is also
+        /// deallocated, the entire channel is deallocated.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void Free(Allocation* /* EndpointCore* opt(ExHeap) */ endpoint);
+
+        /// <summary>
+        /// Performs the initialization of the core part of each endpoint and cross links
+        /// them to form a channel.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void Connect(
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ imp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ exp);
+
+        /// <summary>
+        /// Indicates if this endpoint is closed
+        /// </summary>
+        [NoHeapAllocation]
+        public static bool Closed(ref EndpointCore ep);
+
+        /// <summary>
+        /// Indicates if this endpoint is closed
+        /// </summary>
+        [NoHeapAllocation]
+        public static bool PeerClosed(ref EndpointCore ep);
+
+        /// <summary>
+        /// Set this endpoint to closed
+        /// </summary>
+        [NoHeapAllocation]
+        public static void Close(ref EndpointCore ep);
+
+        /// <summary>
+        /// The endpoint to which this endpoint is connected.
+        /// </summary>
+        [NoHeapAllocation]
+        public static Allocation* /*EndpointCore* opt(ExHeap) */ GetPeer(ref EndpointCore ep,
+                                                                         out bool marshall);
+
+        /// <summary>
+        /// The event to wait for messages on this endpoint. Used by Select.
+        /// </summary>
+        [NoHeapAllocation]
+        public static SyncHandle GetWaitHandle(ref EndpointCore ep);
+
+        /// <summary>
+        /// Notify the the peer endpoint that a message is ready.
+        /// Notifies the set if the peer endpoint is part of a set.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void NotifyPeer(ref EndpointCore ep);
+
+        /// <summary>
+        /// Wait for a message to arrive on this endpoint.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void Wait(ref EndpointCore ep);
+
+        /// <summary>
+        /// Transfer the given Allocation block to the target endpoint
+        /// <summary>
+        [NoHeapAllocation]
+        public static void TransferBlockOwnership(Allocation* ptr, ref EndpointCore target);
+
+        /// <summary>
+        /// Transfer any contents that needs to be adjusted from the transferee to the target
+        /// endpoint.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void TransferContentOwnership(
+           ref EndpointCore transferee,
+           ref EndpointCore target);
+
+
+        /// <summary>
+        /// Obtain the process identifier of the owner.
+        /// </summary>
+        [NoHeapAllocation]
+        public static int GetOwnerProcessID(ref EndpointCore ep);
+
+        /// <summary>
+        /// Obtain the principal identifier of the owner.
+        /// </summary>
+        [NoHeapAllocation]
+        public static PrincipalHandle GetOwnerPrincipalHandle(ref EndpointCore ep);
+
+        /// <summary>
+        /// Obtain the process identifier of the owner of the other endpoint
+        /// </summary>
+        [NoHeapAllocation]
+        public static int GetPeerProcessID(ref EndpointCore ep);
+
+        /// <summary>
+        /// Obtain the principal identifier of the owner of the other endpoint
+        /// </summary>
+        [NoHeapAllocation]
+        public static PrincipalHandle GetPeerPrincipalHandle(ref EndpointCore ep);
+
+        /// <summary>
+        /// Obtain the channel identifier of this endpoint.
+        /// </summary>
+        [NoHeapAllocation]
+        public static int GetChannelID(ref EndpointCore ep);
+
+        /// <summary>
+        /// Instruct the selectable object to signal events on the given AutoResetEvent
+        /// rather than its normal event in order to aggregate signalling into a set.
+        /// A selectable object need only support being part of a single collection at
+        /// any point in time.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void LinkIntoCollection(ref EndpointCore ep, AutoResetEventHandle ev);
+
+        /// <summary>
+        /// Instruct the selectable object to stop signalling events on the given
+        /// AutoResetEvent.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void UnlinkFromCollection(ref EndpointCore ep, AutoResetEventHandle ev);
+
+
+        /// <summary>
+        /// Called when sending a message across domains. Instructs the kernel
+        /// to prepare an update record to push into the peer when the peer
+        /// is running.
+        ///
+        /// This call starts a sequence of MarshallPointer calls that will
+        /// end with a call to NotifyPeer.
+        /// </summary>
+        [NoHeapAllocation]
+        unsafe public static void MarshallMessage(ref EndpointCore ep,
+                                                  byte* basep, byte* source,
+                                                  int* tagAddress, int size);
+
+        [NoHeapAllocation]
+        unsafe public static void MarshallPointer(ref EndpointCore ep,
+                                                  byte* basep, byte** target, SystemType type);
+
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/DebugService.csi b/base/Interfaces/Singularity.V1/Services/DebugService.csi
new file mode 100644
index 0000000..fb739a6
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/DebugService.csi
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DebugService.csi
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct DebugService
+    {
+        public readonly int id;
+
+        [NoHeapAllocation]
+        public static unsafe void PrintBegin(out char * buffer, out int length);
+        [NoHeapAllocation]
+        public static unsafe void PrintComplete(char * buffer, int used);
+
+        [NoHeapAllocation]
+        public static unsafe void Print(char * buffer);
+        [NoHeapAllocation]
+        public static unsafe void Print(char * buffer, int length);
+
+        [NoHeapAllocation]
+        public static void Print(bool value);
+        [NoHeapAllocation]
+        public static void Print(char value);
+        [NoHeapAllocation]
+        public static void Print(byte value);
+        [NoHeapAllocation]
+        public static void Print(int value);
+        [NoHeapAllocation]
+        public static void Print(uint value);
+        [NoHeapAllocation]
+        public static void Print(long value);
+        [NoHeapAllocation]
+        public static void Print(ulong value);
+
+        [NoHeapAllocation]
+        public static void Break();
+        [NoHeapAllocation]
+        public static void WalkStack();
+
+        [NoHeapAllocation]
+        public static bool IsDebuggerPresent();
+
+        [NoHeapAllocation]
+        public static ulong ReadPerfCounter(uint which);
+
+        [NoHeapAllocation]
+        public static bool WritePerfCounter(uint which, ulong value);
+
+        [NoHeapAllocation]
+        public static bool AddToPerfCounter(uint which, ulong value);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/DeviceService.csi b/base/Interfaces/Singularity.V1/Services/DeviceService.csi
new file mode 100644
index 0000000..0c0def3
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/DeviceService.csi
@@ -0,0 +1,103 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DeviceService.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct DeviceService
+    {
+        [NoHeapAllocation]
+        public static unsafe uint GetPnpSignature(int index, /*[out]*/ char * output,
+                                                  uint maxout);
+
+        [NoHeapAllocation]
+        public static bool GetPciConfig(out ushort pciAddressPort,
+                                        out ushort pciDataPort,
+                                        out ushort identifier);
+
+        [NoHeapAllocation]
+        public static int GetIrqCount(byte line);
+
+        [NoHeapAllocation]
+        public static uint GetDynamicIoRangeCount();
+
+        [NoHeapAllocation]
+        public static bool GetDynamicIoPortRange(uint range,
+                                                 out ushort port,
+                                                 out ushort size,
+                                                 out bool readable,
+                                                 out bool writable);
+
+        [NoHeapAllocation]
+        public static unsafe bool GetDynamicIoMemoryRange(uint range,
+                                                          out byte * data,
+                                                          out uint size,
+                                                          out bool readable,
+                                                          out bool writable);
+
+        [NoHeapAllocation]
+        public static bool GetDynamicIoIrqRange(uint range,
+                                                out byte line,
+                                                out byte size);
+
+        [NoHeapAllocation]
+        public static bool GetDynamicIoDmaRange(uint range,
+                                                out byte channel,
+                                                out byte size);
+
+        [NoHeapAllocation]
+        public static uint GetFixedIoRangeCount();
+
+        [NoHeapAllocation]
+        public static bool GetFixedIoPortRange(uint range,
+                                               out ushort port,
+                                               out ushort size,
+                                               out bool readable,
+                                               out bool writable);
+
+        [NoHeapAllocation]
+        public static unsafe bool GetFixedIoMemoryRange(uint range,
+                                                        out byte * data,
+                                                        out uint size,
+                                                        out bool readable,
+                                                        out bool writable);
+
+        [NoHeapAllocation]
+        public static bool GetFixedIoIrqRange(uint range,
+                                              out byte line,
+                                              out byte size);
+
+        [NoHeapAllocation]
+        public static bool GetFixedIoDmaRange(uint range,
+                                              out byte channel,
+                                              out byte size);
+
+        [NoHeapAllocation]
+        public static UIntPtr MapPhysicalRange(UIntPtr physStart,
+                                               UIntPtr numBytes,
+                                               bool readable,
+                                               bool writable);
+
+        [NoHeapAllocation]
+        public static void UnmapPhysicalRange(UIntPtr startAddr,
+                                              UIntPtr limitAddr);
+
+        [NoHeapAllocation]
+        public static bool GetDmaPhysicalAddress(
+            UIntPtr virtualAddr,
+            out UIntPtr physicalAddr,
+            out UIntPtr physicalRemaining
+            );
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/PageTableService.csi b/base/Interfaces/Singularity.V1/Services/PageTableService.csi
new file mode 100644
index 0000000..6e05c8e
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/PageTableService.csi
@@ -0,0 +1,101 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PageTableService.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct PageTableService
+    {
+        public readonly int id;
+
+        [NoHeapAllocation]
+        public static unsafe uint * GetPageTable();
+
+#if UINTPTR_SUPPORT_IN_ABI
+        [NoHeapAllocation]
+        public static UIntPtr GetPageCount();
+
+        [NoHeapAllocation]
+        public static UIntPtr GetBaseAddress();
+#endif
+
+        [NoHeapAllocation]
+        public static uint GetProcessTag();
+
+        [NoHeapAllocation]
+        public static UIntPtr Allocate(UIntPtr numPages);
+
+
+        [NoHeapAllocation]
+        public static UIntPtr AllocateExtend(UIntPtr addr,
+                                             UIntPtr numPages);
+
+        [NoHeapAllocation]
+        public static void Free(UIntPtr addr,
+                                UIntPtr numPages);
+
+        [NoHeapAllocation]
+        public static UIntPtr AllocateIOMemory(UIntPtr limit,
+                                               UIntPtr bytes,
+                                               UIntPtr alignment);
+
+        [NoHeapAllocation]
+        public static void FreeIOMemory(UIntPtr addr,
+                                        UIntPtr bytes);
+
+        [NoHeapAllocation]
+        public static bool Query(UIntPtr queryAddr,
+                                 out UIntPtr regionAddr,
+                                 out UIntPtr regionSize);
+
+        [NoHeapAllocation]
+        public static void GetUsageStatistics(out ulong allocatedCount,
+                                              out ulong allocatedBytes,
+                                              out ulong freedCount,
+                                              out ulong freedBytes);
+
+        //////////////////////////////////////////////////////////////////////
+#if !UINTPTR_SUPPORT_IN_ABI
+        [NoHeapAllocation]
+        public static uint GetPageCount();
+
+        [NoHeapAllocation]
+        public static uint GetBaseAddress();
+
+        [NoHeapAllocation]
+        public static uint Allocate(uint numPages);
+
+        [NoHeapAllocation]
+        public static uint AllocateExtend(uint addr,
+                                          uint numPages);
+
+        [NoHeapAllocation]
+        public static void Free(uint addr,
+                                uint numPages);
+
+        [NoHeapAllocation]
+        public static uint AllocateIOMemory(uint limit,
+                                            uint bytes,
+                                            uint alignment);
+
+        [NoHeapAllocation]
+        public static void FreeIOMemory(uint addr,
+                                        uint bytes);
+
+        [NoHeapAllocation]
+        public static bool Query(uint queryAddr,
+                                 out uint regionAddr,
+                                 out uint regionSize);
+#endif
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/ProcessService.csi b/base/Interfaces/Singularity.V1/Services/ProcessService.csi
new file mode 100644
index 0000000..481a9f2
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/ProcessService.csi
@@ -0,0 +1,156 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcessService.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Security;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct LogEntry
+    {
+    }
+
+    public enum  ParameterCode {
+        Success,
+        OutOfRange,
+        NotSet,
+        Retrieved,
+        AlreadySet,
+        Undefined,
+    }
+
+    public struct ProcessService
+    {
+        public readonly int id;
+
+        [NoHeapAllocation]
+        public static void Stop(int exitCode);
+        [NoHeapAllocation]
+        public static TimeSpan GetUpTime();
+        [NoHeapAllocation]
+        public static DateTime GetUtcTime();
+        [NoHeapAllocation]
+        public static long GetCycleCount();
+        [NoHeapAllocation]
+        public static long GetContextSwitchCount();
+        [NoHeapAllocation]
+        public static long GetKernelGcCount();
+        [NoHeapAllocation]
+        public static long GetKernelBootCount();
+        [NoHeapAllocation]
+        public static long GetKernelInterruptCount();
+        [NoHeapAllocation]
+        public static long GetCyclesPerSecond();
+        [NoHeapAllocation]
+        public static ushort GetCurrentProcessId();
+
+        // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        [NoHeapAllocation]
+        public static unsafe SharedHeapService.Allocation * GetNamespaceEndpoint();
+
+        [NoHeapAllocation]
+        public static TimeSpan GetThreadTime();
+
+
+        [NoHeapAllocation]
+        public static long GetThreadsCreatedCount();
+
+        [NoHeapAllocation]
+        public static int GetStartupEndpointCount();
+
+        // Return parameter is really: ExtensionContract.Exp opt(ExHeap) *
+        [NoHeapAllocation]
+        public static unsafe SharedHeapService.Allocation * GetStartupEndpoint(int arg);
+
+        // First parameter is really: ExtensionContract.Exp opt(ExHeap) *
+        [NoHeapAllocation]
+        public static unsafe void SetStartupEndpoint(int arg, SharedHeapService.Allocation * ep);
+
+        [NoHeapAllocation]
+        public static int GetStartupArgCount();
+        [NoHeapAllocation]
+        public static unsafe int GetStartupArg(int arg, char * output, int maxout);
+
+        [NoHeapAllocation]
+        public static unsafe void GetTracingHeaders(out LogEntry *logBegin,
+                                                    out LogEntry *logLimit,
+                                                    out LogEntry **logHead,
+                                                    out byte *txtBegin,
+                                                    out byte *txtLimit,
+                                                    out byte **txtHead);
+
+        [NoHeapAllocation]
+        public static unsafe void GetMonitoringHeaders(out byte * _buffer);
+
+        [NoHeapAllocation]
+        public static void SetGcPerformanceCounters(TimeSpan spent, long bytes);
+
+        [NoHeapAllocation]
+        public static void Waypoint0();
+        [NoHeapAllocation]
+        public static void Waypoint(int num);
+        [NoHeapAllocation]
+        public static void WaypointDone();
+        [NoHeapAllocation]
+        public static void WaypointDump();
+
+        [NoHeapAllocation]
+        public static int GetStartupBoolArgCount();
+
+        [NoHeapAllocation]
+        public static int GetStartupLongArgCount();
+
+        [NoHeapAllocation]
+        public static int GetStartupStringArgCount();
+
+        [NoHeapAllocation]
+        public static int GetStartupStringArrayArgCount();
+
+        [NoHeapAllocation]
+        public static ParameterCode GetStartupBoolArg(int index, out bool value);
+
+        [NoHeapAllocation]
+        public static ParameterCode GetStartupLongArg(int index, out long value);
+
+        [NoHeapAllocation]
+        public static unsafe ParameterCode GetStartupStringArg(int arg, char * output, ref int inoutlength);
+
+        [NoHeapAllocation]
+        public static unsafe ParameterCode GetStartupStringArrayArg(
+                                                int index,
+                                                char *args,
+                                                int *argLengths,
+                                                out int arrayLength,
+                                                out int totalCharCount
+                                         );
+
+        // haryadi -- ping pong
+        [NoHeapAllocation]
+        public static int RunPingPongInt(int start);
+
+        [NoHeapAllocation]
+        public static int HelloProcessABI(int num, int num2);
+
+        [ NoHeapAllocation ]
+        public static unsafe ulong TestAbiCallOne(ulong a);
+
+        [ NoHeapAllocation ]
+        public static unsafe int TestAbiCallTwo(uint a, char *b);
+
+        [ NoHeapAllocation ]
+        public static unsafe char* TestAbiCallThree(int a, int *b, byte c);
+
+
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/SharedHeapService.csi b/base/Interfaces/Singularity.V1/Services/SharedHeapService.csi
new file mode 100644
index 0000000..e4f8773
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/SharedHeapService.csi
@@ -0,0 +1,73 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SharedHeapService.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Types;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    [CLSCompliant(false)]
+    public struct SharedHeapService
+    {
+        public struct Allocation {
+            // No fields visible to ABI callers.
+        }
+
+        public struct AllocationOwnerId {
+            // No fields visible to ABI callers.
+        }
+
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetData(Allocation *allocation);
+
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetSize(Allocation *allocation);
+
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetType(Allocation *allocation);
+
+        [NoHeapAllocation]
+        public static unsafe Allocation *Allocate(UIntPtr size,
+                                                  SystemType type,
+                                                  uint alignment);
+
+        /// <returns>true if last reference was freed</returns>
+        [NoHeapAllocation]
+        public static unsafe bool Free(Allocation *allocation);
+
+        [NoHeapAllocation]
+        public static unsafe Allocation *Share(Allocation *allocation,
+                                               UIntPtr startOffset,
+                                               UIntPtr endOffset);
+
+        [NoHeapAllocation]
+        public static unsafe Allocation *Split(Allocation *allocation,
+                                               UIntPtr offset);
+
+        [NoHeapAllocation]
+        public static unsafe void Truncate(Allocation *allocation,
+                                           UIntPtr offset);
+
+#if NOT_YET
+        [NoHeapAllocation]
+        public static unsafe void TransferTo(
+            Allocation *allocation,
+            AllocationOwnerId newOwner);
+
+        [NoHeapAllocation]
+        public static unsafe void TransferFrom(
+            Allocation *allocation,
+            AllocationOwnerId oldOwner);
+#endif
+
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Services/StackService.csi b/base/Interfaces/Singularity.V1/Services/StackService.csi
new file mode 100644
index 0000000..85afb3c
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Services/StackService.csi
@@ -0,0 +1,82 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: StackService.csi
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct StackService
+    {
+        private readonly int id;
+
+        [NoHeapAllocation]
+        public static void GetUnlinkStackRange(out ulong unlinkBegin, out ulong unlinkLimit);
+        [NoHeapAllocation]
+        public static void WalkStack();
+        [NoHeapAllocation]
+        public static void GetUsageStatistics(out ulong gets, out ulong returns);
+
+        [NoHeapAllocation]
+        public static void LinkStack0();
+        [NoHeapAllocation]
+        public static void LinkStack4();
+        [NoHeapAllocation]
+        public static void LinkStack8();
+        [NoHeapAllocation]
+        public static void LinkStack12();
+        [NoHeapAllocation]
+        public static void LinkStack16();
+        [NoHeapAllocation]
+        public static void LinkStack20();
+        [NoHeapAllocation]
+        public static void LinkStack24();
+        [NoHeapAllocation]
+        public static void LinkStack28();
+        [NoHeapAllocation]
+        public static void LinkStack32();
+        [NoHeapAllocation]
+        public static void LinkStack36();
+        [NoHeapAllocation]
+        public static void LinkStack40();
+        [NoHeapAllocation]
+        public static void LinkStack44();
+        [NoHeapAllocation]
+        public static void LinkStack48();
+        [NoHeapAllocation]
+        public static void LinkStack52();
+        [NoHeapAllocation]
+        public static void LinkStack56();
+        [NoHeapAllocation]
+        public static void LinkStack60();
+        [NoHeapAllocation]
+        public static void LinkStack64();
+
+#if PAGING
+        // For use from the ring-3 code in halstack.asm
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetStackSegmentAndCopy(
+            UIntPtr size,
+            ref ThreadContext context,
+            uint *arg2,
+            uint args,
+            UIntPtr esp,
+            UIntPtr begin,
+            UIntPtr limit);
+
+        // For use from the ring-3 code in halstack.asm
+        [NoHeapAllocation]
+        public static unsafe void ReturnStackSegmentRaw(
+            ref ThreadContext context,
+            UIntPtr begin,
+            UIntPtr limit);
+#endif
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Singularity.V1.csi b/base/Interfaces/Singularity.V1/Singularity.V1.csi
new file mode 100644
index 0000000..70ff90e
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Singularity.V1.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Singularity.V1.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Singularity.V1/Singularity.V1.csproj b/base/Interfaces/Singularity.V1/Singularity.V1.csproj
new file mode 100644
index 0000000..e3f80e4
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Singularity.V1.csproj
@@ -0,0 +1,52 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Singularity.V1\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>Singularity.V1</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdLib>true</NoStdLib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Processes\ProcessHandle.csi"/>
+    <Compile Include="Security\PrincipalHandle.csi"/>
+    <Compile Include="Services\ChannelService.csi"/>
+    <Compile Include="Services\DebugService.csi"/>
+    <Compile Include="Services\DeviceService.csi"/>
+    <Compile Include="Services\PageTableService.csi"/>
+    <Compile Include="Services\ProcessService.csi"/>
+    <Compile Include="Services\SharedHeapService.csi"/>
+    <Compile Include="Services\StackService.csi"/>
+    <Compile Include="Stress\StressDirect.csi"/>
+    <Compile Include="Threads\AutoResetEventHandle.csi"/>
+    <Compile Include="Threads\ContainerHandle.csi"/>
+    <Compile Include="Threads\InterruptHandle.csi"/>
+    <Compile Include="Threads\ManualResetEventHandle.csi"/>
+    <Compile Include="Threads\MutexHandle.csi"/>
+    <Compile Include="Threads\SyncHandle.csi"/>
+    <Compile Include="Threads\ThreadHandle.csi"/>
+    <Compile Include="Threads\ThreadState.csi"/>
+    <Compile Include="Types\SystemType.csi"/>
+    <Compile Include="Singularity.V1.csi"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Baseattrs\Baseattrs.csproj"><Alias>corlib.exe</Alias></ProjectReference>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Basetypes\Basetypes.csproj"><Alias>corlib.exe</Alias></ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets"/>
+
+</Project>
diff --git a/base/Interfaces/Singularity.V1/Stress/StressDirect.csi b/base/Interfaces/Singularity.V1/Stress/StressDirect.csi
new file mode 100644
index 0000000..4a89a38
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Stress/StressDirect.csi
@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressDirect.csi
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Stress
+{
+    public struct StressDirect
+    {
+        [NoHeapAllocation]
+        static public unsafe uint KPTest(SharedHeapService.Allocation* sharedArgs, int i);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/AutoResetEventHandle.csi b/base/Interfaces/Singularity.V1/Threads/AutoResetEventHandle.csi
new file mode 100644
index 0000000..0f02307
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/AutoResetEventHandle.csi
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AutoResetEventHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct AutoResetEventHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(bool initialState,
+                                  out AutoResetEventHandle handle);
+        [NoHeapAllocation]
+        public static void Dispose(AutoResetEventHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Reset(AutoResetEventHandle handle);
+        [NoHeapAllocation]
+        public static bool Set(AutoResetEventHandle handle);
+        [NoHeapAllocation]
+        public static bool SetAll(AutoResetEventHandle handle);
+        [NoHeapAllocation]
+        public static bool SetNoGC(AutoResetEventHandle handle);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/ContainerHandle.csi b/base/Interfaces/Singularity.V1/Threads/ContainerHandle.csi
new file mode 100644
index 0000000..5aceac7
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/ContainerHandle.csi
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ContainerHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct ContainerHandle
+    {
+        public readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static bool Create(out ContainerHandle container);
+        [NoHeapAllocation]
+        public static void Dispose(ContainerHandle container);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/InterruptHandle.csi b/base/Interfaces/Singularity.V1/Threads/InterruptHandle.csi
new file mode 100644
index 0000000..0841df8
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/InterruptHandle.csi
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   InterruptHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct InterruptHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(byte irq,
+                                  out InterruptHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Dispose(InterruptHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Wait(InterruptHandle handle);
+
+        [NoHeapAllocation]
+        public static void Pulse(InterruptHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Ack(InterruptHandle handle);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/ManualResetEventHandle.csi b/base/Interfaces/Singularity.V1/Threads/ManualResetEventHandle.csi
new file mode 100644
index 0000000..cd54e3f
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/ManualResetEventHandle.csi
@@ -0,0 +1,32 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ManualResetEventHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct ManualResetEventHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(bool initialState,
+                                  out ManualResetEventHandle handle);
+        [NoHeapAllocation]
+        public static void Dispose(ManualResetEventHandle handle);
+
+        [NoHeapAllocation]
+        public static bool Reset(ManualResetEventHandle handle);
+        [NoHeapAllocation]
+        public static bool Set(ManualResetEventHandle handle);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/MutexHandle.csi b/base/Interfaces/Singularity.V1/Threads/MutexHandle.csi
new file mode 100644
index 0000000..0dc99c3
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/MutexHandle.csi
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MutexHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct MutexHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(bool initiallyOwned,
+                                  out MutexHandle handle);
+        [NoHeapAllocation]
+        public static void Dispose(MutexHandle handle);
+
+        [NoHeapAllocation]
+        public static void Release(MutexHandle handle);
+
+        [NoHeapAllocation]
+        public static bool IsOwnedByCurrentThread(MutexHandle handle);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/SyncHandle.csi b/base/Interfaces/Singularity.V1/Threads/SyncHandle.csi
new file mode 100644
index 0000000..6e29103
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/SyncHandle.csi
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SyncHandle.csi
+//
+//  Note:   Common synchronization handle (ala WaitHandle in runtime)
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct SyncHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        // Conversion operators
+        //
+
+        [NoHeapAllocation]
+        public static implicit operator SyncHandle(MutexHandle handle);
+        [NoHeapAllocation]
+        public static implicit operator SyncHandle(AutoResetEventHandle handle);
+        [NoHeapAllocation]
+        public static implicit operator SyncHandle(ManualResetEventHandle handle);
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        // The following methods could be moved to WaitHandle if we had
+        // struct inheritance.
+        //
+        [NoHeapAllocation]
+        public static bool WaitOne(SyncHandle handle);
+        [NoHeapAllocation]
+        public static bool WaitOne(SyncHandle handle,
+                                   TimeSpan timeout);
+        [NoHeapAllocation]
+        public static bool WaitOne(SyncHandle handle,
+                                   SchedulerTime stop);
+
+        [NoHeapAllocation]
+        public static bool WaitOneNoGC(SyncHandle handle);
+
+        [NoHeapAllocation]
+        public static int WaitAny(SyncHandle * handles,
+                                  int handleCount);
+        [NoHeapAllocation]
+        public static int WaitAny(SyncHandle * handles,
+                                  int handleCount,
+                                  TimeSpan timeout);
+        [NoHeapAllocation]
+        public static int WaitAny(SyncHandle * handles,
+                                  int handleCount,
+                                  SchedulerTime stop);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/ThreadHandle.csi b/base/Interfaces/Singularity.V1/Threads/ThreadHandle.csi
new file mode 100644
index 0000000..46119fd
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/ThreadHandle.csi
@@ -0,0 +1,67 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Channels;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    //| <include path='docs/doc[@for="ThreadHandle"]/*' />
+    public struct ThreadHandle
+    {
+        public readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static bool Create(int threadIndex,
+                                  ContainerHandle container,
+                                  out ThreadHandle thread,
+                                  out UIntPtr threadContext);
+        [NoHeapAllocation]
+        public static void Dispose(ThreadHandle thread);
+
+        [NoHeapAllocation]
+        public static void Start(ThreadHandle thread);
+        [NoHeapAllocation]
+        public static ThreadState GetThreadState(ThreadHandle thread);
+        [NoHeapAllocation]
+        public static TimeSpan GetExecutionTime(ThreadHandle thread);
+
+        [NoHeapAllocation]
+        public static bool Join(ThreadHandle thread);
+        [NoHeapAllocation]
+        public static bool Join(ThreadHandle thread, TimeSpan timeout);
+        [NoHeapAllocation]
+        public static bool Join(ThreadHandle thread, SchedulerTime stop);
+
+        [NoHeapAllocation]
+        public static ThreadHandle CurrentThread();
+
+        [NoHeapAllocation]
+        public static UIntPtr GetThreadLocalValue();
+        [NoHeapAllocation]
+        public static void SetThreadLocalValue(UIntPtr value);
+
+        [NoHeapAllocation]
+        public static void Sleep(TimeSpan timeout);
+        [NoHeapAllocation]
+        public static void Sleep(SchedulerTime stop);
+        [NoHeapAllocation]
+        public static void Yield();
+
+        [NoHeapAllocation]
+        public static void SpinWait(int iterations);
+
+        //public static uint GetPrincipal(/*[out]*/ char *outprincipal, uint maxout);
+
+        // public static uint GetPrincipal(ThreadHandle handle, /*[out]*/ char *outprincipal, uint maxout);
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/Threads/ThreadState.csi b/base/Interfaces/Singularity.V1/Threads/ThreadState.csi
new file mode 100644
index 0000000..a0388dd
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/Threads/ThreadState.csi
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadState.csi
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    //| <include path='docs/doc[@for="ThreadState"]/*' />
+    [Flags]
+    public enum ThreadState
+    {
+        Unstarted           = 0x00,
+        Running             = 0x01,
+        Blocked             = 0x02,
+        Suspended           = 0x04,
+        Stopped             = 0x08,
+    }
+}
diff --git a/base/Interfaces/Singularity.V1/types/SystemType.csi b/base/Interfaces/Singularity.V1/types/SystemType.csi
new file mode 100644
index 0000000..ca7a0b3
--- /dev/null
+++ b/base/Interfaces/Singularity.V1/types/SystemType.csi
@@ -0,0 +1,51 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SystemType.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Types
+{
+    [CLSCompliant(true)]
+    public struct SystemType
+    {
+        /// A handle to a RuntimeSystemType
+        private readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static SystemType RootSystemType();
+
+        [NoHeapAllocation]
+        public static SystemType Register(char* name,
+                                          int nameLength,
+                                          long lowerHash,
+                                          long upperHash,
+                                          SystemType parent);
+
+        [NoHeapAllocation]
+        public static bool IsSubtype(SystemType child,
+                                     SystemType parent);
+
+        [NoHeapAllocation]
+        unsafe public static bool IsSubtype(SharedHeapService.Allocation* childData,
+                                            SystemType parent);
+
+        [NoHeapAllocation]
+        public static bool IsNull(SystemType st);
+
+        public UIntPtr TypeId
+        {
+            [NoHeapAllocation]
+            get;
+        }
+    }
+}
diff --git a/base/Interfaces/Stress/Stress.csi b/base/Interfaces/Stress/Stress.csi
new file mode 100644
index 0000000..89019cf
--- /dev/null
+++ b/base/Interfaces/Stress/Stress.csi
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Stress.csi
+//
+//  Note:   Assembly strong name information.
+//
+
+using System;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
diff --git a/base/Interfaces/Stress/Stress.csproj b/base/Interfaces/Stress/Stress.csproj
new file mode 100644
index 0000000..c7b287c
--- /dev/null
+++ b/base/Interfaces/Stress/Stress.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Stress\Stress.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Stress</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Stress.csi" />
+    <Compile Include="StressService.csi" />
+    <Compile Include="StressDirect.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Baseattrs\Baseattrs.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+  </ItemGroup>
+  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Interfaces/Stress/StressDirect.csi b/base/Interfaces/Stress/StressDirect.csi
new file mode 100644
index 0000000..11c571e
--- /dev/null
+++ b/base/Interfaces/Stress/StressDirect.csi
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressDirect.csi
+//
+//  Note:
+//
+
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Stress
+{
+    public class StressDirect
+    {
+        static public unsafe uint KPTest(SharedHeap.Allocation *sharedArgs, int i);
+    }
+}
diff --git a/base/Interfaces/Stress/StressService.csi b/base/Interfaces/Stress/StressService.csi
new file mode 100644
index 0000000..482852f
--- /dev/null
+++ b/base/Interfaces/Stress/StressService.csi
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressService.csi
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Stress
+{
+    public class StressService
+    {
+        static public void Initialize();
+    }
+}
diff --git a/base/Interfaces/Xml/Xml.csi b/base/Interfaces/Xml/Xml.csi
new file mode 100644
index 0000000..064497e
--- /dev/null
+++ b/base/Interfaces/Xml/Xml.csi
@@ -0,0 +1,57 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Xml.csi
+//
+//  Note:   Interface definition for the Xml classs
+//
+//////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Collections;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyKeyFileAttribute("public.snk")]
+[assembly: System.Reflection.AssemblyDelaySignAttribute(true)]
+
+namespace Microsoft.Singularity.Xml
+{
+    public class XmlReader
+    {
+        public XmlReader(IoMemory mem);
+
+        public XmlReader(byte[] buffer);
+
+        public ArrayList Parse();
+    }
+
+    public class XmlNode
+    {
+        public string Name {get;}
+        public ArrayList GetNamedChildren(string name);
+        public XmlNode GetNestedChild(ICollection nodeNameList);
+
+        // these are safe accessors to the attributes
+        public string GetAttribute(string attributeName, string defaultValue);
+        public bool   GetAttribute(string attributeName, bool   defaultValue);
+        public string GetAttribute(string attributeName, int    defaultValue);
+
+        // not sure if these should go away
+        public ArrayList Children {get;}
+        public void AddChild(XmlNode node);
+        public XmlNode(string name, int depth);
+
+        // these should go away
+        public int Depth {get;}
+        public void AddText(string text);
+        public string Text {get;}
+        public string this[string attributeName] { get; set; }
+    }
+}
diff --git a/base/Interfaces/Xml/Xml.csproj b/base/Interfaces/Xml/Xml.csproj
new file mode 100644
index 0000000..7903263
--- /dev/null
+++ b/base/Interfaces/Xml/Xml.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Interfaces\Xml\Xml.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Xml</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStdlib>true</NoStdlib>
+    <AssemblyAlias>kernel.exe</AssemblyAlias>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Xml.csi" />
+    <ProjectReference Include="..\Basetypes\Basetypes.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Kernel\Kernel.csproj" />
+    <ProjectReference Include="..\Memory\Memory.csproj"><Alias>kernel.exe</Alias></ProjectReference>
+    <ProjectReference Include="..\Collections\Collections.csproj" />    
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/Kernel/App.Corlib.csproj b/base/Kernel/App.Corlib.csproj
new file mode 100644
index 0000000..c3d92bf
--- /dev/null
+++ b/base/Kernel/App.Corlib.csproj
@@ -0,0 +1,310 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Applications\Runtime\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <UseResponseFile>true</UseResponseFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ExcludeFromILReferences>false</ExcludeFromILReferences>
+    <DefineConstants>SINGULARITY_PROCESS;ENDPOINT_STRUCT</DefineConstants>
+    <NoWarn>169,649</NoWarn>
+    <AssemblyName>Corlib</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AssemblyEnvironment>none</AssemblyEnvironment>
+    <APPRUNTIME>..\Applications\Runtime</APPRUNTIME>
+    <LIBRARIES>..\Libraries</LIBRARIES>
+    <Language>C#</Language>
+    <NoStdLib>true</NoStdLib>
+    <ProjectGuid>{F4C22616-B154-496C-A4CF-C49401E52C87}</ProjectGuid>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(PAGING)'=='On'">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);PAGING</DefineConstants>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+  <ItemGroup>
+    <Compile Include="System\ApplicationException.cs" />
+    <Compile Include="System\ArgumentException.cs" />
+    <Compile Include="System\ArgumentNullException.cs" />
+    <Compile Include="System\ArgumentOutOfRangeException.cs" />
+    <Compile Include="System\ArithmeticException.cs" />
+    <Compile Include="System\ArrayTypeMismatchException.cs" />
+    <Compile Include="System\DivideByZeroException.cs" />
+    <Compile Include="System\Exception.cs" />
+    <Compile Include="System\FormatException.cs" />
+    <Compile Include="System\IndexOutOfRangeException.cs" />
+    <Compile Include="System\InvalidCastException.cs" />
+    <Compile Include="System\InvalidOperationException.cs" />
+    <Compile Include="System\MulticastNotSupportedException.cs" />
+    <Compile Include="System\NotSupportedException.cs" />
+    <Compile Include="System\NullReferenceException.cs" />
+    <Compile Include="System\ObjectDisposedException.cs" />
+    <Compile Include="System\OutOfMemoryException.cs" />
+    <Compile Include="System\OverflowException.cs" />
+    <Compile Include="$(APPRUNTIME)\System\ProcessCreateException.cs" />
+    <Compile Include="System\ProcessStateException.cs" />
+    <Compile Include="System\RankException.cs" />
+    <Compile Include="System\StackOverflowException.cs" />
+    <Compile Include="System\SystemException.cs" />
+    <Compile Include="System\TypeInitializationException.cs" />
+    <Compile Include="System\AttributeUsageAttribute.cs" />
+    <Compile Include="System\CLSCompliantAttribute.cs" />
+    <Compile Include="System\FlagsAttribute.cs" />
+    <Compile Include="System\ObsoleteAttribute.cs" />
+    <Compile Include="System\ParamArrayAttribute.cs" />
+    <Compile Include="System\ArgIterator.cs" />
+    <Compile Include="System\Array.cs" />
+    <Compile Include="System\AsyncCallback.cs" />
+    <Compile Include="System\Attribute.cs" />
+    <Compile Include="System\AttributeTargets.cs" />
+    <Compile Include="System\BitConverter.cs" />
+    <Compile Include="System\Boolean.cs" />
+    <Compile Include="System\Buffer.cs" />
+    <Compile Include="System\Byte.cs" />
+    <Compile Include="System\Char.cs" />
+    <Compile Include="System\CharEnumerator.cs" />
+    <Compile Include="$(APPRUNTIME)\System\Console.cs" />
+    <Compile Include="$(APPRUNTIME)\System\DateTime.cs" />
+    <Compile Include="System\SchedulerTime.cs" />
+    <Compile Include="System\DayOfWeek.cs" />
+    <Compile Include="System\Decimal.cs" />
+    <Compile Include="System\Delegate.cs" />
+    <Compile Include="System\Double.cs" />
+    <Compile Include="System\Empty.cs" />
+    <Compile Include="System\Enum.cs" />
+    <Compile Include="$(APPRUNTIME)\System\Environment.cs" />
+    <Compile Include="System\EventArgs.cs" />
+    <Compile Include="System\EventHandler.cs" />
+    <Compile Include="System\Guid.cs" />
+    <Compile Include="System\IAsyncResult.cs" />
+    <Compile Include="System\ICloneable.cs" />
+    <Compile Include="System\IComparable.cs" />
+    <Compile Include="System\IDisposable.cs" />
+    <Compile Include="System\IFormattable.cs" />
+    <Compile Include="System\Int16.cs" />
+    <Compile Include="System\Int32.cs" />
+    <Compile Include="System\Int64.cs" />
+    <Compile Include="System\IntPtr.cs" />
+    <Compile Include="System\Internal.cs" />
+    <Compile Include="System\Math.cs" />
+    <Compile Include="System\MulticastDelegate.cs" />
+    <Compile Include="System\Number.cs" />
+    <Compile Include="System\Object.cs" />
+    <Compile Include="System\ParseNumbers.cs" />
+    <!-- <Compile Include="System\PrincipalId.cs"/> -->
+    <Compile Include="System\ProcessExitCode.cs" />
+    <Compile Include="System\Random.cs" />
+    <Compile Include="System\RuntimeArgumentHandle.cs" />
+    <Compile Include="System\RuntimeFieldHandle.cs" />
+    <Compile Include="System\RuntimeMethodHandle.cs" />
+    <Compile Include="System\RuntimeType.cs" />
+    <Compile Include="System\RuntimeTypeHandle.cs" />
+    <Compile Include="System\SByte.cs" />
+    <Compile Include="System\Single.cs" />
+    <Compile Include="System\String.cs" />
+    <Compile Include="System\Text\StringBuilder.cs" />
+    <Compile Include="System\TimeSpan.cs" />
+    <Compile Include="System\Type.cs" />
+    <Compile Include="System\TypeCode.cs" />
+    <Compile Include="System\TypedReference.cs" />
+    <Compile Include="System\UInt16.cs" />
+    <Compile Include="System\UInt32.cs" />
+    <Compile Include="System\UInt64.cs" />
+    <Compile Include="System\UIntPtr.cs" />
+    <Compile Include="System\ValueType.cs" />
+    <Compile Include="System\VarargList.cs" />
+    <Compile Include="System\Version.cs" />
+    <Compile Include="System\Void.cs" />
+    <Compile Include="System\_LocalDataStore.cs" />
+    <Compile Include="System\_LocalDataStoreMgr.cs" />
+    <Compile Include="$(LIBRARIES)\Crypto\MD5.cs" />
+
+    <!-- THREADING_SOURCES -->
+    <Compile Include="$(APPRUNTIME)\System\Threading\AutoResetEvent.cs" />
+    <Compile Include="System\Threading\HandleCreateException.cs" />
+    <Compile Include="System\Threading\Interlocked.cs" />
+    <Compile Include="$(APPRUNTIME)\System\Threading\ManualResetEvent.cs" />
+    <Compile Include="System\Threading\Monitor.cs" />
+    <Compile Include="$(APPRUNTIME)\System\Threading\Mutex.cs" />
+    <Compile Include="System\Threading\SynchronizationLockException.cs" />
+    <Compile Include="$(APPRUNTIME)\System\Threading\Thread.cs" />
+    <Compile Include="System\Threading\ThreadStart.cs" />
+    <Compile Include="System\Threading\ThreadState.cs" />
+    <Compile Include="System\Threading\ThreadStateException.cs" />
+    <Compile Include="System\Threading\Timeout.cs" />
+    <Compile Include="$(APPRUNTIME)\System\Threading\WaitHandle.cs" />
+    <!-- COLLECTIONS_SOURCES -->
+    <Compile Include="System\Collections\ArrayList.cs" />
+    <Compile Include="System\Collections\BitArray.cs" />
+    <Compile Include="System\Collections\CaseInsensitiveComparer.cs" />
+    <Compile Include="System\Collections\CaseInsensitiveHashCodeProvider.cs" />
+    <Compile Include="System\Collections\CollectionBase.cs" />
+    <Compile Include="System\Collections\Comparer.cs" />
+    <Compile Include="System\Collections\DictionaryBase.cs" />
+    <Compile Include="System\Collections\DictionaryEntry.cs" />
+    <Compile Include="System\Collections\Hashtable.cs" />
+    <Compile Include="System\Collections\ICollection.cs" />
+    <Compile Include="System\Collections\IComparer.cs" />
+    <Compile Include="System\Collections\IDictionary.cs" />
+    <Compile Include="System\Collections\IDictionaryEnumerator.cs" />
+    <Compile Include="System\Collections\IEnumerable.cs" />
+    <Compile Include="System\Collections\IEnumerator.cs" />
+    <Compile Include="System\Collections\IHashCodeProvider.cs" />
+    <Compile Include="System\Collections\IList.cs" />
+    <Compile Include="System\Collections\Queue.cs" />
+    <Compile Include="System\Collections\ReadOnlyCollectionBase.cs" />
+    <Compile Include="System\Collections\SortedList.cs" />
+    <Compile Include="System\Collections\Stack.cs" />
+    <Compile Include="System\Collections\Specialized\ListDictionary.cs" />
+    <Compile Include="System\Collections\Specialized\StringDictionary.cs" />
+    <!-- DIAGNOSTICS_SOURCES -->
+    <Compile Include="System\Diagnostics\Assert.cs" />
+    <Compile Include="System\Diagnostics\AssertFilter.cs" />
+    <Compile Include="System\Diagnostics\AssertFilters.cs" />
+    <Compile Include="System\Diagnostics\ConditionalAttribute.cs" />
+    <Compile Include="System\Diagnostics\Debug.cs" />
+    <Compile Include="System\Diagnostics\DebuggerAttributes.cs" />
+    <!-- REFLECTION_SOURCES -->
+    <Compile Include="System\Reflection\Assembly.cs" />
+    <Compile Include="System\Reflection\AssemblyAttributes.cs" />
+    <Compile Include="System\Reflection\AssemblyName.cs" />
+    <Compile Include="System\Reflection\AssemblyReflectionAttributes.cs" />
+    <Compile Include="System\Reflection\DefaultMemberAttribute.cs" />
+    <Compile Include="System\Reflection\Module.cs" />
+    <Compile Include="System\Reflection\TypeAttributes.cs" />
+    <!-- GLOBALIZATION_SOURCES -->
+    <Compile Include="System\Globalization\CharacterInfo.cs" />
+    <Compile Include="System\Globalization\CompareInfo.cs" />
+    <Compile Include="System\Globalization\CultureInfo.cs" />
+    <Compile Include="System\Globalization\NumberFormatInfo.cs" />
+    <Compile Include="System\Globalization\NumberStyles.cs" />
+    <Compile Include="System\Globalization\TextInfo.cs" />
+    <Compile Include="System\Globalization\UnicodeCategory.cs" />
+    <!-- TEXT_SOURCES -->
+    <Compile Include="System\Text\ASCIIEncoding.cs" />
+    <Compile Include="System\Text\Decoder.cs" />
+    <Compile Include="System\Text\Encoder.cs" />
+    <Compile Include="System\Text\Encoding.cs" />
+    <Compile Include="System\Text\UnicodeEncoding.cs" />
+    <Compile Include="System\Text\UTF8Encoding.cs" />
+    <!-- REGULAR_EXPRESSIONS_SOURCES -->
+    <Compile Include="System\Text\RegularExpressions\regex.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexboyermoore.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcapture.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcapturecollection.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcharclass.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcode.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcompilationinfo.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexfcd.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexgroup.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexgroupcollection.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexinterpreter.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexmatch.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexmatchcollection.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexnode.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexoptions.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexparser.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexreplacement.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexrunner.cs" />
+    <Compile Include="System\Text\RegularExpressions\regextree.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexwriter.cs" />
+    <!-- COMPILER_SERVICES_SOURCES -->
+    <Compile Include="System\Runtime\CompilerServices\DecimalConstantAttribute.cs" />
+    <Compile Include="System\Runtime\CompilerServices\IndexerNameAttribute.cs" />
+    <Compile Include="System\Runtime\CompilerServices\IsVolatile.cs" />
+    <Compile Include="System\Runtime\CompilerServices\MethodImplAttribute.cs" />
+    <Compile Include="System\Runtime\CompilerServices\RuntimeHelpers.cs" />
+    <!-- INTEROP_SOURCES -->
+    <Compile Include="System\Runtime\InteropServices\Attributes.cs" />
+    <Compile Include="System\Runtime\InteropServices\CharSet.cs" />
+    <Compile Include="System\Runtime\InteropServices\GCHandle.cs" />
+    <Compile Include="System\Runtime\InteropServices\LayoutKind.cs" />
+    <Compile Include="System\Runtime\InteropServices\Marshal.cs" />
+    <!-- X86_SOURCES -->
+    <Compile Include="Singularity\X86\CR0.cs" />
+    <Compile Include="Singularity\X86\CR3.cs" />
+    <Compile Include="Singularity\X86\CR4.cs" />
+    <Compile Include="Singularity\X86\EFlags.cs" />
+    <Compile Include="Singularity\X86\EVectors.cs" />
+    <Compile Include="Singularity\X86\Gdt.cs" />
+    <Compile Include="Singularity\X86\Idt.cs" />
+    <Compile Include="Singularity\X86\MmxContext.cs" />
+    <Compile Include="Singularity\X86\Pdt.cs" />
+    <Compile Include="Singularity\X86\ProcessorContext.cs" />
+    <Compile Include="Singularity\X86\ThreadContext.cs" />
+    <Compile Include="Singularity\X86\Tss.cs" />
+    <!-- CHANNEL_SOURCES -->
+    <Compile Include="Singularity\Channels\ChannelClosedException.cs" />
+    <Compile Include="Singularity\Channels\ChannelException.cs" />
+    <Compile Include="Singularity\Channels\ChannelTransferredException.cs" />
+    <Compile Include="Singularity\Channels\ClaimsAttribute.cs" />
+    <Compile Include="Singularity\Channels\ISelectable.sg" />
+    <Compile Include="Singularity\Channels\ITracked.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="Singularity\Io\IoDma.cs" />
+    <Compile Include="Singularity\Io\IoDmaRange.cs" />
+    <Compile Include="$(APPRUNTIME)\Singularity\Io\IoIrq.cs" />
+    <Compile Include="Singularity\Io\IoIrqRange.cs" />
+    <Compile Include="Singularity\Io\IoMemoryRange.cs" />
+    <Compile Include="Singularity\Io\IoPort.cs" />
+    <Compile Include="Singularity\Io\IoPortRange.cs" />
+    <Compile Include="Singularity\Io\IoRange.cs" />
+    <Compile Include="Singularity\Io\PciConfig.cs" />
+    <Compile Include="Singularity\Io\PnpConfig.cs" />
+    <Compile Include="Singularity\Io\ResourceAttributes.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- IO_SOURCES -->
+    <Compile Include="Singularity\Io\Access.cs" />
+    <Compile Include="Singularity\Io\ByteOrder.cs" />
+    <Compile Include="Singularity\Io\Error.cs" />
+    <Compile Include="Singularity\Io\IoConfig.cs" />
+    <Compile Include="Singularity\Io\IoMemory.cs" />
+    <Compile Include="Singularity\Io\CategoryAttributes.cs" />
+    <Compile Include="Singularity\Memory\PhysicalAddress.cs" />
+    <!-- SA_SOURCES -->
+    <Compile Include="Singularity\Security\SecurityAttributes.cs" />
+    <Compile Include="$(APPRUNTIME)\Singularity\AppRuntime.cs" />
+    <Compile Include="$(APPRUNTIME)\Singularity\DebugStub.cs" />
+    <Compile Include="$(APPRUNTIME)\Singularity\Processor.cs" />
+    <Compile Include="$(APPRUNTIME)\Singularity\Memory\Stacks.cs" />
+    <Compile Include="Singularity\Tracing.cs" />
+    <Compile Include="Singularity\Monitoring.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Console\Console.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Runtime\ILHelpers.csproj" />
+  </ItemGroup>
+
+
+  <!-- Pull in the items and properties for the GC implementation. -->
+  <PropertyGroup>
+    <Collector>$(COLLECTOR_APP)</Collector>
+    <DefineGCCompileItems>true</DefineGCCompileItems>
+  </PropertyGroup>
+  <Import Project="GC.targets"/>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\AppRuntime.targets" />
+</Project>
diff --git a/base/Kernel/Bartok/ArrayHelper.cs b/base/Kernel/Bartok/ArrayHelper.cs
new file mode 100644
index 0000000..9f19038
--- /dev/null
+++ b/base/Kernel/Bartok/ArrayHelper.cs
@@ -0,0 +1,707 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System {
+
+  using Microsoft.Bartok.Runtime;
+  using System;
+  using System.Collections;
+  using System.GCs;
+  using System.Runtime.InteropServices;
+  using System.Runtime.CompilerServices;
+
+  [RequiredByBartok]
+  internal class ArrayHelper {
+      // these should probably all be replaced with calls to Buffer.MoveMemory.
+      [RequiredByBartok]
+      public static void CopyBoolUp(bool[] srcArray, int srcOffset,
+                                    bool[] dstArray, int dstOffset,
+                                    int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyBoolDown(bool[] srcArray, int srcOffset,
+                                      bool[] dstArray, int dstOffset,
+                                      int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyCharUp(char[] srcArray, int srcOffset,
+                                    char[] dstArray, int dstOffset,
+                                    int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyCharDown(char[] srcArray, int srcOffset,
+                                      char[] dstArray, int dstOffset,
+                                      int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyInt8Up(sbyte[] srcArray, int srcOffset,
+                                    sbyte[] dstArray, int dstOffset,
+                                    int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyInt8Down(sbyte[] srcArray, int srcOffset,
+                                      sbyte[] dstArray, int dstOffset,
+                                      int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyInt16Up(short[] srcArray, int srcOffset,
+                                     short[] dstArray, int dstOffset,
+                                     int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyInt16Down(short[] srcArray, int srcOffset,
+                                       short[] dstArray, int dstOffset,
+                                       int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyInt32Up(int[] srcArray, int srcOffset,
+                                     int[] dstArray, int dstOffset,
+                                     int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyInt32Down(int[] srcArray, int srcOffset,
+                                       int[] dstArray, int dstOffset,
+                                       int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyInt64Up(long[] srcArray, int srcOffset,
+                                     long[] dstArray, int dstOffset,
+                                     int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyInt64Down(long[] srcArray, int srcOffset,
+                                       long[] dstArray, int dstOffset,
+                                       int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyUInt8Up(byte[] srcArray, int srcOffset,
+                                     byte[] dstArray, int dstOffset,
+                                     int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyUInt8Down(byte[] srcArray, int srcOffset,
+                                       byte[] dstArray, int dstOffset,
+                                       int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyUInt16Up(ushort[] srcArray, int srcOffset,
+                                      ushort[] dstArray, int dstOffset,
+                                      int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyUInt16Down(ushort[] srcArray, int srcOffset,
+                                        ushort[] dstArray, int dstOffset,
+                                        int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyUInt32Up(uint[] srcArray, int srcOffset,
+                                      uint[] dstArray, int dstOffset,
+                                      int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyUInt32Down(uint[] srcArray, int srcOffset,
+                                        uint[] dstArray, int dstOffset,
+                                        int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyUInt64Up(ulong[] srcArray, int srcOffset,
+                                      ulong[] dstArray, int dstOffset,
+                                      int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyUInt64Down(ulong[] srcArray, int srcOffset,
+                                        ulong[] dstArray, int dstOffset,
+                                        int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyFloat32Up(float[] srcArray, int srcOffset,
+                                       float[] dstArray, int dstOffset,
+                                       int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyFloat32Down(float[] srcArray, int srcOffset,
+                                         float[] dstArray, int dstOffset,
+                                         int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      [RequiredByBartok]
+      public static void CopyFloat64Up(double[] srcArray, int srcOffset,
+                                       double[] dstArray, int dstOffset,
+                                       int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyFloat64Down(double[] srcArray, int srcOffset,
+                                         double[] dstArray, int dstOffset,
+                                         int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      // Unchecked versions of these arrays.
+      // Preconditions: bounds are in range.
+      public static void UncheckedCopyBoolUp(bool[] srcArray, int srcOffset,
+                                             bool[] dstArray, int dstOffset,
+                                             int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyBoolDown(bool[] srcArray, int srcOffset,
+                                               bool[] dstArray, int dstOffset,
+                                               int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyCharUp(char[] srcArray, int srcOffset,
+                                             char[] dstArray, int dstOffset,
+                                             int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyCharDown(char[] srcArray, int srcOffset,
+                                               char[] dstArray, int dstOffset,
+                                               int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyInt8Up(sbyte[] srcArray, int srcOffset,
+                                             sbyte[] dstArray, int dstOffset,
+                                             int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyInt8Down(sbyte[] srcArray, int srcOffset,
+                                               sbyte[] dstArray, int dstOffset,
+                                               int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyInt16Up(short[] srcArray, int srcOffset,
+                                              short[] dstArray, int dstOffset,
+                                              int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyInt16Down(short[] srcArray, int srcOffset,
+                                                short[] dstArray, int dstOffset,
+                                                int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyInt32Up(int[] srcArray, int srcOffset,
+                                              int[] dstArray, int dstOffset,
+                                              int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyInt32Down(int[] srcArray, int srcOffset,
+                                                int[] dstArray, int dstOffset,
+                                                int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyInt64Up(long[] srcArray, int srcOffset,
+                                              long[] dstArray, int dstOffset,
+                                              int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyInt64Down(long[] srcArray, int srcOffset,
+                                                long[] dstArray, int dstOffset,
+                                                int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyUInt8Up(byte[] srcArray, int srcOffset,
+                                              byte[] dstArray, int dstOffset,
+                                              int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyUInt8Down(byte[] srcArray, int srcOffset,
+                                                byte[] dstArray, int dstOffset,
+                                                int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyUInt16Up(ushort[] srcArray, int srcOffset,
+                                               ushort[] dstArray, int dstOffset,
+                                               int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyUInt16Down(ushort[] srcArray,
+                                                 int srcOffset,
+                                                 ushort[] dstArray,
+                                                 int dstOffset,
+                                                 int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyUInt32Up(uint[] srcArray, int srcOffset,
+                                               uint[] dstArray, int dstOffset,
+                                               int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyUInt32Down(uint[] srcArray, int srcOffset,
+                                                 uint[] dstArray, int dstOffset,
+                                                 int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyUInt64Up(ulong[] srcArray, int srcOffset,
+                                               ulong[] dstArray, int dstOffset,
+                                               int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyUInt64Down(ulong[] srcArray,
+                                                 int srcOffset,
+                                                 ulong[] dstArray,
+                                                 int dstOffset,
+                                                 int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyFloat32Up(float[] srcArray, int srcOffset,
+                                                float[] dstArray, int dstOffset,
+                                                int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyFloat32Down(float[] srcArray,
+                                                  int srcOffset,
+                                                  float[] dstArray,
+                                                  int dstOffset,
+                                                  int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      public static void UncheckedCopyFloat64Up(double[] srcArray,
+                                                int srcOffset,
+                                                double[] dstArray,
+                                                int dstOffset,
+                                                int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void UncheckedCopyFloat64Down(double[] srcArray,
+                                                  int srcOffset,
+                                                  double[] dstArray,
+                                                  int dstOffset,
+                                                  int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+
+      // PRE: lengths compatible
+      // REVIEW: no length or type checking
+      // REVIEW: see System.Array.Copy
+      [RequiredByBartok]
+      public static unsafe void InitArray(System.Array srcArray,
+                                          System.Array dstArray) {
+#if !REFERENCE_COUNTING_GC && !DEFERRED_REFERENCE_COUNTING_GC
+          WriteBarrier.ArrayCopy(srcArray, 0, dstArray, 0, srcArray.Length);
+#else
+          fixed (int *srcFieldPtr = &srcArray.field1) {
+              void *src = srcArray.GetFirstElementAddress(srcFieldPtr);
+              fixed (int *dstFieldPtr = &dstArray.field1) {
+                  void *dst = dstArray.GetFirstElementAddress(dstFieldPtr);
+                  int size = (srcArray.vtable.arrayElementSize *
+                              srcArray.Length);
+#if REFERENCE_COUNTING_GC
+                  if (dstArray.vtable.arrayOf ==
+                      StructuralType.Reference ||
+                      dstArray.vtable.arrayOf ==
+                      StructuralType.Struct) {
+                      int dstLength =
+                          size/dstArray.vtable.arrayElementSize;
+                      GCs.ReferenceCountingCollector.
+                      IncrementReferentRefCounts(Magic.addressOf(srcArray),
+                                                 srcArray.vtable,
+                                                 0,
+                                                 srcArray.Length);
+                      GCs.ReferenceCountingCollector.
+                      DecrementReferentRefCounts(Magic.addressOf(dstArray),
+                                                 dstArray.vtable,
+                                                 0,
+                                                 dstLength);
+                  }
+#elif DEFERRED_REFERENCE_COUNTING_GC
+                  if (dstArray.vtable.arrayOf ==
+                      StructuralType.Reference ||
+                      dstArray.vtable.arrayOf ==
+                      StructuralType.Struct) {
+                      int dstLength =
+                          size/dstArray.vtable.arrayElementSize;
+                      GCs.DeferredReferenceCountingCollector.
+                      IncrementReferentRefCounts(Magic.addressOf(srcArray),
+                                                 srcArray.vtable,
+                                                 0,
+                                                 srcArray.Length);
+                      GCs.DeferredReferenceCountingCollector.
+                      DecrementReferentRefCounts(Magic.addressOf(dstArray),
+                                                 dstArray.vtable,
+                                                 0,
+                                                 dstLength);
+                  }
+#endif // REFERENCE_COUNTING_GC
+                  System.IO.__UnmanagedMemoryStream.memcpyimpl
+                      ((byte*)src, (byte*)dst, size);
+              }
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      public static void CopyRefObjectUp(Object[] srcArray, int srcOffset,
+                                         Object[] dstArray, int dstOffset,
+                                         int length) {
+          int dx = dstOffset;
+          int sx = srcOffset;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx++;
+              dx++;
+          }
+      }
+
+      public static void CopyRefObjectDown(Object[] srcArray, int srcOffset,
+                                           Object[] dstArray, int dstOffset,
+                                           int length) {
+          int dx = dstOffset+length-1;
+          int sx = srcOffset+length-1;
+          for (int i=length-1; i>=0; i--) {
+              dstArray[dx] = srcArray[sx];
+              sx--;
+              dx--;
+          }
+      }
+  }
+}
diff --git a/base/Kernel/Bartok/Finalizer.cs b/base/Kernel/Bartok/Finalizer.cs
new file mode 100644
index 0000000..76d9dc9
--- /dev/null
+++ b/base/Kernel/Bartok/Finalizer.cs
@@ -0,0 +1,718 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System {
+
+  using Microsoft.Bartok.Runtime;
+  using System.Threading;
+  using System.Runtime.CompilerServices;
+  using System.GCs;
+#if SINGULARITY
+  using Microsoft.Singularity;
+#endif
+
+  /// <summary>
+  /// Finalizers are allocated for allocated objects that are finalizable.
+  ///
+  /// BUGBUG: During a garbage collection it should be possible to coalesce
+  /// several FinalizerTable entries into a single entry. In order to
+  /// facilitate this all indexes are currently allocated with reference to
+  /// the first table. It should also be possible to compact the tables.
+  /// </summary>
+  [CCtorIsRunDuringStartup]
+  [RequiredByBartok]
+  internal struct Finalizer
+  {
+      // Objects are stored as their UIntPtr, asserted to have the low bit
+      // clear.  Links in the free list are stored as the (index<<1 | 1).
+      private static bool IsLink(int index)
+      {
+          return ((index & 1) != 0);
+      }
+
+      private static int LinkToIndex(int link)
+      {
+          VTable.Assert(IsLink(link));
+          return (link >> 1);
+      }
+
+      private static int IndexToLink(int index)
+      {
+          return (index << 1) | 1;
+      }
+
+      /// <summary>
+      /// Allocate a Finalizer entry for this object.
+      /// </summary>
+      [RequiredByBartok]
+      internal static void RegisterCandidate(Object obj)
+      {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          UIntPtr objPtr = Magic.addressOf(obj);
+          UIntPtr page = PageTable.Page(objPtr);
+          if (!PageTable.IsGcPage(page)) {
+              return;
+          }
+
+          // It's tempting to do all manipulations of the CandidateTable with Interlocked
+          // operations, but it would leave us open to the ABA problem.  For example,
+          //
+          //    candidateFreeList points to slot 5, which points to slot 7, and then 9.
+          //    We start our CompareExchange loop based on these facts.
+          //    Another thread intervenes.  It:
+          //          Allocates slot 5 from the free list.
+          //          Allocates slot 7 from the free list, so 9 is now at the top.
+          //          It calls SuppressCandidate on #5, putting it back on the list,
+          //                pointing at 9.
+          //    Our thread performs the CompareExchange, removing 5 from the list &
+          //          establishing 7 as the head.
+          //
+          // In order to avoid these (admittedly unlikely) corruptions, just use a
+          // SpinLock to serialize all modifications of the CandidateTable.  But to
+          // keep the SpinLock as a leaf lock and avoid deadlocks, ensure that we
+          // never allocate or do anything else significant while holding the lock.
+
+#if SINGULARITY
+          bool disabled = Processor.DisableInterrupts();
+#endif
+          spinLock.Acquire();
+          bool lockHeld = true;
+          try {
+restart:
+              // Set index to point into the table at a free spot.
+              int index = 0;
+              UIntPtr[] table = null;
+
+              // Grab from the free list.  Note that our free list can never be empty.
+              // That's because it points either down a linked chain of previously allocated
+              // and since free'd entries, or it points out past the high water mark.  We
+              // may need to allocate memory to back that index, but the free list always
+              // contains at least a virtual index.  And the slot that points past the
+              // high water mark is always the last slot to be consumed from the free
+              // list, so we grow only as a last resort.
+              int logicalIndex = index = LinkToIndex(freeCandidateLink);
+
+              // Relate that global index to a table and a local index.
+              for (int i=0; i<CandidateTable.Length; i++) {
+                  table = CandidateTable[i];
+                  if (table == null) {
+                      // Must be the first index into a new table.  We're going to
+                      // create the new table, but we don't want to hold the spinLock
+                      // during the create.  (We want the spinLock to be a leaf lock
+                      // that cannot interact with any GC locks to cause deadlock).
+                      VTable.Assert(index == 0);
+                      lockHeld = false;
+                      spinLock.Release();
+#if SINGULARITY
+                      Processor.RestoreInterrupts(disabled);
+#endif
+                      table = new UIntPtr[CandidateTable[i-1].Length*2];
+#if SINGULARITY
+                      disabled = Processor.DisableInterrupts();
+#endif
+                      spinLock.Acquire();
+                      lockHeld = true;
+
+                      // There is a race here.  If we lose the race, someone else will
+                      // have extended the table.  If so, we use their official table and
+                      // let the GC collect our extra one.  No need for interlocked
+                      // operations since we are back inside the spinLock.
+                      if (CandidateTable[i] == null) {
+                          CandidateTable[i] = table;
+                      }
+                      // Regardless, the world has changed.
+                      goto restart;
+                  }
+
+                  // Are we extending or are we chasing previously allocated empty slots?
+                  if (index < table.Length) {
+                      if (logicalIndex >= lastCandidateIndex) {
+                          // we are extending past the high water mark.  Grow the free list
+                          // ahead of us by 1 slot.
+                          VTable.Assert(logicalIndex == lastCandidateIndex);
+                          lastCandidateIndex = logicalIndex+1;
+                          freeCandidateLink = IndexToLink(lastCandidateIndex);
+                      } else {
+                          // We are consuming the free list
+                          freeCandidateLink = (int) table[index];
+                          VTable.Assert(IsLink(freeCandidateLink));
+                      }
+                      break;
+                  }
+                  index -= table.Length;        // on to the next table
+              }
+
+              VTable.Assert(table != null, "Candidate Algorithmic inconsistency");
+
+              // We have found the table!
+              table[index] = objPtr;
+
+              // The following looks like a 64-bit porting issue (32-bit truncation).
+              // But actually I'm just ensuring that object pointers have the low bit
+              // cleared.
+              VTable.Assert(!IsLink((int) objPtr));
+          }
+          finally {
+              if (lockHeld) {
+                  spinLock.Release();
+#if SINGULARITY
+                  Processor.RestoreInterrupts(disabled);
+#endif
+              }
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Loop through the candidate structure and zero a reference to
+      /// this object.
+      /// </summary>
+      internal static void SuppressCandidate(Object obj)
+      {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          // It's tempting to just hold the spinLock after we find this object and
+          // link it into the freeList.  However, SuppressFinalize and ReRegisterForFinalize
+          // could be called on multiple threads for the same object simultaneously.  So
+          // we really need a lock around the whole thing.
+          int logicalIndex = 0;
+#if SINGULARITY
+          bool disabled = Processor.DisableInterrupts();
+#endif
+          spinLock.Acquire();
+          try {
+              UIntPtr objPtr = Magic.addressOf(obj);
+              for (int i=0; i < CandidateTable.Length; i++) {
+                  if (CandidateTable[i] != null) {
+                      for (int j=0; j < CandidateTable[i].Length; j++, logicalIndex++) {
+                          if (CandidateTable[i][j] == objPtr) {
+                              CandidateTable[i][j] = (UIntPtr) freeCandidateLink;
+                              freeCandidateLink = IndexToLink(logicalIndex);
+                              return;
+                          }
+                      }
+                  }
+              }
+          }
+          finally {
+              spinLock.Release();
+#if SINGULARITY
+              Processor.RestoreInterrupts(disabled);
+#endif
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Moves all candidates to the run queue.
+      /// </summary>
+      internal static void Shutdown()
+      {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          if (running) {
+              WaitForPending();
+              running = false;
+
+              // Wake up the finalizer thread, so that it will exit
+              WorkExistsForFinalizerThread.Set();
+
+              finalizerThread.Join();
+          }
+
+          // It looks like this stage of shutdown occurs when the app is single-threaded.
+          // So we don't need the spinLock to protect against races if the app calls
+          // SuppressFinalize or ReRegisterForFinalize on another thread.
+          for (int i=0; i < CandidateTable.Length; i++) {
+              if (CandidateTable[i] != null) {
+                  for (int j=0; j < CandidateTable[i].Length; j++) {
+                      UIntPtr candidate = CandidateTable[i][j];
+                      if (candidate == UIntPtr.Zero) {
+                          // The high water mark of the table.
+                          return;
+                      }
+                      if (!IsLink((int) candidate)) {
+                          try {
+                              Object obj = Magic.fromAddress(candidate);
+                              Magic.callFinalizer(obj);
+                          } catch {
+                              // Throw it away!
+                          }
+                      }
+                  }
+              }
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Wait until the finalization queue has been emptied.
+      /// </summary>
+      internal static void WaitForPending() {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          if (Thread.CurrentThread == Finalizer.finalizerThread) {
+              return;
+          }
+
+          WaitForPendingShouldReturn.WaitOne();
+
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// BUGBUG: TODO
+      /// </summary>
+      internal static void CompactTables() {
+      }
+
+      [PreInitRefCounts]
+      static unsafe Finalizer() {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          // There is a security issue here.  On 64-bit systems, a malicious SIP
+          // could theoretically create more than 2 billion finalizable objects.
+          // At that point, the use of 'int' in this file is unsafe, and could
+          // allow multiple objects to share the same index.  However, it looks
+          // like the candidate table, as allocated below, will support less than
+          // 1/2 billion objects.  So we should be okay.
+          CandidateTable = (UIntPtr[][])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[][]), 24);
+
+          CandidateTableShadow = (UIntPtr[][])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[][]), 24);
+
+          RunFinalizerTable = (UIntPtr[][])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[][]), 24);
+
+          RunFinalizerTableShadow = (UIntPtr[][])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[][]), 24);
+
+          CandidateTable[0] = (UIntPtr[])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[]), 10);
+
+          RunFinalizerTable[0] = (UIntPtr[])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[]), 10);
+
+          RunFinalizerTableShadow[0] = (UIntPtr[])
+              GCs.BootstrapMemory.Allocate(typeof(UIntPtr[]), 10);
+
+          lastCandidateIndex = 0;
+          freeCandidateLink = IndexToLink(lastCandidateIndex);
+#endif // REFERENCE_COUNTING_GC
+      }
+
+
+      /// <summary>
+      /// Start the finalization thread.
+      /// </summary>
+      internal static void StartFinalizerThread() {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          if (GC.gcType == Microsoft.Bartok.Runtime.GCType.NullCollector) {
+              return;
+          }
+
+          WorkExistsForFinalizerThread = new AutoResetEvent(false);
+          WaitForPendingShouldReturn = new ManualResetEvent(true);
+
+#if SINGULARITY_KERNEL
+          finalizerThread = Thread.CreateThread(null,
+                                                new ThreadStart(ThreadLoop));
+          VTable.Assert(finalizerThread != null);
+          running = true;
+          finalizerThread.Start();
+#elif SINGULARITY_PROCESS
+          finalizerThread = new Thread(new ThreadStart(ThreadLoop));
+          finalizerThread.SetIgnoredByJoinAll();
+          running = true;
+          finalizerThread.Start();
+#else // !SINGULARITY
+          finalizerThread = new Thread(new ThreadStart(ThreadLoop));
+          running = true;
+          finalizerThread.Start();
+#endif // !SINGULARITY
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// The thread loops doing this work forever.
+      /// </summary>
+      private static void ThreadLoop() {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          while(running) {
+              if (WaitingToRun == 0) {
+                  WaitForPendingShouldReturn.Set();
+                  WorkExistsForFinalizerThread.WaitOne();
+                  continue;
+              }
+
+              // Get some work
+              Object current = GetObjectFromRun();
+              VTable.Assert(current != null,
+                            "No finalizer found, but WaitingToRun != 0");
+              try {
+                  Magic.callFinalizer(current);
+              } catch {
+                  // throw it away!
+              }
+              Interlocked.Decrement(ref WaitingToRun);
+          }
+          WaitForPendingShouldReturn.Set();
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// This method must be called to prepare the Finalizer data
+      /// structures for a collection.
+      /// </summary>
+      internal unsafe static void PrepareCollectFinalizers() {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          CompactTables();
+          madeRunnable = false;
+
+          for (int i=0; i < CandidateTable.Length; i++) {
+              CandidateTableShadow[i] = CandidateTable[i];
+          }
+          for (int i=0; i < RunFinalizerTable.Length; i++) {
+              RunFinalizerTableShadow[i] = RunFinalizerTable[i];
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Finish up after a collection.
+      /// </summary>
+      internal static void ReleaseCollectFinalizers() {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          if (madeRunnable) {
+              WaitForPendingShouldReturn.Reset();
+              WorkExistsForFinalizerThread.Set();
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Ensure that any references from the Bootstrap space into the
+      /// managed heap are traced during a collection avoiding dangling
+      /// pointers.
+      /// </summary>
+      internal unsafe static
+      void VisitBootstrapData(NonNullReferenceVisitor visitor)
+      {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          VisitAllRunFinalizer(visitor, true, false);
+
+          // Trace other GC data. Being careful to NOT trace the Shadow
+          visitor.VisitReferenceFields(CandidateTable);
+          visitor.VisitReferenceFields(RunFinalizerTable);
+          visitor.VisitReferenceFields(RunFinalizerTable[0]);
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// This method visits all the objects in the RunFinalizer structures.
+      /// </summary>
+      private unsafe static
+      void VisitAllRunFinalizer(NonNullReferenceVisitor visitor,
+                                bool copyFirst, bool markedOnly)
+      {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          // Visit all RunFinalizer objects.
+          for (int i=0; i < RunFinalizerTableShadow.Length; i++) {
+              UIntPtr[] table = copyFirst
+                  ? RunFinalizerTable[i]
+                  : RunFinalizerTableShadow[i];
+
+              if (table != null) {
+                  for (int j=0; j < table.Length; j++) {
+                      fixed (UIntPtr *loc = &table[j]) {
+                          if (*loc != UIntPtr.Zero) {
+                              if (markedOnly) {
+                                  if ((*loc & 1) == 1) {
+                                      *loc = *loc & (~(UIntPtr)1);
+                                  } else {
+                                      continue;
+                                  }
+                              }
+                              visitor.Visit(loc);
+                          }
+                      }
+                  }
+              }
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Find all candidates that have become unreachable.
+      /// </summary>
+      internal unsafe static
+      void ResurrectCandidates(NonNullReferenceVisitor forwardVisitor,
+                               NonNullReferenceVisitor resurrectVisitor,
+                               bool copyFirst)
+      {
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          UIntPtr[] runTable = null;
+          int runTableIndex = 0;
+          int runIndex = 0;
+
+          // For the concurrent collector, ResurrectCandidates could happen
+          // while the application threads are calling SuppressFinalize and
+          // ReRegisterForFinalize.  So we need to use the spinLock to prevent
+          // races.  But we do not want to hold the spinLock while allocating
+          // (i.e. when we grow the RunFinalizerTable[Shadow]) because our
+          // spinLock is a leaf lock.  We don't want to worry about deadlocks
+          // involving the spinLock and any locking that occurs as part of a
+          // GC provoked by an allocation attempt.
+#if SINGULARITY
+          bool disabled = Processor.DisableInterrupts();
+#endif
+          spinLock.Acquire();
+          bool lockHeld = true;
+          try {
+              int logicalIndex = 0;
+              for (int i=0; i < CandidateTableShadow.Length; i++) {
+                  UIntPtr[] table = copyFirst
+                      ? CandidateTable[i]
+                      : CandidateTableShadow[i];
+
+                  if (table == null) {
+                      VTable.Assert(logicalIndex == lastCandidateIndex);
+                      break;
+                  }
+                  for (int j=0; j < table.Length; j++, logicalIndex++) {
+                      if (table[j] == UIntPtr.Zero) {
+                          VTable.Assert(logicalIndex == lastCandidateIndex);
+                          break;
+                      }
+                      fixed (UIntPtr *loc = &table[j]) {
+                          if (!IsLink((int) *loc)) {
+                              UIntPtr oldVal = *loc;
+                              forwardVisitor.Visit(loc);
+                              if (*loc == UIntPtr.Zero) {
+                                  // Put this slot onto the CandidateTable's free list
+                                  *loc = (UIntPtr) freeCandidateLink;
+                                  freeCandidateLink = IndexToLink(logicalIndex);
+
+                                  // marching forward through the RunFinalizer[Shadow] table, find an
+                                  // empty slot to install this object.  Maintain the cursor across
+                                  // objects, so we can efficiently transfer an entire batch.
+
+                                  for (; runTableIndex < RunFinalizerTableShadow.Length; runTableIndex++) {
+                                      runTable = copyFirst
+                                          ? RunFinalizerTable[runTableIndex]
+                                          : RunFinalizerTableShadow[runTableIndex];
+
+                                      if (runTable == null) {
+                                          // Create a new table
+                                          int length = RunFinalizerTableShadow[runTableIndex-1].Length*2;
+
+                                          lockHeld = false;
+                                          spinLock.Release();
+#if SINGULARITY
+                                          Processor.RestoreInterrupts(disabled);
+#endif
+                                          UIntPtr[] newTable = new UIntPtr[length];
+#if SINGULARITY
+                                          disabled = Processor.DisableInterrupts();
+#endif
+                                          spinLock.Acquire();
+                                          lockHeld = true;
+
+                                          // There is no race with the RunFinalizerTable[Shadow].
+                                          // The spinLock serializes access to the CandidateTable[Shadow].
+                                          runTable = newTable;
+                                          RunFinalizerTable[runTableIndex] = newTable;
+                                          RunFinalizerTableShadow[runTableIndex] = newTable;
+                                          UIntPtr tableAddr = Magic.addressOf(newTable);
+                                          resurrectVisitor.Visit(&tableAddr);
+                                          resurrectVisitor.VisitReferenceFields(RunFinalizerTable[runTableIndex]);
+                                          resurrectVisitor.VisitReferenceFields(RunFinalizerTableShadow[runTableIndex]);
+                                      }
+
+                                      for (; runIndex < runTable.Length; runIndex++) {
+                                          if (runTable[runIndex] == UIntPtr.Zero) {
+                                              goto outer;
+                                          }
+                                      }
+                                      runIndex -= runTable.Length;
+                                      VTable.Assert(runIndex == 0);     // ready for next sub-table
+                                  }
+outer:
+                                  // We found an empty slot in the RunFinalizerTable[Shadow],
+                                  // where we can put our ready Candidate.  It's also possible
+                                  // to reach this label by falling through after exhausting the
+                                  // entire table.  This will result in an exception when we
+                                  // attempt to over-index the array.  It's not clear what more
+                                  // protections are required... the process has exceeded an
+                                  // unlikely and hard-wired capacity limit.
+                                  Interlocked.Increment(ref WaitingToRun);
+                                  madeRunnable = true;
+
+                                  if (copyFirst) {
+                                      RunFinalizerTable[runTableIndex][runIndex]
+                                          = oldVal | new UIntPtr(1);
+                                  } else {
+                                      RunFinalizerTableShadow[runTableIndex][runIndex]
+                                          = oldVal | new UIntPtr(1);
+                                  }
+                              }
+                          }
+                      }
+                  }
+              }
+          }
+          finally {
+              if (lockHeld) {
+                  spinLock.Release();
+#if SINGULARITY
+                  Processor.RestoreInterrupts(disabled);
+#endif
+              }
+          }
+
+          if (madeRunnable) {
+              // Resurrect objects!
+              VisitAllRunFinalizer(resurrectVisitor, copyFirst, true);
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// Find and remove an object from the to be run list.  Remembers where
+      /// the last object was found as a starting point for finding the next
+      /// object.
+      /// </summary>
+      internal static Object GetObjectFromRun() {
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+          return null;
+#else
+          bool first = true;
+          int entryStart = Finalizer.LastEntryRun;
+
+          for (int i = Finalizer.LastTableRun; ; i++) {
+              if (i == RunFinalizerTableShadow.Length) {
+                  i = 0;
+              }
+
+              UIntPtr[] table = RunFinalizerTable[i];
+
+              if (table == null) {
+                  i = 0;
+                  table = RunFinalizerTable[0];
+                  VTable.Assert(table != null, "lost RunFinalizerTable[0]");
+              }
+
+              for (int j = entryStart; j < table.Length; j++) {
+                  if (table[j] != UIntPtr.Zero) {
+                      Object obj = Magic.fromAddress(table[j]);
+                      table[j] = UIntPtr.Zero;
+                      Finalizer.LastTableRun = i;
+                      Finalizer.LastEntryRun = j;
+                      return obj;
+                  }
+                  if ((i == Finalizer.LastTableRun)
+                      && (j == Finalizer.LastEntryRun)) {
+                      if (first) {
+                          // Triggers the very first time through the loops.
+                          entryStart = 0;
+                          first = false;
+                      } else {
+                          // Triggers after going around all of the tables.
+                          return null;
+                      }
+                  }
+              }
+          }
+#endif // REFERENCE_COUNTING_GC
+      }
+
+      /// <summary>
+      /// The thread that runs finalizers.
+      /// </summary>
+      private static Thread finalizerThread;
+
+      /// <summary>
+      /// Did the current collection make any finalizers runnable?
+      /// </summary>
+      private static bool madeRunnable;
+
+      /// <summary>
+      /// Is the finalization thread running?
+      /// </summary>
+      private static bool running;
+
+      /// <summary>
+      /// The table of Finalization Candidates.
+      /// </summary>
+      private static UIntPtr[][] CandidateTable;
+
+      /// <summary>
+      /// A shadow of the candidates table (hidden from GC).
+      /// </summary>
+      private static UIntPtr[][] CandidateTableShadow;
+
+      /// <summary>
+      /// The table of objects to have finalizers run Candidates.
+      /// </summary>
+      private static UIntPtr[][] RunFinalizerTable;
+
+      /// <summary>
+      /// Controls sleeping on the finalizer thread.  The GC signals the
+      /// finalizer thread when there is work to do.  The finalizer thread
+      /// sleeps when there is no work remaining.  The use of an event prevents
+      /// the GC from being blocked.
+      /// </summary>
+      private static AutoResetEvent WorkExistsForFinalizerThread;
+
+      /// <summary>
+      /// Controls sleeping in calls to WaitForPendingFinalizers.  The
+      /// finalizer thread signals when work is complete.  The GC resets the
+      /// signal when there is more work.  The use of an event should prevent
+      /// deadlocks.
+      /// </summary>
+      private static ManualResetEvent WaitForPendingShouldReturn;
+
+      /// <summary>
+      /// A shadow of the run finalizer table (hidden from GC).
+      /// </summary>
+      private static UIntPtr[][] RunFinalizerTableShadow;
+
+      /// <summary>
+      /// This is one more than the highest index in use.
+      /// </summary>
+      private static int lastCandidateIndex;
+
+      /// <summary>
+      /// This is a link into the free list of entries in the CandidateTable.
+      /// </summary>
+      private static int freeCandidateLink;
+
+      /// <summary>
+      /// SpinLock to serialize modifications to the CandidateTable.
+      /// </summary>
+      private static SpinLock spinLock;
+
+      /// <summary>
+      /// This is the index of the table from which the last finalizer was run.
+      /// Used as an optimization in finding the next finalizer to run.
+      /// </summary>
+      private static int LastTableRun;
+
+      /// <summary>
+      /// This is the index of the finalizer (in LastTableRun) that was last
+      /// run.  Used as an optimization in finding the next finalizer to run.
+      /// </summary>
+      private static int LastEntryRun;
+
+      /// <summary>
+      /// The number of finalizers waiting to run
+      /// </summary>
+      private static int WaitingToRun;
+
+  }
+}
diff --git a/base/Kernel/Bartok/GC.cs b/base/Kernel/Bartok/GC.cs
new file mode 100644
index 0000000..b8a4200
--- /dev/null
+++ b/base/Kernel/Bartok/GC.cs
@@ -0,0 +1,616 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System
+{
+    using Microsoft.Bartok.Runtime;
+    using System.GCs;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.X86;
+#endif
+
+    // The GC has only static members and doesn't require the serializable
+    // keyword.
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    [CLSCompliant(false)]
+    public sealed class GC
+    {
+
+        // Bartok runtime "magic" function
+        // It saves the callee-save registers in a transition record and
+        // calls System.GC.CollectBody(thread, generation)
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.GCFRIEND)]
+        [StackBound(128)]
+        private static extern void CollectBodyTransition(Thread thread,
+                                                         int generation);
+        internal static int         gcTotalCount;
+        internal static long        gcTotalTime;
+        internal static long        maxPauseTime;
+        internal static long        pauseCount;
+        internal static long        gcTotalBytes;
+        internal static ulong       bytesAllocated;
+        internal static ulong       objectsAllocated;
+#if SINGULARITY_KERNEL
+        internal static uint        perfCounter = 6;
+#else
+        internal static uint        perfCounter = 5;
+#endif
+
+        [RequiredByBartok]
+        [TrustedNonNull]
+        internal static Collector   installedGC;
+
+        private  static bool        isProfiling;
+
+        private  static Object      dummyGlobal; // Used by KeepAlive
+
+        [AccessedByRuntime("referenced in halasm.asm/brtasm.asm")]
+        internal static bool        allocationInhibitGC = false;
+
+        internal static UIntPtr     newBytesSinceGC;
+
+        [Intrinsic]
+        internal static GCType gcType;
+
+        [Intrinsic]
+        internal static WBType wbType;
+
+        [Intrinsic]
+        internal static RemSetType remsetType;
+
+        [Intrinsic]
+        internal static CopyScanType copyscanType;
+
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        [PreInitRefCounts]
+        internal static void ConstructHeap() {
+            PageTable.Initialize();
+
+            MemoryManager.Initialize();
+#if SINGULARITY
+            UIntPtr heap_commit_size = new UIntPtr(1 << 16);
+#else
+            UIntPtr heap_commit_size = new UIntPtr(1 << 20);
+#endif
+            UIntPtr os_commit_size = MemoryManager.OperatingSystemCommitSize;
+            VTable.Assert(os_commit_size > UIntPtr.Zero);
+            VTable.Assert(heap_commit_size >= os_commit_size);
+            UIntPtr bootstrapSize =
+                UIntPtr.Size == 8
+                ? (UIntPtr) 1 << 15
+                : (UIntPtr) 1 << 14;
+            if (bootstrapSize < os_commit_size) {
+                bootstrapSize = os_commit_size;
+            }
+            BootstrapMemory.Initialize(bootstrapSize);
+            StaticData.Initialize();
+            PageManager.Initialize(os_commit_size, heap_commit_size);
+        }
+
+        // Called after the GC is up, but before multi-threading is enabled.
+        internal static void FinishInitializeThread()
+        {
+            PageManager.FinishInitializeThread();
+        }
+
+        // NB: This is called from VTable.Initialize()
+        [PreInitRefCounts]
+        static GC() // Class Constructor (cctor)
+        {
+            switch(gcType) {
+#if !SINGULARITY || ADAPTIVE_COPYING_COLLECTOR
+              case GCType.AdaptiveCopyingCollector: {
+                  AdaptiveCopyingCollector.Initialize();
+                  GC.installedGC = AdaptiveCopyingCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || MARK_SWEEP_COLLECTOR
+              case GCType.MarkSweepCollector: {
+                  MarkSweepCollector.Initialize();
+                  GC.installedGC = MarkSweepCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || TABLE_MARK_SWEEP_COLLECTOR
+              case GCType.TableMarkSweepCollector: {
+                  SimpleMarkSweepCollector.Initialize();
+                  GC.installedGC = SimpleMarkSweepCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || SEMISPACE_COLLECTOR
+              case GCType.SemispaceCollector: {
+                  SemispaceCollector.Initialize();
+                  GC.installedGC = SemispaceCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || SLIDING_COLLECTOR
+              case GCType.SlidingCollector: {
+                  SlidingCollector.Initialize();
+                  GC.installedGC = SlidingCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || CONCURRENT_MS_COLLECTOR
+              case GCType.ConcurrentMSCollector: {
+                  ConcurrentMSCollector.Initialize();
+                  GC.installedGC = ConcurrentMSCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || ATOMIC_RC_COLLECTOR
+              case GCType.AtomicRCCollector: {
+                  AtomicRCCollector.Initialize();
+                  GC.installedGC = AtomicRCCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY
+              case GCType.ReferenceCountingCollector: {
+                  ReferenceCountingCollector.Initialize();
+                  GC.installedGC = ReferenceCountingCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY
+              case GCType.DeferredReferenceCountingCollector: {
+                  DeferredReferenceCountingCollector.Initialize();
+                  GC.installedGC = DeferredReferenceCountingCollector.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY
+              case GCType.NullCollector: {
+                  VTable.Assert(wbType == 0, "No need for a write barrier");
+                  GC.Initialize();
+                  GC.installedGC =
+                      (NullCollector)
+                      BootstrapMemory.Allocate(typeof(NullCollector));
+                  break;
+              }
+#endif
+              default: {
+                  VTable.NotReached("Unknown GC type: "+gcType);
+                  break;
+              }
+            }
+            GC.installedGC.NewThreadNotification(Thread.initialThread, true);
+            GC.installedGC.ThreadStartNotification(Thread.initialThread.threadIndex);
+        }
+
+        [PreInitRefCounts]
+        internal static void Initialize()
+        {
+            Transitions.Initialize();
+            WriteBarrier.Initialize();
+        }
+
+        private static void FinishedGCCycle()
+        {
+            gcTotalCount++;
+            gcTotalBytes += (long) newBytesSinceGC;
+            newBytesSinceGC = UIntPtr.Zero;
+        }
+
+#if !SINGULARITY
+        private static DateTime LogMessage(String message)
+        {
+            DateTime currentTime = System.DateTime.Now;
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            String hourString = currentTime.Hour.ToString();
+            if (hourString.Length == 1) {
+                sb.Append('0');
+            }
+            sb.Append(hourString);
+            sb.Append(':');
+            String minuteString = currentTime.Minute.ToString();
+            if (minuteString.Length == 1) {
+                sb.Append('0');
+            }
+            sb.Append(minuteString);
+            sb.Append(':');
+            String secondString = currentTime.Second.ToString();
+            if (secondString.Length == 1) {
+                sb.Append('0');
+            }
+            sb.Append(secondString);
+            sb.Append('.');
+            String milliString = currentTime.Millisecond.ToString();
+            if (milliString.Length < 3) {
+                sb.Append('0');
+            }
+            if (milliString.Length < 2) {
+                sb.Append('0');
+            }
+            sb.Append(milliString);
+            sb.Append(":  ");
+            sb.Append(message);
+            Console.Out.WriteLine(sb.ToString());
+            return currentTime;
+        }
+#endif
+
+        // This empty class allows us to easily spot the HeapCritialSection
+        // mutex when debugging.
+        private class HeapMonitor
+        {
+        }
+
+        internal static void CheckForNeededGCWork(Thread currentThread) {
+            installedGC.CheckForNeededGCWork(currentThread);
+        }
+
+#if SINGULARITY
+        // This is a Singularity special not in the CLR
+        public static void Verify()
+        {
+            DebugStub.WriteLine("Calling VerifyHeap()");
+            bool oldGCVerify = VTable.enableGCVerify;
+            VTable.enableGCVerify = true;
+            Collect();
+            VTable.enableGCVerify = oldGCVerify;
+            DebugStub.WriteLine("Verification finished.");
+        }
+
+        public static void PerformanceCounters(out int collectorCount,
+                                               out long collectorMillis,
+                                               out long collectorBytes)
+        {
+            collectorCount  = gcTotalCount;
+            collectorMillis = gcTotalTime;
+            collectorBytes  = gcTotalBytes;
+        }
+#endif
+
+        // Garbage Collect all generations.
+        public static void Collect()
+        {
+            CollectBodyTransition(Thread.CurrentThread, MaxGeneration);
+        }
+
+        public static void Collect(int generation)
+        {
+            if (generation < 0) {
+                throw new ArgumentOutOfRangeException(
+                    "generation",
+                    "Argument should be positive!");
+            }
+            CollectBodyTransition(Thread.CurrentThread, generation);
+        }
+
+        internal static void InvokeCollection(Thread currentThread)
+        {
+            CollectBodyTransition(currentThread, -1);
+        }
+
+        internal static void InvokeMajorCollection(Thread currentThread)
+        {
+            CollectBodyTransition(currentThread, -2);
+        }
+
+        // DO NOT REMOVE THE StackLinkCheck ATTRIBUTE FROM THIS
+        // FUNCTION!
+        //
+        // It is called from native code System.GC.CollectBodyTransition
+        // that only has an attribute for the amount of stack space that
+        // the native code requires.
+        [StackLinkCheck]
+        [AccessedByRuntime("called from halforgc.asm/brtforgc.asm")]
+        private static unsafe Thread CollectBody(Thread currentThread,
+                                                 int generation)
+        {
+            int startTicks = 0;
+            bool enableGCTiming = VTable.enableGCTiming;
+            if (enableGCTiming) {
+                VTable.enableGCTiming = false;
+                pauseCount++;
+                startTicks = Environment.TickCount;
+                VTable.DebugPrint("[GC start: {0} bytes]\n",
+                                  __arglist(installedGC.TotalMemory));
+            }
+            if (VTable.enableGCWatermarks) {
+                MemoryAccounting.RecordHeapWatermarks();
+            }
+
+            int currentThreadIndex = currentThread.threadIndex;
+            // Our stack is GC safe after going through CollectBodyTransition
+            installedGC.Collect(currentThreadIndex, generation);
+            FinishedGCCycle();
+
+            if (VTable.enableGCWatermarks) {
+                MemoryAccounting.RecordHeapWatermarks();
+            }
+            if (enableGCTiming) {
+                int elapsedTicks = Environment.TickCount - startTicks;
+                gcTotalTime += elapsedTicks;
+                if (maxPauseTime < elapsedTicks) {
+                    maxPauseTime = elapsedTicks;
+                }
+                VTable.DebugPrint("[GC end  : {0} bytes, {1} ms]\n",
+                                  __arglist(installedGC.TotalMemory,
+                                            elapsedTicks));
+                VTable.enableGCTiming = true;
+            }
+            return Thread.threadTable[currentThreadIndex];
+        }
+
+        [RequiredByBartok]
+        [AccessedByRuntime("called from brtasm.asm")]
+        [Inline]
+        [ManualRefCounts]
+        internal static Object AllocateObject(VTable vtable)
+        {
+            return AllocateObject(vtable, Thread.CurrentThread);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        [ManualRefCounts]
+        internal static Object AllocateObject(VTable vtable,
+                                              Thread currentThread)
+        {
+            VTable.Deny(Transitions.UnderGCControl(currentThread.threadIndex));
+            return installedGC.AllocateObject(vtable, currentThread);
+        }
+
+        [NoInline]
+        [ManualRefCounts]
+        internal static Object AllocateObjectNoInline(VTable vtable,
+                                                      Thread currentThread)
+        {
+            return GC.AllocateObject(vtable, currentThread);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        [ManualRefCounts]
+        internal static Array AllocateVector(VTable vtable, int numElements)
+        {
+            return AllocateVector(vtable, numElements, Thread.CurrentThread);
+        }
+
+        [Inline]
+        [ManualRefCounts]
+        internal static Array AllocateVector(VTable vtable,
+                                             int numElements,
+                                             Thread currentThread)
+        {
+            VTable.Deny(Transitions.UnderGCControl(currentThread.threadIndex));
+            return installedGC.AllocateVector(vtable, numElements,
+                                              currentThread);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        [ManualRefCounts]
+        internal static Array AllocateArray(VTable vtable, int rank,
+                                            int totalElements)
+        {
+            return AllocateArray(vtable, rank, totalElements,
+                                 Thread.CurrentThread);
+        }
+
+        [Inline]
+        [ManualRefCounts]
+        internal static Array AllocateArray(VTable vtable, int rank,
+                                            int totalElements,
+                                            Thread currentThread)
+        {
+            VTable.Deny(Transitions.UnderGCControl(currentThread.threadIndex));
+            return installedGC.AllocateArray(vtable, rank, totalElements,
+                                             currentThread);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        [ManualRefCounts]
+        internal static String AllocateString(int stringLength)
+        {
+            return AllocateString(stringLength, Thread.CurrentThread);
+        }
+
+        [Inline]
+        [ManualRefCounts]
+        internal static String AllocateString(int stringLength,
+                                              Thread currentThread)
+        {
+            VTable.Deny(Transitions.UnderGCControl(currentThread.threadIndex));
+            return installedGC.AllocateString(stringLength, currentThread);
+        }
+
+        public static int GetGeneration(Object obj)
+        {
+            return installedGC.GetGeneration(obj);
+        }
+
+        public static int MaxGeneration {
+            get { return installedGC.MaxGeneration; }
+        }
+
+        [NoInline]
+        public static void KeepAlive(Object obj)
+        {
+            dummyGlobal = obj;
+            dummyGlobal = null;
+        }
+
+        public static void WaitForPendingFinalizers()
+        {
+            Finalizer.WaitForPending();
+        }
+
+        public static long GetTotalMemory(bool forceFullCollection)
+        {
+            long size = installedGC.TotalMemory;
+            if (!forceFullCollection) {
+                return size;
+            }
+            // If we force a full collection, we will run the finalizers on all
+            // existing objects and do a collection until the value stabilizes.
+            // The value is "stable" when either the value is within 5% of the
+            // previous call to installedGC.TotalMemory, or if we have been sitting
+            // here for more than x times (we don't want to loop forever here).
+            for (int reps = 0; reps < 8; reps++) {
+                WaitForPendingFinalizers();
+                Collect();
+                long newSize = installedGC.TotalMemory;
+                long bound = size / 20;  // 5%
+                long diff = newSize - size;
+                size = newSize;
+                if (diff >= -bound && diff <= bound) {
+                    break;
+                }
+            }
+            return size;
+        }
+
+        public static void SuppressFinalize(Object obj)
+        {
+            if (obj == null) {
+                throw new ArgumentNullException("obj");
+            }
+            Finalizer.SuppressCandidate(obj);
+        }
+
+        internal static void nativeSuppressFinalize(Object obj) {
+            Finalizer.SuppressCandidate(obj);
+        }
+
+        public static void ReRegisterForFinalize(Object obj)
+        {
+            if (obj == null) {
+                throw new ArgumentNullException("obj");
+            }
+            Finalizer.RegisterCandidate(obj);
+        }
+
+        public static int GetGeneration(WeakReference wo)
+        {
+            Object obj = wo.Target;
+            if (obj == null) {
+                throw new ArgumentException("wo", "target already collected");
+            }
+            return GetGeneration(obj);
+        }
+
+        public static void SetProfiler(GCProfiler profiler)
+        {
+            installedGC.SetProfiler(profiler);
+            isProfiling = true;
+        }
+
+        public static bool IsProfiling
+        {
+            get {
+                return isProfiling;
+            }
+        }
+
+        internal static void ProfileAllocation(Object obj)
+        {
+            if (isProfiling) {
+                installedGC.ProfileAllocation(obj);
+            }
+        }
+
+        private static void SetCleanupCache()
+        {
+            // REVIEW: will not ever clean up these caches (such as Assembly
+            // strong names)
+        }
+
+        internal static void EnableHeap()
+        {
+            CollectorStatistics.Initialize();
+            CollectorStatistics.Event(GCEvent.CreateHeap);
+            GC.installedGC.EnableHeap();
+            Finalizer.StartFinalizerThread();
+        }
+
+        // Called on VM shutdown.
+        internal static void DestructHeap()
+        {
+            if (VTable.enableGCWatermarks) {
+                MemoryAccounting.RecordHeapWatermarks();
+                MemoryAccounting.ReportHeapWatermarks();
+            }
+
+            if (VTable.enableGCTiming) {
+#if SINGULARITY
+                DebugStub.WriteLine("Total GC Time (ms): {0}",
+                                    __arglist(gcTotalTime));
+#else
+                Console.Error.WriteLine("Total GC Time (ms): " + gcTotalTime);
+                Console.Error.WriteLine("Max. Pause Time (ms): " + maxPauseTime);
+                if (pauseCount != 0) {
+                    Console.Error.WriteLine("Avg. Pause Time (ms): " +
+                                            gcTotalTime/pauseCount);
+                } else {
+                    Console.Error.WriteLine("Avg. Pause Time (ms): 0");
+                }
+#endif
+            }
+            if (VTable.enableGCProfiling) {
+#if !SINGULARITY
+                Console.Error.WriteLine("Objects allocated: "+
+                                        objectsAllocated);
+                Console.Error.WriteLine("Total bytes allocated (KB): "+
+                                        (bytesAllocated >> 10));
+#endif
+            }
+
+            if(installedGC != null) {
+                installedGC.DestructHeap();
+            }
+            CollectorStatistics.Event(GCEvent.DestroyHeap);
+            CollectorStatistics.Summary();
+        }
+
+        internal static void NewThreadNotification(Thread newThread,
+                                                   bool initial)
+        {
+            GC.installedGC.NewThreadNotification(newThread, initial);
+        }
+
+        internal static void DeadThreadNotification(Thread deadThread)
+        {
+            GC.installedGC.DeadThreadNotification(deadThread);
+        }
+
+        internal static void ThreadStartNotification(int currentThreadIndex)
+        {
+            GC.installedGC.ThreadStartNotification(currentThreadIndex);
+        }
+
+        internal static void ThreadEndNotification(Thread dyingThread)
+        {
+            GC.installedGC.ThreadEndNotification(dyingThread);
+        }
+
+        internal static void ThreadDormantGCNotification(int threadIndex)
+        {
+            GC.installedGC.ThreadDormantGCNotification(threadIndex);
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/AllCardsWriteBarrier.cs b/base/Kernel/Bartok/GCs/AllCardsWriteBarrier.cs
new file mode 100644
index 0000000..5303081
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/AllCardsWriteBarrier.cs
@@ -0,0 +1,132 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    internal unsafe class AllCardsWriteBarrier : WriteBarrier
+    {
+
+        internal static AllCardsWriteBarrier instance;
+
+        internal static new void Initialize() {
+            AllCardsWriteBarrier.instance = (AllCardsWriteBarrier)
+                BootstrapMemory.Allocate(typeof(AllCardsWriteBarrier));
+         }
+
+         [Inline]
+         protected override void StoreStaticFieldImpl(ref Object staticField,
+                                                      Object value)
+         {
+             // No need to mark the card for a static field.
+             *Magic.toPointer(ref staticField) = Magic.addressOf(value);
+         }
+
+         protected override void CopyStructImpl(VTable vtable,
+                                                UIntPtr srcPtr,
+                                                UIntPtr dstPtr)
+         {
+             CopyStructWithBarrier(vtable, srcPtr, dstPtr);
+         }
+
+         [Inline]
+         protected override Object AtomicSwapImpl(ref Object reference,
+                                                  Object value)
+         {
+             UIntPtr resultAddr =
+                 Interlocked.Exchange(Magic.toPointer(ref reference),
+                                      Magic.addressOf(value));
+             RecordReference(ref reference, value);
+             return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected override
+        Object AtomicCompareAndSwapImpl(ref Object reference,
+                                        Object newValue,
+                                        Object comparand)
+        {
+            UIntPtr resultAddr =
+                Interlocked.CompareExchange(Magic.toPointer(ref reference),
+                                            Magic.addressOf(newValue),
+                                            Magic.addressOf(comparand));
+            RecordReference(ref reference, newValue);
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected override void CloneImpl(Object srcObject, Object dstObject)
+        {
+            CloneNoBarrier(srcObject, dstObject);
+            RecordClone(dstObject);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        protected override void ArrayZeroImpl(Array array,
+                                              int offset,
+                                              int length)
+        {
+            ArrayZeroNoBarrier(array, offset, length);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        protected override void ArrayCopyImpl(Array srcArray, int srcOffset,
+                                              Array dstArray, int dstOffset,
+                                              int length)
+        {
+            if ((length > 1000) || ((length << 2) >= dstArray.Length)) {
+                ArrayCopyNoBarrier(srcArray, srcOffset,
+                                   dstArray, dstOffset,
+                                   length);
+                RecordClone(dstArray);
+            } else {
+                ArrayCopyWithBarrier(srcArray, srcOffset,
+                                     dstArray, dstOffset,
+                                     length);
+            }
+        }
+
+        [Inline]
+        protected override void WriteReferenceImpl(UIntPtr *location,
+                                                   Object value)
+        {
+            *location = Magic.addressOf(value);
+            RecordReference(location, value);
+        }
+
+        [Inline]
+        private static void RecordClone(Object clone) {
+            GenerationalCollector.installedRemSet.RecordClonedObject(clone);
+        }
+
+        [Inline]
+        private static void RecordReference(ref Object location,
+                                            Object value)
+        {
+            RecordReference(Magic.toPointer(ref location), value);
+        }
+
+        [Inline]
+        private static void RecordReference(UIntPtr *location,
+                                            Object value)
+        {
+            GenerationalCollector.
+                installedRemSet.RecordReference(location, value);
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/Allocator.cs b/base/Kernel/Bartok/GCs/Allocator.cs
new file mode 100644
index 0000000..b3fef3a
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/Allocator.cs
@@ -0,0 +1,117 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+
+    [NoCCtor]
+    internal class Allocator
+    {
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static unsafe void WriteAlignment(UIntPtr addr)
+        {
+            *(UIntPtr*)addr = ALIGNMENT_TOKEN;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static unsafe bool IsAlignmentMarkerAddr(UIntPtr addr)
+        {
+            return (*(UIntPtr*)addr == ALIGNMENT_TOKEN);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static unsafe bool IsAlignment(UIntPtr obj)
+        {
+            return *(UIntPtr*)(obj - PreHeader.Size) == ALIGNMENT_TOKEN;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static UIntPtr SkipAlignment(UIntPtr obj)
+        {
+            while (IsAlignment(obj)) {
+                obj += UIntPtr.Size;
+            }
+            return obj;
+        }
+      
+        // Pads the allocation to the appropriate alignment.
+        [Inline]
+        internal static UIntPtr AlignedAllocationPtr(UIntPtr startAddr,
+                                                     UIntPtr limitAddr,
+                                                     uint alignment)
+        {
+            if (alignment > UIntPtr.Size) {
+                uint alignmentMask = alignment - 1;
+                int offset = PreHeader.Size + PostHeader.Size;
+                while (((startAddr + offset) & alignmentMask) != 0 &&
+                       startAddr < limitAddr) {
+                    Allocator.WriteAlignment(startAddr);
+                    startAddr += UIntPtr.Size;
+                }
+            }
+            return startAddr;
+        }
+
+        [Inline]
+        internal static UIntPtr AlignedObjectPtr(UIntPtr startAddr,
+                                                 uint alignment)
+        {
+            if (alignment > UIntPtr.Size) {
+                uint alignmentMask = alignment - 1;
+                int offset = PostHeader.Size;
+                while (((startAddr + offset) & alignmentMask) != 0) {
+                    Allocator.WriteAlignment(startAddr- PreHeader.Size);
+                    startAddr += UIntPtr.Size;
+                }
+            }
+            return startAddr;
+        }
+
+        [NoHeapAllocation]
+        internal static unsafe UIntPtr * GetObjectVTableAddress
+        (UIntPtr potentialObject) {
+            UIntPtr vtableAddr = potentialObject + Magic.OffsetOfVTable;
+            return (UIntPtr *) vtableAddr;
+        }
+
+        [NoHeapAllocation]
+        internal static unsafe UIntPtr GetObjectVTable
+        (UIntPtr potentialObject) {
+            return *GetObjectVTableAddress(potentialObject);
+        }
+
+        [NoHeapAllocation]
+        internal static unsafe void SetObjectVTable(UIntPtr potentialObject,
+                                                    UIntPtr vtable) {
+            *GetObjectVTableAddress(potentialObject) = vtable;
+        }
+
+        [NoHeapAllocation]
+        internal static bool IsZeroVTable(UIntPtr addr) {
+            return GetObjectVTable(addr) == UIntPtr.Zero;
+        }
+
+        private static UIntPtr ALIGNMENT_TOKEN{
+            [Inline]
+            [NoHeapAllocation]
+            get { return ~((UIntPtr)3u); }
+        }
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/BaseCollector.cs b/base/Kernel/Bartok/GCs/BaseCollector.cs
new file mode 100644
index 0000000..99a19ab
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/BaseCollector.cs
@@ -0,0 +1,145 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+
+    using Microsoft.Bartok.Runtime;
+
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+    [NoCCtor]
+    internal abstract class BaseCollector : Collector
+    {
+
+        internal override void NewThreadNotification(Thread newThread,
+                                                     bool initial)
+        {
+            Transitions.NewThreadNotification(newThread.threadIndex, initial);
+        }
+
+        internal override void DeadThreadNotification(Thread deadThread)
+        {
+        }
+
+        internal override void ThreadStartNotification(int currentThreadIndex)
+        {
+            Thread currentThread = Thread.threadTable[currentThreadIndex];
+#if !SINGULARITY
+            PageManager.MarkThreadStack(currentThread);
+#endif
+        }
+
+        internal override void ThreadEndNotification(Thread currentThread)
+        {
+        }
+
+        [ManualRefCounts]
+        internal override Object AllocateObject(VTable vtable,
+                                                Thread currentThread)
+        {
+            UIntPtr numBytes = ObjectLayout.ObjectSize(vtable);
+            UIntPtr objectAddr =
+                AllocateObjectMemory(numBytes, vtable.baseAlignment,
+                                     currentThread);
+            Object result = Magic.fromAddress(objectAddr);
+            this.CreateObject(result, vtable, currentThread);
+            if (GC.IsProfiling) {
+                ProfileAllocation(result);
+            }
+            if (VTable.enableGCProfiling) {
+                System.GC.bytesAllocated += (ulong)numBytes;
+                System.GC.objectsAllocated++;
+            }
+
+            return result;
+        }
+
+        [ManualRefCounts]
+        internal override Array AllocateVector(VTable vtable,
+                                               int numElements,
+                                               Thread currentThread)
+        {
+            UIntPtr numBytes =
+                ObjectLayout.ArraySize(vtable, unchecked((uint)numElements));
+            UIntPtr vectorAddr =
+                AllocateObjectMemory(numBytes, vtable.baseAlignment,
+                                     currentThread);
+            Array result = Magic.toArray(Magic.fromAddress(vectorAddr));
+            CreateObject(result, vtable, currentThread);
+            result.InitializeVectorLength(numElements);
+            if (VTable.enableGCProfiling) {
+                System.GC.bytesAllocated += (ulong)numBytes;
+                System.GC.objectsAllocated++;
+            }
+            return result;
+        }
+
+        [ManualRefCounts]
+        internal override  Array AllocateArray(VTable vtable,
+                                               int rank,
+                                               int totalElements,
+                                               Thread currentThread)
+        {
+            UIntPtr numBytes =
+                ObjectLayout.ArraySize(vtable, unchecked((uint)totalElements));
+            UIntPtr arrayAddr =
+                AllocateObjectMemory(numBytes, vtable.baseAlignment,
+                                     currentThread);
+            Array result = Magic.toArray(Magic.fromAddress(arrayAddr));
+            CreateObject(result, vtable, currentThread);
+            result.InitializeArrayLength(rank, totalElements);
+            if (VTable.enableGCProfiling) {
+                System.GC.bytesAllocated += (ulong)numBytes;
+                System.GC.objectsAllocated++;
+            }
+            return result;
+        }
+
+        [ManualRefCounts]
+        internal override String AllocateString(int stringLength,
+                                                Thread currentThread)
+        {
+            VTable vtable =
+                Magic.toRuntimeType(typeof(System.String)).classVtable;
+            UIntPtr numBytes =
+                ObjectLayout.StringSize(vtable,
+                                        unchecked((uint) (stringLength+1)));
+            UIntPtr stringAddr =
+                AllocateObjectMemory(numBytes, unchecked((uint) UIntPtr.Size),
+                                     currentThread);
+            String result = Magic.toString(Magic.fromAddress(stringAddr));
+            CreateObject(result, vtable, currentThread);
+            result.InitializeStringLength(stringLength);
+            if (VTable.enableGCProfiling) {
+                System.GC.bytesAllocated += (ulong)numBytes;
+                System.GC.objectsAllocated++;
+            }
+            return result;
+        }
+
+        [ManualRefCounts]
+        [Inline]
+        protected virtual void CreateObject(Object obj, VTable vtable,
+                                            Thread currentThread)
+        {
+            obj.vtable = vtable;
+        }
+
+        [Inline]
+        protected bool IsValidGeneration(int generation)
+        {
+            return ((generation >= MinGeneration) && (generation <= MaxGeneration));
+        }
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/BootstrapMemory.cs b/base/Kernel/Bartok/GCs/BootstrapMemory.cs
new file mode 100644
index 0000000..7709091
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/BootstrapMemory.cs
@@ -0,0 +1,153 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+    internal unsafe class BootstrapMemory
+    {
+
+        // WARNING: don't initialize any static fields in this class
+        // without manually running the class constructor at startup!
+
+        private static BumpAllocator pool;
+
+        [PreInitRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static void Initialize(UIntPtr systemMemorySize) {
+            pool = new BumpAllocator(PageType.NonGC);
+            UIntPtr memStart = MemoryManager.AllocateMemory(systemMemorySize);
+            pool.SetZeroedRange(memStart, systemMemorySize);
+            if(GC.gcType != GCType.NullCollector) {
+                PageManager.SetStaticDataPages(memStart, systemMemorySize);
+#if !SINGULARITY
+                PageTable.SetProcess(PageTable.Page(memStart),
+                                     PageTable.PageCount(systemMemorySize));
+#endif
+            }
+        }
+
+        [ManualRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static Object Allocate(VTable vtable) {
+            UIntPtr numBytes = ObjectLayout.ObjectSize(vtable);
+            UIntPtr objectAddr =
+                pool.AllocateFast(numBytes, vtable.baseAlignment);
+            VTable.Assert(objectAddr != UIntPtr.Zero,
+                          "Out of BootstrapMemory");
+            Object result = Magic.fromAddress(objectAddr);
+#if REFERENCE_COUNTING_GC
+            result.REF_STATE = vtable.isAcyclicRefType ?
+                (ReferenceCountingCollector.
+                 acyclicFlagMask | 1): 1;
+            result.REF_STATE = (result.REF_STATE | 2) &
+                ~ReferenceCountingCollector.countingONFlagMask;
+#elif DEFERRED_REFERENCE_COUNTING_GC
+            result.REF_STATE = vtable.isAcyclicRefType ?
+                (DeferredReferenceCountingCollector.
+                 acyclicFlagMask |
+                 DeferredReferenceCountingCollector.
+                 markFlagMask) :
+                DeferredReferenceCountingCollector.
+                markFlagMask;
+            result.REF_STATE &=
+                ~DeferredReferenceCountingCollector.countingONFlagMask;
+#endif
+            *result.VTableFieldAddr = Magic.addressOf(vtable);
+            return result;
+        }
+
+        [ManualRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static Object Allocate(VTable vtable, uint count) {
+            UIntPtr numBytes = ObjectLayout.ArraySize(vtable, count);
+            UIntPtr objectAddr =
+                pool.AllocateFast(numBytes, vtable.baseAlignment);
+            VTable.Assert(objectAddr != UIntPtr.Zero,
+                          "Out of BootstrapMemory");
+            Array result = Magic.toArray(Magic.fromAddress(objectAddr));
+#if REFERENCE_COUNTING_GC
+            result.REF_STATE = vtable.isAcyclicRefType ?
+                (ReferenceCountingCollector.
+                 acyclicFlagMask | 1): 1;
+            result.REF_STATE = (result.REF_STATE | 2) &
+                ~ReferenceCountingCollector.countingONFlagMask;
+#elif DEFERRED_REFERENCE_COUNTING_GC
+            result.REF_STATE = vtable.isAcyclicRefType ?
+                (DeferredReferenceCountingCollector.
+                 acyclicFlagMask |
+                 DeferredReferenceCountingCollector.
+                 markFlagMask) :
+                DeferredReferenceCountingCollector.
+                markFlagMask;
+            result.REF_STATE &=
+                ~DeferredReferenceCountingCollector.countingONFlagMask;
+#endif
+            *result.VTableFieldAddr = Magic.addressOf(vtable);
+            result.InitializeVectorLength((int) count);
+            return result;
+        }
+
+        [PreInitRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static Object Allocate(Type t) {
+            return Allocate((RuntimeType) t);
+        }
+
+        [PreInitRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static Object Allocate(Type t, uint count) {
+            return Allocate((RuntimeType) t, count);
+        }
+
+        [PreInitRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static Object Allocate(RuntimeType t) {
+            return Allocate(t.classVtable);
+        }
+
+        [PreInitRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static Object Allocate(RuntimeType t, uint count) {
+            return Allocate(t.classVtable, count);
+        }
+
+        internal static void Truncate() {
+            UIntPtr allocLimit = PageTable.PagePad(pool.AllocPtr);
+            UIntPtr unusedSize = pool.ReserveLimit - allocLimit;
+            if(GC.gcType != GCType.NullCollector) {
+                PageManager.ReleaseUnusedPages(PageTable.Page(allocLimit),
+                                               PageTable.PageCount(unusedSize),
+                                               true);
+            }
+            pool.Truncate();
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/BumpAllocator.cs b/base/Kernel/Bartok/GCs/BumpAllocator.cs
new file mode 100644
index 0000000..e991566
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/BumpAllocator.cs
@@ -0,0 +1,689 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// Conceptually, even if nothing is recorded in the offset table
+// during object allocation, the offset table itself should be
+// able to identify objects correctly in the execution. So as
+// a stress mode to test the correctness of the offset table,
+// here we can turn on the following macro to disable recording
+// object allocation in the offset table.
+
+//#define DONT_RECORD_OBJALLOC_IN_OFFSETTABLE
+
+#define ENSURE_ALLOCATION_ALLOWED
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    using Microsoft.Bartok.Options;
+    using Microsoft.Bartok.Runtime;
+#if SINGULARITY
+    using Microsoft.Singularity;
+#endif
+
+    // Common struct for allocation pool.
+    [NoCCtor]
+    internal struct BumpAllocator /* : Allocator */
+    {
+
+        [RequiredByBartok]
+        private UIntPtr           allocPtr; // Next allocation.
+        [RequiredByBartok]
+        private UIntPtr           zeroedLimit; // Limit of zeroed pool.
+        private UIntPtr           reserveLimit; // Limit of reserved pool.
+        private UIntPtr           allocNew; // Most recent page allocation.
+        private readonly PageType pageType;
+
+        [MixinOverride]
+        private static bool CLEAR_POOL_PAGES() {
+            VTable.DebugBreak();
+            return false;
+        }
+
+        [MixinConditional("BumpAllocator")]
+        [MixinConditional("AllThreadMixins")]
+        [Mixin(typeof(Thread))]
+        private class BumpAllocatorThread : Object {
+            // Thread-specific bump allocator
+            [RequiredByBartok]
+            internal BumpAllocator bumpAllocator;
+        }
+
+        [Inline]
+        private static BumpAllocatorThread MixinThread(Thread t)
+        {
+            return (BumpAllocatorThread) (Object) t;
+        }
+
+        internal BumpAllocator(PageType pageType) {
+            this.zeroedLimit = UIntPtr.Zero;
+            this.reserveLimit = UIntPtr.Zero;
+            this.allocPtr = UIntPtr.Zero;
+            this.allocNew = UIntPtr.Zero;
+            this.pageType = pageType;
+        }
+
+        internal void SetReservedRange(UIntPtr startAddr, UIntPtr length) {
+            this.allocPtr = startAddr;
+            this.reserveLimit = startAddr + length;
+        }
+
+        internal void SetZeroedRange(UIntPtr startAddr, UIntPtr length) {
+            this.allocPtr = startAddr;
+            this.zeroedLimit = startAddr + length;
+            this.reserveLimit = startAddr + length;
+        }
+
+        internal void SetZeroedLimit(UIntPtr zeroedLimit) {
+            this.zeroedLimit = zeroedLimit;
+        }
+
+        internal UIntPtr AllocPtr {
+            get { return this.allocPtr; }
+        }
+
+        internal UIntPtr ZeroedLimit {
+            get { return this.zeroedLimit; }
+        }
+
+        internal UIntPtr ReserveLimit {
+            get { return this.reserveLimit; }
+        }
+
+        internal UIntPtr AllocNew {
+            get { return this.allocNew; }
+        }
+
+        internal void Dump()
+        {
+#if SINGULARITY
+            Tracing.Log(Tracing.Debug, "[gen={0} {1:x8}..{2:x8}..{3:x8}]",
+                        (UIntPtr)unchecked((uint)this.pageType),
+                        this.allocPtr, this.zeroedLimit, this.reserveLimit);
+#else
+            VTable.DebugPrint(" [gen={0} {1:x8}..{2:x8}..{3:x8}]\n",
+                              __arglist(this.pageType, this.allocPtr,
+                                        this.zeroedLimit, this.reserveLimit));
+#endif
+        }
+
+        internal static void NewThreadNotification(Thread newThread,
+                                                   PageType pageType)
+        {
+            MixinThread(newThread).bumpAllocator = new BumpAllocator(pageType);
+        }
+
+        [ManualRefCounts]
+        public static UIntPtr Allocate(Thread thread,
+                                       UIntPtr bytes, uint alignment)
+        {
+            BumpAllocatorThread mixinThread = MixinThread(thread);
+            return mixinThread.bumpAllocator.Allocate(bytes, alignment,
+                                                      thread);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        public static unsafe Object CompilerAllocateGenerational
+        (VTable vtable, Thread currentThread, UIntPtr bytes, uint alignment)
+        {
+            VTable.Assert((alignment == 4)
+                          || ((alignment == 8) && (UIntPtr.Size == 8))
+                          || ((alignment == 8) && (PreHeader.Size == 4)),
+                          "Unsupported object layout");
+            VTable.Assert(UIntPtr.Size == PreHeader.Size,
+                          "Unsupported preheader size");
+            VTable.Assert
+                (Util.IsAligned((uint) PreHeader.Size + (uint)PostHeader.Size,
+                                alignment),
+                 "Unsupported header sizes");
+
+            UIntPtr preHeaderAddr =
+                MixinThread(currentThread).bumpAllocator.allocPtr;
+
+            // allocPtr is only needed when alignment needs to be checked.  It
+            // stores the beginning of the region to be allocation including
+            // a possible alignment token.
+            UIntPtr allocPtr = UIntPtr.Zero;
+            if((alignment == 8) && (UIntPtr.Size == 4)) {
+                allocPtr = preHeaderAddr;
+                preHeaderAddr = Util.Pad(preHeaderAddr, (UIntPtr) alignment);
+            }
+
+            UIntPtr bound = preHeaderAddr + bytes;
+            UIntPtr limitPtr =
+                MixinThread(currentThread).bumpAllocator.zeroedLimit;
+            if (bound <= limitPtr) {
+                if((alignment == 8) && (UIntPtr.Size == 4)) {
+                    // Store alignment token at allocPtr.  This will be where an
+                    // alignment token should go if 'preHeaderAddr' was
+                    // bumped...
+                    Allocator.WriteAlignment(allocPtr);
+                    // ... or the alignment token is where the object header
+                    // should be.  This code zeroes the object header regardless
+                    // and avoids a branch in this fast path.
+                    *(UIntPtr *)preHeaderAddr = UIntPtr.Zero;
+                }
+                MixinThread(currentThread).bumpAllocator.allocPtr = bound;
+
+                UIntPtr objAddr = preHeaderAddr + PreHeader.Size;
+                Object obj = Magic.fromAddress(objAddr);
+                obj.vtable = vtable;
+                return obj;
+            }
+
+            return GC.AllocateObjectNoInline(vtable, currentThread);
+        }
+
+        [Inline]
+        internal static UIntPtr AllocateFast(Thread thread,
+                                             UIntPtr bytes, uint alignment)
+        {
+            BumpAllocatorThread mixinThread = MixinThread(thread);
+            return mixinThread.bumpAllocator.AllocateFast(bytes, alignment);
+        }
+
+        [ManualRefCounts]
+        public static UIntPtr AllocateSlow(Thread currentThread,
+                                           UIntPtr bytes, uint alignment)
+        {
+            BumpAllocatorThread mixinThread = MixinThread(currentThread);
+            return mixinThread.bumpAllocator.AllocateSlow(bytes, alignment,
+                                                          currentThread);
+        }
+
+        [ManualRefCounts]
+        public UIntPtr Allocate(UIntPtr bytes, uint alignment) {
+            UIntPtr resultAddr = this.AllocateFast(bytes, alignment);
+            if (resultAddr == UIntPtr.Zero) {
+                Thread currentThread = Thread.CurrentThread;
+                resultAddr = this.AllocateSlow(bytes, alignment,
+                                               currentThread);
+                VTable.Assert(resultAddr != UIntPtr.Zero);
+            }
+            return resultAddr;
+        }
+
+        [ManualRefCounts]
+        public UIntPtr Allocate(UIntPtr bytes, uint alignment, Thread thread)
+        {
+            UIntPtr resultAddr = this.AllocateFast(bytes, alignment);
+            if (resultAddr == UIntPtr.Zero) {
+                resultAddr = this.AllocateSlow(bytes, alignment, thread);
+                VTable.Assert(resultAddr != UIntPtr.Zero);
+            }
+            return resultAddr;
+        }
+
+        [ManualRefCounts]
+        internal UIntPtr AllocateFast(UIntPtr bytes, uint alignment)
+        {
+#if SINGULARITY_KERNEL
+#if ENSURE_ALLOCATION_ALLOWED
+            BumpAllocator.EnsureAllocationAllowed();
+#endif
+#endif
+            UIntPtr allocPtr =
+                Allocator.AlignedAllocationPtr(this.allocPtr, this.zeroedLimit,
+                                               alignment);
+            if (allocPtr + bytes > this.zeroedLimit) {
+                this.allocPtr = allocPtr;
+                return UIntPtr.Zero;
+            }
+            this.allocPtr = allocPtr + bytes;
+            return allocPtr + PreHeader.Size;
+        }
+
+        internal UIntPtr AllocateSlow(UIntPtr bytes, uint alignment,
+                                      Thread currentThread)
+        {
+            UIntPtr newObjectAddr = this.ExtendZero(bytes, alignment);
+            if (newObjectAddr == UIntPtr.Zero) {
+                newObjectAddr =
+                    this.ExtendAlloc(bytes, alignment, currentThread);
+                if (newObjectAddr == UIntPtr.Zero) {
+                    newObjectAddr =
+                        this.FreshAlloc(bytes, alignment, currentThread);
+                }
+            }
+            return newObjectAddr;
+        }
+
+        [Inline]
+        private UIntPtr ExtendZero(UIntPtr bytes, uint alignment)
+        {
+            return UIntPtr.Zero;
+        }
+
+        private UIntPtr ExtendAlloc(UIntPtr bytes, uint alignment,
+                                    Thread currentThread)
+        {
+            if (this.reserveLimit == UIntPtr.Zero) {
+                return UIntPtr.Zero;
+            }
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint(700);
+#endif
+            UIntPtr neededBytes =
+                bytes +  // Bytes required for object +
+                alignment - UIntPtr.Size - // worst case alignment overhead +
+                (this.reserveLimit - this.allocPtr); // bytes already available
+            UIntPtr paddedNeed = PageTable.PagePad(neededBytes);
+            UIntPtr pageCount = PageTable.PageCount(paddedNeed);
+            UIntPtr startPage = PageTable.Page(this.reserveLimit);
+            bool fCleanPages = CLEAR_POOL_PAGES();
+            bool gotPages =
+                PageManager.TryReserveUnusedPages(currentThread, startPage,
+                                                  pageCount, this.pageType,
+                                                  ref fCleanPages);
+            if (!gotPages) {
+                // We can't indiscriminately ask for more memory if we have
+                // unused pages already available.
+                return UIntPtr.Zero;
+            }
+            if (this.reserveLimit == UIntPtr.Zero) {
+                // A collection occurred, so there is no region to extend
+                PageManager.ReleaseUnusedPages(startPage, pageCount,
+                                               fCleanPages);
+                return UIntPtr.Zero;
+            }
+            GC.newBytesSinceGC += paddedNeed;
+            this.allocNew = this.reserveLimit;
+            // Pad alignment space if necessary.  NB: a prior call to
+            // AllocateFast may have started generating alignment tokens,
+            // but we may need to finish the job here if the residual space
+            // was insufficient for a multi-word alignment.
+            UIntPtr oldReserveLimit = this.reserveLimit;
+            this.reserveLimit += paddedNeed;
+            this.allocPtr =
+                Allocator.AlignedAllocationPtr(this.allocPtr,
+                                               this.reserveLimit,
+                                               alignment);
+            if (this.zeroedLimit < this.allocPtr) {
+                this.zeroedLimit = this.allocPtr;
+            }
+            UIntPtr objectAddr = this.allocPtr + PreHeader.Size;
+            this.allocPtr += bytes;
+            if (fCleanPages) {
+                if (this.zeroedLimit < oldReserveLimit) {
+                    Util.MemClear(this.zeroedLimit,
+                                  oldReserveLimit - this.zeroedLimit);
+                }
+                this.zeroedLimit = this.reserveLimit;
+            } else {
+                Util.MemClear(this.zeroedLimit,
+                              this.allocPtr - this.zeroedLimit);
+                this.zeroedLimit = this.allocPtr;
+            }
+            VTable.Assert(this.allocPtr <= this.zeroedLimit);
+            VTable.Assert(PageTable.PageAligned(this.reserveLimit));
+            if (objectAddr >= oldReserveLimit) {
+                // Object is first on new page
+                InteriorPtrTable.SetFirst(objectAddr);
+            } else if (objectAddr + bytes < this.reserveLimit) {
+                // The object does not end on new limit
+
+                // N.B. The next object may not be allocated at exactly
+                // (objectAddr + bytes) due to alignment considerations.  It
+                // also might not ever be allocated.  These cases are handled
+                // by InteriorPtrTable.First skipping over alignment tokens
+                // and callers of First watching out for unused space tokens.
+
+                InteriorPtrTable.SetFirst(objectAddr + bytes);
+            }
+            // We know an object is located as the last one in a page
+            // when it extends through the page to the next.
+            // Otherwise, it is totally before or below the page, and
+            // we are not sure whether it is the last object or not.
+            // So record only such an object for the last card in that
+            // page. Many objects may have been omitted due to
+            // this coarse-grain recording. But we should be able
+            // to incrementally update the offset table and find them.
+            // I believe this is a better choice than simply recording
+            // any object to the offset table, because most objects
+            // may just die and need not to record.
+
+#if !SINGULARITY || SEMISPACE_COLLECTOR || ADAPTIVE_COPYING_COLLECTOR || SLIDING_COLLECTOR
+            if (GC.remsetType == RemSetType.Cards) {
+                if (objectAddr < oldReserveLimit &&
+                    allocPtr + bytes > oldReserveLimit) {
+#if DONT_RECORD_OBJALLOC_IN_OFFSETTABLE
+#else
+                    OffsetTable.SetLast(objectAddr);
+#endif
+                }
+            }
+#endif
+
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint(701);
+#endif
+            return objectAddr;
+        }
+
+        private UIntPtr FreshAlloc(UIntPtr bytes, uint alignment,
+                                   Thread currentThread)
+        {
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint(702);
+#endif
+            this.Truncate();
+            UIntPtr paddedBytes =
+                PageTable.PagePad(bytes + alignment - UIntPtr.Size);
+            GC.newBytesSinceGC += paddedBytes;
+            UIntPtr pages = PageTable.PageCount(paddedBytes);
+            bool fCleanPages = CLEAR_POOL_PAGES();
+            // We may eventually want to ask for specific pages
+            // between asking if any pages are reusable and asking the
+            // OS for any possible page.
+            UIntPtr startPage =
+                PageManager.EnsurePages(currentThread, pages, this.pageType,
+                                        ref fCleanPages);
+            UIntPtr startAddr = PageTable.PageAddr(startPage);
+            UIntPtr limitAddr = PageTable.PageAddr(startPage + pages);
+            startAddr = Allocator.AlignedAllocationPtr(startAddr, limitAddr,
+                                                       alignment);
+            this.allocNew = startAddr;
+            this.allocPtr = startAddr + bytes;
+            if (fCleanPages) {
+                this.zeroedLimit = limitAddr;
+            } else {
+                Util.MemClear(startAddr, bytes);
+                this.zeroedLimit = this.allocPtr;
+            }
+            this.reserveLimit = limitAddr;
+            UIntPtr resultAddr = startAddr + PreHeader.Size;
+            InteriorPtrTable.SetFirst(resultAddr);
+
+#if !SINGULARITY || SEMISPACE_COLLECTOR || ADAPTIVE_COPYING_COLLECTOR || SLIDING_COLLECTOR
+            if (GC.remsetType == RemSetType.Cards) {
+                UIntPtr nextPageAddr = startAddr + PageTable.PageSize;
+                VTable.Assert(resultAddr < nextPageAddr);
+                if (this.allocPtr > nextPageAddr) {
+#if DONT_RECORD_OBJALLOC_IN_OFFSETTABLE
+#else
+                    OffsetTable.SetLast(resultAddr);
+#endif
+                }
+            }
+#endif
+
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint(703);
+#endif
+            return resultAddr;
+        }
+
+        internal static void Preempt(Thread t)
+        {
+            MixinThread(t).bumpAllocator.Preempt();
+        }
+
+        private void Preempt()
+        {
+            this.zeroedLimit = UIntPtr.Zero;
+        }
+
+        internal static void Truncate(Thread t)
+        {
+            MixinThread(t).bumpAllocator.Truncate();
+        }
+
+        internal void Truncate()
+        {
+            UIntPtr allocPtr = this.allocPtr;
+            if (!PageTable.PageAligned(allocPtr)) {
+                WriteUnusedMarker(allocPtr);
+            }
+            // NB: allocPtr must never be zero unless zeroedLimit is also zero.
+            // NB: zeroedLimit can be zero if GC is necessary.
+            this.zeroedLimit = UIntPtr.Zero;
+            this.reserveLimit = UIntPtr.Zero;
+            this.allocPtr = UIntPtr.Zero;
+            this.allocNew = UIntPtr.Zero;
+        }
+
+        private static UIntPtr UNUSED_SPACE_TOKEN {
+            [Inline]
+            [NoHeapAllocation]
+            get { return ~((UIntPtr)7u); }
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static unsafe void WriteUnusedMarker(UIntPtr addr)
+        {
+            *(UIntPtr*)addr = BumpAllocator.UNUSED_SPACE_TOKEN;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static unsafe bool IsUnusedMarkerAddr(UIntPtr addr)
+        {
+            return (*(UIntPtr*)addr == UNUSED_SPACE_TOKEN);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static unsafe bool IsUnusedSpace(UIntPtr obj)
+        {
+            return *(UIntPtr*)(obj - PreHeader.Size) == UNUSED_SPACE_TOKEN;
+        }
+
+        internal static unsafe UIntPtr SkipNonObjectData(UIntPtr objectAddr,
+                                                         UIntPtr limit)
+        {
+            // Skip any UNUSED_SPACE_TOKEN and ALIGNMENT_TOKEN areas
+            while (true) {
+                if (objectAddr >= limit) {
+                    break;
+                }
+                if (Allocator.IsAlignment(objectAddr)) {
+                    objectAddr += UIntPtr.Size;
+                } else if (IsUnusedSpace(objectAddr)) {
+                    UIntPtr wordAfterUnused =
+                        objectAddr - PreHeader.Size + UIntPtr.Size;
+                    UIntPtr pageLimit = PageTable.PagePad(wordAfterUnused);
+                    CheckMemoryClear(wordAfterUnused, pageLimit);
+                    objectAddr = pageLimit + PreHeader.Size;
+                } else if (Allocator.IsZeroVTable(objectAddr)) {
+                    // The rest of the page must not be used
+                    UIntPtr pageLimit = PageTable.PagePad(objectAddr);
+                    CheckMemoryClear(objectAddr, pageLimit);
+                    objectAddr = pageLimit + PreHeader.Size;
+                } else {
+                    break;
+                }
+            }
+            return objectAddr;
+        }
+
+        [Inline]
+        internal static unsafe bool IsRestOfPageZero(UIntPtr lowAddr) {
+            UIntPtr* initial = (UIntPtr*)lowAddr;
+            UIntPtr* pageLimit = (UIntPtr*)PageTable.PagePad(lowAddr);
+            for (UIntPtr* addr = initial; addr < pageLimit; addr++) {
+                 if (*addr != UIntPtr.Zero) {
+                     return false;
+                 }
+            }
+            return true;
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        private static void CheckMemoryClear(UIntPtr begin,
+                                             UIntPtr limit) {
+            VTable.DebugBreak();
+        }
+
+#if SINGULARITY_KERNEL
+#if ENSURE_ALLOCATION_ALLOWED
+        internal static void EnsureAllocationAllowed()
+        {
+            // Verify that we're not in an interrupt or non-preemptible region where allocations are prohibited
+            Microsoft.Singularity.Processor currentProcessor = Microsoft.Singularity.Processor.CurrentProcessor;
+            if (currentProcessor != null) // The Processor object itself may still need to be allocated
+            {
+                if (currentProcessor.InInterruptContext)
+                {
+                    Tracing.Log(Tracing.Fatal, "Attempt to allocate memory from interrupt context!");
+                    VTable.DebugPrint("Attempt to allocate memory from interrupt context!\n");
+                    VTable.DebugBreak();
+                }
+#if false // Currently too many allocations with preemption disabled to debug right now
+                if (currentProcessor.PreemptionDisabled)
+                {
+                    VTable.DebugPrint("Attempt to allocate memory with preemption disabled!\n");
+                    VTable.DebugBreak();
+                }
+#endif
+            }
+            VTable.Deny(Thread.CurrentThread != null &&
+                        Transitions.fInitializedRuntime &&
+                        Transitions.UnderGCControl(Thread.GetCurrentThreadIndex()));
+        }
+#endif
+#endif
+
+    }
+
+    [MixinConditional("BumpAllocatorPageClear")]
+    [Mixin(typeof(BumpAllocator))]
+    internal struct BumpAllocatorPageClear /* : BumpAllocator */
+    {
+
+        [MixinOverride]
+        private static bool CLEAR_POOL_PAGES() {
+            return true;
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [MixinOverride]
+        private static unsafe void CheckMemoryClear(UIntPtr begin,
+                                                    UIntPtr limit)
+        {
+            UIntPtr *beg = (UIntPtr *)begin;
+            UIntPtr *lim = (UIntPtr *)limit;
+
+            for (; beg < lim; beg++) {
+                VTable.Assert(*beg == UIntPtr.Zero, "Memory isn't zero.");
+            }
+        }
+
+    }
+
+    [MixinConditional("BumpAllocatorObjectClear")]
+    [Mixin(typeof(BumpAllocator))]
+    internal struct BumpAllocatorObjectClear /* : BumpAllocator */
+    {
+
+        private UIntPtr           allocPtr; // Next allocation.
+        private UIntPtr           zeroedLimit; // Limit of zeroed pool.
+        private UIntPtr           reserveLimit; // Limit of reserved pool.
+
+        [MixinOverride]
+        private static bool CLEAR_POOL_PAGES() {
+            return false;
+        }
+
+        [MixinOverride]
+        [ManualRefCounts]
+        [Inline]
+        internal UIntPtr AllocateFast(UIntPtr bytes, uint alignment)
+        {
+#if SINGULARITY_KERNEL
+#if ENSURE_ALLOCATION_ALLOWED
+            BumpAllocator.EnsureAllocationAllowed();
+#endif
+#endif
+            UIntPtr allocPtr =
+                Allocator.AlignedAllocationPtr(this.allocPtr,
+                                               this.reserveLimit,
+                                               alignment);
+            UIntPtr objectLimitPtr = allocPtr + bytes;
+            if (objectLimitPtr > this.reserveLimit) {
+                this.allocPtr = allocPtr;
+                return UIntPtr.Zero;
+            }
+            if (objectLimitPtr > this.zeroedLimit) {
+                Util.MemClear(allocPtr, bytes);
+                this.zeroedLimit = objectLimitPtr;
+            }
+            this.allocPtr = objectLimitPtr;
+            return allocPtr + PreHeader.Size;
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [MixinOverride]
+        private static unsafe void CheckMemoryClear(UIntPtr begin,
+                                                    UIntPtr limit)
+        {
+            // Since we are only clearing memory on demand, the memory area
+            // is allowed to contain random garbage values.
+        }
+
+    }
+
+    [MixinConditional("BumpAllocatorCacheClear")]
+    [Mixin(typeof(BumpAllocator))]
+    internal struct BumpAllocatorCacheClear /* : BumpAllocator */
+    {
+
+        private UIntPtr           allocPtr; // Next allocation.
+        private UIntPtr           zeroedLimit; // Limit of zeroed pool.
+        private UIntPtr           reserveLimit; // Limit of reserved pool.
+
+        [MixinOverride]
+        private static bool CLEAR_POOL_PAGES() {
+            return false;
+        }
+
+        private static UIntPtr CACHE_SIZE {
+            get { return (UIntPtr) 128; }
+        }
+
+        [MixinOverride]
+        internal UIntPtr ExtendZero(UIntPtr bytes, uint alignment)
+        {
+            while (this.allocPtr + bytes <= this.reserveLimit) {
+                UIntPtr newZeroedLimit =
+                    Util.Pad(this.allocPtr + bytes, CACHE_SIZE);
+                Util.MemClear(this.zeroedLimit,
+                              newZeroedLimit - this.zeroedLimit);
+                this.zeroedLimit = newZeroedLimit;
+                UIntPtr allocPtr =
+                    Allocator.AlignedAllocationPtr(this.allocPtr,
+                                                   newZeroedLimit,
+                                                   alignment);
+                if (allocPtr + bytes <= newZeroedLimit) {
+                    this.allocPtr = allocPtr + bytes;
+                    return allocPtr + PreHeader.Size;
+                } else {
+                    this.allocPtr = allocPtr;
+                }
+            }
+            return UIntPtr.Zero;
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [MixinOverride]
+        private static unsafe void CheckMemoryClear(UIntPtr begin,
+                                                    UIntPtr limit)
+        {
+            // Since we are only clearing memory on demand, the memory area
+            // is allowed to contain random garbage values.
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/CallStack.cs b/base/Kernel/Bartok/GCs/CallStack.cs
new file mode 100644
index 0000000..f8417e0
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/CallStack.cs
@@ -0,0 +1,950 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    using Microsoft.Bartok.Options;
+    using Microsoft.Bartok.Runtime;
+
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity.X86;
+#elif SINGULARITY_PROCESS
+    using Microsoft.Singularity.X86;
+    using Microsoft.Singularity.V1.Services;
+#endif
+
+    [NoCCtor]
+    [RequiredByBartok]
+    internal unsafe class CallStack
+    {
+
+        [Mixin(typeof(Thread))] 
+        private class CallStackThread : Object {
+            [AccessedByRuntime("reference in brtstack.asm")]
+            internal UIntPtr asmStackBase; // Limit of thread's stack
+            [AccessedByRuntime("reference in brtstack.asm")]
+            internal UIntPtr asmStackLimit;
+            [AccessedByRuntime("reference in brtforgc.asm")]
+            internal unsafe TransitionRecord *asmStackMarker;
+        }
+
+        private static CallStackThread MixinThread(Thread t) {
+            return (CallStackThread) (Object) t;
+        }
+
+        internal static UIntPtr StackBase(Thread t) {
+            return MixinThread(t).asmStackBase;
+        }
+
+        internal static void SetStackBase(Thread t, UIntPtr value) {
+            MixinThread(t).asmStackBase = value;
+        }
+
+        internal static UIntPtr StackLimit(Thread t) {
+            return MixinThread(t).asmStackLimit;
+        }
+
+        internal static void SetStackLimit(Thread t, UIntPtr value) {
+            MixinThread(t).asmStackLimit = value;
+        }
+
+        internal static TransitionRecord* StackMarker(Thread t)
+        {
+            return MixinThread(t).asmStackMarker;
+        }
+
+#if X86
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        [StructLayout(LayoutKind.Sequential)]
+        internal unsafe struct TransitionRecord {
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal TransitionRecord *oldTransitionRecord;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr callAddr;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr stackBottom;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr EBX;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr EDI;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr ESI;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr EBP;
+        }
+#elif AMD64
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        [StructLayout(LayoutKind.Sequential)]
+        internal unsafe struct TransitionRecord {
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal TransitionRecord *oldTransitionRecord;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr callAddr;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr stackBottom;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr EBX;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr EDI;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr ESI;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr EBP;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr R12;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr R13;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr R14;
+            [AccessedByRuntime("referenced from halforgc.asm")]
+            internal UIntPtr R15;
+        }
+#endif
+        internal static Thread threadBeingProcessed;
+
+        private struct CalleeSaveLocations {
+
+#if SINGULARITY_KERNEL
+            internal void SetCalleeSaves(ThreadContext *context) {
+                EBX.SetCalleeReg(&context->ebx);
+                EDI.SetCalleeReg(&context->edi);
+                ESI.SetCalleeReg(&context->esi);
+                EBP.SetCalleeReg(&context->ebp);
+            }
+#endif
+
+#if X86
+            internal void SetCalleeSaves(TransitionRecord *transitionRecord)
+            {
+                EBX.SetCalleeReg(&transitionRecord->EBX);
+                EDI.SetCalleeReg(&transitionRecord->EDI);
+                ESI.SetCalleeReg(&transitionRecord->ESI);
+                EBP.SetCalleeReg(&transitionRecord->EBP);
+            }
+
+            internal void ClearCalleeSaves() {
+                EBX.ClearCalleeReg();
+                ESI.ClearCalleeReg();
+                EDI.ClearCalleeReg();
+                EBP.ClearCalleeReg();
+            }
+
+            internal
+            void ScanLiveRegs(uint mask,
+                              NonNullReferenceVisitor referenceVisitor)
+            {
+                EDI.ScanLiveReg((mask >> 2) & 0x3, referenceVisitor);
+                ESI.ScanLiveReg((mask >> 4) & 0x3, referenceVisitor);
+                EBX.ScanLiveReg((mask >> 0) & 0x3, referenceVisitor);
+                EBP.ScanLiveReg((mask >> 6) & 0x3, referenceVisitor);
+            }
+
+            internal void PopFrame(UIntPtr *framePointer,
+                                   uint calleeSaveMask,
+                                   bool framePointerOmitted)
+            {
+                UIntPtr *calleeSaveStart;
+                if (framePointerOmitted) {
+                    calleeSaveStart = framePointer - 1;
+                } else {
+                    VTable.Assert((calleeSaveMask & 0x10) == 0,
+                                  "EBP should not be callee saved");
+                    calleeSaveStart = framePointer;
+                    EBP.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x1) != 0) {
+                    calleeSaveStart -=
+                        sizeof(TransitionRecord) / sizeof(UIntPtr);
+                }
+
+                // Note: the order in which these appear is important!
+                if ((calleeSaveMask & 0x2) != 0) {
+                    EBX.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x10) != 0) {
+                    EBP.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x8) != 0) {
+                    ESI.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x4) != 0) {
+                    EDI.PopFrameReg(ref calleeSaveStart);
+                }
+            }
+
+            internal void ClearFrame(uint calleeSaveMask,
+                                     bool framePointerOmitted)
+            {
+                if (!framePointerOmitted) {
+                    VTable.Assert((calleeSaveMask & 0x10) == 0,
+                                  "EBP should not be callee saved");
+                    EBP.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x2) != 0) {
+                    EBX.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x10) != 0) {
+                    EBP.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x8) != 0) {
+                    ESI.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x4) != 0) {
+                    EDI.ClearFrameReg();
+                }
+            }
+#elif AMD64
+            internal void SetCalleeSaves(TransitionRecord *transitionRecord)
+            {
+                EBX.SetCalleeReg(&transitionRecord->EBX);
+                EDI.SetCalleeReg(&transitionRecord->EDI);
+                ESI.SetCalleeReg(&transitionRecord->ESI);
+                EBP.SetCalleeReg(&transitionRecord->EBP);
+                R12.SetCalleeReg(&transitionRecord->R12);
+                R13.SetCalleeReg(&transitionRecord->R13);
+                R14.SetCalleeReg(&transitionRecord->R14);
+                R15.SetCalleeReg(&transitionRecord->R15);
+            }
+
+            internal void ClearCalleeSaves() {
+                EBX.ClearCalleeReg();
+                ESI.ClearCalleeReg();
+                EDI.ClearCalleeReg();
+                EBP.ClearCalleeReg();
+                R12.ClearCalleeReg();
+                R13.ClearCalleeReg();
+                R14.ClearCalleeReg();
+                R15.ClearCalleeReg();
+            }
+
+            internal
+            void ScanLiveRegs(uint mask,
+                              NonNullReferenceVisitor referenceVisitor)
+            {
+                EDI.ScanLiveReg((mask >> 2) & 0x3, referenceVisitor);
+                ESI.ScanLiveReg((mask >> 4) & 0x3, referenceVisitor);
+                EBX.ScanLiveReg((mask >> 0) & 0x3, referenceVisitor);
+                R12.ScanLiveReg((mask >> 6) & 0x3, referenceVisitor);
+                R13.ScanLiveReg((mask >> 8) & 0x3, referenceVisitor);
+                R14.ScanLiveReg((mask >> 10) & 0x3, referenceVisitor);
+                R15.ScanLiveReg((mask >> 12) & 0x3, referenceVisitor);
+                EBP.ScanLiveReg((mask >> 14) & 0x3, referenceVisitor);
+            }
+
+            internal void PopFrame(UIntPtr *framePointer,
+                                   uint calleeSaveMask,
+                                   bool framePointerOmitted)
+            {
+                UIntPtr *calleeSaveStart;
+                if (framePointerOmitted) {
+                    calleeSaveStart = framePointer - 1;
+                } else {
+                    VTable.Assert((calleeSaveMask & 0x100) == 0,
+                                  "EBP should not be callee saved");
+                    calleeSaveStart = framePointer;
+                    EBP.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x1) != 0) {
+                    calleeSaveStart -=
+                        sizeof(TransitionRecord) / sizeof(UIntPtr);
+                }
+
+                // Note: the order in which these appear is important!
+                if ((calleeSaveMask & 0x2) != 0) {
+                    EBX.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x100) != 0) {
+                    EBP.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x8) != 0) {
+                    ESI.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x4) != 0) {
+                    EDI.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x10) != 0) {
+                    R12.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x20) != 0) {
+                    R13.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x40) != 0) {
+                    R14.PopFrameReg(ref calleeSaveStart);
+                }
+                if ((calleeSaveMask & 0x80) != 0) {
+                    R15.PopFrameReg(ref calleeSaveStart);
+                }
+            }
+
+            internal void ClearFrame(uint calleeSaveMask,
+                                     bool framePointerOmitted)
+            {
+                if (!framePointerOmitted) {
+                    VTable.Assert((calleeSaveMask & 0x100) == 0,
+                                  "EBP should not be callee saved");
+                    EBP.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x2) != 0) {
+                    EBX.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x100) != 0) {
+                    EBP.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x8) != 0) {
+                    ESI.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x4) != 0) {
+                    EDI.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x10) != 0) {
+                    R12.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x20) != 0) {
+                    R13.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x40) != 0) {
+                    R14.ClearFrameReg();
+                }
+                if ((calleeSaveMask & 0x80) != 0) {
+                    R15.ClearFrameReg();
+                }
+
+            }
+#endif
+
+            internal UIntPtr GetFramePointer()
+            {
+                return EBP.value;
+            }
+
+            private struct RegLocation
+            {
+
+                [Inline]
+                internal void SetCalleeReg(UIntPtr *regField)
+                {
+                    this.pending = false;
+                    this.value = *regField;
+                    this.head = regField;
+                    *regField = UIntPtr.Zero;
+                }
+
+                internal void ClearCalleeReg()
+                {
+                    VTable.Deny(this.pending);
+                    UIntPtr *scan = this.head;
+                    while (scan != null) {
+                        UIntPtr temp = *scan;
+                        *scan = value;
+                        scan  = (UIntPtr *) temp;
+                    }
+                    this.head = null;
+                }
+
+                internal void ScanLiveReg(uint kind,
+                                          NonNullReferenceVisitor visitor)
+                {
+                    switch (kind) {
+                      case 0: {
+                          // Value is not a traceable heap pointer
+                          break;
+                      }
+                      case 1: {
+                          // Value is a pointer variable
+                          VTable.Deny(this.head == null);
+                          if (value != UIntPtr.Zero) {
+                              fixed (UIntPtr *valueField = &this.value) {
+                                  visitor.Visit(valueField);
+                              }
+                          }
+                          ClearCalleeReg();
+                          break;
+                      }
+                      case 2: {
+                          // Value is unchanged since function entry
+                          VTable.Deny(this.pending);
+                          this.pending = true;
+                          break;
+                      }
+                      case 3:
+                      default: {
+                          VTable.NotReached("ScanLiveReg 3 or default");
+                          break;
+                      }
+                    }
+                }
+
+                internal void PopFrameReg(ref UIntPtr *calleeSaveStart)
+                {
+                    if (this.head != null && !this.pending) {
+                        ClearCalleeReg();
+                    }
+                    if (this.head == null) {
+                        this.value = *calleeSaveStart;
+                    } else {
+                        VTable.Assert(this.pending, "pending should be true");
+                        VTable.Assert(*calleeSaveStart == this.value,
+                                      "values are not equal");
+                    }
+                    this.pending = false;
+                    *calleeSaveStart = (UIntPtr) this.head;
+                    this.head = calleeSaveStart;
+                    calleeSaveStart--;
+                }
+
+                internal void ClearFrameReg() {
+                    UIntPtr *scan = this.head;
+                    while (scan != null) {
+                        UIntPtr temp = *scan;
+                        *scan = value;
+                        scan = (UIntPtr *) temp;
+                    }
+                    this.head = null;
+                    this.pending = false;
+                    this.value = UIntPtr.Zero;
+                }
+
+                internal bool pending;
+                internal UIntPtr value;
+                internal UIntPtr *head;
+
+            }
+
+#if X86
+            RegLocation EBX;
+            RegLocation EDI;
+            RegLocation ESI;
+            RegLocation EBP;
+#elif AMD64
+            RegLocation EBX;
+            RegLocation EDI;
+            RegLocation ESI;
+            RegLocation EBP;
+            RegLocation R12;
+            RegLocation R13;
+            RegLocation R14;
+            RegLocation R15;
+#endif
+        }
+
+        [RequiredByBartok]
+        private static int callSiteTableCount;
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        private static UIntPtr *codeBaseStartTable;
+        [RequiredByBartok]
+        private static UIntPtr **returnAddressToCallSiteSetNumbers;
+        [RequiredByBartok]
+        private static int **callSiteSetCount;
+
+        private static int CallSiteTableNumber(UIntPtr returnAddr)
+        {
+            UIntPtr address = returnAddr;
+            for (int i = 0; i < callSiteTableCount; i++) {
+                UIntPtr baseAddress = codeBaseStartTable[i];
+                if (address < baseAddress) {
+                    continue;
+                }
+                UIntPtr relativeAddress = address - baseAddress;
+                UIntPtr *ptr = returnAddressToCallSiteSetNumbers[i];
+                int callSiteCount = *(callSiteSetCount[i]);
+                if (relativeAddress >= ptr[0] &&
+                    relativeAddress <= ptr[callSiteCount]) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        private static int CallSiteSetNumber(UIntPtr returnAddr, int index)
+        {
+            UIntPtr codeBaseAddr = codeBaseStartTable[index];
+            UIntPtr relativeAddr = returnAddr - codeBaseAddr;
+            UIntPtr *callSiteTable = returnAddressToCallSiteSetNumbers[index];
+            int callSiteCount = *(callSiteSetCount[index]);
+            int left = 0;
+            int right = callSiteCount;
+            // Loop invariant:
+            //   callSiteTable[left] <= returnAddress < callSiteTable[right]
+            while (left < right-1) {
+                int mid = (left + right)/2;
+                if (callSiteTable[mid] <= relativeAddr) {
+                    left = mid;
+                } else {
+                    right = mid;
+                }
+            }
+            return left;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FullDescriptor {
+            internal UIntPtr mask;
+            internal int variableData;
+        }
+
+        private const uint ESCAPE32_TAG = 0x0;
+        private const uint ESCAPE16_TAG = 0x1;
+        private const uint ESCAPE8_TAG  = 0x2;
+
+        // Check whether the specified stack frame contains the
+        // transition record: if so then we're done scanning this
+        // segment of the stack.  NB: the caller must ensure that the
+        // framePointer has been recomputed in a
+        // framePointerOmitted-method.
+        private static bool FrameContainsTransitionRecord(UIntPtr *framePointer,
+                                                          UIntPtr *stackPointer,
+                                                          TransitionRecord *stopMarker) {
+            bool result = false;
+            if ((framePointer >= stopMarker) && (stackPointer < stopMarker)) {
+                result = true;
+            }
+            return result;
+        }
+
+        // Returns the return address in the calling method
+        private static
+        bool WalkStackFrame(ref UIntPtr *framePointer,
+                            ref UIntPtr *stackPointer,
+                            ref CalleeSaveLocations calleeSaves,
+                            ref UIntPtr returnAddr,
+                            NonNullReferenceVisitor threadReferenceVisitor,
+                            NonNullReferenceVisitor pinnedReferenceVisitor,
+                            UIntPtr frameDescriptorEntryPtr,
+                            TransitionRecord *stopMarker,
+                            Thread thread)
+            // BUGBUG: Remove thread argument when ThreadContext is on stack!
+        {
+            Trace.Log(Trace.Area.Stack,
+                      "WalkStackFrame: fp={0:x}, sp={1:x}, returnAddr={2:x}, desc={3:x}",
+                      __arglist(framePointer, stackPointer,
+                                returnAddr, frameDescriptorEntryPtr));
+            bool framePointerOmitted;
+            uint liveRegs, calleeSaveMask;
+            //uint frameDescriptorEntry = (uint) frameDescriptorEntryPtr;
+            UIntPtr frameDescriptorEntry = frameDescriptorEntryPtr;
+            if ((frameDescriptorEntry & 0x1) != 0) {
+                // Compact descriptor
+                UIntPtr mask;
+                framePointerOmitted =
+                    (((frameDescriptorEntry >> 1) & 0x1) != 0);
+                int inbetweenSlots;
+                if (framePointerOmitted) {
+                    // No frame pointer
+                    inbetweenSlots = Constants.InbetweenSlotsNoFP;
+                    mask =
+                        frameDescriptorEntry >> Constants.CompactStackBitMaskStartNoFP;
+                    calleeSaveMask =
+                        (uint)((frameDescriptorEntry >> Constants.CompactEntryMaskStart)
+                                & Constants.CompactEntryMaskNoFP);
+                    liveRegs = (uint)((frameDescriptorEntry >>
+                                       Constants.CompactCalleeSaveUseStartNoFP) &
+                                      Constants.CompactCalleeSaveUseMaskNoFP);
+                    // when frame pointer is omitted, the stack top
+                    // equals stackPointer plus frameSize
+                    int frameSize =
+                        unchecked((int)(frameDescriptorEntry >>
+                                        Constants.CompactFrameSizeStartNoFP) &
+                                  Constants.CompactFrameSizeMaskNoFP);
+                    framePointer = stackPointer + frameSize;
+                } else {
+                    // Use frame pointer
+                    inbetweenSlots = Constants.InbetweenSlotsFP;
+                    mask = frameDescriptorEntry >> Constants.CompactStackBitMaskStartFP;
+                    calleeSaveMask =
+                        (uint)((frameDescriptorEntry >> Constants.CompactEntryMaskStart)
+                                & Constants.CompactEntryMaskFP);
+                    liveRegs =
+                        (uint) ((frameDescriptorEntry >>
+                                 Constants.CompactCalleeSaveUseStartFP) &
+                                Constants.CompactCalleeSaveUseMaskFP);
+                }
+
+                Trace.Log(Trace.Area.Stack,
+                          "Compact desc: fpo={0}, mask={1:x}, inbetweenSlots={2}, calleeSaveMask={3:x}, liveRegs={4:x}",
+                          __arglist(framePointerOmitted, mask, inbetweenSlots,
+                                    calleeSaveMask, liveRegs));
+                if (FrameContainsTransitionRecord(framePointer,
+                                                  stackPointer,
+                                                  stopMarker)) {
+                    return true; // true: done
+                }
+                uint stackArgSize =
+                    (uint)((frameDescriptorEntry >> Constants.CompactArgMaskStart)
+                                           & Constants.CompactArgMask);
+                UIntPtr *p = framePointer + stackArgSize + inbetweenSlots;
+                Trace.Log(Trace.Area.Stack,
+                          "Compact desc: stackArgSize={0:x}, p={1:x}",
+                          __arglist(stackArgSize, p));
+                // Process the arguments
+                if (threadReferenceVisitor != null) {
+                    for (int i = 0; mask != 0 && i <= stackArgSize; i++) {
+                        if ((mask & 0x1) != 0 && *p != UIntPtr.Zero) {
+                            // BUGBUG: threadReferenceVisitor.Visit(p);
+                            VisitIfNotContext(thread, threadReferenceVisitor,
+                                              p);
+                        }
+                        mask >>= 1;
+                        p--;
+                    }
+                } else {
+                    for (int i = 0; mask != 0 && i <= stackArgSize; i++) {
+                        mask >>= 1;
+                    }
+                }
+                // Process the local variables
+                bool transitionRecord = ((calleeSaveMask & 0x1) != 0);
+                uint savedRegs = (uint) (calleeSaveMask >> 1);
+                uint countRegs = ((savedRegs & 1) +
+                                  ((savedRegs >> 1) & 1) +
+                                  ((savedRegs >> 2) & 1) +
+                                  ((savedRegs >> 3) & 1) +
+                                  ((savedRegs >> 4) & 1) +
+                                  ((savedRegs >> 5) & 1) +
+                                  ((savedRegs >> 6) & 1) +
+                                  ((savedRegs >> 7) & 1));
+                int transitionRecordSize =
+                    transitionRecord ?
+                    sizeof(TransitionRecord)/sizeof(UIntPtr) :
+                    0;
+                p = framePointer - 1 - countRegs - transitionRecordSize;
+                Trace.Log(Trace.Area.Stack,
+                          "Compact desc: savedRegs={0:x}, countRegs={0:x}, transSize={0:x}, p={0:x}", __arglist(savedRegs, countRegs, transitionRecordSize));
+                if (threadReferenceVisitor != null) {
+                    while (mask != 0) {
+                        if ((mask & 1) != 0 && *p != UIntPtr.Zero) {
+                            // BUGBUG: threadReferenceVisitor.Visit(p);
+                            VisitIfNotContext(thread, threadReferenceVisitor,
+                                              p);
+                        }
+                        mask >>= 1;
+                        p--;
+                    }
+                }
+            } else {
+                // Full descriptor
+                FullDescriptor *desc =
+                    ((FullDescriptor *) frameDescriptorEntryPtr);
+                UIntPtr mask = (UIntPtr) desc->mask;
+                framePointerOmitted = ((mask & 1) != 0);
+                bool pinnedVars;
+                uint frameTag;
+                if (framePointerOmitted) {
+                    // no frame pointer
+                    calleeSaveMask = (uint) ((mask >> Constants.FullEntryMaskStart) &
+                                         Constants.FullEntryMaskNoFP);
+                    pinnedVars = (((mask >> Constants.FullPinnedPosNoFP) & 1) != 0);
+                    liveRegs = (uint) (( mask >> Constants.FullCalleeSaveUseStartNoFP) &
+                                       Constants.FullCalleeSaveUseMaskNoFP);
+                    frameTag = (uint) ((mask >> Constants.FullRecordSizePosNoFP) &
+                                       Constants.FullRecordMask);
+                    // when frame pointer is omitted, the stack top
+                    // equals stackPointer plus frameSize
+                    int frameSize = unchecked((int)(mask >> Constants.FullFrameSizeStartNoFP));
+                    framePointer = stackPointer + frameSize;
+                } else {
+                    // use frame pointer
+                    calleeSaveMask = (uint) ((mask >> Constants.FullEntryMaskStart) &
+                                             Constants.FullEntryMaskFP);
+                    pinnedVars = (((mask >> Constants.FullPinnedPosFP) & 1) != 0);
+                    liveRegs = (uint) (( mask >> Constants.FullCalleeSaveUseStartFP) &
+                                       Constants.FullCalleeSaveUseMaskFP);
+                    frameTag = (uint) ((mask >> Constants.FullRecordSizePosFP) &
+                                       Constants.FullRecordMask);
+                }
+
+                if (FrameContainsTransitionRecord(framePointer,
+                                                  stackPointer,
+                                                  stopMarker)) {
+                    return true; // true: done
+                }
+                switch (frameTag) {
+                  case ESCAPE8_TAG: {
+                      int count = *(byte *) &desc->variableData;
+                      byte pinnedCount = *((byte*)&desc->variableData+1);
+                      sbyte *offsets = (sbyte *)&desc->variableData+2;
+                      if (threadReferenceVisitor != null) {
+                          for (int i = 0; i < count; i++) {
+                              UIntPtr *loc = framePointer + offsets[i];
+                              if (*loc != UIntPtr.Zero) {
+                                  // BUGBUG: threadReferenceVisitor.Visit(loc);
+                                  VisitIfNotContext(thread, threadReferenceVisitor, loc);
+                              }
+                          }
+                      }
+                      if (pinnedVars && pinnedReferenceVisitor != null) {
+                          int last = count + pinnedCount;
+                          for (int i = count; i < last; i++) {
+                              UIntPtr *loc = framePointer + offsets[i];
+                              if (*loc != UIntPtr.Zero) {
+                                  pinnedReferenceVisitor.Visit(loc);
+                              }
+                          }
+                      }
+                      break;
+                  }
+                  case ESCAPE16_TAG: {
+                      int count = *((short *) &desc->variableData);
+                      short pinnedCount = *((short*)&desc->variableData+1);
+                      short *offsets = (short *)&desc->variableData+2;
+                      if (threadReferenceVisitor != null) {
+                          for (int i = 0; i < count; i++) {
+                              UIntPtr *loc = framePointer + offsets[i];
+                              if (*loc != UIntPtr.Zero) {
+                                  // BUGBUG: threadReferenceVisitor.Visit(loc);
+                                  VisitIfNotContext(thread, threadReferenceVisitor, loc);
+                              }
+                          }
+                      }
+                      if (pinnedVars && pinnedReferenceVisitor != null) {
+                          int last = count + pinnedCount;
+                          for (int i = count; i < last; i++) {
+                              UIntPtr *loc = framePointer + offsets[i];
+                              if (*loc != UIntPtr.Zero) {
+                                  pinnedReferenceVisitor.Visit(loc);
+                              }
+                          }
+                      }
+                      break;
+                  }
+                  case ESCAPE32_TAG: {
+                      int count = *((int *) &desc->variableData);
+                      int pinnedCount = *((int *) &desc->variableData+1);
+                      int *offsets = (int *) &desc->variableData+2;
+                      if (threadReferenceVisitor != null) {
+                          for (int i = 0; i < count; i++) {
+                              UIntPtr *loc = framePointer + offsets[i];
+                              if (*loc != UIntPtr.Zero) {
+                                  // BUGBUG: threadReferenceVisitor.Visit(loc);
+                                  VisitIfNotContext(thread, threadReferenceVisitor, loc);
+                              }
+                          }
+                      }
+                      if (pinnedVars && pinnedReferenceVisitor != null) {
+                          int last = count + pinnedCount;
+                          for (int i = count; i < last; i++) {
+                              UIntPtr *loc = framePointer + offsets[i];
+                              if (*loc != UIntPtr.Zero) {
+                                  pinnedReferenceVisitor.Visit(loc);
+                              }
+                          }
+                      }
+                      break;
+                  }
+                  default: {
+                      VTable.NotReached("GC mask switch failed");
+                      break;
+                  }
+                }
+            }
+            if (liveRegs != 0 && threadReferenceVisitor != null) {
+                calleeSaves.ScanLiveRegs(liveRegs, threadReferenceVisitor);
+            }
+            UIntPtr nextReturnAddr;
+            if (framePointerOmitted) {
+                nextReturnAddr = *framePointer;
+                stackPointer = framePointer + 1;
+            } else {
+                nextReturnAddr = *(framePointer + 1);
+                stackPointer = framePointer + 2;
+            }
+            // In Singularity, the final return address of a thread is zero
+            if (nextReturnAddr != UIntPtr.Zero) {
+                calleeSaves.PopFrame(framePointer, calleeSaveMask,
+                                     framePointerOmitted);
+            } else {
+                calleeSaves.ClearFrame(calleeSaveMask, framePointerOmitted);
+            }
+            UIntPtr *calcedfp = (UIntPtr *) calleeSaves.GetFramePointer();
+            if (calcedfp != null) {
+                framePointer = calcedfp;
+            }
+            returnAddr = nextReturnAddr;
+            return false; // false: not done scanning: proceed to next frame
+        }
+
+#if SINGULARITY_PROCESS
+        // BUGBUG: Get rid of this when ThreadContext is on stack! --rusa
+        [Inline]
+        private static
+        void VisitIfNotContext(Thread thread,
+                               NonNullReferenceVisitor threadReferenceVisitor,
+                               UIntPtr *p)
+        {
+            if (*p != (UIntPtr) thread.context &&
+                (int *) *p != &thread.context->gcStates) {
+                threadReferenceVisitor.Visit(p);
+            }
+        }
+#else
+        [Inline]
+        private static
+        void VisitIfNotContext(Thread thread,
+                               NonNullReferenceVisitor threadReferenceVisitor,
+                               UIntPtr *p)
+        {
+            threadReferenceVisitor.Visit(p);
+        }
+#endif
+
+        [RequiredByBartok]
+        private static ushort **callSetSiteNumberToIndex;
+        [RequiredByBartok]
+        private static UIntPtr **activationDescriptorTable;
+
+        [PreInitRefCounts]
+        internal static
+        int ScanStacks(NonNullReferenceVisitor VisitThreadReference,
+                       NonNullReferenceVisitor VisitPinnedReference)
+        {
+            int limit = Thread.threadTable.Length;
+            int countThreads = 0;
+            for (int i = 0; i < limit; i++) {
+                Thread t = Thread.threadTable[i];
+                if (t != null) {
+                    CollectorStatistics.Event(GCEvent.StackScanStart, i);
+                    ScanStack(t, VisitThreadReference, VisitPinnedReference);
+                    CollectorStatistics.Event(GCEvent.StackScanComplete, i);
+                    countThreads++;
+                }
+            }
+            return countThreads;
+        }
+
+        [PreInitRefCounts]
+        internal static
+        uint ScanStack(Thread thread,
+                       NonNullReferenceVisitor VisitThreadReference,
+                       NonNullReferenceVisitor VisitPinnedReference)
+        {
+            Trace.Log(Trace.Area.Stack,
+                      "Scanning stack for thread {0:x}",
+                      __arglist(thread.threadIndex));
+
+            uint numStackFrames = 0;
+            threadBeingProcessed = thread;
+            CalleeSaveLocations calleeSaves = new CalleeSaveLocations();
+#if SINGULARITY_KERNEL
+            TransitionRecord *marker = (TransitionRecord *) thread.context.stackMarkers;
+#elif SINGULARITY_PROCESS
+            TransitionRecord *marker = null;
+            if (thread.context != null) {
+                marker = (TransitionRecord *) thread.context->stackMarkers;
+            }
+#else
+            TransitionRecord *marker = (TransitionRecord *)
+                MixinThread(thread).asmStackMarker;
+#endif
+            while (marker != null) {
+                Trace.Log(Trace.Area.Stack,
+                          "Transition record: old={0:x}, callAddr={1:x}, stackBottom={2:x}, EBX={3:x}, EDI={4:x}, ESI={5:x}, EBP={6:x}", __arglist(marker->oldTransitionRecord, marker->callAddr, marker->stackBottom, marker->EBX, marker->EDI, marker->ESI, marker->EBP));
+
+                TransitionRecord *stopMarker = marker->oldTransitionRecord;
+                UIntPtr returnAddr = marker->callAddr;
+                UIntPtr *fp = (UIntPtr *) marker->EBP;
+                UIntPtr *sp = (UIntPtr *) marker->stackBottom;
+                calleeSaves.SetCalleeSaves(marker);
+                numStackFrames +=
+                    ScanStackSegment(ref calleeSaves, returnAddr, fp, sp,
+                                     stopMarker, VisitThreadReference,
+                                     VisitPinnedReference, thread);
+                marker = marker->oldTransitionRecord;
+            }
+            threadBeingProcessed = null;
+            return numStackFrames;
+        }
+
+        [PreInitRefCounts]
+        private static
+        uint ScanStackSegment(ref CalleeSaveLocations calleeSaves,
+                              UIntPtr returnAddr,
+                              UIntPtr *fp,
+                              UIntPtr *sp,
+                              TransitionRecord *stopMarker,
+                              NonNullReferenceVisitor VisitThreadReference,
+                              NonNullReferenceVisitor VisitPinnedReference,
+                              Thread thread)
+            // BUGBUG: Remove thread argument when ThreadContext is on stack!
+        {
+#if SINGULARITY
+            UIntPtr unlinkBegin;
+            UIntPtr unlinkLimit;
+
+            fixed (byte *begin =
+                   &Microsoft.Singularity.Memory.Stacks.UnlinkStackBegin) {
+                unlinkBegin = (UIntPtr)begin;
+            }
+            fixed (byte *limit =
+                   &Microsoft.Singularity.Memory.Stacks.UnlinkStackLimit) {
+                unlinkLimit = (UIntPtr)limit;
+            }
+#endif
+            uint numStackFrames = 0;
+            while (true) {
+#if SINGULARITY
+                if (returnAddr >= unlinkBegin && returnAddr <= unlinkLimit) {
+                    returnAddr = WalkStack(ref fp, ref sp);
+                }
+#endif
+
+                // Exit loop if we have reached the of the stack segment
+                if (fp >= stopMarker && sp < stopMarker) {
+                    break;
+                }
+                int tableIndex = CallSiteTableNumber(returnAddr);
+                if (tableIndex < 0) {
+                    break;
+                }
+                int callSiteSet = CallSiteSetNumber(returnAddr, tableIndex);
+                if (callSiteSet < 0) {
+                    break;
+                }
+                ushort *callSiteToIndexTable =
+                    callSetSiteNumberToIndex[tableIndex];
+                int activationIndex = (int) callSiteToIndexTable[callSiteSet];
+                VTable.Assert(activationIndex >= 0);
+                UIntPtr *descriptorTable =
+                    activationDescriptorTable[tableIndex];
+                UIntPtr frameDescriptorEntry = descriptorTable[activationIndex];
+                bool done = WalkStackFrame(ref fp, ref sp, ref calleeSaves,
+                                           ref returnAddr,
+                                           VisitThreadReference,
+                                           VisitPinnedReference,
+                                           frameDescriptorEntry,
+                                           stopMarker, thread);
+                if (done) {
+                    break;
+                }
+                numStackFrames++;
+            }
+            calleeSaves.ClearCalleeSaves();
+            return numStackFrames;
+        }
+
+        private static UIntPtr WalkStack(ref UIntPtr *framePointer,
+                                         ref UIntPtr *stackPointer) {
+            // the frame pointer points to the ebp in the old frame
+            // since at the end of WalkStackFrame, it sets return addr
+            // and pop up a frame. However, since we are using linked
+            // stack, "pop up a frame" didn't actually set the frame
+            // to the caller's frame, it just goes from new frame to the
+            // old frame, therefore, we need to get return addr and pop
+            // a frame again.
+            stackPointer = framePointer + 2;
+            UIntPtr returnAddr = *(framePointer + 1);
+            framePointer = (UIntPtr*) *framePointer;
+            return returnAddr;
+        }
+    }
+}
diff --git a/base/Kernel/Bartok/GCs/CardTable.cs b/base/Kernel/Bartok/GCs/CardTable.cs
new file mode 100644
index 0000000..0d2f904
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/CardTable.cs
@@ -0,0 +1,294 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//#define DEBUG_CARDS
+
+namespace System.GCs {
+
+  using Microsoft.Bartok.Runtime;
+  using System.Threading;
+  using System.Runtime.CompilerServices;
+
+  internal unsafe class CardTable : RememberedSet {
+
+      internal static CardTable instance;
+
+      private static UIntPtr firstCardNo; 
+      private static UIntPtr totalCards; 
+
+      // To save time in computing the correct card to be marked,
+      // set the value of cardTableBase such that given a card number c, 
+      // the corresponding card entry is simply cardTableBase+c. 
+      // Note: the card number c of address p is p >>CardBits. Since our
+      // heap does not necessarily start from address 0, the card numbers
+      // may NOT start  from 0, either.
+      
+      private static byte *cardTablePtr; // real start of the card table     
+      private static byte *cardTableBase; 
+
+      // A card is clean before any pointer update in it. It is dirty after an
+      // update. During a collection, if the card has inter-generational
+      // pointers, the pointers are traced. 
+      
+      internal enum CardType: byte{
+         Clean = 0,
+         Dirty = 1
+      }
+
+      // CardBits, CardSize, etc.  are defined as properties instead of
+      // const int to avoid calling static constructor of CardTye
+      // during GC.cctor.
+      
+      // TODO: fine tune the CardBits for performance
+      
+      internal static byte CardBits {
+         get { 
+            if (UIntPtr.Size == 4) {
+               return 9;
+            } else if (UIntPtr.Size == 8) {
+               return 10;
+            } else {
+               VTable.Assert(false, "Not supported pointer type");
+               return 0xff;
+            }
+         }
+      }
+      
+      internal static UIntPtr CardSize {
+         get { return (UIntPtr)1 << CardBits;}  // size of a card in bytes
+      }
+      
+      internal static UIntPtr FirstCardNo {
+         get {
+            return firstCardNo;
+         }
+      }
+
+      internal static void Initialize() {
+         // The card table covers all the heap. Below is not accurate heap
+         // size. It includes all the memory space, starting from address 0.
+         // TODO: find more accurate heap size and start
+         
+         UIntPtr heapSize = PageTable.pageTableCount * PageTable.PageSize;
+         VTable.Assert((heapSize >> CardBits) << CardBits == heapSize,
+               "Assumption: pageSize is expected to be multiple of CardSize");
+         UIntPtr heapStart = (UIntPtr)0;
+         
+         totalCards = heapSize >> CardBits;
+         firstCardNo = heapStart >> CardBits;
+
+         UIntPtr tablePtr =PageManager.AllocateNonheapMemory(null,  totalCards);
+         VTable.Assert(tablePtr != UIntPtr.Zero);         
+         cardTablePtr = (byte*) tablePtr;
+         cardTableBase = (byte*)(tablePtr - firstCardNo);
+         
+         CardTable.instance = (CardTable)
+              BootstrapMemory.Allocate(typeof(CardTable));
+
+         OffsetTable.Initialize(totalCards);
+
+         for (UIntPtr c = firstCardNo; c < firstCardNo + totalCards; c++) {
+            VTable.Assert(!CardIsDirty(c), "Card table initialization error");
+         }
+      }
+
+      [Inline]
+      internal static bool IsValidCardNo(UIntPtr c)
+      {
+         return (c >= firstCardNo && c < firstCardNo + totalCards);
+      }
+
+      [Inline]
+      internal static UIntPtr CardNo(UIntPtr addr)
+      {
+         UIntPtr c = addr >> CardBits;
+         VTable.Assert(IsValidCardNo(c), "CardNo invalid");
+         return c;
+      }
+      
+      [Inline]
+      internal static UIntPtr CardAddr(UIntPtr c)
+      {
+         VTable.Assert(IsValidCardNo(c), "CardAddr invalid");
+         return c << CardBits;
+      }
+
+      [Inline]
+      internal static UIntPtr NextCardAddr(UIntPtr c)
+      {
+         VTable.Assert(IsValidCardNo(c), "NextCardAddr invalid");
+         return CardAddr(c) + CardSize;
+      }
+      
+      // The following two Clean functions are supposed to reset unused
+      // entries in the remembered set. They are not meaningful for cardtable.
+
+      [Inline]
+      internal override void Clean() {
+         // Nothing to do
+      }
+
+      [Inline]      
+      internal override void Clean(Thread thread) {
+         // Nothing to do        
+      }
+
+      // There is no duplicate entries in cardtable.
+      
+      internal override void Uniquify() {
+         // Nothing to do
+      }
+
+      internal override void Reset() {
+         Util.MemClear((UIntPtr)cardTablePtr, totalCards);
+      }
+
+      [Inline]
+      private static bool CardIsDirty(UIntPtr c)
+      {
+         VTable.Assert(IsValidCardNo(c), "CardIsDirty invalid");
+         return (*(cardTableBase+c) == (byte)CardType.Dirty);
+      }
+
+      [Inline]
+      internal static PageType CardGeneration(UIntPtr c)
+      {
+         VTable.Assert(IsValidCardNo(c), "CardGeneration invalid");
+         return PageTable.Type(PageTable.Page(CardAddr(c)));
+      }
+
+      [Inline]
+      internal static bool IsMyLiveGcCard(UIntPtr c)
+      {
+         VTable.Assert(IsValidCardNo(c), "IsMyLiveGcCard invalid");
+         UIntPtr page = PageTable.Page(CardAddr(c));
+         return (PageTable.IsMyPage(page) && 
+                        PageTable.IsLiveGcPage(PageTable.Type(page)));
+      }
+
+      [Inline]
+      internal static bool IsMyGcCard(UIntPtr c)
+      {
+         VTable.Assert(IsValidCardNo(c), "IsMyGcCard invalid");
+         UIntPtr page = PageTable.Page(CardAddr(c));
+         return (PageTable.IsMyGcPage(page));
+      }
+
+      [Inline]
+      internal static UIntPtr PageAddrOfCard(UIntPtr c)
+      {
+         return  PageTable.PageAlign(CardAddr(c));
+      }                         
+
+      [Inline]
+      internal override void RecordReference(ref Object reference,
+                                             Object toObj)
+      {
+          Record((UIntPtr) Magic.toPointer(ref reference));
+      }
+
+      [Inline]
+      internal override void RecordReference(UIntPtr* fromAddr,
+                                             Object toObj)
+      {
+          Record((UIntPtr) fromAddr);
+      }
+
+      // So far, we scan the whole object that has any dirty field. So we just 
+      // make the first card of this cloned object dirty.
+      // TODO: make all the cards of the object dirty if we scan fields
+      // in the dirty card only.
+      
+      [Inline]
+      internal override void RecordClonedObject(Object clonedObject)
+      {
+          Record(Magic.addressOf(clonedObject));
+      }
+
+      [RequiredByBartok]
+      [Inline]
+      public static void Record(UIntPtr fromAddr)    
+      {
+         *(cardTableBase + CardNo(fromAddr)) = (byte)CardType.Dirty;
+      }         
+            
+      internal override void Scan(NonNullReferenceVisitor ptrVisitor, 
+         PageType genToCollect)
+      {   
+#if DEBUG_CARDS 
+         VTable.DebugPrint("************  Scan to collect generation {0:x8} ******\n", 
+               __arglist(genToCollect));                  
+         for (UIntPtr i = firstCardNo; i < firstCardNo + totalCards; i++) {
+            if (CardIsDirty(i)) {
+               VTable.DebugPrint("dirty card {0:x8} gen {1:x8}\n", __arglist(i, CardGeneration(i)));
+            }               
+         }
+#endif                  
+      
+         for (UIntPtr c = firstCardNo; c < firstCardNo + totalCards; ) {
+            if (CardIsDirty(c) && IsMyLiveGcCard(c) && 
+               CardGeneration(c) > genToCollect) {
+                  UIntPtr last = c + 1;
+                  while (last < firstCardNo + totalCards && CardIsDirty(last) && 
+                     IsMyLiveGcCard(last) && 
+                     CardGeneration(last) > genToCollect) {
+                        last++;
+                  }
+#if DEBUG_CARDS 
+                  VTable.DebugPrint("Scan from {0:x8} to {1:x8} to collect gen {2:x8}\n",
+                        __arglist(c, last-1, genToCollect));                  
+#endif                  
+                  VisitObjectsInCards(ptrVisitor, c, last - 1);
+                  c = last;
+               } else {
+                  c++;
+               }
+         }
+#if DEBUG_CARDS 
+         VTable.DebugPrint("************ End Scan ******\n");                  
+#endif                           
+      }
+
+      private static void VisitObjectsInCards(NonNullReferenceVisitor ptrVisitor,
+         UIntPtr first, UIntPtr last)
+      {
+         UIntPtr objectPtr = OffsetTable.FirstObjPtrWithFieldInCard(first);
+         VTable.Assert(objectPtr != UIntPtr.Zero, "No first obj ptr");
+
+         // TODO: in semispace.Visit, update cards in visiting promoted objects.
+         // So far, since we have only two generations, and after scanning, all nursery
+         // objects are promoted to mature generation,  thus there is no inter-generational
+         // pointers anymore, and we do not need to update cards during visit. But we
+         // need to do that once we have more than two generations.
+
+         UIntPtr limit = NextCardAddr(last);
+         
+         while (objectPtr != UIntPtr.Zero && objectPtr < limit) {
+#if DEBUG_CARDS
+            VTable.DebugPrint("     visiting obj ptr {0:x8}\n", __arglist(objectPtr));      
+#endif                              
+            Object obj = Magic.fromAddress(objectPtr);
+            UIntPtr objSize = ptrVisitor.VisitReferenceFields(obj);
+            UIntPtr nextObjectPtr = OffsetTable.PtrToNextObject(objectPtr, objSize, limit);  
+            VTable.Assert(CardNo(objectPtr) <= CardNo(nextObjectPtr),
+                  "Next object should be below the current one");
+            if (CardNo(objectPtr) < CardNo(nextObjectPtr)) {
+               UIntPtr c = CardNo(objectPtr);
+               UIntPtr offset = objectPtr - CardAddr(c);
+               if ( offset > OffsetTable.GetOffset(c)) {
+                  OffsetTable.SetOffset(c, offset);
+               }
+            }
+            objectPtr = nextObjectPtr;
+         }
+      }
+   }
+}
diff --git a/base/Kernel/Bartok/GCs/CentralPT.cs b/base/Kernel/Bartok/GCs/CentralPT.cs
new file mode 100644
index 0000000..b441701
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/CentralPT.cs
@@ -0,0 +1,48 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    [RequiredByBartok]
+    internal class CentralPT: PageTable {
+
+
+        [PreInitRefCounts]
+        [NoStackLinkCheck]
+        new internal static unsafe void Initialize() {
+            SetProcessTag((uint) Thread.GetCurrentProcessIndex() << 16);
+            pageTableCount = new UIntPtr(1U) << (int) (31 - PageBits);
+            UIntPtr pageTableSize = pageTableCount * sizeof(uint);
+            halPageDescriptor = (uint *)
+                MemoryManager.AllocateMemory(pageTableSize);
+            UIntPtr startPage = Page((UIntPtr) halPageDescriptor);
+            UIntPtr pageCount = PageCount(PagePad(pageTableCount));
+            SetType(startPage, pageCount, PageType.System);
+            SetProcess(UIntPtr.Zero, pageTableCount);
+        }
+
+            
+        [Inline]
+        internal static unsafe uint PageTableEntryImpl(UIntPtr page)
+        {
+            return *(halPageDescriptor + page);
+        }
+
+        [Inline]
+        internal static unsafe void SetPageTableEntryImpl(UIntPtr page, uint value)
+        {
+            *(halPageDescriptor + page) = value;
+        }
+    }
+}
diff --git a/base/Kernel/Bartok/GCs/Collector.cs b/base/Kernel/Bartok/GCs/Collector.cs
new file mode 100644
index 0000000..92e3efc
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/Collector.cs
@@ -0,0 +1,69 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    [NoCCtor]
+    [RequiredByBartok]
+    internal abstract class Collector
+    {
+        // Helper methods for GC.cs
+        internal abstract void Collect(int currentThreadIndex,
+                                       int generation);
+        internal abstract void CheckForNeededGCWork(Thread currentThread);
+        internal abstract int CollectionGeneration(int gen);
+        internal abstract int GetGeneration(Object obj);
+        internal abstract int MaxGeneration { get; }
+        internal abstract int MinGeneration { get; }        
+        internal abstract long TotalMemory { get; }
+        // Creation and destruction of heaps
+        internal abstract void EnableHeap();
+        internal abstract void DestructHeap();
+        // Verification of the heap
+        internal abstract void VerifyHeap(bool beforeCollection);
+        // Object visitation methods
+        internal abstract UIntPtr FindObjectAddr(UIntPtr interiorPtr);
+        internal abstract void VisitObjects(ObjectLayout.ObjectVisitor objectVisitor,
+                                            UIntPtr lowAddr,
+                                            UIntPtr highAddr);
+        // Transition methods
+        internal abstract void NewThreadNotification(Thread newThread,
+                                                     bool initial);
+        internal abstract void DeadThreadNotification(Thread deadThread);
+        internal abstract void ThreadStartNotification(int currentThreadIndex);
+        internal abstract void ThreadEndNotification(Thread currentThread);
+        internal abstract void ThreadDormantGCNotification(int threadIndex);
+        internal abstract bool IsOnTheFlyCollector {get;}
+        // Profiling methods.
+        internal virtual void SetProfiler(GCProfiler profiler) { }
+        internal virtual  void ProfileAllocation(Object obj)  { }
+        // Allocation of objects
+        internal abstract UIntPtr AllocateObjectMemory(UIntPtr numBytes,
+                                                       uint alignment,
+                                                       Thread currentThread);
+        internal abstract Object AllocateObject(VTable vtable,
+                                                Thread currentThread);
+        internal abstract Array AllocateVector(VTable vtable,
+                                               int numElements,
+                                               Thread currentThread);
+        internal abstract Array AllocateArray(VTable vtable,
+                                              int rank, int totalElements,
+                                              Thread currentThread);
+        internal abstract String AllocateString(int stringLength,
+                                                Thread currentThread);
+    }        
+
+}
diff --git a/base/Kernel/Bartok/GCs/CollectorStatistics.cs b/base/Kernel/Bartok/GCs/CollectorStatistics.cs
new file mode 100644
index 0000000..2bad0b2
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/CollectorStatistics.cs
@@ -0,0 +1,262 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define ENABLED
+
+namespace System.GCs {
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+#if SINGULARITY_PROCESS
+    using Microsoft.Singularity.V1.Services;
+#endif
+#endif
+
+    /// <summary>
+    /// Enumeration of Event Types.
+    /// </summary>
+    public enum GCEvent: int {
+        CreateHeap,
+        DestroyHeap,
+        StopTheWorld,
+        StopThread,
+        ResumeTheWorld,
+        ComputeRootSet,
+        TraceStart,
+        TraceSpecial,
+        SweepStart,
+        SweepSpecial,
+        SweepPreCommit,
+        CollectionComplete,
+        RootSetComputed,
+        StackScanStart,
+        StackScanComplete
+    }
+
+    /// <summary>
+    /// Manages statistics from the collector. Intended for communication
+    /// with the scheduler.
+    /// </summary>
+    internal class CollectorStatistics {
+        [Inline]
+        private static string EventToString(GCEvent ev) {
+            switch (ev) {
+              case GCEvent.CreateHeap:         return "CreateHeap        ";
+              case GCEvent.DestroyHeap:        return "DestroyHeap       ";
+              case GCEvent.StopTheWorld:       return "StopTheWorld      ";
+              case GCEvent.StopThread:         return "StopThread        ";
+              case GCEvent.ResumeTheWorld:     return "ResumeTheWorld    ";
+              case GCEvent.ComputeRootSet:     return "ComputeRootSet    ";
+              case GCEvent.TraceStart:         return "TraceStart        ";
+              case GCEvent.TraceSpecial:       return "TraceSpecial      ";
+              case GCEvent.SweepStart:         return "SweepStart        ";
+              case GCEvent.SweepSpecial:       return "SweepSpecial      ";
+              case GCEvent.SweepPreCommit:     return "SweepPreCommit    ";
+              case GCEvent.CollectionComplete: return "CollectionComplete";
+              case GCEvent.RootSetComputed:    return "RootSetComputed   ";
+              case GCEvent.StackScanStart:     return "StackScanStart    ";
+              case GCEvent.StackScanComplete:  return "StackScanComplete ";
+              default:                         return "Unknown!          ";
+            }
+        }
+
+        [Inline]
+        private static string EventToFormatString(GCEvent ev) {
+            switch (ev) {
+              case GCEvent.CreateHeap:         return "CreateHeap";
+              case GCEvent.DestroyHeap:        return "DestroyHeap";
+              case GCEvent.StopTheWorld:       return "StopTheWorld";
+              case GCEvent.StopThread:         return "StopThread, thread {0}";
+              case GCEvent.ResumeTheWorld:     return "ResumeTheWorld";
+              case GCEvent.ComputeRootSet:     return "ComputeRootSet";
+              case GCEvent.TraceStart:         return "TraceStart";
+              case GCEvent.TraceSpecial:       return "TraceSpecial";
+              case GCEvent.SweepStart:         return "SweepStart";
+              case GCEvent.SweepSpecial:       return "SweepSpecial";
+              case GCEvent.SweepPreCommit:     return "SweepPreCommit";
+              case GCEvent.CollectionComplete: return "CollectionComplete";
+              case GCEvent.RootSetComputed:    return "RootSetComputed";
+              case GCEvent.StackScanStart:     return "StackScanStart, thread {0}";
+              case GCEvent.StackScanComplete:  return "StackScanComplete, thread {0}";
+              default:                         return "Unknown!";
+            }
+        }
+
+        /// <summary>
+        /// The current value of the counter.
+        /// </summary>
+        public static long PerformanceCounter {
+            [Inline]
+            get {
+                long val;
+                bool ok = QueryPerformanceCounter(out val);
+                VTable.Assert(ok);
+                return val;
+            }
+        }
+
+        public static long ThreadTime {
+            [Inline]
+            get {
+#if SINGULARITY
+                return 0;
+#else
+                long creationTime, exitTime, kernelTime, userTime;
+
+                UIntPtr handle = Thread.CurrentThread.asmWin32ThreadHandle;
+
+                bool ok = GetThreadTimes(handle,
+                                         out creationTime,
+                                         out exitTime,
+                                         out kernelTime,
+                                         out userTime);
+                VTable.Assert(ok);
+                return kernelTime + userTime;
+#endif
+            }
+        }
+
+#if SINGULARITY_KERNEL
+        public static bool QueryPerformanceCounter(out long lpPerformanceCount)
+        {
+            lpPerformanceCount = unchecked((long)Processor.CycleCount);
+            return true;
+        }
+
+        public static bool QueryPerformanceFrequency(out long lpFrequency)
+        {
+            lpFrequency = unchecked((long)Processor.CyclesPerSecond);
+            return true;
+        }
+#elif SINGULARITY_PROCESS
+        public static bool QueryPerformanceCounter(out long lpPerformanceCount)
+        {
+            lpPerformanceCount = unchecked((long)ProcessService.GetCycleCount());
+            return true;
+        }
+
+        public static bool QueryPerformanceFrequency(out long lpFrequency)
+        {
+            lpFrequency = unchecked((long)ProcessService.GetCyclesPerSecond());
+            return true;
+        }
+#else // not SINGULARITY
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        public static extern bool QueryPerformanceCounter(
+            out long lpPerformanceCount);
+
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        public static extern bool QueryPerformanceFrequency(
+            out long lpFrequency);
+
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        public static extern bool GetThreadTimes(
+            UIntPtr hThread,
+            out long lpCreationTime,
+            out long lpExitTime,
+            out long lpKernelTime,
+            out long lpUserTime
+            );
+#endif
+
+        /// <summary>
+        /// The number of counter values per microsecond.
+        /// </summary>
+        public static long CounterFrequency;
+
+        /// <summary>
+        /// The counter value at the initialization of statistics.
+        /// </summary>
+        public static long StartCount;
+
+        /// <summary>
+        /// Initialize the statistics information
+        /// </summary>
+        public static void Initialize() {
+#if ENABLED
+            bool ok = QueryPerformanceFrequency(out CounterFrequency);
+            VTable.Assert(CounterFrequency > 0);
+            VTable.Assert(ok);
+            StartCount = PerformanceCounter;
+#endif
+        }
+
+        /// <summary>
+        /// Print out a summary
+        /// </summary>
+        public static void Summary() {
+
+        }
+
+        /// <summary>
+        /// A GC event.
+        /// </summary>
+        [Inline]
+        public static void Event(GCEvent ev) {
+            Event(ev, -1);
+        }
+
+        /// <summary>
+        /// A GC event.
+        /// </summary>
+        [Inline]
+        public static void Event(GCEvent ev, long val) {
+#if ENABLED
+            long time = ((PerformanceCounter - StartCount) * 1000000
+                         / CounterFrequency);
+
+            LogEntry le;
+
+            le.TimeStamp = time;
+            le.ThreadTime = 0;
+            le.Event = ev;
+            le.Data = val;
+
+            Log(le);
+#endif
+        }
+
+        private static SpinLock hack;
+        private static void Log(LogEntry le) {
+#if SINGULARITY
+            Tracing.Log(Tracing.Audit,
+                        EventToFormatString(le.Event),
+                        unchecked((UIntPtr)(uint)le.Data));
+#endif
+#if DONT
+            Thread t = Thread.CurrentThread;
+            VTable.DebugPrint("#GCEVENT Thread {0}: {1}, {2}, {3}\n",
+                              __arglist(t.threadIndex,
+                                        EventToString(le.Event),
+                                        le.TimeStamp,
+                                        le.Data));
+#endif
+        }
+
+
+        private struct LogEntry {
+            public GCEvent Event;
+            public long TimeStamp;
+            public long ThreadTime;
+            public long Data;
+        }
+    }
+}
diff --git a/base/Kernel/Bartok/GCs/ConcurrentMSCollector.cs b/base/Kernel/Bartok/GCs/ConcurrentMSCollector.cs
new file mode 100644
index 0000000..667eb4f
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/ConcurrentMSCollector.cs
@@ -0,0 +1,1086 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define OVERLAPPING_PHASES
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+#if SINGULARITY_PROCESS
+    using Microsoft.Singularity.V1.Services; // Used for timing, only
+#elif SINGULARITY_KERNEL
+    using Microsoft.Singularity.Scheduling;
+    using Microsoft.Singularity.X86;
+#endif
+#endif
+
+    /// <summary>
+    /// This class implements a semi-concurrent version of MarkSweep.
+    ///
+    /// The goal for this collector is to perform as much of the processing
+    /// as possible during mutator time, and also have a fixed upper bound
+    /// on pause times.
+    ///
+    /// Additionally, the collector will be required in the future to
+    /// communicate with the scheduler to prevent real time applications
+    /// from competing with the GC.
+    ///
+    ///
+    /// BUGBUG: NEED TO REPLICATE THE ALLOCATION COLOR LOGIC TO THE INLINED
+    ///         ALLOCATION SEQUENCE. [T-DANIF 12/3/2004]
+    /// </summary>
+
+    [NoCCtor]
+    [RequiredByBartok]
+    internal class ConcurrentMSCollector: BaseCollector
+    {
+
+        internal enum MarkingPhase {
+            Dummy,              // Not used!
+            Idle,               // No marking is occurring
+            Requested,          // No marking, but will be soon
+            ComputingRoots,     // Marking the roots
+            Tracing,            // Tracing gray objects
+        }
+
+        internal enum ReclamationPhase {
+            Dummy,              // Not used!
+            Idle,               // No reclamation is in progress
+            Reclaiming,         // Reclamation is in progress
+        }
+
+        internal static MarkingPhase CurrentMarkingPhase {
+            get { return (MarkingPhase) currentMarkingPhase; }
+            set { currentMarkingPhase = (int) value; }
+        }
+
+        internal static int currentMarkingPhase;
+
+        internal static ReclamationPhase CurrentReclamationPhase;
+
+#if SINGULARITY
+        private static TimeSpan infiniteWait;
+#else
+        private static int infiniteWait;
+#endif
+
+        /// <summary>
+        /// Current mark state. This is flipped between collections.
+        /// </summary>
+        internal static UIntPtr markedColor;
+        internal static UIntPtr unmarkedColor;
+        internal static UIntPtr reclamationColor;
+
+        private const uint markOne = 1U;
+        private const uint markTwo = 2U;
+        private const uint markThree = 3U;
+
+        /// <summary>
+        /// Amount of memory to allocate between collections.
+        /// BUGBUG: This heuristic is not very good for CMS.
+        /// </summary>
+        private static UIntPtr collectionTrigger;
+
+        internal static ConcurrentMSCollector instance;
+
+        // Pointer visitors used for marking, etc
+        private static MarkReferenceVisitor markReferenceVisitor;
+        private static UpdateReferenceVisitor updateReferenceVisitor;
+        private static StackMarkReferenceVisitor stackMarkReferenceVisitor;
+
+        // Object visitors used for sweeping, etc
+        private static SweepVisitor sweepVisitor;
+
+        // Which threads are in what marking stage?
+        private static UIntPtr[] threadColor;
+
+        // Threads waiting for a particular collection to finish
+        private static int[] waitingThreads;
+        private static int firstWaitingThread;
+        private const int waitingThreadsNullValue = -1;
+        private const int waitingThreadsUnusedValue = -2;
+
+        private const uint noColor = 0xffffffff;
+
+        // The threads that performs the collection work
+        private static Thread markThread;
+        private static Thread workerThread1;
+        private static Thread workerThread2;
+
+        private static AutoResetEvent sweepPhaseMutex;
+
+        /// <summary>
+        /// Does this collector compute a root set with threads running?
+        /// </summary>
+        internal override bool IsOnTheFlyCollector {
+            get {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Initialise the collector and allow allocations to commence.
+        /// </summary>
+        [PreInitRefCounts]
+        public static void Initialize() {
+            GC.Initialize();
+            SegregatedFreeList.Initialize();
+            unmarkedColor = (UIntPtr) markOne;
+            markedColor = (UIntPtr) markTwo;
+            reclamationColor = (UIntPtr) markThree;
+            // instance = new ConcurrentMSCollector();
+            ConcurrentMSCollector.instance = (ConcurrentMSCollector)
+                BootstrapMemory.Allocate(typeof(ConcurrentMSCollector));
+            // markReferenceVisitor = new MarkReferenceVisitor();
+            markReferenceVisitor = (MarkReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(MarkReferenceVisitor));
+            // updateReferenceVisitor = new UpdateReferenceVisitor();
+            updateReferenceVisitor = (UpdateReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(UpdateReferenceVisitor));
+            // stackMarkReferenceVisitor = new StackMarkReferenceVisitor();
+            stackMarkReferenceVisitor = (StackMarkReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(StackMarkReferenceVisitor));
+            // sweepVisitor = new SweepVisitor();
+            sweepVisitor = (SweepVisitor)
+                BootstrapMemory.Allocate(typeof(SweepVisitor));
+            // threadColor = new UIntPtr[Thread.maxThreads];
+            threadColor = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), Thread.maxThreads);
+            for (int i = 0; i < threadColor.Length; i++) {
+                threadColor[i] = (UIntPtr) noColor;
+            }
+            collectionTrigger = (UIntPtr) (1 << 24);
+            CurrentMarkingPhase = MarkingPhase.Idle;
+            CurrentReclamationPhase = ReclamationPhase.Idle;
+#if SINGULARITY
+            infiniteWait = TimeSpan.Infinite;
+#else
+            infiniteWait = Timeout.Infinite;
+#endif
+        }
+
+        /// <summary>
+        /// Perform a collection. Depending on the current phase of collection
+        /// this method will either:
+        ///
+        ///     1. Start a new collection and schedule the mark thread
+        ///     2. Notice that a collection is underway and exit
+        ///     3. Clean up after a collection
+        ///
+        /// BUGBUG: The interaction between the collector needs work!
+        /// </summary>
+        internal override void Collect(int currentThreadIndex,
+                                       int generation)
+        {
+            if (Transitions.HasGCRequest(currentThreadIndex)) {
+                // We are GC safe, so we may do this
+                Transitions.TakeDormantControlNoGC(currentThreadIndex);
+                if (Transitions.TakeGCControl(currentThreadIndex)) {
+                    MutatorHandshake(currentThreadIndex);
+                    Transitions.ReleaseGCControl(currentThreadIndex);
+                    Thread.SignalGCEvent(markThread.threadIndex);
+                }
+                Transitions.TakeMutatorControlNoGC(currentThreadIndex);
+            } else {
+                if (generation >= 0) {
+                    AddThreadToWaitList(currentThreadIndex);
+                }
+                AddCollectionRequest();
+                if (generation >= 0) {
+                    Thread currentThread =
+                        Thread.threadTable[currentThreadIndex];
+                    while (ThreadIsWaiting(currentThreadIndex)) {
+                        currentThread.WaitForEvent(infiniteWait);
+                    }
+                }
+            }
+        }
+
+        internal override void CheckForNeededGCWork(Thread currentThread) {
+            if (Transitions.HasGCRequest(currentThread.threadIndex)) {
+                GC.InvokeCollection(currentThread);
+            }
+        }
+
+        private static void CollectorHandshake(Thread collectorThread)
+        {
+            Transitions.MakeGCRequests(collectorThread.threadIndex);
+            // Handshake with all the (other) threads.
+            for(int i=0; i < Thread.threadTable.Length; i++) {
+#if SINGULARITY_KERNEL
+                if (Scheduler.IsIdleThread(i)) {
+                    continue;
+                }
+#endif
+                // Is there an unscanned thread here?
+                while (Transitions.HasGCRequest(i)) {
+                    if (Transitions.TakeGCControl(i)) {
+                        MutatorHandshake(i);
+                        Transitions.ReleaseGCControl(i);
+                        Thread.SignalGCEvent(i);
+                    } else if (Thread.threadTable[i] == null) {
+                        // The thread must have terminated but the
+                        // state hasn't yet changed to DormantState.
+                        break;
+                    } else {
+                        Thread.WaitForGCEvent(collectorThread.threadIndex);
+                    }
+                }
+            }
+
+            if (CurrentMarkingPhase == MarkingPhase.ComputingRoots &&
+                !WriteBarrierCMS.InSnoopingPhase) {
+                MultiUseWord.CollectFromPreviousCollections(false);
+            }
+        }
+
+        private static void MutatorHandshake(int threadIndex)
+        {
+            if (CurrentMarkingPhase == MarkingPhase.ComputingRoots &&
+                !WriteBarrierCMS.InSnoopingPhase) {
+                Thread thread = Thread.threadTable[threadIndex];
+                if (thread != null) {
+                    ScanThreadRoots(thread);
+                    MultiUseWord.CollectFromThread(thread);
+                }
+            }
+        }
+
+        private static void ScanThreadRoots(Thread thread) {
+            long start = CollectorStatistics.PerformanceCounter;
+            CollectorStatistics.Event(GCEvent.StackScanStart,
+                                      thread.threadIndex);
+            CallStack.ScanStack(thread, stackMarkReferenceVisitor,
+                                stackMarkReferenceVisitor);
+            threadColor[thread.threadIndex] = markedColor;
+            // Report the pause
+            long pause =
+                CollectorStatistics.PerformanceCounter - start;
+            CollectorStatistics.Event(GCEvent.StackScanComplete,
+                                      pause);
+        }
+
+        private static bool terminateCollectorThreads;
+
+        private static void TraceThreadNotification() {
+            terminateCollectorThreads = true;
+            GC.Collect();
+        }
+
+        /// <summary>
+        /// This method is run by the collector threads.
+        /// </summary>
+        private static void CollectionLoop() {
+            Thread currentThread = Thread.CurrentThread;
+#if SINGULARITY_PROCESS
+            currentThread.MakeServiceThread(new Thread.StopServiceNotice(TraceThreadNotification));
+#endif
+            while (!terminateCollectorThreads) {
+                // Wait to be told to start working.
+                while (!TakeChargeOfTraceRequest()) {
+                    currentThread.WaitForEvent(infiniteWait);
+                }
+#if SINGULARITY
+#if DEBUG
+                DebugStub.WriteLine("~~~~~ Start Concurrent Marking  [data={0:x8}, pid={1:x3}]",
+                                    __arglist(SegregatedFreeList.TotalBytes,
+                                              PageTable.processTag >> 16));
+#endif
+                int startTicks = Environment.TickCount;
+#endif
+                markThread = currentThread;
+                advanceMarkColors();
+                // Construct the root set.
+                CollectorStatistics.Event(GCEvent.ComputeRootSet);
+                StartRootMarkingPhase();
+                WriteBarrierCMS.EnterSnoopingPhase();
+                // Start the process of recycling pages
+                SegregatedFreeList.RecycleGlobalPagesPhase1();
+                // One handshake to ensure that everyone starts snooping
+                CollectorHandshake(currentThread);
+                // Complete the process of recycling pages
+                SegregatedFreeList.RecycleGlobalPagesPhase2();
+                // Another handshake to ensure that all updates started by
+                // other threads prior to their handshake are done and
+                // snooping will affect all new updates.
+                CollectorHandshake(currentThread);
+                WriteBarrierCMS.LeaveSnoopingPhase();
+                ScanThreadRoots(currentThread);
+                // A third handshake to get the threads to process their
+                // own roots.
+                CollectorHandshake(currentThread);
+                Finalizer.PrepareCollectFinalizers();
+                Thread.VisitBootstrapData(markReferenceVisitor);
+#if SINGULARITY_KERNEL
+                Kernel.VisitSpecialData(markReferenceVisitor);
+#endif
+                MultiUseWord.VisitStrongRefs(markReferenceVisitor,
+                                             false /* Don't use shadows */);
+#if !VC
+                TryAllManager.VisitStrongRefs(markReferenceVisitor);
+#endif
+                StaticData.ScanStaticData(markReferenceVisitor);
+                CollectorStatistics.Event(GCEvent.RootSetComputed);
+                int waitingThreadList = StealWaitingThreadsList();
+                // We are now in the concurrent tracing phase.
+                ResetCollectorRequests();
+                StartTracingPhase();
+                CollectorStatistics.Event(GCEvent.TraceStart,
+                                          ReservedMemory);
+                // Trace live objects from the root set.
+                markReferenceVisitor.ProcessScheduledObjects();
+                CollectorStatistics.Event(GCEvent.TraceSpecial);
+                // Mark weak references that do not track resurrection as dead.
+                WeakReference.Process(updateReferenceVisitor, true, true);
+                // Resurrect any finalization candidates.
+                Finalizer.ResurrectCandidates(updateReferenceVisitor,
+                                              markReferenceVisitor, true);
+                // Complete closure from finalized objects.
+                markReferenceVisitor.ProcessScheduledObjects();
+                // Mark appropriate weak references as dead
+                WeakReference.Process(updateReferenceVisitor, true, false);
+                MultiUseWord.VisitWeakRefs(updateReferenceVisitor,
+                                           false /* Don't use shadows */);
+#if !VC
+                TryAllManager.VisitWeakRefs(updateReferenceVisitor);
+#endif
+                MultiUseWord.PostGCHook();
+                // Reset thread queues.  They should all be empty.
+                markReferenceVisitor.Cleanup();
+#if SINGULARITY
+#if DEBUG
+                int middleTicks = Environment.TickCount;
+                DebugStub.WriteLine("~~~~~ Finish Concurrent Marking [data={0:x8}, pid={1:x3} ms={2:d6}]",
+                                    __arglist(SegregatedFreeList.TotalBytes,
+                                              PageTable.processTag >> 16,
+                                              middleTicks - startTicks));
+#endif
+#endif
+                    
+                markThread = nextWorkerThread(currentThread);
+                sweepPhaseMutex.WaitOne();
+                try {
+                    reclamationColor = unmarkedColor;
+                    FinishTracingPhase();
+                    SatisfyCollectorRequest(); // May start another trace phase
+                    // Sweep garbage objects
+                    StartReclamationPhase();
+                    CollectorStatistics.Event(GCEvent.SweepStart,
+                                              ReservedMemory);
+                    Sweep();
+                    // Clean up after the collection
+                    CollectorStatistics.Event(GCEvent.SweepSpecial,
+                                              ReservedMemory);
+                    Finalizer.ReleaseCollectFinalizers();
+                    CollectorStatistics.Event(GCEvent.SweepPreCommit,
+                                              ReservedMemory);
+                    // Commit accounting changes
+                    CommitSweep();
+                    CollectorStatistics.Event(GCEvent.CollectionComplete,
+                                              ReservedMemory);
+                    // TODO: Determine a new collection trigger?
+                    SignalWaitingThreads(waitingThreadList);
+                    FinishReclamationPhase();
+                } finally {
+                    sweepPhaseMutex.Set();
+                }
+#if SINGULARITY
+#if DEBUG
+                int endTicks = Environment.TickCount;
+                DebugStub.WriteLine("~~~~~ Finish Concurrent Reclamation [data={0:x8}, pid={1:x3} ms={2:d6}]",
+                                    __arglist(ReservedMemory,
+                                              PageTable.processTag >> 16,
+                                              endTicks - middleTicks));
+#endif
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Allocate memory for a new object, potentially triggering a
+        /// collection.
+        /// </summary>
+        [Inline]
+        internal override UIntPtr AllocateObjectMemory(UIntPtr numBytes,
+                                                       uint alignment,
+                                                       Thread currentThread)
+        {
+            UIntPtr resultAddr =
+                SegregatedFreeList.AllocateFast(currentThread,
+                                                numBytes, alignment);
+            if (resultAddr == UIntPtr.Zero) {
+                resultAddr = AllocateObjectMemorySlow(numBytes, alignment,
+                                                      currentThread);
+            }
+            return resultAddr;
+        }
+
+        [NoInline]
+        private UIntPtr AllocateObjectMemorySlow(UIntPtr numBytes,
+                                                 uint alignment,
+                                                 Thread currentThread)
+        {
+            if (GC.newBytesSinceGC > collectionTrigger) {
+                if (CurrentMarkingPhase == MarkingPhase.Idle ||
+                    Transitions.HasGCRequest(currentThread.threadIndex)) {
+                    GC.InvokeCollection(currentThread);
+                } else if (GC.newBytesSinceGC > (collectionTrigger<<1)) {
+                    // Slow down the allocating thread a bit
+                    Thread.Yield();
+                }
+            }
+            return SegregatedFreeList.AllocateSlow(currentThread,
+                                                   numBytes, alignment);
+        }
+
+        [Inline]
+        protected override void CreateObject(Object obj, VTable vtable,
+                                             Thread currentThread)
+        {
+            // We expect the color to be assigned before the vtable field
+            // is initialized.  This ensures that every real object has a
+            // valid color.
+            UIntPtr markBits = threadColor[currentThread.threadIndex];
+            ThreadHeaderQueue.SetGcMark(obj, markBits);
+            // The vtable field must be initialized before the object is
+            // inserted into a list of objects to be scanned.
+            base.CreateObject(obj, vtable, currentThread);
+            // If necessary, mark the object for future scanning
+            if (CurrentMarkingPhase == MarkingPhase.ComputingRoots &&
+                Transitions.HasGCRequest(currentThread.threadIndex)) {
+                ThreadHeaderQueue.PushUnsafe(currentThread, obj, markBits);
+            }
+        }
+
+        /// <summary>
+        /// Return the generation for an object. We only have one
+        /// generation so we always return generation zero.
+        /// </summary>
+        internal override int GetGeneration(Object obj) {
+            Verifier.genericObjectVisitor.Visit(obj);
+            return MinGeneration;
+        }
+
+        /// <summary>
+        /// The maximum generation. For MarkSweep this is generation zero.
+        /// </summary>
+        internal override int MaxGeneration {
+            get { return (int)PageType.Owner0; }
+        }
+
+        /// <summary>
+        /// The minimum generation. For MarkSweep this is generation zero.
+        /// </summary>
+        internal override int MinGeneration {
+            get { return (int)PageType.Owner0; }
+        }
+
+        /// <summary>
+        /// This returns the total amount of memory that is allocated within
+        /// the collected heap.
+        /// </summary>
+        internal override long TotalMemory {
+            get {
+                return ReservedMemory;
+            }
+        }
+
+        private static long ReservedMemory {
+            get {
+                return (long)SegregatedFreeList.TotalBytes;
+            }
+        }
+
+        internal override void EnableHeap() {
+            // waitingThreads = new int[Thread.maxThreads]
+            waitingThreads = new int[Thread.maxThreads];
+            for (int i = 0; i < waitingThreads.Length; i++) {
+                waitingThreads[i] = waitingThreadsUnusedValue;
+            }
+            firstWaitingThread = -1;
+            // Construct the collector thread(s)
+#if SINGULARITY_KERNEL
+            workerThread1 =
+                Thread.CreateThread(Process.kernelProcess,
+                                    new ThreadStart(CollectionLoop));
+            workerThread2 =
+                Thread.CreateThread(Process.kernelProcess,
+                                    new ThreadStart(CollectionLoop));
+#else
+            workerThread1 = new Thread(new ThreadStart(CollectionLoop));
+            workerThread2 = new Thread(new ThreadStart(CollectionLoop));
+#endif
+            workerThread1.Start();
+            workerThread2.Start();
+            markThread = workerThread1;
+            sweepPhaseMutex = new AutoResetEvent(true);
+        }
+
+        /// <summary>
+        /// Destroy the heap. Nothing to do here.
+        /// </summary>
+        internal override void DestructHeap() {
+            // Do nothing
+            while (CurrentMarkingPhase != MarkingPhase.Idle &&
+                   CurrentReclamationPhase != ReclamationPhase.Idle) {
+                Thread.Yield();
+            }
+        }
+
+        /// <summary>
+        /// Verify the heap.
+        /// </summary>
+        internal override void VerifyHeap(bool beforeCollection) {
+            SegregatedFreeList.VisitAllObjects(VerifyVisitor.visitor);
+            Verifier.segregatedFreeListVerifier.VerifyHeap();
+        }
+
+        private static char ToHexDigit(int number, int position) {
+            int digit = (number >> (position * 4)) & 0xf;
+            return (char) (digit + ((digit <= 9) ? '0' : ('A' - 10)));
+        }
+        private static int flag; // = 0;
+        private static void DebugTrace(String text, int threadIndex) {
+            while (Interlocked.CompareExchange(ref flag, 1, 0) != 0) { }
+            VTable.DebugPrint(text+" "+
+                              ToHexDigit(threadIndex, 2)+
+                              ToHexDigit(threadIndex, 1)+
+                              ToHexDigit(threadIndex, 0)+
+                              "\n");
+            Interlocked.Exchange(ref flag, 0);
+        }
+
+        /// Routines to keep track of requests for collection work
+
+        private static int collectorStack; // 0:idle, 1:work, 2+:work+pending
+
+        private static void AddCollectionRequest() {
+            int stackHeight = Interlocked.Increment(ref collectorStack);
+            VTable.Assert(stackHeight > 0);
+            if (stackHeight == 1) {
+                MakeTraceRequest();
+            }
+        }
+
+        private static void ResetCollectorRequests() {
+            Interlocked.Exchange(ref collectorStack, 1);
+        }
+
+        private static void SatisfyCollectorRequest() {
+            int stackHeight = Interlocked.Decrement(ref collectorStack);
+            VTable.Assert(stackHeight >= 0);
+            if (stackHeight > 0 ) {
+                MakeTraceRequest();
+            }
+        }
+
+        /// Routines to control the commencement of the tracing phase
+
+        private static void MakeTraceRequest() {
+            CurrentMarkingPhase = MarkingPhase.Requested;
+            markThread.SignalEvent();
+        }
+
+        private static bool TakeChargeOfTraceRequest() {
+            return
+                (Interlocked.CompareExchange(ref currentMarkingPhase,
+                                             (int) MarkingPhase.ComputingRoots,
+                                             (int) MarkingPhase.Requested) ==
+                 (int) MarkingPhase.Requested);
+        }
+
+        /// Routines to keep track of threads that must be notified when
+        /// a collection has been completed.
+
+        private static void AddThreadToWaitList(int threadIndex) {
+            int listHead = firstWaitingThread;
+            waitingThreads[threadIndex] = listHead;
+            while (Interlocked.CompareExchange(ref firstWaitingThread,
+                                               threadIndex, listHead) !=
+                   listHead) {
+                listHead = firstWaitingThread;
+                waitingThreads[threadIndex] = listHead;
+            }
+        }
+
+        private static bool ThreadIsWaiting(int threadIndex) {
+            return (waitingThreads[threadIndex] != waitingThreadsUnusedValue);
+        }
+
+        private static int StealWaitingThreadsList() {
+            return Interlocked.Exchange(ref firstWaitingThread,
+                                        waitingThreadsNullValue);
+        }
+
+        private static void SignalWaitingThreads(int listHead) {
+            while (listHead != waitingThreadsNullValue) {
+                int threadIndex = listHead;
+                listHead = waitingThreads[threadIndex];
+                waitingThreads[threadIndex] = waitingThreadsUnusedValue;
+                Thread.threadTable[threadIndex].SignalEvent();
+            }
+        }
+
+        // Routines to keep track of what phases the collector threads are in.
+
+        private static void StartRootMarkingPhase() {
+            CurrentMarkingPhase = MarkingPhase.ComputingRoots;
+        }
+
+        private static void StartTracingPhase() {
+            CurrentMarkingPhase = MarkingPhase.Tracing;
+        }
+
+        private static void FinishTracingPhase() {
+            CurrentMarkingPhase = MarkingPhase.Idle;
+        }
+
+        private static void StartReclamationPhase() {
+            CurrentReclamationPhase = ReclamationPhase.Reclaiming;
+        }
+
+        private static void FinishReclamationPhase() {
+            CurrentReclamationPhase = ReclamationPhase.Idle;
+        }
+
+        // Routines to manage marking colors
+
+        private static void advanceMarkColors()
+        {
+            unmarkedColor = markedColor;
+            markedColor = nextColor(markedColor);
+        }
+
+        private static UIntPtr nextColor(UIntPtr originalColor)
+        {
+            switch ((uint) originalColor) {
+              case markOne: return (UIntPtr) markTwo;
+              case markTwo: return (UIntPtr) markThree;
+              case markThree: return (UIntPtr) markOne;
+              default: throw new Exception("advanceColor failure!");
+            }
+        }
+
+        private static Thread nextWorkerThread(Thread currentThread) {
+#if OVERLAPPING_PHASES
+            return ((currentThread == workerThread1) ?
+                    workerThread2 :
+                    workerThread1);
+#else
+            return currentThread;
+#endif
+        }
+
+        /// <summary>
+        /// Walk the allocation structures and reclaim any free cells.
+        /// </summary>
+        private static void Sweep() {
+            SegregatedFreeList.VisitAllObjects(sweepVisitor);
+        }
+
+        /// <summary>
+        /// Update alloc heap to account for data just freed.
+        /// </summary>
+        private static void CommitSweep() {
+            SegregatedFreeList.CommitFreedData();
+        }
+
+        /// <summary>
+        /// Routines for updating pointers to new locations of marked objects
+        /// No objects are resurrected using this mechanism.
+        /// As this is mark sweep the value does not need to be updated.
+        /// </summary>
+        private class UpdateReferenceVisitor: NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert((PageTable.IsNonGcPage(pageType) &&
+                                   PageTable.IsMyPage(page)) ||
+                                  PageTable.IsStackPage(pageType),
+                                  "update.visit invalid page");
+                    return;
+                }
+                VTable.Assert(PageTable.IsMyPage(page));
+                Object obj = Magic.fromAddress(addr);
+                if (ThreadHeaderQueue.GcMark(obj) == unmarkedColor) {
+                    // The object was not live
+                    *loc = UIntPtr.Zero;
+                }
+                VTable.Assert(obj.vtable != null, "update.visit null vtable");
+            }
+        }
+
+        /// <summary>
+        /// Select the generation to collect (always generation 0)
+        /// </summary>
+        internal override int CollectionGeneration(int genRequest) {
+            return MinGeneration;
+        }
+
+
+        /// <summary>
+        /// This visitor is the core of the tracing functionality.
+        /// It builds up a buffer of references (the root set), and
+        /// then at a later point the tracing thread processes these
+        /// buffers.
+        /// </summary>
+        private class MarkReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            /// <summary>
+            /// Visit an object reference.
+            /// </summary>
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                if (addr == UIntPtr.Zero) return;
+                VisitValue(addr);
+            }
+
+
+            public void VisitValue(UIntPtr addr) {
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert((PageTable.IsNonGcPage(pageType) &&
+                                   PageTable.IsMyPage(page)) ||
+                                  PageTable.IsStackPage(pageType),
+                                  "value.visit invalid page");
+                    return;
+                }
+                VTable.Assert(PageTable.IsMyPage(page));
+                Object obj = Magic.fromAddress(addr);
+                VTable.Assert(obj.vtable != null,
+                              "value.visit null vtable");
+                WriteBarrierCMS.MarkObject(obj);
+            }
+
+            /// <summary>
+            /// Process all marked objects from queues stored in
+            /// thread objects.
+            /// </summary>
+            public void ProcessScheduledObjects() {
+                Thread currentThread = Thread.CurrentThread;
+                StealWork();
+                do {
+                    while (!ThreadHeaderQueue.IsEmpty(currentThread)) {
+                        // Pop the next value
+                        Object obj =
+                            ThreadHeaderQueue.Pop(currentThread, markedColor);
+                        // Visit Fields
+                        this.VisitReferenceFields(obj);
+                    }
+                } while (StealWork());
+            }
+
+            /// <summary>
+            /// Look through other threads and see if any have some values on
+            /// their queues that we can steal.
+            /// </summary>
+            private bool StealWork() {
+                Thread[] threadTable = Thread.threadTable;
+                Thread me = Thread.CurrentThread;
+                bool foundWork = false;
+                // Attempt to steal work from live threads
+                for (int i = 0; i < threadTable.Length; i++) {
+                    Thread t = threadTable[i];
+                    if (t != null && t != me &&
+                        ThreadHeaderQueue.Steal(me, t, markedColor)) {
+                        foundWork = true;
+                    }
+                }
+                return foundWork;
+            }
+
+            /// <summary>
+            /// Clean up after processing all queues. This involves calling
+            /// reset on each thread's queue.
+            /// </summary>
+            internal void Cleanup() {
+                Thread[] threadTable = Thread.threadTable;
+                for (int i = 0; i < threadTable.Length; i++) {
+                    Thread t = threadTable[i];
+                    if (t != null) {
+                        if (!ThreadHeaderQueue.IsEmpty(t)) {
+                            // The queues may contain new objects allocated
+                            // during the root-set computation phase but added
+                            // to the queue after the scanning has completed.
+                            // This is benign and we can clear the queues.
+                            do {
+                                Object head =
+                                    ThreadHeaderQueue.Pop(t, markedColor);
+                                VTable.Assert(ThreadHeaderQueue.GcMark(head) ==
+                                              markedColor);
+                            } while (!ThreadHeaderQueue.IsEmpty(t));
+                        }
+                        ThreadHeaderQueue.Reset(t);
+                    }
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// This class maps an interior pointer back to the containing object
+        /// pointer and then passes it on to the object marking visitor.
+        /// </summary>
+        private class StackMarkReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            /// <summary>
+            /// Visit an interior pointer stored in loc.
+            /// </summary>
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert((PageTable.IsNonGcPage(pageType) &&
+                                   PageTable.IsMyPage(page)) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType),
+                                  "interior.visit invalid page");
+                    return;
+                }
+                UIntPtr realPtr = SegregatedFreeList.Find(addr);
+                VTable.Assert(Magic.fromAddress(realPtr).vtable != null,
+                              "interior.visit null vtable");
+                markReferenceVisitor.VisitValue(realPtr);
+            }
+
+        }
+
+
+        /// <summary>
+        /// This class is used to visit every small object, determine if it
+        /// is marked and free it if not.
+        /// </summary>
+        private class SweepVisitor : SegregatedFreeList.ObjectVisitor
+        {
+
+            private SegregatedFreeList.TempList tempList;
+
+            internal override void VisitSmall(Object obj, UIntPtr memAddr)
+            {
+                if (ThreadHeaderQueue.GcMark(obj) == reclamationColor) {
+                    // Not marked.
+                    tempList.Add(memAddr);
+                }
+            }
+
+            internal override void VisitSmallPageEnd() {
+                SegregatedFreeList.FreeSmallList(ref tempList);
+            }
+
+            internal override UIntPtr VisitLarge(Object obj)
+            {
+                UIntPtr objectSize = ObjectLayout.Sizeof(obj);
+                if (ThreadHeaderQueue.GcMark(obj) == reclamationColor) {
+                    // Not marked.
+                    SegregatedFreeList.FreeLarge(obj);
+                }
+                return objectSize;
+            }
+
+        }
+
+        /// <summary>
+        /// Find the object address for a given interior pointer.
+        /// </summary>
+        internal override UIntPtr FindObjectAddr(UIntPtr interiorPtr) {
+            return SegregatedFreeList.Find(interiorPtr);
+        }
+
+        /// <summary>
+        /// Visit all objects in the heap with a specified visitor.
+        /// </summary>
+        internal override
+        void VisitObjects(ObjectLayout.ObjectVisitor objectVisitor,
+                          UIntPtr lowAddr, UIntPtr highAddr)
+        {
+            VTable.Assert(PageTable.PageAligned(lowAddr),
+                          "low not page aligned");
+            VTable.Assert(PageTable.PageAligned(highAddr),
+                          "high not page aligned");
+            UIntPtr lowPage = PageTable.Page(lowAddr);
+            UIntPtr highPage = PageTable.Page(highAddr);
+            SegregatedFreeList.VisitObjects(lowPage, highPage, objectVisitor);
+        }
+
+        /// <summary>
+        /// A new thread has been created, set any allocator/collector state.
+        /// </summary>
+        internal override void NewThreadNotification(Thread newThread,
+                                                     bool initial)
+        {
+            base.NewThreadNotification(newThread, initial);
+            threadColor[newThread.threadIndex] = markedColor;
+            ThreadHeaderQueue.Reset(newThread);
+            SegregatedFreeList.NewThreadNotification(newThread, initial);
+            if (CurrentMarkingPhase == MarkingPhase.ComputingRoots) {
+                Transitions.MakeGCRequest(newThread.threadIndex);
+            }
+        }
+
+        internal override void DeadThreadNotification(Thread deadThread)
+        {
+            MultiUseWord.CollectFromThread(deadThread);
+            SegregatedFreeList.DeadThreadNotification(deadThread);
+            ThreadHeaderQueue.DeadThreadNotification(deadThread, markedColor);
+            threadColor[deadThread.threadIndex] = (UIntPtr) noColor;
+            base.DeadThreadNotification(deadThread);
+        }
+
+        internal override void ThreadStartNotification(int currentThreadIndex)
+        {
+            base.ThreadStartNotification(currentThreadIndex);
+            threadColor[currentThreadIndex] = markedColor;
+            if (CurrentMarkingPhase == MarkingPhase.ComputingRoots) {
+                Transitions.MakeGCRequest(currentThreadIndex);
+            }
+        }
+
+        internal override void ThreadDormantGCNotification(int threadIndex) {
+            // We could scan our own stack, but instead we try to get
+            // some work done while the Trace thread scans our stack.
+            Thread.SignalGCEvent(markThread.threadIndex);
+        }
+
+        /// <summary>
+        /// This class is used to verify that there are no dangling pointers.
+        /// </summary>
+        private class VerifyVisitor : SegregatedFreeList.ObjectVisitor
+        {
+
+            internal static VerifyVisitor visitor = new VerifyVisitor();
+
+            internal override void VisitSmall(Object obj, UIntPtr memAddr) {
+                if (ThreadHeaderQueue.GcMark(obj) == markedColor) {
+                    VerifyMarkVisitor.visitor.VisitReferenceFields(obj);
+                } else {
+                    VTable.Assert(ThreadHeaderQueue.GcMark(obj) ==
+                                  unmarkedColor);
+                }
+            }
+
+            internal override UIntPtr VisitLarge(Object obj) {
+                UIntPtr size;
+                if (ThreadHeaderQueue.GcMark(obj) == markedColor) {
+                    // The object has the mark color, so it should only
+                    // reference other objects with the mark color.
+                    size = VerifyMarkVisitor.visitor.VisitReferenceFields(obj);
+                } else {
+                    VTable.Assert(ThreadHeaderQueue.GcMark(obj) ==
+                                  unmarkedColor);
+                    size = ObjectLayout.Sizeof(obj);
+                }
+                return size;
+            }
+
+        }
+
+        /// <summary>
+        /// This class is used to check that all the pointers within a marked
+        /// object point into other marked objects.
+        /// </summary>
+        private class VerifyMarkVisitor : NonNullReferenceVisitor
+        {
+
+            internal static VerifyMarkVisitor visitor
+                = new VerifyMarkVisitor();
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                UIntPtr page = PageTable.Page(addr);
+                if (PageTable.IsGcPage(page)) {
+                    Object obj = Magic.fromAddress(addr);
+
+                    VTable.Assert(ThreadHeaderQueue.GcMark(obj) == markedColor,
+                                  "dangling pointer!");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// This method loops through all non-null threads and asserts that
+        /// no thread has any work on its marking queue.
+        /// </summary>
+        private void VerifyEmptyQueues() {
+            Thread[] threadTable = Thread.threadTable;
+            for (int i = 0; i < threadTable.Length; i++) {
+                Thread t = threadTable[i];
+                if (t != null) {
+                    VTable.Assert(ThreadHeaderQueue.IsEmpty(t),
+                                  "Non-empty Queue!");
+                }
+            }
+        }
+
+        /// <summary>
+        /// This method walks through all objects in the heap to ensure
+        /// that no objects have values in their queue header field
+        /// </summary>
+        private void VerifyQueueHeaders() {
+            SegregatedFreeList.VisitAllObjects(VerifyHeaderVisitor.visitor);
+        }
+
+        /// <summary>
+        /// This visitor trivially asserts that the objects queue header
+        /// field is zero.
+        /// </summary>
+        private class VerifyHeaderVisitor : SegregatedFreeList.ObjectVisitor
+        {
+
+            internal static VerifyHeaderVisitor visitor
+                = new VerifyHeaderVisitor();
+
+            /// <summary>
+            /// Visit small objects, checking queue header.
+            /// </summary>
+            internal unsafe override void VisitSmall(Object obj,
+                                                     UIntPtr memAddr)
+            {
+                VTable.Deny(ThreadHeaderQueue.IsInQueue(obj),
+                            "Object in ThreadHeaderQueue");
+            }
+
+            internal override UIntPtr VisitLarge(Object obj) {
+                VTable.Deny(ThreadHeaderQueue.IsInQueue(obj),
+                            "Object in ThreadHeaderQueue");
+                return ObjectLayout.Sizeof(obj);
+            }
+
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/CopyScan.cs b/base/Kernel/Bartok/GCs/CopyScan.cs
new file mode 100644
index 0000000..bf3420a
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/CopyScan.cs
@@ -0,0 +1,405 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    internal abstract class CopyScan
+    {
+
+        protected PageType pageType;
+        protected BumpAllocator allocator;
+
+        internal virtual void Initialize(PageType pageType)
+        {
+            this.pageType = pageType;
+            this.allocator = new BumpAllocator(pageType);
+        }
+
+        internal abstract void Cleanup();
+
+        internal virtual void TruncateAllocationArea()
+        {
+            this.allocator.Truncate();
+        }
+
+        protected abstract bool HaveWork { get; }
+
+        protected abstract void AddWork(UIntPtr start, UIntPtr limit);
+
+        protected abstract UIntPtr GetWork(out UIntPtr value2);
+
+        internal Object Copy(Object obj)
+        {
+            UIntPtr size = ObjectLayout.Sizeof(obj);
+            if (GenerationalCollector.IsLargeObjectSize(size)) {
+                return CopyLarge(obj, size);
+            } else {
+                return CopySmall(obj, size);
+            }
+        }
+
+        private Object CopyLarge(Object obj, UIntPtr size)
+        {
+            // Don't copy large objects.
+            // Change the page type instead.
+            UIntPtr startAddr = Magic.addressOf(obj) - PreHeader.Size;
+            UIntPtr startPage = PageTable.Page(startAddr);
+            UIntPtr endPage = PageTable.Page(startAddr+size-1)+1;
+            VTable.Assert(this.pageType ==
+                          PageTable.ZombieToLive(PageTable.Type(startPage)));
+            PageTable.SetType(startPage, (endPage - startPage),
+                              this.pageType);
+            UIntPtr sizeOfPages = PageTable.PageSize * (endPage-startPage);
+            Trace.Log(Trace.Area.Pointer,
+                      "FwdRef: large object: {0} gen: {1} pagesize: {2}",
+                      __arglist(Magic.addressOf(obj), this.pageType,
+                                sizeOfPages));
+            GenerationalCollector.gcPromotedTable[(int)this.pageType-1] +=
+                sizeOfPages;
+            this.AddWork(startAddr, startAddr + size);
+            return obj;
+        }
+
+        private unsafe Object CopySmall(Object obj, UIntPtr size)
+        {
+            uint alignment = obj.vtable.baseAlignment;
+            UIntPtr newObjectAddr =
+                this.allocator.AllocateFast(size, alignment);
+            if (newObjectAddr == UIntPtr.Zero) {
+                int threadIndex = StopTheWorldCollector.collectorThreadIndex;
+                Thread thread = Thread.threadTable[threadIndex];
+                UIntPtr oldAllocNew = this.allocator.AllocNew;
+                newObjectAddr =
+                    this.allocator.AllocateSlow(size, alignment, thread);
+                UIntPtr allocNew = this.allocator.AllocNew;
+                if (oldAllocNew != allocNew) {
+                    UIntPtr limitPtr = this.allocator.ReserveLimit;
+                    this.NewAllocationRange(newObjectAddr, allocNew, limitPtr);
+                }
+            }
+            this.NewObject(newObjectAddr, size);
+            UIntPtr srcAddr = Magic.addressOf(obj) - PreHeader.Size;
+            UIntPtr dstAddr = newObjectAddr - PreHeader.Size;
+            Trace.Log(Trace.Area.Pointer,
+                      "FwdRef: {0} -> {1}, gen={2}, size={3}",
+                      __arglist(Magic.addressOf(obj), newObjectAddr,
+                                this.pageType, size));
+            VTable.Assert(this.pageType ==
+                          PageTable.Type(PageTable.Page(dstAddr)));
+            GenerationalCollector.gcPromotedTable[(int)this.pageType-1] +=
+                size;
+            Util.MemCopy(dstAddr, srcAddr, size);
+            *obj.VTableFieldAddr = newObjectAddr;
+            return Magic.fromAddress(newObjectAddr);
+        }
+
+        protected abstract void NewAllocationRange(UIntPtr objectAddr,
+                                                   UIntPtr rangeStart,
+                                                   UIntPtr rangeLimit);
+
+        protected abstract void NewObject(UIntPtr objAddr, UIntPtr size);
+
+        [Inline]
+        internal abstract bool Scan(NonNullReferenceVisitor visitor);
+
+    }
+
+    internal abstract class CopyScanQueue : CopyScan
+    {
+
+        private UIntPtrQueue workList;
+
+        internal override void Initialize(PageType pageType)
+        {
+            base.Initialize(pageType);
+            this.workList = new UIntPtrQueue();
+        }
+
+        protected override bool HaveWork{
+            get { return !this.workList.IsEmpty; }
+        }
+
+        protected override void AddWork(UIntPtr start, UIntPtr limit)
+        {
+            this.workList.Write(start, limit);
+        }
+
+        protected override UIntPtr GetWork(out UIntPtr value2)
+        {
+            return this.workList.Read(out value2);
+        }
+
+        internal override void Cleanup()
+        {
+            this.workList.Cleanup(false);
+        }
+
+    }
+        
+
+    internal abstract class CopyScanStack : CopyScan
+    {
+
+        private UIntPtrStack workList;
+
+        internal override void Initialize(PageType pageType)
+        {
+            base.Initialize(pageType);
+            this.workList = new UIntPtrStack();
+        }
+
+        protected override bool HaveWork {
+            get { return !this.workList.IsEmpty; }
+        }
+
+        protected override void AddWork(UIntPtr start, UIntPtr limit)
+        {
+            this.workList.Write(start, limit);
+        }
+
+        protected override UIntPtr GetWork(out UIntPtr value2)
+        {
+            return this.workList.Read(out value2);
+        }
+
+        internal override void Cleanup()
+        {
+            this.workList.Cleanup(false);
+        }
+
+    }
+        
+
+    internal class CheneyScan : CopyScanQueue
+    {
+
+        private UIntPtr destinationLow;
+        private UIntPtr destinationHigh;
+
+        protected override void NewAllocationRange(UIntPtr objectAddr,
+                                                   UIntPtr rangeStart,
+                                                   UIntPtr rangeLimit)
+        {
+            if (rangeStart != destinationHigh) {
+                // Switching to a new allocation range
+                if (destinationLow != destinationHigh) {
+                    this.AddWork(destinationLow, destinationHigh);
+                }
+                destinationLow = rangeStart;
+            }
+            destinationHigh = rangeLimit;
+        }
+
+        protected override void NewObject(UIntPtr objAddr, UIntPtr size)
+        {
+            // We don't need to do anything for individual objects
+        }
+
+        [Inline]
+        internal override bool Scan(NonNullReferenceVisitor visitor)
+        {
+            bool localRepeat = false;
+            bool globalRepeat = false;
+            while (true) {
+                while (this.HaveWork) {
+                    localRepeat = true;
+                    UIntPtr lowAddr, highAddr;
+                    lowAddr = this.GetWork(out highAddr);
+                    lowAddr += PreHeader.Size;
+                    lowAddr =
+                        BumpAllocator.SkipNonObjectData(lowAddr, highAddr);
+                    while (lowAddr < highAddr) {
+                        Object obj = Magic.fromAddress(lowAddr);
+                        lowAddr += visitor.VisitReferenceFields(obj);
+                        lowAddr =
+                            BumpAllocator.SkipNonObjectData(lowAddr, highAddr);
+                    }
+                }
+                if (this.destinationLow != this.allocator.AllocPtr) {
+                    localRepeat = true;
+                    UIntPtr lowAddr = this.destinationLow;
+                    UIntPtr highAddr = this.allocator.AllocPtr;
+                    this.destinationLow = highAddr;
+                    this.AddWork(lowAddr, highAddr);
+                }
+                if (!localRepeat) {
+                    // Exit the loop if we have done nothing this time around
+                    break;
+                }
+                globalRepeat = true;
+                localRepeat = false;
+            }
+            return globalRepeat;
+        }
+
+        internal override void Initialize(PageType pageType)
+        {
+            base.Initialize(pageType);
+            this.destinationLow = UIntPtr.Zero;
+            this.destinationHigh = UIntPtr.Zero;
+        }
+
+        internal override void Cleanup()
+        {
+            VTable.Assert(!this.HaveWork, "Cheney Scan: work left at cleanup");
+            base.Cleanup();
+        }
+
+        internal override void TruncateAllocationArea()
+        {
+            UIntPtr lowAddr = this.destinationLow;
+            UIntPtr highAddr = this.allocator.AllocPtr;
+            if (lowAddr != highAddr) {
+                this.AddWork(lowAddr, highAddr);
+            }
+            base.TruncateAllocationArea();
+            this.destinationLow = UIntPtr.Zero;
+            this.destinationHigh = UIntPtr.Zero;
+        }
+    }
+
+    internal class HierarchicalScan : CopyScanQueue
+    {
+
+        private UIntPtr destinationLow;
+        private UIntPtr destinationHigh;
+        private UIntPtr sourceHigh;
+
+        protected override unsafe void NewAllocationRange(UIntPtr objectAddr,
+                                                          UIntPtr rangeStart,
+                                                          UIntPtr rangeLimit)
+        {
+            UIntPtr preObjectAddr = objectAddr - PreHeader.Size;
+            if (preObjectAddr >= destinationLow &&
+                preObjectAddr <= destinationHigh) {
+                // Extending the current allocation range
+                VTable.Assert(rangeStart == destinationHigh);
+                if (destinationLow != preObjectAddr) {
+                    this.AddWork(destinationLow, preObjectAddr);
+                }
+            } else {
+                // Switching to a new allocation range
+                if (destinationLow != destinationHigh) {
+                    this.AddWork(destinationLow, destinationHigh);
+                }
+            }
+            this.sourceHigh = UIntPtr.Zero;
+            destinationLow = preObjectAddr;
+            destinationHigh = rangeLimit;
+        }
+
+        protected override void NewObject(UIntPtr objAdr, UIntPtr size)
+        {
+            // We don't need to do anything for individual objects
+        }
+
+        [Inline]
+        internal override bool Scan(NonNullReferenceVisitor visitor)
+        {
+            bool globalRepeat = false;
+            while (true) {
+                UIntPtr lowAddr, highAddr;
+                if (this.destinationLow != this.allocator.AllocPtr) {
+                    lowAddr = this.destinationLow;
+                    highAddr = this.allocator.AllocPtr;
+                    this.destinationLow = highAddr;
+                } else if (!this.HaveWork) {
+                    // No more work to do
+                    break;
+                } else {
+                    lowAddr = this.GetWork(out highAddr);
+                }
+                globalRepeat = true;
+                this.sourceHigh = highAddr;
+                lowAddr += PreHeader.Size;
+                lowAddr =
+                    BumpAllocator.SkipNonObjectData(lowAddr, highAddr);
+                while (lowAddr < this.sourceHigh) {
+                    Object obj = Magic.fromAddress(lowAddr);
+                    lowAddr += visitor.VisitReferenceFields(obj);
+                    lowAddr =
+                        BumpAllocator.SkipNonObjectData(lowAddr, highAddr);
+                }
+                if (lowAddr < highAddr) {
+                    // The scanning must have been aborted early due to
+                    // overflow into a new page.  Put the rest of the
+                    // range on the work list.
+                    this.AddWork(lowAddr - PreHeader.Size, highAddr);
+                }
+            }
+            return globalRepeat;
+        }
+
+        internal override void Initialize(PageType pageType)
+        {
+            base.Initialize(pageType);
+            this.destinationLow = UIntPtr.Zero;
+            this.destinationHigh = UIntPtr.Zero;
+        }
+
+        internal override void Cleanup()
+        {
+            VTable.Assert(!this.HaveWork,
+                          "Hierarchical Scan: work left at cleanup");
+            base.Cleanup();
+        }
+
+        internal override void TruncateAllocationArea()
+        {
+            UIntPtr lowAddr = this.destinationLow;
+            UIntPtr highAddr = this.allocator.AllocPtr;
+            if (lowAddr != highAddr) {
+                this.AddWork(lowAddr, highAddr);
+            }
+            base.TruncateAllocationArea();
+            this.destinationLow = UIntPtr.Zero;
+            this.destinationHigh = UIntPtr.Zero;
+        }
+    }
+
+    internal class NestedHierarchicalScan : CopyScanStack
+    {
+
+        protected UIntPtr destinationLow;
+        protected UIntPtr destinationHigh;
+        protected UIntPtr sourceHigh;
+
+        protected override unsafe void NewAllocationRange(UIntPtr objectAddr,
+                                                          UIntPtr rangeStart,
+                                                          UIntPtr rangeLimit)
+        {
+            // BUGBUG:
+        }
+
+        protected override void NewObject(UIntPtr objAddr, UIntPtr size)
+        {
+            // BUGBUG:
+        }
+
+        [Inline]
+        internal override bool Scan(NonNullReferenceVisitor visitor)
+        {
+            // BUGBUG:
+            return false;
+        }
+
+        internal override void TruncateAllocationArea()
+        {
+            // BUGBUG:
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/EmptyWriteBarrier.cs b/base/Kernel/Bartok/GCs/EmptyWriteBarrier.cs
new file mode 100644
index 0000000..02a3511
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/EmptyWriteBarrier.cs
@@ -0,0 +1,89 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+
+    internal unsafe class EmptyWriteBarrier : WriteBarrier
+    {
+
+        internal static EmptyWriteBarrier instance;
+
+        internal static new void Initialize() {
+            EmptyWriteBarrier.instance =  (EmptyWriteBarrier)
+                BootstrapMemory.Allocate(typeof(EmptyWriteBarrier));
+        }
+
+        [Inline]
+        protected override void CopyStructImpl(VTable vtable,
+                                               UIntPtr srcPtr,
+                                               UIntPtr dstPtr)
+        {
+            CopyStructNoBarrier(vtable, srcPtr, dstPtr);
+        }
+
+        [Inline]
+        protected override Object AtomicSwapImpl(ref Object reference,
+                                                 Object value)
+        {
+            return AtomicSwapNoBarrier(ref reference, value);
+        }
+
+        [Inline]
+        protected override
+        Object AtomicCompareAndSwapImpl(ref Object reference,
+                                        Object newValue,
+                                        Object comparand)
+        {
+            return AtomicCompareAndSwapNoBarrier(ref reference, newValue,
+                                                 comparand);
+        }
+
+        [Inline]
+        protected override void CloneImpl(Object srcObject, Object dstObject)
+        {
+            CloneNoBarrier(srcObject, dstObject);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected override void ArrayZeroImpl(Array array,
+                                              int offset,
+                                              int length)
+        {
+            ArrayZeroNoBarrier(array, offset, length);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected override void ArrayCopyImpl(Array srcArray, int srcOffset,
+                                              Array dstArray, int dstOffset,
+                                              int length)
+        {
+            ArrayCopyNoBarrier(srcArray, srcOffset,
+                               dstArray, dstOffset,
+                               length);
+        }
+
+        [Inline]
+        protected override void WriteReferenceImpl(UIntPtr *location,
+                                                   Object value)
+        {
+            *location = Magic.addressOf(value);
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/GCProfiler.cs b/base/Kernel/Bartok/GCs/GCProfiler.cs
new file mode 100644
index 0000000..e385b21
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/GCProfiler.cs
@@ -0,0 +1,158 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+
+    using Microsoft.Bartok.Runtime;
+
+    internal delegate
+    void ProfileRootsDelegate(NonNullReferenceVisitor visitor);
+
+    internal delegate
+    void ProfileObjectsDelegate(SegregatedFreeList.ObjectVisitor visitor);
+
+    // Receive notifications from the GC and deliver them to a profiler.  This class
+    // should be subtyped and then an instance associated with the GC via
+    // System.GC.SetProfiler().
+    [CLSCompliant(false)]
+    public abstract class GCProfiler
+    {
+        public GCProfiler()
+        {
+            rootVisitor = new RootVisitor(this);
+            objectVisitor = new ObjectVisitor(this);
+        }
+
+        // To limit the size of the TCB, we make a strict separation between two APIs.
+        // The trusted API is the one between the GC and this base GCProfiler.  The
+        // untrusted API is the one between this base GCProfiler and any subtypes of
+        // this profiler that actually generate useful profiles.
+
+        // Trusted API between this base and the GC
+        internal void NotifyShutdown()
+        {
+            Shutdown();
+        }
+
+        internal void NotifyPreGC(int generation)
+        {
+            PreGC(generation);
+        }
+
+        internal void NotifyPostGC(ProfileRootsDelegate profileRoots,
+                                   ProfileObjectsDelegate profileObjects)
+        {
+            this.profileRoots = profileRoots;
+            this.profileObjects = profileObjects;
+            PostGC();
+        }
+
+        internal void NotifyAllocation(UIntPtr objAddr, Type type, UIntPtr size)
+        {
+            Allocation(objAddr, type, size);
+        }
+
+        // Untrusted API between this base and the concrete profiler subtype.  The
+        // concrete subtype implements this.
+        protected abstract void Shutdown();
+        protected abstract void PreGC(int generation);
+        protected abstract void PostGC();
+        protected abstract void Allocation(UIntPtr objAddr, Type type, UIntPtr size);
+
+        protected abstract void ScanOneRoot(UIntPtr objectAddress);
+
+        protected abstract void StartScanOneObject(UIntPtr objectAddress, Type type, UIntPtr size);
+        protected abstract void ScanOneObjectField(UIntPtr objectAddress);
+        protected abstract void EndScanOneObject();
+
+        // API for the concrete subtype to call back on the abstract base.  We must
+        // not accept UIntPtrs, etc. from the untrusted subtype and operate on them
+        // here!
+
+        protected void ScanRoots()
+        {
+            profileRoots(rootVisitor);
+        }
+
+        protected void ScanObjects()
+        {
+            profileObjects(objectVisitor);
+        }
+
+        // And the rest is implementation detail.
+
+        private RootVisitor             rootVisitor;
+        private ObjectVisitor           objectVisitor;
+
+        private ProfileRootsDelegate    profileRoots;
+        private ProfileObjectsDelegate  profileObjects;
+
+        // For one object, visit all the references it contains
+        internal class OneObjectVisitor : NonNullReferenceVisitor
+        {
+            private GCProfiler profiler;
+
+            public OneObjectVisitor(GCProfiler profiler)
+            {
+                this.profiler = profiler;
+            }
+
+            // The NonNullReferenceVisitor contract:
+            internal unsafe override void Visit(UIntPtr *location)
+            {
+                profiler.ScanOneObjectField(*location);
+            }
+        }
+
+        // Visit all the roots
+        internal class RootVisitor : NonNullReferenceVisitor
+        {
+            private GCProfiler profiler;
+
+            public RootVisitor(GCProfiler profiler)
+            {
+                this.profiler = profiler;
+            }
+
+            // The NonNullReferenceVisitor contract:
+            internal unsafe override void Visit(UIntPtr *location)
+            {
+                profiler.ScanOneRoot(*location);
+            }
+        }
+
+        // Visit all the objects in the heap
+        internal class ObjectVisitor : SegregatedFreeList.ObjectVisitor
+        {
+            private GCProfiler          profiler;
+            private OneObjectVisitor    oneObjectVisitor;
+
+            public ObjectVisitor(GCProfiler profiler)
+            {
+                this.profiler = profiler;
+                oneObjectVisitor = new OneObjectVisitor(profiler);
+            }
+
+            // The ObjectVisitor contract:
+            // Must return the size of the visited object.
+            internal override UIntPtr Visit(Object obj)
+            {
+                UIntPtr size = ObjectLayout.Sizeof(obj);
+                UIntPtr objectAddress = Magic.addressOf(obj);
+                profiler.StartScanOneObject(objectAddress, obj.GetType(), size);
+                oneObjectVisitor.VisitReferenceFields(obj);
+                profiler.EndScanOneObject();
+                return size;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Bartok/GCs/GenerationalCollector.cs b/base/Kernel/Bartok/GCs/GenerationalCollector.cs
new file mode 100644
index 0000000..dbfe124
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/GenerationalCollector.cs
@@ -0,0 +1,543 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//#define DONT_RECORD_OBJALLOC_IN_OFFSETTABLE
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    [NoCCtor]
+    internal abstract class GenerationalCollector: StopTheWorldCollector
+    {
+
+        [TrustedNonNull]
+        internal static RememberedSet installedRemSet;
+
+        // PageType.Owner0 is not 0 now. One side effect is that the following arrays
+        // have unused entries.
+
+        internal static short[]     gcCountTable;
+        internal static short[]     gcFrequencyTable;
+
+        internal static UIntPtr[]   gcPromotedTable;
+        internal static UIntPtr[]   gcPromotedLimitTable;
+
+        internal static int[]       fromSpacePageCounts;
+
+        private  static UIntPtr     previousPageCount;
+        internal static UIntPtr     nurserySize;
+        internal static UIntPtr     pretenuredSinceLastFullGC;
+        internal const  PageType    nurseryGeneration     = PageType.Owner0;
+        internal const  PageType    largeObjectGeneration = PageType.Owner1;
+        internal static PageType    defaultGeneration;
+
+        internal static PageType MIN_GENERATION {
+            get { return PageType.Owner0; }
+        }
+        internal static PageType MAX_GENERATION {
+            get { return PageType.Owner1; }
+        }
+
+        // These two arrays contain the range of pages each generation is within
+        internal static UIntPtr[] MinGenPage;
+        internal static UIntPtr[] MaxGenPage;
+
+        [PreInitRefCounts]
+        internal static new void Initialize() {
+            if (gcCountTable != null) {
+                return;
+            }
+            GC.Initialize();
+            StopTheWorldCollector.Initialize();
+            defaultGeneration = MAX_GENERATION;
+            uint tableSize = (uint) MAX_GENERATION+1;
+            nurserySize    = (UIntPtr) (1 << 24);
+            // gcCountTable = new short[MAX_GENERATION+1];
+            gcCountTable = (short[])
+                BootstrapMemory.Allocate(typeof(short[]), tableSize);
+            // gcFrequencyTable = new short[MAX_GENERATION+1];
+            gcFrequencyTable = (short[])
+                BootstrapMemory.Allocate(typeof(short[]), tableSize);
+            // gcPromotedTable = new UIntPtr[MAX_GENERATION+1];
+            gcPromotedTable = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), tableSize);
+            // gcPromotedLimitTable = new UIntPtr[MAX_GENERATION+1];
+            gcPromotedLimitTable = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), tableSize);
+            previousPageCount = UIntPtr.Zero;
+            pretenuredSinceLastFullGC = UIntPtr.Zero;
+            // fromSpacePageCounts = new int[MAX_GENERATION+1];
+            fromSpacePageCounts = (int[])
+                BootstrapMemory.Allocate(typeof(int[]),
+                                         (uint)MAX_GENERATION+1);
+
+            MinGenPage = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]),
+                                         (uint)MAX_GENERATION+1);
+            MaxGenPage = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]),
+                                         (uint)MAX_GENERATION+1);
+
+
+            // Initialization of tables
+            // gcFrequencyTable and gcPromotedLimitTable may be modified by
+            // VTable.ParseArgs
+            gcFrequencyTable[(int)MIN_GENERATION] = Int16.MaxValue;
+            gcPromotedLimitTable[(int)MIN_GENERATION] = (UIntPtr)1 << 25; // 32MB
+            // Install the remembered set
+            InstallRemSet();
+        }
+
+        private static void InstallRemSet() {
+            switch (GC.remsetType) {
+              case RemSetType.SSB: {
+                  SequentialStoreBuffer.Initialize();
+                  installedRemSet = SequentialStoreBuffer.instance;
+                  break;
+              }
+              case RemSetType.Cards: {
+                  CardTable.Initialize();
+                  installedRemSet = CardTable.instance;
+                  break;
+              }
+              default: {
+                  VTable.NotReached("Unsupported remembered set: "+
+                                    GC.remsetType);
+                  break;
+              }
+            }
+        }
+
+        private void TruncateAllocationAreas(int generation) {
+            this.TruncateNurseryAllocationAreas();
+            if (generation != (int) nurseryGeneration) {
+                this.TruncateOlderAllocationAreas(generation);
+            }
+        }
+
+        private void TruncateNurseryAllocationAreas() {
+            int limit = Thread.threadTable.Length;
+            for (int i = 0; i < limit; i++) {
+                Thread t = Thread.threadTable[i];
+                if (t != null) {
+                    BumpAllocator.Truncate(t);
+                }
+            }
+        }
+
+        internal abstract void TruncateOlderAllocationAreas(int generation);
+
+        internal override void CollectStopped(int currentThreadIndex,
+                                              int generation)
+        {
+            VTable.Assert(currentThreadIndex == collectorThreadIndex);
+            int maxGeneration = (int) MAX_GENERATION;
+            if (generation < 0) {
+                if (generation == -1) {
+                    generation = MinGeneration;
+                    while (generation < maxGeneration &&
+                           gcCountTable[generation] >=
+                           gcFrequencyTable[generation]) {
+                        generation++;
+                    }
+                    while (generation < maxGeneration &&
+                           gcPromotedTable[generation] >=
+                           gcPromotedLimitTable[generation]) {
+                        generation++;
+                    }
+                } else {
+                    generation = maxGeneration;
+                }
+            } else {
+                generation = Math.Max(generation, MinGeneration);
+                generation = Math.Min(generation, maxGeneration);
+            }
+            generation = this.CollectionGeneration(generation);
+            for (int i = MinGeneration; i < generation; i++) {
+                gcCountTable[i] = 0;
+            }
+            gcCountTable[generation]++;
+            this.TruncateAllocationAreas(generation);
+            UIntPtr heapPageCount = MarkZombiePages(generation);
+            //VTable.DebugPrint("[GC gen {0}]\n", __arglist(generation));
+            this.CollectGeneration(generation, heapPageCount);
+            ReclaimZombiePages(heapPageCount, generation);
+            for (int i = MinGeneration; i < generation; i++) {
+                gcPromotedTable[i] = UIntPtr.Zero;
+            }
+        }
+
+        internal abstract void CollectGeneration(int generation,
+                                                 UIntPtr sourcePageCount);
+
+        [Inline]
+        internal override UIntPtr AllocateObjectMemory(UIntPtr numBytes,
+                                                       uint alignment,
+                                                       Thread currentThread)
+        {
+            UIntPtr resultAddr =
+                BumpAllocator.AllocateFast(currentThread, numBytes, alignment);
+            if (resultAddr == UIntPtr.Zero) {
+                resultAddr = AllocateObjectMemorySlow(numBytes, alignment,
+                                                      currentThread);
+            }
+
+            VTable.Assert(resultAddr != UIntPtr.Zero);
+            return resultAddr;
+        }
+
+        [NoInline]
+        private UIntPtr AllocateObjectMemorySlow(UIntPtr numBytes,
+                                                 uint alignment,
+                                                 Thread currentThread)
+        {
+            //Trace.Log(Trace.Area.Allocate,
+            //          "AllocateObjectMemorySlow numBytes={0}, alignment={1}, currentThread={2}", __arglist(numBytes, alignment, currentThread));
+            GC.CheckForNeededGCWork(currentThread);
+            VTable.Assert(CurrentPhase != STWPhase.SingleThreaded ||
+                          currentThread.threadIndex==collectorThreadIndex);
+            if (GenerationalCollector.IsLargeObjectSize(numBytes)) {
+                return AllocateBig(numBytes, alignment, currentThread);
+            }
+            return BumpAllocator.Allocate(currentThread, numBytes, alignment);
+        }
+
+        internal override int GetGeneration(Object obj) {
+            UIntPtr addr = Magic.addressOf(obj);
+            UIntPtr page = PageTable.Page(addr);
+            return (int) PageTable.Type(page);
+        }
+
+        internal override int MaxGeneration {
+            get { return (int)MAX_GENERATION; }
+        }
+
+        internal override int MinGeneration {
+            get { return (int)MIN_GENERATION; }
+        }
+
+        internal override long TotalMemory {
+            get {
+                UIntPtr pageCount = UIntPtr.Zero;
+                for (UIntPtr i=UIntPtr.Zero; i<PageTable.pageTableCount; i++) {
+                    if (PageTable.IsMyGcPage(i)) {
+                        pageCount++;
+                    }
+                }
+                return (long) PageTable.RegionSize(pageCount);
+            }
+        }
+
+        internal override void EnableHeap() {
+            // Do nothing
+        }
+
+        internal override void DestructHeap() {
+            // Do nothing
+        }
+
+        internal override void VerifyHeap(bool beforeCollection) {
+            this.TruncateAllocationAreas((int)MAX_GENERATION);
+            Verifier.bumpAllocatorVerifier.VerifyHeap();
+        }
+
+        internal override UIntPtr FindObjectAddr(UIntPtr interiorPtr) {
+            return InteriorPtrTable.Find(interiorPtr);
+        }
+
+        internal override
+        void VisitObjects(ObjectLayout.ObjectVisitor objectVisitor,
+                          UIntPtr lowAddr, UIntPtr highAddr)
+        {
+            UIntPtr oldAddr = UIntPtr.Zero;
+            UIntPtr objectAddr = lowAddr + PreHeader.Size;
+            objectAddr = BumpAllocator.SkipNonObjectData(objectAddr, highAddr);
+            while (objectAddr < highAddr) {
+                if (PageTable.Page(objectAddr) != PageTable.Page(oldAddr)) {
+                    InteriorPtrTable.VerifyFirst(oldAddr, objectAddr);
+                }
+                oldAddr = objectAddr;
+                Object obj = Magic.fromAddress(objectAddr);
+                UIntPtr objectSize = objectVisitor.Visit(obj);
+                objectAddr += objectSize;
+                objectAddr =
+                    BumpAllocator.SkipNonObjectData(objectAddr, highAddr);
+            }
+            VTable.Assert(objectAddr - PreHeader.Size <= highAddr);
+        }
+
+        internal override void NewThreadNotification(Thread newThread,
+                                                     bool initial)
+        {
+            base.NewThreadNotification(newThread, initial);
+            BumpAllocator.NewThreadNotification(newThread, nurseryGeneration);
+        }
+
+        internal override void DeadThreadNotification(Thread deadThread)
+        {
+            installedRemSet.Clean(deadThread);
+            base.DeadThreadNotification(deadThread);
+        }
+
+        //=======================================
+        // Routines to manipulate from-space tags
+
+        [Inline]
+        internal unsafe static void MakeZombiePage(UIntPtr page,
+                                                   PageType destGeneration)
+        {
+            VTable.Assert(destGeneration >= nurseryGeneration &&
+                          destGeneration <= MAX_GENERATION);
+            PageType pageType = PageTable.LiveToZombie(destGeneration);
+            PageTable.SetType(page, pageType);
+        }
+
+        [Inline]
+        internal unsafe static void MakeZombiePages(UIntPtr startPage,
+                                                    UIntPtr pageCount,
+                                                    PageType destGeneration)
+        {
+            VTable.Assert(destGeneration >= nurseryGeneration &&
+                          destGeneration <= MAX_GENERATION);
+            PageType pageType = PageTable.LiveToZombie(destGeneration);
+            PageTable.SetType(startPage, pageCount, pageType);
+        }
+
+        [Inline]
+        internal static bool IsMyZombiePage(UIntPtr page) {
+            return (PageTable.IsMyPage(page) &&
+                    PageTable.IsZombiePage(PageTable.Type(page)));
+        }
+
+        internal static UIntPtr PretenureSoftGCTrigger {
+            [Inline]
+            get { return (UIntPtr) (1 << 26); }
+        }
+
+        internal static UIntPtr PretenureHardGCTrigger {
+            [Inline]
+            get { return (UIntPtr) (1 << 27); }
+        }
+
+        [Inline]
+        internal static bool IsLargeObjectSize(UIntPtr size) {
+            UIntPtr largeObjectSize =
+                (UIntPtr) (1 << Constants.LargeObjectBits);
+            return size >= largeObjectSize;
+        }
+
+        internal override int CollectionGeneration(int genRequest) {
+            if (pretenuredSinceLastFullGC > PretenureSoftGCTrigger) {
+                genRequest = GC.MaxGeneration;
+            }
+
+            if (genRequest == GC.MaxGeneration) {
+                pretenuredSinceLastFullGC = UIntPtr.Zero;
+            }
+
+            return genRequest;
+        }
+
+        internal static UIntPtr MarkZombiePages(int generation) {
+            for (int i = (int)MIN_GENERATION; i <= generation; i++) {
+                fromSpacePageCounts[i] = 0;
+            }
+            // Count the number of pages belonging to each generation.
+            // Mark pages in the target generations as zombies.
+            UIntPtr heapPageCount = UIntPtr.Zero;
+
+            // determine the range of pages to loop through.
+            // Our target generations are "generation" and all younger ones.
+            // Therefore to ensure we get the right range, we must union the
+            // ranges of all the target generations
+            UIntPtr minPage = MinGenPage[generation];
+            UIntPtr maxPage = MaxGenPage[generation];
+
+            for (int i = 0; i < generation; i++) {
+                if (MinGenPage[i] < minPage)
+                {
+                    minPage = MinGenPage[i];
+                }
+                if (MaxGenPage[i] > maxPage)
+                {
+                    maxPage = MaxGenPage[i];
+                }
+            }
+
+            // This is used to determine the new range for the target generations
+            UIntPtr newMinPage = PageTable.pageTableCount;
+            UIntPtr newMaxPage = (UIntPtr)0;
+
+            for (UIntPtr i = minPage; i <= maxPage; i++) {
+                if (PageTable.IsMyGcPage(i)) {
+                    heapPageCount++;
+                    PageType pageType = PageTable.Type(i);
+                    int pageGen = (int) pageType;
+                    if (pageGen <= generation) {
+                        fromSpacePageCounts[pageGen]++;
+                        if (pageGen < (int)MAX_GENERATION) {
+                            MakeZombiePage(i, (PageType)(pageGen+1));
+                        } else {
+                            MakeZombiePage(i, MAX_GENERATION);
+                        }
+
+                        if (i < newMinPage)
+                        {
+                            newMinPage = i;
+                        }
+
+                        // for loop is always increasing, so MaxNurseryPage will
+                        // never be greater than i
+                        newMaxPage = i;
+                    }
+                }
+            }
+
+            // update this generation with the new range.
+            // This info is used by ReclaimZombiePages
+
+            MinGenPage[generation] = newMinPage;
+            MaxGenPage[generation] = newMaxPage;
+
+            return heapPageCount;
+        }
+
+        internal static void ReclaimZombiePages(UIntPtr heapPageCount,
+                                                int generation) {
+            UIntPtr reservePages;
+            if (heapPageCount < previousPageCount) {
+                reservePages = (previousPageCount + heapPageCount) / 2;
+            } else {
+                reservePages = heapPageCount;
+            }
+            previousPageCount = heapPageCount;
+
+            // MarkZombiePages updates the range for this generation, so we do
+            // not need to take the union ranges of all target generations
+            UIntPtr minZombiePage = MinGenPage[generation];
+            UIntPtr maxZombiePage = MaxGenPage[generation];
+
+            for (UIntPtr i = minZombiePage; i <= maxZombiePage; i++) {
+                if (IsMyZombiePage(i)) {
+                    UIntPtr startPage = i;
+                    UIntPtr endPage = startPage;
+                    do {
+                        endPage++;
+                    } while (IsMyZombiePage(endPage));
+                    InteriorPtrTable.ClearFirst(startPage, endPage);
+                    if (GC.remsetType == RemSetType.Cards) {
+                       OffsetTable.ClearLast(PageTable.PageAddr(startPage), 
+                                             PageTable.PageAddr(endPage)-1);
+                    }
+                    if (reservePages > UIntPtr.Zero) {
+                        // Keep sufficient pages for the new nursery
+                        UIntPtr pageCount = endPage - startPage;
+                        if (pageCount > reservePages) {
+                            // Zero out the memory for reuse
+                            PageManager.ReleaseUnusedPages(startPage,
+                                                           reservePages,
+                                                           false);
+                            startPage += reservePages;
+                            PageManager.FreePageRange(startPage, endPage);
+                            reservePages = UIntPtr.Zero;
+                        } else {
+                            // Zero out the memory for reuse
+                            PageManager.ReleaseUnusedPages(startPage,
+                                                           pageCount,
+                                                           false);
+                            reservePages = reservePages - pageCount;
+                        }
+                    } else {
+                        PageManager.FreePageRange(startPage, endPage);
+                    }
+                    i = endPage - 1;
+                }
+            }
+        }
+
+        // Interface with the compiler!
+
+        internal static unsafe UIntPtr AllocateBig(UIntPtr numBytes,
+                                                   uint alignment,
+                                                   Thread currentThread)
+        {
+            // Pretenure Trigger
+            pretenuredSinceLastFullGC += numBytes;
+            if (pretenuredSinceLastFullGC > PretenureHardGCTrigger) {
+                GC.InvokeMajorCollection(currentThread);
+            }
+
+            // Potentially Join a collection
+            GC.CheckForNeededGCWork(currentThread);
+            int maxAlignmentOverhead = unchecked((int)alignment)-UIntPtr.Size;
+            UIntPtr pageCount =
+                PageTable.PageCount(numBytes + maxAlignmentOverhead);
+            bool fCleanPages = true;
+            UIntPtr page = PageManager.EnsurePages(currentThread, pageCount,
+                                                   largeObjectGeneration,
+                                                   ref fCleanPages);
+            int unusedBytes =
+                unchecked((int) (PageTable.RegionSize(pageCount) - numBytes));
+            int unusedCacheLines =
+                unchecked((int) (unusedBytes - maxAlignmentOverhead)) >> 5;
+            int pageOffset = 0;
+            if (unusedCacheLines != 0) {
+                pageOffset = (bigOffset % unusedCacheLines) << 5;
+                bigOffset++;
+            }
+            UIntPtr pageStart = PageTable.PageAddr(page);
+            for (int i = 0; i < pageOffset; i += UIntPtr.Size) {
+                Allocator.WriteAlignment(pageStart + i);
+            }
+            UIntPtr unalignedStartAddr = pageStart + pageOffset;
+            UIntPtr startAddr =
+                Allocator.AlignedAllocationPtr(unalignedStartAddr,
+                                               pageStart + unusedBytes,
+                                               alignment);
+            pageOffset +=
+                unchecked((int)(uint)(startAddr - unalignedStartAddr));
+            if (pageOffset < unusedBytes) {
+                BumpAllocator.WriteUnusedMarker(pageStart+pageOffset+numBytes);
+            }
+            UIntPtr resultAddr = startAddr + PreHeader.Size;
+            InteriorPtrTable.SetFirst(resultAddr);
+            VTable.Assert(PageTable.Page(resultAddr) <
+                          PageTable.Page(startAddr+numBytes-1),
+                          "Big object should cross pages");
+            if (GC.remsetType == RemSetType.Cards) {
+#if DONT_RECORD_OBJALLOC_IN_OFFSETTABLE
+#else
+                     OffsetTable.SetLast(resultAddr);   
+#endif
+            }      
+            return resultAddr;
+        }
+
+        private static int bigOffset;
+
+        // Utility functions
+
+        internal override void CheckForNeededGCWork(Thread currentThread)
+        {
+            base.CheckForNeededGCWork(currentThread);
+            if (CurrentPhase == STWPhase.Idle &&
+                GC.newBytesSinceGC >= nurserySize &&
+                !GC.allocationInhibitGC) {
+                GC.InvokeCollection(currentThread);
+            }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/GenerationalWriteBarrier.cs b/base/Kernel/Bartok/GCs/GenerationalWriteBarrier.cs
new file mode 100644
index 0000000..1c8faef
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/GenerationalWriteBarrier.cs
@@ -0,0 +1,165 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    internal unsafe class GenerationalWriteBarrier : WriteBarrier
+    {
+
+        internal static GenerationalWriteBarrier instance;
+
+        internal static new void Initialize() {
+            GenerationalWriteBarrier.instance = (GenerationalWriteBarrier)
+                BootstrapMemory.Allocate(typeof(GenerationalWriteBarrier));
+        }
+
+        [Inline]
+        protected override void StoreStaticFieldImpl(ref Object staticField,
+                                                     Object value)
+        {
+            // No need to perform a ReferenceCheck here!
+            *Magic.toPointer(ref staticField) = Magic.addressOf(value);
+        }
+
+        protected override void CopyStructImpl(VTable vtable,
+                                               UIntPtr srcPtr,
+                                               UIntPtr dstPtr)
+        {
+            CopyStructWithBarrier(vtable, srcPtr, dstPtr);
+        }
+
+        [Inline]
+        protected override Object AtomicSwapImpl(ref Object reference,
+                                                 Object value)
+        {
+            UIntPtr resultAddr =
+                Interlocked.Exchange(Magic.toPointer(ref reference),
+                                     Magic.addressOf(value));
+            ReferenceCheck(Magic.toPointer(ref reference), value);
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected override
+        Object AtomicCompareAndSwapImpl(ref Object reference,
+                                        Object newValue,
+                                        Object comparand)
+        {
+            UIntPtr resultAddr =
+                Interlocked.CompareExchange(Magic.toPointer(ref reference),
+                                            Magic.addressOf(newValue),
+                                            Magic.addressOf(comparand));
+            ReferenceCheck(Magic.toPointer(ref reference), newValue);
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected override void CloneImpl(Object srcObject, Object dstObject)
+        {
+            CloneNoBarrier(srcObject, dstObject);
+            ReferenceCheck(dstObject);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        protected override void ArrayZeroImpl(Array array,
+                                              int offset,
+                                              int length)
+        {
+            ArrayZeroNoBarrier(array, offset, length);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        protected override void ArrayCopyImpl(Array srcArray, int srcOffset,
+                                              Array dstArray, int dstOffset,
+                                              int length)
+        {
+            if ((length > 1000) || ((length << 2) >= dstArray.Length)) {
+                ArrayCopyNoBarrier(srcArray, srcOffset,
+                                   dstArray, dstOffset,
+                                   length);
+                ReferenceCheck(dstArray);
+            } else {
+                ArrayCopyWithBarrier(srcArray, srcOffset,
+                                     dstArray, dstOffset,
+                                     length);
+            }
+        }
+
+        [Inline]
+        protected override void WriteReferenceImpl(UIntPtr *location,
+                                                   Object value)
+        {
+            *location = Magic.addressOf(value);
+            ReferenceCheck(location, value);
+        }
+
+        [Inline]
+        private static void ReferenceCheck(Object obj) {
+            PageType pageType =
+                PageTable.Type(PageTable.Page(Magic.addressOf(obj)));
+            if (GenerationalCollector.MAX_GENERATION == PageType.Owner1) {
+                if (pageType == PageType.Owner1) {
+                    GenerationalCollector.
+                        installedRemSet.RecordClonedObject(obj);
+                }
+            } else {
+                if (pageType != GenerationalCollector.nurseryGeneration) {
+                    GenerationalCollector.
+                        installedRemSet.RecordClonedObject(obj);
+                }
+            }
+        }
+
+        [Inline]
+        private static void ReferenceCheck(UIntPtr *addr, Object value)
+        {
+            PageType addrType = PageTable.Type(PageTable.Page((UIntPtr) addr));
+            if (GenerationalCollector.MAX_GENERATION == PageType.Owner1) {
+                if (addrType != PageType.Owner1) {
+                    return;
+                } else {
+                    ReferenceCheck(addrType, addr, value);
+                }
+            } else {
+                if (PageTable.IsLiveGcPage(addrType)){
+                    ReferenceCheck(addrType, addr, value);
+                }
+            }
+        }
+
+        [NoInline]
+        private static void ReferenceCheck(PageType addrType, UIntPtr *addr,
+                                           Object value) {
+            VTable.Assert(PageTable.IsGcPage(addrType));
+
+            if (GC.remsetType == RemSetType.Cards) {
+               GenerationalCollector.
+                    installedRemSet.RecordReference(addr, value);
+               return;
+            }
+            
+            UIntPtr valueAddr = Magic.addressOf(value);
+            PageType valType = PageTable.Type(PageTable.Page(valueAddr));
+            if (PageTable.IsGcPage(valType) && (addrType > valType)){
+                GenerationalCollector.
+                    installedRemSet.RecordReference(addr, value);
+            }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/InteriorPtrTable.cs b/base/Kernel/Bartok/GCs/InteriorPtrTable.cs
new file mode 100644
index 0000000..a65c7ba
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/InteriorPtrTable.cs
@@ -0,0 +1,290 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+  using Microsoft.Bartok.Runtime;
+  using System.Runtime.CompilerServices;
+
+  internal class InteriorPtrTable {
+
+      // WARNING: don't initialize any static fields in this class
+      // without manually running the class constructor at startup!
+
+      internal const short OFFSET_NO_DATA = 0;
+      internal const short OFFSET_SKEW = 1;
+
+      /* 
+       * Returns a pointer to the beginning of an object such that the
+       * pointer is less than or equal to addr.  N.B. Before may return a
+       * pointer to an alignment or an unused space token.
+       */
+      private static UIntPtr Before(UIntPtr addr) {
+          UIntPtr page = PageTable.Page(addr);
+          short offset = PageTable.Extra(page);
+          // OFFSET_NO_DATA and negative offsets should always fail this
+          // test.
+          if (PageTable.PageAddr(page) + (offset-OFFSET_SKEW) > addr) {
+              // If the addr is an interior pointer of an object on a
+              // previous page, go back one entry.
+              --page;
+              offset = PageTable.Extra(page);
+          }
+          if (offset == OFFSET_NO_DATA) {
+              // Scroll back until we find a page entry with real data in
+              // it.  This handles the case of a large object allocated
+              // across pages.
+              do {
+                  --page;
+                  offset = PageTable.Extra(page);
+              }
+              while (offset == OFFSET_NO_DATA);
+          }
+          VTable.Assert(offset > OFFSET_NO_DATA, "No offset data");
+          // Unused: since we currently do not use negative offsets in the
+          // page table.  This would be more efficient for really big
+          // objects, but the OFFSET_NO_DATA value works fine too.
+          /*
+            // Scroll backwards using big steps.  Offset will never be
+            // OFFSET_NO_DATA in this loop.
+            while (offset < OFFSET_NO_DATA) {
+            entry += (offset - OFFSET_SKEW);
+            offset = *entry;
+            }
+          */
+          return PageTable.PageAddr(page) + (offset - OFFSET_SKEW);
+      }
+
+      /*
+       * Returns a pointer to the first object on the given page.
+       * N.B. If called on a page with no ~allocated~ first object it may
+       * return a pointer to the unused space token.
+       */
+      internal static UIntPtr First(UIntPtr page)
+      {
+          short offset = PageTable.Extra(page);
+          UIntPtr pageAddr = PageTable.PageAddr(page);
+          UIntPtr currAddr;
+          if (offset != OFFSET_NO_DATA) {
+              currAddr = pageAddr + (offset - OFFSET_SKEW);
+          } else {
+              currAddr = Before(pageAddr);
+              VTable.Assert(currAddr <= pageAddr);
+              UIntPtr nextPageStart = PageTable.PagePad(currAddr+1);
+              while (currAddr < pageAddr) {
+                  if (Allocator.IsAlignment(currAddr)) {
+                      currAddr += UIntPtr.Size;
+                  } else if (BumpAllocator.IsUnusedSpace(currAddr)) {
+                      currAddr = PageTable.PagePad(currAddr) + PreHeader.Size;
+                  } else {
+                      if (currAddr >= nextPageStart) {
+                          InteriorPtrTable.SetFirst(currAddr);
+                          nextPageStart = PageTable.PagePad(currAddr+1);
+                      }
+                      currAddr += ObjectSize(currAddr);
+                  }
+              }
+          }
+          currAddr = Allocator.SkipAlignment(currAddr);
+          return currAddr;
+      }
+
+      /*
+       * Returns a pointer past the last object _that_fits_completely_ on
+       * the given page.  Note that the "last" object on a page may
+       * actually start on a previous page.
+       */
+      internal static UIntPtr Last(UIntPtr page)
+      {
+          UIntPtr currAddr = InteriorPtrTable.First(page);
+          UIntPtr endAddr = PageTable.PageAddr(page + 1);
+          // Look out for the unused space token: this page may not
+          // have been completely allocated: its "first" object might not
+          // be valid.
+          if (BumpAllocator.IsUnusedSpace(currAddr) || currAddr >= endAddr) {
+              // Back up to the previous object.  Should be fast
+              // since First updated the InteriorPtrTable entries.
+              currAddr = Before(PageTable.PageAddr(page));
+          }
+          // REVIEW this is very similar to Find(addr) below.
+          VTable.Assert(currAddr <= endAddr);
+          while (true) {
+              // Watch out for alignment padding; advance the pointer if
+              // it points to a syncblock index rather than a vtable
+              // pointer.  Note that we must do this before scrolling,
+              // since the page table value was set before we knew the
+              // required alignment.
+              if (Allocator.IsAlignment(currAddr)) {
+                  currAddr += UIntPtr.Size;
+              } else if (BumpAllocator.IsUnusedSpace(currAddr)) {
+                  UIntPtr nextAddr =
+                      PageTable.PagePad(currAddr) + PreHeader.Size;
+                  if (nextAddr >= endAddr) {
+                      return currAddr;
+                  } else {
+                      currAddr = nextAddr;
+                  }
+              } else {
+                  VTable.Assert(currAddr <= endAddr);
+                  UIntPtr size = ObjectSize(currAddr);
+                  UIntPtr postAddr = currAddr + size;
+                  if (postAddr > endAddr) {
+                      if (postAddr - PreHeader.Size > endAddr) {
+                          // The object spills over onto the next page
+                          return currAddr;
+                      } else {
+                          // The object ended at or before the page boundary
+                          return postAddr;
+                      }
+                  } else {
+                      currAddr = postAddr;
+                  }
+              }
+          }
+      }
+
+      internal static UIntPtr Find(UIntPtr addr) 
+      {
+          UIntPtr page = PageTable.Page(addr);
+          UIntPtr currAddr = InteriorPtrTable.First(page);
+          UIntPtr endAddr = PageTable.PageAddr(page + 1);
+          // Look out for the unused space token: this page may not
+          // have been completely allocated: its "first" object might not
+          // be valid.
+          if (BumpAllocator.IsUnusedSpace(currAddr) || currAddr > addr) {
+              // Back up to the previous object.  Should be fast
+              // since First updated the InteriorPtrTable entries.
+              currAddr = Before(PageTable.PageAddr(page));
+          }
+          VTable.Assert(!BumpAllocator.IsUnusedSpace(currAddr),
+                        "InteriorPtrTable.Find 0");
+          VTable.Assert(currAddr <= addr, "InteriorPtrTable.Find 1");
+          while (true) {
+              // Watch out for alignment padding; advance the pointer if
+              // it points to a syncblock index rather than a vtable
+              // pointer.  Note that we must do this before scrolling,
+              // since the page table value was set before we knew the
+              // required alignment.
+              if (Allocator.IsAlignment(currAddr)) {
+                  currAddr += UIntPtr.Size;
+              } else if (BumpAllocator.IsUnusedSpace(currAddr)) {
+                  UIntPtr postAddr =
+                      PageTable.PagePad(currAddr) + PreHeader.Size;
+                  VTable.Assert(postAddr <= addr, "InteriorPtrTable.Find 2");
+                  currAddr = postAddr;
+              } else {
+                  VTable.Assert(currAddr <= addr, "InteriorPtrTable.Find 3");
+                  UIntPtr size = ObjectSize(currAddr);
+                  VTable.Assert(size >= UIntPtr.Zero,
+                                "InteriorPtrTable.Find 4");
+                  UIntPtr postAddr = currAddr + size;
+                  if (postAddr > addr) {
+                      return currAddr;
+                  } else {
+                      currAddr = postAddr;
+                  }
+              }
+          }
+      }
+
+      internal static unsafe UIntPtr ObjectSize(UIntPtr addr) {
+          UIntPtr vtableAddr = Allocator.GetObjectVTable(addr);
+          UIntPtr vtablePage = PageTable.Page(vtableAddr);
+          if (PageTable.IsGcPage(vtablePage)) {
+              // The vtable field is really a forwarding pointer
+              vtableAddr = Allocator.GetObjectVTable(vtableAddr);
+          } else {
+              // Clear the lowest bits, if set
+              vtableAddr &= ~((UIntPtr)3);
+          }
+          VTable.Assert((UIntPtr.Size == 8) ||
+                        ((vtableAddr & 0x80000000) == 0));
+          VTable vtable =
+              Magic.toVTable(Magic.fromAddress(vtableAddr));
+          return ObjectLayout.ObjectSize(addr, vtable);
+      }
+
+      [Inline]
+      internal static unsafe void SetFirst(UIntPtr newAddr) {
+          VTable.Assert(PageTable.IsGcPage(PageTable.Page(newAddr)));
+          UIntPtr page = PageTable.Page(newAddr);
+          UIntPtr offset = newAddr - PageTable.PageAddr(page);
+          PageTable.SetExtra(page, unchecked((short)(offset+OFFSET_SKEW)));
+      }
+
+      [Inline]
+      internal static unsafe void ClearFirst(UIntPtr page) {
+          PageTable.SetExtra(page, OFFSET_NO_DATA);
+      }
+
+      [Inline]
+      internal static unsafe void ClearFirst(UIntPtr startPage, 
+                                             UIntPtr endPage)
+      {
+          PageTable.SetExtra(startPage, endPage - startPage, OFFSET_NO_DATA);
+      }
+
+      [System.Diagnostics.Conditional("DEBUG")]
+      internal static unsafe void VerifyFirst(UIntPtr previousObjectAddr,
+                                              UIntPtr objectAddr)
+      {
+          UIntPtr page = PageTable.Page(objectAddr);
+          if (previousObjectAddr != UIntPtr.Zero) {
+              UIntPtr previousPage = PageTable.Page(previousObjectAddr);
+              UIntPtr pageCursor = previousPage + 1;
+              while (pageCursor < page) {
+                  short cursorOffset = PageTable.Extra(pageCursor);
+                  UIntPtr objAddr = (PageTable.PageAddr(pageCursor) +
+                                     cursorOffset - OFFSET_SKEW);
+                  if(!(cursorOffset <= OFFSET_NO_DATA ||
+                       BumpAllocator.IsUnusedSpace(objAddr) ||
+                       Allocator.IsAlignment(objAddr) ||
+                       BumpAllocator.IsRestOfPageZero(objAddr))) {
+                      VTable.DebugPrint
+                          ("cursorOffset={0:x} OFFSET_NO_DATA={1:x} objAddr={2:x} unused={3} isalign={4} iszero={5}\n",
+                           __arglist((cursorOffset),
+                                     (OFFSET_NO_DATA),
+                                     ((long)objAddr),
+                                     (BumpAllocator.IsUnusedSpace(objAddr)),
+                                     (Allocator.IsAlignment(objAddr)),
+                                     (BumpAllocator.IsRestOfPageZero(objAddr))));
+                  }
+                  VTable.Assert(cursorOffset <= OFFSET_NO_DATA ||
+                                BumpAllocator.IsUnusedSpace(objAddr) ||
+                                Allocator.IsAlignment(objAddr) ||
+                                BumpAllocator.IsRestOfPageZero(objAddr),
+                                "VerifyFirst 1");
+                  pageCursor++;
+              }
+          }
+          short offset = PageTable.Extra(page);
+          if (offset > OFFSET_NO_DATA) {
+              UIntPtr firstAddr =
+                  PageTable.PageAddr(page) + offset - OFFSET_SKEW;
+              if(!(firstAddr == objectAddr ||
+                   (firstAddr + UIntPtr.Size == objectAddr &&
+                    Allocator.IsAlignment(firstAddr)))) {
+                  VTable.DebugPrint
+                      ("firstAddr={0:x} objectAddr={1:x} isalign={2}\n",
+                       __arglist(((long)firstAddr),
+                                 ((long)objectAddr),
+                                 (Allocator.IsAlignment(firstAddr))));
+              }
+              VTable.Assert(firstAddr == objectAddr ||
+                            (firstAddr + 4 == objectAddr &&
+                             Allocator.IsAlignment(firstAddr)),
+                            "VerifyFirst 2");
+          }
+      }
+
+  }
+
+}
diff --git a/base/Kernel/Bartok/GCs/MarkSweepCollector.cs b/base/Kernel/Bartok/GCs/MarkSweepCollector.cs
new file mode 100644
index 0000000..d3a2e8f
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/MarkSweepCollector.cs
@@ -0,0 +1,560 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+#if SINGULARITY_PROCESS
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.V1.Threads;
+#else
+    using Microsoft.Singularity.Memory;
+#endif
+#endif
+
+    [NoCCtor]
+    [RequiredByBartok]
+    internal class MarkSweepCollector: StopTheWorldCollector
+    {
+        private static UIntPtr collectionTrigger;
+
+        internal static MarkSweepCollector instance;
+
+        // Visitor instances used for marking objects
+        private static MarkReferenceVisitor markReferenceVisitor;
+        private static UpdateReferenceVisitor updateReferenceVisitor;
+        private static ThreadMarkReferenceVisitor threadMarkReferenceVisitor;
+        private static SweepVisitor sweepVisitor;
+
+        private static GCProfiler gcProfiler;
+        private static ProfileRootsDelegate profileRoots;
+        private static ProfileObjectsDelegate profileObjects;
+        private static bool heapDamaged;
+
+        private MarkSweepCollector() {
+        }
+
+        public static new void Initialize() {
+            GC.Initialize();
+            StopTheWorldCollector.Initialize();
+            SegregatedFreeList.Initialize();
+            // instance = new MarkSweepCollector();
+            MarkSweepCollector.instance = (MarkSweepCollector)
+                BootstrapMemory.Allocate(typeof(MarkSweepCollector));
+            // markReferenceVisitor = new MarkReferenceVisitor();
+            markReferenceVisitor = (MarkReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(MarkReferenceVisitor));
+            // updateReferenceVisitor = new UpdateReferenceVisitor();
+            updateReferenceVisitor = (UpdateReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(UpdateReferenceVisitor));
+            // threadMarkReferenceVisitor = new ThreadMarkReferenceVisitor();
+            threadMarkReferenceVisitor = (ThreadMarkReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(ThreadMarkReferenceVisitor));
+            // sweepVisitor = new SweepVisitor();
+            sweepVisitor = (SweepVisitor)
+                BootstrapMemory.Allocate(typeof(SweepVisitor));
+            collectionTrigger = (UIntPtr) (1 << 24);
+        }
+
+        // GCInterface methods
+        internal override bool IsOnTheFlyCollector {
+            get {
+                return false;
+            }
+        }
+
+        internal override void SetProfiler(GCProfiler profiler)
+        {
+            if (gcProfiler != null) {
+                throw new InvalidOperationException("Only one GCProfiler can be active in a process");
+            }
+            profileRoots = new ProfileRootsDelegate(ProfileScanRoots);
+            profileObjects = new ProfileObjectsDelegate(ProfileScanObjects);
+            gcProfiler = profiler;
+        }
+
+        internal override void CollectStopped(int currentThreadIndex,
+                                              int generation)
+        {
+#if SINGULARITY
+            UIntPtr preGcTotalBytes = SegregatedFreeList.TotalBytes;
+#if DEBUG
+            DebugStub.WriteLine("~~~~~ Start MarkSweep Cleanup  [data={0:x8}, pid={1:x3}]",
+                                __arglist(SegregatedFreeList.TotalBytes,
+                                          PageTable.processTag >> 16));
+#endif
+#if SINGULARITY_KERNEL
+    #if THREAD_TIME_ACCOUNTING
+            TimeSpan ticks = Thread.CurrentThread.ExecutionTime;
+            TimeSpan ticks2 = SystemClock.KernelUpTime;
+    #else
+            TimeSpan ticks = SystemClock.KernelUpTime;
+    #endif
+#elif SINGULARITY_PROCESS
+    #if THREAD_TIME_ACCOUNTING
+            TimeSpan ticks = ProcessService.GetThreadTime();
+            TimeSpan ticks2 = ProcessService.GetUpTime();
+    #else
+            TimeSpan ticks = ProcessService.GetUpTime();
+    #endif
+#endif
+#endif
+            if (GC.IsProfiling) {
+                gcProfiler.NotifyPreGC(MinGeneration);
+                // non-generational collector, so pretend Gen0
+                // Calls like ResurrectCandidates below can cause
+                // allocations and thus, potentially, profiler
+                // notifications.  However, at that time the heap is
+                // damaged in the sense that VPtrs have bits OR-ed in
+                // for object marking.  We do not want to accept
+                // profiling during this window.
+                //
+                // There is no synchronization issue with setting this
+                // flag because it will only be consulted by the
+                // thread that sets and resets it.
+                heapDamaged = true;
+            }
+            // 1) Mark the live objects
+            CollectorStatistics.Event(GCEvent.TraceStart);
+#if !VC
+            TryAllManager.PreGCHookTryAll();
+#endif
+            MultiUseWord.PreGCHook(false /* don't use shadows */);
+            Finalizer.PrepareCollectFinalizers();
+            int countThreads =
+                CallStack.ScanStacks(threadMarkReferenceVisitor,
+                                     threadMarkReferenceVisitor);
+            Thread.VisitBootstrapData(markReferenceVisitor);
+#if SINGULARITY_KERNEL
+            Kernel.VisitSpecialData(markReferenceVisitor);
+#endif
+            MultiUseWord.VisitStrongRefs(markReferenceVisitor,
+                                         false /* Don't use shadows */);
+#if !VC
+            TryAllManager.VisitStrongRefs(markReferenceVisitor);
+#endif
+            StaticData.ScanStaticData(markReferenceVisitor);
+            CollectorStatistics.Event(GCEvent.TraceSpecial);
+            WeakReference.Process(updateReferenceVisitor, true, true);
+            Finalizer.ResurrectCandidates(updateReferenceVisitor,
+                                          markReferenceVisitor, true);
+            markReferenceVisitor.Cleanup();
+            UnmanagedPageList.ReleaseStandbyPages();
+            // 2) Sweep the garbage objects
+            CollectorStatistics.Event(GCEvent.SweepStart, TotalMemory);
+            WeakReference.Process(updateReferenceVisitor, true, false);
+            MultiUseWord.VisitWeakRefs(updateReferenceVisitor,
+                                       false /* Don't use shadows */);
+#if !VC
+            TryAllManager.VisitWeakRefs(updateReferenceVisitor);
+#endif
+            SegregatedFreeList.VisitAllObjects(sweepVisitor);
+            SegregatedFreeList.RecycleGlobalPages();
+            SegregatedFreeList.CommitFreedData();
+            CollectorStatistics.Event(GCEvent.SweepSpecial);
+            MultiUseWord.PostGCHook();
+            if (GC.IsProfiling) {
+                heapDamaged = false;
+                // Allocations may occur inside the PostGCHook.  Hopefully a
+                // sufficiently limited quantity that we don't recursively
+                // trigger a GC.
+                gcProfiler.NotifyPostGC(profileRoots, profileObjects);
+            }
+            Finalizer.ReleaseCollectFinalizers();
+#if !VC
+            TryAllManager.PostGCHookTryAll();
+#endif
+            CollectorStatistics.Event(GCEvent.CollectionComplete,
+                                      TotalMemory);
+            // 3) Determine a new collection trigger
+            UIntPtr testTrigger = (UIntPtr) this.TotalMemory >> 2;
+            UIntPtr minTrigger = (UIntPtr) (1 << 24);
+            UIntPtr maxTrigger = (UIntPtr) (1 << 26);
+            collectionTrigger =
+                (testTrigger > minTrigger) ?
+                (testTrigger < maxTrigger ?
+                 testTrigger : maxTrigger) : minTrigger;
+#if SINGULARITY
+#if SINGULARITY_KERNEL
+    #if THREAD_TIME_ACCOUNTING
+            int procId = Thread.CurrentProcess.ProcessId;
+            ticks = Thread.CurrentThread.ExecutionTime - ticks;
+            ticks2 = SystemClock.KernelUpTime - ticks2;
+    #else
+            ticks = SystemClock.KernelUpTime - ticks;
+    #endif
+            //Thread.CurrentProcess.SetGcPerformanceCounters(ticks, (long) SegregatedFreeList.TotalBytes);
+#elif SINGULARITY_PROCESS
+    #if THREAD_TIME_ACCOUNTING
+            ushort procId = ProcessService.GetCurrentProcessId();
+            ticks = ProcessService.GetThreadTime()  - ticks;
+            ticks2 = ProcessService.GetUpTime() - ticks2;
+    #else
+            ticks = ProcessService.GetUpTime() - ticks;
+    #endif
+            //ProcessService.SetGcPerformanceCounters(ticks, (long) SegregatedFreeList.TotalBytes);
+#endif
+#if DEBUG
+#if THREAD_TIME_ACCOUNTING
+            DebugStub.WriteLine("~~~~~ Finish MarkSweep Cleanup [data={0:x8}, diff={7:x8} pid={1:x3}, ms(Thread)={2:d6}, ms(System)={3:d6}, thds={4}, procId={5}, tid={6}]",
+                                __arglist(SegregatedFreeList.TotalBytes,
+                                          PageTable.processTag >> 16,
+                                          ticks.Milliseconds,
+                                          ticks2.Milliseconds,
+                                          countThreads,
+                                          procId,
+                                          Thread.GetCurrentThreadIndex(),
+                                          preGcTotalBytes - SegregatedFreeList.TotalBytes
+                                          ));
+#else
+            DebugStub.WriteLine("~~~~~ Finish MarkSweep Cleanup [data={0:x8}, pid={1:x3}, ms={2:d6}, thds={3}]",
+                __arglist(SegregatedFreeList.TotalBytes,
+                PageTable.processTag >> 16,
+                ticks.Milliseconds,
+                countThreads));
+#endif
+#endif
+#endif
+        }
+
+        internal override int CollectionGeneration(int genRequest) {
+            return MinGeneration;
+        }
+
+        // A profiler can request a scan of all Roots, passing in a
+        // visitor for callback.
+        private void ProfileScanRoots(NonNullReferenceVisitor visitor)
+        {
+            CallStack.ScanStacks(visitor, visitor);
+            Thread.VisitBootstrapData(visitor);
+#if SINGULARITY_KERNEL
+            Kernel.VisitSpecialData(visitor);
+#endif
+            MultiUseWord.VisitStrongRefs(visitor,
+                                         false /* Don't use shadows */);
+            StaticData.ScanStaticData(visitor);
+        }
+
+        // A profiler can request a scan of all Objects in the heap,
+        // passing in a visitor for callback.
+        private
+        void ProfileScanObjects(SegregatedFreeList.ObjectVisitor visitor)
+        {
+            SegregatedFreeList.VisitAllObjects(visitor);
+        }
+
+        internal override void ProfileAllocation(Object obj)
+        {
+            if (GC.IsProfiling && !heapDamaged) {
+                UIntPtr size = ObjectLayout.Sizeof(obj);
+                gcProfiler.NotifyAllocation(Magic.addressOf(obj),
+                                            obj.GetType(), size);
+            }
+        }
+
+        [Inline]
+        internal override UIntPtr AllocateObjectMemory(UIntPtr numBytes,
+                                                       uint alignment,
+                                                       Thread currentThread)
+        {
+            UIntPtr resultAddr =
+                SegregatedFreeList.AllocateFast(currentThread,
+                                                numBytes, alignment);
+            if (resultAddr == UIntPtr.Zero) {
+                resultAddr = this.AllocateObjectMemorySlow(numBytes, alignment,
+                                                           currentThread);
+            }
+            return resultAddr;
+        }
+
+        [NoInline]
+        private UIntPtr AllocateObjectMemorySlow(UIntPtr numBytes,
+                                                 uint alignment,
+                                                 Thread currentThread)
+        {
+            if (GC.newBytesSinceGC > collectionTrigger &&
+                !GC.allocationInhibitGC) {
+                //REVIEW: This actually happens after the trigger...
+                GC.InvokeCollection(currentThread);
+            }
+            return SegregatedFreeList.AllocateSlow(currentThread,
+                                                   numBytes, alignment);
+        }
+
+        internal override int GetGeneration(Object obj) {
+            return MinGeneration;
+        }
+
+        internal override int MaxGeneration {
+            get { return (int)PageType.Owner0; }
+        }
+
+        internal override int MinGeneration {
+            get { return (int)PageType.Owner0; }
+        }
+
+        internal override long TotalMemory {
+            get {
+                return (long)SegregatedFreeList.TotalBytes;
+#if false
+                UIntPtr pageCount = UIntPtr.Zero;
+                for (UIntPtr i=UIntPtr.Zero; i<PageTable.pageTableCount; i++) {
+                    if (PageTable.IsGcPage(i) && PageTable.IsMyPage(i)) {
+                        pageCount++;
+                    }
+                }
+                return (long) PageTable.RegionSize(pageCount);
+#endif
+            }
+        }
+
+        internal override void EnableHeap() {
+            // Do nothing
+        }
+
+        internal override void DestructHeap() {
+            if (GC.IsProfiling) {
+                gcProfiler.NotifyShutdown();
+            }
+        }
+
+        internal override void VerifyHeap(bool beforeCollection) {
+            Verifier.segregatedFreeListVerifier.VerifyHeap();
+        }
+
+        internal override UIntPtr FindObjectAddr(UIntPtr interiorPtr) {
+            return SegregatedFreeList.Find(interiorPtr);
+        }
+
+        internal override
+        void VisitObjects(ObjectLayout.ObjectVisitor objectVisitor,
+                          UIntPtr lowAddr, UIntPtr highAddr)
+        {
+            VTable.Assert(PageTable.PageAligned(lowAddr));
+            VTable.Assert(PageTable.PageAligned(highAddr));
+            UIntPtr lowPage = PageTable.Page(lowAddr);
+            UIntPtr highPage = PageTable.Page(highAddr);
+            SegregatedFreeList.VisitObjects(lowPage, highPage, objectVisitor);
+        }
+
+        internal override void NewThreadNotification(Thread newThread,
+                                                     bool initial)
+        {
+            base.NewThreadNotification(newThread, initial);
+            SegregatedFreeList.NewThreadNotification(newThread, initial);
+        }
+
+        internal override void DeadThreadNotification(Thread deadThread)
+        {
+            SegregatedFreeList.DeadThreadNotification(deadThread);
+            base.DeadThreadNotification(deadThread);
+        }
+
+        // Routines for updating pointers to new locations of marked objects
+        // No objects are resurrected using this mechanism
+        // As this is mark sweep the value does not need to be updated.
+        private class UpdateReferenceVisitor: NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert((PageTable.IsNonGcPage(pageType) &&
+                                   PageTable.IsMyPage(page)) ||
+                                  PageTable.IsStackPage(pageType));
+                    return;
+                }
+                VTable.Assert(PageTable.IsMyPage(page));
+                Object obj = Magic.fromAddress(addr);
+                VTable.Assert(obj.vtable != null, "Null VTable");
+                if (obj.GcMark() == UIntPtr.Zero) {
+                    // The object was not live
+                    *loc = UIntPtr.Zero;
+                }
+            }
+        }
+
+        private class MarkReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            private static UIntPtrStack workList;
+            private static bool fMarkInProgress;
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert((PageTable.IsNonGcPage(pageType) &&
+                                   PageTable.IsMyPage(page)) ||
+                                  PageTable.IsStackPage(pageType));
+                    return;
+                }
+                VTable.Assert(PageTable.IsMyPage(page));
+                Object obj = Magic.fromAddress(addr);
+                VTable.Assert(obj.vtable != null);
+                if (obj.GcMark((UIntPtr)1)) {
+                    // We changed the color of the object, so we
+                    // have to mark the objects reachable from the fields
+                    MarkVisit(obj);
+                }
+            }
+
+            internal void MarkVisit(Object obj) {
+                if (fMarkInProgress) {
+                    workList.Write(Magic.addressOf(obj));
+                } else {
+                    fMarkInProgress = true;
+                    this.VisitReferenceFields(obj);
+                    this.ProcessScheduledObjects();
+                    fMarkInProgress = false;
+                }
+            }
+
+            private void ProcessScheduledObjects() {
+                while (!workList.IsEmpty) {
+                    UIntPtr addr = workList.Read();
+                    Object obj = Magic.fromAddress(addr);
+                    this.VisitReferenceFields(obj);
+                }
+            }
+
+            internal void Cleanup() {
+                VTable.Assert(workList.IsEmpty);
+                workList.Cleanup(true);
+            }
+
+            [Inline]
+            internal override UIntPtr VisitReferenceFields(Object obj)
+            {
+                UIntPtr vtableAddr = Magic.addressOf(obj.vtable)&~(UIntPtr)3U;
+                VTable vtable = Magic.toVTable(Magic.fromAddress(vtableAddr));
+                return this.VisitReferenceFields(Magic.addressOf(obj),
+                                                 vtable);
+            }
+
+        }
+
+        private class ThreadMarkReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert((PageTable.IsNonGcPage(pageType) &&
+                                   PageTable.IsMyPage(page))||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType));
+                    return;
+                }
+                UIntPtr objectAddr = SegregatedFreeList.Find(addr);
+                markReferenceVisitor.Visit(&objectAddr);
+            }
+
+        }
+
+        private class SweepVisitor : SegregatedFreeList.ObjectVisitor
+        {
+
+            private SegregatedFreeList.TempList tempList;
+
+            internal override void VisitSmall(Object obj, UIntPtr memAddr)
+            {
+                if (!obj.GcMark(UIntPtr.Zero)) {
+                    // We did not change the color of the object back
+                    // to unmarked, so we are responsible for freeing it.
+                    tempList.Add(memAddr);
+                }
+            }
+
+            internal override void VisitSmallPageEnd() {
+                SegregatedFreeList.FreeSmallList(ref tempList);
+            }
+
+            internal override UIntPtr VisitLarge(Object obj)
+            {
+                UIntPtr objectSize =
+                    ObjectLayout.ObjectSize(Magic.addressOf(obj),
+                                            obj.GcUnmarkedVTable);
+                if (!obj.GcMark(UIntPtr.Zero)) {
+                    // We did not change the color of the object back
+                    // to unmarked, so we are responsible for freeing it.
+                    SegregatedFreeList.FreeLarge(obj);
+                }
+                // REVIEW: Should we return a real size here?
+                return objectSize;
+            }
+
+        }
+
+        private class VerifyVisitor : ObjectLayout.ObjectVisitor {
+
+            internal static VerifyVisitor visitor = new VerifyVisitor();
+
+            internal override UIntPtr Visit(Object obj) {
+                UIntPtr size;
+                if (obj.GcMark() != UIntPtr.Zero) {
+                    // The object has the mark color, so it should only
+                    // reference other objects with the mark color.
+                    size = VerifyMarkVisitor.visitor.VisitReferenceFields(obj);
+                } else {
+                    size = ObjectLayout.Sizeof(obj);
+                }
+                return size;
+            }
+
+        }
+
+        private class VerifyMarkVisitor : NonNullReferenceVisitor {
+
+            internal static VerifyMarkVisitor visitor =new VerifyMarkVisitor();
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                // Ignore pointers out of our memory area
+                if (PageTable.IsForeignAddr(addr)) {
+                    return;
+                }
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (PageTable.IsGcPage(pageType)) {
+                    Object obj = Magic.fromAddress(addr);
+                    VTable.Assert(obj.GcMark() != UIntPtr.Zero);
+                    VTable.Assert(PageTable.IsMyPage(page));
+                }
+            }
+
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/MemoryAccounting.cs b/base/Kernel/Bartok/GCs/MemoryAccounting.cs
new file mode 100644
index 0000000..cdc543d
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/MemoryAccounting.cs
@@ -0,0 +1,539 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+  using System.Threading;
+  using System.Runtime.CompilerServices;
+  using Microsoft.Bartok.Runtime;
+
+  internal class MemoryAccounting {
+      private static BumpAllocator localArea;
+
+      private static ManagedPtrAccounting traceablePtrs;
+      private static ManagedPtrAccounting traceablePinnedPtrs;
+      private static StaticPtrAccounting staticPtrs;
+
+      private static AssertRTypeHeaders assertRTypeHeaders;
+      private static ObjectLayout.ObjectVisitor forGCAssertRTypeHeaders;
+      private static RuntimeTypeReckoner runtimeTypeReckoner;
+      private static ObjectLayout.ObjectVisitor forGCRuntimeTypeReckoner;
+      private static RuntimeTypeMapper runtimeTypeMapper;
+      private static ObjectLayout.ObjectVisitor forGCRuntimeTypeMapper;
+      private static InstanceReckoner instanceReckoner;
+      private static ObjectLayout.ObjectVisitor forGCInstanceReckoner;
+
+      private const int TABLE_SIZE = 1024;
+      private static RuntimeTypeAccounting[] table;
+
+      private static UIntPtr totalSize;
+
+      private static bool initialized;
+
+      internal static long MaxHeapWatermark;
+      internal static double AvgHeapSize;
+      internal static long Watermarks;
+
+      internal unsafe static void Initialize(GCType gcType) {
+          traceablePtrs = new ManagedPtrAccounting();
+          traceablePinnedPtrs = new ManagedPtrAccounting();
+          staticPtrs = new StaticPtrAccounting();
+
+          assertRTypeHeaders = new AssertRTypeHeaders();
+          forGCAssertRTypeHeaders = assertRTypeHeaders;
+          runtimeTypeReckoner = new RuntimeTypeReckoner();
+          forGCRuntimeTypeReckoner = runtimeTypeReckoner;
+          runtimeTypeMapper = new RuntimeTypeMapper();
+          forGCRuntimeTypeMapper = runtimeTypeMapper;
+          instanceReckoner = new InstanceReckoner();
+          forGCInstanceReckoner = instanceReckoner;
+
+          switch(gcType) {
+            case GCType.MarkSweepCollector: {
+                forGCAssertRTypeHeaders = new SegregatedFreeList.ObjectVisitorWrapper(assertRTypeHeaders);
+                forGCRuntimeTypeReckoner = new SegregatedFreeList.ObjectVisitorWrapper(runtimeTypeReckoner);
+                forGCRuntimeTypeMapper = new SegregatedFreeList.ObjectVisitorWrapper(runtimeTypeMapper);
+                forGCInstanceReckoner = new SegregatedFreeList.ObjectVisitorWrapper(instanceReckoner);
+                break;
+            }
+          }
+
+          table = new RuntimeTypeAccounting[TABLE_SIZE];
+
+          MemoryAccounting.initialized = true;
+      }
+
+      internal unsafe static void Report(GCType gcType) {
+          if(!MemoryAccounting.initialized) {
+              VTable.DebugPrint("MemoryAccounting invoked before"
+                                + " initialization was completed!");
+              return;
+          }
+
+          VTable.DebugPrint("\nCollector: ");
+          switch(gcType) {
+              case GCType.AdaptiveCopyingCollector: {
+                  VTable.DebugPrint("Adaptive Copying\n");
+                  break;
+              }
+              case GCType.MarkSweepCollector: {
+                  VTable.DebugPrint("Mark-Sweep\n");
+                  break;
+              }
+              case GCType.SemispaceCollector: {
+                  VTable.DebugPrint("Semispace\n");
+                  break;
+              }
+              case GCType.SlidingCollector: {
+                  VTable.DebugPrint("Sliding\n");
+                  break;
+              }
+              case GCType.ConcurrentMSCollector: {
+                  VTable.DebugPrint("Concurrent Mark-Sweep\n");
+                  break;
+              }
+              case GCType.ReferenceCountingCollector: {
+                  VTable.DebugPrint("Reference Counting\n");
+                  VTable.NotImplemented();
+                  return; // Not supported yet.
+              }
+#if !SINGULARITY
+              case GCType.DeferredReferenceCountingCollector: {
+                  VTable.DebugPrint("Deferred Reference Counting\n");
+                  VTable.NotImplemented();
+                  return; // Not supported yet.
+              }
+#endif
+              default: {
+                  VTable.NotReached("Unknown GC type: "+gcType);
+                  break;
+              }
+          }
+
+          uint pageSize = (uint)(PageTable.PageSize >> 10);
+          VTable.DebugPrint("\nPage size: {0}KB\nVM size: {1} KB\n",
+                            __arglist(pageSize,
+                                      pageSize*(uint)PageTable.pageTableCount));
+
+          ReportNonGCDetails();
+          ReportStackDetails();
+          ReportHeapDetails();
+      }
+
+      internal unsafe static void ReportNonGCDetails() {
+          VTable.DebugPrint("\nNon-GC data details:\n");
+          uint totalPageCount = TotalNumPages(PageType.NonGC);
+          VTable.DebugPrint("\tTotal number of pages: {0}",
+                            __arglist(totalPageCount));
+
+          VTable.DebugPrint("\n\tMemory accounting storage: {0}B",
+                            __arglist((uint)totalSize));
+
+          staticPtrs.Initialize();
+          uint staticSize = StaticData.ScanStaticPointerData(staticPtrs);
+          VTable.DebugPrint("\n\tCompile-time allocated data: {0}B",
+                            __arglist(staticSize));
+          VTable.DebugPrint("\n\tNumber of pointers: {0}",
+                            __arglist(staticPtrs.PtrCount));
+          uint bootstrapPageCount = totalPageCount -
+              (uint)PageTable.PageCount((UIntPtr)staticSize);
+          VTable.DebugPrint("\n\tNumber of bootstrap pages: {0}\n",
+                            __arglist(bootstrapPageCount));
+      }
+
+      internal unsafe static void ReportStackDetails() {
+          VTable.DebugPrint("\nStack details:\n");
+          VTable.DebugPrint("\tTotal number of reserved pages: {0}",
+                            __arglist(TotalNumPages(PageType.Stack)));
+
+          for (int i = 0; i < Thread.threadTable.Length; i++) {
+              traceablePtrs.Initialize();
+              traceablePinnedPtrs.Initialize();
+
+              Thread t = Thread.threadTable[i];
+              if (t == null) {
+                  continue;
+              }
+
+              uint numStackFrames =
+                  CallStack.ScanStack(t, traceablePtrs,
+                                      traceablePinnedPtrs);
+
+              VTable.DebugPrint("\n\tThread: {0}",
+                                __arglist(i));
+              VTable.DebugPrint("\n\t\tStack frame count: {0}",
+                                __arglist(numStackFrames));
+              VTable.DebugPrint("\n\t\tManaged ptrs to static data: {0}",
+                                __arglist
+                                (traceablePtrs.managedPtrsToStaticData));
+              VTable.DebugPrint("\n\t\tManaged ptrs to stack: {0}",
+                                __arglist(traceablePtrs.managedPtrsToStack));
+              VTable.DebugPrint("\n\t\tExterior managed heap ptrs: {0}",
+                                __arglist
+                                (traceablePtrs.exteriorManagedHeapPtrs));
+              VTable.DebugPrint("\n\t\tInterior managed heap ptrs: {0}",
+                                __arglist
+                                (traceablePtrs.interiorManagedHeapPtrs));
+
+#if !SINGULARITY
+              UIntPtr stackTop = (UIntPtr) CallStack.StackMarker(t);
+              uint stackSize = 0;
+              if (stackTop != UIntPtr.Zero) {
+                  VTable.Assert(CallStack.StackBase(t) > stackTop,
+                                @"t.asmStackBase > stackTop");
+
+                  stackSize = (uint)(CallStack.StackBase(t)-stackTop);
+              }
+              VTable.DebugPrint("\n\t\tApprox. stack size: {0}B",
+                                __arglist(stackSize));
+#endif
+
+              // REVIEW: Why are these here?
+              VTable.Assert(traceablePinnedPtrs.
+                            managedPtrsToStaticData == 0,
+                            @"traceablePinnedPtrs.
+                            managedPtrsToStaticData == 0");
+              VTable.Assert(traceablePinnedPtrs.
+                            managedPtrsToStack == 0,
+                            @"traceablePinnedPtrs.
+                            managedPtrsToStack == 0");
+
+              VTable.DebugPrint("\n\t\tPinned managed heap ptrs: {0}",
+                                __arglist
+                                (traceablePinnedPtrs.exteriorManagedHeapPtrs +
+                                 traceablePinnedPtrs.interiorManagedHeapPtrs));
+          }
+
+          VTable.DebugPrint("\n");
+      }
+
+      internal static void ReportHeapDetails() {
+          VTable.DebugPrint("\nHeap details:\n");
+          uint pageCount = 0;
+          for (UIntPtr i = UIntPtr.Zero; i < PageTable.pageTableCount;
+               i++) {
+              if (PageTable.IsMyGcPage(i)) {
+                  pageCount++;
+              }
+          }
+          VTable.DebugPrint("\tTotal number of heap pages: {0}",
+                            __arglist(pageCount));
+
+          // The following obtains counts of heap objects against types.
+          UIntPtr lowPage = UIntPtr.Zero;
+          UIntPtr highPage = PageTable.pageTableCount;
+          assertRuntimeTypeHeaders(lowPage, highPage);
+
+          // First count the RuntimeType instances for heap objects.
+          runtimeTypeReckoner.Initialize(true);
+          visitAllObjects(forGCRuntimeTypeReckoner, lowPage, highPage);
+
+          // Next, create a table for RuntimeType instance accounting.
+          // NOTE: Storage for the table is marked "non-GC". Since
+          // static data accounting is done before this, it's okay.
+          int numSlots = runtimeTypeReckoner.Count;
+          if(numSlots > TABLE_SIZE) {
+              VTable.DebugPrint("Need {0} slots, have {1}\n",
+                                __arglist(numSlots, TABLE_SIZE));
+              VTable.NotReached("MemoryAccounting table not large enough");
+          }
+
+          // Associate a table slot for each RuntimeType instance.
+          runtimeTypeMapper.Initialize(false, MemoryAccounting.table);
+          visitAllObjects(forGCRuntimeTypeMapper, lowPage, highPage);
+
+          // Map each relevant RuntimeType instance to its table slot.
+          for (uint i = 0; i < numSlots; i++) {
+              RuntimeType rType = MemoryAccounting.table[i].RuntimeTypeObject;
+              VTable.Assert(!MultiUseWord.IsMarked(rType),
+                            @"!MultiUseWord.IsMarked(rType)");
+              MemoryAccounting.table[i].SavedMUW =
+                  MultiUseWord.GetForObject(rType);
+              MultiUseWord.SetValForObject(rType, (UIntPtr)i);
+          }
+
+          // Count heap object instances by RuntimeType using table.
+          instanceReckoner.Initialize(MemoryAccounting.table);
+          visitAllObjects(forGCInstanceReckoner, lowPage, highPage);
+
+          // Bubble sort the table in decreasing order of total size.
+          for (int i = 0; i < numSlots; i++) {
+              for (int j = numSlots-1; j > i; j--) {
+                  if (MemoryAccounting.table[j].TotalSize
+                      > MemoryAccounting.table[j-1].TotalSize) {
+                      // Swap contents.
+                      RuntimeTypeAccounting temp = MemoryAccounting.table[j];
+                      MemoryAccounting.table[j] = MemoryAccounting.table[j-1];
+                      MemoryAccounting.table[j-1] = temp;
+                  }
+              }
+          }
+
+          // Display table.
+          VTable.DebugPrint("\n\tCounts of objects against types:\n");
+          for (uint i = 0; i < numSlots; i++) {
+              if((uint)MemoryAccounting.table[i].TotalSize < 1024) {
+                  continue;
+              }
+              VTable.DebugPrint
+                  ("\t\t{0,36} instances: {1,6}, bytes: {2,10}\n",
+                   __arglist(MemoryAccounting.table[i].RuntimeTypeObject.Name,
+                             (uint)MemoryAccounting.table[i].Count,
+                             (uint)MemoryAccounting.table[i].TotalSize));
+          }
+
+          // Reset book-keeping information maintained in headers and the global
+          // table.
+          for (uint i = 0; i < numSlots; i++) {
+              RuntimeType rType = MemoryAccounting.table[i].RuntimeTypeObject;
+              MultiUseWord.SetForObject
+                  (rType, MemoryAccounting.table[i].SavedMUW);
+              VTable.Assert(!MultiUseWord.IsMarked(rType),
+                            "@!MultiUseWord.IsMarked(rType)");
+
+              MemoryAccounting.table[i].RuntimeTypeObject = null;
+              MemoryAccounting.table[i].SavedMUW =
+                  new MultiUseWord(new UIntPtr(0));
+              MemoryAccounting.table[i].TotalSize = new UIntPtr(0);
+              MemoryAccounting.table[i].Count = 0;
+          }
+      }
+
+      internal static void ReportHeapWatermarks() {
+          VTable.DebugPrint("Max. Heap: {0}KB ",
+                            __arglist(MaxHeapWatermark >> 10));
+          VTable.DebugPrint("Avg. Heap: {0}KB ",
+                            __arglist(((ulong)AvgHeapSize) >> 10));
+          VTable.DebugPrint("\n");
+      }
+
+      [ManualRefCounts]
+      internal static void RecordHeapWatermarks() {
+          long totalMemory = GC.installedGC.TotalMemory;
+          if (totalMemory > MaxHeapWatermark) {
+              MaxHeapWatermark = totalMemory;
+          }
+          AvgHeapSize =
+              (AvgHeapSize*Watermarks+totalMemory)/(Watermarks+1);
+          Watermarks++;
+      }
+
+      internal static uint TotalNumPages(PageType kind) {
+          uint pageCount = 0;
+          for (UIntPtr i = UIntPtr.Zero; i < PageTable.pageTableCount;
+               i++) {
+              if (PageTable.IsMyPage(i)) {
+                  PageType pageType = PageTable.Type(i);
+                  if (pageType == kind) {
+                      pageCount++;
+                  }
+              }
+          }
+
+          return pageCount;
+      }
+
+      private static void visitAllObjects(ObjectLayout.ObjectVisitor visitor,
+                                          UIntPtr lowPage, UIntPtr highPage)
+      {
+          for (UIntPtr first = lowPage; first < highPage; first++) {
+              if (PageTable.IsMyGcPage(first)) {
+                  UIntPtr last = first+1;
+                  while (last < highPage) {
+                      if (!PageTable.IsMyGcPage(last)) {
+                          break;
+                      }
+                      last++;
+                  }
+                  UIntPtr start = PageTable.PageAddr(first);
+                  UIntPtr end = PageTable.PageAddr(last);
+                  GC.installedGC.VisitObjects(visitor, start, end);
+                  first = last;
+              }
+          }
+      }
+
+      [System.Diagnostics.Conditional("DEBUG")]
+      private static void assertRuntimeTypeHeaders(UIntPtr lowPage,
+                                                   UIntPtr highPage) {
+          visitAllObjects(forGCAssertRTypeHeaders, lowPage, highPage);
+      }
+
+
+      private class ManagedPtrAccounting : NonNullReferenceVisitor {
+          internal uint managedPtrsToStaticData;
+          internal uint managedPtrsToStack;
+          internal uint interiorManagedHeapPtrs;
+          internal uint exteriorManagedHeapPtrs;
+
+          internal void Initialize() {
+              managedPtrsToStaticData = 0;
+              managedPtrsToStack = 0;
+              interiorManagedHeapPtrs = 0;
+              exteriorManagedHeapPtrs = 0;
+          }
+
+          internal override unsafe void Visit(UIntPtr* loc) {
+              // <loc> is a traceable pointer; its referent
+              // either resides in the heap, the stack or in
+              // the static data area.
+              UIntPtr addr = *loc;
+
+              UIntPtr page = PageTable.Page(addr);
+              VTable.Assert(PageTable.IsMyPage(page),
+                            "MemoryAccounting: !IsMyPage");
+              if (!PageTable.IsGcPage(page)) {
+                  PageType pageType = PageTable.Type(page);
+                  VTable.Assert(pageType == PageType.NonGC ||
+                                pageType == PageType.Stack ||
+                                pageType == PageType.Shared,
+                                "unexpected page type");
+
+                  if (pageType == PageType.NonGC) {
+                      // A managed pointer into the static data area.
+                      managedPtrsToStaticData++;
+                  } else {
+                      // A managed pointer into the stack area.
+                      managedPtrsToStack++;
+                  }
+                  return;
+              }
+
+              UIntPtr objAddr = GC.installedGC.FindObjectAddr(addr);
+              if (objAddr != addr) {
+                  // A "truly" interior pointer into a heap object.
+                  interiorManagedHeapPtrs++;
+              } else {
+                  exteriorManagedHeapPtrs++;
+              }
+          }
+      }
+
+      private class StaticPtrAccounting : NonNullReferenceVisitor {
+          internal uint PtrCount;
+
+          internal void Initialize() {
+              PtrCount = 0;
+          }
+
+          internal override unsafe void Visit(UIntPtr* loc) {
+              // <loc> is an address of a reference location
+              // in the static data area.
+              UIntPtr page = PageTable.Page((UIntPtr)loc);
+              PageType pageType = PageTable.Type(page);
+              VTable.Assert(pageType == PageType.NonGC,
+                            @"pageType == PageType.NonGC");
+
+              PtrCount++;
+          }
+      }
+
+      private struct RuntimeTypeAccounting {
+          // Reference to the accounted RuntimeType object.
+          internal RuntimeType RuntimeTypeObject;
+
+          // Copy of the accounted RuntimeType MultiUseWord.
+          internal MultiUseWord SavedMUW;
+
+          // Total size of all instances having this RuntimeType.
+          internal UIntPtr TotalSize;
+
+          // Number of instances having this RuntimeType.
+          internal uint Count;
+      }
+
+      private class AssertRTypeHeaders : ObjectLayout.ObjectVisitor {
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              RuntimeType rType = vtable.vtableType;
+              VTable.Assert(!MultiUseWord.IsMarked(rType),
+                            "@!MultiUseWord.IsMarked(rType)");
+              return ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+          }
+      }
+
+      private class RuntimeTypeReckoner : ObjectLayout.ObjectVisitor {
+          internal int Count;
+
+          internal void Initialize(bool isVisitedFlag) {
+              this.isVisitedFlag = isVisitedFlag;
+              this.Count = 0;
+          }
+
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              RuntimeType rType = vtable.vtableType;
+              if (MultiUseWord.IsMarked(rType) != this.isVisitedFlag) {
+                  this.Count++;
+                  MultiUseWord.SetMark(rType, this.isVisitedFlag);
+              }
+
+              return ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+          }
+
+          private bool isVisitedFlag;
+      }
+
+      private class RuntimeTypeMapper : ObjectLayout.ObjectVisitor {
+          internal void Initialize(bool isVisitedFlag,
+                                   RuntimeTypeAccounting[] table) {
+              this.isVisitedFlag = isVisitedFlag;
+              this.tableIndex = 0;
+              this.accounts = table;
+          }
+
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              RuntimeType rType = vtable.vtableType;
+              if (MultiUseWord.IsMarked(rType) != this.isVisitedFlag) {
+                  VTable.Assert(this.tableIndex <
+                                this.accounts.Length,
+                                @"this.tableIndex <
+                                  this.accounts.Length");
+
+                  this.accounts[this.tableIndex].RuntimeTypeObject =
+                      rType;
+                  this.accounts[this.tableIndex].TotalSize =
+                      UIntPtr.Zero;
+                  this.accounts[this.tableIndex].Count = 0;
+                  MultiUseWord.SetMark(rType, this.isVisitedFlag);
+                  this.tableIndex++;
+              }
+
+              return ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+          }
+
+          private bool isVisitedFlag;
+          private uint tableIndex;
+          private RuntimeTypeAccounting[] accounts;
+      }
+
+      private class InstanceReckoner : ObjectLayout.ObjectVisitor {
+          internal void Initialize(RuntimeTypeAccounting[] table) {
+              this.accounts = table;
+          }
+
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              RuntimeType rType = vtable.vtableType;
+              uint tableIndex = (uint) MultiUseWord.GetValForObject(rType);
+              UIntPtr objAddr = Magic.addressOf(obj);
+              this.accounts[tableIndex].TotalSize +=
+                  ObjectLayout.ObjectSize(objAddr, vtable);
+              this.accounts[tableIndex].Count++;
+
+              return ObjectLayout.ObjectSize(objAddr, vtable);
+          }
+
+          private RuntimeTypeAccounting[] accounts;
+      }
+  }
+}
diff --git a/base/Kernel/Bartok/GCs/MemoryManager.cs b/base/Kernel/Bartok/GCs/MemoryManager.cs
new file mode 100644
index 0000000..8747d24
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/MemoryManager.cs
@@ -0,0 +1,359 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Memory;
+    using Sing_MemoryManager = Microsoft.Singularity.Memory.MemoryManager;
+#elif SINGULARITY_PROCESS
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Services;
+#endif
+
+    internal class MemoryManager
+    {
+
+        private static UIntPtr allocationGranularity;
+        private static UIntPtr totalMemorySize;
+        private static UIntPtr operatingSystemSize;
+
+        private static bool inAllocator;
+
+#if SINGULARITY
+
+        internal static unsafe void Initialize()
+        {
+            allocationGranularity = (UIntPtr)0x10000;
+            totalMemorySize = PageTable.PageSize * PageTable.pageTableCount;
+            operatingSystemSize = totalMemorySize / 16;
+        }
+
+        //////////////////////////////////// Allocation and Free Routines.
+        //
+        // Allocation is optimized for the case where an allocation starts
+        // with a relatively small amount of memory and grows over time.
+        // This is exactly the behavior exhibited by stacks and GC heaps.
+        //
+        // The allocation strategy also works well for large initial
+        // allocations.  The strategy would be very inefficient if a very
+        // large number of small, completely independent allocations are
+        // made.
+        //
+        // AllocateMemory(size) performs an initial allocation.
+        // AllocateMemory(startAddr, size) performs growing allocations.
+        //
+        internal static unsafe UIntPtr AllocateMemory(UIntPtr size)
+        {
+            VTable.Assert(PageTable.PageAligned(size));
+#if SINGULARITY_KERNEL
+            UIntPtr addr = Sing_MemoryManager.KernelAllocate(
+                Sing_MemoryManager.PagesFromBytes(size),
+                Process.kernelProcess, 0, PageType.Unknown);
+#elif SINGULARITY_PROCESS
+            UIntPtr addr = PageTableService.Allocate(size);
+#endif
+
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint((int)size);
+            Kernel.Waypoint(811);
+#endif // SINGULARITY_KERNEL
+
+            if (addr != UIntPtr.Zero) {
+                Util.MemClear(addr, size);
+            }
+            return addr;
+        }
+
+        internal static unsafe bool AllocateMemory(UIntPtr startAddr,
+                                                   UIntPtr size)
+        {
+            VTable.Deny(inAllocator);
+            inAllocator = true;
+            VTable.Assert(PageTable.PageAligned(startAddr));
+            VTable.Assert(PageTable.PageAligned(size));
+
+#if SINGULARITY_KERNEL
+            UIntPtr addr = Sing_MemoryManager.KernelExtend(
+                startAddr, Sing_MemoryManager.PagesFromBytes(size),
+                Process.kernelProcess, PageType.Unknown);
+#elif SINGULARITY_PROCESS
+            UIntPtr addr = PageTableService.AllocateExtend(startAddr, size);
+#endif
+            inAllocator = false;
+            if (addr != UIntPtr.Zero) {
+                Util.MemClear(addr, size);
+                return true;
+            }
+            return false;
+        }
+
+        [Inline]
+        internal static void FreeMemory(UIntPtr startAddr, UIntPtr size)
+        {
+#if SINGULARITY_KERNEL
+            DebugStub.Assert(Sing_MemoryManager.IsPageAligned(size));
+            Sing_MemoryManager.KernelFree(
+                startAddr, Sing_MemoryManager.PagesFromBytes(size),
+                Process.kernelProcess);
+#elif SINGULARITY_PROCESS
+            VTable.Assert((size & PageTable.PageMask) == 0);
+            PageTableService.Free(startAddr, size);
+#endif
+        }
+
+        internal static void IgnoreMemoryContents(UIntPtr startAddr,
+                                                  UIntPtr regionSize)
+        {
+            // Since we don't do swapping, we simply ignore this information
+        }
+
+        internal static bool QueryMemory(UIntPtr queryAddr,
+                                             out UIntPtr regionAddr,
+                                             out UIntPtr regionSize)
+        {
+#if SINGULARITY_KERNEL
+            PageType type = Sing_MemoryManager.KernelQuery(
+                queryAddr, out regionAddr, out regionSize);
+            return (type != PageType.Unknown);
+#elif SINGULARITY_PROCESS
+            return PageTableService.Query(queryAddr, out regionAddr, out regionSize);
+#endif
+        }
+
+#else // not SINGULARITY
+        [PreInitRefCounts]
+        [NoStackLinkCheck]
+        internal static unsafe void Initialize() {
+            SYSTEM_INFO systemInfo;
+            GetSystemInfo(out systemInfo);
+            allocationGranularity =
+                new UIntPtr(systemInfo.AllocationGranularity);
+            MEMORYSTATUSEX memoryStatus = new MEMORYSTATUSEX();
+            memoryStatus.Length = (uint) sizeof(MEMORYSTATUSEX);
+            GlobalMemoryStatusEx(ref memoryStatus);
+            if (memoryStatus.TotalPhysical <= ((ulong)UIntPtr.MaxValue)) {
+                totalMemorySize = (UIntPtr) memoryStatus.TotalPhysical;
+            } else {
+                // TotalPhysical exceeds UIntPtr.MaxValue running in 32bit
+                // mode on a machine with more than 4GB of RAM
+                totalMemorySize = UIntPtr.MaxValue;
+            }
+            // We are just making  a random guess here
+            operatingSystemSize = (UIntPtr) 1 << 26;
+        }
+
+        // Low-level routines based on Win32
+
+        internal const int PAGE_READWRITE =    0x04;
+        internal const int PAGE_EXECUTE_READWRITE = 0x40;
+        internal const int PAGE_NOACCESS = 0x01;
+        internal const int MEM_COMMIT     =  0x1000;
+        internal const int MEM_RESERVE    =  0x2000;
+        private const int MEM_DECOMMIT   =  0x4000;
+        internal const int MEM_RELEASE    =  0x8000;
+        private const int MEM_FREE       = 0x10000;
+        private const int MEM_RESET      = 0x80000;
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct MEMORY_BASIC_INFORMATION {
+            internal UIntPtr BaseAddress;
+            internal UIntPtr AllocationBase;
+            internal int  AllocationProtect;
+            internal UIntPtr RegionSize;
+            internal int  State;
+            internal int  Protect;
+            internal int  Type;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct SYSTEM_INFO {
+            internal ushort ProcessorArchitecture;
+            internal ushort Reserved;
+            internal uint PageSize;
+            internal UIntPtr MinimumApplicationAddress;
+            internal UIntPtr MaximumApplicationAddress;
+            internal uint ActiveProcessorMask;
+            internal uint NumberOfProcessors;
+            internal uint ProcessorType;
+            internal uint AllocationGranularity;
+            internal ushort ProcessorLevel;
+            internal ushort ProcessorRevision;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct MEMORYSTATUSEX {
+            internal uint Length;
+            internal uint MemoryLoad;
+            internal ulong TotalPhysical;
+            internal ulong AvailPhysical;
+            internal ulong TotalPageFile;
+            internal ulong AvailPageFile;
+            internal ulong TotalVirtual;
+            internal ulong AvailVirtual;
+            internal ulong AvailExtendedVirtual;
+        }
+
+        // Kernel32.dll functions (via MSVCRT.dll)
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [NoStackLinkCheck]
+        [StackBound(1024)]
+        public static unsafe extern void *VirtualAlloc(void *lpAddress,
+                                                       UIntPtr dwSize,
+                                                       int fIAllocationType,
+                                                       int fIProtect);
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        internal static unsafe extern int VirtualFree(void *lpAddress,
+                                                      UIntPtr dwSize,
+                                                      int dwFreeType);
+
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        private static unsafe extern UIntPtr VirtualQuery(void *lpAddress, out MEMORY_BASIC_INFORMATION memInfo, UIntPtr dwLength);
+
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [NoStackLinkCheck]
+        [StackBound(1024)]
+        private static unsafe extern void GetSystemInfo(out SYSTEM_INFO systemInfo);
+
+        [DllImport("BRT")]
+        [GCAnnotation(GCOption.NOGC)]
+        [NoStackLinkCheck]
+        [StackBound(1024)]
+        private static unsafe extern void GlobalMemoryStatusEx(ref MEMORYSTATUSEX memoryStatus);
+
+        // Low-level routines based on the operating system interface
+
+        private static unsafe UIntPtr AllocateMemoryHelper(UIntPtr startAddr,
+                                                           UIntPtr size)
+        {
+            void *result = VirtualAlloc((void *) startAddr,
+                                        size, MEM_RESERVE, PAGE_READWRITE);
+            VTable.Assert
+                (PageTable.Page((UIntPtr) result + size - 1)
+                 < PageTable.pageTableCount,
+                 "OutOfMemory: MemoryManager: memory doesn't fit in page table");
+            if (result != null) {
+                Trace.Log(Trace.Area.Page,
+                          "VirtualAlloc {0} at {1}",
+                          __arglist(size, result));
+                VTable.Assert((startAddr == UIntPtr.Zero)
+                              || (result == (void *) startAddr));
+
+                void *area = VirtualAlloc(result, size,
+                                          MEM_COMMIT, PAGE_READWRITE);
+                if (PageTable.halPageDescriptor != null) {
+                    PageTable.CreateNewPageTablesIfNecessary(PageTable.Page((UIntPtr)result), PageTable.PageCount(size));
+                    PageTable.SetProcess(PageTable.Page((UIntPtr) area),
+                                         PageTable.PageCount(size));
+                }
+                VTable.Assert(result == area);
+#if HIMEM
+                // This assertion intends only to catch bugs in Bartok. But if
+                // the system (windows) frees memory before, the memory
+                // may be in low memory, and if we happen to get that
+                // memory, this assertion itself may not hold
+                VTable.Assert((UIntPtr) result >= PageTable.HIMEMStart, 
+                    ("High memory is expected to be allocated in HIMEM mode"));
+#endif                
+            }
+            return new UIntPtr(result);
+        }
+
+        internal static unsafe bool AllocateMemory(UIntPtr startAddr,
+                                                   UIntPtr size) {
+            UIntPtr addr = AllocateMemoryHelper(startAddr, size);
+            return addr != UIntPtr.Zero;
+        }
+
+        internal static unsafe UIntPtr AllocateMemory(UIntPtr size) {
+            return AllocateMemoryHelper(UIntPtr.Zero, size);
+        }
+
+        internal static unsafe void FreeMemory(UIntPtr addr, UIntPtr size) {
+            Trace.Log(Trace.Area.Page,
+                      "VirtualFree {0} at {1}",
+                      __arglist(size, addr));
+            int success = VirtualFree((void *) addr, UIntPtr.Zero,
+                                      MEM_RELEASE);
+            VTable.Assert(success != 0);
+        }
+
+        // Indicate that we still own the memory but that we don't care
+        // about the content of the memory.  The virtual memory system
+        // does not have to write the memory to the swap file in order
+        // to reuse the physical memory for other purposes.
+        internal static unsafe void IgnoreMemoryContents(UIntPtr startAddr,
+                                                         UIntPtr regionSize)
+        {
+            Trace.Log(Trace.Area.Page,
+                      "VirtualAlloc-Reset {0} at {1}",
+                      __arglist(regionSize, startAddr));
+            void * result = VirtualAlloc((void *) startAddr, regionSize,
+                                         MEM_RESET, PAGE_READWRITE);
+            VTable.Assert(result == (void *) startAddr,
+                          "VirtualAlloc MEM_RESET failed");
+        }
+
+        internal static unsafe bool QueryMemory(UIntPtr queryAddr,
+                                                out UIntPtr regionAddr,
+                                                out UIntPtr regionSize)
+        {
+            VTable.Assert(PageTable.PageAligned(queryAddr));
+            MEMORY_BASIC_INFORMATION memInfo;
+            UIntPtr size = (UIntPtr) sizeof(MEMORY_BASIC_INFORMATION);
+            UIntPtr data = VirtualQuery((void *) queryAddr, out memInfo, size);
+            Trace.Log(Trace.Area.Page,
+                      "VirtualQuery {0}: base={1} size={2}",
+                      __arglist(queryAddr, memInfo.AllocationBase,
+                                memInfo.RegionSize));
+            if (data == 0) {
+                // queryAddr is a kernel-mode pointer
+                regionAddr = queryAddr;
+                regionSize = (UIntPtr) sizeof(int);
+                return false;
+            } else {
+                VTable.Assert(data == size &&
+                              memInfo.BaseAddress == queryAddr);
+                regionAddr = memInfo.AllocationBase;
+                regionSize = (queryAddr - regionAddr) + memInfo.RegionSize;
+                return (memInfo.State != MEM_FREE);
+            }
+        }
+#endif
+
+        internal static UIntPtr OperatingSystemCommitSize {
+            get {
+                return allocationGranularity;
+            }
+        }
+
+        // We are just guessing here
+        internal static UIntPtr MemorySize {
+            get { return totalMemorySize; }
+        }
+
+        // We are just making an educated guess here
+        internal static UIntPtr OperatingSystemSize {
+            get { return operatingSystemSize; }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/ObjectLayout.cs b/base/Kernel/Bartok/GCs/ObjectLayout.cs
new file mode 100644
index 0000000..1df18d0
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/ObjectLayout.cs
@@ -0,0 +1,118 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+
+    internal class ObjectLayout
+    {
+
+        // Tags on GC information provided by compiler.
+        internal const uint SPARSE_TAG              = 0x1;
+        internal const uint DENSE_TAG               = 0x3;
+        internal const uint PTR_VECTOR_TAG          = 0x5;
+        internal const uint OTHER_VECTOR_TAG        = 0x7;
+        internal const uint PTR_ARRAY_TAG           = 0x9;
+        internal const uint OTHER_ARRAY_TAG         = 0xb;
+        internal const uint STRING_TAG              = 0xd;
+        internal const uint RESERVED_TAG            = 0xf;
+
+        internal abstract class ObjectVisitor {
+            // Must return the size of the visited object.
+            internal abstract UIntPtr Visit(Object obj);
+        }
+
+        // Returns object size in bytes
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        internal static UIntPtr ObjectSize(VTable vtable)
+        {
+            uint baseLength = unchecked((uint)vtable.baseLength);
+            VTable.Assert(Util.UIntPtrPad((UIntPtr) baseLength) == baseLength);
+            return (UIntPtr)baseLength;
+        }
+
+        // Returns string size in bytes
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        internal static unsafe UIntPtr StringSize(VTable vtable,
+                                                  uint arrayLength)
+        {
+            uint baseLength = unchecked((uint) vtable.baseLength);
+            uint size = (baseLength + sizeof(char)*arrayLength);
+            return Util.UIntPtrPad((UIntPtr) size);
+        }
+
+        // Returns array size in bytes
+        [ManualRefCounts]
+        [NoInline]
+        [NoHeapAllocation]
+        internal static UIntPtr ArraySize(VTable vtable, uint numElements)
+        {
+            UIntPtr baseLength = (UIntPtr)
+                unchecked((uint) vtable.baseLength);
+            UIntPtr elementSize = (UIntPtr)
+                unchecked((uint) vtable.arrayElementSize);
+            UIntPtr size = baseLength + elementSize * numElements;
+            return Util.UIntPtrPad(size);
+        }
+
+        // Returns object size in bytes
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        internal unsafe static UIntPtr Sizeof(Object obj) {
+            return ObjectSize(Magic.addressOf(obj), obj.vtable);
+        }
+
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        internal unsafe static UIntPtr ObjectSize(UIntPtr objectBase,
+                                                  VTable vtable)
+        {
+            uint objectTag =
+                unchecked((uint) vtable.pointerTrackingMask) & 0xf;
+            switch (objectTag) {
+              case SPARSE_TAG:
+              case DENSE_TAG: {
+                  return ObjectSize(vtable);
+              }
+              case PTR_VECTOR_TAG:
+              case OTHER_VECTOR_TAG: {
+                  uint length = *(uint*) (objectBase + PostHeader.Size);
+                  return ArraySize(vtable, length);
+              }
+              case PTR_ARRAY_TAG:
+              case OTHER_ARRAY_TAG: {
+                  uint length =
+                      *(uint*)(objectBase + PostHeader.Size + sizeof(uint));
+                  return ArraySize(vtable, length);
+              }
+              case STRING_TAG: {
+                  uint length = *(uint*) (objectBase + PostHeader.Size);
+                  return StringSize(vtable, length);
+              }
+              case RESERVED_TAG: {
+                  VTable.Assert(false, "RESERVED_TAG was used!");
+                  return UIntPtr.Zero;
+              }
+              default: {
+                  // escape case
+                  return ObjectSize(vtable);
+              }
+            }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/OffsetTable.cs b/base/Kernel/Bartok/GCs/OffsetTable.cs
new file mode 100644
index 0000000..50b3ece
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/OffsetTable.cs
@@ -0,0 +1,378 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//#define DEBUG_OFFSETTABLE
+
+namespace System.GCs {
+
+  using Microsoft.Bartok.Runtime;
+  using System.Threading;
+  using System.Runtime.CompilerServices;
+
+  internal unsafe class OffsetTable {
+   
+      // OffsetTable is to identify objects in cards. Each card has one
+      // entry in the offsetTable.
+      // An entry in the offsetTable for a card has a special value 
+      // (NoObjPtrToCard) if no object pointer points to the card.
+      // Otherwise, it is an offset of the last object in the card
+      // relative to the beginning of the card. 
+      // Note: an object pointer points to the byte below its header,
+      // not the header itself. That is vtable for non reference counting
+      // collector, and refCount for reference counting.
+
+      private static byte *offsetTableBase;
+
+      // Special offset indicating that in a card, there is no object
+      // pointer to it. We make it as -1, and the effective
+      // offset of an pointer is within 0~127 when an offsetTable entry
+      // is 1 byte, or 0~2**15-1 if it is 2 bytes. However, to avoid time
+      // to initialize the offsetTable with -1, we simply add an bias 1
+      // to all the them, such that the special offset is 0, and the effective
+      // ones are within 1~128 (or 1~2**15). Correspondingly, in fetching
+      // the offset from the able, we should deduct the bias to get the real
+      // offset.
+      
+      private static UIntPtr NoObjPtrToCard {
+         get { return (UIntPtr)0x0;}
+      }     
+
+      // The  bias.
+      
+      private static byte OffsetBias {
+         get { return 0x1;}
+      }           
+
+      // Assume pointers are naturally aligned within a card. Then
+      // its least 2 or 3 significant bits are 0 and need not be recorded.
+
+      private static byte OffsetIgnorableBits {
+         get {
+            VTable.Assert(UIntPtr.Size == 4 || UIntPtr.Size == 8, 
+                     "Not supported pointer type");                     
+            if (UIntPtr.Size == 4) {
+               return 2;
+            } else {
+               return 3;
+            }
+         }
+      }
+
+      // An entry in the offsetTable needs to be either 1 byte or 2 bytes,
+      // depending on the size of a card.
+      // Given one byte for an entry, we can represent 128 effective offsets,
+      // and one special offset NoObjPtrToCard. For x64,
+      // UIntPtr.Size*128 = 2**10. For x86, UIntPtr.Size * 128 = 2**9.
+      // That is, the size of a card is no bigger than 2**10 or 2**9.
+      // Given two bytes for an entry, we can represent 2**15 effective
+      // offsets, and one special offset. The size of card is no bigger than
+      // 2**18 or 2**17.
+ 
+      private static byte EntryBytes {
+         get {
+            VTable.Assert(UIntPtr.Size == 4 || UIntPtr.Size == 8, 
+                     "Not supported pointer type");         
+            if ((UIntPtr.Size == 4 && CardTable.CardBits <= 9) ||
+                 (UIntPtr.Size == 8 && CardTable.CardBits <= 10)) {
+               return 1;
+            } else {
+               VTable.Assert((UIntPtr.Size == 4 && CardTable.CardBits <= 17) ||
+                                     (UIntPtr.Size == 8 && CardTable.CardBits <= 18),
+                                     "Card size is unreasonable large");
+               return 2;
+            }
+         }
+      }
+      
+      internal static void Initialize(UIntPtr totalCards) {
+         UIntPtr offsetTablePtr = PageManager.AllocateNonheapMemory(null,  
+            ((UIntPtr)EntryBytes)*totalCards);
+         VTable.Assert(offsetTablePtr != UIntPtr.Zero, "OffsetTable.Initialize: no memory");
+         
+         offsetTableBase = (byte*)(offsetTablePtr - CardTable.FirstCardNo);
+
+         // The memory of offset table should have already been cleaned
+         
+         for (UIntPtr c=CardTable.FirstCardNo; c<CardTable.FirstCardNo+totalCards;c++) {
+            VTable.Assert(NoObjectPtrToTheCard(c), "offset table initialization error");
+         }
+      }
+      
+      [Inline]
+      private static void SetNoObjPtrToCard(UIntPtr c)
+      {
+         VTable.Assert(CardTable.IsValidCardNo(c), "SetNoObjPtrToCard: invalid card no");
+         SetCompressedBiasedOffset(c, NoObjPtrToCard);
+      }
+
+      [Inline]
+      internal static bool NoObjectPtrToTheCard(UIntPtr c)
+      {
+         VTable.Assert(CardTable.IsValidCardNo(c), "NoObjectPtrToTheCard: invalid card no");
+         return (GetCompressedBiasedOffset(c)  == NoObjPtrToCard);
+      }
+
+      [Inline]
+      internal static void SetOffset(UIntPtr c, UIntPtr offset)
+      {            
+         VTable.Assert((offset >> OffsetIgnorableBits) << OffsetIgnorableBits
+                                 == offset, "offset should be multiple of pointer size");
+         VTable.Assert(NoObjectPtrToTheCard(c) || GetOffset(c) < offset,
+               "A smaller offset offset is set to card ");
+
+         SetCompressedBiasedOffset(c, (offset >> OffsetIgnorableBits) + (UIntPtr)OffsetBias);
+      }
+
+      [Inline]
+      internal static UIntPtr GetOffset(UIntPtr c)
+      {
+         UIntPtr offset = GetCompressedBiasedOffset(c) - (UIntPtr)OffsetBias;
+         return offset << OffsetIgnorableBits;
+      }            
+
+      [Inline]
+      private static bool IsValidCompressedBiasedOffset(UIntPtr value) 
+      {
+         return value <= ((UIntPtr)2<<(EntryBytes * 8 -1));
+      }
+
+      [Inline]
+      private static void SetCompressedBiasedOffset(UIntPtr c, UIntPtr value)
+      {
+         VTable.Assert(IsValidCompressedBiasedOffset(value), "Invalid compressed biased value");
+         if (EntryBytes == 1) {
+            *(offsetTableBase + c)  = (byte)value;
+         } else {
+            *((short*)offsetTableBase + c)  = (short)value;        
+         }
+      }
+
+      [Inline]
+      private static UIntPtr GetCompressedBiasedOffset(UIntPtr c)
+      {
+         if (EntryBytes == 1) {
+            return (UIntPtr) (*(offsetTableBase + c));
+         } else {
+            return (UIntPtr)(*((short*)offsetTableBase + c));       
+         }
+      }
+
+      // OffsetTable records all objects promoted or directly allocated in mature
+      // generation. 
+      
+      internal static void SetLast(UIntPtr objPtr)
+      {      
+         VTable.Assert(PageTable.IsGcPage(PageTable.Page(objPtr)), "Not GC page");
+ 
+         UIntPtr card = CardTable.CardNo(objPtr);                           
+         UIntPtr mask = (UIntPtr)(CardTable.CardSize -1);
+         UIntPtr offset = objPtr & mask;
+         VTable.Assert(offset < CardTable.CardSize, "Overflow");
+         SetOffset(card, offset);    
+#if DEBUG_OFFSETTABLE         
+         VTable.DebugPrint("SetLast objPtr {0:x8}, card {1:x8}, offset {2:x8}\n",
+                  __arglist(objPtr, card, offset));
+#endif                  
+      }
+
+      internal static UIntPtr FirstObjPtrWithFieldInCard(UIntPtr c)
+      {
+         VTable.Assert(CardTable.IsValidCardNo(c), "Not valid card no");
+         VTable.Assert(CardTable.IsMyLiveGcCard(c), "Not my live GC card");
+
+         UIntPtr cardAddr = CardTable.CardAddr(c);
+         UIntPtr nextCardAddr = CardTable.NextCardAddr(c);
+
+         // Scan backward. May go to zombie areas
+         
+         UIntPtr cardBefore = c -1;
+         while (cardBefore >= CardTable.FirstCardNo &&
+            OffsetTable.NoObjectPtrToTheCard(cardBefore) &&
+            CardTable.IsMyGcCard(cardBefore)){
+               cardBefore --;
+         }
+         
+         UIntPtr ptr;
+         
+         if (cardBefore < CardTable.FirstCardNo || 
+              !CardTable.IsMyGcCard(cardBefore)) {
+            
+            // this case happens when c is the first live card that has an object.
+
+            VTable.Assert(CardTable.IsMyGcCard(cardBefore+1),
+                  "The next card must be a GC card");
+            VTable.Assert(CardTable.CardAddr(cardBefore+1) == 
+                  CardTable.PageAddrOfCard(cardBefore+1),
+                  "The next card must be at the boundary of a page");
+                           
+            UIntPtr pageAddr = CardTable.PageAddrOfCard(cardBefore+1);
+            ptr =PtrToNextObject(pageAddr, (UIntPtr)PreHeader.Size, nextCardAddr);
+         } else {         
+            VTable.Assert(!OffsetTable.NoObjectPtrToTheCard(cardBefore),
+                  "A card with an object must have been found");
+            ptr = CardTable.CardAddr(cardBefore) +
+                     OffsetTable.GetOffset(cardBefore);
+         }
+         VTable.Assert(ptr < nextCardAddr, "No objptr in this card");
+
+         // Scan forward. Update offset table in the course.
+
+         UIntPtr currentPtr = ptr;
+         while (currentPtr < cardAddr) { 
+               UIntPtr size = OffsetTable.ObjectSize(currentPtr);
+               if (currentPtr + size - PreHeader.Size > cardAddr) {     
+                  VTable.Assert(CardTable.CardGeneration(CardTable.CardNo(currentPtr)) == 
+                        CardTable.CardGeneration(c), 
+                        "The whole object must be in the same generation");
+                  break;
+               } else {               
+                  ptr = currentPtr;
+                  currentPtr = PtrToNextObject(currentPtr, size, nextCardAddr);
+                  VTable.Assert(CardTable.CardNo(ptr) <= CardTable.CardNo(currentPtr), 
+                        "Previous ptr should be before current ptr");
+                  if (CardTable.CardNo(ptr) < CardTable.CardNo(currentPtr)) {
+                        UIntPtr ptrC = CardTable.CardNo(ptr);
+                        UIntPtr offsetC = ptr - CardTable.CardAddr(ptrC);                        
+                        if (offsetC > GetOffset(ptrC)) {                           
+                              SetOffset(ptrC, offsetC);                              
+                        }
+                  }
+              }
+         }            
+         VTable.Assert(currentPtr != UIntPtr.Zero, "current ptr is zero");
+         VTable.Assert(currentPtr < nextCardAddr, "No objptr found in this card");  
+        
+#if DEBUG_OFFSETTABLE
+         UIntPtr temp = OffsetTable.FirstPtrFromInteriorTable(c);
+         if (temp != currentPtr) {
+            VTable.DebugPrint("Found ptr ({0:x8}) inconsistent with first ptr from interior table({1:x8})\n",
+                  __arglist(currentPtr, temp));            
+            VTable.Assert(false);
+         }                    
+#endif
+
+         return currentPtr;       
+      }
+
+      // The next object after the current object and below the limit
+      
+      [Inline]
+      internal static UIntPtr PtrToNextObject(UIntPtr objPtr, UIntPtr size, UIntPtr limit)
+      {
+         return BumpAllocator.SkipNonObjectData(objPtr + size, limit);
+      }            
+
+      [Inline]
+      internal static void ClearCards(UIntPtr c1, UIntPtr c2)
+      {
+         for (UIntPtr i = c1; i <= c2; i++) {
+            SetNoObjPtrToCard(i);
+         }   
+#if DEBUG_OFFSETTABLE
+         VTable.DebugPrint("ClearLast from {0:x8} to {1:x8}\n", __arglist(c1, c2));
+#endif
+      }
+      
+      internal static void ClearLast(UIntPtr from, UIntPtr to)
+      {
+         UIntPtr first = CardTable.CardNo(from);
+         UIntPtr last = CardTable.CardNo(to);
+         ClearCards(first, last);
+      }
+
+      // Copied from InteriorPtrTable.cs
+
+      internal static unsafe UIntPtr ObjectSize(UIntPtr addr) {
+          UIntPtr vtableAddr = Allocator.GetObjectVTable(addr);
+          UIntPtr vtablePage = PageTable.Page(vtableAddr);
+          if (PageTable.IsGcPage(vtablePage)) {
+              // The vtable field is really a forwarding pointer
+              vtableAddr = Allocator.GetObjectVTable(vtableAddr);
+          } else {
+              // Clear the lowest bits, if set
+              vtableAddr &= ~((UIntPtr)3);
+          }
+          VTable.Assert((UIntPtr.Size == 8) ||
+                        ((vtableAddr & 0x80000000) == 0), 
+                        "Unaligned vtable addr");
+          VTable vtable =
+              Magic.toVTable(Magic.fromAddress(vtableAddr));
+          return ObjectLayout.ObjectSize(addr, vtable);
+      }
+         
+#if DEBUG_OFFSETTABLE
+      private static UIntPtr FirstPtrFromInteriorTable(UIntPtr c)
+      {   
+          UIntPtr cardAddr = CardTable.CardAddr(c);
+          UIntPtr nextCardAddr = CardTable.NextCardAddr(c);
+          UIntPtr page = PageTable.Page(cardAddr);
+          UIntPtr pageAddr = PageTable.PageAddr(page);
+          UIntPtr currAddr;
+
+          if (page == 0) {
+               currAddr =PtrToNextObject(pageAddr, 
+                              (UIntPtr)PreHeader.Size, nextCardAddr);
+          } else {
+               short offset = PageTable.Extra(page);
+               currAddr = UIntPtr.Zero;
+               if (offset != InteriorPtrTable.OFFSET_NO_DATA) {
+                  currAddr = pageAddr + (offset - InteriorPtrTable.OFFSET_SKEW);
+               }
+
+               // In general, we expect currAddr <= cardAddr. Or in the extreme
+               // case, when the object starts from the page boundary,
+               // currAddr - Object.HEADER_BYTES <= cardAddr. The contrary
+               // cases has to be handled by searching previous pages.
+               
+               if (currAddr == UIntPtr.Zero ||
+                    (currAddr > cardAddr &&    
+                      currAddr - PreHeader.Size > cardAddr)) {
+               
+                  // look from previous pages, in case that an object on
+                  // them spans to the current page. In that case, we should 
+                  // should use that object's ptr.
+
+                  currAddr = InteriorPtrTable.Last(page -1);
+
+                  // Usually, Last() returns a pointer before or at the page
+                  // boundary. However, there is one exception: when an object
+                  // exactly fits to the last byte of the previous page, and the next
+                  // object starts right from the page boundary (the first byte of
+                  // the next page), then the pointer to this next object is returned.
+                  // Example found: objPtr =3d09fa8, size=60, pageboundary=
+                  // 3d0a000, next objPtr=3d0a008. Then returned pointer is
+                  // 3d0a008, which is beyond the page boundary.
+               
+                  VTable.Assert(currAddr <= pageAddr || 
+                     currAddr - PreHeader.Size <= pageAddr,
+                     "object is expected before page or right at the beginning of it");
+              }
+          }
+          VTable.Assert(currAddr < nextCardAddr, "object is expected before next card");
+          
+          while (currAddr < nextCardAddr) {
+              if (Allocator.IsAlignment(currAddr)) {
+                  currAddr += UIntPtr.Size;
+              } else if (BumpAllocator.IsUnusedSpace(currAddr)) {
+                  currAddr = PageTable.PagePad(currAddr) + PreHeader.Size;
+              } else {
+                  UIntPtr size = InteriorPtrTable.ObjectSize(currAddr);                  
+                  if (currAddr + size - PreHeader.Size > cardAddr) {                     
+                     return currAddr;
+                  }
+                  currAddr += size;                   
+             }
+        }       
+        VTable.Assert(false, "No obj ptr found by looking at interior table");
+        return UIntPtr.Zero;
+     }
+#endif
+   }
+}
diff --git a/base/Kernel/Bartok/GCs/PageManager.cs b/base/Kernel/Bartok/GCs/PageManager.cs
new file mode 100644
index 0000000..7d7a90b
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/PageManager.cs
@@ -0,0 +1,1033 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#if !SINGULARITY || (SINGULARITY_KERNEL && SINGULARITY_MP)
+#define USE_SPINLOCK
+#elif SINGULARITY_PROCESS
+#define USE_MUTEX
+#endif
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+#endif
+
+    internal unsafe class PageManager
+    {
+
+        // WARNING: don't initialize any static fields in this class
+        // without manually running the class constructor at startup!
+
+        // 2006/04/20: Makes old-generation collections take 5+ seconds:
+        private static bool SlowDebug {
+            get { return false; }
+        }
+
+        // 2006/04/20: Known to slow down selfhost if true:
+        private static bool AggressiveMemReset {
+            get { return false; }
+        }
+
+        internal static UIntPtr os_commit_size;
+        private static UIntPtr heap_commit_size;
+        private static UnusedBlockHeader [] unusedMemoryBlocks;
+        private static bool avoidDirtyPages;
+        private static OutOfMemoryException outOfMemoryException;
+
+#if USE_MUTEX
+        private static Mutex mutex;
+#elif USE_SPINLOCK
+        private static SpinLock Lock;
+#endif
+
+        // Unused pages (clean and dirty combined) in the system are combined
+        // into multi-page regions.  Parts of the this struct are stored in the
+        // first and last pages of each region.  Since a region may be a single
+        // page, it is necessary for the various first-page and last-page fields
+        // to be stored at different offsets, which is why they are all declared
+        // in this struct.  The headers form a list of regions of approximately
+        // the same size (see SlotFromCount).  The head of each list is a dummy
+        // node in the 'unusedMemoryBlocks' array.  The last page of region
+        // simply points back to the beginning of the region.
+
+        private struct UnusedBlockHeader {
+            private const int magicNumber = 0x1234567;
+
+            // Simply a sanity check against random overwrites of the region.
+            private UIntPtr magic;
+
+            // Built-in threading for the list of similarly sized regions.
+            internal UnusedBlockHeader * next;
+            private UnusedBlockHeader * prev;
+
+            // Number of pages in this unused page region.
+            internal UIntPtr count;
+
+            // The 'curr' field is in the last block of the unused region.
+            // However, the first and last blocks may be the same, so we
+            // put the field in the same struct so that the layout can be
+            // done automatically for us.  The last block does not have the
+            // normal header fields.
+            internal UnusedBlockHeader * curr;
+
+            internal void Initialize(UIntPtr count)
+            {
+                this.magic = (UIntPtr) magicNumber;
+                this.next = null;
+                this.prev = null;
+                this.count = count;
+
+                UIntPtr thisAddr;
+                fixed (UnusedBlockHeader *thisFixedAddr = &this) {
+                    thisAddr = (UIntPtr) thisFixedAddr;
+                }
+
+                UIntPtr tailAddr = thisAddr + PageTable.RegionSize(count - 1);
+                UnusedBlockHeader * tail = (UnusedBlockHeader *) tailAddr;
+
+                tail->curr = (UnusedBlockHeader *) thisAddr;
+            }
+
+            [System.Diagnostics.Conditional("DEBUG")]
+            internal void Verify() {
+                VTable.Assert(this.magic == (UIntPtr) magicNumber,
+                              "Bad magic number in UnusedBlockHeader");
+                VTable.Assert(this.count > 0,
+                              "Count <= 0 in UnusedBlockHeader");
+                fixed (UnusedBlockHeader *thisAddr = &this) {
+                    VTable.Assert(this.prev->next == thisAddr,
+                                  "UnusedBlockHeader not linked properly (1)");
+                    if (this.next != null) {
+                        VTable.Assert
+                            (this.next->prev == thisAddr,
+                             "UnusedBlockHeader not linked properly (2)");
+                    }
+                    UIntPtr tailAddr =
+                        ((UIntPtr) thisAddr)
+                        + PageTable.RegionSize(this.count - 1);
+                    UnusedBlockHeader * tail = (UnusedBlockHeader *) tailAddr;
+                    VTable.Assert(tail->curr == (UnusedBlockHeader *) thisAddr,
+                                  "UnusedBlockHeader tail->curr is incorrect");
+                    if (PageManager.SlowDebug) {
+                        UIntPtr page = PageTable.Page((UIntPtr)thisAddr);
+                        for (UIntPtr i = UIntPtr.Zero; i < this.count; i++) {
+                            VTable.Assert(PageTable.IsUnusedPage(page+i) &&
+                                          PageTable.IsMyPage(page+i),
+                                          "Incorrect page in unused region");
+                        }
+                    }
+                }
+            }
+
+            internal void InsertNext(UnusedBlockHeader *newNext) {
+                //Trace.Log(Trace.Area.Page,
+                //          "UnusedBlockHeader.InsertNext {0} count={1}",
+                //          __arglist(newNext, newNext->count));
+                UnusedBlockHeader *oldNext = this.next;
+                this.next = newNext;
+                newNext->next = oldNext;
+                fixed (UnusedBlockHeader *thisAddr = &this) {
+                    newNext->prev = thisAddr;
+                }
+                if (oldNext != null) {
+                    oldNext->prev = newNext;
+                }
+                newNext->Verify();
+            }
+
+            internal UIntPtr Remove() {
+                //Trace.Log(Trace.Area.Page,
+                //          "UnusedBlockHeader.Remove {0} count={1}",
+                //          __arglist(this.prev->next, this.count));
+                this.Verify();
+                this.prev->next = this.next;
+                if (this.next != null) {
+                    this.next->prev = this.prev;
+                }
+                UIntPtr result = this.count;
+                this.magic = UIntPtr.Zero;
+                this.prev = null;
+                this.next = null;
+                this.count = UIntPtr.Zero;
+
+                UIntPtr thisAddr;
+                fixed (UnusedBlockHeader *thisFixedAddr = &this) {
+                    thisAddr = (UIntPtr) thisFixedAddr;
+                }
+
+                UIntPtr tailAddr = thisAddr + PageTable.RegionSize(result - 1);
+                UnusedBlockHeader * tail = (UnusedBlockHeader *) tailAddr;
+
+                tail->curr = null;
+
+                return result;
+            }
+
+        }
+
+        [PreInitRefCounts]
+        internal static void Initialize(UIntPtr os_commit_size,
+                                        UIntPtr heap_commit_size)
+        {
+            PageManager.os_commit_size = os_commit_size;
+            PageManager.heap_commit_size = heap_commit_size;
+            // unusedMemoryBlocks = new UnusedBlockHeader [32]
+            unusedMemoryBlocks = (UnusedBlockHeader[])
+                BootstrapMemory.Allocate(typeof(UnusedBlockHeader[]), 32);
+            // outOfMemoryException = new OutOfMemoryException();
+            outOfMemoryException = (OutOfMemoryException)
+                BootstrapMemory.Allocate(typeof(OutOfMemoryException));
+#if SINGULARITY_KERNEL
+            avoidDirtyPages = true;
+#else
+            avoidDirtyPages = false;
+#endif
+        }
+
+        internal static void FinishInitializeThread()
+        {
+#if USE_MUTEX
+            mutex = new Mutex();
+#endif
+        }
+
+        private static bool EnterMutex(Thread currentThread) {
+            bool iflag = false;
+            if (currentThread != null
+#if !SINGULARITY || SEMISPACE_COLLECTOR || SLIDING_COLLECTOR || ADAPTIVE_COPYING_COLLECTOR || MARK_SWEEP_COLLECTOR
+                &&
+                StopTheWorldCollector.CurrentPhase !=
+                StopTheWorldCollector.STWPhase.SingleThreaded
+#endif
+                ) {
+#if SINGULARITY_KERNEL
+                iflag = Processor.DisableInterrupts();
+#endif // SINGULARITY_KERNEL
+#if USE_MUTEX
+                if (mutex != null) {
+                    mutex.AcquireMutex();
+                }
+#elif USE_SPINLOCK
+                PageManager.Lock.Acquire(currentThread);
+#endif
+            }
+            return iflag;
+        }
+
+        private static void LeaveMutex(Thread currentThread, bool iflag) {
+            if (currentThread != null
+#if !SINGULARITY || SEMISPACE_COLLECTOR || SLIDING_COLLECTOR || ADAPTIVE_COPYING_COLLECTOR || MARK_SWEEP_COLLECTOR
+                &&
+                StopTheWorldCollector.CurrentPhase !=
+                StopTheWorldCollector.STWPhase.SingleThreaded
+#endif
+                ) {
+#if USE_MUTEX
+                if (mutex != null) {
+                    mutex.ReleaseMutex();
+                }
+#elif USE_SPINLOCK
+                PageManager.Lock.Release(currentThread);
+#endif
+
+#if SINGULARITY_KERNEL
+                // Must happen after spinlock is released
+                Processor.RestoreInterrupts(iflag);
+#endif // SINGULARITY_KERNEL
+            }
+        }
+
+        [ManualRefCounts]
+        private static void Clear(UIntPtr startAddr,
+                                  UIntPtr regionSize)
+        {
+            VTable.Assert(PageTable.PageAligned(startAddr));
+            VTable.Assert(PageTable.PageAligned(regionSize));
+            MemoryManager.IgnoreMemoryContents(startAddr, regionSize);
+            MarkUnusedPages(Thread.CurrentThread,
+                            PageTable.Page(startAddr),
+                            PageTable.PageCount(regionSize),
+                            false);
+        }
+
+        private static int SlotFromCount(UIntPtr count) {
+            int slot = -1;
+            do {
+                slot++;
+                count >>= 1;
+            } while (count > UIntPtr.Zero);
+            return slot;
+        }
+
+        internal static UIntPtr AllocateNonheapMemory(Thread currentThread,
+                                                      UIntPtr size)
+        {
+            bool iflag = false;
+            if (currentThread != null) {
+                iflag = EnterMutex(currentThread);
+            }
+            try {
+                UIntPtr result = MemoryManager.AllocateMemory(size);
+                if (result != UIntPtr.Zero) {
+                    SetNonheapPages(result, size);
+                }
+                return result;
+            } finally {
+                if (currentThread != null) {
+                    LeaveMutex(currentThread, iflag);
+                }
+            }
+        }
+
+        internal static void FreeNonheapMemory(UIntPtr startAddress,
+                                               UIntPtr size)
+        {
+            SetUnallocatedPages(startAddress, size);
+            MemoryManager.FreeMemory(startAddress, size);
+        }
+
+        private static void SetPageTypeClean(UIntPtr startPage,
+                                             UIntPtr pageCount,
+                                             PageType newType)
+        {
+            UIntPtr* tableAddr = (UIntPtr *) PageTable.PageAddr(startPage);
+            UIntPtr* tableCursor = tableAddr + 1;
+            UIntPtr dirtyCount = UIntPtr.Zero;
+            UIntPtr endPage = startPage + pageCount;
+            for (UIntPtr i = startPage; i < endPage; i++) {
+                PageType pageType = PageTable.Type(i);
+                if (pageType == PageType.UnusedDirty) {
+                    PageTable.SetType(i, newType);
+                    UIntPtr j = i+1;
+                    while (j < endPage &&
+                           PageTable.Type(j)==PageType.UnusedDirty) {
+                        PageTable.SetType(j, newType);
+                        j++;
+                    }
+                    UIntPtr dirtyStartAddr = PageTable.PageAddr(i);
+                    UIntPtr dirtyEndAddr = PageTable.PageAddr(j);
+                    *tableCursor++ = dirtyStartAddr;
+                    *tableCursor++ = dirtyEndAddr - dirtyStartAddr;
+                    dirtyCount++;
+                    i = j-1;
+                } else {
+                    PageTable.SetType(i, newType);
+                }
+            }
+            *tableAddr = dirtyCount;
+            PageTable.SetProcess(startPage, pageCount);
+        }
+
+        [ManualRefCounts]
+        internal static UIntPtr EnsurePages(Thread currentThread,
+                                            UIntPtr pageCount,
+                                            PageType newType,
+                                            ref bool fCleanPages)
+        {
+            if (currentThread != null) {
+                GC.CheckForNeededGCWork(currentThread);
+            }
+            VTable.Deny(PageTable.IsUnusedPageType(newType));
+            // Try to find already allocated but unused pages
+            UIntPtr foundPages =
+                FindUnusedPages(currentThread, pageCount, newType);
+            if (foundPages != UIntPtr.Zero) {
+                if (fCleanPages) {
+                    CleanFoundPages(foundPages);
+                } else {
+                    fCleanPages = FoundOnlyCleanPages(foundPages);
+                }
+                return foundPages;
+            }
+            // We need to allocate new pages
+            bool iflag = EnterMutex(currentThread);
+            try {
+                UIntPtr bytesNeeded = PageTable.RegionSize(pageCount);
+                UIntPtr allocSize = Util.Pad(bytesNeeded, heap_commit_size);
+                UIntPtr startAddr = MemoryManager.AllocateMemory(allocSize);
+                if (startAddr == UIntPtr.Zero) {
+                    if (heap_commit_size > os_commit_size) {
+                        allocSize = Util.Pad(bytesNeeded, os_commit_size);
+                        startAddr = MemoryManager.AllocateMemory(allocSize);
+                    }
+                }
+                if (startAddr == UIntPtr.Zero) {
+                    PageTable.Dump("Out of memory");
+                    throw outOfMemoryException;
+                }
+                UIntPtr startPage = PageTable.Page(startAddr);
+                PageTable.SetType(startPage, pageCount, newType);
+                PageTable.SetProcess(startPage, pageCount);
+                UIntPtr extraPages =
+                    PageTable.PageCount(allocSize) - pageCount;
+                if (extraPages > 0) {
+                    // Mark the new memory pages as allocated-but-unused
+                    MarkUnusedPages(/* avoid recursive locking */ null,
+                                    startPage+pageCount, extraPages,
+                                    fCleanPages);
+                }
+                return startPage;
+            } finally {
+                LeaveMutex(currentThread, iflag);
+            }
+        }
+
+        internal static void ReleaseUnusedPages(UIntPtr startPage,
+                                                UIntPtr pageCount,
+                                                bool fCleanPages)
+        {
+            if(VTable.enableDebugPrint) {
+                VTable.DebugPrint("ClearPages({0}, {1})\n",
+                                  __arglist(startPage, pageCount));
+            }
+            UIntPtr startAddr = PageTable.PageAddr(startPage);
+            UIntPtr endPage = startPage + pageCount;
+            UIntPtr endAddr = PageTable.PageAddr(endPage);
+            UIntPtr rangeSize = PageTable.RegionSize(pageCount);
+
+            MarkUnusedPages(Thread.CurrentThread,
+                            PageTable.Page(startAddr),
+                            PageTable.PageCount(rangeSize),
+                            fCleanPages);
+
+            if (PageManager.AggressiveMemReset) {
+                // We cannot simply reset the memory range, as MEM_RESET can
+                // only be used within a region returned from a single
+                // VirtualAlloc call.
+                UIntPtr regionAddr, regionSize;
+                bool fUsed = MemoryManager.QueryMemory(startAddr,
+                                                       out regionAddr,
+                                                       out regionSize);
+                if(VTable.enableDebugPrint) {
+                    VTable.DebugPrint(" 1 Query({0}, {1}, {2}) -> {3}\n",
+                                      __arglist(startAddr, regionAddr,
+                                                regionSize, fUsed));
+                }
+                VTable.Assert(fUsed, "Memory to be cleared isn't used");
+                // We don't care if regionAddr < startAddr.  We can MEM_RESET
+                // part of the region.
+
+                UIntPtr endRegion = regionAddr + regionSize;
+                while (endRegion < endAddr) {
+                    if (VTable.enableDebugPrint) {
+                        VTable.DebugPrint("Clearing region [{0}, {1}]\n",
+                                          __arglist(regionAddr,
+                                                    regionAddr+regionSize));
+                    }
+                    MemoryManager.IgnoreMemoryContents(startAddr,
+                                                       endRegion - startAddr);
+                    startAddr = endRegion;
+                    fUsed = MemoryManager.QueryMemory(endRegion,
+                                                      out regionAddr,
+                                                      out regionSize);
+                    if(VTable.enableDebugPrint) {
+                        VTable.DebugPrint(" 2 Query({0}, {1}, {2}) -> {3}\n",
+                                          __arglist(endRegion, regionAddr,
+                                                    regionSize, fUsed));
+                    }
+                    VTable.Assert(fUsed, "Region to be freed isn't used");
+                    endRegion = regionAddr + regionSize;
+                }
+                if (VTable.enableDebugPrint) {
+                    VTable.DebugPrint("Clearing final region [{0}, {1}]\n",
+                                      __arglist(startAddr, endAddr));
+                }
+                MemoryManager.IgnoreMemoryContents(startAddr,
+                                                   endAddr - startAddr);
+            }
+            if(VTable.enableDebugPrint) {
+                VTable.DebugPrint("  --> ClearPages({0},{1})\n",
+                                  __arglist(startPage, pageCount));
+            }
+        }
+
+        // Use this method to free heap pages.
+        // There must be no contention regarding ownership of the pages.
+        internal static void FreePageRange(UIntPtr startPage,
+                                           UIntPtr endPage)
+        {
+            if(VTable.enableDebugPrint) {
+                VTable.DebugPrint("FreePageRange({0}, {1})\n",
+                                  __arglist(startPage, endPage));
+            }
+            UIntPtr startAddr = PageTable.PageAddr(startPage);
+            UIntPtr endAddr = PageTable.PageAddr(endPage);
+            UIntPtr rangeSize = endAddr - startAddr;
+#if SINGULARITY
+            // Singularity doesn't care if you free pages in different
+            // chunks than you acquired them in
+            MemoryManager.FreeMemory(startAddr, rangeSize);
+#else
+            // We cannot simply release the memory range, as MEM_RELEASE
+            // requires the pointer to be the same as the original call
+            // to VirtualAlloc, and the length to be zero.
+            UIntPtr regionAddr, regionSize;
+            bool fUsed = MemoryManager.QueryMemory(startAddr,
+                                                   out regionAddr,
+                                                   out regionSize);
+            if(VTable.enableDebugPrint) {
+                VTable.DebugPrint(" 1 Query({0}, {1}, {2}) -> {3}\n",
+                                  __arglist(startAddr, regionAddr,
+                                            regionSize, fUsed));
+            }
+            VTable.Assert(fUsed, "Memory to be freed isn't used");
+            UIntPtr endRegion = regionAddr + regionSize;
+            if (regionAddr < startAddr) {
+                // startAddr is in the middle of an allocation region -> skip
+                if (endRegion >= endAddr) {
+                    // [startAddr, endAddr] is fully contained in a region
+                    PageManager.Clear(startAddr, endAddr - startAddr);
+                    return;
+                }
+                // Part of the address range falls into the next region
+                PageManager.Clear(startAddr, endRegion - startAddr);
+                fUsed = MemoryManager.QueryMemory(endRegion,
+                                                  out regionAddr,
+                                                  out regionSize);
+                if(VTable.enableDebugPrint) {
+                    VTable.DebugPrint(" 2 Query({0}, {1}, {2}) -> {3}\n",
+                                      __arglist(endRegion, regionAddr,
+                                                regionSize, fUsed));
+                }
+                VTable.Assert(fUsed, "Area to be freed isn't used");
+                endRegion = regionAddr + regionSize;
+            }
+            // [regionAddr, endRegion] is contained in [startAddr, endAddr]
+            while (endRegion < endAddr) {
+                if (VTable.enableDebugPrint) {
+                    VTable.DebugPrint("Freeing region [{0}, {1}]\n",
+                                      __arglist(regionAddr,
+                                                regionAddr+regionSize));
+                }
+                SetUnallocatedPages(regionAddr, regionSize);
+                MemoryManager.FreeMemory(regionAddr, regionSize);
+                fUsed = MemoryManager.QueryMemory(endRegion,
+                                                  out regionAddr,
+                                                  out regionSize);
+                if(VTable.enableDebugPrint) {
+                    VTable.DebugPrint(" 3 Query({0}, {1}, {2}) -> {3}\n",
+                                      __arglist(endRegion, regionAddr,
+                                                regionSize, fUsed));
+                }
+                VTable.Assert(fUsed, "Region to be freed isn't used");
+                endRegion = regionAddr + regionSize;
+            }
+            if (endRegion == endAddr) {
+                if (VTable.enableDebugPrint) {
+                    VTable.DebugPrint("Freeing final region [{0}, {1}]\n",
+                                      __arglist(regionAddr,
+                                                regionAddr + regionSize));
+                }
+                SetUnallocatedPages(regionAddr, regionSize);
+                MemoryManager.FreeMemory(regionAddr, regionSize);
+            } else {
+                PageManager.Clear(regionAddr, endAddr - regionAddr);
+            }
+            if(VTable.enableDebugPrint) {
+                VTable.DebugPrint("  --> FreePageRange({0},{1})\n",
+                                  __arglist(startPage, endPage));
+            }
+#endif // SINGULARITY
+        }
+
+        //===============================
+        // Routines to mark special pages
+
+        private static unsafe void SetNonheapPages(UIntPtr startAddr,
+                                                    UIntPtr size)
+        {
+            UIntPtr startPage = PageTable.Page(startAddr);
+            UIntPtr endAddr = startAddr + size;
+            UIntPtr endPage = PageTable.Page(endAddr);
+            if (!PageTable.PageAligned(endAddr)) {
+                endPage++;
+            }
+            UIntPtr pageCount = endPage - startPage;
+            if (pageCount == 1) {
+                PageTable.SetType(startPage, PageType.System);
+            } else {
+                PageTable.SetType(startPage, pageCount, PageType.System);
+            }
+        }
+
+        // Tell the GC that a certain data area is no longer allowed to
+        // contain off-limits, non-moveable data.
+        private static unsafe void SetUnallocatedPages(UIntPtr startAddr,
+                                                       UIntPtr size)
+        {
+            UIntPtr startPage = PageTable.Page(startAddr);
+            UIntPtr endAddr = startAddr + size;
+            UIntPtr endPage = PageTable.Page(endAddr);
+            UIntPtr pageCount = endPage - startPage;
+            if (pageCount == 1) {
+                PageTable.SetExtra(startPage, 0);
+                PageTable.SetType(startPage, PageType.Unallocated);
+                PageTable.SetProcess(startPage, 0);
+            } else {
+                PageTable.SetExtra(startPage, pageCount, 0);
+                PageTable.SetType(startPage, pageCount, PageType.Unallocated);
+                PageTable.SetProcess(startPage, pageCount, 0);
+            }
+        }
+
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static unsafe void SetStaticDataPages(UIntPtr startAddr,
+                                                       UIntPtr size)
+        {
+            UIntPtr startIndex = PageTable.Page(startAddr);
+            UIntPtr pageCount = PageTable.PageCount(size);
+            PageTable.SetType(startIndex, pageCount, PageType.NonGC);
+        }
+
+#if !SINGULARITY
+        // Bartok uses the extra field in the PageTable to easily
+        // map from a stack address to the thread that owns that stack.
+        // This is used to implement GetCurrentThread.
+        // Singularity uses a different mechanism that does not involve
+        // the extra data at all.
+
+        private static unsafe void SetStackPages(UIntPtr startAddr,
+                                                 UIntPtr endAddr,
+                                                 Thread thread)
+        {
+            UIntPtr startPage = PageTable.Page(startAddr);
+            UIntPtr endPage = PageTable.Page(endAddr);
+            UIntPtr pageCount = endPage - startPage;
+            PageTable.VerifyType(startPage, pageCount, PageType.Unallocated);
+            PageTable.VerifyExtra(startPage, pageCount, (short) 0);
+            PageTable.SetType(startPage, pageCount, PageType.Stack);
+            PageTable.SetExtra(startPage, pageCount,
+                               (short) thread.threadIndex);
+        }
+
+        internal static unsafe void MarkThreadStack(Thread thread) {
+            int stackVariable;
+            UIntPtr stackBase = PageTable.PagePad(new UIntPtr(&stackVariable));
+            CallStack.SetStackBase(thread, stackBase);
+            UIntPtr topPageAddr =
+                PageTable.PageAlign(CallStack.StackBase(thread) - 1);
+            SetStackPages(topPageAddr, CallStack.StackBase(thread), thread);
+            UIntPtr regionAddr, regionSize;
+            bool fUsed = MemoryManager.QueryMemory(topPageAddr,
+                                                   out regionAddr,
+                                                   out regionSize);
+            VTable.Assert(fUsed);
+            SetStackPages(regionAddr, topPageAddr, thread);
+        }
+
+        internal static unsafe void ClearThreadStack(Thread thread) {
+            short threadIndex = (short) thread.threadIndex;
+            UIntPtr endPage = PageTable.Page(CallStack.StackBase(thread));
+            UIntPtr startPage = endPage - 1;
+            VTable.Assert(PageTable.IsStackPage(PageTable.Type(startPage)));
+            VTable.Assert(PageTable.Extra(startPage) == threadIndex);
+            while (startPage > 0 &&
+                   PageTable.IsStackPage(PageTable.Type(startPage-1)) &&
+                   PageTable.Extra(startPage-1) == threadIndex) {
+                startPage--;
+            }
+            UIntPtr startAddr = PageTable.PageAddr(startPage);
+            UIntPtr size = PageTable.RegionSize(endPage - startPage);
+            SetUnallocatedPages(startAddr, size);
+        }
+#endif
+
+        //====================================
+        // Routines to manipulate unused pages
+
+        [ManualRefCounts]
+        private static void LinkUnusedPages(UIntPtr startPage,
+                                            UIntPtr pageCount)
+        {
+            if (PageManager.SlowDebug) {
+                for (UIntPtr i = startPage; i < startPage + pageCount; i++) {
+                    VTable.Assert(PageTable.IsUnusedPage(i) &&
+                                  PageTable.IsMyPage(i),
+                                  "Incorrect page to link into unused region");
+                }
+            }
+            Trace.Log(Trace.Area.Page,
+                      "LinkUnusedPages start={0:x} count={1:x}",
+                      __arglist(startPage, pageCount));
+            VTable.Deny(startPage > UIntPtr.Zero &&
+                        PageTable.IsUnusedPage(startPage-1) &&
+                        PageTable.IsMyPage(startPage-1));
+            VTable.Deny(startPage + pageCount > PageTable.pageTableCount);
+            VTable.Deny(startPage + pageCount < PageTable.pageTableCount &&
+                        PageTable.IsUnusedPage(startPage + pageCount) &&
+                        PageTable.IsMyPage(startPage + pageCount));
+            UnusedBlockHeader *header = (UnusedBlockHeader *)
+                PageTable.PageAddr(startPage);
+            header->Initialize(pageCount);
+            int slot = SlotFromCount(pageCount);
+            unusedMemoryBlocks[slot].InsertNext(header);
+        }
+
+        private static UIntPtr UnlinkUnusedPages(UIntPtr startPage)
+        {
+            VTable.Assert(PageTable.IsUnusedPage(startPage) &&
+                          PageTable.IsMyPage(startPage));
+            VTable.Deny(startPage > UIntPtr.Zero &&
+                        PageTable.IsUnusedPage(startPage-1) &&
+                        PageTable.IsMyPage(startPage-1));
+            UnusedBlockHeader *header = (UnusedBlockHeader *)
+                PageTable.PageAddr(startPage);
+            UIntPtr pageCount = header->Remove();
+            Trace.Log(Trace.Area.Page,
+                      "UnlinkUnusedPages start={0:x} count={1:x}",
+                      __arglist(startPage, pageCount));
+            return pageCount;
+        }
+
+        // The indicated pages will be marked with 'pageStatus' in the
+        // page table.  The region of unused memory will also be linked
+        // into the table of blocks of unused memory
+        [ManualRefCounts]
+        private static void MarkUnusedPages(Thread currentThread,
+                                            UIntPtr startPage,
+                                            UIntPtr pageCount,
+                                            bool fCleanPages)
+        {
+            Trace.Log(Trace.Area.Page,
+                      "MarkUnusedPages start={0:x} count={1:x}",
+                      __arglist(startPage, pageCount));
+            UIntPtr endPage = startPage + pageCount;
+            if (avoidDirtyPages && !fCleanPages) {
+                UIntPtr dirtyStartAddr = PageTable.PageAddr(startPage);
+                UIntPtr dirtySize = PageTable.RegionSize(pageCount);
+                Util.MemClear(dirtyStartAddr, dirtySize);
+                fCleanPages = true;
+            }
+            bool iflag = false;
+            if (currentThread != null) {
+                iflag = EnterMutex(currentThread);
+            }
+            try {
+                if (endPage < PageTable.pageTableCount) {
+                    if (PageTable.IsUnusedPage(endPage) &&
+                        PageTable.IsMyPage(endPage)) {
+                        UIntPtr regionSize = UnlinkUnusedPages(endPage);
+                        endPage += regionSize;
+                    }
+                }
+
+                UIntPtr queryStartPage = startPage - 1;
+                UIntPtr newStartPage = startPage;
+                if (PageTable.IsUnusedPage(queryStartPage) &&
+                    PageTable.IsMyPage(queryStartPage)) {
+                    UnusedBlockHeader * tailUnused = (UnusedBlockHeader *)
+                        PageTable.PageAddr(queryStartPage);
+                    UIntPtr newStartAddr = (UIntPtr) tailUnused->curr;
+                    newStartPage = PageTable.Page(newStartAddr);
+                    UIntPtr regionSize = UnlinkUnusedPages(newStartPage);
+                    VTable.Assert(newStartPage + regionSize == startPage);
+                }
+
+                PageType pageType =
+                    fCleanPages ? PageType.UnusedClean : PageType.UnusedDirty;
+                PageTable.SetType(startPage, pageCount, pageType);
+                LinkUnusedPages(newStartPage, endPage - newStartPage);
+            } finally {
+                if (currentThread != null) {
+                    LeaveMutex(currentThread, iflag);
+                }
+            }
+        }
+
+        internal static bool TryReserveUnusedPages(Thread currentThread,
+                                                   UIntPtr startPage,
+                                                   UIntPtr pageCount,
+                                                   PageType newType,
+                                                   ref bool fCleanPages)
+        {
+            Trace.Log(Trace.Area.Page,
+                      "TryReserveUnusedPages start={0:x} count={1:x}",
+                      __arglist(startPage, pageCount));
+            VTable.Deny(PageTable.IsUnusedPageType(newType));
+            VTable.Assert(pageCount > UIntPtr.Zero);
+            VTable.Deny(startPage != UIntPtr.Zero &&
+                        PageTable.IsUnusedPage(startPage-1) &&
+                        PageTable.IsMyPage(startPage-1));
+            UIntPtr endPage = startPage + pageCount;
+            if (endPage > PageTable.pageTableCount) {
+                return false;
+            }
+            if (currentThread != null) {
+                GC.CheckForNeededGCWork(currentThread);
+            }
+            bool iflag = EnterMutex(currentThread);
+            try {
+                // GC can occur and page can be collected.
+                if (startPage != UIntPtr.Zero &&
+                    PageTable.IsUnusedPage(startPage-1)) {
+                    return false;
+                }
+
+                if (!PageTable.IsUnusedPage(startPage)
+                    || !PageTable.IsMyPage(startPage)) {
+                    return false;
+                }
+
+                UnusedBlockHeader * header = (UnusedBlockHeader *)
+                    PageTable.PageAddr(startPage);
+
+                if (header->count < pageCount) {
+                    return false;
+                }
+
+                UIntPtr regionPages = UnlinkUnusedPages(startPage);
+                Trace.Log(Trace.Area.Page,
+                          "TryReserveUnusedPages found={0:x}",
+                          __arglist(regionPages));
+
+                SetPageTypeClean(startPage, pageCount, newType);
+                if (regionPages > pageCount) {
+                    UIntPtr suffixPages = regionPages - pageCount;
+                    LinkUnusedPages(endPage, suffixPages);
+                }
+            } finally {
+                LeaveMutex(currentThread, iflag);
+            }
+            // Now that we are outside the Mutex, we should perform the
+            // real cleaning of the gotten pages
+            if (fCleanPages) {
+                CleanFoundPages(startPage);
+            } else {
+                fCleanPages = FoundOnlyCleanPages(startPage);
+            }
+            return true;
+        }
+
+        internal static bool TryReservePages(Thread currentThread,
+                                             UIntPtr startPage,
+                                             UIntPtr pageCount,
+                                             PageType newType,
+                                             ref bool fCleanPages)
+        {
+            Trace.Log(Trace.Area.Page,
+                      "TryReservePages start={0:x} count={1:x}",
+                      __arglist(startPage, pageCount));
+            VTable.Deny(PageTable.IsUnusedPageType(newType));
+            VTable.Assert(pageCount > UIntPtr.Zero);
+            VTable.Deny(startPage != UIntPtr.Zero &&
+                        PageTable.IsUnusedPage(startPage-1) &&
+                        PageTable.IsMyPage(startPage-1));
+            UIntPtr endPage = startPage + pageCount;
+            UIntPtr index = startPage;
+            while (index < endPage &&
+                   PageTable.IsUnusedPage(index) &&
+                   PageTable.IsMyPage(index)) {
+                index++;
+            }
+            if (PageTable.IsUnallocatedPage(PageTable.Type(index))) {
+                // We should try to extend the region of allocated pages
+                UIntPtr pagesNeeded = pageCount - (index - startPage);
+                UIntPtr bytesNeeded = PageTable.RegionSize(pagesNeeded);
+                UIntPtr allocSize = Util.Pad(bytesNeeded, heap_commit_size);
+                UIntPtr startAddr = PageTable.PageAddr(index);
+                bool iflag = EnterMutex(currentThread);
+                bool gotMemory = false;
+                try {
+                    gotMemory =
+                        MemoryManager.AllocateMemory(startAddr, allocSize);
+                    if (gotMemory) {
+                        UIntPtr allocPages = PageTable.PageCount(allocSize);
+                        MarkUnusedPages(/* avoid recursive locking */ null,
+                                        index, allocPages, true);
+                    }
+                } finally {
+                    LeaveMutex(currentThread, iflag);
+                }
+                if (gotMemory) {
+                    bool success =
+                        TryReserveUnusedPages(currentThread, startPage,
+                                              pageCount, newType,
+                                              ref fCleanPages);
+                    Trace.Log(Trace.Area.Page,
+                              "TryReservePages success={0}",
+                              __arglist(success));
+                    return success;
+                }
+            }
+            return false;
+        }
+
+        // Try to find a region of unused memory of a given size.  If the
+        // request can be satisfied, the return value is the first page
+        // in the found region.  If the request cannot be satisfied, the
+        // return value is UIntPtr.Zero.
+        [ManualRefCounts]
+        private static UIntPtr FindUnusedPages(Thread currentThread,
+                                               UIntPtr pageCount,
+                                               PageType newType)
+        {
+            VTable.Deny(PageTable.IsUnusedPageType(newType));
+            int slot = SlotFromCount(pageCount);
+            Trace.Log(Trace.Area.Page,
+                      "FindUnusedPages count={0:x} slot={1}",
+                      __arglist(pageCount, slot));
+            bool iflag = EnterMutex(currentThread);
+            try {
+                while (slot < 32) {
+                    UnusedBlockHeader *header = unusedMemoryBlocks[slot].next;
+                    while (header != null) {
+                        if (header->count >= pageCount) {
+                            UIntPtr startPage =
+                                PageTable.Page((UIntPtr) header);
+                            UIntPtr regionSize = UnlinkUnusedPages(startPage);
+                            SetPageTypeClean(startPage, pageCount, newType);
+                            if (regionSize > pageCount) {
+                                UIntPtr restCount = regionSize - pageCount;
+                                UIntPtr endPage = startPage + pageCount;
+                                LinkUnusedPages(endPage, restCount);
+                            }
+                            Trace.Log(Trace.Area.Page,
+                                      "FindUnusedPages success {0:x}",
+                                      __arglist(startPage));
+                            return startPage;
+                        }
+                        header = header->next;
+                    }
+                    slot++;
+                }
+                return UIntPtr.Zero;
+            } finally {
+                LeaveMutex(currentThread, iflag);
+            }
+        }
+
+        [ManualRefCounts]
+        private static void CleanFoundPages(UIntPtr startPage)
+        {
+            UIntPtr *tableAddr = (UIntPtr *) PageTable.PageAddr(startPage);
+            uint count = (uint) *tableAddr;
+            UIntPtr* cursor = tableAddr + (count + count);
+            while (count != 0) {
+                UIntPtr dirtySize = *cursor;
+                *cursor-- = UIntPtr.Zero;
+                UIntPtr dirtyStartAddr = *cursor;
+                *cursor-- = UIntPtr.Zero;
+                Util.MemClear(dirtyStartAddr, dirtySize);
+                count--;
+            }
+            *tableAddr = UIntPtr.Zero;
+        }
+
+        [ManualRefCounts]
+        private static bool FoundOnlyCleanPages(UIntPtr startPage)
+        {
+            UIntPtr *tableAddr = (UIntPtr *) PageTable.PageAddr(startPage);
+            uint count = (uint) *tableAddr;
+            UIntPtr* cursor = tableAddr + (count + count);
+            bool result = true;
+            while (count != 0) {
+                result = false;
+                UIntPtr dirtySize = *cursor;
+                *cursor-- = UIntPtr.Zero;
+                UIntPtr dirtyStartAddr = *cursor;
+                *cursor-- = UIntPtr.Zero;
+                count--;
+            }
+            *tableAddr = UIntPtr.Zero;
+            return result;
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        internal static void VerifyUnusedPage(UIntPtr page, bool containsHeader)
+        {
+            if (PageTable.Type(page) == PageType.UnusedDirty) {
+                return;
+            }
+
+            // Verify that the page is indeed clean
+
+            UIntPtr *startAddr = (UIntPtr *) PageTable.PageAddr(page);
+            UIntPtr *endAddr = (UIntPtr *) PageTable.PageAddr(page + 1);
+
+            // If the page contains a header then we can't expect the header
+            // to be clean.
+            if (containsHeader)
+            {
+                startAddr += (uint)
+                    (Util.UIntPtrPad((UIntPtr)sizeof(UnusedBlockHeader))
+                     / (uint)sizeof(UIntPtr));
+            }
+
+            while (startAddr < endAddr) {
+                VTable.Assert(*startAddr == UIntPtr.Zero,
+                              "UnusedClean page contains nonzero data");
+                startAddr++;
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        internal static void VerifyUnusedRegion(UIntPtr startPage,
+                                                UIntPtr endPage)
+        {
+            // Verify that all of the pages are of the same Clean/Dirty type.
+            PageType startType = PageTable.Type(startPage);
+            for(UIntPtr page = startPage; page < endPage; ++page) {
+                VTable.Assert(startType == PageTable.Type(page),
+                              "Unused page types don't match in region");
+            }
+
+            if (startPage > UIntPtr.Zero &&
+                PageTable.IsUnusedPage(startPage-1) &&
+                PageTable.IsMyPage(startPage-1)) {
+                // We have already checked the region
+                return;
+            }
+
+            UIntPtr regionAddr = PageTable.PageAddr(startPage);
+            UnusedBlockHeader * regionHeader = (UnusedBlockHeader *) regionAddr;
+            UIntPtr pageCount = regionHeader->count;
+            VTable.Assert
+                (pageCount >= (endPage - startPage),
+                 "Region-to-verify is larger than its header specifies");
+
+            endPage = startPage + pageCount;
+
+            for(UIntPtr page = startPage; page < endPage; ++page) {
+                VTable.Assert(PageTable.IsUnusedPage(page) &&
+                              PageTable.IsMyPage(page),
+                              "Non my-unused page in unused region");
+
+                PageManager.VerifyUnusedPage
+                    (page, (page == startPage) || (page == (endPage - 1)));
+            }
+
+            VTable.Assert(!(endPage < PageTable.pageTableCount &&
+                            PageTable.IsUnusedPage(endPage) &&
+                            PageTable.IsMyPage(endPage)),
+                          "My-unused page immediately after unused region");
+
+            // Verify that the region is correctly linked into the
+            // list of unused memory blocks
+            int slot = SlotFromCount(pageCount);
+            UnusedBlockHeader *header = unusedMemoryBlocks[slot].next;
+            header->Verify();
+            while (regionAddr != (UIntPtr) header) {
+                header = header->next;
+                VTable.Assert(header != null,
+                              "Unused region not list for its slot number");
+                header->Verify();
+            }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/PageTable.cs b/base/Kernel/Bartok/GCs/PageTable.cs
new file mode 100644
index 0000000..0a5eab6
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/PageTable.cs
@@ -0,0 +1,781 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+    using Microsoft.Bartok.Runtime;
+
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Memory;
+    using Sing_MemoryManager = Microsoft.Singularity.Memory.MemoryManager;
+#elif SINGULARITY_PROCESS
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Services;
+#endif
+
+    [RequiredByBartok]
+    abstract internal class PageTable {
+
+        // WARNING: don't initialize any static fields in this class
+        // without manually running the class constructor at startup!
+
+        // The following are the several flavors for page table design:
+        // 1. Centralized: Only one table for all the memory. There are two
+        //    cases within it: HIMEM or not. HIMEM forces the table to put beyond
+        //    4G. HIMEM means for correctness testing, not for performance.
+        //    In both cases, an address is composed of two parts:
+        //              (Page number) (offset in the page)
+        // 2. Otherwise: there are multiple page tables (DistributedPT). Two cases are allowed:
+        //      (1) FlatDistributedPT: All the page tables manage the same-sized
+        //              space. A page table itself is within the space it manages, and the
+        //              offset of it to the starting address of the space is fixed.
+        //              An address has three parts:
+        //                  (Segment number)(page number in the segment)(Offset in the page)
+        //              Since a page table is located in a fixed offset of the segment it
+        //              manages, we do not need a segment table. The segment number
+        //              tells the segment address. With the fixed offset, we get the
+        //              the page table.
+        //      (2) two level hierarchy. An address has also three parts But
+        //              each page table can be put at an arbitrary place. So we need a
+        //              segment table to find the requested page table. Not implemented yet. But
+        //              is straightforward based on the flat distributed page table.
+        //     Note: to keep consistent with the previous central table, function Page()
+        //     will return (segment number)(page number in the segment) as the page number.
+
+        // Note: In distributed case, pageTableCount refers to the total entries in all
+        // page tables that have already been allocated.
+
+        internal static UIntPtr pageTableCount;
+#if SINGULARITY
+        protected static UIntPtr baseAddr;
+        protected static UIntPtr limitAddr;
+#endif
+
+        [RequiredByBartok]
+        [AccessedByRuntime("referenced from brtforgc.asm/halforgc.asm")]
+        internal static unsafe uint *halPageDescriptor;
+
+        [Intrinsic]
+        internal static PTType ptType;
+
+#if SINGULARITY_KERNEL
+        internal const uint ProcessPageMask = Sing_MemoryManager.ProcessPageMask;
+        internal static uint processTag;
+
+        internal static unsafe void Initialize()
+        {
+            Tracing.Log(Tracing.Debug, "Initialize.");
+
+            processTag = 0x10000;
+            baseAddr = Sing_MemoryManager.KernelBaseAddr;
+            pageTableCount = Sing_MemoryManager.KernelPageCount;
+            limitAddr = baseAddr + pageTableCount << PageBits;
+            halPageDescriptor = Sing_MemoryManager.KernelPageTable;
+        }
+#elif SINGULARITY_PROCESS
+        internal const uint ProcessPageMask = 0xffff0000u;
+        internal static uint processTag;
+
+        internal static unsafe void Initialize()
+        {
+            Tracing.Log(Tracing.Debug, "Initialize.");
+
+            processTag = PageTableService.GetProcessTag();
+            baseAddr = PageTableService.GetBaseAddress();
+            pageTableCount = PageTableService.GetPageCount();
+            limitAddr = baseAddr + (pageTableCount << PageBits);
+            halPageDescriptor = PageTableService.GetPageTable();
+        }
+#else
+
+        private static uint processTag {
+            get { VTable.NotReached("should not be using processTag outside of Singularity"); return 0; }
+            set { VTable.NotReached("should not be using processTag outside of Singularity"); }
+        }
+
+        // Initialization sets up page table in the memory. The pagetable must be
+        // set up before anything else (bootstrapmemory, GC,...) works.
+
+        // This function is implemented in each subclass by "new static", which
+        // is in general not ideal, but here since we explicitly call them by the class
+        // names, and they do not call other "new static" functions, there
+        // should not be any confusion.
+
+        // Also note that every function in this class that have different implementations
+        // in subclasses is implemented by testing ptType, and then calling the specific
+        // class. We cannot use the same idea as GC does, which use an "instance" of
+        // the specified GC type. The reason is that the instance needs allocate space
+        // from bootstrapmemory, which however, at each allocation, needs to change
+        // the pagetable. Since the pagetable has not generated an instance yet, the
+        // bootstrapmemory cannot access the pagetable through an instance.
+
+        [PreInitRefCounts]
+        [NoStackLinkCheck]
+        internal static unsafe void Initialize() {
+            switch(ptType) {
+              case PTType.CentralPT: {
+                  CentralPT.Initialize();
+                  break;
+              }
+              case PTType.CentralPTHimem: {
+                  CentralPTHimem.Initialize();
+                  break;
+              }
+              case PTType.FlatDistributedPT: {
+                  FlatDistributedPT.Initialize();
+                  break;
+              }
+              case PTType.FlatDistributedPTTest: {
+                  FlatDistributedPTTest.Initialize();
+                  break;
+              }
+              default: {
+                  VTable.NotReached("Unknown PT type: "+ptType);
+                  break;
+              }
+            }
+        }
+#endif
+
+        [System.Diagnostics.Conditional("SINGULARITY")]
+        internal static void SetProcessTag(uint tag) {
+            processTag = tag;
+        }
+
+        internal static bool Dump(ushort process)
+        {
+            UIntPtr pages = (UIntPtr) 0;
+            UIntPtr freePages = UIntPtr.Zero;
+            UIntPtr usedPages = UIntPtr.Zero;
+            UIntPtr stackPages = UIntPtr.Zero;
+            UIntPtr fixedPages = UIntPtr.Zero;
+            UIntPtr sharedPages = UIntPtr.Zero;
+            UIntPtr unknownPages = UIntPtr.Zero;
+
+            for (UIntPtr i = (UIntPtr) 1; i < pageTableCount; i++) {
+                if (Process(i) != process) {
+                    continue;
+                }
+
+                PageType type = Type(i);
+
+                pages++;
+                switch (type) {
+                    case PageType.UnusedDirty:
+                    case PageType.UnusedClean:
+                    case PageType.Unallocated:
+                        freePages++;
+                        break;
+
+                    case PageType.NonGC:
+                    case PageType.System:
+                        fixedPages++;
+                        break;
+
+                    case PageType.Stack:
+                        stackPages++;
+                        break;
+
+                    case PageType.Shared:
+                        sharedPages++;
+                        break;
+
+                    case PageType.Unknown:
+                        unknownPages++;
+                        break;
+
+                    case PageType.Owner2:
+                    case PageType.Owner3:
+                        type = PageType.Owner2;
+                        usedPages++;
+                        break;
+
+                    default:
+                        usedPages++;
+                        break;
+                }
+            }
+
+            if (pages > 0) {
+                VTable.DebugPrint("{0:d6}: free={1:d6}, use={2:d6}, stk={3:d6}, fix={4:d6}, shr={5:d6}, unk={6:d6}\n",
+                                  __arglist(process,
+                                            freePages,
+                                            usedPages,
+                                            stackPages,
+                                            fixedPages,
+                                            sharedPages,
+                                            unknownPages));
+                return true;
+            }
+            return false;
+        }
+
+        internal static void Dump(String s)
+        {
+            VTable.DebugPrint("PageTable.Dump({0}):\n",
+                              __arglist(s));
+
+            ushort empty = 0;
+            for (ushort proc = 0; proc < 10240; proc++) {
+                if (Dump(proc)) {
+                    empty = 0;
+                }
+                else {
+                    empty++;
+                }
+                if (empty > 512) {
+                    break;
+                }
+            }
+            Dump((ushort)0xffff);
+
+            PageType lastType = Type(UIntPtr.Zero);
+            ushort lastProcess = Process((UIntPtr) 1);
+            UIntPtr begin = UIntPtr.Zero;
+
+            UIntPtr freePages = UIntPtr.Zero;
+            UIntPtr usedPages = UIntPtr.Zero;
+            UIntPtr stackPages = UIntPtr.Zero;
+            UIntPtr fixedPages = UIntPtr.Zero;
+            UIntPtr sharedPages = UIntPtr.Zero;
+            UIntPtr unknownPages = UIntPtr.Zero;
+
+            for (UIntPtr i = (UIntPtr) 1; i < pageTableCount; i++) {
+                PageType type = Type(i);
+
+                switch (type) {
+                    case PageType.UnusedDirty:
+                    case PageType.UnusedClean:
+                    case PageType.Unallocated:
+                        freePages++;
+                        break;
+                    case PageType.NonGC:
+                    case PageType.System:
+                        fixedPages++;
+                        break;
+
+                    case PageType.Stack:
+                        stackPages++;
+                        break;
+
+                    case PageType.Shared:
+                        sharedPages++;
+                        break;
+
+                    case PageType.Unknown:
+                        unknownPages++;
+                        break;
+
+                    case PageType.Owner2:
+                    case PageType.Owner3:
+                        type = PageType.Owner2;
+                        usedPages++;
+                        break;
+
+                    default:
+                        usedPages++;
+                        break;
+                }
+
+                if ((type != lastType) || (Process(i) != lastProcess)) {
+#if NOTHING
+                    VTable.DebugPrint("  {0:x8}..{1:x8} ({2:d6} pages) : {3:x2} for {4:d5}\n",
+                                      __arglist(
+                                          ((ulong)begin) << PageBits,
+                                          ((ulong)i) << PageBits,
+                                          i - begin,
+                                          (uint)lastType,
+                                          lastProcess));
+#endif
+                    lastType = type;
+                    lastProcess = Process(i);
+                    begin = i;
+                }
+            }
+
+#if NOTHING
+            VTable.DebugPrint("  {0:x8}..{1:x8} ({2:d6} pages) : {3:x2} for {4:d5}\n",
+                              __arglist(
+                                  ((ulong)begin) << PageBits,
+                                  ((ulong)pageTableCount) << PageBits,
+                                  pageTableCount - begin,
+                                  (uint)lastType,
+                                  lastProcess));
+#endif
+
+            VTable.DebugPrint(" =====: free={1:d6}, use={2:d6}, stk={3:d6}, fix={4:d6}, shr={5:d6}, unk={6:d6}\n",
+                              __arglist(0,
+                                        freePages,
+                                        usedPages,
+                                        stackPages,
+                                        fixedPages,
+                                        sharedPages,
+                                        unknownPages));
+        }
+
+        internal static byte PageBits {
+            [Inline]
+            get { return 12; }
+        }
+
+        internal static UIntPtr PageSize {
+            [Inline]
+            get { return (UIntPtr)(1U << PageBits); }
+        }
+
+        internal static UIntPtr PageMask {
+            [Inline]
+            get { return PageSize - 1; }
+        }
+
+        internal static UIntPtr PageAlignMask {
+            [Inline]
+            get { return ~PageMask; }
+        }
+
+        [Inline]
+        internal unsafe static PageType MyType(UIntPtr page) {
+#if SINGULARITY
+            uint value = PageTableEntry(page);
+            if ((value & ProcessPageMask) == processTag) {
+                return (PageType)(value & 0xf);
+            }
+            else {
+                return PageType.Unknown;
+            }
+#else
+            return Type(page);
+#endif
+        }
+
+        [Inline]
+        internal unsafe static PageType Type(UIntPtr page) {
+            VTable.Assert(page < pageTableCount, "page out of count");
+            return (PageType)(PageTableEntry(page) & 0xf);
+        }
+
+        [Inline]
+        internal unsafe static void SetType(UIntPtr page, PageType newType) {
+            VTable.Assert(page < pageTableCount);
+
+            // for the Generational Collector, keep track of the max and min
+            // page of each generation.
+
+            switch(GC.gcType) {
+#if !SINGULARITY || ADAPTIVE_COPYING_COLLECTOR || SEMISPACE_COLLECTOR || SLIDING_COLLECTOR
+                case GCType.AdaptiveCopyingCollector:
+                case GCType.SemispaceCollector:
+                case GCType.SlidingCollector:
+                    int generation = (int)newType;
+
+                    if (generation >= (int)GCs.GenerationalCollector.MIN_GENERATION
+                        && generation <= (int)GCs.GenerationalCollector.MAX_GENERATION)
+                    {
+                        if (page < GCs.GenerationalCollector.MinGenPage[generation])
+                        {
+                            GCs.GenerationalCollector.MinGenPage[generation] = page;
+                        }
+                        if (page > GCs.GenerationalCollector.MaxGenPage[generation])
+                        {
+                            GCs.GenerationalCollector.MaxGenPage[generation] = page;
+                        }
+                    }
+                    break;
+#endif
+#if !SINGULARITY || MARK_SWEEP_COLLECTOR || CONCURRENT_MS_COLLECTOR
+                case GCType.MarkSweepCollector:
+                case GCType.TableMarkSweepCollector:
+                case GCType.ReferenceCountingCollector:
+                case GCType.ConcurrentMSCollector:
+                case GCType.AtomicRCCollector:
+                case GCType.DeferredReferenceCountingCollector:
+                case GCType.NullCollector:
+                    // do nothing if not a Generational Collector
+                    break;
+#endif
+                default:
+                    VTable.Assert(false, "Unknown Garbage Collector.");
+                    break;
+            }
+
+            uint value = (PageTableEntry(page) & ~0xfU) | (uint)newType;
+            SetPageTableEntry(page, value);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        internal static void VerifyType(UIntPtr page, PageType pageType)
+        {
+            VTable.Assert(PageTable.Type(page) == pageType);
+        }
+
+        [Inline]
+        internal static short Extra(UIntPtr page) {
+            VTable.Assert(page < pageTableCount);
+            return (short)((PageTableEntry(page) & 0xfff0) >> 4);
+        }
+
+        [Inline]
+        internal static void SetExtra(UIntPtr page, short extra) {
+            VTable.Assert(page < pageTableCount);
+            uint value = (PageTableEntry(page) & ~0xfff0U) | ((uint) extra << 4);
+            SetPageTableEntry(page, value);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        internal static void VerifyExtra(UIntPtr page, short extra) {
+            VTable.Assert(Extra(page) == extra);
+        }
+
+        [Inline]
+        internal static ushort Process(UIntPtr page) {
+#if SINGULARITY
+            VTable.Assert(page < pageTableCount);
+            return (ushort)((PageTableEntry(page) & 0xffff0000u) >> 16);
+#else
+            return 0;
+#endif
+        }
+
+        [Inline]
+        [System.Diagnostics.Conditional("SINGULARITY")]
+        internal unsafe static void SetProcess(UIntPtr page, ushort processId) {
+            VTable.Assert(page < pageTableCount);
+            uint value = (PageTableEntry(page) & ~0xffff0000U) | ((uint) processId << 16);
+            SetPageTableEntry(page, value);
+        }
+
+#if SINGULARITY
+        [Inline]
+        private unsafe static uint ProcessTag(UIntPtr page) {
+            VTable.Assert(page < pageTableCount);
+            return PageTableEntry(page) & 0xffff0000u;
+        }
+#endif
+
+        [Inline]
+        [System.Diagnostics.Conditional("SINGULARITY")]
+        private unsafe static void SetProcessTag(UIntPtr page, uint processTag) {
+            VTable.Assert(page < pageTableCount);
+            uint  value = (PageTableEntry(page) & ~0xffff0000U) | processTag;
+            SetPageTableEntry(page, value);
+        }
+
+        [Inline]
+        internal static void SetType(UIntPtr startPage,
+                                     UIntPtr pageCount,
+                                     PageType newType)
+        {
+            while (pageCount > UIntPtr.Zero) {
+                SetType(startPage, newType);
+                startPage++;
+                pageCount--;
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        internal static void VerifyType(UIntPtr startPage,
+                                        UIntPtr pageCount,
+                                        PageType pageType)
+        {
+            while (pageCount > UIntPtr.Zero) {
+                VerifyType(startPage, pageType);
+                startPage++;
+                pageCount--;
+            }
+        }
+
+        [Inline]
+        internal static void SetExtra(UIntPtr startPage,
+                                      UIntPtr pageCount,
+                                      short extra)
+        {
+            while (pageCount > UIntPtr.Zero) {
+                SetExtra(startPage, extra);
+                startPage++;
+                pageCount--;
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        internal static void VerifyExtra(UIntPtr startPage,
+                                         UIntPtr pageCount,
+                                         short extra)
+        {
+            while (pageCount > UIntPtr.Zero) {
+                VerifyExtra(startPage, extra);
+                startPage++;
+                pageCount--;
+            }
+        }
+
+        [Inline]
+        [System.Diagnostics.Conditional("SINGULARITY")]
+        internal static void SetProcess(UIntPtr startPage,
+                                        UIntPtr pageCount)
+        {
+            uint processId = processTag;
+            PageTable.SetProcessTag(startPage, pageCount, processTag);
+        }
+
+        [Inline]
+        [System.Diagnostics.Conditional("SINGULARITY")]
+        internal static void SetProcess(UIntPtr startPage,
+                                        UIntPtr pageCount,
+                                        ushort processId)
+        {
+            while (pageCount > UIntPtr.Zero) {
+                SetProcess(startPage, processId);
+                startPage++;
+                pageCount--;
+            }
+        }
+
+        [Inline]
+        [System.Diagnostics.Conditional("SINGULARITY")]
+        internal static void SetProcessTag(UIntPtr startPage,
+                                           UIntPtr pageCount,
+                                           uint processTag)
+        {
+            while (pageCount > UIntPtr.Zero) {
+                SetProcessTag(startPage, processTag);
+                startPage++;
+                pageCount--;
+            }
+        }
+
+        [Inline]
+        internal static bool IsGcPage(UIntPtr page)
+        {
+            return IsGcPage(Type(page));
+        }
+
+        [Inline]
+        internal static bool IsMyGcPage(UIntPtr page) {
+            return (PageTable.IsMyPage(page) && PageTable.IsGcPage(page));
+        }
+
+        // NOTE: The following 5 functions are dependent on the definition of
+        // System.GCs.PageType.
+
+        [Inline]
+        internal static bool IsGcPage(PageType pageType) {
+            return pageType >= PageType.Owner0;
+        }
+
+        [Inline]
+        internal static bool IsZombiePage(PageType pageType) {
+            return (pageType & PageType.TypeMask) == PageType.ZombieMask;
+        }
+
+        [Inline]
+        internal static bool IsLiveGcPage(PageType pageType) {
+            return ( (pageType >= PageType.Owner0) && (pageType < PageType.ZombieMask));
+        }
+
+        [Inline]
+        internal static PageType ZombieToLive(PageType pageType)
+        {
+            VTable.Assert(IsZombiePage(pageType), "not a zombie page");
+            PageType type = (PageType)(pageType - PageType.Zombie);
+            return type;
+        }
+
+        [Inline]
+        internal static PageType LiveToZombie(PageType pageType)
+        {
+            VTable.Assert(IsLiveGcPage(pageType), "not a live GC page");
+            return (pageType | PageType.Zombie);
+        }
+        // End of PageType dependent functions
+
+        [Inline]
+        internal static bool IsNonGcPage(PageType pageType) {
+            return pageType == PageType.NonGC;
+        }
+
+        [Inline]
+        internal static bool IsStackPage(PageType pageType) {
+            return pageType == PageType.Stack;
+        }
+
+        [Inline]
+        internal static bool IsSystemPage(PageType pageType) {
+            return pageType == PageType.System;
+        }
+
+        [Inline]
+        internal static bool IsSharedPage(PageType pageType) {
+            return pageType == PageType.Shared;
+        }
+
+        [Inline]
+        internal static bool IsUnknownPage(PageType pageType) {
+            return pageType == PageType.Unknown;
+        }
+
+        [Inline]
+        internal static bool IsUnallocatedPage(PageType pageType) {
+            return pageType == PageType.Unallocated;
+        }
+
+        [Inline]
+        internal static bool IsUnusedPage(UIntPtr page) {
+            return IsUnusedPageType(PageTable.Type(page));
+        }
+
+        [Inline]
+        internal static bool IsUnusedPageType(PageType pageType) {
+            return (pageType == PageType.UnusedDirty ||
+                    pageType == PageType.UnusedClean);
+        }
+
+        [Inline]
+        internal unsafe static bool IsMyPage(UIntPtr page) {
+#if SINGULARITY
+            return PageTable.ProcessTag(page) == processTag;
+#else
+            return true;
+#endif
+        }
+
+        [Inline]
+        internal static bool IsForeignAddr(UIntPtr addr) {
+#if SINGULARITY
+            return (addr < baseAddr) || (addr >= limitAddr);
+#else
+            return false;
+#endif
+        }
+
+        [Inline]
+        internal static UIntPtr Page(UIntPtr addr) {
+#if SINGULARITY
+            VTable.Assert((addr >= baseAddr) && (addr < limitAddr));
+            return (addr - baseAddr) >> PageBits;
+#else
+            return (addr >> PageBits);
+#endif
+        }
+
+        [Inline]
+        internal static UIntPtr PageCount(UIntPtr size) {
+            return ((size + PageMask) >> PageBits);
+        }
+
+        [Inline]
+        internal static UIntPtr PageAddr(UIntPtr page) {
+#if SINGULARITY
+            return ((page << PageBits) + baseAddr);
+#else
+            return (page << PageBits);
+#endif
+        }
+
+        [Inline]
+        internal static UIntPtr RegionSize(UIntPtr pageCount) {
+            return (pageCount << PageBits);
+        }
+
+        [Inline]
+        internal static bool PageAligned(UIntPtr addr) {
+            return ((addr & PageMask) == UIntPtr.Zero);
+        }
+
+        [Inline]
+        internal static UIntPtr PageAlign(UIntPtr addr) {
+            return addr & PageAlignMask;
+        }
+
+        [Inline]
+        internal static UIntPtr PagePad(UIntPtr addr) {
+            return ((addr + PageMask) & ~PageMask);
+        }
+
+        [Inline]
+        internal static UIntPtr PadBytesToPages(UIntPtr size)
+        {
+            return ((size + PageSize - 1) >> PageBits);
+        }
+
+        // The following functions have an implementation in each specific subclass. To avoid
+        // any potential "new static" confusion, we have the names with "Impl" suffix.
+
+        [Inline]
+        internal static unsafe uint PageTableEntry(UIntPtr page)
+        {
+            switch(ptType) {
+              case PTType.CentralPT:
+              case PTType.CentralPTHimem:
+                  return CentralPT.PageTableEntryImpl(page);
+
+#if !SINGULARITY
+              case PTType.FlatDistributedPT:
+              case PTType.FlatDistributedPTTest:
+                  return FlatDistributedPT.PageTableEntryImpl(page);
+#endif
+              default: {
+                  VTable.NotReached("Unknown PT type: "+ptType);
+                  return 0xffffffff;
+              }
+            }
+        }
+
+        [Inline]
+        internal static unsafe void SetPageTableEntry(UIntPtr page, uint value)
+        {
+            switch(ptType) {
+              case PTType.CentralPT:
+              case PTType.CentralPTHimem: {
+                  CentralPT.SetPageTableEntryImpl(page, value);
+                  break;
+              }
+#if !SINGULARITY
+              case PTType.FlatDistributedPT:
+              case PTType.FlatDistributedPTTest: {
+                    FlatDistributedPT.SetPageTableEntryImpl(page, value);
+                    break;
+              }
+#endif
+              default: {
+                  VTable.NotReached("Unknown PT type: "+ptType);
+                  break;
+              }
+            }
+        }
+
+        internal static unsafe void CreateNewPageTablesIfNecessary(UIntPtr startPage,
+                                                    UIntPtr pageCount)
+        {
+#if !SINGULARITY
+            if (ptType == PTType.FlatDistributedPT ||ptType == PTType.FlatDistributedPTTest) {
+                    FlatDistributedPT.CreateNewPageTablesIfNecessaryImpl(startPage, pageCount);
+           }
+#endif
+        }
+
+        [Inline]
+        internal static unsafe bool ValidMemAddress(void* addr)
+        {
+#if !SINGULARITY
+            if (ptType == PTType.CentralPTHimem) {
+                return CentralPTHimem.ValidMemAddressImpl(addr);
+            }
+#endif
+            return true;
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/PageType.cs b/base/Kernel/Bartok/GCs/PageType.cs
new file mode 100644
index 0000000..202cb01
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/PageType.cs
@@ -0,0 +1,72 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    // If the order of the page types is to be changed, remember to change
+    // the 5 functions pointed out in PageTable, and minor change in
+    // ConvertMethod.cs. We do not put the functions in this file, since
+    // PageType is an enum, not a class. These should be the only places
+    // that know the internal of PageType. Other classes should be already
+    // cleaned all the assumptions of the page type values and order.
+    // Also note that generational collectors have the assumption that an
+    // older generation has bigger value than a younger one. So do not
+    // change the order of Owner0...Owner7.
+
+    [FlagsAttribute]
+    internal enum PageType : byte {
+
+        // Let Unallocated be 0. Then after the page table is allocated by VirtualAlloc,
+        // which automatically initializes the memory to 0, the page table entries
+        // need not to be reinitialized as Unallocated.
+
+        Unallocated     = 0x00,
+        NonGC           = 0x01,                         // Used by Singularity ABI.
+
+        // System pages are unavailable to the GC heap.
+        Stack           = 0x02,                         // Used by Singularity ABI.
+        System          = 0x03,                         // Used by Singularity ABI.
+        Shared          = 0x04,                         // Shared heap page.
+        Unknown         = 0x05,
+
+        // For GC heap.
+
+        // Unused pages are available for inclusion in the GC heap.
+        UnusedDirty     = 0x06,
+        UnusedClean     = 0x07,
+
+        // Let all the GC heap types be higher numbers so that in PageTable.IsGCPage,
+        // we still need only one comparison: type >=Owner0.
+
+        Owner0          = 0x08,
+        Owner1          = 0x09,
+        Owner2          = 0x0a,
+        Owner3          = 0x0b,
+        Owner4          = 0x0c,
+        Owner5          = 0x0d,
+        Owner6          = 0x0e,
+        Owner7          = 0x0f,
+
+        Zombie4         = 0x0c,
+        Zombie5         = 0x0d,
+        Zombie6         = 0x0e,
+        Zombie7         = 0x0f,
+
+        // Masks for page type.
+
+        TypeMask        = 0x0c,
+        ZombieMask    = 0x0c,
+        Zombie            = 0x4
+    }
+}
diff --git a/base/Kernel/Bartok/GCs/ReferenceVisitor.cs b/base/Kernel/Bartok/GCs/ReferenceVisitor.cs
new file mode 100644
index 0000000..39674d6
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/ReferenceVisitor.cs
@@ -0,0 +1,334 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+
+    internal abstract class ReferenceVisitor {
+
+        internal struct ObjectDescriptor {
+            [ManualRefCounts]
+            [Inline]
+            internal ObjectDescriptor(VTable vtable, UIntPtr objectBase) :
+                this(vtable, objectBase, UIntPtr.Zero, UIntPtr.Zero)
+            {
+            }
+
+            [ManualRefCounts]
+            [Inline]
+            internal ObjectDescriptor(VTable vtable, UIntPtr objectBase,
+                                      UIntPtr secondBase) :
+                this(vtable, objectBase, secondBase, UIntPtr.Zero)
+            {
+            }
+
+            [ManualRefCounts]
+            [Inline]
+            internal ObjectDescriptor(VTable vtable,
+                                      UIntPtr objectBase,
+                                      UIntPtr secondBase,
+                                      UIntPtr extra)
+            {
+                this.vtable = vtable;
+                this.objectBase = objectBase;
+                this.secondBase = secondBase;
+                this.extra = extra;
+            }
+
+            internal new VTable vtable;
+            internal UIntPtr objectBase;
+            internal UIntPtr secondBase;
+            internal UIntPtr extra;
+        }
+
+        [ManualRefCounts]
+        internal virtual UIntPtr VisitReferenceFields(Object obj)
+        {
+            return this.VisitReferenceFields(Magic.addressOf(obj),
+                                             obj.vtable);
+        }
+
+        internal abstract UIntPtr VisitReferenceFields(UIntPtr objectBase,
+                                                       VTable vtable);
+
+        [Inline]
+        protected abstract unsafe
+        void Filter(UIntPtr *location, ref ObjectDescriptor objDesc);
+
+        [ManualRefCounts]
+        protected unsafe
+        UIntPtr VisitReferenceFieldsTemplate(ref ObjectDescriptor objDesc)
+        {
+            UIntPtr pointerTracking = objDesc.vtable.pointerTrackingMask;
+            uint objectTag = (pointerTracking & 0xf);
+            UIntPtr size;
+            switch (objectTag) {
+              case ObjectLayout.SPARSE_TAG: {
+                  UIntPtr *sparseObject = (UIntPtr *) objDesc.objectBase;
+                  size = ObjectLayout.ObjectSize(objDesc.vtable);
+                  pointerTracking >>= 4;
+                  while (pointerTracking != 0) {
+                      uint index = pointerTracking & 0xf;
+                      pointerTracking >>= 4;
+                      // The cast to int prevents C# from taking the
+                      // index * sizeof(UIntPtr) to long:
+                      UIntPtr *loc = sparseObject + (int) index;
+                      this.Filter(loc, ref objDesc);
+                  }
+                  break;
+              }
+              case ObjectLayout.DENSE_TAG: {
+                  // skip vtable
+                  int postHeaderSize = PostHeader.Size;
+                  UIntPtr *denseObject = (UIntPtr *)
+                      (objDesc.objectBase + postHeaderSize);
+                  size = ObjectLayout.ObjectSize(objDesc.vtable);
+                  pointerTracking >>= 4;
+                  while (pointerTracking != 0) {
+                      if ((pointerTracking & ((UIntPtr)0x1)) != 0) {
+                          this.Filter(denseObject, ref objDesc);
+                      }
+                      pointerTracking >>= 1;
+                      denseObject++;
+                  }
+                  break;
+              }
+              case ObjectLayout.PTR_VECTOR_TAG: {
+                  int postHeaderSize = PostHeader.Size;
+                  uint length = *(uint*)(objDesc.objectBase + postHeaderSize);
+                  size = ObjectLayout.ArraySize(objDesc.vtable, length);
+                  int preHeaderSize = PreHeader.Size;
+                  UIntPtr *elementAddress = (UIntPtr *)
+                      (objDesc.objectBase + objDesc.vtable.baseLength -
+                       preHeaderSize);
+                  for (uint i = 0; i < length; i++, elementAddress++) {
+                      this.Filter(elementAddress, ref objDesc);
+                  }
+                  break;
+              }
+              case ObjectLayout.OTHER_VECTOR_TAG: {
+                  int postHeaderSize = PostHeader.Size;
+                  uint length = *(uint*)(objDesc.objectBase + postHeaderSize);
+                  size = ObjectLayout.ArraySize(objDesc.vtable, length);
+                  if (objDesc.vtable.arrayOf == StructuralType.Struct) {
+                      // pretend the struct is boxed and account for the
+                      // presence of the vtable field
+                      VTable elementVTable = objDesc.vtable.arrayElementClass;
+                      UIntPtr elementMask = elementVTable.pointerTrackingMask;
+                      // A structure with no references will have a SPARSE
+                      // descriptor with no offset values.
+                      if (elementMask != (UIntPtr) ObjectLayout.SPARSE_TAG) {
+                          int preHeaderSize = PreHeader.Size;
+                          UIntPtr elementAddress = (objDesc.objectBase +
+                                                    objDesc.vtable.baseLength -
+                                                    preHeaderSize -
+                                                    postHeaderSize);
+                          int elementSize = objDesc.vtable.arrayElementSize;
+                          objDesc.vtable = elementVTable;
+                          for (uint i = 0; i < length; i++) {
+                              objDesc.objectBase = elementAddress;
+                              this.VisitReferenceFieldsTemplate(ref objDesc);
+                              elementAddress += elementSize;
+                          }
+                      }
+                  }
+                  break;
+              }
+              case ObjectLayout.PTR_ARRAY_TAG: {
+                  int postHeaderSize = PostHeader.Size;
+                  uint length = *(uint*)(objDesc.objectBase + postHeaderSize +
+                                         sizeof(uint));
+                  size = ObjectLayout.ArraySize(objDesc.vtable, length);
+                  int preHeaderSize = PreHeader.Size;
+                  UIntPtr *elementAddress = (UIntPtr *)
+                      (objDesc.objectBase + objDesc.vtable.baseLength -
+                       preHeaderSize);
+                  for (uint i = 0; i < length; i++, elementAddress++) {
+                      this.Filter(elementAddress, ref objDesc);
+                  }
+                  break;
+              }
+              case ObjectLayout.OTHER_ARRAY_TAG: {
+                  int postHeaderSize = PostHeader.Size;
+                  uint length = *(uint*)(objDesc.objectBase + postHeaderSize +
+                                         sizeof(uint));
+                  size = ObjectLayout.ArraySize(objDesc.vtable, length);
+                  if (objDesc.vtable.arrayOf == StructuralType.Struct) {
+                      // pretend the struct is boxed and account for the
+                      // presence of the PostHeader
+                      VTable elementVTable = objDesc.vtable.arrayElementClass;
+                      UIntPtr elementMask = elementVTable.pointerTrackingMask;
+                      // A structure with no references will have a SPARSE
+                      // descriptor with no offset values.
+                      if (elementMask != (UIntPtr) ObjectLayout.SPARSE_TAG) {
+                          int preHeaderSize = PreHeader.Size;
+                          int elementSize = objDesc.vtable.arrayElementSize;
+                          UIntPtr elementAddress =
+                              objDesc.objectBase + objDesc.vtable.baseLength -
+                              preHeaderSize - postHeaderSize;
+                          objDesc.vtable = elementVTable;
+                          for (uint i = 0; i < length; i++) {
+                              objDesc.objectBase = elementAddress;
+                              this.VisitReferenceFieldsTemplate(ref objDesc);
+                              elementAddress += elementSize;
+                          }
+                      }
+                  }
+                  break;
+              }
+              case ObjectLayout.STRING_TAG: {
+                  int postHeaderSize = PostHeader.Size;
+                  uint arrayLength =
+                      *(uint*)(objDesc.objectBase + postHeaderSize);
+                  size = ObjectLayout.StringSize(objDesc.vtable, arrayLength);
+                  break;
+              }
+              default: {
+                  // escape case
+                  VTable.Assert((objectTag & 0x1) == 0,
+                                "ReferenceVisitor: (objectTag & 0x1) == 0");
+                  UIntPtr *largeObject = (UIntPtr *) objDesc.objectBase;
+                  size = ObjectLayout.ObjectSize(objDesc.vtable);
+                  int *pointerDescription = (int *) pointerTracking;
+                  int count = *pointerDescription;
+                  for (int i = 1; i <= count; i++) {
+                      UIntPtr *loc = largeObject + *(pointerDescription+i);
+                      this.Filter(loc, ref objDesc);
+                  }
+                  break;
+              }
+            }
+            return size;
+        }
+
+        [ManualRefCounts]
+        protected unsafe
+        void VisitReferenceFieldsTemplate(ref ObjectDescriptor objDesc,
+                                          int count)
+        {
+            UIntPtr pointerTracking = objDesc.vtable.pointerTrackingMask;
+            uint objectTag = (pointerTracking & 0xf);
+            switch (objectTag) {
+              case ObjectLayout.PTR_VECTOR_TAG:
+              case ObjectLayout.PTR_ARRAY_TAG: {
+                  UIntPtr *elementAddress = (UIntPtr *) objDesc.objectBase;
+                  for (int i = 0; i < count; i++, elementAddress++) {
+                      this.Filter(elementAddress, ref objDesc);
+                  }
+                  break;
+              }
+              case ObjectLayout.OTHER_VECTOR_TAG:
+              case ObjectLayout.OTHER_ARRAY_TAG: {
+                  if (objDesc.vtable.arrayOf == StructuralType.Struct) {
+                      // pretend the struct is boxed and account for the
+                      // presence of the vtable field
+                      VTable elementVTable = objDesc.vtable.arrayElementClass;
+                      UIntPtr elementMask = elementVTable.pointerTrackingMask;
+                      // A structure with no references will have a SPARSE
+                      // descriptor with no offset values.
+                      if (elementMask != (UIntPtr) ObjectLayout.SPARSE_TAG) {
+                          int postHeaderSize = PostHeader.Size;
+                          objDesc.objectBase -= postHeaderSize;
+                          objDesc.secondBase -= postHeaderSize;
+                          objDesc.extra += postHeaderSize;
+                          int elementSize = objDesc.vtable.arrayElementSize;
+                          objDesc.vtable = elementVTable;
+                          for (int i = 0; i < count; i++) {
+                              this.VisitReferenceFieldsTemplate(ref objDesc);
+                              objDesc.objectBase += elementSize;
+                              objDesc.secondBase += elementSize;
+                              objDesc.extra -= elementSize;
+                          }
+                          objDesc.objectBase += postHeaderSize;
+                          objDesc.secondBase += postHeaderSize;
+                          objDesc.extra -= postHeaderSize;
+                      }
+                  }
+                  break;
+              }
+              default: {
+                  throw new Exception("Indexing non-indexed type");
+              }
+            }
+        }
+
+    }
+
+    internal abstract class NonNullReferenceVisitor : ReferenceVisitor
+    {
+
+        internal unsafe abstract void Visit(UIntPtr *location);
+
+#region HELP_DEVIRT
+        // This method simply forces the compiler to generate a copy
+        // of VisitReferenceFieldsTemplate in this class.
+        [ManualRefCounts]
+        internal override UIntPtr VisitReferenceFields(Object obj)
+        {
+            return this.VisitReferenceFields(Magic.addressOf(obj),
+                                             obj.vtable);
+        }
+
+        // This method simply forces the compiler to generate a copy
+        // of VisitReferenceFieldsTemplate in this class.
+        [ManualRefCounts]
+        internal override
+        UIntPtr VisitReferenceFields(UIntPtr objectBase, VTable vtable)
+        {
+            ObjectDescriptor objDesc =
+                new ObjectDescriptor(vtable, objectBase);
+            return VisitReferenceFieldsTemplate(ref objDesc);
+        }
+#endregion
+
+        [Inline]
+        protected override unsafe
+        void Filter(UIntPtr *location, ref ObjectDescriptor objDesc)
+        {
+            if (*location != UIntPtr.Zero) {
+                this.Visit(location);
+            }
+        }
+
+    }
+
+    internal abstract class OffsetReferenceVisitor : ReferenceVisitor
+    {
+
+        internal abstract void FieldOffset(UIntPtr offset,
+                                           ref ObjectDescriptor objDesc);
+
+#region HELP_DEVIRT
+        // This method simply forces the compiler to generate a copy
+        // of VisitReferenceFieldsTemplate in this class.
+        [ManualRefCounts]
+        internal override sealed
+        UIntPtr VisitReferenceFields(UIntPtr objectBase, VTable vtable)
+        {
+            ObjectDescriptor objDesc =
+                new ObjectDescriptor(vtable, objectBase);
+            return VisitReferenceFieldsTemplate(ref objDesc);
+        }
+#endregion
+
+        [Inline]
+        protected override unsafe sealed
+        void Filter(UIntPtr *location, ref ObjectDescriptor objDesc)
+        {
+            UIntPtr offset = ((UIntPtr) location) - objDesc.objectBase;
+            this.FieldOffset(offset, ref objDesc);
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/RememberedSet.cs b/base/Kernel/Bartok/GCs/RememberedSet.cs
new file mode 100644
index 0000000..46d5484
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/RememberedSet.cs
@@ -0,0 +1,39 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+    internal abstract unsafe class RememberedSet
+    {
+        // Record a pointer fromAddr->toAddr
+        internal abstract void RecordReference(ref Object reference,
+                                               Object toObj);
+        internal abstract void RecordReference(UIntPtr* fromAddr,
+                                               Object toObj);
+        internal abstract void RecordClonedObject(Object obj);
+        // Clean out stale entries for all threads
+        internal abstract void Clean();
+        // Clean out stale entries for given thread
+        internal abstract void Clean(Thread thread);
+        // Visit all locations in remset
+        internal abstract void Scan(NonNullReferenceVisitor visitor,
+                                             PageType genToCollect);
+         // Remove all entries in remset
+        internal abstract void Reset();
+        // Remove duplicates in remset
+        internal abstract void Uniquify();
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/SegregatedFreeList.cs b/base/Kernel/Bartok/GCs/SegregatedFreeList.cs
new file mode 100644
index 0000000..3a6887d
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/SegregatedFreeList.cs
@@ -0,0 +1,1266 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Options;
+    using Microsoft.Bartok.Runtime;
+
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+#endif
+
+    /// <summary>
+    /// This class supports Allocate/Free operations using memory obtained
+    /// from the PageManager.
+    ///
+    /// Objects that are small enough that multiple instances of them can fit
+    /// on a page are allocated from pages of identically sized memory cells.
+    ///
+    /// Large objects are allocated on separate pages.
+    ///
+    /// This class is designed to be thread safe on both allocation and free
+    /// operations. At this stage it is required that RecycleGlobalPages is
+    /// called periodically to reconsider previously full pages for inclusion
+    /// in allocation lists.
+    ///
+    /// The free operation is currently more expensive than required due to
+    /// space accounting.
+    ///
+    /// This class also keeps up to date memory accounting information. Note
+    /// that modifications to this data is not synchronized so it is possible
+    /// that the counts drift from actual figures over time.
+    /// </summary>
+    internal unsafe struct SegregatedFreeList /* : Allocator */
+    {
+
+        #region Mixins
+
+        [MixinConditional("SegregatedFreeList")]
+        [MixinConditional("AllThreadMixins")]
+        [Mixin(typeof(Thread))]
+        private class SegregatedFreeListThread : Object {
+            // Thread-specific segregated free-list allocator
+            [RequiredByBartok]
+            internal SegregatedFreeList segregatedFreeList;
+        }
+
+        [Inline]
+        private static SegregatedFreeListThread MixinThread(Thread t)
+        {
+            return (SegregatedFreeListThread) (Object) t;
+        }
+
+        #endregion
+
+        #region Global (Safe from the context of any thread)
+
+        #region Constants
+        /// <summary>
+        /// Small objects.
+        /// </summary>
+        internal const PageType SMALL_OBJ_PAGE = PageType.Owner2;
+
+        /// <summary>
+        /// This is a page that is being set up.
+        /// </summary>
+        internal const PageType INIT_PAGE = PageType.Owner4;
+
+        /// <summary>
+        /// Large objects.
+        /// </summary>
+        internal const PageType LARGE_OBJ_PAGE = PageType.Owner3;
+
+        /// <summary>
+        /// BUGBUG: Duplicated constant.
+        /// </summary>
+        internal const int LOG_PAGE_SIZE = 12;
+
+        /// <summary>
+        /// The size of each block (which contains a single object size)
+        /// </summary>
+        internal const int BLOCK_SIZE = (1 << LOG_PAGE_SIZE) - PageHeader.SIZEOF;
+
+        /// <summary>
+        /// The threshold where objects become large objects.
+        /// </summary>
+        internal const int LARGE_OBJECT_THRESHOLD = (BLOCK_SIZE >> 1) + 1;
+
+        /// <summary>
+        /// The largest possible size class.
+        /// </summary>
+        internal const int SIZE_CLASSES = 33 + ((LARGE_OBJECT_THRESHOLD-1) >> 7);
+        #endregion
+
+        #region Size Class Mappings
+        /// <summary>
+        /// Returns the size class index for an object of the specified size.
+        ///
+        /// BUGBUG: We hope that from an inlined allocation site this is
+        /// resolved as a constant. That is why this was changed to remove
+        /// indirection through an index lookup table.
+        /// </summary>
+        [Inline]
+        private static int GetSizeClass(UIntPtr bytes) {
+            // Exact request rounds down to lower size class.
+            bytes = bytes - new UIntPtr(1);
+            // Sizes 0 -> 64 are in classes 0 -> 15
+            // Sizes 72 -> 128 are in classes 16 -> 23
+            // Sizes 140 -> 256 are in classes 24 -> 31
+            // Sizes 256 -> 512 are in classes 32 -> 35
+            // We skip a power of 2 because large objects are rare.
+            //Sizes 512 and up are in classes 36 -> 41
+            if (bytes <  64) return  0 + ((int)bytes >> 2);
+            if (bytes < 128) return  8 + ((int)bytes >> 3);
+            if (bytes < 256) return 16 + ((int)bytes >> 4);
+            if (bytes < 512) return 28 + ((int)bytes >> 6);
+            if (bytes < LARGE_OBJECT_THRESHOLD) return 32 + ((int)bytes >> 7);
+            throw new Exception("GetSizeClass called on large object size");
+        }
+
+        /// <summary>
+        /// Returns the cell size for a given size class.
+        /// </summary>
+        private static UIntPtr GetCellSize(int sizeClass) {
+            VTable.Assert(sizeClass < SIZE_CLASSES,
+                          "Attempt cellSize for invalid sizeClass");
+
+            uint sc = (uint)sizeClass + 1;
+
+            uint bytes;
+            if      (sc <= 16) bytes = (sc -  0) << 2;
+            else if (sc <= 24) bytes = (sc -  8) << 3;
+            else if (sc <= 32) bytes = (sc - 16) << 4;
+            else if (sc <= 36) bytes = (sc - 28) << 6;
+            else               bytes = (sc - 32) << 7;
+
+            return new UIntPtr(bytes);
+        }
+        #endregion
+
+        #region Memory Accounting
+        /// <summary>
+        /// A count of the bytes allocated for small objects.
+        /// </summary>
+        internal static UIntPtr SmallBytes;
+
+        /// <summary>
+        /// A count of the bytes for objects the process of being freed.
+        /// </summary>
+        internal static UIntPtr SmallFreedBytes;
+
+        /// <summary>
+        /// A count of the small pages in the process of being freed.
+        /// </summary>
+        internal static UIntPtr SmallFreedPages;
+
+        /// <summary>
+        /// A count of the large pages in the process of being freed.
+        /// </summary>
+        internal static UIntPtr LargeFreedPages;
+
+        /// <summary>
+        /// A count of the bytes allocated for large objects.
+        /// </summary>
+        internal static UIntPtr LargeBytes {
+            get {
+                return PageTable.RegionSize(LargePages);
+            }
+        }
+
+        /// <summary>
+        /// The number of pages reserved for large objects.
+        /// </summary>
+        internal static UIntPtr LargePages;
+
+        /// <summary>
+        /// The number of pages reserved for small objects.
+        /// </summary>
+        internal static UIntPtr SmallPages;
+
+        /// <summary>
+        /// This is the total size of data (including object headers)
+        /// </summary>
+        internal static UIntPtr TotalBytes {
+            get {
+                return SmallBytes + LargeBytes;
+            }
+        }
+
+        /// <summary>
+        /// The number of pages managed by the alloc heap, including space
+        /// occupied by empty cells.
+        /// </summary>
+        internal static UIntPtr ReservedBytes {
+            get {
+                return PageTable.RegionSize(SmallPages) + LargeBytes;
+            }
+        }
+
+        /// <summary>
+        /// Increment the counter of the number of small bytes allocated.
+        /// </summary>
+        [Inline]
+        private static void AddSmallBytes(UIntPtr newBytes) {
+            SmallBytes += newBytes;
+            GC.newBytesSinceGC += newBytes;
+        }
+
+        /// <summary>
+        /// Increment the counter of the number of large bytes allocated.
+        /// </summary>
+        [Inline]
+        private static void AddLargePages(UIntPtr pageCount) {
+            LargePages += pageCount;
+            GC.newBytesSinceGC += PageTable.RegionSize(pageCount);
+        }
+
+        /// <summary>
+        /// Decrement the counter of the number of small bytes allocated.
+        /// </summary>
+        [Inline]
+        private static void SubSmallBytes(UIntPtr newBytes) {
+            SmallFreedBytes += newBytes;
+        }
+
+        /// <summary>
+        /// Decrement the counter of the number of large pages allocated.
+        /// </summary>
+        [Inline]
+        private static void SubLargePages(UIntPtr pageCount) {
+            LargeFreedPages += pageCount;
+        }
+
+        /// <summary>
+        /// Increment the counter of the number of small pages allocated.
+        /// </summary>
+        [Inline]
+        private static void AddSmallPage() {
+            SmallPages += new UIntPtr(1);
+            AddSmallBytes(PageTable.PageSize);
+        }
+
+        /// <summary>
+        /// Decrement the counter of the number of small pages allocated.
+        /// </summary>
+        [Inline]
+        private static void SubSmallPage(PageHeader *page) {
+            SmallFreedPages += new UIntPtr(1);
+            SubSmallBytes(PageTable.PageSize -
+                          (page->cellSize * (UIntPtr) page->freeCount));
+        }
+
+        /// <summary>
+        /// Subtract and zero the freed data counts.
+        /// </summary>
+        internal static void CommitFreedData() {
+            SmallPages -= SmallFreedPages;
+            SmallFreedPages = new UIntPtr(0);
+            LargePages -= LargeFreedPages;
+            LargeFreedPages = new UIntPtr(0);
+            SmallBytes -= SmallFreedBytes;
+            SmallFreedBytes = new UIntPtr(0);
+        }
+        #endregion
+
+        /// <summary>
+        /// When notified of the creation of a new thread we initialize the
+        /// alloc heap in that thread.
+        /// </summary>
+        internal unsafe static void NewThreadNotification(Thread newThread,
+                                                          bool initial)
+        {
+            SegregatedFreeListThread mixinThread = MixinThread(newThread);
+            if (initial) {
+                // Initialise the initial thread.
+                mixinThread.segregatedFreeList.localPages = (PageHeader*[])
+                    BootstrapMemory.Allocate(typeof(PageHeader*[]),
+                                             SIZE_CLASSES);
+                mixinThread.segregatedFreeList.freeList = (UIntPtr[])
+                    BootstrapMemory.Allocate(typeof(UIntPtr[]), SIZE_CLASSES);
+            } else {
+                // We have to create the thread-specific array of pages.
+                mixinThread.segregatedFreeList.freeList =
+                    new UIntPtr[SIZE_CLASSES];
+                mixinThread.segregatedFreeList.localPages =
+                    new PageHeader*[SIZE_CLASSES];
+            }
+        }
+
+        /// <summary>
+        /// A thread has finished, so we release any local pages.
+        /// </summary>
+        internal static void DeadThreadNotification(Thread deadThread)
+        {
+            SegregatedFreeListThread mixinThread = MixinThread(deadThread);
+            for(int i=0; i < SIZE_CLASSES; i++) {
+                if (mixinThread.segregatedFreeList.localPages[i] != null) {
+                    mixinThread.segregatedFreeList.ReleaseLocalPage(i);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Allocate a large object. Large objects don't share pages with
+        /// any other objects. Get memory for the object directly from the
+        /// PageManager.
+        /// </summary>
+        [ManualRefCounts]
+        private static unsafe UIntPtr AllocateLarge(uint alignment,
+                                                    UIntPtr bytes,
+                                                    Thread currentThread)
+        {
+            UIntPtr pageCount = PageTable.PageCount(PageTable.PagePad(bytes));
+            bool fCleanPages = true;
+            UIntPtr page = PageManager.EnsurePages(currentThread,
+                                                   pageCount, INIT_PAGE,
+                                                   ref fCleanPages);
+
+            UIntPtr regionSize = PageTable.RegionSize(pageCount);
+            AddLargePages(pageCount);
+
+            int unusedBytes = (int) (regionSize - bytes);
+            int unusedCacheLines = unusedBytes >> 5;
+            int offset;
+            if (unusedCacheLines != 0) {
+                offset = (largeOffset % unusedCacheLines) << 5;
+                largeOffset =
+                    (largeOffset + 1) & ((int)PageTable.PageSize - 1);
+            } else {
+                offset = 0;
+            }
+            UIntPtr pageAddr = PageTable.PageAddr(page);
+            UIntPtr startAddr = pageAddr + offset + PreHeader.Size;
+            UIntPtr resultAddr =
+                Allocator.AlignedObjectPtr(startAddr, alignment);
+            short shortOff = (short) (resultAddr - pageAddr);
+            VTable.Assert(shortOff > 0, "offset not positive");
+            PageTable.SetExtra(page, shortOff);
+            // Ready to be visited
+            PageTable.SetType(page, pageCount, LARGE_OBJ_PAGE);
+            return resultAddr;
+        }
+
+        /// <summary>
+        /// Free the specified object. For large objects the page becomes
+        /// immediately available. For small objects it may require a call
+        /// to RecycleGlobalPages.
+        /// </summary>
+        [ManualRefCounts]
+        internal static void Free(Object obj) {
+            UIntPtr objectStart = Magic.addressOf(obj) - PreHeader.Size;
+            UIntPtr page = PageTable.Page(objectStart);
+            PageType pageType = PageTable.Type(page);
+            // Free the object
+            if (pageType == SMALL_OBJ_PAGE) {
+                FreeSmall(obj);
+            } else {
+                VTable.Assert(pageType == LARGE_OBJ_PAGE,
+                    "Found GC Page not small or large");
+                FreeLarge(obj);
+            }
+        }
+
+        /// <summary>
+        /// Free a small object.
+        /// </summary>
+        [ManualRefCounts]
+        internal static void FreeSmall(Object obj) {
+            UIntPtr objectAddr = Magic.addressOf(obj);
+            // Put the object memory cell on the freelist for the page
+            UIntPtr pageAddr = PageTable.PageAlign(objectAddr);
+            PageHeader *pageHeader = (PageHeader*) pageAddr;
+            UIntPtr cellStart;
+            if (obj.vtable.baseAlignment > UIntPtr.Size) {
+                cellStart = FindSmallCell(objectAddr);
+                VTable.Assert(cellStart > (UIntPtr) pageHeader &&
+                              cellStart <= objectAddr &&
+                              cellStart+pageHeader->cellSize >= objectAddr,
+                              "find small cell found invalid start");
+            } else {
+                cellStart = objectAddr - PreHeader.Size;
+            }
+            Util.MemClear(cellStart, pageHeader->cellSize);
+            SubSmallBytes(pageHeader->cellSize);
+            UIntPtr oldFreeList;
+            cellStart = (cellStart + PreHeader.Size);
+            do {
+                oldFreeList = pageHeader->freeList;
+                *(UIntPtr *)cellStart = oldFreeList;
+            } while (Interlocked.CompareExchange(ref pageHeader->freeList,
+                cellStart, oldFreeList) != oldFreeList);
+            Interlocked.Increment(ref pageHeader->freeCount);
+        }
+
+        internal unsafe struct TempList {
+
+            private UIntPtr next;
+
+            internal void Add(UIntPtr memAddr) {
+                *(UIntPtr *) memAddr = this.next;
+                this.next = memAddr;
+            }
+
+            internal UIntPtr GetList() {
+                UIntPtr result = this.next;
+                this.next = UIntPtr.Zero;
+                return result;
+            }
+
+        }
+
+        [ManualRefCounts]
+        internal static void FreeSmallList(ref TempList tempList)
+        {
+            UIntPtr cell = tempList.GetList();
+            if (cell != UIntPtr.Zero) {
+                PageHeader *pageHeader = (PageHeader *)
+                    PageTable.PageAlign(cell);
+                UIntPtr newChain = UIntPtr.Zero;
+                UIntPtr newChainTail = cell + PreHeader.Size;
+                UIntPtr cellSize = pageHeader->cellSize;
+                int count = 0;
+                do {
+                    count++;
+                    UIntPtr next = *(UIntPtr *) cell;
+                    Util.MemClear(cell, cellSize);
+                    UIntPtr cellPtrAddr = cell + PreHeader.Size;
+                    *(UIntPtr *) cellPtrAddr = newChain;
+                    newChain = cellPtrAddr;
+                    cell = next;
+                } while (cell != UIntPtr.Zero);
+                SubSmallBytes((UIntPtr) count * cellSize);
+                UIntPtr oldFreeList;
+                do {
+                    oldFreeList = pageHeader->freeList;
+                    *(UIntPtr*)newChainTail = oldFreeList;
+                } while (Interlocked.CompareExchange(ref pageHeader->freeList,
+                                                     newChain, oldFreeList) !=
+                         oldFreeList);
+                int oldFreeCount, newFreeCount;
+                do {
+                    oldFreeCount = pageHeader->freeCount;
+                    newFreeCount = oldFreeCount + count;
+                } while (Interlocked.CompareExchange(ref pageHeader->freeCount,
+                                                     newFreeCount,
+                                                     oldFreeCount) !=
+                         oldFreeCount);
+            }
+        }
+
+        /// <summary>
+        /// Free a large object.
+        /// </summary>
+        [ManualRefCounts]
+        internal static void FreeLarge(Object obj) {
+            UIntPtr objectStart = Magic.addressOf(obj) - PreHeader.Size;
+            UIntPtr firstPage = PageTable.Page(objectStart);
+            // Release the page(s) that the object resides on
+            UIntPtr pageAddr = PageTable.PageAlign(objectStart);
+            UIntPtr objectSize = ObjectLayout.Sizeof(obj);
+            UIntPtr limitPage =
+                PageTable.Page(PageTable.PagePad(objectStart + objectSize));
+            UIntPtr pageCount = limitPage - firstPage;
+            PageTable.SetType(firstPage, pageCount, INIT_PAGE);
+            PageTable.SetExtra(PageTable.Page(pageAddr), 0);
+            PageManager.ReleaseUnusedPages(firstPage, pageCount, false);
+            SubLargePages(pageCount);
+        }
+
+        /// <summary>
+        /// Given a possibly interior pointer to an object, return the
+        /// real address of the object.
+        /// </summary>
+        internal static unsafe UIntPtr Find(UIntPtr addr) {
+            UIntPtr page = PageTable.Page(addr);
+            PageType pageType = PageTable.Type(page);
+            VTable.Assert(PageTable.IsGcPage(pageType),
+                          "Attempt find on non-GC page");
+            if (pageType == SMALL_OBJ_PAGE) {
+                return FindSmall(addr);
+            } else {
+                return FindLarge(addr);
+            }
+        }
+
+        /// <summary>
+        /// Find a small object (after determining it is on a small page)
+        /// </summary>
+        private static UIntPtr FindSmall(UIntPtr cellAddr) {
+            UIntPtr objectAddr = FindSmallCell(cellAddr) + PreHeader.Size;
+            objectAddr = Allocator.SkipAlignment(objectAddr);
+            return objectAddr;
+        }
+
+        /// <summary>
+        /// Find the cell for a given object address
+        /// </summary>
+        private static unsafe UIntPtr FindSmallCell(UIntPtr addr) {
+            UIntPtr pageAddr = PageTable.PageAlign(addr - PreHeader.Size);
+            PageHeader *pageHeader = (PageHeader *) pageAddr;
+            UIntPtr firstAddr = pageAddr + PageHeader.SIZEOF;
+            return
+                addr - ((int)(addr - firstAddr) % (int)pageHeader->cellSize);
+        }
+
+        /// <summary>
+        /// Find a large object (after determining it is on a large page)
+        /// </summary>
+        private static UIntPtr FindLarge(UIntPtr addr) {
+            UIntPtr page = PageTable.Page(addr - PreHeader.Size);
+            short brickData = PageTable.Extra(page);
+            while (brickData == 0) {
+                page--;
+                brickData = PageTable.Extra(page);
+                VTable.Assert(PageTable.Type(page) == LARGE_OBJ_PAGE,
+                              "page type invalid");
+            }
+            return (PageTable.PageAddr(page) + brickData);
+        }
+
+        internal abstract class ObjectVisitor : ObjectLayout.ObjectVisitor {
+
+            internal virtual void VisitSmall(Object obj, UIntPtr memAddr) {
+                this.Visit(obj);
+            }
+
+            internal virtual void VisitSmallPageEnd() { }
+
+            internal virtual UIntPtr VisitLarge(Object obj) {
+                return this.Visit(obj);
+            }
+
+            internal override UIntPtr Visit(Object obj) {
+                VTable.NotReached("Someone forgot an override method in a "+
+                                  "subclass of SegregatedFreeList.ObjectVisitor");
+                return UIntPtr.Zero;
+            }
+
+        }
+
+        // Wraps an SegregatedFreeList.ObjectVisitor around a
+        // ObjectLayout.ObjectVisitor.
+        // Both large and small objects are visited by the same
+        // ObjectLayout.ObjectVisitor.
+        internal class ObjectVisitorWrapper : ObjectVisitor {
+
+            private ObjectLayout.ObjectVisitor visitor;
+
+            internal ObjectVisitorWrapper(ObjectLayout.ObjectVisitor visitor) {
+                this.visitor = visitor;
+            }
+
+            internal override void VisitSmall(Object obj, UIntPtr memAddr) {
+                this.visitor.Visit(obj);
+            }
+
+            internal override UIntPtr VisitLarge(Object obj) {
+                return this.visitor.Visit(obj);
+            }
+
+        }
+
+        /// <summary>
+        /// Visit each object in the heap across all pages.
+        /// </summary>
+        [ManualRefCounts]
+        internal static void VisitAllObjects(ObjectVisitor visitor)
+        {
+            VisitObjects(UIntPtr.Zero, PageTable.pageTableCount, visitor);
+        }
+
+        /// <summary>
+        /// Visit each object in the heap across a range of pages.
+        ///
+        /// This can be run concurrent to allocations, but not frees.
+        /// </summary>
+        [ManualRefCounts]
+        internal static void VisitObjects(UIntPtr lowPage,
+                                          UIntPtr highPage,
+                                          ObjectVisitor visitor)
+        {
+            for (UIntPtr i = lowPage; i < highPage; i++) {
+                PageType pageType = PageTable.MyType(i);
+                if (pageType == INIT_PAGE) {
+                    // Not yet ready for allocation so we can't visit it...
+                } else if (pageType == SMALL_OBJ_PAGE) {
+                    VisitSmallObjects(i, visitor);
+                } else if (pageType == LARGE_OBJ_PAGE) {
+                    UIntPtr j = i + 1;
+                    while (j < highPage &&
+                           PageTable.MyType(j) == LARGE_OBJ_PAGE) {
+                        j++;
+                    }
+                    UIntPtr largeObjectPageCount =
+                        VisitLargeObject(i, visitor);
+                    i += largeObjectPageCount - 1;
+                    VTable.Assert(i <= j);
+                }
+            }
+        }
+
+        internal static void VisitObjects(UIntPtr lowPage,
+                                          UIntPtr highPage,
+                                          ObjectLayout.ObjectVisitor visitor)
+        {
+            ObjectVisitor myObjectVisitor = visitor as ObjectVisitor;
+            VTable.Assert(myObjectVisitor != null,
+                          "SegregatedFreeList requires specialized ObjectVisitor");
+            VisitObjects(lowPage, highPage, myObjectVisitor);
+        }
+
+        /// <summary>
+        /// Visit small objects in a single page.
+        /// </summary>
+        [ManualRefCounts]
+        private static unsafe void VisitSmallObjects(UIntPtr page,
+                                                     ObjectVisitor visitor)
+        {
+            VTable.Assert(PageTable.Type(page) == SMALL_OBJ_PAGE,
+                          "Visiting small objects on invalid page");
+            UIntPtr pageAddr = PageTable.PageAddr(page);
+            PageHeader *pageHeader = (PageHeader *) pageAddr;
+            UIntPtr cellSize = pageHeader->cellSize;
+            VTable.Assert(cellSize != UIntPtr.Zero,
+                          "zero cellSize visiting small");
+            UIntPtr lowAddr = pageAddr + PageHeader.SIZEOF;
+            UIntPtr highAddr = PageTable.PagePad(lowAddr);
+            while (lowAddr <= highAddr - cellSize) {
+                UIntPtr objectAddr = lowAddr + PreHeader.Size;
+                objectAddr = Allocator.SkipAlignment(objectAddr);
+                Object maybeObject = Magic.fromAddress(objectAddr);
+                UIntPtr vtablePtr = *maybeObject.VTableFieldAddr;
+                if (vtablePtr != 0) {
+                    // In Singularity, it is not always allowed
+                    // to compute PageTable.Page(UIntPtr.Zero);
+                    UIntPtr vtablePage = PageTable.Page(vtablePtr);
+                    if (vtablePage != page) {
+                        // We have found a slot containing an object
+                        visitor.VisitSmall(maybeObject, lowAddr);
+                    }
+                }
+                lowAddr += cellSize;
+            }
+            visitor.VisitSmallPageEnd();
+        }
+
+        /// <summary>
+        /// Visit a large object on the specified page.
+        /// </summary>
+        [ManualRefCounts]
+        private static UIntPtr VisitLargeObject(UIntPtr page,
+                                                ObjectVisitor visitor)
+        {
+            VTable.Assert(PageTable.Type(page) == LARGE_OBJ_PAGE,
+                          "Visiting large object on invalid page");
+            // Find the object
+            UIntPtr pageAddr = PageTable.PageAddr(page);
+            short brickData = PageTable.Extra(page);
+            if (brickData == 0) {
+                // Possibly in the process of being allocated.
+                return new UIntPtr(1);
+            }
+            UIntPtr objectAddr = pageAddr + brickData;
+            Object obj = Magic.fromAddress(objectAddr);
+            if (obj.vtable == null) {
+                // Memory has been allocated, but object is not initialized
+                return new UIntPtr(1);
+            }
+            // Visit the object
+            UIntPtr objectSize = visitor.VisitLarge(obj);
+            // Return the page count
+            UIntPtr objectEnd = objectAddr + objectSize - PreHeader.Size;
+            UIntPtr limitPage = PageTable.Page(PageTable.PagePad(objectEnd));
+            return limitPage - page;
+        }
+
+        /// <summary>
+        /// This is the the free list of pages to allocate from.
+        /// </summary>
+        private static UIntPtr[] globalFreePages;
+
+        /// <summary>
+        /// This is the list of pages released by threads. These pages must
+        /// be periodically processes to release them back for allocation if
+        /// necessary.
+        /// </summary>
+        private static UIntPtr[] globalPages;
+
+        // Used by RecycleGlobalPages to avoid the ABA problem of
+        // lock-free data structures.
+        private static UIntPtr[] stolenGlobalFreePages;
+        private static UIntPtr[] stolenGlobalFullPages;
+
+        /// <summary>
+        /// Initialize the alloc heap by setting up the heads for all the
+        /// linked lists.
+        /// </summary>
+        [PreInitRefCounts]
+        internal static unsafe void Initialize() {
+            // Global array of allocated pages
+            globalPages = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), SIZE_CLASSES);
+            // Global array of pages with free elements
+            globalFreePages = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), SIZE_CLASSES);
+            // Temporary list holders used by RecycleGlobalPages
+            stolenGlobalFullPages = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), SIZE_CLASSES);
+            stolenGlobalFreePages = (UIntPtr[])
+                BootstrapMemory.Allocate(typeof(UIntPtr[]), SIZE_CLASSES);
+        }
+
+        /// <summary>
+        /// Take all global pages that have had elements freed and put them in
+        /// the allocation queues.
+        /// </summary>
+        internal static void RecycleGlobalPages() {
+            RecycleGlobalPagesPhase1();
+            RecycleGlobalPagesPhase2();
+        }
+
+        internal static void RecycleGlobalPagesPhase1() {
+            for (int i=0; i < SIZE_CLASSES; i++) {
+                // Steal chains
+                VTable.Assert(stolenGlobalFullPages[i] == UIntPtr.Zero);
+                VTable.Assert(stolenGlobalFreePages[i] == UIntPtr.Zero);
+                stolenGlobalFullPages[i] =
+                    AtomicPopChain(ref globalPages[i]);
+                stolenGlobalFreePages[i] =
+                    AtomicPopChain(ref globalFreePages[i]);
+            }
+        }
+
+        internal static void RecycleGlobalPagesPhase2() {
+            for (int i=0; i < SIZE_CLASSES; i++) {
+                UIntPtr globalFull = stolenGlobalFullPages[i];
+                stolenGlobalFullPages[i] = UIntPtr.Zero;
+                UIntPtr globalFree = stolenGlobalFreePages[i];
+                stolenGlobalFreePages[i] = UIntPtr.Zero;
+
+                // Start with free pages (they can not become full)
+                UIntPtr current = globalFree;
+
+                // New free and full chains
+                PageHeader *freeHead = null, freeTail = null;
+                PageHeader *fullHead = null, fullTail = null;
+
+                // Determine starting point
+                if (current == UIntPtr.Zero) {
+                    current = globalFull;
+                    globalFull = UIntPtr.Zero;
+
+                    if (current == UIntPtr.Zero) {
+                        continue;
+                    }
+                }
+
+                // Number of cells of this size class in a block
+                int cells = BLOCK_SIZE / (int) GetCellSize(i);
+                VTable.Assert(cells > 0 && cells < (BLOCK_SIZE >> 1),
+                              "invalid cell count");
+
+                // Iterate through list
+                while (current != UIntPtr.Zero) {
+                    PageHeader *page = (PageHeader*) current;
+                    current = page->nextPage;
+
+                    if (page->freeCount == cells) {
+                        // Completely Free Page
+                        SubSmallPage(page);
+                        UIntPtr pageNum = PageTable.Page(new UIntPtr(page));
+                        PageTable.SetType(pageNum, INIT_PAGE);
+                        PageTable.SetExtra(pageNum, 0);
+                        PageManager.ReleaseUnusedPages(pageNum, new UIntPtr(1),
+                                                       false);
+                    } else if (page->freeCount > 0) {
+                        // Partially Free Page
+                        AddPageToList(page, ref freeHead, ref freeTail);
+                    } else {
+                        // Completely Full Page
+                        AddPageToList(page, ref fullHead, ref fullTail);
+                    }
+
+                    if (current == UIntPtr.Zero) {
+                        // Finished the free list, onto the full list.
+                        current = globalFull;
+                        globalFull = UIntPtr.Zero;
+                    }
+                }
+
+                // Reinsert values onto the free and full chains
+                if (fullHead != null) {
+                    AtomicPushChain(ref globalPages[i],
+                                    fullHead, fullTail);
+                }
+
+                if (freeHead != null) {
+                    AtomicPushChain(ref globalFreePages[i],
+                                    freeHead, freeTail);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Add a page onto a local linked list (possibly the first page)
+        /// </summary>
+        private static void AddPageToList(PageHeader *page,
+                                          ref PageHeader *head,
+                                          ref PageHeader *tail) {
+            if (head == null) {
+                page->nextPage = UIntPtr.Zero;
+                head = page;
+                tail = page;
+                return;
+            }
+            tail->nextPage = new UIntPtr(page);
+            tail = page;
+        }
+
+        /// <summary>
+        /// Atomically push a value onto the linked list.
+        /// </summary>
+        private static void AtomicPush(ref UIntPtr head, PageHeader *page) {
+            AtomicPushChain(ref head, page, page);
+        }
+
+        /// <summary>
+        /// Atomically remove a value from the linked list. Returns null if the
+        /// list is empty.
+        /// </summary>
+        private static UIntPtr AtomicPop(ref UIntPtr head) {
+            UIntPtr oldHead;
+            PageHeader *oldPage;
+            UIntPtr newHead;
+            do {
+                oldHead = head;
+                if (oldHead == UIntPtr.Zero) {
+                    // Empty list.
+                    return UIntPtr.Zero;
+                }
+                oldPage = (PageHeader*) oldHead;
+                newHead = oldPage->nextPage;
+            } while(oldHead != Interlocked.CompareExchange
+                (ref head, newHead, oldHead));
+
+            oldPage->nextPage = UIntPtr.Zero;
+            return oldHead;
+        }
+
+        /// <summary>
+        /// Steal an entire list.
+        /// </summary>
+        private static UIntPtr AtomicPopChain(ref UIntPtr head) {
+            return Interlocked.Exchange(ref head, UIntPtr.Zero);
+        }
+
+        /// <summary>
+        /// Push a whole chain onto a list.
+        /// </summary>
+        private static void AtomicPushChain(ref UIntPtr head,
+                                            PageHeader *chainHead,
+                                            PageHeader *chainTail) {
+            UIntPtr oldHead;
+            UIntPtr newHead = new UIntPtr(chainHead);
+            do {
+                oldHead = head;
+                chainTail->nextPage = oldHead;
+            } while (oldHead != Interlocked.CompareExchange
+                (ref head, newHead, oldHead));
+        }
+
+        /// <summary>
+        /// This struct represents the header data stored in each
+        /// small object page.
+        ///
+        /// BUGBUG: Not space efficient.
+        /// </summary>
+        private struct PageHeader {
+            internal const int SIZEOF = 16;
+
+            /// <summary>
+            /// The next page in the linked list.
+            /// </summary>
+            internal UIntPtr nextPage;
+
+            /// <summary>
+            /// The head of the free list for this page. This is not
+            /// used when a page is assigned to a thread.
+            /// </summary>
+            internal UIntPtr freeList;
+
+            /// <summary>
+            /// The cell size for objects in this page.
+            /// </summary>
+            internal UIntPtr cellSize;
+
+            /// <summary>
+            /// The number of cells that have been freed. This is used
+            /// for accounting purposes.
+            /// </summary>
+            internal int freeCount;
+        }
+        #endregion
+
+        #region Local  (Safe from the context of owner thread)
+        /// <summary>
+        /// This is a thread's local free list for each size class.
+        /// </summary>
+        [RequiredByBartok]
+        private UIntPtr[] freeList;
+
+        /// <summary>
+        /// This is a thread's local set of pages for each size class.
+        /// </summary>
+        private PageHeader*[] localPages;
+
+        [ManualRefCounts]
+        internal static UIntPtr Allocate(Thread thread,
+                                         UIntPtr bytes, uint alignment)
+        {
+            SegregatedFreeListThread mixinThread = MixinThread(thread);
+            return mixinThread.segregatedFreeList.Allocate(bytes, alignment,
+                                                           thread);
+        }
+
+        [ManualRefCounts]
+        internal UIntPtr Allocate(UIntPtr bytes, uint alignment, Thread thread)
+        {
+            UIntPtr resultAddr = this.AllocateFast(bytes, alignment);
+            if (resultAddr == UIntPtr.Zero) {
+                resultAddr = this.AllocateSlow(bytes, alignment, thread);
+            }
+            return resultAddr;
+        }
+
+        [Inline]
+        [ManualRefCounts]
+        internal static UIntPtr AllocateFast(Thread thread,
+                                             UIntPtr bytes,
+                                             uint alignment)
+        {
+            SegregatedFreeListThread mixinThread = MixinThread(thread);
+            return mixinThread.segregatedFreeList.AllocateFast(bytes,
+                                                               alignment);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        [DisableBoundsChecks]
+        public static unsafe Object CompilerAllocateMarkSweep
+        (VTable vtable, Thread currentThread, UIntPtr bytes, uint alignment)
+        {
+            VTable.Assert((alignment == 4)
+                          || ((alignment == 8) && (UIntPtr.Size == 8))
+                          || ((alignment == 8) && (PreHeader.Size == 4)),
+                          "Unsupported object layout");
+            VTable.Assert(UIntPtr.Size == PreHeader.Size,
+                          "Unsupported preheader size");
+            VTable.Assert
+                (Util.IsAligned((uint) PreHeader.Size + (uint)PostHeader.Size,
+                                alignment),
+                 "Unsupported header sizes");
+            VTable.Assert(bytes < LARGE_OBJECT_THRESHOLD,
+                          "CompilerAllocate called for large object");
+
+            // Room to ensure alignment
+            bool alignRequired = (alignment > UIntPtr.Size);
+            if (alignRequired) {
+                bytes = bytes + alignment - UIntPtr.Size;
+            }
+            int sizeClass = GetSizeClass(bytes);
+            SegregatedFreeListThread mixinThread = MixinThread(currentThread);
+            UIntPtr region = mixinThread.segregatedFreeList.freeList[sizeClass];
+            if (region != UIntPtr.Zero) {
+                mixinThread.segregatedFreeList.freeList[sizeClass] =
+                    *(UIntPtr *)region;
+
+                // Zero out the free list data structure.  However, if the
+                // vtable is at offset zero, then we're going to overwrite it
+                // anyway.  (and the optimizer does not see this through the
+                // unmanaged/managed conversion)
+                if (Magic.OffsetOfVTable != UIntPtr.Zero) {
+                    *(UIntPtr *)region = UIntPtr.Zero;
+                }
+
+                UIntPtr objAddr = region;
+
+                if((alignment == 8) && (UIntPtr.Size == 4)) {
+                    // Since 'objAddr' will be the actual object reference, we
+                    // want to misalign it here so that the object payload will
+                    // be aligned.  (We know that PostHeader.Size & 8 == 4
+                    // because the PreHeader is 4 and the sum of the PreHeader
+                    // and PostHeader sizes is a multiple of alignment (8))
+
+                    // Store alignment token at objAddr.  This will be where an
+                    // alignment token should go if it is required...
+                    Allocator.WriteAlignment(objAddr);
+                    // ... (align if necessary) ...
+                    objAddr = Util.Align(objAddr, (UIntPtr) alignment);
+                    // ... or where the object header will be if alignment was
+                    // not necessary.  This code zeroes the object header
+                    // regardless and avoids a branch in this fast path.
+                    *(UIntPtr *)objAddr = UIntPtr.Zero;
+                    // Finally misalign 'objAddr'
+                    objAddr += PreHeader.Size;
+                }
+
+                Object obj = Magic.fromAddress(objAddr);
+                obj.vtable = vtable;
+                return obj;
+            }
+
+            return GC.AllocateObjectNoInline(vtable, currentThread);
+        }
+
+        [Inline]
+        [ManualRefCounts]
+        private UIntPtr AllocateFast(UIntPtr bytes, uint alignment)
+        {
+            // Room to ensure alignment
+            bool alignRequired = (alignment > UIntPtr.Size);
+            if (alignRequired) {
+                bytes = bytes + alignment - UIntPtr.Size;
+            }
+            // Is this a large object?
+            if (!(bytes < LARGE_OBJECT_THRESHOLD)) {
+                return UIntPtr.Zero;
+            }
+            int sizeClass = GetSizeClass(bytes);
+            UIntPtr region = AllocateSmallFast(sizeClass);
+            if (region == UIntPtr.Zero) {
+                return UIntPtr.Zero;
+            } else {
+                UIntPtr resultAddr =
+                    Allocator.AlignedObjectPtr(region, alignment);
+                return resultAddr;
+            }
+        }
+
+        [Inline]
+        [ManualRefCounts]
+        internal static UIntPtr AllocateSlow(Thread thread,
+                                             UIntPtr bytes, uint alignment)
+        {
+            SegregatedFreeListThread mixinThread = MixinThread(thread);
+            return mixinThread.segregatedFreeList.AllocateSlow(bytes,
+                                                               alignment,
+                                                               thread);
+        }
+
+        [NoInline]
+        [ManualRefCounts]
+        private UIntPtr AllocateSlow(UIntPtr bytes, uint alignment,
+                                      Thread currentThread)
+        {
+            // Room to ensure alignment
+            bool alignRequired = (alignment > UIntPtr.Size);
+
+            if (alignRequired) {
+                bytes = bytes + alignment - UIntPtr.Size;
+            }
+
+            // Is this a large object?
+            if (!(bytes < LARGE_OBJECT_THRESHOLD)) {
+                return AllocateLarge(alignment, bytes, currentThread);
+            }
+
+            int sizeClass = GetSizeClass(bytes);
+            UIntPtr region = AllocateSmall(sizeClass, currentThread);
+            UIntPtr resultAddr =
+                Allocator.AlignedObjectPtr(region, alignment);
+            return resultAddr;
+        }
+
+        /// <summary>
+        /// Used to attempt to spread large objects across pages to avoid
+        /// higher cache conflicts on low page addresses.
+        /// </summary>
+        private static int largeOffset;
+
+        /// <summary>
+        /// Allocate an object of a specified size class from the
+        /// thread's local block.
+        /// </summary>
+        [Inline]
+        [ManualRefCounts]
+        private UIntPtr AllocateSmall(int sizeClass, Thread currentThread) {
+            UIntPtr region = freeList[sizeClass];
+            if (region != UIntPtr.Zero) {
+                freeList[sizeClass] = *(UIntPtr*)region;
+                *(UIntPtr*)region = UIntPtr.Zero;
+                return region;
+            } else {
+                return AllocateSmallSlow(sizeClass, currentThread);
+            }
+        }
+
+        [Inline]
+        private UIntPtr AllocateSmallFast(int sizeClass) {
+            UIntPtr region = freeList[sizeClass];
+            if (region != UIntPtr.Zero) {
+                freeList[sizeClass] = *(UIntPtr*)region;
+                *(UIntPtr*)region = UIntPtr.Zero;
+                return region;
+            } else {
+                return UIntPtr.Zero;
+            }
+        }
+
+        /// <summary>
+        /// Get a new page and allocate into it.
+        /// </summary>
+        /// <param name="sizeClass"></param>
+        /// <returns></returns>
+        [ManualRefCounts]
+        private UIntPtr AllocateSmallSlow(int sizeClass, Thread currentThread)
+        {
+            // Return our old page
+            if (localPages[sizeClass] != null) {
+                ReleaseLocalPage(sizeClass);
+            }
+
+            // Get a new one.
+            localPages[sizeClass] = GetLocalPage(sizeClass, currentThread);
+            VTable.Assert(localPages[sizeClass] != null, "no local page");
+
+            // Read (and then zero) the free list.
+            freeList[sizeClass] = Interlocked.Exchange
+                (ref localPages[sizeClass]->freeList, UIntPtr.Zero);
+
+            VTable.Assert(freeList[sizeClass] != UIntPtr.Zero,
+                          "GetLocalPage returned empty page");
+
+            // Allocate off the free list
+            return AllocateSmallFast(sizeClass);
+        }
+
+        /// <summary>
+        /// Release a local allocation page into the pool of consumed pages.
+        /// </summary>
+        [ManualRefCounts]
+        private void ReleaseLocalPage(int sizeClass) {
+            PageHeader *page = localPages[sizeClass];
+
+            // Prepare the page to be released
+            if (freeList[sizeClass] != UIntPtr.Zero) {
+                // We are releasing the page 'early'.
+                UIntPtr pageFreeList = freeList[sizeClass];
+                freeList[sizeClass] = UIntPtr.Zero;
+
+                // Save our local free list as the page's free list
+                UIntPtr oldFreeList = Interlocked.CompareExchange
+                    (ref page->freeList, pageFreeList, UIntPtr.Zero);
+
+                // Count the reclaimed cells.
+                int freeCount = 0;
+                UIntPtr next = pageFreeList;
+                while (next != UIntPtr.Zero) {
+                    next = *(UIntPtr*)next;
+                    freeCount++;
+                }
+
+                SubSmallBytes(new UIntPtr((uint)freeCount *
+                    (uint)page->cellSize));
+
+                if (oldFreeList != UIntPtr.Zero) {
+                    // Page already had a free list, follow it to the end.
+                    while(*(UIntPtr*)oldFreeList != UIntPtr.Zero) {
+                        oldFreeList = *(UIntPtr*)oldFreeList;
+                    }
+
+                    // And stitch the free lists together
+                    *(UIntPtr*)oldFreeList = pageFreeList;
+                }
+
+                // Set the reclaimed cells.
+                int old;
+                do {
+                    old = page->freeCount;
+                } while (old != Interlocked.CompareExchange
+                    (ref page->freeCount, old + freeCount, old));
+            }
+
+            // Atomically insert the page in the globalPages queue.
+            AtomicPush(ref globalPages[sizeClass], page);
+        }
+
+        /// <summary>
+        /// Either reuse an existing or make a new page to allocate into.
+        /// </summary>
+        [ManualRefCounts]
+        private PageHeader * GetLocalPage(int sizeClass, Thread currentThread)
+        {
+            GC.CheckForNeededGCWork(currentThread);
+            UIntPtr page = AtomicPop(ref globalFreePages[sizeClass]);
+            if (page != UIntPtr.Zero) {
+                // We got the page
+                PageHeader *pageHeader = (PageHeader*) page;
+
+                VTable.Assert(pageHeader->freeCount > 0, "empty FreePage");
+
+                AddSmallBytes(new UIntPtr((uint)pageHeader->freeCount *
+                    (uint)pageHeader->cellSize));
+
+                pageHeader->freeCount = 0;
+
+                return pageHeader;
+            }
+
+            // Create a new local page.
+            return NewLocalPage(sizeClass, currentThread);
+        }
+
+        /// <summary>
+        /// Create a new page to allocate into
+        /// </summary>
+        [ManualRefCounts]
+        private PageHeader * NewLocalPage(int sizeClass, Thread currentThread)
+        {
+            VTable.Assert(sizeClass > 0, "non-positive sizeClass");
+            bool fCleanPages = true;
+            UIntPtr page = PageManager.EnsurePages(currentThread,
+                                                   (UIntPtr) 1, INIT_PAGE,
+                                                   ref fCleanPages);
+            AddSmallPage();
+            UIntPtr pageAddr = PageTable.PageAddr(page);
+            PageTable.SetExtra(page, (short) sizeClass);
+            PageHeader *pageHeader = (PageHeader *) pageAddr;
+
+            // Set up the free list of free slots
+            UIntPtr stride = GetCellSize(sizeClass);
+            VTable.Assert(stride != UIntPtr.Zero, "Zero Stride");
+            pageHeader->cellSize = stride;
+            UIntPtr cursor =
+                pageAddr + PageHeader.SIZEOF + PreHeader.Size;
+
+            pageHeader->freeList = cursor;
+            UIntPtr limit =
+                PageTable.PageAddr(page+1) - stride + PreHeader.Size;
+            UIntPtr nextAddr = cursor + stride;
+            while (nextAddr <= limit) {
+                *(UIntPtr*)cursor = nextAddr;
+                cursor = nextAddr;
+                nextAddr = cursor + stride;
+            }
+
+            PageTable.SetType(page, SMALL_OBJ_PAGE);
+            return pageHeader;
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/SemispaceCollector.cs b/base/Kernel/Bartok/GCs/SemispaceCollector.cs
new file mode 100644
index 0000000..f1448af
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/SemispaceCollector.cs
@@ -0,0 +1,794 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Collections;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity;
+#endif
+
+    [NoCCtor]
+    internal unsafe class SemispaceCollector: GenerationalCollector
+    {
+
+        // WARNING: don't initialize any static fields in this class!
+
+        internal static CopyScan[] copyScanners;
+
+        internal static SemispaceCollector instance;
+
+        // Visitor instances used for marking objects
+        private static ForwardReferenceVisitor generalReferenceVisitor;
+        private static ForwardThreadReference threadReferenceVisitor;
+        private static RegisterPinnedReference pinnedReferenceVisitor;
+        private static ForwardOnlyReferenceVisitor forwardOnlyReferenceVisitor;
+
+        private SemispaceCollector() {
+        }
+
+        public static new void Initialize() {
+            GenerationalCollector.Initialize();
+            // copyScanners = new CopyScan[MAX_GENERATION+1];
+            copyScanners = (CopyScan[])
+                BootstrapMemory.Allocate(typeof(CopyScan[]),
+                                         (uint)MAX_GENERATION+1);
+            for (int i = (int)MIN_GENERATION; i <= (int)MAX_GENERATION; i++) {
+                switch (GC.copyscanType) {
+                  case CopyScanType.CheneyScan: {
+                      copyScanners[i] = (CopyScan)
+                          BootstrapMemory.Allocate(typeof(CheneyScan));
+                      break;
+                  }
+                  case CopyScanType.HierarchicalScan: {
+                      copyScanners[i] = (CopyScan)
+                          BootstrapMemory.Allocate(typeof(HierarchicalScan));
+                      break;
+                  }
+                  case CopyScanType.NestedHierarchicalScan: {
+                      copyScanners[i] = (CopyScan)
+                          BootstrapMemory.Allocate(typeof(NestedHierarchicalScan));
+                      break;
+                  }
+                  default: {
+                      VTable.NotReached("Unknown CopyScan type: "+
+                                        GC.copyscanType);
+                      break;
+                  }
+                }
+                copyScanners[i].Initialize((PageType) i);
+            }
+            // SemispaceCollector.instance = new SemispaceCollector();
+            SemispaceCollector.instance = (SemispaceCollector)
+                BootstrapMemory.Allocate(typeof(SemispaceCollector));
+            // generalReferenceVisitor = new ForwardReferenceVisitor();
+            SemispaceCollector.generalReferenceVisitor = (ForwardReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(ForwardReferenceVisitor));
+            // threadReferenceVisitor = new ForwardThreadReference(generalReferenceVisitor);
+            SemispaceCollector.threadReferenceVisitor = (ForwardThreadReference)
+                BootstrapMemory.Allocate(typeof(ForwardThreadReference));
+            // pinnedReferenceVisitor = new RegisterPinnedReference();
+            SemispaceCollector.pinnedReferenceVisitor = (RegisterPinnedReference)
+                BootstrapMemory.Allocate(typeof(RegisterPinnedReference));
+            // forwardOnlyReferenceVisitor = new ForwardOnlyReferenceVisitor();
+            SemispaceCollector.forwardOnlyReferenceVisitor = (ForwardOnlyReferenceVisitor)
+                BootstrapMemory.Allocate(typeof(ForwardOnlyReferenceVisitor));
+        }
+
+        internal override void TruncateOlderAllocationAreas(int generation) {
+            for (int i = (int)MIN_GENERATION; i <= generation; i++) {
+                copyScanners[i].TruncateAllocationArea();
+            }
+        }
+
+        internal override void CollectGeneration(int generation,
+                                                 UIntPtr generationPageCount)
+        {
+            UIntPtr fromSpacePageCountTotal = UIntPtr.Zero;
+            for (int i = MinGeneration; i <= generation; i++) {
+                fromSpacePageCountTotal += fromSpacePageCounts[i];
+            }
+
+            PageType maxDestGeneration = (generation < (int)MAX_GENERATION)
+                ? (PageType)(generation+1)
+                : MAX_GENERATION;
+
+            // The real work: find the roots, copy reachable objects
+            CollectorStatistics.Event(GCEvent.ComputeRootSet);
+#if !VC
+            TryAllManager.PreGCHookTryAll();
+#endif
+            bool onlyNew = false;
+            if (generation == (int)nurseryGeneration) {
+                onlyNew = true;
+            }
+            MultiUseWord.PreGCHook(false, /* don't use shadows */
+                                   onlyNew /* only scan new EMUs */);
+            Finalizer.PrepareCollectFinalizers();
+            CallStack.ScanStacks(null, pinnedReferenceVisitor);
+            pinnedReferenceVisitor.ProcessPinnedPages(generalReferenceVisitor);
+            CallStack.ScanStacks(threadReferenceVisitor, null);
+            Thread.VisitBootstrapData(generalReferenceVisitor);
+#if SINGULARITY
+            Thread.UpdateAfterGC();
+#endif
+            Thread currentThread = Thread.threadTable[collectorThreadIndex];
+#if SINGULARITY_KERNEL
+            Kernel.VisitSpecialData(generalReferenceVisitor);
+            Kernel.UpdateAfterGC(currentThread);
+#endif
+            MultiUseWord.VisitStrongRefs(generalReferenceVisitor,
+                                         false /* Don't use shadows */);
+#if !VC
+            TryAllManager.VisitStrongRefs(generalReferenceVisitor);
+#endif
+            StaticData.ScanStaticData(generalReferenceVisitor);
+            if ((PageType)generation < MAX_GENERATION) {
+                installedRemSet.Clean();
+                this.ScanRemSet((PageType) generation);
+            }
+            installedRemSet.Reset();
+            CollectorStatistics.Event(GCEvent.TraceStart);
+            this.ScanAndCopy(maxDestGeneration);
+            CollectorStatistics.Event(GCEvent.TraceSpecial);
+            WeakReference.Process(forwardOnlyReferenceVisitor, true, true);
+            Finalizer.ResurrectCandidates(forwardOnlyReferenceVisitor,
+                                          generalReferenceVisitor,
+                                          true);
+            this.ScanAndCopy(maxDestGeneration);
+            WeakReference.Process(forwardOnlyReferenceVisitor, true, false);
+            MultiUseWord.VisitWeakRefs(forwardOnlyReferenceVisitor,
+                                       false /* Don't use shadows */);
+#if !VC
+            TryAllManager.VisitWeakRefs(forwardOnlyReferenceVisitor);
+#endif
+            CollectorStatistics.Event(GCEvent.CollectionComplete);
+            // Clean up the auxiliary data structures
+            for (int i = MinGeneration + 1; i <= (int)maxDestGeneration; i++) {
+                copyScanners[i].Cleanup();
+            }
+            UnmanagedPageList.ReleaseStandbyPages();
+            pinnedReferenceVisitor.CleanPinnedPages();
+            MultiUseWord.PostGCHook(onlyNew);
+            Finalizer.ReleaseCollectFinalizers();
+#if !VC
+            TryAllManager.PostGCHookTryAll();
+#endif
+        }
+
+        internal override void EnableHeap() {
+            // Ensure that we don't call any type initializers during a GC
+            ArrayList pageList = new ArrayList();
+            pageList.Add(new UIntPtr(11));
+            pageList.Add(new UIntPtr(10));
+            UIntPtrComparer comparer = new UIntPtrComparer();
+            pageList.Sort(comparer);
+        }
+
+        // Internal workings of the collector
+
+        // Scan is large and will be inlined here.  This is a performance
+        // workaround that performs manual specialization of the Scan method.
+        [NoInline]
+        private void ScanRemSet(PageType generation) {
+            installedRemSet.Scan(generalReferenceVisitor, generation);
+        }
+
+
+        private void ScanAndCopy(PageType maxDestGeneration) {
+            bool repeat = true;
+            while (repeat) {
+                repeat = false;
+                for (int gen = MinGeneration; gen <= (int)maxDestGeneration; gen++) {
+                    if (copyScanners[gen].Scan(generalReferenceVisitor)) {
+                        repeat = true;
+                    }
+                }
+            }
+        }
+
+        // No objects can be resurrected using this mechanism
+        private class ForwardOnlyReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsZombiePage(pageType)) {
+                    VTable.Assert(PageTable.IsGcPage(pageType) ||
+                                  PageTable.IsNonGcPage(pageType) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType),
+                                  "Semispace:ForwardOnlyReferenceVisitor");
+                    return;
+                }
+                PageType gen = PageTable.ZombieToLive(pageType);
+                UIntPtr vtableAddr = Allocator.GetObjectVTable(addr);
+                UIntPtr vtablePageIndex = PageTable.Page(vtableAddr);
+                if (PageTable.Type(vtablePageIndex) == gen) {
+                    // The vtable field is really a forwarding pointer
+                    *loc = vtableAddr;
+                } else {
+                    // The object was not live
+                    *loc = UIntPtr.Zero;
+                }
+            }
+
+#region HELP_DEVIRT
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            internal override UIntPtr VisitReferenceFields(Object obj)
+            {
+                return this.VisitReferenceFields(Magic.addressOf(obj),
+                                                 obj.vtable);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            [InlineIntoOnce]
+            internal override
+            UIntPtr VisitReferenceFields(UIntPtr objectBase, VTable vtable)
+            {
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable, objectBase);
+                return VisitReferenceFieldsTemplate(ref objDesc);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [Inline]
+            protected override unsafe sealed
+            void Filter(UIntPtr *location, ref ObjectDescriptor objDesc)
+            {
+                base.Filter(location, ref objDesc);
+            }
+#endregion
+
+        }
+
+        internal class ForwardReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr objAddr = *loc;
+                UIntPtr page = PageTable.Page(objAddr);
+                Trace.Log(Trace.Area.Pointer,
+                          "FwdRef: loc={0}, addr={1}, page={2}",
+                          __arglist(loc, objAddr, page));
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsZombiePage(pageType)) {
+                    VTable.Assert(PageTable.IsGcPage(pageType) ||
+                                  PageTable.IsNonGcPage(pageType) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType),
+                                  "Semispace:ForwardReferenceVisitor");
+                    return;
+                }
+                PageType gen = PageTable.ZombieToLive(pageType);
+                VTable.Assert(gen > MIN_GENERATION);
+                Object obj = Magic.fromAddress(objAddr);
+                UIntPtr vtableAddr = *obj.VTableFieldAddr;
+                UIntPtr vtablePageIndex = PageTable.Page(vtableAddr);
+                if (PageTable.Type(vtablePageIndex) == gen) {
+                    // The vtable field is really a forwarding pointer
+                    Trace.Log(Trace.Area.Pointer,
+                              "FwdRef: VT fwd: {0} -> {1}",
+                              __arglist(objAddr, vtableAddr));
+                    *loc = vtableAddr;
+                    return;
+                }
+                Object newObject = copyScanners[(int)gen].Copy(obj);
+                *loc = Magic.addressOf(newObject);
+            }
+
+#region HELP_DEVIRT
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            internal override UIntPtr VisitReferenceFields(Object obj)
+            {
+                return this.VisitReferenceFields(Magic.addressOf(obj),
+                                                 obj.vtable);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            [InlineIntoOnce]
+            internal override
+            UIntPtr VisitReferenceFields(UIntPtr objectBase, VTable vtable)
+            {
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable, objectBase);
+                return VisitReferenceFieldsTemplate(ref objDesc);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [Inline]
+            protected override unsafe sealed
+            void Filter(UIntPtr *location, ref ObjectDescriptor objDesc)
+            {
+                base.Filter(location, ref objDesc);
+            }
+#endregion
+
+        }
+
+        private class ForwardThreadReference : NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                UIntPtr page = PageTable.Page(addr);
+                Trace.Log(Trace.Area.Pointer,
+                          "FwdThrRef: loc={0}, addr={1}, page={2}",
+                          __arglist(loc, addr, page));
+                PageType pageType = PageTable.Type(page);
+                // if an object "spills" into a page that 
+                // is pinned, and the object is copied 
+                // during a collection, we will end up with
+                // the first part of the object in a zombie page
+                // the second part of the object in a GC page.
+                // We need to find the start of the object and
+                // use that to determine whether the object has
+                // been moved.
+                if (!PageTable.IsZombiePage(pageType) &&
+                    !PageTable.IsGcPage(pageType)) {
+                    VTable.Assert(PageTable.IsNonGcPage(pageType) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType) ||
+                                  VTable.BuildC2Mods,
+                                  "Semispace:ForwardThreadReference");
+                    return;
+                }
+                
+                UIntPtr objectPtr = InteriorPtrTable.Find(addr);
+                if (objectPtr == addr) {
+                    generalReferenceVisitor.Visit(loc);
+                } else {
+                    // we can check for the page type of 
+                    // objectPtr here to see if it is zombie page. 
+                    // If true we can just return.
+                    UIntPtr newObject = objectPtr;
+                    generalReferenceVisitor.Visit(&newObject);
+                    UIntPtr newAddr = newObject + (addr - objectPtr);
+                    Trace.Log(Trace.Area.Pointer,
+                              "FwdThrRef: {0} -> {1}",
+                              __arglist(addr, newAddr));
+                    *loc = newAddr;
+                }
+            }
+
+#region HELP_DEVIRT
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            internal override UIntPtr VisitReferenceFields(Object obj)
+            {
+                return this.VisitReferenceFields(Magic.addressOf(obj),
+                                                 obj.vtable);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            [InlineIntoOnce]
+            internal override
+            UIntPtr VisitReferenceFields(UIntPtr objectBase, VTable vtable)
+            {
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable, objectBase);
+                return VisitReferenceFieldsTemplate(ref objDesc);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [Inline]
+            protected override unsafe sealed
+            void Filter(UIntPtr *location, ref ObjectDescriptor objDesc)
+            {
+                base.Filter(location, ref objDesc);
+            }
+#endregion
+
+            internal ForwardReferenceVisitor ptrVisitor;
+
+        }
+
+        private class RegisterPinnedReference : NonNullReferenceVisitor
+        {
+
+            // BUGBUG: We are allocating an ArrayList while the collector
+            // is running.  If the ArrayList gets big enough to be
+            // allocated in the older generation, then the RemSet has the
+            // potential to overflow since the boxed integers will reside
+            // in the young generation.  We should eventually eliminate
+            // the use of ArrayList in this class as well as avoid boxing
+            // the page indices.
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsZombiePage(pageType)) {
+                    VTable.Assert(PageTable.IsGcPage(pageType) ||
+                                  PageTable.IsNonGcPage(pageType) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType) ||
+                                  VTable.BuildC2Mods,
+                                  "Semispace:RegisterPinnedReference:1");
+                    return;
+                }
+                PageType gen = PageTable.ZombieToLive(pageType);
+                UIntPtr pinnedObjectAddr = InteriorPtrTable.Find(addr);
+                if (pinnedPageList == null) {
+                    pinnedPageList = new ArrayList();
+                    comparer = new UIntPtrComparer();
+                }
+                Object pinnedObject = Magic.fromAddress(pinnedObjectAddr);
+                UIntPtr objectSize =
+                    ObjectLayout.ObjectSize(pinnedObjectAddr,
+                                            pinnedObject.vtable);
+                UIntPtr beforeObjectAddr = pinnedObjectAddr - PreHeader.Size;
+                UIntPtr pastObjectAddr = beforeObjectAddr + objectSize;
+                UIntPtr firstPage = PageTable.Page(beforeObjectAddr);
+                UIntPtr lastPage = PageTable.Page(pastObjectAddr - 1);
+                for (UIntPtr i = firstPage; i <= lastPage; i++) {
+                    if (!pinnedPageList.Contains(i)) {
+                        Trace.Log(Trace.Area.Pointer,
+                                  "RegPin: ptr={0} page={1} gen={2}",
+                                  __arglist(pinnedObjectAddr, i, gen));
+                        GenerationalCollector.gcPromotedTable[(int) gen-1] +=
+                            PageTable.PageSize;
+                        pinnedPageList.Add(i);
+                    }
+                }
+            }
+
+#region HELP_DEVIRT
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            internal override UIntPtr VisitReferenceFields(Object obj)
+            {
+                return this.VisitReferenceFields(Magic.addressOf(obj),
+                                                 obj.vtable);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [ManualRefCounts]
+            [InlineIntoOnce]
+            internal override
+            UIntPtr VisitReferenceFields(UIntPtr objectBase, VTable vtable)
+            {
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable, objectBase);
+                return VisitReferenceFieldsTemplate(ref objDesc);
+            }
+
+            // This method simply forces the compiler to generate a copy
+            // of VisitReferenceFieldsTemplate in this class.
+            [Inline]
+            protected override unsafe sealed
+            void Filter(UIntPtr *location, ref ObjectDescriptor objDesc)
+            {
+                base.Filter(location, ref objDesc);
+            }
+#endregion
+
+            internal void ProcessPinnedPages(ReferenceVisitor ptrVisitor) {
+                if (pinnedPageList == null || pinnedPageList.Count == 0) {
+                    return;
+                }
+                pinnedPageList.Sort(comparer);
+                int limit = pinnedPageList.Count;
+                for (int i = 0; i < limit; i++) {
+                    UIntPtr page = (UIntPtr) pinnedPageList[i];
+                    PageType fromSpaceType = PageTable.Type(page);
+                    VTable.Assert(PageTable.IsZombiePage(fromSpaceType),
+                                  "Semispace:RegisterPinnedReference:2");
+                    PageType toSpaceType =
+                        PageTable.ZombieToLive(fromSpaceType);
+                    PageTable.SetType(page, toSpaceType);
+                }
+                int pageIndex = 0;
+                while (pageIndex < limit) {
+                    UIntPtr startPage = (UIntPtr) pinnedPageList[pageIndex];
+                    UIntPtr endPage = startPage + 1;
+                    pageIndex++;
+                    while (pageIndex < limit &&
+                           (UIntPtr) pinnedPageList[pageIndex] == endPage) {
+                        pageIndex++;
+                        endPage++;
+                    }
+                    UIntPtr objectAddr = FirstPinnedObjectAddr(startPage);
+                    UIntPtr pastAddr = PostPinnedObjectAddr(endPage);
+                    while (objectAddr < pastAddr) {
+                        if (Allocator.IsAlignment(objectAddr)) {
+                            objectAddr += UIntPtr.Size;
+                        } else if (BumpAllocator.IsUnusedSpace(objectAddr)) {
+                            objectAddr = (PageTable.PagePad(objectAddr) +
+                                          PreHeader.Size);
+                        } else {
+                            Object obj = Magic.fromAddress(objectAddr);
+                            objectAddr += ptrVisitor.VisitReferenceFields(obj);
+                        }
+                    }
+                }
+            }
+
+            internal void CleanPinnedPages() {
+                if (pinnedPageList == null || pinnedPageList.Count == 0) {
+                    return;
+                }
+                int pageIndex = 0;
+                int limit = pinnedPageList.Count;
+                UIntPtr lastPostPinnedAddr = UIntPtr.Zero;
+                while (pageIndex < limit) {
+                    UIntPtr startPage = (UIntPtr) pinnedPageList[pageIndex];
+                    UIntPtr endPage = startPage + 1;
+                    pageIndex++;
+                    while (pageIndex < limit &&
+                           (UIntPtr) pinnedPageList[pageIndex] == endPage) {
+                        pageIndex++;
+                        endPage++;
+                    }
+                    // Zero out the area between the start of the page and
+                    // the first object on the page
+                    UIntPtr firstObjectAddr = FirstPinnedObjectAddr(startPage);
+                    UIntPtr firstAddr = firstObjectAddr - PreHeader.Size;
+                    UIntPtr trashAddr = PageTable.PageAddr(startPage);
+                    if (firstAddr < trashAddr) {
+                        // The first object "spills" into the previous page,
+                        // presumably by no more than HEADER_BYTES bytes
+                        VTable.Assert(
+                            PageTable.Page(firstAddr) == startPage - 1,
+                            "Semispace:RegisterPinnedReference:3");
+                        // Prepare to zero the preceding page unless it also
+                        // had pinned data on it
+                        trashAddr = PageTable.PageAddr(startPage - 1);
+                        InteriorPtrTable.ClearFirst(startPage - 1);
+                        if (trashAddr >= lastPostPinnedAddr) {
+                            // Need to mark the spilled-onto page live to
+                            // keep the spilled data around
+                            PageType fromSpaceType =
+                                PageTable.Type(startPage - 1);
+                            VTable.Assert(
+                                PageTable.IsZombiePage(fromSpaceType),
+                                "Semispace:RegisterPinnedReference:4");
+                            PageType toSpaceType =
+                                PageTable.ZombieToLive(fromSpaceType);
+                            PageTable.SetType(startPage - 1, toSpaceType);
+                        }
+                    }
+                    // If lastPostPinnedAddr is on the page that trashAddr
+                    // starts, pinned data from the last run of pinned pages
+                    // and pinned data from this run of pinned data are on the
+                    // same page, so just write alignment tokens from
+                    // lastPostPinnedAddr to the first pinned object.
+                    // Otherwise, write an unused marker at lastPostPinnedAddr
+                    // since the rest of its page must be copied or dead.
+                    if (trashAddr < lastPostPinnedAddr) {
+                        trashAddr = lastPostPinnedAddr;
+                    } else {
+                        CleanPageTail(lastPostPinnedAddr);
+                    }
+
+                    if (GC.remsetType == RemSetType.Cards &&
+                        trashAddr < firstAddr) {
+                        UIntPtr firstCard = CardTable.CardNo(trashAddr);
+                        UIntPtr lastCard = CardTable.CardNo(firstAddr -1);
+
+                        if (!OffsetTable.NoObjectPtrToTheCard(firstCard)) {
+                            UIntPtr offset= OffsetTable.GetOffset(firstCard);
+                            UIntPtr objPtr =
+                                CardTable.CardAddr(firstCard) + offset;
+                            UIntPtr size = OffsetTable.ObjectSize(objPtr);
+                            VTable.Assert
+                                ((objPtr + size - PreHeader.Size <= trashAddr)
+                                 || (objPtr >= trashAddr),
+                                 "Object should be totally "
+                                 + "above or below trashAddr");
+                            if (objPtr >= trashAddr) {
+                                // The offset in this card needs to be updated
+                                OffsetTable.ClearCards(firstCard, firstCard);
+                            }
+                        }
+
+                        OffsetTable.ClearCards(firstCard+1, lastCard-1);
+
+                        if (lastCard != CardTable.CardNo(firstObjectAddr)) {
+                            OffsetTable.ClearCards(lastCard, lastCard);
+                        } else {
+                            VTable.Assert(OffsetTable.GetOffset(lastCard)
+                                          >= (firstObjectAddr
+                                              - CardTable.CardAddr(lastCard)),
+                                          "wrong offset");
+                        }
+                    }
+
+                    {
+                        // trashAddr should go back at most one page.
+
+                        UIntPtr trashPage = PageTable.Page(trashAddr);
+                        UIntPtr firstObjectAddrPage =
+                            PageTable.Page(firstObjectAddr);
+                        VTable.Assert((trashPage == firstObjectAddrPage - 1)
+                                      || (trashPage == firstObjectAddrPage));
+                    }
+
+                    // If the InteriorPtrTable already had a value, then this is
+                    // redundant, but if the call to First above has to compute
+                    // the value, then (since it won't store it in the table) we
+                    // should store it.  Why?  At this point the previous page
+                    // would be "connected" to this one.  After this collection
+                    // the previous page will be unused or re-used and unrelated
+                    // to this page and subsequent calls to First would then
+                    // rely on it making the leap between unrelated pages.
+                    InteriorPtrTable.SetFirst(firstObjectAddr);
+
+                    while (trashAddr < firstAddr) {
+                        Allocator.WriteAlignment(trashAddr);
+                        trashAddr += UIntPtr.Size;
+                    }
+
+                    // Zero out the area between the last whole object on
+                    // the last page and the end of the last page
+                    UIntPtr pastAddr = PostPinnedObjectAddr(endPage);
+                    UIntPtr newEndPage =
+                        PageTable.Page(PageTable.PagePad(pastAddr));
+                    while (endPage < newEndPage) {
+                        // The last object spills into the next page(s), so
+                        // mark those page(s) live
+                        PageType fromPageType = PageTable.Type(endPage);
+                        if (PageTable.IsZombiePage(fromPageType)) {
+                            PageType toSpaceType =
+                                PageTable.ZombieToLive(fromPageType);
+                            PageTable.SetType(endPage, toSpaceType);
+                        } else {
+                            // final page might be live already because
+                            // something else on it was pinned.
+                            // pageIndex has already been incremented,
+                            // so it points to the start of the next
+                            // set of contiguous pages
+                            VTable.Assert(
+                                PageTable.IsLiveGcPage(fromPageType) &&
+                                pageIndex < limit &&
+                                endPage ==
+                                    (UIntPtr) pinnedPageList[pageIndex],
+                                "Semispace:RegisterPinnedReference:5");
+                        }
+                        ++endPage;
+                    }
+                    lastPostPinnedAddr = pastAddr;
+                }
+                CleanPageTail(lastPostPinnedAddr);
+                pinnedPageList = null;
+                comparer = null;
+            }
+
+            private static void CleanPageTail(UIntPtr postPinnedAddr) {
+                if (!PageTable.PageAligned(postPinnedAddr)) {
+                    // If postPinnedAddr points to the first object on its page,
+                    // then we are removing all objects (specifically the part
+                    // of the object that the InteriorPtrTable tracks, the
+                    // vtables) from the page, so we should clear the page's
+                    // entry in the InteriorPtrTable.
+
+                    UIntPtr page = PageTable.Page(postPinnedAddr);
+                    UIntPtr firstObjPtr = InteriorPtrTable.First(page);
+                    if (firstObjPtr > postPinnedAddr) {
+                        VTable.Assert
+                            (firstObjPtr - PreHeader.Size >= postPinnedAddr,
+                             "postPinnedAddr should not point to the "
+                             + "interior of an object (1)");
+                        InteriorPtrTable.ClearFirst(page);
+                    } else if (!BumpAllocator.IsUnusedSpace(firstObjPtr)) {
+                        UIntPtr firstObjSize =
+                            InteriorPtrTable.ObjectSize(firstObjPtr);
+                        VTable.Assert
+                            (firstObjPtr + firstObjSize - PreHeader.Size
+                             <= postPinnedAddr,
+                             "postPinnedAddr should not point to the "
+                             + "interior of an object (2)");
+                    }
+
+                    UIntPtr byteCount = PageTable.PagePad(postPinnedAddr)
+                                        - postPinnedAddr;
+                    Util.MemClear(postPinnedAddr, byteCount);
+                    BumpAllocator.WriteUnusedMarker(postPinnedAddr);
+
+                    if (GC.remsetType == RemSetType.Cards && byteCount > 0) {
+                        UIntPtr firstCard = CardTable.CardNo(postPinnedAddr);
+                        UIntPtr lastCard =
+                            CardTable.CardNo(postPinnedAddr + byteCount -1);
+
+                        if (!OffsetTable.NoObjectPtrToTheCard(firstCard)) {
+                            UIntPtr offset = OffsetTable.GetOffset(firstCard);
+                            UIntPtr objPtr =
+                                CardTable.CardAddr(firstCard) + offset;
+                            UIntPtr size = OffsetTable.ObjectSize(objPtr);
+
+                            VTable.Assert
+                                ((objPtr + size - PreHeader.Size
+                                  <= postPinnedAddr)
+                                 || (objPtr >= postPinnedAddr),
+                                 "Object should be totally "
+                                 + "above or below postPinnedAddr");
+                            if (objPtr >= postPinnedAddr) {
+                                OffsetTable.ClearCards(firstCard, firstCard);
+                            }
+                        }
+
+                        OffsetTable.ClearCards(firstCard + 1, lastCard);
+                    }
+                }
+            }
+
+            private static UIntPtr FirstPinnedObjectAddr(UIntPtr startPage) {
+                return InteriorPtrTable.First(startPage);
+            }
+
+            private static UIntPtr PostPinnedObjectAddr(UIntPtr endPage) {
+                UIntPtr endAddr = PageTable.PageAddr(endPage);
+                UIntPtr postLastObjectAddr = InteriorPtrTable.Last(endPage-1);
+                if (postLastObjectAddr < endAddr &&
+                    !BumpAllocator.IsUnusedSpace(postLastObjectAddr)) {
+                    // If the next object straddles into the next page,
+                    // return the location just past the object
+                    Object lastObject = Magic.fromAddress(postLastObjectAddr);
+                    UIntPtr lastObjectSize =
+                        ObjectLayout.ObjectSize(postLastObjectAddr,
+                                                lastObject.vtable);
+                    postLastObjectAddr += lastObjectSize;
+                }
+                return postLastObjectAddr - PreHeader.Size;
+            }
+
+            internal ArrayList pinnedPageList;
+            internal UIntPtrComparer comparer; // type defined in UIntPtr.cs
+
+        }
+
+    }
+
+    // N.B. Must get two UIntPtrs!
+
+    internal class UIntPtrComparer : Collections.IComparer
+    {
+        public int Compare(Object x, Object y)
+        {
+            VTable.Assert(x is UIntPtr);
+            VTable.Assert(y is UIntPtr);
+
+            UIntPtr u = (UIntPtr) x;
+            UIntPtr v = (UIntPtr) y;
+
+            if(u < v) {
+                return -1;
+            }
+            if(u > v) {
+                return 1;
+            }
+            return 0;
+        }
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/SequentialStoreBuffer.cs b/base/Kernel/Bartok/GCs/SequentialStoreBuffer.cs
new file mode 100644
index 0000000..e7a818a
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/SequentialStoreBuffer.cs
@@ -0,0 +1,328 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+  using Microsoft.Bartok.Options;
+  using Microsoft.Bartok.Runtime;
+
+  using System.Threading;
+  using System.Runtime.CompilerServices;
+
+  internal unsafe class SequentialStoreBuffer : RememberedSet {
+
+      internal static SequentialStoreBuffer instance;
+
+      private struct ThreadLocal {
+          internal UIntPtr overflowValue;
+          [AccessedByRuntime("referenced from halforgc.asm")]
+          internal UIntPtr *cursor;
+          [AccessedByRuntime("referenced from halforgc.asm")]
+          internal UIntPtr *limit;
+      }
+
+      [MixinConditional("SSB")]
+      [MixinConditional("AllThreadMixins")]
+      [Mixin(typeof(Thread))]
+      private class SequentialStoreBufferThread : Object {
+          [AccessedByRuntime("referenced from brtforgc.asm")]
+          internal ThreadLocal ssb;
+      }
+
+      private static SequentialStoreBufferThread MixinThread(Thread t) {
+          return (SequentialStoreBufferThread) (Object) t;
+      }
+
+      internal static void Initialize() {
+          Initialize(128, PageTable.PageSize);
+      }
+
+      internal static void Initialize(int count, UIntPtr size) {
+          writeBufferSize = ((int) size * count) / UIntPtr.Size;
+          chunkSize = (int) size;
+          UIntPtr memorySize = (UIntPtr) UIntPtr.Size * (uint) writeBufferSize;
+          writeBuffer = (UIntPtr *)
+              PageManager.AllocateNonheapMemory(null, memorySize);
+          VTable.Assert(writeBuffer != null);
+          AdjustChunkSize(1);
+          SequentialStoreBuffer.instance = (SequentialStoreBuffer)
+              BootstrapMemory.Allocate(typeof(SequentialStoreBuffer));
+      }
+
+      [Inline]
+      internal override void RecordReference(ref Object reference,
+                                             Object toObj)
+      {
+          Record((UIntPtr) Magic.toPointer(ref reference));
+      }
+
+      [Inline]
+      internal override void RecordReference(UIntPtr* fromAddr,
+                                             Object toObj)
+      {
+          Record((UIntPtr) fromAddr);
+      }
+
+      [Inline]
+      internal override void RecordClonedObject(Object clonedObject)
+      {
+          Record(Magic.addressOf(clonedObject) + 1);
+      }
+
+      internal override void Clean() {
+          for (int i = 0; i < Thread.threadTable.Length; i++) {
+              Thread t = Thread.threadTable[i];
+              if (t != null) {
+                  Clean(t);
+              }
+          }
+      }
+
+      internal override void Clean(Thread thread) {
+          UIntPtr wbCursor = (UIntPtr) MixinThread(thread).ssb.cursor;
+          UIntPtr wbLimit = (UIntPtr) MixinThread(thread).ssb.limit;
+          if (wbCursor < wbLimit) {
+              VTable.Assert(wbCursor != UIntPtr.Zero);          
+              Util.MemClear(wbCursor, wbLimit - wbCursor);
+          }
+      }
+
+      [RequiredByBartok]
+      [Inline]
+      public static void Record(UIntPtr value) {
+          Thread currentThread = Thread.CurrentThread;
+          if (MixinThread(currentThread).ssb.cursor ==
+              MixinThread(currentThread).ssb.limit) {
+              RecordSlow(currentThread, value);
+          } else {
+              *MixinThread(currentThread).ssb.cursor = value;
+              MixinThread(currentThread).ssb.cursor++;
+          }
+      }
+
+      private static void RecordSlow(Thread currentThread, UIntPtr value) {
+          // Try to acquire a new chunk of the store buffer
+          while (writeBufferIndex < writeBufferSize) {
+              int oldIndex = writeBufferIndex;
+              int newIndex = oldIndex + chunkSize;
+              if (Interlocked.CompareExchange(ref writeBufferIndex, newIndex,
+                                              oldIndex) == oldIndex) {
+                  // We secured a new block of write buffer for this thread
+                  UIntPtr *cursor = writeBuffer + oldIndex;
+                  *cursor = value;
+                  cursor++;
+                  MixinThread(currentThread).ssb.cursor = cursor;
+                  MixinThread(currentThread).ssb.limit =
+                      writeBuffer + newIndex;
+                  return;
+              }
+          }
+          // We have run out of write barrier space
+          if (StopTheWorldCollector.CurrentPhase ==
+              StopTheWorldCollector.STWPhase.SingleThreaded) {
+              VTable.DebugBreak();
+          }
+          VTable.Assert(MixinThread(currentThread).ssb.overflowValue ==
+                        UIntPtr.Zero);
+          MixinThread(currentThread).ssb.overflowValue = value;
+          GC.InvokeCollection(currentThread);
+          while (MixinThread(currentThread).ssb.overflowValue != UIntPtr.Zero) {
+              // Another thread must have taken charge of performing the
+              // collection and hadn't yet assigned a GCRequest to the
+              // current thread.  Give the other thread a chance to do
+              // some work before we try invoking the collector again.
+              Thread.Yield();
+              GC.InvokeCollection(currentThread);
+          }
+      }
+
+      internal override void Uniquify() {
+          // Sort the write buffer.
+
+          // TODO: Would like sort that is in-place, O(n lg n) worst-case, and
+          // O(n) when nearly-sorted.
+
+          bool changed = true;
+          for(int max = writeBufferIndex; changed; --max) {
+              changed = false;
+              for(int i = 1; i < max; ++i) {
+                  if(writeBuffer[i-1] > writeBuffer[i]) {
+                      changed = true;
+                      UIntPtr t = writeBuffer[i-1];
+                      writeBuffer[i-1] = writeBuffer[i];
+                      writeBuffer[i] = t;
+                  }
+              }
+          }
+
+          // Remove duplicates
+          int dest = 0;
+          UIntPtr last = UIntPtr.Zero;
+          for (int i = 0; i < writeBufferIndex; i++) {
+              UIntPtr current = *(writeBuffer + i);
+              if (current != last) {
+                  VTable.Assert(current > last);
+                  *(writeBuffer + dest) = current;
+                  dest++;
+                  last = current;
+                  if ((current & 1) != 0) {
+                      // The entire object is marked, skip interior addresses
+                      UIntPtr objPtr = current - 1;
+                      VTable vtable = Magic.fromAddress(objPtr).vtable;
+                      UIntPtr size = ObjectLayout.ObjectSize(objPtr, vtable);
+                      VTable.Assert(size > 0);
+                      UIntPtr objLimit = objPtr + size;
+                      i++;
+                      while (i < writeBufferIndex &&
+                             *(writeBuffer + i) < objLimit) {
+                          i++;
+                      }
+                      i--;
+                  }
+              }
+          }
+          writeBufferIndex = dest;
+          // Remove duplicates hiding in the overflow slot in thread objects!
+          for (int i = 0; i < Thread.threadTable.Length; i++) {
+              Thread t = Thread.threadTable[i];
+              if (t != null) {
+                  UIntPtr overflowPtr = MixinThread(t).ssb.overflowValue;
+                  if (overflowPtr != UIntPtr.Zero) {
+                      int left = 0;
+                      int right = writeBufferIndex;
+                      while (left < right - 1) {
+                          int mid = (left + right) / 2;
+                          if (*(writeBuffer + mid) <= overflowPtr) {
+                              left = mid;
+                          } else {
+                              right = mid;
+                          }
+                      }
+                      UIntPtr foundPtr = *(writeBuffer + left);
+                      if (overflowPtr == foundPtr) {
+                          // Found an exact duplicate
+                          MixinThread(t).ssb.overflowValue = UIntPtr.Zero;
+                          continue;
+                      } else if ((foundPtr & 1) != 0) {
+                          UIntPtr objAddr = foundPtr - 1;
+                          VTable vtable = Magic.fromAddress(objAddr).vtable;
+                          UIntPtr size =
+                              ObjectLayout.ObjectSize(objAddr, vtable);
+                          if (overflowPtr < objAddr + size) {
+                              // found a pointer into a checked object
+                              MixinThread(t).ssb.overflowValue = UIntPtr.Zero;
+                          }
+                      } else if ((overflowPtr & 1) != 0) {
+                          UIntPtr objAddr = overflowPtr - 1;
+                          VTable vtable = Magic.fromAddress(objAddr).vtable;
+                          UIntPtr size =
+                              ObjectLayout.ObjectSize(objAddr, vtable);
+                          UIntPtr objLimit = objAddr + size;
+                          int skipCount = 0;
+                          int probe = left + 1;
+                          while (probe < writeBufferIndex &&
+                                 *(writeBuffer + probe) < objLimit) {
+                              probe++;
+                              skipCount++;
+                          }
+                          if (skipCount > 0) {
+                              while (probe < writeBufferIndex) {
+                                  *(writeBuffer + left) =
+                                      *(writeBuffer + probe);
+                                  left++;
+                                  probe++;
+                              }
+                          }
+                      }
+                  }
+              }
+          }
+      }
+
+      // REVIEW: This is marked inline because the adaptive collector calls
+      // it with two different NonNullReferenceVisitors and we need to avoid
+      // the virtual call.  We really want to specialize the method.
+      [Inline]
+      internal override void Scan(NonNullReferenceVisitor ptrVisitor,
+                                  PageType genToCollect)
+      {
+          for (int i = 0; i < writeBufferIndex; i++) {
+              UIntPtr tag = *(writeBuffer + i);
+              if (tag != UIntPtr.Zero) {
+                  if ((tag & 0x1) == 0) {
+                      UIntPtr *fieldLoc = (UIntPtr *) tag;
+                      if (*fieldLoc != UIntPtr.Zero) {
+                          ptrVisitor.Visit(fieldLoc);
+                      }
+                  } else {
+                      UIntPtr objectPtr = (UIntPtr) (tag - 1);
+                      Object obj = Magic.fromAddress(objectPtr);
+                      ptrVisitor.VisitReferenceFields(obj);
+                  }
+              }
+          }
+          // Handle the overflow in the thread objects
+          for (int i = 0; i < Thread.threadTable.Length; i++) {
+              Thread t = Thread.threadTable[i];
+              if (t != null) {
+                  UIntPtr tag = MixinThread(t).ssb.overflowValue;
+                  if (tag != UIntPtr.Zero) {
+                      if ((tag & 0x1) == 0) {
+                          UIntPtr *fieldLoc = (UIntPtr *) tag;
+                          if (*fieldLoc != UIntPtr.Zero) {
+                              ptrVisitor.Visit(fieldLoc);
+                          }
+                      } else {
+                          UIntPtr objectPtr = (UIntPtr) (tag - 1);
+                          Object obj = Magic.fromAddress(objectPtr);
+                          ptrVisitor.VisitReferenceFields(obj);
+                      }
+                  }
+              }
+          }
+      }
+
+      internal override void Reset() {
+          int threadCount = 0;
+          for (int i = 0; i < Thread.threadTable.Length; i++) {
+              Thread t = Thread.threadTable[i];
+              if (t != null) {
+                  threadCount++;
+                  MixinThread(t).ssb.overflowValue = UIntPtr.Zero;
+                  MixinThread(t).ssb.cursor = null;
+                  MixinThread(t).ssb.limit = null;
+              }
+          }
+          AdjustChunkSize(threadCount);
+      }
+
+      private static void AdjustChunkSize(int threadCount) {
+          writeBufferIndex = 0;
+          // Adjust the size of the write barrier chunks
+          int testSize = writeBufferSize;
+          while (threadCount > 0) {
+              threadCount >>= 1;
+              testSize >>= 1;
+          }
+          if (testSize < chunkSize) {
+              VTable.Assert(testSize > 0);
+              chunkSize = testSize;
+          }
+      }
+
+      internal static int chunkSize;
+      internal static UIntPtr *writeBuffer;
+      internal static int writeBufferIndex;
+      internal static int writeBufferSize;
+
+  }
+
+}
diff --git a/base/Kernel/Bartok/GCs/SingleThreadedRCCollector.cs b/base/Kernel/Bartok/GCs/SingleThreadedRCCollector.cs
new file mode 100644
index 0000000..ae5043f
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/SingleThreadedRCCollector.cs
@@ -0,0 +1,1122 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// #define DEBUG
+
+namespace System.GCs {
+
+  using Microsoft.Bartok.Options;
+  using Microsoft.Bartok.Runtime;
+  using System.Runtime.InteropServices;
+  using System.Runtime.CompilerServices;
+  using System.Threading;
+  using System.Collections;
+
+  [NoCCtor]
+  [RequiredByBartok]
+  internal abstract class SingleThreadedRCCollector : RCCollector {
+      [PreInitRefCounts]
+      public new static void Initialize() {
+          RCCollector.Initialize();
+
+          if (VerificationMode) {
+              backupInit =
+                  (BackupInitializer)BootstrapMemory.
+                  Allocate(typeof(BackupInitializer));
+              backupRefCount =
+                  (BackupRefCount)BootstrapMemory.
+                  Allocate(typeof(BackupRefCount));
+              incrementBackupRefCount =
+                  (IncrementBackupRefCount)BootstrapMemory.
+                  Allocate(typeof(IncrementBackupRefCount));
+              rootsScanner =
+                  (RootsScanner)BootstrapMemory.
+                  Allocate(typeof(RootsScanner));
+              resetRoots =
+                  (ResetRoots)BootstrapMemory.
+                  Allocate(typeof(ResetRoots));
+              resetTraversal =
+                  (ResetTraversal)BootstrapMemory.
+                  Allocate(typeof(ResetTraversal));
+
+              leakAccumulator =
+                  (LeakAccumulator)BootstrapMemory.
+                  Allocate(typeof(LeakAccumulator));
+              leakedNodesDFS =
+                  (LeakedNodesDFS)BootstrapMemory.
+                  Allocate(typeof(LeakedNodesDFS));
+              leakedCycleClosure =
+                  (LeakedCycleClosure)BootstrapMemory.
+                  Allocate(typeof(LeakedCycleClosure));
+              dfsMarker =
+                  (DFSMarker)BootstrapMemory.
+                  Allocate(typeof(DFSMarker));
+              cycleClosure =
+                  (CycleClosure)BootstrapMemory.
+                  Allocate(typeof(CycleClosure));
+              bfsMarker =
+                  (BFSMarker)BootstrapMemory.
+                  Allocate(typeof(BFSMarker));
+              leakedRoots =
+                  (LeakedRoots)BootstrapMemory.
+                  Allocate(typeof(LeakedRoots));
+              leakedRootsCounter =
+                  (LeakedRootsCounter)BootstrapMemory.
+                  Allocate(typeof(LeakedRootsCounter));
+          }
+      }
+
+      internal override bool IsOnTheFlyCollector {
+          get {
+              return false;
+          }
+      }
+
+      internal override void CheckForNeededGCWork
+          (Thread currentThread) {
+      }
+
+      internal override int GetGeneration(Object obj) {
+          return MinGeneration;
+      }
+
+      internal override int MinGeneration {
+          get {
+              return (int)PageType.Owner0;
+          }
+      }
+
+      internal override int MaxGeneration {
+          get {
+              return (int)PageType.Owner0;
+          }
+      }
+
+      internal override int CollectionGeneration(int gen) {
+          return MinGeneration;
+      }
+
+      internal override void NewThreadNotification(Thread newThread,
+                                                   bool initial)
+      {
+          base.NewThreadNotification(newThread, initial);
+          SegregatedFreeList.NewThreadNotification(newThread, initial);
+      }
+
+      internal override void DeadThreadNotification(Thread deadThread)
+      {
+          MultiUseWord.CollectFromThread(deadThread);
+          SegregatedFreeList.DeadThreadNotification(deadThread);
+          base.DeadThreadNotification(deadThread);
+      }
+
+      [NoInline]
+      [ManualRefCounts]
+      protected void preVerifyHeap(bool beforeCollection) {
+          VTable.Assert(RCCollector.VerificationMode,
+                        @"RCCollector.VerificationMode");
+
+          // Ensure the integrity of the delayed deallocation list.
+          deallocationListChecker();
+      }
+
+      [NoInline]
+      [ManualRefCounts]
+      protected void postVerifyHeap(bool beforeCollection) {
+          VTable.Assert(RCCollector.VerificationMode,
+                        @"RCCollector.VerificationMode");
+
+          SegregatedFreeList.RecycleGlobalPages();
+          SegregatedFreeList.CommitFreedData();
+          GC.newBytesSinceGC = UIntPtr.Zero;
+
+          // Initialize the "backup" reference count.
+          SegregatedFreeList.VisitAllObjects(backupInit);
+
+          // Count all references and managed pointers.
+          rootsScanner.Initialize(backupRefCount);
+          CallStack.ScanStacks(rootsScanner, rootsScanner);
+          Thread.VisitBootstrapData(rootsScanner);
+          StaticData.ScanStaticData(rootsScanner);
+          MultiUseWord.VisitStrongRefs(rootsScanner, false);
+
+          CallStack.ScanStacks(resetRoots, resetRoots);
+          Thread.VisitBootstrapData(resetRoots);
+          StaticData.ScanStaticData(resetRoots);
+
+          SegregatedFreeList.VisitAllObjects(resetTraversal);
+
+          // Actual leaks (refCount > 0 and backup refCount = 0).
+          leakAccumulator.Initialize();
+          SegregatedFreeList.VisitAllObjects(leakAccumulator);
+          VTable.DebugPrint("Leaked storage: ");
+          VTable.DebugPrint((int)leakAccumulator.Size);
+          VTable.DebugPrint("B");
+
+          if (VerifyLeakedCycles) {
+              // Find leaked data that *should* have been reclaimed.
+              // (If L is the set of all leaked nodes, and L' the
+              // transitive closure of leaked cycles, then L-L' is
+              // the set of nodes that should have been captured
+              // by a pure RC collector.)
+              SegregatedFreeList.VisitAllObjects(leakedNodesDFS);
+              SegregatedFreeList.VisitAllObjects(resetTraversal);
+              SegregatedFreeList.VisitAllObjects(leakedCycleClosure);
+              SegregatedFreeList.VisitAllObjects(resetTraversal);
+              leakAccumulator.Initialize();
+              SegregatedFreeList.VisitAllObjects(leakAccumulator);
+              VTable.DebugPrint(" (");
+              VTable.DebugPrint((int)leakAccumulator.Size);
+              VTable.DebugPrint("B acyclic)");
+          }
+
+          // Find the roots of leaked data.
+          leakedRoots.Initialize();
+          SegregatedFreeList.VisitAllObjects(leakedRoots);
+          leakedRootsCounter.Initialize();
+          SegregatedFreeList.VisitAllObjects(leakedRootsCounter);
+          SegregatedFreeList.VisitAllObjects(resetTraversal);
+          VTable.DebugPrint("; leaked heap roots: ");
+          VTable.DebugPrint((int)leakedRootsCounter.Total);
+          VTable.DebugPrint("\n");
+      }
+
+
+      [Inline]
+      [ManualRefCounts]
+      [RequiredByBartok]
+      protected static void UpdateReferentRefCounts
+          (UIntPtr objAddr,
+           VTable vtable,
+           NonNullReferenceVisitor updater) {
+          updater.VisitReferenceFields(objAddr, vtable);
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      [RequiredByBartok]
+      protected static unsafe void UpdateReferentRefCounts
+          (UIntPtr objAddr,
+           VTable vtable,
+           int start,
+           int span,
+           NonNullReferenceVisitor updater) {
+          uint pointerTracking = (uint)vtable.pointerTrackingMask;
+          uint objTag = pointerTracking & 0xf;
+
+          switch (objTag) {
+              case ObjectLayout.PTR_VECTOR_TAG: {
+                  uint length = *(uint*)(objAddr+PostHeader.Size);
+                  VTable.Assert(span <= length,
+                                @"span <= length");
+
+                  UIntPtr* elemAddress = (UIntPtr*)(objAddr+
+                      vtable.baseLength-PreHeader.Size)+start;
+                  for (int i = 0; i < span; i++, elemAddress++) {
+                      updater.Visit(elemAddress);
+                  }
+                  break;
+              }
+
+              case ObjectLayout.OTHER_VECTOR_TAG: {
+                  uint length = *(uint*)(objAddr+PostHeader.Size);
+                  VTable.Assert(span <= length,
+                                @"span <= length");
+
+                  if (vtable.arrayOf == StructuralType.Struct) {
+                      int elemSize = vtable.arrayElementSize;
+                      UIntPtr elemAddress = objAddr+vtable.baseLength-
+                          PreHeader.Size-PostHeader.Size+elemSize*start;
+                      VTable elemVTable = vtable.arrayElementClass;
+                      for (int i = 0; i < span; i++,
+                           elemAddress += elemSize) {
+                          updater.VisitReferenceFields(elemAddress,
+                                                       elemVTable);
+                      }
+                  }
+                  break;
+              }
+
+              case ObjectLayout.PTR_ARRAY_TAG: {
+                  uint length =
+                      *(uint*)(objAddr+PostHeader.Size+sizeof(uint));
+                  VTable.Assert(span <= length,
+                                @"span <= length");
+
+                  UIntPtr* elemAddress = (UIntPtr*)
+                      (objAddr+vtable.baseLength-PreHeader.Size)+start;
+                  for (int i = 0; i < span; i++, elemAddress++) {
+                      updater.Visit(elemAddress);
+                  }
+                  break;
+              }
+
+              case ObjectLayout.OTHER_ARRAY_TAG: {
+                  uint length =
+                      *(uint*)(objAddr+PostHeader.Size+sizeof(uint));
+                  VTable.Assert(span <= length,
+                                @"span <= length");
+
+                  if (vtable.arrayOf == StructuralType.Struct) {
+                      int elemSize = vtable.arrayElementSize;
+                      UIntPtr elemAddress = objAddr+vtable.baseLength-
+                          PreHeader.Size-PostHeader.Size+elemSize*start;
+                      VTable elemVTable = vtable.arrayElementClass;
+                      for (int i = 0; i < span; i++,
+                           elemAddress += elemSize) {
+                          updater.VisitReferenceFields(elemAddress,
+                                                       elemVTable);
+                      }
+                  }
+                  break;
+              }
+
+              case ObjectLayout.STRING_TAG: {
+                  break;
+              }
+
+              default: {
+                  VTable.NotReached("An unsupported tag found!");
+                  break;
+              }
+          }
+      }
+
+
+      [NoInline]
+      [ManualRefCounts]
+      protected static void deallocationListChecker() {
+          // Check for nonzero reference counts and for
+          // loops in the delayed deallocation list.
+          for (Object block = delayedDeallocationList;
+               block != null; block = getNextLink(block)) {
+              UIntPtr objAddr = Magic.addressOf(block);
+              UIntPtr page = PageTable.Page(objAddr);
+              if (!PageTable.IsGcPage(page)) {
+                  VTable.DebugPrint("Non-GC memory for freeing!\n");
+                  VTable.DebugBreak();
+              }
+              uint refState = block.REF_STATE;
+              if ((refState & RSMasks.refCount) != 0) {
+                  VTable.DebugPrint("Non-zero reference count!\n");
+                  VTable.DebugBreak();
+              }
+              block.REF_STATE = refState+1;
+          }
+          // Make another pass to reset reference counts.
+          for (Object block = delayedDeallocationList;
+               block != null; block = getNextLink(block)) {
+              block.REF_STATE--;
+          }
+      }
+
+      [NoInline]
+      [ManualRefCounts]
+      protected static void purgeDeallocationList
+          (NonNullReferenceVisitor decrementer) {
+          while (beingDeallocatedBlock != null ||
+                 delayedDeallocationList != null) {
+              deallocateObjects(decrementer);
+          }
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void deallocateLazily(Object obj) {
+          setNextLink(obj, delayedDeallocationList);
+          delayedDeallocationList = obj;
+          delayedDeallocationLength++;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void deallocateObjects
+          (NonNullReferenceVisitor decrementer) {
+          int startTicks = 0;
+          bool enableGCTiming = VTable.enableGCTiming;
+          if (enableGCTiming) {
+              VTable.enableGCTiming = false;
+              startTicks = Environment.TickCount;
+          }
+          if (VTable.enableGCWatermarks) {
+              MemoryAccounting.RecordHeapWatermarks();
+          }
+
+          // Set up a block to deallocate, if one doesn't exist.
+          if (beingDeallocatedBlock == null &&
+              delayedDeallocationList != null) {
+              beingDeallocatedBlock = delayedDeallocationList;
+              delayedDeallocationList =
+                  getNextLink(delayedDeallocationList);
+              delayedDeallocationLength--;
+
+              UIntPtr objAddr = Magic.addressOf(beingDeallocatedBlock);
+              VTable vtable = beingDeallocatedBlock.vtable;
+              initIncrementalDecrement(objAddr, vtable);
+          }
+
+          // Perform up to a constant number of work chunks on the
+          // block being deallocated. A "work chunk" is either
+          // decrementing up to a fixed number of references held in
+          // an object, decrementing up to a fixed number of slots
+          // if the object is an array, or reclaiming the object
+          // after all decrements on its internal contents are done.
+          for (uint workDone = 0; beingDeallocatedBlock != null &&
+               workDone < deallocationSpan; workDone++) {
+               // Continue work on block.
+              UIntPtr objAddr = Magic.addressOf(beingDeallocatedBlock);
+ #if DEBUG
+              UIntPtr page = PageTable.Page(objAddr);
+              VTable.Assert(PageTable.IsGcPage(page),
+                            @"PageTable.IsGcPage(page)");
+ #endif // DEBUG
+
+              VTable vtable = beingDeallocatedBlock.vtable;
+              if (incrementalDecrement(objAddr, vtable,
+                                       decrementer) != 0) {
+                  continue;
+              }
+
+              // All decrements on contained references are over.
+              Object obj = beingDeallocatedBlock;
+              VTable.Assert((obj.REF_STATE & RSMasks.refCount) == 0,
+                            @"(obj.REF_STATE & RSMasks.refCount) == 0");
+#if DEBUG
+              PLCLink* plcLinkAddr = GetPLCLink(obj);
+              VTable.Assert(plcLinkAddr == null,
+                            @"plcLinkAddr == null");
+#endif // DEBUG
+
+              SegregatedFreeList.Free(obj);
+
+              // Set up block to work on next.
+              beingDeallocatedBlock = delayedDeallocationList;
+              if (delayedDeallocationList != null) {
+                  delayedDeallocationList =
+                      getNextLink(delayedDeallocationList);
+                  delayedDeallocationLength--;
+
+                  objAddr = Magic.addressOf(beingDeallocatedBlock);
+                  vtable = beingDeallocatedBlock.vtable;
+                  initIncrementalDecrement(objAddr, vtable);
+              }
+          }
+
+          SegregatedFreeList.RecycleGlobalPages();
+          SegregatedFreeList.CommitFreedData();
+          GC.newBytesSinceGC = UIntPtr.Zero;
+
+          if (enableGCTiming) {
+              int elapsedTicks = Environment.TickCount - startTicks;
+              System.GC.gcTotalTime += elapsedTicks;
+              if (System.GC.maxPauseTime < elapsedTicks) {
+                  System.GC.maxPauseTime = elapsedTicks;
+              }
+              System.GC.pauseCount++;
+              VTable.enableGCTiming = true;
+          }
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static unsafe uint incrementalDecrement
+          (UIntPtr objAddr,
+           VTable vtable,
+           NonNullReferenceVisitor decrementer) {
+          uint pointerTracking = (uint)vtable.pointerTrackingMask;
+          uint objTag = pointerTracking & 0xf;
+          uint workDone = 0;
+
+          switch (objTag) {
+              case ObjectLayout.SPARSE_TAG: {
+                  UIntPtr* sparseObject = (UIntPtr*)objAddr;
+                  uint lastPointerTracking = getLastTracked(objAddr);
+                  for (pointerTracking = lastPointerTracking;
+                       pointerTracking != 0 &&
+                       workDone < decrementSpan; workDone++) {
+                      uint index = pointerTracking & 0xf;
+                      pointerTracking >>= 4;
+                      UIntPtr* loc = sparseObject+(int)index;
+                      UIntPtr addr = *loc;
+                      if (addr != UIntPtr.Zero) {
+                          decrementer.Visit(addr);
+                      }
+                  }
+                  setLastTracked(objAddr, pointerTracking);
+                  break;
+              }
+
+              case ObjectLayout.DENSE_TAG: {
+                  UIntPtr* denseObject = (UIntPtr*)
+                      (objAddr+PostHeader.Size);
+                  int lastIndex =
+                      unchecked((int)getLastTracked(objAddr));
+                  pointerTracking >>= lastIndex+4;
+                  for (denseObject += lastIndex; pointerTracking != 0 &&
+                       workDone < decrementSpan; workDone++,
+                       lastIndex++, denseObject++) {
+                      if ((pointerTracking & 0x1) != 0 &&
+                          *denseObject != UIntPtr.Zero) {
+                          decrementer.Visit(denseObject);
+                      }
+                      pointerTracking >>= 1;
+                  }
+                  setLastTracked(objAddr, unchecked((uint)lastIndex));
+                  break;
+              }
+
+              case ObjectLayout.PTR_VECTOR_TAG: {
+                  uint length = *(uint*)(objAddr+PostHeader.Size);
+                  UIntPtr* elemAddress = (UIntPtr*)
+                      (objAddr+vtable.baseLength-PreHeader.Size);
+                  uint lastIndex = getLastTracked(objAddr);
+                  for (elemAddress += lastIndex; lastIndex < length &&
+                       workDone < decrementSpan; workDone++,
+                       lastIndex++, elemAddress++) {
+                      if (*elemAddress != UIntPtr.Zero) {
+                          decrementer.Visit(elemAddress);
+                      }
+                  }
+                  setLastTracked(objAddr, lastIndex);
+                  break;
+              }
+
+              case ObjectLayout.OTHER_VECTOR_TAG: {
+                  if (vtable.arrayOf == StructuralType.Struct) {
+                      uint length = *(uint*)(objAddr+PostHeader.Size);
+                      UIntPtr elemAddress = objAddr+vtable.baseLength-
+                          PreHeader.Size-PostHeader.Size;
+                      VTable elemVTable = vtable.arrayElementClass;
+                      int elemSize = vtable.arrayElementSize;
+                      uint lastIndex = getLastTracked(objAddr);
+                      for (elemAddress += (UIntPtr)(elemSize*lastIndex);
+                           lastIndex < length &&
+                           workDone < decrementSpan; workDone++,
+                           lastIndex++, elemAddress += elemSize) {
+                          decrementer.VisitReferenceFields(elemAddress,
+                                                           elemVTable);
+                      }
+                      setLastTracked(objAddr, lastIndex);
+                  }
+                  break;
+              }
+
+              case ObjectLayout.PTR_ARRAY_TAG: {
+                  uint length =
+                      *(uint*)(objAddr+PostHeader.Size+sizeof(uint));
+                  UIntPtr* elemAddress = (UIntPtr*)
+                      (objAddr+vtable.baseLength-PreHeader.Size);
+                  uint lastIndex = getLastTracked(objAddr);
+                  for (elemAddress += lastIndex; lastIndex < length &&
+                       workDone < decrementSpan; workDone++,
+                       lastIndex++, elemAddress++) {
+                      if (*elemAddress != UIntPtr.Zero) {
+                          decrementer.Visit(elemAddress);
+                      }
+                  }
+                  setLastTracked(objAddr, lastIndex);
+                  break;
+              }
+
+              case ObjectLayout.OTHER_ARRAY_TAG: {
+                  if (vtable.arrayOf == StructuralType.Struct) {
+                      uint length =
+                          *(uint*)(objAddr+
+                                   PostHeader.Size+sizeof(uint));
+                      UIntPtr elemAddress = objAddr+vtable.baseLength-
+                          PreHeader.Size-PostHeader.Size;
+                      VTable elemVTable = vtable.arrayElementClass;
+                      int elemSize = vtable.arrayElementSize;
+                      uint lastIndex = getLastTracked(objAddr);
+                      for (elemAddress += (UIntPtr)(elemSize*lastIndex);
+                           lastIndex < length &&
+                           workDone < decrementSpan; workDone++,
+                           lastIndex++, elemAddress += elemSize) {
+                          decrementer.VisitReferenceFields(elemAddress,
+                                                           elemVTable);
+                      }
+                      setLastTracked(objAddr, lastIndex);
+                  }
+                  break;
+              }
+
+              case ObjectLayout.STRING_TAG: {
+                  break;
+              }
+
+              default: {
+                  VTable.Assert((objTag & 0x1) == 0,
+                                @"(objTag & 0x1) == 0");
+
+                  UIntPtr* largeObject = (UIntPtr*)objAddr;
+                  int* pointerDescription =
+                      (int*)vtable.pointerTrackingMask;
+                  int lastCount =
+                      unchecked((int)getLastTracked(objAddr));
+                  for (int count = *pointerDescription;
+                       lastCount <= count && workDone < decrementSpan;
+                       workDone++, lastCount++) {
+                      UIntPtr* loc = largeObject+
+                          *(pointerDescription+lastCount);
+                      if (*loc != UIntPtr.Zero) {
+                          decrementer.Visit(loc);
+                      }
+                  }
+                  setLastTracked(objAddr, unchecked((uint)lastCount));
+                  break;
+              }
+          }
+
+          return workDone;
+      }
+
+      [ManualRefCounts]
+      protected static unsafe void initIncrementalDecrement
+          (UIntPtr objAddr,
+           VTable vtable) {
+          uint pointerTracking = (uint)vtable.pointerTrackingMask;
+          uint objTag = pointerTracking & 0xf;
+
+          switch (objTag) {
+              case ObjectLayout.SPARSE_TAG: {
+                  setLastTracked(objAddr, pointerTracking >> 4);
+                  break;
+              }
+
+              case ObjectLayout.DENSE_TAG: {
+                  setLastTracked(objAddr, 0);
+                  break;
+              }
+
+              case ObjectLayout.PTR_VECTOR_TAG:
+              case ObjectLayout.OTHER_VECTOR_TAG:
+              case ObjectLayout.PTR_ARRAY_TAG:
+              case ObjectLayout.OTHER_ARRAY_TAG: {
+                  setLastTracked(objAddr, 0);
+                  break;
+              }
+
+              case ObjectLayout.STRING_TAG : {
+                  break;
+              }
+
+              default: {
+                 setLastTracked(objAddr, 1);
+                 break;
+              }
+          }
+      }
+
+
+      [Inline]
+      [ManualRefCounts]
+      protected static Object getNextLink(Object obj) {
+          return Magic.fromAddress(obj.preHeader.muw.value);
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void setNextLink(Object obj, Object next) {
+          obj.preHeader.muw.value = Magic.addressOf(next);
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static uint getLastTracked(UIntPtr objAddr) {
+          Object obj = Magic.fromAddress(objAddr);
+          return (uint)obj.preHeader.muw.value;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void setLastTracked(UIntPtr objAddr, uint last) {
+          Object obj = Magic.fromAddress(objAddr);
+          obj.preHeader.muw.value = (UIntPtr)last;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static UIntPtr getBackupRefcount(Object obj) {
+          return ((RCGCVerificationObject)obj).preHeader.
+                 backupRefcount;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void setBackupRefcount(Object obj,
+                                              UIntPtr count) {
+          ((RCGCVerificationObject)obj).preHeader.backupRefcount =
+              count;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static UIntPtr getDfsDiscoveryTime(Object obj) {
+          return ((RCGCVerificationObject)obj).preHeader.
+                 dfsDiscoveryTime;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void setDfsDiscoveryTime(Object obj,
+                                                UIntPtr time) {
+          ((RCGCVerificationObject)obj).preHeader.dfsDiscoveryTime =
+              time;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static UIntPtr getDfsFinishingTime(Object obj) {
+          return ((RCGCVerificationObject)obj).preHeader.
+                 dfsFinishingTime;
+      }
+
+      [Inline]
+      [ManualRefCounts]
+      protected static void setDfsFinishingTime(Object obj,
+                                                UIntPtr time) {
+          ((RCGCVerificationObject)obj).preHeader.dfsFinishingTime =
+              time;
+      }
+
+
+      protected abstract class ObjectVisitor :
+          SegregatedFreeList.ObjectVisitor {
+          [ManualRefCounts]
+          internal override void VisitSmall(Object obj,
+                                            UIntPtr memAddr) {
+              this.Visit(obj);
+          }
+
+          [ManualRefCounts]
+          internal override UIntPtr VisitLarge(Object obj) {
+              return this.Visit(obj);
+          }
+
+          internal abstract override UIntPtr Visit(Object obj);
+      }
+
+
+      protected class ResetTraversal : ObjectVisitor {
+          [ManualRefCounts]
+          internal override unsafe UIntPtr Visit(Object obj) {
+              obj.GcMark(UIntPtr.Zero);
+              VTable vtable = obj.vtable;
+              UIntPtr size =
+                  ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+
+              return size;
+          }
+      }
+
+
+      private class BackupInitializer : ObjectVisitor {
+          [ManualRefCounts]
+          internal override UIntPtr Visit(Object obj) {
+              setBackupRefcount(obj, UIntPtr.Zero);
+
+              return ObjectLayout.ObjectSize(Magic.addressOf(obj),
+                                             obj.vtable);
+          }
+      }
+
+      private class BackupRefCount : NonNullReferenceVisitor {
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr addr = *loc;
+
+              UIntPtr page = PageTable.Page(addr);
+              if (!PageTable.IsGcPage(page)) {
+                  PageType pageType = PageTable.Type(page);
+                  VTable.Assert(pageType == PageType.NonGC ||
+                                pageType == PageType.Stack,
+                                @"pageType == PageType.NonGC ||
+                                pageType == PageType.Stack");
+
+                  return;
+              }
+
+              UIntPtr objAddr = SegregatedFreeList.Find(addr);
+              incrementBackupRefCount.Traverse(objAddr);
+          }
+      }
+
+      private class IncrementBackupRefCount : NonNullReferenceVisitor {
+          [ManualRefCounts]
+          internal void Traverse(UIntPtr objAddr) {
+              Object obj = Magic.fromAddress(objAddr);
+              UIntPtr count = getBackupRefcount(obj);
+              setBackupRefcount(obj, count+1);
+              if (obj.GcMark((UIntPtr)1)) {
+                  this.VisitReferenceFields(obj);
+              }
+              while (!this.workList.IsEmpty) {
+                  objAddr = this.workList.Read();
+                  obj = Magic.fromAddress(objAddr);
+                  this.VisitReferenceFields(obj);
+              }
+          }
+
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr addr = *loc;
+
+              UIntPtr page = PageTable.Page(addr);
+              if (!PageTable.IsGcPage(page)) {
+                  PageType pageType = PageTable.Type(page);
+                  VTable.Assert(pageType == PageType.NonGC ||
+                                pageType == PageType.Stack,
+                                @"pageType == PageType.NonGC ||
+                                pageType == PageType.Stack");
+
+                  return;
+              }
+
+              UIntPtr objAddr = SegregatedFreeList.Find(addr);
+              Object obj = Magic.fromAddress(objAddr);
+              UIntPtr count = getBackupRefcount(obj);
+              setBackupRefcount(obj, count+1);
+              if (obj.GcMark((UIntPtr)1)) {
+                  this.workList.Write(objAddr);
+              }
+          }
+
+          private UIntPtrQueue workList;
+      }
+
+      private class RootsScanner : NonNullReferenceVisitor {
+          internal void Initialize(NonNullReferenceVisitor v) {
+              this.visitor = v;
+          }
+
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr pageLoc = PageTable.Page((UIntPtr)loc);
+              PageType pageType = PageTable.Type(pageLoc);
+              if (pageType != PageType.NonGC &&
+                  pageType != PageType.Stack) {
+                  VTable.Assert(PageTable.IsGcPage(pageLoc),
+                                @"PageTable.IsGcPage(pageLoc)");
+
+                  return;
+              }
+
+              uint addr = (uint)*loc;
+              if (pageType == PageType.NonGC || (addr & 0x03) == 0) {
+                  this.visitor.Visit(loc);
+              }
+              if (pageType == PageType.Stack) {
+                  *loc = (UIntPtr)(addr | 0x01);
+              }
+          }
+
+          NonNullReferenceVisitor visitor;
+      }
+
+      private class ResetRoots : NonNullReferenceVisitor {
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr pageLoc = PageTable.Page((UIntPtr)loc);
+              PageType pageType = PageTable.Type(pageLoc);
+              if (pageType != PageType.NonGC &&
+                  pageType != PageType.Stack) {
+                  VTable.Assert(PageTable.IsGcPage(pageLoc),
+                                @"PageTable.IsGcPage(pageLoc)");
+
+                  return;
+              }
+
+              if (pageType == PageType.Stack) {
+                  *loc = (UIntPtr)((uint)*loc & 0xfffffffc);
+              }
+          }
+      }
+
+      private class LeakAccumulator : ObjectVisitor {
+          internal UIntPtr Size;
+
+          internal void Initialize() {
+              this.Size = UIntPtr.Zero;
+          }
+
+          [ManualRefCounts]
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              UIntPtr size =
+                  ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+
+              uint refState = obj.REF_STATE;
+              UIntPtr refCount = (UIntPtr)(refState & RSMasks.refCount);
+              if ((refState & RSMasks.countingFlag) != 0 &&
+                  refCount > 0) {
+                  // This object is considered live by the
+                  // RC collector.
+                  UIntPtr count = getBackupRefcount(obj);
+                  if (count == 0) {
+                      // But it is actually unreachable.
+                      this.Size += size;
+                  }
+              }
+
+              return size;
+          }
+      }
+
+      private class LeakedNodesDFS : ObjectVisitor {
+          [ManualRefCounts]
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              UIntPtr size =
+                  ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+
+              uint refState = obj.REF_STATE;
+              UIntPtr refCount = (UIntPtr)(refState & RSMasks.refCount);
+              if ((refState & RSMasks.countingFlag) != 0 &&
+                  refCount > 0) {
+                  UIntPtr count = getBackupRefcount(obj);
+                  if (count == 0) {
+                      UIntPtr objAddr = Magic.addressOf(obj);
+                      dfsMarker.Visit(&objAddr);
+                  }
+              }
+
+              return size;
+          }
+      }
+
+      private class DFSMarker : NonNullReferenceVisitor {
+          internal void Initialize() {
+              this.time = UIntPtr.Zero;
+          }
+
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr objAddr = *loc;
+
+              UIntPtr page = PageTable.Page(objAddr);
+              if (!PageTable.IsGcPage(page)) {
+                  PageType pageType = PageTable.Type(page);
+                  VTable.Assert(pageType == PageType.NonGC ||
+                                pageType == PageType.Stack,
+                                @"pageType == PageType.NonGC ||
+                                pageType == PageType.Stack");
+
+                  return;
+              }
+
+              Object obj = Magic.fromAddress(objAddr);
+              if (obj.GcMark((UIntPtr)1)) {
+                  this.time = this.time+1;
+                  setDfsDiscoveryTime(obj, this.time);
+
+                  UIntPtr vtableAddr = Magic.addressOf(obj.vtable);
+                  this.Visit(&vtableAddr);
+                  this.VisitReferenceFields(obj);
+
+                  this.time = this.time+1;
+                  setDfsFinishingTime(obj, this.time);
+              }
+          }
+
+          private UIntPtr time;
+      }
+
+      private class LeakedCycleClosure : ObjectVisitor {
+          [ManualRefCounts]
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              UIntPtr size =
+                  ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+
+              uint refState = obj.REF_STATE;
+              UIntPtr refCount = (UIntPtr)(refState & RSMasks.refCount);
+              if ((refState & RSMasks.countingFlag) != 0 &&
+                  refCount > 0) {
+                  UIntPtr count = getBackupRefcount(obj);
+                  if (count == 0) {
+                      UIntPtr dTime = getDfsDiscoveryTime(obj);
+                      UIntPtr fTime = getDfsFinishingTime(obj);
+                      cycleClosure.Initialize(dTime, fTime);
+                      cycleClosure.VisitReferenceFields(obj);
+                  }
+              }
+
+              return size;
+          }
+      }
+
+      private class CycleClosure : NonNullReferenceVisitor {
+          internal void Initialize(UIntPtr dTime, UIntPtr fTime) {
+              this.predDiscoveryTime = dTime;
+              this.predFinishingTime = fTime;
+          }
+
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr objAddr = *loc;
+
+              UIntPtr page = PageTable.Page(objAddr);
+              if (!PageTable.IsGcPage(page)) {
+                  PageType pageType = PageTable.Type(page);
+                  VTable.Assert(pageType == PageType.NonGC ||
+                                pageType == PageType.Stack,
+                                @"pageType == PageType.NonGC ||
+                                pageType == PageType.Stack");
+
+                  return;
+              }
+
+              Object obj = Magic.fromAddress(objAddr);
+              UIntPtr dTime = getDfsDiscoveryTime(obj);
+              UIntPtr fTime = getDfsFinishingTime(obj);
+              VTable.Assert(this.predDiscoveryTime > UIntPtr.Zero &&
+                            this.predFinishingTime > UIntPtr.Zero &&
+                            dTime > UIntPtr.Zero &&
+                            fTime > UIntPtr.Zero,
+                            @"this.predDiscoveryTime > UIntPtr.Zero &&
+                            this.predFinishingTime > UIntPtr.Zero &&
+                            dTime > UIntPtr.Zero &&
+                            fTime > UIntPtr.Zero");
+
+              if (dTime < this.predDiscoveryTime &&
+                  this.predDiscoveryTime < this.predFinishingTime &&
+                  this.predFinishingTime < fTime) {
+                  // A back edge is incident on this node;
+                  // therefore, the node is part of a cycle.
+                  backupRefCount.Visit(&objAddr);
+              }
+          }
+
+          private UIntPtr predDiscoveryTime;
+          private UIntPtr predFinishingTime;
+      }
+
+      private class BFSMarker : NonNullReferenceVisitor {
+          internal void Initialize(bool isVisited) {
+              this.isVisited = (UIntPtr)(isVisited ? 1 : 0);
+          }
+
+          [ManualRefCounts]
+          internal void Traverse(Object obj) {
+              this.VisitReferenceFields(obj);
+              while (!this.workList.IsEmpty) {
+                  UIntPtr objAddr = this.workList.Read();
+                  obj = Magic.fromAddress(objAddr);
+                  this.VisitReferenceFields(obj);
+              }
+          }
+
+          [ManualRefCounts]
+          internal override unsafe void Visit(UIntPtr* loc) {
+              UIntPtr addr = *loc;
+
+              UIntPtr page = PageTable.Page(addr);
+              if (!PageTable.IsGcPage(page)) {
+                  PageType pageType = PageTable.Type(page);
+                  VTable.Assert(pageType == PageType.NonGC ||
+                                pageType == PageType.Stack,
+                                @"pageType == PageType.NonGC ||
+                                pageType == PageType.Stack");
+
+                  return;
+              }
+
+              UIntPtr objAddr = SegregatedFreeList.Find(addr);
+              Object obj = Magic.fromAddress(objAddr);
+              if (obj.GcMark(this.isVisited)) {
+                  this.workList.Write(objAddr);
+              }
+          }
+
+          private UIntPtr isVisited;
+          private UIntPtrQueue workList;
+      }
+
+      private class LeakedRoots : ObjectVisitor {
+          internal void Initialize() {
+              bfsMarker.Initialize(true);
+          }
+
+          [ManualRefCounts]
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              UIntPtr size =
+                  ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+
+              uint refState = obj.REF_STATE;
+              UIntPtr refCount = (UIntPtr)(refState & RSMasks.refCount);
+              if ((refState & RSMasks.countingFlag) != 0 &&
+                  refCount > 0) {
+                  UIntPtr count = getBackupRefcount(obj);
+                  if (count == 0 && obj.GcMark() == UIntPtr.Zero) {
+                      bfsMarker.Traverse(obj);
+                  }
+              }
+
+              return size;
+          }
+      }
+
+      private class LeakedRootsCounter : ObjectVisitor {
+          internal uint Total;
+
+          internal void Initialize() {
+              this.Total = 0;
+          }
+
+          [ManualRefCounts]
+          internal override unsafe UIntPtr Visit(Object obj) {
+              VTable vtable = obj.vtable;
+              UIntPtr size =
+                  ObjectLayout.ObjectSize(Magic.addressOf(obj),
+                                          vtable);
+
+              uint refState = obj.REF_STATE;
+              UIntPtr refCount = (UIntPtr)(refState & RSMasks.refCount);
+              if ((refState & RSMasks.countingFlag) != 0 &&
+                  refCount > 0) {
+                  UIntPtr count = getBackupRefcount(obj);
+                  if (count == 0 && obj.GcMark() == UIntPtr.Zero) {
+                      this.Total++;
+                  }
+              }
+
+              return size;
+          }
+      }
+
+
+      private static Object delayedDeallocationList;
+      private static Object beingDeallocatedBlock;
+      private static uint delayedDeallocationLength;
+      private const uint collectionTrigger = 1 << 15;
+      private const uint deallocationSpan = 1 << 20;
+      private const uint decrementSpan = 1 << 8;
+
+      // Used only in verification mode.
+      private static BackupInitializer backupInit;
+      private static BackupRefCount backupRefCount;
+      private static IncrementBackupRefCount incrementBackupRefCount;
+      private static RootsScanner rootsScanner;
+      private static NonNullReferenceVisitor resetRoots;
+      private static ObjectVisitor resetTraversal;
+      private static LeakAccumulator leakAccumulator;
+      private static LeakedNodesDFS leakedNodesDFS;
+      private static LeakedCycleClosure leakedCycleClosure;
+      private static CycleClosure cycleClosure;
+      private static DFSMarker dfsMarker;
+      private static BFSMarker bfsMarker;
+      private static LeakedRootsCounter leakedRootsCounter;
+      private static LeakedRoots leakedRoots;
+  }
+}
+
+
diff --git a/base/Kernel/Bartok/GCs/StaticData.cs b/base/Kernel/Bartok/GCs/StaticData.cs
new file mode 100644
index 0000000..63e9b8a
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/StaticData.cs
@@ -0,0 +1,117 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+
+    [RequiredByBartok]
+    internal unsafe class StaticData
+    {
+        [RequiredByBartok]
+        private static int sectionCount;
+        [RequiredByBartok]
+        private static UIntPtr **dataSectionEnd; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static UIntPtr **dataSectionBase; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static UIntPtr **roDataSectionEnd; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static UIntPtr **roDataSectionBase; // unmanaged uint**[]
+        [RequiredByBartok]
+        private static uint **staticDataPointerBitMap; // unmanaged uint*[]
+
+        [PreInitRefCounts]
+#if !SINGULARITY
+        [NoStackLinkCheck]
+#endif
+        internal static void Initialize() {
+            for (int section = 0; section < sectionCount; section++) {
+                UIntPtr startAddr = (UIntPtr) dataSectionBase[section];
+                startAddr = PageTable.PageAlign(startAddr);
+                UIntPtr size = (UIntPtr) dataSectionEnd[section] - startAddr;
+                size = PageTable.PagePad(size);
+                PageManager.SetStaticDataPages(startAddr, size);
+            }
+            for (int section = 0; section < sectionCount; section++) {
+                UIntPtr startAddr = (UIntPtr) roDataSectionBase[section];
+                startAddr = PageTable.PageAlign(startAddr);
+                UIntPtr size = (UIntPtr) roDataSectionEnd[section]-startAddr;
+                size = PageTable.PagePad(size);
+                PageManager.SetStaticDataPages(startAddr, size);
+            }
+        }
+
+        internal static
+        void ScanStaticData(NonNullReferenceVisitor referenceVisitor)
+        {
+            Finalizer.VisitBootstrapData(referenceVisitor);
+            for (int section = 0; section < sectionCount; section++) {
+                int size = (int)
+                    (*(dataSectionEnd+section)-*(dataSectionBase+section));
+                int iters = (size + 31) / 32;
+                UIntPtr *ptr = *(dataSectionBase+section);
+                uint *pointerBitmap = *(staticDataPointerBitMap+section);
+                for (int i = 0; i < iters; i++) {
+                    uint mask = *pointerBitmap++;
+                    if (mask != 0) {
+                        for (int j = 0; j < 32; j++) {
+                            if ((mask & 1) != 0 && *ptr != UIntPtr.Zero) {
+                                referenceVisitor.Visit(ptr);
+                            }
+                            ptr++;
+                            mask >>= 1;
+                        }
+                    } else {
+                        ptr += 32;
+                    }
+                }
+            }
+        }
+
+        internal static
+        uint ScanStaticPointerData(NonNullReferenceVisitor referenceVisitor)
+        {
+            uint totalSize = 0;
+            for (int section = 0; section < sectionCount; section++) {
+                uint size = (uint)(*(dataSectionEnd+section)-
+                    *(dataSectionBase+section));
+                totalSize += size;
+                UIntPtr *ptr = *(dataSectionBase+section);
+                uint *pointerBitmap = *(staticDataPointerBitMap+section);
+                uint iters = (size + 31) / 32;
+                for (uint i = 0; i < iters; i++) {
+                    uint mask = *pointerBitmap++;
+                    if (mask != 0) {
+                        for (int j = 0; j < 32; j++) {
+                            if ((mask & 1) != 0) {
+                                referenceVisitor.Visit(ptr);
+                            }
+                            ptr++;
+                            mask >>= 1;
+                        }
+                    } else {
+                        ptr += 32;
+                    }
+                }
+            }
+
+            for (int section = 0; section < sectionCount; section++) {
+                uint size = (uint)(*(roDataSectionEnd+section)-
+                    *(roDataSectionBase+section));
+                totalSize += size;
+            }
+
+            return totalSize*(uint)UIntPtr.Size;
+        }
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/StopTheWorldCollector.cs b/base/Kernel/Bartok/GCs/StopTheWorldCollector.cs
new file mode 100644
index 0000000..297df4c
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/StopTheWorldCollector.cs
@@ -0,0 +1,322 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+#if SINGULARITY
+#if SINGULARITY_KERNEL
+  using Microsoft.Singularity;
+  using Microsoft.Singularity.Scheduling;
+#else
+  using Microsoft.Singularity;
+  using Microsoft.Singularity.V1.Services;
+#endif
+
+    [CLSCompliant(false)]
+    public enum GarbageCollectorEvent : ushort
+    {
+        StartStopTheWorld = 1,
+        EndStopTheWorld = 2,
+        StartCollection = 3,
+        EndCollection = 4,
+    }
+#endif
+
+    [NoCCtor]
+    internal abstract class StopTheWorldCollector : BaseCollector
+    {
+
+        internal static int collectorThreadIndex;
+
+        /// <summary>
+        /// Identifies the current collection phase
+        /// </summary>
+        internal enum STWPhase {
+            Dummy,              // Not used!
+            Idle,               // No collection is taking place
+            Synchronizing,      // Attempting to stop the world
+            SingleThreaded,     // Stop-the-world phase
+        }
+
+        /// <summary>
+        /// The current state of the collector.
+        /// </summary>
+        internal static STWPhase CurrentPhase;
+
+        [PreInitRefCounts]
+        internal static void Initialize() {
+            collectorThreadIndex = -1;
+            CurrentPhase = STWPhase.Idle;
+        }
+
+        internal abstract void CollectStopped(int currentThreadIndex,
+                                              int generation);
+
+        // Implementation of GCInterface
+        internal override bool IsOnTheFlyCollector {
+            get {
+                return false;
+            }
+        }
+
+        internal override void Collect(int currentThreadIndex,
+                                       int generation)
+        {
+            int foundIndex =
+                Interlocked.CompareExchange(ref collectorThreadIndex,
+                                            currentThreadIndex, -1);
+            if (foundIndex < 0) {
+                // We are the designated collector thread
+                PerformCollection(generation);
+            } else {
+                Transitions.TakeDormantControlNoGC(currentThreadIndex);
+                // The 'foundIndex' thread may have completed its
+                // collection and another thread may have started
+                // another collection after we read
+                // 'collectorThreadIndex'.  The collector thread may
+                // have decided to wait for us before we entered
+                // DormantState, so we have to read
+                // 'collectorThreadIndex' again.
+                foundIndex = collectorThreadIndex;
+                if (foundIndex >= 0) {
+                    Thread.SignalGCEvent(foundIndex);
+                }
+                Transitions.TakeMutatorControlNoGC(currentThreadIndex);
+            }
+        }
+
+        private void PerformCollection(int generation)
+        {
+#if SINGULARITY
+            Tracing.Log(Tracing.Debug,"GC start");
+#endif
+            CollectorStatistics.Event(GCEvent.StopTheWorld);
+            CurrentPhase = STWPhase.Synchronizing;
+            StopTheWorld();
+            CurrentPhase = STWPhase.SingleThreaded;
+#if SINGULARITY
+            long preGcMemoryUsage = GC.GetTotalMemory(false);
+#if SINGULARITY_KERNEL
+#if THREAD_TIME_ACCOUNTING
+            TimeSpan ticks = Thread.CurrentThread.ExecutionTime;
+            TimeSpan ticks2 = SystemClock.KernelUpTime;
+#else
+            TimeSpan ticks = SystemClock.KernelUpTime;
+#endif
+#elif SINGULARITY_PROCESS
+#if THREAD_TIME_ACCOUNTING
+            TimeSpan ticks = ProcessService.GetThreadTime();
+            TimeSpan ticks2 = ProcessService.GetUpTime();
+#else
+            TimeSpan ticks = ProcessService.GetUpTime();
+#endif
+#endif
+#endif  //singularity
+#if SINGULARITY_KERNEL
+            bool iflag = Processor.DisableInterrupts();
+#endif
+#if SINGULARITY
+            ulong beg = Processor.GetCycleCount();
+#endif
+            // Preparation
+            GC.allocationInhibitGC = true;
+            // Verify the heap before GC
+            if (VTable.enableGCVerify) {
+                this.VerifyHeap(true);
+            }
+            // Invoke the chosen collector
+#if SINGULARITY
+            Monitoring.Log(Monitoring.Provider.GC,
+                           (ushort)GarbageCollectorEvent.StartCollection);
+#endif
+            this.CollectStopped(collectorThreadIndex, generation);
+#if SINGULARITY
+            Monitoring.Log(Monitoring.Provider.GC,
+                           (ushort)GarbageCollectorEvent.EndCollection);
+#endif
+            // Verify the heap after GC
+            if (VTable.enableGCVerify) {
+                this.VerifyHeap(false);
+            }
+            if (VTable.enableGCAccounting) {
+                MemoryAccounting.Report(GC.gcType);
+            }
+            // Cleanup
+            CollectorStatistics.Event(GCEvent.ResumeTheWorld);
+            GC.allocationInhibitGC = false;
+            CurrentPhase = STWPhase.Idle;
+#if SINGULARITY
+            long postGcMemoryUsage = GC.GetTotalMemory(false);
+#endif
+            ResumeTheWorld();
+            collectorThreadIndex = -1;
+#if SINGULARITY
+            Tracing.Log(Tracing.Debug,"GC stop");
+            long pagesCollected = preGcMemoryUsage - postGcMemoryUsage;
+#if SINGULARITY_KERNEL
+#if THREAD_TIME_ACCOUNTING
+            int procId = Thread.CurrentProcess.ProcessId;
+            ticks = Thread.CurrentThread.ExecutionTime - ticks;
+            ticks2 = SystemClock.KernelUpTime - ticks2;
+            Process.kernelProcess.SetGcPerformanceCounters(ticks, (long) pagesCollected);
+#else
+            ticks = SystemClock.KernelUpTime - ticks;
+#endif
+            Thread.CurrentProcess.SetGcPerformanceCounters(ticks, (long) pagesCollected);
+#elif SINGULARITY_PROCESS
+#if THREAD_TIME_ACCOUNTING
+            ushort procId = ProcessService.GetCurrentProcessId();
+            ticks = ProcessService.GetThreadTime()  - ticks;
+            ticks2 = ProcessService.GetUpTime() - ticks2;
+#else
+            ticks = ProcessService.GetUpTime() - ticks;
+#endif
+            ProcessService.SetGcPerformanceCounters(ticks, (long) pagesCollected);
+#endif
+
+#if DEBUG
+#if THREAD_TIME_ACCOUNTING
+            DebugStub.WriteLine("~~~~~ StopTheWorld [collected pages={0:x8}, pid={1:x3}, ms(Thread)={2:d6}, ms(System)={3:d6}, procId={4}, tid={5}]",
+                                __arglist(pagesCollected,
+                                          PageTable.processTag >> 16,
+                                          ticks.Milliseconds,
+                                          ticks2.Milliseconds,
+                                          procId,
+                                          Thread.GetCurrentThreadIndex()
+                                          ));
+#endif
+#endif
+#endif
+
+#if SINGULARITY
+            DebugStub.AddToPerfCounter(GC.perfCounter, Processor.GetCycleCount() - beg);
+#endif
+#if SINGULARITY_KERNEL
+#else
+#if false
+            DebugStub.WriteLine("GC{0} after {1,11}",
+                                __arglist(
+                                    ProcessService.GetCurrentProcessId(),
+                                    (UIntPtr)GC.installedGC.TotalMemory));
+            if (GC.installedGC.TotalMemory >= VTable.enableGCAccountingThreshold) {
+                DebugStub.WriteLine("GC memory {0,16}", __arglist(GC.installedGC.TotalMemory));
+            }
+#endif
+#endif
+
+#if SINGULARITY_KERNEL
+            Processor.RestoreInterrupts(iflag);
+#endif
+        }
+
+        internal override void CheckForNeededGCWork(Thread currentThread) {
+            while (CurrentPhase == STWPhase.Synchronizing &&
+                   currentThread.threadIndex != collectorThreadIndex) {
+                GC.InvokeCollection(currentThread);
+            }
+        }
+
+        internal override void NewThreadNotification(Thread newThread,
+                                                     bool initial)
+        {
+            base.NewThreadNotification(newThread, initial);
+            if (CurrentPhase == STWPhase.Synchronizing) {
+                Transitions.MakeGCRequest(newThread.threadIndex);
+            }
+        }
+
+        internal override void DeadThreadNotification(Thread deadThread)
+        {
+            MultiUseWord.CollectFromThread(deadThread);
+            base.DeadThreadNotification(deadThread);
+        }
+
+        internal override void ThreadDormantGCNotification(int threadIndex) {
+            int ctid = collectorThreadIndex;
+            if (ctid >= 0) {
+                Thread.SignalGCEvent(ctid);
+            }
+        }
+
+        private static void StopTheWorld() {
+#if SINGULARITY
+            //DebugStub.WriteLine("~~~~~ StopTheWorld()");
+            Monitoring.Log(Monitoring.Provider.GC,
+                           (ushort)GarbageCollectorEvent.StartStopTheWorld);
+#if SINGULARITY_KERNEL
+            TimeSpan ticks = SystemClock.KernelUpTime;
+#elif SINGULARITY_PROCESS
+            TimeSpan ticks = ProcessService.GetUpTime();
+#endif
+#endif
+            VTable.Assert(Thread.GetCurrentThreadIndex() ==
+                          collectorThreadIndex);
+            Transitions.MakeGCRequests(collectorThreadIndex);
+            // Force threads to take allocation slow path.
+            for (int i = 0; i < Thread.threadTable.Length; i++) {
+                Thread t = Thread.threadTable[i];
+                if (t != null) {
+                    BumpAllocator.Preempt(t);
+                }
+            }
+            for(int i = 0; i < Thread.threadTable.Length; i++) {
+                if (Thread.threadTable[i] == null) {
+                    continue;
+                }
+                if (i == collectorThreadIndex) {
+                    continue;
+                }
+                CollectorStatistics.Event(GCEvent.StopThread, i);
+                while (!Transitions.TakeGCControl(i) &&
+                       !Transitions.UnderGCControl(i) &&
+                       Transitions.HasGCRequest(i) &&
+                       Thread.threadTable[i] != null) {
+                    Thread.WaitForGCEvent(collectorThreadIndex);
+                }
+            }
+#if SINGULARITY
+#if SINGULARITY_KERNEL
+            ticks = SystemClock.KernelUpTime - ticks;
+#elif SINGULARITY_PROCESS
+            ticks = ProcessService.GetUpTime() - ticks;
+#endif
+                Monitoring.Log(Monitoring.Provider.GC,
+                               (ushort)GarbageCollectorEvent.EndStopTheWorld);
+#endif
+        }
+
+        private static void ResumeTheWorld() {
+            VTable.Assert(Thread.GetCurrentThreadIndex() ==
+                          collectorThreadIndex);
+            for(int i = 0; i < Thread.threadTable.Length; i++) {
+#if SINGULARITY_KERNEL
+                if (Scheduler.IsIdleThread(i)) {
+                    continue;
+                }
+#endif
+                if (i == collectorThreadIndex) {
+                    if (Transitions.HasGCRequest(i)) {
+                        Transitions.ClearGCRequest(i);
+                    }
+                } else if (Transitions.UnderGCControl(i)) {
+                    Transitions.ReleaseGCControl(i);
+                } else if (Thread.threadTable[i] != null) {
+                    Thread.SignalGCEvent(i);
+                }
+            }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/ThreadHeaderQueue.cs b/base/Kernel/Bartok/GCs/ThreadHeaderQueue.cs
new file mode 100644
index 0000000..24347d3
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/ThreadHeaderQueue.cs
@@ -0,0 +1,407 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Options;
+    using Microsoft.Bartok.Runtime;
+
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// This class defines a queue that is created as a linked list from
+    /// each thread object through pointers stored in object headers.
+    ///
+    /// This queue is used for the concurrent mark sweep collector to allow
+    /// it to trace through the heap without ever requiring allocation
+    /// or locking.
+    ///
+    /// Within a thread this is a FIFO queue; all mutations are made at the
+    /// head.
+    /// </summary>
+    internal struct ThreadHeaderQueue {
+
+        [StructLayout(LayoutKind.Sequential)]
+        [MixinConditional("ConcurrentMSGC")]
+        [Mixin(typeof(PreHeader))]
+        private struct PreHeaderQueue {
+            internal MultiUseWord muw;
+            internal UIntPtr link;
+        }
+
+        [MixinConditional("ConcurrentMSGC")]
+        [Mixin(typeof(Object))]
+        private class ThreadHeaderQueueObject : System.Object {
+            internal new PreHeaderQueue preHeader;
+        }
+
+        [Inline]
+        private static ThreadHeaderQueueObject MixinObject(Object obj) {
+            return (ThreadHeaderQueueObject) obj;
+        }
+
+        [MixinConditional("ConcurrentMSGC")]
+        [MixinConditional("AllThreadMixins")]
+        [Mixin(typeof(Thread))]
+        private class ThreadHeaderQueueThread : Object {
+            [AccessedByRuntime("referenced in brtforgc.asm")]
+            internal ThreadHeaderQueue gcQueue;
+        }
+
+        [Inline]
+        private static ThreadHeaderQueueThread MixinThread(Thread t) {
+            return (ThreadHeaderQueueThread) (Object) t;
+        }
+        
+        /// <summary>
+        /// Contains the pointer to an object that a thread is trying
+        /// to insert.
+        /// </summary>
+        internal UIntPtr newHead;
+
+        /// <summary>
+        /// Contains the pointer to the first object in the queue, or Zero
+        /// if the queue is empty.
+        /// </summary>
+        internal UIntPtr head;
+
+        /// <summary>
+        /// Contains a pointer to the object that was at the head of the
+        /// queue the last time it was 'stolen' by a consuming thread.
+        ///
+        /// If this matches the current head value then there is nothing
+        /// on the queue that has not been stolen.
+        /// </summary>
+        internal UIntPtr stolenHead;
+
+        // Contains a count of nodes that have been stolen
+        internal static long stolenCount;
+
+        internal static UIntPtr TAIL_MARKER {
+          get { return ~(UIntPtr)3U; }
+        }
+        
+        /// <summary>
+        /// Reset the queue.
+        /// </summary>
+        [Inline]
+        internal static void Reset(Thread t) {
+            MixinThread(t).gcQueue.Reset();
+        }
+
+        [Inline]
+        internal void Reset()
+        {
+            this.head = TAIL_MARKER;
+            this.newHead = TAIL_MARKER;
+            this.stolenHead = TAIL_MARKER;
+        }
+
+        /// <summary>
+        /// Is the queue empty?
+        /// </summary>
+        internal static bool IsEmpty(Thread t) {
+            return MixinThread(t).gcQueue.IsEmpty();
+        }
+
+        private bool IsEmpty() {
+            return (this.head == this.stolenHead);
+        }
+
+        [Inline]
+        private static UIntPtr QueueField(Object obj)
+        {
+            return MixinObject(obj).preHeader.link;
+        }
+
+        [Inline]
+        private static void SetQueueField(Object obj, UIntPtr value)
+        {
+            MixinObject(obj).preHeader.link = value;
+        }
+
+        private static bool ExchangeQueueField(Object obj,
+                                               UIntPtr val,
+                                               UIntPtr oldVal)
+        {
+            ThreadHeaderQueueObject obj2 = MixinObject(obj);
+            return Interlocked.CompareExchange(ref obj2.preHeader.link,
+                                               val, oldVal) == oldVal;
+        }
+
+        /// <summary>
+        /// Get the mark value from the header word of the object.
+        /// </summary>
+        [Inline]
+        internal static UIntPtr GcMark(Object obj)
+        {
+            VTable.Assert(obj != null, "Can not get mark of null");
+            return (QueueField(obj) & (UIntPtr)3U);
+        }
+
+        /// <summary>
+        /// Sets the mark value in the header word of the object.
+        /// </summary>
+        [Inline]
+        internal static void SetGcMark(UIntPtr objAddr, UIntPtr markBits)
+        {
+            SetGcMark(Magic.fromAddress(objAddr), markBits);
+        }
+
+        [Inline]
+        internal static void SetGcMark(Object obj, UIntPtr markBits)
+        {
+            SetQueueField(obj, markBits);
+        }
+
+        internal static bool IsInQueue(Object obj) {
+            return (QueueField(obj) == UIntPtr.Zero);
+        }
+
+        /// <summary>
+        /// Link a new value at the head of the queue.  It is assumed that
+        /// if the object is unmarked, the value in the header word will
+        /// simply be 'unmarkedColor'.  Returns true if the object was
+        /// marked an linked into the queue.
+        /// </summary>
+        [Inline]
+        internal static bool Push(Thread t,
+                                  UIntPtr objAddr,
+                                  UIntPtr markedColor,
+                                  UIntPtr unmarkedColor)
+        {
+            return MixinThread(t).gcQueue.Push(objAddr,
+                                               markedColor,
+                                               unmarkedColor);
+        }
+
+        [Inline]
+        private bool Push(UIntPtr objAddr,
+                          UIntPtr markedColor,
+                          UIntPtr unmarkedColor)
+        {
+            VTable.Assert(objAddr != UIntPtr.Zero, "Can not push null!");
+            this.newHead = objAddr;
+            Object obj = Magic.fromAddress(objAddr);
+            if (ExchangeQueueField(obj, this.head + markedColor,
+                                   unmarkedColor)) {
+                this.head = objAddr;
+                return true;
+            } else {
+                // Someone else enqueued the object, so restore this queue
+                this.newHead = this.head;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Link a new value at the head of the queue, knowing that the
+        /// object is a thread local object.
+        /// </summary>
+        [Inline]
+        internal static void PushUnsafe(Thread t,
+                                        Object obj,
+                                        UIntPtr markBits)
+        {
+            MixinThread(t).gcQueue.PushUnsafe(obj, markBits);
+        }
+
+        [Inline]
+        private void PushUnsafe(Object obj, UIntPtr markBits)
+        {
+            VTable.Assert(obj != null, "Can not push null!");
+            SetQueueField(obj, this.head + markBits);
+            this.newHead = Magic.addressOf(obj);
+            this.head = this.newHead;
+        }
+
+        /// <summary>
+        /// Unlink a value from the head of the queue. This
+        /// method is not thread safe.  The method is supposed to be
+        /// called only from the collector thread.
+        /// </summary>
+        [Inline]
+        internal static Object Pop(Thread thread, UIntPtr markedColor) {
+            return MixinThread(thread).gcQueue.Pop(markedColor);
+        }
+
+        [Inline]
+        private Object Pop(UIntPtr markedColor)
+        {
+            VTable.Assert(!this.IsEmpty(), "Queue is empty!");
+            Object obj = Magic.fromAddress(this.head);
+            this.head = QueueField(obj) & ~(UIntPtr)3U;
+            SetQueueField(obj, markedColor);
+            return obj;
+        }
+
+        /// <summary>
+        /// Returns the number of values in the list.  It is tolerant
+        /// of concurrent additions, although additions after the initial
+        /// read of the list head will not be counted.  It is tolerant
+        /// of concurrent steals from the list, although the count may
+        /// be truncated if the list is stolen from during the count.
+        /// </summary>
+        internal int Count {
+            get {
+                UIntPtr cachedStolenHead = this.stolenHead;
+                if (this.head == cachedStolenHead) {
+                    return 0;
+                }
+                Object obj = Magic.fromAddress(this.head);
+                UIntPtr next = QueueField(obj) & ~(UIntPtr)3U;
+                int listLength = 1;
+                while (next != cachedStolenHead &&
+                       this.stolenHead == cachedStolenHead) {
+                    listLength++;
+                    obj = Magic.fromAddress(next);
+                    next = QueueField(obj) & ~(UIntPtr)3U;
+                }
+                return listLength;
+            }
+        }
+
+        internal static void DeadThreadNotification(Thread deadThread,
+                                                    UIntPtr markedColor)
+        {
+            StealSafe(Thread.CurrentThread, deadThread, markedColor);
+        }
+
+        /// <summary>
+        /// This method attempts to take values from the passed-in queue
+        /// and place it in the 'this' queue.  It assumes that the 'this'
+        /// queue is not concurrently added to.  However, the method is
+        /// tolerant of concurrent attempts to steal from the fromQueue.
+        ///
+        /// Rather than reading the old mark value from the header word
+        /// of the tail object in the 'fromQueue', the new mark value in
+        /// said object is going to be 'markedColor'
+        ///
+        /// If any values are stolen the method returns true.
+        /// </summary>
+        internal static bool Steal(Thread toThread,
+                                   Thread fromThread,
+                                   UIntPtr markedColor)
+        {
+            ThreadHeaderQueueThread myToThread = MixinThread(toThread);
+            ThreadHeaderQueueThread myFromThread = MixinThread(fromThread);
+            return myToThread.gcQueue.StealFrom(ref myFromThread.gcQueue,
+                                                markedColor);
+        }
+
+        private bool StealFrom(ref ThreadHeaderQueue fromQueue,
+                                UIntPtr markedColor)
+        {
+            UIntPtr fromHead, fromTail;
+            if (fromQueue.Steal(out fromHead, out fromTail)) {
+                // Prepend the stolen list segment to our list
+                this.newHead = fromHead;
+                Object tailObject = Magic.fromAddress(fromTail);
+                SetQueueField(tailObject, this.head + markedColor);
+                this.head = fromHead;
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// This method attempts to take values from the passed-in queue
+        /// and place it in the 'this' queue.  The method is tolerant of
+        /// concurrent attempts to add to the 'this' queue and is
+        /// tolerant of concurrent attempts to steal from the fromQueue.
+        ///
+        /// Rather than reading the old mark value from the header word
+        /// of the tail object in the 'fromQueue', the new mark value in
+        /// said object is going to be 'markedColor'
+        ///
+        /// If any values are stolen the method returns true.
+        /// </summary>
+        internal static void StealSafe(Thread toThread,
+                                       Thread fromThread,
+                                       UIntPtr markedColor)
+        {
+            ThreadHeaderQueueThread myToThread = MixinThread(toThread);
+            ThreadHeaderQueueThread myFromThread = MixinThread(fromThread);
+            myToThread.gcQueue.StealFromSafe(ref myFromThread.gcQueue,
+                                             markedColor);
+        }
+
+        private void StealFromSafe(ref ThreadHeaderQueue fromQueue,
+                                   UIntPtr markedColor)
+        {
+            UIntPtr fromHead, fromTail;
+            this.newHead = fromQueue.head;
+            if (fromQueue.Steal(out fromHead, out fromTail)) {
+                VTable.Assert(this.newHead == fromHead);
+                // Prepend the stolen list segment to our list
+                UIntPtr thisHead = this.head;
+                while (Interlocked.CompareExchange(ref this.newHead,
+                                                   fromHead, thisHead) !=
+                       thisHead) {
+                    thisHead = this.head;
+                }
+                // We have won exclusive rights to insert into 'this'.
+                Object tailObject = Magic.fromAddress(fromTail);
+                SetQueueField(tailObject, thisHead + markedColor);
+                this.head = fromHead;
+            } else {
+                this.newHead = this.head;
+            }
+        }
+
+        private bool Steal(out UIntPtr stolenHead, out UIntPtr stolenTail)
+        {
+            while (true) {
+                UIntPtr thisStolen = this.stolenHead;
+                UIntPtr thisHead = this.head;
+                while (thisStolen != thisHead) {
+                    if (Interlocked.CompareExchange(ref this.stolenHead,
+                                                    thisHead, thisStolen) ==
+                        thisStolen) {
+                        // We managed to steal part of the list.
+                        // Find the end of the stolen list segment.
+                        Object obj = Magic.fromAddress(thisHead);
+                        UIntPtr next =
+                            QueueField(obj) & ~(UIntPtr)3U;
+                        int listLength = 0;
+                        while (next != thisStolen) {
+                            listLength++;
+                            obj = Magic.fromAddress(next);
+                            next = QueueField(obj) & ~(UIntPtr)3U;
+                        }
+                        stolenCount += listLength;
+                        stolenHead = thisHead;
+                        stolenTail = Magic.addressOf(obj);
+                        return true;
+                    }
+                    thisStolen = this.stolenHead;
+                    thisHead = this.head;
+                }
+                if (this.newHead == thisHead) {
+                    // There is nothing to steal.
+                    stolenHead = UIntPtr.Zero;
+                    stolenTail = UIntPtr.Zero;
+                    return false;
+                }
+                // Someone must be in the process of inserting something
+                // into the queue.
+                Thread.Yield();
+            }
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/Trace.cs b/base/Kernel/Bartok/GCs/Trace.cs
new file mode 100644
index 0000000..95c588f
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/Trace.cs
@@ -0,0 +1,83 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+  internal class Trace {
+      [Flags]
+      internal enum Area {
+          Pointer  = 0x01,
+          Page     = 0x02,
+          Heap     = 0x04,
+          Stack    = 0x08,
+          Thread   = 0x10,
+          Allocate = 0x20,
+          Emu      = 0x40
+      }
+
+      internal static Area filterArea = 0;
+
+      internal static UIntPtr filter;
+      internal static UIntPtr filterLow;
+      internal static UIntPtr filterHigh;
+
+      [System.Diagnostics.Conditional("TRACE")]
+      internal static void Log(Area area, String v, __arglist) {
+          if ((area & Trace.filterArea) == 0) {
+              return;
+          }
+
+          bool tryFind = false;
+          bool found = false;
+          if (filter != UIntPtr.Zero) {
+              tryFind = true;
+              ArgIterator argsFilter = new ArgIterator(__arglist);
+
+              while (argsFilter.GetRemainingCount() > 0) {
+                  TypedReference tr = argsFilter.GetNextArg();
+                  Type t = __reftype(tr);
+                  if (t == typeof(System.UIntPtr)) {
+                      UIntPtr u = __refvalue(tr, UIntPtr);
+                      if (u == filter) {
+                          found = true;
+                          break;
+                      }
+                  }
+              }
+          }
+
+          if (!found && (filterLow != UIntPtr.Zero)) {
+              tryFind = true;
+              ArgIterator argsFilter = new ArgIterator(__arglist);
+
+              while (argsFilter.GetRemainingCount() > 0) {
+                  TypedReference tr = argsFilter.GetNextArg();
+                  Type t = __reftype(tr);
+                  if (t == typeof(System.UIntPtr)) {
+                      UIntPtr u = __refvalue(tr, UIntPtr);
+                      if ((u >= filterLow) && (u <= filterHigh)) {
+                          found = true;
+                          break;
+                      }
+                  }
+              }
+          }
+
+          if (tryFind && !found) {
+             return;
+          }
+
+          ArgIterator args = new ArgIterator(__arglist);
+          VTable.DebugPrint(v, args);
+          VTable.DebugPrint("\n");
+      }
+  }
+}
diff --git a/base/Kernel/Bartok/GCs/Transitions.cs b/base/Kernel/Bartok/GCs/Transitions.cs
new file mode 100644
index 0000000..405e495
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/Transitions.cs
@@ -0,0 +1,835 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+#if SINGULARITY
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.X86;
+#endif
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity.Scheduling;
+#endif
+
+    internal class Transitions
+    {
+
+        // Synchronization among threads for GC:
+        //
+        // We keep an integer for each thread.
+        // The possible values are:
+
+#if SINGULARITY_KERNEL
+        // Thread is dormant or in unmanaged code and a GC would be ok
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int DormantState      =   0x1;
+        // Thread is running in managed code and not ready for GC
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int MutatorState      =   0x2;
+        // GC work is desired
+        private const int GCRequest         =   0x4;
+        // Thread is under GC control
+        private const int GCControl         =   0x8;
+        // Thread is dormant in the application space
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int OtherDormantState =  0x10;
+        // Thread is running in the application space
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int OtherMutatorState =  0x20;
+        // GC work is desired in the application space
+        private const int OtherGCRequest    =  0x40;
+        // Application thread is under GC control
+        private const int OtherGCControl    =  0x80;
+#else
+        // Thread is dormant or in unmanaged code and a GC would be ok
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int DormantState      =  0x10;
+        // Thread is running in managed code and not ready for GC
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int MutatorState      =  0x20;
+        // GC work is desired.  Must be a power of 2.
+        private const int GCRequest         =  0x40;
+        // Thread is under GC control.  Must be a power of 2.
+        private const int GCControl         =  0x80;
+        // Thread is dormant in the kernel space
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int OtherDormantState =   0x1;
+        // Thread is running in the kernel space
+        [AccessedByRuntime("Referenced in halforgc.asm")]
+        private const int OtherMutatorState =   0x2;
+#endif // SINGULARITY_KERNEL
+
+        internal static bool        fInitializedRuntime;
+
+        internal static void RuntimeInitialized() {
+            fInitializedRuntime = true;
+        }
+
+#if SINGULARITY_KERNEL
+        [Inline]
+        internal static unsafe
+        void InitializeStatusWord(ref ThreadContext threadContext)
+        {
+            int oldValue, newValue;
+            do {
+                oldValue = threadContext.gcStates;
+                newValue = ((oldValue|DormantState|OtherDormantState)&
+                            ~(MutatorState|GCRequest|GCControl|
+                              OtherMutatorState|OtherGCRequest|OtherGCControl));
+            } while (!CompareAndSwap(ref threadContext.gcStates,
+                                     newValue, oldValue));
+        }
+#endif
+
+        // Code outside of the GC will move threads between
+        // MutatorState and DormantState.  This should be done with
+        // the TakeMutatorControl and TakeDormantControl methods.  The
+        // garbage collectors can request that they be notified when
+        // threads go dormant.  They do this by calling the
+        // MakeGCRequests method.  The TakeMutatorControl and
+        // TakeDormantControl methods are then supposed to do the
+        // right thing.
+
+        [Inline]
+        private static bool CompareAndSwap(ref int word,
+                                           int newValue,
+                                           int oldValue)
+        {
+            return (Interlocked.CompareExchange(ref word, newValue, oldValue)
+                    == oldValue);
+        }
+
+        #region Transition Methods (Methods corresponding to macro transitions)
+
+        // To be called when a thread is created
+        internal static void NewThreadNotification(int newThreadIndex,
+                                                   bool initial)
+        {
+#if SINGULARITY_PROCESS
+            if (initial) {
+                VTable.Assert(InMutatorState(newThreadIndex));
+                return;
+            }
+#endif
+            VTable.Assert(InDormantState(newThreadIndex));
+        }
+
+        // To be called when a thread is terminated/terminating
+        internal static void DeadThreadNotification(int deadThreadIndex)
+        {
+            VTable.Assert(Thread.threadTable[deadThreadIndex] == null);
+            VTable.Assert(InDormantState(deadThreadIndex));
+            if (Transitions.HasGCRequest(deadThreadIndex)) {
+                GC.ThreadDormantGCNotification(deadThreadIndex);
+            }
+        }
+
+#if SINGULARITY
+#if SINGULARITY_KERNEL
+        // To be called at the beginning of a thread
+        internal static unsafe void ThreadStart() {
+            ThreadContext *currentThreadContext =
+                Processor.GetCurrentThreadContext();
+            TakeMutatorControlNoGC(currentThreadContext);
+        }
+#else
+        // To be called at the beginning of a thread
+        internal static unsafe void ThreadStart() {
+            ThreadContext *currentThreadContext =
+                Processor.GetCurrentThreadContext();
+            // The thread has been started in the kernel.  We need
+            // to ensure that the transition to application space
+            // is completed properly.
+            EnsureMutatorControlNoGC(currentThreadContext);
+        }
+#endif
+
+#else // SINGULARITY
+
+        // To be called at the beginning of a thread
+        internal static void ThreadStart(int currentThreadIndex) {
+            VTable.Assert(InDormantState(currentThreadIndex));
+            TakeMutatorControlNoGC(currentThreadIndex);
+        }
+
+#endif // SINGULARITY
+
+        // To be called at the end of a thread
+        internal static void ThreadEnd(int currentThreadIndex) {
+            VTable.Assert(InMutatorState(currentThreadIndex));
+            TakeDormantControl(currentThreadIndex);
+        }
+
+#if SINGULARITY
+
+        [AccessedByRuntime("called from halforgc.asm")]
+        internal static unsafe
+        void LeaveManagedSpace(ThreadContext *currentThreadContext)
+        {
+            TransferMutatorControl(currentThreadContext);
+        }
+
+        // To be used for returning from calls to outside managed space
+        [AccessedByRuntime("called from halforgc.asm")]
+        [Inline]
+        internal static unsafe
+        void ReturnToManagedSpace(ThreadContext *currentThreadContext)
+        {
+            EnsureMutatorControl(currentThreadContext);
+        }
+
+#if SINGULARITY_KERNEL
+
+        [AccessedByRuntime("called from halforgc.asm")]
+        internal static unsafe
+        void SuspendThread(ThreadContext *currentThreadContext)
+        {
+            TakeDormantControl(currentThreadContext);
+        }
+
+        [AccessedByRuntime("called from halforgc.asm")]
+        internal static unsafe
+        void ReviveThread(ThreadContext *currentThreadContext)
+        {
+            TakeMutatorControl(currentThreadContext);
+        }
+
+#endif // SINGULARITY_KERNEL
+
+#else // SINGULARITY
+
+        // To be used for calls to outside managed space
+        [AccessedByRuntime("called from halforgc.asm")]
+        [Inline]
+        [ManualRefCounts]
+        internal static void LeaveManagedSpace(Thread currentThread) {
+            TakeDormantControl(currentThread.threadIndex);
+        }
+
+        // To be used for returning from calls to outside managed space
+        [AccessedByRuntime("called from halforgc.asm")]
+        [Inline]
+        internal static Thread ReturnToManagedSpace(int currentThreadIndex) {
+            TakeMutatorControl(currentThreadIndex);
+            return Thread.threadTable[currentThreadIndex];
+        }
+
+#endif // SINGULARITY
+
+        // For the LoadFunction stub for PInvoke methods
+        [RequiredByBartok]
+        internal static void EnterLoadFunctionStub() {
+            TakeMutatorControl(Thread.GetCurrentThreadIndex());
+        }
+
+        // For the LoadFunction stub for PInvoke methods
+        [RequiredByBartok]
+        internal static void LeaveLoadFunctionStub() {
+            TakeDormantControl(Thread.GetCurrentThreadIndex());
+        }
+
+        #endregion
+
+        internal static void MakeGCRequests(int excludedThreadIndex) {
+            int limit = Thread.threadTable.Length;
+            for (int i = 0; i < limit; i++) {
+                if (Thread.threadTable[i] != null &&
+                    i != excludedThreadIndex) {
+                    MakeGCRequest(i);
+                }
+            }
+        }
+
+        #region Helper Functions (Independent of where statusWord is)
+
+        [Inline]
+        private static bool fInDormantState(int statusWord) {
+            return ((statusWord & DormantState) != 0);
+        }
+
+        [Inline]
+        private static bool fInMutatorState(int statusWord) {
+            return ((statusWord & MutatorState) != 0);
+        }
+
+        [Inline]
+        private static bool fHasGCRequest(int statusWord) {
+            return ((statusWord & GCRequest) != 0);
+        }
+
+        [Inline]
+        private static bool fUnderGCControl(int statusWord) {
+            return ((statusWord & GCControl) != 0);
+        }
+
+        [Inline]
+        private static void TakeDormantControl(ref int statusWord,
+                                               int threadIndex)
+        {
+            VTable.Assert(fInMutatorState(statusWord));
+            VTable.Deny(fInDormantState(statusWord));
+            int oldValue, newValue;
+            do {
+                oldValue = statusWord;
+                newValue = (oldValue|DormantState) & ~MutatorState;
+            } while (!CompareAndSwap(ref statusWord, newValue, oldValue));
+            if (fHasGCRequest(newValue)) {
+                GC.ThreadDormantGCNotification(threadIndex);
+            }
+        }
+
+        [Inline]
+        private static void TakeDormantControlNoGC(ref int statusWord) {
+            VTable.Assert(fInMutatorState(statusWord));
+            VTable.Deny(fInDormantState(statusWord));
+            int oldValue, newValue;
+            do {
+                oldValue = statusWord;
+                newValue = (oldValue|DormantState) & ~MutatorState;
+            } while (!CompareAndSwap(ref statusWord, newValue, oldValue));
+        }
+
+        [Inline]
+        private static void TransferMutatorControl(ref int statusWord,
+                                                   int threadIndex)
+        {
+            if (!CompareAndSwap(ref statusWord,
+                                DormantState|OtherMutatorState,
+                                MutatorState|OtherDormantState)) {
+                TakeDormantControl(ref statusWord, threadIndex);
+            }
+        }
+
+        [Inline]
+        private static void EnsureMutatorControl(ref int statusWord,
+                                                 int currentThreadIndex)
+        {
+            if (!fInMutatorState(statusWord)) {
+                TakeMutatorControl(ref statusWord, currentThreadIndex);
+            }
+            VTable.Deny(fInDormantState(statusWord));
+            VTable.Deny(fUnderGCControl(statusWord));
+        }
+
+        [Inline]
+        private static void EnsureMutatorControlNoGC(ref int statusWord,
+                                                     int currentThreadIndex)
+        {
+            if (!fInMutatorState(statusWord)) {
+                TakeMutatorControlNoGC(ref statusWord, currentThreadIndex);
+            }
+            VTable.Deny(fInDormantState(statusWord));
+            VTable.Deny(fUnderGCControl(statusWord));
+        }
+
+#if SINGULARITY
+        [AccessedByRuntime("referenced from halasm.asm")]
+        [NoStackLinkCheck]
+        internal static unsafe void RestoreMutatorControlIfNeeded()
+        {
+            ThreadContext *currentThreadContext =
+                Processor.GetCurrentThreadContext();
+            if (!Transitions.InMutatorState(currentThreadContext)) {
+                // NOTE: There is a window where OtherMutatorControl may be
+                // set simultaneously with OtherGCRequest.  When clearing
+                // OtherMutatorControl and setting OtherDormantControl, the
+                // normal thing to do is to check for a GC request, but in
+                // this case it doesn't matter as this code is only run
+                // when an kernel exception is supposed to pass over an
+                // application stack segment.
+                int oldValue, newValue;
+                do {
+                    oldValue = currentThreadContext->gcStates;
+                    if (fUnderGCControl(oldValue)) {
+                        Thread.WaitForGCEvent(currentThreadContext->threadIndex);
+                    }
+                    newValue = ((oldValue|MutatorState|OtherDormantState) &
+                                ~(DormantState|OtherMutatorState));
+                } while (!CompareAndSwap(ref currentThreadContext->gcStates,
+                                         newValue, oldValue));
+            }
+        }
+#endif
+
+        [Inline]
+        private static void TakeMutatorControl(ref int statusWord,
+                                               int currentThreadIndex)
+        {
+            if (!SwitchToMutatorState(ref statusWord)) {
+                TakeMutatorControlSlow(ref statusWord, currentThreadIndex);
+            }
+            VTable.Assert(fInMutatorState(statusWord));
+            VTable.Deny(fInDormantState(statusWord));
+            VTable.Deny(fUnderGCControl(statusWord));
+        }
+
+        [Inline]
+        private static void TakeMutatorControlNoGC(ref int statusWord,
+                                                   int currentThreadIndex)
+        {
+            if (!SwitchToMutatorState(ref statusWord)) {
+                TakeMutatorControlSlowNoGC(ref statusWord, currentThreadIndex);
+            }
+            VTable.Assert(fInMutatorState(statusWord));
+            VTable.Deny(fInDormantState(statusWord));
+            VTable.Deny(fUnderGCControl(statusWord));
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        private static void TakeMutatorControlSlow(ref int statusWord,
+                                                   int currentThreadIndex)
+        {
+            while (true) {
+                if (SwitchToMutatorState(ref statusWord)) {
+                    break;
+                }
+                if (SwitchToMutatorStateWithGCRequest(ref statusWord)) {
+                    Thread currentThread =
+                        Thread.threadTable[currentThreadIndex];
+                    GC.InvokeCollection(currentThread);
+                    break;
+                }
+                if (fUnderGCControl(statusWord)) {
+                    Thread.WaitForGCEvent(currentThreadIndex);
+                }
+            }
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        private static void TakeMutatorControlSlowNoGC(ref int statusWord,
+                                                       int currentThreadIndex)
+        {
+            while (true) {
+                if (SwitchToMutatorState(ref statusWord)) {
+                    break;
+                }
+                if (SwitchToMutatorStateWithGCRequest(ref statusWord)) {
+                    // Do not call the GC, even though a GC handshake
+                    // has been requested.
+                    break;
+                }
+                if (fUnderGCControl(statusWord)) {
+                    Thread.WaitForGCEvent(currentThreadIndex);
+                }
+            }
+        }
+
+        [Inline]
+        private static bool SwitchToMutatorState(ref int statusWord) {
+            VTable.Deny(fInMutatorState(statusWord),
+                        "Thread is already under mutator control");
+            VTable.Assert(fInDormantState(statusWord));
+            int oldValue = statusWord & ~(GCRequest|GCControl);
+            int newValue = (oldValue|MutatorState) & ~DormantState;
+            return CompareAndSwap(ref statusWord, newValue, oldValue);
+        }
+
+        [Inline]
+        private static
+        bool SwitchToMutatorStateWithGCRequest(ref int statusWord)
+        {
+            int oldValue = ((statusWord|DormantState|GCRequest) & ~GCControl);
+            int newValue = (oldValue|MutatorState) & ~DormantState;
+            return CompareAndSwap(ref statusWord, newValue, oldValue);
+        }
+
+        [Inline]
+        private static bool TakeGCControl(ref int statusWord) {
+            int oldValue, newValue;
+            do {
+                oldValue = statusWord;
+                if (!fInDormantState(oldValue) ||
+                    !fHasGCRequest(oldValue) ||
+                    fUnderGCControl(oldValue)) {
+                    return false;
+                }
+                newValue = oldValue|GCControl;
+            } while (!CompareAndSwap(ref statusWord, newValue, oldValue));
+            return true;
+        }
+
+        [Inline]
+        private static void ReleaseGCControl(ref int statusWord,
+                                             int threadIndex)
+        {
+            VTable.Assert(fInDormantState(statusWord));
+            VTable.Assert(fHasGCRequest(statusWord));
+            VTable.Assert(fUnderGCControl(statusWord));
+            // There is only one possible transition out of this state.
+            int oldValue, newValue;
+            do {
+                oldValue = statusWord;
+                newValue = ((oldValue|DormantState)&
+                            ~(MutatorState|GCRequest|GCControl));
+            } while (!CompareAndSwap(ref statusWord, newValue, oldValue));
+            Thread.SignalGCEvent(threadIndex);
+        }
+
+        private static void MakeGCRequest(ref int statusWord,
+                                          int threadIndex)
+        {
+#if SINGULARITY_KERNEL
+            if (Scheduler.IsIdleThread(threadIndex)) {
+                return;
+            }
+#endif
+            int oldStatus, newStatus;
+            do {
+                oldStatus = statusWord;
+                newStatus = oldStatus|GCRequest;
+            } while (!CompareAndSwap(ref statusWord, newStatus, oldStatus));
+        }
+
+        private static void ClearGCRequest(ref int statusWord,
+                                           int threadIndex)
+        {
+            VTable.Assert(fHasGCRequest(statusWord));
+            VTable.Assert(fInMutatorState(statusWord));
+            int oldStatus, newStatus;
+            do {
+                oldStatus = statusWord;
+                newStatus = (oldStatus & ~GCRequest);
+            } while (!CompareAndSwap(ref statusWord, newStatus, oldStatus));
+        }
+        #endregion
+
+#if SINGULARITY
+
+        [Inline]
+        private static unsafe
+        ThreadContext *GetCurrentThreadContext(int currentThreadIndex) {
+            VTable.Assert(GetThreadContext(currentThreadIndex) ==
+                          Processor.GetCurrentThreadContext());
+            return Processor.GetCurrentThreadContext();
+        }
+
+        [Inline]
+        private static unsafe
+        ThreadContext *GetThreadContext(int threadIndex) {
+            Thread thread = Thread.threadTable[threadIndex];
+            if (thread == null) {
+                return null;
+            } else {
+#if SINGULARITY_KERNEL
+                fixed (ThreadContext *result = &thread.context) {
+                    return result;
+                }
+#else
+                return thread.context;
+#endif
+            }
+        }
+
+#endif
+
+        #region Dependent (Methods depending on location of the status word)
+
+#if SINGULARITY
+
+        [PreInitRefCounts]
+        internal static void Initialize()
+        {
+        }
+
+        // To be used for callbacks into managed space
+        [RequiredByBartok]
+        [Inline]
+        internal static unsafe void EntryIntoManagedSpace() {
+            ThreadContext *currentThreadContext =
+                Processor.GetCurrentThreadContext();
+            EnsureMutatorControl(currentThreadContext);
+        }
+
+        // To be used for returning from a callback into managed space
+        [RequiredByBartok]
+        [Inline]
+        internal static unsafe void ReturnFromManagedSpace() {
+            ThreadContext *currentThreadContext =
+                Processor.GetCurrentThreadContext();
+            TransferMutatorControl(currentThreadContext);
+        }
+
+        // To be used for returning from a callback into managed space
+        // from another managed space that doesn't want the automatic
+        // transition back to its mutator state.
+        [RequiredByBartok]
+        [Inline]
+        internal static unsafe void ReturnFromManagedSpaceNoCallerTransition()
+        {
+            ThreadContext *currentThreadContext =
+                Processor.GetCurrentThreadContext();
+            TakeDormantControl(currentThreadContext);
+        }
+
+        [Inline]
+        internal static unsafe bool InDormantState(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            return (threadContext == null ||
+                    fInDormantState(threadContext->gcStates));
+        }
+
+        [Inline]
+        internal static unsafe bool InMutatorState(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            return InMutatorState(threadContext);
+        }
+
+        [Inline]
+        internal static unsafe bool InMutatorState(ThreadContext *threadContext)
+        {
+            return (threadContext != null &&
+                    fInMutatorState(threadContext->gcStates));
+        }
+
+        [Inline]
+        internal static unsafe bool HasGCRequest(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            return (threadContext != null &&
+                    fHasGCRequest(threadContext->gcStates));
+        }
+
+        [Inline]
+        internal static unsafe bool UnderGCControl(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            return (threadContext != null &&
+                    fUnderGCControl(threadContext->gcStates));
+        }
+
+        [Inline]
+        internal static unsafe void TakeDormantControl(int threadIndex)
+        {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            TakeDormantControl(ref threadContext->gcStates, threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TakeDormantControl(ThreadContext *threadContext)
+        {
+            TakeDormantControl(ref threadContext->gcStates,
+                               threadContext->threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TakeDormantControlNoGC(int currentThreadIndex)
+        {
+            ThreadContext *threadContext =
+                GetCurrentThreadContext(currentThreadIndex);
+            TakeDormantControlNoGC(ref threadContext->gcStates);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TakeMutatorControl(int currentThreadIndex)
+        {
+            ThreadContext *threadContext =
+                GetCurrentThreadContext(currentThreadIndex);
+            TakeMutatorControl(threadContext);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TakeMutatorControlNoGC(int currentThreadIndex)
+        {
+            ThreadContext *threadContext =
+                GetCurrentThreadContext(currentThreadIndex);
+            TakeMutatorControlNoGC(threadContext);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TakeMutatorControl(ThreadContext *threadContext)
+        {
+            TakeMutatorControl(ref threadContext->gcStates,
+                               threadContext->threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TakeMutatorControlNoGC(ThreadContext *threadContext)
+        {
+            TakeMutatorControlNoGC(ref threadContext->gcStates,
+                                   threadContext->threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void TransferMutatorControl(ThreadContext *currentThreadContext)
+        {
+            TransferMutatorControl(ref currentThreadContext->gcStates,
+                                   currentThreadContext->threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void EnsureMutatorControl(ThreadContext *currentThreadContext)
+        {
+            EnsureMutatorControl(ref currentThreadContext->gcStates,
+                                 currentThreadContext->threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void EnsureMutatorControlNoGC(ThreadContext *currentThreadContext)
+        {
+            EnsureMutatorControlNoGC(ref currentThreadContext->gcStates,
+                                     currentThreadContext->threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe
+        void EnsureDormantControl(int currentThreadIndex) {
+            ThreadContext *threadContext =
+                GetCurrentThreadContext(currentThreadIndex);
+            if (!fInDormantState(threadContext->gcStates)) {
+                TakeDormantControlNoGC(ref threadContext->gcStates);
+            }
+        }
+
+        [Inline]
+        internal static unsafe bool TakeGCControl(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            return (threadContext != null &&
+                    TakeGCControl(ref threadContext->gcStates));
+        }
+
+        [Inline]
+        internal static unsafe void ReleaseGCControl(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            ReleaseGCControl(ref threadContext->gcStates, threadIndex);
+        }
+
+        [Inline]
+        internal static unsafe void MakeGCRequest(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            if (threadContext != null) {
+                MakeGCRequest(ref threadContext->gcStates, threadIndex);
+            }
+        }
+
+        [Inline]
+        internal static unsafe void ClearGCRequest(int threadIndex) {
+            ThreadContext *threadContext = GetThreadContext(threadIndex);
+            if (threadContext != null) {
+                ClearGCRequest(ref threadContext->gcStates, threadIndex);
+            }
+        }
+#else
+
+        private static int[]       gcReadyTable;
+
+        [PreInitRefCounts]
+        internal static void Initialize()
+        {
+            // gcReadyTable = new int[Thread.maxThreads];
+            gcReadyTable = (int[])
+                GCs.BootstrapMemory.Allocate(typeof(int[]), Thread.maxThreads);
+            for (int i = 0; i < gcReadyTable.Length; i++) {
+                gcReadyTable[i] = DormantState;
+            }
+        }
+
+        // To be used for callbacks into managed space
+        [RequiredByBartok]
+        [Inline]
+        internal static void EntryIntoManagedSpace() {
+            int currentThreadIndex = Thread.GetCurrentThreadIndex();
+            TakeMutatorControl(currentThreadIndex);
+        }
+
+        // To be used for returning from a callback into managed space
+        [RequiredByBartok]
+        [Inline]
+        internal static void ReturnFromManagedSpace() {
+            TakeDormantControl(Thread.GetCurrentThreadIndex());
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void ReturnFromManagedSpaceNoCallerTransition() {
+            TakeDormantControl(Thread.GetCurrentThreadIndex());
+        }
+
+        [Inline]
+        internal static bool InDormantState(int threadIndex) {
+            return fInDormantState(gcReadyTable[threadIndex]);
+        }
+
+        [Inline]
+        internal static bool InMutatorState(int threadIndex) {
+            return fInMutatorState(gcReadyTable[threadIndex]);
+        }
+
+        [Inline]
+        internal static bool HasGCRequest(int threadIndex) {
+            return fHasGCRequest(gcReadyTable[threadIndex]);
+        }
+
+        [Inline]
+        internal static bool UnderGCControl(int threadIndex) {
+            return fUnderGCControl(gcReadyTable[threadIndex]);
+        }
+
+        [Inline]
+        internal static void TakeDormantControl(int currentThreadIndex) {
+            TakeDormantControl(ref gcReadyTable[currentThreadIndex],
+                               currentThreadIndex);
+        }
+
+        [Inline]
+        internal static void TakeDormantControlNoGC(int currentThreadIndex) {
+            TakeDormantControlNoGC(ref gcReadyTable[currentThreadIndex]);
+        }
+
+        [Inline]
+        internal static void TakeMutatorControl(int currentThreadIndex) {
+            TakeMutatorControl(ref gcReadyTable[currentThreadIndex],
+                               currentThreadIndex);
+        }
+
+        [Inline]
+        internal static void TakeMutatorControlNoGC(int currentThreadIndex) {
+            TakeMutatorControlNoGC(ref gcReadyTable[currentThreadIndex],
+                                   currentThreadIndex);
+        }
+
+        [Inline]
+        internal static bool TakeGCControl(int threadIndex) {
+            return TakeGCControl(ref gcReadyTable[threadIndex]);
+        }
+
+        [Inline]
+        internal static void ReleaseGCControl(int threadIndex) {
+            ReleaseGCControl(ref gcReadyTable[threadIndex], threadIndex);
+        }
+
+        [Inline]
+        internal static void MakeGCRequest(int threadIndex) {
+            MakeGCRequest(ref gcReadyTable[threadIndex], threadIndex);
+        }
+
+        [Inline]
+        internal static void ClearGCRequest(int threadIndex) {
+            ClearGCRequest(ref gcReadyTable[threadIndex], threadIndex);
+        }
+#endif
+
+        #endregion
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/UIntPtrQueue.cs b/base/Kernel/Bartok/GCs/UIntPtrQueue.cs
new file mode 100644
index 0000000..3bc64b0
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/UIntPtrQueue.cs
@@ -0,0 +1,237 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+  using System.Runtime.CompilerServices;
+  using System.Threading;
+
+  internal unsafe struct UIntPtrQueue {
+
+      private UnmanagedPageList pageList;
+      private UIntPtr readPage;
+      private PageCursor readCursor;
+      private PageCursor writeCursor;
+
+      internal bool IsEmpty {
+          [Inline]
+          get { return (this.readCursor.cursor == this.writeCursor.cursor); }
+      }
+
+      internal void Write(UIntPtr value) {
+          if (this.writeCursor.IsEmpty) {
+              this.AdvanceWritePage();
+          }
+          if (this.readCursor.limit == this.writeCursor.cursor) {
+              this.writeCursor.Write(value);
+              this.readCursor.limit = this.writeCursor.cursor;
+          } else {
+              this.writeCursor.Write(value);
+          }
+      }
+
+      internal void Write(UIntPtr value1, UIntPtr value2) {
+          if (this.writeCursor.HasTwo) {
+              if (this.readCursor.limit == this.writeCursor.cursor) {
+                  this.writeCursor.Write(value1);
+                  this.writeCursor.Write(value2);
+                  this.readCursor.limit = this.writeCursor.cursor;
+              } else {
+                  this.writeCursor.Write(value1);
+                  this.writeCursor.Write(value2);
+              }
+          } else {
+              this.Write(value1);
+              this.Write(value2);
+          }
+      }
+
+      internal UIntPtr Read() {
+          if (this.readCursor.IsEmpty) {
+              this.AdvanceReadPage();
+          }
+          return this.readCursor.Read();
+      }
+
+      internal UIntPtr Read(out UIntPtr value2) {
+          if (this.readCursor.HasTwo) {
+              UIntPtr value1 = this.readCursor.Read();
+              value2 = this.readCursor.Read();
+              return value1;
+          } else {
+              UIntPtr value1 = this.Read();
+              value2 = this.Read();
+              return value1;
+          }
+      }
+
+      internal void Cleanup(bool mustBeEmpty) {
+          if (mustBeEmpty) {
+              VTable.Assert(this.pageList.Head == this.pageList.Tail);
+              VTable.Assert(this.readCursor.cursor == this.writeCursor.cursor);
+          }
+          if (this.readPage != UIntPtr.Zero) {
+              UnmanagedPageList.pageCache.AddHead(this.readPage);
+              this.readPage = UIntPtr.Zero;
+          }
+          while (!this.pageList.IsEmpty) {
+              UIntPtr headPage = this.pageList.RemoveHead();
+              UnmanagedPageList.pageCache.AddHead(headPage);
+          }
+          this.writeCursor = new PageCursor(null, null);
+          this.readCursor = new PageCursor(null, null);
+      }
+
+      private void AdvanceReadPage() {
+          if (this.pageList.IsEmpty) {
+              return;
+          }
+          if (this.readPage != UIntPtr.Zero) {
+              UnmanagedPageList.pageCache.AddHead(this.readPage);
+          }
+          this.readPage = this.pageList.RemoveHead();
+          UIntPtr* startPtr = UnmanagedPageList.FirstPageAddr(this.readPage);
+          UIntPtr* limitPtr;
+          if (this.pageList.IsEmpty) {
+              limitPtr = this.writeCursor.cursor;
+          } else {
+              limitPtr = UnmanagedPageList.EndPageAddr(this.readPage);
+          }
+          this.readCursor = new PageCursor(startPtr, limitPtr);
+      }
+
+      private void AdvanceWritePage() {
+          UIntPtr pageAddr;
+          if (UnmanagedPageList.pageCache.IsEmpty) {
+              bool fCleanPages = true;
+              UIntPtr page = PageManager.EnsurePages(null, (UIntPtr) 1,
+                                                     PageType.System,
+                                                     ref fCleanPages);
+              pageAddr = PageTable.PageAddr(page);
+          } else {
+              pageAddr = UnmanagedPageList.pageCache.RemoveHead();
+          }
+          this.pageList.AddTail(pageAddr);
+          this.writeCursor =
+              new PageCursor(UnmanagedPageList.FirstPageAddr(pageAddr),
+                             UnmanagedPageList.EndPageAddr(pageAddr));
+      }
+
+      private struct PageCursor {
+          internal UIntPtr *cursor;
+          internal UIntPtr *limit;
+
+          internal PageCursor(UIntPtr *start, UIntPtr *limit) {
+              this.cursor = start;
+              this.limit = limit;
+          }
+
+          internal bool IsEmpty {
+              [Inline]
+              get { return this.cursor == this.limit; }
+          }
+
+          internal bool HasTwo {
+              [Inline]
+              get { return (this.cursor + 2 <= this.limit); }
+          }
+
+          [Inline]
+          internal void Write(UIntPtr value) {
+              VTable.Deny(this.IsEmpty);
+              *this.cursor++ = value;
+          }
+
+          [Inline]
+          internal UIntPtr Read() {
+              VTable.Deny(this.IsEmpty);
+              return *this.cursor++;
+          }
+
+          internal bool MoveNext() {
+              if (this.IsEmpty) {
+                  return false;
+              }
+              this.cursor++;
+              return (!this.IsEmpty);
+          }
+
+          internal UIntPtr Current {
+              get { return *this.cursor; }
+          }
+
+          internal UIntPtr* CurrentAddr {
+              get { return this.cursor; }
+          }
+
+      }
+
+      internal unsafe struct Enumerator {
+
+          private UnmanagedPageList.Enumerator pageEnumerator;
+          private UIntPtr lastPageStart;
+          private UIntPtr* lastPageLimit;
+          private PageCursor currentCursor;
+
+          internal Enumerator(ref UIntPtrQueue queue) {
+              this.pageEnumerator =
+                  new UnmanagedPageList.Enumerator(ref queue.pageList);
+              this.lastPageLimit = queue.writeCursor.cursor;
+              this.lastPageStart =
+                  PageTable.PageAlign((UIntPtr) lastPageLimit);
+              this.currentCursor = new PageCursor(null, null);
+              if (this.pageEnumerator.MoveNext()) {
+                  UIntPtr currentPage = this.pageEnumerator.Current;
+                  this.SetCursor(currentPage);
+              }
+          }
+
+          private void SetCursor(UIntPtr pageAddr) {
+              UIntPtr* preFirstAddr =
+                  UnmanagedPageList.FirstPageAddr(pageAddr) - 1;
+              if (pageAddr == lastPageStart) {
+                  this.currentCursor = new PageCursor(preFirstAddr,
+                                                      this.lastPageLimit);
+              } else {
+                  UIntPtr* endAddr = UnmanagedPageList.EndPageAddr(pageAddr);
+                  this.currentCursor = new PageCursor(preFirstAddr, endAddr);
+              }
+          }
+
+          internal bool MoveNext() {
+              if (this.currentCursor.MoveNext()) {
+                  return true;
+              }
+              if (!this.pageEnumerator.MoveNext()) {
+                  return false;
+              }
+              UIntPtr currentPage = this.pageEnumerator.Current;
+              this.SetCursor(currentPage);
+              return this.currentCursor.MoveNext();
+          }
+
+          internal UIntPtr Current {
+              get { return this.currentCursor.Current; }
+          }
+
+          internal UIntPtr* CurrentAddr {
+              get { return this.currentCursor.CurrentAddr; }
+          }
+
+          internal void Reset() {
+              throw new Exception("No reset on UIntPtrQueue iterator");
+          }
+
+      }
+
+  }
+
+}
diff --git a/base/Kernel/Bartok/GCs/UIntPtrStack.cs b/base/Kernel/Bartok/GCs/UIntPtrStack.cs
new file mode 100644
index 0000000..e60fdca
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/UIntPtrStack.cs
@@ -0,0 +1,116 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+  using System.Runtime.CompilerServices;
+
+  internal unsafe struct UIntPtrStack {
+
+      private UnmanagedPageList pageList;
+      private UIntPtr stackPage;
+      private UIntPtr *stackBottom;
+      private UIntPtr *stackPtr;
+      private UIntPtr *stackTop;
+
+      internal bool IsEmpty {
+          get {
+              return ((this.stackPtr == this.stackBottom) &&
+                      this.pageList.IsEmpty);
+          }
+      }
+
+      internal void Write(UIntPtr value) {
+          if (this.stackPtr == stackTop) {
+              AdvancePage();
+          }
+          *this.stackPtr = value;
+          this.stackPtr++;
+      }
+
+      internal void Write(UIntPtr value1, UIntPtr value2) {
+          if (this.stackPtr + 2 <= stackTop) {
+              *this.stackPtr = value1;
+              *(this.stackPtr + 1) = value2;
+              this.stackPtr += 2;
+          } else {
+              this.Write(value1);
+              this.Write(value2);
+          }
+      }
+
+      internal UIntPtr Read() {
+          if (this.stackPtr == stackBottom) {
+              RetractPage();
+          }
+          this.stackPtr--;
+          return *this.stackPtr;
+      }
+
+      internal UIntPtr Read(out UIntPtr value2) {
+          if (this.stackPtr - 2 >= stackBottom) {
+              value2 = *(this.stackPtr - 1);
+              UIntPtr value1 = *(this.stackPtr - 2);
+              this.stackPtr -= 2;
+              return value1;
+          } else {
+              value2 = this.Read();
+              UIntPtr value1 = this.Read();
+              return value1;
+          }
+      }
+
+      internal void Cleanup(bool mustBeEmpty) {
+          if (mustBeEmpty) {
+              VTable.Assert(this.IsEmpty);
+          }
+          if  (this.stackPage != UIntPtr.Zero) {
+              UnmanagedPageList.pageCache.AddHead(this.stackPage);
+              this.stackPage = UIntPtr.Zero;
+          }
+          while (!this.pageList.IsEmpty) {
+              UIntPtr headPage = this.pageList.RemoveHead();
+              UnmanagedPageList.pageCache.AddHead(headPage);
+          }
+          this.stackBottom = null;
+          this.stackTop = null;
+          this.stackPtr = null;
+      }
+
+      private void AdvancePage() {
+          if (this.stackPage != UIntPtr.Zero) {
+              this.pageList.AddHead(this.stackPage);
+          }
+          if (UnmanagedPageList.pageCache.IsEmpty) {
+              bool fCleanPages = true;
+              UIntPtr page = PageManager.EnsurePages(null, (UIntPtr) 1,
+                                                     PageType.System,
+                                                     ref fCleanPages);
+              this.stackPage = PageTable.PageAddr(page);
+          } else {
+              this.stackPage = UnmanagedPageList.pageCache.RemoveHead();
+          }
+          this.stackBottom = UnmanagedPageList.FirstPageAddr(this.stackPage);
+          this.stackPtr = this.stackBottom;
+          this.stackTop = UnmanagedPageList.EndPageAddr(this.stackPage);
+      }
+
+      private void RetractPage() {
+          UnmanagedPageList.pageCache.AddHead(this.stackPage);
+          this.stackPage = this.pageList.RemoveHead();
+          this.stackBottom = UnmanagedPageList.FirstPageAddr(this.stackPage);
+          this.stackTop = UnmanagedPageList.EndPageAddr(this.stackPage);
+          this.stackPtr = this.stackTop;
+      }
+
+  }
+
+}
diff --git a/base/Kernel/Bartok/GCs/UniversalWriteBarrier.cs b/base/Kernel/Bartok/GCs/UniversalWriteBarrier.cs
new file mode 100644
index 0000000..a8d538e
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/UniversalWriteBarrier.cs
@@ -0,0 +1,57 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+
+    internal unsafe abstract class UniversalWriteBarrier : WriteBarrier
+    {
+
+        [Inline]
+        protected override void CopyStructImpl(VTable vtable,
+                                               UIntPtr srcPtr,
+                                               UIntPtr dstPtr)
+        {
+            CopyStructWithBarrier(vtable, srcPtr, dstPtr);
+        }
+
+        [Inline]
+        protected override void CloneImpl(Object srcObject, Object dstObject)
+        {
+            CloneWithBarrier(srcObject, dstObject);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected override void ArrayZeroImpl(Array array,
+                                              int offset,
+                                              int length)
+        {
+            ArrayZeroWithBarrier(array, offset, length);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected override void ArrayCopyImpl(Array srcArray, int srcOffset,
+                                              Array dstArray, int dstOffset,
+                                              int length)
+        {
+            ArrayCopyWithBarrier(srcArray, srcOffset,
+                                 dstArray, dstOffset,
+                                 length);
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/UnmanagedPageList.cs b/base/Kernel/Bartok/GCs/UnmanagedPageList.cs
new file mode 100644
index 0000000..d37490d
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/UnmanagedPageList.cs
@@ -0,0 +1,131 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using System.Runtime.CompilerServices;
+
+    internal unsafe struct UnmanagedPageList {
+
+        internal static UnmanagedPageList pageCache;
+
+        private UIntPtr head;
+        private UIntPtr tail;
+
+        internal static void ReleaseStandbyPages() {
+            while (!pageCache.IsEmpty) {
+                UIntPtr pageAddr = pageCache.RemoveHead();
+                PageManager.ReleaseUnusedPages(PageTable.Page(pageAddr),
+                                               (UIntPtr) 1, false);
+            }
+        }
+
+        internal bool IsEmpty {
+            [Inline]
+                get { return this.head == UIntPtr.Zero; }
+        }
+
+        internal bool IsSingleton {
+            [Inline]
+                get { return this.head == this.tail; }
+        }
+
+        internal UIntPtr Head {
+            get { return this.head; }
+        }
+
+        internal UIntPtr Tail {
+            get { return this.tail; }
+        }
+
+        internal void AddTail(UIntPtr pageAddr) {
+            if (this.head == UIntPtr.Zero) {
+                this.head = pageAddr;
+            } else {
+                SetNext(this.tail, pageAddr);
+            }
+            this.tail = pageAddr;
+        }
+
+        internal void AddHead(UIntPtr pageAddr) {
+            SetNext(pageAddr, this.head);
+            this.head = pageAddr;
+            if (this.tail == UIntPtr.Zero) {
+                this.tail = pageAddr;
+            }
+        }
+
+        internal UIntPtr RemoveHead() {
+            UIntPtr oldHead = this.head;
+            UIntPtr newHead = Next(oldHead);
+            this.head = newHead;
+            if (newHead == UIntPtr.Zero) {
+                this.tail = UIntPtr.Zero;
+            }
+            SetNext(oldHead, UIntPtr.Zero);
+            return oldHead;
+        }
+
+        [Inline]
+        private static UIntPtr Next(UIntPtr pageAddr) {
+            return *(UIntPtr *) pageAddr;
+        }
+
+        [Inline]
+        private static void SetNext(UIntPtr pageAddr,
+                                           UIntPtr nextPageAddr)
+        {
+            *(UIntPtr *) pageAddr = nextPageAddr;
+        }
+
+        internal static UIntPtr* FirstPageAddr(UIntPtr pageAddr) {
+            return (((UIntPtr *) pageAddr) + 1);
+        }
+
+        internal static UIntPtr* EndPageAddr(UIntPtr pageAddr) {
+            return (UIntPtr *) (pageAddr + PageTable.PageSize);
+        }
+
+        internal struct Enumerator {
+
+            private bool movedToFirst;
+            private UIntPtr currentPage;
+            private UIntPtr tailPage;
+
+            internal Enumerator(ref UnmanagedPageList pageList) {
+                this.movedToFirst = false;
+                this.currentPage = pageList.Head;
+                this.tailPage = pageList.Tail;
+            }
+
+            internal bool MoveNext() {
+                if (!this.movedToFirst) {
+                    this.movedToFirst = true;
+                    return (this.currentPage != UIntPtr.Zero);
+                } else if (currentPage == tailPage) {
+                    return false;
+                } else {
+                    this.currentPage = Next(this.currentPage);
+                    VTable.Assert(this.currentPage != UIntPtr.Zero);
+                    return true;
+                }
+            }
+
+            internal UIntPtr Current {
+                get { return this.currentPage; }
+            }
+
+        }
+
+    }
+
+}
+
diff --git a/base/Kernel/Bartok/GCs/Util.cs b/base/Kernel/Bartok/GCs/Util.cs
new file mode 100644
index 0000000..21dcb99
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/Util.cs
@@ -0,0 +1,127 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+    using System.Runtime.CompilerServices;
+
+    // Util contains common functions for alignment and padding
+    // arithmetic and for calculating object sizes.
+    internal class Util
+    {
+        // WARNING: don't initialize any static fields in this class
+        // without manually running the class constructor at startup!
+
+        [NoHeapAllocation]
+        internal static uint dwordAlign(uint numBytes) {
+            return ((numBytes+3) & ~3U);
+        }
+
+        [NoHeapAllocation]
+        internal static UIntPtr dwordAlign(UIntPtr numBytes) {
+            return ((numBytes+3) & new UIntPtr(~3U));
+        }
+
+        [NoHeapAllocation]
+        static UIntPtr qwordAlign(UIntPtr addr) {
+            return ((addr+7) & new UIntPtr(~7U));
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static bool IsAligned(uint bytes, uint size)
+        {
+            return (bytes & (size - 1)) == 0;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static bool IsAligned(UIntPtr bytes, UIntPtr size)
+        {
+            return (bytes & (size - 1)) == UIntPtr.Zero;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static uint Align(uint bytes, uint size)
+        {
+            return (bytes & ~(size - 1));
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static UIntPtr Align(UIntPtr bytes, UIntPtr size)
+        {
+            return (bytes & ~(size - 1));
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static UIntPtr UIntPtrAlign(UIntPtr bytes)
+        {
+            return Align(bytes, (UIntPtr) UIntPtr.Size);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static uint Pad(uint data, uint size)
+        {
+            return ((data + (size - 1)) & ~(size - 1));
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static UIntPtr Pad(UIntPtr data, UIntPtr size)
+        {
+            return ((data + (size - 1)) & ~(size - 1));
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal static UIntPtr UIntPtrPad(UIntPtr bytes)
+        {
+            return Pad(bytes, (UIntPtr) UIntPtr.Size);
+        }
+
+        internal static unsafe void MemClear(UIntPtr startAddr,
+                                             UIntPtr size)
+        {
+#if SINGULARITY
+            // On Singularity we use the common optimized functions.
+            Buffer.ZeroMemory((byte*)startAddr, (int)size);
+#else
+            VTable.Assert(UIntPtr.Size !=4 || ((startAddr & ((UIntPtr)0x3)) == ((UIntPtr)0)), "Not-aligned address in Util.MemClear");
+            VTable.Assert(UIntPtr.Size !=8 || ((startAddr & ((UIntPtr)0x7)) == ((UIntPtr)0)), "Not-aligned address in Util.MemClear");
+            VTable.Assert((size & ((UIntPtr)0x3)) == ((UIntPtr)0), "size expected to be multiple of 4 (size of int) in Util.MemClear"); 
+            Buffer.ZeroMemory((byte*)startAddr, size);
+#endif
+        }
+
+        internal static unsafe void MemCopy(UIntPtr toAddress,
+                                            UIntPtr fromAddress,
+                                            UIntPtr count)
+        {
+#if SINGULARITY
+            // On Singularity we use the common optimized functions.
+            Buffer.MoveMemory((byte*)toAddress, (byte*)fromAddress, (int)count);
+#else
+            int wordCount = (int) (count >> 2);
+            int *from = (int *) fromAddress;
+            int *to = (int *) toAddress;
+            for (int i = 0; i < wordCount; i++) {
+                to[i] = from[i];
+            }
+#endif
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/Verifier.cs b/base/Kernel/Bartok/GCs/Verifier.cs
new file mode 100644
index 0000000..7aaa35e
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/Verifier.cs
@@ -0,0 +1,267 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//#define DEBUG_OFFSETTABLE
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+    [CCtorIsRunDuringStartup]
+    internal class Verifier
+    {
+
+        internal abstract class StackVerifier {
+
+            internal abstract
+            void Verify(NonNullReferenceVisitor threadReferenceVisitor,
+                        Thread thread);
+
+        }
+
+        private NonNullReferenceVisitor referenceVisitor;
+        private NonNullReferenceVisitor threadReferenceVisitor;
+        private ObjectLayout.ObjectVisitor objectVisitor;
+        private StackVerifier stackVerifier;
+
+        internal static readonly NonNullReferenceVisitor genericReferenceVisitor;
+        internal static readonly ObjectLayout.ObjectVisitor genericObjectVisitor;
+        internal static readonly NonNullReferenceVisitor genericThreadReferenceVisitor;
+        internal static readonly StackVerifier genericStackVerifier;
+        internal static readonly Verifier bumpAllocatorVerifier;
+        internal static readonly Verifier segregatedFreeListVerifier;
+
+        static Verifier() {
+            genericReferenceVisitor = new GenericReferenceVisitor();
+            genericThreadReferenceVisitor =
+                new GenericThreadReferenceVisitor();
+            genericObjectVisitor =
+                new GenericObjectVisitor(genericReferenceVisitor);
+            genericStackVerifier = new GenericStackVerifier();
+            bumpAllocatorVerifier = new Verifier(genericReferenceVisitor,
+                                                 genericThreadReferenceVisitor,
+                                                 genericObjectVisitor,
+                                                 genericStackVerifier);
+            segregatedFreeListVerifier =
+                new Verifier(genericReferenceVisitor,
+                             genericThreadReferenceVisitor,
+                             new SegregatedFreeList.ObjectVisitorWrapper(genericObjectVisitor),
+                             genericStackVerifier);
+        }
+
+        internal Verifier(NonNullReferenceVisitor referenceVisitor,
+                          NonNullReferenceVisitor threadReferenceVisitor,
+                          ObjectLayout.ObjectVisitor objectVisitor,
+                          StackVerifier stackVerifier) {
+            this.referenceVisitor = referenceVisitor;;
+            this.threadReferenceVisitor = threadReferenceVisitor;
+            this.objectVisitor = objectVisitor;
+            this.stackVerifier = stackVerifier;
+        }
+
+        public void VerifyHeap() {
+            // Temporarily set the thread allocation point to the unused
+            // space token, if necessary.
+            Thread currentThread = Thread.CurrentThread;
+            VerifyAllThreadsGCControlled(currentThread);
+            // Do the real work
+            VerifyPages(this.objectVisitor);
+            StaticData.ScanStaticData(this.referenceVisitor);
+            VTable.Deny(PageTable.IsUnusedPage(PageTable.Page(Magic.addressOf(Thread.threadTable))));
+            for (int i = 0; i < Thread.threadTable.Length; i++) {
+                Thread t = Thread.threadTable[i];
+                if (t != null) {
+                    VTable.Deny(PageTable.IsUnusedPage(PageTable.Page(Magic.addressOf(t))));
+                      this.stackVerifier.Verify(this.threadReferenceVisitor,
+                                                t);
+                }
+            }
+        }
+
+        private static void VerifyAllThreadsGCControlled(Thread thread) {
+            int limit = Thread.threadTable.Length;
+            for (int i = 0; i < limit; i++) {
+                Thread t = Thread.threadTable[i];
+                if (t != null && t != thread) {
+#if !SINGULARITY
+                    VTable.Assert(Transitions.UnderGCControl(t.threadIndex));
+#endif
+                }
+            }
+        }
+
+        //=========================================
+        // Verification of heap and page management
+
+        internal static
+        void VerifyPages(ObjectLayout.ObjectVisitor objectVisitor)
+        {
+            UIntPtr page = UIntPtr.Zero;
+            while (page < PageTable.pageTableCount) {
+                UIntPtr startPage = page;
+                if (!PageTable.IsMyPage(startPage)) {
+                    page++;
+                    continue;
+                }
+                PageType pageType = PageTable.Type(page);
+                uint pageProcess = PageTable.Process(page);
+                do {
+                    page++;
+                } while (page < PageTable.pageTableCount &&
+                         PageTable.Type(page) == pageType &&
+                         PageTable.Process(page) == pageProcess);
+                UIntPtr endPage = page;
+                switch (pageType) {
+                  case PageType.Unallocated:
+                  case PageType.Unknown:
+                  case PageType.Shared: {
+                      // The region does not belong to us, so there is
+                      // nothing to check.
+                      break;
+                  }
+                  case PageType.UnusedClean:
+                  case PageType.UnusedDirty: {
+                      PageManager.VerifyUnusedRegion(startPage, endPage);
+                      break;
+                  }
+                  case PageType.System: {
+                      // We have looked at the region, but it is off-limits
+                      // for the verifier.
+                      break;
+                  }
+                  case PageType.NonGC: {
+                      // Since there may be non-objects in the static data
+                      // pages, we cannot apply the heapVerifier to the
+                      // region.
+                      break;
+                  }
+                  case PageType.Stack: {
+                      // The page contains (part of) the activation record
+                      // stack for one or more threads.
+                      break;
+                  }
+                  default: {
+                      // We have found a data region
+                      VTable.Assert(PageTable.IsGcPage(startPage));
+                      UIntPtr startAddr = PageTable.PageAddr(startPage);
+                      UIntPtr endAddr = PageTable.PageAddr(endPage);
+                      GC.installedGC.VisitObjects(objectVisitor,
+                                                  startAddr, endAddr);
+                      break;
+                  }
+                }
+            }
+        }
+
+        private class GenericReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert(PageTable.IsNonGcPage(pageType) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType));
+                    return;
+                }
+                VTable.Assert(PageTable.IsMyPage(page));
+                UIntPtr objectAddr = GC.installedGC.FindObjectAddr(addr);
+                VTable.Assert(objectAddr == addr);
+                UIntPtr vtableAddr =
+                    Magic.addressOf(Magic.fromAddress(objectAddr).vtable);
+                VTable.Assert(PageTable.IsNonGcPage(PageTable.Type(PageTable.Page(vtableAddr))));
+                VTable.Assert(Magic.fromAddress(vtableAddr) is VTable);
+            }
+
+        }
+
+        internal class GenericThreadReferenceVisitor : NonNullReferenceVisitor
+        {
+
+            internal unsafe override void Visit(UIntPtr *loc) {
+                UIntPtr addr = *loc;
+                UIntPtr page = PageTable.Page(addr);
+                PageType pageType = PageTable.Type(page);
+                if (!PageTable.IsGcPage(pageType)) {
+                    VTable.Assert(PageTable.IsNonGcPage(pageType) ||
+                                  PageTable.IsStackPage(pageType) ||
+                                  PageTable.IsSharedPage(pageType));
+                    return;
+                }
+                VTable.Assert(PageTable.IsMyPage(page));
+                UIntPtr objectAddr = GC.installedGC.FindObjectAddr(addr);
+                VTable.Assert(objectAddr <= addr);
+                UIntPtr vtableAddr =
+                    Magic.addressOf(Magic.fromAddress(objectAddr).vtable);
+                VTable.Assert(PageTable.IsNonGcPage(PageTable.Type(PageTable.Page(vtableAddr))));
+                VTable.Assert(Magic.fromAddress(vtableAddr) is VTable);
+            }
+
+        }
+
+        internal class GenericObjectVisitor : ObjectLayout.ObjectVisitor {
+
+            private NonNullReferenceVisitor referenceVisitor;
+#if DEBUG_OFFSETTABLE
+            private static UIntPtr lastObjPtr;
+#endif                     
+
+            internal
+            GenericObjectVisitor(NonNullReferenceVisitor referenceVisitor)
+            {
+                this.referenceVisitor = referenceVisitor;
+#if DEBUG_OFFSETTABLE
+                lastObjPtr = UIntPtr.Zero;
+#endif                     
+            }
+
+            internal override UIntPtr Visit(Object obj) {
+#if DEBUG_OFFSETTABLE
+                VTable.DebugPrint("visit obj {0:x8}\n", __arglist(Magic.addressOf(obj))); 
+                if (lastObjPtr != UIntPtr.Zero) {
+                     UIntPtr lastCard = CardTable.CardNo(lastObjPtr);
+                     if (lastCard != CardTable.CardNo(Magic.addressOf(obj))) {
+                        if (!OffsetTable.NoObjectPtrToTheCard(lastCard)) {
+                              UIntPtr realOffst = lastObjPtr - CardTable.CardAddr(lastCard);
+                              UIntPtr currOffst = OffsetTable.GetOffset(lastCard);
+                              if (realOffst != currOffst ) {
+                                 VTable.DebugPrint("Verifier: wrong offset. Card {0:x8} Offset {1:x8} Should be {2:x8}\n",
+                                       __arglist(lastCard, currOffst, realOffst));
+                                 VTable.Assert(false);
+                              }
+                         }
+                     }
+                }    
+#endif                     
+                return this.referenceVisitor.VisitReferenceFields(obj);
+            }
+
+        }
+
+        internal class GenericStackVerifier : StackVerifier {
+
+            internal override
+            void Verify(NonNullReferenceVisitor threadReferenceVisitor,
+                        Thread thread)
+            {
+                CallStack.ScanStack(thread, threadReferenceVisitor,
+                                    threadReferenceVisitor);
+            }
+
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/WriteBarrier.cs b/base/Kernel/Bartok/GCs/WriteBarrier.cs
new file mode 100644
index 0000000..f5c3f18
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/WriteBarrier.cs
@@ -0,0 +1,580 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs
+{
+    using Microsoft.Bartok.Runtime;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    [CCtorIsRunDuringStartup]
+    internal abstract unsafe class WriteBarrier
+    {
+
+        [TrustedNonNull]
+        private static WriteBarrier installedWriteBarrier;
+
+        [TrustedNonNull]
+        private static CopyFieldsVisitor copyFieldsVisitor;
+
+        [TrustedNonNull]
+        private static ZeroFieldsVisitor zeroFieldsVisitor;
+
+        [PreInitRefCounts]
+        internal static void Initialize()
+        {
+            switch (GC.wbType) {
+#if !SINGULARITY || MARK_SWEEP_COLLECTOR
+              case WBType.noWB: {
+                  EmptyWriteBarrier.Initialize();
+                  installedWriteBarrier = EmptyWriteBarrier.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || SEMISPACE_COLLECTOR || SLIDING_COLLECTOR || ADAPTIVE_COPYING_COLLECTOR
+              case WBType.Generational: {
+                  GenerationalWriteBarrier.Initialize();
+                  installedWriteBarrier = GenerationalWriteBarrier.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || CONCURRENT_MS_COLLECTOR
+              case WBType.CMS: {
+                  WriteBarrierCMS.Initialize();
+                  installedWriteBarrier = WriteBarrierCMS.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || ATOMIC_RC_COLLECTOR
+              case WBType.ARC: {
+                  AtomicRCWriteBarrier.Initialize();
+                  installedWriteBarrier = AtomicRCWriteBarrier.instance;
+                  break;
+              }
+#endif
+#if !SINGULARITY || SEMISPACE_COLLECTOR || SLIDING_COLLECTOR || ADAPTIVE_COPYING_COLLECTOR
+              case WBType.AllCards: {
+                  AllCardsWriteBarrier.Initialize();
+                  installedWriteBarrier = AllCardsWriteBarrier.instance;
+                  break;
+              }
+#endif
+              default: {
+                  VTable.NotReached("Unknown write barrier type: "+GC.wbType);
+                  break;
+              }
+            }
+            // copyFieldsVisitor = new CopyFieldsVisitor();
+            WriteBarrier.copyFieldsVisitor = (CopyFieldsVisitor)
+                BootstrapMemory.Allocate(typeof(CopyFieldsVisitor));
+            // zeroFieldsVisitor = new ZeroFieldsVisitor();
+            WriteBarrier.zeroFieldsVisitor = (ZeroFieldsVisitor)
+                BootstrapMemory.Allocate(typeof(ZeroFieldsVisitor));
+        }
+
+        [Inline]
+        protected virtual void StoreIndirectImpl(UIntPtr *location,
+                                                 Object value)
+        {
+            this.WriteReferenceImpl(location, value);
+        }
+
+        [Inline]
+        protected virtual void StoreIndirectImpl(ref Object reference,
+                                                 Object value)
+        {
+            this.WriteReferenceImpl(ref reference, value);
+        }
+
+        [Inline]
+        protected virtual void StoreObjectFieldImpl(Object obj,
+                                                    UIntPtr fieldOffset,
+                                                    Object value)
+        {
+            UIntPtr *fieldPtr = (UIntPtr *)
+                (Magic.addressOf(obj) + fieldOffset);
+            this.WriteReferenceImpl(fieldPtr, value);
+        }
+
+        [Inline]
+        protected virtual void StoreStructFieldImpl(UIntPtr structPtr,
+                                                    UIntPtr fieldOffset,
+                                                    Object value)
+        {
+            UIntPtr *fieldPtr = (UIntPtr *) (structPtr + fieldOffset);
+            this.WriteReferenceImpl(fieldPtr, value);
+        }
+
+        [Inline]
+        protected virtual void StoreVectorElementImpl(Array vector,
+                                                      int index,
+                                                      int arrayElementSize,
+                                                      UIntPtr fieldOffset,
+                                                      Object value)
+        {
+            UIntPtr *fieldPtr =
+                IndexedFieldPtr(vector, index, arrayElementSize, fieldOffset);
+            this.WriteReferenceImpl(fieldPtr, value);
+        }
+
+        [Inline]
+        protected virtual void StoreArrayElementImpl(Array array,
+                                                     int index,
+                                                     int arrayElementSize,
+                                                     UIntPtr fieldOffset,
+                                                     Object value)
+        {
+            UIntPtr *fieldPtr =
+                IndexedFieldPtr(array, index, arrayElementSize, fieldOffset);
+            this.WriteReferenceImpl(fieldPtr, value);
+        }
+
+        [Inline]
+        protected virtual void StoreStaticFieldImpl(ref Object staticField,
+                                                    Object value)
+        {
+            this.WriteReferenceImpl(ref staticField, value);
+        }
+
+        protected abstract void CopyStructImpl(VTable vtable,
+                                               UIntPtr srcPtr,
+                                               UIntPtr dstPtr);
+
+        protected abstract Object AtomicSwapImpl(ref Object reference,
+                                                 Object value);
+
+        protected abstract Object AtomicCompareAndSwapImpl(ref Object reference,
+                                                           Object newValue,
+                                                           Object comparand);
+
+        protected abstract void CloneImpl(Object srcObject, Object dstObject);
+
+        protected void WriteReferenceImpl(ref Object reference, Object value)
+        {
+            this.WriteReferenceImpl(Magic.toPointer(ref reference), value);
+        }
+
+        protected abstract void WriteReferenceImpl(UIntPtr *location,
+                                                   Object value);
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        protected abstract void ArrayZeroImpl(Array array,
+                                              int offset,
+                                              int length);
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        protected abstract void ArrayCopyImpl(Array srcArray, int srcOffset,
+                                              Array dstArray, int dstOffset,
+                                              int length);
+
+        [Inline]
+        protected static UIntPtr IndexedDataPtr(Array array) {
+            return (UIntPtr) (Magic.addressOf(array) + 
+                              (array.vtable.baseLength-(uint)PreHeader.Size));
+        }
+
+        [Inline]
+        protected static UIntPtr *IndexedFieldPtr(Array obj,
+                                                  int index,
+                                                  int arrayElementSize,
+                                                  UIntPtr fieldOffset)
+        {
+            UIntPtr dataPtr = IndexedDataPtr(obj);
+            UIntPtr *fieldPtr = (UIntPtr *)
+                (dataPtr + index * arrayElementSize + fieldOffset);
+            return fieldPtr;
+        }
+
+        [Inline]
+        protected void CopyStructNoBarrier(VTable vtable,
+                                           UIntPtr srcPtr,
+                                           UIntPtr dstPtr)
+        {
+            int preHeaderSize = PreHeader.Size;
+            int postHeaderSize = PostHeader.Size;
+            int structSize = ((int) ObjectLayout.ObjectSize(vtable) -
+                              (preHeaderSize + postHeaderSize));
+            Buffer.MoveMemory((byte *) dstPtr, (byte *) srcPtr, structSize);
+        }
+
+        [Inline]
+        protected void CopyStructWithBarrier(VTable vtable,
+                                             UIntPtr srcPtr,
+                                             UIntPtr dstPtr)
+        {
+            copyFieldsVisitor.VisitReferenceFields(vtable, srcPtr, dstPtr);
+        }
+
+        [Inline]
+        protected Object AtomicSwapNoBarrier(ref Object reference,
+                                             Object value)
+        {
+            UIntPtr resultAddr =
+                Interlocked.Exchange(Magic.toPointer(ref reference),
+                                     Magic.addressOf(value));
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected Object AtomicCompareAndSwapNoBarrier(ref Object reference,
+                                                       Object newValue,
+                                                       Object comparand)
+        {
+            UIntPtr resultAddr =
+                Interlocked.CompareExchange(Magic.toPointer(ref reference),
+                                            Magic.addressOf(newValue),
+                                            Magic.addressOf(comparand));
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected void CloneNoBarrier(Object srcObject,
+                                      Object dstObject)
+        {
+            UIntPtr objectSize = System.GCs.ObjectLayout.Sizeof(srcObject);
+            int preHeaderSize = PreHeader.Size;
+            int postHeaderSize = PostHeader.Size;
+            // We don't copy any of the header fields.
+            Util.MemCopy(Magic.addressOf(dstObject) + postHeaderSize,
+                         Magic.addressOf(srcObject) + postHeaderSize,
+                         objectSize - preHeaderSize - postHeaderSize);
+        }
+
+        [Inline]
+        protected void CloneWithBarrier(Object srcObject,
+                                        Object dstObject)
+        {
+            copyFieldsVisitor.VisitReferenceFields(srcObject, dstObject);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected void ArrayZeroNoBarrier(Array array, int offset,
+                                          int length)
+        {
+            UIntPtr dataPtr = IndexedDataPtr(array);
+            int elementSize = array.vtable.arrayElementSize;
+            Buffer.ZeroMemory((byte *)dataPtr + offset * elementSize,
+                              length * elementSize);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected void ArrayZeroWithBarrier(Array array, int offset,
+                                            int length)
+        {
+            UIntPtr dataPtr = IndexedDataPtr(array);
+            int elementSize = array.vtable.arrayElementSize;
+            UIntPtr startAddr = dataPtr + offset * elementSize;
+            zeroFieldsVisitor.VisitReferenceFields(array.vtable,
+                                                   startAddr, length);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected void ArrayCopyNoBarrier(Array srcArray, int srcOffset,
+                                          Array dstArray, int dstOffset,
+                                          int length)
+        {
+            UIntPtr srcDataAddr = IndexedDataPtr(srcArray);
+            UIntPtr dstDataAddr = IndexedDataPtr(dstArray);
+            int elementSize = srcArray.vtable.arrayElementSize;
+            VTable.Assert(elementSize ==
+                          dstArray.vtable.arrayElementSize);
+            Buffer.MoveMemory((byte *) (dstDataAddr + dstOffset * elementSize),
+                              (byte *) (srcDataAddr + srcOffset * elementSize),
+                              length * elementSize);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        protected void ArrayCopyWithBarrier(Array srcArray, int srcOffset,
+                                            Array dstArray, int dstOffset,
+                                            int length)
+        {
+            UIntPtr srcDataAddr = IndexedDataPtr(srcArray);
+            UIntPtr dstDataAddr = IndexedDataPtr(dstArray);
+            int elementSize = srcArray.vtable.arrayElementSize;
+            VTable.Assert(elementSize == dstArray.vtable.arrayElementSize);
+            UIntPtr srcStartAddr = srcDataAddr + srcOffset * elementSize;
+            UIntPtr dstStartAddr = dstDataAddr + dstOffset * elementSize;
+            copyFieldsVisitor.VisitReferenceFields(srcArray.vtable,
+                                                   srcStartAddr,
+                                                   dstStartAddr,
+                                                   length);
+        }
+
+        [Inline]
+        internal static void StoreIndirect(UIntPtr *location, Object value)
+        {
+            installedWriteBarrier.StoreIndirectImpl(location, value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void StoreIndirect(ref Object reference,
+                                           Object value)
+        {
+            installedWriteBarrier.StoreIndirectImpl(ref reference, value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void StoreObjectField(Object obj,
+                                              UIntPtr fieldOffset,
+                                              Object value)
+        {
+            installedWriteBarrier.StoreObjectFieldImpl(obj,
+                                                       fieldOffset,
+                                                       value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void StoreStructField(UIntPtr structPtr,
+                                              UIntPtr fieldOffset,
+                                              Object value)
+        {
+            installedWriteBarrier.StoreStructFieldImpl(structPtr,
+                                                       fieldOffset,
+                                                       value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void StoreVectorElement(Array vector,
+                                                int index,
+                                                int arrayElementSize,
+                                                UIntPtr fieldOffset,
+                                                Object value)
+        {
+            installedWriteBarrier.StoreVectorElementImpl(vector,
+                                                         index,
+                                                         arrayElementSize,
+                                                         fieldOffset,
+                                                         value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void StoreArrayElement(Array array,
+                                               int index,
+                                               int arrayElementSize,
+                                               UIntPtr fieldOffset,
+                                               Object value)
+        {
+            installedWriteBarrier.StoreArrayElementImpl(array,
+                                                        index,
+                                                        arrayElementSize,
+                                                        fieldOffset,
+                                                        value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static void StoreStaticField(ref Object staticField,
+                                              Object value)
+        {
+            installedWriteBarrier.StoreStaticFieldImpl(ref staticField, value);
+        }
+
+        [Inline]
+        internal static void CopyStruct(VTable vtable,
+                                        UIntPtr srcPtr,
+                                        UIntPtr dstPtr)
+        {
+            installedWriteBarrier.CopyStructImpl(vtable, srcPtr, dstPtr);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static Object AtomicSwap(ref Object reference,
+                                          Object value)
+        {
+            return installedWriteBarrier.AtomicSwapImpl(ref reference, value);
+        }
+
+        [RequiredByBartok]
+        [Inline]
+        internal static Object AtomicCompareAndSwap(ref Object reference,
+                                                    Object newValue,
+                                                    Object comparand)
+        {
+            return
+                installedWriteBarrier.AtomicCompareAndSwapImpl(ref reference,
+                                                               newValue,
+                                                               comparand);
+        }
+
+        [Inline]
+        internal static void Clone(Object srcObject, Object dstObject)
+        {
+            installedWriteBarrier.CloneImpl(srcObject, dstObject);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        internal static void ArrayZero(Array array, int offset, int length)
+        {
+            installedWriteBarrier.ArrayZeroImpl(array, offset, length);
+        }
+
+        // 'offset' is not relative to the lower bound, but is a count
+        // of elements from the first element in the array.
+        [Inline]
+        internal static void ArrayCopy(Array srcArray, int srcOffset,
+                                       Array dstArray, int dstOffset,
+                                       int length)
+        {
+            installedWriteBarrier.ArrayCopyImpl(srcArray, srcOffset,
+                                                dstArray, dstOffset,
+                                                length);
+        }
+
+        [Inline]
+        internal static void WriteReference(UIntPtr *location, Object value)
+        {
+            installedWriteBarrier.WriteReferenceImpl(location, value);
+        }
+
+        private class CopyFieldsVisitor : OffsetReferenceVisitor
+        {
+
+            // Struct copy
+            internal void VisitReferenceFields(VTable vtable,
+                                               UIntPtr srcPtr,
+                                               UIntPtr dstPtr)
+            {
+                int postHeaderSize = PostHeader.Size;
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable,
+                                         srcPtr - postHeaderSize,
+                                         dstPtr - postHeaderSize,
+                                         (UIntPtr) postHeaderSize);
+                UIntPtr ignore = VisitReferenceFieldsTemplate(ref objDesc);
+                int preHeaderSize = PreHeader.Size;
+                UIntPtr limitSize =
+                    ObjectLayout.ObjectSize(vtable) - preHeaderSize;
+                UIntPtr previouslyDone = objDesc.extra;
+                UIntPtr tailSize = limitSize - previouslyDone;
+                if (tailSize > UIntPtr.Zero) {
+                    Util.MemCopy(objDesc.secondBase + previouslyDone,
+                                 objDesc.objectBase + previouslyDone,
+                                 tailSize);
+                }
+            }
+
+            internal void VisitReferenceFields(Object srcObject,
+                                               Object dstObject)
+            {
+                int postHeaderSize = PostHeader.Size;
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(srcObject.vtable,
+                                         Magic.addressOf(srcObject),
+                                         Magic.addressOf(dstObject),
+                                         (UIntPtr) postHeaderSize);
+                UIntPtr objectSize = VisitReferenceFieldsTemplate(ref objDesc);
+                int preHeaderSize = PreHeader.Size;
+                UIntPtr limitSize = objectSize - preHeaderSize;
+                UIntPtr previouslyDone = objDesc.extra;
+                UIntPtr tailSize = limitSize - previouslyDone;
+                if (tailSize > UIntPtr.Zero) {
+                    Util.MemCopy(objDesc.secondBase + previouslyDone,
+                                 objDesc.objectBase + previouslyDone,
+                                 tailSize);
+                }
+            }
+
+            // Partial array copy
+            internal void VisitReferenceFields(VTable vtable,
+                                               UIntPtr srcElementPtr,
+                                               UIntPtr dstElementPtr,
+                                               int length)
+            {
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable, srcElementPtr, dstElementPtr);
+                VisitReferenceFieldsTemplate(ref objDesc, length);
+                UIntPtr srcLimitAddr =
+                    srcElementPtr + length * vtable.arrayElementSize;
+                UIntPtr previouslyDone = objDesc.objectBase + objDesc.extra;
+                UIntPtr tailSize = srcLimitAddr - previouslyDone;
+                if (tailSize > UIntPtr.Zero) {
+                    Util.MemCopy(objDesc.secondBase + objDesc.extra,
+                                 previouslyDone, tailSize);
+                }
+            }
+
+            internal override void FieldOffset(UIntPtr offset,
+                                               ref ObjectDescriptor objDesc)
+            {
+                UIntPtr previouslyDone = objDesc.extra;
+                objDesc.extra = offset + UIntPtr.Size;
+                UIntPtr norefSize = offset - previouslyDone;
+                if (norefSize > UIntPtr.Zero) {
+                    Util.MemCopy(objDesc.secondBase + previouslyDone,
+                                 objDesc.objectBase + previouslyDone,
+                                 norefSize);
+                }
+                UIntPtr *srcAddr = (UIntPtr *) (objDesc.objectBase + offset);
+                UIntPtr *dstAddr = (UIntPtr *) (objDesc.secondBase + offset);
+                Object fieldValue = Magic.fromAddress(*srcAddr);
+                WriteBarrier.WriteReference(dstAddr, fieldValue);
+            }
+
+        }
+
+        private class ZeroFieldsVisitor : OffsetReferenceVisitor
+        {
+
+            internal void VisitReferenceFields(VTable vtable,
+                                               UIntPtr elementAddr,
+                                               int length)
+            {
+                int postHeaderSize = PostHeader.Size;
+                ObjectDescriptor objDesc =
+                    new ObjectDescriptor(vtable, elementAddr);
+                VisitReferenceFieldsTemplate(ref objDesc, length);
+                UIntPtr limitAddr =
+                    elementAddr + length * vtable.arrayElementSize;
+                UIntPtr previouslyDone = objDesc.objectBase + objDesc.extra;
+                UIntPtr tailSize = limitAddr - previouslyDone;
+                if (tailSize > UIntPtr.Zero) {
+                    Buffer.ZeroMemory((byte *) previouslyDone, tailSize);
+                }
+            }
+
+            internal override void FieldOffset(UIntPtr offset,
+                                               ref ObjectDescriptor objDesc)
+            {
+                int postHeaderSize = PostHeader.Size;
+                UIntPtr previouslyDone = objDesc.extra;
+                objDesc.extra = offset + UIntPtr.Size;
+                UIntPtr norefSize = offset - previouslyDone;
+                if (norefSize > UIntPtr.Zero) {
+                    Util.MemClear(objDesc.objectBase + previouslyDone,
+                                  norefSize);
+                }
+                UIntPtr *fieldAddr = (UIntPtr *) (objDesc.objectBase + offset);
+                WriteBarrier.WriteReference(fieldAddr, null);
+            }
+
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/GCs/WriteBarrierCMS.cs b/base/Kernel/Bartok/GCs/WriteBarrierCMS.cs
new file mode 100644
index 0000000..021c4dd
--- /dev/null
+++ b/base/Kernel/Bartok/GCs/WriteBarrierCMS.cs
@@ -0,0 +1,148 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.GCs {
+
+    using Microsoft.Bartok.Runtime;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+    internal unsafe class WriteBarrierCMS : UniversalWriteBarrier
+    {
+
+        internal static WriteBarrierCMS instance;
+
+        [PreInitRefCounts]
+        internal static new void Initialize() {
+            WriteBarrierCMS.instance = (WriteBarrierCMS)
+                BootstrapMemory.Allocate(typeof(WriteBarrierCMS));
+        }
+
+        [Inline]
+        protected override Object AtomicSwapImpl(ref Object reference,
+                                                 Object value)
+        {
+            ReferenceCheck(Magic.toPointer(ref reference), value);
+            UIntPtr resultAddr =
+                Interlocked.Exchange(Magic.toPointer(ref reference),
+                                     Magic.addressOf(value));
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected override
+        Object AtomicCompareAndSwapImpl(ref Object reference,
+                                        Object newValue,
+                                        Object comparand)
+        {
+            ReferenceCheck(Magic.toPointer(ref reference), newValue);
+            UIntPtr resultAddr =
+                Interlocked.CompareExchange(Magic.toPointer(ref reference),
+                                            Magic.addressOf(newValue),
+                                            Magic.addressOf(comparand));
+            return Magic.fromAddress(resultAddr);
+        }
+
+        [Inline]
+        protected override void CloneImpl(Object srcObject, Object dstObject)
+        {
+            // There is no need to keep track of initial writes, so do nothing!
+            CloneNoBarrier(srcObject, dstObject);
+        }
+
+        [Inline]
+        protected override void WriteReferenceImpl(UIntPtr *location,
+                                                   Object value)
+        {
+            ReferenceCheck(location, value);
+            *location = Magic.addressOf(value);
+        }
+
+        /// <summary>
+        /// In the sliding views phase, where some threads may have
+        /// scanned their roots and others have not, we need to ensure
+        /// that both old and new values will be marked and scanned.
+        /// In the tracing phase we only need to ensure that the old
+        /// values are traced and marked, as the old values may be the
+        /// only references to a part of the snapshot reachable object
+        /// graph from the untraced part of the object graph.
+        /// </summary>
+        /// <param name="addr">The memory location being modified</param>
+        /// <param name="value">The reference value to be written into
+        /// the "addr" location</param>
+        [Inline]
+        private static void ReferenceCheck(UIntPtr *addr, Object value)
+        {
+#if !SINGULARITY || CONCURRENT_MS_COLLECTOR
+            if (ConcurrentMSCollector.CurrentMarkingPhase ==
+                ConcurrentMSCollector.MarkingPhase.ComputingRoots) {
+                UIntPtr oldValue = *addr;
+                MarkIfNecessary(oldValue);
+                MarkIfNecessary(Magic.addressOf(value));
+            } else if (ConcurrentMSCollector.CurrentMarkingPhase ==
+                       ConcurrentMSCollector.MarkingPhase.Tracing) {
+                UIntPtr oldValue = *addr;
+                MarkIfNecessary(oldValue);
+            }
+#endif // CONCURRENT_MS_COLLECTOR
+        }
+
+        /// <summary>
+        /// Ensures that a reference value is going to be marked and
+        /// scanned.
+        /// </summary>
+        /// <param name="value">The reference value that may need to
+        /// be marked</param>
+        [RequiredByBartok]
+        private static void MarkIfNecessary(UIntPtr value) {
+#if !SINGULARITY || CONCURRENT_MS_COLLECTOR
+            if (PageTable.IsGcPage(PageTable.Page(value)) &&
+                (ThreadHeaderQueue.GcMark(Magic.fromAddress(value)) !=
+                 ConcurrentMSCollector.markedColor)) {
+                VTable.Assert(PageTable.IsMyPage(PageTable.Page(value)));
+                Thread thread = Thread.CurrentThread;
+                ThreadHeaderQueue.Push(thread,
+                                       value,
+                                       ConcurrentMSCollector.markedColor,
+                                       ConcurrentMSCollector.unmarkedColor);
+            }
+#endif // CONCURRENT_MS_COLLECTOR
+        }
+
+        internal static void EnterSnoopingPhase() {
+            WriteBarrierCMS.isSnooping = true;
+        }
+
+        internal static void LeaveSnoopingPhase() {
+            WriteBarrierCMS.isSnooping = false;
+        }
+
+        internal static bool InSnoopingPhase {
+            get {
+                return WriteBarrierCMS.isSnooping;
+            }
+        }
+
+        /// <summary>
+        /// Ensures that an object is going to be marked and scanned.
+        /// </summary>
+        /// <param name="obj">The object that may need to be marked</param>
+        internal static void MarkObject(Object obj) {
+#if !SINGULARITY || CONCURRENT_MS_COLLECTOR
+            MarkIfNecessary(Magic.addressOf(obj));
+#endif // CONCURRENT_MS_COLLECTOR
+        }
+
+        private static bool isSnooping;
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/Headers.cs b/base/Kernel/Bartok/Headers.cs
new file mode 100644
index 0000000..2081949
--- /dev/null
+++ b/base/Kernel/Bartok/Headers.cs
@@ -0,0 +1,46 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Bartok.Runtime {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    [RequiredByBartok]
+    internal struct PreHeader {
+
+        internal MultiUseWord muw;
+
+        [Intrinsic]
+        internal static int Size;
+
+    }
+
+    [RequiredByBartok]
+    internal struct PostHeader {
+
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+        internal uint refState;
+#endif
+
+#if SINGULARITY
+        [AccessedByRuntime("accessed from halexn.cpp")]
+#else
+        [RequiredByBartok]
+#endif
+        internal VTable vtableObject;
+
+        [Intrinsic]
+        internal static int Size;
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/Ilhelpers.il b/base/Kernel/Bartok/Ilhelpers.il
new file mode 100644
index 0000000..3cdee7b
--- /dev/null
+++ b/base/Kernel/Bartok/Ilhelpers.il
@@ -0,0 +1,102 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+.assembly extern mscorlib
+{
+  .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )    // .z\V.4..
+  .ver 1:0:5000:0
+}
+
+.assembly ILHelpers
+{
+}
+.module ILHelpers.dll
+.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
+.imagebase 0x00400000
+.subsystem 0x00000003
+.file alignment 4096
+.corflags 0x00000001
+// Image base: 0x02c00000
+
+// ============== CLASS STRUCTURE DECLARATION ==================
+
+.namespace System
+{
+  .class public auto ansi serializable beforefieldinit sealed ILHelpers
+         extends [mscorlib]System.Object
+  {
+  } // end of class ILHelpers
+
+} // end of namespace System
+
+// =============== CLASS MEMBERS DECLARATION ===================
+//   note that class flags, 'extends' and 'implements' clauses
+//          are provided here for information only
+
+.namespace System
+{
+  .class public auto ansi serializable beforefieldinit sealed ILHelpers
+         extends [mscorlib]System.Object
+  {
+    .method public hidebysig specialname static 
+            void SetAt(object obj,
+                       native unsigned int offset,
+                       native unsigned int data) cil managed
+    {
+      //.maxstack  8
+      .locals ([0] native unsigned int& dataPtr)
+
+      // dataPtr = (native unsigned int&) obj
+      ldarg.0
+      stloc.0
+
+      // dataPtr += offset
+      ldloc.0
+      ldarg.1
+      add
+      stloc.0
+
+      // *dataPtr = data
+      ldloc.0
+      ldarg.2
+      stind.i
+
+      ret
+    } // end of method ILHelpers::SetAt
+
+    .method public hidebysig specialname static 
+            void SetAt(object obj,
+                       native unsigned int offset,
+                       object data) cil managed
+    {
+      //.maxstack  8
+      .locals ([0] object& dataPtr)
+
+      // dataPtr = (object&) obj
+      ldarg.0
+      stloc.0
+
+      // dataPtr += offset
+      ldloc.0
+      ldarg.1
+      add
+      stloc.0
+
+      // *dataPtr = data
+      ldloc.0
+      ldarg.2
+      stind.ref
+
+      ret
+    } // end of method ILHelpers::SetAt
+  }
+}
diff --git a/base/Kernel/Bartok/Magic.cs b/base/Kernel/Bartok/Magic.cs
new file mode 100644
index 0000000..b651786
--- /dev/null
+++ b/base/Kernel/Bartok/Magic.cs
@@ -0,0 +1,92 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Bartok.Runtime {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    internal sealed class Magic {
+
+        internal static extern UIntPtr OffsetOfVTable {
+            [NoHeapAllocation]
+            [Intrinsic]
+            get;
+        }
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern UIntPtr addressOf(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static unsafe extern UIntPtr *toPointer(ref Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static unsafe extern UIntPtr *toPointer(ref VTable o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern Object fromAddress(UIntPtr v);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern Thread toThread(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern Monitor toMonitor(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern EMU toEMU(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern VTable toVTable(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern Array toArray(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern String toString(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern RuntimeType toRuntimeType(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern Type toType(Object o);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern uint[] toUIntArray(Object o);
+
+        [Intrinsic]
+        internal static extern WeakReference toWeakReference(Object o);
+
+        [Intrinsic]
+        internal static extern void calli(System.UIntPtr p);
+
+        [Intrinsic]
+        internal static extern void calli(System.UIntPtr p, System.UIntPtr v);
+
+        [Intrinsic]
+        internal static extern void callFinalizer(Object o);
+
+    }
+
+}
diff --git a/base/Kernel/Bartok/MultiUseWord.cs b/base/Kernel/Bartok/MultiUseWord.cs
new file mode 100644
index 0000000..14c4dd9
--- /dev/null
+++ b/base/Kernel/Bartok/MultiUseWord.cs
@@ -0,0 +1,2060 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+/*
+
+This class provides fast-path code for a number of operations which
+potentially require additional information to be associated with each
+object in the heap:
+
+ - Object ownership and versioning information needed by the STM
+   implementation.
+
+ - Location-insensitive hash codes that have been allocated to objects.
+
+ - Monitor objects that have been associate with objects.
+
+ - StringState bits associated with String objects
+
+
+Overview
+--------
+
+Each object has a value of type MultiUseWord (MUW) held as a header
+word.  This can be used directly for any *one* of the three purposes
+listed above.  If more than one kind of usage is required on the same
+object then the MUW is "inflated" -- i.e. replaced by a value that
+indicates an external multi-use object (EMU) which contains space for
+all three purposes.
+
+NB: the StringState and HashCode words share the same storage locations,
+distinguished by value.  We rely on ChooseHashCode to not use small
+integer values corresponding to the StringState enumeration.
+
+In addition, the MUW provides a single per-object 'mark' bit.  This
+is used in the MemoryAccounting module when counting the volume of
+different kinds of object in the heap.  Placing this bit in the MUW
+(rather than using spare vtable-bits as the GC does) allows
+memory accounting to be invoked at any time (e.g. after a crash during
+a GC).
+
+
+MUW structure
+-------------
+
+The structure of the MUW is as follows:
+
+   |  31  | 30                 2 | 1 0 |
+   | mark |       payload        | tag |
+
+The single mark bit is the MSB.  By convention, all modules using the
+mark bit must (a) work with the world stopped and (b) leave all object's
+mark bits 0 after their operation.  (They may assume this is true when
+they start).  This restriction avoids needing to mask off the mark bit
+in common code paths in this file.
+
+The payload field forms the majority of the MUW.  The contents of the
+payload are taken from bits 2..30 in the MUW, padded with two 0-bits
+at the least significant end.  This means that the payload can hold a
+pointer to a 4-byte aligned address.
+
+The tag values distinguish between four states that the MUW can be in:
+
+00 => The MUW is either unused (if the payload is 0), or holds the
+      STM word for the object (if the payload is non-0).
+
+01 => The payload holds the object's hash code or StringState bits.
+
+10 => The payload refers to the Monitor for the object.
+
+11 => The payload refers to an external multi-use object (EMU).
+
+
+Memory management
+-----------------
+
+See detailed comments below about interaction between this file and
+the various garbage collectors.
+
+
+To do
+-----
+
+ - If we can guarantee that the GC will not relocate objects then we
+   can avoid needing to place hashcodes in the MUW.  This may
+   slightly reduce the frequency of inflation.
+
+ - The state used for fast-path monitor operations could be placed
+   directly in the MUW's payload rather than in an external Monitor
+   object.
+
+*/
+
+// Verbose runtime tracing
+//#define ENABLE_LOG_TRACING
+
+// Profile MUW inflation
+#if DEBUG
+#define ENABLE_PROFILING
+#endif
+
+// Occasionally perform unnecessary inflation
+//#define SHAKE
+
+namespace System {
+
+    using Microsoft.Bartok.Runtime;
+    using System.GCs;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    [CCtorIsRunDuringStartup]
+    [NoLoggingForUndo]
+    internal struct MultiUseWord {
+        internal UIntPtr value;
+
+        // Different tag values
+        internal const uint STM_TAG       = 0;
+        internal const uint HASHCODE_TAG  = 1;
+        internal const uint MONITOR_TAG   = 2;
+        internal const uint INFLATED_TAG  = 3;
+
+        // Structure of the multi-use word
+        internal const uint TAG_MASK  = 0x00000003;
+
+        //----------------------------------------------------------------------
+        //
+        // Constructors
+
+        static MultiUseWord() {
+        }
+
+        internal MultiUseWord(UIntPtr value) {
+            this.value = value;
+        }
+
+        internal MultiUseWord(uint tag, UIntPtr payload) {
+            VTable.Assert((tag & TAG_MASK) == tag);
+            VTable.Assert((UIntPtr)(payload & PAYLOAD_MASK) == payload);
+            this.value = (UIntPtr)(tag | (uint)payload);
+            DebugPrint("MUW tag={0:x} uintptr-payload={1:x}\n",
+                       __arglist(tag, payload));
+        }
+
+        internal MultiUseWord(uint tag, Object payload) {
+            UIntPtr addr = Magic.addressOf(payload);
+            VTable.Assert(!(payload is uint));
+            VTable.Assert((tag == MONITOR_TAG) ||
+                          (tag == INFLATED_TAG));
+            VTable.Assert(payload != null);
+            VTable.Assert((addr & PAYLOAD_MASK) == addr);
+            VTable.Assert((addr & (payload.vtable.baseAlignment - 1)) == 0);
+            this.value = (UIntPtr)((UIntPtr)tag |addr);
+            DebugPrint("MUW tag={0:x} object-payload={1:x}\n",
+                       __arglist(tag, Magic.addressOf(payload)));
+        }
+
+        //----------------------------------------------------------------------
+
+        // Accessor methods
+
+        internal uint GetTag() {
+            uint tag = (uint)(this.value & INFLATED_TAG);
+            return tag;
+        }
+
+        internal bool IsUnused() {
+            bool result = (this.value == UIntPtr.Zero);
+            return result;
+        }
+
+        internal bool IsMarked() {
+            bool result = ((this.value & MARK_BIT_MASK) != 0);
+            return result;
+        }
+
+        internal bool IsInflated() {
+            bool result = ((this.value & TAG_MASK) == INFLATED_TAG);
+            return result;
+        }
+
+        internal bool IsHashcode() {
+            bool result = ((this.value & TAG_MASK) == HASHCODE_TAG);
+            return result;
+        }
+
+        internal bool IsMonitor() {
+            bool result = ((this.value & TAG_MASK) == MONITOR_TAG);
+            return result;
+        }
+
+        internal bool IsMonitorOrInflatedTag() {
+            bool result = (this.value & MONITOR_TAG) != 0;
+            return result;
+        }
+
+        internal bool IsSTM() {
+            bool result = ((this.value & TAG_MASK) == STM_TAG);
+            return result;
+        }
+
+        internal bool Eq(MultiUseWord other) {
+            return (other.value == this.value);
+        }
+
+        // Return the payload of the multi-use word as a UIntPtr.
+
+        internal UIntPtr GetPayload() {
+            UIntPtr result = (this.value & PAYLOAD_MASK);
+            return result;
+        }
+
+        // Return the payload of the multi-use word as an object reference.
+        // Asserts that the payload is non-null and that the object that it
+        // refers to has strong enough alignment requirements for the number
+        // of payload bits available.
+
+        internal unsafe Object GetRefPayload() {
+            UIntPtr payload = (UIntPtr) this.GetPayload();
+            Object result = Magic.fromAddress(payload);
+            VTable.Assert(result != null);
+            VTable.Assert(result.vtable != null);
+            VTable.Assert((payload & (result.vtable.baseAlignment - 1)) == 0);
+            return result;
+        }
+
+        // Equivalent to "(EMU) GetRefPayload()", but avoids an explicit
+        // cast.  This is needed during GCs that use the vtable word.
+        internal unsafe EMU GetEMURefPayload() {
+            UIntPtr payload = (UIntPtr) this.GetPayload();
+            EMU result = EMU.FromAddress(payload);
+            VTable.Assert(result != null);
+            VTable.Assert((payload & (result.vtable.baseAlignment - 1)) == 0);
+            return result;
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Get and set an object's MUW.
+
+        [ManualRefCounts]
+        internal static MultiUseWord GetForObject(Object obj) {
+            MultiUseWord result = obj.preHeader.muw;
+
+            DebugPrint("GetForObject({0:x}) = {1:x}\n",
+                       __arglist(Magic.addressOf(obj), result.value));
+
+            return result;
+        }
+
+        internal static void SetForObject(Object obj, MultiUseWord w) {
+            DebugPrint("SetForObject({0:x}, {1:x})\n",
+                       __arglist(Magic.addressOf(obj), w.value));
+
+            obj.preHeader.muw = w;
+        }
+
+        internal static MultiUseWord CompareExchangeForObject(Object obj,
+                                                              MultiUseWord newWord,
+                                                              MultiUseWord oldWord) {
+            DebugPrint("CompareExchangeForObject({0:x}, new={1:x}, old={2:x})\n",
+                       __arglist(Magic.addressOf(obj), newWord.value, oldWord.value));
+
+
+            UIntPtr saw =
+                Interlocked.CompareExchange(ref obj.preHeader.muw.value,
+                                            newWord.value, oldWord.value);
+
+            DebugPrint("CompareExchangeForObject saw {0:x}\n", __arglist(saw));
+
+            return new MultiUseWord(saw);
+        }
+
+        // Get and set the underlying UIntPtr value held in the same
+        // header word that is used for the MUW.  These methods are needed
+        // in MemoryAccounting where the header field is re-used (after
+        // making a private copy of the MUW value).
+
+        internal static UIntPtr GetValForObject(Object obj) {
+            UIntPtr result = obj.preHeader.muw.value;
+
+            DebugPrint("GetValForObject({0:x}) = {1:x}\n",
+                       __arglist(Magic.addressOf(obj), result));
+
+            return result;
+        }
+
+        internal static void SetValForObject(Object obj, UIntPtr w) {
+            DebugPrint("SeValtForObject({0:x}, {1:x})\n",
+                       __arglist(Magic.addressOf(obj), w));
+
+            obj.preHeader.muw.value = w;
+        }
+
+        internal static UIntPtr PAYLOAD_MASK {
+            get { return (UIntPtr.Size == 8)?
+                (UIntPtr)0x7ffffffffffffffc :
+                (UIntPtr)0x7ffffffc; }
+        }
+
+        internal static UIntPtr MARK_BIT_MASK {
+            get { return (UIntPtr.Size == 8)?
+                (UIntPtr)0x8000000000000000 :
+                (UIntPtr)0x80000000; }
+         }
+
+        //----------------------------------------------------------------------
+        //
+        // Shake debugging
+        //
+        // If SHAKE is #defined then we periodically choose to inflate an
+        // object's multi-use-word when it is not necessary to do so.  This
+        // will help test coverage: this design is based on the assumption that
+        // inflation is rare, so let's make sure that it actually works!
+        //
+        // Code guarded by "if (Occasionally()) { ... }" will run occasionally
+        // when shake debugging is enabled, and should be entirely elided when
+        // it is disabled.
+        //
+        // NB: Occasionally() is not thread safe, but note that even if races
+        // allow shakeCtr to overshoot shakeLim then it doesn't matter: we'll
+        // just go around another shakeLim times.
+
+        private static int shakeCtr = 0;
+        private static int shakeLim = 1;
+
+        [Inline]
+        internal static bool Occasionally() {
+            bool result = false;
+#if SHAKE
+            if ((shakeCtr++) % shakeLim == 0) {
+                shakeLim += 10;
+                shakeCtr = 1;
+                result = true;
+            }
+#endif
+            return result;
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Mark bit
+
+        internal static bool IsMarked(Object obj) {
+            MultiUseWord muw = GetForObject(obj);
+            bool result;
+            result = muw.IsMarked();
+            return result;
+        }
+
+        internal static void SetMark(Object obj, bool mark) {
+            MultiUseWord muw = GetForObject(obj);
+            MultiUseWord newMuw;
+            if (mark) {
+                newMuw = new MultiUseWord(muw.value | (UIntPtr)MARK_BIT_MASK);
+            } else {
+                newMuw = new MultiUseWord(muw.value & (UIntPtr)(~MARK_BIT_MASK));
+            }
+            SetForObject(obj, newMuw);
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Monitor
+        //
+        // The implementation of Monitor-related and Hashcode-related operations
+        // is largely the same:
+        //
+        //   - A "Get..." method deals with the fast path operations of either:
+        //     returning the Monitor/Hashcode directly from the MUW or from the
+        //     field containing it in the EMU.
+        //
+        //   - A "Get...Slow" method is responsible for the slow path operations
+        //     of allocating a new monitor/hashcode and inflating a MUW if
+        //     necessary.
+
+        [NoInline]
+        internal static Monitor GetMonitorSlow(Object obj, MultiUseWord muw) {
+            Monitor result = null;
+
+            DebugPrint("GetMonitorSlow obj={0:x} muw={1:x}\n",
+                       __arglist(Magic.addressOf(obj), muw.value));
+
+            // .................................................................
+            //
+            // Firstly: try to allocate a Monitor object and make this reachable
+            // directly from the MUW.
+
+            if (muw.IsUnused() && (!Occasionally())) {
+                Thread thread = Thread.CurrentThread;
+                MultiUseWord newWord;
+                DebugPrint("MUW currently unused for {0:x}, allocating monitor\n",
+                           __arglist(Magic.addressOf(obj)));
+
+                // Remember: either of these allocations may trigger a GC.
+
+                Monitor m = new Monitor();
+
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                DebugPrint("+rc on monitor {0:x}\n", __arglist(Magic.addressOf(m)));
+                IncrementRefCount(m);
+#else
+                EMU emu = new EMU();
+                IncrementMonitorEMUAllocCount();
+                emu.Target = obj;
+                emu.Monitor = m;
+#endif
+
+                newWord = new MultiUseWord(MONITOR_TAG, m);
+                DebugPrint("MUW currently unused for {0:x}, trying to install {1:x}\n",
+                           __arglist(Magic.addressOf(obj), newWord.value));
+
+                MultiUseWord now = CompareExchangeForObject(obj, newWord, muw);
+
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                if (now.Eq(muw)) {
+                    DebugPrint("Installed it\n");
+                    RegisterLostObjForVerifyHeap(obj, m);
+                } else {
+                    DebugPrint("-rc on monitor {0:x}\n", __arglist(Magic.addressOf(m)));
+                    DecrementRefCount(m);
+                }
+#else
+                if (now.Eq(muw)) {
+                    DebugPrint("Installed it\n");
+                    emu.Register();
+                } else {
+                    IncrementAbandonedEMUsCount();
+                }
+#endif
+
+                muw = GetForObject(obj);
+
+                DebugPrint("MUW now {0:x}\n", __arglist(muw.value));
+            }
+
+            // .................................................................
+            //
+            // Secondly: either pick up the Monitor reachable from the MUW,
+            // or from the EMU (inflating if necessary).
+
+            uint tag = muw.GetTag();
+            if (tag == MONITOR_TAG) {
+                result = (Monitor)(muw.GetRefPayload());
+            } else {
+                if (tag != INFLATED_TAG) {
+                    Inflate(obj);
+                    IncrementInflationToCount(MONITOR_TAG);
+                    muw = GetForObject(obj);
+                    tag = muw.GetTag();
+                }
+
+                VTable.Assert(tag == INFLATED_TAG,
+                              "Multi-use word not inflated in GetMonitorSlow");
+
+                EMU emu = muw.GetEMURefPayload();
+
+                VTable.Assert(emu.monitor != UIntPtr.Zero, "Monitor should not be null");
+
+                result = emu.Monitor;
+            }
+
+            DebugPrint("Got monitor {0:x}\n", __arglist(Magic.addressOf(result)));
+            return result;
+        }
+
+        internal static Monitor GetMonitor(Object obj) {
+            Monitor result;
+
+            DebugPrint("GetMonitor[Fast] obj={0:x} on {1:x} type {2:x}\n",
+                       __arglist(Magic.addressOf(obj),
+                                 PageTable.Page(Magic.addressOf(obj)),
+                                 PageTable.MyType(PageTable.Page(Magic.addressOf(obj)))));
+
+            MultiUseWord muw = GetForObject(obj);
+            uint tag = muw.GetTag();
+
+            DebugPrint("GetMonitor[Fast] muw={0:x} tag={1:x}\n",
+                       __arglist(muw.value, tag));
+
+            if (tag == MONITOR_TAG) {
+                result = (Monitor)muw.GetRefPayload();
+            } else {
+                if (tag == INFLATED_TAG) {
+                    EMU emu = muw.GetEMURefPayload();
+                    if (emu.Monitor != null) {
+                        result = emu.Monitor;
+                    } else {
+                        result = GetMonitorSlow(obj, muw);
+                    }
+                } else {
+                    result = GetMonitorSlow(obj, muw);
+                }
+            }
+
+            DebugPrint("Got monitor {0:x}\n", __arglist(Magic.addressOf(result)));
+
+            return result;
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Hashcode
+        //
+        // See comments above regarding monitors.  The implementation of
+        // hashcodes follows the same general pattern aside from the addition
+        // of Get/SetStringState.
+
+        [NoInline]
+        internal static int GetHashCodeSlow(Object obj, MultiUseWord muw) {
+            int result;
+
+            DebugPrint("GetHashCodeSlow obj={0:x} muw={1:x}\n",
+                       __arglist(Magic.addressOf(obj), muw.value));
+
+            // .................................................................
+            //
+            // Firstly: try to choose a hash code place this directly in the MUW.
+
+            if (muw.IsUnused() && (!Occasionally())) {
+                MultiUseWord newWord;
+                DebugPrint("MUW currently unused for {0:x}, choosing hash code\n",
+                           __arglist(Magic.addressOf(obj)));
+                int h = ChooseHashCode(obj);
+                newWord = new MultiUseWord(HASHCODE_TAG, (UIntPtr) h);
+                DebugPrint("MUW currently unused for {0:x}, trying to install {1:x}\n",
+                           __arglist(Magic.addressOf(obj), newWord.value));
+                CompareExchangeForObject(obj, newWord, muw);
+                muw = GetForObject(obj);
+                DebugPrint("MUW now {0:x}\n", __arglist(muw.value));
+            }
+
+            // .................................................................
+            //
+            // Secondly: either pick up the hash code from the MUW, or from the EMU
+            // (inflating if necessary).
+
+            uint tag = muw.GetTag();
+            if (tag == HASHCODE_TAG) {
+                result = (int)(muw.GetPayload());
+            } else {
+                if (tag != INFLATED_TAG) {
+                    Inflate(obj);
+                    IncrementInflationToCount(HASHCODE_TAG);
+                    muw = GetForObject(obj);
+                    tag = muw.GetTag();
+                }
+
+                VTable.Assert(tag == INFLATED_TAG,
+                              "Multi-use word not inflated in GetHashCodeSlow");
+
+                EMU emu = muw.GetEMURefPayload();
+
+                result = emu.HashCode;
+            }
+
+            DebugPrint("Got hash code {0:x}\n", __arglist(result));
+            return result;
+        }
+
+        internal static int GetHashCode(Object obj) {
+            int result;
+
+            DebugPrint("GetHashCode[Fast] obj={0:x}\n",
+                       __arglist(Magic.addressOf(obj)));
+
+            MultiUseWord muw = GetForObject(obj);
+            uint tag = muw.GetTag();
+
+            DebugPrint("GetHashCode[Fast] muw={0:x} tag={1:x}\n",
+                       __arglist(muw.value, tag));
+
+            if (tag == HASHCODE_TAG) {
+                result = (int)(muw.GetPayload());
+            } else {
+                if (tag == INFLATED_TAG) {
+                    EMU emu = muw.GetEMURefPayload();
+                    result = emu.HashCode;
+                } else {
+                    return GetHashCodeSlow(obj, muw);
+                }
+            }
+
+            DebugPrint("Got hash code {0:x}\n", __arglist(result));
+            return result;
+        }
+
+        internal static StringState GetStringState(String str) {
+            int result = GetHashCode(str);
+            VTable.Assert(((result == (int)StringState.Undetermined) ||
+                           (result == (int)StringState.HighChars) ||
+                           (result == (int)StringState.FastOps) ||
+                           (result == (int)StringState.SpecialSort)));
+            return (StringState) result;
+        }
+
+        // Forcible set the StringState bits in the hashcode word.
+        //
+        // There is a subtle, benign and unlikely race in this code:
+        // we may execute Interlocked.CompareExchange on the emu.HashCode
+        // field at exactly the same time that another thread re-inflates
+        // the object.  The current code loops until it successfully
+        // writes the intended value into the hashcode field.  However,
+        // note that if concurrent threads call SetHashCode then it might
+        // be possible for a value to be re-written: the first thread
+        // may update emu.HashCode, a second thread re-inflates the
+        // object, a third thread then calls SetHashCode successfully
+        // and then the first thread observes the race with the second
+        // and writes its value again.  This race is benign for the
+        // case of StringState flags: the value written depends on the
+        // immutable contents of the string.
+
+        internal static void SetStringState(String str, StringState st) {
+            bool done = false;
+
+            DebugPrint("SetStringState str={0:x} hashcode={1:x}\n",
+                       __arglist(Magic.addressOf(str), st));
+
+            do {
+                MultiUseWord oldMUW = GetForObject(str);
+                uint tag = oldMUW.GetTag();
+                DebugPrint("SetStringState muw={0:x} tag={1:x}\n",
+                           __arglist(oldMUW.value, tag));
+
+                if ((oldMUW.IsUnused() && (!Occasionally())) ||
+                    (tag == HASHCODE_TAG)) {
+                    MultiUseWord newMUW = new MultiUseWord(HASHCODE_TAG,
+                                                           (UIntPtr)st);
+                    MultiUseWord sawMUW = CompareExchangeForObject(str,
+                                                                   newMUW,
+                                                                   oldMUW);
+                    done = (sawMUW.Eq(oldMUW));
+                } else {
+                    if (tag != INFLATED_TAG) {
+                        Inflate(str);
+                        oldMUW = GetForObject(str);
+                        tag = oldMUW.GetTag();
+                    }
+
+                    VTable.Assert(tag == INFLATED_TAG,
+                                  "Multi-use word not inflated in SetStringState");
+
+                    EMU emu = oldMUW.GetEMURefPayload();
+                    int oldStringState = emu.hashCode;
+                    int sawStringState = Interlocked.CompareExchange(ref emu.hashCode,
+                                                                  (int)st,
+                                                                  oldStringState);
+                    MultiUseWord newMUW = GetForObject(str);
+
+                    done = ((sawStringState == oldStringState) &&
+                            (newMUW.Eq(oldMUW)));
+                }
+            } while (!done);
+
+            VTable.Assert(GetHashCode(str) == (int)st,
+                          "HashCode does not match StringState");
+        }
+
+        // Choose a hashcode to use for the supplied object.  The resulting
+        // hashcode must fit in the payload in the MUW; in practice an address
+        // can be used, but it may be worth revisiting this choice if using
+        // a small nursery.
+
+        internal static int ChooseHashCode(Object obj) {
+            int result;
+            if (obj is String) {
+                // If the object is a string then this word holds its
+                // StringState value instead.  We call ChooseHashCode
+                // when getting an object hash code for the first time,
+                // or when inflating it.  Only the latter applied for
+                // String objects.
+                result = 0;
+            } else {
+                // Hash code is int32. Unfortunately we cannot change that assumption.
+                // The following cast will return only the lower bits in x64.
+                // But it should not affect correctness.
+                result = (int) (Magic.addressOf(obj) & PAYLOAD_MASK);
+            }
+            DebugPrint("Chosen hash code {0:x} for {1:x}\n",
+                       __arglist(result, Magic.addressOf(obj)));
+            return result;
+        }
+
+#if !VC
+        //----------------------------------------------------------------------
+        //
+        // STM
+        //
+        // The interaction between the STM and the multi-use-word is more complex
+        // than that of GetMonitor and GetHashCode.
+        //
+        // The abstractions used are as follows:
+        //
+        //   - A STMHandle provides a reference to the MUW on a
+        //     given object.  It provides all of the methods through which the
+        //     STM implementation accesses the MUW.
+        //
+        //   - A STMSnapshot represents a saved view of the MUW at a given
+        //     instant in time.  The snapshot is used when validating a
+        //     transaction: if the current snapshot matches a saved snapshot
+        //     then no update has been committed to the object in-between.
+        //
+        //   - A STMWord represents the meta-data that the STM itself wishes
+        //     to maintain about the object.  Its structure is defined in
+        //     TryAll.cs, but in outline, it either holds a version number for
+        //     the object, or holds a pointer to an UpdateEnlistmentLog.Entry
+        //     structure for the transaction that's currently got the object
+        //     opened for update.
+        //
+        // When an object's MUW is used only for STM operations then the
+        // STMSnapshot and the STMWord both come directly from the MUW.
+        //
+        // When an object has been used for one purpose other than the STM
+        // then its STMWord is conceptually 0 (this is safe: it's not been
+        // used by the STM so no updates have been committed to it).
+        //
+        // If an object has been inflated then the value in the MUW still
+        // forms the STMSnapshot, but the STMWord is displaced to the
+        // EMU.
+
+        [NoLoggingForUndo]
+        internal struct STMSnapshot {
+
+            internal UIntPtr value;
+
+            internal STMSnapshot (UIntPtr value) {
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                VTable.Assert(false, "STM not supported with RC collector");
+#endif
+                this.value = value;
+            }
+
+            // Map from an STMSnapshot to an STMWord.  Ordinarily we
+            // hope the object has an STM_TAG and the STMWord comes directly
+            // from the snapshot.
+
+            [Inline]
+            internal STMWord GetSTMWord() {
+                uint snapshotTag = (this.value & TAG_MASK);
+                STMWord result;
+
+                if (snapshotTag == STM_TAG) {
+                    // STMWord is held in the MUW's payload
+                    result = new STMWord(this.value);
+
+                } else if (snapshotTag == INFLATED_TAG) {
+                    // STMWord is held out-of-line in the EMU
+                    EMU emu = EMU.FromAddress((UIntPtr)
+                                              (this.value & PAYLOAD_MASK));
+                    result = emu.stmWord;
+
+                } else {
+                    // STMWord is conceptually zero: the object has a hashcode
+                    // or Monitor, but has never been opened for update by the STM.
+                    result = new STMWord(UIntPtr.Zero);
+                }
+
+                DebugPrint("Got word {0:x} from snapshot {1:x}\n",
+                           __arglist(result.value, this.value));
+
+                return result;
+            }
+
+            // Fast test of whether a snapshot is quiescent, on the assumption
+            // that the snapshot is likely to be an STM word.
+
+            [Inline]
+            internal uint ZeroIfMustBeQuiescent() {
+                VTable.Assert(STM_TAG == 0);
+                return (this.value & (TAG_MASK | STMWord.IS_OWNED_MASK));
+            }
+
+            // Visit an STMSnapshot during GC.  We need to update any
+            // pointer-derived values that it contains.  There are two
+            // cases:
+            //
+            //  a. It refers to a Monitor or an EMU structure: extract the
+            //     pointer, visit that, and then pack it back up with the
+            //     appropriate tag.
+            //
+            //  b. It contains an STMWord: unpack that, then call the
+            //     STM's method than knows how to deal with STMWords.
+
+            internal unsafe void Visit(NonNullReferenceVisitor v) {
+                MultiUseWord muw = new MultiUseWord(this.value);
+                DebugPrint("Visit STM snapshot {0:x}\n", __arglist(muw.value));
+                uint tag = muw.GetTag();
+                if (tag == MONITOR_TAG || tag == INFLATED_TAG) {
+                    // Pointer-derived value managed by MultiUseWord.cs
+                    UIntPtr payload = (UIntPtr) muw.GetPayload();
+                    v.Visit(&payload);
+                    muw = new MultiUseWord(tag, payload);
+                }
+
+                if (tag == STM_TAG) {
+                    // Opaque value (possibly pointer-derived) managed by
+                    // TryAll.cs
+                    STMWord stmWord = GetSTMWord();
+                    stmWord.Visit(v);
+                    muw = new MultiUseWord(tag, stmWord.value);
+                }
+
+                DebugPrint("Visit STM snapshot, result = {0:x}\n",
+                           __arglist(muw.value));
+                this.value = muw.value;
+            }
+
+            internal bool Eq(STMSnapshot other) {
+                return (this.value == other.value);
+            }
+
+            internal bool Neq(STMSnapshot other) {
+                return (this.value != other.value);
+            }
+        }
+
+
+        [NoLoggingForUndo]
+        internal struct STMHandle {
+            internal UIntPtr addr;
+
+#if !DEBUG
+            [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+            internal unsafe STMHandle(Object obj) {
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                VTable.Assert(false, "STM not supported with RC collector");
+#endif
+                this.addr = Magic.addressOf(obj);
+            }
+
+#if !DEBUG
+            [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+            internal unsafe STMSnapshot GetSTMSnapshot() {
+                Object obj = Magic.fromAddress(this.addr);
+                return new STMSnapshot(obj.preHeader.muw.value);
+            }
+
+            internal unsafe void SetSTMWordAtAllocation(STMWord s) {
+                VTable.Assert(GetSTMSnapshot().value == UIntPtr.Zero);
+                VTable.Assert((s.value & TAG_MASK) == STM_TAG);
+                Object obj = Magic.fromAddress(this.addr);
+                obj.preHeader.muw.value = s.value;
+            }
+
+            internal unsafe void SetSTMWordAtGC(NonNullReferenceVisitor rv,
+                                                STMWord s) {
+                VTable.Assert((s.value & TAG_MASK) == STM_TAG);
+                UIntPtr curSnapVal = GetSTMSnapshot().value;
+                uint curTag = (curSnapVal & TAG_MASK);
+                if (curTag == STM_TAG) {
+                    Object obj = Magic.fromAddress(this.addr);
+                    obj.preHeader.muw.value = s.value;
+                } else {
+                    UIntPtr ptrVal = (UIntPtr)curSnapVal & (UIntPtr)PAYLOAD_MASK;
+                    rv.Visit(&ptrVal);
+                    EMU emu = EMU.FromAddress(ptrVal);
+                    emu.stmWord.value = s.value;
+                }
+            }
+
+            // Attempt to update the STMWord for the object that this handle
+            // refers to.
+            //
+            // If the object has not been inflated then the STM word is held
+            // directly in the MUW: try to update it with a compare and swap.
+            //
+            // If the object has been inflated then the STM word is held out-of-line
+            // in the EMU.  Map from the supplied snapshot to the EMU, and then
+            // do a compare and swap on the STMWord field that it contains.
+
+            internal unsafe bool CompareExchangeSTMWord(UIntPtr newWord,
+                                                        UIntPtr oldWord,
+                                                        STMSnapshot oldSnapshot) {
+                UIntPtr oldSnapVal = oldSnapshot.value;
+                VTable.Assert((newWord & TAG_MASK) == 0);
+                VTable.Assert((oldWord & TAG_MASK) == 0);
+                uint oldTag = (oldSnapVal & TAG_MASK);
+                bool result;
+
+                VTable.Assert((newWord & MARK_BIT_MASK) == 0);
+                VTable.Assert((oldWord & MARK_BIT_MASK) == 0);
+
+                DebugPrint("CompareExchangeSTMWord on {0:x}, {1:x}/{2:x} -> {3:x}\n",
+                           __arglist(this.addr, oldSnapVal, oldWord, newWord));
+
+                if (oldTag == STM_TAG) {
+                    VTable.Assert(oldWord == oldSnapshot.value);
+                    Object obj = Magic.fromAddress(this.addr);
+                    result = (Interlocked.CompareExchange(ref obj.preHeader.muw.value,
+                                                          newWord,
+                                                          oldWord) == oldWord);
+                } else {
+                    if  (oldTag != INFLATED_TAG) {
+                        DebugPrint("CompareExchangeSTMWord triggered inflation\n");
+                        Object obj = Magic.fromAddress(this.addr);
+                        Inflate(obj);
+                        IncrementInflationToCount(STM_TAG);
+                        oldSnapVal = GetForObject(obj).value;
+                    }
+
+                    EMU emu = new MultiUseWord(oldSnapVal).GetEMURefPayload();
+                    result = (Interlocked.CompareExchange(ref emu.stmWord.value,
+                                                          newWord,
+                                                          oldWord) == oldWord);
+                }
+                return result;
+            }
+
+            internal unsafe void RefreshSTMWord(STMWord newWord) {
+                DebugPrint("RefreshSTMValue on {0:x} to {1:x}\n",
+                           __arglist(this.addr, newWord.value));
+
+                Object obj = Magic.fromAddress(this.addr);
+                UIntPtr curVal = obj.preHeader.muw.value;
+                uint curTag = (curVal & TAG_MASK);
+                VTable.Assert((curTag == STM_TAG) ||
+                              (curTag == INFLATED_TAG));
+                if (curTag == STM_TAG) {
+                    VTable.Assert((newWord.value & TAG_MASK) == 0);
+                    UIntPtr saw = Interlocked.CompareExchange(ref obj.preHeader.muw.value,
+                                                              newWord.value,
+                                                              curVal);
+
+                    // NB: we have the object opened for update, and so if our
+                    // Interlocked.CompareExchange failed then it must be because another
+                    // thread triggered inflation.
+                    if (saw != curVal) {
+                        VTable.Assert((saw & TAG_MASK) ==
+                                      INFLATED_TAG);
+                        ReInflate(obj, newWord);
+                    }
+
+                    if (Occasionally()) {
+                        MultiUseWord m = GetForObject(obj);
+                        if (!(m.IsInflated())) {
+                            Inflate(obj);
+                            IncrementInflationToCount(STM_TAG);
+                        }
+                    }
+                } else {
+                    ReInflate(obj, newWord);
+                }
+            }
+
+            // Visit the object that the STMHandle refers to.  This is usually used
+            // with a visitor that treats the reference as weak; we return false
+            // if the visitor null's out the object reference.
+            internal unsafe bool Visit(NonNullReferenceVisitor v) {
+                UIntPtr t = this.addr;
+                v.Visit(&t);
+                if (t == UIntPtr.Zero) {
+                    return false;
+                } else {
+                    this.addr = t;
+                    return true;
+                }
+            }
+
+            internal unsafe bool IsMarked() {
+                Object obj = Magic.fromAddress(this.addr);
+                MultiUseWord muw = obj.preHeader.muw;
+                return muw.IsMarked();
+            }
+
+            internal unsafe void SetMark(bool mark) {
+                Object obj = Magic.fromAddress(this.addr);
+                MultiUseWord muw = obj.preHeader.muw;
+                MultiUseWord newMuw;
+                if (mark) {
+                    newMuw = new MultiUseWord(muw.value | (UIntPtr)MARK_BIT_MASK);
+                } else {
+                    newMuw = new MultiUseWord(muw.value & (UIntPtr)(~MARK_BIT_MASK));
+                }
+                obj.preHeader.muw = newMuw;
+            }
+
+            internal static void ReInflate(Object obj, STMWord newWord) {
+                MultiUseWord saw;
+                EMU curEMU;
+
+                // Allocate new EMU first so that we do not have to consider
+                // GC during the rest of this function.
+                EMU newEMU = new EMU();
+                IncrementReInflationCount();
+
+                // Transfer current emu contents to the new EMU.
+                saw = GetForObject(obj);
+                VTable.Assert(saw.IsInflated());
+                VTable.Assert(!saw.IsMarked());
+                curEMU = saw.GetEMURefPayload();
+                VTable.Assert(curEMU.Target == obj);
+                newEMU.Target = obj;
+                newEMU.Monitor = curEMU.Monitor;
+                newEMU.HashCode = curEMU.HashCode;
+                newEMU.stmWord = newWord;
+
+                // Install new EMU in place of existing one
+                curEMU.Target = null;
+                SetForObject(obj, new MultiUseWord(INFLATED_TAG, newEMU));
+                newEMU.Register();
+
+                DebugPrint("ReInflation: EMU {0:x} becomes {1:x}\n",
+                           __arglist(Magic.addressOf(curEMU),
+                                     Magic.addressOf(newEMU)));
+
+            }
+        }
+#endif
+
+        //----------------------------------------------------------------------
+        //
+        // Cause the multi-use word on "obj" to be inflated.
+        //
+        // This method guarantees that obj is inflated before it returns:
+        // however, it may be that the inflation itself is performed by a
+        // second thread if multiple threads race to inflate the same object.
+        //
+        // For simplicity of code we allocate a Monitor for each inflated
+        // object.  This will cause unnecessary monitor allocations in
+        // applications where GetHashCode and STM operations are performed
+        // on the same object (otherwise, at least one of the operations
+        // requiring the MUW is a GetMonitor call).
+        //
+        // Why can't we just leave the Monitor field NULL and allocate the
+        // Monitor lazily?  The problem is how to avoid a race with the
+        // STM which must do the same thing with its field in the EMU
+        // object -- suppose thread A is about to re-inflate an object
+        // just when thread B is about to install a Monitor in the EMU.
+        // The monitor would be lost.
+        //
+        // If the extra Monitor allocations are a problem then we could
+        // use a more complicated handshaking scheme whereby a thread that
+        // is reinflating an object must install a distinct value in the
+        // EMU's monitor field.
+
+        internal static void Inflate(Object obj) {
+
+            MultiUseWord saw = GetForObject(obj);
+            while (!saw.IsInflated()) {
+                VTable.Assert(!saw.IsInflated());
+                VTable.Assert(!saw.IsMarked());
+
+                // Remember: extract any reference-typed payload from "saw"
+                // before we do anything that might trigger a GC.
+
+                uint sawTag = saw.GetTag();
+                int hashCode = (sawTag == HASHCODE_TAG)
+                    ? (int)(saw.GetPayload()) : ChooseHashCode(obj);
+                Monitor monitor = (sawTag == MONITOR_TAG)
+                    ? (Monitor)(saw.GetRefPayload()) : new Monitor();
+                EMU emu = new EMU();
+                IncrementFullEMUAllocCount();
+
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                if (sawTag != MONITOR_TAG) {
+                    DebugPrint("+rc on monitor {0:x}\n",
+                               __arglist(Magic.addressOf(monitor)));
+                    IncrementRefCount(monitor);
+                }
+                DebugPrint("+rc on emu {0:x}\n", __arglist(Magic.addressOf(emu)));
+                IncrementRefCount(emu);
+#endif
+
+                emu.Target = obj;
+                emu.Monitor = monitor;
+                emu.HashCode = hashCode;
+#if !VC
+                emu.stmWord = ((saw.value & TAG_MASK) == STM_TAG)
+                    ? new STMWord(saw.value) : new STMWord(UIntPtr.Zero);
+#endif
+
+                MultiUseWord newWord = new MultiUseWord(INFLATED_TAG,emu);
+                DebugPrint("Inflating {0:x} from {1:x} to {2:x} with hashcode {3:x}\n",
+                           __arglist(Magic.addressOf(obj),
+                                     saw.value,
+                                     newWord.value,
+                                     emu.HashCode));
+                MultiUseWord now = CompareExchangeForObject(obj,
+                                                            newWord,
+                                                            saw);
+                if (now.Eq(saw)) {
+                    // Inflation successful
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                    RegisterLostObjForVerifyHeap(obj, emu);
+#else
+                    emu.Register();
+#endif
+                    IncrementInflationFromCount(saw.GetTag());
+                    break;
+                } else {
+                    // Inflation not successful
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+                    if (sawTag != MONITOR_TAG) {
+                        DebugPrint("-rc on monitor {0:x}\n",
+                                   __arglist(Magic.addressOf(monitor)));
+                        DecrementRefCount(monitor);
+                    }
+                    DebugPrint("-rc on emu {0:x}\n",
+                               __arglist(Magic.addressOf(emu)));
+                    DecrementRefCount(emu);
+#endif
+                    IncrementAbandonedEMUsCount();
+                }
+
+                saw = now;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // GC support (reference counting collector)
+        //
+        // NB: STM is not supported with the reference counting collector.  This
+        // is a limitation in TryAll.cs, not specifically here.
+        //
+        // The Monitor and EMU objects allocated here are managed as follows:
+        //
+        //  - The compiler automatically inserts RC modifications when
+        //    casting the MUW's payload to a reference type (either a Monitor or
+        //    an EMU).
+        //
+        //  - We manually increment and decrement the count on a Monitor or
+        //    EMU object while it is reachable from the multi-use word.
+        //    That is, we increment the count just before making it reachable
+        //    from the word, and we decrement the count (a) when the object
+        //    it's associated has count of 0, or (b) when we inflate a Monitor
+        //    with an EMU.
+        //
+        //  - The Monitor and EMU objects are _not_ threaded on a list as they
+        //    are with tracing collectors.  The tracing collectors need the
+        //    list so they can visit the Monitor and EMU objects that are alive
+        //    only because of references from multi-use words (the alternative
+        //    is for the GC to visit all MultiUseWords, but we anticipate most
+        //    holding scalars).
+        //
+        // The RC collector is responsible for calling RefCountGCDeadObjHook (below)
+        // on each object that has a 0 count.  Since we're called from within
+        // the RC collector we use ManualRefCounts and tread carefully when
+        // dealing with pointer-derived values -- i.e. directly extracting
+        // them without automatic RC updates rather than going through the usual
+        // accessors.
+
+        [ManualRefCounts]
+        internal static void RefCountGCDeadObjHook(MultiUseWord muw) {
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+            uint tag = muw.GetTag();
+            VTable.Assert(tag == MONITOR_TAG || tag == INFLATED_TAG,
+                          "tag == MONITOR_TAG || tag == INFLATED_TAG");
+
+            UIntPtr payload = (UIntPtr) muw.GetPayload();
+            Object refPayload = Magic.fromAddress(payload);
+            if (tag == MONITOR_TAG) {
+                Monitor m = (Monitor) refPayload;
+                DebugPrint("-rc on monitor on dead obj {0:x}\n",
+                           __arglist(Magic.addressOf(m)));
+                DecrementRefCount(m);
+            } else {
+                EMU emu = (EMU) refPayload;
+                Monitor m = (Monitor) Magic.fromAddress(emu.monitor);
+                DebugPrint("-rc on monitor on dead obj {0:x}\n",
+                           __arglist(Magic.addressOf(m)));
+                DecrementRefCount(m);
+                DebugPrint("-rc on emu on dead obj {0:x}\n",
+                            __arglist(Magic.addressOf(emu)));
+                DecrementRefCount(emu);
+            }
+#endif
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // GC support (tracing collectors)
+        //
+        // We must co-operate with the GC in order to (a) ensure that active EMU
+        // objects and the Monitors reachable from them are treated as reachable,
+        // (b) allow EMU to be reclaimed when their target is NULL or when their
+        // target has died, and (c) update object header words if a collector
+        // moves an EMU object.
+        //
+        // The implementation must be careful to work with all three tracing
+        // collectors because of the different ways in which they process the
+        // heap during collection (mark-sweep, semispace, sliding).  In overview:
+        //
+        //    Mark-sweep : This is the easy case.  Objects are not moved and
+        //                 their fields remain traversable during collection.
+        //                 A bit in the vtable word is used as a mark bit and
+        //                 so we cannot make ordinary method calls on an object
+        //                 if it may be marked, and we cannot perform other
+        //                 operations that use the vtable (e.g. checked casts).
+        //
+        //    Semispace :  Objects are moved during collection, with the vtable
+        //                 word holding a forwarding pointer.  As above, we must
+        //                 avoid operations that may require the vtable.  Furthermore,
+        //                 if we are going to update an object during GC, we must
+        //                 make sure that we update the to-space version and not
+        //                 the from-space version.  We deal with that by ensuring
+        //                 that all objects accessed have already been visited.
+        //
+        //    Sliding:     This is a mark-compact collector.  During the mark phase
+        //                 an object's vtable word forms the head of a list of
+        //                 references that will need to be updated.  This list
+        //                 is threaded through the object references themselves,
+        //                 so we cannot traverse object-typed fields once an
+        //                 object's fields have been visited.  We avoid this by
+        //                 building our own shadow list of EMU objects: we do not
+        //                 visit the emuGCListShadow and nextShadow fields which
+        //                 make up this list.
+        //
+        // We receive callbacks from these tracing collectors at four times:
+        //
+        // 1. PreGCHook is called with the world stopped but before any marking
+        //    is done on the EMU objects.  At this point we collect recently
+        //    allocated EMU objects from per-thread lists onto a global list at
+        //    emuGCList.  If we're using the sliding collector then we build a
+        //    duplicate shadow list.
+        //    When onlyNew parameter is true, we only scan recently allocated
+        //    EMU objects from per-thread list between GC.
+        //    When onlyNew parameter is false, we scan all the EMU objects
+        //    (newly allocated EMU + EMU that live after previous GC --
+        //    emuGCListAll..emuGCListAllTail)
+        //
+        // 2. VisitStrongRefs is called during the mark phase (for mark-sweep
+        //    and sliding collectors) or during copying (for semispace).  It is
+        //    responsible for visiting the EMU objects and sometimes the Monitor
+        //    objects reachable from them.  The references to these are strong:
+        //    unneeded EMUs are unlinked from emuGCList at the end of a GC cycle
+        //    and reclaimed in the next.
+        //
+        //    Monitor objects can be reclaimed if they are not in use (that is,
+        //    they are not held nor being waited on by any objects).  In this
+        //    case, they are treated as weak references.  If a thread has a
+        //    local reference to an object's monitor and is about to enter when
+        //    a GC occurs, then reclaiming the monitor will result in a lock
+        //    on a disconnected monitor.  This only current works for
+        //    stop-the-world collectors as we would effectively need a read
+        //    barrier on the monitor field to avoid the locking/reclaiming
+        //    race - so collectors marked IsOnTheFlyCollector will always
+        //    treat the references to monitors as strong.
+
+        //
+        //    NB: during VisitStrongRefs we cannot assume that the EMUs have not
+        //    already been visited.  This may happen if e.g. they lie on the same
+        //    page as a pinned object.  This is why we use a visit-before-use
+        //    access pattern.
+        //
+        // 3. VisitWeakRefs is called after the mark phase (for mark-sweep and
+        //    sliding collectors) or after copying (for semispace).  It is no
+        //    longer possible to mark further objects, but it is possible to
+        //    inspect the mark bits via the weak ptr visitor that's passed in.
+        //    During this phase we find all of the EMUs whose targets have
+        //    died.  We record this by nulling out the EMU's target field.
+        //
+        // 4. PostGCHook is called just before restarting the world.  It can
+        //    traverse the heap normally again.  It is responsible for updating
+        //    the MUWs in the objects headers to refer to the new location of
+        //    the EMU or Monitor.
+        //    At the end of PostGCHook, we update emuGCListAll so it has all
+        //    the surviving EMU objects.  We also clear emuGCList.
+        //
+        // Because of the collectors' use of the vtable word, we are careful to
+        // (a) avoid casts during VisitStrongRefs and VisitWeakRefs (hence
+        // EMU.FromAddress, rather than Magic.fromAddress + cast), and
+        // (b) avoid virtual method calls during VisitStrongRefs and VisitWeakRefs
+        // (hence EMU.ToAddress is a static method).
+
+        // TODO: Documentation above does not discuss concurrent collector.
+        // Are there race conditions involving thread termination and collection
+        // on emuGCList?
+
+        private static UIntPtr emuGCList;
+        private static UIntPtr emuGCListShadow;
+        private static UIntPtr emuGCListAll;
+        private static UIntPtr emuGCListAllTail;
+
+        // Collect EMUs that survived previous collections (unless 'onlyNew'
+        // is set).
+        internal static void CollectFromPreviousCollections(bool onlyNew) {
+            if (onlyNew) {
+                // emuGCListAll has entries that we don't want to scan.  We will
+                // add the surviving entries to that list at the end of
+                // PostGCHook.
+                //
+                // emuGCListAll and emuGCListAllTail are both valid for the list
+                // of older items.
+            } else {
+                // We will prepend emuGCListAll to what we already have in
+                // emuGCList (from thread termination) and then scan all of the
+                // entries.
+
+                if(emuGCListAllTail != UIntPtr.Zero) {
+                    EMU.FromAddress(emuGCListAllTail).next = emuGCList;
+                    emuGCList = emuGCListAll;
+                }
+
+                // emuGCListAll and emuGCListAllTail are now bogus and will be
+                // replaced at the end of PostGCHook.
+            }
+        }
+
+        // Called from 'thread', or with the world stopped.  Collects
+        // EMUs allocated by the thread onto the global list.
+        internal unsafe static void CollectFromThread(Thread thread) {
+            if (thread.externalMultiUseObjAllocListHead != UIntPtr.Zero) {
+                DebugPrint("CollectFromThread: thread {0:x}\n",
+                           __arglist(Magic.addressOf(thread)));
+                EMU firstEmu =
+                    EMU.FromAddress(thread.externalMultiUseObjAllocListHead);
+                EMU lastEmu =
+                    EMU.FromAddress(thread.externalMultiUseObjAllocListTail);
+                DebugPrint("CollectFromThread: got {0:x}..{1:x}\n",
+                           __arglist(Magic.addressOf(firstEmu),
+                                     Magic.addressOf(lastEmu)));
+
+                while (true) {
+                    UIntPtr currentFirst = emuGCList;
+                    lastEmu.next = currentFirst;
+
+                    // Splice per-thread list onto the global list.  NB: in
+                    // most cases this can be a direct assignment, but in principle
+                    // a CAS is needed to deal with a race where two threads
+                    // finish concurrently.
+
+                    if (Interlocked.CompareExchange(ref emuGCList,
+                                                    Magic.addressOf(firstEmu),
+                                                    currentFirst) == currentFirst) {
+                        DebugPrint("CollectFromThread: installed\n");
+                        thread.externalMultiUseObjAllocListHead = UIntPtr.Zero;
+                        thread.externalMultiUseObjAllocListTail = UIntPtr.Zero;
+                        break;
+                    } else {
+                        DebugPrint("CollectFromThread: race, retrying install\n");
+                    }
+                }
+            }
+        }
+
+        // Collect recently allocated EMUs from per-thread lists onto
+        // the global EMU list hanging off emuGCList.
+        private static void CollectFromThreads(bool onlyNew) {
+            Thread[] threadTable = Thread.threadTable;
+            int limit = threadTable.Length;
+            for (int i = 0; i < limit; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    CollectFromThread(thread);
+                }
+            }
+        }
+
+        // Called with the world stopped, before marking begins.  Responsible
+        // for updating our list of all EMU objects.
+        internal unsafe static void PreGCHook(bool useShadows) {
+            PreGCHook(useShadows, false);
+        }
+
+        internal unsafe static void PreGCHook(bool useShadows, bool onlyNew) {
+            DebugPrint("GC: PrepareCollectEMUs\n");
+
+            // Collect EMUs that survived previous collections (unless 'onlyNew'
+            // is set).
+            CollectFromPreviousCollections(onlyNew);
+
+            // Collect recently allocated EMUs from per-thread lists onto
+            // the global EMU list hanging off emuGCList.
+            CollectFromThreads(onlyNew);
+
+            if (useShadows) {
+                // Build shadow lists if necessary.  These will not be visited during
+                // GC: they're needed for the sliding collector which updates
+                // fields that are visited during the mark phase.
+                emuGCListShadow = emuGCList;
+                EMU i = EMU.FromAddress(emuGCListShadow);
+                while (i != null) {
+                    i.NextShadow = i.Next;
+                    i = i.Next;
+                }
+            }
+            // count the number of emu in the list.
+            ComputeEmuCount(useShadows);
+        }
+
+        // Called during the mark phase.  Responsible for keeping alive the
+        // EMU objects and the Monitors reachable from them.
+        internal unsafe static
+        void VisitStrongRefs(NonNullReferenceVisitor strongReferenceVisitor,
+                             bool useShadows)
+        {
+            DebugPrint("GC: VisitStrongRefs\n");
+
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+            VisitStrongRefsRC(strongReferenceVisitor);
+#else
+            VisitStrongRefsNonRC(strongReferenceVisitor, useShadows);
+#endif
+        }
+
+
+        // With the RC collector VisitStrongRefs is only called during VerifyHeap
+        // when traversing the heap to find the objects that are reachable.  We
+        // need to visit any Monitor and EMU objects that are kept alive via
+        // MUWs.
+        //
+        // Because this is not fast-path code, we just visit every object in the
+        // heap and visit reference-derived values in the MUW field, and (for inflated
+        // objects) in the Monitor field of the EMU.  We keep a separate list of
+        // Monitor and EMU objects that have been retained from objects in
+        // non-GC pages (e.g. from locking on RuntimeType objects).
+
+#if REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC
+        internal unsafe static
+        void VisitStrongRefsRC(NonNullReferenceVisitor strongRefVisitor)
+        {
+            VTable.Assert(VerificationMode, @"VerificationMode");
+
+            DebugPrint("GC: VisitStrongRefsRC");
+
+            VTable.Assert(emuGCList == UIntPtr.Zero);
+
+            Visitor.Initialize(strongRefVisitor);
+            SegregatedFreeList.VisitAllObjects(Visitor);
+        }
+
+        private static MUWVisitor Visitor = new MUWVisitor();
+
+        private class MUWVisitor : SegregatedFreeList.ObjectVisitor {
+
+            private NonNullReferenceVisitor Visitor;
+
+            [ManualRefCounts]
+            internal override void VisitSmall(Object obj, UIntPtr memAddr) {
+                this.Visit(obj);
+            }
+
+            [ManualRefCounts]
+            internal override UIntPtr VisitLarge(Object obj) {
+                return this.Visit(obj);
+            }
+
+            [ManualRefCounts]
+            internal override unsafe UIntPtr Visit(Object obj) {
+                MultiUseWord muw = GetForObject(obj);
+                uint tag = muw.GetTag();
+                if (tag == MONITOR_TAG || tag == INFLATED_TAG) {
+                    UIntPtr payload = (UIntPtr) muw.GetPayload();
+                    DebugPrint("GC: VisitStrongRefsRC visiting {0:x}\n",
+                               __arglist(payload));
+                    this.Visitor.Visit(&payload);
+                    if (tag == INFLATED_TAG) {
+                        EMU emu = EMU.FromAddress((UIntPtr)muw.GetPayload());
+                        UIntPtr m = emu.monitor;
+                        DebugPrint("GC: VisitStrongRefsRC visiting {0:x}\n",
+                                   __arglist(m));
+                        this.Visitor.Visit(&m);
+                    }
+                }
+                VTable vtable = obj.vtable;
+                return ObjectLayout.ObjectSize(Magic.addressOf(obj), vtable);
+            }
+
+            [ManualRefCounts]
+            internal void Initialize(NonNullReferenceVisitor visitor) {
+                this.Visitor = visitor;
+            }
+        }
+
+        private static void RegisterLostObjForVerifyHeap(Object owner,
+                                                         Object obj) {
+            if (VerificationMode) {
+                UIntPtr page = PageTable.Page(Magic.addressOf(owner));
+                PageType pageType = PageTable.Type(page);
+                if (PageTable.IsNonGcPage(pageType)) {
+                    DebugPrint("GC: Registering permanent object {0:x} -> {1:x}\n",
+                               __arglist(Magic.addressOf(owner),
+                                         Magic.addressOf(obj)));
+                    PermanentObj po = new PermanentObj();
+                    po.Obj = obj;
+                    po.Next = PermanentObjList;
+                    PermanentObjList = po;
+                }
+            }
+        }
+
+        private static PermanentObj PermanentObjList;
+
+        private class PermanentObj {
+            internal Object Obj;
+            internal PermanentObj Next;
+        }
+#endif
+
+#if REFERENCE_COUNTING_GC
+        [ManualRefCounts]
+        internal static void IncrementRefCount(Object obj) {
+            ReferenceCountingCollector.IncrementRefCount(obj);
+        }
+
+        [ManualRefCounts]
+        internal static void DecrementRefCount(Object obj) {
+            ReferenceCountingCollector.DecrementRefCount(obj);
+        }
+
+        internal static bool VerificationMode {
+            [ManualRefCounts]
+            get {
+                return ReferenceCountingCollector.VerificationMode;
+            }
+        }
+#endif
+
+#if DEFERRED_REFERENCE_COUNTING_GC
+        [ManualRefCounts]
+        internal static void IncrementRefCount(Object obj) {
+            DeferredReferenceCountingCollector.IncrementRefCount(obj);
+        }
+
+        [ManualRefCounts]
+        internal static void DecrementRefCount(Object obj) {
+            DeferredReferenceCountingCollector.DecrementRefCount(obj);
+        }
+
+        internal static bool VerificationMode {
+            [ManualRefCounts]
+            get {
+                return DeferredReferenceCountingCollector.VerificationMode;
+            }
+        }
+#endif
+
+
+        // With a tracing collector we visit Monitor and EMU objects by linking
+        // them on emuGCList.  This avoids us needing to visit MUWs on all objects
+        // in the heap on every GC.
+
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+        internal unsafe static
+        void VisitStrongRefsNonRC(NonNullReferenceVisitor strongRefVisitor,
+                                  bool useShadows)
+        {
+            DebugPrint("GC: VisitStrongRefsNonRC\n");
+
+            fixed (UIntPtr *loc = &emuGCList) {
+                if (*loc != UIntPtr.Zero) {
+                    strongRefVisitor.Visit(loc);
+                }
+            }
+
+            EMU emu = EMU.FromAddress(useShadows ? emuGCListShadow : emuGCList);
+            while (emu != null) {
+                // Visit the EMU's monitor field
+
+                if (emu.monitor != UIntPtr.Zero) {
+
+                    Monitor m = Monitor.FromAddress(emu.monitor);
+
+                    if (!GC.installedGC.IsOnTheFlyCollector
+                        && m != null && !m.IsInUse() && emu.IsMonitor()) {
+                        // Do nothing.  The monitor will be treated as a
+                        // weak reference instead.
+                    } else {
+                        DebugPrint
+                            ("GC: Visiting {0:x}'s monitor field {1:x}\n",
+                             __arglist(Magic.addressOf(emu), emu.monitor));
+                        fixed (UIntPtr* loc = &emu.monitor) {
+                            strongRefVisitor.Visit(loc);
+                        }
+                        DebugPrint("GC: Now {0:x}\n",
+                                   __arglist(emu.monitor));
+                    }
+                }
+
+#if !VC
+                // Visit the EMU's STM word
+                DebugPrint("GC: Visiting {0:x}'s STM word {1:x}\n",
+                           __arglist(Magic.addressOf(emu), emu.stmWord.value));
+                STMWord w = emu.stmWord;
+                w.Visit(strongRefVisitor);
+                emu.stmWord = w;
+                DebugPrint("GC: Now {0:x}\n",
+                           __arglist(emu.stmWord.value));
+#endif
+
+                // Visit the EMU's next field
+                DebugPrint("GC: Visiting {0:x}'s next field {1:x}\n",
+                           __arglist(Magic.addressOf(emu), emu.next));
+                fixed (UIntPtr *loc = &emu.next) {
+                    if (*loc != UIntPtr.Zero) {
+                        strongRefVisitor.Visit(loc);
+                    }
+                }
+                DebugPrint("GC: Now {0:x}\n",
+                           __arglist(emu.next));
+
+                emu = useShadows ? emu.NextShadow : emu.Next;
+            }
+
+            DebugPrint("GC: VisitStrongRefsNonRC done\n");
+        }
+#endif
+
+        // Called after the mark phase.  Responsible for identifying EMU objects
+        // whose targets have become dead.  This is indicated by the
+        // weakReferenceVisitor nulling out the target field.  Any such EMUs
+        // are then cut out of the global list in PostGCHook.
+        internal unsafe static
+        void VisitWeakRefs(NonNullReferenceVisitor weakReferenceVisitor,
+                           bool useShadows)
+        {
+            DebugPrint("GC: VisitWeakRefs\n");
+
+            EMU emu = EMU.FromAddress(useShadows ? emuGCListShadow : emuGCList);
+            while (emu != null) {
+                if (emu.monitor != UIntPtr.Zero) {
+
+                    Monitor m = Monitor.FromAddress(emu.monitor);
+
+                    if (!GC.installedGC.IsOnTheFlyCollector
+                        && m != null && !m.IsInUse() && emu.IsMonitor()) {
+                        DebugPrint
+                            ("GC: Visiting {0:x}'s monitor field {1:x}\n",
+                             __arglist(Magic.addressOf(emu), emu.monitor));
+                        fixed (UIntPtr *loc = &emu.monitor) {
+                            weakReferenceVisitor.Visit(loc);
+                        }
+                        DebugPrint("GC: Now {0:x}\n", __arglist(emu.monitor));
+                    }
+                }
+
+                DebugPrint("GC: Visiting {0:x}'s target field {1:x}\n",
+                           __arglist(Magic.addressOf(emu), emu.target));
+
+                fixed (UIntPtr *loc = &emu.target) {
+                    if (*loc != UIntPtr.Zero) {
+                        weakReferenceVisitor.Visit(loc);
+                    }
+                }
+                DebugPrint("GC: Now {0:x}\n", __arglist(emu.target));
+                emu = useShadows ? emu.NextShadow : emu.Next;
+            }
+        }
+
+        // Called just before starting the world.  Responsible for excising
+        // unneeded EMUs from the global list and for updating the MUW header
+        // in objects whose EMU or Monitor may have moved.
+        internal unsafe static void PostGCHook() {
+            PostGCHook(false);
+        }
+
+        internal unsafe static void PostGCHook(bool onlyNew) {
+            DebugPrint("GC: PostGCHook\n");
+
+            EMU emu = EMU.FromAddress(emuGCList);
+
+            // We traverse emuGCList with prevLivingEMU pointing to the
+            // most recent entry that should be kept in the list.
+            EMU prevLivingEMU = null;
+            bool inDeadRun = false;
+
+            while (emu != null) {
+                bool live = false;
+
+                if (emu.target != UIntPtr.Zero) {
+                    // Either (a) the EMU really is still needed, or (b) the
+                    // EMU was allocated when a Monitor was provided for the
+                    // object and it's been replaced by a full EMU.
+                    // or (c) the emu was only a monitor which has been removed
+                    // and emu needs to be removed also
+
+                    MultiUseWord muw = GetForObject(emu.Target);
+                    DebugPrint("GC: {0:x} target non-null {1:x}, tag {2:x}\n",
+                               __arglist(Magic.addressOf(emu),
+                                         emu.target,
+                                         muw.GetTag()));
+
+                    VTable.Assert(muw.IsInflated() || muw.IsMonitor());
+
+                    if (muw.IsMonitor()) {
+                        // MONITOR_TAG on the object: keep the EMU (it must be
+                        // a monitor EMU).
+                        VTable.Assert(emu.IsMonitor());
+
+                        // This monitor was unused, thus set to zero when visiting
+                        // Set the muw in object to unused and remove emu
+
+                        if (emu.monitor == UIntPtr.Zero)
+                        {
+                            MultiUseWord muwTemp = new MultiUseWord(UIntPtr.Zero);
+                            SetForObject(emu.Target, muwTemp);
+                            emu.target = UIntPtr.Zero;
+                        } else {
+                            muw = new MultiUseWord(MONITOR_TAG, emu.Monitor);
+                            SetForObject(emu.Target, muw);
+                            live = true;
+                        }
+
+                    } else {
+                        // INFLATED_TAG on the object: only keep the EMU
+                        // if it's a full EMU.
+                        if (!emu.IsMonitor()) {
+                            muw = new MultiUseWord(INFLATED_TAG, emu);
+                            SetForObject(emu.Target, muw);
+                            live = true;
+                        }
+                    }
+                }
+
+                if (live) {
+                    // If this EMU is still needed then cut out any
+                    // run of dead predecessors in the list.
+
+                    DebugPrint("GC: {0:x} is alive\n", __arglist(EMU.ToAddress(emu)));
+                    if (inDeadRun) {
+                        DebugPrint("GC: {0:x} is new successor of {1:x}\n",
+                                   __arglist(Magic.addressOf(emu),
+                                             Magic.addressOf(prevLivingEMU)));
+                        if (prevLivingEMU == null) {
+                            emuGCList = Magic.addressOf(emu);
+                        } else {
+                            prevLivingEMU.next = Magic.addressOf(emu);
+                        }
+                        inDeadRun = false;
+                    }
+                    prevLivingEMU = emu;
+                } else {
+                    // EMU is not needed.  Either (a) the target was nulled
+                    // out by weakReferenceVisitor, or (b) a new EMU was
+                    // allocated for this target and target was nulled out at
+                    // that point.  In either case we should cut it from the
+                    // list and let it be collected at the next GC.
+
+                    DebugPrint("GC: {0:x} is dead\n",
+                               __arglist(EMU.ToAddress(emu)));
+                    IncrementDeadEMUsCount();
+                    inDeadRun = true;
+                }
+
+                emu = emu.Next;
+            }
+
+            if (inDeadRun) {
+                DebugPrint("GC: {0:x} is new tail\n",
+                           __arglist(Magic.addressOf(prevLivingEMU)));
+                if (prevLivingEMU == null) {
+                    emuGCList = UIntPtr.Zero;
+                } else {
+                    prevLivingEMU.next = UIntPtr.Zero;
+                }
+            }
+
+            if (onlyNew) {
+                // Prepend surviving entries to the list already contained in
+                // emuGCListAll...emuGCListAllTail.
+                if (prevLivingEMU != null) {
+                    prevLivingEMU.next = emuGCListAll;
+                    emuGCListAll = emuGCList;
+                    if (emuGCListAllTail == UIntPtr.Zero) {
+                        emuGCListAllTail = Magic.addressOf(prevLivingEMU);
+                    }
+                }
+            } else {
+                // Replace emuGCListAll with emuGCList because we copied the
+                // "All" list into the list that we just processed.
+                emuGCListAll = emuGCList;
+                emuGCListAllTail = Magic.addressOf(prevLivingEMU);
+            }
+
+            // The emuGCList entries are contained in emuGCListAll, so now clear
+            // emuGCList so that it can start receiving thread termination lists
+            // for the next GC.
+            emuGCList = UIntPtr.Zero;
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Debugging and tracing
+
+        [System.Diagnostics.Conditional("ENABLE_LOG_TRACING")]
+        [NoInline]
+        internal static void DebugPrint(String v, __arglist)
+        {
+            VTable.DebugPrint(v, new ArgIterator(__arglist));
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_LOG_TRACING")]
+        [NoInline]
+        internal static void DebugPrint(String v)
+        {
+            VTable.DebugPrint(v);
+        }
+
+        private static int[] InflationFromCount = new int[TAG_MASK + 1];
+        private static int[] InflationToCount = new int[TAG_MASK + 1];
+        private static int AbandonedEMUsCount = 0;
+        private static int DeadEMUsCount = 0;
+        private static int MonitorEMUAllocCount = 0;
+        private static int FullEMUAllocCount = 0;
+        private static int ReInflationCount = 0;
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementInflationFromCount(uint tag)
+        {
+            VTable.Assert(tag >= 0 && tag <= TAG_MASK);
+            InflationFromCount[tag] ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementInflationToCount(uint tag)
+        {
+            VTable.Assert(tag >= 0 && tag <= TAG_MASK);
+            InflationToCount[tag] ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementReInflationCount()
+        {
+            ReInflationCount ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementAbandonedEMUsCount()
+        {
+            AbandonedEMUsCount ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementDeadEMUsCount()
+        {
+            DeadEMUsCount ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementFullEMUAllocCount()
+        {
+            FullEMUAllocCount ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void IncrementMonitorEMUAllocCount()
+        {
+            MonitorEMUAllocCount ++;
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_PROFILING")]
+        internal static void ComputeEmuCount(bool useShadows)
+        {
+            int total = 0;
+            EMU emu = EMU.FromAddress(useShadows ? emuGCListShadow : emuGCList);
+            while (emu != null) {
+                total++;
+                emu = useShadows ? emu.NextShadow : emu.Next;
+            }
+            Trace.Log(Trace.Area.Emu, "total {0} emu", __arglist(total));
+        }
+
+
+        internal static void DumpTables()
+        {
+#if ENABLE_PROFILING
+            int monitorEMUs = 0;
+            int fullEMUs = 0;
+            int retargetedEMUs = 0;
+
+            // Collect recently allocated EMUs from per-thread lists onto
+            // the global EMU list hanging off emuGCList.
+            CollectFromThreads(false);
+
+            // Count EMUs on the global list
+            EMU i = EMU.FromAddress(emuGCList);
+            while (i != null) {
+                if (i.Target == null) {
+                    retargetedEMUs ++;
+                } else {
+                    MultiUseWord muw = GetForObject(i.Target);
+                    if (muw.IsMonitor()) {
+                        monitorEMUs ++;
+                    } else {
+                        VTable.Assert(muw.IsInflated());
+                        fullEMUs ++;
+                    }
+                }
+                i = i.Next;
+            }
+
+            // Output stats
+            VTable.DebugPrint(@"
+MultiUseWord stats: (non-thread-safe counters)
+Full EMUs allocated:          {0}
+Monitor EMUs allocated:       {1}
+Reinflated EMUs allocated:    {2}
+Total EMUs allocated:         {3}
+",
+__arglist(
+          FullEMUAllocCount, // 0
+          MonitorEMUAllocCount, // 1
+          ReInflationCount, // 2
+          FullEMUAllocCount + MonitorEMUAllocCount + ReInflationCount // 3
+          ));
+
+#if !(REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+            VTable.DebugPrint(@"
+Of which:
+  EMUs abandoned at birth:    {0}
+  EMUs found dead:            {1}
+  Moribund reinflated EMUs:   {2}
+  Live monitor EMUs:          {3}
+  Live full EMUs:             {4}
+  Total EMUs found :          {5}
+",
+__arglist(AbandonedEMUsCount, // 0
+          DeadEMUsCount, // 1
+          retargetedEMUs, // 2
+          monitorEMUs, // 3
+          fullEMUs, // 4
+          (AbandonedEMUsCount +
+           DeadEMUsCount +
+           retargetedEMUs +
+           monitorEMUs +
+           fullEMUs) //5
+          ));
+#endif
+
+            VTable.DebugPrint(@"
+Inflation from STM:           {0}
+          from hashcode:      {1}
+          from monitor:       {2}
+Inflation caused by STM:      {3}
+          caused by hashcode: {4}
+          caused by monitor:  {5}
+",
+__arglist(InflationFromCount[STM_TAG], // 0
+          InflationFromCount[HASHCODE_TAG], // 1
+          InflationFromCount[MONITOR_TAG], // 2
+          InflationToCount[STM_TAG], // 3
+          InflationToCount[HASHCODE_TAG], // 4
+          InflationToCount[MONITOR_TAG] // 5
+          ));
+#endif
+        }
+    }
+
+    internal class EMU {
+        // Scalar fields holding scalar values
+        internal int hashCode;
+#if !VC
+        internal STMWord stmWord;
+#endif
+
+        // Scalar fields holding references (accessed through properties below)
+        internal UIntPtr target;
+        internal UIntPtr monitor;
+        internal UIntPtr next;
+        internal UIntPtr nextShadow;
+
+        public bool IsMonitor() {
+            return (HashCode == 0);
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Scalar properties
+
+        public int HashCode {
+            get {
+                return hashCode;
+            }
+            set {
+                hashCode = value;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Accessor methods for scalar fields holding references
+
+        public Object Target {
+            get {
+                return Magic.fromAddress(target);
+            }
+            set {
+                target = Magic.addressOf(value);
+            }
+        }
+
+        public Monitor Monitor {
+            get {
+                return (Monitor)(Magic.fromAddress(this.monitor));
+            }
+            set {
+                monitor = Magic.addressOf(value);
+            }
+        }
+
+        public EMU Next {
+            get {
+                return FromAddress(this.next);
+            }
+            set {
+                next = Magic.addressOf(value);
+            }
+        }
+
+        public EMU NextShadow {
+            get {
+                return FromAddress(this.nextShadow);
+            }
+            set {
+                nextShadow = Magic.addressOf(value);
+            }
+        }
+
+        internal void Register() {
+            Thread thread = Thread.CurrentThread;
+            if (thread.externalMultiUseObjAllocListHead == UIntPtr.Zero) {
+                VTable.Assert(thread.externalMultiUseObjAllocListTail == UIntPtr.Zero);
+                thread.externalMultiUseObjAllocListHead = Magic.addressOf(this);
+                thread.externalMultiUseObjAllocListTail = Magic.addressOf(this);
+            } else {
+                VTable.Assert(thread.externalMultiUseObjAllocListTail != UIntPtr.Zero);
+                this.next = thread.externalMultiUseObjAllocListHead;
+                thread.externalMultiUseObjAllocListHead = Magic.addressOf(this);
+            }
+        }
+
+
+        //----------------------------------------------------------------------
+        //
+        // Type conversion methods.  Note: (1) we cannot do a checked cast
+        // from Object to EMU during GC (because the GC may be using the
+        // vtable word), (2) we don't make ToAddress an ordinary method in
+        // case it's not compiled with devirtualization and the call goes
+        // through the vtable.
+
+        internal static EMU FromAddress(UIntPtr v) {
+            return Magic.toEMU(Magic.fromAddress(v));
+        }
+
+        internal static UIntPtr ToAddress(EMU i) {
+            return Magic.addressOf(i);
+        }
+    }
+
+    // The StringState enum is only used in String.cs, but kept here because
+    // of the dependence between the values used and the format of the MultiUseWord.
+    // We require that the values are all contained within PAYLOAD_MASK.
+
+    public enum StringState {
+        Undetermined =  0, // Undetermined == 0 assumed in MultiUseWord.cs
+        HighChars =     4,
+        FastOps =       8,
+        SpecialSort =  12,
+    }
+}
diff --git a/base/Kernel/Bartok/Options.cs b/base/Kernel/Bartok/Options.cs
new file mode 100644
index 0000000..9fcdb53
--- /dev/null
+++ b/base/Kernel/Bartok/Options.cs
@@ -0,0 +1,52 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Bartok.Options {
+
+  using System;
+
+  [AttributeUsage(AttributeTargets.Class|
+                  AttributeTargets.Struct|
+                  AttributeTargets.Enum)]
+  public sealed class MixinAttribute : Attribute {
+      internal Type option;
+      public MixinAttribute(Type type) {
+          this.option = type;
+      }
+  }
+
+  [AttributeUsage(AttributeTargets.Class|
+                  AttributeTargets.Struct|
+                  AttributeTargets.Enum,
+                  AllowMultiple=true)]
+  public sealed class MixinConditionalAttribute : Attribute {
+      internal String option;
+      public MixinConditionalAttribute(String option) {
+          this.option = option;
+      }
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor|
+                  AttributeTargets.Field)]
+  public sealed class MixinOverrideAttribute : Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor)]
+  public sealed class MixinExtendAttribute : Attribute {
+      internal String option;
+      public MixinExtendAttribute(String option) {
+          this.option = option;
+      }
+  }
+
+}
diff --git a/base/Kernel/Bartok/Shared.cs b/base/Kernel/Bartok/Shared.cs
new file mode 100644
index 0000000..8f3fc04
--- /dev/null
+++ b/base/Kernel/Bartok/Shared.cs
@@ -0,0 +1,283 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// This code is used in both mscorlibOverride and for building applications
+// (in particular Bartok). This makes sure the constant used in Bartok
+// compiler and mscorlibOverride are the same
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Bartok.Runtime {
+    public enum StructuralType {
+        None            = 0x00,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Reference       = 0x01,
+        UntracedPointer = 0x02,
+        Struct          = 0x03,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Bool            = 0x04,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Char            = 0x05,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Int8            = 0x06,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Int16           = 0x07,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Int32           = 0x08,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Int64           = 0x09,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        UInt8           = 0x0a,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        UInt16          = 0x0b,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        UInt32          = 0x0c,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        UInt64          = 0x0d,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Float32         = 0x0e,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        Float64         = 0x0f,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        IntPtr          = 0x10,
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        UIntPtr         = 0x11,
+        Void            = 0x12,
+    };
+
+    public enum GCType{
+        AdaptiveCopyingCollector            = 0x00,
+        MarkSweepCollector                  = 0x01,
+        SemispaceCollector                  = 0x02,
+        SlidingCollector                    = 0x03,
+        ReferenceCountingCollector          = 0x04,
+        ConcurrentMSCollector               = 0x05,
+        DeferredReferenceCountingCollector  = 0x06,
+        NullCollector                       = 0x07,
+        AtomicRCCollector                   = 0x08,
+        TableMarkSweepCollector             = 0x09,
+    };
+
+    public enum PTType{
+        CentralPT = 0,
+        CentralPTHimem,
+        FlatDistributedPT,
+        FlatDistributedPTTest
+    }; 
+
+    public enum WBType {
+        noWB                         = 0,
+        Generational                 = 1,
+        CMS                          = 2,
+        ARC                          = 3,
+        AllCards                     = 4,
+    };
+
+    public enum RemSetType {
+        noRemSet                     = 0,
+        SSB                          = 1,
+        Cards                        = 2,
+    };
+
+    public enum CopyScanType {
+        noCopyScan                   = 0,
+        CheneyScan                   = 1,
+        HierarchicalScan             = 2,
+        NestedHierarchicalScan       = 3,
+    };
+
+    public class Constants {
+        public const int TypeTestDisplaySize = 6;
+        public const int TypeTestDisplayPosCache = TypeTestDisplaySize + 1;
+        public const bool TypeTestDisplayIncludesObject = false;
+        public const int TypeTestDisplayObjectOffset =
+        TypeTestDisplayIncludesObject ? 1 : 0;
+        public const int LargeObjectBits = 16;
+
+      // constants used by GC activation descriptor table entry
+      public const int InbetweenSlotsNoFP = 1;
+      public const int InbetweenSlotsFP = 2;
+
+      // shared by compact record
+      public const int CompactEntryMaskStart = 6;
+      public const int CompactArgMaskStart = 2;
+      public const int CompactArgMask = 0xf;
+
+      // shared by full record
+      public const int FullEntryMaskStart = 1;
+      public const int FullRecordMask = 0x7;
+#if X86
+      public const int LastBitPos = 31;
+      // Compact record Frame pointer omitted
+      public const int CompactStackBitMaskStartNoFP = 24;
+      public const int CompactEntryMaskNoFP = 0x1f;
+      public const int CompactCalleeSaveUseStartNoFP = 11;
+      public const int CompactCalleeSaveUseMaskNoFP = 0xff;
+      public const int CompactFrameSizeStartNoFP = 19;
+      public const int CompactFrameSizeMaskNoFP = 0x1f;
+
+      // Compact record Use frame pointer
+      public const int CompactStackBitMaskStartFP = 16;
+      public const int CompactEntryMaskFP = 0xf;
+      public const int CompactCalleeSaveUseStartFP = 10;
+      public const int CompactCalleeSaveUseMaskFP = 0x3f;
+
+      // Full record Frame pointer omitted.
+      public const int FullEntryMaskNoFP = 0x1f;
+      public const int FullPinnedPosNoFP = 17;
+      public const int FullPinnedStartNoFP = 18;
+      public const int FullCalleeSaveUseStartNoFP = 6;
+      public const int FullCalleeSaveUseMaskNoFP = 0xff;
+      public const int FullRecordSizePosNoFP = 14;
+      public const int FullFrameSizeStartNoFP = 22;
+
+      // Full record Use Frame pointer
+      public const int FullEntryMaskFP = 0xf;
+      public const int FullPinnedPosFP = 14;
+      public const int FullPinnedStartFP = 15;
+      public const int FullCalleeSaveUseStartFP = 5;
+      public const int FullCalleeSaveUseMaskFP = 0x3f;
+      public const int FullRecordSizePosFP = 11;
+#elif AMD64
+      public const int LastBitPos = 63;
+      // Compact record Frame pointer omitted
+      public const int CompactStackBitMaskStartNoFP = 36;
+      public const int CompactEntryMaskNoFP = 0x1ff;
+      public const int CompactCalleeSaveUseStartNoFP = 15;
+      public const int CompactCalleeSaveUseMaskNoFP = 0xffff;
+      public const int CompactFrameSizeStartNoFP =31;
+      public const int CompactFrameSizeMaskNoFP = 0x1f;
+
+      // Compact record Use frame pointer
+      public const int CompactStackBitMaskStartFP = 28;
+      public const int CompactEntryMaskFP = 0xff;
+      public const int CompactCalleeSaveUseStartFP = 14;
+      public const int CompactCalleeSaveUseMaskFP = 0x3fff;
+
+      // Full record Frame pointer omitted
+      public const int FullEntryMaskNoFP = 0x1ff;
+      public const int FullPinnedPosNoFP = 29;
+      public const int FullPinnedStartNoFP = 30;
+      public const int FullCalleeSaveUseStartNoFP = 10;
+      public const int FullCalleeSaveUseMaskNoFP = 0xffff;
+      public const int FullRecordSizePosNoFP = 26;
+      public const int FullFrameSizeStartNoFP = 38;
+
+      // Full record Use Frame pointer
+      public const int FullEntryMaskFP = 0xff;
+      public const int FullPinnedPosFP = 26;
+      public const int FullPinnedStartFP = 27;
+      public const int FullCalleeSaveUseStartFP = 9;
+      public const int FullCalleeSaveUseMaskFP = 0x3fff;
+      public const int FullRecordSizePosFP = 23;
+#endif
+
+        // Workaround for lack of enum printing in Bartok
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        public static string[] StructuralTypeNames = {
+            "None",
+            "Reference",
+            "UntracedPointer",
+            "Struct",
+            "Bool",
+            "Char",
+            "Int8",
+            "Int16",
+            "Int32",
+            "Int64",
+            "UnsignedInt8",
+            "UnsignedInt16",
+            "UnsignedInt32",
+            "UnsignedInt64",
+            "Float32",
+            "Float64",
+            "IntPtr",
+            "UIntPtr",
+            "Void",
+        };
+
+        // BUGBUG: what about entry for structs?
+#if SINGULARITY
+        [AccessedByRuntime("Referenced from C++")]
+#endif
+        public int[] arrayOfStride = {
+            0,
+            4,
+            4,
+            0,
+            1,
+            2,
+            1,
+            2,
+            4,
+            8,
+            1,
+            2,
+            4,
+            8,
+            4,
+            8,
+            4,
+            4,
+            4,
+        };
+    };
+
+#if !BARTOK_SYSTEM_EXTENSION
+    [RequiredByBartok]
+#endif
+    public enum TypeInitState {
+        Ready = 0,
+        Running = 1,
+        Failed = 2,
+        Completed = 3
+    };
+
+    public enum StageControlOption {
+        TryAllSupport = 0,
+        InstrumentVirtualCalls = 1,
+        PInvoke = 2,
+    };
+}
+
diff --git a/base/Kernel/Bartok/StackHeight.cs b/base/Kernel/Bartok/StackHeight.cs
new file mode 100644
index 0000000..a3b0cff
--- /dev/null
+++ b/base/Kernel/Bartok/StackHeight.cs
@@ -0,0 +1,84 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System {
+  using System.GCs;
+  using System.Runtime.CompilerServices;
+
+  /// <summary>
+  /// Abstraction for information about the stack height.  This is currently
+  /// only used by the logging undo code for determining if a pointer write
+  /// occurred in stack space allocated after the tryall section began.
+  ///
+  /// StackHeight does not record information about the call stack.
+  ///
+  /// The current implementation is hardwired to a stack model where the stack
+  /// is a single contiguous piece of memory that grows by putting smaller
+  /// values into the stack pointer.
+  /// </summary>
+  [RequiredByBartok]
+  internal struct StackHeight {
+      /// <summary>
+      /// Interpret the pointer as a stack pointer to determine the stack
+      /// height.
+      /// </summary>
+      /// <param name="stackPointer">Pointer into the stack.</param>
+      /// <returns>The stack height of the location pointed to by the
+      /// argument.</returns>
+      internal StackHeight(UIntPtr stackPointer) {
+          VTable.Assert(stackPointer == UIntPtr.Zero
+                        || (PageTable.Type(PageTable.Page(stackPointer))
+                            == PageType.Stack));
+          this.stackPointer = stackPointer;
+      }
+
+      /// <summary>
+      /// Interpret the pointer as a stack pointer to determine the stack
+      /// height.
+      /// </summary>
+      /// <param name="stackPointer">Pointer into the stack.</param>
+      /// <returns>The stack height of the location pointed to by the
+      /// argument.</returns>
+      public static explicit operator StackHeight(UIntPtr stackPointer) {
+          return new StackHeight(stackPointer);
+      }
+
+      /// <summary>
+      /// Get the current stack height.
+      /// </summary>
+      /// <returns>The current stack height.</returns>
+      [Intrinsic]
+      internal static extern StackHeight GetStackHeight();
+
+      /// <summary>
+      /// Check if the first stack height represents a deeper location on the
+      /// stack.
+      /// </summary>
+      /// <param name="first">The first stack height to compare.</param>
+      /// <param name="second">The second stack height to compare.</param>
+      /// <returns>True iff the first height is deeper in the stack than the
+      /// second height.</returns>
+      internal static bool Deeper(StackHeight first, StackHeight second) {
+          VTable.Assert(first.stackPointer != UIntPtr.Zero);
+          VTable.Assert(second.stackPointer != UIntPtr.Zero);
+          return first.stackPointer <= second.stackPointer;
+      }
+
+      public override string ToString() {
+          return stackPointer.ToString();
+      }
+
+      /// <summary>
+      /// The value of the stack pointer when the stack height was taken.
+      /// </summary>
+      private UIntPtr stackPointer;
+  }
+}
diff --git a/base/Kernel/Bartok/TryAll.cs b/base/Kernel/Bartok/TryAll.cs
new file mode 100644
index 0000000..f943240
--- /dev/null
+++ b/base/Kernel/Bartok/TryAll.cs
@@ -0,0 +1,7223 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+/*
+
+******************** See below for known problems ********************
+
+This class provides the run-time support for "try_all { ... }" blocks
+(i.e. exception handlers with roll-back) and for "atomic { ... }"
+blocks implemented over STM.
+
+Overview
+--------
+
+Static methods on TryAllManager provide the entry points from compiled
+code.  The per-thread TryAllManager objects that are passed in are
+instantiated the first time a thread invokes startTryAll.
+
+NB : for most entry points there are variants that take a
+TryAllManager and variants that look up the TryAllManager from the
+current thread.  The former are used when
+StageControlOptions.TryAllOptimisePass is enabled (intended to be the
+default).  The latter are there for performance comparisons.
+
+Names in this file reflect the try_all origin of the code.  In
+practice a try_all is simply an atomic block that (a) doesn't enlist
+the objects that it works on and therefore can't fail with
+AtomicIsInvalidException and, (b) doesn't catch
+AtomicIsInvalidException and use that to prompt automatic
+re-execution.
+
+The external entry points are as follows:
+
+ - startTryAll  - start a new try_all / atomic
+
+ - commit       - attempt to commit the current try_all / atomic
+
+ - abort        - abort the current try_all / atomic
+
+ - validate     - validate the current atomic
+
+ - EnlistNewObjForUpdate - Add the specified newly-allocated object to the 
+                  transaction.  If StageControlOptions.AtomicTrackTransactionLocals 
+                  is set then we distinguish newly allocated objects from ordinary
+                  update enlistments.
+
+ - Enlist[X]for[Y] where X is in {Addr, Indirect, Obj} and Y is in {Read, Update}
+                - Add the specified item to the set for read-only access or
+                  read-write access in the current atomic block.  "Obj"
+                  operations take an object reference.  "Addr" operations take
+                  the address of a static field.  "Indirect" operations take
+                  an arbitrary address and byte size.
+
+ - Log*         - Log the current contents of the specified data before it
+                  may be updated.  Variants specify ref/val (whether the 
+                  data being updated is a reference type or a value type)
+                  and heap/indirect (whether the data is identified by
+                  an object & offset (object == null for statics), or 
+                  by a pointer).
+
+ - RegisterForUndo - Register a call-back for execution during an
+                  abort.  See Shinnar et al's paper for a discussion
+                  of the semantics: currently the heap is rolled back
+                  to the point of registration, then the call-back
+                  executes, then roll-back continues.  If the
+                  call-back raises an exception then it itself is
+                  rolled back and the exception silently dropped.
+
+The caller must guarantee that:
+
+ - commit / abort / validate / enlist* / log* are only invoked when there is
+   an active try_all or atomic.
+
+ - before a data item is read, an enlist-for-read or enlist-for-update
+   has been issued that covers it (since the earliest active
+   startTryAll on that manager).
+
+ - before a data item is updated, an enlist-for-update has been issued
+   that covers it (since the earliest active startTryAll on that
+   manager) and a log call has been made for the item (since the most
+   recent active startTryAllOnThatManager).
+
+ - within an atomic block, a AtomicIsInvalidException will
+   propagate to the edge of an atomic block and cause abort to be
+   called.  
+
+The roll-back code here is, of course, largely derived from the
+try_all implementation by Avraham Shinnar, David Tarditi, Mark Plesko
+and Bjarne Steensgaard.
+
+Dynamically nested try_all and atomic blocks are notionally
+implemented, but I've not tested them at all thoroughly (indeed, I may
+have introduced regressions since the original try_all
+implementation).
+
+STM
+---
+
+In overview:
+
+ - The transactional memory allows application code to perform updates
+   in place, with per-transaction logs of the values overwritten.
+
+ - Conflicts between transactions are detected through versioning
+   information.  This is normally held in the multi-use-word (MUW) in an
+   object's header, but it can be displaced to the external multi-use
+   object if the MUW is already in use (e.g. because the object has had
+   its hashcode taken, or because it has a lock associated with it).
+
+ - Write enlistments are visible: each object can be enlisted for
+   update by at most one transaction at a time.  This is reflected in
+   the versioning header.  If there is a conflict when T1 encounters
+   an object already enlisted by T2 then, currently T1 becomes invalid
+   and is re-executed.
+
+ - Read enlistments are invisible: each object can be enlisted for
+   read by more than one transaction at a time; this is reflected
+   solely in the per-transaction logs.  Conflicts are detected only in
+   calls to commit and validate.
+
+Transaction logs
+----------------
+
+Transaction logs are held in the ordinary heap.  Each transaction has
+a ReadEnlistmentLog, an UpdateEnlistmentLog and an UpdateLog.  The
+read enlistment log is built up during Enlist*forRead calls and
+traversed during validation in calls to commit and validate.  The
+update enlistment log is built up during Enlist*forUpdate calls and
+traversed after validation in calls to commit.  The update log is
+built up during Log* operations and traversed only during roll-back.
+
+Each log comprises a linked list of BlockNode objects each holding an
+array of length ENLISTMENT_LOG_CHUNK_SIZE or UPDATE_LOG_CHUNK_SIZE
+entries as appropriate.  The TryAllManager refers to the head
+(i.e. most recent) end of these lists, so adding an entry is usually a
+case of writing it into the next slot in the head chunk. 
+
+Log updates are implemented using the functions in the *LogWriter
+structures which are embedded in TryAllManager objects using direct
+pointers into the array's elements.  I'm intending to replace these
+"Add" methods with inline code generation in the compiler (as the
+basic write barrier code already is).  This is particularly useful in
+the case of read enlistments.  Consistency between the *LogWriter
+structures and the fields in the corresponding *Log object is
+maintained by the "SyncFromWriter" and "GetWriter" methods.  These are
+used when a log chunk overflows, or before/after a GC so we don't need
+to deal with the direct pointers.
+
+Interaction with the GC
+-----------------------
+
+We use untraced pointers in four places: (1) the Writer structs
+contain interior pointers into the current log chunk, (2) the
+enlistment logs contain pointes to the versioning word in the header,
+(3) the update logs contain pointers to the objects updated, and to
+the overwritten values, in UIntPtr fields, (4) the hash table scheme
+for reducing duplicates contains interior pointers to the addresses
+that have been logged.
+
+The GC deals with these as follows:
+
+(1) the writers are nulled out before GC (PreGCHook) and filled back
+in again post GC (PostGCHook).  The GC itself does not need to be 
+aware of their contents during collection.
+
+(2), (3) the contents of the enlistment and update logs are visited 
+explicitly (see the Visit methods in this file).
+
+(4) the hash table is discarded before GC (PreGCHook) so there
+is no need to keep it up to date.
+
+There is one final subtlety about how this code interacts with the GC.  
+We must be careful about write barrier entries caused by updates to
+reference-typed fields in the data structures used here: any of these
+may overflow a SSB barrier and cause a GC.  The danger is that the
+Visit methods may miss objects if we're in the course of changing a
+log (e.g. splicing on a new chunk) when a GC occurs.  We deal with
+this by following two rules:
+
+(1) when splicing on a log chunk we always write to the reference-typed
+currentChunk field *before* writing 0 to the scalar nextEntry field.  A
+GC will therefore either see the previous state of the log (if it
+triggers before the write to currentChunk), or the next state of
+the log.  Note that if these fields were written in the opposite 
+order then it might see the previous log chunk but with nextEntry
+set back to 0: entries in the chunk would not be visited.
+
+(2) when splicing on a log chunk we mark the interior pointers held
+in the Writer objects as 'invalid'.  This means that if a GC 
+happens while splicing on the chunk that it will use the slow-path
+log info (currentChunk and nextEntry) to determine where to scan
+from, rather than the fast path info (from the Writer structs) which
+may be out of date.
+
+Versioning
+----------
+
+Values of type STMHandle hold pointers to the versioning information
+for an object.  Two kinds of versioning information is used:
+
+ - A value of type STMSnapshot.  This is just a snapshot of the 
+   object's multi-use word.  It is used for detecting conflicts on
+   objects that the transaction has enlisted for read: the
+   STM guarantees that the STMSnapshot changes whenever an update
+   is committed to the object.
+
+ - A value of type STMWord.  This holds either (a) a version number
+   for the object, or (b) a pointer into the transaction log of
+   a thread that has the object enlisted for update.  It is either
+   held in the MUW (if the MUW is not needed for another purpose),
+   or externally in the EMU.
+
+Code here is implemented to use STMSnapshots wherever possible because
+of the need for extra tests and indirection to obtain the STMWord.
+In particular, the fast-path code when enlisting objects for read
+will *only* require the STMSnapshot.
+
+See comments below under "version number management" for how we
+avoid wrap-around problems in the version number space.
+
+Known problems
+--------------
+
+- If the enable bitmap stage control option is set then we use a 
+  slow test in UpdateLogWriter.Write(...) as to whether or not the
+  calling thread has opened the supplied object for update.  We
+  can assume (or assert) this in an atomic block, and we should 
+  assume (or assert) the converse in a try_all (unless nested within
+  an outer atomic block).  However, we use a dynamic check to
+  avoid splitting the Log* operations into try_all and atomic
+  variants.
+
+
+
+tharris, 9 May 2006
+
+*/
+
+
+// Enable bitmap runtime options (enlarges update enlistment log entry
+// from 16 bytes to 32 bytes)
+#define ENABLE_BITMAP
+
+// Verbose runtime tracing
+//#define ENABLE_TRACING
+
+// Verbose tracing during GC
+//#define ENABLE_GC_TRACING
+
+// Profile individual call sites (needs /StageControl).
+//#define ENABLE_PER_CALL_SITE_PROFILING
+
+// Occasionally pretend atomic blocks are invalid
+//#define SHAKE                 
+
+namespace System
+{
+    using Microsoft.Bartok.Runtime;
+    using STMHandle = System.MultiUseWord.STMHandle;
+    using STMSnapshot = System.MultiUseWord.STMSnapshot;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+    using System.GCs;
+    
+    [RequiredByBartok("AtomicSupport")]
+    public class AtomicException : Exception {}
+
+    //----------------------------------------------------------------------
+    //
+    // AtomicIsInvalidException is the sole way that invalidity is signalled:
+    // we assume that transactions generally execute and commit without conflict
+    // and so take a bigger hit on dealing with invalid exceptions in order to
+    // avoid testing against boolean results.  
+    //
+    // Code must be prepared to deal with AtomicIsInvalidException being raised
+    // until the point where the status field is set to ChosenCommit.
+    //
+    // If building a non-blocking implementation we could throw
+    // AtomicIsInvalidException in asynchronously.
+
+    public sealed class AtomicIsInvalidException : AtomicException {}
+
+    // This Interface allows programs to define manual actions to be taken to
+    // recover during a tryall abort. See also TryAllManager.RegisterForUndo
+    
+    public interface IUndo {
+        // Note that when Undo is called, accessible memory should be in the same
+        // state as it was when RegisterForUndo was called.
+        void Undo();
+    }
+
+    //----------------------------------------------------------------------
+    //
+    // A value of type STMWord holds either:
+    //
+    //  a. A version number counting the number of times that the object has
+    //     been enlisted for update. 
+    //
+    //  b. A pointer to the UpdateEnlistmentLog.Entry relating to the
+    //     transaction that has the object opened for update.
+    //
+    // These cases are distinguished based on the bit indicated by IS_OWNED_MASK.
+
+    [NoCCtor]
+    internal struct STMWord {
+
+        // IS_OWNED_MASK is the bit we claim to distinguish owned / not owned
+        // STM words.  PAYLOAD_MASK is what remains after this bit and those
+        // used by the multi-use word.
+        internal const uint IS_OWNED_MASK       = 0x00000004;
+        internal const uint PAYLOAD_MASK        = 0x7ffffff8;
+      
+#if DEBUG
+        // Constrain us to an artificially small portion of the version number
+        // space in debug builds.  This will force us to trigger GCs to
+        // reclaim version numbers and to test out the validate-during-GC code
+        // paths.
+        internal const uint VERSION_MASK        = 0x7fff0000;
+        internal const int  VERSION_SHIFT       = 16;
+#else
+        // During ordinary builds, use the largest version number space
+        // available.
+        internal const uint VERSION_MASK        = PAYLOAD_MASK;
+        internal const int  VERSION_SHIFT       = 3;
+#endif
+
+        internal UIntPtr value;
+
+        // Constructors 
+
+        internal STMWord (UIntPtr value) {
+            this.value = value;
+        }
+
+        internal STMWord (UIntPtr payload, bool owned) {
+            VTable.Assert((payload & PAYLOAD_MASK) == (uint)payload);
+            this.value = payload + (UIntPtr)(owned ? IS_OWNED_MASK : 0);
+        }
+
+        // Accessors
+
+        internal UIntPtr GetPayload() {
+            return (this.value & (UIntPtr)PAYLOAD_MASK);
+        }
+
+        internal UIntPtr GetPayloadWhenOwned() {
+            VTable.Assert((this.value & IS_OWNED_MASK) == IS_OWNED_MASK);
+            return (this.value - IS_OWNED_MASK);
+        }
+
+        internal unsafe TryAllManager GetOwner() {
+            VTable.Assert((this.value & IS_OWNED_MASK) != 0);
+            UIntPtr ptr = (UIntPtr)(this.value - IS_OWNED_MASK);
+
+            UpdateEnlistmentLog.Entry *entry = 
+                (UpdateEnlistmentLog.Entry *) ptr;
+            TryAllManager m = TryAllManager.toTryAllManager(Magic.fromAddress(entry -> m));
+            return m;
+        }
+
+        internal unsafe STMWord GetOwnersVersion() {
+            VTable.Assert((this.value & IS_OWNED_MASK) != 0);
+            UIntPtr ptr = (UIntPtr)(this.value - IS_OWNED_MASK);
+            UpdateEnlistmentLog.Entry *entry = 
+                (UpdateEnlistmentLog.Entry *) ptr;
+            STMWord ver = entry -> v;
+            TryAllManager.DebugPrint("STMWord={0:x} ptr={1:x} ver={2:x}\n",
+                                     __arglist(this.value,
+                                               ptr,
+                                               ver.value));
+            return ver;
+        }
+
+        internal bool IsQuiescent() {
+            return !IsOwned();
+        }
+
+        internal bool IsOwned() {
+            return ((this.value & IS_OWNED_MASK) != 0);
+        }
+
+        internal STMWord GetNextVersion() {
+            return new STMWord((this.value + (1 << STMWord.VERSION_SHIFT)) &
+                               (UIntPtr)STMWord.VERSION_MASK);
+        }        
+
+        internal unsafe void Visit(NonNullReferenceVisitor referenceVisitor)
+        {
+#if ENABLE_GC_TRACING
+            VTable.DebugPrint("Visit STM word {0:x}\n", __arglist(this.value));
+#endif
+            if (IsOwned()) {
+                UIntPtr ownerAddr = GetPayload();
+                UpdateEnlistmentLog.Entry *updateEntry;
+                updateEntry = (UpdateEnlistmentLog.Entry *) ownerAddr;
+
+                // Map interior pointer back to start of this array of entries
+                UIntPtr offset = *(((UIntPtr*)updateEntry) + 3);
+                UIntPtr ownerObj = ownerAddr - offset;
+
+                // Visit the array of entries
+                referenceVisitor.Visit(&ownerObj);
+
+                // Recompute the interior pointer
+                ownerAddr = ownerObj + offset;
+                this.value = (ownerAddr) | (UIntPtr)IS_OWNED_MASK;
+            }
+            TryAllManager.DebugPrintGC("Visit STM word now {0:x}\n", 
+                                       __arglist(this.value));
+        }
+
+        // Equality tests
+
+        [Inline]
+        internal bool Eq(STMWord other) {
+            return (this.value == other.value);
+        }
+
+        [Inline]
+        internal bool Eq(STMSnapshot other) {
+            return ((this.value == other.value) ||
+                    (this.value == other.GetSTMWord().value));
+        }
+
+        [Inline]
+        internal bool Neq(STMWord other) {
+            return (this.value != other.value);
+        }
+
+        // Formatting
+        
+        public override String ToString() {
+            String r = String.Concat("<",
+                                     GetPayload().ToString(),
+                                     ",",
+                                     IsOwned().ToString(),
+                                     ">",
+                                     "");
+            return r;
+        }
+    }
+
+    //----------------------------------------------------------------------
+    //
+    // This is the main class that implements the runtime support for tryall
+    // clauses.  Just about all functions called from outside the class are
+    // static, and they just call the current thread's local version of the
+    // function.
+
+    [NoLoggingForUndo]
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok("TryAllSupport")]
+    public sealed class TryAllManager {
+
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        private static extern long RDTSC();
+
+        //----------------------------------------------------------------------
+        //
+        // Configuration
+
+        [Intrinsic]
+        internal static readonly int UPDATE_LOG_CHUNK_SIZE = 7;
+        [Intrinsic]
+        internal static readonly int ENLISTMENT_LOG_CHUNK_SIZE = 5;
+        [Intrinsic]
+        internal static readonly bool TRACK_TRANSACTION_LOCALS = false;
+        [Intrinsic]
+        internal static readonly bool REMOVE_READ_DUPLICATES_AT_GC = false;
+        [Intrinsic]
+        internal static readonly bool REMOVE_READ_AFTER_UPDATE_AT_GC = false;
+        [Intrinsic]
+        internal static readonly bool REMOVE_READ_AFTER_UPDATE_AT_ENLISTMENT = false;
+        [Intrinsic]
+        internal static readonly bool HASHING = false;
+        [Intrinsic]
+        internal static readonly bool HASHING_FOR_READS = false;
+        [Intrinsic]
+        internal static readonly bool BITMAP = false;
+        [Intrinsic]
+        internal static readonly bool EXTERNAL_BITMAP = false;
+        [Intrinsic]
+        internal static readonly int HASH_MASK = 2047;
+        [Intrinsic]
+        internal static readonly bool DISABLE_BEFORE_WRITING_LOG = false;
+        [Intrinsic]
+        internal static readonly bool DISABLE_AFTER_FILTERING = false;
+        [Intrinsic]
+        internal static readonly bool DISABLE_BEFORE_FILTERING = false;
+        [Intrinsic]
+        internal static readonly bool DISABLE_ON_METHOD_ENTRY = false;
+        [Intrinsic]
+        internal static readonly bool DISABLE_HOUSEKEEPING = false;
+        [Intrinsic]
+        internal static readonly bool ENABLE_PROFILING = false;
+#if DEBUG
+        // Debug sizes are deliberately small: they ensure that we test the
+        // code responsible for chunk management.
+        internal const int UNDO_INITIAL_SIZE = 1;
+        internal const int MAX_INITIAL_NESTING_DEPTH = 1;
+#else
+        internal const int UNDO_INITIAL_SIZE = 4;
+        internal const int MAX_INITIAL_NESTING_DEPTH = 4;
+#endif
+
+        // In debug builds we write this value into log entries that
+        // should never be accessed -- e.g. because there's spare space at the 
+        // end of a chunk (to avoid fragmenting decomposed reservations),
+        // or because there's spare space at the beginning (because compaction
+        // did not fill a whole number of chunks).  
+#if DEBUG
+        internal const uint DEAD_PTR = 0xDEADBEEF;
+#endif
+
+        //----------------------------------------------------------------------
+        // 
+        // Constructor
+
+        internal TryAllManager() {
+
+            // Sanity check configuration
+#if !ENABLE_BITMAP
+            if (TryAllManager.BITMAP || TryAllManager.EXTERNAL_BITMAP) {
+                VTable.DebugPrint("Runtime cannot support bitmap options");
+                VTable.DebugBreak();
+            }
+#endif
+
+            this.savedTryAlls = new TryAll[MAX_INITIAL_NESTING_DEPTH];
+            this.locallyAllocatedSTMWord = this.savedTryAlls[0].locallyAllocatedSTMWord;
+
+            this.atomicIsInvalidException = new AtomicIsInvalidException();
+            this.tryAllCounters = TryAllCounters.NewRegisteredCounters();
+            this.nextSavedTryAll = 0;
+
+            this.updateLog = new UpdateLog();
+            UpdateLog.InitWriter(this);
+
+            this.rEnlistmentLog = new ReadEnlistmentLog();
+            ReadEnlistmentLog.InitWriter(this);
+
+            this.uEnlistmentLog = new UpdateEnlistmentLog(this);
+            UpdateEnlistmentLog.InitWriter(this);
+
+            this.undoLog = new UndoLog();
+
+            this.AllocLocallyAllocatedSTMWords();
+            this.InitLocallyAllocatedSTMWords();
+            this.startNestedTryAllHelper(true, 0);
+
+            EnsureCache(this);
+
+            // Initialise static fields holding delegates used by the GC.
+            // Multiple initialization is OK; the delegates point to static
+            // methods.  This lets us (a) avoid work scanning the logs if 
+            // no try_all / atomic blocks have been started (e.g. no need to
+            // go through the table of threads), (b) let the tree shaker
+            // discard more of the implementation of try_all / atomic if
+            // support is not enabled.
+
+            visitStrongRefsDelegate = new VisitMethod(TryAllManager.doVisitStrongRefs);
+            visitWeakRefsDelegate = new VisitMethod(TryAllManager.doVisitWeakRefs);
+            preGCHookDelegate = new GCHookMethod(TryAllManager.doPreGCHook);
+            postGCHookDelegate = new GCHookMethod(TryAllManager.doPostGCHook);
+        }
+
+        //----------------------------------------------------------------------
+
+        // Each TryAll struct has a special STM word that EnlistNewObjForUpdate
+        // places in newly allocated objects.  This identifies locally allocated
+        // objects so that we can avoid Enlist* and Log* calls for them. 
+        // These STMWords are held in single-entry arrays of
+        // UpdateEnlistmentLog.Entry.  This means that they have the same format
+        // in memory as ordinary update enlistment log entries.
+        // 
+        // AllocLocallyAllocatedSTMWords ensures that each TryAll has an
+        // UpdateEnlistmentLog.entry[] allocated for it.  
+        //
+        // InitLocallyAllocatedSTMWords ensures that each TryAll's
+        // locallyAllocatedSTMWord refers to the current address of the
+        // single element in the UpdateEnlistmentLog.entry[].  (This is
+        // needed after allocation and also after GC in case the array
+        // has been relocated).
+
+        private void AllocLocallyAllocatedSTMWords() {
+            for (int i = 0; i < this.savedTryAlls.Length; i ++) {
+                UpdateEnlistmentLog.Entry[] entries;
+                entries = this.savedTryAlls[i].locallyAllocatedEntry;
+                if (entries == null) {
+                    entries = new UpdateEnlistmentLog.Entry[1];
+                    this.savedTryAlls[i].locallyAllocatedEntry = entries;
+                    VTable.Assert(this.savedTryAlls[i].locallyAllocatedSTMWord.value == 
+                                  UIntPtr.Zero);
+                }
+            }
+        }
+
+        private unsafe void InitLocallyAllocatedSTMWords() {
+            for (int i = 0; i < this.savedTryAlls.Length; i ++) {
+                STMWord stmWord;
+                UIntPtr entryAddr;
+                UpdateEnlistmentLog.Entry[] entries;
+
+                entries = this.savedTryAlls[i].locallyAllocatedEntry;
+                if (entries != null) {
+
+                    // Set up the entry to look like an ordinary update-
+                    // enlistment-log entry for this try all manager.
+#if DEBUG
+                    entries[0].h.addr = (UIntPtr)TryAllManager.DEAD_PTR;
+#endif
+                    entries[0].m = Magic.addressOf(this);
+                    entries[0].v = new STMWord(UIntPtr.Zero);
+                    fixed (UpdateEnlistmentLog.Entry *entry = &entries[0]) {
+                        entryAddr = (UIntPtr)entry;
+                        UIntPtr start = Magic.addressOf(entries);
+                        entries[0].offset = ((UIntPtr)entry) - start;
+                        stmWord = new STMWord((UIntPtr)entry, true);
+                    }
+                    
+                    this.savedTryAlls[i].locallyAllocatedSTMWord = stmWord;
+                }
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Start, validate, commit, abort, end
+        //
+        // These are expected to be called "start, validate*, commit"
+        // for transactions that attempt to commit, or "start, validate*,
+        // abort" for transactions that decide to abort.  Validation is 
+        // performed in commit, so explicit calls are needed only to detect 
+        // if a transaction is looping.  "end" is used internally in "commit"
+        // and "abort" so is not called explicitly.
+
+        [Inline]
+        private void startNestedTryAllHelper(bool isAtomic, int saveAt) {
+            if (saveAt == savedTryAlls.Length) {
+                int curLength = this.savedTryAlls.Length;
+                int newLength = curLength * 2;
+                TryAll[] temp = new TryAll[newLength];
+                Array.Copy(this.savedTryAlls, 0, temp, 0, curLength);
+                this.savedTryAlls = temp;
+                AllocLocallyAllocatedSTMWords();
+                InitLocallyAllocatedSTMWords();
+            }
+
+            this.savedTryAlls[saveAt].stackHeight = this.currentTryAllStackHeight;
+            UpdateLog.SyncFromWriter(this);
+            this.savedTryAlls[saveAt].updateLogAtStart = this.updateLog.CurrentLocation;
+
+            if (isAtomic) {
+                ReadEnlistmentLog.SyncFromWriter(this);
+                this.savedTryAlls[saveAt].rEnlistmentLogAtStart = 
+                    this.rEnlistmentLog.CurrentLocation;
+
+                UpdateEnlistmentLog.SyncFromWriter(this);
+                this.savedTryAlls[saveAt].uEnlistmentLogAtStart = 
+                    this.uEnlistmentLog.CurrentLocation;
+
+                this.locallyAllocatedSTMWord = this.savedTryAlls[saveAt].locallyAllocatedSTMWord;
+            }
+        }
+      
+        [Inline]
+        private void startTryAllHelper(bool isAtomic, StackHeight stackHeight) {
+            ClaimToken();
+            tryAllCounters.IncrementStartTryAll();
+
+            int saveAt = this.nextSavedTryAll++;
+
+            if (saveAt == 0) {
+                // We're entering an outermost try-all, no need to actually save
+            } else {
+                // We're entering a nested try-all
+                startNestedTryAllHelper(isAtomic, saveAt);
+            }
+
+            if (isAtomic) {
+                ReadEnlistmentLogWriter.EnsureLogMemory(this);
+                UpdateEnlistmentLogWriter.EnsureLogMemory(this);
+            }
+
+            UpdateLogWriter.EnsureLogMemory(this);
+
+            this.currentTryAllStackHeight = stackHeight;
+        }
+
+        private void endTryAll(bool isAtomic)
+        {
+            DebugPrint("{0}: end (after): {1}%{2}%{3}%{4}%{5}\n", 
+                       __arglist(isAtomic ? "atomic" : "try_all",
+                                 this.nextSavedTryAll - 1,
+                                 this.rEnlistmentLog.Size,
+                                 this.uEnlistmentLog.Size,
+                                 this.updateLog.Size,
+                                 this.undoLog.Size));
+
+            this.nextSavedTryAll--;
+            if(this.nextSavedTryAll == 0) {
+                // Finished outermost block
+                DebugPrint("Clearing logs\n");
+                this.updateLog.ResetTo(savedTryAlls[0].updateLogAtStart);
+                UpdateLog.InitWriter(this);
+
+            } else {
+                // Finished nested block.  
+                this.currentTryAllStackHeight = 
+                    this.savedTryAlls[nextSavedTryAll].stackHeight;
+
+                if (isAtomic) {
+                    this.locallyAllocatedSTMWord = this.savedTryAlls[nextSavedTryAll].locallyAllocatedSTMWord;
+                }
+                
+                // If we finished an atomic block then propagate the
+                // invalidity exception upwards.  This is really a
+                // policy decision: if we could confirm that the
+                // enclosing transaction was valid then we could retry
+                // the inner one.
+
+                if (this.currentTryAllStatus == TryAllStatus.Invalid) {
+                    if (isAtomic) {
+                        DebugPrint("Enclosing transaction still invalid\n");
+                        throw this.atomicIsInvalidException;
+                    } else {
+                        this.currentTryAllStatus = TryAllStatus.Active;
+                    }
+                }
+            }
+        }
+
+        internal void becomeInvalid(bool duringGC) {
+            DebugPrint("Becoming invalid\n");
+            VTable.Assert((this.currentTryAllStatus == TryAllStatus.Active) ||
+                          (this.currentTryAllStatus == TryAllStatus.Invalid));
+            this.currentTryAllStatus = TryAllStatus.Invalid;
+            if (!duringGC) {
+                this.tryAllCounters.IncrementInvalidOutsideGC();
+                throw this.atomicIsInvalidException;
+            } else {
+                this.tryAllCounters.IncrementInvalidDuringGC();
+            }
+        }
+
+        private unsafe void validateHelper() {
+            Shake(false); // Not during GC
+            TryAllStatus s = this.currentTryAllStatus;
+            if (s == TryAllStatus.Invalid) {
+                DebugPrint("Transaction previously invalid\n");
+                throw this.atomicIsInvalidException;
+            } else {
+                VTable.Assert(s == TryAllStatus.Active);
+
+                ReadEnlistmentLog.SyncFromWriter(this);
+                UpdateEnlistmentLog.SyncFromWriter(this);
+                this.rEnlistmentLog.Validate(this,
+                                             false); // Not during GC
+
+                DebugPrint("Validation successful\n");
+            }
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private unsafe void commitHelper(bool isAtomic) {
+            VTable.Assert((this.currentTryAllStatus == TryAllStatus.Active) ||
+                          (this.currentTryAllStatus == TryAllStatus.Invalid));
+
+            if (isAtomic) {
+                ReadEnlistmentLog.SyncFromWriter(this);
+                UpdateEnlistmentLog.SyncFromWriter(this);
+                Shake(false); // Not during GC
+
+                if (this.currentTryAllStatus == TryAllStatus.Invalid) {
+                    becomeInvalid(false); // Not during GC
+                }
+
+                this.rEnlistmentLog.Validate(this, 
+                                             false); // Not during GC
+
+                if (this.nextSavedTryAll == 1) {
+                    DebugPrint("Finished outermost transaction\n");
+                    
+                    // Finished outermost try_atomic -- dismiss enlistments
+                    
+                    this.tryAllCounters.IncrementCommitSucceeded();
+                    
+                    ReadEnlistmentLog.Location rEnlistmentLogAtStart;
+                    rEnlistmentLogAtStart = this.savedTryAlls[0].rEnlistmentLogAtStart;
+                    this.rEnlistmentLog.DismissFrom(this, rEnlistmentLogAtStart);
+                    ReadEnlistmentLog.InitWriter(this);
+
+                    UpdateEnlistmentLog.Location uEnlistmentLogAtStart;
+                    uEnlistmentLogAtStart = this.savedTryAlls[0].uEnlistmentLogAtStart;
+                    this.uEnlistmentLog.DismissFrom(this, uEnlistmentLogAtStart);
+                    UpdateEnlistmentLog.InitWriter(this);
+
+                } else {
+                    DebugPrint("Finished nested transaction\n");
+                }
+            } else {
+                this.tryAllCounters.IncrementCommitSucceeded();
+            }
+
+            endTryAll(isAtomic);
+        }
+
+        private unsafe void AbortHelper(bool isAtomic) {
+            bool takeAction;
+
+            if (isAtomic) {
+                ReadEnlistmentLog.SyncFromWriter(this);
+                UpdateEnlistmentLog.SyncFromWriter(this);
+            }
+
+            UpdateLog.SyncFromWriter(this);
+
+            int curTryAll = (this.nextSavedTryAll - 1);
+            UpdateLog.Location updateLogAtStart;
+            updateLogAtStart = this.savedTryAlls[curTryAll].updateLogAtStart;
+
+            // we must undo back to the state the top action was in,
+            // execute the action, and continue.
+            do {
+                DebugPrint("Depth {0}\n", 
+                           __arglist(curTryAll));
+
+                UpdateLog.Location undoUpdatesFrom = updateLogAtStart;
+                takeAction = false;
+                int lastEntry = this.undoLog.nextEntry - 1;
+
+                if (lastEntry >= 0) {
+                    UpdateLog.Location undoWasAt;
+                    undoWasAt = this.undoLog.entries[lastEntry].updateLogAtRegistration;
+
+                    if ((curTryAll == 0) || updateLogAtStart.LtEq(undoWasAt)) {
+                        // the undo object is part of the current tryall
+                        takeAction = true;
+                        undoUpdatesFrom = undoWasAt;
+                    }
+                } 
+
+                DebugPrint(" takeAction: {0} undoUpdatesFrom: {1}\n", 
+                           __arglist(takeAction ? "True" : " False",
+                                     updateLogAtStart.entry));
+
+                this.updateLog.RollBack(this, 
+                                        currentTryAllStackHeight, 
+                                        undoUpdatesFrom);
+
+                UpdateLog.InitWriter(this);
+
+                if(takeAction) {
+                    // get the undo object.
+                    IUndo ua = this.undoLog.entries[lastEntry].UndoAction;
+                    // book-keeping. must do before undo call.
+                    this.undoLog.entries[lastEntry].UndoAction = null;
+                    this.undoLog.nextEntry--;
+                    // at this point, nested tryAlls are allowed (which is needed,
+                    // since callUndo uses them).  call the registered Undo
+                    // function
+                    callUndo(ua);
+                }
+            } while(takeAction);
+
+            if (isAtomic) {
+                // Dismiss enlistments made in the aborted section
+                
+                ReadEnlistmentLog.Location rEnlistmentsStartAt;
+                rEnlistmentsStartAt = savedTryAlls[curTryAll].rEnlistmentLogAtStart;
+                this.rEnlistmentLog.DismissFrom(this, rEnlistmentsStartAt);
+                ReadEnlistmentLog.InitWriter(this);
+
+                UpdateEnlistmentLog.Location uEnlistmentsStartAt;
+                uEnlistmentsStartAt = savedTryAlls[curTryAll].uEnlistmentLogAtStart;
+                this.uEnlistmentLog.DismissFrom(this, uEnlistmentsStartAt);
+                UpdateEnlistmentLog.InitWriter(this);
+            }
+          
+            endTryAll(isAtomic);
+
+            if (isAtomic) {
+                this.currentTryAllStatus = TryAllStatus.Active;
+            }                
+        }
+
+        internal static TryAllManager CurrentTryAll {
+            get {
+                Thread currentThread = Thread.CurrentThread;
+                VTable.Assert(currentThread != null, "no running thread");
+                VTable.Assert(currentThread.tryAllManager != null,
+                              "no running TryAll");
+                TryAllManager m = currentThread.tryAllManager;
+                VTable.Deny(m.nextSavedTryAll < 0, "nextSavedTryAll < 0");
+                return m;
+            }
+        }
+
+        internal static TryAllManager CurrentRunningTryAll {
+            get {
+                TryAllManager m = TryAllManager.CurrentTryAll;
+                VTable.Deny(m.nextSavedTryAll == 0,
+                            "No running TryAll");
+                return m;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // For now we conflate all static fields to a single object for the
+        // purposes of contention detection.
+
+        [RequiredByBartok("AtomicSupport")]
+        private static Object objForStaticEnlists = new Object();
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static Object AddrToObj(UIntPtr addr) {
+            return objForStaticEnlists;
+        }
+        
+        //----------------------------------------------------------------------
+        //
+        // Object enlistment & update logging
+
+        // EnsureLog operations: ensure that sufficient room is available for subsequent fast stores
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnsureLogMemoryHelperForUpdateEnlistmentLog(uint bytesNeeded, TryAllManager m) {
+            m.tryAllCounters.IncrementEnsureLogMemoryForUpdateEnlistmentLog(bytesNeeded);
+            UpdateEnlistmentLogWriter.EnsureLogMemory(m, bytesNeeded);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnsureLogMemoryHelperForReadEnlistmentLog(uint bytesNeeded, TryAllManager m) {
+            m.tryAllCounters.IncrementEnsureLogMemoryForReadEnlistmentLog(bytesNeeded);
+            ReadEnlistmentLogWriter.EnsureLogMemory(m, bytesNeeded);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnsureLogMemoryHelperForUpdateLog(uint bytesNeeded, TryAllManager m) {
+            m.tryAllCounters.IncrementEnsureLogMemoryForUpdateLog(bytesNeeded);
+            UpdateLogWriter.EnsureLogMemory(m, bytesNeeded);
+        }
+        
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistObjHelperForRead(Object obj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistObjForRead();
+            STMHandle h = new STMHandle(obj);
+            ReadEnlistmentLogWriter.Write(m, h, true); 
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistObjHelperForReadFast(Object obj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistObjForReadFast();
+            STMHandle h = new STMHandle(obj);
+            ReadEnlistmentLogWriter.Write(m, h, false); 
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistObjHelperForUpdate(Object obj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistObjForUpdate();
+            STMHandle h = new STMHandle(obj);
+            UpdateEnlistmentLogWriter.Write(m, h, true);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistObjHelperForUpdateFast(Object obj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistObjForUpdateFast();
+            STMHandle h = new STMHandle(obj);
+            UpdateEnlistmentLogWriter.Write(m, h, false);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistNewObjHelperForUpdate(Object obj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistNewObjForUpdate();
+            STMHandle h = new STMHandle(obj);
+            UpdateEnlistmentLogWriter.WriteNew(m, h, true);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistNewObjHelperForUpdateFast(Object obj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistNewObjForUpdateFast();
+            STMHandle h = new STMHandle(obj);
+            UpdateEnlistmentLogWriter.WriteNew(m, h, false);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistAddrHelperForRead(UIntPtr pobj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistAddrForRead();
+            Object obj = AddrToObj(pobj);
+            STMHandle h = new STMHandle(obj);
+            ReadEnlistmentLogWriter.Write(m, h, true);  
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistAddrHelperForReadFast(UIntPtr pobj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistAddrForReadFast();
+            Object obj = AddrToObj(pobj);
+            STMHandle h = new STMHandle(obj);
+            ReadEnlistmentLogWriter.Write(m, h, false);  
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistAddrHelperForUpdate(UIntPtr pobj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistAddrForUpdate();
+            Object obj = AddrToObj(pobj);
+            STMHandle h = new STMHandle(obj);
+            UpdateEnlistmentLogWriter.Write(m, h, true);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void EnlistAddrHelperForUpdateFast(UIntPtr pobj, TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistAddrForUpdateFast();
+            Object obj = AddrToObj(pobj);
+            STMHandle h = new STMHandle(obj);
+            UpdateEnlistmentLogWriter.Write(m, h, false);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static bool FilterLog(TryAllManager m,
+                                       UIntPtr addr,
+                                       UpdateLog.EntryKind kind) {
+            if (HASHING) {
+                DebugPrint("CheckCache for {0} {1} ", __arglist(addr, (int)kind));
+                
+                uint[] cache = m.addressCache;
+                VTable.Assert(cache != null);
+                uint hash = (((uint)addr) >> 2) & (uint) TryAllManager.HASH_MASK;
+                
+                DebugPrint("Hashes to {0} mask={1} ", 
+                           __arglist(hash,
+                                     TryAllManager.HASH_MASK));
+                
+                uint key = ((uint)addr) ^ ((uint)m.tokens);
+                if (cache[hash] == (uint) key) {
+                    DebugPrint("Found\n");
+                    m.tryAllCounters.IncrementUpdateHitInCache(kind);
+                    return true;
+                } else {
+                    DebugPrint("Not found\n");
+                    cache[hash] = (uint) key;
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static bool FilterLog(TryAllManager m,
+                                       Object obj, 
+                                       UIntPtr off,
+                                       UpdateLog.EntryKind kind) {
+            return FilterLog(m, Magic.addressOf(obj) + off, kind);
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void LogValHeapHelper(Object obj, UIntPtr off,
+                                              TryAllManager m) {
+            m.tryAllCounters.IncrementLogValHeap();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, obj, off, UpdateLog.EntryKind.HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_VAL, 
+                                      obj, 
+                                      off,
+                                      true, true,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void LogValHeapHelperFast(Object obj, UIntPtr off,
+                                              TryAllManager m) {
+            m.tryAllCounters.IncrementLogValHeapFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, obj, off, UpdateLog.EntryKind.HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_VAL, 
+                                      obj, 
+                                      off,
+                                      true, true,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogRefHeapHelper(Object obj, UIntPtr off,
+                                             TryAllManager m) {
+            m.tryAllCounters.IncrementLogRefHeap();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, obj, off, UpdateLog.EntryKind.HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_REF, 
+                                      obj, 
+                                      off,
+                                      true, true,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogRefHeapHelperFast(Object obj, UIntPtr off,
+                                             TryAllManager m) {
+            m.tryAllCounters.IncrementLogRefHeapFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, obj, off, UpdateLog.EntryKind.HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_REF, 
+                                      obj, 
+                                      off,
+                                      true, true,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void LogValStaticHelper(UIntPtr addr,
+                                                TryAllManager m) {
+            m.tryAllCounters.IncrementLogValHeap();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, addr, UpdateLog.EntryKind.HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_VAL, 
+                                      null,
+                                      addr,
+                                      false,
+                                      false,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        internal static void LogValStaticHelperFast(UIntPtr addr,
+                                                    TryAllManager m) {
+            m.tryAllCounters.IncrementLogValHeapFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, addr, UpdateLog.EntryKind.HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_VAL, 
+                                      null,
+                                      addr,
+                                      false,
+                                      false,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogRefStaticHelper(UIntPtr addr,
+                                               TryAllManager m) {
+            m.tryAllCounters.IncrementLogRefHeap();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, addr, UpdateLog.EntryKind.HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_REF, 
+                                      null,
+                                      addr,
+                                      false,
+                                      false,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogRefStaticHelperFast(UIntPtr addr,
+                                                   TryAllManager m) {
+            m.tryAllCounters.IncrementLogRefHeapFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, addr, UpdateLog.EntryKind.HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_REF, 
+                                      null,
+                                      addr,
+                                      false,
+                                      false,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectValHeapHelper(UIntPtr pobj,
+                                                     TryAllManager m) {
+
+            m.tryAllCounters.IncrementLogIndirectValHeap();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                FactoredPointer factoredPointer = fixupInterior(pobj);
+                //                EnsureLogMemory(m, 4);
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_VAL, 
+                                      factoredPointer.baseObj,
+                                      factoredPointer.offset,
+                                      true, 
+                                      false,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectValHeapHelperFast(UIntPtr pobj,
+                                                     TryAllManager m) {
+
+            m.tryAllCounters.IncrementLogIndirectValHeapFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                FactoredPointer factoredPointer = fixupInterior(pobj);
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_VAL, 
+                                      factoredPointer.baseObj,
+                                      factoredPointer.offset,
+                                      true,
+                                      false,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectValStackHelper(UIntPtr pobj,
+                                                      TryAllManager m) {
+            m.tryAllCounters.IncrementLogIndirectValStack();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.NON_HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.NON_HEAP_VAL, 
+                                      null,
+                                      pobj,
+                                      false,
+                                      false,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectValStackHelperFast(UIntPtr pobj,
+                                                      TryAllManager m) {
+            m.tryAllCounters.IncrementLogIndirectValStackFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.NON_HEAP_VAL)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.NON_HEAP_VAL, 
+                                      null,
+                                      pobj,
+                                      false,
+                                      false,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectRefHeapHelper(UIntPtr pobj,
+                                                     TryAllManager m) {
+
+            m.tryAllCounters.IncrementLogIndirectRefHeap();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                FactoredPointer factoredPointer = fixupInterior(pobj);
+                //                EnsureLogMemory(m, 4);
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_REF,
+                                      factoredPointer.baseObj, 
+                                      factoredPointer.offset,
+                                      true,
+                                      false,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectRefHeapHelperFast(UIntPtr pobj,
+                                                     TryAllManager m) {
+
+            m.tryAllCounters.IncrementLogIndirectRefHeapFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                FactoredPointer factoredPointer = fixupInterior(pobj);
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.HEAP_REF,
+                                      factoredPointer.baseObj, 
+                                      factoredPointer.offset,
+                                      true,
+                                      false,
+                                      false);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectRefStackHelper(UIntPtr pobj,
+                                                      TryAllManager m) {
+            m.tryAllCounters.IncrementLogIndirectRefStack();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.NON_HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.NON_HEAP_REF,
+                                      null,
+                                      pobj,
+                                      false,
+                                      false,
+                                      true);
+            }
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif
+        private static void LogIndirectRefStackHelperFast(UIntPtr pobj,
+                                                      TryAllManager m) {
+            m.tryAllCounters.IncrementLogIndirectRefStackFast();
+
+            if (DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (!FilterLog(m, pobj, UpdateLog.EntryKind.NON_HEAP_REF)) {
+
+                if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                    return;
+                }
+
+                UpdateLogWriter.Write(m,
+                                      UpdateLog.EntryKind.NON_HEAP_REF,
+                                      null,
+                                      pobj,
+                                      false,
+                                      false,
+                                      false);
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Version number management
+        //
+        // We increment an object's version number each time we commit
+        // or abort a transaction that has enlisted it for update.  We
+        // let version numbers wrap around when the number of bits
+        // available to store them in the STM word overflows.
+        //
+        // In order to make this safe we must make sure that a
+        // transaction which has a read enlistment for an earlier use
+        // of a version number is no longer running when we might
+        // re-use that version number in the same object.
+        //
+        // We do that by ensuring that we validate all of the running
+        // transactions at least once every N transactions where N is
+        // no larger than the number of version numbers that are
+        // available.  
+        //
+        // After validation, each object is either (a) not enlisted by
+        // any transaction, (b) enlisted for update by one transaction
+        // and possibly enlisted for read by that same transaction, or
+        // (c) enlisted for read by a number of valid transactions.  This
+        // lets us make a further complete cycle through the version number
+        // space.
+        //
+        // In practice we always validate at GC and so we need only make sure
+        // that GCs occur sufficiently often.
+        //
+        // We detect when we need to force validation by allocating
+        // "transaction tokens" to TryAllManagers.  A TryAllManager
+        // must have a transaction token in order to start a new
+        // transaction.  We give out batches of transaction tokens to
+        // TryAllManagers so that they can start transactions without
+        // contending for a single shared count.  We force validation
+        // when have given out all the batches that are available.
+        //
+        // Tokens are replenished at every GC: as long as GCs happen
+        // sufficiently often we'll never need to force one.  NB: in a 
+        // release build with 3 bits taken out of the version number 
+        // we're left with N = 2^29, about 500 million transactions.
+
+        const uint TOKEN_BATCH_SIZE = 128;
+        const uint MAX_TOKENS = (STMWord.VERSION_MASK >> STMWord.VERSION_SHIFT);
+        const int MAX_BATCHES = (int)(MAX_TOKENS / TOKEN_BATCH_SIZE);
+        
+        static int batchesAvailable = MAX_BATCHES;
+
+        [NoInline]
+        internal void ClaimTokens() {
+
+            DebugPrint("{0:x}: Claiming tokens\n",
+                              __arglist(Magic.addressOf(this)));
+
+            // Try to claim one of the batches currently available.
+            int available;
+            do {
+                available = batchesAvailable;
+
+                // If there are no batches available (or periodically if
+                // SHAKE debugging is enabled) force a GC to replenish
+                // the supply.
+                if ((available == 0) || (Occasionally())) {
+                    tryAllCounters.IncrementForcedGC();
+                    GC.Collect();
+                    available = batchesAvailable;
+                }
+            } while (Interlocked.CompareExchange(ref batchesAvailable,
+                                                 (available - 1),
+                                                 available) != available);
+
+            DebugPrint("{0:x}: Got tokens, now {1} batches available\n",
+                       __arglist(Magic.addressOf(this), batchesAvailable));
+
+            tokens = TOKEN_BATCH_SIZE;
+
+            VTable.Assert(TOKEN_BATCH_SIZE < TryAllManager.HASH_MASK);
+
+            TryAllManager.ClearCache(this);
+        }
+
+        internal void ClaimToken() {
+            // Get a new batch of tokens if our current batch is
+            // exhausted.
+            if (this.tokens == 0) {
+                ClaimTokens();
+            }
+
+            // Get a token from our current batch
+            this.tokens --;
+            DebugPrint("{0} tokens remain\n", __arglist(this.tokens));
+        }
+
+        internal static void ReplenishTokens() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                if (VTable.enableGCTiming) {
+                    VTable.DebugPrint("[Token batches before: {0} after: {1}]\n",
+                                      __arglist(batchesAvailable, MAX_BATCHES));
+                }
+            }
+
+            // Make sure that we generate > 0 batches -- this may fail if the
+            // settings of VERSION_MASK and VERSION_SHIFT leave fewer than
+            // TOKEN_BATCH_SIZE tokens available.  
+
+            VTable.Assert(MAX_BATCHES > 0, "Too few tokens to make a single batch");
+            
+            batchesAvailable = MAX_BATCHES;
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // GC support
+        //
+        // We interact with the GC in two ways.  (1) During GC we make sure that the
+        // log state is held in the nextEntry fields rather than cached in the
+        // writer structures; this means we don't have to worry about fixing up
+        // the pointers.  (2) We need to manually traverse the logs to visit 
+        // pointers to objects which are held (a) in UIntPtr typed fields in the
+        // update log and (b) implicitly in STMHandle structures in the enlistment
+        // logs.
+        //
+        // NB: all pointers reads during the GC must be made through
+        // the ReadBarrier function below -- otherwise we can't be sure if the
+        // field may have already been visited.  
+
+        internal static
+        void VisitStrongRefs(NonNullReferenceVisitor referenceVisitor)
+        {
+            if (visitStrongRefsDelegate != null) {
+                visitStrongRefsDelegate(referenceVisitor);
+            }
+        }
+
+        internal static 
+        void VisitWeakRefs(NonNullReferenceVisitor referenceVisitor) 
+        {
+            if (visitWeakRefsDelegate != null) {
+                visitWeakRefsDelegate(referenceVisitor);
+            }
+        }
+
+        internal static void PreGCHookTryAll() 
+        {
+            if (preGCHookDelegate != null) {
+                preGCHookDelegate();
+            }
+        }
+
+        internal static void PostGCHookTryAll() 
+        {
+            if (postGCHookDelegate != null) {
+                postGCHookDelegate();
+            }
+        }
+
+        // Called after stopping the world and before tracing begins.  This is 
+        // responsible for:
+        //
+        //    a. clearing the pointer-derived values held in UIntPtrs that won't
+        //       be explicitly visited during GC.
+        //
+        //    b. Validating all of the running transactions.  We do that *before*
+        //       GC so that (i) we can recover space used by the enlistment logs of 
+        //       invalid transactions, (ii) we can recover space used by duplicate
+        //       log entries, (iii) we can assume that transactions are valid
+        //       when visiting their logs.
+
+        internal static void doPreGCHook() {
+            SetDuringGC(true);
+            TryAllManager.DebugPrintNoLock("PreGC callback\n");
+            Thread[] threadTable = Thread.threadTable;
+            int limit = threadTable.Length;
+            
+            for (int i = 0; i < limit; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    TryAllManager m = thread.tryAllManager;
+                    if(m != null) {
+                        RemoveCache(m);
+                        UpdateLog.SyncFromWriter(m);
+                        ReadEnlistmentLog.SyncFromWriter(m);
+                        UpdateEnlistmentLog.SyncFromWriter(m);
+
+                        if (TryAllManager.REMOVE_READ_AFTER_UPDATE_AT_GC ||
+                            TryAllManager.REMOVE_READ_DUPLICATES_AT_GC) {
+                            m.rEnlistmentLog.ValidateAndRemoveDuplicates(m);
+                        } else {
+                            m.rEnlistmentLog.Validate(m, true /* during GC */);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Called before resuming the world.  This is responsible for
+        // validation, removing duplicates from the logs and restoring
+        // untraced pointers in the fast-path writer structs.  In
+        // theory we could perform the operations on the logs when
+        // visiting them -- but this is tricky code and separating it
+        // out lets us work without needing GC barriers.
+
+        internal static void doPostGCHook() {
+            Thread[] threadTable = Thread.threadTable;
+            int limit = threadTable.Length;
+
+            TryAllManager.DebugPrintNoLock("PostGC callback\n");
+
+            // 1. Restore STMWords for locally allocated objects and
+            //    hashtables for duplicate detection
+
+            for (int i = 0; i < limit; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    TryAllManager m = thread.tryAllManager;
+                    if(m != null) {
+                        EnsureCache(m); 
+                        // NB: we do not call AllocLocallyAllocatedSTMWords here:
+                        // we haven't completely finished the current GC and don't
+                        // wish to risk triggering further GCs by allocating
+                        // new UpdateEnlistmentLog.Entry arrays for any TryAll
+                        // structs that don't have one yet.  (This could happen
+                        // if the current GC was triggered by such an allocation)
+                        m.InitLocallyAllocatedSTMWords();
+
+                        if (m.nextSavedTryAll == 0) { 
+                            m.locallyAllocatedSTMWord = m.savedTryAlls[0].locallyAllocatedSTMWord;
+                        } else {
+                            m.locallyAllocatedSTMWord = m.savedTryAlls[m.nextSavedTryAll - 1].locallyAllocatedSTMWord;
+                        }
+                    }
+                }
+            }
+
+            // 2. Replenish supply of transaction tokens
+            TryAllManager.ReplenishTokens();
+
+            // 3. Restore fast-path writer structs and STMWords for locally
+            //    allocated objects
+            for (int i = 0; i < limit; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    TryAllManager m = thread.tryAllManager;
+                    if(m != null) {
+                        if (UpdateLog.WriterIsValid(m._updateLogWriter)) {
+                            UpdateLog.InitWriter(m);
+                        }
+                        if (ReadEnlistmentLog.WriterIsValid(m._rEnlistmentLogWriter)) {
+                            ReadEnlistmentLog.InitWriter(m);
+                        }
+                        if (UpdateEnlistmentLog.WriterIsValid(m._uEnlistmentLogWriter)) {
+                            UpdateEnlistmentLog.InitWriter(m);
+                        }
+                    }
+                }
+            }
+
+            SetDuringGC(false);
+        }
+
+        // We ensure that all of our own data structures held in objects and read
+        // during GC must have been visited.  For the semispace collector this 
+        // ensures that they are in to-space with a valid vtable pointer.
+        // This makes the code less brittle to the ordering of special cases 
+        // during GC -- e.g. we can be run after dealing with pinned objects 
+        // (some of which may lie on the same page as our data structures).
+
+        internal unsafe static Object ReadBarrier(NonNullReferenceVisitor v,
+                                                  Object o)
+        {
+            Object result;
+            if (o == null) {
+                result = null;
+            } else {
+                UIntPtr temp = Magic.addressOf(o);
+#if ENABLE_GC_TRACING
+                VTable.DebugPrint("rb({0:x}) -> ", 
+                                  __arglist((uint)Magic.addressOf(o)));
+#endif
+
+                v.Visit(&temp);
+                result = Magic.fromAddress(temp);
+#if ENABLE_GC_TRACING
+                VTable.DebugPrint("{0:x}\n", 
+                                  __arglist((uint)Magic.addressOf(result)));
+#endif
+            }
+            return result;    
+        }
+
+
+        // Intrinsics used to avoid casts from the result returned by
+        // ReadBarrier: the collector may use bits in the VTable word and so
+        // we cannot use a checked cast.
+
+        [Intrinsic]
+        internal static unsafe extern Thread[] 
+        toThreadArray(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern Thread 
+        toThread(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern TryAllManager 
+        toTryAllManager(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern ReadEnlistmentLog 
+        toReadEnlistmentLog(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern ReadEnlistmentLog.LogChunk
+        toReadEnlistmentLogChunk(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern ReadEnlistmentLog.Entry[]
+        toReadEnlistmentLogEntryArray(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern UpdateEnlistmentLog
+        toUpdateEnlistmentLog(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern UpdateEnlistmentLog.LogChunk
+        toUpdateEnlistmentLogChunk(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern UpdateEnlistmentLog.Entry[]
+        toUpdateEnlistmentLogEntryArray(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern UpdateLog
+        toUpdateLog(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern UpdateLog.LogChunk
+        toUpdateLogChunk(Object o);
+
+        [Intrinsic]
+        internal static unsafe extern UpdateLog.Entry[]
+        toUpdateLogEntryArray(Object o);
+
+        // Visit strong refs from the transaction logs.  These occur only in the 
+        // 'old value' entries in the undo log. 
+        private static void doVisitStrongRefs(NonNullReferenceVisitor rv) {
+            TryAllManager.DebugPrintGC("GC - VisitLogData with ptrVisitor={0}\n", 
+                                __arglist((uint)Magic.addressOf(rv)));
+            
+            Thread[] threadTable = toThreadArray(ReadBarrier(rv, 
+                                                             Thread.threadTable));
+            
+            int limit = threadTable.Length;
+            for (int i = 0; i < limit; i++) {
+                Thread thread = toThread(ReadBarrier(rv, threadTable[i]));
+                if (thread != null) {
+                    TryAllManager m = toTryAllManager(ReadBarrier(rv,
+                                                                  thread.tryAllManager));
+                    if(m != null) {
+                        TryAllManager.DebugPrintGC("GC - Visiting thread index={0} \n",
+                                            __arglist(i));
+                        VisitStrongRefs(m, rv);
+                    }
+                }
+            }
+        }
+
+        // Visit weak refs from the transaction logs.  These occur in the 
+        // reference-directed values identifying objects in all three logs.
+        // The log entries can be removed if the referent has died.
+        //
+        // We split weak ref processing into two phases.  The first phase visits
+        // the update-enlistment log.  The second phase visits the 
+        // read-enlistment and undo logs.  This simplifies processing of the 
+        // read-enlistment log when handling entries that occur in both 
+        // enlistment logs.
+        private static void doVisitWeakRefs(NonNullReferenceVisitor rv) {
+            TryAllManager.DebugPrintGC("GC - Visit logs (weak) with {0}\n", 
+                                __arglist((uint)Magic.addressOf(rv)));
+            
+            Thread[] threadTable = toThreadArray(ReadBarrier(rv, 
+                                                             Thread.threadTable));
+            
+            int limit = threadTable.Length;
+            
+            for (int i = 0; i < limit; i++) {
+                Thread thread = toThread(ReadBarrier(rv,
+                                                     threadTable[i]));
+                if (thread != null) {
+                    TryAllManager m =
+                        toTryAllManager(ReadBarrier(rv,
+                                                    thread.tryAllManager));
+                    if(m != null) {
+#if ENABLE_GC_TRACING
+                        VTable.DebugPrint("GC - Visiting thread index={0} \n",
+                                          __arglist(i));
+#endif
+                        VisitWeakRefsPhase1(m, rv);
+                    }
+                }
+            }
+                
+            for (int i = 0; i < limit; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    TryAllManager m = thread.tryAllManager;
+                    if(m != null) {
+                        TryAllManager.DebugPrintGC("GC - Visiting thread index={0} \n",
+                                            __arglist(i));
+                        VisitWeakRefsPhase2(m, rv);
+                    }
+                }
+            }
+        }
+
+        // Visit strong refs from the transaction logs.  These occur in the 
+        // overwritten values in the undo log.
+        private static void VisitStrongRefs(TryAllManager m,
+                                            NonNullReferenceVisitor rv) {
+
+            UpdateLog updateLog = toUpdateLog(ReadBarrier(rv, 
+                                                          m.updateLog));
+            updateLog.VisitStrongRefs(m, rv);
+        }
+
+        private static void VisitWeakRefsPhase1(TryAllManager m,
+                                                NonNullReferenceVisitor rv) {
+            UpdateEnlistmentLog uEnlistmentLog = m.uEnlistmentLog;
+            uEnlistmentLog.VisitWeakRefs(m, rv);
+        }
+
+        private static void VisitWeakRefsPhase2(TryAllManager m,
+                                                NonNullReferenceVisitor rv) {
+            UpdateLog updateLog;
+            ReadEnlistmentLog rEnlistmentLog;
+
+            updateLog =
+                toUpdateLog(ReadBarrier(rv, m.updateLog));
+            rEnlistmentLog =
+                toReadEnlistmentLog(ReadBarrier(rv, 
+                                                m.rEnlistmentLog));
+
+            updateLog.VisitWeakRefs(m, rv);
+            rEnlistmentLog.VisitWeakRefs(m, rv);
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Hashing
+        //
+        // If HASHING is set then we keep a fixed sized table 
+        // (VTable.tryAllCheckMask entries) which maps from hash values to 
+        // addresses that have been logged.  We use this to filter logging requests
+        // in order to remove duplicates.  For simplicity we hold only a single
+        // address for each hash value.
+
+        private static void ClearCache(TryAllManager m) {
+            if (HASHING) {
+                DebugPrint("Clearing cache\n");
+                uint[] cache = m.addressCache;
+                if (cache != null) {
+                    System.Array.Clear(cache, 0, cache.Length);
+                }
+            }
+        }
+
+        // Ensure that a cache structure is available.  We do this on the 
+        // way out of Log* operation so that we can GC if no cache is available.
+        [NoInline]
+        internal static void EnsureCache(TryAllManager m) {
+            if (HASHING) {
+                VTable.Assert(m.addressCache == null);
+                DebugPrint("No cache available: creating one\n");
+                uint[] cache = new uint[TryAllManager.HASH_MASK + 1];
+                m.tryAllCounters.IncrementCachesCreated();
+                m.addressCache = cache;
+            }
+        }
+
+        // Null-out the cache field before GC
+        [NoInline]
+        internal static void RemoveCache(TryAllManager m) {
+            if (HASHING) {
+                m.addressCache = null;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Undo helpers
+        //
+        // The implementation here is not thoroughly tested: it's really
+        // a placeholder while we think about the programming model.  Some 
+        // points to note about this:
+        //
+        // (a) We associate registered IUndo actions with positions in the 
+        //     update log.  When rolling back the log we use these positions
+        //     to indicate when to execute each IUndo action.  This causes
+        //     a problem with nested try_all blocks which do not contain
+        //     logging:  try_all { register-for-undo { try_all { .. } } }.
+        //     Without logging we can't tell whether the registered action
+        //     is associated with the inner try_all or the outer one.  We
+        //     currently deal with this by logging a dummy entry in the log
+        //     when registering an undo action.  We could alternatively
+        //     record the current try_all nesting depth in the IUndo log.
+        //     
+        // (b) The current model requires IUndo actions to run with the
+        //     state rewound to the point at which they were registered.
+        //     This means that registration imposes a barrier across which
+        //     Log* operations cannot be optimized.  Two consequences: 
+        //     (i) the current compiler does not respect this barrier,
+        //     (ii) if implemented correctly it means we cannot bound the
+        //     log sizes by the volume of data overwritten.
+
+        private void RegisterForUndoHelper(IUndo ua) {
+            // note to compiler: if this function may be invoked at a given point,
+            // any point after that must (at least once) backup the value of any
+            // data modified after that.  This is like a backup-barrier.  also,
+            // code can't migrate through calls to it.
+
+            if(nextSavedTryAll <= 0) {
+                return;
+            }
+
+            DebugPrint("<TryAll> undo action being registered\n");
+
+            if(ua == null) {
+                return;
+            }
+
+            this.undoLog.EnsureCapacity();
+
+            // prevent issues with logging right after a StartTryAll().  this code
+            // should be done better, and hopefully made optional (with support
+            // from the compiler).
+            unsafe {
+                fixed(UIntPtr* dummyAddress = &TryAllManager.staticDummyLogged) {
+                    LogIndirectValStackHelper((UIntPtr)dummyAddress, this);
+                }
+            }
+
+            // copy indices.
+            int ne = (this.undoLog.nextEntry++);
+
+            this.undoLog.entries[ne].updateLogAtRegistration = 
+                updateLog.CurrentLocation;
+
+            this.undoLog.entries[ne].UndoAction = 
+                ua;
+        }
+
+        // this function may not throw an exception
+        private void callUndo(IUndo ua) {
+            // should probably have 1 static exception for here.
+
+            DebugPrint("<TryAll> Undo action being invoked\n");
+
+            Exception ex = new Exception();
+            try {
+                try { // tryall
+                    DebugPrint(" nesting depth: {0}\n", 
+                               __arglist(nextSavedTryAll));
+                    ua.Undo();
+                    throw ex;
+                } catch(System.TryAllFakeException) { }
+            } catch (Exception) {
+                // catch the exception generated, and do nothing about it.  Note
+                // that this means that any exceptions propagated up to this level
+                // are squashed.
+            }
+
+            DebugPrint("<TryAll> undo finished\n nesting depth: {0}\n",
+                       __arglist(nextSavedTryAll));
+
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Wrappers called from outside.  These generally default in 
+        // the TryAllManager parameter, or expand multi-word operations 
+        // into series of invocations on single-word ones.
+
+        public static void RegisterForUndo(IUndo ua) {
+            TryAllManager.CurrentRunningTryAll.RegisterForUndoHelper(ua);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+        [NoLoggingForUndoAttribute]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void StartTryAll(StackHeight stackHeight) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("start try_all (slow)\n");
+            
+            Thread currentThread = Thread.CurrentThread;
+            if(currentThread.tryAllManager == null) {
+                currentThread.tryAllManager = new TryAllManager();
+            }
+            currentThread.tryAllManager.startTryAllHelper(false /*try_all*/,
+                                                          stackHeight);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+        [NoLoggingForUndoAttribute]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void StartTryAll(StackHeight stackHeight, 
+                                         TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("start try_all (quick)\n");
+
+            // We may receive a null TryAllManager if this is the first
+            // call to StartTryAll made by this thread.  NB, Start/Commit/Abort
+            // "may mutate existing storage" in Operator.cs, so subsequent
+            // calls will re-read the TryAllManager after we've stored it
+            // in the Thread structure.  
+            if (m == null) {
+                StartTryAll(stackHeight);
+            } else {
+                m.startTryAllHelper(false /*try_all*/, stackHeight);
+            }
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndoAttribute]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void StartAtomic(StackHeight stackHeight) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("start atomic (slow)\n");
+            
+            Thread currentThread = Thread.CurrentThread;
+            if(currentThread.tryAllManager == null) {
+                currentThread.tryAllManager = new TryAllManager();
+            }
+            currentThread.tryAllManager.startTryAllHelper(true /*atomic*/,
+                                                          stackHeight);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndoAttribute]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void StartAtomic(StackHeight stackHeight, 
+                                         TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("start (quick)\n");
+
+            // We may receive a null TryAllManager if this is the first
+            // call to StartTryAll made by this thread.  NB, Start/Commit/Abort
+            // "may mutate existing storage" in Operator.cs, so subsequent
+            // calls will re-read the TryAllManager after we've stored it
+            // in the Thread structure.  
+            if (m == null) {
+                StartAtomic(stackHeight);
+            } else {
+                m.startTryAllHelper(true /*atomic*/, stackHeight);
+            }
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+        [NoLoggingForUndo]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void CommitTryAll() {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("commit try_all (slow)\n");
+
+            TryAllManager.CurrentRunningTryAll.commitHelper(false /*tryall*/);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+        [NoLoggingForUndo]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void CommitTryAll(TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("commit try_all (quick)\n");
+
+            m.commitHelper(false /*tryall*/);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndo]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void CommitAtomic() {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("commit atomic (slow)\n");
+
+            TryAllManager.CurrentRunningTryAll.commitHelper(true /*atomic*/);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndo]
+#if !DEBUG
+        [DisableNullChecks]
+        [DisableBoundsChecks]
+#endif // !DEBUG
+        internal static void CommitAtomic(TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("commit atomic (quick)\n");
+
+            m.commitHelper(true /*atomic*/);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+        [NoLoggingForUndo]
+        internal static void AbortTryAll() {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("abort try_all (slow)\n");
+
+            TryAllManager.CurrentRunningTryAll.AbortHelper(false /*tryall*/);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+        [NoLoggingForUndo]
+        internal static void AbortTryAll(TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("abort try_all (quick)\n");
+            m.AbortHelper(false /*tryall*/);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndo]
+        internal static void AbortAtomic() {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("abort atomic (slow)\n");
+
+            TryAllManager.CurrentRunningTryAll.AbortHelper(true /*atomic*/);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndo]
+        internal static void AbortAtomic(TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("abort atomic (quick)\n");
+            m.AbortHelper(true /*atomic*/);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndoAttribute]
+        internal static void ValidateEnlistments() {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("ValidateEnlistments (slow)\n");
+            TryAllManager.CurrentRunningTryAll.validateHelper();
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+        [NoLoggingForUndoAttribute]
+        internal static void ValidateEnlistments(TryAllManager m) {
+            VTable.Assert(!TryAllManager.DISABLE_HOUSEKEEPING);
+            DebugPrint("ValidateEnlistments (quick)\n");
+            m.validateHelper();
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemoryForUpdateLog(uint bytesNeeded) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnsureLogMemoryHelperForUpdateLog(bytesNeeded, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemoryForUpdateLog(uint bytesNeeded,
+                                                         TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnsureLogMemoryHelperForUpdateLog(bytesNeeded, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemoryForReadEnlistmentLog(uint bytesNeeded) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnsureLogMemoryHelperForReadEnlistmentLog(bytesNeeded, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemoryForReadEnlistmentLog(uint bytesNeeded,
+                                                                 TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnsureLogMemoryHelperForReadEnlistmentLog(bytesNeeded, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemoryForUpdateEnlistmentLog(uint bytesNeeded) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnsureLogMemoryHelperForUpdateEnlistmentLog(bytesNeeded, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemoryForUpdateEnlistmentLog(uint bytesNeeded,
+                                                                   TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnsureLogMemoryHelperForUpdateEnlistmentLog(bytesNeeded, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForRead(Object obj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistObjHelperForRead(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForReadFast(Object obj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistObjHelperForReadFast(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForRead(Object obj, 
+                                              TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistObjHelperForRead(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForReadFast(Object obj, 
+                                              TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistObjHelperForReadFast(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForRead(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistAddrHelperForRead(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForReadFast(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistAddrHelperForReadFast(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForRead(UIntPtr pobj, 
+                                               TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistAddrHelperForRead(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForReadFast(UIntPtr pobj, 
+                                               TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistAddrHelperForReadFast(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForRead(UIntPtr ptr, 
+                                                   UIntPtr byteSize) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistIndirectHelper(ptr, byteSize, m, true);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForReadFast(UIntPtr ptr, 
+                                                       UIntPtr byteSize) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistIndirectHelperFast(ptr, byteSize, m, true);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForRead(UIntPtr ptr, 
+                                                   UIntPtr byteSize, 
+                                                   TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistIndirectHelper(ptr, byteSize, m, true);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForReadFast(UIntPtr ptr, 
+                                                   UIntPtr byteSize, 
+                                                   TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistIndirectHelperFast(ptr, byteSize, m, true);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForUpdate(Object obj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistObjHelperForUpdate(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForUpdateFast(Object obj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistObjHelperForUpdateFast(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForUpdate(Object obj, 
+                                                TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistObjHelperForUpdate(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistObjForUpdateFast(Object obj, 
+                                                    TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistObjHelperForUpdateFast(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistNewObjForUpdate(Object obj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistNewObjHelperForUpdate(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistNewObjForUpdateFast(Object obj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistNewObjHelperForUpdateFast(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistNewObjForUpdate(Object obj, 
+                                                   TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistNewObjHelperForUpdate(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistNewObjForUpdateFast(Object obj, 
+                                                       TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistNewObjHelperForUpdateFast(obj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForUpdate(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistAddrHelperForUpdate(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForUpdateFast(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistAddrHelperForUpdateFast(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForUpdate(UIntPtr pobj, 
+                                                 TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistAddrHelperForUpdate(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistAddrForUpdateFast(UIntPtr pobj, 
+                                                     TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistAddrHelperForUpdateFast(pobj, m);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForUpdate(UIntPtr ptr, 
+                                                     UIntPtr byteSize) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistIndirectHelper(ptr, byteSize, m, false);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForUpdateFast(UIntPtr ptr, 
+                                                     UIntPtr byteSize) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            EnlistIndirectHelperFast(ptr, byteSize, m, false);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForUpdate(UIntPtr ptr, 
+                                                     UIntPtr byteSize, 
+                                                     TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistIndirectHelper(ptr, byteSize, m, false);
+        }
+
+        [RequiredByBartok("AtomicSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectForUpdateFast(UIntPtr ptr, 
+                                                     UIntPtr byteSize, 
+                                                     TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            EnlistIndirectHelperFast(ptr, byteSize, m, false);
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectHelper(UIntPtr ptr, 
+                                                  UIntPtr byteSize,
+                                                  TryAllManager m,
+                                                  bool readOnly) {
+            UIntPtr startBlock = alignStart(ptr);
+
+            if (readOnly) {
+                m.tryAllCounters.IncrementEnlistIndirectForRead();
+            } else {
+                m.tryAllCounters.IncrementEnlistIndirectForUpdate();
+            }
+
+            if (isStack(startBlock)) {
+                // Ptr to the stack : thread private so no need to enlist
+                DebugPrint("Address {0} is on stack: no need to enlist\n",
+                           __arglist((int)ptr));
+
+            } else if (isStatic(startBlock)) {
+                // Ptr to a static : enlist all blocks covered by the static
+
+                UIntPtr endBlock = alignEnd(ptr + byteSize);
+
+                DebugPrint("Address {0} is static, enlisting blocks {1}..{2}\n",
+                           __arglist((int)ptr,
+                                     (int)startBlock,
+                                     (int)endBlock));
+
+                for (UIntPtr i = startBlock ; i < endBlock ; i += blockSize) {
+                    if (readOnly) {
+                        EnlistAddrHelperForRead(i, m);
+                    } else {
+                        EnlistAddrHelperForUpdate(i, m);
+                    }
+                }
+
+            } else {
+                // Ptr to the heap : map to object pointer and enlist the object
+                
+                FactoredPointer factoredPointer = fixupInterior(ptr);
+                Object obj = factoredPointer.baseObj;
+
+                if (readOnly) {
+                    EnlistObjForRead(obj, m);
+                } else {
+                    EnlistObjForUpdate(obj, m);
+                }
+            }
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnlistIndirectHelperFast(UIntPtr ptr, 
+                                                  UIntPtr byteSize,
+                                                  TryAllManager m,
+                                                  bool readOnly) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            UIntPtr startBlock = alignStart(ptr);
+
+            if (readOnly) {
+                m.tryAllCounters.IncrementEnlistIndirectForReadFast();
+            } else {
+                m.tryAllCounters.IncrementEnlistIndirectForUpdateFast();
+            }
+
+            if (isStack(startBlock)) {
+                // Ptr to the stack : thread private so no need to enlist
+                DebugPrint("Address {0} is on stack: no need to enlist\n",
+                           __arglist((int)ptr));
+
+            } else if (isStatic(startBlock)) {
+                // Ptr to a static : enlist all blocks covered by the static
+
+                UIntPtr endBlock = alignEnd(ptr + byteSize);
+
+                DebugPrint("Address {0} is static, enlisting blocks {1}..{2}\n",
+                           __arglist((int)ptr,
+                                     (int)startBlock,
+                                     (int)endBlock));
+
+                for (UIntPtr i = startBlock ; i < endBlock ; i += blockSize) {
+                    if (readOnly) {
+                        EnlistAddrHelperForReadFast(i, m);
+                    } else {
+                        EnlistAddrHelperForUpdateFast(i, m);
+                    }
+                }
+
+            } else {
+                // Ptr to the heap : map to object pointer and enlist the object
+                
+                FactoredPointer factoredPointer = fixupInterior(ptr);
+                Object obj = factoredPointer.baseObj;
+
+                if (readOnly) {
+                    EnlistObjForReadFast(obj, m);
+                } else {
+                    EnlistObjForUpdateFast(obj, m);
+                }
+            }
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeapMultiple(Object obj, 
+                                                UIntPtr off,
+                                                UIntPtr size) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogValHeapMultipleHelper(obj, off, size, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeapMultipleFast(Object obj, 
+                                                    UIntPtr off,
+                                                    UIntPtr size) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogValHeapMultipleHelperFast(obj, off, size, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeapMultiple(Object obj,
+                                                UIntPtr off, 
+                                                UIntPtr size, 
+                                                TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogValHeapMultipleHelper(obj, off, size, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeapMultipleFast(Object obj,
+                                                    UIntPtr off, 
+                                                    UIntPtr size, 
+                                                    TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogValHeapMultipleHelperFast(obj, off, size, m);
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private static void LogValHeapMultipleHelper(Object obj, 
+                                                     UIntPtr off, 
+                                                     UIntPtr size, 
+                                                     TryAllManager m) {
+
+            UIntPtr offset = off;
+            UIntPtr startOffset = offset & blockAlignmentNegMask;
+            UIntPtr endOffset = offset + size;
+            if((endOffset & blockAlignmentMask) != 0) {
+                endOffset += blockSize;
+                endOffset &= blockAlignmentNegMask;
+            }
+
+            DebugPrint("<TryAll> log::vm: {0}/{1}+{2}::{3}--{4}\n", 
+                       __arglist((uint)Magic.addressOf(obj),
+                                 (uint)offset,
+                                 (uint)size,
+                                 (uint)startOffset,
+                                 (uint)endOffset));
+
+
+            m.tryAllCounters.IncrementLogValHeapMultiple();
+
+            for(UIntPtr curOffset = startOffset;
+                curOffset < endOffset;
+                curOffset += blockSize) {
+
+                LogValHeapHelper(obj, curOffset, m);
+            }
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private static void LogValHeapMultipleHelperFast(Object obj, 
+                                                         UIntPtr off, 
+                                                         UIntPtr size, 
+                                                         TryAllManager m) {
+
+            UIntPtr offset = off;
+            UIntPtr startOffset = offset & blockAlignmentNegMask;
+            UIntPtr endOffset = offset + size;
+            if((endOffset & blockAlignmentMask) != 0) {
+                endOffset += blockSize;
+                endOffset &= blockAlignmentNegMask;
+            }
+
+            DebugPrint("<TryAll> log::vm: {0}/{1}+{2}::{3}--{4}\n", 
+                       __arglist((uint)Magic.addressOf(obj),
+                                 (uint)offset,
+                                 (uint)size,
+                                 (uint)startOffset,
+                                 (uint)endOffset));
+
+
+            m.tryAllCounters.IncrementLogValHeapMultipleFast();
+
+            for(UIntPtr curOffset = startOffset;
+                curOffset < endOffset;
+                curOffset += blockSize) {
+
+                LogValHeapHelperFast(obj, curOffset, m);
+            }
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeap(Object obj, 
+                                        UIntPtr off) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogValHeapHelper(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeapFast(Object obj, 
+                                        UIntPtr off) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogValHeapHelperFast(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeap(Object obj, 
+                                        UIntPtr off,
+                                        TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogValHeapHelper(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValHeapFast(Object obj, 
+                                            UIntPtr off,
+                                            TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogValHeapHelperFast(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValStatic(UIntPtr addr) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogValStaticHelper(addr, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValStaticFast(UIntPtr addr) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogValStaticHelperFast(addr, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValStatic(UIntPtr addr,
+                                          TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogValStaticHelper(addr, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogValStaticFast(UIntPtr addr,
+                                              TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogValStaticHelperFast(addr, m);
+        }
+
+        // This function assumes that off is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefHeap(Object obj, 
+                                        UIntPtr off) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogRefHeapHelper(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefStatic(UIntPtr addr) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogRefStaticHelper(addr, m);
+        }
+
+        // This function assumes that off is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefHeapFast(Object obj, 
+                                            UIntPtr off) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogRefHeapHelperFast(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefStaticFast(UIntPtr addr) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogRefStaticHelperFast(addr, m);
+        }
+
+        // This function assumes that off is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefHeap(Object obj, 
+                                        UIntPtr off,
+                                        TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogRefHeapHelper(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefStatic(UIntPtr addr,
+                                          TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogRefStaticHelper(addr, m);
+        }
+
+        // This function assumes that off is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefHeapFast(Object obj, 
+                                            UIntPtr off,
+                                            TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogRefHeapHelperFast(obj, off, m);
+        }
+
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogRefStaticFast(UIntPtr addr,
+                                              TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogRefStaticHelperFast(addr, m);
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectRef(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogIndirectRefHelper(pobj, m);
+        }
+
+       // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectRefFast(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogIndirectRefHelperFast(pobj, m);
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectRef(UIntPtr pobj, 
+                                            TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogIndirectRefHelper(pobj, m);
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectRefFast(UIntPtr pobj, 
+                                            TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogIndirectRefHelperFast(pobj, m);
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectRefHelper(UIntPtr pobj,
+                                                  TryAllManager m) {
+            if(isStack(pobj)) {
+                LogIndirectRefStackHelper(pobj, m);
+            } else {
+                LogIndirectRefHeapHelper(pobj, m);
+            }
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectRefHelperFast(UIntPtr pobj,
+                                                  TryAllManager m) {
+            if(isStack(pobj)) {
+                LogIndirectRefStackHelperFast(pobj, m);
+            } else {
+                LogIndirectRefHeapHelperFast(pobj, m);
+            }
+        }
+        
+        // pobj does not have to be aligned
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectValMultiple(UIntPtr pobj, 
+                                                    UIntPtr size) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogIndirectValMultipleHelper(pobj, size, m);
+        }
+
+        // pobj does not have to be aligned
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectValMultipleFast(UIntPtr pobj, 
+                                                        UIntPtr size) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogIndirectValMultipleHelperFast(pobj, size, m);
+        }
+
+        // pobj does not have to be aligned
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectValMultiple(UIntPtr pobj, 
+                                                    UIntPtr size,
+                                                    TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogIndirectValMultipleHelper(pobj, size, m);
+        }
+
+        // pobj does not have to be aligned
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectValMultipleFast(UIntPtr pobj, 
+                                                        UIntPtr size,
+                                                        TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogIndirectValMultipleHelperFast(pobj, size, m);
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private static void LogIndirectValMultipleHelper(UIntPtr pobj, 
+                                                         UIntPtr size, 
+                                                         TryAllManager m) {
+            UIntPtr mem = pobj;
+            UIntPtr startBlock = alignStart(mem);
+            UIntPtr endBlock = alignEnd(mem + size);
+            
+            DebugPrint("<TryAll> logi::vm: {0}+{1}::{2}--{3}\n", 
+                       __arglist((uint)pobj,
+                                 (uint)size,
+                                 (uint)startBlock,
+                                 (uint)endBlock));
+
+
+            m.tryAllCounters.IncrementLogIndirectValMultiple();
+            
+            bool isstack = isStack(startBlock);
+            
+            Object startBlock2 = Magic.fromAddress(startBlock);
+            Object endBlock2 = Magic.fromAddress(endBlock);
+            
+            // REVIEW: Using Object to represent interior pointers
+            for(Object block = startBlock2;
+                Magic.addressOf(block) < Magic.addressOf(endBlock2);
+                block = Magic.fromAddress(Magic.addressOf(block) + blockSize)) {
+                if(isstack) {
+                    LogIndirectValStackHelper(Magic.addressOf(block), m);
+                } else {
+                    LogIndirectValHeapHelper(Magic.addressOf(block), m);
+                }
+            }
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private static void LogIndirectValMultipleHelperFast(UIntPtr pobj, 
+                                                         UIntPtr size, 
+                                                         TryAllManager m) {
+            UIntPtr mem = pobj;
+            UIntPtr startBlock = alignStart(mem);
+            UIntPtr endBlock = alignEnd(mem + size);
+            
+            DebugPrint("<TryAll> logi::vm: {0}+{1}::{2}--{3}\n", 
+                       __arglist((uint)pobj,
+                                 (uint)size,
+                                 (uint)startBlock,
+                                 (uint)endBlock));
+
+
+            m.tryAllCounters.IncrementLogIndirectValMultipleFast();
+            
+            bool isstack = isStack(startBlock);
+            
+            Object startBlock2 = Magic.fromAddress(startBlock);
+            Object endBlock2 = Magic.fromAddress(endBlock);
+            
+            // REVIEW: Using Object to represent interior pointers
+            for(Object block = startBlock2;
+                Magic.addressOf(block) < Magic.addressOf(endBlock2);
+                block = Magic.fromAddress(Magic.addressOf(block) + blockSize)) {
+                if(isstack) {
+                    LogIndirectValStackHelperFast(Magic.addressOf(block), m);
+                } else {
+                    LogIndirectValHeapHelperFast(Magic.addressOf(block), m);
+                }
+            }
+        }
+        
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectVal(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogIndirectValHelper(pobj, m);
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectValFast(UIntPtr pobj) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            LogIndirectValHelperFast(pobj, m);
+        }
+        
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectVal(UIntPtr pobj,
+                                            TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogIndirectValHelper(pobj, m);
+        }
+
+        // This function assumes that pobj is already 4/8byte aligned.
+        [RequiredByBartok("TryAllSupport")]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void LogIndirectValFast(UIntPtr pobj,
+                                                TryAllManager m) {
+            if (TryAllManager.DISABLE_ON_METHOD_ENTRY) {
+                return;
+            }
+            LogIndirectValHelperFast(pobj, m);
+        }
+        
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private static void LogIndirectValHelper(UIntPtr pobj,
+                                                 TryAllManager m) {
+            if(isStack(pobj)) {
+                LogIndirectValStackHelper(pobj, m);
+            } else {
+                LogIndirectValHeapHelper(pobj, m);
+            }
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        private static void LogIndirectValHelperFast(UIntPtr pobj,
+                                                 TryAllManager m) {
+            if(isStack(pobj)) {
+                LogIndirectValStackHelperFast(pobj, m);
+            } else {
+                LogIndirectValHeapHelperFast(pobj, m);
+            }
+        }
+        
+        //----------------------------------------------------------------------
+        //
+        // Debugging & profiling
+        //
+        // ENABLE_TRACING causes messages through DebugPrint to be
+        // output directly.  
+
+        // DebugPrintNoLock is used when acquiring a lock is not a good idea.
+        //
+
+        [System.Diagnostics.Conditional("ENABLE_TRACING")]
+        [NoInline]
+        internal static void DebugPrint(String v)
+        {
+            LockDebugPrint();
+            VTable.DebugPrint(v, new ArgIterator());
+            UnlockDebugPrint();
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_TRACING")]
+        [NoInline]
+        internal static void DebugPrint(String v, __arglist)
+        {
+            LockDebugPrint();
+            VTable.DebugPrint(v, new ArgIterator(__arglist));
+            UnlockDebugPrint();
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_TRACING")]
+        [NoInline]
+        internal static void DebugPrintNoLock(String v, __arglist)
+        {
+            VTable.DebugPrint(v, new ArgIterator(__arglist));
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_TRACING")]
+        [NoInline]
+        internal static void DebugPrintNoLock(String v)
+        {
+            VTable.DebugPrint(v, new ArgIterator());
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_GC_TRACING")]
+        [NoInline]
+        internal static void DebugPrintGC(String v)
+        {
+            VTable.DebugPrint(v, new ArgIterator());
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_GC_TRACING")]
+        [NoInline]
+        internal static void DebugPrintGC(String v, __arglist)
+        {
+            VTable.DebugPrint(v, new ArgIterator(__arglist));
+        }
+
+        // GC is currently co-operative so we must periodically check in if in a loop
+        // without allocation, e.g. in LockDebugPrint.  We obviously don't need these 
+        // counters to be precise, so no attempt at concurrency control.
+        static volatile int i;
+        static volatile Object o;
+        static void CheckInForGCHack() {
+            i++;
+            if ((i & 65535) == 0) {
+                o = new Object();
+            }
+        }
+
+        static int daplock = 0; // 0 => unlocked
+
+        [System.Diagnostics.Conditional("ENABLE_TRACING")]
+        internal static void LockDebugPrint() {
+            if (!DuringGC()) {
+                while (Interlocked.CompareExchange(ref daplock,
+                                                   1,
+                                                   0) != 0) {
+                    CheckInForGCHack();
+                }
+                DebugPrintNoLock("{0} : ", 
+                                 __arglist(Thread.CurrentThread.threadIndex));
+            }
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_TRACING")]
+        internal static void UnlockDebugPrint() {
+            if (!DuringGC()) {
+                daplock = 0;
+            }
+        }
+
+        internal static void LockLock() {
+            while (Interlocked.CompareExchange(ref daplock,
+                                               1,
+                                               0) != 0) {
+                CheckInForGCHack();
+            }
+        }
+
+        internal static void UnlockUnlock() {
+            daplock = 0;
+        }
+
+
+
+#if ENABLE_TRACING
+        static private bool duringGC = false;
+
+        static bool DuringGC() {
+            return duringGC;
+        }
+
+        static void SetDuringGC(bool f) {
+            duringGC =  f;
+        }
+#else
+        static bool DuringGC() {
+            // Callers should be conditional on ENABLE_TRACING.
+            VTable.NotReached("Testing DuringGC without ENABLE_TRACING set");
+            return false;
+        }
+
+        static void SetDuringGC(bool f) {
+            /* Nothing */
+        }
+#endif        
+
+        //----------------------------------------------------------------------
+        //
+        // Shake debugging
+        // 
+        // If SHAKE is #defined then we periodically pretend to be invalid in order
+        // to try to test more code paths.  
+        // 
+        // Each time we decide to shake we either (a) make sure the transaction
+        // will appear invalid and then raise an ordinary exception, or (b)
+        // raise AtomicIsInvalidException.  The first test ensures that we
+        // correctly suppress exceptions leaking out of invalid transactions.
+        // The second test deals with 'ordinary' invalidity, e.g. detected
+        // part way through a commit.
+
+        
+        public sealed class ShakeException : Exception {}
+    
+        internal int shakeCtr = 0; 
+        internal int shakeLim = 1;
+        internal bool shakeWithExn = false;
+
+        internal static void ShakeCurrent(bool duringGC) {
+#if SHAKE
+            CurrentRunningTryAll.Shake(duringGC);
+#endif
+        }
+
+        internal bool Occasionally() {
+            bool result = false;
+#if SHAKE
+            if ((shakeCtr++) % shakeLim == 0) {
+                shakeLim += 10;//= 2;
+                shakeCtr = 1;
+                result = true;
+            }
+#endif
+            return result;
+        }
+
+        internal void Shake(bool duringGC) {
+#if SHAKE
+            if (Occasionally()) {
+                if (currentTryAllStatus == TryAllStatus.Invalid) {
+                    DebugPrint("Already invalid\n");
+                } else {
+                    DebugPrint("Pretending to be invalid\n");
+                    shakeWithExn = !shakeWithExn;
+                    if (shakeWithExn && !duringGC) {
+                        DebugPrint("Raising ShakeException\n");
+                        tryAllCounters.IncrementInvalidShakeException();
+                        tryAllCounters.IncrementInvalidOutsideGC();
+                        currentTryAllStatus = TryAllStatus.Invalid;
+                        throw new ShakeException();
+                    } else {
+                        tryAllCounters.IncrementInvalidShake();
+                        becomeInvalid(duringGC);
+                    }
+                }
+            }
+#endif
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Debugging support.  
+        //
+        // These functions are for use from user code, e.g. to check that none of
+        // the objects making up an application's data structure are enlisted
+        // once a test has finished.
+
+        public static void DebugAbort() {
+#if DEBUG
+            VTable.DebugBreak();
+#endif
+        }
+
+        public static bool DebugIsQuiescent(Object obj) { 
+            STMHandle h = new STMHandle(obj);
+            STMSnapshot s = h.GetSTMSnapshot();
+            STMWord w = s.GetSTMWord();
+            bool r = w.IsQuiescent(); 
+#if DEBUG
+            if (!r) {
+                DebugPrint("Not quiescent: {0} snapshot=<{1:x}> word=<{2:x}>\n", 
+                           __arglist(Magic.addressOf(obj), s.value, w.value));
+            }
+#endif
+            return r;
+        }
+
+        public static bool InTryAll {
+            get {
+                Thread currentThread = Thread.CurrentThread;
+                if(currentThread.tryAllManager == null) {
+                    return false;
+                }
+                TryAllManager manager = currentThread.tryAllManager;
+                VTable.Deny(manager.nextSavedTryAll < 0,
+                            "nextSavedTryAll < 0");
+                return manager.nextSavedTryAll > 0;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Per-call-site profiling.
+        //
+        // If /TryAllPerCallSiteProfiling is enabled then Bartok will generate calls
+        // to UnsafeSetCallSite just before each Enlist* or Log* instruction.  This
+        // call supplies an integer value that uniquely identifies the call sit.
+        //
+        // The Enlist* and Log* operations are responsible for calling CountAsLogged
+        // if they write to the log.  
+        //
+        // The counting is best effort because a single shared call site ID
+        // is kept at runtime and shared count arrays are used.  This code is
+        // intended for single-threaded use when developing optimizations to
+        // reduce the calls made onto Enlist* and Log* functions.
+
+#if ENABLE_PER_CALL_SITE_PROFILING
+        private const int MAX_CALL_SITES_TRACKED = 16384;
+        private static int[] totCount = new int[MAX_CALL_SITES_TRACKED];
+        private static int[] logCount = new int[MAX_CALL_SITES_TRACKED];
+        private static int lastCallSite = 0;
+
+        [RequiredByBartok("TryAllSupport")]
+        public static void UnsafeSetCallSite(int i) {
+            lastCallSite = i;
+            totCount[lastCallSite]++;
+        }
+
+        internal static void CountAsLogged() {
+            logCount[lastCallSite]++;
+        }
+
+        internal static void DumpPerCallSiteStats() {
+            for (int i = 0; i < totCount.Length; i++) {
+                if (totCount[i] != 0) {
+                    VTable.DebugPrint("Id {0} called {1} logged {2} ({3} %)\n",
+                                      __arglist(i,
+                                                totCount[i],
+                                                logCount[i],
+                                                (100*(long)logCount[i]) / totCount[i]));
+                }
+            }
+        }
+#else
+
+        [RequiredByBartok("TryAllSupport")]
+        public static void UnsafeSetCallSite(int i) {
+            /* Nothing */
+        }
+
+        internal static void CountAsLogged() {
+            /* Nothing */
+        }
+
+        internal static void DumpPerCallSiteStats() {
+            /* Nothing */
+        }
+#endif
+
+        //----------------------------------------------------------------------
+        //
+        // Utility functions used during roll-back for distinguishing different
+        // kinds of address and making updates.
+
+        private static bool isStack(UIntPtr addr) {
+            PageType pageType = PageTable.Type(PageTable.Page(addr));
+            VTable.Deny(pageType == PageType.System,
+                        "pageType == PageType.System");
+            return pageType == PageType.Stack;
+        }
+
+        private static bool isStatic(UIntPtr addr) {
+            PageType pageType = PageTable.Type(PageTable.Page(addr));
+            VTable.Deny(pageType == PageType.System,
+                        "pageType == PageType.System");
+            return pageType == PageType.NonGC;
+        }
+
+        private static bool isNative(UIntPtr addr) {
+            PageType pageType = PageTable.Type(PageTable.Page(addr));
+            VTable.Deny(pageType == PageType.System,
+                        "pageType == PageType.System");
+            return pageType == PageType.Unallocated;
+        }
+
+        private static bool isGcHeap(UIntPtr addr) {
+            VTable.Deny(PageTable.Type(PageTable.Page(addr))
+                        == PageType.System,
+                        "pageType == PageType.System");
+            return PageTable.IsGcPage(PageTable.Page(addr));
+        }
+
+        internal static unsafe UIntPtr *getLoc(Object obj, UIntPtr offset) {
+            if(obj == null) {
+                return enpointerize(offset);
+            } else {
+                return enpointerize((Magic.addressOf(obj)+offset));
+            }
+
+        }
+
+        internal static unsafe void setAt(Object obj, UIntPtr offset,
+                                          UIntPtr data) {
+
+            DebugPrint("<TryAll> set::v: {0}/{1}::{2}->{3}\n", 
+                       __arglist((uint)Magic.addressOf(obj),
+                                 (uint)offset,
+                                 (uint)(*(getLoc(obj,offset))),
+                                 (uint)data));
+
+            System.ILHelpers.SetAt(obj, offset, data);
+        }
+
+        internal static unsafe void setAt(Object obj, UIntPtr offset,
+                                          Object data) {
+
+            DebugPrint("<TryAll> set::r: {0}/{1}::{2}->{3}\n", 
+                       __arglist((uint)Magic.addressOf(obj),
+                                 (uint)offset,
+                                 (uint)(*(getLoc(obj,offset))),
+                                 (uint)Magic.addressOf(data)));
+
+            System.ILHelpers.SetAt(obj, offset, data);
+        }
+
+        internal static unsafe void setAtStack
+        (StackHeight stackHeight, Object obj, UIntPtr offset, UIntPtr data) {
+            UIntPtr *memLoc = getLoc(obj,offset);
+            if(isStack((UIntPtr)memLoc)
+               && StackHeight.Deeper(stackHeight, (StackHeight)(UIntPtr)memLoc)) {
+
+                DebugPrint("<TryAll> set::vs: {0}/{1}::{2}->{3}\n",  
+                           __arglist((uint)Magic.addressOf(obj),
+                                     (uint)offset,
+                                     (uint)(*(getLoc(obj,offset))),
+                                     (uint)data));
+
+                System.ILHelpers.SetAt(obj, offset, data);
+            }
+        }
+
+        internal static unsafe void setAtStack
+        (StackHeight stackHeight, Object obj, UIntPtr offset, Object data) {
+            UIntPtr *memLoc = getLoc(obj,offset);
+            if(isStack((UIntPtr)memLoc)
+               && StackHeight.Deeper(stackHeight, (StackHeight)(UIntPtr)memLoc)) {
+
+                DebugPrint("<TryAll> set::rs: {0}/{1}::{2}->{3}\n",  
+                           __arglist((uint)Magic.addressOf(obj),
+                                     (uint)offset,
+                                     (uint)(*(getLoc(obj,offset))),
+                                     (uint)Magic.addressOf(data)));
+
+                System.ILHelpers.SetAt(obj, offset, data);
+            }
+        }
+
+        internal static unsafe UIntPtr *enpointerize(UIntPtr inp) {
+            return (UIntPtr *) inp;
+        }
+        internal static unsafe Object enpointerize2(UIntPtr inp) {
+            return Magic.fromAddress(*(UIntPtr *) inp);
+        }
+
+        // aligns an address on the word boundary nearest it, after
+        internal static UIntPtr alignStart(UIntPtr mem) {
+            return mem & blockAlignmentNegMask;
+        }
+        // aligns an address on the word boundary nearest it, before
+        internal static UIntPtr alignEnd(UIntPtr mem) {
+            return (mem + (blockSize - 1)) & blockAlignmentNegMask;
+        }
+
+        // note that this should NOT be called for stuff on the stack lists (and
+        // may give undefined results if such is done).  Eventually, these
+        // functions should be invoked by the GC on the heap lists.  At the
+        // moment, so as not to have to modify with the GC, it is done at Log
+        // time.  The function has no effect on tryall support, it is solely to
+        // keep the GC happy.
+
+        internal struct FactoredPointer {
+            internal Object baseObj;
+            internal UIntPtr offset;
+        }
+
+        internal static int fixup = 0;
+        internal static FactoredPointer fixupInterior(UIntPtr obj) {
+            Object baseObj;
+            UIntPtr offset;
+
+            fixup++;
+
+            VTable.Deny(isStack(obj), "fixup called on stack object");
+            if(!isGcHeap(obj)) {
+                baseObj = null;
+                offset = obj;
+            } else {
+                UIntPtr addr = GC.installedGC.FindObjectAddr(obj);
+                baseObj = Magic.fromAddress(addr);
+                offset = obj - addr;
+            }
+
+            FactoredPointer result;
+            result.baseObj = baseObj;
+            result.offset = offset;
+            return result;
+        }
+
+        // Information in this variable is essentially guaranteed garbage.  It is
+        // just a nice fixed place in memory.
+        private static UIntPtr staticDummyLogged = (UIntPtr) 0;
+
+        private static UIntPtr blockSize {
+            get {
+                return (UIntPtr) UIntPtr.Size;
+            }
+        }
+
+        private static UIntPtr blockAlignmentMask {
+            get {
+                return blockSize - 1;
+            }
+        }
+
+        private static UIntPtr blockAlignmentNegMask {
+            get {
+                return ~blockAlignmentMask;
+            }
+        }
+
+        //----------------------------------------------------------------------
+        //
+        // Fields
+
+        internal TryAll[] savedTryAlls;
+        internal int nextSavedTryAll;
+
+        internal StackHeight currentTryAllStackHeight;
+        internal TryAllStatus currentTryAllStatus;
+
+        internal ReadEnlistmentLogWriter _rEnlistmentLogWriter;
+        internal UpdateEnlistmentLogWriter _uEnlistmentLogWriter;
+        internal UpdateLogWriter _updateLogWriter;
+
+        internal ReadEnlistmentLog rEnlistmentLog;
+        internal UpdateEnlistmentLog uEnlistmentLog;
+        internal UpdateLog updateLog;
+        internal UndoLog undoLog;
+
+        internal TryAllCounters tryAllCounters;
+        internal AtomicIsInvalidException atomicIsInvalidException;
+        
+        internal uint tokens;
+
+        internal STMWord locallyAllocatedSTMWord;
+
+        private static VisitMethod visitStrongRefsDelegate;
+        private static VisitMethod visitWeakRefsDelegate;
+        private static GCHookMethod preGCHookDelegate;
+        private static GCHookMethod postGCHookDelegate;
+
+        delegate void VisitMethod(NonNullReferenceVisitor visitor);
+        delegate void GCHookMethod();
+
+        internal uint[] addressCache;
+    }
+
+    [NoLoggingForUndo]
+    internal struct TryAll {
+        internal StackHeight stackHeight;
+        internal UpdateLog.Location updateLogAtStart;
+        internal ReadEnlistmentLog.Location rEnlistmentLogAtStart;
+        internal UpdateEnlistmentLog.Location uEnlistmentLogAtStart;
+        internal UpdateEnlistmentLog.Entry[] locallyAllocatedEntry;
+        internal STMWord locallyAllocatedSTMWord;
+    }
+
+    internal enum TryAllStatus {
+        Active, ChosenCommit, Invalid
+    }
+
+    [NoLoggingForUndo]
+    internal struct LogEntryUndoAction {
+        // needed so we know when to invoke this action
+        internal UpdateLog.Location updateLogAtRegistration;
+        // the actual undo info
+        internal IUndo UndoAction;
+    }
+    
+    //----------------------------------------------------------------------
+    //
+    // Read enlistment log
+
+    unsafe struct ReadEnlistmentLogWriter {
+        internal ReadEnlistmentLog.Entry *next;
+        internal ReadEnlistmentLog.Entry *limit;
+
+        internal unsafe ReadEnlistmentLogWriter(ReadEnlistmentLog.Entry *next,
+                                                ReadEnlistmentLog.Entry *limit) {
+            this.next = next;
+            this.limit = limit;
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void EnsureLogMemory(TryAllManager m, uint bytesNeeded) {
+            VTable.Assert(bytesNeeded <= TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE * sizeof(ReadEnlistmentLog.Entry));
+            TryAllManager.DebugPrint("ReadEnlistment: EnsureLogMemory : bytesNeeded={0} {1:x} {2:x}\n",
+                                     __arglist(bytesNeeded,
+                                               (UIntPtr)m._rEnlistmentLogWriter.next,
+                                               (UIntPtr)m._rEnlistmentLogWriter.limit));
+
+            if((UIntPtr) m._rEnlistmentLogWriter.next + bytesNeeded
+                > (UIntPtr)m._rEnlistmentLogWriter.limit) {
+                GetNewLogChunk(m);
+             }             
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void EnsureLogMemory(TryAllManager m) {
+            TryAllManager.DebugPrint("ReadEnlistment: EnsureLogMemory {0:x} {1:x}\n",
+                                     __arglist((UIntPtr)m._rEnlistmentLogWriter.next,
+                                               (UIntPtr)m._rEnlistmentLogWriter.limit));
+
+            if((UIntPtr) m._rEnlistmentLogWriter.next > 
+               (UIntPtr)m._rEnlistmentLogWriter.limit) {
+                GetNewLogChunk(m);
+                VTable.Deny((UIntPtr) m._rEnlistmentLogWriter.next > 
+                            (UIntPtr)m._rEnlistmentLogWriter.limit);
+             }             
+        }
+
+        [NoInline]
+        internal static void GetNewLogChunk(TryAllManager m) {
+            //TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            ReadEnlistmentLog.SyncFromWriter(m);
+            m._rEnlistmentLogWriter = ReadEnlistmentLog.GetInvalidWriter();
+            m.rEnlistmentLog.AddCapacity(m);
+            ReadEnlistmentLog.InitWriter(m);
+            
+            TryAllManager.DebugPrint("ReadEnlistmentLogWriter, entries[0]={0:x}\n", 
+                                     __arglist(
+                                     (UIntPtr)(m._rEnlistmentLogWriter.next)));
+
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal static unsafe void Write(TryAllManager m, STMHandle h, bool ensure_after) {
+
+            TryAllManager.DebugPrint("ReadEnlistment: Write {0:x} {1:x}\n",
+                                     __arglist((UIntPtr)m._rEnlistmentLogWriter.next,
+                                               (UIntPtr)m._rEnlistmentLogWriter.limit));
+
+            VTable.Deny (m._rEnlistmentLogWriter.next > m._rEnlistmentLogWriter.limit);
+
+            if (TryAllManager.DISABLE_BEFORE_FILTERING) {
+                return;
+            }
+
+            if (TryAllManager.HASHING_FOR_READS) {
+                uint[] cache = m.addressCache;
+                VTable.Assert(cache != null);
+                uint hash = (h.addr >> 2) & (uint) TryAllManager.HASH_MASK;
+                
+                uint key = ((uint)h.addr) ^ (uint)(m.tokens);
+                TryAllManager.DebugPrint("Hashes to {0} mask={1}\n", 
+                           __arglist(hash,
+                                     TryAllManager.HASH_MASK));
+                
+                if (cache[hash] == (uint) key) {
+                    TryAllManager.DebugPrint("Found\n");
+                    m.tryAllCounters.IncrementReadsHitInCache();
+                    return;
+                } else {
+                    TryAllManager.DebugPrint("Not found\n");
+                    cache[hash] = (uint) key;
+                }
+                
+            }
+
+            if (TryAllManager.DISABLE_AFTER_FILTERING) {
+                return;
+            }
+
+            STMSnapshot v = h.GetSTMSnapshot();
+            if (TryAllManager.REMOVE_READ_AFTER_UPDATE_AT_ENLISTMENT) {
+                STMWord w = v.GetSTMWord();
+                if (w.IsOwned() && w.GetOwner() == m) {
+                    TryAllManager.DebugPrint("EnlistForRead h=<{0:x}> v=<{1:x}> already enlisted for update by us\n", 
+                                             __arglist(h.addr,
+                                                       v.value));
+                    m.tryAllCounters.IncrementUpdatesInReadEnlistmentsAtEnlistment();
+                    return;
+                }
+            }
+
+            //----------------------------------------------------------------------
+
+            if (!TryAllManager.DISABLE_BEFORE_WRITING_LOG) {
+                m.tryAllCounters.IncrementEnlistForReadLogged();
+                
+                ReadEnlistmentLog.Entry *ne = m._rEnlistmentLogWriter.next;
+                ne -> h = h;
+                ne -> v = v;
+                ne++;
+                m._rEnlistmentLogWriter.next = (ReadEnlistmentLog.Entry *) ne;
+                
+                TryAllManager.CountAsLogged();
+
+                if (ensure_after) {
+                    EnsureLogMemory(m); 
+                }
+            }
+
+            TryAllManager.DebugPrint("EnlistForRead h=<{0:x}> v=<{1:x}> entry=<{2:x}>\n", 
+                                     __arglist(h.addr,
+                                               v.value,
+                                               (UIntPtr)(m._rEnlistmentLogWriter.next)));
+
+            //----------------------------------------------------------------------
+        }
+    }
+
+    [NoLoggingForUndo]
+    class ReadEnlistmentLog {
+        internal ReadEnlistmentLog() {
+            Entry[] entries = new Entry[TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE];
+            this.currentChunk = new LogChunk(entries, null);
+        }
+      
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe Entry *AddrOfEntry(int idx) {
+            Entry[] entries = this.currentChunk.entries;
+            UIntPtr addrAsUIntPtr;
+            Entry *result;
+
+            fixed (Entry *baseAddr = &entries[0]) {
+                Entry *entryAddr = baseAddr + idx;
+                addrAsUIntPtr = (UIntPtr) entryAddr;
+            }
+
+            result = (Entry *) addrAsUIntPtr;
+
+            return result;
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe uint AddrToIndex(Entry *entryPtr) {
+            uint result;
+            UIntPtr baseAddr;
+            fixed (Entry *basePtr = &this.currentChunk.entries[0]) {
+                baseAddr = (UIntPtr)basePtr;
+            }
+            UIntPtr entryAddr = (UIntPtr)entryPtr;
+            result = (uint)((int)(entryAddr - baseAddr)) / ((uint)sizeof (Entry));
+            return (uint)result;
+        }
+
+        internal bool NotEmpty() {
+            return ((this.currentChunk.nextEntry != 0) || (this.currentChunk.next != null));
+        }
+
+        // For each enlistment was log the STMSnapshot we saw when we enlisted
+        // the object.  The STM guarantees that the STM snapshot changes
+        // every time the object is opened for update: we'll detect conflicts
+        // because we'll see a different STMSnapshot at validation.
+
+        internal struct Entry {
+            internal STMHandle h;
+            internal STMSnapshot v;
+        }
+
+        internal class LogChunk {
+            internal LogChunk(Entry[] entries,LogChunk next) {
+                this.entries = entries;
+                this.next = next;
+            }
+        
+            internal Entry[] entries;
+            internal LogChunk next;
+            internal int nextEntry;
+        }
+    
+
+        internal unsafe void Dump() {
+            VTable.DebugPrint("ReadEnlistment log:\n");
+            LogChunk chunk = this.currentChunk;
+            int lowIdx = 0;
+            int highIdx = chunk.nextEntry;
+
+            while (chunk != null) {
+                Entry[] entries = chunk.entries;
+                VTable.DebugPrint("chunk={0} entries={1}\n",
+                                  __arglist((uint)(Magic.addressOf(chunk)),
+                                            (uint)(Magic.addressOf(entries))));
+
+                for (int i = lowIdx; i < highIdx; i++) {
+                    VTable.DebugPrint("entry[{0}] : <{1}> logged: <{2}> now: <{3}>\n",
+                                      __arglist(i,
+                                                (uint)(entries[i].h.addr),
+                                                (uint)(entries[i].v.value),
+                                                (uint)(entries[i].h.GetSTMSnapshot().GetSTMWord().value)));
+
+                }
+
+                chunk = chunk.next;
+                highIdx = TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE;
+            }
+        }
+
+        [NoInline]
+        internal void AddCapacity(TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistmentOverflow();
+
+            // NB: construct these objects before linking them in case
+            // the write barriers cause GC.
+
+            Entry[] newEntries = 
+                new Entry[TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE];
+
+            LogChunk newNode = 
+                new LogChunk(newEntries, this.currentChunk);
+
+            // NB: Storing to currentChunk may trip the write barrier.
+            // We need to make sure that the visitation code will work
+            // at any of those points.  This means we write to currentChunk
+            // first: if that causes a GC then we can scan the previous
+            // chunk without having corrupted nextEntry.
+
+            this.currentChunk = newNode;
+        }
+    
+        [InlineCopyAttribute]
+        internal struct Location {
+            internal Location(LogChunk node, int entry) {
+                this.node = node;
+                this.entry = entry;
+            }
+        
+            internal static bool Eq(Location l1, Location l2) {
+                return (l1.entry == l2.entry) && (l1.node == l2.node);
+            }
+
+            internal static int ToDebugIdx(Location l1) {
+                LogChunk n1 = l1.node;
+                int result = 0;
+
+                while (n1.next != null) {
+                    result += TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE;
+                    n1 = n1.next;
+                }
+                result += l1.entry;
+                return result;
+            }
+
+            internal LogChunk node;
+            internal int entry;
+        }
+
+        internal Location CurrentLocation {
+            get {
+                return new Location(this.currentChunk, this.currentChunk.nextEntry);
+            }
+        }
+
+        internal int Size {
+            get {
+                int size = 0;
+                for(LogChunk node = this.currentChunk;
+                    node != null;
+                    node = node.next) {
+                    size += node.entries.Length;
+                }
+                return size;
+            }
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void SyncFromWriter(TryAllManager m) {
+            ReadEnlistmentLog l = m.rEnlistmentLog;
+
+            if (m._rEnlistmentLogWriter.next != null) {
+                l.currentChunk.nextEntry = (int)l.AddrToIndex(m._rEnlistmentLogWriter.next);
+            }
+
+            VTable.Assert(l.currentChunk.nextEntry >= 0);
+            VTable.Assert(l.currentChunk.nextEntry <= TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE);
+
+            TryAllManager.DebugPrint("ReadEnlistmentLogWriter : sync when nextEntry={0}\n",
+                                     __arglist(l.currentChunk.nextEntry));
+        }
+
+        internal static unsafe ReadEnlistmentLogWriter GetInvalidWriter() {
+            return new ReadEnlistmentLogWriter(null, null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe bool WriterIsValid(ReadEnlistmentLogWriter w) {
+            return (w.next != null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void InitWriter(TryAllManager m) {
+            ReadEnlistmentLog r = m.rEnlistmentLog;
+            Entry *next = r.AddrOfEntry(r.currentChunk.nextEntry);
+            Entry *limit = r.AddrOfEntry(TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE - 1);
+            
+            TryAllManager.DebugPrint("ReadEnlistmentLogWriter : nextEntry={0} next={1} limit={2}\n",
+                                     __arglist(r.currentChunk.nextEntry,
+                                               (uint)(UIntPtr)next,
+                                               (uint)(UIntPtr)limit));
+
+            m._rEnlistmentLogWriter.next = next;
+            m._rEnlistmentLogWriter.limit = limit;
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal unsafe void Validate(TryAllManager m, bool duringGC) {
+            LogChunk chunk = this.currentChunk;
+            Entry[] entries = chunk.entries;
+            int endEntry = chunk.nextEntry;
+            int oldestEntry = m.savedTryAlls[0].rEnlistmentLogAtStart.entry;
+
+            TryAllManager.DebugPrint("Pre-validation status {0} {1}\n",
+                                     __arglist((int)m.currentTryAllStatus,
+                                               duringGC ? "(during GC)" : "(not during GC)"));
+
+            m.Shake(duringGC);
+
+            do {
+                int startEntry = (chunk.next == null) ? oldestEntry : 0;
+                
+                VTable.Assert((chunk != m.savedTryAlls[0].rEnlistmentLogAtStart.node) || 
+                              (chunk.next == null));
+
+                for (int entry = startEntry; entry < endEntry; entry++) {
+                    STMHandle h = entries[entry].h;
+
+                    STMSnapshot oldSnapshot = entries[entry].v;
+                    STMSnapshot curSnapshot = h.GetSTMSnapshot();
+                    
+                    TryAllManager.DebugPrint("index {0} h=<{1:x}> logged=<{2:x}> now=<{3:x}>\n", 
+                                             __arglist(entry,
+                                                       h.addr,
+                                                       oldSnapshot.value,
+                                                       curSnapshot.value));
+
+                    if (oldSnapshot.value == curSnapshot.value) {
+                        if (curSnapshot.ZeroIfMustBeQuiescent() == 0) {
+                            // Fast test succeeded: certainly quiescent
+                        } else {
+                            STMWord curWord = curSnapshot.GetSTMWord();
+                            if (curWord.IsQuiescent()) {
+                                // Unchanged, not enlisted by anyone
+                            } else if (curWord.GetOwner() == m) {
+                                // Previously enlisted by us
+                                VTable.Assert(m.uEnlistmentLog.NotEmpty());
+                            } else {
+                                // Previously enlisted by someone else 
+                                m.tryAllCounters.IncrementInvalidConflict();
+                                m.becomeInvalid(duringGC);
+                            }
+                        }
+                    } else {
+                        STMWord curWord = curSnapshot.GetSTMWord();
+                        if (curWord.IsQuiescent()) {
+                            if (curWord.Eq(oldSnapshot.GetSTMWord())) {
+                                // Inflated, but no conflicting STM operation
+                                m.tryAllCounters.IncrementInflationSeen();
+                            } else {
+                                // Updated by someone else after we enlisted it
+                                m.tryAllCounters.IncrementInvalidConflict();
+                                m.becomeInvalid(duringGC);
+                            }
+                        } else if (curWord.GetOwner() == m) {
+                            // Subsequently enlisted by us...
+                            VTable.Assert(m.uEnlistmentLog.NotEmpty());
+                            if (curWord.GetOwnersVersion().Eq(oldSnapshot)) {
+                                // ...without intervening update
+                            } else {
+                                // ...but updated by someone else before then
+                                m.tryAllCounters.IncrementInvalidConflict();
+                                m.becomeInvalid(duringGC);
+                            }
+                        } else {
+                            // Subsequently enlisted by someone else
+                            m.tryAllCounters.IncrementInvalidConflict();
+                            m.becomeInvalid(duringGC);
+                        }
+                    }
+                }
+                
+                if (chunk.next == null) break;
+                chunk = chunk.next;
+                entries = chunk.entries;
+                endEntry = chunk.nextEntry;
+            } while (true);
+
+            TryAllManager.DebugPrint("{0:x}: Post-validation status {1}\n",
+                                     __arglist(Magic.addressOf(m),
+                                               (int)m.currentTryAllStatus));
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal void DismissFrom(TryAllManager m, Location l) {
+            TryAllManager.DebugPrint("Dismissing read enlistments from {0} to {1}\n",
+                                     __arglist(Location.ToDebugIdx(l),
+                                               Location.ToDebugIdx(CurrentLocation)));
+
+
+            this.currentChunk = l.node;
+            this.currentChunk.nextEntry = l.entry;
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe void VisitWeakRefs(TryAllManager m, 
+                                           NonNullReferenceVisitor rv) {
+            LogChunk fromChunk = this.currentChunk;
+            Entry[] fromEntries = fromChunk.entries;
+            int fromEntry = fromChunk.nextEntry;
+            int fromNumBlocks = 1;
+
+            LogChunk toChunk = fromChunk;
+            Entry[] toEntries = fromEntries;
+            int toEntry = fromEntry;
+            int toNumBlocks = 1;
+
+            for (int depth = m.nextSavedTryAll - 1; depth >= 0; depth --) {
+                LogChunk startToChunk = toChunk;
+                int startToEntry = toEntry;
+                
+                LogChunk endFromChunk = m.savedTryAlls[depth].rEnlistmentLogAtStart.node;
+                int endFromEntry = m.savedTryAlls[depth].rEnlistmentLogAtStart.entry;
+
+                endFromChunk = TryAllManager.toReadEnlistmentLogChunk(TryAllManager.ReadBarrier(rv, 
+                                                                                                endFromChunk));
+                
+                TryAllManager.DebugPrintGC("Visiting read enlistments for {0:x} depth {1} ({2:x}:{3})\n", 
+                                    __arglist((UIntPtr)Magic.addressOf(m),
+                                              depth,
+                                              Magic.addressOf(endFromChunk),
+                                              endFromEntry));
+                
+                while (true) {
+                    bool inEndChunk = (fromChunk == endFromChunk);
+                    int downTo = inEndChunk ? endFromEntry : 0;
+                    
+                    for (fromEntry --; fromEntry >= downTo; fromEntry --) {
+                        STMHandle h = fromEntries[fromEntry].h;
+                        STMWord curWord = h.GetSTMSnapshot().GetSTMWord();
+
+                        TryAllManager.DebugPrintGC("saw index {0:x}/{1} {2:x} {3:x} in read enlistments\n",
+                                            __arglist(Magic.addressOf(fromEntries),
+                                                      fromEntry,
+                                                      h.addr,
+                                                      curWord.value));
+                        
+                        // Check if the referent has died
+
+                        bool keep;
+                        if ((h.addr != UIntPtr.Zero) &&
+                            (!fromEntries[fromEntry].h.Visit(rv))) {
+                            keep = false;
+                            TryAllManager.DebugPrintGC("   cleared weak ref\n");
+                            m.tryAllCounters.IncrementWeakRefsClearedInReadEnlistmentLog();
+                        } else {
+                            keep = true;
+                        }
+
+                        if (keep) {
+                            // Move on to the next to-chunk if we've filled one
+                            if (toEntry == 0) {
+                                toChunk = toChunk.next;
+                                toEntries = toChunk.entries;
+                                toEntry = toEntries.Length;
+                                
+                                toChunk.nextEntry = toEntries.Length;
+                                toNumBlocks ++;
+                            }
+                            
+                            // Claim a slot in toEntries
+                            toEntry --;
+                            
+                            // Copy the entry to the to-chunk, visit the
+                            // pointer-derived values in it
+                            toEntries[toEntry] = fromEntries[fromEntry];
+                            toEntries[toEntry].v.Visit(rv);
+                            
+                            TryAllManager.DebugPrintGC("   --> {0:x}/{1} {2:x} {3:x}\n",
+                                                __arglist(Magic.addressOf(toEntries),
+                                                          toEntry,
+                                                          toEntries[toEntry].h.addr,
+                                                          toEntries[toEntry].v.value));
+                        }
+                    }
+                    
+                    if (inEndChunk) {
+                        break;
+                    }
+                    
+                    // Move on to the next from-chunk
+                    fromChunk = fromChunk.next;
+                    fromEntries = fromChunk.entries;
+                    fromEntry = fromChunk.nextEntry;
+                    fromNumBlocks ++;
+                }
+                
+                // Update finishing point
+                TryAllManager.DebugPrintGC("Log now starts at {0:x}:{1}\n",
+                                           __arglist(Magic.addressOf(toChunk),
+                                                     toEntry));
+                m.savedTryAlls[depth].rEnlistmentLogAtStart.node = toChunk;
+                m.savedTryAlls[depth].rEnlistmentLogAtStart.entry = toEntry;
+
+            }
+            
+            VTable.Assert(fromChunk.next == null);
+            toChunk.next = null;
+
+            if (TryAllManager.ENABLE_PROFILING) {
+                if (VTable.enableGCTiming) {
+                    VTable.DebugPrint("[Read enlistment log: {0}->{1} * {2}]\n",
+                                      __arglist(fromNumBlocks,
+                                                toNumBlocks,
+                                                TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE));
+                }
+            }
+
+#if DEBUG
+            for (int i = 0; i < toEntry; i ++) {
+                toEntries[i].h.addr = (UIntPtr)TryAllManager.DEAD_PTR;
+                toEntries[i].v.value = UIntPtr.Zero;
+            }
+#endif
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe void ValidateAndRemoveDuplicates(TryAllManager m) {
+            LogChunk fromChunk = this.currentChunk;
+            Entry[] fromEntries = fromChunk.entries;
+            int fromEntry = fromChunk.nextEntry;
+            int fromNumBlocks = 1;
+
+            LogChunk toChunk = fromChunk;
+            Entry[] toEntries = fromEntries;
+            int toEntry = fromEntry;
+            int toNumBlocks = 1;
+
+            for (int depth = m.nextSavedTryAll - 1; depth >= 0; depth --) {
+                LogChunk startToChunk = toChunk;
+                int startToEntry = toEntry;
+                
+                LogChunk endFromChunk = m.savedTryAlls[depth].rEnlistmentLogAtStart.node;
+                int endFromEntry = m.savedTryAlls[depth].rEnlistmentLogAtStart.entry;
+
+                TryAllManager.DebugPrintGC("Visiting read enlistments for {0:x} depth {1} ({2:x}:{3})\n", 
+                                    __arglist((UIntPtr)Magic.addressOf(m),
+                                              depth,
+                                              Magic.addressOf(endFromChunk),
+                                              endFromEntry));
+                
+                while (true) {
+                    bool inEndChunk = (fromChunk == endFromChunk);
+                    int downTo = inEndChunk ? endFromEntry : 0;
+                    
+
+                    for (fromEntry --; fromEntry >= downTo; fromEntry --) {
+                        STMHandle h = fromEntries[fromEntry].h;
+                        STMWord curWord = h.GetSTMSnapshot().GetSTMWord();
+
+                        TryAllManager.DebugPrintGC("saw index {0:x}/{1} {2:x} {3:x} in read enlistments chunk {4:x}\n",
+                                            __arglist(Magic.addressOf(fromEntries),
+                                                      fromEntry,
+                                                      h.addr,
+                                                      curWord.value,
+                                                      Magic.addressOf(fromChunk)));
+                        
+                        bool keep = false;
+
+                        STMSnapshot oldSnapshot = fromEntries[fromEntry].v;
+                        STMSnapshot curSnapshot = h.GetSTMSnapshot();
+                        
+                        TryAllManager.DebugPrintGC("index {0} h=<{1:x}> logged=<{2:x}> now=<{3:x}>\n", 
+                                                   __arglist(fromEntry,
+                                                             h.addr,
+                                                             oldSnapshot.value,
+                                                             curSnapshot.value));
+                        
+                        keep = true;
+                        if (TryAllManager.REMOVE_READ_DUPLICATES_AT_GC && keep) {
+                            if (fromEntries[fromEntry].h.IsMarked()) {
+                                TryAllManager.DebugPrintGC("   is duplicate\n");
+                                keep = false;
+                                m.tryAllCounters.IncrementReadDuplicatesRemoved();
+                            } 
+                        }
+                        
+                        
+                        if (keep) {
+                            if (oldSnapshot.Eq(curSnapshot)) {
+                                if (curWord.IsQuiescent()) {
+                                    // Unchanged, not enlisted by anyone
+                                } else if (curWord.GetOwner() == m) {
+                                    // Previously enlisted by us
+                                    m.tryAllCounters.IncrementUpdatesInReadEnlistmentsAtGC();
+                                    keep = false;
+                                        VTable.Assert(m.uEnlistmentLog.NotEmpty());
+                                } else {
+                                    // Previously enlisted by someone else 
+                                    m.tryAllCounters.IncrementInvalidConflict();
+                                    m.becomeInvalid(true);
+                                        keep = false;
+                                }
+                            } else {
+                                if (curWord.IsQuiescent()) {
+                                    if (curWord.Eq(oldSnapshot.GetSTMWord())) {
+                                        // Inflated, but no conflicting STM operation
+                                        m.tryAllCounters.IncrementInflationSeen();
+                                    } else {
+                                        // Updated by someone else after we enlisted it
+                                        m.tryAllCounters.IncrementInvalidConflict();
+                                        m.becomeInvalid(true);
+                                        keep = false;
+                                    }
+                                } else if (curWord.GetOwner() == m) {
+                                    // Subsequently enlisted by us...
+                                    VTable.Assert(m.uEnlistmentLog.NotEmpty());
+                                    if (curWord.GetOwnersVersion().Eq(oldSnapshot)) {
+                                        // ...without intervening update
+                                        m.tryAllCounters.IncrementUpdatesInReadEnlistmentsAtGC();
+                                        keep = false;
+                                    } else {
+                                        // ...but updated by someone else before then
+                                        m.tryAllCounters.IncrementInvalidConflict();
+                                        m.becomeInvalid(true);
+                                        keep = false;
+                                    }
+                                } else {
+                                    // Subsequently enlisted by someone else
+                                    m.tryAllCounters.IncrementInvalidConflict();
+                                    m.becomeInvalid(true);
+                                    keep = false;
+                                }
+                            }
+                        }
+                        
+                        if (TryAllManager.REMOVE_READ_DUPLICATES_AT_GC && keep) {
+                            TryAllManager.DebugPrintGC("   setting mark\n");
+                            fromEntries[fromEntry].h.SetMark(true);
+                        }
+
+                        if (keep) {
+                            // Move on to the next to-chunk if we've filled one
+                            if (toEntry == 0) {
+                                toChunk = toChunk.next;
+                                toEntries = toChunk.entries;
+                                toEntry = toEntries.Length;
+                                
+                                toChunk.nextEntry = toEntries.Length;
+                                toNumBlocks ++;
+                            }
+                            
+                            // Claim a slot in toEntries
+                            toEntry --;
+                            
+                            // Copy the entry to the to-chunk, visit the
+                            // pointer-derived values in it
+                            toEntries[toEntry] = fromEntries[fromEntry];
+                            
+                            TryAllManager.DebugPrintGC("   --> {0:x}/{1} {2:x}\n",
+                                                __arglist(Magic.addressOf(toEntries),
+                                                          toEntry,
+                                                          toEntries[toEntry].h.addr));
+                        } 
+                    }
+                    
+                    if (inEndChunk) {
+                        break;
+                    }
+                    
+                    // Move on to the next from-chunk
+                    fromChunk = fromChunk.next;
+                    fromEntries = fromChunk.entries;
+                    fromEntry = fromChunk.nextEntry;
+                    fromNumBlocks ++;
+                }
+                
+                // Update finishing point
+                TryAllManager.DebugPrintGC("Log now starts at {0:x}:{1}\n",
+                                           __arglist(Magic.addressOf(toChunk),
+                                                     toEntry));
+                m.savedTryAlls[depth].rEnlistmentLogAtStart.node = toChunk;
+                m.savedTryAlls[depth].rEnlistmentLogAtStart.entry = toEntry;
+
+                // Clear marks on retained objects (if removing duplicates)
+                if (TryAllManager.REMOVE_READ_DUPLICATES_AT_GC) {
+                    LogChunk tempChunk = startToChunk;
+                    Entry[] tempEntries = startToChunk.entries;
+                    int tempEntry = startToEntry;
+
+                    while (true) {
+                        bool inEndChunk = (tempChunk == toChunk);
+                        int downTo = inEndChunk ? toEntry : 0;
+                        
+                        for (tempEntry --; tempEntry >= downTo; tempEntry --) {
+                            STMHandle h = tempEntries[tempEntry].h;
+                            TryAllManager.DebugPrintGC("clearing mark on {0:x}/{1} {2} in read enlistments\n",
+                                                __arglist(Magic.addressOf(tempChunk),
+                                                          tempEntry,
+                                                          h.addr));
+
+                            VTable.Assert(tempEntries[tempEntry].h.IsMarked());
+                            tempEntries[tempEntry].h.SetMark(false);
+                        }
+
+                        if (inEndChunk) {
+                            break;
+                        }
+                        
+                        // Move on to the next temp-chunk
+                        tempChunk = tempChunk.next;
+                        tempEntries = tempChunk.entries;
+                        tempEntry = tempChunk.nextEntry;
+                    }
+                }
+            }
+            
+            VTable.Assert(fromChunk.next == null);
+            toChunk.next = null;
+
+            if (TryAllManager.ENABLE_PROFILING) {
+                if (VTable.enableGCTiming) {
+                    VTable.DebugPrint("[Read enlistment log: {0}->{1} * {2}]\n",
+                                      __arglist(fromNumBlocks,
+                                                toNumBlocks,
+                                                TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE));
+                }
+            }
+
+#if DEBUG
+            for (int i = 0; i < toEntry; i ++) {
+                toEntries[i].h.addr = (UIntPtr)TryAllManager.DEAD_PTR;
+                toEntries[i].v.value = UIntPtr.Zero;
+            }
+#endif
+        }
+
+        internal LogChunk currentChunk;
+    }
+
+    //----------------------------------------------------------------------
+    //
+    // Update enlistment log
+
+    unsafe struct UpdateEnlistmentLogWriter {
+        internal UpdateEnlistmentLog.Entry *next;
+        internal UpdateEnlistmentLog.Entry *limit;
+
+        internal unsafe UpdateEnlistmentLogWriter(UpdateEnlistmentLog.Entry *next,
+                                                  UpdateEnlistmentLog.Entry *limit) {
+            this.next = next;
+            this.limit = limit;
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemory(TryAllManager m, uint bytesNeeded) {
+            VTable.Assert(bytesNeeded <= TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE * sizeof(UpdateEnlistmentLog.Entry));
+            TryAllManager.DebugPrint("UpdateEnlistment: EnsureLogMemory : bytesNeeded={0} {1:x} {2:x}\n",
+                                     __arglist(bytesNeeded,
+                                               (UIntPtr)m._uEnlistmentLogWriter.next,
+                                               (UIntPtr)m._uEnlistmentLogWriter.limit));
+
+            if((UIntPtr) m._uEnlistmentLogWriter.next + bytesNeeded
+                > (UIntPtr)m._uEnlistmentLogWriter.limit) {
+                 GetNewLogChunk(m);
+             }             
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemory(TryAllManager m) {
+            TryAllManager.DebugPrint("UpdateEnlistment: EnsureLogMemory {0:x} {1:x}\n",
+                                     __arglist((UIntPtr)m._uEnlistmentLogWriter.next,
+                                               (UIntPtr)m._uEnlistmentLogWriter.limit));
+
+            if((UIntPtr) m._uEnlistmentLogWriter.next >
+               (UIntPtr)m._uEnlistmentLogWriter.limit) {
+                 GetNewLogChunk(m);
+             }             
+        }
+
+        [NoInline]
+        internal static unsafe void GetNewLogChunk(TryAllManager m) {
+            // TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            UpdateEnlistmentLog.SyncFromWriter(m);
+            m._uEnlistmentLogWriter = UpdateEnlistmentLog.GetInvalidWriter();
+            m.uEnlistmentLog.AddCapacity(m);
+            UpdateEnlistmentLog.InitWriter(m);
+            
+            TryAllManager.DebugPrint("UpdateEnlistmentLogWriter, entries[0]={0}\n",
+                                     __arglist((UIntPtr)(m._uEnlistmentLogWriter.next)));
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal static unsafe void Write(TryAllManager m, STMHandle h, bool ensureAfter) {
+            
+            if (TryAllManager.DISABLE_BEFORE_FILTERING ||
+                TryAllManager.DISABLE_AFTER_FILTERING) {
+                return;
+            }
+
+            TryAllManager.DebugPrint("UpdateEnlistment: Write h={0:x} {1:x} {2:x}\n",
+                                     __arglist(h.addr,
+                                               (UIntPtr)m._uEnlistmentLogWriter.next,
+                                               (UIntPtr)m._uEnlistmentLogWriter.limit));
+
+            VTable.Deny(m._uEnlistmentLogWriter.next > m._uEnlistmentLogWriter.limit);
+
+            STMSnapshot curSnap = h.GetSTMSnapshot();
+            STMWord curWord = curSnap.GetSTMWord();
+            TryAllManager.DebugPrint("EnlistForUpdate h=<{0:x}> v=<{1:x}> entry=<{2:x}>\n",
+                                     __arglist(h.addr,
+                                               curWord.value,
+                                               (UIntPtr)(m._uEnlistmentLogWriter.next)));
+
+            if (curWord.IsQuiescent()) {
+                // Nobody seems to have enlisted it yet.  NB: we must write
+                // the log entry first and only then attempt to claim ownership.
+                // This is because claiming ownership may trigger a GC if it
+                // causes a multi-use-word to be inflated.  The GC will need
+                // to scan the new log entry so that it can update the
+                // reference-derived values in it.
+
+                if (!TryAllManager.DISABLE_BEFORE_WRITING_LOG) {
+                    UpdateEnlistmentLog.Entry *ne = m._uEnlistmentLogWriter.next;
+                    ne -> h = h;
+                    ne -> v = curWord;
+                    STMWord newWord = new STMWord((UIntPtr)ne, true);
+                    ne ++;
+                    m._uEnlistmentLogWriter.next = (UpdateEnlistmentLog.Entry *)ne;
+                    
+                    bool success = h.CompareExchangeSTMWord(newWord.value,
+                                                            curWord.value, 
+                                                            curSnap);
+                    
+                    if (!success) {
+                        ne --;
+                        m._uEnlistmentLogWriter.next = (UpdateEnlistmentLog.Entry *)ne;
+                        
+                        TryAllManager.DebugPrint("Race during enlistment\n");
+                        
+                        m.tryAllCounters.IncrementInvalidRace();
+                        m.becomeInvalid(false); // Not during GC
+                    } else {
+                        
+                        TryAllManager.CountAsLogged();
+                        m.tryAllCounters.IncrementEnlistForUpdateLogged();
+                        if (ensureAfter) {
+                            EnsureLogMemory(m);
+                        }
+                    }
+                }
+            } else if (curWord.GetOwner() == m) {
+                // We have already enlisted it for update
+
+                TryAllManager.DebugPrint("Already enlisted for update by us\n");
+            } else {
+                // Someone else has enlisted it for update
+                TryAllManager.DebugPrint("Already enlisted for another tm\n");
+                m.tryAllCounters.IncrementInvalidConflict();
+                m.becomeInvalid(false); // Not during GC
+            } 
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal static unsafe void WriteNew(TryAllManager m, STMHandle h, bool ensureAfter) {
+
+            if (TryAllManager.DISABLE_BEFORE_FILTERING ||
+                TryAllManager.DISABLE_AFTER_FILTERING) {
+                return;
+            }
+
+            TryAllManager.DebugPrint("UpdateEnlistment: Write {0:x} {1:x}\n",
+                                     __arglist((UIntPtr)m._uEnlistmentLogWriter.next,
+                                               (UIntPtr)m._uEnlistmentLogWriter.limit));
+
+            VTable.Deny(m._uEnlistmentLogWriter.next > m._uEnlistmentLogWriter.limit);
+            TryAllManager.DebugPrint("EnlistNewObjForUpdate h=<{0:x}> snapshot=<{1:x}>\n",
+                                     __arglist(h.addr,
+                                               h.GetSTMSnapshot().value));
+            VTable.Assert(h.GetSTMSnapshot().value == UIntPtr.Zero);
+
+            TryAllManager.DebugPrint("EnlistNewObjForUpdate h=<{0:x}> entry=<{1:x}> word {2:x}\n",
+                                     __arglist(h.addr,
+                                               (UIntPtr)(m._uEnlistmentLogWriter.next),
+                                               m.locallyAllocatedSTMWord.value));
+            
+            if (!TryAllManager.DISABLE_BEFORE_WRITING_LOG) {
+                UpdateEnlistmentLog.Entry *ne = m._uEnlistmentLogWriter.next;
+                ne -> h = h;
+                ne -> v.value = UIntPtr.Zero;
+                TryAllManager.DebugPrint("EnlistNewObjForUpdate m=<{0:x}> {1:x} offset={2:x} {3:x}\n",
+                                         __arglist((UIntPtr)(ne -> m),
+                                                   Magic.addressOf(m),
+                                                   (UIntPtr)(ne -> offset),
+                                                   ((UIntPtr)ne) - Magic.addressOf(m.uEnlistmentLog.currentChunk.entries)));
+                VTable.Assert(ne -> m == Magic.addressOf(m));
+                VTable.Assert(ne -> offset == ((UIntPtr)ne) - Magic.addressOf(m.uEnlistmentLog.currentChunk.entries));
+                
+                ne ++;
+                m._uEnlistmentLogWriter.next = (UpdateEnlistmentLog.Entry *)ne;
+
+                h.SetSTMWordAtAllocation(m.locallyAllocatedSTMWord);
+
+                TryAllManager.CountAsLogged();
+                m.tryAllCounters.IncrementEnlistForUpdateLogged();
+
+                if (ensureAfter) {
+                    EnsureLogMemory(m);
+                }
+            }
+        }
+    }
+
+    [NoLoggingForUndo]
+    class UpdateEnlistmentLog {
+
+        internal UpdateEnlistmentLog(TryAllManager m) {
+            AddCapacity(m);
+        }
+      
+        [Inline]
+        internal static unsafe Entry *AddrOfEntry(Entry[] entries, int idx) {
+            UIntPtr addrAsUIntPtr;
+            Entry *result;
+
+            fixed (Entry *baseAddr = &entries[0]) {
+                Entry *entryAddr = baseAddr + idx;
+                addrAsUIntPtr = (UIntPtr) entryAddr;
+            }
+
+            result = (Entry *) addrAsUIntPtr;
+
+            return result;
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe uint AddrToIndex(Entry *entryPtr) {
+            uint result;
+            UIntPtr baseAddr;
+            fixed (Entry *basePtr = &this.currentChunk.entries[0]) {
+                baseAddr = (UIntPtr)basePtr;
+            }
+            UIntPtr entryAddr = (UIntPtr)entryPtr;
+            result = (uint)((int)(entryAddr - baseAddr)) / ((uint)sizeof (Entry));
+            return (uint)result;
+        }
+
+        internal bool NotEmpty() {
+            return ((this.currentChunk.nextEntry != 0) || (this.currentChunk.next != null));
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe Entry *AddrOfEntry(int idx) {
+            Entry[] entries = this.currentChunk.entries;
+            Entry *result = AddrOfEntry(entries, idx);
+            return result;
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void SyncFromWriter(TryAllManager m) {
+            UpdateEnlistmentLog u = m.uEnlistmentLog;
+
+            if (m._uEnlistmentLogWriter.next != null) {
+                u.currentChunk.nextEntry = (int)u.AddrToIndex(m._uEnlistmentLogWriter.next);
+            }
+
+            VTable.Assert(u.currentChunk.nextEntry >= 0);
+            VTable.Assert(u.currentChunk.nextEntry <= TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE);
+
+            TryAllManager.DebugPrint("UpdateEnlistmentLogWriter : sync when nextEntry={0}\n",
+                                     __arglist(u.currentChunk.nextEntry));
+        }
+
+        internal static unsafe UpdateEnlistmentLogWriter GetInvalidWriter() {
+            return new UpdateEnlistmentLogWriter(null, null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe bool WriterIsValid(UpdateEnlistmentLogWriter w) {
+            return (w.next != null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void InitWriter(TryAllManager m) {
+            UpdateEnlistmentLog u = m.uEnlistmentLog;
+            Entry *next = u.AddrOfEntry(u.currentChunk.nextEntry);
+            Entry *limit = u.AddrOfEntry(TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE - 1);
+            
+            TryAllManager.DebugPrint("UpdateEnlistmentLogWriter : nextEntry={0} next={1} limit={2}\n",
+                                     __arglist(u.currentChunk.nextEntry,
+                                               (uint)(UIntPtr)next,
+                                               (uint)(UIntPtr)limit));
+
+            m._uEnlistmentLogWriter.next = next;
+            m._uEnlistmentLogWriter.limit = limit;
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        private unsafe void DismissChunkBetween(TryAllManager m, 
+                                                LogChunk chunk, 
+                                                int lowIdx,
+                                                int highIdx) 
+        {
+            TryAllManager.DebugPrint("Dismissing chunk {0:x} {1}..{2} (Length={3})\n",
+                                     __arglist(Magic.addressOf(chunk),
+                                               lowIdx,
+                                               highIdx,
+                                               chunk.nextEntry));
+
+            VTable.Assert(lowIdx >= 0);
+            VTable.Assert(lowIdx <= highIdx);
+            VTable.Assert(highIdx <= chunk.nextEntry);
+
+            Entry[] entries = chunk.entries;
+            for (int entry = lowIdx; entry < highIdx; entry++) {
+                STMHandle h = entries[entry].h;
+                
+                TryAllManager.DebugPrint("index {0} h=<{1:x}> m={2:x} {3:x}\n", 
+                                         __arglist(entry,
+                                                   h.addr,
+                                                   entries[entry].m,
+                                                   Magic.addressOf(m)));
+                TryAllManager.DebugPrint("Version at enlistment {0:x}\n",
+                                         __arglist(entries[entry].v.value));
+                VTable.Assert(entries[entry].m == Magic.addressOf(m));
+                h.RefreshSTMWord(entries[entry].v.GetNextVersion());
+            }
+            TryAllManager.DebugPrint("Dismissed chunk {0:x} entries {1:x} {2}..{3}\n",
+                                     __arglist(Magic.addressOf(chunk),
+                                               Magic.addressOf(entries),
+                                               lowIdx,
+                                               highIdx));;
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal void DismissFrom(TryAllManager m, Location endLocation) {
+
+            TryAllManager.DebugPrint("Dismissing update enlistments from {0} to {1}\n",
+                                     __arglist(Location.ToDebugIdx(endLocation),
+                                               Location.ToDebugIdx(CurrentLocation)));
+
+
+            LogChunk startNode = this.currentChunk;
+            LogChunk endNode = endLocation.node;
+            int startEntry = startNode.nextEntry;
+            int endEntry = endLocation.entry;
+
+            if (startNode != endNode || startEntry != endEntry) {
+
+                while (startNode != endNode) {
+                    DismissChunkBetween(m, startNode, 0, startEntry);
+                    startNode = startNode.next;
+                    startEntry = startNode.nextEntry; //TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE;
+                }
+                
+                DismissChunkBetween(m, startNode, endEntry, startEntry);
+
+#if ENABLE_BITMAP
+                if (TryAllManager.BITMAP) {
+                    for (int entry = endLocation.entry; entry < endNode.nextEntry; entry ++) {
+                        endNode.entries[entry].bitmap0 = UIntPtr.Zero;
+                        endNode.entries[entry].bitmap1 = UIntPtr.Zero;
+                        endNode.entries[entry].bitmap2 = UIntPtr.Zero;
+                        endNode.entries[entry].bitmap3 = UIntPtr.Zero;
+                    }
+                }
+#endif
+                
+                this.currentChunk = endNode;
+                this.currentChunk.nextEntry = endLocation.entry;
+            }
+
+            TryAllManager.DebugPrint("Current chunk={0:x} entries={1:x} nextEntry={2}\n",
+                                     __arglist(Magic.addressOf(this.currentChunk),
+                                               Magic.addressOf(this.currentChunk.entries),
+                                               this.currentChunk.nextEntry));
+        }
+
+
+        // For each enlistment was log the version information we saw when we enlisted
+        // the object.  For an update enlistment we need:
+        //
+        //  - A handle for the object in question
+        //
+        //  - The STMWord that was current when we enlisted it: this is needed
+        //    (a) to compute the next version number when we stand down
+        //    our enlistment and (b) to deal with the case where we
+        //    enlist an object for read and then upgrade it to an update
+        //    enlistment -- we check the value in the read log against the 
+        //    value here.
+        //
+        //  - A pointer to our TryAllManager (used when we find a pointer to an
+        //    Entry structure to tell if it's one of ours or someone else's).
+        //
+        //  - A pointer to the array of Entry structures that this is within.
+        //    This is used during GC to avoid frequent use of interior pointers.
+        // 
+        // NB: we will eventually need 16-byte alignment anyway because of the 
+        // 2 bits needed for the MUW tag, 1 bit needed for IS_OWNED_MASK and
+        // 1 bit used to distinguish objects allocated within the current transaction.
+        // We could remove the last two fields if the time writing them is prohibitive
+        // (but note that they could be written when allocating a new chunk rather
+        // than on every update enlistment).
+        //
+        // We use sequential layout because STMWord.Visit uses a hack to get
+        // to the offset field.  This is necessary (at 16 Aug 05) to avoid asm
+        // code like this being generated for the field access:
+        //
+        //     mov ebx,?Field offset : uintPtr
+
+#if ENABLE_BITMAP
+        [StructAlignAttribute(32), StructLayout(LayoutKind.Sequential)]
+#else
+        [StructAlignAttribute(16)]
+#endif
+        internal struct Entry {
+            internal STMHandle h;
+            internal STMWord v;
+            internal UIntPtr m;
+            internal UIntPtr offset;
+#if ENABLE_BITMAP
+            internal UIntPtr bitmap0;
+            internal UIntPtr bitmap1;
+            internal UIntPtr bitmap2;
+            internal UIntPtr bitmap3;
+#endif
+        }
+
+        internal class LogChunk {
+            internal LogChunk(Entry[] entries,LogChunk next) {
+                this.nextEntry = 0;
+                this.entries = entries;
+                this.next = next;
+            }
+        
+            internal Entry[] entries;
+            internal LogChunk next;
+            internal int nextEntry;
+        }
+    
+
+        internal unsafe void Dump() {
+            VTable.DebugPrint("Enlistment log:\n");
+            LogChunk chunk = this.currentChunk;
+            int lowIdx = 0;
+            int highIdx = chunk.nextEntry;
+
+            while (chunk != null) {
+                Entry[] entries = chunk.entries;
+                VTable.DebugPrint("chunk={0} entries={1}\n",
+                                  __arglist((uint)(Magic.addressOf(chunk)),
+                                            (uint)(Magic.addressOf(entries))));
+
+                for (int i = lowIdx; i < highIdx; i++) {
+                    VTable.DebugPrint("entry[{0}] : <{1}> logged: <{2}> now: <{3}>\n",
+                                      __arglist(i,
+                                                (uint)(entries[i].h.addr),
+                                                (uint)(entries[i].v.value),
+                                                (uint)(entries[i].h.GetSTMSnapshot().GetSTMWord().value)));
+
+                }
+
+                chunk = chunk.next;
+                highIdx = chunk.nextEntry;
+            }
+        }
+
+        [NoInline]
+        internal unsafe void AddCapacity(TryAllManager m) {
+            m.tryAllCounters.IncrementEnlistmentOverflow();
+
+            // NB: ensure links from the new chunk to the current one are in place
+            // before linking it in -- the write barriers may cause GC and we 
+            // need to find the log chunks.  
+
+            Entry[] newEntries = 
+                new Entry[TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE];
+
+            LogChunk newNode = 
+                new LogChunk(newEntries, this.currentChunk);
+
+            this.currentChunk = newNode;
+
+            for (int i = 0; i < TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE; i ++) {
+                newEntries[i].m = Magic.addressOf(m);
+                newEntries[i].offset = ((UIntPtr)AddrOfEntry(i)) - Magic.addressOf(newEntries);
+            }
+        }
+    
+        [InlineCopyAttribute]
+        internal struct Location {
+            internal Location(LogChunk node, int entry) {
+                this.node = node;
+                this.entry = entry;
+            }
+        
+            internal static bool Eq(Location l1, Location l2) {
+                return (l1.entry == l2.entry) && (l1.node == l2.node);
+            }
+
+            internal static int ToDebugIdx(Location l1) {
+                LogChunk n1 = l1.node;
+                int result = 0;
+
+                while (n1.next != null) {
+                    result += TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE;
+                    n1 = n1.next;
+                }
+                result += l1.entry;
+                return result;
+            }
+
+            internal LogChunk node;
+            internal int entry;
+        }
+
+        internal Location CurrentLocation {
+            get {
+                return new Location(this.currentChunk, this.currentChunk.nextEntry);
+            }
+        }
+
+        internal int Size {
+            get {
+                int size = 0;
+                for(LogChunk node = this.currentChunk;
+                    node != null;
+                    node = node.next) {
+                    size += node.nextEntry;
+                }
+                return size;
+            }
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe void VisitWeakRefs(TryAllManager m, NonNullReferenceVisitor v) {
+            LogChunk fromChunk = this.currentChunk;
+            Entry[] fromEntries = fromChunk.entries;
+            int fromEntry = fromChunk.nextEntry;
+            int fromNumBlocks = 1;
+
+            LogChunk toChunk = fromChunk;
+            Entry[] toEntries = fromEntries;
+            int toEntry = fromEntry;
+            int toNumBlocks = 1;
+
+            if (m.nextSavedTryAll == 0) {
+                for (int i = 0; i < TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE; i ++) {
+                    toEntries[i].m = Magic.addressOf(m);
+                }
+            } else {
+                for (int depth = m.nextSavedTryAll - 1; depth >= 0; depth --) {
+                    LogChunk endFromChunk = m.savedTryAlls[0].uEnlistmentLogAtStart.node;
+                    int endFromEntry = m.savedTryAlls[0].uEnlistmentLogAtStart.entry;
+                    
+                    TryAllManager.DebugPrintGC("Visiting update enlistments for {0:x} depth {1} {2:x} ({3:x}:{4})\n", 
+                                               __arglist((UIntPtr)Magic.addressOf(m),
+                                                         depth,
+                                                         Magic.addressOf(fromChunk),
+                                                         Magic.addressOf(endFromChunk),
+                                                         endFromEntry));
+                    
+                    while (true) {
+                        bool inEndChunk = (fromChunk == endFromChunk);
+                        int downTo = inEndChunk ? endFromEntry : 0;
+                        
+                        for (fromEntry --; fromEntry >= downTo; fromEntry --) {
+                            STMHandle h = fromEntries[fromEntry].h;
+                            
+                            TryAllManager.DebugPrintGC("saw index {0:x}/{1} {2:x} in update enlistments\n",
+                                                       __arglist(Magic.addressOf(fromEntries),
+                                                                 fromEntry,
+                                                                 h.addr));
+                            
+                            if (h.addr != UIntPtr.Zero) {
+                                if (fromEntries[fromEntry].h.Visit(v)) {
+                                    // Move on to the next to-chunk if we've filled one
+                                    if (toEntry == 0) {
+                                        toChunk = toChunk.next;
+                                        toEntries = toChunk.entries;
+                                        toEntry = toEntries.Length;
+                                        
+                                        toChunk.nextEntry = toEntries.Length;
+                                        toNumBlocks ++;
+                                    }
+                                    
+                                    // Claim a slot in toEntries
+                                    toEntry --;
+                                    
+                                    // Copy the entry to the to-chunk, visit the
+                                    // pointer-derived values in it
+                                    toEntries[toEntry].h = fromEntries[fromEntry].h;
+                                    toEntries[toEntry].v = fromEntries[fromEntry].v;
+                                    toEntries[toEntry].v.Visit(v);
+                                    
+#if ENABLE_BITMAP
+                                    if (TryAllManager.BITMAP) {
+                                        toEntries[toEntry].bitmap0 = fromEntries[fromEntry].bitmap0;
+                                        toEntries[toEntry].bitmap1 = fromEntries[fromEntry].bitmap1;
+                                        toEntries[toEntry].bitmap2 = fromEntries[fromEntry].bitmap2;
+                                    } 
+                                    
+                                    if (TryAllManager.EXTERNAL_BITMAP) {
+                                        toEntries[toEntry].bitmap3 = UIntPtr.Zero;
+                                    }
+#endif
+                                    
+                                    fixed (UpdateEnlistmentLog.Entry *toAddr = 
+                                           &toEntries[toEntry]) {
+                                        STMWord newWord = new STMWord((UIntPtr)toAddr, true);
+                                        TryAllManager.DebugPrintGC("      word now {0:x}\n",
+                                                                   __arglist(newWord.value));
+                                        toEntries[toEntry].h.SetSTMWordAtGC(v, newWord);
+                                    }
+                                    
+                                    TryAllManager.DebugPrintGC("   --> {0:x}/{1} {2:x}\n",
+                                                               __arglist(Magic.addressOf(toEntries),
+                                                                         toEntry,
+                                                                         toEntries[toEntry].h.addr));
+                                } else {
+                                    TryAllManager.DebugPrintGC("   cleared weak ref\n");
+                                    m.tryAllCounters.IncrementWeakRefsClearedInUpdateEnlistmentLog();
+                                }
+                            }
+                        }
+                        
+                        for (int i = 0; i < TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE; i ++) {
+                            toEntries[i].m = Magic.addressOf(m);
+                        }
+                        
+                        if (inEndChunk) {
+                            break;
+                        }
+                        
+                        TryAllManager.DebugPrintGC("Going on from {0:x} {1:x} {2:x}\n",
+                                               __arglist(Magic.addressOf(fromChunk),
+                                                         Magic.addressOf(fromEntries),
+                                                         Magic.addressOf(fromChunk.next)));
+                        
+                        // Move on to the next from-chunk
+                        fromChunk = fromChunk.next;
+                        fromEntries = fromChunk.entries;
+                        fromEntry = fromChunk.nextEntry;
+                        fromNumBlocks ++;
+                    } 
+                    
+                    // Update finishing point
+                    TryAllManager.DebugPrintGC("Log now starts at {0:x}:{1}\n",
+                                               __arglist(Magic.addressOf(toChunk),
+                                                         toEntry));
+                    m.savedTryAlls[depth].uEnlistmentLogAtStart.node = toChunk;
+                    m.savedTryAlls[depth].uEnlistmentLogAtStart.entry = toEntry;
+                }
+                
+                VTable.Assert(fromChunk.next == null);
+                toChunk.next = null;
+                
+                if (TryAllManager.ENABLE_PROFILING) {
+                    if (VTable.enableGCTiming) {
+                        VTable.DebugPrint("[Update enlistment log: {0}->{1} * {2}]\n",
+                                          __arglist(fromNumBlocks,
+                                                    toNumBlocks,
+                                                    TryAllManager.ENLISTMENT_LOG_CHUNK_SIZE));
+                    }
+                }
+                
+#if DEBUG
+                for (int i = 0; i < toEntry; i ++) {
+                    toEntries[i].h.addr = (UIntPtr)TryAllManager.DEAD_PTR;
+                    toEntries[i].v.value = UIntPtr.Zero;
+                }
+#endif
+            }
+        }
+
+        internal LogChunk currentChunk;
+    }
+
+    //----------------------------------------------------------------------
+    //
+    // Update log
+
+    unsafe struct UpdateLogWriter {
+        internal UpdateLog.Entry *next;
+        internal UpdateLog.Entry *limit;
+
+        internal unsafe UpdateLogWriter(UpdateLog.Entry *next,
+                                        UpdateLog.Entry *limit) {
+            this.next = next;
+            this.limit = limit;
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemory(TryAllManager m, uint bytesNeeded) {
+            VTable.Assert(bytesNeeded <= TryAllManager.UPDATE_LOG_CHUNK_SIZE * sizeof(UpdateLog.Entry));
+            TryAllManager.DebugPrint("Update: EnsureLogMemory : bytesNeeded={0}\n",
+                                     __arglist(bytesNeeded));
+
+            if((UIntPtr)m._updateLogWriter.next + bytesNeeded
+                > (UIntPtr) m._updateLogWriter.limit) {
+                 GetNewLogChunk(m);
+             }             
+
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static void EnsureLogMemory(TryAllManager m) {
+            TryAllManager.DebugPrint("Update: EnsureLogMemory\n");
+
+            if((UIntPtr)m._updateLogWriter.next 
+                > (UIntPtr) m._updateLogWriter.limit) {
+                 GetNewLogChunk(m);
+             }             
+
+        }
+
+        [NoInline]
+        internal static unsafe void GetNewLogChunk(TryAllManager m) {
+            // TryAllManager m = TryAllManager.CurrentRunningTryAll;
+            UpdateLog.SyncFromWriter(m);
+            m._updateLogWriter = UpdateLog.GetInvalidWriter();
+            m.updateLog.AddCapacity(m);
+            UpdateLog.InitWriter(m);
+            
+            TryAllManager.DebugPrint("UpdateLogWriter, entries[0]={0}\n",
+                                     __arglist((uint)(UIntPtr *)(m._updateLogWriter.next)));
+        }
+
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal static void Write(TryAllManager m, 
+                                   UpdateLog.EntryKind kind,
+                                   Object obj,
+                                   UIntPtr offset,
+                                   bool mayHaveObj,
+                                   bool mustHaveObj,
+                                   bool ensureAfter) {
+
+            VTable.Deny(m._updateLogWriter.next > m._updateLogWriter.limit);
+
+            if (mustHaveObj) {
+
+                // NB: filtering depends on the updated-object log entries being
+                // written
+                if ((TryAllManager.DISABLE_BEFORE_WRITING_LOG == false) && (
+                    TryAllManager.TRACK_TRANSACTION_LOCALS || 
+                    TryAllManager.BITMAP)) {
+
+                    STMHandle h = new STMHandle(obj);
+                    STMSnapshot s = h.GetSTMSnapshot();
+
+                    if (TryAllManager.TRACK_TRANSACTION_LOCALS) {
+                        if (s.value == m.locallyAllocatedSTMWord.value) {
+                            TryAllManager.DebugPrint("Not logging store to locally allocated obj {0:x}\n",
+                                                     __arglist(Magic.addressOf(obj)));
+                            m.tryAllCounters.IncrementLocalUpdate(kind);
+                            return;
+                        }
+                    }
+
+#if ENABLE_BITMAP
+                    if (TryAllManager.BITMAP) {
+                        uint wordOffset = (uint)offset >> 2;
+                        STMWord w = s.GetSTMWord();
+                        
+                        // XXX tharris -- See known problem: this test could be removed
+                        // at the cost of splitting the Log* operations into try_all
+                        // and atomic variants.
+                        if (w.IsOwned()) {
+                            if (wordOffset < 96 || TryAllManager.DISABLE_BEFORE_WRITING_LOG) {
+                                UpdateEnlistmentLog.Entry *e = (UpdateEnlistmentLog.Entry*)(w.GetPayloadWhenOwned());
+                                UIntPtr *bm = &e->bitmap0;
+                                {
+                                    int bitmapWord = (int)wordOffset >> 5;
+                                    uint bitmapBit = wordOffset/* & 31*/;
+                                    uint bit = (uint)1 << (int)bitmapBit;
+                                    UIntPtr *bmw = bm + bitmapWord;
+                                    uint saw = (uint)*bmw;
+                                    if ((saw & bit) != 0) {
+                                        TryAllManager.DebugPrint("Bitmap hit {0} {1} {2} {3}\n",
+                                                                 __arglist(Magic.addressOf(obj),
+                                                                           offset,
+                                                                           (int)kind,
+                                                                           (UIntPtr)bm));
+                                        m.tryAllCounters.IncrementUpdateHitInBitmap(kind);
+                                    } else {
+                                        TryAllManager.DebugPrint("Bitmap miss {0} {1} {2} {3}\n",
+                                                                 __arglist(Magic.addressOf(obj),
+                                                                           offset,
+                                                                           (int)kind,
+                                                                           (UIntPtr)bm));
+                                        saw |= bit;
+                                        *bmw = (UIntPtr)saw;
+                                        ReallyWrite(m, kind, Magic.addressOf(obj), offset, ensureAfter);
+                                    }
+                                    return;
+                                }       
+                            } else {
+                                if (TryAllManager.EXTERNAL_BITMAP) {
+                                    UpdateEnlistmentLog.Entry *e = (UpdateEnlistmentLog.Entry*)(w.GetPayloadWhenOwned());
+                                    UIntPtr *bm = (UIntPtr*)e->bitmap3;
+                                    if (bm == null) {
+                                        uint objByteSize = (uint)GCs.ObjectLayout.Sizeof(obj);
+                                        uint bitmapLen = objByteSize / 32;
+                                        uint[] bitmap = new uint[bitmapLen - 3];
+                                        // GC may occur here, recover entry information
+                                        h = new STMHandle(obj);
+                                        s = h.GetSTMSnapshot();
+                                        w = s.GetSTMWord();
+                                        e = (UpdateEnlistmentLog.Entry*)(w.GetPayloadWhenOwned());
+                                        bm = (UIntPtr*)Magic.addressOf(bitmap);
+                                        e->bitmap3 = Magic.addressOf(bitmap);
+                                        m.tryAllCounters.IncrementExternalBitmaps();
+                                    }
+                                    
+                                    int bitmapWord = (int)wordOffset >> 5;
+                                    uint bitmapBit = wordOffset/* & 31*/;
+                                    uint bit = (uint)1 << (int)bitmapBit;
+                                    UIntPtr *bmw = bm + bitmapWord;
+                                    uint saw = (uint)*bmw;
+                                    if ((saw & bit) != 0) {
+                                        TryAllManager.DebugPrint("External bitmap hit {0} {1} {2}\n",
+                                                                 __arglist(Magic.addressOf(obj),
+                                                                           offset,
+                                                                           (int)kind));
+                                        m.tryAllCounters.IncrementUpdateHitInBitmap(kind);
+                                    } else {
+                                        TryAllManager.DebugPrint("Bitmap miss {0} {1} {2}\n",
+                                                                 __arglist(Magic.addressOf(obj),
+                                                                           offset,
+                                                                           (int)kind));
+                                        saw |= bit;
+                                        *bmw = (UIntPtr)saw;
+                                        ReallyWrite(m, kind, Magic.addressOf(obj), offset, ensureAfter);
+                                    }
+                                    return;
+                                } else {
+                                    m.tryAllCounters.IncrementBitmapOverflows();
+                                    ReallyWrite(m, kind, Magic.addressOf(obj), offset, ensureAfter);
+                                    return;
+                                }
+                            }
+                        } else {
+                            ReallyWrite(m, kind, Magic.addressOf(obj), offset, ensureAfter);
+                            return;
+                        }
+                    }
+#endif
+                }
+            }
+
+            UIntPtr objAddr;
+            if (mayHaveObj) {
+                objAddr = Magic.addressOf(obj);
+            } else {
+                objAddr = UIntPtr.Zero;
+            } 
+
+            ReallyWrite(m, 
+                        kind,
+                        objAddr,
+                        offset,
+                        ensureAfter);
+        }
+        
+#if !DEBUG
+        [Inline] [DisableBoundsChecks] [DisableNullChecks]
+#endif 
+        internal static void ReallyWrite(TryAllManager m, 
+                                         UpdateLog.EntryKind kind,
+                                         UIntPtr objAddr,
+                                         UIntPtr offset,
+                                         bool ensureAfter) {
+            if (TryAllManager.DISABLE_BEFORE_WRITING_LOG) {
+                return;
+            }
+            
+            TryAllManager.DebugPrint("Logging store to obj={0:x} offset={1} at {2:x}\n",
+                                     __arglist(objAddr,
+                                               offset,
+                                               (uint)(UIntPtr)m._updateLogWriter.next));
+            
+            m.tryAllCounters.IncrementUpdateLogged(kind);
+            TryAllManager.CountAsLogged();
+            
+            VTable.Deny(m._updateLogWriter.next > m._updateLogWriter.limit);
+            
+            UpdateLog.Entry *ne = m._updateLogWriter.next;
+            ne -> kind = kind;
+            ne -> obj = objAddr;
+            ne -> offset = offset;
+            ne -> val = *(UIntPtr*)(objAddr + offset);
+            ne++;
+            m._updateLogWriter.next = ne;
+            
+            //------------------------------------------------------------------
+            
+            if (ensureAfter) {
+                EnsureLogMemory(m);
+            }
+        }
+
+        //......................................................................
+    }
+
+    [NoLoggingForUndo]
+    class UpdateLog {
+        internal UpdateLog() {
+            Entry[] entries = new Entry[TryAllManager.UPDATE_LOG_CHUNK_SIZE];
+            this.currentChunk = new LogChunk(entries, null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void SyncFromWriter(TryAllManager m) {
+            UpdateLog l = m.updateLog;
+
+            if (m._updateLogWriter.next != null) { 
+                l.currentChunk.nextEntry = (int)l.AddrToIndex(m._updateLogWriter.next);
+            } 
+
+            VTable.Assert(l.currentChunk.nextEntry >= 0);
+            VTable.Assert(l.currentChunk.nextEntry <= TryAllManager.UPDATE_LOG_CHUNK_SIZE);
+
+            TryAllManager.DebugPrint("UpdateLogWriter : sync when nextExntry={0}\n",
+                                     __arglist(l.currentChunk.nextEntry));
+        }
+      
+        internal static unsafe UpdateLogWriter GetInvalidWriter() {
+            return new UpdateLogWriter(null, null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe bool WriterIsValid(UpdateLogWriter w) {
+            return (w.next != null);
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal static unsafe void InitWriter(TryAllManager m) {
+            UpdateLog u = m.updateLog;
+            Entry *next = u.AddrOfEntry(u.currentChunk.nextEntry);
+            Entry *limit = u.AddrOfEntry(TryAllManager.UPDATE_LOG_CHUNK_SIZE - 1);
+            
+            TryAllManager.DebugPrint("UpdateLogWriter : nextEntry={0} next={1} limit={2}\n",
+                                     __arglist(u.currentChunk.nextEntry,
+                                               (uint)(UIntPtr)next,
+                                               (uint)(UIntPtr)limit));
+
+            m._updateLogWriter.next = next;
+            m._updateLogWriter.limit = limit;
+        }
+
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe Entry *AddrOfEntry(int idx) {
+            Entry[] entries = this.currentChunk.entries;
+            UIntPtr addrAsUIntPtr;
+            Entry *result;
+
+            fixed (Entry *baseAddr = &entries[0]) {
+                Entry *entryAddr = baseAddr + idx;
+                addrAsUIntPtr = (UIntPtr) entryAddr;
+            }
+
+            result = (Entry *) addrAsUIntPtr;
+
+            return result;
+        }
+      
+        [Inline]
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe uint AddrToIndex(Entry *entryPtr) {
+            uint result;
+            UIntPtr baseAddr;
+            fixed (Entry *basePtr = &this.currentChunk.entries[0]) {
+                baseAddr = (UIntPtr)basePtr;
+            }
+            UIntPtr entryAddr = (UIntPtr)entryPtr;
+            result = (uint)((int)(entryAddr - baseAddr)) / ((uint)sizeof (Entry));
+            return (uint)result;
+        }
+
+        // The Entry struct is the struct holding individual log entries.
+        //
+        // Discipline note: when setting, always set obj first, then offset.  when
+        // clearing, always clear offset first, then obj.
+
+        internal enum EntryKind {
+            HEAP_VAL,
+            HEAP_REF,
+            NON_HEAP_VAL,
+            NON_HEAP_REF
+        }
+
+        internal struct Entry {
+            internal EntryKind kind; // Could use spare bits in obj
+            internal UIntPtr obj;    // Really of type Object
+            internal UIntPtr offset;
+            internal UIntPtr val;
+        }
+
+        internal class LogChunk {
+            internal LogChunk(Entry[] entries,LogChunk next) {
+                this.entries = entries;
+                this.next = next;
+                this.nextEntry = 0;
+            }
+
+            internal Entry[] entries;
+            internal LogChunk next;
+            internal int nextEntry = 0;
+        }
+
+        [Inline]
+        internal void ResetTo(Location l1) {
+            this.currentChunk = l1.node;
+            this.currentChunk.nextEntry = l1.entry;
+        }
+
+        [Inline]
+        internal void AddCapacity(TryAllManager m) {
+          
+            m.tryAllCounters.IncrementUpdateOverflow();
+
+            // NB: construct these objects before linking them incase the write
+            // barriers cause GC.
+            Entry[] newEntries = new Entry[TryAllManager.UPDATE_LOG_CHUNK_SIZE];
+            LogChunk newNode = new LogChunk(newEntries, this.currentChunk);
+
+            this.currentChunk = newNode;
+        }
+
+        [InlineCopyAttribute]
+        internal struct Location {
+            internal Location(LogChunk node, int entry) {
+                this.node = node;
+                this.entry = entry;
+            }
+
+            internal static int ToDebugIdx(Location l1) {
+                LogChunk n1 = l1.node;
+                int result = 0;
+
+                while (n1.next != null) {
+                    result += TryAllManager.UPDATE_LOG_CHUNK_SIZE;
+                    n1 = n1.next;
+                }
+                result += l1.entry;
+                return result;
+            }
+
+            internal bool LtEq(Location other) {
+                LogChunk n1 = this.node;
+                LogChunk n2 = other.node;
+                if(n1 == n2) {
+                    return this.entry <= other.entry;
+                }
+                while(n2 != null) {
+                    n2 = n2.next;
+                    if(n1 == n2) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            internal LogChunk node;
+            internal int entry;
+        }
+
+        internal Location CurrentLocation {
+            get {
+                return new Location(this.currentChunk, this.currentChunk.nextEntry);
+            }
+        }
+
+        internal int Size {
+            get {
+                int size = 0;
+                for(LogChunk node = this.currentChunk;
+                    node != null;
+                    node = node.next) {
+                    size += node.nextEntry;
+                }
+                return size;
+            }
+        }
+
+        internal unsafe void Dump() {
+            VTable.DebugPrint("Update log:\n");
+            LogChunk chunk = this.currentChunk;
+            int highIdx = chunk.nextEntry;
+            int lowIdx = 0;
+
+            while (chunk != null) {
+                Entry[] entries = chunk.entries;
+                VTable.DebugPrint("chunk={0} entries={1}\n",
+                                  __arglist((uint)(Magic.addressOf(chunk)),
+                                            (uint)(Magic.addressOf(entries))));
+                
+                for (int i = lowIdx; i < highIdx; i++) {
+                    UIntPtr cur;
+                    cur = *TryAllManager.getLoc(Magic.fromAddress(entries[i].obj), 
+                                                entries[i].offset);
+                    VTable.DebugPrint("entry[{0}] : {1} obj: {2} offset: {3} val: {4} now: {5}\n",
+                                      __arglist(i,
+                                                (uint)(entries[i].kind),
+                                                (uint)(entries[i].obj),
+                                                (uint)(entries[i].offset),
+                                                (uint)(entries[i].val),
+                                                (uint)cur));
+                }
+
+                chunk = chunk.next;
+                highIdx = chunk.nextEntry;
+            }
+        }
+
+        internal void RollBack(TryAllManager m, 
+                               StackHeight stackHeight, 
+                               Location endLocation) {
+
+            //
+            // Undo the entries from end block back to start block
+            //
+
+            TryAllManager.DebugPrint("Rolling back from {0} to {1}\nCurrent stack height is {2}\n",
+                                     __arglist(Location.ToDebugIdx(endLocation),
+                                               Location.ToDebugIdx(CurrentLocation),
+                                               stackHeight.ToString()));
+
+
+            VTable.Assert(endLocation.LtEq(this.CurrentLocation));
+
+            LogChunk endNode = endLocation.node;
+
+            LogChunk startNode = this.currentChunk;
+            int startEntry = startNode.nextEntry - 1;
+            Entry[] entries = startNode.entries;
+
+            do {
+                int endEntry = (startNode == endNode) ? endLocation.entry : 0;
+                for (int entry = startEntry; entry >= endEntry; entry--) {
+                    TryAllManager.DebugPrint("Rolling back kind={0} obj={1} offset={2} val={3}\n",
+                                             __arglist((int)(entries[entry].kind),
+                                                       (uint)(entries[entry].obj),
+                                                       (uint)(entries[entry].offset),
+                                                       (uint)(entries[entry].val)));
+
+                    if (entries[entry].obj == UIntPtr.Zero &&
+                        entries[entry].offset == UIntPtr.Zero) {
+                        VTable.DebugPrint("Saw null'd ref in update log\n");
+                    } else {
+                        switch (entries[entry].kind) {
+                        case EntryKind.HEAP_VAL:
+                            TryAllManager.setAt(Magic.fromAddress(entries[entry].obj),
+                                                entries[entry].offset,
+                                                entries[entry].val);
+                            break;
+                            
+                        case EntryKind.NON_HEAP_VAL:
+                            TryAllManager.setAtStack(stackHeight,
+                                                     null,
+                                                     entries[entry].offset,
+                                                     entries[entry].val);
+                            break;
+                            
+                        case EntryKind.HEAP_REF:
+                            TryAllManager.setAt(Magic.fromAddress(entries[entry].obj),
+                                                entries[entry].offset,
+                                                Magic.fromAddress(entries[entry].val));
+                            break;
+                            
+                        case EntryKind.NON_HEAP_REF:
+                            TryAllManager.setAtStack
+                                (stackHeight,
+                                 null,
+                                 entries[entry].offset,
+                                 Magic.fromAddress(entries[entry].val));
+                            break;
+                            
+                        default:
+                            TryAllManager.DebugPrintNoLock("Unexpected kind {0}",
+                                                           __arglist((int)(entries[entry].kind)));
+                            VTable.DebugBreak();
+                            break;
+                        }
+                    }
+                }
+
+                if (startNode == endNode) {
+                    break;
+                } else {
+                    startNode = startNode.next;
+                    entries = startNode.entries;
+                    startEntry = startNode.nextEntry - 1;
+                }
+            } while (true);
+            
+
+            this.currentChunk = endNode;
+            this.currentChunk.nextEntry = endLocation.entry;
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe void VisitStrongRefs(TryAllManager m, NonNullReferenceVisitor v)
+        {
+            LogChunk chunk = TryAllManager.toUpdateLogChunk(TryAllManager.ReadBarrier(v, 
+                                                                                      this.currentChunk));
+            
+#if ENABLE_GC_TRACING
+            VTable.DebugPrint("Visiting updates logged for {0:x} (strong)\n",
+                              __arglist(Magic.addressOf(m)));
+#endif
+            Entry[] entries = TryAllManager.toUpdateLogEntryArray(TryAllManager.ReadBarrier(v, chunk.entries));
+
+            int endEntry = chunk.nextEntry;
+            int numBlocks = 0;
+            
+            do {
+                numBlocks++;
+#if ENABLE_GC_TRACING
+                VTable.DebugPrint("block={0} entries={1}\n",
+                                  __arglist((int)Magic.addressOf(chunk),
+                                            (int)Magic.addressOf(entries)));
+#endif
+                for (int entry = 0; entry < endEntry; entry++) {
+                    EntryKind k = entries[entry].kind;
+                    
+                    // Visit the overwritten value if it has a pointer type
+                    if (k == EntryKind.HEAP_REF || k == EntryKind.NON_HEAP_REF) {
+                        fixed(UIntPtr* pobj = &entries[entry].val) {
+                            if(*pobj != UIntPtr.Zero) {
+                                v.Visit(pobj);
+                            }
+                        }
+                    }
+                }
+                LogChunk next = TryAllManager.toUpdateLogChunk(TryAllManager.ReadBarrier(v, chunk.next));
+                if (next == null) break;
+                chunk = next;
+
+                entries = TryAllManager.toUpdateLogEntryArray(TryAllManager.ReadBarrier(v, chunk.entries));
+                endEntry = chunk.nextEntry;
+            } while (true);
+
+            if (TryAllManager.ENABLE_PROFILING) {
+                if (VTable.enableGCTiming) {
+                    VTable.DebugPrint("[Update log: {0} * {1}]\n",
+                                      __arglist(numBlocks,
+                                                TryAllManager.UPDATE_LOG_CHUNK_SIZE));
+                }
+            }
+        }
+
+#if !DEBUG
+        [DisableBoundsChecks]
+        [DisableNullChecks]
+#endif // !DEBUG
+        internal unsafe void VisitWeakRefs(TryAllManager m, NonNullReferenceVisitor rv) {
+            LogChunk fromChunk = this.currentChunk;
+            Entry[] fromEntries = fromChunk.entries;
+            int fromEntry = fromChunk.nextEntry;
+            int fromNumBlocks = 1;
+
+            LogChunk toChunk = fromChunk;
+            Entry[] toEntries = fromEntries;
+            int toEntry = fromEntry;
+            int toNumBlocks = 1;
+
+            for (int depth = m.nextSavedTryAll - 1; depth >= 0; depth --) {
+                LogChunk endFromChunk = m.savedTryAlls[depth].updateLogAtStart.node;
+                int endFromEntry = m.savedTryAlls[depth].updateLogAtStart.entry;
+                
+                TryAllManager.DebugPrintGC("Visiting updates for {0:x} depth {1} ({2:x}:{3})\n", 
+                                    __arglist((UIntPtr)Magic.addressOf(m),
+                                              depth,
+                                              Magic.addressOf(endFromChunk),
+                                              endFromEntry));
+                
+                while (true) {
+                    bool inEndChunk = (fromChunk == endFromChunk);
+                    int downTo = inEndChunk ? endFromEntry : 0;
+                    
+                    for (fromEntry --; fromEntry >= downTo; fromEntry --) {
+                        
+                        TryAllManager.DebugPrintGC("saw index {0:x}/{1} {2}+{3} in update log\n",
+                                            __arglist(Magic.addressOf(fromEntries),
+                                                      fromEntry,
+                                                      fromEntries[fromEntry].obj,
+                                                      fromEntries[fromEntry].offset));
+                        
+                        EntryKind k = fromEntries[fromEntry].kind;
+                        bool keep = true;
+                        if (k == EntryKind.HEAP_VAL || k == EntryKind.HEAP_REF) {
+                            fixed(UIntPtr* pobj = &fromEntries[fromEntry].obj) {
+                                if(*pobj != UIntPtr.Zero) {
+                                    rv.Visit(pobj);
+                                    if (*pobj == UIntPtr.Zero) {
+                                        TryAllManager.DebugPrintGC("   cleared weak ref\n");
+                                        m.tryAllCounters.IncrementWeakRefsClearedInUpdateLog();
+                                        keep = false;
+                                    }
+                                }
+                            }
+                        }
+                        
+                        if (keep) {
+                            // Move on to the next to-chunk if we've filled one
+                            if (toEntry == 0) {
+                                toChunk = toChunk.next;
+                                toEntries = toChunk.entries;
+                                toEntry = toEntries.Length;
+                                
+                                toChunk.nextEntry = toEntries.Length;
+                                toNumBlocks ++;
+                            }
+                            
+                            // Claim a slot in toEntries
+                            toEntry --;
+                            
+                            // Copy the entry to the to-chunk, visit the
+                            // pointer-derived values in it
+                            toEntries[toEntry] = fromEntries[fromEntry];
+                            
+                            TryAllManager.DebugPrintGC("   --> {0:x}/{1} {2:x}+{3}\n",
+                                              __arglist(Magic.addressOf(toEntries),
+                                                        toEntry,
+                                                        toEntries[toEntry].obj,
+                                                        toEntries[toEntry].offset));
+                        }
+                    }
+
+                    if (inEndChunk) {
+                        break;
+                    }
+                    
+                    // Move on to the next from-chunk
+                    fromChunk = fromChunk.next;
+                    fromEntries = fromChunk.entries;
+                    fromEntry = fromChunk.nextEntry;
+                    fromNumBlocks ++;
+                }
+                
+                // Update finishing point
+                TryAllManager.DebugPrintGC("Log now starts at {0:x}:{1}\n",
+                                           __arglist(Magic.addressOf(toChunk),
+                                                     toEntry));
+                m.savedTryAlls[depth].updateLogAtStart.node = toChunk;
+                m.savedTryAlls[depth].updateLogAtStart.entry = toEntry;
+            }
+
+            VTable.Assert(fromChunk.next == null);
+            toChunk.next = null;
+
+            if (TryAllManager.ENABLE_PROFILING) {
+                if (VTable.enableGCTiming) {
+                    VTable.DebugPrint("[Update log: {0}->{1} * {2}]\n",
+                                      __arglist(fromNumBlocks,
+                                                toNumBlocks,
+                                                TryAllManager.UPDATE_LOG_CHUNK_SIZE));
+                }
+            }
+
+#if DEBUG
+            for (int i = 0; i < toEntry; i ++) {
+                toEntries[i].kind = EntryKind.HEAP_VAL;
+                toEntries[i].obj = (UIntPtr)TryAllManager.DEAD_PTR;
+                toEntries[i].offset = UIntPtr.Zero;
+                toEntries[i].val = UIntPtr.Zero;
+            }
+#endif
+        }
+
+        internal LogChunk currentChunk;
+    }
+
+    //----------------------------------------------------------------------
+    //
+    // Undo log
+
+    [NoLoggingForUndo]
+    class UndoLog {
+        internal UndoLog() {
+            this.entries = new LogEntryUndoAction[TryAllManager.UNDO_INITIAL_SIZE];
+        }
+
+        [Inline]
+        internal void Reset() {
+            if (this.nextEntry != 0) {
+                for(int i=0; i<this.nextEntry;++i) {
+                    this.entries[i].UndoAction = null;
+                }
+                this.nextEntry = 0;
+            }
+        }
+
+        internal void EnsureCapacity() {
+            if (this.nextEntry >= this.entries.Length) {
+                LogEntryUndoAction[] temp =
+                    new LogEntryUndoAction[2 * this.entries.Length];
+                Array.Copy(this.entries, 0, temp, 0, this.entries.Length);
+                this.entries = temp;
+            }
+        }
+
+        internal int Size {
+            get {
+                return this.nextEntry;
+            }
+        }
+
+        internal int nextEntry;
+        internal LogEntryUndoAction[] entries;
+    }
+  
+    //----------------------------------------------------------------------
+    //
+    // Profiling counters
+
+    [NoLoggingForUndo]
+    [CCtorIsRunDuringStartup]
+    sealed class TryAllCounters {
+        private TryAllCounters() {
+            // Create instances through NewRegisteredCounters
+        }
+
+        internal static TryAllCounters TryAllCountersList = null;
+        internal static Object TryAllCountersLock = new Object();
+
+        internal static TryAllCounters NewRegisteredCounters() {
+            TryAllCounters c = new TryAllCounters();
+            lock (TryAllCountersLock) {
+                c.next = TryAllCountersList;
+                TryAllCountersList = c;
+            }
+            return c;
+        }
+
+        internal static void DumpRegisteredCounters() {
+            TryAllCounters c = new TryAllCounters();
+            TryAllCounters temp = TryAllCountersList;
+            while (temp != null) {
+                c.MergeCounters(temp);
+                temp = temp.next;
+            }
+            c.DumpStats();
+        }
+
+        internal void MergeCounters(TryAllCounters other) {
+            this.startTryAll += other.startTryAll;
+            this.commitSucceeded += other.commitSucceeded;
+
+            this.ensureLogMemoryForUpdateEnlistmentLogCalls += 
+                other.ensureLogMemoryForUpdateEnlistmentLogCalls;
+            this.ensureLogMemoryForUpdateEnlistmentLogSlots += 
+                other.ensureLogMemoryForUpdateEnlistmentLogSlots;
+            this.ensureLogMemoryForReadEnlistmentLogCalls += 
+                other.ensureLogMemoryForReadEnlistmentLogCalls;
+            this.ensureLogMemoryForReadEnlistmentLogSlots += 
+                other.ensureLogMemoryForReadEnlistmentLogSlots;
+            this.ensureLogMemoryForUpdateLogCalls += 
+                other.ensureLogMemoryForUpdateLogCalls;
+            this.ensureLogMemoryForUpdateLogSlots += 
+                other.ensureLogMemoryForUpdateLogSlots;
+
+            this.logValHeapMultiple += other.logValHeapMultiple;
+            this.logValHeap += other.logValHeap;
+            this.logRefHeap += other.logRefHeap;
+            this.logIndirectValMultiple += other.logIndirectValMultiple;
+            this.logIndirectValHeap += other.logIndirectValHeap;
+            this.logIndirectValStack += other.logIndirectValStack;
+            this.logIndirectRefHeap += other.logIndirectRefHeap;
+            this.logIndirectRefStack += other.logIndirectRefStack;
+
+            this.logValHeapMultipleFast += other.logValHeapMultipleFast;
+            this.logValHeapFast += other.logValHeapFast;
+            this.logRefHeapFast += other.logRefHeapFast;
+            this.logIndirectValMultipleFast += other.logIndirectValMultipleFast;
+            this.logIndirectValHeapFast += other.logIndirectValHeapFast;
+            this.logIndirectValStackFast += other.logIndirectValStackFast;
+            this.logIndirectRefHeapFast += other.logIndirectRefHeapFast;
+            this.logIndirectRefStackFast += other.logIndirectRefStackFast;
+
+            this.skipScan += other.skipScan;
+            this.enlistObjForRead += other.enlistObjForRead;
+            this.enlistObjForUpdate += other.enlistObjForUpdate;
+            this.enlistNewObjForUpdate += other.enlistNewObjForUpdate;
+            this.enlistAddrForRead += other.enlistAddrForRead;
+            this.enlistAddrForUpdate += other.enlistAddrForUpdate;
+            this.enlistIndirectForRead += other.enlistIndirectForRead;
+            this.enlistIndirectForUpdate += other.enlistIndirectForUpdate;
+
+            this.enlistObjForReadFast += other.enlistObjForReadFast;
+            this.enlistObjForUpdateFast += other.enlistObjForUpdateFast;
+            this.enlistNewObjForUpdateFast += other.enlistNewObjForUpdateFast;
+            this.enlistAddrForReadFast += other.enlistAddrForReadFast;
+            this.enlistAddrForUpdateFast += other.enlistAddrForUpdateFast;
+            this.enlistIndirectForReadFast += other.enlistIndirectForReadFast;
+            this.enlistIndirectForUpdateFast += other.enlistIndirectForUpdateFast;
+
+            this.invalidShake += other.invalidShake;
+            this.invalidShakeException += other.invalidShakeException;
+            this.invalidConflict += other.invalidConflict;
+            this.invalidRace += other.invalidRace;
+            this.invalidDuringGC += other.invalidDuringGC;
+            this.invalidOutsideGC += other.invalidOutsideGC;
+            this.inflationSeen += other.inflationSeen;
+            this.updateOverflow += other.updateOverflow;
+            this.enlistmentOverflow += other.enlistmentOverflow;
+            this.loggedHeapVal += other.loggedHeapVal;
+            this.loggedHeapRef += other.loggedHeapRef;
+            this.loggedNonHeapVal += other.loggedNonHeapVal;
+            this.loggedNonHeapRef += other.loggedNonHeapRef;
+            this.localUpdateHeapVal += other.localUpdateHeapVal;
+            this.localUpdateHeapRef += other.localUpdateHeapRef;
+            this.localUpdateNonHeapVal += other.localUpdateNonHeapVal;
+            this.localUpdateNonHeapRef += other.localUpdateNonHeapRef;
+            this.updateHitInCacheHeapVal += other.updateHitInCacheHeapVal;
+            this.updateHitInCacheHeapRef += other.updateHitInCacheHeapRef;
+            this.updateHitInCacheNonHeapVal += other.updateHitInCacheNonHeapVal;
+            this.updateHitInCacheNonHeapRef += other.updateHitInCacheNonHeapRef;
+            this.updateHitInBitmapHeapVal += other.updateHitInBitmapHeapVal;
+            this.updateHitInBitmapHeapRef += other.updateHitInBitmapHeapRef;
+            this.updateHitInBitmapNonHeapVal += other.updateHitInBitmapNonHeapVal;
+            this.updateHitInBitmapNonHeapRef += other.updateHitInBitmapNonHeapRef;
+            this.enlistForReadLogged += other.enlistForReadLogged;
+            this.enlistForUpdateLogged += other.enlistForUpdateLogged;
+            this.readsHitInCache += other.readsHitInCache;
+            this.cachesCreated += other.cachesCreated;
+            this.bitmapOverflows += other.bitmapOverflows;
+            this.externalBitmaps += other.externalBitmaps;
+            this.forcedGC += other.forcedGC;
+            this.weakRefsClearedInReadEnlistmentLog += other.weakRefsClearedInReadEnlistmentLog;
+            this.weakRefsClearedInUpdateEnlistmentLog += other.weakRefsClearedInUpdateEnlistmentLog;
+            this.weakRefsClearedInUpdateLog += other.weakRefsClearedInUpdateLog;
+            this.readDuplicatesRemoved += other.readDuplicatesRemoved;
+            this.updatesInReadEnlistmentsAtGC += other.updatesInReadEnlistmentsAtGC;
+            this.updatesInReadEnlistmentsAtEnlistment += other.updatesInReadEnlistmentsAtEnlistment;
+        }
+
+        internal void DumpStats() {
+            if (TryAllManager.ENABLE_PROFILING) {
+            
+            // NB: do not assert that total started == total ended because a
+            // forced exit may occur when some threads are in the middle of 
+            // transactions.
+VTable.DebugPrint(@"
+Total started:                {0}
+Total ended:                  {1}
+Of which:
+   commitSucceeded:           {2}
+   invalidShake:              {3}
+   invalidShakeException:     {4}
+   invalidConflict:           {5}
+   invalidRace:               {6}
+", __arglist(startTryAll, // 0
+             (commitSucceeded + 
+              invalidShake + 
+              invalidShakeException + 
+              invalidConflict + 
+              invalidRace), // 1
+             commitSucceeded, // 2
+             invalidShake, // 3
+             invalidShakeException, // 4
+             invalidConflict, // 5
+             invalidRace // 6
+));
+
+VTable.DebugPrint(@"
+logValHeapMultiple:           {0}
+logValHeap:                   {1}
+logRefHeap:                   {2}
+logIndirectValMultiple:       {3}
+logIndirectValHeap:           {4}
+logIndirectValHeap:           {5}
+logIndirectRefHeap:           {6}
+logIndirectRefStack:          {7}
+",
+__arglist(logValHeapMultiple, // 0
+          logValHeap, // 1
+          logRefHeap, // 2
+          logIndirectValMultiple, // 3
+          logIndirectValHeap, // 4
+          logIndirectValStack, // 5
+          logIndirectRefHeap, // 6
+          logIndirectRefStack) // 7
+);
+
+VTable.DebugPrint(@"
+logValHeapMultipleFast:       {0}
+logValHeapFast:               {1}
+logRefHeapFast:               {2}
+logIndirectValMultipleFast:   {3}
+logIndirectValHeapFast:       {4}
+logIndirectValHeapFast:       {5}
+logIndirectRefHeapFast:       {6}
+logIndirectRefStackFast:      {7}
+",
+__arglist(logValHeapMultipleFast, // 0
+          logValHeapFast, // 1
+          logRefHeapFast, // 2
+          logIndirectValMultipleFast, // 3
+          logIndirectValHeapFast, // 4
+          logIndirectValStackFast, // 5
+          logIndirectRefHeapFast, // 6
+          logIndirectRefStackFast  // 7
+));
+
+VTable.DebugPrint(@"
+  HEAP_VAL total              {0}
+  HEAP_VAL to local obj       {1}
+  HEAP_VAL hit in table       {2}
+  HEAP_VAL hit in bitmap      {3}
+  HEAP_VAL logged             {4} ({5} %)
+
+  HEAP_REF total              {6}
+  HEAP_REF to local obj       {7}
+  HEAP_REF hit in table       {8}
+  HEAP_REF hit in bitmap      {9}
+  HEAP_REF logged             {10} ({11} %)
+
+  NON_HEAP_VAL total          {12}
+  NON_HEAP_VAL to local obj   {13}
+  NON_HEAP_VAL hit in table   {14}
+  NON_HEAP_VAL hit in bitmap  {15}
+  NON_HEAP_VAL logged         {16} ({17} %)
+
+  NON_HEAP_REF total          {18}
+  NON_HEAP_REF to local obj   {19}
+  NON_HEAP_REF hit in table   {20}
+  NON_HEAP_REF hit in bitmap  {21}
+  NON_HEAP_REF logged         {22} ({23} %)
+
+  readsHitInCache             {24}
+  cachesCreated               {25}
+  bitmapOverflows             {26}
+  externalBitmaps             {27}
+",
+__arglist(
+          logValHeap 
+          + logIndirectValHeap 
+          + logValHeapFast 
+          + logIndirectValHeapFast, // 0
+          localUpdateHeapVal, // 1
+          updateHitInCacheHeapVal, // 2
+          updateHitInBitmapHeapVal, // 3
+          loggedHeapVal, // 4
+          loggedHeapVal == 0 ? 0
+                : ((100 * (long)loggedHeapVal)
+                   / (logValHeap 
+                      + logIndirectValHeap 
+                      + logValHeapFast 
+                      + logIndirectValHeapFast)), // 5
+
+          logRefHeap 
+          + logIndirectRefHeap
+          + logRefHeapFast 
+          + logIndirectRefHeapFast, // 6
+          localUpdateHeapRef, // 7
+          updateHitInCacheHeapRef, // 8
+          updateHitInBitmapHeapRef, // 9
+          loggedHeapRef, // 10
+          loggedHeapRef == 0 ? 0
+                : ((100 * (long)loggedHeapRef)
+                   / ( logRefHeap 
+                       + logIndirectRefHeap
+                       + logRefHeapFast 
+                       + logIndirectRefHeapFast)), // 11
+
+          logIndirectValStack + logIndirectValStackFast, // 12
+          localUpdateNonHeapVal, // 13
+          updateHitInCacheNonHeapVal, // 14
+          updateHitInBitmapNonHeapVal, // 15
+          loggedNonHeapVal, // 16
+          loggedNonHeapVal == 0 ? 0
+                : ((100 * (long)loggedNonHeapVal)
+                   / (logIndirectValStack + logIndirectValStackFast)), // 17
+
+          logIndirectRefStack + logIndirectRefStackFast, // 18
+          localUpdateNonHeapRef, // 19
+          updateHitInCacheNonHeapRef, // 20
+          updateHitInBitmapNonHeapRef, // 21
+          loggedNonHeapRef, // 22
+          loggedNonHeapRef == 0 ? 0
+          : ((100 * (long)loggedNonHeapRef)
+             / (logIndirectRefStack + logIndirectRefStackFast)), // 23
+
+          readsHitInCache, // 24
+          cachesCreated, // 25
+          bitmapOverflows, // 26
+          externalBitmaps) // 27
+);
+             
+VTable.DebugPrint(@"
+enlistObjForRead:             {0}
+enlistAddrForRead:            {1}
+  of which indirect:          {2}
+  enlistForRead total:        {3}
+
+enlistObjForUpdate:           {4}
+enlistNewObjForUpdate:        {5}
+enlistAddrForUpdate:          {6}
+  of which indirect:          {7}
+  enlistForUpdate total:      {8}
+", __arglist(enlistObjForRead, // 0
+             enlistAddrForRead, // 1
+             enlistIndirectForRead, // 2
+             enlistObjForRead + enlistAddrForRead, // 3
+
+             enlistObjForUpdate, // 4
+             enlistNewObjForUpdate, // 5
+             enlistAddrForUpdate, // 6
+             enlistIndirectForUpdate, // 7
+             enlistObjForUpdate + enlistNewObjForUpdate + enlistAddrForUpdate // 9
+));
+
+VTable.DebugPrint(@"
+enlistObjForReadFast:         {0}
+enlistAddrForReadFast:        {1}
+  of which indirect:          {2}
+  enlistForReadFast total:    {3}
+
+enlistObjForUpdateFast:       {4}
+enlistNewObjForUpdateFast:    {5}
+enlistAddrForUpdateFast:      {6}
+  of which indirect:          {7}
+  enlistForUpdateFast total:  {8}
+", __arglist(enlistObjForReadFast, // 0
+             enlistAddrForReadFast, // 1
+             enlistIndirectForReadFast, // 2
+             enlistObjForReadFast + enlistAddrForReadFast, //3
+
+             enlistObjForUpdateFast, // 4
+             enlistNewObjForUpdateFast, // 5
+             enlistAddrForUpdateFast, // 6
+             enlistIndirectForUpdateFast, // 7
+             enlistObjForUpdateFast + enlistNewObjForUpdateFast + enlistAddrForUpdateFast // 8
+));
+
+VTable.DebugPrint(@"
+enlistForRead logged:         {0} ({1} %)
+enlistForUpdate logged:       {2} ({3} %)
+
+", __arglist(enlistForReadLogged, // 0
+             (enlistForReadLogged == 0 
+              || (0 == (enlistObjForRead 
+                        + enlistAddrForRead 
+                        + enlistObjForReadFast 
+                        + enlistAddrForReadFast))) 
+             ? 0
+             : ((100 * (long)enlistForReadLogged)
+                / (enlistObjForRead 
+                   + enlistAddrForRead 
+                   + enlistObjForReadFast 
+                   + enlistAddrForReadFast)), // 1
+
+             enlistForUpdateLogged, // 2
+             (enlistForUpdateLogged == 0
+              || (0 == (enlistObjForUpdate
+                        + enlistNewObjForUpdate
+                        + enlistAddrForUpdate
+                        + enlistObjForUpdateFast
+                        + enlistNewObjForUpdateFast
+                        + enlistAddrForUpdateFast)))
+             ? 0
+             : ((100 * (long)enlistForUpdateLogged)
+                / (enlistObjForUpdate
+                   + enlistNewObjForUpdate
+                   + enlistAddrForUpdate
+                   + enlistObjForUpdateFast
+                   + enlistNewObjForUpdateFast
+                   + enlistAddrForUpdateFast)) // 3
+));
+
+VTable.DebugPrint(@"
+EnsureLogMemory:          Calls     Slots   
+  UpdateEnlistmentLog:   {0,10} {1,10}
+  ReadEnlistmentLog:     {2,10} {3,10}
+  UpdateLog:             {4,10} {5,10}
+", __arglist(ensureLogMemoryForUpdateEnlistmentLogCalls, // 0
+             ensureLogMemoryForUpdateEnlistmentLogSlots, // 1
+             ensureLogMemoryForReadEnlistmentLogCalls, // 2
+             ensureLogMemoryForReadEnlistmentLogSlots, // 3
+             ensureLogMemoryForUpdateLogCalls, // 4
+             ensureLogMemoryForUpdateLogSlots // 5
+)); 
+
+VTable.DebugPrint(@"
+invalidDuringGC:              {0}
+updateOverflow:               {1}
+enlistmentOverflow:           {2}
+newBytesSinceGC:              {3}
+", __arglist(invalidDuringGC, // 0
+             updateOverflow, // 1
+             enlistmentOverflow, // 2
+             (int)GC.newBytesSinceGC // 3
+));
+
+VTable.DebugPrint(@"
+Weak refs cleared in:
+  ReadEnlistmentLog:          {0}
+  UpdateEnlistmentLog:        {1}
+  UpdateLog:                  {2}
+", __arglist(weakRefsClearedInReadEnlistmentLog, // 0
+             weakRefsClearedInUpdateEnlistmentLog, // 1
+             weakRefsClearedInUpdateLog // 2
+));
+
+VTable.DebugPrint(@"
+Duplicate reads removed:      {0}
+RMW removed at GC:            {1}
+RMW removed at enlistment:    {2}
+", __arglist(readDuplicatesRemoved, // 0
+             updatesInReadEnlistmentsAtGC, // 1
+             updatesInReadEnlistmentsAtEnlistment // 2
+));
+
+            TryAllManager.DumpPerCallSiteStats();
+            }
+        }
+
+        internal void IncrementStartTryAll() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                startTryAll++;
+            }
+        }
+
+        internal void IncrementCommitSucceeded() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                commitSucceeded++;
+            }
+        }
+
+        internal unsafe void IncrementEnsureLogMemoryForUpdateLog(uint bytesNeeded) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                ensureLogMemoryForUpdateLogCalls++;
+                ensureLogMemoryForUpdateLogSlots += (bytesNeeded / (uint)sizeof(UpdateLog.Entry));
+            }
+        }
+
+        internal unsafe void IncrementEnsureLogMemoryForReadEnlistmentLog(uint bytesNeeded) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                ensureLogMemoryForReadEnlistmentLogCalls++;
+                ensureLogMemoryForReadEnlistmentLogSlots += (bytesNeeded / (uint)sizeof(ReadEnlistmentLog.Entry));
+            }
+        }
+
+        internal unsafe void IncrementEnsureLogMemoryForUpdateEnlistmentLog(uint bytesNeeded) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                ensureLogMemoryForUpdateEnlistmentLogCalls++;
+                ensureLogMemoryForUpdateEnlistmentLogSlots += (bytesNeeded / (uint)sizeof(UpdateEnlistmentLog.Entry));
+            }
+        }
+
+        internal void IncrementLogValHeapMultiple() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logValHeapMultiple++;
+            }
+        }
+
+        internal void IncrementLogValHeap() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logValHeap++;
+            }
+        }
+
+        internal void IncrementLogRefHeap() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logRefHeap++;
+            }
+        }
+
+        internal void IncrementLogIndirectValMultiple() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectValMultiple++;
+            }
+        }
+
+        internal void IncrementLogIndirectValHeap() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectValHeap++;
+            }
+        }
+
+        internal void IncrementLogIndirectValStack() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectValStack++;
+            }
+        }
+
+        internal void IncrementLogIndirectRefHeap() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectRefHeap++;
+            }
+        }
+
+        internal void IncrementLogIndirectRefStack() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectRefStack++;
+            }
+        }
+
+        internal void IncrementSkipScan(uint n) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                skipScan += n;
+            }
+        }
+
+        internal void IncrementEnlistObjForRead() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistObjForRead++;
+            }
+        }
+
+        internal void IncrementEnlistObjForUpdate() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistObjForUpdate++;
+            }
+        }
+
+        internal void IncrementEnlistNewObjForUpdate() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistNewObjForUpdate++;
+            }
+        }
+
+        internal void IncrementEnlistAddrForRead() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistAddrForRead++;
+            }
+        }
+
+        internal void IncrementEnlistAddrForUpdate() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistAddrForUpdate++;
+            }
+        }
+
+        internal void IncrementEnlistIndirectForRead() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistIndirectForRead++;
+            }
+        }
+
+        internal void IncrementEnlistIndirectForUpdate() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistIndirectForUpdate++;
+            }
+        }
+
+        internal void IncrementEnlistForReadLogged() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistForReadLogged++;
+            }
+        }
+
+        internal void IncrementEnlistForUpdateLogged() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistForUpdateLogged++;
+            }
+        }
+
+        internal void IncrementLogValHeapMultipleFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logValHeapMultipleFast++;
+            }
+        }
+
+        internal void IncrementLogValHeapFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logValHeapFast++;
+            }
+        }
+
+        internal void IncrementLogRefHeapFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logRefHeapFast++;
+            }
+        }
+
+        internal void IncrementLogIndirectValMultipleFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectValMultipleFast++;
+            }
+        }
+
+        internal void IncrementLogIndirectValHeapFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectValHeapFast++;
+            }
+        }
+
+        internal void IncrementLogIndirectValStackFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectValStackFast++;
+            }
+        }
+
+
+        internal void IncrementLogIndirectRefHeapFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectRefHeapFast++;
+            }
+        }
+
+        internal void IncrementLogIndirectRefStackFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                logIndirectRefStackFast++;
+            }
+        }
+
+        internal void IncrementEnlistObjForReadFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistObjForReadFast++;
+            }
+        }
+
+        internal void IncrementEnlistObjForUpdateFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistObjForUpdateFast++;
+            }
+        }
+
+        internal void IncrementEnlistNewObjForUpdateFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistNewObjForUpdateFast++;
+            }
+        }
+
+        internal void IncrementEnlistAddrForReadFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistAddrForReadFast++;
+            }
+        }
+
+        internal void IncrementEnlistAddrForUpdateFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistAddrForUpdateFast++;
+            }
+        }
+
+        internal void IncrementEnlistIndirectForReadFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistIndirectForReadFast++;
+            }
+        }
+
+        internal void IncrementEnlistIndirectForUpdateFast() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistIndirectForUpdateFast++;
+            }
+        }
+
+        internal void IncrementInvalidShake() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                invalidShake++;
+            }
+        }
+
+        internal void IncrementInvalidShakeException() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                invalidShakeException++;
+            }
+        }
+
+        internal void IncrementInvalidConflict() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                invalidConflict++;
+            }
+        }
+
+        internal void IncrementInvalidRace() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                invalidRace++;
+            }
+        }
+
+        internal void IncrementInvalidDuringGC() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                invalidDuringGC++;
+            }
+        }
+
+        internal void IncrementInvalidOutsideGC() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                invalidOutsideGC++;
+            }
+        }
+
+        internal void IncrementEnlistmentOverflow() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                enlistmentOverflow++;
+            }
+        }
+
+        internal void IncrementInflationSeen() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                inflationSeen++;
+            }
+        }
+
+        internal void IncrementUpdateOverflow() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                updateOverflow++;
+            }
+        }
+
+        internal void IncrementUpdateLogged(UpdateLog.EntryKind kind) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                switch (kind) {
+                case UpdateLog.EntryKind.HEAP_VAL:
+                    this.loggedHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.HEAP_REF:
+                    this.loggedHeapRef++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_VAL:
+                    this.loggedNonHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_REF:
+                    this.loggedNonHeapRef++;
+                    break;
+                    
+                default:
+                    VTable.Assert(false);
+                    break;
+                }
+            }
+        }
+
+        internal void IncrementLocalUpdate(UpdateLog.EntryKind kind) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                switch (kind) {
+                case UpdateLog.EntryKind.HEAP_VAL:
+                    this.localUpdateHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.HEAP_REF:
+                    this.localUpdateHeapRef++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_VAL:
+                    this.localUpdateNonHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_REF:
+                    this.localUpdateNonHeapRef++;
+                    break;
+                    
+                default:
+                    VTable.Assert(false);
+                    break;
+                }
+            }
+        }
+
+        internal void IncrementUpdateHitInCache(UpdateLog.EntryKind kind) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                switch (kind) {
+                case UpdateLog.EntryKind.HEAP_VAL:
+                    this.updateHitInCacheHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.HEAP_REF:
+                    this.updateHitInCacheHeapRef++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_VAL:
+                    this.updateHitInCacheNonHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_REF:
+                    this.updateHitInCacheNonHeapRef++;
+                    break;
+                
+                default:
+                    VTable.Assert(false);
+                    break;
+                }
+            }
+        }
+
+        internal void IncrementUpdateHitInBitmap(UpdateLog.EntryKind kind) {
+            if (TryAllManager.ENABLE_PROFILING) {
+                switch (kind) {
+                case UpdateLog.EntryKind.HEAP_VAL:
+                    this.updateHitInBitmapHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.HEAP_REF:
+                    this.updateHitInBitmapHeapRef++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_VAL:
+                    this.updateHitInBitmapNonHeapVal++;
+                    break;
+                    
+                case UpdateLog.EntryKind.NON_HEAP_REF:
+                    this.updateHitInBitmapNonHeapRef++;
+                    break;
+                    
+                default:
+                    VTable.Assert(false);
+                    break;
+                }
+            }
+        }
+
+        internal void IncrementCachesCreated() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                cachesCreated++;
+            }
+        }
+
+        internal void IncrementReadsHitInCache() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                readsHitInCache++;
+            }
+        }
+
+        internal void IncrementBitmapOverflows() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                bitmapOverflows++;
+            }
+        }
+
+        internal void IncrementExternalBitmaps() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                externalBitmaps++;
+            }
+        }
+
+        internal void IncrementForcedGC() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                forcedGC++;
+            }
+        }
+
+        internal void IncrementWeakRefsClearedInReadEnlistmentLog() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                weakRefsClearedInReadEnlistmentLog++;
+            }
+        }
+
+        internal void IncrementWeakRefsClearedInUpdateEnlistmentLog() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                weakRefsClearedInUpdateEnlistmentLog++;
+            }
+        }
+
+        internal void IncrementWeakRefsClearedInUpdateLog() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                weakRefsClearedInUpdateLog++;
+            }
+        }
+
+        internal void IncrementReadDuplicatesRemoved() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                readDuplicatesRemoved++;
+            }
+        }
+
+        internal void IncrementUpdatesInReadEnlistmentsAtGC() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                updatesInReadEnlistmentsAtGC++;
+            }
+        }
+
+        internal void IncrementUpdatesInReadEnlistmentsAtEnlistment() {
+            if (TryAllManager.ENABLE_PROFILING) {
+                updatesInReadEnlistmentsAtEnlistment++;
+            }
+        }
+
+        internal uint startTryAll;
+        internal uint commitSucceeded;
+        internal uint ensureLogMemoryForUpdateEnlistmentLogCalls;
+        internal uint ensureLogMemoryForUpdateEnlistmentLogSlots;
+        internal uint ensureLogMemoryForReadEnlistmentLogCalls;
+        internal uint ensureLogMemoryForReadEnlistmentLogSlots;
+        internal uint ensureLogMemoryForUpdateLogCalls;
+        internal uint ensureLogMemoryForUpdateLogSlots;
+        internal uint logValHeapMultiple;
+        internal uint logValHeap;
+        internal uint logRefHeap;
+        internal uint logIndirectValMultiple;
+        internal uint logIndirectValHeap;
+        internal uint logIndirectValStack;
+        internal uint logIndirectRefHeap;
+        internal uint logIndirectRefStack;
+        internal uint logValHeapMultipleFast;
+        internal uint logValHeapFast;
+        internal uint logRefHeapFast;
+        internal uint logIndirectValMultipleFast;
+        internal uint logIndirectValHeapFast;
+        internal uint logIndirectValStackFast;
+        internal uint logIndirectRefHeapFast;
+        internal uint logIndirectRefStackFast;
+        internal uint skipScan;
+        internal uint enlistObjForRead;
+        internal uint enlistObjForUpdate;
+        internal uint enlistNewObjForUpdate;
+        internal uint enlistAddrForRead;
+        internal uint enlistAddrForUpdate;
+        internal uint enlistIndirectForRead;
+        internal uint enlistIndirectForUpdate;
+        internal uint enlistForReadLogged;
+        internal uint enlistForUpdateLogged;
+        internal uint enlistObjForReadFast;
+        internal uint enlistObjForUpdateFast;
+        internal uint enlistNewObjForUpdateFast;
+        internal uint enlistAddrForReadFast;
+        internal uint enlistAddrForUpdateFast;
+        internal uint enlistIndirectForReadFast;
+        internal uint enlistIndirectForUpdateFast;
+        internal uint invalidShake;
+        internal uint invalidShakeException;
+        internal uint invalidConflict;
+        internal uint invalidRace;
+        internal uint invalidDuringGC;
+        internal uint invalidOutsideGC;
+        internal uint inflationSeen;
+        internal uint updateOverflow;
+        internal uint enlistmentOverflow;
+        internal uint loggedHeapVal;
+        internal uint loggedHeapRef;
+        internal uint loggedNonHeapVal;
+        internal uint loggedNonHeapRef;
+        internal uint readsHitInCache;
+        internal uint updateHitInCacheHeapVal;
+        internal uint updateHitInCacheHeapRef;
+        internal uint updateHitInCacheNonHeapVal;
+        internal uint updateHitInCacheNonHeapRef;
+        internal uint updateHitInBitmapHeapVal;
+        internal uint updateHitInBitmapHeapRef;
+        internal uint updateHitInBitmapNonHeapVal;
+        internal uint updateHitInBitmapNonHeapRef;
+        internal uint localUpdateHeapVal;
+        internal uint localUpdateHeapRef;
+        internal uint localUpdateNonHeapVal;
+        internal uint localUpdateNonHeapRef;
+        internal uint updatesInReadEnlistmentsAtGC;
+        internal uint updatesInReadEnlistmentsAtEnlistment;
+        internal uint cachesCreated;
+        internal uint bitmapOverflows;
+        internal uint externalBitmaps;
+        internal uint forcedGC;
+        internal uint weakRefsClearedInReadEnlistmentLog;
+        internal uint weakRefsClearedInUpdateEnlistmentLog;
+        internal uint weakRefsClearedInUpdateLog;
+        internal uint readDuplicatesRemoved;
+
+        internal TryAllCounters next;
+    }
+
+}
diff --git a/base/Kernel/Bartok/TryAllAttributes.cs b/base/Kernel/Bartok/TryAllAttributes.cs
new file mode 100644
index 0000000..ff26a09
--- /dev/null
+++ b/base/Kernel/Bartok/TryAllAttributes.cs
@@ -0,0 +1,31 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System {
+
+  // A method marked as NoLoggingForUndo will not have logging code
+  // inserted even if called from a logging context
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class
+                  | AttributeTargets.Struct | AttributeTargets.Constructor
+                  | AttributeTargets.Method,
+                  Inherited = false)]
+  public sealed class NoLoggingForUndoAttribute: Attribute {}
+
+  // A method marked as NonTransactional may NOT be called from a
+  // transactional context.  This is statically checked by
+  // convert\PropagateLogging.cs
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class
+                  | AttributeTargets.Struct | AttributeTargets.Constructor
+                  | AttributeTargets.Method,
+                  Inherited = false)]
+  public sealed class NonTransactableAttribute: Attribute {}
+
+}
diff --git a/base/Kernel/Bartok/TryAllException.cs b/base/Kernel/Bartok/TryAllException.cs
new file mode 100644
index 0000000..4a79e8b
--- /dev/null
+++ b/base/Kernel/Bartok/TryAllException.cs
@@ -0,0 +1,17 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// This file contains the runtime support code for tryall support.
+
+namespace System {
+  public sealed class TryAllFakeException : Exception {}
+  public sealed class AtomicFakeException : Exception {}
+}
diff --git a/base/Kernel/Bartok/VTable.cs b/base/Kernel/Bartok/VTable.cs
new file mode 100644
index 0000000..eaa4cfc
--- /dev/null
+++ b/base/Kernel/Bartok/VTable.cs
@@ -0,0 +1,1984 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define OLD_FAST_TESTS
+#if MARKSWEEPCOLLECTOR
+#define ALLOW_BOOT_ARGLIST
+#endif
+
+namespace System {
+
+    using Microsoft.Bartok.Runtime;
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity;
+#elif SINGULARITY_PROCESS
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.V1.Services;
+#endif
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+    using System;
+
+    internal sealed class MutableInt32 {
+        public MutableInt32(int x) { this.val = x; }
+        public int Value { get { return this.val; } set { this.val = value; } }
+        private int val;
+    }
+
+    [RequiredByBartok]
+    internal struct InterfaceInfo {
+        [RequiredByBartok]
+        internal System.RuntimeType type;
+        [RequiredByBartok]
+        internal IntPtr offset;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [CCtorIsRunDuringStartup]
+    [NoLoggingForUndo]
+    [RequiredByBartok]
+    internal sealed class VTable {
+        [RequiredByBartok]
+        public readonly VTable depth1;
+        [RequiredByBartok]
+        public readonly VTable depth2;
+        [RequiredByBartok]
+        public readonly VTable depth3;
+        [RequiredByBartok]
+        public readonly VTable depth4;
+        [RequiredByBartok]
+        public readonly VTable depth5;
+        [RequiredByBartok]
+        public readonly VTable depth6;
+        public VTable posCache;
+        [RequiredByBartok]
+        public int depth;
+        [RequiredByBartok]
+        public readonly StructuralType arrayOf;
+        [RequiredByBartok]
+        public readonly VTable arrayElementClass;
+        [RequiredByBartok]
+        public readonly int arrayElementSize;
+        [RequiredByBartok]
+        public readonly InterfaceInfo[] interfaces;
+        [RequiredByBartok]
+        public readonly uint baseLength;
+        [RequiredByBartok]
+        public readonly uint baseAlignment;
+        [RequiredByBartok]
+        public readonly UIntPtr pointerTrackingMask;
+        [AccessedByRuntime("Referenced from C++")]
+        public readonly StructuralType structuralView;
+        [AccessedByRuntime("Referenced from C++")]
+        public readonly RuntimeType vtableType;
+        [RequiredByBartok]
+        public readonly int marshalSize;
+        [RequiredByBartok]
+        public readonly VTable vectorClass;
+        [AccessedByRuntime("Type information available to runtime.")]
+        public readonly bool isAcyclicRefType;
+
+        // one less than size, which must be a power of two
+        internal static int tryAllCheckMask = 2047;
+#if SINGULARITY_KERNEL
+        private static bool multiThreaded;
+#endif
+
+        internal class ClassConstructorLock
+        {
+        }
+
+        public static readonly ClassConstructorLock cctorLock = new ClassConstructorLock();
+        public static int[] handle_counts = new int[4];
+        public static bool runtimeInitialized = false;
+        public static System.Collections.Hashtable interfaceOffsetTable;
+        public static bool callTraceInProgress;
+
+        // This method is generated by Bartok.
+        // It calls all the auto init class constructors.
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(252)]
+        [RequiredByBartok]
+        private static extern void Initialize();
+
+        // NB: This is called from Kernel.Main() before the VTable.cctor.
+        // It calls all the manual init class constructors then
+        // call Initialize() above to call the auto init class constructors.
+        [AccessedByRuntime("called from brtmain.cpp")]
+        [NoStackLinkCheck]
+        static public void Initialize(RuntimeType mainType)
+        {
+            initializeGC();
+
+#if !SINGULARITY
+            if (useLinkedStack) {
+                System.GCs.StackManager.Initialize();
+            }
+#endif // !SINGULARITY
+
+            // The remaining cctors may allocate memory normally
+            InitializeLimitedType(typeof(System.Delegate));
+            InitializeLimitedType(typeof(System.MultiUseWord));
+            InitializeLimitedType(typeof(System.WeakReference));
+            InitializeLimitedType(typeof(System.GCs.Verifier));
+            InitializeLimitedType(typeof(System.Collections.Hashtable));
+
+            Thread.FinishInitializeThread();
+
+            // Make transition to full thread-ready GC.
+            // We can't start any other threads until this code runs.
+            System.GC.FinishInitializeThread();
+
+#if !SINGULARITY
+            InitializeLimitedType(typeof(System.IO.Stream));
+            InitializeLimitedType(typeof(System.Reflection.Missing));
+            InitializeLimitedType(typeof(System.RuntimeType));
+            InitializeLimitedType(typeof(System.Environment));
+#endif
+#if SINGULARITY
+            InitializeLimitedType(typeof(System.DateTime));
+            InitializeLimitedType(typeof(System.TimeSpan));
+            InitializeLimitedType(typeof(System.SchedulerTime));
+#endif
+            InitializeLimitedType(typeof(System.Type));
+            InitializeLimitedType(typeof(System.String));
+            InitializeLimitedType(typeof(System.BitConverter));
+            InitializeLimitedType(typeof(System.Math));
+            InitializeLimitedType(typeof(System.VTable));
+
+#if !VC
+            InitializeLimitedType(typeof(System.TryAllManager));
+            InitializeLimitedType(typeof(System.TryAllCounters));
+#endif
+
+            VTable.runtimeInitialized = true;
+            if(VTable.enableGCAccounting) {
+                GCs.MemoryAccounting.Initialize(GC.gcType);
+            }
+            VTable.Initialize();
+#if !SINGULARITY
+            GC.EnableHeap();
+            if(mainType != null) {
+                initType(mainType);
+            }
+#endif
+        }
+
+#if SINGULARITY_KERNEL
+        static public void InitializeForMultipleThread()
+        {
+            multiThreaded = true;
+        }
+#endif
+
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+        [NoInline]
+#endif // REFERENCE_COUNTING_GC
+        [PreInitRefCounts]
+        private static void initializeGC() {
+            // Create the heap management data structures
+            System.GC.ConstructHeap();
+            // The following cctors may only allocate using BootstrapMemory
+            InitializeLimitedType(typeof(System.Threading.Thread));
+            InitializeLimitedType(typeof(System.GC));
+            InitializeLimitedType(typeof(System.Finalizer));
+            System.GCs.BootstrapMemory.Truncate();
+        }
+
+        [RequiredByBartok]
+        private static bool useLinkedStack;
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        static unsafe void StartupChecks() {
+            VTable v = ((RuntimeType)typeof(System.VTable)).classVtable;
+            Assert(v.depth == (Constants.TypeTestDisplayObjectOffset + 1),
+                   "Depth of VTable's VTable is wrong, so either the hierarchy " +
+                   "has changed or the compiler and runtime differ over the " +
+                   "size of the display so the depth offset is wrong");
+            fixed(int * p =  &v.depth) {
+                UIntPtr up = (UIntPtr) p;
+                UIntPtr upBase = Magic.addressOf(v);
+                int diff = ((int) (up - upBase)) / UIntPtr.Size;
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+                Assert(diff == Constants.TypeTestDisplaySize + 3,
+                       "Number of display fields does not match constant");
+#else // REFERENCE_COUNTING_GC
+                Assert(diff == Constants.TypeTestDisplaySize + 2,
+                       "Number of display fields does not match constant");
+#endif
+            }
+        }
+
+        static unsafe VTable() {
+            StartupChecks();
+
+            // Ensure that the monitors have been allocated, so that we don't
+            // try to allocate them just as we are running out of memory
+            Monitor.Enter(VTable.cctorLock);
+            Monitor.Exit(VTable.cctorLock);
+        }
+
+        internal static void checkNonNull(object obj) {
+            if (obj == null) {
+                throw new NullReferenceException();
+            }
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static void checkUnbox(object obj, int structuralType) {
+            if (structuralType != (int) obj.vtable.structuralView) {
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug, "checkUnbox failed: Obj={0:x8} st={1}",
+                            Magic.addressOf(obj),
+                            unchecked((uint)structuralType));
+#endif
+
+                throwNewClassCastException();
+            }
+        }
+
+        [RequiredByBartok]
+        internal static void checkArrayStore(object obj1,object obj2) {
+            Assert(obj1.vtable.vtableType.IsArray);
+
+            // can't put an object into a primitive array, but we can probably
+            // guarantee that this is never called on a primitive type array
+            VTable obj1VT = obj1.vtable;
+            VTable obj1ElemVT = obj1VT.arrayElementClass;
+            RuntimeType obj1ElemTy = obj1ElemVT.vtableType;
+
+            // typeof is too slow right now...
+            //if(obj1ElemTy == typeof(Object)) {
+            //    return;
+            //}
+
+            Deny(obj1ElemTy.IsPrimitive);
+
+            if(obj2 == null) {
+                return;
+            }
+
+            RuntimeType obj2Ty = obj2.vtable.vtableType;
+            if(! isValidAssignment(obj1ElemTy, obj2Ty)) {
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug,
+                            "checkArrayStore failed: obj1={0:x8} obj2={1:x8} obj1ElemTy={2:x8} obj2Ty={3:x8}",
+                            Magic.addressOf(obj1),
+                            Magic.addressOf(obj2),
+                            Magic.addressOf(obj1ElemTy),
+                            Magic.addressOf(obj2Ty));
+#endif
+                throwNewArrayTypeMismatchException();
+            }
+        }
+
+        [RequiredByBartok]
+        internal static void checkArrayElementAddress(RuntimeType ty,
+                                                      object obj) {
+            if(ty != obj.vtable.vtableType) {
+                throwNewArrayTypeMismatchException();
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug,
+                            "checkArrayElementAddress failed: ty={0:x8} obj={1:x8}",
+                            Magic.addressOf(ty),
+                            Magic.addressOf(obj));
+#endif
+            }
+        }
+
+        [PreInitRefCounts]
+        private static bool isValidAssignmentArray(RuntimeType ty,
+                                                   RuntimeType objTy) {
+            Assert((ty.IsVector && objTy.IsVector) ||
+                   (ty.IsRectangleArray && objTy.IsRectangleArray),
+                   "incompatible arrays");
+            Assert(ty.classVtable.arrayOf == objTy.classVtable.arrayOf,
+                   "!= arrayOfs");
+
+            VTable tyVT = ty.classVtable;
+            VTable tyElementVT = tyVT.arrayElementClass;
+            Assert(tyElementVT != null, "array has null arrayElementClass");
+            RuntimeType tyElementType = tyElementVT.vtableType;
+            RuntimeType objElementType =
+                objTy.classVtable.arrayElementClass.vtableType;
+
+            // struct
+            if(tyVT.arrayOf == StructuralType.Struct) {
+                return tyElementType == objElementType;
+            }
+
+            // primitives and enums -- this allows int[], E1[], and E2[]
+            // to cast either way (assuming E1 and E2 are based on int)
+            if(tyVT.arrayOf != StructuralType.Reference) {
+                return true;
+            }
+
+            // reference
+            return isValidAssignment(tyElementType, objElementType);
+        }
+
+        [PreInitRefCounts]
+        internal static bool isValidAssignment(RuntimeType ty,RuntimeType objTy) {
+            return (ty == objTy) || isValidAssignmentMedium(ty, objTy);
+        }
+
+        [PreInitRefCounts]
+        internal static bool isValidAssignmentMedium(RuntimeType ty,
+                                                     RuntimeType objTy)
+        {
+            RuntimeType testType = objTy;
+            do {
+                testType = testType.baseType;
+                if (ty == testType) {
+                    return true;
+                }
+            } while (testType != null);
+            return isValidAssignmentSlow(ty, objTy);
+        }
+
+        [PreInitRefCounts]
+        private static bool isValidAssignmentSlow(RuntimeType ty,
+                                                  RuntimeType objTy)
+        {
+            Assert(ty != null, "isValidAssignment null dst type");
+            Assert(objTy != null, "isValidAssignment null src type");
+
+            if(ty.classVtable.arrayOf != StructuralType.None) {
+                // ty is an Array
+                if(ty.classVtable.arrayOf == objTy.classVtable.arrayOf) {
+                    if(ty.IsVector) {
+                        if (objTy.IsVector) {
+                            return isValidAssignmentArray(ty, objTy);
+                        }
+                    } else {
+                        Assert(ty.IsRectangleArray, "not rectangle array");
+                        if(!objTy.IsVector && ty.rank == objTy.rank) {
+                            return isValidAssignmentArray(ty, objTy);
+                        }
+                    }
+                }
+            } else if ((ty.attributes & TypeAttributes.ClassSemanticsMask) ==
+                       TypeAttributes.Interface) {
+                // ty is an Interface
+                System.RuntimeType[] interfaces = objTy.interfaces;
+                if(interfaces != null) {
+                    int numInterfaces = interfaces.Length;
+                    for(int i=0; i<numInterfaces; ++i) {
+                        if(interfaces[i] == ty) {
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        [RequiredByBartok]
+        internal static Object isInstanceOf(RuntimeType ty,object obj) {
+            if(obj == null) {
+                return null;
+            }
+            RuntimeType objTy = obj.vtable.vtableType;
+            if(isValidAssignment(ty, objTy)) {
+                return obj;
+            } else {
+                return null;
+            }
+        }
+
+        // null ok
+        [RequiredByBartok]
+        [PreInitRefCounts]
+        internal static void checkClassCast(RuntimeType ty,object obj) {
+            if(obj != null && !isValidAssignment(ty, obj.vtable.vtableType)) {
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug,
+                            "checkClassCast failed: ty={0:x8} obj={1:x8}",
+                            Magic.addressOf(ty),
+                            Magic.addressOf(obj));
+#endif
+                throwNewClassCastException();
+            }
+        }
+
+        // "Simple" means that we must be testing against a type that is in our
+        // display.  Deep classes, interfaces, and arrays of interfaces are not
+        // simple.  "Exact" means that we do not accept subtypes.  This is
+        // common if we are testing against a sealed type since it will have no
+        // subtypes.
+#if OLD_FAST_TESTS
+        // The boolean parameters should always be inlined constants -- it is here
+        // so that the callers here in VTable can be partially evaluated at
+        // compile-time.
+        [Inline]
+        [PreInitRefCounts]
+        internal unsafe static bool newIsValidAssignment(VTable vtarget,
+                                                         VTable vobj,
+                                                         int vtargetDepth,
+                                                         bool alwaysExact,
+                                                         bool alwaysSimple) {
+            Assert((int)vtarget.depth == vtargetDepth);
+            Assert(vtargetDepth > 0);
+
+            if(alwaysExact) {
+                return vobj == vtarget;
+            }
+
+            UIntPtr * p = (UIntPtr *) Magic.addressOf(vobj);
+
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+            if(alwaysSimple ||
+               (vtargetDepth < Constants.TypeTestDisplayPosCache)) {
+                return p[vtargetDepth+1] == Magic.addressOf(vtarget);
+            }
+#else // REFERENCE_COUNTING_GC
+            if(alwaysSimple ||
+               (vtargetDepth < Constants.TypeTestDisplayPosCache)) {
+                return p[vtargetDepth] == Magic.addressOf(vtarget);
+            }
+#endif
+
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+            if(p[vtargetDepth+1] == Magic.addressOf(vtarget)) {
+                return true;
+            }
+#else // REFERENCE_COUNTING_GC
+            if(p[vtargetDepth] == Magic.addressOf(vtarget)) {
+                return true;
+            }
+#endif
+
+            if(isValidAssignment(vtarget.vtableType, vobj.vtableType)) {
+                vobj.posCache = vtarget;
+                return true;
+            }
+
+            return false;
+        }
+
+        [Inline]
+        private static Object newIsInstanceOf(VTable v,
+                                              Object obj,
+                                              int vtargetDepth,
+                                              bool mayBeNull,
+                                              bool mustBeExact,
+                                              bool alwaysSimple) {
+            if(mayBeNull && obj == null) {
+                return null;
+            }
+
+            VTable objVtable = obj.vtable;
+            if(newIsValidAssignment(v, objVtable, vtargetDepth, mustBeExact,
+                                    alwaysSimple)) {
+                return obj;
+            } else {
+                return null;
+            }
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfNonNullExact(VTable v,
+                                                           Object obj,
+                                                           int vtargetDepth) {
+            return newIsInstanceOf(v, obj, vtargetDepth, false, true, true);
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfExact(VTable v,
+                                                    Object obj,
+                                                    int vtargetDepth) {
+            return newIsInstanceOf(v, obj, vtargetDepth, true, true, true);
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfNonNullSimple(VTable v,
+                                                            Object obj,
+                                                            int vtargetDepth) {
+            return newIsInstanceOf(v, obj, vtargetDepth, false, false, true);
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfSimple(VTable v,
+                                                     Object obj,
+                                                     int vtargetDepth) {
+            return newIsInstanceOf(v, obj, vtargetDepth, true, false, true);
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfNonNullComplex(VTable v,
+                                                             Object obj,
+                                                             int vtargetDepth) {
+            return newIsInstanceOf(v, obj, vtargetDepth, false, false, false);
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfComplex(VTable v,
+                                                      Object obj,
+                                                      int vtargetDepth) {
+            return newIsInstanceOf(v, obj, vtargetDepth, true, false, false);
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        internal static void newCheckClassCast(VTable v,
+                                               object obj,
+                                               int vtargetDepth,
+                                               bool mayBeNull,
+                                               bool mustBeExact,
+                                               bool alwaysSimple) {
+            if(mayBeNull && obj == null) {
+                return;
+            }
+
+            if(!newIsValidAssignment(v, obj.vtable, vtargetDepth, mustBeExact,
+                                     alwaysSimple)) {
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug,
+                            "newCheckClassCast failed: v={0:x8} obj={1:x8} vtd={2} mbn={3} as={4}",
+                            Magic.addressOf(v),
+                            Magic.addressOf(obj),
+                            unchecked((uint)vtargetDepth),
+                            unchecked((uint)(mayBeNull ? 1 : 0)),
+                            unchecked((uint)(alwaysSimple ? 1 : 0)));
+#endif
+                throwNewClassCastException();
+            }
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastNonNullExact(VTable v,
+                                                           object obj,
+                                                           int vtargetDepth) {
+            newCheckClassCast(v, obj, vtargetDepth, false, true, true);
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastExact(VTable v,
+                                                    object obj,
+                                                    int vtargetDepth) {
+            newCheckClassCast(v, obj, vtargetDepth, true, true, true);
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastNonNullSimple(VTable v,
+                                                            object obj,
+                                                            int vtargetDepth) {
+            newCheckClassCast(v, obj, vtargetDepth, false, false, true);
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastSimple(VTable v,
+                                                     object obj,
+                                                     int vtargetDepth) {
+            newCheckClassCast(v, obj, vtargetDepth, true, false, true);
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastNonNullComplex(VTable v,
+                                                             object obj,
+                                                             int vtargetDepth)
+        {
+            newCheckClassCast(v, obj, vtargetDepth, false, false, false);
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastComplex(VTable v,
+                                                      object obj,
+                                                      int vtargetDepth) {
+            newCheckClassCast(v, obj, vtargetDepth, true, false, false);
+        }
+
+#else
+
+        [Inline]
+        private unsafe static bool checkDisplay(VTable vtarget,
+                                                VTable vobj,
+                                                int vtargetDepth) {
+            UIntPtr * p = (UIntPtr *) Magic.addressOf(vobj);
+            Assert((int)vtarget.depth == vtargetDepth);
+            Assert(vtargetDepth > 0);
+
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+            return p[vtargetDepth+1] == Magic.addressOf(vtarget);
+#else // REFERENCE_COUNTING_GC
+            return p[vtargetDepth] == Magic.addressOf(vtarget);
+#endif
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfNonNullSimple(VTable v,
+                                                            Object obj,
+                                                            int vtargetDepth) {
+            return checkDisplay(v, obj.vtable, vtargetDepth)
+                ? obj : null;
+        }
+
+        [Inline]
+        internal static Object newIsInstanceOfSimple(VTable v,
+                                                     Object obj,
+                                                     int vtargetDepth) {
+            if(obj == null) {
+                return null;
+            }
+            return newIsInstanceOfNonNullSimple(v, obj, vtargetDepth);
+        }
+
+        [NoInline]
+        internal static Object newIsInstanceOfHelp(VTable v,
+                                                   Object obj) {
+            int vtargetDepth = v.depth;
+            if(vtargetDepth < Constants.TypeTestDisplayPosCache) {
+                return null;
+            }
+
+            VTable vobj = obj.vtable;
+
+            if(isValidAssignment(v.vtableType, vobj.vtableType)) {
+                v.posCache = vobj;
+                return obj;
+            }
+
+            return null;
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static Object newIsInstanceOfNonNullComplex(VTable v,
+                                                             Object obj,
+                                                             int vtargetDepth) {
+
+            return checkDisplay(v, obj.vtable, vtargetDepth)
+                ? obj : newIsInstanceOfHelp(v, obj);
+        }
+
+        [Inline]
+        internal static Object newIsInstanceOfComplex(VTable v,
+                                                      Object obj,
+                                                      int vtargetDepth) {
+            if(obj == null) {
+                return null;
+            }
+            return newIsInstanceOfNonNullComplex(v, obj, vtargetDepth);
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static void newCheckClassCastNonNullSimple(VTable v,
+                                                            object obj,
+                                                            int vtargetDepth) {
+            if(!checkDisplay(v, obj.vtable, vtargetDepth)) {
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug,
+                            "newCheckClassCastNonNullSimple failed: v={0:x8} obj={1:x8} vtd={2}",
+                            Magic.addressOf(v),
+                            Magic.addressOf(obj),
+                            unchecked((uint)vtargetDepth));
+#endif
+                throwNewClassCastException();
+            }
+        }
+
+        [Inline]
+        [PreInitRefCounts]
+        [RequiredByBartok]
+        internal static void newCheckClassCastSimple(VTable v,
+                                                     object obj,
+                                                     int vtargetDepth) {
+            if(obj == null) {
+                return;
+            }
+            newCheckClassCastNonNullSimple(v, obj, vtargetDepth);
+        }
+
+        [NoInline]
+        [PreInitRefCounts]
+        internal static void newCheckClassCastHelp(VTable v,
+                                                   VTable vobj) {
+            int vtargetDepth = v.depth;
+            if(vtargetDepth == Constants.TypeTestDisplayPosCache
+               && isValidAssignment(v.vtableType, vobj.vtableType)) {
+                v.posCache = vobj;
+                return;
+            }
+
+#if SINGULARITY
+            Tracing.Log(Tracing.Debug,
+                        "newCheckClassCastHelp failed: v={0:x8} vobj={1:x8}",
+                        Magic.addressOf(v),
+                        Magic.addressOf(vobj));
+#endif
+            throwNewClassCastException();
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static void newCheckClassCastNonNullComplex(VTable v,
+                                                             object obj,
+                                                             int vtargetDepth) {
+            VTable vobj = obj.vtable;
+            if(!checkDisplay(v, vobj, vtargetDepth)) {
+                newCheckClassCastHelp(v, vobj);
+            }
+        }
+
+        [Inline]
+        [RequiredByBartok]
+        internal static void newCheckClassCastComplex(VTable v,
+                                                      object obj,
+                                                      int vtargetDepth) {
+            if(obj == null) {
+                return;
+            }
+            newCheckClassCastNonNullComplex(v, obj, vtargetDepth);
+        }
+
+        /*
+          [NoInline]
+          internal static void newCheckArrayStoreHelp(VTable v,
+          VTable vobj) {
+          int vtargetDepth = v.depth;
+          if(vtargetDepth == Constants.TypeTestDisplayPosCache
+          && isValidAssignment(v.vtableType, vobj.vtableType)) {
+          v.posCache = vobj;
+          return;
+          }
+
+          throwNewArrayTypeMismatchException();
+          }
+
+          [NoInline]
+          internal static void newCheckArrayStore(object obj1,object obj2) {
+          Assert(obj1.vtable.vtableType.IsArray);
+
+          if(obj2 == null) {
+          return;
+          }
+
+          // can't put an object into a primitive array, but we can probably
+          // guarantee that this is never called on a primitive type array
+          VTable obj1ElemTy = obj1.vtable.arrayElementClass;
+          VTable obj2Ty = obj2.vtable;
+
+          Deny(obj1ElemTy.vtableType.IsPrimitive);
+
+          if(checkDisplay(obj1ElemTy, obj2Ty, obj1ElemTy.depth)) {
+          return;
+          }
+
+          newCheckArrayStoreHelp(obj1ElemTy, obj2Ty);
+          }
+        */
+#endif // OLD_FAST_TESTS
+
+        [NoInline]
+        internal static bool shouldDoCallTrace() {
+            return VTable.runtimeInitialized && !VTable.callTraceInProgress;
+        }
+
+        [NoInline]
+        internal static void callTrace(Object o) {
+            if(o == null) {
+                VTable.DebugPrint("null");
+                return;
+            }
+
+            VTable.callTraceInProgress = true;
+            try {
+                VTable.DebugPrint(o.ToString());
+            } catch(Exception) {
+                VTable.DebugPrint("exn");
+            }
+            VTable.callTraceInProgress = false;
+        }
+
+        // Bartok intrinsics
+
+        [Intrinsic]
+        internal static extern ulong mulUIntUIntToULong(uint x, uint y);
+
+        internal static extern bool BuildC2Mods
+        {
+            [Intrinsic]
+            get;
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        private static void initTypePrint(RuntimeType ty, String s)
+        {
+            if (VTable.enableDebugPrint) {
+#if ALLOW_BOOT_ARGLIST
+                DebugPrint("initType({0}.{1}): {2}\n",
+                           __arglist(ty.Namespace, ty.Name, s));
+#endif
+            }
+        }
+
+        [PreInitRefCounts]
+        internal static void InitializeLimitedType(Type t)
+        {
+            InitializeLimitedType((RuntimeType)t);
+        }
+
+        [PreInitRefCounts]
+        private static void InitializeLimitedType(RuntimeType ty)
+        {
+#if SINGULARITY_KERNEL
+            Tracing.Log(Tracing.Debug, "InitializeLimitedType({0}.{1}",
+                        ty.Namespace, ty.Name);
+            //DebugStub.WriteLine("InitializeLimitedType({0}.{1})",
+            //__arglist(ty.Namespace, ty.Name));
+#endif
+
+            // Null check is needed because Bartok can remove static type
+            // constructors and we don't have a good framework for removing the
+            // static initialization of those types (particularly in
+            // VTable.Initialize).
+            if(ty.cctor != UIntPtr.Zero) {
+                Magic.calli(ty.cctor);
+            }
+            ty.cctorState = TypeInitState.Completed;
+        }
+
+        [StackLinkCheck]
+        [RequiredByBartok]
+        internal static void initType(RuntimeType ty) {
+            // Abort early if the type has already been initialized.
+            if (ty.cctorState == TypeInitState.Completed) {
+                return;
+            }
+            // Or if it doesn't have a class constructor.
+            if (ty.cctor == UIntPtr.Zero) {
+                ty.cctorState = TypeInitState.Completed;
+                return;
+            }
+
+#if SINGULARITY_KERNEL
+            if (!multiThreaded) {
+                //DebugStub.WriteLine("initType({0}.{1}) - singlethreaded",
+                //__arglist(ty.Namespace, ty.Name));
+                switch(ty.cctorState) {
+                    case TypeInitState.Ready:
+                        initTypePrint(ty, "ready");
+                        ty.cctorState = TypeInitState.Running;
+
+                        try {
+                            initTypePrint(ty, "running");
+                            Magic.calli(ty.cctor);
+                        } catch (Exception e) {
+                            initTypePrint(ty, "failed");
+
+                            // Wrap the type initializer exception
+                            // appropriately and save it for future calls.
+
+                            ty.cctorState = TypeInitState.Failed;
+                            Exception exn
+                                = new TypeInitializationException(ty.FullName, e);
+                            ty.cctorException = exn;
+                            throw exn;
+                        }
+                        initTypePrint(ty, "complete");
+                        ty.cctorState = TypeInitState.Completed;
+                        return;
+
+                    case TypeInitState.Failed:
+                        initTypePrint(ty, "previous failure");
+                        throw ty.cctorException;
+
+                    case TypeInitState.Completed:
+                        initTypePrint(ty, "already completed");
+                        return;
+
+                    default:
+                        initTypePrint(ty, "selfloop or finished");
+
+                        if (ty.cctorState == TypeInitState.Failed) {
+                            initTypePrint(ty, "clash finished - failed");
+
+                            throw ty.cctorException;
+                        }
+                        return;
+                }
+            }
+            //DebugStub.WriteLine("initType({0}.{1}) - multithreaded",
+            //__arglist(ty.Namespace, ty.Name));
+#endif
+
+            // Get global lock - must have to read/write any thread/type
+            // wait dependencies.  Also used for some things that possibly
+            // should be shifted to the type locks.
+
+            // BUGBUG: The local lock used below is the RuntimeType object.  We
+            // can't use VTable since interfaces do not currently have VTable
+            // objects.  But RuntimeType is exposed to users and thus this is
+            // incorrect.
+            Monitor.Enter(VTable.cctorLock);
+
+            switch(ty.cctorState) {
+                case TypeInitState.Ready:{
+                    initTypePrint(ty, "ready");
+
+                    // Record that this thread is running this type initializer.
+
+                    Thread t = Thread.CurrentThread;
+                    ty.cctorThread = t;
+                    ty.cctorState = TypeInitState.Running;
+
+                    // Get local lock - must have to actually run an initializer
+                    // and thus also to check if one is done.  We are done setting
+                    // global state and ready to run the local (type) initializer;
+                    // therefore we can dump the global lock now as well.
+
+                    lock (ty) { // .classVtable) {
+                        Monitor.Exit(VTable.cctorLock);
+                        // we don't need to start with "initialize base and
+                        // all interfaces" because the compiler explicitly
+                        // add calls to the base and interfaces ..ctor in
+                        // current type's ..cctor.
+
+                        // Run the type initializer, if it exists.
+                        if (ty.cctor != UIntPtr.Zero) {
+                            try {
+                                initTypePrint(ty, "running");
+                                Magic.calli(ty.cctor);
+                            } catch(Exception e) {
+                                initTypePrint(ty, "failed");
+
+                                // Wrap the type initializer exception
+                                // appropriately and save it for future calls.
+
+                                ty.cctorState = TypeInitState.Failed;
+                                ty.cctorThread = null;
+                                Exception exn = new TypeInitializationException
+                                    (ty.FullName, e);
+                                ty.cctorException = exn;
+                                throw exn;
+                            }
+                        }
+                        initTypePrint(ty, "complete");
+                        ty.cctorState = TypeInitState.Completed;
+                        ty.cctorThread = null;
+                    }
+
+                    return;
+                }
+
+                case TypeInitState.Running:{
+                    initTypePrint(ty, "clash");
+
+                    // Try to grab the local lock.  This seems somewhat confusing
+                    // to me but I'll follow the CLR code for now (see
+                    // VM\class.cpp:EEClass::DoRunClassInit()).  It is important
+                    // to do the TryEnter() as we need to detect circular
+                    // dependencies.
+
+                    Thread runningThread = ty.cctorThread;
+                    bool gotIt = Monitor.TryEnter(ty); // .classVtable);
+                    if (gotIt) {
+                        initTypePrint(ty, "selfloop or finished");
+
+                        // If we succeed in getting the lock, then either the
+                        // class finished between the switch statement and here
+                        // (setting complete/fail does not require the global
+                        // lock...) or this thread is attempting circular
+                        // initialization.  In the former we need to check for
+                        // success/failure; in the latter we just return to
+                        // prevent deadlock (state will still be Running and thus
+                        // not Failed).
+
+                        Monitor.Exit(ty); // .classVtable);
+                        Monitor.Exit(VTable.cctorLock);
+
+                        if (ty.cctorState == TypeInitState.Failed) {
+                            initTypePrint(ty, "clash finished - failed");
+
+                            throw ty.cctorException;
+                        }
+                        return;
+                    } else {
+                        initTypePrint(ty, "blocked by another thread");
+
+                        // Check and see if blocking this thread to wait for the
+                        // type to complete initialization will cause a deadlock.
+                        // To do this, see which thread is initializing the type
+                        // and then follow the blocking threads.  This thread
+                        // can not be at any of the intermediate (next blocking
+                        // thread is non-null) points as by definition they are
+                        // blocked and can't have reached here.
+
+                        Thread currentThread = Thread.CurrentThread;
+                        Thread blockingThread = runningThread;
+                        VTable.Assert(blockingThread != null);
+
+                        while(blockingThread.blockingCctorThread != null) {
+                            blockingThread = blockingThread.blockingCctorThread;
+                        }
+
+                        if(currentThread == blockingThread) {
+
+                            // Circular dependency.  Give up on "finished
+                            // initialization" guaranties and just return.
+
+                            initTypePrint(ty, "circular");
+                            Monitor.Exit(VTable.cctorLock);
+                            return;
+                        }
+
+                        // Set us as blocked by this type, release the global
+                        // lock, and wait for the type to complete initialization.
+                        // REVIEW: I have concerns about the lack of lock around
+                        // setting the block to null.  Come back to this!
+
+                        currentThread.blockingCctorThread = runningThread;
+                        Monitor.Exit(VTable.cctorLock);
+                        lock (ty) {} // .classVtable) {}
+                        currentThread.blockingCctorThread = null;
+
+                        // The type has finished initialization.  As above, the
+                        // two possible cases are Completed and Failed.
+
+                        if(ty.cctorState == TypeInitState.Failed) {
+                            throw ty.cctorException;
+                        }
+                        return;
+                    }
+                }
+
+                case TypeInitState.Failed:
+                    initTypePrint(ty, "previous failure");
+                    Monitor.Exit(VTable.cctorLock);
+                    throw ty.cctorException;
+
+                case TypeInitState.Completed:
+                    initTypePrint(ty, "already completed");
+                    Monitor.Exit(VTable.cctorLock);
+                    return;
+            }
+        }
+
+        [NoInline]
+        internal static void throwNewClassCastException() {
+            throw new InvalidCastException();
+        }
+
+        [NoInline]
+        internal static void throwNewArgumentOutOfRangeException() {
+            throw new ArgumentOutOfRangeException();
+        }
+
+        [NoInline]
+        [RequiredByBartok]
+        internal static void throwNewIndexOutOfRangeException() {
+            throw new IndexOutOfRangeException();
+        }
+
+        [NoInline]
+        [RequiredByBartok]
+        internal static void throwNewStringIndexOutOfRangeException() {
+            throw new ArgumentOutOfRangeException();
+        }
+
+        [NoInline]
+        internal static void throwNewArrayTypeMismatchException() {
+            throw new ArrayTypeMismatchException();
+        }
+
+        [NoInline]
+        [AccessedByRuntime("referenced from halasm.asm")]
+        internal static void throwNewOverflowException() {
+            throw new OverflowException();
+        }
+
+        [NoInline]
+        [RequiredByBartok]
+        internal static void throwNewDivideByZeroException() {
+            throw new DivideByZeroException();
+        }
+
+        [NoInline]
+        [RequiredByBartok]
+        internal static void throwNewArithmeticException() {
+            throw new ArithmeticException();
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        private static void profileInterfaceOffset(VTable v, RuntimeType ty,
+                                                   int index) {
+            // REVIEW: Counts could be off in a multithreaded setting, but these
+            // are just debug counts and if extra hashtables are allocated or
+            // increments are missed it's not that big of a deal.
+
+            // index ignored
+
+            if(VTable.runtimeInitialized && VTable.enableDumpInterface) {
+                if(VTable.interfaceOffsetTable == null) {
+                    VTable.interfaceOffsetTable =
+                        new System.Collections.Hashtable();
+                }
+
+                System.Collections.Hashtable h = (System.Collections.Hashtable)
+                    VTable.interfaceOffsetTable[v];
+                if(h == null) {
+                    VTable.interfaceOffsetTable[v] = h =
+                        new System.Collections.Hashtable();
+                }
+
+                MutableInt32 m = (MutableInt32) h[ty];
+
+                if(m == null) {
+                    h[ty] = new MutableInt32(1);
+                } else {
+                    m.Value++;
+                }
+            }
+        }
+
+        [DisableBoundsChecks]
+        [RequiredByBartok]
+        internal static IntPtr interfaceOffset(VTable v,RuntimeType ty) {
+            InterfaceInfo[] interfaces = v.interfaces;
+            VTable.Assert(interfaces != null);
+            int numInterfaces = interfaces.Length;
+            int i;
+            for(i=0; i<numInterfaces; ++i) {
+                if(interfaces[i].type == ty) {
+                    break;
+                }
+            }
+
+            profileInterfaceOffset(v, ty, i);
+
+            VTable.Assert(i != numInterfaces);
+
+            return interfaces[i].offset;
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(24)]
+        [RequiredByBartok]
+        internal static extern int doubleToInt(double d);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(28)]
+        [RequiredByBartok]
+        internal static extern long doubleToLong(double d);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(20)]
+        [RequiredByBartok]
+        internal static extern int floatToInt(float f);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(24)]
+        [RequiredByBartok]
+        internal static extern long floatToLong(float  f);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(24)]
+        [RequiredByBartok]
+        internal static extern int checkedDoubleToInt(double d);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(28)]
+        [RequiredByBartok]
+        internal static extern long checkedDoubleToLong(double d);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(20)]
+        [RequiredByBartok]
+        internal static extern int checkedFloatToInt(float f);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(24)]
+        [RequiredByBartok]
+        internal static extern long checkedFloatToLong(float  f);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [RequiredByBartok]
+        internal static extern float floatRem(float f1, float f2);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(20)]
+        [RequiredByBartok]
+        internal static extern double doubleRem(double d1, double d2);
+
+        // mulSigned64Bit: signed 2's complement 64-bit multiplication with
+        // overflow checking.
+        //
+        // x,y and the result are represented in 2's complement.  The
+        // following algorithm is used:
+        //   Compute the sign of x*y.
+        //   Compute |x| * |y| using unsigned arithmetic
+        //   If the sign of the result is non-negative
+        //       Check that x*y <= 2^(n-1)-1.
+        //   If the sign of the result is negative,
+        //       Check that x*y <= 2^(n-1).
+        //       Convert back to 2's complement:
+        //          2^n - x*y
+        [RequiredByBartok]
+        static public long mulOverflowSigned64Bit(long x,long y) {
+            bool isPositive = true;
+            if (x < 0) {
+                x = -x;
+                isPositive = false;
+            }
+            if (y < 0) {
+                y = -y;
+                isPositive = !isPositive;
+            }
+            ulong result = mulOverflowUnsigned64Bit((ulong) x, (ulong) y);
+            if (isPositive) {
+                if (result <= 0x7FFFFFFFFFFFFFFF) {
+                    return (long) result;
+                } else {
+                    VTable.throwNewOverflowException();
+                    return 0;
+                }
+            } else {
+                if (result <= 0x8000000000000000) {
+                    return -((long) result);
+                } else {
+                    VTable.throwNewOverflowException();
+                    return 0;
+                }
+            }
+        }
+
+        [RequiredByBartok]
+        // unsigned 64-bit multiplication with overflow checking
+        static public ulong mulOverflowUnsigned64Bit(ulong x,ulong y) {
+            uint loX = (uint) x;
+            uint hiX = (uint) (x >> 32);
+            uint loY = (uint) y;
+            uint hiY = (uint) (y >> 32);
+            if (hiX > 0 && hiY > 0) {
+                VTable.throwNewOverflowException();
+            }
+            ulong result = mulUIntUIntToULong(loY, loX);
+            checked {
+                result =  result + (((ulong) (loX * hiY)) << 32);
+                result =  result + (((ulong) (loY * hiX)) << 32);
+            }
+            return result;
+        }
+
+        [RequiredByBartok]
+        // unsigned 64-bit multiplication with no overflow checking
+        static public ulong mulUnsigned64Bit(ulong x,ulong y) {
+            uint loX = (uint) x;
+            uint hiX = (uint) (x >> 32);
+            uint loY = (uint) y;
+            uint hiY = (uint) (y >> 32);
+            ulong result = mulUIntUIntToULong(loY, loX);
+            result =  result + (((ulong) (loX * hiY)) << 32);
+            result =  result + (((ulong) (loY * hiX)) << 32);
+            return result;
+        }
+
+        public const bool enableLibraryOptions = true;
+        internal static bool enableDebugPrint = false; /*true to log initType calls*/
+        internal static bool enableGCVerify = false;
+        internal static bool enableGCProfiling = false;
+        internal static bool enableGCTiming = false;
+        internal static bool enableGCAccounting = false;
+        internal static bool enableGCWatermarks = false;
+        internal static bool enableDumpMemStats = false;
+        internal static bool enableDumpMultiUseWords = false;
+        internal static bool enableDumpInterface = false;
+        internal static bool enableDumpTryAllStats = false;
+
+        [NoHeapAllocation]
+        public static bool EnableLibraryNotImplemented() {
+            return(false);
+        }
+
+        [NoHeapAllocation]
+        public static bool EnableLibraryAsserts() {
+            return(true);
+        }
+
+        [NoHeapAllocation]
+        public static void NotImplemented() {
+            failAssert("Not implemented.");
+        }
+
+        [NoHeapAllocation]
+        public static void NotImplemented(String msg) {
+            failAssert(/*"Not implemented: "+*/msg);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void NotReached() {
+            failAssert("Unreachable code reached.");
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void NotReached(String msg) {
+            failAssert(/*"Unreachable code reached: "+*/msg);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        public static void Assert(bool expr) {
+            if (VTable.enableLibraryOptions && EnableLibraryAsserts() && !expr) {
+                failAssert(null);
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        public static void Deny(bool expr) {
+            if (VTable.enableLibraryOptions && EnableLibraryAsserts() && expr) {
+                failAssert(null);
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void AssertForRedundant(bool expr) {
+            if (!expr) {
+                failAssert(null);
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void DenyForRedundant(bool expr) {
+            AssertForRedundant(!expr);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        public static void Assert(bool expr, String s) {
+            if (VTable.enableLibraryOptions && EnableLibraryAsserts() && !expr) {
+                failAssert(s);
+            }
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void Deny(bool expr, String s) {
+            if (VTable.enableLibraryOptions && EnableLibraryAsserts() && expr) {
+                failAssert(s);
+            }
+        }
+
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        private static void failAssert(String s) {
+#if SINGULARITY
+            if (s != null) {
+                Tracing.Log(Tracing.Notice, "Assertion failed: {0}\n", s);
+            } else {
+                Tracing.Log(Tracing.Notice, "Assertion failed\n");
+            }
+#endif
+            //        DebugPrintSpinLock();
+            //        DebugPrint(Thread.currentThread().toString());
+            if (s != null) {
+                DebugPrint("Assertion failed: {0}\n", __arglist(s));
+            }
+            else {
+                DebugPrint("Assertion failed.\n");
+            }
+            //        Thread.DebugDumpThreadAnchorTable(0);
+            DebugBreak();
+            //        DebugPrintSpinUnlock();
+        }
+
+#if SINGULARITY_KERNEL || SINGULARITY_PROCESS
+
+        // Note confusion: This DebugPrint is an unconditional output to stderr,
+        // not something that only prints in BRT debug modes.
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        static public void DebugPrint(String v)
+        {
+            DebugStub.Print(v);
+        }
+
+        [NoHeapAllocation]
+        static public void DebugPrint(String v, __arglist)
+        {
+            DebugStub.Print(v, new ArgIterator(__arglist));
+        }
+
+        [NoHeapAllocation]
+        static public void DebugPrint(String v, ArgIterator args)
+        {
+            DebugStub.Print(v, args);
+        }
+
+        [RequiredByBartok]
+        static public void DebugPrint(int v)
+        {
+            DebugStub.Print("{0}", __arglist(v));
+        }
+
+        [RequiredByBartok]
+        static public void DebugPrint(long v)
+        {
+            DebugStub.Print("{0}", __arglist(v));
+        }
+
+        [NoHeapAllocation]
+        static public void DebugBreak()
+        {
+            DebugStub.Break();
+        }
+
+#else // not SINGULARITY
+
+        // Note confusion: This DebugPrint is an unconditional output to stderr,
+        // not something that only prints in BRT debug modes.
+        [RequiredByBartok]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(312)]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(String v);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        //[StackBound(610)]
+        [NoHeapAllocation]
+        static private unsafe extern void DebugPrintHelper(char *p_str, int length);
+
+
+        const int DEBUG_MESSAGE_BUFFER_SIZE = 4095;
+        [NoHeapAllocation]
+        static public unsafe void DebugPrint(String v, ArgIterator args)
+        {
+            char *memBuffer = stackalloc char[DEBUG_MESSAGE_BUFFER_SIZE+1];
+            // note that we save 1 for the null character
+            int stringLength = String.LimitedFormatTo(v, args, memBuffer, DEBUG_MESSAGE_BUFFER_SIZE);
+            VTable.Assert(stringLength <= DEBUG_MESSAGE_BUFFER_SIZE, "String.LimitedFormatTo returned an impossibly large stringLength");
+            // null terminate the string
+            DebugPrintHelper(memBuffer, stringLength);
+        }
+
+        [NoHeapAllocation]
+        static public void DebugPrint(String v, __arglist)
+        {
+            DebugPrint(v, new ArgIterator(__arglist));
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(610)]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(byte v);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(610)]
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(int v);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(618)]
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(long v);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(618)]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(ulong v);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(618)]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(int v, int width);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(626)]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(long v, int width);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        static public extern void DebugPrint(ulong v, int width);
+
+        [NoHeapAllocation]
+        static public void DebugPrint(bool b)
+        {
+            if (b) {
+                DebugPrint("true");
+            }
+            else {
+                DebugPrint("false");
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(638)]
+        [NoHeapAllocation]
+        static public extern void DebugDump(object o);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(638)]
+        [NoHeapAllocation]
+        static public extern void DebugBreak();
+
+#endif
+
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        [NoHeapAllocation]
+        static public bool IsExceptionHandler(Type t,Exception e) {
+            Type s = e.vtable.vtableType;
+            // check whether s is a subtype of t
+            do {
+                if (s==t) {
+                    return true;
+                }
+                s = s.BaseType;
+            } while (s != null);
+            return false;
+        }
+
+#if SINGULARITY
+        static public String[] ParseArgs(String[] args)
+#else
+        [AccessedByRuntime("referenced from brtmain.cpp")]
+        static public String[] ParseArgs()
+#endif
+        {
+#if !SINGULARITY
+            String[] args = System.Environment.GetCommandLineArgs();
+#endif
+
+            int i=0;
+
+            ++i;  // dump program name argument
+
+            for( ; i<args.Length; ++i) {
+                String arg = args[i];
+                if(!arg.StartsWith("--brt")) {
+                    break;
+                }
+
+                if(arg == "--brt-debug") {
+                    VTable.enableDebugPrint = true;
+                    continue;
+                }
+
+                if(arg == "--brt-gc-verify") {
+                    VTable.enableGCVerify = true;
+                    continue;
+                }
+
+                if(arg == "--brt-gc-profiling") {
+                    VTable.enableGCProfiling = true;
+                    continue;
+                }
+
+                if(arg == "--brt-gc-timing") {
+                    VTable.enableGCTiming = true;
+                    continue;
+                }
+
+                if(arg == "--brt-gc-accounting") {
+                    VTable.enableGCAccounting = true;
+                    continue;
+                }
+
+                if(arg == "--brt-gc-watermarks") {
+                    VTable.enableGCWatermarks = true;
+                    continue;
+                }
+
+                if(arg == "--brt-dump-memstats") {
+                    VTable.enableDumpMemStats = true;
+                    continue;
+                }
+
+                if(arg == "--brt-dump-muw") {
+                    VTable.enableDumpMultiUseWords = true;
+                    continue;
+                }
+
+                if(arg == "--brt-dump-interface") {
+                    VTable.enableDumpInterface = true;
+                    continue;
+                }
+
+                if(arg == "--brt-tryallchecksize") {
+                    ++i;
+                    if(i==args.Length) {
+                        DebugPrint
+                            ("--brt-tryallchecksize requires argument\r\n");
+                        DebugBreak();
+                    }
+
+                    try {
+                        int tryAllSize = Int32.Parse(args[i]);
+
+                        // check that it's a power of two
+                        VTable.Assert
+                            ((tryAllSize > 0)
+                             && (((tryAllSize - 1) & tryAllSize) == 0),
+                             "--brt-tryallchecksize must be a power of two");
+                        VTable.tryAllCheckMask = tryAllSize - 1;
+                    } catch(FormatException) {
+                        DebugPrint
+                            ("--brt-tryallchecksize requires argument\r\n");
+                        DebugBreak();
+                    }
+                    continue;
+                }
+
+                if(arg == "--brt-dump-tryallstats") {
+                    VTable.enableDumpTryAllStats = true;
+                    continue;
+                }
+
+                if(arg == "--brt-countgc-trigger") {
+#if !SINGULARITY || ADAPTIVE_COPYING_COLLECTOR || SEMISPACE_COLLECTOR
+                    switch(GC.gcType) {
+                      case GCType.AdaptiveCopyingCollector:
+                      case GCType.SemispaceCollector: {
+                          ++i;
+                          if(i==args.Length) {
+                              DebugPrint("--brt-countgc-trigger requires argument\r\n");
+                              DebugBreak();
+                          }
+
+                          try {
+                              short countGCTrigger = Int16.Parse(args[i]);
+                              if(countGCTrigger == -1) {
+                                  countGCTrigger = Int16.MaxValue;
+                              }
+                              GCs.GenerationalCollector.gcFrequencyTable
+                                    [(int)GCs.GenerationalCollector.MIN_GENERATION] = countGCTrigger;
+                          } catch(FormatException) {
+                              DebugPrint("--brt-countgc-trigger requires argument\r\n");
+                              DebugBreak();
+                          }
+                          break;
+                      }
+                    }
+#endif
+                    continue; // argument loop
+                }
+
+                if(arg == "--brt-promotegc-trigger") {
+#if !SINGULARITY || ADAPTIVE_COPYING_COLLECTOR || SEMISPACE_COLLECTOR
+                    switch(GC.gcType) {
+                      case GCType.AdaptiveCopyingCollector:
+                      case GCType.SemispaceCollector: {
+                          ++i;
+                          if(i==args.Length) {
+                              DebugPrint("--brt-promotegc-trigger requires argument\r\n");
+                              DebugBreak();
+                          }
+
+                          try {
+                              long promotedGCTrigger = Int64.Parse(args[i]);
+                              if(promotedGCTrigger == -1L) {
+                                  promotedGCTrigger = Int64.MaxValue;
+                              }
+                              GCs.GenerationalCollector.gcPromotedLimitTable
+                                 [(int)GCs.GenerationalCollector.MIN_GENERATION] = (UIntPtr) promotedGCTrigger;
+                          } catch(FormatException) {
+                              DebugPrint
+                                  ("--brt-promotegc-trigger requires argument\r\n");
+                              DebugBreak();
+                          }
+                          break;
+                      }
+                    }
+#endif
+                    continue; // argument loop
+                }
+
+                if(arg == "--brt-nurserysize") {
+#if !SINGULARITY || ADAPTIVE_COPYING_COLLECTOR || SEMISPACE_COLLECTOR
+                    switch(GC.gcType) {
+                      case GCType.AdaptiveCopyingCollector:
+                      case GCType.SemispaceCollector: {
+                          ++i;
+                          if(i==args.Length) {
+                              DebugPrint
+                                  ("--brt-nurserysize requires argument\r\n");
+                              DebugBreak();
+                          }
+
+                          try {
+                              GCs.GenerationalCollector.nurserySize = (UIntPtr)
+                                  UInt64.Parse(args[i]);
+                          } catch(FormatException) {
+                              DebugPrint("--brt-nurserysize-trigger requires argument\r\n");
+                              DebugBreak();
+                          }
+                          break;
+                      }
+                    }
+#endif
+                    continue; // argument loop
+                }
+
+                /*
+                if(arg == "--brt-ssbsize") {
+                    ++i;
+                    if(i==args.Length) {
+                        DebugPrint
+                            ("--brt-ssbsize requires argument\r\n");
+                        DebugBreak();
+                    }
+
+                    try {
+                        SequentialStoreBuffer.??? = Int32.Parse(args[i]);
+                    } catch(FormatException) {
+                        DebugPrint
+                            ("--brt-ssbsize requires argument\r\n");
+                        DebugBreak();
+                    }
+                    continue;
+                }
+                */
+
+                if(arg == "--brt-gctrace-filter") {
+                    ++i;
+                    if(i==args.Length) {
+                        DebugPrint
+                            ("--brt-gctrace-filter requires argument\r\n");
+                        DebugBreak();
+                    }
+
+                    try {
+                        System.GCs.Trace.filter = (UIntPtr)
+                            UInt64.Parse(args[i], System.Globalization.NumberStyles.AllowHexSpecifier);
+                    } catch(FormatException) {
+                        DebugPrint
+                            ("--brt-gctrace-filter requires a hex argument\r\n");
+                        DebugBreak();
+                    }
+                    continue;
+                }
+
+                if(arg == "--brt-gctrace-filter-range") {
+                    i += 2;
+                    if(i >= args.Length) {
+                        DebugPrint
+                            ("--brt-gctrace-filter-range requires two hex arguments\r\n");
+                        DebugBreak();
+                    }
+
+                    try {
+                        System.GCs.Trace.filterLow = (UIntPtr)
+                            UInt64.Parse(args[i-1], System.Globalization.NumberStyles.AllowHexSpecifier);
+                        System.GCs.Trace.filterHigh = (UIntPtr)
+                            UInt64.Parse(args[i], System.Globalization.NumberStyles.AllowHexSpecifier);
+                    } catch(FormatException) {
+                        DebugPrint
+                            ("--brt-gctrace-filter-range requires two hex arguments\r\n");
+                        DebugBreak();
+                    }
+                    continue;
+                }
+
+                if(arg == "--brt-gctrace-filter-area") {
+                    ++i;
+                    if(i >= args.Length) {
+                        DebugPrint
+                            ("--brt-gctrace-filter-area requires hex argument\r\n");
+                        DebugBreak();
+                    }
+
+                    try {
+                        System.GCs.Trace.filterArea = (System.GCs.Trace.Area)
+                            Int32.Parse(args[i], System.Globalization.NumberStyles.AllowHexSpecifier);
+                    } catch(FormatException) {
+                        DebugPrint
+                            ("--brt-gctrace-filter-area requires hex argument\r\n");
+                        DebugBreak();
+                    }
+                    continue;
+                }
+
+                DebugPrint("Unrecognized BRT option: {0}\n", __arglist(arg));
+                DebugBreak();
+            }
+
+            String[] mainArgs = new String[args.Length - i];
+
+            for(int j=0; i<args.Length; ++i, ++j) {
+                mainArgs[j] = args[i];
+            }
+
+            return mainArgs;
+        }
+
+        // This method is modified by Bartok.
+        // It calls profiling dump functions.
+        [RequiredByBartok]
+        [NoInline]
+        private static void Shutdown() {}
+
+        // REVIEW: We need to make sure that this is called for all exit modes.
+        // Right now we have normal exit, exception exit, and Environment.Exit,
+        // but we probably want an OS hook.  Also, nothing important to
+        // shutdown happens here anyway.
+
+#if SINGULARITY
+        private static int hasShutdownStarted = 0;
+#endif
+
+        static public void Shutdown(int exitCode) {
+#if SINGULARITY_KERNEL
+            if (Interlocked.CompareExchange(ref hasShutdownStarted, 1, 0) != 0) {
+                return;
+            }
+            Kernel.Shutdown(exitCode);
+#elif SINGULARITY_PROCESS
+            if (Interlocked.CompareExchange(ref hasShutdownStarted, 1, 0) != 0) {
+                return;
+            }
+            Finalizer.Shutdown();
+#else
+            if(Interlocked.CompareExchange(ref Environment.hasShutdownStarted,
+                                           1, 0) != 0) {
+                return;
+            }
+            Finalizer.Shutdown();
+#endif
+
+            VTable.Shutdown();
+
+            if(VTable.enableDumpMultiUseWords) {
+                MultiUseWord.DumpTables();
+            }
+
+            if(VTable.enableDumpInterface) {
+                if(VTable.interfaceOffsetTable != null) {
+                    foreach(System.Collections.DictionaryEntry d
+                            in VTable.interfaceOffsetTable) {
+                        VTable v = (VTable) d.Key;
+                        foreach(System.Collections.DictionaryEntry d2
+                                in (System.Collections.Hashtable) d.Value) {
+                            RuntimeType ty = (RuntimeType) d2.Key;
+                            MutableInt32 m = (MutableInt32) d2.Value;
+                            int num = m.Value;
+
+                            IntPtr index = interfaceOffset(v, ty);
+
+                            DebugPrint("{0} - {1}: {2}\n",
+                                       __arglist(v.vtableType.FullName,
+                                                 ty.FullName,
+                                                 num));
+                        }
+                    }
+                }
+            }
+
+#if !VC
+            if(VTable.enableDumpTryAllStats) {
+                TryAllCounters.DumpRegisteredCounters();
+            }
+#endif
+
+            int size = handle_counts.Length;
+            if(size > 4) {
+                for(int i = 0; i < size; i++) {
+                    if(handle_counts[i] == 0) {
+                        continue;
+                    }
+                    DebugPrint("{0:d3}: {1}\n", __arglist(i, handle_counts[i]));
+                }
+            }
+            GC.DestructHeap();
+        }
+
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        static public void TerminateByException(Exception e) {
+            RuntimeType rt = (RuntimeType)e.GetType();
+            DebugPrint("\n");
+            DebugPrint("Unhandled Exception ({0}.{1}):\n",
+                       __arglist(rt.Namespace, rt.Name));
+            DebugPrint("  {0}\n", __arglist(e.Message));
+            try {
+                DebugPrint("  {0}\n", __arglist(e.ToString()));
+            } catch(Exception) {
+                try {
+                    DebugPrint("\n   Exception.ToString() failed.\n");
+                } catch (Exception) {
+                }
+            } finally {
+                Shutdown(-2);
+            }
+            DebugBreak();
+        }
+
+        static public void DumpException(Exception e) {
+            RuntimeType rt = (RuntimeType)e.GetType();
+            DebugPrint("Handled Exception ({0}.{1}):\n",
+                       __arglist(rt.Namespace, rt.Name));
+            DebugPrint("  {0}\n", __arglist(e.Message));
+            try {
+                DebugPrint("  {0}\n", __arglist(e.ToString()));
+            } catch(Exception) {
+                try {
+                    DebugPrint("   Exception.ToString() failed.\n");
+                } catch (Exception) {
+                }
+            } finally {
+            }
+        }
+
+        [RequiredByBartok]
+        public static void init(object obj) {
+        }
+    }
+}
diff --git a/base/Kernel/Bartok/WeakReference.cs b/base/Kernel/Bartok/WeakReference.cs
new file mode 100644
index 0000000..0272646
--- /dev/null
+++ b/base/Kernel/Bartok/WeakReference.cs
@@ -0,0 +1,194 @@
+/*******************************************************************/
+/*                           WARNING                               */
+/* This file should be identical in the Bartok and Singularity     */
+/* depots. Master copy resides in Bartok Depot. Changes should be  */
+/* made to Bartok Depot and propagated to Singularity Depot.       */
+/*******************************************************************/
+
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System {
+
+  using Microsoft.Bartok.Runtime;
+  using System.Threading;
+  using System.Runtime.CompilerServices;
+  using System.GCs;
+
+  /// <summary>
+  /// This class implements weak references.
+  /// 
+  /// When a new weak references is allocated it is atomically linked 
+  /// onto a singly linked list of weak references.
+  /// 
+  /// During a garbage collection this chain is traversed and references 
+  /// are updated or cleared.
+  /// 
+  /// There are two modes of processing weak references.
+  /// 
+  ///     1. Ignoring 'Long' References that track resurrection and
+  ///        only updating references that should be cleared when the
+  ///        object is finalized.
+  ///     2. Updating all reference types.
+  ///    
+  /// In any collection at least the second method must be called to 
+  /// ensure no dangling pointers are created.
+  /// 
+  /// BUGBUG: At the moment it is possible to have a weak reference that
+  /// is unlinked from the chain and then resurrected as reachable from 
+  /// a finalizable object!
+  /// </summary>
+  [CCtorIsRunDuringStartup]
+#if !SINGULARITY
+  [Serializable]
+#endif
+  public unsafe class WeakReference {
+
+      /// <summary>
+      /// The dummy head reference to simplify traversal logic.
+      /// </summary>
+      private static readonly WeakReference headRef;
+
+      /// <summary>
+      /// The weak reference to the object
+      /// </summary>
+      private UIntPtr objPtr;
+
+      /// <summary>
+      /// The next reference on the chain.
+      /// </summary>
+      private UIntPtr nextRef;
+
+      /// <summary>
+      /// Does this reference stay alive during finalization of the target?
+      /// </summary>
+      private bool trackResurrection;
+      
+      private WeakReference() {}
+
+      /// <summary>
+      /// Construct a 'Short' weak reference.
+      /// </summary>
+      public WeakReference(Object target) : this(target, false) {}
+
+      /// <summary>
+      /// Construct a weak reference and link it onto the chain, 
+      /// specifying if it is to track an object through finalization.
+      /// </summary>
+      public WeakReference(Object target, bool trackResurrection) {
+          this.Target = target;
+          this.trackResurrection = trackResurrection;
+
+          UIntPtr thisPtr = Magic.addressOf(this);
+          do {
+              this.nextRef = headRef.nextRef;
+          } while (this.nextRef != Interlocked.CompareExchange(
+              ref headRef.nextRef,
+              thisPtr,
+              this.nextRef));
+      }
+
+      /// <summary>
+      /// Is the object alive?
+      /// </summary>
+      public virtual bool IsAlive {
+          get {
+              return this.objPtr != UIntPtr.Zero;
+          }
+      }
+
+      /// <summary>
+      /// Get or set target of the object. Null if the object has been
+      /// collected.
+      /// </summary>
+      public virtual Object Target {
+          get {
+              return Magic.fromAddress(objPtr);
+          }
+          set {
+              this.objPtr = Magic.addressOf(value);
+          }
+      }
+
+      /// <summary>
+      /// Should this reference track objects through finalization?
+      /// </summary>
+      public virtual bool TrackResurrection {
+          get {
+              return trackResurrection;
+          }
+      }
+
+      /// <summary>
+      /// This method performs the processing of weak references for GC.
+      /// 
+      /// It essentially walks a list unlinking weak reference objects 
+      /// that are not live and updating references as necessary.
+      /// </summary>
+      internal static
+      void Process(NonNullReferenceVisitor updateReferenceVisitor,
+                   bool copyFirst, bool ignoreLong)
+      {
+
+          // Head ref is a dummy ref object.
+          WeakReference wr = headRef;
+          
+          while (wr.nextRef != UIntPtr.Zero) {
+              if (ignoreLong) {
+                  WeakReference tmp =
+                      Magic.toWeakReference(Magic.fromAddress(wr.nextRef));
+
+                  if (tmp.trackResurrection) {
+                      wr = tmp;
+                      continue;
+                  }
+                  
+              }
+
+              UIntPtr nextPtr = wr.nextRef;
+
+              fixed (UIntPtr * loc = &wr.nextRef) {
+                  // update the reference 
+                  updateReferenceVisitor.Visit(loc);
+              }
+
+              WeakReference next;
+
+              if (wr.nextRef == UIntPtr.Zero) {
+                  // remove next from the chain and continue
+                  next =
+                      Magic.toWeakReference(Magic.fromAddress(nextPtr));
+                  wr.nextRef = next.nextRef;
+                  continue;
+              }
+
+              // Updating old or new location?
+              if (copyFirst) {
+                  next =
+                      Magic.toWeakReference(Magic.fromAddress(wr.nextRef));
+              } else {
+                  next =
+                      Magic.toWeakReference(Magic.fromAddress(nextPtr));
+              }
+
+              fixed (UIntPtr * loc = &next.objPtr) {
+                  if (*loc != UIntPtr.Zero) {
+                      // Update Reference
+                      updateReferenceVisitor.Visit(loc);
+                  }
+              }
+
+              // Continue
+              wr = next;
+          }
+      }
+
+      /// <summary>
+      /// Class constructor, set up dummy head.
+      /// </summary>
+      static WeakReference() {
+          headRef = new WeakReference();
+      }
+  }
+}
diff --git a/base/Kernel/GC.targets b/base/Kernel/GC.targets
new file mode 100644
index 0000000..9a790f8
--- /dev/null
+++ b/base/Kernel/GC.targets
@@ -0,0 +1,187 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Kernel\GC.targets
+#
+#   Note:
+#
+##############################################################################
+
+This file contains the definitions for selecting the different GC implementations.
+Projects that import this file must set the 'Collector' property to a valid collector
+name before importing this file.
+
+If the 'DefineGCCompileItems' property is set to true, then this target will define
+'Compile' items for the C# source code for the specified GC implementation.
+
+This file will always set the GCDefine name to be the name of the GC, as passed to
+C#, Sing#, C/C++, and assembler files as a preprocessor directive.  If the
+DefineGCCompileItems property is 'true', then the DefineConstants property will be
+updated to include this value.  Other kinds of projects will need to handle
+passing 'GCDefine' to the appropriate preprocessor.
+
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+
+  <ItemGroup Condition="'$(DefineGCCompileItems)'=='true'">
+    <!-- BARTOK_SOURCES -->
+    <Compile Include="Bartok\ArrayHelper.cs" />
+    <Compile Include="Bartok\Headers.cs" />
+    <Compile Include="Bartok\Magic.cs" />
+    <Compile Include="Bartok\MultiUseWord.cs" />
+    <Compile Include="Bartok\Options.cs" />
+    <Compile Include="Bartok\Shared.cs" />
+    <Compile Include="Bartok\VTable.cs" />
+    <Compile Include="System\Runtime\CompilerServices\Attributes.cs" />
+    <Compile Include="System\Security\Attributes.cs" />
+    <Compile Include="System\Threading\SpinLock.cs" />
+    
+    
+    <!-- RUNTIME_SOURCES -->
+    <Compile Include="Bartok\Finalizer.cs" />
+    <Compile Include="Bartok\GC.cs" />
+    <Compile Include="Bartok\StackHeight.cs" />
+    <Compile Include="Bartok\TryAll.cs" />
+    <Compile Include="Bartok\TryAllAttributes.cs" />
+    <Compile Include="Bartok\TryAllException.cs" />
+    <Compile Include="Bartok\WeakReference.cs" />
+
+    <!-- COLLECTOR_SOURCES -->
+    <Compile Include="Bartok\GCs\Allocator.cs" />
+    <Compile Include="Bartok\GCs\BaseCollector.cs" />
+    <Compile Include="Bartok\GCs\BootstrapMemory.cs" />
+    <Compile Include="Bartok\GCs\BumpAllocator.cs" />
+    <Compile Include="Bartok\GCs\CallStack.cs" />
+    <Compile Include="Bartok\GCs\CentralPT.cs" />
+    <Compile Include="Bartok\GCs\Collector.cs" />
+    <Compile Include="Bartok\GCs\CollectorStatistics.cs" />
+    <Compile Include="Bartok\GCs\GCProfiler.cs" />
+    <Compile Include="Bartok\GCs\InteriorPtrTable.cs" />
+    <Compile Include="Bartok\GCs\MemoryAccounting.cs" />
+    <Compile Include="Bartok\GCs\MemoryManager.cs" />
+    <Compile Include="Bartok\GCs\ObjectLayout.cs" />
+    <Compile Include="Bartok\GCs\PageManager.cs" />
+    <Compile Include="Bartok\GCs\PageTable.cs" />
+    <Compile Include="Bartok\GCs\PageType.cs" />
+    <Compile Include="Bartok\GCs\ReferenceVisitor.cs" />
+    <Compile Include="Bartok\GCs\SegregatedFreeList.cs" />
+    <Compile Include="Bartok\GCs\StaticData.cs" />
+    <Compile Include="Bartok\GCs\Trace.cs" />
+    <Compile Include="Bartok\GCs\Transitions.cs" />
+    <Compile Include="Bartok\GCs\UIntPtrQueue.cs" />
+    <Compile Include="Bartok\GCs\UIntPtrStack.cs" />
+    <Compile Include="Bartok\GCs\UnmanagedPageList.cs" />
+    <Compile Include="Bartok\GCs\Util.cs" />
+    <Compile Include="Bartok\GCs\Verifier.cs" />
+    <Compile Include="Bartok\GCs\WriteBarrier.cs" />
+  </ItemGroup>
+  
+
+  <Choose>
+    <When Condition="'$(Collector)'=='AdaptiveCopying'">
+      <PropertyGroup>
+        <GCDefine>ADAPTIVE_COPYING_COLLECTOR</GCDefine>
+        <BARTOK_COLLECTOR>/AdaptiveCopying</BARTOK_COLLECTOR>
+        <GC_CSC_DEFS>ADAPTIVE_COPYING_COLLECTOR</GC_CSC_DEFS>
+        <GC_ML_DEFS>/DWRITEBARRIER_SSB=1</GC_ML_DEFS>
+      </PropertyGroup>
+      <ItemGroup Condition="'$(DefineGCCompileItems)'=='true'">
+        <Compile Include="Bartok\GCs\AdaptiveCopyingCollector.cs" />
+        <Compile Include="Bartok\GCs\AllCardsWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\CardTable.cs" />
+        <Compile Include="Bartok\GCs\CopyScan.cs" />
+        <Compile Include="Bartok\GCs\GenerationalCollector.cs" />
+        <Compile Include="Bartok\GCs\GenerationalWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\OffsetTable.cs" />
+        <Compile Include="Bartok\GCs\RememberedSet.cs" />
+        <Compile Include="Bartok\GCs\SemiSpaceCollector.cs" />
+        <Compile Include="Bartok\GCs\SlidingCollector.cs" />
+        <Compile Include="Bartok\GCs\SequentialStoreBuffer.cs" />
+        <Compile Include="Bartok\GCs\StopTheWorldCollector.cs" />
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Collector)'=='Concurrent'">
+      <PropertyGroup>
+        <GCDefine>CONCURRENT_MS_COLLECTOR</GCDefine>
+        <BARTOK_COLLECTOR>/ConcurrentMSGC</BARTOK_COLLECTOR>
+        <GC_CSC_DEFS>CONCURRENT_MS_COLLECTOR</GC_CSC_DEFS>
+        <GC_ML_DEFS>/DWRITEBARRIER_CMS=1</GC_ML_DEFS>
+      </PropertyGroup>
+      <ItemGroup Condition="'$(DefineGCCompileItems)'=='true'">
+        <Compile Include="Bartok\GCs\ConcurrentMSCollector.cs" />
+        <Compile Include="Bartok\GCs\ThreadHeaderQueue.cs" />
+        <Compile Include="Bartok\GCs\UniversalWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\WriteBarrierCMS.cs" />
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Collector)'=='MarkSweep'">
+      <PropertyGroup>
+        <GCDefine>MARK_SWEEP_COLLECTOR</GCDefine>
+        <BARTOK_COLLECTOR>/MarkSweepGC</BARTOK_COLLECTOR>
+        <GC_CSC_DEFS>MARK_SWEEP_COLLECTOR</GC_CSC_DEFS>
+        <GC_ML_DEFS></GC_ML_DEFS>
+      </PropertyGroup>
+      <ItemGroup Condition="'$(DefineGCCompileItems)'=='true'">
+        <Compile Include="Bartok\GCs\EmptyWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\MarkSweepCollector.cs" />
+        <Compile Include="Bartok\GCs\StopTheWorldCollector.cs" />
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Collector)'=='Semispace'">
+      <PropertyGroup>
+        <GCDefine>SEMISPACE_COLLECTOR</GCDefine>
+        <BARTOK_COLLECTOR>/SemispaceGC</BARTOK_COLLECTOR>
+        <GC_CSC_DEFS>SEMISPACE_COLLECTOR</GC_CSC_DEFS>
+        <GC_ML_DEFS>/DWRITEBARRIER_SSB=1</GC_ML_DEFS>
+      </PropertyGroup>
+      <ItemGroup Condition="'$(DefineGCCompileItems)'=='true'">
+        <Compile Include="Bartok\GCs\SemispaceCollector.cs" />
+        <Compile Include="Bartok\GCs\CardTable.cs" />
+        <Compile Include="Bartok\GCs\CopyScan.cs" />
+        <Compile Include="Bartok\GCs\OffsetTable.cs" />
+        <Compile Include="Bartok\GCs\GenerationalCollector.cs" />
+        <Compile Include="Bartok\GCs\GenerationalWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\AllCardsWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\RememberedSet.cs" />
+        <Compile Include="Bartok\GCs\StopTheWorldCollector.cs" />
+        <Compile Include="Bartok\GCs\SequentialStoreBuffer.cs" />
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Collector)'=='Sliding'">
+      <PropertyGroup>
+        <GCDefine>SLIDING_COLLECTOR</GCDefine>
+        <BARTOK_COLLECTOR>/SlidingGC</BARTOK_COLLECTOR>
+        <GC_CSC_DEFS>SLIDING_COLLECTOR</GC_CSC_DEFS>
+        <GC_ML_DEFS>/DWRITEBARRIER_SSB=1</GC_ML_DEFS>
+      </PropertyGroup>
+      <ItemGroup Condition="'$(DefineGCCompileItems)'=='true'">
+        <Compile Include="Bartok\GCs\SlidingCollector.cs" />
+        <Compile Include="Bartok\GCs\CardTable.cs" />
+        <Compile Include="Bartok\GCs\OffsetTable.cs" />
+        <Compile Include="Bartok\GCs\GenerationalCollector.cs" />
+        <Compile Include="Bartok\GCs\GenerationalWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\AllCardsWriteBarrier.cs" />
+        <Compile Include="Bartok\GCs\RememberedSet.cs" />
+        <Compile Include="Bartok\GCs\StopTheWorldCollector.cs" />
+        <Compile Include="Bartok\GCs\SequentialStoreBuffer.cs" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <!-- 'Collector' not specified. -->
+      <PropertyGroup>
+        <ERROR>The 'Collector' property has not been specified, or is not a recognized value.</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <PropertyGroup Condition="'$(GCDefine)'!=''">
+    <DefineConstants Condition="'$(DefineConstants)'!=''">$(DefineConstants);</DefineConstants>
+    <DefineConstants>$(DefineConstants)$(GCDefine)</DefineConstants>
+  </PropertyGroup>
+  
+</Project>
diff --git a/base/Kernel/Hal.Common.targets b/base/Kernel/Hal.Common.targets
new file mode 100644
index 0000000..fff10e3
--- /dev/null
+++ b/base/Kernel/Hal.Common.targets
@@ -0,0 +1,35 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+
+  <ItemGroup>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\AcpiChecksum.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\AcpiTables.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Dsdt.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Fadt.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Gas.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Madt.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\PMTimer.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Rsdp.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Rsdt.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Ssdt.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\Srat.cs"/>
+    <HAL_ACPI_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Acpi\SystemTableHeader.cs"/>
+    
+    <HAL_COMMON_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Common\HalMemory.cs"/>
+    <HAL_COMMON_SOURCES Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.Common\HalScreen.cs"/>
+    
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.Kernel.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\IoSystem\IoSystem.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Console\Console.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\System.Compiler.Runtime\System.Compiler.Runtime.Kernel.csproj"/>
+  </ItemGroup>
+
+  
+  
+</Project>
diff --git a/base/Kernel/ILHelpers.proj b/base/Kernel/ILHelpers.proj
new file mode 100644
index 0000000..3836d75
--- /dev/null
+++ b/base/Kernel/ILHelpers.proj
@@ -0,0 +1,33 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>ILHelpers</AssemblyName>
+    <OutputType>Library</OutputType>
+    <OutputPath>$(KERNEL_IL_DIR)</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AssemblyOutputPath>$(OutputPath)\$(AssemblyName).dll</AssemblyOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Bartok\ILHelpers.il"/>
+  </ItemGroup>
+
+  <Target Name="BuildILHelpers" Inputs="@(Compile)" Outputs="$(AssemblyOutputPath)"
+          DependsOnTargets="CreateStrongName">
+    <Message Text="Building ILHelpers"/>
+    <MakeDir Directories="$(OutputPath)"/>
+    <Exec Command="$(ILASM) /nologo /quiet /dll /debug /key=$(OutputPath)\public.snk /output=$(AssemblyOutputPath) @(Compile,' ')" />
+  </Target>
+  
+  <Target Name="CreateStrongName" Condition="'$(NoStrongName)'!='true'">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Build\BuildKey.proj"/>
+  </Target>
+
+  <Target Name="Build" DependsOnTargets="BuildILHelpers" Outputs="$(AssemblyOutputPath)">    
+  </Target>
+  
+</Project>
diff --git a/base/Kernel/Kernel.Corlib.csproj b/base/Kernel/Kernel.Corlib.csproj
new file mode 100644
index 0000000..2f70f14
--- /dev/null
+++ b/base/Kernel/Kernel.Corlib.csproj
@@ -0,0 +1,401 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+  <PropertyGroup>
+    <AssemblyName>kernel</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <Language>C#</Language>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoWarn>169,649</NoWarn>
+    <WarningLevel>2</WarningLevel>
+    <DefineConstants>SINGULARITY_KERNEL;ENDPOINT_STRUCT;_NEW_CLASSLOADER</DefineConstants>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>$(KERNEL_IL_DIR)</OutputPath>
+    <NoStdLib>true</NoStdLib>
+    <UseResponseFile>true</UseResponseFile>
+    <ProjectGuid>{FA3325A6-5C21-475E-A600-51AD6163DFAA}</ProjectGuid>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(PAGING)'=='On'">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);PAGING</DefineConstants>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="'$(Scheduler)'=='Affinity'">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);AFFINITY_SCHEDULER</DefineConstants>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <ItemGroup>
+    <Compile Include="System\ApplicationException.cs" />
+    <Compile Include="System\ArgumentException.cs" />
+    <Compile Include="System\ArgumentNullException.cs" />
+    <Compile Include="System\ArgumentOutOfRangeException.cs" />
+    <Compile Include="System\ArithmeticException.cs" />
+    <Compile Include="System\ArrayTypeMismatchException.cs" />
+    <Compile Include="System\DivideByZeroException.cs" />
+    <Compile Include="System\Exception.cs" />
+    <Compile Include="System\FormatException.cs" />
+    <Compile Include="System\IndexOutOfRangeException.cs" />
+    <Compile Include="System\InvalidCastException.cs" />
+    <Compile Include="System\InvalidOperationException.cs" />
+    <Compile Include="System\MulticastNotSupportedException.cs" />
+    <Compile Include="System\NotSupportedException.cs" />
+    <Compile Include="System\NullReferenceException.cs" />
+    <Compile Include="System\ObjectDisposedException.cs" />
+    <Compile Include="System\OutOfMemoryException.cs" />
+    <Compile Include="System\OverflowException.cs" />
+    <Compile Include="System\ProcessStateException.cs" />
+    <Compile Include="System\RankException.cs" />
+    <Compile Include="System\StackOverflowException.cs" />
+    <Compile Include="System\SystemException.cs" />
+    <Compile Include="System\TypeInitializationException.cs" />
+    <Compile Include="System\AttributeUsageAttribute.cs" />
+    <Compile Include="System\CLSCompliantAttribute.cs" />
+    <Compile Include="System\FlagsAttribute.cs" />
+    <Compile Include="System\ObsoleteAttribute.cs" />
+    <Compile Include="System\ParamArrayAttribute.cs" />
+    <Compile Include="System\ArgIterator.cs" />
+    <Compile Include="System\Array.cs" />
+    <Compile Include="System\AsyncCallback.cs" />
+    <Compile Include="System\Attribute.cs" />
+    <Compile Include="System\AttributeTargets.cs" />
+    <Compile Include="System\BitConverter.cs" />
+    <Compile Include="System\Boolean.cs" />
+    <Compile Include="System\Buffer.cs" />
+    <Compile Include="System\Byte.cs" />
+    <Compile Include="System\Char.cs" />
+    <Compile Include="System\CharEnumerator.cs" />
+    <Compile Include="System\Console.cs" />
+    <Compile Include="System\DateTime.cs" />
+    <Compile Include="System\DayOfWeek.cs" />
+    <Compile Include="System\Decimal.cs" />
+    <Compile Include="System\Delegate.cs" />
+    <Compile Include="System\Double.cs" />
+    <Compile Include="System\Empty.cs" />
+    <Compile Include="System\Enum.cs" />
+    <Compile Include="System\Environment.cs" />
+    <Compile Include="System\EventArgs.cs" />
+    <Compile Include="System\EventHandler.cs" />
+    <Compile Include="System\Guid.cs" />
+    <Compile Include="System\IAsyncResult.cs" />
+    <Compile Include="System\ICloneable.cs" />
+    <Compile Include="System\IComparable.cs" />
+    <Compile Include="System\IDisposable.cs" />
+    <Compile Include="System\IFormattable.cs" />
+    <Compile Include="System\Int16.cs" />
+    <Compile Include="System\Int32.cs" />
+    <Compile Include="System\Int64.cs" />
+    <Compile Include="System\IntPtr.cs" />
+    <Compile Include="System\Internal.cs" />
+    <Compile Include="System\Math.cs" />
+    <Compile Include="System\MulticastDelegate.cs" />
+    <Compile Include="System\Number.cs" />
+    <Compile Include="System\Object.cs" />
+    <Compile Include="System\ParseNumbers.cs" />
+    <Compile Include="System\ProcessExitCode.cs" />
+    <Compile Include="System\Random.cs" />
+    <Compile Include="System\RuntimeArgumentHandle.cs" />
+    <Compile Include="System\RuntimeFieldHandle.cs" />
+    <Compile Include="System\RuntimeMethodHandle.cs" />
+    <Compile Include="System\RuntimeType.cs" />
+    <Compile Include="System\RuntimeTypeHandle.cs" />
+    <Compile Include="System\SchedulerTime.cs" />
+    <Compile Include="System\SByte.cs" />
+    <Compile Include="System\Single.cs" />
+    <Compile Include="System\String.cs" />
+    <Compile Include="System\Text\StringBuilder.cs" />
+    <Compile Include="System\TimeSpan.cs" />
+    <Compile Include="System\Type.cs" />
+    <Compile Include="System\TypeCode.cs" />
+    <Compile Include="System\TypedReference.cs" />
+    <Compile Include="System\UInt16.cs" />
+    <Compile Include="System\UInt32.cs" />
+    <Compile Include="System\UInt64.cs" />
+    <Compile Include="System\UIntPtr.cs" />
+    <Compile Include="System\ValueType.cs" />
+    <Compile Include="System\VarargList.cs" />
+    <Compile Include="System\Version.cs" />
+    <Compile Include="System\Void.cs" />
+    <Compile Include="System\_LocalDataStore.cs" />
+    <Compile Include="System\_LocalDataStoreMgr.cs" />
+    <Compile Include="$(SINGULARITY_ROOT)\Libraries\Crypto\MD5.cs" />
+    <!-- THREADING_SOURCES -->
+    <Compile Include="System\Threading\AutoResetEvent.cs" />
+    <Compile Include="System\Threading\HandleCreateException.cs" />
+    <Compile Include="System\Threading\Interlocked.cs" />
+    <Compile Include="System\Threading\ManualResetEvent.cs" />
+    <Compile Include="System\Threading\Monitor.cs" />
+    <Compile Include="System\Threading\Mutex.cs" />
+    <Compile Include="System\Threading\SmartSpinlock.cs" />
+    <Compile Include="System\Threading\SynchronizationLockException.cs" />
+    <Compile Include="System\Threading\Thread.cs" />
+    <Compile Include="System\Threading\ThreadLocalServiceRequest.cs" />
+    <Compile Include="System\Threading\ThreadStart.cs" />
+    <Compile Include="System\Threading\ThreadState.cs" />
+    <Compile Include="System\Threading\ThreadStateException.cs" />
+    <Compile Include="System\Threading\Timeout.cs" />
+    <Compile Include="System\Threading\WaitHandle.cs" />
+    <Compile Include="Singularity\Scheduling\ListNode.cs" />
+    <Compile Include="Singularity\Scheduling\Scheduler.cs" />
+    <Compile Include="Singularity\Scheduling\ThreadEntry.cs" />
+    <Compile Include="Singularity\Scheduling\ThreadQueue.cs" />
+    <Compile Include="Singularity\Scheduling\Min\MinScheduler.cs" Condition="'$(Scheduler)'!='Affinity'" />
+    <Compile Include="Singularity\Scheduling\Affinity\AffinityScheduler.cs" Condition="'$(Scheduler)'=='Affinity'" />
+    <Compile Include="System\Collections\ArrayList.cs" />
+    <Compile Include="System\Collections\BitArray.cs" />
+    <Compile Include="System\Collections\CaseInsensitiveComparer.cs" />
+    <Compile Include="System\Collections\CaseInsensitiveHashCodeProvider.cs" />
+    <Compile Include="System\Collections\CollectionBase.cs" />
+    <Compile Include="System\Collections\Comparer.cs" />
+    <Compile Include="System\Collections\DictionaryBase.cs" />
+    <Compile Include="System\Collections\DictionaryEntry.cs" />
+    <Compile Include="System\Collections\Hashtable.cs" />
+    <Compile Include="System\Collections\ICollection.cs" />
+    <Compile Include="System\Collections\IComparer.cs" />
+    <Compile Include="System\Collections\IDictionary.cs" />
+    <Compile Include="System\Collections\IDictionaryEnumerator.cs" />
+    <Compile Include="System\Collections\IEnumerable.cs" />
+    <Compile Include="System\Collections\IEnumerator.cs" />
+    <Compile Include="System\Collections\IHashCodeProvider.cs" />
+    <Compile Include="System\Collections\IList.cs" />
+    <Compile Include="System\Collections\Queue.cs" />
+    <Compile Include="System\Collections\ReadOnlyCollectionBase.cs" />
+    <Compile Include="System\Collections\SortedList.cs" />
+    <Compile Include="System\Collections\Stack.cs" />
+    <Compile Include="System\Collections\Specialized\ListDictionary.cs" />
+    <Compile Include="System\Collections\Specialized\StringDictionary.cs" />
+    <Compile Include="System\Diagnostics\Assert.cs" />
+    <Compile Include="System\Diagnostics\AssertFilter.cs" />
+    <Compile Include="System\Diagnostics\AssertFilters.cs" />
+    <Compile Include="System\Diagnostics\ConditionalAttribute.cs" />
+    <Compile Include="System\Diagnostics\Debug.cs" />
+    <Compile Include="System\Diagnostics\DebuggerAttributes.cs" />
+    <Compile Include="System\Reflection\Assembly.cs" />
+    <Compile Include="System\Reflection\AssemblyAttributes.cs" />
+    <Compile Include="System\Reflection\AssemblyName.cs" />
+    <Compile Include="System\Reflection\AssemblyReflectionAttributes.cs" />
+    <Compile Include="System\Reflection\DefaultMemberAttribute.cs" />
+    <Compile Include="System\Reflection\Module.cs" />
+    <Compile Include="System\Reflection\TypeAttributes.cs" />
+    <Compile Include="System\Globalization\CharacterInfo.cs" />
+    <Compile Include="System\Globalization\CompareInfo.cs" />
+    <Compile Include="System\Globalization\CultureInfo.cs" />
+    <Compile Include="System\Globalization\NumberFormatInfo.cs" />
+    <Compile Include="System\Globalization\NumberStyles.cs" />
+    <Compile Include="System\Globalization\TextInfo.cs" />
+    <Compile Include="System\Globalization\UnicodeCategory.cs" />
+    <Compile Include="System\Text\ASCIIEncoding.cs" />
+    <Compile Include="System\Text\Decoder.cs" />
+    <Compile Include="System\Text\Encoder.cs" />
+    <Compile Include="System\Text\Encoding.cs" />
+    <Compile Include="System\Text\UnicodeEncoding.cs" />
+    <Compile Include="System\Text\UTF8Encoding.cs" />
+    <Compile Include="System\Text\RegularExpressions\regex.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexboyermoore.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcapture.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcapturecollection.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcharclass.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcode.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexcompilationinfo.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexfcd.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexgroup.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexgroupcollection.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexinterpreter.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexmatch.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexmatchcollection.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexnode.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexoptions.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexparser.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexreplacement.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexrunner.cs" />
+    <Compile Include="System\Text\RegularExpressions\regextree.cs" />
+    <Compile Include="System\Text\RegularExpressions\regexwriter.cs" />
+    <Compile Include="System\Runtime\CompilerServices\DecimalConstantAttribute.cs" />
+    <Compile Include="System\Runtime\CompilerServices\IndexerNameAttribute.cs" />
+    <Compile Include="System\Runtime\CompilerServices\IsVolatile.cs" />
+    <Compile Include="System\Runtime\CompilerServices\MethodImplAttribute.cs" />
+    <Compile Include="System\Runtime\CompilerServices\RuntimeHelpers.cs" />
+    <Compile Include="System\Runtime\InteropServices\Attributes.cs" />
+    <Compile Include="System\Runtime\InteropServices\CharSet.cs" />
+    <Compile Include="System\Runtime\InteropServices\GCHandle.cs" />
+    <Compile Include="System\Runtime\InteropServices\LayoutKind.cs" />
+    <Compile Include="System\Runtime\InteropServices\Marshal.cs" />
+    <!-- ABI_ORIGINAL_SOURCES -->
+    <Compile Include="Singularity\V1\Processes\ProcessHandle.cs" />
+    <Compile Include="Singularity\V1\Security\PrincipalHandle.cs" />
+    <Compile Include="Singularity\V1\Services\ChannelService.cs" />
+    <Compile Include="Singularity\V1\Services\DebugService.cs" />
+    <Compile Include="Singularity\V1\Services\DeviceService.cs" />
+    <Compile Include="Singularity\V1\Services\PageTableService.cs" />
+    <Compile Include="Singularity\V1\Services\ProcessService.cs" />
+    <Compile Include="Singularity\V1\Services\SharedHeapService.cs" />
+    <Compile Include="Singularity\V1\Services\StackService.cs" />
+    <Compile Include="Singularity\V1\Stress\StressDirect.cs" />
+    <Compile Include="Singularity\V1\Threads\AutoResetEventHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\ContainerHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\InterruptHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\ManualResetEventHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\MutexHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\SyncHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\ThreadHandle.cs" />
+    <Compile Include="Singularity\V1\Threads\ThreadState.cs" />
+    <Compile Include="Singularity\V1\Types\SystemType.cs" />
+    <!-- Channels -->
+    <Compile Include="Singularity\Channels\ChannelClosedException.cs" />
+    <Compile Include="Singularity\Channels\ChannelException.cs" />
+    <Compile Include="Singularity\Channels\ChannelTransferredException.cs" />
+    <Compile Include="Singularity\Channels\ClaimsAttribute.cs" />
+    <Compile Include="Singularity\Channels\EndpointCore.cs" />
+    <Compile Include="Singularity\Channels\ISelectable.sg" />
+    <Compile Include="Singularity\Channels\ITracked.cs" />
+    <Compile Include="Singularity\Channels\RuntimeSystemType.cs" />
+  <!-- HAL_SOURCES -->
+    <Compile Include="Singularity\Hal\IHalMemory.cs" />
+  <!-- IO_SOURCES -->
+    <Compile Include="Singularity\Io\Access.cs" />
+    <Compile Include="Singularity\Io\ByteOrder.cs" />
+    <Compile Include="Singularity\Io\Error.cs" />
+    <Compile Include="Singularity\Io\FileImage.cs" />
+    <Compile Include="Singularity\Io\IoConfig.cs" />
+    <Compile Include="Singularity\Io\IoMemory.cs" />
+    <Compile Include="Singularity\Io\IoResult.cs" />
+    <Compile Include="Singularity\Io\Resources.cs" />
+    <Compile Include="Singularity\Io\IReadOnlyRegister16.cs" />
+    <Compile Include="Singularity\Io\IReadOnlyRegister32.cs" />
+    <Compile Include="Singularity\Io\IReadOnlyRegister8.cs" />
+    <Compile Include="Singularity\Io\IReadWriteRegister16.cs" />
+    <Compile Include="Singularity\Io\IReadWriteRegister32.cs" />
+    <Compile Include="Singularity\Io\IReadWriteRegister8.cs" />
+    <Compile Include="Singularity\Io\IWriteOnlyRegister16.cs" />
+    <Compile Include="Singularity\Io\IWriteOnlyRegister32.cs" />
+    <Compile Include="Singularity\Io\IWriteOnlyRegister8.cs" />
+    <Compile Include="Singularity\Io\IoDma.cs" />
+    <Compile Include="Singularity\Io\IoDmaRange.cs" />
+    <Compile Include="Singularity\Io\IoIrqRange.cs" />
+    <Compile Include="Singularity\Io\IoMemoryRange.cs" />
+    <Compile Include="Singularity\Io\IoPort.cs" />
+    <Compile Include="Singularity\Io\IoPortRange.cs" />
+    <Compile Include="Singularity\Io\IoRange.cs" />
+    <Compile Include="Singularity\Io\PnpConfig.cs" />
+    <Compile Include="Singularity\Io\PciConfig.cs" />
+    <Compile Include="Singularity\Io\ReadOnlyMemoryRegister16.cs" />
+    <Compile Include="Singularity\Io\ReadOnlyMemoryRegister32.cs" />
+    <Compile Include="Singularity\Io\ReadOnlyMemoryRegister8.cs" />
+    <Compile Include="Singularity\Io\ReadOnlyPortRegister16.cs" />
+    <Compile Include="Singularity\Io\ReadOnlyPortRegister32.cs" />
+    <Compile Include="Singularity\Io\ReadOnlyPortRegister8.cs" />
+    <Compile Include="Singularity\Io\ReadWriteMemoryRegister16.cs" />
+    <Compile Include="Singularity\Io\ReadWriteMemoryRegister32.cs" />
+    <Compile Include="Singularity\Io\ReadWriteMemoryRegister8.cs" />
+    <Compile Include="Singularity\Io\ReadWritePortRegister16.cs" />
+    <Compile Include="Singularity\Io\ReadWritePortRegister32.cs" />
+    <Compile Include="Singularity\Io\ReadWritePortRegister8.cs" />
+    <Compile Include="Singularity\Io\ResourceAttributes.cs" />
+    <Compile Include="Singularity\Io\CategoryAttributes.cs" />
+    <Compile Include="Singularity\Io\WriteOnlyMemoryRegister16.cs" />
+    <Compile Include="Singularity\Io\WriteOnlyMemoryRegister32.cs" />
+    <Compile Include="Singularity\Io\WriteOnlyMemoryRegister8.cs" />
+    <Compile Include="Singularity\Io\WriteOnlyPortRegister16.cs" />
+    <Compile Include="Singularity\Io\WriteOnlyPortRegister32.cs" />
+    <Compile Include="Singularity\Io\WriteOnlyPortRegister8.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <!-- LOADER_SOURCES -->
+    <Compile Include="Singularity\Loader\DirectoryEntry.cs" />
+    <Compile Include="Singularity\Loader\ExportTable.cs" />
+    <Compile Include="Singularity\Loader\ImportTable.cs" />
+    <Compile Include="Singularity\Loader\BadImageFormatException.cs" />
+    <Compile Include="Singularity\Loader\PEImage.cs" />
+    <Compile Include="Singularity\Loader\Relocations.cs" />
+    <Compile Include="Singularity\Loader\SectionHeader.cs" />
+    <!-- MEMORY_SOURCES -->
+    <Compile Include="Singularity\Memory\AddressSpace.cs" />
+    <Compile Include="Singularity\Memory\FlatPages.cs" />
+    <Compile Include="Singularity\Memory\HandleTable.cs" />
+    <Compile Include="Singularity\Memory\MemoryManager.cs" />
+    <Compile Include="Singularity\Memory\PhysicalAddress.cs" />
+    <Compile Include="Singularity\Memory\PhysicalHeap.cs" />
+    <Compile Include="Singularity\Memory\PhysicalPages.cs" />
+    <Compile Include="Singularity\Memory\SharedHeap.cs" />
+    <Compile Include="Singularity\Memory\Stacks.cs" />
+    <Compile Include="Singularity\Memory\VMManager.cs" />
+    <Compile Include="Singularity\Memory\VirtualMemoryRange.cs" />
+    <Compile Include="Singularity\Security\SecurityAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(Machine)'=='x86'">
+    <Compile Include="Singularity\X86\CR0.cs" />
+    <Compile Include="Singularity\X86\CR3.cs" />
+    <Compile Include="Singularity\X86\CR4.cs" />
+    <Compile Include="Singularity\X86\EFlags.cs" />
+    <Compile Include="Singularity\X86\EVectors.cs" />
+    <Compile Include="Singularity\X86\Fpcw.cs" />
+    <Compile Include="Singularity\X86\Fpsw.cs" />
+    <Compile Include="Singularity\X86\Gdt.cs" />
+    <Compile Include="Singularity\X86\Idt.cs" />
+    <Compile Include="Singularity\X86\MmxContext.cs" />
+    <Compile Include="Singularity\X86\Pdt.cs" />
+    <Compile Include="Singularity\X86\ProcessorContext.cs" />
+    <Compile Include="Singularity\X86\ThreadContext.cs" />
+    <Compile Include="Singularity\X86\Tss.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Singularity\Xml\XmlReader.cs" />
+    <Compile Include="Singularity\Xml\XmlNode.cs" />
+    <Compile Include="Singularity\Xml\XmlException.cs" />
+    <Compile Include="Singularity\MpBootInfo.cs" />
+    <Compile Include="Singularity\MpBootStatus.cs" />
+    <Compile Include="Singularity\DebugStub.cs" />
+    <Compile Include="Singularity\BootInfo.cs" />
+    <Compile Include="Singularity\CpuInfo.cs" />
+    <Compile Include="Singularity\Kernel.cs" />
+    <Compile Include="Singularity\MpExecution.cs" />
+    <Compile Include="Singularity\PerfCounters.cs" />
+    <Compile Include="Singularity\Process.cs" />
+    <Compile Include="Singularity\ProcessStart.cs" />
+    <Compile Include="Singularity\ProcessState.cs" />
+    <Compile Include="Singularity\ProcessStopException.cs" />
+    <Compile Include="Singularity\ProcessUncaughtException.cs" />
+    <Compile Include="Singularity\Processor.cs" />
+    <Compile Include="Singularity\ProtectionDomain.cs" />
+    <Compile Include="Singularity\ServiceRequest.cs" />
+    <Compile Include="Singularity\ServiceRequestQueue.cs" />
+    <Compile Include="Singularity\ServiceThread.cs" />
+    <Compile Include="Singularity\SharedHeapWalker.cs" />
+    <Compile Include="Singularity\SmapInfo.cs" />
+    <Compile Include="Singularity\SystemClock.cs" />
+    <Compile Include="Singularity\Tracing.cs" />
+    <Compile Include="Singularity\Monitoring.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Drivers\Drivers.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Diagnostics\Diagnostics.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\IoSystem\IoSystem.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Console\Console.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Hal\Hal.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Loader\Loader.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\NVidiaDrivers\NVidiaDrivers.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Directory\Directory.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Stress\Stress.csproj" />
+    <ProjectReference Include="ILHelpers.proj" />
+  </ItemGroup>
+  <PropertyGroup>
+    <Collector>$(COLLECTOR_KERNEL)</Collector>
+    <DefineGCCompileItems>true</DefineGCCompileItems>
+  </PropertyGroup>
+  <Import Project="GC.targets" />
+  <Import Project="$(SINGULARITY_ROOT)\Targets\SingSharp.targets" />
+</Project>
diff --git a/base/Kernel/Kernel.proj b/base/Kernel/Kernel.proj
new file mode 100644
index 0000000..e3017c2
--- /dev/null
+++ b/base/Kernel/Kernel.proj
@@ -0,0 +1,522 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <PropertyGroup>
+    <SDIZEPDB>sdizepdb</SDIZEPDB>
+    <AFLAGS>$(AFLAGS)</AFLAGS>
+    <CFLAGS>$(CFLAGS) /Gr /Oi /I..\boot\include /I..\Windows\Inc /I$(KERNEL_NATIVE_DIR) /I$(SINGULARITY_ROOT)\boot\include -UDEBUG</CFLAGS>
+    <ACFLAGS>$(ACFLAGS) /DSINGULARITY=1 /DSINGULARITY_KERNEL=1 /I$(KERNEL_NATIVE_DIR)</ACFLAGS>
+    <ACFLAGS Condition="'$(SINGULARITY_MP)'=='true'">$(ACFLAGS) /DSINGULARITY_MP=1</ACFLAGS>
+    <ACFLAGS Condition="'$(PAGING)'=='On'">$(ACFLAGS) /DPAGING</ACFLAGS>
+    <LFLAGS>$(LINKFLAGS) /nodefaultlib /subsystem:native /OPT:REF /RELEASE /DLL </LFLAGS>
+    <KPRIDIR>$(KERNEL_NATIVE_DIR)\obj</KPRIDIR>
+    <KERNEL_BARTOK_LOG>&gt;$(KERNEL_NATIVE_DIR)\kernel.log</KERNEL_BARTOK_LOG>
+    <LBASEFLAGS>/fixed /map /base:0x310000</LBASEFLAGS>
+    <LENTRYFLAGS>/entry:Hal</LENTRYFLAGS>
+    <Collector>$(COLLECTOR_KERNEL)</Collector>
+
+    <DEFAULT_SYSCALL_BUILDER>$(BUILDDIR)\SyscallBuilder.exe</DEFAULT_SYSCALL_BUILDER>
+    <SYSCALL_BUILDER Condition="'$(SYSCALL_BUILDER)'==''">$(DEFAULT_SYSCALL_BUILDER)</SYSCALL_BUILDER>
+  </PropertyGroup>
+
+
+  <!-- Importing GC.targets gets us GC_ML_DEFS, and BARTOK_COLLECTOR. -->
+  <Import Project="GC.targets"/>
+
+  <PropertyGroup>
+    <BartokFlags>$(BartokFlags) /Singularity</BartokFlags>
+    <BartokFlags>$(BartokFlags) /verbosity:silence</BartokFlags>
+    <BartokFlags>$(BartokFlags) /LinkedStacksRequireExternalBound=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /LinkedStacksDumpBounds=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /BackEndComments=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /GCInlineAllocations=false</BartokFlags>
+    <BartokFlags>$(BartokFlags) /GCInlineWriteBarrier=false</BartokFlags>
+    <BartokFlags>$(BartokFlags) /GenAsmHeader="$(KERNEL_NATIVE_DIR)\halclass.inc"</BartokFlags>
+    <BartokFlags>$(BartokFlags) /GenCppHeader="$(KERNEL_NATIVE_DIR)\halclass.h"</BartokFlags>
+    <BartokFlags>$(BartokFlags) /OmitFramePointer=false</BartokFlags>
+    <BartokFlags>$(BartokFlags) /DebugInline=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /UnnameTracedPtrs=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /Warnings=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /WholeProgram=true</BartokFlags>
+    <BartokFlags>$(BartokFlags) /GenCoffLineNumber=false</BartokFlags>
+
+    <BartokFlags Condition="'$(Configuration)'=='Prototype'">$(BartokFlags) /IrSimpleInliner=false</BartokFlags>
+
+    <!--
+    <BartokFlags>&gt; $(KERNEL_NATIVE_DIR)\kernel.log</BartokFlags>
+    -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Collector>$(COLLECTOR_KERNEL)</Collector>
+    <NativeImageName>kernel</NativeImageName>
+    <EnableOutputLog>false</EnableOutputLog>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AbiCandidatesFile>$(KERNEL_NATIVE_DIR)\Singularity.V1.candidates</AbiCandidatesFile>
+    <KernelObjPath>$(KERNEL_NATIVE_DIR)\kernel.obj</KernelObjPath>
+
+    <NativeLibPath>$(KERNEL_NATIVE_DIR)\native.lib</NativeLibPath>
+  </PropertyGroup>
+
+
+  <!-- HAL -->
+  <Choose>
+    <When Condition="'$(Platform)'=='ApicPC'">
+      <PropertyGroup>
+        <HalProject>$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.ApicPC.csproj</HalProject>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Platform)'=='ApicMP'">
+      <PropertyGroup>
+        <HalProject>$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.ApicMP.csproj</HalProject>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Platform)'=='LegacyPC'">
+      <PropertyGroup>
+        <HalProject>$(SINGULARITY_ROOT)\Kernel\Singularity.Hal.LegacyPC.csproj</HalProject>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>The value '$(Platform)' is not a valid choice for the Platform property.</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <Choose>
+    <When Condition="'$(Machine)'=='x86'">
+      <PropertyGroup>
+        <BartokFlags>$(BartokFlags) /SymbolicDebug=true</BartokFlags>
+        <BartokFlags>$(BartokFlags) /LinkedStacks=true</BartokFlags>
+        <NativeSrcDir>Native</NativeSrcDir>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+  <ItemGroup Condition="'$(PAGING)'=='On'">
+    <KernelObj Include="$(KERNEL_NATIVE_DIR)\sysentry.obj"/>
+  </ItemGroup>
+  <PropertyGroup Condition="'$(PAGING)'=='On'">
+    <LinkKernelDependsOn>$(LinkKernelDependsOn);sysentry_obj</LinkKernelDependsOn>
+    <BuildDependsOn>$(BuildDependsOn);LinkSyscallsDll</BuildDependsOn>
+  </PropertyGroup>
+
+
+  <!-- ##################################### TARGETS ############################################ -->
+
+  <Target Name="Build" DependsOnTargets="
+          BuildDependentProjects;
+          BuildKernelManifest;
+          LinkKernel;
+          BuildKernelDmp;
+          LinkTestApp;
+          BuildTestPeManifest;
+          $(BuildDependsOn);
+          ">
+  </Target>
+
+  <!-- These items are the IL assemblies that form the managed part of the kernel. -->
+  <ItemGroup>
+    <ProjectReference Include="Kernel.Corlib.csproj" />
+    <ProjectReference Include="System.Compiler.Runtime\System.Compiler.Runtime.Kernel.csproj" />
+    <ProjectReference Include="ILHelpers.proj" />
+    <ProjectReference Include="SingSharp.Runtime\Microsoft.SingSharp.Runtime.Kernel.csproj" />
+    <ProjectReference Include="Singularity.Diagnostics\Diagnostics.csproj" />
+    <ProjectReference Include="Singularity.Loader\Loader.csproj" />
+    <ProjectReference Include="Singularity.Directory\Directory.csproj" />
+    <ProjectReference Include="Singularity.Stress\Stress.csproj" />
+    <ProjectReference Include="Singularity.Io\IoSystem.csproj" />
+    <ProjectReference Include="Singularity.Drivers\KernelDrivers.csproj" />
+    <ProjectReference Include="Singularity.Security\Security.csproj" />
+    <ProjectReference Include="Singularity.Security\Service\SecurityService.csproj" />
+    <ProjectReference Include="$(HalProject)" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Stress.Contracts\Stress.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.Kernel.csproj" />
+
+    <!-- Reference project to copy the DLL, then reference it -->
+    <ProjectReference Include="Singularity.Drivers\NVidia_MSIL\KernelDriversNVidia_MSIL.csproj" />
+    <Reference        Include="$(KERNEL_IL_DIR)\NVidiaDrivers.dll" />
+  </ItemGroup>
+
+  <Target Name="BuildDependentProjects">
+    <MSBuild Projects="@(ProjectReference)" StopOnFirstFailure="$(StopOnFirstFailure)">
+      <Output ItemName="Reference" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+  </Target>
+
+  <Target Name="BuildKernelManifest"
+          Inputs="@(Reference)"
+          Outputs="$(KERNEL_NATIVE_DIR)\kernel.manifest"
+          DependsOnTargets="BuildDependentProjects">
+    <Message Text="Building kernel.manifest" />
+    <MakeDir Directories="$(KERNEL_NATIVE_DIR)"/>
+    <Exec Command="$(BUILDDIR)\mkmani /out:$(KERNEL_NATIVE_DIR)\kernel.manifest /app:kernel /cache:$(BASEDIR) @(Reference,' ')" />
+  </Target>
+
+
+  <Target Name="BuildAbiCandidates"
+          Inputs="$(KernelObjPath);$(NativeLibPath)"
+          Outputs="$(AbiCandidatesFile)"
+          DependsOnTargets="CompileKernelObj;BuildNativeLib">
+    <Message Text="Building Singularity.V1.candidates" />
+    <Exec Command="abi2def.cmd /version 1 /def $(AbiCandidatesFile) $(KernelObjPath) $(NativeLibPath)" />
+  </Target>
+
+
+  <!-- This target links a dummy version of the PE/COFF kernel. -->
+  <Target Name="LinkDummyKernel"
+          Outputs="$(KERNEL_NATIVE_DIR)\dummykernel.x86"
+          Inputs="$(KERNEL_NATIVE_DIR)\kernel.obj;$(NativeLibPath);linkdate.cpp;$(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE);dummysysentry.cpp"
+          DependsOnTargets="CompileKernelObj;BuildNativeLib;BuildAbiLib">
+    <Message Text="Building dummy kernel native .obj"/>
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /Fo$(KERNEL_NATIVE_DIR)\dummysysentry.obj /Fd$(KERNEL_NATIVE_DIR)\dummysysentry.pdb /c dummysysentry.cpp" />
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /Fo$(KERNEL_NATIVE_DIR)\linkdate.obj /Fd$(KERNEL_NATIVE_DIR)\linkdate.pdb /c linkdate.cpp" />
+    <Exec Command="$(LINK) /out:$(KERNEL_NATIVE_DIR)\dummykernel.x86 /def:$(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE) /pdb:$(KERNEL_NATIVE_DIR)\dummykernel.x86.pdb $(LFLAGS) /fixed /map /base:0x310000 $(LENTRYFLAGS) $(NativeLibPath) $(KERNEL_NATIVE_DIR)\linkdate.obj $(KERNEL_NATIVE_DIR)\kernel.obj $(KERNEL_NATIVE_DIR)\dummysysentry.obj $(KERNEL_NATIVE_DIR)\kernel_superObj.obj" />
+
+    <Exec Command="$(SDIZEPDB) /t:$(KERNEL_NATIVE_DIR)\kernel.txt $(KERNEL_NATIVE_DIR)\dummykernel.x86.pdb"
+          IgnoreExitCode="true"
+          Condition="'$(EnableSdize)'=='true'"/>
+  </Target>
+
+  <!-- This target dumps the export symbols of the dummy kernel. -->
+  <Target Name="CreateSyscallsSources"
+          Inputs="$(KERNEL_NATIVE_DIR)\dummykernel.x86"
+          Outputs="
+          $(KERNEL_NATIVE_DIR)\dummykernel.dumpbin;
+          $(KERNEL_NATIVE_DIR)\syscalls.h;
+          $(KERNEL_NATIVE_DIR)\syscalls.cpp;
+          $(KERNEL_NATIVE_DIR)\sysentry.cpp;
+          "
+          DependsOnTargets="LinkDummyKernel">
+    <Message Text="Dumping export symbols of dummy kernel"/>
+    <Exec Command="$(BUILDDIR)\dumpbin.exe /exports $(KERNEL_NATIVE_DIR)\dummykernel.x86 &gt; $(KERNEL_NATIVE_DIR)\dummykernel.dumpbin" />
+    <Exec Command="$(SYSCALL_BUILDER) /genhdr &lt; $(KERNEL_NATIVE_DIR)\dummykernel.dumpbin &gt; $(KERNEL_NATIVE_DIR)\syscalls.h" />
+    <Exec Command="$(SYSCALL_BUILDER) /genlib &lt; $(KERNEL_NATIVE_DIR)\dummykernel.dumpbin &gt; $(KERNEL_NATIVE_DIR)\syscalls.cpp" />
+    <Exec Command="$(SYSCALL_BUILDER) /genentry &lt; $(KERNEL_NATIVE_DIR)\dummykernel.dumpbin &gt; $(KERNEL_NATIVE_DIR)\sysentry.cpp"/>
+  </Target>
+
+
+  <Target Name="sysentry_obj"
+          Inputs="$(KERNEL_NATIVE_DIR)\sysentry.cpp;$(KERNEL_NATIVE_DIR)\syscalls.h"
+          Outputs="$(KERNEL_NATIVE_DIR)\sysentry.obj"
+          DependsOnTargets="CreateSyscallsSources">
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /Fo$(KERNEL_NATIVE_DIR)\sysentry.obj /Fd$(KERNEL_NATIVE_DIR)\sysentry.pdb /c $(KERNEL_NATIVE_DIR)\sysentry.cpp" />
+  </Target>
+
+  <Target Name="CompileRing3HalstackAsm"
+          Inputs="$(NativeSrcDir)\ring3_halstack.asm;$(KERNEL_NATIVE_DIR)\halclass.h"
+          Outputs="$(KERNEL_NATIVE_DIR)\ring3_halstack.obj"
+          DependsOnTargets="CompileKernelObj"
+          >
+    <Exec Command="$(AS) $(AFLAGS) $(ACFLAGS) /c /Fo$(KERNEL_NATIVE_DIR)\ring3_halstack.obj $(NativeSrcDir)\ring3_halstack.asm"/>
+  </Target>
+
+
+  <Target Name="CompileSyscallsObj"
+          Inputs="$(KERNEL_NATIVE_DIR)\syscalls.cpp;$(KERNEL_NATIVE_DIR)\syscalls.h"
+          Outputs="$(KERNEL_NATIVE_DIR)\syscalls.obj"
+          DependsOnTargets="CreateSyscallsSources">
+    <Exec Command="$(CC) /c $(CFLAGS) $(ACFLAGS) /Fd$(KERNEL_NATIVE_DIR)\syscalls.pdb /Fo$(KERNEL_NATIVE_DIR)\syscalls.obj $(KERNEL_NATIVE_DIR)\syscalls.cpp" />
+    <!--    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /LD /Fd$(KERNEL_NATIVE_DIR)\syscalls.pdb $(KERNEL_NATIVE_DIR)\syscalls.cpp /link /out:$(KERNEL_NATIVE_DIR)\syscalls.dll /NODEFAULTLIB /NOENTRY $(KERNEL_NATIVE_DIR)\kernel.lib" /> -->
+  </Target>
+
+  <ItemGroup>
+    <SyscallsObj Include="$(KERNEL_NATIVE_DIR)\syscalls.obj"/>
+    <SyscallsObj Include="$(KERNEL_NATIVE_DIR)\kernel.lib"/>
+    <SyscallsObj Include="$(KERNEL_NATIVE_DIR)\ring3_halstack.obj"/>
+  </ItemGroup>
+
+  <Target Name="LinkSyscallsDll"
+          Inputs="@(SyscallsObj)"
+          Outputs="$(KERNEL_NATIVE_DIR)\syscalls.dll"
+          DependsOnTargets="CompileSyscallsObj;LinkKernel;CompileRing3HalstackAsm"
+          >
+    <Exec Command="$(LINK) $(LFLAGS) /DLL /NOENTRY /MAP /out:$(KERNEL_NATIVE_DIR)\syscalls.dll /NODEFAULTLIB /pdb:$(KERNEL_NATIVE_DIR)\syscalls.dll.pdb /EXPORT:&quot;?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ&quot; /EXPORT:&quot;?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ&quot; @(SyscallsObj,' ')"/>
+
+  </Target>
+
+
+
+  <!--
+######################################
+# haryadi - - generating abi stubs
+
+genabistub: $(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin \
+            Singularity\BspAbiStub.cs \
+            $(KERNEL_NATIVE_DIR)\MpSyscalls.x86
+-->
+  <Target Name="genabistub"
+          Inputs="$(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin;Singularity\BspAbiStub.cs;$(KERNEL_NATIVE_DIR)\MpSyscalls.x86"
+          Outputs=""
+          DependsOnTargets="BuildKernelDmp">
+  </Target>
+
+
+  <Target Name="MakeDirs">
+    <MakeDir Directories="$(KERNEL_NATIVE_DIR);$(KPRIDIR)" />
+  </Target>
+
+
+
+  <Target Name="BuildAbiDumpBin"
+          Inputs="$(KERNEL_NATIVE_DIR)\SingularityStub.V1.lib"
+          Outputs="$(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin;$(KERNEL_NATIVE_DIR)\genApAbiStub.out;Singularity\BspAbiStub.cs"
+          DependsOnTargets="BuildAbStubLib">
+    <Exec Command="$(BUILDDIR)\dumpbin /exports $(KERNEL_NATIVE_DIR)\SingularityStub.V1.lib &gt; $(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin" />
+    <Exec Command="$(ASMP_SYSCALL_BUILDER) /genApAbiStub &lt; $(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin &gt; $(KERNEL_NATIVE_DIR)\genApAbiStub.out" />
+    <Exec Command="$(ASMP_SYSCALL_BUILDER) /genBspAbiStub &lt; $(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin &gt; Singularity\BspAbiStub.cs" />
+  </Target>
+
+
+  <!-- busted -->
+  <Target Name="BuildMpSyscallsObj"
+          Inputs="$(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin"
+          Outputs="$(KERNEL_NATIVE_DIR)\MpSyscalls.h;$(KERNEL_NATIVE_DIR)\MpSyscalls.cpp;$(KERNEL_NATIVE_DIR)\MpSyscalls.obj"
+          DependsOnTargets="BuildAbiDumpBin">
+    <Exec Command="$(ASMP_SYSCALL_BUILDER) /genMpSyscallsHeader &lt; $(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin &gt; $(KERNEL_NATIVE_DIR)\MpSyscalls.h" />
+    <Exec Command="$(ASMP_SYSCALL_BUILDER) /genMpSyscallsImpl &lt; $(KERNEL_NATIVE_DIR)\SingularityStub.V1.dumpbin &gt; $(KERNEL_NATIVE_DIR)\MpSyscalls.cpp" />
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /Fo$(KERNEL_NATIVE_DIR)\MpSyscalls.obj /Fd$(KERNEL_NATIVE_DIR)\MpSyscalls.pdb /c $(KERNEL_NATIVE_DIR)\MpSyscalls.cpp" />
+  </Target>
+
+
+  <!--
+# pass5 depends on this .. which depends on MpSyscalls.obj
+$(KERNEL_NATIVE_DIR)\MpSyscalls.x86: $(KERNEL_NATIVE_DIR)\MpSyscalls.obj $(KERNEL_NATIVE_DIR)\SingularityStub.V1.lib
+    $(LINK) $(LFLAGS) /fixed /MAP /out:$@ \
+        /pdb:$(KERNEL_NATIVE_DIR)\MpSyscalls.x86.pdb /base:0x00600000 /entry:entry \
+        $(KERNEL_NATIVE_DIR)\MpSyscalls.obj \
+        $(KERNEL_NATIVE_DIR)\SingularityStub.V1.lib
+-->
+  <Target Name="BuildMpSyscallsNative"
+          Inputs="$(KERNEL_NATIVE_DIR)\MpSyscalls.obj;$(KERNEL_NATIVE_DIR)\SingularityStub.V1.lib"
+          Outputs="$(KERNEL_NATIVE_DIR)\MpSyscalls.x86"
+          DependsOnTargets="">
+    <Exec Command="$(LINK) $(LFLAGS) /fixed /MAP /out:$(KERNEL_NATIVE_DIR)\MpSyscalls.x86 /pdb:$(KERNEL_NATIVE_DIR)\MpSyscalls.x86.pdb /base:0x00600000 /entry:entry $(KERNEL_NATIVE_DIR)\MpSyscalls.obj $(KERNEL_NATIVE_DIR)\SingularityStub.V1.lib" />
+  </Target>
+
+
+  <ItemGroup>
+    <KernelObj Include="$(KERNEL_NATIVE_DIR)\kernel.obj"/>
+    <KernelObj Include="$(KERNEL_NATIVE_DIR)\kernel_superObj.obj"/>
+  </ItemGroup>
+
+
+
+  <Target Name="PreprocessAbiDef"
+          Inputs="$(SING_DEF_FILE)"
+          Outputs="$(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)"
+          >
+    <MakeDir Directories="$(KERNEL_NATIVE_DIR)" />
+    <Message Text="Preprocessing ABI names - $(SING_DEF_FILE) to $(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)" />
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /EP /TP $(SING_DEF_FILE) &gt; $(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)" />
+  </Target>
+
+  <Target Name="LinkKernel"
+          Outputs="$(KERNEL_NATIVE_DIR)\kernel.x86;$(KERNEL_NATIVE_DIR)\kernel.lib"
+          Inputs="@(KernelObj);linkdate.cpp;$(NativeLibPath);$(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)"
+          DependsOnTargets="CompileKernelObj;PreprocessAbiDef;BuildNativeLib;$(LinkKernelDependsOn)">
+    <Message Text="Linking kernel native PE image" />
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /Fo$(KERNEL_NATIVE_DIR)\linkdate.obj /Fd$(KERNEL_NATIVE_DIR)\linkdate.pdb /c linkdate.cpp" />
+    <Exec Command="$(LINK) /out:$(KERNEL_NATIVE_DIR)\kernel.x86 /def:$(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE) /debug /pdb:$(KERNEL_NATIVE_DIR)\kernel.x86.pdb $(LFLAGS) $(LBASEFLAGS) $(LENTRYFLAGS) $(NativeLibPath) $(KERNEL_NATIVE_DIR)\linkdate.obj @(KernelObj,' ')" />
+    <Exec Command="$(SDIZEPDB) /t:$(KERNEL_NATIVE_DIR)\kernel.txt $(KERNEL_NATIVE_DIR)\kernel.x86.pdb"
+          IgnoreExitCode="true"
+          Condition="'$(EnableSdize)'=='true'"/>
+  </Target>
+
+  <!--
+  This builds SINGLDR, which depends on *some* of the targets within Kernel.proj.
+  SINGLDR.proj and Kernel.proj both have dependencies on specific targets within each other.
+  MSBuild handles this correctly.
+  -->
+  <Target Name="BuildSingldr">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Boot\SINGLDR\SINGLDR.proj" StopOnFirstFailure="$(StopOnFirstFailure)"/>
+  </Target>
+
+  <Target Name="BuildKernelDmp"
+          Outputs="$(KERNEL_NATIVE_DIR)\kernel.dmp"
+          Inputs="$(KERNEL_NATIVE_DIR)\kernel.x86;$(BOOTDIR)\undump.exe;$(BOOTDIR)\Singldr"
+          DependsOnTargets="LinkKernel;BuildSingldr">
+    <Message Text="Building kernel dump file" />
+    <Exec Command="$(BUILDDIR)\mkcore /v /s:0x2fff00 /c:0x100 /o:$(KERNEL_NATIVE_DIR)\kernel.dmp $(KERNEL_NATIVE_DIR)\kernel.x86 $(BOOTDIR)\undump.exe /a:0x7b00 /b:$(BOOTDIR)\Singldr" />
+  </Target>
+
+  <!-- ############################################################# C++ Hello World. -->
+  <Target Name="BuildTestPeObj"
+          Inputs="testpe.cpp"
+          Outputs="$(KERNEL_NATIVE_DIR)\testpe.obj"
+          DependsOnTargets="">
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /FAsc /Fa$(KERNEL_NATIVE_DIR)\testpe.lst /Fo$(KERNEL_NATIVE_DIR)\testpe.obj /Fd$(KERNEL_NATIVE_DIR)\testpe.pdb /c testpe.cpp" />
+  </Target>
+
+  <Target Name="LinkTestApp"
+          Outputs="$(KERNEL_NATIVE_DIR)\testpe.x86"
+          Inputs="$(KERNEL_NATIVE_DIR)\testpe.obj;$(KERNEL_NATIVE_DIR)\Singularity.V1.lib"
+          DependsOnTargets="BuildTestPeObj;BuildAbiLib">
+    <Message Text="Linking native PE image of test app" />
+    <Exec Command="$(LINK) $(LFLAGS) /fixed:no /out:$(KERNEL_NATIVE_DIR)\testpe.x86 /pdb:$(KERNEL_NATIVE_DIR)\testpe.x86.pdb /base:0x2000000 /entry:entry $(KERNEL_NATIVE_DIR)\testpe.obj $(KERNEL_NATIVE_DIR)\Singularity.V1.lib" />
+  </Target>
+
+  <Target Name="BuildAbiLib"
+          Inputs="$(SING_DEF_FILE)"
+          Outputs="$(KERNEL_NATIVE_DIR)\Singularity.V1.lib">
+    <Message Text="Preprocessing ABI .def file: $(SING_DEF_FILE) to $(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)" />
+    <MakeDir Directories="$(KERNEL_NATIVE_DIR)" />
+    <Exec Command="$(CC) $(CFLAGS) $(ACFLAGS) /EP /TP $(SING_DEF_FILE) &gt; $(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)" />
+    <Message Text="Validating ABI" />
+    <Exec Command="validabi.cmd $(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE)" />
+    <Exec Command="$(LIB) /nologo /def:$(KERNEL_NATIVE_DIR)\$(SING_DEF_FILE) /machine:$(MACHINE) /out:$(KERNEL_NATIVE_DIR)\Singularity.V1.lib" />
+  </Target>
+
+
+  <Target Name="BuildTestPeManifest" Inputs="testpe.manifest" Outputs="$(KERNEL_NATIVE_DIR)\testpe.manifest">
+    <Copy SourceFiles="testpe.manifest" DestinationFolder="$(KERNEL_NATIVE_DIR)" />
+  </Target>
+
+  <!--
+  ==============================================================================================
+
+  Native runtime sources
+
+  ==============================================================================================
+  -->
+
+  <ItemGroup Condition="'$(Machine)'=='x86'">
+    <NativeIncludes Include="Native\hal.h"/>
+    <NativeIncludes Include="Native\halkd.h"/>
+    <NativeIncludes Include="Native\halkd1394.h"/>
+
+    <NativeSource Include="Native\Buffer.cpp"/>
+    <NativeSource Include="Native\Decimal.cpp"/>
+    <NativeSource Include="Native\Math.cpp"/>
+    <NativeSource Include="Native\Number.cpp"/>
+    <NativeSource Include="Native\PEImage.cpp"/>
+    <NativeSource Include="Native\Processor.cpp"/>
+    <NativeSource Include="Native\Stacks.cpp"/>
+    <NativeSource Include="Native\Thread.cpp"/>
+    <NativeSource Include="Native\Tracing.cpp"/>
+    <NativeSource Include="Native\Monitoring.cpp"/>
+    <NativeSource Include="Native\halexn.cpp"/>
+    <NativeSource Include="Native\halforgc.asm"/>
+    <NativeSource Include="Native\halasm.asm"/>
+    <NativeSource Include="Native\_lldiv.asm"/>
+    <NativeSource Include="Native\_llmul.asm"/>
+    <NativeSource Include="Native\_llshl.asm"/>
+    <NativeSource Include="Native\_llshr.asm"/>
+    <NativeSource Include="Native\_llrem.asm"/>
+    <NativeSource Include="Native\_memcpy.asm"/>
+    <NativeSource Include="Native\_memset.asm"/>
+    <NativeSource Include="Native\_ulldiv.asm"/>
+    <NativeSource Include="Native\_ulldvrm.asm"/>
+    <NativeSource Include="Native\_ullrem.asm"/>
+    <NativeSource Include="Native\halstack.asm"/>
+    <NativeSource Include="Native\ring0_halstack.asm"/>
+    <NativeSource Include="Native\halkd.cpp"/>
+    <NativeSource Include="Native\halkd1394.cpp"/>
+    <NativeSource Include="Native\halkdcom.cpp"/>
+    <NativeSource Include="Native\hal.cpp"/>
+    <NativeSource Include="Native\BootInfo.cpp"/>
+    <NativeSource Include="Native\halcpu.asm"/>
+    <NativeSource Include="Native\halidt.asm"/>
+    <NativeSource Include="Native\IoPort.cpp"/>
+    <NativeSource Include="Native\MpBootInfo.cpp"/>
+  </ItemGroup>
+
+  <!-- This target creates __native_objs items from NativeSource items. -->
+  <Target Name="CreateNativeItems">
+    <CreateItem Include="$(KPRIDIR)\%(NativeSource.filename).obj">
+      <Output ItemName="__native_objs" TaskParameter="Include"/>
+    </CreateItem>
+  </Target>
+
+  <!--
+  Note: This target uses batching.  All tasks within the target will be executed, once for each distinct
+  value of %(NativeSources.identity).
+  
+  Notes about dependency checking: In general, we do not attempt to do fine-grained dependency checking
+  on #include dependencies, because:
+      * doing so is error-prone (the dependencies are in the code, not in the project)
+      * we don't have much C++ code, so it compiles fast
+      * nearly all of the C++ files depend on halclass.h, which is generated when any IL changes
+      
+  So we just punt, and declare that all native sources depend on halclass.h (and halclass.inc),
+  and the handful of native header files that we have, which are declared as NativeIncludes items.
+  This means that we are conservative about dependencies; we may rebuild code when it is not strictly
+  necessary, but this is better than not building code that really has changed.
+  
+  This target depends on CompileKernelObj because Bartok generates halclass.h / halclass.inc.
+  -->
+  <Target Name="CompileNativeSources"
+          Inputs="
+            %(NativeSource.identity);
+            %(NativeSource.Dependencies);
+            @(NativeIncludes);
+            $(KERNEL_NATIVE_DIR)\halclass.h;
+            $(KERNEL_NATIVE_DIR)\halclass.inc;
+            "
+          Outputs="$(KPRIDIR)\%(NativeSource.filename).obj"
+          DependsOnTargets="CompileKernelObj;CreateNativeItems;MakeDirs">
+
+    <MakeDir Directories="$(KERNEL_NATIVE_DIR)"/>
+
+    <!-- Compile C++ sources -->
+    <Exec Condition="'%(NativeSource.extension)'=='.c' or '%(NativeSource.extension)'=='.cpp'"
+          Command="$(CC) $(CFLAGS) $(ACFLAGS) $(GC_ML_DEFS) /I$(KERNEL_NATIVE_DIR) /I$(NativeSrcDir) /FAsc /Fa$(KPRIDIR)\%(NativeSource.filename).lst /Fd$(KERNEL_NATIVE_DIR)\native.pdb /Fo$(KPRIDIR)\%(NativeSource.filename).obj /c %(NativeSource.identity)"/>
+
+    <!-- Compile assembly sources -->
+    <Exec Condition="'%(NativeSource.extension)'=='.asm'"
+          Command="$(AS) $(AFLAGS) $(ACFLAGS) $(GC_ML_DEFS) /I$(KERNEL_NATIVE_DIR) /I$(NativeSrcDir) /Fl$(KPRIDIR)\%(NativeSource.filename).lst /Fo$(KPRIDIR)\%(NativeSource.filename).obj /c %(NativeSource.identity)"/>
+  </Target>
+
+  <Target Name="BuildNativeLib"
+          DependsOnTargets="CompileNativeSources"
+          Outputs="$(KERNEL_NATIVE_DIR)\native.lib"
+          Inputs="@(__native_objs)">
+    <Message Text="Linking native lib - $(KERNEL_NATIVE_DIR)\native.lib"/>
+    <Delete Files="$(KERNEL_NATIVE_DIR)\native.lib"/>
+    <Exec Command="$(LIB) /nologo /nod /out:$(KERNEL_NATIVE_DIR)\native.lib @(__native_objs,' ')"/>
+  </Target>
+
+  <!-- This target is useful for debugging build problems. -->
+  <Target Name="PreprocessNativeSources"
+          Inputs="%(NativeSource.identity)"
+          Outputs="$(KPRIDIR)\%(NativeSource.filename).i"
+          DependsOnTargets="CompileKernelObj;CreateNativeItems;MakeDirs">
+
+    <!-- Compile C++ sources -->
+    <Exec Condition="'%(NativeSource.extension)'=='.c' or '%(NativeSource.extension)'=='.cpp'"
+          Command="$(CC) /EP &gt;$(KPRIDIR)\%(NativeSource.filename).i $(CFLAGS) $(ACFLAGS) $(GC_ML_DEFS) /I$(KERNEL_NATIVE_DIR) /INative /FAsc /Fa$(KPRIDIR)\%(NativeSource.filename).lst /Fd$(KERNEL_NATIVE_DIR)\native.pdb /Fo$(KPRIDIR)\%(NativeSource.filename).obj /c %(NativeSource.identity)"/>
+
+    <!-- Compile assembly sources -->
+    <Exec Condition="'%(NativeSource.extension)'=='.asm'"
+          Command="$(AS) /EP &gt;$(KPRIDIR)\%(NativeSource.filename).i $(AFLAGS) $(ACFLAGS) $(GC_ML_DEFS) /I$(KERNEL_NATIVE_DIR) /INative /Fl$(KPRIDIR)\%(NativeSource.filename).lst /Fo$(KPRIDIR)\%(NativeSource.filename).obj /c %(NativeSource.identity)"/>
+  </Target>
+
+
+  <Target Name="ShowDebugInfo">
+    <Message Text="KERNEL_NATIVE_DIR:               $(KERNEL_NATIVE_DIR)"/>
+    <Message Text="KERNEL_IL_DIR:                   $(KERNEL_IL_DIR)"/>
+  </Target>
+
+
+  <Target Name="CompileKernelObj"
+          Inputs="@(Reference)"
+          Outputs="$(KernelObjPath);$(KERNEL_NATIVE_DIR)\kernel_superObj.obj;$(KERNEL_NATIVE_DIR)\halclass.h;$(KERNEL_NATIVE_DIR)\halclass.inc"
+          DependsOnTargets="BuildDependentProjects;MakeDirs"
+          >
+    <Message Text="Compiling Kernel.obj native image"/>
+    <Message Text="IL assemblies:"/>
+    <Message Text="    %(Reference.identity)"/>
+
+    <Exec WorkingDirectory="$(SINGULARITY_ROOT)\build"
+      Command="PATH $(SINGULARITY_PATH)
+      $(BARTOK) $(BARTOK_COLLECTOR) $(BartokFlags) /out: $(KernelObjPath) @(Reference->'%(identity)',' ') $(KERNEL_BARTOK_LOG)"/>
+  </Target>
+
+</Project>
diff --git a/base/Kernel/Native/BootInfo.cpp b/base/Kernel/Native/BootInfo.cpp
new file mode 100644
index 0000000..7d97074
--- /dev/null
+++ b/base/Kernel/Native/BootInfo.cpp
@@ -0,0 +1,31 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BootInfo.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+
+//////////////////////////////////////////////////////////////////////////////
+//
+const Struct_Microsoft_Singularity_BootInfo *g_pBootInfo;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+Struct_Microsoft_Singularity_BootInfo *
+Struct_Microsoft_Singularity_BootInfo::g_HalGetBootInfo()
+{
+    return (Struct_Microsoft_Singularity_BootInfo *)g_pBootInfo;
+}
+
+#endif // SINGULARITY_KERNEL
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Buffer.cpp b/base/Kernel/Native/Buffer.cpp
new file mode 100644
index 0000000..5ad18f4
--- /dev/null
+++ b/base/Kernel/Native/Buffer.cpp
@@ -0,0 +1,170 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Buffer.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+void Class_System_Buffer::g_MoveMemory(uint8* dmem, uint8* smem, int size)
+{
+    if (size % 64 == 0 && size >= 64 && (uintptr)dmem % 64 == 0 && (uintptr)smem % 64 == 0) {
+        g_CopyPages(dmem, smem, size);
+        return;
+    }
+
+    if (dmem <= smem) {
+        // make sure the destination is dword aligned
+        while ((((int)dmem ) & 0x3) != 0 && size >= 3) {
+            *dmem++ = *smem++;
+            size -= 1;
+        }
+
+        // copy 16 bytes at a time
+        if (size >= 16) {
+            size -= 16;
+            do {
+                ((int *)dmem)[0] = ((int *)smem)[0];
+                ((int *)dmem)[1] = ((int *)smem)[1];
+                ((int *)dmem)[2] = ((int *)smem)[2];
+                ((int *)dmem)[3] = ((int *)smem)[3];
+                dmem += 16;
+                smem += 16;
+            }
+            while ((size -= 16) >= 0);
+        }
+
+        // still 8 bytes or more left to copy?
+        if ((size & 8) != 0) {
+            ((int *)dmem)[0] = ((int *)smem)[0];
+            ((int *)dmem)[1] = ((int *)smem)[1];
+            dmem += 8;
+            smem += 8;
+        }
+
+        // still 4 bytes or more left to copy?
+        if ((size & 4) != 0) {
+            ((int *)dmem)[0] = ((int *)smem)[0];
+            dmem += 4;
+            smem += 4;
+        }
+
+        // still 2 bytes or more left to copy?
+        if ((size & 2) != 0) {
+            ((short *)dmem)[0] = ((short *)smem)[0];
+            dmem += 2;
+            smem += 2;
+        }
+
+        // still 1 byte left to copy?
+        if ((size & 1) != 0) {
+            dmem[0] = smem[0];
+            dmem += 1;
+            smem += 1;
+        }
+    } else {
+        smem += size;
+        dmem += size;
+
+        // make sure the destination is dword aligned
+        while ((((int)dmem) & 0x3) != 0 && size >= 3) {
+            *--dmem = *--smem;
+            size -= 1;
+        }
+
+        // copy 16 bytes at a time
+        if (size >= 16) {
+            size -= 16;
+            do {
+                dmem -= 16;
+                smem -= 16;
+                ((int *)dmem)[3] = ((int *)smem)[3];
+                ((int *)dmem)[2] = ((int *)smem)[2];
+                ((int *)dmem)[1] = ((int *)smem)[1];
+                ((int *)dmem)[0] = ((int *)smem)[0];
+            }
+            while ((size -= 16) >= 0);
+        }
+
+        // still 8 bytes or more left to copy?
+        if ((size & 8) != 0) {
+            dmem -= 8;
+            smem -= 8;
+            ((int *)dmem)[1] = ((int *)smem)[1];
+            ((int *)dmem)[0] = ((int *)smem)[0];
+        }
+
+        // still 4 bytes or more left to copy?
+        if ((size & 4) != 0) {
+            dmem -= 4;
+            smem -= 4;
+            ((int *)dmem)[0] = ((int *)smem)[0];
+        }
+
+        // still 2 bytes or more left to copy?
+        if ((size & 2) != 0) {
+            dmem -= 2;
+            smem -= 2;
+            ((short *)dmem)[0] = ((short *)smem)[0];
+        }
+
+        // still 1 byte left to copy?
+        if ((size & 1) != 0) {
+            dmem -= 1;
+            smem -= 1;
+            dmem[0] = smem[0];
+        }
+    }
+}
+
+void Class_System_Buffer::g_ZeroMemory(uint8* dmem, int size)
+{
+    // Align dmem to 8-bytes for g_ZeroPages
+    while ((((int)dmem) & 0x7) != 0 && size > 0) {
+        *dmem++ = 0;
+        size   -= 1;
+    }
+
+    if (size >= 64) {
+        // g_ZeroPages expects 8-byte alignment and a block size of n*64 bytes.
+        int toZero = size & ~63;
+        g_ZeroPages(dmem, toZero);
+        dmem += toZero;
+        size -= toZero;
+    }
+
+    if (size >= 16) {
+        size -= 16;
+        do {
+            ((int*)dmem)[0] = 0;
+            ((int*)dmem)[1] = 0;
+            ((int*)dmem)[2] = 0;
+            ((int*)dmem)[3] = 0;
+            dmem += 16;
+        } while ((size -= 16) >= 0);
+    }
+    if ((size & 8) > 0) {
+        ((int*)dmem)[0] = 0;
+        ((int*)dmem)[1] = 0;
+        dmem += 8;
+    }
+    if ((size & 4) > 0) {
+        ((int*)dmem)[0] = 0;
+        dmem += 4;
+    }
+    if ((size & 2) != 0) {
+        ((short*)dmem)[0] = 0;
+        dmem += 2;
+    }
+    if ((size & 1) != 0) {
+        *dmem++ = 0;
+    }
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/DebugStub.cpp b/base/Kernel/Native/DebugStub.cpp
new file mode 100644
index 0000000..6391baf
--- /dev/null
+++ b/base/Kernel/Native/DebugStub.cpp
@@ -0,0 +1,26 @@
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  DebugStub.cpp: runtime support for debugging
+//
+//
+#include "hal.h"
+
+#if SINGULARITY_PROCESS
+#if PAGING
+int ccc;
+extern "C" void __cdecl _pushStackMark();
+__declspec(naked) void Class_Microsoft_Singularity_DebugStub::g_Foo()
+{
+    __asm
+    {
+        ret
+    }
+//    ccc = *((int *)_pushStackMark);
+}
+#endif
+void Class_Microsoft_Singularity_DebugStub::g_Break()
+{
+    __asm int 3;
+}
+#endif
diff --git a/base/Kernel/Native/Decimal.cpp b/base/Kernel/Native/Decimal.cpp
new file mode 100644
index 0000000..982d09f
--- /dev/null
+++ b/base/Kernel/Native/Decimal.cpp
@@ -0,0 +1,103 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Number.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+int Struct_System_Decimal::g_FloatFromDecimal(Struct_System_Decimal *d,
+                                              float32 *result)
+{
+    Assert(!"FloatFromDecimal");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DoubleFromDecimal(Struct_System_Decimal *d,
+                                               float64 *result)
+{
+    Assert(!"DoubleFromDecimal");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalTruncate(Struct_System_Decimal *d,
+                                             Struct_System_Decimal *result)
+{
+    Assert(!"DecimalTruncate");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalRound(Struct_System_Decimal *d,
+                                          int decimals,
+                                          Struct_System_Decimal *result)
+{
+    Assert(!"DecimalRound");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalCompare(Struct_System_Decimal *d1,
+                                            Struct_System_Decimal *d2)
+{
+    Assert(!"DecimalCompare");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalFromDouble(double d,
+                                               Struct_System_Decimal *result)
+{
+    Assert(!"DecimalFromDouble");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalFromFloat(float d,
+                                              Struct_System_Decimal *result)
+{
+    Assert(!"DecimalFromFloat");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalAdd(Struct_System_Decimal * d1,
+                                        Struct_System_Decimal * d2,
+                                        Struct_System_Decimal * result)
+{
+    Assert(!"DecimalAdd");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalDivide(Struct_System_Decimal *d1,
+                                           Struct_System_Decimal *d2,
+                                           Struct_System_Decimal *result)
+{
+    Assert(!"DecimalDivide");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalFloor(Struct_System_Decimal *d,
+                                          Struct_System_Decimal *result)
+{
+    Assert(!"DecimalFloor");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalMultiply(Struct_System_Decimal *d1,
+                                             Struct_System_Decimal *d2,
+                                             Struct_System_Decimal *result)
+{
+    Assert(!"DecimalMultiply");
+    return 0;
+}
+
+int Struct_System_Decimal::g_DecimalSubtract(Struct_System_Decimal *d1,
+                                             Struct_System_Decimal *d2,
+                                             Struct_System_Decimal *result)
+{
+    Assert(!"DecimalSubtract");
+    return 0;
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/HalKd1394.cpp b/base/Kernel/Native/HalKd1394.cpp
new file mode 100644
index 0000000..0b206b6
--- /dev/null
+++ b/base/Kernel/Native/HalKd1394.cpp
@@ -0,0 +1,808 @@
+//
+//  Copyright (c) Microsoft Corporation.   All rights reserved.
+//
+//  halkd1394.cpp: runtime support for debugging over 1394.
+//
+//  For more information see:
+//      \nt\base\ntos\kd64
+//      \nt\base\boot\kdcom
+//      \nt\base\boot\kd1394
+//      \nt\base\boot\kdusb2
+//      \nt\sdktools\debuggers\ntsd64
+//
+#include "hal.h"
+#include "halkd.h"
+#include "halkd1394.h"
+
+extern "C" void *  __cdecl memcpy(void *, const void *, size_t);
+extern "C" void *  __cdecl memset(void *, int, size_t);
+
+//
+// Debugger Debugging
+//
+#define KDDBG if (0) kdprintf
+#define KDDBG2 if (0) kdprintf
+
+///////////////////////////////////////////////////////// Debugger Structures.
+//
+//  These structures are accessed directly by the host using RDMA.
+//
+#define DEBUG_BUS1394_MAX_PACKET_SIZE       4000
+#define DEBUG_1394_MAJOR_VERSION            0x1
+#define DEBUG_1394_MINOR_VERSION            0x0
+#define DEBUG_1394_CONFIG_TAG               0xBABABABA
+
+struct DEBUG_1394_SEND_PACKET {
+    ULONG               TransferStatus;
+    ULONG               PacketHeader[4];
+    ULONG               Length;
+    UCHAR               Packet[DEBUG_BUS1394_MAX_PACKET_SIZE];
+    UCHAR               Padding[72];
+};
+STATIC_ASSERT(sizeof(DEBUG_1394_SEND_PACKET) == 4096);
+
+struct DEBUG_1394_RECEIVE_PACKET {
+    ULONG               TransferStatus;
+    ULONG               Length;
+    UCHAR               Packet[DEBUG_BUS1394_MAX_PACKET_SIZE];
+    UCHAR               Padding[88];
+};
+STATIC_ASSERT(sizeof(DEBUG_1394_RECEIVE_PACKET) == 4096);
+
+// exists on target, host reads it to match for id.
+struct DEBUG_1394_CONFIG {
+    ULONG               Tag;
+    USHORT              MajorVersion;
+    USHORT              MinorVersion;
+    ULONG               Id;
+    ULONG               BusPresent;
+    ULONG64             SendPacket;
+    ULONG64             ReceivePacket;
+};
+STATIC_ASSERT(sizeof(DEBUG_1394_CONFIG) == 32);
+
+struct DEBUG_1394_DATA {
+    //    POHCI_REGISTER_MAP          BaseAddress;    // our OHCI register map
+    ULONG                       CromBuffer[248];   // our config ROM - must be 1k aligned
+    DEBUG_1394_CONFIG           Config;         // our config for this session
+    DEBUG_1394_SEND_PACKET      SendPacket;     // our send packet (isoch packet)
+    DEBUG_1394_RECEIVE_PACKET   ReceivePacket;  // our receive packet
+};
+STATIC_ASSERT(sizeof(DEBUG_1394_DATA) == 1024 + 4096 + 4096);
+STATIC_ASSERT(sizeof(DEBUG_1394_DATA) <= 3 * 4096);   // we allocate 12KB in boot.
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define TIMEOUT_COUNT                   1024*500
+#define MAX_REGISTER_READS              400000
+
+//
+// Global Data Structures
+//
+static DEBUG_1394_DATA *            Kd1394Data;
+static volatile OHCI_REGISTER_MAP * KdRegisters;
+
+//
+static ULONG_PTR MmGetPhysicalAddress(PVOID pv)
+{
+    return (ULONG_PTR)pv;
+}
+
+// ?? need to look into this
+static ULONG Dbg1394_StallExecution(ULONG LoopCount)
+{
+    ULONG b = 1;
+
+    for (ULONG k = 0; k < LoopCount; k++) {
+        for (ULONG i = 1; i < 100000; i++) {
+            __asm pause;
+            b = b * (i>>k);
+        }
+    }
+
+    return b;
+}
+
+//  Exchange byte pairs 0:3 and 1:2 of Source and returns the resulting ULONG.
+static inline ULONG Dbg1394_ByteSwap(ULONG Source)
+{
+    return (((Source)              << (8 * 3)) |
+            ((Source & 0x0000FF00) << (8 * 1)) |
+            ((Source & 0x00FF0000) >> (8 * 1)) |
+            ((Source)              >> (8 * 3)));
+}
+
+//  Derive the 16 bit CRC as defined by IEEE 1212 clause 8.1.5.
+//  (ISO/IEC 13213) First edition 1994-10-05.
+//      data - ULONG data to derive CRC from.
+//      check - check value.
+static ULONG Dbg1394_Crc16(ULONG data, ULONG check)
+{
+    ULONG next = check;
+
+    for (LONG shift = 28; shift >= 0; shift -= 4) {
+        ULONG sum = ((next >> 12) ^ (data >> shift)) & 0xf;
+        next = (next << 4) ^ (sum << 12) ^ (sum << 5) ^ (sum);
+    }
+    return (next & 0xFFFF);
+}
+
+//  Calculate a CRC for the pointer to the Quadlet data.
+//      Quadlet - Pointer to data to CRC
+//      length - length of data to CRC
+static USHORT Dbg1394_CalculateCrc(PULONG Quadlet, ULONG length)
+{
+    ULONG temp = 0;
+
+    for (ULONG index = 0; index < length; index++) {
+        temp = Dbg1394_Crc16(Quadlet[index], temp);
+    }
+    return (USHORT)temp;
+}
+
+//////////////////////////////////////////////////  Initialize the controller!
+//
+bool Kdp1394Init(Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    if (bi->Ohci1394Base == 0 ||
+        bi->Ohci1394BufferAddr32 == 0 ||
+        bi->Ohci1394BufferSize32 < sizeof(DEBUG_1394_DATA)) {
+
+        bi->Ohci1394Base = 0;
+        bi->Ohci1394BufferAddr32 = 0;
+        bi->Ohci1394BufferSize32 = 0;
+        return FALSE;
+    }
+
+    // Note: Kd1394Data must be in the low 32-bits of address space due to
+    //       limits on valid 1394 DMA addresses.  It must also be contiguous.
+    Kd1394Data = (DEBUG_1394_DATA *)bi->Ohci1394BufferAddr32;
+    memset(Kd1394Data, 0, sizeof(*Kd1394Data));
+
+    // get our base address
+    KdRegisters = (volatile OHCI_REGISTER_MAP *)bi->Ohci1394Base;
+
+    // initialize our config info for host debugger to read.
+    Kd1394Data->Config.Tag = DEBUG_1394_CONFIG_TAG;
+    Kd1394Data->Config.MajorVersion = DEBUG_1394_MAJOR_VERSION;
+    Kd1394Data->Config.MinorVersion = DEBUG_1394_MINOR_VERSION;
+    Kd1394Data->Config.Id = (bi->DebugBasePort < 0x100) ? bi->DebugBasePort : 0;
+    Kd1394Data->Config.BusPresent = FALSE;
+    Kd1394Data->Config.SendPacket = MmGetPhysicalAddress(&Kd1394Data->SendPacket);
+    Kd1394Data->Config.ReceivePacket = MmGetPhysicalAddress(&Kd1394Data->ReceivePacket);
+
+    // get our version
+    ULONG ulVersion = KdRegisters->Version.all;
+    UCHAR MajorVersion = (UCHAR)(ulVersion >> 16);
+
+    // make sure we have a valid version
+    if (MajorVersion != 1) { // INVESTIGATE
+        kdprintf("1394: MajorVersion != 1\n");
+        return FALSE;
+    }
+
+    // soft reset to initialize the controller
+    HC_CONTROL_REGISTER HCControl;
+    HCControl.all = 0;
+    HCControl.SoftReset = TRUE;
+    KdRegisters->HCControlSet.all = HCControl.all;
+
+    // wait until reset complete - ??
+    ULONG retry = 1000; // ??
+    do {
+        HCControl.all = KdRegisters->HCControlSet.all;
+        Dbg1394_StallExecution(1);
+    } while ((HCControl.SoftReset) && (--retry));
+    if (retry == 0) {
+        kdprintf("1394: Reset failed\n");
+        return FALSE;
+    }
+
+    // enable link to phy communication.
+    HCControl.all = 0;
+    HCControl.Lps = TRUE;
+    KdRegisters->HCControlSet.all = HCControl.all;
+
+    Dbg1394_StallExecution(20);
+
+    // initialize HCControl register
+    // send data in little-endian order (i.e. do byte swap).
+    HCControl.all = 0;
+    HCControl.NoByteSwapData = TRUE;
+    KdRegisters->HCControlClear.all = HCControl.all;
+
+    // enable posted writes.
+    HCControl.all = 0;
+    HCControl.PostedWriteEnable = TRUE;
+    KdRegisters->HCControlSet.all = HCControl.all;
+
+    // setup the link control
+    LINK_CONTROL_REGISTER LinkControl;
+    LinkControl.all = 0;
+    LinkControl.CycleTimerEnable = TRUE;
+    LinkControl.CycleMaster = TRUE;
+    LinkControl.RcvPhyPkt = TRUE;
+    LinkControl.RcvSelfId = TRUE;
+    KdRegisters->LinkControlClear.all = LinkControl.all;
+
+    LinkControl.all = 0;
+    LinkControl.CycleTimerEnable = TRUE;
+    LinkControl.CycleMaster = TRUE;
+    KdRegisters->LinkControlSet.all = LinkControl.all;
+
+    // set the bus number (hardcoded to 0x3FF) - ??? what about node id??
+    NODE_ID_REGISTER NodeId;
+    NodeId.all = 0;
+    NodeId.BusId = (USHORT)0x3FF;
+    KdRegisters->NodeId.all = NodeId.all;
+
+    // do something with the crom...
+
+    // 0xf0000404 - bus id register
+    Kd1394Data->CromBuffer[1] = 0x31333934;
+
+    // 0xf0000408 - bus options register
+    BUS_OPTIONS_REGISTER BusOptions;
+    BusOptions.all = Dbg1394_ByteSwap(KdRegisters->BusOptions.all);
+    BusOptions.Pmc = FALSE;
+    BusOptions.Bmc = FALSE;
+    BusOptions.Isc = FALSE;
+    BusOptions.Cmc = FALSE;
+    BusOptions.Irmc = FALSE;
+    BusOptions.g = 1;
+    Kd1394Data->CromBuffer[2] = Dbg1394_ByteSwap(BusOptions.all);
+
+    // 0xf000040c - global unique id hi
+    Kd1394Data->CromBuffer[3] = KdRegisters->GuidHi;
+
+    // 0xf0000410 - global unique id lo
+    Kd1394Data->CromBuffer[4] = KdRegisters->GuidLo;
+
+    // 0xf0000400 - config ROM header - set last to calculate CRC!
+    CONFIG_ROM_INFO ConfigRomHeader;
+    ConfigRomHeader.all = 0;
+    ConfigRomHeader.CRI_Info_Length = 4;
+    ConfigRomHeader.CRI_CRC_Length = 4;
+    ConfigRomHeader.CRI_CRC_Value = Dbg1394_CalculateCrc(&Kd1394Data->CromBuffer[1],
+                                                         ConfigRomHeader.CRI_CRC_Length);
+    Kd1394Data->CromBuffer[0] = ConfigRomHeader.all;
+
+    Kd1394Data->CromBuffer[6] = 0xC083000C; // 0xf0000418 - node capabilities
+    Kd1394Data->CromBuffer[7] = 0xF2500003; // 0xf000041C - module vendor id
+
+    // KD's state machine looks for 1c w/ 50f2, 1d w/ 02, then 1e w/ address.
+    Kd1394Data->CromBuffer[8] = 0xF250001C; // 0xf0000420 - extended key (for KD)
+    Kd1394Data->CromBuffer[9] = 0x0200001D; // 0xf0000424 - debug key (for KD)
+
+    // 0xf0000428 - debug value (for KD)
+    IMMEDIATE_ENTRY CromEntry;
+    CromEntry.all = MmGetPhysicalAddress(&Kd1394Data->Config);
+    CromEntry.IE_Key = 0x1E;
+    Kd1394Data->CromBuffer[10] = Dbg1394_ByteSwap(CromEntry.all);
+
+    // 0xf0000414 - root directory header - set last to calculate CRC!
+    DIRECTORY_INFO DirectoryInfo;
+    DirectoryInfo.all = 0;
+    DirectoryInfo.DI_Length = 5;
+    DirectoryInfo.DI_CRC = Dbg1394_CalculateCrc(&Kd1394Data->CromBuffer[6],
+                                                DirectoryInfo.DI_Length);
+    Kd1394Data->CromBuffer[5] = Dbg1394_ByteSwap(DirectoryInfo.all);
+
+    // write the first few registers
+    KdRegisters->ConfigRomHeader.all = Kd1394Data->CromBuffer[0];
+    KdRegisters->BusId = Kd1394Data->CromBuffer[1];
+    KdRegisters->BusOptions.all = Kd1394Data->CromBuffer[2];
+    KdRegisters->GuidHi = Kd1394Data->CromBuffer[3];
+    KdRegisters->GuidLo = Kd1394Data->CromBuffer[4];
+
+    // set our crom
+    KdRegisters->ConfigRomMap = MmGetPhysicalAddress(&Kd1394Data->CromBuffer);
+
+    // disable all interrupts. wdm driver will enable them later - ??
+    KdRegisters->IntMaskClear.all = 0xFFFFFFFF;
+
+    // enable the link
+    HCControl.all = 0;
+    HCControl.LinkEnable = TRUE;
+    KdRegisters->HCControlSet.all = HCControl.all;
+
+    Dbg1394_StallExecution(1000);
+
+    // enable access filters to all nodes
+    KdRegisters->AsynchReqFilterLoSet = 0xFFFFFFFF;
+    KdRegisters->AsynchReqFilterHiSet = 0xFFFFFFFF;
+    KdRegisters->PhyReqFilterHiSet = 0xFFFFFFFF;
+    KdRegisters->PhyReqFilterLoSet = 0xFFFFFFFF;
+
+    // hard reset on the bus (so KD will look for us)
+    PHY_CONTROL_REGISTER PhyControl;
+    PhyControl.all = 0;
+    PhyControl.RdReg = TRUE;
+    PhyControl.RegAddr = 1;
+
+    KdRegisters->PhyControl.all = PhyControl.all;
+    retry = MAX_REGISTER_READS;
+    do {
+        PhyControl.all = KdRegisters->PhyControl.all;
+    } while ((!PhyControl.RdDone) && --retry);
+    if (retry == 0) {
+        kdprintf("1394: Read on bus failed\n");
+        return FALSE;
+    }
+
+    UCHAR Data = ((UCHAR)PhyControl.RdData | PHY_INITIATE_BUS_RESET);
+
+    PhyControl.all = 0;
+    PhyControl.WrReg = TRUE;
+    PhyControl.RegAddr = 1;
+    PhyControl.WrData = Data;
+
+    KDDBG2("1394: Writing to        PhyControl=%08x\n", PhyControl.all);
+    KdRegisters->PhyControl.all = PhyControl.all;
+
+    retry = MAX_REGISTER_READS;
+    do {
+        PhyControl.all = KdRegisters->PhyControl.all;
+    } while (PhyControl.WrReg && --retry);
+    if (retry == 0) {
+        kdprintf("1394: Hard reset on bus failed\n");
+        return FALSE;
+    }
+
+    kdprintf("1394: Init Succeeded\n");
+    return TRUE;
+}
+
+static void Dbg1394_EnablePhysicalAccess()
+{
+    // see if ohci1394 is being loaded...
+    HC_CONTROL_REGISTER HCControl;
+    HCControl.all = KdRegisters->HCControlSet.all;
+    if (!HCControl.LinkEnable || !HCControl.Lps || HCControl.SoftReset) {
+        KDDBG("1394: EnablePhysicalAccess HCControl=%08x!\n", HCControl.all);
+        return;
+    }
+
+    // if the bus reset interrupt is not cleared, we have to clear it...
+    INT_EVENT_MASK_REGISTER IntEvent;
+    IntEvent.all = KdRegisters->IntEventSet.all;
+    if (IntEvent.BusReset) {
+        KDDBG("1394: EnablePhysicalAccess IntEvent =%08x!\n", IntEvent.all);
+        IntEvent.all = 0;
+        IntEvent.BusReset = 1;
+        KdRegisters->IntEventClear.all = IntEvent.all;
+    }
+
+    // we might need to re-enable physical access. If so, do it.
+    KdRegisters->AsynchReqFilterHiSet = 0xFFFFFFFF;
+    KdRegisters->AsynchReqFilterLoSet = 0xFFFFFFFF;
+    KdRegisters->PhyReqFilterHiSet = 0xFFFFFFFF;
+    KdRegisters->PhyReqFilterLoSet = 0xFFFFFFFF;
+}
+
+static KDP_STATUS
+Dbg1394_ReadPacket(
+    OUT PKD_PACKET      PacketHeader,
+    OUT PSTRING         MessageHeader,
+    OUT PSTRING         MessageData,
+    bool             Wait
+    )
+//    KDP_PACKET_RESEND - if resend is required.  = 2 = CP_GET_ERROR
+//    KDP_PACKET_TIMEOUT - if timeout.            = 1 = CP_GET_NODATA
+//    KDP_PACKET_RECEIVED - if packet received.   = 0 = CP_GET_SUCCESS
+{
+    ULONG   timeoutLimit = 0;
+
+    do {
+        // make sure our link is enabled..
+        Dbg1394_EnablePhysicalAccess();
+        KdpSpin();
+
+        if (Kd1394Data->ReceivePacket.TransferStatus == STATUS_PENDING) {
+            KdDebuggerNotPresent = FALSE;
+
+            memcpy(PacketHeader,
+                   &Kd1394Data->ReceivePacket.Packet[0],
+                   sizeof(KD_PACKET));
+
+            // make sure we have a valid PacketHeader
+            if (Kd1394Data->ReceivePacket.Length < sizeof(KD_PACKET)) {
+                // short packet, we are done...
+                Kd1394Data->ReceivePacket.TransferStatus = STATUS_SUCCESS;
+                return(KDP_PACKET_RESEND);
+            }
+
+            if (MessageHeader) {
+                memcpy(MessageHeader->Buffer,
+                       &Kd1394Data->ReceivePacket.Packet[sizeof(KD_PACKET)],
+                       MessageHeader->MaximumLength);
+
+                if (Kd1394Data->ReceivePacket.Length <= (USHORT)(sizeof(KD_PACKET)+MessageHeader->MaximumLength)) {
+                    Kd1394Data->ReceivePacket.TransferStatus = STATUS_SUCCESS;
+                    return(KDP_PACKET_RECEIVED);
+                }
+
+                if (MessageData) {
+                    memcpy(MessageData->Buffer,
+                           &Kd1394Data->ReceivePacket.Packet[sizeof(KD_PACKET) + MessageHeader->MaximumLength],
+                           Kd1394Data->ReceivePacket.Length - (sizeof(KD_PACKET) + MessageHeader->MaximumLength));
+                }
+            }
+
+            Kd1394Data->ReceivePacket.TransferStatus = STATUS_SUCCESS;
+            return(KDP_PACKET_RECEIVED);
+        }
+
+        timeoutLimit++;
+
+        if (Wait == FALSE) {
+            return(KDP_PACKET_RESEND);
+        }
+
+    } while (timeoutLimit <= TIMEOUT_COUNT);
+
+    return(KDP_PACKET_TIMEOUT);
+}
+
+//
+//  Send a control packet to the host machine that is running the
+//  kernel debugger and wait for an ACK.
+//
+//      PacketType - Supplies the type of packet to send.
+//
+static void KdpSendControlPacket(IN USHORT PacketType)
+{
+    KD_PACKET   PacketHeader;
+
+    //
+    // Initialize and send the packet header.
+    //
+    PacketHeader.PacketLeader = CONTROL_PACKET_LEADER;
+    PacketHeader.PacketId = 0;
+    PacketHeader.ByteCount = 0;
+    PacketHeader.Checksum = 0;
+    PacketHeader.PacketType = PacketType;
+
+    // setup our send packet
+    memset(&Kd1394Data->SendPacket, 0, sizeof(DEBUG_1394_SEND_PACKET));
+    Kd1394Data->SendPacket.Length = 0;
+
+    memcpy(&Kd1394Data->SendPacket.PacketHeader[0],
+           &PacketHeader, sizeof(KD_PACKET));
+
+    Kd1394Data->SendPacket.TransferStatus = STATUS_PENDING;
+}
+
+KDP_STATUS
+Kdp1394ReceivePacket(
+    IN ULONG            PacketType,
+    OUT PSTRING         MessageHeader,
+    OUT PSTRING         MessageData,
+    OUT PULONG          DataLength,
+    IN OUT PKD_CONTEXT  KdContext
+    )
+    //  Routine Description:
+    //      This routine receives a packet from the host machine that is running
+    //      the kernel debugger UI.  This routine is ALWAYS called after packet being
+    //      sent by caller.  It first waits for ACK packet for the packet sent and
+    //      then waits for the packet desired.
+    //
+    //      N.B. If caller is KdPrintString, the parameter PacketType is
+    //         PACKET_TYPE_KD_ACKNOWLEDGE.  In this case, this routine will return
+    //         right after the ack packet is received.
+    //
+    //  Arguments:
+    //      PacketType - Supplies the type of packet that is excepted.
+    //      MessageHeader - Supplies a pointer to a string descriptor for the input
+    //          message.
+    //      MessageData - Supplies a pointer to a string descriptor for the input data.
+    //      DataLength - Supplies pointer to ULONG to receive length of recv. data.
+    //      KdContext - Supplies a pointer to the kernel debugger context.
+    //
+    //  Return Value:
+    //      KDP_PACKET_RESEND - if resend is required.  = 2 = CP_GET_ERROR
+    //      KDP_PACKET_TIMEOUT - if timeout.            = 1 = CP_GET_NODATA
+    //      KDP_PACKET_RECEIVED - if packet received.   = 0 = CP_GET_SUCCESS
+{
+    ULONG       MessageLength;
+    KD_PACKET   PacketHeader;
+    KDP_STATUS  ReturnCode;
+    ULONG       Checksum;
+
+    KDDBG2("Kdp1394ReceivePacket\n");
+
+    // this dispatch gets called with PacketType != PACKET_TYPE_KD_POLL_BREAKIN for
+    // the number of times specified in KdCompNumberRetries (??).
+
+WaitForPacketLeader:
+
+    // read in our packet, if available...
+    ReturnCode = Dbg1394_ReadPacket(&PacketHeader,
+                                    MessageHeader,
+                                    MessageData,
+                                    TRUE);
+    //
+    // If we can successfully read packet leader, it has high possibility that
+    // kernel debugger is alive.  So reset count.
+    //
+    if (ReturnCode != KDP_PACKET_TIMEOUT) {
+        KdCompNumberRetries = KdCompRetryCount;
+    }
+
+    if (ReturnCode != KDP_PACKET_RECEIVED) {
+        // see if it's a breakin packet...
+        if ((PacketHeader.PacketLeader & 0xFF) == BREAKIN_PACKET_BYTE) {
+            KdContext->KdpControlCPending = TRUE;
+            return(KDP_PACKET_RESEND);
+        }
+        return(ReturnCode);
+    }
+
+    //
+    // if the packet we received is a resend request, we return true and
+    // let caller resend the packet.
+    //
+    if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER &&
+        PacketHeader.PacketType == PACKET_TYPE_KD_RESEND) {
+        return(KDP_PACKET_RESEND);
+    }
+
+    //
+    // Check ByteCount received is valid
+    //
+    MessageLength = MessageHeader->MaximumLength;
+
+    if ((PacketHeader.ByteCount > (USHORT)PACKET_MAX_SIZE) ||
+        (PacketHeader.ByteCount < (USHORT)MessageLength)) {
+        goto SendResendPacket;
+    }
+    *DataLength = PacketHeader.ByteCount - MessageLength;
+
+    MessageData->Length = (USHORT)*DataLength;
+    MessageHeader->Length = (USHORT)MessageLength;
+
+    //
+    // Check PacketType is what we are waiting for.
+    //
+    if (PacketType != PacketHeader.PacketType) {
+        goto SendResendPacket;
+    }
+
+    //
+    // Check checksum is valid.
+    //
+    Checksum = KdpComputeChecksum(MessageHeader->Buffer, MessageHeader->Length);
+    Checksum += KdpComputeChecksum(MessageData->Buffer, MessageData->Length);
+
+    if (Checksum != PacketHeader.Checksum) {
+        goto SendResendPacket;
+    }
+
+    return(KDP_PACKET_RECEIVED);
+
+SendResendPacket:
+
+    KdpSendControlPacket(PACKET_TYPE_KD_RESEND);
+    goto WaitForPacketLeader;
+}
+
+void
+Kdp1394SendPacket(
+    IN ULONG            PacketType,
+    IN PSTRING          MessageHeader,
+    IN PSTRING          MessageData OPTIONAL,
+    IN OUT PKD_CONTEXT  KdContext
+    )
+    //  Routine Description:
+    //      This routine sends a packet to the host machine that is running the
+    //      kernel debugger and waits for an ACK.
+    //
+    //  Arguments:
+    //      PacketType - Supplies the type of packet to send.
+    //      MessageHeader - Supplies a pointer to a string descriptor that describes
+    //          the message information.
+    //      MessageData - Supplies a pointer to a string descriptor that describes
+    //          the optional message data.
+    //      KdContext - Supplies a pointer to the kernel debugger context.
+    //
+    //  Return Value:
+    //      None.
+{
+    KD_PACKET                   PacketHeader;
+    ULONG                       MessageDataLength;
+    ULONG                       ReturnCode;
+    bool                        bException = FALSE;
+
+    KDDBG2("Kdp1394SendPacket\n");
+    PacketHeader.Checksum = 0;
+
+    if (MessageData != NULL) {
+        MessageDataLength = MessageData->Length;
+        PacketHeader.Checksum = KdpComputeChecksum(MessageData->Buffer, MessageData->Length);
+    }
+    else {
+        MessageDataLength = 0;
+        PacketHeader.Checksum = 0;
+    }
+
+    PacketHeader.Checksum += KdpComputeChecksum(MessageHeader->Buffer, MessageHeader->Length);
+
+    //
+    // Initialize and send the packet header.
+    //
+    PacketHeader.PacketLeader = PACKET_LEADER;
+    PacketHeader.ByteCount = (USHORT)(MessageHeader->Length + MessageDataLength);
+    PacketHeader.PacketType = (USHORT)PacketType;
+    PacketHeader.PacketId = KdPacketId;
+
+    KdPacketId++;
+
+    KdCompNumberRetries = KdCompRetryCount;
+
+    // setup our send packet
+    memset(&Kd1394Data->SendPacket, 0, sizeof(DEBUG_1394_SEND_PACKET));
+    Kd1394Data->SendPacket.Length = 0;
+
+    // copy our packet header...
+    memcpy(&Kd1394Data->SendPacket.PacketHeader[0],
+           &PacketHeader, sizeof(KD_PACKET));
+
+    // setup our message header
+    if (MessageHeader) {
+        memcpy(&Kd1394Data->SendPacket.Packet[0],
+               MessageHeader->Buffer, MessageHeader->Length);
+        Kd1394Data->SendPacket.Length += MessageHeader->Length;
+    }
+
+    // setup our message data
+    if (MessageData != NULL) {
+        memcpy(&Kd1394Data->SendPacket.Packet[Kd1394Data->SendPacket.Length],
+               MessageData->Buffer, MessageData->Length);
+        Kd1394Data->SendPacket.Length += MessageData->Length;
+    }
+
+    Kd1394Data->SendPacket.TransferStatus = STATUS_PENDING;
+
+    //
+    // We sync on first STATE_CHANGE64 message like NT.  If this
+    // is the first such message, drain receive pipe as nothing
+    // said before this instant is interesting (and any buffered
+    // packets may interact badly with SendWaitContinue).
+    //
+    if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64 /* && !KdStateChange64Sent*/) {
+        // need to do this to fix pre-logging (eventually).
+#if 0
+        UCHAR uDummy;
+        DWORD dwDrained = 0;
+        KdCompNextPacketIdToSend |= SYNC_PACKET_ID;
+        KdStateChange64Sent = TRUE;
+
+        while (KdCompGetByte(&uDummy) == CP_GET_SUCCESS)
+            dwDrained++;
+#endif // 0
+    }
+
+    do {
+        KDDBG2("LOOP %d/%d [SendPacket=%p %08x %08x %08x %02x %02x %02x %02x]\n",
+               KdCompNumberRetries, KdCompRetryCount,
+               &Kd1394Data->SendPacket,
+               Kd1394Data->SendPacket.TransferStatus,
+               *(ULONG*)&Kd1394Data->SendPacket.PacketHeader,
+               Kd1394Data->SendPacket.Length,
+               Kd1394Data->SendPacket.Packet[0],
+               Kd1394Data->SendPacket.Packet[1],
+               Kd1394Data->SendPacket.Packet[2],
+               Kd1394Data->SendPacket.Packet[3]);
+
+        // make sure our link is enabled..
+        Dbg1394_EnablePhysicalAccess();
+
+        if (KdCompNumberRetries == 0) {
+            //
+            // If the packet is not for reporting exception, we give up
+            // and declare debugger not present.
+            //
+            if (PacketType == PACKET_TYPE_KD_DEBUG_IO) {
+                PDBGKD_DEBUG_IO DebugIo
+                    = (PDBGKD_DEBUG_IO)MessageHeader->Buffer;
+
+                if (DebugIo->ApiNumber == DbgKdPrintStringApi) {
+                    KdDebuggerNotPresent = TRUE;
+                    Kd1394Data->SendPacket.TransferStatus = STATUS_SUCCESS;
+                    return;
+                }
+            }
+            else if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64) {
+                PDBGKD_ANY_WAIT_STATE_CHANGE StateChange
+                    = (PDBGKD_ANY_WAIT_STATE_CHANGE)MessageHeader->Buffer;
+                if (StateChange->NewState == DbgKdLoadSymbolsStateChange) {
+                    KdDebuggerNotPresent = TRUE;
+                    Kd1394Data->SendPacket.TransferStatus = STATUS_SUCCESS;
+                    return;
+                }
+            }
+#if 0
+            else if (PacketType == PACKET_TYPE_KD_FILE_IO) {
+                PDBGKD_FILE_IO FileIo
+                    = (PDBGKD_FILE_IO)MessageHeader->Buffer;
+                if (FileIo->ApiNumber == DbgKdCreateFileApi) {
+                    KdDebuggerNotPresent = TRUE;
+                    Kd1394Data->SendPacket.TransferStatus = STATUS_SUCCESS;
+                    return;
+                }
+            }
+#endif
+            else {
+                bException = TRUE;
+            }
+        }
+
+        ReturnCode = KDP_PACKET_TIMEOUT;
+
+        {
+            ULONG                   count = 0;
+            volatile NTSTATUS       *pStatus;
+
+            pStatus = &Kd1394Data->ReceivePacket.TransferStatus;
+
+            //
+            // now sit here and poll for a response from the host machine
+            //
+            do {
+                // make sure our link is enabled..
+                Dbg1394_EnablePhysicalAccess();
+                KdpSpin();
+
+                //
+                // while in this loop check if the host has submitted a new request.
+                // If they did, abort processing of the current request.
+                //
+                count++;
+                if (Kd1394Data->SendPacket.TransferStatus != STATUS_PENDING) {
+                    ReturnCode = KDP_PACKET_RECEIVED;
+                    break;
+                }
+
+                if ((*pStatus == STATUS_PENDING) && (!bException)) {
+                    ReturnCode = KDP_PACKET_RECEIVED;
+                    break;
+                }
+            } while (count < TIMEOUT_COUNT);
+        }
+
+        if (ReturnCode == KDP_PACKET_TIMEOUT) {
+            KdCompNumberRetries--;
+        }
+    } while (ReturnCode != KDP_PACKET_RECEIVED);
+
+    //
+    // Since we are able to talk to debugger, the retrycount is set to
+    // maximum value.
+    //
+    KdCompRetryCount = KdContext->KdpDefaultRetries;
+}
+
+// Returns TRUE if a breakin packet is pending.
+// A packet is present if: There is a valid character which matches BREAK_CHAR.
+bool Kdp1394PollBreakIn(VOID)
+{
+    KDDBG2("Kdp1394PollBreakIn\n");
+
+    // make sure our link is enabled..
+    Dbg1394_EnablePhysicalAccess();
+
+    // let's peak into our receive packet and see if it's a breakin
+    if ((Kd1394Data->ReceivePacket.TransferStatus == STATUS_PENDING) &&
+        (Kd1394Data->ReceivePacket.Packet[0] == BREAKIN_PACKET_BYTE)) {
+
+        KdDebuggerNotPresent = FALSE;
+
+        // we have a breakin packet
+        Kd1394Data->ReceivePacket.TransferStatus = STATUS_SUCCESS;
+        return true;
+    }
+    return false;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/HalKd1394.h b/base/Kernel/Native/HalKd1394.h
new file mode 100644
index 0000000..db6b6fd
--- /dev/null
+++ b/base/Kernel/Native/HalKd1394.h
@@ -0,0 +1,482 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// kd1394.h - 1394 Kernel Debugger DLL
+
+//
+// Various OHCI definitions
+//
+#define PHY_INITIATE_BUS_RESET              0x40        // IBR @ Address 1
+
+///////////////////////////////////////////////////////// Register Structures.
+//
+union VERSION_REGISTER {
+    struct {
+        ULONG       Revision:8;             // bits 0-7
+        ULONG       Reserved:8;             // bits 8-15
+        ULONG       Version:8;              // bits 16-23
+        ULONG       GUID_ROM:1;             // bit  24
+        ULONG       Reserved1:7;            // bits 25-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(VERSION_REGISTER) == 4);
+
+union VENDOR_ID_REGISTER {
+    struct {
+        ULONG       VendorCompanyId:24;     // bits 0-23
+        ULONG       VendorUnique:8;         // bits 24-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(VENDOR_ID_REGISTER) == 4);
+
+union GUID_ROM_REGISTER {
+    struct {
+        ULONG       Reserved0:16;           // bits 0-15
+        ULONG       RdData:8;               // bits 16-23
+        ULONG       Reserved1:1;            // bit  24
+        ULONG       RdStart:1;              // bit  25
+        ULONG       Reserved2:5;            // bits 26-30
+        ULONG       AddrReset:1;            // bits 31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(GUID_ROM_REGISTER) == 4);
+
+union AT_RETRIES_REGISTER {
+    struct {
+        ULONG       MaxATReqRetries:4;      // bits 0-3
+        ULONG       MaxATRespRetries:4;     // bits 4-7
+        ULONG       MaxPhysRespRetries:4;   // bits 8-11
+        ULONG       Reserved:4;             // bits 12-15
+        ULONG       CycleLimit:13;          // bits 16-28
+        ULONG       SecondLimit:3;          // bits 29-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(AT_RETRIES_REGISTER) == 4);
+
+union CSR_CONTROL_REGISTER {
+    struct {
+        ULONG       CsrSel:2;               // bits 0-1
+        ULONG       Reserved:29;            // bits 2-30
+        ULONG       CsrDone:1;              // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(CSR_CONTROL_REGISTER) == 4);
+
+union CONFIG_ROM_HEADER_REGISTER {
+    struct {
+        ULONG       Rom_crc_value:16;       // bits 0-15
+        ULONG       Crc_length:8;           // bits 16-23
+        ULONG       Info_length:8;          // bits 24-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(CONFIG_ROM_HEADER_REGISTER) == 4);
+
+union BUS_OPTIONS_REGISTER {
+    struct {
+        ULONG       Link_spd:3;             // bits 0-2
+        ULONG       Reserved0:3;            // bits 3-5
+        ULONG       g:2;                    // bits 6-7
+        ULONG       Reserved1:4;            // bits 8-11
+        ULONG       Max_rec:4;              // bits 12-15
+        ULONG       Cyc_clk_acc:8;          // bits 16-23
+        ULONG       Reserved2:3;            // bits 24-26
+        ULONG       Pmc:1;                  // bit  27
+        ULONG       Bmc:1;                  // bit  28
+        ULONG       Isc:1;                  // bit  29
+        ULONG       Cmc:1;                  // bit  30
+        ULONG       Irmc:1;                 // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(BUS_OPTIONS_REGISTER) == 4);
+
+union HC_CONTROL_REGISTER {
+    struct {
+        ULONG       Reserved:16;            // bits 0-15
+        ULONG       SoftReset:1;            // bit  16
+        ULONG       LinkEnable:1;           // bit  17
+        ULONG       PostedWriteEnable:1;    // bit  18
+        ULONG       Lps:1;                  // bit  19
+        ULONG       Reserved2:2;            // bits 20-21
+        ULONG       APhyEnhanceEnable:1;    // bit  22
+        ULONG       ProgramPhyEnable:1;     // bit  23
+        ULONG       Reserved3:6;            // bits 24-29
+        ULONG       NoByteSwapData:1;       // bit  30
+        ULONG       Reserved4:1;            // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(HC_CONTROL_REGISTER) == 4);
+
+union FAIRNESS_CONTROL_REGISTER {
+    struct {
+        ULONG       Pri_req:8;              // bits 0-7
+        ULONG       Reserved0:24;           // bits 8-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(FAIRNESS_CONTROL_REGISTER) == 4);
+
+union LINK_CONTROL_REGISTER {
+    struct {
+        ULONG       Reserved0:4;            // bits 0-3
+        ULONG       CycleSyncLReqEnable:1;  // bit  4
+        ULONG       Reserved1:4;            // bits 5-8
+        ULONG       RcvSelfId:1;            // bit  9
+        ULONG       RcvPhyPkt:1;            // bit  10
+        ULONG       Reserved2:9;            // bits 11-19
+        ULONG       CycleTimerEnable:1;     // bit  20
+        ULONG       CycleMaster:1;          // bit  21
+        ULONG       CycleSource:1;          // bit  22
+        ULONG       Reserved3:9;            // bits 23-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(LINK_CONTROL_REGISTER) == 4);
+
+union NODE_ID_REGISTER {
+    struct {
+        ULONG       NodeId:6;               // bits 0-5
+        ULONG       BusId:10;               // bits 6-15
+        ULONG       Reserved1:11;           // bits 16-26
+        ULONG       Cps:1;                  // bit  27
+        ULONG       Reserved2:2;            // bits 28-29
+        ULONG       Root:1;                 // bit  30
+        ULONG       IdValid:1;              // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(NODE_ID_REGISTER) == 4);
+
+union SELF_ID_BUFFER_REGISTER {
+    ULONG SelfIdBufferPointer;
+    struct {
+        ULONG       Reserved0:11;           // bits 0-10
+        ULONG       SelfIdBuffer:21;        // bits 11-32
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(SELF_ID_BUFFER_REGISTER) == 4);
+
+union SELF_ID_COUNT_REGISTER {
+    struct {
+        ULONG       Reserved0:2;            // bits 0-1
+        ULONG       SelfIdSize:11;          // bits 2-12
+        ULONG       Reserved1:3;            // bits 13-15
+        ULONG       SelfIdGeneration:8;     // bits 16-23
+        ULONG       Reserved2:7;            // bits 24-30
+        ULONG       SelfIdError:1;          // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(SELF_ID_COUNT_REGISTER) == 4);
+
+union PHY_CONTROL_REGISTER {
+    struct {
+        ULONG       WrData:8;               // bits 0-7
+        ULONG       RegAddr:4;              // bits 8-11
+        ULONG       Reserved0:2;            // bits 12-13
+        ULONG       WrReg:1;                // bit  14
+        ULONG       RdReg:1;                // bit  15
+        ULONG       RdData:8;               // bits 16-23
+        ULONG       RdAddr:4;               // bits 24-27
+        ULONG       Reserved1:3;            // bits 28-30
+        ULONG       RdDone:1;               // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(PHY_CONTROL_REGISTER) == 4);
+
+union ISOCH_CYCLE_TIMER_REGISTER {
+    struct {
+        ULONG       CycleOffset:12;         // bits 0-11
+        ULONG       CycleCount:13;          // bits 12-24
+        ULONG       CycleSeconds:7;         // bits 25-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(ISOCH_CYCLE_TIMER_REGISTER) == 4);
+
+union INT_EVENT_MASK_REGISTER {
+    struct {
+        ULONG       ReqTxComplete:1;        // bit  0
+        ULONG       RspTxComplete:1;        // bit  1
+        ULONG       ARRQ:1;                 // bit  2
+        ULONG       ARRS:1;                 // bit  3
+        ULONG       RQPkt:1;                // bit  4
+        ULONG       RSPPkt:1;               // bit  5
+        ULONG       IsochTx:1;              // bit  6
+        ULONG       IsochRx:1;              // bit  7
+        ULONG       PostedWriteErr:1;       // bit  8
+        ULONG       LockRespErr:1;          // bit  9
+        ULONG       Reserved0:6;            // bits 10-15
+        ULONG       SelfIdComplete:1;       // bit  16
+        ULONG       BusReset:1;             // bit  17
+        ULONG       Reserved1:1;            // bit  18
+        ULONG       Phy:1;                  // bit  19
+        ULONG       CycleSynch:1;           // bit  20
+        ULONG       Cycle64Secs:1;          // bit  21
+        ULONG       CycleLost:1;            // bit  22
+        ULONG       CycleInconsistent:1;    // bit  23
+        ULONG       UnrecoverableError:1;   // bit  24
+        ULONG       CycleTooLong:1;         // bit  25
+        ULONG       PhyRegRcvd:1;           // bit  26
+        ULONG       Reserved2:3;            // bits 27-29
+        ULONG       VendorSpecific:1;       // bit  30
+        ULONG       MasterIntEnable:1;      // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(INT_EVENT_MASK_REGISTER) == 4);
+
+union COMMAND_POINTER_REGISTER {
+    struct {
+        ULONG       Z:4;                    // bits 0-3
+        ULONG       DescriptorAddr:28;      // bits 4-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(COMMAND_POINTER_REGISTER) == 4);
+
+union CONTEXT_CONTROL_REGISTER {
+    struct {
+        ULONG       EventCode:5;            // bits 0-4
+        ULONG       Spd:3;                  // bits 5-7
+        ULONG       Reserved0:2;            // bits 8-9
+        ULONG       Active:1;               // bit  10
+        ULONG       Dead:1;                 // bit  11
+        ULONG       Wake:1;                 // bit  12
+        ULONG       Reserved1:2;            // bits 13-14
+        ULONG       Run:1;                  // bit  15
+        ULONG       Reserved2:16;           // bits 16-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(CONTEXT_CONTROL_REGISTER) == 4);
+
+union IT_CONTEXT_CONTROL_REGISTER {
+    struct {
+        ULONG       EventCode:5;            // bits 0-4
+        ULONG       Spd:3;                  // bits 5-7
+        ULONG       Reserved0:2;            // bits 8-9
+        ULONG       Active:1;               // bit  10
+        ULONG       Dead:1;                 // bit  11
+        ULONG       Wake:1;                 // bit  12
+        ULONG       Reserved1:2;            // bits 13-14
+        ULONG       Run:1;                  // bit  15
+        ULONG       CycleMatch:15;          // bits 16-30
+        ULONG       CycleMatchEnable:1;     // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(IT_CONTEXT_CONTROL_REGISTER) == 4);
+
+union IR_CONTEXT_CONTROL_REGISTER {
+    struct {
+        ULONG       EventCode:5;            // bits 0-4
+        ULONG       Spd:3;                  // bits 5-7
+        ULONG       Reserved0:2;            // bits 8-9
+        ULONG       Active:1;               // bit  10
+        ULONG       Dead:1;                 // bit  11
+        ULONG       Wake:1;                 // bit  12
+        ULONG       Reserved1:2;            // bits 13-14
+        ULONG       Run:1;                  // bit  15
+        ULONG       CycleMatch:12;          // bits 16-27
+        ULONG       MultiChanMode:1;        // bit  28
+        ULONG       CycleMatchEnable:1;     // bit  29
+        ULONG       IsochHeader:1;          // bit  30
+        ULONG       BufferFill:1;           // bit  31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(IR_CONTEXT_CONTROL_REGISTER) == 4);
+
+union CONTEXT_MATCH_REGISTER {
+    struct {
+        ULONG       ChannelNumber:6;        // bits 0-5
+        ULONG       Reserved:1;             // bit  6
+        ULONG       Tag1SyncFilter:1;       // bit  7
+        ULONG       Sync:4;                 // bits 8-11
+        ULONG       CycleMatch:13;          // bits 12-24
+        ULONG       Reserved1:3;            // bits 25-27
+        ULONG       Tag:4;                  // bit  28-31
+    };
+    ULONG all;
+};
+STATIC_ASSERT(sizeof(CONTEXT_MATCH_REGISTER) == 4);
+
+/////////////////////////////////////////////////////////////// Register Sets.
+//
+struct DMA_CONTEXT_REGISTERS {
+    CONTEXT_CONTROL_REGISTER    ContextControlSet;
+    CONTEXT_CONTROL_REGISTER    ContextControlClear;
+    ULONG                       Reserved0[1];
+    COMMAND_POINTER_REGISTER    CommandPtr;
+    ULONG                       Reserved1[4];
+};
+
+struct DMA_ISOCH_RCV_CONTEXT_REGISTERS {
+    IR_CONTEXT_CONTROL_REGISTER ContextControlSet;
+    IR_CONTEXT_CONTROL_REGISTER ContextControlClear;
+    ULONG                       Reserved0[1];
+    COMMAND_POINTER_REGISTER    CommandPtr;
+    CONTEXT_MATCH_REGISTER      ContextMatch;
+    ULONG                       Reserved1[3];
+};
+
+struct DMA_ISOCH_XMIT_CONTEXT_REGISTERS {
+    IT_CONTEXT_CONTROL_REGISTER ContextControlSet;
+    IT_CONTEXT_CONTROL_REGISTER ContextControlClear;
+    ULONG                       Reserved0[1];
+    COMMAND_POINTER_REGISTER    CommandPtr;
+};
+
+struct OHCI_REGISTER_MAP {
+    VERSION_REGISTER            Version;                // @ 0
+    GUID_ROM_REGISTER           GUID_ROM;               // @ 4
+    AT_RETRIES_REGISTER         ATRetries;              // @ 8
+    ULONG                       CsrData;                // @ C
+    ULONG                       CsrCompare;             // @ 10
+    CSR_CONTROL_REGISTER        CsrControl;             // @ 14
+    CONFIG_ROM_HEADER_REGISTER  ConfigRomHeader;        // @ 18
+    ULONG                       BusId;                  // @ 1C
+    BUS_OPTIONS_REGISTER        BusOptions;             // @ 20
+    ULONG                       GuidHi;                 // @ 24
+    ULONG                       GuidLo;                 // @ 28
+    ULONG                       Reserved0[2];           // @ 2C
+    ULONG                       ConfigRomMap;           // @ 34
+
+    ULONG                       PostedWriteAddressLo;   // @ 38
+    ULONG                       PostedWriteAddressHi;   // @ 3C
+
+    VENDOR_ID_REGISTER          VendorId;               // @ 40
+    ULONG                       Reserved1[3];           // @ 44
+
+    HC_CONTROL_REGISTER         HCControlSet;           // @ 50
+    HC_CONTROL_REGISTER         HCControlClear;         // @ 54
+
+    ULONG                       Reserved2[3];           // @ 58
+
+    SELF_ID_BUFFER_REGISTER     SelfIdBufferPtr;        // @ 64
+    SELF_ID_COUNT_REGISTER      SelfIdCount;            // @ 68
+
+    ULONG                       Reserved3[1];           // @ 6C
+
+    ULONG                       IRChannelMaskHiSet;     // @ 70
+    ULONG                       IRChannelMaskHiClear;   // @ 74
+    ULONG                       IRChannelMaskLoSet;     // @ 78
+    ULONG                       IRChannelMaskLoClear;   // @ 7C
+
+    INT_EVENT_MASK_REGISTER     IntEventSet;            // @ 80
+    INT_EVENT_MASK_REGISTER     IntEventClear;          // @ 84
+
+    INT_EVENT_MASK_REGISTER     IntMaskSet;             // @ 88
+    INT_EVENT_MASK_REGISTER     IntMaskClear;           // @ 8C
+
+    ULONG                       IsoXmitIntEventSet;     // @ 90
+    ULONG                       IsoXmitIntEventClear;   // @ 94
+
+    ULONG                       IsoXmitIntMaskSet;      // @ 98
+    ULONG                       IsoXmitIntMaskClear;    // @ 9C
+
+    ULONG                       IsoRecvIntEventSet;     // @ A0
+    ULONG                       IsoRecvIntEventClear;   // @ A4
+
+    ULONG                       IsoRecvIntMaskSet;      // @ A8
+    ULONG                       IsoRecvIntMaskClear;    // @ AC
+
+    ULONG                       Reserved4[11];          // @ B0
+
+    FAIRNESS_CONTROL_REGISTER   FairnessControl;        // @ DC
+
+    LINK_CONTROL_REGISTER       LinkControlSet;         // @ E0
+    LINK_CONTROL_REGISTER       LinkControlClear;       // @ E4
+
+    NODE_ID_REGISTER            NodeId;                 // @ E8
+    PHY_CONTROL_REGISTER        PhyControl;             // @ EC
+
+    ISOCH_CYCLE_TIMER_REGISTER  IsochCycleTimer;        // @ F0
+
+    ULONG                       Reserved5[3];           // @ F4
+
+    ULONG                       AsynchReqFilterHiSet;   // @ 100
+    ULONG                       AsynchReqFilterHiClear; // @ 104
+
+    ULONG                       AsynchReqFilterLoSet;   // @ 108
+    ULONG                       AsynchReqFilterLoClear; // @ 10C
+
+    ULONG                       PhyReqFilterHiSet;      // @ 110
+    ULONG                       PhyReqFilterHiClear;    // @ 114
+
+    ULONG                       PhyReqFilterLoSet;      // @ 118
+    ULONG                       PhyReqFilterLoClear;    // @ 11C
+
+    ULONG                       PhysicalUpperBound;     // @ 120
+    ULONG                       Reserved6[23];          // @ 124
+
+    DMA_CONTEXT_REGISTERS       AsynchContext[4];       // @ 180
+    // ATRsp_Context;   // @ 1A0
+    // ARReq_Context;   // @ 1C0
+    // ARRsp_Context;   // @ 1E0
+
+    DMA_ISOCH_XMIT_CONTEXT_REGISTERS IT_Context[32];    // @ 200
+
+    DMA_ISOCH_RCV_CONTEXT_REGISTERS IR_Context[32];     // @ 400
+};
+STATIC_ASSERT(sizeof(OHCI_REGISTER_MAP) == 2048);
+
+//
+// IEEE 1212 Configuration Rom header definition
+//
+union CONFIG_ROM_INFO {
+    struct {
+        union {
+            USHORT          CRI_CRC_Value:16;
+            struct {
+                UCHAR       CRI_Saved_Info_Length;
+                UCHAR       CRI_Saved_CRC_Length;
+            } Saved;
+        };
+        UCHAR               CRI_CRC_Length;
+        UCHAR               CRI_Info_Length;
+    };
+    ULONG   all;
+};
+STATIC_ASSERT(sizeof(CONFIG_ROM_INFO) == 4);
+
+//
+// IEEE 1212 Immediate entry definition
+//
+union IMMEDIATE_ENTRY {
+    struct {
+        ULONG               IE_Value:24;
+        ULONG               IE_Key:8;
+    };
+    ULONG   all;
+};
+STATIC_ASSERT(sizeof(IMMEDIATE_ENTRY) == 4);
+
+//
+// IEEE 1212 Directory definition
+//
+union DIRECTORY_INFO {
+    struct {
+        union {
+            USHORT          DI_CRC;
+            USHORT          DI_Saved_Length;
+        };
+        USHORT              DI_Length;
+    };
+    ULONG   all;
+};
+STATIC_ASSERT(sizeof(DIRECTORY_INFO) == 4);
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/HalKdCom.cpp b/base/Kernel/Native/HalKdCom.cpp
new file mode 100644
index 0000000..5ebdc8f
--- /dev/null
+++ b/base/Kernel/Native/HalKdCom.cpp
@@ -0,0 +1,935 @@
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  halkd.cpp: runtime support for debugging
+//
+//  For more information see:
+//      \nt\base\ntos\kd64
+//      \nt\base\boot\kdcom
+//      \nt\base\boot\kd1394
+//      \nt\base\boot\kdusb2
+//      \nt\sdktools\debuggers\ntsd64
+//
+#include "hal.h"
+#include "halkd.h"
+
+extern "C" void *  __cdecl memcpy(void *, const void *, size_t);
+extern "C" void *  __cdecl memset(void *, int, size_t);
+
+//
+// Debugger Debugging
+//
+#define KDDBG if (0) kdprintf
+#define KDDBG2 if (0) kdprintf
+
+//
+#define CP_GET_SUCCESS  0
+#define CP_GET_NODATA   1
+#define CP_GET_ERROR    2
+
+////////////////////////////////////////////////////////// COM PORT Constants.
+//
+#define COM1_PORT           0x03f8
+#define COM2_PORT           0x02f8
+#define COM3_PORT           0x03e8
+#define COM4_PORT           0x02e8
+
+#define COM_DAT             0x00
+#define COM_IEN             0x01    // interrupt enable register
+#define COM_FCR             0x02    // FIFO Control Register
+#define COM_LCR             0x03    // line control registers
+#define COM_MCR             0x04    // modem control reg
+#define COM_LSR             0x05    // line status register
+#define COM_MSR             0x06    // modem status register
+#define COM_SCR             0x07    // scratch register
+#define COM_DLL             0x00    // divisor latch least sig
+#define COM_DLM             0x01    // divisor latch most sig
+
+const UINT16 BaudRate = 1;          // 115200 bps
+
+#define COM_DATRDY          0x01
+#define COM_OUTRDY          0x20
+
+#define LC_DLAB             0x80
+
+#define CLOCK_RATE          0x1C200 // USART clock rate
+
+#define MC_DTRRTS           0x03    // Control bits to assert DTR and RTS
+#define MS_DSRCTSCD         0xB0    // Status bits for DSR, CTS and CD
+#define MS_CD               0x80
+
+#define SERIAL_MCR_LOOP     0x10    // enables loopback testing mode
+#define SERIAL_MCR_OUT1     0x04    // general purpose output.
+#define SERIAL_MSR_CTS      0x10    // (complemented) state of clear to send (CTS).
+#define SERIAL_MSR_DSR      0x20    // (complemented) state of data set ready (DSR).
+#define SERIAL_MSR_RI       0x40    // (complemented) state of ring indicator (RI).
+#define SERIAL_MSR_DCD      0x80    // (complemented) state of data carrier detect (DCD).
+
+//
+// Globals
+//
+static UINT16 KdBasePort = COM2_PORT;
+static ULONG KdCompPacketIdExpected = 0;
+static ULONG KdCompNextPacketIdToSend = 0;
+static BOOL  KdStateChange64Sent = FALSE;
+
+////////////////////////////////////////////////// Serial Port Input & Output.
+//
+static UINT8 KdReadInt8(UINT16 port)
+{
+    __asm {
+        mov eax,0;
+        mov dx,port;
+        in al,dx;
+    }
+}
+
+static void KdWriteInt8(UINT16 port, UINT8 value)
+{
+    __asm {
+        mov dx,port;
+        mov al,value;
+        out dx,al;
+    }
+}
+
+// http://byterunner.com/16550.html
+
+bool KdpComInit(Struct_Microsoft_Singularity_BootInfo *bi)
+// Initializes the communication port (baud rate, parity etc.)
+{
+    KdBasePort = bi->DebugBasePort;
+    if (KdBasePort < 0x100) {
+        KdBasePort = 0;
+        return FALSE;
+    }
+    KdCompNextPacketIdToSend = INITIAL_PACKET_ID | SYNC_PACKET_ID;
+    KdCompPacketIdExpected = INITIAL_PACKET_ID;
+
+    // turn off interrupts
+    KdWriteInt8(KdBasePort + COM_LCR, 0x00);
+    KdWriteInt8(KdBasePort + COM_IEN, 0x00);
+
+    // Turn on DTS/RTS
+    KdWriteInt8(KdBasePort + COM_MCR, MC_DTRRTS); // Needed for VirtualPC PIPE/Serial
+
+    // Turn on FIFO
+    //KdWriteInt8(KdBasePort + COM_FCR, 1);
+
+    // Set the baud rate
+    KdWriteInt8(KdBasePort + COM_LCR, LC_DLAB);  // Divisor latch access bit
+    KdWriteInt8(KdBasePort + COM_DLM, (UINT8)(BaudRate >> 8));
+    KdWriteInt8(KdBasePort + COM_DLL, (UINT8)(BaudRate & 0xFF));
+
+    // initialize the LCR
+    KdWriteInt8(KdBasePort + COM_LCR, 0x03);
+    // 8 data bits, 1 stop bit, no parity, no break
+
+    // See if the 16450/16550 scratch register is available.
+    // If not, we'll assume the serial port doesn't really exist.
+    KdWriteInt8(KdBasePort + COM_SCR, 0xff);
+    UINT8 a1 = KdReadInt8(KdBasePort + COM_SCR);
+    KdWriteInt8(KdBasePort + COM_SCR, 0x00);
+    UINT8 a2 = KdReadInt8(KdBasePort + COM_SCR);
+
+    return (bool) ((a1 == (UINT8)0xff) && (a2 == (UINT8)0x00));
+}
+
+//
+// Define wait timeout value.
+//
+#define TIMEOUT_COUNT 1024 * 10
+// #define TIMEOUT_COUNT 1024 * 200
+//#define TIMEOUT_COUNT 15
+
+static KDP_STATUS CpGetByte(OUT PUCHAR Input, BOOL WaitForByte)
+{
+    UCHAR lsr;
+    UCHAR value;
+    ULONG limitcount = WaitForByte ? TIMEOUT_COUNT : 1;
+
+    UCHAR msr;
+    msr = KdReadInt8(KdBasePort + COM_MSR);
+    KDDBG2("MSR %02x\n", msr);
+
+    while (limitcount != 0) {
+        limitcount--;
+
+        lsr = KdReadInt8(KdBasePort + COM_LSR);
+        KDDBG2("LSR %02x\n", lsr);
+        if (lsr & COM_DATRDY) {
+            value = KdReadInt8(KdBasePort + COM_DAT);
+            *Input = value & 0xff;
+            return KDP_PACKET_RECEIVED;
+        }
+    }
+    return KDP_PACKET_TIMEOUT;
+}
+
+//  Fetch a byte from the debug port and return it.
+//  N.B. It is assumed that necessary multiprocessor synchronization has been
+//  performed before this routine is called.
+//
+static KDP_STATUS KdCompGetByte(OUT PUCHAR Input)
+{
+    KDP_STATUS stat;
+    KDDBG2("KdCompGetByte\n");
+    stat = CpGetByte(Input, TRUE);
+    KDDBG2("KdCompGetByte status %d\n", stat);
+
+    return stat;
+}
+
+//  Write a byte to the debug port.
+//  N.B. It is assumed that necessary multiprocessor synchronization has been
+//  performed before this routine is called.
+//
+static VOID KdCompPutByte(IN UCHAR Output)
+{
+    KDDBG2("KdCompPutByte %02x\n", Output);
+    // wait for the com port to be ready
+    while ((KdReadInt8( KdBasePort + COM_LSR ) & COM_OUTRDY) == 0);
+
+    KDDBG2("KdCompPutByte ready\n");
+
+    // write a single char
+    KdWriteInt8(KdBasePort + COM_DAT, Output);
+    KDDBG2("KdCompPutByte done\n");
+}
+
+
+//  Fetch a byte from the debug port and return it if one is available.
+//  N.B. It is assumed that necessary multiprocessor synchronization has been
+//  performed before this routine is called.
+//
+static KDP_STATUS KdCompPollByte(OUT PUCHAR Input)
+{
+    KDDBG2("KdCompPollByte\n");
+    KDP_STATUS status = CpGetByte(Input, FALSE);
+    KDDBG2("KdCompPollByte %d\n", status);
+    return status;
+}
+
+//  Wait for a packet header leader (receive it into PacketLeader ULONG).
+//
+static
+KDP_STATUS
+KdCompReceivePacketLeader(
+    OUT PULONG PacketLeader,
+    IN OUT PKD_CONTEXT KdContext
+    )
+{
+
+    UCHAR Input;
+    UCHAR PreviousByte = 0;
+    ULONG PacketId = 0;
+    ULONG Index;
+    KDP_STATUS ReturnCode;
+    BOOLEAN BreakinDetected = FALSE;
+
+    KDDBG2("KdCompReceivePacketLeader\n");
+    //
+    // NOTE - With all the interrupts being off, it is very hard
+    // to implement the actual timeout code. (Maybe, by reading the CMOS.)
+    // Here we use a loop count to wait about 3 seconds.  The CpGetByte
+    // will return with error code = KDP_PACKET_TIMEOUT if it cannot find data
+    // byte within 1 second. Kernel debugger's timeout period is 5 seconds.
+    //
+
+    Index = 0;
+    do {
+        ReturnCode = KdCompGetByte(&Input);
+        if (ReturnCode == KDP_PACKET_TIMEOUT) {
+            if (BreakinDetected) {
+                KdContext->KdpControlCPending = TRUE;
+                return KDP_PACKET_RESEND;
+            } else {
+                KDDBG2("KdCompReceivePackerLeader returning KDP_PACKET_TIMEOUT\n");
+                return KDP_PACKET_TIMEOUT;
+            }
+        } else if (ReturnCode == KDP_PACKET_RESEND) {
+            Index = 0;
+            continue;
+        } else {                    // if (ReturnCode == KDP_PACKET_RECEIVED)
+            if ( Input == PACKET_LEADER_BYTE ||
+                 Input == CONTROL_PACKET_LEADER_BYTE ) {
+                if ( Index == 0 ) {
+                    PreviousByte = Input;
+                    Index++;
+                } else if (Input == PreviousByte ) {
+                    Index++;
+                } else {
+                    PreviousByte = Input;
+                    Index = 1;
+                }
+            } else {
+
+                //
+                // If we detect breakin character, we need to verify it
+                // validity.  (It is possible that we missed a packet leader
+                // and the breakin character is simply a data byte in the
+                // packet.)
+                // Since kernel debugger send out breakin character ONLY
+                // when it is waiting for State Change packet.  The breakin
+                // character should not be followed by any other character
+                // except packet leader byte.
+                //
+
+                if ( Input == BREAKIN_PACKET_BYTE ) {
+                    BreakinDetected = TRUE;
+                }
+                else {
+
+                    //
+                    // The following statement is ABSOLUTELY necessary.
+                    //
+
+                    BreakinDetected = FALSE;
+                }
+                Index = 0;
+            }
+        }
+    } while ( Index < 4 );
+
+    if (BreakinDetected) {
+        KdContext->KdpControlCPending = TRUE;
+    }
+
+    //
+    // return the packet leader and FALSE to indicate no resend is needed.
+    //
+
+    if ( Input == PACKET_LEADER_BYTE ) {
+        *PacketLeader = PACKET_LEADER;
+    }
+    else {
+        *PacketLeader = CONTROL_PACKET_LEADER;
+    }
+    KdDebuggerNotPresent = FALSE;
+#if 0
+    SharedUserData->KdDebuggerEnabled |= 0x00000002;
+#endif
+
+    return KDP_PACKET_RECEIVED;
+}
+
+
+static
+VOID
+KdpSendString(
+    IN PCHAR Source,
+    IN ULONG Length
+    )
+    //  Routine Description:
+    //      This routine writes a string to the kernel debugger port.
+    //
+    //  Arguments:
+    //      Source - Supplies a pointer to the output string.
+    //      Length - Supplies the length of the string to be written.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    UCHAR Output;
+
+    KDDBG2("KdpSendString len %d\n", Length);
+
+    //
+    // Write bytes to the kernel debugger port.
+    //
+
+    while (Length > 0) {
+        Output = *Source++;
+        KdCompPutByte(Output);
+        Length -= 1;
+    }
+    KDDBG2("KdpSendString done\n");
+    return;
+}
+
+static
+KDP_STATUS
+KdpReceiveString(
+    OUT PCHAR Destination,
+    IN ULONG Length
+    )
+    //  Routine Description:
+    //      This routine reads a string from the kernel debugger port.
+    //
+    //  Arguments:
+    //      Destination - Supplies a pointer to the input string.
+    //      Length - Supplies the length of the string to be read.
+{
+
+    UCHAR Input;
+    KDP_STATUS ReturnCode;
+    KDDBG2("KdpReceiveString len %d\n", Length);
+
+    //
+    // Read bytes until either an error is encountered or the entire string
+    // has been read.
+    //
+    while (Length > 0) {
+        KdpSpin();
+
+        ReturnCode = KdCompGetByte(&Input);
+        if (ReturnCode != KDP_PACKET_RECEIVED) {
+            KDDBG("KdpReceiveString return %d\n", ReturnCode);
+            return ReturnCode;
+        }
+        else {
+            *Destination++ = Input;
+            Length -= 1;
+        }
+    }
+    KDDBG2("KdpReceiveString return %d\n", KDP_PACKET_RECEIVED);
+    return KDP_PACKET_RECEIVED;
+}
+
+static
+VOID
+KdpSendControlPacket(
+    IN USHORT PacketType,
+    IN ULONG PacketId OPTIONAL
+    )
+    //  Routine Description:
+    //      This routine sends a control packet to the host machine that is running the
+    //      kernel debugger and waits for an ACK.
+    //
+    //  Arguments:
+    //      PacketType - Supplies the type of packet to send.
+    //      PacketId - Supplies packet id, optionally.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    KD_PACKET PacketHeader;
+
+    //
+    // Initialize and send the packet header.
+    //
+
+    PacketHeader.PacketLeader = CONTROL_PACKET_LEADER;
+    if (PacketId != 0) {
+        PacketHeader.PacketId = PacketId;
+    }
+    PacketHeader.ByteCount = 0;
+    PacketHeader.Checksum = 0;
+    PacketHeader.PacketType = PacketType;
+    KdpSendString((PCHAR)&PacketHeader, sizeof(KD_PACKET));
+
+    return;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+void
+KdpComSendPacket(
+                 IN ULONG PacketType,
+                 IN PSTRING MessageHeader,
+                 IN PSTRING MessageData OPTIONAL,
+                 IN OUT PKD_CONTEXT KdContext
+                )
+    //  Routine Description:
+    //      This routine sends a packet to the host machine that is running the
+    //      kernel debugger and waits for an ACK.
+    //
+    //  Arguments:
+    //      PacketType - Supplies the type of packet to send.
+    //      MessageHeader - Supplies a pointer to a string descriptor that describes
+    //          the message information.
+    //      MessageData - Supplies a pointer to a string descriptor that describes
+    //          the optional message data.
+    //      KdContext - Supplies a pointer to the kernel debugger context.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    KD_PACKET PacketHeader;
+    ULONG MessageDataLength;
+    KDP_STATUS ReturnCode;
+    KDDBG2("KdpComSendPacket %d\n", PacketType);
+
+    if (MessageData != NULL) {
+        MessageDataLength = MessageData->Length;
+        PacketHeader.Checksum = KdpComputeChecksum(MessageData->Buffer,
+                                                   MessageData->Length);
+    }
+    else {
+        MessageDataLength = 0;
+        PacketHeader.Checksum = 0;
+    }
+    PacketHeader.Checksum += KdpComputeChecksum(MessageHeader->Buffer,
+                                                MessageHeader->Length);
+
+    //
+    // Initialize and send the packet header.
+    //
+
+    PacketHeader.PacketLeader = PACKET_LEADER;
+    PacketHeader.ByteCount = (USHORT)(MessageHeader->Length + MessageDataLength);
+    PacketHeader.PacketType = (USHORT)PacketType;
+
+    KdCompNumberRetries = KdCompRetryCount;
+
+    //
+    // We sync on first STATE_CHANGE64 message like NT.  If this
+    // is the first such message, drain receive pipe as nothing
+    // said before this instant is interesting (and any buffered
+    // packets may interact badly with SendWaitContinue).
+    //
+    if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64 && !KdStateChange64Sent) {
+        //
+        UCHAR uDummy;
+        DWORD dwDrained = 0;
+        KdCompNextPacketIdToSend |= SYNC_PACKET_ID;
+        KdStateChange64Sent = TRUE;
+
+        while (KdCompGetByte(&uDummy) == KDP_PACKET_RECEIVED)
+            dwDrained++;
+    }
+
+    do {
+        KDDBG2("LOOP %d/%d\n", KdCompNumberRetries, KdCompRetryCount);
+        if (KdCompNumberRetries == 0) {
+            KDDBG("KdCompNumberRetries == 0\n");
+            //
+            // If the packet is not for reporting exception, we give up
+            // and declare debugger not present.
+            //
+            if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64) {
+                PDBGKD_ANY_WAIT_STATE_CHANGE StateChange
+                    = (PDBGKD_ANY_WAIT_STATE_CHANGE)MessageHeader->Buffer;
+                if (StateChange->NewState == DbgKdLoadSymbolsStateChange) {
+                    KdDebuggerNotPresent = TRUE;
+                    //SharedUserData->KdDebuggerEnabled &= ~0x00000002;
+                    KdCompNextPacketIdToSend = INITIAL_PACKET_ID | SYNC_PACKET_ID;
+                    KdCompPacketIdExpected = INITIAL_PACKET_ID;
+                    return;
+                }
+            }
+            else if (PacketType == PACKET_TYPE_KD_DEBUG_IO) {
+                PDBGKD_DEBUG_IO DebugIo
+                    = (PDBGKD_DEBUG_IO)MessageHeader->Buffer;
+                if (DebugIo->ApiNumber == DbgKdPrintStringApi) {
+                    KdDebuggerNotPresent = TRUE;
+                    //SharedUserData->KdDebuggerEnabled &= ~0x00000002;
+                    KdCompNextPacketIdToSend = INITIAL_PACKET_ID | SYNC_PACKET_ID;
+                    KdCompPacketIdExpected = INITIAL_PACKET_ID;
+                    return;
+                }
+            }
+#if 0
+            else if (PacketType == PACKET_TYPE_KD_FILE_IO) {
+                PDBGKD_FILE_IO FileIo;
+
+                FileIo = (PDBGKD_FILE_IO)MessageHeader->Buffer;
+                if (FileIo->ApiNumber == DbgKdCreateFileApi) {
+                    KdDebuggerNotPresent = TRUE;
+                    //SharedUserData->KdDebuggerEnabled &= ~0x00000002;
+                    KdCompNextPacketIdToSend = INITIAL_PACKET_ID | SYNC_PACKET_ID;
+                    KdCompPacketIdExpected = INITIAL_PACKET_ID;
+                    return;
+                }
+            }
+#endif
+        }
+        //
+        // Setting PacketId has to be in the do loop in case Packet Id was
+        // reset.
+        //
+
+        PacketHeader.PacketId = KdCompNextPacketIdToSend;
+        KdpSendString((PCHAR)&PacketHeader, sizeof(KD_PACKET));
+
+        //
+        // Output message header.
+        //
+
+        KdpSendString(MessageHeader->Buffer, MessageHeader->Length);
+
+        //
+        // Output message data.
+        //
+
+        if ( MessageDataLength ) {
+            KdpSendString(MessageData->Buffer, MessageData->Length);
+        }
+
+        //
+        // Output a packet trailing byte
+        //
+
+        KdCompPutByte(PACKET_TRAILING_BYTE);
+
+        //
+        // Wait for the Ack Packet
+        //
+
+        ReturnCode = KdpComReceivePacket(
+                                         PACKET_TYPE_KD_ACKNOWLEDGE,
+                                         NULL,
+                                         NULL,
+                                         NULL,
+                                         KdContext
+                                        );
+        if (ReturnCode == KDP_PACKET_TIMEOUT) {
+            KDDBG2("TIMEOUT\n");
+            KdCompNumberRetries--;
+        }
+        KdpSpin();
+    } while (ReturnCode != KDP_PACKET_RECEIVED);
+
+    KDDBG2("KD: PACKET_RECEIVED\n");
+    //
+    // Reset Sync bit in packet id.  The packet we sent may have Sync bit set
+    //
+
+    KdCompNextPacketIdToSend &= ~SYNC_PACKET_ID;
+
+    //
+    // Since we are able to talk to debugger, the retrycount is set to
+    // maximum value.
+    //
+
+    KdCompRetryCount = KdContext->KdpDefaultRetries;
+
+    KDDBG2("KdpComSendPacket %d done\n", PacketType);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+KDP_STATUS
+KdpComReceivePacket(
+                    IN ULONG PacketType,
+                    OUT PSTRING MessageHeader,
+                    OUT PSTRING MessageData,
+                    OUT PULONG DataLength,
+                    IN OUT PKD_CONTEXT KdContext
+                   )
+    //  Routine Description:
+    //      This routine receives a packet from the host machine that is running
+    //      the kernel debugger UI.  This routine is ALWAYS called after packet being
+    //      sent by caller.  It first waits for ACK packet for the packet sent and
+    //      then waits for the packet desired.
+    //
+    //      N.B. If caller is KdPrintString, the parameter PacketType is
+    //         PACKET_TYPE_KD_ACKNOWLEDGE.  In this case, this routine will return
+    //         right after the ack packet is received.
+    //
+    //  Arguments:
+    //      PacketType - Supplies the type of packet that is excepted.
+    //      MessageHeader - Supplies a pointer to a string descriptor for the input
+    //          message.
+    //      MessageData - Supplies a pointer to a string descriptor for the input data.
+    //      DataLength - Supplies pointer to ULONG to receive length of recv. data.
+    //      KdContext - Supplies a pointer to the kernel debugger context.
+    //
+    //  Return Value:
+    //      KDP_PACKET_RESEND - if resend is required.
+    //      KDP_PAKCET_TIMEOUT - if timeout.
+    //      KDP_PACKET_RECEIVED - if packet received.
+{
+
+    UCHAR Input;
+    ULONG MessageLength;
+    KD_PACKET PacketHeader;
+    KDP_STATUS ReturnCode;
+    ULONG Checksum;
+
+    KDDBG2("KdpComReceivePacket %d\n", PacketType);
+
+  WaitForPacketLeader:
+
+    KdpSpin();
+
+    //
+    // Read Packet Leader
+    //
+    ReturnCode = KdCompReceivePacketLeader(&PacketHeader.PacketLeader, KdContext);
+    KDDBG2("KdCompReceivePacketLeader returned %d\n", ReturnCode);
+
+    //
+    // If we can successfully read packet leader, it has high possibility that
+    // kernel debugger is alive.  So reset count.
+    //
+    if (ReturnCode != KDP_PACKET_TIMEOUT) {
+        KdCompNumberRetries = KdCompRetryCount;
+    }
+    if (ReturnCode != KDP_PACKET_RECEIVED) {
+        return ReturnCode;
+    }
+
+    //
+    // Read packet type.
+    //
+    ReturnCode = KdpReceiveString((PCHAR)&PacketHeader.PacketType,
+                                  sizeof(PacketHeader.PacketType));
+    if (ReturnCode == KDP_PACKET_TIMEOUT) {
+        return KDP_PACKET_TIMEOUT;
+    }
+    else if (ReturnCode == KDP_PACKET_RESEND) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            //
+            // If read error and it is for a control packet, simply
+            // pretend that we have not seen this packet.  Hopefully
+            // we will receive the packet we desire which automatically acks
+            // the packet we just sent.
+            //
+            goto WaitForPacketLeader;
+        }
+        else {
+            //
+            // if read error while reading data packet, we have to ask
+            // kernel debugger to resend us the packet.
+            //
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // if the packet we received is a resend request, we return true and
+    // let caller resend the packet.
+    //
+    if ( PacketHeader.PacketLeader == CONTROL_PACKET_LEADER &&
+         PacketHeader.PacketType == PACKET_TYPE_KD_RESEND ) {
+        return KDP_PACKET_RESEND;
+    }
+
+    //
+    // Read data length.
+    //
+    ReturnCode = KdpReceiveString((PCHAR)&PacketHeader.ByteCount,
+                                  sizeof(PacketHeader.ByteCount));
+    if (ReturnCode == KDP_PACKET_TIMEOUT) {
+        return KDP_PACKET_TIMEOUT;
+    }
+    else if (ReturnCode == KDP_PACKET_RESEND) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            goto WaitForPacketLeader;
+        }
+        else {
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // Read Packet Id.
+    //
+    ReturnCode = KdpReceiveString((PCHAR)&PacketHeader.PacketId,
+                                  sizeof(PacketHeader.PacketId));
+
+    if (ReturnCode == KDP_PACKET_TIMEOUT) {
+        return KDP_PACKET_TIMEOUT;
+    }
+    else if (ReturnCode == KDP_PACKET_RESEND) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            goto WaitForPacketLeader;
+        }
+        else {
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // Read packet checksum.
+    //
+    ReturnCode = KdpReceiveString((PCHAR)&PacketHeader.Checksum,
+                                  sizeof(PacketHeader.Checksum));
+    if (ReturnCode == KDP_PACKET_TIMEOUT) {
+        return KDP_PACKET_TIMEOUT;
+    }
+    else if (ReturnCode == KDP_PACKET_RESEND) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            goto WaitForPacketLeader;
+        }
+        else {
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // A complete packet header is received.  Check its validity and
+    // perform appropriate action depending on packet type.
+    //
+    if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER ) {
+        if (PacketHeader.PacketType == PACKET_TYPE_KD_ACKNOWLEDGE ) {
+            //
+            // If we received an expected ACK packet and we are not
+            // waiting for any new packet, update outgoing packet id
+            // and return.  If we are NOT waiting for ACK packet
+            // we will keep on waiting.  If the ACK packet
+            // is not for the packet we send, ignore it and keep on waiting.
+            //
+            if (PacketHeader.PacketId !=
+                (KdCompNextPacketIdToSend & ~SYNC_PACKET_ID))  {
+                goto WaitForPacketLeader;
+            }
+            else if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) {
+                KdCompNextPacketIdToSend ^= 1;
+                return KDP_PACKET_RECEIVED;
+            } else {
+                goto WaitForPacketLeader;
+            }
+        }
+        else if (PacketHeader.PacketType == PACKET_TYPE_KD_RESET) {
+            //
+            // if we received Reset packet, reset the packet control variables
+            // and resend earlier packet.
+            //
+            KdCompNextPacketIdToSend = INITIAL_PACKET_ID;
+            KdCompPacketIdExpected = INITIAL_PACKET_ID;
+            KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0L);
+            return KDP_PACKET_RESEND;
+        }
+        else if (PacketHeader.PacketType == PACKET_TYPE_KD_RESEND) {
+            return KDP_PACKET_RESEND;
+        }
+        else {
+            //
+            // Invalid packet header, ignore it.
+            //
+            goto WaitForPacketLeader;
+        }
+
+        //
+        // The packet header is for data packet (not control packet).
+        //
+
+    }
+    else if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) {
+        //
+        // if we are waiting for ACK packet ONLY
+        // and we receive a data packet header, check if the packet id
+        // is what we expected.  If yes, assume the acknowledge is lost (but
+        // sent), ask sender to resend and return with PACKET_RECEIVED.
+        //
+        if (PacketHeader.PacketId == KdCompPacketIdExpected) {
+            KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0L);
+            KdCompNextPacketIdToSend ^= 1;
+            return KDP_PACKET_RECEIVED;
+        }
+        else {
+            KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                                 PacketHeader.PacketId);
+            goto WaitForPacketLeader;
+        }
+    }
+
+    //
+    // we are waiting for data packet and we received the packet header
+    // for data packet. Perform the following checks to make sure
+    // it is the packet we are waiting for.
+    //
+
+    //
+    // Check ByteCount received is valid
+    //
+    MessageLength = MessageHeader->MaximumLength;
+    if ((PacketHeader.ByteCount > (USHORT)PACKET_MAX_SIZE) ||
+        (PacketHeader.ByteCount < (USHORT)MessageLength)) {
+        goto SendResendPacket;
+    }
+    *DataLength = PacketHeader.ByteCount - MessageLength;
+
+    //
+    // Read the message header.
+    //
+    ReturnCode = KdpReceiveString(MessageHeader->Buffer, MessageLength);
+    if (ReturnCode != KDP_PACKET_RECEIVED) {
+        goto SendResendPacket;
+    }
+    MessageHeader->Length = (USHORT)MessageLength;
+
+    //
+    // Read the message data.
+    //
+    ReturnCode = KdpReceiveString(MessageData->Buffer, *DataLength);
+    if (ReturnCode != KDP_PACKET_RECEIVED) {
+        goto SendResendPacket;
+    }
+    MessageData->Length = (USHORT)*DataLength;
+
+    //
+    // Read packet trailing byte
+    //
+    ReturnCode = KdCompGetByte(&Input);
+    if (ReturnCode != KDP_PACKET_RECEIVED || Input != PACKET_TRAILING_BYTE) {
+        goto SendResendPacket;
+    }
+
+    //
+    // Check PacketType is what we are waiting for.
+    //
+    if (PacketType != PacketHeader.PacketType) {
+        KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                             PacketHeader.PacketId);
+        goto WaitForPacketLeader;
+    }
+
+    //
+    // Check PacketId is valid.
+    //
+    if (PacketHeader.PacketId == INITIAL_PACKET_ID ||
+        PacketHeader.PacketId == (INITIAL_PACKET_ID ^ 1)) {
+        if (PacketHeader.PacketId != KdCompPacketIdExpected) {
+            KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                                 PacketHeader.PacketId);
+            goto WaitForPacketLeader;
+        }
+    }
+    else {
+        goto SendResendPacket;
+    }
+
+    //
+    // Check checksum is valid.
+    //
+    Checksum = KdpComputeChecksum(MessageHeader->Buffer,
+                                  MessageHeader->Length);
+    Checksum += KdpComputeChecksum(MessageData->Buffer,
+                                   MessageData->Length);
+    if (Checksum != PacketHeader.Checksum) {
+        goto SendResendPacket;
+    }
+
+    //
+    // Send Acknowledge byte and the Id of the packet received.
+    // Then, update the ExpectId for next incoming packet.
+    //
+    KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                         PacketHeader.PacketId);
+
+    //
+    // We have successfully received the packet so update the
+    // packet control variables and return success.
+    //
+    KdCompPacketIdExpected ^= 1;
+    KDDBG2("KdpComReceivePacket - got one!\n");
+    return KDP_PACKET_RECEIVED;
+
+  SendResendPacket:
+    KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0L);
+    goto WaitForPacketLeader;
+}
+
+// Returns TRUE if a breakin packet is pending.
+// A packet is present if: There is a valid character which matches BREAK_CHAR.
+bool KdpComPollBreakIn()
+{
+    KDDBG2("KdpComPollBreakIn\n");
+    UCHAR Input;
+    ULONG Status = KdCompPollByte(&Input);
+    KDDBG2("KdCompPollByte STATUS %d Input %02x\n", Status, Input);
+    if ((Status == KDP_PACKET_RECEIVED) && (Input == BREAKIN_PACKET_BYTE)) {
+        KDDBG("KDP_PACKET_RECEIVED\n");
+        KdDebuggerNotPresent = FALSE;
+        return true;
+    }
+    return false;
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Hypervisor.cpp b/base/Kernel/Native/Hypervisor.cpp
new file mode 100644
index 0000000..0cfb3d7
--- /dev/null
+++ b/base/Kernel/Native/Hypervisor.cpp
@@ -0,0 +1,71 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   hyper.cpp
+//
+//  Note:
+//      Hypervisor interaction
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+
+uint16 Class_Microsoft_Singularity_Hypervisor::g_DispatchRepHypercall(uint16 callCode, 
+                                                                      uint16 *reps, uint16 start,
+                                                                      UIntPtr inputBuffer, UIntPtr outputBuffer)
+{
+    uint32 hi = ((uint32)*reps) | (((uint32)start) << 16);
+    uint32 lo = (uint32) callCode;
+
+    uint32 result, complete;
+
+    uint32 dest = Struct_Microsoft_Singularity_BootInfo_HYPERCALL_PAGE;
+
+    __asm {
+        mov edx, hi;
+        mov eax, lo;
+        xor ebx, ebx;
+        mov ecx, inputBuffer;
+        xor edi, edi;
+        mov esi, outputBuffer;
+
+        call dest;
+
+        mov result, eax;
+        mov complete, edx;
+    }
+
+    *reps = (complete&0x3F);
+    return (result&0xff);
+}
+
+uint16 Class_Microsoft_Singularity_Hypervisor::g_DispatchHypercall(uint16 callCode,
+                                                                   UIntPtr inputBuffer, UIntPtr outputBuffer)
+{
+    uint32 lo = (uint32) callCode;
+
+    uint32 result;
+
+    uint32 dest = Struct_Microsoft_Singularity_BootInfo_HYPERCALL_PAGE;
+
+    __asm {
+        xor edx, edx;
+        mov eax, lo;
+        xor ebx, ebx;
+        mov ecx, inputBuffer;
+        xor edi, edi;
+        mov esi, outputBuffer;
+
+        call dest;
+
+        mov result, eax;
+    }
+
+    return (result&0xff);
+}
+
+#endif // SINGULARITY_KERNEL
diff --git a/base/Kernel/Native/IoPort.cpp b/base/Kernel/Native/IoPort.cpp
new file mode 100644
index 0000000..76268e9
--- /dev/null
+++ b/base/Kernel/Native/IoPort.cpp
@@ -0,0 +1,104 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoPort.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+#if SINGULARITY
+
+///////////////////////////////////////////////////////////// I/O Port Access.
+//
+
+uint8 Class_Microsoft_Singularity_Io_IoPort::g_HalReadInt8(uint32 port)
+{
+    __asm {
+        mov eax,0;
+        mov edx,port;
+        in al,dx;
+    }
+}
+
+uint16 Class_Microsoft_Singularity_Io_IoPort::g_HalReadInt16(uint32 port)
+{
+    __asm {
+        mov eax,0;
+        mov edx,port;
+        in ax,dx;
+    }
+}
+
+uint32 Class_Microsoft_Singularity_Io_IoPort::g_HalReadInt32(uint32 port)
+{
+    __asm {
+        mov edx,port;
+        in eax,dx;
+    }
+}
+
+void Class_Microsoft_Singularity_Io_IoPort::g_HalWriteInt8(uint32 port,
+                                                           uint8  value)
+{
+    __asm {
+        mov edx,port;
+        mov al,value;
+        out dx,al;
+    }
+}
+
+void Class_Microsoft_Singularity_Io_IoPort::g_HalWriteInt16(uint32 port,
+                                                            uint16 value)
+{
+    __asm {
+        mov edx,port;
+        mov ax,value;
+        out dx,ax;
+    }
+}
+
+void Class_Microsoft_Singularity_Io_IoPort::g_HalWriteInt32(uint32 port,
+                                                            uint32 value)
+{
+    __asm {
+        mov edx,port;
+        mov eax,value;
+        out dx,eax;
+    }
+}
+
+#if DO_UNSAFE_CODE_IN_IO
+void Class_Microsoft_Singularity_Io_IoPort::g_HalReadFifo16(uint32 port,
+                                                            uint16 *buffer,
+                                                            uint32 count)
+{
+    __asm {
+        mov edx,port;
+        mov edi,buffer;
+        mov ecx,count;
+        rep insw;
+    }
+}
+
+void Class_Microsoft_Singularity_Io_IoPort::g_HalWriteFifo16(uint32 port,
+                                                             uint16 *buffer,
+                                                             uint32 count)
+{
+    __asm {
+        mov edx,port;
+        mov esi,buffer;
+        mov ecx,count;
+        rep outsw;
+    }
+}
+#endif // DO_UNSAFE_CODE_IN_IO
+
+#endif // SINGULARITY_KERNEL
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Math.cpp b/base/Kernel/Native/Math.cpp
new file mode 100644
index 0000000..50fda5b
--- /dev/null
+++ b/base/Kernel/Native/Math.cpp
@@ -0,0 +1,946 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Math.cpp
+//
+//  Note:
+//
+
+#define LITTL_ENDIAN
+
+#include "hal.h"
+
+#pragma warning(disable: 4725)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define IMCW_EM         0x003f          // interrupt Exception Masks
+#define IEM_INVALID     0x0001          //   invalid
+#define IEM_DENORMAL    0x0002          //   denormal
+#define IEM_ZERODIVIDE  0x0004          //   zero divide
+#define IEM_OVERFLOW    0x0008          //   overflow
+#define IEM_UNDERFLOW   0x0010          //   underflow
+#define IEM_PRECISION   0x0020          //   precision
+
+#define IMCW_RC         0x0c00          // Rounding Control
+#define IRC_CHOP        0x0c00          //   chop
+#define IRC_UP          0x0800          //   up
+#define IRC_DOWN        0x0400          //   down
+#define IRC_NEAR        0x0000          //   near
+
+#define ISW_INVALID     0x0001          // invalid
+#define ISW_DENORMAL    0x0002          // denormal
+#define ISW_ZERODIVIDE  0x0004          // zero divide
+#define ISW_OVERFLOW    0x0008          // overflow
+#define ISW_UNDERFLOW   0x0010          // underflow
+#define ISW_PRECISION   0x0020          // inexact
+
+#define IMCW_PC         0x0300          // Precision Control
+#define IPC_24          0x0000          //    24 bits
+#define IPC_53          0x0200          //    53 bits
+#define IPC_64          0x0300          //    64 bits
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#ifdef BIG_ENDIAN
+// big endian
+#define D_EXP(x) ((unsigned short *)&(x))
+#define D_HI(x) ((unsigned long *)&(x))
+#define D_LO(x) ((unsigned long *)&(x)+1)
+#else
+#define D_EXP(x) ((unsigned short *)&(x)+3)
+#define D_HI(x) ((unsigned long *)&(x)+1)
+#define D_LO(x) ((unsigned long *)&(x))
+#endif
+
+#define D_BIASM1 0x3fe // off by one to compensate for the implied bit
+#define MAXEXP 1024
+#define MINEXP -1021
+
+// return the int representation of the exponent
+// if x = .f * 2^n, 0.5<=f<1, return n (unbiased)
+// e.g. INTEXP(3.0) == 2
+#define INTEXP(x) ((signed short)((*D_EXP(x) & 0x7ff0) >> 4) - D_BIASM1)
+
+
+// check for infinity, NAN
+#define D_ISINF(x) ((*D_HI(x) & 0x7fffffff) == 0x7ff00000 && *D_LO(x) == 0)
+#define IS_D_SPECIAL(x) ((*D_EXP(x) & 0x7ff0) == 0x7ff0)
+#define IS_D_NAN(x) (IS_D_SPECIAL(x) && !D_ISINF(x))
+
+#define IS_D_QNAN(x)    ((*D_EXP(x) & 0x7ff8) == 0x7ff8)
+#define IS_D_SNAN(x)    ((*D_EXP(x) & 0x7ff8) == 0x7ff0 && \
+                         (*D_HI(x) << 13 || *D_LO(x)))
+
+#define IS_D_DENORM(x)  ((*D_EXP(x) & 0x7ff0) == 0  && \
+                         (*D_HI(x) << 12 || *D_LO(x)))
+
+#define IS_D_INF(x)  (*D_HI(x) == 0x7ff00000 && *D_LO(x) == 0)
+#define IS_D_MINF(x) (*D_HI(x) == 0xfff00000 && *D_LO(x) == 0)
+
+/////////////////////////////////////////////////////// Define special values.
+//
+typedef union {
+    uint64  lng;
+    float64 dbl;
+} _dbl;
+
+static _dbl _d_pos_inf = { 0x7ff0000000000000 };    // positive infinity
+static _dbl _d_neg_inf = { 0xfff0000000000000 };    // negative infinity
+static _dbl _d_ind     = { 0xfff8000000000000 };    // real indefinite
+static _dbl _d_neg_zer = { 0x8000000000000000 };    // negative zero
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+__declspec(naked) uint16 __fastcall g_ClearFp()
+{
+    __asm {
+        push ebp
+        mov ebp, esp
+
+        // Save the old SW
+        fnstsw [esp-4];
+        fnclex
+        mov eax, [esp-4];
+        and eax, 0xffff;
+
+        pop ebp;
+        ret; // Returns result in EAX
+    }
+}
+
+// Doesn't alter any additional registers
+__declspec(naked) uint16 __fastcall g_ControlFp(uint16 newctrl, uint16 mask)
+{
+    (void)newctrl; (void)mask;  // accessed directly via ecx, edx respectively.
+    __asm {
+        push ebp
+        mov ebp, esp
+
+        // Save the old CW
+        fstcw [esp-4];
+        mov eax, [esp-4];
+        and eax, 0xffff;
+
+        // Load the new CW
+        and ecx,edx;
+        not edx;
+        and edx,eax;
+        or  edx,ecx;
+        mov [esp-4], edx;
+        fldcw [esp-4];
+
+        pop ebp
+        ret;
+    }
+}
+
+// Doesn't alter any additional registers
+__declspec(naked) void __fastcall g_RestoreFp(uint16 newctrl)
+{
+    (void)newctrl;  // accessed directly via ecx.
+    __asm {
+        push ebp
+        mov ebp, esp
+
+        // Load the new CW
+        and ecx, 0xffff;
+        mov [esp-4], ecx;
+        fldcw [esp-4];
+
+        pop ebp
+        ret;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static float64 __fastcall _frnd(float64 v)
+{
+    _asm {
+        fld v;
+        frndint;
+    }
+}
+
+static int32 __fastcall _ftoi(float64 v)
+{
+    int32 intval;
+    int32 oldcw;
+    int32 newcw;
+    _asm {
+        fstcw [oldcw];      // get control word
+
+        mov eax, [oldcw];   // round mode saved
+        or  eax, IRC_CHOP;  // set chop rounding mode
+        mov [newcw], eax;   // back to memory
+
+        fldcw [newcw];      // reset rounding
+        fld v;
+        fistp [intval];     // store chopped integer
+        fwait;
+        fldcw [oldcw];      // restore rounding
+    }
+    return intval;
+}
+
+static float64 _abs(float64 x)
+{
+    (*(uint64 *)&x) &= 0x7fffffffffffffff;
+    return x;
+}
+
+static float64 _set_exp(float64 x, int exp) // does not check validity of exp
+{
+    float64 retval = x;
+    int biased_exp = exp + D_BIASM1;
+    *D_EXP(retval) = (unsigned short) (*D_EXP(x) & 0x800f | (biased_exp << 4));
+    return retval;
+}
+
+int _get_exp(float64 x)
+{
+    signed short exp;
+    exp = (signed short)((*D_EXP(x) & 0x7ff0) >> 4);
+    exp -= D_BIASM1; //unbias
+    return (int) exp;
+}
+
+
+//  Provide the mantissa and  the exponent of e^x
+//
+//  Entry:
+//     x : a (non special) float64 precision number
+//
+//  Exit:
+//     *newexp: the exponent of e^x
+//     return value: the mantissa m of e^x scaled by a factor
+//                   (the value of this factor has no significance.
+//                    The mantissa can be obtained with _set_exp(m, 0).
+//
+//     _set_exp(m, *pnewexp) may be used for constructing the final
+//     result, if it is within the representable range.
+//
+static inline float64 r_exp_p(float64 z)
+{
+    static float64 const p0 = 0.249999999999999993e+0;
+    static float64 const p1 = 0.694360001511792852e-2;
+    static float64 const p2 = 0.165203300268279130e-4;
+
+    return ( (p2 * (z) + p1) * (z) + p0 );
+}
+
+static inline float64 r_exp_q(float64 z)
+{
+    static float64 const q0 = 0.500000000000000000e+0;
+    static float64 const q1 = 0.555538666969001188e-1;
+    static float64 const q2 = 0.495862884905441294e-3;
+
+    return ( (q2 * (z) + q1) * (z) + q0 );
+}
+
+float64 _exphlp(float64 x, int * pnewexp)
+{
+    static float64 const  LN2INV =  1.442695040889634074;      // 1/ln(2)
+    static float64 const  C1     =  0.693359375000000000;
+    static float64 const  C2     = -2.1219444005469058277e-4;
+    float64 xn;
+    float64 g,z,gpz,qz,rg;
+    int n;
+
+    xn = _frnd(x * LN2INV);
+    n = _ftoi(xn);
+
+    // assume guard digit is present
+    g = (x - xn * C1) - xn * C2;
+    z = g*g;
+    gpz = g * r_exp_p(z);
+    qz = r_exp_q(z);
+    rg = 0.5 + gpz/(qz-gpz);
+
+    n++;
+
+    *pnewexp = _get_exp(rg) + n;
+    return rg;
+}
+
+//
+// Decompose a number to a normalized mantissa and exponent.
+//
+static float64 _decomp(float64 x, int *pexp)
+{
+    int exp;
+    float64 man;
+
+    if (x == 0.0) {
+        man = 0.0;
+        exp = 0;
+    }
+    else if (IS_D_DENORM(x)) {
+        int neg;
+
+        exp = 1 - D_BIASM1;
+        neg = x < 0.0;
+        while((*D_EXP(x) & 0x0010) == 0) {
+            // shift mantissa to the left until bit 52 is 1
+            (*D_HI(x)) <<= 1;
+            if (*D_LO(x) & 0x80000000)
+                (*D_HI(x)) |= 0x1;
+            (*D_LO(x)) <<= 1;
+            exp--;
+        }
+        (*D_EXP(x)) &= 0xffef; // clear bit 52
+        if (neg) {
+            (*D_EXP(x)) |= 0x8000; // set sign bit
+        }
+        man = _set_exp(x,0);
+    }
+    else {
+        man = _set_exp(x,0);
+        exp = INTEXP(x);
+    }
+
+    *pexp = exp;
+    return man;
+}
+
+static bool is_odd_integer(float64 y)
+{
+    int exp = INTEXP(y);
+    if (exp < 1 || exp > 63) {
+        return false;
+    }
+    return(((*(uint64*)&y) | 0x10000000000000u) << (10 + exp) == 0x8000000000000000);
+}
+
+static bool is_even_integer(float64 y)
+{
+    int exp = INTEXP(y);
+    if (exp < 1 || exp > 63) {
+        return false;
+    }
+    return (((*(uint64*)&y) | 0x10000000000000u) << (10 + exp) == 0);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+float64 Class_System_Math::g_Round(float64 v)
+{
+    return _frnd(v);
+}
+
+float64 Class_System_Math::g_Sin(float64 v)
+{
+    __asm {
+        fld v;
+        fsin; // Returns result in ST(0)
+    }
+}
+
+float64 Class_System_Math::g_Cos(float64 v)
+{
+    __asm {
+        fld v;
+        fcos; // Returns result in ST(0)
+    }
+}
+
+float64 Class_System_Math::g_Tan(float64 v)
+{
+    __asm {
+        fld v;
+        fptan;
+        fstp ST(0); // Returns result in ST(0)
+    }
+}
+
+float64 Class_System_Math::g_Atan(float64 v)
+{
+    __asm {
+        fld v;
+        fld1;
+        fpatan;
+    }
+}
+
+float64 Class_System_Math::g_Atan2(float64 v, float64 w)
+{
+    __asm {
+        fld v;
+        fld w;
+        fpatan;
+    }
+}
+
+float64 Class_System_Math::g_Abs(float64 v)
+{
+    __asm {
+        fld v;
+        fabs;
+    }
+}
+
+float64 Class_System_Math::g_Sqrt(float64 v)
+{
+    __asm {
+        fld v;
+        fsqrt;
+    }
+}
+
+float64 Class_System_Math::g_Log(float64 v)
+{
+    __asm {
+        fld v;
+        fldln2;
+        fxch ST(1);
+        fyl2x; // Returns result in ST(0)
+    }
+}
+
+float64 Class_System_Math::g_Log10(float64 v)
+{
+    __asm {
+        fld v;
+        fldlg2;
+        fxch ST(1);
+        fyl2x; // Returns result in ST(0)
+    }
+}
+
+float64 Class_System_Math::g_Exp(float64 v)
+{
+    __asm {
+        fldl2e;
+        fmul v;
+        fld ST(0);
+        frndint;
+        fxch ST(1);
+        fsub ST(0), ST(1);
+        f2xm1;
+        fld1;
+        faddp ST(1), ST(0);
+        fscale;
+        fstp ST(1); // Returns result in ST(0)
+    }
+}
+
+// constants for the rational approximation
+static inline float64 r_sinh_p(float64 f)
+{
+    static float64 const p0 = -0.35181283430177117881e+6;
+    static float64 const p1 = -0.11563521196851768270e+5;
+    static float64 const p2 = -0.16375798202630751372e+3;
+    static float64 const p3 = -0.78966127417357099479e+0;
+
+    return (((p3 * (f) + p2) * (f) + p1) * (f) + p0);
+}
+
+static inline float64 r_sinh_q(float64 f)
+{
+    static float64 const q0 = -0.21108770058106271242e+7;
+    static float64 const q1 =  0.36162723109421836460e+5;
+    static float64 const q2 = -0.27773523119650701667e+3;
+    // q3 = 1 is not used (avoid multiplication by 1)
+
+    return ((((f) + q2) * (f) + q1) * (f) + q0);
+}
+
+// Compute the hyperbolic sine of a number.
+//  The algorithm (reduction / rational approximation) is
+// taken from Cody & Waite.
+float64 Class_System_Math::g_Sinh(float64 v)
+{
+    static float64 const EPS  = 5.16987882845642297e-26;    // 2^(-53) / 2
+    // exp(YBAR) should be close to but less than XMAX
+    // and 1/exp(YBAR) should not underflow
+    static float64 const YBAR = 7.00e2;
+
+    // WMAX=ln(OVFX)+0.69 (Cody & Waite),omitted LNV, used OVFX instead of BIGX
+
+    static float64 const WMAX = 1.77514678223345998953e+003;
+
+    float64 result;
+
+    if (IS_D_SPECIAL(v)) {
+        if (IS_D_INF(v) || IS_D_MINF(v)) {
+        }
+        else if (IS_D_QNAN(v)) {
+            // should throw a soft exception.
+        }
+        else if (IS_D_SNAN(v)) {
+            // should throw a hard exception.
+        }
+        result = v;
+    }
+    else if (v == 0.0) {
+        // no precision exception
+        result = v;
+    }
+    else {
+        bool neg = (v < 0.0);
+        float64 y = _abs(v);
+
+        if (y > 1.0) {
+            int newexp;
+            if (y > YBAR) {
+                if (y > WMAX) {
+                    // result too large, even after scaling
+                    result = v * _d_pos_inf.dbl;
+                    // should through hard exception.
+                    goto exit;
+                }
+
+                //
+                // result = exp(y)/2
+                //
+
+                result = _exphlp(y, &newexp);
+                newexp --;      //divide by 2
+                if (newexp > MAXEXP) {
+                    result = 0.0; //result = _set_exp(result, newexp-IEEE_ADJUST);
+                    // should through hard exception.
+                    goto exit;
+                }
+                else {
+                    result = _set_exp(result, newexp);
+                }
+
+            }
+            else {
+                float64 z = _exphlp(y, &newexp);
+                z = _set_exp(z, newexp);
+                result = (z - 1.0/z) / 2.0;
+            }
+
+            if (neg) {
+                result = -result;
+            }
+        }
+        else {
+            if (y < EPS) {
+                result = v;
+                if (IS_D_DENORM(result)) {
+                    result = 0.0; // result = _add_exp(result, IEEE_ADJUST);
+                    // should through hard exception.
+                    goto exit;
+                }
+            }
+            else {
+                float64 f = v * v;
+                float64 r = f * (r_sinh_p(f) / r_sinh_q(f));
+                result = v + v * r;
+            }
+        }
+    }
+
+  exit:
+    return result;
+}
+
+//  Compute the hyperbolic cosine of a number.
+//  The algorithm (reduction / rational approximation) is
+//  taken from Cody & Waite.
+//
+float64 Class_System_Math::g_Cosh(float64 v)
+{
+    // exp(YBAR) should be close to but less than XMAX
+    // and 1/exp(YBAR) should not underflow
+    static float64 const YBAR = 7.00e2;
+
+    // WMAX=ln(OVFX)+0.69 (Cody & Waite),omitted LNV, used OVFX instead of BIGX
+    static float64 const WMAX = 1.77514678223345998953e+003;
+
+    float64 result;
+
+    if (IS_D_SPECIAL(v)) {
+        if (IS_D_INF(v) || IS_D_MINF(v)) {
+            result = _d_pos_inf.dbl;
+
+        }
+        else if (IS_D_QNAN(v)) {
+            // should throw a soft exception.
+            result = v;
+        }
+        else {
+            // should throw a hard exception.
+            result = v;
+        }
+    }
+    else if (v == 0.0) {
+        result = 1.0;
+    }
+    else {
+        float64 y = _abs(v);
+        if (y > YBAR) {
+            if (y > WMAX) {
+                // should throw a hard exception.
+                result = v;
+                goto exit;
+            }
+
+            //
+            // result =     exp(y)/2
+            //
+
+            int newexp;
+            result = _exphlp(y, &newexp);
+            newexp --;          //divide by 2
+            if (newexp > MAXEXP) {
+                // should throw a hard exception.
+                result = 0.0; //result = _set_exp(result, newexp-IEEE_ADJUST);
+                goto exit;
+            }
+            else {
+                result = _set_exp(result, newexp);
+            }
+        }
+        else {
+            int newexp;
+            float64 z = _exphlp(y, &newexp);
+            z = _set_exp(z, newexp);
+            result = (z + 1.0/z) / 2.0;
+        }
+        // should throw a hard exception if exactness is required.
+    }
+
+  exit:
+    return result;
+}
+
+// Compute the hyperbolic tangent of a number.
+// The algorithm (reduction / rational approximation) is
+// taken from Cody & Waite.
+
+static inline float64 r_tanh(float64 g)
+{
+    // constants for rational approximation
+    static float64 const p0 = -0.16134119023996228053e+4;
+    static float64 const p1 = -0.99225929672236083313e+2;
+    static float64 const p2 = -0.96437492777225469787e+0;
+    static float64 const q0 =  0.48402357071988688686e+4;
+    static float64 const q1 =  0.22337720718962312926e+4;
+    static float64 const q2 =  0.11274474380534949335e+3;
+    static float64 const q3 =  0.10000000000000000000e+1;
+
+    return ((((p2 * (g) + p1) * (g) + p0) * (g)) / ((((g) + q2) * (g) + q1) * (g) + q0));
+}
+
+float64 Class_System_Math::g_Tanh(float64 v)
+{
+    // constants
+    static float64 const EPS  = 5.16987882845642297e-26;     // 2^(-53) / 2
+    static float64 const XBIG = 1.90615474653984960096e+001; // ln(2)(53+2)/2
+    static float64 const C0   = 0.54930614433405484570;      // ln(3)/2
+
+    if (IS_D_SPECIAL(v)) {
+        if (IS_D_INF(v)) {
+            v = 1.0;
+        }
+        else if (IS_D_MINF(v)) {
+            v = -1.0;
+        }
+        else if (IS_D_QNAN(v)) {
+            // should throw a soft exception.
+        }
+        else if (IS_D_SNAN(v)) {
+            // should throw a hard exception.
+        }
+    }
+    else if (v == 0.0) {
+        // no precision exception
+    }
+    else {
+        bool neg = false;
+        if (v < 0.0) {
+            neg = true;
+            v = -v;
+        }
+
+        if (v > XBIG) {
+            v = 1;
+        }
+        else if (v > C0) {
+            v = 0.5 - 1.0 / (g_Exp(v+v) + 1.0);
+            v = v + v;
+        }
+        else if (v < EPS) {
+            if (IS_D_DENORM(v)) {
+                // should throw a heard exception.
+            }
+        }
+        else {
+            v = v + v * r_tanh(v * v);
+        }
+        if (neg) {
+            v = -v;
+        }
+    }
+    return v;
+}
+
+float64 Class_System_Math::g_Acos(float64 v)
+{
+    __asm {
+        fld v;
+        fld1;               // load 1.0
+        fadd st, st(1);     // 1+x
+        fld1;               // load 1.0
+        fsub st, st(2);     // 1-x
+        fmul;               // (1+x)(1-x)
+        fsqrt;              // sqrt((1+x)(1-x))
+        fxch;
+        fpatan;             // fpatan(x,sqrt((1+x)(1-x)))
+    }
+}
+
+float64 Class_System_Math::g_Asin(float64 v)
+{
+    __asm {
+        fld v;
+        fld1;               // load 1.0
+        fadd st, st(1);     // 1+x
+        fld1;               // load 1.0
+        fsub st, st(2);     // 1-x
+        fmul;               // (1+x)(1-x)
+        fsqrt;              // sqrt((1+x)(1-x))
+        fpatan;             // fpatan(x,sqrt((1+x)(1-x)))
+    }
+}
+
+static float64 _fastpow(float64 v, float64 w)
+{
+    __asm {
+        fld w;              // neither v or w can be a boundary cases.
+        fld v;
+        fyl2x;              // compute y*log2(x)
+        fld st(0);          // duplicate stack top
+        frndint;            // N = round(y)
+        fsubr st(1), st;
+        fxch;
+        fchs;               // g = y - N where abs(g) < 1
+        f2xm1;              // 2**g - 1
+        fld1;
+        fadd;               // 2**g
+        fscale;             // (2**g) * (2**N) - gives 2**y
+        fstp st(1);         // pop extra stuff from fp stack
+    }
+}
+
+float64 Class_System_Math::g_Pow(float64 v, float64 w)
+{
+    float64 result = 0.0;
+
+    // check for infinity or NAN
+    if (IS_D_SPECIAL(w) || IS_D_SPECIAL(v)) {
+        if (IS_D_INF(w)) {
+            float64 absv = _abs(v);
+            if (absv > 1.0) {
+                result = _d_pos_inf.dbl;
+            }
+            else if (absv < 1.0) {
+                result = 0.0;
+            }
+            else {
+                result = _d_ind.dbl;
+                // Should throw a hard exception.
+                goto exit;
+            }
+        }
+        else if (IS_D_MINF(w)) {
+            float64 absv = _abs(v);
+            if (absv > 1.0) {
+                result = 0.0;
+            }
+            else if (absv < 1.0) {
+                result = _d_pos_inf.dbl;
+            }
+            else {
+                result = _d_ind.dbl;
+                // Should throw a hard exception.
+                goto exit;
+            }
+        }
+        else if (IS_D_INF(v)) {
+            if (w > 0.0) {
+                result = _d_pos_inf.dbl;
+            }
+            else if (w < 0.0) {
+                result = 0.0;
+            }
+            else {
+                result = 1.0;
+            }
+        }
+        else if (IS_D_MINF(v)) {
+            if (w > 0.0) {
+                result = is_odd_integer(w) ? _d_neg_inf.dbl : _d_pos_inf.dbl;
+            }
+            else if (w < 0.0) {
+                result = is_odd_integer(w) ? _d_neg_zer.dbl : 0.0;
+            }
+            else {
+                result = 1.0;
+            }
+        }
+    }
+    else if (w == 0.0) {
+        result = 1.0;
+    }
+    else if (v == 0.0) {
+        if (w < 0.0) {
+            // Should throw a hard exception.
+            result = is_odd_integer(v) ? _d_neg_inf.dbl : _d_pos_inf.dbl;
+        }
+        else {
+            result = is_odd_integer(v) ? w : 0.0;
+        }
+    }
+    else if (v < 0.0) {
+        if (is_odd_integer(w)) {
+            result = - _fastpow(-v, w);
+        }
+        else if (is_even_integer(w)) {
+            result = _fastpow(-v, w);
+        }
+        else {
+            // Should throw a hard exception.
+            result = v;
+        }
+    }
+    else {
+        result = _fastpow(v, w);
+    }
+
+  exit:
+    return result;
+}
+
+float64 Class_System_Math::g_Mod(float64 x, float64 y)
+{
+    float64 result = 0.0;
+
+    // check for infinity or NAN
+    if (IS_D_SPECIAL(y) || IS_D_SPECIAL(x)) {
+        if (IS_D_SNAN(y) || IS_D_SNAN(x)) {
+            // Should throw a hard exception.
+        }
+        else if (IS_D_QNAN(y) || IS_D_QNAN(x)) {
+            // Should throw a soft exception.
+            result = x;
+        }
+        else if (IS_D_INF(x) || IS_D_MINF(x)) {
+            // Should throw a hard exception.
+        }
+    }
+    else if (y == 0.0) {
+        // Should throw a hard exception.
+    }
+    else if (x == 0.0) {
+        result = x;
+    }
+    else {
+        const int SCALE = 53;
+        bool neg = false;
+        bool denorm = false;
+        float64 d,ty,fx,fy;
+        int nx, ny, nexp;
+
+        if (x < 0.0) {
+            result = -x;
+            neg = 1;
+        }
+        else {
+            result = x;
+        }
+
+        ty = _abs(y);
+
+        while (result >= ty) {
+            fx = _decomp(result, &nx);
+            fy = _decomp(ty, &ny);
+
+            if (nx < MINEXP) {
+                // result is a denormalized number
+                denorm = true;
+                nx += SCALE;
+                ny += SCALE;
+                result = _set_exp(fx, nx);
+                ty = _set_exp(fy, ny);
+            }
+
+
+            if (fx >= fy) {
+                nexp = nx ;
+            }
+            else {
+                nexp = nx - 1;
+            }
+            d = _set_exp(fy, nexp);
+            result -= d;
+        }
+        if (denorm) {
+            // should raise only FP_U exception.
+        }
+        if (neg) {
+            result = -result;
+        }
+    }
+
+    return result;
+}
+
+float64 Class_System_Math::g_Floor(float64 v)
+{
+    float64 result;
+
+    // save user fp control word, and set round down.
+    uint16 oldcw = g_ControlFp(IRC_DOWN, IMCW_RC);
+
+    if (IS_D_SPECIAL(v)) {
+        if (IS_D_QNAN(v)) {
+            // should throw a soft exception.
+        }
+        else if (IS_D_SNAN(v)) {
+            // should throw a hard exception.
+        }
+        result = v;
+    }
+    else {
+        result = _frnd(v); // round according to the current rounding mode.
+    }
+
+    g_RestoreFp(oldcw);
+    return result;
+}
+
+float64 Class_System_Math::g_Ceiling(float64 v)
+{
+    float64 result;
+
+    // save user fp control word, and set round up.
+    uint16 oldcw = g_ControlFp(IRC_UP, IMCW_RC);
+    if (IS_D_SPECIAL(v)) {
+        if (IS_D_QNAN(v)) {
+            // should throw a soft exception.
+        }
+        else if (IS_D_SNAN(v)) {
+            // should throw a hard exception.
+        }
+        result = v;
+    }
+    else {
+        result = _frnd(v); // round according to the current rounding mode.
+    }
+
+    g_RestoreFp(oldcw);
+    return result;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
+
diff --git a/base/Kernel/Native/Monitoring.cpp b/base/Kernel/Native/Monitoring.cpp
new file mode 100644
index 0000000..b937dff
--- /dev/null
+++ b/base/Kernel/Native/Monitoring.cpp
@@ -0,0 +1,883 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Monitoring.cpp
+//
+//  Note:
+//
+
+// This stuff in here provides a ring-buffer like way to organize monitoring
+// buffer entries.  Interrupts are *never* disabled, all synchronization is
+// done in a non-blocking fashion.
+//
+// You should *never* get incorrect values from the basic events, the worst
+// thing that should happen is that a value is not available anymore, due to
+// buffer wrap around.  Entries should never be corrupted.
+//
+// This buffer should be thread and MP safe.  Therefore only one buffer is
+// currently used for the whole system.
+//
+// All events may have an additional pointer to a variably sized string in a
+// second buffer.  Guarantees for data in this buffer are weaker.  You might
+// not be able to retrieve data in it, if there was a buffer wrap-around or
+// an very old mid-preempted entry-writing threads gets scheduled again and
+// corrupts the area you just acquired.  That is, you might not be able to
+// retrieve certain string, but older ones might still be accessible.
+// In very rare cases you could also see corrupted data in the strings!
+//
+// These words of warning spoken: Such data loss should be negligible if you
+// make the buffer structures large enough, and read often enough from them.
+
+#include "hal.h"
+
+//////////////////////////////////////////////////////////////// Image Loader.
+//
+
+#define min(a, b) ((a < b) ? a : b)
+
+struct indexEntry {
+    union {
+        volatile UINT64 data;
+        struct {
+            volatile UINT32 lo;
+            volatile UINT32 hi;
+        } hi_lo;
+        struct {
+            // use similar types to really get a packed bitfield
+            // (circumvent compiler limitation)
+            volatile UINT64 index:16;   // index (lo. 16 bits)   \_ 'data' grows
+            volatile UINT64 counter:48; // counter (hi. 48 bits) /  monotonically
+        } val;
+    };
+};
+
+struct buffer_t {
+    indexEntry   head;        // head (most current) index entry
+    indexEntry   tail;        // tail (oldest valid) index entry
+    UINT32       flags;       // 0 == monitoring active, 1 == mon. inactive
+    UINT32       entries;     // number of elements in the following arrays
+    indexEntry * index;       // index array
+    Struct_Microsoft_Singularity_Monitoring_LogEntry * logs; // entry array
+    uint8      * txt;         // start of text area
+    uint8      * txtLimit;    // end of text area
+    // fixme: we need a version number here for ABA problem
+    uint8      * txtCurrent;  // pointer to current position in text area
+    UINT32       magic;       // just for padding to 48 byte size
+};
+
+static unsigned char cas64(void *dest, void *comp, void *exch)
+{
+   unsigned char retval;
+   __asm {
+       mov   esi, [comp];
+       mov   eax, [esi + 0];
+       mov   edx, [esi + 4];
+       mov   esi, [exch];
+       mov   ebx, [esi + 0];
+       mov   ecx, [esi + 4];
+       mov   esi, [dest];
+       lock  cmpxchg8b [esi];
+       sete  retval;
+   }
+   return retval;
+}
+
+static unsigned char cas(void *dest, void *comp, void *exch)
+{
+   unsigned char retval;
+    __asm {
+        mov  ecx, dest;
+        mov  edx, exch;
+        mov  eax, comp;
+        lock cmpxchg [ecx], edx;
+        sete retval;
+    }
+    return retval;
+}
+
+// debug version that puts a seqno in _eip.
+// #define GET_EIP() \
+// {                                \
+//     uintptr old_seq;                     \
+//     uintptr new_seq;                     \
+//     UINT32 *valp = &(((buffer_t*)c_buffer)->magic);      \
+//     do                               \
+//     {                                \
+//  old_seq = *valp;                    \
+//  new_seq = old_seq + 1;                  \
+//     } while (!cas(valp, (void*)old_seq, (void*)new_seq));    \
+//     _eip = new_seq;                      \
+// }
+
+
+#define MONITORING_BUFFER_SIZE (6 * 1024 * 1024)
+#define MONITORING_TEXT_SIZE   (2 * 1024 * 1024)
+
+void
+Class_Microsoft_Singularity_Monitoring::
+g_Initialize()
+{
+#if SINGULARITY_KERNEL
+    // Init. all data only in the kernel
+    //Propagate information to userland to init. a (simpler) copy object there
+
+    // layout the header structure at the start of KERNEL_MONREC_BEGIN
+    g_InitPages((UIntPtr)(MONITORING_BUFFER_SIZE));
+    if (c_buffer == NULL) {
+        printf("Monitoring: Error getting Memory for buffer!!!\n");
+        // fixme: halt system here
+        return;
+    }
+    else {
+        printf("Monitoring: Got Memory for buffer: %p\n", c_buffer);
+    }
+
+    // text stuff
+    ((buffer_t *)c_buffer)->txt =
+        (uint8 *) g_InitText((UIntPtr)(MONITORING_TEXT_SIZE));
+    if (((buffer_t *)c_buffer)->txt == NULL) {
+        printf("Monitoring: Error getting Memory for text!!!\n");
+        // fixme: halt system here
+        return;
+    }
+    else {
+        printf("Monitoring: Got Memory for text: %p\n",
+               ((buffer_t *)c_buffer)->txt);
+    }
+    ((buffer_t *)c_buffer)->txtLimit = ((buffer_t *)c_buffer)->txt +
+                                       MONITORING_TEXT_SIZE;
+    ((buffer_t *)c_buffer)->txtCurrent = ((buffer_t *)c_buffer)->txt;
+
+    ((buffer_t *)c_buffer)->head.data = 0;
+    ((buffer_t *)c_buffer)->tail.data = 0;
+    ((buffer_t *)c_buffer)->flags = 0;
+    ((buffer_t *)c_buffer)->index = (indexEntry *)(((buffer_t *)c_buffer) + 1);
+    // compute the number of available events
+    // fixme: one should really have ssize_t here
+    int memSize = MONITORING_BUFFER_SIZE - sizeof(buffer_t);
+    if (memSize < sizeof(indexEntry) + sizeof(buffer_t)) {
+        printf("Error: Not enough memory for monitoring events!\n");
+        // fixme: stop machine here or something
+        ((buffer_t *)c_buffer)->entries = 0;
+    }
+    else {
+        ((buffer_t *)c_buffer)->entries =
+            min(0xffff, memSize / (sizeof(indexEntry) + sizeof(buffer_t)));
+        printf("Info: Monitoring will use %u entries at %p, memSize = %d.\n",
+               ((buffer_t *)c_buffer)->entries, c_buffer, memSize);
+    }
+    ((buffer_t *)c_buffer)->logs =
+        (Struct_Microsoft_Singularity_Monitoring_LogEntry *)
+            (((buffer_t *)c_buffer)->index + ((buffer_t *)c_buffer)->entries);
+
+    // init. elements
+    for (UINT16 i = 0; i < ((buffer_t *)c_buffer)->entries; i++) {
+        // clean up indices
+        ((buffer_t *)c_buffer)->index[i].val.index = i;
+        ((buffer_t *)c_buffer)->index[i].val.counter = i; // fixme: 0 or i
+        // cleanup timestamps in real entries as this is used to detect a
+        // valid entry
+        ((buffer_t *)c_buffer)->logs[i].cycleCount = 0ULL;
+    }
+    // init. head and tail indices
+    // fixme: get this right
+    ((buffer_t *)c_buffer)->head.val.index = 0;
+    ((buffer_t *)c_buffer)->head.val.counter = ((buffer_t *)c_buffer)->entries;
+    ((buffer_t *)c_buffer)->tail.val.index = 0;
+    ((buffer_t *)c_buffer)->tail.val.counter = 0;
+
+    // last magic values, mostly used for alignment
+    ((buffer_t *)c_buffer)->magic = 0x12345678;
+
+#elif SINGULARITY_PROCESS
+    // get the address from the kernel and init. our local object
+    uint8 * _buffer;
+
+    Struct_Microsoft_Singularity_V1_Services_ProcessService::
+        g_GetMonitoringHeaders(&_buffer);
+
+    c_buffer = _buffer;
+#endif
+}
+
+// Get Pointer to (hopefully dequeued) LogEntry for index into the log array
+// as returned by dequeue.
+Struct_Microsoft_Singularity_Monitoring_LogEntry *
+Class_Microsoft_Singularity_Monitoring::
+g_IndexToPointer(UINT16 index)
+{
+    return &((buffer_t *)c_buffer)->logs[index];
+}
+
+// fixme: care for failing dequeuing due to missing elements
+UINT16
+Class_Microsoft_Singularity_Monitoring::
+g_Dequeue()
+{
+    indexEntry tail;
+    indexEntry new_tail;
+    UINT16 index;
+
+    // comments are from the paper where this buffer is described:
+    // "A Generalized Approach to Runtime Monitoring for Real-Time Systems",
+    // Torvald Riegel, 2005, Technische Universität Dresden, Germany
+    //
+    // 1. The tail position is read. The technique explained in the previous
+    // subsection (reading the higher, the lower, and again the higher word) can
+    // be reused if the index part is not monotonically increasing because the
+    // element counter part is strictly monotonically increasing and located in
+    // the upper 48 bits of 64 bit wide tail position. If the first and the
+    // second read of the higher word returned different values, this step is
+    // executed again.
+    for (;;) {
+        // read atomically
+        tail.hi_lo.hi = ((buffer_t *)c_buffer)->tail.hi_lo.hi;
+        tail.hi_lo.lo = ((buffer_t *)c_buffer)->tail.hi_lo.lo;
+        if (tail.hi_lo.hi != ((buffer_t *)c_buffer)->tail.hi_lo.hi) {
+            continue;  // try again
+        }
+
+        new_tail.data = tail.data;
+
+        // 2. The element counter part and the index part of the local copy of
+        // the read position are advanced.
+        //
+        new_tail.val.counter++;
+        new_tail.val.index++;
+        if (new_tail.val.index >= ((buffer_t *)c_buffer)->entries) {
+            new_tail.val.index = 0;
+        }
+
+        index = tail.val.index;
+
+        // 3. Using a compare-and-exchange instruction, it is tried to
+        // exchange the tail position in the output buffer with the
+        // modified local copy. If the exchange fails because the value
+        // in the buffer has been modified, the algorithm is restarted at
+        // step one. If the operation succeeds, the index that was read
+        // in step one returned. It points to the dequeued and thus
+        // allocated output element.
+        //
+        if (cas64(&(((buffer_t *)c_buffer)->tail),
+                  (void *)&tail.data, (void *)&new_tail.data)) {
+            return index;
+        }
+    }
+}
+
+void
+Class_Microsoft_Singularity_Monitoring::
+g_Enqueue(UINT16 newElement)
+{
+    indexEntry head;
+    indexEntry new_head;
+    indexEntry index;
+    indexEntry new_index;
+    UINT32 i;
+    int enqueued;
+
+    do {
+        // step 1
+        // read atomically
+        head.hi_lo.hi = ((buffer_t *)c_buffer)->head.hi_lo.hi;
+        head.hi_lo.lo = ((buffer_t *)c_buffer)->head.hi_lo.lo;
+        if (head.hi_lo.hi != ((buffer_t *)c_buffer)->head.hi_lo.hi) {
+            continue;  // try again
+        }
+
+        i = head.val.index;
+
+        // step 2
+        index.hi_lo.hi = ((buffer_t *)c_buffer)->index[i].hi_lo.hi;
+        index.hi_lo.lo = ((buffer_t *)c_buffer)->index[i].hi_lo.lo;
+        if ((index.hi_lo.hi != ((buffer_t *)c_buffer)->index[i].hi_lo.hi)
+            || (index.val.counter > head.val.counter)) {
+            continue;  // try again
+        }
+
+        if (index.val.counter != head.val.counter) {
+            // step 3
+            ((buffer_t *)c_buffer)->logs[newElement].cycleCount = RDTSC();
+            // step 4
+            new_index.val.counter = head.val.counter;
+            new_index.val.index   = newElement;
+            enqueued = cas64(&(((buffer_t *)c_buffer)->index[i]),
+                             (void *)&index.data, (void *)&new_index.data);
+        }
+        // step 5
+        new_head.val.counter = head.val.counter + 1;
+        new_head.val.index   = head.val.index + 1;
+        if (new_head.val.index >= ((buffer_t *)c_buffer)->entries) {
+            new_head.val.index = 0;
+        }
+
+        cas64(&(((buffer_t *)c_buffer)->head), (void *)&head.data,
+              (void *)&new_head.data);
+    } while (!enqueued);
+}
+
+void
+Class_Microsoft_Singularity_Monitoring::
+g_Enqueue(UINT16 newElement, UINT64 * ptr)
+{
+    indexEntry head;
+    indexEntry new_head;
+    indexEntry index;
+    indexEntry new_index;
+    UINT32 i;
+    int enqueued;
+
+    do {
+        // step 1
+        // read atomically
+        head.hi_lo.hi = ((buffer_t *)c_buffer)->head.hi_lo.hi;
+        head.hi_lo.lo = ((buffer_t *)c_buffer)->head.hi_lo.lo;
+        if (head.hi_lo.hi != ((buffer_t *)c_buffer)->head.hi_lo.hi) {
+            continue;  // try again
+        }
+
+        i = head.val.index;
+
+        // step 2
+        index.hi_lo.hi = ((buffer_t *)c_buffer)->index[i].hi_lo.hi;
+        index.hi_lo.lo = ((buffer_t *)c_buffer)->index[i].hi_lo.lo;
+        if ((index.hi_lo.hi != ((buffer_t *)c_buffer)->index[i].hi_lo.hi)
+            || (index.val.counter > head.val.counter)) {
+            continue;  // try again
+        }
+
+        if (index.val.counter != head.val.counter) {
+            // step 3
+            *ptr = RDTSC();
+            ((buffer_t *)c_buffer)->logs[newElement].cycleCount = *ptr;
+            // step 4
+            new_index.val.counter = head.val.counter;
+            new_index.val.index   = newElement;
+            enqueued = cas64(&(((buffer_t *)c_buffer)->index[i]),
+                             (void *)&index.data, (void *)&new_index.data);
+        }
+
+        // step 5
+        new_head.val.counter = head.val.counter + 1;
+        new_head.val.index   = head.val.index + 1;
+        if (new_head.val.index >= ((buffer_t *)c_buffer)->entries) {
+            new_head.val.index = 0;
+        }
+
+        cas64(&(((buffer_t *)c_buffer)->head), (void *)&head.data,
+              (void *)&new_head.data);
+    } while (!enqueued);
+}
+
+
+void
+Class_Microsoft_Singularity_Monitoring::
+g_Finalize()
+{
+}
+
+uint8 *
+Class_Microsoft_Singularity_Monitoring::
+g_CompareExchange(uint8 **dest, uint8 *exch, uint8 *comp)
+{
+    uint8 *val;
+    __asm {
+        mov ecx, dest;
+        mov edx, exch;
+        mov eax, comp;
+        lock cmpxchg [ecx], edx;
+        mov val, eax;
+    }
+    return val;
+}
+
+
+Struct_Microsoft_Singularity_Monitoring_LogEntry *
+Class_Microsoft_Singularity_Monitoring::
+g_CompareExchange(Struct_Microsoft_Singularity_Monitoring_LogEntry **dest,
+                Struct_Microsoft_Singularity_Monitoring_LogEntry *exch,
+                Struct_Microsoft_Singularity_Monitoring_LogEntry *comp)
+{
+    Struct_Microsoft_Singularity_Monitoring_LogEntry * val;
+    __asm {
+        mov ecx, dest;
+        mov edx, exch;
+        mov eax, comp;
+        lock cmpxchg [ecx], edx;
+        mov val, eax;
+    }
+    return val;
+}
+
+void Class_Microsoft_Singularity_Monitoring::
+g_Log(uint16 provider, uint16 type, uint16 version,
+      uint32 a0, uint32 a1, uint32 a2, uint32 a3, uint32 a4)
+{
+    // fixme: should we check for c_buffer != 0 ???
+
+    if (! g_isActive()) {
+        return;
+    }
+
+    uintptr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+
+    UINT16 index;
+    Struct_Microsoft_Singularity_Monitoring_LogEntry * p;
+
+    Struct_Microsoft_Singularity_X86_ThreadContext *threadContext =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+
+    int cpuid = Class_Microsoft_Singularity_Processor::
+                    g_GetCurrentProcessorContext()->cpuId;
+
+    // get buffer
+    index = g_Dequeue();
+    p = g_IndexToPointer(index);
+
+    // fill it
+    p->eip       = _eip;
+    p->provider  = provider;
+    p->type      = type;
+    p->text      = NULL;
+    p->cpu       = cpuid;
+    p->version   = version;
+    p->arg0      = a0;
+    p->arg1      = a1;
+    p->arg2      = a2;
+    p->arg3      = a3;
+    p->arg4      = a4;
+    p->processId = threadContext->processId;
+#ifdef  SINGULARITY_KERNEL
+    p->threadId  = threadContext->threadIndex;
+#else
+    p->threadId  = threadContext->kernelThreadIndex;
+#endif
+
+    // return buffer
+    g_Enqueue(index);
+
+//    UINT32 d_ret;
+//    d_ret = g_ConsistencyCheck();
+//    if (d_ret) {
+//        Class_Microsoft_Singularity_DebugStub::g_Break();
+//    }
+}
+
+void Class_Microsoft_Singularity_Monitoring::
+g_Log(uint16 provider, uint16 type)
+{
+    // fixme: should we check for c_buffer != 0 ???  Right now we assume to
+    //        only get called after init.
+
+    if (! g_isActive()) {
+        return;
+    }
+
+    uintptr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+
+    UINT16 index;
+    Struct_Microsoft_Singularity_Monitoring_LogEntry * p;
+
+    Struct_Microsoft_Singularity_X86_ThreadContext *threadContext =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+
+    int cpuid = Class_Microsoft_Singularity_Processor::
+                    g_GetCurrentProcessorContext()->cpuId;
+
+    // get buffer
+    index = g_Dequeue();
+    p = g_IndexToPointer(index);
+
+    // fill it
+    p->eip       = _eip;
+    p->provider  = provider;
+    p->type      = type;
+    p->text      = NULL;
+    p->cpu       = cpuid;
+    p->version   = 0;
+    p->arg0      = 0;
+    p->arg1      = 0;
+    p->arg2      = 0;
+    p->arg3      = 0;
+    p->arg4      = 0;
+    p->processId = threadContext->processId;
+#ifdef  SINGULARITY_KERNEL
+    p->threadId  = threadContext->threadIndex;
+#else
+    p->threadId  = threadContext->kernelThreadIndex;
+#endif
+
+    // return buffer
+    g_Enqueue(index);
+
+//    UINT32 d_ret;
+//    d_ret = g_ConsistencyCheck();
+//    if (d_ret) {
+//        Class_Microsoft_Singularity_DebugStub::g_Break();
+//    }
+}
+
+void Class_Microsoft_Singularity_Monitoring::
+g_Log(uint16 provider, uint16 type, Class_System_String *s)
+{
+    // fixme: should we check for c_buffer != 0 ???  Right now we assume to
+    //        only get called after init.
+
+    if (! g_isActive()) {
+        return;
+    }
+
+    uintptr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+
+    UINT16 index;
+    Struct_Microsoft_Singularity_Monitoring_LogEntry * p;
+
+    Struct_Microsoft_Singularity_X86_ThreadContext *threadContext =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+
+    int cpuid = Class_Microsoft_Singularity_Processor::
+                    g_GetCurrentProcessorContext()->cpuId;
+
+    // get buffer
+    index = g_Dequeue();
+    p = g_IndexToPointer(index);
+
+    // fill it
+    p->eip       = _eip;
+    p->provider  = provider;
+    p->type      = type;
+    p->cpu       = cpuid;
+    p->version   = 0;
+    p->arg0      = 0;
+    p->arg1      = 0;
+    p->arg2      = 0;
+    p->arg3      = 0;
+    p->arg4      = 0;
+    p->processId = threadContext->processId;
+#ifdef  SINGULARITY_KERNEL
+    p->threadId  = threadContext->threadIndex;
+#else
+    p->threadId  = threadContext->kernelThreadIndex;
+#endif
+    // care for the string now ...
+
+    bool enabled = Class_Microsoft_Singularity_Processor::g_DisableInterrupts();
+    // reserve space for one 64 bit counter, 32 bit for the string length and
+    // the string itself
+    uint8 * newTxt;
+    uint8 * oldTxt;
+
+//    Class_Microsoft_Singularity_DebugStub::g_Break();
+
+    // update txtCurrent, align to 8 byte
+    do {
+        oldTxt = ((buffer_t *)c_buffer)->txtCurrent;
+        // well, this is ugly but /W3 seems to prevent bitmasking (uint8 *) ...
+        newTxt = (uint8 *)((unsigned)
+                     ((oldTxt + sizeof(UINT64) + sizeof(UINT32) +
+                      s->m_stringLength + 7)) & ((unsigned)(-1) - 7));
+        if (newTxt >= ((buffer_t *)c_buffer)->txtLimit) {
+            newTxt = (uint8 *)((unsigned)
+                         (((buffer_t *)c_buffer)->txt + sizeof(UINT64) +
+                          sizeof(UINT32) + s->m_stringLength + 7) &
+                          ((unsigned)(-1) - 7));
+        }
+    } while (! cas(&((buffer_t *)c_buffer)->txtCurrent, oldTxt, newTxt));
+
+    *(oldTxt + sizeof(UINT64)) = s->m_stringLength;          // write length
+    g_AddText(oldTxt + sizeof(UINT64) + sizeof(UINT32), s);  // write string
+    p->text = oldTxt;                                 // string ptr -> event
+
+    // return buffer
+    // also sets counter in string, *before* releasing event
+    g_Enqueue(index, (UINT64 *)oldTxt);
+    Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(enabled);
+
+//    UINT32 d_ret;
+//    d_ret = g_ConsistencyCheck();
+//    if (d_ret) {
+//        Class_Microsoft_Singularity_DebugStub::g_Break();
+//    }
+}
+
+int Class_Microsoft_Singularity_Monitoring::
+g_FillLogEntry(Struct_Microsoft_Singularity_Monitoring_LogEntry * log,
+               UINT64 * min_counter)
+{
+    // fixme: should we check for c_buffer != 0 ???, probably not necessary,
+    //        Initialize() should have been called long before first request
+    //        here, right?
+
+    indexEntry tail;
+    indexEntry head;
+    indexEntry ie;
+    UINT16 index;
+
+//    UINT32 d_ret;
+//    d_ret = g_ConsistencyCheck();
+//    if (d_ret) {
+//        Class_Microsoft_Singularity_DebugStub::g_Break();
+//    }
+
+    // get tail pointer first
+    do {
+        tail.hi_lo.hi = ((buffer_t *)c_buffer)->tail.hi_lo.hi;
+        tail.hi_lo.lo = ((buffer_t *)c_buffer)->tail.hi_lo.lo;
+    } while (tail.hi_lo.hi != ((buffer_t *)c_buffer)->tail.hi_lo.hi);
+
+    for (;;) {
+
+        // check if user wants valid entry, no? give him the oldest valid one
+        if (*min_counter < tail.val.counter) {
+            *min_counter = tail.val.counter;
+        }
+
+        // check for too fast request polling
+        do {
+            head.hi_lo.hi = ((buffer_t *)c_buffer)->head.hi_lo.hi;
+            head.hi_lo.lo = ((buffer_t *)c_buffer)->head.hi_lo.lo;
+        } while (head.hi_lo.hi != ((buffer_t *)c_buffer)->head.hi_lo.hi);
+        // consumer requests counter in the future
+        if (*min_counter >= head.val.counter) {
+            return -1;
+        }
+
+        // now get the index entry atomically
+        index = (UINT16)(*min_counter % ((buffer_t *)c_buffer)->entries);
+        do {
+            ie.hi_lo.hi = ((buffer_t *)c_buffer)->index[index].hi_lo.hi;
+            ie.hi_lo.lo = ((buffer_t *)c_buffer)->index[index].hi_lo.lo;
+        } while (ie.hi_lo.hi != ((buffer_t *)c_buffer)->index[index].hi_lo.hi);
+
+        // if index is newer than expected, try again
+        if (ie.val.counter != *min_counter) {
+            continue;
+        }
+
+        // now copy the whole thing
+        *log = ((buffer_t *)c_buffer)->logs[ie.val.index];
+
+        // get tail pointer again
+        do {
+            tail.hi_lo.hi = ((buffer_t *)c_buffer)->tail.hi_lo.hi;
+            tail.hi_lo.lo = ((buffer_t *)c_buffer)->tail.hi_lo.lo;
+        } while (tail.hi_lo.hi != ((buffer_t *)c_buffer)->tail.hi_lo.hi);
+
+        // check if we were overtaken
+        if (tail.val.counter <= *min_counter) {
+            break;  // finally, we got it ...
+        }
+    }
+
+//    d_ret = g_ConsistencyCheck();
+//    if (d_ret) {
+//        Class_Microsoft_Singularity_DebugStub::g_Break();
+//    }
+
+    return 0;
+}
+
+int Class_Microsoft_Singularity_Monitoring::
+g_FillTextEntry(uint8 * src, UINT64 counter, uint8 * dst, int max_size)
+{
+    uint8 * old_src = src;
+
+    if ((src < ((buffer_t *)c_buffer)->txt) ||
+        (src + sizeof(UINT64) + sizeof(UINT32) >
+            ((buffer_t *)c_buffer)->txtLimit)) {
+        return -2;  // memory bounds error
+    }
+
+    // 1. get size
+    // fixme: make another bounds check here
+    int len = *(UINT32 *)(src + sizeof(UINT64));
+
+    // fixme: create a memory barrier here
+
+    // 2. check TSC, -> bail out if wrong
+    volatile UINT64 _counter = *(UINT64 *)(src);
+    if (_counter != counter) {
+        return -1;  // corrupt data
+    }
+
+    src += sizeof(UINT64) + sizeof(UINT32);
+
+    // 3. copy string
+    int i;
+    for (i = 0; i < max_size && i < len; i++) {
+        *dst++ = *src++;
+    }
+
+    // 4. check TSC again, -> bail out if wrong
+    _counter = *(UINT64 *)(old_src);
+    if (_counter != counter) {
+        return -3;  // corrupt data
+    }
+    return i;
+}
+
+// Copies a given string to a memory area by stripping every second byte,
+// UTF16 -> ASCII conversion, assuming there where no control characters in the
+// UTF16 string ...
+uint8 * Class_Microsoft_Singularity_Monitoring::
+g_AddText(uint8 *dst, Class_System_String *arg)
+{
+    bartok_char *src = &arg->m_firstChar;
+    bartok_char *end = src + arg->m_stringLength;
+
+    while (src < end) {
+        *dst++ = (uint8)*src++;
+    }
+//    *dst++ = '\0';
+
+    return dst;
+}
+
+bool Class_Microsoft_Singularity_Monitoring::
+g_isActive()
+{
+    return ((buffer_t *)c_buffer)->flags == 0;
+}
+
+void Class_Microsoft_Singularity_Monitoring::
+g_setActive(bool active)
+{
+    if (active) {
+        ((buffer_t *)c_buffer)->flags = 0;
+    }
+    else {
+        ((buffer_t *)c_buffer)->flags = 1;
+    }
+}
+
+
+void Class_Microsoft_Singularity_Monitoring::
+g_DebugTest(UINT64 * h_ts, UINT64 * t_ts, UINT64 *min, UINT64 * max)
+{
+    // output head and tail counters
+#if 0
+#if SINGULARITY_KERNEL
+    printf("Head (%llu, %llu), Tail (%llu, %llu)\n",
+           ((buffer_t *)c_buffer)->head.val.index, ((buffer_t *)c_buffer)->head.val.counter,
+           ((buffer_t *)c_buffer)->tail.val.index, ((buffer_t *)c_buffer)->tail.val.counter);
+#else
+    Class_Microsoft_Singularity_DebugStub::Print("Head (" + ((buffer_t *)c_buffer)->head.val.index +
+                           ", " + ((buffer_t *)c_buffer)->head.val.counter +
+                           "), Tail (" + ((buffer_t *)c_buffer)->tail.val.index +
+                           ", " + ((buffer_t *)c_buffer)->tail.val.counter) + ")\n");
+
+#endif
+#endif
+    // output head and tail elements
+    UINT64 ih, it;
+    UINT64 ih2, it2;
+
+    ih = (((buffer_t *)c_buffer)->head.val.counter - 1) % ((buffer_t *)c_buffer)->entries;
+    it = (((buffer_t *)c_buffer)->tail.val.counter)     % ((buffer_t *)c_buffer)->entries;
+
+    ih2 = ((buffer_t *)c_buffer)->index[ih].val.index;
+    it2 = ((buffer_t *)c_buffer)->index[it].val.index;
+
+#if 0
+#if SINGULARITY_KERNEL
+    printf("TS: Head-1 (%llu), Tail (%llu)\n",
+           ((buffer_t *)c_buffer)->logs[ih2].cycleCount,
+           ((buffer_t *)c_buffer)->logs[it2].cycleCount);
+#else
+    Class_Microsoft_Singularity_DebugStub::Print("TS: Head-1 (" + ((buffer_t *)c_buffer)->logs[ih2].cycleCount +
+                    "), Tail (" + ((buffer_t *)c_buffer)->logs[it2].cycleCount + ")\n");
+#endif
+#endif
+
+    *h_ts = ((buffer_t *)c_buffer)->logs[ih2].cycleCount;
+    *t_ts = ((buffer_t *)c_buffer)->logs[it2].cycleCount;
+
+    // show min and max ts + its index
+    UINT32 i, j;
+    UINT64 min_ts = 100000000000ULL, max_ts = 0, ts;
+    for (i = ((buffer_t *)c_buffer)->tail.val.counter;
+         i < ((buffer_t *)c_buffer)->head.val.counter;) {
+        j = i % ((buffer_t *)c_buffer)->entries;
+        ts = ((buffer_t *)c_buffer)->logs[((buffer_t *)c_buffer)->index[j].val.index].cycleCount;
+
+        if (ts < min_ts) {
+            min_ts = ts;
+        }
+        if (ts > max_ts) {
+            max_ts = ts;
+        }
+
+        // advance i
+        i++;
+        if (i >= ((buffer_t *)c_buffer)->entries) {
+            i = 0;
+        }
+    }
+#if 0
+#if SINGULARITY_KERNEL
+    printf("TS: Min (%llu), Max (%llu)\n", min_ts, max_ts);
+#else
+    Class_Microsoft_Singularity_DebugStub::Print("TS: Min (" + min_ts + "), Max (" +max_ts  + ")\n");
+#endif
+#endif
+    *min = min_ts;
+    *max = max_ts;
+
+}
+
+uint32 Class_Microsoft_Singularity_Monitoring::
+g_ConsistencyCheck()
+{
+    bool id;
+
+    id = Class_Microsoft_Singularity_Processor::g_DisableInterrupts();
+
+    // run through all indices and check the TSs of the log entries for
+	// ascending order
+    uint64 i;
+    uint32 j;
+    uint32 k = 0;
+    uint64 old_ts = 0;
+    uint64 ts;
+    for (i = ((buffer_t *)c_buffer)->tail.val.counter;
+         i < ((buffer_t *)c_buffer)->head.val.counter;
+         i++, k++) {
+        j = (UINT32)(i % ((buffer_t *)c_buffer)->entries);
+        ts = ((buffer_t *)c_buffer)->logs[((buffer_t *)c_buffer)->index[j].val.index].cycleCount;
+
+        if (ts < old_ts && old_ts != 0 && ts != 0) {
+            ((buffer_t *)c_buffer)->magic = (UINT32)i;
+            Class_Microsoft_Singularity_DebugStub::g_Break();
+            Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(id);
+            return (UINT32)i;
+        }
+        old_ts = ts;
+        if (k > 100000) {
+            Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(id);
+            Class_Microsoft_Singularity_DebugStub::g_Break();
+            return 0;
+        }
+    }
+
+    Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(id);
+
+    return 0;  // everything is fine!
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/MpBootInfo.cpp b/base/Kernel/Native/MpBootInfo.cpp
new file mode 100644
index 0000000..4be5fbc
--- /dev/null
+++ b/base/Kernel/Native/MpBootInfo.cpp
@@ -0,0 +1,29 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+
+Struct_Microsoft_Singularity_MpBootInfo*
+Struct_Microsoft_Singularity_MpBootInfo::g_HalGetMpBootInfo()
+{
+    Struct_Microsoft_Singularity_BootInfo* bi = Struct_Microsoft_Singularity_BootInfo::g_HalGetBootInfo();
+    uint32 addr = (uint32) bi->MpBootInfo32;
+    return (Struct_Microsoft_Singularity_MpBootInfo*)((uint8*) addr);
+}
+
+void
+Struct_Microsoft_Singularity_MpBootInfo::g_HalReleaseMpStartupLock()
+{
+    Struct_Microsoft_Singularity_BootInfo* bi = Struct_Microsoft_Singularity_BootInfo::g_HalGetBootInfo();
+    uint32 lockAddr = (uint32) bi->MpStartupLock32;
+    if (lockAddr != 0)
+    {
+        *((uint16*) lockAddr) = 0;
+    }
+}
+
+#endif // SINGULARITY_KERNEL
diff --git a/base/Kernel/Native/Number.cpp b/base/Kernel/Native/Number.cpp
new file mode 100644
index 0000000..3414a67
--- /dev/null
+++ b/base/Kernel/Native/Number.cpp
@@ -0,0 +1,818 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Number.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define LITTLE_ENDIAN
+
+#if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64)
+#define REQUIRES_UNALIGNED_FLAG
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static const int32 SCALE_NAN = (int32)0x80000000;
+static const int32 SCALE_INF = 0x7FFFFFFF;
+
+//  Currently our string conversion routines do not conform to the special
+//  requirements of the IEEE standard for floating point conversions.
+//  We do this to avoid IEEE exceptions.
+
+#pragma pack(4)
+typedef struct {
+        uint8 ld12[12];
+} _LDBL12;
+#pragma pack()
+
+#define PTR_12(x) ((uint8 *)(&(x)->ld12))
+
+#define MAX_USHORT  ((uint16)0xffff)
+#define MSB_USHORT  ((uint16)0x8000)
+#define MAX_ULONG   ((uint32)0xffffffff)
+#define MSB_ULONG   ((uint32)0x80000000)
+
+#define LD_BIAS     0x3fff  // exponent bias for long double
+#define LD_BIASM1   0x3ffe  // LD_BIAS - 1
+#define LD_MAXEXP   0x7fff  // maximum biased exponent
+
+#define D_BIAS      0x3ff   // exponent bias for double
+#define D_BIASM1    0x3fe   // D_BIAS - 1
+#define D_MAXEXP    0x7ff   // maximum biased exponent
+
+#define _IS_MAN_INF(signbit, manhi, manlo) ((manhi)==MSB_ULONG && (manlo)==0x0 )
+
+#if defined (LITTLE_ENDIAN)
+
+// Manipulation of a 12-byte long double number (an ordinary
+// 10-byte long double plus two extra bytes of mantissa).
+//
+// byte layout:
+//
+//              +--+--+--+--+--+--+--+--+--+--+--+--+
+//              |XT:2 |  MANLO:4  |  MANHI:4  |EXP:2|
+//              +--+--+--+--+--+--+--+--+--+--+--+--+
+//              |  UL_LO:4  |  UL_MED:4 |  UL_HI:4  |
+//              +--+--+--+--+--+--+--+--+--+--+--+--+
+//
+#define U_EXP_12(p) ((uint16 *)(PTR_12(p)+10))      // exponent/sign
+#if !defined(REQUIRES_UNALIGNED_FLAG)
+#define UL_MANHI_12(p) ((uint32 *)(PTR_12(p)+6))    // 4 hi-order bytes of ord mantissa
+#define UL_MANLO_12(p) ((uint32 *)(PTR_12(p)+2))    // 4 lo-order bytes of ord mantissa
+#else
+#define UL_MANHI_12(p) ((uint32  __unaligned *) (PTR_12(p)+6) )
+#define UL_MANLO_12(p) ((uint32  __unaligned *) (PTR_12(p)+2) )
+#endif // defined(REQUIRES_UNALIGNED_FLAG)
+#define U_XT_12(p) ((uint16 *)PTR_12(p))            // 2 extra-lo bytes of mantissa
+
+#define UL_LO_12(p) ((uint32 *)PTR_12(p))           // 4 lo-order bytes of 12-byte value
+#define UL_MED_12(p) ((uint32 *)(PTR_12(p)+4))      // 4 mid-order bytes of 12-byte value
+#define UL_HI_12(p) ((uint32 *)(PTR_12(p)+8))       // 4 hi-order bytes of 12-byte value
+
+#define UCHAR_12(p,i) ((uint8 *)PTR_12(p)+(i))      // byte of order i (LSB=0)
+#define USHORT_12(p,i) ((uint16 *)((uint8 *)PTR_12(p)+(i))) // uint16 at byte of order i
+#define ULONG_12(p,i) ((uint32 *)((uint8 *)PTR_12(p)+(i)))  // uint32 at byte of order i
+
+// Manipulation of a 64bit IEEE double
+#define UINT164_D(p) ((uint16 *)(p) + 3)
+#define UL_HI_D(p) ((uint32 *)(p) + 1)
+#define UL_LO_D(p) ((uint32 *)(p))
+
+#endif // defined(LITTLE_ENDIAN)
+
+#if defined (BIG_ENDIAN)
+
+#define U_EXP_12(p) ((uint16 *)PTR_12(p))
+#define UL_MANHI_12(p) ((uint32 *)(PTR_12(p)+2))
+#define UL_MANLO_12(p) ((uint32 *)(PTR_12(p)+6))
+#define U_XT_12(p) ((uint16 *)(PTR_12(p)+10))
+
+#define UL_LO_12(p) ((uint32 *)(PTR_12(p)+8))
+#define UL_MED_12(p) ((uint32 *)(PTR_12(p)+4))
+#define UL_HI_12(p) ((uint32 *)PTR_12(p))
+
+#define UCHAR_12(p,i) ((uint8 *)PTR_12(p)+(11-(i)))
+#define USHORT_12(p,i)  ((uint16 *)((uint8 *)PTR_12(p)+10-(i)))
+#define ULONG_12(p,i) ((uint32 *)((uint8 *)PTR_12(p)+8-(i)))
+
+// Manipulation of a 64bit IEEE double
+#define UINT164_D(p) ((uint16 *)(p))
+#define UL_HI_D(p) ((uint32 *)(p))
+#define UL_LO_D(p) ((uint32 *)(p) + 1)
+
+#endif // defined(BIG_ENDIAN)
+
+#define PUT_INF_12(p,sign) \
+                  *UL_HI_12(p) = (sign)?0xffff8000:0x7fff8000; \
+                  *UL_MED_12(p) = 0; \
+                  *UL_LO_12(p) = 0;
+
+#define PUT_ZERO_12(p) *UL_HI_12(p) = 0; \
+                  *UL_MED_12(p) = 0; \
+                  *UL_LO_12(p) = 0;
+
+#define ISZERO_12(p) ((*UL_HI_12(p)&0x7fffffff) == 0 && \
+                      *UL_MED_12(p) == 0 && \
+                      *UL_LO_12(p) == 0 )
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Purpose:  Convert a double into a _LDBL12
+//
+//  Entry: double *px
+//
+//  Exit: the corresponding _LDBL12 value is returned in *pld
+//
+static void dtold12(_LDBL12 *pld, const double *px)
+{
+    uint32 msb = MSB_ULONG;
+    uint16 ldexp = 0;
+    uint16 exp = (*UINT164_D(px) & (uint16)0x7ff0) >> 4;
+    uint16 sign = *UINT164_D(px) & (uint16)0x8000;
+    uint32 manhi = *UL_HI_D(px) & 0xfffff;
+    uint32 manlo = *UL_LO_D(px);
+
+    switch (exp) {
+      case D_MAXEXP:
+        ldexp = LD_MAXEXP;
+        break;
+      case 0:
+        // check for zero
+        if (manhi == 0 && manlo == 0) {
+            *UL_MANHI_12(pld) = 0;
+            *UL_MANLO_12(pld) = 0;
+            *U_XT_12(pld) = 0;
+            *U_EXP_12(pld) = 0;
+            return;
+        }
+        // we have a denormal -- we'll normalize later
+        ldexp = (uint16) ((int16)exp - D_BIAS + LD_BIAS + 1);
+        msb = 0;
+        break;
+      default:
+        exp -= D_BIAS;
+        ldexp = (uint16) ((int16)exp + LD_BIAS);
+        break;
+    }
+
+    *UL_MANHI_12(pld) = msb | (manhi << 11) | (manlo >> 21);
+    *UL_MANLO_12(pld) = manlo << 11;
+
+    // normalize if necessary
+    while ((*UL_MANHI_12(pld) & MSB_ULONG) == 0) {
+        // shift left
+        *UL_MANHI_12(pld) = (*UL_MANHI_12(pld) << 1) |
+            (MSB_ULONG & *UL_MANLO_12(pld) ? 1: 0);
+        (*UL_MANLO_12(pld)) <<= 1;
+        ldexp --;
+    }
+    *U_EXP_12(pld) = sign | ldexp;
+    *U_XT_12(pld) = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Purpose: add two uint32 numbers and return carry
+//
+//  Entry: uint32 x, uint32 y : the numbers to be added
+//         uint32 *sum : where to store the result
+//
+//  Exit: *sum receives the value of x+y
+//        the value of the carry is returned
+//
+static int addl(uint32 x, uint32 y, uint32 *sum)
+{
+    uint32 r = x + y;
+    *sum = r;
+    return (r < x || r < y);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Purpose: add two _LDBL12 numbers. The numbers are added
+//  as 12-byte integers. Overflow is ignored.
+//
+//  Entry: x,y: pointers to the operands
+//
+//  Exit: *x receives the sum
+//
+static void add_12(_LDBL12 *x, _LDBL12 *y)
+{
+    if (addl(*UL_LO_12(x),*UL_LO_12(y),UL_LO_12(x))) {
+        if (addl(*UL_MED_12(x),(uint32)1,UL_MED_12(x))) {
+            (*UL_HI_12(x))++;
+        }
+    }
+    if (addl(*UL_MED_12(x),*UL_MED_12(y),UL_MED_12(x))) {
+        (*UL_HI_12(x))++;
+    }
+    // ignore next carry -- assume no overflow will occur
+    (void)addl(*UL_HI_12(x),*UL_HI_12(y),UL_HI_12(x));
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Purpose: Shift a _LDBL12 number one bit to the left (right). The number
+//  is shifted as a 12-byte integer. The MSB is lost.
+//
+//  Entry: x: a pointer to the operand
+//
+//  Exit: *x is shifted one bit to the left (or right)
+//
+static void shl_12(_LDBL12 *p)
+{
+    uint32 c0 = (*UL_LO_12(p) & MSB_ULONG) ? 1: 0;
+    uint32 c1 = (*UL_MED_12(p) & MSB_ULONG) ? 1: 0;
+    *UL_LO_12(p) <<= 1;
+    *UL_MED_12(p) = (*UL_MED_12(p) << 1) | c0;
+    *UL_HI_12(p) = (*UL_HI_12(p) << 1) | c1;
+}
+
+static void shr_12(_LDBL12 *p)
+{
+    uint32 c2 = (*UL_HI_12(p) & 0x1) ? MSB_ULONG: 0;
+    uint32 c1 = (*UL_MED_12(p) & 0x1) ? MSB_ULONG: 0;
+    *UL_HI_12(p) >>= 1;
+    *UL_MED_12(p) = (*UL_MED_12(p) >> 1) | c2;
+    *UL_LO_12(p) = (*UL_LO_12(p) >> 1) | c1;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Purpose: multiply two _LDBL12 numbers
+//
+//  Entry: px,py: pointers to the _LDBL12 operands
+//
+//  Exit: *px contains the product
+//
+static void ld12mul(_LDBL12 *px, _LDBL12 *py)
+{
+    _LDBL12 tempman; // this is actually a 12-byte mantissa, not a 12-byte long double
+
+    *UL_LO_12(&tempman) = 0;
+    *UL_MED_12(&tempman) = 0;
+    *UL_HI_12(&tempman) = 0;
+
+    uint16 expx = *U_EXP_12(px);
+    uint16 expy = *U_EXP_12(py);
+    uint16 sign = (expx ^ expy) & (uint16)0x8000;
+    expx &= 0x7fff;
+    expy &= 0x7fff;
+    uint16 expsum = expx + expy;
+    if (expx >= LD_MAXEXP
+        || expy >= LD_MAXEXP
+        || expsum > LD_MAXEXP + LD_BIASM1) {
+        // overflow to infinity
+        PUT_INF_12(px,sign);
+        return;
+    }
+    if (expsum <= LD_BIASM1 - 63) {
+        // underflow to zero
+        PUT_ZERO_12(px);
+        return;
+    }
+    if (expx == 0) {
+        // If this is a denormal temp real then the mantissa
+        // was shifted right once to set bit 63 to zero.
+        expsum++; // Correct for this
+        if (ISZERO_12(px)) {
+            // put positive sign
+            *U_EXP_12(px) = 0;
+            return;
+        }
+    }
+    if (expy == 0) {
+        expsum++; // because arg2 is denormal
+        if (ISZERO_12(py)) {
+            PUT_ZERO_12(px);
+            return;
+        }
+    }
+
+    int roffs = 0;
+    for (int i = 0; i < 5; i++) {
+        int poffs = i << 1;
+        int qoffs = 8;
+        for (int j = 5 - i; j > 0; j--) {
+            uint32 prod;
+            int carry;
+            uint16 *p, *q;
+            uint32 *r;
+            p = USHORT_12(px,poffs);
+            q = USHORT_12(py,qoffs);
+            r = ULONG_12(&tempman,roffs);
+            prod = (uint32)*p * (uint32)*q;
+            carry = addl(*r,prod,r);
+            if (carry) {
+                // roffs should be less than 8 in this case
+                (*USHORT_12(&tempman,roffs+4))++;
+            }
+            poffs += 2;
+            qoffs -= 2;
+        }
+        roffs += 2;
+    }
+
+    expsum -= LD_BIASM1;
+
+    // normalize
+    while ((int16)expsum > 0 &&
+           ((*UL_HI_12(&tempman) & MSB_ULONG) == 0)) {
+        shl_12(&tempman);
+        expsum--;
+    }
+
+    if ((int16)expsum <= 0) {
+        bool sticky = false;
+        expsum--;
+        while ((int16)expsum < 0) {
+            if (*U_XT_12(&tempman) & 0x1) {
+                sticky = true;
+            }
+            shr_12(&tempman);
+            expsum++;
+        }
+        if (sticky) {
+            *U_XT_12(&tempman) |= 0x1;
+        }
+    }
+
+    if (*U_XT_12(&tempman) > 0x8000 ||
+        ((*UL_LO_12(&tempman) & 0x1ffff) == 0x18000)) {
+        // round up
+        if (*UL_MANLO_12(&tempman) == MAX_ULONG) {
+            *UL_MANLO_12(&tempman) = 0;
+            if (*UL_MANHI_12(&tempman) == MAX_ULONG) {
+                *UL_MANHI_12(&tempman) = 0;
+                if (*U_EXP_12(&tempman) == MAX_USHORT) {
+                    // 12-byte mantissa overflow
+                    *U_EXP_12(&tempman) = MSB_USHORT;
+                    expsum++;
+                }
+                else {
+                    (*U_EXP_12(&tempman))++;
+                }
+            }
+            else {
+                (*UL_MANHI_12(&tempman))++;
+            }
+        }
+        else {
+            (*UL_MANLO_12(&tempman))++;
+        }
+    }
+
+    // check for exponent overflow
+    if (expsum >= 0x7fff) {
+        PUT_INF_12(px, sign);
+        return;
+    }
+
+    // put result in px
+    *U_XT_12(px) = *USHORT_12(&tempman,2);
+    *UL_MANLO_12(px) = *UL_MED_12(&tempman);
+    *UL_MANHI_12(px) = *UL_HI_12(&tempman);
+    *U_EXP_12(px) = expsum | sign;
+}
+
+static void multtenpow12(_LDBL12 *pld12, int pow)
+{
+    //////////////////////////////////////////////////////////////////////////////
+    //
+    // Format: A 10 byte long double + 2 bytes of extra precision
+    // If the extra precision is desired, the 10-byte long double
+    // should be "unrounded" first.
+    //
+    static _LDBL12 _pow10pos[] = {
+#if defined(LITTLE_ENDIAN)
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xA0,0x02,0x40}},   // P0001
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC8,0x05,0x40}},   // P0002
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFA,0x08,0x40}},   // P0003
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x9C,0x0C,0x40}},   // P0004
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x50,0xC3,0x0F,0x40}},   // P0005
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x24,0xF4,0x12,0x40}},   // P0006
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x80,0x96,0x98,0x16,0x40}},   // P0007
+        {{0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x20,0xBC,0xBE,0x19,0x40}},   // P0008
+        {{0x00,0x00, 0x00,0x00,0x00,0x04,0xBF,0xC9,0x1B,0x8E,0x34,0x40}},   // P0016
+        {{0x00,0x00, 0x00,0xA1,0xED,0xCC,0xCE,0x1B,0xC2,0xD3,0x4E,0x40}},   // P0024
+        {{0x20,0xF0, 0x9E,0xB5,0x70,0x2B,0xA8,0xAD,0xC5,0x9D,0x69,0x40}},   // P0032
+        {{0xD0,0x5D, 0xFD,0x25,0xE5,0x1A,0x8E,0x4F,0x19,0xEB,0x83,0x40}},   // P0040
+        {{0x71,0x96, 0xD7,0x95,0x43,0x0E,0x05,0x8D,0x29,0xAF,0x9E,0x40}},   // P0048
+        {{0xF9,0xBF, 0xA0,0x44,0xED,0x81,0x12,0x8F,0x81,0x82,0xB9,0x40}},   // P0056
+        {{0xBF,0x3C, 0xD5,0xA6,0xCF,0xFF,0x49,0x1F,0x78,0xC2,0xD3,0x40}},   // P0064
+        {{0x6F,0xC6, 0xE0,0x8C,0xE9,0x80,0xC9,0x47,0xBA,0x93,0xA8,0x41}},   // P0128
+        {{0xBC,0x85, 0x6B,0x55,0x27,0x39,0x8D,0xF7,0x70,0xE0,0x7C,0x42}},   // P0192
+        {{0xBC,0xDD, 0x8E,0xDE,0xF9,0x9D,0xFB,0xEB,0x7E,0xAA,0x51,0x43}},   // P0256
+        {{0xA1,0xE6, 0x76,0xE3,0xCC,0xF2,0x29,0x2F,0x84,0x81,0x26,0x44}},   // P0320
+        {{0x28,0x10, 0x17,0xAA,0xF8,0xAE,0x10,0xE3,0xC5,0xC4,0xFA,0x44}},   // P0384
+        {{0xEB,0xA7, 0xD4,0xF3,0xF7,0xEB,0xE1,0x4A,0x7A,0x95,0xCF,0x45}},   // P0448
+        {{0x65,0xCC, 0xC7,0x91,0x0E,0xA6,0xAE,0xA0,0x19,0xE3,0xA3,0x46}},   // P0512
+        {{0x0D,0x65, 0x17,0x0C,0x75,0x81,0x86,0x75,0x76,0xC9,0x48,0x4D}},   // P1024
+        {{0x58,0x42, 0xE4,0xA7,0x93,0x39,0x3B,0x35,0xB8,0xB2,0xED,0x53}},   // P1536
+        {{0x4D,0xA7, 0xE5,0x5D,0x3D,0xC5,0x5D,0x3B,0x8B,0x9E,0x92,0x5A}},   // P2048
+        {{0xFF,0x5D, 0xA6,0xF0,0xA1,0x20,0xC0,0x54,0xA5,0x8C,0x37,0x61}},   // P2560
+        {{0xD1,0xFD, 0x8B,0x5A,0x8B,0xD8,0x25,0x5D,0x89,0xF9,0xDB,0x67}},   // P3072
+        {{0xAA,0x95, 0xF8,0xF3,0x27,0xBF,0xA2,0xC8,0x5D,0xDD,0x80,0x6E}},   // P3584
+        {{0x4C,0xC9, 0x9B,0x97,0x20,0x8A,0x02,0x52,0x60,0xC4,0x25,0x75}}    // P4096
+#endif
+#if defined(BIG_ENDIAN)
+        {{0x40,0x02,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0001
+        {{0x40,0x05,0xC8,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0002
+        {{0x40,0x08,0xFA,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0003
+        {{0x40,0x0C,0x9C,0x40,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0004
+        {{0x40,0x0F,0xC3,0x50,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0005
+        {{0x40,0x12,0xF4,0x24,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0006
+        {{0x40,0x16,0x98,0x96,0x80,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0007
+        {{0x40,0x19,0xBE,0xBC,0x20,0x00,0x00,0x00,0x00,0x00, 0x00,0x00}},   // P0008
+        {{0x40,0x34,0x8E,0x1B,0xC9,0xBF,0x04,0x00,0x00,0x00, 0x00,0x00}},   // P0016
+        {{0x40,0x4E,0xD3,0xC2,0x1B,0xCE,0xCC,0xED,0xA1,0x00, 0x00,0x00}},   // P0024
+        {{0x40,0x69,0x9D,0xC5,0xAD,0xA8,0x2B,0x70,0xB5,0x9E, 0xF0,0x20}},   // P0032
+        {{0x40,0x83,0xEB,0x19,0x4F,0x8E,0x1A,0xE5,0x25,0xFD, 0x5D,0xD0}},   // P0040
+        {{0x40,0x9E,0xAF,0x29,0x8D,0x05,0x0E,0x43,0x95,0xD7, 0x96,0x71}},   // P0048
+        {{0x40,0xB9,0x82,0x81,0x8F,0x12,0x81,0xED,0x44,0xA0, 0xBF,0xF9}},   // P0056
+        {{0x40,0xD3,0xC2,0x78,0x1F,0x49,0xFF,0xCF,0xA6,0xD5, 0x3C,0xBF}},   // P0064
+        {{0x41,0xA8,0x93,0xBA,0x47,0xC9,0x80,0xE9,0x8C,0xE0, 0xC6,0x6F}},   // P0128
+        {{0x42,0x7C,0xE0,0x70,0xF7,0x8D,0x39,0x27,0x55,0x6B, 0x85,0xBC}},   // P0192
+        {{0x43,0x51,0xAA,0x7E,0xEB,0xFB,0x9D,0xF9,0xDE,0x8E, 0xDD,0xBC}},   // P0256
+        {{0x44,0x26,0x81,0x84,0x2F,0x29,0xF2,0xCC,0xE3,0x76, 0xE6,0xA1}},   // P0320
+        {{0x44,0xFA,0xC4,0xC5,0xE3,0x10,0xAE,0xF8,0xAA,0x17, 0x10,0x28}},   // P0384
+        {{0x45,0xCF,0x95,0x7A,0x4A,0xE1,0xEB,0xF7,0xF3,0xD4, 0xA7,0xEB}},   // P0448
+        {{0x46,0xA3,0xE3,0x19,0xA0,0xAE,0xA6,0x0E,0x91,0xC7, 0xCC,0x65}},   // P0512
+        {{0x4D,0x48,0xC9,0x76,0x75,0x86,0x81,0x75,0x0C,0x17, 0x65,0x0D}},   // P1024
+        {{0x53,0xED,0xB2,0xB8,0x35,0x3B,0x39,0x93,0xA7,0xE4, 0x42,0x58}},   // P1536
+        {{0x5A,0x92,0x9E,0x8B,0x3B,0x5D,0xC5,0x3D,0x5D,0xE5, 0xA7,0x4D}},   // P2048
+        {{0x61,0x37,0x8C,0xA5,0x54,0xC0,0x20,0xA1,0xF0,0xA6, 0x5D,0xFF}},   // P2560
+        {{0x67,0xDB,0xF9,0x89,0x5D,0x25,0xD8,0x8B,0x5A,0x8B, 0xFD,0xD1}},   // P3072
+        {{0x6E,0x80,0xDD,0x5D,0xC8,0xA2,0xBF,0x27,0xF3,0xF8, 0x95,0xAA}},   // P3584
+        {{0x75,0x25,0xC4,0x60,0x52,0x02,0x8A,0x20,0x97,0x9B, 0xC9,0x4C}}    // P4096
+#endif
+    };
+
+    static _LDBL12 _pow10neg[] = {
+#if defined(LITTLE_ENDIAN)
+        {{0xCD,0xCC, 0xCD,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xFB,0x3F}},   // N0001
+        {{0x71,0x3D, 0x0A,0xD7,0xA3,0x70,0x3D,0x0A,0xD7,0xA3,0xF8,0x3F}},   // N0002
+        {{0x5A,0x64, 0x3B,0xDF,0x4F,0x8D,0x97,0x6E,0x12,0x83,0xF5,0x3F}},   // N0003
+        {{0xC3,0xD3, 0x2C,0x65,0x19,0xE2,0x58,0x17,0xB7,0xD1,0xF1,0x3F}},   // N0004
+        {{0xD0,0x0F, 0x23,0x84,0x47,0x1B,0x47,0xAC,0xC5,0xA7,0xEE,0x3F}},   // N0005
+        {{0x40,0xA6, 0xB6,0x69,0x6C,0xAF,0x05,0xBD,0x37,0x86,0xEB,0x3F}},   // N0006
+        {{0x33,0x3D, 0xBC,0x42,0x7A,0xE5,0xD5,0x94,0xBF,0xD6,0xE7,0x3F}},   // N0007
+        {{0xC2,0xFD, 0xFD,0xCE,0x61,0x84,0x11,0x77,0xCC,0xAB,0xE4,0x3F}},   // N0008
+        {{0x2F,0x4C, 0x5B,0xE1,0x4D,0xC4,0xBE,0x94,0x95,0xE6,0xC9,0x3F}},   // N0016
+        {{0x92,0xC4, 0x53,0x3B,0x75,0x44,0xCD,0x14,0xBE,0x9A,0xAF,0x3F}},   // N0024
+        {{0xDE,0x67, 0xBA,0x94,0x39,0x45,0xAD,0x1E,0xB1,0xCF,0x94,0x3F}},   // N0032
+        {{0x24,0x23, 0xC6,0xE2,0xBC,0xBA,0x3B,0x31,0x61,0x8B,0x7A,0x3F}},   // N0040
+        {{0x61,0x55, 0x59,0xC1,0x7E,0xB1,0x53,0x7C,0x12,0xBB,0x5F,0x3F}},   // N0048
+        {{0xD7,0xEE, 0x2F,0x8D,0x06,0xBE,0x92,0x85,0x15,0xFB,0x44,0x3F}},   // N0056
+        {{0x24,0x3F, 0xA5,0xE9,0x39,0xA5,0x27,0xEA,0x7F,0xA8,0x2A,0x3F}},   // N0064
+        {{0x7D,0xAC, 0xA1,0xE4,0xBC,0x64,0x7C,0x46,0xD0,0xDD,0x55,0x3E}},   // N0128
+        {{0x63,0x7B, 0x06,0xCC,0x23,0x54,0x77,0x83,0xFF,0x91,0x81,0x3D}},   // N0192
+        {{0x91,0xFA, 0x3A,0x19,0x7A,0x63,0x25,0x43,0x31,0xC0,0xAC,0x3C}},   // N0256
+        {{0x21,0x89, 0xD1,0x38,0x82,0x47,0x97,0xB8,0x00,0xFD,0xD7,0x3B}},   // N0320
+        {{0xDC,0x88, 0x58,0x08,0x1B,0xB1,0xE8,0xE3,0x86,0xA6,0x03,0x3B}},   // N0384
+        {{0xC6,0x84, 0x45,0x42,0x07,0xB6,0x99,0x75,0x37,0xDB,0x2E,0x3A}},   // N0448
+        {{0x33,0x71, 0x1C,0xD2,0x23,0xDB,0x32,0xEE,0x49,0x90,0x5A,0x39}},   // N0512
+        {{0xA6,0x87, 0xBE,0xC0,0x57,0xDA,0xA5,0x82,0xA6,0xA2,0xB5,0x32}},   // N1024
+        {{0xE2,0x68, 0xB2,0x11,0xA7,0x52,0x9F,0x44,0x59,0xB7,0x10,0x2C}},   // N1536
+        {{0x25,0x49, 0xE4,0x2D,0x36,0x34,0x4F,0x53,0xAE,0xCE,0x6B,0x25}},   // N2048
+        {{0x8F,0x59, 0x04,0xA4,0xC0,0xDE,0xC2,0x7D,0xFB,0xE8,0xC6,0x1E}},   // N2560
+        {{0x9E,0xE7, 0x88,0x5A,0x57,0x91,0x3C,0xBF,0x50,0x83,0x22,0x18}},   // N3072
+        {{0x4E,0x4B, 0x65,0x62,0xFD,0x83,0x8F,0xAF,0x06,0x94,0x7D,0x11}},   // N3584
+        {{0xE4,0x2D, 0xDE,0x9F,0xCE,0xD2,0xC8,0x04,0xDD,0xA6,0xD8,0x0A}}    // N4096
+#endif
+#if defined(BIG_ENDIAN)
+        {{0x3F,0xFB,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCD, 0xCC,0xCD}},   // N0001
+        {{0x3F,0xF8,0xA3,0xD7,0x0A,0x3D,0x70,0xA3,0xD7,0x0A, 0x3D,0x71}},   // N0002
+        {{0x3F,0xF5,0x83,0x12,0x6E,0x97,0x8D,0x4F,0xDF,0x3B, 0x64,0x5A}},   // N0003
+        {{0x3F,0xF1,0xD1,0xB7,0x17,0x58,0xE2,0x19,0x65,0x2C, 0xD3,0xC3}},   // N0004
+        {{0x3F,0xEE,0xA7,0xC5,0xAC,0x47,0x1B,0x47,0x84,0x23, 0x0F,0xD0}},   // N0005
+        {{0x3F,0xEB,0x86,0x37,0xBD,0x05,0xAF,0x6C,0x69,0xB6, 0xA6,0x40}},   // N0006
+        {{0x3F,0xE7,0xD6,0xBF,0x94,0xD5,0xE5,0x7A,0x42,0xBC, 0x3D,0x33}},   // N0007
+        {{0x3F,0xE4,0xAB,0xCC,0x77,0x11,0x84,0x61,0xCE,0xFD, 0xFD,0xC2}},   // N0008
+        {{0x3F,0xC9,0xE6,0x95,0x94,0xBE,0xC4,0x4D,0xE1,0x5B, 0x4C,0x2F}},   // N0016
+        {{0x3F,0xAF,0x9A,0xBE,0x14,0xCD,0x44,0x75,0x3B,0x53, 0xC4,0x92}},   // N0024
+        {{0x3F,0x94,0xCF,0xB1,0x1E,0xAD,0x45,0x39,0x94,0xBA, 0x67,0xDE}},   // N0032
+        {{0x3F,0x7A,0x8B,0x61,0x31,0x3B,0xBA,0xBC,0xE2,0xC6, 0x23,0x24}},   // N0040
+        {{0x3F,0x5F,0xBB,0x12,0x7C,0x53,0xB1,0x7E,0xC1,0x59, 0x55,0x61}},   // N0048
+        {{0x3F,0x44,0xFB,0x15,0x85,0x92,0xBE,0x06,0x8D,0x2F, 0xEE,0xD7}},   // N0056
+        {{0x3F,0x2A,0xA8,0x7F,0xEA,0x27,0xA5,0x39,0xE9,0xA5, 0x3F,0x24}},   // N0064
+        {{0x3E,0x55,0xDD,0xD0,0x46,0x7C,0x64,0xBC,0xE4,0xA1, 0xAC,0x7D}},   // N0128
+        {{0x3D,0x81,0x91,0xFF,0x83,0x77,0x54,0x23,0xCC,0x06, 0x7B,0x63}},   // N0192
+        {{0x3C,0xAC,0xC0,0x31,0x43,0x25,0x63,0x7A,0x19,0x3A, 0xFA,0x91}},   // N0256
+        {{0x3B,0xD7,0xFD,0x00,0xB8,0x97,0x47,0x82,0x38,0xD1, 0x89,0x21}},   // N0320
+        {{0x3B,0x03,0xA6,0x86,0xE3,0xE8,0xB1,0x1B,0x08,0x58, 0x88,0xDC}},   // N0384
+        {{0x3A,0x2E,0xDB,0x37,0x75,0x99,0xB6,0x07,0x42,0x45, 0x84,0xC6}},   // N0448
+        {{0x39,0x5A,0x90,0x49,0xEE,0x32,0xDB,0x23,0xD2,0x1C, 0x71,0x33}},   // N0512
+        {{0x32,0xB5,0xA2,0xA6,0x82,0xA5,0xDA,0x57,0xC0,0xBE, 0x87,0xA6}},   // N1024
+        {{0x2C,0x10,0xB7,0x59,0x44,0x9F,0x52,0xA7,0x11,0xB2, 0x68,0xE2}},   // N1536
+        {{0x25,0x6B,0xCE,0xAE,0x53,0x4F,0x34,0x36,0x2D,0xE4, 0x49,0x25}},   // N2048
+        {{0x1E,0xC6,0xE8,0xFB,0x7D,0xC2,0xDE,0xC0,0xA4,0x04, 0x59,0x8F}},   // N2560
+        {{0x18,0x22,0x83,0x50,0xBF,0x3C,0x91,0x57,0x5A,0x88, 0xE7,0x9E}},   // N3072
+        {{0x11,0x7D,0x94,0x06,0xAF,0x8F,0x83,0xFD,0x62,0x65, 0x4B,0x4E}},   // N3584
+        {{0x0A,0xD8,0xA6,0xDD,0x04,0xC8,0xD2,0xCE,0x9F,0xDE, 0x2D,0xE4}}    // N4096
+#endif
+    };
+
+    _LDBL12 *pow_10p = _pow10pos - 8;
+    if (pow == 0) {
+        return;
+    }
+    if (pow < 0) {
+        pow = -pow;
+        pow_10p = _pow10neg - 8;
+    }
+
+    while (pow) {
+        pow_10p += 7;
+        int last3 = pow & 0x7;  // the 3 LSBits of pow
+        pow >>= 3;
+        if (last3 == 0) {
+            continue;
+        }
+        _LDBL12 *py = pow_10p + last3;
+
+        // do an exact 12 byte multiplication
+        if (*U_XT_12(py) >= 0x8000) {
+
+            _LDBL12 unround = *py;      // copy number
+            (*UL_MANLO_12(&unround))--; // unround adjacent byte
+            py = &unround;              // point to new operand
+        }
+        ld12mul(pld12, py);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Purpose:
+//      _ecvt converts value to a null terminated string of
+//      UNICODE digits, and returns a pointer to the result.
+//      The position of the decimal point relative to the
+//      beginning of the string is stored indirectly through
+//      decpt, where negative means to the left of the returned
+//      digits.  If the sign of the result is negative, the
+//      bool pointed to by negative is set to true, otherwise it is
+//      false.  The low order digit is rounded.
+//
+//  Entry:
+//      double value - number to be converted
+//      int digits - number of digits after decimal point
+//
+//  Exit:
+//      returns pointer to the character representation of value.
+//      int *decpt - pointer to int with position of decimal point
+//      bool *negative - pointer to bool for if value < 0.
+//
+bool Class_System_Number::g_ecvt(double value,
+                                 int digits,
+                                 ClassVector_bartok_char * buf,
+                                 int *decpt,
+                                 bool *negative)
+{
+    if ((uint32)digits > buf->length - 1) {
+        digits = buf->length - 1;
+    }
+    bartok_char *man = buf->values;
+
+    // useful constants (see algorithm explanation below)
+    const uint16 log2hi = 0x4d10;
+    const uint16 log2lo = 0x4d;
+    const uint16 log4hi = 0x9a;
+    const uint32 c = 0x134312f4;
+#if defined(LITTLE_ENDIAN)
+    _LDBL12 ld12_one_tenth = {
+        {0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfb,0x3f}
+    };
+#endif
+#if defined(BIG_ENDIAN)
+    _LDBL12 ld12_one_tenth = {
+        {0x3f,0xfb,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc}
+    };
+#endif
+
+    // convert the double into a 12-byte long double.
+    _LDBL12 ld12;
+    dtold12(&ld12, &value);
+
+    uint16 expn = *U_EXP_12(&ld12);
+    uint32 manhi = *UL_MANHI_12(&ld12);
+    uint32 manlo = *UL_MANLO_12(&ld12);
+    uint16 sign = expn & MSB_USHORT;
+    expn &= 0x7fff;
+    *U_EXP_12(&ld12) = expn;
+
+    *negative = (sign != 0);
+
+    if (expn == 0 && manhi == 0 && manlo == 0) {
+      zero_fos:
+        *decpt = 0;
+        *negative = false;
+        man[0] = '0';
+        man[1] = '\0';
+        return true;
+    }
+
+    if (expn == 0x7fff) {
+        man[0] = '\0';
+        *decpt = SCALE_NAN;
+        if (_IS_MAN_INF(sign, manhi, manlo)) {
+            *decpt = SCALE_INF; // infinity
+        }
+        return false;
+    }
+    else {
+        // * Algorithm for the decoding of a valid real number x *
+        //
+        // In the following INT(r) is the largest integer less than or
+        // equal to r (i.e. r rounded toward -infinity). We want a result
+        // r equal to 1 + log(x), because then x = mantissa
+        // * 10^(INT(r)) so that .1 <= mantissa < 1.  Unfortunately,
+        // we cannot compute s exactly so we must alter the procedure
+        // slightly.  We will instead compute an estimate r of 1 +
+        // log(x) which is always low.  This will either result
+        // in the correctly normalized number on the top of the stack
+        // or perhaps a number which is a factor of 10 too large.  We
+        // will then check to see that if x is larger  than one
+        // and if so multiply x by 1/10.
+        //
+        // We will use a low precision (fixed point 24 bit) estimate
+        // of of 1 + log base 10 of x.  We have approximately .mm
+        // * 2^hhll on the top of the stack where m, h, and l represent
+        // hex digits, mm represents the high 2 hex digits of the
+        // mantissa, hh represents the high 2 hex digits of the exponent,
+        // and ll represents the low 2 hex digits of the exponent.  Since
+        // .mm is a truncated representation of the mantissa, using it
+        // in this monotonically increasing  polynomial approximation
+        // of the logarithm will naturally give a low result. Let's
+        // derive a formula for a lower bound r on 1 + log(x):
+        //
+        //      .4D104D42H < log(2)=.30102999...(base 10) < .4D104D43H
+        //     .9A20H < log(4)=.60205999...(base 10) < .9A21H
+        //
+        //  1/2 <= .mm < 1
+        //  ==>  log(.mm) >= .mm * log(4) - log(4)
+        //
+        // Substituting in truncated hex constants in the formula above
+        // gives r = 1 + .4D104DH * hhll. + .9AH * .mm - .9A21H.  Now
+        // multiplication of hex digits 5 and 6 of log(2) by ll has an
+        // insignificant effect on the first 24 bits of the result so
+        // it will not be calculated.  This gives the expression r =
+        // 1 + .4D10H * hhll. + .4DH * .hh + .9A * .mm - .9A21H.
+        // Finally we must add terms to our formula to subtract out the
+        // effect of the exponent bias.  We obtain the following formula:
+        //
+        //           (implied decimal point)
+        //   <                 >.<                  >
+        //   |3|3|2|2|2|2|2|2|2|2|2|2|1|1|1|1|1|1|1|1|1|1|0|0|0|0|0|0|0|0|0|0|
+        //   |1|0|9|8|7|6|5|4|3|2|1|0|9|8|7|6|5|4|3|2|1|0|9|8|7|6|5|4|3|2|1|0|
+        // + <         1       >
+        // + <               .4D10H * hhll.             >
+        // +                 <       .00004DH * hh00.       >
+        // +                 <          .9AH * .mm      >
+        // -                 <        .9A21H        >
+        // - <               .4D10H * 3FFEH             >
+        // -                 <       .00004DH * 3F00H       >
+        //
+        //  ==>  r = .4D10H * hhll. + .4DH * .hh + .9AH * .mm - 1343.12F4H
+        //
+        // The difference between the lower bound r and the upper bound
+        // s is calculated as follows:
+        //
+        //  .937EH < 1/ln(10)-log(1/ln(4))=.57614993...(base 10) < .937FH
+        //
+        //  1/2 <= .mm < 1
+        //  ==>  log(.mm) <= .mm * log(4) - [1/ln(10) - log(1/ln(4))]
+        //
+        // so tentatively s = r + log(4) - [1/ln(10) - log(1/ln(4))],
+        // but we must also add in terms to ensure we will have an upper
+        // bound even after the truncation of various values.  Because
+        // log(2) * hh00. is truncated to .4D104DH * hh00.  we must
+        // add .0043H, because log(2) * ll. is truncated to .4D10H *
+        // ll. we must add .0005H, because <mantissa> * log(4) is
+        // truncated to .mm * .9AH we must add .009AH and .0021H.
+        //
+        // Thus s = r - .937EH + .9A21H + .0043H + .0005H + .009AH + .0021H
+        //   = r + .07A6H
+        //  ==>  s = .4D10H * hhll. + .4DH * .hh + .9AH * .mm - 1343.0B4EH
+        //
+        // r is equal to 1 + log(x) more than (10000H - 7A6H) /
+        // 10000H = 97% of the time.
+        //
+        // In the above formula, a uint32 is use to accommodate r, and
+        // there is an implied decimal point in the middle.
+
+        uint16 hh = expn >> 8;
+        uint16 ll = expn & (uint16)0xff;
+        uint16 mm = (uint16) (manhi >> 24);   // the two most significant bytes of the mantissa.
+        int32 r = (int32)log2hi*(int32)expn + log2lo*hh + log4hi*mm - c;
+        // the corresponding power of 10
+        int32 ir = (int16)(r >> 16); // ir = floor(r)
+
+        // We stated that we wanted to normalize x so that
+        //
+        //  .1 <= x < 1
+        //
+        // This was a slight oversimplification.  Actually we want a
+        // number which when rounded to 16 significant digits is in the
+        // desired range.  To do this we must normalize x so that
+        //
+        //  .1 - 5*10^(-18) <= x < 1 - 5*10^(-17)
+        //
+        // and then round.
+        //
+        // If we had f = INT(1+log(x)) we could multiply by 10^(-f)
+        // to get x into the desired range.  We do not quite have
+        // f but we do have INT(r) from the last step which is equal
+        // to f 97% of the time and 1 less than f the rest of the time.
+        // We can multiply by 10^-[INT(r)] and if the result is greater
+        // than 1 - 5*10^(-17) we can then multiply by 1/10.  This final
+        // result will lie in the proper range.
+
+        // multiply by 10^(-ir)
+        multtenpow12(&ld12,-ir);
+
+        // if ld12 >= 1.0 then divide by 10.0
+        if (*U_EXP_12(&ld12) >= 0x3fff) {
+            ir++;
+            ld12mul(&ld12,&ld12_one_tenth);
+        }
+
+        *decpt = ir;
+
+        int ub_exp = *U_EXP_12(&ld12) - 0x3ffe; // unbias exponent
+        *U_EXP_12(&ld12) = 0;
+
+        // Now the mantissa has to be converted to fixed point.
+        // Then we will use the MSB of ld12 for generating
+        // the decimal digits. The next 11 bytes will hold
+        // the mantissa (after it has been converted to
+        // fixed point).
+
+        for (int i = 0; i < 8; i++) {
+            shl_12(&ld12);
+            // make space for an extra byte, in case we shift right later.
+        }
+        if (ub_exp < 0) {
+            int shift_count = (-ub_exp) & 0xff;
+            for (; shift_count > 0; shift_count--) {
+                shr_12(&ld12);
+            }
+        }
+
+        bartok_char *p = man;
+        for (int digcount = digits + 1; digcount > 0; digcount--) {
+            _LDBL12 tmp12 = ld12;
+            shl_12(&ld12);
+            shl_12(&ld12);
+            add_12(&ld12,&tmp12);
+            shl_12(&ld12);    // ld12 *= 10
+
+            // Now we have the first decimal digit in the most significant byte of exponent
+            *p++ = (char) (*UCHAR_12(&ld12,11) + '0');
+            *UCHAR_12(&ld12,11) = 0;
+        }
+
+        bartok_char round = *(--p);
+        p--;
+        // p points now to the last character of the string excluding the rounding digit.
+        if (round >= '5') {
+            // look for a non-9 digit starting from the end of string
+            for (; p >= man && *p == '9'; p--) {
+                *p = '0';
+            }
+            if (p < man) {
+                p++;
+                (*decpt)++;
+            }
+            (*p)++;
+        }
+        else {
+            // we probably don't want to truncate all of the zeros!
+            for (; p >= man && *p == '0'; p--) {
+                // remove extra zeros;
+            }
+            if (p < man) {
+                goto zero_fos;
+            }
+        }
+        man[(p - man + 1)] = '\0';
+        return true;
+    }
+}
+
+double Class_System_Number::g_atof(struct ClassVector_uint8 *a)
+{
+    Assert(!"atof");
+    return 0;
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/PEImage.cpp b/base/Kernel/Native/PEImage.cpp
new file mode 100644
index 0000000..871b476
--- /dev/null
+++ b/base/Kernel/Native/PEImage.cpp
@@ -0,0 +1,200 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PEImage.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+
+//////////////////////////////////////////////////////////////// Image Loader.
+//
+#if PAGING
+extern int syscallEntryTable[];
+
+struct AbiStackHead
+{
+    uintptr    prevBegin;
+    uintptr    prevLimit;
+    uintptr    esp;
+};
+
+int FakeSyscallBegin(int abiIndex)
+{
+    // TODO: validate abiIndex, set fs, etc.
+    return syscallEntryTable[abiIndex];
+}
+
+// TODO: these cannot be functions; we cannot trust the user stack
+uintptr PushAbiStack(uintptr esp)
+{
+    Struct_Microsoft_Singularity_X86_ThreadContext * context =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+    AbiStackHead *head = (AbiStackHead *)(context->abiStackHead);
+    head->prevBegin = context->stackBegin;
+    head->prevLimit = context->stackLimit;
+    head->esp = esp;
+    context->stackBegin = context->abiStackBegin;
+    context->stackLimit = context->abiStackLimit;
+    return uintptr(head);
+}
+
+uintptr PopAbiStack(AbiStackHead *head)
+{
+    Struct_Microsoft_Singularity_X86_ThreadContext * context =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+    // HACK: if the ABI call changed stackBegin/stackLimit, keep the changes
+    // (otherwise, switch back to original stack)
+    if (context->stackBegin == context->abiStackBegin) {
+        context->stackBegin = head->prevBegin;
+        context->stackLimit = head->prevLimit;
+    }
+    return head->esp;
+}
+
+#define SEGMENT_SELECTOR(s) \
+    (uint16)(offsetof(Struct_Microsoft_Singularity_CpuInfo,s) \
+             - offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtNull))
+const uint16 ourFs = SEGMENT_SELECTOR(GdtPF);
+__declspec(naked) void FakeSyscall()
+{
+    __asm
+    {
+#if 0
+        push ecx
+        push edx
+        call AbiStackSegment
+        pop edx
+        pop ecx
+        mov esp, eax // TODO: must set stackBase, stackLimit
+        push edx
+        call FakeSyscallBegin
+        mov edx, eax
+        mov eax, [esp] // eax = pointer to arg1
+        call edx
+        pop ecx // ecx = pointer to arg1
+        sub ecx, 4 // ecx = pointer to return address
+        mov esp, ecx
+        ret 8
+#else
+        // user stack = ret arg1 arg2 ret arg3 ... argn ...
+        // ecx = ABI index
+        // edx = pointer to arg1
+        push ecx
+        push edx
+        mov ecx, edx
+        sub ecx, 4 // 1 word for return address
+        call PushAbiStack
+        pop edx
+        pop ecx
+        mov esp, eax
+
+///        mov eax, edx
+///        sub eax, 4 // 1 word for return address
+///        mov esp, eax
+        sti
+        mov ax, ss
+        mov ds, ax    // Copy stack segment selector to DS so we can access memory!
+        mov es, ax    // Copy stack segment selector to ES so we can access memory!
+//        push    (offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtPF) - offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtNull))
+//        push    ourFs
+//        pop     fs
+        mov     ax, 0x38  // TODO: no more hexadecimal constants
+        mov     fs, ax
+//        push    fs;
+//        pop     fs;    // refresh fs (TODO: don't trust user's fs)
+        push edx
+        call FakeSyscallBegin
+        mov edx, eax
+        pop eax // pointer to arg1
+        // user stack = ret arg1 arg2 ret arg3 ... argn ...
+        call edx
+        call Class_Microsoft_Singularity_Processor::g_EnterRing3
+
+        // Any changes here must be reflected in EnterRing0
+        mov ecx, esp
+        push eax
+        push edx
+        call PopAbiStack
+        mov ecx, eax
+        pop edx
+        pop eax
+        mov esp, ecx
+
+        ret 8
+#endif
+    }
+}
+__declspec(naked) void EnterRing0()
+{
+    __asm
+    {
+        add esp, 4 // discard return address (pointing to FakeSyscall)
+
+        // Copied from FakeSyscall epilog:
+        mov ecx, esp
+        push eax
+        push edx
+        call PopAbiStack
+        mov ecx, eax
+        pop edx
+        pop eax
+        mov esp, ecx
+
+        ret 8
+    }
+}
+#endif // PAGING
+
+int32 Class_Microsoft_Singularity_Loader_PEImage::
+g_HalCallEntryPoint(UIntPtr entry, int threadIndex, bool runAtRing3)
+{
+    if (entry == 0) {
+        printf("Class_Microsoft_Singularity_Loader_PEImage::g_HalCallPeEntry called with null entry.\n");
+        return -1;
+    }
+
+#if PAGING
+    if (runAtRing3) {
+        Class_Microsoft_Singularity_Processor::g_EnterRing3();
+    }
+#else
+    Assert(!runAtRing3);
+#endif
+
+    int32 retval = (( int32 (__fastcall *)(int32))entry)(threadIndex);
+
+#if PAGING
+    if (runAtRing3) {
+        // We should still be running at ring-3 when the process unwinds
+        Assert(!Class_Microsoft_Singularity_Processor::g_AtKernelPrivilege());
+
+        // Call ABI zero, which drops us to ring-0. Why is this not
+        // a gaping security hole? The kernel should verify that this
+        // request only ever comes from its own (trusted) code (i.e.,
+        // right here).
+        __asm {
+            mov ecx, 0
+            push ecx
+            push ecx
+            mov edx, esp
+            push done
+            _emit   0x0f
+            _emit   0x34  //sysenter
+done:
+        }
+    }
+#endif
+
+    return retval;
+}
+#endif // SINGULARITY_KERNEL
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Processor.cpp b/base/Kernel/Native/Processor.cpp
new file mode 100644
index 0000000..a6fe58a
--- /dev/null
+++ b/base/Kernel/Native/Processor.cpp
@@ -0,0 +1,826 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Processor.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+#include "halkd.h"
+#endif // SINGULARITY_KERNEL
+
+/////////////////////////////////////////////////////////// Segment Selectors.
+//
+#define SEGMENT_SELECTOR(s) \
+    (uint16)(offsetof(Struct_Microsoft_Singularity_CpuInfo,s) \
+             - offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtNull))
+
+/////////////////////////////////////////////////////////// Processor Context.
+//
+Class_Microsoft_Singularity_Processor *
+Struct_Microsoft_Singularity_X86_ProcessorContext::
+m_GetProcessor(Struct_Microsoft_Singularity_X86_ProcessorContext *self)
+{
+    return self->_processor;
+}
+
+#if SINGULARITY_KERNEL
+void
+Struct_Microsoft_Singularity_X86_ProcessorContext::
+m_UpdateAfterGC(Struct_Microsoft_Singularity_X86_ProcessorContext * self,
+                Class_Microsoft_Singularity_Processor *processor)
+{
+    self->_processor = processor;
+}
+#endif // SINGULARITY_KERNEL
+
+/////////////////////////////////////////////////////////// Processor Methods.
+//
+#if SINGULARITY_KERNEL
+
+static int g_nIgnoredHardwareInterrupts = 0;
+
+static __declspec(align(8)) Struct_Microsoft_Singularity_X86_IDTP g_idt;
+static __declspec(align(8)) Struct_Microsoft_Singularity_X86_IDTE g_idtEntries[256];
+void (__fastcall *c_exceptionHandler)(int exception,
+                                      Struct_Microsoft_Singularity_X86_ThreadContext *context);
+void (__fastcall *c_interruptHandler)(int exception,
+                                      Struct_Microsoft_Singularity_X86_ThreadContext *context);
+
+__declspec(naked)
+void Class_Microsoft_Singularity_Processor::g_HaltUntilInterruptNative()
+{
+    __asm {
+        hlt;
+        ret;
+    }
+}
+
+__declspec(naked)
+void Class_Microsoft_Singularity_Processor::g_InitFpu(void)
+{
+    __asm {
+        finit;
+        mov eax, 0x37e;
+        push eax;
+        fldcw [esp];
+        pop eax;
+        ret;
+    }
+}
+
+__declspec(naked)
+uint32 Class_Microsoft_Singularity_Processor::g_ReadFpuStatus(void)
+{
+    __asm {
+        xor eax,eax;
+        push eax;
+        fnstsw [esp];
+        pop eax;
+        ret;
+    }
+}
+
+__declspec(naked)
+void Class_Microsoft_Singularity_Processor::g_ClearFpuStatus(void)
+{
+    __asm {
+        fnclex;
+        ret;
+    }
+}
+
+__declspec(naked)
+Class_Microsoft_Singularity_Processor *
+Class_Microsoft_Singularity_Processor::g_GetCurrentProcessor()
+{
+    __asm {
+        mov eax, fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext._processor;
+        ret;
+    }
+}
+
+#endif // SINGULARITY_KERNEL
+
+__declspec(naked)
+uint64 Class_Microsoft_Singularity_Processor::g_ReadMsr(uint32 counter)
+{
+    __asm {
+        // ECX = msr
+        rdmsr;
+        ret;
+    }
+}
+
+void Class_Microsoft_Singularity_Processor::g_WriteMsr(uint32 msr, uint64 value)
+{
+    uint32 lo = *(((uint32*)&value) + 0);
+    uint32 hi = *(((uint32*)&value) + 1);
+
+    __asm {
+        mov ecx, msr;
+        mov eax, lo;
+        mov edx, hi;
+        wrmsr;
+    }
+}
+
+void Class_Microsoft_Singularity_Processor::g_ReadCpuid(uint32 feature,
+                                                        uint32 *p0,
+                                                        uint32 *p1,
+                                                        uint32 *p2,
+                                                        uint32 *p3)
+{
+    uint32 v0;
+    uint32 v1;
+    uint32 v2;
+    uint32 v3;
+
+    __asm {
+        mov eax, feature;
+        cpuid;
+        mov v0, eax;
+        mov v1, ebx;
+        mov v2, ecx;
+        mov v3, edx;
+    }
+    *p0 = v0;
+    *p1 = v1;
+    *p2 = v2;
+    *p3 = v3;
+}
+
+__declspec(naked)
+uint64 Class_Microsoft_Singularity_Processor::g_ReadPmc(uint32 counter)
+{
+    __asm {
+        // ECX = counter
+        rdpmc;
+        ret;
+    }
+}
+
+__declspec(naked)
+uint64 Class_Microsoft_Singularity_Processor::g_GetCycleCount()
+{
+    __asm {
+        rdtsc;
+        ret;
+    }
+}
+
+#ifndef ZERO_RUNTIME
+UIntPtr Class_Microsoft_Singularity_Processor::g_GetFrameEip(UIntPtr ebp)
+{
+    if (ebp < (UIntPtr)0x10000) {
+        return 0;
+    }
+    return ((UIntPtr*)ebp)[1];
+}
+
+UIntPtr Class_Microsoft_Singularity_Processor::g_GetFrameEbp(UIntPtr ebp)
+{
+    if (ebp < (UIntPtr)0x10000) {
+        return 0;
+    }
+    return ((UIntPtr*)ebp)[0];
+}
+
+__declspec(naked)
+UIntPtr Class_Microsoft_Singularity_Processor::g_GetStackPointer()
+{
+    __asm {
+        mov eax, esp;
+        ret;
+    }
+}
+
+__declspec(naked)
+UIntPtr Class_Microsoft_Singularity_Processor::g_GetFramePointer()
+{
+    __asm {
+        mov eax, ebp;
+        ret;
+    }
+}
+
+__declspec(naked)
+Struct_Microsoft_Singularity_X86_ProcessorContext *
+Class_Microsoft_Singularity_Processor::g_GetCurrentProcessorContext()
+{
+    __asm {
+        mov eax, fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.processorContext;
+        ret;
+    }
+}
+#endif // !ZERO_RUNTIME
+
+__declspec(naked)
+Struct_Microsoft_Singularity_X86_ThreadContext *
+Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext()
+{
+    __asm {
+        mov eax, fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.threadContext;
+        ret;
+    }
+}
+
+__declspec(naked)
+Class_System_Threading_Thread *
+Class_Microsoft_Singularity_Processor::g_GetCurrentThread()
+{
+    __asm {
+        mov edx, fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.threadContext;
+        mov eax, [edx]Struct_Microsoft_Singularity_X86_ThreadContext._thread;
+        ret;
+    }
+#if 0
+    Struct_Microsoft_Singularity_X86_ProcessorContext * proc;
+    __asm {
+        mov eax, fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.processorContext;
+        mov proc, eax;
+    }
+    return proc->threadContext->_thread;
+#endif
+}
+
+#if SINGULARITY_KERNEL
+
+__declspec(naked)
+void Class_Microsoft_Singularity_Processor::
+g_SetCurrentThreadContext(Struct_Microsoft_Singularity_X86_ThreadContext * context)
+{
+    __asm {
+        mov fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.threadContext, ecx;
+        ret;
+    }
+}
+
+#endif // SINGULARITY_KERNEL
+
+#if SINGULARITY_KERNEL
+#if DO_FXSAVE_TEST
+#pragma warning(disable:4733) // We'll touch fs:[0] if we want to.
+int Class_Microsoft_Singularity_Processor::g_TestFxsave()
+{
+    uint64 beg;
+    uint64 end;
+    int loops = 1000000;
+
+    Struct_Microsoft_Singularity_X86_ThreadContext * context =
+        g_GetCurrentThreadContext();
+    Struct_Microsoft_Singularity_X86_MmxContext *fxregs = &context->mmx;
+    int fs0;
+
+    bool fEnabled = g_DisableInterrupts();
+
+    beg = RDTSC();
+    while (loops-- > 0) {
+        __asm {
+            mov eax, fxregs;
+            fxsave [eax];
+            fxrstor [eax];
+        }
+    }
+    end = RDTSC();
+
+    g_RestoreInterrupts(fEnabled);
+
+    printf("value of fs:[0]: %08x\n", fs0);
+    printf("elapsed: %d\n", (int)(end - beg));
+    return ((int)((end - beg) / 1000000));
+}
+#endif DO_FS0_TEST
+
+#if DO_FS0_TEST
+#pragma warning(disable:4733) // We'll touch fs:[0] if we want to.
+int Class_Microsoft_Singularity_Processor::g_TestFs0()
+{
+    uint64 beg;
+    uint64 end;
+    int loops = 1000000;
+    void * stackLimit = (void *)0x800000;
+    void * threadContext = &stackLimit;
+    void * processorContextThread = &threadContext;
+    int fs0;
+
+    bool fEnabled = g_DisableInterrupts();
+
+    __asm {
+        mov eax, processorContextThread;
+        mov fs:[0], eax;
+    }
+
+    beg = RDTSC();
+    while (loops-- > 0) {
+        __asm {
+            mov eax, fs:[0];
+            mov eax, [eax];
+            add eax, 0x100;
+            cmp eax, esp;
+            mov fs0, eax;
+        }
+    }
+    end = RDTSC();
+
+    g_RestoreInterrupts(fEnabled);
+
+    printf("value of fs:[0]: %08x\n", fs0);
+    printf("elapsed: %d\n", (int)(end - beg));
+    return ((int)((end - beg) / 1000000));
+}
+#endif DO_FS0_TEST
+
+#if DO_CLI_STI_TEST
+int Class_Microsoft_Singularity_Processor::g_TestCliSti()
+{
+    uint64 beg;
+    uint64 end;
+    int loops = 1000000;
+
+    bool fEnabled = g_DisableInterrupts();
+
+    g_nIgnoredHardwareInterrupts = 0;
+
+    __asm sti;
+    beg = RDTSC();
+    while (loops-- > 0) {
+        __asm {
+            cli;    // 1
+            sti;
+            cli;    // 2
+            sti;
+            cli;    // 3
+            sti;
+            cli;    // 4
+            sti;
+            cli;    // 5
+            sti;
+            cli;    // 6
+            sti;
+            cli;    // 7
+            sti;
+            cli;    // 8
+            sti;
+            cli;    // 9
+            sti;
+            cli;    // 10
+            sti;
+        }
+    }
+    end = RDTSC();
+    __asm cli;
+
+    printf("Ignored %d hardware interrupts.\n", g_nIgnoredHardwareInterrupts);
+
+    g_RestoreInterrupts(fEnabled);
+
+    return ((int)((end - beg) / 1000000)) / 10;
+}
+#endif // DO_CLI_STI_TEST
+#endif // SINGULARITY_KERNEL
+
+#if SLOW_INTERRUPT_SAVE_RESTORE
+
+static uint32 dstack[8];
+static uint64 disabled = 0;
+static uint64 restored = 0;
+
+bool Class_Microsoft_Singularity_Processor::g_DisableInterrupts()
+{
+    uint32 eflags;
+
+    __asm {
+        pushfd;
+        pop eax;
+        mov eflags, eax;
+        cli;
+    }
+#if 0
+    if ((eflags & Struct_Microsoft_Singularity_X86_EFlags_IF) != 0) {
+        uint32 _ebp;
+        __asm {
+            mov _ebp, ebp;
+        }
+        for (int i = 0; i < arrayof(dstack); i++) {
+            if (_ebp != 0) {
+                dstack[i] = ((uint32*)_ebp)[1];
+                _ebp = ((uint32*)_ebp)[0];
+            }
+            else {
+                dstack[i] = 0;
+            }
+        }
+        disabled = g_GetCycleCount();
+    }
+#endif // 0
+    return (eflags & Struct_Microsoft_Singularity_X86_EFlags_IF) != 0;
+}
+
+void Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(bool enabled)
+{
+    if (enabled) {
+#if 0
+        restored = g_GetCycleCount();
+        if (restored - disabled > 10000000000 && disabled != 0) {
+            __asm int 3;
+        }
+#endif // 0
+        __asm sti;
+    }
+}
+
+#else // SLOW_INTERRUPT_SAVE_RESTORE
+
+__declspec(naked)
+bool Class_Microsoft_Singularity_Processor::g_DisableInterrupts()
+{
+    __asm {
+        pushfd;
+        pop eax;
+        test eax, Struct_Microsoft_Singularity_X86_EFlags_IF;
+        setnz al;
+        cli;
+        ret;
+    }
+}
+
+__declspec(naked)
+void Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(bool enabled)
+{
+    __asm {
+        test cl, cl;
+        je done;
+        sti;
+      done:
+        ret;
+    }
+}
+
+#endif // SLOW_INTERRUPT_SAVE_RESTORE
+
+__declspec(naked)
+bool Class_Microsoft_Singularity_Processor::g_InterruptsDisabled()
+{
+    __asm {
+        pushfd;
+        pop eax;
+        test eax, Struct_Microsoft_Singularity_X86_EFlags_IF;
+        setz al;
+        ret;
+    }
+}
+
+__declspec(naked) void Class_Microsoft_Singularity_Processor::g_EnterRing3()
+{
+//    int uc3 = SEGMENT_SELECTOR(GdtUC) + 3;
+//    int ud3 = SEGMENT_SELECTOR(GdtUD) + 3;
+//    int uf3 = SEGMENT_SELECTOR(GdtPF) + 3; // for the moment, share UF and PF
+
+// TODO: get rid of hexadecimal constants below
+
+    // warning: preserve return values eax, edx (for returning from ABI)
+    __asm {
+        push edx
+        mov ecx, esp
+        mov edx, ring3
+        _emit   0x0f;
+        _emit   0x35;  //sysexit
+      ring3:
+        pop edx
+        mov cx, ss
+        mov ds, cx
+        mov es, cx
+        mov ecx, 0x38 + 3 // SEGMENT_SELECTOR(GdtPF) + 3
+        mov fs, cx
+        ret
+    }
+}
+
+#if DONT_TRY_THIS_YET
+__declspec(naked) bool Class_Microsoft_Singularity_Processor::g_AtKernelPrivilege()
+{
+    // The bottom two bits of the CS selector are the RPL
+    // (requested privilege level) of the selector. If
+    // this is zero, we're running at ring0. Otherwise,
+    // we're less privileged.
+    __asm {
+        mov ax, cs;
+        test ax, 3;
+        setnz al; // or setz al;
+        ret;
+    }
+}
+#else
+bool Class_Microsoft_Singularity_Processor::g_AtKernelPrivilege()
+{
+    uint16 _cs;
+
+    __asm{
+        mov _cs, cs
+    }
+
+    // The bottom two bits of the CS selector are the RPL
+    // (requested privilege level) of the selector. If
+    // this is zero, we're running at ring0. Otherwise,
+    // we're less privileged.
+    return (_cs & 0x3) == 0;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#if SINGULARITY_KERNEL
+void DumpContext(Struct_Microsoft_Singularity_X86_ThreadContext *context)
+{
+    printf("    thr=%8x, prv=%8x, nxt=%8x, ctx=%08x\n",
+           context->_thread, context->prev, context->next, context);
+    printf("    num=%8x, err=%8x, cr2=%8x\n",
+           context->num, context->err, context->cr2);
+    printf("    eax=%8x, ebx=%8x, ecx=%8x, edx=%8x\n",
+           context->eax, context->ebx, context->ecx, context->edx);
+    printf("    esp=%8x, ebp=%8x, esi=%8x, edi=%8x\n",
+           context->esp, context->ebp, context->esi, context->edi);
+    printf("    efl=%8x, eip=%8x, beg=%8x, lim=%8x\n",
+           context->efl, context->eip, context->stackBegin, context->stackLimit);
+    printf("    cs0=%8x\n", context->cs0);
+
+#if 0
+    uint32 _cs;
+    uint32 _ss;
+    uint32 _ds;
+    uint32 _es;
+    uint32 _fs;
+    uint32 _gs;
+    uint32 _esp;
+    __asm {
+        push cs;
+        pop  _cs;
+        push ss;
+        pop  _ss;
+        push ds;
+        pop  _ds;
+        push es;
+        pop  _es;
+        push fs;
+        pop  _fs;
+        push gs;
+        pop  _gs;
+        push esp;
+        pop  _esp;
+    }
+
+    printf("    cs=%04x, ss=%04x, ds=%04x, es=%04x, fs=%04x, gs=%04x, esp=%08x\n",
+           _cs, _ss, _ds, _es, _fs, _gs, _esp);
+#endif
+}
+
+void LimitedDispatchException(int interrupt, Struct_Microsoft_Singularity_X86_ThreadContext *context)
+{
+#if 0
+    Struct_Microsoft_Singularity_X86_ProcessorContext * proc;
+    __asm {
+        mov eax, fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.processorContext;
+        mov proc, eax;
+    }
+#endif
+    if (context->num == 0x2E) {
+        printf("SYSCALL!!\n");
+        DumpContext(context);
+        return;
+    }
+    if (context->num == 0x2F) {
+        printf("SYSENTER!!\n");
+        DumpContext(context);
+        return;
+    }
+    if (context->num > 0x20) {
+        g_nIgnoredHardwareInterrupts++;
+        return;
+    }
+
+#if 1
+    printf("-- Exception 0x%02x -------------------------------------------\n",
+           interrupt);
+    DumpContext(context);
+#endif // 1
+
+    printf("Entering debugger stub...\n");
+    printf("[= Exception: %02x eip=%08x efl=%08x ==\n",
+           interrupt, context->eip, context->efl);
+
+    Class_Microsoft_Singularity_DebugStub::g_Trap(context, false);
+}
+
+void Class_Microsoft_Singularity_Processor::g_ClearIdtTable()
+{
+    printf("Clearing C# IDT Table.\n");
+    c_exceptionHandler = LimitedDispatchException;
+    c_interruptHandler = LimitedDispatchException;
+}
+
+void Class_Microsoft_Singularity_Processor::g_SetIdtTable()
+{
+    printf("Setting C# IDT Table.\n");
+    c_exceptionHandler = Class_Microsoft_Singularity_Processor::g_DispatchException;
+    c_interruptHandler = Class_Microsoft_Singularity_Processor::g_DispatchInterrupt;
+}
+
+extern "C" void __cdecl EdtEnter0(void);
+extern "C" void __cdecl EdtEnter1(void);
+extern "C" void __cdecl IdtEnter20(void);
+extern "C" void __cdecl IdtEnter21(void);
+extern "C" void __cdecl SysEnter(void);
+extern void FakeSyscall();
+
+void IdtInitialize()
+{
+    // Configure the simplest IDT Handler.
+    Class_Microsoft_Singularity_Processor::g_ClearIdtTable();
+
+    // Create the IDT Entry Table, first set the exception entries.
+    uint32 entry = (uint32)EdtEnter0;
+    uint32 offset = ((uint32)EdtEnter1) - ((uint32)EdtEnter0);
+
+    for (int i = 0; i < 0x20; i++) {
+#if DOUBLE_FAULT_HANDLER
+        if (i == Struct_Microsoft_Singularity_X86_EVectors_DoubleFault) {
+            // The double fault handler uses a task gate to set up stack.
+
+            g_idtEntries[i].offset_0_15 = 0;
+            g_idtEntries[i].offset_16_31 = 0;
+            g_idtEntries[i].selector = SEGMENT_SELECTOR(GdtDF);
+            g_idtEntries[i].access =
+                (Struct_Microsoft_Singularity_X86_IDTE_PRESENT |
+                 Struct_Microsoft_Singularity_X86_IDTE_DPL_RING0 |  // RING0 for hardware ints.
+                 Struct_Microsoft_Singularity_X86_IDTE_TASK_GATE);
+
+
+            uint32 * pi = (uint32 *)&g_idtEntries[i];
+            printf("idt[0x%02x] = %08x %08x\n", i, pi[0], pi[1]);
+        }
+        else {
+#endif
+            g_idtEntries[i].offset_0_15 = (uint16)entry;
+            g_idtEntries[i].selector = SEGMENT_SELECTOR(GdtPC);
+            g_idtEntries[i].access =
+                (Struct_Microsoft_Singularity_X86_IDTE_PRESENT |
+                 Struct_Microsoft_Singularity_X86_IDTE_DPL_RING3 |  // RING0 for hardware ints.
+                 Struct_Microsoft_Singularity_X86_IDTE_INT_GATE);
+            g_idtEntries[i].offset_16_31 = (uint16)(entry >> 16);
+#if DOUBLE_FAULT_HANDLER
+        }
+#endif
+        entry += offset;
+    }
+
+    // Now set the interrupt entries.
+    entry = (uint32)IdtEnter20;
+    offset = ((uint32)IdtEnter21) - ((uint32)IdtEnter20);
+
+    for (int i = 0x20; i < arrayof(g_idtEntries); i++) {
+        g_idtEntries[i].offset_0_15 = (uint16)entry;
+        g_idtEntries[i].selector = SEGMENT_SELECTOR(GdtPC);
+        g_idtEntries[i].access =
+            (Struct_Microsoft_Singularity_X86_IDTE_PRESENT |
+             Struct_Microsoft_Singularity_X86_IDTE_DPL_RING3 |
+             Struct_Microsoft_Singularity_X86_IDTE_INT_GATE);
+        g_idtEntries[i].offset_16_31 = (uint16)(entry >> 16);
+        entry += offset;
+    }
+
+    g_idt.limit = sizeof(g_idtEntries);
+    g_idt.addr = (uintptr)g_idtEntries;
+}
+
+void IdtLoad()
+{
+    __asm {
+        lidt g_idt.limit;
+    }
+}
+
+void ProcessorInitialize(const Struct_Microsoft_Singularity_CpuInfo *pCpuInfo,
+                         int   cpuId)
+{
+    Struct_Microsoft_Singularity_X86_ProcessorContext *proc
+        = (Struct_Microsoft_Singularity_X86_ProcessorContext *)pCpuInfo->Fs32;
+
+    proc->cpuId = cpuId;
+    // Set up a default environment.
+    proc->processorContext = proc;
+    proc->threadContext = &proc->thirdContext;  // Insure valid context early in boot.
+    proc->threadContext->_thread = (Class_System_Threading_Thread *)pCpuInfo->Gs32;
+    proc->threadContext->stackLimit = 0;
+    proc->threadContext->stackBegin = 0;
+
+    // Make sure we have a viable exception stack for early debugging.
+    // Note that this stack is only used for early debugging (i.e before Kernel.cs runs).
+    proc->exceptionStackBegin
+        = Struct_Microsoft_Singularity_BootInfo_KERNEL_STACK_BEGIN + 0x2000;
+    proc->exceptionStackLimit
+        = Struct_Microsoft_Singularity_BootInfo_KERNEL_STACK_BEGIN;
+
+#if PAGING
+    // XXX Set up MSRs for SYSENTER/SYSEXIT
+    Class_Microsoft_Singularity_Processor::g_WriteMsr(0x174, SEGMENT_SELECTOR(GdtPC));
+    Class_Microsoft_Singularity_Processor::g_WriteMsr(0x175, proc->exceptionStackBegin + 0x2000);
+#if !PAGING
+    Class_Microsoft_Singularity_Processor::g_WriteMsr(0x176, (UINT64)SysEnter);
+#else
+    Class_Microsoft_Singularity_Processor::g_WriteMsr(0x176, (UINT64)FakeSyscall);
+#endif
+#endif
+}
+
+void Class_Microsoft_Singularity_Processor::g_PrivateEnablePaging(uint32 pdpt)
+{
+    __asm {
+        // use the pdpt argument directly as the cr3 value. This leaves
+        // top-level write-through and cache-disable turned off.
+        mov     eax, pdpt;
+        mov     cr3, eax;
+
+        // Turn on paging and write protection
+        mov     eax, cr0;
+        or      eax, Struct_Microsoft_Singularity_X86_CR0_PG + Struct_Microsoft_Singularity_X86_CR0_WP;
+        mov     cr0, eax;
+
+        jmp     reload_tlb;
+        ALIGN   0x010;
+
+reload_tlb:
+    }
+}
+
+void Class_Microsoft_Singularity_Processor::g_PrivateChangeAddressSpace(uint32 pdpt)
+{
+    __asm {
+        // use the pdpt argument directly as the cr3 value. This leaves
+        // top-level write-through and cache-disable turned off.
+        mov     eax, pdpt;
+        mov     cr3, eax;
+
+        jmp     reload_tlb;
+        ALIGN   0x010;
+
+reload_tlb:
+    }
+}
+
+__declspec(naked)
+void Class_Microsoft_Singularity_Processor::g_DisablePaging()
+{
+    __asm {
+        // Turn off paging.
+        mov     eax, cr0;
+        and     eax, NOT (Struct_Microsoft_Singularity_X86_CR0_PG + Struct_Microsoft_Singularity_X86_CR0_WP);
+        mov     cr0, eax;
+
+        // Flush and reset the TLB.
+        mov     eax,0;
+        mov     cr3,eax;
+
+        jmp     reload_tlb;
+        ALIGN   0x010;
+
+reload_tlb:
+    }
+}
+
+void Class_Microsoft_Singularity_Processor::g_PrivateInvalidateTLBEntry(UIntPtr pageAddr)
+{
+    __asm {
+        mov      eax, pageAddr;
+        invlpg   [eax];
+    }
+}
+
+__declspec(naked)
+uint32 Class_Microsoft_Singularity_Processor::g_GetCr3()
+{
+    __asm {
+        mov      eax, cr3;
+        ret;
+    }
+}
+
+// haryadi
+void Class_Microsoft_Singularity_Processor::g_MpCallEntryPoint(UIntPtr entry)
+{
+    __asm {
+        mov eax, entry;
+        call eax;
+    }
+}
+
+#endif // SINGULARITY_KERNEL
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Stacks.cpp b/base/Kernel/Native/Stacks.cpp
new file mode 100644
index 0000000..61c4bca
--- /dev/null
+++ b/base/Kernel/Native/Stacks.cpp
@@ -0,0 +1,34 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Stacks.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+// #define TEST_STACK_LINKING
+#ifdef TEST_STACK_LINKING
+void Class_Microsoft_Singularity_Memory_Stacks::g_TestStackLink1024()
+{
+}
+
+void Class_Microsoft_Singularity_Memory_Stacks::g_TestStackLink2048()
+{
+}
+
+void Class_Microsoft_Singularity_Memory_Stacks::g_TestStackLink4096()
+{
+}
+
+void Class_Microsoft_Singularity_Memory_Stacks::g_TestStackLink8192()
+{
+}
+#endif // TEST_STACK_LINKING
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Thread.cpp b/base/Kernel/Native/Thread.cpp
new file mode 100644
index 0000000..8559eba
--- /dev/null
+++ b/base/Kernel/Native/Thread.cpp
@@ -0,0 +1,80 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Thread.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+////////////////////////////////////////////////////////////// Thread Context.
+//
+void
+Struct_Microsoft_Singularity_X86_ThreadContext::
+m_UpdateAfterGC(Struct_Microsoft_Singularity_X86_ThreadContext * self,
+                Class_System_Threading_Thread *thread)
+{
+    self->_thread = thread;
+}
+
+Class_System_Threading_Thread *
+Struct_Microsoft_Singularity_X86_ThreadContext::
+m_GetThread(Struct_Microsoft_Singularity_X86_ThreadContext * self)
+{
+    return self->_thread;
+}
+
+#if SINGULARITY_KERNEL
+void
+Struct_Microsoft_Singularity_X86_ThreadContext::
+m_Initialize(Struct_Microsoft_Singularity_X86_ThreadContext * self,
+             int threadIndex,
+             UIntPtr stack,
+			 uint32 cr3)
+{
+    uintptr *esp = (uintptr*)stack;
+    *--esp = 0;
+    *--esp = 0;
+    self->ebp = (uintptr)esp;
+    self->esp = (uintptr)esp;
+    self->eip = (uintptr)Class_System_Threading_Thread::g_ThreadStub;
+    self->cs0 = (uintptr)(offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtPC) -
+                          offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtNull));
+    self->ecx = threadIndex;
+	self->cr3 = cr3;
+    self->efl = Struct_Microsoft_Singularity_X86_EFlags_IF | Struct_Microsoft_Singularity_X86_EFlags_IOPL; // TODO: get rid of IOPL
+    self->mmx.fcw = 0x037f;
+    self->mmx.ftw = 0;
+    // self->mmx.mxcsr = 0x1f80;
+}
+
+void
+Struct_Microsoft_Singularity_X86_ThreadContext::
+m_InitializeIdle(Struct_Microsoft_Singularity_X86_ThreadContext * self,
+                 int threadIndex,
+                 UIntPtr stack,
+				 uint32 cr3)
+{
+    uintptr *esp = (uintptr*)stack;
+    *--esp = 0;
+    *--esp = 0;
+    self->ebp = (uintptr)esp;
+    self->esp = (uintptr)esp;
+    self->eip = (uintptr)Class_System_Threading_Thread::g_ThreadIdleStub;
+    self->cs0 = (uintptr)(offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtPC) -
+                          offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtNull));
+    self->ecx = threadIndex;
+	self->cr3 = cr3;
+    self->efl = Struct_Microsoft_Singularity_X86_EFlags_IF | Struct_Microsoft_Singularity_X86_EFlags_IOPL; // TODO: get rid of IOPL
+    self->mmx.fcw = 0x037f;
+    self->mmx.ftw = 0;
+    // self->mmx.mxcsr = 0x1f80;
+}
+#endif // SINGULARITY_KERNEL
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/Tracing.cpp b/base/Kernel/Native/Tracing.cpp
new file mode 100644
index 0000000..b4c4a5a
--- /dev/null
+++ b/base/Kernel/Native/Tracing.cpp
@@ -0,0 +1,568 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Tracing.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+static int64 tscOffsets[8];
+#endif
+
+//////////////////////////////////////////////////////////////// Image Loader.
+//
+
+void
+Class_Microsoft_Singularity_Tracing::
+g_Initialize()
+{
+#if SINGULARITY_KERNEL
+    c_txtBegin = (uint8 *)Struct_Microsoft_Singularity_BootInfo_KERNEL_LOGTXT_BEGIN;
+    c_txtLimit = (uint8 *)Struct_Microsoft_Singularity_BootInfo_KERNEL_LOGTXT_LIMIT;
+    c_txtHead = c_txtBegin;
+    c_ptxtHead = &c_txtHead;
+
+    int cnt = (Struct_Microsoft_Singularity_BootInfo_KERNEL_LOGREC_LIMIT -
+               Struct_Microsoft_Singularity_BootInfo_KERNEL_LOGREC_BEGIN)
+        / sizeof(Struct_Microsoft_Singularity_Tracing_LogEntry);
+
+    c_logBegin   = (Struct_Microsoft_Singularity_Tracing_LogEntry *)
+        Struct_Microsoft_Singularity_BootInfo_KERNEL_LOGREC_BEGIN;
+    c_logLimit   = c_logBegin + cnt;
+    c_logHead    = c_logBegin;
+    c_plogHead   = &c_logHead;
+    c_tscOffsets = tscOffsets;
+#elif SINGULARITY_PROCESS
+    Struct_Microsoft_Singularity_Tracing_LogEntry * logBegin;
+    Struct_Microsoft_Singularity_Tracing_LogEntry * logLimit;
+    Struct_Microsoft_Singularity_Tracing_LogEntry ** plogHead;
+    uint8 * txtBegin;
+    uint8 * txtLimit;
+    uint8 ** ptxtHead;
+
+    Struct_Microsoft_Singularity_V1_Services_ProcessService::
+        g_GetTracingHeaders((Struct_Microsoft_Singularity_V1_Services_LogEntry **)&logBegin,
+                            (Struct_Microsoft_Singularity_V1_Services_LogEntry **)&logLimit,
+                            (Struct_Microsoft_Singularity_V1_Services_LogEntry ***)&plogHead,
+                            &txtBegin,
+                            &txtLimit,
+                            &ptxtHead);
+
+    c_logBegin = logBegin;
+    c_logLimit = logLimit;
+    c_plogHead = plogHead;
+
+    c_txtBegin = txtBegin;
+    c_txtLimit = txtLimit;
+    c_ptxtHead = ptxtHead;
+#else
+#error "File should be compiled with SINGULARITY_KERNEL or SINGULARITY_PROCESS"
+#endif
+}
+
+void
+Class_Microsoft_Singularity_Tracing::
+g_Finalize()
+{
+}
+
+#if SINGULARITY_KERNEL
+void
+Class_Microsoft_Singularity_Tracing::
+g_SetTscOffset(int64 theTscOffset)
+{
+    Struct_Microsoft_Singularity_X86_ProcessorContext *processorContext =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentProcessorContext();
+    int cpuId = processorContext->cpuId;
+    if (cpuId < 0 || cpuId >= sizeof(tscOffsets)/sizeof(tscOffsets[0])) {
+        __asm int 3
+    }
+    tscOffsets[cpuId] = theTscOffset;
+}
+#endif // SINGULARITY_KERNEL
+
+uint8 * CompareExchange(uint8 **dest, uint8 *exch, uint8 *comp)
+{
+    uint8 *val;
+    __asm {
+        mov ecx, dest;
+        mov edx, exch;
+        mov eax, comp;
+        lock cmpxchg [ecx], edx;
+        mov val, eax;
+    }
+    return val;
+}
+
+Struct_Microsoft_Singularity_Tracing_LogEntry *
+CompareExchange(Struct_Microsoft_Singularity_Tracing_LogEntry **dest,
+                Struct_Microsoft_Singularity_Tracing_LogEntry *exch,
+                Struct_Microsoft_Singularity_Tracing_LogEntry *comp)
+{
+    Struct_Microsoft_Singularity_Tracing_LogEntry * val;
+    __asm {
+        mov ecx, dest;
+        mov edx, exch;
+        mov eax, comp;
+        lock cmpxchg [ecx], edx;
+        mov val, eax;
+    }
+    return val;
+}
+
+Struct_Microsoft_Singularity_Tracing_LogEntry *
+Class_Microsoft_Singularity_Tracing::
+g_CreateLog(uint8 severity, UIntPtr eip, int chars, uint8 **buf)
+{
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    Struct_Microsoft_Singularity_Tracing_LogEntry * logWas;
+    Struct_Microsoft_Singularity_Tracing_LogEntry * logBec;
+
+    do {
+        log = *c_plogHead;
+        logWas = log;
+        logBec = logWas + 1;
+        if (logBec >= c_logLimit) {
+            logBec = c_logBegin;
+        }
+    } while (logWas != CompareExchange(c_plogHead, logBec, logWas));
+
+    uint8 *str;
+    uint8 *txtWas;
+    uint8 *txtBec;
+
+    do {
+        str = *c_ptxtHead;
+        txtWas = str;
+        txtBec = str + chars;
+
+        if (txtBec > c_txtLimit) {
+            str = c_txtBegin;
+            txtBec = str + chars;
+        }
+    } while (txtWas != CompareExchange(c_ptxtHead, txtBec, txtWas));
+
+#if SINGULARITY_KERNEL || !PAGING
+    bool enabled = Class_Microsoft_Singularity_Processor::g_DisableInterrupts();
+#endif
+
+    // We need acquiring a log entry to be
+    // wait-free since this routine can be called from the
+    // kernel or a userland application.  We cannot simply
+    // disable interrupts as there may be multiple hardware
+    // threads and it might result in a userland thread blocking
+    // a kernel thread.  Callers may be context switched acquiring
+    // the log entry.  This means there is finite chance that
+    // the log entries do not have monotonically increasing tsc
+    // values.  This is sometimes visible in the !log output.
+    UINT64 tsc = RDTSC();
+
+    Struct_Microsoft_Singularity_X86_ThreadContext *threadContext =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+    Struct_Microsoft_Singularity_X86_ProcessorContext *processorContext =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentProcessorContext();
+
+    log->processId = threadContext->processId;
+
+#if SINGULARITY_KERNEL
+    log->threadId = threadContext->threadIndex;
+#else
+    log->threadId = threadContext->kernelThreadIndex;
+#endif
+
+    log->eip        = (uintptr)eip;     //(uintptr)g_GetCallerEip(3);
+    log->text       = str;
+    log->severity   = (uint8)severity;
+    log->strings    = 0;
+    log->tag        = 0;
+    log->cycleCount = tsc;
+    log->cpuId      = processorContext->cpuId;
+
+    *str++ = (uint8)log->cycleCount;
+    *str = '\0';
+
+#if SINGULARITY_KERNEL || !PAGING
+    Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(enabled);
+#endif
+
+    *buf = str;
+
+    return log;
+}
+
+uint8 * Class_Microsoft_Singularity_Tracing::
+g_AddText(uint8 *dst, Class_System_String *arg)
+{
+    if (arg != NULL) {
+        bartok_char *src = &arg->m_firstChar;
+        bartok_char *end = src + arg->m_stringLength;
+
+        while (src < end) {
+            *dst++ = (uint8)*src++;
+        }
+    }
+    *dst++ = '\0';
+
+    return dst;
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    log = g_CreateLog(severity, _eip, 2, &text);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      UIntPtr arg0)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->arg0 = (uintptr)arg0;
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      UIntPtr arg0, UIntPtr arg1)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->arg0 = (uintptr)arg0;
+    log->arg1 = (uintptr)arg1;
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      UIntPtr arg0, UIntPtr arg1, UIntPtr arg2)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->arg0 = (uintptr)arg0;
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      UIntPtr arg0, UIntPtr arg1, UIntPtr arg2,
+      UIntPtr arg3)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->arg0 = (uintptr)arg0;
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+    log->arg3 = (uintptr)arg3;
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      UIntPtr arg0, UIntPtr arg1, UIntPtr arg2,
+      UIntPtr arg3, UIntPtr arg4)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->arg0 = (uintptr)arg0;
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+    log->arg3 = (uintptr)arg3;
+    log->arg4 = (uintptr)arg4;
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      UIntPtr arg0, UIntPtr arg1, UIntPtr arg2,
+      UIntPtr arg3, UIntPtr arg4, UIntPtr arg5)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->arg0 = (uintptr)arg0;
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+    log->arg3 = (uintptr)arg3;
+    log->arg4 = (uintptr)arg4;
+    log->arg5 = (uintptr)arg5;
+    text = g_AddText(text, msg);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      Class_System_String *arg0)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1 +
+        (arg0 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = Struct_Microsoft_Singularity_Tracing_Strings_String0;
+    text = g_AddText(text, msg);
+    text = g_AddText(text, arg0);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      Class_System_String *arg0,
+      UIntPtr arg1)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1 +
+        (arg0 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = Struct_Microsoft_Singularity_Tracing_Strings_String0;
+    log->arg1 = (uintptr)arg1;
+    text = g_AddText(text, msg);
+    text = g_AddText(text, arg0);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      Class_System_String *arg0,
+      UIntPtr arg1, UIntPtr arg2)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1 +
+        (arg0 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = Struct_Microsoft_Singularity_Tracing_Strings_String0;
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+    text = g_AddText(text, msg);
+    text = g_AddText(text, arg0);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      Class_System_String *arg0,
+      UIntPtr arg1, UIntPtr arg2, UIntPtr arg3)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + msg->m_stringLength + 1 +
+        (arg0 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = Struct_Microsoft_Singularity_Tracing_Strings_String0;
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+    log->arg3 = (uintptr)arg3;
+    text = g_AddText(text, msg);
+    text = g_AddText(text, arg0);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      Class_System_String *msg,
+      Class_System_String *arg0,
+      Class_System_String *arg1)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+
+    int chars = 1 + msg->m_stringLength + 1
+        + (arg0 != NULL ? arg0->m_stringLength : 0) + 1
+        + (arg1 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = (Struct_Microsoft_Singularity_Tracing_Strings_String0 |
+                    Struct_Microsoft_Singularity_Tracing_Strings_String1);
+    text = g_AddText(text, msg);
+    text = g_AddText(text, arg0);
+    text = g_AddText(text, arg1);
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      char * msg)
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    char *txt = msg;
+    while (*txt) {
+        txt++;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + txt - msg + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    while (*msg != '\0') {
+        *text++ = *msg++;
+    }
+    *text++ = '\0';
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      char * msg,
+      Class_System_String *arg0,
+      UIntPtr arg1
+      )
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    char *txt = msg;
+    while (*txt) {
+        txt++;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + txt - msg + 1 + (arg0 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = Struct_Microsoft_Singularity_Tracing_Strings_String0;
+    while (*msg != '\0') {
+        *text++ = *msg++;
+    }
+    *text++ = '\0';
+    text = g_AddText(text, arg0);
+    log->arg1 = (uintptr)arg1;
+}
+
+void Class_Microsoft_Singularity_Tracing::
+g_Log(uint8 severity,
+      char * msg,
+      Class_System_String *arg0,
+      UIntPtr arg1,
+      UIntPtr arg2
+      )
+{
+    UIntPtr _eip;
+    __asm {
+        mov eax, [ebp+4];
+        mov _eip, eax;
+    }
+    char *txt = msg;
+    while (*txt) {
+        txt++;
+    }
+    Struct_Microsoft_Singularity_Tracing_LogEntry * log;
+    uint8 *text;
+    int chars = 1 + txt - msg + 1 + (arg0 != NULL ? arg0->m_stringLength : 0) + 1;
+    log = g_CreateLog(severity, _eip, chars, &text);
+    log->strings = Struct_Microsoft_Singularity_Tracing_Strings_String0;
+    while (*msg != '\0') {
+        *text++ = *msg++;
+    }
+    *text++ = '\0';
+    text = g_AddText(text, arg0);
+    log->arg1 = (uintptr)arg1;
+    log->arg2 = (uintptr)arg2;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/_lldiv.asm b/base/Kernel/Native/_lldiv.asm
new file mode 100644
index 0000000..e5a78b8
--- /dev/null
+++ b/base/Kernel/Native/_lldiv.asm
@@ -0,0 +1,207 @@
+;*******************************************************************************
+;lldiv.asm - signed long divide routine
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       defines the signed long divide routine
+;           __alldiv
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;lldiv - signed long divide
+;
+;Purpose:
+;       Does a signed long divide of the arguments.  Arguments are
+;       not changed.
+;
+;Entry:
+;       Arguments are passed on the stack:
+;               1st pushed: divisor (QWORD)
+;               2nd pushed: dividend (QWORD)
+;
+;Exit:
+;       EDX:EAX contains the quotient (dividend/divisor)
+;       NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;       ECX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_alldiv PROC NEAR
+
+        push    edi
+        push    esi
+        push    ebx
+
+; Set up the local stack and save the index registers.  When this is done
+; the stack frame will look as follows (assuming that the expression a/b will
+; generate a call to lldiv(a, b)):
+;
+;               -----------------
+;               |               |
+;               |---------------|
+;               |               |
+;               |--divisor (b)--|
+;               |               |
+;               |---------------|
+;               |               |
+;               |--dividend (a)-|
+;               |               |
+;               |---------------|
+;               | return addr** |
+;               |---------------|
+;               |      EDI      |
+;               |---------------|
+;               |      ESI      |
+;               |---------------|
+;       ESP---->|      EBX      |
+;               -----------------
+;
+
+DVND    equ     [esp + 16]      ; stack address of dividend (a)
+DVSR    equ     [esp + 24]      ; stack address of divisor (b)
+
+
+; Determine sign of the result (edi = 0 if result is positive, non-zero
+; otherwise) and make operands positive.
+
+        xor     edi,edi         ; result sign assumed positive
+
+        mov     eax,HIWORD(DVND) ; hi word of a
+        or      eax,eax         ; test to see if signed
+        jge     short L1        ; skip rest if a is already positive
+        inc     edi             ; complement result sign flag
+        mov     edx,LOWORD(DVND) ; lo word of a
+        neg     eax             ; make a positive
+        neg     edx
+        sbb     eax,0
+        mov     HIWORD(DVND),eax ; save positive value
+        mov     LOWORD(DVND),edx
+L1:
+        mov     eax,HIWORD(DVSR) ; hi word of b
+        or      eax,eax         ; test to see if signed
+        jge     short L2        ; skip rest if b is already positive
+        inc     edi             ; complement the result sign flag
+        mov     edx,LOWORD(DVSR) ; lo word of a
+        neg     eax             ; make b positive
+        neg     edx
+        sbb     eax,0
+        mov     HIWORD(DVSR),eax ; save positive value
+        mov     LOWORD(DVSR),edx
+L2:
+
+;
+; Now do the divide.  First look to see if the divisor is less than 4194304K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+; NOTE - eax currently contains the high order word of DVSR
+;
+
+        or      eax,eax         ; check to see if divisor < 4194304K
+        jnz     short L3        ; nope, gotta do this the hard way
+        mov     ecx,LOWORD(DVSR) ; load divisor
+        mov     eax,HIWORD(DVND) ; load high word of dividend
+        xor     edx,edx
+        div     ecx             ; eax <- high order bits of quotient
+        mov     ebx,eax         ; save high bits of quotient
+        mov     eax,LOWORD(DVND) ; edx:eax <- remainder:lo word of dividend
+        div     ecx             ; eax <- low order bits of quotient
+        mov     edx,ebx         ; edx:eax <- quotient
+        jmp     short L4        ; set sign, restore stack and return
+
+;
+; Here we do it the hard way.  Remember, eax contains the high word of DVSR
+;
+
+L3:
+        mov     ebx,eax         ; ebx:ecx <- divisor
+        mov     ecx,LOWORD(DVSR)
+        mov     edx,HIWORD(DVND) ; edx:eax <- dividend
+        mov     eax,LOWORD(DVND)
+L5:
+        shr     ebx,1           ; shift divisor right one bit
+        rcr     ecx,1
+        shr     edx,1           ; shift dividend right one bit
+        rcr     eax,1
+        or      ebx,ebx
+        jnz     short L5        ; loop until divisor < 4194304K
+        div     ecx             ; now divide, ignore remainder
+        mov     esi,eax         ; save quotient
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**64 and the quotient is off by 1.
+;
+
+        mul     dword ptr HIWORD(DVSR) ; QUOT * HIWORD(DVSR)
+        mov     ecx,eax
+        mov     eax,LOWORD(DVSR)
+        mul     esi             ; QUOT * LOWORD(DVSR)
+        add     edx,ecx         ; EDX:EAX = QUOT * DVSR
+        jc      short L6        ; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in edx:eax.  If original is larger or equal, we are ok, otherwise
+; subtract one (1) from the quotient.
+;
+
+        cmp     edx,HIWORD(DVND) ; compare hi words of result and original
+        ja      short L6        ; if result > original, do subtract
+        jb      short L7        ; if result < original, we are ok
+        cmp     eax,LOWORD(DVND) ; hi words are equal, compare lo words
+        jbe     short L7        ; if less or equal we are ok, else subtract
+L6:
+        dec     esi             ; subtract 1 from quotient
+L7:
+        xor     edx,edx         ; edx:eax <- quotient
+        mov     eax,esi
+
+;
+; Just the cleanup left to do.  edx:eax contains the quotient.  Set the sign
+; according to the save value, cleanup the stack, and return.
+;
+
+L4:
+        dec     edi             ; check to see if result is negative
+        jnz     short L8        ; if EDI == 0, result should be negative
+        neg     edx             ; otherwise, negate the result
+        neg     eax
+        sbb     edx,0
+
+;
+; Restore the saved registers and return.
+;
+
+L8:
+        pop     ebx
+        pop     esi
+        pop     edi
+
+        ret     16
+
+_alldiv ENDP
+
+end
diff --git a/base/Kernel/Native/_llmul.asm b/base/Kernel/Native/_llmul.asm
new file mode 100644
index 0000000..96ae354
--- /dev/null
+++ b/base/Kernel/Native/_llmul.asm
@@ -0,0 +1,103 @@
+;*******************************************************************************
+;llmul.asm - long multiply routine
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       Defines long multiply routine
+;       Both signed and unsigned routines are the same, since multiply's
+;       work out the same in 2's complement
+;       creates the following routine:
+;           __allmul
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;llmul - long multiply routine
+;
+;Purpose:
+;       Does a long multiply (same for signed/unsigned)
+;       Parameters are not changed.
+;
+;Entry:
+;       Parameters are passed on the stack:
+;               1st pushed: multiplier (QWORD)
+;               2nd pushed: multiplicand (QWORD)
+;
+;Exit:
+;       EDX:EAX - product of multiplier and multiplicand
+;       NOTE: parameters are removed from the stack
+;
+;Uses:
+;       ECX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_allmul PROC NEAR
+
+A       EQU     [esp + 4]       ; stack address of a
+B       EQU     [esp + 12]      ; stack address of b
+
+;
+;       AHI, BHI : upper 32 bits of A and B
+;       ALO, BLO : lower 32 bits of A and B
+;
+;             ALO * BLO
+;       ALO * BHI
+; +     BLO * AHI
+; ---------------------
+;
+
+        mov     eax,HIWORD(A)
+        mov     ecx,HIWORD(B)
+        or      ecx,eax         ;test for both hiwords zero.
+        mov     ecx,LOWORD(B)
+        jnz     short hard      ;both are zero, just mult ALO and BLO
+
+        mov     eax,LOWORD(A)
+        mul     ecx
+
+        ret     16              ; callee restores the stack
+
+hard:
+        push    ebx
+
+; must redefine A and B since esp has been altered
+
+A2      EQU     [esp + 8]       ; stack address of a
+B2      EQU     [esp + 16]      ; stack address of b
+
+        mul     ecx             ;eax has AHI, ecx has BLO, so AHI * BLO
+        mov     ebx,eax         ;save result
+
+        mov     eax,LOWORD(A2)
+        mul     dword ptr HIWORD(B2) ;ALO * BHI
+        add     ebx,eax         ;ebx = ((ALO * BHI) + (AHI * BLO))
+
+        mov     eax,LOWORD(A2)  ;ecx = BLO
+        mul     ecx             ;so edx:eax = ALO*BLO
+        add     edx,ebx         ;now edx has all the LO*HI stuff
+
+        pop     ebx
+
+        ret     16              ; callee restores the stack
+
+_allmul ENDP
+
+        end
diff --git a/base/Kernel/Native/_llrem.asm b/base/Kernel/Native/_llrem.asm
new file mode 100644
index 0000000..af5bfee
--- /dev/null
+++ b/base/Kernel/Native/_llrem.asm
@@ -0,0 +1,214 @@
+;*******************************************************************************
+;llrem.asm - signed long remainder routine
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       defines the signed long remainder routine
+;           __allrem
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;llrem - signed long remainder
+;
+;Purpose:
+;       Does a signed long remainder of the arguments.  Arguments are
+;       not changed.
+;
+;Entry:
+;       Arguments are passed on the stack:
+;               1st pushed: divisor (QWORD)
+;               2nd pushed: dividend (QWORD)
+;
+;Exit:
+;       EDX:EAX contains the remainder (dividend%divisor)
+;       NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;       ECX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_allrem PROC NEAR
+
+        push    ebx
+        push    edi
+
+; Set up the local stack and save the index registers.  When this is done
+; the stack frame will look as follows (assuming that the expression a%b will
+; generate a call to lrem(a, b)):
+;
+;               -----------------
+;               |               |
+;               |---------------|
+;               |               |
+;               |--divisor (b)--|
+;               |               |
+;               |---------------|
+;               |               |
+;               |--dividend (a)-|
+;               |               |
+;               |---------------|
+;               | return addr** |
+;               |---------------|
+;               |       EBX     |
+;               |---------------|
+;       ESP---->|       EDI     |
+;               -----------------
+;
+
+DVND    equ     [esp + 12]      ; stack address of dividend (a)
+DVSR    equ     [esp + 20]      ; stack address of divisor (b)
+
+
+; Determine sign of the result (edi = 0 if result is positive, non-zero
+; otherwise) and make operands positive.
+
+        xor     edi,edi         ; result sign assumed positive
+
+        mov     eax,HIWORD(DVND) ; hi word of a
+        or      eax,eax         ; test to see if signed
+        jge     short L1        ; skip rest if a is already positive
+        inc     edi             ; complement result sign flag bit
+        mov     edx,LOWORD(DVND) ; lo word of a
+        neg     eax             ; make a positive
+        neg     edx
+        sbb     eax,0
+        mov     HIWORD(DVND),eax ; save positive value
+        mov     LOWORD(DVND),edx
+L1:
+        mov     eax,HIWORD(DVSR) ; hi word of b
+        or      eax,eax         ; test to see if signed
+        jge     short L2        ; skip rest if b is already positive
+        mov     edx,LOWORD(DVSR) ; lo word of b
+        neg     eax             ; make b positive
+        neg     edx
+        sbb     eax,0
+        mov     HIWORD(DVSR),eax ; save positive value
+        mov     LOWORD(DVSR),edx
+L2:
+
+;
+; Now do the divide.  First look to see if the divisor is less than 4194304K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+; NOTE - eax currently contains the high order word of DVSR
+;
+
+        or      eax,eax         ; check to see if divisor < 4194304K
+        jnz     short L3        ; nope, gotta do this the hard way
+        mov     ecx,LOWORD(DVSR) ; load divisor
+        mov     eax,HIWORD(DVND) ; load high word of dividend
+        xor     edx,edx
+        div     ecx             ; edx <- remainder
+        mov     eax,LOWORD(DVND) ; edx:eax <- remainder:lo word of dividend
+        div     ecx             ; edx <- final remainder
+        mov     eax,edx         ; edx:eax <- remainder
+        xor     edx,edx
+        dec     edi             ; check result sign flag
+        jns     short L4        ; negate result, restore stack and return
+        jmp     short L8        ; result sign ok, restore stack and return
+
+;
+; Here we do it the hard way.  Remember, eax contains the high word of DVSR
+;
+
+L3:
+        mov     ebx,eax         ; ebx:ecx <- divisor
+        mov     ecx,LOWORD(DVSR)
+        mov     edx,HIWORD(DVND) ; edx:eax <- dividend
+        mov     eax,LOWORD(DVND)
+L5:
+        shr     ebx,1           ; shift divisor right one bit
+        rcr     ecx,1
+        shr     edx,1           ; shift dividend right one bit
+        rcr     eax,1
+        or      ebx,ebx
+        jnz     short L5        ; loop until divisor < 4194304K
+        div     ecx             ; now divide, ignore remainder
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**64 and the quotient is off by 1.
+;
+
+        mov     ecx,eax         ; save a copy of quotient in ECX
+        mul     dword ptr HIWORD(DVSR)
+        xchg    ecx,eax         ; save product, get quotient in EAX
+        mul     dword ptr LOWORD(DVSR)
+        add     edx,ecx         ; EDX:EAX = QUOT * DVSR
+        jc      short L6        ; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in edx:eax.  If original is larger or equal, we are ok, otherwise
+; subtract the original divisor from the result.
+;
+
+        cmp     edx,HIWORD(DVND) ; compare hi words of result and original
+        ja      short L6        ; if result > original, do subtract
+        jb      short L7        ; if result < original, we are ok
+        cmp     eax,LOWORD(DVND) ; hi words are equal, compare lo words
+        jbe     short L7        ; if less or equal we are ok, else subtract
+L6:
+        sub     eax,LOWORD(DVSR) ; subtract divisor from result
+        sbb     edx,HIWORD(DVSR)
+L7:
+
+;
+; Calculate remainder by subtracting the result from the original dividend.
+; Since the result is already in a register, we will do the subtract in the
+; opposite direction and negate the result if necessary.
+;
+
+        sub     eax,LOWORD(DVND) ; subtract dividend from result
+        sbb     edx,HIWORD(DVND)
+
+;
+; Now check the result sign flag to see if the result is supposed to be positive
+; or negative.  It is currently negated (because we subtracted in the 'wrong'
+; direction), so if the sign flag is set we are done, otherwise we must negate
+; the result to make it positive again.
+;
+
+        dec     edi             ; check result sign flag
+        jns     short L8        ; result is ok, restore stack and return
+L4:
+        neg     edx             ; otherwise, negate the result
+        neg     eax
+        sbb     edx,0
+
+;
+; Just the cleanup left to do.  edx:eax contains the quotient.
+; Restore the saved registers and return.
+;
+
+L8:
+        pop     edi
+        pop     ebx
+
+        ret     16
+
+_allrem ENDP
+
+        end
diff --git a/base/Kernel/Native/_llshl.asm b/base/Kernel/Native/_llshl.asm
new file mode 100644
index 0000000..8ade80b
--- /dev/null
+++ b/base/Kernel/Native/_llshl.asm
@@ -0,0 +1,84 @@
+;***
+;llshl.asm - long shift left
+;
+;	Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;	define long shift left routine (signed and unsigned are same)
+;	    __allshl
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;llshl - long shift left
+;
+;Purpose:
+;	Does a Long Shift Left (signed and unsigned are identical)
+;	Shifts a long left any number of bits.
+;
+;Entry:
+;	EDX:EAX - long value to be shifted
+;	CL    - number of bits to shift by
+;
+;Exit:
+;	EDX:EAX - shifted value
+;
+;Uses:
+;	CL is destroyed.
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_allshl	PROC NEAR
+
+;
+; Handle shifts of 64 or more bits (all get 0)
+;
+	cmp	cl, 64
+	jae	short RETZERO
+
+;
+; Handle shifts of between 0 and 31 bits
+;
+	cmp	cl, 32
+	jae	short MORE32
+	shld	edx,eax,cl
+	shl	eax,cl
+	ret
+
+;
+; Handle shifts of between 32 and 63 bits
+;
+MORE32:
+	mov	edx,eax
+	xor	eax,eax
+	and	cl,31
+	shl	edx,cl
+	ret
+
+;
+; return 0 in edx:eax
+;
+RETZERO:
+	xor	eax,eax
+	xor	edx,edx
+	ret
+
+_allshl	ENDP
+
+	end
diff --git a/base/Kernel/Native/_llshr.asm b/base/Kernel/Native/_llshr.asm
new file mode 100644
index 0000000..a4e0a12
--- /dev/null
+++ b/base/Kernel/Native/_llshr.asm
@@ -0,0 +1,85 @@
+;***
+;llshr.asm - long shift right
+;
+;	Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;	define signed long shift right routine 
+;	    __allshr
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;llshr - long shift right
+;
+;Purpose:
+;	Does a signed Long Shift Right 
+;	Shifts a long right any number of bits.
+;
+;Entry:
+;	EDX:EAX - long value to be shifted
+;	CL    - number of bits to shift by
+;
+;Exit:
+;	EDX:EAX - shifted value
+;
+;Uses:
+;	CL is destroyed.
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_allshr	PROC NEAR
+
+;
+; Handle shifts of 64 bits or more (if shifting 64 bits or more, the result
+; depends only on the high order bit of edx).
+;
+	cmp	cl,64
+	jae	short RETSIGN
+
+;
+; Handle shifts of between 0 and 31 bits
+;
+	cmp	cl, 32
+	jae	short MORE32
+	shrd	eax,edx,cl
+	sar	edx,cl
+	ret
+
+;
+; Handle shifts of between 32 and 63 bits
+;
+MORE32:
+	mov	eax,edx
+	sar	edx,31
+	and	cl,31
+	sar	eax,cl
+	ret
+
+;
+; Return double precision 0 or -1, depending on the sign of edx
+;
+RETSIGN:
+	sar	edx,31
+	mov	eax,edx
+	ret
+
+_allshr	ENDP
+
+	end
diff --git a/base/Kernel/Native/_memcpy.asm b/base/Kernel/Native/_memcpy.asm
new file mode 100644
index 0000000..78eceee
--- /dev/null
+++ b/base/Kernel/Native/_memcpy.asm
@@ -0,0 +1,590 @@
+;*******************************************************************************
+;memcpy.asm - contains memcpy and memmove routines
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       memcpy() copies a source memory buffer to a destination buffer.
+;       Overlapping buffers are not treated specially, so propogation may occur.
+;       memmove() copies a source memory buffer to a destination buffer.
+;       Overlapping buffers are treated specially, to avoid propogation.
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;memcpy - Copy source buffer to destination buffer
+;
+;Purpose:
+;       memcpy() copies a source memory buffer to a destination memory buffer.
+;       This routine does NOT recognize overlapping buffers, and thus can lead
+;       to propogation.
+;       For cases where propogation must be avoided, memmove() must be used.
+;
+;       Algorithm:
+;
+;       void * memcpy(void * dst, void * src, size_t count)
+;       {
+;               void * ret = dst;
+;
+;               /*
+;                * copy from lower addresses to higher addresses
+;                */
+;               while (count--)
+;                       *dst++ = *src++;
+;
+;               return(ret);
+;       }
+;
+;memmove - Copy source buffer to destination buffer
+;
+;Purpose:
+;       memmove() copies a source memory buffer to a destination memory buffer.
+;       This routine recognize overlapping buffers to avoid propogation.
+;       For cases where propogation is not a problem, memcpy() can be used.
+;
+;   Algorithm:
+;
+;       void * memmove(void * dst, void * src, size_t count)
+;       {
+;               void * ret = dst;
+;
+;               if (dst <= src || dst >= (src + count)) {
+;                       /*
+;                        * Non-Overlapping Buffers
+;                        * copy from lower addresses to higher addresses
+;                        */
+;                       while (count--)
+;                               *dst++ = *src++;
+;                       }
+;               else {
+;                       /*
+;                        * Overlapping Buffers
+;                        * copy from higher addresses to lower addresses
+;                        */
+;                       dst += count - 1;
+;                       src += count - 1;
+;
+;                       while (count--)
+;                               *dst-- = *src--;
+;                       }
+;
+;               return(ret);
+;       }
+;
+;
+;Entry:
+;       void *dst = pointer to destination buffer
+;       const void *src = pointer to source buffer
+;       size_t count = number of bytes to copy
+;
+;Exit:
+;       Returns a pointer to the destination buffer in AX/DX:AX
+;
+;Uses:
+;       CX, DX
+;
+;Exceptions:
+;*******************************************************************************
+
+%       public  memcpy
+memcpy   proc \
+        dst:ptr byte, \
+        src:ptr byte, \
+        count:DWORD
+
+              ; destination pointer
+              ; source pointer
+              ; number of bytes to copy
+
+;       push    ebp             ;U - save old frame pointer
+;       mov     ebp, esp        ;V - set new frame pointer
+
+        push    edi             ;U - save edi
+        push    esi             ;V - save esi
+
+        mov     esi,[src]       ;U - esi = source
+        mov     ecx,[count]     ;V - ecx = number of bytes to move
+
+        mov     edi,[dst]       ;U - edi = dest
+
+;
+; Check for overlapping buffers:
+;       If (dst <= src) Or (dst >= src + Count) Then
+;               Do normal (Upwards) Copy
+;       Else
+;               Do Downwards Copy to avoid propagation
+;
+
+        mov     eax,ecx         ;V - eax = byte count...
+
+        mov     edx,ecx         ;U - edx = byte count...
+        add     eax,esi         ;V - eax = point past source end
+
+        cmp     edi,esi         ;U - dst <= src ?
+        jbe     short CopyUp    ;V - yes, copy toward higher addresses
+
+        cmp     edi,eax         ;U - dst < (src + count) ?
+        jb      CopyDown        ;V - yes, copy toward lower addresses
+
+;
+; Copy toward higher addresses.
+;
+;
+; The algorithm for forward moves is to align the destination to a dword
+; boundary and so we can move dwords with an aligned destination.  This
+; occurs in 3 steps.
+;
+;   - move x = ((4 - Dest & 3) & 3) bytes
+;   - move y = ((L-x) >> 2) dwords
+;   - move (L - x - y*4) bytes
+;
+
+CopyUp:
+        test    edi,11b         ;U - destination dword aligned?
+        jnz     short CopyLeadUp ;V - if we are not dword aligned already, align
+
+        shr     ecx,2           ;U - shift down to dword count
+        and     edx,11b         ;V - trailing byte count
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindUp ;V - if so, then jump
+
+        rep     movsd           ;N - move all of our dwords
+
+        jmp     dword ptr TrailUpVec[edx*4] ;N - process trailing bytes
+
+;
+; Code to do optimal memory copies for non-dword-aligned destinations.
+;
+
+; The following length check is done for two reasons:
+;
+;    1. to ensure that the actual move length is greater than any possiale
+;       alignment move, and
+;
+;    2. to skip the multiple move logic for small moves where it would
+;       be faster to move the bytes with one instruction.
+;
+
+        align   @WordSize
+CopyLeadUp:
+
+        mov     eax,edi         ;U - get destination offset
+        mov     edx,11b         ;V - prepare for mask
+
+        sub     ecx,4           ;U - check for really short string - sub for adjust
+        jb      short ByteCopyUp ;V - branch to just copy bytes
+
+        and     eax,11b         ;U - get offset within first dword
+        add     ecx,eax         ;V - update size after leading bytes copied
+
+        jmp     dword ptr LeadUpVec[eax*4-4] ;N - process leading bytes
+
+        align   @WordSize
+ByteCopyUp:
+        jmp     dword ptr TrailUpVec[ecx*4+16] ;N - process just bytes
+
+        align   @WordSize
+CopyUnwindUp:
+        jmp     dword ptr UnwindUpVec[ecx*4] ;N - unwind dword copy
+
+        align   @WordSize
+LeadUpVec       dd      LeadUp1, LeadUp2, LeadUp3
+
+        align   @WordSize
+LeadUp1:
+        and     edx,ecx         ;U - trailing byte count
+        mov     al,[esi]        ;V - get first byte from source
+
+        mov     [edi],al        ;U - write second byte to destination
+        mov     al,[esi+1]      ;V - get second byte from source
+
+        mov     [edi+1],al      ;U - write second byte to destination
+        mov     al,[esi+2]      ;V - get third byte from source
+
+        shr     ecx,2           ;U - shift down to dword count
+        mov     [edi+2],al      ;V - write third byte to destination
+
+        add     esi,3           ;U - advance source pointer
+        add     edi,3           ;V - advance destination pointer
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindUp ;V - if so, then jump
+
+        rep     movsd           ;N - move all of our dwords
+
+        jmp     dword ptr TrailUpVec[edx*4] ;N - process trailing bytes
+
+        align   @WordSize
+LeadUp2:
+        and     edx,ecx         ;U - trailing byte count
+        mov     al,[esi]        ;V - get first byte from source
+
+        mov     [edi],al        ;U - write second byte to destination
+        mov     al,[esi+1]      ;V - get second byte from source
+
+        shr     ecx,2           ;U - shift down to dword count
+        mov     [edi+1],al      ;V - write second byte to destination
+
+        add     esi,2           ;U - advance source pointer
+        add     edi,2           ;V - advance destination pointer
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindUp ;V - if so, then jump
+
+        rep     movsd           ;N - move all of our dwords
+
+        jmp     dword ptr TrailUpVec[edx*4] ;N - process trailing bytes
+
+        align   @WordSize
+LeadUp3:
+        and     edx,ecx         ;U - trailing byte count
+        mov     al,[esi]        ;V - get first byte from source
+
+        mov     [edi],al        ;U - write second byte to destination
+        add     esi,1           ;V - advance source pointer
+
+        shr     ecx,2           ;U - shift down to dword count
+        add     edi,1           ;V - advance destination pointer
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindUp ;V - if so, then jump
+
+        rep     movsd           ;N - move all of our dwords
+
+        jmp     dword ptr TrailUpVec[edx*4] ;N - process trailing bytes
+
+        align   @WordSize
+UnwindUpVec     dd      UnwindUp0, UnwindUp1, UnwindUp2, UnwindUp3
+                dd      UnwindUp4, UnwindUp5, UnwindUp6, UnwindUp7
+
+UnwindUp7:
+        mov     eax,[esi+ecx*4-28] ;U - get dword from source
+                                   ;V - spare
+        mov     [edi+ecx*4-28],eax ;U - put dword into destination
+UnwindUp6:
+        mov     eax,[esi+ecx*4-24] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4-24],eax ;U - put dword into destination
+UnwindUp5:
+        mov     eax,[esi+ecx*4-20] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4-20],eax ;U - put dword into destination
+UnwindUp4:
+        mov     eax,[esi+ecx*4-16] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4-16],eax ;U - put dword into destination
+UnwindUp3:
+        mov     eax,[esi+ecx*4-12] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4-12],eax ;U - put dword into destination
+UnwindUp2:
+        mov     eax,[esi+ecx*4-8] ;U(entry)/V(not) - get dword from source
+                                  ;V(entry) - spare
+        mov     [edi+ecx*4-8],eax ;U - put dword into destination
+UnwindUp1:
+        mov     eax,[esi+ecx*4-4] ;U(entry)/V(not) - get dword from source
+                                  ;V(entry) - spare
+        mov     [edi+ecx*4-4],eax ;U - put dword into destination
+
+        lea     eax,[ecx*4]     ;V - compute update for pointer
+
+        add     esi,eax         ;U - update source pointer
+        add     edi,eax         ;V - update destination pointer
+UnwindUp0:
+        jmp     dword ptr TrailUpVec[edx*4] ;N - process trailing bytes
+
+;-----------------------------------------------------------------------------
+
+        align   @WordSize
+TrailUpVec      dd      TrailUp0, TrailUp1, TrailUp2, TrailUp3
+
+        align   @WordSize
+TrailUp0:
+        mov     eax,[dst]       ;U - return pointer to destination
+        pop     esi             ;V - restore esi
+        pop     edi             ;U - restore edi
+                                ;V - spare
+        ret
+
+        align   @WordSize
+TrailUp1:
+        mov     al,[esi]        ;U - get byte from source
+                                ;V - spare
+        mov     [edi],al        ;U - put byte in destination
+        mov     eax,[dst]       ;V - return pointer to destination
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+        align   @WordSize
+TrailUp2:
+        mov     al,[esi]        ;U - get first byte from source
+                                ;V - spare
+        mov     [edi],al        ;U - put first byte into destination
+        mov     al,[esi+1]      ;V - get second byte from source
+        mov     [edi+1],al      ;U - put second byte into destination
+        mov     eax,[dst]       ;V - return pointer to destination
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+        align   @WordSize
+TrailUp3:
+        mov     al,[esi]        ;U - get first byte from source
+                                ;V - spare
+        mov     [edi],al        ;U - put first byte into destination
+        mov     al,[esi+1]      ;V - get second byte from source
+        mov     [edi+1],al      ;U - put second byte into destination
+        mov     al,[esi+2]      ;V - get third byte from source
+        mov     [edi+2],al      ;U - put third byte into destination
+        mov     eax,[dst]       ;V - return pointer to destination
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
+;-----------------------------------------------------------------------------
+
+;
+; Copy down to avoid propogation in overlapping buffers.
+;
+        align   @WordSize
+CopyDown:
+        lea     esi,[esi+ecx-4] ;U - point to 4 bytes before src buffer end
+        lea     edi,[edi+ecx-4] ;V - point to 4 bytes before dest buffer end
+;
+; See if the destination start is dword aligned
+;
+
+        test    edi,11b         ;U - test if dword aligned
+        jnz     short CopyLeadDown ;V - if not, jump
+
+        shr     ecx,2           ;U - shift down to dword count
+        and     edx,11b         ;V - trailing byte count
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindDown ;V - if so, then jump
+
+        std                     ;N - set direction flag
+        rep     movsd           ;N - move all of our dwords
+        cld                     ;N - clear direction flag back
+
+        jmp     dword ptr TrailDownVec[edx*4] ;N - process trailing bytes
+
+        align   @WordSize
+CopyUnwindDown:
+        neg     ecx             ;U - negate dword count for table merging
+                                ;V - spare
+
+        jmp     dword ptr UnwindDownVec[ecx*4+28] ;N - unwind copy
+
+        align   @WordSize
+CopyLeadDown:
+
+        mov     eax,edi         ;U - get destination offset
+        mov     edx,11b         ;V - prepare for mask
+
+        cmp     ecx,4           ;U - check for really short string
+        jb      short ByteCopyDown ;V - branch to just copy bytes
+
+        and     eax,11b         ;U - get offset within first dword
+        sub     ecx,eax         ;U - to update size after lead copied
+
+        jmp     dword ptr LeadDownVec[eax*4-4] ;N - process leading bytes
+
+        align   @WordSize
+ByteCopyDown:
+        jmp     dword ptr TrailDownVec[ecx*4] ;N - process just bytes
+
+        align   @WordSize
+LeadDownVec     dd      LeadDown1, LeadDown2, LeadDown3
+
+        align   @WordSize
+LeadDown1:
+        mov     al,[esi+3]      ;U - load first byte
+        and     edx,ecx         ;V - trailing byte count
+
+        mov     [edi+3],al      ;U - write out first byte
+        sub     esi,1           ;V - point to last src dword
+
+        shr     ecx,2           ;U - shift down to dword count
+        sub     edi,1           ;V - point to last dest dword
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindDown ;V - if so, then jump
+
+        std                     ;N - set direction flag
+        rep     movsd           ;N - move all of our dwords
+        cld                     ;N - clear direction flag
+
+        jmp     dword ptr TrailDownVec[edx*4] ;N - process trailing bytes
+
+        align   @WordSize
+LeadDown2:
+        mov     al,[esi+3]      ;U - load first byte
+        and     edx,ecx         ;V - trailing byte count
+
+        mov     [edi+3],al      ;U - write out first byte
+        mov     al,[esi+2]      ;V - get second byte from source
+
+        shr     ecx,2           ;U - shift down to dword count
+        mov     [edi+2],al      ;V - write second byte to destination
+
+        sub     esi,2           ;U - point to last src dword
+        sub     edi,2           ;V - point to last dest dword
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      short CopyUnwindDown ;V - if so, then jump
+
+        std                     ;N - set direction flag
+        rep     movsd           ;N - move all of our dwords
+        cld                     ;N - clear direction flag
+
+        jmp     dword ptr TrailDownVec[edx*4] ;N - process trailing bytes
+
+        align   @WordSize
+LeadDown3:
+        mov     al,[esi+3]      ;U - load first byte
+        and     edx,ecx         ;V - trailing byte count
+
+        mov     [edi+3],al      ;U - write out first byte
+        mov     al,[esi+2]      ;V - get second byte from source
+
+        mov     [edi+2],al      ;U - write second byte to destination
+        mov     al,[esi+1]      ;V - get third byte from source
+
+        shr     ecx,2           ;U - shift down to dword count
+        mov     [edi+1],al      ;V - write third byte to destination
+
+        sub     esi,3           ;U - point to last src dword
+        sub     edi,3           ;V - point to last dest dword
+
+        cmp     ecx,8           ;U - test if small enough for unwind copy
+        jb      CopyUnwindDown  ;V - if so, then jump
+
+        std                     ;N - set direction flag
+        rep     movsd           ;N - move all of our dwords
+        cld                     ;N - clear direction flag
+
+        jmp     dword ptr TrailDownVec[edx*4] ;N - process trailing bytes
+
+;------------------------------------------------------------------
+
+        align   @WordSize
+UnwindDownVec   dd      UnwindDown7, UnwindDown6, UnwindDown5, UnwindDown4
+                dd      UnwindDown3, UnwindDown2, UnwindDown1, UnwindDown0
+
+UnwindDown7:
+        mov     eax,[esi+ecx*4+28] ;U - get dword from source
+                                   ;V - spare
+        mov     [edi+ecx*4+28],eax ;U - put dword into destination
+UnwindDown6:
+        mov     eax,[esi+ecx*4+24] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4+24],eax ;U - put dword into destination
+UnwindDown5:
+        mov     eax,[esi+ecx*4+20] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4+20],eax ;U - put dword into destination
+UnwindDown4:
+        mov     eax,[esi+ecx*4+16] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4+16],eax ;U - put dword into destination
+UnwindDown3:
+        mov     eax,[esi+ecx*4+12] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4+12],eax ;U - put dword into destination
+UnwindDown2:
+        mov     eax,[esi+ecx*4+8] ;U(entry)/V(not) - get dword from source
+                                   ;V(entry) - spare
+        mov     [edi+ecx*4+8],eax ;U - put dword into destination
+UnwindDown1:
+        mov     eax,[esi+ecx*4+4] ;U(entry)/V(not) - get dword from source
+                                  ;V(entry) - spare
+        mov     [edi+ecx*4+4],eax ;U - put dword into destination
+
+        lea     eax,[ecx*4]     ;V - compute update for pointer
+
+        add     esi,eax         ;U - update source pointer
+        add     edi,eax         ;V - update destination pointer
+UnwindDown0:
+        jmp     dword ptr TrailDownVec[edx*4] ;N - process trailing bytes
+
+;-----------------------------------------------------------------------------
+
+        align   @WordSize
+TrailDownVec    dd      TrailDown0, TrailDown1, TrailDown2, TrailDown3
+
+        align   @WordSize
+TrailDown0:
+        mov     eax,[dst]       ;U - return pointer to destination
+                                ;V - spare
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+        align   @WordSize
+TrailDown1:
+        mov     al,[esi+3]      ;U - get byte from source
+                                ;V - spare
+        mov     [edi+3],al      ;U - put byte in destination
+        mov     eax,[dst]       ;V - return pointer to destination
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+        align   @WordSize
+TrailDown2:
+        mov     al,[esi+3]      ;U - get first byte from source
+                                ;V - spare
+        mov     [edi+3],al      ;U - put first byte into destination
+        mov     al,[esi+2]      ;V - get second byte from source
+        mov     [edi+2],al      ;U - put second byte into destination
+        mov     eax,[dst]       ;V - return pointer to destination
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+        align   @WordSize
+TrailDown3:
+        mov     al,[esi+3]      ;U - get first byte from source
+                                ;V - spare
+        mov     [edi+3],al      ;U - put first byte into destination
+        mov     al,[esi+2]      ;V - get second byte from source
+        mov     [edi+2],al      ;U - put second byte into destination
+        mov     al,[esi+1]      ;V - get third byte from source
+        mov     [edi+1],al      ;U - put third byte into destination
+        mov     eax,[dst]       ;V - return pointer to destination
+        pop     esi             ;U - restore esi
+        pop     edi             ;V - restore edi
+        ret
+
+memcpy   endp
+
+
+memmove proc \
+        dst:ptr byte, \
+        src:ptr byte, \
+        count:DWORD
+
+        jmp memcpy
+        
+memmove endp
+        end
+
diff --git a/base/Kernel/Native/_memset.asm b/base/Kernel/Native/_memset.asm
new file mode 100644
index 0000000..960a8c9
--- /dev/null
+++ b/base/Kernel/Native/_memset.asm
@@ -0,0 +1,140 @@
+;*******************************************************************************
+;memset.asm - set a section of memory to all one byte
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       contains the memset() routine
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;char *memset(dst, value, count) - sets "count" bytes at "dst" to "value"
+;
+;Purpose:
+;       Sets the first "count" bytes of the memory starting
+;       at "dst" to the character value "value".
+;
+;       Algorithm:
+;       char *
+;       memset (dst, value, count)
+;               char *dst;
+;               char value;
+;               unsigned int count;
+;               {
+;               char *start = dst;
+;
+;               while (count--)
+;                       *dst++ = value;
+;               return(start);
+;               }
+;
+;Entry:
+;       char *dst - pointer to memory to fill with value
+;       char value - value to put in dst bytes
+;       int count - number of bytes of dst to fill
+;
+;Exit:
+;       returns dst, with filled bytes
+;
+;Uses:
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+        public  memset
+memset proc
+
+        .FPO    ( 0, 3, 0, 0, 0, 0 )
+
+        mov     edx,[esp + 0ch] ; edx = "count"
+        mov     ecx,[esp + 4]   ; ecx points to "dst"
+
+        test    edx,edx         ; 0?
+        jz      short toend     ; if so, nothing to do
+
+        xor     eax,eax
+        mov     al,[esp + 8]    ; the byte "value" to be stored
+
+
+; Align address on dword boundary
+
+        push    edi             ; preserve edi
+        mov     edi,ecx         ; edi = dest pointer
+
+        cmp     edx,4           ; if it's less then 4 bytes
+        jb      tail            ; tail needs edi and edx to be initialized
+
+        neg     ecx
+        and     ecx,3           ; ecx = # bytes before dword boundary
+        jz      short dwords    ; jump if address already aligned
+
+        sub     edx,ecx         ; edx = adjusted count (for later)
+adjust_loop:
+        mov     [edi],al
+        add     edi,1
+        sub     ecx,1
+        jnz     adjust_loop
+
+dwords:
+; set all 4 bytes of eax to [value]
+        mov     ecx,eax         ; ecx=0/0/0/value
+        shl     eax,8           ; eax=0/0/value/0
+
+        add     eax,ecx         ; eax=0/0val/val
+
+        mov     ecx,eax         ; ecx=0/0/val/val
+
+        shl     eax,10h         ; eax=val/val/0/0
+
+        add     eax,ecx         ; eax = all 4 bytes = [value]
+
+; Set dword-sized blocks
+        mov     ecx,edx         ; move original count to ecx
+        and     edx,3           ; prepare in edx byte count (for tail loop)
+        shr     ecx,2           ; adjust ecx to be dword count
+        jz      tail            ; jump if it was less then 4 bytes
+
+        rep     stosd
+main_loop_tail:
+        test    edx,edx         ; if there is no tail bytes,
+        jz      finish          ; we finish, and it's time to leave
+; Set remaining bytes
+
+tail:
+        mov     [edi],al        ; set remaining bytes
+        add     edi,1
+
+        sub     edx,1           ; if there is some more bytes
+        jnz     tail            ; continue to fill them
+
+; Done
+finish:
+        mov     eax,[esp + 8]   ; return dest pointer
+        pop     edi             ; restore edi
+
+        ret
+
+toend:
+        mov     eax,[esp + 4]   ; return dest pointer
+
+        ret
+
+memset  endp
+
+        end
diff --git a/base/Kernel/Native/_ulldiv.asm b/base/Kernel/Native/_ulldiv.asm
new file mode 100644
index 0000000..92a255e
--- /dev/null
+++ b/base/Kernel/Native/_ulldiv.asm
@@ -0,0 +1,163 @@
+;*******************************************************************************
+;ulldiv.asm - unsigned long divide routine
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       defines the unsigned long divide routine
+;           __aulldiv
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;ulldiv - unsigned long divide
+;
+;Purpose:
+;       Does a unsigned long divide of the arguments.  Arguments are
+;       not changed.
+;
+;Entry:
+;       Arguments are passed on the stack:
+;               1st pushed: divisor (QWORD)
+;               2nd pushed: dividend (QWORD)
+;
+;Exit:
+;       EDX:EAX contains the quotient (dividend/divisor)
+;       NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;       ECX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_aulldiv        PROC NEAR
+
+        push    ebx
+        push    esi
+
+; Set up the local stack and save the index registers.  When this is done
+; the stack frame will look as follows (assuming that the expression a/b will
+; generate a call to uldiv(a, b)):
+;
+;               -----------------
+;               |               |
+;               |---------------|
+;               |               |
+;               |--divisor (b)--|
+;               |               |
+;               |---------------|
+;               |               |
+;               |--dividend (a)-|
+;               |               |
+;               |---------------|
+;               | return addr** |
+;               |---------------|
+;               |      EBX      |
+;               |---------------|
+;       ESP---->|      ESI      |
+;               -----------------
+;
+
+DVND    equ     [esp + 12]      ; stack address of dividend (a)
+DVSR    equ     [esp + 20]      ; stack address of divisor (b)
+
+;
+; Now do the divide.  First look to see if the divisor is less than 4194304K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+
+        mov     eax,HIWORD(DVSR) ; check to see if divisor < 4194304K
+        or      eax,eax
+        jnz     short L1        ; nope, gotta do this the hard way
+        mov     ecx,LOWORD(DVSR) ; load divisor
+        mov     eax,HIWORD(DVND) ; load high word of dividend
+        xor     edx,edx
+        div     ecx             ; get high order bits of quotient
+        mov     ebx,eax         ; save high bits of quotient
+        mov     eax,LOWORD(DVND) ; edx:eax <- remainder:lo word of dividend
+        div     ecx             ; get low order bits of quotient
+        mov     edx,ebx         ; edx:eax <- quotient hi:quotient lo
+        jmp     short L2        ; restore stack and return
+
+;
+; Here we do it the hard way.  Remember, eax contains DVSRHI
+;
+
+L1:
+        mov     ecx,eax         ; ecx:ebx <- divisor
+        mov     ebx,LOWORD(DVSR)
+        mov     edx,HIWORD(DVND) ; edx:eax <- dividend
+        mov     eax,LOWORD(DVND)
+L3:
+        shr     ecx,1           ; shift divisor right one bit; hi bit <- 0
+        rcr     ebx,1
+        shr     edx,1           ; shift dividend right one bit; hi bit <- 0
+        rcr     eax,1
+        or      ecx,ecx
+        jnz     short L3        ; loop until divisor < 4194304K
+        div     ebx             ; now divide, ignore remainder
+        mov     esi,eax         ; save quotient
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**64 and the quotient is off by 1.
+;
+
+        mul     dword ptr HIWORD(DVSR) ; QUOT * HIWORD(DVSR)
+        mov     ecx,eax
+        mov     eax,LOWORD(DVSR)
+        mul     esi             ; QUOT * LOWORD(DVSR)
+        add     edx,ecx         ; EDX:EAX = QUOT * DVSR
+        jc      short L4        ; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in edx:eax.  If original is larger or equal, we are ok, otherwise
+; subtract one (1) from the quotient.
+;
+
+        cmp     edx,HIWORD(DVND) ; compare hi words of result and original
+        ja      short L4        ; if result > original, do subtract
+        jb      short L5        ; if result < original, we are ok
+        cmp     eax,LOWORD(DVND) ; hi words are equal, compare lo words
+        jbe     short L5        ; if less or equal we are ok, else subtract
+L4:
+        dec     esi             ; subtract 1 from quotient
+L5:
+        xor     edx,edx         ; edx:eax <- quotient
+        mov     eax,esi
+
+;
+; Just the cleanup left to do.  edx:eax contains the quotient.
+; Restore the saved registers and return.
+;
+
+L2:
+
+        pop     esi
+        pop     ebx
+
+        ret     16
+
+_aulldiv        ENDP
+
+        end
diff --git a/base/Kernel/Native/_ulldvrm.asm b/base/Kernel/Native/_ulldvrm.asm
new file mode 100644
index 0000000..fb81fbd
--- /dev/null
+++ b/base/Kernel/Native/_ulldvrm.asm
@@ -0,0 +1,193 @@
+;*******************************************************************************
+;ulldvrm.asm - unsigned long divide and remainder routine
+;
+;	Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;	defines the unsigned long divide and remainder routine
+;	    __aulldvrm
+;
+;Revision History:
+;	10-06-98  SMK	Initial version.
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+;***
+;ulldvrm - unsigned long divide and remainder
+;
+;Purpose:
+;	Does a unsigned long divide and remainder of the arguments.  Arguments
+;       are not changed.
+;
+;Entry:
+;	Arguments are passed on the stack:
+;		1st pushed: divisor (QWORD)
+;		2nd pushed: dividend (QWORD)
+;
+;Exit:
+;	EDX:EAX contains the quotient (dividend/divisor)
+;       EBX:ECX contains the remainder (divided % divisor)
+;	NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;	ECX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_aulldvrm PROC NEAR
+
+	push	esi
+
+; Set up the local stack and save the index registers.	When this is done
+; the stack frame will look as follows (assuming that the expression a/b will
+; generate a call to aulldvrm(a, b)):
+;
+;		-----------------
+;		|		|
+;		|---------------|
+;		|		|
+;		|--divisor (b)--|
+;		|		|
+;		|---------------|
+;		|		|
+;		|--dividend (a)-|
+;		|		|
+;		|---------------|
+;		| return addr** |
+;		|---------------|
+;	ESP---->|      ESI	|
+;		-----------------
+;
+
+DVND	equ	[esp + 8]	; stack address of dividend (a)
+DVSR	equ	[esp + 16]	; stack address of divisor (b)
+
+;
+; Now do the divide.  First look to see if the divisor is less than 4194304K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+
+	mov	eax,HIWORD(DVSR) ; check to see if divisor < 4194304K
+	or	eax,eax
+	jnz	short L1	; nope, gotta do this the hard way
+	mov	ecx,LOWORD(DVSR) ; load divisor
+	mov	eax,HIWORD(DVND) ; load high word of dividend
+	xor	edx,edx
+	div	ecx		; get high order bits of quotient
+	mov	ebx,eax		; save high bits of quotient
+	mov	eax,LOWORD(DVND) ; edx:eax <- remainder:lo word of dividend
+	div	ecx		; get low order bits of quotient
+	mov	esi,eax		; ebx:esi <- quotient
+
+;
+; Now we need to do a multiply so that we can compute the remainder.
+;
+	mov     eax,ebx         ; set up high word of quotient
+	mul	dword ptr LOWORD(DVSR) ; HIWORD(QUOT) * DVSR
+	mov	ecx,eax         ; save the result in ecx
+	mov     eax,esi         ; set up low word of quotient
+	mul	dword ptr LOWORD(DVSR) ; LOWORD(QUOT) * DVSR
+	add	edx,ecx		; EDX:EAX = QUOT * DVSR
+	jmp	short L2	; complete remainder calculation
+
+;
+; Here we do it the hard way.  Remember, eax contains DVSRHI
+;
+
+L1:
+	mov	ecx,eax		; ecx:ebx <- divisor
+	mov	ebx,LOWORD(DVSR)
+	mov	edx,HIWORD(DVND) ; edx:eax <- dividend
+	mov	eax,LOWORD(DVND)
+L3:
+	shr	ecx,1		; shift divisor right one bit; hi bit <- 0
+	rcr	ebx,1
+	shr	edx,1		; shift dividend right one bit; hi bit <- 0
+	rcr	eax,1
+	or	ecx,ecx
+	jnz	short L3	; loop until divisor < 4194304K
+	div	ebx		; now divide, ignore remainder
+	mov	esi,eax		; save quotient
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**64 and the quotient is off by 1.
+;
+
+	mul	dword ptr HIWORD(DVSR) ; QUOT * HIWORD(DVSR)
+	mov	ecx,eax
+	mov	eax,LOWORD(DVSR)
+	mul	esi		; QUOT * LOWORD(DVSR)
+	add	edx,ecx		; EDX:EAX = QUOT * DVSR
+	jc	short L4	; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in edx:eax.  If original is larger or equal, we are ok, otherwise
+; subtract one (1) from the quotient.
+;
+
+	cmp	edx,HIWORD(DVND) ; compare hi words of result and original
+	ja	short L4	; if result > original, do subtract
+	jb	short L5	; if result < original, we are ok
+	cmp	eax,LOWORD(DVND) ; hi words are equal, compare lo words
+	jbe	short L5	; if less or equal we are ok, else subtract
+L4:
+	dec	esi		; subtract 1 from quotient
+	sub	eax,LOWORD(DVSR) ; subtract divisor from result
+	sbb	edx,HIWORD(DVSR)
+L5:
+	xor	ebx,ebx		; ebx:esi <- quotient
+
+L2:
+;
+; Calculate remainder by subtracting the result from the original dividend.
+; Since the result is already in a register, we will do the subtract in the
+; opposite direction and negate the result.
+;
+
+	sub	eax,LOWORD(DVND) ; subtract dividend from result
+	sbb	edx,HIWORD(DVND)
+	neg	edx		; otherwise, negate the result
+	neg	eax
+	sbb	edx,0
+
+;
+; Now we need to get the quotient into edx:eax and the remainder into ebx:ecx.
+;
+	mov	ecx,edx
+	mov     edx,ebx
+	mov     ebx,ecx
+	mov     ecx,eax
+	mov     eax,esi
+;
+; Just the cleanup left to do.	edx:eax contains the quotient.
+; Restore the saved registers and return.
+;
+
+	pop	esi
+
+	ret	16
+
+_aulldvrm ENDP
+
+	end
diff --git a/base/Kernel/Native/_ullrem.asm b/base/Kernel/Native/_ullrem.asm
new file mode 100644
index 0000000..9947cb3
--- /dev/null
+++ b/base/Kernel/Native/_ullrem.asm
@@ -0,0 +1,168 @@
+;*******************************************************************************
+;ullrem.asm - unsigned long remainder routine
+;
+;       Copyright (c) Microsoft Corporation. All rights reserved.
+;
+;Purpose:
+;       defines the unsigned long remainder routine
+;           __aullrem
+;
+;*******************************************************************************
+
+.686p
+.mmx
+.xmm
+.model flat,C
+.code
+        
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+
+include hal.inc
+        
+;***
+;ullrem - unsigned long remainder
+;
+;Purpose:
+;       Does a unsigned long remainder of the arguments.  Arguments are
+;       not changed.
+;
+;Entry:
+;       Arguments are passed on the stack:
+;               1st pushed: divisor (QWORD)
+;               2nd pushed: dividend (QWORD)
+;
+;Exit:
+;       EDX:EAX contains the remainder (dividend%divisor)
+;       NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;       ECX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+_aullrem        PROC NEAR
+
+        push    ebx
+
+; Set up the local stack and save the index registers.  When this is done
+; the stack frame will look as follows (assuming that the expression a%b will
+; generate a call to ullrem(a, b)):
+;
+;               -----------------
+;               |               |
+;               |---------------|
+;               |               |
+;               |--divisor (b)--|
+;               |               |
+;               |---------------|
+;               |               |
+;               |--dividend (a)-|
+;               |               |
+;               |---------------|
+;               | return addr** |
+;               |---------------|
+;       ESP---->|      EBX      |
+;               -----------------
+;
+
+DVND    equ     [esp + 8]       ; stack address of dividend (a)
+DVSR    equ     [esp + 16]      ; stack address of divisor (b)
+
+; Now do the divide.  First look to see if the divisor is less than 4194304K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+
+        mov     eax,HIWORD(DVSR) ; check to see if divisor < 4194304K
+        or      eax,eax
+        jnz     short L1        ; nope, gotta do this the hard way
+        mov     ecx,LOWORD(DVSR) ; load divisor
+        mov     eax,HIWORD(DVND) ; load high word of dividend
+        xor     edx,edx
+        div     ecx             ; edx <- remainder, eax <- quotient
+        mov     eax,LOWORD(DVND) ; edx:eax <- remainder:lo word of dividend
+        div     ecx             ; edx <- final remainder
+        mov     eax,edx         ; edx:eax <- remainder
+        xor     edx,edx
+        jmp     short L2        ; restore stack and return
+
+;
+; Here we do it the hard way.  Remember, eax contains DVSRHI
+;
+
+L1:
+        mov     ecx,eax         ; ecx:ebx <- divisor
+        mov     ebx,LOWORD(DVSR)
+        mov     edx,HIWORD(DVND) ; edx:eax <- dividend
+        mov     eax,LOWORD(DVND)
+L3:
+        shr     ecx,1           ; shift divisor right one bit; hi bit <- 0
+        rcr     ebx,1
+        shr     edx,1           ; shift dividend right one bit; hi bit <- 0
+        rcr     eax,1
+        or      ecx,ecx
+        jnz     short L3        ; loop until divisor < 4194304K
+        div     ebx             ; now divide, ignore remainder
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**64 and the quotient is off by 1.
+;
+
+        mov     ecx,eax         ; save a copy of quotient in ECX
+        mul     dword ptr HIWORD(DVSR)
+        xchg    ecx,eax         ; put partial product in ECX, get quotient in EAX
+        mul     dword ptr LOWORD(DVSR)
+        add     edx,ecx         ; EDX:EAX = QUOT * DVSR
+        jc      short L4        ; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in edx:eax.  If original is larger or equal, we're ok, otherwise
+; subtract the original divisor from the result.
+;
+
+        cmp     edx,HIWORD(DVND) ; compare hi words of result and original
+        ja      short L4        ; if result > original, do subtract
+        jb      short L5        ; if result < original, we're ok
+        cmp     eax,LOWORD(DVND) ; hi words are equal, compare lo words
+        jbe     short L5        ; if less or equal we're ok, else subtract
+L4:
+        sub     eax,LOWORD(DVSR) ; subtract divisor from result
+        sbb     edx,HIWORD(DVSR)
+L5:
+
+;
+; Calculate remainder by subtracting the result from the original dividend.
+; Since the result is already in a register, we will perform the subtract in
+; the opposite direction and negate the result to make it positive.
+;
+
+        sub     eax,LOWORD(DVND) ; subtract original dividend from result
+        sbb     edx,HIWORD(DVND)
+        neg     edx             ; and negate it
+        neg     eax
+        sbb     edx,0
+
+;
+; Just the cleanup left to do.  dx:ax contains the remainder.
+; Restore the saved registers and return.
+;
+
+L2:
+
+        pop     ebx
+
+        ret     16
+
+_aullrem        ENDP
+
+        end
diff --git a/base/Kernel/Native/hal.cpp b/base/Kernel/Native/hal.cpp
new file mode 100644
index 0000000..2a76a66
--- /dev/null
+++ b/base/Kernel/Native/hal.cpp
@@ -0,0 +1,356 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Hal.cpp
+//
+//  Note:
+//
+
+#include "hal.h"
+
+#if SINGULARITY_KERNEL
+#include "halkd.h"
+#include "printf.cpp"
+#endif // SINGULARITY_KERNEL
+
+//////////////////////////////////////////////////////////////////////////////
+
+extern "C" int _fltused = 0x9875;
+
+//////////////////////////////////////////////////////////////////////////////
+// debugging code.    Put it here for now.
+
+#if SINGULARITY_KERNEL
+
+void Halt()
+{
+    uintptr _ebp;
+    __asm mov _ebp, ebp;
+
+    for (int i = 0; i < 30 && _ebp >= 0x4000; i++) {
+
+        uintptr next = ((uintptr *)_ebp)[0];
+        uintptr code = ((uintptr *)_ebp)[1];
+
+        printf("    %p: %p %p\n", _ebp, next, code);
+        _ebp = next;
+    }
+    printf("---- Halting. --------------------------------------------------------");
+
+    __asm int 3;
+}
+
+void Cls()
+{
+    KdPutChar('\n');
+    for (uint16 n = 0; n < 79; n++) {
+        KdPutChar('-');
+    }
+    KdPutChar('\n');
+}
+
+void __cdecl PutChar(char cOut)
+{
+    KdPutChar(cOut);
+}
+
+void fail_assert(const char *expr)
+{
+    printf("%s\n", expr);
+    printf("----- Frame --- EBP ---- Code ----------------------------- Assert Failure\n");
+    Halt();
+    __asm int 3;
+}
+
+#elif SINGULARITY_PROCESS
+
+void fail_assert(Class_System_String *message)
+{
+    Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print((bartok_char*)&message->m_firstChar,
+                                                                   message->m_stringLength);
+    //Struct_Microsoft_Singularity_V1_Services_DebugService::g_Break();
+    Class_Microsoft_Singularity_DebugStub::g_Break();
+}
+#endif // SINGULARITY_KERNEL
+
+//////////////////////////////////////////////////////////////////////////////
+//
+extern "C" int __cdecl _cinit(void);
+extern "C" int __cdecl _cfini(void);
+
+#if SINGULARITY_KERNEL
+
+void Class_Microsoft_Singularity_Kernel::g_Kill(int32 action)
+{
+    ((Struct_Microsoft_Singularity_BootInfo *)g_pBootInfo)->KillAction = action;
+
+    void (__cdecl *pfKill)(void) = (void (__cdecl *)(void))g_pBootInfo->Kill32;
+    printf("About to call pfKill(%p) with %08x [g_pBootInfo=%p]\n",
+           pfKill, g_pBootInfo->KillAction, g_pBootInfo);
+    pfKill();
+    Halt();
+}
+
+extern wchar_t _LinkDate[];
+
+bartok_char *
+Class_Microsoft_Singularity_Kernel::g_HalGetLinkDate()
+{
+    return (bartok_char *)_LinkDate;
+}
+
+// Hoisted this out of checkHinges because VC appears to have changed its name
+// mangling strategy for structs in functions.
+
+struct CheckedHingeEntry { uint32 i; char *a; char *b; };
+
+void checkHinges()
+{
+    // Check for a broken image produce when Bartok compiles through an assembler.
+    int busted = false;
+    extern CheckedHingeEntry checkedHingeTable[];
+    for (CheckedHingeEntry *che = checkedHingeTable; che->a; che++) {
+        if (che->a+1 != che->b) {
+            printf("%06d: 0x%08x 0x%08x\n", che->i, che->a+1, che->b);
+            busted = true;
+        }
+    }
+    if (busted) {
+        printf("----- Frame --- EBP ---- Code ------------------------------ Busted Hinges\n");
+        Halt();
+    }
+}
+
+extern "C" static void __cdecl
+HalBspEnter(Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    g_pBootInfo = bi;
+
+    kdprintf("Singularity HAL [%ls]\n", _LinkDate);
+    _cinit();
+
+    kdprintf("DebugPort: %04x\n", bi->DebugBasePort);
+    KdInitialize(bi);
+
+    Cls();
+    printf("Singularity Hardware Abstraction Layer [%ls]\n", _LinkDate);
+
+    printf("\n");
+
+    IdtInitialize();
+    IdtLoad();
+    ProcessorInitialize(&bi->Cpu0, 0);
+    checkHinges();
+
+    Class_Microsoft_Singularity_Tracing::g_Initialize();
+    Class_Microsoft_Singularity_Tracing::g_Log(0);
+    Class_Microsoft_Singularity_Tracing::g_Log(1);
+    Class_Microsoft_Singularity_Tracing::g_Log(2);
+    Class_Microsoft_Singularity_Tracing::g_Log(3);
+
+    printf("----------------------------------------------------------------------\n");
+    printf("Calling Kernel.Main:\n");
+    Class_Microsoft_Singularity_Kernel::g_Main();
+
+    // We should not rely on or use any C++ finalizers.
+    // _cfini();
+}
+
+extern "C" static void __cdecl
+HalApEnter(const Struct_Microsoft_Singularity_BootInfo *bi, int cpu)
+{
+    IdtLoad();
+
+    const Struct_Microsoft_Singularity_CpuInfo *cpuInfo = &bi->Cpu0 + cpu;
+    ProcessorInitialize(cpuInfo, cpu);
+
+    Class_Microsoft_Singularity_Kernel::g_MpMain(cpu);
+    Class_Microsoft_Singularity_Processor::g_DisableInterrupts();
+    for (int i = 0; i != i + 1; i++) {
+        uint16* p = (uint16*)(0xb8000 + (cpu - 1) * 2 * 8);
+        for (int r = 0; r < 8; r++) {
+            uint16 t = (uint16)(i >> (28 - r * 4));
+            t &= 0xf;
+            if (t > 9) {
+                t += 0x1f00 + 'a' - 10;
+            }
+            else {
+                t += 0x1f00 + '0';
+            }
+            *p++ = t;
+            if (Class_Microsoft_Singularity_DebugStub::g_PollForBreak() == true) {
+                __asm int 3;
+            }
+            for (int i = 0; i < 50000; i++) {
+                __asm nop;
+            }
+        }
+    }
+}
+
+extern "C" void __cdecl
+Hal(Struct_Microsoft_Singularity_BootInfo *bi, int cpu)
+{
+    if (cpu == 0) {
+        HalBspEnter(bi);
+    }
+    else {
+        HalApEnter(bi, cpu);
+    }
+}
+
+#elif SINGULARITY_PROCESS
+
+BOOL KdDebuggerNotPresent;
+extern Class_System_RuntimeType * brtmainClass;
+extern int (*brtmain)(ClassVector_Class_System_String *args);
+extern int brtmainReturnsInt;
+
+// Note: CallMain's return value is only meaningful if brtmainReturnsInt is true.
+// Example:
+//   int ret = CallMain(args);
+//   if (!MainReturnsInt()) ret = 0;
+__declspec(naked) int Class_Microsoft_Singularity_AppRuntime::
+g_CallMain(ClassVector_Class_System_String *args)
+{
+    // To avoid creating an unmanaged stack frame, jmp directly to the main function:
+    __asm {
+        mov eax, brtmain;
+        jmp eax;
+    }
+}
+
+bool Class_Microsoft_Singularity_AppRuntime::
+g_MainReturnsInt()
+{
+    return (brtmainReturnsInt != 0);
+}
+
+void Class_Microsoft_Singularity_AppRuntime::
+g_SetDebuggerPresence(bool debuggerPresent)
+{
+    KdDebuggerNotPresent = !debuggerPresent;
+}
+
+extern "C" int32 __fastcall RuntimeEntryPoint(int threadIndex)
+{
+    int32 ret = 0;
+
+    Struct_Microsoft_Singularity_X86_ThreadContext * context =
+        Class_Microsoft_Singularity_Processor::g_GetCurrentThreadContext();
+
+    if (!Struct_Microsoft_Singularity_X86_ThreadContext::m_IsInKernelMode(
+        context)) {
+        // fail assertion in uninitialized process mode:
+        __asm int 3
+    }
+
+    Struct_Microsoft_Singularity_X86_ThreadContext::m_SetProcessMode(context);
+
+    if (threadIndex == -1) {
+        _cinit();
+        Class_Microsoft_Singularity_Tracing::g_Initialize();
+        Class_Microsoft_Singularity_Tracing::g_Log(0, "RuntimeEntryPoint:Main");
+        Class_Microsoft_Singularity_Monitoring::g_Initialize();
+
+        ret = Class_Microsoft_Singularity_AppRuntime::g_AppStart(brtmainClass);
+    }
+    else {
+        Class_Microsoft_Singularity_Tracing::g_Log(0, "RuntimeEntryPoint:Thread");
+        Class_System_Threading_Thread::g_ThreadStub(threadIndex);
+    }
+
+    Struct_Microsoft_Singularity_X86_ThreadContext::m_SetKernelMode(context);
+
+    return ret;
+}
+
+#endif // SINGULARITY_PROCESS
+
+//////////////////////////////////////////////////////////////////////////////
+
+// Need to put the following marker variables into the .CRT section.
+// The .CRT section contains arrays of function pointers.
+// The compiler creates functions and adds pointers to this section
+// for things like C++ global constructors.
+//
+// The XIA, XCA etc are group names with in the section.
+// The compiler sorts the contributions by the group name.
+// For example, .CRT$XCA followed by .CRT$XCB, ... .CRT$XCZ.
+// The marker variables below let us get pointers
+// to the beginning/end of the arrays of function pointers.
+//
+// For example, standard groups are
+//  XCA used here, for begin marker
+//  XCC "compiler" inits
+//  XCL "library" inits
+//  XCU "user" inits
+//  XCZ used here, for end marker
+//
+
+typedef void (__cdecl *_PVFV)(void);
+// typedef int  (__cdecl *_PIFV)(void);
+typedef _PVFV _PIFV;
+
+#pragma comment(linker, "/merge:.CRT=.DATA")
+
+#pragma data_seg(".CRT$XIA", "DATA")
+extern "C" _PIFV __xi_a[] = { NULL };                    // C initializers.
+
+#pragma data_seg(".CRT$XIZ", "DATA")
+extern "C" _PIFV __xi_z[] = { NULL };
+
+#pragma data_seg(".CRT$XCA", "DATA")
+extern "C" _PVFV __xc_a[] = { NULL };                    // C++ initializers.
+
+#pragma data_seg(".CRT$XCZ", "DATA")
+extern "C" _PVFV __xc_z[] = { NULL };
+
+#pragma data_seg(".CRT$XPA", "DATA")
+extern "C" _PVFV __xp_a[] = { NULL };                    // C pre-terminators.
+
+#pragma data_seg(".CRT$XPZ", "DATA")
+extern "C" _PVFV __xp_z[] = { NULL };
+
+#pragma data_seg(".CRT$XTA", "DATA")
+extern "C" _PVFV __xt_a[] = { NULL };                    // C terminators.
+
+#pragma data_seg(".CRT$XTZ", "DATA")
+extern "C" _PVFV __xt_z[] = { NULL };
+
+#pragma data_seg()
+
+// Walk an array of function pointers, call non-NULL ones.
+void __cdecl _initterm(_PVFV *pfbegin, _PVFV *pfend)
+{
+    for (; pfbegin < pfend; pfbegin++) {
+        if (*pfbegin != NULL) {
+            (**pfbegin)();
+        }
+    }
+}
+
+// Call all of the C++ static constructors.
+//
+int __cdecl _cinit(void)
+{
+    // do C initializations
+    _initterm( __xi_a, __xi_z );
+
+    // do C++ initializations
+    _initterm( __xc_a, __xc_z );
+    return 0;
+}
+
+int  __cdecl _cfini(void)
+{
+    // do C initializations
+    _initterm( __xp_a, __xp_z );
+
+    // do C++ terminations
+    _initterm( __xt_a, __xt_z );
+    return 0;
+}
diff --git a/base/Kernel/Native/hal.h b/base/Kernel/Native/hal.h
new file mode 100644
index 0000000..1bdcaf2
--- /dev/null
+++ b/base/Kernel/Native/hal.h
@@ -0,0 +1,387 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   hal.h
+//
+//  Note:
+//
+
+#ifndef __hal_h_
+#define __hal_h_
+
+#define UNICODE
+#define _UNICODE
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define PTR_SIZE_32 1
+
+/////////////////////////////////////////// Core types used by runtime system.
+//
+
+typedef __wchar_t           bartok_char;
+
+typedef char                int8;
+typedef short               int16;
+typedef int                 int32;
+typedef __int64             int64;
+
+typedef unsigned char       uint8;
+typedef unsigned short      uint16;
+typedef unsigned int        uint32;
+typedef unsigned __int64    uint64;
+
+typedef float               float32;
+typedef double              float64;
+
+#if defined(PTR_SIZE_32)
+typedef int                 intptr;
+typedef unsigned int        uintptr;
+#else
+typedef __int64             intptr;
+typedef unsigned __int64    uintptr;
+#endif
+
+struct uintPtr
+{
+    uintptr value;
+};
+
+struct intPtr
+{
+    intptr value;
+};
+
+typedef struct uintPtr *UIntPtr;
+typedef struct intPtr *IntPtr;
+
+/////////////////////////////////////////////////////////////// Static Assert.
+//
+// Compile-time (not run-time) assertion. Code will not compile if
+// expr is false. Note: there is no non-debug version of this; we
+// want this for all builds. The compiler optimizes the code away.
+//
+template <bool x> struct STATIC_ASSERT_FAILURE;
+template <> struct STATIC_ASSERT_FAILURE<true> { };
+template <int x> struct static_assert_test { };
+
+#define STATIC_CAT_INNER(x,y) x##y
+#define STATIC_CAT(x,y) STATIC_CAT_INNER(x,y)
+#define STATIC_ASSERT(condition) \
+   typedef static_assert_test< \
+      sizeof(STATIC_ASSERT_FAILURE<(bool)(condition)>)> \
+         STATIC_CAT(__static_assert_typedef_, __COUNTER__)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define OFFSETOF(s,m)   ((uintptr)&(((s *)0)->m))
+#define ARRAYOF(a)      (sizeof(a)/sizeof(a[0]))
+
+//////////////////////////////////////////////////////////////////////////////
+//
+typedef signed int INT;
+typedef signed char INT8;
+typedef signed short INT16;
+typedef signed long INT32;
+typedef signed __int64 INT64;
+typedef unsigned int UINT;
+typedef unsigned char UINT8;
+typedef unsigned short UINT16;
+typedef unsigned long UINT32;
+typedef unsigned __int64 UINT64;
+
+typedef wchar_t WCHAR;
+typedef unsigned char UCHAR;
+
+typedef void *PVOID;
+typedef uintptr ULONG_PTR;
+typedef unsigned long   DWORD;
+typedef uint64 ULARGEST;
+typedef int64 LARGEST;
+
+typedef struct
+{
+    UINT64  _lo;
+    UINT64  _hi;
+} UINT128;
+
+#define NULL 0
+
+#if SINGULARITY_KERNEL
+
+#ifndef _VA_LIST_DEFINED
+typedef char *va_list;
+#define _VA_LIST_DEFINED
+
+#define _INTSIZEOF(n)    ( (sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1) )
+#define va_start(ap,v) ap = (va_list)&v + _INTSIZEOF(v)
+#define va_arg(ap,t) ( *(t *)((ap += _INTSIZEOF(t)) - _INTSIZEOF(t)) )
+#define va_end(ap) ap = (va_list)0
+#endif
+
+int printf(const char *pszFmt, ...);
+
+void IdtInitialize();
+void IdtLoad();
+
+struct Struct_Microsoft_Singularity_CpuInfo;
+void ProcessorInitialize(const Struct_Microsoft_Singularity_CpuInfo* cpu,
+                         int cpuId);
+int GetCurrentProcessorNumber();
+
+#ifndef MAX_CPU
+#define MAX_CPU 1
+#endif  // MAX_CPU
+
+#endif // SINGULARITY_KERNEL
+
+//////////////////////////////////////////////////////////////////////////////
+//
+typedef int BOOL;
+
+#if SINGULARITY_KERNEL
+
+#include "winctx.h"
+#include "minidump.h"
+
+#elif SINGULARITY_PROCESS
+
+//////////////////////////////////////////////////////////////////////////////
+//
+typedef int BOOL;
+
+struct Struct_System_ObjectHeader
+{
+    int32  syncBlockValue;
+};
+
+#define MAKE_STRING(s,v) \
+struct _##s \
+{ \
+    Struct_System_ObjectHeader header; \
+    union \
+    { \
+        struct \
+        { \
+            Class_System_VTable * vable; \
+            int32 arrayLength; \
+            int32 stringLength; \
+            wchar_t chars[sizeof(v)]; \
+        }; \
+        Class_System_String string; \
+    }; \
+} s = { \
+    {}, \
+    (Class_System_VTable *)&Class_System_String::_vtable, \
+    sizeof(v), \
+    sizeof(v) - 1, \
+    L##v \
+}
+
+#endif // SINGULARITY_PROCESS
+
+//////////////////////////////////////////////////////////////////////////////
+
+#if     DEBUG
+
+#if SINGULARITY_KERNEL
+extern void fail_assert(const char *expr);
+#define __fail_assert(expr, file, line) fail_assert("assert(" #expr ") failed at " file ":" #line)
+#define Assert(expr) { if (!(expr)) { __fail_assert(expr, __FILE__, __LINE__); } }
+#elif SINGULARITY_PROCESS
+extern void fail_assert(Class_System_String *message);
+#define Assert(expr) { if (!(expr)) { static MAKE_STRING(msg, "assert(" #expr ") failed at " __FILE__ ":" __LINE__); fail_assert(&msg.string); } }
+#endif // SINGULARITY_KERNEL
+
+#else //DEBUG
+#define Assert(expr) { 0; }
+#endif//DEBUG
+
+#pragma warning(disable: 4201)  // Allow nameless struct/union
+#pragma warning(disable:4127)   // 4127: warning about constant conditional
+
+#define EXCEPTION_ACCESS_VIOLATION      1
+#define EXCEPTION_CONTINUE_EXECUTION    2
+#define EXCEPTION_CONTINUE_SEARCH       3
+#define EXCEPTION_FLT_DIVIDE_BY_ZERO    4
+#define EXCEPTION_INT_DIVIDE_BY_ZERO    5
+#define EXCEPTION_INT_OVERFLOW          6
+#define EXCEPTION_STACK_OVERFLOW        7
+
+//////////////////////////////////////////////////////////////////////////////
+
+// Used to pass various data through "int 29"
+struct KdDebugTrapData
+{
+    enum Tag
+    {
+        FIRST_CHANCE_EXCEPTION,
+        LOADED_BINARY,
+        UNLOADED_BINARY
+    } tag;
+    union
+    {
+        struct
+        {
+            uintptr throwAddr;
+        } firstChanceException;
+        struct
+        {
+            UIntPtr baseAddress;
+            UIntPtr bytes;
+            UIntPtr name;
+            uint32 checksum;
+            uint32 timestamp;
+            bool silent;
+            bool ret;
+        } loadedBinary;
+        struct
+        {
+            UIntPtr baseAddress;
+            bool silent;
+            bool ret;
+        } unloadedBinary;
+    } u;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#pragma warning(disable: 4103)
+#pragma pack(push, 4)
+#include "halclass.h"
+#pragma pack(pop)
+
+#if SINGULARITY_KERNEL
+extern const Struct_Microsoft_Singularity_BootInfo *g_pBootInfo;
+#endif // SINGULARITY_KERNEL
+
+//////////////////////////////////////////////////////////////////////////////
+//
+struct ClassVector : Class_System_Object
+{
+    uint32          length;
+};
+
+struct ClassVector_uint8 : ClassVector
+{
+    static struct Class_System_VTable ClassVector_uint8::_vtable;
+
+    uint8           values[1];
+};
+
+struct ClassVector_ClassVector_uint8 : ClassVector
+{
+    static struct Class_System_VTable ClassVector_ClassVector_uint8::_vtable;
+
+    ClassVector_uint8 * values[1];
+};
+
+struct ClassVector_bartok_char : ClassVector
+{
+    static struct Class_System_VTable ClassVector_bartok_char::_vtable;
+
+    bartok_char     values[1];
+};
+
+
+// Routine to read Pentium time stamp counter
+_inline _declspec( naked ) UINT64 RDTSC()
+{
+    __asm {
+        rdtsc;
+        ret;
+    }
+}
+
+_inline _declspec(naked) UINT32 DisableInterrupts()
+{
+    __asm {
+        pushfd;
+        pop eax;
+        cli;
+        ret;
+    }
+}
+
+_inline _declspec(naked) void EnableInterrupts()
+{
+    __asm {
+        sti;
+        ret;
+    }
+}
+
+_inline void RestoreInterrupts(UINT32 fd)
+{
+    if ((fd & Struct_Microsoft_Singularity_X86_EFlags_IF) != 0) {
+        __asm sti;
+    }
+}
+
+/////////////////////////////////////////////////////// Interlocked Intrinsics.
+//
+
+#define InterlockedIncrement              _InterlockedIncrement
+#define InterlockedDecrement              _InterlockedDecrement
+#define InterlockedExchange               _InterlockedExchange
+#define InterlockedExchangeAdd            _InterlockedExchangeAdd
+#define InterlockedCompareExchange        _InterlockedCompareExchange
+
+extern "C"
+{
+
+INT32
+__cdecl
+InterlockedIncrement(
+    INT32 volatile *lpAddend
+    );
+
+INT32
+__cdecl
+InterlockedDecrement(
+    INT32 volatile *lpAddend
+    );
+
+INT32
+__cdecl
+InterlockedExchange(
+    INT32 volatile *Target,
+    INT32 Value
+    );
+
+INT32
+__cdecl
+InterlockedExchangeAdd(
+    INT32 volatile *Addend,
+    INT32 Value
+    );
+
+INT32
+__cdecl
+InterlockedCompareExchange (
+    INT32 volatile *Destination,
+    INT32 ExChange,
+    INT32 Comperand
+    );
+
+#pragma intrinsic(_InterlockedIncrement)
+#pragma intrinsic(_InterlockedDecrement)
+#pragma intrinsic(_InterlockedExchange)
+#pragma intrinsic(_InterlockedExchangeAdd)
+#pragma intrinsic(_InterlockedCompareExchange)
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#define arrayof(a)      (sizeof(a)/sizeof(a[0]))
+#define offsetof(s,m)   (size_t)&(((s *)0)->m)
+
+#pragma warning(disable: 4100)  // allow unreferenced formal parameters
+
+#endif // __hal_h_
+
+//
+////////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/hal.inc b/base/Kernel/Native/hal.inc
new file mode 100644
index 0000000..f0d33c7
--- /dev/null
+++ b/base/Kernel/Native/hal.inc
@@ -0,0 +1,96 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+; Include file for assembly files.
+;
+
+;ASSUME  DS:FLAT, ES:FLAT, SS:FLAT, FS:NOTHING, GS:NOTHING
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+SINGLE_THREADED          equ 0
+EXCLUDED                 equ 0
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;  Typedefs & Constants
+;
+UINT8  TYPEDEF BYTE
+UINT16 TYPEDEF WORD
+UINT32 TYPEDEF DWORD
+UINT64 TYPEDEF QWORD
+UINT128 STRUCT 16
+        _lo             UINT64          ?
+        _hi             UINT64          ?
+UINT128 ENDS
+
+;
+X86_EFLAG_IF            equ     0200h
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;  Bartok Types
+;
+
+uint8 TYPEDEF BYTE
+uint16 TYPEDEF WORD
+uint32 TYPEDEF DWORD
+uint64 TYPEDEF QWORD
+
+int8 TYPEDEF BYTE
+int16 TYPEDEF WORD
+int32 TYPEDEF DWORD
+int64 TYPEDEF QWORD
+
+bool TYPEDEF BYTE
+bartok_char TYPEDEF WORD
+
+intptr TYPEDEF DWORD
+uintptr TYPEDEF DWORD
+
+uintPtr STRUCT 4
+        value  uintptr ?
+uintPtr ENDS
+
+intPtr STRUCT 4
+        value  intptr ?
+intPtr ENDS
+
+PTR_uintptr TYPEDEF PTR uintptr
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+
+include halclass.inc
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Macros
+;
+
+; define CurrentThread() function as a macro.
+CurrentThread MACRO reg
+        mov  reg,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        mov  reg,[reg].Struct_Microsoft_Singularity_X86_ThreadContext.__thread
+        ENDM
+
+CurrentThreadContext MACRO reg
+        mov  reg,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        ENDM
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Big/Little Endian Definitions for Long Integers
+;
+
+ifdef   bigend                  ; Big Endian (hi word at low address)
+LOWORD  equ     [4]
+HIWORD  equ     [0]
+else                            ; Little Endian (low word at low address)
+LOWORD  equ     [0]
+HIWORD  equ     [4]
+endif
+
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; End of File.
diff --git a/base/Kernel/Native/halasm.asm b/base/Kernel/Native/halasm.asm
new file mode 100644
index 0000000..6424ea6
--- /dev/null
+++ b/base/Kernel/Native/halasm.asm
@@ -0,0 +1,1470 @@
+; 
+; Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+
+ifdef SINGULARITY
+.686p
+.mmx
+.xmm
+else ;; SINGULARITY
+.686
+endif ;; SINGULARITY
+
+.model flat
+.code
+
+ifdef SINGULARITY
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+else ;; SINGULARITY
+EXCLUDED equ 0
+SINGLE_THREADED equ 0
+endif ;; SINGULARITY
+
+include hal.inc
+
+externdef __throwDispatcher:NEAR
+externdef __throwDispatcherExplicitAddrAfter:NEAR
+externdef ?ExceptionTableLookup@@YI_KPAUClass_System_Exception@@I@Z:NEAR
+
+ifndef SINGULARITY
+externdef ?ResetGuardPage@@YIXXZ:NEAR
+endif ;; !SINGULARITY
+
+ifdef SINGULARITY_KERNEL
+externdef ?g_setStopContext@Class_System_Threading_Thread@@SIXPAU1@PAUClass_System_Exception@@@Z:NEAR
+externdef __throwBeyondMarker:NEAR
+endif ; SINGULARITY_KERNEL
+
+externdef __throwDivideByZeroException:NEAR
+externdef __throwNullPointerException:NEAR
+externdef __throwOverflowException:NEAR
+externdef __throwStackOverflowException:NEAR
+
+ifndef SINGULARITY
+externdef ?g_throwNewOverflowException@Class_System_VTable@@SIXXZ:NEAR
+externdef ?c_CheckCount@Class_System_GCs_StackManager@@2HA:int32
+externdef ?g_GetStackChunk@Class_System_GCs_StackManager@@SIPAUuintPtr@@PAU2@PAUClass_System_Threading_Thread@@_N@Z:NEAR
+externdef ?g_ReturnStackChunk@Class_System_GCs_StackManager@@SIXPAUClass_System_Threading_Thread@@_N@Z:NEAR
+;
+; externals used to construct instances of machine-level exceptions
+;
+
+externdef ?g_AllocateObject@Class_System_GC@@SIPAUClass_System_Object@@PAUClass_System_VTable@@@Z:NEAR
+externdef ?m__ctor@Class_System_ArithmeticException@@SIXPAU1@@Z:NEAR
+externdef ??_7System_ArithmeticException@@6B@:dword ; vtable
+externdef ?m__ctor@Class_System_DivideByZeroException@@SIXPAU1@@Z:NEAR
+externdef ??_7System_DivideByZeroException@@6B@:dword ; vtable
+externdef ?m__ctor@Class_System_NullReferenceException@@SIXPAU1@@Z:NEAR
+externdef ??_7System_NullReferenceException@@6B@:dword ;  vtable
+externdef ?m__ctor@Class_System_OverflowException@@SIXPAU1@@Z:NEAR
+externdef ??_7System_OverflowException@@6B@:dword ; vtable
+externdef ?m__ctor@Class_System_StackOverflowException@@SIXPAU1@@Z:NEAR
+externdef ??_7System_StackOverflowException@@6B@:PTR_Class_System_VTable
+
+externdef ?c_allocationInhibitGC@Class_System_GC@@2_NA:dword
+
+externdef ?g_doubleToInt@Class_System_VTable@@SIHN@Z:NEAR
+externdef ?g_doubleToLong@Class_System_VTable@@SI_JN@Z:NEAR
+externdef ?g_floatToInt@Class_System_VTable@@SIHM@Z:NEAR
+externdef ?g_floatToLong@Class_System_VTable@@SI_JM@Z:NEAR
+externdef ?g_checkedDoubleToInt@Class_System_VTable@@SIHN@Z:NEAR
+externdef ?g_checkedDoubleToLong@Class_System_VTable@@SI_JN@Z:NEAR
+externdef ?g_checkedFloatToInt@Class_System_VTable@@SIHM@Z:NEAR
+externdef ?g_checkedFloatToLong@Class_System_VTable@@SI_JM@Z:NEAR
+endif ;; !SINGULARITY
+
+if EXCLUDED
+externdef __checkFPStackDepth0:NEAR
+externdef __checkFPStackDepth1:NEAR
+externdef __checkFPStackDepth2:NEAR
+externdef __checkFPStackDepth3:NEAR
+externdef __checkFPStackDepth4:NEAR
+externdef __checkFPStackDepth5:NEAR
+externdef __checkFPStackDepth6:NEAR
+externdef __checkFPStackDepth7:NEAR
+endif ;; EXCLUDED
+
+        align       8
+$DBLMAXINT  DQ      041dfffffffc00000r          ; 2.14747e+009
+$DBLMININT  DQ      0c1e0000000000000r          ; -2.14748e+009
+$MAXLONG    DQ      07fffffffffffffffh
+$MINLONG    DQ      08000000000000000h
+
+;
+;  __throwDispatcher(ecx=exception)
+; 
+; Description: this function is called to explicitly throw an exception.
+; It assumes that the return address points to the instruction immediately
+; after the one where the exception was thrown
+;
+; Arguments:
+;    ecx = exception object
+;    [esp] = the return address
+; Effects:
+;    1. Create ebp chain entry
+;    2. Get return address and uses it to calculate the address of the 
+;       instruction that threw the exception.
+;    3. Looks up the appropriate handler and jumps to code to process it.
+
+align 16
+
+__throwDispatcher proc
+        push        ebp          ; create ebp chain entry
+        mov         ebp, esp     ; set new ebp
+        mov         edx, [ebp+4] ; get return address
+        push        ecx       ; save exception
+        sub         edx, 1    ; adjust to point to throw location
+        call        ?ExceptionTableLookup@@YI_KPAUClass_System_Exception@@I@Z
+        pop         ecx  ; restore exception
+        pop         ebp       ; remove ebp chain
+        add         esp, 4    ; remove eip from the stack
+;        mov        edx is already ok
+        jmp         __throwDispatcherHandler
+__throwDispatcher endp
+
+;
+;  __throwDispatcherExplicitAddr (ecx=exception, edx=throwAddress)
+;
+; Description:
+; This is to be used when the address where the exception occurred
+; is passed in as an extra argument
+;
+; Arguments:
+;    ecx = exception object
+;    edx = address where the exception was thrown
+;
+
+
+align 16
+__throwDispatcherExplicitAddr proc
+        push        ecx  ; save exception
+        call        ?ExceptionTableLookup@@YI_KPAUClass_System_Exception@@I@Z
+        pop         ecx  ; restore exception
+;        mov         edx is already ok
+        jmp         __throwDispatcherHandler
+__throwDispatcherExplicitAddr endp
+
+;
+;  __throwDispatcherExplictAddrAfter (ecx=exception, edx=throwAddress)
+;
+; Description:
+;    This is to be used when the address of the instruction immediately after
+;    the one that actually threw the exception is passed as an argument.
+;
+; Arguments:
+;    ecx = pointer to exception object being thrown
+;    edx = address of the instruction following the one where
+;          the exception was thrown
+;
+; This is used, for example, in stack unwinding, where edx is the
+; return address on the stack for the current procedure. 
+;
+; Stack unwinding occurs when the current procedure does not have a handler
+; for the routine.   The idea is to pop the stack frame and treat the call
+; instruction in the caller as though it threw.    We only have the return
+; address, though, which points to the instruction *after* the call.   
+;
+
+align 16
+__throwDispatcherExplicitAddrAfter proc
+ifdef SINGULARITY
+        push        ecx
+        push        edx
+        mov         ecx, edx
+        call        ?g_IsUnlinkStack@Class_System_Exception@@SI_NPAUuintPtr@@@Z
+        pop         edx
+        pop         ecx
+        test        al, al      
+        je          normal
+        mov         eax, ecx                       ; save exception type
+        mov         ecx, edx            
+        mov         edx, [ebp+4]                   ; save the return addr in caller
+        mov         [ebp+4], afterUnlinkStack      ; override return addr to instr after
+        jmp         ecx                            ; unlink stack which saves eax, edx
+afterUnlinkStack:      
+        mov         ecx, eax                       ; restore return addr in caller
+normal:
+        ; Have we reached a kernel->process or process->kernel boundary?
+        ; Call Exception.CheckKernelProcessBoundary(esp, ebp, exception)
+        push        ecx
+        push        edx
+        push        ecx      ; arg 3 (exception)
+        mov         ecx, esp ; arg 2 (ebp)
+        mov         edx, ebp ; arg 1 (esp)
+        call        ?g_CheckKernelProcessBoundary@Class_System_Threading_Thread@@SIPAUuintPtr@@PAU2@0PAUClass_System_Exception@@@Z
+        pop         edx
+        pop         ecx
+        ; A non-zero return value means we reached a boundary.
+        test        eax, eax      
+        jz          normal2
+ifdef SINGULARITY_PROCESS
+        ;; The process's exception reached the kernel's frames.
+        ; Return gracefully to the kernel (i.e. jump to the kernel's
+        ;   return address), and the kernel's popStackMark
+        ;   will check uncaughtFlag and throw a new exception.
+        jmp edx
+endif ; SINGULARITY_PROCESS
+ifdef SINGULARITY_KERNEL
+; There are 3 control paths that merge here:
+;  (1) When Thread.cs stops a process mode thread, it sets eip to point here.
+;  (2) When Thread.cs stops a blocked kernel thread, it sets eip to point here.
+;  (3) The stack unwinder falls through to this case when a kernel exception
+;      reaches a process's frames.
+; For control path (3), a finally block puts us in a GC safe state
+; just before we reach here.
+; We also expect to be in the GC safe state most of the
+; time for control paths (1) and (2), but
+; because pushStackMark and popStackMark are not atomic operations,
+; we cannot be 100% sure that we're in the GC safe state.
+;   eax: kernel->process or kernel->kernel marker
+;   ecx: exception
+__throwBeyondMarker LABEL NEAR
+        push ecx
+        push eax
+        ; Leave the GC safe state (if we're actually in it)
+        call ?g_RestoreMutatorControlIfNeeded@Class_System_GCs_Transitions@@SIXXZ
+        pop eax
+        pop ecx
+;   eax: kernel->process or kernel->kernel marker
+;   ecx: exception
+        ; Restore state from the marker, skipping over any intermediate frames.
+        ; Keep the original exception in ecx.
+        ; Get the return address for the frame beyond the marker into edx:
+        mov         edx, dword ptr [eax].Struct_System_GCs_CallStack_TransitionRecord._stackBottom
+        mov         edx, dword ptr [edx - 4]
+        ; Free any stack segments that we skipped over:
+        push        eax
+        push        ecx
+        push        edx
+        mov         ecx, eax ; arg 1 (marker)
+        call        ?g_DiscardSkippedStackSegments@Class_System_Threading_Thread@@SIXPAUStruct_System_GCs_CallStack_TransitionRecord@@@Z
+        pop         edx
+        pop         ecx
+        pop         eax
+        ; Restore the kernel's ebx, edi, esi from the marker:
+        mov         ebx, dword ptr [eax].Struct_System_GCs_CallStack_TransitionRecord._EBX
+        mov         edi, dword ptr [eax].Struct_System_GCs_CallStack_TransitionRecord._EDI
+        mov         esi, dword ptr [eax].Struct_System_GCs_CallStack_TransitionRecord._ESI
+        ; Restore the kernel's esp, ebp from the kernel->process marker:
+        mov         ebp, dword ptr [eax].Struct_System_GCs_CallStack_TransitionRecord._EBP
+        mov         esp, dword ptr [eax].Struct_System_GCs_CallStack_TransitionRecord._stackBottom
+endif ; SINGULARITY_KERNEL
+normal2:
+endif
+	push        ecx  ;  save exception
+        dec         edx
+        call        ?ExceptionTableLookup@@YI_KPAUClass_System_Exception@@I@Z
+        pop         ecx  ; restore exception
+;        mov         edx is already ok
+        jmp         __throwDispatcherHandler
+__throwDispatcherExplicitAddrAfter endp
+
+;  __throwDispatcherHandler (eax=frameSetupInfo or exceptionType,
+;                            ecx=exception,
+;                            edx=spillSize,frameSetupSize, or handlerAddress
+;
+; Description:
+;    After the exception table entry has been found, the values are passed here
+;    for processing.  This method simply checks for the easy case of an explicit
+;    handler (known if the exceptionType is given <-- low bit is zero).
+;    In this case it simply jumps to the handler.  Otherwise it passes the
+;    information along to __throwDispatcherUnwind.
+;
+; Arguments:
+;    If low bit of eax is set:
+;        eax = frame setup information
+;        ecx = exception object
+;        edx = spill size excluding callee-save register saves
+;              or offset from ebp to end of callee-save register saves
+;    Otherwise:
+;        eax = exception type (unused)
+;        ecx = exception object
+;        edx = handler address
+
+align 16
+__throwDispatcherHandler proc
+        test        eax, 1
+        jne         __throwDispatcherUnwind
+        ;; ecx=exception, edx=handler
+        jmp         edx
+__throwDispatcherHandler endp
+
+;  __throwDispatcherUnwind (eax=frame setup info, ecx=exception, edx=spill size
+;
+; Description:
+;    This is the global unwind handler.  It is used to unwind a single stack
+;    frame if there are no explicit handlers that catch an exception in a given
+;    function.
+;
+; Arguments:
+;    eax = frame setup information, must have low bit set
+;    ecx = exception object
+;    edx = spill size excluding callee-save register saves
+;          or offset from ebp to end of callee-save register saves
+;
+; See tables\ExceptionTable.cs for details on these values
+
+align 16
+__throwDispatcherUnwind proc
+        ;; eax=frame info
+        ;; edx=spill size
+
+        ;; obviously ebp isn't useful under frame pointer omission
+        ;; but less obviously esp may be invalid if ebp is good
+        ;; (e.g. under varargs we may not have known how many arguments to
+        ;; pop; this is one reason why varargs turns off frame pointer omission)
+        test        eax, 2h
+        jne         esp_is_good
+        ;; ebp_is_good
+        add         edx, ebp
+        mov         esp, edx
+        jmp         esp_is_setup
+esp_is_good:
+        ;; pop spill slots
+        add         esp, edx
+
+esp_is_setup:
+
+        ;; restore callee-saves and pop values from stack
+        ;; (excludes ebp if used as the frame pointer)
+        test        eax, 4h
+        je          skip_edi_restore
+        ;; restore edi
+        pop         edi
+skip_edi_restore:
+        test        eax, 8h
+        je          skip_esi_restore
+        ;; restore esi
+        pop         esi
+skip_esi_restore:
+        test        eax, 10h
+        je          skip_ebp_restore
+        ;; restore ebp
+        pop         ebp
+skip_ebp_restore:
+        test        eax, 20h
+        je          skip_ebx_restore
+        ;; restore ebx
+        pop         ebx
+skip_ebx_restore:
+
+        test        eax, 40h
+        je          skip_jump_transition_record
+        ;; jump over transition record
+        add         esp, (SIZE Struct_System_GCs_CallStack_TransitionRecord)
+skip_jump_transition_record:
+
+        ;; restore ebp if it was used as the frame pointer
+        test        eax, 2h
+        jne         skip_frame_pointer_restore
+        ;; restore frame pointer (esp == ebp already)
+        pop         ebp
+skip_frame_pointer_restore:
+
+        ;; set edx=return address
+        pop         edx
+
+        ;; pop arguments
+        shr         eax, 16
+        add         esp, eax
+
+        ;; At this point
+        ;; ecx=exception, edx=return address
+        ;; esi/edi/ebx/ebp/esp have been restored
+        ;; eax is scratch
+
+        ;; set up next handler search
+        jmp         __throwDispatcherExplicitAddrAfter
+__throwDispatcherUnwind endp
+
+; 
+; __throwDivideByZeroException: instantiate an divide-by-zero exception
+; and throw it.
+;
+; Assumes edx points to the address after the one that threw.
+;
+
+align 16
+__throwDivideByZeroException proc
+        push ebx
+        push esi
+        mov ebx,edx  ; save address
+if SINGLE_THREADED
+        inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; SINGLE_THREADED
+        mov ecx,offset ??_7System_DivideByZeroException@@6B@
+        call ?g_AllocateObject@Class_System_GC@@SIPAUClass_System_Object@@PAUClass_System_VTable@@@Z
+        mov esi,eax  ; save pointer to instance of exception
+        mov ecx,eax  ; initialize instance
+        call ?m__ctor@Class_System_DivideByZeroException@@SIXPAU1@@Z
+if SINGLE_THREADED
+        dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; SINGLE_THREADED
+        mov ecx,esi
+        mov edx,ebx
+        pop esi
+        pop ebx
+        jmp __throwDispatcherExplicitAddr
+__throwDivideByZeroException endp
+
+; 
+; __throwStackOverflowException: instantiate an StackOverflow exception
+; and throw it.
+;
+; Assumes edx points to the address of the instruction that faulted
+;
+
+align 16
+__throwStackOverflowException proc
+        push ebx
+        push esi
+        mov ebx,edx  ; save address
+if SINGLE_THREADED
+        inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; MULTI_THREADED
+        mov ecx,offset ??_7System_StackOverflowException@@6B@
+        call ?g_AllocateObject@Class_System_GC@@SIPAUClass_System_Object@@PAUClass_System_VTable@@@Z
+        mov esi,eax  ; save pointer to instance of exception
+        mov ecx,eax  ; initialize instance
+        call ?m__ctor@Class_System_StackOverflowException@@SIXPAU1@@Z
+if SINGLE_THREADED
+        dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; MULTI_THREADED
+        mov ecx,esi
+        mov edx,ebx
+        call ?ExceptionTableLookup@@YI_KPAUClass_System_Exception@@I@Z
+ifndef SINGULARITY
+        push esi
+        push edx
+        call ?ResetGuardPage@@YIXXZ
+        pop edx
+        pop eax
+endif
+        pop esi
+        pop ebx
+        mov ecx,eax
+;        mov edx is already ok
+        jmp edx
+__throwStackOverflowException endp
+
+; 
+; __throwNullReferenceException: instantiate an NullReference exception
+; and throw it.
+;
+; Assumes edx points to the address of the instruction that faulted
+;
+
+align 16
+__throwNullReferenceException proc
+        push ebx
+        push esi
+        mov ebx,edx  ; save address
+if SINGLE_THREADED
+        inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; SINGLE_THREADED
+        mov ecx,offset ??_7System_NullReferenceException@@6B@
+        call ?g_AllocateObject@Class_System_GC@@SIPAUClass_System_Object@@PAUClass_System_VTable@@@Z
+        mov esi,eax  ; save pointer to instance of exception
+        mov ecx,eax  ; initialize instance
+        call ?m__ctor@Class_System_NullReferenceException@@SIXPAU1@@Z
+if SINGLE_THREADED
+        dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; SINGLE_THREADED
+        mov ecx,esi
+        mov edx,ebx
+        pop esi
+        pop ebx
+        jmp __throwDispatcherExplicitAddr
+__throwNullReferenceException endp
+
+; 
+; __throwDivideByZeroException: instantiate an divide-by-zero exception
+; and throw it.
+;
+; Assumes edx points to the address of the instruction that faulted
+;
+
+align 16
+__throwOverflowException proc
+        push ebx
+        push esi
+        mov ebx,edx  ; save address
+if SINGLE_THREADED
+        inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock inc ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; SINGLE_THREADED
+        mov ecx,offset ??_7System_OverflowException@@6B@
+        call ?g_AllocateObject@Class_System_GC@@SIPAUClass_System_Object@@PAUClass_System_VTable@@@Z
+        mov esi,eax  ; save pointer to instance of exception
+        mov ecx,eax  ; initialize instance
+        call ?m__ctor@Class_System_OverflowException@@SIXPAU1@@Z
+if SINGLE_THREADED
+        dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+else ; SINGLE_THREADED
+        lock dec ?c_allocationInhibitGC@Class_System_GC@@2_NA
+endif ; SINGLE_THREADED
+        mov ecx,esi
+        mov edx,ebx
+        pop esi
+        pop ebx
+        jmp __throwDispatcherExplicitAddr
+__throwOverflowException endp
+
+ifdef SINGULARITY_KERNEL
+;
+;  void Thread.setStopContext(Thread t, Exception exn)
+;
+
+align 16
+?g_setStopContext@Class_System_Threading_Thread@@SIXPAU1@PAUClass_System_Exception@@@Z proc
+        ; ecx = ecx.context
+        add ecx, Class_System_Threading_Thread._context
+        ; context.eip = __throwBeyondMarker
+        ; context.ecx = processStopException
+        ; context.eax = context.stackMarkers
+        mov     [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._eip, __throwBeyondMarker
+        mov     [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._ecx, edx
+        mov     eax, [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers
+        mov     [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._eax, eax
+        ret
+?g_setStopContext@Class_System_Threading_Thread@@SIXPAU1@PAUClass_System_Exception@@@Z endp
+
+endif ; SINGULARITY_KERNEL
+
+;
+;  int System.VTable.doubleToInt(double)
+;
+
+align 16
+?g_doubleToInt@Class_System_VTable@@SIHN@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-8
+        fld         real8 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       dword ptr [ebp-8]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-8]
+
+        cmp         eax,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         8
+
+possible_overflow:
+        fld         real8 ptr [ebp+8]
+        fcomp       real8 ptr $DBLMAXINT
+        fnstsw      ax
+        test        ah,4
+        jne         short return_zero
+        test        ah,1
+        jne         short return_MININT
+
+return_MAXINT:
+        mov         eax, 07fffffffh
+        jmp         short return
+
+return_zero:
+        xor         eax, eax
+        jmp         short return
+
+return_MININT:
+        mov         eax, 080000000h
+        jmp         short return
+
+?g_doubleToInt@Class_System_VTable@@SIHN@Z endp
+
+;
+;  long System.VTable.doubleToLong(double)
+;
+
+align 16
+?g_doubleToLong@Class_System_VTable@@SI_JN@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-12
+        fld         real8 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       qword ptr [ebp-12]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-12]
+        mov         edx,dword ptr [ebp-8]
+
+        cmp         edx,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         8
+
+possible_overflow:
+        mov         edx,eax                    ; save lsw
+        fld         real8 ptr [ebp+8]
+        fild        qword ptr $MAXLONG
+        fcompp
+        fnstsw      ax
+        test        ah,4
+        jne         short return_zero
+        test        ah,65
+        je          short check_MINLONG
+
+return_MAXLONG:
+        mov         eax, 0ffffffffh
+        mov         edx, 07fffffffh
+        jmp         short return
+
+return_zero:
+        xor         eax, eax
+        xor         edx, edx
+        jmp         short return
+
+check_MINLONG:
+        fld         real8 ptr [ebp+8]
+        fild        qword ptr $MINLONG
+        fcompp
+        fnstsw      ax
+        test        ah,1
+        jne         short return_original
+
+return_MINLONG:
+        xor         edx, edx                   ; zero lsw
+
+return_original:
+        mov         eax, edx                   ; restore lsw to eax
+        mov         edx, 080000000h
+        jmp         short return
+
+?g_doubleToLong@Class_System_VTable@@SI_JN@Z endp
+
+;
+;  int System.VTable.floatToInt(float)
+;
+
+align 16
+?g_floatToInt@Class_System_VTable@@SIHM@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-8
+        fld         real4 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        xor         eax,eax
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       dword ptr [ebp-8]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-8]
+
+        cmp         eax,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         4
+
+possible_overflow:
+        fld         real4 ptr [ebp+8]
+        fcomp       real8 ptr $DBLMAXINT
+        fnstsw      ax
+        test        ah,4
+        jne         short return_zero
+        test        ah,1
+        jne         short return_MININT
+        mov         eax, 07fffffffh
+        jmp         short return
+
+return_zero:        
+        xor         eax, eax
+        jmp         short return
+
+return_MININT:
+        mov         eax, 080000000h
+        jmp         short return
+
+?g_floatToInt@Class_System_VTable@@SIHM@Z endp
+
+;
+;  long System.VTable.floatToLong(float)
+;
+
+align 16
+?g_floatToLong@Class_System_VTable@@SI_JM@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-12
+        fld         real4 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       qword ptr [ebp-12]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-12]
+        mov         edx,dword ptr [ebp-8]
+
+        cmp         edx,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         4
+
+possible_overflow:
+        mov         edx,eax                    ; save lsw
+        fld         real4 ptr [ebp+8]
+        fild        qword ptr $MAXLONG
+        fcompp
+        fnstsw      ax
+        test        ah,4                                        
+        jne         short return_zero
+        test        ah,65
+        je          short check_MINLONG
+
+return_MAXLONG:
+        mov         eax, 0ffffffffh
+        mov         edx, 07fffffffh
+        jmp         short return
+
+return_zero:
+        xor         eax, eax
+        xor         edx, edx
+        jmp         short return
+
+check_MINLONG:
+        fld         real4 ptr [ebp+8]
+        fild        qword ptr $MINLONG
+        fcompp
+        fnstsw      ax
+        test        ah,1
+        jne         short return_original
+
+return_MINLONG:
+        xor         edx, edx                   ; zero lsw
+
+return_original:
+        mov         eax, edx                   ; restore lsw to eax
+        mov         edx, 080000000h
+        jmp         short return
+
+?g_floatToLong@Class_System_VTable@@SI_JM@Z endp
+
+;
+;  int System.VTable.checkedDoubleToInt(double)
+;
+
+align 16
+?g_checkedDoubleToInt@Class_System_VTable@@SIHN@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-8
+        fld         real8 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       dword ptr [ebp-8]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-8]
+
+        cmp         eax,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         8
+
+possible_overflow:
+        fld         real8 ptr [ebp+8]
+        fcomp       real8 ptr $DBLMAXINT
+        fnstsw      ax
+        test        ah,4                    ; test for unordered
+        jne         short throw_exception
+        test        ah,1                    ; test for <$DBLMAXINT
+        jne         short return_MININT
+        ; src > $DBLMAXINT
+        ; throw an overflow exception
+        jmp         short throw_exception
+        
+return_MININT:
+        ; check against $DBLMININT
+        fld         real8 ptr [ebp+8]
+        fcomp       real8 ptr $DBLMININT
+        fnstsw      ax
+        test        ah, 1                       ; test for < $DBLMININT
+        jne         short throw_exception ; throw exception if true 
+        mov         eax, 080000000h
+        jmp         short return
+        
+throw_exception:
+        ; throw an overflow exception
+        ; set up stack frame so that it looks like a call to throwNewOverflowException
+        ; from the caller of this function.
+        mov         esp,ebp
+        pop         ebp
+        pop         eax       ; grab return address
+        add         esp, 4    ; move esp pass the first parameter.
+        mov         [esp],eax ; overwrite argument
+        jmp         ?g_throwNewOverflowException@Class_System_VTable@@SIXXZ    
+
+?g_checkedDoubleToInt@Class_System_VTable@@SIHN@Z endp
+
+;
+;  long System.VTable.checkedDoubleToLong(double)
+;
+
+align 16
+?g_checkedDoubleToLong@Class_System_VTable@@SI_JN@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-12
+        fld         real8 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       qword ptr [ebp-12]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-12]
+        mov         edx,dword ptr [ebp-8]
+
+        cmp         edx,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         8
+
+possible_overflow:
+        mov         edx,eax                    ; save lsw
+        fld         real8 ptr [ebp+8]
+        fild        qword ptr $MAXLONG
+        fcompp
+        fnstsw      ax
+        test        ah,4                       ; test for unordered
+        jne         short return_zero
+        test        ah,65                      ; test for <= $MAXLONG
+        je          short check_MINLONG
+
+return_MAXLONG:
+        ; src > $MAXLONG
+        ; throw an exception
+        jmp         short throw_exception
+
+return_zero:
+        jmp         short throw_exception
+
+check_MINLONG:
+        ; src <= $MINLONG
+        fild        qword ptr $MINLONG
+        fld         real8 ptr [ebp+8]
+        fcompp                       ; real8 ptr [ebp+8] < $MINLONG
+        fnstsw      ax
+        test        ah,1
+        jne         short throw_exception
+        
+return_MINLONG:
+        mov         eax, edx                   ; restore lsw to eax
+        mov         edx, 080000000h
+        jmp         short return
+        
+
+throw_exception:
+        ; throw an overflow exception
+        ; set up stack frame so that it looks like a call to throwNewOverflowException
+        ; from the caller of this function.
+        mov         esp,ebp
+        pop         ebp
+        pop         eax       ; grab return address
+        add         esp, 4    ; move esp pass the first parameter.
+        mov         [esp],eax ; overwrite argument
+        jmp         ?g_throwNewOverflowException@Class_System_VTable@@SIXXZ
+       
+?g_checkedDoubleToLong@Class_System_VTable@@SI_JN@Z endp
+
+;
+;  int System.VTable.checkedFloatToInt(float)
+;
+
+align 16
+?g_checkedFloatToInt@Class_System_VTable@@SIHM@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-8
+        fld         real4 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        xor         eax,eax
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       dword ptr [ebp-8]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-8]
+
+        cmp         eax,080000000h
+        je          possible_overflow
+
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         4
+
+possible_overflow:
+        fld         real4 ptr [ebp+8]
+        fcomp       real8 ptr $DBLMAXINT
+        fnstsw      ax
+        test        ah,4                        ; test for unordered
+        jne         short throw_exception
+        test        ah,1                        ; test for src < $DBLMAXINT
+        jne         short return_MININT
+        ; src > $DBLMAXINT
+        ; throw an overflow exception
+        jmp         short throw_exception
+
+return_MININT:
+        ; need to check against $DBLMININT, if it is less than,
+        ; then throw an overflow exception
+        fld         real4 ptr [ebp+8]
+        fcomp       real8 ptr $DBLMININT
+        fnstsw      ax
+        test        ah,1                        ; test for less than
+        jne         short throw_exception       
+        mov         eax, 080000000h
+        jmp         short return
+
+throw_exception:
+        ; throw an overflow exception
+        ; set up stack frame so that it looks like a call to throwNewOverflowException
+        ; from the caller of this function.
+        mov         esp,ebp
+        pop         ebp
+        pop         eax       ; grab return address
+        mov         [esp],eax ; overwrite argument
+        jmp         ?g_throwNewOverflowException@Class_System_VTable@@SIXXZ
+
+?g_checkedFloatToInt@Class_System_VTable@@SIHM@Z endp
+
+;
+;  long System.VTable.checkedFloatToLong(float)
+;
+
+align 16
+?g_checkedFloatToLong@Class_System_VTable@@SI_JM@Z proc
+        push        ebp
+        mov         ebp,esp
+        add         esp,-12
+        fld         real4 ptr [ebp+8]
+        wait
+        fnstcw      word ptr [ebp-2]
+        wait
+        mov         ax,word ptr [ebp-2]
+        or          eax,0C00h
+        mov         word ptr [ebp-4],ax
+        fldcw       word ptr [ebp-4]
+        fistp       qword ptr [ebp-12]
+        fldcw       word ptr [ebp-2]
+        mov         eax,dword ptr [ebp-12]
+        mov         edx,dword ptr [ebp-8]
+
+        cmp         edx,080000000h
+        je          possible_overflow
+return:
+        mov         esp,ebp
+        pop         ebp
+        ret         4
+
+possible_overflow:
+        mov         edx,eax                    ; save lsw
+        fld         real4 ptr [ebp+8]
+        fild        qword ptr $MAXLONG
+        fcompp
+        fnstsw      ax
+        test        ah,4                        ; test for unordered
+        jne         short return_zero
+        test        ah,65                       ; test for <= $MAXLONG
+        je          short check_MINLONG
+
+return_MAXLONG:
+        ; src > $MAXLONG
+        ; throw an exception
+        jmp         short throw_exception
+
+return_zero:
+        ; compare with $MAXLONG results in unordered
+        ; throw an overflow exception
+        jmp         short throw_exception
+
+check_MINLONG:
+        ; src <= $MINLONG
+        fild        qword ptr $MINLONG
+        fld         real4 ptr [ebp+8]
+        fcompp                                  ; real8 ptr [ebp+8] < $MINLONG
+        fnstsw      ax
+        test        ah,1                        
+        jne         short throw_exception ;  throw an overflow exception when src < $MINLONG  
+return_MINLONG:
+        mov         eax, edx        ;  restore lsw
+        mov         edx, 080000000h
+        jmp         short return
+
+throw_exception:
+        ; throw an overflow exception
+        ; set up stack frame so that it looks like a call to throwNewOverflowException
+        ; from the caller of this function.
+        mov         esp,ebp
+        pop         ebp
+        pop         eax       ; grab return address
+        mov         [esp],eax ; overwrite argument
+        jmp         ?g_throwNewOverflowException@Class_System_VTable@@SIXXZ
+
+?g_checkedFloatToLong@Class_System_VTable@@SI_JM@Z endp
+
+align 16
+?g_floatRem@Class_System_VTable@@SIMMM@Z proc                                
+        fld     real4 ptr [esp+8]
+        fld     real4 ptr [esp+4]
+fremloop:        
+        fprem
+        fstsw   ax        
+        fwait
+        sahf
+        jp      fremloop    ; Continue while the FPU status bit C2 is set
+        ffree st(1)
+        ret     8
+?g_floatRem@Class_System_VTable@@SIMMM@Z endp
+
+align 16
+?g_doubleRem@Class_System_VTable@@SINNN@Z proc
+        fld     real8 ptr [esp+12]
+        fld     real8 ptr [esp+4]
+fremloop:
+        fprem
+        fstsw   ax        
+        fwait
+        sahf
+        jp      fremloop    ; Continue while the FPU status bit C2 is set
+        ffree st(1)
+        ret     16
+?g_doubleRem@Class_System_VTable@@SINNN@Z endp
+
+
+if EXCLUDED        
+;
+;  void __checkFPStackDepth0
+;
+
+align 16
+__checkFPStackDepth0 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,0
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth0 endp
+
+;
+;  void __checkFPStackDepth1
+;
+
+align 16
+__checkFPStackDepth1 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-1
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth1 endp
+
+;
+;  void __checkFPStackDepth2
+;
+
+align 16
+__checkFPStackDepth2 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-2
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth2 endp
+
+;
+;  void __checkFPStackDepth3
+;
+
+align 16
+__checkFPStackDepth3 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-3
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth3 endp
+
+;
+;  void __checkFPStackDepth4
+;
+
+align 16
+__checkFPStackDepth4 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-4
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth4 endp
+
+;
+;  void __checkFPStackDepth5
+;
+
+align 16
+__checkFPStackDepth5 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-5
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth5 endp
+
+;
+;  void __checkFPStackDepth6
+;
+
+align 16
+__checkFPStackDepth6 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-6
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth6 endp
+
+;
+;  void __checkFPStackDepth7
+;
+
+align 16
+__checkFPStackDepth7 proc
+        push        ebp
+        mov         ebp,esp
+
+        push        eax
+        pushfd
+ 
+        xor         eax,eax
+
+        wait
+        fnstsw      ax
+        wait
+
+        shr         eax,11
+        and         eax,7
+        cmp         eax,8-7
+        je          ok
+oops:
+        int         3
+ok:
+
+        popfd
+        pop         eax
+
+        pop         ebp
+        ret         0
+__checkFPStackDepth7 endp
+endif ; EXCLUDED
+
+;;; 
+;;; 
+;;; 
+;;; 
+
+ifdef SINGULARITY            
+?g_ZeroPages@Class_System_Buffer@@SIXPAEH@Z proc
+        ;; ECX = dst
+        ;; EDX = len (bytes)
+        
+        push    ebp
+        mov     ebp, esp
+        pxor    mm0, mm0
+next:
+        movntq  [ecx + 0], mm0
+        movntq  [ecx + 8], mm0
+        movntq  [ecx + 16], mm0
+        movntq  [ecx + 24], mm0
+        movntq  [ecx + 32], mm0
+        movntq  [ecx + 40], mm0
+        movntq  [ecx + 48], mm0
+        movntq  [ecx + 56], mm0
+        add     ecx, 64
+        sub     edx, 64
+        ja      next
+        
+        sfence
+        emms
+        pop     ebp
+        ret
+?g_ZeroPages@Class_System_Buffer@@SIXPAEH@Z endp
+
+?g_CopyPages@Class_System_Buffer@@SIXPAE0H@Z proc
+        ;; ECX = dst
+        ;; EDX = src
+        ;; [ebp+8]  len (bytes)
+        
+        push    ebp
+        mov     ebp, esp
+        mov     eax, [ebp + 8]
+
+        cmp     ecx, edx
+        js      down
+
+        ;; destination is lower than source
+        add     ecx, eax
+        add     edx, eax
+        sub     ecx, 64
+        sub     edx, 64
+         
+up:
+        movq    mm0, [edx +  0]
+        movq    mm1, [edx +  8]
+        movq    mm2, [edx + 16]
+        movq    mm3, [edx + 24]
+        movq    mm4, [edx + 32]
+        movq    mm5, [edx + 40]
+        movq    mm6, [edx + 48]
+        movq    mm7, [edx + 56]
+        movntq  [ecx +  0], mm0
+        movntq  [ecx +  8], mm1
+        movntq  [ecx + 16], mm2
+        movntq  [ecx + 24], mm3
+        movntq  [ecx + 32], mm4
+        movntq  [ecx + 40], mm5
+        movntq  [ecx + 48], mm6
+        movntq  [ecx + 56], mm7
+        sub     ecx, 64
+        sub     edx, 64
+        sub     eax, 64
+        ja      up
+
+        sfence
+        emms
+        pop     ebp
+        ret     4
+        
+        ;; destination is higher than source
+down:
+        movq    mm0, [edx +  0]
+        movq    mm1, [edx +  8]
+        movq    mm2, [edx + 16]
+        movq    mm3, [edx + 24]
+        movq    mm4, [edx + 32]
+        movq    mm5, [edx + 40]
+        movq    mm6, [edx + 48]
+        movq    mm7, [edx + 56]
+        movntq  [ecx +  0], mm0
+        movntq  [ecx +  8], mm1
+        movntq  [ecx + 16], mm2
+        movntq  [ecx + 24], mm3
+        movntq  [ecx + 32], mm4
+        movntq  [ecx + 40], mm5
+        movntq  [ecx + 48], mm6
+        movntq  [ecx + 56], mm7
+        add     ecx, 64
+        add     edx, 64
+        sub     eax, 64
+        ja      down
+
+        sfence
+        emms
+        pop     ebp
+        ret     4
+?g_CopyPages@Class_System_Buffer@@SIXPAE0H@Z endp
+        
+endif
+
+end
diff --git a/base/Kernel/Native/halcpu.asm b/base/Kernel/Native/halcpu.asm
new file mode 100644
index 0000000..c55db3b
--- /dev/null
+++ b/base/Kernel/Native/halcpu.asm
@@ -0,0 +1,22 @@
+;
+; Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+
+.686p
+.model flat
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+
+include hal.inc
+
+?GetCurrentProcessorNumber@@YIHXZ proc
+    mov eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._cpuId]
+    ret
+?GetCurrentProcessorNumber@@YIHXZ endp
+
+end
diff --git a/base/Kernel/Native/halexn.cpp b/base/Kernel/Native/halexn.cpp
new file mode 100644
index 0000000..6622396
--- /dev/null
+++ b/base/Kernel/Native/halexn.cpp
@@ -0,0 +1,431 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  halexn.cpp - Singularity/Bartok Exception Handling
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  Runtime support for CIL exceptions
+//  * searching exception table
+//  * make machine faults raise CIL exceptions
+//
+
+#if SINGULARITY
+# include "hal.h"
+#else
+# include "brt.h"
+# include <malloc.h>
+#endif
+
+extern "C" void __cdecl _throwDispatcher();
+extern "C" void __cdecl _throwArithmeticException();
+extern "C" void __cdecl _throwDivideByZeroException();
+extern "C" void __cdecl _throwNullReferenceException();
+extern "C" void __cdecl _throwOverflowException();
+extern "C" void __cdecl _throwStackOverflowException();
+
+#ifdef SINGULARITY
+extern void DumpStack(UIntPtr ebp);
+extern BOOL KdDebuggerNotPresent;
+#endif
+
+// See Bartok\tables\ExceptionTable.cs for a description of ExceptionTableEntry
+
+//////////////////////////////////////////////////////////////////////////////
+//
+struct ExceptionTableEntry {
+    uintptr scopeBaseAddr;
+    union {
+        struct {
+            Class_System_Type *exceptionClass; // low bit is zero
+            uintptr handlerAddr;
+        };
+        struct {
+            uintptr frameSetupInfo; // low bit is one
+            uintptr spillSize;
+        };
+    };
+};
+
+struct TableEntry {
+    ExceptionTableEntry * tableBaseAddr;
+    ExceptionTableEntry * tableEndAddr;
+};
+
+extern TableEntry TableBase[1];
+extern TableEntry TableBound[1];
+
+// This will break down with 64 bit pointers.  We will need to revisit the code
+// that uses the ExceptionTableLookupReturn result (__throwDispatcher*).
+STATIC_ASSERT(sizeof(uint64) == 2 * sizeof(uintptr));
+
+union ExceptionTableLookupReturn {
+    uint64 qword;
+    struct {
+        Class_System_Type *exceptionClass;
+        uintptr handlerAddr;
+    };
+    struct {
+        uintptr frameSetupInfo;
+        uintptr spillSize;
+    };
+};
+
+static uintptr LookupTable(uintptr throwAddr,
+                           ExceptionTableEntry **tableBaseEntry,
+                           ExceptionTableEntry **tableEndEntry) {
+#if 0
+    printf("LookupTable(throwAddr=%p, tableBase=%p, tableEnd=%p)\n",
+           throwAddr, tableBaseEntry, tableEndEntry);
+    printf("  TableBase=%p, TableBound=%p, maxIndex = %d\n",
+           TableBase, TableBound, TableBound - TableBase);
+    printf("  callSiteTableCount=%d\n",
+           Class_System_GCs_CallStack::c_callSiteTableCount);
+    printf("  codeBaseStartTable=%p\n",
+           Class_System_GCs_CallStack::c_codeBaseStartTable);
+    printf("  returnAddressToCallSiteSetNumbers=%p\n",
+           Class_System_GCs_CallStack::c_returnAddressToCallSiteSetNumbers);
+    printf("  callSiteSetCount=%p\n",
+           Class_System_GCs_CallStack::c_callSiteSetCount);
+#endif
+
+    //  search to find which table to use
+    int maxIndex = TableBound - TableBase;
+    uintptr codeBase = (uintptr) -1;
+    uintptr relCodeAddr = 0;
+    for (int i = 0; i < maxIndex; i++) {
+        TableEntry *entry = &TableBase[i];
+#if 0
+        printf("   TableBase[%d]  base=%p end=%p  codeBaseStartTable[]=%p\n",
+               i, entry->tableBaseAddr, entry->tableEndAddr,
+               Class_System_GCs_CallStack::c_codeBaseStartTable[i]);
+#endif
+        codeBase =
+            ((uintptr*)Class_System_GCs_CallStack::c_codeBaseStartTable)[i];
+
+        if (throwAddr < codeBase) {
+            continue;
+        }
+        relCodeAddr = throwAddr - codeBase;
+        *tableBaseEntry = entry->tableBaseAddr;
+        *tableEndEntry = entry->tableEndAddr;
+
+#if 0
+        printf("   relCodeAddr = %p\n", relCodeAddr);
+        printf("    tableBase scopeBaseAddr=%p class=%p handler=%p\n",
+               (*tableBaseEntry)->scopeBaseAddr,
+               (*tableBaseEntry)->exceptionClass,
+               (*tableBaseEntry)->handlerAddr);
+        printf("    tableEnd  scopeBaseAddr=%p class=%p handler=%p\n",
+               (*tableEndEntry)->scopeBaseAddr,
+               (*tableEndEntry)->exceptionClass,
+               (*tableEndEntry)->handlerAddr);
+#endif
+
+        if ((relCodeAddr >= (*tableBaseEntry)->scopeBaseAddr)
+            && (relCodeAddr <= (*tableEndEntry)->scopeBaseAddr)) {
+            return codeBase;
+        }
+    }
+
+    return (uintptr) -1;
+    //exit(-2);
+    //__asm int 3;
+}
+
+#if SINGULARITY
+Class_System_VTable * getRealVTable(Class_System_VTable * vt)
+{
+    return (Class_System_VTable *)((uintptr)vt & (~((uintptr)3)));
+}
+#endif
+
+// search an exception table
+
+//////////////////////////////////////////////////////////////////////////////
+
+// search an exception table
+// - Returns the exception in eax.
+// - Returns the handler address in edx.
+// OR if the shared unwind handler should be used
+// - Returns the frameSetupInfo in eax.
+// - Returns the spill area size in edx.
+
+uint64 __fastcall ExceptionTableLookup(Class_System_Exception *exception,
+                                       uintptr throwAddr) {
+#if 0
+    printf("\n");
+    printf("ExceptionTableLookup(exception=%p, vtable=%p, throwAddr=%p)\n",
+           exception, ((uintptr *)exception)[0], throwAddr);
+#endif
+
+#if SINGULARITY
+    if (exception->_throwAddress == NULL) {
+        exception->_throwAddress = throwAddr;
+    }
+#endif
+
+    //  search for table using throwAddr
+    ExceptionTableEntry *baseEntry = NULL;
+    ExceptionTableEntry *endEntry = NULL;
+    uintptr codeBase = LookupTable(throwAddr, &baseEntry, &endEntry);
+
+#if 0
+    printf("  codeBase=%p baseEntry=%p endEntry=%p\n",
+           codeBase, baseEntry, endEntry);
+#endif
+
+    if (codeBase == (uintptr) -1) {
+#if SINGULARITY_KERNEL
+        printf("Exception outside of any known code regions!\n");
+        if (!KdDebuggerNotPresent) {
+            __asm int 3;
+        }
+        Class_System_VTable::g_TerminateByException(exception);
+        __asm int 3;
+#elif SINGULARITY_PROCESS
+        Assert("Exception outside of any known code regions!\n");
+        Class_System_VTable::g_TerminateByException(exception);
+        __asm int 3;
+#else
+        Class_System_VTable::g_TerminateByException(exception);
+        exit(-2);
+#endif
+    }
+
+    // bsearch for throwAddr
+    int minIndex = 0;
+    int maxIndex = endEntry-baseEntry;
+    throwAddr -= codeBase;
+
+    if (throwAddr < baseEntry[minIndex].scopeBaseAddr ||
+        throwAddr > baseEntry[maxIndex].scopeBaseAddr) {
+        // BUGBUG: callback to C# code that may trigger GC
+#if SINGULARITY_KERNEL
+        printf("Exception outside of known code region for %p\n", codeBase);
+        if (!KdDebuggerNotPresent) {
+            __asm int 3;
+        }
+        Class_System_VTable::g_TerminateByException(exception);
+        printf("top-level exception handling code failed\n");
+        __asm int 3;
+#elif SINGULARITY_PROCESS
+        Assert("Exception outside of known code region for.\n");
+        Class_System_VTable::g_TerminateByException(exception);
+        Assert("top-level exception handling code failed\n");
+        __asm int 3;
+#else
+        Class_System_VTable::g_TerminateByException(exception);
+        fprintf(stderr, "top-level exception handling code failed");
+        fflush(stderr);
+        __asm int 3;
+        exit(-2);
+#endif
+    }
+    while (minIndex+1 < maxIndex) {
+        int midIndex = (minIndex+maxIndex)/2;
+        uintptr midAddr = baseEntry[midIndex].scopeBaseAddr;
+        if (throwAddr < midAddr) {
+            maxIndex = midIndex;
+        }
+        else {
+            minIndex = midIndex;
+        }
+    }
+    ExceptionTableEntry *entry = &baseEntry[minIndex];
+
+    //  back up to first entry containing throwAddr (there may be several)
+    uintptr baseAddr;
+    for (baseAddr = entry->scopeBaseAddr;
+         entry->scopeBaseAddr == baseAddr && entry >= baseEntry;
+         entry--) {
+        continue;
+    }
+
+    //  check each of the handlers in turn
+
+    for (entry++; entry->scopeBaseAddr <= throwAddr; entry++) {
+#if 0
+        printf("    entry=%p[%d]  "
+               "scopeBaseAddr=%p exceptionClass=%p handler=%p\n",
+               entry, entry - baseEntry,
+               entry->scopeBaseAddr, entry->exceptionClass, entry->handlerAddr);
+#endif
+
+        // 0 now means "no frame pointer omission and no callee save registers
+        // have been saved to the stack":
+        // Assert(entry->exceptionClass);
+
+        Assert(((entry->frameSetupInfo & 0x1) != 0)
+               || (entry->handlerAddr != NULL));
+        if (((entry->frameSetupInfo & 0x1) != 0)
+            || Class_System_VTable::g_IsExceptionHandler(entry->exceptionClass,
+                                                         exception)) {
+#if 0
+            printf("Found matching exception entry: %p\n", entry);
+#endif
+            break;
+        }
+    }
+    Assert(entry->scopeBaseAddr == baseAddr);
+
+    ExceptionTableLookupReturn retval;
+
+    if((entry->frameSetupInfo & 0x1) != 0) {
+        retval.frameSetupInfo = entry->frameSetupInfo;
+        retval.spillSize = entry->spillSize;
+#if SINGULARITY
+        Class_Microsoft_Singularity_Tracing::g_Log
+            (9, "Throw {0} from {1:x8} to shared unwind handler",
+             getRealVTable(exception->postHeader.vtableObject)->vtableType->name,
+             (UIntPtr)(codeBase + throwAddr));
+#endif
+    }
+    else {
+        retval.exceptionClass = entry->exceptionClass;
+        retval.handlerAddr = entry->handlerAddr + codeBase;
+#if SINGULARITY
+        Class_Microsoft_Singularity_Tracing::g_Log
+            (9, "Throw {0} from {1:x8} to {2:x8}",
+             getRealVTable(exception->postHeader.vtableObject)->vtableType->name,
+             (UIntPtr)(codeBase + throwAddr),
+             (UIntPtr)(retval.handlerAddr));
+#endif
+    }
+
+#if SINGULARITY_KERNEL || SINGULARITY_PROCESS
+    if (!exception->_notifiedDebugger) {
+        exception->_notifiedDebugger = true;
+
+        bool iflag =
+            Class_Microsoft_Singularity_Processor::g_DisableInterrupts();
+        Class_System_VTable * vtable = getRealVTable(exception->postHeader.vtableObject);
+        if((entry->frameSetupInfo & 0x1) != 0) {
+            Class_Microsoft_Singularity_Tracing::g_Log
+                (2, "First chance {0} at {1:x8}.  Handler is shared",
+                 vtable->vtableType->name,
+                 (UIntPtr)(codeBase + throwAddr));
+        }
+        else {
+            Class_Microsoft_Singularity_Tracing::g_Log
+                (2, "First chance {0} at {1:x8}.  Handler is {2:x8}",
+                 vtable->vtableType->name,
+                 (UIntPtr)(codeBase + throwAddr),
+                 (UIntPtr)retval.handlerAddr);
+        }
+        if (exception->_message != NULL) {
+            Class_Microsoft_Singularity_Tracing::g_Log
+                (0, "  Message: {0}", exception->_message, 0);
+        }
+
+        if (!KdDebuggerNotPresent) {
+            KdDebugTrapData trapData, *trapDataPtr = &trapData;
+            trapData.tag = KdDebugTrapData::FIRST_CHANCE_EXCEPTION;
+            trapData.u.firstChanceException.throwAddr = throwAddr;
+            __asm {
+                // int 3; // uncomment this line to cause every exception to break here.
+                mov eax, exception;
+                mov fs:[0]Struct_Microsoft_Singularity_X86_ProcessorContext.exception, eax;
+                mov eax, trapDataPtr;
+                int 29; // Notify debugging stub of first chance exception.
+            }
+        }
+        Class_Microsoft_Singularity_Processor::g_RestoreInterrupts(iflag);
+    }
+#endif
+
+    return(retval.qword);
+}
+
+#if !SINGULARITY
+
+void alterContinuation(PCONTEXT contextRecord, DWORD newPC) {
+    // assign edx location of instruction that faulted
+    contextRecord->Edx = contextRecord->Eip;
+    contextRecord->Eip = (DWORD) newPC;
+}
+
+// BartokMachineFaultFilter:
+//   This filter is invoked when when a machine fault occurs.   If the
+//   machine fault occurred in MSIL code, it modifies the context so
+//   that the appropriate exception is thrown when the filter returns.
+//
+
+LONG WINAPI BartokMachineFaultFilter(struct _EXCEPTION_POINTERS *exnInfo) {
+    PEXCEPTION_RECORD exceptionRecord = exnInfo->ExceptionRecord;
+    PCONTEXT contextRecord = exnInfo->ContextRecord;
+
+#if 0
+    printf("BartokMachineFaultFilter(exnInfo=%p)\n", exnInfo);
+#endif
+
+    // check if it is an exception in MSIL code.
+
+    // points at instruction that faulted
+    uintptr throwAddr = contextRecord->Eip;
+
+    // search for table using throwAddr
+    ExceptionTableEntry *baseEntry = NULL;
+    ExceptionTableEntry *endEntry = NULL;
+    uintptr codeBase = LookupTable(throwAddr, &baseEntry, &endEntry);
+
+    int minIndex = 0;
+    int maxIndex = endEntry-baseEntry;
+    throwAddr -= codeBase;
+
+    if (throwAddr < baseEntry[minIndex].scopeBaseAddr ||
+        throwAddr > baseEntry[maxIndex].scopeBaseAddr) {
+        // nope, it isn't.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    switch (exceptionRecord->ExceptionCode) {
+        case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+        case EXCEPTION_INT_DIVIDE_BY_ZERO: {
+            alterContinuation(contextRecord,
+                              (DWORD) _throwDivideByZeroException);
+            return EXCEPTION_CONTINUE_EXECUTION;
+        }
+        case EXCEPTION_INT_OVERFLOW: {
+            alterContinuation(contextRecord,(DWORD) _throwOverflowException);
+            return EXCEPTION_CONTINUE_EXECUTION;
+        }
+        case EXCEPTION_STACK_OVERFLOW: {
+            alterContinuation(contextRecord,
+                              (DWORD) _throwStackOverflowException);
+            return EXCEPTION_CONTINUE_EXECUTION;
+        }
+        case EXCEPTION_ACCESS_VIOLATION: {
+            DWORD *exceptionInformation = exceptionRecord->ExceptionInformation;
+            // BUGBUG: how much memory is protected? NB we must trap negative offsets
+            // from null because the first access through a null reference may be
+            // to a header word (e.g. opening the object for read in a memory transaction)
+            if (exceptionInformation[1] < 4096) {
+                exceptionInformation[1] >= 0xfffff000) {
+                alterContinuation(contextRecord,
+                                  (DWORD) _throwNullReferenceException);
+                return EXCEPTION_CONTINUE_EXECUTION;
+            }
+            else {
+                return EXCEPTION_CONTINUE_SEARCH;
+            }
+        }
+        default: {
+            return EXCEPTION_CONTINUE_SEARCH;
+        }
+    }
+}
+
+// If the stack pointer is too close to the bottom of the stack, abort the
+// process otherwise reset the guard page.
+// This function is called when we handle stack overflow exception.
+
+void ResetGuardPage(){
+
+    if (_resetstkoflw() == 0) {
+      fprintf(stderr, "Reset from stack overflow failed. Abort.");
+      fflush(stderr);
+      _exit(-2);
+    }
+}
+
+#endif // !SINGULARITY
diff --git a/base/Kernel/Native/halforgc.asm b/base/Kernel/Native/halforgc.asm
new file mode 100644
index 0000000..d17c69d
--- /dev/null
+++ b/base/Kernel/Native/halforgc.asm
@@ -0,0 +1,328 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+
+.686p
+.mmx
+.xmm
+.model flat
+.code
+
+ifdef SINGULARITY
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+endif  ;  Singularity
+
+include hal.inc
+
+PAGE_BITS               EQU     12
+MASK_OWNER              EQU     03h
+
+externdef ?g_ssbRecordWriteBarrier@Class_System_VTable@@SIXPAUUntracedPtr_void@@@Z:NEAR
+; static void __fastcall VTable.ssbRecordWriteBarrier(void*)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; pushStackMark: If a function may be called by C, push a pointer to its
+; frame on to a stack at the beginning of the function.
+;
+; Transition record layout:
+;
+; (lower addresses)
+; --------------------------
+; |Old stack marker record |
+; --------------------------
+; |Addr of call instr      |
+; --------------------------
+; |Bottom of stack frame   |
+; --------------------------
+; |ebx                     |
+; --------------------------
+; |edi                     |
+; --------------------------
+; |esi                     |
+; --------------------------
+; |ebp                     |
+; --------------------------
+; (higher addresses);
+;
+
+align 16
+__pushStackMark proc
+        ;; Free up a register
+        push ecx
+        ;; Fill the new transition record
+        lea  ecx, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)]
+        ;; Stash the callee-save registers
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._EBX, ebx
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._EDI, edi
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._ESI, esi
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._EBP, ebp
+        ;; record.callAddr = <return addr of this call>
+        mov  ebx, [esp+4]
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._callAddr, ebx
+        ;; record.stackBottom = <bottom of stack frame>
+        lea  ebx, [esp+8]
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._stackBottom, ebx
+ifdef SINGULARITY
+        ;; Link in new transition record
+        CurrentThreadContext(ebx)
+        mov  edi, [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._oldTransitionRecord, edi
+        ;; The next instruction officially switches modes (process->kernel only).
+        ;; Make sure that the transition record is complete at this point.
+        mov  [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, ecx
+        ;; We are now officially in a different mode.
+        ;; Allow the GC to work while this thread is out
+        mov ecx, Class_System_GCs_Transitions_DormantState + Class_System_GCs_Transitions_OtherMutatorState
+        mov eax, Class_System_GCs_Transitions_MutatorState + Class_System_GCs_Transitions_OtherDormantState
+        lock cmpxchg [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._gcStates, ecx
+        jz pushFastPath
+        ;; Transitions.LeaveManagedSpace(threadContext)
+        mov ecx, ebx
+        push eax
+	push edx
+        call ?g_LeaveManagedSpace@Class_System_GCs_Transitions@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z
+	pop  edx
+        pop  eax
+pushFastPath:
+else ; SINGULARITY
+        ;; Link in new transition record
+        CurrentThread(ebx)
+        mov  edi, [ebx].Class_System_Threading_Thread._asmStackMarker
+        mov  [ecx].Struct_System_GCs_CallStack_TransitionRecord._oldTransitionRecord, edi
+        mov  [ebx].Class_System_Threading_Thread._asmStackMarker, ecx
+        ;; Allow the GC to work while this thread is out
+	mov ecx, ebx
+        push eax
+        push edx
+        call ?g_LeaveManagedSpace@Class_System_GCs_Transitions@@SIXPAUClass_System_Threading_Thread@@@Z
+        pop  edx
+        pop  eax
+endif ; SINGULARITY
+        pop  ecx
+        ret
+__pushStackMark endp
+
+;
+; popStackMark: pop the pointer before returning from the function
+;
+align 16
+__popStackMark proc
+        ;; Preserve caller-save registers
+        push eax
+ifdef SINGULARITY
+        CurrentThreadContext(ebx)
+        ;; NOTE: replacing the following two instructions with a "test"
+        ;; instruction has a 1-cycle penalty!
+        mov edi, [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._gcStates
+        and edi, Class_System_GCs_Transitions_MutatorState
+        jnz popFastPath
+	push ecx
+        push edx
+        mov ecx, ebx
+        call ?g_ReturnToManagedSpace@Class_System_GCs_Transitions@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z
+        pop edx
+        pop ecx
+popFastPath:
+ifndef SINGULARITY_KERNEL
+        cmp byte ptr [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._suspendAlert, 0
+        je noAlert
+        push ecx
+        push edx
+        call ?g_SuspendBarrier@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIXXZ
+        pop edx
+        pop ecx
+noAlert:
+endif ; SINGULARITY_KERNEL
+        ;; Unlink transition record
+	lea  edi, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)]
+        mov  esi, [edi].Struct_System_GCs_CallStack_TransitionRecord._oldTransitionRecord
+        ;; The next instruction officially switches modes (process<-kernel only).
+        mov  [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, esi
+        ;; We are now officially in a different mode.
+ifdef SINGULARITY_KERNEL
+        ;; Assert(ebx == current context)
+        ;; Assert(edi == transition record in caller's frame)
+        ;; If we're returning to the kernel from a process that threw an
+        ;; exception, throw a new kernel exception:
+        cmp  byte ptr [ebx].Struct_Microsoft_Singularity_X86_ThreadContext._uncaughtFlag, 0
+        je   noProcessUncaughtException
+        add  esp, 8   ; discard eax, retaddr
+	;; push TransitionRecord.callAddr as the new return address
+        push [edi].Struct_System_GCs_CallStack_TransitionRecord._callAddr
+        ;; Restore callee-save registers
+        mov  ebx, [edi].Struct_System_GCs_CallStack_TransitionRecord._EBX
+        mov  esi, [edi].Struct_System_GCs_CallStack_TransitionRecord._ESI
+        mov  ebp, [edi].Struct_System_GCs_CallStack_TransitionRecord._EBP
+        mov  edi, [edi].Struct_System_GCs_CallStack_TransitionRecord._EDI
+        ;; (We have to jump to the code; a "call" would push a return address
+        ;; that doesn't exist in the exception tables.)
+        jmp ?g_ThrowProcessUncaughtException@Class_Microsoft_Singularity_ProcessUncaughtException@@SIXXZ
+noProcessUncaughtException:
+endif ; SINGULARITY_KERNEL
+else ; SINGULARITY
+	push ecx
+        push edx
+        CurrentThreadIndex(ecx)      ; get current thread
+        call ?g_ReturnToManagedSpace@Class_System_GCs_Transitions@@SIPAUClass_System_Threading_Thread@@H@Z
+	pop edx
+        pop ecx
+        ;; Unlink transition record
+	lea  edi, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)]
+        mov  esi, [edi].Struct_System_GCs_CallStack_TransitionRecord._oldTransitionRecord
+        mov  [eax].Class_System_Threading_Thread._asmStackMarker, esi
+endif ; SINGULARITY
+        ;; Restore callee-save registers
+        mov  ebx, [edi].Struct_System_GCs_CallStack_TransitionRecord._EBX
+        mov  esi, [edi].Struct_System_GCs_CallStack_TransitionRecord._ESI
+        mov  ebp, [edi].Struct_System_GCs_CallStack_TransitionRecord._EBP
+        mov  edi, [edi].Struct_System_GCs_CallStack_TransitionRecord._EDI
+        ;; Restore caller-save registers and return
+        pop eax
+        ret
+__popStackMark endp
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; void CollectBodyTransition(Thread thread, int generation):  
+;   Save the callee-save registers in a transition record and then call
+;   System.GC.CollectBody(thread, generation)
+;
+
+;
+;  Note: If you modify the amount of stack that this function uses,
+;  you MUST make update the StackBound attribute for
+;  System.GC.CollectBodyTransition. 
+;
+;  It is conservatively set to 128 bytes.     This includes the frame size
+;  for the function + 88 bytes for a possible linked stack call in
+;  CollectBody
+
+align 16
+?g_CollectBodyTransition@Class_System_GC@@SIXPAUClass_System_Threading_Thread@@H@Z proc
+; static void __fastcall GC.CollectBodyTransition(Thread, int)
+        ;; Prologue
+        push ebp
+        mov ebp, esp
+        sub esp, SIZE Struct_System_GCs_CallStack_TransitionRecord
+        ;; Fill the new transition record
+        mov  eax, dword ptr [ebp+4]   ; return address of this call
+        mov  dword ptr [ebp-24], eax
+        lea  eax, [ebp+8]             ; skip pushed PC and SP
+        mov  dword ptr [ebp-20], eax  ; bottom of stack frame
+        mov  dword ptr [ebp-16], ebx  ; callee-save registers
+        mov  dword ptr [ebp-12], edi
+        mov  dword ptr [ebp-08], esi
+        mov  eax, dword ptr [ebp]
+        mov  dword ptr [ebp-04], eax   ; old ebp value
+        ;; Link in new transition record
+        lea  edi, dword ptr [ebp-28]  ;  address of new transition record
+ifdef SINGULARITY
+ifdef SINGULARITY_KERNEL
+        mov  eax, dword ptr [ecx].Class_System_Threading_Thread._context.Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers
+        mov  dword ptr [ecx].Class_System_Threading_Thread._context.Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, edi
+else
+        mov  esi, dword ptr [ecx].Class_System_Threading_Thread._context
+        mov  eax, dword ptr [esi].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers
+        mov  dword ptr [esi].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, edi
+endif ; SINGULARITY_KERNEL
+else ; SINGULARITY
+        mov  eax, dword ptr [ecx].Class_System_Threading_Thread._asmStackMarker
+        mov  dword ptr [ecx].Class_System_Threading_Thread._asmStackMarker, edi
+endif ; SINGULARITY
+        mov  dword ptr [edi], eax     ; add in old transition record chain
+        ;; Call "Thread GC.CollectBody(Thread, int)"
+        call ?g_CollectBody@Class_System_GC@@SIPAUClass_System_Threading_Thread@@PAU2@H@Z
+        ;; Unlink transition record
+        mov  edi, dword ptr [ebp-28]   ; get old transition record chain
+ifdef SINGULARITY
+ifdef SINGULARITY_KERNEL
+        mov  dword ptr [eax].Class_System_Threading_Thread._context.Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, edi
+else
+        mov  esi, dword ptr [eax].Class_System_Threading_Thread._context
+        mov  dword ptr [esi].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, edi
+endif ; SINGULARITY_KERNEL
+else ; SINGULARITY
+        mov  dword ptr [eax].Class_System_Threading_Thread._asmStackMarker, edi
+endif ; SINGULARITY
+        ;; Restore callee-save registers
+        mov  ebx, dword ptr [ebp-16]
+        mov  edi, dword ptr [ebp-12]
+        mov  esi, dword ptr [ebp-08]
+        ;; Epilogue
+        ;; (note: because of interrupts, be careful not to ever read below esp)
+        lea  esp, [ebp-04]
+        pop  ebp                                   ;  restore old ebp
+        add  esp, 4                                ;  skip FP
+        ret
+?g_CollectBodyTransition@Class_System_GC@@SIXPAUClass_System_Threading_Thread@@H@Z endp
+
+
+ifdef SINGULARITY_KERNEL
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; void Processor.SwitchToThreadContext(ref X86_ThreadContext oldContext,
+;                                      ref X86_ThreadContext newContext);
+;
+; precondition: Scheduler.dispatchLock held
+;
+align 16
+?g_SwitchToThreadContext@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@0@Z proc
+        ;; Prologue
+        push ebp
+        mov ebp, esp
+        ;; TransitionRecord record;
+        ;; <spill slot for oldContext>
+        sub esp, SIZE Struct_System_GCs_CallStack_TransitionRecord + 4
+        mov [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)-4], ecx
+        ;; record.oldTransitionRecord = oldContext.stackMarkers
+        mov eax, [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers
+        mov [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)].Struct_System_GCs_CallStack_TransitionRecord._oldTransitionRecord, eax
+        ;; oldContext.stackMarkers = &record
+        lea eax, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)]
+        mov [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, eax
+        ;; record.callAddr = <PC from stack frame>
+        mov ecx, dword ptr [ebp+4]
+        mov [eax].Struct_System_GCs_CallStack_TransitionRecord._callAddr, ecx
+        ;; record.stackBottom = <bottom of previous stack frame>
+        lea ecx, [ebp+8]        ; Skip pushed PC and SP
+        mov [eax].Struct_System_GCs_CallStack_TransitionRecord._stackBottom, ecx
+        ;; <Save callee-save registers>
+        mov [eax].Struct_System_GCs_CallStack_TransitionRecord._EBX, ebx
+        mov [eax].Struct_System_GCs_CallStack_TransitionRecord._EDI, edi
+        mov [eax].Struct_System_GCs_CallStack_TransitionRecord._ESI, esi
+        mov ecx, dword ptr [ebp]
+        mov [eax].Struct_System_GCs_CallStack_TransitionRecord._EBP, ecx
+        ;; Transitions.SuspendThread(oldContext)
+        mov ecx, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)-4]
+        mov edi, edx            ; save newContext away in a callee-save reg
+        call ?g_SuspendThread@Class_System_GCs_Transitions@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z
+        ;; Processor.SwitchToThreadContextNoGC(newContext)
+        mov ecx, edi
+        call ?g_SwitchToThreadContextNoGC@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z
+        ;; Transitions.ReviveThread(oldContext)
+        mov ecx, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)-4]
+        call ?g_ReviveThread@Class_System_GCs_Transitions@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z
+        ;; <Restore callee-save registers>
+        lea eax, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)]
+        mov ebx, [eax].Struct_System_GCs_CallStack_TransitionRecord._EBX
+        mov edi, [eax].Struct_System_GCs_CallStack_TransitionRecord._EDI
+        mov esi, [eax].Struct_System_GCs_CallStack_TransitionRecord._ESI
+        ;; oldContext.stackMarkers = record.oldTransitionRecord
+        mov ecx, [ebp-(SIZE Struct_System_GCs_CallStack_TransitionRecord)-4]
+        mov edx, [eax].Struct_System_GCs_CallStack_TransitionRecord._oldTransitionRecord
+        mov [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackMarkers, edx
+        ;; Epilogue
+        mov esp, ebp
+        pop ebp
+        ret
+?g_SwitchToThreadContext@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@0@Z endp
+
+endif ; SINGULARITY_KERNEL
+
+end
diff --git a/base/Kernel/Native/halidt.asm b/base/Kernel/Native/halidt.asm
new file mode 100644
index 0000000..e4b2408
--- /dev/null
+++ b/base/Kernel/Native/halidt.asm
@@ -0,0 +1,1319 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Microsoft Research Singularity
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+;;  File:   halidt.asm
+;;
+;;  Note:
+;;
+
+.686p
+.mmx
+.xmm
+.model flat
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+        
+include hal.inc
+
+DEBUG_INTERRUPTS EQU 0
+ifdef DEBUG
+SPINLOCK_RELEASE_SANITY_CHECK EQU 1
+else        
+SPINLOCK_RELEASE_SANITY_CHECK EQU 0
+endif
+
+ifdef PAGING
+public _SysEnter
+endif        
+
+externdef ?c_exceptionHandler@@3P6IXHPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@ZA:uintPtr
+; static void __fastcall Class.Microsoft.SingularityIoSystem.DispatchException(
+;       int interrupt [ECX], ref ThreadContex [EDX]))
+; __fastcall:   
+;       Arg0 passed in ECX
+;       Arg1 passed in EDX
+;       Others passed right to left on stack.
+;       EBX, ESI, EDI, and EBP are callee saved.
+;       EAX receives return value if any.
+
+public _EdtEnter0
+public _EdtEnter1
+public _EdtEnterBody
+        
+externdef ?c_interruptHandler@@3P6IXHPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@ZA:uintPtr
+; static void __fastcall Class.Microsoft.SingularityIoSystem.DispatchInterrupt(
+;       int interrupt [ECX], ref ThreadContex [EDX]))
+; __fastcall:   
+;       Arg0 passed in ECX
+;       Arg1 passed in EDX
+;       Others passed right to left on stack.
+;       EBX, ESI, EDI, and EBP are callee saved.
+;       EAX receives return value if any.
+
+public _IdtEnter20
+public _IdtEnter21
+public _IdtEnterBody
+                
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; 
+;;; The IDT_ENTER building macros insure that each IDT target has
+;;; an offset of form (_IdtEnter0 or _EdtEnter0) + 0x10 * interrupt_number.
+;;;
+IDT_ENTER_IN STRUCT 1
+        _esi            UINT32          ?
+        _num            UINT32          ?
+        _err            UINT32          ?
+        _eip            UINT32          ?
+        _cs0            UINT32          ?
+        _efl            UINT32          ?
+IDT_ENTER_IN ENDS
+
+ifdef PAGING
+IDT_ENTER_IN_LARGE STRUCT 1
+        _esi            UINT32          ?
+        _num            UINT32          ?
+        _err            UINT32          ?
+        _eip            UINT32          ?
+        _cs0            UINT32          ?
+        _efl            UINT32          ?
+        _esp            UINT32          ?
+        _ss             UINT32          ?
+IDT_ENTER_IN_LARGE ENDS
+endif        
+
+IDT_ENTER_OUT STRUCT 1
+        _esi            UINT32          ?
+        _eip            UINT32          ?
+        _cs0            UINT32          ?
+        _efl            UINT32          ?
+IDT_ENTER_OUT ENDS
+
+ifdef PAGING
+IDT_ENTER_OUT_LARGE STRUCT 1
+        _esi            UINT32          ?
+        _eip            UINT32          ?
+        _cs0            UINT32          ?
+        _efl            UINT32          ?
+        _esp            UINT32          ?
+        _ss             UINT32          ?
+IDT_ENTER_OUT_LARGE ENDS
+endif        
+
+EDT_ENTER_CLEAN MACRO num
+        push    0                                       ; No error
+        push    num
+        jmp     _EdtEnterBody
+        align   16
+ENDM
+
+EDT_ENTER_ERR   MACRO num
+        push    num
+        jmp     _EdtEnterBody
+        align   16
+ENDM    
+        
+IDT_ENTER_CLEAN MACRO num
+        push    0                                       ; No error
+        push    num
+        jmp     _IdtEnterBody
+        align   16
+ENDM
+       
+IDT_SAVE_CONTEXT MACRO fxregs, error, dregs
+        ;; Save the processor's thread context.
+        ;; Mark that the context contains caller-saved registers as well.
+        ;; Input:
+        ;;      ESI = address of ThreadContext structure.
+        ;;      ESP = bottom of IDT_ENTER_IN context:
+        ;;              ESP[ 0] = esi
+        ;;              ESP[ 4] = num
+        ;;              ESP[ 8] = err
+        ;;              ESP[12] = eip
+        ;;              ESP[16] = cs
+        ;;              ESP[20] = efl
+
+        ;; XXX - if we came from ring 3 then stack also has SS and ESP
+        ;;              ESP[24] = esp
+        ;;              ESP[28] = ss 
+        ;; This code needs to check cs&3 and if non-zero save ss:esp to thread context
+        
+        ;; Output:      
+        ;;      ESI = address of ThreadContext structure.
+        ;;      ESP = stack w/o IDT_ENTER_IN context
+        ;;      ECX = num
+        ;;
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eax, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebx, ebx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ecx, ecx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edx, edx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebp, ebp
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edi, edi
+        mov     eax, cr3
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cr3, eax
+        
+        mov     eax, [esp].IDT_ENTER_IN._esi
+        mov     ebx, [esp].IDT_ENTER_IN._eip
+        mov     ecx, [esp].IDT_ENTER_IN._cs0
+        mov     edx, [esp].IDT_ENTER_IN._efl
+
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esi, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eip, ebx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cs0, ecx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._efl, edx
+
+if dregs     
+        mov     eax, dr0
+        mov     ebx, dr1
+        mov     ecx, dr2
+        mov     edx, dr3
+        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr0, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr1, ebx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr2, ecx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr3, edx
+
+        mov     eax, dr6
+        mov     ebx, dr7
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr6, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr7, ebx
+        
+        xor     eax, eax
+        mov     dr6, eax
+endif        
+        
+        mov     ecx, [esp].IDT_ENTER_IN._num            ;  this flows through
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._num, cx
+
+if error        
+        mov     ebx, [esp].IDT_ENTER_IN._err
+        mov     eax, cr2
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._err, ebx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cr2, eax
+endif
+                
+if fxregs
+if dregs        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 3
+else        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 1
+endif        
+        fxsave  [esi].Struct_Microsoft_Singularity_X86_ThreadContext._mmx
+        fninit
+        mov     eax, 37eh
+        push    eax
+        fldcw   [esp]
+        pop     eax
+else
+if dregs        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 2
+else
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 0
+endif                
+endif
+
+ifdef PAGING
+        ;; Is it a small or large frame?
+        mov     eax, [esp].IDT_ENTER_IN._cs0
+        and     eax, 3
+        jz      s_case_0
+
+        ;; Case ring-3: IDT_ENTER_IN_LARGE
+        mov     eax, [esp].IDT_ENTER_IN_LARGE._esp
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esp, eax
+        add     esp, SIZEOF IDT_ENTER_IN_LARGE
+        jmp s_case_0_3
+
+s_case_0:
+endif        
+        ;; Case ring-0: IDT_ENTER_IN
+        add     esp, SIZEOF IDT_ENTER_IN
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esp, esp
+
+ifdef PAGING
+s_case_0_3:
+endif
+                
+ENDM        
+                 
+IDT_LOAD_CONTEXT MACRO dregs
+        ;; Create the outgoing stack frame.
+ifdef PAGING        
+        ;; Is it a small or large frame?
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cs0
+        and     eax, 3
+        jz      l_case_0
+
+        ;; Case ring-3: push an IDT_ENTER_OUT_LARGE
+        sub     esp, SIZEOF IDT_ENTER_OUT_LARGE
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esp
+        mov     [esp].IDT_ENTER_OUT_LARGE._esp, eax
+        mov     eax, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtUD - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull + 3
+        mov     [esp].IDT_ENTER_OUT_LARGE._ss, eax
+        mov     es, ax
+        ;; For the moment, share UF and PF:
+        mov     eax, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPF - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull + 3
+        mov     fs, ax
+        jmp     l_cases_0_3
+
+l_case_0:
+endif ;; PAGING        
+        ;; Case ring-0: push an IDT_ENTER_OUT
+        mov     esp, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esp
+        sub     esp, SIZEOF IDT_ENTER_OUT
+
+ifdef PAGING        
+l_cases_0_3:
+        ;; Code common to ring-0 and ring-3
+endif ;; PAGING        
+
+        ;; Check if we need to restore the floating-point registers
+        test    [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 1
+        jz      skip_fxrstor
+        fxrstor [esi].Struct_Microsoft_Singularity_X86_ThreadContext._mmx
+skip_fxrstor:
+
+if dregs        
+        ;; Check if we need to restore the debug registers
+        test    [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 2
+        jz      skip_drstor
+        
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr0
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr1
+        mov     ecx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr2
+        mov     edx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr3
+        
+        mov     dr0, eax
+        mov     dr1, ebx
+        mov     dr2, ecx
+        mov     dr3, edx
+        
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr6
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr7
+        
+        mov     dr6, eax
+        mov     dr7, ebx
+skip_drstor:
+endif        
+
+ifdef PAGING
+        ;; Zero for cr3 in the ThreadContext means "don't care" (no paging)
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cr3
+        cmp     eax, 0
+        je      skip_cr3
+
+        ;; Avoid TLB flushes if possible
+        mov     ebx, CR3
+        cmp     eax, ebx
+        je      skip_cr3
+
+        mov     CR3, eax
+        
+skip_cr3:       
+endif ;; PAGING
+                        
+        ;; Restore the registers
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esi
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eip
+        mov     ecx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cs0
+        mov     edx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._efl
+        
+        mov     [esp].IDT_ENTER_OUT._esi, eax
+        mov     [esp].IDT_ENTER_OUT._eip, ebx
+        mov     [esp].IDT_ENTER_OUT._cs0, ecx
+        mov     [esp].IDT_ENTER_OUT._efl, edx
+        
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eax
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebx
+        mov     ecx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ecx
+        mov     edx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edx
+        mov     ebp, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebp
+        mov     edi, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edi
+        pop     esi
+ifdef PAGING
+        push    es
+        pop     ds
+endif        
+ENDM        
+
+DBG_EDX_FROM_EAX MACRO edxval, eaxval
+if DEBUG_INTERRUPTS
+        mov     edx, edxval
+        mov     eax, eaxval
+        mov     [edx], eax
+endif
+ENDM        
+
+DBG_SCREEN_AS_VALUE MACRO edxval, eaxval
+if DEBUG_INTERRUPTS
+        push    eax
+        push    edx
+        DBG_EDX_FROM_EAX edxval, eaxval
+        pop     edx
+        pop     eax
+endif
+ENDM        
+        
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; 
+ifdef DEBUG
+?g_TestSave@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z proc
+        pop eax
+        push eax
+        pushad
+
+        mov ebx, 0fffffeb0h
+        mov edx, 0fffffed0h
+        mov ebp, 0fffffeb1h
+        mov edi, 0fffffed1h
+        mov esi, 0fffffef1h
+        
+        pushfd          ; _efl
+        push cs         ; _cs0
+        push eax        ; _eip
+        push 0eeeh      ; _err
+        push 0fffh      ; _num
+        push esi        ; _esi
+        
+        mov esi, ecx
+        IDT_SAVE_CONTEXT 1,1,1
+
+        popad
+        ret
+?g_TestSave@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z endp
+
+?g_TestSaveLoad@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z proc
+        pop eax
+        
+        pushfd          ; _efl
+        push cs         ; _cs0
+        push eax        ; _eip
+        push 0eeeh      ; _err
+        push 0fffh      ; _num
+        push esi        ; _esi
+        
+        mov esi, ecx
+        IDT_SAVE_CONTEXT 1,1,1
+        IDT_LOAD_CONTEXT 0
+        iretd
+        
+?g_TestSaveLoad@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z endp
+endif
+                 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Exceptions.
+;;; 
+        align 16
+_EdtEnter proc
+_EdtEnter0::             
+        EDT_ENTER_CLEAN       000h                            ; #DE Divide-by-Zero
+_EdtEnter1::
+        EDT_ENTER_CLEAN       001h                            ; #DB Debug Exception
+        EDT_ENTER_CLEAN       002h                            ; NMI Non-Maskable-Interrupt
+        EDT_ENTER_CLEAN       003h                            ; #BP Breakpoint
+        EDT_ENTER_CLEAN       004h                            ; #OF OVerflow
+        EDT_ENTER_CLEAN       005h                            ; #BR Bound-Range
+        EDT_ENTER_CLEAN       006h                            ; #UD Invalid Opcode
+        EDT_ENTER_CLEAN       007h                            ; #NM Device Not Available
+        EDT_ENTER_ERR         008h                            ; #DF Double Fault
+        EDT_ENTER_CLEAN       009h                            ; Unused (was x87 segment except)
+        EDT_ENTER_ERR         00ah                            ; #TS Invalid TSS
+        EDT_ENTER_ERR         00bh                            ; #NP Sgement Not Present
+        EDT_ENTER_ERR         00ch                            ; #SS Stack Exception
+        EDT_ENTER_ERR         00dh                            ; #GP General Protection
+        EDT_ENTER_ERR         00eh                            ; #PF Page Fault
+        EDT_ENTER_CLEAN       00fh                            ; Reserved
+        EDT_ENTER_CLEAN       010h                            ; #MF x87 Math Error
+        EDT_ENTER_ERR         011h                            ; #AC Alignment Check
+        EDT_ENTER_CLEAN       012h                            ; #MC Machine Check
+        EDT_ENTER_CLEAN       013h                            ; #XF SIMD Exception
+        EDT_ENTER_CLEAN       014h                            ; 014h exception
+        EDT_ENTER_CLEAN       015h                            ; 015h exception
+        EDT_ENTER_CLEAN       016h                            ; 016h exception
+        EDT_ENTER_CLEAN       017h                            ; 017h exception
+        EDT_ENTER_CLEAN       018h                            ; 018h exception
+        EDT_ENTER_CLEAN       019h                            ; 019h exception
+        EDT_ENTER_CLEAN       01ah                            ; 01ah exception
+        EDT_ENTER_CLEAN       01bh                            ; 01bh exception
+        EDT_ENTER_CLEAN       01ch                            ; 01ch exception
+        EDT_ENTER_CLEAN       01dh                            ; 01dh exception
+        EDT_ENTER_CLEAN       01eh                            ; 01eh exception
+        EDT_ENTER_CLEAN       01fh                            ; 01fh exception
+
+_EdtEnterBody::
+        push    esi
+
+ifdef PAGING
+        push    ss
+        pop     ds    ; Copy stack segment selector to DS so we can access memory!
+        push    ss
+        pop     es    ; Copy stack segment selector to ES so we can access memory!
+endif        
+
+        DBG_SCREEN_AS_VALUE 0b8020h, 01f301f40h ; @0
+
+ifdef PAGING
+        ; XXX if we've arrived from ring 3 FS will be invalid
+        push    Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPF - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+        pop     fs
+endif        
+
+        ;; Exceptions spill to the per-processor exceptionContext.
+        mov     esi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._processorContext]
+        lea     esi, [esi].Struct_Microsoft_Singularity_X86_ProcessorContext._exceptionContext
+
+        IDT_SAVE_CONTEXT 1,1,1 ; Save fxregs, error codes, and dregs.
+
+
+        ;; Link the per-processor exception to the faulting thread
+        mov     edi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        mov     eax, [edi].Struct_Microsoft_Singularity_X86_ThreadContext.__thread
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext.__thread, eax
+
+        ;; Link the per-processor thread context to the original thread context.
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._next, esi
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._prev, edi
+
+        DBG_EDX_FROM_EAX 0b8024h, 01f311f40h ; @1
+        
+        ;; Switch to the exception stack and adjust the stack limit values.
+        mov     esp, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._exceptionStackBegin]
+        mov     eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._exceptionStackLimit]
+        mov     edx, [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit, eax
+        mov     fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._exceptionStackPreLimit], edx
+
+        DBG_EDX_FROM_EAX 0b8028h, 01f321f40h ; @2
+        
+        ;; Call the exception handler.
+        mov     edx, esi
+        mov     eax, [?c_exceptionHandler@@3P6IXHPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@ZA]
+        call    eax
+
+        DBG_EDX_FROM_EAX 0b802ch, 01f331f40h ; @3
+
+        ;; mov     esi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._processorContext]
+        ;; lea     esi, [esi].Struct_Microsoft_Singularity_X86_ProcessorContext._exceptionContext
+
+        ;; Restore the stack limit (edi should still be good)
+        mov     eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._exceptionStackPreLimit]
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit, eax
+        
+        ;; Unlink the per-processor context.
+        mov     edi, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._prev
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._next, 0
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._prev, 0
+
+        IDT_LOAD_CONTEXT 1
+        
+        iretd
+        
+_EdtEnter endp
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Interrupts.
+;;; 
+
+        align 16
+_IdtEnter proc
+_IdtEnter20::             
+        IDT_ENTER_CLEAN       020h                            ; 021h: first interrupt
+_IdtEnter21::   
+        _num = 021h                                           ; 021h to 0ffh
+        WHILE _num LE 0ffh
+                IDT_ENTER_CLEAN       _num
+                _num = _num + 1
+        ENDM
+
+_IdtEnterBody::
+        push    esi
+
+ifdef PAGING
+        push    ss
+        pop     ds    ; Copy stack segment selector to DS so we can access memory!
+        push    ss
+        pop     es    ; Copy stack segment selector to ES so we can access memory!
+endif
+        
+        DBG_SCREEN_AS_VALUE 0b8000h, 01f301f40h ; @0
+
+ifdef PAGING
+        ; XXX if we've arrived from ring 3 FS will be invalid
+        push    Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPF - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+        pop     fs
+endif        
+    
+        ;; Interrupts spill to the thread's context.
+        mov     esi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+
+        IDT_SAVE_CONTEXT 1,0,0 ; Save fxregs, but not error codes or dregs.
+
+
+        DBG_EDX_FROM_EAX 0b8004h, 01f311f40h ; @1
+
+        ;; Switch to the interrupt stack and adjust the stack limit values.
+        mov     edi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        mov     esp, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackBegin]
+        mov     eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackLimit]
+        mov     edx, [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit, eax
+        mov     fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackPreLimit], edx
+
+        DBG_EDX_FROM_EAX 0b8008h, 01f321f40h ; @2
+
+        ;; Call the interrupt handler.
+        mov     edx, esi
+        mov     eax, [?c_interruptHandler@@3P6IXHPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@ZA]
+        call    eax
+
+        DBG_EDX_FROM_EAX 0b800ch, 01f331f40h ; @3
+
+        ;; Restore the stack limit (edi should still be good)
+        mov     eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackPreLimit]
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit, eax
+        
+        ;; Select the processor's thread context (may have been changed by scheduler).
+        mov     esi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+
+        IDT_LOAD_CONTEXT 0
+        
+        iretd
+        
+_IdtEnter endp
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Syscall via SYSENTER
+;;; 
+ifdef PAGING
+
+SYSENTER_IN STRUCT 1
+        _esi            UINT32          ?
+        _num            UINT32          ?
+SYSENTER_IN ENDS
+
+SYSENTER_SAVE_CONTEXT MACRO fxregs, dregs
+        ;; Save the processor's thread context.
+        ;; Input:
+        ;;      ESI = address of ThreadContext structure.
+        ;;      EDX = orig ESP
+        ;;      ECX = orig EIP
+        ;; Output:      
+        ;;      ESI = address of ThreadContext structure.
+        ;;      ESP = stack w/o IDT_ENTER_IN context
+        ;;      ECX = num
+        ;;
+
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eip, ecx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esp, edx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._cs0, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtUD - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull + 3
+        ;mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ss,  05bh  ; XXX no room at the inn
+
+        pushfd
+        pop     edx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._efl, edx
+
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eax, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebx, ebx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ecx, ecx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edx, edx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebp, ebp
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edi, edi
+        
+        mov     eax, [esp].SYSENTER_IN._esi
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esi, eax
+
+        mov     ecx, [esp].SYSENTER_IN._num            ;  this flows through
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._num, cx
+        
+        ;; XXX Need to save segment registers!!
+
+if dregs     
+        mov     eax, dr0
+        mov     ebx, dr1
+        mov     ecx, dr2
+        mov     edx, dr3
+        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr0, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr1, ebx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr2, ecx
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr3, edx
+
+        mov     eax, dr6
+        mov     ebx, dr7
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr6, eax
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr7, ebx
+        
+        xor     eax, eax
+        mov     dr6, eax
+endif        
+                        
+if fxregs
+if dregs        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 3
+else        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 1
+endif        
+        fxsave  [esi].Struct_Microsoft_Singularity_X86_ThreadContext._mmx
+        fninit
+        mov     eax, 37eh
+        push    eax
+        fldcw   [esp]
+        pop     eax
+else
+if dregs        
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 2
+else
+        mov     [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 0
+endif                
+endif
+        ;; XXX this is wrong for the ring 3 case...
+        add     esp, SIZEOF SYSENTER_IN
+
+ENDM        
+                 
+SYSENTER_LOAD_CONTEXT MACRO dregs
+        ;; Check if we need to restore the floating-point registers
+        test    [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 1
+        jz      skip_fxrstor
+        fxrstor [esi].Struct_Microsoft_Singularity_X86_ThreadContext._mmx
+skip_fxrstor:
+
+if dregs        
+        ;; Check if we need to restore the debug registers
+        test    [esi].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 2
+        jz      skip_drstor
+        
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr0
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr1
+        mov     ecx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr2
+        mov     edx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr3
+        
+        mov     dr0, eax
+        mov     dr1, ebx
+        mov     dr2, ecx
+        mov     dr3, edx
+        
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr6
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._dr7
+        
+        mov     dr6, eax
+        mov     dr7, ebx
+skip_drstor:
+endif        
+        
+        ;; Restore the registers
+        mov     eax, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eax
+        mov     ebx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebx
+        mov     ecx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ecx  ; pointless
+        mov     edx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edx  ; pointless
+        mov     ebp, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._ebp
+        mov     edi, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._edi
+
+        ;; We restore EIP into edx and ESP into ECX
+        mov     ecx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esp
+        mov     edx, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._eip
+
+
+        ;; Need to restore segment registers
+
+        ; Restore flags - is this necessary?
+        push    [esi].Struct_Microsoft_Singularity_X86_ThreadContext._efl
+        mov     esi, [esi].Struct_Microsoft_Singularity_X86_ThreadContext._esi
+        popfd
+ENDM        
+
+        align 16
+_SysEnter proc
+        ; SYSENTER doesn't put *anything* on the stack - the only way 
+        ; we can know the return EIP/ESP is if they are passed in registers.
+        ; On Windows there is only one SYSENTER instruction in ntdll, so sysexit
+        ; knows where to return to, and the ring 3 stack pointer is passed in edx.
+        ;
+        ; Entry state:   ss:esp0, cs:eip loaded from processor MSRs
+        ; 
+        push    0
+        push    02Fh 
+        push    esi     ; This is to make the stack frame look like IDT_ENTER_ expects
+
+        push    ss
+        pop     ds      ; Copy stack segment selector to DS so we can access memory!
+
+        DBG_SCREEN_AS_VALUE 0b8000h, 01f301f40h ; @0
+
+        ; XXX if we've arrived from ring 3 FS will be invalid
+        push    Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPF - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+        pop     fs
+        push    ss
+        pop     es      ; Copy stack segment selector to ES so we can access memory!
+    
+        ;; Interrupts spill to the thread's context.
+        mov     esi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+
+        ;; XXX - Can save some time by not saving caller-save regs 
+        SYSENTER_SAVE_CONTEXT 1,0 ; Save fxregs, but not error codes or dregs.
+
+        DBG_EDX_FROM_EAX 0b8004h, 01f311f40h ; @1
+
+        ;; Switch to the interrupt stack and adjust the stack limit values.
+        mov     edi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        mov     esp, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackBegin]
+        mov     eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackLimit]
+        mov     edx, [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit, eax
+        mov     fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackPreLimit], edx
+
+        DBG_EDX_FROM_EAX 0b8008h, 01f321f40h ; @2
+
+        ;; Call the interrupt handler.
+        mov     edx, esi
+        mov     eax, [?c_interruptHandler@@3P6IXHPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@ZA]
+        call    eax
+
+        DBG_EDX_FROM_EAX 0b800ch, 01f331f40h ; @3
+
+        ;; Restore the stack limit (edi should still be good)
+        mov     eax, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._interruptStackPreLimit]
+        mov     [edi].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit, eax
+        
+        ;; Select the processor's thread context (may have been changed by scheduler).
+        mov     esi, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+
+        ; 
+        SYSENTER_LOAD_CONTEXT 0
+    
+        ; SYSEXIT does the following
+        ; EIP <-- EDX
+        ; ESP <-- ECX
+        ; CS  <-- MSR[IA32_CS_SYSENTER] + 0x18
+        sysexit
+        
+_SysEnter endp
+
+endif
+        
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; void Processor.SwitchToThreadContext(ref X86_ThreadContext newContext);
+;   Saves the current context and load the new context from
+;   newContext(ecx), effectively switching contexts between threads.
+;   Always returns executing in the new context.
+;   The code after _SwitchedInContextSwitch will only run if the context was
+;   switch out using this routine.
+;
+; precondition: Scheduler.dispatchLock held
+;
+align 16
+?g_SwitchToThreadContextNoGC@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z proc
+        ;; Save the old processor context.
+
+        pushfd
+        
+        ;; From here on we need interrupts disabled.
+        cli
+        
+        mov     edx, fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        
+        ;; On clean switch, no need to save caller-saved registers (eax,ecx,edx,fxsave)
+ifdef PAGING        
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._cs0, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPC - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+endif        
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._ebx, ebx
+
+        pop     eax                                     ; pop flags from stack.
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._efl, eax
+        
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._esp, esp
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._ebp, ebp
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._esi, esi
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._edi, edi
+ifdef PAGING        
+        mov     eax, CR3
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._cr3, eax
+endif        
+        
+        lea     eax, _SwitchedInContextSwitch
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._eip, eax
+
+ifdef THREAD_TIME_ACCOUNTING
+        ;; thread execution time accouting
+        ;; Get and save current timestamp
+        mov     ebx, edx       ; save edx
+        rdtsc                  ; -> edx:eax
+
+        push    eax            ; save timestamp for later use
+        push    edx
+
+        ;; now - old.lastExecutionTimeUpdate
+        sub     eax, dword ptr [ebx    ].Struct_Microsoft_Singularity_X86_ThreadContext._lastExecutionTimeUpdate
+        sbb     edx, dword ptr [ebx + 4].Struct_Microsoft_Singularity_X86_ThreadContext._lastExecutionTimeUpdate
+
+        ;; old.executionTime += now - old.lastExecutionTimeUpdate
+        add     dword ptr [ebx    ].Struct_Microsoft_Singularity_X86_ThreadContext._executionTime, eax
+        adc     dword ptr [ebx + 4].Struct_Microsoft_Singularity_X86_ThreadContext._executionTime, edx
+
+        pop     edx            ; restore timestamp
+        pop     eax
+
+        ;; new.lastExecutionTimeUpdate = now
+        mov     dword ptr [ecx    ].Struct_Microsoft_Singularity_X86_ThreadContext._lastExecutionTimeUpdate, eax
+        mov     dword ptr [ecx + 4].Struct_Microsoft_Singularity_X86_ThreadContext._lastExecutionTimeUpdate, edx
+
+        mov     edx, ebx       ; restore edx
+        ;; End thread execution time accouting
+endif
+        ;; On clean switch, no need to save caller-saved registers
+        ; fxsave  [edx].Struct_Microsoft_Singularity_X86_ThreadContext._mmx
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._regs, 0
+
+        ;; The old context has been saved, so we can now release the dispatch
+        ;; lock and let other processors load the old context.
+        ;; (We've released the old stack pointer and haven't yet
+        ;; set up a new stack pointer, so the following code
+        ;; does not touch the stack.)
+        ;; This code duplicates code from SpinLock.Release.
+
+if SPINLOCK_RELEASE_SANITY_CHECK
+        ; if (this.lockWord != 1 || this.lockingThreadIndexPlusOne-1 != currentThreadId) throw ...
+        cmp     ?c_dispatchLock@Class_Microsoft_Singularity_Scheduling_Scheduler@@2?AUStruct_System_Threading_SpinLock@@A.Struct_System_Threading_SpinLock._lockWord, 1
+        je      spinLockOk1
+        int     3
+        spinLockOk1:
+        mov     eax, ?c_dispatchLock@Class_Microsoft_Singularity_Scheduling_Scheduler@@2?AUStruct_System_Threading_SpinLock@@A.Struct_System_Threading_SpinLock._lockingThreadIndexPlusOne
+        sub     eax, 1
+        cmp     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._threadIndex, ax
+        je      spinLockOk2
+        int     3
+        spinLockOk2:
+endif ; SPINLOCK_RELEASE_SANITY_CHECK
+        ; this.lockingThreadIndexPlusOne = 0;
+        ; this.lockWord = 0;
+        mov     ?c_dispatchLock@Class_Microsoft_Singularity_Scheduling_Scheduler@@2?AUStruct_System_Threading_SpinLock@@A.Struct_System_Threading_SpinLock._lockingThreadIndexPlusOne, 0
+        mov     ?c_dispatchLock@Class_Microsoft_Singularity_Scheduling_Scheduler@@2?AUStruct_System_Threading_SpinLock@@A.Struct_System_Threading_SpinLock._lockWord, 0
+
+        ;; Load the new processor context.
+
+        mov     fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext], ecx
+        mov     esi, ecx
+
+        IDT_LOAD_CONTEXT 0
+        
+        iretd
+        
+_SwitchedInContextSwitch:
+        ret
+        
+?g_SwitchToThreadContextNoGC@Class_Microsoft_Singularity_Processor@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@@Z endp
+
+ifdef DOUBLE_FAULT_HANDLER
+align 16
+?CallTaskGate@@YIXGI@Z proc
+;
+; FAR JMP to double-fault task gate.  This is hand-coded, because I can't figure out
+; how to make MASM do this for me.
+;
+        db      09Ah                ; CALL FAR PTR
+        dd      0
+        dw      Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtDFG - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+        
+        ret
+?CallTaskGate@@YIXGI@Z endp
+
+PRINTAL MACRO
+        mov     ah, 0ah;0ah
+        mov     [edx], ax
+        add     edx, 2
+ENDM
+        
+PRINTC MACRO num
+        mov     al, num
+        mov     ah, 02h;0ah
+        mov     [edx], ax
+        add     edx, 2        
+ENDM
+        
+; DoubleFault
+;   Entered in 32-bit protected mode.
+PUBLIC ?DoubleFault@@YIXXZ
+?DoubleFault@@YIXXZ PROC NEAR
+    mov     edx, 0b8000h
+
+    PRINTC  '*'
+    PRINTC  '*'
+    PRINTC  '2'
+    PRINTC  '*'
+    PRINTC  '*'
+    PRINTC  ' '
+
+    PRINTC  'e'
+    PRINTC  'b'
+    PRINTC  'p'
+    mov     ecx, ebp
+    call    printdw
+
+    PRINTC  'e'
+    PRINTC  'f'
+    PRINTC  'l'
+    pushfd
+    pop     ecx
+    call    printdw
+
+    PRINTC  'e'
+    PRINTC  'f'
+    PRINTC  'l'
+    pushfd
+    pop     ecx
+;     or      ecx, 04000h                                 
+;     push    ecx
+;     popfd
+    call    printdw
+
+    mov     edx, 0b8000h + 160
+        
+    PRINTC  'c'
+    PRINTC  's'
+    push    cs
+    pop     cx
+    call    printw
+
+    PRINTC  's'
+    PRINTC  's'
+    mov     cx, ss
+    call    printw
+
+    PRINTC  'd'
+    PRINTC  's'
+    mov     cx, ds
+    call    printw
+
+    PRINTC  'e'
+    PRINTC  's'
+    mov     cx, es
+    call    printw
+
+    PRINTC  'f'
+    PRINTC  's'
+    mov     cx, fs
+    call    printw
+
+    PRINTC  'g'
+    PRINTC  's'
+    mov     cx, gs
+    call    printw
+
+    PRINTC  't'
+    PRINTC  'r'
+    str     cx
+    call    printw
+
+    mov     edx, 0b8000h + 160 * 2
+        
+    PRINTC  'e'
+    PRINTC  's'
+    PRINTC  'p'
+    mov     ecx, esp
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '0'
+    mov     ecx, [esp]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '4'
+    mov     ecx, [esp+4]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '8'
+    mov     ecx, [esp+8]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '1'
+    PRINTC  '2'
+    mov     ecx, [esp+12]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '1'
+    PRINTC  '6'
+    mov     ecx, [esp+16]
+    call    printdw
+
+    mov     edx, 0b8000h + 160 * 3
+        
+    PRINTC  'e'
+    PRINTC  's'
+    PRINTC  'i'
+    mov     ecx, esi
+    call    printdw
+
+    PRINTC  'p'
+    PRINTC  't'
+    mov     cx, [esi].Struct_Microsoft_Singularity_X86_TSS._previous_tss
+    call    printw
+
+    PRINTC  'e'
+    PRINTC  's'
+    PRINTC  'p'
+    mov     ecx, [esi].Struct_Microsoft_Singularity_X86_TSS._esp
+    call    printdw
+
+    PRINTC  'e'
+    PRINTC  'i'
+    PRINTC  'p'
+    mov     ecx, [esi].Struct_Microsoft_Singularity_X86_TSS._eip
+    call    printdw
+
+    PRINTC  'e'
+    PRINTC  'f'
+    PRINTC  'l'
+    mov     ecx, [esi].Struct_Microsoft_Singularity_X86_TSS._eflags
+    call    printdw
+
+    PRINTC  'c'
+    PRINTC  'r'
+    PRINTC  '3'
+    mov     ecx, [esi].Struct_Microsoft_Singularity_X86_TSS._cr3
+    call    printdw
+
+    PRINTC  'u'
+    mov     cx, [esi].Struct_Microsoft_Singularity_X86_TSS._trap_bit
+    call    printw
+
+    mov     edx, 0b8000h + 160 * 4
+        
+    PRINTC  'e'
+    PRINTC  'd'
+    PRINTC  'i'
+    mov     ecx, edi
+    call    printdw
+
+    PRINTC  'p'
+    PRINTC  't'
+    mov     cx, [edi].Struct_Microsoft_Singularity_X86_TSS._previous_tss
+    call    printw
+
+    PRINTC  'e'
+    PRINTC  's'
+    PRINTC  'p'
+    mov     ecx, [edi].Struct_Microsoft_Singularity_X86_TSS._esp
+    call    printdw
+
+    PRINTC  'e'
+    PRINTC  'i'
+    PRINTC  'p'
+    mov     ecx, [edi].Struct_Microsoft_Singularity_X86_TSS._eip
+    call    printdw
+
+    PRINTC  'e'
+    PRINTC  'f'
+    PRINTC  'l'
+    mov     ecx, [edi].Struct_Microsoft_Singularity_X86_TSS._eflags
+    call    printdw
+
+    PRINTC  'c'
+    PRINTC  'r'
+    PRINTC  '3'
+    mov     ecx, [edi].Struct_Microsoft_Singularity_X86_TSS._cr3
+    call    printdw
+
+    PRINTC  'u'
+    mov     cx, [edi].Struct_Microsoft_Singularity_X86_TSS._trap_bit
+    call    printw
+
+    mov     edx, 0b8000h + 160 * 5
+    mov     ebp, [esi].Struct_Microsoft_Singularity_X86_TSS._esp
+        
+    PRINTC  'e'
+    PRINTC  's'
+    PRINTC  'p'
+    mov     ecx, ebp
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '0'
+    mov     ecx, [ebp]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '4'
+    mov     ecx, [ebp+4]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '8'
+    mov     ecx, [ebp+8]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '1'
+    PRINTC  '2'
+    mov     ecx, [ebp+12]
+    call    printdw
+
+    PRINTC  '+'
+    PRINTC  '1'
+    PRINTC  '6'
+    mov     ecx, [ebp+16]
+    call    printdw
+
+        
+    iretd ;     // note, should clear CR0.TS                                          
+again:
+    jmp again
+
+?DoubleFault@@YIXXZ ENDP
+
+; Print a DWORD to the screen
+;   [in]  ecx = dword to print
+;   [in]  edx = address of screen
+;   [use] eax = trashed for temporary
+;
+printdw PROC NEAR
+    PRINTC  ':'
+        
+    mov     eax, ecx
+    shr     eax, 28
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print28
+    add     eax, 7h
+print28:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 24
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print24
+    add     eax, 7h
+print24:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 20
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print20
+    add     eax, 7h
+print20:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 16
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print16
+    add     eax, 7h
+print16:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 12
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print12
+    add     eax, 7h
+print12:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 08
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print08
+    add     eax, 7h
+print08:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 04
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print04
+    add     eax, 7h
+print04:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 00
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print00
+    add     eax, 7h
+print00:
+    PRINTAL        
+
+    PRINTC  ' '
+
+    ret
+printdw ENDP
+                
+; Print a WORD to the screen
+;   [in]  ecx = word to print (in low 16-bits, high 16-bits ignored)
+;   [in]  edx = address of screen
+;   [use] eax = trashed for temporary
+;
+printw PROC NEAR
+    PRINTC  ':'
+        
+    mov     eax, ecx
+    shr     eax, 12
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print12
+    add     eax, 7h
+print12:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 08
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print08
+    add     eax, 7h
+print08:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 04
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print04
+    add     eax, 7h
+print04:
+    PRINTAL        
+
+    mov     eax, ecx
+    shr     eax, 00
+    and     eax, 0fh
+    add     eax, 030h
+    cmp     eax, 03ah
+    jl      print00
+    add     eax, 7h
+print00:
+    PRINTAL        
+
+    PRINTC  ' '
+
+    ret
+printw ENDP
+endif ;; DOUBLE_FAULT_HANDLER
+                        
+END
diff --git a/base/Kernel/Native/halkd.cpp b/base/Kernel/Native/halkd.cpp
new file mode 100644
index 0000000..42c6a1e
--- /dev/null
+++ b/base/Kernel/Native/halkd.cpp
@@ -0,0 +1,3001 @@
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  halkd.cpp: runtime support for debugging
+//
+//  For more information see:
+//      \nt\base\ntos\kd64
+//      \nt\base\boot\kdcom
+//      \nt\base\boot\kd1394
+//      \nt\base\boot\kdusb2
+//      \nt\sdktools\debuggers\ntsd64
+//
+#include "hal.h"
+#include "halkd.h"
+
+extern "C" void *  __cdecl memcpy(void *, const void *, size_t);
+extern "C" void *  __cdecl memset(void *, int, size_t);
+
+//
+// Debugger Debugging
+//
+#define KDDBG if (0) kdprintf
+#define KDDBG2 if (0) kdprintf
+
+#if defined(_IA64_)
+#define SIGN_EXTEND_PTR(p) p
+#else
+#define SIGN_EXTEND_PTR(p) ((ULONG_PTR)(LONG_PTR)(LONG)(p))
+#endif
+
+#define KeProcessorLevel 15
+
+//
+// Globals
+//
+extern const Struct_Microsoft_Singularity_BootInfo *g_pBootInfo;
+static Struct_Microsoft_Singularity_X86_IDTP g_idt;
+
+BOOL KdDebuggerNotPresent = FALSE;
+
+#define KDP_MESSAGE_BUFFER_SIZE 4096
+static CHAR KdpMessageBuffer[KDP_MESSAGE_BUFFER_SIZE];
+static BOOL KdpContextSent;
+
+static KPROCESSOR_STATE KdpProcessorState[MAX_CPU];
+static KD_CONTEXT KdpContext;
+static int KeNumberProcessors = 1;
+static UINT16 KdpSpinBase = 0x2f00;
+
+KDP_BREAKPOINT_TYPE KdpBreakpointInstruction = KDP_BREAKPOINT_VALUE;
+BREAKPOINT_ENTRY KdpBreakpointTable[BREAKPOINT_TABLE_SIZE] = {0};
+
+//
+// KdpRetryCount controls the number of retries before we give
+// up and assume kernel debugger is not present.
+// KdpNumberRetries is the number of retries left.  Initially,
+// it is set to 5 such that booting NT without debugger won't be
+// delayed to long.
+//
+ULONG KdCompNumberRetries = 5;
+ULONG KdCompRetryCount    = 5;
+ULONG KdPacketId = 0;
+
+void (*KdSendPacket)(ULONG PacketType,
+                     IN PSTRING MessageHeader,
+                     IN PSTRING MessageData OPTIONAL,
+                     IN OUT PKD_CONTEXT KdContext) = NULL;
+KDP_STATUS (*KdReceivePacket)(IN ULONG PacketType,
+                         OUT PSTRING MessageHeader,
+                         OUT PSTRING MessageData,
+                         OUT PULONG DataLength,
+                         IN OUT PKD_CONTEXT KdContext) = NULL;
+bool (*KdPollBreakIn)() = NULL;
+
+//
+// Static data - these are walked by the kernel debugger
+//
+
+//PsLoadedModuleList ===========================================================
+
+struct KLDR_DATA_TABLE_ENTRY_WITH_NAME : KLDR_DATA_TABLE_ENTRY
+{
+    WCHAR   wzName[32];
+};
+
+static KLDR_DATA_TABLE_ENTRY_WITH_NAME KdModuleKernelEntry[128];
+static ULONG KdModuleKernelUsed = 0;
+static LIST_ENTRY PsLoadedModuleList;
+static PMINIDUMP_MODULE_LIST KdMinidumpModuleList = NULL;
+
+// KdVersionBlock =============================================================
+
+static DBGKD_GET_VERSION64 KdVersionBlock = {
+    DBGKD_MAJOR_SINGULARITY << 8, // MajorVersion ... this one sort of works
+    0, // Minor
+    DBGKD_64BIT_PROTOCOL_VERSION2, // Protocol
+    DBGKD_VERS_FLAG_NOMM, //DBGKD_VERS_FLAG_DATA, // Flags
+    IMAGE_FILE_MACHINE_I386, // Machine Type
+    PACKET_TYPE_MAX, // Max packet
+    DbgKdMaximumStateChange - DbgKdMinimumStateChange, // MaxStateChange
+    DbgKdSetContextApi /*DbgKdMaximumManipulate*/ - DbgKdMinimumManipulate, // MaxManipulate we support
+    0, // Simulation
+    0, // Unused
+    0, // KernBase
+    (ULONG64)&PsLoadedModuleList, // PsLoadedModuleList
+    0 // DebuggerDataList
+};
+
+// ========================================================================
+
+// Forward declarations
+
+static void KdpLock(void);
+static void KdpUnlock(void);
+
+static void KdpEnter(void);
+static void KdpLeave(void);
+
+static void KdpFakeOutPsLoadedModuleList(void);
+
+static KCONTINUE_STATUS
+KdpSendWaitContinue(
+    IN ULONG OutPacketType,
+    IN PSTRING OutMessageHeader,
+    IN PSTRING OutMessageData OPTIONAL,
+    IN OUT Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    );
+
+static void LoadedBinary(Struct_Microsoft_Singularity_X86_ThreadContext *context);
+static void UnloadedBinary(Struct_Microsoft_Singularity_X86_ThreadContext *context);
+
+extern int printf(const char *pszFmt, ...);
+
+///////////////////////////////////////// Debugger Unique Interrupts Routines.
+//
+//  NB: Without these, we share routines with the mainline code and we get
+//  caught in a loop when the debugger inserts a break after the pushfd when
+//  someone tries to single step through Processor:g_DisableInterrupts!
+//
+static __declspec(naked) bool KdpDisableInterrupts()
+{
+    __asm {
+        pushfd;
+        pop eax;
+        test eax, Struct_Microsoft_Singularity_X86_EFlags_IF;
+        setnz al;
+        nop;    // required so that the linker doesn't combine with g_Disable
+        cli;
+        ret;
+    }
+}
+
+static __declspec(naked) void KdpRestoreInterrupts(bool enabled)
+{
+    __asm {
+        nop;
+        test cl, cl;
+        je done;
+        nop;    // required so that the linker doesn't combine with g_Restore
+        sti;
+      done:
+        ret;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static volatile INT32 KdpInDebugger = 0;
+static volatile bool KdpInDebuggerIntEnabled = FALSE;
+
+#define MAXIMUM_RETRIES 20
+
+static void KdpNulSendPacket(ULONG PacketType,
+                             IN PSTRING MessageHeader,
+                             IN PSTRING MessageData OPTIONAL,
+                             IN OUT PKD_CONTEXT KdContext)
+{
+}
+
+static KDP_STATUS KdpNulReceivePacket(IN ULONG PacketType,
+                                      OUT PSTRING MessageHeader,
+                                      OUT PSTRING MessageData,
+                                      OUT PULONG DataLength,
+                                      IN OUT PKD_CONTEXT KdContext)
+{
+    return KDP_PACKET_TIMEOUT;
+}
+
+static bool KdpNulPollBreakIn()
+{
+    return false;
+}
+
+void KdInitialize(Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    KdpLock();
+
+    if (KdpComInit(bi)) {
+        KdpSpinBase = 0x2f00;
+        KdSendPacket = KdpComSendPacket;
+        KdReceivePacket = KdpComReceivePacket;
+        KdPollBreakIn = KdpComPollBreakIn;
+        kdprintf("Serial Port (bi->DebugBasePort=%x).\n", bi->DebugBasePort);
+    }
+    else if (Kdp1394Init(bi)) {
+        KdpSpinBase = 0x4f00;
+        KdSendPacket = Kdp1394SendPacket;
+        KdReceivePacket = Kdp1394ReceivePacket;
+        KdPollBreakIn = Kdp1394PollBreakIn;
+        kdprintf("1394 Port (bi->DebugBasePort=%x).\n", bi->DebugBasePort);
+    }
+    else {
+        kdprintf("No debugger.\n");
+        KdSendPacket = KdpNulSendPacket;
+        KdReceivePacket = KdpNulReceivePacket;
+        KdPollBreakIn = KdpNulPollBreakIn;
+        KdDebuggerNotPresent = true;
+    }
+
+    // Retries are set to this after boot
+    KdpContext.KdpDefaultRetries = MAXIMUM_RETRIES;
+
+    KdpUnlock();
+
+    KdpFakeOutPsLoadedModuleList();
+}
+
+static void KdpLock()
+{
+    for (;;) {
+        bool enabled = KdpDisableInterrupts();
+        if (InterlockedCompareExchange(&KdpInDebugger, 1, 0) == 0) {
+            KdpInDebuggerIntEnabled = enabled;
+            return;
+        }
+        KdpRestoreInterrupts(enabled);
+        __asm pause
+    }
+}
+
+static void KdpUnlock()
+{
+    KdpInDebugger = 0;
+    KdpRestoreInterrupts(KdpInDebuggerIntEnabled);
+}
+
+static void KdpEnter()
+{
+    if (KeNumberProcessors > 1) {
+        Class_Microsoft_Singularity_MpExecution::g_FreezeAllProcessors();
+    }
+}
+
+static void KdpLeave()
+{
+    if (KeNumberProcessors > 1) {
+        Class_Microsoft_Singularity_MpExecution::g_ThawAllProcessors();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+extern int strformat(void (*pfOutput)(void *pContext, char c), void *pContext,
+                     const char * pszFmt, va_list args);
+
+#define KD_LEFT     0
+#define KD_HEIGHT   46
+
+static UINT16 kdcurs = KD_LEFT;
+static UINT16 kdattr = 0x2f00;
+
+static void koutput(void *pContext, char c)
+{
+    //
+    // Update cursor position
+    //
+    if ((kdcurs % 80) < KD_LEFT) {
+        kdcurs += KD_LEFT - (kdcurs % 80);
+    }
+
+    if (kdcurs >= KD_HEIGHT * 80) {
+        for (UINT16 i = 0; i < KD_HEIGHT - 1; i++) {
+            for (UINT16 j = KD_LEFT; j < 80; j++) {
+                ((UINT16 *)0xb8000)[i*80+j] = ((UINT16 *)0xb8000)[i*80+80+j];
+            }
+        }
+        for (UINT16 j = KD_LEFT; j < 80; j++) {
+            ((UINT16 *)0xb8000)[(KD_HEIGHT-1)*80+j] = kdattr | ' ';
+        }
+        kdcurs = kdcurs - 80;
+    }
+
+    //
+    // Output character
+    //
+    if (c >= ' ' && c <= '~') {
+        ((UINT16 *)0xb8000)[kdcurs++] = kdattr | c;
+    }
+    else if (c == '\t') {
+        kdcurs += 8 - (kdcurs % 8);
+    }
+    else if (c == '\n') {
+        while ((kdcurs % 80) != 0) {
+            ((UINT16 *)0xb8000)[kdcurs++] = kdattr | ' ';
+        }
+    }
+    else if (c == '\r') {
+        kdcurs -= (kdcurs % 80);
+    }
+    else if (c == '\f') {
+        kdcurs = 0;
+    }
+}
+
+void kdprints(const char * pszFmt)
+{
+    while (*pszFmt) {
+        koutput(NULL, *pszFmt++);
+    }
+}
+
+void kdprintf(const char * pszFmt, ...)
+{
+    va_list args;
+
+    va_start(args, pszFmt);
+    strformat(koutput, NULL, pszFmt, args);
+    va_end(args);
+}
+
+void KdpSpin()
+{
+    static UINT8 state = 0;
+
+    *((UINT16 *)0xb809e) = KdpSpinBase + ("+-|*" [state++ & 0x3]);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+ULONG KdpComputeChecksum(IN PCHAR Buffer, IN ULONG Length)
+{
+    // Compute the checksum for the string passed in.
+    ULONG   Checksum = 0;
+
+    while (Length > 0) {
+        Checksum = Checksum + (ULONG)*(PUCHAR)Buffer++;
+        Length--;
+    }
+
+    return(Checksum);
+} // KdpComputeChecksum
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static
+VOID KdSingularityToWindbgContext(IN CONST Struct_Microsoft_Singularity_X86_ThreadContext *singularity,
+                                  OUT CONTEXT *windbg)
+{
+    RtlZeroMemory(windbg, sizeof(*windbg));
+
+    windbg->ContextFlags = (CONTEXT_CONTROL |
+                            CONTEXT_INTEGER |
+                            CONTEXT_SEGMENTS |
+                            CONTEXT_DEBUG_REGISTERS);
+
+    // CONTEXT_FULL;
+    windbg->Eax = singularity->eax;
+    windbg->Ebx = singularity->ebx;
+    windbg->Ecx = singularity->ecx;
+    windbg->Edx = singularity->edx;
+    windbg->Esp = singularity->esp;
+    windbg->Ebp = singularity->ebp;
+    windbg->Esi = singularity->esi;
+    windbg->Edi = singularity->edi;
+    windbg->Eip = singularity->eip;
+    windbg->EFlags = singularity->efl;
+
+    // CONTEXT_FLOATING_POINT
+    if (singularity->regs) {
+        windbg->ContextFlags |= CONTEXT_FLOATING_POINT;
+
+#if 0
+        PUCHAR pmmx = (PUCHAR)&singularity->mmx;
+        kdprintf("  MMX=%02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x\n",
+                 pmmx[0], pmmx[1], pmmx[2], pmmx[3],
+                 pmmx[4], pmmx[5], pmmx[6], pmmx[7],
+                 pmmx[8], pmmx[9], pmmx[10], pmmx[11],
+                 pmmx[12], pmmx[13], pmmx[14], pmmx[15]);
+        kdprintf("  MMX=%04x %04x %02x %03x %04x:%08x %04x:%08x\n",
+                 singularity->mmx.fcw,
+                 singularity->mmx.fsw,
+                 singularity->mmx.ftw,
+                 singularity->mmx.fop,
+                 singularity->mmx.cs,
+                 singularity->mmx.eip,
+                 singularity->mmx.ds,
+                 singularity->mmx.dp);
+#endif
+
+        windbg->FloatSave.ControlWord = singularity->mmx.fcw;
+        windbg->FloatSave.StatusWord = singularity->mmx.fsw;
+        windbg->FloatSave.TagWord = singularity->mmx.ftw;
+        windbg->FloatSave.ErrorOffset = singularity->mmx.eip;
+        windbg->FloatSave.ErrorSelector = singularity->mmx.cs;
+        windbg->FloatSave.DataOffset = singularity->mmx.dp;
+        windbg->FloatSave.DataSelector = singularity->mmx.ds;
+
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+0, &singularity->mmx.st0, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+10, &singularity->mmx.st1, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+20, &singularity->mmx.st2, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+30, &singularity->mmx.st3, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+40, &singularity->mmx.st4, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+50, &singularity->mmx.st5, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+60, &singularity->mmx.st6, 10);
+        memcpy((uint8*)windbg->FloatSave.RegisterArea+70, &singularity->mmx.st7, 10);
+    }
+
+    // CONTEXT_EXTENDED_REGISTERS
+    if (singularity->regs & 1) {
+        windbg->ContextFlags |= CONTEXT_EXTENDED_REGISTERS;
+        memcpy(windbg->ExtendedRegisters, &singularity->mmx, 512);
+    }
+
+    //
+    // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is
+    // set in ContextFlags.  Note that CONTEXT_DEBUG_REGISTERS is NOT
+    // included in CONTEXT_FULL.
+    //
+    windbg->Dr0 = singularity->dr0;
+    windbg->Dr1 = singularity->dr1;
+    windbg->Dr2 = singularity->dr2;
+    windbg->Dr3 = singularity->dr3;
+    windbg->Dr6 = singularity->dr6;
+    windbg->Dr7 = singularity->dr7;
+
+#if 0
+    __asm {
+        mov ebx, windbg;
+
+        mov eax, dr0;
+        mov [ebx]CONTEXT.Dr0, eax;
+        mov eax, dr1;
+        mov [ebx]CONTEXT.Dr1, eax;
+        mov eax, dr2;
+        mov [ebx]CONTEXT.Dr2, eax;
+        mov eax, dr3;
+        mov [ebx]CONTEXT.Dr3, eax;
+        mov eax, dr6;
+        mov [ebx]CONTEXT.Dr6, eax;
+        mov eax, dr7;
+        mov [ebx]CONTEXT.Dr7, eax;
+    }
+#endif
+
+#if 1
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contains the flag CONTEXT_SEGMENTS.
+    //
+    __asm {
+        mov ebx, windbg;
+
+        xor eax, eax;
+        mov ax, gs;
+        mov [ebx]CONTEXT.SegGs, eax;
+        mov ax, fs;
+        mov [ebx]CONTEXT.SegFs, eax;
+        mov ax, es;
+        mov [ebx]CONTEXT.SegEs, eax;
+        mov ax, ds;
+        mov [ebx]CONTEXT.SegDs, eax;
+    }
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contains the flag CONTEXT_CONTROL.
+    //
+
+    __asm {
+        mov ebx, windbg;
+
+        xor eax, eax;
+        mov ax, ss;
+        mov [ebx]CONTEXT.SegSs, eax;
+    }
+
+    windbg->SegCs = singularity->cs0;
+#endif
+}
+
+VOID KdWindbgToSingularityContext(IN CONST CONTEXT *windbg,
+                                  OUT Struct_Microsoft_Singularity_X86_ThreadContext *singularity)
+{
+    singularity->eax = windbg->Eax;
+    singularity->ebx = windbg->Ebx;
+    singularity->ecx = windbg->Ecx;
+    singularity->edx = windbg->Edx;
+    singularity->esp = windbg->Esp;
+    singularity->ebp = windbg->Ebp;
+    singularity->esi = windbg->Esi;
+    singularity->edi = windbg->Edi;
+    singularity->eip = windbg->Eip;
+    singularity->efl = windbg->EFlags;
+
+    // CONTEXT_FLOATING_POINT
+    if (windbg->ContextFlags & CONTEXT_FLOATING_POINT) {
+        singularity->mmx.fcw = (uint16)windbg->FloatSave.ControlWord;
+        singularity->mmx.fsw = (uint16)windbg->FloatSave.StatusWord;
+        singularity->mmx.ftw = (uint16)windbg->FloatSave.TagWord;
+        singularity->mmx.cs = (uint16)windbg->FloatSave.ErrorSelector;
+        singularity->mmx.eip = windbg->FloatSave.ErrorOffset;
+        singularity->mmx.ds = (uint16)windbg->FloatSave.DataSelector;
+        singularity->mmx.dp = windbg->FloatSave.DataOffset;
+        memcpy(&singularity->mmx.st0, windbg->FloatSave.RegisterArea+0, 10);
+        memcpy(&singularity->mmx.st1, windbg->FloatSave.RegisterArea+10, 10);
+        memcpy(&singularity->mmx.st2, windbg->FloatSave.RegisterArea+20, 10);
+        memcpy(&singularity->mmx.st3, windbg->FloatSave.RegisterArea+30, 10);
+        memcpy(&singularity->mmx.st4, windbg->FloatSave.RegisterArea+40, 10);
+        memcpy(&singularity->mmx.st5, windbg->FloatSave.RegisterArea+50, 10);
+        memcpy(&singularity->mmx.st6, windbg->FloatSave.RegisterArea+60, 10);
+        memcpy(&singularity->mmx.st7, windbg->FloatSave.RegisterArea+70, 10);
+    }
+
+    // CONTEXT_EXTENDED_REGISTERS
+    if (windbg->ContextFlags & CONTEXT_EXTENDED_REGISTERS) {
+        memcpy(&singularity->mmx, windbg->ExtendedRegisters, 512);
+    }
+
+    //
+    // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is
+    // set in ContextFlags.  Note that CONTEXT_DEBUG_REGISTERS is NOT
+    // included in CONTEXT_FULL.
+    //
+    if (windbg->ContextFlags & CONTEXT_DEBUG_REGISTERS) {
+        singularity->dr0 = windbg->Dr0;
+        singularity->dr1 = windbg->Dr1;
+        singularity->dr2 = windbg->Dr2;
+        singularity->dr3 = windbg->Dr3;
+        singularity->dr6 = windbg->Dr6;
+        singularity->dr7 = windbg->Dr7;
+#if 0
+        __asm {
+            mov ebx, windbg;
+            mov eax, [ebx]CONTEXT.Dr0;
+            mov dr0, eax;
+            mov eax, [ebx]CONTEXT.Dr1;
+            mov dr1, eax;
+            mov eax, [ebx]CONTEXT.Dr2;
+            mov dr2, eax;
+            mov eax, [ebx]CONTEXT.Dr3;
+            mov dr3, eax;
+            mov eax, 0; //CONTEXT.Dr6 : DR6 is reset when changing BPTs.
+            mov dr6, eax;
+            mov eax, [ebx]CONTEXT.Dr7;
+            mov eax, dr7;
+        }
+#endif
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+//
+// Misc KD functions
+//
+
+
+NTSTATUS
+KdpCopyMemoryChunks(
+    ULONG64 Address,
+    PVOID Buffer,
+    ULONG TotalSize,
+    ULONG ChunkSize,
+    ULONG Flags,
+    PULONG ActualSize OPTIONAL
+    )
+    //  Routine Description:
+    //      Copies memory to/from a buffer to/from a system address.
+    //      The address can be physical or virtual.
+    //      The buffer is assumed to be valid for the duration of this call.
+    //
+    //  Arguments:
+    //      Address - System address.
+    //      Buffer - Buffer to read from or write to.
+    //      TotalSize - Number of bytes to read/write.
+    //      ChunkSize - Maximum single item transfer size, must
+    //                  be 1, 2, 4 or 8.
+    //                  0 means choose a default.
+    //      Flags - MMDBG_COPY flags for MmDbgCopyMemory.
+    //      ActualSize - Number of bytes actually read/written.
+    //
+    //  Return Value:
+    //      NTSTATUS
+{
+    ULONG Length;
+    ULONG CopyChunk;
+//    NTSTATUS Status;
+#if defined(_IA64_)
+    ULONG64 AddressStart = Address;
+#endif
+
+    if (ChunkSize > MMDBG_COPY_MAX_SIZE) {
+        ChunkSize = MMDBG_COPY_MAX_SIZE;
+    } else if (ChunkSize == 0) {
+        // Default to 4 byte chunks as that's
+        // what the previous code did.
+        ChunkSize = 4;
+    }
+
+    //
+    // MmDbgCopyMemory only copies a single aligned chunk at a
+    // time.  It is Kd's responsibility to chunk up a larger
+    // request for individual copy requests.  This gives Kd
+    // the flexibility to pick a chunk size and also frees
+    // Mm from having to worry about more than a page at a time.
+    // Additionally, it is important that we access memory with the
+    // largest size possible because we could be accessing
+    // memory-mapped I/O space.
+    //
+
+    Length = TotalSize;
+    CopyChunk = 1;
+
+    while (Length > 0) {
+
+        // Expand the chunk size as long as:
+        //   We haven't hit the chunk limit.
+        //   We have enough data left.
+        //   The address is properly aligned.
+        while (CopyChunk < ChunkSize &&
+               (CopyChunk << 1) <= Length &&
+               (Address & ((CopyChunk << 1) - 1)) == 0) {
+            CopyChunk <<= 1;
+        }
+
+        // Shrink the chunk size to fit the available data.
+        while (CopyChunk > Length) {
+            CopyChunk >>= 1;
+        }
+
+        Address &= 0xffffffff;
+        if (Address < Struct_Microsoft_Singularity_BootInfo_PHYSICAL_DISABLED) {
+            break;
+        }
+        if (Address == 0) {
+            break;
+        }
+#if PAGING
+        ULONG64 RawAddress = Address;
+        if (Flags & MMDBG_COPY_PHYSICAL) {
+            // Temporarily map the physical memory range.
+            // TODO: KernelMapPhysicalMemory tries to acquire a lock -- if
+            // this lock is not free, we may deadlock here.
+            // Also, remapping for every chunk is inefficient.
+            KDDBG("Physical address = 0x%x size = 0x%x\n", int(Address), int(CopyChunk));
+            Struct_Microsoft_Singularity_Memory_PhysicalAddress physical;
+            Struct_Microsoft_Singularity_Memory_PhysicalAddress::m__ctor(
+                &physical,
+                UIntPtr(Address));
+            Address = ULONG64(Class_Microsoft_Singularity_Memory_MemoryManager
+                ::g_KernelMapPhysicalMemory(
+                    physical,
+                    UIntPtr(CopyChunk)));
+            KDDBG("Physical address 0x%x mapped to virtual address 0x%x\n", int(RawAddress), int(Address));
+        }
+        else {
+            if (Class_Microsoft_Singularity_Memory_MemoryManager::c_isInitialized
+                && !Class_Microsoft_Singularity_Memory_VMManager::g_IsPageMapped(
+                        Class_Microsoft_Singularity_Memory_MemoryManager::g_PageAlign(
+                            UIntPtr(Address)))) {
+                break;
+            }
+        }
+#endif
+        if (Flags & MMDBG_COPY_WRITE) {
+            memcpy((void*)Address, Buffer, CopyChunk);
+        } else {
+            memcpy(Buffer, (void*)Address, CopyChunk);
+        }
+
+#if PAGING
+        if (Flags & MMDBG_COPY_PHYSICAL) {
+            KDDBG("Unmapping physical address 0x%x (virtual address 0x%x)\n", int(RawAddress), int(Address));
+            Class_Microsoft_Singularity_Memory_MemoryManager
+                ::g_KernelUnmapPhysicalMemory(
+                    UIntPtr(Address), UIntPtr(Address + CopyChunk));
+            KDDBG("Unmapped physical address 0x%x (virtual address 0x%x)\n", int(RawAddress), int(Address));
+            Address = RawAddress;
+        }
+#endif
+
+        Address += CopyChunk;
+        Buffer = (PVOID)((PUCHAR)Buffer + CopyChunk);
+        Length -= CopyChunk;
+    }
+
+    if (ActualSize) {
+        *ActualSize = TotalSize - Length;
+    }
+
+    //
+    // Flush the instruction cache in case the write was into the instruction
+    // stream.  Only do this when writing into the kernel address space,
+    // and if any bytes were actually written
+    //
+
+    if ((Flags & MMDBG_COPY_WRITE) && Length < TotalSize) {
+#if defined(_IA64_)
+        //
+        // KeSweepCurrentIcacheRange requires a valid virtual address.
+        // It is used because KeSweepCurrentICache does not work until
+        // the HAL as been initialized.
+        //
+
+        if (Flags & MMDBG_COPY_PHYSICAL) {
+            KeSweepCurrentIcache();
+        }
+        else {
+            KeSweepCurrentIcacheRange((PVOID)AddressStart, TotalSize - Length);
+        }
+#else
+        __asm wbinvd;
+        //   KeSweepCurrentIcache();
+#endif
+
+    }
+
+    return Length != 0 ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS;
+}
+
+static
+VOID
+KdpSetCommonState(
+    IN ULONG NewState,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext *x86Context,
+    OUT PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange
+    )
+{
+    PCHAR PcMemory = (PCHAR)x86Context->eip;
+    ULONG InstrCount;
+    PUCHAR InstrStream;
+
+    WaitStateChange->NewState = NewState;
+    WaitStateChange->ProcessorLevel = KeProcessorLevel;
+    WaitStateChange->Processor = GetCurrentProcessorNumber();
+    WaitStateChange->NumberProcessors = KeNumberProcessors;
+    WaitStateChange->Thread = SIGN_EXTEND_PTR(x86Context->_thread);
+    WaitStateChange->ProgramCounter = SIGN_EXTEND_PTR(x86Context->eip);
+
+    RtlZeroMemory(&WaitStateChange->AnyControlReport,
+                  sizeof(WaitStateChange->AnyControlReport));
+
+    //
+    // Copy instruction stream immediately following location of event.
+    //
+
+    InstrStream = WaitStateChange->ControlReport.InstructionStream;
+    KdpCopyFromPtr(InstrStream, PcMemory, DBGKD_MAXSTREAM, &InstrCount);
+    WaitStateChange->ControlReport.InstructionCount = (USHORT)InstrCount;
+
+    //
+    // Clear breakpoints in copied area.
+    // If there were any breakpoints cleared, recopy the instruction area
+    // without them.
+    //
+
+    // if (KdpDeleteBreakpointRange(PcMemory, PcMemory + InstrCount - 1)) {
+    //    KdpCopyFromPtr(InstrStream, PcMemory, InstrCount, &InstrCount);
+    // }
+}
+
+VOID
+KdpSetContextState(
+    IN OUT PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      Fill in the Wait_State_Change message record.
+    //
+    //  Arguments:
+    //      WaitStateChange - Supplies pointer to record to fill in
+    //      x86Context - Supplies a pointer to a context record.
+    //
+    //  Return Value:
+    //      None.
+{
+#if 0
+    PKPRCB Prcb;
+
+    //
+    //  Special registers for the x86
+    //
+    Prcb = KeGetCurrentPrcb();
+    WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters.KernelDr6;
+    WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters.KernelDr7;
+#endif
+
+    UINT32 _dr6;
+    UINT32 _dr7;
+    UINT16 _cs;
+    UINT16 _ds;
+    UINT16 _es;
+    UINT16 _fs;
+
+    __asm {
+        mov eax, dr6;
+        mov _dr6, eax;
+        mov eax, dr7;
+        mov _dr7, eax;
+        mov ax, cs;
+        mov _cs, ax;
+        mov ax, ds;
+        mov _ds, ax;
+        mov ax, es;
+        mov _es, ax;
+        mov ax, fs;
+        mov _fs, ax;
+    }
+
+    // I'm not sure we're handling dr6 right here.
+    KDDBG("KdpSetContextState dr6=%08x dr7=%08x cs=%04x/%04x\n",
+          _dr6, _dr7, _cs, _ds);
+
+    WaitStateChange->ControlReport.Dr6 = _dr6;
+    WaitStateChange->ControlReport.Dr7 = _dr7;
+    WaitStateChange->ControlReport.SegCs  = _cs;
+    WaitStateChange->ControlReport.SegDs  = _ds;
+    WaitStateChange->ControlReport.SegEs  = _es;
+    WaitStateChange->ControlReport.SegFs  = _fs;
+    WaitStateChange->ControlReport.EFlags = x86Context->efl;
+    WaitStateChange->ControlReport.ReportFlags = X86_REPORT_INCLUDES_SEGS;
+
+#if !PAGING
+    // Let the debugger know so that it doesn't have to retrieve the CS descriptor.
+    WaitStateChange->ControlReport.ReportFlags |= X86_REPORT_STANDARD_CS;
+#endif
+}
+
+ULONG
+WcsToStr(WCHAR *pwcsSrc, ULONG Length, PCHAR pszDst)
+{
+    for (ULONG n = 0; n < Length; n++) {
+        *pszDst++ = (char)*pwcsSrc++;
+    }
+    *pszDst++ = '\0';
+
+    return Length + 1;
+}
+
+bool
+KdpReportLoadSymbolsStateChange(
+    IN WCHAR *PathName,
+    IN ULONG PathNameLength,
+    IN ULONG64 BaseOfDll,
+    IN ULONG   ProcessId,
+    IN ULONG   CheckSum,
+    IN ULONG   SizeOfImage,
+    IN BOOLEAN UnloadSymbols,
+    IN OUT Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      This routine sends a load symbols state change packet to the kernel
+    //      debugger and waits for a manipulate state message.
+    //
+    //  Arguments:
+    //      PathName - Supplies a pointer to the pathname of the image whose
+    //          symbols are to be loaded.
+    //      BaseOfDll - Supplies the base address where the image was loaded.
+    //      ProcessId - Unique identifier for process that is using
+    //          the symbols.  -1 for system process.
+    //      CheckSum - Checksum from image header.
+    //      UnloadSymbol - TRUE if the symbols that were previously loaded for
+    //          the named image are to be unloaded from the debugger.
+    //
+    //  Return Value:
+    //      A value of TRUE is returned if the exception is handled. Otherwise, a
+    //      value of FALSE is returned.
+{
+    // NB: \nt\sdktools\debuggers\ntsd64\event.cpp
+    // PathNameLength = 0, ProcessId = 0, BaseOfDll = -1 for reboot.
+    // PathNameLength = 0, ProcessId = 0, BaseOfDll = -2 for hibernate.
+
+    STRING MessageData;
+    STRING MessageHeader;
+    DBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange;
+    KCONTINUE_STATUS Status;
+
+    KDDBG("KdpReportLoadSymbolsStateChange %p\n", x86Context);
+
+    do {
+        //
+        // Construct the wait state change message and message descriptor.
+        //
+
+        KdpSetCommonState(DbgKdLoadSymbolsStateChange, x86Context,
+                          &WaitStateChange);
+
+        WaitStateChange.u.LoadSymbols.UnloadSymbols = UnloadSymbols;
+        WaitStateChange.u.LoadSymbols.BaseOfDll = BaseOfDll;
+        WaitStateChange.u.LoadSymbols.ProcessId = ProcessId;
+        WaitStateChange.u.LoadSymbols.CheckSum = CheckSum;
+        WaitStateChange.u.LoadSymbols.SizeOfImage = SizeOfImage;
+        if (PathName != NULL) {
+            WaitStateChange.u.LoadSymbols.PathNameLength =
+                WcsToStr(PathName, PathNameLength, KdpMessageBuffer);
+        }
+        else {
+            WaitStateChange.u.LoadSymbols.PathNameLength = 0;
+        }
+        MessageData.Buffer = KdpMessageBuffer;
+        MessageData.Length = (USHORT)WaitStateChange.u.LoadSymbols.PathNameLength;
+
+        KdpSetContextState(&WaitStateChange, x86Context);
+
+        MessageHeader.Length = sizeof(WaitStateChange);
+        MessageHeader.Buffer = (PCHAR)&WaitStateChange;
+
+        Status = KdpSendWaitContinue(
+                    PACKET_TYPE_KD_STATE_CHANGE64,
+                    &MessageHeader,
+                    &MessageData,
+                    x86Context
+                    );
+
+    } while (Status == ContinueProcessorReselected) ;
+
+    return (Status == ContinueSuccess) ? true : false;
+}
+
+static
+KCONTINUE_STATUS
+KdpReportExceptionStateChange(
+    IN PEXCEPTION_RECORD64 ExceptionRecord,
+    IN OUT Struct_Microsoft_Singularity_X86_ThreadContext *x86Context,
+    IN BOOLEAN FirstChance
+    )
+    //  Routine Description:
+    //      This routine sends an exception state change packet to the kernel
+    //      debugger and waits for a manipulate state message.
+    //
+    //  Arguments:
+    //      ExceptionRecord - Supplies a pointer to an exception record.
+    //      x86Context - Supplies a pointer to a context record.
+    //      FirstChance - Supplies a boolean value that determines whether this is
+    //          the first or second chance for the exception.
+    //
+    //  Return Value:
+    //      A value of TRUE is returned if the exception is handled. Otherwise, a
+    //      value of FALSE is returned.
+{
+    STRING MessageData;
+    STRING MessageHeader;
+    DBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange;
+    KCONTINUE_STATUS Status;
+
+    KDDBG("KdpReportExceptionStateChange %p\n", x86Context);
+
+    do {
+
+        //
+        // Construct the wait state change message and message descriptor.
+        //
+
+        KdpSetCommonState(DbgKdExceptionStateChange, x86Context,
+                          &WaitStateChange);
+
+        WaitStateChange.u.Exception.ExceptionRecord = *ExceptionRecord;
+        WaitStateChange.u.Exception.FirstChance = FirstChance;
+
+        KdpSetContextState(&WaitStateChange, x86Context);
+
+        MessageHeader.Length = sizeof(WaitStateChange);
+        MessageHeader.Buffer = (PCHAR)&WaitStateChange;
+        MessageData.Length = 0;
+
+        //
+        // Send packet to the kernel debugger on the host machine,
+        // wait for answer.
+        //
+        Status = KdpSendWaitContinue(
+                    PACKET_TYPE_KD_STATE_CHANGE64,
+                    &MessageHeader,
+                    &MessageData,
+                    x86Context
+                    );
+    } while (Status == ContinueProcessorReselected) ;
+
+    return Status;
+}
+
+
+static
+VOID
+KdpReadVirtualMemory(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData
+    )
+    //  Routine Description:
+    //      This function is called in response to a read virtual memory 32-bit
+    //      state manipulation message. Its function is to read virtual memory
+    //      and return.
+    //
+    //  Arguments:
+    //      m - Supplies a pointer to the state manipulation message.
+    //      AdditionalData - Supplies a pointer to a descriptor for the data to read.
+    //      x86Context - Supplies a pointer to the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    ULONG Length;
+    STRING MessageHeader;
+
+    //
+    // Trim the transfer count to fit in a single message.
+    //
+
+    Length = m->u.ReadMemory.TransferCount;
+    if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) {
+        Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64);
+    }
+
+    //
+    // Move the data to the destination buffer.
+    //
+    if (m->u.ReadMemory.TargetBaseAddress >= 0x80000000) {
+        KDDBG("  Read out of range!\n");
+
+        for (UINT i = 0; i < Length; i++) {
+            AdditionalData->Buffer[i] = 0;
+        }
+        Length = 0;
+    }
+    else {
+        m->ReturnStatus =
+            KdpCopyMemoryChunks(m->u.ReadMemory.TargetBaseAddress,
+                                AdditionalData->Buffer,
+                                Length,
+                                0,
+                                MMDBG_COPY_UNSAFE,
+                                &Length);
+    }
+
+    //
+    // Set the actual number of bytes read, initialize the message header,
+    // and send the reply packet to the host debugger.
+    //
+
+    AdditionalData->Length = (USHORT)Length;
+    m->u.ReadMemory.ActualBytesRead = Length;
+
+    MessageHeader.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)m;
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 AdditionalData,
+                 &KdpContext);
+
+    return;
+}
+
+static
+VOID
+KdpWriteVirtualMemory(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData
+    )
+    //  Routine Description:
+    //      This function is called in response of a write virtual memory 32-bit
+    //      state manipulation message. Its function is to write virtual memory
+    //      and return.
+    //
+    //  Arguments:
+    //      m - Supplies a pointer to the state manipulation message.
+    //      AdditionalData - Supplies a pointer to a descriptor for the data to write.
+    //      x86Context - Supplies a pointer to the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    STRING MessageHeader;
+
+    //
+    // Move the data to the destination buffer.
+    //
+
+    m->ReturnStatus =
+        KdpCopyMemoryChunks(m->u.WriteMemory.TargetBaseAddress,
+                            AdditionalData->Buffer,
+                            AdditionalData->Length,
+                            0,
+                            MMDBG_COPY_WRITE | MMDBG_COPY_UNSAFE,
+                            &m->u.WriteMemory.ActualBytesWritten);
+
+    //
+    // Set the actual number of bytes written, initialize the message header,
+    // and send the reply packet to the host debugger.
+    //
+
+    MessageHeader.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)m;
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+
+    return;
+}
+
+static
+VOID
+KdpReadPhysicalMemory(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData
+    )
+    //  Routine Description:
+    //      This function is called in response to a read physical memory 32-bit
+    //      state manipulation message. Its function is to read physical memory
+    //      and return.
+    //
+    //  Arguments:
+    //      m - Supplies a pointer to the state manipulation message.
+    //      AdditionalData - Supplies a pointer to a descriptor for the data to read.
+    //      x86Context - Supplies a pointer to the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    ULONG Length;
+    STRING MessageHeader;
+
+    //
+    // Trim the transfer count to fit in a single message.
+    //
+
+    Length = m->u.ReadMemory.TransferCount;
+    if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) {
+        Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64);
+    }
+
+    m->ReturnStatus =
+        KdpCopyMemoryChunks(m->u.ReadMemory.TargetBaseAddress,
+                            AdditionalData->Buffer,
+                            Length,
+                            0,
+                            MMDBG_COPY_UNSAFE | MMDBG_COPY_PHYSICAL,
+                            &Length);
+
+    //
+    // Set the actual number of bytes read, initialize the message header,
+    // and send the reply packet to the host debugger.
+    //
+
+    AdditionalData->Length = (USHORT)Length;
+    m->u.ReadMemory.ActualBytesRead = Length;
+
+    MessageHeader.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)m;
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 AdditionalData,
+                 &KdpContext);
+
+    return;
+}
+
+static
+VOID
+KdpWritePhysicalMemory(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData
+    )
+    //  Routine Description:
+    //      This function is called in response of a write physical memory 32-bit
+    //      state manipulation message. Its function is to write physical memory
+    //      and return.
+    //
+    //  Arguments:
+    //      m - Supplies a pointer to the state manipulation message.
+    //      AdditionalData - Supplies a pointer to a descriptor for the data to write.
+    //      x86Context - Supplies a pointer to the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    STRING MessageHeader;
+
+    //
+    // Move the data to the destination buffer.
+    //
+
+    m->ReturnStatus =
+        KdpCopyMemoryChunks(m->u.WriteMemory.TargetBaseAddress,
+                            AdditionalData->Buffer,
+                            AdditionalData->Length,
+                            0,
+                            MMDBG_COPY_WRITE | MMDBG_COPY_UNSAFE | MMDBG_COPY_PHYSICAL,
+                            &m->u.WriteMemory.ActualBytesWritten);
+
+    //
+    // Set the actual number of bytes written, initialize the message header,
+    // and send the reply packet to the host debugger.
+    //
+
+    MessageHeader.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)m;
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+
+    return;
+}
+
+static
+VOID
+KdpReadMachineSpecificRegister(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      This function is called in response of a write physical memory 32-bit
+    //      state manipulation message. Its function is to write physical memory
+    //      and return.
+    //
+    //  Arguments:
+    //      m - Supplies a pointer to the state manipulation message.
+    //      AdditionalData - Supplies a pointer to a descriptor for the data to write.
+    //      x86Context - Supplies a pointer to the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    STRING MessageHeader;
+
+    //
+    // Read the MSR
+    //
+
+    UINT32 msr = m->u.ReadWriteMsr.Msr;
+    UINT32 hi, lo;
+
+    __asm {
+        mov ecx, msr;
+        rdmsr;
+        mov hi, edx;
+        mov lo, eax;
+    }
+
+    m->u.ReadWriteMsr.DataValueHigh = hi;
+    m->u.ReadWriteMsr.DataValueLow = lo;
+    m->ReturnStatus = STATUS_SUCCESS;
+
+    //
+    // Set the actual number of bytes written, initialize the message header,
+    // and send the reply packet to the host debugger.
+    //
+
+    MessageHeader.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)m;
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+
+    return;
+}
+
+static
+VOID
+KdpWriteMachineSpecificRegister(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      This function is called in response of a write physical memory 32-bit
+    //      state manipulation message. Its function is to write physical memory
+    //      and return.
+    //
+    //  Arguments:
+    //      m - Supplies a pointer to the state manipulation message.
+    //      AdditionalData - Supplies a pointer to a descriptor for the data to write.
+    //      x86Context - Supplies a pointer to the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+
+    STRING MessageHeader;
+
+    //
+    // Write the MSR
+    //
+
+    UINT32 msr = m->u.ReadWriteMsr.Msr;
+    UINT32 hi = m->u.ReadWriteMsr.DataValueHigh, lo = m->u.ReadWriteMsr.DataValueLow;
+
+    __asm {
+        mov ecx, msr;
+        mov edx, hi;
+        mov eax, lo;
+        wrmsr;
+    }
+
+    m->ReturnStatus = STATUS_SUCCESS;
+
+    //
+    // Set the actual number of bytes written, initialize the message header,
+    // and send the reply packet to the host debugger.
+    //
+
+    MessageHeader.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)m;
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+
+    return;
+}
+
+static int wcslen(WCHAR *pwz)
+{
+    int len = 0;
+
+    while (*pwz++) {
+        len++;
+    }
+    return len;
+}
+
+static WCHAR * trim(WCHAR *pwz)
+{
+    WCHAR *pwzBeg = pwz;
+    for (; *pwz; pwz++) {
+        if (*pwz == '\\') {
+            pwzBeg = pwz + 1;
+        }
+    }
+    return pwzBeg;
+}
+
+static void KdpFakeOutPsLoadedModuleList()
+{
+    UINT8* pbImage = (UINT8*)g_pBootInfo->DumpAddr32;
+    PMINIDUMP_HEADER pHeader = (PMINIDUMP_HEADER)(pbImage + 0);
+
+#define VERBOSE 1
+#if VERBOSE
+    printf("KdpFakeOutPsLoadedModuleList (%p):\n"
+           "  BootInfo at %p  MINIDUMP_HEADER at %p\n",
+           &PsLoadedModuleList, g_pBootInfo, pHeader);
+#endif
+
+    // Need to build a data structure which looks like NT's PsLoadedModuleList
+    InitializeListHead(&PsLoadedModuleList);
+
+    PMINIDUMP_DIRECTORY pDir
+        = (PMINIDUMP_DIRECTORY)(pbImage + pHeader->StreamDirectoryRva);
+
+    for (UINT i = 0; i < pHeader->NumberOfStreams; i++) {
+        if (pDir[i].StreamType == ModuleListStream) {
+            KdMinidumpModuleList = (PMINIDUMP_MODULE_LIST)(pbImage + pDir[i].Location.Rva);
+            break;
+        }
+    }
+    if (KdMinidumpModuleList == NULL) {
+#if VERBOSE
+        printf("Couldn't find module list.\n");
+#endif
+        return;
+    }
+
+    KdVersionBlock.KernBase = (ULONG64)KdMinidumpModuleList->Modules[0].BaseOfImage;
+
+#if VERBOSE
+    printf("MODULE_LIST: %d entries\n", KdMinidumpModuleList->NumberOfModules);
+#endif
+
+#if 1
+    // We manual include these modules to allow debugging very early in the boot cycle.
+    for (UINT m = 0; m < KdMinidumpModuleList->NumberOfModules &&
+             m < (sizeof(KdModuleKernelEntry)/sizeof(KdModuleKernelEntry[0])); m++) {
+
+        PMINIDUMP_MODULE pModule = &KdMinidumpModuleList->Modules[m];
+        KLDR_DATA_TABLE_ENTRY_WITH_NAME *pEntry = &KdModuleKernelEntry[KdModuleKernelUsed++];
+
+        WCHAR *name = trim((WCHAR *)((pbImage + pModule->ModuleNameRva)+4));
+        USHORT nlen = (USHORT)2 * wcslen(name);
+        if (nlen > sizeof(pEntry->wzName)) {
+            nlen = sizeof(pEntry->wzName);
+        }
+
+        pEntry->DllBase = (PVOID *)pModule->BaseOfImage;
+        pEntry->CheckSum = pModule->CheckSum;
+        pEntry->TimeDateStamp = pModule->TimeDateStamp;
+        pEntry->LoadCount = 1;
+        pEntry->SizeOfImage = pModule->SizeOfImage;
+        memcpy(pEntry->wzName, name, nlen);
+        RtlInitUnicodeString(&pEntry->BaseDllName, pEntry->wzName, nlen);
+        RtlInitUnicodeString(&pEntry->FullDllName, pEntry->wzName, nlen); // Write back on self.
+
+#if VERBOSE
+        printf("%4d: BaseOfImage %8lx SizeOfImage %8x ModuleNameRva %8x\n",
+               m,
+               pModule->BaseOfImage,
+               pModule->SizeOfImage,
+               pModule->ModuleNameRva);
+        printf("      ModuleName: %ls (%p)\n",
+               pEntry->BaseDllName.Buffer,
+               pEntry);
+#endif
+
+        InsertTailList(&PsLoadedModuleList, &pEntry->InLoadOrderLinks);
+    }
+#endif
+}
+
+VOID
+KdpSysGetVersion(
+    PDBGKD_GET_VERSION64 Version
+    )
+    //  Routine Description:
+    //      This function returns to the caller a general information packet
+    //      that contains useful information to a debugger.  This packet is also
+    //      used for a debugger to determine if the writebreakpointex and
+    //      readbreakpointex APIs are available.
+    //
+    //  Arguments:
+    //      Version - Supplies the structure to fill in
+    //
+    //  Return Value:
+    //      None.
+{
+    *Version = KdVersionBlock;
+}
+
+
+static
+VOID
+KdpGetVersion(
+    IN PDBGKD_MANIPULATE_STATE64 m
+    )
+    //  Routine Description:
+    //      This function returns to the caller a general information packet
+    //      that contains useful information to a debugger.  This packet is also
+    //      used for a debugger to determine if the writebreakpointex and
+    //      readbreakpointex APIs are available.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //
+    //  Return Value:
+    //      None.
+{
+    STRING messageHeader;
+
+    messageHeader.Length = sizeof(*m);
+    messageHeader.Buffer = (PCHAR)m;
+
+    KdpSysGetVersion(&m->u.GetVersion64);
+
+    //
+    // the usual stuff
+    //
+    m->ReturnStatus = STATUS_SUCCESS;
+    m->ApiNumber = DbgKdGetVersionApi;
+
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &messageHeader,
+                 NULL,
+                 &KdpContext
+                 );
+
+    return;
+} // KdGetVersion
+
+static inline ULONG min(ULONG a, ULONG b)
+{
+    return a < b ? a : b;
+}
+
+static
+VOID
+KdpReadControlSpace(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext * x86Context
+    )
+    //  Routine Description:
+    //      This function is called in response of a read control space state
+    //      manipulation message.  Its function is to read implementation
+    //      specific system data.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //      AdditionalData - Supplies any additional data for the message.
+    //      Context - Supplies the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    PDBGKD_READ_MEMORY64 a = &m->u.ReadMemory;
+    STRING MessageHeader;
+    ULONG Length;
+
+    MessageHeader.Length = sizeof(*m);
+    MessageHeader.Buffer = (PCHAR)m;
+
+    ASSERT(AdditionalData->Length == 0);
+
+    Length = min(min(a->TransferCount,
+                     PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)),
+                 sizeof(KPROCESSOR_STATE) - (ULONG)a->TargetBaseAddress);
+
+    if ((a->TargetBaseAddress + Length <= sizeof(KPROCESSOR_STATE)) &&
+        (m->Processor < (ULONG)KeNumberProcessors)) {
+        PKPROCESSOR_STATE ProcessorState = &KdpProcessorState[m->Processor];
+        if (a->TargetBaseAddress < sizeof(CONTEXT)) {
+            // Need to update the thread context information.
+            KdSingularityToWindbgContext(x86Context, &ProcessorState->ContextFrame);
+        }
+        if (a->TargetBaseAddress + Length > sizeof(CONTEXT)) {
+            // Need to update the processor context information.
+            // ASSERT(m->Processor == 0); // MP support broken.
+
+            ProcessorState->SpecialRegisters.Cr2 = x86Context->cr2;
+            ProcessorState->SpecialRegisters.Cr3 = (ULONG)x86Context->cr3;
+            KSPECIAL_REGISTERS *pksp = &ProcessorState->SpecialRegisters;
+
+            __asm {
+                mov ebx, pksp;
+
+                mov eax, cr0;
+                mov [ebx].Cr0, eax;
+                mov eax, cr3;
+                mov [ebx].Cr3, eax;
+                _emit 0x0f;  // mov eax,cr4
+                _emit 0x20;
+                _emit 0xe0;
+                mov [ebx].Cr4, eax;
+
+                // XXX save TR should save segment regs as well.
+                str ax;
+                mov [ebx].Tr, ax;
+#if 0
+                mov eax, dr0;
+                mov [ebx].KernelDr0, eax;
+                mov eax, dr1;
+                mov [ebx].KernelDr1, eax;
+                mov eax, dr2;
+                mov [ebx].KernelDr2, eax;
+                mov eax, dr3;
+                mov [ebx].KernelDr3, eax;
+                mov eax, dr6;
+                mov [ebx].KernelDr6, eax;
+                mov eax, dr7;
+                mov [ebx].KernelDr7, eax;
+#endif
+            }
+
+            const Struct_Microsoft_Singularity_CpuInfo* cpuInfo = &g_pBootInfo->Cpu0 + m->Processor;
+            ProcessorState->SpecialRegisters.Gdtr.Pad = cpuInfo->GdtPtr.pad;
+            ProcessorState->SpecialRegisters.Gdtr.Limit = cpuInfo->GdtPtr.limit;
+            ProcessorState->SpecialRegisters.Gdtr.Base = cpuInfo->GdtPtr.addr;
+
+            ProcessorState->SpecialRegisters.Idtr.Pad = g_idt.pad;
+            ProcessorState->SpecialRegisters.Idtr.Limit = g_idt.limit;
+            ProcessorState->SpecialRegisters.Idtr.Base = g_idt.addr;
+        }
+
+        m->ReturnStatus = KdpCopyToPtr(AdditionalData->Buffer,
+                                       ((uint8*)ProcessorState) + a->TargetBaseAddress,
+                                       Length,
+                                       &Length);
+    }
+    else {
+        m->ReturnStatus = STATUS_UNSUCCESSFUL;
+        Length = 0;
+    }
+
+    AdditionalData->Length = (USHORT)Length;
+    a->ActualBytesRead = Length;
+
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 AdditionalData,
+                 &KdpContext);
+}
+
+static
+VOID
+KdpWriteControlSpace(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext * x86Context
+    )
+    //  Routine Description:
+    //      This function is called in response of a write control space state
+    //      manipulation message.  Its function is to write implementation
+    //      specific system data.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //      AdditionalData - Supplies any additional data for the message.
+    //      x86Context - Supplies the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    PDBGKD_WRITE_MEMORY64 a = &m->u.WriteMemory;
+    ULONG Length;
+    STRING MessageHeader;
+
+    MessageHeader.Length = sizeof(*m);
+    MessageHeader.Buffer = (PCHAR)m;
+
+    Length = AdditionalData->Length;
+
+    if (((a->TargetBaseAddress + Length) <= sizeof(KPROCESSOR_STATE)) &&
+        (m->Processor < (ULONG)KeNumberProcessors)) {
+        PKPROCESSOR_STATE ProcessorState = &KdpProcessorState[m->Processor];
+        if (a->TargetBaseAddress < sizeof(CONTEXT)) {
+            // Need to update the thread context information.
+            KdWindbgToSingularityContext(&ProcessorState->ContextFrame, x86Context);
+        }
+        if (a->TargetBaseAddress + Length > sizeof(CONTEXT)) {
+            // Need to update the processor context information.
+            KDDBG("   Writing SpecialRegisters.\n");
+            ASSERT(m->Processor == 0);  // MP support broken.
+
+#if 0
+            // We don't support separate kernel data breakpoints as
+            // Singularity uses a single address space.
+            kdprintf("  dr0=%p dr1=%p dr2=%p dr3=%p dr6=%p dr7=%p\n",
+                     (PVOID)(windbg->Dr0),
+                     (PVOID)(windbg->Dr1),
+                     (PVOID)(windbg->Dr2),
+                     (PVOID)(windbg->Dr3),
+                     (PVOID)(windbg->Dr6),
+                     (PVOID)(windbg->Dr7));
+
+            KSPECIAL_REGISTERS *pksp = &ProcessorState->SpecialRegisters;
+            kdprintf("  cr0=%p cr2=%p cr3=%p cr4=%p\n",
+                     pksp->Cr0, pksp->Cr2, pksp->Cr3, pksp->Cr4);
+
+            __asm {
+                mov ebx, pksp;
+
+#if 0
+                mov eax, [ebx].Cr0;
+                mov cr0, eax;
+                mov eax, [ebx].Cr2;
+                mov cr2, eax;
+                mov eax, [ebx].Cr2;
+                mov cr3, eax;
+                mov eax, [ebx].Cr4;
+                _emit 0x0f;  // mov cr4,eax
+                _emit 0x22;
+                _emit 0xe0;
+#endif
+
+                mov eax, [ebx].KernelDr0;
+                mov dr0, eax;
+                mov eax, [ebx].KernelDr1;
+                mov dr1, eax;
+                mov eax, [ebx].KernelDr2;
+                mov dr2, eax;
+                mov eax, [ebx].KernelDr3;
+                mov dr3, eax;
+                mov eax, [ebx].KernelDr6;
+                mov dr6, eax;
+                mov eax, [ebx].KernelDr7;
+                mov dr7, eax;
+            }
+            kdprintf("  dr0=%p dr1=%p dr2=%p dr3=%p dr6=%p dr7=%p\n",
+                     (PVOID)(pksp->KernelDr0),
+                     (PVOID)(pksp->KernelDr1),
+                     (PVOID)(pksp->KernelDr2),
+                     (PVOID)(pksp->KernelDr3),
+                     (PVOID)(pksp->KernelDr6),
+                     (PVOID)(pksp->KernelDr7));
+            kdprintf("  rr0=%p rr1=%p rr2=%p rr3=%p rr6=%p rr7=%p\n",
+                     (PVOID)(pksp->Reserved[0]),
+                     (PVOID)(pksp->Reserved[1]),
+                     (PVOID)(pksp->Reserved[2]),
+                     (PVOID)(pksp->Reserved[3]),
+                     (PVOID)(pksp->Reserved[4]),
+                     (PVOID)(pksp->Reserved[5]));
+#endif
+        }
+
+        m->ReturnStatus = KdpCopyFromPtr(((uint8*)ProcessorState) + a->TargetBaseAddress,
+                                         AdditionalData->Buffer,
+                                         Length,
+                                         &Length);
+    } else {
+        m->ReturnStatus = STATUS_UNSUCCESSFUL;
+        Length = 0;
+    }
+
+    a->ActualBytesWritten = Length;
+
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 AdditionalData,
+                 &KdpContext);
+}
+
+static
+VOID
+KdpSetContext(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext * x86Context
+    )
+    //  Routine Description:
+    //      This function is called in response of a set context state
+    //      manipulation message.  Its function is set the current
+    //      context.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //      AdditionalData - Supplies any additional data for the message.
+    //      x86Context - Supplies the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    STRING MessageHeader;
+
+    MessageHeader.Length = sizeof(*m);
+    MessageHeader.Buffer = (PCHAR)m;
+
+    ASSERT(AdditionalData->Length == sizeof(CONTEXT));
+
+    ASSERT(m->Processor == 0);  // MP support broken.
+
+    if ((m->Processor >= (USHORT)KeNumberProcessors) ||
+        (KdpContextSent == FALSE)) {
+        m->ReturnStatus = STATUS_UNSUCCESSFUL;
+    }
+    else {
+        m->ReturnStatus = STATUS_SUCCESS;
+        KdWindbgToSingularityContext((CONTEXT*)AdditionalData->Buffer, x86Context);
+    }
+
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+}
+
+static
+VOID
+KdpGetContext(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      This function is called in response of a get context state
+    //      manipulation message.  Its function is to return the current
+    //      context.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //      AdditionalData - Supplies any additional data for the message.
+    //      x86Context - Supplies the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    STRING MessageHeader;
+
+    MessageHeader.Length = sizeof(*m);
+    MessageHeader.Buffer = (PCHAR)m;
+
+    ASSERT(AdditionalData->Length == 0);
+
+    ASSERT(m->Processor == 0);  // MP support broken.
+
+    if (m->Processor >= (USHORT)KeNumberProcessors) {
+        m->ReturnStatus = STATUS_UNSUCCESSFUL;
+    }
+    else {
+        m->ReturnStatus = STATUS_SUCCESS;
+        AdditionalData->Length = sizeof(CONTEXT);
+
+        KdSingularityToWindbgContext(x86Context, (CONTEXT*)AdditionalData->Buffer);
+        KdpContextSent = TRUE;
+    }
+
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 AdditionalData,
+                 &KdpContext);
+}
+
+
+ULONG
+KdpAddBreakpoint(
+    IN PVOID Address
+    )
+    //  Routine Description:
+    //      This routine adds an entry to the breakpoint table and returns a handle
+    //      to the breakpoint table entry.
+    //
+    //  Arguments:
+    //      Address - Supplies the address where to set the breakpoint.
+    //
+    //  Return Value:
+    //
+    //      A value of zero is returned if the specified address is already in the
+    //      breakpoint table, there are no free entries in the breakpoint table, the
+    //      specified address is not correctly aligned, or the specified address is
+    //      not valid. Otherwise, the index of the assigned breakpoint table entry
+    //      plus one is returned as the function value.
+{
+    ULONG Index;
+    KDP_BREAKPOINT_TYPE Content;
+    BOOL Accessible;
+
+    KDDBG2("KdpAddBreakpoint(%p)\n", Address);
+
+    for (Index = 0; Index < BREAKPOINT_TABLE_SIZE; Index++) {
+        if (KdpBreakpointTable[Index].Flags  == 0) break;
+    }
+    if (Index == BREAKPOINT_TABLE_SIZE) {
+        KDDBG("KD: ran out of breakpoints!\n");
+        return 0;
+    }
+
+    Accessible = NT_SUCCESS(KdpCopyFromPtr(&Content,
+                                           Address,
+                                           sizeof(KDP_BREAKPOINT_TYPE),
+                                           NULL));
+    KDDBG("KD: memory %saccessible\n", Accessible ? "" : "in");
+
+    if (Accessible) {
+        KdpBreakpointTable[Index].Address = Address;
+        KdpBreakpointTable[Index].Content = Content;
+        KdpBreakpointTable[Index].Flags = KD_BREAKPOINT_IN_USE;
+
+        if (!NT_SUCCESS(KdpCopyToPtr(Address,
+                                     &KdpBreakpointInstruction,
+                                     sizeof(KDP_BREAKPOINT_TYPE),
+                                     NULL))) {
+            KDDBG("KD: Unable to write BP!\n");
+        }
+    }
+    else {
+        return 0;
+    }
+
+    return Index+1;
+}
+
+BOOLEAN
+KdpDeleteBreakpoint(
+    IN ULONG Handle
+    )
+{
+    ULONG Index = Handle - 1;
+    KDDBG2("KD: Delete Breakpoint %d\n", Handle);
+
+    if ((Handle == 0) || (Handle > BREAKPOINT_TABLE_SIZE)) {
+        KDDBG("KD: Breakpoint %d invalid.\n", Index);
+        return FALSE;
+    }
+
+    //
+    // Replace the instruction contents.
+    //
+    if (!NT_SUCCESS(KdpCopyToPtr(KdpBreakpointTable[Index].Address,
+                                 &KdpBreakpointTable[Index].Content,
+                                 sizeof(KDP_BREAKPOINT_TYPE),
+                                 NULL))) {
+        KDDBG("KD: Breakpoint at 0x%p; unable to clear, flag set.\n",
+                  KdpBreakpointTable[Index].Address);
+        return FALSE;
+    }
+    else {
+        KDDBG2("KD: Breakpoint at 0x%p cleared.\n",
+               KdpBreakpointTable[Index].Address);
+        KdpBreakpointTable[Index].Flags = 0;
+    }
+
+    return TRUE;
+}
+
+VOID
+KdpWriteBreakpoint(
+    IN PDBGKD_MANIPULATE_STATE64 m
+    )
+    //  Routine Description:
+    //      This function is called in response of a write breakpoint state
+    //      manipulation message.  Its function is to write a breakpoint
+    //      and return a handle to the breakpoint.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //      AdditionalData - Supplies any additional data for the message.
+    //      x86Context - Supplies the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    PDBGKD_WRITE_BREAKPOINT64 a = &m->u.WriteBreakPoint;
+    STRING MessageHeader;
+
+    MessageHeader.Length = sizeof(*m);
+    MessageHeader.Buffer = (PCHAR)m;
+
+    ASSERT(AdditionalData->Length == 0);
+
+    a->BreakPointHandle = KdpAddBreakpoint((PVOID)(ULONG_PTR)a->BreakPointAddress);
+    if (a->BreakPointHandle != 0) {
+        m->ReturnStatus = STATUS_SUCCESS;
+    }
+    else {
+        m->ReturnStatus = STATUS_UNSUCCESSFUL;
+    }
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+}
+
+VOID
+KdpRestoreBreakpoint(
+    IN PDBGKD_MANIPULATE_STATE64 m,
+    IN PSTRING AdditionalData
+    )
+    //  Routine Description:
+    //      This function is called in response of a restore breakpoint state
+    //      manipulation message.  Its function is to restore a breakpoint
+    //      using the specified handle.
+    //
+    //  Arguments:
+    //      m - Supplies the state manipulation message.
+    //      AdditionalData - Supplies any additional data for the message.
+    //      Context - Supplies the current context.
+    //
+    //  Return Value:
+    //      None.
+{
+    PDBGKD_RESTORE_BREAKPOINT a = &m->u.RestoreBreakPoint;
+    STRING MessageHeader;
+
+    MessageHeader.Length = sizeof(*m);
+    MessageHeader.Buffer = (PCHAR)m;
+
+    ASSERT(AdditionalData->Length == 0);
+    if (KdpDeleteBreakpoint(a->BreakPointHandle)) {
+        m->ReturnStatus = STATUS_SUCCESS;
+    }
+    else {
+        m->ReturnStatus = STATUS_UNSUCCESSFUL;
+    }
+    KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                 &MessageHeader,
+                 NULL,
+                 &KdpContext);
+}
+
+static
+VOID
+KdpGetStateChange(
+    IN PDBGKD_MANIPULATE_STATE64 ManipulateState,
+    IN Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      Extract continuation control data from Manipulate_State message
+    //
+    //  Arguments:
+    //      ManipulateState - supplies pointer to Manipulate_State packet
+    //      x86Context - Supplies a pointer to a context record.
+    //
+    //  Return Value:
+    //      None.
+{
+    //PKPRCB Prcb;
+    //ULONG  Processor;
+
+    if (NT_SUCCESS(ManipulateState->u.Continue2.ContinueStatus)) {
+        //
+        // If NT_SUCCESS returns TRUE, then the debugger is doing a
+        // continue, and it makes sense to apply control changes.
+        // Otherwise the debugger is saying that it doesn't know what
+        // to do with this exception, so control values are ignored.
+        //
+
+        if (ManipulateState->u.Continue2.ControlSet.TraceFlag == TRUE) {
+            KDDBG2("KD: Warning - trace flag set\n");
+            x86Context->efl |= Struct_Microsoft_Singularity_X86_EFlags_TF;
+        }
+        else {
+            x86Context->efl &= ~Struct_Microsoft_Singularity_X86_EFlags_TF;
+        }
+
+        UINT32 _dr7 = ManipulateState->u.Continue2.ControlSet.Dr7;
+        x86Context->dr7 = ManipulateState->u.Continue2.ControlSet.Dr7;
+
+#if 0
+        __asm {
+            mov eax, 0;
+            mov dr6, eax;
+            mov eax, _dr7;
+            mov dr7, eax;
+        }
+#endif
+#if 0
+        for (Processor = 0; Processor < (ULONG)KeNumberProcessors; Processor++) {
+            Prcb = KiProcessorBlock[Processor];
+
+            Prcb->ProcessorState.SpecialRegisters.KernelDr7 =
+                ManipulateState->u.Continue2.ControlSet.Dr7;
+
+            Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0L;
+        }
+        if (ManipulateState->u.Continue2.ControlSet.CurrentSymbolStart != 1) {
+            KdpCurrentSymbolStart = ManipulateState->u.Continue2.ControlSet.CurrentSymbolStart;
+            KdpCurrentSymbolEnd = ManipulateState->u.Continue2.ControlSet.CurrentSymbolEnd;
+        }
+#endif
+    }
+}
+
+KCONTINUE_STATUS
+KdpSendWaitContinue(
+    IN ULONG OutPacketType,
+    IN PSTRING OutMessageHeader,
+    IN PSTRING OutMessageData OPTIONAL,
+    IN OUT Struct_Microsoft_Singularity_X86_ThreadContext *x86Context
+    )
+    //  Routine Description:
+    //      This function sends a packet, and then waits for a continue message.
+    //      BreakIns received while waiting will always cause a resend of the
+    //      packet originally sent out.  While waiting, manipulate messages
+    //      will be serviced.
+    //      A resend always resends the original event sent to the debugger,
+    //      not the last response to some debugger command.
+    //
+    //  Arguments:
+    //      OutPacketType - Supplies the type of packet to send.
+    //      OutMessageHeader - Supplies a pointer to a string descriptor that describes
+    //          the message information.
+    //      OutMessageData - Supplies a pointer to a string descriptor that describes
+    //          the optional message data.
+    //      x86Record - Exception context
+    //
+    //  Return Value:
+    //      A value of TRUE is returned if the continue message indicates
+    //      success, Otherwise, a value of FALSE is returned.
+{
+
+    ULONG Length;
+    STRING MessageData;
+    STRING MessageHeader;
+    DBGKD_MANIPULATE_STATE64 ManipulateState;
+    ULONG ReturnCode;
+    //    NTSTATUS Status;
+    //    KCONTINUE_STATUS ContinueStatus;
+
+    //
+    // Loop servicing state manipulation message until a continue message
+    // is received.
+    //
+
+    MessageHeader.MaximumLength = sizeof(DBGKD_MANIPULATE_STATE64);
+    MessageHeader.Buffer = (PCHAR)&ManipulateState;
+    MessageData.MaximumLength = arrayof(KdpMessageBuffer);
+    MessageData.Buffer = KdpMessageBuffer;
+    KdpContextSent = FALSE;
+
+  ResendPacket:
+
+    //
+    // Send event notification packet to debugger on host.  Come back
+    // here any time we see a breakin sequence.
+    //
+
+    KdSendPacket(OutPacketType,
+                 OutMessageHeader,
+                 OutMessageData,
+                 &KdpContext);
+
+    //
+    // After sending packet, if there is no response from debugger
+    // AND the packet is for reporting symbol (un)load, the debugger
+    // will be declared to be not present.  Note If the packet is for
+    // reporting exception, the KdSendPacket will never stop.
+    //
+
+    if (KdDebuggerNotPresent) {
+        return ContinueSuccess;
+    }
+
+    for (;;) {
+        //
+        // Wait for State Manipulate Packet without timeout.
+        //
+
+        KDDBG("KdpSendWait::\r");
+
+        do {
+            ReturnCode = KdReceivePacket(
+                                         PACKET_TYPE_KD_STATE_MANIPULATE,
+                                         &MessageHeader,
+                                         &MessageData,
+                                         &Length,
+                                         &KdpContext
+                                        );
+            KDDBG2("KdReceivePacket returned %d\n", ReturnCode);
+            if (ReturnCode == KDP_PACKET_RESEND) {
+                goto ResendPacket;
+            }
+        } while (ReturnCode == KDP_PACKET_TIMEOUT);
+
+        KDDBG2("KdpSendWaitContinue: ManipulateState.ApiNumber=0x%x\n", ManipulateState.ApiNumber);
+
+        //
+        // Switch on the return message API number.
+        //
+
+        switch (ManipulateState.ApiNumber) {
+
+          case DbgKdReadVirtualMemoryApi:
+            KDDBG("KdpSendWait::KdReadVirtualMemory (%8p..%8p) (%d bytes)\n",
+                  (ULONG_PTR)ManipulateState.u.ReadMemory.TargetBaseAddress,
+                  (ULONG_PTR)ManipulateState.u.ReadMemory.TargetBaseAddress +
+                  ManipulateState.u.ReadMemory.TransferCount,
+                  ManipulateState.u.ReadMemory.TransferCount);
+            KdpReadVirtualMemory(&ManipulateState,&MessageData);
+            break;
+
+#if 0
+          case DbgKdReadVirtualMemory64Api:
+            KdpReadVirtualMemory64(&ManipulateState,&MessageData);
+            break;
+#endif
+          case DbgKdWriteVirtualMemoryApi:
+            KDDBG("KdpSendWait::KdWriteVirtualMemory(%8p..%8p)\n",
+                  (ULONG_PTR)ManipulateState.u.WriteMemory.TargetBaseAddress,
+                  (ULONG_PTR)ManipulateState.u.WriteMemory.TargetBaseAddress +
+                  ManipulateState.u.WriteMemory.TransferCount);
+            KdpWriteVirtualMemory(&ManipulateState,&MessageData);
+            break;
+#if 0
+          case DbgKdWriteVirtualMemory64Api:
+            KdpWriteVirtualMemory64(&ManipulateState,&MessageData);
+            break;
+#endif
+          case DbgKdGetVersionApi:
+            KDDBG("KdpSendWait::KdGetVersion()\n");
+            KdpGetVersion(&ManipulateState);
+            break;
+
+          case DbgKdGetContextApi:
+            KDDBG("KdpSendWait::KdGetContext(p=%x)\n", ManipulateState.Processor);
+            KdpGetContext(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdReadControlSpaceApi:
+            KDDBG("KdpSendWait::KdReadControlSpace  (%8p..%8p p=%x)\n",
+                  (ULONG_PTR)ManipulateState.u.ReadMemory.TargetBaseAddress,
+                  (ULONG_PTR)ManipulateState.u.ReadMemory.TargetBaseAddress +
+                  ManipulateState.u.ReadMemory.TransferCount,
+                  (ULONG_PTR)ManipulateState.Processor);
+            KdpReadControlSpace(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdWriteControlSpaceApi:
+            KDDBG("KdpSendWait::KdWriteControlSpace (%8p..%8p p=%x)\n",
+                  (ULONG_PTR)ManipulateState.u.WriteMemory.TargetBaseAddress,
+                  (ULONG_PTR)ManipulateState.u.WriteMemory.TargetBaseAddress +
+                  ManipulateState.u.WriteMemory.TransferCount,
+                  (ULONG_PTR)ManipulateState.Processor);
+            KdpWriteControlSpace(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdSetContextApi:
+            KDDBG("KdpSendWait::KdSetContext(p=%x)\n", ManipulateState.Processor);
+            KdpSetContext(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdWriteBreakPointApi:
+            KDDBG("KdpSendWait::KdWriteBreakPoint(%p)\n",
+                  ManipulateState.u.WriteBreakPoint.BreakPointAddress);
+            KdpWriteBreakpoint(&ManipulateState);
+            break;
+
+          case DbgKdRestoreBreakPointApi:
+            if (ManipulateState.u.RestoreBreakPoint.BreakPointHandle < 0x8 ||
+                ManipulateState.u.RestoreBreakPoint.BreakPointHandle > 0x1e) {
+                KDDBG("KdpSendWait::KdRestoreBreakpoint(h=%x)\n",
+                      ManipulateState.u.RestoreBreakPoint.BreakPointHandle);
+            }
+            KdpRestoreBreakpoint(&ManipulateState,&MessageData);
+            break;
+
+          case DbgKdContinueApi:
+            KDDBG("KdpSendWait::KdContinue(ContinueStatus=%08x)\n",
+                  ManipulateState.u.Continue.ContinueStatus);
+            if (NT_SUCCESS(ManipulateState.u.Continue.ContinueStatus)) {
+                return ContinueSuccess;
+            }
+            else {
+                return ContinueError;
+            }
+            break;
+
+          case DbgKdContinueApi2:
+            KDDBG("KdpSendWait::KdContinue2(ContinueStatus=%08x)\n",
+                  ManipulateState.u.Continue2.ContinueStatus);
+            if (NT_SUCCESS(ManipulateState.u.Continue2.ContinueStatus)) {
+                KDDBG("KdpSendWait::KdpGetStateChange()\n");
+                KdpGetStateChange(&ManipulateState,x86Context);
+                return ContinueSuccess;
+            }
+            else {
+                KDDBG("KdpSendWait::ContinueError!\n");
+                return ContinueError;
+            }
+            break;
+
+          case DbgKdReadPhysicalMemoryApi:
+            KDDBG("KdpSendWait::KdReadPhysicalMemory (%8p..%8p)\n",
+                  (ULONG_PTR)ManipulateState.u.ReadMemory.TargetBaseAddress,
+                  (ULONG_PTR)ManipulateState.u.ReadMemory.TargetBaseAddress +
+                  ManipulateState.u.ReadMemory.TransferCount);
+            // KdpReadPhysicalMemory(&ManipulateState,&MessageData,x86Context);
+            KdpReadPhysicalMemory(&ManipulateState,&MessageData);
+            break;
+
+          case DbgKdWritePhysicalMemoryApi:
+            KdpWritePhysicalMemory(&ManipulateState,&MessageData);
+            KDDBG("KdpSendWait::KdWritePhysicalMemory (%8p..%8p)\n",
+                  (ULONG_PTR)ManipulateState.u.WriteMemory.TargetBaseAddress,
+                  (ULONG_PTR)ManipulateState.u.WriteMemory.TargetBaseAddress +
+                  ManipulateState.u.ReadMemory.TransferCount);
+            break;
+
+          case DbgKdSwitchProcessor:
+              {
+                  // KdRestore(FALSE);
+                  bool switched = Class_Microsoft_Singularity_MpExecution::g_SwitchFrozenProcessor((int32) ManipulateState.Processor);
+                  return (switched == true) ? ContinueNextProcessor : ContinueSuccess;
+                  // KdSave(FALSE);
+              }
+            break;
+
+          case DbgKdReadMachineSpecificRegister:
+            KdpReadMachineSpecificRegister(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdWriteMachineSpecificRegister:
+            KdpWriteMachineSpecificRegister(&ManipulateState,&MessageData,x86Context);
+            break;
+
+#if 0 // Haven't implemented most of the protocol yet!
+          case DbgKdCheckLowMemoryApi:
+            KdpCheckLowMemory (&ManipulateState);
+            break;
+
+          case DbgKdReadControlSpaceApi:
+            KdpReadControlSpace(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdWriteControlSpaceApi:
+            KdpWriteControlSpace(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdReadIoSpaceApi:
+            KdpReadIoSpace(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdWriteIoSpaceApi:
+            KdpWriteIoSpace(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdReadIoSpaceExtendedApi:
+            KdpReadIoSpaceExtended(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdWriteIoSpaceExtendedApi:
+            KdpWriteIoSpaceExtended(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdGetBusDataApi:
+            KdpGetBusData(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdSetBusDataApi:
+            KdpSetBusData(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdRebootApi:
+            HalReturnToFirmware(HalRebootRoutine);
+            break;
+
+#if defined(i386)
+          case DbgKdSetSpecialCallApi:
+            KdSetSpecialCall(&ManipulateState,x86Context);
+            break;
+
+          case DbgKdClearSpecialCallsApi:
+            KdClearSpecialCalls();
+            break;
+
+          case DbgKdSetInternalBreakPointApi:
+            KdSetInternalBreakpoint(&ManipulateState);
+            break;
+
+          case DbgKdGetInternalBreakPointApi:
+            KdGetInternalBreakpoint(&ManipulateState);
+            break;
+
+          case DbgKdClearAllInternalBreakpointsApi:
+            KdpNumInternalBreakpoints = 0;
+            break;
+
+#endif // i386
+
+          case DbgKdCauseBugCheckApi:
+            KdpCauseBugCheck(&ManipulateState);
+            break;
+
+          case DbgKdPageInApi:
+            KdpNotSupported(&ManipulateState);
+            break;
+
+          case DbgKdWriteBreakPointExApi:
+            Status = KdpWriteBreakPointEx(&ManipulateState,
+                                          &MessageData,
+                                          x86Context);
+            if (Status) {
+                ManipulateState.ApiNumber = DbgKdContinueApi;
+                ManipulateState.u.Continue.ContinueStatus = Status;
+                return ContinueError;
+            }
+            break;
+
+          case DbgKdRestoreBreakPointExApi:
+            KdpRestoreBreakPointEx(&ManipulateState,&MessageData,x86Context);
+            break;
+
+          case DbgKdSearchMemoryApi:
+            KdpSearchMemory(&ManipulateState, &MessageData, x86Context);
+            break;
+
+          case DbgKdFillMemoryApi:
+            KdpFillMemory(&ManipulateState, &MessageData, x86Context);
+            break;
+
+          case DbgKdQueryMemoryApi:
+            KdpQueryMemory(&ManipulateState, x86Context);
+            break;
+
+            //
+            // Invalid message.
+            //
+#endif // XXX Haven't implemented most of the protocol yet!
+
+          default:
+            kdprintf("KdpSendWaitContinue: unrecognized API number 0x%x\n", ManipulateState.ApiNumber);
+            MessageData.Length = 0;
+            ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL;
+            KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &MessageHeader, &MessageData, &KdpContext);
+            break;
+        }
+    }
+}
+//
+//////////////////////////////////////////////////////////////////////////////
+
+BOOLEAN
+KdPrintString(
+    IN PSTRING Output,
+    IN BOOLEAN Unicode
+    )
+    //  Routine Description:
+    //      This routine prints a string.
+    //
+    //  Arguments:
+    //      Output - Supplies a pointer to a string descriptor for the output string.
+    //
+    //  Return Value:
+    //      TRUE if Control-C present in input buffer after print is done.
+    //      FALSE otherwise.
+{
+
+    ULONG Length;
+    STRING MessageData;
+    STRING MessageHeader;
+    DBGKD_DEBUG_IO DebugIo;
+
+    if (KdDebuggerNotPresent) {
+        return FALSE;
+    }
+
+    KdpLock();
+
+    // Move the output string to the message buffer.
+    //
+    if (Unicode) {
+        WCHAR *pBuffer = (WCHAR *)Output->Buffer;
+        for (int i = 0; i < Output->Length; i++) {
+            KdpMessageBuffer[i] = (char)pBuffer[i];
+        }
+        Length = Output->Length;
+    }
+    else {
+        KdpCopyFromPtr(KdpMessageBuffer,
+                       Output->Buffer,
+                       Output->Length,
+                       &Length);
+    }
+
+    // If the total message length is greater than the maximum packet size,
+    // then truncate the output string.
+    //
+    if ((sizeof(DBGKD_DEBUG_IO) + Length) > PACKET_MAX_SIZE) {
+        Length = PACKET_MAX_SIZE - sizeof(DBGKD_DEBUG_IO);
+    }
+
+    // Construct the print string message and message descriptor.
+    //
+    DebugIo.ApiNumber = DbgKdPrintStringApi;
+    DebugIo.ProcessorLevel = KeProcessorLevel;
+    DebugIo.Processor = (USHORT)GetCurrentProcessorNumber();
+    DebugIo.u.PrintString.LengthOfString = Length;
+    MessageHeader.Length = sizeof(DBGKD_DEBUG_IO);
+    MessageHeader.Buffer = (PCHAR)&DebugIo;
+
+    // Construct the print string data and data descriptor.
+    //
+    MessageData.Length = (USHORT)Length;
+    MessageData.Buffer = (PCHAR) KdpMessageBuffer;
+
+    // Send packet to the kernel debugger on the host machine.
+    //
+    KdSendPacket(PACKET_TYPE_KD_DEBUG_IO,
+                 &MessageHeader,
+                 &MessageData,
+                 &KdpContext);
+
+    KdpUnlock();
+
+    return FALSE;
+}
+
+
+// This should be fixed.
+VOID
+KdPutChar(
+    CHAR c
+)
+{
+     static char _KdpDebugStringBuf[KDP_MESSAGE_BUFFER_SIZE];
+     static STRING KdpDebugString = { 0, KDP_MESSAGE_BUFFER_SIZE, (PCHAR)&_KdpDebugStringBuf };
+
+     if (KdpInDebugger) {
+         koutput(NULL, c);
+         return;
+     }
+
+     KdpDebugString.Buffer[KdpDebugString.Length++] = c;
+     if (c == '\n' || KdpDebugString.Length == KdpDebugString.MaximumLength) {
+          KdPrintString(&KdpDebugString, FALSE);
+          KdpDebugString.Length = 0;
+     }
+}
+
+/////////////////////////////////////////////////////// Methods Exposed to C#.
+//
+bool Class_Microsoft_Singularity_DebugStub::
+g_Trap(Struct_Microsoft_Singularity_X86_ThreadContext *context, bool firstChance)
+{
+    EXCEPTION_RECORD64 er;
+    bool handled;
+    RtlZeroMemory(&er, sizeof(er));
+
+    KdpLock();
+
+    // Breakpoints:
+    switch (context->num) {
+
+        case Struct_Microsoft_Singularity_X86_EVectors_SingleStep:
+            er.ExceptionCode = STATUS_SINGLE_STEP;
+            er.ExceptionAddress = (ULONG64)context->eip;
+            // context->efl &= ~Struct_Microsoft_Singularity_X86_EFlags_TF;
+            break;
+
+        case Struct_Microsoft_Singularity_X86_EVectors_Breakpoint:
+            context->eip -= 1;
+            er.ExceptionCode = STATUS_BREAKPOINT;
+            er.NumberParameters = 1;
+            er.ExceptionInformation[0] = BREAKPOINT_BREAK;
+            er.ExceptionAddress = (ULONG64)context->eip;
+            break;
+
+        case Struct_Microsoft_Singularity_X86_EVectors_IllegalInstruction:
+            er.ExceptionCode = STATUS_ILLEGAL_INSTRUCTION;
+            break;
+
+        case Struct_Microsoft_Singularity_X86_EVectors_PageFault:
+            KDDBG("KD: 0x0E %d\n", context->num);
+            er.ExceptionCode = STATUS_ACCESS_VIOLATION;
+            er.ExceptionAddress = (UINT64)context->eip;
+            er.NumberParameters = 1;
+            er.ExceptionInformation[0] = context->cr2;
+            break;
+
+        case Struct_Microsoft_Singularity_X86_EVectors_FirstChanceException: {
+            KdDebugTrapData *trapData = (KdDebugTrapData *) (context->eax);
+            switch(trapData->tag) {
+                case KdDebugTrapData::FIRST_CHANCE_EXCEPTION:
+                    context->eax = trapData->u.firstChanceException.throwAddr;
+                    KDDBG("KD: First chance C# exception\n");
+                    // er.ExceptionCode = STATUS_CPP_EH_EXCEPTION; //0xe06d7363;
+                    er.ExceptionCode = STATUS_VCPP_EXCEPTION; //0x8000ff1f;
+                    er.ExceptionAddress = (UINT64)context->eip;
+                    er.NumberParameters = 1;
+                    er.ExceptionInformation[0] = BREAKPOINT_BREAK;
+                    break;
+                case KdDebugTrapData::LOADED_BINARY:
+                    KDDBG("KD: Loaded binary\n");
+                    KdpUnlock();
+                    LoadedBinary(context);
+                    return true;
+                case KdDebugTrapData::UNLOADED_BINARY:
+                    KDDBG("KD: Unloaded binary\n");
+                    KdpUnlock();
+                    UnloadedBinary(context);
+                    return true;
+                default:
+                    KDDBG("KD: Unexpected interrupt %d\n", context->num);
+                    er.ExceptionCode = 0x80000000 + context->num;
+                    er.ExceptionAddress = (UINT64)context->eip;
+                    break;
+            }
+            break;
+        }
+
+        case Struct_Microsoft_Singularity_X86_EVectors_SecondChanceException:
+            KDDBG("KD: Second chance C# exception\n");
+            er.ExceptionCode = STATUS_VCPP_EXCEPTION;
+            er.ExceptionAddress = (UINT64)context->eip;
+            break;
+
+        case Struct_Microsoft_Singularity_X86_EVectors_DebuggerBreakRequest:
+            KDDBG("KD: Debugger ctrl-break\n");
+            er.ExceptionCode = STATUS_BREAKPOINT;
+            er.ExceptionInformation[0] = BREAKPOINT_BREAK;
+            er.ExceptionAddress = (UINT64)context->eip;
+            break;
+
+        default:
+            KDDBG("KD: Unexpected interrupt %d\n", context->num);
+            er.ExceptionCode = 0x80000000 + context->num;
+            er.ExceptionAddress = (UINT64)context->eip;
+            break;
+
+    }
+
+    KDDBG("Trap: Context at %p\n", context);
+    KDDBG("  CXT=%08x  THR=%08x\n",
+          context, context->_thread);
+    KDDBG("  EIP=%08x  EFL=%08x  ERR=%08x  CR2=%08x\n",
+          context->eip, context->efl, context->err, context->cr2);
+    KDDBG("  EAX=%08x  EBX=%08x  ECX=%08x  EDX=%08x\n",
+          context->eax, context->ebx, context->ecx, context->edx);
+    KDDBG("  ESP=%08x  EBP=%08x  ESI=%08x  EDI=%08x\n",
+          context->esp, context->ebp, context->esi, context->edi);
+
+#if 0
+    kdprintf("Exception EIPs = %08x", er.ExceptionAddress);
+    uintptr ebp = context->ebp;
+    for (int i = 0; i < 3 && ebp >= Struct_Microsoft_Singularity_BootInfo_PHYSICAL_DISABLED; i++) {
+
+        uintptr next = ((uintptr *)ebp)[0];
+        uintptr code = ((uintptr *)ebp)[1];
+
+        kdprintf(" %08x", code);
+        ebp = next;
+    }
+    kdprintf("\n");
+#endif
+
+    KdpEnter();
+
+    handled = (KdpReportExceptionStateChange(&er, context, firstChance) == ContinueSuccess);
+    if (context->num == Struct_Microsoft_Singularity_X86_EVectors_SingleStep &&
+        (context->efl & Struct_Microsoft_Singularity_X86_EFlags_TF) == 0) {
+#if 0
+        kdprintf("Continuing to eip=%08x [efl=%08x]\n", context->eip, context->efl);
+#endif
+
+#if 0
+        if (context->eip != 0 && *(uint8*)(context->eip) == 0x9c) {
+            // we always override into single-step mode if the next instruction is pushfd.
+            context->efl |= Struct_Microsoft_Singularity_X86_EFlags_TF;
+            kdprintf("Continuing to eip=%08x [efl=%08x] ****\n", context->eip, context->efl);
+#if 0
+            kdprintf("  CXT=%08x  THR=%08x  REG=%02x\n",
+                     context, context->_thread, context->regs);
+            kdprintf("  EIP=%08x  EFL=%08x  ERR=%08x  CR2=%08x\n",
+                     context->eip, context->efl, context->err, context->cr2);
+            kdprintf("  EAX=%08x  EBX=%08x  ECX=%08x  EDX=%08x\n",
+                     context->eax, context->ebx, context->ecx, context->edx);
+            kdprintf("  ESP=%08x  EBP=%08x  ESI=%08x  EDI=%08x\n",
+                     context->esp, context->ebp, context->esi, context->edi);
+            kdprintf("  DR0=%08x  DR1=%08x  DR2=%08x  DR3=%08x\n",
+                     context->dr0, context->dr1, context->dr2, context->dr3);
+            kdprintf("  DR6=%08x  DR7=%08x  DR2=%08x  DR3=%08x\n",
+                     context->dr6, context->dr7, context->dr2, context->dr3);
+#endif
+        }
+#endif
+    }
+
+#if 0
+    if (context->num == Struct_Microsoft_Singularity_X86_EVectors_SingleStep &&
+        context->eip != 0 && *(uint8*)(context->eip) == 0x9c) {
+        kdprintf("  CXT=%08x  THR=%08x  REG=%02x\n",
+                 context, context->_thread, context->regs);
+        kdprintf("  EIP=%08x  EFL=%08x  ERR=%08x  CR2=%08x\n",
+                 context->eip, context->efl, context->err, context->cr2);
+        kdprintf("  EAX=%08x  EBX=%08x  ECX=%08x  EDX=%08x\n",
+                 context->eax, context->ebx, context->ecx, context->edx);
+        kdprintf("  ESP=%08x  EBP=%08x  ESI=%08x  EDI=%08x\n",
+                 context->esp, context->ebp, context->esi, context->edi);
+        kdprintf("  DR0=%08x  DR1=%08x  DR2=%08x  DR3=%08x\n",
+                 context->dr0, context->dr1, context->dr2, context->dr3);
+        kdprintf("  DR6=%08x  DR7=%08x  DR2=%08x  DR3=%08x\n",
+                 context->dr6, context->dr7, context->dr2, context->dr3);
+    }
+    kdprintf("-- Trap num=0x%02x eip=%08x\n", context->num, context->eip);
+#endif
+
+    KdpLeave();
+
+    KdpUnlock();
+
+    return handled;
+}
+
+bool Class_Microsoft_Singularity_DebugStub::
+g_TrapForProcessorSwitch(Struct_Microsoft_Singularity_X86_ThreadContext *context)
+{
+    EXCEPTION_RECORD64 er;
+
+    RtlZeroMemory(&er, sizeof(er));
+    er.ExceptionCode    = STATUS_WAKE_SYSTEM_DEBUGGER;
+    er.ExceptionRecord  = (ULONG64)&er;
+    er.ExceptionAddress = (ULONG64)context->eip;
+
+    // KdSave(FALSE);
+    KCONTINUE_STATUS status = KdpReportExceptionStateChange(&er, context, true);
+    // KdRestore(FALSE);
+    return status == ContinueSuccess;
+}
+
+void Class_Microsoft_Singularity_DebugStub::g_AddProcessor(int cpuId)
+{
+    KdpLock();
+    KeNumberProcessors = cpuId + 1;
+    KdpUnlock();
+}
+
+void Class_Microsoft_Singularity_DebugStub::g_RevertToUniprocessor()
+{
+    KdpLock();
+    KeNumberProcessors = 1;
+    KdpUnlock();
+}
+
+bool Class_Microsoft_Singularity_DebugStub::g_PollForBreak()
+{
+    //    KdpLock();
+
+    // Don't re-enter debugger if already debugging.
+    if (KdpInDebugger) {
+        return FALSE;
+    }
+
+    // If the debugger is enabled, see if a breakin by the kernel
+    // debugger is pending.
+    // We might want to enable retry here.  The transports support it.
+    if (KdDebuggerNotPresent) {
+        return false;
+    }
+
+    // Did we already record a break from the host?
+    if (KdpContext.KdpControlCPending) {
+        KdpContext.KdpControlCPending = FALSE;
+        return true;
+    }
+
+    bool success = KdPollBreakIn();
+    //    KdpUnlock();
+    return success;
+}
+
+void Class_Microsoft_Singularity_DebugStub::g_Break()
+{
+    __asm int 3;
+}
+
+bool Class_Microsoft_Singularity_DebugStub::g_LoadedBinary(UIntPtr baseAddress,
+                                                           UIntPtr bytes,
+                                                           Class_System_String *name,
+                                                           uint32 checksum,
+                                                           uint32 timestamp,
+                                                           bool silent)
+{
+    return g_LoadedBinary(baseAddress,
+                          bytes,
+                          (UIntPtr)&name->m_firstChar,
+                          checksum,
+                          timestamp,
+                          silent);
+}
+
+bool Class_Microsoft_Singularity_DebugStub::g_LoadedBinary(UIntPtr baseAddress,
+                                                           UIntPtr bytes,
+                                                           UIntPtr name,
+                                                           uint32 checksum,
+                                                           uint32 timestamp,
+                                                           bool silent)
+{
+    KdDebugTrapData trapData, *trapDataPtr = &trapData;
+    trapData.tag = KdDebugTrapData::LOADED_BINARY;
+    trapData.u.loadedBinary.baseAddress = baseAddress;
+    trapData.u.loadedBinary.bytes = bytes;
+    trapData.u.loadedBinary.name = name;
+    trapData.u.loadedBinary.checksum = checksum;
+    trapData.u.loadedBinary.timestamp = timestamp;
+    trapData.u.loadedBinary.silent = silent;
+
+    // Call LoadedBinary via an __asm int 29:
+    __asm {
+        mov eax, trapDataPtr;
+        int 29;
+    }
+
+    return trapData.u.loadedBinary.ret;
+}
+
+static void LoadedBinary(Struct_Microsoft_Singularity_X86_ThreadContext *context)
+{
+    KdDebugTrapData *trapData = (KdDebugTrapData *) (context->eax);
+    UIntPtr baseAddress = trapData->u.loadedBinary.baseAddress;
+    UIntPtr bytes = trapData->u.loadedBinary.bytes;
+    UIntPtr nameof = trapData->u.loadedBinary.name;
+    uint32 checksum = trapData->u.loadedBinary.checksum;
+    uint32 timestamp = trapData->u.loadedBinary.timestamp;
+    bool silent = trapData->u.loadedBinary.silent;
+
+    KLDR_DATA_TABLE_ENTRY_WITH_NAME *pEntry;
+    bool good = false;
+    WCHAR * name = trim((WCHAR *)nameof);
+    USHORT nlen = (USHORT)2 * wcslen(name);
+    if (nlen > sizeof(pEntry->wzName)) {
+        nlen = sizeof(pEntry->wzName);
+    }
+
+    KdpLock();
+#if 0 // Debug module names
+    if (name != NULL) {
+        kdprintf("LoadedBinary(%08lx: %ls)\n", (uint64)(uintptr)name, name);
+    }
+    else {
+        kdprintf("LoadedBinary(%08lx)\n", (uint64)(uintptr)name);
+    }
+#endif
+
+    for (int i = 0; i < ARRAYOF(KdModuleKernelEntry); i++) {
+        pEntry = &KdModuleKernelEntry[i];
+
+        if (pEntry->DllBase == 0) {
+            pEntry->DllBase = (PVOID *)baseAddress;
+            pEntry->CheckSum = checksum;
+            pEntry->TimeDateStamp = timestamp;
+            pEntry->LoadCount = 1;
+            pEntry->SizeOfImage = (uintptr)bytes;
+            memcpy(pEntry->wzName, name, nlen);
+            RtlInitUnicodeString(&pEntry->FullDllName, name, nlen);
+            RtlInitUnicodeString(&pEntry->BaseDllName, name, nlen);
+
+#if 0
+            printf("----: BaseOfImage %8lx SizeOfImage %8x ModuleName %8x\n",
+                   (uint64)(uintptr)baseAddress,
+                   (uintptr)bytes,
+                   (uintptr)pEntry->BaseDllName.Buffer);
+            printf("      ModuleName: %ls (%p)\n",
+                   pEntry->BaseDllName.Buffer,
+                   pEntry);
+#endif
+
+            // We should insert in the right order in the list...
+            InsertTailList(&PsLoadedModuleList, &pEntry->InLoadOrderLinks);
+            good = true;
+            break;
+        }
+    }
+
+    if (!silent) {
+        if (good) {
+            KdpReportLoadSymbolsStateChange(pEntry->BaseDllName.Buffer,
+                                            pEntry->BaseDllName.Length,
+                                            (ULONG64)baseAddress,
+                                            (ULONG)0,
+                                            checksum,
+                                            (LONG)bytes,
+                                            FALSE,
+                                            context);
+        }
+        else {
+            KdpReportLoadSymbolsStateChange(NULL,
+                                            0,
+                                            (ULONG64)baseAddress,
+                                            (ULONG)0,
+                                            checksum,
+                                            (LONG)bytes,
+                                            FALSE,
+                                            context);
+        }
+    }
+    KdpUnlock();
+
+    trapData->u.loadedBinary.ret = good;
+}
+
+bool Class_Microsoft_Singularity_DebugStub::
+g_UnloadedBinary(UIntPtr baseAddress, bool silent)
+{
+    KdDebugTrapData trapData, *trapDataPtr = &trapData;
+    trapData.tag = KdDebugTrapData::UNLOADED_BINARY;
+    trapData.u.unloadedBinary.baseAddress = baseAddress;
+    trapData.u.unloadedBinary.silent = silent;
+
+    // Call UnloadedBinary via an __asm int 29:
+    __asm {
+        mov eax, trapDataPtr;
+        int 29;
+    }
+
+    return trapData.u.unloadedBinary.ret;
+}
+
+static void UnloadedBinary(Struct_Microsoft_Singularity_X86_ThreadContext *context)
+{
+    KdDebugTrapData *trapData = (KdDebugTrapData *) (context->eax);
+    UIntPtr baseAddress = trapData->u.unloadedBinary.baseAddress;
+    bool silent = trapData->u.unloadedBinary.silent;
+
+    bool good = false;
+
+    KdpLock();
+    KLDR_DATA_TABLE_ENTRY_WITH_NAME *pEntry = NULL;
+    for (int i = 0; i < ARRAYOF(KdModuleKernelEntry); i++) {
+        pEntry = &KdModuleKernelEntry[i];
+
+        if (pEntry->DllBase == (PVOID*)baseAddress) {
+            RemoveEntryList(&pEntry->InLoadOrderLinks);
+            good = true;
+            break;
+        }
+    }
+
+    if (good) {
+        if (!silent) {
+            // Only tell debugger if we found an image name.
+            // The debugger ignores unload requests that lack a processId (not us)
+            // or a path name.
+
+            KdpReportLoadSymbolsStateChange(pEntry->BaseDllName.Buffer,
+                                            pEntry->BaseDllName.Length,
+                                            (ULONG64)baseAddress,
+                                            (ULONG)0,
+                                            0,
+                                            0,
+                                            TRUE,
+                                            context);
+        }
+        RtlZeroMemory(pEntry, sizeof(*pEntry));
+    }
+    KdpUnlock();
+
+    trapData->u.unloadedBinary.ret = good;
+}
+
+bool Class_Microsoft_Singularity_DebugStub::g_IsDebuggerPresent()
+{
+    return !KdDebuggerNotPresent;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Note: Leaves the lock held by the client code, so it had better be trustworthy.
+void Class_Microsoft_Singularity_DebugStub::g_PrintBegin(WCHAR **buffer, int *length)
+{
+    if (KdDebuggerNotPresent) {
+        *buffer = NULL;
+        *length = 0;
+        return;
+    }
+    else {
+        KdpLock();
+
+        *buffer = (WCHAR *)KdpMessageBuffer;
+        *length = sizeof(KdpMessageBuffer) / sizeof(WCHAR);
+    }
+}
+
+// Note: Assumes the lock is held, so the client code had better be trustworthy.
+void Class_Microsoft_Singularity_DebugStub::g_PrintComplete(WCHAR *buffer, int length)
+{
+    if (KdDebuggerNotPresent) {
+        return;
+    }
+
+    CHAR *out = KdpMessageBuffer;
+    if (length > arrayof(KdpMessageBuffer)) {
+        length = arrayof(KdpMessageBuffer);
+    }
+
+    for (int i = 0; i < length; i++) {
+        *out++ = (CHAR)*buffer++;
+    }
+
+    // If the total message length is greater than the maximum packet size,
+    // then truncate the output string.
+    //
+    if ((sizeof(DBGKD_DEBUG_IO) + length) > PACKET_MAX_SIZE) {
+        length = PACKET_MAX_SIZE - sizeof(DBGKD_DEBUG_IO);
+    }
+
+    //
+    // Construct the print string message and message descriptor.
+    //
+    DBGKD_DEBUG_IO DebugIo;
+    DebugIo.ApiNumber = DbgKdPrintStringApi;
+    DebugIo.ProcessorLevel = KeProcessorLevel;
+    DebugIo.Processor = (USHORT)GetCurrentProcessorNumber();
+    DebugIo.u.PrintString.LengthOfString = length;
+
+    STRING MessageHeader;
+    MessageHeader.Length = sizeof(DBGKD_DEBUG_IO);
+    MessageHeader.Buffer = (PCHAR)&DebugIo;
+
+    //
+    // Construct the print string data and data descriptor.
+    //
+    STRING MessageData;
+    MessageData.Length = (USHORT)length;
+    MessageData.Buffer = KdpMessageBuffer;
+
+    //
+    // Send packet to the kernel debugger on the host machine.
+    //
+    KdSendPacket(PACKET_TYPE_KD_DEBUG_IO,
+                 &MessageHeader,
+                 &MessageData,
+                 &KdpContext);
+
+    KdpUnlock();
+}
+
+void Class_Microsoft_Singularity_DebugStub::g_Print(WCHAR *buf, int len)
+{
+    if (KdDebuggerNotPresent) {
+        return;
+    }
+
+    WCHAR *buffer;
+    int length;
+
+    g_PrintBegin(&buffer, &length);
+    g_PrintComplete(buf, len);
+}
+
+void Class_Microsoft_Singularity_DebugStub::g_Print(WCHAR *buf)
+{
+    int len = 0;
+
+    while (buf[len] != '\0') {
+        len++;
+    }
+    g_Print(buf, len);
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/halkd.h b/base/Kernel/Native/halkd.h
new file mode 100644
index 0000000..a35971d
--- /dev/null
+++ b/base/Kernel/Native/halkd.h
@@ -0,0 +1,927 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// halkd.h: runtime support for debugging
+//
+
+
+#define FALSE 0
+#define TRUE   1
+
+#define IN
+#define OUT
+#define OPTIONAL
+#define CONST const
+
+#define ASSERT(x)
+#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0)
+
+// NT Compat types
+typedef BOOL BOOLEAN;
+typedef UINT16 USHORT;
+typedef INT32  LONG;
+typedef UINT32 ULONG, *PULONG;
+typedef UINT64 ULONG64;
+typedef INT64 LONG64;
+typedef char *PCHAR;
+typedef char  CHAR;
+typedef void   VOID;
+typedef UCHAR *PUCHAR;
+typedef WCHAR *LPWSTR, *PWSTR;
+typedef /*_W64 */ long LONG_PTR, *PLONG_PTR;
+typedef DWORD NTSTATUS;
+typedef struct _STRING {
+    USHORT Length;
+    USHORT MaximumLength;
+    PCHAR  Buffer;
+} STRING, *PSTRING;
+typedef struct _UNICODE_STRING {
+    USHORT Length;
+    USHORT MaximumLength;
+    PWSTR  Buffer;
+} UNICODE_STRING;
+typedef struct _LIST_ENTRY {
+    struct _LIST_ENTRY *Flink;
+    struct _LIST_ENTRY *Blink;
+} LIST_ENTRY, *PLIST_ENTRY;
+
+//
+// Some quick macros to avoid having to edit too much NT code
+//
+#define RtlZeroMemory(base, len)            memset((base), 0, (len))
+#define KdpQuickMoveMemory(dst,src,len)     memcpy((dst),(src),(len))
+
+// Read memory from an untrusted pointer into a trusted buffer.
+#define KdpCopyFromPtr(Dst, Src, Size, Done) \
+    KdpCopyMemoryChunks((ULONG_PTR)(Src), Dst, Size, 0,                       \
+                        MMDBG_COPY_UNSAFE, Done)
+// Write memory from a trusted buffer through an untrusted pointer.
+#define KdpCopyToPtr(Dst, Src, Size, Done) \
+    KdpCopyMemoryChunks((ULONG_PTR)(Dst), Src, Size, 0,                       \
+                        MMDBG_COPY_WRITE | MMDBG_COPY_UNSAFE, Done)
+
+#define RtlInitUnicodeString(string, source, length) \
+ { (string)->Buffer = (source); (string)->Length = (string)->MaximumLength = (length); }
+
+#define FORCEINLINE __inline
+
+VOID
+FORCEINLINE
+InitializeListHead(
+    IN PLIST_ENTRY ListHead
+    )
+{
+    ListHead->Flink = ListHead->Blink = ListHead;
+}
+
+BOOLEAN
+FORCEINLINE
+RemoveEntryList(
+    IN PLIST_ENTRY Entry
+    )
+{
+    PLIST_ENTRY Blink;
+    PLIST_ENTRY Flink;
+
+    Flink = Entry->Flink;
+    Blink = Entry->Blink;
+    Blink->Flink = Flink;
+    Flink->Blink = Blink;
+    return (BOOLEAN)(Flink == Blink);
+}
+
+VOID
+FORCEINLINE
+InsertTailList(
+    IN PLIST_ENTRY ListHead,
+    IN PLIST_ENTRY Entry
+    )
+{
+    PLIST_ENTRY Blink;
+
+    Blink = ListHead->Blink;
+    Entry->Flink = ListHead;
+    Entry->Blink = Blink;
+    Blink->Flink = Entry;
+    ListHead->Blink = Entry;
+}
+
+//#define KdpCopyFromPtr(dst, src, size, done)  { memcpy((dst),(src),(size)); *(done)=(size); }
+//#define KdpCopyToPtr(dst, src, size, done)  { memcpy((dst),(src),(size)); *(done)=(size); }
+
+
+
+//======================================================================
+// Selected structs and defines used by the kernel debugger
+//
+typedef void *PNON_PAGED_DEBUG_INFO;
+
+typedef struct _KLDR_DATA_TABLE_ENTRY {
+    LIST_ENTRY InLoadOrderLinks;
+    PVOID __Unused1;
+    PVOID __Unused2;
+    PVOID __Unused3;
+    PNON_PAGED_DEBUG_INFO NonPagedDebugInfo;
+    PVOID DllBase;
+    PVOID EntryPoint;
+    ULONG SizeOfImage;
+    UNICODE_STRING FullDllName;
+    UNICODE_STRING BaseDllName;
+    ULONG Flags;
+    USHORT LoadCount;
+    USHORT __Unused5;
+    PVOID SectionPointer;
+    ULONG CheckSum;
+    // ULONG padding on IA64
+    ULONG TimeDateStamp;
+    //    PVOID LoadedImports;
+    PVOID __Unused6;
+} KLDR_DATA_TABLE_ENTRY, *PKLDR_DATA_TABLE_ENTRY;
+
+//======================================================================
+// Selected structs and defines used by the KD protocol
+//
+
+//
+//  Values put in ExceptionRecord.ExceptionInformation[0]
+//  First parameter is always in ExceptionInformation[1],
+//  Second parameter is always in ExceptionInformation[2]
+//
+
+#define BREAKPOINT_BREAK            0
+#define BREAKPOINT_PRINT            1
+#define BREAKPOINT_PROMPT           2
+#define BREAKPOINT_LOAD_SYMBOLS     3
+#define BREAKPOINT_UNLOAD_SYMBOLS   4
+#define BREAKPOINT_COMMAND_STRING   5
+
+
+#define CONTEXT_i386    0x00010000    // this assumes that i386 and
+#define CONTEXT_i486    0x00010000    // i486 have identical context records
+
+// end_wx86
+
+#define CONTEXT_CONTROL         (CONTEXT_i386 | 0x00000001L) // SS:SP, CS:IP, FLAGS, BP
+#define CONTEXT_INTEGER         (CONTEXT_i386 | 0x00000002L) // AX, BX, CX, DX, SI, DI
+#define CONTEXT_SEGMENTS        (CONTEXT_i386 | 0x00000004L) // DS, ES, FS, GS
+#define CONTEXT_FLOATING_POINT  (CONTEXT_i386 | 0x00000008L) // 387 state
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x00000010L) // DB 0-3,6,7
+#define CONTEXT_EXTENDED_REGISTERS  (CONTEXT_i386 | 0x00000020L) // cpu specific extensions
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER |\
+                      CONTEXT_SEGMENTS)
+
+#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS)
+
+#define CONTEXT_TO_PROGRAM_COUNTER(Context) ((Context)->Eip)
+
+typedef struct _DESCRIPTOR {
+    USHORT  Pad;
+    USHORT  Limit;
+    ULONG   Base;
+} KDESCRIPTOR, *PKDESCRIPTOR;
+
+typedef struct _KSPECIAL_REGISTERS {
+    ULONG Cr0;
+    ULONG Cr2;
+    ULONG Cr3;
+    ULONG Cr4;
+    ULONG KernelDr0;
+    ULONG KernelDr1;
+    ULONG KernelDr2;
+    ULONG KernelDr3;
+    ULONG KernelDr6;
+    ULONG KernelDr7;
+    KDESCRIPTOR Gdtr;
+    KDESCRIPTOR Idtr;
+    USHORT Tr;
+    USHORT Ldtr;
+    ULONG Reserved[6];
+} KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS;
+
+//
+// Processor State frame: Before a processor freezes itself, it
+// dumps the processor state to the processor state frame for
+// debugger to examine.
+//
+
+typedef struct _KPROCESSOR_STATE {
+    struct _CONTEXT ContextFrame;
+    struct _KSPECIAL_REGISTERS SpecialRegisters;
+} KPROCESSOR_STATE, *PKPROCESSOR_STATE;
+
+#if 0  // XXX We have one of these already in minidump.h
+typedef struct _EXCEPTION_RECORD64 {
+    DWORD    ExceptionCode;
+    DWORD ExceptionFlags;
+    DWORD64 ExceptionRecord;
+    DWORD64 ExceptionAddress;
+    DWORD NumberParameters;
+    DWORD __unusedAlignment;
+    DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+} EXCEPTION_RECORD64, *PEXCEPTION_RECORD64;
+#endif
+
+// Don't care what these point to!
+typedef void *PKTRAP_FRAME;
+typedef void *PKEXCEPTION_FRAME;
+
+//
+// Processor modes.
+//
+typedef CHAR KPROCESSOR_MODE;
+typedef enum _MODE {
+    KernelMode,
+    UserMode,
+    MaximumMode
+} MODE;
+
+
+typedef struct _DBGKM_EXCEPTION64 {
+    EXCEPTION_RECORD64 ExceptionRecord;
+    ULONG FirstChance;
+} DBGKM_EXCEPTION64, *PDBGKM_EXCEPTION64;
+
+
+#define DBGKD_MAXSTREAM 16
+
+typedef struct _X86_DBGKD_CONTROL_REPORT {
+    ULONG   Dr6;
+    ULONG   Dr7;
+    USHORT  InstructionCount;
+    USHORT  ReportFlags;
+    UCHAR   InstructionStream[DBGKD_MAXSTREAM];
+    USHORT  SegCs;
+    USHORT  SegDs;
+    USHORT  SegEs;
+    USHORT  SegFs;
+    ULONG   EFlags;
+} X86_DBGKD_CONTROL_REPORT, *PX86_DBGKD_CONTROL_REPORT;
+
+#define X86_REPORT_INCLUDES_SEGS    0x0001
+// Indicates the current CS is a standard 32-bit flat segment.
+// This allows the debugger to avoid retrieving the
+// CS descriptor to see if it's 16-bit code or not.
+// Note that the V86 flag in EFlags must also be checked
+// when determining the code type.
+#define X86_REPORT_STANDARD_CS      0x0002
+
+typedef X86_DBGKD_CONTROL_REPORT   DBGKD_CONTROL_REPORT;
+
+typedef struct _ALPHA_DBGKD_CONTROL_REPORT {
+    ULONG InstructionCount;
+    UCHAR InstructionStream[DBGKD_MAXSTREAM];
+} ALPHA_DBGKD_CONTROL_REPORT, *PALPHA_DBGKD_CONTROL_REPORT;
+
+typedef struct _IA64_DBGKD_CONTROL_REPORT {
+    ULONG InstructionCount;
+    UCHAR InstructionStream[DBGKD_MAXSTREAM];
+} IA64_DBGKD_CONTROL_REPORT, *PIA64_DBGKD_CONTROL_REPORT;
+
+typedef struct _AMD64_DBGKD_CONTROL_REPORT {
+    ULONG64 Dr6;
+    ULONG64 Dr7;
+    ULONG EFlags;
+    USHORT InstructionCount;
+    USHORT ReportFlags;
+    UCHAR InstructionStream[DBGKD_MAXSTREAM];
+    USHORT SegCs;
+    USHORT SegDs;
+    USHORT SegEs;
+    USHORT SegFs;
+} AMD64_DBGKD_CONTROL_REPORT, *PAMD64_DBGKD_CONTROL_REPORT;
+
+typedef struct _DBGKD_ANY_CONTROL_REPORT
+{
+    union
+    {
+        X86_DBGKD_CONTROL_REPORT X86ControlReport;
+        // XXX Though we only care about x86 this union must be the correct size
+        ALPHA_DBGKD_CONTROL_REPORT AlphaControlReport;
+        IA64_DBGKD_CONTROL_REPORT IA64ControlReport;
+        AMD64_DBGKD_CONTROL_REPORT Amd64ControlReport;
+    };
+} DBGKD_ANY_CONTROL_REPORT, *PDBGKD_ANY_CONTROL_REPORT;
+
+typedef struct _DBGKD_LOAD_SYMBOLS64 {
+    ULONG PathNameLength;
+    ULONG64 BaseOfDll;
+    ULONG64 ProcessId;
+    ULONG CheckSum;
+    ULONG SizeOfImage;
+    BOOLEAN UnloadSymbols;
+} DBGKD_LOAD_SYMBOLS64, *PDBGKD_LOAD_SYMBOLS64;
+
+typedef struct _DBGKD_COMMAND_STRING {
+    ULONG Flags;
+    ULONG Reserved1;
+    ULONG64 Reserved2[7];
+} DBGKD_COMMAND_STRING, *PDBGKD_COMMAND_STRING;
+
+// Protocol version 6 state change.
+typedef struct _DBGKD_ANY_WAIT_STATE_CHANGE {
+    ULONG NewState;
+    USHORT ProcessorLevel;
+    USHORT Processor;
+    ULONG NumberProcessors;
+    ULONG64 Thread;
+    ULONG64 ProgramCounter;
+    union {
+        DBGKM_EXCEPTION64 Exception;
+        DBGKD_LOAD_SYMBOLS64 LoadSymbols;
+        DBGKD_COMMAND_STRING CommandString;
+    } u;
+    // The ANY control report is unioned here to
+    // ensure that this structure is always large
+    // enough to hold any possible state change.
+    union {
+        DBGKD_CONTROL_REPORT ControlReport;
+        DBGKD_ANY_CONTROL_REPORT AnyControlReport;
+    };
+} DBGKD_ANY_WAIT_STATE_CHANGE, *PDBGKD_ANY_WAIT_STATE_CHANGE;
+
+
+typedef struct _DBGKD_READ_MEMORY64 {
+    ULONG64 TargetBaseAddress;
+    ULONG TransferCount;
+    ULONG ActualBytesRead;
+} DBGKD_READ_MEMORY64, *PDBGKD_READ_MEMORY64;
+
+typedef struct _DBGKD_WRITE_MEMORY64 {
+    ULONG64 TargetBaseAddress;
+    ULONG TransferCount;
+    ULONG ActualBytesWritten;
+} DBGKD_WRITE_MEMORY64, *PDBGKD_WRITE_MEMORY64;
+
+//
+// Response is a get context message with a full context record following
+//
+
+typedef struct _DBGKD_GET_CONTEXT {
+    ULONG Unused;
+} DBGKD_GET_CONTEXT, *PDBGKD_GET_CONTEXT;
+
+//
+// Full Context record follows
+//
+
+typedef struct _DBGKD_SET_CONTEXT {
+    ULONG ContextFlags;
+} DBGKD_SET_CONTEXT, *PDBGKD_SET_CONTEXT;
+
+//
+// Define breakpoint table entry structure.
+//
+
+
+// XXX Breakpoints are x86 specific
+#define KDP_BREAKPOINT_TYPE  UCHAR
+#define KDP_BREAKPOINT_BUFFER sizeof(UCHAR)
+#define KDP_BREAKPOINT_ALIGN 0
+#define KDP_BREAKPOINT_INSTR_ALIGN 0
+#define KDP_BREAKPOINT_VALUE 0xcc
+
+#define KD_BREAKPOINT_IN_USE        0x00000001
+#define KD_BREAKPOINT_NEEDS_WRITE   0x00000002
+#define KD_BREAKPOINT_SUSPENDED     0x00000004
+#define KD_BREAKPOINT_NEEDS_REPLACE 0x00000008
+
+typedef struct _BREAKPOINT_ENTRY {
+    ULONG Flags;
+    ULONG_PTR DirectoryTableBase;
+    PVOID Address;
+    KDP_BREAKPOINT_TYPE Content;
+} BREAKPOINT_ENTRY, *PBREAKPOINT_ENTRY;
+
+#define BREAKPOINT_TABLE_SIZE   32      // max number supported by kernel
+
+
+typedef struct _DBGKD_WRITE_BREAKPOINT32 {
+    ULONG BreakPointAddress;
+    ULONG BreakPointHandle;
+} DBGKD_WRITE_BREAKPOINT32, *PDBGKD_WRITE_BREAKPOINT32;
+
+typedef struct _DBGKD_WRITE_BREAKPOINT64 {
+    ULONG64 BreakPointAddress;
+    ULONG BreakPointHandle;
+} DBGKD_WRITE_BREAKPOINT64, *PDBGKD_WRITE_BREAKPOINT64;
+
+typedef struct _DBGKD_RESTORE_BREAKPOINT {
+    ULONG BreakPointHandle;
+} DBGKD_RESTORE_BREAKPOINT, *PDBGKD_RESTORE_BREAKPOINT;
+
+typedef struct _DBGKD_CONTINUE {
+    NTSTATUS ContinueStatus;
+} DBGKD_CONTINUE, *PDBGKD_CONTINUE;
+
+// DBGKD_ANY_CONTROL_SET is 32-bit packed with an NTSTATUS in
+// DBGKD_CONTINUE2 so start with a 32-bit value to get the 64-bit
+// values aligned.
+
+#pragma pack(push,4)
+
+typedef struct _X86_DBGKD_CONTROL_SET {
+    ULONG   TraceFlag;
+    ULONG   Dr7;
+    ULONG   CurrentSymbolStart;
+    ULONG   CurrentSymbolEnd;
+} X86_DBGKD_CONTROL_SET, *PX86_DBGKD_CONTROL_SET;
+
+typedef ULONG ALPHA_DBGKD_CONTROL_SET, *PALPHA_DBGKD_CONTROL_SET;
+
+#define IA64_DBGKD_CONTROL_SET_CONTINUE_NONE                0x0000
+#define IA64_DBGKD_CONTROL_SET_CONTINUE_TRACE_INSTRUCTION   0x0001
+#define IA64_DBGKD_CONTROL_SET_CONTINUE_TRACE_TAKEN_BRANCH  0x0002
+
+typedef struct _IA64_DBGKD_CONTROL_SET {
+    ULONG   Continue;
+    ULONG64 CurrentSymbolStart;
+    ULONG64 CurrentSymbolEnd;
+} IA64_DBGKD_CONTROL_SET, *PIA64_DBGKD_CONTROL_SET;
+
+typedef struct _AMD64_DBGKD_CONTROL_SET {
+    ULONG   TraceFlag;
+    ULONG64 Dr7;
+    ULONG64 CurrentSymbolStart;
+    ULONG64 CurrentSymbolEnd;
+} AMD64_DBGKD_CONTROL_SET, *PAMD64_DBGKD_CONTROL_SET;
+
+typedef struct _DBGKD_ANY_CONTROL_SET
+{
+    union
+    {
+        X86_DBGKD_CONTROL_SET X86ControlSet;
+        ALPHA_DBGKD_CONTROL_SET AlphaControlSet;
+        IA64_DBGKD_CONTROL_SET IA64ControlSet;
+        AMD64_DBGKD_CONTROL_SET Amd64ControlSet;
+    };
+} DBGKD_ANY_CONTROL_SET, *PDBGKD_ANY_CONTROL_SET;
+
+typedef X86_DBGKD_CONTROL_SET      DBGKD_CONTROL_SET;
+
+#pragma pack(pop)
+
+// This structure must be 32-bit packed for
+// for compatibility with older, processor-specific
+// versions of this structure.
+
+#pragma pack(push,4)
+
+typedef struct _DBGKD_CONTINUE2 {
+    NTSTATUS ContinueStatus;
+    // The ANY control set is unioned here to
+    // ensure that this structure is always large
+    // enough to hold any possible continue.
+    union {
+        DBGKD_CONTROL_SET ControlSet;
+        DBGKD_ANY_CONTROL_SET AnyControlSet;
+    };
+} DBGKD_CONTINUE2, *PDBGKD_CONTINUE2;
+
+#pragma pack(pop)
+
+//
+// MSR support
+//
+
+typedef struct _DBGKD_READ_WRITE_MSR {
+    ULONG Msr;
+    ULONG DataValueLow;
+    ULONG DataValueHigh;
+} DBGKD_READ_WRITE_MSR, *PDBGKD_READ_WRITE_MSR;
+
+
+typedef struct _DBGKD_GET_VERSION64 {
+    USHORT  MajorVersion;
+    USHORT  MinorVersion;
+    USHORT  ProtocolVersion;
+    USHORT  Flags;
+    USHORT  MachineType;
+
+    //
+    // Protocol command support descriptions.
+    // These allow the debugger to automatically
+    // adapt to different levels of command support
+    // in different kernels.
+    //
+
+    // One beyond highest packet type understood, zero based.
+    UCHAR   MaxPacketType;
+    // One beyond highest state change understood, zero based.
+    UCHAR   MaxStateChange;
+    // One beyond highest state manipulate message understood, zero based.
+    UCHAR   MaxManipulate;
+
+    // Kind of execution environment the kernel is running in,
+    // such as a real machine or a simulator.  Written back
+    // by the simulation if one exists.
+    UCHAR   Simulation;
+
+    USHORT  Unused[1];
+
+    ULONG64 KernBase;
+    ULONG64 PsLoadedModuleList;
+
+    //
+    // Components may register a debug data block for use by
+    // debugger extensions.  This is the address of the list head.
+    //
+    // There will always be an entry for the debugger.
+    //
+
+    ULONG64 DebuggerDataList;
+
+} DBGKD_GET_VERSION64, *PDBGKD_GET_VERSION64;
+
+
+typedef struct _DBGKD_MANIPULATE_STATE64 {
+    ULONG ApiNumber;
+    USHORT ProcessorLevel;
+    USHORT Processor;
+    NTSTATUS ReturnStatus;
+    union {
+        DBGKD_READ_MEMORY64 ReadMemory;
+        DBGKD_WRITE_MEMORY64 WriteMemory;
+        DBGKD_GET_VERSION64 GetVersion64;
+        DBGKD_GET_CONTEXT GetContext;
+        DBGKD_SET_CONTEXT SetContext;
+        DBGKD_WRITE_BREAKPOINT64 WriteBreakPoint;
+        DBGKD_RESTORE_BREAKPOINT RestoreBreakPoint;
+        DBGKD_CONTINUE Continue;
+        DBGKD_CONTINUE2 Continue2;
+        DBGKD_READ_WRITE_MSR ReadWriteMsr;
+#if 0
+        DBGKD_READ_WRITE_IO64 ReadWriteIo;
+        DBGKD_READ_WRITE_IO_EXTENDED64 ReadWriteIoExtended;
+        DBGKD_QUERY_SPECIAL_CALLS QuerySpecialCalls;
+        DBGKD_SET_SPECIAL_CALL64 SetSpecialCall;
+        DBGKD_SET_INTERNAL_BREAKPOINT64 SetInternalBreakpoint;
+        DBGKD_GET_INTERNAL_BREAKPOINT64 GetInternalBreakpoint;
+        DBGKD_BREAKPOINTEX BreakPointEx;
+        DBGKD_SEARCH_MEMORY SearchMemory;
+        DBGKD_GET_SET_BUS_DATA GetSetBusData;
+        DBGKD_FILL_MEMORY FillMemory;
+        DBGKD_QUERY_MEMORY QueryMemory;
+        DBGKD_SWITCH_PARTITION SwitchPartition;
+#endif
+
+    } u;
+} DBGKD_MANIPULATE_STATE64, *PDBGKD_MANIPULATE_STATE64;
+
+//
+// If the packet type is PACKET_TYPE_KD_DEBUG_IO, then
+// the format of the packet data is as follows:
+//
+
+#define DbgKdPrintStringApi     0x00003230L
+#define DbgKdGetStringApi       0x00003231L
+
+//
+// For print string, the Null terminated string to print
+// immediately follows the message
+//
+typedef struct _DBGKD_PRINT_STRING {
+    ULONG LengthOfString;
+} DBGKD_PRINT_STRING, *PDBGKD_PRINT_STRING;
+
+//
+// For get string, the Null terminated prompt string
+// immediately follows the message. The LengthOfStringRead
+// field initially contains the maximum number of characters
+// to read. Upon reply, this contains the number of bytes actually
+// read. The data read immediately follows the message.
+//
+//
+typedef struct _DBGKD_GET_STRING {
+    ULONG LengthOfPromptString;
+    ULONG LengthOfStringRead;
+} DBGKD_GET_STRING, *PDBGKD_GET_STRING;
+
+typedef struct _DBGKD_DEBUG_IO {
+    ULONG ApiNumber;
+    USHORT ProcessorLevel;
+    USHORT Processor;
+    union {
+        DBGKD_PRINT_STRING PrintString;
+        DBGKD_GET_STRING GetString;
+    } u;
+} DBGKD_DEBUG_IO, *PDBGKD_DEBUG_IO;
+
+//
+// DbgKd APIs are for the portable kernel debugger
+//
+
+//
+// KD_PACKETS are the low level data format used in KD. All packets
+// begin with a packet leader, byte count, packet type. The sequence
+// for accepting a packet is:
+//
+//  - read 4 bytes to get packet leader.  If read times out (10 seconds)
+//    with a short read, or if packet leader is incorrect, then retry
+//    the read.
+//
+//  - next read 2 byte packet type.  If read times out (10 seconds) with
+//    a short read, or if packet type is bad, then start again looking
+//    for a packet leader.
+//
+//  - next read 4 byte packet Id.  If read times out (10 seconds)
+//    with a short read, or if packet Id is not what we expect, then
+//    ask for resend and restart again looking for a packet leader.
+//
+//  - next read 2 byte count.  If read times out (10 seconds) with
+//    a short read, or if byte count is greater than PACKET_MAX_SIZE,
+//    then start again looking for a packet leader.
+//
+//  - next read 4 byte packet data checksum.
+//
+//  - The packet data immediately follows the packet.  There should be
+//    ByteCount bytes following the packet header.  Read the packet
+//    data, if read times out (10 seconds) then start again looking for
+//    a packet leader.
+//
+
+
+typedef struct _KD_PACKET {
+    ULONG PacketLeader;
+    USHORT PacketType;
+    USHORT ByteCount;
+    ULONG PacketId;
+    ULONG Checksum;
+} KD_PACKET, *PKD_PACKET;
+
+#define PACKET_MAX_SIZE 4000
+#define INITIAL_PACKET_ID 0x80800000    // Don't use 0
+#define SYNC_PACKET_ID    0x00000800    // Or in with INITIAL_PACKET_ID
+                                        // to force a packet ID reset.
+
+//
+// BreakIn packet
+//
+
+#define BREAKIN_PACKET                  0x62626262
+#define BREAKIN_PACKET_BYTE             0x62
+
+//
+// Packet lead in sequence
+//
+
+#define PACKET_LEADER                   0x30303030 //0x77000077
+#define PACKET_LEADER_BYTE              0x30
+
+#define CONTROL_PACKET_LEADER           0x69696969
+#define CONTROL_PACKET_LEADER_BYTE      0x69
+
+//
+// Packet Trailing Byte
+//
+
+#define PACKET_TRAILING_BYTE            0xAA
+
+//
+// Packet Types
+//
+
+#define PACKET_TYPE_UNUSED              0
+#define PACKET_TYPE_KD_STATE_CHANGE32   1
+#define PACKET_TYPE_KD_STATE_MANIPULATE 2
+#define PACKET_TYPE_KD_DEBUG_IO         3
+#define PACKET_TYPE_KD_ACKNOWLEDGE      4       // Packet-control type
+#define PACKET_TYPE_KD_RESEND           5       // Packet-control type
+#define PACKET_TYPE_KD_RESET            6       // Packet-control type
+#define PACKET_TYPE_KD_STATE_CHANGE64   7
+#define PACKET_TYPE_KD_POLL_BREAKIN     8
+#define PACKET_TYPE_KD_TRACE_IO         9
+#define PACKET_TYPE_KD_CONTROL_REQUEST  10
+#define PACKET_TYPE_KD_FILE_IO          11
+#define PACKET_TYPE_MAX                 12
+
+
+// State change constants
+#define DbgKdMinimumStateChange       0x00003030L
+#define DbgKdExceptionStateChange     0x00003030L
+#define DbgKdLoadSymbolsStateChange   0x00003031L
+#define DbgKdCommandStringStateChange 0x00003032L
+#define DbgKdMaximumStateChange       0x00003033L
+
+
+//
+// If the packet type is PACKET_TYPE_KD_STATE_MANIPULATE, then
+// the format of the packet data is as follows:
+//
+// Api Numbers for state manipulation
+//
+
+#define DbgKdMinimumManipulate              0x00003130L
+
+#define DbgKdReadVirtualMemoryApi           0x00003130L
+#define DbgKdWriteVirtualMemoryApi          0x00003131L
+#define DbgKdGetContextApi                  0x00003132L
+#define DbgKdSetContextApi                  0x00003133L
+#define DbgKdWriteBreakPointApi             0x00003134L
+#define DbgKdRestoreBreakPointApi           0x00003135L
+#define DbgKdContinueApi                    0x00003136L
+#define DbgKdReadControlSpaceApi            0x00003137L
+#define DbgKdWriteControlSpaceApi           0x00003138L
+#define DbgKdReadIoSpaceApi                 0x00003139L
+#define DbgKdWriteIoSpaceApi                0x0000313AL
+#define DbgKdRebootApi                      0x0000313BL
+#define DbgKdContinueApi2                   0x0000313CL
+#define DbgKdReadPhysicalMemoryApi          0x0000313DL
+#define DbgKdWritePhysicalMemoryApi         0x0000313EL
+//#define DbgKdQuerySpecialCallsApi           0x0000313FL
+#define DbgKdSetSpecialCallApi              0x00003140L
+#define DbgKdClearSpecialCallsApi           0x00003141L
+#define DbgKdSetInternalBreakPointApi       0x00003142L
+#define DbgKdGetInternalBreakPointApi       0x00003143L
+#define DbgKdReadIoSpaceExtendedApi         0x00003144L
+#define DbgKdWriteIoSpaceExtendedApi        0x00003145L
+#define DbgKdGetVersionApi                  0x00003146L
+#define DbgKdWriteBreakPointExApi           0x00003147L
+#define DbgKdRestoreBreakPointExApi         0x00003148L
+#define DbgKdCauseBugCheckApi               0x00003149L
+#define DbgKdSwitchProcessor                0x00003150L
+#define DbgKdPageInApi                      0x00003151L // obsolete
+#define DbgKdReadMachineSpecificRegister    0x00003152L
+#define DbgKdWriteMachineSpecificRegister   0x00003153L
+#define OldVlm1                             0x00003154L
+#define OldVlm2                             0x00003155L
+#define DbgKdSearchMemoryApi                0x00003156L
+#define DbgKdGetBusDataApi                  0x00003157L
+#define DbgKdSetBusDataApi                  0x00003158L
+#define DbgKdCheckLowMemoryApi              0x00003159L
+#define DbgKdClearAllInternalBreakpointsApi 0x0000315AL
+#define DbgKdFillMemoryApi                  0x0000315BL
+#define DbgKdQueryMemoryApi                 0x0000315CL
+#define DbgKdSwitchPartition                0x0000315DL
+
+#define DbgKdMaximumManipulate              0x0000315EL
+
+
+
+typedef struct _KD_CONTEXT {
+    ULONG KdpDefaultRetries;
+    BOOLEAN KdpControlCPending;
+} KD_CONTEXT, *PKD_CONTEXT;
+
+typedef enum {
+    ContinueError = FALSE,
+    ContinueSuccess = TRUE,
+    ContinueProcessorReselected,
+    ContinueNextProcessor
+} KCONTINUE_STATUS;
+
+//
+// status Constants for Packet waiting
+//
+
+typedef enum {
+    KDP_PACKET_RECEIVED     = 0,
+    KDP_PACKET_TIMEOUT      = 1,
+    KDP_PACKET_RESEND       = 2
+} KDP_STATUS;
+
+//
+// Status Constants for reading data from comport
+//
+
+#define STATUS_SUCCESS                  ((NTSTATUS)0x00000000L)     // ntsubauth
+
+#define STATUS_VCPP_EXCEPTION           ((NTSTATUS)0x406d1388L)
+#define STATUS_CPP_EH_EXCEPTION         ((NTSTATUS)0xe06d7363L)
+
+//  The operation that was requested is pending completion.
+#define STATUS_PENDING                  ((NTSTATUS)0x00000103L)     // winnt
+
+//  The requested operation was unsuccessful.
+#define STATUS_UNSUCCESSFUL             ((NTSTATUS)0xC0000001L)
+
+//  The instruction at "0x%08lx" referenced memory at "0x%08lx". The memory could not be "%s".
+#define STATUS_ACCESS_VIOLATION         ((NTSTATUS)0xC0000005L)     // winnt
+
+//  Illegal Instruction: An attempt was made to execute an illegal instruction.
+#define STATUS_ILLEGAL_INSTRUCTION      ((NTSTATUS)0xC000001DL)     // winnt
+
+//  {Application Error}:
+//  The exception %s (0x%08lx) occurred in the application at location 0x%08lx.
+//
+#define STATUS_UNHANDLED_EXCEPTION      ((NTSTATUS)0xC0000144L)
+
+//  {EXCEPTION}: Breakpoint: A breakpoint has been reached.
+#define STATUS_BREAKPOINT               ((NTSTATUS)0x80000003L)     // winnt
+
+//
+// MessageId: STATUS_SINGLE_STEP
+//
+// MessageText:
+//
+//  {EXCEPTION}
+//  Single Step
+//  A single step or trace operation has just been completed.
+//
+#define STATUS_SINGLE_STEP               ((NTSTATUS)0x80000004L)    // winnt
+
+//
+// MessageId: STATUS_WAKE_SYSTEM_DEBUGGER
+//
+// MessageText:
+//
+//  {EXCEPTION}
+//  Kernel Debugger Awakened
+//  The system debugger was awakened by an interrupt.
+//
+#define STATUS_WAKE_SYSTEM_DEBUGGER      ((NTSTATUS)0x80000007L)    // winnt
+
+
+#define DBGKD_64BIT_PROTOCOL_VERSION2 6
+//
+// If DBGKD_VERS_FLAG_DATA is set in Flags, info should be retrieved from
+// the KDDEBUGGER_DATA block rather than from the DBGKD_GET_VERSION
+// packet.  The data will remain in the version packet for a while to
+// reduce compatibility problems.
+//
+
+#define DBGKD_VERS_FLAG_MP         0x0001   // kernel is MP built
+#define DBGKD_VERS_FLAG_DATA       0x0002   // DebuggerDataList is valid
+#define DBGKD_VERS_FLAG_PTR64      0x0004   // native pointers are 64 bits
+#define DBGKD_VERS_FLAG_NOMM       0x0008   // No MM - don't decode PTEs
+#define DBGKD_VERS_FLAG_HSS        0x0010   // hardware stepping support
+#define DBGKD_VERS_FLAG_PARTITIONS 0x0020   // multiple OS partitions exist
+
+#define IMAGE_FILE_MACHINE_I386              0x014c  // Intel 386.
+
+//
+// KD version MajorVersion high-byte identifiers.
+//
+typedef enum _DBGKD_MAJOR_TYPES
+{
+    DBGKD_MAJOR_NT,
+    DBGKD_MAJOR_XBOX,
+    DBGKD_MAJOR_BIG,
+    DBGKD_MAJOR_EXDI,
+    DBGKD_MAJOR_NTBD,
+    DBGKD_MAJOR_EFI,
+    DBGKD_MAJOR_TNT,
+    DBGKD_MAJOR_SINGULARITY,
+    DBGKD_MAJOR_COUNT
+} DBGKD_MAJOR_TYPES;
+
+#define DBGKD_MAJOR_TYPE(MajorVersion) \
+    ((DBGKD_MAJOR_TYPES)((MajorVersion) >> 8))
+
+
+#define MMDBG_COPY_WRITE            0x00000001
+#define MMDBG_COPY_PHYSICAL         0x00000002
+#define MMDBG_COPY_UNSAFE           0x00000004
+#define MMDBG_COPY_CACHED           0x00000008
+#define MMDBG_COPY_UNCACHED         0x00000010
+#define MMDBG_COPY_WRITE_COMBINED   0x00000020
+
+#define MMDBG_COPY_MAX_SIZE 8
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+void KdInitialize(Struct_Microsoft_Singularity_BootInfo *bi);
+void KdPutChar(char c);
+
+void kdprintf(const char * pszFmt, ...); // Low level debug (to screen) only.
+void kdprints(const char * pszFmt); // Low level debug (to screen) only.
+
+void KdpSpin();
+ULONG KdpComputeChecksum(IN PCHAR Buffer, IN ULONG Length);
+
+bool KdpComInit(Struct_Microsoft_Singularity_BootInfo *bi);
+void KdpComSendPacket(ULONG PacketType,
+                      IN PSTRING MessageHeader,
+                      IN PSTRING MessageData OPTIONAL,
+                      IN OUT PKD_CONTEXT KdContext);
+KDP_STATUS KdpComReceivePacket(IN ULONG PacketType,
+                               OUT PSTRING MessageHeader,
+                               OUT PSTRING MessageData,
+                               OUT PULONG DataLength,
+                               IN OUT PKD_CONTEXT KdContext);
+bool KdpComPollBreakIn();
+
+bool Kdp1394Init(Struct_Microsoft_Singularity_BootInfo *bi);
+void Kdp1394SendPacket(ULONG PacketType,
+                       IN PSTRING MessageHeader,
+                       IN PSTRING MessageData OPTIONAL,
+                       IN OUT PKD_CONTEXT KdContext);
+KDP_STATUS Kdp1394ReceivePacket(IN ULONG PacketType,
+                                OUT PSTRING MessageHeader,
+                                OUT PSTRING MessageData,
+                                OUT PULONG DataLength,
+                                IN OUT PKD_CONTEXT KdContext);
+bool Kdp1394PollBreakIn();
+
+
+//////////////////////////////////////////////////////////// Shared Variables.
+//
+
+extern BOOL KdDebuggerNotPresent;
+extern ULONG KdCompNumberRetries;
+extern ULONG KdCompRetryCount;
+extern ULONG KdPacketId;
+
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Kernel/Native/halstack.asm b/base/Kernel/Native/halstack.asm
new file mode 100644
index 0000000..f2bd386
--- /dev/null
+++ b/base/Kernel/Native/halstack.asm
@@ -0,0 +1,278 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Microsoft Research Singularity
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+;;  File:   halstack.asm
+;;
+;;  Note:
+;;
+
+.686p
+.mmx
+.xmm
+.model flat
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+
+include hal.inc
+
+externdef ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ:NEAR
+externdef ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ:NEAR
+
+;;; Public symbols
+public ?c_LinkedStackBegin@Class_Microsoft_Singularity_Memory_Stacks@@2EA
+public ?c_LinkStackBegin@Class_Microsoft_Singularity_Memory_Stacks@@2EA
+public ?c_LinkStackLimit@Class_Microsoft_Singularity_Memory_Stacks@@2EA
+public ?c_UnlinkStackBegin@Class_Microsoft_Singularity_Memory_Stacks@@2EA
+public ?c_UnlinkStackLimit@Class_Microsoft_Singularity_Memory_Stacks@@2EA
+public ?c_LinkedStackLimit@Class_Microsoft_Singularity_Memory_Stacks@@2EA
+
+        align 16
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;
+;          1) Stack at entry of LinkStackN
+;              +-----------------------+
+;  old base -> |     previous esp      |   2) Stack on exit from LinkStackN
+;              +-----------------------+       +------------------------+ <- base
+;              |  previous stackBase   |       |         old esp        |
+;              +-----------------------+       +------------------------+       
+;              |  previous stackLimit  |       |        old base        |
+;              +-----------------------+       +------------------------+
+;              |          ..           |       |        old limit       |
+;              +-----------------------+       +------------------------+
+;              |          ..           |  ==>  |            ..          |
+;              |         args          |   .   |           args         |
+;              +-----------------------+   .   +------------------------+
+;              | return addr in caller |   .   | return to UnlinkStackN |
+;              +-----------------------+   .   +------------------------+    
+;   old ebp -> |      caller ebp       |  ==>  |        old ebp         | <- esp &
+;              +-----------------------+       +------------------------+    ebp
+;   old esp -> | return addr in callee |       |           ..           |
+;              +-----------------------+       |           ..           | <- limit
+; * EAX = amount of stack needed.
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Implementations of LinkStackNn just push the appropriate number
+;; and call the general-purpose LinkStack.
+
+?c_LinkedStackBegin@Class_Microsoft_Singularity_Memory_Stacks@@2EA byte 0
+?c_LinkStackBegin@Class_Microsoft_Singularity_Memory_Stacks@@2EA byte 0
+
+?g_LinkStack0@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    0
+        push    ?g_UnlinkStack0@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack4@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    1
+        push    ?g_UnlinkStack4@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack8@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    2
+        push    ?g_UnlinkStack8@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack12@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    3
+        push    ?g_UnlinkStack12@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack16@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    4
+        push    ?g_UnlinkStack16@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack20@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    5
+        push    ?g_UnlinkStack20@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack24@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    6
+        push    ?g_UnlinkStack24@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack28@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    7
+        push    ?g_UnlinkStack28@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack32@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    8
+        push    ?g_UnlinkStack32@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack36@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    9
+        push    ?g_UnlinkStack36@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack40@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    10
+        push    ?g_UnlinkStack40@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack44@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    11
+        push    ?g_UnlinkStack44@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack48@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    12
+        push    ?g_UnlinkStack48@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack52@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    13
+        push    ?g_UnlinkStack52@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack56@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    14
+        push    ?g_UnlinkStack56@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack60@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    15
+        push    ?g_UnlinkStack60@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+?g_LinkStack64@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        push    16
+        push    ?g_UnlinkStack64@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ
+        jmp     ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;
+?c_LinkStackLimit@Class_Microsoft_Singularity_Memory_Stacks@@2EA byte 0
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; 1) Stacks on entry to UnlinkStackN:      
+;    old base -> +-----------------------+Organization.tif
+;                |     previous esp      |    
+;                +-----------------------+       +------------------------+ <- base
+;                |  previous stackBase   |       |         old esp        |
+;                +-----------------------+       +------------------------+       
+;                |  previous stackLimit  |       |        old base        |
+;                +-----------------------+       +------------------------+
+;                |          ..           |       |        old limit       | <- esp
+;                +-----------------------+       +------------------------+
+;                |          ..           |       |           ..           | * ebp = 
+;                |         args          |       |           ..           |   old ebp
+;                +-----------------------+       |           ..           |
+;                | return addr in caller |       |           ..           |   ecx
+;                +-----------------------+       |           ..           |   is free
+;         ebp -> |      caller ebp       |       |           ..           | 
+;                +-----------------------+       |           ..           |
+;     old esp -> | return addr in callee |       |           ..           |
+;                +-----------------------+       |           ..           | <- limit
+; * EAX/EDX = return value from callee.
+;                 
+; 2) Stacks on exit from UnlinkStackN:      
+;   stackBase -> +-----------------------+
+;                |     previous esp      |    
+;                +-----------------------+    
+;                |  previous stackBase   |         
+;                +-----------------------+                
+;                |  previous stackLimit  |         
+;                +-----------------------+         
+;                |          ..           |         
+;         ebp -> |          ..           |         
+;                |          ..           |         
+;         esp -> |          ..           |         
+;                +-----------------------+    * eip = return addr in caller  
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Implementations of UnlinkStackNn just push the appropriate number
+;; and call the general-purpose UnlinkStack.
+
+?c_UnlinkStackBegin@Class_Microsoft_Singularity_Memory_Stacks@@2EA byte 0
+
+?g_UnlinkStack0@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,0
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack4@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,4
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack8@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,8
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack12@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,12
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack16@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,16
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack20@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,20
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack24@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,24
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack28@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,28
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack32@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,32
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack36@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,36
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack40@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,40
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack44@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,44
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack48@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,48
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack52@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,52
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack56@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,56
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack60@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,60
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+?g_UnlinkStack64@Class_Microsoft_Singularity_Memory_Stacks@@SIXXZ::
+        mov     ecx,64
+        jmp     ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+?c_UnlinkStackLimit@Class_Microsoft_Singularity_Memory_Stacks@@2EA byte 0
+?c_LinkedStackLimit@Class_Microsoft_Singularity_Memory_Stacks@@2EA byte 0
+
+align 16
+PUBLIC  __checkStackLimit
+__checkStackLimit       PROC
+        push    edx
+        mov     edx, eax
+        CurrentThreadContext eax
+        mov     eax, [eax][Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit]
+        cmp     edx, eax
+        jb debugHACK
+        pop     edx
+        ret
+debugHACK:     
+        pop     edx
+        ret
+__checkStackLimit       ENDP
+
+end
diff --git a/base/Kernel/Native/ring0_halstack.asm b/base/Kernel/Native/ring0_halstack.asm
new file mode 100644
index 0000000..2ef5dec
--- /dev/null
+++ b/base/Kernel/Native/ring0_halstack.asm
@@ -0,0 +1,180 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Microsoft Research Singularity
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+;;  File:   halstack.asm
+;;
+;;  Note:
+;;      This file contains implementations of the LinkStack and UnlinkStack
+;;      routines suitable for use by ring-0 code (kernel and ring-0 apps).
+;;
+
+.686p
+.mmx
+.xmm
+.model flat
+.code
+
+ifdef SINGULARITY
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+else  ;  Singularity
+PAGE_BITS               EQU     12
+endif  ;  Singularity
+
+include hal.inc
+
+        align 16
+
+;; Public symbols
+public ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+public ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+;;; Stack:
+;;;   arg2.. (args 0 & 1 = ECX & EDX) + 44
+;;;   caller (addr)     + 40
+;;;   caller ebp        + 36    <= old EBP
+;;;   callee (addr)     + 32    <= old ESP
+;;;   argsize           + 28
+;;;   unlinkN           + 24
+;;;   efl               + 20
+;;;   eax               + 16
+;;;   ecx               + 12
+;;;   edx               + 8
+;;;   stackLimit        + 4
+;;;   stackBegin        + 0
+?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ ::
+ 
+        ;; Disable interrupts
+        pushfd                                          ; +20
+        cli
+        push    eax                                     ; +16
+        push    ecx                                     ; +12
+        push    edx                                     ; +8
+        
+        mov     edx,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        push    [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit ; +4
+        push    [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin ; +0
+
+        mov     eax,esp
+        
+        ;; Change to schedulerStack
+        mov     ecx,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._schedulerStackLimit]
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit,ecx
+        mov     ecx,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._schedulerStackBegin]
+        mov     [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin,ecx
+        
+ifdef DEBUG
+        ;; If we're already on the scheduler stack, we're in trouble,
+        ;; so trap to the debugger:
+        cmp eax, [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin
+        jg stackOk
+        cmp eax, [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        jl stackOk
+        sti
+        int 3
+stackOk:
+endif ;; DEBUG
+
+        mov     esp,ecx
+
+        ;; Save the old ESP (and create a temporary frame head).
+        lea     ecx,[eax+32]
+        push    ecx
+        push    [eax+4]                ; stackLimit on old stack
+        push    [eax+0]                ; stackBegin on old stack
+        
+        ;; Call GetStackSegmentAndCopy(ecx=stack needed, edx=threadContext, *args, args, 
+        ;;                             esp, begin, limit)
+        push    ecx                          ; old esp
+        push    [eax+28]                     ; #args
+        lea     ecx,[eax+44]                 ; &arg2
+        push    ecx                          ;
+        mov     ecx,[eax+16]                 ; stack size needed
+        
+        call    ?g_GetStackSegmentAndCopy@Class_Microsoft_Singularity_Memory_Stacks@@SIPAUuintPtr@@PAU2@PAUStruct_Microsoft_Singularity_X86_ThreadContext@@PAII000@Z
+
+        ;; Get back to old ESP, then adjust to pop off EDX and ECX
+        pop     ecx
+        sub     ecx,32
+        mov     esp,eax
+
+        push    [ecx+24]                                ; unlinkN
+        push    [ecx+20]                                ; efl
+        mov     eax,[ecx+32]                            ; callee
+        mov     edx,[ecx+8]                             ; edx
+        mov     ecx,[ecx+12]                            ; ecx
+        
+        ;; Restore interrupts
+        popfd
+        
+        push    ebp                      ; Create new ebp frame.
+        mov     ebp,esp
+        jmp     eax                       ; jump to callee code.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;        
+;; NB: See halstack.asm for a stack diagram
+
+?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ::
+        
+        ;; Disable interrupts and remove dead args from old stack 
+        pushfd
+        cli
+        
+        mov     esp,ebp                      ; Find adjusted ebp
+        add     esp,ecx
+        mov     ecx,[ebp+4]                   ; move eip link up
+        mov     [esp+4],ecx
+        mov     ecx,[ebp+0]                   ; move ebp link up
+        mov     [esp+0],ecx
+        mov     ebp,esp
+
+        push    eax                      ; save eax to old stack
+        push    edx                      ; save edx to old stack
+        
+        mov     ecx,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        mov     eax,[ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin
+        mov     eax,[eax-16]             ; save efl to old stack
+        push    eax
+
+;;; Stack:
+;;;   caller (addr)     + 16
+;;;   caller ebp        + 12
+;;;   eax               + 8
+;;;   edx               + 4
+;;;   efl               + 0
+        
+        ;; Prepare scheduler stack segment.
+        mov     eax,esp
+        mov     esp,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._schedulerStackBegin]
+        push    eax                               ; save old esp
+        push    [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin
+        push    [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        
+        push    [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        mov     edx,[ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin
+        
+        ;; Then switch to scheduler stack.
+        mov     eax,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._schedulerStackLimit]
+        mov     [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit,eax
+        mov     eax,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._schedulerStackBegin]
+        mov     [ecx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin,eax
+
+        ;; Call ReturnStackSegmentRaw(ecx=threadContext, edx=begin, limit)
+        call    ?g_ReturnStackSegmentRaw@Class_Microsoft_Singularity_Memory_Stacks@@SIXPAUStruct_Microsoft_Singularity_X86_ThreadContext@@PAUuintPtr@@1@Z
+
+        pop     eax                              ; pop old limit
+        pop     eax                              ; pop old begin
+        pop     esp                                ; restore esp
+        popfd                               ; restore interrupts
+        pop     edx                        ; restore eax and edx
+        pop     eax
+        pop     ebp                              ; pop ebp chain
+        ret
+
+end
diff --git a/base/Kernel/Native/ring3_halstack.asm b/base/Kernel/Native/ring3_halstack.asm
new file mode 100644
index 0000000..9d12d28
--- /dev/null
+++ b/base/Kernel/Native/ring3_halstack.asm
@@ -0,0 +1,126 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Microsoft Research Singularity
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+;;  File:   halstack.asm
+;;
+;;  Note:
+;;      This file contains implementations of the LinkStack and UnlinkStack
+;;      routines suitable for use by ring-3 application code. This code is
+;;      used to satisfy ring-3 applications' import of the LinkStack and
+;;      UnlinkStack symbols.
+;;
+
+.686p
+.mmx
+.xmm
+.model flat
+.code
+
+assume ds:flat
+assume es:flat
+assume ss:flat
+assume fs:nothing
+assume gs:nothing
+
+include hal.inc
+
+;;; Public symbols
+public ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+public ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+
+;;; Ring-3-specific stack ABIs
+externdef ?g_LinkNewStackSegment@Struct_Microsoft_Singularity_V1_Services_StackService@@SIPAUuintPtr@@PAU2@PAII000@Z:NEAR
+externdef ?g_ReturnStackSegmentRaw@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXPAUuintPtr@@0@Z:NEAR
+
+        align 16
+
+;;; Stack:
+;;;   arg2.. (args 0 & 1 = ECX & EDX) + 40
+;;;   caller (addr)     + 36
+;;;   caller ebp        + 32    <= old EBP
+;;;   callee (addr)     + 28    <= old ESP
+;;;   argsize           + 24
+;;;   unlinkN           + 20
+;;;   eax               + 16
+;;;   ecx               + 12
+;;;   edx               + 8
+;;;   stackLimit        + 4
+;;;   stackBegin        + 0
+
+?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ::
+
+        push    eax                                     ; +16
+        push    ecx                                     ; +12
+        push    edx                                     ; +8
+        
+        mov     edx,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        push    [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit ; +4
+        push    [edx].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin ; +0
+        mov     eax,esp
+        
+        ;; Save the old ESP (and create a temporary frame head).
+        lea     ecx,[eax+28]
+        push    ecx
+        
+        ;; Call LinkNewStackSegment(ecx=stack needed, edx=*args, args, 
+        ;;                          esp, begin, limit)
+        push    [eax+4]                      ; stackLimit on old stack
+        push    [eax+0]                      ; stackBegin on old stack
+        push    ecx                          ; old esp
+        push    [eax+24]                     ; #args
+        lea     edx,[eax+40]                 ; &arg2
+        mov     ecx,[eax+16]                 ; stack size needed
+        
+        call    ?g_LinkNewStackSegment@Struct_Microsoft_Singularity_V1_Services_StackService@@SIPAUuintPtr@@PAU2@PAII000@Z
+
+        ;; Get back to old ESP, then adjust to pop off EDX and ECX
+        pop     ecx
+        sub     ecx,28
+        mov     esp,eax
+
+        push    [ecx+20]                                ; unlinkN
+        mov     eax,[ecx+28]                            ; callee
+        mov     edx,[ecx+8]                             ; edx
+        mov     ecx,[ecx+12]                            ; ecx
+        
+        push    ebp                      ; Create new ebp frame.
+        mov     ebp,esp
+        jmp     eax                       ; jump to callee code.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; NB: See halstack.asm for a stack diagram
+        
+?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ::
+
+        mov     esp,ebp                  ; Find adjusted ebp
+        add     esp,ecx
+        mov     ecx,[ebp+4]              ; move eip link up
+        mov     [esp+4],ecx
+        mov     ecx,[ebp+0]              ; move ebp link up
+        mov     [esp+0],ecx
+        mov     ebp,esp
+
+        push    eax                      ; Save eax to old stack
+        push    edx                      ; save edx to old stack
+
+;;; Stack:
+;;;   caller (addr)     + 12
+;;;   caller ebp        + 8
+;;;   eax               + 4
+;;;   edx               + 0
+
+        ;; Call ReturnStackSegmentRaw(ecx=begin, edx=limit)
+        mov     eax,fs:[Struct_Microsoft_Singularity_X86_ProcessorContext._threadContext]
+        mov     edx,[eax].Struct_Microsoft_Singularity_X86_ThreadContext._stackLimit
+        mov     ecx,[eax].Struct_Microsoft_Singularity_X86_ThreadContext._stackBegin
+        call    ?g_ReturnStackSegmentRaw@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXPAUuintPtr@@0@Z
+
+        pop     edx                      ; restore eax and edx
+        pop     eax
+        pop     ebp                      ; pop ebp chain
+        ret
+
+end
diff --git a/base/Kernel/RuntimeNative.Common.targets b/base/Kernel/RuntimeNative.Common.targets
new file mode 100644
index 0000000..3a688bc
--- /dev/null
+++ b/base/Kernel/RuntimeNative.Common.targets
@@ -0,0 +1,54 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+
+  <!-- Importing GC.targets gets us GC_ML_DEFS. -->
+  <Import Project="GC.targets"/>
+  
+  <PropertyGroup>
+    <AFLAGS>$(AFLAGS) </AFLAGS>
+    <CFLAGS>$(CFLAGS) /Gr /I$(SINGULARITY_ROOT)\boot\include -UDEBUG</CFLAGS>
+    <LFLAGS>$(LINKFLAGS) /OPT:REF /RELEASE /nod /subsystem:native</LFLAGS>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CFLAGS>$(CFLAGS) $(GC_ML_DEFS) /I$(OutputPath) /I%(rootdir)%(directory)</CFLAGS>
+    <AFLAGS>$(AFLAGS) $(GC_ML_DEFS) /I$(OutputPath) /INative </AFLAGS>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Native\hal.cpp"/>
+    <Compile Include="Native\BootInfo.cpp"/>
+    <Compile Include="Native\Buffer.cpp"/>
+    <Compile Include="Native\Decimal.cpp"/>
+    <!-- <Compile Include="Native\DebugStub.cpp"/> for app rt only -->
+    <Compile Include="Native\IoPort.cpp"/>
+    <Compile Include="Native\Math.cpp"/>
+    <Compile Include="Native\Number.cpp"/>
+    <Compile Include="Native\PEImage.cpp"/>
+    <Compile Include="Native\Processor.cpp"/>
+    <Compile Include="Native\Stacks.cpp"/>
+    <Compile Include="Native\Thread.cpp"/>
+    <Compile Include="Native\Tracing.cpp"/>
+    <Compile Include="Native\Monitoring.cpp"/>
+    <Compile Include="Native\halexn.cpp"/>
+
+    <!-- <Compile Include="Native\halstack.asm"/> -->
+    
+    <Compile Include="Native\halforgc.asm"/>
+    <Compile Include="Native\halasm.asm"/>
+    <Compile Include="Native\_lldiv.asm"/>
+    <Compile Include="Native\_llmul.asm"/>
+    <Compile Include="Native\_llshl.asm"/>
+    <Compile Include="Native\_llshr.asm"/>
+    <Compile Include="Native\_llrem.asm"/>
+    <Compile Include="Native\_memcpy.asm"/>
+    <Compile Include="Native\_memset.asm"/>
+    <Compile Include="Native\_ulldiv.asm"/>
+    <Compile Include="Native\_ulldvrm.asm"/>
+    <Compile Include="Native\_ullrem.asm"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Native.targets"/>
+
+</Project>
diff --git a/base/Kernel/RuntimeNative.Kernel.proj b/base/Kernel/RuntimeNative.Kernel.proj
new file mode 100644
index 0000000..04d85b7
--- /dev/null
+++ b/base/Kernel/RuntimeNative.Kernel.proj
@@ -0,0 +1,31 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <TargetName>Native</TargetName>
+    <OutputType>StaticLibrary</OutputType>
+    <OutputPath>$(KOBJDIR)</OutputPath>
+    <ObjectPath>$(KOBJDIR)\private</ObjectPath>
+    <CFLAGS>$(CFLAGS) /DSINGULARITY_KERNEL=1 /I$(KERNDIR)</CFLAGS>
+    <AFLAGS>$(AFLAGS) /DSINGULARITY_KERNEL=1 /I$(KERNDIR)</AFLAGS>
+    <AFLAGS Condition="'$(PAGING)'=='On'">$(AFLAGS) /DPAGING=1</AFLAGS>
+    <Collector>$(COLLECTOR_KERNEL)</Collector>
+    <OutputPath>$(KOBJDIR)</OutputPath>
+  </PropertyGroup>
+
+  <!-- These are the native sources that are specific to the kernel. -->
+  <ItemGroup>
+    <NativeSources Include="Native\halcpu.asm"/>
+    <NativeSources Include="Native\halidt.asm"/>
+    <NativeSources Include="Native\halstack.asm"/>
+    <NativeSources Include="Native\ring0_halstack.asm"/>
+    <NativeSources Include="Native\MpBootInfo.cpp"/>
+    <NativeSources Include="Native\halkd.cpp"/>
+    <NativeSources Include="Native\halkd1394.cpp"/>
+    <NativeSources Include="Native\halkdcom.cpp"/>
+  </ItemGroup>
+
+  <Import Project="RuntimeNative.Common.targets"/>
+
+</Project>
diff --git a/base/Kernel/SingSharp.Runtime/AssemblyInfo.cs b/base/Kernel/SingSharp.Runtime/AssemblyInfo.cs
new file mode 100644
index 0000000..f4fe50b
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/AssemblyInfo.cs
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Microsoft.SingSharp.Runtime")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+// Singularity specific version of this library
+[assembly: AssemblyVersion("1.0.3555.0")]
+// [assembly: AssemblyKeyFile(@"SingSharp.Runtime\SingSharp.snk")]
+
diff --git a/base/Kernel/SingSharp.Runtime/Attributes.cs b/base/Kernel/SingSharp.Runtime/Attributes.cs
new file mode 100644
index 0000000..ef93057
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Attributes.cs
@@ -0,0 +1,239 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+
+//---------------------------------------------------------------------------
+//SingSharp Library
+//---------------------------------------------------------------------------
+
+namespace Microsoft.SingSharp {
+
+
+
+  /// <summary>
+  /// Marks methods that check should enforce context restrictions on
+  /// </summary>
+  [ AttributeUsage(AttributeTargets.Method | AttributeTargets.Delegate, AllowMultiple = true)]
+  public class ContextRestrictionAttribute : Attribute {
+  }
+
+
+  /// <summary>
+  /// Context restriction that enforces that a method does not perform allocations and does not
+  /// call methods that perform allocations.
+  /// </summary>
+  [ AttributeUsage(AttributeTargets.Method | AttributeTargets.Delegate, AllowMultiple = true)]
+  public class NoAllocateAttribute : ContextRestrictionAttribute {
+  }
+
+  /// <summary>
+  /// Context restriction that enforces that a method does not block and does not call methods that
+  /// might block. It's strictly more restrictive than NoAllocate, since allocation can cause blocking.
+  /// </summary>
+  [ AttributeUsage(AttributeTargets.Method | AttributeTargets.Delegate, AllowMultiple = true)]
+  public class NoBlockingAttribute : NoAllocateAttribute {
+  }
+
+  /// <summary>
+  /// Marks a struct as a message.
+  /// </summary>
+  public sealed class MessageAttribute : Attribute {
+    public enum Direction {
+      In,
+      Out,
+      Both
+    }
+
+    public MessageAttribute(Direction direction) {
+    }
+  }
+
+
+  /// <summary>
+  /// Marks a rep struct as not containing any pointers.
+  /// </summary>
+  public sealed class PointerFreeAttribute : Attribute {
+  }
+
+  /// <summary>
+  /// Marks the protocolstate as a parallel (All) state
+  /// </summary>
+  public sealed class ProtocolParallelStateAttribute : Attribute {
+    public ProtocolParallelStateAttribute() {}
+  }
+
+
+  /// <summary>
+  /// Marks a the start state of a protocol.
+  /// </summary>
+  public sealed class ProtocolStartStateAttribute : Attribute {
+    public ProtocolStartStateAttribute() {}
+  }
+
+
+  /// <summary>
+  /// Send(tag) annotates a send method on Imp and Exp types, marking that the corresponding message
+  /// is sent on the receiver endpoint
+  /// </summary>
+  public class SendAttribute : Attribute {
+    public SendAttribute(int tag) {}
+  }
+
+  /// <summary>
+  /// Receive(tag) annotates a receive method on Imp and Exp types, marking that the corresponding message
+  /// is received.
+  /// </summary>
+  public class ReceiveAttribute : Attribute {
+    public ReceiveAttribute(int tag) {}
+  }
+
+
+  /// <summary>
+  /// Annotates an endpoint parameter of a method. Indicates that the endpoint is in the protocol 
+  /// state specified by the given type argument on entry to the method.
+  /// </summary>
+  public class PreStateAttribute : Attribute {
+    public PreStateAttribute(System.Type @state) {}
+  }
+
+
+  /// <summary>
+  /// Annotates an endpoint parameter of a method. Indicates that the endpoint is in the protocol 
+  /// state specified by the given type argument on exit of the method.
+  /// </summary>
+  public class PostStateAttribute : Attribute {
+    public PostStateAttribute(System.Type @state) {}
+  }
+
+
+  #region Obsolete. Get rid of these and switch to ITracked and Claims tracking
+  /// <summary>
+  /// Annotates a method result or out parameter to indicate that the method transfers ownership of the
+  /// endpoint to the caller. The bind is from the caller's perspective. The callee must view it as
+  /// an unbind.
+  /// </summary>
+  public class BindEndpointAttribute : Attribute {
+    public BindEndpointAttribute() {}
+  }
+
+  /// <summary>
+  /// Annotates a method parameter to indicate that the caller transfers ownership of the
+  /// endpoint to the callee. The unbind is from the caller's perspective. The callee must view it as
+  /// a bind.
+  /// </summary>
+  public class UnbindEndpointAttribute : Attribute {
+    public UnbindEndpointAttribute() {}
+  }
+  #endregion
+
+
+  /// <summary>
+  /// Marks static fields that hold select receive patterns. The argument
+  /// is the actual int[][] pattern array used in the initializer.
+  /// 
+  /// Each case row is a separate attribute.
+  /// </summary>
+  [ AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
+  public class SelectReceivePatternAttribute : Attribute {
+    public SelectReceivePatternAttribute(int row, int[] pattern) {}
+  }
+
+
+  [ AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true) ]
+  public class LinkPortAttribute : Attribute {
+    public LinkPortAttribute(System.Type importPort, System.Type exportPort) {}
+  }
+
+  // a dummy attribute used for compiling type extensions
+  // (in case the real Bartok version is inaccessible)
+  [ AttributeUsage(AttributeTargets.Class|AttributeTargets.Struct|AttributeTargets.Interface) ]
+  public sealed class MixinAttribute : Attribute {
+    internal Type option;
+    public MixinAttribute(Type type) {
+      this.option = type;
+    }
+  }
+  // a dummy attribute used for compiling type extensions
+  // (in case the real Bartok version is inaccessible)
+  [ AttributeUsage(AttributeTargets.Method) ]
+  public sealed class MixinExtendAttribute : Attribute {
+    internal string name;
+    public MixinExtendAttribute(string name) {
+      this.name = name;
+    }
+  }
+}
+
+#if CCINamespace
+namespace Microsoft.Cci.TypeExtensions {
+#else
+namespace System.Compiler.TypeExtensions {
+#endif
+  /// <summary>
+  /// Marks a class as a process contract
+  /// </summary>
+  public interface IChannelContract {
+  }
+
+  /// <summary>
+  /// Marks a struct as a rep struct
+  /// </summary>
+  public interface IRepStruct {
+  }
+
+  /// <summary>
+  /// Marks a struct as a rep struct type parameter
+  /// </summary>
+  public interface IRepStructParameter {
+  }
+
+  /// <summary>
+  /// Marks a struct as a message struct
+  /// </summary>
+  public interface IMessage {
+  }
+
+  /// <summary>
+  /// Marks a protocol state as a protocol state
+  /// </summary>
+  public interface IProtocolState {
+  }
+
+  /// <summary>
+  /// Marks a signature class as a signature
+  /// </summary>
+  public interface ISignature {
+  }
+
+  /// <summary>
+  /// Marks a part class as an import port
+  /// </summary>
+  public interface IImportPort 
+  {
+  }
+
+  /// <summary>
+  /// Marks a part class as an export port
+  /// </summary>
+  public interface IExportPort 
+  {
+  }
+
+}
+
+namespace System.Compiler {
+    /// <summary>
+    /// Used to mark Template classes so Bartok can ignore them.
+    /// If the name or namespace changes, we need to update Bartok.
+    /// </summary>
+    public interface ITemplate {
+    }
+}
+
diff --git a/base/Kernel/SingSharp.Runtime/Bitter.sg b/base/Kernel/SingSharp.Runtime/Bitter.sg
new file mode 100644
index 0000000..a0d30dd
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Bitter.sg
@@ -0,0 +1,487 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Bitter.sg
+//
+//  Helper class for moving values in and out of byte vectors.
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Runtime.CompilerServices;  //StructAlign attribute
+using System.Runtime.InteropServices;   //structLayout attribute
+using System.GCs;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Threads;
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+namespace Microsoft.Singularity
+{
+    public class Bitter
+    {
+        private static void BoundsCheck(byte[] in ExHeap buffer, int offset, int length)
+        {
+            if (buffer == null) {
+                throw new ArgumentNullException("value");
+            }
+            if (offset < 0) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (offset + length > buffer.Length) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            }
+        }
+
+        private static void BoundsCheck(char[] in ExHeap buffer, int offset, int length)
+        {
+            if (buffer == null) {
+                throw new ArgumentNullException("value");
+            }
+            if (offset < 0) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (offset + length > buffer.Length) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            }
+        }
+
+        private static void BoundsCheck(byte[] buffer, int offset, int length)
+        {
+            if (buffer == null) {
+                throw new ArgumentNullException("value");
+            }
+            if (offset < 0) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (offset + length > buffer.Length) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            }
+        }
+
+        public static unsafe UIntPtr ToAddress(byte[]! in ExHeap buffer, int offset)
+        {
+            unsafe {
+                return (UIntPtr)(byte *)&buffer[offset];
+            }
+        }
+
+        unsafe public static byte[]! ToByteArray(byte[]! in ExHeap buffer)
+        {
+            byte[] retval = new byte[buffer.Length];
+            int length = buffer.Length;
+
+            fixed (byte *pdst = &retval[0]) {
+                fixed (byte *psrc = &buffer[0]) {
+                    Buffer.MoveMemory(pdst, psrc, length);
+                }
+            }
+            return retval;
+        }
+
+        public static unsafe void ToByteArray(byte[]! in ExHeap buffer, int offset,
+                                              int length, byte[]! array, int aoffset)
+        {
+            BoundsCheck(buffer, offset, length);
+            BoundsCheck(array, aoffset, length);
+
+            fixed (byte *pdst = &array[aoffset]) {
+                fixed (byte *psrc = &buffer[offset]) {
+                    Buffer.MoveMemory(pdst, psrc, length);
+                }
+            }
+        }
+
+        public static unsafe void ToIoMemory(byte[] in ExHeap buffer, int offset,
+                                             int length, IoMemory memory, int aoffset)
+        {
+            if (buffer == null || memory == null ||
+                offset < 0 || offset + length > buffer.Length ||
+                aoffset < 0 || aoffset + length > memory.Length) {
+
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            }
+
+            fixed (byte * src = &buffer[offset]) {
+                memory.Write8(aoffset, src, length);
+            }
+        }
+
+        public static unsafe char ToChar(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(char));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((char *)ptr);
+            }
+        }
+
+        public static unsafe short ToInt16(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(short));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((short *)ptr);
+            }
+        }
+
+        public static unsafe int ToInt32(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(int));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((int *)ptr);
+            }
+        }
+
+        public static unsafe long ToInt64(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(long));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((long *)ptr);
+            }
+        }
+
+        public static unsafe ushort ToUInt16(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(ushort));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((ushort *)ptr);
+            }
+        }
+
+        public static unsafe uint ToUInt32(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(uint));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((uint *)ptr);
+            }
+        }
+
+        public static unsafe ulong ToUInt64(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(ulong));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((ulong *)ptr);
+            }
+        }
+
+        public static unsafe float ToSingle(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(float));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((float *)ptr);
+            }
+        }
+
+        public static unsafe double ToDouble(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(double));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((double *)ptr);
+            }
+        }
+
+        public static unsafe bool ToBoolean(byte[]! in ExHeap buffer, int offset) {
+            BoundsCheck(buffer, offset, sizeof(int));
+            fixed (byte *ptr = &buffer[offset]) {
+                return *((int *)ptr) ==  0 ? false : true;
+            }
+        }
+
+        // Converts a character vector to a managed string
+        public static unsafe string ToString(char[] in ExHeap chars)
+        {
+            if (chars == null) return null;
+            else {
+                char[]! in ExHeap nnChars = chars;
+                return ToString2(nnChars);
+            }
+        }
+
+        // Converts a character vector to a managed string
+        public static unsafe string! ToString2(char[]! in ExHeap chars,
+                                               int offset, int length)
+        {
+            if ((length == 0) || (chars.Length == 0))
+            { return (!)String.Empty; } // happens before we have the String contract
+
+            DebugStub.Assert(offset < chars.Length);
+            DebugStub.Assert(offset + length <= chars.Length);
+
+            fixed (char *ptr = &chars[0]) {
+                // unnecessary cast, but because we have to build the
+                // runtime first before Kernel.Contracts.dll, we don't know
+                // that StringCTOR always returns non-null value.
+                return (!)String.StringCTOR(ptr, offset, length);
+            }
+        }
+
+        public static unsafe string! ToString2(char[]! in ExHeap chars)
+        {
+            return ToString2(chars, 0, chars.Length);
+        }
+
+        // Converts a byte vector to a managed string
+        public static unsafe string ToString(byte[] in ExHeap chars)
+        {
+            if (chars == null) return null;
+            else {
+                return ToString2(chars);
+            }
+        }
+
+        // Converts a character vector to a managed string
+        public static unsafe string! ToString2(byte[]! in ExHeap chars)
+        {
+            if (chars.Length == 0)
+            { return (!)String.Empty; } // happens before we have the String contract
+
+            fixed (byte *ptr = &chars[0]) {
+                // unnecessary cast, but because we have to build the
+                // runtime first before Kernel.Contracts.dll, we don't know
+                // that StringCTOR always returns non-null value.
+                return (!)String.StringCTOR(ptr, 0, chars.Length);
+            }
+        }
+
+        public static byte[]! in ExHeap FromByteArray(byte[]! buffer)
+        {
+            byte[] in ExHeap retval = new[ExHeap] byte[buffer.Length];
+            int length = buffer.Length;
+
+            FromByteArray(retval, 0, length, buffer, 0);
+            return retval;
+        }
+
+        public static byte[]! in ExHeap
+        FromByteArray(byte[]! buffer, int offset, int length)
+        {
+            byte[] in ExHeap retval = new[ExHeap] byte[length];
+            FromByteArray(retval, 0, length, buffer, offset);
+            return retval;
+        }
+
+        public static unsafe void FromByteArray(byte[]! in ExHeap buffer,
+                                                int offset, int length,
+                                                byte[]! array, int aoffset)
+        {
+            BoundsCheck(buffer, offset, length);
+            BoundsCheck(array, aoffset, length);
+
+            fixed (byte *pdst = &buffer[offset]) {
+                fixed (byte *psrc = &array[aoffset]) {
+                    Buffer.MoveMemory(pdst, psrc, length);
+                }
+            }
+        }
+
+        public static unsafe void FromIoMemory(byte[] in ExHeap buffer, int offset,
+                                               int length, IoMemory memory, int aoffset)
+        {
+            if (buffer == null || memory == null ||
+                offset < 0 || offset + length > buffer.Length ||
+                aoffset < 0 || aoffset + length > memory.Length) {
+
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            }
+
+            fixed (byte * src = &buffer[offset]) {
+                memory.Read8(aoffset, src, length);
+            }
+        }
+
+
+        public static unsafe void FromChar(byte[]! in ExHeap buffer, int offset,
+                                           char value) {
+            BoundsCheck(buffer, offset, sizeof(char));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((char *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromInt16(byte[]! in ExHeap buffer, int offset,
+                                            short value) {
+            BoundsCheck(buffer, offset, sizeof(short));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((short *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromInt32(byte[]! in ExHeap buffer, int offset,
+                                            int value) {
+            BoundsCheck(buffer, offset, sizeof(int));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((int *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromInt64(byte[]! in ExHeap buffer, int offset,
+                                            long value) {
+            BoundsCheck(buffer, offset, sizeof(long));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((long *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromUInt16(byte[]! in ExHeap buffer, int offset,
+                                             ushort value) {
+            BoundsCheck(buffer, offset, sizeof(ushort));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((ushort *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromUInt32(byte[]! in ExHeap buffer, int offset,
+                                             uint value) {
+            BoundsCheck(buffer, offset, sizeof(uint));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((uint *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromUInt64(byte[]! in ExHeap buffer, int offset,
+                                             ulong value) {
+            BoundsCheck(buffer, offset, sizeof(ulong));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((ulong *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromSingle(byte[]! in ExHeap buffer, int offset,
+                                             float value) {
+            BoundsCheck(buffer, offset, sizeof(float));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((float *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromDouble(byte[]! in ExHeap buffer, int offset,
+                                             double value) {
+            BoundsCheck(buffer, offset, sizeof(double));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((double *)ptr) = value;
+            }
+        }
+
+        public static unsafe void FromBoolean(byte[]! in ExHeap buffer, int offset,
+                                              bool value) {
+            BoundsCheck(buffer, offset, sizeof(int));
+            fixed (byte *ptr = &buffer[offset]) {
+                *((int *)ptr) = value ? 1 : 0;
+            }
+        }
+
+        // Converts a managed string to a char vector.
+        public static char[] in ExHeap FromString(string str)
+        {
+            if (str == null)
+            { return null; }
+            return FromString2(str);
+        }
+
+        // Converts a managed string to a char vector.
+        public static char[]! in ExHeap FromString2(string! str)
+        {
+            return FromString2(str, 0, str.Length);
+        }
+
+        public static char[]! in ExHeap FromString2(string! str,
+                                                    int     start,
+                                                    int     length)
+        {
+            if (length == 0) {
+                return new [ExHeap] char[0];
+            }
+            else {
+                if (start + length > str.Length) {
+                    length = str.Length - start;
+                }
+                char [] in ExHeap retval = new [ExHeap] char [length];
+                for (int i = 0; i < length; i++) {
+                    retval[i] = str[start + i];
+                }
+                return retval;
+            }
+        }
+
+        public static unsafe void Copy(byte[]! in ExHeap dest,
+                                       int destOffset,
+                                       int length,
+                                       byte[]! in ExHeap source,
+                                       int sourceOffset)
+        {
+            BoundsCheck(source, sourceOffset, length);
+            BoundsCheck(dest, destOffset, length);
+
+            fixed (byte *pdst = &dest[destOffset]) {
+                fixed (byte *psrc = &source[sourceOffset]) {
+                    Buffer.MoveMemory(pdst, psrc, length);
+                }
+            }
+        }
+
+        public static unsafe void Copy(char[]! in ExHeap dest,
+                                       int destOffset,
+                                       int length,
+                                       char[]! in ExHeap source,
+                                       int sourceOffset)
+        {
+            BoundsCheck(source, sourceOffset, length);
+            BoundsCheck(dest, destOffset, length);
+
+            fixed (char *pdst = &dest[destOffset]) {
+                fixed (char *psrc = &source[sourceOffset]) {
+                    Buffer.MoveMemory((byte*)pdst, (byte*)psrc, length*sizeof(char));
+                }
+            }
+        }
+
+        public static unsafe void Zero(byte[]! in ExHeap dest,
+                                       int destOffset,
+                                       int length)
+        {
+            BoundsCheck(dest, destOffset, length);
+            fixed (byte *pdst = &dest[destOffset]) {
+                Buffer.ZeroMemory(pdst, length);
+            }
+        }
+
+        public static unsafe byte[]! in ExHeap
+        SplitOff(ref byte[]! in ExHeap original, int offset)
+        {
+            byte[]! in ExHeap vec = original;
+            return (byte[]! in ExHeap)SharedHeapService.Split(
+                (Allocation*)vec,
+                new UIntPtr(offset)
+                );
+        }
+
+        public static unsafe char[]! in ExHeap
+        SplitOff(ref char[]! in ExHeap original, int charOffset)
+        {
+            char[]! in ExHeap vec = original;
+            return (char[]! in ExHeap)SharedHeapService.Split(
+                (Allocation*)vec,
+                new UIntPtr(sizeof(char) * charOffset)
+                );
+        }
+
+        public static unsafe void Truncate(ref byte[]! in ExHeap buffer,
+                                           int newLength)
+        {
+            SharedHeapService.Truncate(
+                (Allocation*)buffer,
+                new UIntPtr(newLength)
+                );
+        }
+
+        public static unsafe void Truncate(ref char[]! in ExHeap buffer,
+                                           int newLength)
+        {
+            SharedHeapService.Truncate(
+                (Allocation*)buffer,
+                new UIntPtr(sizeof(char) * newLength)
+                );
+        }
+    }
+}
+
diff --git a/base/Kernel/SingSharp.Runtime/Classes.ssc b/base/Kernel/SingSharp.Runtime/Classes.ssc
new file mode 100644
index 0000000..6106770
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Classes.ssc
@@ -0,0 +1,51 @@
+using System;
+using System.Collections;
+
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+namespace Microsoft.Contracts {
+  /// <summary>
+  /// Indicates that all derived classes must override this virtual method since the implementation of the method depends on the runtime type of the "this" object
+  /// to be the same as the declaring type of the method.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class MustOverrideAttribute : Attribute {
+  }
+}
+
+//---------------------------------------------------------------------------
+//SingSharp Library
+//---------------------------------------------------------------------------
+
+
+namespace Microsoft.SingSharp {
+  /// <summary>
+  /// Used as a reference point to the runtime library from code
+  /// </summary>
+  public sealed class RuntimeLibraryHook{
+    private RuntimeLibraryHook(){}
+  }
+  
+  
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=true)]
+  public sealed class PostCompilationPluginAttribute : Attribute{
+    private Type pluginType;
+    
+    public PostCompilationPluginAttribute(){      
+    }
+    
+    public PostCompilationPluginAttribute(Type pluginType){
+      this.pluginType = pluginType;
+    }
+    
+    public Type PluginType{
+      get{
+        return this.pluginType;
+      }
+      set{
+        this.pluginType = value;
+      }
+    }
+  }
+  
+}
diff --git a/base/Kernel/SingSharp.Runtime/CustomAllocator.sg b/base/Kernel/SingSharp.Runtime/CustomAllocator.sg
new file mode 100644
index 0000000..c1f04fc
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/CustomAllocator.sg
@@ -0,0 +1,57 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace Microsoft.SingSharp {
+    /// <summary>
+    /// This is the Base class for all Custom allocators.
+    ///
+    /// <i>Custom Allocator support</i>
+    ///
+    /// Custom allocators enable Sing# programs to allocate memory explicitly in a variety of
+    /// different heaps.
+    ///
+    /// Pointers to objects in custom allocation regions have types that are tagged by an optional
+    /// type modifier pointing to the Allocator class. E.g., a pointer to a struct S in allocation
+    /// heap controlled by type A is given type
+    ///
+    ///   (S* ) opt A
+    ///
+    /// In the same vein, we can support vectors in these allocation regions by tagging the pointer
+    /// with a vector type A[]
+    ///
+    ///   (S* ) opt A[]      represents a vector of S in allocation region managed by A.
+    ///
+    /// 
+    /// The idea is that given a pointer tagged with an allocator, we can perform operations
+    /// specific to that allocator, such as getting the array length, freeing the block, or
+    /// indirect to the data (if the allocator uses that representation).
+    ///
+    /// A pointer without an allocator tag is thus interpreted no differently than the CLR normally
+    /// would treat it, and no special operations can be performed on it, in particular, it cannot
+    /// be freed.
+    ///
+    /// The allocator tagging also enables us to make sure we free the pointer with the right
+    /// allocator and to restrict certain operations to particular heaps, for example message sends
+    /// only accept pointers allocated in the exchange heap.
+    /// 
+    /// </summary>
+    public class CustomAllocator {
+    }
+    
+    /// <summary>
+    /// This is a marker used in optional modifiers to encode that a pointer to a custom heap is actually a 
+    /// vector and can be indexed. We encode these as T* opt(Allocator) opt(CustomVector)
+    ///
+    /// History:
+    ///   We used to encode these as T* opt(Allocator[]), but the array type in the modifier position throws
+    ///   off IL readers such as ABSIL.
+    /// </summary>
+    public class CustomVector {
+        public unsafe static void Expose(void* arr, int idx) { }
+        public unsafe static void UnExpose(void* arr, int idx) { }
+    }
+}
diff --git a/base/Kernel/SingSharp.Runtime/EMap.sg b/base/Kernel/SingSharp.Runtime/EMap.sg
new file mode 100644
index 0000000..f90e8cb
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/EMap.sg
@@ -0,0 +1,265 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EMap.ssc
+//
+//  Note: 
+//        
+//        
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Channels {
+
+    using Microsoft.Singularity.V1.Threads;
+    
+    public class EMap<T, State, Data> : ITracked, ISelectable 
+      where T: unmanaged struct, IEventCollectionElement 
+    {
+
+        private AutoResetEventHandle evHandle;
+
+        public SyncHandle GetWaitHandle() { return evHandle; }
+
+        public void ResetWaitSignal() {
+            AutoResetEventHandle.Reset(this.evHandle);
+        }
+
+        private Node! listHead;
+
+        public EMap() {
+            this.listHead = new Node(this);
+            AutoResetEventHandle handleOnStack;
+            if (!AutoResetEventHandle.Create(false, out handleOnStack)) {
+                throw new System.Threading.HandleCreateException();
+            }
+            this.evHandle = handleOnStack;
+        }
+
+        private Node? lookAside;
+
+        private Node? nextScanStart;
+
+        private Node! GetFreshNode(T* in ExHeap opt(State) ep, Data data, EMap<T,State,Data>! parent) {
+            Node n = this.lookAside;
+            if (n == null) {
+                n = new Node(ep, data, parent);
+            }
+            else {
+                this.lookAside = null;
+                n.Init(ep, data, parent);
+            }
+            return n;
+        }
+
+        // we only want type visibility outside NewESet, but not member accessibility
+        private class Node {
+            unsafe internal T* opt(ExHeap) opt(State) endpoint;
+            internal Data data;
+            unsafe private EMap<T, State, Data>! parent;
+            internal Node! next;
+            internal Node! prev;
+
+            internal Node(T* opt(ExHeap) opt(State) ep, Data data, [Delayed] EMap<T, State, Data>! parent) {
+                this.next = this;
+                this.prev = this;
+                this.parent = parent;
+                this.Init(ep, data, parent);
+            }
+
+            [Delayed]
+            internal void Init(T* opt(ExHeap) opt(State) ep, Data data, [Delayed] EMap<T, State, Data>! parent) {
+                this.parent = parent;
+                this.endpoint = ep;
+                this.data = data;
+            }
+
+            /// <summary>
+            /// For constructing the dummy head node.            
+            /// </summary>
+            internal Node([Delayed] EMap<T, State, Data>! parent) {
+                this.next = this;
+                this.prev = this;
+                this.parent = parent;
+            }
+
+            internal T* opt(ExHeap) opt(State) Unlink(EMap<T,State,Data>! parent, out Data data) {
+                assert (parent == this.parent);
+                this.prev.next = this.next;
+                this.next.prev = this.prev;
+                this.next = this;
+                this.prev = this;
+                data = this.data;
+                T* in ExHeap opt(State) ep = this.endpoint;
+                this.endpoint = null;
+                ep->UnlinkFromCollection(parent.evHandle);
+                parent.lookAside = this;
+                return ep;
+            }
+
+            internal void LinkAsNext(T* opt(ExHeap) opt(State)! ep, Data data, EMap<T,State,Data>! parent) {
+                Node next = parent.GetFreshNode(ep, data, parent);
+                next.next = this.next;
+                this.next = next;
+                next.prev = this;
+                next.next.prev = next;
+                ep->LinkIntoCollection(parent.evHandle);
+            }
+        }
+
+        #region ITracked members
+
+        void ITracked.Release()
+        {
+            Node current = this.listHead.next;
+            while (current != this.listHead) {
+                // temporary hack until we fix the compiler to allow this upcast in receiver context
+                unsafe {
+                    current.endpoint->Release();
+                }
+                current = current.next;
+            }
+        }
+
+        void ITracked.Acquire()
+        {
+            Node current = this.listHead.next;
+            while (current != this.listHead) {
+                // temporary hack until we fix the compiler to allow this upcast in receiver context
+                unsafe {
+                    current.endpoint->Acquire();
+                }
+                current = current.next;
+            }
+        }
+
+        public void Dispose()
+        {
+            Node lh = this.listHead;
+            Node current = lh.next;
+            while (current != lh) {
+                Node next = current.next;
+                Data data;
+                T* opt(ExHeap) opt(State)! ep = (!)current.Unlink(this, out data);
+                unsafe { // needed because specializer does not add call usually done by delete
+                    ep->Dispose();
+                }
+                delete ep;
+                current = next;
+            }
+            lh.next = lh;
+            lh.prev = lh;
+            if (this.evHandle.id != UIntPtr.Zero) {
+                AutoResetEventHandle.Dispose(this.evHandle);
+                this.evHandle = new AutoResetEventHandle();
+            }
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+        #endregion
+
+        public void Add([Claims] T* opt(ExHeap) opt(State)! ep, Data data) {
+            this.listHead.LinkAsNext(ep, data, this);
+        }
+
+        ///
+        /// We have to be careful here. The node in nextScanStart might no longer
+        /// be in the set. 
+        ///
+        /// The policy is to start scanning from the successor of the last scanned 
+        /// point. 
+        private Node! NextScanStart {
+            get { 
+                Node candidate = this.nextScanStart;
+                if (candidate == null || candidate.endpoint == null) {
+                    // node might no longer be in the set
+                    return this.listHead;
+                }
+                return candidate;
+            }
+        }
+
+        /// possible set to false when match not possible. Never set to true!
+        public bool HeadMatches(int tag, ref bool possible, ref object setMatch)
+        {
+            // check if this tag is about the collection elements or about the collection itself:
+            if ((tag & (~0xff)) != 0) {
+              // about elements. Shift right 8 bits
+              tag = tag>>8;
+
+              // scan starting at different place each time
+              Node scanStart = this.NextScanStart;
+
+              bool setPossible = false;
+              Node current = scanStart;
+              do {
+                  if (current != this.listHead) {
+                      bool curPossible = true;
+                      if (current.endpoint->HeadMatches(tag, ref curPossible, ref setMatch)) {
+                          setMatch = current;
+                          this.nextScanStart = current.next;
+                          return true;
+                      }
+                      setPossible |= curPossible;
+                  }
+                  current = current.next;
+              } while (current != scanStart);
+
+              if (!setPossible) { possible = false; }
+              return false;
+            }
+            else {
+              // about the map itself
+              switch(tag) {
+                  case EMapReceiveTag.Empty:
+                      if (this.listHead == null || this.listHead.next == this.listHead) {
+                          return true;
+                      }
+                      possible = false; // can't match on this select receive
+                      break;
+                  case EMapReceiveTag.Head:
+                      if (this.listHead != null && this.listHead.next != this.listHead) {
+                          return true;
+                      }
+                      possible = false; // can't match on this select receive
+                      break;
+              }
+              return false;
+            }
+        }
+
+
+        [Selectable((int)ESetReceiveTag.Empty)]
+        public void RecvEmpty() {
+        }
+
+        [Selectable((int)ESetReceiveTag.Head)]
+        public void RecvHead(out T*! in ExHeap opt(State) ep, out Data data) {
+            Node current = this.listHead.next;
+            assert current != this.listHead;
+            ep = (!)current.Unlink(this, out data);
+        }
+
+        public T* opt(ExHeap) opt(State)! Extract(object setMatch, out Data data) {
+            assert setMatch != null;
+            Node node = (Node)setMatch;
+        
+            T* opt(ExHeap) opt(State) result = node.Unlink(this, out data);
+            return (!)result;
+        }
+    }    
+
+    internal enum EMapReceiveTag {
+      Any = 1,
+      Empty = 2,
+      Head = 3,
+    }
+
+}
diff --git a/base/Kernel/SingSharp.Runtime/ESet.sg b/base/Kernel/SingSharp.Runtime/ESet.sg
new file mode 100644
index 0000000..217dd75
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/ESet.sg
@@ -0,0 +1,278 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ESet.ssc
+//
+//  Note: 
+//        
+//        
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Channels {
+
+    using Microsoft.Singularity.V1.Threads;
+    
+    public class ESet<T, State> : ITracked, ISelectable where T: unmanaged struct, IEventCollectionElement {
+
+        private AutoResetEventHandle evHandle;
+
+        public SyncHandle GetWaitHandle() { return evHandle; }
+
+        public void ResetWaitSignal() {
+            AutoResetEventHandle.Reset(evHandle);
+        }
+
+        private Node! listHead;
+
+        private Node? lookAside;
+
+        private Node? nextScanStart;
+
+        public ESet() {
+            this.listHead = new Node(this);
+            AutoResetEventHandle handleOnStack;
+            if (!AutoResetEventHandle.Create(false, out handleOnStack)) {
+                throw new System.Threading.HandleCreateException();
+            }
+            this.evHandle = handleOnStack;
+        }
+
+
+        private Node! GetFreshNode(T* in ExHeap opt(State) ep, ESet<T,State>! parent) {
+            Node n = this.lookAside;
+            if (n == null) {
+                n = new Node(ep, parent);
+            }
+            else {
+                this.lookAside = null;
+                n.Init(ep, parent);
+            }
+            return n;
+        }
+
+
+        // we only want type visibility outside ESet, but not member accessibility
+        private class Node {
+
+            unsafe internal T* opt(ExHeap) opt(State) endpoint;
+            unsafe private ESet<T,State>! parent;
+            internal Node! next;
+            internal Node! prev;
+
+            internal Node([Delayed] ESet<T,State>! parent) {
+                this.next = this;
+                this.prev = this;
+                this.parent = parent;
+            }
+            
+            internal Node(T* opt(ExHeap) opt(State) ep, [Delayed] ESet<T,State>! parent) {
+                this.next = this;
+                this.prev = this;
+                this.Init(ep, parent);
+                this.parent = parent; // redundant, but to keep checker happy.
+            }
+
+            [Delayed]
+            internal void Init(T* opt(ExHeap) opt(State) ep, [Delayed] ESet<T,State>! parent) {
+                this.parent = parent;
+                this.endpoint = ep;
+            }
+
+            internal T* in ExHeap opt(State) Unlink(ESet<T,State>! parent) {
+                assert (parent == this.parent);
+                this.prev.next = this.next;
+                this.next.prev = this.prev;
+                this.next = this;
+                this.prev = this;
+                T* in ExHeap opt(State) data = this.endpoint;
+                assert data != null;
+                this.endpoint = null;
+                data->UnlinkFromCollection(parent.evHandle);
+                parent.lookAside = this;
+                return data;
+            }
+
+            internal void LinkAsNext(T*! opt(ExHeap) opt(State) ep, ESet<T,State>! parent) {
+                Node next = parent.GetFreshNode(ep, parent);
+                next.next = this.next;
+                this.next = next;
+                next.prev = this;
+                next.next.prev = next;
+                ep->LinkIntoCollection(parent.evHandle);
+            }
+        }
+
+        #region ITracked members
+
+        void ITracked.Release()
+        {
+            Node current = this.listHead.next;
+            while (current != this.listHead) {
+                // temporary hack until we fix the upcast in receiver context
+                unsafe {
+                    assert current.endpoint != null;
+                    current.endpoint->Release();
+                }
+                current = current.next;
+            }
+        }
+
+        void ITracked.Acquire()
+        {
+            Node current = this.listHead.next;
+            while (current != this.listHead) {
+                // temporary hack until we fix the upcast in receiver context
+                unsafe {
+                    assert current.endpoint != null;
+                    current.endpoint->Acquire();
+                }
+                current = current.next;
+            }
+        }
+
+        public void Dispose()
+        {
+            Node head = this.listHead;
+            Node current = head.next;
+            while (current != head) {
+                Node next = current.next;
+                T* opt(ExHeap) opt(State) ep = current.Unlink(this);
+                // needed because delete does not add the call here due to generics
+                ep->Dispose();
+                delete ep;
+                current = next;
+            }
+            head.next = head;
+            head.prev = head;
+            if (this.evHandle.id != UIntPtr.Zero) {
+                AutoResetEventHandle.Dispose(this.evHandle);
+                this.evHandle = new AutoResetEventHandle();
+            }
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+        #endregion
+
+        public void Add([Claims] T*! opt(ExHeap) opt(State) ep) {
+            this.listHead.LinkAsNext(ep, this);
+        }
+
+
+        public int Count {
+            get {
+                int count = 0;
+                Node current = this.listHead.next;
+                while (current != this.listHead) {
+                    count++;
+                    current = current.next;
+                }
+                return count;
+            }
+        }
+
+        ///
+        /// We have to be careful here. The node in nextScanStart might no longer
+        /// be in the set. 
+        ///
+        /// The policy is to start scanning from the successor of the last scanned 
+        /// point. 
+        private Node! NextScanStart {
+            get { 
+                Node candidate = this.nextScanStart;
+                if (candidate == null || candidate.endpoint == null) {
+                    // node might no longer be in the set
+                    return this.listHead;
+                }
+                return candidate;
+            }
+        }
+
+        /// possible set to false when match not possible. Never set to true!
+        public bool HeadMatches(int tag, ref bool possible, ref object setMatch)
+        {
+            // check if this tag is about the collection elements or about the collection itself:
+            if ((tag & (~0xff)) != 0) {
+              // about elements. Shift right 8 bits
+              tag = tag>>8;
+
+              // scan starting at different place each time
+              Node scanStart = this.NextScanStart;
+
+              bool setPossible = false;
+              Node current = scanStart;
+              do {
+                  if (current != this.listHead) {
+                      // ignore the dummy node
+                      bool curPossible = true;
+                      if (current.endpoint->HeadMatches(tag, ref curPossible, ref setMatch)) {
+                          setMatch = current;
+                          // set scan start point to be successor of this element
+                          //
+                          this.nextScanStart = current.next;
+                          return true;
+                      }
+                      setPossible |= curPossible;
+                  }
+                  current = current.next;
+              } while (current != scanStart);
+
+              if (!setPossible) { possible = false; }
+              return false;
+            }
+            else {
+              // about the set itself.
+              switch(tag) {
+                case ESetReceiveTag.Empty:
+                    if (this.listHead == null || this.listHead.next == this.listHead) {
+                        return true;
+                    }
+                    possible = false; // can't match on this select receive
+                    break;
+
+                case ESetReceiveTag.Head:
+                    if (this.listHead != null && this.listHead.next != this.listHead) {
+                        return true;
+                    }
+                    possible = false; // can't match on this select receive
+                    break;
+              }
+              return false;
+            }
+        }
+
+        [Selectable((int)ESetReceiveTag.Empty)]
+        public void RecvEmpty() {
+        }
+
+        [Selectable((int)ESetReceiveTag.Head)]
+        public void RecvHead(out T*! in ExHeap opt(State) ep) {
+            Node current = this.listHead.next;
+            assert current != this.listHead;
+            ep = (!)current.Unlink(this);
+        }
+
+        public T* opt(ExHeap) opt(State)! Extract(object setMatch) {
+            assert setMatch != null;
+            Node node = (Node)setMatch;
+        
+            T* opt(ExHeap) opt(State) result = node.Unlink(this);
+            return (!)result;
+        }
+    }    
+
+
+
+    internal enum ESetReceiveTag {
+      Any = 1,
+      Empty = 2,
+      Head = 3,
+    }
+}
diff --git a/base/Kernel/SingSharp.Runtime/Endpoint.sg b/base/Kernel/SingSharp.Runtime/Endpoint.sg
new file mode 100644
index 0000000..c9f5829
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Endpoint.sg
@@ -0,0 +1,783 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Channels {
+
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.V1.Types;
+    using Microsoft.Singularity.V1.Security;
+    using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+    using EndpointCore = Microsoft.Singularity.V1.Services.EndpointCore;
+
+    [CLSCompliant(false)]
+    public enum EndpointEvent : ushort
+    {
+        Notify = 10,
+        Dispose = 1,
+        Select = 2,
+        RetrieveHook = 6,
+        DeliverHook = 7,
+    }
+
+    /// <summary>
+    /// Provides an adapter class between the runtime provided Endpoint and the compiler generated contract specific
+    /// Imp and Exp endpoints.
+    /// </summary>
+    public rep struct Endpoint : EndpointCore, IEventCollectionElement {
+
+        public const int ANY_MESSAGE_TAG = 1;
+        public const int CHANNEL_CLOSED_TAG = -1;
+
+        protected StateStack stateStack;
+
+        // some cached info for Monitoring
+#if MONITORING
+        uint contractTag;
+        uint peerContractTag;
+#endif
+
+        // Initialization of EndpointCore happens during Allocation!
+        protected Endpoint(int initialState)
+        {
+          Initialize(initialState);
+        }
+
+#if SINGULARITY_KERNEL
+        public
+#endif
+        void Initialize(int initialState) {
+          stateStack = new StateStack(initialState);
+          assert stateStack.Top() == initialState;
+        }
+
+        new public bool Closed { get { return EndpointCore.Closed(ref this); } }
+
+        new public void Close() {
+            EndpointCore.Close(ref this);
+        }
+
+        new public bool PeerClosed
+        {
+            get {
+                return EndpointCore.PeerClosed(ref this);
+            }
+        }
+
+        new public virtual SyncHandle GetWaitHandle() {
+            return EndpointCore.GetWaitHandle(ref this);
+        }
+
+        new public virtual void ResetWaitSignal() {
+            // dummy for now
+        }
+
+        new protected void NotifyPeer() {
+            EndpointCore.NotifyPeer(ref this);
+        }
+
+#if false
+        new protected void Notify() {
+          // would like to determine if there are any outstanding messages
+          // on this endpoint and only signal if there are not.
+          // With new message allocation scheme, it is tricky to determine
+          // this without grabbing locks, which I'm trying to avoid
+          // So we just signal it all.
+          //
+          // The access to setHead also needs to change eventually when
+          // we have endpoints in the shared heap. We'll need to figure out
+          // how to encode sets again.
+          //
+
+          Monitoring.Log(Monitoring.Provider.Endpoint,
+                         (ushort)EndpointEvent.Notify,
+                         0, (uint)this.ChannelID, 0, 0, 0, 0);
+
+          if (this.collectionEvent.id != UIntPtr.Zero) {
+            AutoResetEventHandle.Set(this.collectionEvent);
+          }
+          base.Notify();
+        }
+#endif
+
+        /// <summary>
+        /// Wait for a message to arrive on this endpoint.
+        /// </summary>
+        new protected void Wait() {
+          EndpointCore.Wait(ref this);
+        }
+
+        /// <summary>
+        /// Obtain the channel identifier of this endpoint.
+        /// </summary>
+        public new int ChannelID {
+            [NoHeapAllocation]
+            get { 
+                return EndpointCore.GetChannelID(ref this);
+            }
+        }
+
+        /// <summary>
+        /// Obtain the process identifier of the owner.
+        /// </summary>
+        public new int OwnerProcessID {
+            [NoHeapAllocation]
+            get { 
+                return EndpointCore.GetOwnerProcessID(ref this);
+            }
+        }
+
+        /// <summary>
+        /// Obtain the principal identifier of the owner.
+        /// </summary>
+        public new PrincipalHandle OwnerPrincipalHandle {
+            [NoHeapAllocation]
+            get { 
+                return EndpointCore.GetOwnerPrincipalHandle(ref this);
+            }
+        }
+
+        /// <summary>
+        /// Obtain the process identifier of the owner of the other endpoint
+        /// </summary>
+        public new int PeerProcessID {
+            [NoHeapAllocation]
+            get { 
+                return EndpointCore.GetPeerProcessID(ref this);
+            }
+        }
+
+        /// <summary>
+        /// Obtain the principal identifier of the owner of the other endpoint
+        /// </summary>
+        public new PrincipalHandle PeerPrincipalHandle {
+            [NoHeapAllocation]
+            get { 
+                return EndpointCore.GetPeerPrincipalHandle(ref this);
+            }
+        }
+
+
+        ///
+        /// Closes this end of the channel and frees associated resources, EXCEPT the block
+        /// of memory for this endpoint. It must be released by the caller. Sing# does this
+        /// for the programmer.
+        ///
+        public void Dispose() {
+            if (this.Closed) {
+                throw new ApplicationException("Endpoint already closed");
+            }
+            Monitoring.Log(Monitoring.Provider.Endpoint,
+                           (ushort)EndpointEvent.Dispose,
+                           0, (uint)this.ChannelID, 0, 0, 0, 0);
+            if (!EndpointCore.Dispose(ref this)) {
+                throw new ApplicationException("ChannelService.Dispose returned false");
+            }
+        }
+
+
+        [return:Borrowed]
+        new unsafe protected Endpoint*! in ExHeap GetPeer(out bool marshall)
+        {
+            return (Endpoint* in ExHeap!)EndpointCore.GetPeer(ref this, out marshall);
+        }
+
+
+        unsafe public static SystemType RegisterSystemType(string! name,  long lower, long upper, SystemType systemType) 
+        {
+            char [] typeName = new char[name.Length]; 
+
+            if (typeName == null) {
+                throw new Exception("no more memory!");      
+            }
+            
+            for(int i=0; i < name.Length; i++) {
+                typeName[i] = name[i]; 
+            }
+            fixed (char* start = &typeName[0]) {
+                return SystemType.Register(start, name.Length, lower, upper, systemType); 
+            }
+        }
+
+        /// <summary>
+        /// Connects up the endpoints and initializes
+        /// the kernel part of the endpoints. The context needs to call the .ctor on the two
+        /// endpoints returned in order to initialize the contract specific structures as well
+        /// as those of the Endpoint struct itself.
+        /// </summary>
+        unsafe public static void Connect(Endpoint*! in ExHeap imp,
+                                          Endpoint*! in ExHeap exp)
+        {
+#if MONITORING
+            uint impContractTag = getContractTag(imp);
+            uint expContractTag = getContractTag(exp);
+            imp->contractTag = impContractTag;
+            imp->peerContractTag = expContractTag;
+            exp->contractTag = expContractTag;
+            exp->peerContractTag = impContractTag;
+#endif
+            EndpointCore.Connect( (Allocation*)imp, (Allocation*)exp);
+        }
+
+        /// <summary>
+        /// Transfer any content of this endpoint to target endpoint
+        /// </summary>
+        public void TransferContentsOwnership(ref Endpoint target) {
+            EndpointCore.TransferContentOwnership(ref this, ref target);
+        }
+
+
+        /// <summary>
+        /// Transfer actual block of data ownership to this endpoint.
+        /// </summary>
+        unsafe public void TransferBlockOwnership(void* in ExHeap data) {
+            if (data != null) {
+            EndpointCore.TransferBlockOwnership((Microsoft.Singularity.V1.Services.SharedHeapService.Allocation*)data, ref this);
+        }
+        }
+
+
+        /// <summary>
+        /// Instruct the selectable object to signal events on the given AutoResetEvent
+        /// rather than its normal event in order to aggregate signalling into a set.
+        /// A selectable object need only support being part of a single collection at
+        /// any point in time.
+        /// </summary>
+        new public void LinkIntoCollection(AutoResetEventHandle ev) {
+            //          Debug.Assert(this.collectionEvent.id == UIntPtr.Zero);
+            EndpointCore.LinkIntoCollection(ref this, ev);
+        }
+
+        /// <summary>
+        /// Instruct the selectable object to stop signalling events on the given
+        /// AutoResetEvent.
+        /// </summary>
+        new public void UnlinkFromCollection(AutoResetEventHandle ev) {
+            // Debug.Assert(this.collectionEvent.id != UIntPtr.Zero);
+            EndpointCore.UnlinkFromCollection(ref this, ev);
+        }
+
+        void ITracked.Release() {
+        }
+        void ITracked.Acquire() {
+        }
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+        public virtual bool HeadMatches(int tag, ref bool possible, ref object setMatch)
+        {
+          throw new ApplicationException("HeadMatches must be implemented by contract specific endpoints");
+        }
+
+        public static ISelectable[]! ThreadLocalObjectArray(int size) {
+            return (!)(((!)Thread.CurrentThread).PopSelectObjects(size));
+        }
+
+        // Bugfix 167 BY SXIA -- make a consistent statement in previous comments.
+        // This function (and its twin function below with an extra timeout parameter) 
+        // End Bugfix 167
+        // is the main interface for receiving on multiple
+        // endpoints and endpoint sets.
+        //
+        // The first parameter is an array of patterns.  Each pattern is
+        // an array of integers whose length is equal to the number of
+        // endpoints.  Each integer in a pattern indicates the message
+        // that must be received on the corresponding endpoint for that
+        // pattern to match.  (All elements of a pattern must match for
+        // the pattern to match.)  Possible pattern entries include:
+        //
+        //   > 1: wait for a message with this tag on this endpoint
+        //     1: wait for any message on this endpoint
+        //     0: don't wait on this endpoint
+        //    -1: wait for channel closed
+        //  < -1: illegal
+        //
+        // The second parameter contains ISelectable objects.
+        //
+        // The return value is the index of the pattern that matched or -1
+        // if a match is impossible.
+        //
+        // the setMatch out parameter is used to indicate which object of an underlying
+        // set was part of the match.
+        //
+        // NOTE: the endpoint array may contain more elements than the pattern refers to
+        //       thus the patterns 2nd level array Lengths is the indication how many endpoints are actually used.
+        //
+        public static int Select(int[][]! patterns, ISelectable[]! endpoints, out object setMatch)
+        {
+            Thread currentThread = (!)Thread.CurrentThread;
+
+            try 
+              // Give back cache (caller should do this, but we do it here for now)
+              // we assume that caller does not use this for any other purpose
+              // true for the generated code, but might not be true for other Select
+              // uses.
+            {
+                Monitoring.Log(Monitoring.Provider.Endpoint,
+                               (ushort)EndpointEvent.Select);
+                int numCases = patterns.Length;
+                if (numCases == 0) {
+                    setMatch = null;
+                    return -1;
+                }
+
+                int numEndpoints = ((!)patterns[0]).Length;
+
+                #region Debugging asserts
+#if DEBUG_SELECT
+                for (int i = 0; i < numCases; i++) {
+                    if (((!)patterns[i]).Length != numEndpoints) {
+                        throw new ArgumentException("Invalid pattern size.");
+                    }
+                }
+#endif
+                #endregion
+
+                // local resources
+                SyncHandle[] handles = null;
+                bool[] possible = null;
+
+                try 
+                    // Give back bool array on all returns
+                {
+                    possible = (!)currentThread.PopSelectBools(numCases);
+
+                    for (int i = 0; i < numCases; i++) {
+                        possible[i] = true;
+                    }
+
+                    int match = -1;
+                    int hint = -1;
+                    int numPossible = numCases;
+                    setMatch = null;
+
+                    while (numPossible > 0 &&
+                           ! FindRowMatch(hint, endpoints, patterns, possible,
+                                          ref numPossible,
+                                          out match,
+                                          out setMatch))
+                    {
+                        // only wait if last FindMatch didn't decrement numPossible to 0.
+                        if (numPossible > 0) {
+
+                            // special case case where we have 1 endpoint.
+                            if (numEndpoints == 1) {
+                                hint = 0;
+                                SyncHandle.WaitOne(((!)endpoints[0]).GetWaitHandle());
+                            }
+                            else {
+                                if (handles == null) {
+                                    // initialize
+                                    handles = (!)currentThread.PopSelectSyncHandles(numEndpoints);
+                                    for (int i = 0; i < numEndpoints; i++) {
+                                        handles[i] = ((!)endpoints[i]).GetWaitHandle();
+                                    }
+                                }
+                                hint = WaitAnyEndpoint(handles, numEndpoints);
+                            }
+                        }
+                    }
+                    return match;
+                }
+                finally {
+                    // return thread local resources
+                    if (possible != null) {
+                        currentThread.PushSelectBools(possible);
+                    }
+                    if (handles != null) {
+                        currentThread.PushSelectSyncHandles(handles);
+                    }
+                }
+            }
+            finally {
+                // return thread local resources
+                currentThread.PushSelectObjects(endpoints);
+            }
+        }
+
+        /// <summary>
+        /// We compute the index of the row that represents timeout case
+        /// See Parser.cs: the label for timeout is -2, unsatisfiable is -1 
+        /// </summary>
+        const int TimeOutIndex = -2;
+
+        // Bugfix 167 By SXIA -- Add a different version of select here. I keep two versions of select here
+        //                       which differs in whether there is an extra timeout parameter. If the only 
+        //                       callee of this select is the compilation of switch-receive, then we probably should
+        //                       delete the older version.
+        // This function is the second version of the main interface for receiving on multiple
+        // endpoints and endpoint sets.
+        //
+        // The first parameter is an array of patterns.  Each pattern is
+        // an array of integers whose length is equal to the number of
+        // endpoints.  Each integer in a pattern indicates the message
+        // that must be received on the corresponding endpoint for that
+        // pattern to match.  (All elements of a pattern must match for
+        // the pattern to match.)  Possible pattern entries include:
+        //
+        //   > 1: wait for a message with this tag on this endpoint
+        //     1: wait for any message on this endpoint
+        //     0: don't wait on this endpoint
+        //    -1: wait for channel closed
+        //  < -1: illegal
+        //
+        // The second parameter contains ISelectable objects.
+        //
+        // The return value is the index of the pattern that matched or -1
+        // if a match is impossible.
+        //
+        // the setMatch out parameter is used to indicate which object of an underlying
+        // set was part of the match.
+        //
+        // We add an extra integer parameter that represents the timeout value (in milliseconds)
+        // The timeout value is passed to the function call to SyncHandle.WaitXXXX in appropriate type
+        //
+        // NOTE: the endpoint array may contain more elements than the pattern refers to
+        //       thus the patterns 2nd level array Lengths is the indication how many endpoints are actually used.
+        //
+
+        public static int Select(int[][]! patterns, ISelectable[]! endpoints, 
+                                 out object setMatch, System.TimeSpan timeOutAfter)
+        {
+            Thread currentThread = (!)Thread.CurrentThread;
+
+            try 
+              // Give back cache (caller should do this, but we do it here for now)
+              // we assume that caller does not use this for any other purpose
+              // true for the generated code, but might not be true for other Select
+              // uses.
+            {
+
+                Monitoring.Log(Monitoring.Provider.Endpoint,
+                               (ushort)EndpointEvent.Select);
+                           
+                int numCases = patterns.Length;
+                if (numCases == 0) {
+                    setMatch = null;
+                    return -1;
+                }
+
+                int numEndpoints = ((!)patterns[0]).Length;
+
+                #region Debugging asserts
+#if DEBUG_SELECT
+                for (int i = 0; i < numCases; i++) {
+                    if (((!)patterns[i]).Length != numEndpoints) {
+                        throw new ArgumentException("Invalid pattern size.");
+                    }
+                }
+#endif
+                #endregion
+
+                SyncHandle[] handles = null;
+                bool[] possible = null;
+
+                try 
+                    // Give back thread local resources.
+                {
+                    possible = (!)currentThread.PopSelectBools(numCases);
+
+                    for (int i = 0; i < numCases; i++) {
+                        possible[i] = true;
+                    }
+
+                    int match = -1;
+                    int hint = -1;
+                    int numPossible = numCases;
+                    setMatch = null;
+
+                    SchedulerTime deadline = (timeOutAfter.Ticks == 0)?SchedulerTime.MinValue:SchedulerTime.Now + timeOutAfter;
+            
+                    while (numPossible > 0 &&
+                           ! FindRowMatch(hint, endpoints, patterns, possible,
+                                          ref numPossible,
+                                          out match,
+                                          out setMatch))
+                    {
+                        
+                        // only wait if last FindMatch didn't decrement numPossible to 0.
+                        if (numPossible > 0) {
+
+                            // Optimization
+                            //   If timeout is 0 and we got here, then we will definitely
+                            //   take the timeout. So let's not call Wait at all
+                            if (timeOutAfter.Ticks == 0) {
+                                setMatch = null;
+                                return Endpoint.TimeOutIndex;
+                            }
+
+                            // special case case where we have 1 endpoint.
+                            if (numEndpoints == 1) {
+                                hint = 0;
+                                bool gotTimeout = ! SyncHandle.WaitOne(((!)endpoints[0]).GetWaitHandle(), deadline);
+                                if (gotTimeout) {
+                                    setMatch = null;
+                                    return Endpoint.TimeOutIndex;
+                                }
+                            }
+                            else {
+                                if (handles == null) {
+                                    // initialize
+                                    handles = (!)currentThread.PopSelectSyncHandles(numEndpoints);
+                                    for (int i = 0; i < numEndpoints; i++) {
+                                        handles[i] = ((!)endpoints[i]).GetWaitHandle();
+                                    }
+                                }
+                                
+                                hint = WaitAnyEndpoint(handles, numEndpoints, deadline);
+                        
+                                // if the return value is WaitHandle.WaitTimeOut (-1),
+                                // then we know it is timeout
+                                // currently, we check for all out of range cases.
+                                if (hint <0 || hint > numEndpoints) {
+                                    setMatch = null;
+                                    return Endpoint.TimeOutIndex;
+                                }
+                            }
+                        }
+                    }
+                    return match;
+                }
+                finally 
+                {
+                    // return thread local resources
+                    if (possible != null) {
+                        currentThread.PushSelectBools(possible);
+                    }
+                    if (handles != null) {
+                        currentThread.PushSelectSyncHandles(handles);
+                    }
+                }
+            }
+            finally 
+            {
+                // return thread local resources
+                currentThread.PushSelectObjects(endpoints);            
+            }
+        }
+
+        // End Bugfix 167
+        
+        /// <summary>
+        /// If hint &lt; 0, scan all patterns for a match. Otherwise, hint specifies which
+        /// endpoint changed. Thus only that column has to be reexamined.
+        /// If we find a row that matches, we return the row index, and true.
+        /// Updates possibleCount and possible array. When possibleCount goes down to
+        /// 0, no more matches are possible.
+        /// match is set to -1 when false is returned.
+        /// </summary>
+        private static bool FindRowMatch(int hint, ISelectable[]! endpoints, int[][]! patterns,
+                                        bool[]! possible, ref int possibleCount, out int match,
+                                        out object setMatch)
+        {
+            int numRows = patterns.Length;
+            setMatch = null;
+
+            if (hint < 0) {
+                // scan all patterns
+                for (int i = 0; i < numRows; i++) {
+                    if (possible[i]) {
+                        if (RowMatches(endpoints, (!)patterns[i], out setMatch, ref possible[i])) {
+                            match = i;
+                            return true;
+                        }
+
+                        if ( ! possible[i] ) {
+                            // i no longer possible
+                            possibleCount--;
+                        }
+                    }
+                }
+
+                match = -1;
+                return false;
+            }
+            else {
+                // hint tells us which column to scan
+                for (int i = 0; i < numRows; i++) {
+                    
+                    if (possible[i]) {
+                        int pat = ((!)patterns[i])[hint];
+
+                        if (pat != 0) {
+                            if (((!)endpoints[hint]).HeadMatches(pat, ref possible[i], ref setMatch)) {
+                                // matches. Check rest of this row
+                                if (RowMatches(endpoints, (!)patterns[i], out setMatch, ref possible[i])) {
+                                    // found a match.
+                                    match = i;
+                                    return true;
+                                }
+                            }
+                            if ( ! possible[i] ) {
+                                // i no longer possible
+                                possibleCount--;
+                            }
+                        }
+                    }
+                }
+                match = -1;
+                return false;
+            }
+        }
+
+        // This method determines whether a given pattern row has been matched.
+        // It also indicates whether a match is possible in the future.
+        // If the row involves an endpoint set, the particular endpoint in the set
+        // that matches is returned in setMatch. Note there can be at most one
+        // endpoint set per row pattern.
+        //
+        private static bool RowMatches(ISelectable[]! endpoints, int[]! conjuncts,
+                                      out object setMatch,
+                                      ref bool possible)
+        {
+            setMatch = null;
+            int numEndpoints = conjuncts.Length;
+
+            for (int i = 0; i < numEndpoints; i++)
+            {
+                int tag = conjuncts[i];
+                if (tag != 0) {
+                    if (! ((!)endpoints[i]).HeadMatches(tag, ref possible, ref setMatch)) {
+                        return false;
+                    }
+                }
+                // Otherwise, we don't care about this endpoint (conjunct[i] pattern == 0),
+                // so anything is fine.
+            }
+            return true;
+        }
+
+        // Wait on all endpoints that have not yet received a message.
+        // This function returns when any of these endpoints gets a
+        // new message.
+        unsafe private static int WaitAnyEndpoint(SyncHandle[]! handles, int handleCount)
+        {
+            // Debug.Assert(handles.Length > 0, "Can't wait on no handles");
+
+            fixed (SyncHandle* start = &handles[0]) {
+                return SyncHandle.WaitAny(start, handleCount);
+            }
+        }
+
+        // Bugfix 167 by SXIA -- duplicate a version of WaitAnyEndpoint, adding a timeout deadline
+        // Same as above, with an extra timeout (stop) parameter
+        unsafe private static int WaitAnyEndpoint(SyncHandle[]! handles, int handleCount,
+                                                  System.SchedulerTime deadline)
+        {
+            // Debug.Assert(handles.Length > 0, "Can't wait on no handles");
+
+            fixed (SyncHandle* start = &handles[0]) {
+                return SyncHandle.WaitAny(start, handleCount, deadline);
+            }
+        }
+        // End Bugfix 167
+        
+        
+        /// <summary>
+        /// Return a uint tag uniquely identifying the contract
+        /// which endpoint "ep" adheres to.
+        /// XXX: HACK: austind: this isn't 64-bit clean, nor is the
+        /// tag returned particularly stable (it depends on the
+        /// order in which types and handles are allocated).  Ideally we
+        /// would use the SystemType's MD5 hash, but we can't access
+        /// it here; is this correct, MAF?
+        /// </summary>
+        unsafe private static uint getContractTag(Endpoint*! in ExHeap ep)
+        {
+            UIntPtr runtimeSystemTypeHandle =
+                SharedHeapService.GetType((Allocation*)ep);
+            return (uint)runtimeSystemTypeHandle;
+        }
+
+        /// <summary>
+        /// Called whenever a message is retrieved from on an endpoint.
+        /// </summary>
+        public static void RetrieveHook(ref Endpoint receiver, uint channelId, int messageTag)
+        {
+#if MONITORING
+            Monitoring.Log(Monitoring.Provider.Endpoint,
+                           (ushort)EndpointEvent.RetrieveHook, 0,
+                           (uint)messageTag, channelId,
+                           receiver.contractTag, 0, 0);
+#endif
+        }
+
+        /// <summary>
+        /// Called whenever a message is retrieved from an endpoint. The "this" parameter
+        /// is the receiving endpoint. In order to get a pointer to the descriptor block
+        /// that includes a pointer to the system type, we use the funky this.Peer->Peer
+        /// expression.
+        /// </summary>
+        [Conditional("DEBUG")]
+        protected void RetrieveHookInternal(int messageTag) {
+            RetrieveHook(ref this, (uint)this.ChannelID, messageTag);
+        }
+
+        /// <summary>
+        /// Called whenever a message is actually on an endpoint.
+        /// </summary>
+        public static void DeliverHook(ref Endpoint receiver, uint channelId, int messageTag)
+        {
+#if MONITORING
+            Monitoring.Log(Monitoring.Provider.Endpoint,
+                           (ushort)EndpointEvent.DeliverHook, 0,
+                           (uint)messageTag, channelId,
+                           receiver.peerContractTag, 0, 0);
+#endif
+        }
+
+
+        /// <summary>
+        /// Called whenever a message is delivered on an endpoint. The "this" parameter
+        /// is the receiving endpoint, but the static ReceiveHook is called with the
+        /// sender.
+        /// </summary>
+        [Conditional("DEBUG")]
+        protected void DeliverHookInternal(int messageTag) {
+            DeliverHook(ref this, (uint)this.ChannelID, messageTag);
+        }
+
+
+        new unsafe public void MarshallMessage(byte*! basep, byte*! source,
+                                               int*! tagAddress, System.Type! type)
+        {
+            // assert type!=null;
+#if PAGING
+            EndpointCore.MarshallMessage(ref this, 
+                                         basep, source, tagAddress, Marshal.StructSize(type));
+#else
+            DebugStub.WriteLine("MarshallMessage source offset:{0:x} tagLoc offset:{1:x} type:{2}",
+                                __arglist((uint)source-(uint)basep,
+                                          (uint)tagAddress-(uint)basep,
+                                          type.FullName));
+#endif
+        }
+
+        new unsafe public void MarshallPointer(byte*! basep, void**! target, System.Type! type) {
+            // assert type!=null;
+            if (*target == null) return;
+#if PAGING
+            EndpointCore.MarshallPointer(ref this,
+                                         basep, (byte**)target, type.GetSystemType());
+#else
+            DebugStub.WriteLine("MarshallPointer source offset:{0:x} type:{1}",
+                                __arglist((uint)target-(uint)basep, type.FullName));
+#endif
+        }
+
+    }
+}
+
+
+
diff --git a/base/Kernel/SingSharp.Runtime/ExHeap.sg b/base/Kernel/SingSharp.Runtime/ExHeap.sg
new file mode 100644
index 0000000..49cf801
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/ExHeap.sg
@@ -0,0 +1,144 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ExHeap.sg
+//
+//  Note: This is the KERNEL version of the ExHeap custom allocator.
+//
+
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Channels {
+
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.V1.Types;
+    using EndpointCore = Microsoft.Singularity.V1.Services.EndpointCore;
+
+    public class ExHeap : CustomAllocator {
+
+        unsafe public static void*! in ExHeap Allocate(Type! type)
+        {
+            int size = Marshal.StructSize(type);
+#if SINGULARITY
+            SystemType st = type.GetSystemType();
+            Tracing.Log(Tracing.Debug, "ExHeap.Allocate {0} size {1:x} type {2:x}",
+                        type.FullName, (UIntPtr)unchecked((uint)size),
+                        st.TypeId);
+#else
+            Console.WriteLine("ExHeap.Allocate {0} of size {1}", type.FullName, size);
+            SystemType st = new SystemType();
+#endif
+            SharedHeapService.Allocation* ptr = SharedHeapService.Allocate((UIntPtr)size, st, 0);
+#if SINGULARITY_KERNEL
+            Tracing.Log(Tracing.Debug, "  result = {0:x8}", Kernel.AddressOf(ptr));
+#elif SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug, "  result = {0:x8}", (UIntPtr)ptr);
+#endif // SINGULARITY_PROCESS
+            if (ptr == null) throw new OutOfMemoryException("SharedHeap.Allocate returned null");
+            return (void* in ExHeap)ptr;
+        }
+
+        unsafe public static void* opt(ExHeap[])! AllocateVector(Type! type, int elems)
+        {
+            ulong elemSize = (ulong)Marshal.StructSize(type);
+#if SINGULARITY
+            SystemType st = type.GetSystemType();
+            Tracing.Log(Tracing.Debug, "ExHeap.AllocateVector {0} size {1:x} type {2:x}",
+                        type.FullName, (UIntPtr)unchecked(elemSize * (ulong)elems),
+                        st.TypeId);
+#else
+            SystemType st = new SystemType();
+#endif
+            checked {
+                SharedHeapService.Allocation* ptr =
+                    SharedHeapService.Allocate( (UIntPtr)(elemSize * (ulong)elems), st, 0);
+
+                if (ptr == null) throw new OutOfMemoryException("SharedHeap.Allocate returned null");
+#if SINGULARITY
+                Tracing.Log(Tracing.Debug, "  result = {0:x8}", (UIntPtr)ptr);
+#endif
+                return (void* opt(ExHeap[]))ptr;
+            }
+        }
+
+        unsafe public static void Free([Claims] void* in ExHeap ptr)
+        {
+            // Should adhere to contract. ptr can be null.
+            if (ptr == null) return;
+
+#if SINGULARITY_KERNEL
+            Tracing.Log(Tracing.Debug, "ExHeap.Free: {0:x8}", Kernel.AddressOf(ptr));
+#elif SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug, "ExHeap.Free: {0:x8}", (UIntPtr)ptr);
+#endif // SINGULARITY_PROCESS
+            SharedHeapService.Allocation* alloc = (SharedHeapService.Allocation*)ptr;
+            SystemType epType = typeof(Endpoint).GetSystemType();
+            if (SystemType.IsSubtype(alloc, epType)) {
+                EndpointCore.Free(alloc);
+            }
+            else {
+                SharedHeapService.Free(alloc);
+            }
+        }
+
+        unsafe public static bool IsInst(void* in ExHeap ptr, System.Type! targetType)
+        {
+#if SINGULARITY
+            SystemType targetst = targetType.GetSystemType();
+            SharedHeapService.Allocation* alloc = (SharedHeapService.Allocation*)ptr;
+            return SystemType.IsSubtype(alloc, targetst);
+#else
+            return false;
+#endif
+        }
+
+        unsafe public static UIntPtr GetSize(void* in ExHeap ptr)
+        {
+            SharedHeapService.Allocation* alloc = (SharedHeapService.Allocation*)ptr;
+            return SharedHeapService.GetSize(alloc);
+        }
+
+        unsafe public static void* IndirectToData(void* in ExHeap ptr)
+        {
+            SharedHeapService.Allocation* alloc = (SharedHeapService.Allocation*)ptr;
+            UIntPtr data = SharedHeapService.GetData(alloc);
+#if DEBUG
+            if (data == UIntPtr.Zero) throw new ApplicationException("SharedHeapService.GetData returned 0");
+#endif
+            void* result = (void*!)data;
+            return result;
+        }
+
+        unsafe public static void*! in ExHeap Share(void* in ExHeap ptr) {
+            SharedHeapService.Allocation* alloc = (SharedHeapService.Allocation*)ptr;
+            UIntPtr size = SharedHeapService.GetSize(alloc);
+            return (void*! in ExHeap)SharedHeapService.Share(alloc, (UIntPtr)0, size);
+        }
+    }
+
+    /// <summary>
+    /// Specialized entry point for allocating endpoints rather than other exchangeable objects
+    /// </summary>
+    class ChannelHeap : CustomAllocator {
+
+        unsafe public static void*! in ExHeap Allocate(Type! type)
+        {
+            uint size = (uint)Marshal.StructSize(type);
+            Tracing.Log(Tracing.Debug, "EndpointHeap.Allocate {0} with size {1:x}",
+                        type.FullName, (UIntPtr)size);
+
+            SystemType st = type.GetSystemType();
+            SharedHeapService.Allocation* ptr = EndpointCore.Allocate(size, st);
+            if (ptr == null) throw new OutOfMemoryException("EndpointCore.Allocate returned null");
+            return (void* in ExHeap)ptr;
+        }
+
+    }
+}
diff --git a/base/Kernel/SingSharp.Runtime/ExRef.sg b/base/Kernel/SingSharp.Runtime/ExRef.sg
new file mode 100644
index 0000000..366c5ea
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/ExRef.sg
@@ -0,0 +1,101 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   XRef.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Channels
+{
+    using System.Threading;
+    using Allocation = Microsoft.Singularity.Memory.SharedHeap.Allocation;
+
+    public sealed class ExRef<T> where T : unmanaged struct, ITracked
+    {
+        unsafe T* opt(ExHeap) obj;
+        Mutex mutex;
+
+        public ExRef([Claims] T* opt(ExHeap)! i_obj, bool synchronized)
+        {
+            if (i_obj == null) {
+                throw new ArgumentNullException("ExRef must be initialized with a non-null value!");
+            }
+            i_obj->Release();
+            obj = i_obj;
+            if (synchronized) {
+                this.mutex = new Mutex();
+            }
+        }
+
+        // invariant:
+        //   If mutex is held, thread holding mutex is
+        //   responsible for calling Release during that time,
+        //   the obj slot is empty and if the thread tries to
+        //   acquire it again, an exception is thrown.
+
+        /// <summary>
+        /// Will block until the ExRef is free.
+        /// </summary>
+        /// <returns>Acquired tracked type protected by ExRef</returns>
+        public T* opt(ExHeap)! Acquire()
+        {
+            if (this.mutex != null) {
+                this.mutex.WaitOne();
+            }
+            T* opt(ExHeap) elem = this.obj;
+            if (elem == null) {
+                throw new ApplicationException("thread already holds ExRef!");
+            }
+            elem->Acquire();
+            this.obj = null;
+            return elem;
+        }
+
+        /// <summary>
+        /// Releases tracked data into the ExRef so other
+        /// threads can access it.
+        /// </summary>
+        /// <param name="newObj">tracked data to be released</param>
+        public void Release([Claims] T* opt(ExHeap)! newObj)
+        {
+            if (newObj == null) {
+                throw new ArgumentNullException("ExRef must be released with a non-null value!");
+            }
+
+            T* opt(ExHeap) elem = this.obj;
+            if (elem != null) {
+                throw new ApplicationException("Releasing into occupied slot!");
+            }
+
+            newObj->Release();
+            obj = newObj;
+            if (this.mutex != null) {
+                this.mutex.ReleaseMutex();
+            }
+        }
+
+        /// <summary>
+        /// Finalizer to dispose of any left over contents
+        /// </summary>
+        ~ExRef()
+        {
+            T* opt(ExHeap) toDelete = this.obj;
+            if (toDelete != null) {
+                this.obj = null;
+                unsafe {
+                    toDelete->Dispose(); // Explicit call needed due to generics
+                }
+                delete toDelete;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/SingSharp.Runtime/Microsoft.SingSharp.Runtime.App.csproj b/base/Kernel/SingSharp.Runtime/Microsoft.SingSharp.Runtime.App.csproj
new file mode 100644
index 0000000..9a5edee
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Microsoft.SingSharp.Runtime.App.csproj
@@ -0,0 +1,74 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj
+#
+#   Note:   This project builds the copy of Microsoft.SingSharp.Runtime.dll
+#           that applications use (executables outside of the kernel).
+#
+#
+##############################################################################
+
+Notes:
+
+This assembly is one of the more difficult ones to get to build correctly.
+Ordinarily, SGC implicitly adds a reference to this assembly; after all, it's
+part of the runtime environment that Sing# provides..  So, since we're building
+this assembly, we certainly don't want to reference the same assembly.
+To prevent this from happening, we must pass the /nostdlib flag.
+
+However, we do need to reference the standard library, Corlib.dll.  To do this,
+we ALSO pass /stdlib:...\Corlib.dll to SGC.  We achieve this by setting 
+NoStdLib=false, so that App.targets and SingSharp.targets will build and pass the 
+/stdlib flag.
+But that means that the /nostdlib flag will NOT be passed.  So we use the
+ExtraCompilerFlags property to sneak in /nostdlib, as well.  Not pretty.
+
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>Microsoft.SingSharp.Runtime</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants>NOOWNERSHIPCHECK;NODEFAULTLIB</DefineConstants>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Attributes.cs"/>
+    <Compile Include="Bitter.sg"/>
+    <Compile Include="Classes.ssc"/>
+    <Compile Include="CustomAllocator.sg"/>
+    <Compile Include="ESet.sg"/>
+    <Compile Include="Endpoint.sg"/>
+    <Compile Include="EMap.sg"/>
+    <Compile Include="ExHeap.sg"/>
+    <Compile Include="ExRef.sg"/>
+    <Compile Include="StateStack.sg"/>
+    <Compile Include="TContainer.sg"/>
+    <Compile Include="TQueue.sg"/>
+    <Compile Include="TRef.sg"/>
+    <Compile Include="VectorQueue.sg"/>
+    <Compile Include="AssemblyInfo.cs"/>
+    <Compile Include="Reflection\Attributes.cs"/>
+    <Compile Include="Reflection\Classes.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj"/>
+    <ProjectReference Include="..\System.Compiler.Runtime\System.Compiler.Runtime.App.csproj"/>
+    <ProjectReference Include="..\App.Corlib.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\AppRuntime.targets"/>
+
+</Project>
+
diff --git a/base/Kernel/SingSharp.Runtime/Microsoft.SingSharp.Runtime.Kernel.csproj b/base/Kernel/SingSharp.Runtime/Microsoft.SingSharp.Runtime.Kernel.csproj
new file mode 100644
index 0000000..5e0de73
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Microsoft.SingSharp.Runtime.Kernel.csproj
@@ -0,0 +1,66 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<!--
+
+This assembly is the Sing# Runtime.
+It is referenced by SGC and by Bartok.
+It is never referenced by CSC.
+
+However, it is important to note that the SGC compiler will implicitly
+reference this library, when /platform:cli,$(DIR) is set.  Therefore,
+you don't want to pass /r:Microsoft.SingSharp.Runtime.dll to SGC when
+compiling other projects.  This is why the ExcludeFromILReferences
+property is set to true; this prevents projects that refer to this 
+project from adding a /r: reference to this library.
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Microsoft.SingSharp.Runtime</AssemblyName>
+    <DefineConstants>NOOWNERSHIPCHECK</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <NoStdLib>true</NoStdLib>
+    <ExcludeFromILReferences>true</ExcludeFromILReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Attributes.cs" />
+    <Compile Include="Bitter.sg" />
+    <Compile Include="Classes.ssc" />
+    <Compile Include="CustomAllocator.sg" />
+    <Compile Include="ESet.sg" />
+    <Compile Include="Endpoint.sg" />
+    <Compile Include="EMap.sg" />
+    <Compile Include="ExHeap.sg" />
+    <Compile Include="ExRef.sg" />
+    <Compile Include="StateStack.sg" />
+    <Compile Include="TContainer.sg" />
+    <Compile Include="TQueue.sg" />
+    <Compile Include="TRef.sg" />
+    <Compile Include="VectorQueue.sg" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Reflection\Attributes.cs" />
+    <Compile Include="Reflection\Classes.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Compiler.Runtime\System.Compiler.Runtime.Kernel.csproj" />
+    <ProjectReference Include="..\Kernel.Corlib.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+
+</Project>
diff --git a/base/Kernel/SingSharp.Runtime/Reflection/Attributes.cs b/base/Kernel/SingSharp.Runtime/Reflection/Attributes.cs
new file mode 100644
index 0000000..ea49164
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Reflection/Attributes.cs
@@ -0,0 +1,118 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace Microsoft.SingSharp.Reflection{
+	public class AttributePatternAttribute : Attribute {
+		Object type;
+		public Object Type {
+			get { return type; }
+			set { type = value; }
+		}
+
+		object[] expressions;
+		public object[] Expressions{
+			get { return expressions; }
+			set { expressions = value; }
+		}
+	}
+
+	public class ForAllStatementIndex : Attribute {
+		public ForAllStatementIndex(int index) {}
+	}
+
+	public class ForAllSummaryAttribute : Attribute {
+		public ForAllSummaryAttribute(string summary){}
+	}
+	
+	public class ReflectionAttribute : Attribute {
+        public enum Type {
+            None,
+            Index,
+            IndexMap,
+            Generate,
+            Implement,
+            Container,
+            NodeMap,
+            Pattern,
+            Subtype,
+            Shadow,
+            Reflective,
+            ExpressionBinding,
+            Scope,
+        }
+		public ReflectionAttribute(Type type){}
+		
+		uint flags;
+		public uint Flags {
+			get {return flags; }
+			set {flags = value; }
+		}
+		
+	}
+
+	#region parameter attributes
+	[AttributeUsage(AttributeTargets.Parameter)]
+	public class ParameterPatternAttribute : Attribute {
+		string type;
+		public string Type{
+			get {return type; }
+			set {type = value; }
+		}
+		bool typeIsVariable;
+		public bool TypeIsVariable {
+			get {return typeIsVariable; }
+			set {typeIsVariable = value; }
+		}	
+	}
+
+	[AttributeUsage(AttributeTargets.Parameter)]
+	public class StarParameterPatternAttribute : ParameterPatternAttribute {}
+	#endregion
+
+	[AttributeUsage(AttributeTargets.Module | AttributeTargets.Assembly,
+                    AllowMultiple=true)]
+	public class TransformAttribute : Attribute {
+		public Type Transform;
+		public TransformAttribute(Type transformToRun) {
+			this.Transform = transformToRun;
+		}
+
+		string[] namespaces;
+		public string[] Namespaces {
+			get { return namespaces; }
+			set { namespaces = value; }
+		}
+		string [] files;
+		public string[] Files {
+			get { return files; }
+			set { files = value; }
+		}
+
+		Type[] types;
+		public Type[] Types {
+			get  { return types; }
+			set { types = Types; }
+		}
+	}
+	
+}
+
+#if CCINamespace
+namespace Microsoft.Cci.TypeExtensions {
+#else
+namespace System.Compiler.TypeExtensions {
+#endif
+	public interface IReflectionTransform {}
+  // scope pattern
+  public interface IReflectionScopePattern { }
+  // end scope pattern
+  public interface IReflectionContainer {}
+  public interface IReflectionTypeVariable {}
+}
diff --git a/base/Kernel/SingSharp.Runtime/Reflection/Classes.cs b/base/Kernel/SingSharp.Runtime/Reflection/Classes.cs
new file mode 100644
index 0000000..32ac2b8
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/Reflection/Classes.cs
@@ -0,0 +1,23 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+
+namespace Microsoft.SingSharp.Reflection{
+
+	class IClassDummy {}
+	class IInterfaceDummy {}
+	class IStructDummy {}
+	interface IFieldDummy {}
+	interface IMethodDummy {}
+	interface IPropertyDummy {}
+	interface IAttributeDummy {}
+	
+	class ForAllException : Exception {}
+}
diff --git a/base/Kernel/SingSharp.Runtime/StateStack.sg b/base/Kernel/SingSharp.Runtime/StateStack.sg
new file mode 100644
index 0000000..852ddcf
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/StateStack.sg
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StateStack.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.Channels {
+
+    public pointerfree struct StateStack {
+        public const int STATEBITS = 8;
+        public const int STATEMASK = (1 << STATEBITS) - 1;
+
+        private uint stack; // 4 x 8 bits for state of machine of this endpoint. Lowest bits = top of stack
+
+        public StateStack(int initialState) {
+          stack = (uint)initialState & STATEMASK;
+        }
+
+        public void Push(int i) {
+            stack = stack << STATEBITS | ((uint)i & STATEMASK);
+        }
+
+        public void Pop() {
+            stack = stack >> STATEBITS;
+        }
+
+        public void Set(int i) {
+            stack = (stack & (uint)~(uint)STATEMASK) | ((uint)i & STATEMASK);
+        }
+
+        [Pure]
+        public int Top() {
+            return (int)(stack & STATEMASK);
+        }
+    }
+}
diff --git a/base/Kernel/SingSharp.Runtime/TContainer.sg b/base/Kernel/SingSharp.Runtime/TContainer.sg
new file mode 100644
index 0000000..19db87e
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/TContainer.sg
@@ -0,0 +1,153 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TContainer.sg
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Channels
+{
+  using System.Threading;
+  
+  /// <summary>
+  /// TContainer is similar to TRef. It wraps ownership tracked objects (deriving from ITracked) so that
+  /// they can be stored in the GC heap.
+  /// </summary>
+  public sealed class TContainer<T> where T : class, ITracked
+  {
+    unsafe T obj;
+    Mutex! mutex;
+
+    public TContainer([Claims] T! i_obj)
+    {
+      if (i_obj == null) {
+        throw new ArgumentNullException("TContainer must be initialized with a non-null value!");
+      }
+      obj = i_obj;
+      i_obj.Release();
+      mutex = new Mutex();
+      base();
+    }
+
+    // invariant:
+    //   If mutex is held, thread holding mutex is responsible for calling Release
+    //   during that time, the obj slot is empty and if the thread tries to acquire it
+    //   again, an exception is thrown.
+
+    /// <summary>
+    /// Will block until the container is full.
+    /// </summary>
+    /// <returns>Acquired tracked type protected by TContainer</returns>
+    public T! Acquire()
+    {
+      mutex.WaitOne();
+      T elem = this.obj;
+      if (elem == null) {
+        throw new ApplicationException("thread already holds TRef!");
+      }
+      elem.Acquire();
+      this.obj = null;
+      return elem;
+    }
+
+    /// <summary>
+    /// Releases tracked data into the container so other threads can access it.
+    /// </summary>
+    /// <param name="newObj">tracked data to be released</param>
+    public void Release([Claims] T! newObj)
+    {
+      if (newObj == null) {
+        throw new ArgumentNullException("TContainer must be released with a non-null value!");
+      }
+      newObj.Release();
+      obj = newObj;
+      mutex.ReleaseMutex();
+    }
+    
+    
+    /// <summary>
+    /// Finalizer to dispose of any left over contents
+    /// </summary>
+    ~TContainer() {
+      ITracked toDelete = this.obj;
+      if (toDelete != null) {
+        this.obj = null;
+        toDelete.Dispose();
+      }
+    }
+  }
+
+
+  /// <summary>
+  /// VContainer are TContainers for vectors without tracked contents in the shared heap.
+  /// </summary>
+  public sealed class VContainer<T> where T : unmanaged struct
+  {
+    unsafe T[] in ExHeap obj;
+    Mutex! mutex;
+
+    public VContainer([Claims] T[]! in ExHeap i_obj)
+    {
+      if (i_obj == null) {
+        throw new ArgumentNullException("TContainer must be initialized with a non-null value!");
+      }
+      obj = i_obj;
+      mutex = new Mutex();
+      base();
+    }
+
+    // invariant:
+    //   If mutex is held, thread holding mutex is responsible for calling Release
+    //   during that time, the obj slot is empty and if the thread tries to acquire it
+    //   again, an exception is thrown.
+
+    /// <summary>
+    /// Will block until the container is full.
+    /// </summary>
+    /// <returns>Acquired tracked type protected by TContainer</returns>
+    public T[]! in ExHeap Acquire()
+    {
+      mutex.WaitOne();
+      T[] in ExHeap elem = this.obj;
+      if (elem == null) {
+        throw new ApplicationException("thread already holds TRef!");
+      }
+      this.obj = null;
+      return elem;
+    }
+
+    /// <summary>
+    /// Releases tracked data into the container so other threads can access it.
+    /// </summary>
+    /// <param name="newObj">tracked data to be released</param>
+    public void Release([Claims] T[]! in ExHeap newObj)
+    {
+      if (newObj == null) {
+        throw new ArgumentNullException("TContainer must be released with a non-null value!");
+      }
+      obj = newObj;
+      mutex.ReleaseMutex();
+    }
+    
+    
+    /// <summary>
+    /// Finalizer to dispose of any left over contents
+    /// </summary>
+    ~VContainer() {
+      T[] in ExHeap toDelete = this.obj;
+      if (toDelete != null) {
+        this.obj = null;
+        delete toDelete;
+      }
+    }
+  }
+
+}
diff --git a/base/Kernel/SingSharp.Runtime/TQueue.sg b/base/Kernel/SingSharp.Runtime/TQueue.sg
new file mode 100644
index 0000000..a85a77d
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/TQueue.sg
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TQueue.sg
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Channels {
+
+    public class TQueue<T> : ITracked where T : ITracked {
+
+        private Node! listSentinel;
+
+        public TQueue() {
+            this.listSentinel = new Node();
+            base();
+        }
+
+        private class Node {
+            unsafe internal T data;
+
+            internal Node! next;
+            internal Node! prev;
+
+            internal Node() {
+                this.next = this;
+                this.prev = this;
+            }
+
+            internal Node([Claims] T! arg) {
+                this.next = this;
+                this.prev = this;
+                this.data = arg;
+            }
+
+            internal T Unlink() {
+                this.prev.next = this.next;
+                this.next.prev = this.prev;
+                this.next = this;
+                this.prev = this;
+                return this.data;
+            }
+
+            internal void LinkAsNext([Claims] T! data) {
+                Node next = new Node(data);
+                next.next = this.next;
+                this.next = next;
+                next.prev = this;
+                next.next.prev = next;
+            }
+
+            internal void LinkAsPrev([Claims] T! data) {
+                Node prev = new Node(data);
+                prev.prev = this.prev;
+                this.prev = prev;
+                prev.next = this;
+                prev.prev.next = prev;
+            }
+        }
+
+        #region ITracked members
+
+        void ITracked.Release() {}
+        void ITracked.Acquire() {}
+        public void Dispose()
+        {
+            Node current = this.listSentinel.next;
+            while (current != this.listSentinel) {
+                T! data = (!)current.data;
+                data.Dispose();
+                current = current.next;
+            }
+            this.listSentinel = new Node();
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+        #endregion
+
+        public void AddHead([Claims] T! data) {
+            this.listSentinel.LinkAsNext(data);
+        }
+
+        public void AddTail([Claims] T! data) {
+            this.listSentinel.LinkAsPrev(data);
+        }
+
+        public bool Empty { get { return this.listSentinel.next == this.listSentinel; } }
+
+        public T ExtractHead() {
+            // Checking if list is empty
+            // and returning null causes the compiler to warn
+            // that return value can't be null (?).
+            //
+            // The following code works correctly whether the
+            // queue is empty or not.
+            Node candidate = this.listSentinel.next;
+            return candidate.Unlink();
+        }
+
+        public T ExtractTail() {
+            // Checking if list is empty
+            // and returning null causes the compiler to warn
+            // that return value can't be null (?).
+            //
+            // The following code works correctly whether the
+            // queue is empty or not.
+            Node candidate = this.listSentinel.prev;
+            return candidate.Unlink();
+        }
+    }
+}
diff --git a/base/Kernel/SingSharp.Runtime/TRef.sg b/base/Kernel/SingSharp.Runtime/TRef.sg
new file mode 100644
index 0000000..e3a7a9d
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/TRef.sg
@@ -0,0 +1,136 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TRef.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Channels
+{
+  using System.Threading;
+  using Allocation = Microsoft.Singularity.Memory.SharedHeap.Allocation;
+
+  /// <summary>
+  /// In order to capture the state of an endpoint when stored in a TRef, we
+  /// need to attach the state to the type itself, because instance types cannot have attributes.
+  ///
+  /// We use opt modifier types for this.
+  ///
+  /// The syntax is TRef&lt; C.Imp @(State) &gt;
+  /// </summary>
+  public sealed class TRef<T,State> where T : unmanaged struct, ITracked
+  {
+    unsafe T* opt(ExHeap) opt(State) obj;
+    Mutex! mutex;
+
+    public TRef([Claims] T* opt(ExHeap) opt(State)! i_obj)
+    {
+      if (i_obj == null) {
+        throw new ArgumentNullException("TRef must be initialized with a non-null value!");
+      }
+      i_obj->Release();
+#if SINGULARITY_KERNEL
+      // In the Kernel, TRefs are used sometimes to pass endpoints between threads
+      // of different processes. So we have to set it to the kernel on release.
+      unsafe {
+          Process kernelProcess = Process.KernelProcess;
+          Process currentProcess = Thread.CurrentProcess;
+          if ((kernelProcess != null) && (currentProcess != null)) {
+              i_obj = (T* opt(ExHeap) opt(State)!)EndpointCore.MoveEndpoint(
+                  currentProcess.ProcessSharedHeap, SharedHeap.KernelSharedHeap,
+                  kernelProcess, (Allocation*)i_obj);
+          }
+      }
+#endif
+      obj = i_obj;
+      this.mutex = new Mutex();
+    }
+
+    // invariant:
+    //   If mutex is held, thread holding mutex is responsible for calling Release
+    //   during that time, the obj slot is empty and if the thread tries to acquire it
+    //   again, an exception is thrown.
+
+    /// <summary>
+    /// Will block until the TRef is free.
+    /// </summary>
+    /// <returns>Acquired tracked type protected by TRef</returns>
+    public T* opt(ExHeap) opt(State)! Acquire()
+    {
+      this.mutex.WaitOne();
+      T* opt(ExHeap) opt(State) elem = this.obj;
+      if (elem == null) {
+        throw new ApplicationException("thread already holds TRef!");
+      }
+#if SINGULARITY_KERNEL
+      // In the Kernel, TRefs are used sometimes to pass endpoints between threads
+      // of different processes. So we have to set the new owner correctly.
+      unsafe {
+          Process currentProcess = Thread.CurrentProcess;
+          if (currentProcess != null) {
+              elem = (T* opt(ExHeap) opt(State)!)EndpointCore.MoveEndpoint(
+                  SharedHeap.KernelSharedHeap, currentProcess.ProcessSharedHeap,
+                  currentProcess, (Allocation*)elem);
+          }
+      }
+#endif
+      elem->Acquire();
+      this.obj = null;
+      return elem;
+    }
+
+    /// <summary>
+    /// Releases tracked data into the TRef so other threads can access it.
+    /// </summary>
+    /// <param name="newObj">tracked data to be released</param>
+    public void Release([Claims] T* opt(ExHeap) opt(State)! newObj)
+    {
+      if (newObj == null) {
+        throw new ArgumentNullException("TRef must be released with a non-null value!");
+      }
+      newObj->Release();
+#if SINGULARITY_KERNEL
+      // In the Kernel, TRefs are used sometimes to pass endpoints between threads
+      // of different processes. So we have to set it to the kernel on release.
+      unsafe {
+          Process kernelProcess = Process.KernelProcess;
+          Process currentProcess = Thread.CurrentProcess;
+          if ((kernelProcess != null) && (currentProcess != null)) {
+              newObj = (T* opt(ExHeap) opt(State)!)EndpointCore.MoveEndpoint(
+                  currentProcess.ProcessSharedHeap, SharedHeap.KernelSharedHeap,
+                  kernelProcess, (Allocation*)newObj);
+          }
+      }
+#endif
+      obj = newObj;
+      this.mutex.ReleaseMutex();
+    }
+
+    /// <summary>
+    /// Finalizer to dispose of any left over contents
+    /// </summary>
+    ~TRef() {
+      T* opt(ExHeap) opt(State) toDelete = this.obj;
+      if (toDelete != null) {
+        this.obj = null;
+        unsafe {
+#if SINGULARITY_KERNEL
+          Tracing.Log(Tracing.Audit, "TRef finalizing {0:x}", (UIntPtr)toDelete);
+#endif
+          toDelete->Dispose(); // Explicit call needed due to generics
+        }
+        delete toDelete;
+      }
+    }
+
+  }
+}
diff --git a/base/Kernel/SingSharp.Runtime/VectorQueue.sg b/base/Kernel/SingSharp.Runtime/VectorQueue.sg
new file mode 100644
index 0000000..3cd7a7f
--- /dev/null
+++ b/base/Kernel/SingSharp.Runtime/VectorQueue.sg
@@ -0,0 +1,117 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   VectorQueue.sg
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Channels {
+
+    public class VectorQueue<T> : ITracked where T:unmanaged struct {
+
+        private Node! listHead;
+        private Node! listTail;
+
+        public VectorQueue() {
+            Node node = this.listHead = new Node();
+            this.listTail = node;
+            base();
+        }
+
+        private class Node {
+            unsafe internal T[] in ExHeap data;
+
+            internal Node! next;
+            internal Node! prev;
+
+            internal Node() {
+                this.next = this;
+                this.prev = this;
+            }
+            
+            internal Node([Claims] T[]! in ExHeap arg) {
+                this.next = this;
+                this.prev = this;
+                this.data = arg;
+            }
+
+            internal T[] in ExHeap Unlink() {
+                this.prev.next = this.next;
+                this.next.prev = this.prev;
+                this.next = this;
+                this.prev = this;
+                return this.data;
+            }
+
+            internal void LinkAsNext([Claims] T[]! in ExHeap data) {
+                Node next = new Node(data);
+                next.next = this.next;
+                this.next = next;
+                next.prev = this;
+                next.next.prev = next;
+            }
+
+            internal void LinkAsPrev([Claims] T[]! in ExHeap data) {
+                Node prev = new Node(data);
+                prev.prev = this.prev;
+                this.prev = prev;
+                prev.next = this;
+                prev.prev.next = prev;
+            }
+        }
+
+        #region ITracked members
+
+        void ITracked.Release() {}
+        void ITracked.Acquire() {}
+        public void Dispose()
+        {
+            Node current = this.listHead.next;
+            while (current != this.listHead) {
+                // temporary hack until we fix the upcast in receiver context
+                unsafe {
+                    T[] in ExHeap data = current.data;
+                    delete data;
+                }
+                current = current.next;
+            }
+            this.listTail = this.listHead = new Node();
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+
+        #endregion
+
+        public void AddHead([Claims] T[]! in ExHeap data) {
+            this.listHead.LinkAsNext(data);
+        }
+
+        public void AddTail([Claims] T[]! in ExHeap data) {
+            this.listTail.LinkAsPrev(data);
+        }
+
+        public bool Empty { get { return this.listHead.next == this.listTail; } }
+
+
+        public T[] in ExHeap ExtractHead() {
+            if (this.Empty) return null;
+            Node candidate = this.listHead.next;
+            return candidate.Unlink();
+        }
+
+        public T[] in ExHeap ExtractTail() {
+            if (this.Empty) return null;
+            Node candidate = this.listTail.prev;
+            return candidate.Unlink();
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity.Diagnostics/ChannelModule.sg b/base/Kernel/Singularity.Diagnostics/ChannelModule.sg
new file mode 100644
index 0000000..c845e43
--- /dev/null
+++ b/base/Kernel/Singularity.Diagnostics/ChannelModule.sg
@@ -0,0 +1,200 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelModule.sg
+//  Note:   Channel diagnostic module
+//
+
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Directory;
+using System;
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    using SystemType = Microsoft.Singularity.V1.Types.SystemType;
+
+    public class ChannelModule
+    {
+        private void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels.
+            DirectoryServiceContract.Imp! epNS = DirectoryService.NewClientEndpoint();
+
+            try
+            {
+                epNS.SendRegister(Bitter.FromString2(ChannelContract.ModuleName), nsImp);
+
+                switch receive
+                {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, ErrorCode error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the Channel Diagnostic module.\n");
+                        if (rejectedEP != null) {
+                            delete rejectedEP;
+                        }
+                        delete nsExp;
+                        return;
+                }
+            }
+            finally
+            {
+                delete epNS;
+            }
+
+            // Here is the set of client channels we service
+            ESet<ChannelContract.Exp:ReadyState> epSet = new ESet<ChannelContract.Exp:ReadyState>();
+            while(true)
+            {
+                switch receive
+                {
+                    // ------------------------------- Requests for new connections
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people top give us ChannelContract.Exp instances
+                            ChannelContract.Exp newDiagEp = newEp as ChannelContract.Exp;
+
+                            if (newDiagEp == null)
+                            {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else
+                            {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newDiagEp.SendReady();
+                                epSet.Add(newDiagEp);
+                            }
+                        }
+                        break;
+
+                    // ------------------------------- Requests on existing connections
+                    //
+
+                    /// TODO: Move this to the Channel specific contract once we get there.
+                    case ep.GetChannels() in epSet :
+                        {
+                            ChannelInfo[]! in ExHeap channels = ChannelModule.GetChannelInfo();
+                            ep.SendChannels(channels);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetChannelStats() in epSet :
+                        {
+                            long msgs  = PerfCounters.MsgsSent; 
+                            long bytes = PerfCounters.BytesSent; 
+                            long chan  = PerfCounters.ChannelsCreated; 
+                            ep.SendChannelStats(msgs, bytes, chan);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.ChannelClosed() in epSet :
+                        {
+                            delete ep;
+                        }
+                        break;
+
+                    case epSet.Empty() && nsExp.ChannelClosed():
+                        // Exit this thread
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                }
+            }
+        }
+
+        private class ChannelInfoAccumulator
+        {
+            unsafe private ChannelInfo[]! in ExHeap infoVector;
+            private int used = 0;
+
+            [NotDelayed]
+            private ChannelInfoAccumulator()
+            {
+                this.infoVector = new[ExHeap] ChannelInfo[EndpointCore.OpenChannelCount];
+                base();
+                ((!)SharedHeap.KernelSharedHeap).EndpointOwnerId.Iterate(
+                    new SharedHeap.AllocationVisitor(this.Accumulate));
+
+            }
+
+            public static ChannelInfo[]! in ExHeap GetChannels() {
+                ChannelInfoAccumulator acc = new ChannelInfoAccumulator();
+                return acc.infoVector;
+            }
+
+            private unsafe void Accumulate(SharedHeap.Allocation* alloc)
+            {
+                SystemType endpointType = typeof(Endpoint).GetSystemType();
+
+                ChannelInfo[]! in ExHeap infoVector = this.infoVector;
+
+                if (SystemType.IsSubtype(alloc, endpointType))
+                {
+                    unsafe {
+                        // Note that we use Unchecked access here, since we don't
+                        // actually own this data.
+                        //
+                        UIntPtr data = SharedHeap.Allocation.GetDataUnchecked(alloc);
+                        EndpointCore*! ep = (!)(EndpointCore*)data;
+                        int id = ep->ChannelId;
+                        if (id > 0) {
+                            int index = this.used++;
+                            if (index >= infoVector.Length) {
+                                // more channels materialized after we allocated vector
+                                // skip the remaining ones
+
+                                // suck back ownership
+                                this.infoVector = infoVector;
+                                return;
+                            }
+                            infoVector[index].ChannelId = id;
+                            infoVector[index].ExpProcessId = ep->ProcessId;
+                            infoVector[index].ImpProcessId = ep->PeerProcessId;
+                            infoVector[index].MessagesDeliveredToExp = ep->ReceiveCount;
+                            infoVector[index].MessagesDeliveredToImp = ep->PeerReceiveCount;
+                        }
+                    }
+                }
+            }
+        }
+
+
+        public static ChannelInfo[]! in ExHeap GetChannelInfo() {
+            return ChannelInfoAccumulator.GetChannels();
+        }
+
+        internal static void Initialize()
+        {
+            ChannelModule module = new ChannelModule();
+            Thread thread = Thread.CreateThread(Thread.CurrentProcess,
+                                                new ThreadStart(module.Run));
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Diagnostics/Diagnostics.csproj b/base/Kernel/Singularity.Diagnostics/Diagnostics.csproj
new file mode 100644
index 0000000..5695c87
--- /dev/null
+++ b/base/Kernel/Singularity.Diagnostics/Diagnostics.csproj
@@ -0,0 +1,37 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Diagnostics</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStandardLibraries>true</NoStandardLibraries>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ChannelModule.sg" />
+    <Compile Include="Diagnostics.sg" />
+    <Compile Include="MemoryModule.sg" />
+    <Compile Include="ProcessModule.sg" />
+    <Compile Include="ProcMemInfoModule.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Hal\Hal.csproj" />
+    <ProjectReference Include="..\Singularity.Directory\Directory.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Diagnostics/Diagnostics.sg b/base/Kernel/Singularity.Diagnostics/Diagnostics.sg
new file mode 100644
index 0000000..b14b838
--- /dev/null
+++ b/base/Kernel/Singularity.Diagnostics/Diagnostics.sg
@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Diagnostics.sg
+//  Note:   The kernel diagnostics module
+//
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    public class DiagnosticsModule
+    {
+        public static void Initialize()
+        {
+            // NEW-STYLE INITIALIZATION (keep this)
+            ProcessModule.Initialize();
+            MemoryModule.Initialize();
+            ChannelModule.Initialize();
+            ProcMemInfoModule.Initialize();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Diagnostics/MemoryModule.sg b/base/Kernel/Singularity.Diagnostics/MemoryModule.sg
new file mode 100644
index 0000000..dcead9b
--- /dev/null
+++ b/base/Kernel/Singularity.Diagnostics/MemoryModule.sg
@@ -0,0 +1,336 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MemoryModule.sg
+//  Note:   Memory diagnostic module
+//
+
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Directory;
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    public class MemoryModule
+    {
+        private void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try
+            {
+                epNS.SendRegister(Bitter.FromString2(MemoryContract.ModuleName), nsImp);
+
+                switch receive
+                {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, ErrorCode error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the Memory Diagnostic module.\n");
+                        if (rejectedEP != null) {
+                            delete rejectedEP;
+                        }
+                        delete nsExp;
+                        return;
+                }
+            }
+            finally
+            {
+                delete epNS;
+            }
+
+            // Here is the set of client channels we service
+            ESet<MemoryContract.Exp:ReadyState> epSet = new ESet<MemoryContract.Exp:ReadyState>();
+
+            while(true)
+            {
+                switch receive
+                {
+                    // ------------------------------- Requests for new connections
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people to give us MemoryContract.Exp instances
+                            MemoryContract.Exp newDiagEp = newEp as MemoryContract.Exp;
+
+                            if (newDiagEp == null)
+                            {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else
+                            {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newDiagEp.SendReady();
+                                epSet.Add(newDiagEp);
+                            }
+                        }
+                        break;
+
+                    // ------------------------------- Requests on existing connections
+                    //
+                    // Don't forget that we're selecting MemoryContract endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.GetFreeMemory() in epSet :
+                        {
+                            ep.SendMemory((long)Microsoft.Singularity.Memory.MemoryManager.GetFreePhysicalMemory());
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetUsedMemory() in epSet :
+                        {
+                            ep.SendMemory((long)Microsoft.Singularity.Memory.MemoryManager.GetUsedPhysicalMemory());
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetMaxMemory() in epSet :
+                        {
+                            ep.SendMemory((long)Microsoft.Singularity.Memory.MemoryManager.GetMaxPhysicalMemory());
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetProcessUsedMemory(int processId) in epSet:
+                        {
+                            // REVIEW: This returns 0 bytes if the process ID is not recognized.
+                            long bytes = 0;
+                            Process proc = Process.GetProcessByID(processId);
+                            if (proc != null)
+                            {
+                                bytes = (long)proc.AllocatedMemory;
+                            }
+                            ep.SendMemory(bytes);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetProcessPeakMemory(int processId) in epSet:
+                        {
+                            // REVIEW: This returns 0 bytes if the process ID is not recognized.
+                            long bytes = 0;
+                            Process proc = Process.GetProcessByID(processId);
+                            if (proc != null)
+                            {
+                                bytes = (long)proc.PeakAllocatedMemory;
+                            }
+                            ep.SendMemory(bytes);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.TotalUsedCommunicationHeap() in epSet:
+                        {
+                            long blocks, bytes;
+                            ComputeCommunicationHeapMemory(0, out blocks, out bytes);
+                            ep.SendBlocksAndTotal(blocks, bytes);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.ProcessUsedCommunicationHeap(int processId) in epSet:
+                        {
+                            long blocks, bytes;
+                            ComputeCommunicationHeapMemory(processId, out blocks, out bytes);
+                            ep.SendBlocksAndTotal(blocks, bytes);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.DumpExHeap() in epSet :
+                        {
+                            ep.SendExHeapDump(TranslateHeapDump(DumpExHeap()));
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.CollectGarbage() in epSet :
+                        {
+                            GC.Collect();
+                            ep.SendMemory(0);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetProcessHandlePages(int processId) in epSet :
+                        {
+                            long pages = 0;
+                            Process proc = Process.GetProcessByID(processId);
+                            if (proc != null) {
+                                pages = (long)proc.NumHandlePages;
+                            }
+                            ep.SendPages(pages);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.ChannelClosed() in epSet :
+                        {
+                            // Just toss the closed channel
+                            delete ep;
+                        }
+                        break;
+
+                    case epSet.Empty() && nsExp.ChannelClosed():
+                        {
+                            delete nsExp;
+                            epSet.Dispose();
+                            return;
+                        }
+                        break;
+                }
+            }
+        }
+
+        //
+        // This helper object counts up the blocks and bytes attributable to a specific
+        // process ID (procID zero for a total of all blocks/bytes)
+        //
+        private class ProcessBlocksAccumulator
+        {
+            public long blockAccumulator;
+            public long bytesAccumulator;
+            private int procId;
+
+            public ProcessBlocksAccumulator(int processIdFilter)
+            {
+                procId = processIdFilter;
+                blockAccumulator = 0;
+                bytesAccumulator = 0;
+            }
+
+            public void
+            AccumulateCommunicationHeap(SharedHeap.Allocation* alloc)
+            {
+                int owningProcess =
+                    SharedHeap.Allocation.GetOwnerProcessId(alloc);
+
+                if (procId == 0 || owningProcess == procId) {
+                    blockAccumulator++;
+                    bytesAccumulator +=
+                        (long)SharedHeap.Allocation.GetSize(alloc);
+                }
+            }
+        }
+
+        private void ComputeCommunicationHeapMemory(int      processId,
+                                                    out long blocks,
+                                                    out long bytes)
+        {
+            ProcessBlocksAccumulator accumulator =
+                new ProcessBlocksAccumulator(processId);
+
+            Process! process = (!)Thread.CurrentProcess;
+            SharedHeap! sharedHeap = (!)process.ProcessSharedHeap;
+
+            sharedHeap.DataOwnerId.Iterate(
+                new SharedHeap.AllocationVisitor(
+                    accumulator.AccumulateCommunicationHeap
+                    )
+                );
+            blocks = accumulator.blockAccumulator;
+            bytes  = accumulator.bytesAccumulator;
+        }
+
+        //
+        // This helper object collects information on every block in the ExHeap
+        //
+        private class HeapDumper
+        {
+            public struct BlockInfo
+            {
+                public UIntPtr size;
+                public UIntPtr type;
+                public int ownerProcID;
+            }
+
+            public SortedList! blockDetails; // Holds BlockInfo structs
+
+            public HeapDumper()
+            {
+                blockDetails = new SortedList();
+            }
+
+            public void AccumulateBlockInfo(SharedHeap.Allocation* alloc)
+            {
+                BlockInfo info = new BlockInfo();
+                info.ownerProcID = SharedHeap.Allocation.GetOwnerProcessId(alloc);
+                info.type = SharedHeap.Allocation.GetType(alloc);
+                info.size = SharedHeap.Allocation.GetSize(alloc);
+                unsafe {
+                    blockDetails.Add((Int64)alloc, info);
+                }
+            }
+        }
+
+        private SortedList! DumpExHeap() {
+            HeapDumper dumper = new HeapDumper();
+
+            assert SharedHeap.KernelSharedHeap != null;
+            SharedHeap.KernelSharedHeap.DataOwnerId.Iterate(
+                    new SharedHeap.AllocationVisitor(dumper.AccumulateBlockInfo));
+            SharedHeap.KernelSharedHeap.EndpointOwnerId.Iterate(
+                    new SharedHeap.AllocationVisitor(dumper.AccumulateBlockInfo));
+
+            return dumper.blockDetails;
+        }
+
+        private MemoryContract.BlockInfo[]! in ExHeap TranslateHeapDump(SortedList! dump)
+        {
+            MemoryContract.BlockInfo[]! in ExHeap retval = new[ExHeap] MemoryContract.BlockInfo[dump.Count];
+            int i = 0;
+
+            foreach(DictionaryEntry entry in dump) {
+                object! val = (!)entry.Value;
+                HeapDumper.BlockInfo info = (HeapDumper.BlockInfo)val;
+
+                retval[i].ptrVal = (long)((!)entry.Key);
+                retval[i].size = (long)info.size;
+                retval[i].type = (long)info.type;
+                retval[i].ownerProcID = info.ownerProcID;
+                i++;
+            }
+
+            Debug.Assert(i == dump.Count);
+            return retval;
+        }
+
+        internal static void Initialize()
+        {
+            MemoryModule module = new MemoryModule();
+            Thread thread = Thread.CreateThread(Thread.CurrentProcess,
+                                                new ThreadStart(module.Run));
+
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Diagnostics/ProcMemInfoModule.sg b/base/Kernel/Singularity.Diagnostics/ProcMemInfoModule.sg
new file mode 100644
index 0000000..6838359
--- /dev/null
+++ b/base/Kernel/Singularity.Diagnostics/ProcMemInfoModule.sg
@@ -0,0 +1,183 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcMemInfoModule.sg
+//
+//
+//  Note:   ProcMemInfo diagnostic module
+//
+
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Directory;
+using System;
+
+using Microsoft.Singularity.Hal;
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    public class ProcMemInfoModule
+    {
+        private void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels.
+            DirectoryServiceContract.Imp epNS =
+                DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2
+                                  (ProcMemInfoContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister
+                        (ServiceProviderContract.Imp:Start rejectedEP,
+                         ErrorCode error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print
+                        ("Failed register ProcMemInfo Diagnostic module.\n");
+                        if (rejectedEP != null) {
+                            delete rejectedEP;
+                        }
+                        delete nsExp;
+                        return;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            // Here is the set of client channels we service
+            ESet<ProcMemInfoContract.Exp:ReadyState> epSet =
+                new ESet<ProcMemInfoContract.Exp:ReadyState>();
+
+            while(true) {
+
+                switch receive {
+
+                    // ----------------------- Requests for new connections
+                  case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+
+                    // We expect people to give us
+                    // ProcMemInfoContract.Exp instances
+                    ProcMemInfoContract.Exp newDiagEp =
+                        newEp as ProcMemInfoContract.Exp;
+
+                    if (newDiagEp == null) {
+                        // Invalid contract type. Fail.
+                        nsExp.SendNackConnect(newEp);
+                    }
+                    else {
+                        // Signal ready and start servicing this contract
+                        nsExp.SendAckConnect();
+                        newDiagEp.SendReady();
+                        epSet.Add(newDiagEp);
+                    }
+                    break;
+
+                    // ----------------------- Get Processor Affinity
+                  case ep.GetProcessorAffinity() in epSet:
+
+                    IHalMemory.ProcessorAffinity[] processors =
+                        Processor.GetProcessorAffinity();
+
+                    ProcMemInfoContract.ProcessorAffinity[] in
+                        ExHeap retval;
+
+                    if (processors == null) {
+                        retval = null;
+                    }
+                    else {
+                        retval = new[ExHeap]
+                            ProcMemInfoContract.ProcessorAffinity
+                            [processors.Length];
+
+                        for (int i = 0; i < processors.Length; i++) {
+                            retval[i].domain = processors[i].domain;
+                            retval[i].apicId = processors[i].apicId;
+                            retval[i].flagIgnore =
+                                processors[i].flagIgnore;
+                        }
+                    }
+                    ep.SendResultProcessorAffinity(retval);
+                    epSet.Add(ep);
+                    break;
+
+                    // ----------------------- Get Memory Affinity
+                  case ep.GetMemoryAffinity() in epSet:
+
+                    IHalMemory.MemoryAffinity[] memories =
+                        Processor.GetMemoryAffinity();
+
+                    ProcMemInfoContract.MemoryAffinity[] in
+                        ExHeap retval;
+
+                    if (memories == null) {
+                        retval = null;
+                    }
+                    else {
+                        retval = new[ExHeap]
+                            ProcMemInfoContract.MemoryAffinity
+                            [memories.Length];
+
+                        for (int i = 0; i < memories.Length; i++) {
+                            retval[i].domain = memories[i].domain;
+                            retval[i].baseAddress = memories[i].baseAddress;
+                            retval[i].endAddress = memories[i].endAddress;
+                            retval[i].memorySize = memories[i].memorySize;
+                            retval[i].flagIgnore = memories[i].flagIgnore;
+                            retval[i].flagHotPluggable =
+                                memories[i].flagHotPluggable;
+                            retval[i].flagNonVolatile =
+                                memories[i].flagNonVolatile;
+                        }
+                    }
+                    ep.SendResultMemoryAffinity(retval);
+                    epSet.Add(ep);
+                    break;
+
+
+                  case ep.ChannelClosed() in epSet :
+                    // Just toss the closed channel
+                    delete ep;
+                    break;
+
+                  case epSet.Empty() && nsExp.ChannelClosed():
+                    delete nsExp;
+                    epSet.Dispose();
+                    return;
+                    break;
+                }
+            }
+        }
+
+        internal static void Initialize()
+        {
+            ProcMemInfoModule module = new ProcMemInfoModule();
+
+            Thread thread = Thread.CreateThread(Thread.CurrentProcess,
+                                                new ThreadStart(module.Run));
+
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Diagnostics/ProcessModule.sg b/base/Kernel/Singularity.Diagnostics/ProcessModule.sg
new file mode 100644
index 0000000..7c7e08f
--- /dev/null
+++ b/base/Kernel/Singularity.Diagnostics/ProcessModule.sg
@@ -0,0 +1,247 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcessModule.sg
+//  Note:   Process diagnostic module
+//
+
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Diagnostics.Contracts;
+using Microsoft.Singularity.Directory;
+using System;
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    public class ProcessModule
+    {
+        private void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try
+            {
+                epNS.SendRegister(Bitter.FromString2(ProcessContract.ModuleName), nsImp);
+
+                switch receive
+                {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, ErrorCode error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the Process Diagnostic module.\n");
+                        delete nsExp;
+                        if (rejectedEP != null) {
+                            delete rejectedEP;
+                        }
+                        return;
+                }
+            }
+            finally
+            {
+                delete epNS;
+            }
+
+            // Here is the set of client channels we service
+            ESet<ProcessContract.Exp:ReadyState> epSet = new ESet<ProcessContract.Exp:ReadyState>();
+            while(true)
+            {
+                switch receive
+                {
+                    // ------------------------------- Requests for new connections
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people top give us ProcessContract.Exp instances
+                            ProcessContract.Exp newDiagEp = newEp as ProcessContract.Exp;
+
+                            if (newDiagEp == null)
+                            {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else
+                            {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newDiagEp.SendReady();
+                                epSet.Add(newDiagEp);
+                            }
+                        }
+                        break;
+
+                    // ------------------------------- Requests on existing connections
+                    //
+                    // Don't forget that we're selecting ProcessContract endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.GetProcessIDs() in epSet :
+                        {
+                            Process[] processTable = Process.processTable;
+                            int[] scratch = new int[processTable.Length];
+                            int numProcs = 0;
+
+                            // Snapshot the process IDs. Don't worry too much
+                            // about the table changing while we're looking at
+                            // it, since there's no guarantee that the
+                            // list we provide corresponds to a table state
+                            // that actually existed at some point in time.
+                            for (int i = 0; i < processTable.Length; ++i)
+                            {
+                                Process proc = processTable[i];
+
+                                if (proc != null)
+                                {
+                                    scratch[i] = proc.ProcessId;
+                                    ++numProcs;
+                                }
+                                else
+                                {
+                                    scratch[i] = -1;
+                                }
+                            }
+
+                            // Compact the table
+                            int* opt(ExHeap[]) retval = new[ExHeap] int[numProcs];
+                            int curProcess = 0;
+
+                            for (int i = 0; i < scratch.Length; ++i)
+                            {
+                                if (scratch[i] != -1)
+                                {
+                                    retval[curProcess] = scratch[i];
+                                    ++curProcess;
+                                }
+                            }
+
+                            ep.SendProcessIDs(retval);
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetProcessThreadIDs(int procID) in epSet :
+                        {
+                            Process proc = Process.GetProcessByID(procID);
+
+                            if (proc == null) {
+                                ep.SendNotFound();
+                            }
+                            else {
+                                int [] tids = proc.GetThreadIDs(); 
+                                if (tids != null && tids.Length > 0 ) { 
+                                    int* opt(ExHeap[]) retval = new[ExHeap] int[tids.Length];
+                                    for (int i = 0; i < tids.Length; ++i){
+                                        retval[i] = tids[i]; 
+                                    }
+                                    ep.SendProcessThreadIDs(retval);
+                                }
+                                else ep.SendNotFound();
+                                //else DebugStub.Break(); 
+                            }
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetProcessTimes(int procID) in epSet :
+                        {
+                            Process proc = Process.GetProcessByID(procID);
+
+                            if (proc == null) {
+                                ep.SendNotFound();
+                            }
+                            else {
+                                long deadThreadTime  = proc.DeadThreadTime; 
+                                long deadThreadCount = proc.DeadThreadCount; 
+                                long threadTimes     = proc.GetThreadTimes(); 
+                                long totalTime       = threadTimes + deadThreadTime;  
+                                
+                                ep.SendProcessTimes(totalTime,deadThreadTime,deadThreadCount);
+                                //DebugStub.WriteLine("proc={0}, totalTime={1}",__arglist(procID,totalTime));
+                            }
+                            epSet.Add(ep);
+                        }
+                        break;
+                        
+                    case ep.GetProcessGcStats(int procID) in epSet :
+                        {
+                            Process proc = Process.GetProcessByID(procID);
+
+                            if (proc == null) {
+                                ep.SendNotFound();
+                            }
+                            else {
+                                int count;
+                                TimeSpan time; 
+                                long bytes; 
+                                proc.GetGcPerformanceCounters(out count, out time, out bytes); 
+                                ep.SendProcessGcStats(count, time.Ticks, bytes);
+                                //DebugStub.WriteLine("proc={0}, totalTime={1}",__arglist(procID,totalTime));
+                            }
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.GetProcessName(int procID) in epSet :
+                        {
+                            Process proc = Process.GetProcessByID(procID);
+
+                            if (proc == null)
+                            {
+                                ep.SendNotFound();
+                            }
+                            else
+                            {
+                                ep.SendProcessName(Bitter.FromString2((!)proc.GetProcessName()));
+                            }
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case ep.ChannelClosed() in epSet :
+                        {
+                            delete ep;
+                        }
+                        break;
+
+                    case epSet.Empty() && nsExp.ChannelClosed() :
+                        {
+                            // Exit this thread
+                            delete nsExp;
+                            epSet.Dispose();
+                            return;
+                        }
+                        break;
+                }
+            }
+        }
+
+        internal static void Initialize()
+        {
+            ProcessModule module = new ProcessModule();
+            Thread thread = Thread.CreateThread(Thread.CurrentProcess,
+                                                new ThreadStart(module.Run));
+
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/DirAclCoreSupport.sg b/base/Kernel/Singularity.Directory/DirAclCoreSupport.sg
new file mode 100644
index 0000000..e46a68a
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/DirAclCoreSupport.sg
@@ -0,0 +1,101 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirAclCoreSupport.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Directory
+{
+
+    public class DirAclCoreSupport : IAclCoreSupport
+    {
+        private UTF8Encoding! encoder = new UTF8Encoding();
+        private TRef<DirectoryServiceContract.Imp:Ready> cachedRootNS = null;
+
+        public string Expand(string! path)
+        {
+            // read the file size
+            if (cachedRootNS == null)
+                cachedRootNS = new TRef<DirectoryServiceContract.Imp:Ready>(
+                                        DirectoryService.NewClientEndpoint());
+            DirectoryServiceContract.Imp:Ready! ns = cachedRootNS.Acquire();
+            byte[] result =  ReadFromFile(path, ns);
+            cachedRootNS.Release(ns);
+            if (result == null)
+                return null;
+            string! subexpression = (!)encoder.GetString(result);
+            return subexpression;
+        }
+
+        private byte[] ReadFromFile(string!path, DirectoryServiceContract.Imp:Ready! ns)
+        {
+            ErrorCode errCode;
+            byte[] result;
+            long size = 0;
+            int readSize = 4096;
+            NodeType nodeType;
+
+            try {
+                bool temp = SdsUtils.GetAttributes(path, ns, out size, out nodeType, out errCode);
+                if (! temp)
+                    // element does not exist or an error has occurred
+                    throw new Exception("Cannot get attributes - " + SdsUtils.ErrorCodeToString(errCode));
+                result = new byte[size];
+                byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                if (result == null || buf == null)
+                    throw new Exception("Cannot allocate memory");
+                FileContract.Imp! fileImp;
+                FileContract.Exp! fileExp;
+                FileContract.NewChannel(out fileImp, out fileExp);
+                bool bindOk = SdsUtils.Bind(path, ns, fileExp, out errCode);
+                if (!bindOk) {
+                    delete fileImp;
+                    throw new Exception("Can't read group - " + SdsUtils.ErrorCodeToString(errCode));
+                }
+                fileImp.RecvSuccess();
+
+                long readOffset = 0;
+                while (true) {
+                    fileImp.SendRead(buf, 0, readOffset, readSize);
+                    switch receive {
+                        case fileImp.AckRead(localbuf,  bytesRead,  error) :
+                            // move the memory
+                            Bitter.ToByteArray(localbuf, 0, (int)bytesRead, result, (int)readOffset);
+                            if (bytesRead == readSize) {
+                                // see if there is more
+                                readOffset += bytesRead;
+                                buf = localbuf;
+                                continue;
+                            }
+                            delete localbuf;
+                            break;
+                        case fileImp.ChannelClosed() :
+                            break;
+                        case unsatisfiable :
+                            break;
+                    }
+                    break;
+                }
+                delete fileImp;
+            } catch (Exception e) {
+                DebugStub.Print("An exception occurred while reading group definition: {0}\n",
+                                __arglist(path));
+                DebugStub.Print("Message: {0}\n", __arglist(e.Message));
+                return null;
+            }
+            return result;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/DirNode.sg b/base/Kernel/Singularity.Directory/DirNode.sg
new file mode 100644
index 0000000..3e2954c
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/DirNode.sg
@@ -0,0 +1,1154 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+//  Note:
+//
+
+//#define BREAK_ON_FAILURE
+//#define CHECK_TRAVERSE_ACCESS
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+#if SINGULARITY_PROCESS
+    public class Kernel
+    {
+        public static void Waypoint(int num)
+        {
+        }
+    }
+#endif
+
+    public class DirNode : Node
+    {
+        public readonly SortedList! names;
+        internal Hashtable! notificationList;
+        private StringBuilder! sb;
+
+        private Mutex! dirMutex;
+
+        public void AcquireLock()
+        {
+            dirMutex.WaitOne();
+        }
+        public void ReleaseLock()
+        {
+            dirMutex.ReleaseMutex();
+        }
+
+        public DirNode(string! name, Node! parent)
+        {
+            names = new SortedList();
+            dirMutex = new Mutex();
+            notificationList = new Hashtable();
+            sb = new StringBuilder(256);
+            base(NodeType.Directory, name, parent);
+        }
+
+        public DirNode(string! name, AclCore! core, ISdsAcl! aclT)
+        {
+            names = new SortedList();
+            dirMutex = new Mutex();
+            notificationList = new Hashtable();
+            sb = new StringBuilder(256);
+            base(NodeType.Directory, name, core, aclT);
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // begin kernel only functions
+        ///////////////////////////////////////////////////////////////////////////////
+#if !SINGULARITY_PROCESS
+        public bool CreateDirectory(string! name, out ErrorCode error)
+        {
+            error = ErrorCode.NoError;
+            bool success = false;
+            AcquireLock();
+            if (names.ContainsKey(name)) {
+                success = false;
+                error = ErrorCode.AlreadyExists;
+                DebugStub.Break();
+                ReleaseLock();
+                return false;
+            }
+            else {
+                DirNode d = new DirNode(name, this);
+                Tracing.Log(Tracing.Debug,"createDir: parent="+name);
+                names.Add(name,d);
+                HandleNotification(name,NotifyType.Creation);
+                success = true;
+            }
+            ReleaseLock();
+            return success;
+        }
+
+        public bool CreateLink(string! name, string! val)
+        {
+            bool success = false;
+            AcquireLock();
+            if (names.ContainsKey(name)) {
+                success = false;
+#if BREAK_ON_FAILURE
+                DebugStub.Break();
+#endif
+            }
+            else {
+                SymLinkNode sym = new SymLinkNode(val, name, this);
+                names.Add(name,sym);
+                success = true;
+            }
+            ReleaseLock();
+            return success;
+        }
+
+        public DirNode FindDirectory(StringBuilder! p)
+        {
+       /*
+            sb.Append("\nFindDirectory ");
+            sb.Append(SbUtils.PathString(p));
+            sb.Append(" at dir ");
+            sb.Append(this.NodeName);
+            DebugStub.WriteLine(sb.ToString());
+            Tracing.Log(Tracing.Debug,sb.ToString());
+        */
+            if (p.Length == 0) {
+                return this;
+            }
+
+            string first = SbUtils.FirstElement(p);
+/*
+            sb.Length = 0;
+            sb.Append("   findDir: p=");
+            sb.Append(p.ToString());
+            sb.Append(" First=");
+            sb.Append(first);
+            DebugStub.WriteLine(sb.ToString());
+*/
+            //DebugStub.Break();
+            if (null == first) {
+                return null;
+            }
+
+            Node n = (Node)this.names[first];
+            if (null == n) {
+                return null;
+            }
+            int pos;
+            p = SbUtils.RemoveFirstElement(p, out pos);
+/*
+            sb.Length = 0;
+            sb.Append("      afterRemove: p=");
+            sb.Append(p.ToString());
+            sb.Append(" First=");
+            sb.Append(first);
+            DebugStub.WriteLine(sb.ToString());
+*/
+            if (n is DirNode) {
+                return ((DirNode) n).FindDirectory(p);
+            }
+            else {
+                //DebugStub.Break();
+                return null;
+            }
+        }
+
+        /// <returns>
+        /// Special kernel interface for adding in memory images to the namespace.
+        /// </returns>
+        public bool RegisterIoMemory(string! name, IoMemory! ioMemory)
+        {
+            Tracing.Log(Tracing.Debug,"RegisterIoMemory: "+name+" in "+name+" VA:{0} Len:{1}",
+                        ioMemory.VirtualAddress, (UIntPtr)ioMemory.Length);
+
+            if (ioMemory.VirtualAddress == UIntPtr.Zero) {
+                DebugStub.Break();
+            }
+            bool success = false;
+            try {
+                this.AcquireLock();
+                this.names.Add(name, new IoMemoryNode(ioMemory, name, this));
+                success = true;  //success
+            }
+            finally {
+                this.ReleaseLock();
+            }
+            return success;
+        }
+#endif
+        ///////////////////////////////////////////////////////////////////////////////
+        // end kernel only functions
+        ///////////////////////////////////////////////////////////////////////////////
+
+
+        public override bool GetAttributes(StringBuilder! p,
+                                           Principal pr,
+                                           int curpos,
+                                           out int position,
+                                           out bool linkFound,
+                                           out ErrorCode error,
+                                           out bool reparse,
+                                           out string link,
+                                           out long length,
+                                           out NodeType nodeType
+                                           )
+        {
+            Kernel.Waypoint(3050);
+
+            position = 0;
+            reparse = false;
+            link = null;
+            length = 0;
+            linkFound = false;
+            error = ErrorCode.NoError;
+            nodeType = NodeType.BadNode;
+
+            if (CheckEmpty(p)) {
+
+                //the user wants the attributes of the directory object
+                Kernel.Waypoint(3051);
+                Kernel.Waypoint(3052);
+                //check read access for this object
+                if (!CheckAccess(SdsAclPerms.ModeRead, pr)) {
+                    error = ErrorCode.AccessDenied;
+                    return false;
+                }
+                nodeType = NodeType.Directory;
+                return true;
+            }
+
+            // there is more path, continue processing
+            string first = SbUtils.FirstElement(p);
+            if (null == first) {
+                error = ErrorCode.NotFound;
+                return false;
+            }
+
+            // can the caller traverse the current node?
+            Kernel.Waypoint(3052);
+#if CHECK_TRAVERSE_ACCESS
+            if (!CheckAccess(SdsAclPerms.ModeTraverse, pr)) {
+                error = ErrorCode.AccessDenied;
+                Kernel.Waypoint(3053);
+                return false;
+            }
+#endif
+            Kernel.Waypoint(3054);
+            Node n = (Node)this.names[first];
+            if (null == n) {
+                error = ErrorCode.NotFound;
+                nodeType = NodeType.BadNode;
+                return false;
+            }
+
+            int newpos;
+            n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                return false;
+            }
+            Kernel.Waypoint(3055);
+            bool ok =  n.GetAttributes(p,
+                                  pr,
+                                  newpos,
+                                  out position,
+                                  out linkFound,
+                                  out error,
+                                  out reparse,
+                                  out link,
+                                  out length,
+                                  out nodeType
+                                );
+
+            Kernel.Waypoint(3056);
+            return ok;
+        }
+
+
+        public void HandleNotification(string! name, NotifyType type)
+        {
+            NotificationManager.EnqueueNotification(this, name, type);
+        }
+
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 string! fullPath,
+                                                 Principal pr,
+                                                 int curpos,
+                                                 out int position,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 out string linkPrefix,
+                                                 [Claims] ServiceContract.Exp! service)
+        {
+            position = curpos;
+            success = false;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            linkPrefix = null;
+            error = ErrorCode.NoError;
+
+            Tracing.Log(Tracing.Debug, "bind "+ SbUtils.PathString(p));
+            Kernel.Waypoint(3000);
+            if (CheckEmpty(p)) {
+                //the user wants to bind to a directory object in the namespace
+                Kernel.Waypoint(3001);
+                DirectoryServiceContract.Exp dirEP = service as DirectoryServiceContract.Exp;
+                Kernel.Waypoint(3002);
+                if (dirEP != null) {
+                    // check Traverse access for both caller and supplied EP
+#if CHECK_TRAVERSE_ACCESS
+                    if (!CheckAccess(SdsAclPerms.ModeTraverse, pr, service)) {
+                        DebugStub.WriteLine("No access to DirectoryService.Bind");
+                        Kernel.Waypoint(3003);
+                        error = ErrorCode.AccessDenied;
+                        return service;
+                    }
+#endif
+                    //Tracing.Log(Tracing.Debug," found '/' starting dir worker");
+                    Kernel.Waypoint(3004);
+
+                    DirectoryServiceWorker.Create(this, dirEP);
+
+                    Kernel.Waypoint(3005);
+                    success = true;
+                    return null;
+                }
+                else {
+                    error = ErrorCode.ContractNotSupported;
+                    return service;
+                }
+            }
+
+            Kernel.Waypoint(3006);
+            int newpos;
+            Node n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (null == n) {
+                return service;
+            }
+
+            Kernel.Waypoint(3009);
+            ServiceContract.Exp sp = n.Bind(p,
+                                            fullPath,
+                                            pr,
+                                            newpos,
+                                            out position,
+                                            out success,
+                                            out linkFound,
+                                            out error,
+                                            out reparse,
+                                            out link,
+                                            out linkPrefix,
+                                            service);
+            Kernel.Waypoint(3010);
+            return sp;
+        }
+
+
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims] ServiceProviderContract.Imp! sp,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            position = curpos;
+            bool firstFound;
+            Node n = null;
+
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.NoError;
+            bool doReplacement = false;
+
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug,"({1:x8}) Register: path ={0}\n",
+                        SbUtils.PathString(p),(UIntPtr)Kernel.AddressOf(Thread.CurrentThread));
+#endif
+            this.AcquireLock();
+            try {
+                if (CheckEmpty(p) ) {
+                    error = ErrorCode.NotFound;
+                    return sp;
+                }
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        // see if this is a dangling ref -- if so continue with registration
+                        n = (Node) names[name];
+                        if (n != null && n is ProviderNode) {
+                            doReplacement = true;
+                        }
+                        else {
+                            error = ErrorCode.AlreadyExists;
+                            return sp;
+                        }
+                    }
+
+                    // check register access for both caller and EP
+                    if (!CheckAccess(SdsAclPerms.ModeRegister, pr, sp)) {
+                        error = ErrorCode.AccessDenied;
+                        return sp;
+                    }
+                    else {
+                        if (doReplacement) {
+                            assert n != null;
+                            // Perform replacement after access check
+                            // replace provider only succeeds if peer is closed.
+                            ServiceProviderContract.Imp ret = ((ProviderNode) n).ReplaceProvider(sp);
+                            if ( ret != null) {
+                                error = ErrorCode.AlreadyExists;
+                            }
+                            else {
+                                HandleNotification(name, NotifyType.Deletion);
+                                HandleNotification(name, NotifyType.Creation);
+                            }
+                            return ret;
+                        }
+                        else {
+                            HandleNotification(name, NotifyType.Creation);
+                            this.names.Add(name, new ProviderNode(sp, name, this));
+                            error = ErrorCode.NoError;
+                            return null;
+                        }
+                    }
+                }
+                else {
+                    int newpos;
+                    n = GetNextNode(p, pr, curpos, out newpos, out error);
+                    if (n == null) {
+                        return sp;
+                    }
+                    return n.Register(p, pr, sp, newpos, out position, out linkFound, out error, out reparse, out link);
+                }
+            }
+            finally
+            {
+                this.ReleaseLock();
+            }
+        }
+
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start Deregister(StringBuilder! p,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               int curpos,
+                                                               out int position,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            position = curpos;
+            bool firstFound;
+            Node n;
+
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.NoError;
+
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug,"({1:x8}) DeRegister: path ={0}\n",
+                        SbUtils.PathString(p),(UIntPtr)Kernel.AddressOf(Thread.CurrentThread));
+#endif
+            this.AcquireLock();
+            try {
+                if (CheckEmpty(p) ) {
+                    error = ErrorCode.NotFound;
+                    return null;
+                }
+
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (!names.ContainsKey(name)) {
+                        error = ErrorCode.NotFound;
+                        return null;
+                    }
+                    // check deregister access of caller
+                    else if (!CheckAccess(SdsAclPerms.ModeRegister, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return null;
+                    }
+                    else {
+                        HandleNotification(name, NotifyType.Deletion);
+                        n = (Node) names[name];
+                        if (n != null && n is ProviderNode) {
+                            ServiceProviderContract.Imp:Start sp = ((ProviderNode) n).GetServiceEndpoint();
+                            names.Remove(name);
+                            n.ClearAcl();
+                            error = ErrorCode.NoError;
+                            return sp;
+                        }
+                        else {
+                            error = ErrorCode.NotProvider;
+                            return null;
+                        }
+                    }
+                }
+                else {
+                    int newpos;
+                    n = GetNextNode(p, pr, curpos, out newpos, out error);
+                    if (n == null) {
+                        return null;
+                    }
+                    return n.Deregister(p, pr, ep, newpos, out position, out linkFound, out error, out reparse, out link);
+
+                }
+            }
+
+            finally {
+                this.ReleaseLock();
+            }
+            return null;
+        }
+
+        /// <returns>
+        /// The a vector of vectors if success, null, if it fails.
+        /// </returns>
+        public EnumerationRecords[] in ExHeap Enumerate(Principal pr, out ErrorCode error)
+        {
+            Node n;
+            error = ErrorCode.Unknown;
+
+            // check read access for directory enumerate
+            if (!CheckAccess(SdsAclPerms.ModeRead, pr)) {
+                error = ErrorCode.AccessDenied;
+                return null;
+            }
+#if true
+            ArrayList deleteList = new ArrayList();
+            // inspect all entries for dangling refs. if found delete before generating
+            // enumeration records
+            for (int i = 0; i < names.Count; i++){
+                n = (Node)names.GetByIndex(i);
+                if (n != null && n is ProviderNode) {
+                    string name = (string)names.GetKey(i);
+                    //DebugStub.WriteLine("enum: inspecting {0}", __arglist(name));
+                    if ( ((ProviderNode) n).DeleteIfPeerClosed() ) {
+                        // need to remove from directory
+                        assert name != null;
+                        deleteList.Add(name);
+                    }
+                }
+            }
+
+            //DebugStub.WriteLine("enum: there are  {0} entries to be deleted", __arglist(deleteList.Count));
+
+            for (int i=0; i < deleteList.Count; i++) {
+                string s = (string) deleteList[i];
+                //DebugStub.WriteLine("enum: deleting {0}", __arglist(s));
+                names.Remove(s);
+            }
+#endif
+            EnumerationRecords[] in ExHeap responses = new [ExHeap] EnumerationRecords[names.Count];
+            for (int i = 0; i < names.Count; i++){
+                expose (responses[i]) {
+                    delete responses[i].Path; // checker doesn't know its null.
+                    responses[i].Path = Bitter.FromString2((!)(string)names.GetKey(i));
+                    responses[i].Type = ((!) (Node)names.GetByIndex(i)).Type;
+                }
+            }
+            return responses;
+        }
+
+        /// <returns>
+        /// true on success, false, if it fails.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! path,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  int curpos,
+                                                  out int position,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            position = curpos;
+            error = ErrorCode.NoError;
+            linkFound = false;
+            reparse = false;
+            link = null;
+
+            //DebugStub.WriteLine(" dir Notify() sb.len={0}, s={1}",__arglist(pathSpec.Length,pathSpec.ToString()));
+            if (path.Length == 0) {
+                // got it!
+                DebugStub.Break();
+                return notifyImp;
+            }
+
+            if (SbUtils.IsTail(path)) {
+                string! first = (!)SbUtils.FirstElement(path);
+
+                // check access: can the caller AND dest EP received notifications for this object
+                if (!CheckAccess(SdsAclPerms.ModeNotify, pr, notifyImp)) {
+                    error = ErrorCode.AccessDenied;
+                    return notifyImp;
+                }
+                notifyImp.SendBegin();
+                TRef <NotifyContract.Imp:Notify> notifyEP =
+                    new TRef <NotifyContract.Imp:Notify> (notifyImp);
+
+                notificationList.Add(first,notifyEP);
+                Tracing.Log(Tracing.Debug,"notify: pattern="+first);
+                return null;
+            }
+            else {
+                // check access: can the caller traverse the current folder
+#if CHECK_TRAVERSE_ACCESS
+                if (!CheckAccess(SdsAclPerms.ModeTraverse, pr)) {
+                    error = ErrorCode.AccessDenied;
+                    return notifyImp;
+                }
+#endif
+                string first = SbUtils.FirstElement(path);
+                sb.Length = 0;
+                sb.Append(" dirnode Notify: str=");
+                sb.Append(path.ToString());
+                sb.Append(" first = ");
+                sb.Append(first);
+                //DebugStub.WriteLine(sb.ToString());
+
+                Node n = (Node)this.names[first];
+                if (null == n) {
+                    DebugStub.Break();
+                    return notifyImp;
+                }
+
+                int charsConsumed;
+                path = SbUtils.RemoveFirstElement(path, out charsConsumed);
+                return n.Notify(path, pr, pattern,  sendExisting,
+                                curpos, out position,
+                                out linkFound, out error, out reparse, out link, notifyImp);
+            }
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return null;
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NoError;
+            position = curpos;
+            AcquireLock();
+            try {
+                if (SbUtils.IsTail(p)) {
+                    string! name = (!)SbUtils.FirstElement(p);
+                    if (names.ContainsKey(name)) {
+                        error = ErrorCode.AlreadyExists;
+                        return false;
+                    }
+                    // check write access to parent
+                    if (!CheckAccess(SdsAclPerms.ModeWrite, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    else {
+                        DirNode d = new DirNode(name, this);
+                        Tracing.Log(Tracing.Debug,"createDir: parent="+name);
+                        names.Add(name,d);
+                        HandleNotification(name, NotifyType.Creation);
+                        return true;
+                    }
+                }
+                else {
+                    // pass the request on to the next node if there is one.
+                    if (CheckEmpty(p)) {
+                        error = ErrorCode.NotFound;
+                        DebugStub.Break();
+                        return false;
+                    }
+                    int newpos;
+                    n = GetNextNode(p, pr, curpos, out newpos, out error);
+                    if (n == null) {
+                        return false;
+                    }
+                    return n.CreateDirectory(p, pr, newpos, out position, out linkFound, out error, out reparse, out link);
+
+                }
+                return false;
+            }
+            finally {
+                ReleaseLock();
+            }
+        }
+
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+            position = curpos;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NoError;
+
+            if (SbUtils.IsTail(p)) {
+                    // true files are not supported in the namespace
+                error = ErrorCode.NotImplemented;
+                return false;
+            }
+            else {
+                // pass the request on to the next node if there is one.
+                if (CheckEmpty(p)) {
+                    error = ErrorCode.NotImplemented;
+                    return false;
+                }
+                int newpos;
+                n = GetNextNode(p, pr, curpos, out newpos, out error);
+                if (n == null) {
+                    return false;
+                }
+                return n.CreateFile(p, pr, newpos, out position, out linkFound, out error, out reparse, out link);
+
+            }
+            return false;
+        }
+
+        private bool CheckEmpty(StringBuilder! p)
+        {
+            if ( (p.Length == 0)  || ( (p.Length == 1 ) && (p[0] == '/') ) ) {
+                 return true;
+            }
+            return false;
+        }
+
+        private Node GetNextNode(StringBuilder! p, Principal pr, int curpos, out int newpos, out ErrorCode error)
+        {
+            //DebugStub.Break();
+            newpos = curpos;
+            string first = SbUtils.FirstElement(p);
+            error = ErrorCode.NoError;
+            if (null == first) {
+                return null;
+            }
+
+            Kernel.Waypoint(3006);
+#if CHECK_TRAVERSE_ACCESS
+            if (!CheckAccess(SdsAclPerms.ModeTraverse, pr)) {
+                Kernel.Waypoint(3007);
+                error = ErrorCode.AccessDenied;
+                return null;
+            }
+#endif
+            Kernel.Waypoint(3008);
+
+            Node n = (Node)this.names[first];
+            if (null == n) {
+                error = ErrorCode.NotFound;
+                return null;
+            }
+
+            int charsConsumed;
+            SbUtils.RemoveFirstElement(p, out charsConsumed);
+            newpos = curpos + charsConsumed;
+            return n;
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            Node n;
+            linkFound = false;
+            link = null;
+            reparse = false;
+            error = ErrorCode.NoError;
+
+            if (SbUtils.IsTail(p)) {
+                string! name = (!)SbUtils.FirstElement(p);
+                if (names.ContainsKey(name)) {
+                    error = ErrorCode.AlreadyExists;
+                    return false;
+                }
+                // check write access to parent
+                else if (!CheckAccess(SdsAclPerms.ModeWrite, pr)) {
+                    error = ErrorCode.AccessDenied;
+                    return false;
+                }
+                else {
+                    SymLinkNode sym = new SymLinkNode(value, name, this);
+                    names.Add(name,sym);
+                    return true;
+                }
+            }
+            else { //recurse
+                if (CheckEmpty(p)) {
+                    error = ErrorCode.NotFound;
+                    return false;
+                }
+                int newpos;
+                n = GetNextNode(p, pr, curpos, out newpos, out error);
+                if (n == null) {
+                    return false;
+                }
+                return n.CreateLink(p, pr, value, newpos, out position, out linkFound, out error, out reparse, out link);
+            }
+        }
+
+        public override bool DeleteDirectory(StringBuilder! p,
+                                             Principal pr,
+                                             int curpos,
+                                             out int position,
+                                             out bool linkFound,
+                                             out ErrorCode error,
+                                             out bool reparse,
+                                             out string link
+                                             )
+        {
+            Node n;
+
+            position = curpos;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NotFound;
+            DirNode child;
+
+            if (CheckEmpty(p)) {
+                return false;
+            }
+
+            int newpos;
+            if (SbUtils.IsTail(p)) {
+                string! name = (!)SbUtils.FirstElement(p);
+                if (names.ContainsKey(name)) {
+                    // check to see if this node has entries
+                    // if so let the caller know
+                    n = GetNextNode(p, pr, curpos, out newpos, out error);
+                    if (n == null) {
+                        return false;
+                    }
+                    if (n is DirNode) {
+                        child = (DirNode) n;
+                        if (child.names.Count != 0) {
+                            DebugStub.WriteLine("Directory is not empty({0})!", __arglist(child.names.Count));
+                            error = ErrorCode.DirectoryNotEmpty;
+                            return false;
+                        }
+                        // check write access to parent
+                        else if (!CheckAccess(SdsAclPerms.ModeWrite, pr)) {
+                            error = ErrorCode.AccessDenied;
+                            return false;
+                        }
+                        // check write access to child
+                        else if (!n.CheckAccess(SdsAclPerms.ModeWrite, pr)) {
+                            error = ErrorCode.AccessDenied;
+                            return false;
+                        }
+                    }
+                    else {
+                        error = ErrorCode.NotDirectory;
+                        return false;
+                    }
+
+                    error = ErrorCode.NoError;
+                    names.Remove(name);
+                    n.ClearAcl();
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+
+           n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                linkFound = false;
+                reparse = false;
+                link = null;
+                return false;
+            }
+            return n.DeleteDirectory(p, pr, newpos, out position, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            Node n;
+            position = curpos;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NotFound;
+
+            if (CheckEmpty(p)) {
+                error = ErrorCode.NotFound;
+                return false;
+            }
+            if (SbUtils.IsTail(p)) {
+                string! name = (!)SbUtils.FirstElement(p);
+                if (names.ContainsKey(name)) {
+                    // check write access to parent
+                    if (!CheckAccess(SdsAclPerms.ModeWrite, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    // continue on to actual node for deletion
+                }
+                else {
+                    return false;
+                }
+            }
+
+            int newpos;
+            n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                return false;
+            }
+            return n.DeleteFile(p, pr, newpos, out position, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+
+        {
+            Node n;
+            position = curpos;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NotFound;
+            //DebugStub.Break();
+
+            if (CheckEmpty(p)) {
+                return false;
+            }
+
+            if (SbUtils.IsTail(p)) {
+                string! name = (!)SbUtils.FirstElement(p);
+                if (names.ContainsKey(name)) {
+                    //check write access to parent
+                    if (!CheckAccess(SdsAclPerms.ModeWrite, pr)) {
+                        error = ErrorCode.AccessDenied;
+                        return false;
+                    }
+                    error = ErrorCode.NoError;
+                    // this should check whether the node is a link!
+                    n = (Node!) names[name];
+                    n.ClearAcl();
+                    names.Remove(name);
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+
+            int newpos;
+            n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                linkFound = false;
+                reparse = false;
+                link = null;
+                return false;
+            }
+            return n.DeleteLink(p, pr, newpos, out position, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                          Principal pr,
+                                          int curpos,
+                                          out int position,
+                                          out bool linkFound,
+                                          out ErrorCode error,
+                                          out bool reparse,
+                                          out string link
+                                          )
+
+        {
+            Node n;
+            position = curpos;
+            error = ErrorCode.NotLink;
+            linkFound = false;
+            reparse = false;
+            link = null;
+
+            //DebugStub.Break();
+
+            if (CheckEmpty(p)) {
+                return false;
+            }
+
+            int newpos;
+            n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                return false;
+            }
+            return n.GetLinkValue(p, pr, newpos, out position, out linkFound, out error, out reparse, out link);
+        }
+
+
+        public override bool QueryACL(StringBuilder! p,
+                                      bool effective,
+                                      Principal pr,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            Node n;
+            position = curpos;
+            error = ErrorCode.NoError;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            acl = new Acl();
+
+            if (CheckEmpty(p)) {
+                if (!CheckAccess(SdsAclPerms.ModeRead, pr)) {
+                    error = ErrorCode.AccessDenied;
+                    return false;
+                }
+                if (effective)
+                    acl = new Acl(this.GetAclPattern());
+                else
+                    acl = this.GetInstanceAcl();
+                return true;
+            }
+            int newpos;
+            n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                return false;
+            }
+            return n.QueryACL(p, effective, pr, newpos, out position, out linkFound,
+                                   out error, out reparse, out link, out acl);
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            Node n;
+            position = curpos;
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NoError;
+
+            if (CheckEmpty(p)) {
+                if (!CheckAccess(SdsAclPerms.ModeSetAcl, pr)) {
+                    error = ErrorCode.AccessDenied;
+                    return false;
+                }
+                SetInstanceAcl(acl);
+                return true;
+            }
+            int newpos;
+            n = GetNextNode(p, pr, curpos, out newpos, out error);
+            if (n == null) {
+                return false;
+            }
+            return n.StoreACL(p, pr, acl, newpos, out position, out linkFound, out error, out reparse, out link);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/Directory.Utils.csproj b/base/Kernel/Singularity.Directory/Directory.Utils.csproj
new file mode 100644
index 0000000..26d4cea
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/Directory.Utils.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Directory.Utils</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SdsUtils.sg" />
+    <Compile Include="DirAclCoreSupport.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..\SpecSharp.Contracts\Kernel.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+
+  <Target Name="Build">
+    <Error Text="Directory.Utils.csproj is now obsolete.  See change @5346."/>
+  </Target>
+</Project>
diff --git a/base/Kernel/Singularity.Directory/Directory.csproj b/base/Kernel/Singularity.Directory/Directory.csproj
new file mode 100644
index 0000000..500f155
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/Directory.csproj
@@ -0,0 +1,51 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Directory</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DirectoryService.sg" />
+    <Compile Include="DirectoryServiceWorker.sg" />
+    <Compile Include="DirNode.sg" />
+    <Compile Include="IoMemoryNode.sg" />
+    <Compile Include="IoMemoryService.sg" />
+    <Compile Include="Node.sg" />
+    <Compile Include="NotificationManager.sg" />
+    <Compile Include="Path.sg" />
+    <Compile Include="Property.sg" />
+    <Compile Include="ProviderNode.sg" />
+    <Compile Include="ResolutionState.sg" />
+    <Compile Include="SbUtils.sg" />
+    <Compile Include="SymLinkNode.sg" />
+    <Compile Include="WorkerFunctions.sg" />
+    <Compile Include="DirAclCoreSupport.sg" />
+    <Compile Include="SdsUtils.sg" />
+    <Compile Include="SdsUtilsAcl.sg" />    
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Loader\Loader.csproj" />
+    <ProjectReference Include="..\Singularity.Security\Security.csproj" />
+    <ProjectReference Include="..\SpecSharp.Contracts\Kernel.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Directory/DirectoryService.sg b/base/Kernel/Singularity.Directory/DirectoryService.sg
new file mode 100644
index 0000000..b8fa628
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/DirectoryService.sg
@@ -0,0 +1,561 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using System.Text;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Security
+;using Microsoft.Singularity.Security.SDS;
+using Microsoft.Singularity.Loader;
+
+namespace Microsoft.Singularity.Directory
+{
+
+    [CLSCompliant(false)]
+    public enum DirectoryEvent : ushort
+    {
+        DoBind = 1,
+        DoGetAttributes = 2,
+        DoCreateDirectory = 3,
+        DoCreateFile = 4,
+        DoDeleteDirectory = 5,
+        DoDeleteLink = 6,
+        DoGetLinkValue = 7,
+        DoCreateLink = 8,
+    }
+
+    public class DirectoryService
+    {
+        public const string ManifestFile = "manifest";
+        public const string ExecutableExtension = ".x86";
+        public const string ManifestExtension = ".manifest";
+        public const string ExecutablesNamespace = "init";
+
+        private static TRef<IoMemFSContract.Imp:Ready> ioFSImpRef;
+
+        private static DirNode! rootDir;
+
+        internal static Process processForWorkerThreads;
+
+        /// <summary>
+        /// The provider of access control lists for objects
+        /// in this namespace.
+        /// </summary>
+        public static void Initialize(XmlNode! config)
+        {
+            NotificationManager.Initialize();
+ 
+            //RootDir = new RootDirectory("/");
+            ISdsAcl! aclT = new SdsAclImpl();
+            AclCore core = new AclCore("DS_Acl", new DirAclCoreSupport());
+            rootDir = new DirNode("/", core, aclT);
+
+            processForWorkerThreads = Thread.CurrentProcess;
+            InstallLoadedApplications(config);
+            InstallOtherFiles(config);
+            InstallGroups(config);
+            InstallAcls(config, aclT);
+        }
+
+        public static void StartNotificationThread()
+        {
+            NotificationManager.StartNotificationThread();
+        }
+
+        public static  DirectoryServiceContract.Imp:Ready! NewClientEndpoint()
+        {
+#if !SINGULARITY_PROCESS
+            DirectoryServiceContract.Imp! c;
+            DirectoryServiceContract.Exp! s;
+            DirectoryServiceContract.NewChannel(out c, out s);
+
+            DirectoryServiceWorker.Create(rootDir, s);
+
+            c.RecvSuccess();
+
+            return c;
+#else
+            return null;
+#endif
+        }
+
+        public static unsafe SharedHeap.Allocation * NewClientEndpointEx()
+        {
+            // This sequence tells the ownership checker that we transfer
+            // the obligation to the result.
+            DirectoryServiceContract.Imp! imp = NewClientEndpoint();
+            SharedHeap.Allocation* result = (SharedHeap.Allocation*)imp;
+            return result;
+        }
+
+/*************************************************************************************/
+
+#region Constants
+        //
+        // consts for accessing Xml tags and attributes
+        //
+
+        // tags describing entries in the binder
+        const string FileListXmlTag = "files";
+        const string FileEntryXmlTag = "file";
+        const string FileNameXmlAttribute = "name";
+        const string BinderPositionXmlAttribute = "id";
+        const string ManifestBinderPositionXmlAttribute = "manifestId";
+        const string IsExecutableXmlAttribute = "executable";
+        const string IsManifestXmlAttribute = "manifest";
+
+        // security tags
+        const string GroupListXmlTag = "groups";
+        const string GroupEntryXmlTag = "group";
+        const string AclListXmlTag = "acls";
+        const string AclEntryXmlTag = "acl";
+        const string AclEntryPathTag = "path";
+        const string AclEntryThisTag = "this";
+        const string AclEntryInheritedTag = "inherited";
+
+        const string GroupListRootXmlAttribute = "root";
+        const string GroupEntryPathXmlAttribute = "path";
+        const string GroupEntryDescriptionXmlAttribute = "description";
+
+        const string NamespaceParametersTag = "namespace";
+        const string ProxyChannelsAttribute = "proxyChannels";
+        const int DefaultProxyChannels = 10;
+
+#endregion
+
+        private static void InstallLoadedApplications(XmlNode! config)
+        {
+            // get all files to register from the xml
+            XmlNode filesConfig = config.GetChild(FileListXmlTag);
+
+            if (filesConfig == null) {
+                return;
+            }
+
+            ErrorCode error;
+            if (!rootDir.CreateDirectory(DirectoryService.ExecutablesNamespace, out error)) {
+                throw new Exception("Cannot create executables directory");
+            }
+
+            StringBuilder sb = new StringBuilder(DirectoryService.ExecutablesNamespace.Length + 1);
+            sb.Append("/");
+            sb.Append(DirectoryService.ExecutablesNamespace);
+            DirNode root = rootDir.FindDirectory(sb);
+            if (root == null) {
+                throw new Exception("Cannot find executables directory");
+            }
+
+            foreach (XmlNode! file in filesConfig.Children) {
+                if (file.Name != FileEntryXmlTag) {
+                    continue;
+                }
+                bool executable = file.GetAttribute(IsExecutableXmlAttribute, false);
+                bool manifest = file.GetAttribute(IsManifestXmlAttribute, false);
+                int order = file.GetAttribute(BinderPositionXmlAttribute, -1);
+
+                if ((!executable && !manifest) || order == -1) {
+                    // skip non-manifest and non-executable files.
+                    continue;
+                }
+
+                // get attributes.
+                string! name = (!) file.GetAttribute(FileNameXmlAttribute, "");
+                // remove .x86 extension.
+                name = (!)name.Replace(".x86", "");
+
+                int manifestOrder = file.GetAttribute(
+                    ManifestBinderPositionXmlAttribute, -1);
+
+                IoMemory memory = Resources.GetLoadedImageMemory(order);
+
+                if (memory == null) {
+                    DebugStub.WriteLine("Failure loading name={0} order={1}",
+                                        __arglist(name, order));
+                    throw new Exception("Cannot load image");
+                }
+
+                if (executable) {
+                    name = (name + DirectoryService.ExecutableExtension);
+                }
+
+                string folderName = GetFolderName(name);
+                if (folderName != null) {
+                    // this is an application.
+                    // First register the binary in the init directory
+                    // Then register the associated manifest by inspecting the manifestIndex tag
+                    //   (this should be imageIndex + 1)
+
+                    if (root.CreateDirectory(folderName, out error)) {
+                        // obtain the containing directory
+                        StringBuilder p = new StringBuilder(folderName.Length + 1);
+                        p.Append("/");
+                        p.Append(folderName);
+                        DirNode! dir = (!)root.FindDirectory(p);
+                        // register the executable's image
+                        dir.RegisterIoMemory(name, memory);
+                        // if we have a manifest, install it.
+                        if (manifestOrder != -1 ) {
+                            //DebugStub.WriteLine("loading manifest for {0}, binder index={1}",
+                            //    __arglist(folderName,manifestOrder));
+                            IoMemory manMemory = Resources.GetLoadedImageMemory(manifestOrder);
+                            if (manMemory == null) {
+                                DebugStub.WriteLine("Failure loading manifest. name={0} manifestOrder={1}",
+                                                    __arglist(name, manifestOrder));
+                                throw new Exception("Cannot load manifest");
+                            }
+                            dir.RegisterIoMemory(DirectoryService.ManifestFile, manMemory);
+                        }
+                    }
+                }
+                else {
+                    // skip manifests (processed above)
+                    if (!name.EndsWith(DirectoryService.ManifestExtension)) {
+                        // this is a plain old file
+                        root.RegisterIoMemory(name, memory);
+                    }
+                }
+            }
+        }
+
+        private static void InstallOtherFiles(XmlNode! config)
+        {
+            // get all files to register from the xml
+            XmlNode filesConfig = config.GetChild(FileListXmlTag);
+
+            if (filesConfig == null) {
+                return;
+            }
+
+            ErrorCode error;
+
+            StringBuilder sb = new StringBuilder(DirectoryService.ExecutablesNamespace.Length + 1);
+            sb.Append("/");
+            sb.Append(DirectoryService.ExecutablesNamespace);
+            DirNode root = rootDir.FindDirectory(sb);
+            if (root == null) {
+                throw new Exception("Cannot find executables directory");
+            }
+
+            foreach (XmlNode! file in filesConfig.Children) {
+                if (file.Name != FileEntryXmlTag) {
+                    continue;
+                }
+
+                bool executable = file.GetAttribute(IsExecutableXmlAttribute, false);
+                bool manifest = file.GetAttribute(IsManifestXmlAttribute, false);
+                int order = file.GetAttribute(BinderPositionXmlAttribute, -1);
+
+                if (executable || manifest || order == -1) {
+                    // skip executables, manifests, and non-existent files.
+                    continue;
+                }
+
+                string! name = (!)(file.GetAttribute(FileNameXmlAttribute, ""));
+                IoMemory memory = Resources.GetLoadedImageMemory(order);
+
+                if (memory == null) {
+                    DebugStub.WriteLine("Failure loading name={0} order={1}",
+                                        __arglist(name, order));
+                    throw new Exception("Cannot load image");
+                }
+
+                // register the executable's image
+                root.RegisterIoMemory(name, memory);
+            }
+        }
+
+        private static void InstallGroups(XmlNode! config)
+        {
+            UTF8Encoding encoder = new UTF8Encoding();
+
+            // get all group definitions to register from the xml
+            XmlNode groupsConfig = config.GetChild(GroupListXmlTag);
+
+            if (groupsConfig == null) {
+                return;
+            }
+
+            DirNode! groot = rootDir;
+
+            foreach (XmlNode! group in groupsConfig.Children) {
+                if (group.Name != GroupEntryXmlTag) {
+                    continue;
+                }
+                string! path = (!)group.GetAttribute(GroupEntryPathXmlAttribute, "");
+                string! desc = (!)group.GetAttribute(GroupEntryDescriptionXmlAttribute,
+                                                     "");
+
+                // DebugStub.WriteLine("Current group: name: {0}, description: {1}",
+                // __arglist(path, desc));
+
+                if (!path.Equals("")) {
+                    int length = path.Length;
+                    int index = path.LastIndexOf('/');
+
+                    if (index != length-1) {
+                        string! name = (!)path.Substring(index+1);
+                        DirNode dir = GetContainingFolder(groot, path, false);
+
+                        if (dir != null) {
+                            byte[] bytes = encoder.GetBytes(desc);
+
+                            if (bytes == null) {
+                                continue;
+                            }
+
+                            int size = bytes.Length;
+                            IoMemory memory = IoMemory.AllocateRealFixed((UIntPtr)size);
+
+                            if (memory != null) {
+                                // DebugStub.WriteLine("wrote the bytes");
+                                memory.Write8(0, bytes);
+                                // register the group definition
+                                dir.RegisterIoMemory(name, memory);
+                                // DebugStub.WriteLine("Registered the memory");
+                            }
+                        }
+                        else {
+                            // DebugStub.WriteLine("Could not get the containing folder");
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void InstallAcls(XmlNode! config, ISdsAcl! aclT)
+        {
+            // read the rules section from the config
+            XmlNode node = config.GetChild(AclListXmlTag);
+            if (node == null) {
+                return;
+            }
+
+            foreach (XmlNode! rule in node.Children) {
+                if (rule.Name != AclEntryXmlTag) {
+                    continue;
+                }
+
+                string path = (!)rule.GetAttribute(AclEntryPathTag, null);
+                if (path == null) {
+                    continue;
+                }
+                string aclThis = rule.GetAttribute(AclEntryThisTag, null);
+                if (aclThis == null) {
+                    continue;
+                }
+
+                string aclInherited = rule.GetAttribute(AclEntryInheritedTag, null);
+                aclT.Set(path, new Acl(aclThis, aclInherited));
+            }
+        }
+
+        private static string GetFolderName(string! image)
+        {
+            if (image.EndsWith(DirectoryService.ExecutableExtension)) {
+                return (!)image.Substring(0, image.Length -
+                                          DirectoryService.ExecutableExtension.Length);
+            }
+            else if (image.EndsWith(DirectoryService.ManifestExtension) ||
+                     // [TODO] is the following line still correct?
+                     image.EndsWith(DirectoryService.ManifestFile)) {
+                return null;
+            }
+            else {
+                return image;
+            }
+        }
+
+        private static DirNode GetContainingFolder(DirNode! start, string! path, bool mode)
+        {
+            // DebugStub.WriteLine("GetContainingFolder: Start: {0}, Path: {1}",
+            // __arglist(start.NodeName, path));
+            string[] split = (!)path.Split('/');
+
+            DirNode current = start;
+            int size;
+
+            if (mode) {
+                size = split.Length;
+            }
+            else {
+                size = split.Length - 1;
+            }
+
+            for (int i = 0; i < size; i++) {
+                // DebugStub.WriteLine("Current split: {0}", __arglist(split[i]));
+                if (split[i] != "") {
+                    StringBuilder sb = new StringBuilder(((!)split[i]).Length + 1);
+                    sb.Append("/");
+                    sb.Append(split[i]);
+                    // DebugStub.WriteLine("Looking up directory: /{0}", __arglist(split[i]));
+                    DirNode temp = current.FindDirectory(sb);
+                    ErrorCode error;
+                    if (temp == null) {
+                        // DebugStub.WriteLine("Directory does not exist. Trying to create");
+                        if (current.CreateDirectory((!)split[i], out error)) {
+                            // DebugStub.WriteLine("Created the directory");
+                            current = current.FindDirectory(sb);
+                            if (current != null) {
+                                // DebugStub.WriteLine("Found what created");
+                            }
+                            else {
+                                return null;
+                                // DebugStub.WriteLine("Cannot find what created");
+                            }
+                        }
+                        else {
+                            // DebugStub.WriteLine("Failed to create the directory");
+                            return null;
+                        }
+                    }
+                    else {
+                        current = temp;
+                    }
+                }
+            }
+            return current;
+        }
+
+///////////////////////////////////////////////////////////////////////////////
+// begin kernel only functions
+///////////////////////////////////////////////////////////////////////////////
+        public static bool SetIoFS([Claims]IoMemFSContract.Imp:Ready! imp)
+        {
+            DebugStub.WriteLine(" SetIoFs");
+#if !SINGULARITY_PROCESS
+            ioFSImpRef = new TRef<IoMemFSContract.Imp:Ready>(imp);
+            return true;
+#else
+            return false;
+#endif
+        }
+
+        public static IoMemFSContract.Imp:Ready AcquireIoFS()
+        {
+#if !SINGULARITY_PROCESS
+            if ( ioFSImpRef != null) {
+                return ioFSImpRef.Acquire();
+            }
+            else {
+                DebugStub.Break();
+            }
+#endif
+            return null;
+        }
+
+
+        public static bool ReleaseIoFS([Claims]IoMemFSContract.Imp:Ready! io)
+        {
+#if !SINGULARITY_PROCESS
+            if ( ioFSImpRef != null) {
+               ioFSImpRef.Release(io);
+               return true;
+            }
+            else {
+                DebugStub.Break();
+            }
+#endif
+            delete io;   // this is not right.
+            return false;
+        }
+
+
+        public static bool RegisterIoMemory(DirNode dirNode, string! path, IoMemory! ioMem)
+        {
+#if !SINGULARITY_PROCESS
+            if (dirNode != null)
+                return dirNode.RegisterIoMemory(path, ioMem);
+            return false;
+#else
+            return false;
+#endif
+        }
+
+        public static bool CreateDirectory(DirNode node, string! path)
+        {
+#if !SINGULARITY_PROCESS
+            ErrorCode error;
+            if (null != node)
+                return node.CreateDirectory(path, out error);
+            return false;
+#else
+            return false;
+#endif
+        }
+
+        public static bool CreateSymbolicLink(DirNode node, string! path, string! val)
+        {
+#if !SINGULARITY_PROCESS
+            if (null != node)
+                return node.CreateLink(path,val);
+            return false;
+#else
+            return false;
+#endif
+        }
+
+        public static DirNode FindDirectory(string! path)
+        {
+#if !SINGULARITY_PROCESS
+            if (path == "/")return rootDir;
+            return rootDir.FindDirectory(new StringBuilder(path));
+#else
+            return null;
+#endif
+         }
+
+        public static DirNode FindDirectory(string! path, bool createIfNull)
+        {
+            if (!createIfNull) {
+                return FindDirectory(path);
+            }
+
+            // parse the name, one directory token at a time.  If the token
+            // exists, advance to it, otherwise, create it and advance to it
+            ErrorCode error;
+            DirNode nexttree;
+            DirNode! currenttree = (!) DirectoryService.FindDirectory("/");
+
+            foreach (string folder in path.Split('/')) {
+                // don't do the first entry, as it is the root, "/", which we
+                // already have in root
+                if (folder != "") {
+                    StringBuilder! p = new StringBuilder("/" + folder);
+
+                    nexttree = currenttree.FindDirectory(p);
+                    if (nexttree == null) {
+                        currenttree.CreateDirectory((!)folder, out error);
+                        nexttree = currenttree.FindDirectory(p);
+                    }
+                    currenttree = (!) nexttree;
+                }
+            }
+            return currenttree;
+        }
+
+///////////////////////////////////////////////////////////////////////////////
+// end kernel only functions
+///////////////////////////////////////////////////////////////////////////////
+
+        public static void Finalize()
+        {
+        }
+   }
+}
diff --git a/base/Kernel/Singularity.Directory/DirectoryServiceWorker.sg b/base/Kernel/Singularity.Directory/DirectoryServiceWorker.sg
new file mode 100644
index 0000000..b245930
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/DirectoryServiceWorker.sg
@@ -0,0 +1,195 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryServiceWorker.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Directory.WorkerFunctions;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    using SharedHeap = Microsoft.Singularity.Memory.SharedHeap;
+
+    class DirectoryServiceWorker
+    {
+        private TRef<DirectoryServiceContract.Exp:Start> epRef;
+        private DirNode! dirNode;
+
+        private DirectoryServiceWorker(DirNode! dirNode,
+                                      [Claims] DirectoryServiceContract.Exp:Start! i_ep)
+            requires i_ep.InState(DirectoryServiceContract.Start.Value);
+        {
+            epRef = new TRef<DirectoryServiceContract.Exp:Start>(i_ep);
+            this.dirNode = dirNode;
+            base();
+        }
+
+        private void Start()
+        {
+#if !SINGULARITY_PROCESS
+            Thread thread = Thread.CreateThread(DirectoryService.processForWorkerThreads,
+                                                new ThreadStart(Run));
+#else
+            Thread thread = new Thread (new ThreadStart(Run));
+#endif
+
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+
+        public static void Create(DirNode! dirNode,
+                                  [Claims] DirectoryServiceContract.Exp:Start! i_ep)
+        {
+            //
+            // We need to do some trickery to pass the ownership of i_ep to
+            // the thread that will run the worker.
+            // We are currently working on behalf of some user process, but
+            // the worker thread will be a kernel thread.
+            // The transfer has to happen after we released the i_ep into the TRef
+            // but before we acquire the TRef. This is because the Release and Acquire
+            // operations actually cause the endpoint to be dereferenced and that
+            // must happen by the correct owner.
+
+            // The TRef implementation in the kernel now takes care of this.
+
+            DirectoryServiceWorker worker;
+
+            worker = new DirectoryServiceWorker(dirNode, i_ep);
+
+            // Now start the worker, which will acquire the endpoint in the TRef.
+            worker.Start();
+        }
+
+        private void Run()
+        {
+            bool success;
+            int code;
+            char* opt(ExHeap[]) path;
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug,"new thread={0:x8}",(UIntPtr)Kernel.AddressOf(Thread.CurrentThread));
+#endif
+            assert epRef != null;
+            DirectoryServiceContract.Exp ep = epRef.Acquire();
+
+            epRef = null;
+
+            ep.SendSuccess();
+            try {
+                for (bool run = true; run;) {
+                    switch receive {
+                        case ep.Bind(i_path, i_server) :
+                             WorkerFunctions.DoBind(dirNode, ep, i_path, i_server);
+                             break;
+
+                        case ep.BeginEnumeration() :
+                            WorkerFunctions.DoEnumerate(dirNode, ep);
+                            break;
+
+                        case ep.GetAttributes( char []! in ExHeap i_path) :
+                            WorkerFunctions.DoGetAttributes(dirNode, ep, i_path);
+                            break;
+
+                        case ep.ReadEnumeration() :
+                            WorkerFunctions.DoMore(dirNode, ep);
+                            break;
+
+                        case ep.Notify(i_path, i_pattern, i_sendExisting, i_notifyImp):
+                            WorkerFunctions.DoNotify(dirNode, ep,i_path, i_pattern, i_sendExisting, i_notifyImp);
+                            break;
+
+                        case ep.Register(i_path, i_provider):
+                            WorkerFunctions.DoRegister(dirNode, ep, i_path, i_provider);
+                            break;
+
+                        case ep.EndEnumeration() :
+                            WorkerFunctions.DoStop(dirNode, ep);
+                            break;
+
+                        case ep.Deregister(i_path):
+                            WorkerFunctions.DoDeregister(dirNode, ep, i_path);
+                            break;
+
+                        case ep.CreateDirectory(i_name) :
+                            WorkerFunctions.DoCreateDirectory(dirNode, ep,i_name);
+                            break;
+
+                        case ep.DeleteDirectory(i_name) :
+                            WorkerFunctions.DoDeleteDirectory(dirNode, ep,i_name);
+                            break;
+
+                        case ep.CreateFile( char []! in ExHeap i_name) :
+                            WorkerFunctions.DoCreateFile(dirNode, ep,i_name);
+                            break;
+
+                        case ep.DeleteFile(i_name):
+                            WorkerFunctions.DoDeleteFile(dirNode, ep,i_name);
+                            break;
+
+                        case ep.QueryACL(char[]! in ExHeap i_name, bool effective):
+                            WorkerFunctions.DoQueryACL(dirNode, ep, i_name, effective);
+                            break;
+
+                        case ep.StoreACL(char[]! in ExHeap i_name,
+                                         char[] in ExHeap aclThis, char[] in ExHeap aclInherited):
+                            WorkerFunctions.DoStoreACL(dirNode, ep, i_name, aclThis, aclInherited);
+                            break;
+
+                       case ep.CreateAndBindFile(char []! in ExHeap i_name, FileContract.Exp:Start! exp) :
+                            WorkerFunctions.DoCreateAndBindFile(dirNode, ep, i_name, exp);
+                            break;
+
+                        case ep.CreateLink(i_name,i_value) :
+                            WorkerFunctions.DoCreateLink(dirNode, ep,i_name, i_value);
+                            break;
+
+                        case ep.DeleteLink(i_name):
+                            WorkerFunctions.DoDeleteLink(dirNode, ep,i_name);
+                            break;
+
+                        case ep.GetLinkValue(i_name):
+                            WorkerFunctions.DoGetLinkValue(dirNode, ep,i_name);
+                            break;
+
+                        case ep.ChannelClosed():
+#if SINGULARITY_PROCESS
+                            //DebugStub.WriteLine("SDSWorker Thread shutting down");
+#endif
+                            run = false;
+                            break;
+
+                        case unsatisfiable:
+                            DebugStub.Print("NameServiceWorker shutting down\n");
+                            DebugStub.Break();
+                            run = false;
+                            break;
+                    }//switch
+                } //for
+            } //try
+            finally {
+                delete ep;
+            }
+        } //run
+    } //DirectoryServiceWorker class
+} //namespace
diff --git a/base/Kernel/Singularity.Directory/IoMemoryNode.sg b/base/Kernel/Singularity.Directory/IoMemoryNode.sg
new file mode 100644
index 0000000..9ae2bdc
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/IoMemoryNode.sg
@@ -0,0 +1,424 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoMemoryNode.sg
+//
+//  Note: internal node type used to support IoMemory images
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+
+    public class IoMemoryNode : Node
+    {
+        public IoMemory! ioMemory;
+
+        public IoMemoryNode(IoMemory! ioMem, string! name, Node! parent)
+        {
+            this.ioMemory = ioMem;
+            base(NodeType.IoMemory, name, parent);
+        }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 string! fullPath,
+                                                 Principal pr,
+                                                 int curpos,
+                                                 out int position,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 out string linkPrefix,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service)
+        {
+            Kernel.Waypoint(3200);
+            reparse = false;
+            link = null;
+            success = false;
+            linkFound = false;
+            linkPrefix = null;
+            position = curpos;
+
+            if (! (p.Length == 0) ){
+                error = ErrorCode.NotFound;
+                return service;
+            }
+
+            // The FileContract needs to be subdivided into Read and Write, then
+            // we can determine which permissions to use here.  For now, it must
+            // be the case that all  uses (if any) of IoMemory objects in the file system
+            // are read-only. [EPW]
+            if (!CheckAccess(SdsAclPerms.ModeRead, pr, service)) {
+                DebugStub.WriteLine("No access to IoMemoryNode.Bind");
+                error = ErrorCode.AccessDenied;
+                return service;
+            }
+
+#if !SINGULARITY_PROCESS
+            Tracing.Log(Tracing.Debug, "Starting stream IoMemory writer");
+
+            //send a bind message to the IoMemory FS with the endpoint and the cookie as args.
+            FileContract.Exp:Start fp = service as FileContract.Exp;
+            if (fp == null) {
+                success = false;
+                error = ErrorCode.ContractNotSupported;
+                return service;
+            }
+
+            Kernel.Waypoint(3201);
+
+            IoMemFSContract.Imp:Ready io = Directory.DirectoryService.AcquireIoFS();
+            if (io != null) {
+                Kernel.Waypoint(3202);
+                io.SendConnect(fp, (UIntPtr)ioMemory.VirtualAddress, ioMemory.Length);
+                Kernel.Waypoint(3203);
+                io.RecvAckConnect();
+                Kernel.Waypoint(3204);
+                Directory.DirectoryService.ReleaseIoFS(io);
+                success = true;
+            }
+            else {
+                DebugStub.Break();
+                delete fp;
+                success = false;
+            }
+            Kernel.Waypoint(3205);
+            error = ErrorCode.NoError;
+            return null;
+#endif
+            error = ErrorCode.NotImplemented;
+            return service;
+        }
+
+        /// <returns>
+        /// null on success, the sp argument if it failed.
+        /// </returns>
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            // cannot register over an existing provider
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.NotSupported;
+            position = curpos;
+            return sp;
+        }
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start Deregister(StringBuilder! path,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               int curpos,
+                                                               out int position,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            link  = null;
+            linkFound = false;
+            reparse = false;
+            error = ErrorCode.NotSupported;
+            position = curpos;
+            if (! (path.Length == 0) ) {
+                return null;
+            }
+
+            // we are being removed
+            // the remove will fail!
+
+            // if we ever allow deregister of IoMemoryNode
+            // do not forget to add an access control check.
+            return null;
+        }
+
+
+        /// <returns>
+        /// if true returns length and node type, otherwise error
+        /// </returns>
+        public override bool GetAttributes(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link,
+                                        out long length,
+                                        out NodeType nodeType
+                                        )
+        {
+            linkFound = false;
+            reparse = false;
+            link = null;
+            error = ErrorCode.NoError;
+            position = curpos;
+            nodeType = NodeType.IoMemory;
+            length = ioMemory.Length;
+            return true;
+        }
+
+
+        /// <returns>
+        /// null on success, the imp argument if it failed.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! pathSpec,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  int curpos,
+                                                  out int position,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            // this method should never be called
+            error = ErrorCode.NotSupported;
+            reparse = false;
+            link = null;
+            linkFound = false;
+            position = curpos;
+            return notifyImp;
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return null;
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+
+            return false;
+     }
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+        public override bool DeleteDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            linkFound = false;
+            error = ErrorCode.NotLink;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+
+        public override bool QueryACL(StringBuilder! p,
+                                      bool effective,
+                                      Principal pr,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            linkFound = false;
+            error = ErrorCode.NoError;
+            reparse = false;
+            link = null;
+            position = curpos;
+            acl = new Acl();
+
+            if (CheckAccess(SdsAclPerms.ModeRead, pr)) {
+                error = ErrorCode.AccessDenied;
+                return false;
+            }
+            if (effective)
+                acl = new Acl(GetAclPattern());
+            else
+                acl = GetInstanceAcl();
+            return true;
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            linkFound = false;
+            error = ErrorCode.NoError;
+            reparse = false;
+            link = null;
+            position = curpos;
+            if (!CheckAccess(SdsAclPerms.ModeSetAcl, pr)) {
+                error = ErrorCode.AccessDenied;
+                return false;
+            }
+
+            SetInstanceAcl(acl);
+            return true;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/IoMemoryService.sg b/base/Kernel/Singularity.Directory/IoMemoryService.sg
new file mode 100644
index 0000000..96b0b99
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/IoMemoryService.sg
@@ -0,0 +1,122 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoMemoryNode.sg
+//
+//  Note: internal node type used to support IoMemory images
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using SharedHeap = Microsoft.Singularity.Memory.SharedHeap;
+
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.AccessControl;
+
+namespace Microsoft.Singularity.Directory
+{
+    contract IoMemFSContract
+    {
+        in  message Connect(FileContract.Exp:Start!ep,UIntPtr addr, int length);
+        out message AckConnect();
+        out message NakConnect(FileContract.Exp:Start! ep);
+
+        state Ready: one
+        {
+            Connect?  -> (AckConnect! or NakConnect!) -> Ready;
+        }
+    }
+
+    public class IoMemoryFS
+    {
+        private TRef<IoMemFSContract.Exp:Ready> ioRef;
+
+        public IoMemFSContract.Imp Start ()
+        {
+            IoMemFSContract.Imp! imp;
+            IoMemFSContract.Exp! sp;
+            IoMemFSContract.NewChannel(out imp, out sp);
+
+            ioRef = new TRef<IoMemFSContract.Exp:Ready>(sp);
+
+            // create the service thread to manage all requests for IoMemory objects
+            Thread thread = Thread.CreateThread(DirectoryService.processForWorkerThreads,
+                                                new ThreadStart(IoFSPump));
+            if (thread != null) {
+                thread.Start();
+            }
+            else {
+                // make sure caller does not hang
+                sp = ioRef.Acquire();
+                delete sp;
+            }
+            return imp;
+        }
+
+        private void IoFSPump()
+        {
+            bool success;
+            int code;
+            char[] in ExHeap path;
+            EMap<FileContract.Exp:Ready,IoMemory> clients;
+
+            assert ioRef != null;
+            IoMemFSContract.Exp io = ioRef.Acquire();
+            clients = new EMap<FileContract.Exp:Ready,IoMemory>();
+
+            for (bool run = true; run;) {
+                switch receive  {
+                    case io.Connect(ep,UIntPtr addr, int len):
+                        Kernel.Waypoint(3310);
+                        // TODO this must be mapped into *user* space
+                        IoMemory ioMem = IoMemory.Wrap(addr, (uint)len, true, true);
+                        ep.SendSuccess();
+                        Kernel.Waypoint(3311);
+                        clients.Add(ep,ioMem);
+                        Kernel.Waypoint(3312);
+                        io.SendAckConnect();
+                        Kernel.Waypoint(3313);
+                        break;
+                    case ep.Read(i_buffer, i_bufferOffset, fileOffset, count)in clients~>ioMem:
+                        Kernel.Waypoint(3300);
+                        int ioLength = 0;
+                        if (ioMem != null){
+                            ioLength = ioMem.Length;
+                        }
+                        int offset = (int) fileOffset;
+                        //DebugStub.Print(" NS read. fileOff="+
+                        if (offset >= ioLength) {
+                            ep.SendAckRead(i_buffer,0,1); //error
+                            clients.Add(ep,ioMem);
+                            Kernel.Waypoint(3301);
+                            break;
+                        }
+                        int readLen = Math.Min((int) count,  Math.Max(0,ioLength - (int)fileOffset) );
+                        Bitter.FromIoMemory(i_buffer, (int) i_bufferOffset, readLen,
+                                            ioMem, (int)fileOffset);
+                        ep.SendAckRead(i_buffer,readLen,0);
+                        clients.Add(ep,ioMem);
+                        Kernel.Waypoint(3302);
+                        break;
+                    case ep.ChannelClosed() in clients~>ioMem :
+                        delete ep;
+                        break;
+                    case unsatisfiable :
+                        run = false;
+                        break;
+                }
+            }
+            clients.Dispose(); //delete ep;
+            delete io;
+        }
+    } //IoMemory Service
+}
diff --git a/base/Kernel/Singularity.Directory/Node.sg b/base/Kernel/Singularity.Directory/Node.sg
new file mode 100644
index 0000000..ed94b87
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/Node.sg
@@ -0,0 +1,344 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Node.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    public abstract class Node
+    {
+        // base class for all node types in name space
+
+        private string! nodeName;
+
+        /// <summary>
+        /// The policy object controlling the access to this node
+        /// </summary>
+        private AclCore! core;
+        private ISdsAcl! aclT;
+        /// <summary>
+        /// ACLs here are not persistent.
+        /// </summary>
+        private IEffectiveAclRef aclRef = null;
+
+        private readonly NodeType nodeType;
+
+        protected Node(NodeType nodeType, string! name, AclCore! core, ISdsAcl! aclT)
+        {
+            this.nodeType = nodeType;
+            this.nodeName = name;
+            this.core = core;
+            this.aclT = aclT;
+        }
+
+        protected Node(NodeType nodeType, string! name, Node! parent)
+        {
+            this.nodeType = nodeType;
+            if (parent.nodeName[parent.nodeName.Length-1] == '/')
+                this.nodeName = parent.nodeName + name;
+            else
+                this.nodeName = parent.nodeName + "/" + name;
+            this.core = parent.core;
+            this.aclT = parent.aclT;
+        }
+
+        public string GetAclPattern()
+        {
+            // this depends on the atomicity of pointer writes
+            string aclPattern;
+            if (this.aclRef != null && this.aclRef.GetCached(out aclPattern))
+                return aclPattern;
+            return aclT.GetEffective(nodeName, out this.aclRef);
+        }
+
+        public bool CheckAccess(AccessMode! permission, Principal pr)
+        {
+            string ap = GetAclPattern();
+            return core.CheckAccess(ap, permission, pr);
+        }
+
+        public bool CheckAccess(AccessMode! permission, Principal pr, Endpoint*! in ExHeap ep)
+        {
+            string ap = GetAclPattern();
+            if (!core.CheckAccess(ap, permission, pr))
+                return false;
+            Principal pr2 = AclCore.EndpointPeer(ep);
+            if (pr.Equal(pr2))
+                return true;
+            return core.CheckAccess(ap, permission, AclCore.EndpointPeer(ep));
+        }
+
+        public Acl GetInstanceAcl()
+        {
+            return aclT.Get(nodeName);
+        }
+
+        public void SetInstanceAcl(Acl acl)
+        {
+            aclT.Set(nodeName, acl);
+        }
+
+        public void ClearAcl()
+        {
+            aclT.Clear(nodeName);
+        }
+
+        public string! FullName { get { return nodeName; } }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public abstract ServiceContract.Exp Bind(StringBuilder! p,
+                                                 string! fullPath,
+                                                 Principal pr,
+                                                 int curpos,
+                                                 out int position,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 out string linkPrefix,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service);
+
+
+        /// CreateAndBindFile
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                                           Principal pr,
+                                                           int curpos,
+                                                           out int position,
+                                                           out bool linkFound,
+                                                           out ErrorCode error,
+                                                           out bool reparse,
+                                                           out string link
+                                                           );
+
+        /// CreateDirectory
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool CreateDirectory(StringBuilder! p,
+                                             Principal pr,
+                                             int curpos,
+                                             out int position,
+                                             out bool linkFound,
+                                             out ErrorCode error,
+                                             out bool reparse,
+                                             out string link
+                                             );
+
+        /// CreateFile
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+
+        /// CreateFile
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+        /// DeleteDirectory
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool DeleteDirectory(StringBuilder! p,
+                                             Principal pr,
+                                             int curpos,
+                                             out int position,
+                                             out bool linkFound,
+                                             out ErrorCode error,
+                                             out bool reparse,
+                                             out string link
+                                             );
+        /// DeleteFileusing Microsoft.SingSharp;
+
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+
+        /// DeleteLink
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        );
+
+
+        /// GetLinkValue
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool GetLinkValue(StringBuilder! p,
+                                          Principal pr,
+                                          int curpos,
+                                          out int position,
+                                          out bool linkFound,
+                                          out ErrorCode error,
+                                          out bool reparse,
+                                          out string link
+                                          );
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public abstract ServiceProviderContract.Imp:Start Deregister(StringBuilder! path,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               int curpos,
+                                                               out int position,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               );
+
+
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool GetAttributes(StringBuilder! p,
+                                           Principal pr,
+                                           int curpos,
+                                           out int position,
+                                           out bool linkFound,
+                                           out ErrorCode error,
+                                           out bool reparse,
+                                           out string link,
+                                           out long length,
+                                           out NodeType nodeType
+                                           );
+
+
+
+        /// <returns>
+        /// null on success, the imp argument if it failed.
+        /// </returns>
+        public abstract NotifyContract.Imp Notify(StringBuilder! pathSpec,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  int curpos,
+                                                  out int position,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp);
+
+        /// QueryACL
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool QueryACL(StringBuilder! p,
+                                      bool effective,
+                                      Principal pr,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      );
+
+
+        /// Register
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      );
+
+        /// StoreACL
+        /// <returns>
+        /// true if  success false if it fails.
+        /// </returns>
+        public abstract bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      );
+
+
+        public NodeType Type
+        {
+            get
+            {
+                return this.nodeType;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/NotificationManager.sg b/base/Kernel/Singularity.Directory/NotificationManager.sg
new file mode 100644
index 0000000..05949c0
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/NotificationManager.sg
@@ -0,0 +1,244 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NotifcationManager.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    public static class NotificationManager
+    {
+        private static object!   monitor;
+        private static Queue!    requests; 
+        private static TRef<NotificationQueueContract.Exp:RUNNING>! notificationExpTRef;
+        private static TRef<NotificationQueueContract.Imp:RUNNING>! notificationImpTRef;
+        private static StringBuilder! sb;
+        private static bool notificationThreadStarted; 
+        
+        internal contract NotificationQueueContract
+        {
+            in message  WaitForData();
+            out message AckWaitForData();
+
+            state RUNNING : one
+            {
+                WaitForData? -> AckWaitForData! -> RUNNING;
+            }
+        }
+
+        internal class RequestEntry{
+            internal DirNode! dir;
+            internal string!  name;
+            internal NotifyType type; 
+            internal DictionaryEntry trefLoc; 
+                      
+            public RequestEntry(DirNode! n, string! name, NotifyType type)
+            {
+                this.dir = n; 
+                this.name = name;
+                this.type = type;
+            }
+        }
+        
+        public static void Initialize()
+        {
+            requests = new Queue();
+            monitor =  new object();
+            sb = new StringBuilder(512);
+            notificationThreadStarted = false;
+               
+            // Create an internal contract to communicate with worker thread.
+            // We use a message rather than a monitor so that the worker may
+            // create a set to wait on all its acks and for potential new work. 
+            // This is needed because we cannot wait on both events and messages.  
+               
+            NotificationQueueContract.Imp! notificationImp;
+            NotificationQueueContract.Exp! notificationExp;
+            NotificationQueueContract.NewChannel(out notificationImp,
+                                                    out notificationExp);
+            notificationImpTRef =
+                new TRef<NotificationQueueContract.Imp:RUNNING(notificationImp);
+            notificationExpTRef =
+                new TRef<NotificationQueueContract.Exp:RUNNING(notificationExp);
+
+        }
+        
+        
+        // must be called after scheduler is started
+        public static void StartNotificationThread()
+        {
+            notificationThreadStarted = true; 
+             // start worker thread to dequeue items
+#if !SINGULARITY_PROCESS
+            Thread.CreateThread(Thread.CurrentProcess, new ThreadStart(NotificationWorkerMain)).Start();
+#else
+            (new Thread (new ThreadStart(NotificationWorkerMain))).Start();
+#endif
+
+        }
+        
+        public static bool EnqueueNotification(DirNode! n, string! name, NotifyType type)
+        {
+            RequestEntry r = new RequestEntry(n,name,type);
+            lock (monitor) {
+                requests.Enqueue(r);
+            }
+            // cannot perform a wait operation until the scheduler has been started
+            if (notificationThreadStarted) {
+                NotificationQueueContract.Imp f = notificationImpTRef.Acquire();
+                f.SendWaitForData();
+                f.RecvAckWaitForData();
+                notificationImpTRef.Release(f);
+            }
+            return true;    
+        }
+        
+        internal static bool isMatch(string! name, string! pattern)
+        {
+            bool match = false;
+            bool continueMatch = true;
+            string prefix = null;
+            string postfix = null;
+
+            int starPos = pattern.IndexOf("*");
+
+            if (starPos != -1) {
+                if (starPos == 0) {
+                    prefix = null;
+                    postfix = pattern.Substring(1);
+                }
+                else if (starPos == pattern.Length-1) {
+                    prefix = pattern.Substring(0, pattern.Length-1);
+                    postfix = null;
+                }
+                else {
+                    prefix = pattern.Substring(0, starPos);
+                    postfix = pattern.Substring(starPos+1);
+                }
+
+                if (prefix != null) {
+                    if (!name.StartsWith(prefix)) {
+                        continueMatch = false;
+                    }
+                }
+                if (continueMatch && postfix != null) {
+                    if (!name.EndsWith(postfix)) {
+                        continueMatch = false;
+                    }
+                }
+                match = continueMatch;
+            }
+            else if (pattern == name) {
+                match = true;
+            }
+
+            //DebugStub.WriteLine("name={0} pre={1} post={2} match={3}",
+            //                    __arglist(name, prefix, postfix, match));
+            return match;
+        }
+
+        private static void ReturnTRef ([Claims] NotifyContract.Imp! ep, 
+                                        RequestEntry! request)
+        {
+            
+            if (request.trefLoc.Value == null) {
+                DebugStub.Break();
+                delete ep;
+            }
+            
+            else {
+                TRef <NotifyContract.Imp:Notify>! x = 
+                    (TRef <NotifyContract.Imp:Notify>) request.trefLoc.Value;
+                x.Release(ep);   
+            }
+        }
+        
+        private static void Notify(RequestEntry! request,    
+                                   EMap<NotifyContract.Imp:NotifyAck, RequestEntry!>! notifyEpMap)
+        {
+            if (request.dir.notificationList == null) {
+                return;
+            }
+
+            foreach (DictionaryEntry n in request.dir.notificationList) {
+                string pattern = (string!) n.Key;
+                bool match = isMatch(request.name,pattern);
+
+                if (match) {
+                    NotifyContract.Imp! notifyEP =
+                        ((TRef <NotifyContract.Imp:Notify>!) n.Value).Acquire();
+                    assert notifyEP.InState(NotifyContract.Notify.Value);
+                    notifyEP.SendChangeNotification(Bitter.FromString2(request.name),request.type);
+                    // add ep,request to map 
+                    request.trefLoc = n; 
+                    notifyEpMap.Add(notifyEP,request); 
+                    Tracing.Log(Tracing.Debug,"notifying: pattern="+pattern+" path="+request.name+" type="+request.type);
+                }
+            } //foreach
+        }
+        
+        private static void DequeueWork(EMap<NotifyContract.Imp:NotifyAck, RequestEntry!>! notifyEpMap)
+        {
+            lock (monitor) {
+                int count = requests.Count;
+                for(int i = 0; i < count; i++) {
+                   object o = requests.Dequeue();
+                   Notify( (RequestEntry!) o, notifyEpMap);
+                }
+            }
+        }
+        
+        private static void NotificationWorkerMain()
+        {
+            
+            //  map to hold <NotifyEp,RequestEntry> tuples
+            EMap<NotifyContract.Imp:NotifyAck, RequestEntry!> notifyEpMap = 
+                new EMap<NotifyContract.Imp:NotifyAck,RequestEntry!>();
+            
+            bool shutdown = false; 
+                
+            NotificationQueueContract.Exp internalChannel; 
+            internalChannel = notificationExpTRef.Acquire();
+            
+            // handle initial requests. Entries were added before the
+            // scheduler was started. As a result it was not possible to 
+            // send a message.
+            // DequeueWork((!)notifyEpMap);
+
+            while (shutdown ==  false) {
+                switch receive {
+                    case internalChannel.WaitForData():
+                        DequeueWork(notifyEpMap);
+                        internalChannel.SendAckWaitForData();
+                        break;
+                    case ep.AckChangeNotification() in notifyEpMap ~> request:
+                        // return the tref
+                        ReturnTRef(ep, request); 
+                        break;
+                }
+            }
+            delete internalChannel;
+            notifyEpMap.Dispose();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/Path.sg b/base/Kernel/Singularity.Directory/Path.sg
new file mode 100644
index 0000000..f327941
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/Path.sg
@@ -0,0 +1,84 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Nameserver.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+#if !SINGULARITY_PROCESS 
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif 
+{
+    public class Path
+    {
+        ArrayList! elts;
+
+        public Path(String! s)
+        {
+            string[] sa = s.Split("/".ToCharArray());
+            ArrayList elts = this.elts = new ArrayList(sa);
+            elts.RemoveAt(0); // since paths start with a slash, the first one will be empty
+        }
+
+        public bool Empty { get { return this.elts.Count == 0; } }
+
+        public int Length()
+        {
+            return elts.Count;
+        }
+
+        public String StripLast()
+        {
+            int pos = elts.Count - 1;
+            String s = (String)elts[pos];
+            elts.RemoveAt(pos);
+            return s;
+        }
+
+        public void Append(String elt)
+        {
+            elts.Add(elt);
+        }
+
+        public String FirstElement()
+        {
+            return (String)elts[0];
+        }
+
+        public void RemoveFirstElement()
+        {
+            elts.RemoveAt(0);
+        }
+
+        public String! PathString()
+        {
+            String result = "";
+            IEnumerator e = elts.GetEnumerator();
+            while (e.MoveNext()) {
+                result += "/" + e.Current;
+            }
+            return result;
+        }
+
+        public char[]! in ExHeap PathVector()
+        {
+            String result = PathString();
+            return Bitter.FromString2(result);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/Property.sg b/base/Kernel/Singularity.Directory/Property.sg
new file mode 100644
index 0000000..c5d4122
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/Property.sg
@@ -0,0 +1,43 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#if !SINGULARITY_PROCESS 
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif 
+{
+    public class Property
+    {
+        private string name;
+        private byte[] value;
+
+        public Property(string! name, byte[]! value)
+        {
+            this.name = name;
+            this.value = value;
+        }
+
+        public string! Name
+        {
+            get
+            {
+                return name;
+            }
+        }
+
+        public byte[]! Value
+        {
+            get
+            {
+                return value;
+            }
+            set
+            {
+                this.value = value;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/ProviderNode.sg b/base/Kernel/Singularity.Directory/ProviderNode.sg
new file mode 100644
index 0000000..5e072f8
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/ProviderNode.sg
@@ -0,0 +1,549 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif
+{
+    // Although there currently are none, there might need to be access control
+    // checks at Bind time.  Certainly, the Bind target can do an access check,
+    // but the Bind intermediary, here, might also make a check.  See the discussion
+    // below.
+
+    public class ProviderNode : Node
+    {
+        public TRef<ServiceProviderContract.Imp:Start>! ServiceEndpoint;
+        private bool isDead;
+
+        public ProviderNode([Claims] ServiceProviderContract.Imp! imp, string! name, Node! parent)
+            requires imp.InState(ServiceProviderContract.Start.Value);
+        {
+            ServiceEndpoint = new TRef<ServiceProviderContract.Imp:Start>(imp);
+            isDead = false;
+            base(NodeType.ServiceProvider, name, parent);
+        }
+
+        public ServiceProviderContract.Imp:Start! GetServiceEndpoint() {
+                      return this.ServiceEndpoint.Acquire();
+        }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 string! fullPath,
+                                                 Principal pr,
+                                                 int curpos,
+                                                 out int position,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 out string linkPrefix,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service)
+        {
+            Kernel.Waypoint(3100);
+
+            reparse = false;
+            link = null;
+            linkPrefix = null;
+            success = false;
+            linkFound = false;
+            position = curpos;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.NotFound;
+                    reparse = true;
+                    link = p.ToString();
+                    return service;
+                }
+            }
+
+            // There continues to be an inconsistency here with access control.
+            // We might do the access control here on Bind, in which case we know
+            // the caller.  However, if we require the access control operation
+            // to be done on the other side of the Connect operation, then that
+            // code doesn't see the original invoker and moreover there is no
+            // appropriate AccessDenied failure on Connect.
+
+            // It seems a little weird to put access controls on the provider
+            // node, since such node are transient, but that is perhaps what we
+            // should do.
+
+            // If we decide to do ACL checks here, figure out how to get the
+            // permissions from the service endpoint!! No access check here until we do.
+
+            /*
+              if (!CheckNodeAccess(???, pr, service)) {
+                DebugStub.WriteLine("No access to bind");
+                error = ErrorCode.AccessDenied;
+                return service;
+            }
+            */
+
+            lock (this) {
+                Kernel.Waypoint(3101);
+                if (isDead) {
+                    success = false;
+                    error = ErrorCode.NotFound;
+                    return service;
+                }
+
+                ServiceProviderContract.Imp ep = this.ServiceEndpoint.Acquire();
+                assert ep.InState(ServiceProviderContract.Start.Value);
+                Tracing.Log(Tracing.Debug, "Connecting to Service Provider");
+                try {
+                    ep.SendConnect(service);
+                    switch receive {
+                        case ep.AckConnect():
+                            success = true;
+                            error = ErrorCode.NoError;
+                            return null;
+                        case ep.NackConnect(rejectedEP):
+                            Tracing.Log(Tracing.Debug,"nak connect ");
+                            // REVIEW what should be returned here?
+                            error = ErrorCode.ContractNotSupported;
+                            return rejectedEP;
+                        case ep.ChannelClosed():
+                            Tracing.Log(Tracing.Debug,"channel closed");
+                            // make this a zombie node
+                            isDead = true;
+                            error = ErrorCode.ChannelClosed;
+                            success = false;
+                            return null;
+                        case unsatisfiable:
+                            Tracing.Log(Tracing.Debug,"Unsatisfiable!!");
+                            error = ErrorCode.Unsatisfiable;
+                            success = false;
+                            return null;
+                    }
+                }
+                finally {
+                    this.ServiceEndpoint.Release(ep);
+                }
+                Kernel.Waypoint(3102);
+            } // lock on node
+        }
+
+        /// <returns>
+        /// Inform caller if peer endpoint is closed
+        /// remove endpoint if it is
+        /// </returns>
+        public bool DeleteIfPeerClosed ()
+        {
+            ServiceProviderContract.Imp! service;
+            service = this.ServiceEndpoint.Acquire();
+            if (service == null ) return false;
+
+            if (service.PeerClosed) {
+                delete service;
+                return true;
+            }
+            else {
+                this.ServiceEndpoint.Release(service);
+                return false;
+            }
+        }
+
+        /// <returns>
+        /// replace current dead sp with other
+        /// </returns>
+        public ServiceProviderContract.Imp  ReplaceProvider([Claims] ServiceProviderContract.Imp! sp)
+        {
+             DebugStub.WriteLine("replacing provider");
+             ServiceProviderContract.Imp! service;
+             service = this.ServiceEndpoint.Acquire();
+             if (service.PeerClosed) {
+                DebugStub.WriteLine("peer is closed. proceeding");
+                delete service;
+                this.ServiceEndpoint.Release(sp);
+                return null;
+             }
+             this.ServiceEndpoint.Release(service);
+             return sp;
+
+        }
+
+        /// <returns>
+        /// null on success, the sp argument if it failed.
+        /// </returns>
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            position = curpos;
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    return sp;
+                }
+            }
+
+            // check to see if this ep is stale.
+
+            // cannot register over an existing provider
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.AlreadyExists;
+            return sp;
+        }
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start  Deregister(StringBuilder! p,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               int curpos,
+                                                               out int position,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            link  = null;
+            linkFound = false;
+            reparse = false;
+            position = curpos;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    return null;
+                }
+            }
+
+            // Add the following access check on Deregister pursuant on the
+            // discussion about access controls on providers above.
+            /*
+              if (!CheckNodeAccess(DirPermissions.AccessModeRegister, pr, ep)){
+                error = ErrorCode.AccessDenied;
+                return null;
+            }
+            */
+
+            // we are being removed
+            error = ErrorCode.NoError;
+            return this.ServiceEndpoint.Acquire();
+        }
+
+
+        /// <returns>
+        /// if true returns length and node type, otherwise error
+        /// </returns>
+        public override bool GetAttributes(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link,
+                                        out long length,
+                                        out NodeType nodeType
+                                        )
+        {
+
+            position =curpos;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    length = 0;
+                    link = p.ToString();
+                    nodeType = NodeType.ServiceProvider;
+                    return false;
+                }
+            }
+
+            linkFound = false;
+            reparse = false;
+            link = p.ToString();
+            nodeType = NodeType.ServiceProvider;
+            length = 0;
+            error = ErrorCode.Unknown;
+            return true;
+        }
+
+
+        /// <returns>
+        /// null on success, the imp argument if it failed.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! p,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  int curpos,
+                                                  out int position,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/')  ) {
+                    // pass thru if  it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.Unknown;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    return notifyImp;
+                }
+            }
+            return notifyImp;
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return null;
+        }
+
+        private bool CheckForTraverse (StringBuilder! p,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.Unknown;
+            reparse = false;
+            link = null;
+
+            if (p.Length != 0) {
+                if ( (p.Length == 1)  && (p[0] == '/') ){
+                    // pass thru if it is just the delimiter character.
+                }
+                else {
+                    // we have hit a non-leaf service provider
+                    // send back a reparse message
+                    error = ErrorCode.NoError;
+                    reparse = true;
+                    linkFound = false;
+                    link = p.ToString();
+                    if (p[0] == '/')  link = link.Substring(1);
+                    return false;
+                }
+            }
+            return false;
+
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+        public override bool DeleteDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+
+        public override bool QueryACL(StringBuilder! p,
+                                      bool effective,
+                                      Principal pr,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            acl = new Acl();
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            position = curpos;
+            return CheckForTraverse(p, out linkFound, out error, out reparse, out link);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/ResolutionState.sg b/base/Kernel/Singularity.Directory/ResolutionState.sg
new file mode 100644
index 0000000..63bb402
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/ResolutionState.sg
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+namespace Microsoft.Application.DSP
+#endif
+{
+    using System;
+
+    /// <summary>
+    /// This class contains state accumulated during the resolution
+    /// of a namespace path.
+    /// </summary>
+    public class ResolutionState
+    {
+        /// <summary>
+        /// what we have resolved so far (modulo the current namespace provider)
+        /// </summary>
+        private string! resolved;
+
+        public ResolutionState()
+        {
+            resolved = "/";
+        }
+
+        public void UpdateResolved(string! current)
+        {
+            if (current.StartsWith("/") || resolved.EndsWith("/"))
+            {
+                resolved = resolved + current;
+            }
+            else
+            {
+                resolved = resolved + "/" + current;
+            }
+        }
+
+        public string! Resolved
+        {
+            get
+            {
+                return (!)resolved;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/SbUtils.sg b/base/Kernel/Singularity.Directory/SbUtils.sg
new file mode 100644
index 0000000..edaca34
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/SbUtils.sg
@@ -0,0 +1,165 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SbUtils.cs
+//          StringBuilder Utility Class
+//  Note:
+//
+
+using System;
+using System.Text; 
+using Microsoft.Singularity.Channels;
+
+#if !SINGULARITY_PROCESS 
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif 
+{
+    public class SbUtils
+    {
+        private const char delimiter = '/'; 
+
+        public static bool IsTail(StringBuilder! sb) 
+        {
+            if (sb.Length <= 1) return false; 
+            int pos = IndexOf(sb,delimiter,1); 
+            if (pos == -1) return true; 
+            return false; 
+        }
+        public static int IndexOf (StringBuilder! sb, char theChar, int startPos)
+        {
+            if (sb.Length == 0) return 0; 
+            for (int i = startPos ; i < sb.Length;  i++) {
+                if (sb[i] == theChar) return i; 
+            }
+            return -1; 
+        }
+
+        public static int LastIndexOf (StringBuilder! sb, char theChar, int startPos)
+        {
+            if (sb.Length == 0) return 0; 
+            for (int i = sb.Length ; i > startPos+1 ; i--) {
+                if (sb[i-1] == theChar) return i; 
+            }
+            return -1; 
+        }
+
+        public static bool Empty (StringBuilder! sb) 
+        { 
+            if ( sb.Length > 0) {
+                return true; 
+            }
+            else {
+                return false; 
+            }
+        }
+
+        public int Length(StringBuilder! sb)
+        {
+            return sb.Length;
+        }
+
+        public static StringBuilder! StripLast(StringBuilder! sb)
+        {
+            int pos = LastIndexOf(sb,delimiter,0); 
+            if (pos == -1) {
+                sb.Length = 1;  // just the delimiter
+            }
+            else if ( (pos+1) < sb.Length ) {
+                sb.Length = pos-1; 
+            }
+            else {
+                sb.Length = 0; 
+            }
+            return sb; 
+        }
+        
+       
+        public static StringBuilder! RemoveFirstElement(StringBuilder! sb, out int charCount)
+        {
+            return StripFirst(sb, out charCount); 
+        }
+        
+        public static StringBuilder! StripFirst(StringBuilder! sb, out int charCount)
+        {
+            charCount = 0; 
+            if ( sb[0] == delimiter){
+                charCount = 1;
+                int pos = IndexOf(sb, delimiter,1);  // just in case it starts with '/'
+                if (  (pos >= 0) && (pos < sb.Length ) ) {
+                    charCount = pos; 
+                    sb.Remove(0,pos); 
+                    return sb;
+                }
+                charCount = sb.Length;
+                sb.Length = 0; 
+                return sb; 
+            }
+            else {
+                int pos = IndexOf(sb,delimiter,0);  // just in case it starts with '/'
+                if (  (pos >= 0) && (pos < sb.Length ) ){
+                    charCount = pos; 
+                    sb.Remove(0,pos); 
+                    return sb; 
+                }
+                charCount = sb.Length;
+                sb.Length = 0; 
+                return sb; 
+            }
+       }
+
+        public static void Append(StringBuilder! sb, String! elt)
+        {
+            sb.Append(elt);
+        }
+
+        // Return a st
+        //
+        public static String FirstElement(StringBuilder! sb)
+        {
+            if (sb.Length == 0) return null; 
+            
+            if ( sb[0] == delimiter){
+                int pos = IndexOf(sb,delimiter,1);  
+              
+                // DebugStub.WriteLine("  FindFirst:pos={0},len={1},s={2}",__arglist(pos,sb.Length,sb.ToString())); 
+                //DebugStub.Break(); 
+                if (pos == -1) {
+                    if (sb.Length == 1) return null;  // just the delimiter 
+                    return sb.ToString(1,sb.Length-1); 
+                }
+                if (  (pos > 1) && (pos < sb.Length ) ) {
+                    return sb.ToString(1,pos-1); 
+                }
+                return null; 
+            }
+            else {
+                int pos = IndexOf(sb,delimiter,0); 
+                if (pos == -1) {
+                    return sb.ToString(); 
+                }
+                if ( (pos < sb.Length) && (pos > 0) ){
+                    return sb.ToString(0,pos); 
+                }
+                return null; 
+            }
+        }
+
+        public static String PathString(StringBuilder! sb)
+        {
+            if (sb.Length == 0 ) return null; 
+            return sb.ToString(); 
+        }
+
+        public static char[]! in ExHeap PathVector(StringBuilder! sb)
+        {
+            return Bitter.FromString2(sb.ToString());
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/SymLinkNode.sg b/base/Kernel/Singularity.Directory/SymLinkNode.sg
new file mode 100644
index 0000000..c5f598a
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/SymLinkNode.sg
@@ -0,0 +1,452 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SymLinkNode.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    // There are no access checks on symbolic links.
+    // In order to read a link, traverse access to the parent is sufficient.
+    // Although one might think that read access to the parent would be more
+    // appropriate here, the nature of the DirectoryService protocol allows anyone
+    // traversing a link to find the link value, hence there is no benefit to
+    // making "reading" of a link more strict.
+
+    public class SymLinkNode : Node
+    {
+        private string symbolicLink;
+
+        public SymLinkNode(string value, string! name, Node! parent)
+        {
+            symbolicLink = value;
+            base(NodeType.SymLink, name, parent);
+        }
+
+        /// <returns>
+        /// null on success, the service argument if it failed.
+        /// </returns>
+        public override ServiceContract.Exp Bind(StringBuilder! p,
+                                                 string! fullPath,
+                                                 Principal pr,
+                                                 int curpos,
+                                                 out int position,
+                                                 out bool success,
+                                                 out bool linkFound,
+                                                 out ErrorCode error,
+                                                 out bool reparse,
+                                                 out string link,
+                                                 out string linkPrefix,
+                                                 [Claims]
+                                                 ServiceContract.Exp! service)
+        {
+            Kernel.Waypoint(3500);
+            reparse = true;
+            success = true;
+            linkFound = true;
+            position = curpos;
+            error = ErrorCode.NoError;
+            string rest;
+            StringBuilder x;
+            StringBuilder y;
+
+            if (! (p.Length == 0)) {
+                rest = SbUtils.PathString(p);
+                assert rest != null;
+                link = symbolicLink + rest;
+                int prefixIndex = fullPath.IndexOf(rest);
+                if (-1 == prefixIndex) {
+                    DebugStub.WriteLine("Error processing a link");
+                    DebugStub.Break();
+                    linkPrefix = null;
+                }
+                else {
+                    x = new StringBuilder(fullPath.Substring(0,prefixIndex));
+                    y = x;
+                    y = SbUtils.StripLast(y);
+                    DebugStub.WriteLine(" symlink node: full={0}, partial={1}, stripped={2}", __arglist(fullPath, x.ToString(), y.ToString()));
+                    linkPrefix = y.ToString();
+                }
+            }
+            else {
+                link = symbolicLink;
+
+#if old
+                int pos = SbUtils.LastIndexOf(sb,'/',0);
+                if  ( pos == -1 ) pos = 0;
+                linkPrefix = fullPath.Substring(0,pos);
+                DebugStub.WriteLine(" symlink node: full={0}, stripped={1}", __arglist(fullPath, linkPrefix));
+#else
+                x = new StringBuilder(fullPath);
+                y = SbUtils.StripLast(x);
+                DebugStub.WriteLine(" symlink node: full={0}, stripped={1}", __arglist(fullPath, y.ToString()));
+                linkPrefix = y.ToString();
+#endif
+            }
+            Kernel.Waypoint(3501);
+            return service;
+        }
+
+        /// <returns>
+        /// null on success, the sp argument if it failed.
+        /// </returns>
+        public override ServiceProviderContract.Imp Register(StringBuilder! p,
+                                      Principal pr,
+                                      [Claims]ServiceProviderContract.Imp! sp,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            // cannot register over an existing name
+            reparse = false;
+            linkFound = false;
+            link = null;
+            error = ErrorCode.AlreadyExists;
+            position = curpos;
+            return sp;
+        }
+
+        /// <returns>
+        /// The endpoint on success, null, if it fails.
+        /// </returns>
+        public override ServiceProviderContract.Imp:Start  Deregister(StringBuilder! path,
+                                                               Principal pr,
+                                                               DirectoryServiceContract.Exp! ep,
+                                                               int curpos,
+                                                               out int position,
+                                                               out bool linkFound,
+                                                               out ErrorCode error,
+                                                               out bool reparse,
+                                                               out string link
+                                                               )
+
+        {
+            error = ErrorCode.NotSupported;
+            link  = null;
+            linkFound = false;
+            reparse = false;
+            position = curpos;
+            if (!(path.Length == 0) ) {
+                return null;
+            }
+
+            // cannot be removed
+            return null;
+        }
+
+        /// <returns>
+        /// if true returns length and node type, otherwise error
+        /// </returns>
+        public override bool GetAttributes(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link,
+                                        out long length,
+                                        out NodeType nodeType
+                                        )
+        {
+            Kernel.Waypoint(3700);
+            reparse = true;
+            linkFound = true;
+            length = 0;
+            position = curpos;
+            nodeType = NodeType.SymLink;
+            error = ErrorCode.NoError;
+
+            // this is a traverse operation. There is more left on the path
+            if (! (p.Length == 0)) {
+                link = symbolicLink + SbUtils.PathString(p);
+                return false;
+            }
+
+            // stop here
+            reparse = false;
+            link = symbolicLink;
+            Kernel.Waypoint(3701);
+            return true;
+        }
+
+        /// <returns>
+        /// true on success, false, if it fails.
+        /// </returns>
+        public override NotifyContract.Imp Notify(StringBuilder! pathSpec,
+                                                  Principal pr,
+                                                  string! pattern,
+                                                  bool sendExisting,
+                                                  int curpos,
+                                                  out int position,
+                                                  out bool linkFound,
+                                                  out ErrorCode error,
+                                                  out bool reparse,
+                                                  out string link,
+                                                  [Claims] NotifyContract.Imp! notifyImp)
+        {
+            // this method should never be called
+            error = ErrorCode.NotSupported;
+            reparse = false;
+            link = symbolicLink;
+            linkFound = true;
+            position = curpos;
+            return notifyImp;
+        }
+
+        public override FileContract.Imp CreateAndBindFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return null;
+        }
+
+        public override bool CreateDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            position = curpos;
+            //DebugStub.Break();
+            reparse = true;
+            linkFound = true;
+            link = null;
+            error = ErrorCode.NoError;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+
+            return false;
+     }
+        public override bool CreateFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            linkFound = false;
+            error = ErrorCode.NotImplemented;
+            reparse = false;
+            link = null;
+            position = curpos;
+            return false;
+        }
+
+        public override bool CreateLink(StringBuilder! p,
+                                        Principal pr,
+                                        string! value,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            position = curpos;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+            return false;
+        }
+
+        public override bool DeleteDirectory(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            position = curpos;
+
+            if (! (p.Length == 0) ) {
+                link = symbolicLink + SbUtils.PathString(p);
+                return false;
+            }
+
+            link = symbolicLink ;
+            error = ErrorCode.NotDirectory;
+            reparse = false;
+            return false;
+        }
+
+        public override bool DeleteFile(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            position = curpos;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+            return false;
+        }
+
+        public override bool DeleteLink(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            position = curpos;
+
+            if (! (p.Length == 0) )
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink ;
+            return false;
+        }
+
+        public override bool GetLinkValue(StringBuilder! p,
+                                        Principal pr,
+                                        int curpos,
+                                        out int position,
+                                        out bool linkFound,
+                                        out ErrorCode error,
+                                        out bool reparse,
+                                        out string link
+                                        )
+
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            position = curpos;
+
+            // this is a traverse operation
+            if (! (p.Length == 0) )  {
+                link = symbolicLink + SbUtils.PathString(p);
+                return false;
+            }
+            link = symbolicLink;
+            return true;
+        }
+
+        public override bool QueryACL(StringBuilder! p,
+                                      bool effective,
+                                      Principal pr,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link,
+                                      out Acl acl
+                                      )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            reparse = true;
+            acl = new Acl();
+            position = curpos;
+
+            if (! (p.Length == 0))
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink;
+            return false;
+        }
+
+        public override bool StoreACL(StringBuilder! p,
+                                      Principal pr,
+                                      Acl acl,
+                                      int curpos,
+                                      out int position,
+                                      out bool linkFound,
+                                      out ErrorCode error,
+                                      out bool reparse,
+                                      out string link
+                                      )
+        {
+            reparse = true;
+            linkFound = true;
+            error = ErrorCode.NoError;
+            position = curpos;
+
+            if (! (p.Length == 0))
+                link = symbolicLink + SbUtils.PathString(p);
+            else
+                link = symbolicLink;
+            return false;
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity.Directory/WorkerFunctions.sg b/base/Kernel/Singularity.Directory/WorkerFunctions.sg
new file mode 100644
index 0000000..301c571
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/WorkerFunctions.sg
@@ -0,0 +1,1135 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WorkerFunctions.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+
+#if !SINGULARITY_PROCESS
+namespace Microsoft.Singularity.Directory
+#else
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+namespace Microsoft.Application.DSP
+#endif
+{
+    using SharedHeap = Microsoft.Singularity.Memory.SharedHeap;
+
+    class WorkerFunctions
+    {
+
+    //------------------------------------------------------------------------------------
+    // Worker functions for DirectoryServiceWorker loop
+    //------------------------------------------------------------------------------------
+
+        public static void DoDeregister(Node! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap i_path)
+        {
+            ErrorCode error;
+            bool reparse;
+            bool linkFound;
+            string link;
+            string prefix;
+            int position;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            string pathCopy = Bitter.ToString2(i_path);
+            Principal pr = AclCore.EndpointPeer(ep);
+
+            try {
+                ServiceProviderContract.Imp:Start  service =
+                    dir.Deregister(new StringBuilder (Bitter.ToString2(i_path)),
+                                   pr,
+                                   ep,
+                                   0,
+                                   out position,
+                                   out linkFound, out error, out reparse, out link);
+
+                if (service != null) {
+                    ep.SendAckDeregister(service);
+                    Tracing.Log(Tracing.Debug,"Register success");
+                    delete i_path;
+                    return;
+                }
+
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeregister(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeregisterReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakDeregisterReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    //DebugStub.Break();
+                    ep.SendNakDeregister(error);
+                }
+
+            }
+            catch (Exception e) {
+                DebugStub.Print(" Exception {0}\n", __arglist(e.ToString()));
+            }
+            delete i_path;
+        }
+
+    //------------------------------------------------------------------------------------
+    // Directory Enumeration
+    //------------------------------------------------------------------------------------
+        public static void DoEnumerate(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep
+                            )
+        {
+            ErrorCode error;
+            Principal pr = AclCore.EndpointPeer(ep);
+            EnumerationRecords[] in ExHeap results =
+                dir.Enumerate(pr, out error);
+            if (results  == null) ep.SendEnumerationTerminated(ErrorCode.InsufficientResources);
+            else ep.SendEnumerationEntries(results, false);
+        }
+
+        public static void DoMore(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep
+                            )
+        {
+
+            ep.SendEnumerationTerminated(ErrorCode.NotImplemented);
+        }
+
+        public static void DoStop(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep
+                            )
+        {
+
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoRegister(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep ,
+                            [Claims] char[]! in ExHeap i_path,
+                            [Claims] ServiceProviderContract.Imp:Start! i_provider
+                            )
+        {
+            ErrorCode error;
+            bool reparse;
+            bool linkFound;
+            string link;
+            string prefix;
+            int position;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            string pathCopy = Bitter.ToString2(i_path);
+            Principal pr = AclCore.EndpointPeer(ep);
+
+            ServiceProviderContract.Imp reject = null;
+            try {
+                Tracing.Log(Tracing.Debug," Register started");
+                reject = dir.Register(new StringBuilder(Bitter.ToString2(i_path)),
+                                   pr,
+                                   i_provider,
+                                   0,
+                                   out position,
+                                   out linkFound, out error, out reparse, out link);
+
+                Tracing.Log(Tracing.Debug,"Register: linkFound={0}, reparse={1}",
+                            linkFound ? (UIntPtr) 1 : (UIntPtr) 0,
+                            reparse ? (UIntPtr) 1 : (UIntPtr) 0
+                            );
+                if (reject == null) {
+                    ep.SendAckRegister();
+                    Tracing.Log(Tracing.Debug,"Register success");
+                }
+                else {
+                    if  (reparse) {
+                        Tracing.Log(Tracing.Debug,"reparsing "+link);
+                        if (link == null ) {
+                            DebugStub.Break();
+                            ep.SendNakRegister(reject,ErrorCode.Unknown);
+                        }
+                        else {
+                            if (linkFound) {
+                                Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                                exPrefix = Bitter.FromString2(link);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakRegisterReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound,
+                                                        reject);
+                            }
+                            else {
+                                Tracing.Log(Tracing.Debug,"Register(reparse)"+link);
+                                // need to construct prefix from original path
+                                if (position == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,position);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakRegisterReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound,
+                                                    reject);
+                            }
+                            //DebugStub.Break();
+                            }
+                    } // reparse
+                    else {
+                        Tracing.Log(Tracing.Debug," Bind failure!");
+                        ep.SendNakRegister(reject, error);
+                    }
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print(" Exception {0}\n", __arglist(e.ToString()));
+            }
+            delete i_path;
+            Tracing.Log(Tracing.Debug," register {0}", (reject == null) ? "failed" : "success");
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoNotify(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep ,
+                            [Claims] char[]! in ExHeap i_path,
+                            [Claims] char[]!  in ExHeap i_pattern,
+                            bool sendExisting,
+                            [Claims] NotifyContract.Imp:Start! i_notifyImp
+                            )
+        {
+            bool reparse;
+            string link;
+            ErrorCode error;
+            bool linkFound;
+            string prefix;
+            int position;
+
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            Principal pr = AclCore.EndpointPeer(ep);
+
+
+            string path1 = Bitter.ToString2(i_path);
+            string pattern = Bitter.ToString2(i_pattern);
+            string pathCopy = Bitter.ToString2(i_path);
+
+            delete i_path;
+            delete i_pattern;
+
+            Tracing.Log(Tracing.Debug,"Notify {0} {1} "+path1,pattern);
+            NotifyContract.Imp reject =
+                dir.Notify(new StringBuilder(path1),
+                           pr,
+                           pattern,
+                           sendExisting,
+                           0,
+                           out position,
+                           out linkFound,
+                           out error, out reparse, out link, i_notifyImp);
+            if (reject == null) { // success
+                delete reject;
+                ep.SendAckNotify();
+                Tracing.Log(Tracing.Debug,"Notify success");
+            }
+            else {
+                if (reparse) {
+                    if (null == link ) {
+                        ep.SendNakNotify(reject,error);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakNotifyReparse(exPrefix, exSuffix, linkFound, reject);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakNotifyReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound,
+                                                reject);
+                        }
+                    }
+                } //reparse
+                else {
+                    Tracing.Log(Tracing.Debug," Bind failure!");
+                    ep.SendNakNotify(reject, error);
+                }
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+
+        public static void DoBind(DirNode! dir,
+                            DirectoryServiceContract.Exp! ep ,
+                            [Claims] char[]! in ExHeap i_path,
+                            [Claims] ServiceContract.Exp:Start! i_server
+                            )
+        {
+            try {
+                bool success;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                string linkPrefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(i_path);
+                Tracing.Log(Tracing.Debug," lookup started: {0}",pathCopy);
+#if !SINGULARITY_PROCESS
+                Monitoring.Log(Monitoring.Provider.Directory,
+                            (ushort)DirectoryEvent.DoBind,
+                            pathCopy);
+#endif
+                ServiceContract.Exp reject =
+                    dir.Bind(new StringBuilder (pathCopy),
+                             pathCopy,
+                             pr,
+                             0,
+                             out position,
+                             out success, out linkFound, out error, out reparse, out link, out linkPrefix, i_server);
+                Tracing.Log(Tracing.Debug," success={0}, linkFound={1}, reparse={2}",
+                            success ? (UIntPtr) 1 : (UIntPtr) 0,
+                            linkFound ? (UIntPtr) 1 : (UIntPtr) 0,
+                            reparse ? (UIntPtr) 1 : (UIntPtr) 0
+                            );
+                if (reject == null && success) { // success
+                    ep.SendAckBind();
+                    Tracing.Log(Tracing.Debug," Bind success");
+                }
+                else {
+                    if  (reparse) {
+                        Tracing.Log(Tracing.Debug,"reparsing "+link);
+                        if (link == null || reject == null) {
+                            DebugStub.Break();
+                            ep.SendNakBind(reject,ErrorCode.Unknown);
+                        }
+                        else {
+                            if (linkFound) {
+                                Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                                exPrefix = Bitter.FromString2(link);
+                                //FIXFIX this is a bit backwards the prefix is being sent back
+                                // as the suffix for compatibility reasons
+                                assert linkPrefix != null;
+                                exSuffix = Bitter.FromString2(linkPrefix);
+                                ep.SendNakBindReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound,
+                                                        reject);
+                            }
+                            else {
+                                Tracing.Log(Tracing.Debug,"Bind(reparse)"+link);
+                                // need to construct prefix from original path
+                                if (position == 0) prefix = pathCopy;
+                                else prefix = pathCopy.Substring(0,position);
+
+                                exPrefix = Bitter.FromString2(prefix);
+                                exSuffix = Bitter.FromString2(link);
+                                ep.SendNakBindReparse(exPrefix,
+                                                    exSuffix,
+                                                    linkFound,
+                                                    reject);
+                            }
+                            //DebugStub.Break();
+                            }
+                    } // reparse
+                    else {
+                        Tracing.Log(Tracing.Debug," Bind failure!");
+                        ep.SendNakBind(reject, error);
+                    }
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print(" Exception {0}\n", __arglist(e.ToString()));
+            }
+            delete i_path;
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoGetAttributes(DirNode! dir, DirectoryServiceContract.Exp! ep ,[Claims] char[]! in ExHeap i_path)
+        {
+            bool reparse;
+            string link;
+            ErrorCode error;
+            bool linkFound;
+            string prefix;
+            int position;
+            Char[] in ExHeap exPrefix;
+            Char[] in ExHeap exSuffix;
+            long length;
+            NodeType nodeType;
+            Principal pr = AclCore.EndpointPeer(ep);
+
+            string pathCopy = Bitter.ToString2(i_path);
+            string! path1 = Bitter.ToString2(i_path);
+            delete i_path;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoGetAttributes,
+                        pathCopy);
+#endif
+            bool aSuccess = dir.GetAttributes(new StringBuilder(path1),
+                                pr,
+                                0,
+                                out position,
+                                out linkFound,
+                                out error,
+                                out reparse,
+                                out link,
+                                out length,
+                                out nodeType
+                                );
+
+            Tracing.Log(Tracing.Debug,"linkFound={1}, reparse={2}",
+                        linkFound ? (UIntPtr) 1 : (UIntPtr) 0,
+                        reparse ? (UIntPtr) 1 : (UIntPtr) 0
+                        );
+            if (aSuccess) {
+                //if (error != ErrorCode.NoError) DebugStub.Break();
+                ep.SendAckGetAttributes(nodeType,length);
+            }
+            else {
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakGetAttributes(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakGetAttributesReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            Tracing.Log(Tracing.Debug,"GetAttr(reparse)"+link);
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakGetAttributesReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                }
+                else {
+                    ep.SendNakGetAttributes(error);
+                }
+            }
+            Kernel.Waypoint(3401);
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoCreateDirectory(DirNode! dir, DirectoryServiceContract.Exp! ep ,[Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+                int position;
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+
+#if SINGULARITY_PROCESS
+                //DebugStub.Break();
+#else
+                Monitoring.Log(Monitoring.Provider.Directory,
+                            (ushort)DirectoryEvent.DoCreateDirectory,
+                            pathCopy);
+
+#endif
+                ok = dir.CreateDirectory(new StringBuilder (pathCopy),
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckCreateDirectory();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakCreateDirectory(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakCreateDirectoryReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            // position points to last character parsed.
+                            DebugStub.WriteLine(" createdir: provider found, index = {0}", __arglist(position));
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakCreateDirectoryReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    //DebugStub.Break();
+                    ep.SendNakCreateDirectory(error);
+                }
+            }
+            finally {
+            }
+        }
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoCreateFile(DirNode! dir,
+                                        DirectoryServiceContract.Exp! ep,
+                                        [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoCreateFile,
+                        pathCopy);
+#endif
+
+                ok = dir.CreateFile(new StringBuilder (pathCopy),
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckCreateFile();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakCreateFile(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakCreateFileReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakCreateFileReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakCreateFile(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoDeleteDirectory( DirNode! dir,  DirectoryServiceContract.Exp! ep ,[Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoDeleteDirectory,
+                        pathCopy);
+#endif
+                ok = dir.DeleteDirectory(new StringBuilder (pathCopy),
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckDeleteDirectory();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeleteDirectory(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeleteDirectoryReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakDeleteDirectoryReparse(exPrefix,
+                                                                exSuffix,
+                                                                linkFound
+                                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakDeleteDirectory(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------
+        public static void DoDeleteFile( DirNode! dir,  DirectoryServiceContract.Exp! ep,
+                                         [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoCreateFile,
+                        pathCopy);
+#endif
+
+                ok = dir.DeleteFile(new StringBuilder (pathCopy),
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckDeleteFile();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeleteFile(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeleteFileReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakDeleteFileReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakDeleteFile(error);
+                }
+            }
+            finally {
+            }
+        }
+
+
+        public static void DoQueryACL( DirNode! dir,
+                                 DirectoryServiceContract.Exp! ep ,
+                                 [Claims] char[]! in ExHeap exPath,
+                                 bool effective
+                                 )
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Acl acl;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                string! pathCopy = Bitter.ToString2(exPath);
+
+                delete exPath;
+
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                ok = dir.QueryACL(new StringBuilder (pathCopy),
+                                    effective,
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link,
+                                    out acl);
+                if (ok) {
+                    ep.SendAckQueryACL(Bitter.FromString(acl.Node),
+                                       Bitter.FromString(acl.Descendant));
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakQueryACL(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link", link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakQueryACLReparse(exPrefix, exSuffix, linkFound);
+                            return;
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakQueryACLReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound);
+                            return;
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakQueryACL(error);
+                }
+            }
+            finally {
+            }
+        }
+
+        public static void DoStoreACL( DirNode! dir,
+                                 DirectoryServiceContract.Exp! ep ,
+                                 [Claims] char[]! in ExHeap exPath,
+                                 [Claims] char[]  in ExHeap nodePattern,
+                                 [Claims] char[]  in ExHeap descendantPattern
+                                 )
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                string! pathCopy = Bitter.ToString2(exPath);
+                Acl myacl = new Acl(Bitter.ToString(nodePattern), Bitter.ToString(descendantPattern));
+                Principal pr = AclCore.EndpointPeer(ep);
+                delete nodePattern;
+                delete descendantPattern;
+
+                delete exPath;
+
+                ok = dir.StoreACL(new StringBuilder (pathCopy),
+                                    pr,
+                                    myacl,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if (ok) {
+                    ep.SendAckStoreACL();
+                    return;
+                }
+
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakStoreACL(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link", link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakStoreACLReparse(exPrefix, exSuffix, linkFound);
+                            return;
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakStoreACLReparse(exPrefix,
+                                                        exSuffix,
+                                                        linkFound);
+                            return;
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakStoreACL(error);
+                }
+            }
+            finally {
+            }
+        }
+
+        public static void DoCreateAndBindFile(DirNode! dir,
+                                         DirectoryServiceContract.Exp! ep ,
+                                         [Claims] char[]! in ExHeap exPath,
+                                         [Claims] FileContract.Exp:Start! exp
+                                         )
+        {
+            ep.SendNakCreateAndBindFile(exp, ErrorCode.NotImplemented);
+            delete exPath;
+            return;
+        }
+
+    //------------------------------------------------------------------------------------
+    // DeleteLink
+    //------------------------------------------------------------------------------------
+        public static void DoDeleteLink( DirNode! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoDeleteLink,
+                        pathCopy);
+#endif
+                ok = dir.DeleteLink(new StringBuilder (pathCopy),
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckDeleteLink();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakDeleteLink(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakDeleteLinkReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakDeleteLinkReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakDeleteLink(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    //------------------------------------------------------------------------------------
+    // GetLinkValue
+    //------------------------------------------------------------------------------------
+        public static void DoGetLinkValue( DirNode! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap exPath)
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoGetLinkValue,
+                        pathCopy);
+#endif
+                ok = dir.GetLinkValue(new StringBuilder (pathCopy),
+                                    pr,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    if ( link == null ) {
+                        DebugStub.Break();
+                        ep.SendNakGetLinkValue(ErrorCode.Unknown);
+                        return;
+                    }
+                    ep.SendAckGetLinkValue(Bitter.FromString2(link));
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakGetLinkValue(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakGetLinkValueReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakGetLinkValueReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound);
+                        }
+                    }
+                } //reparse
+                else {
+                    ep.SendNakGetLinkValue(error);
+                }
+            }
+            finally {
+            }
+        }
+
+        public static void DoCreateLink( DirNode! dir,
+                                   DirectoryServiceContract.Exp! ep ,
+                                   [Claims] char[]! in ExHeap exPath,
+                                   [Claims] char[]! in ExHeap exValue
+                                   )
+        {
+            try {
+                bool ok;
+                bool reparse;
+                string link;
+                ErrorCode error;
+                bool linkFound;
+                string prefix;
+                int position;
+                Char[] in ExHeap exPrefix;
+                Char[] in ExHeap exSuffix;
+                Principal pr = AclCore.EndpointPeer(ep);
+
+                string pathCopy = Bitter.ToString2(exPath);
+                delete exPath;
+                string value = Bitter.ToString2(exValue);
+                delete exValue;
+
+#if !SINGULARITY_PROCESS
+            Monitoring.Log(Monitoring.Provider.Directory,
+                        (ushort)DirectoryEvent.DoCreateLink,
+                        pathCopy);
+#endif
+
+                ok = dir.CreateLink(new StringBuilder (pathCopy),
+                                    pr,
+                                    value,
+                                    0,
+                                    out position,
+                                    out linkFound,
+                                    out error,
+                                    out reparse,
+                                    out link);
+                if(ok) {
+                    ep.SendAckCreateLink();
+                    return;
+                }
+                if (reparse) {
+                    if (null == link) {
+                        ep.SendNakCreateLink(ErrorCode.Unknown);
+                    }
+                    else {
+                        if (linkFound) {
+                            Tracing.Log(Tracing.Debug,"reparsing {0} as link",link);
+                            exPrefix = Bitter.FromString2(link);
+                            exSuffix = Bitter.FromString2("");
+                            ep.SendNakCreateLinkReparse(exPrefix, exSuffix, linkFound);
+                        }
+                        else {
+                            // need to construct prefix from original path
+                            if (position == 0) prefix = pathCopy;
+                            else prefix = pathCopy.Substring(0,position);
+
+                            exPrefix = Bitter.FromString2(prefix);
+                            exSuffix = Bitter.FromString2(link);
+                            ep.SendNakCreateLinkReparse(exPrefix,
+                                                exSuffix,
+                                                linkFound
+                                                );
+                        }
+                    }
+                } //reparse
+                else {
+                    //DebugStub.Break();
+                    ep.SendNakCreateLink(error);
+                }
+            }
+            finally {
+            }
+        }
+
+    } //WorkerFunctions class
+} //namespace
diff --git a/base/Kernel/Singularity.Directory/sdsutils.sg b/base/Kernel/Singularity.Directory/sdsutils.sg
new file mode 100644
index 0000000..adb5c90
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/sdsutils.sg
@@ -0,0 +1,1533 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SdsUtils.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Collections;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Directory
+{
+    public class SdsUtils
+    {
+        public static string! NodeTypeToString(NodeType n)
+        {
+            string s;
+            switch (n) {
+                case NodeType.Directory :
+                    s = "Directory";
+                    break;
+                case NodeType.File :
+                    s = "File";
+                    break;
+                case NodeType.IoMemory :
+                    s = "IoMemory";
+                    break;
+                case NodeType.ServiceProvider :
+                    s = "ServiceProvider";
+                    break;
+                case NodeType.SymLink :
+                    s = "SymLink";
+                    break;
+                case NodeType.BadNode :
+                    s = "BadNode";
+                    break;
+                default:
+                    s = "Impossible!";
+                    break;
+            }
+            return s;
+        }
+
+        public static string! ErrorCodeToString(ErrorCode code)
+        {
+            string s;
+            switch (code) {
+                case ErrorCode.NoError :
+                    s = "NoError";
+                    break;
+                case ErrorCode.AccessDenied :
+                    s = "AccessDenied";
+                    break;
+                case ErrorCode.AlreadyExists :
+                    s = "AlreadyExists";
+                    break;
+                case ErrorCode.BadArguments:
+                    s = "BadArguments";
+                    break;
+                case ErrorCode.ContractNotSupported :
+                    s = "ContractNotSupported";
+                    break;
+                case ErrorCode.DirectoryNotEmpty :
+                    s = "DirectoryNotEmpty";
+                    break;
+                case ErrorCode.NotFound :
+                    s = "NotFound";
+                    break;
+                case ErrorCode.ChannelClosed :
+                    s = "ChannelClosed";
+                    break;
+                case ErrorCode.Unsatisfiable :
+                    s = "Unsatisfiable";
+                    break;
+                case ErrorCode.NotImplemented :
+                    s = "NotImplemented";
+                    break;
+                case ErrorCode.NotSupported :
+                    s = "NotSupported";
+                    break;
+                case ErrorCode.CapacityReached :
+                    s = "CapacityReached";
+                    break;
+                case ErrorCode.InsufficientResources :
+                    s = "InsufficientResources";
+                    break;
+                case ErrorCode.DirectoryFull :
+                    s = "DirectoryFull";
+                    break;
+                case ErrorCode.NotDirectory :
+                    s = "NotDirectory";
+                    break;
+                case ErrorCode.NotLink :
+                    s = "NotLink";
+                    break;
+                case ErrorCode.NotProvider :
+                    s = "NotProvider";
+                    break;
+                case ErrorCode.NotFile :
+                    s = "NotFile";
+                    break;
+                case ErrorCode.IsOpen:
+                    s = "IsOpen";
+                    break;
+                case ErrorCode.Unknown :
+                    s = "Unknown";
+                    break;
+                default:
+                    s = "Impossible!";
+                    break;
+            }
+            return s;
+        }
+
+//------------------------------------------------------------------------------
+// DSP cache
+//------------------------------------------------------------------------------
+
+static SortedList!  dspCache            = new SortedList();
+static int          cacheUsers          = 0;  // serves as counting semaphore
+static bool         cacheShutdown       = false;
+static readonly Mutex! cacheEmpty       = new Mutex();
+static bool         flushCacheWaiting   = false;
+
+//
+// Atomically:
+//   - Checks the cache for the specified DSP, and returns it if present.
+//   - If not present, binds a new channel to the DSP and puts a TRef
+//     for it in the cache, but .Acquires() the contents and returns them.
+//
+// Regardless, call ReleaseCachedDSP() to return the channel to the cache
+// when done!
+//
+// The "ds" argument provides a DirectoryServiceContract through which to
+// bind to the requested service, if a cached channel is not available.
+//
+// Returns null if anything goes wrong, in which case errorOut is set
+//
+// This is public so that sdsutilsacl.sg can use it
+public static DirectoryServiceContract.Imp GetDSPChannel(DirectoryServiceContract.Imp:Ready! ds,
+                                                          string! prefix, out ErrorCode errorOut)
+{
+    errorOut = ErrorCode.NoError;
+    TRef<DirectoryServiceContract.Imp:Ready>  wrapper;
+
+    lock (dspCache) {
+        if (!cacheShutdown){
+            object  o = dspCache[prefix];
+
+            if (o != null) {
+                //DebugStub.WriteLine("dspCache: {0} found in cache", __arglist (prefix));
+                wrapper = (TRef<DirectoryServiceContract.Imp:Ready>)o;
+            }
+            else {
+                // No cached channel found; create and bind one
+                //DebugStub.WriteLine("dspCache: {0} not found in cache; creating", __arglist(prefix));
+                DirectoryServiceContract.Imp! dsImp;
+                DirectoryServiceContract.Exp! dsExp;
+                DirectoryServiceContract.NewChannel(out dsImp, out dsExp);
+                bool bound =  BindDSP(prefix, ds, dsExp, out errorOut);
+
+                if (!bound) {
+                    delete dsImp;
+                    return null; // failure path;
+                }
+                else {
+                    dsImp.RecvSuccess();
+                }
+// This is internal so that sdsutilsacl.sg can use it
+
+                // Put a placeholder TRef into the cache to signal to other threads
+                // that this channel exists
+                wrapper = new TRef<DirectoryServiceContract.Imp:Ready>(dsImp);
+                dspCache.Add(prefix, wrapper);
+            }
+            cacheUsers++;
+        }
+        else {
+            wrapper = null;
+        }
+
+    } //lock
+
+    // Must Acquire() outside the lock{} construct lest we deadlock!
+    if (!cacheShutdown) {
+        assume(wrapper != null);
+        return wrapper.Acquire();
+    }
+    else return null;
+}
+
+// This is public so that sdsutilsacl.sg can use it
+public static void ReleaseDSPChannel(string! prefix, [Claims] DirectoryServiceContract.Imp:Ready! dsp)
+{
+    lock (dspCache) {
+        object  o = dspCache[prefix];
+
+        if (o == null) {
+            // Shouldn't happen; the caller is trying to release a channel back into the
+            // cache that was not acquired via GetDSPChannel.
+            assert false;
+        }
+        else {
+            ((TRef<DirectoryServiceContract.Imp:Ready>)o).Release(dsp);
+        }
+        if  (--cacheUsers == 0) {
+            // the cache is empty is there anyone we need to inform?
+            if (flushCacheWaiting) {
+                cacheEmpty.ReleaseMutex();
+            }
+        }
+    }
+}
+
+public static void FlushCache()
+{
+    lock (dspCache) {
+        cacheShutdown  = true;
+        if (cacheUsers == 0) {
+        }
+        else {
+            flushCacheWaiting = true;
+        }
+    }
+    if (flushCacheWaiting){
+        cacheEmpty.WaitOne();
+    }
+
+    foreach (TRef<DirectoryServiceContract.Imp:Ready>! wrapper in dspCache) {
+        DirectoryServiceContract.Imp x =  wrapper.Acquire();
+        delete x;
+    }
+    dspCache.Clear();
+}
+
+// find the longest matching path prefix in the dspCache
+// if one is found start return the endpoint, prefix and remaining path
+// The function is linear.  Perf will not be a problem as there will be
+// few entries (< 10) =
+
+// TODO should have wrapper to all the functions below that call
+// that call this function 1st like Bind/BindEx does
+
+public  static DirectoryServiceContract.Imp:Ready FindMaximalPreBoundDsp(
+                   string! path,
+                   DirectoryServiceContract.Imp:Ready! ds,
+                   out string! prefix,
+                   out string! remainder)
+{
+    string pre = "";
+    int longestLength = 0;
+    bool matchFound = false;
+
+    lock (dspCache) {
+        // look for the  longest match in the cache
+        for (int i=0; i < dspCache.Count; i++) {
+            string s = (string) dspCache.GetKey(i);
+            if (s != null && s.Length > longestLength) {
+                string foo = path.Substring(0,Math.Min(path.Length, s.Length));
+                if (s == foo) {
+                    pre = s;
+                    remainder = path.Substring(Math.Min(path.Length, s.Length));
+                    longestLength = s.Length;
+                    matchFound = true;
+                }
+            }
+        }
+    } //lock
+
+    if (matchFound) {
+        ErrorCode errorOut;
+        prefix = pre;
+        remainder = path.Substring(pre.Length);
+        DirectoryServiceContract.Imp dsp = GetDSPChannel(ds, pre, out errorOut);
+        assert (dsp != null);
+        return dsp;
+    }
+    else {
+        prefix = "";
+        remainder = path;
+        return null;
+    }
+}
+
+//------------------------------------------------------------------------------
+// BindDSP
+//------------------------------------------------------------------------------
+
+        public static bool BindDSP(string! path, DirectoryServiceContract.Imp:Start! ds, [Claims] ServiceContract.Exp! exp, out ErrorCode errorOut)
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+
+            ds.SendBind(exPath,exp);
+            switch receive
+            {
+                case ds.NakBind(rejected, error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    delete rejected;
+                    return false;
+
+                case ds.AckBind():
+                    // Success
+                    errorOut = ErrorCode.NoError;
+                    return true;
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    return false;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    //DebugStub.Break();
+                    errorOut = ErrorCode.Unsatisfiable;
+                    return false;
+                    break;
+
+                case ds.NakBindReparse(i_prefix,i_suffix,linkFound, rejected):
+                    DebugStub.Break();
+                    delete i_prefix;
+                    delete i_suffix;
+                    delete rejected;
+                    errorOut = ErrorCode.Unknown;
+                    return false;
+                    break;
+            }
+        }
+//------------------------------------------------------------------------------
+// Bind:  checks for a prefix match before calling the regular bind
+//------------------------------------------------------------------------------
+#if DOES_NOT_WORK
+        public static bool Bind(string! path, DirectoryServiceContract.Imp:Ready! ds,
+                                [Claims] ServiceContract.Exp! exp, out ErrorCode errorOut)
+        {
+            string! remainder;
+            string! prefix;
+
+            // see if we can short-circuit a whole bunch of work
+            DirectoryServiceContract.Imp:Ready cachedDsp =
+                FindMaximalPreBoundDsp(path, ds, out  prefix, out  remainder);
+            if (cachedDsp == null) {
+                return BindEx(path,ds,exp, out errorOut);
+            }
+            else {
+                bool ok = BindEx(remainder,cachedDsp,exp, out errorOut);
+                ReleaseDSPChannel(prefix, cachedDsp);
+                return ok;
+            }
+        }
+//------------------------------------------------------------------------------
+// BindEx
+//------------------------------------------------------------------------------
+
+        public static bool BindEx(string! path, DirectoryServiceContract.Imp:Ready! ds,
+                                [Claims] ServiceContract.Exp! exp, out ErrorCode errorOut)
+#else
+        public static bool Bind(string! path, DirectoryServiceContract.Imp:Ready! ds,
+                                [Claims] ServiceContract.Exp! exp, out ErrorCode errorOut)
+#endif
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+
+            ds.SendBind(exPath,exp);
+            switch receive
+            {
+                case ds.NakBind(rejected, error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    delete rejected;
+                    return false;
+
+                case ds.AckBind():
+                    // Success
+                    errorOut = ErrorCode.NoError;
+                    return true;
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    return false;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    //DebugStub.Break();
+                    errorOut = ErrorCode.Unsatisfiable;
+                    return false;
+                    break;
+
+                case ds.NakBindReparse(i_prefix, i_suffix, linkFound, rejected):
+                    // traversed either a mount point or a link
+                    string pre = Bitter.ToString2(i_prefix);
+                    string suf = Bitter.ToString(i_suffix);
+                    delete i_prefix;
+                    delete i_suffix;
+
+#if DEBUG_X
+                    DebugStub.WriteLine("bind reparse: pre={0}, suf={1}, linkfound ={2}",
+                                       __arglist(pre,suf, linkFound? "true": "false"));
+#endif
+
+                    // Either a SymLink or a non-leaf provider node has been encountered.
+                    if (linkFound) {
+                        //reissue search
+                        // DebugStub.WriteLine("link: issuing rebind to '{0}'",__arglist(pre));
+                        return Bind(pre, ds, rejected, out errorOut);;
+                    }
+                    else {
+                        // Bind to the prefix ServiceProvider and continue search
+                        DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                        if (dsImp == null) {
+                            delete rejected;
+                            return false; // failure; code already in errorOut
+                        }
+
+                        try {
+                            if ( null == suf) {
+                                // Strange to get a NakBindReparse with no suffix
+                                delete rejected;
+                                errorOut = ErrorCode.NotFound;
+                                return false;
+                            }
+                            else {
+                                // There is a trailing part still to bind
+                                return Bind(suf, dsImp, rejected, out errorOut);
+                            }
+                        }
+                        finally {
+                            ReleaseDSPChannel(pre, dsImp);
+                        }
+                    } //!linkFound
+                    break;
+            } //switch
+        } //Bind
+
+//------------------------------------------------------------------------------
+// CreateFile
+//------------------------------------------------------------------------------
+        public static  bool CreateFile (string! path,
+                                        DirectoryServiceContract.Imp:Start! ds,
+                                        out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+
+            ds.SendCreateFile(exPath);
+            switch receive
+            {
+                case ds.NakCreateFile(error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    return false;
+
+                case ds.AckCreateFile():
+                    // Success
+                    errorOut = ErrorCode.NoError;
+                    return true;
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    return false;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    errorOut = ErrorCode.Unsatisfiable;
+                    return false;
+                    break;
+
+                case ds.NakCreateFileReparse(i_prefix,
+                                             i_suffix,
+                                             linkFound) :
+                    // traversed either a mount point or a link
+                    string pre= Bitter.ToString2(i_prefix);
+                    string suf= Bitter.ToString(i_suffix);
+                    delete i_prefix;
+                    delete i_suffix;
+
+                    DebugStub.WriteLine("CreateFile.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                        __arglist(pre,suf, linkFound? "true": "false"));
+
+                    // Either a SymLink or a non-leaf provider node has been encountered.
+                    if (linkFound) {
+                        //reissue search
+                        DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                        return CreateFile(pre, ds, out errorOut);
+                    }
+                    else {
+                        // Bind to the ServiceProvider and continue search
+                        DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+                        //DebugStub.WriteLine("sds create suf={0}", __arglist(suf));
+                        if (dsImp == null) {
+                            return false; // failure; code already in errorOut
+                        }
+
+                        try {
+                            if ( null == suf) {
+                                // Strange to get a NakCreateFileReparse here
+                                errorOut = ErrorCode.Unknown;
+                                return false;
+                            }
+                            else {
+                                return CreateFile(suf, dsImp, out errorOut);
+                            }
+                        }
+                        finally {
+                            ReleaseDSPChannel(pre, dsImp);
+                        }
+                        break;
+                    } //!linkFound
+                    break;
+            } //switch
+        } //CreateFile
+
+//------------------------------------------------------------------------------
+// CreateDirectory
+//------------------------------------------------------------------------------
+        public static  bool CreateDirectory (string! path,
+                                      DirectoryServiceContract.Imp:Ready! ds,
+                                      out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendCreateDirectory(exPath);
+            try {
+                switch receive
+                {
+                    case ds.NakCreateDirectory(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckCreateDirectory():
+                        // Success
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakCreateDirectoryReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("CreateDirectory.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            return CreateDirectory(pre, ds, out errorOut);
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakCreateDirectoryReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return CreateDirectory(suf, dsImp, out errorOut);
+                                }
+                            }
+                            finally {
+                                ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //CreateDirectory
+
+//------------------------------------------------------------------------------
+// CreateLink
+//------------------------------------------------------------------------------
+        public static  bool CreateLink (string! path,
+                                        string! value,
+                                        DirectoryServiceContract.Imp:Ready! ds,
+                                        out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            char[]! in ExHeap exValue;
+            exPath = Bitter.FromString2(path);
+            exValue = Bitter.FromString2(value);
+            bool results;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendCreateLink(exPath,exValue);
+            try {
+                switch receive
+                {
+                    case ds.NakCreateLink(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckCreateLink():
+                        // Success
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakCreateLinkReparse(i_prefix,
+                                                 i_suffix,
+                                                 linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("CreateLink.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            results  = CreateLink(pre, value, ds, out errorOut);
+                            return results;
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakCreateLinkReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return CreateLink(suf,value, dsImp, out errorOut);
+                                }
+                            }
+                            finally {
+                                ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //CreateLink
+
+//------------------------------------------------------------------------------
+// DeleteFile
+//------------------------------------------------------------------------------
+        public static  bool DeleteFile(string! path,
+                                        DirectoryServiceContract.Imp:Ready! ds,
+                                        out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+            DebugStub.WriteLine("sds deletefile path={0}", __arglist(path));
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendDeleteFile(exPath);
+            try {
+                switch receive
+                {
+                    case ds.NakDeleteFile(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                       DebugStub.WriteLine("sds delete file fails {0}", __arglist(error));
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckDeleteFile():
+                        // Success
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakDeleteFileReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("DeleteFile.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            results  = DeleteFile(pre, ds, out errorOut);
+                            return results;
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+                            DebugStub.WriteLine("sds deletefile: got dsp @ {0}. continuing", __arglist(pre));
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakDeleteFileReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    DebugStub.WriteLine("sds deletefile:  continuing with {0}", __arglist(suf));
+                                    return DeleteFile(suf, dsImp, out errorOut);
+                                }
+                            }
+                            finally {
+                                ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //DeleteFile
+
+//------------------------------------------------------------------------------
+// DeleteLink
+//------------------------------------------------------------------------------
+        public static  bool DeleteLink (string! path,
+                                        DirectoryServiceContract.Imp:Ready! ds,
+                                        out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendDeleteLink(exPath);
+            try {
+                switch receive
+                {
+                    case ds.NakDeleteLink(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckDeleteLink():
+                        // Success
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakDeleteLinkReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("DeleteLink.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            results  = DeleteLink(pre, ds, out errorOut);
+                            return results;
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakDeleteLinkReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return DeleteLink(suf, dsImp, out errorOut);
+                                }
+                            }
+                            finally {
+                                ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //DeleteLink
+
+//------------------------------------------------------------------------------
+// GetLinkValue
+//------------------------------------------------------------------------------
+        public static  bool GetLinkValue (string! path,
+                                        DirectoryServiceContract.Imp:Ready! ds,
+                                        out string linkValue,
+                                        out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+            linkValue = null;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendGetLinkValue(exPath);
+            try {
+                switch receive
+                {
+                    case ds.NakGetLinkValue(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckGetLinkValue(i_value):
+                        // Success
+                        linkValue = Bitter.ToString2(i_value);
+                        delete i_value;
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakGetLinkValueReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("GetLinkValue.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            results  = GetLinkValue(pre, ds, out linkValue, out errorOut);
+                            return results;
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakGetLinkValueReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return GetLinkValue(suf, dsImp, out linkValue, out errorOut);
+                                }
+                            }
+                            finally {
+                                ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //GetLinkValue
+
+//------------------------------------------------------------------------------
+// DeleteDirectory
+//------------------------------------------------------------------------------
+        public static  bool DeleteDirectory (string! path,
+                                        DirectoryServiceContract.Imp:Ready! ds,
+                                        out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendDeleteDirectory(exPath);
+            try {
+                switch receive
+                {
+                    case ds.NakDeleteDirectory(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckDeleteDirectory():
+                        // Success
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakDeleteDirectoryReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("DeleteDirectory.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        //DebugStub.Break();
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            results  = DeleteDirectory(pre, ds, out errorOut);
+                            return results;
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                //DebugStub.Break();
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakDeleteDirectoryReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return DeleteDirectory(suf, dsImp, out errorOut);
+                                }
+                            }
+                            finally {
+                                ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //DeleteDirectory
+
+        public static bool IsMatch(string! name, string! pattern)
+        {
+            bool match = false;
+            bool continueMatch = true;
+            string prefix = null;
+            string postfix = null;
+
+            int starPos = pattern.IndexOf("*");
+
+            if (starPos != -1) {
+                if (starPos == 0) {
+                    prefix = null;
+                    postfix = pattern.Substring(1);
+                }
+                else if (starPos == pattern.Length-1) {
+                    prefix = pattern.Substring(0, pattern.Length-1);
+                    postfix = null;
+                }
+                else {
+                    prefix = pattern.Substring(0, starPos);
+                    postfix = pattern.Substring(starPos+1);
+                }
+
+                if (prefix != null) {
+                    if (!name.StartsWith(prefix))
+                        continueMatch = false;
+                }
+                if (continueMatch && postfix != null) {
+                    if (!name.EndsWith(postfix)) {
+                        continueMatch = false;
+                    }
+                }
+                match = continueMatch;
+            }
+            else if (pattern == name) {
+                match = true;
+            }
+
+            //DebugStub.Print("name={0} pre={1} post={2} match={3}\n",
+            //                __arglist(name, prefix, postfix, match));
+            return match;
+        }
+
+//------------------------------------------------------------------------------
+//  Concatenate 2 sets of ExHeap EnumerationRecords
+//------------------------------------------------------------------------------
+        private static EnumerationRecords[]! in ExHeap Concat(
+            [Claims] EnumerationRecords[]! in ExHeap rec1, 
+            [Claims] EnumerationRecords[]! in ExHeap rec2
+            )
+        {
+            int size =  rec1.Length + rec2.Length;
+            EnumerationRecords [] in ExHeap records =
+                        new [ExHeap] EnumerationRecords[size];
+
+            // copy both rec1 and rec2 into records
+
+            for (int i = 0; i < rec1.Length; i++) {
+                expose (records[i]) {
+                    expose (rec1[i]) {
+                        delete records[i].Path;
+                        records[i].Path = (!)rec1[i].Path;
+                        //allocate a byte to satisfy checker
+                        rec1[i].Path = new [ExHeap] char [1];
+                        records[i].Type = rec1[i].Type;
+                    }
+                }
+            }
+
+            for (int i = 0, j = rec1.Length ; i < rec2.Length; i++, j++) {
+                expose (records[j]) {
+                    expose (rec2[i]) {
+                        delete records[j].Path;
+                        records[j].Path = (!)rec2[i].Path;
+                        //allocate a byte to satisfy checker
+                        rec2[i].Path = new [ExHeap] char [1];
+                        records[j].Type = rec2[i].Type;
+                    }
+                }
+            }
+                                
+            delete rec1;
+            delete rec2;
+            
+            return records;
+        }
+//------------------------------------------------------------------------------
+// Find
+//------------------------------------------------------------------------------
+        public static  EnumerationRecords[] in ExHeap EnumerateDirectory(
+                                                     DirectoryServiceContract.Imp:Start! ds,
+                                                     out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            EnumerationRecords[] in ExHeap results;
+
+            ds.SendBeginEnumeration();
+            switch receive
+            {
+                case ds.EnumerationTerminated(error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    return null;
+
+                case ds.EnumerationEntries(i_results, isMore):
+                    // Success
+                    EnumerationRecords[] in ExHeap temp;
+                    int size = i_results.Length;
+                    errorOut = ErrorCode.NoError;
+                    bool doAgain = isMore;
+                    if (doAgain) {
+                        while (doAgain) {
+                            DebugStub.WriteLine(" recvd [{0}], requesting additional enumeration",
+                                __arglist(size));
+                            ds.SendReadEnumeration();
+                            switch receive
+                            {
+                                case ds.EnumerationTerminated(error):
+                                    errorOut = error;
+                                    return i_results;
+                                case ds.EnumerationEntries(i_more_results, isMore2):
+                                    doAgain = isMore2; 
+                                    size = i_more_results.Length;
+                                    if (!doAgain){
+                                        i_results = Concat(i_results,i_more_results);
+                                        ds.SendEndEnumeration();
+                                        return i_results;
+                                        break;
+                                    }
+                                    else {
+                                        i_results = Concat(i_results,i_more_results);
+                                        break;
+                                    }
+                                    break;
+                                case ds.ChannelClosed():
+                                    // Directory channel closed unexpectedly
+                                    errorOut = ErrorCode.ChannelClosed;
+                                    delete i_results; 
+                                    return null;
+                                    break;
+
+                                case unsatisfiable :
+                                    // should never happen.
+                                    delete i_results; 
+                                    errorOut = ErrorCode.Unsatisfiable;
+                                    return null;
+                                    break;
+                            }
+                        }
+                        delete i_results;
+                        return null; 
+                    }
+                    else {
+                        // DebugStub.WriteLine(" About to send END enumerate");
+                        ds.SendEndEnumeration();
+                        if ( ds.InState(DirectoryServiceContract.EnumerateAck.Value) ) DebugStub.Break();
+                        if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+                        return i_results;
+                    }
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    return null;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    errorOut = ErrorCode.Unsatisfiable;
+                    return null;
+                    break;
+
+            } //switch
+        } //Find
+
+//------------------------------------------------------------------------------
+// GetAttributes
+//------------------------------------------------------------------------------
+        public static  bool GetAttributes (string! path,
+                                           DirectoryServiceContract.Imp:Start! ds,
+                                           out long length,
+                                           out NodeType nodeType,
+                                           out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+
+            ds.SendGetAttributes(exPath);
+            switch receive
+            {
+                case ds.NakGetAttributes(error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    length = -1;
+                    nodeType = NodeType.BadNode;
+                    return false;
+
+                case ds.AckGetAttributes(i_nodeType, i_length):
+                    // Success
+                    errorOut = ErrorCode.NoError;
+                    length = i_length;
+                    nodeType = i_nodeType;
+                    return true;
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    length = -1;
+                    nodeType = NodeType.BadNode;
+                    return false;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    errorOut = ErrorCode.Unsatisfiable;
+                    length = -1;
+                    nodeType = NodeType.BadNode;
+                    return false;
+                    break;
+
+                case ds.NakGetAttributesReparse(i_prefix, i_suffix, linkFound) :
+                    // traversed either a mount point or a link
+                    string pre= Bitter.ToString2(i_prefix);
+                    string suf= Bitter.ToString(i_suffix);
+                    delete i_prefix;
+                    delete i_suffix;
+
+                    //DebugStub.WriteLine("GetAttributes.reparse: pre={0}, suf={1}, linkfound ={2}",
+                    //                    __arglist(pre,suf, linkFound? "true": "false"));
+
+                    // Either a SymLink or a non-leaf provider node has been encountered.
+                    if (linkFound) {
+                        //reissue search
+                        DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                        results  = GetAttributes(pre, ds, out length, out nodeType, out errorOut);
+                        return results;
+                    }
+                    else {
+                        // Bind to the ServiceProvider and continue search
+                        DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                        if (dsImp == null) {
+                            length = -1;
+                            nodeType = NodeType.BadNode;
+                            return false; // failure; code already in errorOut
+                        }
+
+                        try {
+                            if ( null == suf) {
+                                // Strange to get a NakGetAttributesReparse here!
+                                length = -1;
+                                nodeType = NodeType.BadNode;
+                                errorOut = ErrorCode.Unknown;
+                                return false;
+                            }
+                            else {
+                                return GetAttributes(suf, dsImp, out length, out nodeType,  out errorOut);
+                            }
+                        }
+                        finally {
+                            ReleaseDSPChannel(pre, dsImp);
+                        }
+                    } //!linkFound
+                    break;
+            } //switch
+        } //Find
+
+//------------------------------------------------------------------------------
+// Deregister
+//------------------------------------------------------------------------------
+        public static  bool Deregister (string! path,
+                                      DirectoryServiceContract.Imp:Start! ds,
+                                      out ServiceProviderContract.Imp:Start  service,
+                                      out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+            service = null;
+
+            ds.SendDeregister(exPath);
+            switch receive
+            {
+                case ds.NakDeregister( error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    return false;
+
+                case ds.AckDeregister(ServiceProviderContract.Imp:Start ! i_service):
+                    // Success
+                    errorOut = ErrorCode.NoError;
+                    service = i_service;
+                    return true;
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    return false;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    errorOut = ErrorCode.Unsatisfiable;
+                    return false;
+                    break;
+
+                case ds.NakDeregisterReparse(i_prefix,
+                                           i_suffix,
+                                           linkFound) :
+
+                    // traversed either a mount point or a link
+                    string pre= Bitter.ToString2(i_prefix);
+                    string suf= Bitter.ToString(i_suffix);
+                    delete i_prefix;
+                    delete i_suffix;
+
+                    DebugStub.WriteLine("Deregister.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                        __arglist(pre,suf, linkFound? "true": "false"));
+
+                    // Either a SymLink or a non-leaf provider node has been encountered.
+                    if (linkFound) {
+                        //reissue search
+                        DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                        results  = Deregister(pre, ds, out service, out errorOut);
+                        return results;
+                    }
+                    else {
+                        // Bind to the ServiceProvider and continue search
+                        DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                        if (dsImp == null) {
+                            return false; // failure; code already in errorOut
+                        }
+
+                        try {
+                            if ( null == suf) {
+                                // Strange to get a NakDeregisterReparse here!
+                                errorOut = ErrorCode.Unknown;
+                                return false;
+                            }
+                            else {
+                                return Deregister(suf, dsImp, out service,  out errorOut);
+                            }
+                        }
+                        finally {
+                            ReleaseDSPChannel(pre, dsImp);
+                        }
+                    } //!linkFound
+                    break;
+            } //switch
+        } //Deregister
+
+//------------------------------------------------------------------------------
+// Register
+//------------------------------------------------------------------------------
+        public static  bool Register (string! path,
+                                      DirectoryServiceContract.Imp:Start! ds,
+                                      [Claims] ServiceProviderContract.Imp! imp,
+                                      out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+            ds.SendRegister(exPath,imp);
+            switch receive
+            {
+                case ds.NakRegister(ServiceProviderContract.Imp:Start rejected, error):
+                    // Failed: no such leaf node, or leaf node is not a file
+                    errorOut = error;
+                    delete rejected;
+                    return false;
+
+                case ds.AckRegister():
+                    // Success
+                    errorOut = ErrorCode.NoError;
+                    return true;
+                    break;
+
+                case ds.ChannelClosed():
+                    // Directory channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    return false;
+                    break;
+
+                case unsatisfiable :
+                    // should never happen.
+                    errorOut = ErrorCode.Unsatisfiable;
+                    return false;
+                    break;
+
+                case ds.NakRegisterReparse(i_prefix,
+                                           i_suffix,
+                                           linkFound,
+                                           ServiceProviderContract.Imp:Start! rejected) :
+                    // traversed either a mount point or a link
+                    string pre= Bitter.ToString2(i_prefix);
+                    string suf= Bitter.ToString(i_suffix);
+                    delete i_prefix;
+                    delete i_suffix;
+
+                    DebugStub.WriteLine("Register.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                        __arglist(pre,suf, linkFound? "true": "false"));
+
+                    // Either a SymLink or a non-leaf provider node has been encountered.
+                    if (linkFound) {
+                        //reissue search
+                        DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                        results  = Register(pre, ds, rejected, out errorOut);
+                        return results;
+                    }
+                    else {
+                        // Bind to the ServiceProvider and continue search
+                        DirectoryServiceContract.Imp dsImp = GetDSPChannel(ds, pre, out errorOut);
+
+                        if (dsImp == null) {
+                            delete rejected;
+                            return false; // failure; code already in errorOut
+                        }
+
+                        try {
+                            if ( null == suf) {
+                                // Strange to get a NakRegisterReparse here!
+                                delete rejected;
+                                errorOut = ErrorCode.Unknown;
+                                return false;
+                            }
+                            else {
+                                return Register(suf, dsImp, rejected,  out errorOut);
+                            }
+                        }
+                        finally {
+                            ReleaseDSPChannel(pre, dsImp);
+                        }
+                    } //!linkFound
+                    break;
+            } //switch
+        } //Register
+    } // class
+}
diff --git a/base/Kernel/Singularity.Directory/sdsutilsacl.sg b/base/Kernel/Singularity.Directory/sdsutilsacl.sg
new file mode 100644
index 0000000..b083053
--- /dev/null
+++ b/base/Kernel/Singularity.Directory/sdsutilsacl.sg
@@ -0,0 +1,218 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SdsUtils.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Collections;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Security.SDS;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Directory
+{
+    public class SdsUtilsAcl
+    {
+
+//------------------------------------------------------------------------------
+// QueryACL
+//------------------------------------------------------------------------------
+        public static  bool QueryACL (string! path, bool effective,
+                                      DirectoryServiceContract.Imp:Ready! ds,
+                                      out Acl aclOut, out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            aclOut = Acl.nullAcl;
+            char[]! in ExHeap exPath;
+            exPath = Bitter.FromString2(path);
+            bool results;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendQueryACL(exPath, effective);
+            try {
+                switch receive
+                {
+                    case ds.NakQueryACL(error):
+  // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckQueryACL(nodePattern, descendantPattern):
+                        // Success
+                        // unmarshall ACL
+                        errorOut = ErrorCode.NoError;
+                        string res1 = Bitter.ToString(nodePattern);
+                        string res2 = Bitter.ToString(descendantPattern);
+                        aclOut = new Acl(res1, res2);
+                        delete nodePattern;
+                        delete descendantPattern;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+  // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakQueryACLReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound):
+                        // traversed either a mount point or a link
+                        string pre = Bitter.ToString2(i_prefix);
+                        string suf = Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("QueryACL.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre,suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            return QueryACL(pre, effective, ds, out aclOut, out errorOut);
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp =
+                                SdsUtils.GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakCreateDirectoryReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return QueryACL(suf, effective, dsImp, out aclOut, out errorOut);
+                                }
+                            }
+                            finally {
+                                SdsUtils.ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //QueryACL
+
+//------------------------------------------------------------------------------
+// StoreACL
+//------------------------------------------------------------------------------
+        public static  bool StoreACL (string! path, Acl acl,
+                                      DirectoryServiceContract.Imp:Ready! ds,
+                                      out ErrorCode errorOut )
+        {
+            errorOut = ErrorCode.Unknown;
+            char[]! in ExHeap exPath;
+            char[] in ExHeap exAclStr1, exAclStr2;
+            exPath = Bitter.FromString2(path);
+            exAclStr1 = Bitter.FromString(acl.Node);
+            exAclStr2 = Bitter.FromString(acl.Descendant);
+            bool results;
+
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            ds.SendStoreACL(exPath, exAclStr1, exAclStr2);
+            try {
+                switch receive
+                {
+                    case ds.NakStoreACL(error):
+                        // Failed: no such leaf node, or leaf node is not a file
+                        errorOut = error;
+                        return false;
+
+                    case ds.AckStoreACL():
+                        // Success
+                        errorOut = ErrorCode.NoError;
+                        return true;
+                        break;
+
+                    case ds.ChannelClosed():
+                        // Directory channel closed unexpectedly
+                        errorOut = ErrorCode.ChannelClosed;
+                        return false;
+                        break;
+
+                    case unsatisfiable :
+                        // should never happen.
+                        errorOut = ErrorCode.Unsatisfiable;
+                        return false;
+                        break;
+
+                    case ds.NakStoreACLReparse(i_prefix,
+                                                    i_suffix,
+                                                    linkFound) :
+                        // traversed either a mount point or a link
+                        string pre= Bitter.ToString2(i_prefix);
+                        string suf= Bitter.ToString(i_suffix);
+                        delete i_prefix;
+                        delete i_suffix;
+
+                        DebugStub.WriteLine("StoreACL.reparse: pre={0}, suf={1}, linkfound ={2}",
+                                            __arglist(pre, suf, linkFound? "true": "false"));
+
+                        // Either a SymLink or a non-leaf provider node has been encountered.
+                        if (linkFound) {
+                            //reissue search
+                            DebugStub.WriteLine("link: issuing rebind to{0}",__arglist(pre));
+                            return StoreACL(pre, acl, ds, out errorOut);
+                        }
+                        else {
+                            // Bind to the ServiceProvider and continue search
+                            DirectoryServiceContract.Imp dsImp =
+                                SdsUtils.GetDSPChannel(ds, pre, out errorOut);
+
+                            if (dsImp == null) {
+                                return false; // failure; code already in errorOut
+                            }
+
+                            try {
+                                if ( null == suf) {
+                                    // Strange to get a NakCreateDirectoryReparse here!
+                                    errorOut = ErrorCode.Unknown;
+                                    return false;
+                                }
+                                else {
+                                    return StoreACL(suf, acl, dsImp, out errorOut);
+                                }
+                            }
+                            finally {
+                                SdsUtils.ReleaseDSPChannel(pre, dsImp);
+                            }
+                        } //!linkFound
+                        break;
+                } //switch
+            }
+            finally {
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) DebugStub.Break();
+            }
+        } //StoreAcl
+    } // class
+}
diff --git a/base/Kernel/Singularity.Drivers/IdeBus.cs b/base/Kernel/Singularity.Drivers/IdeBus.cs
new file mode 100644
index 0000000..10d153a
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/IdeBus.cs
@@ -0,0 +1,191 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IdeBus.cs
+//
+//  Creates IDE Bus device
+//      Creates IDE controller devices as sub devices and registers with with the system
+//      Creates two instances of the controller
+
+#define DONT_DISABLE_LEGACY_NFORCE_TO_HIDE_DVD //
+
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Drivers.IDE;
+
+namespace Microsoft.Singularity.Drivers.IDE
+{
+    // create the resource objects for CTR to fill in
+    // CTR will have to figure out which class to use...
+    [DriverCategory]
+    [Signature("pci/cc_0101")]
+#if DONT_DISABLE_LEGACY_NFORCE_TO_HIDE_DVD //
+    [Signature("pci/ven_10de&dev_0053&cc_0101")] // nForce4
+    [Signature("pci/ven_10de&dev_0035&cc_0101")] // nForce4 Intel Edition
+#endif
+    [EnumeratesDevice("/ata/controller")]
+    internal class LegacyIdeBus : DriverCategoryDeclaration
+    {
+        [IoPortRange(4, Default = 0xffa0, Length = 0x10, Shared = true)]
+        IoPortRange port1;
+
+        [IoFixedIrqRange(Base = 14, Shared = true)]
+        IoIrqRange primaryIrq;
+
+        [IoFixedIrqRange(Base = 15, Shared = true)]
+        IoIrqRange secondaryIrq;
+
+        // Provide to unify creation.
+        public static IDevice! DeviceCreate(IoConfig! config, String! instanceName)
+        {
+            return new IdeBus((PciDeviceConfig)config);
+        }
+    }
+
+    [DriverCategory]
+    [Signature("pci/ven_10de&dev_0054&cc_0101")] // nForce4
+    [Signature("pci/ven_10de&dev_0055&cc_0101")] // nForce4
+    [Signature("pci/ven_10de&dev_0036&cc_0101")] // nForce4 Intel Edition
+    [Signature("pci/ven_10d3&dev_003e&cc_0101")] // nForce4 Intel Edition
+    [EnumeratesDevice("/ata/controller")]
+    internal class NvIdeBus : DriverCategoryDeclaration
+    {
+        // [TODO] Should all of these be shared?
+        [IoPortRange(0, Default = 0x09f0, Length = 0x08, Shared = true)]
+        IoPortRange port1;
+
+        [IoPortRange(1, Default = 0x0bf0, Length = 0x04, Shared = true)]
+        IoPortRange port2;
+
+        [IoPortRange(2, Default = 0x0970, Length = 0x08, Shared = true)]
+        IoPortRange port3;
+
+        [IoPortRange(3, Default = 0x0b70, Length = 0x04, Shared = true)]
+        IoPortRange port4;
+
+        [IoPortRange(4, Default = 0xf600, Length = 0x10, Shared = true)]
+        IoPortRange port5;
+
+        [IoMemoryRange(5, Default = 0, Length = 0x1000)]
+        IoMemoryRange mem1;
+
+        [IoIrqRange(6, Default = 0x0b, Shared = true)]
+        IoIrqRange irq1;
+
+        // Provide to unify creation.
+        public static IDevice! DeviceCreate(IoConfig! config, String! name)
+        {
+            return new IdeBus((PciDeviceConfig)config);
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class IdeBus : IBusDevice
+    {
+        private PciDeviceConfig! config;
+        private PnpConfig        primaryConfig;
+        private PnpConfig        secondaryConfig;
+        const uint PCI_CONFIG_Command_IOE           = 0x1;
+        const uint PCI_CONFIG_PI_PrimaryMode        = 0x1; // NATIVE, ~compatible
+        const uint PCI_CONFIG_PI_PrimaryFixed       = 0x2; // DYNAMIC, ~fixed
+        const uint PCI_CONFIG_PI_SecondaryMode      = 0x4; // NATIVE, ~compatible
+        const uint PCI_CONFIG_PI_SecondaryFixed     = 0x8; // DYNAMIC, ~fixed
+
+        public IdeBus(PciDeviceConfig! config)
+        {
+            //DebugStub.Print("IdeBus: Device instantiated.\n");
+            this.config = config;
+        }
+
+        public void Initialize()
+        {
+            // 0: irq, 1: command, 2: control, 3: dma
+            IoRange[] primary = new IoRange[4];
+            IoRange[] secondary = new IoRange[4];
+
+            DebugStub.Print("IdeBus: Initializing device {0:x8}, vendor {1:x8}, config: {2}\n",
+                            __arglist(
+                                (ulong)config.DeviceId,
+                                (ulong)config.VendorId,
+                                config.ToString()));
+
+            // First, Check to see if the IDE controller is active by checking the
+            // IO enable bit in the PCI configspace Command Register.
+            // For the moment we are assuming that Read32() is handling endian issues
+            // for us.
+            config.EnableIoSpace(true);
+
+            // Read the Programming Interface (PI) Register from the PCI configuration space
+            byte programmingInterfaceValue = config.Read8(0x9);
+
+            // The high bit in the PI indicates the presence of bus-master DMA.
+            assert config.DynamicRanges != null;
+
+            if ((programmingInterfaceValue & 0x80) > 0 &&
+                config.DynamicRanges[4] as IoPortRange != null) {
+
+                IoPortRange! range = (IoPortRange!)(config.DynamicRanges[4]);
+
+                primary[3] = range.RangeAtOffset(0, 8, true, true);
+                secondary[3] = range.RangeAtOffset(8, 8, true, true);
+
+                DebugStub.Print("IdeBus: Interface supports BusMaster DMA, at {0}\n",
+                                __arglist(range.ToString()));
+            }
+
+            // Next we decode the Native/Compat bits from the PI register
+            if ((programmingInterfaceValue & PCI_CONFIG_PI_PrimaryMode) > 0) {
+                //DebugStub.Print("Using Native mode PI={0:x2}\n",__arglist(programmingInterfaceValue));
+                primary[0] = config.GetIrq();
+                secondary[0] = config.GetIrq();
+
+                primary[1] = config.DynamicRanges[0];
+                primary[2] = config.DynamicRanges[1];
+
+                secondary[1] = config.DynamicRanges[2];
+                secondary[2] = config.DynamicRanges[3];
+
+                uint ideChannelConfig = config.Read32(0x50);
+                Tracing.Log(Tracing.Debug,"Channel Config= {0:x8}\n",
+                            (UIntPtr)ideChannelConfig);
+            }
+            else {
+                //compat mode
+                primary[0] = new IoIrqRange(14, 1);
+                secondary[0] = new IoIrqRange(15, 1);
+
+                primary[1] = new IoPortRange(0x1F0, 8, Access.ReadWrite);
+                primary[2] = new IoPortRange(0x3F4, 4, Access.ReadWrite);
+
+                secondary[1] = new IoPortRange(0x170, 8, Access.ReadWrite);
+                secondary[2] = new IoPortRange(0x374, 4, Access.ReadWrite);
+            }
+
+            primaryConfig = new PnpConfig(new string[] { "/ata/controller" }, primary);
+            secondaryConfig = new PnpConfig(new string[] { "/ata/controller" }, secondary);
+        }
+
+        public void Finalize()
+        {
+            DebugStub.Print("IdeBus: Finalized.\n");
+        }
+
+        public SortedList Enumerate()
+        {
+            SortedList found = new SortedList();
+            found.Add("/controller0", primaryConfig);
+            found.Add("/controller1", secondaryConfig);
+            //FIXFIX:  need to figure out why shared interrupt is not working. Post SOSP
+            //found.Add("/secondary",secondaryConfig);
+            return found;
+        }
+    }
+}
+
diff --git a/base/Kernel/Singularity.Drivers/KernelDrivers.csproj b/base/Kernel/Singularity.Drivers/KernelDrivers.csproj
new file mode 100644
index 0000000..395dafe
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/KernelDrivers.csproj
@@ -0,0 +1,37 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Drivers</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="IdeBus.cs" />
+    <Compile Include="PciBus.cs" />
+    <Compile Include="PseudoBus.cs" />
+    <Compile Include="PnpBios.cs" />
+    <Compile Include="Register.cs" />
+    <Compile Include="ScsiDevice.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..\Singularity.Directory\Directory.csproj" />
+    <ProjectReference Include="..\Singularity.Io\IoSystem.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+
+</Project>
diff --git a/base/Kernel/Singularity.Drivers/NVidia_MSIL/KernelDriversNVidia_MSIL.csproj b/base/Kernel/Singularity.Drivers/NVidia_MSIL/KernelDriversNVidia_MSIL.csproj
new file mode 100644
index 0000000..2d0c1ec
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/NVidia_MSIL/KernelDriversNVidia_MSIL.csproj
@@ -0,0 +1,33 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<!-- A special project that merely copies the precompiled nForce4 MSIL binary
+to the object directory. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+  
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>NVidiaDrivers</AssemblyName>
+    <Precompiled>true</Precompiled>
+    <PrecompiledPath>$(PRECOMPILED_NVIDIA_DIR)</PrecompiledPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..\..\Singularity.Directory\Directory.csproj" />
+    <ProjectReference Include="..\..\Singularity.Io\IoSystem.csproj" />
+    <ProjectReference Include="..\KernelDrivers.csproj" />
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Drivers/NvPciLpc.cs b/base/Kernel/Singularity.Drivers/NvPciLpc.cs
new file mode 100644
index 0000000..111f574
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/NvPciLpc.cs
@@ -0,0 +1,242 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NvPciLpcBridge.cs
+//
+//  Notes:
+//
+//  Driver for Low-Pin Count devices.  These are a mix of control
+//  registers for legacy and current devices.  We currently use it to
+//  reroute integrated peripheral interrupts.
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity.Drivers.Pci;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Drivers
+{
+    // create the resource object for CTR to fill in
+    [DriverCategory]
+    [Signature("pci/ven_10de&dev_0050&cc_0601")] // nForce4
+    [Signature("pci/ven_10de&dev_0030&cc_0601")] // nForce4 Intel Edition
+    [EnumeratesDevice("/pnp/PNP0103")]
+    internal class NvPciLpcResources : DriverCategoryDeclaration
+    {
+        // Provide to unify creation.
+        public static IDevice! DeviceCreate(IoConfig! config, string! name)
+        {
+            return new NvPciLpcBridge((PciDeviceConfig) config);
+        }
+    }
+
+    public sealed class NvPciLpcBridge : IBusDevice
+    {
+        private const ushort PCI_VENDOR_NVIDIA             = 0x10de;
+
+        private const ushort PCI_DEVICE_NVIDIA_AMD_SATA0   = 0x0054;
+        private const ushort PCI_DEVICE_NVIDIA_AMD_SATA1   = 0x0055;
+        private const ushort PCI_DEVICE_NVIDIA_AMD_MCP04   = 0x0056;
+
+        private const ushort PCI_DEVICE_NVIDIA_INTEL_SATA0 = 0x0036;
+        private const ushort PCI_DEVICE_NVIDIA_INTEL_SATA1 = 0x003e;
+        private const ushort PCI_DEVICE_NVIDIA_INTEL_MCP04 = 0x0030;
+
+        private const int PCI_HPET_POINTER = 0x44;
+
+        // Generic PCI interrupt remapping
+        private const int PCI_INTERRUPT_MAPPING = 0x7c;
+        private const int SATA0_DEVICE_7_ROLL = 24; // Secondary SATA0 IRQ
+        private const int SATA1_DEVICE_8_ROLL = 20; // Secondary SATA1 IRQ
+        private const int PCI_INTR_Z_ROLL     = 12;
+        private const int PCI_INTR_Y_ROLL     = 8;
+        private const int PCI_INTR_X_ROLL     = 4;
+        private const int PCI_INTR_W_ROLL     = 0;
+
+        private const uint PINT_SEL_DISABLE_IRQ = 0x0;
+        private const uint PINT_SEL_APIC_IRQ17 = 0x1;
+        private const uint PINT_SEL_APIC_IRQ18 = 0x2;
+        private const uint PINT_SEL_IRQ3       = 0x3;
+        private const uint PINT_SEL_IRQ4       = 0x4;
+        private const uint PINT_SEL_IRQ5       = 0x5;
+        private const uint PINT_SEL_IRQ6       = 0x6;
+        private const uint PINT_SEL_IRQ7       = 0x7;
+        private const uint PINT_SEL_APIC_IRQ16 = 0x8;
+        private const uint PINT_SEL_IRQ9       = 0x9;
+        private const uint PINT_SEL_IRQ10      = 0xa;
+        private const uint PINT_SEL_IRQ11      = 0xb;
+        private const uint PINT_SEL_IRQ12      = 0xc;
+        private const uint PINT_SEL_APIC_IRQ19 = 0xd;
+        private const uint PINT_SEL_IRQ14      = 0xe;
+        private const uint PINT_SEL_IRQ15      = 0xf;
+
+        // Integrate peripheral mapping
+        private const int INTERNAL_IRQ0 = 0x80;
+        private const int INTERNAL_IRQ0_SATA0_ROLL = 28;  // Primary SATA
+        private const int INTERNAL_IRQ0_SATA1_ROLL = 24;
+        private const int INTERNAL_IRQ0_P2P_ROLL   = 16;
+        private const int INTERNAL_IRQ0_USB2_ROLL  = 12;
+        private const int INTERNAL_IRQ0_SMBUS_ROLL = 8;
+        private const int INTERNAL_IRQ0_TCO_ROLL   = 4;
+        private const int INTERNAL_IRQ0_SCI_ROLL   = 0;
+
+        private const int INTERNAL_IRQ1 = 0x84;
+        private const int INTERNAL_IRQ1_IDE1_ROLL = 28;
+        private const int INTERNAL_IRQ1_IDE0_ROLL = 24;
+        private const int INTERNAL_IRQ1_MCI_ROLL  = 20;
+        private const int INTERNAL_IRQ1_ACI_ROLL  = 16;
+        private const int INTERNAL_IRQ1_MAC_ROLL  = 8;
+        private const int INTERNAL_IRQ1_USB0_ROLL = 0;
+
+        private const uint INTERNAL_SEL_DISABLE_IRQ = 0x0;
+        private const uint INTERNAL_SEL_APIC_IRQ23  = 0x1;
+        private const uint INTERNAL_SEL_APIC_IRQ22  = 0x2;
+        private const uint INTERNAL_SEL_IRQ3        = 0x3;
+        private const uint INTERNAL_SEL_IRQ4        = 0x4;
+        private const uint INTERNAL_SEL_IRQ5        = 0x5;
+        private const uint INTERNAL_SEL_IRQ6        = 0x6;
+        private const uint INTERNAL_SEL_IRQ7        = 0x7;
+        private const uint INTERNAL_SEL_APIC_IRQ20  = 0x8;
+        private const uint INTERNAL_SEL_IRQ9        = 0x9;
+        private const uint INTERNAL_SEL_IRQ10       = 0xa;
+        private const uint INTERNAL_SEL_IRQ11       = 0xb;
+        private const uint INTERNAL_SEL_IRQ12       = 0xc;
+        private const uint INTERNAL_SEL_APIC_IRQ21  = 0xd;
+        private const uint INTERNAL_SEL_IRQ14       = 0xe;
+        private const uint INTERNAL_SEL_IRQ15       = 0xf;
+
+        ///////////////////////////////////////////////////////////////////////
+
+        PciDeviceConfig! config;
+
+        internal NvPciLpcBridge(PciDeviceConfig! pciDeviceConfig)
+        {
+            config = pciDeviceConfig;
+        }
+
+        void IDevice.Initialize()
+        {
+            DebugStub.Print("NvPciLpc.Initialize (maxirq={0})\n",
+                            __arglist(IoSystem.GetMaximumIrq()));
+            // Reroute NVidia fixed device resources on APIC system
+            if (IoSystem.GetMaximumIrq() > 15)
+            {
+                ReroutePciInterrupts();
+            }
+        }
+
+        void IDevice.Finalize()
+        {
+        }
+
+        private void SetRouteEntry(int register, int roll, uint value)
+        {
+            DebugStub.Print("NvPciLpc.SetRouteEntry(reg={0},rol={1},val={2})\n",
+                            __arglist(register, roll, value));
+            uint r = config.Read32(register) & ~(0x0fu << roll);
+            r |= value << roll;
+            config.Write32(register, r);
+        }
+
+        private void ReroutePciInterrupts()
+        {
+            PciEnumerator enumerator = PciEnumerator.GetEnumerator(null);
+            ICollection! pciConfigs = enumerator.Enumerate().Values;
+
+            foreach (PciConfig! pc in pciConfigs)
+            {
+                if (pc.VendorId == PCI_VENDOR_NVIDIA)
+                {
+                    // NB - if there are multiple devices on the bus with the
+                    // same ID, we still break.  Also note that the parameter
+                    // "1" indicates that this method wants to renumber the 1st
+                    // Irq in the IoConfig.DynamicRanges list, not the 1st
+                    // object.
+                    if ((pc.DeviceId == PCI_DEVICE_NVIDIA_AMD_MCP04 ||
+                         pc.DeviceId == PCI_DEVICE_NVIDIA_INTEL_MCP04) &&
+                        IoSystem.RequestRerouteIrq((!)pc.Id, 1, 23))
+                    {
+                        SetRouteEntry(INTERNAL_IRQ1, INTERNAL_IRQ1_MAC_ROLL,
+                                      INTERNAL_SEL_APIC_IRQ23);
+                        pc.SetInterrupt(23);
+                    }
+                    else if ((pc.DeviceId == PCI_DEVICE_NVIDIA_AMD_SATA0 ||
+                              pc.DeviceId == PCI_DEVICE_NVIDIA_INTEL_SATA0) &&
+                             IoSystem.RequestRerouteIrq((!)pc.Id, 1, 14))
+                    {
+                        SetRouteEntry(INTERNAL_IRQ0,
+                                      INTERNAL_IRQ0_SATA0_ROLL,
+                                      INTERNAL_SEL_IRQ14);
+                        pc.SetInterrupt(14);
+
+                        // Map secondary same as primary
+                        SetRouteEntry(PCI_INTERRUPT_MAPPING,
+                                      SATA0_DEVICE_7_ROLL,
+                                      PINT_SEL_IRQ14);
+                    }
+                    else if ((pc.DeviceId == PCI_DEVICE_NVIDIA_AMD_SATA1 ||
+                              pc.DeviceId == PCI_DEVICE_NVIDIA_INTEL_SATA1) &&
+                             IoSystem.RequestRerouteIrq((!)pc.Id, 1, 15))
+                    {
+                        SetRouteEntry(INTERNAL_IRQ0,
+                                      INTERNAL_IRQ0_SATA1_ROLL,
+                                      INTERNAL_SEL_IRQ15);
+                        pc.SetInterrupt(15);
+
+                        // Map secondary same as primary
+                        SetRouteEntry(PCI_INTERRUPT_MAPPING,
+                                      SATA1_DEVICE_8_ROLL,
+                                      PINT_SEL_IRQ15);
+                    }
+                }
+            }
+        }
+
+        public SortedList Enumerate()
+        {
+            SortedList devs = new SortedList();
+
+            uint hpetPointer = config.Read32(PCI_HPET_POINTER);
+
+            if (hpetPointer != 0)
+            {
+                IoMemoryRange hpetMemory =
+                    new IoMemoryRange(hpetPointer, 0x1000,
+                                      Access.ReadWrite);
+
+                devs.Add("/hpet",
+                         new PnpConfig(new string[] { "/pnp/PNP0103" },
+                                       new IoRange [1] { hpetMemory }
+                                       )
+                         );
+            }
+
+#if NO
+            //
+            // XXX sgc compiler does not accept the following preferred
+            // means of instantiating a PnpConfig object.  It complains:
+            //
+            // NvPciLpc.cs(189,31): error CS1501:
+            // No overload for method 'PnpConfig' takes '2' arguments
+            //
+            // which is bogus - there are two constructors that take two
+            // arguments.  They are both public and differ only in their
+            // second argument.  This is visible in PnpConfig.cs and in
+            // the kernel ilasm.
+            //
+            ArrayList hpetResources = new ArrayList();
+            hpetResources.Add(hpetMemory);
+            devs.Add("/hpet", new PnpConfig("/PNP0103", hpResources));
+#endif
+            return devs;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Drivers/PciBus.cs b/base/Kernel/Singularity.Drivers/PciBus.cs
new file mode 100644
index 0000000..7dbb7f7
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/PciBus.cs
@@ -0,0 +1,253 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PciBus.cs
+//
+//  Note:
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Configuration.Assemblies;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Drivers
+{
+    // create the resource object for CTR to fill in
+    [DriverCategory]
+    [Signature("/pnp/PNP0A03")]
+    [EnumeratesDevice("pci/...")]
+    internal class PciBusResources : DriverCategoryDeclaration
+    {
+        [IoFixedPortRange(Base = 0x0cf8, Length = 0x08)]
+        IoPortRange configPort;
+
+        // Provide to unify creation.
+        public static IDevice! DeviceCreate(IoConfig! config, String! instanceName)
+        {
+            Tracing.Log(Tracing.Debug, "Creating PCI Bus");
+
+            return new PciBus(PciEnumerator.GetEnumerator(config));
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class PciBus : IBusDevice
+    {
+        private PciEnumerator! enumerator;
+
+        static ushort IdentifierFromUnits(uint nBus, uint nDevice, uint nFunction)
+        {
+            return (ushort)(nFunction | (nDevice << 3) | (nBus << 8));
+        }
+
+        public PciBus(PciEnumerator! enumerator)
+        {
+            this.enumerator = enumerator;
+        }
+
+        public void Initialize()
+        {
+            Tracing.Log(Tracing.Debug, "Initializing PciBus.");
+        }
+
+        public void Finalize()
+        {
+        }
+
+        public SortedList Enumerate()
+        {
+            return enumerator.Enumerate();
+        }
+
+        public void Display()
+        {
+            foreach (PciConfig! config in enumerator.Enumerate()) {
+                config.Print();
+            }
+        }
+    }
+
+
+    [CLSCompliant(false)]
+    public class PciEnumerator
+    {
+        public const uint MAX_BUSES         = 256;
+        public const uint MAX_DEVICES       = 32;
+        public const uint MAX_FUNCTIONS     = 8;
+        public const uint MAX_IDENTIFIER    = (MAX_BUSES * MAX_DEVICES * MAX_FUNCTIONS) - 1;
+
+        private const ushort PCI_ADDRESS_PORT    = 0xcf8;
+        private const ushort PCI_DATA_PORT       = 0xcfc;
+
+        private uint numberOfBuses = 0;
+        private IoPort! addressPort;
+        private IoPort! dataPort;
+
+        static ushort IdentifierFromUnits(uint nBus, uint nDevice, uint nFunction)
+        {
+            return (ushort)(nFunction | (nDevice << 3) | (nBus << 8));
+        }
+
+        public static PciEnumerator GetEnumerator(IoConfig config)
+        {
+            uint buses = Resources.GetPciNumberOfBuses();
+
+#if DONT_USE_PNP_FOR_PCI
+            if (config != null &&
+                config.Ranges.Length >= 1 && config.Ranges[0] != null &&
+                config.Ranges[0] is IoPortRange) {
+                IoPortRange ports = (IoPortRange)config.Ranges[0];
+
+                IoPort addrPort = ports.PortAtOffset(0, 4, Access.Write);
+                IoPort dataPort = ports.PortAtOffset(4, 4, Access.ReadWrite);
+                return new PciEnumerator(addrPort, dataPort, buses);
+            }
+            else {
+#endif
+                IoPortRange dev = new IoPortRange(PCI_ADDRESS_PORT, 8, Access.ReadWrite);
+
+                return new PciEnumerator(dev.PortAtOffset(0, 4, Access.Write),
+                                         dev.PortAtOffset(4, 4, Access.ReadWrite),
+                                         buses);
+#if DONT_USE_PNP_FOR_PCI
+            }
+#endif
+
+        }
+
+        private PciEnumerator(IoPort! addressPort, IoPort! dataPort, uint buses)
+        {
+            this.addressPort = addressPort;
+            this.dataPort = dataPort;
+            this.numberOfBuses = buses;
+        }
+
+        private uint Read32(uint identifier, uint offset)
+        {
+            if (identifier < 0 || identifier > MAX_IDENTIFIER) {
+                throw new OverflowException("BAD_IDENTIFIER");
+            }
+            if ((offset & 0x3) != 0) {
+                throw new Exception("BAD_OFFSET");
+            }
+
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            return dataPort.Read32();
+        }
+
+        private void Write32(uint identifier, uint offset, uint value)
+        {
+            if (identifier < 0 || identifier > MAX_IDENTIFIER) {
+                throw new OverflowException("BAD_IDENTIFIER");
+            }
+            if ((offset & 0x3) != 0) {
+                throw new Exception("BAD_OFFSET");
+            }
+
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            dataPort.Write32(value);
+        }
+
+        private PciPort PortForIdentifier(uint identifier)
+        {
+            if (identifier < 0 || identifier > MAX_IDENTIFIER) {
+                throw new OverflowException("BAD_IDENTIFIER");
+            }
+            return new PciPort(addressPort, dataPort, (ushort)identifier);
+        }
+
+        public SortedList! Enumerate()
+        {
+            Tracing.Log(Tracing.Debug, "PCI Bus Enumerate");
+
+            SortedList found = new SortedList();
+            unchecked {
+                Tracing.Log(Tracing.Debug, "    buses: {0}",
+                            (UIntPtr)(uint)numberOfBuses);
+            }
+
+            for (uint bus = 0; bus < numberOfBuses; bus++) {
+                for (uint device = 0; device < MAX_DEVICES; device++) {
+                    PciConfig config;
+                    uint identifier = IdentifierFromUnits(bus, device, 0);
+                    uint u = Read32(identifier, 0);
+
+                    if (u == ~0u || u == 0) {
+                        continue;
+                    }
+
+                    u = Read32(identifier, 0x0c);
+
+                    uint max_functions = (u & PciConfig.PCI_MULTIFUNCTION) == 0
+                        ? (uint)1 : MAX_FUNCTIONS;
+#if DEBUG_PCI_BUS
+                    Tracing.Log(Tracing.Debug, "    {0}.{1}:C => max={2} [{3:x8}]",
+                                bus, device, max_functions, u);
+#endif
+
+                    for (uint function = 0; function < max_functions; function++) {
+                        identifier = IdentifierFromUnits(bus, device, function);
+                        u = Read32(identifier, 0);
+#if DEBUG_PCI_BUS
+                        Tracing.Log(Tracing.Debug, "    {0}.{1}.{2}:0 => {3:x8}",
+                                    bus, device, function, u);
+#endif
+
+                        if (u == ~0u || u == 0) {
+                            continue;
+                        }
+
+                        u = Read32(identifier, 0x0c);
+#if DEBUG_PCI_BUS
+                        Tracing.Log(Tracing.Debug, "    {0}.{1}.{2}:C => {3:x8}",
+                                    bus, device, function, u);
+#endif
+
+                        switch (u & PciConfig.PCI_TYPE_MASK) {
+                            case PciConfig.PCI_DEVICE_TYPE:
+                                config = new PciDeviceConfig(PortForIdentifier(identifier));
+                                break;
+                            case PciConfig.PCI_BRIDGE_TYPE:
+                                config = new PciBridgeConfig(PortForIdentifier(identifier));
+                                break;
+                            case PciConfig.PCI_CARDBUS_TYPE:
+                                config = new PciCardbusConfig(PortForIdentifier(identifier));
+                                break;
+                            default:
+                                config = null;
+                                break;
+                        }
+
+                        if (config != null) {
+                            found.Add(String.Format("/bus{0,4:x4}/dev{1,4:x4}/func{2,4:x4}",
+                                                    bus, device, function),
+                                      config);
+
+                        }
+                    }
+                }
+            }
+
+            return found;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Drivers/Piix4Ata.cs b/base/Kernel/Singularity.Drivers/Piix4Ata.cs
new file mode 100644
index 0000000..dcb6dcc
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/Piix4Ata.cs
@@ -0,0 +1,60 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Piix4Ata.cs
+//
+//  Device driver for accessing the IDE/ATA functionality of the Intel PIIX4
+//  and compatible devices.
+//
+
+using Microsoft.Singularity;
+
+using System;
+using System;
+using System.Text;
+using System.Configuration.Assemblies;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Singularity.Drivers
+{
+    public class Piix4Ata : IDiskDevice
+    {
+        public static IDevice! DeviceCreate(IoConfig! config)
+        {
+            DebugStub.Print("Creating Piix4Ata Driver\n");
+            return new Piix4Ata((PciDeviceConfig)config);
+        }
+
+        private Piix4Ata(PciDeviceConfig config)
+        {
+            DebugStub.Print("Piix4Ata Constructor\n");
+        }
+
+        public void Initialize()
+        {
+            DebugStub.Print("Initializing Piix4Ata Driver\n");
+        }
+
+        public void Finalize()
+        {
+        }
+
+        public void Read(ulong diskByteOffset, [Out] IoMemory memory, int offset, int bytes)
+        {
+        }
+
+        public void Write(ulong diskByteOffset, [In] IoMemory memory, int offset, int bytes)
+        {
+        }
+
+        public void GetInfo(out DISK_INFO info)
+        {
+            info = new DISK_INFO();
+        }
+    }
+}
+
diff --git a/base/Kernel/Singularity.Drivers/PnpBios.cs b/base/Kernel/Singularity.Drivers/PnpBios.cs
new file mode 100644
index 0000000..c350a65
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/PnpBios.cs
@@ -0,0 +1,568 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PnpBios.cs
+//
+//  Note:
+//
+
+//#define VERBOSE
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+using System.Configuration.Assemblies;
+using System.Runtime.Remoting;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Reflection;
+
+namespace Microsoft.Singularity.Drivers
+{
+    [CLSCompliant(false)]
+    public class PnpBios : IBusDevice
+    {
+        // since this is in the kernel, it can make whatever ports and memory it
+        // wants.  The purpose of having a decorated DeviceRequirement object is
+        // just to generate metadata correctly; in truth, we can't do CTR on
+        // this because these resources aren't dynamic, and so we can't count on
+        // IoSystem to get the resources for us.  Instead, we get our own
+        // resources, and then we tell IoSystem about them via the method
+        // ReportConfig
+        [DriverCategory]
+        [Signature("/root/pnp0")]
+        [EnumeratesDevice("/pnp/...")]
+        class MyConfig : DriverCategoryDeclaration
+        {
+            [IoMemoryRange(0, Default = 0xf3c30000, Length = 1, AllowWrite = false)]
+            IoMemoryRange mem1;
+
+            [IoPortRange(1, Default = 0x20b, Length = 1, AllowWrite = false)]
+            IoPortRange port1;
+
+            [IoFixedPortRange(Base = 0x0a79, Length = 0x01, AllowRead = false)]
+            IoPortRange isaWritePort;
+
+            [IoFixedPortRange(Base = 0x0279, Length = 0x01, AllowRead = false)]
+            IoPortRange isaReadport;
+        }
+
+        private static byte lowestbit(uint bits)
+        {
+            for (byte i = 0; i < 32; i++, bits >>= 1) {
+                if ((bits & 1) != 0) {
+                    return i;
+                }
+            }
+            return byte.MaxValue;
+        }
+
+        private static char hexdigit(byte c)
+        {
+            return (char)((c >= 10) ? ('A' + (char)c - 10) : ('0' + (char)c));
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        [CLSCompliant(false)]
+        public struct PNPNODE {
+            [FieldOffset( 0)] public ushort   Size;   //0
+            [FieldOffset( 2)] public byte     Node;   //2
+            [FieldOffset( 3)] public byte     ProductId0; //3
+            [FieldOffset( 4)] public byte     ProductId1; //4
+            [FieldOffset( 5)] public byte     ProductId2; //5
+            [FieldOffset( 6)] public byte     ProductId3; //6
+            [FieldOffset( 7)] public byte     DeviceType0;    //7
+            [FieldOffset( 8)] public byte     DeviceType1;    //8
+            [FieldOffset( 9)] public byte     DeviceType2;    //9
+            [FieldOffset(10)] public ushort   DeviceAttributes;   //10..11
+        }
+
+        private IoMemory!  region;
+        private IoPort!  isaReadPort;
+        private IoPort!  isaWritePort;
+        private IoPort!  isaAddressPort;
+
+        private byte    isaCsns;
+        private string  newId; // not thread safe!
+
+        private const ushort ISA_ADDRESS_PORT   = 0x0279;
+        private const ushort ISA_WRITE_PORT     = 0x0A79;
+
+        private const byte ISA_ADDR_WAKE    = 0x03;
+        private const byte ISA_ADDR_CONFIG  = 0x04;
+        private const byte ISA_ADDR_STATUS  = 0x05;
+
+        private byte GetIsaResByte()
+        {
+            isaAddressPort.Write8(ISA_ADDR_STATUS);
+            while ((isaReadPort.Read8() & 0x1) == 0) {
+                // wait for ready.
+            }
+            isaAddressPort.Write8(ISA_ADDR_CONFIG);
+            return isaReadPort.Read8();
+        }
+
+        private void GetIsaResBytes(byte[]! buffer, int begin, int limit)
+        {
+            for (int i = begin; i < limit; i++) {
+                buffer[i] = GetIsaResByte();
+            }
+        }
+
+        public PnpBios(Resources.PnpBiosInfo pbi)
+            requires pbi.pnpRegion != null;
+            requires pbi.isaReadPort != null;
+        {
+            region = pbi.pnpRegion.AtOffset(0, (int)pbi.pnpRegion.Length);
+            isaReadPort = pbi.isaReadPort;
+            isaWritePort = new IoPort(ISA_WRITE_PORT, 1, Access.Write);
+            isaAddressPort = new IoPort(ISA_ADDRESS_PORT, 1, Access.Write);
+            isaCsns = (byte)pbi.isaCsns;
+        }
+
+        public void Initialize()
+        {
+        }
+
+        public void Finalize()
+        {
+        }
+
+        private string DecodeId(byte[]! buffer, int offset)
+        {
+            return "" +
+                (char)('@' + (buffer[offset + 0] >> 2)) +
+                (char)('@' + (((buffer[offset + 0] & 0x3) << 3) | (buffer[offset + 1] >> 5))) +
+                (char)('@' + ((buffer[offset + 1] & 0x1f))) +
+                hexdigit((byte)(buffer[offset + 2] >> 4)) +
+                hexdigit((byte)(buffer[offset + 2] & 0xf)) +
+                hexdigit((byte)(buffer[offset + 3] >> 4)) +
+                hexdigit((byte)(buffer[offset + 3] & 0xf));
+        }
+
+        private string DecodePnpId(int offset)
+        {
+            byte[] buffer = new byte [7];
+            region.Read8(offset, buffer, 0, 7);
+
+            return DecodeId(buffer, 0);
+        }
+
+        private void DecodeIsaLarge(byte[]! buffer, int size, ArrayList! list)
+        {
+#if VERBOSE
+            DebugStub.Print("  IsaLarge[{0}]: ", __arglist(buffer[0] & 0x7f));
+#endif
+
+            switch (buffer[0] & 0x7f) {
+              default:
+#if VERBOSE
+                DebugStub.Print("   ???1 {0,2:x2}\n", __arglist(buffer[0] & 0x7f));
+#endif
+                break;
+              case 0x1:
+                if (buffer[10] == 0) {
+                    break;
+                }
+#if VERBOSE
+                DebugStub.Print("   Memory inf={0,2:x2} min={1,4:x4}00 max={2,4:x4}00 aln={3,4:x4} len={4,4:x4}00\n",
+                                __arglist(
+                                    buffer[3],
+                                    BitConverter.ToUInt16(buffer, 4),
+                                    BitConverter.ToUInt16(buffer, 6),
+                                    BitConverter.ToUInt16(buffer, 8),
+                                    BitConverter.ToUInt16(buffer, 10)
+                                    ));
+#endif
+                list.Add(new IoMemoryRange((uint)BitConverter.ToUInt16(buffer, 4) << 8,
+                                           (uint)BitConverter.ToUInt16(buffer, 10) << 8,
+                                           Access.ReadWrite));
+                break;
+              case 0x2:
+#if VERBOSE
+                DebugStub.Print("   PNP ANSI Id\n");
+#endif
+                break;
+              case 0x4:
+#if VERBOSE
+                DebugStub.Print("   PNP Vendor\n");
+#endif
+                break;
+              case 0x5:
+                if (BitConverter.ToUInt32(buffer, 16) == 0) {
+                    break;
+                }
+#if VERBOSE
+                DebugStub.Print("   32-bit Memory inf={0,2:x2} min={1,8:x8} max={2,8:x8} aln={3,8:x8} len={4,8:x8}\n",
+                                __arglist(
+                                    buffer[3],
+                                    BitConverter.ToUInt32(buffer, 4),
+                                    BitConverter.ToUInt32(buffer, 8),
+                                    BitConverter.ToUInt32(buffer, 12),
+                                    BitConverter.ToUInt32(buffer, 16)));
+#endif
+                list.Add(new IoMemoryRange((uint)BitConverter.ToUInt32(buffer, 4),
+                                           (uint)BitConverter.ToUInt32(buffer, 16),
+                                           Access.ReadWrite));
+                break;
+              case 0x6:
+                if (BitConverter.ToUInt32(buffer, 8) == 0) {
+                    break;
+                }
+#if VERBOSE
+                DebugStub.Print("   32-bit Fixed Memory inf={0,2:x2} bas={1,8:x8}..{2,8:x8}\n",
+                                __arglist(
+                                    buffer[3],
+                                    BitConverter.ToUInt32(buffer, 4),
+                                    BitConverter.ToUInt32(buffer, 4) + BitConverter.ToUInt32(buffer, 8) - 1
+                                    ));
+#endif
+                list.Add(new IoMemoryRange((uint)BitConverter.ToUInt32(buffer, 4),
+                                           (uint)BitConverter.ToUInt32(buffer, 8),
+                                           Access.ReadWrite));
+                break;
+            }
+        }
+
+        private void DecodeIsaSmall(byte[]! buffer, int size, ArrayList! list)
+        {
+#if VERBOSE
+            DebugStub.Print("  IsaSmall[{0}]: ", __arglist(buffer[0] >> 3));
+#endif
+
+            switch (buffer[0] >> 3) {
+                default:
+#if VERBOSE
+                    DebugStub.Print("   ???2 {0,2:x2}\n", __arglist(buffer[0] >> 3));
+#endif
+                    break;
+
+                case 0x1: // Version
+#if VERBOSE
+                    DebugStub.Print("   Version PnP={0,2:x2}, Vendor={1,2:x2}\n",
+                                    __arglist(
+                                        buffer[1],
+                                        buffer[2]));
+#endif
+                    break;
+                case 0x2: // Logical Device
+#if VERBOSE
+                    DebugStub.Print("   Logical Device={0} Flags={1,2:x2} {2,2:x2}\n",
+                                    __arglist(
+                                        DecodeId(buffer, 1),
+                                        buffer[5],
+                                        buffer[6]));
+#endif
+                    break;
+                case 0x3: // Compatible Device
+#if VERBOSE
+                    DebugStub.Print("   Compatible Device={0}\n",
+                                    __arglist(DecodeId(buffer, 1)));
+#endif
+                    newId = "/" + DecodeId(buffer,1) + newId;
+                    break;
+                case 0x4: // IRQ
+                    byte irq = lowestbit(BitConverter.ToUInt16(buffer, 1));
+                    if (size >= 4) {
+#if VERBOSE
+                        DebugStub.Print("   IRQ {0,4:x4} type={1,2:x2}\n",
+                                        __arglist(irq, buffer[3]));
+#endif
+                    }
+                    else {
+#if VERBOSE
+                        DebugStub.Print("   IRQ {0,4:x4}\n", __arglist(irq));
+#endif
+                    }
+                    list.Add(new IoIrqRange(irq, 1));
+                    break;
+                case 0x5: // DMA
+                    byte dma = lowestbit(buffer[1]);
+#if VERBOSE
+                    DebugStub.Print("   DMA {0,2:x2} type={1,2:x2}\n",
+                                    __arglist(dma, buffer[2]));
+#endif
+                    list.Add(new IoDmaRange(dma, 1));
+                    break;
+                case 0x6: // [
+#if VERBOSE
+                    DebugStub.Print("   Start pri={0} [\n",
+                                    __arglist((buffer[0] >> 3 == 2 ? buffer[1] : (byte)0)));
+#endif
+                    break;
+                case 0x7: // ]
+#if VERBOSE
+                    DebugStub.Print("   ] End\n");
+#endif
+                    break;
+                case 0x8: // Port
+                    if (buffer[7] == 0) {
+                        break;
+                    }
+#if VERBOSE
+                    DebugStub.Print("   I/O Port inf={0,2:x2} min={1,4:x4} max={2,4:x4} aln={3,2:x2} len={4,2:x2} {5,4:x4}..{6,4:x4}\n",
+                                    __arglist(
+                                        buffer[1],
+                                        BitConverter.ToUInt16(buffer, 2),
+                                        BitConverter.ToUInt16(buffer, 4),
+                                        buffer[6],
+                                        buffer[7],
+                                        BitConverter.ToUInt16(buffer, 2),
+                                        BitConverter.ToUInt16(buffer, 2) + buffer[7] - 1));
+#endif
+                    list.Add(new IoPortRange(BitConverter.ToUInt16(buffer, 2),
+                                             buffer[7],
+                                             Access.ReadWrite));
+                    break;
+                case 0x9: // Fixed Port
+                    if (buffer[3] == 0) {
+                        break;
+                    }
+#if VERBOSE
+                    DebugStub.Print("   Fixed I/O Port bas={0,4:x4} len={1,2:x2}  {2,4:x4}..{3,4:x4}\n",
+                                    __arglist(
+                                        BitConverter.ToUInt16(buffer, 1),
+                                        buffer[3],
+                                        BitConverter.ToUInt16(buffer, 1),
+                                        BitConverter.ToUInt16(buffer, 1) + buffer[3] - 1));
+#endif
+                    list.Add(new IoPortRange(BitConverter.ToUInt16(buffer, 1),
+                                             buffer[3],
+                                             Access.ReadWrite));
+                    break;
+                case 0xe: // Vendor
+#if VERBOSE
+                    DebugStub.Print("   Vendor\n");
+#endif
+                    break;
+            }
+        }
+
+        private byte[]! SizeBuffer(byte[] buffer, int size)
+        {
+            if (buffer == null || buffer.Length < size) {
+                return new byte[size];
+            }
+            return buffer;
+        }
+
+        private PnpConfig DecodeIsa()
+        {
+            ArrayList list = new ArrayList();
+            byte[] buffer = null;
+
+            for (;;) {
+                byte b = GetIsaResByte();
+                int size;
+
+                if (b == 0x79) {
+                    break;
+                }
+
+                if ((b & 0x80) != 0) {
+                    byte b1 = GetIsaResByte();
+                    byte b2 = GetIsaResByte();
+                    size = 3 + (((int)b2 << 8) | b1);
+
+                    buffer = SizeBuffer(buffer, size);
+                    buffer[0] = b;
+                    buffer[1] = b1;
+                    buffer[2] = b2;
+                    GetIsaResBytes(buffer, 3, size);
+
+                    DecodeIsaLarge(buffer, size, list);
+                }
+                else {
+                    size = 1 + (b & 0x7);
+                    buffer = SizeBuffer(buffer, size);
+                    buffer[0] = b;
+                    GetIsaResBytes(buffer, 1, size);
+
+                    DecodeIsaSmall(buffer, size, list);
+                }
+            }
+            return NewPnpConfig((!)newId, list);
+        }
+
+        private PnpConfig DecodePnp(int offset, int limit)
+        {
+            ArrayList list = new ArrayList();
+            byte[] buffer = null;
+
+            while (offset < limit) {
+                if (region.Read8(offset) == 0x79) {
+                    offset += 2;
+                    break;
+                }
+
+                int size;
+
+                if ((region.Read8(offset) & 0x80) != 0) {
+                    size = 3 + region.Read16(offset + 1);
+
+                    buffer = SizeBuffer(buffer, size);
+                    region.Read8(offset, buffer, 0, size);
+
+                    DecodeIsaLarge(buffer, size, list);
+                }
+                else {
+                    size = 1 + (region.Read8(offset) & 0x7);
+
+                    buffer = SizeBuffer(buffer, size);
+                    region.Read8(offset, buffer, 0, size);
+
+                    DecodeIsaSmall(buffer, size, list);
+                }
+                offset += size;
+            }
+            return NewPnpConfig((!)newId, list);
+        }
+
+        private static PnpConfig! NewPnpConfig(string! id, ArrayList! list)
+        {
+            ArrayList idlist = new ArrayList();
+
+            string pnp_id = "/pnp" + id;
+
+            idlist.Add(pnp_id);
+
+            int pos = 5; // skip "/pnp/"
+
+            // DebugStub.WriteLine("parsing isa pnp id: " + pnp_id);
+
+            for (;;) {
+                int next = pnp_id.IndexOf('/', pos);
+                if (next == -1)
+                    break;
+                string variant = pnp_id.Substring(0, next);
+                idlist.Add(variant);
+                // DebugStub.WriteLine("adding variant: " + variant);
+                pos = next + 1;
+            }
+            
+            string[]! ids = (!)(string[])idlist.ToArray(typeof(string));
+
+            // DebugStub.Break();
+            return new PnpConfig(ids, list);
+        }
+
+
+        // create a PnpConfig object that tells all of the resources being used
+        // by this resource, so that we can account for everything in IoSystem
+
+        // This may seem perverse, but it is necessary!  We don't use
+        // enumeration to get the root device, and our accounting tool requires
+        // the IoConfig objects that are created via enumeration.  Since the
+        // memory range and readport range are gleaned through the boot process,
+        // without enumeration, we have to provide this hack to get the resource
+        // config into an IoConfig object, or else our accounting will not
+        // include the root bus.
+#if SINGULARITY_KERNEL
+        public PnpConfig! ReportConfig()
+#else
+        internal PnpConfig! ReportConfig()
+#endif
+        {
+            ArrayList list = new ArrayList();
+            IoRange [] fixedRanges = new IoRange[2];
+
+            list.Add(new IoMemoryRange((UIntPtr)region.PhysicalAddress.Value,
+                                       (UIntPtr)region.Length,
+                                       true, true));
+            list.Add(new IoPortRange(isaReadPort.Port,
+                                     isaReadPort.Size,
+                                     isaReadPort.Readable,
+                                     isaReadPort.Writable));
+
+            // since we're creating manual (and, for that matter, trusted)
+            // accounting, let's save a bit of work and generate the fixed
+            // resources right now.
+            fixedRanges[0] = new IoPortRange(isaWritePort.Port,
+                                             isaWritePort.Size,
+                                             isaWritePort.Readable,
+                                             isaWritePort.Writable);
+            fixedRanges[1] = new IoPortRange(isaAddressPort.Port,
+                                             isaAddressPort.Size,
+                                             isaAddressPort.Readable,
+                                             isaAddressPort.Writable);
+            PnpConfig p = new PnpConfig(new string[] { "" }, list);
+            p.FixedRanges = fixedRanges;
+            return p;
+        }
+
+
+        public SortedList Enumerate()
+        {
+            SortedList found = new SortedList();
+
+            Tracing.Log(Tracing.Audit, "Probing ISA Information");
+            DebugStub.WriteLine("Enumerating ISA PNP:");
+            int node = 0x000;
+            for (byte csn = 1; csn <= isaCsns; csn++) {
+#if VERBOSE
+                DebugStub.Print("Reading csn={0}\n", __arglist(csn));
+#endif
+                isaAddressPort.Write8(ISA_ADDR_WAKE);
+                isaWritePort.Write8(csn);
+
+                byte[] buffer = new byte[9];
+                GetIsaResBytes(buffer, 0, 9);
+                newId = "/" + DecodeId(buffer, 0);
+
+                DebugStub.Print(newId);
+                DebugStub.Print("/");
+                DebugStub.Print(node);
+                DebugStub.Print(":\n");
+                found.Add(String.Format("/{0,3:x3}", node++), DecodeIsa());
+            }
+
+#if VERBOSE
+            DebugStub.Print("\n");
+#endif
+            // See http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/devids.txt
+            node = 0x100;
+            for (int offset = 0; offset < region.Length;) {
+                ushort size = region.Read16(offset);
+#if VERBOSE
+                ushort attr = region.Read16(offset + 10);
+#endif
+
+                newId = "/" + DecodePnpId(offset + 3);
+
+#if VERBOSE
+                DebugStub.Print("  {0,8:x8} {1} {2,4:x4}",
+                                __arglist((uint)(region.PhysicalAddress.Value + offset), newId, attr));
+                String s = "";
+
+                if ((attr & 0x0100) != 0) s += " dyn";
+                if ((attr & 0x0080) != 0) s += " onl";
+                if ((attr & 0x0040) != 0) s += " rmv";
+                if ((attr & 0x0020) != 0) s += " dck";
+                if ((attr & 0x0010) != 0) s += " ipl";
+                if ((attr & 0x0008) != 0) s += " inp";
+                if ((attr & 0x0004) != 0) s += " out";
+                if ((attr & 0x0002) != 0) s += " cfg";
+                if ((attr & 0x0001) != 0) s += " dis";
+
+                DebugStub.WriteLine(s);
+#endif
+
+                DebugStub.WriteLine("{0}/{1:x3}:", __arglist(newId, node));
+                found.Add(String.Format("/{0,3:x3}", node++),
+                          DecodePnp(offset + 12, offset + size));
+
+                offset += size;
+            }
+            DebugStub.WriteLine("");
+            return found;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Drivers/PseudoBus.cs b/base/Kernel/Singularity.Drivers/PseudoBus.cs
new file mode 100644
index 0000000..9db831a
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/PseudoBus.cs
@@ -0,0 +1,96 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PseudoBus.cs
+//
+//  Note:
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Drivers
+{
+    /// <summary>
+    /// Bus for pseudo-devices.  A pseudo-device is typically a
+    /// layer in I/O stack that may or may not be associated
+    /// with one or more physical devices.
+    /// </summary>
+    public class PseudoBus : IBusDevice
+    {
+        public const string Name = "/pseudo0";
+
+        private static PseudoBus instance = null;
+
+        private SortedList! pseudoDevices;
+
+        private PseudoBus()
+        {
+            pseudoDevices = new SortedList();
+        }
+
+        internal static PseudoBus! Instance
+        {
+            get {
+                if (instance == null)
+                    instance = new PseudoBus();
+                return instance;
+            }
+        }
+
+        internal void RegisterPseudoDevice(string! name, IoConfig config)
+        {
+            pseudoDevices.Add(name, config);
+        }
+
+        public static IDevice! DeviceCreate(IoConfig! configobj)
+        {
+            return Instance;
+        }
+
+        SortedList IBusDevice.Enumerate()
+        {
+            return pseudoDevices;
+        }
+
+        void IDevice.Initialize()
+        {
+            DebugStub.Print("Initializing PseudoBusDevice.\n");
+        }
+
+        void IDevice.Finalize()
+        {
+        }
+    }
+
+    public class PseudoConfig : IoConfig
+    {
+        static private int count = 0;
+
+        public PseudoConfig(string className)
+        {
+            string[] ids = { String.Format("/pseudo0{0}/{1}", className, count++) };
+            this.Ids = ids;
+        }
+
+        public override string! ToString()
+        {
+            assert Ids != null;
+            assert Ids.Length > 0;
+            string id = Ids[0];
+            assert id != null;
+            return id;
+        }
+
+        public override string ToPrint()
+        {
+            return ToString();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Drivers/Register.cs b/base/Kernel/Singularity.Drivers/Register.cs
new file mode 100644
index 0000000..12ce108
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/Register.cs
@@ -0,0 +1,67 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Register.cs
+//
+//  Note:   PnP Device Type Registration and Base Initialization.
+//
+
+using Microsoft.Singularity.Drivers.IDE;
+using Microsoft.Singularity.Drivers.Pci;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Drivers
+{
+    public sealed class Devices
+    {
+        public static void RegisterPnpResources()
+        {
+            // : /pnp/PNP0700 : Floppy Controller   : PC Standard
+            // : /pnp/PNP0C01 : RAM                 : System Board
+            // : /pnp/PNP0A03 : PCI                 : PCI Bus
+            // : /pnp/PNP0501 : Generic Serial      : 16550A COM Port
+            // : /pnp/PNP0501 : Generic Serial      : 16550A COM Port
+            // : /pnp/PNP0400 : AT Parallel         : LPT Port
+            // : /pnp/PNP0000 : ISA 8259 PIC        : AT Interrupt Controller
+            // : /pnp/PNP0200 : ISA 8237 DMA        : AT DMA Controller
+            // : /pnp/PNP0100 : ISA 8254 Timer      : AT Timer
+            // : /pnp/PNP0B00 : ISA RTC Controller  : AT RTC
+            // : /pnp/PNP0800 : Other               : ???
+            // : /pnp/PNP0C02 : Other               : PnP Event Notification
+            // : /pnp/PNP0C02 : Other               : PnP Event Notification
+            // : /pnp/PNP0C04 : Other               : Math Coprocessor
+            // : /pnp/PNP0303 : Keyboard controller : 101/102 Keyboard
+            // : /pnp/PNP0F13 : Mouse Controller    : Logitech PS/2 Mouse
+
+            PnpBios bios = new PnpBios(Resources.GetPnpBiosInfo());
+
+            // in order for IoSystem accounting to work, we need to explicitly
+            // tell it what the IoConfig of the root device is:
+            IoSystem.AddRootDevice("/pnp0", bios, bios.ReportConfig());
+        }
+
+        // Now that we use metadata, this only registers drivers that do not run
+        // in separate processes.  All external processes are registered through
+        // the IoSystem.Initialize() code.
+        public static void RegisterInternalDrivers()
+        {
+            // PCI Bus
+            IoSystem.RegisterKernelDriver(
+                typeof(PciBusResources),
+                new IoDeviceCreate(PciBusResources.DeviceCreate));
+
+            // Legacy PC IDE bus
+            IoSystem.RegisterKernelDriver(
+                typeof(LegacyIdeBus),
+                new IoDeviceCreate(LegacyIdeBus.DeviceCreate));
+
+            // nForce4 IDE bus
+            IoSystem.RegisterKernelDriver(
+                typeof(NvIdeBus),
+                new IoDeviceCreate(NvIdeBus.DeviceCreate));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Drivers/ScsiDevice.cs b/base/Kernel/Singularity.Drivers/ScsiDevice.cs
new file mode 100644
index 0000000..64e0f7f
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/ScsiDevice.cs
@@ -0,0 +1,71 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ScsiDevice.cs
+//
+//  Base Classes and interfaces for SCSI Devices
+//
+//                           <mmurray@monkey.org>
+//
+//  References used:
+//  "AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS)", Revision 0, DRAFT
+//          08/17/04, ISO Working Group T13, http://www.t13.org/
+//
+//  "SCSI Primary Commands - 3 (SPC-3)", Revision 20a, DRAFT
+//          08/17/04, ISO Working Group T10, http://www.t10.org/
+//
+//  "SCSI Block Commands - 2 (SBC-2)", Revision 15, DRAFT
+//          07/22/04, ISO Working Group T10, http://www.t10.org/
+//
+//  "Multimedia Commands - 4 (MMC-4)", Revision 3a, DRAFT
+//          04/21/04, ISO Working Group T10, http://www.t10.org/
+//
+//  "Multimedia Commands - 5 (MMC-5)", Revision 0, DRAFT
+//          10/11/04, ISO Working Group T10, http://www.t10.org/
+
+using Microsoft.Singularity.Io;
+
+using System;
+
+namespace Microsoft.Singularity.Drivers.SCSI
+{
+    public enum PeripheralDeviceType
+    {
+        // From SPC-3, page 141
+        BLOCK = 0, // Direct Access Device (hard drives), SBC
+        CHAR = 1, // Sequential device (tape), SSC-2
+        PRINTER = 2, // Printers (are people crazy?), SSC
+        PROCESSOR = 3, // Processors (e.g. nCrypt), SPC-2
+        WORM = 4, // Write once, read many, SBC
+        CDROM = 5, // CD/DVD Roms, MMC
+        SCANNER = 6, // Scanners (Obsolete)
+        OPTICAL = 7, // Optical media, like Fujitsu MagnetoOptical. SBC
+        CHANGER = 8, // Media Changers, like Jukeboxes. SMC
+        COMM = 9, // Communications devices, like SCSI Ethernet.. (Obsolete)
+        RAID = 12, // Storage Controllers, SCC-2
+        ENCLOSURE = 13, // Enclosure Services, SES
+        SIMPLE = 14, // Reduced block command devices, RBC
+        OPTCARD = 15, // Optical Card Readers. OCRW
+        OBJECT = 17, // Object Based Storage Device, OSD
+        AUTOMAT = 18, // Automation/Drive Interface, ADC
+        UNKNOWN = 31, // Unknown
+    };
+    public class SPC3 {
+        public static string strDeviceType(PeripheralDeviceType devtype) {
+            switch(devtype) {
+                case PeripheralDeviceType.BLOCK:
+                    return "Block Device";
+                case PeripheralDeviceType.CDROM:
+                    return "CD/DVD-ROM";
+                default:
+                    return "Unknown SCSI Device.";
+            }
+        }
+    }
+};
+
+
+
diff --git a/base/Kernel/Singularity.Drivers/Vga.cs b/base/Kernel/Singularity.Drivers/Vga.cs
new file mode 100644
index 0000000..d2130ba
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/Vga.cs
@@ -0,0 +1,882 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Vga.cs
+//
+//  Notes:
+//
+//  Based on code originally written by Erick Smith (ErickS)
+//
+//  Useful reference URLs:
+//      http://www.xs4all.nl/~ganswijk/chipdir/reg/vga.txt "The VGA Registers"
+//      http://osdev.neopages.net/FreeVGA/vga/graphreg.htm
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using System;
+
+namespace Microsoft.Singularity.Drivers
+{
+    // create the resource object for CTR to fill in
+    [DriverCategory]
+    [Signature("pci/cc_0300")]
+    internal class VgaResources : DriverCategoryDeclaration
+    {
+        [IoFixedPortRange(Base = 0x3c0, Length = 0x20, Shared = true)]
+        IoPortRange dev;
+
+        [IoFixedMemoryRange(Base = 0xa0000, Length = 0x20000, Shared = true)]
+        public IoMemoryRange screenMemory;
+
+        [IoFixedMemoryRange(Base = 0xb8000, Length = 0x8000, Shared = true)]
+        public IoMemoryRange textBuffer;
+
+        // Provide to unify creation.
+        public static IDevice! DeviceCreate(IoConfig! configobj, String! instanceName)
+        {
+            DebugStub.Print("Creating VGA Display\n");
+            return new Vga();
+        }
+    }
+
+    public class Vga : ISvgaDevice
+    {
+        public const ushort ATC_ADDR_PORT               = 0x00;  // 3c0: Attribute Controller Address and
+        public const ushort MISC_OUTPUT_REG_WRITE_PORT  = 0x02;  // 3c2: Miscellaneous Output reg write port
+        public const ushort SEQ_ADDR_PORT               = 0x04;  // 3c4: Sequence Controller Address and
+        public const ushort SEQ_DATA_PORT               = 0x05;  // 3c5: Data registers
+        public const ushort DAC_PIXEL_MASK_PORT         = 0x06;  // 3c6: DAC pixel mask reg
+        public const ushort DAC_ADDR_WRITE_PORT         = 0x08;  // 3c8: DAC register write index reg
+        public const ushort DAC_DATA_REG_PORT           = 0x09;  // 3c9: DAC data transfer reg
+        public const ushort GRAPH_ADDR_PORT             = 0x0e;  // 3ce: Graphics Controller Address
+        public const ushort GRAPH_DATA_PORT             = 0x0f;  // 3cf: Graphics Controller Data
+        public const ushort CRTC_ADDR_COLOR_PORT        = 0x14;  // 3d4: CRT Controller Address and
+        public const ushort INPUT_STATUS_COLOR_PORT     = 0x1a;  // 3da: Input Status 1 register read port in color mode
+
+        public const int SCREEN_HEIGHT = 480;
+        public const int SCREEN_WIDTH = 640;
+
+        public void BitBltPng(int x, int y, byte[] buffer)
+        { /// dummy def
+        }
+
+        public Vga()
+        {
+            IoPortRange dev = new IoPortRange(0x3c0, 0x20, Access.ReadWrite);
+
+            atcAddrPort = dev.PortAtOffset(ATC_ADDR_PORT, 2, Access.ReadWrite);
+            miscOutputRegWritePort = dev.PortAtOffset(MISC_OUTPUT_REG_WRITE_PORT, 2, Access.ReadWrite);
+            seqAddrPort = dev.PortAtOffset(SEQ_ADDR_PORT, 2, Access.Write);
+            seqDataPort = dev.PortAtOffset(SEQ_DATA_PORT, 2, Access.ReadWrite);
+            dacPixelMaskPort = dev.PortAtOffset(DAC_PIXEL_MASK_PORT, 2, Access.Write);
+            dacAddressWritePort = dev.PortAtOffset(DAC_ADDR_WRITE_PORT, 2, Access.Write);
+            dacDataRegPort = dev.PortAtOffset(DAC_DATA_REG_PORT, 2, Access.Write);
+            graphAddrPort = dev.PortAtOffset(GRAPH_ADDR_PORT, 2, Access.Write);
+            graphDataPort = dev.PortAtOffset(GRAPH_DATA_PORT, 2, Access.ReadWrite);
+            crtcAddressColorPort = dev.PortAtOffset(CRTC_ADDR_COLOR_PORT, 2, Access.ReadWrite);
+            inputStatusColorPort = dev.PortAtOffset(INPUT_STATUS_COLOR_PORT, 2, Access.ReadWrite);
+
+            screenBuffer = IoMemory.AllocateIo(0xa0000, 0x20000, true, true);
+            textBuffer = IoMemory.AllocateIo(0xb8000, 0x8000, true, true);
+        }
+
+        private IHalConsole lastScreen;
+
+        //
+        // VGA register definitions
+        //
+        private IoPort  atcAddrPort;            // Attribute Controller Address and
+        private IoPort  miscOutputRegWritePort; // Miscellaneous Output reg write port
+        private IoPort  seqAddrPort;            // Sequence Controller Address and
+        private IoPort  seqDataPort;            // Data registers
+        private IoPort  dacPixelMaskPort;       // DAC pixel mask reg
+        private IoPort  dacAddressWritePort;    // DAC register write index reg
+        private IoPort  dacDataRegPort;         // DAC data transfer reg
+        private IoPort  graphAddrPort;          // Graphics Controller Address
+        private IoPort  graphDataPort;          // Graphics Controller Data
+        private IoPort  crtcAddressColorPort;   // CRT Controller Address and
+        private IoPort  inputStatusColorPort;   // Input Status 1 register read port in color mode
+
+        private IoMemory screenBuffer;
+        private IoMemory textBuffer;
+
+        //
+        // VGA indexed register indexes.
+        //
+        private const byte SEQ_RESET_REG        = 0;
+        private const byte SEQ_CLOCK_REG        = 1;
+        private const byte SEQ_PLANEMASK_REG    = 2;
+        private const byte SEQ_CHARSET_REG      = 3;
+        private const byte SEQ_MEMORY_REG       = 4;
+
+        private const byte GRAPH_SET_REG        = 0;
+        private const byte GRAPH_ENABLE_REG     = 1;
+        private const byte GRAPH_COMPARE_REG    = 2;
+        private const byte GRAPH_OPERATION_REG  = 3;
+        private const byte GRAPH_READSEL_REG    = 4;
+        private const byte GRAPH_MODE_REG       = 5;
+        private const byte GRAPH_MISC_REG       = 6;
+        private const byte GRAPH_DONTCARE_REG   = 7;
+        private const byte GRAPH_BITMASK_REG    = 8;
+
+        private const byte WRITE_MODE_0         = 0;
+        private const byte WRITE_MODE_1         = 1;
+        private const byte WRITE_MODE_2         = 2;
+        private const byte WRITE_MODE_3         = 3;
+        private const byte READ_MODE_0          = 0;
+        private const byte READ_MODE_1          = 8;
+
+        //
+        // Values for Attribute Controller Index register to turn video off
+        // and on, by setting bit 5 to 0 (off) or 1 (on).
+        //
+        private const byte VIDEO_ENABLE          = 0x20;
+
+        private const uint BI_RLE4 = 2;
+
+        //
+        // globals to track screen position
+        //
+
+        private const int DELTA = 80;
+
+        static private byte[] lMaskTable = new byte[8] {0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01};
+        static private byte[] rMaskTable = new byte[8] {0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff};
+        static private byte[] PixelMask = new byte[8] {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+
+        private void ReadWriteMode(byte mode)
+        {
+            graphAddrPort.Write8(GRAPH_MODE_REG);
+            graphDataPort.Write8(mode);
+        }
+
+        private void Plot(int x, int y, byte color)
+        {
+            int offset = y * DELTA + (x / 8);
+
+            ReadWriteMode(READ_MODE_1 | WRITE_MODE_2);
+            graphAddrPort.Write8(GRAPH_BITMASK_REG);
+            graphDataPort.Write8(PixelMask[x % 8]);
+
+            // The read triggers the latch register.
+            screenBuffer.Read8(offset);
+            screenBuffer.Write8(offset, color);
+        }
+
+        private void Fill(int x1, int y1, int x2, int y2, byte color)
+        {
+            if (x1 < 0 || x1 >= SCREEN_WIDTH ||
+                x2 < 0 || x2 >= SCREEN_WIDTH ||
+                y1 < 0 || y1 >= SCREEN_HEIGHT ||
+                y2 < 0 || y2 >= SCREEN_HEIGHT) {
+
+                throw new OverflowException("Draw bounds invalid.");
+            }
+
+            byte lMask = lMaskTable[x1 % 8];
+            byte rMask = rMaskTable[x2 % 8];
+
+            int bank1 = x1 / 8;
+            int bank2 = x2 / 8;
+            int count = bank2 - bank1;
+
+            if (count == 0) {
+                lMask &= rMask;
+            }
+
+            ReadWriteMode(READ_MODE_1 | WRITE_MODE_2);
+
+            //
+            // Do the left edge
+            //
+
+            graphAddrPort.Write8(GRAPH_BITMASK_REG);
+            graphDataPort.Write8(lMask);
+
+            int pDst = y1 * DELTA + bank1;
+            for (int y = y1; y <= y2; y++) {
+
+                // The read triggers the latch register.
+                screenBuffer.Read8(pDst);
+                screenBuffer.Write8(pDst, color);
+                pDst += DELTA;
+            }
+
+            if (count != 0) {
+
+                //
+                // Do the right edge
+                //
+
+                pDst = y1 * DELTA + bank2;
+                count--;
+                graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                graphDataPort.Write8(rMask);
+
+                for (int y = y1; y <= y2; y++) {
+                    // The read triggers the latch register.
+                    screenBuffer.Read8(pDst);
+                    screenBuffer.Write8(pDst, color);
+                    pDst += DELTA;
+                }
+
+                //
+                // Do the center section
+                //
+
+                if (count != 0) {
+
+                    pDst = y1 * DELTA + bank1 + 1;
+
+                    graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                    graphDataPort.Write8(0xff);
+
+                    for (int y = y1; y <= y2; y++) {
+                        screenBuffer.Write8(pDst, (byte)color, count);
+                        pDst += DELTA;
+                    }
+
+                }
+            }
+        }
+
+        private void BitBlt4(int x, int y, int width, int height,
+                             byte[] buffer, int offset, int ScanWidth)
+        {
+            byte[] Plane = new byte [81];
+            bool bRightEdge = false;
+            bool bCenterSection = false;
+
+            byte lMask = lMaskTable[x % 8];
+            byte rMask = rMaskTable[(x + width - 1) % 8];
+
+            int bank1 = x / 8;
+            int bank2 = (x + width - 1) / 8;
+
+            int count = bank2 - bank1;
+
+            if (bank1 == bank2) {
+                lMask &= rMask;
+            }
+
+            if (count != 0) {
+
+                bRightEdge = true;
+
+                count--;
+
+                if (count != 0) {
+
+                    bCenterSection = true;
+                }
+            }
+
+            int pDst = (y * DELTA) + (x / 8);
+            int pSrc = offset;
+
+            ReadWriteMode(READ_MODE_0 | WRITE_MODE_0);
+
+            for (uint j = 0; j < height; j++) {
+
+                for (byte plane = 1; plane < 16; plane <<= 1) {
+
+                    int pSrcTemp = pSrc;
+                    int pDstTemp = pDst;
+
+                    //
+                    // Convert the packed bitmap data into planar data
+                    // for this plane.
+                    //
+
+                    int bank = bank1;
+                    Plane[bank] = 0;
+                    byte Mask = PixelMask[x % 8];
+                    uint toggle = 0;
+
+                    for (uint i = 0; i < width; i++) {
+
+                        if ((toggle++ & 0x1) != 0) {
+
+                            if ((buffer[pSrcTemp] & plane) != 0) {
+                                Plane[bank] |= Mask;
+                            }
+
+                            pSrcTemp++;
+
+                        } else {
+
+                            if (((buffer[pSrcTemp] >> 4) & plane) != 0) {
+                                Plane[bank] |= Mask;
+                            }
+                        }
+
+                        Mask >>= 1;
+
+                        if (Mask == 0) {
+                            bank++;
+                            Plane[bank] = 0;
+                            Mask = 0x80;
+                        }
+                    }
+
+                    //
+                    // Set up the vga so that we see the correct bit plane.
+                    //
+
+                    seqAddrPort.Write8(SEQ_PLANEMASK_REG);
+                    seqDataPort.Write8(plane);
+
+                    //
+                    // bank will go from bank1 to bank2
+                    //
+
+                    bank = bank1;
+                    pDstTemp = pDst;
+
+
+                    //
+                    // Set Bitmask for left edge.
+                    //
+                    graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                    graphDataPort.Write8(lMask);
+
+                    // The read triggers the latch register.
+                    screenBuffer.Read8(pDstTemp);
+                    screenBuffer.Write8(pDstTemp++, Plane[bank++]);
+
+                    if (bCenterSection) {
+
+                        graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                        graphDataPort.Write8(0xff);
+
+                        screenBuffer.Write8(pDstTemp, Plane, bank, count);
+                        bank += count;
+                        pDstTemp += count;
+                    }
+
+                    if (bRightEdge) {
+
+                        //
+                        // Set bitmask for right edge.
+                        //
+
+                        graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                        graphDataPort.Write8(rMask);
+
+                        // The read triggers the latch register.
+                        screenBuffer.Read8(pDstTemp);
+                        screenBuffer.Write8(pDstTemp, Plane[bank]);
+                    }
+                }
+
+                pDst += DELTA;
+                pSrc += ScanWidth;
+            }
+
+            // Restore the settings.
+            seqAddrPort.Write8(SEQ_PLANEMASK_REG);
+            seqDataPort.Write8(0x0f);
+        }
+
+        private void BitBlt1(int x, int y, int width, int height,
+                             byte[] buffer, int offset, int ScanWidth, byte color)
+        {
+            int bank1 = x / 8;
+            int bank2 = (x + width - 1) / 8;
+
+            byte lMask = lMaskTable[x % 8];
+            byte rMask = rMaskTable[(x + width - 1) % 8];
+
+            if (bank1 == bank2) {
+                lMask &= rMask;
+            }
+
+            int pSrc = offset;
+            int pDst = (y * DELTA) + (x / 8);
+
+            int shift = x % 8;
+
+            ReadWriteMode(READ_MODE_0 | WRITE_MODE_0);
+
+            graphAddrPort.Write8(GRAPH_ENABLE_REG);
+            graphDataPort.Write8((byte)(color ^ 0x0f));
+
+            for (uint j = 0; j < height; j++) {
+
+                int pDstTemp = pDst;
+                int pSrcTemp = pSrc;
+                int count = width;
+
+                //
+                // non aligned case
+                //
+
+                if (shift != 0) {
+
+                    //
+                    // Left Edge.
+                    //
+
+                    graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                    graphDataPort.Write8(lMask);
+
+                    // The read triggers the latch register.
+                    screenBuffer.Read8(pDstTemp);
+                    screenBuffer.Write8(pDstTemp++, (byte)(buffer[pSrcTemp] >> shift));
+
+                    count -= (8 - shift);
+
+                    //
+                    // Now do center section
+                    //
+
+                    graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                    graphDataPort.Write8(0xff);
+
+                    while (count > 7) {
+                        screenBuffer.Write8(pDstTemp++,
+                                            (byte)((buffer[pSrcTemp] << (8 - shift)) |
+                                                   (buffer[pSrcTemp+1] >> shift)));
+
+                        pSrcTemp++;
+                        count -= 8;
+                    }
+
+                    //
+                    // Now do the right edge.
+                    //
+
+                    if (count != 0) {
+
+                        graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                        graphDataPort.Write8(rMask);
+
+                        // The read triggers the latch register.
+                        screenBuffer.Read8(pDstTemp);
+                        screenBuffer.Write8(pDstTemp++,
+                                            (byte)(buffer[pSrcTemp] << (8 - shift)));
+                    }
+
+                } else {
+
+                    //
+                    // Aligned case.
+                    //
+                    graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                    graphDataPort.Write8(0xff);
+
+                    screenBuffer.Write8(pDstTemp, buffer, pSrcTemp, count / 8);
+                    pSrcTemp += count / 8;
+                    pDstTemp += count / 8;
+                    count %= 8;
+
+                    //
+                    // Now do any remaining bits.
+                    //
+
+                    if (count != 0) {
+
+                        graphAddrPort.Write8(GRAPH_BITMASK_REG);
+                        graphDataPort.Write8(rMask);
+
+                        // The read triggers the latch register.
+                        screenBuffer.Read8(pDstTemp);
+                        screenBuffer.Write8(pDstTemp++, buffer[pSrcTemp]);
+                    }
+                }
+
+                pSrc += ScanWidth;
+                pDst += DELTA;
+            }
+
+            graphAddrPort.Write8(GRAPH_ENABLE_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_BITMASK_REG);
+            graphDataPort.Write8(0xff);
+        }
+
+        // Display a bitmap at a given location.
+        public void BitBltBmp(int x, int y, byte[] buffer)
+        {
+            BITMAPFILEHEADER bfh;
+            BITMAPINFOHEADER bih;
+            int lDelta;
+            int cbScanLine;
+            int used;
+            int offset = 0;
+
+            bfh = BITMAPFILEHEADER.Read(buffer, offset, out used);
+            bih = BITMAPINFOHEADER.Read(buffer, used, out used);
+
+            if (bih.biWidth == 0 || bih.biHeight == 0) {
+                return;
+            }
+
+            if (x < 0) {
+                x = SCREEN_WIDTH + x - bih.biWidth;
+            }
+            if (y < 0) {
+                y = SCREEN_HEIGHT + y - bih.biHeight;
+            }
+
+            if (x < 0 || x + bih.biWidth > SCREEN_WIDTH ||
+                y < 0 || y + bih.biHeight > SCREEN_HEIGHT) {
+
+                throw new OverflowException("Draw bounds invalid.");
+            }
+
+            offset = offset + bfh.bfOffBits;
+            used = offset;
+
+            //
+            // Make sure this is a 1bpp or 4bpp bitmap.
+            //
+
+            if ((bih.biBitCount * bih.biPlanes) <= 4 || bih.biCompression != 0) {
+
+                cbScanLine = (((bih.biWidth * bih.biBitCount) + 31) & ~31) / 8;
+
+                if (bih.biHeight < 0) {
+
+                    // top down bitmap
+                    lDelta = cbScanLine;
+                    bih.biHeight = -bih.biHeight;
+
+                } else {
+
+                    // bottom up bitmap
+                    offset += cbScanLine * (bih.biHeight - 1);
+                    lDelta = -cbScanLine;
+                }
+
+                if (used + cbScanLine * bih.biHeight > buffer.Length) {
+                    DebugStub.Print("{0} + {1} * {2} = {3} > {4}\n",
+                                    __arglist(
+                                        used,
+                                        cbScanLine,
+                                        bih.biHeight,
+                                        used + cbScanLine * bih.biHeight,
+                                        buffer.Length);
+                    throw new OverflowException("Bitmap invalid.");
+                }
+
+                if (bih.biBitCount == 1) {
+                    BitBlt1(x, y, bih.biWidth, bih.biHeight, buffer, offset, lDelta, 15);
+                }
+                else if (bih.biBitCount == 4) {
+                    BitBlt4(x, y, bih.biWidth, bih.biHeight, buffer, offset, lDelta);
+                }
+
+            } else {
+
+                //
+                // We don't support this type of bitmap.
+                //
+                DebugStub.Print("((bih.biBitCount * bih.biPlanes) not supported");
+            }
+        }
+
+        public void Scroll(int x1, int y1, int x2, int y2, int CharHeight)
+        {
+            if (x1 < 0 || x1 >= SCREEN_WIDTH ||
+                x2 < 0 || x2 >= SCREEN_WIDTH ||
+                y1 < 0 || y1 >= SCREEN_HEIGHT ||
+                y2 < 0 || y2 >= SCREEN_HEIGHT ||
+                y2 - y1 < CharHeight) {
+
+                throw new OverflowException("Draw bounds invalid.");
+            }
+
+            int width = (x2 / 8) - (x1 / 8) + 1;
+
+            ReadWriteMode(READ_MODE_0 | WRITE_MODE_1);
+
+            graphAddrPort.Write8(GRAPH_BITMASK_REG);  // enable write to all bits in plane
+            graphDataPort.Write8(0xff);
+
+            int pDst = y1 * DELTA + (x1 / 8);
+            int pSrc = pDst + DELTA * CharHeight;
+
+            for (int i = y1; i <= y2 - CharHeight; i++) {
+
+                int pDstTemp = pDst;
+                int pSrcTemp = pSrc;
+
+                for (int j = 0; j < width; j++) {
+                    // The read triggers the latch register.
+                    screenBuffer.Read8(pSrcTemp++);
+                    // The write triggers a write from the latch register, value ignored.
+                    screenBuffer.Write8(pDstTemp++, 0);
+                }
+
+                pDst += DELTA;
+                pSrc += DELTA;
+            }
+        }
+
+        public void Plot(int x, int y, RGB color)
+        {
+            Plot(x, y, (byte)color);
+        }
+
+        public void Fill(int x1, int y1, int x2, int y2, RGB color)
+        {
+            Fill(x1, y1, x2, y2, (byte)color);
+        }
+
+        public void BitBltChr(int x, int y, int width, int height,
+                       byte[] buffer, int offset, int ScanWidth,
+                       RGB color, RGB background)
+        {
+            BitBlt1(x, y, width, height, buffer, offset + height - ScanWidth, -ScanWidth, (byte)color);
+        }
+
+        private void SetPaletteEntry(byte index, uint RGB)
+        {
+            dacAddressWritePort.Write8(index);
+            dacDataRegPort.Write8((byte)(RGB & 0xff));
+            dacDataRegPort.Write8((byte)((RGB >> 8) & 0xff));
+            dacDataRegPort.Write8((byte)((RGB >> 16) & 0xff));
+        }
+
+        private void InitializePalette()
+        {
+            uint[] Palette = new uint[]
+                {
+                    0x00000000,
+                    0x00000020,
+                    0x00002000,
+                    0x00002020,
+                    0x00200000,
+                    0x00200020,
+                    0x00202000,
+                    0x00202020,
+                    0x00303030,
+                    0x0000003f,
+                    0x00003f00,
+                    0x00003f3f,
+                    0x003f0000,
+                    0x003f003f,
+                    0x003f3f00,
+                    0x003f3f3f,
+                };
+
+            for (byte i = 0; i < Palette.Length; i++) {
+                SetPaletteEntry(i, Palette[i]);
+            }
+
+        }
+
+        //  This routine initializes the VGA.
+        public void Initialize()
+        {
+            DebugStub.Print("Initializing VGA Driver\n");
+
+            Vga640x480();
+            DebugStub.Print("  VGA.AtInitialization\n");
+            AtInitialization();
+            DebugStub.Print("  VGA.InitializePalette\n");
+            InitializePalette();
+
+            DebugStub.Print("  VGA.Fill\n");
+            Fill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 11);
+            DebugStub.Print("  VGA.new SVGA\n");
+            SvgaWindow console = new SvgaWindow(this, 0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1);
+
+            lastScreen = Console.Screen;
+            Console.Screen = console;
+
+            Console.WriteLine("Singularity VGA Driver");
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+        }
+
+        public void Finalize()
+        {
+            if (lastScreen != null) {
+                Console.Screen = lastScreen;
+            }
+
+            AtInitialization();
+            InitializePalette();
+
+            VgaTextMode();
+
+            for (int i = 0; i < 50 * 80 * 2; i++) {
+                textBuffer.Write16(i, 0x1f41);
+            }
+        }
+
+        private void IndxOut(IoPort port, byte[] values)
+        {
+            for (ushort i = 0; i < values.Length; i++) {
+                port.Write16((ushort)(i + ((ushort)values[i] << 8)));
+            }
+        }
+
+        private void AtcOut(IoPort port, byte[] values)
+        {
+            for (byte i = 0; i < values.Length; i++) {
+                port.Write8(i);
+                port.Write8(values[i]);
+            }
+        }
+
+        //
+        private void VgaTextMode()
+        {
+            // start sync reset program up sequencer
+            IndxOut(seqAddrPort, new byte[] { 0x01,0x00,0x03,0x00,0x02 } );
+
+            miscOutputRegWritePort.Write8(0x67);
+            graphAddrPort.Write16(0x0e06);
+
+            //  EndSyncResetCmd
+            seqAddrPort.Write16(0x0300);
+
+            // Unlock the CTC registers.
+            crtcAddressColorPort.Write16(0x0E11);
+
+            // program crtc registers
+            IndxOut(crtcAddressColorPort, new byte[] { 0x5F,0x4f,0x50,0x82,0x55,0x81,
+                                                       0xbf,0x1f,0x00,0x4f,0x0d,0x0e,
+                                                       0x00,0x00,0x00,0x00,0x9c,0x8e,
+                                                       0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+                                                       0xFF } );
+
+            // prepare atc for writing
+            inputStatusColorPort.Read8();
+            AtcOut(atcAddrPort, new byte[] { 0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+                                             0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+                                             0x04,0x00,0x0F,0x08,0x00 } );
+
+            // program graphics controller registers
+            IndxOut(graphAddrPort, new byte[] { 0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,0xff});
+
+            // DAC mask registers
+            dacPixelMaskPort.Write8(0xFF);
+
+            // prepare atc for writing
+            inputStatusColorPort.Read8();
+
+            // turn video on.
+            atcAddrPort.Write8(VIDEO_ENABLE);
+        }
+
+        //
+        // Code to put vga into mode 12.
+        //
+        private void Vga640x480()
+        {
+            DebugStub.Print("  Vga640x480:1\n");
+            // start sync reset program up sequencer
+            seqAddrPort.Write8(SEQ_RESET_REG);
+            seqDataPort.Write8(0);
+            seqAddrPort.Write8(SEQ_CLOCK_REG);
+            seqDataPort.Write8(0x01);
+            seqAddrPort.Write8(SEQ_PLANEMASK_REG);
+            seqDataPort.Write8(0x0f);
+            seqAddrPort.Write8(SEQ_CHARSET_REG);
+            seqDataPort.Write8(0x00);
+            seqAddrPort.Write8(SEQ_MEMORY_REG);
+            seqDataPort.Write8(0x06);
+
+            DebugStub.Print("  Vga640x480:2\n");
+            miscOutputRegWritePort.Write8(0xe3);
+
+            DebugStub.Print("  Vga640x480:3\n");
+            // Set chain mode in sync reset
+            graphAddrPort.Write8(GRAPH_MISC_REG);
+            graphDataPort.Write8(0x05); // graphics and 64KB buffer
+
+            DebugStub.Print("  Vga640x480:4\n");
+            // EndSyncResetCmd
+            seqAddrPort.Write8(SEQ_RESET_REG);
+            seqDataPort.Write8(0x03);
+
+            DebugStub.Print("  Vga640x480:5\n");
+            // Unlock CRTC registers 0-7
+            crtcAddressColorPort.Write16(0x0511);
+
+            DebugStub.Print("  Vga640x480:6\n");
+            // program crtc registers
+            IndxOut(crtcAddressColorPort, new byte[] { 0x5F,0x4F,0x50,0x82,0x54,0x80,
+                                                       0x0B,0x3E,0x00,0x40,0x00,0x00,
+                                                       0x00,0x00,0x00,0x00,0xEA,0x8C,
+                                                       0xDF,0x28,0x00,0xE7,0x04,0xE3,
+                                                       0xFF } );
+
+            // prepare atc for writing
+            inputStatusColorPort.Read8();
+
+            DebugStub.Print("  Vga640x480:7\n");
+            // program attribute controller registers
+            AtcOut(atcAddrPort, new byte[] { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+                                             0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+                                             0x01,0x00,0x0F,0x00,0x00 } );
+
+            DebugStub.Print("  Vga640x480:8\n");
+            // program graphics controller registers
+            graphAddrPort.Write8(GRAPH_SET_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_ENABLE_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_COMPARE_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_OPERATION_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_READSEL_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_MODE_REG);
+            graphDataPort.Write8(0x00);
+            graphAddrPort.Write8(GRAPH_MISC_REG);
+            graphDataPort.Write8(0x05);
+            graphAddrPort.Write8(GRAPH_DONTCARE_REG);
+            graphDataPort.Write8(0x00); // was 0x0f
+            graphAddrPort.Write8(GRAPH_BITMASK_REG);
+            graphDataPort.Write8(0xff);
+
+            DebugStub.Print("  Vga640x480:9\n");
+            // DAC mask registers
+            dacPixelMaskPort.Write8(0xFF);
+
+            DebugStub.Print("  Vga640x480:10\n");
+            // prepare atc for writing
+            inputStatusColorPort.Read8();
+
+            DebugStub.Print("  Vga640x480:11\n");
+            // turn video on.
+            atcAddrPort.Write8(VIDEO_ENABLE);
+        }
+
+
+        //
+        // Initialize AT registers
+        //
+        private void AtInitialization()
+        {
+            // prepare atc for writing
+            inputStatusColorPort.Read8();
+
+            // program attribute controller registers
+            AtcOut(atcAddrPort, new byte[] { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+                                             0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f
+            });
+
+            // prepare atc for writing
+            inputStatusColorPort.Read8();
+
+            // turn video on.
+            atcAddrPort.Write8(VIDEO_ENABLE);
+        }
+    }
+}
+
diff --git a/base/Kernel/Singularity.Drivers/i8255x.cs b/base/Kernel/Singularity.Drivers/i8255x.cs
new file mode 100644
index 0000000..0183880
--- /dev/null
+++ b/base/Kernel/Singularity.Drivers/i8255x.cs
@@ -0,0 +1,206 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Register.cs
+//
+//  Note:   PnP Device Type Registration and Base Initialization.
+//
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using System;
+using System.Threading;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Intel8255x
+{
+    public class Factory {
+        public static IDevice! DeviceCreate(IoConfig! config, String! instanceName)
+        {
+            return new Driver((PciDeviceConfig)config);
+        }
+    }
+
+    internal enum SCBStatAck : byte {
+        CX  = 1 << 7,
+        FR  = 1 << 6,
+        CNA = 1 << 5,
+        RNR = 1 << 4,
+        MDI = 1 << 3,
+        SWI = 1 << 2,
+        ER  = 1 << 1,
+        FCP = 1 << 0
+    }
+
+    internal enum SCBStatus : byte {
+        RUS = 0x3 << 6,
+        CUS = 0xf << 2
+    }
+
+    internal enum SCBCommand : ushort {
+        CX  = 1 << 15,
+        FR  = 1 << 14,
+        CNA = 1 << 13,
+        RNR = 1 << 12,
+        ER  = 1 << 11,
+        FCP = 1 << 10,
+        SI  = 1 << 9,
+        M   = 1 << 8,
+        CUC = 0xf << 4,
+        RUC = 0x7
+    }
+
+    public class Driver : IDevice {
+        public static IDevice! DeviceCreate(IoConfig! config)
+        {
+            return new Driver((PciDeviceConfig)config);
+        }
+
+        private PciDeviceConfig config;
+
+        private IoMemoryRange eepromBase;
+        private IoMemory eepromMemory;
+
+        private IReadWriteRegister16    scbCommand;
+        private IReadOnlyRegister8      scbStatus;
+        private IReadWriteRegister8     scbStatAck;
+
+        private IoIrq                   irq;
+        private Thread                  irqWorker;
+        private bool                    irqWorkerStop = false;
+        private Thread                  irqMaker;
+        private bool                    irqMakerStop = false;
+
+        internal Driver(PciDeviceConfig config)
+        {
+            this.config = config;
+        }
+
+        private void DebugPrint(string format, __arglist)
+        {
+            DebugStub.Print(format, __arglist);
+        }
+
+        private void InitializeMemoryRegisters()
+        {
+            IoMemoryRange range = (IoMemoryRange)config.Ranges[0];
+            scbStatus  = ReadOnlyMemoryRegister8.Create(range, 0);
+            scbStatAck = ReadWriteMemoryRegister8.Create(range, 1);
+            scbCommand = ReadWriteMemoryRegister16.Create(range, 2);
+        }
+
+        private void InitializeIoPortRegisters()
+        {
+            IoPortRange range = (IoPortRange)config.Ranges[1];
+            scbStatus  = ReadOnlyPortRegister8.Create(range, 0);
+            scbStatAck = ReadWritePortRegister8.Create(range, 1);
+            scbCommand = ReadWritePortRegister16.Create(range, 2);
+        }
+
+        public void Initialize()
+        {
+            if (config.MemorySpaceEnabled) {
+                InitializeMemoryRegisters();
+            } else {
+                Debug.Assert(config.IoSpaceEnabled == true);
+                InitializeIoPortRegisters();
+            }
+
+            eepromBase = (IoMemoryRange)config.Ranges[2];
+            eepromMemory = eepromBase.MemoryAtOffset(0, 65536, Access.Read);
+
+            DebugPrint("RevisionId {0} SCB Status 0x{1:x2} " +
+                       "Command 0x{2:x4}\n",
+                       __arglist(config.RevisionId,
+                                 (byte)GetScbStatus(), (ushort)GetScbCommand()));
+
+            irq = config.GetIrq().IrqAtOffset(0);
+            irq.RegisterInterrupt();
+            irqWorker = new Thread(new ThreadStart(this.IrqWorkerMain),
+                                   new Scheduler.Activity()
+                                   );
+            irqWorker.Start();
+            irqWorker.Name = String.Format("i8255x I/O {0} ({0})",
+                                           config.ToString());
+
+            irqMaker = new Thread(new ThreadStart(this.IrqMakerMain),
+                                  new Scheduler.Activity()
+                                  );
+            irqMaker.Start();
+        }
+
+        public void Finalize()
+        {
+            irqWorkerStop = true;
+            irqMakerStop = true;
+            irq.ReleaseInterrupt();
+
+#if CAN_JOIN
+            if (irqMaker != null) {
+                irqMaker.Join();
+                irqMaker = null;
+            }
+            if (irqWorker != null) {
+                irqWorker.Join();
+                irqWorker = null;
+            }
+#endif
+        }
+
+        private SCBStatus GetScbStatus()
+        {
+            return (SCBStatus)scbStatus.Read();
+        }
+
+        private SCBStatAck GetScbStatAck()
+        {
+            return (SCBStatAck)scbStatAck.Read();
+        }
+
+        private void SetScbStatAck(SCBStatAck value)
+        {
+            scbStatAck.Write((byte)value);
+        }
+
+        private SCBCommand GetScbCommand()
+        {
+            return (SCBCommand)scbCommand.Read();
+        }
+
+        private void SetScbCommand(SCBCommand value)
+        {
+            scbCommand.Write((ushort)value);
+        }
+
+        private void IrqMakerMain()
+        {
+            for (;;) {
+                Thread.Sleep(1000);
+                // Trigger Software Interrupt
+                scbCommand.Write((ushort)SCBCommand.SI);
+            }
+        }
+
+        private void IrqWorkerMain()
+        {
+            Tracing.Log(Tracing.Audit, "Start of worker thread.");
+            uint iters = 0;
+            for (;;) {
+                irq.WaitForInterrupt();
+                DebugPrint("+ IrqWorkerMain iteration {0}\n", __arglist(iters));
+
+                SCBStatAck s = GetScbStatAck();
+                DebugPrint("Clearing Interupt : StatAck 0x{0:x4}\n",
+                           __arglist((ushort)s));
+                SetScbStatAck(s); // Write bits back to clear
+                scbCommand.Write(0);
+                irq.AckInterrupt();
+
+                DebugPrint("- IrqWorkerMain iteration {0}\n", __arglist(iters));
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/AcpiChecksum.cs b/base/Kernel/Singularity.Hal.Acpi/AcpiChecksum.cs
new file mode 100644
index 0000000..462bae6
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/AcpiChecksum.cs
@@ -0,0 +1,36 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AcpiChecksum.cs
+//
+//  Note:
+//    Based on ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    internal class AcpiChecksum
+    {
+        public static byte Compute(IoMemory region)
+        {
+            return Compute(region, 0, (uint) region.Length);
+        }
+
+        public static byte Compute(IoMemory region, uint offset, uint length)
+        {
+            byte sum  = 0;
+            uint stop = offset + length;
+
+            for (uint i = offset; i < stop; i++)
+            {
+                sum += region.Read8((int) i);
+            }
+            return sum;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/AcpiTables.cs b/base/Kernel/Singularity.Hal.Acpi/AcpiTables.cs
new file mode 100644
index 0000000..b16ab33
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/AcpiTables.cs
@@ -0,0 +1,270 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AcpiTables.cs
+//
+//  Note:
+//    Based on ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    [ CLSCompliant(false) ]
+    internal class AcpiTables
+    {
+        private static Fadt fadt;
+        private static Madt madt;
+
+        private static Dsdt dsdt;
+        private static Ssdt ssdt;
+
+        private static Srat srat;
+
+        private static PMTimer pmTimer;
+
+        private static UIntPtr GetRsdpBase()
+        {
+            unsafe
+            {
+                return BootInfo.GetBootInfo().AcpiRoot32;
+            }
+        }
+
+        public static Fadt GetFadt()
+        {
+            return fadt;
+        }
+
+        public static Madt GetMadt()
+        {
+            return madt;
+        }
+
+        public static Srat GetSrat()
+        {
+            return srat;
+        }
+
+        public static PMTimer GetPMTimer()
+        {
+            return pmTimer;
+        }
+
+        public static void Parse()
+        {
+            UIntPtr rsdpBase = GetRsdpBase();
+
+            if (rsdpBase == UIntPtr.Zero) {
+                DebugStub.Print("ACPI RSDP not found\n");
+            }
+
+            DebugStub.Print("ACPI RSDP address is {0:x8}\n",
+                            __arglist(rsdpBase));
+            Rsdp rsdp = Rsdp.Parse(rsdpBase, 36u);
+
+            DebugStub.Print("ACPI RSDP OemId is {0:x8}\n",
+                            __arglist(rsdp.OemId));
+            DebugStub.Print("ACPI RSDP revision is {0:x8}\n",
+                            __arglist(rsdp.Revision));
+            DebugStub.Print("ACPI RSDT address is {0:x8}\n",
+                            __arglist(rsdp.RsdtAddress));
+
+            SystemTableHeader rsdtHeader =
+                SystemTableHeader.Create(rsdp.RsdtAddress);
+
+            Rsdt rsdt = Rsdt.Create(rsdtHeader);
+
+
+            DebugStub.Print("RSDT contains:\n");
+            for (int i = 0; i < rsdt.EntryCount; i++) {
+                SystemTableHeader header = rsdt.GetTableHeader(i);
+                DebugStub.Print("    {0:x8}\n", __arglist(header.Signature));
+                if (header.Signature == Fadt.Signature) {
+                    fadt = Fadt.Create(header);
+                }
+                else if (header.Signature == Madt.Signature) {
+                    madt = Madt.Create(header);
+                }
+                else if (header.Signature == Ssdt.Signature) {
+                    ssdt = Ssdt.Create(header);
+                }
+                // haryadi - Srat, Slit
+                else if (header.Signature == Srat.Signature)
+                {
+                    srat = Srat.Create(header);
+                    srat.ParseSratStructure();
+
+                    // srat.DumpSratOffsets();
+                    // srat.DumpSratImportantFields();
+                    // srat.DumpSratStructure();
+
+                }
+            }
+
+            if (fadt != null) {
+                pmTimer = PMTimer.Create(fadt);
+                DebugStub.Print("PMTimer Value={0} Width={1}\n",
+                                __arglist(pmTimer.Value, pmTimer.Width));
+                uint t0 = pmTimer.Value;
+                uint t1 = pmTimer.Value;
+                uint t2 = pmTimer.Value;
+                uint delta = (t2 >= t1) ? t2 - t1 : ((t1 | 0xff000000) - t2);
+                DebugStub.Print("Read cost {0} ticks\n", __arglist(delta));
+
+                if (fadt.DSDT != 0)
+                {
+                    dsdt = Dsdt.Create(
+                        SystemTableHeader.Create(fadt.DSDT)
+                        );
+                }
+            }
+            if (dsdt != null) {
+                DumpRegion("DSDT", dsdt.Region);
+            }
+            if (ssdt != null) {
+                DumpRegion("SSDT", ssdt.Region);
+            }
+        }
+
+        private static char Hex(int v)
+        {
+            if (v < 10) {
+                return (char)('0' + v);
+            }
+            else {
+                return (char)('A' + v - 10);
+            }
+        }
+
+        private static void DumpRegion(string name, IoMemory region)
+        {
+#if FALSE
+            //            (new NamespaceWalker(region)).Display();
+            DebugStub.Print("-----------------------------------------------------------------------------\n");
+            DebugStub.Print("Table {0} dump\n", __arglist(name));
+            DebugStub.Print("-----------------------------------------------------------------------------\n");
+
+            const int step = 16;
+
+            byte last = region.Read8(0);
+            for (int i = 0; i < region.Length - 8; i ++) {
+                if (region.Read8(i + 0) == (byte)'_' &&
+                    (region.Read8(i + 1) == (byte)'C' ||
+                     region.Read8(i + 1) == (byte)'H') &&
+                    region.Read8(i + 2) == (byte)'I' &&
+                    region.Read8(i + 3) == (byte)'D') {
+
+                    int o = 1;
+                    byte d0 = region.Read8(i + 4 + o);
+                    byte d1 = region.Read8(i + 5 + o);
+                    byte d2 = region.Read8(i + 6 + o);
+                    byte d3 = region.Read8(i + 7 + o);
+                    char c0 = (char)(((d0 & 0x7f) >> 2) + 0x40);
+                    char c1 = (char)((((d0 & 0x3) << 3) | (d1 >> 5)) + 0x40);
+                    char c2 = (char)((d1 & 0x1f) + 0x40);
+                    char c3 = Hex(d2 >> 4);
+                    char c4 = Hex(d2 & 0xf);
+                    char c5 = Hex(d3 >> 4);
+                    char c6 = Hex(d3 & 0xf);
+                    DebugStub.Print("{0:x8} -> _{8}ID {1}{2}{3}{4}{5}{6}{7}\n",
+                                    __arglist(i, c0, c1, c2,
+                                              c3, c4, c5, c6,
+                                              (char)region.Read8(i + 1)));
+                }
+            }
+
+            for (int i = 0; i < region.Length; i += step) {
+                DebugStub.Print("{0:x8} : ", __arglist(i));
+                int n = step;
+                if (region.Length - i < n) {
+                    n = region.Length - i;
+                }
+                for (int j = 0; j < n; j++) {
+                    char c = (char)region.Read8(i + j);
+                    DebugStub.Print("{0:x2} ", __arglist((int)c));
+                }
+                for (int j = 0; j < n; j++) {
+                    char c = (char)region.Read8(i + j);
+                    if (c < 32 || c > 127)
+                        c = '.';
+                    DebugStub.Print(c.ToString());
+                }
+                DebugStub.Print("\n");
+            }
+            DebugStub.Print("\n");
+#endif // FALSE
+        }
+
+        internal class NamespaceWalker
+        {
+            int cursor = 0;
+            IoMemory memory;
+
+            internal NamespaceWalker(IoMemory m)
+            {
+                this.memory = m;
+            }
+
+            byte Read8()
+            {
+                return this.memory.Read8(cursor++);
+            }
+
+            ushort Read16()
+            {
+                ushort r = this.memory.Read16(cursor);
+                cursor += 2;
+                return r;
+            }
+
+            uint Read32()
+            {
+                uint r = this.memory.Read32(cursor++);
+                cursor += 4;
+                return r;
+            }
+
+            int GetPackageLength()
+            {
+                byte b = Read8();
+                int length    = (int)b & 0x3f;
+                int following = ((int)b & 0xc) >> 6;
+                while (following-- > 0) {
+                    length = length << 8;
+                    length += (int)Read8();
+                }
+                return length;
+            }
+
+            void Reset()
+            {
+                cursor = 0;
+            }
+
+            internal void Display()
+            {
+                while (cursor < this.memory.Length) {
+                    DisplayPackage(0);
+                }
+            }
+
+            void DisplayPackage(int depth)
+            {
+                int length    = GetPackageLength();
+                int oldCursor = this.cursor;
+                DebugStub.Print("Package Length {0} Name {1}{2}{3}{4}",
+                                __arglist(length,
+                                          (char)Read8(),
+                                          (char)Read8(),
+                                          (char)Read8(),
+                                          (char)Read8()));
+                cursor = oldCursor + length;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Dsdt.cs b/base/Kernel/Singularity.Hal.Acpi/Dsdt.cs
new file mode 100644
index 0000000..0f018c1
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Dsdt.cs
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Dsdt.cs
+//
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    public class Dsdt
+    {
+        public const string Signature = "DSDT";
+
+        private IoMemory          region;
+        private SystemTableHeader header;
+
+        public Dsdt(IoMemory region, SystemTableHeader header)
+        {
+            this.region = region;
+            this.header = header;
+        }
+
+        public IoMemory Region
+        {
+            get { return region; }
+        }
+
+        public static Dsdt Create(SystemTableHeader header)
+        {
+            IoMemory region = IoMemory.MapPhysicalMemory(header.PostHeaderAddress,
+                                                         header.PostHeaderLength,
+                                                         true, false);
+            int sum = (header.Checksum + AcpiChecksum.Compute(region)) & 0xff;
+            if (sum != 0)
+            {
+                return null;
+            }
+            return new Dsdt(region, header);
+        }
+    }
+
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Fadt.cs b/base/Kernel/Singularity.Hal.Acpi/Fadt.cs
new file mode 100644
index 0000000..2d2d69b
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Fadt.cs
@@ -0,0 +1,145 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AcpiTables.cs
+//
+//  Note:
+//    Pages 95-104 of ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    public enum FadtFlags : uint
+    {
+        WBINVD                               = 1u << 0,
+        WBINVD_FLUSH                         = 1u << 1,
+        PROC_C1                              = 1u << 2,
+        P_LVL2_UP                            = 1u << 3,
+        PWR_BUTTON                           = 1u << 4,
+        SLP_BUTTON                           = 1u << 5,
+        FIX_RTC                              = 1u << 6,
+        RTC_S4                               = 1u << 7,
+        TMR_VAL_EXT                          = 1u << 8,
+        DCK_CAP                              = 1u << 9,
+        RESET_REG_SUP                        = 1u << 10,
+        SEALED_CASE                          = 1u << 11,
+        HEADLESS                             = 1u << 12,
+        CPU_SW_SLP                           = 1u << 13,
+        PCI_EXP_WAK                          = 1u << 14,
+        USE_PLATFORM_CLOCK                   = 1u << 15,
+        S4_RTC_STS_VALID                     = 1u << 16,
+        REMOTE_POWER_ON_CAPABLE              = 1u << 17,
+        FORCE_APIC_CLUSTER_MODEL             = 1u << 18,
+        FORCE_APIC_PHYSICAL_DESTINATION_MODE = 1u << 19,
+    };
+
+    public class Fadt
+    {
+        public const string Signature = "FACP";
+
+        private IoMemory          region;
+        private SystemTableHeader header;
+
+        public Fadt(IoMemory region, SystemTableHeader header)
+        {
+            this.region = region;
+            this.header = header;
+        }
+
+        private byte Read8(int offset)
+        {
+            return region.Read8(offset - (int) SystemTableHeader.Length);
+        }
+
+        private ushort Read16(int offset)
+        {
+            return region.Read16(offset - (int) SystemTableHeader.Length);
+        }
+
+        private uint Read32(int offset)
+        {
+            return region.Read32(offset - (int) SystemTableHeader.Length);
+        }
+
+        private ulong Read64(int offset)
+        {
+            return region.Read64(offset - (int) SystemTableHeader.Length);
+        }
+
+        private Gas ReadGas(int offset)
+        {
+            return new Gas(Read32(offset), Read64(offset + 4));
+        }
+
+        // --- BEGIN GENERATED REGION ---
+
+        public uint FIRMWARE_CTRL        { get { return Read32(36); } }
+        public uint DSDT                 { get { return Read32(40); } }
+        public byte Preferred_PM_Profile { get { return Read8(45); } }
+        public ushort SCI_INT            { get { return Read16(46); } }
+        public uint SMI_CMD              { get { return Read32(48); } }
+        public byte ACPI_ENABLE          { get { return Read8(52); } }
+        public byte ACPI_DISABLE         { get { return Read8(53); } }
+        public byte S4BIOS_REQ           { get { return Read8(54); } }
+        public byte PSTATE_CNT           { get { return Read8(55); } }
+        public uint PM1a_EVT_BLK         { get { return Read32(56); } }
+        public uint PM1b_EVT_BLK         { get { return Read32(60); } }
+        public uint PM1a_CNT_BLK         { get { return Read32(64); } }
+        public uint PM1b_CNT_BLK         { get { return Read32(68); } }
+        public uint PM2_CNT_BLK          { get { return Read32(72); } }
+        public uint PM_TMR_BLK           { get { return Read32(76); } }
+        public uint GPE0_BLK             { get { return Read32(80); } }
+        public uint GPE1_BLK             { get { return Read32(84); } }
+        public byte PM1_EVT_LEN          { get { return Read8(88); } }
+        public byte PM1_CNT_LEN          { get { return Read8(89); } }
+        public byte PM2_CNT_LEN          { get { return Read8(90); } }
+        public byte PM_TMR_LEN           { get { return Read8(91); } }
+        public byte GPE0_BLK_LEN         { get { return Read8(92); } }
+        public byte GPE1_BLK_LEN         { get { return Read8(93); } }
+        public byte GPE1_BASE            { get { return Read8(94); } }
+        public byte CST_CNT              { get { return Read8(95); } }
+        public ushort P_LVL2_LAT         { get { return Read16(96); } }
+        public ushort P_LVL3_LAT         { get { return Read16(98); } }
+        public ushort FLUSH_SIZE         { get { return Read16(100); } }
+        public ushort FLUSH_STRIDE       { get { return Read16(102); } }
+        public byte DUTY_OFFSET          { get { return Read8(104); } }
+        public byte DUTY_WIDTH           { get { return Read8(105); } }
+        public byte DAY_ALRM             { get { return Read8(106); } }
+        public byte MON_ALRM             { get { return Read8(107); } }
+        public byte CENTURY              { get { return Read8(108); } }
+        public ushort IAPC_BOOT_ARCH     { get { return Read16(109); } }
+        public uint Flags                { get { return Read32(112); } }
+        public Gas RESET_REG             { get { return ReadGas(116); } }
+        public byte RESET_VALUE          { get { return Read8(128); } }
+        public ulong X_FIRMWARE_CTRL     { get { return Read64(132); } }
+        public ulong X_DSDT              { get { return Read64(140); } }
+        public Gas X_PM1a_EVT_BLK        { get { return ReadGas(148); } }
+        public Gas X_PM1b_EVT_BLK        { get { return ReadGas(160); } }
+        public Gas X_PM1a_CNT_BLK        { get { return ReadGas(172); } }
+        public Gas X_PM1b_CNT_BLK        { get { return ReadGas(184); } }
+        public Gas X_PM2_CNT_BLK         { get { return ReadGas(196); } }
+        public Gas X_PM_TMR_BLK          { get { return ReadGas(208); } }
+        public Gas X_GPE0_BLK            { get { return ReadGas(220); } }
+        public Gas X_GPE1_BLK            { get { return ReadGas(232); } }
+
+        // --- END GENERATED REGION ---
+
+        public static Fadt Create(SystemTableHeader header)
+        {
+            IoMemory region = IoMemory.MapPhysicalMemory(header.PostHeaderAddress,
+                                                         header.PostHeaderLength,
+                                                         true, false);
+            int sum = (header.Checksum + AcpiChecksum.Compute(region)) & 0xff;
+            if (sum != 0)
+            {
+                return null;
+            }
+            return new Fadt(region, header);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Gas.cs b/base/Kernel/Singularity.Hal.Acpi/Gas.cs
new file mode 100644
index 0000000..c7ffa87
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Gas.cs
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Gas.cs
+//
+//  Note:
+//    Page 87 of ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    public class Gas  // Generic Address Structure
+    {
+        // Address space id values
+        public const byte SystemMemory            = 0;
+        public const byte SystemIo                = 1;
+        public const byte PciConfigSpace          = 2;
+        public const byte EmbeddedController      = 3;
+        public const byte SMBus                   = 4;
+        public const byte FunctionalFixedHardware = 0x7f;
+
+        private uint  properties;
+        private ulong address;
+
+        public Gas(uint properties, ulong address)
+        {
+            this.properties = properties;
+            this.address = address;
+        }
+
+        public byte AddressSpaceId
+        {
+            get { return (byte) properties; }
+        }
+
+        public byte RegisterBitWidth
+        {
+            get { return (byte) (properties >> 8); }
+        }
+
+        public byte RegisterBitOffset
+        {
+            get { return (byte) (properties >> 16); }
+        }
+
+        public byte AccessSize
+        {
+            get { return (byte) (properties >> 24); }
+        }
+
+        public int AccessSizeBytes
+        {
+            get { return ((1 << AccessSize) >> 1); }
+        }
+
+        public ulong Address
+        {
+            get { return address; }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Madt.cs b/base/Kernel/Singularity.Hal.Acpi/Madt.cs
new file mode 100644
index 0000000..75a35f6
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Madt.cs
@@ -0,0 +1,460 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AcpiTables.cs
+//
+//  Note:
+//    Pages of 111-121 ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using Microsoft.Singularity.Io;
+
+    public struct MadtFlags
+    {
+        public const uint PCAT_COMPAT_FLAG = 0x01;
+    }
+
+    public class Madt
+    {
+        public const string Signature = "APIC";
+
+        private IoMemory region;
+        private SystemTableHeader header;
+
+        uint localApicAddress;
+        uint flags;             // Values per MadtFlags
+
+        private Madt(IoMemory region, SystemTableHeader header)
+        {
+            this.region = region;
+            this.header = header;
+
+            localApicAddress = region.Read32(0);
+            flags            = region.Read32(4);
+
+            // XXX Just for debugging
+            GetLocalApics();
+            GetIoApics();
+            GetInterruptSourceOverrides();
+            GetNmis();
+            GetApicNmis();
+            GetLocalApicAddressOverrides();
+            GetIoSApics();
+            GetLocalSApics();
+            GetPlatformInterruptSources();
+        }
+
+
+        ///////////////////////////////////////////////////////////////////////
+        // Structure and method to get MADT table items generically
+
+        private delegate object ItemCreateDelegate(IoMemory mem, int offset);
+
+        private ArrayList GetStructures(byte typeId,
+                                        ItemCreateDelegate createMethod)
+        {
+            ArrayList l = new ArrayList();
+
+            int offset = 8;
+            while (offset < region.Length)
+            {
+                if (region.Read8(offset) == typeId)
+                {
+                    object entry = createMethod(region, offset);
+                    if (entry != null)
+                    {
+                        l.Add(entry);
+                    }
+                }
+                offset +=  region.Read8(offset + 1);
+            }
+            return l;
+        }
+
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods to get MADT items of particular types
+
+        public ArrayList GetLocalApics()
+        {
+            return GetStructures(LocalApic.TypeId,
+                                 new ItemCreateDelegate(LocalApic.Create));
+        }
+
+        public ArrayList GetIoApics()
+        {
+            return GetStructures(IoApic.TypeId,
+                                 new ItemCreateDelegate(IoApic.Create));
+        }
+
+        public ArrayList GetInterruptSourceOverrides()
+        {
+            return GetStructures(InterruptSourceOverride.TypeId,
+                                 new ItemCreateDelegate(InterruptSourceOverride.Create));
+        }
+
+        public ArrayList GetNmis()
+        {
+            return GetStructures(Nmi.TypeId,
+                                 new ItemCreateDelegate(Nmi.Create));
+        }
+
+        public ArrayList GetApicNmis()
+        {
+            return GetStructures(ApicNmi.TypeId,
+                                 new ItemCreateDelegate(ApicNmi.Create));
+        }
+
+        public ArrayList GetLocalApicAddressOverrides()
+        {
+            return GetStructures(LocalApicAddressOverride.TypeId,
+                                 new ItemCreateDelegate(LocalApicAddressOverride.Create));
+        }
+
+        public ArrayList GetIoSApics()
+        {
+            return GetStructures(IoSApic.TypeId,
+                                 new ItemCreateDelegate(IoSApic.Create));
+        }
+
+        public ArrayList GetLocalSApics()
+        {
+            return GetStructures(LocalSApic.TypeId,
+                                 new ItemCreateDelegate(LocalSApic.Create));
+        }
+
+        public ArrayList GetPlatformInterruptSources()
+        {
+            return GetStructures(PlatformInterruptSource.TypeId,
+                                 new ItemCreateDelegate(PlatformInterruptSource.Create));
+        }
+
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+
+        internal static Madt Create(SystemTableHeader header)
+        {
+            IoMemory region = IoMemory.MapPhysicalMemory(header.PostHeaderAddress,
+                                                         header.PostHeaderLength,
+                                                         true, false);
+            int sum = (header.Checksum + AcpiChecksum.Compute(region)) & 0xff;
+            if (sum != 0)
+            {
+                return null;
+            }
+            return new Madt(region, header);
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // MADT APIC Structure Constants
+
+    public struct ApicFlags
+    {
+        public const uint Enabled = 0x01;
+    }
+
+    public struct MpsIntiFlags
+    {
+        public const ushort PolarityBus        = 0;
+        public const ushort PolarityActiveHigh = 1;
+        public const ushort PolarityActiveLow  = 3;
+        public const ushort PolarityMask       = 3;
+
+        public const ushort TriggerBus         = 0;
+        public const ushort TriggerEdge        = 4;
+        public const ushort TriggerLevel       = 6;
+        public const ushort TriggerMask        = 6;
+    }
+
+    public struct PlatformInterruptType
+    {
+        public const uint PMI                             = 1;
+        public const uint INIT                            = 2;
+        public const uint CorrectedPlatformErrorInterrupt = 3;
+    }
+
+    public struct PlatformInterruptSourceFlags
+    {
+        public const uint CpeiProcessorOverride = 1;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // MADT APIC Structures
+
+    public class LocalApic
+    {
+        internal const byte TypeId = 0x00;
+        internal const byte Length = 8;
+
+        public byte AcpiProcessorId;
+        public byte ApicId;
+        public uint Flags;              // Values per ApicFlags
+
+        internal LocalApic(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            AcpiProcessorId = region.Read8(offset  + 2);
+            ApicId          = region.Read8(offset  + 3);
+            Flags           = region.Read32(offset + 4);
+
+            // DebugStub.Print("{0:x4}:{1:x4} type {2:x1} AcpiProcId {3:x2} ApicId {4:x2} Flags {5:x8} (LocalApic)\n", __arglist(offset, offset + Length, TypeId, AcpiProcessorId, ApicId, Flags));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            LocalApic entry = new LocalApic(region, offset);
+
+            // Only return usable entries
+            return ((entry.Flags & 1) == 1
+                    ? entry
+                    : null);
+        }
+    }
+
+    public class IoApic
+    {
+        internal const byte TypeId = 0x01;
+        internal const byte Length = 12;
+
+        public byte Id;
+        public uint Address;
+        public uint InterruptBase;
+
+        internal IoApic(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            Id            = region.Read8(offset + 2);
+            // reserved   = region.Read8(offset + 3);
+            Address       = region.Read32(offset + 4);
+            InterruptBase = region.Read32(offset + 8);
+
+            // DebugStub.Print("{0:x4}:{1:x4} type {2:x1} Id {3:x2} Address {4:x8} InterruptBase {5:x8} (IoApic)\n", __arglist(offset, offset + Length, TypeId, Id, Address, InterruptBase));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new IoApic(region, offset);
+        }
+    }
+
+    public class InterruptSourceOverride
+    {
+        internal const byte TypeId = 0x02;
+        internal const byte Length = 10;
+
+        public byte   Bus;
+        public byte   Source;
+        public uint   GlobalSystemInterrupt;
+        public ushort Flags;    // Values per MpsIntiFlags
+
+        internal InterruptSourceOverride(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            Bus                   = region.Read8(offset + 2);
+            Source                = region.Read8(offset + 3);
+            GlobalSystemInterrupt = region.Read32(offset + 4);
+            Flags                 = region.Read16(offset + 8);
+
+            // DebugStub.Print("{0:x4}:{1:x4} type {2:x1} Bus {3:x2} Source {4:x2} GlobalSystemInterrupt {5:x8} Flags {6:x2} (InterruptSourceOverride)\n", __arglist(offset, offset + Length, TypeId, Bus, Source, GlobalSystemInterrupt, Flags));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new InterruptSourceOverride(region, offset);
+        }
+    }
+
+    public class Nmi
+    {
+        internal const byte TypeId = 0x03;
+        internal const byte Length = 8;
+
+        public ushort Flags;    // Values per MpsIntiFlags
+        public uint   GlobalSystemInterrupt;
+
+        internal Nmi(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            Flags                 = region.Read16(offset + 2);
+            GlobalSystemInterrupt = region.Read32(offset + 4);
+
+            // DebugStub.Print("{0:x4}:{1:x4} type {2:x1} Flags {3:x2} GlobalSystemInterrupt {4:x8} (Nmi)\n", __arglist(offset, offset + Length, TypeId, Flags, GlobalSystemInterrupt));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new Nmi(region, offset);
+        }
+    }
+
+    public class ApicNmi
+    {
+        internal const byte TypeId = 0x04;
+        internal const byte Length = 6;
+
+        public byte   AcpiProcessorId;
+        public ushort Flags;              // Values per MpsIntiFlags
+        public byte   LocalApicLint;
+
+        internal ApicNmi(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            AcpiProcessorId = region.Read8(offset + 2);
+            Flags           = region.Read16(offset + 3);
+            LocalApicLint   = region.Read8(offset + 5);
+
+            // DebugStub.Print("{0:x4}:{1:x4} type {2:x1} ApicProcessorId {3:x2} Flags {4:x4} LocalApicLint {5:x2} (ApicNmi)\n", __arglist(offset, offset + Length, TypeId, AcpiProcessorId, Flags, LocalApicLint));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new ApicNmi(region, offset);
+        }
+    }
+
+    public class LocalApicAddressOverride
+    {
+        internal const byte TypeId = 0x05;
+        internal const byte Length = 12;
+
+        ulong LocalApicAddress;
+
+        internal LocalApicAddressOverride(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            // reserved = region.Read16(offset + 2);
+            LocalApicAddress = region.Read64(offset + 4);
+
+            // DebugStub.Print("{0:x04}:{1:x04} type {2:x01} LocalApicAddress {3:x016} (LocalApicAddressOverride)\n", __arglist(offset, offset + Length, TypeId, LocalApicAddress));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new LocalApicAddressOverride(region, offset);
+        }
+    }
+
+    public class IoSApic
+    {
+        internal const byte TypeId = 0x6;
+        internal const byte Length = 16;
+
+        internal byte Id;
+        internal uint InterruptBase;
+        internal ulong Address;
+
+        internal IoSApic(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            Id            = region.Read8(offset + 2);
+            // reserved = region.Read8(offset + 3);
+            InterruptBase = region.Read32(offset + 4);
+            Address       = region.Read64(offset + 8);
+
+            // DebugStub.Print("{0:x04}:{1:x04} type {2:x01} Id {3:x02} InterruptBase {4:x04} Address {5:x016} (IoSApic)\n", __arglist(offset, offset + Length, TypeId, Id, InterruptBase, Address));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new IoSApic(region, offset);
+        }
+    }
+
+    public class LocalSApic
+    {
+        internal const byte TypeId = 0x07;
+        internal const byte MinLength = 17;
+
+        public byte   AcpiProcessorId;
+        public byte   LocalSApicId;
+        public byte   LocalSApicEid;
+        public uint   Flags;              // Values per ApicFlags
+        public uint   AcpiProcessorUidValue;
+        public string AcpiProcessorUidString;
+
+        internal LocalSApic(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+
+            byte length = region.Read8(offset + 1);
+            Debug.Assert(length >= MinLength);
+
+            AcpiProcessorId        = region.Read8(offset + 2);
+            LocalSApicId           = region.Read8(offset + 3);
+            LocalSApicEid          = region.Read8(offset + 4);
+            // reserved            = region.Read24(offset + 5);
+            Flags                  = region.Read32(offset + 8);
+            AcpiProcessorUidValue  = region.Read32(offset + 12) ;
+            AcpiProcessorUidString = region.ReadString(offset + 16,
+                                                       (int)length - 17);
+
+            // DebugStub.Print("{0:x04}:{1:x04} type {2:x01} AcpiProcId {3:x02} LocalSApicId {4:x02} LocalSApicEid {5:x02} Flags {6:x08} AcpiProcUid {7:x04} AcpiProcUid \"{8}\" (LocalSApic)\n", __arglist(offset, offset + length, TypeId, AcpiProcessorId, LocalSApicId, LocalSApicEid, Flags, AcpiProcessorUidValue, AcpiProcessorUidString));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new LocalSApic(region, offset);
+        }
+    }
+
+    public class PlatformInterruptSource
+    {
+        internal const byte TypeId = 0x8;
+        internal const byte Length = 16;
+
+        public ushort Flags;             // Values per MpsIntiFlags
+        public byte   InterruptType;     // PlatformInterruptType
+        public byte   ProcessorId;
+        public byte   ProcessorEid;
+        public byte   IoSApicVector;
+        public uint   GlobalSystemInterrupt;
+        public uint   SourceFlags;       // PlatformInterruptSourceFlags
+
+        internal PlatformInterruptSource(IoMemory region, int offset)
+        {
+            Debug.Assert(region.Read8(offset + 0) == TypeId);
+            Debug.Assert(region.Read8(offset + 1) == Length);
+
+            Flags                 = region.Read16(offset + 2);
+            InterruptType         = region.Read8(offset + 4);
+            ProcessorId           = region.Read8(offset + 5);
+            ProcessorEid          = region.Read8(offset + 6);
+            IoSApicVector         = region.Read8(offset + 7);
+            GlobalSystemInterrupt = region.Read32(offset + 8);
+            SourceFlags           = region.Read32(offset + 12);
+
+            // DebugStub.Print("{0:x04}:{1:x04} type {2:x01} Flags {3:x04} InterruptType {4:x02} ProcessorId {5:x02} ProcessorEid {6:x02} IoSApicVector {7:x02} GlobalSystemInterrupt {8:x04} SourceFlags {9:x04} (PlatformInterruptSource)\n", __arglist(offset, offset + Length, TypeId, Flags, InterruptType, ProcessorId, ProcessorEid, IoSApicVector, GlobalSystemInterrupt, SourceFlags));
+        }
+
+        internal static object Create(IoMemory region, int offset)
+        {
+            return new PlatformInterruptSource(region, offset);
+        }
+    }
+
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/PMTimer.cs b/base/Kernel/Singularity.Hal.Acpi/PMTimer.cs
new file mode 100644
index 0000000..561e6c9
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/PMTimer.cs
@@ -0,0 +1,68 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PmTimer.cs
+//
+//  Note:
+//    Power management timer
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity.Io;
+
+    [ CLSCompliant(false) ]
+    public sealed class PMTimer
+    {
+        public const uint FrequencyHz = 3579545;
+
+        IoPort   io;
+        IoMemory mem;
+        int      width;
+
+        private PMTimer(uint offset, int width)
+        {
+            if (offset < 0xffffu) {
+                this.io = new IoPort((ushort) offset, 4, Access.Read);
+            }
+            else {
+                this.mem = IoMemory.MapPhysicalMemory(new UIntPtr(offset),
+                                                      4, true, false);
+            }
+            this.width = width;
+        }
+
+        /// <summary> Get the width of the timer in bits (24 or 32). </summary>
+        public int Width { get { return width; } }
+
+        /// <summary> Get the current timer value. </summary>
+        public uint Value
+        {
+            [NoHeapAllocation]
+            get {
+                uint value;
+                if (io != null) {
+                    IoResult result = io.Read32NoThrow(0, out value);
+                    DebugStub.Assert(IoResult.Success == result);
+                }
+                else {
+                    IoResult result = mem.Read32NoThrow(0, out value);
+                    DebugStub.Assert(IoResult.Success == result);
+                }
+                return value;
+            }
+        }
+
+        public static PMTimer Create(Fadt fadt)
+        {
+            if ((fadt.Flags & (uint) FadtFlags.TMR_VAL_EXT) == 0) {
+                return new PMTimer(fadt.PM_TMR_BLK, 24);
+            }
+            return new PMTimer(fadt.PM_TMR_BLK, 32);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Rsdp.cs b/base/Kernel/Singularity.Hal.Acpi/Rsdp.cs
new file mode 100644
index 0000000..494e4bb
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Rsdp.cs
@@ -0,0 +1,71 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AcpiTables.cs
+//
+//  Note:
+//    Page 89 of ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    internal class Rsdp
+    {
+        public const string Id = "RSD PTR ";
+
+        private IoMemory region;
+
+        public Rsdp(IoMemory region)
+        {
+            this.region = region;
+        }
+
+        public string Signature
+        {
+            get { return Id; }
+        }
+
+        public string OemId
+        {
+            get { return region.ReadAsciiZeroString(9, 6); }
+        }
+
+        public byte Revision
+        {
+            get { return region.Read8(15); }
+        }
+
+        public uint RsdtAddress
+        {
+            get { return region.Read32(16); }
+        }
+
+        public uint Length
+        {
+            get { return region.Read32(20); }
+        }
+
+        public static Rsdp Parse(UIntPtr regionAddress,
+                                          uint    regionBytes)
+        {
+            if (regionBytes >= 20)
+            {
+                IoMemory region = IoMemory.MapPhysicalMemory(regionAddress,
+                                                             regionBytes,
+                                                             true, false);
+
+                if (AcpiChecksum.Compute(region, 0, 20) == 0 &&
+                    region.ReadAsciiZeroString(0, 8) == Rsdp.Id)
+                {
+                    return new Rsdp(region);
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Rsdt.cs b/base/Kernel/Singularity.Hal.Acpi/Rsdt.cs
new file mode 100644
index 0000000..2d8f2d2
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Rsdt.cs
@@ -0,0 +1,56 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Rsdt.cs
+//
+//  Note:
+//    Page 93 of ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+    public class Rsdt
+    {
+        private IoMemory          region;
+        private SystemTableHeader header;
+
+        public Rsdt(IoMemory region, SystemTableHeader header)
+        {
+            this.region = region;
+            this.header = header;
+        }
+
+        public int EntryCount { get { return region.Length / 4; } }
+
+        public uint GetEntry(int index)
+        {
+            index *= 4;
+            if (index > region.Length)
+                return 0;
+            return region.Read32(index);
+        }
+
+        public SystemTableHeader GetTableHeader(int index)
+        {
+            uint address = GetEntry(index);
+            if (address == 0)
+                return null;
+            return SystemTableHeader.Create(address);
+        }
+
+        public static Rsdt Create(SystemTableHeader header)
+        {
+            return new Rsdt(
+                IoMemory.MapPhysicalMemory(
+                    header.PostHeaderAddress, header.PostHeaderLength,
+                    true, false
+                    ),
+                header
+                );
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Srat.cs b/base/Kernel/Singularity.Hal.Acpi/Srat.cs
new file mode 100644
index 0000000..eabe014
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Srat.cs
@@ -0,0 +1,390 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Srat.cs
+//
+//
+//  Note:
+//    System Resource Affinity Table (SRAT)
+//    Page 123 of ACPI 3.0 Spec.
+//    Also see: "Static Resource Affinity Table" at www.microsoft.com
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+
+    using System;
+    using Microsoft.Singularity.Io;
+
+    public class Srat
+    {
+        public const string Signature = "SRAT";
+        private const int ProcessorStructureId = 0;
+        private const int MemoryStructureId = 1;
+
+        private int [] processorOffsets;
+        private int [] memoryOffsets;
+
+        private IoMemory          region;
+        private SystemTableHeader header;
+
+
+        public int GetNumberOfProcessors()
+        {
+            return processorOffsets.Length;
+        }
+
+        public int GetNumberOfMemories()
+        {
+            return memoryOffsets.Length;
+        }
+
+        // Processor fields offsets (important fields marked with XX)
+        // -----------------------------------------------------------
+        //     Entry                offsets      byte length
+        // -----------------------------------------------------------
+        //     Type               :   0
+        //     Length             :   1
+        //     Proximity Domain L :   2    XX
+        //     APIC ID            :   3    XX
+        //     Flags              :   4    XX
+        //     Local SAPIC EID    :   8
+        //     Proximity Domain H :   9
+        //     Reserved           :  12
+        public uint GetProcessorDomain(int processorIndex)
+        {
+            int offset = processorOffsets[processorIndex];
+            uint domain = 0;
+            domain = domain + region.Read8(offset+9) << 24;
+            domain = domain + region.Read8(offset+10) << 16;
+            domain = domain + region.Read8(offset+11) << 8;
+            domain = domain + region.Read8(offset+2);
+            return domain;
+        }
+
+        public uint GetProcessorApicId(int processorIndex)
+        {
+            return region.Read8(processorOffsets[processorIndex]+3);
+        }
+
+        public uint GetProcessorFlagIgnore(int processorIndex)
+        {
+            uint flags = region.Read32(processorOffsets[processorIndex]+4);
+            return (flags & 0x1);
+        }
+
+        // Memory fields offsets (important fields marked with XX)
+        // -----------------------------------------------------------
+        //     Entry                offsets      byte length
+        // -----------------------------------------------------------
+        //     Type               :   0
+        //     Length             :   1
+        //     Proximity Domain   :   2    XX
+        //     Reserved           :   6
+        //     Base Address Low   :   8    XX
+        //     Base Address High  :  12    XX
+        //     Length Low         :  16    XX
+        //     Length High        :  20    XX
+        //     Reserved           :  24
+        //     Flags              :  28    XX
+        //     Reserved           :  32
+        public uint GetMemoryDomain(int memoryIndex)
+        {
+            return (region.Read32(memoryOffsets[memoryIndex]+2));
+        }
+
+        public ulong GetMemoryBaseAddress(int memoryIndex)
+        {
+            int offset = memoryOffsets[memoryIndex];
+            uint baseHigh = region.Read32(offset+12);
+            uint baseLow  = region.Read32(offset+8);
+            ulong baseAddr = (((ulong)baseHigh) << 32) + baseLow;
+            return baseAddr;
+        }
+
+        public ulong GetMemoryEndAddress(int memoryIndex)
+        {
+            ulong baseAddr = GetMemoryBaseAddress(memoryIndex);
+            ulong memSize = GetMemorySize(memoryIndex);
+            return baseAddr+memSize;
+        }
+
+        public ulong GetMemorySize(int memoryIndex)
+        {
+            int offset = memoryOffsets[memoryIndex];
+            uint lenHigh = region.Read32(offset+20);
+            uint lenLow  = region.Read32(offset+16);
+            ulong memSize = (((ulong)lenHigh) << 32) + lenLow;
+            return memSize;
+        }
+
+        public uint GetMemoryFlagIgnore(int memoryIndex)
+        {
+            uint flags = region.Read32(memoryOffsets[memoryIndex]+28);
+            return (flags & 0x1);
+        }
+
+        public uint GetMemoryFlagHotPluggable(int memoryIndex)
+        {
+            uint flags = region.Read32(memoryOffsets[memoryIndex]+28);
+            return (flags & 0x2);
+        }
+
+        public uint GetMemoryFlagNonVolatile(int memoryIndex)
+        {
+            uint flags = region.Read32(memoryOffsets[memoryIndex]+28);
+            return (flags & 0x4);
+        }
+
+        public Srat(IoMemory region, SystemTableHeader header)
+        {
+            this.region = region;
+            this.header = header;
+        }
+
+        // Create() Srat
+        public static Srat Create(SystemTableHeader header)
+        {
+            return new Srat(
+                IoMemory.MapPhysicalMemory(
+                    header.PostHeaderAddress, header.PostHeaderLength,
+                    true, false
+                    ),
+                header
+                );
+        }
+
+        // Parse Srat structure
+        public void ParseSratStructure()
+        {
+            int offset = 12; // there are 12 bytes offset
+            int processorCount = 0;
+            int memoryCount = 0;
+            int type,length;
+
+            // 1st stage, count the number of processors
+            // reset counter
+            while (offset < region.Length) {
+
+                type = region.Read8(offset);
+
+                // this is a processor structure
+                if (type == ProcessorStructureId) {
+                    length = region.Read8(offset+1);
+                    processorCount++;
+                    offset += length;
+                }
+                // this is a memory structure
+                else if (type == MemoryStructureId) {
+                    length = region.Read8(offset+1);
+                    memoryCount++;
+                    offset += length;
+                }
+                else {
+                    DebugStub.Print("  ERROR: Impossible Srat Id\n");
+                    DebugStub.Break();
+                    break;
+                }
+            }
+
+            // 2nd stage, create arrays
+            processorOffsets = new int [processorCount];
+            memoryOffsets = new int [memoryCount];
+
+            // 3rd stage: fill the offsets
+            // clear everything first
+            offset = 12;
+            processorCount = 0;
+            memoryCount = 0;
+
+            while (offset < region.Length) {
+
+                type = region.Read8(offset);
+
+                // this is a processor structure
+                if (type == ProcessorStructureId) {
+                    length = region.Read8(offset+1);
+                    processorOffsets[processorCount] = offset;
+                    processorCount++;
+                    offset += length;
+                }
+                // this is a memory structure
+                else if (type == MemoryStructureId) {
+                    length = region.Read8(offset+1);
+                    memoryOffsets[memoryCount] = offset;
+                    memoryCount++;
+                    offset += length;
+                }
+                else {
+                    DebugStub.Print("  ERROR: Impossible Srat Id\n");
+                    DebugStub.Break();
+                    break;
+                }
+            }
+        }
+
+        // Dump Srat structure
+        public void DumpSratOffsets()
+        {
+            DebugStub.Print("\n\n\n  SRAT Offset Details: \n");
+            DebugStub.Print("------------------------------------\n");
+            DebugStub.Print("  {0} processors, {1} memories \n",
+                            __arglist(processorOffsets.Length,
+                                      memoryOffsets.Length));
+
+            DebugStub.Print("  P Offset --  ");
+            for (int i = 0; i < processorOffsets.Length; i++) {
+                DebugStub.Print("{0}  ", __arglist(processorOffsets[i]));
+            }
+            DebugStub.Print("\n");
+            DebugStub.Print("  M Offset --  ");
+            for (int i = 0; i < memoryOffsets.Length; i++) {
+                DebugStub.Print("{0}  ", __arglist(memoryOffsets[i]));
+            }
+            DebugStub.Print("\n\n\n");
+        }
+
+        // Dump Srat Important fields
+        public void DumpSratImportantFields()
+        {
+            DebugStub.Print("\n\n\n  SRAT Important Fields: \n");
+            DebugStub.Print("------------------------------------\n");
+
+
+            for (int i = 0; i < processorOffsets.Length; i++) {
+                DebugStub.Print("     PROCESSOR {0}\n",
+                                __arglist(i));
+                DebugStub.Print("         Domain  : {0}\n",
+                                __arglist(GetProcessorDomain(i)));
+                DebugStub.Print("         APIC ID : {0}\n",
+                                __arglist(GetProcessorApicId(i)));
+                DebugStub.Print("         Ignore  : {0}\n",
+                                __arglist(GetProcessorFlagIgnore(i)));
+            }
+
+            for (int i = 0; i < memoryOffsets.Length; i++) {
+                DebugStub.Print("     MEMORY {0}\n",
+                                __arglist(i));
+                DebugStub.Print("         Domain  : {0}\n",
+                                __arglist(GetMemoryDomain(i)));
+                DebugStub.Print("         Base    : {0} KB\n",
+                                __arglist(GetMemoryBaseAddress(i)/1024));
+                DebugStub.Print("         End     : {0} KB\n",
+                                __arglist(GetMemoryEndAddress(i)/1024));
+                DebugStub.Print("         MemSize : {0} KB\n",
+                                __arglist(GetMemorySize(i)/1024));
+                DebugStub.Print("         Ignore  : {0}\n",
+                                __arglist(GetMemoryFlagIgnore(i)));
+                DebugStub.Print("         HotPlug : {0}\n",
+                                __arglist(GetMemoryFlagHotPluggable(i)));
+                DebugStub.Print("         NonVol  : {0}\n",
+                                __arglist(GetMemoryFlagNonVolatile(i)));
+            }
+            DebugStub.Print("\n\n\n");
+        }
+
+        // Dump Srat structure
+        public void DumpSratStructure()
+        {
+            int offset = 12; // there are 12 bytes offset
+            int processorCount = 0;
+            int memoryCount = 0;
+            int type,length;
+
+            // fields
+            uint ptype, plen, pdom, pid, pflag, peid, pdom2, pres;
+            uint mtype, mlen, mdom, mres, mlow, mhigh, mlenl, mlenh;
+            uint mres2, mflag, mres3;
+
+            DebugStub.Print("  Region length {0}\n",
+                            __arglist(region.Length));
+            DebugStub.Print("------------------------------------\n");
+
+            // reset counter
+            while (offset < region.Length) {
+
+                // this is a processor structure
+                type = region.Read8(offset);
+                if (type == ProcessorStructureId) {
+
+                    length = region.Read8(offset+1);
+
+                    DebugStub.Print("\n  proc:{0}  \n",
+                                    __arglist(processorCount, length));
+                    DebugStub.Print("------------------------------------\n");
+
+                    ptype = region.Read8 (offset);
+                    plen  = region.Read8 (offset+1);
+                    pdom  = region.Read8 (offset+2);
+                    pid   = region.Read8 (offset+3);
+                    pflag = region.Read32(offset+4);
+                    peid  = region.Read8 (offset+8);
+                    pdom2 = region.Read32(offset+9);
+                    pres  = region.Read32(offset+12);
+
+                    DebugStub.Print("   ptype: {0}\n", __arglist(ptype));
+                    DebugStub.Print("   plen : {0}\n", __arglist(plen ));
+                    DebugStub.Print("   pdom : {0}\n", __arglist(pdom ));
+                    DebugStub.Print("   pid  : {0}\n", __arglist(pid  ));
+                    DebugStub.Print("   pflag: {0}\n", __arglist(pflag));
+                    DebugStub.Print("   peid : {0}\n", __arglist(peid ));
+                    DebugStub.Print("   pdom2: {0}\n", __arglist(pdom2));
+                    DebugStub.Print("   pres : {0}\n", __arglist(pres ));
+
+
+                    processorCount++;
+                    offset += length;
+                }
+
+                // this is a memory structure
+                else if (type == MemoryStructureId) {
+
+                    length = region.Read8(offset+1);
+                    DebugStub.Print("\n  memr:{0} \n",
+                                    __arglist(memoryCount, length));
+                    DebugStub.Print("------------------------------------\n");
+
+                    mtype = region.Read8 (offset);
+                    mlen  = region.Read8 (offset+1);
+                    mdom  = region.Read32(offset+2);
+                    mres  = region.Read8 (offset+6);
+                    mlow  = region.Read32(offset+8);
+                    mhigh = region.Read32(offset+12);
+                    mlenl = region.Read32(offset+16);
+                    mlenh = region.Read32(offset+20);
+                    mres2 = region.Read32(offset+24);
+                    mflag = region.Read32(offset+28);
+                    mres3 = region.Read32(offset+32);
+
+                    DebugStub.Print("   mtype: {0}\n", __arglist(mtype));
+                    DebugStub.Print("   mlen : {0}\n", __arglist(mlen ));
+                    DebugStub.Print("   mdom : {0}\n", __arglist(mdom ));
+                    DebugStub.Print("   mres : {0}\n", __arglist(mres ));
+                    DebugStub.Print("   mlow : {0}\n", __arglist(mlow ));
+                    DebugStub.Print("   mhigh: {0}\n", __arglist(mhigh));
+                    DebugStub.Print("   mlenl: {0}\n", __arglist(mlenl));
+                    DebugStub.Print("   mlenh: {0}\n", __arglist(mlenh));
+                    DebugStub.Print("   mres2: {0}\n", __arglist(mres2));
+                    DebugStub.Print("   mflag: {0}\n", __arglist(mflag));
+                    DebugStub.Print("   mres3: {0}\n", __arglist(mres3));
+
+                    memoryCount++;
+                    offset += length;
+                }
+                else {
+                    DebugStub.Print("  Error \n");
+                    DebugStub.Print("Impossible Affinity Structure Id\n");
+                    DebugStub.Break();
+                    break;
+                }
+            }
+
+            DebugStub.Print("------------------------------------\n");
+            DebugStub.Print("  Done Parsing Srat Structure ... \n");
+            DebugStub.Print("  Found {0} processors and {1} memory\n",
+                            __arglist(processorCount,memoryCount));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/Ssdt.cs b/base/Kernel/Singularity.Hal.Acpi/Ssdt.cs
new file mode 100644
index 0000000..9568241
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/Ssdt.cs
@@ -0,0 +1,46 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Ssdt.cs
+//
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    public class Ssdt
+    {
+        public const string Signature = "SSDT";
+
+        private IoMemory          region;
+        private SystemTableHeader header;
+
+        public Ssdt(IoMemory region, SystemTableHeader header)
+        {
+            this.region = region;
+            this.header = header;
+        }
+
+        public IoMemory Region
+        {
+            get { return region; }
+        }
+
+        public static Ssdt Create(SystemTableHeader header)
+        {
+            IoMemory region = IoMemory.MapPhysicalMemory(header.PostHeaderAddress,
+                                                         header.PostHeaderLength,
+                                                         true, false);
+            int sum = (header.Checksum + AcpiChecksum.Compute(region)) & 0xff;
+            if (sum != 0)
+            {
+                return null;
+            }
+            return new Ssdt(region, header);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Acpi/SystemTableHeader.cs b/base/Kernel/Singularity.Hal.Acpi/SystemTableHeader.cs
new file mode 100644
index 0000000..71ad3b2
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Acpi/SystemTableHeader.cs
@@ -0,0 +1,97 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SystemTableHeader.cs
+//
+//  Note:
+//    Page 90 of ACPI 3.0 Spec.
+
+namespace Microsoft.Singularity.Hal.Acpi
+{
+    using System;
+    using Microsoft.Singularity.Io;
+
+    public class SystemTableHeader
+    {
+        public const uint Length = 36;
+
+        private IoMemory region;
+
+        public SystemTableHeader(IoMemory region)
+        {
+            this.region = region;
+        }
+
+        // Returns a PHYSICAL address
+        public UIntPtr Address
+        {
+            get { return region.PhysicalAddress.Value; }
+        }
+
+        public string Signature
+        {
+            get { return region.ReadAsciiZeroString(0, 4); }
+        }
+
+        public uint FullTableLength
+        {
+            get { return region.Read32(4); }
+        }
+
+        public uint PostHeaderLength
+        {
+            get { return FullTableLength - Length; }
+        }
+
+        // Returns a PHYSICAL address
+        public UIntPtr PostHeaderAddress
+        {
+            get { return new UIntPtr ((uint)region.PhysicalAddress.Value + Length); }
+        }
+
+        public byte Checksum
+        {
+            get { return AcpiChecksum.Compute(region); }
+        }
+
+        public byte Revision
+        {
+            get { return region.Read8(8); }
+        }
+
+        public string OemId
+        {
+            get { return region.ReadAsciiZeroString(10, 16); }
+        }
+
+        public string OemTableId
+        {
+            get { return region.ReadAsciiZeroString(16, 24); }
+        }
+
+        public uint OemRevision
+        {
+            get { return region.Read32(24); }
+        }
+
+        public uint CreatorId
+        {
+            get { return region.Read32(28); }
+        }
+
+        public uint CreatorRevision
+        {
+            get { return region.Read32(32); }
+        }
+
+        public static SystemTableHeader Create(uint address)
+        {
+            return new SystemTableHeader(
+                IoMemory.MapPhysicalMemory(new UIntPtr(address), Length, true, false)
+                );
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicMP.csproj b/base/Kernel/Singularity.Hal.ApicMP.csproj
new file mode 100644
index 0000000..84f8486
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicMP.csproj
@@ -0,0 +1,45 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Hal.ApicMP</AssemblyName>
+    <OutputType>Library</OutputType>
+    <Language>C#</Language>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants>SINGULARITY_MP</DefineConstants>
+  </PropertyGroup>
+  
+  <Import Project="Hal.Common.targets" />
+  <ItemGroup>
+    <Compile Include="Singularity.Hal.ApicPc\Apic.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\ApicTimer.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\Calibrate.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\HalPic.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\HalDevices.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\HalTimer.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\Hpet.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\HpetClock.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\IoApic.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\MpHalClock.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\MpResources.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\Pic.cs"/>
+    <Compile Include="Singularity.Hal.ApicPc\PmClock.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\RTClock.cs"/>
+    <Compile Include="Singularity.Hal.ApicPC\Timer8254.cs"/>
+    <Compile Include="@(HAL_ACPI_SOURCES)"/>
+    <Compile Include="@(HAL_COMMON_SOURCES)"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets"/>
+
+</Project>
diff --git a/base/Kernel/Singularity.Hal.ApicPC.csproj b/base/Kernel/Singularity.Hal.ApicPC.csproj
new file mode 100644
index 0000000..4ba4355
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC.csproj
@@ -0,0 +1,44 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Hal.ApicPC</AssemblyName>
+    <OutputType>Library</OutputType>
+    <Language>C#</Language>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  
+  <Import Project="Hal.Common.targets" />
+  <ItemGroup>
+    <Compile Include="Singularity.Hal.ApicPC\Apic.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\ApicTimer.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\Calibrate.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\HalClock.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\HalDevices.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\HalPic.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\HalTimer.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\Hpet.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\HpetClock.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\IoApic.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\MpResources.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\Pic.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\PmClock.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\RTClock.cs" />
+    <Compile Include="Singularity.Hal.ApicPC\Timer8254.cs" />
+    <Compile Include="@(HAL_ACPI_SOURCES)"/>
+    <Compile Include="@(HAL_COMMON_SOURCES)"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets"/>
+
+</Project>
diff --git a/base/Kernel/Singularity.Hal.ApicPC/Apic.cs b/base/Kernel/Singularity.Hal.ApicPC/Apic.cs
new file mode 100644
index 0000000..d0322ac
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/Apic.cs
@@ -0,0 +1,704 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Apic.cs
+//
+//
+//  Note:
+//    Intel MP Specification 1.4
+//    IA-32 Intel Architecture Software Developers Manual
+//       Volume 3: Systems Programming Guide
+//
+//  Caution:
+//    This code has not been tested on multi I/O apic systems
+//    and the handling for this case is probably not sane.
+
+namespace Microsoft.Singularity.Hal
+{
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity.Io;
+
+    [CLSCompliant(false)]
+    internal struct ApicOffset
+    {
+        internal const uint Id                      = 0x0020;
+        internal const uint Version                 = 0x0030;
+        internal const uint TaskPriority            = 0x0080;
+        internal const uint ArbitrationPriority     = 0x0090;
+        internal const uint ProcessorPriority       = 0x00a0;
+        internal const uint EoiRegister             = 0x00b0;
+        internal const uint LocalDestination        = 0x00d0;
+        internal const uint DestinationFormat       = 0x00e0;
+        internal const uint SpuriousIntVector       = 0x00f0;
+        internal const uint IsrBase                 = 0x0100;
+        internal const uint TmrBase                 = 0x0180;
+        internal const uint IrrBase                 = 0x0200;
+        internal const uint ErrorStatus             = 0x0280;
+        internal const uint IcrLo                   = 0x0300;
+        internal const uint IcrHi                   = 0x0310;
+        internal const uint LvtTimer                = 0x0320;
+        internal const uint LvtThermalSensor        = 0x0330;
+        internal const uint LvtPerfCounts           = 0x0340;
+        internal const uint LvtLint0                = 0x0350;
+        internal const uint LvtLint1                = 0x0360;
+        internal const uint LvtError                = 0x0370;
+        internal const uint TimerInitialCount       = 0x0380;
+        internal const uint TimerCurrentCount       = 0x0390;
+        internal const uint TimerDivideConf         = 0x03e0;
+        internal const uint Max                     = 0x0400;
+    };
+
+    [CLSCompliant(false)]
+    internal struct LvtFlags
+    {
+        internal const uint TimerBit      = 1 << 17;
+        internal const uint      Periodic    = TimerBit;
+        internal const uint      OneShot     = 0;
+        internal const uint MaskedBit     = 1 << 16;
+        internal const uint      Masked      = MaskedBit;
+        internal const uint      Unmasked    = 0;
+        internal const uint TriggerBit    = 1 << 15;
+        internal const uint      Level        = TriggerBit;
+        internal const uint      Edge         = 0;
+        internal const uint RIRRBit       = 1 << 14;
+        internal const uint PolarityBit   = 1 << 13;
+        internal const uint      ActiveLow    = PolarityBit;
+        internal const uint      ActiveHigh   = 0;
+        internal const uint StatusBit     = 1 << 12;
+        internal const uint      Pending      = StatusBit;
+        internal const uint      Idle         = 0;
+        internal const uint DeliveryBits = 7 << 8;
+        internal const uint      Fixed        = 0 << 8;
+        internal const uint      SMI          = 2 << 8;
+        internal const uint      NMI          = 4 << 8;
+        internal const uint      INIT         = 5 << 8;
+        internal const uint      ExtInt       = 7 << 8;
+    }
+
+    [CLSCompliant(false)]
+    internal struct IcrFlags
+    {
+        internal const uint ShorthandBits   = 3 << 18;
+        internal const uint     NoShortHand     = 0 << 18;
+        internal const uint     Self            = 1 << 18;
+        internal const uint     All             = 2 << 18;
+        internal const uint     AllBarSelf      = 3 << 18;
+        internal const uint TriggerBit      = 1 << 15;
+        internal const uint     Edge            = 0;
+        internal const uint     Level           = TriggerBit;
+        internal const uint LevelBit        = 1 << 14;
+        internal const uint     DeAssert        = 0;
+        internal const uint     Assert          = LevelBit;
+        internal const uint StatusBit       = 1 << 12;
+        internal const uint     Idle            = 0;
+        internal const uint     Pending         = StatusBit;
+        internal const uint ModeBit         = 1 << 11;
+        internal const uint     Physical        = 0;
+        internal const uint     Logical         = ModeBit;
+        internal const uint DeliveryBits    = 7 << 8;
+        internal const uint      Fixed          = 0 << 8;
+        internal const uint      SMI            = 2 << 8;
+        internal const uint      NMI            = 4 << 8;
+        internal const uint      INIT           = 5 << 8;
+        internal const uint      StartUp        = 6 << 8;
+    }
+
+    [CLSCompliant(false)]
+    public class Apic
+    {
+        const ushort ImcrAddressPort   = 0x22;
+        const ushort ImcrDataPort      = 0x23;
+        const byte   ImcrAddressSelect = 0x70;
+        const byte   ImcrData8259      = 0x00;
+        const byte   ImcrDataApic      = 0x01;
+
+        const byte   ApicMSR           = 0x1b;
+
+        public const byte RtClockIrq = 8;
+        public const byte TimerIrq   = 0;
+
+        static uint baseAddr;
+        // Table of Apic Ids before changed to cpu-id.
+        static byte [] initialIdTable;
+
+        IoMemory  apicRegion;
+        IoApic [] ioApics;
+        byte      baseVector;
+        byte      maxIrq;
+
+        public Apic(IoApic[] ioApics)
+        {
+            ulong msr = Processor.ReadMsr(0x1b);
+            baseAddr  = ((uint) msr) & 0xfffff000u;
+
+            this.apicRegion =
+                IoMemory.MapPhysicalMemory(baseAddr,
+                                           new UIntPtr(ApicOffset.Max),
+                                           true, true);
+            this.ioApics = ioApics;
+
+            DebugStub.Assert(initialIdTable == null); // Check Single Apic instance
+            initialIdTable = new byte [256];
+        }
+
+        internal void Finalize()
+        {
+        }
+
+        [NoHeapAllocation]
+        internal uint Read(uint offset)
+        {
+            uint outValue;
+            IoResult result = apicRegion.Read32NoThrow((int) offset,
+                                                       out outValue);
+            DebugStub.Assert(IoResult.Success == result);
+            return outValue;
+        }
+
+        [NoHeapAllocation]
+        internal void Write(uint offset, uint value)
+        {
+            IoResult result = apicRegion.Write32NoThrow((int) offset, value);
+            DebugStub.Assert(IoResult.Success == result);
+        }
+
+        internal byte Id
+        {
+            [NoHeapAllocation]
+            get { return (byte)(Read(ApicOffset.Id) >> 24); }
+        }
+
+        [NoHeapAllocation]
+        private void SetId(byte cpuId)
+        {
+            uint v = Read(ApicOffset.Id);
+            initialIdTable[cpuId] = (byte)(v >> 24);
+            v = (v & 0xffffff) | (((uint)cpuId) << 24);
+            Write(ApicOffset.Id, v);
+        }
+
+        private bool IsBsp
+        {
+            [NoHeapAllocation]
+            get { return (Processor.ReadMsr(0x1b) & 0x100) == 0x100; }
+        }
+
+        [NoHeapAllocation]
+        private IoApic GetIoApic(int id)
+        {
+            for (int i = 0; i < ioApics.Length; i++)
+            {
+                if (ioApics[i].GetId() == id)
+                {
+                    return ioApics[i];
+                }
+            }
+            return null;
+        }
+
+        internal void Initialize(byte baseVector)
+        {
+            DebugStub.Assert(255 - baseVector >= 48);
+            this.baseVector = baseVector;
+
+            Write(ApicOffset.LvtTimer, LvtFlags.Masked);
+            Write(ApicOffset.LvtThermalSensor, LvtFlags.Masked);
+            Write(ApicOffset.LvtPerfCounts, LvtFlags.Masked);
+            Write(ApicOffset.LvtError, LvtFlags.Masked);
+            Write(ApicOffset.SpuriousIntVector, 0xdfu);
+
+            // haryadi -- set task priority to 0 so that it can
+            //            receive all interrupts from IPI
+            // Write(ApicOffset.TaskPriority, 0x20u);
+            Write(ApicOffset.TaskPriority, 0);
+
+            Write(ApicOffset.LvtLint0, LvtFlags.Masked);
+            Write(ApicOffset.LvtLint1, LvtFlags.Masked);
+
+            SetId((byte) Processor.GetCurrentProcessorId());
+
+            if (this.IsBsp) {
+                InitializeRouteableEntries();
+                InitializeMpResourceEntries();
+            }
+
+            // Enable in s/w
+            SetEnabled(true);
+
+            // Enable in h/w
+            Processor.WriteMsr(ApicMSR, Processor.ReadMsr(ApicMSR) | (1 << 11));
+
+            // Watch out for the uniprocessor case where the
+            // FloatingPointer may be null.
+            MpFloatingPointer floatingPointer = MpResources.FloatingPointer;
+
+            if (floatingPointer != null && floatingPointer.ImcrPresent && this.IsBsp) {
+                IoPort addrPort = new IoPort(ImcrAddressPort, 1, Access.Write);
+                IoPort dataPort = new IoPort(ImcrDataPort, 1, Access.Write);
+                addrPort.Write8(ImcrAddressSelect);
+                dataPort.Write8(ImcrDataApic);
+            }
+
+            Write(ApicOffset.LvtLint0, LvtFlags.Level | LvtFlags.ExtInt);
+            Write(ApicOffset.LvtLint1, LvtFlags.NMI | 0x02);
+
+            for (int z = 0; z <= maxIrq; z++) {
+                byte m = IrqToInterrupt((byte) z);
+                byte n = InterruptToIrq(m);
+                DebugStub.Assert((byte) z == n);
+            }
+        }
+
+        internal void Initialize()
+        {
+            Initialize(0x70);
+        }
+
+        private void InitializeRouteableEntries()
+        {
+            // Initialize entries that may not be part of MP set
+            // configuration, but might be utilizable via a
+            // programmable interrupt routing on PCI-LPC bridge
+            // or elsewhere.
+            byte   irq = 16;
+            IoBits stdPciBits = (IoBits.DstPhysical | IoBits.DelModFixed     |
+                                 IoBits.IrqMask     | IoBits.IntPolActiveLow |
+                                 IoBits.TriggerModeLevel);
+            for (int id = 0; id < ioApics.Length; id++) {
+                uint start = (id == 0) ? 16u : 0u;
+                uint end   = ioApics[id].RedirectionEntryCount;
+                for (uint index = start; index < end; index++) {
+                    RedirectionEntry re =
+                        new RedirectionEntry(this.Id, stdPciBits,
+                                             IrqToInterrupt(irq));
+                    ioApics[id].SetRedirectionEntry(index, ref re);
+                    irq++;
+                }
+            }
+            maxIrq = (byte) (irq - 1);
+        }
+
+        private void InitializeMpResourceEntries()
+        {
+            foreach (MpInterruptEntry e in MpResources.IoInterruptEntries) {
+                IoApic ioApic = GetIoApic(e.ApicId);
+                if (ioApic == null) {
+                    DebugStub.Print("Could not find I/O Apic with id {0}\n",
+                                    __arglist(e.ApicId));
+                    continue;
+                }
+
+                MpBusEntry be = MpResources.GetBusEntryById(e.BusId);
+                if (be == null) {
+                    DebugStub.Print("Unknown bus device id {0:x2}\n",
+                                    __arglist(e.BusId));
+                    continue;
+                }
+
+                if (be.BusType == BusType.ISA) {
+                    ConfigureIsaInterrupt(ioApic, e);
+                }
+                else if (be.BusType == BusType.PCI) {
+                    ConfigurePciInterrupt(ioApic, e);
+                }
+                else {
+                    DebugStub.Print("Unhandled device on bus {0:x2}\n",
+                                    __arglist(e.BusId));
+                    continue;
+                }
+            }
+        }
+
+        internal void ConfigureIsaInterrupt(IoApic ioApic, MpInterruptEntry e)
+        {
+            byte vector = IrqToInterrupt(e.BusIrq);
+
+            IoBits iobits = (e.PolarityType == Polarity.ActiveLow) ?
+                IoBits.IntPolActiveLow : IoBits.IntPolActiveHigh;
+
+            iobits |= (e.TriggerType == Trigger.Level) ?
+                IoBits.TriggerModeLevel : IoBits.TriggerModeEdge;
+            iobits |= IoBits.DstPhysical;
+            iobits |= IoBits.DelModFixed;
+            iobits |= IoBits.IrqMask;
+
+            RedirectionEntry r = new RedirectionEntry(this.Id, iobits, vector);
+            ioApic.SetRedirectionEntry(e.ApicLine, ref r);
+        }
+
+        internal void ConfigurePciInterrupt(IoApic ioApic, MpInterruptEntry e)
+        {
+            byte vector = IrqToInterrupt(e.ApicLine);
+
+            IoBits iobits = (e.PolarityType == Polarity.ActiveHigh) ?
+                IoBits.IntPolActiveHigh : IoBits.IntPolActiveLow;
+            iobits |= (e.TriggerType == Trigger.Edge) ?
+                IoBits.TriggerModeEdge : IoBits.TriggerModeLevel;
+            iobits |= IoBits.DstPhysical;
+            iobits |= IoBits.DelModFixed;
+            iobits |= IoBits.IrqMask;
+            RedirectionEntry r = new RedirectionEntry(this.Id, iobits, vector);
+            ioApic.SetRedirectionEntry(e.ApicLine, ref r);
+        }
+
+        [NoHeapAllocation]
+        public byte InterruptToIrq(byte interrupt)
+        {
+            if (interrupt < baseVector) {
+                return RtClockIrq;
+            }
+            if (interrupt == baseVector) {
+                return TimerIrq;
+            }
+            if (interrupt == baseVector + 16) {
+                return RtClockIrq;
+            }
+            return (byte)(interrupt - (baseVector + 32));
+        }
+
+        [NoHeapAllocation]
+        public byte IrqToInterrupt(byte irq)
+        {
+            if (irq == TimerIrq) {
+                return (byte) (baseVector + 0);
+            }
+            if (irq == RtClockIrq) {
+                return (byte) (baseVector + 16);
+            }
+            return (byte) (baseVector + 32 + irq);
+        }
+
+
+        public byte MaximumIrq
+        {
+            [NoHeapAllocation]
+            get { return maxIrq; }
+        }
+
+        [NoHeapAllocation]
+        public void SetEnabled(bool enabled)
+        {
+            uint v = Read(ApicOffset.SpuriousIntVector);
+            v &= ~(1u << 8);
+            if (enabled)
+                v |= 1u << 8;
+            Write(ApicOffset.SpuriousIntVector, v);
+        }
+
+        [NoHeapAllocation]
+        public bool GetEnabled()
+        {
+            return (Read(ApicOffset.SpuriousIntVector) & (1u << 8)) != 0;
+        }
+
+        [NoHeapAllocation]
+        public void AckIrq(byte irq)
+        {
+            // XXX should not ack spurious interrupt
+            Write(ApicOffset.EoiRegister, 0);
+        }
+
+        [NoHeapAllocation]
+        public void EnableIrq(byte irq)
+        {
+            // XXX TODO fix for multiple I/O apics
+            ioApics[0].SetEntryMask(irq, false);
+        }
+
+        [NoHeapAllocation]
+        public void DisableIrq(byte irq)
+        {
+            // XXX TODO fix for multiple I/O apics
+            ioApics[0].SetEntryMask(irq, true);
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt(byte interrupt)
+        {
+            byte irq = InterruptToIrq(interrupt);
+            Tracing.Log(Tracing.Debug, "Clearing interrupt {0} (irq {1})",
+                        (UIntPtr)interrupt, (UIntPtr)irq);
+            //            byte isrInterrupt = (byte) ActiveIsrInterrupt();
+            if (interrupt >= baseVector) {
+                //                DebugStub.Assert(interrupt == isrInterrupt);
+                DisableIrq(irq);
+            }
+            AckIrq(irq);
+        }
+
+        [NoHeapAllocation]
+        private bool SendIPI(uint icrHi, uint icrLo)
+        {
+            //
+            // DebugStub.Print is not permitted here.  We may be
+            // invoked from within DebugStub.Trap with the
+            // non-recursive communication lock held.
+            //
+            Tracing.Log(Tracing.Audit,
+                        "Sending IPI {0:x8}{1:x8}\n", icrHi, icrLo);
+
+            // Clear ESR
+            Write(ApicOffset.ErrorStatus, 0);
+            Write(ApicOffset.ErrorStatus, 0);
+
+            // Send IPI
+            Write(ApicOffset.IcrHi, icrHi);
+            Write(ApicOffset.IcrLo, icrLo);
+
+            do {
+                Write(ApicOffset.ErrorStatus, 0);        // Trigger ESR update
+                uint esr = Read(ApicOffset.ErrorStatus);
+                if (esr != 0) {
+                    Tracing.Log(Tracing.Warning,
+                                "APIC SendIPI Error (esr = {0})\n", esr);
+                    return false;
+                }
+            } while ((Read(ApicOffset.IcrLo) & IcrFlags.Pending) != 0);
+            return true;
+        }
+
+        [NoHeapAllocation]
+        private static void Delay(uint micros)
+        {
+            HalDevices.StallProcessor(micros);
+        }
+
+        [NoHeapAllocation]
+        internal void BroadcastStartupIPI(byte vector)
+        {
+            Write(ApicOffset.IcrHi, 0);
+
+            // Per AP initialization in IA-32 Vol 3
+            // Init IPI     // ICR.Lo = 00c4500h
+            SendIPI(0, IcrFlags.AllBarSelf | IcrFlags.Assert | IcrFlags.Pending | IcrFlags.INIT | (uint)vector);
+
+            // ...delay 10ms
+            Delay(10000);
+
+            // Startup IPI  // ICR.Lo = 00c46XXh
+            SendIPI(0, IcrFlags.AllBarSelf | IcrFlags.Assert | IcrFlags.Pending | IcrFlags.StartUp | (uint)vector);
+
+            // ...delay 200us
+            Delay(200);
+            SendIPI(0,
+                    (IcrFlags.AllBarSelf | IcrFlags.Assert | IcrFlags.Pending |
+                     IcrFlags.StartUp | (uint)vector)
+                    );
+        }
+
+        [NoHeapAllocation]
+        internal void BroadcastFreezeIPI()
+        {
+            Write(ApicOffset.IcrHi, 0);
+            SendIPI(0,
+                    (IcrFlags.AllBarSelf | IcrFlags.Assert |
+                     IcrFlags.Pending | IcrFlags.NMI)
+                    );
+        }
+
+        [NoHeapAllocation]
+        internal void SendFixedIPI(byte vector, int from, int to)
+        {
+            uint icrHi = ((uint)to & 0x0ff) << 24;
+            uint icrLo =
+                IcrFlags.NoShortHand | IcrFlags.Assert |
+                IcrFlags.Pending     | IcrFlags.Fixed  |
+                IcrFlags.Physical    | (uint)vector;
+
+            Write(ApicOffset.IcrHi, 0);
+
+            if (!SendIPI(icrHi, icrLo)) {
+                DebugStub.Break();
+            }
+        }
+
+        [NoHeapAllocation]
+        internal void BroadcastFixedIPI(byte vector, bool includeSelf)
+        {
+            uint icrHi = 0;
+            uint icrLo = includeSelf ? IcrFlags.All : IcrFlags.AllBarSelf;
+            icrLo |= (IcrFlags.Assert | IcrFlags.Pending | IcrFlags.Fixed |
+                      (uint)vector);
+
+            Write(ApicOffset.IcrHi, 0);
+
+            if (!SendIPI(icrHi, icrLo)) {
+                DebugStub.Break();
+            }
+        }
+
+        [NoHeapAllocation]
+        internal void ClearFixedIPI()
+        {
+            Write(ApicOffset.EoiRegister, 0);
+        }
+
+        [NoHeapAllocation]
+        private bool IrrIsSet(byte interrupt)
+        {
+            // Read() is 4 bytes wide.
+            // Each DWORD is aligned on 16-byte boundaries.
+            //    IsrBase + 0x00 = interrupts   0-31
+            //    IsrBase + 0x10 = interrupts  32-63
+            //    IsrBase + 0x20 = interrupts  64-95
+            //    ...
+            //    IsrBase + 0x70 = interrupts 224-255
+            uint d = (uint)interrupt / 32u;
+            uint o = ApicOffset.IrrBase + d * 16u;
+            uint m = 1u << (int) ((int)interrupt - d * 32);
+            return (Read(o) & m) == m;
+        }
+
+        [NoHeapAllocation]
+        private bool IsrIsSet(byte interrupt)
+        {
+            // Read() is 4 bytes wide.
+            // Each DWORD is aligned on 16-byte boundaries.
+            //    IsrBase + 0x00 = interrupts   0-31
+            //    IsrBase + 0x10 = interrupts  32-63
+            //    IsrBase + 0x20 = interrupts  64-95
+            //    ...
+            //    IsrBase + 0x70 = interrupts 224-255
+            uint d = (uint)interrupt / 32u;
+            uint o = ApicOffset.IsrBase + d * 16u;
+            uint m = 1u << (int) ((int)interrupt - d * 32);
+            return (Read(o) & m) == m;
+        }
+
+        [NoHeapAllocation]
+        private uint Log2(uint value)
+        {
+            uint l = 0;
+            if ((value & 0xffff0000u) != 0) l += 16u;
+            if ((value & 0xff00ff00u) != 0) l += 8u;
+            if ((value & 0xf0f0f0f0u) != 0) l += 4u;
+            if ((value & 0xccccccccu) != 0) l += 2u;
+            if ((value & 0xaaaaaaaau) != 0) l += 1u;
+            return l;
+        }
+
+        private uint lastByte;
+        private int  lastByteValue;
+        private uint lastIsr;
+
+        [NoHeapAllocation]
+        private uint ActiveIsrInterrupt()
+        {
+            uint isr = ~0u;
+            uint i;
+            for (i = 0; i < 0x80; i += 0x10) {
+                uint value = Read(ApicOffset.IsrBase + i);
+                if (value != 0) {
+                    lastByteValue = (int) value;
+                    lastByte = i;
+                    DebugStub.Assert((value & (value - 1)) == 0);
+                    isr = i * 2 + Log2(value);
+                    lastIsr = isr;
+                    break;
+                }
+            }
+            i += 0x10;
+            for (; i < 0x80; i += 0x10) {
+                uint value = Read(ApicOffset.IsrBase + i);
+                DebugStub.Assert(value == 0);
+            }
+            DebugStub.Assert(isr != ~0u);
+            return isr;
+        }
+
+        [Conditional("DEBUG_APIC")]
+        [NoHeapAllocation]
+        internal void DumpState()
+        {
+            ulong msr      = Processor.ReadMsr(0x1b);
+            uint  baseAddr = ((uint) msr) & 0xfffff000u;
+            uint  en       = (((uint) msr) >> 11) & 0x1;
+            uint  bsp      = (((uint) msr) >>  8) & 0x1;
+
+            DebugStub.Print("Apic Base {0:x8} MSR Enabled {1} BSP {2}\n",
+                            __arglist(baseAddr, en, bsp));
+
+            DebugStub.Print("Id {0:x} Version {1:x} TaskPriority {2:x} " +
+                            "ArbitrationPriority {3:x} ProcessorPriority {4:x}\n",
+                            __arglist(
+                                Read(ApicOffset.Id),
+                                Read(ApicOffset.Version),
+                                Read(ApicOffset.TaskPriority),
+                                Read(ApicOffset.ArbitrationPriority),
+                                Read(ApicOffset.ProcessorPriority)));
+
+            DebugStub.Print("Timer LVT        {0:x8}  Thermal LVT      {1:x8}  " +
+                            "PerfCounts LVT   {2:x8}\n",
+                            __arglist(
+                                Read(ApicOffset.LvtTimer),
+                                Read(ApicOffset.LvtThermalSensor),
+                                Read(ApicOffset.LvtPerfCounts)));
+
+            DebugStub.Print("Lint0 LVT        {0:x8}  Lint1 LVT        {1:x8}\n",
+                            __arglist(
+                                Read(ApicOffset.LvtLint0),
+                                Read(ApicOffset.LvtLint1)));
+
+            DebugStub.Print("LvtError LVT     {0:x8}  Spurious LVT     {1:x8}  ESR {2:x2}\n",
+                            __arglist(
+                                Read(ApicOffset.LvtError),
+                                Read(ApicOffset.SpuriousIntVector),
+                                Read(ApicOffset.ErrorStatus) & 0xef));
+        }
+
+        // haryadi -- print IRR and ISR register
+#if FALSE
+        // : This method is commented out because
+        // it allocates memory.  The fix is trivial.
+        internal void PrintIrrAndIsr(bool debug)
+        {
+            uint addr, a;
+            uint [] c = new uint [8];
+            uint [] b = new uint [8];
+
+            if (debug) {
+                DebugStub.Print("HSG: IRR  ");
+                for (int i = 0; i < 8; i++) {
+                    addr = ApicOffset.IrrBase+(uint)(i*32);
+                    a = Read(addr);
+                    DebugStub.Print("{0}.{1:x08}  ", __arglist(i,a));
+                }
+                DebugStub.WriteLine("");
+                DebugStub.Print("HSG: ISR  ");
+                for (int i = 0; i < 8; i++) {
+                    addr = ApicOffset.IsrBase+(uint)(i*32);
+                    a = Read(addr);
+                    DebugStub.Print("{0}.{1:x08}  ", __arglist(i,a));
+                }
+                DebugStub.WriteLine("");
+            }
+
+
+            for (int i = 0; i < 8; i++) {
+                addr = ApicOffset.IrrBase+(uint)(i*32);
+                c[i] = Read(addr);
+            }
+            for (int i = 0; i < 8; i++) {
+                addr = ApicOffset.IsrBase+(uint)(i*32);
+                b[i] = Read(addr);
+            }
+
+            Tracing.Log(Tracing.Debug, "************************************");
+            Tracing.Log(Tracing.Debug, "IRR lo: {0:x08} {1:x08} {2:x08} {3:x08}",
+                        c[0], c[1], c[2], c[3]);
+            Tracing.Log(Tracing.Debug, "IRR hi: {0:x08} {1:x08} {2:x08} {3:x08}",
+                        c[4], c[5], c[6], c[7]);
+            Tracing.Log(Tracing.Debug, "ISR lo: {0:x08} {1:x08} {2:x08} {3:x08}",
+                        b[0], b[1], b[2], b[3]);
+            Tracing.Log(Tracing.Debug, "ISRb hi: {0:x08} {1:x08} {2:x08} {3:x08}",
+                        b[4], b[5], b[6], b[7]);
+
+        }
+#endif // FALSE
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/ApicTimer.cs b/base/Kernel/Singularity.Hal.ApicPC/ApicTimer.cs
new file mode 100644
index 0000000..5fa0a04
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/ApicTimer.cs
@@ -0,0 +1,251 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ApicTimer.cs
+//
+
+namespace Microsoft.Singularity.Hal
+{
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+
+    public class ApicTimer
+    {
+        //
+        // Constants
+        //
+        private readonly byte [] divisors = new byte [] {
+            11 /*   1 */, 0 /*   2 */, 1 /*   4 */,  2 /*   8 */,
+             3 /*  16 */, 8 /*  32 */, 9 /*  64 */, 10 /* 128 */
+        };
+
+        private const uint TimerPending  = 1u << 12;
+        private const uint TimerMasked   = 1u << 16;
+        private const uint TimerPeriodic = 1u << 17;
+
+        private const uint TimeSpanHz = 10 * 1000 * 1000;
+        private const long maxInterruptInterval = TimeSpanHz / 10;     // 100ms
+        private const long minInterruptInterval = TimeSpanHz / 2000;   // 500us
+        private const long interruptGranularity = TimeSpanHz / 100000; //  10us
+
+        //
+        // Members
+        //
+        private Apic apic;
+        private uint divisor      = 1;
+        private uint busFrequency = 100000000;
+        private uint frequency;     // == busFrequency / divisor
+        private byte interrupt;
+
+        //
+        // Methods
+        //
+        internal ApicTimer(Apic apic)
+        {
+            this.apic = apic;
+            SetDivisor(1);
+            SetOneShot();
+            SetInterruptEnabled(false);
+            interrupt = apic.IrqToInterrupt(Apic.TimerIrq);
+        }
+
+        internal void Finalize()
+        {
+        }
+
+        internal byte Initialize()
+        {
+            SetInterruptVector(interrupt);
+            SetDivisor(1);
+            SetOneShot();
+            SetBusFrequency(busFrequency);
+            return interrupt;
+        }
+
+        internal void Start()
+        {
+            SetInterruptEnabled(true);
+            SetNextInterrupt(maxInterruptInterval);
+        }
+
+        [NoHeapAllocation]
+        internal void SetBusFrequency(uint measuredFrequency)
+        {
+            busFrequency = measuredFrequency;
+            for (divisor = 1; divisor <= 128; divisor *= 2) {
+                frequency = busFrequency / divisor;
+                if (frequency < 100 * 1000 * 1000) {
+                    break;
+                }
+            }
+            SetDivisor(divisor);
+        }
+
+        /// <summary>
+        /// Set processor clock bus divider.
+        /// </summary>
+        ///
+        /// <param name ="amount">
+        /// Amount to divide by.  Must be a power of 2 between 1 and 128.
+        /// </param>
+        [NoHeapAllocation]
+        internal void SetDivisor(uint amount)
+        {
+            for (int i = 0; i < divisors.Length; i++) {
+                if (amount <= (1u << i)) {
+                    uint v = apic.Read(ApicOffset.TimerDivideConf) & ~0xfu;
+                    v |= (uint)divisors[i];
+                    apic.Write(ApicOffset.TimerDivideConf, v);
+                    divisor = 1u << i;
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get processor clock bus divider.
+        /// </summary>
+        [NoHeapAllocation]
+        internal uint GetDivisor()
+        {
+            uint v = apic.Read(ApicOffset.TimerDivideConf) & 0xbu;
+            for (int i = 0; i < divisors.Length; i++) {
+                if ((uint)divisors[i] == v) {
+                    return 1u << i;
+                }
+            }
+            return ~0u;
+        }
+
+        [NoHeapAllocation]
+        internal uint GetCurrentCount()
+        {
+            return apic.Read(ApicOffset.TimerCurrentCount);
+        }
+
+        internal uint Value
+        {
+            [NoHeapAllocation]
+            get { return GetCurrentCount(); }
+        }
+
+        [NoHeapAllocation]
+        internal void SetInitialCount(uint value)
+        {
+            apic.Write(ApicOffset.TimerInitialCount, value);
+        }
+
+        [NoHeapAllocation]
+        internal void SetInterruptEnabled(bool enabled)
+        {
+            uint r = apic.Read(ApicOffset.LvtTimer) & ~TimerMasked;
+            if (enabled == false) {
+                r |= TimerMasked;
+            }
+            apic.Write(ApicOffset.LvtTimer, r);
+        }
+
+        [NoHeapAllocation]
+        internal bool InterruptEnabled()
+        {
+            return (apic.Read(ApicOffset.LvtTimer) & TimerMasked) == 0;
+        }
+
+        [NoHeapAllocation]
+        private void SetInterruptVector(byte interrupt)
+        {
+            uint r = (apic.Read(ApicOffset.LvtTimer) & ~0xffu) | interrupt;
+            apic.Write(ApicOffset.LvtTimer, r);
+        }
+
+        [NoHeapAllocation]
+        internal void SetPeriodic()
+        {
+            uint r = apic.Read(ApicOffset.LvtTimer) & ~TimerPeriodic;
+            apic.Write(ApicOffset.LvtTimer, r | TimerPeriodic);
+        }
+
+        [NoHeapAllocation]
+        internal void SetOneShot()
+        {
+            uint r = apic.Read(ApicOffset.LvtTimer) & ~TimerPeriodic;
+            apic.Write(ApicOffset.LvtTimer, r);
+        }
+
+        internal byte Interrupt
+        {
+            [NoHeapAllocation]
+            get { return interrupt; }
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            apic.Write(ApicOffset.EoiRegister, 0);
+            SetNextInterrupt(maxInterruptInterval);
+        }
+
+        /// <summary>
+        /// Set relative time of next interrupt.
+        ///
+        /// <param name="delta">Relative time of next interrupt in units
+        /// of 100ns.  The time should be with the range between
+        /// from <c>SetNextInterruptMinDelta</c> to
+        /// <c>SetNextInterruptMaxDelta</c></param>.
+        /// <returns> true on success.</returns>
+        /// </summary>
+        [NoHeapAllocation]
+        public bool SetNextInterrupt(long delta)
+        {
+            DebugStub.Assert(delta <= maxInterruptInterval);
+
+            SetInitialCount(TimeSpanToTimerTicks(delta));
+
+            return true;
+        }
+
+        /// <value>
+        /// Maximum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MaxInterruptInterval
+        {
+            [NoHeapAllocation]
+            get { return maxInterruptInterval; }
+        }
+
+        /// <value>
+        /// Minimum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MinInterruptInterval
+        {
+            [NoHeapAllocation]
+            get { return minInterruptInterval; }
+        }
+
+        /// <value>
+        /// Granularity of interrupt timeout (in units of 100ns).
+        /// </value>
+        public long InterruptIntervalGranularity
+        {
+            [NoHeapAllocation]
+            get { return interruptGranularity; }
+        }
+
+        [NoHeapAllocation]
+        public long TimerToTimeSpanTicks(uint timerTicks)
+        {
+            long r = ((long) TimeSpanHz * (long) timerTicks) / frequency;
+            return r;
+        }
+
+        [NoHeapAllocation]
+        public uint TimeSpanToTimerTicks(long timeSpanTicks)
+        {
+            return (uint) (((long) frequency) * timeSpanTicks / TimeSpanHz);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/Calibrate.cs b/base/Kernel/Singularity.Hal.ApicPC/Calibrate.cs
new file mode 100644
index 0000000..3c9c32d
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/Calibrate.cs
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Calibration.cs
+//
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Hal.Acpi;
+
+    internal class Calibrate
+    {
+        private static uint PmDelta(uint newValue, uint oldValue)
+        {
+            // PmTimer may be 24 or 32 bits depending on system.
+            // Simplest to treat as 24 bits.
+            return (newValue - oldValue) & 0x00ffffff;
+        }
+
+        internal static void CpuCycleCounter(PMTimer pmTimer)
+        {
+            uint  pmLast  = pmTimer.Value;
+            ulong tscLast = Processor.CycleCount;
+
+            uint  pmLimit = PMTimer.FrequencyHz / 15;
+            uint  pmAccum = 0;
+            ulong tscNow  = 0;
+
+            // Initial measurements
+            tscLast = Processor.CycleCount;
+            pmLast  = pmTimer.Value;
+
+            // Measurement loop
+            do
+            {
+                tscNow      = Processor.CycleCount;
+                uint pmNow  = pmTimer.Value;
+                pmAccum    += PmDelta(pmNow, pmLast);
+                pmLast      = pmNow;
+            } while (pmAccum < pmLimit);
+
+            ulong tscHz = PMTimer.FrequencyHz * (tscNow - tscLast) / pmAccum;
+            DebugStub.Print("Cpu{0}: TSC frequency {1} Hz\n",
+                            __arglist(Processor.CurrentProcessor.Id, tscHz));
+            Processor.CyclesPerSecond = tscHz;
+        }
+
+        internal static void ApicTimer(PMTimer pmTimer, ApicTimer apicTimer)
+        {
+            apicTimer.SetDivisor(1);
+            apicTimer.SetOneShot();
+            apicTimer.SetInterruptEnabled(false);
+            apicTimer.SetInitialCount(~0u);
+
+            uint apicLast = apicTimer.Value;
+            uint pmLast   = pmTimer.Value;
+
+            uint  pmLimit = PMTimer.FrequencyHz / 15;
+            uint  pmAccum = 0;
+            uint  apicNow = 0;
+
+            // Initial measurements
+            apicLast = apicTimer.Value;
+            pmLast   = pmTimer.Value;
+            do
+            {
+                apicNow     = apicTimer.Value;
+                uint pmNow  = pmTimer.Value | 0xff000000;
+                pmAccum    += PmDelta(pmNow, pmLast);
+                pmLast      = pmNow;
+            } while (pmAccum < pmLimit);
+
+            ulong apicHz = PMTimer.FrequencyHz * (ulong)(apicLast - apicNow) / pmAccum;
+            DebugStub.Print("Cpu{0}: APIC timer frequency {1} Hz\n",
+                            __arglist(Processor.CurrentProcessor.Id, apicHz));
+
+            apicTimer.SetBusFrequency((uint)apicHz);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/HalClock.cs b/base/Kernel/Singularity.Hal.ApicPC/HalClock.cs
new file mode 100644
index 0000000..208ba16
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/HalClock.cs
@@ -0,0 +1,147 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalClock.cs
+//
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalClock.csi
+//
+//  Having some form of time working when one or processors may be in the
+//  debugger makes this hard and expensive.
+//
+
+#if SINGULARITY_MP
+#error "This file is not for MP builds."
+#endif // SINGULARITY_MP
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Hal.Acpi;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+
+    public class HalClock
+    {
+        Apic      apic;
+        PMClock   pmClock;
+        RTClock   rtClock;
+        HpetClock hpetClock;
+
+        long      lastKernelTicks;
+        ulong     tscSnapshot;
+        bool      tscSnapshotValid = false;
+        long      ticksSnapshot;
+        int       tickScale = 0;
+        const int tickRoll = 24;
+
+        internal HalClock(Apic apic, RTClock rtClock, PMClock /* ! */ pmClock)
+        {
+            this.apic        = apic;
+            this.rtClock     = rtClock;
+            this.pmClock     = pmClock;
+            this.hpetClock   = null;
+            this.tscSnapshot = 0;
+            this.ticksSnapshot = 0;
+            int ticksPerKernelTick =
+                (int)(Processor.CyclesPerSecond / 10000000);
+            this.tickScale = (1 << tickRoll) / ticksPerKernelTick;
+            lastKernelTicks = InternalGetKernelTicks();
+        }
+
+        [NoHeapAllocation]
+        public long GetKernelTicks()
+        {
+            bool en = Processor.DisableInterrupts();
+            try {
+                long kernelTicks = InternalGetKernelTicks();
+                if (kernelTicks >= lastKernelTicks ||
+                    (kernelTicks < 0 && lastKernelTicks > 0)) {
+                    lastKernelTicks = kernelTicks;
+                    return kernelTicks;
+                }
+                else {
+                    // Skew from switching between tsc and underlying clock
+                    DebugStub.Assert(lastKernelTicks - kernelTicks < 5000000);
+                    return lastKernelTicks;
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(en);
+            }
+        }
+
+        [NoHeapAllocation]
+        private long InternalGetKernelTicks()
+        {
+            if (!tscSnapshotValid) {
+                if (hpetClock == null)
+                {
+                    ticksSnapshot = (long) pmClock.GetKernelTicks();
+
+                } else {
+                    ticksSnapshot = (long) hpetClock.GetKernelTicks();
+                }
+                tscSnapshot      = Processor.CycleCount;
+                tscSnapshotValid = true;
+
+                return ticksSnapshot;
+            } else {
+                long tscDelta  = (long)(Processor.CycleCount - tscSnapshot);
+                long tickDelta = (tscDelta * tickScale) >> tickRoll;
+                return ticksSnapshot + tickDelta;
+            }
+        }
+
+        public byte Interrupt
+        {
+            [NoHeapAllocation]
+            get { return rtClock.Interrupt; }
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            if (hpetClock == null) {
+                pmClock.Update();
+            }
+            else {
+                hpetClock.Update();
+            }
+            rtClock.ClearInterrupt();
+            tscSnapshotValid = false;
+        }
+
+        internal void SwitchToHpetClock(HpetClock hc)
+        {
+            // Change rt clock interrupt frequency to appropriate
+            // rate for HPET main clock.
+            rtClock.SetFrequency(HpetClock.UpdateFrequency(hc.Hpet));
+            hpetClock = hc;
+            DebugStub.Print("Hal switching to HpetClock.\n");
+        }
+
+        [NoHeapAllocation]
+        public void CpuResumeFromHaltEvent()
+        {
+            tscSnapshotValid = false;
+        }
+
+        [NoHeapAllocation]
+        public long GetRtcTime()
+        {
+            return rtClock.GetBootTime() + GetKernelTicks();
+        }
+
+        public void SetRtcTime(long newRtcTime)
+        {
+            rtClock.SetRtcTime(newRtcTime, GetKernelTicks());
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/HalDevices.cs b/base/Kernel/Singularity.Hal.ApicPC/HalDevices.cs
new file mode 100644
index 0000000..b126384
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/HalDevices.cs
@@ -0,0 +1,569 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: HalDevices.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Hal.Acpi;
+
+namespace Microsoft.Singularity.Hal
+{
+    // Lockstep states for MP initialization.  The bootstrap
+    // processor (BSP) sets states beginning Bsp and the
+    // upcoming Application Processor (AP) sets states beginning
+    // with Ap.
+    internal enum MpSyncState : int
+    {
+        BspWaitingForAp             = 0,
+        ApOnline                    = 1,
+        BspWaitingForApCalibration  = 2,
+        ApCalibrationDone           = 3,
+        BspStartingTscCorrelation   = 4,
+        ApTscCorrelationDone        = 5,
+        BspWaitingApRunning         = 6,
+        ApRunning                   = 7
+    }
+
+    [CLSCompliant(false)]
+    public sealed class HalDevices
+    {
+        private const byte PicBaseVector  = 0x60;
+        private const byte ApicBaseVector = 0x70;
+
+        private static IoApic [] ioApics;
+
+        private static HalPic    halPic;    // dumb wrapper for APIC for kernel
+        private static Apic      apic;
+
+        private static Pic       pic;       // for squelching pic interrupts
+
+        private static HalTimer  halTimer;  // wrapper for APIC timer for kernel
+        private static ApicTimer apicTimer;
+
+        private static PMTimer   pmTimer;
+        private static Timer8254 stallTimer;
+
+        private static RTClock   rtClock;
+
+        private static HalClock  halClock;
+        private static HalMemory halMemory;
+
+        private static int processorCount;
+
+        private static volatile MpSyncState mpSyncState;
+
+        // TSC skew calculation variables
+        private const int TscCalibrationRounds = 20;
+        private static volatile uint tsc0Lo;
+        private static volatile uint tsc0Hi;
+        private static ulong cpu0CyclesPerSecond;
+
+        // Kernel thread stack variables
+        private static Thread  nextKernelThread;
+        private static UIntPtr nextKernelStackBegin;
+        private static UIntPtr nextKernelStackLimit;
+
+        public static void InitializeBsp(Processor rootProcessor)
+        {
+            DebugStub.Print("HalDevices.Initialize()\n");
+
+            AcpiTables.Parse();
+            pmTimer = AcpiTables.GetPMTimer();
+
+            // Get PIC resources.  Pic is masked by default.
+            PnpConfig picConfig
+                = (PnpConfig)IoSystem.YieldResources("/pnp/PNP0000", typeof(Pic));
+            pic = new Pic(picConfig);
+            pic.Initialize(PicBaseVector);
+
+            // Parse MP Table and create IO apics
+            MpResources.ParseMpTables();
+            ioApics = IoApic.CreateIOApics();
+
+            apic = new Apic(ioApics);
+            apic.Initialize(ApicBaseVector);
+            halPic = new HalPic(apic);
+
+            // Apic timer is used to provide one-shot timer interrupts.
+            apicTimer = new ApicTimer(apic);
+            apicTimer.Initialize();
+
+            halTimer = new HalTimer(apicTimer);
+
+            // Calibrate timers
+            Calibrate.CpuCycleCounter(pmTimer);
+            Calibrate.ApicTimer(pmTimer, apicTimer);
+
+            // Store BSPs clock rate
+            cpu0CyclesPerSecond = Processor.CyclesPerSecond;
+
+            // Legacy timer is used to time stalls when starting CPUs.
+            PnpConfig i8254Config
+                = (PnpConfig)IoSystem.YieldResources("/pnp/PNP0100", typeof(Timer8254));
+            stallTimer = new Timer8254(i8254Config);
+
+            // Real-time clock
+            PnpConfig rtClockConfig
+                = (PnpConfig)IoSystem.YieldResources("/pnp/PNP0B00", typeof(RTClock));
+            rtClock = new RTClock(rtClockConfig, apic);
+
+            // Compose HalClock
+            halClock = new HalClock(apic, rtClock, new PMClock(pmTimer));
+
+            SystemClock.Initialize(halClock, TimeSpan.FromHours(8).Ticks);
+
+            rootProcessor.AddPic(halPic);
+
+            rootProcessor.AddTimer(halTimer.Interrupt, halTimer);
+            rootProcessor.AddClock(halClock.Interrupt, halClock);
+
+            InitializeProcessorCount();
+            DebugReportProcessors();
+
+            // ------------------------------------------------
+            // haryadi: add Srat tables to the Processor
+            halMemory = new HalMemory(AcpiTables.GetSrat());
+            Processor.AddHalMemory(halMemory);
+
+            Processor.SetIdtTable();
+
+            apicTimer.Start();
+
+            // Get the screen resources.  Since we have metadata above to
+            // declare all fixed resources used by the screen,
+            // YieldResources("") will keep the resource tracking correct:
+            Console.Screen =
+                new HalScreen(IoSystem.YieldResources("", typeof(HalScreen)));
+
+            apic.DumpState();
+            foreach (IoApic ioApic in ioApics) {
+                ioApic.DumpRedirectionEntries();
+            }
+            pic.DumpRegisters();
+        }
+
+        public static void InitializeAp(Processor processor)
+        {
+            Processor.SetIdtTable();
+
+            Thread.BindKernelThread(nextKernelThread,
+                                    nextKernelStackBegin,
+                                    nextKernelStackLimit);
+
+            // Fleeting check that allocator works.
+            Object o = new Object();
+            if (o == null)
+                DebugStub.Break();
+
+            apic.Initialize();
+            apicTimer.Initialize();
+            processor.AddPic(halPic);
+            processor.AddTimer(halTimer.Interrupt, halTimer);
+            processor.AddClock(halClock.Interrupt, halClock);
+
+            SetMpSyncState(MpSyncState.ApOnline);
+            WaitForMpSyncState(MpSyncState.BspWaitingForApCalibration);
+
+            // Calibrate timers
+            ulong t1 = Processor.CycleCount;
+            Calibrate.CpuCycleCounter(pmTimer);
+            Calibrate.ApicTimer(pmTimer, apicTimer);
+            ulong t2 = Processor.CycleCount;
+            Tracing.Log(Tracing.Audit, "Calibration time {0}",
+                        new UIntPtr((uint)(t2 - t1)));
+
+            SetMpSyncState(MpSyncState.ApCalibrationDone);
+
+            // Calculate tsc skew
+            long [] skewEstimates = new long[TscCalibrationRounds];
+            for (int i = 0; i < TscCalibrationRounds; i++) {
+                ApSync(out skewEstimates[i]);
+            }
+
+            bool success = false;
+            WaitForMpSyncState(MpSyncState.BspWaitingApRunning, 100000,
+                               out success);
+
+            SetMpSyncState(MpSyncState.ApRunning);
+
+            // Sort skew estimates and picked median
+            Array.Sort(skewEstimates);
+            Tracing.Log(Tracing.Audit, "Skew estimate {0}",
+                new UIntPtr((int)(skewEstimates[TscCalibrationRounds / 2])));
+            Tracing.SetTscOffset((skewEstimates[TscCalibrationRounds / 2]));
+
+            apicTimer.Start();
+        }
+
+        public static void Initialize(Processor processor)
+        {
+            if (processor.Id == 0) {
+                InitializeBsp(processor);
+
+                IoSystem.RegisterKernelDriver(
+                    typeof(HpetResources),
+                    new IoDeviceCreate(Hpet.CreateDevice)
+                    );
+            }
+            else {
+                InitializeAp(processor);
+            }
+        }
+
+        public static void Finalize()
+        {
+            rtClock.Finalize();
+            rtClock = null;
+
+            apicTimer.Finalize();
+            apicTimer = null;
+
+            apic.Finalize();
+            apic = null;
+
+            pic.Finalize();
+            pic = null;
+        }
+
+        [NoHeapAllocation]
+        public static bool InternalInterrupt(byte interrupt)
+        {
+            if (interrupt >= PicBaseVector && interrupt < ApicBaseVector) {
+                // Spurious PIC interrupt.
+                // Appears to happen once on test boards even though PIC
+                // is masked out and no interrupt was raised before masking.
+                pic.DumpRegisters();
+                pic.AckIrq((byte) (interrupt - PicBaseVector));
+                return true;
+            }
+            return false;
+        }
+
+        [NoHeapAllocation]
+        internal static void StallProcessor(uint microseconds)
+        {
+            ulong todo = microseconds *
+                (Processor.CyclesPerSecond / 1000000);
+            ulong last = Processor.CycleCount;
+            ulong elapsed = 0;
+
+            while (elapsed < todo) {
+                // Keep track of how much time has elapsed.
+                ulong now  = Processor.CycleCount;
+                elapsed   += (now - last);
+                last       = now;
+            }
+        }
+
+        internal static void SwitchToHpetClock(Hpet hpet)
+        {
+            DebugStub.Print("Switching to HPET clock");
+            halClock.SwitchToHpetClock(
+                new HpetClock(hpet, (ulong)halClock.GetKernelTicks() + 1000u)
+                );
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private static void SetMpSyncState(MpSyncState newState)
+        {
+            Tracing.Log(Tracing.Debug, "Changing MP sync state {0} -> {1}",
+                        (uint)mpSyncState, (uint)newState);
+            mpSyncState = newState;
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private static void WaitForMpSyncState(MpSyncState newState,
+                                               uint microseconds,
+                                               out bool success)
+        {
+            Tracing.Log(
+                Tracing.Debug,
+                "Waiting for MP sync state {0} -> {1} ({2} microseconds)",
+                (uint)mpSyncState, (uint)newState, microseconds
+                );
+
+            ulong todo = microseconds * (Processor.CyclesPerSecond / 1000000);
+            ulong last = Processor.CycleCount;
+            ulong elapsed = 0;
+
+            success = false;
+
+            while (elapsed < todo) {
+                ulong now  = Processor.CycleCount;
+                elapsed   += (now - last);
+                last       = now;
+                if (HalDevices.mpSyncState == newState) {
+                    success = true;
+                    return;
+                }
+            }
+            Tracing.Log(Tracing.Debug, "Mp sync state timed out");
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private static void WaitForMpSyncState(MpSyncState newState)
+        {
+            Tracing.Log(
+                Tracing.Debug,
+                "Waiting for MP sync state {0} -> {1} (indefinite)",
+                (uint)mpSyncState, (uint)newState
+                );
+            while (HalDevices.mpSyncState != newState)
+                ;
+        }
+
+        public static byte GetMaximumIrq()
+        {
+            return apic.MaximumIrq;
+        }
+
+        //
+        // Adding and removing interrupts from the Pic.
+        //
+        [NoHeapAllocation]
+        public static void EnableIoInterrupt(byte irq)
+        {
+            apic.EnableIrq(irq);
+        }
+
+        [NoHeapAllocation]
+        public static void DisableIoInterrupt(byte irq)
+        {
+            apic.DisableIrq(irq);
+        }
+
+
+        private static void InitializeProcessorCount()
+        {
+            Madt madt = AcpiTables.GetMadt();
+            if (madt != null) {
+                processorCount = madt.GetLocalApics().Count;
+            }
+            else if (MpResources.ProcessorEntries != null) {
+                processorCount = MpResources.ProcessorEntries.Count;
+            }
+            else {
+                processorCount = 1;
+            }
+        }
+
+        [NoHeapAllocation]
+        private static int GetProcessorCount()
+        {
+            return processorCount;
+        }
+
+        private static void DebugReportProcessors()
+        {
+#if SINGULARITY_MP
+            string kernelType = "Multi";
+#else
+            string kernelType = "Uni";
+#endif
+            DebugStub.Print("{0}processor kernel on {1} processor system.\n",
+                            __arglist(kernelType, GetProcessorCount()));
+        }
+
+        // Runs Bootstrap processor component of TSC offset computation.
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private static void BspSync(uint microseconds)
+        {
+            ulong todo = microseconds * (Processor.CyclesPerSecond / 1000000);
+            ulong last = Processor.CycleCount;
+            ulong elapsed = 0;
+
+            SetMpSyncState(MpSyncState.BspStartingTscCorrelation);
+
+            elapsed = 0;
+            while (elapsed < todo &&
+                   mpSyncState != MpSyncState.ApTscCorrelationDone) {
+                // Keep track of how much time has elapsed.
+                ulong now  = Processor.CycleCount;
+                elapsed   += (now - last);
+                last       = now;
+                // Order of these assignments is important
+                tsc0Lo     = (uint)(now & 0xffffffff);
+                tsc0Hi     = (uint)(now >> 32);
+                // Yield hardware thread on HT boxes
+                Thread.NativeNoOp();
+            }
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private static void ApSync(out long tscOffset)
+        {
+            WaitForMpSyncState(MpSyncState.BspStartingTscCorrelation);
+
+            ulong now = 0;
+            uint tscLo;
+            uint tscHi;
+            uint tscTmp;
+            for (int i = 0; i < 5; i++) {
+                do {
+                    now = Processor.CycleCount;
+                    tscLo  = tsc0Lo;
+                    tscHi  = tsc0Hi;
+                    tscTmp = tsc0Lo;
+                    // Yield hardware thread on HT boxes
+                    Thread.NativeNoOp();
+                } while (tscTmp != tscLo);
+            }
+            ulong tsc0 = (((ulong)tsc0Hi) << 32) + tsc0Lo;
+            if (tsc0 > now) {
+                Tracing.Log(Tracing.Audit, "Skew tsc-{0}",
+                            new UIntPtr(tsc0 - now));
+            }
+            else {
+                Tracing.Log(Tracing.Audit, "Skew tsc+{0}",
+                            new UIntPtr(now - tsc0));
+            }
+            tscOffset = (long)(now - tsc0);
+            SetMpSyncState(MpSyncState.ApTscCorrelationDone);
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private static void AnnounceApFail(int nextCpu)
+        {
+            MpSyncState localMpState = mpSyncState;
+            DebugStub.Print("MpState {0}", __arglist(localMpState));
+            DebugStub.Break();
+            BootInfo bi = BootInfo.GetBootInfo();
+            DebugStub.Print("Cpu {0} failed. ",
+                            __arglist(nextCpu));
+            DebugStub.Print("GotBack-> Status {0} Count {1:x8}\n",
+                            __arglist(bi.MpStatus32, bi.MpCpuCount));
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        //        [NoHeapAllocation]
+        private static void StartApProcessorsInternal()
+        {
+            // Currently we fire up all processors.  They
+            // serialize on a spin lock in low memory.
+            int expectedCpus = GetProcessorCount();
+            int nextCpu      = 1;
+
+            bool en = Processor.DisableInterrupts();
+            try {
+                do {
+                    DebugStub.Print("Starting CPU {0} / {1}\n",
+                                    __arglist(nextCpu + 1,
+                                              expectedCpus));
+                    SetMpSyncState(MpSyncState.BspWaitingForAp);
+                    Tracing.Log(Tracing.Audit,
+                                "Initializing cpu {0}", (uint)nextCpu);
+                    nextKernelThread = Thread.PrepareKernelThread();
+
+                    MpBootInfo.PrepareForCpuStart(nextCpu);
+                    MpBootInfo mbi       = MpBootInfo.GetMpBootInfo();
+                    nextKernelStackBegin = mbi.KernelStackBegin;
+                    nextKernelStackLimit = mbi.KernelStackLimit;
+
+                    Tracing.Log(Tracing.Audit,
+                                "Starting cpu {0}. Stack start {1:x8} base {2:x8} limit {3:x8})\n",
+                                new UIntPtr(nextCpu),
+                                mbi.KernelStackBegin,
+                                mbi.KernelStack,
+                                mbi.KernelStackLimit);
+
+                    if (nextCpu == 1) {
+                        BootInfo bi = BootInfo.GetBootInfo();
+                        apic.BroadcastStartupIPI((byte) (bi.MpEnter32 >> 12));
+                    }
+
+                    bool success = false;
+                    WaitForMpSyncState(MpSyncState.ApOnline, 500000,
+                                       out success);
+                    if (!success) {
+                        AnnounceApFail(nextCpu);
+                        continue;
+                    }
+
+                    SetMpSyncState(MpSyncState.BspWaitingForApCalibration);
+
+                    WaitForMpSyncState(MpSyncState.ApCalibrationDone, 1000000,
+                                       out success);
+                    if (!success) {
+                        AnnounceApFail(nextCpu);
+                        continue;
+                    }
+
+                    for (int i = 0; i < TscCalibrationRounds; i++) {
+                        BspSync(100000);
+                    }
+
+                    SetMpSyncState(MpSyncState.BspWaitingApRunning);
+
+                    WaitForMpSyncState(MpSyncState.ApRunning, 100000,
+                                       out success);
+                    if (!success) {
+                        AnnounceApFail(nextCpu);
+                        continue;
+                    }
+                    Processor.RestoreInterrupts(en);
+                    en = false;
+                    DebugStub.Print("Cpu {0} running ({1} remaining).\n",
+                                    __arglist(nextCpu,
+                                              expectedCpus - nextCpu - 1));
+                } while (++nextCpu < expectedCpus);
+                DebugStub.Print("Done.");
+            }
+            finally {
+                DebugStub.Print("Reached finally block in HalDevices.StartApProcessorsInternal()");
+                Processor.RestoreInterrupts(en);
+            }
+        }
+
+        //        [NoHeapAllocation]
+        public static void StartApProcessors()
+        {
+            if (GetProcessorCount() > 1) {
+                StartApProcessorsInternal();
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void FreezeProcessors()
+        {
+            apic.BroadcastFreezeIPI();
+        }
+
+        [NoHeapAllocation]
+        public static void SendFixedIPI(byte vector, int from, int to)
+        {
+            apic.SendFixedIPI(vector, from, to);
+        }
+
+        [NoHeapAllocation]
+        public static void BroadcastFixedIPI(byte vector, bool includeSelf)
+        {
+            apic.BroadcastFixedIPI(vector, includeSelf);
+        }
+
+        [NoHeapAllocation]
+        public static void ClearFixedIPI()
+        {
+            apic.ClearFixedIPI();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/HalPic.cs b/base/Kernel/Singularity.Hal.ApicPC/HalPic.cs
new file mode 100644
index 0000000..b7fedb1
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/HalPic.cs
@@ -0,0 +1,92 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalPic.cs
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalPic.csi
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalPic
+    {
+        private Apic apic;
+
+        public HalPic(Apic theApic)
+        {
+            this.apic = theApic;
+        }
+
+        public byte MaximumIrq
+        {
+            [NoHeapAllocation]
+            get {
+                return apic.MaximumIrq;
+            }
+        }
+
+        /// <summary>
+        /// Convert interrupt vector to interrupt request line.
+        /// </summary>
+        [NoHeapAllocation]
+        public byte InterruptToIrq(byte interrupt)
+        {
+            return apic.InterruptToIrq(interrupt);
+        }
+
+        /// <summary>
+        /// Convert interrupt request line to interrupt vector.
+        /// </summary>
+        [NoHeapAllocation]
+        public byte IrqToInterrupt(byte irq)
+        {
+            return apic.IrqToInterrupt(irq);
+        }
+
+        /// <summary>
+        /// Acknowledge the interrupt request.  (EOI)
+        /// </summary>
+        [NoHeapAllocation]
+        public void AckIrq(byte irq)
+        {
+            apic.AckIrq(irq);
+        }
+
+        /// <summary>
+        /// Enable interrupt request by removing mask.
+        /// </summary>
+        [NoHeapAllocation]
+        public void EnableIrq(byte irq)
+        {
+            apic.EnableIrq(irq);
+        }
+
+        /// <summary>
+        /// Disable interrupt request by applying mask.
+        /// </summary>
+        [NoHeapAllocation]
+        public void DisableIrq(byte irq)
+        {
+            apic.DisableIrq(irq);
+        }
+
+        /// <summary>
+        /// Acknowledge and mask interrupt.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt(byte interrupt)
+        {
+            apic.ClearInterrupt(interrupt);
+        }
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Kernel/Singularity.Hal.ApicPC/HalTimer.cs b/base/Kernel/Singularity.Hal.ApicPC/HalTimer.cs
new file mode 100644
index 0000000..729acda
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/HalTimer.cs
@@ -0,0 +1,81 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalTimer.cs
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalTimer.csi
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalTimer
+    {
+        private ApicTimer apicTimer;
+
+        public HalTimer(ApicTimer theApicTimer)
+        {
+            this.apicTimer = theApicTimer;
+        }
+
+        /// <summary>
+        /// Clear interrupt associated with timer.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            apicTimer.ClearInterrupt();
+        }
+
+        /// <value>
+        /// Maximum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MaxInterruptInterval {
+            [NoHeapAllocation]
+            get { return apicTimer.MaxInterruptInterval; }
+        }
+
+        /// <value>
+        /// Minimum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MinInterruptInterval {
+            [NoHeapAllocation]
+            get { return apicTimer.MinInterruptInterval; }
+        }
+
+        /// <value>
+        /// Granularity of interrupt timeout (in units of 100ns).
+        /// </value>
+        public long InterruptIntervalGranularity {
+            [NoHeapAllocation]
+            get { return apicTimer.InterruptIntervalGranularity; }
+        }
+
+        /// <summary>
+        /// Set relative time of next interrupt.
+        ///
+        /// <param name="delta">Relative time of next interrupt in units
+        /// of 100ns.  The time should be with the range between
+        /// from <c>SetNextInterruptMinDelta</c> to
+        /// <c>SetNextInterruptMaxDelta</c></param>.
+        /// <returns> true on success.</returns>
+        /// </summary>
+        [NoHeapAllocation]
+        public bool SetNextInterrupt(long delta)
+        {
+            return apicTimer.SetNextInterrupt(delta);
+        }
+
+        public byte Interrupt {
+            [NoHeapAllocation]
+            get { return apicTimer.Interrupt; }
+        }
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Kernel/Singularity.Hal.ApicPC/Hpet.cs b/base/Kernel/Singularity.Hal.ApicPC/Hpet.cs
new file mode 100644
index 0000000..abb50ad
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/Hpet.cs
@@ -0,0 +1,212 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Hpet.cs
+//
+//
+//  Note:
+//    Based on IA-PC HPET (High Precision Event Timers) Specification
+//    Revision 1.0, June 2004.
+//
+//    The HPET code includes unchecked I/O memory operations so
+//    methods can be marked as NoHeapAllocation.  CreateDevice()
+//    must verify that there is at least enough memory for the
+//    MainTimer.
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity.Configuration;
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    internal struct HpetTimerCaps
+    {
+        internal const uint FsbDelivery     = 1u << 15;
+        internal const uint Width64         = 1u << 5;
+        internal const uint PeriodicSupport = 1u << 4;
+
+        internal const uint Mask = FsbDelivery | Width64 | PeriodicSupport;
+    }
+
+    internal struct HpetTimerConf
+    {
+        internal const uint LevelTriggered  = 1u << 1;
+        internal const uint InterruptEnable = 1u << 2;
+        internal const uint PeriodicMode    = 1u << 3;
+        internal const uint Force32Bit      = 1u << 8;
+    }
+
+    [DriverCategory]
+    [Signature("/pnp/PNP0103")]
+    public sealed class HpetResources : DriverCategoryDeclaration
+    {
+        [IoMemoryRange(0, Default = 0, Length = 0x400)]
+        public IoMemoryRange mem1;
+    }
+
+    internal sealed class Hpet : IDevice
+    {
+        private PnpConfig config;
+        private IoMemory  region;
+
+        private const int MainCounterOffset = 0xf0;
+
+        internal const int MinRegionBytes = 0xf8;
+
+        uint periodFs;              // femtoseconds
+        uint capabilities;          // bits 0-31 at offset 0
+
+        internal Hpet(PnpConfig config)
+        {
+            this.config = config;
+            IoMemoryRange imr = (IoMemoryRange) config.DynamicRanges[0];
+            this.region = imr.MemoryAtOffset(0, (int) imr.Length.ToUInt32(),
+                                             Access.ReadWrite);
+
+            capabilities = region.Read32(0x00);
+            periodFs     = region.Read32(0x04);
+
+            // Disable interrupts on timers
+            for (uint i = 0; i <= MaxCounterIndex; i++) {
+                DisableInterrupt(i);
+            }
+
+            uint gc = region.Read32(0x10) & ~3u;    // Clear legacy bits
+            region.Write32(0x10, gc | 1);           // Enable main counter
+        }
+
+        void IDevice.Initialize()
+        {
+        }
+
+        void IDevice.Finalize()
+        {
+        }
+
+        /// <summary> Period in femptoseconds (10^-15) </summary>
+        internal uint PeriodFs
+        {
+            [NoHeapAllocation]
+            get { return periodFs; }
+        }
+
+        internal ushort VendorId
+        {
+            [NoHeapAllocation]
+            get { return (ushort) (capabilities >> 16); }
+        }
+
+        internal uint Width
+        {
+            [NoHeapAllocation]
+            get { return ((capabilities & 0x2000) != 0) ? 64u : 32u; }
+        }
+
+        internal uint MaxCounterIndex
+        {
+            [NoHeapAllocation]
+            get { return ((capabilities >> 8) & 0xf); }
+        }
+
+        internal uint AvailableCounters
+        {
+            [NoHeapAllocation]
+            get { return MaxCounterIndex + 1; }
+        }
+
+        internal uint Revision
+        {
+            [NoHeapAllocation]
+            get { return capabilities & 0xff; }
+        }
+
+        internal ulong MainCounterValue
+        {
+            [NoHeapAllocation]
+            get {
+                ulong value;
+                uint hi;
+                do {
+                    IoResult r;
+                    r = region.Read64NoThrow(MainCounterOffset, out value);
+                    DebugStub.Assert(IoResult.Success == r);
+                    r = region.Read32NoThrow(MainCounterOffset + 4, out hi);
+                    DebugStub.Assert(IoResult.Success == r);
+                } while ((uint)(value >> 32) != hi);
+                return value;
+            }
+        }
+
+        internal uint MainCounterValue32
+        {
+            [NoHeapAllocation]
+            get {
+                uint value;
+                IoResult r = region.Read32NoThrow(MainCounterOffset,
+                                                  out value);
+                DebugStub.Assert(IoResult.Success == r);
+                return value;
+            }
+        }
+
+        [NoHeapAllocation]
+        internal void ClearInterrupt(uint timer)
+        {
+            if (timer <= MaxCounterIndex) {
+
+                uint value;
+                IoResult result = region.Read32NoThrow(0x20, out value);
+                DebugStub.Assert(IoResult.Success == result);
+                value = value & ~(1u << (int)timer);
+
+                result = region.Write32NoThrow(0x20, value);
+                DebugStub.Assert(IoResult.Success == result);
+            }
+        }
+
+        [NoHeapAllocation]
+        private int TimerOffset(uint timer)
+        {
+            return 0x100 + 0x20 * (int)timer;
+        }
+
+        internal void DisableInterrupt(uint timer)
+        {
+            if (timer <= MaxCounterIndex) {
+                uint m = region.Read32(TimerOffset(timer));
+                m &= ~HpetTimerConf.InterruptEnable;
+                region.Write32(TimerOffset(timer), m);
+            }
+        }
+
+        internal static IDevice CreateDevice(IoConfig config, string name)
+        {
+            PnpConfig pnpConfig = config as PnpConfig;
+            if (pnpConfig == null) {
+                return null;
+            }
+
+            IoMemoryRange imr = config.DynamicRanges[0] as IoMemoryRange;
+            if (imr == null) {
+                return null;
+            }
+
+            int imrBytes = (int)imr.Length.ToUInt32();
+            if (imrBytes < Hpet.MinRegionBytes) {
+                DebugStub.Write(
+                    "HPET failed as region too small ({0} bytes).\n",
+                    __arglist(imrBytes));
+                return null;
+            }
+
+            Hpet hpet = new Hpet(pnpConfig);
+            HalDevices.SwitchToHpetClock(hpet);
+            return hpet;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/HpetClock.cs b/base/Kernel/Singularity.Hal.ApicPC/HpetClock.cs
new file mode 100644
index 0000000..ceccbb5
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/HpetClock.cs
@@ -0,0 +1,90 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HpetClock.cs
+//
+//
+//  Note:
+//
+//  HalClock is expected to call PMClock's time maintenance
+//  functions with a spin lock held.
+//
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Hal.Acpi;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    [ CLSCompliant(false) ]
+    internal class HpetClock
+    {
+        Hpet     hpet;
+        SpinLock masterLock;
+        ulong    kernelTicksAccumulated;
+        uint     hpetLastUpdate;
+
+        internal HpetClock(Hpet timer, ulong initialKernelTicks)
+        {
+            this.hpet                   = timer;
+            this.masterLock             = new SpinLock();
+            this.hpetLastUpdate         = hpet.MainCounterValue32;
+            this.kernelTicksAccumulated = initialKernelTicks;
+        }
+
+        internal Hpet Hpet
+        {
+            get { return hpet; }
+        }
+
+        [NoHeapAllocation]
+        private uint DeltaHpetTicksToKernelTicks(uint delta)
+        {
+            // Kernel ticks are every 100ns seconds
+            ulong t = delta * (ulong)hpet.PeriodFs;
+            t /= 100 * 1000 * 1000;
+            return (uint) t;
+        }
+
+        [NoHeapAllocation]
+        internal ulong GetKernelTicks()
+        {
+            uint now = hpet.MainCounterValue32;
+            return (this.kernelTicksAccumulated +
+                    DeltaHpetTicksToKernelTicks(now - this.hpetLastUpdate)
+                    );
+        }
+
+        [NoHeapAllocation]
+        internal void Update()
+        {
+            uint now = hpet.MainCounterValue32;
+            this.kernelTicksAccumulated +=
+                DeltaHpetTicksToKernelTicks(now - this.hpetLastUpdate);
+            this.hpetLastUpdate = now;
+        }
+
+        [NoHeapAllocation]
+        public static uint UpdateFrequency(Hpet hpet)
+        {
+            // Compute RTC clock frequency (2^n Hz) to avoid a
+            // wrap between clock interrupts.
+            ulong wrapPeriodUs =
+                ((ulong)0xffffffffu * hpet.PeriodFs) / (1000000 * 1000);
+            uint wrapFrequency =
+                1 + (uint) ((long)1000000 / (1 + wrapPeriodUs));
+            uint updateFrequency = 2;   // Min freq of RTC
+            while (updateFrequency < 4 * wrapFrequency) {
+                updateFrequency *= 2;
+            }
+            return updateFrequency;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/IoApic.cs b/base/Kernel/Singularity.Hal.ApicPC/IoApic.cs
new file mode 100644
index 0000000..220b424
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/IoApic.cs
@@ -0,0 +1,478 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoApic.cs
+//
+//  Note:
+//    Intel MP Specification 1.4
+//    82093AA I/O Advanced Programmable Interrupt Controller
+
+namespace Microsoft.Singularity.Hal
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity.Hal.Acpi;
+
+    public enum IoBits : ushort
+    {
+        IrqMask          = 0x0100,
+        TriggerModeMask  = 0x0080,
+            TriggerModeLevel = TriggerModeMask,
+            TriggerModeEdge  = 0,
+        RemoteIRR        = 0x0040,
+        IntPolMask       = 0x0020,
+            IntPolActiveLow  = IntPolMask,
+            IntPolActiveHigh = 0,
+        DeliveryStatus   = 0x0010,
+        DstMask          = 0x0008,         // Destination Mask
+            DstLogical       = DstMask,
+            DstPhysical      = 0,
+        DelModMask       = 0x0007,         // Delivery Mode Mask
+            DelModFixed      = 0x0000,
+            DelModLowest     = 0x0001,
+            DelModSMI        = 0x0002,
+            DelModReserved1  = 0x0003,
+            DelModNMI        = 0x0004,
+            DelModINIT       = 0x0005,
+            DelModReserved2  = 0x0006,
+            DelModExtINT     = 0x0007,
+    };
+
+    [CLSCompliant(false)]
+    public struct RedirectionEntry
+    {
+        public byte        Destination;
+        public IoBits      IoBits;
+        public byte        InterruptVector;
+
+        [NoHeapAllocation]
+        public RedirectionEntry(byte   destination,
+                                IoBits ioBits,
+                                byte   interruptVector)
+        {
+            this.Destination     = destination;
+            this.IoBits          = ioBits;
+            this.InterruptVector = interruptVector;
+        }
+
+        [NoHeapAllocation]
+        public RedirectionEntry(byte        destination,
+                                ushort      ioBits,
+                                byte        interruptVector)
+        {
+            this.Destination     = destination;
+            this.IoBits          = (IoBits)ioBits;
+            this.InterruptVector = interruptVector;
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class IoApic
+    {
+        private const uint MaskBit   = 1 << 16;
+        private const uint RedHiBase = 0x11;
+        private const uint RedLoBase = 0x10;
+
+        IoMemory ioRegSel;
+        IoMemory ioWin;
+        uint     entries;
+
+        bool     irqRestore;
+        SpinLock ioLock;
+
+        public IoApic(UIntPtr memoryBase)
+        {
+            ioRegSel = IoMemory.MapPhysicalMemory(memoryBase,
+                                                  new UIntPtr(4u), true, true);
+            ioWin    = IoMemory.MapPhysicalMemory(memoryBase + new UIntPtr(0x10u),
+                                                  new UIntPtr(4u), true, true);
+
+            entries = ((ReadRegister(1) & 0xff0000u) >> 16) + 1;
+
+            for (uint i = 0; i < entries; i++)
+            {
+                SetEntryMask(i, true);
+            }
+
+            ioLock = new SpinLock();
+        }
+
+        [NoHeapAllocation]
+        private void AcquireLock()
+        {
+            irqRestore = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            ioLock.Acquire();
+#endif // SINGULARITY_MP
+        }
+
+        [NoHeapAllocation]
+        private void ReleaseLock()
+        {
+#if SINGULARITY_MP
+            ioLock.Release();
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(irqRestore);
+        }
+
+        [ Conditional("DEBUG_APIC") ]
+        [NoHeapAllocation]
+        internal void DumpRedirectionEntries()
+        {
+            AcquireLock();
+            try
+            {
+                for (uint i = 0; i < entries; i++)
+                {
+                    uint hi = ReadRegister(RedHiBase + i * 2);
+                    uint lo = ReadRegister(RedLoBase + i * 2);
+                    Tracing.Log(Tracing.Debug,
+                                "IoApic Entry {0:x2} {1:x8} {2:x8}",
+                                i, hi, lo);
+                }
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+            }
+
+        [NoHeapAllocation]
+        private void RangeCheck(uint value, uint max, string name)
+        {
+            if (value > max)
+            {
+                DebugStub.Break();
+            }
+        }
+
+        [NoHeapAllocation]
+        private uint ReadRegister(uint offset)
+        {
+            RangeCheck(offset, 0x3fu, "offset");
+            DebugStub.Assert(Processor.InterruptsDisabled());
+
+            IoResult result = ioRegSel.Write32NoThrow(0, offset);
+            DebugStub.Assert(IoResult.Success == result);
+
+            uint outValue;
+            result = ioWin.Read32NoThrow((byte)0, out outValue);
+            DebugStub.Assert(IoResult.Success == result);
+            return outValue;
+        }
+
+        [NoHeapAllocation]
+        private void WriteRegister(uint offset, uint value)
+        {
+            RangeCheck(offset, 0x3fu, "offset");
+            DebugStub.Assert(Processor.InterruptsDisabled());
+
+            IoResult result = ioRegSel.Write32NoThrow(0, offset);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = ioWin.Write32NoThrow((byte)0, value);
+            DebugStub.Assert(IoResult.Success == result);
+        }
+
+        [NoHeapAllocation]
+        public byte GetId()
+        {
+            AcquireLock();
+            try
+            {
+                return (byte)((ReadRegister(0) & 0x0f000000u) >> 24);
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public void SetId(byte id)
+        {
+            AcquireLock();
+            try
+            {
+                RangeCheck(id, 0x0fu, "id");
+                uint reserved = ReadRegister(0) & 0xf0ffffffu;
+                WriteRegister(0, reserved | ((uint)id << 24));
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public byte GetVersion()
+        {
+            AcquireLock();
+            try
+            {
+                return (byte)ReadRegister(1);
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public byte GetArbitrationId()
+        {
+            AcquireLock();
+            try
+            {
+                return (byte)((ReadRegister(2) & 0x0f000000u) >> 24);
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public void SetArbitrationId(byte id)
+        {
+            RangeCheck(id, 0x0fu, "id");
+
+            AcquireLock();
+            try
+            {
+                uint reserved = ReadRegister(0) & 0xf0ffffffu;
+                WriteRegister(2, reserved | ((uint)id << 24));
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        public uint RedirectionEntryCount
+        {
+            [NoHeapAllocation]
+            get { return entries; }
+        }
+
+        [NoHeapAllocation]
+        public RedirectionEntry GetRedirectionEntry(uint index)
+        {
+            AcquireLock();
+            try
+            {
+                RangeCheck(index, 24u, "index");
+
+                uint hi = ReadRegister(RedHiBase + index * 2);
+                uint lo = ReadRegister(RedLoBase + index * 2);
+
+                return new RedirectionEntry((byte) (hi >> 24),
+                                            (ushort) ((lo >> 8) & 0x1ff),
+                                            (byte) (lo & 0xff));
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public void SetRedirectionEntry(uint index, ref RedirectionEntry entry)
+        {
+            AcquireLock();
+            try
+            {
+                RangeCheck(index, 24u, "index");
+
+                WriteRegister(RedLoBase + index * 2, MaskBit);
+
+                uint hi = ReadRegister(RedHiBase + index * 2) & 0xffffffu;
+                hi |= ((uint)entry.Destination) << 24;
+                WriteRegister(RedHiBase + index * 2, hi);
+
+                uint lo = ReadRegister(RedLoBase + index * 2) & 0x1ffffu;
+                lo |= ((uint)entry.IoBits) << 8;
+                lo |= (uint)entry.InterruptVector;
+                WriteRegister(RedLoBase + index * 2, lo);
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public void SetEntryMask(uint index, bool masked)
+        {
+            AcquireLock();
+            try
+            {
+                uint lo = ReadRegister(RedLoBase + index * 2) & ~MaskBit;
+                if (masked)
+                {
+                    lo |= MaskBit;
+                }
+                WriteRegister(RedLoBase + index * 2, lo);
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        [NoHeapAllocation]
+        public bool GetEntryMask(uint index)
+        {
+            AcquireLock();
+            try
+            {
+                uint lo = ReadRegister(RedLoBase + index * 2) & MaskBit;
+                return lo == MaskBit;
+            }
+            finally
+            {
+                ReleaseLock();
+            }
+        }
+
+        internal static IoApic [] CreateIOApics()
+        {
+            // Prefer to get the list of IoApics from the MADT
+            Madt madt = AcpiTables.GetMadt();
+            if (madt != null)
+            {
+                ArrayList alist = madt.GetIoApics();
+                if (alist.Count > 0)
+                {
+                    IoApic [] apics = new IoApic[alist.Count];
+                    for (int i=0; i<alist.Count; i++)
+                    {
+                        // Have to convert from a ...Hal.Acpi.IoApic into a Hal.IoApic:
+                        Microsoft.Singularity.Hal.Acpi.IoApic sourceEntry = (Microsoft.Singularity.Hal.Acpi.IoApic) alist[i];
+                        IoApic destEntry = new IoApic(sourceEntry.Address);
+                        destEntry.SetId(sourceEntry.Id);
+                        apics[i] = destEntry;
+                    }
+                    return apics;
+                }
+            }
+
+            // Otherwise, create from Mp tables
+            return CreateFromMpResources();
+        }
+
+        internal static IoApic [] CreateFromMpResources()
+        {
+            ArrayList ioApicEntries = MpResources.IoApicEntries;
+
+            if (ioApicEntries == null)
+            {
+                DebugStub.Print("No I/O APICs found\n");
+                return null;
+            }
+
+            // Scan IoApic entries and remove those that are marked unusable
+            int usable = ioApicEntries.Count;
+            foreach (MpIoApicEntry entry in ioApicEntries)
+            {
+                if (((int)entry.Flags & 0x1) != 0x1) usable--;
+            }
+
+            if (usable == 0)
+            {
+                DebugStub.Print("No usable I/O APICs found\n");
+                return null;
+            }
+
+            IoApic [] apics = new IoApic[usable];
+            int i = 0;
+            foreach (MpIoApicEntry entry in ioApicEntries)
+            {
+                if (((int)entry.Flags & 0x1) != 0x1)
+                    continue;
+
+                apics[i] = new IoApic(new UIntPtr(entry.BaseAddress));
+                apics[i].SetId(entry.Id);
+                i++;
+            }
+            return apics;
+        }
+    }
+
+    public class IoApicInspector
+    {
+        public static void DescribeModMask(IoBits ioBits)
+        {
+            ioBits = (IoBits) ((ushort)ioBits & (ushort)IoBits.DelModMask);
+            switch (ioBits)
+            {
+                case IoBits.DelModFixed:
+                    DebugStub.Print("Fixed\n");
+                    return;
+                case IoBits.DelModLowest:
+                    DebugStub.Print("Lowest\n");
+                    return;
+                case IoBits.DelModSMI:
+                    DebugStub.Print("SMI\n");
+                    return;
+                case IoBits.DelModReserved1:
+                    DebugStub.Print("Reserved1\n");
+                    return;
+                case IoBits.DelModNMI:
+                    DebugStub.Print("NMI\n");
+                    return;
+                case IoBits.DelModINIT:
+                    DebugStub.Print("INIT\n");
+                    return;
+                case IoBits.DelModReserved2:
+                    DebugStub.Print("Reserved2\n");
+                    return;
+                case IoBits.DelModExtINT:
+                    DebugStub.Print("ExtINT\n");
+                    return;
+                default:
+                    DebugStub.Print("ERROR\n");
+                    return;
+            }
+        }
+
+        public static void PrintApic(IoApic ioApic)
+        {
+            DebugStub.Print("Io Apic\n");
+            DebugStub.Print("  Id: {0:x2} Version: {1:x4} ArbitrationId: {2:x2}\n",
+                            __arglist(
+                                ioApic.GetId(),
+                                ioApic.GetVersion(),
+                                ioApic.GetArbitrationId()));
+
+            for (uint i = 0; i < ioApic.RedirectionEntryCount; i++)
+            {
+                RedirectionEntry e = ioApic.GetRedirectionEntry(i);
+                IoBits ib = (IoBits) ((int)e.IoBits & ~(int)IoBits.DelModMask);
+
+                DebugStub.Print("  IoRedTbl[{0:x2}]" +
+                                "Dst: {1:x2} IntVec: {2:x2} Control: {3} {4} {5} {6} {7} {8}" +
+                                "Delivery Mode ",
+                                __arglist(
+                                    i,
+                                    e.Destination,
+                                    e.InterruptVector,
+                                    ((ib & IoBits.DstLogical) != 0) ? "Logical" : "Physical",
+                                    ((ib & IoBits.IrqMask) != 0) ? "Masked" : "Unmasked",
+                                    ((ib & IoBits.TriggerModeMask) != 0) ? "Level" : "Edge",
+                                    ((ib & IoBits.RemoteIRR) != 0) ? "Accept" : "Recv",
+                                    ((ib & IoBits.IntPolMask) != 0) ? "Hi active" : "Lo active",
+                                    ((ib & IoBits.DeliveryStatus) != 0) ? "Pending" : "Idle"));
+                DescribeModMask(e.IoBits);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/MpHalClock.cs b/base/Kernel/Singularity.Hal.ApicPC/MpHalClock.cs
new file mode 100644
index 0000000..2dfb45c
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/MpHalClock.cs
@@ -0,0 +1,140 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalMpClock.cs
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalClock.csi
+//
+//    For now we just read the time from the HPET or PMTimer.  Both of these
+//  use a spinlock to protect the relevant state.  The PMTimer is incredibly
+//  expensive.
+
+
+#if !SINGULARITY_MP
+#error "This file is only for MP builds."
+#endif
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Hal.Acpi;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    public class HalClock
+    {
+        Apic      apic;
+        PMClock   pmClock;
+        RTClock   rtClock;
+        HpetClock hpetClock;
+        SpinLock  spinLock;
+
+        internal HalClock(Apic apic, RTClock rtClock, PMClock pmClock)
+        {
+            this.apic      = apic;
+            this.rtClock   = rtClock;
+            this.pmClock   = pmClock;
+            this.hpetClock = null;
+            this.spinLock  = new SpinLock();
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private void AcquireLock()
+        {
+            this.spinLock.Acquire();
+        }
+
+        [Conditional("SINGULARITY_MP")]
+        [NoHeapAllocation]
+        private void ReleaseLock()
+        {
+            this.spinLock.Release();
+        }
+
+        [NoHeapAllocation]
+        public long GetKernelTicks()
+        {
+            bool en = Processor.DisableInterrupts();
+            this.AcquireLock();
+            try {
+                if (this.hpetClock == null) {
+                    return (long) pmClock.GetKernelTicks();
+                }
+                else {
+                    return (long) hpetClock.GetKernelTicks();
+                }
+            }
+            finally {
+                this.ReleaseLock();
+                Processor.RestoreInterrupts(en);
+            }
+        }
+
+        internal byte Interrupt
+        {
+            [NoHeapAllocation]
+            get { return rtClock.Interrupt; }
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            bool en = Processor.DisableInterrupts();
+            this.AcquireLock();
+            try {
+                if (hpetClock == null) {
+                    pmClock.Update();
+                }
+                else {
+                    hpetClock.Update();
+                }
+                rtClock.ClearInterrupt();
+            }
+            finally {
+                this.ReleaseLock();
+                Processor.RestoreInterrupts(en);
+            }
+        }
+
+        internal void SwitchToHpetClock(HpetClock hc)
+        {
+            // Change rt clock interrupt frequency to appropriate
+            // rate for HPET main clock.
+            bool en = Processor.DisableInterrupts();
+            this.AcquireLock();
+            try {
+                rtClock.SetFrequency(HpetClock.UpdateFrequency(hc.Hpet));
+                hpetClock = hc;
+            }
+            finally {
+                this.ReleaseLock();
+                Processor.RestoreInterrupts(en);
+            }
+            DebugStub.Print("Hal switching to HpetClock.\n");
+        }
+
+        [NoHeapAllocation]
+        public void CpuResumeFromHaltEvent()
+        {
+        }
+
+        [NoHeapAllocation]
+        public long GetRtcTime()
+        {
+            return rtClock.GetBootTime() + GetKernelTicks();
+        }
+
+        public void SetRtcTime(long newRtcTime)
+        {
+            rtClock.SetRtcTime(newRtcTime, GetKernelTicks());
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/MpResources.cs b/base/Kernel/Singularity.Hal.ApicPC/MpResources.cs
new file mode 100644
index 0000000..f40df29
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/MpResources.cs
@@ -0,0 +1,535 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MpResources.cs
+//
+//  Note:
+//    Intel MP Specification 1.4
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity;
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+
+    [CLSCompliant(false)]
+    internal class MpFloatingPointer
+    {
+        private const uint Signature = 0x5f504d5f;
+
+        internal uint ConfTableBase;
+        internal byte Revision;
+        internal byte [] Feature;
+
+        internal byte ConfigurationType
+        {
+            get { return Feature[0]; }
+        }
+
+        internal bool MpConfTablePresent
+        {
+            get { return Feature[0] == 0; }
+        }
+
+        internal bool ImcrPresent
+        {
+            get { return (Feature[1] & 0x80) != 0; }
+        }
+
+        internal bool MultipleClockSources
+        {
+            get { return (Feature[1] & 0x40) != 0; }
+        }
+
+        internal static MpFloatingPointer Parse(IoMemory region)
+        {
+            uint signature = region.Read32(0);
+            if (signature != Signature) {
+                return null;
+            }
+
+            int length = region.Read8(8) * 16;
+            if (length != 16) {
+                return null;
+            }
+
+            byte checksum = 0;
+            for (int i = 0; i < length; i++) {
+                checksum += region.Read8((int) i);
+            }
+
+            if (checksum != 0) {
+                return null;
+            }
+
+            MpFloatingPointer m = new MpFloatingPointer();
+            m.ConfTableBase = region.Read32(4);
+            m.Revision      = region.Read8(9);
+            m.Feature       = new byte [5];
+            for (int i = 0; i < m.Feature.Length; i++) {
+                m.Feature[i] = region.Read8(0xb + i);
+            }
+
+            return m;
+        }
+    }
+
+    [CLSCompliant(false)]
+    internal class MpConfTable
+    {
+        private const uint Signature   = 0x504d4350;
+        private const uint FixedLength = 0x2c;
+
+        internal ushort BaseTableLength;
+        internal byte   Revision;
+        internal uint   OemTableBase;
+        internal ushort OemTableSize;
+        internal ushort EntryCount;
+        internal uint   LocalApicBase;
+        internal ushort ExtendedTableLength;
+        internal byte   ExtendedTableChecksum;
+        internal string OemId;
+        internal string ProductId;
+
+        internal static MpConfTable Parse(IoMemory region)
+        {
+            if (region.Read32(0) != Signature) {
+                return null;
+            }
+
+            int  length = region.Read16(4);
+            DebugStub.Print("MP Conf Table length {0}\n", __arglist(length));
+
+#if NOTYET
+            byte checksum = 0;
+            for (int i = 0; i < length; i++) {
+                checksum += region.Read8(i);
+            }
+
+            if (checksum != 0) {
+                return null;
+            }
+#endif
+
+            MpConfTable confTable = new MpConfTable();
+            confTable.BaseTableLength       = region.Read16(4);
+            confTable.Revision              = region.Read8(7);
+            confTable.OemTableBase          = region.Read32(0x1c);
+            confTable.OemTableSize          = region.Read16(0x20);
+            confTable.EntryCount            = region.Read16(0x22);
+            confTable.LocalApicBase         = region.Read32(0x24);
+            confTable.ExtendedTableLength   = region.Read16(0x28);
+            confTable.ExtendedTableChecksum = region.Read8(0x2a);
+            confTable.OemId     = region.ReadAsciiZeroString(8, 8);
+            confTable.ProductId = region.ReadAsciiZeroString(0x10, 0x0c);
+            return confTable;
+        }
+    }
+
+    [CLSCompliant(false)]
+    internal class MpProcessorEntry
+    {
+        internal const byte EntryType = 0x00;
+        internal const int  Length    = 0x14;
+
+        internal byte LocalApicId;
+        internal byte LocalApicVersion;
+        internal byte CpuFlags;
+        internal uint CpuSignature;
+        internal uint FeatureFlags;
+
+        internal bool Enabled
+        {
+            get { return (CpuFlags & 0x01) != 0; }
+        }
+
+        internal bool BootStrapProcessor
+        {
+            get { return (CpuFlags & 0x02) != 0; }
+        }
+
+        [Conditional("MP_TABLE_DEBUG")]
+        internal void DebugPrint()
+        {
+            DebugStub.Print("CPU Apic Id {0:x2} Version {1:x2} CpuFlags {2:x2} " +
+                            "Signature {3:x8} Features {4:x8}\n",
+                            __arglist(
+                                LocalApicId,
+                                LocalApicVersion,
+                                CpuFlags,
+                                CpuSignature,
+                                FeatureFlags));
+        }
+
+        internal static MpProcessorEntry Parse(IoMemory region,
+                                               int      length,
+                                               ref int  offset)
+        {
+            Debug.Assert(length >= offset + Length);
+            Debug.Assert(region.Read8(offset + 0) == EntryType);
+
+            MpProcessorEntry e = new MpProcessorEntry();
+            e.LocalApicId      = region.Read8(offset + 1);
+            e.LocalApicVersion = region.Read8(offset + 2);
+            e.CpuFlags         = region.Read8(offset + 3);
+            e.CpuSignature     = region.Read32(offset + 4);
+            e.FeatureFlags     = region.Read32(offset + 8);
+            e.DebugPrint();
+            offset += Length;
+            return e;
+        }
+    }
+
+    internal enum BusType : byte
+    {
+        CBUS    = 0,
+        CBUSII  = 1,
+        EISA    = 2,
+        FUTURE  = 3,
+        INTERN  = 4,
+        ISA     = 5,
+        MBI     = 6,
+        MBII    = 7,
+        MCA     = 8,
+        MPI     = 9,
+        MPSA    = 10,
+        NUBUS   = 11,
+        PCI     = 12,
+        PCMCIA  = 13,
+        TC      = 14,
+        VL      = 15,
+        VME     = 16,
+        XPRESS  = 17,
+        LAST    = 17,
+        UNKNOWN = 255,
+    }
+
+    [CLSCompliant(false)]
+    internal class MpBusEntry
+    {
+        internal const byte EntryType = 0x01;
+        internal const int  Length    = 0x08;
+
+        // Bus type names 1-1 correspondence with BusType enum.
+        private static string [] busNames = new string [(int)BusType.LAST + 1]
+        {
+            "CBUS  ", "CBUSII", "EISA  ", "FUTURE", "INTERN", "ISA   ",
+            "MBI   ", "MBII  ", "MCA   ", "MPI   ", "MPSA  ", "NUBUS ",
+            "PCI   ", "PCMCIA", "TC    ", "VL    ", "VME   ", "XPRESS"
+        };
+
+        internal byte    BusId;
+        internal BusType BusType;
+
+        [Conditional("MP_TABLE_DEBUG")]
+        internal void DebugPrint()
+        {
+            DebugStub.Print("BusId {0:x2} BusType {1:x2}\n", __arglist(BusId, BusName));
+        }
+
+        internal string BusName
+        {
+            get
+            {
+                if (BusType == BusType.UNKNOWN) {
+                    return "UNKNOWN";
+                }
+                return busNames[(int)BusType];
+            }
+        }
+
+        internal static MpBusEntry Parse(IoMemory region,
+                                         int      length,
+                                         ref int  offset)
+        {
+            Debug.Assert(length >= offset + Length);
+            Debug.Assert(region.Read8(offset + 0) == EntryType);
+
+            MpBusEntry e = new MpBusEntry();
+            e.BusId      = region.Read8(offset + 1);
+            e.BusType    = BusType.UNKNOWN;
+
+            string name = region.ReadAsciiZeroString(offset + 2, 6);
+            e.BusType = BusType.UNKNOWN;
+
+            for (int i = 0; i <= (int)BusType.LAST; i++) {
+                if (name == busNames[i]) {
+                    e.BusType = (BusType)i;
+                    break;
+                }
+            }
+
+            e.DebugPrint();
+            offset += Length;
+            return e;
+        }
+    }
+
+    [CLSCompliant(false)]
+    internal class MpIoApicEntry
+    {
+        internal const byte EntryType = 0x02;
+        internal const int Length     = 0x08;
+
+        internal byte Id;
+        internal byte Version;
+        internal byte Flags;
+        internal uint BaseAddress;
+
+        internal bool Enabled { get { return (Flags & 0x01) == 0x01; } }
+
+        [Conditional("MP_TABLE_DEBUG")]
+        internal void DebugPrint()
+        {
+            DebugStub.Print("Id {0:x2} Version {1:x2} Flags {2:x2} BaseAddress {3:x8}\n",
+                            __arglist(Id, Version, Flags, BaseAddress));
+        }
+
+        internal static MpIoApicEntry Parse(IoMemory region,
+                                            int      length,
+                                            ref int  offset)
+        {
+            Debug.Assert(length >= offset + Length);
+            Debug.Assert(region.Read8(offset + 0) == EntryType);
+
+            MpIoApicEntry e = new MpIoApicEntry();
+            e.Id          = region.Read8(offset + 1);
+            e.Version     = region.Read8(offset + 2);
+            e.Flags       = region.Read8(offset + 3);
+            e.BaseAddress = region.Read32(offset + 4);
+            e.DebugPrint();
+            offset += Length;
+            return e;
+        }
+    }
+
+    internal enum InterruptType : byte
+    {
+        INT    = 0,
+        NMI    = 1,
+        SMI    = 2,
+        ExtINT = 3,
+    }
+
+    internal enum Polarity : ushort
+    {
+        Bus        = 0,
+        ActiveHigh = 1,
+        Reserved   = 2,
+        ActiveLow  = 3,
+    }
+
+    internal enum Trigger : ushort
+    {
+        Bus      = 0,
+        Edge     = 4,
+        Reserved = 8,
+        Level    = 12,
+    }
+
+    [CLSCompliant(false)]
+    internal class MpInterruptEntry
+    {
+        internal const byte IoEntryType    = 0x03;
+        internal const byte LocalEntryType = 0x04;
+        internal const int  Length         = 0x08;
+
+        internal byte   EntryType;
+        internal byte   Interrupt;
+        internal ushort Flags;
+        internal byte   BusId;
+        internal byte   BusIrq;
+        internal byte   ApicId;
+        internal byte   ApicLine;
+
+        internal bool ApicRedirect
+        {
+            get { return Interrupt == (byte)InterruptType.INT; }
+        }
+
+        internal Polarity PolarityType
+        {
+            get { return (Polarity) (Flags & 0x3); }
+        }
+
+        internal Trigger TriggerType
+        {
+            get { return (Trigger) (Flags & 0xc); }
+        }
+
+        [Conditional("MP_TABLE_DEBUG")]
+        internal void DebugPrint()
+        {
+            DebugStub.Print("{0} Interrupt {1:x2} Flags {2:x4} BusId {3:x2} " +
+                            "BusIrq {4:x2} ApicId {5:x2} ApicLine {6:x2}\n",
+                            __arglist(
+                                EntryType == IoEntryType ? "Io" : "Local",
+                                Interrupt,
+                                Flags,
+                                BusId,
+                                BusIrq,
+                                ApicId,
+                                ApicLine));
+        }
+
+        internal static MpInterruptEntry Parse(IoMemory region,
+                                             int      length,
+                                             ref int  offset)
+        {
+            Debug.Assert(length >= offset + Length);
+            byte entry = region.Read8(offset + 0);
+            Debug.Assert(entry == IoEntryType || entry == LocalEntryType);
+
+            MpInterruptEntry e = new MpInterruptEntry();
+            e.EntryType = entry;
+            e.Interrupt = region.Read8(offset + 1);
+            e.Flags     = region.Read16(offset + 2);
+            e.BusId     = region.Read8(offset + 4);
+            e.BusIrq    = region.Read8(offset + 5);
+            e.ApicId    = region.Read8(offset + 6);
+            e.ApicLine  = region.Read8(offset + 7);
+            e.DebugPrint();
+            offset += Length;
+            return e;
+        }
+    }
+
+    [CLSCompliant(false)]
+    internal class MpResources
+    {
+        static IoMemory mpFloatRegion;
+        static IoMemory mpConfTableRegion;
+
+        internal static MpFloatingPointer FloatingPointer;
+        internal static MpConfTable       ConfTable;
+
+        internal static ArrayList ProcessorEntries;
+        internal static ArrayList BusEntries;
+        internal static ArrayList IoApicEntries;
+        internal static ArrayList IoInterruptEntries;
+        internal static ArrayList LocalInterruptEntries;
+
+        internal static void Parse(IoMemory region,
+                                 int      length,
+                                 uint     entryCount)
+        {
+            int offset = 0;
+            for (int i = 0; i < entryCount; i++) {
+                switch (region.Read8(offset))
+                {
+                    case MpProcessorEntry.EntryType:
+                        ProcessorEntries.Add(
+                            MpProcessorEntry.Parse(region, length, ref offset)
+                            );
+                        break;
+                    case MpBusEntry.EntryType:
+                        BusEntries.Add(
+                            MpBusEntry.Parse(region, length, ref offset)
+                            );
+                        break;
+                    case MpIoApicEntry.EntryType:
+                        IoApicEntries.Add(
+                            MpIoApicEntry.Parse(region, length, ref offset)
+                            );
+                        break;
+                    case MpInterruptEntry.IoEntryType:
+                        IoInterruptEntries.Add(
+                            MpInterruptEntry.Parse(region, length, ref offset)
+                            );
+                        break;
+                    case MpInterruptEntry.LocalEntryType:
+                        LocalInterruptEntries.Add(
+                            MpInterruptEntry.Parse(region, length, ref offset)
+                            );
+                        break;
+                }
+            }
+        }
+
+        private static UIntPtr GetMpFloatBase()
+        {
+            unsafe
+            {
+                return new UIntPtr (BootInfo.GetBootInfo().MpFloat32);
+            }
+        }
+
+        internal static MpBusEntry GetBusEntryById(byte id)
+        {
+            foreach (MpBusEntry be in BusEntries) {
+                if (be.BusId == id) {
+                    return be;
+                }
+            }
+            return null;
+        }
+
+        internal static void ParseMpTables()
+        {
+            UIntPtr mpFloat = GetMpFloatBase();
+            if (mpFloat == UIntPtr.Zero) {
+                DebugStub.Print("MP Floating Pointer Structure not found.\n");
+                return;
+            }
+
+            mpFloatRegion =
+                IoMemory.MapPhysicalMemory(mpFloat, new UIntPtr(16), true, false);
+
+            FloatingPointer = MpFloatingPointer.Parse(mpFloatRegion);
+            if (FloatingPointer == null) {
+                DebugStub.Print("Failed to parse MP Floating Pointer " +
+                                "Structure.\n");
+                return;
+            }
+
+            if (FloatingPointer.MpConfTablePresent) {
+                mpConfTableRegion = IoMemory.MapPhysicalMemory(
+                    new UIntPtr(FloatingPointer.ConfTableBase),
+                    new UIntPtr(0x2c), true, false);
+
+                DebugStub.Print("Found MP Conf Table\n");
+
+                ConfTable = MpConfTable.Parse(mpConfTableRegion);
+                if (ConfTable == null) {
+                    DebugStub.Print("Failed to parse MP Configuration table.\n");
+                }
+
+                IoMemory mpResourceRegion =
+                    IoMemory.MapPhysicalMemory(
+                        new UIntPtr(FloatingPointer.ConfTableBase + 0x2c),
+                        new UIntPtr(ConfTable.BaseTableLength - 0x2c),
+                        true, false);
+                DebugStub.Print("Parsing MP Conf Table Resources\n");
+                MpResources.Parse(mpResourceRegion,
+                                  ConfTable.BaseTableLength - 0x2c,
+                                  ConfTable.EntryCount);
+            }
+            else
+            {
+                DebugStub.Print("MP Configuration table not present.\n");
+                DebugStub.Print("MP Floating Pointer features: " +
+                                "{0:x8} {1:x8} {2:x8} {3:x8} {4:x8}\n",
+                                __arglist(
+                                    FloatingPointer.Feature[0],
+                                    FloatingPointer.Feature[1],
+                                    FloatingPointer.Feature[2],
+                                    FloatingPointer.Feature[3],
+                                    FloatingPointer.Feature[4]));
+            }
+        }
+
+        static MpResources()
+        {
+            ProcessorEntries      = new ArrayList();
+            BusEntries            = new ArrayList();
+            IoApicEntries         = new ArrayList();
+            IoInterruptEntries    = new ArrayList();
+            LocalInterruptEntries = new ArrayList();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/PMClock.cs b/base/Kernel/Singularity.Hal.ApicPC/PMClock.cs
new file mode 100644
index 0000000..7fb1903
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/PMClock.cs
@@ -0,0 +1,88 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PMClock.cs
+//
+//
+//  Note:
+//
+//  HalClock is expected to call PMClock's time maintenance
+//  functions with a spin lock held.
+
+namespace Microsoft.Singularity.Hal
+{
+    using Microsoft.Singularity.Hal.Acpi;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    [ CLSCompliant(false) ]
+    internal class PMClock
+    {
+        PMTimer pmTimer;
+        ulong   kernelTicksTotal;
+        ulong   pmResidual;
+        uint    pmLastUpdate;
+
+        internal PMClock(PMTimer timer)
+        {
+            this.pmTimer          = timer;
+            this.kernelTicksTotal = 0;
+            this.pmResidual       = 0;
+            this.pmLastUpdate     = pmTimer.Value;
+        }
+
+        [NoHeapAllocation]
+        private static ulong PMTicksToKernelTicks(ulong pmTicks)
+        {
+            // REVIEW: Does this need to be a ulong?
+            //
+            // PM frequency is 3579545Hz.  Kernel tick frequency is 10MHz.
+            // The conversion is:
+            // kTicks = pmTicks * 10000000 / 3579545
+            //        = pmTicks * (2 + 0xcb2cb8bed / 0x1000000000)
+            //        = pmTicks * (0x2cb / 0x100 + 0x2cb / 0x100000 +
+            //                     0x8bed / 0x1000000000)
+            ulong tmp = pmTicks * 0x2cb;
+            return (tmp >> 8) + (tmp >> 20) + ((pmTicks * 0x8bed) >> 36);
+        }
+
+        [NoHeapAllocation]
+        private static uint PmDeltaTicks(uint pmNow, uint pmLast)
+        {
+            // We unconditionally round down to 24-bits as
+            // values from PM timer may be 24-bit or 32-bit.
+            return (pmNow - pmLast) & 0xffffff;
+        }
+
+        [NoHeapAllocation]
+        internal ulong GetKernelTicks()
+        {
+            uint pmNow   = pmTimer.Value;
+            uint pmDelta = PmDeltaTicks(pmNow, this.pmLastUpdate);
+            return this.kernelTicksTotal +
+                PMTicksToKernelTicks(this.pmResidual + pmDelta);
+        }
+
+        [NoHeapAllocation]
+        internal void Update()
+        {
+            uint pmNow = pmTimer.Value;
+            this.pmResidual += PmDeltaTicks(pmNow, this.pmLastUpdate);
+            // Transfer time from residual to accumulated
+            // time in one second intervals since there is
+            // an integral relationship between the two.
+            while (this.pmResidual >= PMTimer.FrequencyHz) {
+                this.kernelTicksTotal += 10000000; // Kernel tick freq
+                this.pmResidual       -= PMTimer.FrequencyHz;
+            }
+            this.pmLastUpdate = pmNow;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/Pic.cs b/base/Kernel/Singularity.Hal.ApicPC/Pic.cs
new file mode 100644
index 0000000..0c70c41
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/Pic.cs
@@ -0,0 +1,193 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Pic.cs
+//
+//  Note:
+//    http://home.ozonline.com.au/davmac/davpage/PIC.html
+//
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Hal
+{
+    [DriverCategory]
+    [Signature("/pnp/PNP0000")]
+    public sealed class PicResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x0020, Length = 0x02)]
+        public IoPortRange port1;
+
+        [IoPortRange(1, Default = 0x00a0, Length = 0x02)]
+        public IoPortRange port2;
+    }
+
+    [ CLSCompliant(false) ]
+    public sealed class Pic
+    {
+        public const byte PIC_VECTORS = 16;
+
+        private IoPort pic0CtrlPort;
+        private IoPort pic0MaskPort;
+        private IoPort pic1CtrlPort;
+        private IoPort pic1MaskPort;
+        private byte   baseVector;
+
+        // Constants for PIC interrupt vectors.
+
+        internal Pic(PnpConfig config)
+        {
+            // /pnp/08/00/01/PNP0000 0003 cfg dis
+            // I/O Port inf=01 min=0020 max=0020 aln=01 len=02 0020..0021
+            // I/O Port inf=01 min=00a0 max=00a0 aln=01 len=02 00a0..00a1
+            // IRQ mask=0004 type=79
+
+            // Range[0]: 0x20; // PIC0
+            // Range[1]: 0xA0; // PIC1
+
+            pic0CtrlPort = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(0, 1, Access.ReadWrite);
+            pic0MaskPort = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(1, 1, Access.ReadWrite);
+            pic1CtrlPort = ((IoPortRange)config.DynamicRanges[1])
+                .PortAtOffset(0, 1, Access.ReadWrite);
+            pic1MaskPort = ((IoPortRange)config.DynamicRanges[1])
+                .PortAtOffset(1, 1, Access.ReadWrite);
+        }
+
+        public byte Initialize(byte baseVector)
+        {
+            this.baseVector = baseVector;
+
+            // Set ICW1 (must be followed by ICW2, ICW3, and ICW4).
+            //  00010001b - 8-byte,cascaded,triggered,w/ICW4
+            pic1CtrlPort.Write8(0x11);
+            pic0CtrlPort.Write8(0x11);
+
+            // ICW2
+            pic1MaskPort.Write8((byte)(baseVector + 8));
+            pic0MaskPort.Write8(baseVector);
+
+            // ICW3
+            pic1MaskPort.Write8(0x02); // Cascaded interrupt number
+            pic0MaskPort.Write8(0x04); // Cascaded interrupt bit.
+
+            // ICW4
+            pic1MaskPort.Write8(1);
+            pic0MaskPort.Write8(1);
+
+            // OCW2 - EOI
+            pic1CtrlPort.Write8(0x20);
+            pic0CtrlPort.Write8(0x20);
+
+            MaskAll();
+            DumpRegisters();
+
+            pic1CtrlPort.Write8(0x20);
+            pic0CtrlPort.Write8(0x20);
+
+            MaskAll();
+            DumpRegisters();
+            MaskAll();
+
+            // OCW2 - EOI
+            pic1CtrlPort.Write8(0x20);
+            pic0CtrlPort.Write8(0x20);
+
+            return PIC_VECTORS;
+        }
+
+        public void Initialize()
+        {
+            this.Initialize(0x60);
+            DumpRegisters();
+        }
+
+        [NoHeapAllocation]
+        public void AckIrq(byte irq)
+        {
+            DumpRegisters();
+
+#if DEBUG_INTERRUPTS
+            DebugStub.Print("Int{0:x2}  Acked, Mask={1:x8}\n",
+                            __arglist(irq + baseVector, irqMask));
+#endif
+
+            // Quiet the interrupt controller.
+            IoResult result;
+            if (irq >= 8) {
+                result = pic1CtrlPort.Write8NoThrow(0x20);
+                DebugStub.Assert(IoResult.Success == result);
+            }
+            result = pic0CtrlPort.Write8NoThrow(0x20);
+            DebugStub.Assert(IoResult.Success == result);
+
+            DumpRegisters();
+        }
+
+        [ Conditional("DEBUG_INTERRUPTS") ]
+        [NoHeapAllocation]
+        public void DumpRegisters()
+        {
+            byte irr0, isr0, irr1, isr1;
+            IoResult result;
+
+            // OCW3  - read IRR
+            result = pic0CtrlPort.Write8NoThrow(0x04 | 0x02);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic0CtrlPort.Read8NoThrow(out irr0);
+            DebugStub.Assert(IoResult.Success == result);
+
+            // OCW3  - read ISR
+            result = pic0CtrlPort.Write8NoThrow(0x04 | 0x03);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic0CtrlPort.Read8NoThrow(out isr0);
+            DebugStub.Assert(IoResult.Success == result);
+
+            // OCW3  - read IRR
+            result = pic1CtrlPort.Write8NoThrow(0x04 | 0x02);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic1CtrlPort.Read8NoThrow(out irr1);
+            DebugStub.Assert(IoResult.Success == result);
+
+            // OCW3  - read ISR
+            result = pic1CtrlPort.Write8NoThrow(0x04 | 0x03);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic1CtrlPort.Read8NoThrow(out isr1);
+            DebugStub.Assert(IoResult.Success == result);
+
+            // Get mask state
+            byte mask0, mask1;
+            result = pic0MaskPort.Read8NoThrow(out mask0);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic1MaskPort.Read8NoThrow(out mask1);
+            DebugStub.Assert(IoResult.Success == result);
+
+            DebugStub.Print("PIC IRR: {0:x2}/{1:x2} ISR: {2:x2}/{3:x2} Mask {4:x2}/{5:x2}\n",
+                            __arglist(irr0, irr1, isr0, isr1, mask0, mask1));
+        }
+
+        public void Finalize()
+        {
+        }
+
+        private void MaskAll()
+        {
+            pic1MaskPort.Write8(0xff);
+            pic0MaskPort.Write8(0xff);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/RTClock.cs b/base/Kernel/Singularity.Hal.ApicPC/RTClock.cs
new file mode 100644
index 0000000..a4140c7
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/RTClock.cs
@@ -0,0 +1,386 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RTClock.cs
+//
+//  Useful reference URLs:
+//    http://developer.intel.com/design/archives/periphrl/index.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/7203.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/23124406.htm
+//    http://www.cebix.net/downloads/bebox/bq3285.pdf
+//
+
+//#define SAMPLE_PC
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Hal
+{
+    [DriverCategory]
+    [Signature("/pnp/PNP0B00")]
+    public sealed class RtcResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x0070, Length = 0x02)]
+        public IoPortRange port1;
+
+        [IoIrqRange(1, Default = 0x08)]
+        public IoIrqRange irq1;
+    }
+
+    /// <remarks>
+    /// Class <c>RTClock</c> represents the system
+    /// Real-Time Clock.  RTC chips in PCs are based on the
+    /// Motorola MC146818A.  It provides timing resolution
+    /// of 1 second, but can generate periodic interrupts
+    /// more frequently.
+    /// </remarks>
+    [ CLSCompliant(false) ]
+    public sealed class RTClock
+    {
+        // Data registers
+        private const byte DS1287_SECONDS       = 0x00;
+        private const byte DS1287_SECONDS_ALARM = 0x01;
+        private const byte DS1287_MINUTES       = 0x02;
+        private const byte DS1287_MINUTES_ALARM = 0x03;
+        private const byte DS1287_HOURS         = 0x04;
+        private const byte DS1287_HOURS_ALARM   = 0x05;
+        private const byte DS1287_DAY_OF_WEEK   = 0x06; // 1 is Sunday
+        private const byte DS1287_DAY_OF_MONTH  = 0x07;
+        private const byte DS1287_MONTH         = 0x08;
+        private const byte DS1287_YEAR          = 0x09;
+        private const byte DS1287_USERDATA      = 0x32; // Randomly chosen user reg.
+        // Control registers and masks
+        private const byte DS1287_A             = 0x0a;
+        private const byte DS1287_A_UIP         = 0x80; // Update Cycle Status
+        private const byte DS1287_A_DIVON       = 0x20; // Osc and Freq Div on
+        private const byte DS1287_A_8KHZ        = 0x03;
+        private const byte DS1287_A_4KHZ        = 0x04;
+        private const byte DS1287_A_2KHZ        = 0x05;
+        private const byte DS1287_A_1KHZ        = 0x06;
+        private const byte DS1287_A_64HZ        = 0x0a;
+        private const byte DS1287_A_2HZ         = 0x0f;
+        private const byte DS1287_B             = 0x0b;
+        private const byte DS1287_B_UTI         = 0x80; // Update Transfer Inhibit
+        private const byte DS1287_B_PIE         = 0x40; // Periodic Interrupt Enable
+        private const byte DS1287_B_24H         = 0x20; // Alarm Interrupt Enable
+        private const byte DS1287_B_UIE         = 0x10; // Update Cycle Inter. Enable
+        private const byte DS1287_B_SQWE        = 0x08; // Square-Wave Enable
+        private const byte DS1287_B_DF          = 0x04; // Data Format
+        private const byte DS1287_B_DF_BINARY   = 0x04; //   Binary
+        private const byte DS1287_B_DF_BCD      = 0x00; //   Binary Coded Decimal (BCD)
+        private const byte DS1287_B_HF          = 0x02; // Hour Format
+        private const byte DS1287_B_HF_24H      = 0x02; //   24-hour format
+        private const byte DS1287_B_HF_12H      = 0x00; //   12-hour format
+        private const byte DS1287_B_DSE         = 0x01; // Daylight Saving Enable
+        private const byte DS1287_C             = 0x0c;
+        private const byte DS1287_C_UF          = 0x10; // Update Event Flag
+        private const byte DS1287_C_AF          = 0x20; // Alarm Event Flag
+        private const byte DS1287_C_PF          = 0x40; // Periodic Event Flag
+        private const byte DS1287_C_INTF        = 0x80; // Interrupt Request Flag
+        private const byte DS1287_D             = 0x0d;
+        private const byte DS1287_D_VRT         = 0x80; // Valid RAM and Time
+
+        private PnpConfig config;
+        private IoPort    rtcadd;
+        private IoPort    rtcdat;
+
+        private Apic apic;
+        private byte irq;
+        private byte interrupt;
+        internal volatile uint irqCount = 0;
+
+        private SpinLock rtcSpinLock;  // Protects rtcBootTime and rtc update
+        private long rtcBootTime;
+
+        // Constructor
+        internal RTClock(PnpConfig config, Apic apic)
+        {
+            DebugStub.Print("RTClock: create\n");
+
+            // /pnp/08/03/01/PNP0B00 0003 cfg dis : ISA RTC Controller : AT RTC
+            // IRQ mask=0100 type=47
+            // I/O Port inf=01 min=0070 max=0070 aln=01 len=02 0070..0071
+
+            this.config      = config;
+            this.irq         = ((IoIrqRange)config.DynamicRanges[1]).Irq;
+            this.apic        = apic;
+            this.rtcSpinLock = new SpinLock();
+
+            rtcadd = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(0, 1, Access.ReadWrite);
+            rtcdat = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(1, 1, Access.ReadWrite);
+
+            this.interrupt = Initialize();
+        }
+
+        [NoHeapAllocation]
+        private byte ReadRtc(byte addr)
+        {
+            IoResult result;
+
+            result = rtcadd.Write8NoThrow(addr);
+            DebugStub.Assert(IoResult.Success == result);
+
+            byte value;
+            result = rtcdat.Read8NoThrow(out value);
+            DebugStub.Assert(IoResult.Success == result);
+            return value;
+        }
+
+        [NoHeapAllocation]
+        private void WriteRtc(byte addr, byte val)
+        {
+            IoResult result;
+
+            result = rtcadd.Write8NoThrow(addr);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = rtcdat.Write8NoThrow(val);
+            DebugStub.Assert(IoResult.Success == result);
+        }
+
+        private byte Initialize()
+        {
+            // Disable and clear interrupts
+            if (Processor.SamplingEnabled()) {
+                WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_8KHZ);
+            }
+            else {
+                WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_64HZ);
+            }
+
+            WriteRtc(DS1287_B, DS1287_B_HF_24H | DS1287_B_DF_BCD);
+            ReadRtc(DS1287_C);  // Clear any update bits
+
+            if ((ReadRtc(DS1287_D) & DS1287_D_VRT) == 0)
+            {
+                DebugStub.Print("RTClock weak or defective power source.\n");
+            }
+
+            rtcBootTime = PullRtcTime();
+
+            DebugStub.Print("RTClock::Start()\n");
+
+            // Enable and clear interrupts
+            // NB it may take 500ms for first interrupt to be generated.
+            WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_2HZ);
+            WriteRtc(DS1287_B, DS1287_B_HF_24H | DS1287_B_DF_BCD | DS1287_B_PIE | DS1287_B_SQWE);
+            ReadRtc(DS1287_C);
+
+            apic.EnableIrq(irq);
+            return apic.IrqToInterrupt(irq);
+        }
+
+        private int Log2(uint value)
+        {
+            int l = 0;
+            if ((value & 0xffff0000u) != 0) { l += 16; value >>= 16; }
+            if ((value & 0x0000ff00u) != 0) { l +=  8; value >>=  8; }
+            if ((value & 0x000000f0u) != 0) { l +=  4; value >>=  4; }
+            if ((value & 0x0000000cu) != 0) { l +=  2; value >>=  2; }
+            if ((value & 0x0000000au) != 0) { l +=  1; value >>=  1; }
+            return l;
+        }
+
+        internal bool SetFrequency(uint frequency)
+        {
+            if (frequency > 8192 || frequency < 2)
+            {
+                return false;
+            }
+
+            if (Processor.SamplingEnabled()) {
+                frequency = 8192;
+            }
+
+            int a = 0x20;
+            a |= (0xf - (Log2(frequency) - 1)) & 0xf;
+            WriteRtc(DS1287_A, (byte) a);
+            WriteRtc(DS1287_B, DS1287_B_HF_24H | DS1287_B_DF_BCD | DS1287_B_PIE | DS1287_B_SQWE);
+            ReadRtc(DS1287_C);
+
+            return true;
+        }
+
+        public void Finalize()
+        {
+            apic.DisableIrq(irq);
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            byte status = ReadRtc(DS1287_C);
+            if ((status & DS1287_C_PF) != 0)
+            {
+                irqCount++;
+            }
+            apic.AckIrq(irq);
+        }
+
+        public byte Interrupt
+        {
+            [NoHeapAllocation]
+            get { return interrupt; }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+
+        [ System.Diagnostics.Conditional("SINGULARITY_MP") ]
+        [NoHeapAllocation]
+        private void AcquireLock()
+        {
+            rtcSpinLock.Acquire();
+        }
+
+        [ System.Diagnostics.Conditional("SINGULARITY_MP") ]
+        [NoHeapAllocation]
+        private void ReleaseLock()
+        {
+            rtcSpinLock.Release();
+        }
+
+        [NoHeapAllocation]
+        public long GetBootTime()
+        {
+            bool en = Processor.DisableInterrupts();
+            try {
+                AcquireLock();
+                long bootTime = rtcBootTime;
+                ReleaseLock();
+                return bootTime;
+            }
+            finally {
+                Processor.RestoreInterrupts(en);
+            }
+        }
+
+        public void SetRtcTime(long newRtcTime, long kernelTicks)
+        {
+            bool en = Processor.DisableInterrupts();
+            try {
+                AcquireLock();
+                long currentRtcTime = rtcBootTime + kernelTicks;
+                long delta  = newRtcTime - currentRtcTime;
+                rtcBootTime = rtcBootTime + delta;
+                PushRtcTime(newRtcTime);
+                ReleaseLock();
+            }
+            finally {
+                Processor.RestoreInterrupts(en);
+            }
+        }
+
+        [NoHeapAllocation]
+        internal static byte BcdToHex(byte bcd)
+        {
+            return (byte) (10 * (bcd >> 4) + (bcd & 0x0f));
+        }
+
+        [NoHeapAllocation]
+        internal static byte HexToBcd(int hex)
+        {
+            int h = hex / 10;
+            return (byte) ((h << 4) | (hex - h * 10));
+        }
+
+        private long PullRtcTime()
+        {
+            for (uint iters = 0; iters < 1000000; iters++) {
+                bool iflag = Processor.DisableInterrupts();
+
+                try {
+                    ReadRtc(DS1287_C); // Clear update flag if set
+
+                    if ((ReadRtc(DS1287_A) & DS1287_A_UIP) != 0) {
+                        // Update is in progress, try again
+                        continue;
+                    }
+
+                    // There is no update
+                    // pending.  The specs suggest at least
+                    // ~244us to read values (T_BUC)...
+                    byte second  = BcdToHex(ReadRtc(DS1287_SECONDS));
+                    byte minute  = BcdToHex(ReadRtc(DS1287_MINUTES));
+                    byte hour    = BcdToHex(ReadRtc(DS1287_HOURS));
+                    byte day     = BcdToHex(ReadRtc(DS1287_DAY_OF_MONTH));
+                    byte month   = BcdToHex(ReadRtc(DS1287_MONTH));
+                    byte year    = BcdToHex(ReadRtc(DS1287_YEAR));
+                    byte century = BcdToHex(ReadRtc(DS1287_USERDATA));
+
+                    // ...but we don't
+                    // trust the specs, particularly as we may
+                    // be running on emulated hardware.  Retry
+                    // if an update is pending or appears to
+                    // have completed whilst reading the time.
+                    if ((ReadRtc(DS1287_A) & DS1287_A_UIP) != 0 ||
+                        (ReadRtc(DS1287_C) & DS1287_C_UF)  != 0) {
+                        continue;
+                    }
+
+                    DebugStub.Print("PullRtcTime: " +
+                                    "{0:d4}-{1:d2}-{2:d} {3:2}:{4:d2}:{5:d2}" +
+                                    "\n",
+                                    __arglist(100*century+year, month, day,
+                                              hour, minute, second));
+
+                    DateTime d = new DateTime(century * 100 + year, month, day,
+                                              hour, minute, second);
+                    return d.Ticks;
+                }
+                catch (ArgumentOutOfRangeException e) {
+                    DebugStub.Print("PullRtcTime failed: {0}\n",
+                                    __arglist(e));
+                }
+                finally {
+                    Processor.RestoreInterrupts(iflag);
+                }
+            }
+            return (new DateTime(2005, 1, 1, 0, 0, 0)).Ticks;
+        }
+
+        private void PushRtcTime(long dtTicks)
+        {
+            DateTime dt = new DateTime(dtTicks);
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                byte saved = ReadRtc(DS1287_B);
+
+                // Set UTI bit to stop transfers between RTC
+                // bytes and user buffer.
+                WriteRtc(DS1287_B, (byte)(saved | DS1287_B_UTI));
+                // Write new values
+                WriteRtc(DS1287_SECONDS,      HexToBcd(dt.Second));
+                WriteRtc(DS1287_MINUTES,      HexToBcd(dt.Minute));
+                WriteRtc(DS1287_HOURS,        HexToBcd(dt.Hour));
+                WriteRtc(DS1287_DAY_OF_MONTH, HexToBcd(dt.Day));
+                WriteRtc(DS1287_MONTH,        HexToBcd(dt.Month));
+
+                int century = dt.Year / 100;
+                WriteRtc(DS1287_YEAR,         HexToBcd(dt.Year - century*100));
+                WriteRtc(DS1287_USERDATA,     HexToBcd(century));
+                // Clear UTI bit to enable transfers again
+                WriteRtc(DS1287_B, saved);
+                DebugStub.Print("PushRtcTime {3:2}:{4:d2}:{5:d2} {0}/{1}-{2:d4}\n",
+                                __arglist(dt.Month, dt.Day,
+                                          100*century + dt.Year, dt.Hour,
+                                          dt.Minute, dt.Second));
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.ApicPC/Timer8254.cs b/base/Kernel/Singularity.Hal.ApicPC/Timer8254.cs
new file mode 100644
index 0000000..fcef4f7
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.ApicPC/Timer8254.cs
@@ -0,0 +1,189 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Timer8254.cs
+//
+//  Useful reference URLs:
+//    http://developer.intel.com/design/archives/periphrl/index.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/7203.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/23124406.htm
+//
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+using System;
+using System.Threading;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Hal
+{
+    [DriverCategory]
+    [Signature("/pnp/PNP0100")]
+    public sealed class Timer8254Resources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x0040, Length = 0x04)]
+        public IoPortRange port1;
+
+        [IoIrqRange(1, Default = 0x00, Length = 0x01)]
+        public IoIrqRange irq1;
+
+        [IoFixedPortRange(Base = 0x0061, Length = 0x01)]
+        public IoPortRange port2;
+    }
+
+    /*
+     * Note on the i8254 timer:
+     *
+     * The clock is driven by a 14.318 MHz clock through a divide-by-12
+     * counter.
+     * This gives a clock frequency of 1.193 MHz.
+     * Each tick is therefore 0.838 microseconds long.
+     * Thus a 16 bit timer gives us a maximum delay of 0.05 seconds.
+     */
+    [CLSCompliant(false)]
+    public sealed class Timer8254
+    {
+        /* Registers */
+        const byte  i8254_C2     = 0x02;    /* counter 2     */
+        const byte  i8254_CW     = 0x03;    /* control word    */
+
+        /*
+          The control word to the 8254 is composed of four fields:
+          bits 6-7: select the counter
+          bits 4-5: select read/write
+          bits 1-3: mode to use
+          bit  0  : BCD mode
+        */
+
+        /* bits 6-7 select the counter */
+        const byte i8254_CW_SEL0      = 0x00;  /* select counter 0       */
+        const byte i8254_CW_SEL1      = 0x40;  /* select counter 1       */
+        const byte i8254_CW_SEL2      = 0x80;  /* select counter 2       */
+        const byte i8254_CW_RBC       = 0xc0;  /* read-back command      */
+
+        /* bits 4-5 select transaction type */
+        const byte i8254_CW_CLC       = 0x00;  /* counter latch comm.    */
+        const byte i8254_CW_LSB       = 0x10;  /* r/w lsb only           */
+        const byte i8254_CW_MSB       = 0x20;  /* r/w msb only           */
+        const byte i8254_CW_BOTH      = 0x30;  /* r/w lsb, then msb      */
+
+        /* bits 1-3 select the mode. bit 3 is sometimes a don't care */
+        const byte i8254_CW_MODE0     = 0x00;  /* int. on term. count    */
+        const byte i8254_CW_MODE1     = 0x02;  /* h/w retrig. one-shot   */
+        const byte i8254_CW_MODE2     = 0x04;  /* rate generator         */
+        const byte i8254_CW_MODE3     = 0x06;  /* square wave mode       */
+        const byte i8254_CW_MODE4     = 0x08;  /* s/w trig. strobe       */
+        const byte i8254_CW_MODE5     = 0x0a;  /* h/w trig. strobe       */
+
+        /* bit 0 sets BCD mode, if you really must */
+        const byte i8254_CW_BCD       = 0x01;  /* set BCD operation      */
+
+        /* read-back commands use bits 4 and 5 to return status these
+         * are the wrong way round since the bits are inverted (RTFDS).
+         */
+        const byte i8254_RB_NOSTATUS  = 0xd0;  /* Don't get latched count */
+        const byte i8254_RB_NOCOUNT   = 0xe0;  /* Don't get status       */
+        const byte i8254_RB_ALL       = 0xc0;  /* Get status and count   */
+
+        /* read-back commands use bits 3-1 to select counter */
+        const byte i8254_RB_SEL2      = 0x08;  /* counter 2              */
+
+        /* status from read-back is returned in bits 6-7 */
+        const byte i8254_RB_OUT       = 0x80;  /* out pin value          */
+        const byte i8254_RB_NULL      = 0x40;  /* 1 = count null         */
+
+        private static readonly int DefaultTicksPerSecond = 1193182;
+        private static readonly int SystemTicksPerSecond  = 10000000;
+
+        private PnpConfig config;
+        private byte      irq;
+        private int       frequency = DefaultTicksPerSecond;
+
+        /* IOPorts */
+        private IoPort  C2Port;
+        private IoPort  CWPort;
+
+        // Constructor
+        internal Timer8254(PnpConfig config)
+        {
+            // /pnp/08/02/01/PNP0100 0003 cfg dis : ISA 8254 Timer : AT Timer
+            // IRQ mask=0001 type=47
+            // I/O Port inf=01 min=0040 max=0040 aln=01 len=04 0040..0043
+            this.config = config;
+            this.irq    = ((IoIrqRange)config.DynamicRanges[1]).Irq;
+
+            IoPortRange ioPorts = (IoPortRange) config.DynamicRanges[0];
+
+            C2Port = ioPorts.PortAtOffset(i8254_C2, 1, Access.ReadWrite);
+            CWPort = ioPorts.PortAtOffset(i8254_CW, 1, Access.ReadWrite);
+
+            // Use Timer2 as it's not connected as interrupt source.
+            //
+            // Lower 2 bits of port 61 are described in:
+            // The Indispensable PC Hardware Book (3rd Edition) p.724
+            ioPorts = (IoPortRange) config.FixedRanges[0];
+            IoPort p = ioPorts.PortAtOffset(0, 1, Access.ReadWrite);
+            p.Write8((byte) ((p.Read8() & 0xfc) | 0x01));
+        }
+
+        internal void Start(ushort pitTicks)
+        {
+            CWPort.Write8(i8254_CW_MODE2 | i8254_CW_BOTH | i8254_CW_SEL2);
+            C2Port.Write8((byte)(pitTicks & 0xff));
+            C2Port.Write8((byte)(pitTicks >> 8));
+            do {
+                CWPort.Write8(i8254_RB_NOCOUNT | i8254_RB_SEL2);
+            } while ((C2Port.Read8() & i8254_RB_NULL) == i8254_RB_NULL);
+        }
+
+        internal ushort Read()
+        {
+            CWPort.Write8(i8254_RB_NOSTATUS | i8254_RB_SEL2);
+            return (ushort)(C2Port.Read8() | (C2Port.Read8() << 8));
+        }
+
+        internal void Stop()
+        {
+            CWPort.Write8(i8254_CW_MODE2 | i8254_CW_BOTH | i8254_CW_SEL2);
+            C2Port.Write8((byte)(0));    /* LSB */
+            /* C2Port.Write8((byte)(0));  MSB DON'T! */
+        }
+
+        internal void SetFrequency(uint newFrequency)
+        {
+            frequency = (int)newFrequency;
+            DebugStub.Print("i8254 frequency {0} Hz\n", __arglist(frequency));
+        }
+
+        internal uint TimeSpanToTimerTicks(uint ts)
+        {
+            return (uint) ((ulong)ts * (uint)(frequency / SystemTicksPerSecond));
+        }
+
+        internal uint TimerToTimeSpanTicks(uint ts)
+        {
+            return (uint) ((ulong)ts * (uint)(SystemTicksPerSecond / frequency));
+        }
+
+#if FIXED_FREQUENCY
+        internal static int TimeSpanTicksToPitTicks(int ts)
+        {
+            // t = 1193182 * T / (10^7) = 0.1193182 * T
+            //   = T * (1/0x10 + 0xe8ba/0x100000)
+            int tmp = (ts * 0xe8ba) >> 20;
+            return tmp + (ts >> 4);
+        }
+
+        internal static int PitTicksToTimeSpanTicks(int delta)
+        {
+            // T = 10^7 * t / 1193182 = 8.3809511 * t
+            //   = t * (8 + 0x6186/0x10000)
+            return (delta << 3) + ((delta * 0x6186) >> 16);
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Common/HalMemory.cs b/base/Kernel/Singularity.Hal.Common/HalMemory.cs
new file mode 100644
index 0000000..06ba13b
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Common/HalMemory.cs
@@ -0,0 +1,81 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalMemory.cs
+//
+//
+//  Note:
+//
+//
+//  Caution:
+//
+
+using Microsoft.Singularity.Hal.Acpi;
+
+
+namespace Microsoft.Singularity.Hal
+{
+    using System;
+    using System.Diagnostics;
+    using Microsoft.Singularity.Io;
+
+    [CLSCompliant(false)]
+    internal class HalMemory : IHalMemory
+    {
+        // See ProcessorAffinity and MemoryAffinity
+        // in the Interface (IHalMemory.cs)
+
+        private static ProcessorAffinity[] processors;
+        private static MemoryAffinity[] memories;
+
+        private Srat srat;
+
+        internal HalMemory(Srat srat)
+        {
+            this.srat = srat;
+            if (srat == null) {
+                processors = null;
+                memories = null;
+            }
+            else {
+                processors = new
+                    ProcessorAffinity[srat.GetNumberOfProcessors()];
+                memories = new
+                    MemoryAffinity [srat.GetNumberOfMemories()];
+
+                for (int i = 0; i < processors.Length; i++) {
+                    processors[i].domain = srat.GetProcessorDomain(i);
+                    processors[i].apicId = srat.GetProcessorApicId(i);
+                    processors[i].flagIgnore = srat.GetProcessorFlagIgnore(i);
+                }
+
+                for (int i = 0; i < memories.Length; i++) {
+                    memories[i].domain = srat.GetMemoryDomain(i);
+                    memories[i].baseAddress = srat.GetMemoryBaseAddress(i);
+                    memories[i].endAddress = srat.GetMemoryEndAddress(i);
+                    memories[i].memorySize = srat.GetMemorySize(i);
+                    memories[i].flagIgnore = srat.GetMemoryFlagIgnore(i);
+                    memories[i].flagHotPluggable =
+                        srat.GetMemoryFlagHotPluggable(i);
+                    memories[i].flagNonVolatile =
+                        srat.GetMemoryFlagNonVolatile(i);
+                }
+            }
+        }
+
+        public override ProcessorAffinity[] GetProcessorAffinity()
+        {
+            return processors;
+        }
+
+        public override MemoryAffinity[] GetMemoryAffinity()
+        {
+            return memories;
+        }
+
+        // public static void Initialize (Srat srat)
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.Common/HalScreen.cs b/base/Kernel/Singularity.Hal.Common/HalScreen.cs
new file mode 100644
index 0000000..c2e88dd
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.Common/HalScreen.cs
@@ -0,0 +1,327 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalScreen.cs
+//
+//  Note:
+//    The Indispensable PC Hardware Book (Third Edition), pp1055-1066.
+
+using System;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Hal
+{
+    // declare resources for the kernel manifest
+    [DriverCategory]
+    public sealed class HalScreenResources : DriverCategoryDeclaration
+    {
+        [IoFixedPortRange(Base = 0x03d4, Length = 0x01, Shared = true)]
+        public IoPortRange indexPort;
+
+        [IoFixedPortRange(Base = 0x03d5, Length = 0x01, Shared = true)]
+        public IoPortRange dataPort;
+
+        [IoFixedMemoryRange(Base = 0xb8000, Length = 8000, Shared = true)]
+        public IoMemoryRange screenMemory;
+
+        //[TODO] - how can we represent endpoints here?
+        //[ServiceEndpoint(typeof(ConsoleDeviceContract.Exp),
+        //                 CustomName = "HalScreen")]
+        //TRef<ServiceProviderContract.Exp:Start> conoutsp;
+    }
+
+    [CLSCompliant(false)]
+    public class HalScreen
+    {
+        public const int Columns    = 80;
+        public const int Rows       = 50;
+        public const int ScreenSize = Columns * Rows;
+
+        public const ushort CGA_INDEX_PORT = 0x3d4;
+        public const ushort CGA_DATA_PORT  = 0x3d5;
+        public const byte SmallCursorStart = 6;
+        public const byte LargeCursorStart = 0;
+
+        private enum Coloring
+        {
+            Dim     = 0x1700,
+            Yellow  = 0x1e00,
+            Green   = 0x1a00,
+            Red     = 0x1c00,
+            Normal  = 0x1f00
+        }
+
+        private ushort color           = (ushort)Coloring.Normal;
+        private int    cursor          = 0;
+        private bool   cursorVisible   = false;
+        private byte   cursorStartLine = SmallCursorStart;
+
+        private const byte CGA_CURSOR_START = 0xa;
+        private const byte CGA_CURSOR_MSB   = 0xe;
+        private const byte CGA_CURSOR_LSB   = 0xf;
+
+        private IoPort indexRegister = null;
+        private IoPort dataRegister = null;
+        private IoMemory screenBuffer = null;
+
+        public HalScreen(IoConfig config)
+        {
+            indexRegister =
+                ((IoPortRange) config.FixedRanges[0]).PortAtOffset(
+                    0, 1, Access.Write);
+            dataRegister =
+                ((IoPortRange) config.FixedRanges[1]).PortAtOffset(
+                    0, 1, Access.Write);
+            screenBuffer =
+                ((IoMemoryRange) config.FixedRanges[2]).MemoryAtOffset(
+                    0, ScreenSize * 2, Access.ReadWrite);
+            Clear();
+            WriteLine("Singularity HAL Console Driver.");
+            UpdateCursor(true);
+        }
+
+        public HalScreen()
+        {
+            // For compatibility with .csi compiled file
+            DebugStub.Break();
+        }
+
+        public void Dim()
+        {
+            color = (ushort)Coloring.Dim;
+        }
+
+        public void Yellow()
+        {
+            color = (ushort)Coloring.Yellow;
+        }
+
+        public void Green()
+        {
+            color = (ushort)Coloring.Green;
+        }
+
+        public void Red()
+        {
+            color = (ushort)Coloring.Red;
+        }
+
+        public void Normal()
+        {
+            color = (ushort)Coloring.Normal;
+        }
+
+        public void CursorFlash()
+        {
+            screenBuffer.Write16(0, (ushort)(screenBuffer.Read16(0) ^ 0xff00u));
+        }
+
+        public void CursorHide()
+        {
+            UpdateCursor(false);
+        }
+
+        public void CursorShow()
+        {
+            UpdateCursor(true);
+        }
+
+        [NoHeapAllocation]
+        public void Clear()
+        {
+            if (screenBuffer == null) {
+                DebugStub.Break();
+                return;
+            }
+            ushort zip = (ushort)(color | ' ');
+            IoResult result = screenBuffer.Write16NoThrow(0, zip, ScreenSize);
+            DebugStub.Assert(IoResult.Success == result);
+
+            cursor = 0;
+            UpdateCursor(cursorVisible);
+        }
+
+        [NoHeapAllocation]
+        public void GetDisplayDimensions(out int columns, out int rows)
+        {
+            columns = Columns;
+            rows    = Rows;
+        }
+
+        [NoHeapAllocation]
+        public void GetCursorPosition(out int column, out int row)
+        {
+            column = cursor % Columns;
+            row    = cursor / Columns;
+        }
+
+        [NoHeapAllocation]
+        public void SetCursorSizeLarge()
+        {
+            cursorStartLine = LargeCursorStart;
+            ForcedCursorUpdate();
+        }
+
+        [NoHeapAllocation]
+        public void SetCursorSizeSmall()
+        {
+            cursorStartLine = SmallCursorStart;
+            ForcedCursorUpdate();
+        }
+
+        [NoHeapAllocation]
+        private void ForcedCursorUpdate()
+        {
+            bool saved      = cursorVisible;
+            cursorVisible   = !cursorVisible;
+            UpdateCursor(saved);
+        }
+
+        [NoHeapAllocation]
+        private void UpdateCursor(bool newVisibleState)
+        {
+            IoResult result;
+
+            if (newVisibleState != cursorVisible) {
+                byte cgaStart = 32; // Cursor off
+                if (newVisibleState) {
+                    cgaStart = (byte)(64 + cursorStartLine);  // Cursor on
+                }
+
+                result = indexRegister.Write8NoThrow(CGA_CURSOR_START);
+                DebugStub.Assert(IoResult.Success == result);
+
+                result = dataRegister.Write8NoThrow(cgaStart);
+                DebugStub.Assert(IoResult.Success == result);
+
+                cursorVisible = newVisibleState;
+            }
+
+            if (newVisibleState) {
+                // Write cursor location
+                result = indexRegister.Write8NoThrow(CGA_CURSOR_MSB);
+                DebugStub.Assert(IoResult.Success == result);
+                result = dataRegister.Write8NoThrow((byte)(cursor >> 8));
+                DebugStub.Assert(IoResult.Success == result);
+                result = indexRegister.Write8NoThrow(CGA_CURSOR_LSB);
+                DebugStub.Assert(IoResult.Success == result);
+                result = dataRegister.Write8NoThrow((byte)(cursor & 0xff));
+                DebugStub.Assert(IoResult.Success == result);
+            }
+        }
+
+        [NoHeapAllocation]
+        public bool SetCursorPosition(int column, int row)
+        {
+            if (column < 0 || column >= Columns ||
+                row < 0 || row >= Rows) {
+                return false;
+            }
+            cursor = column + row * Columns;
+            UpdateCursor(cursorVisible);
+            return true;
+        }
+
+        [NoHeapAllocation]
+        public void ClearCursorToEndOfLine()
+        {
+            // Writing to the screen is slow.  We might
+            // want to track how many characters are written per line
+            // to speed this up.
+            int column = cursor % Columns;
+            int row    =  cursor / Columns;
+            while (column != Columns) {
+                PutCharAt(' ', column++, row);
+            }
+        }
+
+
+        [NoHeapAllocation]
+        public bool PutCharAt(char c, int column, int row)
+        {
+            if (column < 0 || column >= Columns ||
+                row < 0 || row >= Rows) {
+                return false;
+            }
+            int offset = (column + row * Columns) * 2;
+            IoResult result = screenBuffer.Write16NoThrow(offset,
+                                                          (ushort)(color | c));
+            DebugStub.Assert(IoResult.Success == result);
+            return true;
+        }
+
+        [NoHeapAllocation]
+        public void PutChar(char c)
+        {
+            PutChar((byte)c);
+        }
+
+        [NoHeapAllocation]
+        public void PutChar(byte c)
+        {
+            if (screenBuffer == null) {
+                return;
+            }
+
+            if (c == (byte)'\b') {
+                cursor--;
+            }
+            else if (c == (byte)'\r') {
+                int left = Columns - (cursor % Columns);
+
+                cursor -= cursor % Columns;
+            }
+            else if (c == (byte)'\n') {
+                cursor += Columns - (cursor % Columns);
+            }
+            else {
+                IoResult result =
+                    screenBuffer.Write16NoThrow(cursor++ * 2,
+                                                (ushort)(color | (c & 0x7f)));
+                DebugStub.Assert(IoResult.Success == result);
+            }
+
+            if (cursor >= ScreenSize) {
+                IoResult result;
+                // Scroll up 1-line
+                result = screenBuffer.Copy8NoThrow(Columns * 2, 0,
+                                                   (ScreenSize - Columns) * 2);
+                DebugStub.Assert(IoResult.Success == result);
+                // Blank bottom line
+                result =
+                    screenBuffer.Write16NoThrow((ScreenSize - Columns) * 2,
+                                                (ushort)(color | ' '),
+                                                Columns);
+                DebugStub.Assert(IoResult.Success == result);
+                // Reel in cursor
+                cursor -= Columns;
+            }
+
+            UpdateCursor(cursorVisible);
+        }
+
+        [NoHeapAllocation]
+        public void Write(byte[] buffer, int offset, int count)
+        {
+            for (int i = 0; i < count; i++) {
+                PutChar(buffer[offset + i]);
+            }
+        }
+
+        private void WriteLine(String value)
+        {
+            for (int i = 0; i < value.Length; i++) {
+                PutChar((byte)value[i]);
+            }
+            PutChar((byte)'\r');
+            PutChar((byte)'\n');
+        }
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Kernel/Singularity.Hal.LegacyPC.csproj b/base/Kernel/Singularity.Hal.LegacyPC.csproj
new file mode 100644
index 0000000..5cec0c9
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC.csproj
@@ -0,0 +1,40 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Hal.LegacyPC</AssemblyName>
+    <OutputType>Library</OutputType>
+    <Language>C#</Language>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  
+  <Import Project="Hal.Common.targets" />
+  <ItemGroup>
+    <Compile Include="Singularity.Hal.LegacyPC\CalibrateTimer.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\ClockLogger.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\HalClock.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\HalDevices.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\HalPic.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\HalTimer.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\Pic.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\RTClock.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\RtcPitState.cs" />
+    <Compile Include="Singularity.Hal.LegacyPC\Timer8254.cs" />
+    <Compile Include="@(HAL_ACPI_SOURCES)"/>
+    <Compile Include="@(HAL_COMMON_SOURCES)"/>
+    <Compile Include="@(HAL_TPM_SOURCES)"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets"/>
+
+</Project>
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/CalibrateTimer.cs b/base/Kernel/Singularity.Hal.LegacyPC/CalibrateTimer.cs
new file mode 100644
index 0000000..7b19544
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/CalibrateTimer.cs
@@ -0,0 +1,282 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: CalibrateTimers.cs
+//
+//  Note:
+//
+
+// #define VERBOSE
+
+using System;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Hal.Acpi;
+
+namespace Microsoft.Singularity.Hal
+{
+    [ CLSCompliant(false) ]
+    internal sealed class CalibrateTimers
+    {
+        private static int ApproxLog10(ulong value)
+        {
+            ulong thresh = 4;
+            for (int i = 0; i < 20; i++)
+            {
+                if (thresh >= value)
+                {
+                    return i;
+                }
+                thresh *= 10;
+            }
+            return 0;
+        }
+
+        private static int MinSpread(ulong [] values, int width)
+        {
+            ulong maxIre = 0; // Inverse-relative error
+            int   minCenter = 0;
+
+            for (int i = 0; i < values.Length - width; i++)
+            {
+                ulong delta = values[i + width - 1] - values[i];
+                ulong ire = values[i + width / 2] / (delta + 1);
+                if (ire > maxIre)
+                {
+                    maxIre = ire;
+                    minCenter = i + width / 2;
+                }
+            }
+            return minCenter;
+        }
+
+        private static void DisplayResults(ulong tscHz, int i8254Hz)
+        {
+            DebugStub.Print("TSC measured at {0} MHz\n",
+                            __arglist((int)(tscHz / 1000000)));
+            DebugStub.Print("i8254 measured at {0} Hz\n",
+                            __arglist(i8254Hz));
+        }
+
+        internal static bool Run(PMTimer pmtimer, Timer8254 i8254)
+        {
+            const int testRuns = 8;
+            int attempts = 0;
+
+            const uint  pmMask    = 0xffffffu;
+            const ulong tscMask   = 0xffffffffffff;
+            const int   i8254Mask = 0xffff;
+
+            ulong [] tscHz    = new ulong[testRuns];
+            ulong [] i8254Hz  = new ulong[testRuns];
+            uint  [] pmGoal   = new uint[testRuns];
+            uint  [] pmActual = new uint[testRuns];
+
+            i8254.Timer2Start();
+
+          measure:
+            attempts ++;
+            for (uint i = 0; i < testRuns; i++)
+            {
+                uint testHz = 2u + (i % 5u);
+
+                uint pmAccum = 0;
+                uint pmLast  = pmtimer.Value & pmMask;
+                uint pmEnd   = PMTimer.FrequencyHz / testHz;
+
+                ulong tscStart = Processor.CycleCount;
+                ulong tscEnd   = 0;
+
+                int i8254Accum = 0;
+                int i8254Last  = i8254.Timer2Read();
+
+                while (pmAccum < pmEnd)
+                {
+                    // Spin to burn on few
+                    // clock cycles.  On real hardware we stall
+                    // reading the timers.  On VPC we see the
+                    // PMTimer go backwards occasionally when
+                    // hammering it so we call SpinWait to
+                    // reduce the chance of observing it go
+                    // backwards.
+                    //
+                    // Note: We explicitly use Thread.SpinWait
+                    // since it will not be optimized out,
+                    // unlike a simple spin loop.
+                    System.Threading.Thread.SpinWait(10000);
+
+                    uint pmNow = pmtimer.Value & pmMask;
+                    if (pmNow < pmLast) {
+                        // On VPC the PM
+                        // timer occasionally goes backwards and
+                        // this leads to bogus calibration
+                        // points.
+                        if (pmLast - pmNow < PMTimer.FrequencyHz / 2) {
+                            // ignore measurement
+                            continue;
+                        }
+                        // Clock wrap, measurement okay.
+                    }
+                    pmAccum += (pmNow + (pmMask + 1) - pmLast) & pmMask;
+                    pmLast = pmNow;
+
+                    tscEnd = Processor.CycleCount;
+
+                    int i8254Now = i8254.Timer2Read();
+                    i8254Accum += ((i8254Mask + 1) + i8254Last - i8254Now) &
+                        i8254Mask;
+                    i8254Last = i8254Now;
+                }
+
+                ulong tscDelta = (tscEnd + (tscMask + 1) - tscStart) & tscMask;
+
+                tscHz[i]   = tscDelta * PMTimer.FrequencyHz / pmAccum;
+                i8254Hz[i] = (ulong)i8254Accum * PMTimer.FrequencyHz / pmAccum;
+                pmGoal[i]   = pmEnd;
+                pmActual[i] = pmAccum;
+            }
+
+#region -*- temporary failure debugging support -*-
+
+            ulong[] tscHzBackup = new ulong[tscHz.Length];
+            ulong[] i8254HzBackup = new ulong[i8254Hz.Length];
+            Array.Copy(tscHz, tscHzBackup, tscHz.Length);
+            Array.Copy(i8254Hz, i8254HzBackup, i8254Hz.Length);
+#endregion
+
+            Array.Sort(tscHz);
+            Array.Sort(i8254Hz);
+
+            bool noisyClock = false;
+
+            // Re-measure if values are obviously bogus as can occur with
+            // VPC.  Check is minimum value is less than n% of maximum
+            // value.
+            bool tscFailed   = tscHz[0] < 3 * tscHz[testRuns - 1] / 4;
+            bool i8254Failed = i8254Hz[0] < 3 * i8254Hz[testRuns - 1] / 4;
+
+            if (tscFailed || i8254Failed) {
+                if (attempts < 10) {
+                    noisyClock = true;
+                    DebugStub.Print("CLOCK CALIBRATION FAILED");
+                    if (tscFailed && i8254Failed) {
+                        DebugStub.Print(" (tsc and i2854) ");
+                    }
+                    else if (tscFailed) {
+                        DebugStub.Print(" (tsc only) " );
+                    }
+                    else {
+                        DebugStub.Print(" (i8254 only) " );
+                    }
+                    DebugStub.Print("RETRYING.\n");
+                    for (int i = 0; i < tscHzBackup.Length; i++) {
+                        DebugStub.Print("tscHz {0} i8254Hz {1} pmGoal {2} pmActual {3}\n",
+                                        __arglist(tscHzBackup[i],
+                                                  i8254HzBackup[i],
+                                                  pmGoal[i],
+                                                  pmActual[i]));
+                    }
+                    goto measure;
+                }
+                else {
+                    DebugStub.Print("ALL CLOCK CALIBRATION ATTEMPTS FAILED.\n");
+                    //
+                    // TODO:
+                    //   Try to calibrate with rtClock
+                    //     SlowCalibration(rtClock, timer8254);
+                    Processor.CyclesPerSecond = 1800 * 1000 * 1000;
+                    i8254.SetTicksPerSecond(1193180);
+                    return true;
+                }
+            }
+
+            ulong tscHzEstimate   = tscHz[MinSpread(tscHz, 3)];
+            int   i8254HzEstimate = (int) i8254Hz[MinSpread(i8254Hz, 3)];
+
+            DisplayResults(tscHzEstimate, i8254HzEstimate);
+
+            // Set measured frequencies in appropriate places.
+            Processor.CyclesPerSecond = tscHzEstimate;
+            i8254.SetTicksPerSecond(i8254HzEstimate);
+
+            //
+            // Range of measurements is a pretty good indicator of VPCness
+            // since it may have been descheduled during these measurements
+            // so timer measurements will be poor.
+            //
+            int oValue = ApproxLog10(tscHzEstimate);
+            int oRange = ApproxLog10(tscHz[testRuns - 1] - tscHz[0]);
+            if (oValue - oRange < 5)
+            {
+                DebugStub.Print("*** Noisy timing measurements.  Looks like measurement on VPC or bad hardware. ***\n");
+                noisyClock = true;
+            }
+            return noisyClock;
+        }
+
+        internal static void Run(RTClock rtc, Timer8254 i8254)
+        {
+            // This test uses the RTC's update-in-progress bit, UIP, as
+            // a measure of 1 second of time.  The UIP set period is
+            // around 240us which means we can safely read the
+            // i8254 in a loop without worrying about missing the
+            // bit being set / cleared because of i/o operations.
+            //
+            // This test fails horribly on VPC.  It has problems with the
+            // update-in-progress bit in the RTC.  Fortunately we should
+            // not get here on VPC.
+            //
+            // NB This routine does not try to be as rigorous as
+            // the PM Timer version as each calibration run
+            // takes much longer.
+
+            const int testRuns = 2;
+
+            int i8254Last  = 0;
+            int i8254Now   = 0;
+            int i8254Accum = 0;
+            int [] i8254Hz = new int [testRuns];
+
+            ulong tscLast = 0;
+            ulong tscNow  = 0;
+            ulong [] tscHz = new ulong[testRuns];
+
+            i8254.Timer2Start();
+
+            do
+            {
+                tscLast   = Processor.CycleCount;
+                i8254Last = i8254.Timer2Read();
+            } while (rtc.UpdateInProgress() == false);
+
+            for (int i = 0; i < testRuns; i++)
+            {
+                while (rtc.UpdateInProgress() == true)
+                    ;
+
+                do
+                {
+                    tscNow = Processor.CycleCount;
+
+                    i8254Now    = i8254.Timer2Read();
+                    i8254Accum += (0x10000 + i8254Last - i8254Now) & 0xffff;
+                    i8254Last   = i8254Now;
+                }
+                while (rtc.UpdateInProgress() == false);
+
+                tscHz[i] = (tscNow + 0x1000000000000 - tscLast)&0xffffffffffff;
+                tscLast = tscNow;
+
+                i8254Hz[i] = i8254Accum;
+                i8254Accum = 0;
+            }
+
+            DisplayResults(tscHz[testRuns - 1], i8254Hz[testRuns - 1]);
+
+            Processor.CyclesPerSecond = tscHz[testRuns - 1];
+            i8254.SetTicksPerSecond(i8254Hz[testRuns - 1]);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/ClockLogger.cs b/base/Kernel/Singularity.Hal.LegacyPC/ClockLogger.cs
new file mode 100644
index 0000000..a398f13
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/ClockLogger.cs
@@ -0,0 +1,230 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ClockLogger.cs
+//
+//  Useful reference URLs:
+//    http://developer.intel.com/design/archives/periphrl/index.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/7203.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/23124406.htm
+//
+// The basic ideas for this driver come from the MMOSA code,
+// though the implementation differs.  This is partly because
+// the code needs to run on Virtual PC and it isn't able to do
+// a very accurate emulation of the i8254.
+//
+// There are two source available for timing - the Real-Time
+// Clock (RTC) and the programmable interval timer (PIT).  The
+// standard PC RTC is based on derivatives of the Motorola
+// MC146818A.  It's able to provide the time with a resolution
+// of 1 second and also has a programmable periodic interrupt.
+//
+// The programmable interrupt timer is based on the i8254.  It
+// can be programmed in a variety of modes - we use it to
+// generate an interrupt at a configurable time in the future
+// and then reprogram it each interrupt.  The maximum interrupt
+// period is 65535 ticks of a 1.193MHz clock.
+//
+// We use both of the RTC and the programmable interrupt timer to
+// maintain our estimate of the current time.  The RTC provides granularity
+// to with 1/64 seconds and the time is used to get an estimate to within
+// 1/1.193 * 10e-6 seconds within each RTC interval.
+//
+// The key variables are:
+//
+// upTime -   the time the system has been up.  This variable gets
+//            updated during the periodic RTC interrupt handling
+//            (delta = 1/64Hz).
+//
+// pitLast -  the last value programmed into the PIT.  The PIT counts down
+//            and generates an interrupt at (or shortly after) the instant
+//            the current PIT value reaches zero.
+//
+// pitAccum - the accumulated time measured by the PIT since upTime
+//            was updated.
+//
+// The current kernel time is always:
+//      upTime + pitAccum + (pitLast - pitCurrent)
+//
+// The PIT is always programmed to run, either by the consumer of the timer
+// interface or by the timer itself.
+//
+//    Timer::SetNextInterrupt(t)
+//      pitAccum += (pitLast - pitCurrent)
+//      // program PIT (not shown)
+//      pitLast = t
+//
+//    Timer::Interrupt()
+//      pitAccum += pitLast;
+//      // But PIT time may accumulate between interrupt dispatch and crossing
+//      // Zero so.
+//      if (pitCurrent != 0)
+//           pitAccum += (MaxPitValue - pitCurrent)
+//      // Inform user of interrupt
+//      if (userNotScheduledInterrupt)
+//           SetNextInterrupt(MaxInterruptInterval)
+//
+//    RTC::Interrupt()
+//      pitLast = pitNow
+//      pitAccum = 0
+//      upTime += RTCInterruptPeriod
+//
+// All of these methods are atomic interrupt-wise.
+//
+// Note: if we want to test the accuracy of the timer over a
+// period we can set RTC::Interrupt to just return without
+// touching any variables.  All of the time accumulated will end
+// up in pitAccum.
+//
+// Conditionals
+//
+// TIMER_NO_GO  - disables timer and scheduling of timer interrupts.
+//
+// RTC_NO_GO    - disable RTC.
+//
+// DEBUG_TIMER  - enable timer debug messages and boot-time diagnostics.
+//
+// DEBUG_CLOCK  - enable clock debug messages
+//
+// LOG_CLOCK    - log adjustments to clock time and dump out later.
+//
+// LOG_SNI      - log calls to SetNextInterrupt to see what's being thrown in.
+//
+// Tip: When this code does not behave useful things to check
+// are the interrupt rate and the rate of calls to
+// SetNextInterrupt.
+//
+
+// #define VERBOSE
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Hal
+{
+    [ CLSCompliant(false) ]
+    internal sealed class ClockLogger
+    {
+        public struct Record
+        {
+            public int who;
+            public ulong when;
+            public ulong currentTime;
+            public long upTime;
+            public int  pitLastClock;
+            public int  pitNow;
+            public long cookie;
+        };
+        private static int currentRecord = 0;
+        private static Record [] entries = null;
+        private static int ignoreCount = 20000;
+
+        static ClockLogger()
+        {
+            InitializeEntries();
+#if LOG_CLOCK
+            DebugStub.Print("Initializing ClockLogger.\n");
+#endif // LOG_CLOCK
+        }
+
+        [System.Diagnostics.Conditional("LOG_CLOCK")]
+        internal static void InitializeEntries()
+        {
+            entries = new Record[10000];
+        }
+
+        [System.Diagnostics.Conditional("LOG_CLOCK")]
+        [NoHeapAllocation]
+        internal static void AddEntry(int who, RtcPitState rps, Timer8254 timer, long cookie)
+        {
+            if (ignoreCount != 0) {
+                ignoreCount--;
+                return;
+            }
+
+            if (currentRecord == entries.Length)
+                return;
+
+            entries[currentRecord].who = who;
+            entries[currentRecord].cookie = cookie;
+            entries[currentRecord].when = Processor.CycleCount;
+            int pitNow = timer.Timer2Read();
+            entries[currentRecord].currentTime =
+                (ulong)rps.GetKernelTicks(pitNow);
+            entries[currentRecord].upTime = rps.upTime;
+            entries[currentRecord].pitLastClock = rps.pitLastClock;
+            entries[currentRecord].pitNow = pitNow;
+
+            currentRecord = currentRecord + 1;
+
+            if (currentRecord == entries.Length) {
+                bool iflag = Processor.DisableInterrupts();
+                try {
+                    DumpEntries();
+                    DebugStub.Assert(false);
+                }
+                finally {
+                    Processor.RestoreInterrupts(iflag);
+                }
+            }
+        }
+
+        [System.Diagnostics.Conditional("LOG_CLOCK")]
+        [NoHeapAllocation]
+        internal static void AddEntry(int who, RtcPitState rps, Timer8254 timer)
+        {
+            AddEntry(who, rps, timer, 0);
+        }
+
+        [System.Diagnostics.Conditional("LOG_CLOCK")]
+        [NoHeapAllocation]
+        internal static void SetCookie(long cookie)
+        {
+            if (currentRecord < entries.Length)
+                entries[currentRecord].cookie = cookie;
+        }
+
+        [NoHeapAllocation]
+        static ulong ToMicros(ulong t, ulong t0, ulong tps)
+        {
+            return ((t - t0) * 10000000) / tps;
+        }
+
+        [System.Diagnostics.Conditional("LOG_CLOCK")]
+        [NoHeapAllocation]
+        static void DumpEntries()
+        {
+            DebugStub.Print("# Clock column 1 who\n");
+            DebugStub.Print("# Clock column 2 time in cpu cycles\n");
+            DebugStub.Print("# Clock column 3 time from clock\n");
+            DebugStub.Print("# Clock column 4 pitLastClock\n");
+            DebugStub.Print("# Clock column 5 pitNow\n");
+            DebugStub.Print("# Clock column 6 upTime\n");
+            DebugStub.Print("# Clock column 7 currentTime\n");
+            DebugStub.Print("# Clock column 8 cookie\n");
+            DebugStub.Print("# Clock column 9 record number\n");
+
+            for (int i = 0; i != currentRecord; i++) {
+                DebugStub.Print("Clock {0:d6} {1:d6} {2} {3} {4} {5} {6} {7}\n",
+                                __arglist(
+                                    ToMicros(entries[i].when,
+                                             entries[0].when,
+                                             Processor.CyclesPerSecond),
+                                    ToMicros(entries[i].currentTime, 0, 10000000),
+                                    entries[i].pitLastClock,
+                                    entries[i].pitNow,
+                                    entries[i].upTime,
+                                    entries[i].currentTime,
+                                    entries[i].cookie,
+                                    i));
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/HalClock.cs b/base/Kernel/Singularity.Hal.LegacyPC/HalClock.cs
new file mode 100644
index 0000000..7a8fd67
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/HalClock.cs
@@ -0,0 +1,69 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: HalClock.cs
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalClock.csi
+//
+//  This is nothing more than a wrapper for the real-time clock.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalClock
+    {
+        private RTClock rtc;
+
+        internal HalClock(RTClock rtc)
+        {
+            this.rtc = rtc;
+        }
+
+        public HalClock()
+        {
+            DebugStub.Assert(false);
+        }
+
+        public void Finalize()
+        {
+            rtc.Finalize();
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            rtc.ClearInterrupt();
+        }
+
+        [NoHeapAllocation]
+        public long GetKernelTicks()
+        {
+            return rtc.GetKernelTicks();
+        }
+
+        [NoHeapAllocation]
+        public void CpuResumeFromHaltEvent()
+        {
+            rtc.CpuResumeFromHaltEvent();
+        }
+
+        [NoHeapAllocation]
+        public long GetRtcTime()
+        {
+            return rtc.GetRtcTime();
+        }
+
+        public void SetRtcTime(long rtcTicks)
+        {
+            rtc.SetRtcTime(rtcTicks);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/HalDevices.cs b/base/Kernel/Singularity.Hal.LegacyPC/HalDevices.cs
new file mode 100644
index 0000000..4e8b995
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/HalDevices.cs
@@ -0,0 +1,190 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: HalDevices.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Hal.Acpi;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalDevices
+    {
+        private static Pic pic;
+        private static Timer8254 timer;
+        private static PMTimer pmTimer;
+        private static RTClock clock;
+
+        // haryadi
+        private static HalMemory halMemory;
+
+        [CLSCompliant(false)]
+        public static void Initialize(Processor rootProcessor)
+        {
+            DebugStub.Print("HalDevices.Initialize() - Legacy\n");
+
+            AcpiTables.Parse();
+            pmTimer = AcpiTables.GetPMTimer();
+
+            // PIC
+            PnpConfig picConfig
+                = (PnpConfig)IoSystem.YieldResources("/pnp/PNP0000", typeof(Pic));
+            pic = new Pic(picConfig);
+            pic.Initialize();
+
+            // Timer
+            PnpConfig timerConfig
+                = (PnpConfig)IoSystem.YieldResources("/pnp/PNP0100", typeof(Timer8254));
+            timer = new Timer8254(timerConfig, pic);
+            byte timerInterrupt = timer.Initialize();
+
+            // Real-time clock
+            PnpConfig clockConfig
+                = (PnpConfig)IoSystem.YieldResources("/pnp/PNP0B00", typeof(RTClock));
+            clock = new RTClock(clockConfig, pic, timer);
+            byte clockInterrupt = clock.Initialize();
+
+            bool noisyTimer = false;
+            if (pmTimer != null) {
+                noisyTimer = CalibrateTimers.Run(pmTimer, timer);
+            }
+            else {
+                CalibrateTimers.Run(clock, timer);
+            }
+
+            clock.SetNoisyTimer(noisyTimer);
+            clock.Start();
+
+            HalClock halClock = new HalClock(clock);
+            SystemClock.Initialize(halClock, TimeSpan.FromHours(8).Ticks);
+
+            rootProcessor.AddPic(new HalPic(pic));
+            rootProcessor.AddTimer(timerInterrupt, new HalTimer(timer));
+            rootProcessor.AddClock(clockInterrupt, halClock);
+
+            // ----------------------------------------------------------
+            // haryadi: add Srat tables to the Processor
+            halMemory = new HalMemory(AcpiTables.GetSrat());
+            Processor.AddHalMemory(halMemory);
+
+            Processor.SetIdtTable();
+
+            timer.Start();
+
+            // Get the screen resources.  Since we have metadata above to
+            // declare all fixed resources used by the screen,
+            // YieldResources("") will keep the resource tracking correct:
+            Console.Screen =
+                new HalScreen(IoSystem.YieldResources("", typeof(HalScreen)));
+        }
+
+        public static void Finalize()
+        {
+            clock.Finalize();
+            clock = null;
+
+            timer.Finalize();
+            timer = null;
+
+            pic.Finalize();
+            pic = null;
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static byte GetMaximumIrq()
+        {
+            return pic.MaximumIrq;
+        }
+
+        //
+        // Adding and removing interrupts from the Pic.
+        //
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static void EnableIoInterrupt(byte irq)
+        {
+            pic.EnableIrq(irq);
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static void DisableIoInterrupt(byte irq)
+        {
+            pic.DisableIrq(irq);
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static bool InternalInterrupt(byte interrupt)
+        {
+            // Strictly there are no interrupts internal to
+            // this Hal instance.  In practice, some hardware seems
+            // intent on firing an interrupt even if it is masked.
+            //
+            // Return true if interrupt appears to be valid but
+            // is masked, false otherwise.
+            byte irq = pic.InterruptToIrq(interrupt);
+
+#if DEBUG_SPURIOUS
+            DebugStub.Break();
+#endif
+
+            if (pic.IrqMasked(irq) == true)
+            {
+                DebugStub.WriteLine("--- Acked spurious Irq={0:x2}", __arglist(irq));
+                pic.AckIrq(irq);
+                return true;
+            }
+            return false;
+        }
+
+        [NoHeapAllocation]
+        private static int GetProcessorCount()
+        {
+            return 1;
+        }
+
+        [CLSCompliant(false)]
+        public static void StartApProcessors()
+        {
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static void FreezeProcessors()
+        {
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        private static void SendFixedIPI(byte vector, int from, int to)
+        {
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        private static void BroadcastFixedIPI(byte vector, bool includeSelf)
+        {
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        private static void ClearFixedIPI()
+        {
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/HalPic.cs b/base/Kernel/Singularity.Hal.LegacyPC/HalPic.cs
new file mode 100644
index 0000000..1e942a2
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/HalPic.cs
@@ -0,0 +1,94 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalPic.cs
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalPic.csi
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalPic
+    {
+        private Pic pic;
+
+        internal HalPic(Pic thePic)
+        {
+            this.pic = thePic;
+        }
+
+        /// <summary>
+        /// Maximum valid IRQ property.  On legacy PC systems this value is
+        /// 15.  On APIC PC systems this number will usually be larger.
+        /// </summary>
+        public byte MaximumIrq
+        {
+            [NoHeapAllocation]
+            get { return pic.MaximumIrq; }
+        }
+
+        /// <summary>
+        /// Convert interrupt vector to interrupt request line.
+        /// </summary>
+        [NoHeapAllocation]
+        public byte InterruptToIrq(byte interrupt)
+        {
+            return pic.InterruptToIrq(interrupt);
+        }
+
+        /// <summary>
+        /// Convert interrupt request line to interrupt vector.
+        /// </summary>
+        [NoHeapAllocation]
+        public byte IrqToInterrupt(byte irq)
+        {
+            return pic.IrqToInterrupt(irq);
+        }
+
+        /// <summary>
+        /// Acknowledge the interrupt request.  (EOI)
+        /// </summary>
+        [NoHeapAllocation]
+        public void AckIrq(byte irq)
+        {
+            pic.AckIrq(irq);
+        }
+
+        /// <summary>
+        /// Enable interrupt request by removing mask.
+        /// </summary>
+        [NoHeapAllocation]
+        public void EnableIrq(byte irq)
+        {
+            pic.EnableIrq(irq);
+        }
+
+        /// <summary>
+        /// Disable interrupt request by applying mask.
+        /// </summary>
+        [NoHeapAllocation]
+        public void DisableIrq(byte irq)
+        {
+            pic.DisableIrq(irq);
+        }
+
+        /// <summary>
+        /// Acknowledge and mask interrupt.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt(byte interrupt)
+        {
+            pic.ClearInterrupt(interrupt);
+        }
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/HalTimer.cs b/base/Kernel/Singularity.Hal.LegacyPC/HalTimer.cs
new file mode 100644
index 0000000..11aa93f
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/HalTimer.cs
@@ -0,0 +1,76 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HalTimer.cs
+//
+//  Note:
+//
+//  This file is an implementation of Interfaces/Hal/HalTimer.csi
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.Hal
+{
+    public class HalTimer
+    {
+        private Timer8254 timer;
+
+        internal HalTimer(Timer8254 theTimer)
+        {
+            this.timer = theTimer;
+        }
+
+        /// <summary>
+        /// Clear interrupt associated with timer.
+        /// </summary>
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+            timer.ClearInterrupt();
+        }
+
+        /// <value>
+        /// Maximum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MaxInterruptInterval {
+            [NoHeapAllocation]
+            get { return timer.MaxInterruptInterval; }
+        }
+
+        /// <value>
+        /// Minimum value accepted by SetNextInterrupt (in units of 100ns).
+        /// </value>
+        public long MinInterruptInterval {
+            [NoHeapAllocation]
+            get { return timer.MinInterruptInterval; }
+        }
+
+        /// <value>
+        /// Granularity of interrupt timeout (in units of 100ns).
+        /// </value>
+        public long InterruptIntervalGranularity {
+            [NoHeapAllocation]
+            get { return timer.InterruptIntervalGranularity; }
+        }
+
+        /// <summary>
+        /// Set relative time of next interrupt.
+        ///
+        /// <param name="delta">Relative time of next interrupt in units
+        /// of 100ns.  The time should be with the range between
+        /// from <c>SetNextInterruptMinDelta</c> to
+        /// <c>SetNextInterruptMaxDelta</c></param>.
+        /// <returns> true on success.</returns>
+        /// </summary>
+        [NoHeapAllocation]
+        public bool SetNextInterrupt(long delta)
+        {
+            return timer.SetNextInterrupt(delta);
+        }
+    }
+} // namespace Microsoft.Singularity.Hal
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/Pic.cs b/base/Kernel/Singularity.Hal.LegacyPC/Pic.cs
new file mode 100644
index 0000000..c52fc7e
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/Pic.cs
@@ -0,0 +1,356 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Pic.cs
+//
+//  Note:
+//    http://home.ozonline.com.au/davmac/davpage/PIC.html
+//
+
+//#define DEBUG_INTERRUPTS
+//#define DEBUG_DISPATCH_IO
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Hal
+{
+    // declare resources for the kernel manifest
+    [DriverCategory]
+    [Signature("/pnp/PNP0000")]
+    public sealed class PicResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x20, Length = 0x02)]
+        public IoPortRange port1;
+
+        [IoPortRange(1, Default = 0xa0, Length = 0x02)]
+        public IoPortRange port2;
+    }
+
+    [CLSCompliant(false)]
+    public sealed class Pic
+    {
+        // Constants for PIC interrupt vectors.
+        public const byte   PIC0_BIOS_VECTOR    = 0x08; // IRQ0..IRQ7
+        public const byte   PIC1_BIOS_VECTOR    = 0x70; // IRQ8..IRQF
+
+        public const byte   PIC_NS_EOI          = 0x20; // OCW1: End of Interrupt.
+        public const ushort PIC_I_PIC1          = 0x04; // IRQ 2 / INT 0x0a 10
+        public const byte   PIC_VECTORS         = 16;
+
+        private ushort  irqMask;
+        private byte    baseVector;
+
+        private IoPort pic0CtrlPort;
+        private IoPort pic0MaskPort;
+        private IoPort pic1CtrlPort;
+        private IoPort pic1MaskPort;
+
+        internal Pic(PnpConfig config)
+        {
+            // /pnp/08/00/01/PNP0000 0003 cfg dis
+            // I/O Port inf=01 min=0020 max=0020 aln=01 len=02 0020..0021
+            // I/O Port inf=01 min=00a0 max=00a0 aln=01 len=02 00a0..00a1
+            // IRQ mask=0004 type=79
+
+            // Range[0]: 0x20; // PIC0
+            // Range[1]: 0xA0; // PIC1
+
+            pic0CtrlPort = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(0, 1, Access.ReadWrite);
+            pic0MaskPort = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(1, 1, Access.ReadWrite);
+            pic1CtrlPort = ((IoPortRange)config.DynamicRanges[1])
+                .PortAtOffset(0, 1, Access.ReadWrite);
+            pic1MaskPort = ((IoPortRange)config.DynamicRanges[1])
+                .PortAtOffset(1, 1, Access.ReadWrite);
+        }
+
+        public byte Initialize(byte baseVector)
+        {
+            DebugStub.Print("Pic.Initializing IRQs at interrupt {0:x2}\n",
+                            __arglist(baseVector));
+
+            this.baseVector = baseVector;
+            irqMask = unchecked((ushort)~PIC_I_PIC1);
+
+            // Set ICW1 (must be followed by ICW2, ICW3, and ICW4).
+            //  00010001b - 8-byte,cascaded,triggered,w/ICW4
+            pic1CtrlPort.Write8(0x11);
+            pic0CtrlPort.Write8(0x11);
+
+            // Set ICW2..ICW3 (must follow ICW1)
+            pic1MaskPort.Write8((byte)(baseVector + 8));
+            pic0MaskPort.Write8(baseVector);
+
+            pic1MaskPort.Write8(0x02); // Cascaded interrupt number
+            pic0MaskPort.Write8(0x04); // Cascaded interrupt bit.
+
+            pic1MaskPort.Write8(1);    // End of Interrupt
+            pic0MaskPort.Write8(1);
+
+            pic1CtrlPort.Write8(0x20);  // EOI
+            pic0CtrlPort.Write8(0x20);  // EOI
+
+            MaskAll();
+
+            return PIC_VECTORS;
+        }
+
+        public void Initialize()
+        {
+            this.Initialize(0x70);
+        }
+
+        public void Finalize()
+        {
+            UnmaskAll();
+        }
+
+        [NoHeapAllocation]
+        public byte InterruptToIrq(byte interrupt)
+        {
+            return (byte)(interrupt - baseVector);
+        }
+
+        [NoHeapAllocation]
+        public byte IrqToInterrupt(byte irq)
+        {
+            return (byte)(baseVector + irq);
+        }
+
+        public byte MaximumIrq
+        {
+            [NoHeapAllocation]
+            get { return PIC_VECTORS - 1; }
+        }
+
+        [System.Diagnostics.Conditional("PIC_DEBUG")]
+        private void DumpRegisters()
+        {
+            pic0CtrlPort.Write8(0x04 | 0x02); // OCW3  - read IRR
+            byte irr0 = pic0CtrlPort.Read8();
+            pic0CtrlPort.Write8(0x04 | 0x03); // OCW3  - read ISR
+            byte isr0 = pic0CtrlPort.Read8();
+            pic1CtrlPort.Write8(0x04 | 0x02); // OCW3  - read IRR
+            byte irr1 = pic1CtrlPort.Read8();
+            pic1CtrlPort.Write8(0x04 | 0x03); // OCW3  - read ISR
+            byte isr1 = pic1CtrlPort.Read8();
+            byte mask0 = pic0MaskPort.Read8();
+            byte mask1 = pic1MaskPort.Read8();
+
+            DebugStub.Print("PIC IRR: {0:x2}{1:x2} ISR: {2:x2}{3:x2} Mask:{4:x2}{5:x2}\n",
+                            __arglist(irr1, irr0, isr1, isr0, mask1, mask0));
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt(byte interrupt)
+        {
+            byte irq = InterruptToIrq(interrupt);
+
+            Mask(irq);
+            AckIrq(irq);
+
+#if DEBUG_INTERRUPTS
+            DebugStub.Print("pic.ClearInterrupt({0:x2})\n",
+                            __arglist(irqMask));
+#endif
+        }
+
+        [NoHeapAllocation]
+        public void AckIrq(byte irq)
+        {
+            DebugStub.Assert(Processor.InterruptsDisabled());
+#if PIC_DEBUG
+            DumpRegisters();
+#endif
+
+            // Mark the IRQ as activated and mask it
+#if DEBUG_INTERRUPTS
+            DebugStub.Print("Int{0:x2}  Acked, Mask={1:x4}\n",
+                            __arglist(irq + baseVector, irqMask));
+#endif
+
+            // Quite the interrupt controller.
+            IoResult result;
+            if (irq >= 8) {
+                result = pic1CtrlPort.Write8NoThrow(PIC_NS_EOI);
+                DebugStub.Assert(IoResult.Success == result);
+            }
+            result = pic0CtrlPort.Write8NoThrow(PIC_NS_EOI);
+            DebugStub.Assert(IoResult.Success == result);
+
+#if PIC_DEBUG
+            DumpRegisters();
+#endif
+        }
+
+        [NoHeapAllocation]
+        public ushort Pending()
+        {
+            byte irr0;
+            byte irr1;
+
+            IoResult result = pic0CtrlPort.Write8NoThrow(0x04 | 0x02); // OCW3  - read IRR
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic0CtrlPort.Read8NoThrow(out irr0);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic1CtrlPort.Write8NoThrow(0x04 | 0x02); // OCW3  - read IRR
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = pic1CtrlPort.Read8NoThrow(out irr1);
+            DebugStub.Assert(IoResult.Success == result);
+
+            return (ushort) (irr0 | (irr1<<8));
+        }
+
+        [NoHeapAllocation]
+        public void EnableIrq(byte irq)
+        {
+            if (irq == 2 || irq >= PIC_VECTORS) {
+                DebugStub.Break();
+                // throw new OverflowException
+                // (String.Format("irq {0} out of range.", irq));
+            }
+
+#if DEBUG_INTERRUPTS
+            DebugStub.Print("Int{0:x2}  Enable, Mask={1:x4}\n",
+                            __arglist(irq + baseVector, irqMask));
+#endif
+
+            bool saved = Processor.DisableInterrupts();
+            try
+            {
+                Unmask(irq);
+                DumpRegisters();
+            }
+            finally
+            {
+                Processor.RestoreInterrupts(saved);
+            }
+        }
+
+        [NoHeapAllocation]
+        public void DisableIrq(byte irq)
+        {
+            if (irq == 2 || irq >= PIC_VECTORS) {
+                DebugStub.Break();
+                //                throw new OverflowException
+                // (String.Format("irq {0} out of range.", irq));
+            }
+
+#if DEBUG_INTERRUPTS
+            DebugStub.Print("Int{0:x2} Disable\n",
+                            __arglist(irq + baseVector));
+#endif
+            bool saved = Processor.DisableInterrupts();
+            try
+            {
+                Mask(irq);
+                DumpRegisters();
+            }
+            finally
+            {
+                Processor.RestoreInterrupts(saved);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        [NoHeapAllocation]
+        private void Mask(byte irq)
+        {
+            DebugStub.Assert(Processor.InterruptsDisabled());
+            ushort newMask = (ushort)(irqMask | (1 << irq));
+            if (newMask != irqMask) {
+#if DEBUG_DISPATCH_IO
+                DebugStub.WriteLine("-- Mask IRQs:   old={0:x4} new={1:x4}",
+                                    __arglist(irqMask, newMask));
+#endif
+                irqMask = newMask;
+                IoResult result;
+                result = pic1MaskPort.Write8NoThrow((byte)(irqMask >> 8));
+                DebugStub.Assert(IoResult.Success == result);
+                result = pic0MaskPort.Write8NoThrow((byte)(irqMask & 0xff));
+                DebugStub.Assert(IoResult.Success == result);
+#if PIC_DEBUG
+                byte mask0;
+                pic0MaskPort.Read8NoThrow(out mask0);
+                byte mask1;
+                pic1MaskPort.Read8NoThrow(out mask1);
+
+                DebugStub.Print("PIC Mask: {0:x2}{1:x2}\n",
+                                __arglist(mask1, mask0));
+#endif
+            }
+        }
+
+        [NoHeapAllocation]
+        private void Unmask(byte irq)
+        {
+            DebugStub.Assert(Processor.InterruptsDisabled());
+            ushort newMask = (ushort)(irqMask & ~(1 << irq));
+            if (newMask != irqMask) {
+#if DEBUG_DISPATCH_IO
+                DebugStub.WriteLine("-- Unmask IRQs: old={0:x4} new={1:x4}",
+                                    __arglist(irqMask, newMask));
+#endif
+                irqMask = newMask;
+                IoResult result;
+
+                result = pic1MaskPort.Write8NoThrow((byte)(irqMask >> 8));
+                DebugStub.Assert(IoResult.Success == result);
+
+                result = pic0MaskPort.Write8NoThrow((byte)(irqMask & 0xff));
+                DebugStub.Assert(IoResult.Success == result);
+#if PIC_DEBUG
+                byte mask0;
+                result = pic0MaskPort.Read8(out mask0);
+                DebugStub.Assert(IoResult.Success == result);
+
+                byte mask1;
+                result = pic1MaskPort.Read8(out mask1);
+                DebugStub.Assert(IoResult.Success == result);
+
+                DebugStub.Print("PIC Mask: {0:x2}{1:x2}\n",
+                                __arglist(mask1, mask0));
+#endif
+            }
+        }
+
+        [NoHeapAllocation]
+        public bool IrqMasked(byte irq)
+        {
+            if (irq >= PIC_VECTORS)
+            {
+                return false;
+            }
+            return (irqMask & (1u << irq)) != 0;
+        }
+
+        private void MaskAll()
+        {
+            DebugStub.Assert(Processor.InterruptsDisabled());
+            pic1MaskPort.Write8(0xff);
+            pic0MaskPort.Write8(0xff);
+        }
+
+        private void UnmaskAll()
+        {
+            DebugStub.Assert(Processor.InterruptsDisabled());
+            pic1MaskPort.Write8((byte)(irqMask >> 8));
+            pic0MaskPort.Write8((byte)(irqMask & 0xff));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/RTClock.cs b/base/Kernel/Singularity.Hal.LegacyPC/RTClock.cs
new file mode 100644
index 0000000..a2edb37
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/RTClock.cs
@@ -0,0 +1,617 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RTClock.cs
+//
+//  Useful reference URLs:
+//    http://developer.intel.com/design/archives/periphrl/index.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/7203.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/23124406.htm
+//
+// The basic ideas for this driver come from the MMOSA code,
+// though the implementation differs.  This is partly because
+// the code needs to run on Virtual PC and it isn't able to do
+// a very accurate emulation of the i8254.
+//
+// There are two source available for timing - the Real-Time
+// Clock (RTC) and the programmable interval timer (PIT).  The
+// standard PC RTC is based on derivatives of the Motorola
+// MC146818A.  It's able to provide the time with a resolution
+// of 1 second and also has a programmable periodic interrupt.
+//
+// The programmable interrupt timer is based on the i8254.  It
+// can be programmed in a variety of modes - we use it to
+// generate an interrupt at a configurable time in the future
+// and then reprogram it each interrupt.  The maximum interrupt
+// period is 65535 ticks of a 1.193MHz clock.
+//
+// We use both of the RTC and the programmable interrupt timer to
+// maintain our estimate of the current time.  The RTC provides granularity
+// to with 1/64 seconds and the time is used to get an estimate to within
+// 1/1.193 * 10e-6 seconds within each RTC interval.
+//
+// The key variables are:
+//
+// upTime -   the time the system has been up.  This variable gets
+//            updated during the periodic RTC interrupt handling
+//            (delta = 1/64Hz).
+//
+// pitLast -  the last value programmed into the PIT.  The PIT counts down
+//            and generates an interrupt at (or shortly after) the instant
+//            the current PIT value reaches zero.
+//
+// pitAccum - the accumulated time measured by the PIT since upTime
+//            was updated.
+//
+// The current kernel time is always:
+//      upTime + pitAccum + (pitLast - pitCurrent)
+//
+// The PIT is always programmed to run, either by the consumer of the timer
+// interface or by the timer itself.
+//
+//    Timer::SetNextInterrupt(t)
+//      pitAccum += (pitLast - pitCurrent)
+//      // program PIT (not shown)
+//      pitLast = t
+//
+//    Timer::Interrupt()
+//      pitAccum += pitLast;
+//      // But PIT time may accumulate between interrupt dispatch and crossing
+//      // Zero so.
+//      if (pitCurrent != 0)
+//           pitAccum += (MaxPitValue - pitCurrent)
+//      // Inform user of interrupt
+//      if (userNotScheduledInterrupt)
+//           SetNextInterrupt(MaxInterruptInterval)
+//
+//    RTC::Interrupt()
+//      pitLast = pitNow
+//      pitAccum = 0
+//      upTime += RTCInterruptPeriod
+//
+// All of these methods are atomic interrupt-wise.
+//
+// Note: if we want to test the accuracy of the timer over a
+// period we can set RTC::Interrupt to just return without
+// touching any variables.  All of the time accumulated will end
+// up in pitAccum.
+//
+// Conditionals
+//
+// TIMER_NO_GO  - disables timer and scheduling of timer interrupts.
+//
+// RTC_NO_GO    - disable RTC.
+//
+// DEBUG_TIMER  - enable timer debug messages and boot-time diagnostics.
+//
+// DEBUG_CLOCK  - enable clock debug messages
+//
+// LOG_CLOCK    - log adjustments to clock time and dump out later.
+//
+// LOG_SNI      - log calls to SetNextInterrupt to see what's being thrown in.
+//
+// Tip: When this code does not behave useful things to check
+// are the interrupt rate and the rate of calls to
+// SetNextInterrupt.
+//
+
+// #define VERBOSE
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Threading;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Hal
+{
+    // declare resources for the kernel manifest
+    [DriverCategory]
+    [Signature("/pnp/PNP0B00")]
+    public sealed class RtcResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x70, Length = 0x02)]
+        public IoPortRange port1;
+
+        [IoIrqRange(1, Default = 0x08)]
+        public IoIrqRange irq1;
+    }
+
+    /// <remarks>
+    /// Class <c>RTClock</c> represents the system
+    /// Real-Time Clock.  RTC chips in PCs are based on the
+    /// Motorola MC1461818A.  It provides timing resolution of 1
+    /// second, but can generate periodic interrupts more
+    /// frequently.  By combining information from
+    /// <c>Timer8254</c> programmable timer time can be read
+    /// with a resolution of 0.838 microseconds.
+    /// </remarks>
+    [ CLSCompliant(false) ]
+    internal sealed class RTClock
+    {
+        private PnpConfig   config;
+        private byte        irq;
+        private Pic         pic;
+
+        /* Real time clock registers - for calibration */
+        private IoPort rtcadd;
+        private IoPort rtcdat;
+
+        // Data registers
+        private const byte DS1287_SECONDS       = 0x00;
+        private const byte DS1287_SECONDS_ALARM = 0x01;
+        private const byte DS1287_MINUTES       = 0x02;
+        private const byte DS1287_MINUTES_ALARM = 0x03;
+        private const byte DS1287_HOURS         = 0x04;
+        private const byte DS1287_HOURS_ALARM   = 0x05;
+        private const byte DS1287_DAY_OF_WEEK   = 0x06; // 1 is Sunday
+        private const byte DS1287_DAY_OF_MONTH  = 0x07;
+        private const byte DS1287_MONTH         = 0x08;
+        private const byte DS1287_YEAR          = 0x09;
+        private const byte DS1287_USERDATA      = 0x32; // Randomly chosen user reg.
+        // Control registers and masks
+        private const byte DS1287_A             = 0x0a;
+        private const byte DS1287_A_UIP         = 0x80; // Update Cycle Status
+        private const byte DS1287_A_DIVON       = 0x20; // Osc and Freq Div on
+        private const byte DS1287_A_8KHZ        = 0x03;
+        private const byte DS1287_A_4KHZ        = 0x04;
+        private const byte DS1287_A_2KHZ        = 0x05;
+        private const byte DS1287_A_1KHZ        = 0x06;
+        private const byte DS1287_A_64HZ        = 0x0a;
+        private const byte DS1287_A_2HZ         = 0x0f;
+        private const byte DS1287_B             = 0x0b;
+        private const byte DS1287_B_UTI         = 0x80; // Update Transfer Inhibit
+        private const byte DS1287_B_PIE         = 0x40; // Periodic Interrupt Enable
+        private const byte DS1287_B_24H         = 0x20; // Alarm Interrupt Enable
+        private const byte DS1287_B_UIE         = 0x10; // Update Cycle Inter. Enable
+        private const byte DS1287_B_SQWE        = 0x08; // Square-Wave Enable
+        private const byte DS1287_B_DF          = 0x04; // Data Format
+        private const byte DS1287_B_DF_BINARY   = 0x04; //   Binary
+        private const byte DS1287_B_DF_BCD      = 0x00; //   Binary Coded Decimal (BCD)
+        private const byte DS1287_B_HF          = 0x02; // Hour Format
+        private const byte DS1287_B_HF_24H      = 0x02; //   24-hour format
+        private const byte DS1287_B_HF_12H      = 0x00; //   12-hour format
+        private const byte DS1287_B_DSE         = 0x01; // Daylight Saving Enable
+        private const byte DS1287_C             = 0x0c;
+        private const byte DS1287_C_UF          = 0x10; // Update Event Flag
+        private const byte DS1287_C_AF          = 0x20; // Alarm Event Flag
+        private const byte DS1287_C_PF          = 0x40; // Periodic Event Flag
+        private const byte DS1287_C_INTF        = 0x80; // Interrupt Request Flag
+        private const byte DS1287_D             = 0x0d;
+        private const byte DS1287_D_VRT         = 0x80; // Valid RAM and Time
+
+        // Rate if rtc used for generating profiling interrupts
+        const byte DS1287_A_SAMPLING_HZ = DS1287_A_1KHZ;
+
+        const int InterruptGapTicks    = 156250;   // units of 100ns
+
+        const uint maxAttempts = 1000000;
+
+        private RtcPitState rps   = null;
+        private Timer8254   timer = null;
+        private long        rtcBootTime;
+        private volatile uint irqCount = 0;
+
+        // Variables for fast GetKernelTicks implementation that uses
+        // TSC when it is deemed safe.
+        bool  noisyTimer;               // Running on VPC? Disable optimization
+        long  tscSnapshot;              // TSC value at sync point
+        long  ticksSnapshot;            // Kernel ticks at sync point
+        long  lastKernelTicks;          // Last kernel ticks reported
+        bool  tscSnapshotValid = false;
+        bool  initedFastTime   = false;
+        int   tickScale;
+        const int tickRoll = 24;
+
+        // Constructor
+        internal RTClock(PnpConfig config, Pic pic, Timer8254 timer)
+        {
+            DebugStub.Print("RTClock: create\n");
+
+            // /pnp/08/03/01/PNP0B00 0003 cfg dis : ISA RTC Controller : AT RTC
+            // IRQ mask=0100 type=47
+            // I/O Port inf=01 min=0070 max=0070 aln=01 len=02 0070..0071
+
+            this.config = config;
+            this.pic    = pic;
+            this.irq    = ((IoIrqRange)config.DynamicRanges[1]).Irq;
+            this.timer  = timer;
+
+            rtcadd = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(0, 1, Access.ReadWrite);
+            rtcdat = ((IoPortRange)config.DynamicRanges[0])
+                .PortAtOffset(1, 1, Access.ReadWrite);
+
+        }
+
+        [NoHeapAllocation]
+        private byte ReadRtc(byte addr)
+        {
+            IoResult result;
+            byte value;
+
+            result = rtcadd.Write8NoThrow(addr);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = rtcdat.Read8NoThrow(out value);
+            DebugStub.Assert(IoResult.Success == result);
+
+            return value;
+        }
+
+        [NoHeapAllocation]
+        private void WriteRtc(byte addr, byte val)
+        {
+            IoResult result;
+
+            result = rtcadd.Write8NoThrow(addr);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = rtcdat.Write8NoThrow(val);
+            DebugStub.Assert(IoResult.Success == result);
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+#if RTC_NO_GO
+            DebugStub.Print("Unwanted RTC interrupt! (b = {0})\n",
+                            __arglist(ReadRtc(DS1287_B)));
+            return;
+#endif // RTC_NO_GO
+
+            byte status = ReadRtc(DS1287_C);
+            if ((status & 0x40) != 0x40) {
+                // We may get Update-Ended interrupts even though we've
+                // not requested them.
+                pic.AckIrq(irq);
+                return;
+            }
+
+            ClockLogger.AddEntry(4, rps, timer);
+            rps.pitLastClock  = timer.Timer2Read();
+            rps.upTime       += InterruptGapTicks;
+
+            ClockLogger.AddEntry(5, rps, timer);
+            irqCount++;
+
+            if (timer.InterruptPending == false) {
+                // This is to keep time progressing if the user has
+                // not set an interrupt
+                timer.SetKeepAliveInterrupt();
+            }
+            pic.AckIrq(irq);
+
+            // Invalidate TSC snapshot to force clock synchronization
+            this.tscSnapshotValid = false;
+        }
+
+        internal byte Initialize()
+        {
+            DebugStub.Print("RTClock: initialize\n");
+
+            rps = timer.rps;
+
+            // Turn oscillator on, but disable and clear interrupts
+            if (Processor.SamplingEnabled()) {
+                WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_SAMPLING_HZ);
+            }
+            else {
+                WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_64HZ);
+            }
+            WriteRtc(DS1287_B, DS1287_B_24H | DS1287_B_DF_BCD);
+            ReadRtc(DS1287_C);  // Clear any update bits
+
+            if ((ReadRtc(DS1287_D) & DS1287_D_VRT) == 0) {
+                DebugStub.Print("RTClock weak or defective power source.\n");
+            }
+
+            rtcBootTime = PullRtcTime().Ticks;
+
+            // Enable and clear interrupts
+            // NB it may take 500ms for first interrupt to be generated.
+            pic.EnableIrq(irq);
+            return pic.IrqToInterrupt(irq);
+        }
+
+        internal void Start()
+        {
+            DebugStub.Print("RTClock::Start()\n");
+#if RTC_NO_GO
+            WriteRtc(DS1287_B, DS1287_B_24H | DS1287_B_UTI);
+#endif
+            // XXX A #else does not work here with sgc (!)
+#if !RTC_NO_GO
+            if (Processor.SamplingEnabled()) {
+                WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_SAMPLING_HZ);
+            }
+            else {
+                WriteRtc(DS1287_A, DS1287_A_DIVON | DS1287_A_64HZ);
+            }
+            WriteRtc(DS1287_B, DS1287_B_24H | DS1287_B_PIE);
+            ReadRtc(DS1287_C);
+#endif
+        }
+
+        internal void Finalize()
+        {
+            pic.DisableIrq(irq);
+        }
+
+        [NoHeapAllocation]
+        bool InitializeFastTime()
+        {
+            const ulong KernelTicksPerSecond = 10000000;
+            ulong cps = Processor.CyclesPerSecond;
+            if (cps >= KernelTicksPerSecond) {
+                this.tscSnapshot   = 0;
+                this.ticksSnapshot = 0;
+                this.tickScale =
+                    (int)((1 << tickRoll) * KernelTicksPerSecond / cps);
+#if VERBOSE
+                DebugStub.Print(
+                    "tick scale = {0} (actual {1:d}, fast {2:d})",
+                    __arglist(this.tickScale,
+                              cps,
+                              ((1 << tickRoll) * KernelTicksPerSecond /
+                               (ulong)this.tickScale))
+                    );
+#endif // VERBOSE
+                return true;
+            }
+            return false;
+        }
+
+        internal void SetNoisyTimer(bool noisy)
+        {
+            this.noisyTimer = noisy;
+        }
+
+        [NoHeapAllocation]
+        private long GetKernelTicksFromHW()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                ClockLogger.AddEntry(100, rps, timer);
+                long r = rps.GetKernelTicks(timer.Timer2Read());
+                return r;
+            } finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        [NoHeapAllocation]
+        private long GetKernelTicksFromTsc()
+        {
+            long now = unchecked((long)Processor.CycleCount);
+            long tscDelta = now - this.tscSnapshot;
+            long tickDelta = (tscDelta * tickScale) >> tickRoll;
+            DebugStub.Assert(tickDelta >= 0);
+            return ticksSnapshot + tickDelta;
+        }
+
+        [NoHeapAllocation]
+        private long InternalGetKernelTicks()
+        {
+            if (!initedFastTime) {
+                initedFastTime = InitializeFastTime();
+            }
+
+            if (this.noisyTimer || !initedFastTime) {
+                // Looks like Virtual PC or one not suited to
+                // fast time calculation.  Always pull time from
+                // the hardware as the TSC is not virtualized
+                // and is not to be trusted.
+                return GetKernelTicksFromHW();
+            }
+            else {
+                if (!tscSnapshotValid) {
+                    // When waking up from a processor halt
+                    // event or from a clock interrupt, sync
+                    // with the fixed h/w's concept of time.
+                    this.ticksSnapshot = GetKernelTicksFromHW();
+                    this.tscSnapshot   = unchecked((long)Processor.CycleCount);
+                    this.tscSnapshotValid = true;
+                    return ticksSnapshot;
+                } else {
+                    return GetKernelTicksFromTsc();
+                }
+            }
+        }
+
+        [NoHeapAllocation]
+        public long GetKernelTicks()
+        {
+#if DEBUG_TIMER
+            {
+                long cpuT = GetKernelTicksFromTsc();
+                long hwT = GetKernelTicksFromHW();
+
+                if (cpuT - hwT > 5000 || hwT - cpuT < - 5000) {
+                    DebugStub.Print("Delta = {0:d} (hw {1:d} cpu {2:d})\n",
+                                    __arglist(cpuT - hwT, hwT, cpuT));
+                }
+            }
+#endif // DEBUG_TIMER
+
+            // We use the TSC to provide fast kernel ticks as
+            // far as possible, and periodically sync against an
+            // off-chip clock.  Because there are different time
+            // sources and we don't ever want to report time
+            // going backwards, we need to check that time would
+            // reported to have advanced or remained the same,
+            // and that the clock has not wrapped.
+            long kernelTicks = InternalGetKernelTicks();
+
+            if (kernelTicks >= lastKernelTicks) {
+                lastKernelTicks = kernelTicks;
+                return kernelTicks;
+            }
+            else if (kernelTicks < 0 && lastKernelTicks > 0) {
+                    // clock wrap
+                return kernelTicks;
+            }
+#if DEBUG_TIMER
+            // Skew from switching between tsc and underlying clock
+            DebugStub.Print("Backwards delta = {0} (HW {1} TSC {2})\n",
+                            __arglist(kernelTicks - lastKernelTicks,
+                                      GetKernelTicksFromHW(),
+                                      GetKernelTicksFromTsc())
+                            );
+#endif // DEBUG_TIMER
+            return lastKernelTicks;
+        }
+
+        [NoHeapAllocation]
+        public void CpuResumeFromHaltEvent()
+        {
+            tscSnapshotValid = false;
+        }
+
+        [NoHeapAllocation]
+        public long GetRtcTime()
+        {
+            return rtcBootTime + GetKernelTicks();
+        }
+
+        public void SetRtcTime(long rtcTime)
+        {
+            long delta = rtcTime - GetRtcTime();
+            rtcBootTime = rtcBootTime + delta;
+            PushRtcTime(new DateTime(rtcTime));
+        }
+
+        [NoHeapAllocation]
+        internal static byte BcdToHex(byte bcd)
+        {
+            return (byte) (10 * (bcd >> 4) + (bcd & 0x0f));
+        }
+
+        [NoHeapAllocation]
+        internal static byte HexToBcd(int hex)
+        {
+            int h = hex / 10;
+            return (byte) ((h << 4) | (hex - h * 10));
+        }
+
+        internal bool UpdateInProgress()
+        {
+            return (ReadRtc(DS1287_A) & DS1287_A_UIP) == DS1287_A_UIP;
+        }
+
+        private DateTime PullRtcTime()
+        {
+            for (uint iters = 0; iters < maxAttempts; iters++) {
+                bool iflag = Processor.DisableInterrupts();
+
+                try {
+                    ReadRtc(DS1287_C); // Clear update flag if set
+
+                    if ((ReadRtc(DS1287_A) & DS1287_A_UIP) != 0) {
+                        // Update is in progress, try again
+                        continue;
+                    }
+
+                    // There is no update
+                    // pending.  The specs suggest at least
+                    // ~244us to read values (T_BUC)...
+                    byte second  = BcdToHex(ReadRtc(DS1287_SECONDS));
+                    byte minute  = BcdToHex(ReadRtc(DS1287_MINUTES));
+                    byte hour    = BcdToHex(ReadRtc(DS1287_HOURS));
+                    byte day     = BcdToHex(ReadRtc(DS1287_DAY_OF_MONTH));
+                    byte month   = BcdToHex(ReadRtc(DS1287_MONTH));
+                    byte year    = BcdToHex(ReadRtc(DS1287_YEAR));
+                    byte century = BcdToHex(ReadRtc(DS1287_USERDATA));
+
+                    // ...but we don't
+                    // trust the specs, particularly as we may
+                    // be running on emulated hardware.  Retry
+                    // if an update is pending or appears to
+                    // have completed whilst reading the time.
+                    if ((ReadRtc(DS1287_A) & DS1287_A_UIP) != 0 ||
+                        (ReadRtc(DS1287_C) & DS1287_C_UF)  != 0) {
+                        continue;
+                    }
+
+                    DebugStub.Print("PullRtcTime: " +
+                                    "{0:d4}-{1:d2}-{2:d} {3:2}:{4:d2}:{5:d2}" +
+                                    "\n",
+                                    __arglist(100*century+year, month, day,
+                                              hour, minute, second));
+                    //
+                    // There appears to be an issue with the timer that
+                    // doesn't clear/zero out the most significant digit
+                    // when a value can be represented by a single digit.
+                    // Attempt to recover from this scenario.
+                    second = (second < 60) ? second : (byte) (second % 10);
+                    minute = (minute < 60) ? minute : (byte) (minute % 10);
+                    hour = (hour < 24) ? hour : (byte) (hour % 10);
+                    day = (day <= 31) ? day : (byte) (day % 10);
+                    month = (month <= 12) ? month : (byte) (month % 10);
+                    year = (year < 100) ? year : (byte) (year % 100);
+
+                    return new DateTime(century * 100 + year,
+                                        month, day, hour, minute,
+                                        second);
+                }
+                catch (ArgumentOutOfRangeException e) {
+                    DebugStub.Print("PullRtcTime failed: {0} "+
+                                    "(1:x}:{2:x}:{3:x} {4:x}/{5:x} "+
+                                    "100*{6:x}+{7:x})\n",
+                                    __arglist(e,
+                                              ReadRtc(DS1287_HOURS),
+                                              ReadRtc(DS1287_MINUTES),
+                                              ReadRtc(DS1287_SECONDS),
+                                              ReadRtc(DS1287_MONTH),
+                                              ReadRtc(DS1287_DAY_OF_MONTH),
+                                              ReadRtc(DS1287_USERDATA),
+                                              ReadRtc(DS1287_YEAR)));
+                    if (iters > (maxAttempts >> 1)) {
+                        DebugStub.Break();
+                    }
+                }
+                finally {
+                    Processor.RestoreInterrupts(iflag);
+                }
+            }
+            return new DateTime(2005, 1, 1, 0, 0, 0);
+        }
+
+        private void PushRtcTime(DateTime dt)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            byte saved = ReadRtc(DS1287_B);
+
+            try {
+                // Set UTI bit to stop transfers between RTC
+                // bytes and user buffer.
+                WriteRtc(DS1287_B, (byte)(saved | DS1287_B_UTI));
+                // Write new values
+                WriteRtc(DS1287_SECONDS,      HexToBcd(dt.Second));
+                WriteRtc(DS1287_MINUTES,      HexToBcd(dt.Minute));
+                WriteRtc(DS1287_HOURS,        HexToBcd(dt.Hour));
+                WriteRtc(DS1287_DAY_OF_MONTH, HexToBcd(dt.Day));
+                WriteRtc(DS1287_MONTH,        HexToBcd(dt.Month));
+
+                int century = dt.Year / 100;
+                WriteRtc(9, HexToBcd(dt.Year - century * 100));
+                WriteRtc(DS1287_YEAR,         HexToBcd(dt.Year - century*100));
+                WriteRtc(DS1287_USERDATA,     HexToBcd(century));
+                // Clear UTI bit to enable transfers again
+                DebugStub.Print("PushRtcTime {3:2}:{4:d2}:{5:d2} {0}/{1}-{2:d4}\n",
+                                __arglist(dt.Month, dt.Day,
+                                          100*century + dt.Year, dt.Hour,
+                                          dt.Minute, dt.Second));
+            }
+            finally {
+                WriteRtc(DS1287_B, saved);
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/RtcPitState.cs b/base/Kernel/Singularity.Hal.LegacyPC/RtcPitState.cs
new file mode 100644
index 0000000..b40a586
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/RtcPitState.cs
@@ -0,0 +1,165 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RtcPitState.cs
+//
+//  Useful reference URLs:
+//    http://developer.intel.com/design/archives/periphrl/index.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/7203.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/23124406.htm
+//
+// The basic ideas for this driver come from the MMOSA code,
+// though the implementation differs.  This is partly because
+// the code needs to run on Virtual PC and it isn't able to do
+// a very accurate emulation of the i8254.
+//
+// There are two source available for timing - the Real-Time
+// Clock (RTC) and the programmable interval timer (PIT).  The
+// standard PC RTC is based on derivatives of the Motorola
+// MC146818A.  It's able to provide the time with a resolution
+// of 1 second and also has a programmable periodic interrupt.
+//
+// The programmable interrupt timer is based on the i8254.  It
+// can be programmed in a variety of modes - we use it to
+// generate an interrupt at a configurable time in the future
+// and then reprogram it each interrupt.  The maximum interrupt
+// period is 65535 ticks of a 1.193MHz clock.
+//
+// We use both of the RTC and the programmable interrupt timer to
+// maintain our estimate of the current time.  The RTC provides granularity
+// to with 1/64 seconds and the time is used to get an estimate to within
+// 1/1.193 * 10e-6 seconds within each RTC interval.
+//
+// The key variables are:
+//
+// upTime -   the time the system has been up.  This variable gets
+//            updated during the periodic RTC interrupt handling
+//            (delta = 1/64Hz).
+//
+// pitLast -  the last value programmed into the PIT.  The PIT counts down
+//            and generates an interrupt at (or shortly after) the instant
+//            the current PIT value reaches zero.
+//
+// pitAccum - the accumulated time measured by the PIT since upTime
+//            was updated.
+//
+// The current kernel time is always:
+//      upTime + pitAccum + (pitLast - pitCurrent)
+//
+// The PIT is always programmed to run, either by the consumer of the timer
+// interface or by the timer itself.
+//
+//    Timer::SetNextInterrupt(t)
+//      pitAccum += (pitLast - pitCurrent)
+//      // program PIT (not shown)
+//      pitLast = t
+//
+//    Timer::Interrupt()
+//      pitAccum += pitLast;
+//      // But PIT time may accumulate between interrupt dispatch and crossing
+//      // Zero so.
+//      if (pitCurrent != 0)
+//           pitAccum += (MaxPitValue - pitCurrent)
+//      // Inform user of interrupt
+//      if (userNotScheduledInterrupt)
+//           SetNextInterrupt(MaxInterruptInterval)
+//
+//    RTC::Interrupt()
+//      pitLast = pitNow
+//      pitAccum = 0
+//      upTime += RTCInterruptPeriod
+//
+// All of these methods are atomic interrupt-wise.
+//
+// Note: if we want to test the accuracy of the timer over a
+// period we can set RTC::Interrupt to just return without
+// touching any variables.  All of the time accumulated will end
+// up in pitAccum.
+//
+// Conditionals
+//
+// TIMER_NO_GO  - disables timer and scheduling of timer interrupts.
+//
+// RTC_NO_GO    - disable RTC.
+//
+// DEBUG_TIMER  - enable timer debug messages and boot-time diagnostics.
+//
+// DEBUG_CLOCK  - enable clock debug messages
+//
+// LOG_CLOCK    - log adjustments to clock time and dump out later.
+//
+// LOG_SNI      - log calls to SetNextInterrupt to see what's being thrown in.
+//
+// Tip: When this code does not behave useful things to check
+// are the interrupt rate and the rate of calls to
+// SetNextInterrupt.
+//
+
+// #define VERBOSE
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+using System.Threading;
+
+namespace Microsoft.Singularity.Hal
+{
+    // Shared time state between RTClock and Programmable Timer
+    [ CLSCompliant(false) ]
+    internal sealed class RtcPitState
+    {
+        /// <remarks>
+        /// System up time as measured by the <see>RTClock</see>.  This value
+        /// is only updated by the RTClock.
+        /// </remarks>
+        internal long upTime = 0;
+
+        internal volatile int pitLastClock;
+
+        /// <remarks>
+        /// Last time returned by GetKernelTicks.  Used to check for time
+        /// going backwards.  This can occur in PIT value updates in the
+        /// scaling between PIT timebase and kernel time base.
+        /// </remarks>
+        internal long lastKernelTicks = 0;
+
+        internal RtcPitState()
+        {
+            this.pitLastClock = 0xffff;
+            this.upTime       = 0;
+        }
+
+        [NoHeapAllocation]
+        internal static int ComputePitOffset(int pitPrev, int pitNow)
+        {
+            if (pitPrev >= pitNow) {
+                return pitPrev - pitNow;
+            }
+            return pitPrev + 0xffff - pitNow;
+        }
+
+        [NoHeapAllocation]
+        internal long GetKernelTicks(int pitNow)
+        {
+            int  pitOffset = ComputePitOffset(this.pitLastClock, pitNow);
+            long delta = Timer8254.PitTicksToTimeSpanTicks(pitOffset);
+            long r = this.upTime + delta;
+
+            if (r < this.lastKernelTicks)
+            {
+                // This should only be by a few ticks.
+                // Something to look for if you are ever
+                // working on this code.
+                r = this.lastKernelTicks;
+            } else {
+                this.lastKernelTicks = r;
+            }
+            return r;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Hal.LegacyPC/Timer8254.cs b/base/Kernel/Singularity.Hal.LegacyPC/Timer8254.cs
new file mode 100644
index 0000000..a2a066c
--- /dev/null
+++ b/base/Kernel/Singularity.Hal.LegacyPC/Timer8254.cs
@@ -0,0 +1,615 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Timer8254.cs
+//
+//  Useful reference URLs:
+//    http://developer.intel.com/design/archives/periphrl/index.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/7203.htm
+//    http://developer.intel.com/design/archives/periphrl/docs/23124406.htm
+//
+// The basic ideas for this driver come from the MMOSA code,
+// though the implementation differs.  This is partly because
+// the code needs to run on Virtual PC and it isn't able to do
+// a very accurate emulation of the i8254.
+//
+// There are two source available for timing - the Real-Time
+// Clock (RTC) and the programmable interval timer (PIT).  The
+// standard PC RTC is based on derivatives of the Motorola
+// MC146818A.  It's able to provide the time with a resolution
+// of 1 second and also has a programmable periodic interrupt.
+//
+// The programmable interrupt timer is based on the i8254.  It
+// can be programmed in a variety of modes - we use it to
+// generate an interrupt at a configurable time in the future
+// and then reprogram it each interrupt.  The maximum interrupt
+// period is 65535 ticks of a 1.193MHz clock.
+//
+// We use both of the RTC and the programmable interrupt timer to
+// maintain our estimate of the current time.  The RTC provides granularity
+// to with 1/64 seconds and the time is used to get an estimate to within
+// 1/1.193 * 10e-6 seconds within each RTC interval.
+//
+// The key variables are:
+//
+// upTime -   the time the system has been up.  This variable gets
+//            updated during the periodic RTC interrupt handling
+//            (delta = 1/64Hz).
+//
+// pitLast -  the last value programmed into the PIT.  The PIT counts down
+//            and generates an interrupt at (or shortly after) the instant
+//            the current PIT value reaches zero.
+//
+// pitAccum - the accumulated time measured by the PIT since upTime
+//            was updated.
+//
+// The current kernel time is always:
+//      upTime + pitAccum + (pitLast - pitCurrent)
+//
+// The PIT is always programmed to run, either by the consumer of the timer
+// interface or by the timer itself.
+//
+//    Timer::SetNextInterrupt(t)
+//      pitAccum += (pitLast - pitCurrent)
+//      // program PIT (not shown)
+//      pitLast = t
+//
+//    Timer::Interrupt()
+//      pitAccum += pitLast;
+//      // But PIT time may accumulate between interrupt dispatch and crossing
+//      // Zero so.
+//      if (pitCurrent != 0)
+//           pitAccum += (MaxPitValue - pitCurrent)
+//      // Inform user of interrupt
+//      if (userNotScheduledInterrupt)
+//           SetNextInterrupt(MaxInterruptInterval)
+//
+//    RTC::Interrupt()
+//      pitLast = pitNow
+//      pitAccum = 0
+//      upTime += RTCInterruptPeriod
+//
+// All of these methods are atomic interrupt-wise.
+//
+// Note: if we want to test the accuracy of the timer over a
+// period we can set RTC::Interrupt to just return without
+// touching any variables.  All of the time accumulated will end
+// up in pitAccum.
+//
+// Conditionals
+//
+// TIMER_NO_GO  - disables timer and scheduling of timer interrupts.
+//
+// RTC_NO_GO    - disable RTC.
+//
+// DEBUG_TIMER  - enable timer debug messages and boot-time diagnostics.
+//
+// DEBUG_CLOCK  - enable clock debug messages
+//
+// LOG_CLOCK    - log adjustments to clock time and dump out later.
+//
+// LOG_SNI      - log calls to SetNextInterrupt to see what's being thrown in.
+//
+// Tip: When this code does not behave useful things to check
+// are the interrupt rate and the rate of calls to
+// SetNextInterrupt.
+//
+
+// #define VERBOSE
+
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+using System.Threading;
+
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Hal
+{
+    // declare resources for the kernel manifest
+    [DriverCategory]
+    [Signature("/pnp/PNP0100")]
+    public sealed class TimerResources : DriverCategoryDeclaration
+    {
+        [IoPortRange(0, Default = 0x40, Length = 0x04)]
+        public IoPortRange port1;
+
+        [IoIrqRange(1, Default = 0x00, Length = 0x01)]
+        public IoIrqRange irq1;
+
+        [IoFixedPortRange(Base = 0x0061, Length = 0x01)]
+        public IoPortRange port2;
+    }
+
+    /*
+     * Note on the i8254 timer:
+     *
+     * The clock is driven by a 14.318 MHz clock through a divide-by-12
+     * counter.
+     * This gives a clock frequency of 1.193 MHz.
+     * Each tick is therefore 0.838 microseconds long.
+     * Thus a 16 bit timer gives us a maximum delay of 0.05 seconds.
+     */
+    [ CLSCompliant(false) ]
+    public sealed class Timer8254
+    {
+        /* Registers */
+        const byte  i8254_C0     = 0x00;    /* counter 0     */
+        const byte  i8254_C1     = 0x01;    /* counter 1     */
+        const byte  i8254_C2     = 0x02;    /* counter 2     */
+        const byte  i8254_CW     = 0x03;    /* control word    */
+
+        /*
+          The control word to the 8254 is composed of four fields:
+          bits 6-7: select the counter
+          bits 4-5: select read/write
+          bits 1-3: mode to use
+          bit  0  : BCD mode
+        */
+
+        /* bits 6-7 select the counter */
+        const byte i8254_CW_SEL0      = 0x00;  /* select counter 0       */
+        const byte i8254_CW_SEL1      = 0x40;  /* select counter 1       */
+        const byte i8254_CW_SEL2      = 0x80;  /* select counter 2       */
+        const byte i8254_CW_RBC       = 0xc0;  /* read-back command      */
+
+        /* bits 4-5 select transaction type */
+        const byte i8254_CW_CLC       = 0x00;  /* counter latch comm.    */
+        const byte i8254_CW_LSB       = 0x10;  /* r/w lsb only           */
+        const byte i8254_CW_MSB       = 0x20;  /* r/w msb only           */
+        const byte i8254_CW_BOTH      = 0x30;  /* r/w lsb, then msb      */
+
+        /* bits 1-3 select the mode. bit 3 is sometimes a don't care */
+        const byte i8254_CW_MODE0     = 0x00;  /* int. on term. count    */
+        const byte i8254_CW_MODE1     = 0x02;  /* h/w retrig. one-shot   */
+        const byte i8254_CW_MODE2     = 0x04;  /* rate generator         */
+        const byte i8254_CW_MODE3     = 0x06;  /* square wave mode       */
+        const byte i8254_CW_MODE4     = 0x08;  /* s/w trig. strobe       */
+        const byte i8254_CW_MODE5     = 0x0a;  /* h/w trig. strobe       */
+
+        /* bit 0 sets BCD mode, if you really must */
+        const byte i8254_CW_BCD       = 0x01;  /* set BCD operation      */
+
+        /* read-back commands use bits 4 and 5 to return status these
+         * are the wrong way round since the bits are inverted (RTFDS).
+         */
+        const byte i8254_RB_NOSTATUS  = 0xd0;  /* Don't get latched count */
+        const byte i8254_RB_NOCOUNT   = 0xe0;  /* Don't get status       */
+        const byte i8254_RB_ALL       = 0xc0;  /* Get status and count   */
+
+        /* read-back commands use bits 3-1 to select counter */
+        const byte i8254_RB_SEL0      = 0x02;  /* counter 0              */
+        const byte i8254_RB_SEL1      = 0x04;  /* counter 1              */
+        const byte i8254_RB_SEL2      = 0x08;  /* counter 2              */
+
+        /* status from read-back is returned in bits 6-7 */
+        const byte i8254_RB_OUT       = 0x80;  /* out pin value          */
+        const byte i8254_RB_NULL      = 0x40;  /* 1 = count null         */
+
+        private PnpConfig config;
+        private Pic       pic;
+        private byte      irq;
+
+        /* IOPorts */
+        private IoPort C0Port;
+        private IoPort C2Port;
+        private IoPort CWPort;
+
+        internal static readonly int PitInterruptThreshold = 0xffff;
+        internal static readonly int PitMaxWrite           = 0xffff;
+
+        /* Timer State */
+        private volatile bool interruptPending = false;
+
+        internal volatile uint irqCount = 0;
+        internal RtcPitState rps;
+
+        internal void SetTicksPerSecond(int count)
+        {
+#if DYNAMIC_TICKS
+            ticksPerSecond = count;
+            unchecked {
+                Tracing.Log(Tracing.Audit, "i8254 Frequency {0} Hz.",
+                            (UIntPtr)(uint)ticksPerSecond);
+            }
+#endif // DYNAMIC_TICKS
+        }
+
+        // Constructor
+        internal Timer8254(PnpConfig config, Pic pic)
+        {
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "Timer8254: create");
+#endif
+
+            // /pnp/08/02/01/PNP0100 0003 cfg dis : ISA 8254 Timer : AT Timer
+            // IRQ mask=0001 type=47
+            // I/O Port inf=01 min=0040 max=0040 aln=01 len=04 0040..0043
+            this.config = config;
+            this.pic    = pic;
+            this.irq    = ((IoIrqRange)config.DynamicRanges[1]).Irq;
+            IoPortRange ioPorts = (IoPortRange) config.DynamicRanges[0];
+            C0Port = ioPorts.PortAtOffset(i8254_C0, 1, Access.ReadWrite);
+            C2Port = ioPorts.PortAtOffset(i8254_C2, 1, Access.ReadWrite);
+            CWPort = ioPorts.PortAtOffset(i8254_CW, 1, Access.ReadWrite);
+
+            // Enable Timer2
+            // Lower 2 bits of port 61 are described in:
+            // The Indispensable PC Hardware Book (3rd Edition) p.724
+            ioPorts = (IoPortRange) config.FixedRanges[0];
+            IoPort p = ioPorts.PortAtOffset(0, 1, Access.ReadWrite);
+            p.Write8((byte) ((p.Read8() & 0xfc) | 0x01));
+        }
+
+        public byte Initialize()
+        {
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "Timer.Initialize()");
+#endif
+
+            rps = new RtcPitState();
+            Stop();
+            DoPitPerformanceTests();
+
+            pic.EnableIrq(irq);
+            return pic.IrqToInterrupt(irq);
+        }
+
+        public void Finalize()
+        {
+            pic.DisableIrq(irq);
+            Stop();
+        }
+
+        internal void Start()
+        {
+#if !TIMER_NO_GO
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                PitWrite(0xffff);
+                Timer2Start();
+                SetKeepAliveInterrupt();
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+#endif // TIMER_NO_GO
+        }
+
+        internal void Stop()
+        {
+            /*
+             * Half-program counter to stop counter running.  Trick copied
+             * from MMOSA i386 timer code
+             */
+            CWPort.Write8(i8254_CW_MODE0 | i8254_CW_BOTH | i8254_CW_SEL0);
+            C0Port.Write8((byte)(0));    /* LSB */
+            /* C0Port.Write8((byte)(0));  MSB DON'T! */
+        }
+
+        internal void Timer2Start()
+        {
+            CWPort.Write8(i8254_CW_MODE2 | i8254_CW_BOTH | i8254_CW_SEL2);
+            C2Port.Write8((byte)0xff);
+            C2Port.Write8((byte)0xff);
+        }
+
+        [NoHeapAllocation]
+        internal static int TimeSpanTicksToPitTicks(int ts)
+        {
+            // We should calculate scaling
+            // factors based on ticksPerSecond.
+
+            // Ticks = ts * 1193182 / 10000000
+            //       = ts * (0x1e/0x100 + 0x8ba/0x100000)
+            DebugStub.Assert(ts < 960000); // Limit for 0x8ba factor
+            return ((ts * 0x1e) >> 8) + ((ts * 0x8ba) >> 20);
+        }
+
+        [NoHeapAllocation]
+        internal static int PitTicksToTimeSpanTicks(int pit)
+        {
+            // We should calculate scaling
+            // factors based on ticksPerSecond.
+
+            // Ticks = pit * 10000000 / 1193182
+            //       = pit * (0x86 / 0x10) + (0x186 / 0x10000)
+            DebugStub.Assert(pit < 5500000); // Limit for 0x186 factor
+            return ((pit * 0x86) >> 4) + ((pit * 0x186) >> 16);
+        }
+
+        /* Interrupt constants (in units of TimeSpan tick == 100ns) */
+        public long MaxInterruptInterval {
+            [NoHeapAllocation]
+            get {
+                return 500000;  // 50ms
+            }
+        }
+
+        public long MinInterruptInterval {
+            [NoHeapAllocation]
+            get {
+                return 10000;   // 1ms
+            }
+        }
+
+        public long InterruptIntervalGranularity
+        {
+            [NoHeapAllocation]
+            get {
+                return 17;
+            }
+        }
+
+        [NoHeapAllocation]
+        public bool SetNextInterrupt(long delta)
+        {
+            if (delta < MinInterruptInterval || delta > MaxInterruptInterval) {
+#if VERBOSE
+                unchecked {
+                    Tracing.Log(Tracing.Audit, "Next Interrupt {0} false",
+                                (UIntPtr)(uint)delta);
+                }
+#endif
+                return false;
+            }
+
+#if VERBOSE
+            unchecked {
+                Tracing.Log(Tracing.Audit, "NextInterrupt {0} true",
+                            (UIntPtr)(uint)delta);
+            }
+#endif
+
+#if TIMER_NO_GO
+            return true;
+#endif
+            bool iflag   = Processor.DisableInterrupts();
+            try {
+                ClockLogger.AddEntry(2, rps, this, delta);
+
+                PitWrite(TimeSpanTicksToPitTicks((int)delta));
+                this.interruptPending = true;
+
+                ClockLogger.AddEntry(3, rps, this, delta);
+            } finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            return true;
+        }
+
+        /// <remarks> Set timer interrupt to start or keep timer running.
+        /// The user is expected to call SetNextInterrupt regularly during
+        /// normal operation.  This method is invoked at start-up and if
+        /// we find the timer interrupt is not programmed during the clock
+        /// interrupt.
+        /// </remarks>
+        [NoHeapAllocation]
+        internal void SetKeepAliveInterrupt()
+        {
+            ClockLogger.AddEntry(0, rps, this);
+            PitWrite(PitMaxWrite);
+            ClockLogger.AddEntry(1, rps, this);
+            this.interruptPending = true;
+        }
+
+        internal bool InterruptPending
+        {
+            [NoHeapAllocation]
+            get { return interruptPending; }
+        }
+
+        [NoHeapAllocation]
+        public void ClearInterrupt()
+        {
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "Timer.ClearInterrupt()");
+#endif
+#if TIMER_NO_GO
+            Tracing.Log(Tracing.Notice, "Unwanted timer interrupt!");
+#endif // TIMER_NO_GO
+
+            ClockLogger.AddEntry(10, rps, this);
+
+            long currentTime = rps.GetKernelTicks(Timer2Read());
+
+            this.interruptPending = false;
+
+            irqCount++;
+            ClockLogger.AddEntry(11, rps, this);
+            pic.AckIrq(irq);
+        }
+
+        [NoHeapAllocation]
+        private void PitAccessError()
+        {
+            DebugStub.Break();
+        }
+
+
+        [NoHeapAllocation]
+        internal void PitWrite(int pt)
+        {
+#if TIMER_NO_GO
+            return;
+#endif // TIMER_NO_GO
+            IoResult result;
+
+            result = CWPort.Write8NoThrow(i8254_CW_MODE0 | i8254_CW_BOTH | i8254_CW_SEL0);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = C0Port.Write8NoThrow((byte)(pt & 0xff));
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = C0Port.Write8NoThrow((byte)(pt >> 8));
+            DebugStub.Assert(IoResult.Success == result);
+            byte v;
+            do {
+                result = CWPort.Write8NoThrow(i8254_RB_NOCOUNT | i8254_RB_SEL0);
+                DebugStub.Assert(IoResult.Success == result);
+
+                result = C0Port.Read8NoThrow(out v);
+                DebugStub.Assert(IoResult.Success == result);
+            } while ((v & i8254_RB_NULL) == i8254_RB_NULL);
+        }
+
+        volatile int timer2reads = 0;
+
+        [NoHeapAllocation]
+        internal int Timer2Read()
+        {
+            timer2reads++;
+            DebugStub.Assert(timer2reads == 1);
+
+            IoResult result = CWPort.Write8NoThrow(i8254_RB_NOSTATUS | i8254_RB_SEL2);
+            DebugStub.Assert(IoResult.Success == result);
+
+            byte lo, hi;
+
+            result = C2Port.Read8NoThrow(out lo);
+            DebugStub.Assert(IoResult.Success == result);
+
+            result = C2Port.Read8NoThrow(out hi);
+            DebugStub.Assert(IoResult.Success == result);
+
+            timer2reads--;
+            DebugStub.Assert(timer2reads == 0);
+
+            return (int)lo | ((int)hi << 8);
+        }
+
+        internal int PitRead()
+        {
+            CWPort.Write8(i8254_RB_ALL | i8254_RB_SEL0);
+            byte status = C0Port.Read8();
+            int pit1 = (int)C0Port.Read8() | ((int)C0Port.Read8() << 8);
+
+            // Extend pit value using i8254 output bit
+            if ((status & i8254_RB_OUT) == 0 ||
+                (pit1 == 0 && interruptPending == true)) {
+                pit1 += PitInterruptThreshold;
+            }
+
+            return pit1;
+        }
+
+        [ Conditional("DEBUG_TIMER") ]
+        private void PitDirectReadTest()
+        {
+            uint[] p = new uint [6];
+
+            PitWrite(0xffff);
+
+            for (int i = 0; i < p.Length; i++) {
+                CWPort.Write8(i8254_RB_NOSTATUS | i8254_RB_SEL0);
+                p[i] = C0Port.Read8();
+                p[i] += (uint) (((int)C0Port.Read8()) << 8);
+            }
+            Stop();
+
+            DebugStub.Print("Direct back to back reads in pit ticks:" +
+                            "{0} {1} {2} {3} {4} {5}\n",
+                            __arglist(
+                                p[0] - p[1],
+                                p[1] - p[2],
+                                p[2] - p[3],
+                                p[3] - p[4],
+                                p[4] - p[5]));
+        }
+
+        [ Conditional("DEBUG_TIMER") ]
+        private void PitWriteReadTest()
+        {
+            DebugStub.Print("PitWriteRead() test...\n");
+            int pitLast = 0x4fff;
+            int pitNow;
+            int pitEnd = 0x3fff;
+
+            PitWrite(pitLast);
+            do {
+                pitNow = PitRead();
+                if (pitNow > pitLast) {
+                    DebugStub.Print("({0} > {1})\n",
+                                    __arglist(pitNow, pitLast));
+                    break;
+                }
+                pitLast = pitNow;
+            } while (pitNow > pitEnd);
+
+            DebugStub.Print((pitNow <= pitEnd) ? "PASSED\n" : "FAILED\n");
+        }
+
+        [Conditional("DEBUG_TIMER")]
+        private void DoPitPerformanceTests()
+        {
+            PitWriteReadTest();
+
+            ulong tsc0 = 0;
+            ulong tsc1 = 0;
+
+            for (int i = 0; i < 3 ; i++) {
+                tsc0 = Processor.CycleCount;
+                tsc0 = Processor.CycleCount;
+                tsc0 = Processor.CycleCount;
+                tsc0 = Processor.CycleCount;
+                tsc1 = Processor.CycleCount;
+                tsc1 = Processor.CycleCount;
+                DebugStub.Print("Kernel.GetCpuCycleCount took {0} cycles\n",
+                                __arglist(tsc1 - tsc0));
+                ulong overhead = (tsc1 - tsc0) / 2;
+                // On VPC this figure varies wildly
+                // So it's set to zero and the measurement below include
+                // the cost of measuring the cycles.
+                overhead = 0;
+
+                DebugStub.Print("PitTicksToTimeSpanTicks() in cycles...\n");
+                for (int j = 0; j < 10; j++) {
+                    tsc0 = Processor.CycleCount;
+                    PitTicksToTimeSpanTicks(0);
+                    tsc1 = Processor.CycleCount;
+                    DebugStub.Print("{0}\n", __arglist(tsc1 - tsc0 - overhead));
+                }
+
+                DebugStub.Print("TimeSpanTicksToPitTicks() in cycles...\n");
+                for (int j = 0; j < 10; j++) {
+                    tsc0 = Processor.CycleCount;
+                    TimeSpanTicksToPitTicks(0);
+                    tsc1 = Processor.CycleCount;
+                    DebugStub.Print("{0}\n", __arglist(tsc1 - tsc0 - overhead));
+                }
+
+                DebugStub.Print("PitWrite() in cycles...\n");
+                for (uint n = 0; n < 10; n++) {
+                    tsc0 = Processor.CycleCount;
+                    PitWrite(0xffff);
+                    tsc1 = Processor.CycleCount;
+                    DebugStub.Print("{0}\n", __arglist(tsc1 - tsc0 - overhead));
+                }
+                Stop();
+
+                PitWrite(0xffff);
+                DebugStub.Print("PitRead() in cycles...\n");
+                for (uint n = 0; n < 10; n++) {
+                    tsc0 = Processor.CycleCount;
+                    PitRead();
+                    tsc1 = Processor.CycleCount;
+                    DebugStub.Print("{0}\n", __arglist(tsc1 - tsc0));
+                }
+                Stop();
+
+                DebugStub.Print("Pit Direct Read Test\n");
+                PitDirectReadTest();
+
+                // Shut up SSC
+                tsc0 = tsc1;
+                tsc1 = tsc0;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Io/ConsoleOutput.sg b/base/Kernel/Singularity.Io/ConsoleOutput.sg
new file mode 100644
index 0000000..ce2fe52
--- /dev/null
+++ b/base/Kernel/Singularity.Io/ConsoleOutput.sg
@@ -0,0 +1,246 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ConsoleOutput.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Runtime.CompilerServices;  //StructAlign attribute
+using System.Runtime.InteropServices;   //structLayout attribute
+using System.GCs;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Hal;
+
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+namespace Microsoft.Singularity.Io
+{
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  The ConsoleOutput class has a single message pump that manages messages
+    //  to/from the "/dev/conout" namespace and incoming play requests.
+    //
+    public class ConsoleOutput
+    {
+        private static HalScreen! screen;
+        private static Thread!    worker;
+        private static bool       stopWork;
+
+        public static void Initialize()
+        {
+            screen = (!)Console.Screen;
+            stopWork = false;
+            worker = Thread.CreateThread(null, new ThreadStart(Pump));
+            worker.Start();
+        }
+
+        public static void Finalize()
+        {
+            stopWork = true;
+            worker.Join();
+        }
+
+        public static void Pump()
+        {
+            byte[] side = new byte [160];
+
+            // Create a ServiceProvider channel
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! sp;
+            ServiceProviderContract.NewChannel(out imp, out sp);
+
+            // Connect the service provider to the namespace.
+            DirectoryServiceContract.Imp nc = DirectoryService.NewClientEndpoint();
+
+            // Register the device using the namespace.
+            try {
+                nc.SendRegister(Bitter.FromString2("/dev/conout"), imp);
+                switch receive {
+                    case nc.AckRegister():
+                        break;
+
+                    case nc.NakRegister(rejected, error):
+                        DebugStub.Break();
+                        if (rejected != null) {
+                            delete rejected;
+                        }
+                        break;
+
+                    case unsatisfiable:
+                        DebugStub.Print("unable to register /dev/conout with name service\n");
+                        DebugStub.Break();
+                        delete sp;
+                        return;
+                }
+            }
+            finally {
+                delete nc;
+            }
+            Tracing.Log(Tracing.Audit, "conout Registered");
+
+            // create a set of all client endpoints connected to the sound device
+            ESet<ConsoleDeviceContract.Exp:Ready> clients
+                = new ESet<ConsoleDeviceContract.Exp:Ready>();
+
+            try {
+                while (!stopWork) {
+                    switch receive {
+                        // Listen for new connections
+                        case sp.Connect(candidate): {
+                            ConsoleDeviceContract.Exp newClient
+                                = candidate as ConsoleDeviceContract.Exp;
+
+                            if (newClient != null) {
+                                newClient.SendSuccess();
+                                clients.Add(newClient);
+                                sp.SendAckConnect();
+                            }
+                            else {
+                                sp.SendNackConnect(candidate);
+                            }
+                            break;
+                        }
+
+                        case ep.Clear() in clients: {
+                            screen.Clear();
+                            ep.SendAckClear();
+
+                            clients.Add(ep);    // add client endpoint back into set.
+                            break;
+                        }
+
+                        case ep.GetDisplayDimensions() in clients: {
+                            int columns, rows;
+                            screen.GetDisplayDimensions(out columns, out rows);
+                            ep.SendDisplayDimensions(columns, rows);
+                            clients.Add(ep);
+                            break;
+                        }
+
+                        case ep.GetCursorPosition() in clients: {
+                            int column, row;
+                            screen.GetCursorPosition(out column, out row);
+                            ep.SendCursorPosition(column, row);
+                            clients.Add(ep);
+                            break;
+                        }
+
+                        case ep.SetCursorPosition(column, row) in clients: {
+                            if (screen.SetCursorPosition(column, row)) {
+                                ep.SendAckSetCursorPosition();
+                            }
+                            else {
+                                ep.SendInvalidPosition();
+                            }
+                            clients.Add(ep);
+                            break;
+                        }
+
+                        case ep.SetCursorSize(cursorSize) in clients:
+                            if (cursorSize == CursorSize.Large) {
+                                screen.SetCursorSizeLarge();
+                            }
+                            else {
+                                screen.SetCursorSizeSmall();
+                            }
+                            ep.SendAckSetCursorSize();
+                            clients.Add(ep);
+                            break;
+
+                        case ep.Write(buffer, offset, count) in clients: {
+                            if (buffer != null)
+                            {
+                                if (side.Length < count) {
+                                    side = new byte [count];
+                                }
+                                for (int i = 0; i < count; i++) {
+                                    side[i] = (byte)buffer[offset + i];
+                                }
+                                screen.Write(side, 0, count);
+                            }
+                            ep.SendAckWrite(buffer);
+                            clients.Add(ep);    // add client endpoint back into set.
+                            break;
+                        }
+
+                        case ep.PutChar(char c) in clients:
+                            screen.PutChar(c);
+                            ep.SendAckPutChar();
+                            clients.Add(ep);
+                            break;
+
+                        case ep.PutCharAt(char c, int column, int row) in clients:
+                            if (screen.PutCharAt(c, column, row)) {
+                                ep.SendAckPutCharAt();
+                            }
+                            else {
+                                ep.SendInvalidPosition();
+                            }
+                            clients.Add(ep);    // add client endpoint back into set.
+                            break;
+
+                        case ep.ClearCursorToEndOfLine() in clients:
+                            screen.ClearCursorToEndOfLine();
+                            ep.SendAckClearCursorToEndOfLine();
+                            clients.Add(ep);
+                            break;
+
+                        case ep.CursorFlash() in clients: {
+                            screen.CursorFlash();
+                            ep.SendAckCursorFlash();
+                            clients.Add(ep);    // add client endpoint back into set.
+                            break;
+                        }
+
+                        case ep.CursorHide() in clients: {
+                            screen.CursorHide();
+                            ep.SendAckCursorHide();
+                            clients.Add(ep);    // add client endpoint back into set.
+                            break;
+                        }
+
+                        case ep.CursorShow() in clients: {
+                            screen.CursorShow();
+                            ep.SendAckCursorShow();
+                            clients.Add(ep);    // add client endpoint back into set.
+                            break;
+                        }
+                            // Listen for client departure
+                        case ep.ChannelClosed() in clients: {
+                            Tracing.Log(Tracing.Debug, "Client channel closes.");
+                            delete ep;
+                            break;
+                        }
+
+                        case unsatisfiable: {
+                            Tracing.Log(Tracing.Debug, "Received unknown message.");
+                            DebugStub.Break();
+                            stopWork = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            finally {
+                Tracing.Log(Tracing.Debug, "conout finished message pump.");
+                clients.Dispose();
+                delete sp;
+            }
+
+            Tracing.Log(Tracing.Audit, "Shutdown");
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Io/IBusDevice.cs b/base/Kernel/Singularity.Io/IBusDevice.cs
new file mode 100644
index 0000000..f25224a
--- /dev/null
+++ b/base/Kernel/Singularity.Io/IBusDevice.cs
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IBusDevice.cs
+//
+//  Note:
+//
+
+using System.Collections;
+
+namespace Microsoft.Singularity.Io
+{
+    public interface IBusDevice : IDevice
+    {
+        SortedList Enumerate();
+    }
+}
diff --git a/base/Kernel/Singularity.Io/IDevice.cs b/base/Kernel/Singularity.Io/IDevice.cs
new file mode 100644
index 0000000..7ae09b5
--- /dev/null
+++ b/base/Kernel/Singularity.Io/IDevice.cs
@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IDevice.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Io
+{
+    public interface IDevice
+    {
+        void Initialize();
+        void Finalize();
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Kernel/Singularity.Io/IoIrq.cs b/base/Kernel/Singularity.Io/IoIrq.cs
new file mode 100644
index 0000000..d547b5f
--- /dev/null
+++ b/base/Kernel/Singularity.Io/IoIrq.cs
@@ -0,0 +1,179 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoIrq.cs
+//
+
+//#define DEBUG_DISPATCH_IO
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity.Hal;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoIrq
+    {
+        private readonly byte irq;
+        private AutoResetEvent! signal;
+        private IoIrq next;
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        private const int MaxInterrupts = 256;
+        private static IoIrq[]! registered;
+        private static SpinLock regLock;
+
+        static IoIrq()
+        {
+            registered = new IoIrq [MaxInterrupts];
+            regLock = new SpinLock();
+        }
+
+        [NoHeapAllocation]
+        private static bool AcquireLock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            regLock.Acquire();
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [NoHeapAllocation]
+        private static void ReleaseLock(bool enabled)
+        {
+#if SINGULARITY_MP
+            regLock.Release();
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(enabled);
+        }
+
+        // This doesn't need a lock because Register and Release
+        // insure that the list is *always* valid (even when being updated).
+        [NoHeapAllocation]
+        public static void SignalInterrupt(byte irq)
+        {
+#if DEBUG_DISPATCH_IO
+            DebugStub.WriteLine("++ SetInterruptEvent: Irq={0:x2}", __arglist(irq));
+#endif
+            for (IoIrq step = registered[irq]; step != null; step = step.next) {
+                step.signal.Set();
+            }
+        }
+
+        public IoIrq(byte irq)
+        {
+            this.irq = irq;
+            this.next = null;
+            this.signal = new AutoResetEvent(false);
+        }
+
+        public byte Irq
+        {
+            [NoHeapAllocation]
+            get { return irq; }
+        }
+
+        // Insert the IoIrq into the linked list for this irq.
+        // If it is the first entry, then notify HAL to enable its irq.
+        // Returns true if this IoIrq caused the irq to be enabled.
+        public bool RegisterInterrupt()
+        {
+            bool enabled = AcquireLock();
+            try {
+                Tracing.Log(Tracing.Debug, "Register Irq={0:x2}", irq);
+#if DEBUG_DISPATCH_IO
+                DebugStub.WriteLine("++ Register Irq={0:x2}", __arglist(irq));
+#endif
+
+                next = registered[irq];
+                registered[irq] = this;
+
+                if (next == null) {
+                    HalDevices.EnableIoInterrupt(irq);
+                    return true;
+                }
+            }
+            finally {
+                ReleaseLock(enabled);
+            }
+            return false;
+        }
+
+        // Remove the IoIrq into the linked list for this irq.
+        // If it is the last entry, then notify HAL to disable its irq.
+        // Returns true if this IoIrq caused the irq to be disabled.
+        public bool ReleaseInterrupt()
+        {
+            bool enabled = AcquireLock();
+            try {
+                Tracing.Log(Tracing.Debug, "Release Irq={0:x2}", irq);
+#if DEBUG_DISPATCH_IO
+                DebugStub.WriteLine("++ Release Irq={0:x2}", __arglist(irq));
+#endif
+
+                if (registered[irq] == this) {
+                    registered[irq] = this.next;
+                }
+                else {
+                    IoIrq! prev = (!)registered[irq];
+                    while (prev.next != this) {
+                        prev = prev.next;
+                    }
+                    prev.next = this.next;
+                }
+
+                if (registered[irq] == null) {
+                    HalDevices.DisableIoInterrupt(irq);
+                    return true;
+                }
+            }
+            finally {
+                ReleaseLock(enabled);
+            }
+            return true;
+        }
+
+        public bool WaitForInterrupt()
+        {
+            if (signal != null) {
+                return signal.WaitOne();
+            }
+            return false;
+        }
+
+        public bool WaitForInterrupt(TimeSpan timeout)
+        {
+            if (signal != null) {
+                return signal.WaitOne(timeout);
+            }
+            return false;
+        }
+
+        public void Pulse()
+        {
+            signal.Set();
+        }
+
+        public bool AckInterrupt()
+        {
+#if DEBUG_DISPATCH_IO
+            DebugStub.WriteLine("++ AckInterrupt: Irq={0:x2}", __arglist(irq));
+#endif
+            HalDevices.EnableIoInterrupt(irq);
+            return true;
+        }
+
+        public override string! ToString()
+        {
+            return String.Format("IRQ:{0,2:x2}", irq);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Io/IoSystem.csproj b/base/Kernel/Singularity.Io/IoSystem.csproj
new file mode 100644
index 0000000..38103ed
--- /dev/null
+++ b/base/Kernel/Singularity.Io/IoSystem.csproj
@@ -0,0 +1,43 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>IoSystem</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ConsoleOutput.sg" />
+    <Compile Include="IBusDevice.cs" />
+    <Compile Include="IDevice.cs" />
+    <Compile Include="IoIrq.cs" />
+    <Compile Include="IoSystem.sg" />
+    <Compile Include="ResourceTracker.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Hal\Hal.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..\SpecSharp.Contracts\Kernel.Contracts.csproj" />
+    <ProjectReference Include="..\Singularity.Loader\Loader.csproj" />
+    <ProjectReference Include="..\Singularity.Directory\Directory.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Io/IoSystem.sg b/base/Kernel/Singularity.Io/IoSystem.sg
new file mode 100644
index 0000000..8839b65
--- /dev/null
+++ b/base/Kernel/Singularity.Io/IoSystem.sg
@@ -0,0 +1,1843 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoSystem.sg
+//
+//  Note:
+//
+
+//#define DEBUG_DISPATCH_IO
+//#define VERBOSE
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.Memory;
+
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Io
+{
+    internal sealed class VerboseOut
+    {
+        [ System.Diagnostics.Conditional("VERBOSE") ]
+        internal static void Print(string format, __arglist)
+        {
+            DebugStub.Print(format, new ArgIterator(__arglist));
+        }
+
+        [ System.Diagnostics.Conditional("VERBOSE") ]
+        internal static void Print(string message)
+        {
+            DebugStub.Print(message);
+        }
+
+        [ System.Diagnostics.Conditional("VERBOSE") ]
+        internal static void WriteLine(string format, __arglist)
+        {
+            DebugStub.WriteLine(format, new ArgIterator(__arglist));
+        }
+
+        [ System.Diagnostics.Conditional("VERBOSE") ]
+        internal static void WriteLine(string message)
+        {
+            DebugStub.WriteLine(message);
+        }
+    }
+
+    [CLSCompliant(false)]
+    public delegate IDevice! IoDeviceCreate(IoConfig! config,
+                                            String! instanceName);
+
+    internal class ExtensionDevice
+    {
+        // endpoint tags:
+        public const string EndpointSetXmlTag = "endpoints";
+        public const string ServiceEndpointXmlTag = "serviceProvider";
+        public const string ExtensionEndpointXmlTag = "extension";
+        public const string GenericEndpointXmlTag = "endpoint";
+        public const string ContractXmlAttribute = "contractName";
+        public const string EndpointEndXmlAttribute = "endpointEnd";
+        public const string IndexXmlAttribute = "id";
+
+        private readonly Driver!        driver;
+        private readonly DeviceNode!    device;
+        private String                  instance;
+        private Process                 process;
+        private TRef<ExtensionContract.Imp:Ready> channel;
+
+        // invariant driver.imagePath != null;
+
+        public ExtensionDevice(Driver! driver, DeviceNode! device)
+            requires driver.imagePath != null;
+        {
+            VerboseOut.Print("  ExtensionDevice({0})",
+                             __arglist(driver.name));
+
+            this.driver = driver;
+            this.device = device;
+            this.instance = null;
+            base();
+        }
+
+        public void Finalize()
+        {
+            VerboseOut.Print("Finalizing {0} (channel = {1})\n",
+                             __arglist(driver.name, channel != null));
+            if (channel == null) {
+                return;
+            }
+
+            ExtensionContract.Imp imp = channel.Acquire();
+            VerboseOut.Print("Requesting shutdown...");
+
+            imp.SendShutdown();
+            switch receive {
+                case imp.RecvAckShutdown():
+                    Tracing.Log(Tracing.Audit, "Driver shutdown!");
+                    break;
+                case imp.RecvNakShutdown():
+                    Tracing.Log(Tracing.Audit, "Driver won't shutdown!");
+                    break;
+                case unsatisfiable:
+                    Tracing.Log(Tracing.Audit, "Child aborted!");
+                    break;
+                case timeout(TimeSpan.FromSeconds(5)):
+                    DebugStub.Break();
+                    break;
+            }
+            delete imp;
+            VerboseOut.WriteLine("done");
+
+            channel = null;
+        }
+
+        // Activate a device driver
+        // NB: this method assumes that the device has already been checked, and
+        // its dependencies are all satisfied/satisfiable
+        public bool Activate()
+        {
+            // Update the /hardware namespace
+            if (driver.directoryRoot == null || device.directoryRoot == null) {
+                // The /hardware tree is incomplete for this device
+                DebugStub.Break();
+                return false;
+            }
+
+            // Create an instance name for this driver
+            for (int i = 0;; i++) {
+                string inst = driver.directoryRoot + "/instance" + i;
+                if (DirectoryService.FindDirectory(inst, false) == null) {
+                    instance = inst;
+                    break;
+                }
+            }
+
+            // Create the child process.
+            Manifest manifest;
+            
+            // from invariant
+            assume driver.imagePath != null;
+
+            IoMemory memory = Binder.LoadImage(Process.KernelProcess,
+                                               driver.imagePath,
+                                               out manifest);
+            if (null == memory && manifest == null) {
+                return false;
+            }
+
+            // The instance argument in the
+            // process arguments gets replaced by the service
+            // endpoint path if present in the manifest before
+            // we call process.Start().  This is a little ugly,
+            // but some services need to be able to pass their
+            // endpoint name to other services (e.g. disk driver
+            // to volume manager).
+            string [] processArgs = new String[] {
+                driver.imagePath,
+                "-instance",
+                instance,           // Value overwritten below (do not reorder)
+                "-signature",
+                device.MatchingDeviceId
+            };
+
+            process = new Process(Process.KernelProcess, memory, null,
+                                  processArgs, manifest);
+            if (null == process) {
+                return false;
+            }
+            process.IoConfig = device.config;
+
+            // the order here is a little bit funny; we need to create the
+            // endpoints before we start the driver.  We must also build the
+            // pieces of the /hardware tree that store the real endpoints.
+            // However, we cannot create the public names (i.e. those in the
+            // /dev namespace) until after the driver is started.
+
+            // [TODO] If the activation fails, there is no rollback,
+            // and so we'll end up with a polluted namespace
+
+            // since we can't create the public names until after driver
+            // activation, we need a place to store the string names as we
+            // generate them
+
+            SortedList publicServiceProviderNames = new SortedList();
+
+            // do the accounting, NS bindings, and endpoint creation:
+
+            // get the image node and device node, create the instance node
+            DirNode devImageNode = DirectoryService.FindDirectory(
+                driver.directoryRoot + "/image", false);
+            DirNode driverNode = DirectoryService.FindDirectory(instance, true);
+            DirNode! deviceNode = (!)DirectoryService.FindDirectory(
+                device.directoryRoot, false);
+
+            VerboseOut.Print("DriverName: {0}\n",
+                             __arglist(driver.directoryRoot));
+            VerboseOut.Print("DeviceName: {0}\n",
+                             __arglist(device.directoryRoot));
+
+            // build the symlinks:
+            DirectoryService.CreateSymbolicLink(driverNode, "device",
+                                           device.directoryRoot);
+            DirectoryService.CreateSymbolicLink(deviceNode, "driver",
+                                           instance);
+            if (devImageNode != null) {
+                DirectoryService.CreateSymbolicLink(driverNode, "image",
+                                               driver.directoryRoot);
+            }
+
+            // Now create and link all of the ServiceProvider endpoints
+            // that this driver provides:
+            XmlNode! endpoints
+                = (!)driver.metadata.GetChild(EndpointSetXmlTag);
+
+            // [TODO] this will not work correctly if there
+            // are non-endpoint declarations in the <endpoints> set
+            int endpointCount = endpoints.GetAttribute("length", 0);
+            process.SetEndpointCount(endpointCount);
+
+            int extensionIndex = -1; // we only support one extension
+            // Make all endpoints
+            foreach (XmlNode! endpoint in endpoints.Children) {
+                string! contract = (!)endpoint.GetAttribute(
+                    ContractXmlAttribute, "");
+                bool created = false;
+
+                int index = endpoint.GetAttribute(IndexXmlAttribute, -1);
+
+                if (endpoint.Name == ExtensionEndpointXmlTag &&
+                    extensionIndex == -1) {
+                    extensionIndex = index;
+                    created = true;
+                }
+                else if (endpoint.Name == ServiceEndpointXmlTag) {
+                    // create the /hardware name (private name)
+                    string privateName = instance + "/endpoint" + index;
+
+                    string! publicName;
+
+                    // now tell the ResourceTracker to connect this private
+                    // name and use the policy to create a public name
+                    Binder.SetEndpoint(process, index,
+                                       Binder.BindServiceProvider(
+                                           contract, privateName,
+                                           out created, out publicName));
+
+                    VerboseOut.Print("privateName: {0}\n",
+                                     __arglist(privateName));
+                    VerboseOut.Print("publicName: {0}\n",
+                                     __arglist(publicName));
+                    processArgs[2] = privateName;
+
+                    publicServiceProviderNames.Add(privateName, publicName);
+                }
+                else if (endpoint.Name == GenericEndpointXmlTag) {
+                    // get a pre-bound generic endpoint to a service from the
+                    // resource tracker
+                    created = Binder.BindServiceUser(process, index, contract, endpoint);
+                }
+                else {
+                    DebugStub.WriteLine("Invalid tag {0} in Metadata",
+                                        __arglist(endpoint.Name));
+                    DebugStub.Break();
+                }
+
+                // [TODO] how should we handle errors?  Can we do
+                // a roll-back?
+                if (!created) {
+                    DebugStub.Break();
+                    // we might have dangling endpoints and a polluted
+                    // /hardware namespace
+                    return false;
+                }
+            }
+            if (extensionIndex == -1) {
+                DebugStub.WriteLine("Driver is missing extension endpoint.");
+                DebugStub.Break();
+            }
+
+            // Add all endpoints that we created.
+            VerboseOut.Print(
+                "Activate Device {0} {1} [{2}]\n",
+                __arglist(device.location, driver.name, instance)
+                );
+
+            ExtensionContract.Imp! imp;
+            ExtensionContract.Exp! exp;
+            ExtensionContract.NewChannel(out imp, out exp);
+
+            Binder.SetEndpoint(process, extensionIndex, exp);
+            process.Start();
+
+            Tracing.Log(Tracing.Audit, "Waiting for driver {0:x8} to init.",
+                        Kernel.AddressOf(process));
+
+            bool success = false;
+            switch receive {
+                case imp.RecvSuccess():
+                    Tracing.Log(Tracing.Audit, "Driver initialized!");
+                    success = true;
+                    break;
+                case unsatisfiable:
+                    Tracing.Log(Tracing.Audit, "Driver failed to initialize!");
+                    break;
+            }
+
+            if (success) {
+                channel = new TRef<ExtensionContract.Imp:Ready>(imp);
+            }
+            else {
+                delete imp;
+            }
+
+            // update the public namespace
+            foreach (DictionaryEntry de in publicServiceProviderNames) {
+                string! privateName = (!)(de.Key as string);
+                string! publicName = (!)(de.Value as string);
+                Binder.CreatePublicSymlink(publicName, privateName);
+            }
+            return true;
+        }
+    }
+
+    // Driver encapsulates known device drivers.
+    internal class Driver
+    {
+        // Instance fields:
+        /// <summary>
+        /// Friendly name used in debugging.
+        /// This comes from the Name property of the System.Type instance.
+        /// </summary>
+        public readonly String! name;
+
+        /// <summary>
+        /// The PNP device ID (hardware, model, class, etc.) that this device driver definition binds to.
+        /// </summary>
+        public readonly String! pnpSignature;
+
+        /// <summary>
+        /// root node in directory.
+        /// </summary>
+        public readonly String! directoryRoot;
+
+        /// <summary>
+        /// The XML metadata for this driver.  -XXX- Which element?
+        /// </summary>
+        public readonly XmlNode! metadata;
+
+        /// <summary>
+        /// Creation delegate for internal (in-kernel) drivers.
+        /// </summary>
+        public readonly IoDeviceCreate factory;
+
+        /// <summary>
+        /// The binary / image path for the executable.
+        /// This field is only non-null for process drivers (not in-kernel drivers).
+        /// </summary>
+        public readonly String imagePath;
+
+        public override string! ToString()
+        {
+            if (factory != null)
+                return "<kernel driver '" + this.name + "'>";
+            if (imagePath != null)
+                return "<process driver '" + this.name + "' image=" + this.imagePath + "'>";
+            return "<hal driver '" + this.name + "'>";
+        }
+
+        /// <summary>
+        /// The number of instances of this device driver.
+        /// </summary>
+        private int instanceCount;
+
+        // Static fields:
+
+        /// <summary>
+        /// Key: string! PNP device ID
+        /// Value: Driver! driver
+        ///
+        /// List of registered drivers.  A given driver can be in this list more than once,
+        /// if that driver can match more than one device ID.
+        /// </summary>
+        private static SortedList DriversTable;
+
+        // Constructor for external drivers.
+        private Driver(String! pnpSignature,
+                       String! directoryRoot,
+                       String! imagePath,
+                       XmlNode! metadata)
+        {
+            this.name = imagePath;
+            this.pnpSignature = pnpSignature;
+            this.directoryRoot = directoryRoot;
+            this.metadata = metadata;
+            this.imagePath = imagePath;
+            this.factory = null;
+            base();
+        }
+
+        // Constructor for internal drivers.
+        private Driver(String! pnpSignature,
+                       String! directoryRoot,
+                       Type! type,
+                       IoDeviceCreate! factory,
+                       XmlNode! metadata)
+        {
+            this.name = (!)type.Name;
+            this.pnpSignature = pnpSignature;
+            this.directoryRoot = directoryRoot;
+            this.metadata = metadata;
+            this.imagePath = null;
+            this.factory = factory;
+            base();
+        }
+
+        // Constructor for HAL drivers.
+        private Driver(String! pnpSignature,
+                       String! directoryRoot,
+                       Type! type,
+                       XmlNode! metadata)
+        {
+            this.name = (!)type.Name;
+            this.pnpSignature = pnpSignature;
+            this.directoryRoot = directoryRoot;
+            this.metadata = metadata;
+            this.imagePath = null;
+            this.factory = null;
+            base();
+        }
+
+        // Generic helper function for driver registration.
+        private static void Add(Driver! driver)
+        {
+            if (DriversTable == null) {
+                DriversTable = new SortedList();
+            }
+
+            string canonical_device_id = GetCanonicalDeviceId(driver.pnpSignature);
+
+            Driver existingDriver = (Driver)DriversTable[canonical_device_id];
+            if (existingDriver != null) {
+                DebugStub.WriteLine("WARNING: Two drivers match the same PNP signature!");
+                DebugStub.WriteLine("    PNP signature:    " + canonical_device_id);
+                DebugStub.WriteLine("    Existing driver:  " + existingDriver.imagePath);
+                DebugStub.WriteLine("    Second driver:    " + driver.imagePath);
+                DebugStub.WriteLine("  The second driver will be IGNORED.");
+                return;
+            }
+
+            DriversTable.Add(canonical_device_id, driver);
+            VerboseOut.Print(
+                "Adding driver map:   device id {0,-25} -> {1}\n",
+                __arglist(driver.pnpSignature, driver.ToString())
+                );
+        }
+
+        static Driver FindDriverByDeviceId(string! deviceId)
+        {
+            if (DriversTable == null)
+                return null;
+
+            deviceId = GetCanonicalDeviceId(deviceId);
+            Driver driver = (Driver)DriversTable[deviceId];
+            return driver;
+        }
+
+        static string! GetCanonicalDeviceId(string! id)
+        {
+            return id.ToLower();
+        }
+
+        // Register an external driver.
+        public static Driver! Register(String! pnpSignature,
+                                       String! directoryRoot,
+                                       String! imagePath,
+                                       XmlNode! metadata)
+        {
+            Driver! driver
+                = new Driver(pnpSignature, directoryRoot, imagePath, metadata);
+            Add(driver);
+            return driver;
+        }
+
+        // Register an internal driver.
+        public static Driver! Register(String! pnpSignature,
+                                       String! directoryRoot,
+                                       Type! type,
+                                       IoDeviceCreate! factory,
+                                       XmlNode! metadata)
+        {
+            Driver! driver
+                = new Driver(pnpSignature, directoryRoot, type, factory, metadata);
+            Add(driver);
+            return driver;
+        }
+
+        // Register a HAL driver.
+        public static Driver! Register(String! pnpSignature,
+                                       String! directoryRoot,
+                                       Type! type,
+                                       XmlNode! metadata)
+        {
+            Driver! driver
+                = new Driver(pnpSignature, directoryRoot, type, metadata);
+            Add(driver);
+            return driver;
+        }
+
+        // Searches a list of PNP signatures for the best driver (closest match).
+        public static Driver FindBest(string[]! deviceIds, out string! matchingDeviceId)
+        {
+            VerboseOut.Print(
+                "Driver.FindBest: checking these signatures: " +
+                String.Join(", ", deviceIds) + "\n"
+                );
+
+            foreach (string deviceId in deviceIds)
+            {
+                assert deviceId != null;
+                VerboseOut.Print(
+                    "    checking signature: {0}\n", __arglist(deviceId)
+                    );
+
+                Driver driver = FindBest(deviceId);
+                if (driver != null) {
+                    VerboseOut.Print(
+                        "    Found matching driver: {0}\n", __arglist(driver)
+                        );
+                    matchingDeviceId = deviceId;
+                    return driver;
+                }
+            }
+
+            matchingDeviceId = "";
+            return null;
+        }
+
+        // Find the best driver for this PNP signature via prefix match.
+        public static Driver FindBest(string! deviceId)
+        {
+            Driver driver = FindDriverByDeviceId(deviceId);
+            return driver;
+        }
+
+        // Dump the list of know drivers.
+        public static void DumpAll()
+        {
+            if (DriversTable == null) return;
+#if false
+            DebugStub.WriteLine("\nDrivers:");
+            foreach (Driver driver in DriversTable.Values) {
+                if (driver == null)
+                    continue;
+                DebugStub.WriteLine("    " + driver);
+            }
+#endif
+
+            DebugStub.WriteLine("\nDevice ID mappings:");
+            foreach (DictionaryEntry entry in DriversTable) {
+                string! deviceId = (string)entry.Key;
+                Driver! driver = (!)(Driver)entry.Value;
+                DebugStub.WriteLine("  {0,-36} -> {1}", __arglist(deviceId, driver.name));
+            }
+
+            DebugStub.WriteLine("");
+
+
+            Tracing.Log(Tracing.Audit, "Drivers:");
+            foreach (Driver driver in DriversTable.Values) {
+                if (driver == null)
+                    continue;
+                Tracing.Log(Tracing.Audit, "{0}:{1}", driver.pnpSignature, driver.name);
+            }
+        }
+    }
+
+    // DeviceNodes are the single mechanism for initializing device drivers.
+    // DeviceNodes will never be fully populated, but once certain fields are
+    // populated correctly, the DeviceNode can move into a new list, signifying
+    // that it has moved into a new state of execution
+    internal class DeviceNode
+    {
+        public readonly String!     location;       // location on a bus
+
+        // This is the hardware ID (PNP signature) that we actually matched when
+        // locating a device driver.  This value is null if we have not associated
+        // a function driver.
+        public string MatchingDeviceId;
+
+        public readonly IoConfig!   config;         // Io resource container
+
+        public Driver               driver;         // associated device driver
+        public ExtensionDevice      extdev;         // external device.
+        public IDevice              intdev;         // internal device.
+        public String               directoryRoot;  // in the /Hardware namespace
+        public int                  startOrder;     // > zero when activated
+
+        public static int           lastStartOrder;
+
+        public DeviceNode(String! location, String! matchingDeviceId, IoConfig! config)
+        {
+            this.location = location;
+            this.MatchingDeviceId = matchingDeviceId;
+            this.config = config;
+            this.startOrder = -1;
+            base();
+        }
+
+        public override string! ToString()
+        {
+            if (MatchingDeviceId != null) {
+                return "[Device: location='" + this.location + "' MatchingDeviceId='" + this.MatchingDeviceId + "']";
+            } else {
+                return "[Device: location='" + this.location + " (not associated)]";
+            }
+        }
+    }
+
+
+    [CLSCompliant(false)]
+    public class IoSystem
+    {
+        //
+        // consts for accessing Xml tags and attributes
+        //
+
+        // tags describing the IoSystem config xml tree
+        public const string DriverRegistrationXmlTag = "driver";
+        public const string DriverNameXmlAttribute = "name";
+        public const string DeviceSignatureXmlAttribute = "signature";
+        public const string DriverPathXmlAttribute = "path";
+        public const string DriverClassXmlAttribute = "class";
+
+        // endpoint tags:
+        public const string EndpointSetXmlTag = "endpoints";
+        public const string ServiceEndpointXmlTag = "serviceProvider";
+        public const string ExtensionEndpointXmlTag = "extension";
+        public const string GenericEndpointXmlTag = "endpoint";
+        public const string ContractXmlAttribute = "contractName";
+        public const string EndpointEndXmlAttribute = "endpointEnd";
+
+        // Io resource tags
+        public const string FixedHardwareSetXmlTag = "fixedHardware";
+        public const string DynamicHardwareSetXmlTag = "dynamicHardware";
+        public const string PortRangeXmlTag = "ioPortRange";
+        public const string DmaRangeXmlTag = "ioDmaRange";
+        public const string IrqRangeXmlTag = "ioIrqRange";
+        public const string MemoryRangeXmlTag = "ioMemoryRange";
+        public const string AddressBitsXmlAttribute = "addressBits";
+        public const string AlignmentXmlAttribute = "alignment";
+        public const string BaseAddressXmlAttribute = "baseAddress";
+        public const string RangeLengthXmlAttribute = "rangeLength";
+        public const string ReadableXmlAttribute = "allowRead";
+        public const string WritableXmlAttribute = "allowWrite";
+        public const string SharedXmlAttribute = "shared";
+        public const string IndexXmlAttribute = "id";
+
+        // follows/provides tags
+        public const string FollowsXmlTag = "follows";
+        public const string ProvidesXmlTag = "provides";
+        public const string FollowsNameXmlAttribute = "name";
+
+        // xml config for the IoSystem
+        private static XmlNode!     config;
+
+        // a device instance consists (full signature, Dynamic IoConfig,
+        // location) and is created only during device enumeration.
+        private static SortedList!  instances;
+
+        // when a device instance is matched to a driver, we have an
+        // association.  This is an activatable object, if its dependencies
+        // are met.
+        private static SortedList!  associations;
+
+        // an instance that is successfully paired with a driver becomes
+        // an activatable entity.  Upon activation, it moves into this list.
+        private static SortedList!  activations;
+
+        // the entire "follows" tracking can be handled with one SortedList
+        private static SortedList!  followsList;
+
+        // to speed up LoadImage we need to cache a ref to the directory service root
+        // this is initialized in InitializeDirectoryService and used in FindFileImage
+        // and FindManifest
+        private static TRef<DirectoryServiceContract.Imp:Start> nsRootRef;
+
+        // In order to have unified accounting even for devices who do not have
+        // a Pnp signature (such as the hal console), we need a private,
+        // concrete IoConfig object
+        private class FixedIoConfig : IoConfig
+        {
+            public FixedIoConfig (string[] ids)
+            {
+                this.Ids = ids;
+                this.DynamicRanges = new IoRange[0];
+                this.FixedRanges = new IoRange[0];
+            }
+
+            public override string ToPrint()
+            {
+                return String.Join(",", this.Ids);
+            }
+        }
+
+        private static void StartProcess(string! name,
+                                         string! executable)
+        {
+            Process process = null;
+            Manifest manifest;
+
+            IoMemory memory = Binder.LoadImage(Thread.CurrentProcess,
+                                               executable,
+                                               out manifest);
+
+            if (memory != null && memory.Length > 0 && manifest != null) {
+                process = new Process(Thread.CurrentProcess,
+                                      memory,
+                                      null,
+                                      new string[1] {name},
+                                      manifest);
+                if (process != null) {
+                    VerboseOut.Print("I/O: Starting {0} process\n",
+                                     __arglist(name));
+                    process.Start();
+                }
+            }
+            else {
+                DebugStub.WriteLine("I/O: unable to find {0}",
+                                    __arglist(executable));
+            }
+        }
+
+        // VolumeManager initialization should be managed just
+        // like drivers, but currently isn't
+        public static void InitializeVolumeManager()
+        {
+            StartProcess("volmgr", "volmgr.x86");
+        }
+
+
+        // This configuration should move to DirectoryService.Initialize() and should
+        // involve xml
+        public static void InitializeDirectoryService()
+        {
+            // initialize IoMemory FileSystem
+            IoMemoryFS ioFS = new IoMemoryFS();
+            IoMemFSContract.Imp fsImp = ioFS.Start();
+            if (fsImp != null) {
+                Directory.DirectoryService.SetIoFS(fsImp);
+            }
+            // create  "/dev" namespace  and link it into the root
+#if true
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+
+            DirectoryServiceContract.Imp! dirImp;
+            DirectoryServiceContract.Exp! dirExp;
+            DirectoryServiceContract.NewChannel(out dirImp, out dirExp);
+            rootNS.SendBind((!)Bitter.FromString("/"), dirExp);
+
+            switch receive {
+                case rootNS.NakBind(rejected, error):
+                    delete rejected;
+                    DebugStub.Break();
+                    break;
+                case rootNS.AckBind():
+                    break;
+            }
+
+            dirImp.RecvSuccess();
+            nsRootRef = new TRef<DirectoryServiceContract.Imp:Start> (rootNS);
+
+            dirImp.SendCreateDirectory((!)Bitter.FromString("dev"));
+            switch receive {
+                case dirImp.AckCreateDirectory() :
+                    break;
+                case dirImp.NakCreateDirectory(error) :
+                    DebugStub.Break();
+                    break;
+            }
+
+            delete dirImp;
+#endif
+        }
+
+        public static unsafe void InitializeServiceManager(XmlNode !config)
+        {
+            const string Name = "sms";
+            const string Executable = "sms.x86";
+
+
+            ArrayList args = new ArrayList();
+
+            args.Add(Name);
+
+            if (config != null) {
+                foreach (XmlNode! service in config.Children) {
+                    if (service.Name != "service") {
+                        continue;
+                    }
+
+                    // Should be separated to avoid type ambiguity.
+                    string name = service.GetAttribute("name", "");
+                    string binary = service.GetAttribute("binary", "");
+                    string option = service.GetAttribute("mode", "managed");
+                    args.Add(name);
+                    args.Add(binary);
+                    args.Add(option);
+
+                    DebugStub.Print("SMS: Found " + name +
+                                    "(" + binary + ": " + option + ")\n");
+                }
+            }
+            else {
+                DebugStub.WriteLine("SMS:No Configuration");
+            }
+
+            String [] stringArgs = (string []) args.ToArray(typeof(string));
+            Process process = null;
+            Manifest manifest = null;
+
+            IoMemory memory = Binder.LoadImage(Thread.CurrentProcess,
+                                                Executable,
+                                                out manifest);
+
+            if (memory != null && memory.Length > 0 && manifest != null) {
+                DirectoryServiceContract.Imp! ds = DirectoryService.NewClientEndpoint();
+                if (ds == null) {
+                    DebugStub.Break();
+                }
+
+                process = new Process(Thread.CurrentProcess,
+                                        memory,
+                                        null,
+                                        stringArgs,
+                                        manifest);
+                if (process != null) {
+                    SharedHeap.Allocation *ep = (SharedHeap.Allocation *)ds;
+
+                    process.SetEndpointCount(1);
+                    process.SetEndpoint(0, ref ep);
+                    DebugStub.WriteLine("Starting SMS");
+                    process.Start();
+                }
+            }
+            else {
+                DebugStub.WriteLine("Unable to find {0}",
+                                    __arglist(Executable));
+                DebugStub.Break();
+            }
+        }
+        // initialize all variables
+        static public void Initialize(XmlNode! _config)
+        {
+            Tracing.Log(Tracing.Debug, "IoSystem.Initialize()");
+
+            // store the xml config:
+            // don't store the nsConfig, since we don't use it locally
+            config = _config;
+
+            // create all lists
+            instances = new SortedList();
+            activations = new SortedList();
+            associations = new SortedList();
+            followsList = new SortedList();
+
+            // initialize the resource tracker.
+            ResourceTracker.Initialize();
+
+            Tracing.Log(Tracing.Debug, "IoSystem.Initialized");
+        }
+
+        public static void Finalize()
+        {
+            Tracing.Log(Tracing.Debug, "IoSystem.Finalize()");
+            FinalizeOldDevices();
+        }
+
+        public static byte GetMaximumIrq()
+        {
+            return HalDevices.GetMaximumIrq();
+        }
+
+        // all sorted tracking is handled here:
+        // check if a follows name has been provided yet
+        public static bool CheckFollows(string followName)
+        {
+            return followsList.ContainsKey(followName);
+        }
+
+        // mark a follows name as being provided
+        public static void SetFollows(string! followName)
+        {
+            if (!followsList.ContainsKey(followName)) {
+                followsList.Add(followName, followName);
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        // Device Management Code: The kernel has 2 stages of device management.
+        //
+        //  Stage 1: there are no interrupts, and the Hal isn't even started.
+        //
+        //      In this stage, we use Drivers\register.cs to create a pnpbus,
+        //      and then we pass it to a custom method in IoSystem which
+        //      associates and activates the bus (the bus is not a process).
+        //      Then we start the Hal, and we use another custom method to
+        //      simulate association and activation of the hal devices (in this
+        //      case, we don't actually activate, we just mark the devices as
+        //      activated and give their resources to the Hal)
+        //
+        //  Stage 2: we can run any process whose dependencies are satisfied.
+        //
+        //      In this stage, we can start any driver, and so we use general
+        //      mechanisms.  We also pre-bind endpoints and generally do our
+        //      best to make everything nice and clean.  There is a hack in here
+        //      to let us register the drivers who haven't migrated to separate
+        //      processes.
+
+        // Parse the driverRegistry metadata to register drivers.
+        public static void RegisterDrivers()
+        {
+            foreach (XmlNode! driver in config.Children) {
+                if (driver.Name != DriverRegistrationXmlTag) {
+                    continue;
+                }
+                string! drivername
+                    = (!)driver.GetAttribute(DriverNameXmlAttribute, "");
+                string! image
+                    = (!)driver.GetAttribute(DriverPathXmlAttribute, "");
+                string! signature
+                    = (!)driver.GetAttribute(DeviceSignatureXmlAttribute, "");
+
+                // add the driver to /hardware/drivers
+                drivername = "/hardware/drivers/" + drivername;
+                DirNode! driverNode = (!)DirectoryService.FindDirectory(drivername,
+                                                                   true);
+
+                // if this is an external driver, create a symlink for the
+                // executable image of the driver.  Since this is at boot
+                // time, we know the image should go to /init
+                if (image != "") {
+                    // we only work with .x86 images for now:
+                    if (image.EndsWith(".x86")) {
+                        image = "/init/" + image.Remove(image.Length-4, 4);
+                        DirectoryService.CreateSymbolicLink(driverNode, "image",
+                                                       image);
+                    }
+                }
+
+                // [TODO] - if there is no device signature, what
+                // should we do?  We need some way to register the volume
+                // manager.
+                if (signature != "") {
+                    if (image != "") {
+                        Driver.Register(signature, drivername, image, driver);
+                    }
+                    // add the device to /hardware/registrations
+                    string! registration_path;
+                    if (signature.StartsWith("/"))
+                        registration_path = "/hardware/registrations" + signature;
+                    else
+                        registration_path = "/hardware/registrations/" + signature;
+                    DirNode! deviceNode =
+                        (!)DirectoryService.FindDirectory(registration_path, true);
+                    // create a symlink to the driver
+                    DirectoryService.CreateSymbolicLink(deviceNode, "driver",
+                                                   drivername);
+                }
+            }
+        }
+
+        // There are a few devices that aren't processes but who don't start
+        // until after interrupts are up.  Once all drivers become processes,
+        // this should go away.
+        // The key problem is that we haven't figured out, yet, how
+        // to move bus drivers out of the kernel.
+        public static bool RegisterKernelDriver(Type type,
+                                                IoDeviceCreate creator)
+        {
+            string iclass = ((!)type).FullName;
+            VerboseOut.Print("  Registering class: {0}\n",
+                             __arglist(iclass));
+
+            // Find any signatures in the metadata for this class.
+            bool match = false;
+            foreach (XmlNode! driver in config.Children) {
+                if (driver.Name != DriverRegistrationXmlTag) {
+                    continue;
+                }
+
+                string mclass = driver.GetAttribute(DriverClassXmlAttribute, "");
+                if (mclass != iclass) {
+                    continue;
+                }
+
+                match = true;
+                string! signature = (!)driver.GetAttribute(DeviceSignatureXmlAttribute, "");
+                VerboseOut.Print("    Registering signature: {0}\n",
+                                 __arglist(signature));
+
+                string! drivername = "/hardware/drivers/" +
+                    driver.GetAttribute(DriverNameXmlAttribute, "");
+
+                // Caution: we already added this to /hardware during the general
+                // registration process, but we need to give this node its name in
+                // /hardware
+                Driver.Register(signature, drivername, type, (!)creator, driver);
+            }
+
+            if (!match) {
+                DebugStub.WriteLine("Error: No metadata for class {0}",
+                                    __arglist(iclass));
+                DebugStub.Break();
+            }
+            return match;
+        }
+
+
+        // given a piece of metadata, generate an IoRange array
+        // the input is the <fixedHardware> or <dynamicHardware> node of a
+        // registered device's metadata
+        private static IoRange[] CreateIoRangesFromMetadata(XmlNode resources)
+        {
+            if (resources == null) {
+                return new IoRange[0];
+            }
+
+            // see if there are any resources in the metadata
+            int numitems = resources.GetAttribute("length", 0);
+
+            // Create all of the fixed resources in one IoRange array
+            IoRange[] ranges = new IoRange[numitems];
+            int i = 0;
+            foreach (XmlNode! res in resources.Children) {
+                if (res.Name == PortRangeXmlTag) {
+                    ushort fixedBase
+                        = (ushort)res.GetAttribute(BaseAddressXmlAttribute, 0);
+                    ushort fixedSize
+                        = (ushort)res.GetAttribute(RangeLengthXmlAttribute, 0);
+                    bool read = res.GetAttribute(ReadableXmlAttribute, true);
+                    bool write = res.GetAttribute(WritableXmlAttribute, true);
+
+                    ranges[i++] = new IoPortRange(fixedBase, fixedSize,
+                                                  read, write);
+                }
+                else if (res.Name == IrqRangeXmlTag) {
+                    byte fixedBase
+                        = (byte)res.GetAttribute(BaseAddressXmlAttribute, 0);
+                    byte fixedSize
+                        = (byte)res.GetAttribute(RangeLengthXmlAttribute, 1);
+                    ranges[i++] = new IoIrqRange(fixedBase, fixedSize);
+                }
+                else if (res.Name == DmaRangeXmlTag) {
+                    byte fixedBase
+                        = (byte)res.GetAttribute(BaseAddressXmlAttribute, 0);
+                    byte fixedSize
+                        = (byte)res.GetAttribute(RangeLengthXmlAttribute, 1);
+
+                    ranges[i++] = new IoDmaRange(fixedBase, fixedSize);
+                }
+                else if (res.Name == MemoryRangeXmlTag) {
+                    UIntPtr fixedBase
+                        = res.GetAttributeAsUIntPtr(BaseAddressXmlAttribute, 0);
+                    UIntPtr fixedSize
+                        = res.GetAttributeAsUIntPtr(RangeLengthXmlAttribute, 0);
+                    byte addressBits
+                        = (byte)res.GetAttribute(AddressBitsXmlAttribute, 24);
+                    UIntPtr alignment
+                        = res.GetAttributeAsUIntPtr(AlignmentXmlAttribute, 4);
+
+                    bool read = res.GetAttribute(ReadableXmlAttribute, true);
+                    bool write = res.GetAttribute(WritableXmlAttribute, true);
+
+                    if (fixedBase == 0) {
+                        IoMemory mem = null;
+
+                        // [TODO] This only supports 24-bit addressing right
+                        // now.  We need support for the rest of the possible regions
+                        // eventually
+                        if (addressBits == 24) {
+                            mem = IoMemory.AllocatePhysBelow16MB(fixedSize, alignment);
+                        }
+                        if (mem == null) {
+                            DebugStub.WriteLine("Failed for addressBits={0}",
+                                                __arglist(addressBits));
+                            DebugStub.Break();
+                            continue;
+                        }
+                        DebugStub.Assert(mem.PhysicalAddress.Value != 0);
+                        ranges[i++] = new IoMemoryRange((UIntPtr)mem.PhysicalAddress.Value,
+                                                        (UIntPtr)mem.Length,
+                                                        read, write);
+                    }
+                    else {
+                        ranges[i++] = new IoMemoryRange(fixedBase, fixedSize,
+                                                        read, write);
+                    }
+                }
+                else {
+                    // this should never happen
+                    i++;
+                    DebugStub.Break();
+                }
+            }
+            return ranges;
+        }
+
+        // The root device does not have a Pnp configuration via enumeration,
+        // which is why we require the devConfig parameter.  Also, we need to
+        // enumerate the root before we can start the Hal, but we don't want to
+        // let anything else start running yet (since there is no threading yet)
+        public static void AddRootDevice(String! path,
+                                         IBusDevice! bus,
+                                         IoConfig! config)
+        {
+            String! signature = "/root" + path;
+
+            // Simulate association: we don't have a true registered driver.
+            XmlNode metadata = GetMetaData(signature);
+            if (metadata == null) {
+                DebugStub.WriteLine("No configuration found for root device {0}\n",
+                                    __arglist(path));
+                DebugStub.Break();
+                return;
+            }
+            if (!ResourceTracker.AreResourcesValid(config, metadata)) {
+                DebugStub.WriteLine("Invalid configuration for root device {0}\n",
+                                    __arglist(path));
+                DebugStub.Break();
+                return;
+            }
+
+            Driver! driver = Driver.Register(signature,
+                                             path,
+                                             bus.GetType(),
+                                             metadata);
+
+            // create a device instance of the root:
+            DeviceNode! device = new DeviceNode(path, signature, config);
+
+            // Simulate activation: we don't need to make an
+            // IDevice because we already have one
+            device.driver = driver;
+            device.intdev = bus;
+
+            // make sure the resources are available, and claim them.
+            VerboseOut.Print("AddRootDevice Device: {0}\n",
+                             __arglist(path));
+            if (ResourceTracker.FindResourceConflicts(device) == null) {
+                ResourceTracker.AddResources(device);
+            }
+            else {
+                // somehow the needed root resources are unavailable.
+                DebugStub.Break();
+                return;
+            }
+
+            // Manually initialize the root bus, but don't
+            // associate devices we find
+            VerboseOut.Print("Activate root device {0} {1}\n",
+                             __arglist(device.location,
+                                       device.driver.name)
+                             );
+            bus.Initialize();
+            EnumerateDevice(bus, device.location, false);
+        }
+
+        static DeviceNode FindSingletonDeviceBySignature(string! signature)
+        {
+            DeviceNode device;
+            if (signature == "") {
+                string[]! ids = { "" };
+                FixedIoConfig! config = new FixedIoConfig(ids);
+                device = new DeviceNode("/hal0", signature, config);
+                return device;
+            } else {
+                device = null;
+
+                foreach (DictionaryEntry de in instances) {
+                    DeviceNode! node = (DeviceNode!) de.Value;
+                    foreach (string sig in node.config.Ids) {
+                        if (sig == signature) {
+                            if (device != null) {
+                                DebugStub.WriteLine("WARNING! Found more than one device with signature '" + signature + "' while searching for singleton device!");
+                                continue;
+                            }
+                            device = node;
+                            // break;
+                        }
+                    }
+
+                    // Keep looping so we can find duplicates.
+                    // This is just for debugging / paranoia.
+                    //if (device != null)
+                    //    break;
+                }
+
+                return device;
+            }
+        }
+
+        bool PnpSignaturesAreEqual(string! sig1, string! sig2)
+        {
+            return String.Compare(sig1, sig2, true) == 0;
+        }
+
+        // The Hal activates its own devices, but we need to do the accounting
+        // for them and move them from instances to activations.
+        // NB - for the hal screen resources, the signature will be ""
+        public static IoConfig YieldResources(string! signature, Type! type)
+        {
+            // do pseudo-registration by getting metadata directly
+            XmlNode metadata = GetMetaData(signature);
+            if (metadata == null) {
+                DebugStub.WriteLine("IoSystem.YieldResources: Failed to find driver metadata for signature: " + signature);
+                DebugStub.Break();  // Couldn't find info in manifest!
+                return null;
+            }
+
+            string path = (signature == "") ? "/hal0" : ("/hardware/drivers" + signature);
+
+            Driver! driver = Driver.Register(signature,
+                                             path,
+                                             type,
+                                             metadata);
+
+            // first get a device instance (or if signature=="", create an
+            // instance with an empty IoConfig)
+            DeviceNode device = FindSingletonDeviceBySignature(signature);
+            if (device == null) {
+                DebugStub.WriteLine("IoSystem.YieldResources: Failed to find singleton device node for PNP signature: " + signature);
+                DebugStub.Break();
+                for (;;) {
+                    FindSingletonDeviceBySignature(signature);
+                }
+                return null;    // Couldn't find hardware.
+            }
+
+            device.driver = driver;
+
+            // use the XML to get fixed resources
+            XmlNode fixedResNode
+                = driver.metadata.GetChild(FixedHardwareSetXmlTag);
+            device.config.FixedRanges
+                = CreateIoRangesFromMetadata(fixedResNode);
+
+            // This device is now associated.  Now do all of the
+            // accounting, but don't activate it
+            VerboseOut.WriteLine("YieldResources Signature: {0}",
+                                __arglist(signature));
+
+            if (ResourceTracker.AreResourcesValid(device.config, metadata) &&
+                ResourceTracker.FindResourceConflicts(device) == null) {
+                ResourceTracker.AddResources(device);
+            }
+            else {
+                // somehow the resources the Hal needs have already been taken!
+                DebugStub.Break();
+                return null;
+            }
+
+            // now move the device from instances to activations and return the
+            // dynamic config
+            VerboseOut.WriteLine("YieldResources Remove({0})",
+                                __arglist(device.location));
+            instances.Remove(device.location);
+            activations.Add(device.location, device);
+            return device.config;
+        }
+
+        //
+        // Irq Rerouting code - this lets us keep our accounting clean when
+        // kernel-only devices reroute IRQs
+        //
+
+        // [TODO] if multiple devices exist, all of whom have the same
+        // Id, this is going to break.  How can we fix it?  The caller doesn't
+        // understand hardware locations, so the problem is his, but this code
+        // suffers from his lack of information
+
+        // Public hook for well-behaved devices that reroute IRQs to request
+        // permission before doing the rerouting.  This has the side effect of
+        // updating the ResourceTracker with the new IoIrqRange values
+        public static bool RequestRerouteIrq(string name, int irqNum,
+                                             byte irqVal)
+        {
+            // In order to allow a rerouting, two conditions must be met
+            // 1 - the device "name" must not be in activations
+            // 2 - there must be an irqNum'th  IoIrq object
+            foreach (DictionaryEntry de in instances) {
+                DeviceNode! device = (DeviceNode!) de.Value;
+                if (device.MatchingDeviceId == name) {
+                    return RerouteIrq(device, irqNum, irqVal);
+                }
+            }
+
+            foreach (DictionaryEntry de in associations) {
+                DeviceNode! device = (DeviceNode!) de.Value;
+                if (device.MatchingDeviceId == name) {
+                    return RerouteIrq(device, irqNum, irqVal);
+                }
+            }
+            return false;
+        }
+
+        // private code that actually changes the IoConfig object
+        private static bool RerouteIrq(DeviceNode! device, int irqNum,
+                                       byte irqVal)
+        {
+            int irqCounter = 0;
+            int targetPosition = -1;
+            IoRange[] ranges = device.config.DynamicRanges;
+
+            for (int i = 0; i < ranges.Length; i++) {
+                if (device.config.DynamicRanges[i] is IoIrqRange) {
+                    irqCounter++;
+                }
+                if (irqCounter == irqNum) {
+                    targetPosition = i;
+                    break;
+                }
+            }
+            if (targetPosition == -1) {
+                return false;
+            }
+
+            ranges[targetPosition] = new IoIrqRange(irqVal, 1);
+            return true;
+        }
+
+        // Enumerate an IBusDevice (create instances):
+        //   - Find devices and add them to the devices list
+        //   - Add each device to the /hardware namespace
+        //
+        // NB: When we get rid of non-process drivers, then this will only be
+        // used by the root device; all other buses will be separate processes
+        // who will announce new config to the IoSystem over a channel
+        public static bool EnumerateDevice(IBusDevice! bus, string busLocation,
+                                           bool associate)
+        {
+            Tracing.Log(Tracing.Debug, "Enumerating Bus");
+
+            SortedList found = bus.Enumerate();
+
+            if (found != null) {
+                foreach (DictionaryEntry n in found) {
+                    // get the IoConfig for this device
+                    IoConfig! config = (IoConfig!)n.Value;
+
+                    // set the IoConfig's FixedRange to an empty list
+                    config.FixedRanges = new IoRange[0];
+
+                    assume config.Ids != null;
+
+                    // now set up the /hardware namespace
+                    string! location = busLocation + n.Key;
+                    string! device = (!)config.Ids[0];
+                    // -XXX- Need to do something smarter, now that we support lists of IDs.
+
+                    // create a DeviceNode for this device
+                    DeviceNode! node = new DeviceNode(location, device, config);
+
+                    // add this location and device to the /hardware tree
+                    location = JoinForwardSlashPath("/hardware/locations", location);
+                    DirNode locationNode = DirectoryService.FindDirectory(location, true);
+
+                    // This needs to be reconsidered.  What's the point of registering the
+                    // device ID, now that doing so is ambiguous?  We'll register the first
+                    // device ID, anyway, until we figure this out.
+                    string! hardware_devices_path = JoinForwardSlashPath("/hardware/devices", device);
+                    DirNode deviceNode = DirectoryService.FindDirectory(hardware_devices_path, true);
+
+                    // create a device instance in the namespace:
+                    string instname;
+                    for (int i = 0;; i++) { // find next available instance num
+                        instname = hardware_devices_path + "/instance" + i.ToString();
+                        if (DirectoryService.FindDirectory(instname, false) == null) {
+                            break;
+                        }
+                    }
+                    deviceNode = DirectoryService.FindDirectory(instname, true);
+
+                    // symlink the instance and location
+                    DirectoryService.CreateSymbolicLink(locationNode, "device",
+                                                   instname);
+                    DirectoryService.CreateSymbolicLink(deviceNode, "location",
+                                                   location);
+
+                    node.directoryRoot = instname;
+
+                    // try to associate the instance, and if we can't, then put
+                    // it in the instance list:
+                    if (!associate || !Associate(node)) {
+                        instances.Add(node.location, node);
+                    }
+                }
+            }
+            return (found != null);
+        }
+
+        static string! JoinForwardSlashPath(string! container, string! path)
+        {
+            bool container_ends_with_slash = container.EndsWith("/");
+            bool path_starts_with_slash = path.StartsWith("/");
+
+            if (container_ends_with_slash && path_starts_with_slash)
+                return container + path.Substring(1, path.Length - 1);
+
+            if (!container_ends_with_slash && !path_starts_with_slash)
+                return container + "/" + path;
+
+            return container + path;
+        }
+
+        // the association step does not care about dependencies and does not
+        // touch the namespace.  All it does is resolve an instance of a device
+        // with the appropriate registration of a driver for that device, and
+        // creates the fixed Io resources:
+        private static bool Associate(DeviceNode! device)
+        {
+            string! matchingDeviceId;
+            Driver driver = Driver.FindBest(device.config.Ids, out matchingDeviceId);
+            if (driver == null) {
+                VerboseOut.WriteLine("{0}: no driver found for this device.",
+                                     __arglist(device.location));
+                VerboseOut.Print(device.config.ToPrint());
+                return false;
+            }
+
+            if (driver.factory == null && driver.imagePath == null) {
+                DebugStub.WriteLine("Error: Attempt to associate HAL driver {0} with {1} ",
+                                    __arglist(driver.name,
+                                              device.location));
+                DebugStub.Break();
+                return false;
+            }
+
+            VerboseOut.WriteLine(
+                "{0}: now associated with driver {1}, on device id {2}",
+                __arglist(device.location, driver.name, matchingDeviceId)
+                );
+
+            // now attached the driver.
+            device.driver = driver;
+            device.MatchingDeviceId = matchingDeviceId;
+
+            // create the fixed config.
+            XmlNode fixedResNode
+                = driver.metadata.GetChild(FixedHardwareSetXmlTag);
+            device.config.FixedRanges
+                = CreateIoRangesFromMetadata(fixedResNode);
+
+            // if the hardware resources are available, copy the device to associations
+            if (!ResourceTracker.AreResourcesValid(device.config, driver.metadata)) {
+                DebugStub.WriteLine("Error: Can't associate a device without resources.");
+                DebugStub.Break();
+                return false;
+            }
+
+            VerboseOut.WriteLine(device.location +
+                                 ": Device associated -> driver "
+                                 + driver.name + " using signature " +
+                                 matchingDeviceId);
+
+            associations.Add(device.location, device);
+            return true;
+        }
+
+        // The root bus and hal need to be associated before the registration
+        // list is ready.  Use this method to associate directly from Xml.
+        private static XmlNode GetMetaData(String! pnpSignature)
+        {
+            // a matched driver must not have an image (that is, it shouldn't be
+            // an external driver).  Otherwise, anything that matches is good:
+
+            int bestlength = 0;
+            XmlNode bestNode = null;
+
+            // check each driver
+            foreach (XmlNode! driver in config.Children) {
+                if (driver.Name != DriverRegistrationXmlTag) {
+                    continue;
+                }
+                string! devicename =
+                    (!)driver.GetAttribute(DeviceSignatureXmlAttribute, "");
+                string! image =
+                    (!)driver.GetAttribute(DriverPathXmlAttribute, "");
+
+                if (image == "" &&
+                    pnpSignature.StartsWith(devicename) &&
+                    devicename.Length > bestlength) {
+                    bestNode = driver;
+                    bestlength = devicename.Length;
+                }
+                // special code for the Hal console, which has no signature
+                else if (image == "" &&
+                         pnpSignature == "" &&
+                         devicename == "" &&
+                         bestlength == 0) {
+                    bestNode = driver;
+                    bestlength = 1;
+                }
+            }
+            return bestNode;
+        }
+
+        // check if we can start a driver
+        // RequireFollows--> treat "follows" tags as firm requirements
+        private static bool CheckDependencies(Driver! driver,
+                                              bool RequireFollows)
+        {
+            // Check all <follows> rules
+            if (RequireFollows) {
+                foreach (XmlNode! follows in driver.metadata.Children) {
+                    if (follows.Name != FollowsXmlTag) {
+                        continue;
+                    }
+
+                    string tagName =
+                        follows.GetAttribute(FollowsNameXmlAttribute, "");
+                    if (!CheckFollows(tagName)) {
+                        return false;
+                    }
+                }
+            }
+
+            // Make sure that ServiceProvider endpoint names aren't exhausted,
+            // and that the ServiceContracts are satisfiable
+            XmlNode! endpointset
+                = (!)driver.metadata.GetChild(EndpointSetXmlTag);
+            foreach (XmlNode! endpoint in endpointset.Children) {
+                string contract = endpoint.GetAttribute(
+                    ContractXmlAttribute, "");
+
+                if (endpoint.Name == ServiceEndpointXmlTag) {
+                    if (!Binder.IsServiceContractStartable(contract)) {
+                        return false;
+                    }
+                }
+                else if (endpoint.Name == GenericEndpointXmlTag) {
+                    if (!Binder.IsServiceContractAvailable(contract)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        // Return the next device that should be activated, according to the
+        // following priority:
+        // 1 - if all dependencies of an bus device are satisfied, return it
+        // 2 - else return the first device with all dependencies satisfied
+        // 3 - else return the first bus device who only lacks "follows"
+        // 4 - else return the first device who only lacks "follows"
+        // 5 - else return null
+        private static DeviceNode GetActivatableDriver()
+        {
+            DeviceNode device = null;
+            DeviceNode busWithoutFollows = null;
+            DeviceNode deviceWithoutFollows = null;
+
+            VerboseOut.Print("GetActivatableDriver:[");
+            foreach (DictionaryEntry de in associations) {
+                DeviceNode! dev = (DeviceNode!)de.Value;
+                VerboseOut.Print(dev.ToString());
+                VerboseOut.Print(" ");
+            }
+            VerboseOut.Print("] ");
+
+            // we need only look in the associations list, as it holds the only
+            // device instances that are matched to drivers:
+            foreach (DictionaryEntry de in associations) {
+                DeviceNode! dev = (DeviceNode!) de.Value;
+
+                // device has already been associated
+                assert dev.driver != null;
+                assert dev.MatchingDeviceId != null;
+
+                Driver! driver = dev.driver;
+
+                // First do the hard test - all <follows> must be satisfied
+                if (CheckDependencies(driver, true)) {
+                    // prioritize buses - if we find one, return it immediately
+                    if (dev.intdev is IBusDevice) {
+                        VerboseOut.WriteLine("-> {0} [bus]",
+                                             __arglist(dev.MatchingDeviceId));
+                        return dev;
+                    }
+                    else {
+                        if (device == null) {
+                            device = dev;
+                        }
+                    }
+                }
+                // then try without the <follows>
+                else if (CheckDependencies(driver, false)) {
+                    if (dev.intdev is IBusDevice) {
+                        if (busWithoutFollows == null) {
+                            busWithoutFollows = dev;
+                        }
+                    }
+                    else {
+                        if (deviceWithoutFollows == null) {
+                            deviceWithoutFollows = dev;
+                        }
+                    }
+                }
+            }
+            if (device != null) {
+                VerboseOut.WriteLine("-> {0}",
+                                     __arglist(device.MatchingDeviceId));
+                return device;
+            }
+            else if (busWithoutFollows != null) {
+                VerboseOut.WriteLine(
+                    "-> {0} [bus w/o]",
+                    __arglist(busWithoutFollows.MatchingDeviceId)
+                    );
+                return busWithoutFollows;
+            }
+            else {
+                if (deviceWithoutFollows == null) {
+                    VerboseOut.WriteLine("-> null");
+                }
+                else {
+                    VerboseOut.WriteLine(
+                        "-> {0} [w/o]",
+                        __arglist(deviceWithoutFollows.MatchingDeviceId)
+                        );
+                }
+                return deviceWithoutFollows; // may be null, but that's ok...
+            }
+        }
+
+        // [TODO] non-device services (i.e. volmgr) should start
+        // through this mechanism, but don't yet
+        // Activate any drivers whose needs can be fully satisfied:
+        public static void ActivateDrivers()
+        {
+            // since enumeration now associates whatever it can, we can pull
+            // the association step out of the loop.
+            foreach (DictionaryEntry d in instances) {
+                Associate((DeviceNode!) d.Value);
+            }
+
+            // we can't remove items from the instances list during the previous
+            // step, so we need a second loop to remove instances that have been
+            // associated:
+            foreach (DictionaryEntry d in associations) {
+                String key = (String) d.Key;
+                if (instances.ContainsKey(key)) {
+                    instances.Remove(key);
+                }
+            }
+
+            // [TODO] once VolMgr is started through this method,
+            // remove the following line (we need it in order for the DiskDrive
+            // to run, as it depends on having a volmgr):
+            Binder.ClaimServiceContract(
+                "Microsoft.Singularity.Io.VolumeManagerContract");
+
+            // now activate devices whose dependencies are satisfied:
+            for (DeviceNode device; (device = GetActivatableDriver()) != null;) {
+                // first, check that the device's resources are valid.
+                Driver! driver = device.driver;
+
+                // Do the accounting for all Io Resources
+                if (ResourceTracker.AreResourcesValid(device.config, driver.metadata) &&
+                    ResourceTracker.FindResourceConflicts(device) == null) {
+                    ResourceTracker.AddResources(device);
+                }
+                else {
+                    // somehow the resources the device needs are unavailable
+                    DebugStub.Break();
+                    continue;
+                }
+
+                // Next activate it by factory if needed.
+                bool activated = false;
+                if (driver.factory != null) {
+                    device.intdev = driver.factory(device.config, device.location);
+
+                    // initialize the device, conditional on whether it is a bus or not.
+                    // If it is a bus, be sure to enumerate it.
+                    if (device.intdev is IBusDevice) {
+                        VerboseOut.WriteLine(
+                            "Activate Device {0} {1} [w/ Enumerate]",
+                            __arglist(device.location, device.driver.name)
+                            );
+                        IBusDevice bus = (IBusDevice)device.intdev;
+                        bus.Initialize();
+                        activated = true;
+                        EnumerateDevice(bus, device.location, true);
+                    }
+                    else if (device.intdev is IDevice) {
+                        VerboseOut.WriteLine("Activate Device {0} {1}",
+                                             __arglist(device.location,
+                                                       device.driver.name));
+                        device.intdev.Initialize();
+                        activated = true;
+                    }
+                }
+                else if (driver.imagePath != null) {
+                    device.extdev = new ExtensionDevice(driver, device);
+                    activated = device.extdev.Activate();
+                }
+                else {
+                    DebugStub.WriteLine("Driver appears to be incorrectly initialized.");
+                    DebugStub.Break();
+                }
+
+                if (activated) {
+                    // mark the device as loaded
+                    device.startOrder = ++DeviceNode.lastStartOrder;
+                    activations.Add(device.location, device);
+                    associations.Remove(device.location);
+
+                    // update the follows listing:
+                    foreach (XmlNode! follows in driver.metadata.Children) {
+                        if (follows.Name != ProvidesXmlTag) {
+                            continue;
+                        }
+                        string tagName =
+                            (!)follows.GetAttribute(FollowsNameXmlAttribute, "");
+                        SetFollows(tagName);
+                    }
+                }
+                else {
+                    DebugStub.WriteLine("Driver failed to activate.");
+                    DebugStub.Break();
+                }
+            }
+        }
+
+        // Finalize only deals with drivers that have been activated
+        private static void FinalizeOldDevices()
+        {
+            bool removed;
+
+            // Disable all of the devices in the order initialized.
+            do {
+                removed = false;
+                int highest = 0;
+                string highestDevice = null;
+
+                foreach (DictionaryEntry d in activations) {
+                    DeviceNode! dev = (DeviceNode!)d.Value;
+
+                    if (highest < dev.startOrder) {
+                        highest = dev.startOrder;
+                        highestDevice = (string)d.Key;
+                    }
+                }
+
+                if (highest != 0 && highestDevice != null) {
+                    DeviceNode! dev = (DeviceNode!)activations[highestDevice];
+
+                    Tracing.Log(Tracing.Audit, "Finalizing {0}\n", dev.location);
+                    if (dev.intdev != null) {
+                        dev.intdev.Finalize();
+                    }
+                    else if (dev.extdev != null) {
+                        dev.extdev.Finalize();
+                    }
+                    activations.Remove(highestDevice);
+                    removed = true;
+                }
+            } while (removed);
+        }
+
+        // Print device config to debug console and to the log
+        public static void Dump(bool detailed)
+        {
+            Driver.DumpAll();
+
+            DebugStub.WriteLine("\nDevices found but not associated:");
+            Tracing.Log(Tracing.Audit, "Devices found but not associated:");
+            foreach (DictionaryEntry de in instances) {
+                DeviceNode! dev = (DeviceNode!)de.Value;
+                DumpDeviceNode(dev, detailed);
+            }
+
+
+            DebugStub.WriteLine("\n\nDevices associated but not initialized:");
+            Tracing.Log(Tracing.Audit,
+                        "Devices associated but not initialized:");
+            foreach (DictionaryEntry de in associations) {
+                DeviceNode! dev = (DeviceNode!)de.Value;
+                DumpDeviceNode(dev, detailed);
+            }
+
+            DebugStub.WriteLine("\n\nDevices initialized:");
+            Tracing.Log(Tracing.Audit, "Devices initialized:");
+            foreach (DictionaryEntry de in activations) {
+                DeviceNode! dev = (DeviceNode!)de.Value;
+
+                if ((dev.intdev != null || dev.extdev != null) && dev.startOrder != 0) {
+                    DumpDeviceNode(dev, detailed);
+                }
+            }
+        }
+
+        static void DumpDeviceNode(DeviceNode! device, bool detailed)
+        {
+            DebugStub.WriteLine("device at " + device.location + ":");
+            Tracing.Log(Tracing.Audit, "device at " + device.location);
+
+            if (device.driver != null) {
+                DebugStub.WriteLine("    associated driver: " + device.driver.name);
+                Tracing.Log(Tracing.Audit, "    associated driver: " + device.driver.name);
+            }
+
+            if (device.MatchingDeviceId != null) {
+                DebugStub.WriteLine("    matching device id: " + device.MatchingDeviceId);
+                Tracing.Log(Tracing.Audit, "    matching device id: " + device.MatchingDeviceId);
+            }
+
+            if (detailed) {
+                if (device.config != null) {
+                    DebugStub.WriteLine(device.config.ToPrint());
+                }
+            }
+            DebugStub.WriteLine("");
+        }
+
+    }
+} // namespace Microsoft.Singularity.Io
diff --git a/base/Kernel/Singularity.Io/ResourceTracker.sg b/base/Kernel/Singularity.Io/ResourceTracker.sg
new file mode 100644
index 0000000..5dbe1ef
--- /dev/null
+++ b/base/Kernel/Singularity.Io/ResourceTracker.sg
@@ -0,0 +1,433 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ResourceTracker.cs
+//
+//  Note:   Provides tracking for all IoPorts, IoMemory, IoDma, and IoIrq
+//          that are created by the kernel
+//
+
+// #define DEBUG_PARSING
+// #define VERBOSE
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+
+using Microsoft.Singularity.V1.Types;
+
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Io
+{
+    // [TODO] - this implementation uses an O(n^2) search.  If the
+    // resources were stored in a red-black tree that allowed for duplicate
+    // entries, we could use an Any-Segments-Intersect algorithm to get it down
+    // to O(n log n)
+
+    public class ResourceTracker
+    {
+        // In order to work with the different IoRange objects consistently,
+        // we're going to wrap them in this object before putting them in
+        // array lists:
+        private class ResourceRange
+        {
+            public DeviceNode! owner;
+            public uint    begin;
+            public uint    limit;
+            public bool    shared;
+
+            public ResourceRange(DeviceNode! owner,
+                                 uint begin, uint limit, bool shared)
+            {
+                this.owner = owner;
+                this.begin = begin;
+                this.limit = limit;
+                this.shared = shared;
+                base();
+            }
+            
+            public override string! ToString()
+            {
+                return String.Format("[ResRange: owner={0} begin={1,8:x} limit={2,8:x} shared={3}]",
+                    owner.location,
+                    begin,
+                    limit,
+                    shared.ToString());
+            }
+        }
+
+        // we track the four types of IoResources with these lists
+        private static ArrayList ports;
+        private static ArrayList irqs;
+        private static ArrayList dmas;
+        private static ArrayList memory;
+
+        // initialize the logs
+        public static void Initialize()
+        {
+            // configure IoResource tracking:
+            ports = new ArrayList();
+            irqs = new ArrayList();
+            dmas = new ArrayList();
+            memory = new ArrayList();
+        }
+
+        // Find the correct internal list for the give IoRange type.
+        private static ArrayList FindRangeList(IoRange range)
+        {
+            if (range is IoPortRange) {
+                return ports;
+            }
+            else if (range is IoIrqRange) {
+                return irqs;
+            }
+            else if (range is IoDmaRange) {
+                return dmas;
+            }
+            else if (range is IoMemoryRange) {
+                return memory;
+            }
+            else {
+                // Unknown IoRange type.
+                DebugStub.Break();
+                return null;
+            }
+        }
+
+#if DEBUG_PARSING
+        private static void DumpIndent(int depth)
+        {
+            for (int i = 0; i < depth; i++) {
+                DebugStub.Write("  ");
+            }
+        }
+
+        private static void DumpNode(int depth, XmlNode! node)
+        {
+            DumpIndent(depth);
+            DebugStub.Write("<{0} {1}", __arglist(node.Name, node.GetAttributes()));
+
+            XmlNode [] children = node.Children;
+            if (children != null && children.Length != 0) {
+                DebugStub.WriteLine(">");
+
+                for (int i = 0; i < children.Length; i++) {
+                    DumpNode(depth + 1, (XmlNode!)children[i]);
+                }
+
+                DumpIndent(depth);
+                DebugStub.WriteLine("</{0}>", __arglist(node.Name));
+            }
+            else {
+                DebugStub.WriteLine("/>");
+            }
+        }
+#endif // DEBUG_PARSING
+
+
+        // [TODO] what about conflicts within the resourceSet?
+
+        // Test if a particular IoRange satisfies the requirements of its
+        // associated Xml metadata
+        // inefficient O(n) algorithm for finding range overlaps:
+        private static DeviceNode FindRangeConflict(IoRange! range, bool shared)
+        {
+            ArrayList list = FindRangeList(range);
+            uint begin = range.RangeBase;
+            uint limit = range.RangeBase + range.RangeLength;
+
+            // finally, make sure this resource isn't already claimed
+            if (begin >= limit || list == null) {
+                return null;
+            }
+
+            foreach (ResourceRange! r in list) {
+                if ((begin < r.limit && limit > r.begin) ||
+                    (r.begin < limit && r.limit > begin)) {
+                    if (!shared || !r.shared) {
+                        DebugStub.WriteLine("I/O Conflict on {0} with {1}.",
+                                            __arglist(range.ToString(),
+                                                      r.owner.location));
+                        return r.owner;
+                    }
+                }
+            }
+            return null;
+        }
+
+        // Check if a set of ranges have any conflicts.
+        private static DeviceNode FindRangeConflicts(IoRange []! ranges, XmlNode! ruleSet)
+        {
+            XmlNode[] rules = ruleSet.Children;
+            if (rules == null) {
+                return null;
+            }
+
+            foreach (XmlNode! rule in rules) {
+                int index = rule.GetAttribute(IoSystem.IndexXmlAttribute, -1);
+                bool shared = rule.GetAttribute(IoSystem.SharedXmlAttribute, false);
+
+                DebugStub.Assert(index >= 0);
+
+                if (ranges[index] != null) {
+                    DeviceNode conflict = FindRangeConflict((!)ranges[index], shared);
+                    if (conflict != null) {
+                        return conflict;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private static void DescribeResourceConflict(DeviceNode! newDevice,
+                                                     DeviceNode! oldDevice)
+            requires newDevice.driver != null;
+            requires oldDevice.driver != null;
+        {
+            String newName = newDevice.driver.name;
+            String oldName = oldDevice.driver.name;
+
+            if (newName == null) {
+                newName = newDevice.MatchingDeviceId;
+            }
+            if (oldName == null) {
+                oldName = oldDevice.MatchingDeviceId;
+            }
+
+            DebugStub.WriteLine("I/O Conflict between {0} ({1}) and {2} ({3}).n",
+                                __arglist(newDevice.location,
+                                          newName,
+                                          oldDevice.location,
+                                          oldName));
+        }
+
+        // Given an IoConfig object and an Xml blob, we must determine if the
+        // the resources stated in the IoConfig object are already allocated.
+        // If they are, we return the identity of the conflicting device.
+        internal static DeviceNode FindResourceConflicts(DeviceNode! device)
+            requires device.driver != null;
+        {
+            DeviceNode conflict;
+
+            XmlNode fixedRules
+                = device.driver.metadata.GetChild(IoSystem.FixedHardwareSetXmlTag);
+            if (fixedRules != null) {
+                conflict = FindRangeConflicts(device.config.FixedRanges, fixedRules);
+                if (conflict != null) {
+                    DescribeResourceConflict(device, conflict);
+                    return conflict;
+                }
+            }
+
+            XmlNode dynamicRules =
+                device.driver.metadata.GetChild(IoSystem.DynamicHardwareSetXmlTag);
+            if (dynamicRules != null) {
+                conflict = FindRangeConflicts(device.config.DynamicRanges, dynamicRules);
+                if (conflict != null) {
+                    DescribeResourceConflict(device, conflict);
+                    return conflict;
+                }
+            }
+            return null;
+        }
+
+        // Test if an IoRange matches the Xml metadata.
+        private static bool IsRangeValid(IoRange! range, XmlNode! rule)
+        {
+            if (range is IoPortRange) {
+                if (rule.Name != IoSystem.PortRangeXmlTag) {
+                    return false;
+                }
+            }
+            else if (range is IoIrqRange) {
+                if (rule.Name != IoSystem.IrqRangeXmlTag) {
+                    return false;
+                }
+            }
+            else if (range is IoDmaRange) {
+                if (rule.Name != IoSystem.DmaRangeXmlTag) {
+                    return false;
+                }
+            }
+            else if (range is IoMemoryRange) {
+#if false
+                if (rule.Name == IoSystem.RegionXmlTag) {
+                    return true;    // Note we don't check bounds on this one!
+                }
+                else
+#endif
+                    if (rule.Name != IoSystem.MemoryRangeXmlTag) {
+                    return false;
+                }
+            }
+            else {
+                // Unknown IoRange type.
+                DebugStub.Break();
+                return false;
+            }
+
+            // now make sure that the range length is >= metadata spec
+            // exclude regions since we always make them ourselves, and
+            // can trust them
+            uint expectedLength =
+                (uint)rule.GetAttribute(IoSystem.RangeLengthXmlAttribute, 1);
+            if (range.RangeLength < expectedLength) {
+                return false;
+            }
+            return true;
+        }
+
+        // We let the resource list contain null entries, and we only check
+        // those entries that are not null; the metadata doesn't need to know
+        // about holes.
+        private static bool AreResourcesValid(IoRange[]! ranges, XmlNode ruleSet)
+        {
+            if (ruleSet == null) {
+                return true;
+            }
+#if DEBUG_PARSING
+            DebugStub.WriteLine("  AreResourcesValid:");
+            DumpNode(2, ruleSet);
+            DebugStub.WriteLine("  I/O Resources:");
+            for (int i = 0; i < ranges.Length; i++) {
+                if (ranges[i] != null) {
+                    DebugStub.WriteLine("    {0:d3}: {1}",
+                                        __arglist(i, ((!)ranges[i]).ToString()));
+                }
+            }
+#endif
+
+            XmlNode[] rules = ruleSet.Children;
+            if (rules == null) {
+                return true;
+            }
+
+            foreach (XmlNode! rule in rules) {
+                int index = rule.GetAttribute(IoSystem.IndexXmlAttribute, -1);
+                DebugStub.Assert(index >= 0);
+
+                // Fail if the range doesn't exist.
+                if (ranges[index] == null) {
+                    DebugStub.WriteLine("Resource range[" + index + "] is null!");
+                    // DebugStub.Break();
+                    return false;
+                }
+
+                if (!IsRangeValid((!)ranges[index], rule)) {
+                    DebugStub.WriteLine("Resource range[" + index + "] is not valid!");
+                    // DebugStub.Break();
+                    return false;
+                }
+
+#if false
+                // make sure that the resources are currently available for this driver.
+                bool shared = rule.GetAttribute(IoSystem.SharedXmlAttribute, false);
+                DeviceNode conflict = FindRangeConflict((!)ranges[index], shared);
+                if (conflict != null) {
+                    return false;
+                }
+#endif
+            }
+            return true;
+        }
+
+        // Given an IoConfig object and an Xml blob, determine if the
+        // IoConfig object satisfies the needs expressed as Xml.
+        internal static bool AreResourcesValid(IoConfig! config, XmlNode! metadata)
+        {
+            XmlNode fixedRules
+                = metadata.GetChild(IoSystem.FixedHardwareSetXmlTag);
+            XmlNode dynamicRules
+                = metadata.GetChild(IoSystem.DynamicHardwareSetXmlTag);
+
+            return (AreResourcesValid(config.FixedRanges, fixedRules) &&
+                    AreResourcesValid(config.DynamicRanges, dynamicRules));
+        }
+
+        // add one resource to the accounting logs
+        private static void AddResource(DeviceNode! device,
+                                        IoRange! range,
+                                        XmlNode rule)
+        {
+            ArrayList list = FindRangeList(range);
+            uint begin = range.RangeBase;
+            uint limit = range.RangeBase + range.RangeLength;
+            bool shared = false;
+
+            if (rule != null) {
+                shared = rule.GetAttribute(IoSystem.SharedXmlAttribute, false);
+            }
+
+            if (begin < limit && list != null) {
+                ResourceRange new_range = new ResourceRange(device, begin, limit, shared);
+                #if VERBOSE
+                DebugStub.WriteLine("    " + new_range);
+                #endif
+                list.Add(new_range);
+            }
+        }
+
+        // add one set of resources (either fixed or dynamic)
+        private static void AddResources(DeviceNode! device,
+                                         IoRange []! ranges,
+                                         XmlNode ruleSet)
+        {
+            if (ruleSet == null) {
+                foreach (IoRange range in ranges) {
+                    if (range != null) {
+                        AddResource(device, range, null);
+                    }
+                }
+                return;
+            }
+            
+            #if VERBOSE
+            DebugStub.WriteLine("ResourceTracker: Adding resources for device: " + device);
+            #endif
+
+            XmlNode[] rules = (!)ruleSet.Children;
+            int ruleCounter = 0;
+            foreach (IoRange range in ranges) {
+                if (range == null) {
+                    continue;
+                }
+                XmlNode rule = null;
+                if (ruleCounter < rules.Length) {
+                    // if we aren't out of rules, get a rule for this
+                    // resource (it's ok to run out of rules)
+                    rule = rules[ruleCounter++];
+                }
+                AddResource(device, range, rule);
+            }
+        }
+
+        // Assume that the resources list is no shorter than the rules list
+        // if the rules list is null, then we assume nothing is shared
+        internal static void AddResources(DeviceNode! device)
+            requires device.driver != null;
+        {
+            XmlNode fixedRules =
+                device.driver.metadata.GetChild(IoSystem.FixedHardwareSetXmlTag);
+            XmlNode dynamicRules =
+                device.driver.metadata.GetChild(IoSystem.DynamicHardwareSetXmlTag);
+
+            AddResources(device, device.config.FixedRanges, fixedRules);
+            AddResources(device, device.config.DynamicRanges, dynamicRules);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.KdFiles/Singularity.KdFiles.csproj b/base/Kernel/Singularity.KdFiles/Singularity.KdFiles.csproj
new file mode 100644
index 0000000..a7db86f
--- /dev/null
+++ b/base/Kernel/Singularity.KdFiles/Singularity.KdFiles.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Kernel\YourLibrary\YourLibrary.csproj
+
+Note:   This is the template for a kernel-mode assembly.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+  <PropertyGroup>
+    <AssemblyName>Singularity.KdFiles</AssemblyName>
+    <OutputType>Library</OutputType>
+    <ProjectGuid>{2D9FDD08-D37F-47DB-BEB0-C7721C644D44}</ProjectGuid>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="KdFilesNamespace.sg" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Directory\Directory.csproj" />
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
\ No newline at end of file
diff --git a/base/Kernel/Singularity.Loader/Binder.sg b/base/Kernel/Singularity.Loader/Binder.sg
new file mode 100644
index 0000000..258105f
--- /dev/null
+++ b/base/Kernel/Singularity.Loader/Binder.sg
@@ -0,0 +1,738 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Binder.cs
+//
+//  Note:
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Text;
+using System.GCs;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Init;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Scheduling;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.V1.Types;
+using Microsoft.Singularity.Xml;
+using EndpointCoreImplementation = Microsoft.Singularity.Channels.EndpointCore;
+using Allocation = Microsoft.Singularity.V1.Services.SharedHeapService.Allocation;
+
+namespace Microsoft.Singularity.Loader
+{
+    [CLSCompliant(false)]
+    public class Binder
+    {
+        private static TRef<DirectoryServiceContract.Imp:Start> nsRootRef;
+        // the nameMap contains our full policy for how to resolve names
+        private static SortedList! nameMap = new SortedList();
+
+        private const int INITIALIZED = 0x42494e44;
+        private static int initialized;
+
+        // Initialize the binder and naming policy.
+        //
+        // Should be called when still uniprocessor
+        public static void Initialize(XmlNode! config)
+        {
+            nameMap = new SortedList();
+
+            lock (nameMap) {
+                // parse the namespaceConfig to set up the nameMap
+                foreach (XmlNode! rule in config.Children) {
+                    if (rule.Name != NameXmlTag) {
+                        continue;
+                    }
+                    string contract =
+                        (!)rule.GetAttribute(ContractXmlAttribute, "");
+                    string nsName =
+                        rule.GetAttribute(NamePrefixXmlAttribute, "");
+                    bool multiple =
+                        rule.GetAttribute(AllowMultipleXmlAttribute, false);
+                    int limit =
+                        rule.GetAttribute(InstanceLimitXmlAttribute, -1);
+
+                    DebugStub.WriteLine("{0}: {1}", __arglist(contract,
+                                                              nsName));
+                    assert nsName != null;
+                    MapEntry e = new MapEntry(contract, nsName, multiple,
+                                              limit);
+                    nameMap.Add(contract, e);
+                }
+            }
+
+            // cache a handle to the root name server for directory lookups.
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+            nsRootRef = new TRef<DirectoryServiceContract.Imp:Start>(rootNS);
+            //DebugStub.WriteLine("nsRootRef init'ed");
+            initialized = INITIALIZED;
+        }
+
+        public static bool Initialized { get { return initialized == INITIALIZED; } }
+
+        //
+        // FindFileImage Extended.
+        //
+
+        public static IoMemory FindFileImage(string! file,
+                                             DirectoryServiceContract.Imp:Ready! dirClient)
+        {
+            long size = 0;
+            NodeType nodeType;
+            ErrorCode errorOut;
+
+            long readSize = 4096;
+            Kernel.Waypoint(2500);
+
+            bool ok = SdsUtils.GetAttributes(file,
+                                    dirClient,
+                                    out size,
+                                    out nodeType,
+                                    out errorOut );
+            if (!ok) return null;
+
+            Kernel.Waypoint(2504);
+
+            // bind to file
+
+            FileContract.Imp! fileClient;
+            FileContract.Exp! fileServer;
+            FileContract.NewChannel(out fileClient, out fileServer);
+
+            Kernel.Waypoint(2505);
+            ok = SdsUtils.Bind(file,dirClient,fileServer, out errorOut);
+            if (!ok) {
+                delete fileClient;
+                return null;
+            }
+            Kernel.Waypoint(2506);
+            fileClient.RecvSuccess();
+            Kernel.Waypoint(2509);
+
+            //  Now read file
+
+            Kernel.Waypoint(2510);
+
+            if (fileClient != null) {
+                // allocate memory and read file
+                IoMemory region = IoMemory.AllocateRealFixed((UIntPtr) size);
+                if (region == null) {
+                    delete fileClient;
+                    return null;
+                }
+
+                byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                long readOffset = 0;
+                Kernel.Waypoint(2511);
+                while (true) {
+                    // invariant: we own the non-null buffer buf at the
+                    //            loop head
+                    //       and  we don't own the buffer at the loop exit.
+                    //
+                    Tracing.Log(Tracing.Debug,"FindImage pre SendRead");
+                    Kernel.Waypoint(2512);
+                    fileClient.SendRead(buf, 0, readOffset, readSize);
+                    Kernel.Waypoint(2513);
+
+                    switch receive {
+                        case fileClient.AckRead(localbuf, bytesRead, error) :
+                            Tracing.Log(Tracing.Debug,"FindImage Post SendRead");
+                            Kernel.Waypoint(2514);
+                            Bitter.ToIoMemory(localbuf, 0, (int)bytesRead,
+                                              region, (int)readOffset);
+                            Kernel.Waypoint(2515);
+                            if (bytesRead == readSize) {
+                                // see if there is more
+                                readOffset += bytesRead;
+                                buf = localbuf;
+                                continue;
+                            }
+                            delete localbuf;
+                            break;
+
+                        case fileClient.ChannelClosed() :
+                            break;
+                        case unsatisfiable :
+                            break;
+                    }
+                    // Get out of loop
+                    break;
+                }
+                Kernel.Waypoint(2516);
+                delete fileClient;
+                Kernel.Waypoint(2517);
+                return region;
+            }
+            return null;
+        }
+
+        private static DirectoryServiceContract.Imp:Ready openDir(string! filePath)
+        {
+            Kernel.Waypoint(2400);
+
+            if (nsRootRef == null) {
+                DebugStub.Break();
+                return null;
+            }
+            DirectoryServiceContract.Imp:Start rootNS = nsRootRef.Acquire();
+            if (rootNS == null) {
+                DebugStub.Break();
+                return null;
+            }
+
+            Kernel.Waypoint(2401);
+            DirectoryServiceContract.Imp! dirClient;
+            DirectoryServiceContract.Exp! dirServer;
+            DirectoryServiceContract.NewChannel(
+                out dirClient, out dirServer);
+
+            ErrorCode errorCode;
+            bool ok = SdsUtils.Bind(filePath, rootNS, dirServer, out errorCode);
+            if (!ok) {
+                nsRootRef.Release(rootNS);
+                delete dirClient;
+                return null;
+            }
+
+            Kernel.Waypoint(2403);
+            dirClient.RecvSuccess();
+            nsRootRef.Release(rootNS);
+            Kernel.Waypoint(2404);
+
+            return dirClient;
+        }
+
+        public static IoMemory GetSystemManifest()
+        {
+            return Resources.GetLoadedImageMemory(1);
+        }
+
+        private static Manifest GetManifest(string! name,
+                                            DirectoryServiceContract.Imp:Ready! dirEP,
+                                            out string path)
+        {
+            Manifest manifest = null;
+            path =  null;
+
+            Tracing.Log(Tracing.Debug, "Binder.GetManifest: path={0}", name);
+            try {
+                Kernel.Waypoint(2300);
+                IoMemory manifestMemory = FindFileImage(name,dirEP);
+                Kernel.Waypoint(2301);
+                if (manifestMemory != null) {
+                    Kernel.Waypoint(2302);
+                    manifest = new Manifest(manifestMemory);
+                    path = manifest.Path;
+                    Kernel.Waypoint(2303);
+                    // Manifest consumes IoMemory in constructor
+                    // and does not reference it later on.
+                    IoMemory.Release(manifestMemory);
+                    Kernel.Waypoint(2304);
+                }
+                else {
+                    DebugStub.WriteLine(" no manifest! file={0}",__arglist(name));
+                }
+            }
+            catch (Exception e) {
+                DebugStub.WriteLine("Exception in GetManifest: {0}", __arglist(e.Message));
+                Tracing.Log(Tracing.Debug, "Exception in GetManifest: {0}", e.Message);
+            }
+
+            Kernel.Waypoint(2305);
+            return manifest;
+        }
+
+        /// <summary>
+        /// Loads the image of the corresponding application
+        /// path has to be set to the actual path to the manifest
+        /// (after resolution of symlinks)
+        /// </summary>
+        public static IoMemory LoadImage(Process parent,
+                                         String! application,
+                                         out Manifest outManifest)
+        {
+            Kernel.Waypoint(2000);
+            application = (!)application.ToLower();
+            string folderName = application;
+            string appName = application;
+
+            outManifest = null;
+
+            // Open the directory containing the manifest and the .x86
+            // remove the ".x86" extension if present
+            if (application.EndsWith(DirectoryService.ExecutableExtension)) {
+                folderName =(!)(application.Substring(0, application.Length - ((!)DirectoryService.ExecutableExtension).Length));
+                appName = folderName;
+            }
+
+            if (folderName.Length == 0) {
+                // invalid application name
+                Kernel.Waypoint(2001);
+                return null;
+            }
+
+            // if the first character of the folder name is not "/",
+            // then we will redirect to the init namespace.
+            if (folderName[0] != '/') {
+                appName = folderName;
+
+                string        ns = DirectoryService.ExecutablesNamespace;
+                StringBuilder sb = new StringBuilder(ns.Length +
+                                                     appName.Length + 2);
+                sb.Append("/");
+                sb.Append(ns);
+                sb.Append("/");
+                sb.Append(appName);
+
+                folderName = (!)sb.ToString();
+            }
+            else {
+                // need to strip off all but last part.
+                appName = folderName.Substring(folderName.LastIndexOf('/')+1);
+            }
+
+#if DEBUG
+            DebugStub.WriteLine("Binder.LoadImage: application={0},folder={1},appName={2}",
+                                __arglist (application,folderName,appName));
+#endif
+
+            Kernel.Waypoint(2002);
+            DirectoryServiceContract.Imp:Ready dirEP = openDir(folderName);
+            Kernel.Waypoint(2003);
+
+            if (dirEP == null) {
+                return null;
+            }
+            IoMemory result = null;
+            // read the manifest
+            Kernel.Waypoint(2004);
+            string exePath;
+            Manifest man = GetManifest(DirectoryService.ManifestFile, dirEP, out exePath);
+            // set manifest out parameter. This is used by ProcessHandle.Create()
+            // to get at the resources
+            outManifest =  man;
+
+            Kernel.Waypoint(2005);
+
+            //DebugStub.Break();
+            if (man != null) {
+                Kernel.Waypoint(2006);
+                if (exePath == null) {
+                    delete dirEP;
+                    return null; //  calling contexts don't expect exceptions
+                }
+                // FIXFIX  the files in "/init" are being created in all lower case.
+                // The files when built and their names in the manifest are case sensitive
+                string exeName = exePath.ToLower();
+                //DebugStub.WriteLine("Binder: path returned via manifest ={0}",
+                //                    __arglist(exeName));
+                result = Binder.FindFileImage(exeName,dirEP);
+                //path = exeName;
+                if (result == null) {
+                    DebugStub.WriteLine("LoadImage x86 not found: {0}",__arglist(exeName));
+                }
+                Kernel.Waypoint(2007);
+            }
+            else {
+                delete dirEP;
+                return null; //  calling contexts don't expect exceptions
+            }
+            Kernel.Waypoint(2010);
+            delete dirEP;
+            return result;
+        }
+
+        // currently skips loading manifest, etc.
+        public static IoMemory LoadRawImage(string! folderName,
+                                            string! exeName)
+        {
+            // Open a directory service contract
+            DirectoryServiceContract.Imp:Ready dirEP = openDir(folderName);
+            if (dirEP == null) {
+                DebugStub.WriteLine("LoadRawImage dirEP null [ERROR]");
+                return null;
+            }
+
+            IoMemory result = null;
+
+            // get file image
+            result = Binder.FindFileImage(exeName,dirEP);
+            if (result == null) {
+                DebugStub.WriteLine("LoadRawImage {0} not found",
+                                    __arglist(exeName));
+            }
+            delete dirEP;
+            return result;
+        }
+
+
+        //////////////////////////////////////////////////////// Name Manager.
+        //
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        // [TODO] The namespace management code is all
+        // below this comment, to include the fields in this
+        // static class that are used.  this should make it much
+        // easier to move this into a different module
+
+        const string NameXmlTag = "name";
+        const string NamePrefixXmlAttribute = "nsName";
+        const string InstanceLimitXmlAttribute = "limit";
+        const string AllowMultipleXmlAttribute = "allowMultiple";
+        const string StartStatedIdXmlAttribute = "startStateId";
+        const string EndpointClassName = "Microsoft.Singularity.Channels.Endpoint";
+        const string ContractXmlAttribute = "contract";
+
+        // we'll only put MapEntry objects in the nameMap; they
+        // will be indexed by contractName
+        private class MapEntry
+        {
+            public string contractName;
+            public string! namespacePrefix;
+            public bool appendInstance;
+            public int instanceLimit;
+            public int numInstances;
+
+            public MapEntry(string contractName, string! namespacePrefix,
+                            bool appendInstance, int instanceLimit)
+            {
+                // if we don't append the instance to the name, then we can't
+                // ever have more than 1 instance.
+                if (!appendInstance) {
+                    this.instanceLimit = 1;
+                }
+                else {
+                    this.instanceLimit = instanceLimit;
+                }
+                this.contractName = contractName;
+                this.namespacePrefix = namespacePrefix;
+                this.appendInstance = appendInstance;
+                this.numInstances = 0;
+            }
+        }
+
+        // to check dependencies, we need to be able to see if a
+        // particular name has more instances than its limit
+        public static bool IsServiceContractStartable(string contract)
+        {
+            // [TODO] is this the right policy?  if we
+            // don't understand this contract at all, then fail
+            // by default
+            lock (nameMap) {
+                if (!nameMap.ContainsKey(contract)) {
+                    return false;
+                }
+
+                MapEntry! e = (MapEntry!)nameMap[contract];
+                // (-1 == no limit on the number of instances)
+                return (e.instanceLimit == -1 ||
+                        e.numInstances < e.instanceLimit);
+            }
+        }
+
+        // we also need the ability to verify that an app who
+        // needs a serviceprovider can get it; this lets us
+        // check if the serviceprovider has started and claimed
+        // a name:
+        public static bool IsServiceContractAvailable(string contract)
+        {
+            lock (nameMap) {
+                if(!nameMap.ContainsKey(contract)) {
+                    return false;
+                }
+
+                MapEntry! e = (MapEntry!)nameMap[contract];
+                return (e.numInstances != 0);
+            }
+        }
+
+        // [TODO] - make this private and do the symlinks from this
+        // class:  Warning - must fix VolMgr hack first!
+
+        // This lets the system initializer indicate that a
+        // particular contract instance has been claimed (it
+        // does not create a contract!)  We need to return the
+        // name so that IoSystem can create the symlinks
+        public static string ClaimServiceContract(string contract)
+        {
+            lock (nameMap) {
+                if (IsServiceContractStartable(contract)) {
+                    MapEntry! e = (MapEntry!)nameMap[contract];
+                    string publicName = e.namespacePrefix;
+                    if (e.appendInstance) {
+                        publicName += e.numInstances.ToString();
+                    }
+                    e.numInstances++;
+                    return publicName;
+                }
+                return null;
+            }
+        }
+
+        // [TODO] do we still need this now that we
+        // have the wonderful and more generic method for doing
+        // endpoints?  Attempt to bind a service provider
+        // endpoint to the name nsName
+        public static ServiceProviderContract.Exp!:Start
+        BindServiceProvider(string! contract, string! nsName, out bool success,
+                            out string! publicName)
+        {
+            // Create a ServiceProvider channel
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! sp;
+            ServiceProviderContract.NewChannel(out imp, out sp);
+
+            // Connect the service provider to the namespace.
+
+            // [TODO] can we make nc a static field to avoid
+            // re-allocating nc on every function call?
+            DirectoryServiceContract.Imp nc =
+                DirectoryService.NewClientEndpoint();
+
+            success = false;
+            try {
+                nc.SendRegister((!)Bitter.FromString(nsName), imp);
+                switch receive {
+                    case nc.AckRegister():
+                        success = true;
+                        break;
+                    case nc.NakRegister(rejected, error):
+                        DebugStub.Break();
+                        if (rejected != null) {
+                            delete rejected;
+                        }
+                        break;
+                    case unsatisfiable:
+                        DebugStub.WriteLine("unable to register {0} with Nameservice",
+                                            __arglist(nsName));
+                        DebugStub.Break();
+                        break;
+                }
+            }
+            finally {
+                delete nc;
+            }
+
+            if (success) {
+                publicName = (!)ClaimServiceContract(contract);
+            }
+            else {
+                publicName = "";
+            }
+            return sp;
+        }
+
+        public static void CreatePublicSymlink(string! publicName,
+                                               string! nsName)
+        {
+            // [TODO] this reveals a bug: the /dev
+            // namespace isn't guaranteed to exist!  This code
+            // force-creates it anyway:
+            int splitpoint = publicName.LastIndexOf('/');
+            string directory =
+                publicName.Remove(splitpoint, publicName.Length - splitpoint);
+            string endpoint = publicName.Remove(0, splitpoint + 1);
+
+            DirNode! devFolder = (!)DirectoryService.FindDirectory(directory, true);
+
+            DirectoryService.CreateSymbolicLink(devFolder, endpoint, nsName);
+        }
+
+        // utility function for getting SystemTypes from strings
+        // in the manifest
+        private static SystemType GetEndpointType(XmlNode! metadata)
+        {
+            // everything must derive from Endpoint
+            SystemType epBaseType = typeof(Channels.Endpoint).GetSystemType();
+
+            // now traverse the metadata to the types, in order:
+            foreach (XmlNode! child in metadata.Children) {
+                string! name = (!)child.GetAttribute(NameXmlTag, "");
+
+                long lower, upper;
+                // [TODO] the encoding of types will
+                // change, and when it does, this will need to
+                // change.  Right now, we create the type name
+                // of foo.imp as foo+foo.imp (same for exp)
+                if (name.EndsWith(".Exp") || name.EndsWith(".Imp")) {
+                    name = name.Remove(name.Length - 4, 4) + "+" + name;
+                }
+
+                // get the hash for this type:
+                System.RuntimeTypeHash.ComputeHash(name, out lower, out upper);
+
+                // If this isn't the base of our derivation, get
+                // the type
+                if (name != EndpointClassName) {
+                    epBaseType = SystemType.Register(name, lower, upper,
+                                                     epBaseType);
+                }
+            }
+            return epBaseType;
+        }
+
+        public static unsafe bool
+        SetEndpoint(Process! process,
+                    int      index,
+                    [Claims] Endpoint * in ExHeap endpoint)
+        {
+            SharedHeap.Allocation * ep = (SharedHeap.Allocation *)endpoint;
+            return process.SetEndpoint(index, ref ep);
+        }
+
+
+        ///
+        /// This is factored into a separate method to limit the exposure of "unsafe" to code
+        /// manipulating other resources, as the ownership checker is not checking methods marked
+        /// unsafe.
+        ///
+        unsafe private static void
+        CreateChannel(out Endpoint*! in ExHeap imp, out Endpoint*! in ExHeap exp, SystemType impType, SystemType expType, int initialState) {
+            // Allocate each EndpointCore, with a default size
+            // of 512 (512 is much bigger than we need, but we
+            // don't have an exact number from the metadata yet)
+
+            Allocation * impCore = (Allocation*)
+                Microsoft.Singularity.V1.Services.EndpointCore.Allocate(
+                    512, impType);
+
+            Allocation *expCore = (Allocation*)
+                Microsoft.Singularity.V1.Services.EndpointCore.Allocate(
+                    512, expType);
+
+            if (impCore == null || expCore == null) {
+                throw new ApplicationException("SharedHeap.Allocate returned null");
+            }
+
+            // set the start state of each endpoint via Initialize()
+            Endpoint*! in ExHeap impEp = (Endpoint* in ExHeap) impCore;
+            Endpoint*! in ExHeap expEp = (Endpoint* in ExHeap) expCore;
+
+            impEp->Initialize(initialState);
+            expEp->Initialize(initialState);
+
+            // connect the endpoints
+            Microsoft.Singularity.Channels.Endpoint.Connect(impEp, expEp);
+
+            // return the endpoints
+            imp = impEp;
+            exp = expEp;
+        }
+
+        public static bool
+        BindToService(Process!   process,
+                      SystemType impType,
+                      SystemType expType,
+                      string     contract,
+                      int        initialState,
+                      int        index)
+        {
+            if (contract == null) return false;
+
+            Endpoint* in ExHeap! impEp;
+            Endpoint* in ExHeap! expEp;
+            CreateChannel(out impEp, out expEp, impType, expType, initialState);
+
+            // Now we need to use policy to get the name for binding the exp,
+            // and we need to cast the exp Endpoint as a ServiceContract
+            ServiceContract.Exp! exp = (!)(expEp as ServiceContract.Exp);
+
+            // [TODO] this should be a static field
+            DirectoryServiceContract.Imp nc =
+                DirectoryService.NewClientEndpoint();
+            try {
+                lock (nameMap) {
+                    if (LockedAttachFirstInstance(nc, contract, exp)) {
+                        // TODO: Do the Success hand shake here
+
+                        // Wire the client endpoint directly into
+                        // the target process to simplifies the
+                        // security checks.
+                        SetEndpoint(process, index, impEp);
+                        return true;
+                    }
+                }
+            }
+            finally {
+                delete nc;
+            }
+            delete impEp;
+            return false;
+        }
+
+        // requires nameMap be locked on entry.
+        private static bool
+        LockedAttachFirstInstance(DirectoryServiceContract.Imp! nc,
+                                  string contract,
+                                  [Claims] ServiceContract.Exp! exp)
+        {
+            // [TODO] for now, we only attach to the first instance:
+            MapEntry! e;
+            try {
+                e = (MapEntry!)nameMap[contract];
+            }
+            catch (Exception e) {
+                DebugStub.WriteLine("Loader.BindToService tried to index {0}",
+                                    __arglist(contract));
+                DebugStub.WriteLine("Loader.BindToService exception:{0}",
+                                    __arglist(e.Message));
+                return false;
+            }
+
+            string name = e.namespacePrefix;
+            if (e.appendInstance) {
+                name += "0";
+            }
+
+            ErrorCode errorOut;
+            // Do the bind and return the result:
+            if (SdsUtils.Bind(name, nc, exp, out errorOut)) {
+                return true;
+            }
+
+            // FIXFIX what should be done if this bind fails?
+            // should the process even allowed to be started?
+            //DebugStub.Break();
+            return false;
+        }
+
+        // Attempt to bind an endpoint to a service provider.  We are going to
+        // assume that the serviceprovider has already been started
+        // this relies on some clever tricks by
+        public static bool BindServiceUser(Process! process,
+                                           int index,
+                                           string! contract,
+                                           XmlNode! metadata)
+        {
+            // get the metadata for both sides of the channel
+            XmlNode! impNode = (!)metadata.GetChild("imp");
+            XmlNode! expNode = (!)metadata.GetChild("exp");
+
+            // get the initial state as an integer
+            int initialState = metadata.GetAttribute(StartStatedIdXmlAttribute, 0);
+
+            // now get the SystemType of each endpoint's type (we don't actually
+            // know the type in the kernel, but we can discern it using the
+            // fullname from the metadata)
+            SystemType impType = GetEndpointType(impNode);
+            SystemType expType = GetEndpointType(expNode);
+
+            return BindToService(process, impType, expType, contract, initialState, index);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Loader/DataItem.sg b/base/Kernel/Singularity.Loader/DataItem.sg
new file mode 100644
index 0000000..44157cc
--- /dev/null
+++ b/base/Kernel/Singularity.Loader/DataItem.sg
@@ -0,0 +1,49 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Loader
+{
+    public class DataItem
+    {
+        private string ns;
+        private string name;
+        private string value;
+
+        public DataItem(string ns, string name, string value)
+        {
+            this.ns = ns;
+            this.name = name;
+            this.value = value;
+        }
+
+        public string Directory
+        {
+            get
+            {
+                return ns;
+            }
+        }
+
+        public string Name
+        {
+            get
+            {
+                return name;
+            }
+        }
+
+        public string Value
+        {
+            get
+            {
+                return value;
+            }
+            set
+            {
+                this.value = value;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Loader/Loader.csproj b/base/Kernel/Singularity.Loader/Loader.csproj
new file mode 100644
index 0000000..36b68bd
--- /dev/null
+++ b/base/Kernel/Singularity.Loader/Loader.csproj
@@ -0,0 +1,38 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Loader</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStandardLibraries>true</NoStandardLibraries>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Binder.sg" />
+    <Compile Include="Manifest.sg" />
+    <Compile Include="DataItem.sg" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\IoSystem\IoSystem.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Hal\Hal.csproj" />
+    <ProjectReference Include="..\Singularity.Directory\Directory.csproj" />
+    <ProjectReference Include="..\SpecSharp.Contracts\Kernel.Contracts.csproj" />    
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Loader/Manifest.sg b/base/Kernel/Singularity.Loader/Manifest.sg
new file mode 100644
index 0000000..0b92414
--- /dev/null
+++ b/base/Kernel/Singularity.Loader/Manifest.sg
@@ -0,0 +1,313 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Manifest.cs
+//
+//  Note:   Creates and binds endpoints using a manifest.
+//
+
+using System;
+using System.Text;
+using System.Collections;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Loader
+{
+    /// <summary>
+    /// This is a placeholder class for an application's manifest.
+    /// At present the application manifest is represented by a hashtable.
+    /// The hashtable has several important properties:
+    ///  - name: the name of the application
+    ///  - path: path to the application executable
+    /// </summary>
+    public class Manifest
+    {
+        /// <summary>
+        /// We treat the application manifest as a collection of
+        /// key, value pairs.
+        /// </summary>
+        private Hashtable! data = new Hashtable();
+        private const string pipeContract = "Microsoft.Singularity.Io.UnicodePipeContract";
+
+        private string name;
+        private string path;
+        private string publisher;
+        private string[] privileges = null;
+
+        private readonly XmlNode! applicationNode;
+        private readonly XmlNode! processNode;
+        private readonly XmlNode  categoriesNode;
+
+        /// <summary>
+        /// Create a manifest object from the given xml representation
+        /// </summary>
+        [Microsoft.Contracts.NotDelayed]
+        public Manifest(byte[] xml)
+        {
+            Kernel.Waypoint(2600);
+            XmlReader! reader = new XmlReader(xml);
+            XmlNode! doc = (!)reader.Parse();
+            Kernel.Waypoint(2601);
+
+            this(doc);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        public Manifest(IoMemory memory)
+        {
+            Kernel.Waypoint(2600);
+            XmlReader! reader = new XmlReader(memory);
+            XmlNode! doc = (!)reader.Parse();
+            Kernel.Waypoint(2601);
+
+            this(doc);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        private Manifest(XmlNode! doc)
+        {
+            XmlNode app = (!)doc.GetChild("application");
+            name = app["name"];
+            publisher = app["publisher"];
+            XmlNode proc = null;
+            foreach (XmlNode! process in app.Children) {
+                if (process.Name != "process") {
+                    continue;
+                }
+                if (process.GetAttribute("main", "false") == "true") {
+                    path = process["path"];
+                    proc = process;
+                    break;
+                }
+            }
+            applicationNode = app;
+            XmlNode! processNode = this.processNode = (!)proc;
+
+            base();
+
+            XmlNode privsNode = applicationNode.GetChild("privileges");
+            if (privsNode != null) {
+                int pCount = 0;
+                foreach (XmlNode! privilegeNode in privsNode.Children) {
+                    if (privilegeNode.Name != "privilege")
+                        continue;
+                    if (privilegeNode.GetAttribute("name", null) != null) {
+                        pCount++;
+                    }
+                }
+                if (pCount != 0) {
+                    privileges = new string[pCount];
+                    pCount = 0;
+                    foreach (XmlNode! privilegeNode in privsNode.Children) {
+                        if (privilegeNode.Name != "privilege")
+                            continue;
+                        String privilege = privilegeNode.GetAttribute("name", null);
+                        if (privilege != null) {
+                            privileges[pCount++] = privilege;
+                        }
+                    }
+                }
+            }
+
+            categoriesNode = processNode.GetChild("categories");
+            if (categoriesNode != null) {
+                    return;
+            }
+#if false
+            string ns = child["namespace"];
+            string name = child["name"];
+            string value = child["value"];
+
+            if (name != null && value != null) {
+                DataItem item = new DataItem(ns, name, value);
+                data[name] = item;
+            }
+            else {
+                throw new Exception("Invalid manifest");
+            }
+#endif
+            Kernel.Waypoint(2602);
+        }
+
+        public object GetProperty(object! name)
+        {
+            return data[name];
+        }
+
+        public void SetProperty(object! name, object value)
+        {
+            data[name] = value;
+        }
+
+        // given an action find the corresponding category node
+        public  XmlNode GetCategoryNode(string actionName) {
+            if (categoriesNode == null) return null;
+            if (actionName == null) {
+                // return the 1st one if there is one
+                return categoriesNode.GetChild("category");
+            }
+            else {
+                foreach (XmlNode! c in categoriesNode.Children) {
+                    string a = c.GetAttribute("Action",null);
+                    if ( a != null && a == actionName) {
+                        return c;
+                    }
+                }
+                return null;
+            }
+        }
+
+        public bool GetParameterCounts( string action,
+                                        out int boolCount,
+                                        out int longCount,
+                                        out int stringCount,
+                                        out int stringArrayCount)
+        {
+            XmlNode categoryNode;
+
+            boolCount = 0;
+            longCount = 0;
+
+            stringCount = 0;
+            stringArrayCount = 0;
+
+            XmlNode boolParametersNode;
+            XmlNode longParametersNode;
+            XmlNode stringParametersNode;
+            XmlNode stringArrayParametersNode;
+
+            categoryNode = GetCategoryNode(action);
+
+            if (categoryNode == null) {
+                return true;
+            }
+
+            boolParametersNode = categoryNode.GetChild("BoolParameters");
+            if(boolParametersNode != null) {
+               boolCount = boolParametersNode.GetAttribute("length", 0);
+            }
+
+            longParametersNode = categoryNode.GetChild("LongParameters");
+            if(longParametersNode != null) {
+               longCount = longParametersNode.GetAttribute("length", 0);
+            }
+
+            stringParametersNode = categoryNode.GetChild("StringParameters");
+            if(stringParametersNode != null) {
+               stringCount = stringParametersNode.GetAttribute("length", 0);
+            }
+
+            stringArrayParametersNode = categoryNode.GetChild("StringArrayParameters");
+            if(stringArrayParametersNode != null) {
+               stringArrayCount = stringArrayParametersNode.GetAttribute("length", 0);
+            }
+
+            return true;
+
+        }
+
+        public int SetEndpoints(Process! process, string action)
+        {
+            // walk the XmlTree looking endpoints
+            // these will be used by the binder to setup and transfer to
+            // the starting process much like what is done for drivers
+
+            XmlNode categoryNode;
+            categoryNode = GetCategoryNode(action);
+
+            if (categoryNode == null) {
+#if DEBUG
+                DebugStub.WriteLine("::: no category");
+#endif
+                return 0;
+            }
+            XmlNode endpoints = categoryNode.GetChild("endpoints");
+            if (endpoints == null) {
+                return 0;
+            }
+            int endpointCount = endpoints.GetAttribute("length", 0);
+            if (endpointCount == 0) {
+                return 0;
+            }
+
+            // now allocate memory for ep set
+            process.SetEndpointCount(endpointCount);
+            //DebugStub.WriteLine("Setting endpoint count to {0}", __arglist(endpointCount));
+            return endpointCount;
+        }
+
+        public string Name
+        {
+            get {
+                return name;
+            }
+        }
+
+        public string Publisher
+        {
+            get {
+                return publisher;
+            }
+        }
+
+        public string Path
+        {
+            get {
+                return path;
+            }
+        }
+
+        public string[] Privileges
+        {
+            get {
+                return privileges;
+            }
+        }
+
+#if false
+        public override string! ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.AppendFormat("<application name=\"{0}\">", Name);
+
+            // the main executable
+            sb.AppendFormat("<process main=\"true\" path=\"{0}\"/>", Path);
+
+            foreach(DataItem item in data.Values) {
+                if (item.Directory == null) {
+                    sb.AppendFormat("<data name=\"{0}\" value=\"{1}\"/>",
+                                    item.Name, item.Value);
+                }
+                else {
+                    sb.AppendFormat("<data namespace=\"{0}\" name=\"{1}\" value=\"{2}\"/>",
+                                    item.Directory, item.Name, item.Value);
+                }
+            }
+
+            sb.Append("</process>");
+            sb.Append("</application>");
+            sb.Append("<signature>");
+            sb.Append("</signature>");
+
+            return sb.ToString();
+        }
+
+        public byte[] Serialize()
+        {
+            return (new UTF8Encoding()).GetBytes(ToString());
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/AclConverter.sg b/base/Kernel/Singularity.Security/AccessControl/AclConverter.sg
new file mode 100644
index 0000000..313b494
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/AclConverter.sg
@@ -0,0 +1,353 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// #define VERBOSE
+// #define REALLY_VERBOSE
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+    using System;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using System.Collections;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity.Security;
+    using Microsoft.Singularity.Channels;
+
+    /// <summary>
+    /// Converts an Access Control List description to a regular expression.
+    /// Caches group expansions for improved performance.
+    /// </summary>
+
+    public class AclConverter
+    {
+        /// <summary>
+        /// Regular expression matching an path fragment
+        /// </summary>
+        protected const string pathfrag = @"[a-zA-Z1-90_]+(\.[a-zA-Z1-90_]+)*";
+        /// <summary>
+        /// Regular expression matching the beginning of a string
+        /// </summary>
+        protected const string start = "^";
+        /// <summary>
+        /// Regular expression matching the end of a string
+        /// </summary>
+        protected const string end = "$";
+
+        /// <summary>expression
+        /// The reader of group definitions
+        /// </summary>
+        protected Cache! cache;
+        private IAclCoreSupport support;
+
+        /// <summary>
+        /// Create new converter,
+        /// </summary>
+
+        private const int ExpnCachePrunePercent = 20;
+
+        public AclConverter(IAclCoreSupport _support, int expnCacheMaxEntries, int expnCacheExpirySeconds)
+        {
+            this.support = _support;
+            this.cache = new Cache(expnCacheMaxEntries, expnCacheExpirySeconds,
+                                        ExpnCachePrunePercent, "Expansion Cache: ");
+        }
+
+        /// <summary>
+        /// Convert the specified ACL to a regular expression
+        /// </summary>
+        /// <param name="acl">The access control list</param>
+        /// <returns>An equivalent text regular expression</returns>
+
+        public void DumpStats(StringBuilder! sb)
+        {
+            cache.DumpStats(sb);
+        }
+
+        public void ClearStats()
+        {
+            cache.ResetStats();
+        }
+
+        public void FlushCache()
+        {
+            cache.Prune(true);
+        }
+
+        public string! Convert(string! aclstr, bool bypassCache, out DateTime minExpiry)
+        {
+            StringBuilder! sb = new StringBuilder();
+            Stack! stack = new Stack();
+            int nSubExprs = 0;
+
+            minExpiry = DateTime.MaxValue;
+            sb.Append(start);
+            DoExpand(aclstr, sb, "", stack, bypassCache, ref nSubExprs, ref minExpiry);
+            sb.Append(end);
+            return sb.ToString();
+        }
+
+        public string! ConvertTest(string! aclstr, out int nSubExprs)
+        {
+            DateTime minExpiry = DateTime.MaxValue;
+            StringBuilder! sb = new StringBuilder();
+            Stack! stack = new Stack();
+
+            nSubExprs = 0;
+            sb.Append(start);
+            DoExpand(aclstr, sb, "", stack, false, ref nSubExprs, ref minExpiry);
+            sb.Append(end);
+            return sb.ToString();
+        }
+
+        internal class CacheEntry : ICacheValue
+        {
+            public string! expansion;
+            public bool constant;
+            public int nSubExprs;
+
+            public CacheEntry(Cache! cache, string! expansion, bool constant,
+                                           int nSubExprs, DateTime minExpiry)
+            {
+                base(cache, minExpiry);
+                this.expansion = expansion;
+                this.constant = constant;
+                this.nSubExprs = nSubExprs;
+            }
+        }
+
+        private void DoExpand(string! pattern, StringBuilder! sb, string! ns,
+                               Stack! stack, bool bypassCache, ref int nSubExprs, ref DateTime minExpiry)
+        {
+            AclToken t;
+            AclParser parser = new AclParser(pattern);
+
+            CacheEntry ce = null;
+            int eStart = sb.Length;
+            int eSubExprs = nSubExprs;
+
+            ce = (CacheEntry) cache.GetEntry(pattern);
+            if (ce != null) {
+                if (ce.Expired)
+                    ce = null;
+                else if (!bypassCache || ce.constant) {
+#if VERBOSE
+                    DebugStub.Print("DoExpand: Cache hit {0}\n", __arglist(path));
+#endif
+                    if (ce.expiry < minExpiry)
+                        minExpiry = ce.expiry;
+                    sb.Append(ce.expansion);
+                    nSubExprs += ce.nSubExprs;
+                    return;
+                }
+            }
+
+            while ((t = parser.NextToken()) != null) {
+                switch(t.Type) {
+                    case AclTokenType.Literal:
+#if REALLY_VERBOSE
+                        DebugStub.Print("Literal: {0}\n", __arglist(t.Text));
+#endif
+                        sb.Append(t.Text);
+                        break;
+                    case AclTokenType.Arc:
+#if REALLY_VERBOSE
+                        DebugStub.Print("Arc: {0}\n", __arglist(t.Text));
+#endif
+                        /* Arcs need no transformation */
+                        sb.Append(t.Text);
+                        break;
+                    case AclTokenType.Any:
+                        /* Any matches any path fragment */
+#if REALLY_VERBOSE
+                        DebugStub.Print("Any: {0}\n", __arglist(t.Text));
+#endif
+                        sb.Append(pathfrag);
+                        break;
+                    case AclTokenType.Escape:
+                        /* Reserved regular expression symbol: escape it */
+#if REALLY_VERBOSE
+                        DebugStub.Print("Escape: {0}\n", __arglist(t.Text));
+#endif
+                        sb.AppendFormat("\\{0}", t.Text);
+                        break;
+                    case AclTokenType.GroupName:
+                        /*
+                        * A sub-expression can have relative or absolute name.
+                        * We resolve relative names by keeping track of the namespace
+                        * of the last resolution.
+                        */
+                        bool isPath = true;
+                        string path = t.Text;
+                        nSubExprs++;
+                        if (path.Length != 0) {
+                            if (path[0] == '$') {
+                                isPath = false;
+                            } else {
+                                if (path[0] != '/') {
+                                    // this is a relative path. append the namespace
+                                    path = ns + "/" + path;
+                                }
+
+                                // update the namespace name:
+                                int index = path.LastIndexOf('/');
+                                if (index == -1) {
+                                    ns = String.Empty;
+                                } else {
+                                    ns = (!)path.Substring(0, index);
+                                }
+                            }
+
+                            string subexpr = ReadSubexpression(path, isPath);
+                            if (subexpr == null) {
+#if VERBOSE
+                                DebugStub.Print("Undefined subexpression: {0}\n", __arglist(t.Text));
+#endif
+                            }
+
+                            if (stack.Contains(path)) {
+                                throw new Exception("Infinite recursion detected while expanding acl.");
+                            }
+
+                            sb.Append('(');
+                            stack.Push(path);
+                            if (subexpr != null && subexpr.Length != 0)
+                                DoExpand(subexpr, sb, ns, stack, bypassCache, ref nSubExprs, ref minExpiry);
+                            stack.Pop();
+                            sb.Append(')');
+                        }
+                        break;
+                    case AclTokenType.Miscellaneous:
+                        DebugStub.Print("Invalid token: {0} Skipping it\n", __arglist(t.Text));
+                        break;
+                }
+            }
+            // cache the results of the expansion at this level
+            string expansion = sb.ToString(eStart, sb.Length-eStart);
+            if (ce == null || expansion != ce.expansion) {
+                ce = new CacheEntry(cache, expansion, false, nSubExprs-eSubExprs, minExpiry);
+                cache.AddEntry(pattern, ce);
+            } else if (ce != null) {
+                // Old expansion was the same, update expiry.
+                ce.ResetExpiry(cache, minExpiry);
+            }
+            if (ce.expiry < minExpiry)
+                minExpiry = ce.expiry;
+        }
+
+        private string ReadSubexpression(string! path, bool isPath)
+        {
+            string result = null;
+            if (isPath) {
+                if (support == null)
+                    DebugStub.Print("ReadSubexpression: AclCoreSupport object missing\n");
+                else
+                    result = support.Expand(path);
+            } else
+                result = Principal.ExpandAclIndirection(path);
+            return result;
+        }
+
+        /*
+        // this code has been moved to the client impl (e.g. DirAclCoreSupport.sg)
+
+        private string ReadGroup(string! path)
+        {
+            return support.GetGroupContents(path);
+        }
+
+        // read the file size
+            DirectoryServiceContract.Imp:Ready! ns = AcquireNSRoot();
+            byte[] result =  ReadFromFile(path, ns);
+            ReleaseNSRoot(ns);
+
+            if (result == null)
+                return null;
+
+            string! subexpression = (!)encoder.GetString(result);
+            return subexpression;
+        }
+
+        private DirectoryServiceContract.Imp:Ready! AcquireNSRoot()
+        {
+
+            if (cachedRootNS == null)
+                cachedRootNS =
+                    new TRef<DirectoryServiceContract.Imp:Ready>(support.GroupDirectoryRoot());
+            return cachedRootNS.Acquire();
+        }
+
+        private void ReleaseNSRoot([Claims] DirectoryServiceContract.Imp:Ready! ns)
+        {
+            cachedRootNS.Release(ns);
+        }
+
+        private byte[] ReadFromFile(string!path, DirectoryServiceContract.Imp:Ready! ns)
+        {
+            ErrorCode errCode;
+            byte[] result;
+            long size = 0;
+            int readSize = 4096;
+            NodeType nodeType;
+
+
+            try {
+                bool temp = SdsUtils.GetAttributes(path, ns, out size, out nodeType, out errCode);
+                if (! temp)
+                    // element does not exist or an error has occurred
+                    throw new Exception("Cannot get attributes - " + SdsUtils.ErrorCodeToString(errCode));
+
+                result = new byte[size];
+                byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                if (result == null || buf == null)
+                    throw new Exception("Cannot allocate memory");
+
+                FileContract.Imp! fileImp;
+                FileContract.Exp! fileExp;
+                FileContract.NewChannel(out fileImp, out fileExp);
+                bool bindOk = SdsUtils.Bind(path, ns, fileExp, out errCode);
+                if (!bindOk) {
+                    delete fileImp;
+                    throw new Exception("Can't read group - " + SdsUtils.ErrorCodeToString(errCode));
+                }
+                fileImp.RecvSuccess();
+
+                long readOffset = 0;
+                while (true) {
+                    fileImp.SendRead(buf, 0, readOffset, readSize);
+                    switch receive {
+                        case fileImp.AckRead(localbuf,  bytesRead,  error) :
+                            // move the memory
+                            Bitter.ToByteArray(localbuf, 0, (int)bytesRead, result, (int)readOffset);
+                            if (bytesRead == readSize) {
+                                // see if there is more
+                                readOffset += bytesRead;
+                                buf = localbuf;
+                                continue;
+                            }
+                            delete localbuf;
+                            break;
+                        case fileImp.ChannelClosed() :
+                            break;
+                        case unsatisfiable :
+                            break;
+                    }
+                    break;
+                }
+                delete fileImp;
+            } catch (Exception e) {
+                DebugStub.Print("An exception occurred while reading group definition: {0}\n",
+                                __arglist(path));
+                DebugStub.Print("Message: {0}\n", __arglist(e.Message));
+                return null;
+            }
+            return result;
+        }
+        */
+
+    }
+}
+
+
diff --git a/base/Kernel/Singularity.Security/AccessControl/AclParser.sg b/base/Kernel/Singularity.Security/AccessControl/AclParser.sg
new file mode 100644
index 0000000..29af836
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/AclParser.sg
@@ -0,0 +1,398 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+using System;
+using Microsoft.Contracts;
+/* test */
+
+
+internal class AclParser
+{
+private const int YY_BUFFER_SIZE = 512;
+private const int YY_F = -1;
+private const int YY_NO_STATE = -1;
+private const int YY_NOT_ACCEPT = 0;
+private const int YY_START = 1;
+private const int YY_END = 2;
+private const int YY_NO_ANCHOR = 4;
+delegate AclToken AcceptMethod();
+AcceptMethod[]! accept_dispatch;
+private const int YY_BOL = 128;
+private const int YY_EOF = 129;
+private StringReader! yy_reader;
+private int yy_buffer_index;
+private int yy_buffer_read;
+private int yy_buffer_start;
+private int yy_buffer_end;
+private char[]! yy_buffer;
+private int yychar;
+private int yyline;
+private bool yy_at_bol;
+private int yy_lexical_state;
+
+    //        [NotDelayed]
+   internal AclParser(string data)
+   {
+       yy_reader = new StringReader(data);
+  yy_buffer = new char[YY_BUFFER_SIZE];
+  yy_buffer_read = 0;
+  yy_buffer_index = 0;
+  yy_buffer_start = 0;
+  yy_buffer_end = 0;
+  yychar = 0;
+  yyline = 0;
+  yy_at_bol = true;
+  yy_lexical_state = YYINITIAL;
+  base();
+
+  accept_dispatch = new[Delayed] AcceptMethod[]
+ {
+  null,
+  null,
+  new AcceptMethod(this.Accept_2),
+  new AcceptMethod(this.Accept_3),
+  new AcceptMethod(this.Accept_4),
+  new AcceptMethod(this.Accept_5),
+  new AcceptMethod(this.Accept_6),
+  new AcceptMethod(this.Accept_7),
+  null,
+  new AcceptMethod(this.Accept_9),
+  };
+  }
+
+AclToken Accept_2()
+    { // begin accept action #2
+{
+  String! str = (!)yytext().Substring(0, yytext().Length);
+  if (str.Equals("!"))
+    {
+      return (new AclToken(AclTokenType.Any, str, yychar, yychar + 1));
+    }
+  else
+    {
+      return (new AclToken(AclTokenType.Arc, str, yychar, yychar + str.Length));
+    }
+}
+    } // end accept action #2
+
+AclToken Accept_3()
+    { // begin accept action #3
+{yybegin(GROUPNAME); return null;}
+    } // end accept action #3
+
+AclToken Accept_4()
+    { // begin accept action #4
+{ return (new AclToken(AclTokenType.Escape, yytext(), yychar, yychar+1)); }
+    } // end accept action #4
+
+AclToken Accept_5()
+    { // begin accept action #5
+{ return (new AclToken(AclTokenType.Literal, yytext(), yychar, yychar+1)); }
+    } // end accept action #5
+
+AclToken Accept_6()
+    { // begin accept action #6
+{yybegin(YYINITIAL); return null;}
+    } // end accept action #6
+
+AclToken Accept_7()
+    { // begin accept action #7
+{
+  String! str =  (!)yytext().Substring(0, yytext().Length);
+  return (new AclToken(AclTokenType.GroupName, str, yychar, yychar + str.Length));
+}
+    } // end accept action #7
+
+AclToken Accept_9()
+    { // begin accept action #9
+{
+  String! str = (!)yytext().Substring(0, yytext().Length);
+  if (str.Equals("!"))
+    {
+      return (new AclToken(AclTokenType.Any, str, yychar, yychar + 1));
+    }
+  else
+    {
+      return (new AclToken(AclTokenType.Arc, str, yychar, yychar + str.Length));
+    }
+}
+    } // end accept action #9
+
+private const int YYINITIAL = 0;
+private const int GROUPNAME = 1;
+private static int[]! yy_state_dtrans = new int[]
+  {   0,
+  8
+  };
+private void yybegin (int mystate)
+  {
+  yy_lexical_state = mystate;
+  }
+
+private char yy_advance ()
+  {
+  int next_read;
+  int i;
+  int j;
+
+  if (yy_buffer_index < yy_buffer_read)
+    {
+    return yy_buffer[yy_buffer_index++];
+    }
+
+  if (0 != yy_buffer_start)
+    {
+    i = yy_buffer_start;
+    j = 0;
+    while (i < yy_buffer_read)
+      {
+      yy_buffer[j] = yy_buffer[i];
+      i++;
+      j++;
+      }
+    yy_buffer_end = yy_buffer_end - yy_buffer_start;
+    yy_buffer_start = 0;
+    yy_buffer_read = j;
+    yy_buffer_index = j;
+    next_read = yy_reader.Read(yy_buffer,yy_buffer_read,
+                  yy_buffer.Length - yy_buffer_read);
+    if (next_read <= 0)
+      {
+      return (char) YY_EOF;
+      }
+    yy_buffer_read = yy_buffer_read + next_read;
+    }
+  while (yy_buffer_index >= yy_buffer_read)
+    {
+    if (yy_buffer_index >= yy_buffer.Length)
+      {
+      yy_buffer = yy_double(yy_buffer);
+      }
+    next_read = yy_reader.Read(yy_buffer,yy_buffer_read,
+                  yy_buffer.Length - yy_buffer_read);
+    if (next_read <= 0)
+      {
+      return (char) YY_EOF;
+      }
+    yy_buffer_read = yy_buffer_read + next_read;
+    }
+  return yy_buffer[yy_buffer_index++];
+  }
+private void yy_move_end ()
+  {
+  if (yy_buffer_end > yy_buffer_start &&
+      '\n' == yy_buffer[yy_buffer_end-1])
+    yy_buffer_end--;
+  if (yy_buffer_end > yy_buffer_start &&
+      '\r' == yy_buffer[yy_buffer_end-1])
+    yy_buffer_end--;
+  }
+private bool yy_last_was_cr=false;
+private void yy_mark_start ()
+  {
+  int i;
+  for (i = yy_buffer_start; i < yy_buffer_index; i++)
+    {
+    if (yy_buffer[i] == '\n' && !yy_last_was_cr)
+      {
+      yyline++;
+      }
+    if (yy_buffer[i] == '\r')
+      {
+      yyline++;
+      yy_last_was_cr=true;
+      }
+    else
+      {
+      yy_last_was_cr=false;
+      }
+    }
+  yychar = yychar + yy_buffer_index - yy_buffer_start;
+  yy_buffer_start = yy_buffer_index;
+  }
+private void yy_mark_end ()
+  {
+  yy_buffer_end = yy_buffer_index;
+  }
+private void yy_to_mark ()
+  {
+  yy_buffer_index = yy_buffer_end;
+  yy_at_bol = (yy_buffer_end > yy_buffer_start) &&
+    (yy_buffer[yy_buffer_end-1] == '\r' ||
+    yy_buffer[yy_buffer_end-1] == '\n');
+  }
+internal string! yytext()
+  {
+  return (new string(yy_buffer,
+                yy_buffer_start,
+                yy_buffer_end - yy_buffer_start)
+         );
+  }
+private int yylength ()
+  {
+  return yy_buffer_end - yy_buffer_start;
+  }
+private char[]! yy_double (char[]! buf)
+  {
+  int i;
+  char[] newbuf;
+  newbuf = new char[2*buf.Length];
+  for (i = 0; i < buf.Length; i++)
+    {
+    newbuf[i] = buf[i];
+    }
+  return newbuf;
+  }
+private const int YY_E_INTERNAL = 0;
+private const int YY_E_MATCH = 1;
+private static string[]! yy_error_string = new string[]
+  {
+  "Error: Internal error.\n",
+  "Error: Unmatched input.\n"
+  };
+private void yy_error (int code,bool fatal)
+  {
+  System.Console.Write(yy_error_string[code]);
+  if (fatal)
+    {
+    throw new System.ApplicationException("Fatal Error.\n");
+    }
+  }
+private static int[]! yy_acpt = new int[]
+  {
+  /* 0 */   YY_NOT_ACCEPT,
+  /* 1 */   YY_NO_ANCHOR,
+  /* 2 */   YY_NO_ANCHOR,
+  /* 3 */   YY_NO_ANCHOR,
+  /* 4 */   YY_NO_ANCHOR,
+  /* 5 */   YY_NO_ANCHOR,
+  /* 6 */   YY_NO_ANCHOR,
+  /* 7 */   YY_NO_ANCHOR,
+  /* 8 */   YY_NOT_ACCEPT,
+  /* 9 */   YY_NO_ANCHOR
+  };
+private static int[]! yy_cmap = new int[]
+  {
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 2, 4, 4, 4, 4, 4, 4,
+  6, 6, 6, 5, 4, 4, 5, 6,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  6, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 3, 6, 1, 4, 4,
+  0, 0
+  };
+private static int[]! yy_rmap = new int[]
+  {
+  0, 1, 2, 1, 1, 1, 1, 3,
+  4, 1
+  };
+private static int[,]! yy_nxt = new int[,]
+  {
+  { 1, 2, 9, 3, 2, 4, 5 },
+  { -1, -1, -1, -1, -1, -1, -1 },
+  { -1, 2, -1, -1, 2, -1, -1 },
+  { -1, -1, 7, 7, 7, 7, 7 },
+  { 1, 6, 7, 7, 7, 7, 7 }
+  };
+public AclToken NextToken()
+  {
+  char yy_lookahead;
+  int yy_anchor = YY_NO_ANCHOR;
+  int yy_state = yy_state_dtrans[yy_lexical_state];
+  int yy_next_state = YY_NO_STATE;
+  int yy_last_accept_state = YY_NO_STATE;
+  bool yy_initial = true;
+  int yy_this_accept;
+
+  yy_mark_start();
+  yy_this_accept = yy_acpt[yy_state];
+  if (YY_NOT_ACCEPT != yy_this_accept)
+    {
+    yy_last_accept_state = yy_state;
+    yy_mark_end();
+    }
+  while (true)
+    {
+    if (yy_initial && yy_at_bol)
+      yy_lookahead = (char) YY_BOL;
+    else
+      {
+      yy_lookahead = yy_advance();
+      }
+    yy_next_state = yy_nxt[yy_rmap[yy_state],yy_cmap[yy_lookahead]];
+    if (YY_EOF == yy_lookahead && yy_initial)
+      {
+        return null;
+      }
+    if (YY_F != yy_next_state)
+      {
+      yy_state = yy_next_state;
+      yy_initial = false;
+      yy_this_accept = yy_acpt[yy_state];
+      if (YY_NOT_ACCEPT != yy_this_accept)
+        {
+        yy_last_accept_state = yy_state;
+        yy_mark_end();
+        }
+      }
+    else
+      {
+      if (YY_NO_STATE == yy_last_accept_state)
+        {
+        throw new System.ApplicationException("Lexical Error: Unmatched Input.");
+        }
+      else
+        {
+        yy_anchor = yy_acpt[yy_last_accept_state];
+        if (0 != (YY_END & yy_anchor))
+          {
+          yy_move_end();
+          }
+        yy_to_mark();
+        if (yy_last_accept_state < 0)
+          {
+          if (yy_last_accept_state < 10)
+            yy_error(YY_E_INTERNAL, false);
+          }
+        else
+          {
+          AcceptMethod m = accept_dispatch[yy_last_accept_state];
+          if (m != null)
+            {
+            AclToken tmp = m();
+            if (tmp != null)
+              return tmp;
+            }
+          }
+        yy_initial = true;
+        yy_state = yy_state_dtrans[yy_lexical_state];
+        yy_next_state = YY_NO_STATE;
+        yy_last_accept_state = YY_NO_STATE;
+        yy_mark_start();
+        yy_this_accept = yy_acpt[yy_state];
+        if (YY_NOT_ACCEPT != yy_this_accept)
+          {
+          yy_last_accept_state = yy_state;
+          yy_mark_end();
+          }
+        }
+      }
+    }
+  }
+}
+
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/AclToken.sg b/base/Kernel/Singularity.Security/AccessControl/AclToken.sg
new file mode 100644
index 0000000..29851d6
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/AclToken.sg
@@ -0,0 +1,45 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+    using System;
+
+	/// <summary>
+	/// Summary description for Token.
+	/// </summary>
+	internal class AclToken
+	{
+        /// <summary>
+        /// The token type
+        /// </summary>
+        public AclTokenType Type;
+        /// <summary>
+        /// The value of the token
+        /// </summary>
+		public readonly string! Text;
+        /// <summary>
+        /// Start position in the input stream.
+        /// </summary>
+		public int Start;
+        /// <summary>
+        /// End position in the input stream.
+        /// </summary>
+		public int End;
+
+		public AclToken(AclTokenType type, string! text, int start, int end)
+		{
+			this.Type = type;
+			this.Text = text;
+			this.Start = start;
+			this.End = end;
+		}
+
+		public override string! ToString()
+		{
+			return "[" + Type + ":" + Text + ":(" + Start + "," + End +")]";
+		}
+	}
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/AclTokenType.sg b/base/Kernel/Singularity.Security/AccessControl/AclTokenType.sg
new file mode 100644
index 0000000..afe6cc7
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/AclTokenType.sg
@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+    using System;
+
+    /// <summary>
+    /// Summary description for TokenType.
+    /// </summary>
+    internal enum AclTokenType
+    {
+        Arc,
+        GroupName,
+        Literal,
+        Escape,
+        Any,
+        Miscellaneous
+    }
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/Cache.sg b/base/Kernel/Singularity.Security/AccessControl/Cache.sg
new file mode 100644
index 0000000..d8b97bd
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/Cache.sg
@@ -0,0 +1,254 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+    using System;
+    using System.Text;
+    using System.Collections;
+
+    /// <summary>
+    /// Implement an cache with maximum size, timeouts, and LRU pruning.
+    /// </summary>
+
+    public class ICacheValue
+    {
+        public DateTime expiry;
+        public bool Expired { get { return (this.expiry > DateTime.Now); } }
+
+        public void ResetExpiry(Cache! cache, DateTime minExpiry)
+        {
+            expiry = cache.ComputeExpiry(minExpiry);
+        }
+
+        public ICacheValue(Cache! cache, DateTime minExpiry)
+        {
+            expiry = cache.ComputeExpiry(minExpiry);
+        }
+    }
+
+    public class Cache : Hashtable
+    {
+        internal struct Stats {
+            public int maxEntries;
+            public bool enabled;
+            public int hits;
+            public int misses;
+            public int timeout;
+            public int prunePercent;
+            public string statHeader;
+
+            public Stats (int _maxSize, int _timeout, int _prunePercent, string! _statHdr)
+            {
+                maxEntries = _maxSize;
+                enabled = true;
+                hits = 0;
+                misses = 0;
+                timeout = _timeout;
+                prunePercent = _prunePercent;
+                statHeader = _statHdr;
+            }
+        }
+
+        internal class CacheEntry
+        {
+            public string! key;
+            public ulong lastAccess;
+            public ICacheValue! value;          // the client value
+
+            public CacheEntry(string! key, ICacheValue! value)
+            {
+                this.key = key;
+                this.value = value;
+                this.lastAccess = lastAccessSource++;
+            }
+        }
+
+        private const int DefaultMaxCacheSize = 1000;
+        private const int DefaultTimeout = 60 * 60;
+        private const int DefaultPrunePercent = 25;
+
+        // we don't access this inside a lock, because if we lose
+        // a click we don't care
+        private static ulong lastAccessSource = 0L;
+
+        private Stats stats;
+
+        public Cache()
+        {
+            this.stats = new Stats(DefaultMaxCacheSize, DefaultTimeout, DefaultPrunePercent, "");
+        }
+
+        public Cache(int maxEntries, int timeout, int prunePercent, string! statHeader)
+        {
+            this.stats = new Stats(maxEntries, timeout, prunePercent, statHeader);
+        }
+
+        public DateTime ComputeExpiry(DateTime minExpiry)
+        {
+            DateTime exp = DateTime.Now;
+            exp.AddSeconds(stats.timeout);
+            if (exp > minExpiry)
+                exp = minExpiry;
+            return exp;
+        }
+
+        /// <summary>
+        /// Retrieve the corresponding entry
+        /// </summary>
+        public ICacheValue GetEntry(string! key)
+        {
+            // no lock because HTs are lock-free for read
+            if (!stats.enabled)
+                return null;
+
+            CacheEntry e = (CacheEntry) this[key];
+            if (e == null) {
+                stats.misses++;
+                return null;
+            }
+            stats.hits++;
+            e.lastAccess = lastAccessSource++;
+            return e.value;
+        }
+
+        /// <summary>
+        /// Add or replace the entry in the cache
+        /// </summary>
+        public void AddEntry(string! key, ICacheValue! value)
+        {
+            lock (this) {
+                if (! stats.enabled)
+                    return;
+
+                CacheEntry e = new CacheEntry(key, value);
+                if (this.Count >= stats.maxEntries)
+                    Prune(false);
+                this[e.key] = e;
+            }
+        }
+
+        /// <summary>
+        /// Make room in the cache
+        /// </summary>
+
+        public void Prune(bool all)
+        {
+            // assume that Expired entries will come to the head of the LRU
+            lock (this) {
+                if (all)
+                    this.Clear();
+                else {
+                    int target = (this.stats.maxEntries * stats.prunePercent) / 100;
+                    CacheEntry[] candidates = new CacheEntry[target];
+                    CacheEntry lastCandidate = null;
+                    foreach (DictionaryEntry de in this) {
+                        CacheEntry! e = (CacheEntry!) de.Value;
+                        if (lastCandidate == null || e.lastAccess < lastCandidate.lastAccess) {
+                            lastCandidate = InsertPruningCandidate(e, candidates);
+                        }
+                    }
+                    for (int i=0; i<target; i++) {
+                        CacheEntry e = candidates[i];
+                        if (e != null)
+                            this.Remove(e.key);
+                    }
+                }
+            }
+        }
+
+        private CacheEntry InsertPruningCandidate(CacheEntry! e, CacheEntry[]! ccs)
+        {
+
+            for (int i=ccs.Length-1; i>=0; i--) {
+                CacheEntry ee = ccs[i];
+                if (ee == null) {
+                    ccs[i] = e;
+                    break;
+                }
+                if (e.lastAccess < ee.lastAccess) {
+                    // push everyone down, insert here
+                    while (ee != null) {
+                        ccs[i] = e;
+                        if (i-- == 0)
+                            break;
+                        e = ee;
+                        ee = ccs[i];
+                    }
+                    break;
+                }
+                // otherwise keep looking
+            }
+            return ccs[0];
+        }
+
+        // these methods are for testing purposes
+
+        public void ResetStats()
+        {
+            lock (this) {
+                this.stats.hits = 0;
+                this.stats.misses = 0;
+            }
+        }
+
+        public void SetMaxEntries(int max)
+        {
+            lock (this) {
+                stats.maxEntries = max;
+                Prune(false);
+            }
+        }
+
+        public void SetTimeout(int seconds)
+        {
+            lock (this) {
+                stats.timeout = seconds;
+            }
+        }
+
+        public void SetPrunePercent(int percent)
+        {
+            lock (this) {
+                stats.prunePercent = percent;
+            }
+        }
+
+        public void Enable()
+        {
+            lock (this) {
+                stats.enabled = true;
+            }
+        }
+
+        public void Disable()
+        {
+            lock (this) {
+                stats.enabled = false;
+            }
+        }
+
+        public void DumpStats(StringBuilder! sb)
+        {
+            lock (this) {
+                sb.AppendFormat("{0} Hit:{1}, Miss:{2}, N:{3}, Max:{4}, T0:{5}, PP:{6}\n",
+                                        stats.statHeader, stats.hits, stats.misses,
+                                        this.Count, stats.maxEntries, stats.timeout,
+                                        stats.prunePercent);
+            }
+        }
+
+        public void DumpCache(StringBuilder! sb)
+        {
+            lock (this) {
+                foreach (DictionaryEntry de in this) {
+                        CacheEntry! e = (CacheEntry!) de.Value;
+                        sb.AppendFormat("Key: {0}, Expiry: {1}, LastAccess: {2}\n",
+                                    e.key, e.value.expiry.ToString("t"), e.lastAccess);
+                }
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/DataReader.sg b/base/Kernel/Singularity.Security/AccessControl/DataReader.sg
new file mode 100644
index 0000000..307d804
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/DataReader.sg
@@ -0,0 +1,40 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+    using System;
+
+    /// <summary>
+    /// Base class for reading bytes from a stream/string.
+    /// </summary>
+    internal abstract class DataReader
+    {
+        // closes the reader
+        public void Close()
+        {
+            Dispose(true);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        // Returns the next available character without actually reading it from
+        // the underlying medium. The returned value is -1 if no further
+        // characters are available.
+        public abstract int Peek();
+
+        // Reads the next character from the underlying medium. The returned value
+        // is -1 if no further characters are available.
+        public abstract int Read();
+
+        // Reads a block of characters. This method will read up to count
+        // characters from the reader into the buffer character
+        // array starting at position index. Returns the actual number of
+        // characters read, or zero if the end of the medium is reached.
+        public abstract int Read(char[] buffer, int index, int count);
+    }
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/StringReader.sg b/base/Kernel/Singularity.Security/AccessControl/StringReader.sg
new file mode 100644
index 0000000..e855515
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/StringReader.sg
@@ -0,0 +1,131 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security.AccessControl
+{
+    using System;
+
+	internal class StringReader : DataReader
+	{
+        private String s;
+        private int pos;
+        private int length;
+    
+        public StringReader(String s) 
+        {
+            if (s == null){
+                throw new ArgumentNullException("s");
+            }
+
+            this.s = s;
+            this.length = s == null? 0: s.Length;
+        }
+    
+        protected override void Dispose(bool disposing) 
+        {
+            base.Dispose(disposing);
+            
+            s = null;
+            pos = 0;
+            length = 0;
+        }
+
+        // Returns the next available character without actually reading it from
+        // the underlying string. The current position of the StringReader is not
+        // changed by this operation. The returned value is -1 if no further
+        // characters are available.
+        public override int Peek() 
+        {
+            if (s == null){
+                throw new Exception("Reader closed");
+            }
+            if (pos == length) return -1;
+            return s[pos];
+        }
+    
+        // Reads the next character from the underlying string. The returned value
+        // is -1 if no further characters are available.
+        public override int Read() 
+        {
+            if (s == null){
+                throw new Exception("Reader closed");
+            }
+            if (pos == length) return -1;
+            return s[pos++];
+        }
+    
+        // Reads a block of characters. This method will read up to count
+        // characters from this StringReader into the buffer character
+        // array starting at position index. Returns the actual number of
+        // characters read, or zero if the end of the string is reached.
+        public override int Read(char[] buffer, int index, int count) 
+        {
+            if (buffer==null)
+                throw new ArgumentNullException("Argument null buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("Argument out of range");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("Argument out of range");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Invalid offset");
+            if (s == null)
+                throw new Exception("Reader closed");
+
+            int n = length - pos;
+            if (n > 0) 
+            {
+                if (n > count) n = count;
+                s.CopyTo(pos, buffer, index, n);
+                pos += n;
+            }
+            return n;
+        }
+    
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.ReadToEnd"]/*' />
+        public String ReadToEnd()
+        {
+            if (s == null){
+                throw new Exception("Reader closed");
+            }
+            String result;
+            if (pos==0)
+                result = s;
+            else
+                result = s.Substring(pos, length - pos);
+            pos = length;
+            return result;
+        }
+
+        // Reads a line. A line is defined as a sequence of characters followed by
+        // a carriage return ('\r'), a line feed ('\n'), or a carriage return
+        // immediately followed by a line feed. The resulting string does not
+        // contain the terminating carriage return and/or line feed. The returned
+        // value is null if the end of the underlying string has been reached.
+        //
+        public String ReadLine() 
+        {
+            if (s == null){
+                throw new Exception("Reader closed");
+            }
+            int i = pos;
+            while (i < length) {
+                char ch = s[i];
+                if (ch == '\r' || ch == '\n') {
+                    String result = s.Substring(pos, i - pos);
+                    pos = i + 1;
+                    if (ch == '\r' && pos < length && s[pos] == '\n') pos++;
+                    return result;
+                }
+                i++;
+            }
+            if (i > pos){
+                String result = s.Substring(pos, i - pos);
+                pos = i;
+                return result;
+            }
+            return null;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Security/AccessControl/acl.lex b/base/Kernel/Singularity.Security/AccessControl/acl.lex
new file mode 100644
index 0000000..efeb598
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessControl/acl.lex
@@ -0,0 +1,49 @@
+using System;
+using Microsoft.Contracts;
+%%
+%line
+%char
+%namespace Microsoft.Singularity.Security.AccessControl
+%class AclParser
+%function NextToken
+%type AclToken
+
+%state GROUPNAME
+
+ANY=!
+ARC=[^./@\{()*+!\|]+|{ANY}
+GN=[^\}]+
+LITERAL=[()|\*/\|@]
+ESCAPE=[\+\.]
+%%
+
+<YYINITIAL> {ARC} {
+  String! str = (!)yytext().Substring(0, yytext().Length);
+  if (str.Equals("!"))
+    {
+      return (new AclToken(AclTokenType.Any, str, yychar, yychar + 1));
+    }
+  else
+    {
+      return (new AclToken(AclTokenType.Arc, str, yychar, yychar + str.Length));
+    }
+}
+
+<YYINITIAL> "{" {yybegin(GROUPNAME); return null;}
+
+<GROUPNAME> {GN} {
+  String! str =  (!)yytext().Substring(0, yytext().Length);
+  return (new AclToken(AclTokenType.GroupName, str, yychar, yychar + str.Length));
+}
+
+<GROUPNAME> "}" {yybegin(YYINITIAL); return null;}
+
+<YYINITIAL> {LITERAL} { return (new AclToken(AclTokenType.Literal, yytext(), yychar, yychar+1)); }
+
+
+<YYINITIAL> {ESCAPE} { return (new AclToken(AclTokenType.Escape, yytext(), yychar, yychar+1)); }
+
+<YYINITIAL> {ANY} { return (new AclToken(AclTokenType.Any, yytext(), yychar, yychar+1)); }
+
+<YYINITIAL> . { return (new AclToken(AclTokenType.Miscellaneous, yytext(), yychar, yychar+1)); }
+<GROUPNAME> . { return (new AclToken(AclTokenType.Miscellaneous, yytext(), yychar, yychar+1)); }
diff --git a/base/Kernel/Singularity.Security/AccessMode.sg b/base/Kernel/Singularity.Security/AccessMode.sg
new file mode 100644
index 0000000..584651e
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AccessMode.sg
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+
+    /// <summary>
+    /// Represents an access mode (permission)
+    /// </summary>
+    public class AccessMode
+    {
+        private static uint next = 0;
+        private static object sync = new object();
+        private string! mode;
+        private uint num;
+
+        public AccessMode(string! mode)
+        {
+            this.mode = mode;
+            lock (sync)
+                this.num = next++;
+        }
+
+        public string! Val { get { return mode; } }
+        public uint Num { get { return num; } }
+
+        public override int GetHashCode()
+        {
+            return mode.GetHashCode();
+        }
+
+        public override bool Equals(object o)
+        {
+            AccessMode other = o as AccessMode;
+            if (other != null){
+                return this.mode.Equals(other.mode);
+            }
+            return false;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Security/Acl.sg b/base/Kernel/Singularity.Security/Acl.sg
new file mode 100644
index 0000000..98761a7
--- /dev/null
+++ b/base/Kernel/Singularity.Security/Acl.sg
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+
+    /// <summary>
+    /// Represents an access control list
+    /// </summary>
+    public struct Acl
+    {
+        public static Acl nullAcl = new Acl();
+
+        public readonly string val;
+        public Acl(string val)
+        {
+            this.val = val;
+        }
+
+        public Acl(byte[] utf8Encoding)
+        {
+            if (utf8Encoding == null)
+                this.val = null;
+            else
+                // fix this
+                this.val = null;
+        }
+
+        public static byte[] ToUTF8(Acl acl)
+        {
+            if (acl.val == null)
+                return null;
+            // fix this
+            return null;
+        }
+
+        public static string ToString(Acl acl)
+        {
+            return acl.val;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Security/AclCore.sg b/base/Kernel/Singularity.Security/AclCore.sg
new file mode 100644
index 0000000..34ef583
--- /dev/null
+++ b/base/Kernel/Singularity.Security/AclCore.sg
@@ -0,0 +1,493 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using System.Collections;
+    using Microsoft.Contracts;
+    using Microsoft.Singularity.Security;
+    using Microsoft.Singularity.Security.AccessControl;
+    using Microsoft.Singularity.Channels;
+
+    /// <summary>
+    /// Access control implementation core.
+    /// </summary>
+
+    public interface IAclCoreSupport
+    {
+        string Expand(string! path);
+    }
+
+    public class AclCore
+    {
+        public enum CacheLevel {All, Regex, Expn, None}
+
+        private Cache! cache;
+        private AclConverter! converter;
+        private Principal self = Principal.Self();
+        private bool securityDisabled = false;
+        private string coreName;
+        private CacheLevel cacheLevel = CacheLevel.All;
+
+        private const int AclCacheMaxEntries = 200;
+        private const int AclCacheExpirySeconds = 15 * 60;
+        private const int AclCachePrunePercent = 20;
+        private const int ExpnCacheMaxEntries = 100;
+        private const int ExpnCacheExpirySeconds = 60 * 60;
+
+        private ulong nfast = 0;
+        private ulong nregex = 0;
+        private ulong nexpn = 0;
+        private ulong nfull = 0;
+        private ulong nfail = 0;
+
+#if DO_TIMING
+        private Statistics fastStats = new Statistics("Acl fast ok:");
+        private Statistics regexStats = new Statistics("Acl rgxp ok:");
+        private Statistics expnStats = new Statistics("Acl expn ok:");
+        private Statistics fullStats = new Statistics("Acl full ok:");
+        private Statistics failureStats = new Statistics("Acl fail:   ");
+#endif
+
+#if !SINGULARITY_PROCESS
+        public static Principal EndpointPeer(Endpoint*! in ExHeap ep)
+        {
+            return PrincipalImpl.MakePrincipal(ep->PeerPrincipalHandle.val);
+        }
+#else
+        public static Principal EndpointPeer(Endpoint*! in ExHeap ep)
+        {
+            return Principal.EndpointPeer(ep);
+        }
+#endif
+
+        [NotDelayed]
+        public AclCore(string _coreName, IAclCoreSupport _support)
+        {
+            this(_coreName, _support,
+                    AclCacheMaxEntries, AclCacheExpirySeconds,
+                    ExpnCacheMaxEntries, ExpnCacheExpirySeconds);
+        }
+
+        [NotDelayed]
+        public AclCore(string _coreName, IAclCoreSupport _support,
+                       int aclCacheMaxEntries, int aclCacheExpirySeconds,
+                       int expnCacheMaxEntries, int expnCacheExpirySeconds)
+        {
+            /*
+             * This implementation consists of two caches, a cache of regular expression object
+             * (indexed by ACL) and a cache of expansion subexpressions (indexed by expr name).
+             * Both caches are objects of type Cache and can be enabled, disabled and flushed
+             * through the methods of the cache object.
+             */
+            this.coreName = _coreName;
+            this.cache = new Cache(aclCacheMaxEntries, aclCacheExpirySeconds,
+                                   AclCachePrunePercent, "Acl cache:       ");
+            this.converter = new AclConverter(_support, expnCacheMaxEntries, expnCacheExpirySeconds);
+
+            base();
+#if !SINGULARITY_PROCESS
+            PrincipalImpl.RegisterAclCore(this);
+#endif
+        }
+
+        public void SetCacheLevel (CacheLevel val) {
+            cacheLevel = val;
+        }
+
+        public bool Disable { set { securityDisabled = value; } }
+
+        public void DumpStats(StringBuilder! sb)
+        {
+            if (coreName != null)
+                sb.AppendFormat("[{0}]\n", coreName);
+#if DO_TIMING
+            fastStats.DumpStats(sb);
+            regexStats.DumpStats(sb);
+            gCacheStats.DumpStats(sb);
+            fullStats.DumpStats(sb);
+            failureStats.DumpStats(sb);
+#endif
+            sb.AppendFormat("Acl checks:  fast:{0}, regex:{1}, expn:{2}, full:{3}, fail:{4}\n",
+                                nfast, nregex, nexpn, nfull, nfail);
+            cache.DumpStats(sb);
+            converter.DumpStats(sb);
+        }
+
+        public void ClearStats()
+        {
+#if DO_TIMING
+            fastStats.Clear();
+            regexStats.Clear();
+            fullStats.Clear();
+            expnStats.Clear();
+            failureStats.Clear();
+#endif
+            nfast = 0;
+            nregex = 0;
+            nexpn = 0;
+            nfull = 0;
+            nfail = 0;
+            cache.ResetStats();
+            converter.ClearStats();
+        }
+
+        public void FlushCache()
+        {
+            cache.Prune(true);
+            converter.FlushCache();
+        }
+
+        public AclConverter! Converter { get { return converter; }}
+
+        // Returns true if id doesn't require an access check, that is the id gets
+        // access to everything. For now the security service and the kernel always
+        // has access later, we might choose to allow the security service to have
+        // access, but not necessarily the kernel.  In this case, we'd have
+        // to allow the security service to deliver upcalls for expansion information
+        // with a non-kernel principalId.
+
+        enum Result {Failure, Full, Expn, Regex, Fast}
+
+        public bool CheckAccess(string acl, AccessMode mode, Principal principal)
+        {
+            if (securityDisabled)
+                return true;
+
+            if (principal.Equal(self))
+                return true;
+
+            return CheckAccessBody(acl, mode, principal);
+        }
+
+        // call here to avoid "securityDisabled" and "self" tests above
+        public bool CheckAccessBody(string acl, AccessMode mode, Principal principal)
+        {
+
+            if (acl == null)
+                return false;
+
+#if DO_TIMING
+            ulong start = Processor.CycleCount;
+#endif
+
+            Result res = Result.Failure;
+            try {
+                // check if we have the acl in the cache
+                string principalStr = null;
+                ulong prinPerm = principal.Val;
+                if (mode != null)
+                    prinPerm = prinPerm + ((ulong)(mode.Num) << 48);
+                CacheEntry ce = (CacheEntry) cache.GetEntry(acl);
+                if (ce != null && !ce.Expired) {
+                    if (ce.Eval(prinPerm) && cacheLevel == CacheLevel.All) {
+                        res = Result.Fast;
+                    } else {
+                        principalStr = PrincipalAndMode((!)principal.GetName(), mode);
+                        if (ce.FullEval(principalStr, prinPerm) && cacheLevel <= CacheLevel.Regex) {
+                            res = Result.Regex;
+                        }
+                    }
+                }
+
+                bool secondPass = (cacheLevel==CacheLevel.None);
+                while (res == Result.Failure) {
+                    // Not in the cache, no regex match, or expired: go and construct it.
+                    // Take one pass using the expansion cache, otherwise (second pass) start from scratch.
+                    // Thus, we cache positive results, but refresh to avoid false negatives.
+                    DateTime minExpiry;
+                    string! expansion = converter.Convert(acl, secondPass, out minExpiry);
+                    if (ce != null && ce.Expansion == expansion) {
+                        // Old expansion was the same, update expiry to save existing cached
+                        // regex evaluations.
+                        ce.ResetExpiry(cache, minExpiry);
+                    }
+
+                    if (principalStr == null)
+                        principalStr = PrincipalAndMode((!)principal.GetName(), mode);
+                    ce = new CacheEntry(cache, expansion, minExpiry);
+                    cache.AddEntry(acl, ce);
+                    if (ce.FullEval(principalStr, prinPerm)) {
+                        if (secondPass)
+                            res = Result.Full;
+                        else
+                            res = Result.Expn;
+                    } else if (secondPass)
+                        break;
+                    else
+                        secondPass = true;
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print("Exception: {0}", __arglist(e.Message));
+                res = Result.Failure;
+            }
+
+
+#if DO_TIMING
+            diff = Processor.CycleCount - start;
+            switch (res) {
+                case Result.Fast:
+                    fastStats.Add(diff);
+                    nfast++;
+                    break;
+                case Result.Regex:
+                    regexStats.Add(diff);
+                    nregex++;
+                    break;
+                case Result.Expn:
+                    expnStats.Add(diff);
+                    nexpn++;
+                    break;
+                case Result.Full:
+                    fullStats.Add(diff);
+                    nfull++;
+                    break;
+                case Result.Failure:
+                    failureStats.Add(diff);
+                    nfail++;
+                    break;
+            }
+#else
+            switch (res) {
+                case Result.Fast:
+                    nfast++;
+                    break;
+                case Result.Regex:
+                    nregex++;
+                    break;
+                case Result.Expn:
+                    nexpn++;
+                    break;
+                case Result.Full:
+                    nfull++;
+                    break;
+                case Result.Failure:
+                    nfail++;
+                    break;
+            }
+#endif
+            return (res != Result.Failure);
+        }
+
+        // This is for testing, so that we can supply principalNames without requiring
+        // they be existing in the kernel service.  This should be very similar to the
+        // CheckAccess method above.  Do not mix the two!!!  Caller should maintain a
+        // 1-to-1 mapping between id's and principal names.
+        public bool CheckAccess(string acl, AccessMode mode, ulong principalId, string! principalName)
+        {
+            if (securityDisabled)
+                return true;
+
+            if (acl == null)
+                return false;
+
+            if (principalId == self.Val)
+                return true;
+
+#if DO_TIMING
+            ulong start = Processor.CycleCount;
+#endif
+            Result res = Result.Failure;
+            try {
+                // check if we have the acl in the cache
+                string principalStr = null;
+                ulong prinPerm = principalId;
+                if (mode != null)
+                    prinPerm = prinPerm + ((ulong)(mode.Num) << 48);
+                CacheEntry ce = (CacheEntry) cache.GetEntry(acl);
+                if (ce != null && !ce.Expired) {
+                    if (ce.Eval(prinPerm) && cacheLevel == CacheLevel.All) {
+                        res = Result.Fast;
+                    } else {
+                        principalStr = PrincipalAndMode(principalName, mode);
+                        if (ce.FullEval(principalStr, prinPerm) && cacheLevel <= CacheLevel.Regex) {
+                            res = Result.Regex;
+                        }
+                    }
+                }
+
+                bool secondPass = (cacheLevel==CacheLevel.None);
+                while (res == Result.Failure) {
+                    // Not in the cache, no regex match, or expired: go and construct it.
+                    // Take one pass using the expansionCache, otherwise (second pass) start from scratch.
+                    // Thus, we cache positive results, but refresh to avoid false negatives.
+                    DateTime minExpiry;
+                    string! expansion = converter.Convert(acl, secondPass, out minExpiry);
+                    if (ce != null && ce.Expansion == expansion) {
+                        // Old expansion was the same, update expiry to save existing cached
+                        // regex evaluations.
+                        ce.ResetExpiry(cache, minExpiry);
+                    }
+                    if (principalStr == null)
+                        principalStr = PrincipalAndMode(principalName, mode);
+                    ce = new CacheEntry(cache, expansion, minExpiry);
+                    cache.AddEntry(acl, ce);
+                    if (ce.FullEval(principalStr, prinPerm)) {
+                        if (secondPass)
+                            res = Result.Full;
+                        else
+                            res = Result.Expn;
+                    } else if (secondPass)
+                        break;
+                    else
+                        secondPass = true;
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print("Exception: {0}", __arglist(e.Message));
+                res = Result.Failure;
+            }
+
+#if DO_TIMING
+            diff = Processor.CycleCount - start;
+            switch (res) {
+                case Result.Fast:
+                    fastStats.Add(diff);
+                    nfast++;
+                    break;
+                case Result.Regex:
+                    regexStats.Add(diff);
+                    nregex++;
+                    break;
+                case Result.Expn:
+                    expnStats.Add(diff);
+                    nexpn++;
+                    break;
+                case Result.Full:
+                    fullStats.Add(diff);
+                    nfull++;
+                    break;
+                case Result.Failure:
+                    failureStats.Add(diff);
+                    nfail++;
+                    break;
+            }
+#else
+            switch (res) {
+                case Result.Fast:
+                    nfast++;
+                    break;
+                case Result.Regex:
+                    nregex++;
+                    break;
+                case Result.Expn:
+                    nexpn++;
+                    break;
+                case Result.Full:
+                    nfull++;
+                    break;
+                case Result.Failure:
+                    nfail++;
+                    break;
+            }
+#endif
+            return (res != Result.Failure);
+        }
+
+        internal class CacheEntry : ICacheValue
+        {
+            private string! expansion;
+            private Regex! regex;
+            private Hashtable! evalCache;
+
+            private const int MaxCachedEvals = 50;
+
+            public CacheEntry (Cache! cache, string! _expansion, DateTime minExpiry)
+            {
+                this.regex = new Regex(_expansion);
+                this.evalCache = new Hashtable();
+                this.expansion = _expansion;
+                base(cache, minExpiry);
+            }
+
+            public string! Expansion { get { return this.expansion; } }
+
+            public bool Eval(ulong prinPerm)
+            {
+                return (evalCache[prinPerm] != null);
+            }
+
+            public bool FullEval(string! principalStr, ulong prinPerm)
+
+            {
+                bool result = regex.IsMatch(principalStr);
+                if (result) {
+                    // note that hash tables are multiple-reader safe
+                    lock (evalCache) {
+                        if (evalCache.Count >= MaxCachedEvals) {
+                            evalCache.Clear();      // just clear the HT if we've reached the limit
+                        }
+                        evalCache[prinPerm] = "";
+                    }
+                }
+                return result;
+            }
+        }
+
+        private string! PrincipalAndMode(string! principalName, AccessMode mode)
+        {
+            if (mode == null)
+                return principalName;
+            StringBuilder sb = new StringBuilder();
+            sb.Append(principalName);
+            sb.Append("@");
+            sb.Append(mode.Val);
+            return sb.ToString();
+        }
+
+#if DO_TIMING
+        internal class Statistics
+        {
+            private ulong min;
+            private ulong max;
+            private ulong sum;
+            private ulong count;
+
+            public Statistics()
+            {
+                Clear();
+            }
+
+            [Delayed]
+            public void Clear()
+            {
+                min = 0;
+                max = 0;
+                sum = 0;
+                count = 0;
+            }
+
+            public void Add(ulong sample)
+            {
+                count++;
+                if (min == 0 || sample < min){
+                    min = sample;
+                }
+                if (sample > max){
+                    max = sample;
+                }
+                sum += sample;
+            }
+
+            public public void DumpStats(StringBuilder! sb)
+            {
+                ulong mean;
+                if (count == 0)
+                    mean = 0;
+                else
+                    mean = sum/(ulong)count;
+                sb.AppendFormat("N:{1}, Min:{2}, Max:{3}, Mean:{4}\n",
+                                     count, min, max, mean);
+            }
+        }
+#endif
+    }
+}
+
+
diff --git a/base/Kernel/Singularity.Security/SDS/SdsAcl.sg b/base/Kernel/Singularity.Security/SDS/SdsAcl.sg
new file mode 100644
index 0000000..e0b5a3e
--- /dev/null
+++ b/base/Kernel/Singularity.Security/SDS/SdsAcl.sg
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SdsAcl.sg
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Security.SDS
+{
+    using System;
+    using Microsoft.Contracts;
+    using Microsoft.Singularity.Security;
+
+    // This module supports path-based ACLs in the Singularity Directory Service.
+    // ACLs are kept in prefix-table adjoining the SDS data structures.
+    // This module contains a non-persistent implementation.  It can be subclassed to
+    // produce a persistent table.
+
+    // An ACL pattern can be null, which matches nothing.
+    // However, a null ACL can appear only at the root of the hierarchy, since
+    // null elsewhere implies that an ACL pattern should be inherited from a parent.
+
+    // An "effective" acl pattern is one that applies at a given path in the hierarchy.
+
+    // ACLs are <node, descendant> pairs associated with paths.
+    // Effective acl patterns are determined as follows:
+    //    if the node pattern is non-null, return it
+    //    if this is the root, return null
+    //    move to the parent in the hierarchy
+    //    if the descendant pattern is non-null, return it
+    //    iterate
+
+    public struct Acl
+    {
+        public static Acl nullAcl = new Acl();
+
+        private readonly string node;
+        private readonly string descendant;
+
+        public string Node { get { return node; } }
+        public string Descendant { get { return descendant; } }
+
+        public Acl(string val)
+        {
+            this.node = val;
+            this.descendant = null;
+        }
+
+        public Acl(string val1, string val2)
+        {
+            this.node = val1;
+            this.descendant = val2;
+        }
+    }
+
+    public interface IEffectiveAclRef {
+        // if GetCached returns false, the IEffectiveAclRef is invalid:
+        // call ISdsAcl::GetEffective to get a new one
+        bool GetCached (out string aclPattern);
+    }
+
+    public interface ISdsAcl
+    {
+        /*
+          All "path" variables here must start with "/", end with other than "/" (except for the
+          root), and contain no repeated "/" characters.
+        */
+
+        // This method gets the effective acl for the argument path node.
+        // Effective ACLs are computed by tracing up to an non-null descendant ACL.
+        // Effective ACLs always have a null inherited component.
+        string GetEffective(string! path, out IEffectiveAclRef aclRef);
+
+        // This method gets the ACL stored for the designated path (e.g. not inherited)
+        Acl Get(string! path);
+
+        // This method sets an ACL for a path and the paths that inherit from it.
+        void Set(string! path, Acl acl);
+
+        // This method clears an ACL associated with a path;
+        void Clear(string! path);
+    }
+}
diff --git a/base/Kernel/Singularity.Security/SDS/SdsAclImpl.sg b/base/Kernel/Singularity.Security/SDS/SdsAclImpl.sg
new file mode 100644
index 0000000..cc0799f
--- /dev/null
+++ b/base/Kernel/Singularity.Security/SDS/SdsAclImpl.sg
@@ -0,0 +1,310 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// Microsoft Research Singularity
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// File: SdsAclPerms.sg Note:
+//
+
+namespace Microsoft.Singularity.Security.SDS
+{
+    using System;
+    using Microsoft.Contracts;
+    using Microsoft.Singularity.Security;
+
+    // This module support path-based ACLs in the Singularity Directory Service.
+    // ACLs are kept in prefix-table adjoining the SDS data structures.
+    // This module contains a non-persistent implementation.  It can be subclassed to
+    // produce a persistent table.
+
+    public class SdsAclImpl : ISdsAcl
+    {
+        /*
+          All "path" variables here must start with "/", end with other than "/" (except for the
+          root), and contain no repeated "/" characters.
+        */
+
+        // We have two subtypes of IEffectiveAclRef:  one for inherited ACLs, and other
+        // for those that represent an exact match with the target.  This here is of the
+        // former variety.
+        public class AclRef : IEffectiveAclRef {
+            private bool valid = true;
+            private HEntry! entry;
+
+            public bool GetCached (out string aclPattern) {
+                aclPattern = (entry.acl.Descendant != null) ? entry.acl.Descendant : entry.acl.Node;
+                return valid;
+            }
+
+            internal AclRef(HEntry! _entry)
+            {
+                entry = _entry;
+            }
+
+            internal void Invalidate() {
+                valid = false;
+            }
+        }
+
+        //This class is returned to clients for exact path matches.
+        internal class HEntry : IEffectiveAclRef
+        {
+            internal bool inTable;
+            internal string! path;
+            internal int pathlen;
+            internal Acl acl;
+            internal AclRef iref;
+            internal HEntry chain;
+
+            public bool GetCached (out string aclPattern) {
+                aclPattern = acl.Node;
+                return inTable;
+            }
+
+            // this constructor for placeholders
+            internal HEntry(string! _path, int _pathlen)
+            {
+                inTable = true;
+                path = _path;
+                pathlen = _pathlen;
+                acl = Acl.nullAcl;
+                iref = null;
+                chain = null;
+            }
+
+            // this constructor for regular entries
+            internal HEntry(string! _path, int _pathlen, Acl _acl)
+            {
+                inTable = true;
+                path = _path;
+                pathlen = _pathlen;
+                acl = _acl;
+                iref = null;
+                chain = null;
+            }
+        }
+
+        private const int DefaultHTSize = 64;
+        private int htSize = DefaultHTSize;
+        private int htEntries = 0;
+        private HEntry[]! ht = new HEntry[DefaultHTSize];
+
+        [NotDelayed]
+        public SdsAclImpl()
+        {
+            // add null default rule
+            HtInsert(new HEntry("/", 1, Acl.nullAcl));
+        }
+
+        // This method gets a ref for fetching the effective access control pattern
+        public string GetEffective(string! path, out IEffectiveAclRef aclRef)
+        {
+            HEntry h = null;
+            aclRef = null;
+            if (path[0] != '/') {
+                DebugStub.Print("SdsAcl: invalid get acl\n");
+                return null;
+            }
+            lock (this) {
+                // first look for exact match
+                h = HtFind(path, path.Length);
+                if (h != null && h.acl.Node != null) {
+                    aclRef = h;
+                    return h.acl.Node;
+                }
+
+                // from here, we're looking for an inheritance
+                int pathlen = 1;
+                h = HtFind(path, 1);
+                //  h should be non-null here because we guarantee a non-null root
+                if (h == null) {
+                    DebugStub.Print("SdsAcl: missing root acl\n");
+                    return null;
+                }
+
+                while (true) {
+                    HEntry hh;
+                    pathlen = path.IndexOf('/', pathlen+1);
+                    if (pathlen < 0)
+                        break;
+
+                    hh = HtFind(path, pathlen);
+                    if (hh != null) {
+                        if (hh.acl.Node != null || hh.acl.Descendant != null) {
+                            h = hh;
+                        }
+                    }
+                }
+
+                // return the Node acl pattern if the Descendant one is null or we have an exact match
+                if (h.iref == null) {
+                    h.iref = new AclRef(h);
+                }
+                aclRef = h.iref;
+                // we assert that any AclRef currently in the table is valid
+                string res;
+                aclRef.GetCached(out res);
+                return res;
+            }
+        }
+
+        // This method gets the ACL stored for the designated path (e.g. not inherited)
+        public Acl Get(string! path)
+        {
+            if (path[0] != '/') {
+                DebugStub.Print("SdsAcl: invalid get acl\n");
+                return Acl.nullAcl;
+            }
+            lock (this) {
+                HEntry h = null;
+                h = HtFind(path, path.Length);
+                if (h == null)
+                    return Acl.nullAcl;
+                return h.acl;
+            }
+        }
+
+        // This method sets an ACL for a path and the paths that inherit from it.
+        public void Set(string! path, Acl acl)
+        {
+            int pathlen = path.Length;
+            if (path[0] != '/') {
+                DebugStub.Print("SdsAcl: invalid set acl");
+                return;
+            }
+            lock (this) {
+                HEntry h = new HEntry(path, pathlen, acl);
+                h = HtInsert(h);
+                while (true) {
+                    if (h != null) {
+                        if (pathlen == 1 || h.acl.Node != null || h.acl.Descendant != null) {
+                            // invalidate the first non-placeholder, or the root if none
+                            Invalidate(h);
+                            break;
+                        }
+                    }
+                    if (pathlen <= 0) {
+                        DebugStub.Print("SdsAcl: missing root acl\n");
+                        break;
+                    }
+                    // there should always be some non-placeholder ancestor
+                    pathlen = path.LastIndexOf('/', pathlen-1);
+                    if (pathlen == 0)
+                        pathlen++;              // special case to find root
+                    h = HtFind(path, pathlen);
+                    if (h == null) {
+                        // previous was null, add a placeholder
+                        HtInsert(new HEntry(path, pathlen));
+                    }
+                }
+            }
+        }
+
+        // This method clears an ACL associated with a path;
+        public void Clear(string! path)
+        {
+            if (path[0] != '/' || path.Length == 1) {
+                DebugStub.Print("SdsAcl: invalid clear acl\n");
+                return;
+            }
+            lock (this) {
+                HEntry h = HtDelete(path, path.Length);
+                if (h != null)
+                    Invalidate(h);
+            }
+        }
+
+        internal void Invalidate(HEntry h)
+        {
+            if (h != null) {
+                if (h.iref != null) {
+                    h.iref.Invalidate();
+                }
+            }
+        }
+
+        internal HEntry HtFind(string! path, int pathlen)
+        {
+            uint hash = Hash(path, pathlen);
+            HEntry h = ht[hash];
+            while (h != null && !Comp(h, path, pathlen))
+                h = h.chain;
+            return h;
+        }
+
+        internal HEntry HtInsert(HEntry! h)
+        {
+            uint hash = Hash(h.path, h.pathlen);
+            HEntry prev = null;
+            HEntry hh = ht[hash];
+            while (hh != null) {
+                if (Comp(hh, h.path, h.pathlen)) {
+                    if (prev != null)
+                        prev.chain = hh.chain;
+                    else
+                        ht[hash] = hh.chain;
+                    hh.chain = null;
+                    htEntries--;
+                    break;
+                }
+                prev = hh;
+                hh = hh.chain;
+            }
+            h.chain = ht[hash];
+            ht[hash] = h;
+            htEntries++;
+            if (hh != null)
+                hh.inTable = false;
+            return hh;
+        }
+
+        internal HEntry HtDelete(string! path, int pathlen)
+        {
+            uint hash = Hash(path, pathlen);
+            HEntry prev = null;
+            HEntry h = ht[hash];
+            while (h != null) {
+                if (Comp(h, path, pathlen)) {
+                    if (prev != null)
+                        prev.chain = h.chain;
+                    else
+                        ht[hash] = h.chain;
+                    h.chain = null;
+                    htEntries--;                    // note that pathlen of "/" is zero
+
+                    h.inTable = false;
+                    return h;
+                }
+                prev = h;
+                h = h.chain;
+            }
+            return null;
+        }
+
+        internal uint Hash(string! path, int pathlen)
+        {
+            uint hash = 5381;
+            int i = 0;
+            while (i != pathlen) {
+                hash = ((hash << 5) + hash) ^ Char.ToLower(path[i++]);
+            }
+            return hash % (uint) htSize;
+        }
+
+        internal static bool Comp(HEntry! h, string! path, int pathlen)
+        {
+            if (pathlen != h.pathlen)
+                return false;
+
+            int i = 0;
+            while (i != pathlen) {
+                if (Char.ToLower(path[i]) != Char.ToLower(h.path[i]))
+                    return false;
+                i++;
+            }
+            return true;
+        }
+    }
+}
+
diff --git a/base/Kernel/Singularity.Security/SDS/SdsAclPerms.sg b/base/Kernel/Singularity.Security/SDS/SdsAclPerms.sg
new file mode 100644
index 0000000..6246c90
--- /dev/null
+++ b/base/Kernel/Singularity.Security/SDS/SdsAclPerms.sg
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SdsAclPerms.sg
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Security.SDS
+{
+    using Microsoft.Singularity.Security;
+
+    // These are access modes used by all SDS implementations.
+    public class SdsAclPerms
+    {
+        public static readonly AccessMode! ModeTraverse;        // can pass through
+        public static readonly AccessMode! ModeRead;            // can read/enumerate
+        public static readonly AccessMode! ModeWrite;           // can create/write an object
+        public static readonly AccessMode! ModeSetAcl;          // can modify access control
+        public static readonly AccessMode! ModeRegister;        // can register/deregister
+        public static readonly AccessMode! ModeNotify;          // can receive notifications
+
+        static SdsAclPerms() {
+            ModeTraverse = new AccessMode("traverse");
+            ModeRead = new AccessMode("read");
+            ModeWrite = new AccessMode("write");
+            ModeSetAcl = new AccessMode("setacl");
+            ModeRegister = new AccessMode("register");
+            ModeNotify = new AccessMode("notify");
+        }
+    }
+}
+
+
diff --git a/base/Kernel/Singularity.Security/Security.csproj b/base/Kernel/Singularity.Security/Security.csproj
new file mode 100644
index 0000000..5445f7a
--- /dev/null
+++ b/base/Kernel/Singularity.Security/Security.csproj
@@ -0,0 +1,46 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+<!--
+##############################################################################
+# We need to compile the security code in two phases, due to the circular    #
+# dependency between the security service and the name service.              #
+##############################################################################
+-->
+  
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Security</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="AccessMode.sg" />
+    <Compile Include="AclCore.sg" />
+    <Compile Include="AccessControl\Cache.sg" />
+    <Compile Include="AccessControl\AclConverter.sg" />
+    <Compile Include="AccessControl\AclParser.sg" />
+    <Compile Include="AccessControl\AclToken.sg" />
+    <Compile Include="AccessControl\AclTokenType.sg" />
+    <Compile Include="AccessControl\DataReader.sg" />
+    <Compile Include="AccessControl\StringReader.sg" />
+    <Compile Include="SDS\SdsAcl.sg"/>
+    <Compile Include="SDS\SdsAclImpl.sg"/>
+    <Compile Include="SDS\SdsAclPerms.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Security\Security.csproj" />
+    <ProjectReference Include="..\SpecSharp.Contracts\Kernel.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Security/Service/Principal.sg b/base/Kernel/Singularity.Security/Service/Principal.sg
new file mode 100644
index 0000000..0989a7b
--- /dev/null
+++ b/base/Kernel/Singularity.Security/Service/Principal.sg
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using System.Collections;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.V1.Security;
+
+    /// <summary>
+    /// A Principal struct is representation of a principal.
+    /// The security service evaluates ACLs and
+    ///     retrieve names associated with principals.  See the
+    ///     security library.
+    /// </summary>
+
+    /// This is the kernel version of Principal.sg.
+
+    public struct Principal
+    {
+        private readonly ulong val;
+
+        public bool Equal(Principal id) { return (this.Val == id.Val); }
+
+        public static Principal Self()
+        {
+            return PrincipalImpl.Self();
+        }
+
+        public ulong Val { get { return this.val; } }
+
+        public string! GetName()
+        {
+            return PrincipalImpl.GetPrincipalName(this);
+        }
+
+        public static Principal EndpointPeer(Endpoint*! in ExHeap ep)
+        {
+            return new Principal(ep->PeerPrincipalHandle.val);
+        }
+
+        public static string ExpandAclIndirection(string! name)
+        {
+            return PrincipalImpl.ExpandAclIndirection(name);
+        }
+
+        internal Principal(ulong val)
+        {
+            this.val = val;
+        }
+        
+        public ArrayList GetHashes()
+        {
+            return PrincipalImpl.GetPrincipalHashes(this);
+        }
+    }
+}
+
+
diff --git a/base/Kernel/Singularity.Security/Service/PrincipalImpl.sg b/base/Kernel/Singularity.Security/Service/PrincipalImpl.sg
new file mode 100644
index 0000000..e9ed7b1
--- /dev/null
+++ b/base/Kernel/Singularity.Security/Service/PrincipalImpl.sg
@@ -0,0 +1,334 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using System.Threading;
+    using System.Collections;
+    using System.Text;
+
+    using Microsoft.Singularity.Loader;
+    using Microsoft.Singularity.Xml;
+
+    using Microsoft.Singularity.Io;
+
+    public class PrincipalImpl
+    {
+        private const string KernelName = "kernel.localhost";
+        private const string UnknownName = "unknown";
+        private const string UnknownPublisher = "unknown";
+        private const string DefaultNameContext = "localhost";
+        private const string TruncateHistoryPrivilege = "$truncate-history-privilege.localhost";
+
+        // security tags in config XML
+        const string AuthPolicyXmlTag = "authpolicy";
+        const string SubexprXmlTag = "subexpr";
+        const string SubexprNameXmlAttribute = "name";
+        const string SubexprExpansionXmlAttribute = "expansion";
+        const string AuthorityXmlTag = "authority";
+        const string AuthorityNameXmlAttribute = "name";
+        const string AuthorityAclXmlAttribute = "acl";
+
+        private static Hashtable! principalHT;  // map from principal Val (ulong) to PrincipalT
+        private static Hashtable! exprHT;       // map from subexpr name to description (both strings)
+        private static Hashtable! privHT;       // map from privilege name to ArrayList of PrincipalT
+        private static Hashtable! authorityHT;  // map from authority name to acl expansion (both strings)
+        private static Hashtable! publisherHT;  // map from publisher name to PrincipalT
+
+        private const char CharInvocation = '+';
+        private const char CharRole = '@';
+        private const string NullName = "";
+
+        private const ulong KernelIdNum = 1;
+        private static ulong nextIdVal = KernelIdNum + (ulong)1;
+        private static SecurityDiagnostics! secDiag;
+        private static AclCore! aclCore;
+
+
+        internal class PrincipalT {
+            internal string! name;
+            internal string  manifestName;
+            internal string[] privs;
+            internal ulong val;
+            internal PrincipalT publisherT;
+            internal ArrayList principalHashes;
+
+            internal PrincipalT(string! _name, string _maniName, string[] _privs, PrincipalT _publisherT)
+            {
+                name = _name;
+                manifestName = _maniName;
+                privs = _privs;
+                val = 0L;
+                publisherT = _publisherT;
+                principalHashes = null;
+            }
+
+            internal PrincipalT(string! _name, string _maniName, string[] _privs, PrincipalT _publisherT, ArrayList _principalHashes)
+            {
+                name = _name;
+                manifestName = _maniName;
+                privs = _privs;
+                val = 0L;
+                publisherT = _publisherT;
+                principalHashes = _principalHashes;
+            }
+        }
+
+        public static void Initialize(XmlNode! config)
+        {
+            // kernel publisher T is currently "unknown".  fix this (maybe)
+            // one way to fix it is to have kernel manifest here, but that
+            // isn't currently possible.
+            principalHT = new Hashtable();
+            exprHT = new Hashtable();
+            privHT = new Hashtable();
+            authorityHT = new Hashtable();
+            publisherHT = new Hashtable();
+            secDiag = new SecurityDiagnostics();
+            aclCore = new AclCore("PrincipalImpl", null);
+            InstallPolicy(config);
+            principalHT.Add(KernelIdNum,
+                            new PrincipalT(KernelName, null, null, GetPublisherT(UnknownPublisher)));
+        }
+
+
+        public static Principal Self()
+        {
+            return new Principal(KernelIdNum);
+        }
+
+        public static Principal MakePrincipal(ulong id)
+        {
+            return new Principal(id);
+        }
+
+        public static string! GetPrincipalName(Principal pr)
+        {
+            PrincipalT pT = (PrincipalT) principalHT[pr.Val];
+            if (pT == null)
+                return NullName;
+            return pT.name;
+        }
+
+        public static ArrayList GetPrincipalHashes(Principal pr)
+        {
+            PrincipalT pT = (PrincipalT) principalHT[pr.Val];
+            if (pT == null)
+                return new ArrayList();
+            return pT.principalHashes;
+        }
+
+        public static Principal NewInvocation(Principal parent, Manifest! manifest, string role, IoMemory rawImage)
+        {
+            string manifestName = manifest.Name;
+            string publisher = manifest.Publisher;
+            string name, newname;
+            bool eraseHistory = false;
+            string[] appPrivs = manifest.Privileges;
+            ArrayList arrarr = null;
+            byte[] imageHash = null;
+            ArrayList newprincipalHashes = null;
+
+            if (manifestName == null)
+                manifestName = UnknownName;
+
+            if (publisher == null)
+                publisher = UnknownPublisher;
+
+            PrincipalT publisherT = GetPublisherT(publisher);
+
+            manifestName = String.Format("{0}.{1}", manifestName, publisher);
+            name = manifestName;
+
+            // Here we look for authority to grant privilege to the new app
+            // Currently, we don't revisit this decision, although in future we might
+            if (appPrivs != null) {
+                for (int i=0; i< appPrivs.Length; i++) {
+                    string s = (!)appPrivs[i];
+                    string acl = (string) authorityHT[s];
+                    // Would call the normal CheckAccess entry point here, but it can't equate
+                    // the Principal type in this context, and that in the library.  Grumble!
+                    if (acl != null && aclCore.CheckAccess(acl, null,
+                                                              publisherT.val, publisherT.name)) {
+                        ArrayList arr = (ArrayList) privHT[s];
+                        if (arr == null) {
+                            lock (privHT) {
+                                arr = new ArrayList();
+                                privHT[s] = arr;
+                            }
+                        }
+                        // make an array of ArrayLists which we'll add a principal handle to below
+                        if (arrarr == null)
+                            arrarr = new ArrayList();
+                        arrarr.Add(arr);
+                        if (s == TruncateHistoryPrivilege) {
+                            eraseHistory = true;
+                        }
+                    }
+                }
+            }
+
+            if (eraseHistory || (parent.Val == KernelIdNum)) {
+                // ignore role if eraseHistory or kernel parent
+                newname = name;
+                if (imageHash != null) {
+                    newprincipalHashes = new ArrayList();
+                    newprincipalHashes.Add(imageHash);
+                }
+            } else {
+                string parentName = parent.GetName();
+                if (parentName == NullName)
+                    throw new Exception("NewInvocation with null parent");
+                int newlength = parentName.Length + name.Length + 2;
+                if (role != null)
+                    newlength += (role.Length + 1);
+                StringBuilder sb = new StringBuilder(parentName, newlength);
+                if (role != null) {
+                    sb.Append(CharRole);
+                    sb.Append(role);
+                }
+                sb.Append(CharInvocation);
+                sb.Append(name);
+                newname = sb.ToString();
+
+                if (imageHash != null) {
+                    ArrayList parentHashes = parent.GetHashes();
+                    newprincipalHashes = new ArrayList(parentHashes);
+                    newprincipalHashes.Add(imageHash);
+                }
+            }
+
+            PrincipalT pT = new PrincipalT(newname, manifestName, appPrivs, publisherT, newprincipalHashes);
+            if (arrarr != null) {
+                foreach (Object! obj in arrarr) {
+                    ArrayList arr = (ArrayList) obj;
+                    lock (arr) {
+                        arr.Add(pT);
+                    }
+                }
+            }
+
+            lock (principalHT)
+            {
+                pT.val = nextIdVal++;
+                principalHT.Add(pT.val, pT);
+            }
+            return new Principal(pT.val);
+        }
+
+        public static void Dispose(Principal pr)
+        {
+            PrincipalT pT = null;
+            lock (principalHT)
+            {
+                pT = (PrincipalT) principalHT[pr.Val];
+                if (pT == null)
+                    return;
+                principalHT.Remove(pr.Val);
+            }
+            if (pT.privs != null) {
+                for (int i=0; i<pT.privs.Length; i++) {
+                    ArrayList arr = (ArrayList) privHT[(!)pT.privs[i]];
+                    if (arr != null) {
+                        lock (arr) {
+                            arr.Remove(pT);
+                        }
+                    }
+                }
+            }
+        }
+
+        public static string ExpandAclIndirection(string! name)
+        {
+            if (name.Length == 0)
+                return null;
+
+            if (name.IndexOf('.') == -1)
+                name = String.Format("{0}.{1}", name, DefaultNameContext);
+
+            string res = (string) exprHT[name];
+            if (res != null)
+                return res;
+
+            ArrayList arr = (ArrayList) privHT[name];
+            if (arr == null)
+                return null;
+
+            StringBuilder sb = new StringBuilder();
+            lock (arr) {
+                sb.Append("(");
+                for (int i=0; i<arr.Count; i++) {
+                    PrincipalT pT = (PrincipalT!) arr[i];
+                    if (pT == null || pT.manifestName == null)
+                        continue;
+                    if (i != 0)
+                        sb.Append('|');
+                    sb.Append(pT.manifestName);
+                }
+                sb.Append(")");
+            }
+            return sb.ToString();
+        }
+
+        public static void RegisterAclCore(Object core)
+        {
+            secDiag.RegisterAclCore((AclCore!)core);
+        }
+
+        public static void Export()
+        {
+            secDiag.Start();
+        }
+
+        private static void InstallPolicy(XmlNode! config)
+        {
+            // get all group definitions to register from the xml
+            XmlNode policyConfig = config.GetChild(AuthPolicyXmlTag);
+
+            if (policyConfig == null) {
+                return;
+            }
+
+            bool isAuthority = false;
+            foreach (XmlNode! elem in policyConfig.Children) {
+                string name;
+                string target;
+                if (elem.Name == AuthorityXmlTag) {
+                    name = (!)elem.GetAttribute(AuthorityNameXmlAttribute, "");
+                    target = (!)elem.GetAttribute(AuthorityAclXmlAttribute, "");
+                    isAuthority = true;
+                } else if (elem.Name == SubexprXmlTag) {
+                    name = (!)elem.GetAttribute(SubexprNameXmlAttribute, "");
+                    target = (!)elem.GetAttribute(SubexprExpansionXmlAttribute, "");
+                } else
+                    continue;
+                if (name.Length != 0 && target.Length != 0) {
+                    if (name.IndexOf('.') == -1)
+                        name = String.Format("{0}.{1}", name, DefaultNameContext);
+                    if (isAuthority)
+                        authorityHT[name] = target;
+                    else
+                        exprHT[name] = target;
+                }
+            }
+        }
+
+        private static PrincipalT! GetPublisherT(string! publisher)
+        {
+            PrincipalT publisherT = (PrincipalT) publisherHT[publisher];
+            if (publisherT == null) {
+                publisherT = new PrincipalT(publisher, null, null, null);
+                lock (principalHT) {
+                    publisherT.val = nextIdVal++;
+                    principalHT.Add(publisherT.val, publisherT);
+                }
+            }
+            return publisherT;
+        }
+    }
+}
+
+
diff --git a/base/Kernel/Singularity.Security/Service/SecurityDiagnostics.sg b/base/Kernel/Singularity.Security/Service/SecurityDiagnostics.sg
new file mode 100644
index 0000000..bb60058
--- /dev/null
+++ b/base/Kernel/Singularity.Security/Service/SecurityDiagnostics.sg
@@ -0,0 +1,225 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using System.Collections;
+    using System.Text;
+    using System.Threading;
+
+    using Microsoft.Contracts;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+    using Microsoft.Singularity.Security;
+
+    /// <summary>
+    /// The implementation of the <code>SecurityService</code> state machine.
+    /// </summary>
+    public class SecurityDiagnostics
+    {
+        /// <summary>
+        /// The exporting endpoint of the security service.
+        /// </summary>
+        private TRef<ServiceProviderContract.Exp:Start> channel;
+        private bool run = true;
+
+        private ArrayList! coreList;
+
+        public SecurityDiagnostics()
+        {
+            coreList = new ArrayList();
+        }
+
+        /// <summary>
+        /// Starts the service and registers it in the namespace
+        /// </summary>
+        public void Start()
+        {
+            DebugStub.WriteLine("Starting the Security Diagnostics provider");
+
+            // register the service with the namespace
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(SecurityDiagnosticsContract.ModuleName), nsImp);
+
+                switch receive {
+                case epNS.AckRegister() :
+                    // All is well.
+                    break;
+                case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, ErrorCode error) :
+                    // All is very much not well; abort.
+                    DebugStub.WriteLine("Failed to register the Security Service under: {0}",
+                                        __arglist(SecurityDiagnosticsContract.ModuleName));
+                    delete nsExp;
+                    delete rejectedEP;
+                    throw new Exception("Failed to register the Security Diagnostics provider");
+                case epNS.ChannelClosed():
+                    delete nsExp;
+                    DebugStub.WriteLine(
+                               "Failed to register the Security Diagnostics provider under: {0}",
+                               __arglist(SecurityDiagnosticsContract.ModuleName));
+                    throw new Exception("Failed to register the Security Diagnostics provider");
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            channel = new TRef<ServiceProviderContract.Exp:Start>(nsExp);
+
+            Thread thread = Thread.CreateThread(((!)Thread.CurrentThread).Process,
+                                                new ThreadStart(StateMachine));
+
+            if (thread != null)
+            {
+                thread.Start();
+            }
+            else
+            {
+                throw new Exception("Could not create worker thread");
+            }
+        }
+
+        public void RegisterAclCore(AclCore core)
+        {
+            //*** need locking here, but it doesn't work for now
+            //we're called at the wrong point in the init sequence
+            coreList.Add(core);
+        }
+
+        /// <summary>
+        /// State machine for the security namespace
+        /// </summary>
+        private void StateMachine()
+            requires this.channel != null;
+        {
+            // get the endpoint and start listening
+            ServiceProviderContract.Exp! exp = channel.Acquire();
+            // the clients
+            ESet<SecurityDiagnosticsContract.Exp, SecurityDiagnosticsContract.ReadyState> clients =
+               new ESet<SecurityDiagnosticsContract.Exp, SecurityDiagnosticsContract.ReadyState>();
+
+            while(run)
+            {
+                switch receive
+                {
+                    case exp.Connect(ServiceContract.Exp:Start! epClient):
+                    {
+                        // incoming bind request: always grant, anyone should be able to talk to us
+                        SecurityDiagnosticsContract.Exp client =
+                                       epClient as SecurityDiagnosticsContract.Exp;
+                        if (client == null){
+                            exp.SendNackConnect(epClient);
+                        }
+                        else
+                        {
+                            exp.SendAckConnect();
+                            client.SendReady();
+                            clients.Add(client);
+                        }
+                    }
+
+                    break;
+
+                    case client.GetStatistics() in clients:
+                    {
+                        StringBuilder sb = new StringBuilder();
+                        DumpAllStats(sb);
+                        client.SendGetStatisticsAck(Bitter.FromString2(sb.ToString()));
+                        clients.Add(client);
+                    }
+                    break;
+
+                    case client.ClearStatistics() in clients:
+                    {
+                        ClearAllStats();
+                        client.SendAck();
+                        clients.Add(client);
+                    }
+                    break;
+
+                    case client.Disable(bool yes) in clients:
+                    {
+                        DisableAll(yes);
+                        client.SendAck();
+                        clients.Add(client);
+                    }
+                    break;
+
+                    case client.FlushCaches() in clients:
+                    {
+                        FlushAllCaches();
+                        client.SendAck();
+                        clients.Add(client);
+                    }
+                    break;
+
+                    case client.ChannelClosed() in clients:
+                    {
+                        delete client;
+                    }
+                    break;
+
+                    case exp.ChannelClosed():
+                    {
+                        run = false;
+                    }
+                    break;
+                }
+            }
+
+            delete exp;
+            clients.Dispose();
+        }
+
+        private void DisableAll(bool value) {
+            lock (coreList) {
+                for (int i = 0; (i<coreList.Count); i++) {
+                    AclCore core = (AclCore!) coreList[i];
+                    core.Disable = value;
+                }
+            }
+        }
+
+        private void DumpAllStats(StringBuilder! sb)
+        {
+            lock (coreList) {
+                for (int i = 0; (i<coreList.Count); i++) {
+                    AclCore core = (AclCore!) coreList[i];
+                    core.DumpStats(sb);
+                }
+            }
+        }
+
+        private void ClearAllStats()
+        {
+            lock (coreList) {
+                for (int i = 0; (i<coreList.Count); i++) {
+                    AclCore core = (AclCore!) coreList[i];
+                    core.ClearStats();
+                }
+            }
+        }
+
+        private void FlushAllCaches()
+        {
+            lock (coreList) {
+                for (int i = 0; (i<coreList.Count); i++) {
+                    AclCore core = (AclCore!) coreList[i];
+                    core.FlushCache();
+                }
+            }
+        }
+    }
+}
+
diff --git a/base/Kernel/Singularity.Security/Service/SecurityService.csproj b/base/Kernel/Singularity.Security/Service/SecurityService.csproj
new file mode 100644
index 0000000..8da80be
--- /dev/null
+++ b/base/Kernel/Singularity.Security/Service/SecurityService.csproj
@@ -0,0 +1,42 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+<!--
+##############################################################################
+# We need to compile the security code in two phases, due to the circular    #
+# dependency between the security service and the name service.              #
+##############################################################################
+-->
+  
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>SecurityService</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Principal.sg" />
+    <Compile Include="PrincipalImpl.sg" />
+    <Compile Include="SecurityDiagnostics.sg" />    
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..\..\Singularity.Io\IoSystem.csproj" />
+    <ProjectReference Include="..\..\Singularity.Loader\Loader.csproj" />
+    <ProjectReference Include="..\..\Singularity.Security\Security.csproj" />
+    <ProjectReference Include="..\..\Singularity.Directory\Directory.csproj" />
+    <ProjectReference Include="..\..\SpecSharp.Contracts\Kernel.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/Kernel/Singularity.Stress/GcStress.cs b/base/Kernel/Singularity.Stress/GcStress.cs
new file mode 100644
index 0000000..ea49e82
--- /dev/null
+++ b/base/Kernel/Singularity.Stress/GcStress.cs
@@ -0,0 +1,114 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   GcStress.cs
+//
+//  Note:   Simple Singularity test program.
+//  Warning: this file is compiled in two separate places:
+//    - Applications/Tests/GcStress
+//    - Kernel/Singularity.Stress
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Stress
+{
+    public abstract class GcStress
+    {
+        private void GcStressVariableSizeObjects()
+        {
+            const uint maxItemBytes = 65535;
+            const uint maxAllocatedBytes = 1000000;
+            byte dummy = 0;
+
+            Print("Running variable size object test.");
+
+            DateTime start     = DateTime.Now;
+            TimeSpan duration  = TimeSpan.FromSeconds(10);
+            TimeSpan oneSecond = TimeSpan.FromSeconds(1);
+
+            Queue q = new Queue();
+            while (DateTime.Now - start < duration)
+            {
+                DateTime roundStart = DateTime.Now;
+                uint iterations = 0;
+                while (DateTime.Now - roundStart < oneSecond)
+                {
+                    uint allocatedBytes = 0;
+                    uint i = 17u * iterations;
+                    while (allocatedBytes < maxAllocatedBytes)
+                    {
+                        uint itemBytes = 1u + (uint)((433777u * i) % maxItemBytes);
+                        allocatedBytes += itemBytes;
+                        i++;
+                        byte [] data = new byte[itemBytes];
+                        data[0] = 0xff;
+                        q.Enqueue(data);
+                    }
+
+                    while (q.Count != 0)
+                    {
+                        byte []! data = (!)(byte []) q.Dequeue();
+                        dummy ^= data[0];
+                    }
+                    iterations ++;
+                }
+                Print(String.Format(" {0}", iterations, dummy));
+            }
+            Print("\n");
+        }
+
+        private void GcStressFixedSizeObjects()
+        {
+            const int itemCount = 1024;
+            const int itemBytes = 1024;
+
+            Print("Running fixed size object test.");
+
+            byte dummy = 0;
+
+            DateTime start     = DateTime.Now;
+            TimeSpan duration  = TimeSpan.FromSeconds(10);
+            TimeSpan oneSecond = TimeSpan.FromSeconds(1);
+
+            Queue q = new Queue();
+            while (DateTime.Now - start < duration)
+            {
+                DateTime roundStart = DateTime.Now;
+                int iterations = 0;
+                while (DateTime.Now - roundStart < oneSecond)
+                {
+                    for (int i = 0; i < itemCount; i++)
+                    {
+                        byte [] data = new byte[itemBytes];
+                        // Debug.Assert(data[0] == 0);
+                        data[0] = 0xff;
+                        q.Enqueue(data);
+                    }
+
+                    for (int i = 0; i < itemCount; i++)
+                    {
+                        byte []! data = (!)(byte []) q.Dequeue();
+                        // Debug.Assert(data[0] == 0xff);
+                        dummy ^= data[0];
+                    }
+                    iterations ++;
+                }
+                Print(String.Format(" {0}", iterations, dummy));
+            }
+            Print("\n");
+        }
+
+        protected abstract void Print(string! s);
+
+        //[ShellCommand("gcstress", "Stress garbage collector")]
+        public void Run()
+        {
+            GcStressFixedSizeObjects();
+            GcStressVariableSizeObjects();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Stress/KPTestBase.sg b/base/Kernel/Singularity.Stress/KPTestBase.sg
new file mode 100644
index 0000000..221f35a
--- /dev/null
+++ b/base/Kernel/Singularity.Stress/KPTestBase.sg
@@ -0,0 +1,173 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   KPTestBase.sg
+//
+//  Note:   Tests the kernel-process boundary.
+//
+//  Warning: this file is compiled in two separate places:
+//    - Applications/Tests/KPTest
+//    - Kernel/Singularity.Stress
+//
+//  Feel free to add more commands to this file.
+
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Stress
+{
+    public class KPTestBase
+    {
+        public virtual uint Go(string[]! args, int i)
+        {
+            if (i >= args.Length) return 0xdeafbead;
+            string! arg = (!) (args[i]);
+            if (arg == "print")
+            {
+                DebugStub.WriteLine("{0}", __arglist(args[i + 1]));
+                return Go(args, i + 2);
+            }
+            else if (arg == "print-")
+            {
+                uint r = Go(args, i + 2);
+                DebugStub.WriteLine("{0} (print-after) {1:x}", __arglist(args[i + 1], r));
+                return r;
+            }
+            else if (arg == "print^")
+            {
+                DebugStub.WriteLine(args[i + 1] + " (print-before)");
+                uint r = Go(args, i + 2);
+                DebugStub.WriteLine("{0} (print-after) {1:x}", __arglist(args[i + 1], r));
+                return r;
+            }
+            else if (arg == "catch" || arg == "_catch")
+            {
+                try
+                {
+                    return Go(args, i + 2);
+                }
+                catch(Exception)
+                {
+                    if (arg == "catch")
+                    {
+                        DebugStub.WriteLine("{0} (catch)", __arglist(args[i + 1]));
+                    }
+                }
+                return 0xdeadbeef;
+            }
+            else if (arg == "finally" || arg == "_finally")
+            {
+                try
+                {
+                    return Go(args, i + 2);
+                }
+                finally
+                {
+                    if (arg == "finally")
+                    {
+                        DebugStub.WriteLine(" (finally)", __arglist(args[i + 1]));
+                    }
+                }
+            }
+            else if (arg == "throw")
+            {
+                throw new ArgumentException("ArgumentException");
+            }
+            else if (arg == "break" || arg == "_break")
+            {
+                if (arg == "break")
+                {
+                    DebugStub.WriteLine("break-before");
+                }
+                DebugService.Break();
+                uint r = Go(args, i + 1);
+                if (arg == "break")
+                {
+                    DebugStub.WriteLine("break-after");
+                }
+                DebugService.Break();
+                return r;
+            }
+            else if (arg == "frames")
+            {
+                return RecN(Int32.Parse(args[i + 1]), args, i + 2);
+            }
+            else if (arg == "delay")
+            {
+                int n = Int32.Parse(args[i + 1]);
+                uint dummy = 100;
+                for (int k = 0; k < n; k++)
+                {
+                    for (int j = 0; j < 10000000; j++)
+                    {
+                        dummy = dummy % 100;
+                    }
+                }
+                return (dummy % 100) + Go(args, i + 2);
+            }
+            else if (arg == "sleep")
+            {
+                int n = Int32.Parse(args[i + 1]);
+                Thread.Sleep(n);
+                return Go(args, i + 2);
+            }
+            else if (arg == "yield")
+            {
+                Thread.Yield();
+                return Go(args, i + 1);
+            }
+            else if (arg == "wall" || arg == "_wall")
+            {
+                if (arg == "wall")
+                {
+                    DebugStub.WriteLine("wall");
+                }
+                new AutoResetEvent(false).WaitOne();
+                return 0;
+            }
+            else if (arg == "(*")
+            {
+                int n = Int32.Parse(args[i + 1]);
+                int rParen = FindClosingRParen(args, i + 2);
+                string[] before = new string[rParen - (i + 2)];
+                Array.Copy(args, i + 2, before, 0, before.Length);
+                string[] after = new string[args.Length - (rParen + 1)];
+                Array.Copy(args, rParen + 1, after, 0, after.Length);
+                for (int j = 0; j < n; j++)
+                {
+                    Go(before, 0);
+                }
+                return Go(after, 0);
+            }
+            else
+            {
+                DebugStub.WriteLine("unknown command: {0}", __arglist(arg));
+                return 0;
+            }
+        }
+
+        public virtual uint RecN(int n, String[]! args, int i)
+        {
+            if (n == 0) return Go(args, i);
+            else return RecN(n - 1, args, i);
+        }
+
+        public int FindClosingRParen(string[]! args, int i)
+        {
+            int count = 1;
+            for (; i < args.Length; i++)
+            {
+                if (((!) (args[i]))[0] == '(') count++;
+                else if (args[i] == ")") count--;
+                if (count == 0) return i;
+            }
+            return i;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Stress/Stress.csproj b/base/Kernel/Singularity.Stress/Stress.csproj
new file mode 100644
index 0000000..c59f7e7
--- /dev/null
+++ b/base/Kernel/Singularity.Stress/Stress.csproj
@@ -0,0 +1,38 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Stress</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoStandardLibraries>true</NoStandardLibraries>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="StressService.sg" />
+    <Compile Include="StressDirect.sg" />
+    <Compile Include="GcStress.cs" />
+    <Compile Include="KPTestBase.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Stress.Contracts\Stress.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..\SpecSharp.Contracts\Kernel.Contracts.csproj" />
+    <ProjectReference Include="..\Singularity.Directory\Directory.csproj" />
+    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+  
+</Project>
diff --git a/base/Kernel/Singularity.Stress/StressDirect.sg b/base/Kernel/Singularity.Stress/StressDirect.sg
new file mode 100644
index 0000000..9e51e2c
--- /dev/null
+++ b/base/Kernel/Singularity.Stress/StressDirect.sg
@@ -0,0 +1,99 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressDirect.sg
+//  Note:   Kernel diagnostics (testing and debugging)
+//
+//  (non-shipping extensions to kernel ABI, for testing and debugging)
+
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Stress.Contracts;
+using Microsoft.Singularity.Directory;
+using System.Runtime.CompilerServices;
+using System;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.Stress
+{
+    public class StressDirect
+    {
+        private static string[]! GetArgs(ArgList* in ExHeap exArgs, int count)
+        {
+            if(exArgs == null)
+            {
+                return new string[count];
+            }
+            else
+            {
+                expose(exArgs)
+                {
+                    char[] in ExHeap exArg = exArgs->arg;
+                    ArgList* in ExHeap next = exArgs->next;
+                    string[]! args = GetArgs(next, count + 1);
+                    args[count] = Bitter.ToString(exArg);
+                    return args;
+                }
+            }
+        }
+
+        public static unsafe uint KPTest(SharedHeap.Allocation* sharedArgs, int i)
+        {
+            ArgList* in ExHeap exArgs = (ArgList* in ExHeap) sharedArgs;
+            string[]! args = GetArgs(exArgs, 0);
+            if(exArgs != null) delete exArgs;
+            return new KPTestKernel().Go(args, i);
+/*
+            if(exArgs != null) delete exArgs;
+            return 0;
+
+            char[][]! in ExHeap exArgs = (char[][]! in ExHeap) sharedArgs;
+            string[]! args = new string[exArgs.Length];
+            for (int j = 0; j < args.Length; j++)
+            {
+//                SharedHeapService.Allocation* sharedArg = (SharedHeapService.Allocation*) (exArgs[j]);
+                char[]! in ExHeap exArg = (char[]! in ExHeap) (exArgs[j]);
+                args[j] = Bitter.ToString(exArg);
+                delete exArg;
+            }
+            delete exArgs;
+            return new KPTestKernel().Go(args, i);
+
+            SharedHeapService.Allocation*[]! in ExHeap exArgs = (SharedHeapService.Allocation*[]! in ExHeap) sharedArgs;
+            string[]! args = new string[exArgs.Length];
+            for (int j = 0; j < args.Length; j++)
+            {
+                SharedHeapService.Allocation* sharedArg = (SharedHeapService.Allocation*) (exArgs[j]);
+                char[]! in ExHeap exArg = (char[]! in ExHeap) (sharedArg);
+                args[j] = Bitter.ToString(exArg);
+//                delete exArg;
+            }
+            delete exArgs;
+            return new KPTestKernel().Go(args, i);
+*/
+        }
+    }
+
+    class KPTestKernel : KPTestBase
+    {
+        public override uint Go(string[]! args, int i)
+        {
+            if (i >= ((!) args).Length) return 0x87654321;
+            string arg = args[i];
+            if (arg == "throwstop")
+            {
+                throw new ProcessStopException("ProcessStopException");
+            }
+            else
+            {
+                return base.Go(args, i);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.Stress/StressService.sg b/base/Kernel/Singularity.Stress/StressService.sg
new file mode 100644
index 0000000..f25aa22
--- /dev/null
+++ b/base/Kernel/Singularity.Stress/StressService.sg
@@ -0,0 +1,157 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressService.sg
+//  Note:   Kernel diagnostics (testing and debugging)
+//
+
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Stress.Contracts;
+using Microsoft.Singularity.Directory;
+using System;
+
+namespace Microsoft.Singularity.Stress
+{
+    public class StressService
+    {
+        private void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels.
+            DirectoryServiceContract.Imp! epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(StressContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, ErrorCode error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the Stress Diagnostic module.\n");
+                        delete rejectedEP;
+                        delete nsExp;
+                        return;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            // Here is the set of client channels we service
+            ESet<StressContract.Exp:ReadyState> epSet = new ESet<StressContract.Exp:ReadyState>();
+
+            while (true) {
+                switch receive {
+                    // ------------------------------- Requests for new connections
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newServiceEp) : {
+                            // We expect people to give us StressContract.Exp instances
+                            StressContract.Exp newEp = newServiceEp as StressContract.Exp;
+
+                            if (newEp == null) {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newServiceEp);
+                            }
+                            else {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newEp.SendReady();
+                                epSet.Add(newEp);
+                            }
+                        }
+                        break;
+
+                    // ------------------------------- Requests on existing connections
+                    //
+                    // Don't forget that we're selecting endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.GcStress() in epSet :
+                        {
+                            // Use existing thread.
+                            // Block any other stress tests while GcStress runs.
+                            TRef<StressContract.Exp:GcStressState>! epRef =
+                                new TRef<StressContract.Exp:GcStressState>(ep);
+
+                            try {
+                                new GcStressDiagnostic(epRef).Run();
+                            }
+                            finally {
+                                ep = epRef.Acquire();
+                                ep.SendGcStressDone();
+                                epSet.Add(ep);
+                            }
+                        }
+                        break;
+
+                    case ep.ChannelClosed() in epSet :
+                        // ep is no longer in epSet; delete it.
+                        delete ep;
+                        break;
+
+                    case unsatisfiable :
+                        // (This should only be reached if ns is closed and epSet is empty.)
+                        // Exit this thread.
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                }
+            }
+        }
+
+        public static void Initialize()
+        {
+            StressService! module = new StressService();
+            Thread thread = Thread.CreateThread(null, new ThreadStart(module.Run));
+            if (thread != null) {
+                thread.Start();
+            }
+        }
+    }
+
+    class GcStressDiagnostic : GcStress
+    {
+        TRef<StressContract.Exp:GcStressState>! epRef;
+
+        internal GcStressDiagnostic(TRef<StressContract.Exp:GcStressState>! epRef)
+        {
+            this.epRef = epRef;
+            base();
+        }
+
+        override protected void Print(string! s)
+        {
+            // Send a Print message to the client containing s.
+            StressContract.Exp! ep = epRef.Acquire();
+            try {
+                ep.SendPrint(Bitter.FromString(s));
+                switch receive {
+                    case ep.AckPrint() :
+                        break;
+                }
+            }
+            finally {
+                epRef.Release(ep);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity.V1.def b/base/Kernel/Singularity.V1.def
new file mode 100644
index 0000000..77afdf4
--- /dev/null
+++ b/base/Kernel/Singularity.V1.def
@@ -0,0 +1,219 @@
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+
+VERSION 1.4019
+
+EXPORTS
+    ?g_Break@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXXZ
+    ?g_WaitOne@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SI_NU1@@Z
+    ?g_WaitAny@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SIHPAU1@H@Z
+    ?g_Yield@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXXZ
+    ?g_Start@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXU1@@Z
+    ?g_SpinWait@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXH@Z
+    ?g_Sleep@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXUStruct_System_TimeSpan@@@Z
+    ?g_Sleep@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXUStruct_System_SchedulerTime@@@Z
+    ?g_SetThreadLocalValue@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXPAUuintPtr@@@Z
+    ?g_Join@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI_NU1@@Z
+    ?g_Join@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI_NU1@UStruct_System_TimeSpan@@@Z
+    ?g_Join@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI_NU1@UStruct_System_SchedulerTime@@@Z
+    ?g_GetThreadState@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI?AUStruct_Microsoft_Singularity_V1_Threads_ThreadState@@U1@@Z
+    ?g_GetThreadLocalValue@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIPAUuintPtr@@XZ
+    ?g_GetExecutionTime@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI?AUStruct_System_TimeSpan@@U1@@Z
+    ?g_GetThreadsCreatedCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_GetThreadTime@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_System_TimeSpan@@XZ
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SIXU1@@Z
+    ?g_CurrentThread@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI?AU1@XZ
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Threads_ThreadHandle@@SI_NHUStruct_Microsoft_Singularity_V1_Threads_ContainerHandle@@PAU1@PAPAUuintPtr@@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@SI_N_NPAU1@@Z
+    ?g_SuspendBarrier@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIXXZ
+    ?g_Suspend@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@_N@Z
+    ?g_Stop@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIXU1@H@Z
+    ?g_Start@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@@Z
+    ?g_SetStartupEndpoint@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@HPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+    ?g_SetGcPerformanceCounters@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXUStruct_System_TimeSpan@@_J@Z
+    ?g_Resume@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@_N@Z
+    ?g_JoinImpl@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIXU1@PA_N@Z
+    ?g_JoinImpl@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@UStruct_System_SchedulerTime@@PA_N@Z
+    ?g_JoinImpl@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@UStruct_System_TimeSpan@@PA_N@Z
+    ?g_GetProcessId@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIHU1@@Z
+    ?g_GetPrincipalHandle@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI?AUStruct_Microsoft_Singularity_V1_Security_PrincipalHandle@@U1@@Z
+    ?g_GetExitCode@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIHU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SIXU1@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NPA_WPAHH0HHPAU1@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NPA_WH0H0HPAU1@@Z
+    ?g_GetState@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI?AUStruct_Microsoft_Singularity_V1_Processes_ProcessState@@U1@@Z
+    ?g_RootSystemType@Struct_Microsoft_Singularity_V1_Types_SystemType@@SI?AU1@XZ
+    ?g_Register@Struct_Microsoft_Singularity_V1_Types_SystemType@@SI?AU1@PA_WH_J1U1@@Z
+    ?g_IsSubtype@Struct_Microsoft_Singularity_V1_Types_SystemType@@SI_NPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@U1@@Z
+    ?g_IsSubtype@Struct_Microsoft_Singularity_V1_Types_SystemType@@SI_NU1@0@Z
+    ?g_IsNull@Struct_Microsoft_Singularity_V1_Types_SystemType@@SI_NU1@@Z
+    ?g_UnmapPhysicalRange@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SIXPAUuintPtr@@0@Z
+    ?g_MapPhysicalRange@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SIPAUuintPtr@@PAU2@0_N1@Z
+    ?g_GetPnpSignature@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SIIHPA_WI@Z
+    ?g_GetPciConfigImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NPAG00@Z
+    ?g_GetIrqCount@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SIHE@Z
+    ?g_GetFixedIoRangeCount@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SIIXZ
+    ?g_GetFixedIoPortRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAG0PA_N1@Z
+    ?g_GetFixedIoMemoryRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAPAEPAIPA_N2@Z
+    ?g_GetFixedIoIrqRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAE0@Z
+    ?g_GetFixedIoDmaRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAE0@Z
+    ?g_GetDynamicIoRangeCount@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SIIXZ
+    ?g_GetDynamicIoPortRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAG0PA_N1@Z
+    ?g_GetDynamicIoMemoryRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAPAEPAIPA_N2@Z
+    ?g_GetDynamicIoIrqRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAE0@Z
+    ?g_GetDynamicIoDmaRangeImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NIPAE0@Z
+    ?g_GetDmaPhysicalAddressImpl@Struct_Microsoft_Singularity_V1_Services_DeviceService@@SI_NPAUuintPtr@@PAPAU2@1@Z
+    ?g_Split@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@PAU2@PAUuintPtr@@@Z
+    ?g_Share@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@PAU2@PAUuintPtr@@1@Z
+    ?g_Truncate@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIXPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@PAUuintPtr@@@Z
+
+#if ROUTE_INDIRECTION_THROUGH_KERNEL
+    ?g_GetType@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIPAUuintPtr@@PAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+    ?g_GetSize@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIPAUuintPtr@@PAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+    ?g_GetData@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIPAUuintPtr@@PAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+#endif
+    ?g_Free@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SI_NPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+    ?g_Allocate@Struct_Microsoft_Singularity_V1_Services_SharedHeapService@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@PAUuintPtr@@UStruct_Microsoft_Singularity_V1_Types_SystemType@@I@Z
+    ?g_Wait@Struct_Microsoft_Singularity_V1_Threads_InterruptHandle@@SI_NU1@@Z
+    ?g_Pulse@Struct_Microsoft_Singularity_V1_Threads_InterruptHandle@@SIXU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Threads_InterruptHandle@@SI_NU1@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Threads_InterruptHandle@@SI_NEPAU1@@Z
+    ?g_Ack@Struct_Microsoft_Singularity_V1_Threads_InterruptHandle@@SI_NU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Threads_ContainerHandle@@SIXU1@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Threads_ContainerHandle@@SI_NPAU1@@Z
+    ?g_WritePerfCounter@Struct_Microsoft_Singularity_V1_Services_DebugService@@SI_NI_K@Z
+    ?g_AddToPerfCounter@Struct_Microsoft_Singularity_V1_Services_DebugService@@SI_NI_K@Z
+    ?g_WalkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+    ?g_ReadPerfCounter@Struct_Microsoft_Singularity_V1_Services_DebugService@@SI_KI@Z
+    ?g_GetUsageStatisticsImpl@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXPA_K0@Z
+    ?g_SetNoGC@Struct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@SI_NU1@@Z
+    ?g_Set@Struct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@SI_NU1@@Z
+    ?g_SetAll@Struct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@SI_NU1@@Z
+    ?g_Reset@Struct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@SI_NU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@SIXU1@@Z
+    ?g_WaitOneNoGC@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SI_NU1@@Z
+    ?g_WaitOne@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SI_NU1@UStruct_System_TimeSpan@@@Z
+    ?g_WaitOne@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SI_NU1@UStruct_System_SchedulerTime@@@Z
+    ?g_WaitAny@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SIHPAU1@HUStruct_System_TimeSpan@@@Z
+    ?g_WaitAny@Struct_Microsoft_Singularity_V1_Threads_SyncHandle@@SIHPAU1@HUStruct_System_SchedulerTime@@@Z
+    ?g_GetPrincipalNameImpl@Struct_Microsoft_Singularity_V1_Security_PrincipalHandle@@SIHU1@PA_WH@Z
+    ?g_SelfPrincipalHandle@Struct_Microsoft_Singularity_V1_Security_PrincipalHandle@@SI?AU1@XZ
+    ?g_ExpandAclIndirectionImpl@Struct_Microsoft_Singularity_V1_Security_PrincipalHandle@@SIHPA_WH0H@Z
+    ?g_Set@Struct_Microsoft_Singularity_V1_Threads_ManualResetEventHandle@@SI_NU1@@Z
+    ?g_Reset@Struct_Microsoft_Singularity_V1_Threads_ManualResetEventHandle@@SI_NU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Threads_ManualResetEventHandle@@SIXU1@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Threads_ManualResetEventHandle@@SI_N_NPAU1@@Z
+    ?g_KPTest@Struct_Microsoft_Singularity_V1_Stress_StressDirect@@SIIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@H@Z
+    ?g_WaypointDump@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXXZ
+    ?g_WaypointDone@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXXZ
+    ?g_Waypoint0@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXXZ
+    ?g_Waypoint@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXH@Z
+    ?g_Stop@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXH@Z
+    ?g_SetStartupEndpoint@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXHPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+    ?g_GetUpTime@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_System_TimeSpan@@XZ
+    ?g_GetUtcTime@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_System_DateTime@@XZ
+    ?g_GetTracingHeadersImpl@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXPAPAUStruct_Microsoft_Singularity_V1_Services_LogEntry@@0PAPAPAU2@PAPAE2PAPAPAE@Z
+    ?g_GetMonitoringHeadersImpl@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIXPAPAE@Z
+    ?g_GetStartupEndpointCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHXZ
+    ?g_GetStartupEndpoint@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@H@Z
+
+    ?g_BindToService@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI_NU1@UStruct_Microsoft_Singularity_V1_Types_SystemType@@1PA_WHHH@Z
+
+    ?g_SetStartupStringArg@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@U1@HPA_WH@Z
+    ?g_SetStartupLongArg@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@U1@H_J@Z
+    ?g_SetStartupBoolArg@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@U1@H_N@Z
+
+    ?g_GetStartupBoolArgImpl@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@HPA_N@Z
+    ?g_GetStartupLongArgImpl@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@HPA_J@Z
+    ?g_GetStartupStringArgImpl@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@HPA_WPAH@Z
+
+    ?g_GetStartupStringArrayArgImpl@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@HPA_WPAH11@Z
+
+    ?g_GetStartupStringArrayArgCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHXZ
+    ?g_GetStartupStringArgCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHXZ
+    ?g_GetStartupLongArgCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHXZ
+    ?g_GetStartupBoolArgCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHXZ
+
+    ?g_SetStartupStringArrayArg@Struct_Microsoft_Singularity_V1_Processes_ProcessHandle@@SI?AUStruct_Microsoft_Singularity_V1_Services_ParameterCode@@U1@HPA_WPAHH@Z
+
+    ?g_GetStartupArgCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHXZ
+    ?g_GetStartupArg@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHHPA_WH@Z
+    ?g_GetNamespaceEndpoint@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@XZ
+    ?g_GetKernelInterruptCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_GetKernelGcCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_GetKernelBootCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_GetCyclesPerSecond@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_GetCycleCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_GetCurrentProcessId@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIGXZ
+    ?g_GetContextSwitchCount@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_JXZ
+    ?g_Release@Struct_Microsoft_Singularity_V1_Threads_MutexHandle@@SIXU1@@Z
+    ?g_IsOwnedByCurrentThread@Struct_Microsoft_Singularity_V1_Threads_MutexHandle@@SI_NU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Threads_MutexHandle@@SIXU1@@Z
+    ?g_CreateImpl@Struct_Microsoft_Singularity_V1_Threads_MutexHandle@@SI_N_NPAU1@@Z
+    ?g_WalkStack@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXXZ
+    ?g_PrintBeginImpl@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXPAPA_WPAH@Z
+    ?g_PrintComplete@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXPA_WH@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXPA_W@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXPA_WH@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXE@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIX_K@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXI@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIX_J@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXH@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIX_W@Z
+    ?g_Print@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIX_N@Z
+    ?g_IsDebuggerPresent@Struct_Microsoft_Singularity_V1_Services_DebugService@@SI_NXZ
+    ?g_NotifyPeer@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@@Z
+    ?g_TransferContentOwnership@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@0@Z
+    ?g_TransferBlockOwnership@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@PAU1@@Z
+    ?g_Dispose@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SI_NPAU1@@Z
+    ?g_Free@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@@Z
+#if !PAGING
+#else
+    ?g_MarshallPointer@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@PAEPAPAEUStruct_Microsoft_Singularity_V1_Types_SystemType@@@Z
+    ?g_MarshallMessage@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@PAE1PAHH@Z
+    ?g_LinkIntoCollection@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@UStruct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@@Z
+    ?g_UnlinkFromCollection@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@UStruct_Microsoft_Singularity_V1_Threads_AutoResetEventHandle@@@Z
+    ?g_GetPeerProcessID@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIHPAU1@@Z
+    ?g_GetPeerPrincipalHandle@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SI?AUStruct_Microsoft_Singularity_V1_Security_PrincipalHandle@@PAU1@@Z
+    ?g_GetPeer@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@PAU1@PA_N@Z
+    ?g_GetOwnerProcessID@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIHPAU1@@Z
+    ?g_GetOwnerPrincipalHandle@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SI?AUStruct_Microsoft_Singularity_V1_Security_PrincipalHandle@@PAU1@@Z
+    ?g_GetChannelID@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIHPAU1@@Z
+    ?g_Wait@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@@Z
+    ?g_GetWaitHandle@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SI?AUStruct_Microsoft_Singularity_V1_Threads_SyncHandle@@PAU1@@Z
+    ?g_Closed@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SI_NPAU1@@Z
+    ?g_Close@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAU1@@Z
+    ?g_PeerClosed@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SI_NPAU1@@Z
+#endif
+    ?g_Connect@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIXPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@0@Z
+    ?g_Allocate@Struct_Microsoft_Singularity_V1_Services_EndpointCore@@SIPAUStruct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation@@IUStruct_Microsoft_Singularity_V1_Types_SystemType@@@Z
+    ?g_QueryImpl@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SI_NPAUuintPtr@@PAPAU2@1@Z
+    ?g_QueryImpl@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SI_NIPAI0@Z
+    ?g_GetUsageStatisticsImpl@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIXPA_K000@Z
+    ?g_GetProcessTag@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIIXZ
+    ?g_GetPageTable@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIPAIXZ
+    ?g_GetPageCount@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIIXZ
+    ?g_GetBaseAddress@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIIXZ
+    ?g_FreeIOMemory@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIXPAUuintPtr@@0@Z
+    ?g_FreeIOMemory@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIXII@Z
+    ?g_Free@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIXPAUuintPtr@@0@Z
+    ?g_Free@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIXII@Z
+    ?g_AllocateIOMemory@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIPAUuintPtr@@PAU2@00@Z
+    ?g_AllocateIOMemory@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIIIII@Z
+    ?g_AllocateExtend@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIPAUuintPtr@@PAU2@0@Z
+    ?g_AllocateExtend@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIIII@Z
+    ?g_Allocate@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIPAUuintPtr@@PAU2@@Z
+    ?g_Allocate@Struct_Microsoft_Singularity_V1_Services_PageTableService@@SIII@Z
+    ?g_RunPingPongInt@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHH@Z
+    ?g_HelloProcessABI@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHHH@Z
+    ?g_TestAbiCallOne@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SI_K_K@Z
+    ?g_TestAbiCallTwo@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIHIPA_W@Z
+    ?g_TestAbiCallThree@Struct_Microsoft_Singularity_V1_Services_ProcessService@@SIPA_WHPAHE@Z
+
+    ?g_LinkNewStackSegment@Struct_Microsoft_Singularity_V1_Services_StackService@@SIPAUuintPtr@@PAU2@PAII000@Z
+    ?g_ReturnStackSegmentRaw@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXPAUuintPtr@@0@Z
+
+    ?g_LinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
+    ?g_UnlinkStack@Struct_Microsoft_Singularity_V1_Services_StackService@@SIXXZ
diff --git a/base/Kernel/Singularity/ApServiceThread.cs b/base/Kernel/Singularity/ApServiceThread.cs
new file mode 100644
index 0000000..a32380f
--- /dev/null
+++ b/base/Kernel/Singularity/ApServiceThread.cs
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ApServiceThread.cs
+//
+//  Note:
+//
+
+using System.Threading;
+
+using Microsoft.Singularity;
+
+
+namespace Microsoft.Singularity
+{
+    internal class ApServiceThread
+    {
+        public static AutoResetEvent abiEvent;
+
+        internal static void Initialize()
+        {
+            abiEvent = new AutoResetEvent(false);
+            Thread.CreateThread(Thread.CurrentProcess, new ThreadStart(ApServiceLoop)).Start();
+        }
+
+        private static void ApServiceLoop()
+        {
+            DebugStub.WriteLine("ApServiceThread is initialized and sleeping ...");
+            MpExecution.MpCall mpCall;
+            bool iflag;
+
+            while (true) {
+                abiEvent.WaitOne();
+
+                DebugStub.WriteLine
+                    ("HSG: ** cpu.{0} receives AbiCall interrupt",
+                     __arglist(Processor.GetCurrentProcessorId()));
+
+                // Current design: the boot processor will get all
+                // unserved abi call. So we don't need to worry
+                // missing any calls
+                while (true) {
+
+                    iflag = Processor.DisableInterrupts();
+                    mpCall = MpExecution.GetMpCall(Processor.GetCurrentProcessorId());
+                    Processor.RestoreInterrupts(iflag);
+
+
+                    // There is no unserved abi call, just break
+                    if (mpCall == null) {
+                        break;
+                    }
+
+                    BspAbiStub.ProcessMpCall(Processor.GetCurrentProcessorId(), mpCall);
+                }
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/BootInfo.cs b/base/Kernel/Singularity/BootInfo.cs
new file mode 100644
index 0000000..66e86a9
--- /dev/null
+++ b/base/Kernel/Singularity/BootInfo.cs
@@ -0,0 +1,316 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity
+{
+    [StructLayout(LayoutKind.Sequential, Pack=4)]
+    [CLSCompliant(false)]
+    public struct BootInfo
+    {
+        //
+        // These constants control the gross layout of physical memory.
+        //
+        // Physical Addresses
+        // 00000000..000fffff    Reserved for boot loaders
+        // 00007000..00017fff    16-bit segment
+        // 00007b00..0000efff    16-bit real-mode code
+        // 0000f000..00017fff    16-bit stack
+        // 00018000..0005ffff    boot heap
+        // 00060000..000affff    32-bit boot loader code (undump)
+        //
+        // 00100000..001fffff    Reserved for ? (1MB..)
+        //
+        // 00200000..002fffff    Kernel stack   (1MB..2MB)
+        // 00310000..004fffff    Kernel code & static Data (2MB..4MB...)
+        //
+        // 00500000..??          Mp ABI stub (haryadi)
+        //
+        // 04000000..07ffffff    Runtime heaps preferred memory (64MB..128MB)
+        //
+        // top-size..top ram     minidump load.
+        //
+        // fe000000..ffffffff    Uncached mapped memory
+
+        // Memory Layout Constants
+        [AccessedByRuntime("referenced in c++")]
+        // 4KB is currently the only supported size
+        internal const uint PAGE_SIZE           = 0x00001000; // 4KB
+
+        // Make sure zero through this address is always unmapped
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint PHYSICAL_DISABLED   = 0x00004000;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint REAL_CODE_BASE      = 0x00007b00;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint REAL_STACK          = 0x00017FF0;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint REAL_PBOOTINFO      = 0x00017FF8;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint REAL_HEAP           = 0x00018000;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint DUMP_CODE_BASE      = 0x00060000;
+
+        // Addresses for hypervisor overlay pages
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint HYPERCALL_PAGE      = 0x00100000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint HYPERVISOR_SIM_PAGE = 0x00101000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint HYPERVISOR_SIEF_PAGE= 0x00102000;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_LOGREC_BEGIN = 0x00200000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_LOGREC_LIMIT = 0x00220000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_LOGTXT_BEGIN = 0x00220000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_LOGTXT_LIMIT = 0x00240000;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_STACK_BEGIN  = 0x00240000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_STACK        = 0x002ff000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_STACK_LIMIT  = 0x00300000;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint KERNEL_BASE         = 0x00310000;
+
+        // haryadi -- this is the ABI Stub (MpSyscalls.x86)
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint MP_ABI_BASE         = 0x00600000;
+
+        // The physical address and extent of the high-memory
+        // range to map into the Kernel space, and mark
+        // "uncached". This window is for communicating with
+        // hardware.
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint UNCACHED_PHYSICAL   = 0xFE000000;
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint UNCACHED_MAPPED     = 0x02000000;
+
+        // This is the amount of *contiguous, physical* memory
+        // to reserve at boot for use as I/O memory
+        internal const uint IO_MEMORY_SIZE      = 0x00800000; // 8MB
+
+        //
+        // These constants control the gross layout of *virtual*
+        // memory
+        //
+
+        // This is the maximum size of a communication-heap
+        // (used to reserve enough space in virtual address
+        // spaces to map in communication heaps as necessary)
+        // For ease of mapping, this should be a multiple of 2MB
+        internal const uint COMM_HEAP_MAX_SIZE  = 0x02000000; // 32MB
+
+        // This determines where the kernel/user boundary is.
+        // Currently, it needs to be multiple of 1GB.
+        internal const uint KERNEL_BOUNDARY     = 0x40000000; // 1GB
+
+        // This determines the maximum virtual address
+        // we will use. Setting this to less than the
+        // machine's maximum pointer size can reduce the
+        // overhead of paging structures.
+        //
+        // NOTE we are not currently safe to use the top
+        // bit of addresses (because of the "mark" bit in the
+        // multi-use word header), so restrict ourselves to the
+        // bottom 2GB.
+        [AccessedByRuntime("referenced in c++")]
+        internal const uint MAX_VIRTUAL_ADDR    = 0x80000000; // 2GB
+
+        // Exit Codes:
+        [AccessedByRuntime("referenced in c++")]
+        internal const int EXIT_AND_RESTART     = 0x1fff;
+        [AccessedByRuntime("referenced in c++")]
+        internal const int EXIT_AND_SHUTDOWN    = 0x1ffe;
+        [AccessedByRuntime("referenced in c++")]
+        internal const int EXIT_AND_WARMBOOT    = 0x1ffd;
+        [AccessedByRuntime("referenced in c++")]
+        internal const int EXIT_AND_HALT        = 0x1ffc;
+
+        // Sanity Check
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       RecSize;
+
+        // IDT and PIC
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.IDTP   BiosIdtPtr;
+        [AccessedByRuntime("referenced in c++")]
+        internal ushort     BiosPicMask;
+        [AccessedByRuntime("referenced in c++")]
+        internal byte       BiosWarmResetCmos;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       BiosWarmResetVector;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       Info16;
+
+        // Debug Stub Information
+        [AccessedByRuntime("referenced in c++")]
+        internal ushort     DebugBasePort;
+
+        // Temporary IDT
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    IdtEnter0;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    IdtEnter1;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    IdtEnterN;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    IdtTarget;
+
+        // Self-descriptive information
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    Info32;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    Kill32;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       KillAction;
+
+        // MP specific variables
+        [AccessedByRuntime("referenced in c++")]
+        public   ulong    MpEnter32;          // Entry point
+        [AccessedByRuntime("referenced in c++")]
+        public   uint       MpCpuCount;         // No of AP's booted
+        [AccessedByRuntime("referenced in c++")]
+        public   uint       MpStatus32;         // Error indicator
+        [AccessedByRuntime("referenced in c++")]
+        public   ulong    MpStartupLock32;    // Pointer to MP init lock var
+        [AccessedByRuntime("referenced in c++")]
+        public   ulong    MpBootInfo32;       // Pointer to MpBootInfo
+
+        // Per CPU state - in initialization order (CPU0 = BSP, CPUX = AP)
+        [AccessedByRuntime("referenced in c++")]
+        public   CpuInfo    Cpu0;
+#if SINGULARITY_MP
+        [AccessedByRuntime("referenced in c++")]
+        public   CpuInfo    Cpu1;
+        [AccessedByRuntime("referenced in c++")]
+        public   CpuInfo    Cpu2;
+        [AccessedByRuntime("referenced in c++")]
+        public   CpuInfo    Cpu3;
+#  if !MAX_CPU2 && !MAX_CPU3 && !MAX_CPU4
+#    error "MAX_CPUx value is either not defined or not supported."
+#  endif // MAX_CPUx
+#endif // SINGULARITY_MP
+
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong Pdpt32;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    Undump;
+
+        // Location (in high memory) of the executable
+        // images
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    DumpAddr32;
+
+        // Extent of that data
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       DumpSize32;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    DumpRemainder;
+
+        // Start of the undumped kernel image
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    DumpBase;
+
+        // Marks the highest address used by the
+        // kernel image (undumped from high memory)
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    DumpLimit;
+
+        //
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    Heap32;
+
+        // PCI Information (V2.0+)
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       PciBiosAX;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       PciBiosBX;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       PciBiosCX;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       PciBiosEDX;
+
+        // BIOS Information
+        [AccessedByRuntime("referenced in c++")]
+        public   ulong    AcpiRoot32;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    PnpNodesAddr32;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       PnpNodesSize32;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    SmbiosRoot32;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    DmiRoot32;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       IsaCsns;
+        [AccessedByRuntime("referenced in c++")]
+        internal ushort     IsaReadPort;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       Ebda32;
+        [AccessedByRuntime("referenced in c++")]
+        public   uint       MpFloat32;
+
+        // SMAP Information
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       SmapCount;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    SmapData32;
+
+        // 1394 Information
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    Ohci1394Base;
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    Ohci1394BufferAddr32;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       Ohci1394BufferSize32;
+
+        // File image table
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    FileImageTableBase32;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       FileImageTableEntries;
+
+        // BOOT Information
+        [AccessedByRuntime("referenced in c++")]
+        internal ulong    CmdLine32;
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       BootCount;
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(8)]
+        [NoHeapAllocation]
+        internal static unsafe extern BootInfo * HalGetBootInfo();
+
+        [NoHeapAllocation]
+        public static unsafe BootInfo GetBootInfo()
+        {
+            BootInfo *ptr;
+
+            ptr = HalGetBootInfo();
+            return *ptr;
+        }
+
+        [NoHeapAllocation]
+        public unsafe CpuInfo GetCpuInfo(int processorId)
+        {
+            fixed (CpuInfo* ci = &Cpu0)
+            {
+                return *(ci + processorId);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/BspAbiStubSample.cs b/base/Kernel/Singularity/BspAbiStubSample.cs
new file mode 100644
index 0000000..5f73441
--- /dev/null
+++ b/base/Kernel/Singularity/BspAbiStubSample.cs
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////
+// This file will be automatically generated
+// and overwritten again and again ...
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Scheduling;
+using Microsoft.Singularity.X86;
+
+// haryadi: for Abi Call
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity
+{
+    [CLSCompliant(false)]
+    public class BspAbiStub
+    {
+
+        [NoHeapAllocation]
+        public static unsafe void ProcessMpCall(int cpu, MpExecution.MpCall mpCall)
+        {
+            switch (mpCall.abiNum) {
+              case 86: CallHelloProcessABI(cpu, mpCall); break;
+              default:
+                DebugStub.WriteLine("HSG: **** Unknown abi call number {0}",
+                                    __arglist(mpCall.abiNum));
+                break;
+            }
+        }
+
+        [NoHeapAllocation]
+        private static unsafe void CallHelloProcessABI(int cpu, MpExecution.MpCall mpCall)
+        {
+            int p0, p1;
+            int retval;
+
+            // 2) get args from
+            // argVal = mpCall.argVal;
+            fixed (byte *baseArg = & mpCall.argBuffer[0] ) {
+                Buffer.MoveMemory( (byte*) & p0 , baseArg+0, 4);
+                Buffer.MoveMemory( (byte*) & p1 , baseArg+4, 4);
+            }
+
+            // 3) call the actual abi, save return values
+            retval = ProcessService.HelloProcessABI(p0, p1);
+
+            // 4) copy retval to abi
+            // mpCall.retVal = retVal;
+            fixed (byte *baseRet = & mpCall.retBuffer[0] ) {
+                Buffer.MoveMemory( baseRet , (byte*) & retval , 4);
+            }
+
+            // 4) copy arguments to abi
+            fixed (byte *baseArg = & mpCall.argBuffer[0] ) {
+                Buffer.MoveMemory( baseArg+0 , (byte*) & p0 , 4);
+                Buffer.MoveMemory( baseArg+4 , (byte*) & p1 , 4);
+            }
+
+            // 5) store abi back to buffer
+            MpExecution.ReturnMpCall(cpu, mpCall.position);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Channels/ChannelClosedException.cs b/base/Kernel/Singularity/Channels/ChannelClosedException.cs
new file mode 100644
index 0000000..edda740
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/ChannelClosedException.cs
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelClosedException.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+
+namespace Microsoft.Singularity.Channels
+{
+    public class ChannelClosedException : ChannelException
+    {
+        public ChannelClosedException()
+        {
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Channels/ChannelException.cs b/base/Kernel/Singularity/Channels/ChannelException.cs
new file mode 100644
index 0000000..99f48dc
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/ChannelException.cs
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelException.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+
+namespace Microsoft.Singularity.Channels
+{
+    public class ChannelException : Exception
+    {
+        public ChannelException()
+        {
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Channels/ChannelTransferredException.cs b/base/Kernel/Singularity/Channels/ChannelTransferredException.cs
new file mode 100644
index 0000000..456cb69
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/ChannelTransferredException.cs
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelTransferredException.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+using System;
+
+
+namespace Microsoft.Singularity.Channels
+{
+    public class ChannelTransferredException : ChannelException
+    {
+        public ChannelTransferredException()
+        {
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Channels/ClaimsAttribute.cs b/base/Kernel/Singularity/Channels/ClaimsAttribute.cs
new file mode 100644
index 0000000..4875311
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/ClaimsAttribute.cs
@@ -0,0 +1,41 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ClaimsAttribute.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+
+
+namespace Microsoft.SingSharp
+{
+    /// <summary>
+    /// Can be used on parameters of ITracked type to override the default Borrowed semantics.
+    ///
+    /// Means that parameter ownership is not returned by method.
+    ///
+    /// If the attribute appears on an instance method, the attribute applies to the receiver parameter.
+    /// </summary>
+    [ AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, AllowMultiple = false)]
+    public class ClaimsAttribute : Attribute
+    {
+    }
+
+
+    /// <summary>
+    /// Can be used on return of ITracked type to override the default Owned semantics.
+    /// 
+    /// Means that the returned value is part of the 'receivers' representation and cannot outlive the receiver.
+    ///
+    /// </summary>
+    [ AttributeUsage(AttributeTargets.ReturnValue, AllowMultiple = false)]
+    public class BorrowedAttribute : Attribute 
+    {
+    }
+}
diff --git a/base/Kernel/Singularity/Channels/EndpointCore.cs b/base/Kernel/Singularity/Channels/EndpointCore.cs
new file mode 100644
index 0000000..1edf67d
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/EndpointCore.cs
@@ -0,0 +1,1414 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EndpointCore.cs
+//
+
+//  HACK: Because we currently compile this file as part of the Kernel with C#, we can't
+//        make EndpointCore a rep struct, which is necessary for inheriting from it.
+//        The compiler and Bartok recognize EndpointCore as special and treat it as
+//        unsealed.
+//        This hack can be removed, once we compile it with Sing#.
+//        DON'T change the name until then!
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Channels
+{
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.V1.Security;
+    using Microsoft.Singularity.V1.Services;
+    using Microsoft.Singularity.V1.Types;
+    using Allocation = Microsoft.Singularity.Memory.SharedHeap.Allocation;
+    using System.Threading;
+    using SharedHeap = Microsoft.Singularity.Memory.SharedHeap;
+
+    [CLSCompliant(false)]
+    public enum EndpointCoreEvent : ushort
+    {
+        Connect = 4,
+        TransferToProcess = 5,
+    }
+
+#if !PAGING
+    [CLSCompliant(false)]
+    [CCtorIsRunDuringStartup]
+    unsafe public struct EndpointCore
+#else
+    // The portion of the endpoint that is only
+    // accessible to the kernel or to trusted run-time code:
+    [CLSCompliant(false)]
+    unsafe struct EndpointTrusted
+#endif
+    {
+
+        /// <summary>
+        /// Flag indicating that the endpoint is closed.
+        /// This gets set either by an explicit close, or when
+        /// the kernel determines that the endpoint is not reachable.
+        /// NOTE: A channel only goes away entirely, once both ends are closed!
+        ///
+        /// NOTE: The lifetime of the various involved data structures is
+        /// as follows:
+        ///
+        /// Endpoint Allocations: as today. Owned by a process, goes away when
+        ///                       the process decides to free it or the
+        ///                       sharedHeapWalker finds it.
+        ///
+        /// Endpoint structures:  ref counted as today in a process domain.
+        ///                       Alive as long as there is at least one allocation
+        ///                       structure to it. Note that if the channel spans
+        ///                       protection domains, then the endpoint structure is
+        ///                       not kept alive by the peer.
+        ///
+        /// Endpoint trusted:     ref counted in the kernel. Get collected once both
+        ///                       sides are closed.
+        /// </summary>
+        private volatile bool closed;
+
+        /// <summary>
+        /// The endpoint to which this endpoint is connected.
+        /// </summary>
+#if PAGING
+        private EndpointTrusted* peer;
+
+        static private SpinLock spinLock;
+        private int refCount;
+
+        /// <summary>
+        /// The user-level allocation for the endpoint that owns this
+        /// EndpointCoreData struct.
+        ///   this == this->self->data->trusted
+        /// </summary>
+        private Allocation* /*EndpointCore* opt(ExHeap)*/ self;
+
+        /// <summary>
+        /// If the peer is in the same protection domain, then this
+        /// points to an allocation owned by this side to the peer
+        /// EndpointCoreData struct.
+        ///
+        /// We materialize this on demand as well as tear it down
+        /// when an endpoint moves out of a protection domain.
+        ///
+        /// This allocation is used for the fast path to write directly
+        /// into the peer data structure.
+        /// </summary>
+        internal Allocation* /*EndpointCore* opt(ExHeap)*/ directPeerAllocation;
+
+        private EndpointUpdates endpointUpdates;
+
+        /// <summary>
+        /// Return a handle for the peer
+        /// </summary>
+        internal Allocation* DirectPeerAllocation(out bool marshall)
+        {
+            marshall = ChannelSpansDomains;
+
+            return this.directPeerAllocation;
+        }
+
+        bool ChannelSpansDomains {
+            get {
+                Process us = Process.GetProcessByID(this.ownerProcessId);
+                Process them = Process.GetProcessByID(this.peer->ownerProcessId);
+                return (us.ProcessSharedHeap != them.ProcessSharedHeap);
+            }
+        }
+
+#else
+        private Allocation* /*EndpointCore* opt(ExHeap)*/ peer;
+#endif
+
+        /// <summary>
+        /// Event on which sends are signaled to this endpoint.
+        /// The handle is owned by the kernel, since the endpoint can move.
+        /// The kernel deallocates the handle when the channel is deallocated.
+        /// NOTE: stays valid until the entire channel gets collected.
+        /// </summary>
+        private AutoResetEventHandle messageEvent;
+
+        /// <summary>
+        /// Event handle in case this endpoint is part of a collection
+        /// </summary>
+        private AutoResetEventHandle collectionEvent;
+
+        /// <summary>
+        /// Contains the process id of the process currently owning this end of the
+        /// channel.
+        /// </summary>
+        private int ownerProcessId;
+
+        /// <summary>
+        /// Contains the principal that currently controls this end of the
+        /// channel.  For now, this will simply be the owning process ID.  But
+        /// this will change once we implement delegation.
+        /// </summary>
+        private PrincipalHandle ownerPrincipalHandle;
+
+        /// <summary>
+        /// Contains the number of sends to this endpoint.
+        /// </summary>
+        private int receiveCount;
+
+        /// <summary>
+        /// Contains the channelId (positive on the EXP endpoint, negative on the imp endpoint)
+        /// </summary>
+        private int channelId;
+
+        /// <summary>
+        /// Contains the pinned status
+        /// </summary>
+        ///private bool pinned;
+
+        private static int channelIdGenerator;
+
+        private static int openChannelCount = 0;
+
+#if SINGULARITY_KERNEL && CHANNEL_COUNT
+        internal static void IncreaseBytesSentCount(long bytes)
+        {
+              PerfCounters.AddBytesSent(bytes);
+        }
+
+#endif // SINGULARITY_KERNEL
+
+        public static int OpenChannelCount { get { return openChannelCount; } }
+
+#if PAGING
+        struct FreeElement
+        {
+            internal FreeElement* next;
+        }
+        private static FreeElement* freeAllocList;
+        private static SpinLock allocLock;
+
+        // Warning: this allocation resides in a user address space.
+        // TODO: add sanity checks to ensure the correct address space is mapped.
+        public Allocation* Self { get { return self; } }
+
+        public EndpointTrusted* Peer
+        {
+            [NoHeapAllocation]
+            get { return peer; }
+        }
+
+        public void FlushTo(Allocation* peer) {
+            // only touch peer and kernel
+            this.endpointUpdates.Fetch(peer);
+        }
+
+        public static EndpointTrusted* New(Allocation* /*EndpointCore* opt(ExHeap)!*/ self)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            allocLock.Acquire();
+            try {
+                //
+                // Attempt to get a struct from our free list.
+                //
+                FreeElement* address = freeAllocList;
+                if (address != null) {
+                    freeAllocList = address->next;
+                }
+                else {
+                    //
+                    // Free list is empty.
+                    // Allocate new page and break it up into structs.
+                    // Use first struct to satisfy current
+                    // request, put remainder on the free list.
+                    //
+                    UIntPtr newSpace = MemoryManager.KernelAllocate(
+                        1, null, 0, System.GCs.PageType.Shared);
+
+                    uint size = (uint)sizeof(EndpointTrusted);
+
+                    address = (FreeElement*) newSpace;
+                    newSpace += size;
+                    uint spaceRemaining = MemoryManager.PageSize - size;
+                    while (spaceRemaining > size) {
+                        FreeElement* next = freeAllocList;
+                        freeAllocList = (FreeElement*) newSpace;
+                        freeAllocList->next = next;
+                        newSpace += size;
+                        spaceRemaining -= size;
+                    }
+                }
+
+                //
+                // Initialize the trusted endpoint (zero fields).
+                //
+                Buffer.ZeroMemory((byte *)address, sizeof(EndpointTrusted));
+                EndpointTrusted* ep = (EndpointTrusted*) address;
+                ep->refCount = 0;
+                ep->self = self;
+                return ep;
+            }
+            finally {
+                allocLock.Release();
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        public static void Delete(EndpointTrusted* ep)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            allocLock.Acquire();
+            try {
+                FreeElement* element = (FreeElement*) ep;
+                element->next = freeAllocList;
+                freeAllocList = element;
+            }
+            finally {
+                allocLock.Release();
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+#endif
+
+
+        ///
+        /// Closes this end of the channel and frees associated resources, EXCEPT the block
+        /// of memory for this endpoint. It must be released by the caller. Sing# does this
+        /// for the programmer.
+        ///
+        /// This runs in the kernel to avoid a race condition with Process.Stop.
+#if !PAGING
+        public bool Dispose() {
+            if (this.Closed()) {
+                return false;
+            }
+            this.Close(); // mark our side closed before waking up peer
+            // (Note: peer may be null if process stopped before Connect.)
+            if (this.peer != null) {
+                EndpointCore* peerData = (EndpointCore*)Allocation.GetDataUnchecked(this.peer);
+                if (peerData == null) {
+                    return false;
+                }
+                peerData->Notify();  // wake up peer thread if waiting to receive
+            }
+            return true;
+        }
+#else
+        public static void Dispose(EndpointTrusted* endpoint) {
+            if (endpoint->Closed()) {
+                throw new ApplicationException("Endpoint already closed");
+            }
+            endpoint->Close(); // mark our side closed before waking up peer
+            // (Note: peer may be null if process stopped before Connect.)
+            if (endpoint->Peer != null) {
+                endpoint->Peer->Notify();  // wake up peer thread if waiting to receive
+            }
+        }
+#endif //PAGING
+
+#if !PAGING
+        /// <summary>
+        /// Explicitly frees this end of the channel. If other end is also
+        /// freed, the channel is deallocated, meaning we have to deallocate
+        /// the kernel handles for the auto reset events.
+        /// Since both threads on the channel could try to do this simultaneously,
+        /// we use the ref counting on the underlying endpoints to let the last
+        /// free operation (the one pulling the ref count to 0) to free the associated
+        /// event.
+        /// </summary>
+        public static void Free(Allocation* /*EndpointCore* opt(ExHeap)!*/ endpoint) {
+            // Use unchecked GetData here, since this may be called from the
+            // cleanup threading running in the kernel.
+            //
+            EndpointCore* epData = (EndpointCore*)Allocation.GetDataUnchecked(endpoint);
+            if (epData == null) throw new ApplicationException("SharedHeap.GetData return null");
+            if (!epData->closed) {
+                throw new ApplicationException("Endpoint must have been Disposed prior to Delete");
+            }
+
+            Tracing.Log(Tracing.Debug, "Freeing endpoint {0:x8}", (UIntPtr)endpoint);
+
+            // If peer is also closed, try to free ALL auto-reset-event resources associated with the channel.
+            // (Note: peer may be null if process stopped before Connect.)
+            if (epData->peer != null) {
+                // Use unchecked GetData here, since this may be called from the
+                // cleanup threading running in the kernel.
+                //
+                TryFreeResources(epData->peer, SharedHeap.CurrentProcessSharedHeap.EndpointPeerOwnerId); // release our ref count on the peer
+                }
+            TryFreeResources(endpoint, SharedHeap.CurrentProcessSharedHeap.EndpointOwnerId); // release our endpoint
+            }
+#else
+        /// <summary>
+        /// This is initiated by one side's Allocation endpoint being deleted (either explicitly)
+        /// or via the cleanup thread.
+        /// The code here is responsible for
+        /// 1) releasing the direct peer allocation
+        /// 2) decrementing the trusted ref count on the channel
+        /// 3) if the trusted ref count goes to 0 for one of the two trusted endpoints,
+        ///    then delete that trusted endpoint and its associated structures.
+        ///
+        /// NOTE: the main allocation and endpoint structures in the exchange heap are
+        ///       not deleted here!
+        /// </summary>
+        public static void Free(EndpointTrusted* endpoint) {
+            if (!endpoint->closed) {
+                throw new ApplicationException("Endpoint must have been Disposed prior to Delete");
+            }
+
+            Tracing.Log(Tracing.Debug, "Freeing endpoint {0:x8}", (UIntPtr)(endpoint->self));
+
+#region Free the user data endpoint and peer
+            // We assume the freeing is done by a thread that runs in the same
+            // protection domain as the endpoints. Otherwise, how could we possibly
+            // access the data
+
+            // (Note: peer may be null if process stopped before Connect.)
+            Allocation* directPeerAllocation = endpoint->directPeerAllocation;
+
+            if (directPeerAllocation != null) {
+                // This means the peer is in the same protection domain.
+                // delete this allocation.
+                //
+                SharedHeap.CurrentProcessSharedHeap.Free(directPeerAllocation,
+                                                         SharedHeap.CurrentProcessSharedHeap.EndpointPeerOwnerId);
+
+                SharedHeap.CurrentProcessSharedHeap.Free(endpoint->Self,
+                                                         SharedHeap.CurrentProcessSharedHeap.EndpointOwnerId);
+            }
+#endregion
+
+            // If peer is also closed, try to free ALL auto-reset-event resources associated with the channel.
+            // (Note: peer may be null if process stopped before Connect.)
+            if (endpoint->Peer != null) {
+                TryFreeResources(endpoint->Peer); // release our ref count on the peer
+            }
+            TryFreeResources(endpoint); // release our endpoint
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// The peer thread might try this too, so we use the ref count of the underlying memory
+        /// to allow only the last freeer to also free the associated auto-reset event handle.
+        /// Make sure to grab the handle before freeing the endpoint.
+        /// </summary>
+#if !PAGING
+        unsafe private static void TryFreeResources(Allocation* /*EndpointCore*/ endpoint,
+                                                    SharedHeap.AllocationOwnerId ownerId) {
+
+            // Use unchecked GetData here, since this may be called from the
+            // cleanup threading running in the kernel.
+            //
+            EndpointCore* epData = (EndpointCore*)Allocation.GetDataUnchecked(endpoint);
+            AutoResetEventHandle areHandle = epData->messageEvent;
+
+            int channelId = epData->channelId;
+
+            bool lastRefGone = SharedHeap.KernelSharedHeap.Free(endpoint, ownerId);
+
+            if (lastRefGone && channelId > 0) {
+                // the entire channel is closed which we attribute to the closing of the Exp side
+                // (whose channelId is positive).
+                //
+                DebugStub.Assert(openChannelCount > 0,
+                                 "EndpointCore.cs: attempt to take open " +
+                                 "channel count negative");
+                openChannelCount--;
+                Tracing.Log(Tracing.Debug, "Entire channel is closed {0:x8}", (UIntPtr)endpoint);
+            }
+
+            if (lastRefGone && areHandle.id != UIntPtr.Zero) {
+                // got the AutoResetEventHandle
+                Process.kernelProcess.ReleaseHandle(areHandle.id);
+            }
+        }
+#else
+        unsafe private static void TryFreeResources(EndpointTrusted* endpoint) {
+            AutoResetEventHandle areHandle = endpoint->messageEvent;
+            int channelId = endpoint->channelId;
+
+            bool iflag = Processor.DisableInterrupts();
+            spinLock.Acquire();
+            bool lastRefGone;
+            try {
+                endpoint->refCount--;
+                lastRefGone = (endpoint->refCount == 0);
+            }
+            finally {
+                spinLock.Release();
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            if (lastRefGone && channelId > 0) {
+                // the entire channel is closed which we attribute to the closing of the Exp side
+                // (whose channelId is positive).
+                //
+                DebugStub.Assert(openChannelCount > 0,
+                                 "EndpointCore.cs: attempt to take open " +
+                                 "channel count negative");
+                openChannelCount--;
+                Tracing.Log(Tracing.Debug, "Entire channel is closed {0:x8}", (UIntPtr)(endpoint->self));
+            }
+
+            if (lastRefGone) {
+                endpoint->endpointUpdates.FreeResources();
+                EndpointTrusted.Delete(endpoint);
+            }
+
+            if (lastRefGone && areHandle.id != UIntPtr.Zero) {
+                // got the AutoResetEventHandle
+                Process.kernelProcess.ReleaseHandle(areHandle.id);
+            }
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// Performs the initialization of the core part of each endpoint and cross links
+        /// them to form a channel.
+        /// </summary>
+#if !PAGING
+        public static void Connect(
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ imp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ exp)
+        {
+          if (imp == null || exp == null)
+          {
+              throw new ApplicationException("Connect called with null endpoints");
+          }
+          Tracing.Log(Tracing.Debug, "connect {0:x8} and {1:x8}", (UIntPtr)imp, (UIntPtr)exp);
+
+          // keep track of how many channels are open
+          openChannelCount++;
+#if CHANNEL_COUNT
+          PerfCounters.IncrementChannelsCreated();
+#endif
+
+          EndpointCore* impData = (EndpointCore*)Allocation.GetData(imp);
+          EndpointCore* expData = (EndpointCore*)Allocation.GetData(exp);
+          if (impData == null || expData == null)
+          {
+              throw new ApplicationException("SharedHeap.GetData return null");
+          }
+          impData->Initialize(exp);
+          expData->Initialize(imp);
+          expData->channelId = ++channelIdGenerator;
+          impData->channelId = -1 * channelIdGenerator;
+          Monitoring.Log(Monitoring.Provider.EndpointCore,
+                         (ushort)EndpointCoreEvent.Connect, 0,
+                         (uint)expData->channelId, 0, 0, 0, 0);
+        }
+#else
+        public static void Connect(
+            EndpointTrusted* imp,
+            EndpointTrusted* exp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ userImp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ userExp)
+        {
+          if (imp == null || exp == null)
+          {
+              throw new ApplicationException("Connect called with null endpoints");
+          }
+          Tracing.Log(Tracing.Debug, "connect {0:x8} and {1:x8}", (UIntPtr)(imp->self), (UIntPtr)(exp->self));
+
+          // keep track of how many channels are open
+          openChannelCount++;
+
+          imp->Initialize(exp, userExp);
+          exp->Initialize(imp, userImp);
+          exp->channelId = ++channelIdGenerator;
+          imp->channelId = -1 * channelIdGenerator;
+          Monitoring.Log(Monitoring.Provider.EndpointCore,
+                         (ushort)EndpointCoreEvent.Connect, 0,
+                         (uint)exp->channelId, 0, 0, 0, 0);
+        }
+#endif //PAGING
+
+#if !PAGING
+        private void Initialize(Allocation* /*EndpointCore* opt(ExHeap)*/ myPeer)
+#else
+        // Careful: it seems that the allocator for trusted endpoints does not null
+        // memory!
+        private void Initialize(EndpointTrusted* myPeer,
+                                Allocation* /*EndpointCore* opt(ExHeap)*/ myUserPeer)
+#endif
+        {
+            //
+            // Create a new auto-reset event, and a handle in the kernel
+            // process to hold it.
+            //
+            this.messageEvent = new AutoResetEventHandle(
+                Process.kernelProcess.AllocateHandle(new AutoResetEvent(false)));
+            this.collectionEvent = new AutoResetEventHandle();
+
+            this.ownerProcessId = Thread.CurrentProcess.ProcessId;
+            this.ownerPrincipalHandle = new PrincipalHandle(Thread.CurrentProcess.Principal.Val);
+
+            this.closed = false;
+            //this.pinned = false;
+            this.receiveCount = 0;
+            this.channelId = 0; // set in the Connect for Exp
+            // IMPORTANT: Put peer allocations in separate list to avoid putting
+            // endpoints twice in the same list:
+#if !PAGING
+            this.peer =
+                SharedHeap.CurrentProcessSharedHeap.Share(myPeer,
+                    SharedHeap.CurrentProcessSharedHeap.EndpointPeerOwnerId,
+                    (UIntPtr)0,
+                    Allocation.GetSize(myPeer));
+#else
+            this.directPeerAllocation =
+                SharedHeap.CurrentProcessSharedHeap.Share(myUserPeer,
+                    SharedHeap.CurrentProcessSharedHeap.EndpointPeerOwnerId,
+                    (UIntPtr)0,
+                    Allocation.GetSize(myUserPeer));
+            // IMPORTANT: our update buffer must be as big as the peer endpoint,
+            //            not self.
+            endpointUpdates.Initialize(myUserPeer);
+            this.refCount++;
+            this.peer = myPeer;
+            SpinLock peerLock = spinLock;
+
+            // TODO: remove synchronization here; it looks useless
+            bool iflag = Processor.DisableInterrupts();
+            peerLock.Acquire();
+            try {
+                myPeer->refCount++;
+            }
+            finally {
+                peerLock.Release();
+                Processor.RestoreInterrupts(iflag);
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Set this end to closed
+        /// </summary>
+        public void Close() { this.closed = true; }
+
+        public bool Closed() { return this.closed; }
+
+#if PAGING
+        /// <summary>
+        /// The event to wait for messages on this endpoint. Used by Select.
+        /// </summary>
+        public SyncHandle GetWaitHandle() { return messageEvent; }
+#endif //PAGING
+
+        /// <summary>
+        /// Notify the owner of this endpoint that a message is ready.
+        /// Notifies the set owner if this endpoint is part of a set.
+        /// </summary>
+        private void Notify() {
+            this.receiveCount++;
+            Tracing.Log(Tracing.Debug, "Endpoint Notify");
+
+            // NB maf / Cache the collection event to prevent
+            // a race with the receiver.
+            AutoResetEventHandle cached_collEvent = this.collectionEvent;
+            if (cached_collEvent.id != UIntPtr.Zero) {
+                AutoResetEventHandle.Set(cached_collEvent);
+            }
+
+            AutoResetEventHandle.Set(this.messageEvent);
+        }
+
+        internal void NotifyPeer()
+        {
+            // commit the update record if necessary
+#if PAGING
+            if (ChannelSpansDomains) {
+                this.endpointUpdates.EndUpdate();
+            }
+            peer->Notify();
+#else
+            EndpointCore* peerData = (EndpointCore*)Allocation.GetData(this.peer);
+            peerData->Notify();
+#endif
+#if CHANNEL_COUNT
+            //Interlocked.Increment(ref messageCount);
+            PerfCounters.IncrementMsgsSent();
+#endif
+        }
+
+#if !PAGING
+        /// <summary>
+        /// Used internally by the kernel to transfer an endpoint to a new owner
+        /// Called from TRef's within the Kernel.
+        /// </summary>
+        /// The argument ep must be an endpoint.
+        public static Allocation* MoveEndpoint(SharedHeap fromHeap,
+                                               SharedHeap toHeap,
+                                               Process newOwner,
+                                               Allocation* ep)
+        {
+            // Only one heap on non-PAGING builds!
+            DebugStub.Assert(fromHeap == toHeap);
+
+            // Careful about the order.
+            // Since we don't know if this is a release (current process owns it)
+            // or an acquire (current process does not necessarily own it), we
+            // have to bypass the owner check here.
+            int processId = newOwner.ProcessId;
+            EndpointCore* epData = (EndpointCore*)Allocation.GetDataUnchecked(ep);
+            epData->ownerProcessId = processId;
+            epData->ownerPrincipalHandle = new PrincipalHandle(newOwner.Principal.Val);
+            Allocation.SetOwnerProcessId(ep, processId);
+            Allocation.SetOwnerProcessId(epData->peer, processId);
+            Monitoring.Log(Monitoring.Provider.EndpointCore,
+                           (ushort)EndpointCoreEvent.TransferToProcess, 0,
+                           (uint)epData->channelId, (uint)processId, 0, 0, 0);
+            return ep;
+        }
+#else
+        ///
+        /// Only performs the adjustments of the ownership of blocks,
+        /// No copies.
+        ///
+        private static void TransferToProcess(EndpointTrusted* ep,
+                                              Process p)
+        {
+            int processId = p.ProcessId;
+            ep->ownerProcessId = processId;
+            ep->ownerPrincipalHandle = new PrincipalHandle(p.Principal.Val);
+
+            // TODO: allocations should be process-local:
+            Allocation.SetOwnerProcessId(ep->self, processId);
+            Allocation.SetOwnerProcessId(ep->directPeerAllocation, processId);
+
+            Monitoring.Log(Monitoring.Provider.EndpointCore,
+                           (ushort)EndpointCoreEvent.TransferToProcess, 0,
+                           (uint)ep->channelId, (uint)processId, 0, 0, 0);
+        }
+
+        /// <summary>
+        /// Generic copy (either from kernel or to kernel)
+        /// Determines if the thing we are moving is an endpoint and copies it accordingly.
+        /// </summary>
+        private static SystemType EndpointCoreSystemType =
+            typeof(Microsoft.Singularity.V1.Services.EndpointCore).GetSystemType();
+
+        public static Allocation* MoveData(SharedHeap fromHeap, SharedHeap toHeap,
+                                           Process newOwner, Allocation* data)
+        {
+            if (data == null) return data;
+
+            if (!fromHeap.Validate(data)) {
+                throw new ArgumentException("Bad argument. Not visible");
+            }
+
+            // We can only transfer either into our out of the kernel's heap
+            DebugStub.Assert(fromHeap == SharedHeap.KernelSharedHeap ||
+                             toHeap == SharedHeap.KernelSharedHeap);
+
+            if (SystemType.IsSubtype(data, EndpointCoreSystemType))
+            {
+                // we have an endpoint
+                return MoveEndpoint(fromHeap, toHeap, newOwner, data);
+            }
+            else
+            {
+                // we have a NON-endpoint
+                return MoveNonEndpoint(fromHeap, toHeap, newOwner, data);
+            }
+        }
+        /// <summary>
+        /// Used internally by the kernel to transfer data that is NOT and endpoint
+        /// to a new owner
+        /// </summary>
+        private static Allocation* MoveNonEndpoint(SharedHeap fromHeap, SharedHeap toHeap,
+                                                   Process newOwner, Allocation* data)
+        {
+            // We can only transfer either into our out of the kernel's heap
+            DebugStub.Assert(fromHeap == SharedHeap.KernelSharedHeap ||
+                             toHeap == SharedHeap.KernelSharedHeap);
+
+            if (fromHeap != toHeap)
+            {
+                data = toHeap.Move(data, fromHeap, fromHeap.DataOwnerId, toHeap.DataOwnerId);
+            }
+
+            // update id's in kernel structure and who owns the blocks
+            Allocation.SetOwnerProcessId(data, newOwner.ProcessId);
+            return data;
+        }
+
+
+        /// <summary>
+        /// Used internally by the kernel to transfer and endpoint data to a new owner
+        ///
+        /// Must update channel structures if we change co-location of peers.
+        /// 1) if currently co-located and no longer co-located after move, must
+        ///    allocate new target proxies etc.
+        ///
+        /// 2) if we were not colocated and we are after the move, must join the proxies
+        ///    into a direct structure.
+        ///
+        /// </summary>
+        private static Allocation* MoveEndpoint(SharedHeap fromHeap, SharedHeap toHeap,
+                                                Process newOwner, Allocation* ep)
+        {
+            EndpointCore *epc = (EndpointCore*)Allocation.GetDataUnchecked(ep);
+            EndpointTrusted* ept = epc->Trusted;
+
+            if (ep != ept->self) {
+                // passed in ep only pretends to be an endpoint
+                DebugStub.Break();
+            }
+
+            // We can only transfer either into our out of the kernel's heap
+            DebugStub.Assert(fromHeap == SharedHeap.KernelSharedHeap ||
+                             toHeap == SharedHeap.KernelSharedHeap);
+
+            if (fromHeap != toHeap)
+            {
+                // First Copy Self
+                Allocation* epCopy = toHeap.ShallowCopy(ep,
+                                                        toHeap.EndpointOwnerId);
+                fromHeap.Free(ep, fromHeap.EndpointOwnerId);
+                ept->self = epCopy;
+
+
+                // Determine if we are going to be colocated or not:
+                Process peerProcess = Process.GetProcessByID(ept->Peer->ownerProcessId);
+                SharedHeap peerHeap = peerProcess.ProcessSharedHeap;
+
+                // Now deal with Peer
+                Allocation* peerAllocation = ept->directPeerAllocation;
+
+                if (peerHeap != toHeap)
+                {
+                    // After the move, we are not colocated with peer.
+                    // Copy peer proxy as well
+                    Allocation* peerCopy = toHeap.ShallowCopy(peerAllocation,
+                                                              toHeap.EndpointPeerOwnerId);
+
+                    fromHeap.Free(peerAllocation, fromHeap.EndpointPeerOwnerId);
+
+                    ept->directPeerAllocation = peerCopy;
+                }
+                else
+                {
+                    // assume peerHeap == toHeap
+
+                    // After the move, we are colocated with peer.
+                    // 1) Free peer proxy
+                    // 2) Point peer structures at actual peers rather than proxy
+                    fromHeap.Free(peerAllocation, fromHeap.EndpointPeerOwnerId);
+
+                    // Now comes a tricky unsafe part. There's a race in that we are
+                    // trying to share the peer structure, but that might be concurrently
+                    // decrementing its ref count.
+
+                    // TODO: look at shared heap implementation to guard against this.
+
+                    Allocation *truePeer = ept->Peer->self; // CAREFUL: We may not own this guy
+
+                    ept->directPeerAllocation =
+                        toHeap.Share(truePeer,
+                                     toHeap.EndpointPeerOwnerId,
+                                     UIntPtr.Zero,
+                                     Allocation.GetSize(truePeer));
+
+                    // Now we must also update the peer's directPeer to point to us
+                    // rather than the proxy!
+                    peerHeap.Free(ept->Peer->directPeerAllocation, peerHeap.EndpointPeerOwnerId);
+                    ept->Peer->directPeerAllocation =
+                        peerHeap.Share(epCopy,
+                                        peerHeap.EndpointPeerOwnerId,
+                                        UIntPtr.Zero,
+                                        Allocation.GetSize(epCopy));
+
+                    // Make peer process own this shared allocation
+                    Allocation.SetOwnerProcessId(ept->Peer->directPeerAllocation,
+                                                 peerProcess.ProcessId);
+                }
+            }
+
+            // update id's in kernel structure and who owns the blocks
+            TransferToProcess(ept, newOwner);
+            return ept->self;
+        }
+
+
+#endif //PAGING
+
+        public int ChannelId {
+            [NoHeapAllocation]
+            get { return this.channelId; }
+        }
+
+        public int ProcessId {
+            [NoHeapAllocation]
+            get {
+                return this.ownerProcessId;
+            }
+#if PAGING
+            set {
+                this.ownerProcessId = value;
+            }
+#endif
+        }
+
+        public int ReceiveCount
+        {
+            [NoHeapAllocation]
+            get { return this.receiveCount; }
+        }
+
+        /// <summary>
+        /// Used from ChannelDiagnostics module to access data it does not own
+        /// </summary>
+        public int PeerProcessId
+        {
+            [NoHeapAllocation]
+            get
+            {
+#if !PAGING
+                EndpointCore* peer = (EndpointCore*)Allocation.GetDataUnchecked(this.peer);
+                return peer->ownerProcessId;
+#else
+                return Peer->ownerProcessId;
+#endif
+            }
+        }
+
+        public PrincipalHandle PrincipalHandle {
+            [NoHeapAllocation]
+            get {
+                return ownerPrincipalHandle;
+            }
+#if PAGING
+            set {
+                this.ownerPrincipalHandle = value;
+            }
+#endif
+        }
+
+        public PrincipalHandle OwnerPrincipalHandle {
+            [NoHeapAllocation]
+            get {
+                return ownerPrincipalHandle;
+            }
+        }
+
+        public PrincipalHandle PeerPrincipalHandle
+        {
+            [NoHeapAllocation]
+            get
+            {
+#if !PAGING
+                EndpointCore* peer = (EndpointCore*)Allocation.GetDataUnchecked(this.peer);
+                return peer->ownerPrincipalHandle;
+#else
+                return peer->ownerPrincipalHandle;
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Used from ChannelDiagnostics module to access data it does not own
+        /// </summary>
+        public int PeerReceiveCount
+        {
+            [NoHeapAllocation]
+            get
+            {
+#if !PAGING
+                EndpointCore* peer = (EndpointCore*)Allocation.GetDataUnchecked(this.peer);
+                return peer->receiveCount;
+#else
+                return Peer->receiveCount;
+#endif
+            }
+        }
+
+#if PAGING
+        public void LinkIntoCollection(AutoResetEventHandle ev) {
+            this.collectionEvent = ev;
+        }
+
+        public void UnlinkFromCollection(AutoResetEventHandle ev) {
+            this.collectionEvent = new AutoResetEventHandle();
+        }
+
+        internal void BeginUpdate(byte* basep, byte* source,
+                                  int* tagAddress, int size) {
+            endpointUpdates.BeginUpdate(basep, source, tagAddress, size);
+        }
+
+        unsafe internal void MarshallPointer(byte* basep, void** target, SystemType type)
+        {
+            endpointUpdates.MarshallPointer(basep, target, type,
+                                            Process.GetProcessByID(peer->ownerProcessId));
+        }
+
+#endif
+
+    }
+
+#if PAGING
+    [CLSCompliant(false)]
+    unsafe public struct EndpointUpdate
+    {
+        // Each EndpointUpdate points to a message and tag in the
+        // data area of the EndpointUpdates.  The tag is always
+        // a 32-bit word.
+        internal ushort msgOffset;
+        internal ushort msgSize; // message size in bytes
+        internal ushort tagOffset;
+        internal ushort ptrToMarshallOffset0;
+        internal ushort ptrToMarshallOffset1;
+        internal ushort ptrToMarshallOffset2;
+
+        public void Init(ushort msgOffset, ushort msgSize, ushort tagOffset)
+        {
+            this.msgOffset = msgOffset;
+            this.msgSize = msgSize;
+            this.tagOffset = tagOffset;
+            this.ptrToMarshallOffset0 = 0;
+            this.ptrToMarshallOffset1 = 0;
+            this.ptrToMarshallOffset2 = 0;
+        }
+
+        public void AddMarshallOffset(ushort ptrOffset)
+        {
+            DebugStub.Assert(ptrOffset != 0);
+
+            // There's only space for three pointers in out buffer
+            if (ptrToMarshallOffset0 == 0) {
+                ptrToMarshallOffset0 = ptrOffset;
+                return;
+            }
+            if (ptrToMarshallOffset1 == 0) {
+                ptrToMarshallOffset1 = ptrOffset;
+                return;
+            }
+            if (ptrToMarshallOffset2 == 0) {
+                ptrToMarshallOffset2 = ptrOffset;
+                return;
+            }
+            // out of marshall pointer locations
+            DebugStub.Assert(false);
+        }
+
+        public void CopyData(byte* source,
+                             byte* dest)
+        {
+            Buffer.MoveMemory(dest + msgOffset,
+                              source + msgOffset,
+                              (int)(msgSize));
+
+            *((int*)(dest + tagOffset)) = *((int*)(source + tagOffset));
+        }
+
+        private static void MarshallPointer(byte* source,
+                                            byte* dest,
+                                            ref ushort offsetRef)
+        {
+            ushort offset = offsetRef;
+
+            if (offset == 0) return; // unused
+
+            Allocation** srcptr = (Allocation**)(source + offset);
+
+            // update the pointer in the kernel space
+            *srcptr = EndpointTrusted.MoveData(SharedHeap.KernelSharedHeap,
+                                               Thread.CurrentProcess.ProcessSharedHeap,
+                                               Thread.CurrentProcess,
+                                               *srcptr);
+            offsetRef = 0; // mark unused
+        }
+        public void MarshallAndCopyData(byte* source,
+                                        byte* dest)
+        {
+            // Marshall in kernel space
+            MarshallPointer(source, dest, ref ptrToMarshallOffset0);
+            MarshallPointer(source, dest, ref ptrToMarshallOffset1);
+            MarshallPointer(source, dest, ref ptrToMarshallOffset2);
+
+            CopyData(source, dest);
+        }
+
+    }
+
+    [CLSCompliant(false)]
+    unsafe public struct EndpointUpdates
+    {
+        // The buffer holds two areas:
+        //   - Endpoint data (same layout as Endpoint)
+        //   - EndpointUpdate values (one for each word in the data)
+        private Allocation* buffer;
+        private int pending; // number of currently pending updates
+        private EndpointUpdate* updates; // interior pointer into buffer.data
+        private EndpointUpdate current; // currently being constructed
+
+        internal void BeginUpdate(byte* basep, byte* source,
+                                  int* tagAddress, int size)
+        {
+            DebugStub.Assert(source >= basep);
+
+            DebugStub.Assert(source - basep < 0x10000);
+            DebugStub.Assert(0 <= size && size < 0x10000);
+            DebugStub.Assert((byte*)tagAddress >= basep);
+            DebugStub.Assert((byte*)tagAddress - basep < 0x10000);
+
+            ushort msgOffset = (ushort)(source-basep);
+            ushort msgSize = (ushort)size;
+            ushort tagOffset = (ushort)((byte*)tagAddress-basep);
+
+            this.current.Init(msgOffset, msgSize, tagOffset);
+
+            this.current.CopyData(basep, GetBufferData());
+        }
+
+        internal void EndUpdate() {
+            this.Add(this.current);
+        }
+
+        unsafe internal void MarshallPointer(byte* basep, void** target, SystemType type,
+                                             Process newOwner)
+        {
+            long offset = (byte*)target-basep;
+
+            DebugStub.Assert(offset < 0x10000);
+
+            byte* kernelBuffer = GetBufferData();
+            Allocation** dstPtr = ((Allocation**)(kernelBuffer+offset));
+            Allocation* userPtr = *dstPtr;
+            SharedHeap.CurrentProcessSharedHeap.Validate(userPtr);
+
+            // Validate that pointer passed is of the required type
+            if (!SystemType.IsSubtype(userPtr, type)) {
+                // Trusted marshaller thinks we are supposed to pass something other
+                // than the user passed.
+                DebugStub.Break();
+            }
+
+            // Copy it into the kernel space and update the pointer
+            // in the kernel space buffer
+            *dstPtr = EndpointTrusted.MoveData(
+                Thread.CurrentProcess.ProcessSharedHeap,
+                SharedHeap.KernelSharedHeap,
+                newOwner,
+                userPtr);
+
+            this.current.AddMarshallOffset( (ushort)offset );
+        }
+
+        internal void Initialize(Allocation* endpoint)
+        {
+            UIntPtr size = Allocation.GetSize(endpoint);
+            DebugStub.Assert(size < 0x10000); // must fit in ushort
+
+            // TODO: it would be better not to allocate an allocation record here:
+            buffer = SharedHeap.KernelSharedHeap.Allocate(
+                size + 10*sizeof(EndpointUpdate), // allocate endpoint plus 10 update records
+                typeof(EndpointUpdate).GetSystemType().TypeId,
+                0,
+                SharedHeap.KernelSharedHeap.DataOwnerId);
+            Allocation.SetOwnerProcessId(buffer, Process.kernelProcess.ProcessId);
+            pending = 0;
+            updates = (EndpointUpdate*) (GetBufferData() + (int)size);
+        }
+
+        internal void FreeResources()
+        {
+            SharedHeap.KernelSharedHeap.Free(buffer, SharedHeap.KernelSharedHeap.DataOwnerId);
+        }
+
+
+        public Allocation* GetBuffer()
+        {
+            return buffer;
+        }
+
+        public byte* GetBufferData()
+        {
+            return (byte*) Allocation.GetDataUnchecked(buffer);
+        }
+
+        // Add an update to the buffer.
+        // The data pointed to by the update should already be in "buffer".
+        // Called in the sender's thread.
+        public void Add(EndpointUpdate update)
+        {
+            // MULTIPROCESSOR NOTE: tricky concurrency between sender and receiver
+            int n = pending;
+            DebugStub.Assert(updates + (n + 1) <=
+                GetBufferData() + (int)(Allocation.GetSize(buffer)));
+
+            while (true) {
+                *(updates + n) = update;
+                int old = Interlocked.CompareExchange(ref pending, n + 1, n);
+                if (old == n) {
+                    break;
+                }
+                // Receiver just flushed the updates and didn't see ours, so
+                // put the update at index 0.
+                DebugStub.Assert(old == 0);
+                n = 0;
+            }
+        }
+
+        /*
+        public void Add(byte* msgPtr, int msgSize, byte* tagPtr)
+        {
+            byte* data = GetBufferData();
+            DebugStub.Assert(msgPtr >= data);
+            DebugStub.Assert(msgPtr - data < 0x10000);
+            DebugStub.Assert(0 <= msgSize && msgSize < 0x10000);
+            DebugStub.Assert(tagPtr >= data);
+            DebugStub.Assert(tagPtr - data < 0x10000);
+            Add(new EndpointUpdate(
+                (ushort)(msgPtr - data),
+                (ushort)msgSize,
+                (ushort)(tagPtr - data            DebugStub.Assert(msgPtr >= data);
+            DebugStub.Assert(msgPtr - data < 0x10000);
+            DebugStub.Assert(0 <= msgSize && msgSize < 0x10000);
+            DebugStub.Assert(tagPtr >= data);
+            DebugStub.Assert(tagPtr - data < 0x10000);
+)));
+        }
+        */
+
+        // Flush all pending updates into the destination Endpoint.
+        // Called in the receiver's thread.
+        public void Fetch(Allocation* destEp)
+        {
+            // MULTIPROCESSOR NOTE: tricky concurrency between sender and receiver
+            int n = pending;
+            int i = 0;
+            while (i < n) {
+                for (; i < n; i++) {
+                    (updates + i)->MarshallAndCopyData(GetBufferData(),
+                                                       (byte*) (Allocation.GetData(destEp)));
+                }
+                // We've delivered all the updates that we know of (n==i),
+                // so try to change pending from n to 0.  If this succeeds,
+                // n will stay the same (n==i).  Otherwise, n will be a more
+                // recent value of pending (n>i).
+                n = Interlocked.CompareExchange(ref pending, 0, n);
+            }
+        }
+    }
+
+    // The portion of the endpoint that is untrusted and may
+    // contain random garbage.
+    [CLSCompliant(false)]
+    [CCtorIsRunDuringStartup]
+    unsafe public struct EndpointCore
+    {
+        private EndpointTrusted* id;
+
+        [NoHeapAllocation]
+        internal EndpointCore(EndpointTrusted* trusted)
+        {
+            this.id = trusted;
+        }
+
+        internal EndpointTrusted* Trusted {
+            [NoHeapAllocation]
+            get {
+                return id;
+            }
+        }
+
+        private static EndpointTrusted* AllocationTrusted(
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ endpoint)
+        {
+            return ((EndpointCore*)Allocation.GetData(endpoint))->Trusted;
+        }
+
+        public static int OpenChannelCount { get { return EndpointTrusted.OpenChannelCount; } }
+
+        ///
+        /// Closes this end of the channel and frees associated resources, EXCEPT the block
+        /// of memory for this endpoint. It must be released by the caller. Sing# does this
+        /// for the programmer.
+        ///
+        /// This runs in the kernel to avoid a race condition with Process.Stop.
+        public static void Dispose(ref EndpointCore endpoint) {
+            EndpointTrusted.Dispose(endpoint.Trusted);
+        }
+
+        /// <summary>
+        /// Explicitly frees this end of the channel. If other end is also
+        /// freed, the channel is deallocated, meaning we have to deallocate
+        /// the kernel handles for the auto reset events.
+        /// Since both threads on the channel could try to do this simultaneously,
+        /// we use the ref counting on the underlying endpoints to let the last
+        /// free operation (the one pulling the ref count to 0) to free the associated
+        /// event.
+        /// </summary>
+        public static void Free(Allocation* /*EndpointCore* opt(ExHeap)!*/ endpoint) {
+            EndpointTrusted.Free(AllocationTrusted(endpoint));
+        }
+
+        /// <summary>
+        /// Performs the initialization of the core part of each endpoint and cross links
+        /// them to form a channel.
+        /// </summary>
+        public static void Connect(
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ imp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ exp)
+        {
+            // TODO: allocate handle in local process handle table
+            //Process process = Thread.CurrentProcess;
+            Process process = Process.kernelProcess;
+            EndpointTrusted *impEp = EndpointTrusted.New(imp);
+            EndpointTrusted *expEp = EndpointTrusted.New(exp);
+            EndpointCore *impCore = (EndpointCore*)Allocation.GetData(imp);
+            EndpointCore *expCore = (EndpointCore*)Allocation.GetData(exp);
+            impCore->id = impEp;
+            expCore->id = expEp;
+            EndpointTrusted.Connect(impEp, expEp, imp, exp);
+        }
+
+        /// <summary>
+        /// Set this end to closed
+        /// </summary>
+        public void Close() { Trusted->Close(); }
+
+        public bool Closed() { return Trusted->Closed(); }
+
+        public bool PeerClosed() {
+            // make sure to flush updates from peer into this endpoint
+            Trusted->Peer->FlushTo(Trusted->Self);
+            return Trusted->Peer->Closed();
+        }
+
+        /// <summary>
+        /// Return a handle for the peer
+        /// </summary>
+        public Allocation* Peer(out bool marshall) {
+            Allocation* peerAlloc = Trusted->DirectPeerAllocation(out marshall);
+            return peerAlloc;
+        }
+
+        /// <summary>
+        /// The event to wait for messages on this endpoint. Used by Select.
+        /// </summary>
+        public SyncHandle GetWaitHandle() { return Trusted->GetWaitHandle(); }
+
+        /// <summary>
+        /// Notify the peer of this endpoint that a message is ready.
+        /// Notifies the set owner if this endpoint is part of a set.
+        /// </summary>
+        public void NotifyPeer() {
+            Trusted->NotifyPeer();
+        }
+
+        /// <summary>
+        /// Used internally by the kernel to transfer an endpoint to a new owner
+        ///
+        /// Can be used to transfer ANY kind of shared heap data, not just endpoints.
+        /// </summary>
+        /// The argument ep must be an endpoint.
+        public static Allocation* MoveEndpoint(SharedHeap fromHeap, SharedHeap toHeap,
+                                               Process newOwner, Allocation *ep)
+        {
+            return EndpointTrusted.MoveData(fromHeap, toHeap, newOwner, ep);
+        }
+
+        /// <summary>
+        /// Transfer the given Allocation block to the target endpoint
+        /// </summary>
+        // TODO: change "ref EndpointCore" to "EndpointCore"
+        // TODO: rethink this operation
+        public static void TransferBlockOwnership(Allocation* ptr, ref EndpointCore target)
+        {
+            Monitoring.Log(Monitoring.Provider.ChannelService,
+                           (ushort)ChannelServiceEvent.TransferBlockOwnership, 0,
+                           (uint)target.Trusted->ChannelId, (uint)target.Trusted->ProcessId,
+                           0, 0, 0);
+            Allocation.SetOwnerProcessId(ptr, target.Trusted->ProcessId);
+        }
+
+        /// <summary>
+        /// Transfer any contents that needs to be adjusted from the transferee to the target
+        /// endpoint. Currently, this means setting the ownerProcessId of the
+        /// transferee to that of the target.
+        /// </summary>
+        // TODO: change "ref EndpointCore" to "EndpointCore"
+        public static void TransferContentOwnership(
+           ref EndpointCore transferee,
+           ref EndpointCore target)
+        {
+            Monitoring.Log(Monitoring.Provider.ChannelService,
+                           (ushort)ChannelServiceEvent.TransferContentOwnership, 0,
+                           (uint)transferee.Trusted->ProcessId,
+                           (uint)target.Trusted->ProcessId,
+                           (uint)transferee.Trusted->ChannelId,
+                           (uint)target.Trusted->ChannelId,
+                           (uint)target.Trusted->Peer->ChannelId);
+
+            EndpointTrusted* ept = transferee.Trusted;
+            int toProcessId = target.Trusted->ProcessId;
+            PrincipalHandle toPrincipalHandle = target.Trusted->PrincipalHandle;
+            ept->ProcessId = toProcessId;
+            ept->PrincipalHandle = toPrincipalHandle;
+            // also transfer the peer allocation
+            Allocation.SetOwnerProcessId(ept->directPeerAllocation, toProcessId);
+        }
+
+        public int ChannelId
+        {
+            [NoHeapAllocation]
+            get { return Trusted->ChannelId; }
+        }
+        public int ProcessId
+        {
+            [NoHeapAllocation]
+            get { return Trusted->ProcessId; }
+        }
+        public int ReceiveCount
+        {
+            get { return Trusted->ReceiveCount; }
+        }
+        public int PeerProcessId
+        {
+            [NoHeapAllocation]
+            get { return Trusted->PeerProcessId; }
+        }
+        public PrincipalHandle OwnerPrincipalHandle
+        {
+            [NoHeapAllocation]
+            get { return Trusted->OwnerPrincipalHandle; }
+        }
+        public PrincipalHandle PeerPrincipalHandle
+        {
+            [NoHeapAllocation]
+            get { return Trusted->PeerPrincipalHandle; }
+        }
+        public int PeerReceiveCount
+        {
+            [NoHeapAllocation]
+            get { return Trusted->PeerReceiveCount; }
+        }
+
+        public void LinkIntoCollection(AutoResetEventHandle ev) {
+            Trusted->LinkIntoCollection(ev);
+        }
+
+        public void UnlinkFromCollection(AutoResetEventHandle ev) {
+            Trusted->UnlinkFromCollection(ev);
+        }
+
+        internal void BeginUpdate(byte* basep, byte* source,
+                                  int* tagAddress, int size) {
+            Trusted->BeginUpdate(basep, source, tagAddress, size);
+        }
+
+        unsafe public void MarshallPointer(byte* basep, void** target, SystemType type)
+        {
+            if (target == null) return;
+            Trusted->MarshallPointer(basep, target, type);
+        }
+    }
+#endif
+}
+
diff --git a/base/Kernel/Singularity/Channels/ISelectable.sg b/base/Kernel/Singularity/Channels/ISelectable.sg
new file mode 100644
index 0000000..b7d5fb5
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/ISelectable.sg
@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Selectable.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+using System;
+#if ENDPOINT_STRUCT
+using Microsoft.Singularity.V1.Threads;
+#else
+using System.Threading;
+#endif
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Channels {
+
+    [AttributeUsage(AttributeTargets.Method)]
+    public class SelectableAttribute : Attribute {
+      public SelectableAttribute(int tag) {}
+    }
+    
+    
+    [CLSCompliant(false)]
+    public interface ISelectable : IBorrowed {
+
+        /// <summary>
+        /// Tests if the message at the head of the queue matches the given tag. If so,
+        /// returns true.
+        ///
+        /// If no match is possible in the future given the current message, possible must
+        /// be set to false. 
+        /// Implementations are disallowed from setting possible to true
+        /// so that the context can chain them.
+        ///
+        /// If the underlying object is an endpoint set, it also returns an object that
+        /// serves to extract the endpoint having the match from the set later.
+        ///
+        /// Again, implementations are disallowed from setting match setMatch to null
+        /// so that the context can chain the calls.
+        ///
+        /// </summary>
+        bool HeadMatches(int tag, ref bool possible, ref object setMatch);
+        
+        /// <summary>
+        /// Allow the context to get a handle to wait on an event for this object
+        /// </summary>
+        #if ENDPOINT_STRUCT
+        SyncHandle GetWaitHandle();
+        #else
+        WaitHandle GetWaitHandle();
+        #endif
+
+        /// <summary>
+        /// Reset the associated event to avoid spurious wake-ups. This is called by
+        /// Select prior to scanning the state of the ISelectable object.
+        /// </summary>
+        void ResetWaitSignal();
+    }
+
+
+    [CLSCompliant(false)]
+    public interface IEventCollectionElement : ISelectable, ITracked {
+
+        /// <summary>
+        /// Instruct the selectable object to signal events on the given AutoResetEvent
+        /// rather than its normal event in order to aggregate signalling into a set.
+        /// A selectable object need only support being part of a single collection at
+        /// any point in time.
+        /// </summary>
+        #if ENDPOINT_STRUCT
+        void LinkIntoCollection(AutoResetEventHandle ev);
+        #else
+        void LinkIntoCollection(AutoResetEvent ev);
+        #endif
+
+        /// <summary>
+        /// Instruct the selectable object to stop signalling events on the given
+        /// AutoResetEvent.
+        /// </summary>
+        #if ENDPOINT_STRUCT
+        void UnlinkFromCollection(AutoResetEventHandle ev);
+        #else
+        void UnlinkFromCollection(AutoResetEvent ev);
+        #endif
+    }
+}
diff --git a/base/Kernel/Singularity/Channels/ITracked.cs b/base/Kernel/Singularity/Channels/ITracked.cs
new file mode 100644
index 0000000..508a1be
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/ITracked.cs
@@ -0,0 +1,81 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ITracked.cs
+//
+//  Note: File is part of Sing# runtime files and copied into Singularity tree
+//        whenever a new version of Sing# is dropped.
+//
+
+using System;
+
+namespace Microsoft.SingSharp {
+  /// <summary>
+  /// ITracked is a marker interface that marks a GC type as linearly tracked.
+  /// 
+  /// Upcasts of a class C deriving from ITracked are only allowed if 
+  /// a) the target also derives from ITracked, in which case linear tracking continues, or
+  /// b) the target is an interface deriving from IBorrowed. In this case, the resulting value
+  ///    is prevented from escaping the static scope it is in. The checker must make sure that the
+  ///    original tracked object isn't used until the borrowed reference dies.
+  ///  By default, any parameter of type ITracked is treated as borrowed, meaning that it must
+  ///  be owned on entry and ownership is returned on exit.
+  ///
+  ///  By default, any out parameter or return value of type ITracked is interpreted as passing fresh
+  ///  ownership from callee to caller.
+  ///
+  ///  The only overrides needed are for parameters that claim ownership. The Claims attribute below serves
+  ///  that purpose.
+  /// </summary>
+  public interface ITracked {
+    
+    /// <summary>
+    /// Called when a thread releases a tracked object so it can be acquired by another thread.
+    /// Gives implementor of tracked type chance to
+    /// know that current thread no longer owns this tracked resource
+    ///
+    /// Normal clients should not call this method.
+    /// </summary>
+    void Release();
+
+    /// <summary>
+    /// Called when a thread acquired a tracked object not owned by it. Gives implementor of tracked type chance to
+    /// know that current thread now owns this tracked resource.
+    ///
+    /// Note, this method cannot block.
+    ///
+    /// Normal clients should not call this method.
+    /// </summary>
+    void Acquire();
+
+    /// <summary>
+    /// Called to delete the associated resource.
+    /// </summary>
+    void Dispose();
+
+    /// <summary>
+    /// This is a marker method called at the beginning of expose blocks.
+    /// Expose blocks provide scoped access to the tracked fields of tracked objects.
+    /// </summary>
+    void Expose();
+
+    /// <summary>
+    /// This is a marker method called at the end of an expose blocks.
+    /// Expose blocks provide scoped access to the tracked fields of tracked objects.
+    /// </summary>
+    void UnExpose();
+  }
+
+
+  /// <summary>
+  /// Marker interface for interfaces that custom heap pointers can be boxed to, while
+  /// preventing the loss of ownership tracking.
+  /// Upcasts from an interface deriving from IBorrowed are only allowed if target interface
+  /// also derives from IBorrowed.
+  /// </summary>
+  public interface IBorrowed {
+  }
+}
diff --git a/base/Kernel/Singularity/Channels/RuntimeSystemType.cs b/base/Kernel/Singularity/Channels/RuntimeSystemType.cs
new file mode 100644
index 0000000..595ad17
--- /dev/null
+++ b/base/Kernel/Singularity/Channels/RuntimeSystemType.cs
@@ -0,0 +1,168 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RuntimeSystemType.cs
+//
+//  Note: Represents system wide types. They live in the Kernel GC heap and are
+//        mapped to via handles from type Singularity.V1.SystemType
+//
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Channels {
+
+    public class RuntimeSystemType {
+
+        private struct MD5TypeEntry : IComparable
+        {
+            public readonly string name;
+            public readonly long lowerHash;
+            public readonly long upperHash;
+
+            public MD5TypeEntry(string name) : this(name, 0, 0) {}
+
+            public MD5TypeEntry(string name, long lower, long upper) {
+                this.name = name;
+                this.lowerHash = lower;
+                this.upperHash = upper;
+            }
+
+            int IComparable.CompareTo(object o2)
+            {
+                MD5TypeEntry m2 = (MD5TypeEntry)o2;
+
+                if (upperHash < m2.upperHash) {
+                    return -1;
+                }
+                else if (upperHash > m2.upperHash) {
+                    return 1;
+                }
+                else if (lowerHash < m2.lowerHash) {
+                    return -1;
+                }
+                else if (lowerHash > m2.lowerHash) {
+                    return 1;
+                }
+                return this.name.CompareTo(m2.name);
+
+#if false
+                long d1 = unchecked(this.upperHash - m2.upperHash);
+
+                if (d1 == 0) {
+                    long d2 = unchecked(this.lowerHash - m2.lowerHash);
+                    if (d2 == 0) return 0;
+                    if (d2 < 0) return -1;
+                    return +1;
+                }
+                if (d1 < 0) return -1;
+                return +1;
+#endif
+
+            }
+        }
+
+        private MD5TypeEntry hash;
+        private RuntimeSystemType parent;
+        private UIntPtr handle;
+
+        [Conditional("DEBUG_RUNTIME_SYSTEM_TYPE_TREE")]
+        [CLSCompliant(false)]
+        public static void DebugLine(String format, __arglist)
+        {
+            DebugStub.WriteLine(format, new ArgIterator(__arglist));
+        }
+
+        private RuntimeSystemType(RuntimeSystemType parent, MD5TypeEntry hash)
+        {
+            this.hash = hash;
+            this.parent = parent;
+        }
+
+        private static UIntPtr RootHandle;
+
+        static RuntimeSystemType()
+        {
+            RootHandle = RuntimeSystemType.For(null, new MD5TypeEntry("System.Object"));
+        }
+
+        private static UIntPtr For(RuntimeSystemType parent, MD5TypeEntry hash)
+        {
+            RuntimeSystemType rts = new RuntimeSystemType(parent, hash);
+
+            // IMPORTANT we need to allocate these handles to the kernel, since
+            // they are stored in shared heap object headers that move from process
+            // to process.
+            rts.handle = Process.kernelProcess.AllocateHandle(rts);
+
+            // TODO: Figure out how to collect them
+            //
+            return rts.handle;
+        }
+
+
+        public long Hash0 { get { return this.hash.lowerHash; } }
+        public long Hash1 { get { return this.hash.upperHash; } }
+
+        internal static UIntPtr GetRootHandle()
+        {
+            return RootHandle;
+        }
+
+        private SortedList ChildHandles = new SortedList();
+
+        internal UIntPtr LookupChildHandle(string name, long lowerHash, long upperHash)
+        {
+            MD5TypeEntry childhash = new MD5TypeEntry(name, lowerHash, upperHash);
+
+            object childBox = this.ChildHandles[childhash];
+            if (childBox == null) {
+                UIntPtr child = RuntimeSystemType.For(this, childhash);
+                this.ChildHandles.Add(childhash, child);
+                DebugLine("RST.LookupChild({0}.{1:x16}{2:x16}) => {3:x8}",
+                          __arglist(name, lowerHash, upperHash, child));
+                return child;
+            }
+            else {
+                DebugLine("RST.LookupChild({0}.{1:x16}{2:x16}) => {3:x8}",
+                          __arglist(name, lowerHash, upperHash, (UIntPtr)childBox));
+                return (UIntPtr)childBox;
+            }
+
+        }
+
+        internal bool IsSubtype(UIntPtr candidateHandle)
+        {
+            if (candidateHandle == UIntPtr.Zero) {
+                DebugLine("RST.IsSubType {0:x8} of {1:x8} => false",
+                          __arglist(candidateHandle, handle));
+                return false;
+            }
+
+            RuntimeSystemType candidate = HandleTable.GetHandle(candidateHandle) as RuntimeSystemType;
+            if (candidate == null) {
+                DebugLine("RST.IsSubType {0:x8} of {1:x8} => false",
+                          __arglist(candidateHandle, handle));
+                return false;
+            }
+
+            RuntimeSystemType current = this;
+            while (current != null) {
+                if (current == candidate) {
+                    DebugLine("RST.IsSubType {0:x8} of {1:x8} => true",
+                              __arglist(candidateHandle, handle));
+                    return true;
+                }
+                current = current.parent;
+            }
+            DebugLine("RST.IsSubType {0:x8} of {1:x8} => false",
+                      __arglist(candidateHandle, handle));
+            return false;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/CpuInfo.cs b/base/Kernel/Singularity/CpuInfo.cs
new file mode 100644
index 0000000..0a66504
--- /dev/null
+++ b/base/Kernel/Singularity/CpuInfo.cs
@@ -0,0 +1,63 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity
+{
+    /// <remarks> Per-Processor configuration state. </remarks>
+    [StructLayout(LayoutKind.Sequential, Pack=4)]
+    [CLSCompliant(false)]
+    public struct CpuInfo
+    {
+        // Gdt Pointer
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTP   GdtPtr;
+
+        // Base GDT
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtNull;
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtRS;  // Real mode stack
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtRC;  // Real mode code
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtPC;  // Protected mode code (ring 0) : 1 of 4 for SYSENTER
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtPD;  // Protected mode data (ring 0) : 2 of 4 for SYSENTER
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtUC;  // Protected mode code (ring 3) : 3 of 4 for SYSENTER
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtUD;  // Protected mode data (ring 3) : 4 of 4 for SYSENTER
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtPF;  // FS Register
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtPG;  // GS Register
+        [AccessedByRuntime("referenced in c++")]
+        internal X86.GDTE   GdtTSS; // TSS
+
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       GdtEnd;
+
+        // FS and GS hold processor context and thread respectively
+        [AccessedByRuntime("referenced in c++")]
+        internal UIntPtr    Fs32;
+        [AccessedByRuntime("referenced in c++")]
+        internal UIntPtr    Gs32;
+
+        // Only valid for processors started after bootstrap
+        [AccessedByRuntime("referenced in c++")]
+        internal UIntPtr    KernelStackBegin;
+        [AccessedByRuntime("referenced in c++")]
+        internal UIntPtr    KernelStack;
+        [AccessedByRuntime("referenced in c++")]
+        internal UIntPtr    KernelStackLimit;
+
+        // Id number {0, 1, ..., Procs-1}
+        [AccessedByRuntime("referenced in c++")]
+        internal uint       ProcessorId;
+    }
+}
diff --git a/base/Kernel/Singularity/DebugStub.cs b/base/Kernel/Singularity/DebugStub.cs
new file mode 100644
index 0000000..a23afe2
--- /dev/null
+++ b/base/Kernel/Singularity/DebugStub.cs
@@ -0,0 +1,510 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Debug.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.X86;
+
+namespace Microsoft.Singularity
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class DebugStub
+    {
+        public static ulong perfCounter0;
+        public static ulong perfCounter1;
+        public static ulong perfCounter2;
+        public static ulong perfCounter3;
+        public static ulong perfCounter4;
+        public static ulong perfCounter5;
+        public static ulong perfCounter6;
+        public static ulong perfCounter7;
+        public static ulong perfCounter8;
+        public static ulong perfCounter9;
+        public static ulong perfCounter10;
+        public static ulong perfCounter11;
+        public static ulong perfCounter12;
+        public static ulong perfCounter13;
+        public static ulong perfCounter14;
+        public static ulong perfCounter15;
+
+        /////////////////////////////////////////////////////// Print Methods.
+        //
+        [NoHeapAllocation]
+        public static void Print(byte value)
+        {
+            Print("{0:x2}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(ushort value)
+        {
+            Print("{0:x4}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(uint value)
+        {
+            Print("{0:x8}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(ulong value)
+        {
+            Print("{0:x}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(UIntPtr value)
+        {
+            Print("{0:x8}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(sbyte value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(short value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(int value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(long value)
+        {
+            Print("{0}", __arglist(value));
+        }
+
+        [NoHeapAllocation]
+        public static void Print(String value)
+        {
+            if (value != null) {
+                Print(value, new ArgIterator());
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void Print(String format, __arglist)
+        {
+            Print(format, new ArgIterator(__arglist));
+        }
+
+        [NoHeapAllocation]
+        public static unsafe void Print(String format, ArgIterator args)
+        {
+            char *buffer;
+            int length;
+            int used = 0;
+
+            PrintBegin(out buffer, out length);
+            try {
+                if (buffer != null) {
+                    used = String.LimitedFormatTo(format, args, buffer, length);
+                }
+            }
+            finally {
+                PrintComplete(buffer, used);
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void Write(String value)
+        {
+            if (value != null) {
+                Write(value, new ArgIterator());
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void Write(String format, __arglist)
+        {
+            Print(format, new ArgIterator(__arglist));
+        }
+
+        [NoHeapAllocation]
+        public static unsafe void Write(String format, ArgIterator args)
+        {
+            char *buffer;
+            int length;
+            int used = 0;
+
+            PrintBegin(out buffer, out length);
+            try {
+                if (buffer != null) {
+                    used = String.LimitedFormatTo(format, args, buffer, length);
+                }
+            }
+            finally {
+                PrintComplete(buffer, used);
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void WriteLine()
+        {
+            WriteLine("", new ArgIterator());
+        }
+
+        [NoHeapAllocation]
+        public static void WriteLine(String value)
+        {
+            if (value != null) {
+                WriteLine(value, new ArgIterator());
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void WriteLine(String format, __arglist)
+        {
+            WriteLine(format, new ArgIterator(__arglist));
+        }
+
+        [NoHeapAllocation]
+        public static unsafe void WriteLine(String format, ArgIterator args)
+        {
+            char *buffer;
+            int length;
+            int used = 0;
+
+            PrintBegin(out buffer, out length);
+            try {
+                if (buffer != null) {
+                    used = String.LimitedFormatTo(format, args, buffer, length);
+                    if (used < length) {
+                        buffer[used++] = '\n';
+                    }
+                }
+            }
+            finally {
+                PrintComplete(buffer, used);
+            }
+        }
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(610)]
+        [NoHeapAllocation]
+        public static extern unsafe void PrintBegin(out char * buffer, out int length);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(610)]
+        [NoHeapAllocation]
+        public static extern unsafe void PrintComplete(char * buffer, int used);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(610)]
+        [NoHeapAllocation]
+        public static extern unsafe void Print(char *buffer);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(610)]
+        [NoHeapAllocation]
+        public static extern unsafe void Print(char *buffer, int length);
+
+        ////////////////////////////////////////////////////// Assert Methods.
+        //
+        [NoHeapAllocation]
+        public static void NotImplemented()
+        {
+            failAssert("Not implemented.");
+        }
+
+        [NoHeapAllocation]
+        public static void NotImplemented(String msg)
+        {
+            failAssert("Not implemented: {0}", __arglist(msg));
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void NotReached()
+        {
+            failAssert("Unreachable code reached.");
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void NotReached(String msg)
+        {
+            failAssert("Unreachable code reached: ", __arglist(msg));
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        [ManualRefCounts]
+        public static void Assert(bool expr)
+        {
+            if (!expr) {
+                failAssert(null);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        [ManualRefCounts]
+        public static void Deny(bool expr)
+        {
+            if (expr) {
+                failAssert(null);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        [ManualRefCounts]
+        public static void Assert(bool expr, String s)
+        {
+            if (!expr) {
+                failAssert(s);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void Deny(bool expr, String s)
+        {
+            if (expr) {
+                failAssert(s);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        [ManualRefCounts]
+        public static void Assert(bool expr, String format, __arglist)
+        {
+            if (!expr) {
+                failAssert(format, new ArgIterator(__arglist));
+            }
+        }
+
+        [Conditional("DEBUG")]
+        [NoInline]
+        [NoHeapAllocation]
+        public static void Deny(bool expr, String format, __arglist)
+        {
+            if (expr) {
+                failAssert(format, new ArgIterator(__arglist));
+            }
+        }
+
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        private static void failAssert(String s)
+        {
+            if (s != null) {
+                WriteLine("Assertion failed: {0}", __arglist(s));
+            }
+            else {
+                WriteLine("Assertion failed.");
+            }
+            Break();
+        }
+
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        private static void failAssert(String format, __arglist)
+        {
+            failAssert(format, new ArgIterator(__arglist));
+        }
+
+        [ManualRefCounts]
+        [NoHeapAllocation]
+        private static void failAssert(String format, ArgIterator args)
+        {
+            if (format != null) {
+                Write("Assertion failed: ");
+                WriteLine(format, args);
+            }
+            else {
+                WriteLine("Assertion failed.");
+            }
+            Break();
+        }
+
+        /////////////////////////////////////////////////////// State Methods.
+        //
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(638)]
+        [NoHeapAllocation]
+        public static extern void Break();
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        internal static extern bool Trap(ref ThreadContext context, bool firstChance);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        internal static extern bool TrapForProcessorSwitch(ref ThreadContext context);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        internal static extern void AddProcessor(int cpuId);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        internal static extern void RevertToUniprocessor();
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        public static extern bool PollForBreak();
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        public static extern bool LoadedBinary(UIntPtr baseAddress,
+                                               UIntPtr bytes,
+                                               UIntPtr name,
+                                               uint checksum,
+                                               uint timestamp,
+                                               bool silent);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        public static extern bool LoadedBinary(UIntPtr baseAddress,
+                                               UIntPtr bytes,
+                                               String name,
+                                               uint checksum,
+                                               uint timestamp,
+                                               bool silent);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        public static extern bool UnloadedBinary(UIntPtr baseAddress,
+                                                 bool silent);
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        public static extern bool IsDebuggerPresent();
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [NoHeapAllocation]
+        public static ulong ReadPerfCounter(uint which)
+        {
+            switch (which) {
+                case 0: return perfCounter0;
+                case 1: return perfCounter1;
+                case 2: return perfCounter2;
+                case 3: return perfCounter3;
+                case 4: return perfCounter4;
+                case 5: return perfCounter5;
+                case 6: return perfCounter6;
+                case 7: return perfCounter7;
+                case 8: return perfCounter8;
+                case 9: return perfCounter9;
+                case 10: return perfCounter10;
+                case 11: return perfCounter11;
+                case 12: return perfCounter12;
+                case 13: return perfCounter13;
+                case 14: return perfCounter14;
+                case 15: return perfCounter15;
+                default: return 0;
+            }
+        }
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [NoHeapAllocation]
+        public static bool WritePerfCounter(uint which, ulong value)
+        {
+            switch (which) {
+                case 0: perfCounter0 = value; return true;
+                case 1: perfCounter1 = value; return true;
+                case 2: perfCounter2 = value; return true;
+                case 3: perfCounter3 = value; return true;
+                case 4: perfCounter4 = value; return true;
+                case 5: perfCounter5 = value; return true;
+                case 6: perfCounter6 = value; return true;
+                case 7: perfCounter7 = value; return true;
+                case 8: perfCounter8 = value; return true;
+                case 9: perfCounter9 = value; return true;
+                case 10: perfCounter10 = value; return true;
+                case 11: perfCounter11 = value; return true;
+                case 12: perfCounter12 = value; return true;
+                case 13: perfCounter13 = value; return true;
+                case 14: perfCounter14 = value; return true;
+                case 15: perfCounter15 = value; return true;
+                default: return false;
+            }
+        }
+
+        [AccessedByRuntime("output to header : defined in halkd.cpp")]
+        [NoHeapAllocation]
+        public static bool AddToPerfCounter(uint which, ulong value)
+        {
+            switch (which) {
+                case 0: Interlocked.Add(ref perfCounter0, value); return true;
+                case 1: Interlocked.Add(ref perfCounter1, value); return true;
+                case 2: Interlocked.Add(ref perfCounter2, value); return true;
+                case 3: Interlocked.Add(ref perfCounter3, value); return true;
+                case 4: Interlocked.Add(ref perfCounter4, value); return true;
+                case 5: Interlocked.Add(ref perfCounter5, value); return true;
+                case 6: Interlocked.Add(ref perfCounter6, value); return true;
+                case 7: Interlocked.Add(ref perfCounter7, value); return true;
+                case 8: Interlocked.Add(ref perfCounter8, value); return true;
+                case 9: Interlocked.Add(ref perfCounter9, value); return true;
+                case 10: Interlocked.Add(ref perfCounter10, value); return true;
+                case 11: Interlocked.Add(ref perfCounter11, value); return true;
+                case 12: Interlocked.Add(ref perfCounter12, value); return true;
+                case 13: Interlocked.Add(ref perfCounter13, value); return true;
+                case 14: Interlocked.Add(ref perfCounter14, value); return true;
+                case 15: Interlocked.Add(ref perfCounter15, value); return true;
+                default: return false;
+            }
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Hal/IHalMemory.cs b/base/Kernel/Singularity/Hal/IHalMemory.cs
new file mode 100644
index 0000000..5e737cb
--- /dev/null
+++ b/base/Kernel/Singularity/Hal/IHalMemory.cs
@@ -0,0 +1,43 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IHalMemory.cs
+//
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Hal
+{
+    [CLSCompliant(false)]
+    public abstract class IHalMemory
+    {
+
+        public struct ProcessorAffinity
+        {
+            public uint domain;
+            public uint apicId;
+            public uint flagIgnore;
+
+        }
+        public struct MemoryAffinity
+        {
+            public uint  domain;
+            public ulong baseAddress;
+            public ulong endAddress;
+            public ulong memorySize;
+            public uint  flagIgnore;
+            public uint  flagHotPluggable;
+            public uint  flagNonVolatile;
+
+        }
+
+        public abstract ProcessorAffinity[] GetProcessorAffinity();
+        public abstract MemoryAffinity[] GetMemoryAffinity();
+    }
+}
diff --git a/base/Kernel/Singularity/Io/Access.cs b/base/Kernel/Singularity/Io/Access.cs
new file mode 100644
index 0000000..81b24c1
--- /dev/null
+++ b/base/Kernel/Singularity/Io/Access.cs
@@ -0,0 +1,23 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Access.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [Flags]
+    public enum Access
+    {
+        None        = 0x00,
+        Read        = 0x01,
+        Write       = 0x02,
+        ReadWrite   = (Read | Write),
+        Execute     = 0x04,
+    };
+}
diff --git a/base/Kernel/Singularity/Io/ByteOrder.cs b/base/Kernel/Singularity/Io/ByteOrder.cs
new file mode 100644
index 0000000..13eb647
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ByteOrder.cs
@@ -0,0 +1,307 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ByteOrder.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class ByteOrder
+    {
+        private ByteOrder()
+        {
+        }
+
+        static public short Swap(short value)
+        {
+            return (short)((value << 8) | ((value >> 8) & 0xff));
+        }
+
+        static public ushort Swap(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int Swap(int value)
+        {
+            return
+                ((value >> 24) & 0x000000ff) | ((value >>  8) & 0x0000ff00) |
+                ((value <<  8) & 0x00ff0000) | ((value << 24));
+        }
+
+        static public uint Swap(uint value)
+        {
+            return
+                ((value >> 24) & 0x000000ffu) | ((value >>  8) & 0x0000ff00u) |
+                ((value <<  8) & 0x00ff0000u) | ((value << 24));
+        }
+
+        static public long Swap(long value)
+        {
+            return ((long)(Swap((int)(value))) << 32) + (long)Swap((int)(value >> 32));
+        }
+
+        static public ulong Swap(ulong value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+#if BIG_ENDIAN
+        static public short  HostToBigEndian(short  value)
+        {
+            return value;
+        }
+
+        static public int    HostToBigEndian(int    value)
+        {
+            return value;
+        }
+
+        static public long   HostToBigEndian(long   value)
+        {
+            return value;
+        }
+
+        static public ushort HostToBigEndian(ushort value)
+        {
+            return value;
+        }
+
+        static public uint   HostToBigEndian(uint   value)
+        {
+            return value;
+        }
+
+        static public ulong  HostToBigEndian(ulong  value)
+        {
+            return value;
+        }
+
+        static public short  BigEndianToHost(short  value)
+        {
+            return value;
+        }
+
+        static public ushort BigEndianToHost(ushort value)
+        {
+            return value;
+        }
+
+        static public int    BigEndianToHost(int    value)
+        {
+            return value;
+        }
+
+        static public uint   BigEndianToHost(uint   value)
+        {
+            return value;
+        }
+
+        static public long   BigEndianToHost(long   value)
+        {
+            return value;
+        }
+
+        static public ulong  BigEndianToHost(ulong  value)
+        {
+            return value;
+        }
+
+
+        static public short  HostToLittleEndian(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort HostToLittleEndian(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    HostToLittleEndian(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   HostToLittleEndian(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   HostToLittleEndian(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  HostToLittleEndian(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+        static public short  LittleEndianToHost(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort LittleEndianToHost(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    LittleEndianToHost(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   LittleEndianToHost(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   LittleEndianToHost(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  LittleEndianToHost(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+#elif LITTLE_ENDIAN
+        static public short  HostToLittleEndian(short  value)
+        {
+            return value;
+        }
+
+        static public int    HostToLittleEndian(int    value)
+        {
+            return value;
+        }
+
+        static public long   HostToLittleEndian(long   value)
+        {
+            return value;
+        }
+
+        static public ushort HostToLittleEndian(ushort value)
+        {
+            return value;
+        }
+
+        static public uint   HostToLittleEndian(uint   value)
+        {
+            return value;
+        }
+
+        static public ulong  HostToLittleEndian(ulong  value)
+        {
+            return value;
+        }
+
+        static public short  LittleEndianToHost(short  value)
+        {
+            return value;
+        }
+
+        static public ushort LittleEndianToHost(ushort value)
+        {
+            return value;
+        }
+
+        static public int    LittleEndianToHost(int    value)
+        {
+            return value;
+        }
+
+        static public uint   LittleEndianToHost(uint   value)
+        {
+            return value;
+        }
+
+        static public long   LittleEndianToHost(long   value)
+        {
+            return value;
+        }
+
+        static public ulong  LittleEndianToHost(ulong  value)
+        {
+            return value;
+        }
+
+
+        static public short  HostToBigEndian(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort HostToBigEndian(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    HostToBigEndian(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   HostToBigEndian(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   HostToBigEndian(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  HostToBigEndian(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+        static public short  BigEndianToHost(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort BigEndianToHost(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    BigEndianToHost(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   BigEndianToHost(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   BigEndianToHost(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  BigEndianToHost(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+#else
+
+#error "Endian conversion routines expect BIG_ENDIAN or LITTLE_ENDIAN to be defined"
+
+#endif
+    }
+} // Microsoft.Singularity.Io
diff --git a/base/Kernel/Singularity/Io/CategoryAttributes.cs b/base/Kernel/Singularity/Io/CategoryAttributes.cs
new file mode 100644
index 0000000..422c4de
--- /dev/null
+++ b/base/Kernel/Singularity/Io/CategoryAttributes.cs
@@ -0,0 +1,365 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CategoryAttributes.cs
+//
+//  Warning:  This file is compiled into the kernel, and into the runtime.
+//            In order to get the visibility correct in all cases, some #ifs
+//            are needed
+//
+//  New Design:
+//          This now conforms with the ideas presented in the Genesis papers,
+//          chapter 3.  In particular, a device driver is simply a Category,
+//          and anything that is in an app manifest is either intrinsic to
+//          apps/installations (and hence not a decoration), or else a
+//          PropertySet or Category.
+
+using System;
+namespace Microsoft.Singularity.Configuration
+{
+    //
+    // The master Category declaration
+    //
+    // Configuration are optional.  If none are specified, then the app should
+    // be thought of as only having one (default) Category.
+    //
+    // A class that declares a Category must descend from this class
+    //
+    public class CategoryDeclaration
+    {
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // CategoryAttribute
+    //
+    // Purpose: Decorates a class derived from CategoryDeclaration to
+    //          indicate that the metadata parser should declare a category
+    //          from the fields in this class
+    //
+    // Usage:   Must decorate a class derived from CategoryDeclaration
+    //
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class CategoryAttribute : System.Attribute
+    {
+        // <<name>> is the name for this category, to distinguish between
+        // multiple categories in the manifest
+        private string name;
+
+        public CategoryAttribute(string name)
+        {
+            this.name = name;
+        }
+
+    }
+
+    //
+    //  The Console Category
+    //
+
+    // Console apps  are apps that run in a special Category.  We will designate this
+    // by deriving a new class from CategoryDeclaration to represent this
+    // special Category, and then creating special field annotations that only
+    // apply to this Category.
+    //
+    public abstract class ConsoleCategoryDeclaration : CategoryDeclaration
+    {
+        internal abstract int AppMain();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // ConsoleCategoryAttribute
+    //
+    // Purpose: Top-level metadata indicating that an assembly implements the
+    //          Console Category
+    //
+    // Usage:   Must be applied to a class derived from
+    //          ConsoleCategoryDeclaration
+    //
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class ConsoleCategoryAttribute : System.Attribute
+    {
+        public ConsoleCategoryAttribute()
+        {
+
+        }
+        private string action; 
+        private string helpMessage;
+        private bool defaultAction;
+
+        public string HelpMessage
+        {
+            get  {return helpMessage;} 
+            set  {helpMessage = value;}
+        }
+
+        public string Action
+        {
+            get  {return action;} 
+            set  {action  = value;}
+        }
+
+        public bool DefaultAction
+        {
+            get  {return defaultAction;} 
+            set  {defaultAction  = value;}
+        }
+}
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // InputEndpointAttribute
+    //
+    // Purpose: Console Input Unicode Pipe declaration 
+    //          kinds are "data" and "control".  Control is used for a 2nd 
+    //          input pipe such as in More and replaces the "keyboard"
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class InputEndpointAttribute : EndpointAttribute {
+        private string kind; 
+
+        public InputEndpointAttribute(string kind) {
+            this.kind = kind;
+        }
+
+        public string Kind {
+            get {return kind;}
+            set {kind = value;}
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // OutputEndpointAttribute
+    //
+    // Purpose: Console Input Unicode Pipe declaration 
+    //          kinds are "data" and "control".  Control is used for a 2nd 
+    //          input pipe such as in More and replaces the "keyboard"
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class OutputEndpointAttribute : EndpointAttribute {
+        private string kind; 
+
+        public OutputEndpointAttribute(string kind) {
+            this.kind = kind;
+        }
+
+        public string Kind {
+            get {return kind;}
+            set {kind = value;}
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // EndpointAttribute
+    //
+    // Purpose: Any non-ServiceProvider that is a requirement ought to be
+    //          declared with this attribute.  This will tell CTR to pre-bind
+    //          the endpoint and will tell the config the type of the channel
+    //          so that names can be resolved without the assembly declaring
+    //          them
+    //
+    // Usage:   Decorates a field within a class decorated with
+    //          [DriverCategory].  The field should be an endpoint.
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class EndpointAttribute : System.Attribute {
+        public string bindPath; 
+
+        public EndpointAttribute() {
+        }
+
+        public string Path {
+            get {return bindPath;}
+            set {bindPath = value;}
+        }
+    }
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // ExtensionEndpointAttribute
+    //
+    // Purpose: Decorate an extension endpoint and indicate that CTR should bind
+    //          the endpoint before client code is invoked.
+    //
+    // Usage:   Decorates an ExtensionEndpoint field within a class
+    //          decorated with [DriverCategory]
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class ExtensionEndpointAttribute : EndpointAttribute
+    {
+        public ExtensionEndpointAttribute()
+        {
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // ServiceEndpointAttribute
+    //
+    // Purpose: Decorate a ServiceProvider endpoint.  This indicates that the
+    //          endpoint will be pre-bound, so that the kernel can determine
+    //          names and drivers cannot.  The parameter indicates the type of
+    //          channel that is created (second order) from this
+    //          ServiceProvider.
+    //
+    // Usage:   Decorates a ServiceProvider field within a class decorated
+    //          with [DriverCategory]
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class ServiceEndpointAttribute : EndpointAttribute
+    {
+        // <<serviceContractType>> is a required parameter.  It gives the type
+        // of the contract that is served over this ServiceProvider
+        // The Exp is implicit, that is, we can just specify the contract type
+        //
+        private System.Type serviceContractType;
+        //private string bindPath; 
+
+        public ServiceEndpointAttribute(System.Type epType)
+        {
+            serviceContractType = epType;
+        }
+        
+       // public string Path
+       // {
+       //     get {return bindPath;}
+       //     set {bindPath = value;}
+       // }
+
+#if SINGULARITY_KERNEL
+        // <<customname>> is a kernel-only hack to let the Hal console set a
+        // special name for itself.
+        private string customName;
+
+        public string CustomName
+        {
+            get { return customName; }
+            set { customName = value; }
+        }
+#endif
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    ///
+    /// Parameter Attributes 
+    ///
+    //////////////////////////////////////////////////////////////////////////
+
+ 
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public sealed class StringParameterAttribute : ParameterAttribute
+    {
+        private string defaultValue; 
+        
+        //[NotDelayed]
+        public StringParameterAttribute(string ArgumentName)
+                :base(ArgumentName) 
+        {
+        }
+        public string Default
+        {
+            get { return defaultValue; }
+            set { defaultValue = value; }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public sealed class StringArrayParameterAttribute : ParameterAttribute
+    {
+        private string[] defaultValue; 
+        
+        //[NotDelayed]
+        public StringArrayParameterAttribute(string ArgumentName)
+                :base(ArgumentName) 
+        {
+        }
+        public string[] Default
+        {
+            get { return defaultValue; }
+            set { defaultValue = value; }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public sealed class LongParameterAttribute : ParameterAttribute
+    {
+        private long defaultValue; 
+        
+        public LongParameterAttribute(string ArgumentName)
+                :base(ArgumentName) 
+        {
+            defaultValue = -1; 
+            Position = -1; 
+        }
+
+        public long Default
+        {
+            get { return defaultValue; }
+            set { defaultValue = value; }
+        }
+}
+
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public sealed class BoolParameterAttribute : ParameterAttribute
+    {
+        private bool    defaultValue; 
+
+        public BoolParameterAttribute(string name)
+                :base(name) 
+        {
+            defaultValue = false; 
+            Position = -1; 
+        }
+
+        public bool Default
+        {
+            get { return defaultValue; }
+            set { defaultValue = value; }
+        }
+    }
+
+   
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
+    public class ParameterAttribute : System.Attribute
+    {
+        private int     position; 
+        private string  helpMessage; 
+        private bool    mandatory; 
+        private string  name; 
+
+        public ParameterAttribute(string Name)
+        {
+            this.name = Name; 
+        }
+
+        public bool Mandatory
+        {
+            get { return mandatory; }
+            set { mandatory = value; }
+        }
+
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        public int Position 
+        {
+            get { return position; }
+            set { position = value; }
+        }
+
+        public string HelpMessage
+        {
+            get { return helpMessage; }
+            set { helpMessage = value; }
+        }
+   }
+
+}
diff --git a/base/Kernel/Singularity/Io/Error.cs b/base/Kernel/Singularity/Io/Error.cs
new file mode 100644
index 0000000..ed282ea
--- /dev/null
+++ b/base/Kernel/Singularity/Io/Error.cs
@@ -0,0 +1,34 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Error.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    internal class Error
+    {
+        internal static void ReadNotSupported() {
+            throw new
+                NotSupportedException("NotSupported_ReadOnPortOrMemory");
+        }
+
+        internal static void WriteNotSupported() {
+            throw
+                new NotSupportedException("NotSupported_WriteOnPortOrMemory");
+        }
+
+        internal static void AccessOutOfRange() {
+            throw
+                new NotSupportedException("NotSupported_AccessOutOfRange");
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Io/FileImage.cs b/base/Kernel/Singularity/Io/FileImage.cs
new file mode 100644
index 0000000..1f6253f
--- /dev/null
+++ b/base/Kernel/Singularity/Io/FileImage.cs
@@ -0,0 +1,34 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FileImage.cs
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Singularity.Io
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Sequential, Pack=4)]
+    [AccessedByRuntime("referenced in c++")]
+    public struct FileImage
+    {
+        [AccessedByRuntime("referenced in c++")]
+        internal UIntPtr Address;
+
+        [AccessedByRuntime("referenced in c++")]
+        internal uint    Size;
+
+        internal FileImage(UIntPtr address, uint size)
+        {
+            this.Address = address;
+            this.Size    = size;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IReadOnlyRegister16.cs b/base/Kernel/Singularity/Io/IReadOnlyRegister16.cs
new file mode 100644
index 0000000..a8ccb7e
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IReadOnlyRegister16.cs
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IReadOnlyRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IReadOnlyRegister16
+    {
+        public abstract ushort Read();
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IReadOnlyRegister32.cs b/base/Kernel/Singularity/Io/IReadOnlyRegister32.cs
new file mode 100644
index 0000000..d2102f9
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IReadOnlyRegister32.cs
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IReadOnlyRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IReadOnlyRegister32
+    {
+        public abstract uint Read();
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IReadOnlyRegister8.cs b/base/Kernel/Singularity/Io/IReadOnlyRegister8.cs
new file mode 100644
index 0000000..5f684ab
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IReadOnlyRegister8.cs
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IReadOnlyRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IReadOnlyRegister8
+    {
+        public abstract byte Read();
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IReadWriteRegister16.cs b/base/Kernel/Singularity/Io/IReadWriteRegister16.cs
new file mode 100644
index 0000000..de828f7
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IReadWriteRegister16.cs
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IReadWriteRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IReadWriteRegister16
+    {
+        public abstract ushort Read();
+        public abstract void Write(ushort value);
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IReadWriteRegister32.cs b/base/Kernel/Singularity/Io/IReadWriteRegister32.cs
new file mode 100644
index 0000000..187afb6
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IReadWriteRegister32.cs
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IReadWriteRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IReadWriteRegister32
+    {
+        public abstract uint Read();
+        public abstract void Write(uint value);
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IReadWriteRegister8.cs b/base/Kernel/Singularity/Io/IReadWriteRegister8.cs
new file mode 100644
index 0000000..9c05069
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IReadWriteRegister8.cs
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IReadWriteRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IReadWriteRegister8
+    {
+        public abstract byte Read();
+        public abstract void Write(byte value);
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IWriteOnlyRegister16.cs b/base/Kernel/Singularity/Io/IWriteOnlyRegister16.cs
new file mode 100644
index 0000000..18e920b
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IWriteOnlyRegister16.cs
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IWriteOnlyRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IWriteOnlyRegister16
+    {
+        public abstract void Write(ushort value);
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IWriteOnlyRegister32.cs b/base/Kernel/Singularity/Io/IWriteOnlyRegister32.cs
new file mode 100644
index 0000000..55ae3fa
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IWriteOnlyRegister32.cs
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IWriteOnlyRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IWriteOnlyRegister32
+    {
+        public abstract void Write(uint value);
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IWriteOnlyRegister8.cs b/base/Kernel/Singularity/Io/IWriteOnlyRegister8.cs
new file mode 100644
index 0000000..bbf20b6
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IWriteOnlyRegister8.cs
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IWriteOnlyRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IWriteOnlyRegister8
+    {
+        public abstract void Write(byte value);
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoConfig.cs b/base/Kernel/Singularity/Io/IoConfig.cs
new file mode 100644
index 0000000..1b0f893
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoConfig.cs
@@ -0,0 +1,317 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoConfig.cs
+//
+
+using System;
+using StringBuilder = System.Text.StringBuilder;
+using ArrayList = System.Collections.ArrayList;
+
+#if SINGULARITY_PROCESS
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+#endif // SINGULARITY_PROCESS
+
+namespace Microsoft.Singularity.Io
+{
+    /// <summary>
+    /// Instances of this class represent a set of I/O resources that have been assigned
+    /// to a specific device driver instance.
+    /// </summary>
+    [CLSCompliant(false)]
+    public abstract class IoConfig
+    {
+        /// <summary>
+        /// Contains the list of device IDs for this device.  These IDs are created (assigned)
+        /// by the bus driver that enumerated this device.  The bus driver may assign any
+        /// number of IDs.  The first ID should always be the Singularity-compatible ID,
+        /// which uses a path-like syntax, e.g. /pnp/PNP0303 for devices enumerated by the
+        /// PNP BIOS / ISAPNP bus device, or /pci/02/00/8086/... for devices enumerated by
+        /// the PCI bus enumerator.
+        /// </summary>
+        public String[] Ids;
+
+        public IoRange[] DynamicRanges;
+        public IoRange[] FixedRanges;
+
+        /// <summary>
+        /// This property exists for compatibility with drivers that assume a single device ID.
+        /// It returns the first device ID in the list.
+        /// </summary>
+        // [Obsolete("Fix code to use Ids (list of ids)")]
+        public String Id
+        {
+            get
+            {
+                if (Ids == null || Ids.Length == 0 || Ids[0] == null)
+                    return "";
+                else
+                    return Ids[0];
+            }
+        }
+
+        /// <summary>
+        /// Builds a description of this IoConfig instance.
+        /// </summary>
+        /// <returns>The description text.</returns>
+        public virtual string ToPrint()
+        {
+            StringBuilder text = new StringBuilder();
+            ToPrint(text);
+            return text.ToString();
+        }
+
+        /// <summary>
+        /// Builds a description of this IoConfig instance.
+        /// </summary>
+        /// <param name="text">The text buffer in which to write the description.</param>
+        protected void ToPrint(StringBuilder text)
+        {
+            text.Append("IoConfig: type=");
+            text.Append(this.GetType().Name);
+            text.Append("\n");
+            DumpIds(text);
+            DumpRanges(text);
+        }
+
+        public void DumpIds(StringBuilder text)
+        {
+            foreach (string id in this.Ids)
+            {
+                text.Append("    device id: ");
+                text.Append(id);
+                text.Append("\n");
+            }
+        }
+
+        public void DumpRanges(StringBuilder text)
+        {
+            for (int i = 0; i < DynamicRanges.Length; i++)
+            {
+                if (DynamicRanges[i] != null)
+                {
+                    text.Append("    range[");
+                    text.Append(i);
+                    text.Append("]: ");
+                    text.Append(DynamicRanges[i]);
+                    text.Append("\n");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Prints a description of this I/O configuration to the debug port.
+        /// </summary>
+        public void Print()
+        {
+            DebugStub.WriteLine(ToPrint());
+        }
+
+#if SINGULARITY_PROCESS
+        public static unsafe IoConfig GetConfig()
+        {
+            // first get the device signature
+            ArrayList idlist = new ArrayList();
+            char[] idbuffer = new char[0x80];
+            for (int i = 0;; i++) {
+                int len = (int)DeviceService.GetPnpSignature(i, null, 0);
+                if (len == 0)
+                    break;
+                if (len > idbuffer.Length)
+                    idbuffer = new char[len];
+                fixed (char* idbuffer_pinned = &idbuffer[0]) {
+                    len = (int)DeviceService.GetPnpSignature(i, idbuffer_pinned, (uint)idbuffer.Length);
+                }
+                if (len == 0)
+                    break;
+                string id = new String(idbuffer, 0, len);
+                idlist.Add(id);
+                Tracing.Log(Tracing.Debug, "PNP Signature: [{0}]", id);
+            }
+            string[] ids = (string[])idlist.ToArray(typeof(string));
+#if false
+            string id = null;
+            char[] sigArray = new char[DeviceService.GetPnpSignature(null, 0)];
+            fixed (char *sigPtr = &sigArray[0]) {
+                int len = (int)DeviceService.GetPnpSignature(
+                    sigPtr, (uint)sigArray.Length);
+
+                id = String.StringCTOR(sigPtr, 0, len);
+            }
+#endif
+
+
+            // now get the fixed resources
+            IoRange[] fixedRanges = GetFixedIoResources();
+
+            // now determine if this is a PCI bus, and if so, configure it as
+            // such
+            ushort pciAddressPort;
+            ushort pciDataPort;
+            ushort pciIdentifier;
+
+            if (DeviceService.GetPciConfig(out pciAddressPort,
+                                           out pciDataPort,
+                                           out pciIdentifier))
+            {
+                Tracing.Log(Tracing.Debug, "PCI Config: addr={0:x4} port=" +
+                            "{1:x4} id={2:x4}", pciAddressPort, pciDataPort,
+                            pciIdentifier);
+
+                IoPort addrPort = new IoPort(pciAddressPort, 4,
+                                             Access.ReadWrite);
+                IoPort dataPort = new IoPort(pciDataPort, 4, Access.ReadWrite);
+                PciPort port = new PciPort(addrPort, dataPort, pciIdentifier);
+
+                return PciConfig.Create(ids, port, fixedRanges);
+            }
+            else {
+                Tracing.Log(Tracing.Debug, "PCI Config: None.");
+            }
+
+            // it isn't a PCI device, so create a PnpConfig object
+
+            // We should really copy all of the ranges, so that
+            // we can augment even PCI devices (like VGA cards).
+
+            uint rangeCount = DeviceService.GetDynamicIoRangeCount();
+            Tracing.Log(Tracing.Debug, "I/O Ranges: {0}", rangeCount);
+
+            IoRange[] dynamicRanges = new IoRange[rangeCount];
+
+            for (uint range = 0; range < rangeCount; range++) {
+                ushort port;
+                ushort size;
+                bool readable;
+                bool writable;
+                byte * dataAddr;
+                uint dataSize;
+                byte irq;
+                byte irqSize;
+                byte dma;
+                byte dmaSize;
+
+                if (DeviceService.GetDynamicIoPortRange(range, out port,
+                                                        out size, out readable,
+                                                        out writable))
+                {
+                    Tracing.Log(Tracing.Debug, "{0:d4}. I/O Port: port={1:x4}" +
+                                "[{2:x}] read={3} write={4}",
+                                range, port, size,
+                                (UIntPtr)(readable ? 1 : 0),
+                                (UIntPtr)(writable ? 1 : 0));
+                    dynamicRanges[range] = new IoPortRange(port, size, readable,
+                                                           writable);
+                }
+                else if (DeviceService.GetDynamicIoMemoryRange(range,
+                                                               out dataAddr,
+                                                               out dataSize,
+                                                               out readable,
+                                                               out writable))
+                {
+
+                    UIntPtr addr = (UIntPtr)dataAddr;
+                    Tracing.Log(Tracing.Debug, "{0:d4}. Memory:  addr={1:x8}" +
+                                "[2:x] read={3} write={4}",
+                                range, addr, dataSize,
+                                (UIntPtr)(readable ? 1 : 0),
+                                (UIntPtr)(writable ? 1 : 0));
+                    dynamicRanges[range] = new IoMemoryRange(addr, dataSize,
+                                                             readable,
+                                                             writable);
+                }
+                else if (DeviceService.GetDynamicIoIrqRange(range, out irq,
+                                                            out irqSize))
+                {
+                    Tracing.Log(Tracing.Debug, "{0:d4}. Irq:  irq={1:x2}" +
+                                "[{2:x}]", range, irq, irqSize);
+                    dynamicRanges[range] = new IoIrqRange(irq, irqSize);
+                }
+                else if (DeviceService.GetDynamicIoDmaRange(range, out dma,
+                                                            out dmaSize))
+                {
+                    Tracing.Log(Tracing.Debug, "{0:d4}. Dma:  dma={1:x2}" +
+                                "[{2:x}]", range, dma, dmaSize);
+                    dynamicRanges[range] = new IoDmaRange(dma, dmaSize);
+                }
+                else {
+                    Tracing.Log(Tracing.Debug, "{0:d4}. Empty", range);
+                }
+            }
+
+            return new PnpConfig(ids, dynamicRanges, fixedRanges);
+        }
+
+        // return an IoRange array filled with all of the fixed resources that
+        // this assembly requested in its manifest
+        private unsafe static IoRange[] GetFixedIoResources()
+        {
+            uint rangeCount = DeviceService.GetFixedIoRangeCount();
+            Tracing.Log(Tracing.Debug, "I/O Ranges: {0}", rangeCount);
+
+            IoRange[] ranges = new IoRange[rangeCount];
+
+            for (uint range = 0; range < rangeCount; range++) {
+                ushort port, size;
+                bool readable, writable;
+                byte * dataAddr;
+                uint dataSize;
+                byte irq, irqSize;
+                byte dma, dmaSize;
+
+                if (DeviceService.GetFixedIoPortRange(range, out port,
+                                                      out size, out readable,
+                                                      out writable))
+                {
+                    Tracing.Log(Tracing.Debug, "{0:d4}. I/O Port: port={1:x4}" +
+                                "[{2:x}] read={3} write={4}",
+                                range, port, size,
+                                (UIntPtr)(readable ? 1 : 0),
+                                (UIntPtr)(writable ? 1 : 0));
+                    ranges[range] = new IoPortRange(port, size, readable,
+                                                    writable);
+                }
+                else if (DeviceService.GetFixedIoMemoryRange(range,
+                                                             out dataAddr,
+                                                             out dataSize,
+                                                             out readable,
+                                                             out writable))
+                {
+                    UIntPtr addr = (UIntPtr)dataAddr;
+                    Tracing.Log(Tracing.Debug, "{0:d4}. Memory:  addr={1:x8}" +
+                                "[2:x] read={3} write={4}",
+                                range, addr, dataSize,
+                                (UIntPtr)(readable ? 1 : 0),
+                                (UIntPtr)(writable ? 1 : 0));
+                    ranges[range] = new IoMemoryRange(addr, dataSize, readable,
+                                                      writable);
+                }
+                else if (DeviceService.GetFixedIoIrqRange(range, out irq,
+                                                          out irqSize))
+                {
+                    Tracing.Log(Tracing.Debug,
+                                "{0:d4}. Irq:  irq={1:x2}[{2:x}]",
+                                range, irq, irqSize);
+                    ranges[range] = new IoIrqRange(irq, irqSize);
+                }
+                else if (DeviceService.GetFixedIoDmaRange(range, out dma,
+                                                          out dmaSize))
+                {
+                    Tracing.Log(Tracing.Debug,
+                                "{0:d4}. Dma:  dma={1:x2}[{2:x}]",
+                                range, dma, dmaSize);
+                    ranges[range] = new IoDmaRange(dma, dmaSize);
+                }
+                else {
+                    Tracing.Log(Tracing.Debug, "{0:d4}. Empty", range);
+                }
+            }
+            return ranges;
+        }
+#endif // SINGULARITY_PROCESS
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoDma.cs b/base/Kernel/Singularity/Io/IoDma.cs
new file mode 100644
index 0000000..1339bee
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoDma.cs
@@ -0,0 +1,162 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoDma.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    public class IoDma
+    {
+        [Flags]
+        public enum Settings : byte
+        {
+            // DMA MODE
+            DemandMode          = 0x00,
+            SingleMode          = 0x40,
+            BlockMode           = 0x80,
+            CascadeMode         = 0xC0,
+
+            // ADDRESS INCREMENT DECREMENT
+            AddressIncrement    = 0x00,
+            AddressDecrement    = 0x20,
+
+            SingleCycle         = 0x00,
+            AutoInit            = 0x10,
+
+            // TRANSFER TYPE
+            VerifyTransfer      = 0x00,
+            WriteTransfer       = 0x04,
+            ReadTransfer        = 0x08,
+        }
+
+        private byte channel;
+        private byte modeByte;
+        private byte controlByte;
+        private byte controlByteMask;
+        private bool eightBit;
+
+        private IoPort addrPort;
+        private IoPort countPort;
+        private IoPort pagePort;
+        private IoPort maskPort;
+        private IoPort modePort;
+        private IoPort clearPort;
+
+        [CLSCompliant(false)]
+        public IoDma(IoDmaRange dmaRange)
+            : this((byte)dmaRange.Channel)
+        {
+        }
+
+        [CLSCompliant(false)]
+        internal IoDma(byte ugly)
+        {
+            channel = (byte)ugly;
+            byte addrReg;
+            byte countReg;
+            byte pageReg;
+            byte maskReg;
+            byte clearReg;
+            byte modeReg;
+
+            eightBit = true;
+            controlByte = 0;
+            modeByte = 0;
+            controlByteMask = 0;
+
+            if (channel < 4) {
+                // 8 bit transfer
+                addrReg = (byte)(0x00 + (channel * 2));
+                countReg = (byte)(0x01 + (channel * 2));
+                pageReg = (byte)(0x80 + (new byte[4] { 0x7, 0x3, 0x1, 0x2 })[channel]);
+                maskReg = 0x0A;
+                clearReg= 0x0C;
+                modeReg = 0x0B;
+                eightBit = true;
+            }
+            else if (channel > 4 && channel < 8) {
+                channel -= 4;
+
+                //16 bit channel
+                addrReg = (byte)(0xC0 + (channel * 4));
+                countReg = (byte)(0xC2 + (channel * 4));
+                pageReg = (byte)(0x88 + (new byte[4] { 0x7, 0x3, 0x1, 0x2 })[channel]);
+                maskReg = 0xD4;
+                clearReg = 0xD8;
+                modeReg = 0xD6;
+                eightBit = false;
+            }
+            else {
+                Tracing.Log(Tracing.Fatal, "Invalid DMA Channel {0}", channel);
+                throw new Exception("Invalid DMA Channel");
+            }
+            // create ports
+            addrPort = new IoPort(addrReg, 1, Access.ReadWrite);
+            countPort = new IoPort(countReg, 1, Access.ReadWrite);
+            pagePort = new IoPort(pageReg, 1, Access.ReadWrite);
+            maskPort =  new IoPort(maskReg, 1, Access.ReadWrite);
+            clearPort = new IoPort(clearReg, 1, Access.ReadWrite);
+            modePort = new IoPort(modeReg, 1, Access.ReadWrite);
+        }
+
+        public override string ToString()
+        {
+            return String.Format("DMA:{0,2:x2} {1}",
+                                 channel,
+                                 eightBit ? "8-bit" : "16-bit");
+        }
+
+        public void SetControlByteMask(Settings mask)
+        {
+            controlByteMask = (byte)mask;
+            controlByteMask |= channel;
+        }
+
+        public void SetControlByte()
+        {
+            controlByte |= controlByteMask;
+            modePort.Write8(controlByte);
+        }
+
+        public void EnableChannel()
+        {
+            maskPort.Write8(channel);
+        }
+
+        public void DisableChannel()
+        {
+            maskPort.Write8((byte)(channel | 0x04));
+        }
+
+        public void ClearFlipFlop()
+        {
+            clearPort.Write8(0x00);
+        }
+
+        [CLSCompliant(false)]
+        public void SetTransferLength(ushort length)
+        {
+            countPort.Write8((byte)(length & 0xff));//buffersize
+            countPort.Write8((byte)(length >> 8));//buffersize
+        }
+
+        [CLSCompliant(false)]
+        public void SetBuffer(IoMemory buffer)
+        {
+            uint address = (uint)buffer.PhysicalAddress.Value;
+            ushort offs = eightBit
+                ? (ushort)((address) & 0xffff)
+                : (ushort)((address >> 1) & 0xffff);
+
+            pagePort.Write8((byte)((address >> 16) & 0xff));
+            addrPort.Write8((byte)(offs & 0xff));
+            addrPort.Write8((byte)(offs >> 8));
+        }
+    }// end of IoDma class
+}
diff --git a/base/Kernel/Singularity/Io/IoDmaRange.cs b/base/Kernel/Singularity/Io/IoDmaRange.cs
new file mode 100644
index 0000000..4b7cf48
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoDmaRange.cs
@@ -0,0 +1,63 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoDmaRange.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoDmaRange : IoRange
+    {
+        private readonly int dma;
+        private readonly int size;
+
+#if SINGULARITY_KERNEL
+        public IoDmaRange(int channel, int size)
+#elif SINGULARITY_PROCESS
+        internal IoDmaRange(int channel, int size)
+#endif // SINGULARITY_PROCESS
+        {
+            this.dma = channel;
+            this.size = size;
+        }
+
+        public IoDma DmaAtOffset(int offset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (offset + 1 > size) {
+                throw new OverflowException("DmaAtOffset out of range.");
+            }
+#endif
+            return new IoDma((byte)(dma + offset));
+        }
+
+        public byte Channel {
+            get { return (byte)dma; }
+        }
+
+        public byte Size {
+            get { return (byte)size; }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("DMA:{0:x2}[{1:x}]", dma, size);
+        }
+
+#if SINGULARITY_KERNEL
+        public override uint RangeBase {
+            get { return (uint)dma; }
+        }
+
+        public override uint RangeLength {
+            get { return (uint)size; }
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoIrqRange.cs b/base/Kernel/Singularity/Io/IoIrqRange.cs
new file mode 100644
index 0000000..b227aee
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoIrqRange.cs
@@ -0,0 +1,70 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoIrqRange.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoIrqRange : IoRange
+    {
+        private readonly byte irq;
+        private readonly byte size;
+
+#if SINGULARITY_KERNEL
+        public IoIrqRange(byte line, byte size)
+#elif SINGULARITY_PROCESS
+        public IoIrqRange(byte line, byte size)
+#endif // SINGULARITY_PROCESS
+        {
+            this.irq = line;
+            this.size = size;
+        }
+
+        public IoIrq IrqAtOffset(byte offset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (offset + 1 > size) {
+                throw new OverflowException("IrqAtOffset out of range.");
+            }
+#endif
+            return new IoIrq((byte)(irq + offset));
+        }
+
+        public byte Irq
+        {
+            get { return irq; }
+        }
+
+        public byte Line
+        {
+            get { return irq; }
+        }
+
+        public byte Size
+        {
+            get { return size; }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("IRQ:{0:x2}[{1:x}]", irq, size);
+        }
+
+#if SINGULARITY_KERNEL
+        public override uint RangeBase {
+            get { return (uint)irq; }
+        }
+
+        public override uint RangeLength {
+            get { return (uint)size; }
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoMemory.cs b/base/Kernel/Singularity/Io/IoMemory.cs
new file mode 100644
index 0000000..e26d9d9
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoMemory.cs
@@ -0,0 +1,1602 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoMemory.cs
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.Singularity.Memory;
+
+#if SINGULARITY_PROCESS
+using Microsoft.Singularity.V1.Services;
+using System.Diagnostics;
+#endif // SINGULARITY_PROCESS
+
+using PageType = System.GCs.PageType;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoMemory
+    {
+        private enum MemoryType {
+            RegularPages,  // We refer to memory allocated from general-purpose memory
+            IOMemory,      // We refer to a block allocated from the IOMemory pool
+            VirtWrapper,   // We wrap a range of virtual addresses that we didn't alloc
+            PhysMapped,    // We wrap a range of physical addresses that we mapped
+            PhysWrapper,   // We wrap a range of physical addresses that we didn't map
+        }
+
+        private readonly PhysicalAddress  dataPhys;
+        private readonly unsafe byte *    data;
+        private readonly int              bytes;
+        private readonly MemoryType       type;
+        private bool                      readable;
+        private bool                      writable;
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+#if SINGULARITY_PROCESS
+        internal const byte   PageBits = 12;
+        internal const uint   PageSize = 1 << PageBits;
+        internal const uint   PageMask = PageSize - 1;
+
+        [Inline]
+        internal static UIntPtr PagePad(UIntPtr addr) {
+            return ((addr + PageMask) & ~PageMask);
+        }
+#endif
+
+        // Request a mapping to physical memory
+        static public IoMemory MapPhysicalMemory(UIntPtr physAddr,
+                                                 UIntPtr bytes,
+                                                 bool readable,
+                                                 bool writable)
+        {
+            DebugStub.Assert(physAddr != UIntPtr.Zero);
+
+#if SINGULARITY_KERNEL
+            UIntPtr virtAddr = MemoryManager.KernelMapPhysicalMemory(
+                new PhysicalAddress((ulong)physAddr), bytes);
+            DebugStub.Assert(virtAddr != UIntPtr.Zero);
+            return new IoMemory(MemoryType.PhysMapped, new PhysicalAddress(physAddr),
+                                virtAddr, (int)bytes, readable, writable);
+#elif SINGULARITY_PROCESS
+            UIntPtr virtAddr = DeviceService.MapPhysicalRange((ulong)physAddr, (uint)bytes,
+                                                              readable, writable);
+            DebugStub.Assert(virtAddr != UIntPtr.Zero);
+            return new IoMemory(MemoryType.PhysMapped, new PhysicalAddress(physAddr),
+                                virtAddr, (int)bytes, readable, writable);
+#endif
+        }
+
+#if SINGULARITY_KERNEL
+        //
+        // Kernel-only: just wrap a range of memory in an IoMemory for convenience
+        //
+        static public IoMemory Wrap(UIntPtr virtAddr, UIntPtr bytes,
+                                    bool readable, bool writable)
+        {
+            return new IoMemory(MemoryType.VirtWrapper, virtAddr,
+                                (int)bytes, readable, writable);
+        }
+
+        //
+        // Kernel-only: Allocate fixed memory from the user range
+        //
+        static internal IoMemory AllocateUserFixed(UIntPtr bytes, Process process,
+                                                   PageType type)
+        {
+            bytes = MemoryManager.PagePad(bytes);
+            UIntPtr pages = MemoryManager.PagesFromBytes(bytes);
+            UIntPtr addr = MemoryManager.UserAllocate(pages, process, 0, type);
+
+            if (addr == UIntPtr.Zero) {
+                return null;
+            }
+
+            return new IoMemory(MemoryType.RegularPages, addr, (int)bytes, true, true);
+        }
+#endif
+
+        //
+        // Allocate virtually but not physically contiguous pages. The resulting
+        // IoMemory object grants access to a number of bytes rounded up to
+        // the nearest page boundary.
+        //
+        static public IoMemory AllocateFixed(UIntPtr bytes)
+        {
+#if SINGULARITY_KERNEL
+            return AllocateFixed(bytes, Thread.CurrentProcess, PageType.NonGC);
+#elif SINGULARITY_PROCESS
+            int mybytes = (int)bytes;
+            bytes = PagePad(bytes);
+
+            UIntPtr addr = (UIntPtr)PageTableService.Allocate((uint)bytes);
+
+            if (addr == UIntPtr.Zero) {
+                return null;
+            }
+
+            return new IoMemory(MemoryType.RegularPages, addr, (int)bytes, true, true);
+#endif // SINGULARITY_PROCESS
+        }
+
+        //
+        // Allocate virtually but not physically contiguous pages. The resulting
+        // IoMemory object grants access only to the number of bytes requested
+        // (possibly leaving inaccessible bytes at the end of the last page)
+        //
+        static public IoMemory AllocateRealFixed(UIntPtr bytes)
+        {
+#if SINGULARITY_KERNEL
+            return AllocateRealFixed(bytes, Thread.CurrentProcess, PageType.NonGC);
+#elif SINGULARITY_PROCESS
+            int mybytes = (int)bytes;
+            bytes = PagePad(bytes);
+
+            UIntPtr addr = (UIntPtr)PageTableService.Allocate((uint)bytes);
+
+            if (addr == UIntPtr.Zero) {
+                return null;
+            }
+
+            return new IoMemory(MemoryType.RegularPages, addr, mybytes, true, true);
+#endif // SINGULARITY_PROCESS
+        }
+
+
+#if SINGULARITY_KERNEL
+        //
+        // Kernel-only implementation of AllocateRealFixed
+        //
+        static internal IoMemory AllocateRealFixed(UIntPtr bytes, Process process,
+                                                   PageType type)
+        {
+            int mybytes = (int)bytes;
+            UIntPtr pages = MemoryManager.PagesFromBytes(bytes);
+            UIntPtr addr = MemoryManager.KernelAllocate(pages, process, 0, PageType.NonGC);
+
+#if DONT_DUMP
+            unchecked {
+                Tracing.Log(Tracing.Debug, "AllocateFixed     -> [{0,8:x8}..{1,8:x8}]\n",
+                            addr, addr + bytes);
+            }
+#endif
+            if (addr == UIntPtr.Zero) {
+                return null;
+            }
+
+            return new IoMemory(MemoryType.RegularPages, addr, (int)mybytes, true, true);
+        }
+#endif // SINGULARITY_KERNEL
+
+
+
+#if SINGULARITY_KERNEL
+        //
+        // Kernel-only implementation of AllocateFixed
+        //
+        static internal IoMemory AllocateFixed(UIntPtr bytes, Process process,
+                                               PageType type)
+        {
+            bytes = MemoryManager.PagePad(bytes);
+            UIntPtr pages = MemoryManager.PagesFromBytes(bytes);
+            UIntPtr addr = MemoryManager.KernelAllocate(pages, process, 0, PageType.NonGC);
+
+#if DONT_DUMP
+            unchecked {
+                Tracing.Log(Tracing.Debug, "AllocateFixed     -> [{0,8:x8}..{1,8:x8}]\n",
+                            addr, addr + bytes);
+            }
+#endif
+
+            if (addr == UIntPtr.Zero) {
+                return null;
+            }
+
+            return new IoMemory(MemoryType.RegularPages, addr, (int)bytes, true, true);
+        }
+#endif // SINGULARITY_KERNEL
+
+        //
+        // Allocate PHYSICALLY contiguous memory. This allocates IO memory,
+        // which is a scarce system resource when paging is enabled.
+        //
+        static public IoMemory AllocatePhysical(UIntPtr bytes)
+        {
+            return AllocatePhysical(bytes, 0);
+        }
+
+        static public IoMemory AllocatePhysical(UIntPtr bytes,
+                                                UIntPtr alignment)
+        {
+            return AllocatePhysical(0, bytes, alignment);
+        }
+
+        static public IoMemory AllocatePhysical(UIntPtr limitAddr,
+                                                UIntPtr bytes,
+                                                UIntPtr alignment)
+        {
+#if SINGULARITY_KERNEL
+            bytes = MemoryManager.PagePad(bytes);
+            UIntPtr addr = MemoryManager.AllocateIOMemory(
+                limitAddr, bytes, alignment, Thread.CurrentProcess);
+
+#elif SINGULARITY_PROCESS
+            bytes = PagePad(bytes);
+            UIntPtr addr = (UIntPtr)PageTableService.AllocateIOMemory(
+                (uint)limitAddr, (uint)bytes, (uint)alignment);
+#endif // SINGULARITY_PROCESS
+#if DONT_DUMP
+            unchecked {
+                Tracing.Log(Tracing.Debug, "AllocateFixed16MB -> [{0,8:x8}..{1,8:x8}]\n",
+                            addr, addr + bytes);
+            }
+#endif
+
+            if (addr == UIntPtr.Zero) {
+                return null;
+            }
+
+            // IO memory is identity-mapped
+            return new IoMemory(MemoryType.IOMemory, new PhysicalAddress((ulong)addr),
+                                addr, (int)bytes, true, true);
+        }
+
+        //
+        // Allocate PHYSICALLY contiguous memory below the 16MB boundary.
+        // This allocates IO memory, which is a scarce system resource when
+        // paging is enabled.
+        //
+        static public IoMemory AllocatePhysBelow16MB(UIntPtr bytes)
+        {
+            return AllocatePhysBelow16MB(bytes);
+        }
+
+        static public IoMemory AllocatePhysBelow16MB(UIntPtr bytes, UIntPtr alignment)
+        {
+            return AllocatePhysical(0x1000000, bytes, alignment);
+        }
+
+        static public void Release(IoMemory range)
+        {
+            if (range == null || !range.readable) {
+                throw new ArgumentNullException("Range is null");
+            }
+
+#if SINGULARITY_KERNEL
+            Release(Thread.CurrentProcess, range);
+#elif SINGULARITY_PROCESS
+
+            switch (range.type) {
+                case MemoryType.RegularPages :
+                    PageTableService.Free(range.VirtualAddress,
+                                          PagePad((UIntPtr)range.bytes));
+                    break;
+
+                case MemoryType.IOMemory :
+                    PageTableService.FreeIOMemory(range.VirtualAddress,
+                                                  PagePad((UIntPtr)range.bytes));
+                    break;
+
+                case MemoryType.PhysMapped :
+                    DeviceService.UnmapPhysicalRange((uint)range.VirtualAddress,
+                                                     (uint)(range.VirtualAddress + range.bytes));
+                    break;
+
+                case MemoryType.VirtWrapper :
+                case MemoryType.PhysWrapper :
+                    // We do not own the memory; don't free it.
+                    break;
+
+                default :
+                    DebugStub.Assert(false, "Unknown memory type in IoMemory.Release");
+                    break;
+            }
+
+            range.readable = false;
+            range.writable = false;
+#endif
+        }
+
+#if SINGULARITY_KERNEL
+        static internal void Release(Process process, IoMemory range)
+        {
+            if (range == null || !range.readable) {
+                throw new ArgumentNullException("Range is null");
+            }
+
+            switch (range.type) {
+                case MemoryType.RegularPages :
+                    UIntPtr pages = MemoryManager.PagesFromBytes((UIntPtr)range.bytes);
+
+                    //
+                    // NOTE we allocate memory both in the kernel range and
+                    // the user range under different scenarios, so distinguish by
+                    // pointer value.
+                    //
+                    if (range.VirtualAddress > BootInfo.KERNEL_BOUNDARY) {
+                        MemoryManager.UserFree(range.VirtualAddress,
+                                               pages,
+                                               process);
+                    } else {
+                        MemoryManager.KernelFree(range.VirtualAddress,
+                                                 pages,
+                                                 process);
+                    }
+                    break;
+
+                case MemoryType.PhysMapped :
+                    MemoryManager.KernelUnmapPhysicalMemory(
+                        range.VirtualAddress,
+                        range.VirtualAddress + range.bytes);
+                    break;
+
+                case MemoryType.IOMemory :
+                    MemoryManager.FreeIOMemory(
+                        range.VirtualAddress,
+                        MemoryManager.PagePad((UIntPtr)range.bytes),
+                        process);
+                    break;
+
+                case MemoryType.VirtWrapper :
+                case MemoryType.PhysWrapper :
+                    // We do not own the memory; don't free it.
+                    break;
+
+                default :
+                    DebugStub.Assert(false, "Unknown memory type in IoMemory.Release");
+                    break;
+            }
+
+
+
+            range.readable = false;
+            range.writable = false;
+        }
+#endif
+
+        // Sets or Gets the element at the given index.
+        //
+        //| <include path='docs/doc[@for="ArrayList.this"]/*' />
+        public unsafe byte this[int index] {
+            get {
+#if !DONT_CHECK_IO_BOUNDS
+                if (index < 0 || index >= bytes) {
+                    Error.AccessOutOfRange();
+                }
+#endif
+                return data[index];
+            }
+            set {
+#if !DONT_CHECK_IO_BOUNDS
+                if (index < 0 || index >= bytes) {
+                    Error.AccessOutOfRange();
+                }
+#endif
+                data[index] = value;
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        // Constructor for mappings onto physical memory
+        private unsafe IoMemory(MemoryType type,
+                                PhysicalAddress physicalAddr,
+                                UIntPtr virtAddr,
+                                int bytes,
+                                bool readable,
+                                bool writable)
+        {
+            DebugStub.Assert((type == MemoryType.IOMemory) ||
+                             (type == MemoryType.PhysWrapper) ||
+                             (type == MemoryType.PhysMapped));
+
+            DebugStub.Assert(physicalAddr.Value != 0);
+            DebugStub.Assert(virtAddr != 0);
+
+            this.type = type;
+            this.dataPhys = physicalAddr;
+            this.data = (byte*)virtAddr;
+            this.bytes = (int)bytes;
+            this.readable = readable;
+            this.writable = writable;
+        }
+
+        // Constructor for strictly virtual memory
+        private unsafe IoMemory(MemoryType type,
+                                UIntPtr virtAddr,
+                                int bytes,
+                                bool readable,
+                                bool writable)
+        {
+            DebugStub.Assert((type == MemoryType.RegularPages) ||
+                             (type == MemoryType.VirtWrapper));
+
+            DebugStub.Assert(virtAddr != 0);
+
+            this.type = type;
+            this.dataPhys = PhysicalAddress.Null;
+            this.data = (byte*)virtAddr;
+            this.bytes = (int)bytes;
+            this.readable = readable;
+            this.writable = writable;
+        }
+
+
+        public unsafe IoMemory AtOffset(uint byteOffset, int count)
+        {
+            return AtOffset(byteOffset, count, readable, writable);
+        }
+
+        public unsafe IoMemory AtOffset(uint byteOffset, int count,
+                                        bool read, bool write)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (byteOffset + count > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            if ((type == MemoryType.RegularPages) ||
+                (type == MemoryType.VirtWrapper)) {
+
+                // No physical address to worry about
+                DebugStub.Assert(dataPhys.Value == 0);
+
+                return new IoMemory(MemoryType.VirtWrapper,
+                                    VirtualAddress + byteOffset,
+                                    count,
+                                    read,
+                                    write);
+            } else {
+                DebugStub.Assert(dataPhys.Value != 0);
+
+                // Update our physical address too
+                PhysicalAddress newPhys = new PhysicalAddress(PhysicalAddress.Value + byteOffset);
+
+                return new IoMemory(MemoryType.PhysWrapper,
+                                    newPhys,
+                                    VirtualAddress + byteOffset,
+                                    count,
+                                    read,
+                                    write);
+            }
+        }
+
+        // This address is likely useless without creating
+        // another IoMemory object...
+        public unsafe PhysicalAddress PhysicalAddress
+        {
+            [NoHeapAllocation]
+            get {
+                return dataPhys;
+            }
+        }
+
+        public unsafe UIntPtr VirtualAddress
+        {
+            [NoHeapAllocation]
+            get {
+                return (UIntPtr)data;
+            }
+        }
+
+        public int Length
+        {
+            [NoHeapAllocation]
+            get {
+                return bytes;
+            }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("32:{0,8:x8} -> {1,8:x8}[{2:x}]",
+                                 (uint)VirtualAddress, PhysicalAddress.Value,
+                                 (uint)bytes);
+        }
+
+        public static unsafe void Copy(IoMemory source,
+                                       int    byteSource,
+                                       IoMemory destination,
+                                       int    byteDestination,
+                                       int    count)
+        {
+            byte* srcdataptr = source.data, destdataptr = destination.data;
+#if !DONT_CHECK_IO_BOUNDS
+            if (byteSource + count > source.bytes           ||
+                byteSource < 0                              ||
+                byteDestination + count > destination.bytes ||
+                byteDestination < 0)
+            {
+                Error.AccessOutOfRange();
+            }
+#endif
+            Buffer.MoveMemory(&destdataptr[byteDestination],
+                              &srcdataptr[byteSource],
+                              count * sizeof(byte));
+        }
+
+        public unsafe string ReadAsciiZeroString(int byteOffset, int maxSize)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + maxSize > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            int len = 0;
+            byte *dst = &data[byteOffset];
+            for (; len < maxSize && *dst != 0; len++) {
+                dst++;
+            }
+
+            return String.StringCTOR(data, byteOffset, len);
+        }
+
+        public string ReadAsciiZeroString(int byteOffset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (byteOffset > bytes) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            return ReadAsciiZeroString(byteOffset, bytes - byteOffset);
+        }
+
+        [Inline]
+        public unsafe byte Read8(int byteOffset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            return data[byteOffset];
+        }
+
+        [Inline]
+        public unsafe ushort Read16(int byteOffset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + sizeof(ushort) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            return *((ushort *)&data[byteOffset]);
+        }
+
+        [Inline]
+        public unsafe uint Read32(int byteOffset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + sizeof(uint) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            return *((uint *)&data[byteOffset]);
+        }
+
+        [Inline]
+        public unsafe ulong Read64(int byteOffset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + sizeof(ulong) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            return *((ulong *)&data[byteOffset]);
+        }
+
+        // --------------------------------------------------------------------
+        // Export non-exception throwing operations
+        //
+        // These are intended for use in the kernel on
+        // NoHeapAllocation paths.  The caller is expected to
+        // check the result and/or know pre-conditions for the
+        // I/O operation.
+
+#region NoHeapAllocation Read/Write operations
+#if SINGULARITY_KERNEL
+
+        [Inline]
+        [NoHeapAllocation]
+        IoResult CheckRead(int byteOffset, int readBytes)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                return IoResult.ReadNotSupported;
+            }
+            if (byteOffset + readBytes > bytes || byteOffset < 0) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+            return IoResult.Success;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        IoResult CheckWrite(int byteOffset, int writeBytes)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                return IoResult.WriteNotSupported;
+            }
+            if (byteOffset + writeBytes > bytes || byteOffset < 0) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+            return IoResult.Success;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read8NoThrow(int byteOffset, out byte value)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(byte));
+            if (IoResult.Success == check) {
+                value = data[byteOffset];
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read16NoThrow(int byteOffset, out ushort value)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(ushort));
+            if (IoResult.Success == check) {
+                value = *((ushort *)&data[byteOffset]);
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read32NoThrow(int byteOffset, out uint value)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(uint));
+            if (IoResult.Success == check) {
+                value = *((uint *)&data[byteOffset]);
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read64NoThrow(int byteOffset, out ulong value)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(ulong));
+            if (IoResult.Success == check) {
+                value = *((ulong *)&data[byteOffset]);
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Read8NoThrow(int                byteOffset,
+                                            [In, Out] byte[]   buffer,
+                                            int                offset,
+                                            int                count)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(byte) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+
+            fixed (byte *dst = &buffer[offset]) {
+                Buffer.MoveMemory(dst, &data[byteOffset],
+                                  count * sizeof(byte));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Read16NoThrow(int                byteOffset,
+                                             [In, Out] ushort[] buffer,
+                                             int                offset,
+                                             int                count)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(ushort) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+            fixed (ushort *dst = &buffer[offset]) {
+                Buffer.MoveMemory((byte *)dst, &data[byteOffset],
+                                  count * sizeof(ushort));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Read32NoThrow(int              byteOffset,
+                                             [In, Out] uint[] buffer,
+                                             int              offset,
+                                             int              count)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(uint) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+            fixed (uint *dst = &buffer[offset]) {
+                Buffer.MoveMemory((byte *)dst, &data[byteOffset],
+                                  count * sizeof(uint));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Read64NoThrow(int               byteOffset,
+                                             [In, Out] ulong[] buffer,
+                                             int               offset,
+                                             int               count)
+        {
+            IoResult check = CheckRead(byteOffset, sizeof(ulong) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+
+            fixed (ulong *dst = &buffer[offset]) {
+                Buffer.MoveMemory((byte *)dst, &data[byteOffset],
+                                  count * sizeof(ulong));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Write8NoThrow(int                byteOffset,
+                                             [In, Out] byte[]   buffer,
+                                             int                offset,
+                                             int                count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(byte) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+
+            fixed (byte *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], src,
+                                  count * sizeof(byte));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Write16NoThrow(int                byteOffset,
+                                              [In, Out] ushort[] buffer,
+                                              int                offset,
+                                              int                count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(ushort) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+            fixed (ushort *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], (byte *)src,
+                                  count * sizeof(ushort));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Write32NoThrow(int              byteOffset,
+                                              [In, Out] uint[] buffer,
+                                              int              offset,
+                                              int              count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(uint) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+            fixed (uint *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], (byte *)src,
+                                  count * sizeof(uint));
+            }
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Write64NoThrow(int               byteOffset,
+                                              [In, Out] ulong[] buffer,
+                                              int               offset,
+                                              int               count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(ulong) * count);
+            if (IoResult.Success != check) {
+                return check;
+            }
+
+#if !DONT_CHECK_IO_BOUNDS
+            if (buffer == null ||
+                offset < 0 ||
+                offset + count > buffer.Length) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif
+
+            fixed (ulong *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], (byte *)src,
+                                  count * sizeof(ulong));
+            }
+            return IoResult.Success;
+        }
+
+        // --------------------------------------------------------------------
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write8NoThrow(int byteOffset, byte value)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(byte));
+            if (IoResult.Success == check) {
+                data[byteOffset] = value;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write16NoThrow(int byteOffset, ushort value)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(ushort));
+            if (IoResult.Success == check) {
+                *((ushort *)&data[byteOffset]) = value;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write32NoThrow(int byteOffset, uint value)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(uint));
+            if (IoResult.Success == check) {
+                *((uint *)&data[byteOffset]) = value;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write64NoThrow(int byteOffset, ulong value)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(ulong));
+            if (IoResult.Success == check) {
+                *((ulong *)&data[byteOffset]) = value;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write8NoThrow(int  byteOffset,
+                                             byte value,
+                                             int  count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(byte) * count);
+            if (IoResult.Success == check) {
+                byte *temp = &data[byteOffset];
+                while (count-- > 0) {
+                    *temp++ = value;
+                }
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write16NoThrow(int    byteOffset,
+                                              ushort value,
+                                              int    count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(ushort) * count);
+            if (IoResult.Success == check) {
+                ushort *temp = (ushort*) &data[byteOffset];
+                while (count-- > 0) {
+                    *temp++ = value;
+                }
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write32NoThrow(int  byteOffset,
+                                              uint value,
+                                              int  count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(uint) * count);
+            if (IoResult.Success == check) {
+                uint *temp = (uint*) &data[byteOffset];
+                while (count-- > 0) {
+                    *temp++ = value;
+                }
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write64NoThrow(int   byteOffset,
+                                              ulong value,
+                                              int   count)
+        {
+            IoResult check = CheckWrite(byteOffset, sizeof(ulong) * count);
+            if (IoResult.Success == check) {
+                ulong *temp = (ulong*) &data[byteOffset];
+                while (count-- > 0) {
+                    *temp++ = value;
+                }
+            }
+            return check;
+        }
+
+#endif // SINGULARITY_KERNEL
+#endregion // NoHeapAllocation Read/Write operations
+
+        // --------------------------------------------------------------------
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe byte Read8Unchecked(int byteOffset)
+        {
+            return data[byteOffset];
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe ushort Read16Unchecked(int byteOffset)
+        {
+            return *((ushort *)&data[byteOffset]);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe uint Read32Unchecked(int byteOffset)
+        {
+            return *((uint *)&data[byteOffset]);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe ulong Read64Unchecked(int byteOffset)
+        {
+            return *((ulong *)&data[byteOffset]);
+        }
+
+        public unsafe void Read8(int byteOffset, byte *values, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            Buffer.MoveMemory(values, &data[byteOffset], count * sizeof(byte));
+        }
+
+        public unsafe void Read8(int                byteOffset,
+                                 [In, Out] byte[]   buffer,
+                                 int                offset,
+                                 int                count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (byte *dst = &buffer[offset]) {
+                Buffer.MoveMemory(dst, &data[byteOffset], count * sizeof(byte));
+            }
+        }
+
+        public unsafe void Read16(int                byteOffset,
+                                  [In, Out] ushort[] buffer,
+                                  int                offset,
+                                  int                count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + count * sizeof(ushort) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (ushort *dst = &buffer[offset]) {
+                Buffer.MoveMemory((byte *)dst, &data[byteOffset], count * sizeof(ushort));
+            }
+        }
+
+        public unsafe void Read32(int              byteOffset,
+                                  [In, Out] uint[] buffer,
+                                  int              offset,
+                                  int              count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + count * sizeof(uint) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (uint *dst = &buffer[offset]) {
+                Buffer.MoveMemory((byte *)dst, &data[byteOffset], count * sizeof(uint));
+            }
+        }
+
+        public unsafe void Read64(int               byteOffset,
+                                  [In, Out] ulong[] buffer,
+                                  int               offset,
+                                  int               count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + count * sizeof(ulong) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            fixed (ulong *dst = &buffer[offset]) {
+                Buffer.MoveMemory((byte *)dst, &data[byteOffset], count * sizeof(ulong));
+            }
+        }
+
+        public void Read8(int byteOffset, [In,Out] byte[] buffer)
+        {
+            Read8(byteOffset, buffer, 0, buffer.Length);
+        }
+
+        public void Read16(int byteOffset, [In,Out] ushort[] buffer)
+        {
+            Read16(byteOffset, buffer, 0, buffer.Length);
+        }
+
+        public void Read32(int byteOffset, [In,Out] uint[] buffer)
+        {
+            Read32(byteOffset, buffer, 0, buffer.Length);
+        }
+
+        public void Read64(int byteOffset, [In,Out] ulong[] buffer)
+        {
+            Read64(byteOffset, buffer, 0, buffer.Length);
+        }
+
+        public unsafe string ReadString(int byteOffset, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            char[] tempString = new char[count];
+            for(int i = 0; i < count; i++) {
+                tempString[i] = (char)data[i + byteOffset];
+            }
+            return new string(tempString);
+
+        }
+
+        public unsafe void WriteString(int byteOffset, string tempString)
+        {
+            int count = tempString.Length;
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            for(int i = 0; i < count; i++) {
+                data[i + byteOffset] = (byte)tempString[i];
+            }
+        }
+
+        [Inline]
+        public unsafe void Write8(int byteOffset, byte value)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            data[byteOffset] = value;
+        }
+
+        [Inline]
+        public unsafe void Write16(int byteOffset, ushort value)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + sizeof(ushort) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            *((ushort *)&data[byteOffset]) = value;
+        }
+
+        [Inline]
+        public unsafe void Write32(int byteOffset, uint value)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + sizeof(uint) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            *((uint *)&data[byteOffset]) = value;
+        }
+
+        [Inline]
+        public unsafe void Write64(int byteOffset, ulong value)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + sizeof(ulong) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            *((ulong *)&data[byteOffset]) = value;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe void Write8Unchecked(int byteOffset, byte value)
+        {
+            data[byteOffset] = value;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe void Write16Unchecked(int byteOffset, ushort value)
+        {
+            *((ushort *)&data[byteOffset]) = value;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe void Write32Unchecked(int byteOffset, uint value)
+        {
+            *((uint *)&data[byteOffset]) = value;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        internal unsafe void Write64Unchecked(int byteOffset, ulong value)
+        {
+            *((ulong *)&data[byteOffset]) = value;
+        }
+
+        public unsafe void Write8(int byteOffset, byte value, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            byte *temp = &data[byteOffset];
+            while (count-- > 0) {
+                *temp++ = value;
+            }
+        }
+
+        public unsafe void Write16(int byteOffset, ushort value, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(ushort) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            ushort *temp = (ushort *)&data[byteOffset];
+            while (count-- > 0) {
+                *temp++ = value;
+            }
+        }
+
+        public unsafe void Write32(int byteOffset, uint value, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(uint) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            uint *temp = (uint *)&data[byteOffset];
+            while (count-- > 0) {
+                *temp++ = value;
+            }
+        }
+
+        public unsafe void Write64(int byteOffset, ulong value, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(ulong) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            ulong *temp = (ulong *)&data[byteOffset];
+            while (count-- > 0) {
+                *temp++ = value;
+            }
+        }
+
+        public unsafe void Write8(int byteOffset, byte[] values)
+        {
+            Write8(byteOffset, values, 0, values.Length);
+        }
+
+        public unsafe void Write16(int byteOffset, ushort[] values)
+        {
+            Write16(byteOffset, values, 0, values.Length);
+        }
+
+        public unsafe void Write32(int byteOffset, uint[] values)
+        {
+            Write32(byteOffset, values, 0, values.Length);
+        }
+
+        public unsafe void Write64(int byteOffset, ulong[] values)
+        {
+            Write64(byteOffset, values, 0, values.Length);
+        }
+
+        public unsafe void Write8(int byteOffset, byte *values, int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            Buffer.MoveMemory(&data[byteOffset], values, count * sizeof(byte));
+        }
+
+        public unsafe void Write8(int    byteOffset,
+                                  byte[] buffer,
+                                  int    offset,
+                                  int    count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(byte) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (byte *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], src, count * sizeof(byte));
+            }
+        }
+
+        public unsafe void Write16(int      byteOffset,
+                                   ushort[] buffer,
+                                   int      offset,
+                                   int      count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(ushort) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 ||
+                offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (ushort *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], (byte *)src,
+                                  count * sizeof(ushort));
+            }
+        }
+
+        public unsafe void Write32(int    byteOffset,
+                                   uint[] buffer,
+                                   int    offset,
+                                   int    count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(uint) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (uint *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], (byte *)src,
+                                  count * sizeof(uint));
+            }
+        }
+
+        public unsafe void Write64(int     byteOffset,
+                                   ulong[] buffer,
+                                   int     offset,
+                                   int     count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (byteOffset + count * sizeof(ulong) > bytes || byteOffset < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (buffer == null || offset < 0 || offset + count > buffer.Length) {
+                Error.AccessOutOfRange();
+            }
+#endif
+
+            fixed (ulong *src = &buffer[offset]) {
+                Buffer.MoveMemory(&data[byteOffset], (byte *)src,
+                                  count * sizeof(ulong));
+            }
+        }
+
+        public unsafe void Copy8(int byteSource,
+                                 int byteDestination,
+                                 int count)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            if (byteDestination + count > bytes || byteDestination < 0) {
+                Error.AccessOutOfRange();
+            }
+            if (byteSource + count > bytes || byteSource < 0) {
+                Error.AccessOutOfRange();
+            }
+#endif
+            Buffer.MoveMemory(&data[byteDestination], &data[byteSource],
+                              count);
+        }
+
+        public unsafe void Copy16(int byteSource,
+                                  int byteDestination,
+                                  int count)
+        {
+            Copy8(byteSource, byteDestination, count * sizeof(ushort));
+        }
+
+        public unsafe void Copy32(int byteSource,
+                                  int byteDestination,
+                                  int count)
+        {
+            Copy8(byteSource, byteDestination, count * sizeof(uint));
+        }
+
+        public unsafe void Copy64(int byteSource,
+                                  int byteDestination,
+                                  int count)
+        {
+            Copy8(byteSource, byteDestination, count * sizeof(ulong));
+        }
+
+#if SINGULARITY_KERNEL
+
+        [NoHeapAllocation]
+        private IoResult CheckCopy(int byteSource,
+                                   int byteDestination,
+                                   int byteCount)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                return IoResult.WriteNotSupported;
+            }
+            if (!readable) {
+                return IoResult.ReadNotSupported;
+            }
+            if (byteDestination + byteCount > bytes ||
+                byteDestination < 0) {
+                return IoResult.AccessOutOfRange;
+            }
+            if ((byteSource + byteCount) > bytes ||
+                byteSource < 0 ||
+                byteCount < 0) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif // DONT_CHECK_IO_BOUNDS
+            return IoResult.Success;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Copy8NoThrow(int byteSource,
+                                            int byteDestination,
+                                            int count)
+        {
+            int byteCount = count * sizeof(byte);
+            IoResult check = CheckCopy(byteSource, byteDestination, byteCount);
+            if (IoResult.Success == check) {
+                Buffer.MoveMemory(&data[byteDestination], &data[byteSource],
+                                  byteCount);
+            }
+            return check;
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Copy16NoThrow(int byteSource,
+                                             int byteDestination,
+                                             int count)
+        {
+            return Copy8NoThrow(byteSource, byteDestination,
+                                count * sizeof(ushort));
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Copy32NoThrow(int byteSource,
+                                             int byteDestination,
+                                             int count)
+        {
+            return Copy8NoThrow(byteSource, byteDestination,
+                                count * sizeof(uint));
+        }
+
+        [NoHeapAllocation]
+        public unsafe IoResult Copy64NoThrow(int byteSource,
+                                             int byteDestination,
+                                             int count)
+        {
+            return Copy8NoThrow(byteSource, byteDestination,
+                                count * sizeof(ulong));
+        }
+#endif //SINGULARITY_KERNEL
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoMemoryRange.cs b/base/Kernel/Singularity/Io/IoMemoryRange.cs
new file mode 100644
index 0000000..332d3f4
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoMemoryRange.cs
@@ -0,0 +1,114 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoMemoryRange.cs
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoMemoryRange : IoRange
+    {
+        private readonly UIntPtr addr; // PHYSICAL address
+        private readonly UIntPtr size;
+        private readonly bool readable;
+        private readonly bool writable;
+
+#if SINGULARITY_KERNEL
+        public IoMemoryRange(UIntPtr addr, UIntPtr size, Access access)
+#elif SINGULARITY_PROCESS
+        internal IoMemoryRange(UIntPtr addr, UIntPtr size, Access access)
+#endif // SINGULARITY_PROCESS
+        {
+            this.addr = addr;
+            this.size = size;
+            this.readable = (access & Access.Read) != 0;
+            this.writable = (access & Access.Write) != 0;
+        }
+
+#if SINGULARITY_KERNEL
+        public IoMemoryRange(UIntPtr addr, UIntPtr size, bool readable, bool writable)
+#elif SINGULARITY_PROCESS
+        internal IoMemoryRange(UIntPtr addr, UIntPtr size, bool readable, bool writable)
+#endif // SINGULARITY_PROCESS
+        {
+            this.addr = addr;
+            this.size = size;
+            this.readable = readable;
+            this.writable = writable;
+        }
+
+        public IoMemory MemoryAtOffset(uint offset, int bytes, Access access)
+        {
+            return MemoryAtOffset((UIntPtr)offset, bytes, access);
+        }
+
+        public IoMemory MemoryAtOffset(UIntPtr offset, int bytes, Access access)
+        {
+            return MemoryAtOffset(offset, bytes,
+                                  (access & Access.Read) != 0,
+                                  (access & Access.Write) != 0);
+        }
+
+        public IoMemory MemoryAtOffset(UIntPtr offset, int bytes, bool readable, bool writable)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (bytes < 0 || offset + bytes > size) {
+                throw new OverflowException("MemoryAtOffset out of range.");
+            }
+            if ((readable && !this.readable) || (writable && !this.writable)) {
+                throw new OverflowException("MemoryAtOffset invalid access");
+            }
+#endif
+            return IoMemory.MapPhysicalMemory(addr + offset, (uint)bytes,
+                                              readable, writable);
+        }
+
+        public override string ToString()
+        {
+            return String.Format("32:{0,8:x8}[{1:x}]", (uint)addr, (uint)size);
+        }
+
+#if SINGULARITY_KERNEL
+        // The returned address is the PHYSICAL address and is most
+        // likely not usable without constructing an IoMemory object.
+        public PhysicalAddress PhysicalAddress
+        {
+            get { return new PhysicalAddress((ulong)addr); }
+        }
+#endif
+
+        public UIntPtr Length
+        {
+            get { return size; }
+        }
+
+        public bool Readable
+        {
+            get { return readable; }
+        }
+
+        public bool Writable
+        {
+            get { return writable; }
+        }
+
+
+#if SINGULARITY_KERNEL
+        public override uint RangeBase {
+            get { return (uint)addr; }
+        }
+
+        public override uint RangeLength {
+            get { return (uint)size; }
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoPort.cs b/base/Kernel/Singularity/Io/IoPort.cs
new file mode 100644
index 0000000..c7a45f5
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoPort.cs
@@ -0,0 +1,538 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoPort.cs
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+#if SINGULARITY_PROCESS
+using Microsoft.Singularity.V1.Services;
+#endif
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoPort
+    {
+        private readonly ushort port;
+        private readonly ushort size;
+        private readonly bool readable;
+        private readonly bool writable;
+
+#if SINGULARITY_KERNEL
+        public IoPort(ushort port, ushort size, Access access)
+#elif SINGULARITY_PROCESS
+        internal IoPort(ushort port, ushort size, Access access)
+#endif // SINGULARITY_PROCESS
+        {
+            this.port = port;
+            this.size = size;
+            this.readable = (access & Access.Read) != 0;
+            this.writable = (access & Access.Write) != 0;
+        }
+
+#if SINGULARITY_KERNEL
+        public IoPort(ushort port, ushort size, bool readable, bool writable)
+#elif SINGULARITY_PROCESS
+        internal IoPort(ushort port, ushort size, bool readable, bool writable)
+#endif // SINGULARITY_PROCESS
+        {
+            this.port = port;
+            this.size = size;
+            this.readable = readable;
+            this.writable = writable;
+        }
+
+        public ushort Port {
+            [NoHeapAllocation]
+            get { return port; }
+        }
+
+        public ushort Size {
+            [NoHeapAllocation]
+            get { return size; }
+        }
+
+        public bool Readable {
+            [NoHeapAllocation]
+            get { return readable; }
+        }
+
+        public bool Writable {
+            [NoHeapAllocation]
+            get { return writable; }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("IO:{0,4:x4}[{1}]",
+                                 port,
+                                 (readable && writable) ? "R/W" :
+                                 (readable) ? "R" : "W");
+        }
+
+        [Inline]
+        public void Write8(byte value)
+        {
+            Write8(0, value);
+        }
+
+        [Inline]
+        public void Write16(ushort value)
+        {
+            Write16(0, value);
+        }
+
+        [Inline]
+        public void Write16(ushort[] values)
+        {
+            Write16(0, values);
+        }
+
+        [Inline]
+        public void Write32(uint value)
+        {
+            Write32(0, value);
+        }
+
+        [Inline]
+        public byte Read8()
+        {
+            return Read8(0);
+        }
+
+        [Inline]
+        public ushort Read16()
+        {
+            return Read16(0);
+        }
+
+        [Inline]
+        public uint Read32()
+        {
+            return Read32(0);
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+
+        [Inline]
+        private void CheckRead(uint offset, uint bytes)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!readable) {
+                Error.ReadNotSupported();
+            }
+            else if (offset + bytes > size) {
+                Error.AccessOutOfRange();
+            }
+#endif // DONT_CHECK_IO_BOUNDS
+        }
+
+        [Inline]
+        private void CheckWrite(uint offset, uint bytes)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!writable) {
+                Error.WriteNotSupported();
+            }
+            else if (offset + bytes > size) {
+                Error.AccessOutOfRange();
+            }
+#endif // DONT_CHECK_IO_BOUNDS
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        private void DebugBreak()
+        {
+#if SINGULARITY_KERNEL
+            DebugStub.Break();
+#elif SINGULARITY_PROCESS
+            DebugService.Break();
+#endif // SINGULARITY_PROCESS
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //
+
+        [Inline]
+        public void Write8(uint offset, byte value)
+        {
+            CheckWrite(offset, 1);
+            HalWriteInt8(port + offset, value);
+        }
+
+        [Inline]
+        public void Write16(uint offset, ushort value)
+        {
+            CheckWrite(offset, 2);
+            HalWriteInt16(port + offset, value);
+        }
+
+        [Inline]
+        public void Write16(uint offset, ushort[] values)
+        {
+            CheckWrite(offset, 2);
+            for (int i = 0; i < values.Length; i++) {
+                HalWriteInt16(port + offset, values[i]);
+            }
+        }
+
+        [Inline]
+        public void Write32(uint offset, uint value)
+        {
+            CheckWrite(offset, 4);
+            HalWriteInt32(port + offset, value);
+        }
+
+        [Inline]
+        public byte Read8(uint offset)
+        {
+            CheckRead(offset, 1);
+            return HalReadInt8(port + offset);
+        }
+
+        [Inline]
+        public ushort Read16(uint offset)
+        {
+            CheckRead(offset, 2);
+            return HalReadInt16(port + offset);
+        }
+
+        [Inline]
+        public uint Read32(uint offset)
+        {
+            CheckRead(offset, 4);
+            return HalReadInt32(port + offset);
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Export non-exception throwing operations
+        //
+        // These are intended for use in the kernel on
+        // NoHeapAllocation paths.  The caller is expected to
+        // check the result and/or know pre-conditions for the
+        // I/O operation.
+
+#region NoHeapAllocation Read/Write operations
+#if SINGULARITY_KERNEL
+        [Inline]
+        [NoHeapAllocation]
+        private unsafe IoResult CheckReadNoThrow(uint offset, int bytes)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!this.readable) {
+                return IoResult.ReadNotSupported;
+            }
+            if (offset + bytes > this.size) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif // DONT_CHECK_IO_BOUNDS
+            return IoResult.Success;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        private unsafe IoResult CheckWriteNoThrow(uint offset, int bytes)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (!this.writable) {
+                return IoResult.WriteNotSupported;
+            }
+            if (offset + bytes > this.size) {
+                return IoResult.AccessOutOfRange;
+            }
+#endif // DONT_CHECK_IO_BOUNDS
+            return IoResult.Success;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read8NoThrow(uint offset, out byte value)
+        {
+            IoResult check = CheckReadNoThrow(offset, 1);
+            if (IoResult.Success == check) {
+                value = HalReadInt8(port + offset);
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read16NoThrow(uint offset, out ushort value)
+        {
+            IoResult check = CheckReadNoThrow(offset, 2);
+            if (IoResult.Success == check) {
+                value = HalReadInt16(port + offset);
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Read32NoThrow(uint offset, out uint value)
+        {
+            IoResult check = CheckReadNoThrow(offset, 4);
+            if (IoResult.Success == check) {
+                value = HalReadInt32(port + offset);
+            }
+            else {
+                value = 0;
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public IoResult Read8NoThrow(out byte value)
+        {
+            return Read8NoThrow(0, out value);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public IoResult Read16NoThrow(out ushort value)
+        {
+            return Read16NoThrow(0, out value);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public IoResult Read32NoThrow(out uint value)
+        {
+            return Read32NoThrow(0, out value);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write8NoThrow(uint offset, byte value)
+        {
+            IoResult check = CheckWriteNoThrow(offset, 1);
+            if (IoResult.Success == check) {
+                HalWriteInt8(port + offset, value);
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write16NoThrow(uint offset, ushort value)
+        {
+            IoResult check = CheckWriteNoThrow(offset, 2);
+            if (IoResult.Success == check) {
+                HalWriteInt16(port + offset, value);
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public unsafe IoResult Write32NoThrow(uint offset, uint value)
+        {
+            IoResult check = CheckWriteNoThrow(offset, 4);
+            if (IoResult.Success == check) {
+                HalWriteInt32(port + offset, value);
+            }
+            return check;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public IoResult Write8NoThrow(byte value)
+        {
+            return Write8NoThrow(0, value);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public IoResult Write16NoThrow(ushort value)
+        {
+            return Write16NoThrow(0, value);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public IoResult Write32NoThrow(uint value)
+        {
+            return Write32NoThrow(0, value);
+        }
+
+#endif // SINGULARITY_KERNEL
+#endregion // NoHeapAllocation Read/Write operations
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        public byte WaitClear8(byte mask)
+        {
+            CheckRead(0, 1);
+
+            for (int i = 0; i < 100000000; i++) {
+                byte value;
+                if (((value = HalReadInt8(port)) & mask) == 0) {
+                    return value;
+                }
+            }
+
+            DebugBreak();
+
+            return HalReadInt8(port);
+        }
+
+        public ushort WaitClear16(ushort mask)
+        {
+            CheckRead(0, 2);
+
+            for (int i = 0; i < 100000000; i++) {
+                ushort value;
+                if (((value = HalReadInt16(port)) & mask) == 0) {
+                    return value;
+                }
+            }
+
+            DebugBreak();
+
+            return HalReadInt16(port);
+        }
+
+        public uint WaitClear32(uint mask)
+        {
+            CheckRead(0, 4);
+
+            for (int i = 0; i < 100000000; i++) {
+                uint value;
+                if (((value = HalReadInt32(port)) & mask) == 0) {
+                    return value;
+                }
+            }
+
+            DebugBreak();
+
+            return HalReadInt32(port);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        public byte WaitSet8(byte mask)
+        {
+            CheckRead(0, 1);
+
+            for (int i = 0; i < 100000000; i++) {
+                byte value;
+                if (((value = HalReadInt8(port)) & mask) != 0) {
+                    return value;
+                }
+            }
+
+            DebugBreak();
+
+            return HalReadInt8(port);
+        }
+
+        public ushort WaitSet16(ushort mask)
+        {
+            CheckRead(0, 2);
+
+            for (int i = 0; i < 100000000; i++) {
+                ushort value;
+                if (((value = HalReadInt16(port)) & mask) != 0) {
+                    return value;
+                }
+            }
+
+            DebugBreak();
+
+            return HalReadInt16(port);
+        }
+
+        public uint WaitSet32(uint mask)
+        {
+            CheckRead(0, 4);
+
+            for (int i = 0; i < 100000000; i++) {
+                uint value;
+                if (((value = HalReadInt32(port)) & mask) != 0) {
+                    return value;
+                }
+            }
+
+            DebugBreak();
+
+            return HalReadInt32(port);
+        }
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static extern byte HalReadInt8(uint port);
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static extern void HalWriteInt8(uint port, byte value);
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static extern ushort HalReadInt16(uint port);
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static extern void HalWriteInt16(uint port, ushort value);
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static extern uint HalReadInt32(uint port);
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(12)]
+        [NoHeapAllocation]
+        private static extern void HalWriteInt32(uint port, uint value);
+
+#if DO_UNSAFE_CODE_IN_IO
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [NoHeapAllocation]
+        private static extern unsafe void HalReadFifo16(uint port,
+                                                        [In] ushort *data,
+                                                        uint count);
+
+        [AccessedByRuntime("output to header : defined in IoPort.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [NoHeapAllocation]
+        private static extern unsafe void HalWriteFifo16(uint port,
+                                                         [In,Out] ushort *data,
+                                                         uint Count);
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoPortRange.cs b/base/Kernel/Singularity/Io/IoPortRange.cs
new file mode 100644
index 0000000..28bcce4
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoPortRange.cs
@@ -0,0 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoPortRange.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public sealed class IoPortRange : IoRange
+    {
+        private readonly ushort port;
+        private readonly ushort size;
+        private readonly bool readable;
+        private readonly bool writable;
+
+#if SINGULARITY_KERNEL
+        public IoPortRange(ushort port, ushort size, Access access)
+#elif SINGULARITY_PROCESS
+        internal IoPortRange(ushort port, ushort size, Access access)
+#endif // SINGULARITY_PROCESS
+        {
+            this.port = port;
+            this.size = size;
+            this.readable = (access & Access.Read) != 0;
+            this.writable = (access & Access.Write) != 0;
+        }
+
+#if SINGULARITY_KERNEL
+        public IoPortRange(ushort port, ushort size, bool readable, bool writable)
+#elif SINGULARITY_PROCESS
+        internal IoPortRange(ushort port, ushort size, bool readable, bool writable)
+#endif // SINGULARITY_PROCESS
+        {
+            this.port = port;
+            this.size = size;
+            this.readable = readable;
+            this.writable = writable;
+        }
+
+        public IoPortRange RangeAtOffset(ushort offset, ushort bytes,
+                                         bool readable, bool writeable)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (offset + bytes > size) {
+                throw new OverflowException("PortAtOffset out of range.");
+            }
+            if ((readable && !this.readable) || (writable && !this.writable)) {
+                throw new OverflowException("PortAtOffset invalid access");
+            }
+#endif
+            return new IoPortRange((ushort)(port + offset), bytes, readable, writable);
+        }
+
+        public IoPort PortAtOffset(ushort offset, ushort bytes, Access access)
+        {
+            return PortAtOffset(offset,
+                                bytes,
+                                (access & Access.Read) != 0,
+                                (access & Access.Write) != 0);
+        }
+
+        public IoPort PortAtOffset(ushort offset, ushort bytes, bool readable, bool writable)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if (offset + bytes > size) {
+                throw new OverflowException("PortAtOffset out of range.");
+            }
+            if ((readable && !this.readable) || (writable && !this.writable)) {
+                throw new OverflowException("PortAtOffset invalid access");
+            }
+#endif
+            return new IoPort((ushort)(port + offset), bytes, readable, writable);
+        }
+
+        public ushort Port
+        {
+            get { return port; }
+        }
+
+        public ushort Size
+        {
+            get { return size; }
+        }
+
+        public bool Readable
+        {
+            get { return readable; }
+        }
+
+        public bool Writable
+        {
+            get { return writable; }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("IO:{0,4:x4}[{1:x}]", port, size);
+        }
+
+#if SINGULARITY_KERNEL
+        public override uint RangeBase {
+            get { return (uint)port; }
+        }
+
+        public override uint RangeLength {
+            get { return (uint)size; }
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoRange.cs b/base/Kernel/Singularity/Io/IoRange.cs
new file mode 100644
index 0000000..b681e71
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoRange.cs
@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoRange.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public abstract class IoRange
+    {
+#if SINGULARITY_KERNEL
+        public abstract uint RangeBase {
+            get;
+        }
+
+        public abstract uint RangeLength {
+            get;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Io/IoResult.cs b/base/Kernel/Singularity/Io/IoResult.cs
new file mode 100644
index 0000000..066e70b
--- /dev/null
+++ b/base/Kernel/Singularity/Io/IoResult.cs
@@ -0,0 +1,23 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IoStatusCode.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    public enum IoResult : int
+    {
+        Success           = 0,
+        ReadNotSupported  = 1,
+        WriteNotSupported = 2,
+        AccessOutOfRange  = 4,
+    }
+}
diff --git a/base/Kernel/Singularity/Io/PciConfig.cs b/base/Kernel/Singularity/Io/PciConfig.cs
new file mode 100644
index 0000000..40bc168
--- /dev/null
+++ b/base/Kernel/Singularity/Io/PciConfig.cs
@@ -0,0 +1,1302 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PciConfig.cs
+//
+//  Note:
+//
+
+#define VERBOSE
+//#define DEBUG_PCI
+
+using System;
+using StringBuilder = System.Text.StringBuilder;
+using System.Collections;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class PciConfig : IoConfig
+    {
+        //
+        // Bit encodings for  PCI_COMMON_CONFIG.HeaderType
+        //
+
+        public const uint PCI_MULTIFUNCTION   = 0x800000; // full dword
+        public const uint PCI_TYPE_MASK       = 0x7f0000; // full dword
+        public const uint PCI_DEVICE_TYPE     = 0x000000; // full dword
+        public const uint PCI_BRIDGE_TYPE     = 0x010000; // full dword
+        public const uint PCI_CARDBUS_TYPE    = 0x020000; // full dword
+
+        //
+        // Bit encodings for PCI_COMMON_CONFIG.Control
+        //
+        public const uint PCI_CONFIG_Command                  = 0x0004;
+
+        public const uint PCI_ENABLE_IO_SPACE        = 0x0001;
+        public const uint PCI_ENABLE_MEMORY_SPACE    = 0x0002;
+        public const uint PCI_ENABLE_BUS_MASTER      = 0x0004;
+        const uint PCI_ENABLE_SPECIAL_CYCLES         = 0x0008;
+        const uint PCI_ENABLE_WRITE_AND_INVALIDATE   = 0x0010;
+        const uint PCI_ENABLE_VGA_COMPATIBLE_PALETTE = 0x0020;
+        const uint PCI_ENABLE_PARITY                 = 0x0040; // (ro+)
+        const uint PCI_ENABLE_WAIT_CYCLE             = 0x0080; // (ro+)
+        const uint PCI_ENABLE_SERR                   = 0x0100; // (ro+)
+        const uint PCI_ENABLE_FAST_BACK_TO_BACK      = 0x0200; // (ro)
+        const uint PCI_DISABLE_INTERRUPTS            = 0x0400;
+
+        //
+        // Bit encodings for PCI_COMMON_CONFIG.Status
+        //
+        const uint PCI_STATUS_FAST_BACK_TO_BACK        = 0x0080;  // (ro)
+        const uint PCI_STATUS_DATA_PARITY_DETECTED     = 0x0100;
+        const uint PCI_STATUS_DEVSEL                   = 0x0600;  // 2 bits wide
+        const uint PCI_STATUS_SIGNALED_TARGET_ABORT    = 0x0800;
+        const uint PCI_STATUS_RECEIVED_TARGET_ABORT    = 0x1000;
+        const uint PCI_STATUS_RECEIVED_MASTER_ABORT    = 0x2000;
+        const uint PCI_STATUS_SIGNALED_SYSTEM_ERROR    = 0x4000;
+        const uint PCI_STATUS_DETECTED_PARITY_ERROR    = 0x8000;
+
+        // Bit encodes for PCI_COMMON_CONFIG.u.type0.BaseAddresses
+        //
+        const uint PCI_ADDRESS_IO_SPACE                = 0x00000001;  // (ro)
+        const uint PCI_ADDRESS_MEMORY_TYPE_MASK        = 0x00000006;  // (ro)
+        const uint PCI_ADDRESS_MEMORY_PREFETCHABLE     = 0x00000008;  // (ro)
+
+        const uint PCI_TYPE_32BIT      = 0;
+        const uint PCI_TYPE_20BIT      = 2;
+        const uint PCI_TYPE_64BIT      = 4;
+
+        const uint PCI_ROMADDRESS_ENABLED              = 0x00000001;
+
+        const uint PCI_ENABLE_BRIDGE_PARITY_ERROR        = 0x0001;
+        const uint PCI_ENABLE_BRIDGE_SERR                = 0x0002;
+        const uint PCI_ENABLE_BRIDGE_ISA                 = 0x0004;
+        const uint PCI_ENABLE_BRIDGE_VGA                 = 0x0008;
+        const uint PCI_ENABLE_BRIDGE_MASTER_ABORT_SERR   = 0x0020;
+        const uint PCI_ASSERT_BRIDGE_RESET               = 0x0040;
+        const uint PCI_ENABLE_BRIDGE_FAST_BACK_TO_BACK   = 0x0080;
+
+        const byte PCI_CLASS_STORAGE            = 0x01;
+        const byte PCI_CLASS_NETWORK            = 0x02;
+        const byte PCI_CLASS_DISPLAY            = 0x03;
+        const byte PCI_CLASS_MULTIMEDIA         = 0x04;
+        const byte PCI_CLASS_MEMORY             = 0x05;
+        const byte PCI_CLASS_BRIDGE             = 0x06;
+        const byte PCI_CLASS_COMMUNICATION      = 0x07;
+        const byte PCI_CLASS_SYSTEM             = 0x08;
+        const byte PCI_CLASS_INPUT              = 0x09;
+        const byte PCI_CLASS_DOCKING            = 0x0a;
+        const byte PCI_CLASS_PROCESSOR          = 0x0b;
+        const byte PCI_CLASS_SERIAL             = 0x0c;
+        const byte PCI_CLASS_WIRELESS           = 0x0d;
+        const byte PCI_CLASS_I2O                = 0x0e;
+        const byte PCI_CLASS_SATELLITE          = 0x0f;
+        const byte PCI_CLASS_ENCRYPTION         = 0x10;
+        const byte PCI_CLASS_ACQUISITION        = 0x11;
+        const byte PCI_CLASS_OTHERS             = 0xff;
+
+        const byte PCI_CLASS_STORAGE_SCSI       = 0x00;
+        const byte PCI_CLASS_STORAGE_IDE        = 0x01; // NB: Interface
+        const byte PCI_CLASS_STORAGE_FLOPPY     = 0x02;
+        const byte PCI_CLASS_STORAGE_IPI        = 0x03;
+        const byte PCI_CLASS_STORAGE_RAID       = 0x04;
+        const byte PCI_CLASS_STORAGE_ATA        = 0x05; // NB: Interface
+        const byte PCI_CLASS_STORAGE_OTHER      = 0x80;
+
+        const byte PCI_CLASS_NETWORK_ETHERNET   = 0x00;
+        const byte PCI_CLASS_NETWORK_RING       = 0x01;
+        const byte PCI_CLASS_NETWORK_FDDI       = 0x02;
+        const byte PCI_CLASS_NETWORK_ATM        = 0x03;
+        const byte PCI_CLASS_NETWORK_ISDN       = 0x04;
+        const byte PCI_CLASS_NETWORK_FIP        = 0x05;
+        const byte PCI_CLASS_NETWORK_PICMG      = 0x06; // NB: Interface
+        const byte PCI_CLASS_NETWORK_OTHER      = 0x80;
+
+        const byte PCI_CLASS_DISPLAY_VGA        = 0x00; // NB: Interface
+        const byte PCI_CLASS_DISPLAY_XGA        = 0x01;
+        const byte PCI_CLASS_DISPLAY_3D         = 0x02;
+        const byte PCI_CLASS_DISPLAY_OTHER      = 0x80;
+
+        const byte PCI_CLASS_MULTIMEDIA_VIDEO   = 0x00;
+        const byte PCI_CLASS_MULTIMEDIA_AUDIO   = 0x01;
+        const byte PCI_CLASS_MULTIMEDIA_TELEPHONY   = 0x02;
+        const byte PCI_CLASS_MULTIMEDIA_OTHER   = 0x80;
+
+        const byte PCI_CLASS_MEMORY_RAM         = 0x00;
+        const byte PCI_CLASS_MEMORY_FLASH       = 0x01;
+        const byte PCI_CLASS_MEMORY_OTHER       = 0x80;
+
+        const byte PCI_CLASS_BRIDGE_HOST        = 0x00;
+        const byte PCI_CLASS_BRIDGE_ISA         = 0x01;
+        const byte PCI_CLASS_BRIDGE_EISA        = 0x02;
+        const byte PCI_CLASS_BRIDGE_MC          = 0x03;
+        const byte PCI_CLASS_BRIDGE_PCI         = 0x04; // NB: Interface
+        const byte PCI_CLASS_BRIDGE_PCMCIA      = 0x05;
+        const byte PCI_CLASS_BRIDGE_NUBUS       = 0x06;
+        const byte PCI_CLASS_BRIDGE_CARDBUS     = 0x07;
+        const byte PCI_CLASS_BRIDGE_RACEWAY     = 0x08; // NB: Interface
+        const byte PCI_CLASS_BRIDGE_SEMIPCI     = 0x09; // NB: Interface
+        const byte PCI_CLASS_BRIDGE_INFINIBAND  = 0x0a;
+        const byte PCI_CLASS_BRIDGE_OTHER       = 0x80;
+
+        const byte PCI_CLASS_COMMUNICATION_SERIAL       = 0x00; // NB: Interface
+        const byte PCI_CLASS_COMMUNICATION_PARALLEL     = 0x01; // NB: Interface
+        const byte PCI_CLASS_COMMUNICATION_MULTIPORT    = 0x02;
+        const byte PCI_CLASS_COMMUNICATION_MODEM        = 0x03; // NB: Interface
+        const byte PCI_CLASS_COMMUNICATION_GPIB         = 0x04;
+        const byte PCI_CLASS_COMMUNICATION_SMARTCARD    = 0x05;
+        const byte PCI_CLASS_COMMUNICATION_OTHER        = 0x80;
+
+        const byte PCI_CLASS_SYSTEM_PIC         = 0x00; // NB: Interface
+        const byte PCI_CLASS_SYSTEM_DMA         = 0x01; // NB: Interface
+        const byte PCI_CLASS_SYSTEM_TIMER       = 0x02; // NB: Interface
+        const byte PCI_CLASS_SYSTEM_RTC         = 0x03; // NB: Interface
+        const byte PCI_CLASS_SYSTEM_PCIHP       = 0x04;
+        const byte PCI_CLASS_SYSTEM_OTHER       = 0x80;
+
+        const byte PCI_CLASS_INPUT_KEYBOARD     = 0x00;
+        const byte PCI_CLASS_INPUT_PEN          = 0x01;
+        const byte PCI_CLASS_INPUT_MOUSE        = 0x02;
+        const byte PCI_CLASS_INPUT_SCANNER      = 0x03;
+        const byte PCI_CLASS_INPUT_GAMEPORT     = 0x04; // NB: Interface
+        const byte PCI_CLASS_INPUT_OTHER        = 0x80;
+
+        const byte PCI_CLASS_SERIAL_FIREWIRE    = 0x00; // NB: Interface
+        const byte PCI_CLASS_SERIAL_ACCESS      = 0x01;
+        const byte PCI_CLASS_SERIAL_SSA         = 0x02;
+        const byte PCI_CLASS_SERIAL_USB         = 0x03; // NB: Interface
+        const byte PCI_CLASS_SERIAL_FIBRE       = 0x04;
+        const byte PCI_CLASS_SERIAL_SMBUS       = 0x05;
+        const byte PCI_CLASS_SERIAL_INFINIBAND  = 0x06;
+        const byte PCI_CLASS_SERIAL_IPMI        = 0x07; // NB: Interface
+        const byte PCI_CLASS_SERIAL_SERCOS      = 0x08;
+        const byte PCI_CLASS_SERIAL_CANBUS      = 0x09;
+
+        const byte PCI_CLASS_WIRELESS_IRDA      = 0x00;
+        const byte PCI_CLASS_WIRELESS_IR        = 0x01;
+        const byte PCI_CLASS_WIRELESS_RF        = 0x10;
+        const byte PCI_CLASS_WIRELESS_BLUETOOTH = 0x11;
+        const byte PCI_CLASS_WIRELESS_BROADBAND = 0x12;
+        const byte PCI_CLASS_WIRELESS_OTHER     = 0x80;
+
+        const byte PCI_CLASS_I2O_I2O            = 0x00; // NB: Interface
+
+        const byte PCI_CLASS_SATELLITE_TV       = 0x01;
+        const byte PCI_CLASS_SATELLITE_AUDIO    = 0x02;
+        const byte PCI_CLASS_SATELLITE_VOICE    = 0x03;
+        const byte PCI_CLASS_SATELLITE_DATA     = 0x04;
+
+        const byte PCI_CLASS_ENCRYPTION_NETWORK = 0x00;
+        const byte PCI_CLASS_ENCRYPTION_ENTERTAINMENT = 0x10;
+        const byte PCI_CLASS_ENCRYPTION_OTHER   = 0x80;
+
+        const byte PCI_CLASS_ACQUISITION_DPIO   = 0x00;
+        const byte PCI_CLASS_ACQUISITION_PERF   = 0x01;
+        const byte PCI_CLASS_ACQUISITION_COMM   = 0x10;
+        const byte PCI_CLASS_ACQUISITION_MGMT   = 0x20;
+        const byte PCI_CLASS_ACQUISITION_OTHER  = 0x80;
+
+        const int PCI_INTERRUPT_LINE = 0x3c;
+
+        const int PCI_INTERRUPT_PIN  = 0x3d;
+        const byte PCI_INTERRUPT_PIN_A = 1;
+        const byte PCI_INTERRUPT_PIN_B = 2;
+        const byte PCI_INTERRUPT_PIN_C = 3;
+        const byte PCI_INTERRUPT_PIN_D = 4;
+
+        protected PciPort   port;
+
+        public ushort       VendorId;               // 00..01 (ro)
+        public ushort       DeviceId;               // 02..03 (ro)
+        public ushort       Control;                // 04..05 Device control
+        public ushort       Status;                 // 06..07
+        protected byte      RevisionId;             // 08..08 (ro)
+        public byte         Interface;              // 09..09 (ro)
+        protected byte      SubClassId;             // 0a..0a (ro)
+        protected byte      ClassId;                // 0b..0b (ro)
+        public byte         CacheLineSize;          // 0c..0c (ro+)
+        protected byte      LatencyTimer;           // 0d..0d (ro+)
+        protected byte      HeaderType;             // 0e..0e (ro)
+        protected byte      BIST;                   // 0f..0f Built in self test
+
+        protected uint[]    BaseAddresses;          // 10..17 or ..27 [2 or 6]
+        protected uint[]    BaseAddrSizes;
+
+        protected ushort    SubsystemVendorId;      // 2c..2d (devices only)
+        protected ushort    SubsystemDeviceId;      // 2e..2f (devices only)
+
+        protected uint      ROMBaseAddress;         // 38..3b or 30.33
+        protected byte      InterruptPin;           // 3d..3d
+
+        public static PciConfig Create(String[] ids, PciPort port,
+                                       IoRange [] fixedRanges)
+        {
+            uint u = port.Read32(0);
+            if (u == ~0u || u == 0) {
+                return null;
+            }
+
+            PciConfig config = null;
+
+            u = port.Read32(0x0c);
+            switch (u & PciConfig.PCI_TYPE_MASK) {
+                case PciConfig.PCI_DEVICE_TYPE:
+                    config = new PciDeviceConfig(port);
+                    break;
+                case PciConfig.PCI_BRIDGE_TYPE:
+                    config = new PciBridgeConfig(port);
+                    break;
+                case PciConfig.PCI_CARDBUS_TYPE:
+                    config = new PciCardbusConfig(port);
+                    break;
+            }
+            if (config != null) {
+                config.FixedRanges = fixedRanges;
+            }
+            return config;
+        }
+
+        internal PciConfig(String[] ids, PciPort port)
+        {
+            this.port = port;
+            this.Read();
+            this.Ids = ids;
+        }
+
+        public PciConfig(PciPort port)
+        {
+            this.port = port;
+        }
+
+        public ushort AddressPort
+        {
+            get { return port.addressPort.Port; }
+        }
+
+        public ushort DataPort
+        {
+            get { return port.dataPort.Port; }
+        }
+
+        public ushort Identifier
+        {
+            get { return port.identifier; }
+        }
+
+        public IoIrqRange GetIrq()
+        {
+            return new IoIrqRange(InterruptLine, 1);
+        }
+
+        public void SetInterrupt(byte irq)
+        {
+            Write8(PCI_INTERRUPT_LINE, irq);
+        }
+
+        public byte InterruptLine
+        {
+            get { return Read8(PCI_INTERRUPT_LINE); }
+        }
+
+        public void EnableIoSpace(bool Enable)
+        {
+            uint control = Read32(0x04);
+            uint send = (control | PCI_ENABLE_IO_SPACE) & 0xffff;
+            Write32(0x04, send);
+        }
+
+        public uint Read32(int offset) {
+            return port.Read32(offset);
+        }
+
+        public void Write32(int offset, uint value) {
+            port.Write32(offset, value);
+        }
+
+        protected ushort Read16(uint offset) {
+            return port.Read16(offset);
+        }
+
+        protected void Write16(int offset, ushort value) {
+            port.Write16(offset, value);
+        }
+
+        public byte Read8(int offset) {
+            return port.Read8(offset);
+        }
+
+        protected void Write8(int offset, byte value) {
+            port.Write8(offset, value);
+        }
+
+        protected virtual void Read()
+        {
+            uint u;
+
+            u = Read32(0x00);
+            VendorId = (ushort)(u & 0xffff);
+            DeviceId = (ushort)((u >> 16) & 0xffff);
+
+            u = Read32(0x04);
+            Control = (ushort)(u & 0xffff);
+            Status = (ushort)((u >> 16) & 0xffff);
+
+            u = Read32(0x08);
+            RevisionId = (byte)(u & 0xff);
+            Interface = (byte)((u >> 8) & 0xff);
+            SubClassId = (byte)((u >> 16) & 0xff);
+            ClassId = (byte)((u >> 24) & 0xff);
+
+            u = Read32(0x0c);
+            CacheLineSize = (byte)(u & 0xff);
+            LatencyTimer = (byte)((u >> 8) & 0xff);
+            HeaderType = (byte)((u >> 16) & 0xff);
+            BIST = (byte)((u >> 24) & 0xff);
+
+            this.Ids = GetIds();
+
+#if VERBOSE || DEBUG_PCI
+            foreach (string id in Ids)
+            {
+                Tracing.Log(Tracing.Debug, "DeviceId: " + id);
+            }
+            // Tracing.Log(Tracing.Debug, "Read: {0}", Id);
+#endif
+        }
+
+        /// <summary>
+        /// <para>
+        /// Builds the list of device IDs for this PCI device.  We generate the same 
+        /// strings that Windows uses for its hardware IDs and compatible IDs.
+        /// The order is significant; the PNP manager will search the device IDs,
+        /// one by one, for a device driver that matches.  The list is ordered from
+        /// most specific to least specific.
+        /// </para>
+        ///
+        /// <para>
+        /// WDM "hardware IDs":
+        ///      PCI\VEN_xxxy&amp;DEV_yyyy&amp;SUBSYS_zzzzzzzz&amp;REV_rr
+        ///      PCI\VEN_xxxy&amp;DEV_yyyy&amp;SUBSYS_zzzzzzzz
+        ///      PCI\VEN_xxxy&amp;DEV_yyyy&amp;CC_ccssii
+        ///      PCI\VEN_xxxy&amp;DEV_yyyy&amp;CC_ccss
+        ///      PCI\VEN_xxxy
+        /// </para>
+        ///
+        /// <para>
+        /// WDM "compatible IDs":
+        ///      PCI\VEN_xxxy&amp;DEV_yyyy&amp;REV_rr
+        ///      PCI\VEN_xxxy&amp;DEV_yyyy
+        ///      PCI\VEN_xxxx&amp;CC_ccssii
+        ///      PCI\VEN_xxxx&amp;CC_ccss
+        ///      PCI\CC_ccssii
+        ///      PCI\CC_ccss
+        /// </para>
+        /// </summary>
+        /// <returns>
+        /// An array containing the device IDs.  The list is ordered from most specific
+        /// to least specific.
+        /// </returns>
+        public string[] GetIds()
+        {
+            const string pci_prefix = @"PCI/";
+            const string and = "&";
+
+            string id_classcode = "CC_" + ByteToHex(this.ClassId) + ByteToHex(this.SubClassId);
+            string id_classcode_interface = id_classcode + ByteToHex(this.Interface);
+            string id_vendor = "VEN_" + UInt16ToHex(this.VendorId);
+            string id_device = "DEV_" + UInt16ToHex(this.DeviceId);
+            string id_vendor_device = id_vendor + and + id_device;
+            string id_revision = "REV_" + ByteToHex(this.RevisionId);
+            string id_subsys = "SUBSYS_" + UInt16ToHex(this.SubsystemVendorId) + UInt16ToHex(this.SubsystemDeviceId);
+
+#if ENABLE_OLD_SIGNATURE
+            string sing_id = String.Format("/pci/{0,2:x2}/{1,2:x2}/{2,4:x4}/{3,4:x4}/" +
+                               "{4,2:x2}",
+                               ClassId,
+                               SubClassId,
+                               VendorId,
+                               DeviceId,
+                               RevisionId);
+#endif
+
+            string[] ids = {
+#if ENABLE_OLD_SIGNATURE
+                sing_id,
+#endif
+
+                // Hardware IDs
+                pci_prefix + id_vendor_device + and + id_subsys + and + id_revision,
+                pci_prefix + id_vendor_device + and + id_subsys,
+                pci_prefix + id_vendor_device + and + id_classcode_interface,
+                pci_prefix + id_vendor_device + and + id_classcode,
+                pci_prefix + id_vendor,
+
+                // Compatible IDs
+                pci_prefix + id_vendor_device + and + id_revision,
+                pci_prefix + id_vendor_device,
+                pci_prefix + id_vendor + and + id_classcode_interface,
+                pci_prefix + id_vendor + and + id_classcode,
+                pci_prefix + id_classcode_interface,
+                pci_prefix + id_classcode,
+            };
+
+            for (int i = 0; i < ids.Length; i++)
+            {
+                string id = ids[i];
+                id = id.Replace('\\', '/').ToLower();
+                ids[i] = id;
+            }
+
+            return ids;
+        }
+
+        static string ByteToHex(byte value)
+        {
+            StringBuilder sb = new StringBuilder(2);
+            sb.Append(HexDigits[value >> 4]);
+            sb.Append(HexDigits[value & 0xf]);
+            return sb.ToString();
+        }
+
+        static string UInt16ToHex(ushort value)
+        {
+            StringBuilder sb = new StringBuilder(4);
+            sb.Append(HexDigits[(value >> 12) & 0xf]);
+            sb.Append(HexDigits[(value >> 8) & 0xf]);
+            sb.Append(HexDigits[(value >> 4) & 0xf]);
+            sb.Append(HexDigits[value & 0xf]);
+            return sb.ToString();
+
+        }
+
+        const string HexDigits = "0123456789ABCDEF";
+
+        protected void ReadBaseAddresses(int n)
+        {
+            if (Read8(PCI_INTERRUPT_PIN) != 0)
+            {
+                // Add interrupt resource to list of ranges if present
+                DynamicRanges = new IoRange [n + 1];
+                DynamicRanges[n] = new IoIrqRange(Read8(PCI_INTERRUPT_LINE), 1);
+            }
+            else
+            {
+                DynamicRanges = new IoRange [n];
+            }
+
+            BaseAddresses = new uint [n];
+            BaseAddrSizes = new uint [n];
+
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "ReadBaseAddresses()");
+#endif
+
+#if DEBUG_PCI
+            Tracing.Log(Tracing.Debug, "InterruptsDisabled: {0}", Processor.InterruptsDisabled());
+            for (int i = 0; i < n; i++) {
+                uint value = Read32(0x10 + i * 4);
+                Tracing.Log(Tracing.Debug, "Read[{0}][{1}] -: {2:x8}", n, i, value);
+            }
+#endif
+
+            uint control = Read32(0x04);
+            uint send = (control & (~(PCI_ENABLE_IO_SPACE|PCI_ENABLE_MEMORY_SPACE)))
+                & 0xffff;
+            if (control == 0x02b00003) {
+                send = (control & (~(PCI_ENABLE_IO_SPACE))) & 0xffff;
+            }
+
+#if DONT_SKIP_NVIDIA
+            if (control == 0x02b00003) {
+                send = control & 0xffff;
+
+                send &= ~PCI_ENABLE_IO_SPACE;
+                port.Write32(0x04, send);
+                Tracing.Log(Tracing.Debug, "NVIDIA Read[{0}]: ctrl={1:x8} send={2:x8}", n, control, send);
+                uint x = Read32(0x04);
+                Tracing.Log(Tracing.Debug, "NVIDIA Read[{0}]: finl={1:x8}", n, x);
+
+                port.Write32(0x04, control & 0xffff);
+                x = Read32(0x04);
+                Tracing.Log(Tracing.Debug, "NVIDIA Read[{0}]: last={1:x8}", n, x);
+                return;
+            }
+#endif
+
+            port.Write32(0x04, send);
+#if DEBUG_PCI
+            Tracing.Log(Tracing.Debug, "Read[{0}]: ctrl={1:x8} send={2:x8}",
+                        n, control, send);
+#endif
+#if DEBUG_PCI
+            uint x = Read32(0x04);
+            Tracing.Log(Tracing.Debug, "Read[{0}]: finl={1:x8}", n, x);
+#endif
+
+            for (int i = 0; i < n; i++) {
+#if DEBUG_PCI
+                Tracing.Log(Tracing.Debug, "Read[{0}][{1}] A:", n, i);
+#endif
+                uint addr = Read32(0x10 + i * 4);
+                uint size = 0;
+
+                // Find the size of the address space by moving to hi memory.
+
+                if ((addr & PCI_ADDRESS_IO_SPACE) != 0) {
+#if DEBUG_PCI
+                    Tracing.Log(Tracing.Debug, "Read[{0}][{1}] B: {2:x8} ~0", n, i, addr);
+#endif
+                    port.Write32(0x10 + i * 4, ~0u);
+                    size = Read32(0x10 + i * 4);
+                    port.Write32(0x10 + i * 4, addr);
+#if DEBUG_PCI
+                    Tracing.Log(Tracing.Debug, "Read[{0}][{1}] C: {2:x8}", n, i, size);
+#endif
+
+                    size &= ~0x3u;
+                    size |= 0xffff0000;
+                }
+                else {
+#if DEBUG_PCI
+                    Tracing.Log(Tracing.Debug, "Read[{0}][{1}] B: {2:x8} ~0", n, i, addr);
+#endif
+                    port.Write32(0x10 + i * 4, ~0xfu);
+                    size = Read32(0x10 + i * 4);
+                    port.Write32(0x10 + i * 4, addr);
+#if DEBUG_PCI
+                    Tracing.Log(Tracing.Debug, "Read[{0}][{1}] C: {2:x8}", n, i, size);
+#endif
+
+                    size &= ~0xfu;
+                }
+                size = ~size + 1;
+#if DEBUG_PCI
+                Tracing.Log(Tracing.Debug, "Read[{0}][{1}] D: {2:x8}", n, i, size);
+#endif
+
+                if (size >= 2) {
+                    if ((addr & PCI_ADDRESS_IO_SPACE) != 0) {
+                        DynamicRanges[i] = new IoPortRange((ushort)(addr & ~0xf),
+                                                    (ushort)size, Access.ReadWrite);
+                    }
+                    else {
+                        DynamicRanges[i] = new IoMemoryRange((uint)(addr & ~0xf),
+                                                      size, Access.ReadWrite);
+                    }
+                    BaseAddresses[i] = addr;
+                    BaseAddrSizes[i] = size;
+                }
+            }
+            port.Write32(0x04, control & 0xffff);
+#if DEBUG_PCI
+            Tracing.Log(Tracing.Debug, "Read[{0}]: done", n);
+#endif
+
+            string s = "::";
+            for (int i = 0; i < DynamicRanges.Length; i++) {
+                if (DynamicRanges[i] != null) {
+                    s += String.Format("A{0}={1} ", i, DynamicRanges[i]);
+                }
+            }
+            Tracing.Log(Tracing.Debug, "PCI {0}", s);
+        }
+
+        public override string ToString()
+        {
+            return String.Format("[PCI: VEN_{0:x4} DEV_{1:x4} CLASS {2:x2}.{3:x2}.{4:x2} BASE {5:x8}]",
+                this.VendorId,
+                this.DeviceId,
+                this.ClassId,
+                this.SubClassId,
+                this.Interface,
+                this.Base);
+        }
+
+        public override string ToPrint()
+        {
+            StringBuilder text = new StringBuilder();
+            base.DumpRanges(text);
+            text.AppendFormat("    PCI Vendor/Device:  {0:x4}.{1:x4} rev {2:x2}  {3} {4}\n",
+                this.VendorId,
+                this.DeviceId,
+                this.RevisionId,
+                this.Vendor,
+                this.Device);
+            text.AppendFormat("    PCI Class/Subclass: {0:x2}.{1:x2}.{2:x2}\n",
+                this.ClassId,
+                this.SubClassId,
+                this.Interface,
+                this.Class);
+            return text.ToString();
+        }
+
+        protected string PrintAddresses()
+        {
+            String s;
+
+            bool print = false;
+            for (int i = 0; i < BaseAddresses.Length; i++) {
+                if (BaseAddresses[i] != 0 || BaseAddrSizes[i] != 0) {
+                    print = true;
+                    break;
+                }
+            }
+            if (!print &&
+                ROMBaseAddress == 0 && InterruptLine == 0 && InterruptPin == 0) {
+
+                return "";
+            }
+
+            s = String.Format("      RM={0:x8} IL={1,2:x2} IP={2,2:x2} ",
+                              ROMBaseAddress,
+                              InterruptLine,
+                              InterruptPin);
+
+            int printed = 0;
+            for (int i = 0; i < BaseAddresses.Length; i++) {
+                if (DynamicRanges[i] != null) {
+                    s += String.Format("A{0}={1} ", i, DynamicRanges[i]);
+                }
+
+#if DONT_PRINT_RAW_ADDRESSS_BUT_ONLY_RANGES
+                if (BaseAddresses[i] == 0 && BaseAddrSizes[i] == 0) {
+                    continue;
+                }
+
+                if ((BaseAddresses[i] & PCI_ADDRESS_IO_SPACE) != 0) {
+                    s += String.Format("A{0}=IO:{1:x8}[{2:x}]  ",
+                                       i, BaseAddresses[i], BaseAddrSizes[i]);
+                }
+                else {
+                    if ((BaseAddresses[i] & PCI_TYPE_64BIT) != 0) {
+                        s += String.Format("A{0}=64:{1:x8}[{2:x}] ",
+                                           i, BaseAddresses[i], BaseAddrSizes[i]);
+                    }
+                    else if ((BaseAddresses[i] & PCI_TYPE_20BIT) != 0) {
+                        s += String.Format("A{0}=20:{1:x8}[{2:x}] ",
+                                           i, BaseAddresses[i], BaseAddrSizes[i]);
+                    }
+                    else {
+                        s += String.Format("A{0}=32:{1:x8}[{2:x}] ",
+                                           i, BaseAddresses[i], BaseAddrSizes[i]);
+                    }
+                }
+#endif
+                printed++;
+            }
+            return s;
+        }
+
+        protected string Vendor {
+            get {
+                switch (VendorId) {
+                    case 0x1011:
+                        return "DEC";
+                    case 0x104c:
+                        return "TI";
+                    case 0x5333:
+                        return "S3";
+                    case 0x8086:
+                        return "Intel";
+                    case 0x10de:
+                        return "nVidia";
+                    case 0x1106:
+                        return "VIA Technologies";
+                    default:
+                        return String.Format("{0,4:x4}", VendorId);
+                }
+            }
+        }
+
+        protected string Device {
+            get {
+                switch (VendorId) {
+                    case 0x8086:
+                        switch (DeviceId) {
+                            case 0x0484: return "82379AB";
+                            case 0x1229: return "82559nic";
+                            case 0x122E: return "82371FB";
+                            case 0x1234: return "82371MX";
+                            case 0x2410: return "82801AA";
+                            case 0x7000: return "82371SB";
+                            case 0x7110: return "82371AB";
+                            default:
+                                break;
+                        }
+                        break;
+
+                    case 0x10de:
+                        // NVIDIA
+                        switch (DeviceId)
+                        {
+                            case 0x0050: return "PCI-to-ISA bridge";
+                            case 0x0052: return "nForce PCI System Management Module";
+                            case 0x0057: return "nForce Network Interface";
+                            case 0x0059: return "Realtek AC'97 Audio";
+                            case 0x005a: return "USB OHCI";
+                            case 0x005d: return "PCI-to-PCI bridge";
+                            case 0x005e: return "nForce4 HyperTransport Bridge";
+                            default:
+                                break;
+                        }
+                        break;
+
+                    case 0x1106:
+                        // VIA
+                        switch (DeviceId)
+                        {
+                            case 0x3044: return "OHCI Compliant IEEE 1394 Host Controller";
+                            default:
+                                break;
+                        }
+                        break;
+
+
+                    default:
+                        break;
+                }
+
+                return String.Format("{0,4:x4}", DeviceId);
+
+            }
+        }
+
+        protected string Class {
+            get {
+                switch (ClassId) {
+                    case PCI_CLASS_STORAGE:
+                        switch (SubClassId) {
+                            case PCI_CLASS_STORAGE_SCSI:      return "Scsi";
+                            case PCI_CLASS_STORAGE_IDE:       return "Ide";
+                            case PCI_CLASS_STORAGE_FLOPPY:    return "Floppy";
+                            case PCI_CLASS_STORAGE_IPI:       return "Ipi";
+                            case PCI_CLASS_STORAGE_RAID:      return "Raid";
+                            case PCI_CLASS_STORAGE_OTHER:     return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_NETWORK:
+                        switch (SubClassId) {
+                            case PCI_CLASS_NETWORK_ETHERNET:  return "Ethernet";
+                            case PCI_CLASS_NETWORK_RING:      return "Ring";
+                            case PCI_CLASS_NETWORK_FDDI:      return "Fddi";
+                            case PCI_CLASS_NETWORK_ATM:       return "Atm";
+                            case PCI_CLASS_NETWORK_OTHER:     return "Other";
+                            case PCI_CLASS_NETWORK_FIP:       return "FIP";
+                            case PCI_CLASS_NETWORK_PICMG:     return "PICMG";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_DISPLAY:
+                        switch (SubClassId) {
+                            case PCI_CLASS_DISPLAY_VGA:       return "Vga";
+                            case PCI_CLASS_DISPLAY_XGA:       return "Xga";
+                            case PCI_CLASS_DISPLAY_3D:        return "3D";
+                            case PCI_CLASS_DISPLAY_OTHER:     return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_MULTIMEDIA:
+                        switch (SubClassId) {
+                            case PCI_CLASS_MULTIMEDIA_VIDEO:  return "Video";
+                            case PCI_CLASS_MULTIMEDIA_AUDIO:  return "Audio";
+                            case PCI_CLASS_MULTIMEDIA_TELEPHONY:  return "Telephony";
+                            case PCI_CLASS_MULTIMEDIA_OTHER:  return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_MEMORY:
+                        switch (SubClassId) {
+                            case PCI_CLASS_MEMORY_RAM:        return "Ram";
+                            case PCI_CLASS_MEMORY_FLASH:      return "Flash";
+                            case PCI_CLASS_MEMORY_OTHER:      return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_BRIDGE:
+                        switch (SubClassId) {
+                            case PCI_CLASS_BRIDGE_HOST:       return "Host";
+                            case PCI_CLASS_BRIDGE_ISA:        return "Isa";
+                            case PCI_CLASS_BRIDGE_EISA:       return "Eisa";
+                            case PCI_CLASS_BRIDGE_MC:         return "Mc";
+                            case PCI_CLASS_BRIDGE_PCI:        return "Pci";
+                            case PCI_CLASS_BRIDGE_PCMCIA:     return "Pcmcia";
+                            case PCI_CLASS_BRIDGE_NUBUS:      return "Nubus";
+                            case PCI_CLASS_BRIDGE_CARDBUS:    return "Cardbus";
+                            case PCI_CLASS_BRIDGE_RACEWAY:    return "Raceway";
+                            case PCI_CLASS_BRIDGE_SEMIPCI:    return "Semipci";
+                            case PCI_CLASS_BRIDGE_INFINIBAND: return "Infiniband";
+                            case PCI_CLASS_BRIDGE_OTHER:      return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_COMMUNICATION:
+                        switch (SubClassId) {
+                            case PCI_CLASS_COMMUNICATION_SERIAL:      return "Serial";
+                            case PCI_CLASS_COMMUNICATION_PARALLEL:    return "Parallel";
+                            case PCI_CLASS_COMMUNICATION_MULTIPORT:   return "Multiport";
+                            case PCI_CLASS_COMMUNICATION_MODEM:       return "Modem";
+                            case PCI_CLASS_COMMUNICATION_GPIB:        return "Gpib";
+                            case PCI_CLASS_COMMUNICATION_SMARTCARD:   return "Smartcard";
+                            case PCI_CLASS_COMMUNICATION_OTHER:       return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_SYSTEM:
+                        switch (SubClassId) {
+                            case PCI_CLASS_SYSTEM_PIC:        return "Pic";
+                            case PCI_CLASS_SYSTEM_DMA:        return "Dma";
+                            case PCI_CLASS_SYSTEM_TIMER:      return "Timer";
+                            case PCI_CLASS_SYSTEM_RTC:        return "Rtc";
+                            case PCI_CLASS_SYSTEM_PCIHP:      return "Pcihp";
+                            case PCI_CLASS_SYSTEM_OTHER:      return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_INPUT:
+                        switch (SubClassId) {
+                            case PCI_CLASS_INPUT_KEYBOARD:    return "Keyboard";
+                            case PCI_CLASS_INPUT_PEN:         return "Pen";
+                            case PCI_CLASS_INPUT_MOUSE:       return "Mouse";
+                            case PCI_CLASS_INPUT_SCANNER:     return "Scanner";
+                            case PCI_CLASS_INPUT_GAMEPORT:    return "Gameport";
+                            case PCI_CLASS_INPUT_OTHER:       return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_SERIAL:
+                        switch (SubClassId) {
+                            case PCI_CLASS_SERIAL_FIREWIRE:   return "Firewire";
+                            case PCI_CLASS_SERIAL_ACCESS:     return "Access";
+                            case PCI_CLASS_SERIAL_SSA:        return "Ssa";
+                            case PCI_CLASS_SERIAL_USB:
+                                switch (this.Interface)
+                                {
+                                    case 0x00: return "USB1.1 UHCI";
+                                    case 0x10: return "USB1.1 OHCI";
+                                    case 0x20: return "USB2.0 EHCI";
+                                    default:
+                                        return "Usb";
+                                }
+                            case PCI_CLASS_SERIAL_FIBRE:      return "Fibre";
+                            case PCI_CLASS_SERIAL_SMBUS:      return "Smbus";
+                            case PCI_CLASS_SERIAL_INFINIBAND: return "Infiniband";
+                            case PCI_CLASS_SERIAL_IPMI:       return "Ipmi";
+                            case PCI_CLASS_SERIAL_SERCOS:     return "Sercos";
+                            case PCI_CLASS_SERIAL_CANBUS:     return "Canbus";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+                    case PCI_CLASS_WIRELESS:
+                        switch (SubClassId) {
+                            case PCI_CLASS_WIRELESS_IRDA:     return "Irda";
+                            case PCI_CLASS_WIRELESS_IR:       return "Ir";
+                            case PCI_CLASS_WIRELESS_RF:       return "Rf";
+                            case PCI_CLASS_WIRELESS_BLUETOOTH: return "Bluetooth";
+                            case PCI_CLASS_WIRELESS_BROADBAND: return "Broadband";
+                            case PCI_CLASS_WIRELESS_OTHER:    return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_I2O:
+                        switch (SubClassId) {
+                            case PCI_CLASS_I2O_I2O:           return "I2O";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_SATELLITE:
+                        switch (SubClassId) {
+                            case PCI_CLASS_SATELLITE_TV:      return "Tv";
+                            case PCI_CLASS_SATELLITE_AUDIO:   return "Audio";
+                            case PCI_CLASS_SATELLITE_VOICE:   return "Voice";
+                            case PCI_CLASS_SATELLITE_DATA:    return "Data";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_ENCRYPTION:
+                        switch (SubClassId) {
+                            case PCI_CLASS_ENCRYPTION_NETWORK:      return "Network";
+                            case PCI_CLASS_ENCRYPTION_ENTERTAINMENT:return "Entertainment";
+                            case PCI_CLASS_ENCRYPTION_OTHER:        return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+
+                    case PCI_CLASS_ACQUISITION:
+                        switch (SubClassId) {
+                            case PCI_CLASS_ACQUISITION_DPIO:  return "Dpio";
+                            case PCI_CLASS_ACQUISITION_PERF:  return "Perf";
+                            case PCI_CLASS_ACQUISITION_COMM:  return "Comm";
+                            case PCI_CLASS_ACQUISITION_MGMT:  return "Mgmt";
+                            case PCI_CLASS_ACQUISITION_OTHER: return "Other";
+                            default: return String.Format("{0,2:x2}", SubClassId);
+                        }
+                    default: return String.Format("{0,2:x2}", SubClassId);
+                }
+            }
+        }
+
+        protected string Base {
+            get {
+                switch (ClassId) {
+                    case PCI_CLASS_STORAGE:       return "Storage";
+                    case PCI_CLASS_NETWORK:       return "Network";
+                    case PCI_CLASS_DISPLAY:       return "Display";
+                    case PCI_CLASS_MULTIMEDIA:    return "Multimedia";
+                    case PCI_CLASS_MEMORY:        return "Memory";
+                    case PCI_CLASS_BRIDGE:        return "Bridge";
+                    case PCI_CLASS_COMMUNICATION: return "Communication";
+                    case PCI_CLASS_SYSTEM:        return "System";
+                    case PCI_CLASS_INPUT:         return "Input";
+                    case PCI_CLASS_DOCKING:       return "Docking";
+                    case PCI_CLASS_PROCESSOR:     return "Processor";
+                    case PCI_CLASS_SERIAL:        return "Serial";
+                    case PCI_CLASS_OTHERS:        return "Others";
+                    case PCI_CLASS_WIRELESS:      return "Wireless";
+                    case PCI_CLASS_I2O:           return "I2O";
+                    case PCI_CLASS_SATELLITE:     return "Satellite";
+                    case PCI_CLASS_ENCRYPTION:    return "Encryption";
+                    case PCI_CLASS_ACQUISITION:   return "Acquisition";
+                    default: return String.Format("{0,2:x2}", ClassId);
+                }
+            }
+        }
+
+        public bool MemorySpaceEnabled
+        {
+            get { return (Control & PCI_ENABLE_MEMORY_SPACE) != 0; }
+        }
+
+        public bool IoSpaceEnabled
+        {
+            get { return (Control & PCI_ENABLE_IO_SPACE) != 0; }
+        }
+
+        public bool InterruptsEnabled
+        {
+            get { return (Control & PCI_DISABLE_INTERRUPTS) == 0; }
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class PciBridgeConfig : PciConfig
+    {
+        // Bridges: (HeaderType & ~PCI_MULTIFUNCTION) == PCI_BRIDGE_TYPE
+        // public uint  BaseAddresses[2];           // 10..17
+        protected byte     PrimaryBus;                 // 18..18
+        protected byte     SecondaryBus;               // 19..19
+        protected byte     SubordinateBus;             // 1a..1a
+        protected byte     SecondaryLatency;           // 1b..1b
+        protected byte     IOBase;                     // 1c..1c
+        protected byte     IOLimit;                    // 1d..1d
+        protected ushort   SecondaryStatus;            // 1e..1f
+        protected ushort   MemoryBase;                 // 20..21
+        protected ushort   MemoryLimit;                // 22..23
+        protected ushort   PrefetchBase;               // 24..25
+        protected ushort   PrefetchLimit;              // 26..27
+        protected uint     PrefetchBaseUpper32;        // 28..2b
+        protected uint     PrefetchLimitUpper32;       // 2c..2f
+        protected ushort   IOBaseUpper16;              // 30..31
+        protected ushort   IOLimitUpper16;             // 32..33
+        // protected uint  Reserved;                   // 34..37
+        // protected uint  ROMBaseAddress;             // 38..3b
+#if DISABLED
+        // protected byte  InterruptLine;              // 3c..3c
+#endif
+        // protected byte  InterruptPin;               // 3d..3d
+        protected ushort   BridgeControl;              // 3e..3f
+
+        public PciBridgeConfig(PciPort port)
+            : base(port)
+        {
+            Read();
+        }
+
+        protected override void Read()
+        {
+            base.Read();
+            base.ReadBaseAddresses(2);
+
+            uint u;
+
+            u = port.Read32(0x18);
+            PrimaryBus = (byte)(u & 0xff);
+            SecondaryBus = (byte)((u >> 8) & 0xff);
+            SubordinateBus = (byte)((u >> 16) & 0xff);
+            SecondaryLatency = (byte)((u >> 24) & 0xff);
+
+            u = port.Read32(0x1c);
+            IOBase = (byte)(u & 0xff);
+            IOLimit = (byte)((u >> 8) & 0xff);
+            SecondaryStatus = (ushort)((u >> 16) & 0xffff);
+
+            u = port.Read32(0x20);
+            MemoryBase = (ushort)(u & 0xffff);
+            MemoryLimit = (ushort)((u >> 16) & 0xffff);
+
+            u = port.Read32(0x24);
+            PrefetchBase = (ushort)(u & 0xffff);
+            PrefetchLimit = (ushort)((u >> 16) & 0xffff);
+
+            u = port.Read32(0x28);
+            PrefetchBaseUpper32 = u;
+
+            u = port.Read32(0x2c);
+            PrefetchLimitUpper32 = u;
+
+            u = port.Read32(0x30);
+            IOBaseUpper16 = (ushort)(u & 0xffff);
+            IOLimitUpper16 = (ushort)((u >> 16) & 0xffff);
+
+            u = port.Read32(0x38);
+            ROMBaseAddress = u;
+
+            u = port.Read32(0x3c);
+#if DISABLED
+            InterruptLine = (byte)(u & 0xff);
+#endif
+            InterruptPin = (byte)((u >> 8) & 0xff);
+            BridgeControl = (ushort)((u >> 16) & 0xffff);
+        }
+
+        public override string ToPrint()
+        {
+            return base.ToPrint() +
+                String.Format("BUS={0,2:x2}.{1,2:x2}.{2,2:x2} IO={3,4:x4}..{4,4:x4}",
+                              PrimaryBus, SecondaryBus, SubordinateBus,
+                              IOBase, IOLimit) +
+                "" +
+                base.PrintAddresses() + "";
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class PciDeviceConfig : PciConfig
+    {
+        // Devices: (HeaderType & ~PCI_MULTIFUNCTION) == PCI_DEVICE_TYPE
+        // public uint  BaseAddresses[6];           // 10..27
+        protected uint     CardbusCisPtr;              // 28..2b
+        // protected ushort SubsystemVendorId;         // 2c..2d
+        // protected ushort SubsystemDeviceId;         // 2e..2f
+        // protected uint  ROMBaseAddress;             // 30..33
+        protected byte     Capabilities;               // 34..34
+        // protected byte  Reserved[7];                // 35..38
+#if DISABLED
+        // protected byte  InterruptLine;              // 3c..3c
+#endif
+        // protected byte  InterruptPin;               // 3d..3d (ro)
+        protected byte     MinimumGrant;               // 3e..3e (ro)
+        protected byte     MaximumLatency;             // 3f..3f (ro)
+
+        public PciDeviceConfig(PciPort port)
+            : base(port)
+        {
+            Read();
+        }
+
+        protected override void Read()
+        {
+            base.Read();
+            base.ReadBaseAddresses(6);
+
+            uint u;
+
+            u = port.Read32(0x28);
+            CardbusCisPtr = u;
+
+            u = port.Read32(0x2c);
+            SubsystemVendorId = (ushort)(u & 0xffff);
+            SubsystemDeviceId = (ushort)((u >> 16) & 0xffff);
+
+            u = port.Read32(0x30);
+            ROMBaseAddress = u;
+
+            u = port.Read32(0x34);
+            Capabilities = (byte)(u & 0xff);
+
+            u = port.Read32(0x3c);
+            if ((u & 0xff) == 0) {
+                port.Write32(0x3c, u | 0x7);
+                u = port.Read32(0x3c);
+            }
+
+#if DISABLED
+            InterruptLine = (byte)(u & 0xff);
+#endif
+            InterruptPin = (byte)((u >> 8) & 0xff);
+            MinimumGrant = (byte)((u >> 16) & 0xff);
+            MaximumLatency = (byte)((u >> 24) & 0xff);
+
+            Ids = GetIds();
+        }
+
+        public override string ToPrint()
+        {
+            String s = base.ToPrint() + "\n    " + base.PrintAddresses();
+
+            if (CardbusCisPtr != 0 ||
+                Capabilities != 0 ||
+                MinimumGrant != 0 ||
+                MaximumLatency != 0) {
+
+                s += String.Format("      cis={0:x8} cap={1,2:x2} mg={2,2:x2} ml={3,2:x2}",
+                                   CardbusCisPtr,
+                                   Capabilities,
+                                   MinimumGrant,
+                                   MaximumLatency);
+            }
+            return s;
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class PciCardbusConfig : PciConfig
+    {
+        public PciCardbusConfig(PciPort port)
+            : base(port)
+        {
+            BaseAddresses = new uint [0];
+            Read();
+        }
+
+        protected override void Read()
+        {
+            base.Read();
+        }
+
+        public override string ToPrint()
+        {
+            return base.ToPrint();
+        }
+    }
+
+    [CLSCompliant(false)]
+    public class PciPort
+    {
+        internal readonly IoPort addressPort;
+        internal readonly IoPort dataPort;
+        internal readonly ushort identifier;
+
+        public PciPort(IoPort addressPort, IoPort dataPort, ushort identifier)
+        {
+            this.addressPort = addressPort;
+            this.dataPort = dataPort;
+            this.identifier = identifier;
+        }
+
+        public ushort AddressPort
+        {
+            get { return addressPort.Port; }
+        }
+
+        public ushort DataPort
+        {
+            get { return dataPort.Port; }
+        }
+
+        public ushort Identifier
+        {
+            get { return identifier; }
+        }
+
+        public PciConfig ConfigForPort()
+        {
+            uint u = Read32(0);
+
+            switch (u & PciConfig.PCI_TYPE_MASK) {
+                case PciConfig.PCI_DEVICE_TYPE:
+                    return new PciDeviceConfig(this);
+                case PciConfig.PCI_BRIDGE_TYPE:
+                    return new PciBridgeConfig(this);
+                case PciConfig.PCI_CARDBUS_TYPE:
+                    return new PciCardbusConfig(this);
+            }
+            return null;
+        }
+
+        public uint Read32(int offset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if ((offset & 0x3) != 0) {
+                throw new Exception("BAD_OFFSET");
+            }
+#endif
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            return dataPort.Read32();
+        }
+
+        public ushort Read16(uint offset)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if ((offset & 0x1) != 0) {
+                throw new Exception("BAD_OFFSET");
+            }
+#endif
+
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            return dataPort.Read16(offset & 0x1);
+        }
+
+        public byte Read8(int offset)
+        {
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+            addressPort.Write32(config);
+            return dataPort.Read8((uint)offset & 0x3);
+        }
+
+        public void Write32(int offset, uint value)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if ((offset & 0x3) != 0) {
+                throw new Exception("BAD_OFFSET");
+            }
+#endif
+
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            dataPort.Write32(value);
+        }
+
+        public void Write16(int offset, ushort value)
+        {
+#if !DONT_CHECK_IO_BOUNDS
+            if ((offset & 0x1) != 0) {
+                throw new Exception("BAD_OFFSET");
+            }
+#endif
+
+            uint config = (((uint)offset & 0xfc) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            dataPort.Write16((uint)(offset & 0x1), value);
+        }
+
+        public void Write8(int offset, byte value)
+        {
+            uint config = (((uint)offset & 0xff) |
+                           ((uint)identifier << 8) |
+                           ((uint)1 << 31));
+
+            addressPort.Write32(config);
+            dataPort.Write8((uint)(offset & 0x3), value);
+        }
+    }
+} // end namespace Microsoft.Singularity.Io
diff --git a/base/Kernel/Singularity/Io/PnpConfig.cs b/base/Kernel/Singularity/Io/PnpConfig.cs
new file mode 100644
index 0000000..a393088
--- /dev/null
+++ b/base/Kernel/Singularity/Io/PnpConfig.cs
@@ -0,0 +1,83 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PnpConfig.cs
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class PnpConfig : IoConfig
+    {
+        internal PnpConfig(String[] ids, IoRange[] ranges, IoRange [] fixedRanges)
+        {
+            this.Ids = ids;
+            this.DynamicRanges = ranges;
+            this.FixedRanges = fixedRanges;
+        }
+
+        // SOSP Hack [] switched from internal to public
+        public PnpConfig(String[] ids, IoRange[] ranges)
+        {
+            this.Ids = ids;
+            this.DynamicRanges = ranges;
+            this.FixedRanges = null;
+        }
+
+        public PnpConfig(String[] ids, ArrayList rangeList)
+        {
+            this.Ids = ids;
+            this.FixedRanges = null;
+
+            if (rangeList != null) {
+                DynamicRanges = new IoRange [rangeList.Count];
+
+                int o = 0;
+
+                // We copy out in the following order: IoMemory, Ports, IRQ,
+                // DMA.
+
+                for (int i = 0; i < rangeList.Count; i++) {
+                    if (rangeList[i] is IoMemoryRange) {
+                        DynamicRanges[o++] = (IoRange)rangeList[i];
+                    }
+                }
+                for (int i = 0; i < rangeList.Count; i++) {
+                    if (rangeList[i] is IoPortRange) {
+                        DynamicRanges[o++] = (IoRange)rangeList[i];
+                    }
+                }
+                for (int i = 0; i < rangeList.Count; i++) {
+                    if (rangeList[i] is IoIrqRange) {
+                        DynamicRanges[o++] = (IoRange)rangeList[i];
+                    }
+                }
+                for (int i = 0; i < rangeList.Count; i++) {
+                    if (rangeList[i] is IoDmaRange) {
+                        DynamicRanges[o++] = (IoRange)rangeList[i];
+                    }
+                }
+            }
+            else {
+                DynamicRanges = new IoRange [0];
+            }
+
+            Tracing.Log(Tracing.Audit, "{0}", ToPrint());
+        }
+
+        public override string ToString()
+        {
+            return "[PNP " + this.Ids[0] + "]";
+        }
+    }
+} // end namespace Microsoft.Singularity.Io
diff --git a/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister16.cs b/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister16.cs
new file mode 100644
index 0000000..ce6167d
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister16.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadOnlyMemoryRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadOnlyMemoryRegister16 : IReadOnlyRegister16
+    {
+        private const int RegisterWidth = 16 >> 3;
+
+        IoMemory memory;
+
+        public ReadOnlyMemoryRegister16(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override ushort Read()
+        {
+            return memory.Read16(0);
+        }
+
+        public static IReadOnlyRegister16 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IReadOnlyRegister16)
+                new ReadOnlyMemoryRegister16(imr.MemoryAtOffset(offset,
+                                                               RegisterWidth,
+                                                               Access.Read));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister32.cs b/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister32.cs
new file mode 100644
index 0000000..ecf78a4
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister32.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadOnlyMemoryRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadOnlyMemoryRegister32 : IReadOnlyRegister32
+    {
+        private const int RegisterWidth = 32 >> 3;
+
+        IoMemory memory;
+
+        public ReadOnlyMemoryRegister32(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override uint Read()
+        {
+            return memory.Read32(0);
+        }
+
+        public static IReadOnlyRegister32 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IReadOnlyRegister32)
+                new ReadOnlyMemoryRegister32(imr.MemoryAtOffset(offset,
+                                                               RegisterWidth,
+                                                               Access.Read));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister8.cs b/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister8.cs
new file mode 100644
index 0000000..0c0b8e3
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadOnlyMemoryRegister8.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadOnlyMemoryRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadOnlyMemoryRegister8 : IReadOnlyRegister8
+    {
+        private const int RegisterWidth = 8 >> 3;
+
+        IoMemory memory;
+
+        public ReadOnlyMemoryRegister8(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override byte Read()
+        {
+            return memory.Read8(0);
+        }
+
+        public static IReadOnlyRegister8 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IReadOnlyRegister8)
+                new ReadOnlyMemoryRegister8(imr.MemoryAtOffset(offset,
+                                                               RegisterWidth,
+                                                               Access.Read));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadOnlyPortRegister16.cs b/base/Kernel/Singularity/Io/ReadOnlyPortRegister16.cs
new file mode 100644
index 0000000..41562a9
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadOnlyPortRegister16.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadOnlyPortRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadOnlyPortRegister16 : IReadOnlyRegister16
+    {
+        private const int RegisterWidth = 16 >> 3;
+
+        IoPort port;
+
+        public ReadOnlyPortRegister16(IoPort port)   { this.port = port; }
+        public override ushort Read()                { return port.Read16(); }
+
+        public static IReadOnlyRegister16 Create(IoPortRange imr, uint offset)
+        {
+            return (IReadOnlyRegister16)
+                new ReadOnlyPortRegister16(imr.PortAtOffset((ushort)offset,
+                                                           RegisterWidth,
+                                                           Access.Read));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadOnlyPortRegister32.cs b/base/Kernel/Singularity/Io/ReadOnlyPortRegister32.cs
new file mode 100644
index 0000000..da6d7c3
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadOnlyPortRegister32.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadOnlyPortRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadOnlyPortRegister32 : IReadOnlyRegister32
+    {
+        private const int RegisterWidth = 32 >> 3;
+
+        IoPort port;
+
+        public ReadOnlyPortRegister32(IoPort port)  { this.port = port; }
+        public override uint Read()                 { return port.Read32(); }
+
+        public static IReadOnlyRegister32 Create(IoPortRange imr, uint offset)
+        {
+            return (IReadOnlyRegister32)
+                new ReadOnlyPortRegister32(imr.PortAtOffset((ushort)offset,
+                                                           RegisterWidth,
+                                                           Access.Read));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadOnlyPortRegister8.cs b/base/Kernel/Singularity/Io/ReadOnlyPortRegister8.cs
new file mode 100644
index 0000000..82a324e
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadOnlyPortRegister8.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadOnlyPortRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadOnlyPortRegister8 : IReadOnlyRegister8
+    {
+        private const int RegisterWidth = 8 >> 3;
+
+        IoPort port;
+
+        public ReadOnlyPortRegister8(IoPort port)   { this.port = port; }
+        public override byte Read()                 { return port.Read8(); }
+
+        public static IReadOnlyRegister8 Create(IoPortRange imr, uint offset)
+        {
+            return (IReadOnlyRegister8)
+                new ReadOnlyPortRegister8(imr.PortAtOffset((ushort)offset,
+                                                           RegisterWidth,
+                                                           Access.Read));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadWriteMemoryRegister16.cs b/base/Kernel/Singularity/Io/ReadWriteMemoryRegister16.cs
new file mode 100644
index 0000000..cbe48d2
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadWriteMemoryRegister16.cs
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadWriteMemoryRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadWriteMemoryRegister16 : IReadWriteRegister16
+    {
+        private const int RegisterWidth = 16 >> 3;
+
+        IoMemory memory;
+
+        public ReadWriteMemoryRegister16(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override ushort Read()
+        {
+            return memory.Read16(0);
+        }
+
+        public override void Write(ushort value)
+        {
+            memory.Write16(0, value);
+        }
+
+        public static IReadWriteRegister16 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IReadWriteRegister16)
+                new ReadWriteMemoryRegister16(imr.MemoryAtOffset(offset,
+                                                                RegisterWidth,
+                                                                Access.ReadWrite));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadWriteMemoryRegister32.cs b/base/Kernel/Singularity/Io/ReadWriteMemoryRegister32.cs
new file mode 100644
index 0000000..27e97dd
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadWriteMemoryRegister32.cs
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadWriteMemoryRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadWriteMemoryRegister32 : IReadWriteRegister32
+    {
+        private const int RegisterWidth = 32 >> 3;
+
+        IoMemory memory;
+
+        public ReadWriteMemoryRegister32(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override uint Read()
+        {
+            return memory.Read32(0);
+        }
+
+        public override void Write(uint value)
+        {
+            memory.Write32(0, value);
+        }
+
+        public static IReadWriteRegister32 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IReadWriteRegister32)
+                new ReadWriteMemoryRegister32(imr.MemoryAtOffset(offset,
+                                                                RegisterWidth,
+                                                                Access.ReadWrite));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadWriteMemoryRegister8.cs b/base/Kernel/Singularity/Io/ReadWriteMemoryRegister8.cs
new file mode 100644
index 0000000..4b1ea0a
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadWriteMemoryRegister8.cs
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadWriteMemoryRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadWriteMemoryRegister8 : IReadWriteRegister8
+    {
+        private const int RegisterWidth = 8 >> 3;
+
+        IoMemory memory;
+
+        public ReadWriteMemoryRegister8(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override byte Read()
+        {
+            return memory.Read8(0);
+        }
+
+        public override void Write(byte value)
+        {
+            memory.Write8(0, value);
+        }
+
+        public static IReadWriteRegister8 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IReadWriteRegister8)
+                new ReadWriteMemoryRegister8(imr.MemoryAtOffset(offset,
+                                                                RegisterWidth,
+                                                                Access.ReadWrite));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadWritePortRegister16.cs b/base/Kernel/Singularity/Io/ReadWritePortRegister16.cs
new file mode 100644
index 0000000..2b5ee98
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadWritePortRegister16.cs
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadWritePortRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadWritePortRegister16 : IReadWriteRegister16
+    {
+        private const int RegisterWidth = 16 >> 3;
+
+        IoPort port;
+
+        public ReadWritePortRegister16(IoPort port)  { this.port = port; }
+        public override ushort Read()                { return port.Read16(); }
+        public override void Write(ushort value)     { port.Write16(value); }
+
+        public static IReadWriteRegister16 Create(IoPortRange imr, uint offset)
+        {
+            return (IReadWriteRegister16)
+                new ReadWritePortRegister16(imr.PortAtOffset((ushort)offset,
+                                                            RegisterWidth,
+                                                            Access.ReadWrite));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadWritePortRegister32.cs b/base/Kernel/Singularity/Io/ReadWritePortRegister32.cs
new file mode 100644
index 0000000..b91acec
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadWritePortRegister32.cs
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadWritePortRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadWritePortRegister32 : IReadWriteRegister32
+    {
+        private const int RegisterWidth = 32 >> 3;
+
+        IoPort port;
+
+        public ReadWritePortRegister32(IoPort port) { this.port = port; }
+        public override uint Read()                 { return port.Read32(); }
+        public override void Write(uint value)      { port.Write32(value); }
+
+        public static IReadWriteRegister32 Create(IoPortRange imr, uint offset)
+        {
+            return (IReadWriteRegister32)
+                new ReadWritePortRegister32(imr.PortAtOffset((ushort)offset,
+                                                             RegisterWidth,
+                                                             Access.ReadWrite));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ReadWritePortRegister8.cs b/base/Kernel/Singularity/Io/ReadWritePortRegister8.cs
new file mode 100644
index 0000000..1649a73
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ReadWritePortRegister8.cs
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReadWritePortRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class ReadWritePortRegister8 : IReadWriteRegister8
+    {
+        private const int RegisterWidth = 8 >> 3;
+
+        IoPort port;
+
+        public ReadWritePortRegister8(IoPort port)  { this.port = port; }
+        public override byte Read()                 { return port.Read8(); }
+        public override void Write(byte value)      { port.Write8(value); }
+
+        public static IReadWriteRegister8 Create(IoPortRange imr, uint offset)
+        {
+            return (IReadWriteRegister8)
+                new ReadWritePortRegister8(imr.PortAtOffset((ushort)offset,
+                                                            RegisterWidth,
+                                                            Access.ReadWrite));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/ResourceAttributes.cs b/base/Kernel/Singularity/Io/ResourceAttributes.cs
new file mode 100644
index 0000000..dc868dc
--- /dev/null
+++ b/base/Kernel/Singularity/Io/ResourceAttributes.cs
@@ -0,0 +1,558 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DriverAttributes.cs
+//
+//  Warning:  This file is compiled into the kernel, and into the runtime.
+//            In order to get the visibility correct in all cases, some #ifs
+//            are needed
+//
+//  New Design:
+//          This now conforms with the ideas presented in the Genesis papers,
+//          chapter 3.  In particular, a device driver is simply a Category,
+//          and anything that is in an app manifest is either intrinsic to
+//          apps/installations (and hence not a decoration), or else a
+//          PropertySet or Category.
+
+using System;
+using Microsoft.Singularity.Configuration;
+namespace Microsoft.Singularity.Io
+{
+
+    //
+    //  The Driver Category
+    //
+
+    // Drivers are apps that run in a special Category.  We will designate this
+    // by deriving a new class from CategoryDeclaration to represent this
+    // special Category, and then creating special field annotations that only
+    // apply to this Category.
+    //
+    public class DriverCategoryDeclaration : CategoryDeclaration
+    {
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // DriverCategoryAttribute
+    //
+    // Purpose: Top-level metadata indicating that an assembly implements the
+    //          Driver Category
+    //
+    // Usage:   Must be applied to a class derived from
+    //          DriverCategoryDeclaration
+    //
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class DriverCategoryAttribute : System.Attribute
+    {
+        public DriverCategoryAttribute()
+        {
+
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // SignatureAttribute
+    //
+    // Purpose: Declare the signature of the device served by this driver
+    //
+    // Usage:   Must be applied to a class derived from
+    //          DriverCategoryDeclaration
+    //
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public class SignatureAttribute : System.Attribute
+    {
+        // <<deviceIdentifier>> is the prefix of the device signature served by
+        // this driver
+        private string deviceIdentifier;
+
+        public SignatureAttribute(string deviceIdentifier)
+        {
+            this.deviceIdentifier = deviceIdentifier;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // EnumeratesDeviceAttribute
+    //
+    // Purpose: Declare the signature of a device enumerated by this driver
+    //
+    // Usage:   Must be applied to a class derived from
+    //          DriverCategoryDeclaration
+    //
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public class EnumeratesDeviceAttribute : System.Attribute
+    {
+        // <<deviceIdentifier>> is the prefix of the device signature served by
+        // this driver
+        private string deviceIdentifier;
+
+        public EnumeratesDeviceAttribute(string deviceIdentifier)
+        {
+            this.deviceIdentifier = deviceIdentifier;
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoRangeAttribute
+    //
+    // Purpose: All of the Io*RangeAttributes inherit from this one so they
+    //          can be processed together using link-time reflection (LTR).
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [CLSCompliant(false)]
+    public abstract class IoRangeAttribute : System.Attribute
+    {
+        // <<index>> defaults to -1 (unassigned).  It is the index of the
+        // port range in the list of dynamic driver resources.
+        private int index;
+
+        internal IoRangeAttribute(int index)
+        {
+            this.index = index;
+            this.shared = false;
+        }
+
+        // <<sharable>> defaults to false.  To set it true, use the property
+        // Sharable
+        private bool shared;
+        public bool Shared
+        {
+            get { return shared; }
+            set { shared = value; }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoFixedRangeAttribute
+    //
+    // Purpose: All of the IoFixed*RangeAttributes inherit from this one so they
+    //          can be processed together using link-time reflection (LTR).
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [CLSCompliant(false)]
+    public abstract class IoFixedRangeAttribute : System.Attribute
+    {
+        public IoFixedRangeAttribute()
+        {
+            this.shared = false;
+        }
+
+        // <<sharable>> defaults to false.  To set it true, use the property
+        // Sharable
+        private bool shared;
+        public bool Shared
+        {
+            get { return shared; }
+            set { shared = value; }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoPortRangeAttribute
+    //
+    // Purpose: Decorates a IoPortRange to indicate that the runtime should
+    //          preconfigure a PortRange based on the results of PnP
+    //          enumeration.  The default is for the IoPortRange to be
+    //          read/write.  This can be changed via properties.
+    //
+    // Usage:   Must decorate an IoPortRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [CLSCompliant(false)]
+    public class IoPortRangeAttribute : IoRangeAttribute
+    {
+        // <<baseAddress>> is required.  It is the expected base address of the
+        // PortRange
+        private uint baseAddress;
+
+        // <<rangeLength>> is required.  It is the expected length of the
+        // port range that this driver wants to use.
+        private uint rangeLength;
+
+        public IoPortRangeAttribute(int index)
+            : base(index)
+        {
+            this.baseAddress = 0;
+            this.rangeLength = 0;
+            this.read = true;
+            this.write = true;
+        }
+
+        public uint Default
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public uint Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+
+        // <<read>> and <<write>> default to true.  To set them false, the
+        // Properties AllowRead and AllowWrite can be used
+        private bool read;
+        public bool AllowRead
+        {
+            get { return read; }
+            set { read = value; }
+        }
+
+        private bool write;
+        public bool AllowWrite
+        {
+            get { return write; }
+            set { write = value; }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoFixedPortRangeAttribute
+    //
+    // Purpose: Decorates a IoPortRange to indicate that the runtime should
+    //          preconfigure a PortRange based on the these static values.
+    //
+    // Usage:   Must decorate an IoPortRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [CLSCompliant(false)]
+    public class IoFixedPortRangeAttribute : IoFixedRangeAttribute
+    {
+        // <<baseAddress>> is required.  It is the expected base address of the
+        // PortRange
+        private uint baseAddress;
+
+        // <<rangeLength>> is required.  It is the expected length of the
+        // port range that this driver wants to use.
+        private uint rangeLength;
+
+        public IoFixedPortRangeAttribute()
+        {
+            this.baseAddress = baseAddress;
+            this.rangeLength = rangeLength;
+            this.read = true;
+            this.write = true;
+        }
+
+        public uint Base
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public uint Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+
+        // <<read>> and <<write>> default to true.  To set them false, the
+        // Properties AllowRead and AllowWrite can be used
+        private bool read;
+        public bool AllowRead
+        {
+            get { return read; }
+            set { read = value; }
+        }
+
+        private bool write;
+        public bool AllowWrite
+        {
+            get { return write; }
+            set { write = value; }
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoIrqRangeAttribute
+    //
+    // Purpose: Decorates an IoIrqRange object to indicate that the runtime
+    //          should preconfigure an IrqRange based on the results of Pnp.
+    //
+    // Usage:   Must decorate an IoIrqRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    //[TODO] should these really be byte, or should they be ushort?
+    [CLSCompliant(false)]
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class IoIrqRangeAttribute : IoRangeAttribute
+    {
+        // <<defaultBase>> is the default Irq for the device.  It is a required
+        // parameter to the constructor.
+        private byte baseAddress;
+
+        // <<defaultLength>> is the default length of the Irq range.  It is also
+        // a required parameter
+        private byte rangeLength;
+
+        public IoIrqRangeAttribute(int index)
+            : base(index)
+        {
+            this.baseAddress = 0;
+            this.rangeLength = 1;
+        }
+
+        public byte Default
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public byte Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoIrqRangeAttribute
+    //
+    // Purpose: Decorates an IoIrqRange object to indicate that the runtime
+    //          should preconfigure an IrqRange based on the results of Pnp.
+    //
+    // Usage:   Must decorate an IoIrqRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    //[TODO] should these really be byte, or should they be ushort?
+    [CLSCompliant(false)]
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class IoFixedIrqRangeAttribute : IoFixedRangeAttribute
+    {
+        // <<defaultBase>> is the default Irq for the device.  It is a required
+        // parameter to the constructor.
+        private byte baseAddress;
+
+        // <<defaultLength>> is the default length of the Irq range.  It is also
+        // a required parameter
+        private byte rangeLength;
+
+        public IoFixedIrqRangeAttribute()
+            : base()
+        {
+            this.baseAddress = 0;
+            this.rangeLength = 1;
+        }
+
+        public byte Base
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public byte Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoDmaRangeAttribute
+    //
+    // Purpose: Decorates an IoDma object to indicate that the runtime should
+    //          preconfigure a Dma channel based on the results of Pnp.
+    //
+    // Usage:   Must decorate an IoDmaRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    [CLSCompliant(false)]
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    public class IoDmaRangeAttribute : IoRangeAttribute
+    {
+        // <<defaultBase>> is the default Dma for the device
+        private byte baseAddress;
+
+        // <<defaultLength>> is the default length of the Dma range
+        private byte rangeLength;
+
+        public IoDmaRangeAttribute(int index)
+            : base(index)
+        {
+            this.baseAddress = 0;
+            this.rangeLength = 1;
+        }
+
+        public byte Default
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public byte Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoMemoryRangeAttribute
+    //
+    // Purpose: Decorates an IoMemory object to indicate that the runtime should
+    //          preconfigure some memory based on the results of Pnp.  The
+    //          memory region is assumed to be read/write, unless these
+    //          values are changed via properties.
+    //
+    // Usage:   Must decorate an IoMemoryRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [CLSCompliant(false)]
+    public class IoMemoryRangeAttribute : IoRangeAttribute
+    {
+        // <<defaultBase>> is required.  It is the expected base address of this
+        // memory range.  Use 0 if unsure.
+        private uint baseAddress;
+
+        // <<defaultSize>> is required.  It is the minimum acceptable size of
+        // the region.
+        private uint rangeLength;
+
+        // <<read>> and <<write>> default to true.  To set them false, use the
+        // Properties AllowRead and AllowWrite
+        private bool read;
+        private bool write;
+
+        public IoMemoryRangeAttribute(int index)
+            : base(index)
+        {
+            this.baseAddress = baseAddress;
+            this.rangeLength = rangeLength;
+            this.read = true;
+            this.write = true;
+        }
+
+        public bool AllowRead
+        {
+            get { return read; }
+            set { read = value; }
+        }
+
+        public bool AllowWrite
+        {
+            get { return write; }
+            set { write = value; }
+        }
+
+        public uint Default
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public uint Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // IoMemoryRangeAttribute
+    //
+    // Purpose: Decorates an IoMemory object to indicate that the runtime should
+    //          preconfigure are static memory region.  The
+    //          memory region is assumed to be read/write, unless these
+    //          values are changed via properties.
+    //
+    // Usage:   Must decorate an IoMemoryRange field of a class decorated with
+    //          [DriverCategory]
+    //
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [CLSCompliant(false)]
+    public class IoFixedMemoryRangeAttribute : IoFixedRangeAttribute
+    {
+        // <<baseAddress>> defaults to 0, any base.  It is the expected base
+        // address of this memory range.
+        private uint baseAddress;
+
+        // <<alignment>> defaults to 0.  It is the expected alignment.
+        private uint alignment;
+
+        // <<defaultSize>> is required.  It is the minimum acceptable size of
+        // the region.
+        private uint rangeLength;
+
+        // <<addressBits>> defaults to 32.  It is the # of address bits
+        // supported by the hardware.  Used to mark memory that must fit in
+        // low 24 bits for legacy ISA devices, or low 32 bits for legacy PCI
+        // devices.
+        private int addressBits;
+
+        // <<read>> and <<write>> default to true.  To set them false, use the
+        // Properties AllowRead and AllowWrite
+        private bool read;
+        private bool write;
+
+        public IoFixedMemoryRangeAttribute()
+        {
+            this.addressBits = 32;
+            this.alignment = 0;
+            this.baseAddress = 0;
+            this.rangeLength = 0;
+            this.read = true;
+            this.write = true;
+        }
+
+        public int AddressBits
+        {
+            get { return addressBits; }
+            set { addressBits = value; }
+        }
+
+        public uint Alignment
+        {
+            get { return alignment; }
+            set { alignment = value; }
+        }
+
+        public bool AllowRead
+        {
+            get { return read; }
+            set { read = value; }
+        }
+
+        public bool AllowWrite
+        {
+            get { return write; }
+            set { write = value; }
+        }
+
+        public uint Base
+        {
+            get { return baseAddress; }
+            set { baseAddress = value; }
+        }
+
+        public uint Length
+        {
+            get { return rangeLength; }
+            set { rangeLength = value; }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/Resources.cs b/base/Kernel/Singularity/Io/Resources.cs
new file mode 100644
index 0000000..dd63c31
--- /dev/null
+++ b/base/Kernel/Singularity/Io/Resources.cs
@@ -0,0 +1,81 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Resources.cs
+//
+
+using System;
+using System.Threading;
+
+using Microsoft.Singularity.Loader;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class Resources
+    {
+        static public int GetWarmBootCount()
+        {
+            BootInfo bi = BootInfo.GetBootInfo();
+            return (int)bi.BootCount;
+        }
+
+        public struct PnpBiosInfo
+        {
+            public IoMemory     pnpRegion;
+            public IoPort       isaReadPort;
+            public uint         isaCsns;
+        }
+
+        static public PnpBiosInfo GetPnpBiosInfo()
+        {
+            BootInfo bi = BootInfo.GetBootInfo();
+            PnpBiosInfo pbi = new PnpBiosInfo();
+
+            if (bi.PnpNodesAddr32 != UIntPtr.Zero) {
+                Tracing.Log(Tracing.Debug, "PnpBiosRegion {0:x8}..{1:x8}",
+                            bi.PnpNodesAddr32, bi.PnpNodesAddr32 + bi.PnpNodesSize32);
+                pbi.pnpRegion = IoMemory.MapPhysicalMemory(
+                    bi.PnpNodesAddr32, bi.PnpNodesSize32, true, false);
+            }
+
+            pbi.isaReadPort = new IoPort((ushort)bi.IsaReadPort, 1, Access.Read);;
+            pbi.isaCsns = bi.IsaCsns;
+            return pbi;
+        }
+
+        static public uint GetPciNumberOfBuses()
+        {
+            BootInfo bi = BootInfo.GetBootInfo();
+
+            return (uint)bi.PciBiosCX + 1;
+        }
+
+        static private unsafe FileImage GetLoadedFileImage(int image)
+        {
+            BootInfo bi = BootInfo.GetBootInfo();
+            if (image < bi.FileImageTableEntries)
+            {
+                FileImage* fi = (FileImage*) bi.FileImageTableBase32; //.ToPointer();
+                return *(fi + image);
+            }
+            return new FileImage(UIntPtr.Zero, 0);
+        }
+
+        static public IoMemory GetLoadedImageMemory(int image)
+        {
+            BootInfo bi = BootInfo.GetBootInfo();
+
+            FileImage fileImage = GetLoadedFileImage(image);
+            if (fileImage.Address != UIntPtr.Zero)
+            {
+                return IoMemory.MapPhysicalMemory(fileImage.Address, fileImage.Size,
+                                                  true, false);
+            }
+            return null;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister16.cs b/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister16.cs
new file mode 100644
index 0000000..a33c477
--- /dev/null
+++ b/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister16.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WriteOnlyMemoryRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class WriteOnlyMemoryRegister16 : IWriteOnlyRegister16
+    {
+        private const int RegisterWidth = 16 >> 3;
+
+        IoMemory memory;
+
+        public WriteOnlyMemoryRegister16(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override void Write(ushort value)
+        {
+            memory.Write16(0, value);
+        }
+
+        public static IWriteOnlyRegister16 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IWriteOnlyRegister16)
+                new WriteOnlyMemoryRegister16(imr.MemoryAtOffset(offset,
+                                                                RegisterWidth,
+                                                                Access.Write));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister32.cs b/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister32.cs
new file mode 100644
index 0000000..49957f3
--- /dev/null
+++ b/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister32.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WriteOnlyMemoryRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class WriteOnlyMemoryRegister32 : IWriteOnlyRegister32
+    {
+        private const int RegisterWidth = 32 >> 3;
+
+        IoMemory memory;
+
+        public WriteOnlyMemoryRegister32(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override void Write(uint value)
+        {
+            memory.Write32(0, value);
+        }
+
+        public static IWriteOnlyRegister32 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IWriteOnlyRegister32)
+                new WriteOnlyMemoryRegister32(imr.MemoryAtOffset(offset,
+                                                                RegisterWidth,
+                                                                Access.Write));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister8.cs b/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister8.cs
new file mode 100644
index 0000000..0733155
--- /dev/null
+++ b/base/Kernel/Singularity/Io/WriteOnlyMemoryRegister8.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WriteOnlyMemoryRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class WriteOnlyMemoryRegister8 : IWriteOnlyRegister8
+    {
+        private const int RegisterWidth = 8 >> 3;
+
+        IoMemory memory;
+
+        public WriteOnlyMemoryRegister8(IoMemory m)
+        {
+            memory = m;
+        }
+
+        public override void Write(byte value)
+        {
+            memory.Write8(0, value);
+        }
+
+        public static IWriteOnlyRegister8 Create(IoMemoryRange imr, uint offset)
+        {
+            return (IWriteOnlyRegister8)
+                new WriteOnlyMemoryRegister8(imr.MemoryAtOffset(offset,
+                                                                RegisterWidth,
+                                                                Access.Write));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/WriteOnlyPortRegister16.cs b/base/Kernel/Singularity/Io/WriteOnlyPortRegister16.cs
new file mode 100644
index 0000000..d9ce049
--- /dev/null
+++ b/base/Kernel/Singularity/Io/WriteOnlyPortRegister16.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WriteOnlyPortRegister16.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class WriteOnlyPortRegister16 : IWriteOnlyRegister16
+    {
+        private const int RegisterWidth = 16 >> 3;
+
+        IoPort port;
+
+        public WriteOnlyPortRegister16(IoPort port)  { this.port = port; }
+        public override void Write(ushort value)     { port.Write16(value); }
+
+        public static IWriteOnlyRegister16 Create(IoPortRange imr, uint offset)
+        {
+            return (IWriteOnlyRegister16)
+                new WriteOnlyPortRegister16(imr.PortAtOffset((ushort)offset,
+                                                            RegisterWidth,
+                                                            Access.Write));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/WriteOnlyPortRegister32.cs b/base/Kernel/Singularity/Io/WriteOnlyPortRegister32.cs
new file mode 100644
index 0000000..fa00552
--- /dev/null
+++ b/base/Kernel/Singularity/Io/WriteOnlyPortRegister32.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WriteOnlyPortRegister32.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class WriteOnlyPortRegister32 : IWriteOnlyRegister32
+    {
+        private const int RegisterWidth = 32 >> 3;
+
+        IoPort port;
+
+        public WriteOnlyPortRegister32(IoPort port)  { this.port = port; }
+        public override void Write(uint value)       { port.Write32(value); }
+
+        public static IWriteOnlyRegister32 Create(IoPortRange imr, uint offset)
+        {
+            return (IWriteOnlyRegister32)
+                new WriteOnlyPortRegister32(imr.PortAtOffset((ushort)offset,
+                                                             RegisterWidth,
+                                                             Access.Write));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Io/WriteOnlyPortRegister8.cs b/base/Kernel/Singularity/Io/WriteOnlyPortRegister8.cs
new file mode 100644
index 0000000..e8a1f73
--- /dev/null
+++ b/base/Kernel/Singularity/Io/WriteOnlyPortRegister8.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WriteOnlyPortRegister8.cs
+//
+
+using System;
+
+namespace Microsoft.Singularity.Io
+{
+    [CLSCompliant(false)]
+    public class WriteOnlyPortRegister8 : IWriteOnlyRegister8
+    {
+        private const int RegisterWidth = 8 >> 3;
+
+        IoPort port;
+
+        public WriteOnlyPortRegister8(IoPort port)  { this.port = port; }
+        public override void Write(byte value)      { port.Write8(value); }
+
+        public static IWriteOnlyRegister8 Create(IoPortRange imr, uint offset)
+        {
+            return (IWriteOnlyRegister8)
+                new WriteOnlyPortRegister8(imr.PortAtOffset((ushort)offset,
+                                                            RegisterWidth,
+                                                            Access.Write));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Kernel.cs b/base/Kernel/Singularity/Kernel.cs
new file mode 100644
index 0000000..4354d68
--- /dev/null
+++ b/base/Kernel/Singularity/Kernel.cs
@@ -0,0 +1,631 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Bartok.Runtime;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Drivers;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Scheduling;
+
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.V1.Services;
+
+[assembly: AssemblyTitle("Microsoft.Singularity")]
+[assembly: AssemblyProduct("Microsoft Research Singularity Operating System")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyKeyFile("public.snk")]
+[assembly: AssemblyDelaySign(true)]
+
+namespace Microsoft.Singularity
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class Kernel
+    {
+        private static string[] args;
+        private static ManualResetEvent mpEndEvent;
+        private static int bootReturnCode;
+
+        #region Waypoints
+
+        public static long[]    Waypoints;
+        public static int[]     WaypointSeq;
+        public static int[]     WaypointThd;
+        public static int       WaypointNumber;// = 0;
+        public static long      WaypointSamples;// = 0;
+        public static bool      WaypointSuspicious;
+        public static uint      WaypointInterrupt;
+        public const int        NWP = 2048; // XXX if this is readonly then it seems to read as 0!
+
+        [Conditional("WAYPOINTS")]
+        [NoHeapAllocation]
+        public static void Waypoint0()
+        {
+            WaypointSamples++;
+            Waypoints[0] = (long)Processor.CycleCount;
+            WaypointNumber = 1;
+            WaypointSuspicious = false;
+            WaypointInterrupt = Processor.CurrentProcessor.NumInterrupts;
+        }
+
+        [Conditional("WAYPOINTS")]
+        [NoHeapAllocation]
+        public static void Waypoint(int num)
+        {
+            if (Waypoints == null || Waypoints[0] == 0 || WaypointNumber > NWP-1) {
+                return;
+            }
+
+            long delta = (long)Processor.CycleCount - Waypoints[0];
+            if (delta > 7000000) {
+                WaypointSuspicious = true;
+            }
+
+            WaypointSeq[WaypointNumber] = num;
+            WaypointThd[WaypointNumber] = Thread.GetCurrentThreadIndex();
+            Waypoints[WaypointNumber++] = delta;
+        }
+
+        [Conditional("WAYPOINTS")]
+        [NoHeapAllocation]
+        public static void WaypointDone()
+        {
+            Waypoints[0] = 0;
+        }
+
+#if false
+        [Conditional("WAYPOINTS")]
+        [NoHeapAllocation]
+        public static void WaypointDump()
+        {
+            WaypointDump(NWP);
+        }
+#endif
+
+        [Conditional("WAYPOINTS")]
+        public static void WaypointDump()
+        {
+            bool iflag = Processor.DisableInterrupts();
+
+            DebugStub.WriteLine("Interrupts: {0}",
+                                __arglist(Processor.CurrentProcessor.NumInterrupts
+                                          - WaypointInterrupt));
+            DebugStub.WriteLine("WPT Waypoint   Sequence   THD Diff");
+
+            for (int i = 1; i < WaypointNumber; i++) {
+                DebugStub.WriteLine("{0,3:d} {1,10:d} {2,10:d} {3,3:d} {4,10:d}",
+                                    __arglist(
+                                        i,
+                                        Waypoints[i],
+                                        WaypointSeq[i],
+                                        WaypointThd[i].GetHashCode(),
+                                        Waypoints[i] - Kernel.Waypoints[i-1]));
+            }
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        [Conditional("WAYPOINTS")]
+        [NoHeapAllocation]
+        public static void WaypointReset()
+        {
+            for (int i = 0; i < NWP; i++) {
+                Waypoints[i] = 0;
+            }
+            WaypointSamples = 0;
+        }
+        #endregion // Waypoints
+
+
+        // Note: This function is called by Hal.cpp.
+        [AccessedByRuntime("referenced from hal.cpp")]
+        internal static int Main()
+        {
+            bootReturnCode = BootInfo.EXIT_AND_RESTART;
+
+            DebugStub.WriteLine("Kernel.Main()");
+
+            // Initialize the memory subsystem. This turns on paging!
+            MemoryManager.Initialize();
+
+            // Note for Monitoring early boot process:
+            // if you ever want to monitor stuff before this point, you should
+            // allocate a static memory area in BootInit.cs, init the
+            // monitoring system earlier, hold the system at this point here,
+            // copy over all the collected data up to now to the new
+            // dynamically created buffer and continue
+            Monitoring.Initialize();  // uses page memory
+
+            HandleTable.Initialize();
+            Stacks.Initialize();
+
+            try {
+                // Initialize the rest of the primitive runtime.
+                VTable.Initialize((RuntimeType)typeof(Kernel));
+
+#if PAGING
+                // Must occur before MemoryManager.PostGCInitialize()
+                ProtectionDomain.Initialize();
+#endif
+
+                // Must occur before SharedHeap.Initialize()
+                MemoryManager.PostGCInitialize();
+
+                SharedHeap.Initialize();
+
+#if PAGING
+                // Must occur after SharedHeap.Initialize();
+                ProtectionDomain.DefaultDomain.InitHook();
+#endif
+
+                args = GetCommandLine();
+                VTable.ParseArgs(args);
+
+                // Initialize the processor table.
+                InitType(typeof(Processor));
+                InitType(typeof(Scheduler));
+                InitType(typeof(MinScheduler));
+
+                Processor.InitializeProcessorTable();
+
+                Tracing.Log(Tracing.Audit, "processor");
+                Processor processor = Processor.processorTable[0];
+                processor.Initialize(0);
+
+                PEImage.Initialize();
+
+                // initialize endpoints
+                InitType(typeof(Microsoft.Singularity.Channels.EndpointCore));
+
+                // get the system manifest
+                XmlReader xmlReader = new XmlReader(Binder.GetSystemManifest());
+                XmlNode xmlData = xmlReader.Parse();
+                XmlNode manifestRoot = xmlData.GetChild("system");
+                XmlNode initConfig = manifestRoot.GetChild("initConfig");
+
+                PerfCounters.Initialize();
+                // need to have processed the manifest before we can call Process initialize
+                PrincipalImpl.Initialize(initConfig);
+                Process.Initialize(manifestRoot.GetChild("processConfig"));
+
+
+                // obtain the configuration for the namespace service
+                // and initialize the namespace service
+                DirectoryService.Initialize(initConfig);
+
+                Tracing.Log(Tracing.Audit, "IoSystem");
+                IoSystem.Initialize(
+                    manifestRoot.GetChild("drivers"));
+
+                Tracing.Log(Tracing.Audit, "Registering HAL Drivers.");
+                Devices.RegisterPnpResources(); // add the root device
+
+                HalDevices.Initialize(processor); //
+
+#if SINGULARITY_MP
+                // haryadi -- at this point we have the SRAT table,
+                // Create per-processor address space now
+                MemoryManager.InitializeProcessorAddressSpace();
+#endif
+
+                // From here on, we want lazy type initialization to worry about
+                // competing threads.
+                VTable.InitializeForMultipleThread();
+
+                Console.WriteLine("Running C# Kernel of {0}", GetLinkDate());
+
+                Console.WriteLine();
+
+                Console.WriteLine("Initializing Scheduler");
+                MinScheduler.Initialize(Process.idleProcess);
+
+
+                DirectoryService.StartNotificationThread();
+
+                Console.WriteLine("Initializing Shared Heap Walker");
+                Process.InitializeSharedHeapWalker();
+
+                Console.WriteLine("Initializing Service Thread");
+                ServiceThread.Initialize();
+
+#if GENERATE_ABI_SHIM
+                // haryadi: add Ap service thread
+                Console.WriteLine("Initializing AP Service Thread");
+                ApServiceThread.Initialize();
+#endif
+
+                Tracing.Log(Tracing.Audit, "Enabling GC Heap");
+                GC.EnableHeap();
+
+                Tracing.Log(Tracing.Audit, "Waypoints init");
+                Waypoints = new long[2048];
+                WaypointSeq = new int[2048];
+                WaypointThd = new int[2048];
+
+                Tracing.Log(Tracing.Audit, "Interrupts ON.");
+                Processor.RestoreInterrupts(true);
+
+                Tracing.Log(Tracing.Audit, "Starting Security Service channels");
+                PrincipalImpl.Export();
+
+                Tracing.Log(Tracing.Audit, "Creating Root Directory.");
+                IoSystem.InitializeDirectoryService();
+                // [TODO]turn off kernel interfaces to namespace here
+
+                Tracing.Log(Tracing.Audit, "Binder");
+                Binder.Initialize(
+                    manifestRoot.GetChild("namingConventions"));
+
+                Tracing.Log(Tracing.Audit, "Creating console.");
+                ConsoleOutput.Initialize();
+
+                // Initialize MP after Binder and ConsoleOutput
+                // are initialized so there are no
+                // initialization races if the additional
+                // threads try to use them.
+                Tracing.Log(Tracing.Audit, "Starting additional processors");
+                MpExecution.Initialize();
+                mpEndEvent = new ManualResetEvent(false);
+
+                Processor.StartApProcessors();
+
+                Tracing.Log(Tracing.Audit, "Initializing Volume Manager.");
+                IoSystem.InitializeVolumeManager();
+
+                // Register drivers who depend on scheduling and resource
+                // management.
+                DebugStub.WriteLine("--- Registering Drivers ---------------------------");
+                Console.WriteLine("Registering Non-HAL Drivers.");
+                // register the metadata-based drivers
+                IoSystem.RegisterDrivers();
+                // register the internal kernel drivers
+                Devices.RegisterInternalDrivers();
+                NvPciLpcBridge.Register();
+#if DEBUG
+                // and output the results
+                IoSystem.Dump(false);
+#endif
+
+                DebugStub.WriteLine("--- Activating Devices ----------------------------");
+                // now do device initialization
+                IoSystem.ActivateDrivers();
+#if DEBUG
+                // and output the results
+                IoSystem.Dump(true);
+#endif
+
+                Tracing.Log(Tracing.Audit, "Initializing Service Manager.");
+                IoSystem.InitializeServiceManager(manifestRoot.GetChild("serviceConfig"));
+
+                // Start up the kernel's diagnostics module
+                Console.WriteLine("Starting diagnostics module...");
+                Diagnostics.DiagnosticsModule.Initialize();
+
+                // Start up the kernel's stress test module
+                Console.WriteLine("Initializing stress module...");
+                Stress.StressService.Initialize();
+
+                Processor.StartSampling();
+
+                // Consider boot successful at this stage.
+                bootReturnCode = BootInfo.EXIT_AND_SHUTDOWN;
+
+                DebugStub.WriteLine("----------------------------------------------------------");
+                DebugStub.WriteLine("RdTsc, Halt, RdTsc");
+                ulong beg;
+                ulong end;
+                beg = Processor.CycleCount;
+                Processor.HaltUntilInterrupt();
+                end = Processor.CycleCount;
+
+                DebugStub.WriteLine("  Begin: {0,16:d}", __arglist(beg));
+                DebugStub.WriteLine("  End:   {0,16:d}", __arglist(end));
+                DebugStub.WriteLine("  Diff:  {0,16:d}", __arglist(end - beg));
+                DebugStub.WriteLine("----------------------------------------------------------");
+
+                Tracing.Log(Tracing.Audit, "Creating Shell Process");
+                int exit = -10000;
+                Process process = null;
+                IoMemory memory;
+                Manifest manifest;
+
+#if KERNEL_USE_LOGIN
+                if (args[0] == "bvt") {
+                    memory = Binder.LoadImage(Thread.CurrentProcess, "tty.x86", out manifest);
+                }
+                else{
+                    // TODO: The login app needs to be fixed to setup stdin and stdout pipes for
+                    // the shell and pump the data back and forth.
+                    memory = Binder.LoadImage(Thread.CurrentProcess, "login.x86", out manifest);
+                }
+#else
+                memory = Binder.LoadImage(Thread.CurrentProcess, "tty.x86", out manifest);
+#endif
+
+                if (memory != null && memory.Length > 0) {
+                    String[] shellArgs = new String[args.Length + 2];
+                    shellArgs[0] = "tty.x86";
+                    shellArgs[1] = "shell.x86";
+                    for (int i = 0; i < args.Length; i++) {
+                        shellArgs[i + 2] = args[i];
+                    }
+                    process = new Process(Thread.CurrentProcess, memory, null, shellArgs, manifest);
+                    if (process != null) {
+                        process.Start();
+                        process.Join();
+                        exit = process.ExitCode;
+                    }
+                }
+
+                switch (exit) {
+                    case -10000:
+                        Tracing.Log(Tracing.Audit, "Failed to start shell process.");
+                        bootReturnCode = BootInfo.EXIT_AND_RESTART;
+                        break;
+                    case BootInfo.EXIT_AND_WARMBOOT:
+                        bootReturnCode = BootInfo.EXIT_AND_WARMBOOT;
+                        break;
+                    case BootInfo.EXIT_AND_RESTART:
+                        bootReturnCode = BootInfo.EXIT_AND_RESTART;
+                        break;
+                    case BootInfo.EXIT_AND_SHUTDOWN:
+                        bootReturnCode = BootInfo.EXIT_AND_SHUTDOWN;
+                        break;
+                }
+
+                Tracing.Log(Tracing.Audit, "Shutting down AP processors");
+                Processor.StopApProcessors();
+
+                Tracing.Log(Tracing.Audit, "Shutting down I/O system");
+                Console.WriteLine("Shutting down I/O system");
+                IoSystem.Finalize();
+
+                Tracing.Log(Tracing.Audit, "Interrupts OFF.");
+                Processor.DisableInterrupts();
+
+                Tracing.Log(Tracing.Audit, "Shutting down scheduler");
+                Console.WriteLine("Shutting down scheduler");
+                MinScheduler.Finalize();
+
+                // We should turn off interrupts here!
+                HalDevices.Finalize();
+                PEImage.Finalize();
+
+                DebugStub.WriteLine("Kernel Exiting [{0}]",
+                                    __arglist(bootReturnCode));
+            }
+            catch (Exception e) {
+                Tracing.Log(Tracing.Fatal, "Caught exception {0}", e.Message);
+                DebugStub.WriteLine("Caught {0}", __arglist(e.Message));
+                bootReturnCode = -1;
+                DebugStub.Break();
+            }
+
+            DebugStub.WriteLine("Kernel exiting with 0x{0:x4}",
+                                __arglist(bootReturnCode));
+
+            Stacks.Finalize();
+            HandleTable.Finalize();
+#if !PAGING
+            SharedHeap.Finalize();
+#endif //PAGING
+
+            MemoryManager.Finalize();
+
+            if (bootReturnCode != BootInfo.EXIT_AND_WARMBOOT) {
+                Kill(bootReturnCode);
+            }
+            return bootReturnCode;
+        }
+
+        // Note: This function is entry point to the managed
+        // kernel for CPU's other than the bootstrap processor.
+        // It is called by Hal.cpp.
+        [AccessedByRuntime("referenced from hal.cpp")]
+        internal static int MpMain(int cpu)
+        {
+            Tracing.Log(Tracing.Audit, "processor");
+            Processor processor = Processor.processorTable[cpu];
+            processor.Initialize(cpu);
+            HalDevices.Initialize(processor);
+
+            Processor.CurrentProcessor.SetNextTimerInterrupt(TimeSpan.Zero);
+            Processor.RestoreInterrupts(true);
+
+            Tracing.Log(Tracing.Audit,
+                        "Halting processor until first interrupt.");
+            Processor.HaltUntilInterrupt();
+            Tracing.Log(Tracing.Audit, "Resumed from halt.");
+
+            // This probably won't be the
+            // ultimate way of dissociating kernel entry threads
+            // from the kernel.
+            mpEndEvent.WaitOne();
+
+            return 0;
+        }
+
+        // This function is called by the GC to locate all non-static object
+        // references allocated somewhere other than the stack.
+        internal static
+        void VisitSpecialData(System.GCs.NonNullReferenceVisitor visitor)
+        {
+            Process.VisitSpecialData(visitor);
+            visitor.VisitReferenceFields(Processor.processorTable);
+        }
+
+        // This function is called by GCs that move object to update all
+        // object references contained in non-objects (i.e. unsafe structs).
+        internal static void UpdateAfterGC(Thread currentThread)
+        {
+            Processor.UpdateAfterGC(currentThread);
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(8)]
+        [NoHeapAllocation]
+        private static unsafe extern char * HalGetLinkDate();
+
+        internal static unsafe string GetLinkDate()
+        {
+            return new String(HalGetLinkDate());
+        }
+
+        internal static unsafe string[] GetCommandLine()
+        {
+            String[] args =
+                (new String((char *)(BootInfo.HalGetBootInfo()->CmdLine32))).Split(null);
+            int dst = 0;
+            for (int src = 0; src < args.Length; src++) {
+                if (args[src] != null && args[src].Length > 0) {
+                    args[dst++] = args[src];
+                }
+            }
+            if (dst < args.Length) {
+                String[] list = new String[dst];
+                for (int i = 0; i < dst; i++) {
+                    list[i] = args[i];
+                }
+                return list;
+            }
+            return args;
+        }
+
+        [NoHeapAllocation]
+        public static void RequestWarmBoot()
+        {
+            bootReturnCode = BootInfo.EXIT_AND_WARMBOOT;
+        }
+
+        [NoHeapAllocation]
+        public static void RequestRestart()
+        {
+            bootReturnCode = BootInfo.EXIT_AND_RESTART;
+        }
+
+        [NoHeapAllocation]
+        public static void RequestShutdown()
+        {
+            bootReturnCode = BootInfo.EXIT_AND_SHUTDOWN;
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [NoHeapAllocation]
+        private static extern void Kill(int exitCode);
+
+        internal static void Shutdown(int exitCode)
+        {
+            unchecked {
+                Tracing.Log(Tracing.Audit, "Kernel.Shutdown({0})", (UIntPtr)(uint)exitCode);
+            }
+            DebugStub.WriteLine("Kernel.Shutdown(0x{0:x4})",
+                                __arglist(exitCode));
+            DebugStub.Break();
+            VTable.Shutdown(exitCode);
+        }
+
+        internal static void Panic(string why)
+        {
+            DebugStub.WriteLine("KERNEL PANIC: {0}", __arglist(why));
+            Shutdown(BootInfo.EXIT_AND_HALT);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [NoHeapAllocation]
+        public static UIntPtr AddressOf(Object o)
+        {
+            return Magic.addressOf(o);
+        }
+
+        [NoHeapAllocation]
+        public static UIntPtr SizeOf(Object o)
+        {
+            return System.GCs.ObjectLayout.Sizeof(o);
+        }
+
+        [NoHeapAllocation]
+        public static UIntPtr AddressOf(ITracked tracked)
+        {
+            return Magic.addressOf(tracked);
+        }
+
+        [NoHeapAllocation]
+        unsafe public static UIntPtr AddressOf(void * ptr)
+        {
+            return (UIntPtr)ptr;
+        }
+
+        public static void InitType(Type ty)
+        {
+            VTable.initType((RuntimeType) ty);
+        }
+
+        [NoHeapAllocation]
+        public static string TypeName(Object o)
+        {
+            if (o == null) {
+                return "null";
+            }
+            else {
+                Type t = o.GetType();
+                RuntimeType r = (RuntimeType)t;
+                return r.Name;
+            }
+        }
+
+        [NoHeapAllocation]
+        public static string TypeNameSpace(Object o)
+        {
+            if (o == null) {
+                return "null";
+            }
+            else {
+                Type t = o.GetType();
+                RuntimeType r = (RuntimeType)t;
+                return r.Namespace;
+            }
+        }
+
+        public static string FullTypeName(Object o)
+        {
+            if (o == null) {
+                return "null";
+            }
+            else {
+                Type t = o.GetType();
+                RuntimeType r = (RuntimeType)t;
+                return r.Namespace + "." + r.Name;
+            }
+        }
+
+        public static void DumpPageTable()
+        {
+            System.GCs.PageTable.Dump("PageTable");
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Loader/BadImageFormatException.cs b/base/Kernel/Singularity/Loader/BadImageFormatException.cs
new file mode 100644
index 0000000..fbc4881
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/BadImageFormatException.cs
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+
+namespace Microsoft.Singularity.Loader
+{
+    using System;
+
+    internal class BadImageFormatException : SystemException
+    {
+        internal BadImageFormatException(String reason)
+            : base(reason)
+        {
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Loader/DirectoryEntry.cs b/base/Kernel/Singularity/Loader/DirectoryEntry.cs
new file mode 100644
index 0000000..f1e50e0
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/DirectoryEntry.cs
@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+// Currently does not support:
+//      x64
+//      sections loaded at separate addresses
+//      loading at preferred address
+
+// #define verbose
+
+namespace Microsoft.Singularity.Loader
+{
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    internal struct DirectoryEntry
+    {
+        // State
+        internal readonly uint virtualAddress;
+        internal readonly uint size;
+
+        internal DirectoryEntry(IoMemory mem, ref int offset)
+        {
+            if (offset + 8 > mem.Length) {
+                Error.AccessOutOfRange();
+            }
+
+            virtualAddress = mem.Read32Unchecked(offset + 0);
+            size           = mem.Read32Unchecked(offset + 4);
+            offset += 8;
+        }
+
+        // Output Routines
+
+        [Conditional("DEBUG")]
+        internal void DumpToStream(String prefix)
+        {
+            Tracing.Log(Tracing.Debug, "    {0} {1:x8}..{2:x8}",
+                        prefix, virtualAddress, virtualAddress + size);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Loader/ExportTable.cs b/base/Kernel/Singularity/Loader/ExportTable.cs
new file mode 100644
index 0000000..d5530a0
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/ExportTable.cs
@@ -0,0 +1,141 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+// Currently does not support:
+//      x64
+//      sections loaded at separate addresses
+//      loading at preferred address
+
+// #define verbose
+
+namespace Microsoft.Singularity.Loader
+{
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    [CLSCompliant(false)]
+    internal class ExportTable
+    {
+        private IoMemory mem;
+        private DirectoryEntry entry;
+        private ExportDirectory exports;
+        private string[] names;
+        private ushort[] ordinals;
+        private UIntPtr[] addresses;
+
+        struct ExportDirectory
+        {
+            internal readonly uint   Characteristics;
+            internal readonly uint   NumberOfFunctions;
+            internal readonly uint   NumberOfNames;
+            internal readonly uint   AddressOfFunctions;    // RVA from base of image
+            internal readonly uint   AddressOfNames;        // RVA from base of image
+            internal readonly uint   AddressOfOrdinals;     // RVA from base of image
+
+            internal ExportDirectory(IoMemory mem, int offset)
+            {
+                if (offset + 40 > mem.Length) {
+                    Error.AccessOutOfRange();
+                }
+                Characteristics     = mem.Read32Unchecked(offset + 0);
+                NumberOfFunctions   = mem.Read32Unchecked(offset + 20);
+                NumberOfNames       = mem.Read32Unchecked(offset + 24);
+                AddressOfFunctions  = mem.Read32Unchecked(offset + 28);
+                AddressOfNames      = mem.Read32Unchecked(offset + 32);
+                AddressOfOrdinals   = mem.Read32Unchecked(offset + 36);
+
+                if (AddressOfFunctions + 4 * NumberOfFunctions > mem.Length ||
+                    AddressOfOrdinals + 2 * NumberOfFunctions > mem.Length ||
+                    AddressOfNames + 4 * NumberOfFunctions > mem.Length) {
+
+                    Error.AccessOutOfRange();
+                }
+            }
+        }
+
+        internal ExportTable(IoMemory mem, UIntPtr imageBase, DirectoryEntry entry)
+        {
+            this.mem = mem;
+            this.entry = entry;
+
+            try {
+                exports = new ExportDirectory(mem, (int)entry.virtualAddress);
+
+                if (exports.NumberOfFunctions > 0) {
+                    addresses = new UIntPtr[exports.NumberOfFunctions];
+                    for (uint i = 0; i < exports.NumberOfFunctions; i++) {
+                        addresses[i] = imageBase
+                            + mem.Read32Unchecked((int)(exports.AddressOfFunctions + 4 * i));
+                    }
+                }
+
+                if (exports.NumberOfNames > 0) {
+                    names = new string[exports.NumberOfNames];
+                    ordinals = new ushort[exports.NumberOfNames];
+                    for (uint i = 0; i < exports.NumberOfNames; i++) {
+                        ordinals[i]
+                            = mem.Read16Unchecked((int)(exports.AddressOfOrdinals + 2 * i));
+                        uint addrOfName
+                            = mem.Read32Unchecked((int)(exports.AddressOfNames + 4 * i));
+                        names[i] = mem.ReadAsciiZeroString((int)addrOfName);
+                    }
+                }
+            }
+            catch (Exception e) {
+                DebugStub.Print("Caught exception: {0}\n",
+                                __arglist(e.ToString()));
+            }
+        }
+
+        [Conditional("DEBUG")]
+        internal void Dump()
+        {
+            DebugStub.Print("  Ord# Function Name\n");
+            if (names != null) {
+                for (int i = 0; i < names.Length; i++) {
+                    DebugStub.Print("  {0:d4} {1:x8} {2:x8}\n",
+                                    __arglist(ordinals[i], addresses[i], names[i]));
+                }
+            }
+        }
+
+        internal UIntPtr Resolve(ushort hint, string name)
+        {
+            if (names != null) {
+                // haryadi --- we need put a guard here !!!!  because
+                // hint might exceed names.Length The guard in
+                // particular is useful when we want to resolve
+                // imports from MP applications with abi.dll
+                // (MpSyscalls.x86). The "hint" that is obtained from the
+                // app.x86 is actually the hint related to kernel.x86.
+                // Hence, when resolving imports for MP apps, we should
+                // always fall through to the "else" block below
+                if (hint < names.Length && names[hint] == name) {
+                    return addresses[hint];
+                }
+                else {
+                    //[SOSP] we should probably do a binary search.
+                    for (int i = 0; i < names.Length; i++) {
+                        if (names[i] == name) {
+                            return addresses[i];
+                        }
+                    }
+                }
+            }
+            return UIntPtr.Zero;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Loader/ImportTable.cs b/base/Kernel/Singularity/Loader/ImportTable.cs
new file mode 100644
index 0000000..0a6724b
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/ImportTable.cs
@@ -0,0 +1,235 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+// Currently does not support:
+//      x64
+//      sections loaded at separate addresses
+//      loading at preferred address
+
+// #define verbose
+
+namespace Microsoft.Singularity.Loader
+{
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    [CLSCompliant(false)]
+    internal class ImportTable
+    {
+        private IoMemory mem;
+        private DirectoryEntry entry;
+
+        internal ImportTable(IoMemory mem, DirectoryEntry entry)
+        {
+            this.mem = mem;
+            this.entry = entry;
+
+            if (entry.size == 0)
+            {
+                DebugStub.WriteLine("// No import table.");
+                return;
+            }
+        }
+
+#if verbose
+        [Conditional("DEBUG")]
+        public void DumpIAT(String title)
+        {
+            Tracing.Log(Tracing.Debug, "// {0}", title);
+            if (entry.size == 0)
+            {
+                Tracing.Log(Tracing.Debug, "// No data.");
+                return;
+            }
+            int importOffset = (int)entry.virtualAddress;
+            Tracing.Log(Tracing.Debug, "  import offset={0:x8}", importOffset);
+            //
+            // start at the importOffset specified above creating and filling out ImportDescriptors
+            // There is no indication in the header as to how many descriptors are present.
+            // In the last descriptor all fields will be 0; this code checks just the firstChunk field.
+            //
+            for (;;)
+            {
+                ImportDescriptor importDescriptor =
+                    new ImportDescriptor(mem, ref importOffset);
+
+                //Use hit/Name array pointed to by "characteristics"
+                // FirstChunk points to the IAT table which is modified at load time to
+                //  to reflect the fixed-up thunk to access the function
+                if (importDescriptor.characteristics == 0) {
+                    return;
+                }
+                String name = null;
+                if (importDescriptor.name != 0) {
+                    name = mem.ReadAsciiZeroString((int)importDescriptor.name);
+                }
+                Tracing.Log(Tracing.Debug, "// {0}", name);
+                importDescriptor.DumpToStream();
+                Tracing.Log(Tracing.Debug, "//");
+
+                int importTableOffset = (int)importDescriptor.characteristics;
+                for (;;)
+                {
+                    int importTableID = (int) mem.Read32(importTableOffset);
+                    if (importTableID == 0) {
+                        break;
+                    }
+                    Tracing.Log(Tracing.Debug, "importTableID is {0:x8}", importTableID);
+                    int nameStringOffset =
+                        importTableID & 0x7fffffff;
+                    importTableOffset += 4;
+                    if ((importTableID & 0x8000000) != 0) {
+                        Tracing.Log(Tracing.Debug, "//              {0:x8} by ordinal {1:x8}",
+                                    mem.Read16(importTableOffset),
+                                    (importTableID & 0x7ffffff));
+                    }
+                    else {
+                        Tracing.Log(Tracing.Debug, "//              {1:x8} {0:x8}",
+                                    mem.ReadAsciiZeroString(nameStringOffset+2),
+                                    mem.Read16(importTableOffset));
+                    }
+                }
+                Tracing.Log(Tracing.Debug, "");
+            }
+            //throw new BadImageFormatException("");
+        }
+#endif
+
+        public void ResolveImports(ExportTable exports)
+        {
+            if (entry.size == 0)
+            {
+                Tracing.Log(Tracing.Debug, "// No imports to resolve.");
+                return;
+            }
+
+            int importOffset = (int)entry.virtualAddress;
+            //Tracing.Log(Tracing.Debug, "  import offset={0:x8}", importOffset);
+            //
+            // start at the importOffset specified above creating and filling out ImportDescriptors
+            // There is no indication in the header as to how many descriptors are present.
+            // In the last descriptor all fields will be 0; this code checks just the firstChunk field.
+            //
+            for (;;) {
+                ImportDescriptor importDescriptor =
+                    new ImportDescriptor(mem, ref importOffset);
+                if (importDescriptor.firstChunk == 0) {
+                    return;
+                }
+                ushort hint = 0;
+                String name = null;
+                if (importDescriptor.name != 0) {
+                    name = mem.ReadAsciiZeroString((int)importDescriptor.name);
+                }
+#if verbose
+                Tracing.Log(Tracing.Debug, "//     {0}", name);
+                importDescriptor.DumpToStream("//              ");
+                Tracing.Log(Tracing.Debug, "//");
+#endif
+                UIntPtr offsetHintTable = UIntPtr.Zero;
+
+                if (0 == importDescriptor.characteristics) {
+                    offsetHintTable = (UIntPtr)importDescriptor.characteristics;
+                }
+                else {
+                    offsetHintTable = (UIntPtr)importDescriptor.firstChunk;
+                }
+                UIntPtr offsetIAT = (UIntPtr)importDescriptor.firstChunk;
+
+                for (;;) {
+                    // read elements in the hint array for processing
+                    // the hint array terminates when the its content is 0
+                    int importByNameEntry = (int) mem.Read32((int)offsetHintTable);
+                    if (importByNameEntry == 0) break;
+#if verbose
+                    Tracing.Log(Tracing.Debug, "importByName entry is {0:x8}",
+                                importByNameEntry);
+#endif
+                    int nameStringOffset = importByNameEntry & 0x7fffffff;
+                    if ((importByNameEntry & 0x8000000) != 0) {
+                        // should never happen in Singularity (no Ordinals)
+                        throw new BadImageFormatException("Import Ordinal encountered");
+                    }
+                    else {
+                        name = mem.ReadAsciiZeroString((int)nameStringOffset+2);
+                        hint = mem.Read16Unchecked(nameStringOffset);
+                        //Tracing.Log(Tracing.Debug, " function to lookup is {0}", name);
+
+                        UIntPtr addr = exports.Resolve(hint, name);
+                        if (0 != addr)
+                        {
+                            //Overwrite ptr in IAT with address of function in the
+                            // IAT thunk table
+#if verbose
+                            int meth = name.IndexOf('@');
+                            int rest = name.IndexOf('@', meth + 1) + 1;
+                            int clas = name.LastIndexOf('_', rest, rest - meth) + 1;
+                            Tracing.Log(Tracing.Debug, "    import: {1:x8} is {2:x8} {0}",
+                                        name.Substring(0, meth) + "@" + name.Substring(clas, rest - clas) + "@" name.Substring(rest)
+                                        (uint)offsetIAT, (uint)addr);
+#endif
+                            mem.Write32((int) offsetIAT,(uint)addr);
+                        }
+                        else
+                        {
+                            Tracing.Log(Tracing.Debug, " Import not found: {0}", name);
+                            throw new BadImageFormatException("Import Ordinal encountered");
+                        }
+                    }
+                    // increment "array indices"
+                    offsetIAT += 4;
+                    offsetHintTable +=4;
+                }
+                //Tracing.Log(Tracing.Debug, "");
+            }
+            //throw new BadImageFormatException("");
+        }
+
+        internal struct ImportDescriptor
+        {
+            internal ImportDescriptor(IoMemory mem, ref int offset)
+            {
+                if (offset + 20 > mem.Length) {
+                    Error.AccessOutOfRange();
+                }
+                this.characteristics    = mem.Read32Unchecked(offset + 0);
+                this.timeDateStamp      = mem.Read32Unchecked(offset + 4);
+                this.forwarderChain     = mem.Read32Unchecked(offset + 8);
+                this.name               = mem.Read32Unchecked(offset + 12);
+                this.firstChunk         = mem.Read32Unchecked(offset + 16);
+                offset += 20;
+            }
+
+            [Conditional("DEBUG")]
+            internal void DumpToStream()
+            {
+                Tracing.Log(Tracing.Debug, "{0:x8}  Import Address Table", firstChunk);
+                Tracing.Log(Tracing.Debug, "{0:x8}  Import Name Table", name);
+                Tracing.Log(Tracing.Debug, "{0:x8}  Time date stamp", timeDateStamp);
+                Tracing.Log(Tracing.Debug, "{0:x8}  Index of first forwarder reference",
+                            forwarderChain);
+            }
+
+            // State
+
+            internal readonly uint characteristics;
+            internal readonly uint timeDateStamp;
+            internal readonly uint forwarderChain;
+            internal readonly uint name;
+            internal readonly uint firstChunk;
+        }
+    } // ImportTable class
+}
diff --git a/base/Kernel/Singularity/Loader/PEImage.cs b/base/Kernel/Singularity/Loader/PEImage.cs
new file mode 100644
index 0000000..4f29dcc
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/PEImage.cs
@@ -0,0 +1,604 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+// Currently does not support:
+//      x64
+//      sections loaded at separate addresses
+//      loading at preferred address
+
+// #define verbose
+
+// haryadi
+// #define SINGULARITY_ASMP
+
+namespace Microsoft.Singularity.Loader
+{
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity.Memory;
+
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    using PageType = System.GCs.PageType;
+
+    [CLSCompliant(false)]
+    internal class PEImage
+    {
+        // PE Signature
+        internal readonly uint signature;
+
+        // IMAGE_FILE_HEADER
+        internal readonly ushort machine;
+        internal readonly ushort numberOfSections;
+        internal readonly uint   timeDateStamp;
+        internal readonly ushort sizeOfOptionalHeader;
+        internal readonly ushort characteristics;
+
+        // IMAGE_OPTIONAL_HEADER32
+        internal readonly ushort magic;
+        internal readonly uint   addressOfEntryPoint;
+        internal readonly uint   imageBase;
+        internal readonly uint   sectionAlignment;
+        internal readonly uint   fileAlignment;
+        private  readonly uint   sizeOfImage; // use loadedSize (this is rnd'd)
+        internal readonly uint   sizeOfHeaders;
+        internal readonly uint   checkSum;
+        internal readonly ushort dllCharacteristics;
+        internal readonly uint   loaderFlags;
+        internal readonly uint   numberOfRvaAndSizes;
+
+        // IMAGE_DATA_DIRECTORY and SECTION_HEADERs
+        internal readonly DirectoryEntry[] directory;
+        internal readonly SectionHeader[] sections;
+        internal readonly uint loadedSize;
+
+        internal const ushort IMAGE_FILE_32BIT_MACHINE      = 0x0100; // 32 bit machine.
+        internal const ushort IMAGE_FILE_DLL                = 0x2000; // File is a DLL.
+
+        internal const ushort IMAGE_DOS_SIGNATURE           = 0x5A4D;     // MZ
+        internal const uint   IMAGE_NT_SIGNATURE            = 0x00004550; // PE00
+        internal const ushort IMAGE_NT_OPTIONAL_HDR32_MAGIC = 0x010b;
+
+        enum Machine : ushort {
+            UNKNOWN           = 0,
+                I386              = 0x014c, // Intel 386.
+                R3000             = 0x0162, // MIPS little-endian, = 0x160 big-endian
+                R4000             = 0x0166, // MIPS little-endian
+                R10000            = 0x0168, // MIPS little-endian
+                WCEMIPSV2         = 0x0169, // MIPS little-endian WCE v2
+                ALPHA             = 0x0184, // Alpha_AXP
+                SH3               = 0x01a2, // SH3 little-endian
+                SH3DSP            = 0x01a3,
+                SH3E              = 0x01a4, // SH3E little-endian
+                SH4               = 0x01a6, // SH4 little-endian
+                SH5               = 0x01a8, // SH5
+                ARM               = 0x01c0, // ARM Little-Endian
+                THUMB             = 0x01c2,
+                AM33              = 0x01d3,
+                POWERPC           = 0x01F0, // IBM PowerPC Little-Endian
+                POWERPCFP         = 0x01f1,
+                IA64              = 0x0200, // Intel 64
+                MIPS16            = 0x0266, // MIPS
+                ALPHA64           = 0x0284, // ALPHA64
+                MIPSFPU           = 0x0366, // MIPS
+                MIPSFPU16         = 0x0466, // MIPS
+                TRICORE           = 0x0520, // Infineon
+                EBC               = 0x0EBC, // EFI Byte Code
+                X64               = 0x8664, // AMD64, etc.
+                M32R              = 0x9041, // M32R little-endian
+                CEE               = 0xC0EE,
+                };
+
+        // Directory Entries
+
+        enum DirEntry {
+            Export      = 0,    // Export Directory
+            Import      = 1,    // Import Directory
+            Security    = 4,    // Security Directory
+            BaseReloc   = 5,    // Base Relocation Table
+            Debug       = 6,    // Debug Directory
+            Copyright   = 7,    // Description String
+        };
+
+        // Corresponds to the WinNT IMAGE_NT_HEADERS data structure
+        internal static PEImage kernel = null;
+        internal static ExportTable kernelExports = null;
+        internal static PEImage mpAbi = null;
+        internal static ExportTable mpAbiExports = null;
+
+        internal PEImage(IoMemory mem)
+        {
+            Kernel.Waypoint(601);
+            if (mem.Length < 64) {
+                throw new BadImageFormatException("Invalid MZ header");
+            }
+
+            magic = mem.Read16Unchecked(0);
+            Kernel.Waypoint(602);
+
+            int offset = (int)mem.Read32Unchecked(60);
+
+            if (magic != IMAGE_DOS_SIGNATURE || offset < 64 || offset + 120 > mem.Length) {
+                throw new BadImageFormatException("Invalid MZ header");
+            }
+
+            signature                   = mem.Read32Unchecked(offset + 0);
+            machine                     = mem.Read16Unchecked(offset + 4);
+            numberOfSections            = mem.Read16Unchecked(offset + 6);
+            timeDateStamp               = mem.Read16Unchecked(offset + 8);
+            sizeOfOptionalHeader        = mem.Read16Unchecked(offset + 20);
+            characteristics             = mem.Read16Unchecked(offset + 22);
+            magic                       = mem.Read16Unchecked(offset + 24);
+            addressOfEntryPoint         = mem.Read32Unchecked(offset + 40);
+            imageBase                   = mem.Read32Unchecked(offset + 52);
+            sectionAlignment            = mem.Read32Unchecked(offset + 56);
+            fileAlignment               = mem.Read32Unchecked(offset + 60);
+            sizeOfImage                 = mem.Read32Unchecked(offset + 80);
+            sizeOfHeaders               = mem.Read32Unchecked(offset + 84);
+            checkSum                    = mem.Read32Unchecked(offset + 88);
+            dllCharacteristics          = mem.Read16Unchecked(offset + 94);
+            loaderFlags                 = mem.Read32Unchecked(offset + 112);
+            numberOfRvaAndSizes         = mem.Read32Unchecked(offset + 116);
+            offset += 120;
+
+            Kernel.Waypoint(603);
+            // Verify that we have a valid NT header
+
+            if (signature != IMAGE_NT_SIGNATURE ||
+                sizeOfOptionalHeader != 224 ||
+                magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC ||
+                numberOfRvaAndSizes != 16) {
+
+                throw new BadImageFormatException("Invalid PE header");
+            }
+
+            Kernel.Waypoint(693);
+
+            directory = new DirectoryEntry[numberOfRvaAndSizes];
+            for (uint i = 0; i < numberOfRvaAndSizes; i++) {
+                directory[i] = new DirectoryEntry(mem, ref offset);
+            }
+
+            sections = new SectionHeader[numberOfSections];
+            for (uint i = 0; i < numberOfSections; i++) {
+                sections[i] = new SectionHeader(mem, ref offset);
+
+            }
+
+            Kernel.Waypoint(694);
+
+            // Calc the sizes of the loaded regions according to starting virtual address
+            loadedSize = sizeOfImage;
+            for (uint i = 0; i < numberOfSections; i++) {
+                if (!sections[i].IsDiscardable) {
+                    uint addr = sections[i].virtualAddress;
+                    uint size = sections[i].virtualSize;
+                    uint last = addr + size;
+
+                    if (loadedSize < last) {
+                        loadedSize = last;
+                    }
+                }
+            }
+
+            Kernel.Waypoint(604);
+        }
+
+        internal ExportTable GetExportTable(IoMemory mem)
+        {
+            if (directory[(int)DirEntry.Export].virtualAddress == 0) {
+                return null;
+            }
+            return new ExportTable(mem, mem.VirtualAddress,
+                                   directory[(int)DirEntry.Export]);
+        }
+
+        internal ImportTable GetImportTable(IoMemory mem)
+        {
+            if (directory[(int)DirEntry.Import].virtualAddress == 0) {
+                return null;
+            }
+            return new ImportTable(mem, directory[(int)DirEntry.Import]);
+        }
+
+        [NoHeapAllocation]
+        internal uint GetRelocationsRaw()
+        {
+            uint relocationAddr = directory[(int)DirEntry.BaseReloc].virtualAddress;
+
+            for (uint i = 0; i < numberOfSections; i++) {
+                if (sections[i].virtualAddress == relocationAddr) {
+                    return sections[i].pointerToRawData;
+                }
+            }
+            return 0;
+        }
+
+        ////////////////////////////////////////////////////// Static Methods.
+        //
+        public static void Initialize()
+        {
+            IoMemory pages = IoMemory.MapPhysicalMemory(BootInfo.KERNEL_BASE, 4096, true, false);
+            kernel = new PEImage(pages);
+            pages = IoMemory.MapPhysicalMemory(BootInfo.KERNEL_BASE, kernel.loadedSize, true, false);
+            kernelExports = kernel.GetExportTable(pages);
+
+            DebugStub.LoadedBinary(pages.VirtualAddress,
+                                   kernel.sizeOfImage,
+                                   "kernel.x86",
+                                   kernel.checkSum,
+                                   kernel.timeDateStamp,
+                                   false);
+
+            // This breakpoint is triggered by a "-d" to windbg.
+            if (DebugStub.PollForBreak()) {
+                DebugStub.Break();
+            }
+
+#if GENERATE_ABI_SHIM
+            DebugStub.WriteLine("    InitializeMpAbi() *****");
+            InitializeMpAbi();
+#endif
+        }
+
+        // haryadi
+        public static void InitializeMpAbi()
+        {
+            // Note: When mapping the abi stub (MpSyscalls.x86), we must
+            // map it with writable flag! as we want to resolve the stub's
+            // imports
+            IoMemory mpPages = IoMemory.MapPhysicalMemory(BootInfo.MP_ABI_BASE, 4096, true, true);
+            mpAbi = new PEImage(mpPages);
+            mpPages = IoMemory.MapPhysicalMemory(BootInfo.MP_ABI_BASE, mpAbi.loadedSize, true, true);
+            mpAbiExports = mpAbi.GetExportTable(mpPages);
+
+            // Resolve imports in abi shim dll with the kernel exports
+            // which are the real stub that will do IPI stuffs
+            ImportTable mpAbiIt = mpAbi.GetImportTable(mpPages);
+
+            DebugStub.WriteLine("HSG: ** Resolving Imports");
+            mpAbiIt.ResolveImports(kernelExports);
+        }
+
+        public static void Finalize()
+        {
+            // Uncomment the following line to notify debugger when we shutdown.
+            // DebugStub.UnloadedBinary(UIntPtr.MaxValue, false);
+        }
+
+        internal static PEImage KernelImage
+        {
+            [NoHeapAllocation]
+            get { return kernel; }
+        }
+
+        public static PEImage Load(Process process, IoMemory rawMemory,
+                                   out IoMemory loadedMemory, bool isForMp)
+        {
+            return Load(process, rawMemory, out loadedMemory,
+                        isForMp, process == Process.kernelProcess);
+        }
+
+        public static PEImage Load(Process process, IoMemory rawMemory,
+                                   out IoMemory loadedMemory, bool isForMp,
+                                   bool inKernelSpace)
+        {
+            UIntPtr entryPoint = UIntPtr.Zero;
+            loadedMemory = null;
+
+            if (null == rawMemory || 0 == rawMemory.Length) {
+                DebugStub.WriteLine("No PXE image to load!");
+                return null;
+            }
+
+            //
+            // Allocate memory and copy the PXE image from memory to memory
+            //
+#if verbose
+            Tracing.Log(Tracing.Debug, " PXE at {0:x8}, Length ={1:x8}",
+                        (uint)rawMemory.VirtualAddress,
+                        rawMemory.Length);
+#endif
+
+            Kernel.Waypoint(580);
+            Tracing.Log(Tracing.Debug, "Loading:");
+            PEImage image = new PEImage(rawMemory);
+            image.DumpLimitedToStream();
+
+#if verbose
+            Tracing.Log(Tracing.Debug, "  Loaded Size={0:x8}", image.loadedSize);
+#endif
+
+            Kernel.Waypoint(581);
+            if (0 == image.loadedSize) {
+                throw new BadImageFormatException("Invalid PE, no content");
+            }
+
+            try {
+                if (inKernelSpace) {
+                    loadedMemory = IoMemory.AllocateFixed(
+                        (UIntPtr)image.loadedSize,
+                        process, PageType.System);
+                } else {
+                    // Situate the process image in the user range
+                    loadedMemory = IoMemory.AllocateUserFixed(
+                        (UIntPtr)image.loadedSize,
+                        process, PageType.System);
+                }
+
+                Kernel.Waypoint(582);
+#if verbose
+                Tracing.Log(Tracing.Debug, " loaded at {0:x8}, Length ={1:x8}",
+                            (uint)loadedMemory.VirtualAddress,
+                            loadedMemory.Length);
+#endif
+                // Copy the header so the debugger can find it.
+                IoMemory.Copy(rawMemory, 0, loadedMemory, 0, (int)image.sizeOfHeaders);
+
+#if verbose
+                image.DumpLimitedToStream();
+#endif
+                Kernel.Waypoint(583);
+                // load sections into memory where they belong.
+                for (int i = 0; i < image.numberOfSections; i++)
+                {
+                    if (image.sections[i].IsDiscardable ||
+                        image.sections[i].sizeOfRawData == 0) {
+                        continue;
+                    }
+
+                    int targetOffset = (int)image.sections[i].virtualAddress;
+                    int sourceOffset = (int)image.sections[i].pointerToRawData;
+                    uint rawSize = Math.Min(image.sections[i].sizeOfRawData,
+                                            image.sections[i].virtualSize);
+#if verbose
+                    Tracing.Log(Tracing.Debug, "section[{0}] source={1:x8}..{2:x8} target={3:x8}..{4:x8}",
+                                      i,
+                                      sourceOffset, sourceOffset + rawSize,
+                                      targetOffset, targetOffset + rawSize);
+#endif
+                    IoMemory.Copy(rawMemory, sourceOffset, loadedMemory, targetOffset, (int)rawSize);
+                }
+                Kernel.Waypoint(584);
+
+                //
+                // Handle Relocations
+                //
+                int relocationTableOffset = (int)image.GetRelocationsRaw();
+                uint diff = (uint)loadedMemory.VirtualAddress - (uint) image.imageBase;
+
+#if verbose
+                Tracing.Log(Tracing.Debug, " Base loaded={0:x8}, relocated ={1:x8} diff={2:x8}",
+                            image.imageBase, (uint)loadedMemory.VirtualAddress, diff);
+
+                Tracing.Log(Tracing.Debug, " relocationTableOffset ={0:x8} ", relocationTableOffset);
+#endif
+
+                Relocations.FixupBlocks(rawMemory, (int)relocationTableOffset,
+                                        loadedMemory, diff);
+                // We should probably zero the relocation table.
+
+                Kernel.Waypoint(585);
+
+                //
+                // Resolve Imports
+                //
+                ImportTable it = image.GetImportTable(loadedMemory);
+                Kernel.Waypoint(586);
+
+#if !PAGING
+
+#if GENERATE_ABI_SHIM
+                if (it != null) {
+#endif
+                    //it.DumpIAT("Import directory");
+
+                    // haryadi -- if this is loading for remote processor
+                    // then solve the imports with abi stub
+                    if (isForMp) {
+                        it.ResolveImports(mpAbiExports);
+                    }
+                    else {
+                        it.ResolveImports(kernelExports);
+                    }
+
+                    //DumpIAT(loadedMemory, "Import Address Table",
+                    // ref image.directory[12]);
+#if GENERATE_ABI_SHIM
+                }
+#endif
+
+#else
+                if (it != null) {
+                    // Ring-3 protection domains come with a set of
+                    // stubs that accomplish the ring3-to-ring0 ABI
+                    // transitions. Use these when called for.
+                    ExportTable abiStubs = process.Domain.ABIStubs;
+
+                    if (abiStubs != null) {
+                        it.ResolveImports(abiStubs);
+                    } else {
+                        it.ResolveImports(kernelExports);
+                    }
+                }
+#endif
+
+                Kernel.Waypoint(587);
+
+                //
+                // Dump Exports
+                //
+                ExportTable et = image.GetExportTable(loadedMemory);
+                if (et != null) {
+                    et.Dump();
+                }
+
+                Kernel.Waypoint(588);
+
+                entryPoint = (UIntPtr)loadedMemory.VirtualAddress + image.addressOfEntryPoint;
+
+                Tracing.Log(Tracing.Debug, "  Loaded: {0:x8}..{1:x8}, Entry: {2:x8}",
+                                  (ulong)loadedMemory.VirtualAddress,
+                                  (ulong)(loadedMemory.VirtualAddress + loadedMemory.Length),
+                                  (ulong)(entryPoint));
+            }
+            finally {
+                if (entryPoint == UIntPtr.Zero && loadedMemory != null) {
+                    // Need to dispose of target Range.
+                    loadedMemory = null;
+                }
+            }
+            return image;
+        }
+
+        // haryadi -- HelloMpLoad skips several procedures to be able to
+        //            load HelloMp.x86 properly
+        public static PEImage HelloMpLoad(Process process, IoMemory rawMemory,
+                                          out IoMemory loadedMemory)
+        {
+            UIntPtr entryPoint = UIntPtr.Zero;
+            loadedMemory = null;
+
+            if (null == rawMemory || 0 == rawMemory.Length) {
+                DebugStub.WriteLine("No PXE image to load!");
+                return null;
+            }
+
+            Kernel.Waypoint(580);
+            Tracing.Log(Tracing.Debug, "Loading:");
+            PEImage image = new PEImage(rawMemory);
+            image.DumpLimitedToStream();
+
+            Kernel.Waypoint(581);
+            if (0 == image.loadedSize) {
+                throw new BadImageFormatException("Invalid PE, no content");
+            }
+
+            try {
+                // The loadedImage is current loaded to physical memory
+                // directly
+                loadedMemory = IoMemory.AllocatePhysical
+                    ((UIntPtr)image.loadedSize);
+
+                Kernel.Waypoint(582);
+
+                // Copy the header so the debugger can find it.
+                IoMemory.Copy(rawMemory, 0, loadedMemory, 0,
+                              (int)image.sizeOfHeaders);
+                Kernel.Waypoint(583);
+                // load sections into memory where they belong.
+                for (int i = 0; i < image.numberOfSections; i++)
+                {
+                    if (image.sections[i].IsDiscardable ||
+                        image.sections[i].sizeOfRawData == 0) {
+                        continue;
+                    }
+                    int targetOffset = (int)image.sections[i].virtualAddress;
+                    int sourceOffset = (int)image.sections[i].pointerToRawData;
+                    uint rawSize = Math.Min(image.sections[i].sizeOfRawData,
+                                            image.sections[i].virtualSize);
+                    IoMemory.Copy(rawMemory, sourceOffset, loadedMemory,
+                                  targetOffset, (int)rawSize);
+                }
+                Kernel.Waypoint(584);
+
+                int relocationTableOffset = (int)image.GetRelocationsRaw();
+                uint diff = (uint)loadedMemory.VirtualAddress -
+                    (uint) image.imageBase;
+                entryPoint = (UIntPtr)loadedMemory.VirtualAddress +
+                    image.addressOfEntryPoint;
+            }
+            finally {
+                if (entryPoint == UIntPtr.Zero && loadedMemory != null) {
+                    // Need to dispose of target Range.
+                    loadedMemory = null;
+                }
+            }
+            return image;
+        }
+
+
+        [NoHeapAllocation]
+        public UIntPtr GetEntryPoint(IoMemory loadedImage)
+        {
+            return loadedImage.VirtualAddress + addressOfEntryPoint;
+        }
+
+        [AccessedByRuntime("output to header : defined in PEImage.cpp")]
+        [OutsideGCDomain]
+        [StackBound(64)]
+        [NoInline]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        internal static extern int HalCallEntryPoint(UIntPtr entry, int threadIndex,
+                                                     bool runAtRing3);
+
+        [NoHeapAllocation]
+        internal static int CallEntryPoint(UIntPtr entry, int threadIndex,
+                                           bool runAtRing3)
+        {
+            return HalCallEntryPoint(entry, threadIndex, runAtRing3);
+        }
+
+        //
+        // Output Routines
+        //
+        [Conditional("DEBUG")]
+        internal void DumpLimitedToStream()
+        {
+            Tracing.Log(Tracing.Debug, "  Entry point:         {0:x8}", addressOfEntryPoint);
+            Tracing.Log(Tracing.Debug, "  Image base:          {0:x8}", imageBase);
+#if verbose
+            Tracing.Log(Tracing.Debug, "  Section alignment:   {0:x8}", sectionAlignment);
+            Tracing.Log(Tracing.Debug, "  File alignment:      {0:x8}", fileAlignment);
+            Tracing.Log(Tracing.Debug, "  Directories:         {0:x8}", numberOfRvaAndSizes);
+#endif
+            Tracing.Log(Tracing.Debug, "  Loaded Size:         {0:x8}", loadedSize);
+            if (directory[0].virtualAddress != 0) {
+                directory[0].DumpToStream("Export directory      ");
+            }
+            if (directory[1].virtualAddress != 0) {
+                directory[1].DumpToStream("Import directory      ");
+            }
+            if (directory[5].virtualAddress != 0) {
+                directory[5].DumpToStream("Relocation Table      ");
+            }
+            if (directory[6].virtualAddress != 0) {
+                directory[6].DumpToStream("Debug Directory       ");
+            }
+            if (directory[11].virtualAddress != 0) {
+                directory[11].DumpToStream("Bound Import Table   ");
+            }
+            if (directory[12].virtualAddress != 0) {
+                directory[12].DumpToStream("Import Address Table ");
+            }
+
+            for (uint i = 0; i < numberOfSections; i++) {
+                sections[i].DumpToStream();
+            }
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Loader/Relocations.cs b/base/Kernel/Singularity/Loader/Relocations.cs
new file mode 100644
index 0000000..4f0f1ad
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/Relocations.cs
@@ -0,0 +1,115 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+// Currently does not support:
+//      x64
+//      sections loaded at separate addresses
+//      loading at preferred address
+
+// #define verbose
+
+// haryadi
+//#define SINGULARITY_ASMP
+
+namespace Microsoft.Singularity.Loader
+{
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    internal class Relocations
+    {
+        private const ushort sizeofBaseRelocation = 8;
+
+        //Based relocation types.
+        private const ushort IMAGE_REL_BASED_ABSOLUTE      = 0;
+        private const ushort IMAGE_REL_BASED_HIGH          = 1;
+        private const ushort IMAGE_REL_BASED_LOW           = 2;
+        private const ushort IMAGE_REL_BASED_HIGHLOW       = 3;
+        private const ushort IMAGE_REL_BASED_HIGHADJ       = 4;
+
+        internal static void FixupBlocks(IoMemory relocationMemory, int relocOffset,
+                                         IoMemory codeMemory, uint diff)
+        {
+            uint va = relocationMemory.Read32Unchecked(relocOffset);
+            uint size = relocationMemory.Read32Unchecked(relocOffset+4);
+            while (0 != va)
+            {
+#if verbose
+                DebugStub.WriteLine(" FixUpBlocks: addr={0:x8}, size={1:x8}, roffset={2:x8} ",
+                                    __arglist(va, size,relocOffset));
+#endif
+
+#if SINGULARITY_ASMP
+                if (va == 0xffffffff || size == 0xffffffff
+                    ||
+                    va >= 0xc0000000 || size >= 0xc0000000) {
+                    break;
+                }
+#endif
+                FixupBlock(relocationMemory, relocOffset,
+                           codeMemory, diff, va, (int)size);
+                relocOffset += (int)size;
+                va = relocationMemory.Read32Unchecked(relocOffset);
+                size  = relocationMemory.Read32Unchecked(relocOffset+4);
+            }
+        }
+
+        private static void FixupBlock(IoMemory relocationMemory, int relocOffset,
+                                       IoMemory codeMemory, uint diff, uint va, int size)
+        {
+            ushort  fixupEntry;
+
+            // Compute number of entries
+            int numberOfEntries = (size - sizeofBaseRelocation) /2;
+#if verbose
+            DebugStub.WriteLine(" FixUp: addr={0:x8}, size={1:x8}, count={2}",
+                                __arglist(va, size,  numberOfEntries));
+#endif
+            int currentSize = size - sizeofBaseRelocation;
+            relocOffset += sizeofBaseRelocation;   //skip block header
+            for (int i = 0; i < numberOfEntries; i++)
+            {
+                fixupEntry = relocationMemory.Read16(relocOffset);
+                relocOffset += 2;
+                currentSize -= 2;
+                ushort type = (ushort) (fixupEntry >>12);
+                //clear out the upper bits
+                uint rVA  =  (uint)(fixupEntry & 0xfff)+ va;
+                if (IMAGE_REL_BASED_ABSOLUTE == type)
+                {
+                    //DebugStub.WriteLine("        type={0:x4}      rVA={1:x8}",
+                    //__arglist(type, rVA));
+                    // hit an alignment type. there should be no more entries
+                    //DebugStub.WriteLine("   fixup:  count ={0}, loop count ={1} size={2}",
+                    //__arglist(numberOfEntries, i, currentSize));
+                    break;
+                }
+                else if (IMAGE_REL_BASED_HIGHLOW == type)
+                {
+                    // get 32-bit word pointed by rVA
+                    // mem object representing loaded image is 0 based rVA is sufficient
+                    uint fixupItem = codeMemory.Read32Unchecked((int)rVA);
+                    uint newValue = unchecked(diff + (uint) fixupItem);
+#if verbose
+                    DebugStub.WriteLine("        Fixup: rVA={0:x8} value={1:x8} diff={2:x8}, newValue={3:x8}",
+                                        __arglist(rVA, fixupItem, diff, newValue));
+#endif
+                    codeMemory.Write32Unchecked((int) rVA, newValue);
+                }
+            }
+            //DebugStub.WriteLine();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Loader/SectionHeader.cs b/base/Kernel/Singularity/Loader/SectionHeader.cs
new file mode 100644
index 0000000..24c88e2
--- /dev/null
+++ b/base/Kernel/Singularity/Loader/SectionHeader.cs
@@ -0,0 +1,74 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Simple PE Loader for Singularity
+//
+// Currently does not support:
+//      x64
+//      sections loaded at separate addresses
+//      loading at preferred address
+
+// #define verbose
+
+namespace Microsoft.Singularity.Loader
+{
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+
+    [CLSCompliant(false)]
+    internal struct SectionHeader
+    {
+        internal const uint IMAGE_SCN_MEM_DISCARDABLE = 0x02000000;  // Can be discarded.
+        internal const uint IMAGE_SCN_MEM_READ        = 0x40000000;  // Is readable.
+        internal const uint IMAGE_SCN_MEM_WRITE       = 0x80000000;  // Is writeable.
+
+        // State
+
+        internal readonly String name;
+        internal readonly uint   virtualSize;
+        internal readonly uint   virtualAddress;
+        internal readonly uint   sizeOfRawData;
+        internal readonly uint   pointerToRawData;
+        internal readonly uint   characteristics;
+
+        internal SectionHeader(IoMemory mem, ref int offset)
+        {
+            if (offset + 40 > mem.Length) {
+                Error.AccessOutOfRange();
+            }
+            name                = mem.ReadAsciiZeroString(offset, 8);
+            virtualSize         = mem.Read32Unchecked(offset + 8);
+            virtualAddress      = mem.Read32Unchecked(offset + 12);
+            sizeOfRawData       = mem.Read32Unchecked(offset + 16);
+            pointerToRawData    = mem.Read32Unchecked(offset + 20);
+            characteristics     = mem.Read32Unchecked(offset + 36);
+            offset += 40;
+        }
+
+        [Conditional("DEBUG")]
+        internal void DumpToStream()
+        {
+            Tracing.Log(Tracing.Debug,
+                        "    {0:x8}..{1:x8} [{2:x8}..{3:x8}] char={4:x8}",
+                        virtualAddress, virtualAddress + virtualSize,
+                        pointerToRawData, pointerToRawData + sizeOfRawData,
+                        characteristics);
+        }
+
+        internal bool IsDiscardable
+        {
+            get { return ((characteristics & IMAGE_SCN_MEM_DISCARDABLE) != 0); }
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/AddressSpace.cs b/base/Kernel/Singularity/Memory/AddressSpace.cs
new file mode 100644
index 0000000..37687f7
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/AddressSpace.cs
@@ -0,0 +1,73 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AddressSpace.cs
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+using System;
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+
+    // This class just wraps the PhysicalAddress of the root PDPE that
+    // describes this space.
+    public struct AddressSpace
+    {
+        private PhysicalAddress spaceAddr;
+
+        public AddressSpace(PhysicalAddress addr)
+        {
+            spaceAddr = addr;
+        }
+
+        public unsafe PhysicalAddress PdptPage {
+            get {
+                return spaceAddr;
+            }
+        }
+
+        public static AddressSpace Null {
+            get {
+                return new AddressSpace(PhysicalAddress.Null);
+            }
+        }
+
+        public static bool operator== (AddressSpace adr1, AddressSpace adr2)
+        {
+            return adr1.spaceAddr == adr2.spaceAddr;
+        }
+
+        public static bool operator!= (AddressSpace adr1, AddressSpace adr2)
+        {
+            return !(adr1 == adr2);
+        }
+
+        public override bool Equals(Object o)
+        {
+            if (o is AddressSpace) {
+                return this == (AddressSpace)o;
+            } else {
+                return false;
+            }
+        }
+
+        public static AddressSpace CurrentAddressSpace {
+            get {
+                return Processor.GetCurrentAddressSpace();
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return spaceAddr.GetHashCode();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/FlatPages.cs b/base/Kernel/Singularity/Memory/FlatPages.cs
new file mode 100644
index 0000000..c88e5e0
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/FlatPages.cs
@@ -0,0 +1,2847 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Legacy.cs - Primitive memory manager
+//
+//  Note:
+//
+
+#if !PAGING
+
+//#define TEST
+//#define VERBOSE
+//#define MP_VERBOSE
+//#define COMPLEX_TEST
+
+#if MARKSWEEPCOLLECTOR
+#define ALLOW_BOOT_ARGLIST // Cannot be used during boot for GCs w/ write barrier
+#endif
+#define NO__TRACE_PAGES
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.GCs;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Hal; // for IHal
+
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class FlatPages {
+
+        // WARNING: don't initialize any static fields in this class
+        // without manually running the class constructor at startup!
+        //private const uint    PageMask = MemoryManager.PageSize - 1;
+        private const uint    SmallSize = MemoryManager.PageSize;
+
+        private static UIntPtr addressLimit;
+        private static UIntPtr pageCount;
+        private static ulong allocatedBytes;
+        private static ulong allocatedCount;
+        private static ulong freedBytes;
+        private static ulong freedCount;
+        private static SpinLock pageLock;
+
+        private static unsafe uint *pageTable;
+
+        // We keep two lists of free pages:
+        // The freeList has pages that can be used at any moment.
+        // The saveList has pages that were reserved for growing a region.
+
+        private static FreeNode freeListTail;
+        private static FreeNode saveListTail;
+        private static unsafe FreeNode *freeList;
+        private static unsafe FreeNode *saveList;
+
+
+        // This is a representation of MemoryAffinity.  IMPORTANT: The
+        // rule of the thumb is, always check "isValid" flag before
+        // using any of the member variables. The reason is not all
+        // subMemoryMap can be created from the initial freeList. The
+        // caveat is some top memory addresses have been allocated at
+        // boot process (e.g. from experiences almost 8 MB of memory
+        // has been taken).  SRAT table usually gives separate entry
+        // for the first 640 KB region.  Since the first 8 MB has gone
+        // from the free list, we could not create the first
+        // SubMemoryMap that represents the 640 KB region (hence
+        // isValid is false for this SubMemoryMap).
+        private struct SubMemoryMap
+        {
+            public int memoryId;
+            public UIntPtr baseAddr;
+            public UIntPtr endAddr;
+            public UIntPtr length;
+            public uint domain;
+            public bool isValid;
+        }
+
+        // This is a per-processor memory map/address space.  Each
+        // processor will have each own free list. Future memory
+        // allocation for MP must consult this structure, the free
+        // list in particular.  Note: Be careful that, the memory area
+        // from baseAddr to endAddr does not necessary belong to this
+        // processor. A processor is not guaranteed to have contiguous
+        // memory addresses in NUMA node.  The "length" field
+        // specifies how big of memory this processor has.  Other
+        // Notes:
+        //   . Maybe in the future we need to create an array of
+        //     sub memory maps within this processorMemoryMap
+        //   . Code for accounting has not been written
+        private struct ProcessorMemoryMap
+        {
+            public int processorId;
+            public uint domain;
+            public UIntPtr baseAddr;
+            public UIntPtr endAddr;
+            public UIntPtr length;
+            public FreeNode procFreeListTail;
+            public FreeNode procSaveListTail;
+            public unsafe FreeNode *procFreeList;
+            public unsafe FreeNode *procSaveList;
+            public bool isInitialized;
+        }
+
+        // This is a domain mapping for dividing memory across
+        // processors evenly. Using this domain, we ensure that each
+        // processor gets memory from the domain where it belongs.  If
+        // SRAT table is not at available, we just create 1 domain.
+        // Notes:
+        //   . Currently, the code does not support a domain that does not
+        //     have any memory. In other words, currently, we do not allow
+        //     "borrowing" memory from other domains. If this is the case,
+        //     an error will generated and a following DebugStub.Break
+        private struct DomainMap
+        {
+            public uint domain;
+            public ProcessorMemoryMap [] processors;
+            public SubMemoryMap [] subMemories;
+            public UIntPtr totalMemSize;
+            public FreeNode domFreeListTail;
+            public FreeNode domSaveListTail;
+            public unsafe FreeNode *domFreeList;
+            public unsafe FreeNode *domSaveList;
+            public bool isSubMemConnected;
+        }
+
+        private static SubMemoryMap [] subMemoryMap;
+        private static ProcessorMemoryMap [] processorMemoryMap;
+        private static DomainMap [] domainMap;
+        private static bool isProcessorMemoryInitialized;
+
+
+        //////////////////////////////////////////////////////////////////
+        //
+        // haryadi: MP FlatPages routines start here.
+
+        private static unsafe void PrintSubMemoryMap()
+        {
+            DebugStub.WriteLine("\n\n        SUB MEMORY MAP");
+            DebugStub.WriteLine("        --------------------------------------------");
+            for (int i = 0; i < subMemoryMap.Length; i++) {
+                DebugStub.WriteLine("        [m{0}] b.{1:x8} e.{2:x8} l.{3:x8} d.{4} i.{5}",
+                                    __arglist(subMemoryMap[i].memoryId,
+                                              subMemoryMap[i].baseAddr,
+                                              subMemoryMap[i].endAddr,
+                                              subMemoryMap[i].length,
+                                              subMemoryMap[i].domain,
+                                              subMemoryMap[i].isValid));
+            }
+            DebugStub.WriteLine();
+        }
+
+        private static unsafe void PrintProcessorMemoryMap()
+        {
+            DebugStub.WriteLine("\n\n        PROCESSOR MEMORY MAP");
+            DebugStub.WriteLine("        --------------------------------------------");
+
+            for (int i = 0; i < processorMemoryMap.Length; i++) {
+                DebugStub.WriteLine("        [p{0}] b.{1:x8} e.{2:x8} l.{3:x8} d.{4} f.{5:x8} s.{6:x8} i.{7:x8} ",
+                                    __arglist(processorMemoryMap[i].processorId,
+                                              processorMemoryMap[i].baseAddr,
+                                              processorMemoryMap[i].endAddr,
+                                              processorMemoryMap[i].length,
+                                              processorMemoryMap[i].domain,
+                                              (UIntPtr)processorMemoryMap[i].procFreeList,
+                                              (UIntPtr)processorMemoryMap[i].procSaveList,
+                                              processorMemoryMap[i].isInitialized));
+            }
+            DebugStub.WriteLine();
+        }
+
+
+        private static unsafe void PrintDomainMap()
+        {
+            DebugStub.WriteLine("\n\n        DOMAIN MAP");
+            DebugStub.WriteLine("        --------------------------------------------");
+            for (int i = 0; i < domainMap.Length; i++) {
+                DebugStub.Print("        [d{0}]  ts.{1:x8}  dl.{2:x8}",
+                                __arglist(i, domainMap[i].totalMemSize, (UIntPtr)domainMap[i].domFreeList));
+
+                for (int j = 0; j < domainMap[i].processors.Length; j++) {
+                    DebugStub.Print(" (p{0},{1:x8}) ", __arglist(domainMap[i].processors[j].processorId,
+                                                                domainMap[i].processors[j].baseAddr));
+                }
+                for (int j = 0; j < domainMap[i].subMemories.Length; j++) {
+                    DebugStub.Print(" (m{0},{1:x8}) ", __arglist(domainMap[i].subMemories[j].memoryId,
+                                                        domainMap[i].subMemories[j].baseAddr));
+                }
+                DebugStub.WriteLine();
+            }
+            DebugStub.WriteLine();
+        }
+
+        private static unsafe void PrintAllMaps()
+        {
+            DebugStub.WriteLine("\n\n        **** PRINT ALL MAPS ****");
+            PrintSubMemoryMap();
+            PrintProcessorMemoryMap();
+            PrintDomainMap();
+            DebugStub.WriteLine();
+        }
+
+        // Create manually simple SubMemoryMap
+        private static unsafe void PrepareSubMemoryMapSimpleTest()
+        {
+            int memoryCount = 5;
+            subMemoryMap = new SubMemoryMap [memoryCount];
+            fixed (SubMemoryMap *s = &(subMemoryMap[0])) {
+                s->memoryId = 0;
+                s->baseAddr = 0x0;
+                s->endAddr  = 0x000a0000;  // 640 KB
+                s->length   = s->endAddr - s->baseAddr;
+                s->domain   = 0;
+                s->isValid = false;
+            }
+            fixed (SubMemoryMap *s = &(subMemoryMap[1])) {
+                s->memoryId = 1;
+                s->baseAddr = 0x01000000; // 16 MB
+                s->endAddr  = 0x20000000; // 512 MB
+                s->length   = s->endAddr - s->baseAddr;
+                s->domain   = 0;
+                s->isValid = false;
+            }
+            fixed (SubMemoryMap *s = &(subMemoryMap[2])) {
+                s->memoryId = 2;
+                s->baseAddr = 0x20000000; // 512 MB
+                s->endAddr  = 0x40000000; //   1 GB
+                s->length   = s->endAddr - s->baseAddr;
+                s->domain   = 1;
+                s->isValid = false;
+            }
+            fixed (SubMemoryMap *s = &(subMemoryMap[3])) {
+                s->memoryId = 3;
+                s->baseAddr = 0x40000000; //   1 GB
+                s->endAddr  = 0x60000000; // 1.5 GB
+                s->length   = s->endAddr - s->baseAddr;
+                s->domain   = 0;
+                s->isValid = false;
+            }
+            fixed (SubMemoryMap *s = &(subMemoryMap[4])) {
+                s->memoryId = 4;
+                s->baseAddr = 0x60000000; // 1.5 GB
+                s->endAddr  = 0x80000000; //   2 GB
+                s->length   = s->endAddr - s->baseAddr;
+                s->domain   = 1;
+                s->isValid = false;
+            }
+        }
+
+        // Create manually complex SubMemoryMap.
+        // Current complexTest: 3 domains, 12 processors, 9 memories
+        // 1 G: 0x4000_0000
+        // 2 G: 0x8000_0000
+        private static unsafe void PrepareSubMemoryMapComplexTest()
+        {
+            int memoryCount = 9;
+            subMemoryMap = new SubMemoryMap [memoryCount];
+            uint domain = 0;
+            UIntPtr cur = 0;
+            UIntPtr length = 0x04000000;
+
+            for (int i = 0; i < memoryCount; i++) {
+                fixed (SubMemoryMap *s = &(subMemoryMap[i])) {
+                    s->memoryId = i;
+                    s->baseAddr = cur;
+                    s->endAddr  = cur+length;
+                    s->length   = s->endAddr - s->baseAddr;
+                    s->domain   = domain;
+                    s->isValid  = false;
+
+                    // the last one eat up everything
+                    /*
+                    if (i == memoryCount - 1) {
+                        s->baseAddr = cur;
+                        s->endAddr  = 0x80000000;
+                        s->length   = s->endAddr - s->baseAddr;
+                        }*/
+
+                }
+                cur += length;
+                // flip domain, so that we have non-contiguous memory
+                if (domain == 0) {
+                    domain = 1;
+                }
+                else if (domain == 1){
+                    domain = 2;
+                }
+                else {
+                    domain = 0;
+                }
+            }
+        }
+
+        private static unsafe void PrepareSubMemoryMap()
+        {
+            // get memory banks
+            IHalMemory.MemoryAffinity[] memories =
+                Processor.GetMemoryAffinity();
+            int memoryCount = memories.Length;
+            subMemoryMap = new SubMemoryMap [memoryCount];
+            for (int i = 0; i < subMemoryMap.Length; i++) {
+                subMemoryMap[i].memoryId = i;
+                subMemoryMap[i].baseAddr = memories[i].baseAddress;
+                subMemoryMap[i].endAddr = memories[i].endAddress;
+                subMemoryMap[i].length = memories[i].memorySize;
+                subMemoryMap[i].domain = memories[i].domain;
+                subMemoryMap[i].isValid = false;
+            }
+        }
+
+        // If we don't have SRAT table, then we treat the whole memory
+        // as 1 subMemoryMap. Since, we don't break the memory, so
+        // isValid is set to true
+        private static unsafe void PrepareSubMemoryMapNoAffinity()
+        {
+            subMemoryMap = new SubMemoryMap[1];
+            subMemoryMap[0].memoryId = 0;
+            subMemoryMap[0].baseAddr = 0x0;
+            subMemoryMap[0].endAddr = GetMaxMemory();
+            subMemoryMap[0].length = GetMaxMemory();
+            subMemoryMap[0].domain = 0;
+            subMemoryMap[0].isValid = true;
+        }
+
+        // Based on the SRAT table, we try to break original free list
+        // into multiple free nodes. The rule is we break at the start
+        // address of every sub memory map
+        private static unsafe void CreateSubMemoryMap()
+        {
+            for (int mNum = 0; mNum < subMemoryMap.Length; mNum++) {
+                subMemoryMap[mNum].isValid =
+                    CreateSubMemory(mNum,
+                                    subMemoryMap[mNum].baseAddr,
+                                    subMemoryMap[mNum].endAddr);
+                if (!subMemoryMap[mNum].isValid) {
+#if MP_VERBOSE
+                    DebugStub.WriteLine
+                        ("    WARNING: SubMap-{0} [{1:x8}..{2:x8}] cannot be initialized",
+                         __arglist(mNum,
+                                   subMemoryMap[mNum].baseAddr,
+                                   subMemoryMap[mNum].endAddr));
+#endif
+                }
+            }
+        }
+
+        // First, given the base address, we find the free node
+        // (curNode) that will be cut by the base address. In other
+        // words, the curNode is the node that will be broken to 2
+        // parts. If we could not find it, then curNode is null.
+        // Second, we need to check if the memory area from
+        // memBaseAddr to memEndAddr is intersecting with any free
+        // node.  (See more detailed comment in IsPartialIntersect()
+        // function). IsPartialIntersect will give the new breakAddr.
+        // The corresponding subMemoryMap's base address also must be
+        // updated with the new breakAddr.  If the two conditions
+        // above fail. Then this subMemory cannot be initialized.
+        private static unsafe bool CreateSubMemory(int memoryNumber,
+                                                   UIntPtr memBaseAddr,
+                                                   UIntPtr memEndAddr)
+        {
+            // always break at the memBaseAddr
+            UIntPtr breakAddr = memBaseAddr;
+
+#if MP_VERBOSE
+            DebugStub.WriteLine("\n    SubMap[{0}]: Creating at {1:x8}",
+                                __arglist(memoryNumber,breakAddr));
+#endif
+            FreeNode* curNode = FreeNode.GetFreeNodeAtBreakAddr(freeList, breakAddr);
+            if (curNode == null) {
+                // now check just in case the bottom part of this
+                // subMem is intersect with one of the free list node
+                breakAddr = FreeNode.IsPartialIntersect(freeList, memBaseAddr, memEndAddr);
+                curNode = FreeNode.GetFreeNodeAtBreakAddr(freeList, breakAddr);
+
+                if (curNode == null) {
+                    return false;
+                }
+
+                // update base address
+                if (breakAddr != 0) {
+                    subMemoryMap[memoryNumber].baseAddr = breakAddr;
+                }
+            }
+#if MP_VERBOSE
+            DebugStub.WriteLine("    SubMap[{0}]: braking list at {1.x8}",
+                                __arglist(memoryNumber, breakAddr));
+#endif
+            FreeNode.BreakListAt(freeList, curNode, breakAddr);
+            return true;
+        }
+
+        private static unsafe void PrepareProcessorMemoryMapNoAffinity()
+        {
+            int processorCount = Processor.GetProcessorCount();
+            processorMemoryMap = new ProcessorMemoryMap [processorCount];
+            PrepareProcessorMemoryMapCommonFields();
+        }
+
+        private static unsafe void PrepareProcessorMemoryMap()
+        {
+            IHalMemory.ProcessorAffinity [] halProcessors =
+                Processor.GetProcessorAffinity();
+            int processorCount = halProcessors.Length;
+            processorMemoryMap = new ProcessorMemoryMap [processorCount];
+            PrepareProcessorMemoryMapCommonFields();
+
+            // update domain
+            for (int i = 0; i < processorCount; i++) {
+                processorMemoryMap[i].domain = halProcessors[i].domain;
+            }
+        }
+
+        private static unsafe void PrepareProcessorMemoryMapCommonFields()
+        {
+            for (int i=0; i < processorMemoryMap.Length; i++) {
+                processorMemoryMap[i].domain = 0;
+                processorMemoryMap[i].processorId = i;
+                processorMemoryMap[i].baseAddr = 0x0;
+                processorMemoryMap[i].endAddr = 0x0;
+                processorMemoryMap[i].length = 0x0;
+
+                // Initialize the free and save lists.
+                fixed (FreeNode *tail = &(processorMemoryMap[i].procFreeListTail)) {
+                    processorMemoryMap[i].procFreeList = tail;
+                    FreeNode.Init(processorMemoryMap[i].procFreeList, false);
+                }
+                fixed (FreeNode *tail = &(processorMemoryMap[i].procSaveListTail)) {
+                    processorMemoryMap[i].procSaveList = tail;
+                    FreeNode.Init(processorMemoryMap[i].procSaveList, true);
+                }
+            }
+        }
+
+        private static unsafe void PrepareProcessorMemoryMapComplexTest()
+        {
+            int processorCount = 12;
+            uint domain = 0;
+            processorMemoryMap = new ProcessorMemoryMap [processorCount];
+            for (int i=0; i < processorCount; i++) {
+                if (i == 4) {
+                    domain++;
+                }
+                if (i == 8) {
+                    domain++;
+                }
+                processorMemoryMap[i].domain = domain;
+                processorMemoryMap[i].processorId = i;
+                processorMemoryMap[i].baseAddr = 0x0;
+                processorMemoryMap[i].endAddr = 0x0;
+                processorMemoryMap[i].length = 0x0;
+
+                // Initialize the free and save lists.
+                fixed (FreeNode *tail = &(processorMemoryMap[i].procFreeListTail)) {
+                    processorMemoryMap[i].procFreeList = tail;
+                    FreeNode.Init(processorMemoryMap[i].procFreeList, false);
+                }
+                fixed (FreeNode *tail = &(processorMemoryMap[i].procSaveListTail)) {
+                    processorMemoryMap[i].procSaveList = tail;
+                    FreeNode.Init(processorMemoryMap[i].procSaveList, true);
+                }
+            }
+        }
+
+        private static unsafe void PrepareDomainMapCommonFields()
+        {
+            for (int i = 0; i < domainMap.Length; i ++) {
+                domainMap[i].domain = (uint)i;
+                domainMap[i].isSubMemConnected = false;
+                // Initialize the free and save lists.
+                fixed (FreeNode *tail = &(domainMap[i].domFreeListTail)) {
+                    domainMap[i].domFreeList = tail;
+                    FreeNode.Init(domainMap[i].domFreeList, false);
+                }
+                fixed (FreeNode *tail = &(domainMap[i].domSaveListTail)) {
+                    domainMap[i].domSaveList = tail;
+                    FreeNode.Init(domainMap[i].domSaveList, true);
+                }
+            }
+        }
+
+        // Just attach processors and memories if we don't have SRAT table
+        private static unsafe void PrepareDomainMapNoAffinity()
+        {
+            domainMap = new DomainMap [1];
+            PrepareDomainMapCommonFields();
+            domainMap[0].processors = processorMemoryMap;
+            domainMap[0].subMemories = subMemoryMap;
+            domainMap[0].totalMemSize = 0;
+            for (int i = 0; i < subMemoryMap.Length; i++) {
+                domainMap[0].totalMemSize += subMemoryMap[i].length;
+            }
+        }
+
+        // Per Domain: Traverse the processor and memory maps, and put
+        // then in domainMap according to their domain numbers
+        private static unsafe void PrepareDomainMap(int domainCount)
+        {
+            int count;
+            domainMap = new DomainMap [domainCount];
+            PrepareDomainMapCommonFields();
+
+            for (int i = 0; i < domainCount; i ++) {
+                domainMap[i].totalMemSize = 0;
+                // processor, 1st pass, count
+                count = 0;
+                for (int j = 0; j < processorMemoryMap.Length; j++) {
+                    if (processorMemoryMap[j].domain == domainMap[i].domain) {
+                        count++;
+                    }
+                }
+
+                domainMap[i].processors = new ProcessorMemoryMap[count];
+
+                // processor, 2nd pass, count
+                count = 0;
+                for (int j = 0; j < processorMemoryMap.Length; j++) {
+                    if (processorMemoryMap[j].domain == domainMap[i].domain) {
+                        domainMap[i].processors[count] = processorMemoryMap[j];
+                        count++;
+                    }
+                }
+
+                // sub, 1st pass, count
+                count = 0;
+                for (int j = 0; j < subMemoryMap.Length; j++) {
+                    if (subMemoryMap[j].domain == domainMap[i].domain) {
+                        count++;
+                    }
+                }
+
+                domainMap[i].subMemories = new SubMemoryMap[count];
+
+                // sub, 2nd pass, count
+                count = 0;
+                for (int j = 0; j < subMemoryMap.Length; j++) {
+                    if (subMemoryMap[j].domain == domainMap[i].domain) {
+                        domainMap[i].subMemories[count] = subMemoryMap[j];
+                        domainMap[i].totalMemSize += subMemoryMap[j].length;
+                        count++;
+                    }
+                }
+            }
+        }
+
+        // Basically, this function grab the original free list and
+        // and attach it to the domain tail free list. After this
+        // function is called, we should no longer use the original
+        // free list
+        private static unsafe void ConnectSubMemoriesPerDomainNoAffinity()
+        {
+            FreeNode *dom = domainMap[0].domFreeList;
+            FreeNode *first = freeList->next;
+            FreeNode *last = freeList->prev;
+
+            dom->next = first;
+            dom->prev = last;
+            first->prev = dom;
+            first->next = dom;
+
+            domainMap[0].isSubMemConnected = true;;
+
+#if MP_VERBOSE
+            DebugStub.WriteLine("\n\n    Connect memory no affinity: ");
+            DebugStub.WriteLine("    dl.{0:x8}  dn.{1:x8}  dp.{2:x8}",
+                                __arglist((UIntPtr)dom,
+                                          (UIntPtr)dom->next,
+                                          (UIntPtr)dom->prev));
+            DebugStub.WriteLine("    ff.{0:x8}  fn.{1:x8}  fp.{2:x8}",
+                                __arglist((UIntPtr)first,
+                                          (UIntPtr)first->next,
+                                          (UIntPtr)first->prev));
+            DebugStub.WriteLine("    ll.{0:x8}  ln.{1:x8}  lp.{2:x8}",
+                                __arglist((UIntPtr)last,
+                                          (UIntPtr)last->next,
+                                          (UIntPtr)last->prev));
+#endif
+        }
+
+        private static unsafe void ConnectSubMemoriesPerDomain()
+        {
+            for (int i = 0; i < domainMap.Length; i++) {
+#if MP_VERBOSE
+                DebugStub.WriteLine("\n    Domain [{0}]:", __arglist(i));
+#endif
+                ConnectSubMemoriesInDomain(domainMap[i]);
+                domainMap[i].isSubMemConnected = true;
+            }
+        }
+
+        // At this point, the original free list should have been
+        // partitioned according to the subMemoryMap. Now, we attach
+        // the sub memory maps to their corresponding domain free
+        // list.  After this function is called, we should no longer
+        // use the original free list
+        private static unsafe void ConnectSubMemoriesInDomain(DomainMap dMap)
+        {
+            if (dMap.subMemories.Length == 0) {
+                DebugStub.WriteLine("\n\n    **** ERROR, one of the domain does not have memory ****");
+                DebugStub.WriteLine("\n\n    ****        this is not currently supported ****");
+                DebugStub.Break();
+            }
+
+#if MP_VERBOSE
+            DebugStub.WriteLine("\n    Connection SubMemories in Domain {0}:",
+                                __arglist(dMap.domain));
+            DebugStub.WriteLine("    -----------------------------------------------");
+#endif
+
+            FreeNode *domTailNode = dMap.domFreeList;
+            FreeNode *curNode;
+            FreeNode *prevNode = null;
+            int validMem = 0;
+            int validMemCount = 0;
+
+#if MP_VERBOSE
+            DebugStub.WriteLine("    Checking valid memory map:");
+#endif
+            for (int i = 0; i < dMap.subMemories.Length; i++) {
+                if (dMap.subMemories[i].isValid) {
+
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        Valid: sm{0}  smb.{1:x8}  sme.{2:x8}",
+                                        __arglist(i,
+                                                  dMap.subMemories[i].baseAddr,
+                                                  dMap.subMemories[i].endAddr));
+#endif
+                    validMemCount++;
+                }
+            }
+
+#if MP_VERBOSE
+            DebugStub.WriteLine("\n    Connecting sub memories:");
+#endif
+            for (int i = 0; i < dMap.subMemories.Length; i++) {
+
+                // if not valid continue
+                if (!dMap.subMemories[i].isValid) {
+                    continue;
+                }
+
+                // this is wrong
+                curNode = (FreeNode*) dMap.subMemories[i].baseAddr;
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("\n        [{0}].  curNode is at [base.{1:x8}]",
+                                    __arglist(validMem, (UIntPtr)curNode));
+#endif
+
+                // if this is the first valid memory, update the head
+                // of the linked list
+                if (validMem == 0) {
+
+                    domTailNode->next = curNode;
+                    curNode->prev = domTailNode;
+
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        [{0}].  [d.{1:x8}] dn.{2:x8} = c.{3:x8}",
+                                        __arglist(validMem,
+                                                  (UIntPtr)domTailNode,
+                                                  (UIntPtr)domTailNode->next,
+                                                  (UIntPtr)curNode));
+                    DebugStub.WriteLine("        [{0}].  [c.{1:x8}] cp.{2:x8} = d.{3:x8}",
+                                        __arglist(validMem,
+                                                  (UIntPtr)curNode,
+                                                  (UIntPtr)curNode->prev,
+                                                  (UIntPtr)domTailNode));
+#endif
+                }
+
+                // this is the last valid memory, update the tail of
+                // the linked list
+                if (validMem == validMemCount - 1) {
+
+                    if (prevNode != null) {
+                        prevNode->next = curNode;
+                        curNode->prev = prevNode;
+
+#if MP_VERBOSE
+                        DebugStub.WriteLine("        [{0}].  [p.{1:x8}] pn.{2:x8} = c.{3:x8}",
+                                            __arglist(validMem,
+                                                      (UIntPtr)prevNode,
+                                                      (UIntPtr)prevNode->next,
+                                                      (UIntPtr)curNode));
+
+                        DebugStub.WriteLine("        [{0}].  [c.{1:x8}] cp.{2:x8} = p.{3:x8}",
+                                            __arglist(validMem,
+                                                      (UIntPtr)curNode,
+                                                      (UIntPtr)curNode->prev,
+                                                      (UIntPtr)prevNode));
+#endif
+                    }
+
+                    domTailNode->prev = curNode;
+                    curNode->next = domTailNode;
+
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        [{0}].  [d.{1:x8}] dp.{2:x8} = c.{3:x8}",
+                                        __arglist(validMem,
+                                                  (UIntPtr)domTailNode,
+                                                  (UIntPtr)domTailNode->prev,
+                                                  (UIntPtr)curNode));
+                    DebugStub.WriteLine("        [{0}].  [c.{1:x8}] cn.{2:x8} = d.{3:x8}",
+                                        __arglist(validMem,
+                                                  (UIntPtr)curNode,
+                                                  (UIntPtr)curNode->next,
+                                                  (UIntPtr)domTailNode));
+#endif
+                }
+
+                // else this is the middle
+                if (validMem > 0 && validMem < validMemCount - 1) {
+
+                    prevNode->next = curNode;
+                    curNode->prev = prevNode;
+
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        [{0}].  [p.{1:x8}] pn.{2:x8} = c.{3:x8}",
+                                        __arglist(validMem,
+                                                  (UIntPtr)prevNode,
+                                                  (UIntPtr)prevNode->next,
+                                                  (UIntPtr)curNode));
+
+                    DebugStub.WriteLine("        [{0}].  [c.{1:x8}] cp.{2:x8} = p.{3:x8}",
+                                        __arglist(validMem,
+                                                  (UIntPtr)curNode,
+                                                  (UIntPtr)curNode->prev,
+                                                  (UIntPtr)prevNode));
+#endif
+
+                }
+                prevNode = curNode;
+                validMem++;
+            }
+        }
+
+        // Since, a processor might not have a contiguous memory, this
+        // function performs the conversion from the relativeAddr to th
+        // realAddr. For example if a processor has 20 bytes memory at
+        // mem[0..10] and mem[20..30], a relative address of mem[15] will
+        // be converted to the real address mem[25]
+        private static unsafe UIntPtr GetRealBaseAddrInDomainMap(DomainMap dMap, UIntPtr relativeAddr)
+        {
+            for (int i = 0; i < dMap.subMemories.Length; i++) {
+
+                // We should not take into account subMemories
+                // that are not valid. Remember that the first
+                // subMemory usually can not be created because that
+                // part of the memory is not in the original free list
+                if (!dMap.subMemories[i].isValid) {
+                    continue;
+                }
+
+                if (relativeAddr < dMap.subMemories[i].length) {
+                    return (dMap.subMemories[i].baseAddr + relativeAddr);
+                }
+                relativeAddr = relativeAddr - dMap.subMemories[i].length;
+            }
+
+            DebugStub.WriteLine("\n\n    **** ERROR relativeAddr.{0:x8} is to big??, overflow ****",
+                                __arglist(relativeAddr));
+            DebugStub.Break();
+            return 0;
+        }
+
+        // Convert relative end addr
+        private static unsafe UIntPtr GetRealEndAddrInDomainMap (DomainMap dMap, UIntPtr relativeAddr)
+        {
+            for (int i = 0; i < dMap.subMemories.Length; i++) {
+
+                if (!dMap.subMemories[i].isValid) {
+                    continue;
+                }
+
+                if (relativeAddr <= dMap.subMemories[i].length) {
+                    return (dMap.subMemories[i].baseAddr + relativeAddr);
+                }
+                relativeAddr = relativeAddr - dMap.subMemories[i].length;
+            }
+            DebugStub.WriteLine("\n\n    **** ERROR relativeAddr.{0:x8} is to big??, overflow ****",
+                                __arglist(relativeAddr));
+            DebugStub.Break();
+            return 0;
+        }
+
+        // This is for rounding. Consider 1 memory, and 3 processors.
+        // If first two processor get 0.33 of the whole memories, the
+        // last one gets 0.34.
+        private static unsafe UIntPtr GetLastAddrInDomainMap (DomainMap dMap)
+        {
+            return dMap.subMemories[dMap.subMemories.Length - 1].endAddr;
+        }
+
+        // For each Domain dMap, we will partitioned the memories in this
+        // domain across the processors in the same domain.
+        private static unsafe void CreatePerProcessorMemoryInDomain(DomainMap dMap)
+        {
+            int processorCount = dMap.processors.Length;
+            UIntPtr pageCount = dMap.totalMemSize >> MemoryManager.PageBits;
+            UIntPtr pagePerProcessor =
+                (UIntPtr)((ulong)pageCount / (ulong)processorCount);
+            UIntPtr curPage = 0;
+            FreeNode *curNode;
+            UIntPtr breakAddr;
+
+#if MP_VERBOSE
+            DebugStub.WriteLine("\n\n    Creating Domain [{0}]",
+                                __arglist(dMap.domain));
+            DebugStub.WriteLine("    ---------------------------------------");
+            DebugStub.WriteLine("    Total MemSize : {0:x8}",
+                                __arglist(dMap.totalMemSize));
+            DebugStub.WriteLine("    Page Count    : {0}",
+                                __arglist(pageCount));
+            DebugStub.WriteLine("    Processor Cnt : {0}",
+                                __arglist(processorCount));
+            DebugStub.WriteLine("    Page/Proc     : {0}",
+                                __arglist(pagePerProcessor));
+            DebugStub.WriteLine("    DomFreeList   : {0:x8}",
+                                __arglist((UIntPtr)dMap.domFreeList));
+#endif
+
+            for (int i = 0; i < processorCount; i++) {
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("\n\n        PROCESSOR-{0}", __arglist(i));
+                DebugStub.WriteLine("        -------------------------------");
+#endif
+
+                dMap.processors[i].baseAddr =
+                    GetRealBaseAddrInDomainMap(dMap,
+                                               curPage <<
+                                               MemoryManager.PageBits);
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("        GetRealAddr: curPage,{0} --> baseAddr.{1:x8}",
+                                    __arglist(curPage,
+                                              dMap.processors[i].baseAddr));
+#endif
+
+                // if last processor, take all what is left
+                if (i == processorCount - 1) {
+                    dMap.processors[i].endAddr = GetLastAddrInDomainMap(dMap);
+
+                    // is not necessary contiguous
+                    dMap.processors[i].length =
+                        (pageCount - curPage) << MemoryManager.PageBits;
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        LastProcessor in Domain gets all");
+#endif
+                }
+                else {
+                    dMap.processors[i].endAddr =
+                        GetRealEndAddrInDomainMap(dMap,
+                                                  (curPage + pagePerProcessor)
+                                                  << MemoryManager.PageBits);
+
+                    // is not necessary contiguous
+                    dMap.processors[i].length =
+                        (pagePerProcessor << MemoryManager.PageBits);
+                }
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("        GetEndAddr : curPage.{0} --> endAddr.{1:x8}, length.{2:x8}",
+                                    __arglist(curPage,
+                                              dMap.processors[i].endAddr,
+                                              dMap.processors[i].length));
+#endif
+
+                // now, let's break at the start addr
+                breakAddr = dMap.processors[i].baseAddr;
+                curNode = FreeNode.GetFreeNodeAtBreakAddr(dMap.domFreeList, breakAddr);
+
+                if (curNode != null) {
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        Breaking at StartAddr.{0:x8}",
+                                        __arglist(breakAddr));
+                    DebugStub.WriteLine("        curNode found around StartAddr: node.{0:x8}  prev.{1:x8}  next.{2:x8}",
+                                        __arglist((UIntPtr)curNode,
+                                                  (UIntPtr)curNode->prev,
+                                                  (UIntPtr)curNode->next));
+#endif
+                    FreeNode.BreakListAt(dMap.domFreeList, curNode, breakAddr);
+                }
+                else {
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        Breaking at StartAddr.{0:x8} -- cancelled, can't find freeNode",
+                                        __arglist(breakAddr));
+#endif
+                }
+
+                // don't forget to add current page
+                curPage += pagePerProcessor;
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("        Processor[{0}] initialized at base.{0:x8}  end.{1:x8}  length.{2:x8}",
+                                    __arglist(dMap.processors[i].baseAddr,
+                                              dMap.processors[i].endAddr,
+                                              dMap.processors[i].length));
+#endif
+
+            }
+        }
+
+        // Note that this function only performs computation. I.e.
+        // it calculates the memory ranges that a process will be given.
+        // It does not steal the free list yet.
+        private static unsafe void CreatePerProcessorMemory()
+        {
+            for (int i = 0; i < domainMap.Length; i++) {
+                CreatePerProcessorMemoryInDomain(domainMap[i]);
+            }
+        }
+
+        // just copy back some fields, because domainMap.processors and
+        // processorMemoryMap do not point to the same object?????
+        private static unsafe void CopyDomainProcessorsToProcessors()
+        {
+            for (int i = 0; i < processorMemoryMap.Length; i++) {
+                for (int j = 0; j < domainMap.Length; j++) {
+                    for (int k = 0; k < domainMap[j].processors.Length; k++) {
+                        // same, copy
+                        if (processorMemoryMap[i].processorId ==
+                            domainMap[j].processors[k].processorId) {
+
+                            processorMemoryMap[i].domain =
+                                domainMap[j].processors[k].domain;
+                            processorMemoryMap[i].baseAddr =
+                                domainMap[j].processors[k].baseAddr;
+                            processorMemoryMap[i].endAddr =
+                                domainMap[j].processors[k].endAddr;
+                            processorMemoryMap[i].length =
+                                domainMap[j].processors[k].length;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Get lowest free node from all domains
+        private static unsafe FreeNode* GetLowestNodeFromDomains()
+        {
+            // how about in 64 bits architecture??
+            UIntPtr lowest = (UIntPtr) 0xffffffff;
+
+            FreeNode *tail = null;
+            FreeNode *first = null;
+            for (int i = 0; i < domainMap.Length; i++) {
+                tail = domainMap[i].domFreeList;
+                first = tail->next;
+
+                // need to check if tail == first, then we have problem:
+                // there is no free list!!
+                if (tail == first) {
+                    DebugStub.WriteLine("\n\n****** ERROR ******");
+                    DebugStub.WriteLine("GetLow: Domain [{0}] has no free list at tail {1:x8}",
+                                        __arglist(i,(UIntPtr)tail));
+                    DebugStub.Break();
+                }
+
+
+                if ((UIntPtr)first < lowest) {
+                    lowest = (UIntPtr)first;
+                }
+            }
+            return (FreeNode*)lowest;
+        }
+
+        // Get highest node from all domains
+        private static unsafe FreeNode* GetHighestNodeFromDomains()
+        {
+            UIntPtr highest = (UIntPtr) 0x0;
+            FreeNode *tail = null;
+            FreeNode *last = null;
+            for (int i = 0; i < domainMap.Length; i++) {
+                tail = domainMap[i].domFreeList;
+                last = tail->prev;
+                if (tail == last) {
+                    DebugStub.WriteLine("\n\n****** ERROR ******");
+                    DebugStub.WriteLine("GetHigh: Domain [{0}] has no free list at tail {1:x8}",
+                                        __arglist(i,(UIntPtr)tail));
+                    DebugStub.Break();
+                }
+                if ((UIntPtr)last > highest) {
+                    highest = (UIntPtr)last;
+                }
+            }
+            return (FreeNode*)highest;
+        }
+
+        // At this point, each processor should know the baseAddr of
+        // the memory ranges that it should have. Now, we need to
+        // partitioned the domain's free lists for the processors in
+        // the domain.  This is a similar operation that we did when
+        // we partition the original free list to sub-memories. The
+        // way we break it here, is we will break the free list at
+        // each processor's baseAddr. After we break the domain's free
+        // list, we steal the free list and attach it to the
+        // corresponding processors' free list.
+        private static unsafe void AttachPerProcessorMemoryToFreeListTail()
+        {
+            FreeNode *procTailNode;
+            FreeNode *firstNode;
+            LastNode *last;
+            FreeNode *lastNode;
+            FreeNode *prevNode = null;
+
+            for (int i = 0; i < processorMemoryMap.Length; i++) {
+
+                procTailNode = processorMemoryMap[i].procFreeList;
+
+                // Special case: The edges of the memory. i.e.
+                // memories of processor[0] and processor[lastProc]
+                if (i == 0) {
+                    firstNode = GetLowestNodeFromDomains();
+                    last = (LastNode*) (processorMemoryMap[i].endAddr - MemoryManager.PageSize);
+                    lastNode = last->node;
+                }
+                else if (i == processorMemoryMap.Length - 1) {
+                    firstNode = (FreeNode*) processorMemoryMap[i].baseAddr;
+                    last = null;
+                    lastNode = GetHighestNodeFromDomains();
+                }
+                else {
+                    firstNode = (FreeNode*) processorMemoryMap[i].baseAddr;
+                    last = (LastNode*) (processorMemoryMap[i].endAddr - MemoryManager.PageSize);
+                    lastNode = last->node;
+                }
+
+
+
+                // if processor is the lowest
+#if MP_VERBOSE
+                DebugStub.WriteLine();
+                DebugStub.WriteLine("\n    Attaching Processor[{0}]", __arglist(i));
+                DebugStub.WriteLine("    -------------------------------------------");
+
+                DebugStub.WriteLine("    firstNode    = {0:x8}", __arglist((UIntPtr)firstNode));
+                DebugStub.WriteLine("    last         = {0:x8}", __arglist((UIntPtr)last));
+                DebugStub.WriteLine("    lastNode     = {0:x8}", __arglist((UIntPtr)lastNode));
+                DebugStub.WriteLine("    procTailNode = {0:x8}", __arglist((UIntPtr)procTailNode));
+                DebugStub.WriteLine("    procTailNode = {0:x8}", __arglist((UIntPtr)procTailNode));
+
+                DebugStub.WriteLine("\n    Before Attaching: \n");
+
+                if (last != null) {
+                    DebugStub.WriteLine("        last       a.{0:x8}  n.{1:x8} ",
+                                        __arglist((UIntPtr)last, (UIntPtr)last->node));
+                }
+                DebugStub.WriteLine("        procTail   a.{0:x8}  p.{1:x8}  n.{2:x8}  l.{3:x8} ",
+                                    __arglist((UIntPtr)procTailNode, (UIntPtr)procTailNode->prev,
+                                              (UIntPtr)procTailNode->next, (UIntPtr)procTailNode->last));
+
+                DebugStub.WriteLine("        firstNode  a.{0:x8}  p.{1:x8}  n.{2:x8}  l.{3:x8} ",
+                                    __arglist((UIntPtr)firstNode, (UIntPtr)firstNode->prev,
+                                              (UIntPtr)firstNode->next, (UIntPtr)firstNode->last));
+
+                DebugStub.WriteLine("        lastNode   a.{0:x8}  p.{1:x8}  n.{2:x8}  l.{3:x8} ",
+                                    __arglist((UIntPtr)lastNode, (UIntPtr)lastNode->prev,
+                                              (UIntPtr)lastNode->next, (UIntPtr)lastNode->last));
+#endif
+
+                // set heads
+                procTailNode->next = firstNode;
+                firstNode->prev = procTailNode;
+
+                // set tails
+                procTailNode->prev = lastNode;
+                lastNode->next = procTailNode;
+
+                processorMemoryMap[i].isInitialized = true;
+
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("\n    After Attaching: \n");
+
+                if (last != null) {
+                    DebugStub.WriteLine("        last       a.{0:x8}  n.{1:x8} ",
+                                        __arglist((UIntPtr)last, (UIntPtr)last->node));
+                }
+                DebugStub.WriteLine("        procTail   a.{0:x8}  p.{1:x8}  n.{2:x8}  l.{3:x8} ",
+                                    __arglist((UIntPtr)procTailNode, (UIntPtr)procTailNode->prev,
+                                              (UIntPtr)procTailNode->next, (UIntPtr)procTailNode->last));
+
+                DebugStub.WriteLine("        firstNode  a.{0:x8}  p.{1:x8}  n.{2:x8}  l.{3:x8} ",
+                                    __arglist((UIntPtr)firstNode, (UIntPtr)firstNode->prev,
+                                              (UIntPtr)firstNode->next, (UIntPtr)firstNode->last));
+
+                DebugStub.WriteLine("        lastNode  a.{0:x8}  p.{1:x8}  n.{2:x8}  l.{3:x8} ",
+                                    __arglist((UIntPtr)lastNode, (UIntPtr)lastNode->prev,
+                                              (UIntPtr)lastNode->next, (UIntPtr)lastNode->last));
+#endif
+            }
+        }
+
+
+        private static unsafe void DebugMpPhase(int phase)
+        {
+#if MP_VERBOSE
+            DebugStub.WriteLine("\n\n");
+            DebugStub.Print("PHASE {0}: ", __arglist(phase));
+            switch (phase) {
+              case 0:
+                DebugStub.WriteLine("MP FLAT-PAGES START");
+                break;
+              case 1:
+                FreeNode.PrintFreeList(freeList);
+                DebugStub.WriteLine("PREPARE SUB MEMORY MAP");
+                break;
+              case 2:
+                DebugStub.WriteLine("CREATE SUB MEMORY MAP");
+                break;
+              case 3:
+                PrintSubMemoryMap();
+                FreeNode.PrintFreeList(freeList);
+                DebugStub.WriteLine("PREPARE PROCESSOR MEM MAP");
+                break;
+              case 4:
+                PrintProcessorMemoryMap();
+                DebugStub.WriteLine("PREPARE DOMAIN MAPPING");
+                break;
+              case 5:
+                PrintDomainMap();
+                PrintSubMemoryMap();
+                DebugStub.WriteLine("CREATE SUB MEM PER DOMAIN:");
+                break;
+              case 6:
+                FreeNode.PrintDomainFreeLists();
+                DebugStub.WriteLine("CREATE PER PROC MEMORY"); break;
+              case 7:
+                FreeNode.PrintDomainFreeLists();
+                DebugStub.WriteLine("COPY DOMAIN TO PMAP");
+                break;
+              case 8:
+                PrintAllMaps();
+                DebugStub.WriteLine("ATTACH PROC FREE LIST");
+                break;
+              case 9:
+                PrintAllMaps();
+                FreeNode.PrintProcessorFreeLists();
+                DebugStub.WriteLine("MP FLAT-PAGES DONE"); break;
+              default: DebugStub.WriteLine(); break;
+            }
+            DebugStub.WriteLine("*************************************");
+#endif
+        }
+
+
+        // At this point, all subMemories can be considered
+        // independent. Even though, they are all still
+        // full-linked under freeList we are going to break the
+        // links.
+        internal static unsafe void InitializeProcessorAddressSpace()
+        {
+            bool hasAffinityInfo = Processor.HasAffinityInfo();
+
+            DebugMpPhase(0);
+
+#if COMPLEX_TEST
+            DebugMpPhase(1);
+            PrepareSubMemoryMapComplexTest();
+
+            DebugMpPhase(2);
+            CreateSubMemoryMap();
+
+            DebugMpPhase(3);
+            PrepareProcessorMemoryMapComplexTest();
+
+            DebugMpPhase(4);
+            PrepareDomainMap(3);
+
+            DebugMpPhase(5);
+            ConnectSubMemoriesPerDomain();
+#else
+            if (!hasAffinityInfo) {
+
+                DebugMpPhase(1);
+                PrepareSubMemoryMapNoAffinity();
+
+                // skip Phase 2, since only has 1 sub memory
+
+                DebugMpPhase(3);
+                PrepareProcessorMemoryMapNoAffinity();
+
+                DebugMpPhase(4);
+                PrepareDomainMapNoAffinity();
+
+                DebugMpPhase(5);
+                ConnectSubMemoriesPerDomainNoAffinity();
+            }
+            else {
+                DebugMpPhase(1);
+                PrepareSubMemoryMap();
+
+                DebugMpPhase(2);
+                CreateSubMemoryMap();
+
+                DebugMpPhase(3);
+                PrepareProcessorMemoryMap();
+
+                DebugMpPhase(4);
+                PrepareDomainMap(Processor.GetDomainCount());
+
+                DebugMpPhase(5);
+                ConnectSubMemoriesPerDomain();
+            }
+#endif
+
+            // At this point, domain is ready, then we can break the
+            // each domain's sub memories across the processors in the
+            // domain
+
+            DebugMpPhase(6);
+            CreatePerProcessorMemory();
+
+            DebugMpPhase(7);
+            CopyDomainProcessorsToProcessors();
+
+            DebugMpPhase(8);
+            AttachPerProcessorMemoryToFreeListTail();
+
+            // Reset back processor[0].baseAddr = 0. This is a hack for
+            // now, the top part of the memory is already gone during
+            // MP FlatPage initialization.
+            processorMemoryMap[0].length += processorMemoryMap[0].baseAddr;
+            processorMemoryMap[0].baseAddr = 0;
+
+            // Each Processor's memory is ready
+            isProcessorMemoryInitialized = true;
+
+            DebugMpPhase(9);
+
+            // Final check, dump to debugger
+            FreeNode.PrintProcessorsAddressSpaces();
+        }
+
+
+        internal static unsafe void Initialize()
+        {
+            Tracing.Log(Tracing.Debug, "FlatPages.Initialize() called");
+
+            InitializeLock();
+
+            BootInfo * bi = BootInfo.HalGetBootInfo();
+
+            isProcessorMemoryInitialized = false;
+
+            // First pass over SMAP, find the highest RAM address
+            SMAPINFO *smap = (SMAPINFO*)bi->SmapData32;
+            addressLimit = UIntPtr.Zero;
+            for (uint i = 0; i < bi->SmapCount; i++) {
+                if (smap[i].type == (ulong)SMAPINFO.AddressType.Free &&
+                    smap[i].addr + smap[i].size > addressLimit) {
+                    addressLimit = smap[i].addr + smap[i].size;
+                }
+
+                unchecked {
+                    Tracing.Log(Tracing.Debug,
+                                "   [{0,8:x8}..{1,8:x8}] = {2,8:x8}",
+                                (UIntPtr)(uint)smap[i].addr,
+                                (UIntPtr)(uint)(smap[i].addr + smap[i].size),
+                                (UIntPtr)(uint)smap[i].type);
+                }
+            }
+            pageCount = Pad((addressLimit >> MemoryManager.PageBits) + 1, MemoryManager.PageSize / sizeof(uint));
+            UIntPtr limit = Pad(bi->DumpLimit, 0x200000);
+
+            Tracing.Log(Tracing.Debug,
+                        "Limit of RAM={0,8:x}, entries={1:x}, table={2:x}",
+                        addressLimit, pageCount, limit);
+
+            // Create the page descriptor table.
+            pageTable = (uint *)limit;
+
+            // Initialize all page descriptors to Unknown.
+            SetPages(0, pageCount, MemoryManager.PageUnknown);
+
+            // Second pass over SMAP, mark known RAM.
+            for (uint i = 0; i < bi->SmapCount; i++) {
+                if (smap[i].type == (ulong)SMAPINFO.AddressType.Free) {
+                    SetRange(smap[i].addr, smap[i].size, MemoryManager.PageFree);
+                }
+            }
+
+            // Record the page table memory.
+            SetRange(limit, pageCount * sizeof(uint), MemoryManager.KernelPageNonGC);
+
+            // Record the kernel memory.
+            SetRange(0x0, BootInfo.KERNEL_STACK_BEGIN, MemoryManager.KernelPageImage);
+            SetRange(bi->DumpBase, limit - bi->DumpBase, MemoryManager.KernelPageNonGC);
+            SetRange(BootInfo.KERNEL_STACK_BEGIN,
+                     BootInfo.KERNEL_STACK_LIMIT - BootInfo.KERNEL_STACK_BEGIN,
+                     MemoryManager.KernelPageStack);
+
+            // Note, normally filtered out by boot loader.
+            // SetRange(bi->DumpAddr32, bi->DumpAddr32 + bi->DumpSize32, MemoryManager.PageUnknown);
+
+            // Third pass over SMAP, mark hardware reserved memory as Unknown.
+            for (uint i = 0; i < bi->SmapCount; i++) {
+                if (smap[i].type != (ulong)SMAPINFO.AddressType.Free &&
+                    smap[i].addr < addressLimit) {
+                    SetRange(smap[i].addr, smap[i].size, MemoryManager.PageUnknown);
+                }
+            }
+
+            // Initialize the free and save lists.
+            fixed (FreeNode *tail = &freeListTail) {
+                freeList = tail;
+                FreeNode.Init(freeList, false);
+            }
+            fixed (FreeNode *tail = &saveListTail) {
+                saveList = tail;
+                FreeNode.Init(saveList, true);
+            }
+
+            uint *desc = pageTable;
+            uint last = *desc;
+            UIntPtr begin = UIntPtr.Zero;
+
+            for (UIntPtr i = UIntPtr.Zero; i < pageCount; i++) {
+                uint val = *desc++ & MemoryManager.SystemPageMask;
+
+                if (val != last) {
+                    if (last == MemoryManager.PageFree) {
+                        FreeNode.CreateAndInsert(freeList,
+                                                 AddrFromPage(begin),
+                                                 AddrFromPage(i - begin));
+                    }
+                    begin = i;
+                    last = val;
+                }
+            }
+
+            Dump("Initialized");
+
+#if TEST
+            UIntPtr l1 = RawAllocateBelow(0x1000000, 0x20000, 0x20000, 0x88810000u);
+            UIntPtr l2 = RawAllocateBelow(0x1000000, 0x10000, 0x20000, 0x88820000u);
+            UIntPtr l3 = RawAllocateBelow(0x1000000, 0x20000, 0x20000, 0x88830000u);
+            UIntPtr l4 = RawAllocateBelow(0x1000000, 0x10000, 0x20000, 0x88840000u);
+
+            UIntPtr a1 = RawAllocate(  0x1000, 0x100000, 0x4000, 0x99910000u);
+            UIntPtr a2 = RawAllocate( 0x10000, 0x100000, 0x4000, 0x99920000u);
+            UIntPtr a3 = RawAllocate(0x100000, 0x100000, 0x4000, 0x99930000u);
+            UIntPtr a4 = RawAllocate(  0x1000,  0x10000, 0x4000, 0x99940000u);
+            UIntPtr a5 = RawAllocate(  0x1000,  0x10000, 0x4000, 0x99950000u);
+
+            Dump("Base Allocations");
+
+            UIntPtr a1a = a1 != UIntPtr.Zero
+                ? RawAllocateExtend(a1 +  0x1000,  0xf000, 0x99910001u) : UIntPtr.Zero;
+            UIntPtr a2a = a2 != UIntPtr.Zero
+                ? RawAllocateExtend(a2 + 0x10000, 0x10000, 0x99920001u) : UIntPtr.Zero;
+            UIntPtr a4a = a4 != UIntPtr.Zero
+                ? RawAllocateExtend(a4 +  0x1000,  0xf000, 0x99940001u) : UIntPtr.Zero;
+
+            Dump("Extend Allocations");
+
+            Tracing.Log(Tracing.Debug, "Query Tests:");
+            DumpQuery(0);
+            DumpQuery(0x100000);
+            DumpQuery(0x200000);
+            DumpQuery(0x300000);
+            DumpQuery(bi->DumpBase + 0x1000);
+            DumpQuery(BootInfo.KERNEL_STACK_BEGIN + 0x1000);
+            DumpQuery(l1);
+            DumpQuery(l1 + 0x20000);
+            DumpQuery(l2);
+            DumpQuery(l2 + 0x20000);
+            DumpQuery(l3);
+            DumpQuery(l3 + 0x20000);
+            DumpQuery(l4);
+            DumpQuery(l4 + 0x20000);
+            DumpQuery(a1);
+            DumpQuery(a1 + 0x20000);
+            DumpQuery(a2);
+            DumpQuery(a2 + 0x20000);
+            DumpQuery(a3);
+            DumpQuery(a3 + 0x20000);
+            DumpQuery(a4);
+            DumpQuery(a4 + 0x20000);
+            DumpQuery(a5);
+            DumpQuery(a5 + 0x20000);
+
+            if (l1 != UIntPtr.Zero) {
+                RawFree(l1,  0x20000, 0x88810000u);
+            }
+            if (l3 != UIntPtr.Zero) {
+                RawFree(l3,  0x20000, 0x88830000u);
+            }
+            if (a1 != UIntPtr.Zero) {
+                RawFree(a1,  0x10000, 0x99910000u);
+            }
+            if (a3 != UIntPtr.Zero) {
+                RawFree(a3, 0x100000, 0x99930000u);
+            }
+            if (a5 != UIntPtr.Zero) {
+                RawFree(a5,   0x1000, 0x99950000u);
+            }
+
+            Dump("First Free");
+
+            if (l2 != UIntPtr.Zero) {
+                RawFree(l2, 0x10000, 0x88820000u);
+            }
+            if (l4 != UIntPtr.Zero) {
+                RawFree(l4, 0x10000, 0x88840000u);
+            }
+            if (a2 != UIntPtr.Zero) {
+                RawFree(a2, 0x20000, 0x99920000u);
+            }
+            if (a4 != UIntPtr.Zero) {
+                RawFree(a4, 0x10000, 0x99940000u);
+            }
+
+            Dump("Final Free");
+            DebugStub.Break();
+            DebugStub.Break();
+            DebugStub.Break();
+#endif
+        }
+
+        internal static void Finalize()
+        {
+            // Doesn't actually do anything.
+        }
+
+        private static void InitializeLock()
+        {
+#if SINGULARITY_MP
+            pageLock = new SpinLock();
+#endif // SINGULARITY_MP
+        }
+
+        [NoStackLinkCheck]
+        private static bool Lock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            pageLock.Acquire(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [NoStackLinkCheck]
+        private static void Unlock(bool iflag)
+        {
+#if SINGULARITY_MP
+            pageLock.Release(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        // Currently, we just return the BSP free list.  In the
+        // future, this should consult the ProcessorMemoryMap
+        private static unsafe FreeNode* GetFreeList()
+        {
+            if (isProcessorMemoryInitialized) {
+                return processorMemoryMap[0].procFreeList;
+            }
+            else {
+                return freeList;
+            }
+        }
+
+        private static unsafe FreeNode* GetSaveList()
+        {
+            if (isProcessorMemoryInitialized) {
+                return processorMemoryMap[0].procSaveList;
+            }
+            else {
+                return saveList;
+            }
+        }
+
+
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        internal static UIntPtr PageCount
+        {
+            get { return pageCount; }
+        }
+
+        internal static unsafe uint * PageTable
+        {
+            get { return pageTable; }
+        }
+
+        [NoStackLinkCheck]
+        internal static UIntPtr Allocate(UIntPtr bytes,
+                                         UIntPtr reserve,
+                                         UIntPtr alignment,
+                                         Process process,
+                                         uint extra,
+                                         PageType type)
+        {
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(960);
+#endif
+            UIntPtr got = new UIntPtr();
+
+            bool iflag = Lock();
+            try {
+                got = RawAllocate(bytes, reserve, alignment,
+                                  (process != null ? process.ProcessTag : MemoryManager.KernelPage)
+                                  | (extra & MemoryManager.ExtraMask)
+                                  | (uint)type);
+#if VERBOSE
+                Tracing.Log(Tracing.Debug, "{0:x8} Allocate({1:x},{2:x},{3:x}",
+                            Kernel.AddressOf(process), bytes, reserve,
+                            alignment);
+#endif
+                if (process != null) {
+                    process.Allocated(bytes);
+                }
+            }
+            finally {
+                Unlock(iflag);
+            }
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(961);
+#endif
+            return got;
+        }
+
+        internal static UIntPtr AllocateBelow(UIntPtr limit,
+                                              UIntPtr bytes,
+                                              UIntPtr alignment,
+                                              Process process,
+                                              uint extra,
+                                              PageType type)
+        {
+            UIntPtr got = new UIntPtr();
+
+            bool iflag = Lock();
+            try {
+                got = RawAllocateBelow(limit, bytes, alignment,
+                                       (process != null ? process.ProcessTag : MemoryManager.KernelPage)
+                                       | (extra & MemoryManager.ExtraMask)
+                                       | (uint)type);
+                if (process != null) {
+                    process.Allocated(bytes);
+                }
+            }
+            finally {
+                Unlock(iflag);
+            }
+            return got;
+        }
+
+        internal static UIntPtr AllocateExtend(UIntPtr addr,
+                                               UIntPtr bytes,
+                                               Process process,
+                                               uint extra,
+                                               PageType type)
+        {
+            UIntPtr got = new UIntPtr();
+
+            bool iflag = Lock();
+            try {
+                uint tag =
+                    (process != null ?
+                     process.ProcessTag :
+                     MemoryManager.KernelPage)
+                    | (extra & MemoryManager.ExtraMask)
+                    | (uint)type;
+                got = RawAllocateExtend(addr, bytes, tag);
+                if (got != UIntPtr.Zero && process != null) {
+                    process.Allocated(bytes);
+                }
+            }
+            finally {
+                Unlock(iflag);
+            }
+            return got;
+        }
+
+        [NoStackLinkCheck]
+        internal static void Free(UIntPtr addr,
+                                  UIntPtr bytes,
+                                  Process process)
+        {
+            bool iflag = Lock();
+            try {
+                RawFree(addr, bytes, process != null ? process.ProcessTag : MemoryManager.KernelPage);
+                if (process != null) {
+                    process.Freed(bytes);
+                }
+            }
+            finally {
+                Unlock(iflag);
+            }
+        }
+
+        internal static unsafe UIntPtr FreeAll(Process process)
+        {
+            DebugStub.Assert(process != null,
+                             "FlatPages.FreeAll null process");
+            DebugStub.Assert(process.ProcessTag != MemoryManager.KernelPage,
+                             "FlatPages.FreeAll ProcessTag={0}",
+                             __arglist(process.ProcessTag));
+
+            uint tag = process.ProcessTag & MemoryManager.ProcessPageMask;
+            uint *pageLimit = pageTable + pageCount;
+            UIntPtr bytes = 0;
+
+            Tracing.Log(Tracing.Debug, "FreeAll({0,8:x})", tag);
+
+            for (uint *begin = pageTable; begin < pageLimit;) {
+                uint *limit = begin;
+                uint val = (*limit++) & MemoryManager.ProcessPageMask;
+#if VERBOSE
+                unchecked {
+                    Tracing.Log(Tracing.Debug, "  {0,8:x}: {1,8:x}",
+                                AddrFromPage((UIntPtr)(begin - pageTable)),
+                                val);
+                }
+#endif
+
+                if (val == tag) {
+                    while ((((*limit) & MemoryManager.ProcessPageMask) == tag) && (limit < pageLimit)) {
+                        limit++;
+                    }
+
+                    UIntPtr page = (UIntPtr)(begin - pageTable);
+                    UIntPtr size = (UIntPtr)(limit - begin);
+
+                    Tracing.Log(Tracing.Debug,
+                                "  {0,8:x}..{1,8:x} : {2,8:x} [will free]",
+                                page << MemoryManager.PageBits, (page + size) << MemoryManager.PageBits,
+                                *begin);
+
+                    bool iflag = Lock();
+                    try {
+                        RawFree(AddrFromPage(page), AddrFromPage(size), tag);
+                    }
+                    finally {
+                        Unlock(iflag);
+                    }
+
+                    bytes += size;
+                }
+                else {
+                    while ((((*limit) & MemoryManager.ProcessPageMask) != tag) && (limit < pageLimit)) {
+                        limit++;
+                    }
+
+                    UIntPtr page = (UIntPtr)(begin - pageTable);
+                    UIntPtr size = (UIntPtr)(limit - begin);
+
+                    Tracing.Log(Tracing.Debug,
+                                "- {0,8:x}..{1,8:x} : {2,8:x} [will free]",
+                                page << MemoryManager.PageBits, (page + size) << MemoryManager.PageBits,
+                                *begin);
+                }
+                begin = limit;
+            }
+            if (process != null) {
+                process.Freed(bytes * MemoryManager.PageSize);
+            }
+            return bytes * MemoryManager.PageSize;
+        }
+
+        internal static PageType Query(UIntPtr queryAddr,
+                                       Process process,
+                                       out UIntPtr regionAddr,
+                                       out UIntPtr regionSize)
+        {
+            PageType type = new PageType();
+
+            bool iflag = Lock();
+            try {
+                type = RawQuery(queryAddr,
+                                process != null ? process.ProcessTag : 0,
+                                out regionAddr, out regionSize);
+            }
+            finally {
+                Unlock(iflag);
+            }
+            return type;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [NoStackLinkCheck]
+        private static unsafe UIntPtr RawAllocate(UIntPtr bytes,
+                                                  UIntPtr reserve,
+                                                  UIntPtr alignment,
+                                                  uint tag)
+        {
+            VTable.Assert(Processor.InterruptsDisabled());
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(970);
+#endif
+            if (alignment < MemoryManager.PageSize)
+            {
+                alignment = MemoryManager.PageSize;
+            }
+            if (reserve < bytes) {
+                reserve = bytes;
+            }
+#if VERBOSE
+            Tracing.Log(Tracing.Debug,
+                        " size={0:x}, res={1:x}, aln={2:x}, tag={3:x}",
+                        bytes, reserve, alignment, tag);
+#endif
+
+            FreeNode * node = FreeNode.FindGoodFit(GetFreeList(), reserve, alignment);
+            if (node == null) {
+                node = FreeNode.FindGoodFit(GetFreeList(), bytes, alignment);
+                if (node == null) {
+                    node = FreeNode.FindGoodFit(GetSaveList(), reserve, alignment);
+                    if (node == null) {
+                        node = FreeNode.FindGoodFit(GetSaveList(), bytes, alignment);
+                        if (node == null) {
+                            // We should try to combine free and save pages...
+                            // But for now, we just fail.
+                            return UIntPtr.Zero;
+                        }
+                    }
+                }
+            }
+
+
+            UIntPtr addr = (UIntPtr)node;
+            UIntPtr adjust = SpaceNotAligned(addr + node->bytes, alignment);
+            UIntPtr found = node->bytes;
+
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "    0. {0:x8}..{1:x8}: res={2:x}, adj={3:x}",
+                        addr, addr + found, reserve, adjust);
+#endif
+
+
+            if (found > reserve + adjust) {
+                // Put the extraneous pages in the free list.
+                FreeNode.ReturnExtraBelow(GetFreeList(), ref addr, ref found, reserve + adjust);
+
+#if VERBOSE
+                Tracing.Log(Tracing.Debug, "    1. {0:x8}..{1:x8}",
+                            addr, addr + found);
+#endif
+            }
+#if ALLOW_BOOT_ARGLIST
+            DebugStub.Assert
+                (SpaceNotAligned(addr, alignment) == UIntPtr.Zero,
+                 "FlatPages.RawAllocate not aligned addr={0} alignment={1}",
+                 __arglist(addr, alignment));
+#endif
+            if (found > bytes) {
+                // Put extra pages in the save list.
+                FreeNode.ReturnExtraAbove(GetSaveList(), addr, ref found, bytes);
+
+#if VERBOSE
+                Tracing.Log(Tracing.Debug, "    2. {0:x8}..{1:x8}",
+                            addr, addr + found);
+#endif
+            }
+#if ALLOW_BOOT_ARGLIST
+            DebugStub.Assert
+                (found == bytes,
+                 "FlatPages.RawAllocate wrong amount found={0} bytes={1}",
+                 __arglist(found, bytes));
+#endif
+            SetRange(addr, found, tag);
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(971);
+#endif
+
+            allocatedCount++;
+            allocatedBytes += (ulong)bytes;
+
+            return addr;
+        }
+
+        private static unsafe UIntPtr RawAllocateBelow(UIntPtr limit,
+                                                       UIntPtr bytes,
+                                                       UIntPtr alignment,
+                                                       uint tag)
+        {
+            VTable.Assert(Processor.InterruptsDisabled());
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(972);
+#endif
+            if (alignment < MemoryManager.PageSize)
+            {
+                alignment = MemoryManager.PageSize;
+            }
+
+#if VERBOSE
+            Tracing.Log(Tracing.Debug,
+                        "lim={0:x8}, size={1:x8}, align={2}, tag={3:x}",
+                        limit, bytes, alignment, tag);
+#endif
+            FreeNode * node = FreeNode.FindBelow(limit, GetFreeList(), bytes, alignment);
+            if (node == null) {
+                node = FreeNode.FindBelow(limit, GetSaveList(), bytes, alignment);
+                if (node == null) {
+                    // We should try to combine free and save pages...
+                    // But for now, we just fail.
+                    return UIntPtr.Zero;
+                }
+            }
+
+            UIntPtr addr = (UIntPtr)node;
+            UIntPtr adjust = SpaceToAlign(addr, alignment);
+            UIntPtr found = node->bytes;
+
+            if (adjust != UIntPtr.Zero) {
+                // Put the alignment pages in free list.
+                FreeNode.ReturnExtraBelow(GetFreeList(), ref addr, ref found, found - adjust);
+            }
+            DebugStub.Assert
+                (SpaceNotAligned(addr, alignment) == UIntPtr.Zero,
+                 "FlatPages.RawAllocateBelow not aligned addr={0} alignment={1}",
+                 __arglist(addr, alignment));
+
+            if (found > bytes) {
+                // Put the extra pages in free list.
+#if VERBOSE
+                Tracing.Log(Tracing.Debug,
+                            "found {0:x8}..{1:x8}, found={3:x8}, keep={4:x8}",
+                            addr, addr + found, found, bytes);
+#endif
+
+                FreeNode.ReturnExtraAbove(GetFreeList(), addr, ref found, bytes);
+            }
+
+            DebugStub.Assert
+                (found == bytes,
+                 "FlatPages.RawAllocateBelow wrong amount found={0} bytes={1}",
+                 __arglist(found, bytes));
+
+            SetRange(addr, found, tag);
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(973);
+#endif
+
+            allocatedCount++;
+            allocatedBytes += (ulong)bytes;
+
+            return addr;
+        }
+
+        private static unsafe UIntPtr RawAllocateExtend(UIntPtr addr,
+                                                        UIntPtr bytes,
+                                                        uint tag)
+        {
+            VTable.Assert(Processor.InterruptsDisabled());
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(974);
+#endif
+            UIntPtr page = MemoryManager.PageFromAddr(addr);
+            if (*(pageTable + page) != MemoryManager.PageFreeFirst) {
+                Tracing.Log(Tracing.Error,
+                            "{0:x} is not first free page {1:x}.",
+                            addr, *(pageTable + page));
+                return UIntPtr.Zero;
+            }
+
+            FreeNode *node = (FreeNode *)addr;
+            if (node->bytes < bytes) {
+                Tracing.Log(Tracing.Error,
+                            "Only {0:x} free bytes, not {1:x} as requested.",
+                            node->bytes, bytes);
+                return UIntPtr.Zero;
+            }
+
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "addr={0:x8}, size={1:x8}, tag={2:x}",
+                        addr, bytes, tag);
+#endif
+
+            // Remove the node from the list.
+            FreeNode.Remove(node);
+
+            UIntPtr found = node->bytes;
+
+            if (found > bytes) {
+                // Save the extra pages in the save list.
+                FreeNode.ReturnExtraAbove(GetSaveList(), addr, ref found, bytes);
+            }
+
+            DebugStub.Assert
+                (found == bytes,
+                 "FlatPages.RawAllocateExtend wrong amount found={0} bytes{1}",
+                 __arglist(found, bytes));
+
+            SetRange(addr, found, tag);
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(975);
+#endif
+
+            allocatedCount++;
+            allocatedBytes += (ulong)bytes;
+
+            return addr;
+        }
+
+        [NoStackLinkCheck]
+        private static unsafe void VerifyOwner(UIntPtr page, UIntPtr pages, uint tag)
+        {
+            tag &= MemoryManager.ProcessPageMask;
+            for (UIntPtr i = UIntPtr.Zero; i < pages; i++) {
+                DebugStub.Assert
+                    (((*(pageTable + page + i)) & MemoryManager.ProcessPageMask) == tag,
+                     "FlatPages.VerifyOwner page={0} i={1} tag={2}",
+                     __arglist(page, i, tag));
+            }
+        }
+
+        [NoStackLinkCheck]
+        private static unsafe void RawFree(UIntPtr addr, UIntPtr bytes, uint tag)
+        {
+            VTable.Assert(Processor.InterruptsDisabled());
+            UIntPtr bytesIn = bytes;
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(976);
+#endif
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "adr={0:x}, size={1:x}, tag={2:x}",
+                        addr, bytes, tag);
+#endif
+
+            VerifyOwner(MemoryManager.PageFromAddr(addr), MemoryManager.PagesFromBytes(bytes), tag);
+
+            FreeNode *node = FreeNode.GetNodeAt(addr + bytes);
+            FreeNode *prev = FreeNode.GetNodeFromLast(addr - MemoryManager.PageSize);
+
+            SetRange(addr, bytes, MemoryManager.PageFree);
+            // Try to combine with the previous region if it isn't a save region.
+            if (prev != null && prev->isSave == false) {
+                addr = (UIntPtr)prev;
+                bytes += prev->bytes;
+
+                FreeNode.Remove(prev);
+            }
+            // Try to combine with the next region even if it was a save region.
+            if (node != null) {
+                bytes += node->bytes;
+                FreeNode.Remove(node);
+                if (node->isSave) {
+                    // If next was save, then try to combine with the follower.
+                    node = FreeNode.GetNodeAt(addr + bytes);
+                    if (node != null) {
+                        bytes += node->bytes;
+                        FreeNode.Remove(node);
+                    }
+                }
+            }
+            // Create the free node.
+            FreeNode.CreateAndInsert(GetFreeList(), addr, bytes);
+#if NO__TRACE_PAGES
+#else
+            Kernel.Waypoint(977);
+#endif
+
+            freedCount++;
+            freedBytes += (ulong)bytesIn;
+        }
+
+        private static unsafe PageType RawQuery(UIntPtr queryAddr,
+                                                uint tag,
+                                                out UIntPtr regionAddr,
+                                                out UIntPtr regionSize)
+        {
+            VTable.Assert(Processor.InterruptsDisabled());
+            UIntPtr page = MemoryManager.PageFromAddr(queryAddr);
+            UIntPtr startPage = page;
+            UIntPtr limitPage = page + 1;
+
+            PageType type;
+            uint val = *(pageTable + startPage);
+            bool used = ((val & MemoryManager.ProcessPageMask) != MemoryManager.SystemPage);
+
+            if ((val & MemoryManager.ProcessPageMask) == MemoryManager.SystemPage) {
+                // Found a system page.
+                type = (tag == 0) ? (PageType)(val & MemoryManager.TypeMask) : PageType.Unknown;
+
+                // Find the start of the SystemPage region.
+                for (; startPage > UIntPtr.Zero; startPage--) {
+                    val = *(pageTable + startPage - 1);
+                    if ((val & MemoryManager.ProcessPageMask) != MemoryManager.SystemPage) {
+                        break;
+                    }
+                }
+                // Find the end of the SystemPage region
+                for (; limitPage < pageCount; limitPage++) {
+                    val = *(pageTable + limitPage);
+                    if ((val & MemoryManager.ProcessPageMask) != MemoryManager.SystemPage) {
+                        break;
+                    }
+                }
+            }
+            else {
+                // Found a process page.
+                uint ptag = val & MemoryManager.ProcessPageMask;
+                type = (tag == 0 || ptag == tag)
+                    ? (PageType)(val & MemoryManager.TypeMask) : PageType.Unknown;
+
+                if ((val & MemoryManager.TypeMask) == (uint)PageType.System) {
+                    // Find the start of the process code region.
+                    for (; startPage > UIntPtr.Zero; startPage--) {
+                        val = *(pageTable + startPage - 1);
+                        if ((val & MemoryManager.ProcessPageMask) != ptag ||
+                            (val & MemoryManager.TypeMask) != (uint)PageType.System) {
+                            break;
+                        }
+                    }
+                    // Find the end of the process code region
+                    for (; limitPage < pageCount; limitPage++) {
+                        val = *(pageTable + limitPage);
+                        if ((val & MemoryManager.ProcessPageMask) != ptag ||
+                            (val & MemoryManager.TypeMask) != (uint)PageType.System) {
+                            break;
+                        }
+                    }
+                }
+                else {
+                    // Find the start of the process region.
+                    for (; startPage > UIntPtr.Zero; startPage--) {
+                        val = *(pageTable + startPage - 1);
+                        if ((val & MemoryManager.ProcessPageMask) != ptag ||
+                            (val & MemoryManager.TypeMask) == (uint)PageType.System) {
+                            break;
+                        }
+                    }
+                    // Find the end of the process region
+                    for (; limitPage < pageCount; limitPage++) {
+                        val = *(pageTable + limitPage);
+                        if ((val & MemoryManager.ProcessPageMask) != ptag ||
+                            (val & MemoryManager.TypeMask) == (uint)PageType.System) {
+                            break;
+                        }
+                    }
+                }
+            }
+#if VERBOSE
+            Tracing.Log(Tracing.Debug, "[{0:x8}..{1:x8}]",
+                        AddrFromPage(startPage), AddrFromPage(limitPage));
+#endif
+            regionAddr = AddrFromPage(startPage);
+            regionSize = AddrFromPage(limitPage - startPage);
+            return type;
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        //
+        private static unsafe void DumpQuery(UIntPtr addr)
+        {
+            UIntPtr regionAddr;
+            UIntPtr regionSize;
+            PageType type = RawQuery(addr, 0, out regionAddr, out regionSize);
+
+            Tracing.Log(Tracing.Debug, "  {0:x8} => {1:x8}..{2:x8} [{3:x}]",
+                        addr, regionAddr, regionAddr + regionSize, (uint)type);
+        }
+
+        private static unsafe void DumpFreeNodes(FreeNode *list)
+        {
+            DumpFreeNodes(list, list->isSave);
+        }
+
+        private static unsafe void DumpFreeNodes(FreeNode *list, bool isSave)
+        {
+            if (isSave) {
+                Tracing.Log(Tracing.Debug, " SaveList:");
+            }
+            else {
+                Tracing.Log(Tracing.Debug, " FreeList:");
+            }
+
+            for (FreeNode *node = list->next; node != list; node = node->next) {
+                string fmt = "  {0:x8}..{1:x8} prev={2:x8}, next={3:x8}, last={4:x8} ";
+                if (node->isSave != isSave) {
+                    if (node->isSave) {
+                        fmt = "  {0:x8}..{1:x8} prev={2:x8}, next={3:x8}, last={4:x8} [Save!]";
+                    }
+                    else {
+                        fmt = "  {0:x8}..{1:x8} prev={2:x8}, next={3:x8}, last={4:x8} [Free!]";
+                    }
+                }
+                unchecked {
+                    Tracing.Log(Tracing.Debug, fmt,
+                                (UIntPtr)node, (UIntPtr)node + node->bytes,
+                                (UIntPtr)node->prev, (UIntPtr)node->next,
+                                (UIntPtr)node->last);
+                }
+            }
+        }
+
+        internal static unsafe void Dump(string where)
+        {
+            Tracing.Log(Tracing.Debug, "FlatPages.Dump: {0}", where);
+
+            uint *descriptors = pageTable;
+            uint last = *descriptors++ & MemoryManager.SystemPageMask;
+            UIntPtr begin = UIntPtr.Zero;
+
+            UIntPtr freePages = UIntPtr.Zero;
+            UIntPtr usedPages = UIntPtr.Zero;
+            UIntPtr unknownPages = UIntPtr.Zero;
+            UIntPtr sharedPages = UIntPtr.Zero;
+
+            for (UIntPtr i = (UIntPtr)1; i < pageCount; i++) {
+                uint dsc = *descriptors++;
+                uint val = dsc & MemoryManager.SystemPageMask;
+
+                switch (val) {
+                    case MemoryManager.PageUnknown:
+                        unknownPages++;
+                        break;
+                    case MemoryManager.PageShared:
+                        sharedPages++;
+                        break;
+                    case MemoryManager.PageFree:
+                        freePages++;
+                        break;
+                    default:
+                        usedPages++;
+                        break;
+                }
+
+                if (dsc != last) {
+                    Tracing.Log(Tracing.Debug, "  {0:x8}..{1:x8} : {2:x8} : {3:x8}",
+                                begin << MemoryManager.PageBits, i << MemoryManager.PageBits, last,
+                                (i - begin) << MemoryManager.PageBits);
+                    last = dsc;
+                    begin = i;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug, "  {0:x8}..{1:x8} : {2:x8} : {3:x8}",
+                        begin << MemoryManager.PageBits, pageCount << MemoryManager.PageBits, last,
+                        (pageCount - begin) << MemoryManager.PageBits);
+
+            DumpFreeNodes(GetFreeList(), false);
+            DumpFreeNodes(GetSaveList(), true);
+
+            Tracing.Log(Tracing.Audit,
+                        "Totals: free={0:x8}, used={1:x8}, unknown={2:x8}, reserved={3:x8}",
+                        freePages << MemoryManager.PageBits,
+                        usedPages << MemoryManager.PageBits,
+                        unknownPages << MemoryManager.PageBits,
+                        sharedPages << MemoryManager.PageBits);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [NoStackLinkCheck]
+        private static unsafe void SetPages(UIntPtr startPage, UIntPtr pageCount, uint tag)
+        {
+            uint * descriptor = pageTable + startPage;
+
+#if VERY_VERBOSE
+            Tracing.Log(Tracing.Audit,
+                        "SetPages(beg={0:x},num={1:x},val={2}",
+                        startPage << MemoryManager.PageBits,
+                        pageCount << MemoryManager.PageBits,
+                        tag);
+#endif
+
+            while (pageCount > UIntPtr.Zero) {
+                *descriptor++ = tag;
+                pageCount--;
+            }
+        }
+
+        [NoStackLinkCheck]
+        private static void SetRange(UIntPtr start, UIntPtr bytes, uint tag)
+        {
+            if (start > addressLimit) {
+                return;
+            }
+            if (start + bytes > addressLimit) {
+                bytes = addressLimit - start;
+            }
+            SetPages(MemoryManager.PageFromAddr(start), MemoryManager.PagesFromBytes(bytes), tag);
+        }
+        //////////////////////////////////////////////////////////////////////////
+        //
+
+        public static UIntPtr GetMaxMemory()
+        {
+            return addressLimit;
+        }
+
+        public static unsafe UIntPtr GetFreeMemory()
+        {
+            uint *descriptors = pageTable;
+            UIntPtr retval = 0;
+
+            // Count free pages
+            for (UIntPtr i = (UIntPtr)1; i < pageCount; i++) {
+                uint dsc = *descriptors++;
+                uint val = dsc & MemoryManager.SystemPageMask;
+
+                if (val == MemoryManager.PageFree)
+                {
+                    retval++;
+                }
+            }
+
+            return retval * MemoryManager.PageSize;
+        }
+
+        public static unsafe UIntPtr GetUsedMemory()
+        {
+            uint *descriptors = pageTable;
+            UIntPtr retval = 0;
+
+            // Count free pages
+            for (UIntPtr i = (UIntPtr)1; i < pageCount; i++) {
+                uint dsc = *descriptors++;
+                uint val = dsc & MemoryManager.SystemPageMask;
+
+                if (val != MemoryManager.PageFree)
+                {
+                    retval++;
+                }
+            }
+
+            return retval * MemoryManager.PageSize;
+        }
+
+        public static void GetUsageStatistics(out ulong allocatedCount,
+                                              out ulong allocatedBytes,
+                                              out ulong freedCount,
+                                              out ulong freedBytes)
+        {
+            allocatedCount = FlatPages.allocatedCount;
+            allocatedBytes = FlatPages.allocatedBytes;
+            freedCount = FlatPages.freedCount;
+            freedBytes = FlatPages.freedBytes;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        [Inline]
+        internal static UIntPtr AddrFromPage(UIntPtr page) {
+            return (page << MemoryManager.PageBits);
+        }
+
+        [Inline]
+        private static UIntPtr Align(UIntPtr data, UIntPtr size)
+        {
+            return ((data) & ~(size - 1));
+        }
+
+        [Inline]
+        private static UIntPtr Pad(UIntPtr data, UIntPtr size)
+        {
+            return ((data + size - 1) & ~(size - 1));
+        }
+
+        [Inline]
+        private static UIntPtr SpaceToAlign(UIntPtr data, UIntPtr size)
+        {
+            return Pad(data, size) - data;
+        }
+
+        [Inline]
+        private static UIntPtr SpaceNotAligned(UIntPtr data, UIntPtr size)
+        {
+            return ((data) & (size - 1));
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [StructLayout(LayoutKind.Sequential)]
+        private struct LastNode
+        {
+            internal const uint Signature   = 0xaa2222aa;
+            internal const uint Removed     = 0xee1111ee;
+
+            internal uint signature;
+            internal unsafe FreeNode * node;
+
+            [NoStackLinkCheck]
+            internal static unsafe LastNode * Create(UIntPtr addr, FreeNode *node)
+            {
+                LastNode *last = (LastNode *)addr;
+                last->signature = LastNode.Signature;
+                last->node = node;
+                node->last = last;
+#if VERBOSE
+                Tracing.Log(Tracing.Debug, "addr={0:x8}, node={1:x8}",
+                            addr, (UIntPtr) last->node);
+#endif
+                return last;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe void Remove(LastNode *last)
+            {
+                last->signature = Removed;
+                last->node = null;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe void PrintLastNode(UIntPtr addr)
+            {
+                LastNode *last = (LastNode *)addr;
+                DebugStub.WriteLine("ln.{1:x8}  ", __arglist((UIntPtr)last->node));
+            }
+
+        }
+
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FreeNode
+        {
+            internal const uint Signature   = 0x22aaaa22;
+            internal const uint Removed     = 0x11eeee11;
+
+            internal uint signature;
+            internal unsafe FreeNode * prev;
+            internal unsafe FreeNode * next;
+            internal unsafe LastNode * last;
+            internal UIntPtr bytes;
+            internal bool isSave;
+
+            [NoStackLinkCheck]
+            internal static unsafe void Init(FreeNode *list, bool isSave)
+            {
+                list->signature = Signature;
+                list->prev = list;
+                list->next = list;
+                list->last = null;
+                list->bytes = 0;
+                list->isSave = isSave;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe bool Remove(FreeNode *node)
+            {
+                FreeNode * prev;
+                FreeNode * next;
+
+                UIntPtr page = MemoryManager.PageFromAddr((UIntPtr)node);
+                *(pageTable + page) = MemoryManager.PageFree;
+
+                next = node->next;
+                prev = node->prev;
+                prev->next = next;
+                next->prev = prev;
+
+                if (node->last != null) {
+                    LastNode.Remove(node->last);
+                }
+                node->signature = Removed;
+
+                return (next == prev);
+            }
+
+            [NoStackLinkCheck]
+            private static unsafe void InsertAsPrev(FreeNode *list, FreeNode *node)
+            {
+                FreeNode * prev;
+
+                prev = list->prev;
+                node->next = list;
+                node->prev = prev;
+                prev->next = node;
+                list->prev = node;
+            }
+
+            [NoStackLinkCheck]
+            private static unsafe void InsertAsNext(FreeNode *list, FreeNode *node)
+            {
+                FreeNode * next;
+
+                next = list->next;
+                node->prev = list;
+                node->next = next;
+                next->prev = node;
+                list->next = node;
+            }
+
+            [NoStackLinkCheck]
+            private static unsafe void InsertBySize(FreeNode *list, FreeNode *node)
+            {
+#if ALLOW_BOOT_ARGLIST
+                DebugStub.Assert(node->bytes > 0,
+                                 "FlatPages.InsertBySize node->bytes={0}",
+                                 __arglist(node->bytes));
+#endif
+                if (node->bytes <= SmallSize) {
+                    // If the size is pretty small, we insert from the back of the list...
+                    for (FreeNode *step = list->prev; step != list; step = step->prev) {
+                        if (step->bytes >= node->bytes) {
+                            InsertAsNext(step, node);
+                            return;
+                        }
+                    }
+                    InsertAsNext(list, node);
+                }
+                else {
+                    // Insert a region into the list by size.
+                    for (FreeNode *step = list; step->next != list; step = step->next) {
+                        if (step->next->bytes <= node->bytes) {
+                            InsertAsNext(step, node);
+                            return;
+                        }
+                    }
+                    InsertAsPrev(list, node);
+                }
+            }
+
+            ///////////////////////////////////////////////////////////
+            // haryadi FreeNode's new routines start here
+
+            internal static unsafe void PrintFreeList(FreeNode *list)
+            {
+                int count = 0;
+                DebugStub.WriteLine
+                    ("        PRINT FREE LIST  (tail.{0:x8}  prev.{1:x8}  next.{2:x8})",
+                     __arglist((UIntPtr)(list),
+                               (UIntPtr)list->prev,
+                               (UIntPtr)list->next));
+                DebugStub.WriteLine("        ---------------------------------------------------");
+
+                for (FreeNode *node = list->next;
+                     node != list; node = node->next) {
+                    DebugStub.Print
+                        ("        [{0}] b.{1:x8} e.{2:x8} {3,8}KB p.{4:x8} n.{5:x8} l.{6:x8}  --  ",
+                         __arglist(
+                                   count,
+                                   (UIntPtr)node, (UIntPtr)node + node->bytes,
+                                   node->bytes/(1024),
+                                   (UIntPtr)node->prev,
+                                   (UIntPtr)node->next,
+                                   (UIntPtr)node->last));
+                    if (node->last != null) {
+                        LastNode.PrintLastNode((UIntPtr)(node->last));
+                    }
+                    else {
+                        DebugStub.WriteLine();
+                    }
+                    if (count++ > 20) {
+                        DebugStub.WriteLine("\n        **** ERROR INFINITE LIST ****\n");
+                        DebugStub.Break();
+                    }
+                }
+            }
+
+            internal static unsafe void PrintDomainFreeLists()
+            {
+                DebugStub.WriteLine("        DOMAIN FREE LIST");
+                DebugStub.WriteLine("        ------------------------------------------");
+                for (int i = 0; i < domainMap.Length; i++) {
+                    if (domainMap[i].isSubMemConnected) {
+                        DebugStub.WriteLine("\n\n        Domain [{0}]:", __arglist(i));
+                        PrintFreeList(domainMap[i].domFreeList);
+                    }
+
+                }
+            }
+
+            internal static unsafe void PrintProcessorFreeLists()
+            {
+                DebugStub.WriteLine("\n");
+                DebugStub.WriteLine("        ******************************************");
+                DebugStub.WriteLine("        PROCESSOR FREE LIST");
+                DebugStub.WriteLine("        ******************************************");
+                for (int i = 0; i < processorMemoryMap.Length; i++) {
+                    DebugStub.WriteLine("\n\n        Processor [{0}]:", __arglist(i));
+                    if (processorMemoryMap[i].isInitialized) {
+                        PrintFreeList(processorMemoryMap[i].procFreeList);
+                    }
+
+                }
+                DebugStub.WriteLine();
+            }
+
+            internal static unsafe UIntPtr GetFreeListTotalSize(FreeNode *list)
+            {
+                UIntPtr size = 0;
+                for (FreeNode *node = list->next;
+                     node != list; node = node->next) {
+                    size += node->bytes;
+                }
+                return size;
+            }
+
+            internal static unsafe void PrintProcessorAddressSpace(FreeNode *list)
+            {
+                ulong MB = 1024*1024;
+                for (FreeNode *node = list->next;
+                     node != list; node = node->next) {
+                    DebugStub.Print
+                        ("[{0:x8}..{1:x8},{2,3}MB]  ",
+                         __arglist((UIntPtr)node,
+                                   (UIntPtr)node + node->bytes,
+                                   (ulong)(node->bytes)/MB));
+                }
+            }
+
+            internal static unsafe void PrintProcessorsAddressSpaces()
+            {
+                UIntPtr size = 0;
+                ulong MB = 1024*1024;
+
+                DebugStub.WriteLine("Processor Address Space (Current Free List):");
+                for (int i = 0; i < processorMemoryMap.Length; i++) {
+                    if (processorMemoryMap[i].isInitialized) {
+                        size = GetFreeListTotalSize(processorMemoryMap[i].procFreeList);
+                        DebugStub.Print("  p{0} ({1,3}MB) : ",
+                                        __arglist(i, (ulong)size/MB));
+                        PrintProcessorAddressSpace(processorMemoryMap[i].procFreeList);
+                    }
+                    DebugStub.WriteLine();
+                }
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode* GetFreeNodeAtBreakAddr(FreeNode *list, UIntPtr breakAddr)
+            {
+                int count = 0;
+
+                for (FreeNode *node = list->next;
+                     node != list; node = node->next) {
+
+                    if ((UIntPtr)node <= breakAddr
+                        && breakAddr < ((UIntPtr)node + node->bytes)) {
+                        return node;
+                    }
+                    if (count++ > 20) {
+                        DebugStub.WriteLine("  WARNING: Can't GetFreeNode ListTail.{0:x8} at {1:x8} after 20 iterations",
+                                            __arglist((UIntPtr)list, breakAddr));
+                        DebugStub.Break();
+                    }
+
+                }
+                return null;
+            }
+
+            // Imagine the case where the current free list contains
+            // node from address 100 to 1000 Now, the SRAT table says
+            // that a sub memory is from range 50 to 500.  In
+            // CreateSubMemory, when we call GetFreeNodeBreakAddr(50)
+            // it will fail, because there is no free node at address
+            // 50. However this sub memory is actually intersects with
+            // the free list node. So the correct thing to do is to
+            // break it at address 100. This function will return the
+            // correct address (i.e. 100) to the caller, so that the
+            // caller can break the free list at 100 instead of 50.
+            // return breakAddr
+            [NoStackLinkCheck]
+            internal static unsafe UIntPtr IsPartialIntersect(FreeNode *list, UIntPtr baseAddr, UIntPtr endAddr)
+            {
+                UIntPtr nodeBaseAddr;
+                UIntPtr nodeEndAddr;
+
+                for (FreeNode *node = list->next;
+                     node != list; node = node->next) {
+
+                    nodeBaseAddr = (UIntPtr)node;
+                    nodeEndAddr = (UIntPtr)(node) + node->bytes;
+
+                    if (nodeBaseAddr < endAddr && nodeBaseAddr >= baseAddr) {
+#if MP_VERBOSE
+                        DebugStub.WriteLine("  ** Return Nb.{0:x8}",
+                                            __arglist(baseAddr));
+#endif
+                        return nodeBaseAddr;
+                    }
+                }
+                return 0;
+            }
+
+
+
+            // This will break curNode into two nodes. For example
+            // curNode is from address X to Y The two nodes will be
+            // one from X to breakAddr and the other from breakAddr to
+            // Y. Also prev and next pointers are updated
+            [NoStackLinkCheck]
+            internal static unsafe void BreakListAt(FreeNode *list, FreeNode *curNode, UIntPtr breakAddr)
+            {
+                // Before breaking, need to check if this breakAddr
+                // has been broken before or not. If so, don't double
+                // break.  One way to find out is to check the
+                // signature of the lastnode and freenode before and
+                // after the breakAddress respectively
+                FreeNode *freeNode = (FreeNode*) breakAddr;
+                LastNode *lastNode = (LastNode*) (breakAddr - MemoryManager.PageSize);
+                if (lastNode->signature == LastNode.Signature &&
+                    freeNode->signature == FreeNode.Signature) {
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        {0:x8} Has been broken before. Cancel braking.",
+                                        __arglist(breakAddr));
+#endif
+                    return;
+                }
+
+                // If this is the first node in the list, and the address of
+                // the first node is the same as curNode. Then,
+                // don't break this node.
+                if ((UIntPtr) freeNode == breakAddr &&
+                    freeNode->prev == list) {
+#if MP_VERBOSE
+                    DebugStub.WriteLine("        {0:x8} is the first node. Cancel braking.",
+                                        __arglist(breakAddr));
+#endif
+                    return;
+                }
+
+#if MP_VERBOSE
+                DebugStub.WriteLine("        {0:x8} is okay. Proceed Breaking", __arglist(breakAddr));
+#endif
+
+                // first remember originals
+                LastNode *origLast = curNode->last;
+                FreeNode *origNext = curNode->next;
+                FreeNode *origPrev = curNode->prev;
+                UIntPtr origBytes = curNode->bytes;
+                bool origIsSave = curNode->isSave;
+                uint origSignature = curNode->signature;
+
+                // prepare the two nodes
+                FreeNode *firstNode = curNode;
+                FreeNode *secondNode = (FreeNode*)breakAddr;
+                UIntPtr firstNodeBase = (UIntPtr) firstNode;
+                UIntPtr firstNodeEnd = breakAddr;
+                UIntPtr secondNodeBase = breakAddr;
+                UIntPtr secondNodeEnd = (UIntPtr)curNode + curNode->bytes;
+
+                // now fix the second node FIRST!! (before the first node)
+                secondNode->next = origNext;
+                secondNode->prev = firstNode;
+                secondNode->bytes = secondNodeEnd - secondNodeBase;
+                secondNode->isSave = origIsSave;
+                secondNode->signature = origSignature;
+                LastNode.Create(secondNodeEnd - MemoryManager.PageSize, secondNode);
+
+                // now fix the first node
+                firstNode->next = secondNode;
+                firstNode->prev = origPrev;
+                firstNode->bytes = firstNodeEnd - firstNodeBase;
+                firstNode->isSave = origIsSave;
+                firstNode->signature = origSignature;
+                LastNode.Create(firstNodeEnd - MemoryManager.PageSize, firstNode);
+
+                // now fix the original next's previous pointer
+                origNext->prev = secondNode;
+            }
+
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * FindGoodFit(FreeNode *list,
+                                                          UIntPtr bytes, UIntPtr alignment)
+            {
+#if ALLOW_BOOT_ARGLIST
+                DebugStub.Assert(bytes > 0,
+                                 "FlatPages.FindGoodFit bytes={0}",
+                                 __arglist(bytes));
+#endif
+                // If it is a small allocation, we try to accelerate the search.
+                if (bytes <= SmallSize && alignment <= MemoryManager.PageSize) {
+                    for (FreeNode *node = list->prev; node != list; node = node->prev) {
+                        if (node->bytes >= bytes) {
+                            Remove(node);
+                            return node;
+                        }
+                    }
+                    return null;
+                }
+                else {
+                    // First try to find a region closest in size to bytes...
+                    FreeNode *best = null;
+                    for (FreeNode *node = list->next; node != list; node = node->next) {
+                        if (bytes <= node->bytes) {
+                            UIntPtr full = SpaceToAlign((UIntPtr)node, alignment) + bytes;
+                            if (full <= node->bytes) {
+                                // If we find a candidate, remember it.
+                                best = node;
+                                if (full == node->bytes) {
+                                    // Stop if it is the ideal region.
+                                    break;
+                                }
+                            }
+                        }
+                        else {
+                            // Stop if we have a candidate and we've reach smaller regions.
+                            if (best != null) {
+                                break;
+                            }
+                        }
+                    }
+                    if (best != null) {
+                        Remove(best);
+                    }
+                    return best;
+                }
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * FindBelow(UIntPtr limit, FreeNode *list,
+                                                        UIntPtr bytes, UIntPtr alignment)
+            {
+                DebugStub.Assert(bytes > 0,
+                                 "FlatPages.FindBelow bytes={0}",
+                                 __arglist(bytes));
+
+                // Try to find the first region below the limit address.
+                for (FreeNode *node = list->next; node != list; node = node->next) {
+                    if ((UIntPtr)node + bytes < limit && node->bytes >= bytes) {
+                        UIntPtr full = SpaceToAlign((UIntPtr)node, alignment) + bytes;
+                        if ((UIntPtr)node + full < limit && node->bytes >= full) {
+                            Remove(node);
+                            return node;
+                        }
+                    }
+                }
+                return null;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * GetNodeAt(UIntPtr addr)
+            {
+                UIntPtr page = MemoryManager.PageFromAddr(addr);
+
+                if (*(pageTable + page) == MemoryManager.PageFreeFirst) {
+                    return (FreeNode *)addr;
+                }
+                return null;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * GetNodeFromLast(UIntPtr addr)
+            {
+                UIntPtr page = MemoryManager.PageFromAddr(addr);
+
+                if (*(pageTable + page) == MemoryManager.PageFree &&
+                    *(pageTable + page + 1) != MemoryManager.PageFree) {
+
+                    return ((LastNode *)addr)->node;
+                }
+                if (*(pageTable + page) == MemoryManager.PageFreeFirst) {
+                    return (FreeNode *)addr;
+                }
+                return null;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * Create(UIntPtr addr, UIntPtr bytes, bool isSave)
+            {
+                // Mark a page as a node in the free list, initialize the node struct.
+                FreeNode * node = (FreeNode *)addr;
+
+#if VERY_VERBOSE
+                Tracing.Log(Tracing.Debug,
+                            isSave ?
+                            "{0:x8}..{1:x8}, last={4:x8}" :
+                            "{0:x8}..{1:x8}, last={4:x8}",
+                            addr, addr+bytes, addr + bytes - MemoryManager.PageSize);
+#endif
+
+                UIntPtr page = MemoryManager.PageFromAddr(addr);
+                *(pageTable + page) = MemoryManager.PageFreeFirst;
+
+                node->signature = FreeNode.Signature;
+                node->bytes = bytes;
+                node->isSave = isSave;
+                node->prev = null;
+                node->next = null;
+                node->last = null;
+
+                if (bytes > MemoryManager.PageSize) {
+                    LastNode.Create(addr + bytes - MemoryManager.PageSize, node);
+                }
+                return node;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe void CreateAndInsert(FreeNode *list,
+                                                        UIntPtr addr,
+                                                        UIntPtr bytes)
+            {
+                FreeNode * node = Create(addr, bytes, list->isSave);
+
+#if VERBOSE
+                Tracing.Log(Tracing.Debug,
+                            list->isSave ?
+                            "({0:x8}, {1:x8}, true), prev={3:x8}, next={4:x8}, last={5:x8}" :
+                            "({0:x8}, {1:x8}, false), prev={3:x8}, next={4:x8}, last={5:x8}",
+                            addr, bytes, (UIntPtr) node->prev,
+                            (UIntPtr) node->next, (UIntPtr) node->last);
+#endif
+
+
+#if ALLOW_BOOT_ARGLIST
+                DebugStub.Assert((bytes & MemoryManager.PageMask) == 0,
+                                 "FlatPages.CreateAndInsert bytes={0}",
+                                 __arglist(bytes));
+                DebugStub.Assert((node->bytes & MemoryManager.PageMask) == 0,
+                                 "FlatPages.CreateAndInsert node->bytes={0}",
+                                 __arglist(node->bytes));
+#endif
+                InsertBySize(list, node);
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe void ReturnExtraAbove(FreeNode *list,
+                                                         UIntPtr addr,
+                                                         ref UIntPtr found,
+                                                         UIntPtr keep)
+            {
+                CreateAndInsert(list, addr + keep, found - keep);
+                found = keep;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe void ReturnExtraBelow(FreeNode *list,
+                                                         ref UIntPtr addr,
+                                                         ref UIntPtr found,
+                                                         UIntPtr keep)
+            {
+                CreateAndInsert(list, addr, found - keep);
+                addr = addr + found - keep;
+                found = keep;
+            }
+        }
+    }
+}
+
+#endif // !PAGING
diff --git a/base/Kernel/Singularity/Memory/HandleTable.cs b/base/Kernel/Singularity/Memory/HandleTable.cs
new file mode 100644
index 0000000..2fdb7c0
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/HandleTable.cs
@@ -0,0 +1,317 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: HandleTable.cs - Shared region for process handles
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.GCs;
+
+using Microsoft.Bartok.Runtime;
+
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Memory
+{
+    // <summary>
+    // Reference-counted handles to object references that aren't garbage
+    // collected so they can be handed out across GC domains.  The receiving
+    // process is handle an actual pointer into the handle table.  We know
+    // that the process can't forge a non-null pointer due to type safety.
+    // Handle table pages for a process are not freed until the process
+    // terminates because we hand out pointer within the page to the process.
+    //
+    // Each page of handles (and therefore each handle) is owned by one process.
+    // The pages for a process may be quickly found and deleted upon
+    // process death.  "Normal" handles never move between processes.
+    // Handles related to endpoints can move between processes, but
+    // they are owned by the kernel and cleaned up with reference counting
+    // since we know that points to handles in channels can never leak.
+    //
+    // </summary>
+    [NoCCtor]
+    [CLSCompliant(false)]
+    internal class HandleTable {
+
+        internal struct HandlePage
+        {
+            private UIntPtr                 table;
+            internal unsafe HandlePage *    next;
+
+            [Inline]
+            internal void SetTable(HandleTable ht)
+            {
+                table = Magic.addressOf(ht);
+            }
+
+            [Inline]
+            internal HandleTable GetTable()
+            {
+                return (HandleTable)Magic.fromAddress(table);
+            }
+        }
+
+        internal struct HandleEntry {
+            internal UIntPtr                item;
+            internal unsafe HandleEntry *   next;   // next free node, null if last or in use.
+
+            [Inline]
+            internal void Set(Object o)
+            {
+                item = Magic.addressOf(o);
+            }
+
+            [Inline]
+            internal Object Get()
+            {
+                return Magic.fromAddress(item);
+            }
+
+            [Inline]
+            internal unsafe void Visit(NonNullReferenceVisitor visitor)
+            {
+                if (item != UIntPtr.Zero) {
+                    fixed (UIntPtr *loc = &item) {
+                        visitor.Visit(loc);
+                    }
+                }
+            }
+
+        }
+
+        // Per-class members
+        private static int handlesPerPage;
+
+        internal static unsafe void Initialize()
+        {
+            handlesPerPage = (int)((MemoryManager.PageSize / sizeof(HandleEntry)) - 1);
+        }
+
+        internal static void Finalize()
+        {
+        }
+
+        internal static unsafe HandleTable FindOwner(HandleEntry *entry)
+        {
+            HandlePage * page = (HandlePage *)MemoryManager.PageAlign((UIntPtr)entry);
+            return page->GetTable();
+        }
+
+        [Inline]
+        internal static unsafe void SetHandle(UIntPtr handle, Object obj)
+        {
+            HandleEntry *entry = (HandleEntry *)handle;
+            entry->Set(obj);
+        }
+
+        [Inline]
+        internal static unsafe void ClrHandle(UIntPtr handle)
+        {
+            HandleEntry *entry = (HandleEntry *)handle;
+            entry->Set(null);
+        }
+
+        [Inline]
+        internal static unsafe Object GetHandle(UIntPtr handle)
+        {
+            HandleEntry *entry = (HandleEntry *)handle;
+            return entry->Get();
+        }
+
+        // Per-instance members
+        private Process process;
+        private unsafe HandlePage *    pages;
+        private unsafe HandleEntry *   freeList;
+        private int pageCount;
+
+        internal unsafe HandleTable(Process process)
+        {
+            pages = null;
+            freeList = null;
+        }
+
+        internal unsafe void VisitSpecialData(NonNullReferenceVisitor visitor)
+        {
+            HandlePage *limit = null;
+            HandlePage *began;
+            do {
+                // Repeat this loop as long as new pages appear.
+                // I'm not sure this is needed, the write barrier might
+                // take care of this for us.
+                began = pages;
+                for (HandlePage *page = began; page != limit; page = page->next) {
+
+                    // Get the bounds.
+                    HandleEntry *entry = ((HandleEntry *)(page + 1));
+                    HandleEntry *elimit = entry + handlesPerPage;
+
+                    for (; entry < elimit; entry++) {
+                        entry->Visit(visitor);
+                    }
+                }
+                limit = pages;
+            } while (pages != began);
+        }
+
+        internal unsafe UIntPtr FreeAllPages()
+        {
+            // We assume that external code has insured thread safety.
+            freeList = null;
+
+            for (HandlePage *next; pages != null; pages = next) {
+                next = pages->next;
+
+                MemoryManager.KernelFree((UIntPtr)pages, 1, process);
+            }
+
+            return (UIntPtr)pageCount * MemoryManager.PageSize;
+        }
+
+        internal unsafe void FreeHandle(UIntPtr handle)
+        {
+            if (handle != UIntPtr.Zero) {
+                FreeEntry((HandleEntry *)handle);
+            }
+        }
+
+        internal unsafe void FreeEntry(HandleEntry *entry)
+        {
+            entry->Set(null);
+
+            HandleEntry *next;
+            do {
+                next = freeList;
+                entry->next = next;
+
+                // Interlocked.CompareExchange only updates freeList if it hasn't
+                // changed within this loop.
+            } while (next != Interlocked.CompareExchange(ref freeList, entry, next));
+        }
+
+        internal unsafe UIntPtr AllocateHandle()
+        {
+            return (UIntPtr)AllocateEntry();
+        }
+
+        internal unsafe HandleEntry * AllocateEntry()
+        {
+            HandleEntry * entry = AllocateExisting();
+            if (entry != null) {
+                return entry;
+            }
+
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint(830);
+#endif // SINGULARITY_KERNEL
+            // Need to allocate a new page.
+            HandlePage *page
+                = (HandlePage*)MemoryManager.KernelAllocate(
+                    1, process, 0, PageType.Shared);
+
+#if SINGULARITY_KERNEL
+            Kernel.Waypoint(831);
+#endif // SINGULARITY_KERNEL
+
+            if (page == null) {
+                return null;
+            }
+
+            // Get the bounds.
+            HandleEntry *beg = ((HandleEntry *)(page + 1));
+            HandleEntry *end = beg + handlesPerPage - 1;
+
+            // Save off the first entry to return.
+            entry = beg++;
+            entry->Set(null);
+            entry->next = null;
+
+            // Initialize the free list in the rest of the entries.
+            for (HandleEntry *step = beg; step < end; step++) {
+                step->Set(null);
+                step->next = step + 1;
+            }
+            end->Set(null);
+            end->next = null;
+
+            // Initialize the page header and insert into the page list.
+            page->SetTable(this);
+            page->next = null;
+            HandlePage *last;
+            do {
+                last = pages;
+                page->next = last;
+
+                // Interlocked.CompareExchange only updates pages if it hasn't
+                // changed within this loop.
+            } while (last != Interlocked.CompareExchange(ref pages, page, last));
+
+            // Then insert into the free list.
+            HandleEntry *next;
+            do {
+                next = freeList;
+                end->next = next;
+
+                // Interlocked.CompareExchange only updates freeList if it hasn't
+                // changed with this loop.
+            } while (next != Interlocked.CompareExchange(ref freeList, beg, next));
+
+            Interlocked.Increment(ref pageCount);
+
+            return entry;
+        }
+
+        internal unsafe HandleEntry * AllocateExisting()
+        {
+            HandleEntry * first;
+            HandleEntry * second;
+
+            do {
+                //
+                // Cache the contents of head pointer location (i.e. the
+                // address of the first element on the list).
+                //
+                first = freeList;
+
+                if (first == null) {
+                    //
+                    // No first element.  List is empty.
+                    //
+                    return null;
+                }
+
+                //
+                // The first element contains the address of the second.
+                //
+                second = first->next;
+
+                //
+                // Called this way, Interlocked.CompareExchange will only
+                // replace the contents of the head pointer location with
+                // the address of the second element if the contents of the
+                // the head pointer location (i.e. the first element's address)
+                // hasn't changed since we cached it.  If the contents of
+                // the head pointer have changed in the meantime, it means
+                // some other thread has popped that element off the stack.
+                // So we loop back and try it all over again.
+                //
+
+            } while (first != Interlocked.CompareExchange(ref freeList, second, first));
+
+            first->Set(null);
+            first->next = null;
+            return first;
+        }
+
+        [NoHeapAllocation]
+        internal int GetPageCount()
+        {
+            return pageCount;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/MemoryManager.cs b/base/Kernel/Singularity/Memory/MemoryManager.cs
new file mode 100644
index 0000000..51090a7
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/MemoryManager.cs
@@ -0,0 +1,746 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MemoryManager.cs - Main entry points for OS memory management
+//
+//  Note:
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.GCs;
+
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class MemoryManager {
+
+        /////////////////////////////////////
+        // STATIC FIELDS
+        /////////////////////////////////////
+
+#if PAGING
+        private static PhysicalAddress IOMemoryBaseAddr;
+        private static PhysicalHeap KernelIOMemoryHeap;
+        private static VirtualMemoryRange_struct KernelRange;
+        private static VirtualMemoryRange KernelRangeWrapper;
+
+        [AccessedByRuntime("referenced from halkd.cpp")]
+        private static bool isInitialized;
+#endif
+
+        /////////////////////////////////////
+        // CONSTANTS
+        /////////////////////////////////////
+        // 4K pages!
+        internal const byte  PageBits = 12;
+        internal const uint  PageSize = 1 << PageBits;
+        internal const uint  PageMask = PageSize - 1;
+
+        //
+        // These constants define the layout of the virtual-page tables
+        // present in each VirtualMemoryRange (and that correspond to
+        // the FlatPages page table)
+        //
+        internal const uint    SystemPage          = 0xffff0000u;
+        internal const uint    SystemPageMask      = 0xffff000fu;
+        internal const uint    ProcessPageMask     = 0xffff0000u;
+        internal const uint    ExtraMask           = 0x0000fff0u;
+        internal const uint    TypeMask            = 0x0000000fu;
+
+        internal const uint    PageUnknown         = SystemPage + (uint)PageType.Unknown;
+        internal const uint    PageShared          = SystemPage + (uint)PageType.Shared;
+        internal const uint    PageFree            = SystemPage + (uint)PageType.Unallocated;
+        internal const uint    PageFreeFirst       = PageFree + 0xfff0;
+
+        internal const uint    KernelPage          = 0x00010000u;
+
+        internal const uint    KernelPageNonGC     = KernelPage + (uint)PageType.NonGC;
+        internal const uint    KernelPageImage     = KernelPage + (uint)PageType.System;
+        internal const uint    KernelPageStack     = KernelPage + (uint)PageType.Stack;
+
+        /////////////////////////////////////
+        // PUBLIC METHODS
+        /////////////////////////////////////
+
+        internal static void Initialize()
+        {
+            DebugStub.WriteLine("Initializing memory subsystem...");
+
+#if PAGING
+            // Set up the hardware-pages table and reserve a range for
+            // I/O memory
+            IOMemoryBaseAddr = PhysicalPages.Initialize(BootInfo.IO_MEMORY_SIZE);
+
+            // Set up the I/O memory heap
+            KernelIOMemoryHeap = new PhysicalHeap((UIntPtr)IOMemoryBaseAddr.Value,
+                                                  (UIntPtr)(IOMemoryBaseAddr.Value + BootInfo.IO_MEMORY_SIZE));
+
+            // Set up virtual memory. ** This enables paging ** !
+            VMManager.Initialize();
+
+            // Set up the kernel's memory ranges.
+            //
+            // The kernel's general-purpose range is special because
+            // it *describes* low memory as well as the GC range proper
+            // so the kernel's GC doesn't get confused by pointers to
+            // static data in the kernel image.
+            KernelRange = new VirtualMemoryRange_struct(
+                VMManager.KernelHeapBase,
+                VMManager.KernelHeapLimit,
+                UIntPtr.Zero,
+                VMManager.KernelHeapLimit,
+                null); // no concurrent access to page descriptors yet
+
+            // Mark the kernel's special areas
+            KernelRange.SetPages(0x0, BootInfo.KERNEL_STACK_BEGIN, KernelPageImage);
+            KernelRange.SetPages(BootInfo.GetBootInfo().DumpBase,
+                                 BootInfo.GetBootInfo().DumpLimit,
+                                 MemoryManager.KernelPageNonGC);
+            KernelRange.SetPages(BootInfo.KERNEL_STACK_BEGIN, BootInfo.KERNEL_STACK_LIMIT,
+                                 MemoryManager.KernelPageStack);
+
+            DebugStub.WriteLine("MemoryManager initialized with {0} physical pages still free",
+                                __arglist(PhysicalPages.GetFreePageCount()));
+
+            isInitialized = true;
+#else
+            FlatPages.Initialize();
+#endif // PAGING
+        }
+
+        internal static void Finalize()
+        {
+#if PAGING
+            VMManager.Finalize();
+#endif // PAGING
+        }
+
+        internal static unsafe void PostGCInitialize()
+        {
+#if PAGING
+            VMManager.PostGCInitialize();
+
+            // Create the wrapper for the kernel range. The fixed
+            // statement is safe since KernelRange is a static
+            // struct.
+            fixed (VirtualMemoryRange_struct* pKernelRange = &KernelRange) {
+                KernelRangeWrapper = new VirtualMemoryRange(pKernelRange,
+                                                            ProtectionDomain.DefaultDomain);
+            }
+#endif
+        }
+
+        // haryadi
+        internal static void InitializeProcessorAddressSpace()
+        {
+#if PAGING
+            // non-implemented yet for paging
+#else
+            FlatPages.InitializeProcessorAddressSpace();
+#endif
+        }
+
+
+        /////////////////////////////////////
+        // PUBLIC PAGING-SPECIFIC METHODS
+        /////////////////////////////////////
+
+#if PAGING
+        internal static unsafe VirtualMemoryRange GetKernelRange()
+        {
+            DebugStub.Assert(KernelRangeWrapper != null);
+            return KernelRangeWrapper;
+        }
+
+        //
+        // Get a new physical page and map it to the provided virtual address
+        //
+        //
+        private static bool CommitAndMapNewPage(UIntPtr virtualAddr,
+                                                ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(IsPageAligned(virtualAddr));
+            PhysicalAddress newPage = PhysicalPages.AllocPage();
+
+            if (newPage == PhysicalAddress.Null) {
+                // Failed.
+                return false;
+            }
+
+            VMManager.MapPage(newPage, virtualAddr, inDomain);
+            return true;
+        }
+
+        //
+        // Get and map multiple new pages. On failure, no pages are allocated.
+        //
+        internal static bool CommitAndMapRange(UIntPtr virtualAddr,
+                                               UIntPtr limitAddr,
+                                               ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(IsPageAligned(virtualAddr));
+            DebugStub.Assert(IsPageAligned(limitAddr));
+
+            for ( UIntPtr step = virtualAddr;
+                  step < limitAddr;
+                  step += PageSize) {
+
+                if (!CommitAndMapNewPage(step, inDomain)) {
+                    // Uh oh; we failed.
+                    for ( UIntPtr unmapStep = virtualAddr;
+                          unmapStep < virtualAddr;
+                          unmapStep += PageSize) {
+
+                        UnmapAndReleasePage(unmapStep);
+                    }
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        //
+        // Unmap the page at the provided virtual address and release its
+        // underlying physical page
+        //
+        internal static void UnmapAndReleasePage(UIntPtr virtualAddr)
+        {
+            DebugStub.Assert(VMManager.IsPageMapped(virtualAddr),
+                             "Trying to unmap an unmapped page");
+            PhysicalAddress phys = VMManager.UnmapPage(virtualAddr);
+            DebugStub.Assert(phys != PhysicalAddress.Null);
+            PhysicalPages.FreePage(phys);
+        }
+
+        //
+        // Unmap and release an entire range
+        //
+        internal static void UnmapAndReleaseRange(UIntPtr virtualAddr,
+                                                  UIntPtr limitAddr)
+        {
+            DebugStub.Assert(IsPageAligned(virtualAddr));
+            DebugStub.Assert(IsPageAligned(limitAddr));
+
+            for ( UIntPtr step = virtualAddr;
+                  step < limitAddr;
+                  step += PageSize) {
+
+                UnmapAndReleasePage(step);
+            }
+        }
+
+
+        /////////////////////////////////////
+        // PAGING-ENABLED KERNEL MEMORY OPERATIONS
+        /////////////////////////////////////
+
+        internal static PhysicalAddress IOMemoryBase {
+            get {
+                return IOMemoryBaseAddr;
+            }
+        }
+
+        [AccessedByRuntime("referenced from halkd.cpp")]
+        internal static UIntPtr KernelMapPhysicalMemory(PhysicalAddress physStart,
+                                                        UIntPtr numBytes)
+        {
+            UIntPtr permaLoc = VMManager.TranslatePhysicalRange(physStart, numBytes);
+
+            if (permaLoc != UIntPtr.Zero) {
+                // This location has a permanent mapping
+                return permaLoc;
+            } else {
+                // This location must be mapped on the fly
+                return VMManager.MapPhysicalMemory(KernelRangeWrapper,
+                                                   Process.kernelProcess,
+                                                   physStart, numBytes);
+            }
+        }
+
+        [AccessedByRuntime("referenced from halkd.cpp")]
+        internal static void KernelUnmapPhysicalMemory(UIntPtr startAddr,
+                                                       UIntPtr limitAddr)
+        {
+            if (VMManager.IsPermaMapped(startAddr, limitAddr)) {
+                return; // nothing to do
+            } else {
+                VMManager.UnmapPhysicalMemory(KernelRangeWrapper,
+                                              Process.kernelProcess,
+                                              startAddr, limitAddr);
+            }
+        }
+
+        internal static UIntPtr KernelAllocate(UIntPtr numPages, Process process,
+                                               uint extra, PageType type)
+        {
+            //
+            if (KernelRangeWrapper != null) {
+                return KernelRangeWrapper.Allocate(numPages, process, extra, type);
+            } else {
+                // Very early in the initialization sequence; ASSUME there is not
+                // yet any concurrent access to paging descriptors, and allocate
+                // memory without a paging-descriptor lock.
+                return KernelRange.Allocate(numPages, process, extra, type, null);
+            }
+        }
+
+        internal static UIntPtr KernelExtend(UIntPtr addr, UIntPtr numPages, Process process,
+                                             PageType type)
+        {
+            // TODO: Extend not yet implemented
+            DebugStub.Break();
+            return UIntPtr.Zero;
+        }
+
+        internal static PageType KernelQuery(UIntPtr startAddr,
+                                             out UIntPtr regionAddr,
+                                             out UIntPtr regionSize)
+        {
+            // TODO: Query not yet implemented
+            DebugStub.Break();
+            regionAddr = UIntPtr.Zero;
+            regionSize = UIntPtr.Zero;
+            return PageType.Unknown;
+        }
+
+        internal static void KernelFree(UIntPtr startAddr, UIntPtr numPages, Process process)
+        {
+            KernelRange.Free(startAddr, numPages, process);
+        }
+
+        internal static UIntPtr AllocateIOMemory(UIntPtr limitAddr,
+                                                 UIntPtr bytes,
+                                                 UIntPtr alignment,
+                                                 Process process)
+        {
+            return KernelIOMemoryHeap.Allocate(limitAddr, bytes, alignment, process);
+        }
+
+        internal static void FreeIOMemory(UIntPtr addr, UIntPtr size, Process process)
+        {
+            KernelIOMemoryHeap.Free(addr, size, process);
+        }
+
+        internal static UIntPtr KernelBaseAddr
+        {
+            get {
+                return KernelRange.BaseAddress;
+            }
+        }
+
+        internal static unsafe uint* KernelPageTable
+        {
+            get {
+                return KernelRange.PageTable;
+            }
+        }
+
+        internal static UIntPtr KernelPageCount
+        {
+            get {
+                return KernelRange.PageCount;
+            }
+        }
+
+        /////////////////////////////////////
+        // PAGING-ENABLED USER MEMORY OPERATIONS
+        /////////////////////////////////////
+
+        internal static UIntPtr UserBaseAddr
+        {
+            get {
+                return ProtectionDomain.CurrentDomain.UserRange.BaseAddress;
+            }
+        }
+
+        internal static UIntPtr UserMapPhysicalMemory(PhysicalAddress physStart,
+                                                      UIntPtr numBytes)
+        {
+            return VMManager.MapPhysicalMemory(ProtectionDomain.CurrentDomain.UserRange,
+                                               Thread.CurrentProcess, physStart, numBytes);
+        }
+
+        internal static void UserUnmapPhysicalMemory(UIntPtr startAddr,
+                                                     UIntPtr limitAddr)
+        {
+            VMManager.UnmapPhysicalMemory(ProtectionDomain.CurrentDomain.UserRange,
+                                          Thread.CurrentProcess, startAddr, limitAddr);
+        }
+
+        internal static UIntPtr UserAllocate(UIntPtr numPages,
+                                             Process process,
+                                             uint extra,
+                                             PageType type)
+        {
+            return ProtectionDomain.CurrentDomain.UserRange.Allocate(
+                numPages, process, extra, type);
+        }
+
+        internal static UIntPtr UserExtend(UIntPtr addr, UIntPtr numPages, Process process,
+                                           PageType type)
+        {
+            // TODO: Extend not yet implemented
+            DebugStub.Break();
+            return UIntPtr.Zero;
+        }
+
+        internal static void UserFree(UIntPtr addr, UIntPtr numPages, Process process)
+        {
+            ProtectionDomain.CurrentDomain.UserRange.Free(addr, numPages, process);
+        }
+
+        internal static PageType UserQuery(UIntPtr startAddr,
+                                           out UIntPtr regionAddr,
+                                           out UIntPtr regionSize)
+        {
+            // TODO: Query not yet implemented
+            DebugStub.Break();
+            regionAddr = UIntPtr.Zero;
+            regionSize = UIntPtr.Zero;
+            return PageType.Unknown;
+        }
+
+        internal static UIntPtr FreeProcessMemory(Process process)
+        {
+            return ProtectionDomain.CurrentDomain.UserRange.FreeAll(process);
+        }
+
+        internal static unsafe uint* UserPageTable
+        {
+            get {
+                return ProtectionDomain.CurrentDomain.UserRange.PageTable;
+            }
+        }
+
+        internal static UIntPtr UserPageCount
+        {
+            get {
+                return ProtectionDomain.CurrentDomain.UserRange.PageCount;
+            }
+        }
+
+        /////////////////////////////////////
+        // PAGING-ENABLED DIAGNOSTICS
+        /////////////////////////////////////
+
+        public static ulong GetFreePhysicalMemory()
+        {
+            return PhysicalPages.GetFreeMemory();
+        }
+
+        public static ulong GetUsedPhysicalMemory()
+        {
+            return PhysicalPages.GetUsedMemory();
+        }
+
+        public static ulong GetMaxPhysicalMemory()
+        {
+            return PhysicalPages.GetMaxMemory();
+        }
+
+        internal static void GetUserStatistics(out ulong allocatedCount,
+                                               out ulong allocatedBytes,
+                                               out ulong freedCount,
+                                               out ulong freedBytes)
+        {
+            ProtectionDomain.CurrentDomain.UserRange.GetUsageStatistics(
+                out allocatedCount,
+                out allocatedBytes,
+                out freedCount,
+                out freedBytes);
+        }
+
+#else // PAGING
+
+        /////////////////////////////////////
+        // NO-PAGING KERNEL MEMORY OPERATIONS
+        /////////////////////////////////////
+
+        internal static UIntPtr KernelMapPhysicalMemory(PhysicalAddress physStart,
+                                                        UIntPtr numBytes)
+        {
+            // identity map without paging
+            return unchecked((UIntPtr)physStart.Value);
+        }
+
+        internal static void KernelUnmapPhysicalMemory(UIntPtr startAddr,
+                                                       UIntPtr limitAddr)
+        {
+            // do nothing
+        }
+
+        internal static UIntPtr KernelAllocate(UIntPtr numPages, Process process,
+                                               uint extra, PageType type)
+        {
+            return FlatPages.Allocate(BytesFromPages(numPages),
+                                        UIntPtr.Zero,
+                                        MemoryManager.PageSize,
+                                        process, extra, type);
+        }
+
+        internal static UIntPtr KernelExtend(UIntPtr addr, UIntPtr numPages, Process process,
+                                             PageType type)
+        {
+            return FlatPages.AllocateExtend(addr, BytesFromPages(numPages), process, 0, type);
+        }
+
+        internal static void KernelFree(UIntPtr startAddr, UIntPtr numPages, Process process)
+        {
+            FlatPages.Free(startAddr, MemoryManager.BytesFromPages(numPages), process);
+        }
+
+        internal static PageType KernelQuery(UIntPtr startAddr, out UIntPtr regionAddr,
+                                             out UIntPtr regionSize)
+        {
+            return FlatPages.Query(startAddr, Process.kernelProcess, out regionAddr,
+                                   out regionSize);
+        }
+
+        internal static UIntPtr AllocateIOMemory(UIntPtr limitAddr,
+                                                 UIntPtr bytes,
+                                                 UIntPtr alignment,
+                                                 Process process)
+        {
+            if (limitAddr > 0) {
+                return FlatPages.AllocateBelow(limitAddr, bytes, alignment, process, 0, PageType.NonGC);
+            } else {
+                return FlatPages.Allocate(bytes, bytes, alignment, process, 0, PageType.NonGC);
+            }
+        }
+
+        internal static void FreeIOMemory(UIntPtr addr, UIntPtr size, Process process)
+        {
+            FlatPages.Free(addr, size, process);
+        }
+
+        internal static UIntPtr KernelBaseAddr
+        {
+            get {
+                return UIntPtr.Zero;
+            }
+        }
+
+        internal static unsafe uint* KernelPageTable
+        {
+            get {
+                return FlatPages.PageTable;
+            }
+        }
+
+        internal static UIntPtr KernelPageCount
+        {
+            get {
+                return FlatPages.PageCount;
+            }
+        }
+
+        /////////////////////////////////////
+        // NO-PAGING USER MEMORY OPERATIONS
+        /////////////////////////////////////
+
+        internal static UIntPtr UserBaseAddr
+        {
+            get {
+                return UIntPtr.Zero;
+            }
+        }
+
+        internal static UIntPtr UserMapPhysicalMemory(PhysicalAddress physStart,
+                                                      UIntPtr numBytes)
+        {
+            return unchecked((UIntPtr)physStart.Value);
+        }
+
+        internal static void UserUnmapPhysicalMemory(UIntPtr startAddr,
+                                                     UIntPtr limitAddr)
+        {
+            // do nothing
+        }
+
+        internal static UIntPtr UserAllocate(UIntPtr numPages,
+                                             Process process,
+                                             uint extra,
+                                             PageType type)
+        {
+            return FlatPages.Allocate(BytesFromPages(numPages),
+                                        UIntPtr.Zero,
+                                        MemoryManager.PageSize,
+                                        process, extra, type);
+        }
+
+        internal static UIntPtr UserExtend(UIntPtr addr, UIntPtr numPages, Process process,
+                                           PageType type)
+        {
+            return FlatPages.AllocateExtend(addr, BytesFromPages(numPages), process, 0, type);
+        }
+
+        internal static void UserFree(UIntPtr addr, UIntPtr numPages, Process process)
+        {
+            FlatPages.Free(addr, BytesFromPages(numPages), process);
+        }
+
+        internal static PageType UserQuery(UIntPtr startAddr, out UIntPtr regionAddr,
+                                           out UIntPtr regionSize)
+        {
+            return FlatPages.Query(startAddr, Thread.CurrentProcess,
+                                   out regionAddr, out regionSize);
+        }
+
+        internal static UIntPtr FreeProcessMemory(Process process)
+        {
+            return FlatPages.FreeAll(process);
+        }
+
+        internal static unsafe uint* UserPageTable
+        {
+            get {
+                return FlatPages.PageTable;
+            }
+        }
+
+        internal static UIntPtr UserPageCount
+        {
+            get {
+                return FlatPages.PageCount;
+            }
+        }
+
+        /////////////////////////////////////
+        // NO-PAGING DIAGNOSTICS
+        /////////////////////////////////////
+
+        public static ulong GetFreePhysicalMemory()
+        {
+            return (ulong)FlatPages.GetFreeMemory();
+        }
+
+        public static ulong GetUsedPhysicalMemory()
+        {
+            return (ulong)FlatPages.GetUsedMemory();
+        }
+
+        public static ulong GetMaxPhysicalMemory()
+        {
+            return (ulong)FlatPages.GetMaxMemory();
+        }
+
+        internal static void GetUserStatistics(out ulong allocatedCount,
+                                               out ulong allocatedBytes,
+                                               out ulong freedCount,
+                                               out ulong freedBytes)
+        {
+            FlatPages.GetUsageStatistics(out allocatedCount, out allocatedBytes,
+                                         out freedCount, out freedBytes);
+        }
+
+#endif
+
+        // Simpler overload
+        internal static UIntPtr AllocateIOMemory(UIntPtr bytes, Process process)
+        {
+            return AllocateIOMemory(UIntPtr.Zero, bytes, PageSize, process);
+        }
+
+        /////////////////////////////////////
+        // PUBLIC UTILITY METHODS
+        /////////////////////////////////////
+
+        [Inline]
+        internal static ulong PagePad(ulong addr) {
+            return ((addr + PageMask) & ~((ulong)PageMask));
+        }
+
+        [Inline]
+        internal static UIntPtr PagePad(UIntPtr addr) {
+            return ((addr + PageMask) & ~PageMask);
+        }
+
+        [Inline]
+        internal static ulong BytesNotAligned(ulong data, ulong size) {
+            return ((data) & (size - 1));
+        }
+
+        [Inline]
+        internal static UIntPtr BytesNotAligned(UIntPtr data, UIntPtr size) {
+            return ((data) & (size - 1));
+        }
+
+        [Inline]
+        internal static UIntPtr Pad(UIntPtr data, UIntPtr align) {
+            return ((data + align - 1) & ~(align - 1));
+        }
+
+        [Inline]
+        internal static UIntPtr Trunc(UIntPtr addr, UIntPtr align) {
+            return addr - BytesNotAligned(addr, align);
+        }
+
+        [Inline]
+        internal static ulong Trunc(ulong addr, ulong align) {
+            return addr - BytesNotAligned(addr, align);
+        }
+
+        [Inline]
+        internal static UIntPtr PageTrunc(UIntPtr addr) {
+            return (addr & ~PageMask);
+        }
+
+        [Inline]
+        internal static UIntPtr PageFromAddr(UIntPtr addr) {
+            return (addr >> PageBits);
+        }
+
+        [Inline]
+        internal static UIntPtr AddrFromPage(UIntPtr pageIdx) {
+            return (pageIdx << PageBits);
+        }
+
+        [Inline]
+        internal static ulong PagesFromBytes(ulong size) {
+            return ((size + PageMask) >> PageBits);
+        }
+
+        [Inline]
+        internal static UIntPtr PagesFromBytes(UIntPtr size) {
+            return ((size + PageMask) >> PageBits);
+        }
+
+        [Inline]
+        internal static UIntPtr BytesFromPages(UIntPtr pages) {
+            return (UIntPtr)(pages << PageBits);
+        }
+
+        [Inline]
+        internal static UIntPtr BytesFromPages(ulong pages) {
+            return (UIntPtr)(pages << PageBits);
+        }
+
+        [Inline]
+        [AccessedByRuntime("referenced from halkd.cpp")]
+        internal static UIntPtr PageAlign(UIntPtr addr) {
+            return (addr & ~PageMask);
+        }
+
+        [Inline]
+        internal static bool IsPageAligned(UIntPtr addr) {
+            return ((addr & PageMask) == 0);
+        }
+
+        [Inline]
+        internal static bool IsPageAligned(ulong addr) {
+            return ((addr & (ulong)PageMask) == 0);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/PhysicalAddress.cs b/base/Kernel/Singularity/Memory/PhysicalAddress.cs
new file mode 100644
index 0000000..b0572ae
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/PhysicalAddress.cs
@@ -0,0 +1,75 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PhysicalAddress.cs - Abstraction for a processor's physical address
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+using System;
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public struct PhysicalAddress
+    {
+        // This is a processor detail. 52 is for x86-derived
+        // architectures with Physical Address Extensions enabled.
+        private const uint HARDWARE_ADDR_BITS = 52;
+
+        // "640KB is enough for anybody"
+        private ulong addr;
+
+        public PhysicalAddress(ulong pAddr)
+        {
+            addr = pAddr;
+        }
+
+        [AccessedByRuntime("referenced from halkd.cpp")]
+        public PhysicalAddress(UIntPtr pAddr)
+        {
+            addr = (ulong)pAddr;
+        }
+
+        public static PhysicalAddress Null {
+            get {
+                return new PhysicalAddress(0);
+            }
+        }
+
+        public ulong Value {
+            get {
+                return addr;
+            }
+        }
+
+        public static bool operator== (PhysicalAddress adr1, PhysicalAddress adr2)
+        {
+            return adr1.Value == adr2.Value;
+        }
+
+        public static bool operator!= (PhysicalAddress adr1, PhysicalAddress adr2)
+        {
+            return !(adr1 == adr2);
+        }
+
+        public override bool Equals(Object o)
+        {
+            if (o is PhysicalAddress) {
+                return this == (PhysicalAddress)o;
+            } else {
+                return false;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked{ return (int)addr; }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/PhysicalHeap.cs b/base/Kernel/Singularity/Memory/PhysicalHeap.cs
new file mode 100644
index 0000000..2089429
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/PhysicalHeap.cs
@@ -0,0 +1,719 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PhysicalHeap.cs - a simple heap
+//
+//  Note:
+//
+//  This heap manages physical memory so as to be able to satisfy requests
+//  for blocks of contiguous memory. This is used for the restricted
+//  purpose of allocating I/O memory to processes that need, for example,
+//  to perform DMA to hardware.
+//
+//  The implementation of the heap assumes that the contiguous range of
+//  memory that it is pointed to at initialization is always mapped.
+//
+
+#if PAGING
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.GCs;
+
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public struct PhysicalHeap
+    {
+        /////////////////////////////////////
+        // CONSTANTS
+        /////////////////////////////////////
+
+        // We maintain a table of our heap's available pages, one 16-bit
+        // half-word per page. The 16 bits simply indicate the PID of the
+        // process owning the page, or zero if the page is free.
+        private const uint BytesPerTableEntry = 2;
+        private const ushort FreePage = 0x0000;
+        private const ushort KernelPage = 0x0001;
+
+        /////////////////////////////////////
+        // FIELDS
+        /////////////////////////////////////
+
+        // When allocating block of this size or smaller, we will
+        // start from the tail of the freeList instead of the head.
+        // The freeList is kept sorted by size.
+        private const uint    SmallSize = MemoryManager.PageSize;
+
+        // The start and end of heap pages *that can be used for data*
+        // (the page table resides immediately *before* this range!)
+        private UIntPtr startAddr;
+        private UIntPtr heapLimit;
+
+        // A count of the *data pages* in the heap (doesn't count the
+        // pages consumed by the page table)
+        private UIntPtr pageCount;
+
+        // The address of the page table
+        private unsafe ushort* pageTable;
+
+        // Protects access to the heap
+        private SpinLock heapLock;
+
+        // A chained list of free blocks, sorted by block size.
+        private FreeList freeList;
+
+
+        /////////////////////////////////////
+        // PUBLIC METHODS
+        /////////////////////////////////////
+
+        internal unsafe PhysicalHeap(UIntPtr start, UIntPtr limit)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(start));
+            DebugStub.Assert(MemoryManager.IsPageAligned(limit));
+
+            // Note that this wastes a little bit of memory by allocating
+            // table space to describe page-table memory!
+            UIntPtr numPages = MemoryManager.PagesFromBytes(limit - start);
+            UIntPtr bytesForTable = numPages * BytesPerTableEntry;
+            bytesForTable = MemoryManager.PagePad(bytesForTable);
+            UIntPtr pagesForTable = MemoryManager.PagesFromBytes(bytesForTable);
+
+            pageCount = numPages - pagesForTable;
+            startAddr = start  + bytesForTable;
+            heapLimit = limit;
+            pageTable = (ushort*)start;
+            heapLock = new SpinLock();
+
+            // The entire heap is free to start out with
+            freeList = new FreeList();
+
+            // Initialize the page table
+            SetPages(startAddr, pageCount, FreePage);
+
+            fixed (PhysicalHeap* thisPtr = &this) {
+                freeList.CreateAndInsert(thisPtr, startAddr, pageCount);
+            }
+
+            CheckConsistency();
+        }
+
+        // We always hand out blocks consisting of complete
+        // pages of memory.
+        [NoStackLinkCheck]
+        internal unsafe UIntPtr Allocate(UIntPtr bytes, Process process)
+        {
+            return Allocate(0, bytes, 0, process);
+        }
+
+        [NoStackLinkCheck]
+        internal unsafe UIntPtr Allocate(UIntPtr limitAddr,
+                                         UIntPtr bytes,
+                                         UIntPtr alignment,
+                                         Process process)
+        {
+            ushort tag = process != null ? (ushort)process.ProcessId : KernelPage;
+            UIntPtr blockPtr;
+            bool iflag = Lock();
+
+            if (alignment < MemoryManager.PageSize) {
+                alignment = MemoryManager.PageSize;
+            }
+
+            try {
+                CheckConsistency();
+
+                // Find an appropriately-sized block
+                FreeNode *foundNode = freeList.FindGoodFit(bytes, alignment);
+
+                if (foundNode == null) {
+                    return UIntPtr.Zero;
+                }
+
+                DebugStub.Assert(MemoryManager.IsPageAligned((UIntPtr)foundNode));
+
+                // Respect alignment within the node
+                blockPtr = MemoryManager.Pad((UIntPtr)foundNode, alignment);
+                UIntPtr alignedSize = bytes + SpaceToAlign((UIntPtr)foundNode, alignment);
+                DebugStub.Assert(alignedSize == (blockPtr + bytes) - (UIntPtr)foundNode);
+                DebugStub.Assert(foundNode->bytes >= alignedSize);
+
+                // Give back any extra pages
+                UIntPtr numPages = MemoryManager.PagesFromBytes(MemoryManager.PagePad(alignedSize));
+                UIntPtr chunkPages = MemoryManager.PagesFromBytes(foundNode->bytes);
+
+                DebugStub.Assert(chunkPages >= numPages);
+                UIntPtr extraPages = chunkPages - numPages;
+
+                if (extraPages > 0) {
+                    // Give back the extra memory
+                    UIntPtr remainderPtr = (UIntPtr)foundNode + (numPages * MemoryManager.PageSize);
+
+                    fixed (PhysicalHeap* thisPtr = &this) {
+                        freeList.CreateAndInsert(thisPtr, remainderPtr, extraPages);
+                    }
+                }
+
+                SetPages((UIntPtr)foundNode, numPages, tag);
+                CheckConsistency();
+            }
+            finally {
+                Unlock(iflag);
+            }
+
+            // TODO: Flexible limit specification not yet implemented
+            if (limitAddr > UIntPtr.Zero) {
+                DebugStub.Assert(blockPtr < limitAddr);
+            }
+
+            return blockPtr;
+        }
+
+        [NoStackLinkCheck]
+        internal unsafe void Free(UIntPtr addr, UIntPtr bytes, Process process)
+        {
+            if (addr == UIntPtr.Zero) {
+                // Silently accept freeing null
+                return;
+            }
+
+            // We always hand out memory in page-size chunks, so round up what
+            // the caller thinks their block size is
+            bytes = MemoryManager.PagePad(bytes);
+
+            // Our blocks always start on page boundaries
+            DebugStub.Assert(MemoryManager.IsPageAligned(addr));
+            ushort tag = process != null ? (ushort)process.ProcessId : KernelPage;
+            bool iflag = Lock();
+
+            try {
+                CheckConsistency();
+
+                UIntPtr numPages = MemoryManager.PagesFromBytes(bytes);
+                VerifyOwner(addr, numPages, tag);
+
+                FreeNode *nextBlock = null;
+                FreeNode *prevBlock = null;
+
+                if ((addr + bytes) < heapLimit) {
+                    fixed (PhysicalHeap* thisPtr = &this) {
+                        nextBlock = FreeNode.GetNodeAt(thisPtr, addr + bytes);
+                    }
+                }
+
+                if (addr > startAddr) {
+                    fixed (PhysicalHeap* thisPtr = &this) {
+                        prevBlock = LastNode.GetNodeFromLast(thisPtr, addr - MemoryManager.PageSize);
+                    }
+                }
+
+                // Don't mark pages as free until we're done discovering the
+                // previous and next blocks, or the attempt to discover
+                // the previous and next blocks gets confused to find itself
+                // adjacent to a free block.
+                SetPages(addr, numPages, FreePage);
+
+                // Coalesce with the preceding region
+                if (prevBlock != null) {
+                    addr = (UIntPtr)prevBlock;
+                    bytes += prevBlock->bytes;
+                    freeList.Remove(prevBlock);
+                }
+
+                // Coalesce with the following region
+                if (nextBlock != null) {
+                    bytes += nextBlock->bytes;
+                    freeList.Remove(nextBlock);
+                }
+
+                // Blocks should always be integral numbers of pages
+                DebugStub.Assert(MemoryManager.IsPageAligned(bytes));
+
+                // Create the free node.
+                fixed (PhysicalHeap* thisPtr = &this) {
+                    freeList.CreateAndInsert(thisPtr, addr, bytes / MemoryManager.PageSize);
+                }
+
+                CheckConsistency();
+            }
+            finally {
+                Unlock(iflag);
+            }
+        }
+
+        /////////////////////////////////////
+        // PRIVATE METHODS
+        /////////////////////////////////////
+
+        private unsafe UIntPtr FreePageCountFromList()
+        {
+            UIntPtr retval = 0;
+            FreeNode* entry = freeList.head;
+            FreeNode* prev = null;
+
+            while (entry != null) {
+                DebugStub.Assert(MemoryManager.IsPageAligned(entry->bytes));
+                retval += MemoryManager.PagesFromBytes(entry->bytes);
+                DebugStub.Assert(entry->prev == prev);
+                prev = entry;
+                entry = entry->next;
+            }
+
+            return retval;
+        }
+
+        private unsafe void CheckConsistency()
+        {
+#if SELF_TEST
+            UIntPtr freePagesByTable = 0;
+
+            for(UIntPtr i = 0; i < pageCount; i++) {
+                UIntPtr pageAddr = startAddr + (MemoryManager.PageSize * i);
+
+                if (PageWord(i) == FreePage) {
+                    // Validate this block's free information
+                    FreeNode* thisBlock = (FreeNode*)pageAddr;
+                    DebugStub.Assert(thisBlock->signature == FreeNode.Signature);
+
+                    if (thisBlock->last != null) {
+                        // Multi-page free block; validate and skip ahead
+                        DebugStub.Assert(thisBlock->last->node == thisBlock);
+                        DebugStub.Assert(thisBlock->last->signature == LastNode.Signature);
+                        UIntPtr numBytes = (UIntPtr)thisBlock->last - (UIntPtr)pageAddr +
+                            MemoryManager.PageSize;
+                        DebugStub.Assert(numBytes == thisBlock->bytes);
+                        DebugStub.Assert(MemoryManager.IsPageAligned(numBytes));
+                        UIntPtr numPages = MemoryManager.PagesFromBytes(numBytes);
+
+                        for (UIntPtr j = i; j < i + numPages; j++) {
+                            DebugStub.Assert(PageWord(j) == FreePage);
+                        }
+
+                        i += numPages - 1;
+                        freePagesByTable += numPages;
+
+                    } else {
+                        // Single-page free block
+                        if (i != pageCount - 1) {
+                            DebugStub.Assert(PageWord(i + 1) != FreePage);
+                        }
+                        freePagesByTable++;
+                    }
+                }
+            }
+
+            // Now make sure all free pages are accounted for
+            UIntPtr freePagesByList = FreePageCountFromList();
+            DebugStub.Assert(freePagesByList == freePagesByTable);
+#endif
+        }
+
+        [NoStackLinkCheck]
+        private unsafe void SetPages(UIntPtr addr, UIntPtr pageCount, ushort tag)
+        {
+            UIntPtr idx = PageIndex(addr);
+            ushort* descriptor = pageTable + (ulong)idx;
+
+            while (pageCount > 0) {
+                *descriptor++ = tag;
+                pageCount--;
+            }
+        }
+
+        [NoStackLinkCheck]
+        private unsafe void VerifyOwner(UIntPtr addr, UIntPtr pages, ushort tag)
+        {
+            UIntPtr idx = PageIndex(addr);
+
+            for (UIntPtr i = 0; i < pages; i++) {
+                DebugStub.Assert
+                    ((*(pageTable + (ulong)idx + (ulong)i)) == tag,
+                     "PhysicalHeap.VerifyOwner addr={0} i={1} tag={2}",
+                     __arglist(addr, i, tag));
+            }
+        }
+
+        [Inline]
+        private UIntPtr PageIndex(UIntPtr pageAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+            DebugStub.Assert(pageAddr >= startAddr);
+            DebugStub.Assert(pageAddr < heapLimit);
+            return MemoryManager.PageFromAddr(pageAddr - startAddr);
+        }
+
+        [Inline]
+        private unsafe ushort PageWord(UIntPtr pageIdx)
+        {
+            DebugStub.Assert(pageIdx < pageCount);
+            return *(pageTable + (ulong)pageIdx);
+        }
+
+        [NoStackLinkCheck]
+        private bool Lock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            heapLock.Acquire(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [NoStackLinkCheck]
+        private void Unlock(bool iflag)
+        {
+#if SINGULARITY_MP
+            heapLock.Release(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        /////////////////////////////////////
+        // HELPER CLASSES
+        /////////////////////////////////////
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FreeList
+        {
+            internal unsafe FreeNode* head;
+            internal unsafe FreeNode* tail;
+
+            [NoStackLinkCheck]
+            internal unsafe void CreateAndInsert(PhysicalHeap* inHeap,
+                                                 UIntPtr addr,
+                                                 UIntPtr pages)
+            {
+                DebugStub.Assert(MemoryManager.IsPageAligned(addr),
+                                 "PhysicalHeap.CreateAndInsert non page-aligned addr={0:x}",
+                                 __arglist(addr));
+
+                FreeNode * node = FreeNode.Create(inHeap, addr, pages);
+
+                DebugStub.Assert(MemoryManager.IsPageAligned(node->bytes),
+                                 "PhysicalHeap.CreateAndInsert non page-sized node->bytes={0:x}",
+                                 __arglist(node->bytes));
+
+                InsertBySize(node);
+            }
+
+            internal unsafe void Remove(FreeNode* node)
+            {
+                if (node->prev != null) {
+                    node->prev->next = node->next;
+                }
+                else {
+                    DebugStub.Assert(head == node);
+                    head = node->next;
+                }
+
+                if (node->next != null) {
+                    node->next->prev = node->prev;
+                }
+                else {
+                    DebugStub.Assert(tail == node);
+                    tail = node->prev;
+                }
+
+                node->Remove();
+            }
+
+            private unsafe void InsertAsHead(FreeNode* node)
+            {
+                if (head != null) {
+                    head->prev = node;
+                }
+
+                node->next = head;
+                head = node;
+            }
+
+            private unsafe void InsertAsTail(FreeNode* node)
+            {
+                if (tail != null) {
+                    tail->next = node;
+                }
+
+                node->prev = tail;
+                tail = node;
+            }
+
+            private unsafe void InsertAsNext(FreeNode* target, FreeNode* node)
+            {
+                DebugStub.Assert(target != null);
+
+                if (target == tail) {
+                    InsertAsTail(node);
+                }
+                else {
+                    node->next = target->next;
+                    node->prev = target;
+                    target->next = node;
+
+                    if (node->next != null) {
+                        node->next->prev = node;
+                    }
+                }
+            }
+
+            private unsafe void InsertAsPrev(FreeNode* target, FreeNode* node)
+            {
+                DebugStub.Assert(target != null);
+
+                if (target == head) {
+                    InsertAsHead(node);
+                } else {
+                    node->prev = target->prev;
+                    node->next = target;
+                    target->prev = node;
+
+                    if (node->prev != null) {
+                        node->prev->next = node;
+                    }
+                }
+            }
+
+            [NoStackLinkCheck]
+            internal unsafe void InsertBySize(FreeNode* node)
+            {
+                if (head == null) {
+                    // Empty list
+                    DebugStub.Assert(tail == null);
+                    head = node;
+                    tail = node;
+                }
+                else {
+                    if (node->bytes <= SmallSize) {
+                        // If the size is pretty small, we insert from the back of the list...
+                        for (FreeNode *step = tail; step != null; step = step->prev) {
+                            if (step->bytes >= node->bytes) {
+                                InsertAsNext(step, node);
+                                return;
+                            }
+                        }
+
+                        // Every entry in the list is smaller than us. Therefore, we're the
+                        // new head.
+                        InsertAsHead(node);
+                    }
+                    else {
+                        // Insert a region into the list by size.
+                        for (FreeNode *step = head; step != null; step = step->next) {
+                            if (step->bytes <= node->bytes) {
+                                InsertAsPrev(step, node);
+                                return;
+                            }
+                        }
+
+                        // Every entry in the list is larger than us. Therefore, we're
+                        // the new tail.
+                        InsertAsTail(node);
+                    }
+                }
+            }
+
+            [NoStackLinkCheck]
+            internal unsafe FreeNode * FindGoodFit(UIntPtr bytes, UIntPtr alignment)
+            {
+                DebugStub.Assert(alignment >= MemoryManager.PageSize);
+
+                // If it is a small allocation, we try to accelerate the search.
+                if (bytes <= SmallSize) {
+                    for (FreeNode *node = tail; node != null; node = node->prev) {
+                        UIntPtr alignedSize = SpaceToAlign((UIntPtr)node, alignment) + bytes;
+
+                        if (alignedSize <= node->bytes) {
+                            Remove(node);
+                            return node;
+                        }
+                    }
+
+                    return null;
+                }
+                else {
+                    // First try to find a region closest in size to bytes...
+                    FreeNode *best = null;
+
+                    for (FreeNode *node = head; node != null; node = node->next) {
+                        UIntPtr alignedSize = SpaceToAlign((UIntPtr)node, alignment) + bytes;
+
+                        if (alignedSize <= node->bytes) {
+                            // If we find a candidate, remember it.
+                            best = node;
+                            if (bytes == node->bytes) {
+                                // Stop if it is the ideal region.
+                                break;
+                            }
+                        }
+                        else {
+                            // Stop if we've reached smaller regions
+                            break;
+                        }
+                    }
+
+                    if (best != null) {
+                        Remove(best);
+                    }
+
+                    return best;
+                }
+            }
+        }
+
+        [Inline]
+        private static UIntPtr SpaceToAlign(UIntPtr data, UIntPtr size)
+        {
+            return MemoryManager.Pad(data, size) - data;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FreeNode
+        {
+            internal const uint Signature   = 0x22aaaa22;
+            internal const uint Removed     = 0x11eeee11;
+
+            internal uint signature;
+            internal unsafe FreeNode * prev;
+            internal unsafe FreeNode * next;
+            internal unsafe LastNode * last;
+            internal UIntPtr bytes;
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * Create(PhysicalHeap* inHeap,
+                                                     UIntPtr addr, UIntPtr pages)
+            {
+                DebugStub.Assert(addr >= inHeap->startAddr);
+                DebugStub.Assert((addr + (pages * MemoryManager.PageSize)) <= inHeap->heapLimit);
+                FreeNode * node = (FreeNode *)addr;
+
+                // This had better be a free page in the main table
+                DebugStub.Assert(inHeap->PageWord(inHeap->PageIndex(addr)) == FreePage,
+                                 "Creating a FreeNode for non-free page {0:x}",
+                                 __arglist(addr));
+
+                node->signature = FreeNode.Signature;
+                node->bytes = pages * MemoryManager.PageSize;
+                node->prev = null;
+                node->next = null;
+                node->last = null;
+
+                if (pages > 1) {
+                    node->last = LastNode.Create(inHeap, addr, node);
+                }
+
+                return node;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * GetNodeAt(PhysicalHeap* inHeap,
+                                                        UIntPtr addr)
+            {
+                UIntPtr idx = inHeap->PageIndex(addr);
+
+                if (inHeap->PageWord(idx) != FreePage) {
+                    // This address designates a page that is in use.
+                    return null;
+                }
+
+                if ((idx > 0) && (inHeap->PageWord(idx - 1) == FreePage)) {
+                    // This address is in the middle of a free block; it does
+                    // not designate the beginning of a free block.
+                    return null;
+                }
+
+                DebugStub.Assert(((FreeNode*)addr)->signature == Signature);
+                return (FreeNode*)addr;
+            }
+
+            internal unsafe void Remove()
+            {
+                signature = Removed;
+
+                prev = null;
+                next = null;
+
+                if (last != null) {
+                    last->Remove();
+                }
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct LastNode
+        {
+            internal const uint Signature   = 0xaa2222aa;
+            internal const uint Removed     = 0xee1111ee;
+
+            internal uint signature;
+            internal unsafe FreeNode * node;
+
+            [NoStackLinkCheck]
+            internal static unsafe LastNode * Create(PhysicalHeap* inHeap,
+                                                     UIntPtr addr, FreeNode *node)
+            {
+                LastNode *last = (LastNode *)(addr + node->bytes - MemoryManager.PageSize);
+                DebugStub.Assert((UIntPtr)last >= inHeap->startAddr);
+                DebugStub.Assert((UIntPtr)last <= inHeap->heapLimit);
+                DebugStub.Assert(MemoryManager.IsPageAligned((UIntPtr)last));
+                last->signature = LastNode.Signature;
+                last->node = node;
+                return last;
+            }
+
+            [NoStackLinkCheck]
+            internal unsafe void Remove()
+            {
+                signature = Removed;
+                node = null;
+            }
+
+            [NoStackLinkCheck]
+            internal static unsafe FreeNode * GetNodeFromLast(PhysicalHeap* inHeap,
+                                                              UIntPtr addr)
+            {
+                UIntPtr idx = inHeap->PageIndex(addr);
+
+                // addr must specify a free page
+                if (inHeap->PageWord(idx) != FreePage) {
+                    // addr does not specify a LastNode
+                    return null;
+                }
+
+                // addr must specify a page such that the next page (if there
+                // is one) is not free
+                if ( (idx != inHeap->pageCount - 1) &&
+                     (inHeap->PageWord(idx + 1) == FreePage)) {
+                    return null;
+                }
+
+                if (idx == 0) {
+                    // This is a one-page block
+                    DebugStub.Assert(((FreeNode*)addr)->signature == FreeNode.Signature);
+                    return (FreeNode*)addr;
+                }
+
+                // If the preceding page is free, then addr specifies
+                // the last page in a multi-page block, otherwise it
+                // specifies the only page in a one-page block.
+                if ( inHeap->PageWord(idx - 1) == FreePage ) {
+                    DebugStub.Assert(((LastNode*)addr)->signature == Signature);
+                    return ((LastNode *)addr)->node;
+                }
+                else {
+                    DebugStub.Assert(((FreeNode*)addr)->signature == FreeNode.Signature);
+                    return (FreeNode*)addr;
+                }
+            }
+        }
+    }
+}
+
+#endif // PAGING
diff --git a/base/Kernel/Singularity/Memory/PhysicalPages.cs b/base/Kernel/Singularity/Memory/PhysicalPages.cs
new file mode 100644
index 0000000..8c408a6
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/PhysicalPages.cs
@@ -0,0 +1,720 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PhysicalPages.cs - Primitive memory manager
+//
+//  Notes:
+//
+//  This module manages access to the machine's physical memory pages.
+//  This serves as the substrate to paging, so this code cannot assume
+//  that it can actually read and write the physical pages themselves,
+//  as no mapping to them is likely to exist.
+//
+
+#if PAGING
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class PhysicalPages
+    {
+        /////////////////////////////////////
+        // CONSTANTS
+        /////////////////////////////////////
+
+        // Never use physical memory below this limit
+        internal const ulong LowerRAMBlackout = 0x200000; // 2MB
+
+        /////////////////////////////////////
+        // CONSTANTS
+        /////////////////////////////////////
+        private static SpinLock pagesLock;
+
+        private static uint freeList; // index into the table or PageBlock.Sentinel
+        private static unsafe PageBlock* physTable;
+        private static uint numBlocks;
+        private static ulong tableSize;
+
+        // The physical max RAM address
+        private static ulong addressLimit;
+
+        /////////////////////////////////////
+        // PUBLIC METHODS
+        /////////////////////////////////////
+
+        //
+        // Initialize() must be called during OS boot *BEFORE* paging
+        // is enabled, so that physical memory can be accessed
+        // directly. We consult the system's memory map to pick a
+        // range of memory where we can situate the physical page
+        // table, and initialize it.
+        //
+        // the reserveSize argument specifies how much physical
+        // memory to set aside and return a PhysicalAddress to.
+        // This is used by the MemoryManager to reserve an area
+        // of contiguous physical memory for use in I/O operations.
+        //
+        // After Initialize()ation, the PhysicalPages module
+        // assumes that its page table will be identity-mapped
+        // into the kernel's virtual memory space.
+        //
+        internal static unsafe PhysicalAddress Initialize(ulong reserveSize)
+        {
+            // NB: our initialization is currently naive; we
+            // set up a table to describe all of physical memory,
+            // even though there are holes in it for reserved
+            // memory that we will never be able to use.
+            // This makes indexing much easier, though.
+
+            InitializeLock();
+
+            // First figure out how much RAM there is in this
+            // machine
+            BootInfo * bi = BootInfo.HalGetBootInfo();
+            SMAPINFO *smap = (SMAPINFO*)bi->SmapData32;
+            addressLimit = 0;
+
+            for (uint i = 0; i < bi->SmapCount; i++) {
+                if (smap[i].type == (ulong)SMAPINFO.AddressType.Free &&
+                    smap[i].addr + smap[i].size > addressLimit) {
+                    addressLimit = smap[i].addr + smap[i].size;
+                }
+            }
+
+            DebugStub.WriteLine("Highest usable RAM address is {0}",
+                                __arglist(addressLimit));
+
+            // How much room do we need for the page table?
+            numBlocks = GetNumBlocks(addressLimit);
+            ulong requiredSpace = (ulong)numBlocks * (ulong)sizeof(PageBlock);
+
+            // Now we need to find a location in physical memory
+            // where we can stick the physical page table. This needs
+            // to be addressable with a UIntPtr.
+            ulong startAddr = LowerRAMBlackout;
+            if (bi->DumpLimit > startAddr) {
+                startAddr = (ulong)bi->DumpLimit;
+                startAddr = MemoryManager.PagePad(startAddr);
+            }
+
+            ulong physLocation = FindFreeBlockInSMAP(startAddr, requiredSpace);
+
+            if (physLocation == 0) {
+                // Failed to find a spot to park the physical page
+                // table. This is fatal!
+                Kernel.Panic("Couldn't find enough room to initialize hardware page table");
+            }
+
+            // Initialize all the descriptor blocks as "free" (zeroed)
+            physTable = (PageBlock*)physLocation;
+            tableSize = requiredSpace;
+            freeList = 0; // First descriptor
+
+            for (uint i = 0; i < numBlocks; i++) {
+                PageBlock* thisBlock = GetBlock(i);
+                thisBlock->Initialize();
+                thisBlock->prevIdx = (i == 0) ? PageBlock.Sentinel : i - 1;
+                thisBlock->nextIdx = (i == numBlocks - 1) ? PageBlock.Sentinel : i + 1;
+            }
+
+            // Mark the blackout area of low physical memory, along
+            // with room used by the boot loader, as used
+            MarkRangeUsed(0, startAddr - 1);
+
+            // Now mark the range of physical pages occupied by the
+            // hardware table itself as being used!
+            MarkRangeUsed((ulong)physTable, requiredSpace);
+
+            // Mark any non-Free areas (according to SMAP) as in use
+            for (uint i = 0; i < bi->SmapCount; i++) {
+                if ((smap[i].type != (ulong)SMAPINFO.AddressType.Free) &&
+                    ((smap[i].addr + smap[i].size) > startAddr) &&
+                    (smap[i].addr < addressLimit)) {
+
+                    ulong unaccountedStart, unaccountedLength;
+
+                    if (smap[i].addr >= startAddr) {
+                        unaccountedStart = smap[i].addr;
+                        unaccountedLength = smap[i].size;
+                    } else {
+                        // Part of this memory window is already accounted for
+                        unaccountedStart = startAddr;
+                        unaccountedLength = smap[i].size - (startAddr - smap[i].addr);
+                    }
+
+                    MarkRangeUsed(unaccountedStart, unaccountedLength);
+                }
+            }
+
+            // Last step: find an available area to situate the caller's
+            // requested reserve-block, if any.
+            PhysicalAddress reservedPtr = PhysicalAddress.Null;
+
+            if (reserveSize != 0) {
+                reservedPtr = new PhysicalAddress(
+                    FindFreeBlockInSMAP(
+                        MemoryManager.PagePad((ulong)physTable + tableSize),
+                        reserveSize));
+
+                if (reservedPtr == PhysicalAddress.Null) {
+                    Kernel.Panic("Couldn't find enough physically contiguous memory to reserve");
+                }
+            }
+
+            // Mark the reserved block as used. It's up to the caller
+            // to administer its use.
+            MarkRangeUsed(reservedPtr.Value, reserveSize);
+
+            CheckConsistency();
+
+            DebugStub.WriteLine("PhysicalPages initialized with {0} physical pages available.",
+                                __arglist(GetFreePageCount()));
+            return reservedPtr;
+        }
+
+        // Allocate a single hardware page
+        internal unsafe static PhysicalAddress AllocPage()
+        {
+            bool iflag = Lock();
+
+            try {
+                CheckConsistency();
+
+                if (freeList != PageBlock.Sentinel) {
+                    uint blockIdx = freeList;
+                    DebugStub.Assert(GetBlock(blockIdx)->IsLinked(freeList));
+                    uint freePage = GetBlock(blockIdx)->FirstFreePage();
+                    MarkPageInBlockUsed(blockIdx, freePage);
+
+                    ulong physPage =
+                        ((ulong)blockIdx * (ulong)PageBlock.PagesPerBlock) + freePage;
+
+                    ulong physAddr = (ulong)MemoryManager.PageSize * physPage;
+
+                    return new PhysicalAddress(physAddr);
+                }
+
+                DebugStub.WriteLine("** Physical memory exhausted! **");
+                return PhysicalAddress.Null;
+            }
+            finally {
+                CheckConsistency();
+                Unlock(iflag);
+            }
+        }
+
+        // Free a single physical page
+        internal unsafe static void FreePage(PhysicalAddress addr)
+        {
+            bool iflag = Lock();
+
+            try {
+                CheckConsistency();
+                ulong pageNum = MemoryManager.PagesFromBytes(addr.Value);
+                uint blockIdx = (uint)(pageNum / (ulong)PageBlock.PagesPerBlock);
+                uint pageIdx = (uint)(pageNum % (ulong)PageBlock.PagesPerBlock);
+                PageBlock* thisBlock = GetBlock(blockIdx);
+                bool wasFull = thisBlock->Full;
+
+                thisBlock->MarkAsFree(pageIdx);
+
+                if (wasFull) {
+                    // This block now has a page available; put it on the
+                    // free list
+                    DebugStub.Assert(!thisBlock->IsLinked(freeList));
+                    thisBlock->Link(ref freeList);
+                }
+            }
+            finally {
+                CheckConsistency();
+                Unlock(iflag);
+            }
+        }
+
+        // Report how many pages are free
+        internal unsafe static ulong GetFreePageCount()
+        {
+            bool iflag = Lock();
+
+            try {
+                return FreePageCountFromList();
+            }
+            finally {
+                Unlock(iflag);
+            }
+        }
+
+        public static ulong GetMaxMemory()
+        {
+            return addressLimit;
+        }
+
+        public static unsafe ulong GetFreeMemory()
+        {
+            return GetFreePageCount() * MemoryManager.PageSize;
+        }
+
+        public static unsafe ulong GetUsedMemory()
+        {
+            return GetMaxMemory() - GetFreeMemory();
+        }
+
+        /////////////////////////////////////
+        // PRIVATE METHODS
+        /////////////////////////////////////
+
+        [Inline]
+        private unsafe static PageBlock* GetBlock(uint blockIdx)
+        {
+            DebugStub.Assert(blockIdx < numBlocks);
+            DebugStub.Assert(blockIdx != PageBlock.Sentinel);
+            return &(physTable[blockIdx]);
+        }
+
+        // Get the number of descriptor blocks that are necessary for
+        // a given amount of physical RAM
+        private static uint GetNumBlocks(ulong physicalRAM)
+        {
+            ulong pages = MemoryManager.PagesFromBytes(physicalRAM);
+
+            // Round up the number of blocks needed
+            ulong blocks = pages / PageBlock.PagesPerBlock;
+
+            if ((pages % PageBlock.PagesPerBlock) > 0) {
+                blocks++;
+            }
+
+            return (uint)blocks;
+        }
+
+        private static unsafe void MarkPageInBlockUsed(uint blockIdx,
+                                                       uint pageInBlock)
+        {
+            PageBlock* pBlock = GetBlock(blockIdx);
+            pBlock->MarkAsUsed(pageInBlock);
+
+            if (pBlock->Full) {
+                pBlock->Unlink(ref freeList);
+            }
+        }
+
+        private static unsafe void MarkPageUsed(ulong pageAddr)
+        {
+            // Please only give us page-aligned addresses
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr), "Hardware.MarkPageUsed: misaligned address");
+
+            ulong pageNum = MemoryManager.PagesFromBytes(pageAddr);
+            uint blockIdx = (uint)(pageNum / (ulong)PageBlock.PagesPerBlock);
+            uint pageInBlock = (uint)(pageNum % (ulong)PageBlock.PagesPerBlock);
+            MarkPageInBlockUsed(blockIdx, pageInBlock);
+        }
+
+        // Mark a range of physical memory as being used. This is only
+        // used during initialization, and so is not particularly
+        // efficient.
+        //
+        // Addresses do not have to be page-aligned, but whole pages will
+        // be marked.
+        private static unsafe void MarkRangeUsed(ulong startAddr, ulong length)
+        {
+            ulong firstPage = startAddr & ~MemoryManager.PageMask;
+            // lastPage ends up being the address of the page immediately *after*
+            // the data ends.
+            ulong lastPage = MemoryManager.PagePad(startAddr + length);
+
+            for (ulong page = firstPage; page < lastPage; page += MemoryManager.PageSize) {
+                MarkPageUsed(page);
+            }
+        }
+
+        private static unsafe ulong FindFreeBlockInSMAP(ulong startAddr, ulong requiredSpace)
+        {
+            BootInfo * bi = BootInfo.HalGetBootInfo();
+            SMAPINFO *smap = (SMAPINFO*)bi->SmapData32;
+
+            for (uint i = 0; i < bi->SmapCount; i++) {
+                if (smap[i].type == (ulong)SMAPINFO.AddressType.Free &&
+                    smap[i].addr + smap[i].size > startAddr) {
+
+                    ulong usableSize, usableStart;
+
+                    if (smap[i].addr < startAddr) {
+                        usableSize = smap[i].size - (startAddr - smap[i].addr);
+                        usableStart = startAddr;
+                    } else {
+                        usableSize = smap[i].size;
+                        usableStart = smap[i].addr;
+                    }
+
+                    if (usableSize >= requiredSpace) {
+                        return usableStart;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        private unsafe static ulong FreePageCountFromList()
+        {
+            ulong retval = 0;
+            uint freeIdx = freeList;
+
+            while (freeIdx != PageBlock.Sentinel) {
+                PageBlock* pBlock = GetBlock(freeIdx);
+                DebugStub.Assert(!pBlock->Full);
+                retval += pBlock->FreePages;
+                freeIdx = pBlock->nextIdx;
+            }
+
+            return retval;
+        }
+
+        private unsafe static void CheckConsistency()
+        {
+#if SELF_TEST
+            ulong pagesFromFreeList = FreePageCountFromList();
+            ulong pagesFromWalk = 0;
+
+            // Now walk the whole page table and count up
+            // pages that way
+            for (uint i = 0 ; i < numBlocks; i++) {
+                PageBlock* pBlock = GetBlock(i);
+                pagesFromWalk += pBlock->FreePages;
+            }
+
+            DebugStub.Assert(pagesFromWalk == pagesFromFreeList);
+#endif
+        }
+
+        private static void InitializeLock()
+        {
+#if SINGULARITY_MP
+            pagesLock = new SpinLock();
+#endif // SINGULARITY_MP
+        }
+
+        [NoStackLinkCheck]
+        private static bool Lock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            pagesLock.Acquire(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [NoStackLinkCheck]
+        private static void Unlock(bool iflag)
+        {
+#if SINGULARITY_MP
+            pagesLock.Release(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(iflag);
+        }
+
+
+        /////////////////////////////////////
+        // HELPER STRUCTS
+        /////////////////////////////////////
+
+        // This is our descriptor for a range of physical
+        // pages. Each PageBlock describes a range of
+        // physical pages with a used/not-used bitmap.
+        private struct PageBlock
+        {
+            // CONSTS
+
+            // "null" value for indexes
+            internal const uint Sentinel = uint.MaxValue;
+            private const uint RegionsPerBlock = 29;
+            internal const uint PagesPerBlock = RegionsPerBlock * 32;
+            private const uint FullRegion = uint.MaxValue;
+            private const uint BlockMapMask = 0x1FFFFFFF; // 29 bits
+            private const uint FullMap = BlockMapMask;
+            private const uint UnusedMask = 0xE0000000;
+
+            // ------------------------------ struct fields
+            internal unsafe uint prevIdx; // 4 bytes
+            internal unsafe uint nextIdx; // +4 bytes = 8bytes
+
+            // The PageBlock has a mini-tree structure:
+            // this first word is a bitmap indicating
+            // the availability of 29 subregions.
+
+            // The bit for a subregion is SET if it is
+            // *completely full*, and CLEAR otherwise.
+            // The top 3 bits are kept SET.
+            internal uint blockMap;       // +4 bytes = 12 bytes
+
+            // Each region has 4 bytes, making PageBlock
+            // 128 bytes in size all together. Each region
+            // describes 32 pages, one per bit. Each bit
+            // is SET if the page is in use, and CLEAR
+            // if it is free.
+
+            // Due to C# madness, here are some dummy
+            // variables to block out the space.
+            uint  i1;                    // +4 bytes = 16bytes
+            ulong l1, l2, l3, l4, l5,
+                  l6, l7, l8, l9, l10,
+                  l11, l12, l13, l14;    // +112 bytes = 128bytes
+
+            // ------------------------------
+
+            internal void Initialize()
+            {
+                prevIdx = nextIdx = Sentinel;
+                blockMap = 0;
+                l1 = l2 = l3 = l4 = l5 =
+                    l6 = l7 = l8 = l9 = l10 =
+                    l11 = l12 = l13 = l14 = 0;
+                i1 = 0;
+                CheckConsistency();
+            }
+
+            internal unsafe void Unlink(ref uint listHead)
+            {
+                DebugStub.Assert(IsLinked(listHead));
+
+                if (prevIdx != Sentinel) {
+                    DebugStub.Assert(GetBlock(prevIdx)->nextIdx == Index, "PhysicalPages.PageBlock.Unlink: inconsistent prev->next");
+                    GetBlock(prevIdx)->nextIdx = nextIdx;
+                } else {
+                    // We are the list head.
+                    DebugStub.Assert(listHead == Index, "PhysicalPages.PageBlock.Unlink: inconsistent head");
+                    listHead = nextIdx;
+                }
+
+                if (nextIdx != Sentinel) {
+                    DebugStub.Assert(GetBlock(nextIdx)->prevIdx == Index, "PhysicalPages.PageBlock.Unlink: inconsistent next->prev");
+                    GetBlock(nextIdx)->prevIdx = prevIdx;
+                }
+
+                nextIdx = Sentinel;
+                prevIdx = Sentinel;
+            }
+
+            internal unsafe void Link(ref uint listHead)
+            {
+                DebugStub.Assert(!IsLinked(listHead));
+
+                if (listHead != Sentinel) {
+                    DebugStub.Assert(GetBlock(listHead)->prevIdx == Sentinel, "PhysicalPages.PageBlock.Link: Inconsistent head-entry prev link");
+                    GetBlock(listHead)->prevIdx = Index;
+                }
+
+                nextIdx = listHead;
+                listHead = Index;
+                prevIdx = Sentinel;
+            }
+
+            internal unsafe bool PageInUse(uint pageIdx)
+            {
+                CheckConsistency();
+                DebugStub.Assert(pageIdx < PagesPerBlock, "PhysicalPages.PageBlock.PageInUse: Bad page index");
+
+                fixed ( uint* pBeforeRegions = &blockMap ) {
+                    uint* pRegions = pBeforeRegions; // Point just before regions
+                    pRegions++; // Advance to the first region word
+                    uint regionIdx = pageIdx / 32;
+                    uint bitIdx = pageIdx % 32;
+                    return ((pRegions[regionIdx] & (1 << (int)bitIdx)) != 0);
+                }
+            }
+
+            [Inline]
+            internal unsafe bool RegionFull(uint regionIdx)
+            {
+                DebugStub.Assert(regionIdx < RegionsPerBlock, "PhysicalPages.PageBlock.RegionFull: Bad region index");
+                return ((blockMap & (1 << (int)regionIdx)) != 0);
+            }
+
+            // pageIdx specifies a page within this block
+            // (zero is the first, PagesPerBlock-1 is the last)
+            internal unsafe void MarkAsUsed(uint pageIdx)
+            {
+                CheckConsistency();
+
+                fixed( uint *pBeforeRegions = &blockMap ) {
+                    uint* pRegions = pBeforeRegions; // Point just before regions
+                    pRegions++; // Advance to the first region word
+                    uint regionIdx = pageIdx / 32;
+                    uint bitIdx = pageIdx % 32;
+
+                    DebugStub.Assert(pageIdx < PagesPerBlock, "PhysicalPages.PageBlock.MarkAsUsed: Bad page index");
+                    DebugStub.Assert(!PageInUse(pageIdx), "PhysicalPages.PageBlock.MarkAsUsed: Page already in use");
+                    DebugStub.Assert(!RegionFull(regionIdx), "PhysicalPages.PageBlock.MarkAsUsed: Region already full");
+
+                    // Mark the page used in its subregion
+                    pRegions[regionIdx] |= ((uint)1 << (int)bitIdx);
+
+                    // If our whole subregion is full, mark the blockMap
+                    if (pRegions[regionIdx] == FullRegion) {
+                        blockMap |= ((uint)1 << (int)regionIdx);
+                    }
+                }
+
+                CheckConsistency();
+            }
+
+            internal unsafe void MarkAsFree(uint pageIdx)
+            {
+                CheckConsistency();
+
+                fixed( uint *pBeforeRegions = &blockMap ) {
+                    uint* pRegions = pBeforeRegions; // Point just before regions
+                    pRegions++; // Advance to the first region word
+                    uint regionIdx = pageIdx / 32;
+                    uint bitIdx = pageIdx % 32;
+                    DebugStub.Assert(pageIdx < PagesPerBlock, "PhysicalPages.PageBlock.MarkAsFree: Bad page index");
+                    DebugStub.Assert(PageInUse(pageIdx), "PhysicalPages.PageBlock.MarkAsFree: Page already free");
+
+                    // Mark the page free in its subregion
+                    pRegions[regionIdx] &= ~((uint)1 << (int)bitIdx);
+
+                    // Mark our subregion as being usable
+                    blockMap &= ~((uint)1 << (int)regionIdx);
+                }
+
+                CheckConsistency();
+            }
+
+            // Illegal to call this on a full block.
+            internal unsafe uint FirstFreePage()
+            {
+                DebugStub.Assert(!Full, "PhysicalPages.PageBlock.FirstFreePage: Block already full");
+
+                // Look for a clear bit in the region map
+                for (int i = 0 ; i < RegionsPerBlock; i++) {
+                    if ((blockMap & (uint)((uint)1 << i)) == 0) {
+                        // This region is available. Look
+                        // for a free page in the specific
+                        // region.
+                        fixed (uint* pBeforeRegions = &blockMap) {
+                            uint* pRegion = pBeforeRegions + i + 1;
+                            for (int j = 0; j < 32; j++) {
+                                if ((*pRegion & ((uint)1 << j)) == 0) {
+                                    // This page is free.
+                                    return ((uint)i * 32) + (uint)j;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // If we're not full, we should never get here.
+                Kernel.Panic("Inconsistency in PhysicalPages.PageBlock.FirstFreePage()");
+                return 0;
+            }
+
+            internal bool Full {
+                [Inline]
+                get {
+                    CheckConsistency();
+                    return (blockMap & BlockMapMask) == FullMap;
+                }
+            }
+
+
+            internal bool Empty {
+                [Inline]
+                 get {
+                    CheckConsistency();
+                    return (blockMap & BlockMapMask) == 0;
+                }
+            }
+
+            // Illegal to call this on a full block.
+            internal unsafe uint FreePages {
+                get {
+                    CheckConsistency();
+
+                    uint retval = 0;
+
+                    for (int i = 0 ; i < RegionsPerBlock; i++) {
+                        if ((blockMap & (uint)((uint)1 << i)) == 0) {
+                            // This region has free pages.
+                            fixed (uint* pBeforeRegions = &blockMap) {
+                                uint* pRegion = pBeforeRegions + i + 1;
+                                for (int j = 0; j < 32; j++) {
+                                    if ((*pRegion & ((uint)1 << j)) == 0) {
+                                        // This page is free.
+                                        retval++;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    return retval;
+                }
+            }
+
+            internal bool IsLinked(uint listHead) {
+                CheckConsistency();
+
+                if (prevIdx == Sentinel) {
+                    // We are the head of *some* list
+                    return listHead == Index;
+                }
+
+                if ((prevIdx != Sentinel) || (nextIdx != Sentinel)) {
+                    // We are linked into *some* list. We only
+                    // have the freeList at the moment, so for now
+                    // skip the expensive process of walking the list
+                    // to confirm we're in the right one
+                    return true;
+                }
+
+                return false;
+            }
+
+            internal unsafe uint Index {
+                [Inline]
+                get {
+                    fixed( PageBlock* pThis = &this ) {
+                        DebugStub.Assert(pThis >= physTable, "PhysicalPages.PageBlock.Index: this < physTable");
+                        DebugStub.Assert((ulong)pThis < (ulong)physTable + (ulong)tableSize, "PhysicalPages.PageBlock.Index: this > table bounds");
+                        return (uint)(pThis - physTable);
+                    }
+                }
+            }
+
+            private unsafe void CheckConsistency()
+            {
+#if SELF_TEST
+                // Top bits should be kept clear
+                DebugStub.Assert((blockMap & UnusedMask) == 0);
+
+                fixed ( uint* pBeforeRegions = &blockMap ) {
+                    uint* pRegion = pBeforeRegions;
+                    pRegion++;
+
+                    for (uint i = 0; i < RegionsPerBlock; i++, pRegion++) {
+                        if ((*pRegion) != FullRegion) {
+                            DebugStub.Assert((blockMap & ((uint)1 << (int)i)) == 0, "PhysicalPages.PageBlock.CheckConsistency: blockMap shows a free region as full");
+                        }
+                        else {
+                            DebugStub.Assert((blockMap & ((uint)1 << (int)i)) != 0, "PhysicalPages.PageBlock.CheckConsistency: blockMap shows a free region as full");
+                        }
+                    }
+                }
+#endif
+            }
+        }
+    }
+}
+
+#endif // PAGING
diff --git a/base/Kernel/Singularity/Memory/SharedHeap.cs b/base/Kernel/Singularity/Memory/SharedHeap.cs
new file mode 100644
index 0000000..1a7cf7d
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/SharedHeap.cs
@@ -0,0 +1,1724 @@
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SharedHeap.cs - Heap for memory passed between processes.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.GCs;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Memory
+{
+    // <summary>
+    // Non-garbage collected heap for memory transferred between processes.
+    //
+    // This heap supports explicit Allocate/Free operations of arbitrary sizes.
+    //
+    // An allocated region may be split into two separate regions at a later
+    // time.  The split may occur at an arbitrary position inside the original
+    // region.  These split regions may be further split.  In order to support
+    // this feature, the heap meta-data for tracking allocated regions is kept
+    // on the side, instead of directly adjacent to the allocation.
+    //
+    // Each allocated region is owned by a process.  All regions owned by a
+    // process may be quickly found and deleted upon process death.
+    //
+    // An allocated region's ownership may be transferred between owners.
+    // A region may also have multiple owners.
+    // </summary>
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class SharedHeap {
+
+        //
+        // The system always has at least one shared heap
+        //
+        private static SharedHeap kernelSharedHeap;
+
+        public static SharedHeap KernelSharedHeap {
+            get {
+                DebugStub.Assert(kernelSharedHeap != null);
+                return kernelSharedHeap;
+            }
+        }
+
+        public static SharedHeap CurrentProcessSharedHeap {
+            get {
+                return Thread.CurrentProcess.ProcessSharedHeap;
+            }
+        }
+
+#if PAGING
+        internal static unsafe void Initialize()
+        {
+            kernelSharedHeap = new SharedHeap(ProtectionDomain.DefaultDomain, MemoryManager.GetKernelRange());
+        }
+
+        // Debug-only sanity check that we are in the right protection domain.
+        protected void CheckDomain()
+        {
+            //
+            // If this assertion fails, we are not operating within
+            // correct address space. This is likely a serious problem; check
+            // to make sure the caller is properly checking that this
+            // shared heap is, in fact, mapped before trying to use it!
+            //
+            if (!parentDomain.KernelMode) {
+                DebugStub.Assert(
+                    Processor.GetCurrentAddressSpace() ==
+                    parentDomain.AddressSpace);
+            }
+        }
+#else
+        internal static void Initialize()
+        {
+            kernelSharedHeap = new SharedHeap();
+        }
+
+        protected void CheckDomain()
+        {
+            // Do nothing; there are no protection domains on a non-PAGING build
+        }
+#endif
+
+#region Small/Large Region Accounting
+        // <summary>
+        // If we can fit multiple regions of a certain size on a single page,
+        // then we consider them to be "small" regions.  Large regions get
+        // sole usage of their page(s).
+        // </summary>
+        private const uint MaxSmallRegion = MemoryManager.PageSize / 2;
+
+        // <summary>
+        // Small regions fall into various raw bucket sizes:
+        //
+        // Bucket          Raw Size                      4K page example
+        //   0    0 to round(MaxSmallRegion / 128)             16
+        //   1    prior to round(MaxSmallRegion / 64)          32
+        //   2    prior to round(MaxSmallRegion / 32)          64
+        //   3    prior to round(MaxSmallRegion / 16)         128
+        //   4    prior to round(MaxSmallRegion / 8)          256
+        //   5    prior to round(MaxSmallRegion / 4)          512
+        //   6    prior to round(MaxSmallRegion / 2)         1024
+        //   7    prior to MaxSmallRegion                    2048
+        //
+        // Where round() rounds down to UIntPtr-size boundaries.
+        // Actual space available to user is the raw size minus the
+        // size of the small region header.
+        // </summary>
+        private const byte TotalBuckets = 8;
+        private unsafe UIntPtr *freeSmallRegions;
+
+#if PAGING
+        private VirtualMemoryRange memoryRange; // where we get our pages
+        private ProtectionDomain parentDomain;
+#endif
+
+        // <summary>
+        // Given a bucket number, return the size of the regions
+        // stored in that bucket.
+        // </summary>
+        [Inline]
+        private static UIntPtr BucketSize(byte bucket)
+        {
+            DebugStub.Assert(bucket < TotalBuckets);
+
+            return (UIntPtr)(((MaxSmallRegion >> (TotalBuckets - 1)) &
+                              ~(UIntPtr.Size - 1)) << bucket);
+        }
+
+        // <summary>
+        // Given a desired size, return the number of the smallest bucket
+        // which can hold something of the desired size.
+        // </summary>
+        private static byte BucketForSize(UIntPtr size)
+        {
+            DebugStub.Assert(size <= MaxSmallRegion);
+
+            for (byte Loop = 0; Loop < TotalBuckets - 1; Loop++) {
+                if (size <= BucketSize(Loop)) {
+                    return Loop;
+                }
+            }
+
+            return TotalBuckets - 1;
+        }
+
+
+        // <summary>
+        // Header for small regions.
+        // A small region is not returned to its bucket's free list until all
+        // of its shared and split-off pieces have been freed.  The reference
+        // count tracks outstanding views into a region.
+        // </summary>
+        private struct SmallRegion {
+            internal uint referenceCount;
+        }
+
+        // <summary>
+        // Increment the reference count on a small region.
+        //
+        // BUGBUG: Only works where sizeof(UIntPtr) = sizeof(uint)
+        // Need another version of Interlocked.CompareExchange for uints.
+        //
+        // BUGBUG: Should handle ref count overflow more gracefully.
+        // </summary>
+        private static unsafe void AtomicReferenceSmallRegion(UIntPtr region)
+        {
+            uint *refCountLocation;
+            uint oldRefCount, newRefCount;
+
+            refCountLocation = &(((SmallRegion *)region)->referenceCount);
+
+            do {
+                oldRefCount = *refCountLocation;
+                DebugStub.Assert(oldRefCount != uint.MaxValue);
+                newRefCount = oldRefCount + 1;
+            } while (oldRefCount != Interlocked.CompareExchange(
+                         (UIntPtr *)refCountLocation, newRefCount,
+                         oldRefCount));
+        }
+
+        // <summary>
+        // Decrement the reference count on a small region.
+        //
+        // BUGBUG: Only works where sizeof(UIntPtr) = sizeof(uint)
+        // Need another version of Interlocked.CompareExchange for uints.
+        // </summary>
+        private static unsafe uint AtomicDereferenceSmallRegion(
+            UIntPtr region)
+        {
+            uint *refCountLocation;
+            uint oldRefCount, newRefCount;
+
+            refCountLocation = &(((SmallRegion *)region)->referenceCount);
+
+            do {
+                oldRefCount = *refCountLocation;
+                DebugStub.Assert(oldRefCount != 0);
+                newRefCount = oldRefCount - 1;
+            } while (oldRefCount != Interlocked.CompareExchange(
+                         (UIntPtr *)refCountLocation, newRefCount,
+                         oldRefCount));
+
+            return newRefCount;
+        }
+
+
+        // <summary>
+        // Masks to retrieve various interpretations of the "extra" 12 bits
+        // contained in a page descriptor.  One bit differentiates pages
+        // broken into small regions from those comprising large regions.
+        // The remainder are used to indicate the bucket (for small regions)
+        // or the reference count on the page (for large regions).
+        // </summary>
+        private const uint SmallRegionBit = 0x00008000u;
+        private const uint SmallRegionBucketMask = 0x00000ff0u;
+        private const byte SmallRegionBucketShift = 4;
+        private const uint LargeRegionReferenceMask = 0x00007ff0u;
+        private const byte LargeRegionReferenceShift = 4;
+
+        [Inline]
+        private static uint BucketToExtra(byte bucket)
+        {
+            return (uint)(SmallRegionBit |
+                          ((uint)bucket << SmallRegionBucketShift));
+        }
+
+        [Inline]
+        private static uint LargeRefToExtra(uint refCount)
+        {
+            return (uint)(refCount << LargeRegionReferenceShift);
+        }
+
+        // <summary>
+        // Increment the reference count on a large region page.
+        // Note: This method relies upon page descriptor format.
+        //
+        // BUGBUG: Only works where sizeof(UIntPtr) = sizeof(uint)
+        // Need another version of Interlocked.CompareExchange for uints.
+        //
+        // BUGBUG: Should handle ref count overflow more gracefully.
+        // </summary>
+        private unsafe void AtomicReferencePage(UIntPtr page)
+        {
+            uint *descriptorLocation;
+            uint oldDescriptor, refCount, newDescriptor;
+
+            descriptorLocation = SharedHeapPageTable + page;
+
+            do {
+                oldDescriptor = *descriptorLocation;
+                refCount = (oldDescriptor & LargeRegionReferenceMask)
+                    >> LargeRegionReferenceShift;
+                DebugStub.Assert(refCount != (LargeRegionReferenceMask >>
+                                              LargeRegionReferenceShift));
+                refCount++;
+                newDescriptor = (oldDescriptor & ~LargeRegionReferenceMask) |
+                    (refCount << LargeRegionReferenceShift);
+
+            } while (oldDescriptor != Interlocked.CompareExchange(
+                         (UIntPtr *)descriptorLocation, newDescriptor,
+                         oldDescriptor));
+        }
+
+        // <summary>
+        // Decrement the reference count on a large region page.
+        // Note: This method relies upon page descriptor format.
+        //
+        // BUGBUG: Only works where sizeof(UIntPtr) = sizeof(uint)
+        // Need another version of Interlocked.CompareExchange for uints.
+        // </summary>
+        private unsafe uint AtomicDereferencePage(UIntPtr page)
+        {
+            uint *descriptorLocation;
+            uint oldDescriptor, refCount, newDescriptor;
+
+            descriptorLocation = SharedHeapPageTable + page;
+
+            do {
+                oldDescriptor = *descriptorLocation;
+                refCount = (oldDescriptor & LargeRegionReferenceMask)
+                    >> LargeRegionReferenceShift;
+                DebugStub.Assert(refCount != 0);
+                refCount--;
+                newDescriptor = (oldDescriptor & ~LargeRegionReferenceMask) |
+                    (refCount << LargeRegionReferenceShift);
+
+            } while (oldDescriptor != Interlocked.CompareExchange(
+                         (UIntPtr *)descriptorLocation, newDescriptor,
+                         oldDescriptor));
+
+            return refCount;
+        }
+
+        // <summary>
+        // Increment the reference count(s) on the page(s) or small region.
+        // </summary>
+        private unsafe void ReferenceRegion(
+            UIntPtr start, UIntPtr size)
+        {
+            UIntPtr page;
+            uint pageDescriptor;
+
+            if (size == 0) {
+                //
+                // Zero-sized allocations aren't backed by actual memory
+                // and thus have no reference count to maintain.
+                //
+                return;
+            }
+
+            page = PageFromAddr(start);
+            pageDescriptor = *(SharedHeapPageTable + page);
+
+            if ((pageDescriptor & SmallRegionBit) == SmallRegionBit) {
+                byte bucket;
+                UIntPtr region;
+                UIntPtr regionSize;
+
+                //
+                // This is a small region.  Figure out which bucket it's from.
+                // Using the bucket size, we can find the start of the region
+                // and access the region header.
+                //
+                bucket = (byte)((pageDescriptor & SmallRegionBucketMask) >>
+                                SmallRegionBucketShift);
+                regionSize = BucketSize(bucket);
+                region = start & ~(regionSize - 1);
+
+                AtomicReferenceSmallRegion(region);
+
+            } else {
+                //
+                // This is a large region.  We need to walk all the pages
+                // it covers, and increment the reference count on each.
+                //
+                UIntPtr lastPage;
+                UIntPtr lastByteAddress;
+
+                lastByteAddress = start + size - 1;
+                lastPage = PageFromAddr(lastByteAddress);
+
+                while (page <= lastPage) {
+                    AtomicReferencePage(page);
+                    page++;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decrement the reference count(s) on the page(s) or small region.
+        /// </summary>
+        /// <returns>true if last reference to this region was freed.</returns>
+        private unsafe bool DereferenceRegion(UIntPtr start, UIntPtr size)
+        {
+            // Dereference and release underlying memory
+            return DereferenceRegion(start, size, false);
+        }
+
+        // The dontFreePages argument indicates whether to actually release
+        // memory pages back to the operating system. If the caller
+        // specifies true, it acquires ownership of the memory pages if
+        // the return address is true (indicating that no more allocation
+        // records refer to the memory)
+        private unsafe bool DereferenceRegion(UIntPtr start, UIntPtr size,
+                                              bool dontFreePages)
+        {
+            UIntPtr page;
+            uint pageDescriptor;
+            bool lastReference = true;
+
+            if (size == 0) {
+                //
+                // Zero-sized allocations aren't backed by actual memory
+                // and thus have no reference count to maintain.
+                //
+                return lastReference;
+            }
+
+            page = PageFromAddr(start);
+            pageDescriptor = *(SharedHeapPageTable + page);
+
+            if ((pageDescriptor & SmallRegionBit) == SmallRegionBit) {
+                byte bucket;
+                UIntPtr region;
+                UIntPtr regionSize;
+                uint refCount;
+
+                //
+                // This is a small region.  Figure out which bucket it's from.
+                // Using the bucket size, we can find the start of the region
+                // and access the region header.
+                //
+                bucket = (byte)((pageDescriptor & SmallRegionBucketMask) >>
+                                SmallRegionBucketShift);
+                regionSize = BucketSize(bucket);
+                region = start & ~(regionSize - 1);
+
+                refCount = AtomicDereferenceSmallRegion(region);
+                if (refCount == 0) {
+                    //
+                    // Return region to the bucket's free list.
+                    //
+                    AtomicPushFreeList(ref freeSmallRegions[bucket], region);
+                }
+                else {
+                    lastReference = false;
+                }
+
+            } else {
+                //
+                // This is a large region.  We need to walk all the pages
+                // it covers, and decrement the reference count on each.
+                // Pages no longer referenced are returned to the page manager.
+                //
+                UIntPtr lastPage;
+                UIntPtr lastByteAddress;
+
+                lastByteAddress = start + size - 1;
+                lastPage = PageFromAddr(lastByteAddress);
+
+                while (page <= lastPage) {
+
+                    if (AtomicDereferencePage(page) == 0) {
+                        UIntPtr startAddr = AddrFromPage(page);
+                        UIntPtr regionPages = 1;
+                        page++;
+
+                        while (page <= lastPage &&
+                               AtomicDereferencePage(page) == 0) {
+                            regionPages++;
+                            page++;
+                        }
+
+                        if (!dontFreePages) {
+                            FreePages(startAddr, regionPages);
+                        }
+                    }
+                    else {
+                        lastReference = false;
+                    }
+
+                    page++;
+                }
+            }
+            return lastReference;
+        }
+#endregion
+
+#region Allocation Owner Accounting
+        // <summary>
+        // Whether to use spinlocks (true) or disabling of interrupts (false)
+        // to protect the ownership lists.
+        // </summary>
+        private static bool useAllocationOwnerLocks;
+
+        // <summary>
+        // The free allocation owner descriptor list.
+        // Free descriptors are kept as unstructured memory, with the first
+        // UIntPtr bytes of each serving as the pointer to the next one.
+        // </summary>
+        private UIntPtr freeOwnerList;
+
+        //
+        // NOTE The shared heap has a concept of AllocationOwnerIds,
+        // but in our current system there is a single one of these for
+        // all data block and endpoint allocs in a given heap.
+        //
+        private AllocationOwnerId allocOwnerId;
+        private AllocationOwnerId endpointOwnerId;
+        private AllocationOwnerId endpointPeerOwnerId;
+
+        public AllocationOwnerId DataOwnerId {
+            get {
+                return allocOwnerId;
+            }
+        }
+
+        public AllocationOwnerId EndpointOwnerId {
+            get {
+                return endpointOwnerId;
+            }
+        }
+
+        public AllocationOwnerId EndpointPeerOwnerId {
+            get {
+                return endpointPeerOwnerId;
+            }
+        }
+
+        /// <summary>
+        /// Call back for iterating over all elements of an allocation list.
+        /// </summary>
+        unsafe public delegate void AllocationVisitor(Allocation* alloc);
+
+        /// <summary>
+        /// Call back for filtering elements of an allocation list.
+        /// </summary>
+        unsafe public delegate bool AllocationMatches(Allocation* alloc);
+
+        // <summary>
+        // Per-process object structure used to track allocations 'owned'
+        // by a process.  List integrity is protected by the spinlock.
+        // </summary>
+        internal struct AllocationOwner {
+            internal unsafe Allocation *sentinel;
+            private SpinLock listLock;
+            private bool lockInterrupt;
+            internal long outstandingBlocks;
+
+            internal static unsafe void Lock(AllocationOwner *owner)
+            {
+                if (useAllocationOwnerLocks) {
+                    owner->listLock.Acquire(Thread.CurrentThread);
+                } else {
+                    owner->lockInterrupt = Processor.DisableInterrupts();
+                }
+            }
+
+            internal static unsafe void Unlock(AllocationOwner *owner)
+            {
+                if (useAllocationOwnerLocks) {
+                    owner->listLock.Release(Thread.CurrentThread);
+                } else {
+                    Processor.RestoreInterrupts(owner->lockInterrupt);
+                }
+            }
+
+            internal static unsafe void ReuseOrCreateOwner(
+                SharedHeap sharedHeap,
+                out AllocationOwnerId ownerId)
+            {
+                UIntPtr descriptorAddress;
+                uint descriptorSize = (uint)sizeof(AllocationOwner);
+
+                //
+                // Attempt to get a descriptor from our free list.
+                //
+                descriptorAddress = AtomicPopFreeList(ref sharedHeap.freeOwnerList);
+
+                if (descriptorAddress == UIntPtr.Zero) {
+                    //
+                    // Free list is empty.
+                    // Allocate new page and break it up into allocation owner
+                    // descriptors.  Use first descriptor to satisfy current
+                    // request, put remainder on the free list.
+                    //
+                    UIntPtr newSpace;
+                    uint spaceRemaining;
+
+                    newSpace = sharedHeap.AllocatePages(1);
+                    descriptorAddress = newSpace;
+                    newSpace += descriptorSize;
+                    spaceRemaining = MemoryManager.PageSize - descriptorSize;
+                    while (spaceRemaining > descriptorSize) {
+                        AtomicPushFreeList(ref sharedHeap.freeOwnerList, newSpace);
+                        newSpace += descriptorSize;
+                        spaceRemaining -= descriptorSize;
+                    }
+                }
+
+                //
+                // Initialize the owner struct before handing it out.
+                //
+                Buffer.ZeroMemory((byte *)descriptorAddress, descriptorSize);
+
+                ((AllocationOwner*)descriptorAddress)->sentinel =
+                    Allocation.CreateSentinel(sharedHeap);
+                ownerId.owner = (AllocationOwner*)descriptorAddress;
+            }
+
+            ///
+            ///  Diagnostic methods
+            ///
+            public long OutstandingBlocks {
+                get { return this.outstandingBlocks; }
+            }
+
+            /// <summary>
+            /// Calls the visitor with each allocation on the list.
+            /// Important: the visitor is not allowed to keep the element!
+            /// </summary>
+            unsafe public static void Iterate(AllocationOwner* owner,
+                                              AllocationVisitor visitor)
+            {
+                Lock(owner);
+
+                Allocation* sentinel = owner->sentinel;
+                //
+                // Walk the list.
+                //
+                Allocation* current = sentinel->next;
+                while (current != sentinel) {
+                    if (Allocation.GetType(current) !=
+                        typeof(RoverType).GetSystemType().id) {
+                        visitor(current);
+                    }
+                    current = current->next;
+                }
+                Unlock(owner);
+            }
+
+            /// <summary>
+            /// Calls the visitor with each matching allocation on the list.
+            /// The matcher is not allowed to modify the list.
+            /// The visitor is allowed to modify the list (e.g. to delete
+            /// the visited element from the list), and the visitor
+            /// is called with the owner lock unacquired.  Furthermore,
+            /// the iteration releases the owner lock periodically (even
+            /// if visitor is never called) so that it doesn't monopolize
+            /// the lock.  The matcher should only return true if no other
+            /// thread can deallocate the matched element while the lock
+            /// is unheld; otherwise, the visitor will be in a race.
+            ///
+            /// To ensure that iteration is still meaningful in the face
+            /// of concurrent mutation, the iterator adds a "rover"
+            /// node to the beginning of the list, then steps the rover
+            /// one node at a time through the list until it arrives at the
+            /// end.
+            /// </summary>
+            unsafe public static void IterateMatchingForModify(
+                AllocationOwnerId ownerId,
+                AllocationMatches matches,
+                AllocationVisitor visitor)
+            {
+                const int RELEASE_PERIOD = 128; // periodically release lock
+                int releaseCount = 0;
+                Allocation roverAllocation;
+                Allocation* rover = &roverAllocation;
+                UIntPtr roverType = typeof(RoverType).GetSystemType().id;
+                Allocation.Initialize(rover, 0, 0, roverType);
+                AllocationOwner* owner = ownerId.owner;
+                Allocation.AssignOwnership(rover, ownerId);
+                Lock(owner);
+
+                Allocation* sentinel = owner->sentinel;
+                //
+                // Walk the list.
+                //
+                while (rover->next != sentinel) {
+                    releaseCount = (releaseCount + 1) % RELEASE_PERIOD;
+                    Allocation* current = rover->next;
+
+                    if (Allocation.GetType(current) != roverType
+                        && matches(current)) {
+                        Unlock(owner);
+                        visitor(current);
+                        Lock(owner);
+                    }
+                    else if (releaseCount == 0) {
+                        Unlock(owner);
+                        // TODO: pause here? (prevent lock capture effects)
+                        Lock(owner);
+                    }
+                    Allocation.MoveForward(rover);
+                }
+                Unlock(owner);
+                Allocation.RemoveOwnership(rover, ownerId);
+            }
+        }
+
+        // Used by IterateMatchingForModify
+        private struct RoverType {}
+
+        // <summary>
+        // Opaque type used to hide AllocationOwner structure
+        // from everything outside of the SharedHeap.
+        // </summary>
+        public struct AllocationOwnerId {
+            unsafe internal AllocationOwner* owner;
+
+            public void Iterate(AllocationVisitor visitor) {
+                unsafe {
+                    AllocationOwner.Iterate(owner, visitor);
+                }
+            }
+
+            public void IterateMatchingForModify(
+                AllocationMatches matches,
+                AllocationVisitor visitor) {
+                AllocationOwner.IterateMatchingForModify(
+                    this, matches, visitor);
+            }
+        }
+#endregion
+
+        // <summary>
+        // Initialize the shared heap subsystem.
+        // Note: We trust the system to initialize statics to zero.
+        // </summary>
+#if PAGING
+        internal unsafe SharedHeap(ProtectionDomain parentDomain,
+                                   VirtualMemoryRange range)
+#else
+        internal unsafe SharedHeap()
+#endif
+        {
+            useAllocationOwnerLocks = false;
+
+#if PAGING
+            this.memoryRange = range;
+            this.parentDomain = parentDomain;
+#endif
+
+            //
+            // We don't have another memory allocator handy, so we grab
+            // ourselves a page and carve it up.
+            //
+            UIntPtr newSpace = AllocatePages(1);
+            freeSmallRegions = (UIntPtr *)newSpace;
+
+            //
+            // REVIEW: Allocate doesn't currently zero-fill, so
+            // we need to initialize the free lists.
+            //
+            for (uint Loop = 0; Loop < TotalBuckets; Loop++) {
+                freeSmallRegions[Loop] = UIntPtr.Zero;
+            }
+
+            // Set up our owner IDs
+            allocOwnerId = OwnerInitialize();
+            endpointOwnerId = OwnerInitialize();
+            endpointPeerOwnerId = OwnerInitialize();
+        }
+
+        internal static void Finalize()
+        {
+            // Doesn't actually do anything.
+        }
+
+        private UIntPtr AllocatePages(UIntPtr numPages)
+        {
+            return AllocatePages(numPages, 0);
+        }
+
+#if PAGING
+        private unsafe UIntPtr AllocatePages(UIntPtr numPages, uint extra)
+        {
+            return memoryRange.Allocate(numPages, null, extra, PageType.Shared);
+        }
+
+        private unsafe void FreePages(UIntPtr addr, UIntPtr numPages)
+        {
+            memoryRange.Free(addr, numPages, null);
+        }
+
+        private unsafe uint* SharedHeapPageTable {
+            get {
+                return memoryRange.PageTable;
+            }
+        }
+
+        private unsafe UIntPtr SharedHeapPageCount {
+            get {
+                return memoryRange.PageCount;
+            }
+        }
+
+        private unsafe UIntPtr PageFromAddr(UIntPtr addr)
+        {
+            return memoryRange.PageFromAddr(addr);
+        }
+
+        private unsafe UIntPtr AddrFromPage(UIntPtr pageIdx)
+        {
+            return memoryRange.AddrFromPage(pageIdx);
+        }
+
+#else // PAGING
+        //
+        // When paging is not enabled, the (one and only) shared heap
+        // always uses general-purpose kernel memory.
+        //
+        private unsafe UIntPtr AllocatePages(UIntPtr numPages, uint extra)
+        {
+            return MemoryManager.KernelAllocate(numPages, null, extra, PageType.Shared);
+        }
+
+        private void FreePages(UIntPtr addr, UIntPtr numPages)
+        {
+            MemoryManager.KernelFree(addr, numPages, null);
+        }
+
+        private unsafe uint* SharedHeapPageTable {
+            get {
+                return MemoryManager.KernelPageTable;
+            }
+        }
+
+        private UIntPtr SharedHeapPageCount {
+            get {
+                return MemoryManager.KernelPageCount;
+            }
+        }
+
+        private UIntPtr PageFromAddr(UIntPtr addr)
+        {
+            return MemoryManager.PageFromAddr(addr);
+        }
+
+        private UIntPtr AddrFromPage(UIntPtr pageIdx)
+        {
+            return MemoryManager.AddrFromPage(pageIdx);
+        }
+
+#endif // PAGING
+
+
+        // <summary>
+        // Initialize internal per-owner data structure.
+        // Returns an opaque identifier to the owner (usually a process)
+        // for it to use whenever it calls us in the future.
+        // </summary>
+        public AllocationOwnerId OwnerInitialize()
+        {
+            AllocationOwnerId ownerId;
+            AllocationOwner.ReuseOrCreateOwner(this, out ownerId);
+            return ownerId;
+        }
+
+        //
+        // Moves a block from another shared heap into this one!
+        // The source heap must be mapped and accessible.
+        //
+        public unsafe Allocation* Move(Allocation* source,
+                                       SharedHeap sourceHeap,
+                                       AllocationOwnerId sourceOwner,
+                                       AllocationOwnerId targetOwner)
+        {
+            //
+            // Note that since both the source and destination shared heaps must
+            // be accessible, one of them must be the kernel domain's heap!
+            //
+            sourceHeap.CheckDomain();
+            this.CheckDomain();
+
+#if PAGING && (!DISABLE_PAGE_FLIPPING)
+            if (Allocation.GetSize(source) > MaxSmallRegion) {
+                // Large region. Move it by page-flipping.
+                //
+                // NOTE we currently ASSUME that the block
+                // being moved is not being shared, since the sharing
+                // feature is being deprecated.
+                UIntPtr rangeStart = (UIntPtr)Allocation.GetDataUnchecked(source);
+                UIntPtr size = Allocation.GetSize(source);
+                UIntPtr type = Allocation.GetType(source);
+                UIntPtr pagesStart = MemoryManager.PageTrunc(rangeStart);
+                UIntPtr pagesLimit = MemoryManager.PagePad(rangeStart + size);
+                UIntPtr pageCount = MemoryManager.PagesFromBytes(pagesLimit - pagesStart);
+
+                // Release the memory from the source heap.
+                bool lastFree = sourceHeap.DereferenceRegion(rangeStart, size, true /*don't free pages*/);
+                DebugStub.Assert(lastFree);
+
+                // Reserve room in our own memory range for the pages
+                UIntPtr mapPoint = this.memoryRange.Reserve(pageCount, null, LargeRefToExtra(1),
+                                                            PageType.Shared);
+
+                DebugStub.Assert(mapPoint != UIntPtr.Zero);
+
+                UIntPtr stepSource = pagesStart;
+                UIntPtr stepTarget = mapPoint;
+
+                // Map each page into our reserved area of memory
+                while (stepSource < pagesLimit) {
+                    PhysicalAddress phys = VMManager.GetPageMapping(stepSource);
+                    DebugStub.Assert(phys != PhysicalAddress.Null);
+                    VMManager.MapPage(phys, stepTarget, memoryRange.ParentDomain);
+
+                    stepSource += MemoryManager.PageSize;
+                    stepTarget += MemoryManager.PageSize;
+                }
+
+                // Unmap the pages from the source range; they're still marked as being used.
+                VMManager.UnmapRange(pagesStart, pageCount);
+
+                // Mark the pages as free. Now the source heap and range have completely
+                // forgotten about the memory.
+                sourceHeap.memoryRange.Unreserve(pagesStart, pageCount, null);
+
+                return AllocationFromRawMemory(mapPoint, size, type, targetOwner);
+
+            } else
+#endif
+            {
+                // Small region. Move it by copying.
+                Allocation* retval = ShallowCopy(source, targetOwner);
+                sourceHeap.Free(source, sourceOwner);
+                return retval;
+            }
+        }
+
+        // Creates a new allocation record and copies the contents of
+        // the provided allocation.
+        internal unsafe Allocation *ShallowCopy(Allocation* source,
+                                                AllocationOwnerId targetOwner)
+        {
+            CheckDomain();
+
+            Allocation* copy = Allocate(Allocation.GetSize(source),
+                                        Allocation.GetType(source),
+                                        0,
+                                        targetOwner);
+
+            Buffer.MoveMemory((byte*)Allocation.GetDataUnchecked(copy),
+                              (byte*)Allocation.GetDataUnchecked(source),
+                              Allocation.GetSize(source));
+
+            return copy;
+        }
+
+        // <summary>
+        // Allocate an arbitrarily-sized region of memory.
+        // TODO: Handle memory exhaustion gracefully.
+        // </summary>
+        public unsafe Allocation *Allocate(  // Returns new region.
+            UIntPtr bytes,  // Number of bytes to allocate.
+            UIntPtr type,  // Type information.
+            uint alignment,  // Allocation alignment requirement.
+            AllocationOwnerId ownerId)  // Id of owner to assign region to.
+        {
+            CheckDomain();
+            UIntPtr region;
+
+            // REVIEW: Pull out-of-bounds parameters into bounds instead?
+            DebugStub.Assert(bytes >= 0);
+
+            // TODO: deal with alignment.
+
+            //
+            // Allocate the memory region.
+            //
+            // Small regions impose an overhead of sizeof(SmallRegion),
+            // so we need to take that into account when determining
+            // whether or not we can fit the allocation into one.
+            //
+            // Zero-sized allocations are allowed, but we do not allocate
+            // a memory region for them.
+            //
+            if (bytes == 0) {
+                region = UIntPtr.Zero;
+            } else {
+                if (bytes + sizeof(SmallRegion) > MaxSmallRegion) {
+                    region = AllocateLargeRegion(bytes);
+                } else {
+                    region = AllocateSmallRegion(bytes);
+                }
+                // Allocation failed, request denied.  Should
+                // have asked sooner.
+                if (region == UIntPtr.Zero) {
+                    return null;
+                }
+            }
+
+            // TODO: deal with alignment.
+
+            return AllocationFromRawMemory(region, bytes, type, ownerId);
+        }
+
+        //
+        // Wraps a range of raw memory in a new allocation record.
+        //
+        private unsafe Allocation* AllocationFromRawMemory(
+            UIntPtr region,
+            UIntPtr bytes,
+            UIntPtr type,
+            AllocationOwnerId ownerId)
+        {
+            CheckDomain();
+
+            // Get an allocation descriptor to keep track of the region.
+            // TODO: Handle failure here.
+            Allocation* allocation = Allocation.Create(this, region, bytes, type);
+
+            //
+            // Put descriptor on per-process list.
+            //  all descriptors live on the kernel proc for now.
+            //
+            Allocation.AssignOwnership(allocation, ownerId);
+
+            // Figure out who our caller is.
+            UIntPtr pc1, pc2, pc3;
+            Processor.GetStackEips(out pc1, out pc2, out pc3);
+            Tracing.Log(Tracing.Debug, "SharedHeap.Allocate stack trace {0:x} {1:x} {2:x}",
+                        pc1, pc2, pc3);
+            Tracing.Log(Tracing.Debug, "result = {0:x}", (UIntPtr)allocation);
+
+            return allocation;
+        }
+
+        // <summary>
+        // Allocate a large region of memory out of system pages.
+        // </summary>
+        private unsafe UIntPtr AllocateLargeRegion(  // Returns new region.
+            UIntPtr bytes)  // Number of bytes to allocate.
+        {
+            UIntPtr region;
+
+            //
+            // For large allocations, we just get pages from the system.
+            // REVIEW: We round up to a pagesize to keep Allocate happy.
+            // Note: Current implementation of Allocate can block.
+            //
+            bytes = MemoryManager.PagePad(bytes);
+            region = AllocatePages(MemoryManager.PagesFromBytes(bytes), LargeRefToExtra(1));
+
+            //
+            // Zero-fill the region before handing it off.
+            //
+            if (region != UIntPtr.Zero) {
+                Buffer.ZeroMemory((byte *)region, bytes);
+            }
+
+            return region;
+        }
+
+        // <summary>
+        // Allocate a small region of memory out of a heap page.
+        // </summary>
+        private unsafe UIntPtr AllocateSmallRegion(
+            UIntPtr bytes)  // Number of bytes to allocate.
+        {
+            byte bucket;
+            UIntPtr region;
+
+            //
+            // We allocate the region from the bucket which contains the
+            // smallest sized regions which will satisfy the request.
+            // And we initialize the region's reference count to 1.
+            //
+            bucket = BucketForSize(bytes + sizeof(SmallRegion));
+            region = AtomicPopFreeList(ref freeSmallRegions[bucket]);
+            if (region == UIntPtr.Zero) {
+                //
+                // Free list is empty.
+                // Allocate new page and break it up into small regions
+                // of this bucket's size.  Use first descriptor to satisfy
+                // current request, put remainder on the free list.
+                //
+                UIntPtr newSpace;
+                UIntPtr spaceRemaining;
+                UIntPtr regionSize;
+
+                newSpace = AllocatePages(1, BucketToExtra(bucket));
+
+                if (newSpace == UIntPtr.Zero) {
+                    return UIntPtr.Zero;
+                }
+
+                regionSize = BucketSize(bucket);
+                region = newSpace;
+                newSpace += regionSize;
+                spaceRemaining = MemoryManager.PageSize - regionSize;
+                while (spaceRemaining > regionSize) {
+                    AtomicPushFreeList(ref freeSmallRegions[bucket], newSpace);
+                    newSpace += regionSize;
+                    spaceRemaining -= regionSize;
+                }
+            }
+
+            //
+            // Set reference count on the region.
+            //
+            unsafe {
+                ((SmallRegion *)region)->referenceCount = 1;
+                region += sizeof(SmallRegion);
+            }
+
+            //
+            // Zero-fill the region before handing it off.
+            //
+            Buffer.ZeroMemory((byte *)region, bytes);
+
+            return region;
+        }
+
+
+        /// <summary>
+        /// Free a previously-allocated region of memory.
+        /// </summary>
+        /// <returns>true if Free releases last reference to underlying memory</returns>
+        public unsafe bool Free(
+            Allocation *allocation,  // Allocated region to be freed.
+            AllocationOwnerId ownerId)  // Current owner of allocation.
+        {
+            CheckDomain();
+            DebugStub.Assert(Validate(allocation));
+            //
+            // Remove from owning process's allocation list.
+            //
+            Allocation.RemoveOwnership(allocation, ownerId);
+
+            //
+            // Release our allocation's claim on the underlying region.
+            //
+            bool freed = DereferenceRegion(Allocation.GetDataUnchecked(allocation),
+                                           Allocation.GetSize(allocation));
+
+            //
+            // Free our allocation descriptor.
+            //
+            AtomicPushFreeList(ref freeAllocationList, (UIntPtr)allocation);
+
+            //
+            // Tell caller whether last reference was freed
+            //
+            return freed;
+        }
+
+        // <summary>
+        // Free all of a given owner's allocated regions.
+        // </summary>
+        public unsafe void FreeAll(
+            AllocationOwnerId ownerId)
+        {
+            CheckDomain();
+
+            Allocation *first;
+            Allocation *current;
+            AllocationOwner *owner = ownerId.owner;
+
+            //
+            // REVIEW: Do we need this lock?  This should be the last code
+            // for this process to ever call the SharedHeap.
+            //
+            AllocationOwner.Lock(owner);
+
+            //
+            // The FreeAll for a process is called by a kernel service
+            // thread and not by the process itself.
+            // Thus we use unchecked access to the data, since the process
+            // id's won't match
+            //
+            first = owner->sentinel;
+            current = Allocation.Next(first);
+            while(current != first) {
+                Allocation *victim = current;
+                current = Allocation.Next(current);
+                DereferenceRegion(Allocation.GetDataUnchecked(victim),
+                                  Allocation.GetSize(victim));
+                AtomicPushFreeList(ref freeAllocationList, (UIntPtr)victim);
+            }
+
+            DereferenceRegion(Allocation.GetDataUnchecked(first),
+                              Allocation.GetSize(first));
+            AtomicPushFreeList(ref freeAllocationList, (UIntPtr)first);
+            owner->sentinel = null;
+
+            AllocationOwner.Unlock(owner);
+
+            //
+            // Free our owner descriptor.
+            //
+            AtomicPushFreeList(ref freeOwnerList, (UIntPtr)ownerId.owner);
+        }
+
+        // <summary>
+        // Create a second access handle for a previously allocated region.
+        //
+        // Sharing of a zero-sized region is tolerated, although weird.
+        // </summary>
+        public unsafe Allocation *Share(  // Returns new handle.
+            Allocation *existing,  // Allocated region to share.
+            AllocationOwnerId ownerId,  // Owner of above region.
+            UIntPtr startOffset,  // Offset at which shared copy starts.
+            UIntPtr endOffset)  // Offset at which shared copy ends.
+        {
+            CheckDomain();
+
+            DebugStub.Assert(Validate(existing));
+            Allocation *copy;
+            UIntPtr size;
+
+            size = Allocation.GetSize(existing);
+
+            //
+            // We don't handle nonsensical parameters.
+            // REVIEW: Pull out-of-bounds parameters into bounds instead?
+            //
+            DebugStub.Assert(startOffset <= size && endOffset >= startOffset &&
+                             endOffset <= size);
+
+            //
+            // Create a new descriptor for the allocation with (potentially
+            // a subset of) the same data and size as the original.
+            //
+            copy = Allocation.Create(
+                this,
+                Allocation.GetData(existing) + startOffset,
+                endOffset - startOffset,
+                Allocation.GetType(existing),
+                Allocation.GetOwnerProcessId(existing));
+
+            //
+            // Increment the reference count on affected region/page(s).
+            //
+            ReferenceRegion(Allocation.GetData(copy),
+                            Allocation.GetSize(copy));
+
+            //
+            // Put new descriptor on owning process's list.
+            //
+            Allocation.AssignOwnership(copy, ownerId);
+
+            return copy;
+        }
+
+        // <summary>
+        // Truncate an allocation to a length.
+        // </summary>
+        public unsafe void Truncate(Allocation *allocation,
+                                    UIntPtr     newSize)
+        {
+            DebugStub.Assert(Validate(allocation));
+            UIntPtr size = Allocation.GetSize(allocation);
+            DebugStub.Assert(newSize >= 0 && newSize <= size);
+            Allocation.TruncateTo(allocation, newSize);
+        }
+
+        // <summary>
+        // Split a previously allocated region into two smaller regions.
+        // The original region is shrunk by the size of the carved-off
+        // second region.
+        //
+        // Splitting off a zero-sized region is tolerated, although weird.
+        // </summary>
+        public unsafe Allocation *Split(  // Returns latter region.
+            Allocation *existing,  // Region to split.
+            AllocationOwnerId ownerId,  // Owner of above region.
+            UIntPtr offset)  // Offset at which latter region starts.
+        {
+            CheckDomain();
+
+            DebugStub.Assert(Validate(existing));
+            Allocation *copy;
+            UIntPtr size;
+            UIntPtr splitPoint;
+
+            size = Allocation.GetSize(existing);
+
+            //
+            // We don't handle nonsensical parameters.
+            // REVIEW: Pull out-of-bounds parameters into bounds instead?
+            //
+            DebugStub.Assert(offset >= 0 && offset <= size);
+
+            //
+            // Create a new descriptor for the allocation using a suffix
+            // of the original data.
+            //
+            splitPoint = Allocation.GetData(existing) + offset;
+            copy = Allocation.Create(
+                this,
+                splitPoint,
+                size - offset,
+                Allocation.GetType(existing));
+
+            Allocation.TruncateTo(existing, offset);
+
+            //
+            // Increment the reference count on any small region or
+            // page which ends up getting shared as a result of this split.
+            // (Note that any zero-sized allocations created as a result of
+            // this split don't share any memory with other allocations)
+            //
+            // In other words, unless one of the resulting allocations is
+            // zero-sized, or the split point occurs at a page boundary,
+            // increment the ref count on the page or small region the
+            // split occurs in.
+            //
+            if ((offset != 0) && (offset != size) &&
+                (splitPoint != (splitPoint & ~(MemoryManager.PageSize - 1))))
+            {
+                ReferenceRegion(splitPoint, 1);
+            }
+
+            //
+            // Put new descriptor on owning process's list.
+            //
+            Allocation.AssignOwnership(copy, ownerId);
+
+            return copy;
+        }
+
+
+        // <summary>
+        // Transfer ownership of an allocated region from one process
+        // to another.
+        // </summary>
+        public static unsafe void TransferOwnership(
+            Allocation *allocation,
+            AllocationOwnerId oldOwnerId,
+            AllocationOwnerId newOwnerId)
+        {
+            Allocation.RemoveOwnership(allocation, oldOwnerId);
+            Allocation.AssignOwnership(allocation, newOwnerId);
+        }
+
+        // Returns true if a provided allocation record appears to be
+        // a valid record in our heap.
+        public unsafe bool Validate(Allocation *allocation)
+        {
+#if PAGING
+            CheckDomain();
+
+            UIntPtr pData = (UIntPtr)allocation;
+
+            if (pData != UIntPtr.Zero) {
+                if ((pData < memoryRange.DataStartAddr) ||
+                    (pData >= memoryRange.DataLimitAddr)) {
+                    // This can't be a pointer into our heap;
+                    // it's outside the range of pages we use
+                    return false;
+                }
+
+                UIntPtr dataPage = MemoryManager.PageAlign(pData);
+                if (!VMManager.IsPageMapped(dataPage)) {
+                    // It would not be a good idea to try to
+                    // use this pointer
+                    return false;
+                }
+            }
+#endif
+
+            return true;
+        }
+
+        // <summary>
+        // The free allocation descriptor list.
+        // Free descriptors are kept as unstructured memory, with the first
+        // UIntPtr bytes of each serving as the pointer to the next one.
+        // </summary>
+        internal UIntPtr freeAllocationList;
+
+        // <summary>
+        // Structure for tracking allocated regions.
+        // </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Allocation {
+            private UIntPtr data;  // Address of the allocated memory region.
+            private UIntPtr size;  // Size of above in bytes.
+            private unsafe UIntPtr type;  // Type information.
+            internal unsafe Allocation *next;  // Next on owner's list.
+            private unsafe Allocation *prev;  // Previous on owner's list.
+            private int owner;
+
+            [Conditional("DEBUG")]
+            [NoHeapAllocation]
+            private static unsafe void AssertCorrectOwner(Allocation* allocation)
+            {
+                /*
+                if (Thread.CurrentProcess.ProcessId != allocation->owner) {
+                    DebugStub.Break();
+                }
+                */
+            }
+
+            [NoHeapAllocation]
+            public static unsafe UIntPtr GetData(Allocation *allocation)
+            {
+                AssertCorrectOwner(allocation);
+                return allocation->data;
+            }
+
+            /// <summary>
+            /// Only to be used from
+            ///  - TransferToProcess
+            ///  - Freeing the Sentinel on FreeAll
+            ///  - SharedHeap walker
+            ///
+            /// All other uses should be checked.
+            /// </summary>
+            [NoHeapAllocation]
+            public static unsafe UIntPtr GetDataUnchecked(Allocation *allocation)
+            {
+                return allocation->data;
+            }
+
+            [NoHeapAllocation]
+            public static unsafe UIntPtr GetSize(Allocation *allocation)
+            {
+                return allocation->size;
+            }
+
+            [NoHeapAllocation]
+            public static unsafe UIntPtr GetType(Allocation *allocation)
+            {
+                return allocation->type;
+            }
+
+            [NoHeapAllocation]
+            public static unsafe int GetOwnerProcessId(Allocation *allocation)
+            {
+                return allocation->owner;
+            }
+
+            [NoHeapAllocation]
+            internal static unsafe Allocation *Next(Allocation *allocation)
+            {
+                return allocation->next;
+            }
+
+            [NoHeapAllocation]
+            internal static unsafe void SetType(Allocation *allocation, UIntPtr type)
+            {
+                allocation->type = type;
+            }
+
+            internal static unsafe void SetOwnerProcessId(Allocation *allocation,
+                                                          int processId)
+            {
+                unchecked{
+                Tracing.Log(Tracing.Debug, "SetOwnerProcessId old:{0} new:{1} who:{2}",
+                            (UIntPtr)allocation->owner,
+                            (UIntPtr)processId,
+                            (UIntPtr)Thread.CurrentProcess.ProcessId);
+                }
+                // Figure out who our caller is.
+                /*
+                UIntPtr[] stack = new UIntPtr[15];
+                Processor.GetStackEips(stack);
+                for(int i=0; i<stack.Length; i++) {
+                    UIntPtr eip = stack[i];
+                    if (eip == UIntPtr.Zero) break;
+                    Tracing.Log(Tracing.Debug, "SetOwnerProcessId stack trace {0:x}", eip);
+                }
+                */
+                allocation->owner = processId;
+            }
+
+            // <summary>
+            // Move the allocation one element forward in the list.
+            // requires owner lock held.
+            // </summary>
+            internal static unsafe void MoveForward(Allocation *allocation)
+            {
+                Allocation *next = allocation->next;
+                Allocation *prev = allocation->prev;
+                if (next == allocation) return; // only one element; can't move
+                // remove allocation from list
+                prev->next = next;
+                next->prev = prev;
+                // insert allocation into next location in list
+                Allocation *nextnext = next->next;
+                next->next = allocation;
+                allocation->prev = next;
+                allocation->next = nextnext;
+                nextnext->prev = allocation;
+            }
+
+            // <summary>
+            // Allocate an allocation tracking descriptor.
+            // </summary>
+            internal static unsafe Allocation *Create(SharedHeap sharedHeap,
+                UIntPtr address, UIntPtr size, UIntPtr type)
+            {
+                Allocation *allocation = ReuseOrCreateAllocation(sharedHeap);
+                Initialize(allocation, address, size, type);
+                DebugStub.Assert(sharedHeap.Validate(allocation));
+                return allocation;
+            }
+
+            internal static unsafe Allocation *Create(SharedHeap sharedHeap,
+                UIntPtr address, UIntPtr size, UIntPtr type, int ownerprocessId)
+            {
+                Allocation* result = Create(sharedHeap, address, size, type);
+                result->owner = ownerprocessId;
+                return result;
+            }
+
+            // <summary>
+            // Allocate an allocation tracking descriptor.
+            // </summary>
+            internal static unsafe Allocation *CreateSentinel(SharedHeap sharedHeap)
+            {
+                Allocation *allocation = ReuseOrCreateAllocation(sharedHeap);
+                allocation->data = 0;
+                allocation->size = 0;
+                allocation->type = 0;
+                allocation->next = allocation;
+                allocation->prev = allocation;
+                allocation->owner = 0;
+                return allocation;
+            }
+
+            // <summary>
+            // Allocate an allocation tracking descriptor.
+            // </summary>
+            internal static unsafe Allocation *Initialize(
+                Allocation* allocation,
+                UIntPtr address, UIntPtr size, UIntPtr type)
+            {
+                allocation->data = address;
+                allocation->size = size;
+                allocation->type = type;
+                allocation->next = allocation;
+                allocation->prev = allocation;
+
+                allocation->owner = Thread.CurrentProcess.ProcessId;
+
+                return allocation;
+            }
+
+            // <summary>
+            // Truncate an existing allocation at a given offset.
+            // Note that this merely affects the reported size, the entire
+            // region remains allocated, etc.
+            // </summary>
+            internal static unsafe void TruncateTo(Allocation *allocation,
+                                                   UIntPtr offset)
+            {
+                allocation->size = offset;
+            }
+
+            // <summary>
+            // Assign ownership of an allocated region to a process.
+            // Note: this operation can block.
+            // </summary>
+            internal static unsafe void AssignOwnership(
+                Allocation *allocation,
+                AllocationOwnerId ownerId)
+            {
+                AllocationOwner *owner = ownerId.owner;
+
+#if PAGING
+                // Sanity: we shouldn't be putting user blocks onto
+                // the kernel's shared heap lists, and vice versa.
+                if ((UIntPtr)owner >= BootInfo.KERNEL_BOUNDARY) {
+                    DebugStub.Assert((UIntPtr)allocation >= BootInfo.KERNEL_BOUNDARY);
+                } else {
+                    DebugStub.Assert((UIntPtr)allocation < BootInfo.KERNEL_BOUNDARY);
+                }
+#endif
+                AllocationOwner.Lock(owner);
+
+                //
+                // Put allocation at beginning of owner's list.
+                //
+                allocation->next = owner->sentinel->next;
+                allocation->prev = owner->sentinel;
+                allocation->next->prev = allocation;
+                owner->sentinel->next = allocation;
+                owner->outstandingBlocks++;
+                AllocationOwner.Unlock(owner);
+            }
+
+            // <summary>
+            // Remove ownership of an allocated region from a process.
+            // </summary>
+            internal static unsafe void RemoveOwnership(
+                Allocation *allocation,
+                AllocationOwnerId ownerId)
+            {
+                AllocationOwner *owner = ownerId.owner;
+
+                AllocationOwner.Lock(owner);
+
+                //
+                // Remove allocation from owner's list.
+                //
+                allocation->next->prev = allocation->prev;
+                allocation->prev->next = allocation->next;
+
+                owner->outstandingBlocks--;
+                AllocationOwner.Unlock(owner);
+
+                //
+                // Sanitize this element.
+                //
+                allocation->next = allocation->prev = null;
+            }
+
+            private static unsafe Allocation *ReuseOrCreateAllocation(SharedHeap sharedHeap)
+            {
+                sharedHeap.CheckDomain();
+                UIntPtr descriptorAddress;
+
+                //
+                // Attempt to get a descriptor from our free list.
+                //
+                descriptorAddress = AtomicPopFreeList(ref sharedHeap.freeAllocationList);
+
+                if (descriptorAddress == UIntPtr.Zero) {
+                    //
+                    // Free list is empty.
+                    // Allocate new page and break it up into allocation
+                    // descriptors.  Use first descriptor to satisfy current
+                    // request, put remainder on the free list.
+                    //
+                    UIntPtr newSpace;
+                    uint spaceRemaining;
+                    uint descriptorSize;
+
+                    newSpace = sharedHeap.AllocatePages(1);
+                    descriptorSize = (uint)sizeof(Allocation);
+
+                    descriptorAddress = newSpace;
+                    newSpace += descriptorSize;
+                    spaceRemaining = MemoryManager.PageSize - descriptorSize;
+                    while (spaceRemaining > descriptorSize) {
+                        AtomicPushFreeList(ref sharedHeap.freeAllocationList, newSpace);
+                        newSpace += descriptorSize;
+                        spaceRemaining -= descriptorSize;
+                    }
+                }
+
+                //
+                // Turn this chunk of memory into an Allocation.
+                //
+                return (Allocation *)descriptorAddress;
+            }
+        }
+
+
+        // <summary>
+        // Pop an unstructured memory region off a singly-linked list.
+        // The unstructured memory is expected to hold the address of the
+        // next element on the list in its first UIntPtr.
+        //
+        // Note: requires that the passed-in list head be in a fixed
+        // location in memory.
+        // </summary>
+        internal static unsafe UIntPtr AtomicPopFreeList(  // Returns address.
+            ref UIntPtr head)  // List head.
+        {
+            UIntPtr firstElementLocation;
+            UIntPtr secondElementLocation;
+
+            do {
+                //
+                // Cache the contents of head pointer location (i.e. the
+                // address of the first element on the list).
+                //
+                firstElementLocation = head;
+
+                if (firstElementLocation == UIntPtr.Zero) {
+                    //
+                    // No first element.  List is empty.
+                    //
+                    return UIntPtr.Zero;
+                }
+
+                //
+                // The first element contains the address of the second.
+                //
+                secondElementLocation = *(UIntPtr *)firstElementLocation;
+
+                //
+                // Called this way, Interlocked.CompareExchange will only
+                // replace the contents of the head pointer location with
+                // the address of the second element if the contents of the
+                // the head pointer location (i.e. the first element's address)
+                // hasn't changed since we cached it.  If the contents of
+                // the head pointer have changed in the meantime, it means
+                // some other thread has popped that element off the stack.
+                // So we loop back and try it all over again.
+                //
+
+            } while(firstElementLocation != Interlocked.CompareExchange(
+                        ref head, secondElementLocation,
+                        firstElementLocation));
+
+            //
+            // We successfully popped an element off the list.
+            // Sanitize it before returning it.
+            //
+            *(UIntPtr *)firstElementLocation = UIntPtr.Zero;
+            return firstElementLocation;
+        }
+
+
+        // <summary>
+        // Push an unstructured memory region onto a singly-linked list.
+        // The unstructured memory must be large enough to hold the address
+        // of the next element on the list in its first UIntPtr.
+        //
+        // Note: requires that the passed-in list head be in a fixed
+        // location in memory.
+        // </summary>
+        internal static unsafe void AtomicPushFreeList(  // Returns address.
+            ref UIntPtr head,  // List head.
+            UIntPtr newElementLocation)  // Address of element to add to list.
+        {
+            UIntPtr firstElementLocation;
+
+            do {
+                //
+                // Cache the contents of head pointer location (i.e. the
+                // address of the first element on the list).
+                //
+                firstElementLocation = head;
+
+                //
+                // Put the address of the current first element into
+                // our new first element.
+                //
+                *(UIntPtr *)newElementLocation = firstElementLocation;
+
+                //
+                // Called this way, Interlocked.CompareExchange will only swap
+                // the contents of the head pointer with that of the new first
+                // element's pointer if the contents of the head pointer
+                // haven't changed since we cached it.  If the contents of
+                // the head pointer have changed in the meantime, it means
+                // some other thread has popped that element off the stack.
+                // So we loop back and try it all over again.
+                //
+
+            } while(firstElementLocation != Interlocked.CompareExchange(
+                        ref head, newElementLocation,
+                        firstElementLocation));
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/Stacks.cs b/base/Kernel/Singularity/Memory/Stacks.cs
new file mode 100644
index 0000000..b30a2e7
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/Stacks.cs
@@ -0,0 +1,988 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Stacks.cs - Primitive stack segment manager
+//
+//  Note:
+//
+
+//#define TEST_STACK_LINKING
+//#define DEBUG_STACK_VERBOSE
+#define NO_TRACE_STACKS
+
+namespace Microsoft.Singularity.Memory
+{
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+    using System.GCs;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.X86;
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    [RequiredByBartok]
+    internal class Stacks
+    {
+        // This constant gives a reasonable size for an initial stack
+        // chunk, leaving room for the metadata that will be added to
+        // the top of the stack (sizeof(StackHead)).
+        internal const int InitialStackSize = 0x1f00;
+
+        [AccessedByRuntime("referenced from halstack.asm")]
+        internal static int GetCount;
+        internal static int ReturnCount;
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct StackHead
+        {
+            internal UIntPtr    prevBegin;
+            internal UIntPtr    prevLimit;
+            internal UIntPtr    esp;
+        };
+
+        internal static unsafe void Initialize()
+        {
+            Tracing.Log(Tracing.Debug, "Stacks.Initialize() called");
+
+            GetCount = 0;
+            ReturnCount = 0;
+        }
+
+        internal static unsafe void Finalize()
+        {
+            unchecked {
+                Tracing.Log(Tracing.Debug, "Stacks.Finalize()  GetStackSegment called {0} times.",
+                            (UIntPtr)(uint)GetCount);
+            }
+            PrintCounts();
+        }
+
+        internal static void PrintCounts()
+        {
+            unchecked {
+                Tracing.Log(Tracing.Debug, "Segments: {1} links, {2} outstanding",
+                            (UIntPtr)(uint)GetCount,
+                            (UIntPtr)(uint)(GetCount - ReturnCount));
+            }
+        }
+
+        [AccessedByRuntime("referenced from halstack.asm")]
+        [NoStackLinkCheck]
+        internal static unsafe UIntPtr GetStackSegment(UIntPtr size,
+                                                       ref ThreadContext context)
+        {
+            return GetStackSegment(size, ref context, false);
+        }
+
+        [NoStackLinkCheck]
+        internal static unsafe UIntPtr GetInitialStackSegment(ref ThreadContext context)
+        {
+            // The first stack segment is always in kernel memory
+            return GetStackSegment(0, ref context, true);
+        }
+
+        [NoStackLinkCheck]
+        internal static unsafe UIntPtr GetStackSegment(UIntPtr size,
+                                                       ref ThreadContext context,
+                                                       bool forceToKernel)
+        {
+            UIntPtr begin = context.stackBegin;
+            UIntPtr limit = context.stackLimit;
+#if NO_TRACE_STACKS
+#else
+            Kernel.Waypoint(666);
+#endif
+            StackHead *head = GetStackSegmentRaw(size, ref context, forceToKernel);
+            if (head != null) {
+                head->prevBegin = begin;
+                head->prevLimit = limit;
+                head->esp = 0;
+            }
+            return (UIntPtr)head;
+        }
+
+        [NoStackLinkCheck]
+        internal static unsafe StackHead * GetStackSegmentRaw(UIntPtr size,
+                                                              ref ThreadContext context,
+                                                              bool forceToKernel)
+        {
+            // Allocate a new chunk, making room for StackHead at the top.
+            // If you change these constants to add more data, see the
+            // comment about InitialStackSize at the top of this file!
+#if NO_TRACE_STACKS
+#else
+            Kernel.Waypoint(667);
+#endif
+            if (size == UIntPtr.Zero) {
+                size = InitialStackSize;
+            }
+            size = MemoryManager.PagePad(size + sizeof(StackHead));
+
+            UIntPtr chunk;
+
+
+            Process owner = Process.GetProcessByID(context.processId);
+            /*
+              // NOTE here's where we should be clever about
+              // whether to allocate a stack chunk in the user range
+              // or the kernel range. Except, if we switch contexts
+              // during an ABI call while using a user-range stack
+              // segment on a paging machine, we die. Gloss over
+              // this hackily by always getting stack segments
+              // from the kernel range.
+            if (forceToKernel || (owner == Process.kernelProcess)) {
+                chunk = MemoryManager.KernelAllocate(
+                    MemoryManager.PagesFromBytes(size), owner, 0, PageType.Stack);
+            } else {
+                chunk = MemoryManager.UserAllocate(
+                    MemoryManager.PagesFromBytes(size), owner, 0, PageType.Stack);
+            }
+            */
+
+            chunk = MemoryManager.KernelAllocate(
+                MemoryManager.PagesFromBytes(size), owner, 0, PageType.Stack);
+
+            if (chunk != UIntPtr.Zero) {
+                // NB: We do _not_ zero out stack memory!
+                // We assume that Bartok prevents access to prev contents.
+                StackHead *head = (StackHead *)(chunk + size - sizeof(StackHead));
+
+                context.stackBegin = chunk + size;
+                context.stackLimit = chunk;
+
+#if DEBUG_STACK_VERBOSE
+                Tracing.Log(Tracing.Debug, "GetStackSegmentRaw(size={0:d}) -> [{1,8:x}..{2,8:x}",
+                            size, context.stackLimit, context.stackBegin);
+#endif
+                GetCount++;
+
+                return head;
+            }
+            else {
+                // Stack allocation failed.  In the future, we should
+                // trigger a kernel exception; for now, we break to the
+                // debugger.
+                DebugStub.Break();
+                return null;
+            }
+        }
+
+        [AccessedByRuntime("reference from halstack.asm")]
+        [NoStackLinkCheck]
+        // NB: This function must execute in low-stack conditions!
+        // See the comment at the top of this file.
+        // Returns the address of the stack with argsN pushed.
+        internal static unsafe UIntPtr GetStackSegmentAndCopy(UIntPtr size,
+                                                              ref ThreadContext context,
+                                                              uint *arg2,
+                                                              uint args,
+                                                              UIntPtr esp,
+                                                              UIntPtr begin,
+                                                              UIntPtr limit)
+        {
+#if NO_TRACE_STACKS
+#else
+            Kernel.Waypoint(668);
+#endif
+#if DEBUG_STACK_VERBOSE
+            fixed (ThreadContext *ptr = &context) {
+                DebugStub.Print("GetStackSegmentAndCopy(" +
+                                "size={0},cxt={1:x8},arg={2:x8},num={3}," +
+                                "esp={4:x8},beg={5:x8},lim={6:x8}\n",
+                                __arglist((int)size,
+                                          (UIntPtr)ptr,
+                                          (UIntPtr)arg2,
+                                          (int)args,
+                                          esp,
+                                          begin,
+                                          limit));
+            }
+#endif
+            StackHead *head = GetStackSegmentRaw(size, ref context, false);
+            if (head == null) {
+                // We are in serious trouble...
+                DebugStub.Break();
+                return (UIntPtr)head;
+            }
+
+            head->prevBegin = begin;
+            head->prevLimit = limit;
+            head->esp = esp;
+            arg2 += args;
+            uint *nsp = (uint *)head;
+            for (uint n = 0; n < args; n++) {
+                *--nsp = *--arg2;
+            }
+#if DEBUG_STACK_VERBOSE
+            DebugStub.Print("  [old {0:x8}..{1:x8}..{2:x8}] {3:x8} {4:x8} {5:x8}\n",
+                            __arglist(limit, (UIntPtr)(arg2 - 2), begin,
+                                      arg2[-2], arg2[-1], arg2[0]));
+            DebugStub.Print("  [raw {0:x8}..{1:x8}..{2:x8}]\n",
+                            __arglist(context.stackLimit,
+                                      (UIntPtr)head,
+                                      context.stackBegin));
+            DebugStub.Print("  [new {0:x8}..{1:x8}..{2:x8}] {3:x8} {4:x8} {5:x8}\n",
+                            __arglist(context.stackLimit,
+                                      (UIntPtr)nsp,
+                                      context.stackBegin,
+                                      nsp[0], nsp[1], nsp[2]));
+
+            DebugStub.Print("  [ret {0:x8}] {1:x8} {2:x8}\n",
+                            __arglist((UIntPtr)(arg2 + args - 5),
+                                      arg2[-2], arg2[-1]));
+#endif
+            return (UIntPtr)nsp;
+        }
+
+        [AccessedByRuntime("referenced from halstack.asm")]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        internal static unsafe void ReturnStackSegmentRaw(ref ThreadContext context,
+                                                          UIntPtr begin,
+                                                          UIntPtr limit)
+        {
+            StackHead *head = (StackHead *)(begin - sizeof(StackHead));
+
+#if NO_TRACE_STACKS
+#else
+            Kernel.Waypoint(669);
+#endif
+
+            UIntPtr addr = limit;
+            UIntPtr size = begin - limit;
+
+#if DEBUG_STACK_VERBOSE
+            fixed (ThreadContext *ptr = &context) {
+                DebugStub.Print("ReturnStackSegmentRaw(ctx={0:x8},beg={1:x8},lim={2:x8}\n",
+                                __arglist((UIntPtr)ptr, begin, limit));
+            }
+#if TEST_STACK_LINKING
+            DumpStack(Processor.GetFramePointer());
+#endif
+#endif
+
+#if !PAGING
+            context.stackBegin = head->prevBegin;
+            context.stackLimit = head->prevLimit;
+#else
+            //context.stackBegin = head->prevBegin;
+            //context.stackLimit = head->prevLimit;
+            // Moved below, because of the following scenario:
+            //   - call UnlinkStack
+            //   - UnlinkStack switches to the scheduler stack
+            //   - UnlinkStack calls ReturnStackSegmentRaw, which calls
+            //     various other methods
+            //   - one of the other methods invokes write barrier code
+            //   - the write barrier code performs a stack link check
+            //   - If context.stackLimit is already set to head->prevLimit,
+            //     then it may appear that we're out of stack space,
+            //     even if we're really not, so we jump to LinkStack
+            //   - LinkStack overwrites the scheduler stack
+            // TODO: really fix this.
+            UIntPtr stackBegin = head->prevBegin;
+            UIntPtr stackLimit = head->prevLimit;
+#endif
+
+            Process owner = Process.GetProcessByID(context.processId);
+            /*
+              // See note above in GetStackSegmentRaw
+            if ((owner != Process.kernelProcess) &&
+                (addr >= BootInfo.KERNEL_BOUNDARY)) {
+                MemoryManager.UserFree(addr, MemoryManager.PagesFromBytes(size), owner);
+            } else {
+                MemoryManager.KernelFree(addr, MemoryManager.PagesFromBytes(size), owner);
+            }
+            */
+            MemoryManager.KernelFree(addr, MemoryManager.PagesFromBytes(size), owner);
+
+            ReturnCount++;
+
+#if DEBUG_STACK_VERBOSE
+            DebugStub.Print("ReturnStackSegment({0:x8}, {1:x8}\n",
+                            __arglist(addr, size));
+#endif
+#if PAGING
+            // See comments above.
+            context.stackBegin = stackBegin;
+            context.stackLimit = stackLimit;
+#endif
+        }
+
+        [AccessedByRuntime("referenced from halstack.asm")]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        // NB: This function must execute in low-stack conditions!
+        // See the comment at the top of this file.
+        internal static unsafe void ReturnStackSegment(ref ThreadContext context)
+        {
+            ReturnStackSegmentRaw(ref context, context.stackBegin, context.stackLimit);
+        }
+
+        internal static unsafe void WalkStack(UIntPtr ebp)
+        {
+            System.GCs.CallStack.TransitionRecord *kernMarker;
+            System.GCs.CallStack.TransitionRecord *procMarker;
+
+            kernMarker = Processor.GetCurrentThreadContext()->stackMarkers;
+            procMarker = Processor.GetCurrentThreadContext()->processMarkers;
+            UIntPtr ebpKern = kernMarker != null ? kernMarker->EBP : UIntPtr.Zero;
+            UIntPtr ebpProc = procMarker != null ? procMarker->EBP : UIntPtr.Zero;
+
+#if DEBUG_STACK_VERBOSE
+            fixed (byte * begin = &LinkedStackBegin) {
+                fixed (byte * limit = &LinkedStackLimit) {
+                    DebugStub.Print("LinkedStack: {0:x8}..{1:x8}\n",
+                                    __arglist((UIntPtr)begin, (UIntPtr)limit));
+                }
+            }
+
+            fixed (byte * begin = &LinkStackBegin) {
+                fixed (byte * limit = &LinkStackLimit) {
+                    DebugStub.Print("LinkStack:   {0:x8}..{1:x8}\n",
+                                    __arglist((UIntPtr)begin, (UIntPtr)limit));
+                }
+            }
+
+            fixed (byte * begin = &UnlinkStackBegin) {
+                fixed (byte * limit = &UnlinkStackLimit) {
+                    DebugStub.Print("UnlinkStack: {0:x8}..{1:x8}\n",
+                                    __arglist((UIntPtr)begin, (UIntPtr)limit));
+                }
+            }
+#endif
+
+            DebugStub.Print("EBP={0:x8}, kernMarkers={1:x8}, procMarkers={2:x8}\n",
+                            __arglist(ebp, (UIntPtr)kernMarker, (UIntPtr)procMarker));
+            DebugStub.Print("EBP.....: EBP..... EIP..... transitn nexttran stbottom\n");
+
+            while (ebp != UIntPtr.Zero) {
+                if (ebp == ebpKern) {
+                    DebugStub.Print("--kern--: {0:x8} {1:x8} {2:x8} {3:x8} {4:x8}\n",
+                                    __arglist(ebpKern,
+                                              (UIntPtr)kernMarker,
+                                              kernMarker->callAddr,
+                                              (UIntPtr)kernMarker->oldTransitionRecord,
+                                              kernMarker->stackBottom));
+                    kernMarker = kernMarker->oldTransitionRecord;
+                    ebpKern = kernMarker != null ? kernMarker->EBP : UIntPtr.Zero;
+                }
+                if (ebp == ebpProc) {
+                    DebugStub.Print("--proc--: {0:x8} {1:x8} {2:x8} {3:x8} {4:x8}: \n",
+                                    __arglist(ebpProc,
+                                              (UIntPtr)procMarker,
+                                              procMarker->callAddr,
+                                              (UIntPtr)procMarker->oldTransitionRecord,
+                                              procMarker->stackBottom));
+
+                    procMarker = procMarker->oldTransitionRecord;
+                    ebpProc = procMarker != null ? procMarker->EBP : UIntPtr.Zero;
+                }
+                DebugStub.Print("{0:x8}: {1:x8} {2:x8}\n",
+                                __arglist(ebp,
+                                          ((UIntPtr*)ebp)[0], ((UIntPtr*)ebp)[1]));
+
+                if (((UIntPtr*)ebp)[1] == UIntPtr.Zero) {
+                    break;
+                }
+                ebp = ((UIntPtr*)ebp)[0];
+            }
+            // DebugStub.Break();
+        }
+
+        //////////////////////////////////////////////////// LinkStackN Stubs.
+        //
+        // Note: As per the description in SDN20, the LinkStackN stubs use
+        //       a non-standard calling convention.  However, they are
+        //       provided here to given Bartok a symbol to reference.
+        //
+        [ExternalStaticData]
+        internal static byte LinkedStackBegin;
+        [ExternalStaticData]
+        internal static byte LinkStackBegin;
+        [ExternalStaticData]
+        internal static byte LinkStackLimit;
+        [ExternalStaticData]
+        internal static byte UnlinkStackBegin;
+        [ExternalStaticData]
+        internal static byte UnlinkStackLimit;
+        [ExternalStaticData]
+        internal static byte LinkedStackLimit;
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [RequiredByBartok]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack0(); // Copy 0 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [RequiredByBartok]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack4(); // Copy 4 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [RequiredByBartok]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack8(); // Copy 8 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack12(); // Copy 12 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack16(); // Copy 16 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack20(); // Copy 20 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack24(); // Copy 24 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack28(); // Copy 28 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack32(); // Copy 32 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack36(); // Copy 36 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack40(); // Copy 40 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack44(); // Copy 44 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack48(); // Copy 48 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack52(); // Copy 52 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack56(); // Copy 56 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack60(); // Copy 60 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void LinkStack64(); // Copy 64 bytes of arguments on stack.
+
+
+        ////////////////////////////////////////////////// UnlinkStackN Stubs.
+        //
+        // Note: As per the description in SDN20, the UnlinkStackN stubs use
+        //       a non-standard calling convention and should be referenced
+        //       only by the LinkStackN stubs which insert them into the stack.
+        //       However, they are provided here for completeness.
+        //
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack0(); // Remove 0 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack4(); // Remove 4 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack8(); // Remove 8 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack12(); // Remove 12 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack16(); // Remove 16 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack20(); // Remove 20 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack24(); // Remove 24 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack28(); // Remove 28 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack32(); // Remove 32 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack36(); // Remove 36 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack40(); // Remove 40 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack44(); // Remove 44 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack48(); // Remove 48 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack52(); // Remove 52 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack56(); // Remove 56 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack60(); // Remove 60 bytes of arguments on stack.
+
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void UnlinkStack64(); // Remove 64 bytes of arguments on stack.
+
+#if TEST_STACK_LINKING
+        [NoStackLinkCheck]
+        internal static unsafe void TestStack()
+        {
+            ThreadContext *thread = Processor.GetCurrentThreadContext();
+            ProcessorContext *processor = Processor.GetCurrentProcessorContext();
+            UIntPtr oldLimit = thread->stackLimit;
+            UIntPtr newLimit = (Processor.GetStackPointer() - 512);
+
+            DebugStub.Print("************************************************************\n");
+            DebugStub.Print("threadContext={0:x8}, stackBegin={1:x8}, "+
+                            "stackLimit={2:x8}, "+
+                            "esp={3:x8}, stackLimit={4:x8}\n",
+                            __arglist(
+                                (UIntPtr)thread,
+                                thread->stackBegin,
+                                oldLimit,
+                                Processor.GetStackPointer(),
+                                newLimit));
+            DebugStub.Print("processorContext={0:x8}, "+
+                            "schedulerStackBegin={1:x8},"+
+                            "schedulerStackLimit={2:x8}\n",
+                            __arglist(
+                                (UIntPtr)processor,
+                                processor->schedulerStackBegin,
+                                processor->schedulerStackLimit));
+            DebugStub.Print("[TestStack.\n");
+            Test1(1);
+            DebugStub.Print(".TestStack]\n");
+            thread->stackLimit = oldLimit;
+        }
+
+        internal static unsafe void DumpStack(UIntPtr ebp)
+        {
+            ThreadContext *thread = Processor.GetCurrentThreadContext();
+            UIntPtr begin = thread->stackBegin;
+
+            DebugStub.Print("  [{0:x8}..{1:x8}]: "+
+                            "{2:x8} {3:x8} {4:x8} {5:x8} {6:x8} {7:x8} {8:x8} {8:x8}\n",
+                            __arglist(
+                                ebp,
+                                begin,
+                                ((uint*)ebp)[0],
+                                ((uint*)ebp)[1],
+                                ((uint*)ebp)[2],
+                                ((uint*)ebp)[3],
+                                ((uint*)ebp)[4],
+                                ((uint*)ebp)[5],
+                                ((uint*)ebp)[6],
+                                ((uint*)ebp)[7]));
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test1(int a)
+        {
+            DebugStub.Print("[Test1. ({0})\n", __arglist(a));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink1024();
+            a = Test2(a, a + 1) + 1;
+            DebugStub.Print(".Test1] = {0}\n", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test2(int a, int b)
+        {
+            DebugStub.Print("[Test2. ({0}, {1})\n",
+                            __arglist(a, b));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096(); //TestStackLink1024();
+            a = Test3(a, a + 1, a + 2) + 1;
+            DebugStub.Print(".Test2] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test3(int a, int b, int c)
+        {
+            DebugStub.Print("[Test3. ({0},{1},{2})",
+                            __arglist(a, b, c));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096(); //TestStackLink1024();
+            a = Test4(a, a + 1, a + 2, a + 3) + 1;
+            DebugStub.Print(".Test3] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test4(int a, int b, int c, int d)
+        {
+            DebugStub.Print("[Test4. ({0},{1},{2},{3})",
+                            __arglist(a, b, c, d));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096(); //TestStackLink2048();
+            a = Test5(a, a + 1, a + 2, a + 3, a + 4) + 1;
+            DebugStub.Print(".Test4] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test5(int a, int b, int c, int d, int e)
+        {
+            DebugStub.Print("[Test5. ({0},{1},{2},{3},{4})",
+                            __arglist(a, b, c, d, e));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096(); //TestStackLink2048();
+            a = Test6(a, a + 1, a + 2, a + 3, a + 4, a + 5) + 1;
+            DebugStub.Print(".Test5] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test6(int a, int b, int c, int d, int e, int f)
+        {
+            DebugStub.Print("[Test6. ({0},{1},{2},{3},{4},{5})",
+                            __arglist(a, b, c, d, e, f));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096(); //TestStackLink2048();
+            a = Test7(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6) + 1;
+            DebugStub.Print(".Test6] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test7(int a, int b, int c, int d, int e, int f,
+                                  int g)
+        {
+            DebugStub.Print("[Test7. ({0},{1},{2},{3},{4},{5},{6})",
+                            __arglist(a, b, c, d, e, f, g));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test8(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7) + 1;
+            DebugStub.Print(".Test7] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test8(int a, int b, int c, int d, int e, int f,
+                                  int g, int h)
+        {
+            DebugStub.Print("[Test8. ({0},{1},{2},{3},{4},{5},{6},{7})",
+                            __arglist(a, b, c, d, e, f, g, h));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test9(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                      a + 8) + 1;
+            DebugStub.Print(".Test8] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test9(int a, int b, int c, int d, int e, int f,
+                                  int g, int h, int i)
+        {
+            DebugStub.Print("[Test9. ({0},{1},{2},{3},{4},{5},{6},{7},{8})",
+                            __arglist(a, b, c, d, e, f, g, h, i));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test10(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                      a + 8, a + 9) + 1;
+            DebugStub.Print(".Test9] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test10(int a, int b, int c, int d, int e, int f,
+                                  int g, int h, int i, int j)
+        {
+            DebugStub.Print("[Test10. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test11(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10) + 1;
+            DebugStub.Print(".Test10] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test11(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k)
+        {
+            DebugStub.Print("[Test11. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test12(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10, a + 11) + 1;
+            DebugStub.Print(".Test11] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test12(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k, int l)
+        {
+            DebugStub.Print("[Test12. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10},{11})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k, l));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test13(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10, a + 11, a + 12) + 1;
+            DebugStub.Print(".Test12] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test13(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k, int l,
+                                   int m)
+        {
+            DebugStub.Print("[Test13. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10},{11},{12})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k, l, m));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test14(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10, a + 11, a + 12, a + 13) + 1;
+            DebugStub.Print(".Test13] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test14(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k, int l,
+                                   int m, int n)
+        {
+            DebugStub.Print("[Test14. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10},{11},{12},{13})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k, l,
+                                      m, n));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink4096();
+            a = Test15(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10, a + 11, a + 12, a + 13, a + 14) + 1;
+            DebugStub.Print(".Test14] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test15(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k, int l,
+                                   int m, int n, int o)
+        {
+            DebugStub.Print("[Test15. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10},{11},{12},{13},{14})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k, l,
+                                      m, n, o));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink8192();
+            a = Test16(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10, a + 11, a + 12, a + 13, a + 14,
+                       a + 15) + 1;
+            DebugStub.Print(".Test15] = {0}", __arglist(a));
+            return a;
+        }
+
+        [OutsideGCDomain]
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test16(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k, int l,
+                                   int m, int n, int o, int p)
+        {
+            DebugStub.Print("[Test16. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10},{11},{12},{13},{14},{15})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k, l,
+                                      m, n, o, p));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink8192();
+            a = Test17(a, a + 1, a + 2, a + 3, a + 4, a + 5, a + 6, a + 7,
+                       a + 8, a + 9, a + 10, a + 11, a + 12, a + 13, a + 14,
+                       a + 15, a + 16) + 1;
+            DebugStub.Print(".Test16] = {0}", __arglist(a));
+            return a;
+        }
+
+        [NoInline]
+        [StackLinkCheck]
+        internal static int Test17(int a, int b, int c, int d, int e, int f,
+                                   int g, int h, int i, int j, int k, int l,
+                                   int m, int n, int o, int p, int q)
+        {
+            DebugStub.Print("[Test17. ({0},{1},{2},{3},{4},{5},{6},{7},{8},"+
+                            "{9},{10},{11},{12},{13},{14},{15},{16})",
+                            __arglist(a, b, c, d, e, f, g, h, i, j, k, l,
+                                      m, n, o, p, q));
+            DumpStack(Processor.GetFramePointer());
+            TestStackLink8192();
+            a = a + 1;
+            WalkStack(Processor.GetFramePointer());
+            DebugStub.Print(".Test17] = {0}", __arglist(a));
+            return a;
+        }
+
+        [AccessedByRuntime("output to header : defined in stacks.cpp")]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void TestStackLink1024();
+
+        [AccessedByRuntime("output to header : defined in stacks.cpp")]
+        [StackBound(2048)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void TestStackLink2048();
+
+        [AccessedByRuntime("output to header : defined in stacks.cpp")]
+        [StackBound(4096)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void TestStackLink4096();
+
+        [AccessedByRuntime("output to header : defined in stacks.cpp")]
+        [StackBound(8192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern void TestStackLink8192();
+
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Memory/VMManager.cs b/base/Kernel/Singularity/Memory/VMManager.cs
new file mode 100644
index 0000000..ed710f6
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/VMManager.cs
@@ -0,0 +1,1461 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   VMManager.cs -- Virtual Memory Manager
+//
+//  Notes:
+//
+//  This module manages page-translation tables for virtual memory
+//
+
+#if PAGING
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.X86;
+
+using PageType = System.GCs.PageType;
+
+namespace Microsoft.Singularity.Memory
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class VMManager
+    {
+        //
+        // NOTES
+        //
+        // Currently, this class is hand-written to deal with 4KB paging
+        // on the AMD x64 in 32-bit mode, with PAE enabled. The
+        // three-tier structure of the descriptor tables is baked into
+        // the code; we will need to factor and expand this module to
+        // deal with 64-bit mode, or with a different processor.
+        //
+        // This code is also written on the assumption that the user/kernel
+        // boundary is 1GB-aligned, such that one, two or three of the
+        // top-level Page-Directory-Pointer-Table (PDPE) entries fully
+        // describe the kernel space.
+        //
+        // Obviously, memory pages are used to describe the mapping of
+        // virtual memory to physical memory. This gets a little confusing.
+        // We want there to be a mapping for the pages that contain
+        // the page tables (!) so we have virtual addresses we can
+        // use to manipulate the page tables!
+        //
+        // The kernel's page table pages must always be mapped, but the
+        // page tables for the user space must get switched when
+        // we change address spaces. Therefore, the pages used to
+        // describe the mappings for the kernel's space live at a
+        // certain virtual address (kernelPageTableBase), and the
+        // pages that describe the mapping for user-space live at
+        // an address in the user-space (userPageTableBase). This way,
+        // the user's page table mappings get swapped along with the
+        // rest of the user address space.
+        //
+        // A minimally usable address space must include a PDPT, and
+        // PDTs and PTs sufficient to be able to map in all page-
+        // table structures necessary to describe the space, including
+        // user-space if the user-space range will be used.
+        //
+        // Additionally, it is a tricky stunt to set up a new address
+        // space when paging is already turned on, since it is difficult
+        // to "talk about" the page-table pages for the new space.
+        // There are two pages of reserved VM space at scratchAddress1/2
+        // that are used to temporarily map in single pages of
+        // "foreign" memory so we can build a new address space without
+        // having to turn off paging.
+        //
+
+        // These are the PDPT entries for the kernel space. Whether we
+        // are using one, two or three of them is determined by
+        // BootInfo.KERNEL_BOUNDARY
+        private static PhysicalAddress kernelPDPE1;
+        private static PhysicalAddress kernelPDPE2;
+        private static PhysicalAddress kernelPDPE3;
+
+        // How many of the kernelPDPEs are we using?
+        private static uint numKernelPDPEs;
+
+        // The address space we create during boot
+        private static AddressSpace BootstrapSpace;
+
+        // Here is the limit below which memory is identity-mapped
+        private static UIntPtr identityMapLimit;
+
+        // Here is the virtual address where the page-table pages that
+        // describe the kernel's address space are always accessible
+        private static UIntPtr kernelPageTableBase;
+        private static UIntPtr kernelPageTableLimit;
+        private static UIntPtr kernelPDTOffset;
+
+        // Here is the same thing for the user space. This address is
+        // above KERNEL_BOUNDARY.
+        private static UIntPtr userPageTableBase;
+        private static UIntPtr userPageTableLimit;
+        private static UIntPtr userPDTOffset;
+
+        // The PDPT always lives in the user space, so its mapping gets
+        // switched naturally when we change spaces
+        private static PDPT* pdptAddr;
+
+        // Here are two page of VM space we keep available for scratch use.
+        // We must take care to use them atomically!
+        private static UIntPtr scratchAddress1;
+        private static UIntPtr scratchAddress2;
+        private static SpinLock scratchSpin;
+
+        // Here is where we map the uncached-memory window that
+        // corresponds to the high-memory range that we use to
+        // communicate with hardware (like the APIC)
+        private static UIntPtr uncachedWindowBase;
+        private static UIntPtr uncachedWindowSize;
+
+        // Here is where we have situated the executable images that
+        // are actually in high physical memory (where they get put
+        // by the boot loader)
+        private static UIntPtr execImageBase;
+        private static UIntPtr execImageSize;
+
+#if RESERVE_SMAP
+        // Here is where we remap areas of physical memory that are
+        // reported as reserved by the SMAP (in the order they appear
+        // in the SMAP)
+        private static UIntPtr smapRemapBase;
+        private static UIntPtr smapRemapSize;
+#endif
+
+        // Here are the bounds of the VM space that the kernel should use
+        // for its GC heap
+        private static UIntPtr kernelHeapBase;
+        private static UIntPtr kernelHeapLimit;
+
+        // Same for user-land
+        private static UIntPtr userHeapBase;
+        private static UIntPtr userHeapLimit;
+
+        // A protective lock for the kernel's page mappings
+        private static SmartSpinlock KernelMappingLock;
+
+        /////////////////////////////////////
+        // CONSTANTS
+        /////////////////////////////////////
+
+        // Each PT describes 512 4K pages
+        private const uint SpacePerPT             = 4 * 1024 * 512; // 2MB
+
+        // Each PDT describes 512 PTs
+        private const uint SpacePerPDT            = 512 * SpacePerPT; // 1GB
+
+        /////////////////////////////////////
+        // PROPERTIES
+        /////////////////////////////////////
+
+        internal static UIntPtr KernelHeapBase {
+            get {
+                return kernelHeapBase;
+            }
+        }
+
+        internal static UIntPtr KernelHeapLimit {
+            get {
+                return kernelHeapLimit;
+            }
+        }
+
+        internal static UIntPtr UserHeapBase {
+            get {
+                return userHeapBase;
+            }
+        }
+
+        internal static UIntPtr UserHeapLimit {
+            get {
+                return userHeapLimit;
+            }
+        }
+
+        /////////////////////////////////////
+        // PUBLIC METHODS
+        /////////////////////////////////////
+
+        //
+        // This must be called with paging TURNED OFF, and it has the
+        // side effect of TURNING PAGING ON!
+        //
+        internal static unsafe void Initialize()
+        {
+            // How big is the kernel space?
+            DebugStub.Assert(MemoryManager.BytesNotAligned(BootInfo.KERNEL_BOUNDARY,SpacePerPDT) == 0);
+            numKernelPDPEs = (uint)(BootInfo.KERNEL_BOUNDARY / SpacePerPDT);
+            DebugStub.Assert(numKernelPDPEs <= 3);
+
+            // Figure out where the kernel page-table pages will live.
+            // We'll stick it immediately above the IO memory heap, on
+            // a page boundary.
+            kernelPageTableBase = (UIntPtr)MemoryManager.IOMemoryBase.Value;
+            kernelPageTableBase += BootInfo.IO_MEMORY_SIZE;
+            kernelPageTableBase = MemoryManager.PagePad(kernelPageTableBase);
+
+            // Everything below this limit is identity-mapped
+            identityMapLimit = kernelPageTableBase;
+
+            // Now figure out the kernel's page-table layout
+            uint numPTs = BootInfo.KERNEL_BOUNDARY / SpacePerPT;
+            kernelPDTOffset = MemoryManager.BytesFromPages(numPTs);
+            // numKernelPDPEs == the number of PDTs, by definition
+            kernelPageTableLimit = kernelPageTableBase + MemoryManager.BytesFromPages(numPTs + numKernelPDPEs);
+
+            // Stick the user-space page-table mapping right at the
+            // beginning of the user's address space
+            userPageTableBase = BootInfo.KERNEL_BOUNDARY;
+            UIntPtr userSpaceSize = BootInfo.MAX_VIRTUAL_ADDR - BootInfo.KERNEL_BOUNDARY + 1;
+            numPTs = (uint)(userSpaceSize / SpacePerPT);
+            userPDTOffset = MemoryManager.BytesFromPages(numPTs);
+            uint numPDTs = (uint)(userSpaceSize / SpacePerPDT);
+            pdptAddr = (PDPT*)(userPageTableBase + MemoryManager.BytesFromPages(numPTs + numPDTs));
+
+            // Count the PDPT as part of the user's page table so we don't
+            // step on the PDPT mapping later
+            userPageTableLimit = (UIntPtr)pdptAddr + MemoryManager.PageSize;
+
+            // Define the limits of general-purpose user space
+            userHeapBase = userPageTableLimit;
+            userHeapLimit = BootInfo.MAX_VIRTUAL_ADDR;
+            userHeapLimit = MemoryManager.Trunc(userHeapLimit, MemoryManager.PageSize);
+
+            // Locate the uncached window immediately after the kernel's page-table space
+            uncachedWindowBase = kernelPageTableLimit;
+            uncachedWindowSize = BootInfo.UNCACHED_MAPPED;
+
+            BootInfo bi = BootInfo.GetBootInfo();
+
+            // Locate the executable images right after the uncached-window
+            execImageBase = MemoryManager.PagePad(uncachedWindowBase + uncachedWindowSize);
+            execImageSize = bi.DumpSize32;
+
+#if RESERVE_SMAP
+            // Locate the SMAP window next
+            smapRemapBase = MemoryManager.PagePad(execImageBase + execImageSize);
+            smapRemapSize = 0;
+
+            // Calculate its size
+            SMAPINFO *smap = (SMAPINFO*)bi.SmapData32;
+
+            for (uint i = 0; i < bi.SmapCount; i++) {
+                if ((smap[i].type != (ulong)SMAPINFO.AddressType.Free) &&
+                    (smap[i].addr >= identityMapLimit)) {
+                    smapRemapSize += smap[i].size;
+                }
+            }
+            // Locate the one-page scratch window immediately above the smap area
+            scratchAddress1 = MemoryManager.PagePad(smapRemapBase + smapRemapSize);
+#else
+            scratchAddress1 = MemoryManager.PagePad(execImageBase + execImageSize);
+#endif
+
+            scratchAddress2 = scratchAddress1 + MemoryManager.PageSize;
+            scratchSpin = new SpinLock();
+
+            // That's all for our fixed low-memory structures
+            kernelHeapBase = scratchAddress2 + MemoryManager.PageSize;
+            kernelHeapLimit = BootInfo.KERNEL_BOUNDARY;
+            DebugStub.Assert(kernelHeapLimit > kernelHeapBase);
+
+            // Now we can create the kernel's address space!
+            BootstrapSpace = CreateBootstrapSpace();
+
+            // TURN ON PAGING!
+            Processor.EnablePaging(BootstrapSpace);
+
+#if DEBUG
+            // Sanity checks
+            DebugStub.Assert(IsUserDescriptorPageMapped((UIntPtr)pdptAddr));
+            DebugStub.Assert(((*pdptAddr)[0])->Valid);
+
+            // We expect there to be sufficient PTs to describe the entire
+            // kernel page table
+            for (UIntPtr step = MemoryManager.Trunc(kernelPageTableBase, SpacePerPT);
+                 step < MemoryManager.Pad(kernelPageTableLimit, SpacePerPT);
+                 step += SpacePerPT) {
+
+                PT* pt = GetPT(step);
+                DebugStub.Assert(IsKernelDescriptorPageMapped((UIntPtr)pt));
+            }
+
+            // Obviously, the PDT for this space should be mapped too
+            DebugStub.Assert(
+                IsKernelDescriptorPageMapped(
+                    (UIntPtr)GetPDT(
+                        MemoryManager.Trunc(kernelPageTableBase, SpacePerPDT))));
+
+            // Same checks for user-land
+            for (UIntPtr step = MemoryManager.Trunc(userPageTableBase, SpacePerPT);
+                 step < MemoryManager.Pad(userPageTableLimit, SpacePerPT);
+                 step += SpacePerPT) {
+
+                PT* pt = GetPT(step);
+                DebugStub.Assert(IsUserDescriptorPageMapped((UIntPtr)pt));
+            }
+
+            DebugStub.Assert(
+                IsUserDescriptorPageMapped(
+                    (UIntPtr)GetPDT(
+                        MemoryManager.Trunc(userPageTableBase, SpacePerPDT))));
+#endif
+
+            DebugStub.WriteLine("VMManager initialized with {0} physical pages still free",
+                                __arglist(PhysicalPages.GetFreePageCount()));
+        }
+
+        internal static void Finalize()
+        {
+            // Restore the PDPT that the boot loader created
+            Processor.ChangeAddressSpace(new AddressSpace(
+                                             new PhysicalAddress(BootInfo.GetBootInfo().Pdpt32)));
+        }
+
+        internal static void PostGCInitialize()
+        {
+            // Create a spinlock to protect the kernel's page-mapping
+            // structures
+            KernelMappingLock = new SmartSpinlock();
+        }
+
+        //
+        // This gets called during the boot sequence when we're ready to
+        // start using user-space for the first time. We flesh out our
+        // bootstrap address space with a user range and hand it out for the
+        // first time.
+        //
+        internal static AddressSpace GetBootstrapSpace()
+        {
+            return BootstrapSpace;
+        }
+
+        //
+        // Call to create a whole new address space from scratch
+        //
+        public static AddressSpace CreateNewAddressSpace()
+        {
+            AddressSpace retval = CreateNewKernelSpace();
+            InitializeUserRange(retval);
+            return retval;
+        }
+
+        //
+        // Writes a new virtual -> physical address into the page table,
+        // ensuring all necessary PDTs and PTs are allocated and mapped
+        //
+        // The caller must specify the protection domain that owns the mapped
+        // pages, for locking purposes. When mapping pages into the kernel
+        // range this parameter can be null.
+        //
+        // What are the "locking purposes"? Routines that may *add* nodes
+        // to the page-mapping tree need to be protected against concurrency.
+        //
+        public static unsafe void MapPage(PhysicalAddress physAddr,
+                                          UIntPtr virtualAddr,
+                                          ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            DebugStub.Assert(!IsPageMapped(virtualAddr), "Attempt to map over a mapped page");
+
+            SmartSpinlock mappingLock = null;
+
+            if (virtualAddr < BootInfo.KERNEL_BOUNDARY) {
+                mappingLock = KernelMappingLock; // Might be null during early boot
+            } else {
+                DebugStub.Assert(inDomain != null);
+                mappingLock = inDomain.UserMappingLock;
+                DebugStub.Assert(mappingLock != null);
+                DebugStub.Assert(inDomain.AddressSpace == Processor.GetCurrentAddressSpace());
+            }
+
+            bool iflag = false;
+
+            if (mappingLock != null) {
+                iflag = mappingLock.Lock();
+            }
+
+            try {
+                MapPageNoLock(physAddr, virtualAddr);
+            }
+            finally {
+                if (mappingLock != null) {
+                    mappingLock.Unlock(iflag);
+                }
+            }
+        }
+
+        private static unsafe void MapPageNoLock(PhysicalAddress physAddr,
+                                                 UIntPtr virtualAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            DebugStub.Assert(!IsPageMapped(virtualAddr), "Attempt to map over a mapped page");
+            EnsurePTE(virtualAddr);
+            MapPageInternal(physAddr, virtualAddr);
+        }
+
+        //
+        // The caller must specify the protection domain that owns the mapped
+        // pages, for locking purposes. When mapping pages into the kernel
+        // range this parameter can be null.
+        //
+        // What are the "locking purposes"? Routines that may *add* nodes
+        // to the page-mapping tree need to be protected against concurrency.
+        //
+        public static unsafe void MapRange(PhysicalAddress physAddr,
+                                           UIntPtr virtualAddr,
+                                           UIntPtr numPages,
+                                           ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            ulong stepPhys = physAddr.Value;
+            UIntPtr stepVirt = virtualAddr;
+            UIntPtr limitAddr = virtualAddr + MemoryManager.BytesFromPages(numPages);
+
+            SmartSpinlock mappingLock = null;
+
+            if (limitAddr <= BootInfo.KERNEL_BOUNDARY) {
+                mappingLock = KernelMappingLock; // Might be null during early boot
+            } else {
+                DebugStub.Assert(inDomain != null);
+                mappingLock = inDomain.UserMappingLock;
+                DebugStub.Assert(mappingLock != null);
+                DebugStub.Assert(inDomain.AddressSpace == Processor.GetCurrentAddressSpace());
+            }
+
+            bool iflag = false;
+
+            if (mappingLock != null) {
+                iflag = mappingLock.Lock();
+            }
+
+            try {
+                for( UIntPtr i = 0; i < numPages; i++ ) {
+                    MapPageNoLock(new PhysicalAddress(stepPhys), stepVirt);
+                    stepPhys += MemoryManager.PageSize;
+                    stepVirt += MemoryManager.PageSize;
+                }
+            } finally {
+                if (mappingLock != null) {
+                    mappingLock.Unlock(iflag);
+                }
+            }
+        }
+
+        //
+        // Unmaps an existing virtual-memory page.
+        // Does NOT release the underlying physical page
+        // (whose address is returned)
+        //
+        public static unsafe PhysicalAddress UnmapPage(UIntPtr virtualAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            PTE* pte = GetPTE(virtualAddr);
+
+            if (pte->Valid) {
+                PhysicalAddress phys = new PhysicalAddress(pte->Address);
+                pte->Valid = false;
+                pte->Address = 0;
+                Processor.InvalidateTLBEntry(virtualAddr);
+                return phys;
+            }
+            else {
+                DebugStub.Assert(false, "Attempt to unmap an unmapped page");
+                return PhysicalAddress.Null;
+            }
+        }
+
+        public static unsafe void UnmapRange(UIntPtr virtualAddr,
+                                             UIntPtr numPages)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            UIntPtr stepVirt = virtualAddr;
+
+            for( UIntPtr i = 0; i < numPages; i++ ) {
+                UnmapPage(stepVirt);
+                stepVirt += MemoryManager.PageSize;
+            }
+        }
+
+        //
+        // Returns the physical address that a given virtual address is
+        // currently mapped to (or PhysicalAddress.Null if none)
+        //
+        public static unsafe PhysicalAddress GetPageMapping(UIntPtr virtualAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            PTE* pte = GetPTE(virtualAddr);
+
+            if (pte->Valid) {
+                return new PhysicalAddress(pte->Address);
+            } else {
+                return PhysicalAddress.Null;
+            }
+        }
+
+        // Examines the page-table structures to determine whether the page
+        // at pageAddr is mapped or not.
+        //
+        // REVIEW: use a processor instruction instead to get a more definitive
+        // answer?
+        [AccessedByRuntime("referenced from halkd.cpp")]
+        public static unsafe bool IsPageMapped(UIntPtr pageAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+
+            if ((pageAddr >= kernelPageTableBase) &&
+                (pageAddr < kernelPageTableLimit)) {
+                // This is the address of a kernel page-table page.
+                // There should always be sufficient PTs to describe these.
+                return IsKernelDescriptorPageMapped(pageAddr);
+            } else if ((pageAddr >= userPageTableBase) &&
+                       (pageAddr < userPageTableLimit)) {
+                // User-land page-table page
+                return IsUserDescriptorPageMapped(pageAddr);
+            } else {
+                // This page isn't part of the page table, so its
+                // PT may be missing. Check that.
+                PT* pt = GetPT(MemoryManager.Trunc(pageAddr, SpacePerPT));
+
+                if (pageAddr >= BootInfo.KERNEL_BOUNDARY) {
+                    if (!IsUserDescriptorPageMapped((UIntPtr)pt)) {
+                        // The PT for this address isn't even mapped,
+                        // so the address itself can't be mapped!
+                        return false;
+                    }
+                } else {
+                    if (!IsKernelDescriptorPageMapped((UIntPtr)pt)) {
+                        return false;
+                    }
+                }
+
+                // There's a PT but it might say that this page isn't
+                // mapped.
+                PTE* pte = GetPTE(pageAddr);
+                return pte->Valid;
+            }
+        }
+
+        //
+        // A complement to TranslatePhysicalRange. Returns true if
+        // the virtual address provided falls into one of the
+        // virtual ranges we have reserved for permanent mappings
+        // of hardware.
+        //
+        internal static unsafe bool IsPermaMapped(UIntPtr virtualAddr,
+                                                  UIntPtr limitAddr)
+        {
+            if (limitAddr <= identityMapLimit) {
+                return true;
+            }
+
+            if ((virtualAddr >= execImageBase) &&
+                (limitAddr <= execImageBase + execImageSize)) {
+                return true;
+            }
+
+#if RESERVE_SMAP
+            if ((virtualAddr >= smapRemapBase) &&
+                (limitAddr <= smapRemapBase + smapRemapSize)) {
+                return true;
+            }
+#endif
+
+            if ((virtualAddr >= uncachedWindowBase) &&
+                (limitAddr <= uncachedWindowBase + uncachedWindowSize)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        //
+        // This call returns non-null if the physical address provided
+        // is already well-known and mapped into a stable area of
+        // memory.
+        //
+        internal static unsafe UIntPtr TranslatePhysicalRange(PhysicalAddress physAddress,
+                                                              UIntPtr numBytes)
+        {
+            BootInfo bi = BootInfo.GetBootInfo();
+            ulong physAddr = physAddress.Value;
+            ulong physLimit = physAddr + (ulong)numBytes;
+
+            // Some physical pointers are identity-mapped
+            if (physLimit < identityMapLimit) {
+                return physAddr;
+            }
+
+            // Is this an address into the executable-image range
+            // created by the loader?
+            if ((physAddr >= bi.DumpAddr32) &&
+                (physLimit <= bi.DumpAddr32 + execImageSize)) {
+                // Assume we move the exec image lower in memory
+                DebugStub.Assert(bi.DumpAddr32 > execImageBase);
+                return (UIntPtr)(physAddr - (bi.DumpAddr32 - execImageBase));
+            }
+
+#if RESERVE_SMAP
+            // Is this an address into an SMAP-reserved area?
+            SMAPINFO *smap = (SMAPINFO*)bi.SmapData32;
+            UIntPtr stepVirtual = smapRemapBase;
+
+            for (uint i = 0; i < bi.SmapCount; i++) {
+                if ((smap[i].type != (ulong)SMAPINFO.AddressType.Free) &&
+                    (smap[i].addr >= identityMapLimit)) {
+
+                    if ((physAddr >= smap[i].addr) &&
+                        (physLimit <= smap[i].addr + smap[i].size)) {
+                        // Match!
+                        return stepVirtual + (physAddr - smap[i].addr)
+                    }
+
+                    stepVirtual += smap[i].size;
+                }
+            }
+#endif
+
+            // Is this a pointer into the uncached window at the
+            // top of physical memory?
+            ulong uncachedLimit = (ulong)BootInfo.UNCACHED_PHYSICAL +
+                (ulong)BootInfo.UNCACHED_MAPPED;
+
+            if ((physAddr >= BootInfo.UNCACHED_PHYSICAL) &&
+                (physLimit <= uncachedLimit)) {
+                return uncachedWindowBase + (UIntPtr)(physAddr - BootInfo.UNCACHED_PHYSICAL);
+            }
+
+            // No match
+            return UIntPtr.Zero;
+        }
+
+        //
+        // Finds a range of virtual space in the provided address range
+        // and maps in the requested physical range on the fly
+        //
+        internal static UIntPtr MapPhysicalMemory(VirtualMemoryRange range,
+                                                  Process process,
+                                                  PhysicalAddress physStart,
+                                                  UIntPtr numBytes)
+        {
+            ulong startPhysPage = MemoryManager.Trunc(physStart.Value, MemoryManager.PageSize);
+            ulong physLimit = MemoryManager.PagePad(physStart.Value + (ulong)numBytes);
+            UIntPtr numPages = MemoryManager.PagesFromBytes((UIntPtr)(physLimit - startPhysPage));
+
+            // Reserve an area to accomplish the mapping in
+            UIntPtr mapPoint = range.Reserve(numPages, process, 0, PageType.System);
+
+            DebugStub.Assert(mapPoint != UIntPtr.Zero,
+                             "Out of virtual memory trying to map a physical range");
+
+            // Perform the mapping
+            MapRange(new PhysicalAddress(startPhysPage), mapPoint, numPages, range.ParentDomain);
+
+            // Take care to point into the mapped virtual memory properly
+            return mapPoint + (UIntPtr)MemoryManager.BytesNotAligned(
+                physStart.Value, MemoryManager.PageSize);
+        }
+
+        //
+        // Reverses the operation of MapPhysicalMemory
+        //
+        internal static void UnmapPhysicalMemory(VirtualMemoryRange range,
+                                                 Process process,
+                                                 UIntPtr startAddr,
+                                                 UIntPtr limitAddr)
+        {
+            UIntPtr startPageAddr = MemoryManager.Trunc(startAddr, MemoryManager.PageSize);
+            UIntPtr limitPageAddr = MemoryManager.PagePad(limitAddr);
+            uint numPages = (uint)MemoryManager.PagesFromBytes(limitPageAddr - startPageAddr);
+
+            // First undo the mapping
+            UnmapRange(startPageAddr, numPages);
+
+            // Now mark all the pages as free
+            range.Unreserve(startPageAddr, numPages, process);
+        }
+
+        /////////////////////////////////////
+        // PRIVATE BOOTSTRAP METHODS
+        /////////////////////////////////////
+
+        // This function sets up the initial memory space from scratch.
+        // It assumes paging is NOT on.
+        private static unsafe AddressSpace CreateBootstrapSpace()
+        {
+            //
+            // The kernel's address space serves as the template for all other
+            // address spaces, because everything it maps must also be mapped
+            // in other spaces.
+            //
+            // We need mapping for a bunch of things before we can turn on
+            // paging. Here's the list:
+            //
+            // BELOW KERNEL_BOUNDARY:
+            //
+            // Zero through BootInfo.PHYSICAL_DISABLED is always kept unmapped
+            //
+            // Memory from PHYSICAL_DISABLED to the top of the I/O heap is
+            // identity-mapped (we could probably stand to punch some holes
+            // in this)
+            //
+            // Next comes the page-table area, starting at kernelPageTableBase.
+            // It is large enough to cover all the pages that could be
+            // needed to describe the kernel's address space.
+            //
+            // Next comes a window that maps the executable images downloaded
+            // by the boot loader (these usually get stuck in high memory)
+            // into the kernel's space, which is a more convenient location.
+            //
+            // Mappings above KERNEL_BOUNDARY are free for use by processes,
+            // except that from UNCACHED_PHYSICAL to the top (4GB) is marked
+            // uncached.
+            //
+
+            // To get started, we need a PDPT.
+            PhysicalAddress phys = PhysicalPages.AllocPage();
+            DebugStub.Assert(phys != PhysicalAddress.Null);
+            PDPT* pdpt = (PDPT*)phys.Value;
+            pdpt->Init();
+
+            // Identity-map the range from PHYSICAL_DISABLED to the top
+            // of the IO heap
+            BootstrapMapRange(pdpt,
+                              (UIntPtr)BootInfo.PHYSICAL_DISABLED, identityMapLimit,
+                              new PhysicalAddress(BootInfo.PHYSICAL_DISABLED),
+                              true, // writeable
+                              false, // not write-through
+                              false); // don't disable caching
+
+            // Map the uncached area of high memory down into the kernel space
+            BootstrapMapRange(pdpt, uncachedWindowBase,
+                              MemoryManager.PagePad(uncachedWindowBase + uncachedWindowSize),
+                              new PhysicalAddress(BootInfo.UNCACHED_PHYSICAL),
+                              true, // writeable
+                              true, // write-through
+                              true); // disable caching
+
+            // Map the area of high memory that contains executable images
+            // down into its kernel-space window
+            BootInfo bi = BootInfo.GetBootInfo();
+            PhysicalAddress physStart = new PhysicalAddress(bi.DumpAddr32);
+
+            BootstrapMapRange(pdpt, execImageBase,
+                              MemoryManager.PagePad(execImageBase + execImageSize),
+                              physStart,
+                              false, // read-only
+                              false, // not write-through
+                              false); // don't disable caching
+
+#if RESERVE_SMAP
+            // Walk the SMAP and remap any reserved areas into the smap window
+            SMAPINFO *smap = (SMAPINFO*)bi.SmapData32;
+            UIntPtr stepVirtual = smapRemapBase;
+
+            for (uint i = 0; i < bi.SmapCount; i++) {
+                if ((smap[i].type != (ulong)SMAPINFO.AddressType.Free) &&
+                    (smap[i].addr >= identityMapLimit)) {
+                    DebugStub.Assert(MemoryManager.IsPageAligned(smap[i].size));
+                    BootstrapMapRange(pdpt, stepVirtual, stepVirtual + smap[i].size,
+                                      new PhysicalAddress(smap[i].addr),
+                                      true, // writeable
+                                      true, // write-through,
+                                      true); // disable caching
+                    stepVirtual += smap[i].size;
+                }
+            }
+
+            DebugStub.Assert((stepVirtual - smapRemapBase) == smapRemapSize);
+#endif
+
+            // Make sure we have committed a PDT for each kernel PDPE slot, so
+            // other address spaces can alias the kernel range sensibly
+            BootstrapEnsurePDTs(pdpt, UIntPtr.Zero, BootInfo.KERNEL_BOUNDARY);
+
+            kernelPDPE1 = new PhysicalAddress(((*pdpt)[0])->Address);
+            DebugStub.Assert(kernelPDPE1 != PhysicalAddress.Null);
+
+            if (numKernelPDPEs >= 2) {
+                kernelPDPE2 = new PhysicalAddress(((*pdpt)[1])->Address);
+                DebugStub.Assert(kernelPDPE2 != PhysicalAddress.Null);
+            }
+
+            if (numKernelPDPEs >=3 ) {
+                kernelPDPE3 = new PhysicalAddress(((*pdpt)[2])->Address);
+                DebugStub.Assert(kernelPDPE3 != PhysicalAddress.Null);
+            }
+
+            // Create the mappings for all the page-table structures
+            // we just set up so we can still manipulate them after
+            // we turn on paging!
+            BootstrapMapPageTable(pdpt);
+
+            return new AddressSpace(new PhysicalAddress((ulong)pdpt));
+        }
+
+        // For use during startup. Creates a mapping for all the physical
+        // pages currently being used to describe memory mappings (yes,
+        // this is confusing).
+        //
+        // Assumes paging is NOT on so that physical addresses can be
+        // used as-is
+        private static unsafe void BootstrapMapPageTable(PDPT* pdpt)
+        {
+            BootstrapEnsurePTs(pdpt, kernelPageTableBase, kernelPageTableLimit);
+            BootstrapEnsurePTs(pdpt, userPageTableBase, userPageTableLimit);
+
+            BootstrapMapPage(pdpt, (UIntPtr)pdptAddr, new PhysicalAddress((ulong)pdpt), true);
+
+            // First map the kernel page table pages
+            for (uint i = 0; i < numKernelPDPEs; i++) {
+                if (((*pdpt)[i])->Valid) {
+                    PDT* pdt = (PDT*)(((*pdpt)[i])->Address);
+
+                    BootstrapMapPage(pdpt,
+                                     kernelPageTableBase + kernelPDTOffset + MemoryManager.BytesFromPages(i),
+                                     new PhysicalAddress((ulong)pdt), true);
+
+                    for ( uint j = 0; j < 512; j++) {
+                        if (((*pdt)[j])->Valid) {
+                            PT* pt = (PT*)(((*pdt)[j])->Address);
+
+                            BootstrapMapPage(pdpt,
+                                             kernelPageTableBase + MemoryManager.BytesFromPages((i * 512) + j),
+                                             new PhysicalAddress((ulong)pt), true);
+                        }
+                    }
+                }
+            }
+
+            // Now map user-space page-table pages
+            for (uint i = 0; i < (4 - numKernelPDPEs); i++) {
+                if (((*pdpt)[numKernelPDPEs + i])->Valid) {
+                    PDT* pdt = (PDT*)(((*pdpt)[numKernelPDPEs + i])->Address);
+
+                    BootstrapMapPage(pdpt,
+                                     userPageTableBase + userPDTOffset + MemoryManager.BytesFromPages(i),
+                                     new PhysicalAddress((ulong)pdt), true);
+
+                    for ( uint j = 0; j < 512; j++) {
+                        if (((*pdt)[j])->Valid) {
+                            PT* pt = (PT*)(((*pdt)[j])->Address);
+
+                            BootstrapMapPage(pdpt,
+                                             userPageTableBase + MemoryManager.BytesFromPages((i * 512) + j),
+                                             new PhysicalAddress((ulong)pt), true);
+                        }
+                    }
+                }
+            }
+        }
+
+        // For use during startup. Makes sure the given PDPT points to
+        // enough PDTs (which are allocated as necessary) to describe the
+        // address range specified.
+        //
+        // Assumes paging is NOT on.
+        private static unsafe void BootstrapEnsurePDTs(PDPT* pdpt,
+                                                       UIntPtr startAddr,
+                                                       UIntPtr limitAddr)
+        {
+            limitAddr = MemoryManager.Pad(limitAddr, SpacePerPDT);
+            uint stepPDTidx = (uint)(startAddr / SpacePerPDT);
+            UIntPtr stepAddr = startAddr;
+
+            while (stepAddr < limitAddr) {
+                if (!((*pdpt)[stepPDTidx])->Valid) {
+                    PhysicalAddress newPDT = PhysicalPages.AllocPage();
+                    ((PDT*)newPDT.Value)->Init();
+                    ((*pdpt)[stepPDTidx])->Address = newPDT.Value;
+                    ((*pdpt)[stepPDTidx])->Valid = true;
+                }
+
+                stepPDTidx++;
+                stepAddr += SpacePerPDT;
+            }
+        }
+
+
+        // For use during startup. Makes sure there are enough PTs
+        // (which are allocated as necessary) to describe the address
+        // range specified.
+        //
+        // Assumes paging is NOT on.
+        private static unsafe void BootstrapEnsurePTs(PDPT* pdpt,
+                                                      UIntPtr startAddr,
+                                                      UIntPtr limitAddr)
+        {
+            limitAddr = MemoryManager.Pad(limitAddr, SpacePerPT);
+            BootstrapEnsurePDTs(pdpt, startAddr, limitAddr);
+
+            uint stepPDTidx = (uint)(startAddr / SpacePerPDT);
+            UIntPtr stepAddr = startAddr;
+
+            while (stepAddr < limitAddr) {
+                DebugStub.Assert(((*pdpt)[stepPDTidx])->Valid); // ensured above
+                PDT* pdt = (PDT*)(((*pdpt)[stepPDTidx])->Address);
+                UIntPtr offsetInPDT = MemoryManager.BytesNotAligned(stepAddr, SpacePerPDT);
+
+                uint stepPTidx = (uint)(offsetInPDT / SpacePerPT);
+
+                while ((stepAddr < limitAddr) && (stepPTidx < 512)) {
+                    if (!((*pdt)[stepPTidx])->Valid) {
+                        PhysicalAddress newPT = PhysicalPages.AllocPage();
+                        ((PT*)newPT.Value)->Init();
+                        ((*pdt)[stepPTidx])->Address = newPT.Value;
+                        ((*pdt)[stepPTidx])->User = true; // Ring3
+                        ((*pdt)[stepPTidx])->Valid = true;
+                        // Up to each page to set its writability
+                        ((*pdt)[stepPTidx])->Writeable = true;
+                    }
+
+                    stepPTidx++;
+                    stepAddr += SpacePerPT;
+                }
+
+                stepPDTidx++;
+            }
+        }
+
+        // For use during startup. Map a range of addresses.
+        //
+        // Assumes paging is NOT on.
+        private static unsafe void BootstrapMapRange(PDPT* pdpt,
+                                                     UIntPtr startAddr,
+                                                     UIntPtr limitAddr,
+                                                     PhysicalAddress physicalStart,
+                                                     bool writeable,
+                                                     bool writeThrough,
+                                                     bool cacheDisable)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(startAddr));
+            DebugStub.Assert(MemoryManager.IsPageAligned(limitAddr));
+            DebugStub.Assert(MemoryManager.IsPageAligned(physicalStart.Value));
+
+            BootstrapEnsurePTs(pdpt, startAddr, limitAddr);
+
+            uint stepPDTidx = (uint)(startAddr / SpacePerPDT);
+            UIntPtr stepAddr = startAddr;
+            ulong stepPhysical = physicalStart.Value;
+
+            while ((stepAddr < limitAddr) && (stepPDTidx < 4)) {
+                DebugStub.Assert(((*pdpt)[stepPDTidx])->Valid); // ensured above
+                PDT* pdt = (PDT*)((*pdpt)[stepPDTidx])->Address;
+
+                UIntPtr offsetInPDT = MemoryManager.BytesNotAligned(stepAddr, SpacePerPDT);
+                DebugStub.Assert(MemoryManager.IsPageAligned(offsetInPDT));
+                uint stepPTidx = (uint)(offsetInPDT / SpacePerPT);
+
+                while ((stepAddr < limitAddr) && (stepPTidx < 512)) {
+                    DebugStub.Assert(((*pdt)[stepPTidx])->Valid); // ensured above
+                    PT* pt = (PT*)(((*pdt)[stepPTidx])->Address);
+
+                    UIntPtr offsetInPT = MemoryManager.BytesNotAligned(stepAddr, SpacePerPT);
+                    DebugStub.Assert(MemoryManager.IsPageAligned(offsetInPT));
+                    uint pageIndex = (uint)MemoryManager.PagesFromBytes(offsetInPT);
+
+                    while ((stepAddr < limitAddr) && (pageIndex < 512)) {
+                        DebugStub.Assert(!((*pt)[pageIndex])->Valid);
+                        ((*pt)[pageIndex])->Address = stepPhysical;
+                        ((*pt)[pageIndex])->User = true; // Ring3
+                        ((*pt)[pageIndex])->Valid = true;
+                        ((*pt)[pageIndex])->Writeable = writeable;
+                        ((*pt)[pageIndex])->Global = stepAddr < BootInfo.KERNEL_BOUNDARY;
+                        ((*pt)[pageIndex])->WriteThrough = writeThrough;
+                        ((*pt)[pageIndex])->CacheDisable = cacheDisable;
+
+                        stepPhysical += MemoryManager.PageSize;
+                        pageIndex++;
+                        stepAddr += MemoryManager.PageSize;
+                    }
+
+                    stepPTidx++;
+                }
+
+                stepPDTidx++;
+            }
+
+            DebugStub.Assert(stepAddr >= limitAddr);
+        }
+
+        // For use during startup. Maps a single page of memory.
+        //
+        // Assumes paging is NOT on.
+        private static unsafe void BootstrapMapPage(PDPT* pdpt,
+                                                    UIntPtr pageAddr,
+                                                    PhysicalAddress physPage,
+                                                    bool writeable)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+            DebugStub.Assert(MemoryManager.IsPageAligned(physPage.Value));
+
+            BootstrapEnsurePTs(pdpt, pageAddr, pageAddr + MemoryManager.PageSize);
+
+            uint pdtIndex = (uint)(pageAddr / SpacePerPDT);
+            UIntPtr offsetInPDT = MemoryManager.BytesNotAligned(pageAddr, SpacePerPDT);
+            DebugStub.Assert(((*pdpt)[pdtIndex])->Valid); // ensured above
+            PDT* pdt = (PDT*)((*pdpt)[pdtIndex])->Address;
+
+            uint ptIndex = (uint)(offsetInPDT / SpacePerPT);
+            UIntPtr offsetInPT = MemoryManager.BytesNotAligned(offsetInPDT, SpacePerPT);
+            DebugStub.Assert(((*pdt)[ptIndex])->Valid); // ensured above;
+            DebugStub.Assert(((*pdt)[ptIndex])->User); // Ring3
+            PT* pt = (PT*)(((*pdt)[ptIndex])->Address);
+
+            uint pageIndex = (uint)MemoryManager.PagesFromBytes(offsetInPT);
+            DebugStub.Assert(!((*pt)[pageIndex])->Valid);
+
+            ((*pt)[pageIndex])->Address = physPage.Value;
+            ((*pt)[pageIndex])->User = true; // Ring3
+            ((*pt)[pageIndex])->Writeable = writeable;
+            ((*pt)[pageIndex])->Global = pageAddr < BootInfo.KERNEL_BOUNDARY;
+            ((*pt)[pageIndex])->Valid = true;
+        }
+
+        /////////////////////////////////////
+        // PRIVATE METHODS, POST-BOOTSTRAP
+        /////////////////////////////////////
+
+        //
+        // Create a new address space that just maps the (existing) kernel
+        // range.
+        //
+        private static unsafe AddressSpace CreateNewKernelSpace()
+        {
+            // REVIEW it's regrettable that we have to lock
+            // for access to the scratch area. Maybe we should try to
+            // reserve two pages of kernel-space memory instead?
+            bool iflag = ScratchLock();
+
+            try {
+                // Get a page to use as a PDPT and map it
+                PhysicalAddress physPage = PhysicalPages.AllocPage();
+                DebugStub.Assert(physPage != PhysicalAddress.Null);
+                MapPageInternal(physPage, scratchAddress1);
+                PDPT* pdpt = (PDPT*)scratchAddress1;
+
+                pdpt->Init();
+
+                ((*pdpt)[0])->Address = kernelPDPE1.Value;
+                ((*pdpt)[0])->Valid = true;
+
+                // This is klunky but we can't have static arrays...
+                if (numKernelPDPEs >= 2) {
+                    ((*pdpt)[1])->Address = kernelPDPE2.Value;
+                    ((*pdpt)[1])->Valid = true;
+                }
+
+                if (numKernelPDPEs >= 3) {
+                    ((*pdpt)[2])->Address = kernelPDPE3.Value;
+                    ((*pdpt)[2])->Valid = true;
+                }
+
+                DebugStub.Assert(numKernelPDPEs < 4);
+
+                PhysicalAddress sanity = UnmapPage(scratchAddress1);
+                DebugStub.Assert(sanity == physPage);
+
+                return new AddressSpace(physPage);
+            }
+            finally {
+                ScratchUnlock(iflag);
+            }
+        }
+
+        //
+        // Set up a kernel-only address space so its user range can be used.
+        //
+        private static unsafe void InitializeUserRange(AddressSpace space)
+        {
+            // Our task here is to set up enough PTs to cover the
+            // user range's page-table pages. This gets confusing because
+            // we also want to write mappings for the PDT and PTs we
+            // create.
+
+            // Assume the user-space page-table range doesn't straddle a PDT.
+            DebugStub.Assert((userPageTableBase / SpacePerPDT) ==
+                             ((userPageTableLimit - 1) / SpacePerPDT));
+
+            // REVIEW it's regrettable that we have to lock
+            // for access to the scratch area. Maybe we should try to
+            // reserve two pages of kernel-space memory instead?
+            bool iflag = ScratchLock();
+
+            try {
+                PT* pt = null;
+
+                // First create the PDT
+                PhysicalAddress newPdt = PhysicalPages.AllocPage();
+                DebugStub.Assert(newPdt != PhysicalAddress.Null);
+                MapPageInternal(newPdt, scratchAddress1);
+                PDT* pdt = (PDT*)scratchAddress1;
+                pdt->Init();
+
+                // We're going to need to make a mapping for the PDT
+                // so it is addressable at userPageTableBase + userPDTOffset.
+                // Figure out what PT and PTE that lands in.
+                UIntPtr bytesIntoPDTRange = MemoryManager.BytesNotAligned(
+                    userPageTableBase + userPDTOffset, SpacePerPDT);
+                uint pdtPTIdx = (uint)(bytesIntoPDTRange / SpacePerPT);
+
+                UIntPtr bytesIntoPTRange = MemoryManager.BytesNotAligned(
+                    bytesIntoPDTRange, SpacePerPT);
+                uint pdtPTEIdx = (uint)(bytesIntoPTRange / MemoryManager.PageSize);
+
+                // Same story for the PDPT, which gets mapped to a user-space
+                // address (pdptAddr).
+                bytesIntoPDTRange = MemoryManager.BytesNotAligned((UIntPtr)pdptAddr, SpacePerPDT);
+                uint pdptPTIdx = (uint)(bytesIntoPDTRange / SpacePerPT);
+
+                bytesIntoPTRange = MemoryManager.BytesNotAligned(
+                    bytesIntoPDTRange, SpacePerPT);
+                uint pdptPTEIdx = (uint)(bytesIntoPTRange / MemoryManager.PageSize);
+
+                // Now fill in as many PDT slots with new PTs as are
+                // necessary to cover the pagetable range
+                bytesIntoPDTRange = MemoryManager.BytesNotAligned(userPageTableBase, SpacePerPDT);
+                uint startPTIdx = (uint)(bytesIntoPDTRange / SpacePerPT);
+                bytesIntoPDTRange = MemoryManager.BytesNotAligned(userPageTableLimit, SpacePerPDT);
+                bytesIntoPDTRange = MemoryManager.Pad(bytesIntoPDTRange, SpacePerPT);
+                uint limitPTIdx = (uint)(bytesIntoPDTRange / SpacePerPT);
+                uint numPTs = limitPTIdx - startPTIdx;
+
+                for (uint i = startPTIdx; i < limitPTIdx; i++) {
+                    PhysicalAddress newPT = PhysicalPages.AllocPage();
+                    ((*pdt)[i])->Address = newPT.Value;
+                    ((*pdt)[i])->User = true; // Ring3
+                    ((*pdt)[i])->Valid = true;
+                    ((*pdt)[i])->Writeable = true; // each page sets this individually
+
+                    // Map in the new PT page
+                    MapPageInternal(newPT, scratchAddress2, i > startPTIdx);
+                    pt = (PT*)scratchAddress2;
+                    pt->Init();
+
+                    if (i == pdtPTIdx) {
+                        // This is the PT that the PTE for our new PDT
+                        // goes into (yes, that's confusing)
+                        ((*pt)[pdtPTEIdx])->Address = newPdt.Value;
+                        ((*pt)[pdtPTEIdx])->User = true; // Ring3
+                        ((*pt)[pdtPTEIdx])->Valid = true;
+                        ((*pt)[pdtPTEIdx])->Writeable = true;
+                    }
+
+                    if (i == pdptPTIdx) {
+                        // Same drill for the PDPT
+                        ((*pt)[pdptPTEIdx])->Address = space.PdptPage.Value;
+                        ((*pt)[pdptPTEIdx])->User = true; // Ring3
+                        ((*pt)[pdptPTEIdx])->Valid = true;
+                        ((*pt)[pdptPTEIdx])->Writeable = true;
+                    }
+                }
+
+                // Now, write mappings for all the new PT pages we just
+                // created. Assume here that all the PT page mappings
+                // fit into a single PT.
+                DebugStub.Assert(startPTIdx + numPTs < 512);
+
+                // Map the PT that will hold our PTEs
+                MapPageInternal(new PhysicalAddress(((*pdt)[startPTIdx])->Address),
+                                scratchAddress2, true);
+                pt = (PT*)scratchAddress2;
+
+                bytesIntoPTRange = MemoryManager.BytesNotAligned(userPageTableBase, SpacePerPT);
+                uint startPTEIdx = (uint)(bytesIntoPTRange / MemoryManager.PageSize);
+
+                for (uint i = 0; i < numPTs; i++) {
+                    ((*pt)[startPTEIdx + i])->Address = ((*pdt)[startPTIdx + i])->Address;
+                    DebugStub.Assert(((*pt)[startPTEIdx + i])->Address != 0);
+                    ((*pt)[startPTEIdx + i])->User = true; // Ring3
+                    ((*pt)[startPTEIdx + i])->Valid = true;
+                    ((*pt)[startPTEIdx + i])->Writeable = true;
+                }
+
+                PhysicalAddress sanity = UnmapPage(scratchAddress2);
+                DebugStub.Assert(sanity.Value == ((*pdt)[startPTIdx])->Address);
+
+                // Now flip scratchAddress1 to the PDPT for this space
+                MapPageInternal(space.PdptPage, scratchAddress1, true);
+                PDPT* pdpt = (PDPT*)scratchAddress1;
+
+                // Write our new PDT into the PDPT
+                uint pdtIdx = (uint)(userPageTableBase / SpacePerPDT);
+                DebugStub.Assert(pdtIdx >= numKernelPDPEs);
+
+                ((*pdpt)[pdtIdx])->Address = newPdt.Value;
+                ((*pdpt)[pdtIdx])->Valid = true;
+
+                sanity = UnmapPage(scratchAddress1);
+                DebugStub.Assert(sanity == space.PdptPage);
+            }
+            finally {
+                ScratchUnlock(iflag);
+            }
+        }
+
+        // Return a pointer to the PDT that describes the address
+        // range beginning at forAddr, allocating and mapping a
+        // new one if necessary.
+        private static unsafe PDT* EnsurePDT(UIntPtr forAddr)
+        {
+            PDPE* pdpe = GetPDPE(forAddr); // must succeed
+            PDT* retval = GetPDT(forAddr);
+
+            if (! IsPageMapped((UIntPtr)retval)) {
+                // Don't panic; grab a new page to use as a PDT
+                PhysicalAddress newPdt = PhysicalPages.AllocPage();
+
+                if (newPdt == PhysicalAddress.Null) {
+                    Kernel.Panic("Out of physical pages while trying to allocate a PDT");
+                    return null;
+                }
+
+                // Activate this page. If this faults, it means
+                // our address space wasn't set up properly with
+                // enough PTs to describe the page table pages.
+                MapPageInternal(newPdt, (UIntPtr)retval);
+
+                // Now we can address the new page
+                retval->Init();
+
+                // Point our parent PDPT here
+                DebugStub.Assert(!pdpe->Valid);
+                pdpe->Address = newPdt.Value;
+                pdpe->Valid = true;
+            } else {
+                DebugStub.Assert(pdpe->Valid);
+            }
+
+            return retval;
+        }
+
+        // Return a pointer to the PDE for the PT describing the
+        // memory range beginning at forAddr, allocating and
+        // mapping descriptors as necessary.
+        private static unsafe PDE* EnsurePDE(UIntPtr forAddr)
+        {
+            DebugStub.Assert(MemoryManager.BytesNotAligned(forAddr, SpacePerPT) == 0);
+            UIntPtr bytesIntoPDTRange = MemoryManager.BytesNotAligned(forAddr, SpacePerPDT);
+            EnsurePDT(forAddr - bytesIntoPDTRange);
+            return GetPDE(forAddr);
+        }
+
+        // Return a pointer to the PT that describes the address
+        // range beginning at forAddr, allocating and mapping a
+        // new one if necessary.
+        private static unsafe PT* EnsurePT(UIntPtr forAddr)
+        {
+            PDE* pde = EnsurePDE(forAddr);
+            PT* retval = GetPT(forAddr);
+
+            if (! IsPageMapped((UIntPtr)retval)) {
+                // Don't panic; grab a new page to use as a PT
+                PhysicalAddress newPt = PhysicalPages.AllocPage();
+
+                if (newPt == PhysicalAddress.Null) {
+                    Kernel.Panic("Out of physical pages while trying to allocate a PT");
+                    return null;
+                }
+
+                // Activate this page. If this faults, it means
+                // our address space wasn't set up properly with
+                // enough PTs to describe the page table pages.
+                MapPageInternal(newPt, (UIntPtr)retval);
+
+                // Now we can address the new page
+                retval->Init();
+
+                // Add ourselves to our parent PDT
+                DebugStub.Assert(!pde->Valid);
+                pde->Address = newPt.Value;
+                pde->User = true; // Ring3
+                pde->Valid = true;
+                pde->Writeable = true;
+            } else {
+                DebugStub.Assert(pde->Valid);
+            }
+
+            return retval;
+        }
+
+        // Return a pointer to the PTE for the given page address,
+        // allocating and mapping descriptors as necessary.
+        private static unsafe PTE* EnsurePTE(UIntPtr pageAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+
+            UIntPtr bytesIntoPTRange = MemoryManager.BytesNotAligned(pageAddr, SpacePerPT);
+            EnsurePT(pageAddr - bytesIntoPTRange);
+            return GetPTE(pageAddr);
+        }
+
+        // Return a pointer to the PDT that describes the address
+        // range beginning at forAddr, without ensuring that it is
+        // mapped.
+        private static unsafe PDT* GetPDT(UIntPtr forAddr)
+        {
+            // Make sure forAddr specifies a range that
+            // makes sense
+            DebugStub.Assert(MemoryManager.BytesNotAligned(forAddr, SpacePerPDT) == 0);
+
+            UIntPtr pdtBase = kernelPageTableBase + kernelPDTOffset;
+            UIntPtr addr = forAddr;
+
+            if (forAddr >= BootInfo.KERNEL_BOUNDARY) {
+                // User-space address
+                pdtBase = userPageTableBase + userPDTOffset;
+                addr -= BootInfo.KERNEL_BOUNDARY;
+            }
+
+            // Index into the table of PDTs
+            uint pdtIndex = (uint)(addr / SpacePerPDT);
+            return (PDT*)(pdtBase + MemoryManager.BytesFromPages(pdtIndex));
+        }
+
+        // Return a pointer to the PT that describes the address
+        // range beginning at forAddr, without ensuring that it is
+        // mapped.
+        private static unsafe PT* GetPT(UIntPtr forAddr)
+        {
+            DebugStub.Assert(MemoryManager.BytesNotAligned(forAddr, SpacePerPT) == 0);
+
+            UIntPtr ptBase = kernelPageTableBase;
+            UIntPtr addr = forAddr;
+
+            if (forAddr >= BootInfo.KERNEL_BOUNDARY) {
+                // User-space address
+                ptBase = userPageTableBase;
+                addr -= BootInfo.KERNEL_BOUNDARY;
+            }
+
+            // Index into the table of PTs
+            uint ptIndex = (uint)(addr / SpacePerPT);
+            return (PT*)(ptBase + MemoryManager.BytesFromPages(ptIndex));
+        }
+
+        // Return a pointer to the PDPE for the PDT that describes
+        // the memory range beginning at the provided address.
+        // We assume the PDPT is always mapped.
+        private static unsafe PDPE* GetPDPE(UIntPtr forAddr)
+        {
+            DebugStub.Assert(MemoryManager.BytesNotAligned(forAddr, SpacePerPDT) == 0);
+            uint PDTidx = (uint)(forAddr / SpacePerPDT);
+            return (*pdptAddr)[(uint)PDTidx];
+        }
+
+        // Return a pointer to the PDE for the PT that describes
+        // the memory range beginning at the provided address,
+        // without ensuring that the PDT is mapped
+        private static unsafe PDE* GetPDE(UIntPtr forAddr)
+        {
+            DebugStub.Assert(MemoryManager.BytesNotAligned(forAddr, SpacePerPT) == 0);
+            UIntPtr bytesIntoPDTRange = MemoryManager.BytesNotAligned(forAddr, SpacePerPDT);
+            uint ptWithinPDT = (uint)(bytesIntoPDTRange / SpacePerPT);
+            PDT* pdt = GetPDT(forAddr - bytesIntoPDTRange);
+            return (*pdt)[(uint)ptWithinPDT];
+        }
+
+        // Return a pointer to the PTE for the given page address,
+        // without ensuring that the PT is mapped.
+        private static unsafe PTE* GetPTE(UIntPtr pageAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+            UIntPtr bytesIntoPTRange = MemoryManager.BytesNotAligned(pageAddr, SpacePerPT);
+            uint pageWithinPT = (uint)MemoryManager.PagesFromBytes(bytesIntoPTRange);
+            PT* pt = GetPT(pageAddr - bytesIntoPTRange);
+            return (*pt)[pageWithinPT];
+        }
+
+        // This function directly examines the PTE for the virtual
+        // address of a page-table structure (this address should
+        // fall between pageTableBaseAddr and
+        // pageTableBaseAddr + PageTableSize), on the assumption
+        // that sufficient PTs to describe all page-table structures
+        // are always mapped.
+        private static unsafe bool IsKernelDescriptorPageMapped(UIntPtr pageAddr)
+        {
+            // Make sure this address is for a page-table element
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+            DebugStub.Assert(pageAddr >= kernelPageTableBase);
+            DebugStub.Assert(pageAddr < kernelPageTableLimit);
+            PTE* pte = GetPTE(pageAddr);
+
+            // If this faults, our address space wasn't set up right
+            return pte->Valid;
+        }
+
+        // Same for userland
+        private static unsafe bool IsUserDescriptorPageMapped(UIntPtr pageAddr)
+        {
+            // Make sure this address is for a page-table element
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+            DebugStub.Assert(pageAddr >= userPageTableBase);
+            DebugStub.Assert(pageAddr < userPageTableLimit);
+            PTE* pte = GetPTE(pageAddr);
+
+            // If this faults, our address space wasn't set up right
+            return pte->Valid;
+        }
+
+        //
+        // Writes a new virtual -> physical address into the page table,
+        // ASSUMING the right PT is already allocated and mapped.
+        //
+        private static unsafe void MapPageInternal(PhysicalAddress physAddr,
+                                                   UIntPtr virtualAddr,
+                                                   bool expectExistingMapping)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(virtualAddr));
+            PTE* pte = GetPTE(virtualAddr);
+
+            DebugStub.Assert(pte->Valid == expectExistingMapping,
+                             "Unexpected mapping state");
+
+            pte->Address = physAddr.Value;
+            pte->User = true; // Ring3
+            pte->Valid = true;
+            pte->Writeable = true;
+            pte->Global = virtualAddr < BootInfo.KERNEL_BOUNDARY;
+            Processor.InvalidateTLBEntry(virtualAddr);
+        }
+
+        private static unsafe void MapPageInternal(PhysicalAddress physAddr,
+                                                   UIntPtr virtualAddr)
+        {
+            // Expect to not overwrite an existing mapping
+            MapPageInternal(physAddr, virtualAddr, false);
+        }
+
+        [Inline]
+        [NoStackLinkCheck]
+        private static bool ScratchLock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            scratchSpin.Acquire(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [Inline]
+        [NoStackLinkCheck]
+        private static void ScratchUnlock(bool iflag)
+        {
+#if SINGULARITY_MP
+            scratchSpin.Release(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(iflag);
+        }
+    }
+}
+
+#endif // PAGING
diff --git a/base/Kernel/Singularity/Memory/VirtualMemoryRange.cs b/base/Kernel/Singularity/Memory/VirtualMemoryRange.cs
new file mode 100644
index 0000000..bfc648b
--- /dev/null
+++ b/base/Kernel/Singularity/Memory/VirtualMemoryRange.cs
@@ -0,0 +1,903 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   VirtualMemoryRange.cs
+//
+//  Note:
+//
+//  A VirtualMemoryRange is a window of contiguous virtual memory that supports
+//  general-purpose use. It comes with a (very) simple page allocator and a
+//  page table that tracks how each virtual page is being used, to support a GC.
+//
+
+#if PAGING
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.GCs;
+
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Memory
+{
+    //
+    // We need to create VirtualMemoryRanges very early, before we have the use
+    // of a GCable heap. But later on, it's very useful to be able to pass around
+    // references to them as objects. So, we have the struct, which primitive
+    // parts of the system use directly, and then a wrapper object (below) for general
+    // use.
+    //
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public struct VirtualMemoryRange_struct
+    {
+        /////////////////////////////////////
+        // PRIVATE FIELDS
+        /////////////////////////////////////
+
+        // The address range that we *manage*
+        private readonly UIntPtr rangeBase;
+        private readonly UIntPtr rangeLimit;
+
+        // The address range that our page table *describes*
+        private readonly UIntPtr descrBase;
+        private readonly UIntPtr descrLimit;
+
+        // Data begins above the rangeBase since we need room for our
+        // page table.
+        private readonly UIntPtr dataStart;
+
+        // Number of data pages we *describe*
+        private readonly UIntPtr describedPages;
+
+        // One uint per page in our range
+        private unsafe readonly uint* pageTable;
+
+
+        // Protects non-readonly fields
+        private static SpinLock rangeLock;
+
+        // The next address to be alloced
+        private UIntPtr nextAlloc;
+
+        // Statistics
+        private ulong allocatedBytes;
+        private ulong allocatedCount;
+        private ulong freedBytes;
+        private ulong freedCount;
+
+        /////////////////////////////////////
+        // PUBLIC METHODS
+        /////////////////////////////////////
+
+        //
+        // The range of memory turned over to a VirtualMemoryRange structure
+        // must not have *any* mapped pages in it to start out with
+        //
+        // A VirtualMemoryRange can build a pagetable that *describes*
+        // more memory than it *manages* (this supports some kernel GC
+        // oddities). In that case, pages out-of-range are marked
+        // as PageType.Unknown. Obviously, allocation requests are never
+        // satisfied with out-of-bounds data.
+        //
+        internal unsafe VirtualMemoryRange_struct(
+            UIntPtr baseAddr, UIntPtr limitAddr,
+            UIntPtr descrBaseAddr, UIntPtr descrLimitAddr,
+            ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(baseAddr));
+            DebugStub.Assert(MemoryManager.IsPageAligned(limitAddr));
+
+            // The descriptive range can't be smaller than the managed range
+            DebugStub.Assert(descrLimitAddr >= limitAddr);
+            DebugStub.Assert(descrBaseAddr <= baseAddr);
+
+            descrBase = descrBaseAddr;
+            descrLimit = descrLimitAddr;
+            rangeBase = baseAddr;
+            rangeLimit = limitAddr;
+            rangeLock = new SpinLock();
+
+            // Figure out how many pages we need for a page table
+            UIntPtr pageTableSize = descrLimit - descrBase;
+            pageTableSize = MemoryManager.PagesFromBytes(pageTableSize);
+            pageTableSize *= 4; // one uint per page
+            pageTableSize = MemoryManager.PagePad(pageTableSize);
+
+            dataStart = baseAddr + pageTableSize;
+            nextAlloc = dataStart;
+
+            describedPages = MemoryManager.PagesFromBytes(descrLimit - descrBase);
+
+            // Commit and prepare the page table
+            pageTable = (uint*)baseAddr;
+
+            bool success = MemoryManager.CommitAndMapRange(
+                baseAddr, baseAddr + pageTableSize, inDomain);
+
+            if (!success) {
+                Kernel.Panic("Couldn't get pages to create a new VirtualMemoryRange page table");
+            }
+
+            allocatedBytes = 0;
+            allocatedCount = 0;
+            freedBytes = 0;
+            freedCount = 0;
+
+            // Describe the pages outside our range as Unknown
+            if (descrBase < rangeBase) {
+                SetPages(descrBase, rangeBase, MemoryManager.PageUnknown);
+            }
+
+            if (descrLimit > rangeLimit) {
+                SetPages(rangeLimit, descrLimit, MemoryManager.PageUnknown);
+            }
+
+            // The page-table pages are in use by the System
+            SetPages((UIntPtr)pageTable,
+                     (UIntPtr)pageTable + pageTableSize,
+                     MemoryManager.KernelPageNonGC);
+
+            // Describe pages in-range as Free
+            SetPages(dataStart, rangeLimit, MemoryManager.PageFree);
+
+#if DEBUG
+            // Check that our data range is pristine
+            for (UIntPtr stepAddr = dataStart;
+                 stepAddr < rangeLimit;
+                 stepAddr += MemoryManager.PageSize) {
+                DebugStub.Assert(!VMManager.IsPageMapped(stepAddr));
+            }
+#endif
+        }
+
+        //
+        // Allocates but does not commit a new range of memory.
+        //
+        internal UIntPtr Reserve(UIntPtr numPages, Process process,
+                                 uint extra, PageType type)
+        {
+            DebugStub.Assert(numPages > 0);
+            bool iflag = Lock();
+
+            try {
+                return ReserveInternal(numPages, process, extra, type);
+            }
+            finally {
+                Unlock(iflag);
+            }
+        }
+
+        //
+        // Releases a previously reserved range of memory, but does not
+        // uncommit any pages.
+        //
+        internal UIntPtr Unreserve(UIntPtr startAddr, UIntPtr numPages, Process process)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(startAddr));
+            DebugStub.Assert(numPages > 0);
+            UIntPtr blockLimit = startAddr + MemoryManager.BytesFromPages(numPages);
+            DebugStub.Assert(startAddr >= dataStart);
+            DebugStub.Assert(blockLimit <= rangeLimit);
+
+            // Strictly a sanity check
+            uint tag = process != null ? process.ProcessTag : MemoryManager.KernelPage;
+            VerifyOwner(startAddr, blockLimit, tag);
+
+            return FreeInternal(startAddr, numPages);
+        }
+
+        //
+        // Allocates and commits a new range of memory.
+        //
+        internal UIntPtr Allocate(UIntPtr numPages, Process process,
+                                  uint extra, PageType type,
+                                  ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(numPages > 0);
+            UIntPtr mapAddr = UIntPtr.Zero;
+
+            bool iflag = Lock();
+
+            // Within our lock, figure out where we're going to stick the newly
+            // mapped memory, and mark it used.
+            try {
+                mapAddr = ReserveInternal(numPages, process, extra, type);
+
+                if (mapAddr == UIntPtr.Zero) {
+                    DebugStub.Assert(false, "Failed to find a mapping point for new memory");
+                    return mapAddr;
+                }
+            }
+            finally {
+                Unlock(iflag);
+            }
+
+            UIntPtr limitAddr = mapAddr + MemoryManager.BytesFromPages(numPages);
+
+            // Now actually map pages to the chosen region.
+            if (!MemoryManager.CommitAndMapRange(mapAddr, limitAddr, inDomain)) {
+                // yikes; failure
+                return UIntPtr.Zero;
+            }
+
+            allocatedCount++;
+            allocatedBytes += (ulong)MemoryManager.BytesFromPages(numPages);
+
+            if (process != null) {
+                process.Allocated(MemoryManager.BytesFromPages(numPages));
+            }
+
+            return mapAddr;
+        }
+
+        //
+        // Releases and uncommits a range of memory
+        //
+        internal unsafe UIntPtr Free(UIntPtr startPage,
+                                     UIntPtr numPages,
+                                     Process process)
+        {
+            DebugStub.Assert(startPage >= dataStart);
+            DebugStub.Assert(MemoryManager.IsPageAligned(startPage));
+            UIntPtr blockLimit = startPage + MemoryManager.BytesFromPages(numPages);
+            DebugStub.Assert(blockLimit <= rangeLimit);
+
+            //
+            // NOTE This is strictly a sanity check. The pagetable
+            // is ultimately not trustworthy because it is writeable by
+            // user-mode code.
+            //
+            uint tag = process != null ? process.ProcessTag : MemoryManager.KernelPage;
+            VerifyOwner(startPage, blockLimit, tag);
+
+            // Do it
+            return FreeAndUncommit(startPage, numPages);
+        }
+
+        // Returns the number of *addressable* pages, which may be less than
+        // the number of actually *usable* pages, if we describe a larger
+        // range than we manage.
+        internal UIntPtr PageCount
+        { get { return describedPages; } }
+
+        // This lets the caller look directly into the page table; beware!
+        internal unsafe uint* PageTable
+        { get { return pageTable; } }
+
+        internal UIntPtr AllocateExtend(UIntPtr addr,
+                                        UIntPtr bytes,
+                                        Process process,
+                                        uint extra,
+                                        PageType type)
+        {
+            // TODO: Extend not yet implemented
+            DebugStub.Break();
+            return (UIntPtr)null;
+        }
+
+        //
+        // Releases and uncommits all pages that are marked as belonging to a
+        // particular process.
+        //
+        internal unsafe UIntPtr FreeAll(Process process)
+        {
+            DebugStub.Assert(process != null);
+            DebugStub.Assert(process.ProcessTag != MemoryManager.KernelPage);
+
+            uint tag = process.ProcessTag & MemoryManager.ProcessPageMask;
+            uint *pageLimit = PageTable + PageCount;
+            UIntPtr bytesFreed = 0;
+
+            //
+            // NOTE here we choose to use the pagetable data,
+            // which is writeable by user-mode code. Keep in mind that
+            // it may be corrupt. We choose NOT to lock while traversing
+            // for a particular process' pages because no further allocations
+            // should occur tagged for that process once it's been stopped.
+            // Obviously, a rogue process may make more pages that appear
+            // to be owned by the zombie process appear.
+            //
+            for (uint *begin = PageTable; begin < pageLimit;) {
+                uint *limit = begin;
+                uint val = (*limit++) & MemoryManager.ProcessPageMask;
+
+                if (val == tag) {
+                    while ((((*limit) & MemoryManager.ProcessPageMask) == tag) && (limit < pageLimit)) {
+                        limit++;
+                    }
+
+                    UIntPtr startPage = (UIntPtr)(begin - PageTable);
+                    UIntPtr pageCount = (UIntPtr)(limit - begin);
+
+                    bytesFreed += FreeAndUncommit(AddrFromPage(startPage), pageCount);
+                }
+                else {
+                    while ((((*limit) & MemoryManager.ProcessPageMask) != tag) && (limit < pageLimit)) {
+                        limit++;
+                    }
+                }
+
+                begin = limit;
+            }
+
+            if (process != null) {
+                process.Freed(bytesFreed);
+            }
+
+            return bytesFreed;
+        }
+
+        //
+        // Sets a range of pages to have the provided tag
+        //
+        internal unsafe void SetPages(UIntPtr startAddr, UIntPtr limitAddr, uint tag)
+        {
+            DebugStub.Assert(startAddr >= descrBase);
+            DebugStub.Assert(limitAddr <= descrLimit);
+
+            UIntPtr startIdx = PageFromAddr(startAddr);
+            UIntPtr limitIdx = MemoryManager.PageFromAddr(limitAddr - descrBase);
+            DebugStub.Assert(limitIdx <= PageCount);
+
+            for (UIntPtr i = startIdx; i < limitIdx; i++) {
+                pageTable[(uint)i] = tag;
+            }
+        }
+
+        internal PageType Query(UIntPtr queryAddr,
+                                Process process,
+                                out UIntPtr regionAddr,
+                                out UIntPtr regionSize)
+        {
+            // TODO: Query not yet implemented
+            DebugStub.Break();
+            regionAddr = 0;
+            regionSize = 0;
+            return 0;
+        }
+
+        internal unsafe void Dump(string where)
+        {
+            // TODO: Dump not yet implemented
+        }
+
+        public UIntPtr GetMaxMemory()
+        {
+            // Return the amount of space we *manage*
+            return rangeLimit - rangeBase;
+        }
+
+        public unsafe UIntPtr GetFreeMemory()
+        {
+            // Report as free only that memory above our current
+            // allocate-next mark (even though there may be
+            // free holes below that mark that get reclaimed
+            // later)
+            return rangeLimit - nextAlloc;
+        }
+
+        public unsafe UIntPtr GetUsedMemory()
+        {
+            return GetMaxMemory() - GetFreeMemory();
+        }
+
+        public void GetUsageStatistics(out ulong allocatedCount,
+                                       out ulong allocatedBytes,
+                                       out ulong freedCount,
+                                       out ulong freedBytes)
+        {
+            allocatedCount = this.allocatedCount;
+            allocatedBytes = this.allocatedBytes;
+            freedCount = this.freedCount;
+            freedBytes = this.freedBytes;
+        }
+
+        internal UIntPtr PageFromAddr(UIntPtr addr)
+        {
+            DebugStub.Assert(addr >= descrBase);
+            DebugStub.Assert(addr < descrLimit);
+            return MemoryManager.PageFromAddr(addr - descrBase);
+        }
+
+        internal UIntPtr AddrFromPage(UIntPtr pageNum)
+        {
+            DebugStub.Assert(pageNum < PageCount);
+            return descrBase + MemoryManager.BytesFromPages(pageNum);
+        }
+
+        internal UIntPtr BaseAddress
+        {
+            get {
+                // Return the first *described* address
+                return descrBase;
+            }
+        }
+
+        // Returns the first address at which we may allocate memory.
+        // For validating pointers into this range.
+        internal UIntPtr DataStartAddr
+        {
+            get {
+                return dataStart;
+            }
+        }
+
+        // Returns the limit of the range we use for allocations.
+        internal UIntPtr DataLimitAddr
+        {
+            get {
+                return rangeLimit;
+            }
+        }
+
+        /////////////////////////////////////
+        // PRIVATE METHODS
+        /////////////////////////////////////
+
+        //
+        // Finds a contiguous block of virtual memory.
+        //
+        // *** CALLER MUST HOLD OUR PROTECTIVE LOCK! ***
+        //
+        // We don't acquire the spinlock ourselves in case the caller
+        // wants to do more work within it.
+        //
+        // Currently, the approach is VERY simplistic; we just keep handing out
+        // pages starting with the base of the virtual memory space until we
+        // bump into the top, and then we become much more inefficient.
+        //
+        // The expectation is that higher-level components will do smarter
+        // space management than this!
+        //
+        private UIntPtr ReserveInternal(UIntPtr numPages, Process process, uint extra, PageType type)
+        {
+            UIntPtr mapAddr = UIntPtr.Zero;
+
+            if (nextAlloc + MemoryManager.BytesFromPages(numPages) <= rangeLimit) {
+                mapAddr = nextAlloc;
+                UIntPtr limitAddr = mapAddr + MemoryManager.BytesFromPages(numPages);
+                nextAlloc = limitAddr;
+
+                uint tag =
+                    (process != null ? process.ProcessTag : MemoryManager.KernelPage)
+                    | (extra & MemoryManager.ExtraMask)
+                    | (uint)type;
+
+                SetPages(mapAddr, limitAddr, tag);
+            }
+            else {
+                // TODO slow-path allocation not yet implemented
+            }
+
+            return mapAddr;
+        }
+
+        private unsafe UIntPtr FreeAndUncommit(UIntPtr startPage,
+                                               UIntPtr numPages)
+        {
+            // Drop all the memory
+            MemoryManager.UnmapAndReleaseRange(
+                startPage, startPage + MemoryManager.BytesFromPages(numPages));
+
+            // Do the bookkeeping
+            return FreeInternal(startPage, numPages);
+        }
+
+        private unsafe UIntPtr FreeInternal(UIntPtr startPage,
+                                            UIntPtr numPages)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(startPage));
+            DebugStub.Assert(startPage >= dataStart);
+            UIntPtr blockLimit = startPage + MemoryManager.BytesFromPages(numPages);
+            DebugStub.Assert(blockLimit <= rangeLimit);
+            DebugStub.Assert(nextAlloc >= blockLimit);
+
+            bool iflag = Lock();
+
+            try {
+                // Mark the pages free within our lock so we can rely on
+                // blocks being uniformly marked free in here
+                SetPages(startPage, blockLimit, MemoryManager.PageFree);
+
+                // Reduce fragmentation: lower the nextAlloc pointer if
+                // we have freed the top end of memory.
+                if (nextAlloc == blockLimit) {
+                    nextAlloc = startPage;
+
+                    //
+                    // NOTE this chooses to use the page table
+                    // information, which is currently usermode-accessible
+                    // in the case of a user-mode range. Keep in mind that
+                    // the information may be corrupt!
+                    //
+
+                    // Further optimization: drop nextAlloc more
+                    // if the memory below us is free, too.
+                    uint* pageTable = PageTable;
+                    UIntPtr stepPage = nextAlloc;
+                    uint val;
+
+                    do {
+                        nextAlloc = stepPage;
+                        stepPage -= MemoryManager.PageSize;
+                        uint dsc = pageTable[(uint)PageFromAddr(stepPage)];
+                        val = dsc & MemoryManager.SystemPageMask;
+                    }
+                    while((val == MemoryManager.PageFree) &&
+                          (!VMManager.IsPageMapped(stepPage))); // sanity
+                }
+
+                freedCount++;
+                freedBytes += (ulong)MemoryManager.BytesFromPages(numPages);
+            }
+            finally {
+                Unlock(iflag);
+            }
+
+            return MemoryManager.BytesFromPages(numPages);
+        }
+
+        // Confirms that the provided tag is consistent with the pagetable over
+        // a certain range
+        private unsafe void VerifyOwner(UIntPtr startAddr, UIntPtr limitAddr, uint tag)
+        {
+#if DEBUG
+            DebugStub.Assert(startAddr >= dataStart);
+            DebugStub.Assert(limitAddr <= rangeLimit);
+
+            UIntPtr startIdx = PageFromAddr(startAddr);
+            UIntPtr limitIdx = MemoryManager.PagesFromBytes(limitAddr - descrBase);
+            DebugStub.Assert(limitIdx < PageCount);
+
+            tag &= MemoryManager.ProcessPageMask;
+
+            for (UIntPtr i = startIdx; i < limitIdx; i++) {
+                DebugStub.Assert
+                    ((pageTable[(uint)i] & MemoryManager.ProcessPageMask) == tag,
+                     "VirtualMemoryRange.VerifyOwner page={0} i={1} tag={2}",
+                     __arglist(i, i, tag));
+            }
+#endif
+        }
+
+        [Inline]
+        [NoStackLinkCheck]
+        private static bool Lock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            rangeLock.Acquire(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [Inline]
+        [NoStackLinkCheck]
+        private static void Unlock(bool iflag)
+        {
+#if SINGULARITY_MP
+            rangeLock.Release(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(iflag);
+        }
+
+    }
+
+    //
+    // This wrapper is not pretty. We want to use it to wrap structs that were
+    // placed at early-boot time into static memory, as well as structs that
+    // are allocated later when we have the use of a GC heap.
+    //
+    // The natural way to write this would be to write an abstract base class
+    // and then a subclass that knows how to wrap a pointer, and another that
+    // wraps an instance of the struct. Here, we cheezily trade a test for
+    // the VTable indirection.
+    //
+    public class VirtualMemoryRange
+    {
+        // We only use one or the other of these two fields
+        private readonly unsafe VirtualMemoryRange_struct* pRange;
+        private VirtualMemoryRange_struct range;
+        private readonly bool indirect; // true -> we use pRange
+        private readonly ProtectionDomain parentDomain;
+
+        internal unsafe VirtualMemoryRange(VirtualMemoryRange_struct* pRange,
+                                           ProtectionDomain inDomain)
+        {
+            this.pRange = pRange;
+            this.indirect = true;
+            // never use this.range
+            DebugStub.Assert(inDomain != null);
+            this.parentDomain = inDomain;
+        }
+
+        internal unsafe VirtualMemoryRange(UIntPtr baseAddr,
+                                           UIntPtr limitAddr,
+                                           ProtectionDomain inDomain)
+        {
+            DebugStub.Assert(inDomain != null);
+            this.parentDomain = inDomain;
+
+            range = new VirtualMemoryRange_struct(baseAddr, limitAddr,
+                                                  baseAddr, limitAddr,
+                                                  inDomain);
+            this.indirect = false;
+            // never use this.pRange
+        }
+
+        internal ProtectionDomain ParentDomain {
+            get {
+                return this.parentDomain;
+            }
+        }
+
+        internal unsafe UIntPtr Reserve(UIntPtr numPages, Process process,
+                                        uint extra, PageType type)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->Reserve(numPages, process, extra, type);
+            } else {
+                return range.Reserve(numPages, process, extra, type);
+            }
+        }
+
+        internal unsafe UIntPtr Unreserve(UIntPtr startPage, UIntPtr numPages,
+                                          Process process)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->Unreserve(startPage, numPages, process);
+            } else {
+                return range.Unreserve(startPage, numPages, process);
+            }
+        }
+
+        internal unsafe UIntPtr Allocate(UIntPtr numPages, Process process,
+                                         uint extra, PageType type)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->Allocate(numPages, process, extra, type,
+                                        parentDomain);
+            } else {
+                return range.Allocate(numPages, process, extra, type,
+                                      parentDomain);
+            }
+        }
+
+        internal unsafe UIntPtr Free(UIntPtr startPage, UIntPtr numPages,
+                                     Process process)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->Free(startPage, numPages, process);
+            } else {
+                return range.Free(startPage, numPages, process);
+            }
+        }
+
+        internal unsafe UIntPtr PageCount
+        {
+            get {
+                CheckAddressSpace();
+
+                if (indirect) {
+                    return pRange->PageCount;
+                } else {
+                    return range.PageCount;
+                }
+            }
+        }
+
+        internal unsafe uint* PageTable
+        {
+            get {
+                CheckAddressSpace();
+
+                if (indirect) {
+                    return pRange->PageTable;
+                } else {
+                    return range.PageTable;
+                }
+            }
+        }
+
+        internal unsafe UIntPtr AllocateExtend(UIntPtr addr,
+                                               UIntPtr bytes,
+                                               Process process,
+                                               uint extra,
+                                               PageType type)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->AllocateExtend(addr, bytes, process, extra, type);
+            } else {
+                return range.AllocateExtend(addr, bytes, process, extra, type);
+            }
+        }
+
+        internal unsafe UIntPtr FreeAll(Process process)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->FreeAll(process);
+            } else {
+                return range.FreeAll(process);
+            }
+        }
+
+        internal unsafe PageType Query(UIntPtr queryAddr,
+                                       Process process,
+                                       out UIntPtr regionAddr,
+                                       out UIntPtr regionSize)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->Query(queryAddr, process,
+                                     out regionAddr, out regionSize);
+            } else {
+                return range.Query(queryAddr, process,
+                                   out regionAddr, out regionSize);
+            }
+        }
+
+        internal unsafe void Dump(string where)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                pRange->Dump(where);
+            } else {
+                range.Dump(where);
+            }
+        }
+
+        internal unsafe UIntPtr GetMaxMemory()
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->GetMaxMemory();
+            } else {
+                return range.GetMaxMemory();
+            }
+        }
+
+        internal unsafe UIntPtr GetFreeMemory()
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->GetFreeMemory();
+            } else {
+                return range.GetFreeMemory();
+            }
+        }
+
+        internal unsafe UIntPtr GetUsedMemory()
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->GetUsedMemory();
+            } else {
+                return range.GetUsedMemory();
+            }
+        }
+
+        internal unsafe void GetUsageStatistics(out ulong allocatedCount,
+                                                out ulong allocatedBytes,
+                                                out ulong freedCount,
+                                                out ulong freedBytes)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                pRange->GetUsageStatistics(
+                    out allocatedCount, out allocatedBytes,
+                    out freedCount, out freedBytes);
+            } else {
+                range.GetUsageStatistics(
+                    out allocatedCount, out allocatedBytes,
+                    out freedCount, out freedBytes);
+            }
+        }
+
+        internal unsafe UIntPtr PageFromAddr(UIntPtr addr)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->PageFromAddr(addr);
+            } else {
+                return range.PageFromAddr(addr);
+            }
+        }
+
+        internal unsafe UIntPtr AddrFromPage(UIntPtr pageNum)
+        {
+            CheckAddressSpace();
+
+            if (indirect) {
+                return pRange->AddrFromPage(pageNum);
+            } else {
+                return range.AddrFromPage(pageNum);
+            }
+        }
+
+        internal unsafe UIntPtr BaseAddress
+        {
+            get {
+                CheckAddressSpace();
+
+                if (indirect) {
+                    return pRange->BaseAddress;
+                } else {
+                    return range.BaseAddress;
+                }
+            }
+        }
+
+        internal unsafe UIntPtr DataStartAddr
+        {
+            get {
+                CheckAddressSpace();
+
+                if (indirect) {
+                    return pRange->DataStartAddr;
+                } else {
+                    return range.DataStartAddr;
+                }
+            }
+        }
+
+        internal unsafe UIntPtr DataLimitAddr
+        {
+            get {
+                CheckAddressSpace();
+
+                if (indirect) {
+                    return pRange->DataLimitAddr;
+                } else {
+                    return range.DataLimitAddr;
+                }
+            }
+        }
+
+        [Inline]
+        private unsafe void CheckAddressSpace()
+        {
+#if DEBUG
+            UIntPtr rangeLimit;
+
+            if (indirect) {
+                rangeLimit = pRange->DataLimitAddr;
+            } else {
+                rangeLimit = range.DataLimitAddr;
+            }
+
+            if (rangeLimit > BootInfo.KERNEL_BOUNDARY) {
+                // We are a user-space range. We had better
+                // be using the right address space!
+                DebugStub.Assert(parentDomain.AddressSpace == Processor.GetCurrentAddressSpace());
+            } // else we are a kernel range and are always mapped.
+#endif
+        }
+    }
+}
+
+#endif // PAGING
diff --git a/base/Kernel/Singularity/Monitoring.cs b/base/Kernel/Singularity/Monitoring.cs
new file mode 100644
index 0000000..3afc28d
--- /dev/null
+++ b/base/Kernel/Singularity/Monitoring.cs
@@ -0,0 +1,275 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:  Monitoring.cs
+//
+//  Note:  Provides a little bit more sophisticated runtime monitoring (i.e.,
+//         writing and reading events will be possible concurrently at runtime)
+//         facility for performance and other debugging
+//
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class Monitoring
+    {
+        [AccessedByRuntime("referenced from Monitoring.cpp")]
+        public struct LogEntry
+        {
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ulong    cycleCount;     // bytes 0..7
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public UIntPtr  eip;            // bytes 8..11
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ushort   threadId;       // bytes 12..13
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ushort   processId;      // bytes 14..15
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ushort   provider;       // bytes 16..17
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ushort   type;           // bytes 18..19
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public unsafe byte * text;      // bytes 20..23
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ushort   cpu;           // bytes 24..25
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public ushort   version;       // bytes 26..27
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public UIntPtr  arg0;           // bytes 28..31
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public UIntPtr  arg1;           // bytes 32..35
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public UIntPtr  arg2;           // bytes 36..38
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public UIntPtr  arg3;           // bytes 40..43
+            [AccessedByRuntime("referenced from Monitoring.cpp")]
+            public UIntPtr  arg4;           // bytes 44..47
+        }
+
+        // This does not work, probably a Bartok problem
+//        [AccessedByRuntime("referenced from Monitoring.cpp")]
+//        public struct IndexEntry
+//        {
+//            [AccessedByRuntime("referenced from Monitoring.cpp")]
+//            public /*volatile*/ ulong data;     // bytes 0..7
+//        }
+
+        // Note: These fields are initialized by the code in Monitoring.cpp.
+        //
+        [AccessedByRuntime("referenced from Monitoring.cpp")]
+        private static unsafe byte * buffer;
+        //
+        // End Note.
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Initialize();
+
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        private static unsafe void InitPages(UIntPtr bytes)
+        {
+            UIntPtr pages = MemoryManager.PagesFromBytes(
+                MemoryManager.PagePad(bytes));
+
+            buffer = (byte *)MemoryManager.KernelAllocate(
+                pages, null, 0, System.GCs.PageType.NonGC).ToPointer();
+        }
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        private static unsafe UIntPtr InitText(UIntPtr bytes)
+        {
+            UIntPtr pages = MemoryManager.PagesFromBytes(
+                MemoryManager.PagePad(bytes));
+
+            return MemoryManager.KernelAllocate(
+                pages, null, 0, System.GCs.PageType.NonGC);
+        }
+#endif
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Finalize();
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern byte *
+        CompareExchange(byte **dest, byte *exch, byte *comp);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern LogEntry *
+        CompareExchange(LogEntry **dest, LogEntry *exch, LogEntry *comp);
+
+        public static unsafe void GetMonitoringHeaders(out byte * _buffer)
+        {
+            _buffer = buffer;
+        }
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern LogEntry * IndexToPointer(ushort index);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern ushort Dequeue();
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern void Enqueue(ushort newElement);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern void Enqueue(ushort newElement,
+                                                  ulong * ptr);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern byte * AddText(byte *buffer, string arg);
+
+        /* Well-known provider IDs */
+        public struct Provider
+        {
+            public const ushort SysInfo          = 1;
+            public const ushort Cassini          = 3;
+            public const ushort Shell            = 5;
+            public const ushort Endpoint         = 8;
+            public const ushort ChannelService   = 9;
+            public const ushort WaitHandle       = 10;
+            public const ushort AutoResetEvent   = 11;
+            public const ushort Mutex            = 12;
+            public const ushort ManualResetEvent = 13;
+            public const ushort EndpointCore     = 14;
+            public const ushort Process          = 19;
+            public const ushort Thread           = 20;
+            public const ushort DiskIo           = 21;
+            public const ushort WebServer        = 22;  // Not Cassini
+            public const ushort Directory        = 23;  // see Windows\ETS\Directory.tmf
+            public const ushort GC               = 25;
+            public const ushort Iso9660          = 26;
+            public const ushort Processor        = 30;
+        }
+
+        [Conditional("Monitoring")]
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern void Log(ushort provider, ushort type,
+            ushort version, uint a0, uint a1,
+            uint a2, uint a3, uint a4);
+
+        [Conditional("Monitoring")]
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern void Log(ushort provider, ushort type);
+
+        [Conditional("Monitoring")]
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern void Log(ushort provider, ushort type,
+            string s);
+
+        /* \brief Return one LogEntry to caller
+         * \param min_counter minimum event counter to read event for, will be
+         *                    modified and contains the actually read event in
+         *                    it after return
+         * \param log         log entry to be filled
+         */
+        public static unsafe int GetEntry(ref ulong min_counter,
+                                          out LogEntry log)
+        {
+            int ret;
+
+            fixed (LogEntry * pl = &log)
+            {
+                fixed (ulong * pm = &min_counter)
+                {
+                    ret = FillLogEntry(pl, pm);
+                }
+            }
+            return ret;
+        }
+
+        /* \brief Return text part for log entry
+         * \param src      where to get the data from
+         * \param counter  counter to expect at start of src
+         * \param dst      where to copy the byte array to
+         * \param max_size copy max_size bytes at max
+         */
+        public static unsafe int GetText(byte * src, ulong counter, byte * dst,
+                                         int max_size)
+        {
+            int ret;
+
+            ret = FillTextEntry(src, counter, dst, max_size);
+            return ret;
+        }
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern int FillLogEntry(LogEntry * log,
+                                                     ulong * min_counter);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern int
+        FillTextEntry(byte * src, ulong counter, byte * dst, int max_size);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(32)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern bool isActive();
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(32)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern void setActive(bool active);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern
+        void DebugTest(out ulong h_ts, out ulong t_ts, out ulong min,
+                       out ulong max);
+
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern uint ConsistencyCheck();
+
+/*
+        [AccessedByRuntime("output to header : defined in Monitoring.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static unsafe extern LogEntry * CreateLog(byte severity,
+                                                          UIntPtr eip,
+                                                          int chars,
+                                                          out byte *text);
+                                                          */
+    }
+}
diff --git a/base/Kernel/Singularity/MpBootInfo.cs b/base/Kernel/Singularity/MpBootInfo.cs
new file mode 100644
index 0000000..1402cb4
--- /dev/null
+++ b/base/Kernel/Singularity/MpBootInfo.cs
@@ -0,0 +1,105 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: MpBootInfo.cs
+//
+//  Note:
+//    This structure holds values needed to bring the application processors
+//    into protected mode.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity
+{
+    [StructLayout(LayoutKind.Sequential, Pack=4)]
+    [CLSCompliant(false)]
+    public struct MpBootInfo
+    {
+#if SINGULARITY_MP
+        [AccessedByRuntime("referenced in c++")]
+        public const uint MAX_CPU =
+#  if MAX_CPU4
+                                    4;
+#  elif MAX_CPU3
+                                    3;
+#  elif MAX_CPU2
+                                    2;
+#  else
+#  error "MAX_CPUx needs conversion definition."
+#  endif  // MAX_CPUX
+#else
+        [AccessedByRuntime("referenced in c++")]
+        public const uint MAX_CPU = 1;
+#endif // SINGULARITY_MP
+
+        [AccessedByRuntime("referenced in c++")]
+        public const uint Signature = 0x4d504249; // "MPBI"
+
+        // Settings for next processor to enter protected mode
+        [AccessedByRuntime("referenced in c++")]
+        public uint     signature;
+        [AccessedByRuntime("referenced in c++")]
+        public UIntPtr  KernelStackBegin;
+        [AccessedByRuntime("referenced in c++")]
+        public UIntPtr  KernelStack;
+        [AccessedByRuntime("referenced in c++")]
+        public UIntPtr  KernelStackLimit;
+        [AccessedByRuntime("referenced in c++")]
+        public volatile int TargetCpu;
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(16)]
+        internal static unsafe extern MpBootInfo * HalGetMpBootInfo();
+
+        [AccessedByRuntime("referenced in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(16)]
+        internal static unsafe extern void HalReleaseMpStartupLock();
+
+        public static unsafe bool PrepareForCpuStart(int targetCpu)
+        {
+            UIntPtr size = MemoryManager.PagePad(
+                new UIntPtr(BootInfo.KERNEL_STACK_LIMIT - BootInfo.KERNEL_STACK_BEGIN)
+                );
+
+            MpBootInfo* mbi = HalGetMpBootInfo();
+            mbi->KernelStackBegin = MemoryManager.KernelAllocate(
+                MemoryManager.PagesFromBytes(size), null, 0, System.GCs.PageType.Stack);
+
+            if (mbi->KernelStackBegin == UIntPtr.Zero)
+            {
+                mbi->KernelStackLimit = UIntPtr.Zero;
+                mbi->KernelStack      = UIntPtr.Zero;
+                mbi->signature        = 0;
+                return false;
+            }
+
+            mbi->KernelStackLimit = mbi->KernelStackBegin + size;
+            mbi->KernelStack      = mbi->KernelStackLimit - (BootInfo.KERNEL_STACK_LIMIT - BootInfo.KERNEL_STACK);
+            mbi->signature = Signature;
+
+            mbi->TargetCpu = targetCpu;
+            HalReleaseMpStartupLock();
+
+            return true;
+        }
+
+        // NB attribute is necessary to get definition of MpBootInfo as
+        // a struct by Bartok for all builds (including those that do not
+        // use MpBootInfo).
+        [AccessedByRuntime("referenced in c++")]
+        public static unsafe MpBootInfo GetMpBootInfo()
+        {
+            MpBootInfo *ptr = HalGetMpBootInfo();
+            return *ptr;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/MpBootStatus.cs b/base/Kernel/Singularity/MpBootStatus.cs
new file mode 100644
index 0000000..9de4b68
--- /dev/null
+++ b/base/Kernel/Singularity/MpBootStatus.cs
@@ -0,0 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: MpBootStatus.cs
+//
+//  Note:
+//    This structure just contains a list of constants that are used to
+//    signify the progress of processors as they are bought up by the BSP.
+//
+
+namespace Microsoft.Singularity
+{
+    using System.Runtime.CompilerServices;
+    using System;
+
+    /// <summary> Constants used in MP systems to describe the
+    /// progress of an initializing application processor
+    /// (AP). </summary>
+    [CLSCompliant(false)]
+    public struct MpBootStatus
+    {
+        [AccessedByRuntime("referenced in c++")]
+        public const uint Phase1Entry = 0x00000001;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint Phase2Entry = 0x00000002;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint Phase3Entry = 0x00000003;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint UndumpEntry = 0x00000004;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint HalEntry    = 0x00000005;
+
+        [AccessedByRuntime("referenced in c++")]
+        public const uint FailureMask  = 0x80000000;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint BadSignature = 0x80000001;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint ConfigLimit  = 0x80000002;
+        [AccessedByRuntime("referenced in c++")]
+        public const uint AllocFailure = 0x80000003;
+
+        // XXX the following are just to keep Bartok happy.
+        // Without nop this struct is generated as a class.
+        // Without dummy Bartok falls over.
+        int dummy;
+
+        [AccessedByRuntime("referenced in c++")]
+        public static void nop() {}
+    }
+}
diff --git a/base/Kernel/Singularity/MpExecution.cs b/base/Kernel/Singularity/MpExecution.cs
new file mode 100644
index 0000000..deaed3d
--- /dev/null
+++ b/base/Kernel/Singularity/MpExecution.cs
@@ -0,0 +1,773 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MpExecution.cs
+//
+//  Note:
+//          The purpose of this class is to control the execution state of
+//  processors on MP systems.  Specifically, to stop processors running
+//  while the debugger is active and while a GC is running.
+//
+//  NB These functions may be called with the debugger
+//  communications lock held.  Any calls to DebugStub.Print or
+//  its ilk will cause processor to spin on lock forever.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.X86;
+
+namespace Microsoft.Singularity
+{
+    [CLSCompliant(false)]
+    public class MpExecution
+    {
+        // Enumeration of Processor states
+        const int Uninitialized = 0x00;   // Processor state uninitialized
+        const int Running       = 0x01;   // Processor running normally
+        const int TargetFrozen  = 0x02;   // Processor should stop
+        const int TargetThaw    = 0x04;   // Processor should continue
+        const int FreezeActive  = 0x08;   // Processor is active during freeze
+        const int FreezeOwner   = 0x10;   // Processor initiating freeze
+
+        static internal volatile bool FreezeRequested;
+
+        static SpinLock                 freezeLock;
+        static volatile int             freezeCount;
+        static unsafe ProcessorContext* activeCpuContext;
+        static unsafe ProcessorContext* ownerCpuContext;
+
+        [ NoHeapAllocation ]
+        static internal unsafe void AddProcessorContext(ProcessorContext* context)
+        {
+            // Add processor to list of processors in MP system.  Careful
+            // to avoid adding processor mid-freeze or without lock.
+          start:
+            freezeLock.Acquire();
+            try {
+                if (FreezeRequested)
+                    goto start;
+                ProcessorContext* head = Processor.processorTable[0].context;
+                context->nextProcessorContext = head->nextProcessorContext;
+                head->nextProcessorContext = context;
+                context->ipiFreeze = Running;
+                // From this point on the processor is visible
+                // in the debugger
+                DebugStub.AddProcessor(context->cpuId);
+            }
+            finally {
+                freezeLock.Release();
+            }
+        }
+
+        [ AccessedByRuntime("referenced from halkd.cpp") ]
+        [ NoHeapAllocation ]
+        [ Conditional("SINGULARITY_MP") ]
+        static internal unsafe void FreezeAllProcessors()
+        {
+            // This method is only called on MP systems when the
+            // number of running processors is greater than 1.
+            freezeLock.Acquire();
+            try {
+                freezeCount++;
+                if (FreezeRequested == true) {
+                    // Processors are already frozen
+                    return;
+                }
+
+                ownerCpuContext  = Processor.GetCurrentProcessorContext();
+                activeCpuContext = ownerCpuContext;
+                if (activeCpuContext->nextProcessorContext ==
+                    activeCpuContext) {
+                    return;
+                }
+                FreezeRequested = true;
+
+                activeCpuContext->ipiFreeze = FreezeActive | FreezeOwner;
+                HalDevices.FreezeProcessors();
+
+                // Wait until all running processors have gone into freeze
+                ProcessorContext* context = activeCpuContext->nextProcessorContext;
+                do {
+                    if ((context->ipiFreeze & (TargetFrozen|FreezeActive))
+                        != 0) {
+                        context = context->nextProcessorContext;
+                    }
+                } while (context->nextProcessorContext != activeCpuContext);
+            }
+            finally {
+                freezeLock.Release();
+            }
+        }
+
+        [ NoHeapAllocation ]
+        static internal unsafe void
+        FreezeProcessor(ref ThreadContext threadContext)
+        {
+            ProcessorContext* context = Processor.GetCurrentProcessorContext();
+
+            if (context->ipiFreeze == Uninitialized) {
+                // Processor was still being initialized when IPI issued
+                while (FreezeRequested == true)
+                    ; // just spin until thaw occurs
+                return;
+            }
+
+            context->ipiFreeze = TargetFrozen;
+
+            while (context->ipiFreeze != TargetThaw && FreezeRequested) {
+                if ((context->ipiFreeze & FreezeActive) == FreezeActive) {
+                    //
+                    // This processor has been made the active processor
+                    //
+                    activeCpuContext = context;
+
+                    // Pass state over to debugger stub
+                    if (DebugStub.TrapForProcessorSwitch(ref threadContext)) {
+                        // We're returning to Freeze owner, make it active
+                        context->ipiFreeze         &= ~FreezeActive;
+                        ownerCpuContext->ipiFreeze |= FreezeActive;
+                    }
+                }
+            }
+
+            context->ipiFreeze = Running;
+        }
+
+        // Return true maps to ContinueNextProcessor
+        // Return false maps to ContinueProcessorReselected
+        [ AccessedByRuntime("referenced from halkd.cpp") ]
+        [ NoHeapAllocation ]
+        static internal unsafe bool SwitchFrozenProcessor(int cpuId)
+        {
+            ProcessorContext* currentContext = Processor.GetCurrentProcessorContext();
+            if (currentContext->cpuId == cpuId) {
+                // No processor to switch to.
+                return false;
+            }
+
+            ProcessorContext* context = currentContext->nextProcessorContext;
+            do {
+                if (context->cpuId == cpuId) {
+                    currentContext->ipiFreeze &= ~FreezeActive;
+                    context->ipiFreeze |= FreezeActive;
+                    goto WaitForWakeupOrReselection;
+                }
+                context = context->nextProcessorContext;
+            } while (context != activeCpuContext);
+
+            // cpuId not found so no processor to switch to.
+            return false;
+
+          WaitForWakeupOrReselection:
+            // If this processor is in the frozen state already, return
+            // (it'll fall back into FreezeProcessor() loop). NB Initiating
+            // processor can never be in this state.
+            if (currentContext->ipiFreeze == TargetFrozen) {
+                return true;
+            }
+
+            // This processor is the freeze owner, wait to be
+            // reselected as the active processor.
+            while ((currentContext->ipiFreeze & FreezeActive) != FreezeActive)
+                ;
+
+            return false;
+        }
+
+        [ AccessedByRuntime("referenced from halkd.cpp") ]
+        [ NoHeapAllocation ]
+        [ Conditional("SINGULARITY_MP") ]
+        static internal unsafe void ThawAllProcessors()
+        {
+            // This method is only called on MP systems when the
+            // number of running processors is greater than 1.
+            freezeLock.Acquire();
+            try {
+                if (FreezeRequested == false) {
+                    return;
+                }
+
+                freezeCount--;
+                if (freezeCount != 0) {
+                    return;
+                }
+
+                FreezeRequested = false;
+
+                ProcessorContext* context = activeCpuContext;
+                do {
+                    context->ipiFreeze = TargetThaw;
+                    context = context->nextProcessorContext;
+                } while (context != activeCpuContext);
+            }
+            finally {
+                freezeLock.Release();
+            }
+        }
+
+        // -------------------------------------------------------------------
+        // haryadi -- circular buffer for ping pong integer storage
+        private const  int MPBUFFERSIZE = 5;
+
+        private struct IntrPingPong
+        {
+            public SpinLock spinLock;
+            public int  head;
+            public int  tail;
+            public int  [] buffer;
+        }
+
+        public struct ApImage
+        {
+            // public UIntPtr virtAddr;
+            // public UIntPtr phyAddr;
+            // public UIntPtr length;
+            public UIntPtr entryPoint;
+        }
+
+        private struct IntrApImage
+        {
+            public SpinLock spinLock;
+            public int  head;
+            public int  tail;
+            public ApImage [] buffer;
+        }
+
+        static private IntrPingPong [] intrPingPong;
+        static private IntrApImage [] intrApImage;
+
+        /////////////////////////////////////////////////////////////
+        // PingPongInt routines
+
+        [ NoHeapAllocation ]
+        static internal unsafe void StartPingPongInt(int from, int to,
+                                                     byte vector)
+        {
+            intrPingPong[to].spinLock.Acquire();
+            try {
+                HalDevices.SendFixedIPI(vector, from, to);
+            }
+            finally {
+                intrPingPong[to].spinLock.Release();
+            }
+        }
+
+        [ NoHeapAllocation ]
+        static internal unsafe int GetIntrPingPong(int cpuId)
+        {
+            int head = intrPingPong[cpuId].head;
+            int tail = intrPingPong[cpuId].tail;
+            int max  = MPBUFFERSIZE;
+            int retval;
+
+            // empty
+            if (head == tail) {
+                return -1;
+            }
+            retval = intrPingPong[cpuId].buffer[head];
+            intrPingPong[cpuId].head = (head + 1) % max;
+
+            // DebugStub.WriteLine("HSG: Get p{0} it[{1}] = {2}",
+            // __arglist(cpuId, head, retval));
+            return retval;
+        }
+
+        [ NoHeapAllocation ]
+        static internal unsafe bool PutIntrPingPong(int cpuId,
+                                                             int task)
+        {
+            int tail = intrPingPong[cpuId].tail;
+            int head = intrPingPong[cpuId].head;
+            int max  = MPBUFFERSIZE;
+
+            // full
+            if ((tail == max - 1 && head == 0) ||
+                (tail + 1 == head)) {
+                return false;
+            }
+            intrPingPong[cpuId].buffer[tail] = task;
+            intrPingPong[cpuId].tail = (tail + 1) % max;
+
+            // DebugStub.WriteLine("HSG: Put p{0} it[{1}] = {2}",
+            // __arglist(cpuId, tail, task));
+            return true;
+        }
+
+        /////////////////////////////////////////////////////////////
+        // ApImage routines
+
+        [ NoHeapAllocation ]
+        static internal void SendApImage(int from, int to)
+        {
+            byte vector = (byte)EVectors.ApImage;
+            intrApImage[to].spinLock.Acquire();
+            try {
+                HalDevices.SendFixedIPI(vector, from, to);
+            }
+            finally {
+                intrApImage[to].spinLock.Release();
+            }
+        }
+
+        [ NoHeapAllocation ]
+        static internal bool GetIntrApImage(int cpuId,
+                                            out ApImage apImage)
+        {
+            int head = intrApImage[cpuId].head;
+            int tail = intrApImage[cpuId].tail;
+            int max  = MPBUFFERSIZE;
+
+            // empty
+            if (head == tail) {
+                apImage.entryPoint = 0;
+                return false;
+            }
+            apImage = intrApImage[cpuId].buffer[head];
+            intrApImage[cpuId].head = (head + 1) % max;
+
+            return true;
+        }
+
+
+        [ NoHeapAllocation ]
+        static internal bool PutIntrApImage(int cpuId,
+                                            UIntPtr entryPoint)
+        {
+            int tail = intrApImage[cpuId].tail;
+            int head = intrApImage[cpuId].head;
+            int max  = MPBUFFERSIZE;
+
+            // full
+            if ((tail == max - 1 && head == 0) ||
+                (tail + 1 == head)) {
+                return false;
+            }
+            intrApImage[cpuId].buffer[tail].entryPoint = entryPoint;
+            intrApImage[cpuId].tail = (tail + 1) % max;
+            return true;
+        }
+
+
+        /////////////////////////////////////////////////////////////
+        // haryadi: AbiCall structures
+
+        // *************** DEPRECATED if MpCall is working ***************
+
+        // Note: AbiCall buffers should not be treated as queue.
+        // When BSP receives IPI and the corresponding AbiCall buffer, the
+        // buffer should not be released (unlike queue). The BSP will call
+        // the actual ABI and store the return value in the same buffer.
+        // The AP will obtain the return value from the buffer and then release
+        // the buffer.
+        public struct AbiCall
+        {
+            // We need to know the 'position', so
+            // that when the abi is completed we know
+            // where we must put the value
+            public int  position;
+            public int  retVal;
+            public int  argVal;
+
+            public bool validRetVal;
+            public bool valid;
+            public bool served;
+        }
+
+        private struct IntrAbiCall
+        {
+            public SpinLock spinLock;
+            public int  head;
+            public int  tail;
+            public AbiCall [] buffer;
+        }
+
+        static private IntrAbiCall [] intrAbiCall;
+
+        /*
+        /////////////////////////////////////////////////////////////
+        // AbiCall routines
+
+        // PutAbiCall: the caller passes the ABI arguments through
+        // the "AbiCall". The rest of the function just store the
+        // argVal and initialize the slot
+        [ NoHeapAllocation ]
+        static internal int PutAbiCall(int cpuId,
+                                       AbiCall abiCall)
+        {
+            int pos = -1;
+            intrAbiCall[cpuId].spinLock.Acquire();
+            try {
+                // Loop to find free abi call slot. This is slow.  In
+                // the future we should have a helper queue that
+                // points to free slots, hence avoid traversing.
+                for (int i = 0; i < intrAbiCall[cpuId].buffer.Length; i++) {
+                    if (!intrAbiCall[cpuId].buffer[i].valid) {
+
+                        // initialize fields and copy the abi arguments
+                        intrAbiCall[cpuId].buffer[i].valid = true;
+                        intrAbiCall[cpuId].buffer[i].served = false;
+                        intrAbiCall[cpuId].buffer[i].validRetVal = false;
+                        intrAbiCall[cpuId].buffer[i].retVal = 0;
+                        intrAbiCall[cpuId].buffer[i].argVal = abiCall.argVal;
+
+                        // the caller need to know on which abi call it
+                        // should wait, so we copy back for the caller
+                        abiCall = intrAbiCall[cpuId].buffer[i];
+                        pos = i;
+                        break;
+                    }
+                }
+            }
+            finally {
+                intrAbiCall[cpuId].spinLock.Release();
+            }
+            return pos;
+        }
+
+        // SendAbiCall: Send notice to the receiver processor that
+        // there is abi call that needs to be served
+        [ NoHeapAllocation ]
+        static internal void SendAbiCall(int from, int to)
+        {
+            byte vector = (byte)EVectors.AbiCall;
+            intrAbiCall[to].spinLock.Acquire();
+            try {
+                HalDevices.SendFixedIPI(vector, from, to);
+            }
+            finally {
+                intrAbiCall[to].spinLock.Release();
+            }
+        }
+
+        // WaitAbiCall: The caller should wait until the retval is
+        // ready. Currently we just loop. In the future, busy loop is
+        // not necessary when scheduler comes into play.
+        [ NoHeapAllocation ]
+        static internal void WaitAbiCall(int cpuId, int pos,
+                                         out AbiCall abiCall)
+        {
+            // wait for validRetVal;
+            while (!intrAbiCall[cpuId].buffer[pos].validRetVal) {
+                // spin loop until ready
+            }
+
+            // if reach here we have a validRetVal, copy back to caller
+            intrAbiCall[cpuId].spinLock.Acquire();
+            try {
+                abiCall = intrAbiCall[cpuId].buffer[pos];
+            }
+            finally {
+                intrAbiCall[cpuId].spinLock.Release();
+            }
+        }
+
+        // ReleaseAbiCall: release the abi slot
+        [ NoHeapAllocation ]
+        static internal void ReleaseAbiCall(int cpuId, int pos)
+        {
+            intrAbiCall[cpuId].spinLock.Acquire();
+            try {
+                if (pos < intrAbiCall[cpuId].buffer.Length) {
+                    intrAbiCall[cpuId].buffer[pos].valid = false;
+                }
+            }
+            finally {
+                intrAbiCall[cpuId].spinLock.Release();
+            }
+        }
+
+        // GetAbiCall: We should find valid but !served abi calls. The
+        // caller should loop until all abi calls are served.
+        [ NoHeapAllocation ]
+        static internal bool GetAbiCall(int cpuId, out AbiCall abiCall)
+        {
+            bool isUnservedAbi = false;
+            intrAbiCall[cpuId].spinLock.Acquire();
+            try {
+                abiCall = intrAbiCall[cpuId].buffer[0]; // init
+
+                for (int i = 0; i < intrAbiCall[cpuId].buffer.Length; i++) {
+                    if (intrAbiCall[cpuId].buffer[i].valid &&
+                        !intrAbiCall[cpuId].buffer[i].served) {
+
+                        intrAbiCall[cpuId].buffer[i].served = true;
+                        abiCall = intrAbiCall[cpuId].buffer[i];
+                        isUnservedAbi = true;
+                        break;
+                    }
+                }
+            }
+            finally {
+                intrAbiCall[cpuId].spinLock.Release();
+            }
+            return isUnservedAbi;
+        }
+
+        // ReturnAbiCall: The abi call has finished, copy the return
+        // value and set validRetVal to true
+        [ NoHeapAllocation ]
+        static internal void ReturnAbiCall(int cpuId, AbiCall abiCall)
+        {
+            intrAbiCall[cpuId].spinLock.Acquire();
+            try {
+                int pos = abiCall.position;
+                if (abiCall.position < intrAbiCall[cpuId].buffer.Length) {
+                    intrAbiCall[cpuId].buffer[pos] = abiCall;
+                    intrAbiCall[cpuId].buffer[pos].validRetVal = true;
+                }
+            }
+            finally {
+                intrAbiCall[cpuId].spinLock.Release();
+            }
+        }
+        */
+
+
+        /////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////
+        // haryadi: MpCall structures
+
+        // Note: MpCall buffers should not be treated as queue.
+        // When BSP receives IPI and the corresponding MpCall buffer, the
+        // buffer should not be released (unlike queue). The BSP will call
+        // the actual ABI and store the return value in the same buffer.
+        // The AP will obtain the return value from the buffer and then release
+        // the buffer.
+        public class MpCall
+        {
+            public MpCall() {}
+
+            // We need to know the 'position', so
+            // that when the abi is completed we know
+            // where we must put the value
+            public int abiNum;
+            public int position;
+
+            // public int argVal;
+            // public int retVal;
+
+            public const int MAX_RET_SIZE = 20;
+            public const int MAX_ARG_SIZE = 100;
+            public byte [] retBuffer = new byte [MAX_RET_SIZE];
+            public byte [] argBuffer = new byte [MAX_ARG_SIZE];
+
+            public bool validRetVal;
+            public bool valid;
+            public bool served;
+        }
+
+        private struct IntrMpCall
+        {
+            public SpinLock spinLock;
+            public int  head;
+            public int  tail;
+            public MpCall [] buffer;
+        }
+
+        static private IntrMpCall [] intrMpCall;
+
+
+        /////////////////////////////////////////////////////////////
+        // MpCall routines
+
+
+        [ NoHeapAllocation ]
+        static internal MpCall ReserveMpCall(int cpuId)
+        {
+            intrMpCall[cpuId].spinLock.Acquire();
+            try {
+                // Loop to find free abi call slot. This is slow.  In
+                // the future we should have a helper queue that
+                // points to free slots, hence avoid traversing.
+                for (int i = 0; i < intrMpCall[cpuId].buffer.Length; i++) {
+                    if (!intrMpCall[cpuId].buffer[i].valid) {
+
+                        intrMpCall[cpuId].buffer[i].valid = true;
+                        intrMpCall[cpuId].buffer[i].served = false;
+                        intrMpCall[cpuId].buffer[i].validRetVal = false;
+
+                        // the caller need to know on which abi call it
+                        // should wait, so we copy back for the caller
+                        return intrMpCall[cpuId].buffer[i];
+                    }
+                }
+            }
+            finally {
+                intrMpCall[cpuId].spinLock.Release();
+            }
+            return null;
+        }
+
+
+        // SendMpCall: Send notice to the receiver processor that
+        // there is abi call that needs to be served
+        [ NoHeapAllocation ]
+        static internal void SendMpCall(int from, int to)
+        {
+            byte vector = (byte)EVectors.AbiCall;
+            intrMpCall[to].spinLock.Acquire();
+            try {
+                HalDevices.SendFixedIPI(vector, from, to);
+            }
+            finally {
+                intrMpCall[to].spinLock.Release();
+            }
+        }
+
+        // WaitMpCall: The caller should wait until the retval is
+        // ready. Currently we just loop. In the future, busy loop is
+        // not necessary when scheduler comes into play.
+        [ NoHeapAllocation ]
+        static internal void WaitMpCall(int cpuId, int pos)
+        {
+            // wait for validRetVal;
+            while (!intrMpCall[cpuId].buffer[pos].validRetVal) {
+                // spin loop until ready
+            }
+        }
+
+        // ReleaseMpCall: release the abi slot
+        [ NoHeapAllocation ]
+        static internal void ReleaseMpCall(int cpuId, int pos)
+        {
+            intrMpCall[cpuId].spinLock.Acquire();
+            try {
+                if (pos < intrMpCall[cpuId].buffer.Length) {
+                    intrMpCall[cpuId].buffer[pos].valid = false;
+                }
+            }
+            finally {
+                intrMpCall[cpuId].spinLock.Release();
+            }
+        }
+
+        // GetMpCall: We should find valid but !served abi calls. The
+        // caller should loop until all abi calls are served.
+        [ NoHeapAllocation ]
+        static internal MpCall GetMpCall(int cpuId)
+        {
+            intrMpCall[cpuId].spinLock.Acquire();
+            try {
+                for (int i = 0; i < intrMpCall[cpuId].buffer.Length; i++) {
+                    if (intrMpCall[cpuId].buffer[i].valid &&
+                        !intrMpCall[cpuId].buffer[i].served) {
+
+                        intrMpCall[cpuId].buffer[i].served = true;
+                        return intrMpCall[cpuId].buffer[i];
+                    }
+                }
+            }
+            finally {
+                intrMpCall[cpuId].spinLock.Release();
+            }
+            return null;
+        }
+
+        // ReturnMpCall: The abi call has finished, copy the return
+        // value and set validRetVal to true
+        [ NoHeapAllocation ]
+        static internal void ReturnMpCall(int cpuId, int pos)
+        {
+            intrMpCall[cpuId].spinLock.Acquire();
+            try {
+                if (pos < intrMpCall[cpuId].buffer.Length) {
+                    intrMpCall[cpuId].buffer[pos].validRetVal = true;
+                }
+            }
+            finally {
+                intrMpCall[cpuId].spinLock.Release();
+            }
+        }
+
+
+        /////////////////////////////////////////////////////////////
+        // Initialization function
+
+        internal static void Initialize()
+        {
+            freezeLock = new SpinLock();
+            InitializePingPong();
+            InitializeApImage();
+            InitializeAbiCall();
+            InitializeMpCall();
+        }
+
+        // initialize circular buffer for all processors
+        internal static void InitializePingPong()
+        {
+            intrPingPong =
+                new IntrPingPong [MpBootInfo.MAX_CPU];
+            for (int i = 0; i < intrPingPong.Length; i++) {
+                intrPingPong[i].head = 0;
+                intrPingPong[i].tail = 0;
+                intrPingPong[i].buffer = new int [MPBUFFERSIZE];
+                intrPingPong[i].spinLock = new SpinLock();
+            }
+        }
+
+        // initialize circular buffer for all processors
+        internal static void InitializeApImage()
+        {
+            intrApImage =
+                new IntrApImage [MpBootInfo.MAX_CPU];
+            for (int i = 0; i < intrApImage.Length; i++) {
+                intrApImage[i].head = 0;
+                intrApImage[i].tail = 0;
+                intrApImage[i].buffer = new ApImage [MPBUFFERSIZE];
+                intrApImage[i].spinLock = new SpinLock();
+            }
+        }
+
+        // initialize circular buffer for abi calls
+        internal static void InitializeAbiCall()
+        {
+            intrAbiCall =
+                new IntrAbiCall [MpBootInfo.MAX_CPU];
+            for (int i = 0; i < intrAbiCall.Length; i++) {
+                intrAbiCall[i].head = 0;
+                intrAbiCall[i].tail = 0;
+                intrAbiCall[i].buffer = new AbiCall [MPBUFFERSIZE];
+                for (int j = 0; j < intrAbiCall[i].buffer.Length; j++) {
+                    intrAbiCall[i].buffer[j].position = j;
+                    intrAbiCall[i].buffer[j].valid = false;
+                }
+                intrAbiCall[i].spinLock = new SpinLock();
+            }
+        }
+
+
+        // initialize circular buffer for abi calls
+        internal static void InitializeMpCall()
+        {
+            intrMpCall =
+                new IntrMpCall [MpBootInfo.MAX_CPU];
+            for (int i = 0; i < intrMpCall.Length; i++) {
+                intrMpCall[i].head = 0;
+                intrMpCall[i].tail = 0;
+                intrMpCall[i].buffer = new MpCall [MPBUFFERSIZE];
+                for (int j = 0; j < intrMpCall[i].buffer.Length; j++) {
+                    intrMpCall[i].buffer[j] = new MpCall();
+                    intrMpCall[i].buffer[j].position = j;
+                    intrMpCall[i].buffer[j].valid = false;
+                }
+                intrMpCall[i].spinLock = new SpinLock();
+            }
+        }
+
+
+        // Test ..
+        internal static void Test()
+        {
+
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/PerfCounters.cs b/base/Kernel/Singularity/PerfCounters.cs
new file mode 100644
index 0000000..f782c43
--- /dev/null
+++ b/base/Kernel/Singularity/PerfCounters.cs
@@ -0,0 +1,93 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PerfCounters.cs
+//
+//  Note:
+//
+
+using System;
+using System.GCs;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Scheduling;
+
+using Microsoft.Singularity.V1.Threads;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Security;
+
+namespace Microsoft.Singularity
+{
+    [CLSCompliant(false)]
+    public class PerfCounters
+    {
+        private static long threadsCreated; 
+        private static long bytesSent; 
+        private static long msgsSent; 
+        private static long channelsCreated; 
+        
+
+        public static void Initialize() {
+            threadsCreated = 0; 
+            bytesSent = 0; 
+            msgsSent = 0;
+            channelsCreated = 0; 
+        }
+
+        public static void IncrementChannelsCreated() {
+            Interlocked.Increment(ref channelsCreated); 
+        } 
+
+        public static long ChannelsCreated {
+            get {
+                return channelsCreated; 
+            }
+        }
+
+        public static void IncrementThreadsCreated() {
+            Interlocked.Increment(ref threadsCreated); 
+        }
+
+        public static long ThreadsCreated {
+            get {
+                return threadsCreated; 
+            }
+        }
+
+        public static void AddBytesSent(long bytes) {
+            bool iflag = Processor.DisableInterrupts();
+            bytesSent += bytes;
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        public static long BytesSent {
+            get {
+                return bytesSent; 
+            }
+        }
+
+        public static void IncrementMsgsSent() {
+            Interlocked.Increment(ref msgsSent); 
+        }
+
+        public static long MsgsSent {
+            get {
+                return msgsSent; 
+            }
+        }
+    }
+    
+}
diff --git a/base/Kernel/Singularity/Process.cs b/base/Kernel/Singularity/Process.cs
new file mode 100644
index 0000000..4f7fa0c
--- /dev/null
+++ b/base/Kernel/Singularity/Process.cs
@@ -0,0 +1,1947 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Process.cs
+//
+//  Note:
+//
+
+// #define TEST_CREATE_PROCESS_TIME
+// #define VERBOSE
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Scheduling;
+
+using Microsoft.Singularity.V1.Threads;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Security;
+
+namespace Microsoft.Singularity
+{
+    [CLSCompliant(false)]
+    public enum ProcessEvent : ushort
+    {
+        CreateKernelProcess = 1,
+        CreateUserProcess = 2,
+        ImageLoad = 3,
+    }
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class Process
+    {
+        // Per-Class Members:
+        internal static HandleTable kernelHandles;
+        public static bool systemSilentLoad;
+        public static Process kernelProcess;
+        public static Process idleProcess;
+        public static Process[] processTable;
+        private static SpinLock processTableLock;
+        private static int processIndexGenerator;
+
+        internal const int maxProcesses = 1024; // Must be power of 2 >= 64
+
+        private static bool useSeparateAddressSpaces;
+
+        private static ProcessGroup [] processGroups;
+        // Xml processing constants
+        internal const string PolicyXmlTag      = "policy";
+        internal const string ProcessSetXmlTag  = "processSet";
+
+        internal const string SeparateAddressSpaceXmlAttribute  = "separateAddressSpace";
+        internal const string NameXmlAttribute                  = "name";
+        internal const string SetXmlAttribute                   = "set";
+        internal const string KernelDomainXmlAttribute          = "kernelDomain";
+
+        public enum  ParameterCode {
+            Success,
+            OutOfRange,
+            NotSet,
+            Retrieved,
+            AlreadySet,
+            Undefined,
+        }
+
+        // Arrays used set/get process arguments
+
+        private class BoolArg {
+            public bool Value;
+            public bool Set;
+            public bool Retrieved;
+
+            public BoolArg (bool value)
+            {
+                this.Value      = value;
+                this.Set        = false;
+                this.Retrieved  = false;
+            }
+        }
+
+        private class LongArg {
+            public long Value;
+            public bool Set;
+            public bool Retrieved;
+
+            public LongArg (long value)
+            {
+                this.Value      = value;
+                this.Set        = false;
+                this.Retrieved  = false;
+            }
+        }
+
+        private class StringArg {
+            public string   Value;
+            public bool     Set;
+            public bool     Retrieved;
+
+            public StringArg (string value)
+            {
+                this.Value      = value;
+                this.Set        = false;
+                this.Retrieved  = false;
+            }
+        }
+
+         private class StringArrayArg
+         {
+            public string[] Value;
+            public bool     Set;
+            public bool     Retrieved;
+
+            public StringArrayArg (string[] value)
+            {
+                this.Value      = value;
+                this.Set        = false;
+                this.Retrieved  = false;
+            }
+        }
+
+       internal class ProcessGroup
+        {
+            public string GroupName;
+            public string [] ProcessSet;
+            public bool KernelDomain;
+            public ProcessGroup(string name, string[] procs, bool kernelDomain)
+            {
+                this.GroupName = name;
+                this.ProcessSet = procs;
+                this.KernelDomain = kernelDomain;
+            }
+        }
+
+        internal static string [] Tokenize(string str) {
+            int start = 0;
+            int end = str.Length;
+            int count = 0;
+            int at = 0;
+            ArrayList tokens = new ArrayList();
+            string[] retVal = null;
+
+            if (str == null) return null;
+
+            while((start <= end) && (at > -1)) {
+                count = end - start;
+                at = str.IndexOf(' ', start, count);
+                if (at == -1) {
+                    tokens.Add(str.Substring(start));
+                    break;
+                }
+                string s = str.Substring(start, at-start);
+                tokens.Add(s);
+                start = at+1;
+            }
+
+            retVal = new string[tokens.Count];
+            for (int i=0; i< tokens.Count; i++){
+                retVal[i] = (string) tokens[i];
+            }
+            return retVal;
+        }
+
+        internal static void ProcessConfig (XmlNode config)
+        {
+            if (config == null) {
+                return;
+            }
+
+            // process address space policy
+
+            XmlNode policy = config.GetChild(PolicyXmlTag);
+            if (policy != null) {
+                useSeparateAddressSpaces = policy.GetAttribute(SeparateAddressSpaceXmlAttribute, false);
+            }
+
+            int groupNodes = config.CountNamedChildren(ProcessSetXmlTag);
+            if (groupNodes != 0) {
+                // allocate memory for groups
+                processGroups = new ProcessGroup[groupNodes];
+                int idx = 0;
+                foreach (XmlNode group in config.Children) {
+                    if (group.Name != ProcessSetXmlTag) {
+                        continue;
+                    }
+                    string groupName =  group.GetAttribute(NameXmlAttribute, "");
+                    string appSet =  group.GetAttribute(SetXmlAttribute, "");
+                    // break up appset into array of names
+                    string[] procs = Tokenize(appSet);
+                    bool kernelDomain = group.GetAttribute(KernelDomainXmlAttribute,false);
+                    processGroups[idx] = new ProcessGroup(groupName, procs, kernelDomain);
+                    idx++;
+                }
+            }
+        }
+
+        internal static
+        void VisitSpecialData(System.GCs.NonNullReferenceVisitor visitor)
+        {
+            visitor.VisitReferenceFields(Process.processTable);
+
+            for (int i = 0; i < processTable.Length; i++) {
+                if (processTable[i] != null) {
+                    processTable[i].handles.VisitSpecialData(visitor);
+                }
+            }
+        }
+
+        internal static int AllocateProcessTableSlot(Process process)
+        {
+            Thread currentThread = Thread.CurrentThread;
+
+            Kernel.Waypoint(621);
+            bool disabled = Processor.DisableInterrupts();
+            processTableLock.Acquire(currentThread);
+            int foundIndex = -1;
+            try {
+                for (int i = 0; i < processTable.Length; i++) {
+                    int index = (processIndexGenerator + i) % processTable.Length;
+                    if (processTable[index] == null) {
+                        Kernel.Waypoint(622);
+                        foundIndex = index;
+                        processTable[foundIndex] = process;
+                        processIndexGenerator = (index + 1) % processTable.Length;
+                        break;
+                    }
+                }
+            } finally {
+                processTableLock.Release(currentThread);
+                Processor.RestoreInterrupts(disabled);
+            }
+            Kernel.Waypoint(623);
+
+            DebugStub.Assert(foundIndex >= 0, "Out of thread slots!");
+            return foundIndex;
+        }
+
+        internal static void Initialize(XmlNode config)
+        {
+            // Create pre-existent processes.
+            kernelProcess = new Process(1);
+            idleProcess = new Process(2);
+
+            // Initialize process management table.
+            processTable = new Process[maxProcesses];
+            processTable[0] = kernelProcess;    // ensure slot zero is never used
+            processTable[1] = kernelProcess;    // 1 is the kernel process.
+            processTable[2] = idleProcess;      // 2 is the idle process.
+            processIndexGenerator = 3;
+
+            // Create table told hold kernel handles.
+            kernelHandles = new HandleTable(null);
+
+            Thread.initialThread.process = kernelProcess;
+
+            //policy config data
+            ProcessConfig(config);
+        }
+
+        internal static void InitializeSharedHeapWalker()
+        {
+            // TODO The walker needs to become per-protection-domain
+            // on paging systems
+            SharedHeapWalker.Initialize(
+                SharedHeap.KernelSharedHeap.DataOwnerId,
+                SharedHeap.KernelSharedHeap.EndpointOwnerId);
+        }
+
+        // The next 2 functions are used by the loader to determine
+        // what address space SIPs should be created in
+
+        public static bool  RunInSeparateSpace()
+        {
+            return useSeparateAddressSpaces;
+        }
+
+        public static string GetGroupFromName(string name, out bool isKernelDomain)
+        {
+            isKernelDomain = false;
+            if (processGroups == null) return null;
+            for (int i=0; i < processGroups.Length; i++) {
+                for (int j=0; j < processGroups[i].ProcessSet.Length; j++) {
+                    if (processGroups[i].ProcessSet[j] == name) {
+                        isKernelDomain = processGroups[i].KernelDomain;
+                        return processGroups[i].GroupName;
+                    }
+                }
+            }
+            return null;
+        }
+
+        [NoHeapAllocation]
+        public static Process GetProcessByID(int procID)
+        {
+            return processTable[procID];
+        }
+
+        // Per-Instance Members:
+        private ProcessState state; // acquire processMutex before modifying
+        private Mutex suspendMutex; // lock ordering: if you acquire both suspendMutex and processMutex, acquire suspendMutex first
+        private Mutex processMutex; // lock ordering: acquire child lock before acquiring parent lock
+        private int processIndex;
+        private uint processTag;
+        private Process parent;
+        private IoConfig ioconfig;
+        private Process[] children;
+        private Thread[] threads;
+        private int startedChildCount;
+        private int startedThreadCount;
+        private HandleTable handles;
+        private ManualResetEvent joinEvent;
+        private int exitCode;
+        private bool silentLoad;
+        private UIntPtr pagesNow;
+        private UIntPtr pagesMax;
+
+        private PEImage image;
+        private IoMemory loadedImage;
+        private ProcessStart entry;
+        private String imageName;
+        private String[] args;
+
+        private long deadThreadCount;
+        private TimeSpan deadThreadExecutionTime;
+        private int gcCount;
+        private TimeSpan gcTotalTime;
+        private long gcTotalBytes;
+
+        private unsafe SharedHeap.Allocation * [] endpointSet;
+        private BoolArg[]               boolArgSet;
+        private StringArg[]             stringArgSet;
+        private LongArg[]               longArgSet;
+        private StringArrayArg[]        stringArrayArgSet;
+
+#if PAGING
+        private ProtectionDomain protectionDomain;
+#endif
+
+        // The principal of the process
+        private Principal principal;
+
+        private Process(int index)
+        {
+            this.state = ProcessState.Unstarted;
+            this.suspendMutex = new Mutex();
+            this.processMutex = new Mutex();
+            this.processIndex = index;
+            this.processTag = ((uint)processIndex) << 16;
+            this.children = new Process[16];
+            this.threads = new Thread[16];
+            this.handles = new HandleTable(this);
+            this.parent = null;
+
+            this.joinEvent = new ManualResetEvent(false);
+            this.imageName = index == 1 ? "kernel" : "idle";
+            this.deadThreadCount = 0;
+            this.deadThreadExecutionTime = new TimeSpan(0);
+            this.gcCount = 0;
+            this.gcTotalTime = TimeSpan.Zero;
+            this.gcTotalBytes = 0;
+
+            //DebugStub.WriteLine("new process(index): clearing StringArray");
+            this.stringArrayArgSet = null;
+#if PAGING
+            this.protectionDomain = ProtectionDomain.DefaultDomain;
+            protectionDomain.AddRef();
+            DebugStub.WriteLine("Loaded process \"{0}\" into {1}protection domain \"{2}\"",
+                                __arglist(this.imageName,
+                                          this.protectionDomain.KernelMode ? "kernel " : "",
+                                          this.protectionDomain.Name));
+#endif
+
+            //  This constructor is currently used only to create the
+            // process for the kernel. If this changes, the code below should
+            // change as well. In general, use the other constructor, as it
+            // provides sufficient information to create the process principal.
+            this.principal = PrincipalImpl.Self();
+            Monitoring.Log(Monitoring.Provider.Process,
+                           (ushort)ProcessEvent.CreateKernelProcess,
+                           GetProcessName());
+        }
+
+        private Process(Process parent)
+        {
+            Kernel.Waypoint(620);
+            this.processIndex = AllocateProcessTableSlot(this);
+            Kernel.Waypoint(625);
+            this.state = ProcessState.Unstarted;
+            this.suspendMutex = new Mutex();
+            this.processMutex = new Mutex();
+            this.processTag = ((uint)processIndex) << 16;
+            this.children = new Process[16];
+            this.threads = new Thread[16];
+            this.handles = new HandleTable(this);
+            this.parent = parent;
+            this.imageName = parent.imageName;
+            this.ioconfig = parent.ioconfig;    // replicate IoConfig to children.
+            Kernel.Waypoint(626);
+
+            this.joinEvent = new ManualResetEvent(false);
+            //DebugStub.WriteLine("clearing StringArray");
+            this.stringArrayArgSet = null;
+
+            Monitoring.Log(Monitoring.Provider.Process,
+                           (ushort)ProcessEvent.CreateUserProcess, 0,
+                           (uint)this.ProcessId, (uint)parent.ProcessId,
+                           0, 0, 0);
+       }
+
+        public Process(Process parent,
+                       IoMemory rawImage,
+                       String role,
+                       String[] args,
+                       Manifest appManifest)
+            : this(parent)
+        {
+            this.imageName = appManifest.Name;
+            this.args = args;
+
+#if PAGING
+            if (RunInSeparateSpace()) {
+                bool kernelMode;
+                string domainName = GetGroupFromName(this.imageName, out kernelMode);
+
+                if (domainName != null) {
+                    this.protectionDomain = ProtectionDomain.FindOrCreateByName(domainName, kernelMode);
+                }
+            }
+
+            if (this.protectionDomain == null) {
+                // Just inherit from our parent
+                this.protectionDomain = parent.protectionDomain;
+            }
+
+            protectionDomain.AddRef();
+            try {
+                // Temporarily switch to the domain of the process
+                // we are creating
+                Thread.SwitchToDomain(this.protectionDomain);
+                this.protectionDomain.InitHook(); // we might be first
+#endif
+
+                Kernel.Waypoint(510);
+
+                // haryadi -- this is a normal load (for BSP), so
+                // set the 4th argument (isForMp) to false
+                this.image = PEImage.Load(this, rawImage, out loadedImage,
+                                          false);
+
+                Monitoring.Log(Monitoring.Provider.Process,
+                               (ushort)ProcessEvent.ImageLoad,
+                               imageName);
+
+                Kernel.Waypoint(511);
+
+                // Trap-door to turn off debugger notification for micro-benchmark.
+                if (args.Length > 0) {
+                    if (args[args.Length-1] == "!") {
+                        silentLoad = true;
+                    }
+                    else if (args[args.Length-1] == "!+") {
+                        DebugStub.WriteLine();
+                        DebugStub.WriteLine("*** Disabled debugger load notifications. Type \".reload\" to retrieve full symbols.");
+                        DebugStub.WriteLine();
+                        systemSilentLoad = true;
+                    }
+                    else if (args[args.Length-1] == "!-") {
+                        DebugStub.WriteLine();
+                        DebugStub.WriteLine("*** Enabled debugger load notifications.");
+                        DebugStub.WriteLine();
+                        systemSilentLoad = false;
+                    }
+                }
+                if (!silentLoad && systemSilentLoad) {
+                    silentLoad = true;
+                }
+
+#if DEBUG
+                DebugStub.WriteLine(
+                    "Loading {0} [{1:x}...{2:x} bytes]",
+                    __arglist(imageName,
+                              loadedImage.VirtualAddress,
+                              loadedImage.VirtualAddress + loadedImage.Length));
+#endif
+#if PAGING
+                DebugStub.WriteLine(
+                    "Loaded process \"{0}\" into {1}protection domain \"{2}\"",
+                    __arglist(this.imageName,
+                              this.protectionDomain.KernelMode ? "kernel " : "",
+                              this.protectionDomain.Name));
+#endif
+
+                DebugStub.LoadedBinary(loadedImage.VirtualAddress,
+                                       (UIntPtr) loadedImage.Length,
+                                       imageName,
+                                       image.checkSum,
+                                       image.timeDateStamp,
+                                       silentLoad);
+
+                Kernel.Waypoint(512);
+                threads[0] = Thread.CreateThread(this, new ThreadStart(this.PeStart));
+                Kernel.Waypoint(513);
+#if PAGING
+            }
+            finally {
+                Thread.RevertToParentDomain();
+            }
+#endif
+
+            // create the principal of the process
+            this.principal = PrincipalImpl.NewInvocation(parent.Principal, appManifest, role, null);
+
+            Tracing.Log(Tracing.Audit, "Created PE process at {0:x8}",
+                        loadedImage.VirtualAddress);
+
+        }
+
+        public static Process KernelProcess
+        {
+            [NoHeapAllocation]
+            get { return kernelProcess; }
+        }
+
+        public int ProcessId
+        {
+            [NoHeapAllocation]
+            get { return processIndex; }
+        }
+
+        public Principal Principal
+        {
+            [NoHeapAllocation]
+            get { return this.principal; }
+        }
+
+        public uint ProcessTag
+        {
+            [NoHeapAllocation]
+            get { return processTag; }
+        }
+
+        public IoConfig IoConfig
+        {
+            [NoHeapAllocation]
+            get { return ioconfig; }
+            [NoHeapAllocation]
+            set { ioconfig = value; }
+        }
+
+        public SharedHeap ProcessSharedHeap
+        {
+            [Inline]
+#if PAGING
+            get { return protectionDomain.UserSharedHeap; }
+#else
+            // Everyone uses the same heap
+            get { return SharedHeap.KernelSharedHeap; }
+#endif
+        }
+
+#if PAGING
+        public ProtectionDomain Domain
+        {
+            get {
+                return protectionDomain;
+            }
+        }
+
+        public bool RunsAtKernelPrivilege {
+            get {
+                return protectionDomain.KernelMode;
+            }
+        }
+#else
+        public bool RunsAtKernelPrivilege {
+            get {
+                // All processes run at ring-0 on
+                // the non-PAGING build
+                return true;
+            }
+        }
+#endif
+
+        // Routines to maintain child process list.
+        //
+
+        // Called when a child process starts (not called when
+        // a child Process object is allocated).
+        private void AddChild(Process child)
+        {
+            Kernel.Waypoint(514);
+            processMutex.AcquireMutex();
+            try {
+                for (int i = 0; i < children.Length; i++) {
+                    if (children[i] == null) {
+                        children[i] = child;
+                        startedChildCount++;
+                        return;
+                    }
+                }
+
+                // Grow array if necessary
+                Process[] nc = new Process[children.Length * 2];
+                for (int i = 0; i < children.Length; i++) {
+                    nc[i] = children[i];
+                }
+                nc[children.Length] = child;
+                children = nc;
+                startedChildCount++;
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+        }
+
+        // Should only be called from the kernel service thread.
+        private bool ServiceRemoveChild(Process child)
+        {
+            Kernel.Waypoint(515);
+            processMutex.AcquireMutex();
+            try {
+                for (int i = 0; i < children.Length; i++) {
+                    if (children[i] == child) {
+                        children[i] = null;
+                        startedChildCount--;
+                        return true;
+                    }
+                }
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+            return false;
+        }
+
+        // Routines to maintain child thread list.
+        //
+
+        // Called when a thread is created (not when a thread
+        // is started)
+        internal void AddThread(Thread thread, out ThreadHandle handle)
+        {
+            Kernel.Waypoint(516);
+            processMutex.AcquireMutex();
+            try {
+                handle = new ThreadHandle(AllocateHandle(thread));
+                thread.threadHandle = handle;
+
+                for (int i = 0; i < threads.Length; i++) {
+                    if (threads[i] == null) {
+                        threads[i] = thread;
+                        return;
+                    }
+                }
+
+                // Grow array if necessary
+                Thread[] nc = new Thread[threads.Length * 2];
+                for (int i = 0; i < threads.Length; i++) {
+                    nc[i] = threads[i];
+                }
+                nc[threads.Length] = thread;
+                threads = nc;
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+        }
+
+        // Should be called only by the service thread
+        private bool ServiceRemoveThread(Thread thread)
+        {
+            Kernel.Waypoint(517);
+            // An unstarted thread cannot exit (and should not appear in
+            // startedThreadCount):
+            VTable.Assert(thread.ThreadState !=
+                System.Threading.ThreadState.Unstarted);
+            processMutex.AcquireMutex();
+            try {
+                for (int i = 0; i < threads.Length; i++) {
+                    if (threads[i] == thread) {
+                        threads[i] = null;
+                        startedThreadCount--;
+                        return true;
+                    }
+                }
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+            return false;
+        }
+
+        public bool CreateThread(ThreadStart start)
+        {
+            Thread thread = Thread.CreateThread(this, new ThreadStart(start));
+            if (thread == null) {
+                Tracing.Log(Tracing.Audit, "Failed CreateThread request too late.");
+                return false;
+            }
+
+            unchecked {
+                Tracing.Log(Tracing.Audit, "Created new PE thread {1:x3}.",
+                            (UIntPtr)unchecked((uint)thread.threadIndex));
+            }
+            return true;
+        }
+
+        public unsafe bool CreateThread(int threadIndex,
+                                        out ThreadHandle handle,
+                                        out UIntPtr threadContext)
+        {
+            Thread thread =
+                Thread.CreateThread(this, new ThreadStart(this.PeStartThread));
+            if (thread != null) {
+                thread.processThreadIndex = threadIndex;
+                handle = thread.threadHandle;
+                fixed (void *contextAddr = &thread.context) {
+                    threadContext = (UIntPtr) contextAddr;
+                }
+            }
+            else {
+                handle = new ThreadHandle();
+                threadContext = 0;
+                Tracing.Log(Tracing.Audit, "Failed CreateThread lid={0:x3}.",
+                            (UIntPtr)unchecked((uint)threadIndex));
+                return false;
+            }
+
+            unchecked {
+                Tracing.Log(Tracing.Audit, "Created new PE thread tid={0:x3}, lid={1:x3}.",
+                            (UIntPtr)unchecked((uint)thread.threadIndex),
+                            (UIntPtr)unchecked((uint)threadIndex));
+            }
+            return true;
+        }
+
+        // Should only be called from the kernel service thread.
+        private void ServiceRelease()
+        {
+            Kernel.Waypoint(521);
+
+            processMutex.AcquireMutex();
+            try {
+                if (state == ProcessState.Stopped) {
+                    return;
+                }
+                state = ProcessState.Stopped;
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+
+            bool found = parent.ServiceRemoveChild(this);
+            VTable.Assert(found);
+
+            VTable.Assert(processIndex >= 0);
+            Kernel.Waypoint(522);
+
+            UIntPtr imageBytes = UIntPtr.Zero;
+            UIntPtr handleBytes;
+            UIntPtr pageBytes;
+
+            // Must switch to the target process' address space
+            // to free memory properly
+#if PAGING
+            try {
+                Thread.SwitchToDomain(this.protectionDomain);
+#endif
+                if (loadedImage != null) {
+                    imageBytes = (UIntPtr)loadedImage.Length;
+                    Tracing.Log(Tracing.Debug, "UnloadingBinary at {0:x8}",
+                                loadedImage.VirtualAddress);
+                    Kernel.Waypoint(523);
+                    DebugStub.UnloadedBinary(loadedImage.VirtualAddress, silentLoad);
+                    Kernel.Waypoint(524);
+                    IoMemory.Release(this, loadedImage);
+
+                    loadedImage = null;
+                    image = null;
+                    entry = null;
+                }
+
+                Kernel.Waypoint(525);
+                handleBytes = handles.FreeAllPages();
+                Kernel.Waypoint(526);
+                pageBytes = Memory.MemoryManager.FreeProcessMemory(this);
+                Kernel.Waypoint(527);
+
+#if PAGING
+            } finally {
+                Thread.RevertToParentDomain();
+            }
+#endif
+
+            Tracing.Log(Tracing.Audit, "Memory: [image={0:x}, pages={1:x}, max={2:x}, handles={3:x}] total = {4} bytes",
+                        imageBytes, pageBytes, pagesMax, handleBytes,
+                        imageBytes + pageBytes + handleBytes);
+
+            // This must follow FreeAll, which relies on the processIndex
+            // (or rather, on the processTag).
+            PrincipalImpl.Dispose(principal);
+            processTable[processIndex] = null;
+            processIndex = -1;
+
+            joinEvent.Set();
+            SharedHeapWalker.walker.RequestWalk();
+            parent.ServiceCheckForExit();
+
+#if PAGING
+            // Release our enclosing protection domain
+            protectionDomain.Release();
+#endif
+
+#if false
+            DebugStub.WriteLine(
+                "Memory: [image={0:x8}, pages={1:x8}, maxpages={2:x8}, " +
+                "handles={3:x8}] total={4:x8} bytes\n",
+                __arglist(
+                    imageBytes,
+                    pageBytes,
+                    pagesMax,
+                    handleBytes,
+                    (long)(imageBytes + pageBytes + handleBytes)));
+#endif
+        }
+
+        internal unsafe bool CheckEndpointsSet ()
+        {
+            if (endpointSet == null) return true;
+            for (int i=0; i < endpointSet.Length; i++){
+                if (endpointSet[i] == null){
+                    DebugStub.WriteLine("Process.Start: Endpoint ({0}) is not set. Process will not start",
+                         __arglist(i));
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        // Start the process.
+        public bool Start()
+        {
+            // If we're to be suspended, wait until after resumption to start
+            // other processes.
+            SuspendBarrierCheckParents();
+
+            processMutex.AcquireMutex();
+            try {
+                if (state != ProcessState.Unstarted) {
+                    DebugStub.WriteLine(" process not in unstarted state!\n");
+                    return false;
+                }
+                if (!CheckEndpointsSet() ) {
+                    return false;
+                }
+                parent.AddChild(this);
+                state = ProcessState.Running;
+                threads[0].SetMainThreadRunning();
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+            Kernel.Waypoint(528);
+            threads[0].StartRunningThread();
+            Kernel.Waypoint(529);
+            return true;
+        }
+
+        internal void StartThread(ref System.Threading.ThreadState threadState)
+        {
+            // If we're being suspended, wait until after resumption to start.
+            SuspendBarrier();
+
+            processMutex.AcquireMutex();
+            try {
+                if (threadState != System.Threading.ThreadState.Unstarted) {
+                    throw new ThreadStateException("Cannot start thread in state " + threadState);
+                }
+                threadState = System.Threading.ThreadState.Running;
+                startedThreadCount++;
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+        }
+
+        // precondition: processMutex held
+        internal void StartMainThread(ref System.Threading.ThreadState threadState)
+        {
+            VTable.Assert(threadState == System.Threading.ThreadState.Unstarted);
+            VTable.Assert(state == ProcessState.Running);
+            VTable.Assert(startedThreadCount == 0);
+            threadState = System.Threading.ThreadState.Running;
+            startedThreadCount++;
+        }
+
+        // started==true indicates a started process; false
+        // indicates an unstarted process.
+        public void Join(out bool started)
+        {
+            Join(SchedulerTime.MaxValue, out started);
+        }
+
+        public void Join()
+        {
+            bool started;
+            Join(out started);
+            if (!started) {
+                throw new ProcessStateException("joining unstarted process");
+            }
+        }
+
+        // started==true indicates a started process; false
+        // indicates an unstarted process.
+        // Returns false if the join timed out, true otherwise.
+        public bool Join(TimeSpan timeout, out bool started)
+        {
+            return Join(SchedulerTime.Now + timeout, out started);
+        }
+
+        // started==true indicates a started process; false
+        // indicates an unstarted process.
+        // Returns false if the join timed out, true otherwise.
+        public bool Join(SchedulerTime timeOut, out bool started)
+        {
+            if (state == ProcessState.Unstarted) {
+                started = false;
+                return false;
+            }
+            started = true;
+            return joinEvent.WaitOne(timeOut);
+        }
+
+        // Freeze all the threads in a process.  If recursive==true, then
+        // freeze all threads in all descendant processes as well.  This
+        // method blocks until all freezing is complete.  Before a thread
+        // in kernel mode is frozen, it is allowed to run until it reaches
+        // a blocking operation, until it exits, or until it enters process
+        // mode.  Semantically, suspended thread execution should be
+        // equivalent to running thread execution, except that suspended
+        // threads appear to receive time slices of length 0.
+        // Returns true if successful; returns false to indicate an
+        // unstarted process.
+        public bool Suspend(bool recursive)
+        {
+            // Ask the kernel service thread to call ServiceSuspend.
+            return ThreadLocalServiceRequest.SuspendProcess(this, recursive);
+        }
+
+        // Should only execute in the kernel service thread
+        internal bool ServiceSuspend(bool recursive)
+        {
+            return ServiceSuspend(recursive, false);
+        }
+
+        // Should only execute in the kernel service thread
+        private bool ServiceSuspend(bool recursive, bool aboutToStop)
+        {
+            bool alreadySuspended = false;
+
+            processMutex.AcquireMutex();
+            try {
+                // The service thread should not already be in the middle of an operation:
+                Debug.Assert(state != ProcessState.Suspending, "unexpected process state");
+                Debug.Assert(state != ProcessState.SuspendingRecursive, "unexpected process state");
+                Debug.Assert(state != ProcessState.Stopping, "unexpected process state");
+                if (state == ProcessState.Running) {
+                    state = (recursive)?(ProcessState.SuspendingRecursive):(ProcessState.Suspending);
+                }
+                else if (!aboutToStop && state == ProcessState.Unstarted) {
+                    return false;
+                }
+                else {
+                    alreadySuspended = true;
+                }
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+
+            if (!alreadySuspended) {
+                // Hold suspendMutex until suspension is complete, so that other
+                // threads in this process block when acquiring suspendMutex.
+                // Only try to acquire suspendMutex if the process isn't already
+                // suspended, though -- otherwise, one of the suspended threads
+                // might be holding suspendMutex.
+                suspendMutex.AcquireMutex();
+            }
+
+            if (recursive) {
+                // Note: now that this.state==Suspending[Recursive], a barrier
+                // prevents new child processes, so we can safely traverse the
+                // existing children without missing any.
+                for (int index = 0;; index++) {
+                    Process child = null;
+                    processMutex.AcquireMutex();
+                    try {
+                        if (index >= children.Length) {
+                            break;
+                        }
+                        else if (children[index] == null) {
+                            continue;
+                        }
+                        child = children[index];
+                    }
+                    finally {
+                        processMutex.ReleaseMutex();
+                    }
+                    if (child != null) {
+                        child.ServiceSuspend(true, aboutToStop);
+                    }
+                }
+            }
+
+            if (alreadySuspended) {
+                // This process is already suspended, the children are
+                // suspended (if recursive==true), so we're done.
+                return true;
+            }
+
+            bool yieldAndRepeat;
+            do {
+                yieldAndRepeat = false;
+
+                // Note: now that this.state==Suspending[Recursive], a barrier
+                // prevents starting threads, so we can safely traverse the
+                // existing threads without missing any started threads.
+                for (int index = 0;; index++) {
+                    Thread thread = null;
+                    processMutex.AcquireMutex();
+                    try {
+                        if (index >= threads.Length) {
+                            break;
+                        }
+                        else if (threads[index] == null) {
+                            continue;
+                        }
+                        thread = threads[index];
+                    }
+                    finally {
+                        processMutex.ReleaseMutex();
+                    }
+                    if (thread != null) {
+                        bool suspended = thread.Suspend(aboutToStop);
+                        if (!suspended) yieldAndRepeat = true;
+                    }
+                }
+
+                if (yieldAndRepeat) {
+                    Thread.Yield();
+                }
+            } while (yieldAndRepeat);
+
+            processMutex.AcquireMutex();
+            state = ProcessState.Suspended;
+            processMutex.ReleaseMutex();
+
+            suspendMutex.ReleaseMutex();
+
+            return true;
+        }
+
+        // Returns true if successful; returns false to indicate an
+        // unstarted process.
+        public bool Resume(bool recursive)
+        {
+            // Ask the kernel service thread to call ServiceResume.
+            return ThreadLocalServiceRequest.ResumeProcess(this, recursive);
+        }
+
+        // Should only execute in the kernel service thread
+        internal bool ServiceResume(bool recursive)
+        {
+            bool alreadyResumed = false;
+
+            processMutex.AcquireMutex();
+            try {
+                // The service thread should not already be in the middle of an operation:
+                Debug.Assert(state != ProcessState.Suspending, "unexpected process state");
+                Debug.Assert(state != ProcessState.SuspendingRecursive, "unexpected process state");
+                Debug.Assert(state != ProcessState.Stopping, "unexpected process state");
+                if (state == ProcessState.Suspended) {
+                    state = ProcessState.Running;
+                }
+                else if (state == ProcessState.Unstarted) {
+                    return false;
+                }
+                else {
+                    alreadyResumed = true;
+                }
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+
+            if (recursive) {
+                for (int index = 0;; index++) {
+                    Process child = null;
+                    processMutex.AcquireMutex();
+                    try {
+                        if (index >= children.Length) {
+                            break;
+                        }
+                        else if (children[index] == null) {
+                            continue;
+                        }
+                        child = children[index];
+                    }
+                    finally {
+                        processMutex.ReleaseMutex();
+                    }
+                    if (child != null) {
+                        child.ServiceResume(true);
+                    }
+                }
+            }
+
+            if (alreadyResumed) {
+                // This process is already resumed, the children are
+                // resumed (if recursive==true), so we're done.
+                return true;
+            }
+
+            for (int index = 0;; index++) {
+                Thread thread = null;
+                processMutex.AcquireMutex();
+                try {
+                    if (index >= threads.Length) {
+                        break;
+                    }
+                    else if (threads[index] == null) {
+                        continue;
+                    }
+                    thread = threads[index];
+                }
+                finally {
+                    processMutex.ReleaseMutex();
+                }
+                if (thread != null) {
+                    thread.Resume();
+                }
+            }
+            return true;
+        }
+
+        public void Stop(int exitCode)
+        {
+            //
+            //  Terminate the process forcefully.
+            //  Should remove all user code from threads, then force them
+            //  to terminate ASAP, close out objects, etc.
+
+            // Ask the kernel service thread to call ServiceStop.
+            ThreadLocalServiceRequest.StopProcess(this, exitCode);
+        }
+
+        // Should only execute in the kernel service thread
+        //
+        // ServiceStop does not block waiting for threads to exit,
+        // so it is recommended that whoever makes the service
+        // request (currently ThreadLocalServiceRequest) perform
+        // a Process.Join to block until the threads have exited
+        // and the process has stopped.
+        internal void ServiceStop(int exitCode)
+        {
+            processMutex.AcquireMutex();
+            try {
+                if (state == ProcessState.Stopped) {
+                    return;
+                }
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+
+            // Make sure that any suspended process we're about to stop has
+            // a chance to process any pending signals before getting stopped
+            // forever:
+            ServiceResume(true);
+
+            // Now suspend it for good:
+            ServiceSuspend(true, true);
+
+            ServiceStopAfterSuspend(exitCode);
+        }
+
+        // Should only execute in the kernel service thread
+        private void ServiceStopAfterSuspend(int exitCode)
+        {
+            processMutex.AcquireMutex();
+            try {
+                Debug.Assert(state == ProcessState.Suspended
+                          || state == ProcessState.Unstarted, "unexpected process state");
+                state = ProcessState.Stopping;
+            }
+            finally {
+                processMutex.ReleaseMutex();
+            }
+
+            processMutex.AcquireMutex();
+            Process[] childArray = children;
+            processMutex.ReleaseMutex();
+            // Don't hold processMutex while calling ServiceStop; it
+            // would try to double-acquire the lock in RemoveChild.
+            // No locking should be necessary here, because a
+            // suspended process should not add new children.
+            foreach (Process c in childArray) {
+                if (c != null) {
+                    c.ServiceStopAfterSuspend(exitCode);
+                }
+            }
+
+            // Throw an exception in each suspended thread.
+            for (int index = 0;; index++) {
+                Thread thread = null;
+                processMutex.AcquireMutex();
+                try {
+                    if (index >= threads.Length) {
+                        break;
+                    }
+                    else if (threads[index] == null) {
+                        continue;
+                    }
+                    thread = threads[index];
+                }
+                finally {
+                    processMutex.ReleaseMutex();
+                }
+                if (thread != null) {
+                    thread.Stop();
+                }
+            }
+
+            if (exitCode >= (int) ProcessExitCode.StopMin &&
+                exitCode <= (int) ProcessExitCode.StopMax) {
+                this.exitCode = exitCode;
+            }
+            else {
+                this.exitCode = (int) ProcessExitCode.StopDefault;
+            }
+        }
+
+        // Should only execute in the kernel service thread
+        internal void ServiceOnThreadStop(Thread thread)
+        {
+#if THREAD_TIME_ACCOUNTING
+            deadThreadExecutionTime += thread.ExecutionTime;
+            deadThreadCount++;
+#endif
+            bool found = ServiceRemoveThread(thread);
+            VTable.Assert(found);
+            ServiceCheckForExit();
+        }
+
+        // Check to see if a process should exit.  If so, release its
+        // resources.
+        // Should only execute in the kernel service thread
+        private void ServiceCheckForExit()
+        {
+            if (startedThreadCount == 0 && startedChildCount == 0) {
+                ServiceRelease();
+            }
+        }
+
+        // If the current process is about to suspend, block until
+        // the process resumes.  Note: if efficiency is more important than
+        // immediate blocking, you can check ThreadContext.suspendAlert
+        // before calling SuspendBarrier, which (assuming a reasonable
+        // multiprocessor memory model) will eventually become
+        // true during a suspension if the thread runs long enough:
+        //   if (Thread.CurrentThread.context.suspendAlert) SuspendBarrier();
+        // The important thing is that each running thread eventually enters a
+        // suspendable state (process-unblocked-running or
+        // kernel-blocked-running) so that the loop in ServiceSuspend will
+        // terminate.
+        internal static void SuspendBarrier()
+        {
+            Process p = Thread.CurrentProcess;
+            // The service thread holds the suspendMutex throughout the
+            // suspension process, so we'll block if we try to acquire
+            // it during suspension:
+            p.suspendMutex.AcquireMutex();
+            Thread.CurrentThread.context.suspendAlert = false;
+            // Ok, we must be running now.  Release the mutex.
+            p.suspendMutex.ReleaseMutex();
+        }
+
+        // Block if any the current process is suspending or if any of its
+        // ancestors is known by this processor to be suspending recursively.
+        internal static void SuspendBarrierCheckParents()
+        {
+            bool yieldAndRepeat;
+            do {
+                yieldAndRepeat = false;
+                SuspendBarrier();
+                for (Process p = Thread.CurrentProcess.parent; p != null; p = p.parent) {
+                    // Don't try to acquire another process's suspendMutex;
+                    // instead, just check its state field.
+                    // MULTIPROCESSOR NOTE: It's not
+                    // important that we see the most up-to-date value of
+                    // p.state immediately -- we just need to see
+                    // SuspendingRecursive eventually if we call this
+                    // barrier enough times.
+                    if (p.state == ProcessState.SuspendingRecursive) {
+                        // An ancestor is suspending recursively.  This
+                        // means we'll be suspended soon.  Just wait
+                        // for this to happen by yielding repeatedly;
+                        // we'll eventually block in SuspendBarrier().
+                        yieldAndRepeat = true;
+                    }
+                }
+                if (yieldAndRepeat) {
+                    Thread.Yield();
+                }
+            } while (yieldAndRepeat);
+        }
+
+        public void Allocated(UIntPtr bytes)
+        {
+#if THREAD_SAFE_INTERNAL_ONLY
+            UIntPtr used;
+            UIntPtr now;
+            do {
+                now = pagesNow;
+                used = now + bytes;
+            } while (now != Interlocked.CompareExchange(ref pagesNow, used, now));
+
+            do {
+                now = pagesMax;
+            } while (used > now &&
+                     now != Interlocked.CompareExchange(ref pagesMax, used, now));
+#else
+            pagesNow += bytes;
+            if (pagesMax < pagesNow) {
+                pagesMax = pagesNow;
+            }
+#endif
+        }
+
+        public void Freed(UIntPtr bytes)
+        {
+#if THREAD_SAFE_INTERNAL_ONLY
+            UIntPtr used;
+            UIntPtr now;
+            do {
+                now = pagesNow;
+                used = now - bytes;
+            } while (now != Interlocked.CompareExchange(ref pagesNow, used, now));
+#else
+            pagesNow -= bytes;
+#endif
+        }
+
+        // Returns the currently allocated memory in bytes.
+        public UIntPtr AllocatedMemory {
+            [NoHeapAllocation]
+            get { return pagesNow; }
+        }
+
+        // Returns the peak allocated memory in bytes.
+        public UIntPtr PeakAllocatedMemory {
+            [NoHeapAllocation]
+            get { return pagesMax; }
+        }
+
+        // Returns number of pages in the handle table
+        public int NumHandlePages {
+            [NoHeapAllocation]
+            get { return handles.GetPageCount(); }
+        }
+
+        public int ExitCode {
+            [NoHeapAllocation]
+            get { return exitCode; }
+        }
+
+        // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        public unsafe SharedHeap.Allocation * GetNamespaceEndpoint()
+        {
+            return DirectoryService.NewClientEndpointEx();
+        }
+
+        //
+        // Endpoint Argument Processing
+        //
+
+        // Set the size of the endpoint set.
+        public unsafe bool SetEndpointCount(int count) {
+            if (state != ProcessState.Unstarted) {
+                throw new ProcessStateException("process not unstarted");
+            }
+            if (count == 0) {
+                // don't create array if the count is zero.
+                return true;
+            }
+
+            endpointSet = new SharedHeap.Allocation * [count];
+            //DebugStub.WriteLine("-- Process.SetEndpointCount({0})",
+            //__arglist(count));
+            return true;
+        }
+
+        // Set the endpoint and individual endpoint.
+        public unsafe bool SetEndpoint(int index, ref SharedHeap.Allocation * endpoint)
+        {
+            // FIXFIX: I short-circuited the check below to bypass
+            // issues with stdin pipes.
+
+            // if (state != ProcessState.Unstarted) {
+            //     throw new ProcessStateException("process not unstarted");
+            //
+
+            if (endpointSet == null) {
+                DebugStub.WriteLine("Process.SetEndpoint is NULL!");
+                throw new ProcessStateException("endpoint set not allocated, attempting to set");
+            }
+            if (index > endpointSet.Length-1) {
+                DebugStub.WriteLine("Process.SetEndpoint {0} out of range!",__arglist(index));
+                throw new ProcessStateException("endpoint index out of range");
+            }
+            if (endpointSet[index] != null) {
+                DebugStub.Break();
+                DebugStub.WriteLine("Process.SetEndpoint {0} was already set!",__arglist(index));
+                throw new ProcessStateException("endpoint already non-null");
+            }
+
+            // We first move it to the kernel. When the target process retrieves it,
+            // we move it into its heap.
+            endpointSet[index] =
+                Microsoft.Singularity.Channels.EndpointCore.MoveEndpoint(
+                    Thread.CurrentProcess.ProcessSharedHeap,
+                    SharedHeap.KernelSharedHeap, this, endpoint);
+
+            endpoint = null;
+            return true;
+        }
+
+        public unsafe int GetStartupEndpointCount()
+        {
+            //DebugStub.WriteLine("-- Process.GetStartupEndpointCount() -> {0}",
+            //__arglist((int)(endpointSet != null ? endpointSet.Length : 0)));
+            return endpointSet != null ? endpointSet.Length : 0;
+        }
+
+        public unsafe SharedHeap.Allocation * GetStartupEndpoint(int arg)
+        {
+            // Endpoints can only be retrieved once.
+            if (endpointSet == null || arg >= endpointSet.Length) {
+                // legacy code will always ask for a null endpoint 0.
+                //DebugStub.WriteLine("-- Process.GetStartupEndpoint({0}) -> {1:x8}",
+                //__arglist(arg, 0));
+                return null;
+            }
+            SharedHeap.Allocation * used = endpointSet[arg];
+            endpointSet[arg] = null;
+
+#if PAGING
+            // now move it from kernel to user process
+            used = Microsoft.Singularity.Channels.EndpointCore.MoveEndpoint(
+                SharedHeap.KernelSharedHeap, this.ProcessSharedHeap, this, used);
+#endif
+
+            return used;
+        }
+
+        // String Argument Processing
+        //          <set,get>StringArg
+        //          <set,get>StringArgCount
+
+        public  bool SetStringArgCount(int count) {
+            if (state != ProcessState.Unstarted) {
+                throw new ProcessStateException("process not unstarted");
+            }
+            if (count == 0) {
+                // don't create array if the count is zero.
+                return true;
+            }
+
+            stringArgSet = new StringArg [count];
+            //DebugStub.WriteLine("-- Process.SetStringArgCount({0})",
+            //__arglist(count));
+            return true;
+        }
+
+        public bool SetStringArrayArgCount(int count) {
+            //DebugStub.WriteLine("SetStringArrayArg called. count={0}", __arglist(count));
+            if (state != ProcessState.Unstarted) {
+                throw new ProcessStateException("process not unstarted");
+            }
+            if (count == 0) {
+                // don't create array if the count is zero.
+                return true;
+            }
+            stringArrayArgSet = new StringArrayArg [count];
+            if (stringArrayArgSet == null) {
+                throw new Exception("out of memory in process SetStringArrayArgCount");
+            }
+            return true;
+        }
+
+        public int GetStartupStringArrayArgCount() {
+            return stringArrayArgSet != null ? stringArrayArgSet.Length : 0;
+        }
+
+        public ParameterCode GetStartupStringArrayArg(int index, out string [] strings)
+        {
+            //DebugStub.WriteLine("GetStartupStringArrayArg called. index={0}", __arglist(index));
+            if (stringArrayArgSet == null) {
+                strings = null;
+                return ParameterCode.NotSet;
+            }
+            if (index > stringArrayArgSet.Length-1) {
+                strings = null;
+                return ParameterCode.OutOfRange;
+            }
+            if (stringArrayArgSet[index] == null) {
+                strings = null;
+                return ParameterCode.NotSet;
+            }
+
+
+            if (!stringArrayArgSet[index].Set) {
+                strings = null;
+                return ParameterCode.NotSet;
+            }
+            //DebugStub.WriteLine("GetStartupStringArrayArg getting value");
+            strings = stringArrayArgSet[index].Value;
+            return ParameterCode.Success;
+        }
+
+        public ParameterCode SetStartupStringArrayArg(int index, string[] strings)
+        {
+            //DebugStub.WriteLine("Setting string Arg array");
+            if (index > stringArrayArgSet.Length-1) {
+                return ParameterCode.OutOfRange;
+            }
+
+            if (stringArrayArgSet[index] == null) {
+                stringArrayArgSet[index]  = new StringArrayArg(strings);
+            }
+            else {
+                stringArrayArgSet[index].Value = strings;
+            }
+            stringArrayArgSet[index].Set = true;
+            return ParameterCode.Success;
+        }
+
+        public ParameterCode SetStartupStringArg(int index, string value) {
+            //DebugStub.WriteLine("set string attempting to set idx={0}", __arglist(index));
+            if (index > stringArgSet.Length-1) {
+                //DebugStub.WriteLine("Process.SetStringArg {0} out of range!",__arglist(index));
+                //throw new ProcessStateException("StringArg index out of range");
+                return ParameterCode.OutOfRange;
+            }
+
+            if (stringArgSet[index] != null) {
+                //DebugStub.Break();
+                //DebugStub.WriteLine("Process.SetStringArg {0} was already set!",__arglist(index));
+                //throw new ProcessStateException("StringArg already non-null");
+                return ParameterCode.AlreadySet;
+            }
+
+            stringArgSet[index] = new StringArg(value);
+            stringArgSet[index].Set = true;
+            return ParameterCode.Success;
+        }
+
+        public unsafe int GetStartupStringArgCount() {
+            return stringArgSet != null ? stringArgSet.Length : 0;
+        }
+
+        public unsafe ParameterCode GetStartupStringArg(int arg, out string value) {
+            if (stringArgSet == null) {
+                value = null;
+                return ParameterCode.NotSet;
+            }
+            if (arg >= stringArgSet.Length) {
+                value = null;
+                return ParameterCode.OutOfRange;
+            }
+            if (stringArgSet[arg] == null ) {
+                value = null;
+                return ParameterCode.Success;
+            }
+
+            if (!stringArgSet[arg].Set) {
+                value = null;
+                return ParameterCode.NotSet;
+            }
+            value = stringArgSet[arg].Value;
+            return ParameterCode.Success;
+        }
+
+        // int Argument Processing
+        //          <set,get>StringArg
+        //          <set,get>StringArgCount
+
+        public unsafe bool SetLongArgCount(int count) {
+            if (state != ProcessState.Unstarted) {
+                throw new ProcessStateException("process not unstarted");
+            }
+            if (count == 0) {
+                // don't create array if the count is zero.
+                return true;
+            }
+
+            longArgSet = new LongArg [count];
+            //DebugStub.WriteLine("-- Process.SetLongArgCount({0})",
+            //__arglist(count));
+            return true;
+        }
+
+        public unsafe ParameterCode SetStartupLongArg(int index, long value) {
+            if (index > longArgSet.Length-1) {
+                //DebugStub.WriteLine("Process.SetLongArg {0} out of range!",__arglist(index));
+                //throw new ProcessStateException("LongArg index out of range");
+                return ParameterCode.OutOfRange;
+            }
+            // TODO checks for setting more than once
+            if (longArgSet[index] != null) {
+                return ParameterCode.AlreadySet;
+            }
+
+            longArgSet[index] = new LongArg(value);
+            longArgSet[index].Set = true;
+
+            return ParameterCode.Success;
+        }
+
+        public unsafe int GetStartupLongArgCount() {
+            return longArgSet != null ? longArgSet.Length : 0;
+        }
+
+        public unsafe ParameterCode GetStartupLongArg(int arg, out long value) {
+            if (longArgSet == null || arg >= longArgSet.Length) {
+                //DebugStub.WriteLine("Process.GetLongArg {0} out of range!",__arglist(arg));
+                //throw new ProcessStateException("LongArg index out of range");
+                value = -1;
+                return ParameterCode.OutOfRange;
+            }
+
+            if ( longArgSet[arg] == null) {
+                value = -1;
+                return ParameterCode.NotSet;
+            }
+
+            if (longArgSet[arg].Set == false) {
+                value = -1;
+                return ParameterCode.NotSet;
+            }
+#if EXTRA
+            if (longArgSet[arg].Retrieved == true) {
+                value = -1;
+                return ParameterCode.Retrieved;
+            }
+#endif
+            value = longArgSet[arg].Value;
+            longArgSet[arg].Retrieved = true;
+            return ParameterCode.Success;
+        }
+
+        // bool Argument Processing
+        //          <set,get>StringArg
+        //          <set,get>StringArgCount
+
+        public unsafe bool SetBoolArgCount(int count) {
+            if (state != ProcessState.Unstarted) {
+                throw new ProcessStateException("process not unstarted");
+            }
+            if (count == 0) {
+                // don't create array if the count is zero.
+                return true;
+            }
+
+            boolArgSet = new BoolArg [count];
+            //DebugStub.WriteLine("-- Process.SetBoolArgCount({0})",
+            //__arglist(boolArgSet.Length));
+            return true;
+        }
+
+        public unsafe ParameterCode SetStartupBoolArg(int index, bool value) {
+            if (boolArgSet == null) return ParameterCode.OutOfRange;
+
+            if (index > boolArgSet.Length-1) {
+                //DebugStub.WriteLine("Process.SetBoolArg {0} out of range!",__arglist(index));
+                //throw new ProcessStateException("BoolArg index out of range");
+                return ParameterCode.OutOfRange;
+            }
+            // TODO checks for setting more than once
+            boolArgSet[index] = new BoolArg(value);
+            boolArgSet[index].Set = true;
+            return ParameterCode.Success;
+        }
+
+        public unsafe ParameterCode GetStartupBoolArg(int index, out bool value) {
+            value = false;
+            if (boolArgSet == null || index >= boolArgSet.Length) {
+                //DebugStub.WriteLine("Process.GetBoolArg {0} out of range!",__arglist(index));
+                //throw new ProcessStateException("BoolArg index out of range");\
+                value = false;
+                return ParameterCode.OutOfRange;
+            }
+
+            if ( boolArgSet[index] == null) {
+                value = false;
+                return ParameterCode.NotSet;
+            }
+
+            if (boolArgSet[index].Set == false) {
+                return ParameterCode.NotSet;
+            }
+            value = boolArgSet[index].Value;
+            boolArgSet[index].Retrieved = true;
+            return ParameterCode.Success;
+        }
+
+        public unsafe int GetStartupBoolArgCount() {
+            //if ( boolArgSet != null) DebugStub.WriteLine("bool args=", __arglist(boolArgSet.Length));
+            return boolArgSet != null ? boolArgSet.Length : 0;
+        }
+
+
+        public void SetArgs(string[] args)
+        {
+            this.args = args;
+        }
+
+        [NoHeapAllocation]
+        public int GetStartupArgCount()
+        {
+            return args.Length;
+        }
+
+        [NoHeapAllocation]
+        public string GetStartupArg(int arg)
+        {
+            if (arg >= args.Length) {
+                return null;
+            }
+            return args[arg];
+        }
+
+        [NoHeapAllocation]
+        public string GetProcessName() {
+            return imageName;
+        }
+
+        [NoHeapAllocation]
+        public void SetGcPerformanceCounters(TimeSpan timeSpent, long bytes) {
+            gcCount++;
+            gcTotalTime = gcTotalTime.AddNoAlloc(timeSpent);
+            gcTotalBytes += bytes;
+        }
+
+        [NoHeapAllocation]
+        public void GetGcPerformanceCounters( out int count, out TimeSpan time, out long bytes)
+        {
+            count = gcCount;
+            time  = gcTotalTime;
+            bytes = gcTotalBytes;
+        }
+
+        public long GetThreadTimes()
+        {
+#if THREAD_TIME_ACCOUNTING
+            long total = 0;
+            for (int i = 0; i < threads.Length; i++) {
+                if (threads[i] != null) {
+                    total += threads[i].ExecutionTime.Ticks;
+                }
+            }
+            return total;
+#else
+            return 0;
+#endif
+        }
+
+        public long DeadThreadCount
+        {
+            get
+            {
+                return deadThreadCount;
+            }
+        }
+
+        public long DeadThreadTime
+        {
+            get
+            {
+                return deadThreadExecutionTime.Ticks;
+            }
+        }
+
+        public int [] GetThreadIDs()
+        {
+            int threadCount = 0;
+            int [] temp = null;
+
+            processMutex.AcquireMutex();
+            try {
+                for (int i = 0; i < threads.Length; i++) {
+                    if (threads[i] != null) threadCount++;
+                }
+                if (threadCount > 0) {
+                    temp = new int[threadCount];
+
+                    int current = 0;
+                    for (int i = 0; i < threads.Length; i++) {
+                        if (threads[i] != null) {
+                            temp[current++] = threads[i].GetThreadId();
+                        }
+                    }
+                }
+                //else DebugStub.Break();
+            } finally {
+                processMutex.ReleaseMutex();
+            }
+            return temp;
+        }
+
+        // Start the execution within the PE Image.
+        private void PeStart()
+        {
+            Tracing.Log(Tracing.Audit, "** Start of process {0}.", args[0]);
+            UIntPtr entryPoint = image.GetEntryPoint(loadedImage);
+
+#if VERBOSE
+            DebugStub.WriteLine("calling CallEntryPoint");
+            DebugStub.WriteLine(" entry:{0:x8}, args{1}",__arglist((uint)entryPoint, args));
+            for (int i = 0; i < args.Length; i++) {
+                DebugStub.WriteLine("  {0}: [{1}]", __arglist(i, args[i]));
+            }
+#endif
+            try {
+                Tracing.Log(Tracing.Audit, "Calling entryPoint={0:x}", entryPoint);
+                Kernel.Waypoint(530);
+#if THREAD_TIME_ACCOUNTING
+                Processor.GetCurrentThread().context.lastExecutionTimeUpdate =
+                    Processor.CycleCount;
+#endif
+                int code = PEImage.CallEntryPoint(entryPoint, -1, !RunsAtKernelPrivilege);
+                if (code >= (int) ProcessExitCode.MainMin &&
+                    code <= (int) ProcessExitCode.MainMax) {
+                    exitCode = code;
+                }
+                else {
+                    exitCode = (int) ProcessExitCode.ErrorDefault;
+                }
+                Kernel.Waypoint(531);
+                unchecked {
+                    Tracing.Log(Tracing.Audit, "Main thread exited with (exit={0})",
+                                (UIntPtr)(uint)exitCode);
+                }
+            }
+            catch (Exception e) {
+                // Don't set exitCode here; the only exception we should see is
+                // ProcessStopException, and Stop sets exitCode in this case.
+                Tracing.Log(Tracing.Fatal, "Main thread failed with exception {0}.{1}",
+                            e.GetType().Namespace, e.GetType().Name);
+                Tracing.Log(Tracing.Trace, "Exception message was {0}",
+                            e.ToString());
+                DebugStub.WriteLine("Process.cs: Caught exception {0}.", __arglist(e.ToString()));
+            }
+        }
+
+        // Start the execution of the new thread within the PE Image.
+        private void PeStartThread()
+        {
+            UIntPtr entryPoint = image.GetEntryPoint(loadedImage);
+            int threadIndex = Thread.CurrentThread.processThreadIndex;
+            int threadExit = 0;
+
+            Tracing.Log(Tracing.Debug,
+                        "PeStartThread(entry={0:x8}, threadIndex={1}",
+                        entryPoint, (uint)threadIndex);
+#if VERBOSE
+            DebugStub.WriteLine("calling CallEntryPoint for thread");
+            DebugStub.WriteLine(" entry:{0:x8}, threadIndex={1}",
+                                __arglist((uint)entryPoint, threadIndex));
+#endif
+            try {
+                Tracing.Log(Tracing.Audit, "Calling thread entryPoint={0:x}", entryPoint);
+                Kernel.Waypoint(532);
+#if THREAD_TIME_ACCOUNTING
+                Processor.GetCurrentThread().context.lastExecutionTimeUpdate =
+                    Processor.CycleCount;
+#endif
+                threadExit = PEImage.CallEntryPoint(entryPoint, threadIndex,
+                                                    !RunsAtKernelPrivilege);
+                Kernel.Waypoint(533);
+                unchecked {
+                    Tracing.Log(Tracing.Audit, "Thread exited with (exit={0})",
+                                (UIntPtr)(uint)threadExit);
+                }
+            }
+            catch (Exception e) {
+                Tracing.Log(Tracing.Fatal, "Process thread failed with exception {0}.{1}",
+                            e.GetType().Namespace, e.GetType().Name);
+                Tracing.Log(Tracing.Trace, "Exception message was {0}",
+                            e.ToString());
+                DebugStub.WriteLine("Caught exception {0}.", __arglist(e.ToString()));
+            }
+        }
+
+        public ProcessState State {
+            get { return this.state; }
+        }
+
+#region HandleTable
+        public unsafe UIntPtr AllocateHandle()
+        {
+            return handles.AllocateHandle();
+        }
+
+        public unsafe UIntPtr AllocateHandle(object obj)
+        {
+            DebugStub.Assert(obj != null, "Can't allocate handle for null object.");
+
+            UIntPtr handle = handles.AllocateHandle();
+            HandleTable.SetHandle(handle, obj);
+            return handle;
+        }
+
+        public void ReleaseHandle(UIntPtr id)
+        {
+            unchecked {
+                Tracing.Log(Tracing.Debug, "Process[{0:x3}].ReleaseHandle(id={1:x})",
+                            (UIntPtr)(uint)processIndex, id);
+            }
+            handles.FreeHandle(id);
+        }
+#endregion
+    }
+}
diff --git a/base/Kernel/Singularity/ProcessStart.cs b/base/Kernel/Singularity/ProcessStart.cs
new file mode 100644
index 0000000..54f3361
--- /dev/null
+++ b/base/Kernel/Singularity/ProcessStart.cs
@@ -0,0 +1,14 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace Microsoft.Singularity {
+
+    using System;
+
+    // Define the delegate
+    //| <include path='docs/doc[@for="ThreadStart"]/*' />
+    public delegate int ProcessStart(String[] args);
+}
diff --git a/base/Kernel/Singularity/ProcessState.cs b/base/Kernel/Singularity/ProcessState.cs
new file mode 100644
index 0000000..876aaec
--- /dev/null
+++ b/base/Kernel/Singularity/ProcessState.cs
@@ -0,0 +1,24 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Process.cs
+//
+//  Note:
+//
+
+namespace System.Threading
+{
+    public enum ProcessState
+    {
+        Unstarted,
+        Running,
+        Suspending,
+        SuspendingRecursive,
+        Suspended,
+        Stopping,
+        Stopped,
+    }
+}
diff --git a/base/Kernel/Singularity/ProcessStopException.cs b/base/Kernel/Singularity/ProcessStopException.cs
new file mode 100644
index 0000000..1a1424b
--- /dev/null
+++ b/base/Kernel/Singularity/ProcessStopException.cs
@@ -0,0 +1,24 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity 
+{
+    using System;
+
+    // The kernel throws a ProcessStopException to stop the current
+    // thread (as part of stopping a whole process).  This is not
+    // thrown asynchronously, because we don't want to abruptly interrupt
+    // the kernel's execution.  Instead, it is thrown at well-defined
+    // points in the kernel: when the kernel blocks and when the kernel
+    // calls process code.  When the ProcessStopException propagates
+    // up to the process's part of the stack, the exception handling
+    // skips over the process's stack frames and continues propagating
+    // the ProcessStopException in the kernel.
+    public class ProcessStopException : SystemException
+    {
+        public ProcessStopException() : base("Arg_ProcessStopException") {}
+        public ProcessStopException(String message) : base(message) {}
+        public ProcessStopException(String message, Exception inner) : base(message, inner) {}
+    }
+}
diff --git a/base/Kernel/Singularity/ProcessUncaughtException.cs b/base/Kernel/Singularity/ProcessUncaughtException.cs
new file mode 100644
index 0000000..e58d35a
--- /dev/null
+++ b/base/Kernel/Singularity/ProcessUncaughtException.cs
@@ -0,0 +1,30 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity 
+{
+    using System;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity.X86;
+
+    // If a process throws an exception to the kernel, the
+    // exception handling mechanism throws a new ProcessUncaughtException
+    // into the kernel's code.  This ensures that the kernel
+    // does not see the process's exception object, which lives
+    // in a different GC domain.
+    public class ProcessUncaughtException : SystemException
+    {
+        public ProcessUncaughtException() : base("Arg_ProcessUncaughtException") {}
+        public ProcessUncaughtException(String message) : base(message) {}
+        public ProcessUncaughtException(String message, Exception inner) : base(message, inner) {}
+
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        internal static unsafe void ThrowProcessUncaughtException()
+        {
+            ThreadContext *context = Processor.GetCurrentThreadContext();
+            context->uncaughtFlag = false;
+            throw new ProcessUncaughtException();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Processor.cs b/base/Kernel/Singularity/Processor.cs
new file mode 100644
index 0000000..6dff76f
--- /dev/null
+++ b/base/Kernel/Singularity/Processor.cs
@@ -0,0 +1,1352 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Processor.cs
+//
+//  Note:
+//
+
+//#define DEBUG_EXCEPTIONS
+//#define DEBUG_INTERRUPTS
+//#define DEBUG_DISPATCH_TIMER
+//#define DEBUG_DISPATCH_IO
+//#define SAMPLE_PC
+
+// #define SINGULARITY_ASMP
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Scheduling;
+using Microsoft.Singularity.X86;
+
+// haryadi: for Abi Call
+// using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity
+{
+    [CLSCompliant(false)]
+    public enum ProcessorEvent : ushort
+    {
+        Exception = 0,
+        Resume    = 1,
+        Interrupt = 2
+    }
+
+    [CLSCompliant(false)]
+    [CCtorIsRunDuringStartup]
+    public class Processor
+    {
+        private const uint interruptStackSize   = 0x2000;
+        private const uint exceptionStackSize   = 0x2000;
+        private const uint schedulerStackSize   = 0x2000;
+
+        internal unsafe ProcessorContext* context;
+
+        public static Processor[] processorTable;
+
+        //As requested/desired by the SchedulerClock
+
+        private HalPic   pic;
+        private HalTimer timer;
+        private HalClock clock;
+
+        // haryadi
+        private static IHalMemory halMemory;
+
+        private byte timerInterrupt;
+        private byte clockInterrupt;
+
+        private bool inInterruptContext = false;
+        private bool halted = false;
+
+        public readonly int processorIndex;
+        public uint NumExceptions = 0;
+        public uint NumInterrupts = 0;
+        public uint NumContextSwitches = 0;
+        private int[] interruptCounts;
+        private ulong cyclesPerSecond;
+
+        private static int runningCpus = 0;
+
+        public HalTimer Timer
+        {
+            [NoHeapAllocation]
+            get { return timer; }
+        }
+
+        public Thread IdleThread;
+
+        internal static void InitializeProcessorTable()
+        {
+            processorTable = new Processor [MpBootInfo.MAX_CPU];
+            for (int i = 0; i < processorTable.Length; i++) {
+                processorTable[i] = new Processor(i);
+            }
+            DebugStub.WriteLine("Processors: {0} of {1}",
+                                __arglist(processorTable.Length, MpBootInfo.MAX_CPU));
+        }
+
+        internal static void AllocateStack(UIntPtr size, out UIntPtr begin, out UIntPtr limit)
+        {
+            Kernel.Waypoint(818);
+            size = MemoryManager.PagePad(size);
+            limit = MemoryManager.KernelAllocate(
+                MemoryManager.PagesFromBytes(size), null, 0, System.GCs.PageType.Stack);
+            begin = limit + size;
+            Kernel.Waypoint(819);
+        }
+
+        private Processor(int index)
+        {
+            processorIndex = index;
+            if (interruptCounts == null) {
+                interruptCounts = new int [256];
+            }
+        }
+
+        public unsafe void Initialize(int processorId)
+        {
+            processorTable[processorId] = this;
+
+            BootInfo bi = BootInfo.GetBootInfo();
+            CpuInfo  ci = bi.GetCpuInfo(processorId);
+            context = (ProcessorContext*) ci.Fs32;
+            context->UpdateAfterGC(this);
+
+            AllocateStack(interruptStackSize,
+                          out context->interruptStackBegin,
+                          out context->interruptStackLimit);
+            AllocateStack(exceptionStackSize,
+                          out context->exceptionStackBegin,
+                          out context->exceptionStackLimit);
+            AllocateStack(schedulerStackSize,
+                          out context->schedulerStackBegin,
+                          out context->schedulerStackLimit);
+
+            Tracing.Log(Tracing.Debug, "Initialized Processor {0}",
+                        (UIntPtr)processorId);
+            Tracing.Log(Tracing.Debug, "asmInterruptStack={0:x}..{1:x}",
+                        context->interruptStackBegin,
+                        context->interruptStackLimit);
+
+            inInterruptContext = false;
+            MpExecution.AddProcessorContext(context);
+
+            Interlocked.Increment(ref runningCpus);
+        }
+
+        [NoHeapAllocation]
+        public void Uninitialize(int processorId)
+        {
+            Tracing.Log(Tracing.Debug, "UnInitializing Processor {0}",
+                        (UIntPtr)processorId);
+
+            Interlocked.Decrement(ref runningCpus);
+
+            // Processor is out of commission
+            HaltUntilInterrupt();
+        }
+
+        private static void MeasureFxSavePerformance()
+        {
+#if DO_FXSAVE_TEST
+            DebugStub.WriteLine("Starting fxsave test.");
+            int timePerFxsave = TestFxsave();
+            DebugStub.Print("Cycles per fxsave/fxrstor pair: {0}",
+                            __arglist(timePerFxsave));
+#endif // DO_FXSAVE_TEST
+        }
+
+        private static void MeasureFs0Performance()
+        {
+#if DO_FS0_TEST
+            DebugStub.WriteLine("Starting fs:[0] test.");
+            int timePerFs0 = TestFs0();
+            DebugStub.WriteLine("Cycles per fs:[0] test: {0}",
+                            __arglist(timePerFs0));
+#endif // DO_FS0_TEST
+        }
+
+        private static void MeasureCliStiPerformance()
+        {
+#if DO_CLI_STI_TEST
+            DebugStub.WriteLine("Starting cli/sti test.");
+            int timePerCli = TestCliSti();
+            DebugStub.WriteLine("Cycles per cli/sti test: {0}",
+                            __arglist(timePerCli));
+
+            ulong beg;
+            ulong end;
+            int loops = 1000000;
+
+            DebugStub.WriteLine("Starting C# cli/sti test.");
+            bool enabled = DisableInterrupts();
+
+            RestoreInterrupts(true);
+
+            beg = HalGetCycleCount();
+            while (loops-- > 0) {
+                RestoreInterrupts(true);    // 1
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 2
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 3
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 4
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 5
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 6
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 7
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 8
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 9
+                DisableInterrupts();
+                RestoreInterrupts(true);    // 10
+                DisableInterrupts();
+            }
+            end = HalGetCycleCount();
+            DisableInterrupts();
+            RestoreInterrupts(enabled);
+
+            timePerCli = ((int)((end - beg) / 1000000)) / 10;
+            DebugStub.WriteLine("Cycles per C# cli/sti test: {0}",
+                            __arglist(timePerCli));
+#endif // DO_CLI_STI_TEST
+        }
+
+        public void AddPic(HalPic pic)
+        {
+            Tracing.Log(Tracing.Audit, "AddPic({0})\n",
+                        Kernel.TypeName(pic));
+            this.pic = pic;
+
+            MeasureFxSavePerformance();
+            MeasureFs0Performance();
+            MeasureCliStiPerformance();
+        }
+
+        [NoHeapAllocation]
+        public void AddTimer(byte interrupt, HalTimer timer)
+        {
+            Tracing.Log(Tracing.Audit, "AddTimer({0}) on {1}\n",
+                        Kernel.TypeName(timer), interrupt);
+            this.timer = timer;
+            this.timerInterrupt = interrupt;
+        }
+
+        [NoHeapAllocation]
+        public void AddClock(byte interrupt, HalClock clock)
+        {
+            Tracing.Log(Tracing.Audit, "AddClock({0}) on {1}\n",
+                        Kernel.TypeName(clock), interrupt);
+            this.clock = clock;
+            this.clockInterrupt = interrupt;
+        }
+
+        [NoHeapAllocation]
+        public static void AddHalMemory(IHalMemory aHalMemory)
+        {
+            Tracing.Log(Tracing.Audit, "AddHalMemory({0})\n",
+                        Kernel.TypeName(aHalMemory));
+            halMemory = aHalMemory;
+        }
+
+        [NoHeapAllocation]
+        internal unsafe void Display()
+        {
+            int stackVariable;
+            UIntPtr currentStack = new UIntPtr(&stackVariable);
+
+            unchecked {
+                Tracing.Log(Tracing.Debug, "Interrupt stack: {0:x} {1:x}..{2:x} uses",
+                            currentStack,
+                            context->interruptStackBegin,
+                            context->interruptStackLimit);
+            }
+        }
+
+        // Returns the processor that the calling thread is running on.
+        // Needs to be fixed. (Added for consistency)
+        public static Processor CurrentProcessor
+        {
+            [NoHeapAllocation]
+            get { return GetCurrentProcessor(); }
+        }
+
+        [NoHeapAllocation]
+        public static int GetCurrentProcessorId()
+        {
+            return GetCurrentProcessor().Id;
+        }
+
+        public unsafe int Id
+        {
+            [NoHeapAllocation]
+            get { return context->cpuId; }
+        }
+
+        [NoHeapAllocation]
+        public static void HaltUntilInterrupt()
+        {
+            CurrentProcessor.halted = true;
+            HaltUntilInterruptNative();
+        }
+
+        public bool InInterruptContext
+        {
+            [NoHeapAllocation]
+            get { return inInterruptContext; }
+        }
+
+        [NoHeapAllocation]
+        public int GetInterruptCount(byte interrupt)
+        {
+            return interruptCounts[interrupt];
+        }
+
+        public int GetIrqCount(byte irq)
+        {
+            HalPic pic = CurrentProcessor.pic;
+            return interruptCounts[pic.IrqToInterrupt(irq)];
+        }
+
+        public static byte GetMaxIrq()
+        {
+            return CurrentProcessor.pic.MaximumIrq;
+        }
+
+        public static ulong CyclesPerSecond
+        {
+            [NoHeapAllocation]
+            get { return GetCurrentProcessor().cyclesPerSecond; }
+
+            [NoHeapAllocation]
+            set { GetCurrentProcessor().cyclesPerSecond = value; }
+        }
+
+        public static ulong CycleCount
+        {
+            [NoHeapAllocation]
+            get { return GetCycleCount(); }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+#if SAMPLE_PC
+        #if SINGULARITY_MP
+        // This should be easy to fix.
+        #error "SAMPLE_PC does not work in conjunction with SINGULARITY_MP."
+        #endif
+
+        const int pcLog2Samples = 16;
+        const int pcMaxSamples  = 2 << pcLog2Samples;
+        const int sampleMask    = pcMaxSamples - 1;
+
+        static bool nextSampleIdle = false;
+
+        static UIntPtr[] pcSamples = null;
+        static int pcHead          = 0;    // head position
+        static int pcLength        = 0;    // length of live data in buffer
+
+        static uint pcSamplesI = 0;
+        static ulong pcSamplesCounterThen;
+#endif // SAMPLE_PC
+
+        [NoHeapAllocation]
+        public static bool SamplingEnabled()
+        {
+#if SAMPLE_PC
+            return true;
+#else
+            return false;
+#endif // SAMPLE_PC
+        }
+
+        internal static void StartSampling()
+        {
+#if SAMPLE_PC
+            pcSamplesCounterThen = Processor.CycleCount;
+            pcSamples = new UIntPtr[2 << pcLog2Samples];
+            nextSampleIdle = false;
+#endif // SAMPLE_PC
+        }
+
+        [NoHeapAllocation]
+        internal static void NextSampleIsIdle()
+        {
+#if SAMPLE_PC
+            nextSampleIdle = true;
+#endif // SAMPLE_PC
+        }
+
+        //////////////////////////////////////////////////// External Methods.
+        //
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern ulong GetCycleCount();
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern UIntPtr GetFrameEip(UIntPtr ebp);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern UIntPtr GetFrameEbp(UIntPtr ebp);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern UIntPtr GetStackPointer();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern UIntPtr GetFramePointer();
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        private static extern Processor GetCurrentProcessor();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern ThreadContext * GetCurrentThreadContext();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern ProcessorContext * GetCurrentProcessorContext();
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern Thread GetCurrentThread();
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void SetCurrentThreadContext(ref ThreadContext context);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.GCFRIEND)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void SwitchToThreadContext(ref ThreadContext oldContext, ref ThreadContext newContext);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void SwitchToThreadContextNoGC(ref ThreadContext newContext);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void TestSaveLoad(ref ThreadContext newContext);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void TestSave(ref ThreadContext newContext);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern void EnterRing3();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static extern bool AtKernelPrivilege();
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        // These methods are currently marked external because they are used
+        // by device drivers.  We need a tool to verify that device drivers
+        // are in fact using them correctly!
+        //
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern bool DisableInterrupts();
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void RestoreInterrupts(bool enabled);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void SetIdtTable();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        internal static extern void ClearIdtTable();
+
+        // Use this method for assertions only!
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern bool InterruptsDisabled();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void HaltUntilInterruptNative();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void InitFpu();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        private static extern uint ReadFpuStatus();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        private static extern void ClearFpuStatus();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern void WriteMsr(uint offset,
+                                           ulong value);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern ulong ReadMsr(uint offset);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        public static extern ulong ReadPmc(uint offset);
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(64)]
+        [NoHeapAllocation]
+        public static extern void ReadCpuid(uint feature,
+                                            out uint v0,
+                                            out uint v1,
+                                            out uint v2,
+                                            out uint v3);
+
+#if DO_FXSAVE_TEST
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [NoHeapAllocation]
+        public static extern int TestFxsave();
+#endif
+
+#if DO_FS0_TEST
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [NoHeapAllocation]
+        public static extern int TestFs0();
+#endif
+
+#if DO_CLI_STI_TEST
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [NoHeapAllocation]
+        public static extern int TestCliSti();
+#endif
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        /// <summary>
+        /// Hardware exceptions are mapped to vectors 0x00..0x1f.
+        /// They always use a processor context record.
+        /// </summary>
+        [AccessedByRuntime("referenced from Processor.cpp")]
+        [NoHeapAllocation]
+        internal static void DispatchException(int interrupt,
+                                               ref ThreadContext context)
+        {
+            //            Tracing.Log(Tracing.Debug, "Exception {0}", (uint)interrupt);
+            GetCurrentProcessor().DispatchSpecificException(interrupt, ref context);
+        }
+
+        [NoHeapAllocation]
+        private void DispatchSpecificException(int interrupt,
+                                               ref ThreadContext context)
+        {
+            // Indicate that we are in an interrupt context.
+            bool wasInInterrupt = inInterruptContext;
+            inInterruptContext = true;
+
+            NumExceptions++;
+            interruptCounts[interrupt]++;
+
+            if (interrupt == EVectors.Nmi && MpExecution.FreezeRequested) {
+                MpExecution.FreezeProcessor(ref context);
+            }
+            else if (interrupt == EVectors.SingleStep) {
+                DebugStub.Trap(ref context, false);
+            }
+            else if (interrupt == EVectors.Breakpoint) {
+                DebugStub.Trap(ref context, false);
+            }
+            else if (interrupt == EVectors.FirstChanceException) {
+                DebugStub.Trap(ref context, true);
+            }
+            else if (interrupt == EVectors.FpuMathFault) {
+                if ((context.mmx.fsw & Fpsw.StackFaultError) != 0) {
+                    if ((context.mmx.fsw & Fpsw.C1) != 0) {
+                        DebugStub.WriteLine("FPU Stack Overflow Exception (FP SW = 0x{0:x4})",
+                                            __arglist(context.mmx.fsw));
+                    }
+                    else {
+                        DebugStub.WriteLine("FPU Stack Underflow Exception (FP SW = 0x{0:x4})",
+                                            __arglist(context.mmx.fsw));
+                    }
+                }
+                else {
+                    DebugStub.WriteLine("FPU Unit exception (FP SW = 0x{0:x4})",
+                                        __arglist(context.mmx.fsw));
+                }
+
+                DebugStub.Trap(ref context, false);
+                context.mmx.fcw |= Fpsw.ErrorClearMask;
+            }
+            else {
+                Tracing.Log(Tracing.Debug,
+                            "No recognized exception handler (0x{0:x2}",
+                            (uint)interrupt);
+                DebugStub.Trap(ref context, false);
+
+                DebugStub.WriteLine("No recognized exception handler (0x{0:x2}",
+                                    __arglist(interrupt));
+                Thread.Display(ref context, "");
+            }
+            inInterruptContext = wasInInterrupt;
+        }
+
+        /// <summary>
+        /// Hardware interrupts are mapped to vectors 0x20..0xff.
+        /// They always use the thread's context record.
+        /// </summary>
+        [AccessedByRuntime("referenced from Processor.cpp")]
+        [NoHeapAllocation]
+        internal static void DispatchInterrupt(int interrupt,
+                                               ref ThreadContext context)
+        {
+            GetCurrentProcessor().DispatchSpecificInterrupt(interrupt, ref context);
+        }
+
+        [NoHeapAllocation]
+        private unsafe void DispatchSpecificInterrupt(int interrupt,
+                                                      ref ThreadContext context)
+        {
+            // Indicate that we are in an interrupt context.
+            Thread target = null;
+            bool wasInInterrupt = inInterruptContext;
+            inInterruptContext = true;
+
+            Kernel.Waypoint(801);
+
+            NumInterrupts++;
+            NumExceptions++;
+            interruptCounts[interrupt]++;
+
+            // Don't generate loads of output for debugger-related interrupts
+#if DEBUG_INTERRUPTS
+            DebugStub.WriteLine("Int{0:x2}", __arglist(interrupt));
+            Thread.DisplayAbbrev(ref context, " int beg");
+            Thread.Display(ref context, " int beg");
+
+            if (!context.IsFirst()) {
+                DebugStub.WriteLine("*-*-*-*-*-* !IsFirst *-*-*-*-*-*");
+                Thread.Display(ref context, " !IsFirst");
+            }
+#endif
+
+#if SAMPLE_PC
+            // Sample PC values
+            ulong pcNow = Processor.CycleCount;
+            uint pcDiff = unchecked((uint)(pcNow - pcSamplesCounterThen));
+            if (pcSamples != null && pcDiff != 0 && nextSampleIdle == false) {
+                int oldPcHead = pcHead;
+
+                // Sample instance number
+                pcSamples[pcHead] = (UIntPtr)unchecked(pcSamplesI++);
+                pcHead = unchecked((pcHead + 1) & sampleMask);
+
+                // Save relative time in ticks
+                pcSamples[pcHead] = pcDiff;
+                pcHead = unchecked((pcHead + 1) & sampleMask);
+
+                pcSamples[pcHead] = (UIntPtr)interrupt;
+                pcHead = unchecked((pcHead + 1) & sampleMask);
+
+                pcSamplesCounterThen = pcNow;
+
+                // Save stack
+                UIntPtr eip = context.eip;
+                UIntPtr ebp = context.ebp;
+                while (true) {
+                    if (eip == 0) { break; }
+                    pcSamples[pcHead] = eip;
+                    pcHead = (pcHead + 1) & sampleMask;
+                    if (ebp == 0) { break; }
+                    eip = Processor.GetFrameEip(ebp);
+                    ebp = Processor.GetFrameEbp(ebp);
+                }
+                pcSamples[pcHead] = 0;
+                pcHead = (pcHead + 1) & sampleMask;
+
+                pcLength += (pcHead + pcMaxSamples - oldPcHead) & sampleMask;
+                if (pcLength > pcMaxSamples)
+                    pcLength = pcMaxSamples;
+
+                // Clear any partially overwritten sample set ahead
+                int i = pcHead;
+                while (pcSamples[i] != 0) {
+                    pcSamples[i] = 0;
+                    pcLength--;
+                    i = (i + 1) & sampleMask;
+                }
+            }
+            nextSampleIdle = false;
+#endif // SAMPLE_PC
+
+
+            if (halted) {
+                clock.CpuResumeFromHaltEvent();
+                halted = false;
+            }
+
+            unchecked {
+                if (interrupt != clockInterrupt) {
+                    // We don't log the clockInterrupt because of all the spew.
+                    Tracing.Log(Tracing.Debug, "Interrupt 0x{0:x}, count={1:x}",
+                               (UIntPtr)(uint)interrupt,
+                                (UIntPtr) interruptCounts[interrupt]
+                               );
+                }
+            }
+
+            Monitoring.Log(Monitoring.Provider.Processor,
+                           (ushort)ProcessorEvent.Interrupt, 0,
+                           (uint)interrupt, 0, 0, 0, 0);
+
+
+            if ((context.efl & EFlags.IF) == 0) {
+                DebugStub.WriteLine("Int{0:x2}", __arglist(interrupt));
+                Thread.DisplayAbbrev(ref context, " int beg");
+                DebugStub.WriteLine("Interrupt 0x{0:x2}  thrown while interrupts disabled.",
+                                    __arglist(interrupt));
+                DebugStub.Break();
+            }
+
+
+            if (interrupt == timerInterrupt) {
+                timer.ClearInterrupt();
+                SchedulerTime now = SchedulerTime.Now;
+                Scheduler.DispatchLock();
+                try {
+                    if (context.thread == IdleThread) {
+#if TRACE_INTERRUPTS
+                        Tracing.Log(Tracing.Audit,
+                                    "Timer interrupt in idle.");
+#endif // TRACE_INTERRUPTS
+                        target = Scheduler.OnTimerInterrupt(null, now);
+                    }
+                    else {
+#if TRACE_INTERRUPTS
+                        Tracing.Log(Tracing.Audit,
+                                    "Timer interrupt in tid={0:x3}.",
+                                    (uint)context.thread.GetThreadId());
+#endif // TRACE_INTERRUPTS
+                        target = Scheduler.OnTimerInterrupt(context.thread, now);
+                    }
+                    Scheduler.SelectingThread(target);
+#if DEBUG_DISPATCH_TIMER
+                    DebugStub.WriteLine("OnTime.Selecting");
+#endif // DEBUG_DISPATCH_TIMER
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            else if (interrupt == clockInterrupt) {
+                clock.ClearInterrupt();
+
+#if DEBUG
+                // Check for a debug break.
+                if (DebugStub.PollForBreak()) {
+                    DebugStub.WriteLine("Debugger ctrl-break after interrupt 0x{0:x2}",
+                                        __arglist(interrupt));
+                    MpExecution.FreezeAllProcessors();
+                    DebugStub.Break(); // used to be: Trap(ref context, false);
+                    MpExecution.ThawAllProcessors();
+                }
+#endif
+            }
+            else if (interrupt == EVectors.PingPongInt) {
+                HalDevices.ClearFixedIPI();
+
+                inInterruptContext = false;
+
+                int task = MpExecution.GetIntrPingPong(this.Id);
+                DebugStub.WriteLine
+                    ("HSG: ***** cpu.{0} gets  {1}", __arglist(this.Id, task));
+
+                RunPingPongInt(task-1); // send again
+                inInterruptContext = true;
+            }
+            else if (interrupt == EVectors.ApImage) {
+                HalDevices.ClearFixedIPI();
+                inInterruptContext = false;
+                MpExecution.ApImage apImage;
+                bool okay = MpExecution.GetIntrApImage(this.Id, out apImage);
+                if (!okay) {
+                    DebugStub.WriteLine("ERROR: ApImage queue is empty");
+                    DebugStub.Break();
+                }
+
+                inInterruptContext = true;
+
+                DebugStub.WriteLine ("HSG: ** cpu.{0} gets e.{1:x}",
+                                     __arglist(this.Id,
+                                               apImage.entryPoint));
+
+                Processor.MpCallEntryPoint(apImage.entryPoint);
+            }
+            else if (interrupt == EVectors.AbiCall) {
+                HalDevices.ClearFixedIPI();
+#if GENERATE_ABI_SHIM
+                // haryadi: tells AP service thread to process
+                // this abi call later
+                ApServiceThread.abiEvent.Set();
+#endif
+            }
+            else if (interrupt == EVectors.HaltApProcessors) {
+                Processor p = Processor.CurrentProcessor;
+                if (p.Id != 0) {
+                    if (context.thread != IdleThread) {
+                        Scheduler.DispatchLock();
+                        try {
+                            Scheduler.OnProcessorShutdown(context.thread);
+                        }
+                        finally {
+                            Scheduler.DispatchRelease();
+                        }
+                    }
+                    p.Uninitialize(p.Id);
+                }
+            }
+            else if (!HalDevices.InternalInterrupt((byte)interrupt)) {
+                IoIrq.SignalInterrupt(pic.InterruptToIrq((byte)interrupt));
+                pic.ClearInterrupt((byte)interrupt);
+
+                Scheduler.DispatchLock();
+                try {
+                    if (context.thread == IdleThread) {
+#if  TRACE_INTERRUPTS
+                        Tracing.Log(Tracing.Audit,
+                                    "I/O interrupt in idle.");
+#endif // TRACE_INTERRUPTS
+                        target = Scheduler.OnIoInterrupt(null);
+                    }
+                    else {
+#if  TRACE_INTERRUPTS
+                        Tracing.Log(Tracing.Audit,
+                                    "I/O interrupt in tid={0:x3}.",
+                                    (uint)context.thread.GetThreadId());
+#endif // TRACE_INTERRUPTS
+                        target = Scheduler.OnIoInterrupt(context.thread);
+                    }
+#if DEBUG_DISPATCH_IO
+                    DebugStub.WriteLine("++DispatchInterruptEvent Irq={0:x2}, Thread={1:x8}",
+                                        __arglist(pic.InterruptToIrq((byte)interrupt),
+                                                  Kernel.AddressOf(target)));
+#endif // DEBUG_DISPATCH_IO
+                    Scheduler.SelectingThread(target);
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+
+#if DEBUG_INTERRUPTS
+            DebugStub.WriteLine("Int{0:x2}", __arglist(interrupt));
+            Thread.DisplayAbbrev(ref context, " int fin");
+            if (!InterruptsDisabled()) {
+                DebugStub.WriteLine("        interrupts enabled!!!!!!!");
+                Thread.Display(ref context, " !IsFirst");
+                DebugStub.Break();
+            }
+#if DEBUG_DEEPER
+            DebugStub.WriteLine("Int{0:x2}", __arglist(interrupt));
+            Thread.DisplayAbbrev(ref context, " int end");
+#endif
+#endif
+
+            // if (context.lastExecutionTimeUpdate !=
+            //     context.thread.context.lastExecutionTimeUpdate) {
+            //     DebugStub.WriteLine("context != context.thread.context: {0}, {1}, ",
+            //     __arglist(context.lastExecutionTimeUpdate,
+            //     context.thread.context.lastExecutionTimeUpdate));
+            // }
+
+#if THREAD_TIME_ACCOUNTING
+            ulong now_a = Processor.CycleCount;
+            context.executionTime += now_a -
+                context.lastExecutionTimeUpdate;
+#endif
+
+            if (target != null) {
+#if THREAD_TIME_ACCOUNTING
+                target.context.lastExecutionTimeUpdate = now_a;
+#endif
+                Monitoring.Log(Monitoring.Provider.Processor,
+                               (ushort)ProcessorEvent.Resume, 0,
+                               (uint)target.context.threadIndex, 0, 0, 0, 0);
+                // Return to the thread selected by the scheduler if any.
+                SetCurrentThreadContext(ref target.context);
+            }
+            else {
+#if THREAD_TIME_ACCOUNTING
+                context.lastExecutionTimeUpdate = now_a;
+#endif
+                Monitoring.Log(Monitoring.Provider.Processor,
+                               (ushort)ProcessorEvent.Resume, 0,
+                               (uint)context.threadIndex, 0, 0, 0, 0);
+                SetCurrentThreadContext(ref context);
+            }
+
+            inInterruptContext = wasInInterrupt;
+        }
+
+        //Simulator Use
+        //Sets the nextTimerInterrupt
+        [NoHeapAllocation]
+        public bool SetNextTimerInterrupt(TimeSpan delta)
+        {
+            long span = delta.Ticks;
+            if (span > timer.MaxInterruptInterval) {
+                span = timer.MaxInterruptInterval;
+            }
+            else if (span < timer.MinInterruptInterval) {
+                span = timer.MinInterruptInterval;
+            }
+
+            bool success = timer.SetNextInterrupt(span);
+            DebugStub.Assert(success);
+            return success;
+        }
+
+        [NoHeapAllocation]
+        public bool SetNextTimerInterrupt(SchedulerTime until)
+        {
+            return SetNextTimerInterrupt(until - SchedulerTime.Now);
+        }
+
+        [NoHeapAllocation]
+        internal static unsafe void UpdateAfterGC(Thread currentThread)
+        {
+            // Update the processor pointers in processor contexts
+            for (int i = 0; i < Processor.processorTable.Length; i++) {
+                Processor p = Processor.processorTable[i];
+                if (p != null) {
+                    p.context->UpdateAfterGC(p);
+                }
+            }
+            // Ensure that Thread.CurrentThread returns new thread object
+            SetCurrentThreadContext(ref currentThread.context);
+        }
+
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        // These methods are public and safe to use from any where provided
+        // there's at least 2 call frame on the stack.
+        //
+        [NoHeapAllocation]
+        public static UIntPtr GetCallerEip()
+        {
+            UIntPtr currentFrame = GetFramePointer();
+            UIntPtr callerFrame = GetFrameEbp(currentFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return UIntPtr.Zero;
+            }
+            UIntPtr callersCaller = GetFrameEip(callerFrame);
+            return callersCaller;
+        }
+
+        /// <summary>
+        /// Provides a mini stack trace starting from the caller of the caller
+        /// of this method.
+        /// </summary>
+        [NoHeapAllocation]
+        public static void GetStackEips(out UIntPtr pc1, out UIntPtr pc2, out UIntPtr pc3)
+        {
+            pc1 = UIntPtr.Zero;
+            pc2 = UIntPtr.Zero;
+            pc3 = UIntPtr.Zero;
+
+            UIntPtr currentFrame = GetFramePointer();
+            UIntPtr callerFrame = GetFrameEbp(currentFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return;
+            }
+            pc1 = GetFrameEip(callerFrame);
+            callerFrame = GetFrameEbp(callerFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return;
+            }
+            pc2 = GetFrameEip(callerFrame);
+            callerFrame = GetFrameEbp(callerFrame);
+            if (callerFrame == UIntPtr.Zero) {
+                return;
+            }
+            pc3 = GetFrameEip(callerFrame);
+        }
+
+        /// <summary>
+        /// Provides the full stack trace starting from the caller of the caller
+        /// of this method.
+        /// </summary>
+        /// <returns>Eip values in stack array from top to bottom</returns>
+        [NoHeapAllocation]
+        public static void GetStackEips(UIntPtr[] stack)
+        {
+            if (stack == null) {
+                return;
+            }
+            UIntPtr currentFrame = GetFramePointer();
+            UIntPtr callerFrame = GetFrameEbp(currentFrame);
+            for (int index = 0; callerFrame != UIntPtr.Zero && index < stack.Length; index++) {
+                stack[index] = GetFrameEip(callerFrame);
+                callerFrame = GetFrameEbp(callerFrame);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        //
+        // These (native) methods manipulate the local processor's paging
+        // hardware. They can be used even before Processor.Initialize()
+        // has been called.
+        //
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        private static extern void PrivateEnablePaging(uint pdpt);
+
+        internal static void EnablePaging(AddressSpace bootstrapSpace)
+        {
+            PrivateEnablePaging((uint)bootstrapSpace.PdptPage.Value);
+        }
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        private static extern void PrivateChangeAddressSpace(uint pdpt);
+
+        internal static void ChangeAddressSpace(AddressSpace space)
+        {
+            PrivateChangeAddressSpace((uint)space.PdptPage.Value);
+        }
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        internal static extern void DisablePaging();
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        private static extern void PrivateInvalidateTLBEntry(UIntPtr pageAddr);
+
+        internal static void InvalidateTLBEntry(UIntPtr pageAddr)
+        {
+            DebugStub.Assert(MemoryManager.IsPageAligned(pageAddr));
+            PrivateInvalidateTLBEntry(pageAddr);
+        }
+
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(16)]
+        [NoHeapAllocation]
+        private static extern uint GetCr3();
+
+        // haryadi
+        [AccessedByRuntime("output to header : defined in Processor.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(64)]
+        [NoHeapAllocation]
+        public static extern void MpCallEntryPoint(UIntPtr entry);
+
+        internal static AddressSpace GetCurrentAddressSpace()
+        {
+            return new AddressSpace(new PhysicalAddress(GetCr3()));
+        }
+
+        //
+        public static IHalMemory.ProcessorAffinity[] GetProcessorAffinity()
+        {
+            IHalMemory.ProcessorAffinity[] processors =
+                halMemory.GetProcessorAffinity();
+            return processors;
+        }
+
+        public static IHalMemory.MemoryAffinity[] GetMemoryAffinity()
+        {
+            IHalMemory.MemoryAffinity[] memories =
+                halMemory.GetMemoryAffinity();
+            return memories;
+        }
+
+        /// <summary> Start application processors. </summary>
+        [System.Diagnostics.Conditional("SINGULARITY_MP")]
+        public static void StartApProcessors()
+        {
+            // At this point only the BSP is running.
+
+            Tracing.Log(Tracing.Debug, "Processor.StartApProcessors()");
+            HalDevices.StartApProcessors();
+
+            // At this point the BSP and APs are running.
+        }
+
+        /// <summary> Stop application processors. </summary>
+        [NoHeapAllocation]
+        [System.Diagnostics.Conditional("SINGULARITY_MP")]
+        public static void StopApProcessors()
+        {
+            // At this point the BSP and APs are running.
+
+            Tracing.Log(Tracing.Debug, "Processor.StopApProcessors()");
+            HalDevices.BroadcastFixedIPI((byte)EVectors.HaltApProcessors,
+                                         true);
+
+            while (GetRunningProcessorCount() != 1) {
+                /* Thread.Sleep(100); Thread.Sleep needs NoHeapAllocation annotation */
+                Thread.Yield();
+            }
+
+            DebugStub.RevertToUniprocessor();
+
+            // At this point only the BSP is running.
+        }
+
+        /// <summary> Gets the number of processors in use by
+        /// the system. </summary>
+        [NoHeapAllocation]
+        public static int GetRunningProcessorCount()
+        {
+            return runningCpus;
+        }
+
+        /// <summary> Gets the total number of processors known
+        /// to the system.  This includes processors not
+        /// currently in use by the system. </summary>
+        [NoHeapAllocation]
+        public static int GetProcessorCount()
+        {
+            return HalDevices.GetProcessorCount();
+        }
+
+        public static int GetDomainCount()
+        {
+            IHalMemory.ProcessorAffinity[] processors =
+                halMemory.GetProcessorAffinity();
+            uint domain = 0;
+            for (int i = 0; i < processors.Length; i++) {
+                if (processors[i].domain > domain) {
+                    domain = processors[i].domain;
+                }
+            }
+            domain++; // domain number starts from 0
+            return (int)domain;
+        }
+
+        public static bool HasAffinityInfo()
+        {
+            IHalMemory.ProcessorAffinity[] processors =
+                halMemory.GetProcessorAffinity();
+            IHalMemory.MemoryAffinity[] memories =
+                halMemory.GetMemoryAffinity();
+            if (processors == null || memories == null) {
+                return false;
+            }
+            return true;
+        }
+
+        // haryadi -- return cpuId if context is not null
+        [NoHeapAllocation]
+        public unsafe int ValidProcessorId(int i)
+        {
+            if (context != null) {
+                return context->cpuId;
+            }
+            else {
+                return -1;
+            }
+        }
+
+        // haryadi -- determine next ping pong receiver
+        //            i.e. find next processor, if this is
+        //            the last processors, wrap to p0
+
+        [NoHeapAllocation]
+        private static int GetPingPongReceiver()
+        {
+            int from = GetCurrentProcessorId();
+            int to;
+
+            // check if processor table is valid
+            if (processorTable == null || processorTable.Length == 1) {
+                DebugStub.WriteLine
+                    ("HSG: Processors.cs, procTable null/uniproc  ...");
+                return -1;
+            }
+
+            // set up neighbor
+            to = (from + 1) % processorTable.Length;
+
+            // check if processor is valid
+            if (processorTable[to].ValidProcessorId(to) >= 0) {
+                to = processorTable[to].ValidProcessorId(to);
+            }
+            // this is the last processors, wrap to p0
+            else {
+                // DebugStub.WriteLine
+                // ("HSG: Processors.cs, cpu.{0} is the last processor",
+                // __arglist(from));
+                to = 0;
+                to = processorTable[to].ValidProcessorId(to);
+                if (to == from) {
+                    DebugStub.WriteLine
+                        ("HSG: Processor.cs, only 1 valid processor (error)");
+                    return -1;
+                }
+            }
+            return to;
+        }
+
+        // haryadi -- start ping pong
+        [NoHeapAllocation]
+        public static int RunPingPongInt(int start)
+        {
+            // Done ping pong
+            if (start == 0) {
+                return -1;
+            }
+
+            int from = GetCurrentProcessorId();
+            int to   = GetPingPongReceiver();
+
+            // invalid to (or no destination processor)
+            if (to < 0) {
+                return -1;
+            }
+
+            // from and to are ready now
+            DebugStub.WriteLine
+                ("HSG: ***** cpu.{0} sends {1} to p{2}",
+                 __arglist(from, start, to));
+
+            // disable interrupt
+            bool iflag = Processor.DisableInterrupts();
+
+            // put integer "to" to neighbor interrupt task queue
+            MpExecution.PutIntrPingPong(to, start);
+
+            // send ping pong
+            MpExecution.StartPingPongInt(from, to, (byte)EVectors.PingPongInt);
+
+            // enable interrupt
+            Processor.RestoreInterrupts(iflag);
+
+            // DebugStub.WriteLine
+            // ("HSG: Processors.cs, cpu.{0} sent to p{1} (pc:{2}) ",
+            // __arglist(from, to, start));
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/ProtectionDomain.cs b/base/Kernel/Singularity/ProtectionDomain.cs
new file mode 100644
index 0000000..c29c19f
--- /dev/null
+++ b/base/Kernel/Singularity/ProtectionDomain.cs
@@ -0,0 +1,346 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProtectionDomain.cs
+//
+//  Note:
+//
+
+#if PAGING
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity
+{
+
+    //
+    // A protection domain consists of an address space, a communication
+    // heap, and a general-purpose memory range. A protection domain
+    // can host multiple processes.
+    //
+    [CLSCompliant(false)]
+    public class ProtectionDomain
+    {
+        /////////////////////////////////////
+        // STATIC DATA
+        /////////////////////////////////////
+
+        // Table of protection domains
+        private const uint maxPDs = 1024;
+        private static ProtectionDomain[] PdTable;
+        private static SmartSpinlock tableLock;
+        private static uint PdIndexGenerator;
+
+        /////////////////////////////////////
+        // INSTANCE DATA
+        /////////////////////////////////////
+
+        // -------------- Valid before InitHook()
+        private AddressSpace space;
+        private int refCount;
+        private uint id;
+        private readonly bool kernelMode;
+        private readonly string name;
+
+        // Used to protect the user-range page mapping
+        // descriptors.
+        private readonly SmartSpinlock userMappingLock;
+
+        // -------------- Valid after InitHook()
+        private VirtualMemoryRange userRange;
+        private SharedHeap userSharedHeap;
+
+        // These are always null for a kernel domain
+        private PEImage ring3AbiImage;
+        private ExportTable ring3AbiExports;
+
+        // Used for initialization
+        private bool initialized;
+        private SmartSpinlock initSpin;
+
+        /////////////////////////////////////
+        // PUBLIC STATIC METHODS
+        /////////////////////////////////////
+
+        internal static void Initialize()
+        {
+            tableLock = new SmartSpinlock();
+            PdTable = new ProtectionDomain[maxPDs];
+            PdIndexGenerator = 1;
+
+            // Create the default protection domain
+            AddressSpace defaultSpace = VMManager.GetBootstrapSpace();
+            PdTable[0] = new ProtectionDomain(defaultSpace, "Default", true);
+        }
+
+        internal static ProtectionDomain FindOrCreateByName(string name,
+                                                            bool kernelMode)
+        {
+            bool iflag = tableLock.Lock();
+
+            try {
+                for(uint i = 0; i < PdTable.Length; i++) {
+                    if ((PdTable[i] != null) &&
+                        (PdTable[i].name == name)) {
+                        // found it
+                        return PdTable[i];
+                    }
+                }
+
+                return CreateProtectionDomain(name, kernelMode);
+            }
+            finally {
+                tableLock.Unlock(iflag);
+            }
+        }
+
+        internal static ProtectionDomain DefaultDomain
+        {
+            get {
+                DebugStub.Assert(PdTable[0] != null);
+                return PdTable[0];
+            }
+        }
+
+        internal static ProtectionDomain CurrentDomain
+        {
+            get {
+                return Thread.CurrentThread.CurrentDomain;
+            }
+        }
+
+        /////////////////////////////////////
+        // PUBLIC INSTANCE METHODS
+        /////////////////////////////////////
+
+        internal void AddRef()
+        {
+            Interlocked.Increment(ref refCount);
+        }
+
+        internal int Release()
+        {
+            int decreased = Interlocked.Decrement(ref refCount);
+            DebugStub.Assert(decreased > 0);
+            return decreased;
+        }
+
+        internal AddressSpace AddressSpace {
+            get {
+                return space;
+            }
+        }
+
+        internal SmartSpinlock UserMappingLock {
+            get {
+                return userMappingLock;
+            }
+        }
+
+        internal bool KernelMode {
+            get {
+                return kernelMode;
+            }
+        }
+
+        internal ExportTable ABIStubs {
+            get {
+                return ring3AbiExports;
+            }
+        }
+
+        //
+        // Someone must arrange to call this from *within* the
+        // Protection Domain for us to have an opportunity to finish
+        // initializing.
+        //
+        internal unsafe void InitHook()
+        {
+            DebugStub.Assert(AddressSpace.CurrentAddressSpace == this.AddressSpace);
+
+            if (this.initialized) {
+                // Someone else has already set up the space
+                return;
+            }
+
+            bool iflag = initSpin.Lock();
+
+            try {
+                if (this.initialized) {
+                    // Someone else snuck in and initialized
+                    return;
+                }
+
+                //
+                // We're first into this space, so set it up.
+                //
+                DebugStub.WriteLine("Setting up protection domain \"{0}\"",
+                                    __arglist(this.name));
+
+                userRange = new VirtualMemoryRange(VMManager.UserHeapBase,
+                                                   VMManager.UserHeapLimit,
+                                                   this);
+
+                if (kernelMode) {
+                    // This will be a ring-0, trusted domain, so just
+                    // point the userSharedHeap at the kernel's comm heap.
+                    userSharedHeap = SharedHeap.KernelSharedHeap;
+
+                    this.initialized = true;
+                } else {
+                    // Create a new shared heap that lives in
+                    // user-land.
+                    userSharedHeap = new SharedHeap(this, userRange);
+                    DebugStub.WriteLine("  ...Created a shared heap");
+
+                    //
+                    // N.B. this is kind of tricky. Loading an
+                    // executable image involves allocating memory,
+                    // which goes through this object. So, before
+                    // attempting the load, mark ourselves as initialized.
+                    //
+                    // ---- DON'T PUT GENUINE INITIALIZATION
+                    //      CODE BELOW HERE! ---------
+                    this.initialized = true;
+
+                    // Load our own, protection-domain-private copy of the
+                    // ABI stubs. These will get shared by all apps in
+                    // this domain.
+                    IoMemory syscallsMemory = Binder.LoadRawImage("/init", "syscalls.dll");
+                    IoMemory loadedMemory;
+
+                    // Load the stubs library into the user range, but make
+                    // the kernel process the logical owner. This seems like
+                    // the only sensible approach since the stubs do not
+                    // belong to any particular process but must be in the
+                    // user range of memory. -- maiken
+
+                    // N.B.: RE-ENTERS this object!
+                    ring3AbiImage = PEImage.Load(Process.kernelProcess, syscallsMemory,
+                                                 out loadedMemory,
+                                                 false, // isForMp
+                                                 false // inKernelSpace
+                                                 );
+
+                    ring3AbiExports = ring3AbiImage.GetExportTable(loadedMemory);
+                    DebugStub.WriteLine("  ...Loaded ring-3 ABI stubs");
+                }
+
+            } finally {
+                DebugStub.Assert(this.initialized);
+                initSpin.Unlock(iflag);
+            }
+        }
+
+        internal string Name {
+            get {
+                return this.name;
+            }
+        }
+
+        //
+        // Accessors below are only usable after InitHook()
+        //
+        internal VirtualMemoryRange UserRange {
+            get {
+                DebugStub.Assert(initialized);
+                return userRange;
+            }
+        }
+
+
+        internal SharedHeap UserSharedHeap {
+            [Inline]
+            get {
+                DebugStub.Assert(initialized);
+                return userSharedHeap;
+            }
+        }
+
+        internal SharedHeap.AllocationOwnerId DataOwnerId
+        {
+            get {
+                DebugStub.Assert(initialized);
+                return UserSharedHeap.DataOwnerId;
+            }
+        }
+
+        internal SharedHeap.AllocationOwnerId EndpointOwnerId
+        {
+            get {
+                DebugStub.Assert(initialized);
+                return UserSharedHeap.EndpointOwnerId;
+            }
+        }
+
+        internal SharedHeap.AllocationOwnerId EndpointPeerOwnerId
+        {
+            get {
+                DebugStub.Assert(initialized);
+                return UserSharedHeap.EndpointPeerOwnerId;
+            }
+        }
+
+        /////////////////////////////////////
+        // PRIVATE METHODS
+        /////////////////////////////////////
+
+        private static ProtectionDomain CreateProtectionDomain(
+            string name, bool isKernelDomain)
+        {
+            ProtectionDomain dp = new ProtectionDomain(name, isKernelDomain);
+            dp.id = AssignNewPDSlot(dp);
+            return dp;
+        }
+
+        private ProtectionDomain(string name, bool isKernelDomain)
+            : this(VMManager.CreateNewAddressSpace(), name, isKernelDomain)
+        {
+        }
+
+        private ProtectionDomain(AddressSpace space, string name, bool isKernelDomain)
+        {
+            this.space = space;
+            this.name = name;
+            this.kernelMode = isKernelDomain;
+            this.initSpin = new SmartSpinlock();
+            this.userMappingLock = new SmartSpinlock();
+            this.refCount = 1; // represents the table entry
+            DebugStub.WriteLine("Created protection domain \"{0}\"", __arglist(name));
+        }
+
+        private static uint AssignNewPDSlot(ProtectionDomain pd)
+        {
+            bool iflag = tableLock.Lock();
+
+            try {
+                for(uint i = 0; i < PdTable.Length; i++) {
+                    uint index = (uint)((PdIndexGenerator + i) % PdTable.Length);
+
+                    if (PdTable[index] == null) {
+                        PdTable[index] = pd;
+                        PdIndexGenerator = (uint)((index + 1) % PdTable.Length);
+                        return index;
+                    }
+                }
+            }
+            finally {
+                tableLock.Unlock(iflag);
+            }
+
+            DebugStub.Assert(false, "Out of process domain slots!");
+            return uint.MaxValue;
+        }
+    }
+}
+
+#endif
diff --git a/base/Kernel/Singularity/Scheduling/Full/Activity.cs b/base/Kernel/Singularity/Scheduling/Full/Activity.cs
new file mode 100644
index 0000000..4f2f334
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/Activity.cs
@@ -0,0 +1,80 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Activity.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// This class is the base of the resource class.  To reduce code management cost
+    /// between the simulator and kernel, both kernel and simulator resource container
+    /// classes derive from this base class, which contains most of the functionality.
+    /// </summary>
+    public class Activity
+    {
+        Task defaultTask;
+        //IResourceReservation[] reservations;
+        Hashtable reservations;
+        internal ISchedulerActivity schedulerActivity;
+
+        public  Activity()
+        {
+            defaultTask = new Task(null, null, DateTime.MaxValue, true, null, null, this); //The default task
+            reservations = new Hashtable();
+            schedulerActivity = CpuResource.CreateSchedulerActivity();
+            schedulerActivity.EnclosingActivity = this;
+        }
+
+        /// <summary>
+        /// Return the default task object for this Activity.
+        /// Any code not inside an explicit task is working on behalf of the default "Task".
+        /// Would you not prefer this be a property?
+        /// </summary>
+        public Task DefaultTask()
+        {
+            return defaultTask;
+        }
+
+        /// <summary>
+        /// Returns the ongoing resource reservations for this resource container.
+        /// </summary>
+        public ICollection Reservations()
+        {
+            return reservations.Values;
+        }
+
+        internal IResourceReservation GetResourceReservation(string resourceString)
+        {
+            return (IResourceReservation)reservations[resourceString];
+        }
+
+        internal void SetResourceReservation(string resourceString, IResourceReservation reservation)
+        {
+            if (reservation == null) {
+                reservations.Remove(resourceString);
+            }
+            else {
+                reservations[resourceString] = reservation;
+            }
+        }
+
+        /// <summary>
+        /// This only need be called by the thread which creates the resource container,
+        /// and should do so once the reference won't be used outside the resource
+        /// container (i.e. to add threads to it).
+        /// </summary>
+        public void ReleaseReference()
+        {
+            schedulerActivity.ReleaseReference();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/CpuResource.cs b/base/Kernel/Singularity/Scheduling/Full/CpuResource.cs
new file mode 100644
index 0000000..51c9b04
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/CpuResource.cs
@@ -0,0 +1,215 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\Scheduling\CpuResource.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+#if SIMULATOR
+using Thread = Microsoft.Singularity.Scheduling.Thread;
+using Processor = Microsoft.Singularity.Scheduling.Processor;
+#endif
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// The CPU resource provider object.
+    /// </summary>
+    [CLSCompliant(false)]
+    public class CpuResource : IResource
+    {
+        /// <summary>
+        /// Return a reference to the CPU resource provider object.
+        /// </summary>
+        static public CpuResource Provider()
+        {
+            return cpuResourceProvider;
+        }
+
+        public override string ResourceString
+        {
+            get { return "Microsoft.Singularity.Scheduling.CpuResource"; }
+        }
+
+        /// <summary>
+        /// Constructor for the static CPU Resource Provider object
+        /// </summary>
+        private CpuResource()
+        {
+        }
+
+        /// <summary>
+        /// The static CPU Resource Provider object
+        /// </summary>
+        private static CpuResource cpuResourceProvider = new CpuResource();
+
+        //Establishes the system scheduler -- should be called by system initialization, and should
+        //throw an error when called a 2nd time.
+        public static void RegisterSystemScheduler(ICpuScheduler scheduler)
+        {
+            if(cpuResourceScheduler == null) {
+                cpuResourceScheduler = scheduler;
+            }
+            else {
+                //TODO: Throw Exception Perhaps!
+            }
+        }
+
+        /// <summary>
+        /// This is the actual system CPU scheduler.  It is used for CPU reservations,
+        /// constraints, to interact with the timer, and to allow the CPU scheduler
+        /// to be swapped out while maintaining a consistent interface.
+        /// </summary>
+        private static ICpuScheduler cpuResourceScheduler;
+
+        public static ISchedulerActivity CreateSchedulerActivity()
+        {
+            return cpuResourceScheduler.CreateSchedulerActivity();
+        }
+
+        public static ISchedulerThread CreateSchedulerThread(Thread thread)
+        {
+            return cpuResourceScheduler.CreateSchedulerThread(thread);
+        }
+
+        public static ISchedulerProcessor CreateSchedulerProcessor(Processor processor)
+        {
+            return cpuResourceScheduler.CreateSchedulerProcessor(processor);
+        }
+
+        public static readonly TimeSpan MaxPeriod = new TimeSpan(1 * TimeSpan.TicksPerSecond);
+
+        /// <summary>
+        /// Return amount of CPU available for reservation for the specified Activity and period
+        /// </summary>
+        public CpuResourceAmount AvailableCpu(Activity activity, TimeSpan period)
+        {
+            // XXX TBD
+            return new CpuResourceAmount((cyclesPerSecond * period.Ticks)
+                                         / TimeSpan.TicksPerSecond);
+        }
+
+        /// <summary>
+        /// Reserve CPU on an ongoing basis for a resource container.
+        /// Replaces any existing reservation for that resource container.
+        /// Specify 0 cycles to end the CPU reservation for the resource container.
+        /// Returns null if reservation is denied.  XXX Should this throw an exception instead?
+        /// </summary>
+        public CpuResourceReservation ReserveCpu(Activity activity,
+            CpuResourceAmount amount, TimeSpan period)
+        {
+            object tempOldReservation = activity.GetResourceReservation(CpuResource.Provider().ResourceString);
+            Debug.Assert(tempOldReservation == null ||
+                         tempOldReservation is CpuResourceReservation);
+            CpuResourceReservation oldReservation = (CpuResourceReservation)tempOldReservation;
+
+            ISchedulerCpuReservation schedulerReservation =
+                cpuResourceScheduler.ReserveCpu(activity.schedulerActivity, amount, period);
+
+            CpuResourceReservation reservation = null;
+            if(schedulerReservation != null) {
+                reservation = new CpuResourceReservation(amount, period, schedulerReservation);
+                schedulerReservation.EnclosingCpuReservation = reservation;
+            }
+
+            activity.SetResourceReservation(CpuResource.Provider().ResourceString, reservation);
+            return reservation;
+        }
+
+        /// <summary>
+        /// Convert a CPU amount to the minimum amount of time required for that amount.
+        /// This conversion assumes that the CPU is running at its maximum rate.
+        /// </summary>
+        public CpuResourceAmount TimeToCpu(TimeSpan time)
+        {
+            return new CpuResourceAmount((cyclesPerSecond * time.Ticks)
+                                         / TimeSpan.TicksPerSecond);
+        }
+
+        /// <summary>
+        /// Convert a timespan to the maximum amount of CPU that can be used in that timespan.
+        /// This conversion assumes that the CPU is running at its maximum rate.
+        /// </summary>
+        public TimeSpan CpuToTime(CpuResourceAmount amount)
+        {
+            if(amount == null) {
+                return new TimeSpan(0);
+            }
+            return new TimeSpan((TimeSpan.TicksPerSecond * amount.Cycles)
+                                / cyclesPerSecond);
+        }
+
+        private long cyclesPerSecond;
+
+        volatile static int do_something = 0;
+        static void Spinner()
+        {
+            do_something++;
+        }
+
+        public bool NextThread(out Thread nextThread)
+        {
+            return cpuResourceScheduler.NextThread(out nextThread);
+        }
+
+        public bool ShouldReschedule()
+        {
+            return cpuResourceScheduler.ShouldReschedule();
+        }
+
+        //XXX: One resource world only.
+        /// <summary>
+        /// Note that as tasks now contain resource accounting, there is
+        /// no need to pass out the resource usage from the scheduler.
+        /// For consistency we'll still pass it out of the Task API at least
+        /// until instantaneous usage is fixed.
+        /// </summary>
+        /// <param name="?"></param>
+        /// <param name="?"></param>
+        /// <param name="?"></param>
+        /// <param name="?"></param>
+        /// <returns>Returns true if admitted.</returns>
+        internal bool BeginConstraint(Hashtable resourceEstimates,
+                                      DateTime deadline,
+                                      Task taskToEnd,
+                                      out ISchedulerTask schedulerTask)
+        {
+            return cpuResourceScheduler.BeginConstraint(resourceEstimates,
+                                                        deadline, ((taskToEnd==null)?null:taskToEnd.schedulerTask), out schedulerTask);
+        }
+
+        internal void BeginDelayedConstraint(Hashtable resourceEstimates, TimeSpan relativeDeadline, Task taskToEnd, out ISchedulerTask schedulerTask)
+        {
+            cpuResourceScheduler.BeginDelayedConstraint(resourceEstimates, relativeDeadline, ((taskToEnd==null)?null:taskToEnd.schedulerTask), out schedulerTask);
+        }
+
+        internal Hashtable EndConstraint(Task taskToEnd)
+        {
+            cpuResourceScheduler.EndConstraint(((taskToEnd==null)?null:taskToEnd.schedulerTask));
+            return taskToEnd.resourcesUsed;
+        }
+
+        public void Initialize()
+        {
+            Debug.Assert(cpuResourceScheduler != null, "No registered scheduler!");
+            cyclesPerSecond = (long)Processor.CyclesPerSecond;
+
+            Debug.Assert(Processor.processorTable != null, "Processor table is null!");
+            for (int i = 0; i < Processor.processorTable.Length; i++) {
+                Debug.Assert(Processor.processorTable[i] != null, "Processor is null!");
+                Processor.processorTable[i].InitializeSchedulerProcessor();
+            }
+
+            cpuResourceScheduler.Initialize();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/CpuResourceAmount.cs b/base/Kernel/Singularity/Scheduling/Full/CpuResourceAmount.cs
new file mode 100644
index 0000000..2e303d6
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/CpuResourceAmount.cs
@@ -0,0 +1,58 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\Scheduling\CpuResourceAmount.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// The quantity by which amounts of CPU time are measured: cycles.
+    /// </summary>
+    public class CpuResourceAmount : IResourceAmount
+    {
+        /// <summary>
+        /// Return a reference to the CpuResource provider
+        /// </summary>
+        public override IResource Resource
+        {
+            get { return CpuResource.Provider(); }
+        }
+
+        /// <summary>
+        /// Create a CpuResourceAmount with the specified number of cycles
+        /// </summary>
+        /// <param name="cycles"></param>
+        public CpuResourceAmount(long cycles)
+        {
+            this.cycles = cycles;
+        }
+
+        /// <summary>
+        /// Return the number of cycles in the CpuResourceAmount.
+        /// </summary>
+        public long Cycles
+        {
+            get { return cycles; }
+            set { cycles = value; }
+        }
+
+        // The actual number of cycles represented in the amount are stored in this private variable.
+        private long cycles;
+
+        public override IResourceAmount AddTo(IResourceAmount amount)
+        {
+            Debug.Assert(amount is CpuResourceAmount);
+            cycles += ((CpuResourceAmount)amount).Cycles;
+            return this;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/CpuResourceReservation.cs b/base/Kernel/Singularity/Scheduling/Full/CpuResourceReservation.cs
new file mode 100644
index 0000000..801329b
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/CpuResourceReservation.cs
@@ -0,0 +1,83 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\Scheduling\CpuResourceReservation.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// An ongoing CPU resource reservation object.
+    /// </summary>
+    public class CpuResourceReservation : IResourceReservation
+    {
+        public ISchedulerCpuReservation schedulerReservation;
+
+        /// <summary>
+        /// Return a reference to the CpuResource provider
+        /// </summary>
+        public override IResource Resource
+        {
+            get { return CpuResource.Provider(); }
+        }
+
+        private CpuResourceAmount requestedAmount;
+        private TimeSpan requestedPeriod;
+
+        public CpuResourceReservation(CpuResourceAmount requestedAmount,
+                                      TimeSpan requestedPeriod,
+                                      ISchedulerCpuReservation schedulerReservation)
+        {
+            this.requestedAmount = requestedAmount;
+            this.requestedPeriod = requestedPeriod;
+            this.schedulerReservation = schedulerReservation;
+        }
+
+        /// <summary>
+        /// The amount requested for an ongoing CPU reservation
+        /// </summary>
+        public CpuResourceAmount RequestedAmount
+        {
+            get { return requestedAmount; }
+        }
+
+        /// <summary>
+        /// The period requested for an ongoing CPU reservation
+        /// </summary>
+        public TimeSpan RequestedPeriod
+        {
+            get { return requestedPeriod; }
+        }
+
+        /// <summary>
+        /// The amount actually granted for an ongoing CPU reservation
+        /// </summary>
+        public CpuResourceAmount ActualAmount
+        {
+            get {
+                return (schedulerReservation == null)
+                    ? null : schedulerReservation.ReservedAmount;
+                // XXX TBD May change as global schedule changes
+            }
+        }
+
+        /// <summary>
+        /// The period actually granted for an ongoing CPU reservation
+        /// </summary>
+        public TimeSpan ActualPeriod
+        {
+            get {
+                return (schedulerReservation == null)
+                    ? new TimeSpan(0) : schedulerReservation.ReservedPeriod;
+                // XXX TBD May change as global schedule changes
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ICpuScheduler.cs b/base/Kernel/Singularity/Scheduling/Full/ICpuScheduler.cs
new file mode 100644
index 0000000..8f50b5b
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ICpuScheduler.cs
@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\Scheduling\ICpuScheduler.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+#if SIMULATOR
+using Thread = Microsoft.Singularity.Scheduling.Thread;
+#endif
+
+namespace Microsoft.Singularity.Scheduling
+{
+    [CLSCompliant(false)]
+    public abstract class ICpuScheduler
+    {
+        public abstract ISchedulerThread CreateSchedulerThread(Thread thread);
+        public abstract ISchedulerProcessor CreateSchedulerProcessor(Processor processor);
+        public abstract ISchedulerActivity CreateSchedulerActivity();
+        public abstract ISchedulerCpuReservation ReserveCpu(ISchedulerActivity activity,
+                                                            CpuResourceAmount amount,
+                                                            TimeSpan period);
+        public abstract bool NextThread(out Thread nextThread);
+        public abstract bool ShouldReschedule();
+
+        /// <summary>
+        /// Note that as tasks now contain resource accounting, there is
+        /// no need to pass out the resource usage from the scheduler.
+        /// For consistency we'll still pass it out of the Task API at least
+        /// until instantaneous usage is fixed.
+        /// </summary>
+        /// <returns>Returns true if admitted.</returns>
+        public abstract bool BeginConstraint(Hashtable resourceEstimates,
+                                             DateTime deadline,
+                                             ISchedulerTask taskToEnd,
+                                             out ISchedulerTask schedulerTask);
+        public abstract void BeginDelayedConstraint(Hashtable resourceEstimates,
+                                                    TimeSpan relativeDeadline,
+                                                    ISchedulerTask taskToEnd,
+                                                    out ISchedulerTask schedulerTask);
+        public abstract bool EndConstraint(ISchedulerTask taskToEnd);
+        public abstract void Initialize();
+    }
+
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/IGetBeneficiary.cs b/base/Kernel/Singularity/Scheduling/Full/IGetBeneficiary.cs
new file mode 100644
index 0000000..63a0654
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/IGetBeneficiary.cs
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\IGetBeneficiary.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    [CLSCompliant(false)]
+    public abstract class IGetBeneficiary
+    {
+        ///<summary>Returns the beneficiary of scheduling inheritance on this object.</summary>
+        public abstract Thread GetBeneficiary();
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/IResource.cs b/base/Kernel/Singularity/Scheduling/Full/IResource.cs
new file mode 100644
index 0000000..cd08f1b
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/IResource.cs
@@ -0,0 +1,32 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\IResource.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// A resource-independent Resource object.  Actual resources are derived from this base class.
+    /// </summary>
+    public abstract class IResource
+    {
+        /// <summary>
+        /// Activity contains a hashtable of resource reservations.  A
+        /// reservation for a given resource object will be stored and retrieved
+        /// based on the ResourceString returned via that resource.  This
+        /// flexibility will allow more than just on type, since some resource
+        /// types may have distinct providers for different resources (e.g.
+        /// multiple hard disks, network cards, etc), whereas multiple CPU's will
+        /// likely only have one provider.
+        /// </summary>
+        public abstract string ResourceString { get; }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/IResourceAmount.cs b/base/Kernel/Singularity/Scheduling/Full/IResourceAmount.cs
new file mode 100644
index 0000000..0eecd89
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/IResourceAmount.cs
@@ -0,0 +1,31 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\IResourceAmount.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// The base class from which resource-specific resource amount classes are derived.
+    /// </summary>
+    public abstract class IResourceAmount
+    {
+        /// <summary>
+        /// Get the resource object that this IResourceAmount object quantifies
+        /// </summary>
+        public abstract IResource Resource
+        {
+            get;
+        }
+
+        public abstract IResourceAmount AddTo(IResourceAmount amount);
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/IResourceReservation.cs b/base/Kernel/Singularity/Scheduling/Full/IResourceReservation.cs
new file mode 100644
index 0000000..1b22c5e
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/IResourceReservation.cs
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\IResourceReservation.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// A resource-independent ongoing resource reservation object.
+    /// Resource reservation objects for actual resources are derived from this base class.
+    /// </summary>
+    public abstract class IResourceReservation
+    {
+        /// <summary>
+        /// Get the resource object that this IResourceReservation object quantifies
+        /// </summary>
+        public abstract IResource Resource
+        {
+            get;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ISchedulerActivity.cs b/base/Kernel/Singularity/Scheduling/Full/ISchedulerActivity.cs
new file mode 100644
index 0000000..d459ef4
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ISchedulerActivity.cs
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\ISchedulerActivity.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ISchedulerActivity.
+    /// </summary>
+    public abstract class ISchedulerActivity
+    {
+        public abstract Activity EnclosingActivity { set; get; }
+        //CpuResourceReservation CpuResourceReservation { get; }
+        /// <summary>
+        /// ReleaseReference is used by the thread creating the
+        /// resource container to release its reference to it
+        /// voluntarily so that the resource container knows the
+        /// only things added to it can occur as a result of
+        /// threads currently assigned to the resource container.
+        /// </summary>
+        public abstract void ReleaseReference();
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ISchedulerCpuReservation.cs b/base/Kernel/Singularity/Scheduling/Full/ISchedulerCpuReservation.cs
new file mode 100644
index 0000000..4d69dea
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ISchedulerCpuReservation.cs
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\ISchedulerCpuReservation.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ISchedulerCpuReservation.
+    /// </summary>
+    public abstract class ISchedulerCpuReservation
+    {
+        public abstract CpuResourceReservation EnclosingCpuReservation
+        {
+            get; set;
+        }
+
+        public abstract CpuResourceAmount ReservedAmount
+        {
+            get;
+        }
+
+        public abstract TimeSpan ReservedPeriod
+        {
+            get;
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ISchedulerProcessor.cs b/base/Kernel/Singularity/Scheduling/Full/ISchedulerProcessor.cs
new file mode 100644
index 0000000..a5f7d81
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ISchedulerProcessor.cs
@@ -0,0 +1,24 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\ISchedulerProcessor.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ISchedulerProcessor.
+    /// </summary>
+    [CLSCompliant(false)]
+    public abstract class ISchedulerProcessor
+    {
+        public abstract Processor EnclosingProcessor { get; }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ISchedulerTask.cs b/base/Kernel/Singularity/Scheduling/Full/ISchedulerTask.cs
new file mode 100644
index 0000000..7c27357
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ISchedulerTask.cs
@@ -0,0 +1,28 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\ISchedulerTask.cs
+//
+//  Note:
+//
+
+using System.Collections;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ISchedulerTask.
+    /// </summary>
+    public abstract class ISchedulerTask
+    {
+        public abstract Task EnclosingTask { set; get; }
+
+        //This is temporary in the one resource world.  It needs
+        // to change for the multi-resource world.
+        //XXX
+        public abstract Hashtable ResourcesGranted { get; }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ISchedulerThread.cs b/base/Kernel/Singularity/Scheduling/Full/ISchedulerThread.cs
new file mode 100644
index 0000000..facffa5
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ISchedulerThread.cs
@@ -0,0 +1,42 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Kernel\Singularity\ISchedulerThread.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+#if SIMULATOR
+using Thread = Microsoft.Singularity.Scheduling.Thread;
+#endif
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ISchedulerThread.
+    /// </summary>
+    [CLSCompliant(false)]
+    public abstract class ISchedulerThread
+    {
+        public abstract Thread EnclosingThread { get; }
+
+        public abstract void Start();
+        public abstract void SetActivity(ISchedulerActivity activity);
+        public abstract void Cleanup();
+        public abstract TimeSpan ExecutionTime { get; }
+        /// <summary>
+        /// Tells the scheduler that this thread should wait until awoken, or until the timeout.
+        /// </summary>
+        /// <param name="timeOut">A timeout of DateTime.MaxValue means no timeout.  Otherwise the time to wake up.</param>
+        public abstract void SetStateWaiting(DateTime timeOut);
+        public abstract void Wake();
+        public abstract ISchedulerTask PrepareDelayedTask(ISchedulerTask taskToEnd,
+                                                          ref TimeConstraint timeConstraint,
+                                                          DateTime timeNow);
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/ListNode.cs b/base/Kernel/Singularity/Scheduling/Full/ListNode.cs
new file mode 100644
index 0000000..22ae3a9
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/ListNode.cs
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ListNode.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ListNode.
+    /// </summary>
+    public class ListNode
+    {
+
+        public ListNode Previous;   // Before this node
+        public ListNode Next;       // After this node
+
+        [CLSCompliant(false)]
+        public ISchedulerThread Data;
+
+        public ListNode()
+        {
+            Previous = null;
+            Next = null;
+        }
+
+        [CLSCompliant(false)]
+        public ListNode(ISchedulerThread dataref)
+        {
+            Previous = null;
+            Next = null;
+            Data = dataref;
+        }
+
+        // DI -- safe
+        public ListNode ListRemove()
+        {
+            ListNode next;
+
+            if ((next = Next) == this)
+                return null;
+
+            next.Previous = Previous;
+            Previous.Next = next;
+            Previous = Next = this;
+            return next;
+        }
+
+        // DI -- safe
+        public ListNode InsertIntoList(ListNode list)
+        {
+            if (list == null) {
+                Next = Previous = this;
+            }
+            else {
+                Next = list.Next;
+                Next.Previous = this;
+                list.Next = this;
+                Previous = list;
+            }
+            return this;
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/QueueType.cs b/base/Kernel/Singularity/Scheduling/Full/QueueType.cs
new file mode 100644
index 0000000..6129ba9
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/QueueType.cs
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   QueueType.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    public enum QueueType
+    {
+        GuaranteedQueue = 1,
+        NonGuaranteedQueue = 2,
+        IdleQueue = 3,
+        UnfinishedQueue = 4,
+        NoQueue = 5,
+    };
+}
+
+
diff --git a/base/Kernel/Singularity/Scheduling/Full/Scheduler.cs b/base/Kernel/Singularity/Scheduling/Full/Scheduler.cs
new file mode 100644
index 0000000..0099742
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/Scheduler.cs
@@ -0,0 +1,272 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Scheduler.cs
+//
+//  Note:
+//
+
+// #define DEBUG_SCHEDULER
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    public class Scheduler
+    {
+        public static readonly TimeSpan MaxPeriod = new TimeSpan(10000000);
+
+        private static bool yieldFlag;
+        public static bool YieldFlag
+        {
+            get { return yieldFlag; }
+            set { yieldFlag = value; }
+        }
+        private static bool timerInterruptedFlag = true;
+
+        public static bool TimerInterruptedFlag
+        {
+            get { return timerInterruptedFlag; }
+            set { timerInterruptedFlag = value; }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        /// <summary>
+        /// Return the Task object that the calling thread is currently working on behalf of.
+        /// </summary>
+        public static Task CurrentTask()
+        {
+            return Thread.CurrentThread.CurrentTask();
+        }
+
+        /// <summary>
+        /// Return the Activity object that the calling thread is currently working on behalf of.
+        /// </summary>
+        public static Activity CurrentActivity()
+        {
+            return Thread.CurrentThread.Activity; // XXX TBD
+        }
+
+        /// <summary>
+        /// Information logging used for debugging schedulers.
+        /// </summary>
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        [CLSCompliant(false)]
+        public static void LogWakeThread(Thread thread)
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogSchedulerLate()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogContextSwitch()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogReservationId(ISchedulerTask task)
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        [CLSCompliant(false)]
+        public static void LogBeginConstraint(Thread foo, bool ok, ulong start, ulong stop)
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogEndConstraint(TimeSpan diff)
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogTimeJump()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogSleepAdd()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogDeleteActivity()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogEndConstraint()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogResolveConstraint()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogReschedule()
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogReservedActivity(int proxyCount)
+        {
+        }
+
+        [System.Diagnostics.Conditional("DEBUG_SCHEDULER")]
+        public static void LogRecurringCpuReservation()
+        {
+        }
+
+        //
+        //////////////////////////////////////////////////////////////////////////////
+
+        [CLSCompliant(false)]
+        public static void OnTimerInterrupt(IHalTimer timer)
+        {
+            // For now: We don't invoke the scheduler here, as the base
+            // interrupt function will switch to the scheduler
+            // thread context.  (Q: Should we do that here instead?)
+            // Instead, for now just set the interrupted flag.
+            // Also -- in the future instead we may be calling
+            // scheduler.NextThread() and setting to that context.
+            //DebugStub.Print("Timer Interrupt: {0} #\n", __arglist(kCurrentTime));
+            Scheduler.TimerInterruptedFlag = true;
+        }
+
+        [CLSCompliant(false)]
+        public static Thread GetResumedThread()
+        {
+            if (!CpuResource.Provider().ShouldReschedule() &&
+                !IoSystem.DeferredSignalsPending()) {
+                //Kernel.Waypoint(302);
+                return Thread.CurrentThread;
+            }
+            else {
+                if (Thread.CurrentThread != Thread.schedulingThread) {
+                    //Kernel.Waypoint(303);
+                    return Thread.schedulingThread;
+                }
+                else {
+                    //Kernel.Waypoint(304);
+                    return Thread.CurrentThread;
+                }
+            }
+        }
+
+        [CLSCompliant(false)]
+        public bool GetNextThread(out Thread next)
+        {
+            //Kernel.Waypoint(3);
+
+            // DrainDeferredSignals returns true if any signals were queued.
+            IoSystem.DrainDeferredSignals();
+            //Kernel.Waypoint(4);
+
+            // XXX If there is an interrupt right here that adds
+            // a deferred signals to the list it won't get
+            // signalled until after the next thread runs.
+            //
+            // A potential fix is to loop here and make sure the flag is
+            // clear before scheduling the next thread.
+
+            //DebugStub.Print("Scheduler.GetNextThread()\n");
+            //return (item != null) ? item.Thread : null;
+            Debug.Assert(Thread.CurrentThread != null);
+            Thread foo;
+            //Kernel.Waypoint(5);
+            bool halted = CpuResource.Provider().NextThread(out foo);
+            next = (Thread)foo;
+            yieldFlag = false;
+            //DebugStub.Print("Exiting Scheduler.GetNextThread({0:x8},{1}\n",
+            // __arglist(next.threadIndex, halted));
+            //Kernel.Waypoint(6);
+            return halted;
+        }
+
+        static bool notExiting = true;
+        public static void StopSystem()
+        {
+            notExiting = false;
+        }
+
+        //TODO: Replace with a Processor Halt!
+        void Halt()
+        {
+            // DebugStub.Print("Doing Processor hlt\n");
+#if false
+            //[SOSP-2005] Disable hlt so we can always use the cycle counter!
+            Tracing.Log(Tracing.Debug, "Halting processor with hlt.");
+            Processor.HaltUntilInterrupt();
+#endif
+
+            // Check for a debug break.
+            if (DebugStub.PollForBreak()) {
+                DebugStub.Print("Debugger breakin.\n");
+                DebugStub.Break();
+            }
+        }
+
+        [CLSCompliant(false)]
+        public void Start(Processor rootProcessor)
+        {
+            // WARNING: Because the scheduler thread cannot go to sleep,
+            // we must avoid any operation (such as memory allocation)
+            // that might require the current thread to block.
+#if DEBUG_SCHEDULER || !DEBUG_SCHEDULER
+            Tracing.Log(Tracing.Audit, "Scheduler Started.");
+#endif
+            Thread.schedulingThread = Thread.CurrentThread;
+
+            IHalTimer timer = rootProcessor.Timer;
+            timer.SetNextInterrupt(timer.MaxInterruptInterval);
+
+            Thread next;
+#if DEBUG_SCHEDULER || !DEBUG_SCHEDULER
+            Tracing.Log(Tracing.Audit, "Scheduler Loop Started.");
+#endif
+
+            while (notExiting) {
+                bool halted = GetNextThread(out next);
+                Debug.Assert(halted || next != null);
+                if (!halted) {
+#if DEBUG_SCHEDULER
+                    Tracing.Log(Tracing.Audit, "Scheduling thread {0:x3}",
+                                (UIntPtr)unchecked((uint)next.threadIndex));
+#endif
+                    next.Schedule();
+                    if (next != null && next.IsStopping()) {
+#if DEBUG_SCHEDULER
+                        Tracing.Log(Tracing.Audit, "Cleaning up after thread {0:x3}",
+                                    (UIntPtr)unchecked((uint)next.threadIndex));
+#endif
+                        next.Cleanup();
+                    }
+                }
+                else {
+                    if (notExiting) {
+                        Kernel.Waypoint(99);
+                        Halt();
+                    }
+                }
+            }
+
+#if DEBUG_SCHEDULER || !DEBUG_SCHEDULER
+            Tracing.Log(Tracing.Audit, "Scheduler loop terminated.");
+#endif
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/SchedulerClock.cs b/base/Kernel/Singularity/Scheduling/Full/SchedulerClock.cs
new file mode 100644
index 0000000..4bf6fa1
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/SchedulerClock.cs
@@ -0,0 +1,103 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SchedulerClock.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Interface for the system clock device.
+    /// </summary>
+    public class SchedulerClock
+    {
+        public static readonly DateTime BootTime = new DateTime(0);
+        public static DateTime LastTime = new DateTime(0);
+
+        public static DateTime GetUpTime()
+        {
+            LastTime = SystemClock.GetKernelTime();
+            return LastTime;
+        }
+
+        //Simulator Use
+        //Increments the time
+        public static void SimulateTime(TimeSpan diff)
+        {
+            return;
+        }
+
+        //Simulator Use
+        //Returns the time between now and the nextTimerInterrupt
+        public static TimeSpan TimeToInterrupt()
+        {
+            return Processor.CurrentProcessor.NextTimerInterrupt - GetUpTime();
+        }
+
+        //Simulator Use
+        //Sets the nextTimerInterrupt
+        public static bool SetNextInterrupt(DateTime time)
+        {
+            long span = (time - GetUpTime()).Ticks;
+            if (span > Processor.CurrentProcessor.Timer.MaxInterruptInterval) {
+                span = Processor.CurrentProcessor.Timer.MaxInterruptInterval;
+            }
+
+            if (span < Processor.CurrentProcessor.Timer.MinInterruptInterval) {
+#if false
+                DebugStub.Print("SetNextInterrupt warning: requested span {0} " +
+                                " < MinInterruptInterval {1}" +
+                                " at cycle count {2}\n",
+                                __arglist(
+                                    span,
+                                    Processor.CurrentProcessor.Timer.MinInterruptInterval,
+                                    Kernel.GetCpuCycleCount()));
+#endif
+                span = Processor.CurrentProcessor.Timer.MinInterruptInterval;
+            }
+
+            bool success = Processor.CurrentProcessor.Timer.SetNextInterrupt(span);
+            //Debug.Print("SetNextInterrupt -- Span: ");
+            //Debug.Print(span);
+            //Debug.Print(" End: ");
+            //Debug.Print(time.Ticks);
+            //Debug.Print(" Success: ");
+            //Debug.Print((success?1:0));
+            //Debug.Print("\n");
+            if (success) {
+                Processor.CurrentProcessor.NextTimerInterrupt = time;
+                Scheduler.TimerInterruptedFlag = false;
+            }
+            return success;
+        }
+
+        //Allow timer periods longer than timer.MaxInterruptInterval
+        public static void CheckInterrupt()
+        {
+            long span = (Processor.CurrentProcessor.NextTimerInterrupt - GetUpTime()).Ticks;
+            if (span < Processor.CurrentProcessor.Timer.MinInterruptInterval) {
+                return;
+            }
+            SetNextInterrupt(Processor.CurrentProcessor.NextTimerInterrupt);
+            return;
+        }
+
+        // need to tell other processors an important scheduling change
+        //       has been made.
+        // OPEN QUESTION: Do we need to tell all processors, or just the ones
+        //       which are idle?
+        public static void SignalOtherProcessors()
+        {
+            // needs implementation.
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/Task.cs b/base/Kernel/Singularity/Scheduling/Full/Task.cs
new file mode 100644
index 0000000..edbd090
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/Task.cs
@@ -0,0 +1,312 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Task.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Collections;
+using System.Threading;
+#if SIMULATOR
+using Thread = Microsoft.Singularity.Scheduling.Thread;
+#endif
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// A Singularity Task object represents work requiring a set of resources to be performed by a deadline.
+    /// </summary>
+    public class Task
+    {
+        /// <summary>
+        /// True if task was successfully admitted
+        /// </summary>
+        public bool Admitted
+        {
+            get { return admitted; }
+        }
+        internal bool admitted;
+
+        internal Task parentTask;
+        private  DateTime deadline;
+        internal Activity activity;
+        private  Hashtable resourceEstimates;
+        internal Hashtable resourcesGranted;
+        internal Hashtable resourcesUsed;
+        internal ISchedulerTask schedulerTask;
+
+        /// <summary>
+        /// To begin a constraint, use Task.BeginConstraint.  The Task constructors
+        /// are to be used only within the system, and perform no reservation
+        /// activities.
+        ///
+        /// This constructor makes a task as a subtask of CurrentTask() and
+        /// CurrentActivity()
+        /// </summary>
+        internal Task(Hashtable resourceEstimates,
+                      Hashtable resourcesGranted,
+                      DateTime deadline,
+                      bool admitted,
+                      ISchedulerTask schedulerTask)
+            : this(resourceEstimates, resourcesGranted, deadline, admitted, schedulerTask,
+                    Scheduler.CurrentTask(), Scheduler.CurrentActivity())
+        {
+        }
+
+        /// <summary>
+        /// To begin a constraint, use Task.BeginConstraint.  The Task constructors
+        /// are to be used only within the system, and perform no reservation
+        /// activities.
+        ///
+        /// This constructor makes a task as a subtask of parentTask (possibly null)
+        /// and activity (likely a new resource container).
+        /// </summary>
+        internal Task(Hashtable resourceEstimates,
+                      Hashtable resourcesGranted,
+                      DateTime deadline,
+                      bool admitted,
+                      ISchedulerTask schedulerTask,
+                      Task parentTask,
+                      Activity activity)
+        {
+            this.activity = activity;
+            this.parentTask = parentTask;
+            this.resourceEstimates = resourceEstimates;
+            this.resourcesGranted = (resourcesGranted == null) ? new Hashtable() : resourcesGranted;
+            this.deadline = deadline;
+            this.resourcesUsed = new Hashtable();
+            this.admitted = admitted;
+            this.schedulerTask = schedulerTask;
+        }
+
+        public void ClearSchedulerTask()
+        {
+            schedulerTask = null;
+        }
+
+        public void UpdateSchedulingState(bool admitted,
+                                          DateTime deadline,
+                                          Hashtable resourcesGranted)
+        {
+            this.admitted = admitted;
+            this.deadline = deadline;
+            this.resourcesGranted = resourcesGranted;
+        }
+
+        //Because there are no timed-wait-and-begin-constraint (i.e. future constraints),
+        //      I had to modify some of the simfiles to keep threads from exiting early.
+        //      Currently start-times later than now are treated as starting now.
+        public static Task BeginTask()
+        {
+            Hashtable foo;
+            return BeginTask(null, DateTime.MaxValue, null, out foo);
+        }
+
+        public static Task BeginTask(Task taskToEnd, out Hashtable used)
+        {
+            return BeginTask(null, DateTime.MaxValue, taskToEnd, out used);
+        }
+
+        public static Task BeginTask(Hashtable resourceEstimates, DateTime deadline)
+        {
+            Hashtable foo;
+            return BeginTask(resourceEstimates, deadline, null, out foo);
+        }
+
+        public static Task BeginTask(Hashtable resourceEstimates,
+                                     DateTime deadline,
+                                     Task taskToEnd,
+                                     out Hashtable actualUsed)
+        {
+            //In a single resource world, it is sufficient here to
+            //  ask the CpuProvider to begin the constraint.  However,
+            //  this code will be the beginning of the starting point
+            //  for multi-resource scheduling in this capacity.
+            ISchedulerTask schedulerTask;
+            Task task;
+            if ((resourceEstimates != null && resourceEstimates.Count > 0) ||
+                (Scheduler.CurrentTask().resourceEstimates != null && Scheduler.CurrentTask().resourceEstimates.Count > 0)) {
+                bool admitted = CpuResource.Provider().BeginConstraint(resourceEstimates,
+                                                                       deadline,
+                                                                       taskToEnd,
+                                                                       out schedulerTask);
+                if (taskToEnd == null) {
+                    task = new Task(resourceEstimates,
+                                    schedulerTask.ResourcesGranted,
+                                    deadline,
+                                    admitted,
+                                    schedulerTask);
+                }
+                else {
+                    task = new Task(resourceEstimates,
+                                    schedulerTask.ResourcesGranted,
+                                    deadline,
+                                    admitted,
+                                    schedulerTask,
+                                    taskToEnd.parentTask,
+                                    taskToEnd.activity);
+                }
+                schedulerTask.EnclosingTask = task;
+            }
+            else {
+                if (taskToEnd != null) {
+                    taskToEnd.End();
+                }
+                task = new Task(null, null, DateTime.MaxValue, true, null);
+            }
+            if (taskToEnd != null) {
+                actualUsed = taskToEnd.resourcesUsed;
+            }
+            else {
+                actualUsed = null;
+            }
+            Thread.CurrentThread.currentTask = task;
+            Debug.Assert(task.resourcesUsed.Count == 0);
+            return task;
+        }
+
+        public static Task BeginDelayedTask(Hashtable resourceEstimates,
+                                            TimeSpan relativeDeadline)
+        {
+            Hashtable foo;
+            return BeginDelayedTask(resourceEstimates, relativeDeadline, null, out foo);
+        }
+
+        /// <summary>
+        /// Delayed tasks are used for such things as atomic wait and begin constraints.
+        /// The interpretation is that when a thread is woken up, the scheduler promises
+        /// to resolve any pending constraints atomically with the wakeup.  After calling
+        /// BeginDelayedTask, the task won't actually begin until the thread performs
+        /// some action that causes a sleep/wait and is being woken up from it.
+        ///
+        /// Example uses:
+        ///
+        /// while (doingSomeStuff) {
+        ///     Task t = BeginDelayedTask(resourceEstimates, relativeDeadline);
+        ///     autoResetEvent.Wait();
+        ///     if (t.Admitted) {
+        ///         //do full work
+        ///     } else {
+        ///         //do less work is possible
+        ///     }
+        ///     t.End();
+        /// }
+        ///
+        /// while (doingSomeStuff) {
+        ///     Task t = BeginDelayedTask(resourceEstimates, relativeDeadline);
+        ///     Thread.Sleep(500);
+        ///     if (t.Admitted) {
+        ///         //do full work
+        ///     } else {
+        ///         //do less work is possible
+        ///     }
+        ///     t.End();
+        /// }
+        ///
+        /// while (doingSomeStuff) {
+        ///     Task t = BeginDelayedTask(resourceEstimates, relativeDeadline);
+        ///     Thread.Sleep(500);
+        ///     if (t.Admitted) {
+        ///         //do full work
+        ///     } else {
+        ///         //do less work is possible
+        ///     }
+        ///     t.End();
+        /// }
+        ///
+        /// Mutex m;
+        /// while (doingSomeStuff) {
+        ///     Task t = BeginDelayedTask(resourceEstimates, relativeDeadline);
+        ///     m.Acquire();
+        ///     if (t.Admitted) {
+        ///         //do full work
+        ///     } else {
+        ///         //do less work is possible
+        ///     }
+        ///     t.End();
+        /// }
+        ///
+        /// </summary>
+        /// <param name="resourceEstimates"></param>
+        /// <param name="relativeDeadline"></param>
+        /// <param name="taskToEnd"></param>
+        /// <param name="actualUsed"></param>
+        /// <returns></returns>
+        public static Task BeginDelayedTask(Hashtable resourceEstimates,
+                                            TimeSpan relativeDeadline,
+                                            Task taskToEnd,
+                                            out Hashtable actualUsed)
+        {
+            //In a single resource world, it is sufficient here to
+            //  ask the CpuProvider to begin the constraint.  However,
+            //  this code will be the beginning of the starting point
+            //  for multi-resource scheduling in this capacity.
+            ISchedulerTask schedulerTask;
+            Task task;
+
+            Debug.Assert((resourceEstimates != null && resourceEstimates.Count > 0) ||
+                (Scheduler.CurrentTask().resourceEstimates != null && Scheduler.CurrentTask().resourceEstimates.Count > 0));
+            CpuResource.Provider().BeginDelayedConstraint(resourceEstimates, relativeDeadline, taskToEnd, out schedulerTask);
+            Debug.Assert(schedulerTask != null);
+            if (taskToEnd == null) {
+                task = new Task(resourceEstimates, schedulerTask.ResourcesGranted, DateTime.MaxValue, false, schedulerTask);
+            }
+            else {
+                task = new Task(resourceEstimates, schedulerTask.ResourcesGranted, DateTime.MaxValue, false, schedulerTask, taskToEnd.parentTask, taskToEnd.activity);
+            }
+            schedulerTask.EnclosingTask = task;
+            if (taskToEnd != null) {
+                actualUsed = taskToEnd.resourcesUsed;
+            }
+            else {
+                actualUsed = null;
+            }
+            Thread.CurrentThread.currentTask = task;
+            Debug.Assert(task.resourcesUsed.Count == 0);
+            return task;
+        }
+
+        /// <summary>
+        /// The common case method for indicating task completion
+        /// </summary>
+        /// <returns>Returns the actual amounts of resources consumed</returns>
+        public Hashtable End()
+        {
+            //Do we want this static -- i.e. to prevent the thread from trying
+            // to end a task it's not presently working on?
+            Debug.Assert(this == Scheduler.CurrentTask(), "Cannot end a task other than the current task!");
+            Debug.Assert(this != Activity().DefaultTask(), "Cannot end the default task for the resource container!");
+            CpuResource.Provider().EndConstraint(this);
+            Thread.CurrentThread.currentTask = parentTask;
+            return resourcesUsed; // XXX TBD
+        }
+
+        /// <summary>
+        /// Return the Activity object that this task is part of
+        /// </summary>
+        public Activity Activity()
+        {
+            return activity;
+        }
+
+        public void AddResourceAmountUsed(string resourceString, IResourceAmount amount)
+        {
+            IResourceAmount current = (IResourceAmount)resourcesUsed[resourceString];
+            if (current == null) {
+                resourcesUsed[resourceString] = amount;
+            }
+            else {
+                ((IResourceAmount)resourcesUsed[resourceString]).AddTo(amount);
+            }
+            if (parentTask != null) {
+                parentTask.AddResourceAmountUsed(resourceString, amount);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Full/TimeConstraint.cs b/base/Kernel/Singularity/Scheduling/Full/TimeConstraint.cs
new file mode 100644
index 0000000..fd1aa1e
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Full/TimeConstraint.cs
@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TimeConstraint.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// A public structure used to pass data between the Kernel and the Application to express a
+    /// time constraint.
+    /// </summary>
+    public struct TimeConstraint
+    {
+        public DateTime Start;
+        public TimeSpan Estimate;
+        public DateTime Deadline;
+        public TimeSpan RelativeDeadline;
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/LaxityActivity.cs b/base/Kernel/Singularity/Scheduling/Laxity/LaxityActivity.cs
new file mode 100644
index 0000000..1b6fd12
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/LaxityActivity.cs
@@ -0,0 +1,134 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LaxityActivity.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// The resource container class includes a recurring reservation
+    /// (k out of every n), a list of runnable threads, unfinished constraints
+    /// (i.e. non-guaranteed or non-feasible), as well as pointers to handle
+    /// its role in lists for the non-blocked activity list.
+    /// It also has references for the last node to execute it,
+    /// a node assigned to it (which is a list via SameActivityNext), and a node
+    /// assigned to it under the new scheduling plan.  It also has some bookkeeping.
+    /// </summary>
+    public class LaxityActivity : ISchedulerActivity
+    {
+        Activity enclosingActivity;
+
+        public RecurringReservation MyRecurringCpuReservation;
+
+        public LaxityThread     RunnableThreads;// list of runnable threads, if any
+
+#if false
+        public OneShotReservation  UnfinishedConstraints;
+#endif
+
+        public LaxityActivity    Next;     // Next and previous activities
+        public LaxityActivity  Previous;
+
+        public int          ReferenceCount;
+        public int        CountNodes;
+
+        public LaxityActivity()
+        {
+            //Below is InitializeActivity();
+            ReferenceCount = 1;
+            RunnableThreads = null;
+
+//            MyRecurringCpuReservation = new RecurringReservation();
+//            MyRecurringCpuReservation.EnclosingCpuReservation = new CpuResourceReservation(MyRecurringCpuReservation);
+
+            bool iflag = Processor.DisableInterrupts();
+            LaxityScheduler.EnqueueActivity(this); // add in last position in Laxity!
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        public void ReleaseActivity()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            LaxityScheduler.DequeueActivity(this); // update Laxity queue, if required.
+            Processor.RestoreInterrupts(iflag);
+            Scheduler.LogDeleteActivity();
+        }
+
+        //public-normal API
+        //TODO: Call this from finalize?
+        public override void ReleaseReference()
+        {
+            // DI replaced by AtomicDec(&activity->ReferenceCount);
+            Debug.Assert(ReferenceCount > 0);
+            int newrefcnt = Interlocked.Decrement(ref ReferenceCount);
+
+            if (newrefcnt == CountNodes) {
+                if (CountNodes > 0) {
+                    return;
+                }
+                bool iflag = Processor.DisableInterrupts();
+                LaxityScheduler.DequeueActivity(this); // update Laxity queue, if required.
+                Processor.RestoreInterrupts(iflag);
+            }
+            Scheduler.LogDeleteActivity();
+        }
+
+        // find the runnable thread of an activity:
+        public LaxityThread GetRunnableThread()
+        {
+            // dnarayan: we don't schedule tasks from resource containers anymore,
+            // but directly from the global least-laxity heap
+#if false
+            OneShotReservation reservation = UnfinishedConstraints;
+            Debug.Assert(reservation == null || reservation.AssociatedActivity == null);
+            // avoid stack overflow : GetRunnableThread & GetRunnableThread
+            while (reservation != null) {
+                // search in the circular list
+                LaxityThread thread = reservation.GetRunnableThread();
+                if (thread != null) {
+                    return thread;
+                }
+                reservation = reservation.Next;
+                if (reservation == UnfinishedConstraints) {
+                    break;
+                }
+            }
+#endif
+            LaxityThread runThread = RunnableThreads;
+            while (runThread != null && runThread.ActiveProcessor != null && runThread != RunnableThreads.Previous) {
+                runThread = runThread.Next;
+            }
+            if (runThread == null || runThread.ActiveProcessor != null) {
+                return null;
+            }
+            else {
+                return runThread;
+            }
+        }
+
+#region ISchedulerActivity Members
+
+        public override Activity EnclosingActivity
+        {
+            get { return enclosingActivity; }
+            set { enclosingActivity = value; }
+        }
+
+        public CpuResourceReservation CpuResourceReservation
+        {
+            get { return MyRecurringCpuReservation.EnclosingCpuReservation; }
+        }
+#endregion
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/LaxityHeap.cs b/base/Kernel/Singularity/Scheduling/Laxity/LaxityHeap.cs
new file mode 100644
index 0000000..85e4b86
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/LaxityHeap.cs
@@ -0,0 +1,273 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LaxityHeap.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// A generic heap implementation
+    /// </summary>
+    public class Heap
+    {
+        private class HeapElem
+        {
+            public object elem;
+            public IComparable key;
+
+            public HeapElem(object elem, IComparable key)
+            {
+                this.elem = elem;
+                this.key = key;
+            }
+        }
+
+        private Hashtable map;
+        private ArrayList heap;
+
+        // float the value at position i down the heap, assuming
+        // subtrees already satisfy the heap property
+        // this is HEAPIFY from CLR pg 143.
+        private void pushdown(int i)
+        {
+            while (i*2 + 1 < heap.Count) {
+                int ichild = i*2 + 1;
+                HeapElem child = (HeapElem)heap[ichild];
+                if (ichild + 1 < heap.Count) {
+                    HeapElem otherchild = (HeapElem)heap[ichild+1];
+                    if (otherchild.key.CompareTo(child.key) < 0) {
+                        child = otherchild;
+                        ichild++;
+                    }
+                }
+
+                HeapElem cur = (HeapElem)heap[i];
+                // now child contains the child with the smaller key
+                // if that is smaller than parent's key, swap them
+                if (child.key.CompareTo(cur.key) < 0) {
+                    heap[i] = child;
+                    heap[ichild] = cur;
+                    map[child.elem] = i;
+                    map[cur.elem] = ichild;
+                }
+
+                // and continue one level down
+                i = ichild;
+            }
+        }
+
+        // push a value up the heap until it exceeds its parent
+        // this is  HEAP-INSERT from CLR pg 150
+        private void pushup(int i)
+        {
+            while (i > 0) {
+                HeapElem cur = (HeapElem) heap[i];
+                HeapElem parent = (HeapElem) heap[(i-1)/2];
+                if (parent.key.CompareTo(cur.key) <= 0) {
+                    break;
+                }
+                // swap with parent and continue
+                heap[i] = parent;
+                heap[(i-1)/2] = cur;
+                map[parent.elem] = i;
+                map[cur.elem] = (i-1)/2;
+                i = (i-1)/2;
+            }
+        }
+
+
+        // assert heap invariant at node i
+        private void assertHeap(int i)
+        {
+            // first make sure map and heap are consistent
+            Debug.Assert(heap.Count == map.Count);
+            for (int j = 0; j < heap.Count; j++) {
+                HeapElem cur = (HeapElem) heap[j];
+                int jj = (int) map[cur.elem];
+                Debug.Assert(j == jj);
+            }
+
+            for (; i < heap.Count/2; i++) {
+                HeapElem cur = (HeapElem) heap[i];
+                HeapElem child = (HeapElem) heap[i*2+1];
+                Debug.Assert(child.key.CompareTo(cur.key) >= 0);
+                if (i*2 + 2 < heap.Count) {
+                    child = (HeapElem)heap[i*2+2];
+                    Debug.Assert(child.key.CompareTo(cur.key) >= 0);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create a new, empty heap.
+        /// </summary>
+        public Heap()
+        {
+            map = new Hashtable();
+            heap = new ArrayList();
+        }
+
+        public int Count
+        {
+            get { return heap.Count; }
+        }
+
+        /// <summary>
+        /// Check if the heap is legit else assert
+        /// </summary>
+        public void AssertHeap()
+        {
+            assertHeap(0);
+        }
+
+        /// <summary>
+        /// Insert an object into the heap
+        /// </summary>
+        /// <param name="elem">the object to be inserted</param>
+        /// <param name="key">the key value with which the object is associated</param>
+        /// <returns>false if object already exists in the heap (key is not updated in this case)</returns>
+
+        public bool Insert(object elem, IComparable key)
+        {
+            if (map.ContainsKey(elem)) {
+                return false;
+            }
+            int i = heap.Count;
+            map[elem] = i;
+            heap.Add(new HeapElem(elem, key));
+            pushup(i);
+            return true;
+        }
+
+        /// <summary>
+        /// Update a key value for an existing object
+        /// </summary>
+        /// <param name="elem">the object to update the key for</param>
+        /// <param name="newkey">the new key value</param>
+        /// <returns>false if the object does not exist in the heap</returns>
+        public bool Update(object elem, IComparable newkey)
+        {
+            if (!map.ContainsKey(elem)) {
+                return false;
+            }
+            int i = (int)map[elem];
+            HeapElem cur = (HeapElem) heap[i];
+            cur.key = newkey;
+
+            // we need to push it either up or down, just do both
+            pushdown(i);
+            pushup(i);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Delete an object from the heap
+        /// </summary>
+        /// <param name="elem">the object to delete</param>
+        /// <returns>false if object does not exist in the heap</returns>
+        public bool Delete(object elem)
+        {
+            if (!map.ContainsKey(elem)) {
+                return false;
+            }
+
+            int i = (int) map[elem];
+            int ilast = heap.Count - 1;
+            HeapElem lastelem = (HeapElem)heap[ilast];
+
+            // remove from mapping and shrink the array
+            heap.RemoveAt(ilast);
+            map.Remove(elem);
+
+            if (i != ilast) {
+                // move erstwhile last elem into current position and update mapping
+                heap[i] = lastelem;
+                map[lastelem.elem] = i;
+
+                // push up/down to rightful place
+                pushdown(i);
+                pushup(i);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Return the heap object with the least key, without removing it.
+        /// </summary>
+        /// <returns>the heap object with the least key</returns>
+        public object Min
+        {
+            get { return (heap.Count > 0) ? ((HeapElem)heap[0]).elem : null; }
+        }
+
+        // debug the heap
+        static void TestHeap(int maxelem)
+        {
+            Heap newheap = new Heap();
+            Random r = new Random();
+            bool[] inserted = new bool[maxelem];
+            int[] updated = new int[maxelem];
+
+            for (int i = 0; i < maxelem; i++) {
+                DebugStub.WriteLine("Inserting {0}\r", i);
+                int ins = r.Next() % maxelem;
+                bool insret = newheap.Insert(ins, ins);
+                newheap.AssertHeap();
+                Debug.Assert(insret != inserted[ins]); // returns false if already inserted
+                inserted[ins] = true;
+            }
+            DebugStub.WriteLine("{0} inserted", newheap.Count);
+
+            for (int i = 0; i < maxelem; i++) {
+                DebugStub.WriteLine("Updating {0}", i);
+                int newkey = r.Next() % 1000;
+                bool upret = newheap.Update(i, newkey);
+                newheap.AssertHeap();
+                Debug.Assert(upret == inserted[i]);
+                updated[i] = upret ? newkey : -1;
+            }
+            DebugStub.WriteLine();
+
+            for (int i = 0; i < maxelem; i++) {
+                DebugStub.WriteLine("Deleting {0}", i);
+                int del = r.Next() % maxelem;
+                bool delret = newheap.Delete(del);
+                newheap.AssertHeap();
+                Debug.Assert(delret == inserted[del]); // returns false if not inserted
+                inserted[del] = false;
+            }
+            DebugStub.WriteLine();
+
+            int prev = 0;
+            int c = newheap.Count;
+            DebugStub.WriteLine("{0} remaining", c);
+            for (int i = 0; i < c; i++) {
+                int nextval = (int) newheap.Min;
+                newheap.AssertHeap();
+                int nextkey = updated[nextval];
+                Debug.Assert(nextkey != -1);
+                Debug.Assert(nextkey >= prev);
+                DebugStub.Write("{0} ", nextkey);
+                prev = nextkey;
+                Debug.Assert(newheap.Delete(nextval));
+                newheap.AssertHeap();
+            }
+            DebugStub.WriteLine()
+            Debug.Assert(newheap.Count == 0);
+            DebugStub.WriteLine("All serene ...");
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/LaxityProcessor.cs b/base/Kernel/Singularity/Scheduling/Laxity/LaxityProcessor.cs
new file mode 100644
index 0000000..40671c9
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/LaxityProcessor.cs
@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LaxityProcessor.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// </summary>
+    public class LaxityProcessor : ISchedulerProcessor
+    {
+        private readonly Processor enclosingProcessor;
+        public override Processor EnclosingProcessor
+        {
+            get { return enclosingProcessor; }
+        }
+
+        internal LaxityActivity CurrentActivity;
+        internal TimeSpan SliceLeft;
+        internal LaxityThread RunningThread;
+        internal DateTime SchedulingTime;
+        internal bool NeedToReschedule;
+        internal bool Idle;
+
+        public void Reschedule()
+        {
+            NeedToReschedule = true;
+        }
+
+        public LaxityProcessor(Processor processor)
+        {
+            enclosingProcessor = processor;
+            SchedulingTime = SchedulerClock.BootTime;
+        }
+
+    }
+
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/LaxityScheduler.cs b/base/Kernel/Singularity/Scheduling/Laxity/LaxityScheduler.cs
new file mode 100644
index 0000000..cf618fb
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/LaxityScheduler.cs
@@ -0,0 +1,842 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LaxityScheduler.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling
+{
+#if !SIMULATOR
+    public class SystemScheduler
+    {
+        static public void RegisterScheduler()
+        {
+            Laxity.LaxityScheduler.RegisterScheduler();
+        }
+    }
+#endif
+}
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// Summary description for LaxityScheduler.
+    /// </summary>
+    public class LaxityScheduler : ICpuScheduler
+    {
+        public static readonly TimeSpan ContextSwitch = new TimeSpan(200);
+        public static readonly TimeSpan MinSlice = new TimeSpan(10 * ContextSwitch.Ticks);
+        public static readonly TimeSpan AFewSlice = new TimeSpan(3 * MinSlice.Ticks);
+        public static readonly TimeSpan RobinSlice = new TimeSpan(10 * TimeSpan.TicksPerMillisecond);
+
+        static public void RegisterScheduler()
+        {
+            CpuResource.RegisterSystemScheduler(new LaxityScheduler());
+        }
+
+        public override ISchedulerProcessor CreateSchedulerProcessor(Processor processor)
+        {
+            return new LaxityProcessor(processor);
+        }
+
+        public override ISchedulerThread CreateSchedulerThread(Thread thread)
+        {
+            return new LaxityThread(thread);
+        }
+
+        public override ISchedulerActivity CreateSchedulerActivity()
+        {
+            return new LaxityActivity();
+        }
+
+        public override ISchedulerCpuReservation ReserveCpu(ISchedulerActivity activity, CpuResourceAmount amount, TimeSpan period)
+        {
+            return null;
+        }
+
+        public bool ReserveRecurringCpu(Activity activity, ref TimeSpan amount, ref TimeSpan period)
+        {
+            return true;
+        }
+
+        public override bool ShouldReschedule()
+        {
+            LaxityThread currentThread = GetCurrentThread();
+            if (Scheduler.TimerInterruptedFlag && currentThread != null) {
+                //SchedulerClock.CheckInterrupt();
+            }
+
+            if (currentThread == null || Scheduler.YieldFlag || currentThread.EnclosingThread.IsWaiting() || currentThread.EnclosingThread.IsStopped()) {
+                Reschedule();
+            }
+            return NeedToReschedule || Scheduler.TimerInterruptedFlag;
+            // || timer should have fired but didn't?
+        }
+
+        // DI -- this is somehow similar to EnableInterrupts
+        public override bool NextThread(out Thread nextThread)
+        {
+            Debug.Assert(!Processor.InterruptsDisabled());
+            bool iflag = Processor.DisableInterrupts();
+            bool halted = false;
+            LaxityThread currentThread = GetCurrentThread();
+
+            SchedulerClock.CheckInterrupt();
+            if (ShouldReschedule()) {
+                //Debug.Print("Calling RescheduleInterrupt()\n");
+                halted = RescheduleInterrupt(); //TODO: RescheduleInterrupt returns true if the processor needs to be halted.
+                currentThread = GetCurrentThread();
+            }
+            else {
+                //Debug.Print("No call to RescheduleInterrupt()\n");
+            }
+
+            if (currentThread != null) {
+                nextThread = currentThread.EnclosingThread;
+            }
+            else {
+                Debug.Assert(halted);
+                nextThread = null;
+            }
+
+            ((LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor).NeedToReschedule = false;
+            // printf("-------------------------currentThread-Id %d\n", currentThread.Id);
+            //return currentThread;
+            Processor.RestoreInterrupts(iflag);
+            return halted;
+        }
+        //public static void Yield();
+#region Constants
+
+        // Maximum Scheduling Period is 1 sec (i.e. in 100s of nanoseconds).
+        static readonly TimeSpan AmountCpu = CpuResource.MaxPeriod; //(MaxPeriod * 100); //TODO: TICKS vs. TIME_SPAN vs DATE_TIME
+
+#endregion
+
+#region Static data members
+        static LaxityActivity      CircularActivityList = null;
+        /// <summary>
+        /// This must ALWAYS (when lock not held) point to a current resource
+        /// container in the queue.
+        /// </summary>
+        static internal LaxityActivity NextActivity;
+
+
+        //moved to be processor specific
+        //static LaxityActivity        LaxityActivityNext = null;
+        //static LaxityActivity        LaxityActivityCurrent = null;  // activity currently executing from
+
+        private static OneShotReservation ReservationFreePool;
+        private static TimeSpan     IdleTime = new TimeSpan(0);
+        private static bool         Idle
+        {
+            get { return GetCurrentProcessor().Idle; }
+        }
+
+        //moved to be processor specific
+        //static LaxityThread       CurrentThreadGlobal = null;
+        //static TimeSpan       LaxitySliceLeft = LaxityScheduler.LaxitySlice; //new TimeSpan(0);  // the round robin list, if any, and its CPU slice
+        //public static DateTime        SchedulingTime;
+        //static bool           NeedToReschedule = false;
+
+        public static TimeSpan      LA_Time = LaxityScheduler.MinSlice;
+
+        public static DateTime SchedulingTime
+        {
+            get {
+                return ((LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor).SchedulingTime;
+            }
+        }
+
+        public static bool NeedToReschedule
+        {
+            get {
+                return ((LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor).NeedToReschedule;
+            }
+        }
+
+#endregion
+
+        public LaxityScheduler()
+        {
+        }
+
+        public override void Initialize()
+        {
+            LaxityScheduler.InitializeScheduler();
+        }
+
+        public static void InitializeScheduler()
+        { //TODO: Should all the null's be added in here?
+            for (int i = 0; i < Processor.processorTable.Length; i++) {
+                ((LaxityProcessor)Processor.processorTable[i].SchedulerProcessor).SchedulingTime = SystemClock.GetKernelTime();
+            }
+//
+//            TimeSpan currentSliceLeft = LaxitySliceLeft;
+            bool iflag = Processor.DisableInterrupts();
+            SchedulerClock.SetNextInterrupt(SchedulingTime + LaxityScheduler.RobinSlice);
+            Processor.RestoreInterrupts(iflag);
+        }
+
+#region ISystemScheduler Members
+
+        public override void BeginDelayedConstraint(Hashtable resourceEstimates, TimeSpan relativeDeadline, ISchedulerTask taskToEnd, out ISchedulerTask schedulerTask)
+        {
+            TimeConstraint timeConstraint = new TimeConstraint();
+            timeConstraint.Estimate = CpuResource.Provider().CpuToTime((CpuResourceAmount)resourceEstimates[CpuResource.Provider().ResourceString]);
+            timeConstraint.Start = new DateTime(0); //Start now.
+            timeConstraint.RelativeDeadline = relativeDeadline;
+            timeConstraint.Deadline = new DateTime(0); //A 0-deadline means relative instead.
+            schedulerTask = Thread.CurrentThread.SchedulerThread.PrepareDelayedTask(taskToEnd, ref timeConstraint, SystemClock.GetKernelTime());
+        }
+
+        public override bool BeginConstraint(Hashtable resourceEstimates, DateTime deadline, ISchedulerTask taskToEnd, out ISchedulerTask schedulerTask)
+        {
+            DateTime    timeNow = SystemClock.GetKernelTime();
+            LaxityThread        thread = GetCurrentThread();
+            ulong   start;
+            ulong   stop;
+            Debug.Assert(!Processor.InterruptsDisabled());
+
+            thread.IpcCheckFreeConstraint();
+
+            start = Processor.CycleCount;
+
+            Debug.Assert(taskToEnd == null || taskToEnd == thread.ReservationStack);
+            bool end_previous = (taskToEnd != null);
+            TimeConstraint constraint = new TimeConstraint();
+            constraint.Deadline = deadline;
+            constraint.Estimate = CpuResource.Provider().CpuToTime((CpuResourceAmount)resourceEstimates[CpuResource.Provider().ResourceString]);
+            constraint.Start = timeNow;
+
+            bool ok = thread.BeginConstraintBeforeWaitValidate(end_previous, ref constraint, timeNow);
+            schedulerTask = thread.PendingReservation;
+            if (ok) {
+                OneShotReservation.BeginConstraintBeforeWait(thread, end_previous, constraint, timeNow);
+                bool iflag = Processor.DisableInterrupts();
+                ok = OneShotReservation.ResolveConstraint(thread);
+                Processor.RestoreInterrupts(iflag);
+            }
+            stop = Processor.CycleCount;
+
+            Scheduler.LogBeginConstraint(thread.EnclosingThread, ok, start, stop);
+
+            //TODO: Check if this is a necessity, or if it's only for sim time.  Call in wrapper if necessary.
+            //NextThread();
+            return ok;
+        }
+
+        public override bool EndConstraint(ISchedulerTask taskToEnd)
+        {
+            Debug.Assert(!Processor.InterruptsDisabled());
+            Debug.Assert(taskToEnd == GetCurrentThread().ReservationStack);
+            bool iflag = Processor.DisableInterrupts();
+            bool ok = OneShotReservation.EndPreviousConstraint(GetCurrentThread(), SystemClock.GetKernelTime());
+            //
+            // need to reschedule only if on a reserved slot and the top of EarliestDeadlineFirst doesn't
+            //  belong to this task
+            //
+            if ((OneShotReservation.CurrentReservation != null) &&
+                (OneShotReservation.TopGuaranteedReservation != null) &&
+                (OneShotReservation.TopGuaranteedReservation.ReservTask != (GetCurrentThread()))) {
+                Reschedule();
+            }
+
+            Processor.RestoreInterrupts(iflag);
+            Scheduler.LogEndConstraint();
+
+            //TODO: In the system wrapper for BeginConstraint -- it needs to call Yield/NextThread/MaybeYield
+            //NextThread();
+            return ok;
+        }
+
+        public static bool ReserveRecurringCpu(LaxityActivity activity,
+                                               ref TimeSpan amount,
+                                               ref TimeSpan period)
+        {
+            return true;
+        }
+
+#endregion
+
+
+#region OneShotCpuReservation related functions
+        // OneShotCpuReservation related functions begin:
+
+        public static int ReleaseReservationProtected(OneShotReservation reservation)
+        {
+            int  newrefcnt;
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            Debug.Assert(reservation.ReferenceCount > 0);
+            newrefcnt = Interlocked.Decrement(ref reservation.ReferenceCount);
+
+            if (newrefcnt == 0) {
+                // Estimate may be positive when reservation reaches
+                // its Deadline w/o using its Estimate
+                Debug.Assert((reservation.Next == null) && (reservation.Previous == null));
+                if (reservation.OriginalThread != null) {
+                    reservation.OriginalThread.ReleaseProtected();
+                    //Debug.Assert(reservation.ActiveThread != null);
+                    //reservation.ActiveThread.ReleaseProtected();
+                }
+                else {
+                    Debug.Assert(reservation.AssociatedActivity != null);
+                    ActivityReleaseProtected(reservation.AssociatedActivity);
+                }
+                Debug.Assert(reservation.Next == null);
+                CacheFreeReservation(reservation);
+            }
+            return newrefcnt;
+        }
+
+
+        public static OneShotReservation AllocateReservation()
+        {
+            OneShotReservation reservation;
+
+            //  DisableInterrupts();
+            reservation = IpcAllocateReservation();
+            //  EnableInterrupts();
+
+            if (reservation == null) {
+                reservation = new OneShotReservation(); //(PRESERVATION)malloc(sizeof(struct OneShotReservation)); // to be done while on the I-stack!
+                reservation.Clear();
+            }
+            return reservation;
+        }
+
+        static void FreeReservation(OneShotReservation reservation)
+        {
+            reservation = null; //free(reservation);
+        }
+
+        // Garbage-collect unused Reservations.
+
+        public static int ReleaseReservation(OneShotReservation reservation)
+        {
+            // Debug.Assert(!Processor.InterruptsDisabled());
+            Debug.Assert(reservation.ReferenceCount > 0);
+            int newrefcnt = reservation.ReferenceCount - 1;
+            reservation.ReferenceCount = newrefcnt;
+
+            if (newrefcnt == 0) {
+                // Estimate may be positive when reservation reaches its Deadline w/o using its Estimate
+                Debug.Assert((reservation.Next == null) && (reservation.Previous == null));
+                if (reservation.OriginalThread != null) {
+                    reservation.OriginalThread.Release();
+                    //Debug.Assert(reservation.ActiveThread != null);
+                    //reservation.ActiveThread.Release();
+                }
+                else if (reservation.AssociatedActivity != null) {
+                    ActivityObjRelease(reservation.AssociatedActivity);
+                }
+                CacheFreeReservation(reservation);
+            }
+            return newrefcnt;
+        }
+
+        // Like CheckFreeConstraint, but callable from the IPC path.
+        // Because we can't call AllocateReservation, we use the helper thread
+        // if there aren't any free Reservations.
+        static void CacheFreeReservation(OneShotReservation reservation)
+        {
+            if (reservation.OriginalThread != null  &&
+                reservation.OriginalThread.FreeReservation == null) {
+                reservation.OriginalThread.FreeReservation = reservation;
+            }
+            else {
+                IpcFreeReservation(reservation);
+            }
+        }
+
+
+        // Callable with preemption disabled. Allocates a OneShotReservation
+        // from the global free list.
+        public static OneShotReservation IpcAllocateReservation()
+        {
+            OneShotReservation reservation;
+
+            if ((reservation = ReservationFreePool) != null) {
+                ReservationFreePool = reservation.FreeListNext;
+            }
+
+            return reservation;
+        }
+
+
+        // Callable with preemption disabled. Frees a OneShotReservation
+        // to the global free list.
+        public static void IpcFreeReservation(OneShotReservation reservation)
+        {
+            Debug.Assert( reservation != null);
+            Debug.Assert(reservation.ReferenceCount == 0);
+
+            reservation.FreeListNext = ReservationFreePool;
+            ReservationFreePool = reservation;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+
+        public static void AddRefReservation(OneShotReservation reservation)
+        {
+            Debug.Assert(reservation.ReferenceCount >= 0);
+            reservation.ReferenceCount++;
+        }
+
+#endregion
+
+#region Potpourri (Unregioned functions)
+
+        public static LaxityThread GetCurrentThread()
+        {
+            return ((LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor).RunningThread;
+        }
+
+        public static void IChangeCurrentThread(LaxityThread thread)
+        {
+            ((LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor).RunningThread = thread;
+        }
+
+        // Auxiliary Routines.
+        // TODO: Revisit the necessity of these functions.
+        public static TimeSpan minInterval(TimeSpan TimeInterv0, TimeSpan TimeInterv1)
+        {
+            return (TimeInterv0 < TimeInterv1? TimeInterv0: TimeInterv1);
+        }
+
+        public static DateTime minTime(DateTime Time0, DateTime Time1)
+        {
+            return (Time0 < Time1? Time0: Time1);
+        }
+
+        static TimeSpan maxInterval(TimeSpan TimeInterv0, TimeSpan TimeInterv1)
+        {
+            return (TimeInterv0 < TimeInterv1? TimeInterv1: TimeInterv0);
+        }
+
+        static DateTime maxTime(DateTime Time0, DateTime Time1)
+        {
+            return (Time0 < Time1? Time1: Time0);
+        }
+
+        internal static LaxityProcessor GetCurrentProcessor()
+        {
+            return (LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor;
+        }
+
+        // Add Activity in the last Round-Robin position.
+        public static void EnqueueActivity(LaxityActivity activity)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            if (CircularActivityList == null) {
+                NextActivity = CircularActivityList /*= GetCurrentProcessor().CurrentActivity */=
+                    activity.Next = activity.Previous = activity;
+                //Here modifying other processor specific data rather than global.
+//                for (int i=0; i<Processor.processorTable.Length; i++) {
+//                    ((LaxityProcessor)Processor.processorTable[i].SchedulerProcessor).NextActivity = activity;
+//                    ((LaxityProcessor)Processor.processorTable[i].SchedulerProcessor).Reschedule();
+//                }
+                SchedulerClock.SignalOtherProcessors();
+            }
+            else {
+                activity.Next = NextActivity;
+                activity.Previous = NextActivity.Previous;
+                NextActivity.Previous.Next = activity;
+                NextActivity.Previous = activity;
+            }
+        }
+
+        public static void DequeueActivity(LaxityActivity activity) //TODO: Make an activity function?
+        {
+            // In our simulated environment, Activity 0 is never removed from the Q.
+            Debug.Assert(Processor.InterruptsDisabled());
+            //NOTE: Might be replaced with a test and return.
+            Debug.Assert(activity.Next != null);
+            Debug.Assert(activity.Previous != null);
+
+            // Previous. in Laxity  if (activity.Id == 0) return;
+
+            activity.Next.Previous = activity.Previous;
+            activity.Previous.Next = activity.Next;
+            if (CircularActivityList == activity) {
+                CircularActivityList = activity.Next;
+            }
+            if (NextActivity == activity) {
+                NextActivity = activity.Next;
+            }
+//            for (int i=0; i<Processor.processorTable.Length; i++) {
+//                LaxityProcessor processor = (LaxityProcessor)Processor.processorTable[i].SchedulerProcessor;
+//                if (processor.NextActivity == activity) {
+//                    processor.NextActivity = activity.Next;
+//                }
+//            }
+        }
+
+        // if possible, places thread in the 2nd position in the RunnableThreads Q.
+        // Make this a function on a resource container.
+        public static void EnqueueRunThread(LaxityThread thread, bool fromSleeping)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            LaxityActivity activity = thread.AssociatedActivity;
+            if (thread.Next != null) {
+                Debug.Assert(thread.Previous != null);
+                return;
+            }
+
+            //  Debug.Assert(thread.QueueType == QUEUE_NONE);
+
+            //if (thread.State == LaxityThread.ThreadState.ThreadWaiting)
+            //    thread.SetState(LaxityThread.ThreadState.ThreadReady);
+
+            if (activity.RunnableThreads == null) {
+                thread.Next = thread.Previous = thread;
+                activity.RunnableThreads = thread;
+            }
+            else {
+                if (fromSleeping) {
+                    thread.Previous = activity.RunnableThreads;
+                    thread.Next = activity.RunnableThreads.Next;
+                    activity.RunnableThreads.Next.Previous = thread;
+                    activity.RunnableThreads.Next = thread;
+                }
+                else {
+                    //If we weren't sleeping/waiting, then we were running --
+                    // then put thread at end of list, not 2nd.
+                    thread.Next = activity.RunnableThreads;
+                    thread.Previous = activity.RunnableThreads.Previous;
+                    activity.RunnableThreads.Previous.Next = thread;
+                    activity.RunnableThreads.Previous = thread;
+                }
+            }
+            //Editing other processor data again.  Here we actually tell all
+            //processors they need to reschedule, since there is a new thread to
+            //consider.  (perhaps wrong).
+            //NOTE: SignalOtherProcessors only alerts those who are halted at the
+            //moment.
+            for (int i=0; i<Processor.processorTable.Length; i++) {
+                ((LaxityProcessor)Processor.processorTable[i].SchedulerProcessor).Reschedule();
+            }
+            SchedulerClock.SignalOtherProcessors();
+        }
+
+        public static bool DequeueRunThread(LaxityThread thread)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            if (thread.Next == null) {
+                Debug.Assert(thread.Previous == null);
+                return false;
+            }
+
+            if (thread.Next == thread) {
+                Debug.Assert(thread.Previous == thread);
+                thread.AssociatedActivity.RunnableThreads = null;
+            }
+            else {
+                // multiple threads in the RunnableThreads Q
+                thread.Previous.Next = thread.Next;
+                thread.Next.Previous = thread.Previous;
+                if (thread.AssociatedActivity.RunnableThreads == thread) {
+                    thread.AssociatedActivity.RunnableThreads = thread.Next;
+                }
+            }
+            thread.Next = thread.Previous = null;
+            return true;
+        }
+#endregion
+
+#region Additions according to kernel implementation
+
+        static bool ResetTimerTimeout(DateTime NewTimerTimeout)
+        {
+
+            DateTime timeNow = SchedulingTime;
+
+            if (timeNow > NewTimerTimeout) {
+                return false;
+            }
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            // Debug.Assert(CurrentThread()->GetState() == Thread.ThreadState.ThreadRunning);
+
+            Debug.Assert(NewTimerTimeout > SchedulingTime);
+            // Debug.Assert(SleepTimeout > SchedulingTime);
+
+            //TODO: Need LA_Time?
+            //            if (NewTimerTimeout > SleepTimeout - LA_Time)
+            //                NewTimerTimeout = SleepTimeout - LA_Time;
+            if (NewTimerTimeout > LaxityThread.GetSleepTimeout()) {
+                NewTimerTimeout = LaxityThread.GetSleepTimeout();
+            }
+
+            //DebugStub.Print("Setting Next Interrupt for: {0} ....\n",
+            //__arglist(NewTimerTimeout.Ticks));
+            bool success = SchedulerClock.SetNextInterrupt(NewTimerTimeout); //TODO: Perhaps only call this if the time changed.
+
+            //DebugStub.Print(success?"SUCCESS\n":"FAILED\n");
+
+            return success;
+        }
+
+        public static void UpdateSchedulingStatus()
+        {
+            TimeSpan timeRun;
+            LaxityThread currentThread = GetCurrentThread();
+
+            DateTime newSchedulingTime = SystemClock.GetKernelTime();
+
+            timeRun = newSchedulingTime - SchedulingTime;
+            LaxityProcessor processor = (LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor;
+            processor.SchedulingTime = newSchedulingTime;
+
+            if (Idle) {
+                // UpdateIdleTime
+                IdleTime += timeRun;
+                return;
+            }
+
+            // If IDLE compute CurrentPlanNode & set currentThread to null.
+            if (currentThread != null) {
+                // Unless thread just exited,
+                // Update Thread & Activity execution times.
+                currentThread.AddExecutionTime(timeRun);
+                Scheduler.CurrentTask().AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(timeRun));
+//                if (currentThread.AssociatedActivity != null) {
+//                    currentThread.AssociatedActivity.MyRecurringCpuReservation.EnclosingCpuReservation.AddTimeUsed(timeRun);
+//                }
+            }
+            if (OneShotReservation.CurrentReservation != null) {
+                // Slice used for a reservation.
+                OneShotReservation.CurrentReservation.Estimate -= timeRun;
+            }
+            else if (processor.CurrentActivity != null) {
+                // Slice used for round robin.
+                processor.SliceLeft -= timeRun;
+                processor.CurrentActivity = null;
+            }
+        }
+
+        internal static void CheckInvariants()
+        {
+            if (CircularActivityList != null) {
+                bool listNextFound = (CircularActivityList == NextActivity);
+                LaxityActivity start = CircularActivityList, current = CircularActivityList.Next, previous = CircularActivityList;
+                while (current != start) {
+                    //perhaps check thread invariants here too.
+                    Debug.Assert(current != null, "resource container list is not circular");
+                    Debug.Assert(current.Previous == previous, "back pointer doesn't match forward pointer");
+                    if (current == NextActivity) {
+                        listNextFound = true;
+                    }
+                    previous = current;
+                    current = current.Next;
+                }
+                Debug.Assert(listNextFound, "NextActivity isn't in the loop!");
+                Debug.Assert(current.Previous == previous, "Head doesn't point to tail");
+            }
+        }
+
+        // Always called when another thread needs to be scheduled.
+        static bool RescheduleInterrupt()
+        {
+            CheckInvariants();
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(!Processor.InterruptsDisabled());
+            LaxityThread currentThread = GetCurrentThread();
+            Debug.Assert(currentThread == null || currentThread.ActiveProcessor == GetCurrentProcessor());
+            if (currentThread != null) {
+                currentThread.ActiveProcessor = null;
+            }
+
+            DateTime        nextStart;
+            LaxityThread            previousThread;
+
+          RescheduleAgain: // !!!!!!!!!! SIM ONLY !!!!!!!!!
+            if (Idle) {
+                currentThread = null;
+            }
+
+            previousThread = currentThread;
+
+            UpdateSchedulingStatus();
+
+            //  if thread was the head of the runnable threads Q:
+            //  Advance the runnable threads Q.
+            if ((currentThread != null) &&
+                (currentThread.AssociatedActivity != null) &&
+                (currentThread.AssociatedActivity.RunnableThreads == currentThread)) {
+                currentThread.AssociatedActivity.RunnableThreads = currentThread.Next;
+                Debug.Assert(currentThread.AssociatedActivity.RunnableThreads != null);
+            }
+
+            OneShotReservation.UpdateCurrentReservation();
+            OneShotReservation.ClearCurrentReservation();
+            currentThread = null;
+
+            // Finished first stage, i.e. updated state.
+            // Start second stage: wakeup threads & select Next CPU slice.
+
+            LaxityThread.WakeThreads();
+
+            // NOTE: In the original Laxity Simulator Code (& MMOSA code)
+            // The call to DrainDeferredConditions() was made here.
+            // In Singularity, this will basically be replaced with a
+            // queue of wait-events to fix.
+
+            OneShotReservation.FreshenReservationQueues();
+
+            TimeSpan currentNodeSliceLeft;
+            LaxityProcessor currentProcessor = (LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor;
+            if (currentProcessor.CurrentActivity != null && currentProcessor.SliceLeft >= LaxityScheduler.MinSlice) {
+                currentThread = currentProcessor.CurrentActivity.GetRunnableThread();
+                if (currentThread != null) {
+                    goto exit;
+                }
+            }
+
+            // Find runnable one-shot reservation if any.
+            OneShotReservation.FindRunnableReservation(ref currentThread);
+            if (currentThread != null) {
+                goto exit;
+            }
+
+            // Find next runnable Activity.
+            currentProcessor.SliceLeft = LaxityScheduler.RobinSlice;
+            currentProcessor.CurrentActivity = NextActivity; // !!!!!!!!!!!!!SIM ONLY !!!!!!!!!!
+            while ((currentThread = NextActivity.GetRunnableThread()) == null) {
+                NextActivity = NextActivity.Next;
+                //currentProcessor.SliceLeft = LaxityScheduler.LaxitySlice;
+                if (NextActivity == currentProcessor.CurrentActivity) {
+                    // !!!!!!!!SIM ONLY !!!!!!!
+                    // in the real scheduler, execute halt
+                    if (OneShotReservation.IdleReservations != null) {
+                        // reuse nextStart
+                        nextStart = minTime(LaxityThread.GetSleepTimeout(), OneShotReservation.IdleReservations.Start);
+                    }
+                    else {
+                        nextStart = LaxityThread.GetSleepTimeout();
+                        DebugStub.Print("Idle, sleeping until {0} cf maxvalue {1}\n",
+                                        __arglist(nextStart.Ticks,
+                                                  DateTime.MaxValue.Ticks));
+                    }
+                    if (nextStart == DateTime.MaxValue) {
+                        Scheduler.StopSystem();
+                    }
+                    if (! ResetTimerTimeout(nextStart)) {
+                        //Error setting timer.  Try scheduling again.
+                        DebugStub.Print("Thought Idle, failed to set interrupt.\n");
+                        goto RescheduleAgain;
+                    }
+                    GetCurrentProcessor().Idle = true;
+
+                    // !!!!!!!!SIM ONLY !!!!!!!
+                    currentThread = null;           // !!!!!!!!SIM ONLY !!!!!!!
+                    OneShotReservation.ClearCurrentReservation();
+                    currentProcessor.CurrentActivity = null;
+
+                    if (DateTime.MaxValue != nextStart) {
+                        //Scheduler.LogTimeJump();
+                    }
+
+                    //DebugStub.Print("Halted.\n");
+                    IChangeCurrentThread(null);
+                    return true;            // !!!!!!!!SIM ONLY !!!!!!!
+                }
+                // !!!!!!!!SIM ONLY !!!!!!!
+            }
+            //DebugStub.Print("Running Round Robin Resource Container\n");
+            currentProcessor.CurrentActivity = NextActivity; // we probably need only one of the two variables
+            NextActivity = NextActivity.Next;
+
+          exit:
+            currentNodeSliceLeft = currentProcessor.SliceLeft;
+
+            Debug.Assert(currentThread != null);
+            if (currentThread != previousThread) {
+                Scheduler.LogContextSwitch(); // Context Switch statistics
+            }
+
+            if (OneShotReservation.IdleReservations != null) {
+                // reuse nextStart
+                nextStart = minTime(LaxityThread.GetSleepTimeout(), OneShotReservation.IdleReservations.Start);
+            }
+            else {
+                nextStart = LaxityThread.GetSleepTimeout();
+            }
+
+            if (SchedulingTime + currentNodeSliceLeft /* CurrentSlice */ > nextStart) {
+                currentNodeSliceLeft /* CurrentSlice */ = nextStart - currentProcessor.SchedulingTime;
+            }
+
+            Scheduler.LogReschedule();
+            if (!ResetTimerTimeout(currentProcessor.SchedulingTime + currentNodeSliceLeft) || Scheduler.TimerInterruptedFlag) {
+                //TODO: What do we REALLY want here?
+                currentThread = null;           // !!!!!!!!SIM ONLY !!!!!!!
+                OneShotReservation.ClearCurrentReservation();
+                currentProcessor.CurrentActivity = null;
+                goto RescheduleAgain;
+            }
+
+            Debug.Assert(currentThread.ActiveProcessor == null);
+            currentThread.ActiveProcessor = GetCurrentProcessor();
+            Debug.Assert(currentThread.ActiveProcessor != null);
+
+            if (currentThread != previousThread) {
+                IChangeCurrentThread(currentThread);
+            }
+            GetCurrentProcessor().Idle = false;
+
+            // Not necessarily true:  Debug.Assert(!Scheduler.TimerInterruptedFlag);
+            CheckInvariants();
+            return false;
+        }
+
+#endregion
+
+#region Laxity Changes
+
+
+#endregion
+
+#region Constraint feasibility analysis support functions
+        // Node can provide more than time than necessary between start and deadline; come shorter deadline:
+        // add a new pointer to a reservation to a node and clean the ordered array
+#endregion
+
+        public static void Reschedule()
+        {
+            ((LaxityProcessor)Processor.CurrentProcessor.SchedulerProcessor).Reschedule();
+        }
+
+        public static void ActivityObjAddRef(LaxityActivity activity)
+        {
+            activity.ReferenceCount++;
+        }
+
+
+        public static void ActivityObjRelease(LaxityActivity activity)
+        {
+            Debug.Assert(activity.ReferenceCount >= 1);
+            activity.ReleaseReference();
+        }
+
+        public static void ActivityReleaseProtected(LaxityActivity activity)
+        {
+            Debug.Assert(activity.ReferenceCount >= 1);
+            Debug.Assert(Processor.InterruptsDisabled(), "Interrupts Not Disabled!");
+            activity.ReleaseReference();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/LaxityThread.cs b/base/Kernel/Singularity/Scheduling/Laxity/LaxityThread.cs
new file mode 100644
index 0000000..965ab9d
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/LaxityThread.cs
@@ -0,0 +1,518 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LaxityThread.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// The kernel structure for the thread.  Contains an associated activity, a
+    /// stack of reservations executing the activity, a reference for a free
+    /// reservation (rather than allocating a new one all the time), a pending
+    /// reservation (used when new constraints are being created), a reference to the
+    /// thread it’s waiting on (for use in scheduling inheritance), the basic thread
+    /// queue and sleep queue pointers, lists of people waiting on mutexes and cv’s
+    /// owned by this thread, bookkeeping for the type of waiting that I’m doing, and
+    /// general bookkeeping.
+    /// </summary>
+    public class LaxityThread : ISchedulerThread
+    {
+        private static ListNode     SleepingThreads = null;             // list of sleeping threads
+        private static DateTime     SleepTimeout = DateTime.MaxValue;   // Next thread wakeup time
+
+        private TimeSpan     executionTime;
+        public override TimeSpan ExecutionTime
+        {
+            get { return executionTime; }
+        }
+
+        public LaxityActivity      AssociatedActivity;    // Thread Activity
+        //public LaxityThread.ThreadState       State;      // RUNNING, WAITING, SLEEPING
+
+        public OneShotReservation   ReservationStack;// Stack of Reservations, one per active Constraint
+        public OneShotReservation   FreeReservation;
+        public OneShotReservation   PendingReservation;     // PendingConstraint if any
+        // DI -- corresponds to MMID Tid
+        //TODO: Replace with TASK public int                Tid;        // Id to mark node reservations made for this Constraint Stack
+        // DI :: NOTE the Owner field in Kernel is used only for Inheritance control
+        //      need to REMOVE it -- this will help to locate easy all these functions and
+        //      comment them out
+        //public int                Epoch;       // inc-ed at every kernel unlock
+
+        public DateTime     StartTime;  // only while on the sleep Q
+
+        public LaxityThread         Next;       // Next and previous threads
+        public LaxityThread         Previous;
+
+        // DI -- maybe don't use it, see vtlb.c
+        // UINT QueueType;            // Type of queue thread is on, if any.
+
+        // DI -- ??!! this might replace Next and Previous from above
+        public ListNode Queue;            // List of threads in a queue.
+        // DI -- need it as a thread may wait on a condition (i.e. use Queue)
+        // and wait for the timeout (Condition_TimedWait)
+        public ListNode SleepQueue;       // Another queue link, for sleeping only.
+
+        public int  ReferenceCount;
+        public readonly Thread enclosingThread;
+
+        public LaxityProcessor ActiveProcessor; //Set only when running on processor -- no other processor may take the thread to run.
+
+        //public interface
+        public LaxityThread(Thread thread)
+        {
+            enclosingThread = thread;
+            Queue = new ListNode(this);
+            SleepQueue = new ListNode(this);
+            AssociatedActivity    = null;
+            StartTime  = new DateTime(0);
+            //TODO: BUGBUGBUG
+            //Tid = Id; REPLACE WITH DEFAULT TASK?
+            Queue.Next = Queue.Previous = Queue;
+            SleepQueue.Next = SleepQueue.Previous = SleepQueue;
+            //State = LaxityThread.ThreadState.ThreadWaiting;
+        }
+
+#region ISchedulerThread Members
+
+        public override Thread EnclosingThread
+        {
+            get { return enclosingThread; }
+        }
+
+        //public interface
+        public override void SetActivity(ISchedulerActivity iActivityNew)
+        {
+            DebugStub.Print("LaxityThread.SetActivity()\n");
+            Debug.Assert(iActivityNew != null);
+            Debug.Assert(iActivityNew is LaxityActivity);
+            Debug.Assert(((LaxityActivity)iActivityNew).ReferenceCount > 0);
+            LaxityActivity activityNew = (LaxityActivity)iActivityNew;
+            LaxityActivity activityOld = AssociatedActivity;
+
+
+            if (activityOld == activityNew)
+                return;
+
+            bool iflag = Processor.DisableInterrupts();
+
+            if (activityOld != null) {
+                //if (State != LaxityThread.ThreadState.ThreadWaiting)
+                if (enclosingThread.ThreadState == System.Threading.ThreadState.Running)
+                    LaxityScheduler.DequeueRunThread(this);
+                LaxityScheduler.ActivityReleaseProtected(activityOld);
+            }
+
+            if (activityNew != null) {
+                //if (State != LaxityThread.ThreadState.ThreadWaiting)
+                if (enclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+                    AssociatedActivity = activityNew;
+                    LaxityScheduler.EnqueueRunThread(this, false);
+                }
+                LaxityScheduler.ActivityObjAddRef(activityNew);
+            }
+            else if (this == LaxityScheduler.GetCurrentThread()) {
+                //TODO: Double Check! //State == LaxityThread.ThreadState.ThreadRunning)
+                if (this == LaxityScheduler.GetCurrentThread() && activityOld != null) {
+                    LaxityScheduler.UpdateSchedulingStatus();
+                }
+            }
+            AssociatedActivity = activityNew;
+            DebugStub.Print("Exiting LaxityThread.SetActivity()\n");
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public interface
+        public override void Start()
+        {
+            //TODO: No need for assertion perhaps -- default somehow?
+            Debug.Assert(AssociatedActivity != null);
+            bool iflag = Processor.DisableInterrupts();
+            IReady();
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public interface
+        public override void Cleanup()
+        {
+            OneShotReservation reservation;
+            DebugStub.Print("Cleaning LaxityThread\n");
+
+            SetStateWaiting(DateTime.MaxValue);
+            DebugStub.Print("At this point thread is dequeued.\n");
+
+            while ((reservation = ReservationStack) != null) {
+                ReservationStack = reservation.Next; // !!!! don't remove Caller's constraints !!!
+                reservation.DequeueReservation();
+            }
+
+            LaxityScheduler.ActivityObjRelease(AssociatedActivity);
+
+            //TODO: In the "real" system, cleanup is called by someone who will pick next thread, right?
+        }
+
+#endregion
+
+        public static DateTime GetSleepTimeout()
+        {
+            if (SleepingThreads != null) {
+                return SleepTimeout;
+            }
+            else {
+                return DateTime.MaxValue;
+            }
+        }
+
+        public void AddRef()
+        {
+            ReferenceCount++;
+        }
+
+        // DI -- instead of calling this, one should call ::ReleaseActivity
+        public void Release()
+        {
+            ReferenceCount--;
+            Debug.Assert(ReferenceCount >= 0);
+        }
+
+        public void ReleaseProtected()
+        {
+            ReferenceCount--;
+            Debug.Assert(ReferenceCount >= 0);
+        }
+
+        public override void SetStateWaiting(DateTime timeOut)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            InternalSetStateWaiting(timeOut);
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        public void InternalSetStateWaiting(DateTime timeOut)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            // DI -- don't need activity state update
+            //This to handle sleeps and timed waits.
+            if (timeOut != DateTime.MaxValue) {
+                if (timeOut - SystemClock.GetKernelTime() > LaxityScheduler.MinSlice) {
+                    Scheduler.LogSleepAdd();
+                    StartTime = timeOut;
+
+                    PutOnSleepQueue();
+                }
+                else {
+                    //Sleeping for less than MinSlice is treated as not sleeping/yield.
+                    if (PendingReservation != null) {
+                        ResolvePendingReservation();
+                    }
+                    return;
+                }
+            }
+
+            LaxityScheduler.DequeueRunThread(this); // from RunnableThreads
+        }
+
+
+        // DI -- this is the function in !LAXITY version
+        //TODO: REPLACE WITH ENCLOSING LOGIC!
+        //public void SetState(ThreadState newState)
+        //{
+        //    State = newState;
+        //    Debug.Assert(newState != ThreadState.ThreadWaiting);
+        //}
+
+        // DI -- safe
+        //TODO: REPLACE WITH ENCLOSING LOGIC!
+        void IReady()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            // TODO -- maybe something for directed context switch
+            // DI -- don't need PutThreadOnReadyQueue outside schedule.c
+            // PutThreadOnReadyQueue(thread);
+
+            LaxityScheduler.EnqueueRunThread(this, true);
+        }
+
+        // DI -- this is called only from PutThreadOnSleepQueue
+        // DI -- merge them ??
+        static ListNode InsertThreadOnSleepQueue(LaxityThread thread, ListNode listThreadHead)
+        {
+            LaxityThread threadHead, threadTail, tempThread;
+
+            if (listThreadHead == null) {
+                // Queue empty.
+                return thread.SleepQueue;
+            }
+
+            threadHead = GetThreadFromListNode(listThreadHead);
+            threadTail = GetThreadFromListNode(threadHead.SleepQueue.Previous);
+
+            if (thread.StartTime >= threadTail.StartTime) {
+                thread.SleepQueue.InsertIntoList(threadTail.SleepQueue);
+                // DI -- if merge: update SleepTimeout here
+                return threadHead.SleepQueue;
+            }
+
+
+            if (thread.StartTime < threadHead.StartTime) {
+                thread.SleepQueue.InsertIntoList(threadTail.SleepQueue);
+                return thread.SleepQueue;
+            }
+
+            tempThread = GetThreadFromListNode(threadHead.SleepQueue.Next);
+            for (;;) {
+                if (tempThread.StartTime > thread.StartTime) {
+                    thread.SleepQueue.InsertIntoList(tempThread.SleepQueue.Previous);
+                    break;
+                }
+                tempThread = GetThreadFromListNode(tempThread.SleepQueue.Next);
+            }
+
+            return threadHead.SleepQueue;
+        }
+
+        public void PutOnSleepQueue()
+        {
+            SleepingThreads = InsertThreadOnSleepQueue(this,SleepingThreads);
+            SleepTimeout = (GetThreadFromListNode(SleepingThreads)).StartTime;
+        }
+
+        //        public void Sleep(DateTime time)
+        //        {
+        //            if (time - SystemClock.GetKernelTime() > Node.MinSlice)
+        //            {
+        //
+        //                Scheduler.LogSleepAdd();
+        //                StartTime = time;
+        //
+        //                SetStateWaiting();
+        //
+        //                // DI -- need it, called from WaitCond also
+        //                PutOnSleepQueue();
+        //            }
+        //        }
+
+        // Di -- safe -- optimized
+        void PullThreadOffSleepQueue()
+        {
+            ListNode listThread, listNewHead;
+
+            listThread = SleepQueue;
+            listNewHead = listThread.ListRemove();
+
+            if (SleepingThreads == listThread) {
+                if ((SleepingThreads = listNewHead) != null) {
+                    SleepTimeout =(GetThreadFromListNode(SleepingThreads)).StartTime;
+                }
+                else {
+                    SleepTimeout = DateTime.MaxValue;
+                }
+            }
+        }
+
+        private void ResolvePendingReservation()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(PendingReservation != null);
+            bool admitted = OneShotReservation.ResolveConstraint(this);
+            if (ReservationStack.EnclosingTask != null) {
+                // Not clear if this will work in real system or not.  Here for simulator mainly.
+                ReservationStack.EnclosingTask.UpdateSchedulingState(admitted, ReservationStack.Deadline, ReservationStack.ResourcesGranted);
+            }
+        }
+
+        // DI -- safe
+        public override void Wake()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            PullThreadOffSleepQueue();
+            IReady();
+
+            if (PendingReservation != null) {
+                ResolvePendingReservation();
+            }
+
+            Processor.RestoreInterrupts(iflag);
+        }
+
+
+        OneShotReservation AllocationReservation()
+        {
+            OneShotReservation reservation = FreeReservation;
+
+            Debug.Assert(reservation != null);
+            FreeReservation = null;
+            reservation.Clear();
+            return reservation;
+        }
+
+
+        public void IpcCheckFreeConstraint()
+        {
+            if (FreeReservation == null) {
+                OneShotReservation reservation;
+
+                reservation = LaxityScheduler.IpcAllocateReservation();
+
+                if (reservation == null) {
+                    reservation = LaxityScheduler.AllocateReservation();
+                }
+
+                FreeReservation = reservation;
+            }
+        }
+
+        // If this thread doesn't have a free OneShotReservation reserved
+        // for its use, then try to grab one from the global free list.
+        // If there aren't any there, then allocate a new one.
+        void ICheckFreeConstraint()
+        {
+            if (FreeReservation == null) {
+                FreeReservation = LaxityScheduler.AllocateReservation();
+            }
+        }
+
+
+        // Free the Reservations associated with a thread.
+        // Used by thread cleanup.
+        public void IFreeConstraints()
+        {
+            OneShotReservation reservation;
+
+            //  Debug.Assert(!Processor.InterruptsDisabled());
+
+            if (FreeReservation != null) {
+                LaxityScheduler.IpcFreeReservation(FreeReservation);
+            }
+            while ((reservation = ReservationStack) != null) {
+                ReservationStack = reservation.SurroundingReservation;
+                LaxityScheduler.ReleaseReservation(reservation);
+            }
+        }
+
+        // DI -- safe but optimize to  because don't need QueueType
+        public ListNode Dequeue()
+        {
+            return Queue.ListRemove();
+        }
+
+        public static ListNode QueueFifo(LaxityThread thread, ListNode threadHead)
+        {
+            if (threadHead != null) {
+                thread.Queue.InsertIntoList(threadHead.Previous);
+            }
+            else {
+                threadHead = thread.Queue;
+            }
+            return threadHead;
+        }
+
+        // DI -- safe
+        public static LaxityThread GetThreadFromListNode(ListNode listNode)
+        {
+            Debug.Assert(listNode == null || listNode.Data is LaxityThread);
+            if (listNode == null) {
+                return null;
+            }
+            if (listNode.Data is LaxityThread) {
+                return (LaxityThread)listNode.Data;
+            }
+            else {
+                return null;
+            }
+        }
+
+        public static void WakeThreads()
+        {
+            LaxityThread    ptemp;
+            Debug.Assert(Processor.InterruptsDisabled());
+            while ((ptemp = LaxityThread.GetThreadFromListNode(SleepingThreads)) != null &&
+                  ptemp.StartTime < LaxityScheduler.SchedulingTime + LaxityScheduler.LA_Time) {
+                //TODO: LA_Time here?
+                SleepingThreads = SleepingThreads.ListRemove();
+
+                ptemp.IReady();
+
+                if (ptemp.PendingReservation != null) {
+                    ptemp.ResolvePendingReservation();
+                }
+                Scheduler.LogWakeThread(ptemp.EnclosingThread);
+            }
+
+            if (ptemp != null) {
+                SleepTimeout = ptemp.StartTime;
+            }
+            else {
+                SleepTimeout = DateTime.MaxValue;
+            }
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="thread"></param>
+        /// <param name="EndPrevious"></param>
+        /// <param name="timeConstraint"></param>
+        /// <param name="timeNow">TODO: UNUSED</param>
+        /// <returns></returns>
+        public bool BeginConstraintBeforeWaitValidate(bool endPrevious,
+                                                      ref TimeConstraint timeConstraint,
+                                                      DateTime timeNow)
+        {
+            if (endPrevious &&      // check to have a valid constraint in the stack.
+                (ReservationStack == null || ReservationStack.OriginalThread == null)) {
+                return false;
+            }
+
+            if (timeConstraint.Estimate.Ticks < 0) {
+                return false;
+            }
+
+            // By this time, something should be in FreeReservation
+            //  grab it now such to enable the EndPreviousConstraint to
+            //  save its reservation in the cache
+            Debug.Assert(FreeReservation != null);
+            Debug.Assert(FreeReservation != OneShotReservation.CurrentReservation);
+
+            PendingReservation = AllocationReservation();
+
+            return true;
+        }
+
+        public void AddExecutionTime(TimeSpan delta)
+        {
+            executionTime += delta;
+        }
+
+        public override ISchedulerTask PrepareDelayedTask(ISchedulerTask taskToEnd,
+                                                          ref TimeConstraint timeConstraint,
+                                                          DateTime timeNow)
+        {
+            // DI -- the Next calls are from TimedWaitAndBeginConstraint
+            IpcCheckFreeConstraint();
+
+            Debug.Assert(taskToEnd == null || taskToEnd == ReservationStack);
+            bool endPrevious = (taskToEnd != null);
+
+            if (!BeginConstraintBeforeWaitValidate(endPrevious, ref timeConstraint, timeNow)) {
+                goto Exit;
+            }
+            OneShotReservation.BeginConstraintBeforeWait(this, endPrevious, timeConstraint, timeNow);
+          Exit:
+            return PendingReservation;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/OneShotReservation.cs b/base/Kernel/Singularity/Scheduling/Laxity/OneShotReservation.cs
new file mode 100644
index 0000000..8a14c24
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/OneShotReservation.cs
@@ -0,0 +1,768 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   OneShotReservation.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// OneShotReservations are created from tasks for the calling thread.
+    /// It has fields to track the thread calling and the thread waiting on,
+    /// the activity associated when it becomes an activity reservation, its
+    /// surrounding reservation, its place on the free reservation list,
+    /// general bookkeeping, bookkeeping for possible stolen time, and
+    /// references for the general reservation list.
+    /// </summary>
+    public class OneShotReservation : ISchedulerTask
+    {
+        // override the global LaxityQueueType enum with our own
+        public enum LaxityQueueType
+        {
+            NoQueue = 5,
+            GuaranteedQueue = 1,
+            // NonGuaranteedQueue = 2,
+            IdleQueue = 3,
+            // UnfinishedQueue = 4
+        };
+
+        // heap keyed on laxity holding all guaranteed one-shot reservations
+        // that currently have at least one runnable thread.
+        private static Heap  guaranteedReservations = new Heap();
+        public static OneShotReservation TopGuaranteedReservation
+        {
+            get { return (OneShotReservation)guaranteedReservations.Min; }
+        }
+
+        static OneShotReservation  idleReservations = null;
+        public static OneShotReservation IdleReservations
+        {
+            get { return idleReservations; }
+        }
+
+        static OneShotReservation  currentReservation = null;
+        public static OneShotReservation CurrentReservation
+        {
+            get { return currentReservation; }
+            //set { currentReservation = value; }
+        }
+
+        public Hashtable resourcesGranted = new Hashtable();
+        public override Hashtable ResourcesGranted
+        {
+            get
+            {
+                resourcesGranted[CpuResource.Provider().ResourceString] = CpuResource.Provider().TimeToCpu(InitialEstimate);
+                return resourcesGranted;
+            }
+        }
+
+
+        private Task enclosingTask;
+        public override Task EnclosingTask
+        {
+            get { return enclosingTask; }
+            set { enclosingTask = value; }
+        }
+
+        public OneShotReservation      SurroundingReservation;
+        public OneShotReservation      FreeListNext;
+        public LaxityThread             ReservTask;
+
+        TimeSpan     constraintExecution;
+        public TimeSpan ConstraintExecution
+        {
+            get { return constraintExecution; }
+        }
+
+        TimeSpan     initialThreadExecution;
+
+        public DateTime Start, Deadline;
+        public TimeSpan Estimate, RelativeDeadline;
+
+        public DateTime Laxity
+        {
+            // dnarayan
+            // 1. This is actually (laxity + timeNow). It has the same effect as laxity
+            // for comparing across tasks at any given instant, and the additional
+            // advantage that it doesn't change over time, only when resources are consumed.
+            // Another invariant is that with this definition, "laxity" of an individual task
+            // never increases.
+
+            // 2. The assumption is that Estimate always holds (in time units) the total
+            // remaining amount of resource (i.e. reserved - used). Currently this is just
+            // the CPU-remaining estimate
+
+            // 3. If we use more than our allocation, our laxity starts increasing, i.e.
+            // we get punished. This is a feature. However, it's still possible that we
+            // have overused one resource but have low laxity due to being behind on another.
+            // We might want to punish tasks for that as well?
+
+            get { return Deadline - Estimate; }
+        }
+
+        public TimeSpan     InitialEstimate; // test only
+        public LaxityQueueType  MyLaxityQueueType;
+        public bool         Guaranteed;
+        public bool         Valid;
+        public bool         Satisfied;
+
+        // Reservations can be made for Threads XOR Activities!
+        public LaxityThread         OriginalThread; // always the constraint thread -- non-null until the reservation is complete
+        //public LaxityThread           ActiveThread;   // the above, or the thread blocking it
+        //public int                ActiveThreadEpoch;
+        public LaxityActivity      AssociatedActivity;        // the two fields above must be null!
+
+
+        public OneShotReservation      Next;
+        public OneShotReservation      Previous;
+
+        public TimeSpan     InheritedEstimate;  // Stolen => Inherited, no longer critical
+        public int          ResolutionEpoch;    // Stolen => Resolution, since not stealing.
+
+        public int              ReferenceCount;
+
+        public OneShotReservation()
+        {
+        }
+
+        public void Clear()
+        {
+            //ActiveThread = null;
+            //ActiveThreadEpoch = 0;
+            constraintExecution = new TimeSpan(0); //Move to enclosing class
+            initialThreadExecution = new TimeSpan(0); //Move to enclosing class
+            Deadline = new DateTime(0);
+            RelativeDeadline = new TimeSpan(0);
+            Estimate = new TimeSpan(0);
+            FreeListNext = null;
+            Guaranteed = false;
+            InitialEstimate = new TimeSpan(0);
+            Next = null;
+            OriginalThread = null;
+            AssociatedActivity = null;
+            Previous = null;
+            MyLaxityQueueType = LaxityQueueType.NoQueue;
+            ReferenceCount = 0;
+            ReservTask = null;
+            Satisfied = false;
+            Start = new DateTime(0);
+            SurroundingReservation = null;
+            ResolutionEpoch = 0;
+            InheritedEstimate = new TimeSpan(0);
+            Valid = false;
+            if (enclosingTask != null) {
+                enclosingTask.ClearSchedulerTask();
+                enclosingTask = null;
+            }
+
+        }
+
+        // find the runnable thread of a reservation:
+        public LaxityThread GetRunnableThread()
+        {
+//            LaxityThread thread;
+//
+            if (AssociatedActivity != null) {
+                // if an activity reservation
+                return AssociatedActivity.GetRunnableThread();
+            }
+
+            Debug.Assert(OriginalThread != null);
+
+//            if (  (ActiveThread == OriginalThread) &&
+//                (ActiveThread.EnclosingThread.ThreadState == System.Threading.ThreadState.Running))
+//                return ActiveThread;
+//
+//            thread = OriginalThread; // search for active thread starting w/ original thread
+//
+//            if ((ActiveThread != null) &&
+//                (ActiveThread.Epoch == ActiveThreadEpoch) ) {
+//                if (ActiveThread.EnclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+//#if DEBUG_MUTEX
+//                  DebugStub.WriteLine("Mutex inheritance (Epoch ok): Orig {0} Active {1} GO ON",
+//                      thread.Id, ActiveThread.Id);
+//#endif
+//                    return ActiveThread;
+//                }
+//            }
+            //CKillian -- can't do this because of the array of blockedOn.
+            //    else if (ActiveThread.EnclosingThread.IsSleeping()) {
+            //        // more efficient: search for active thread starting w/ current active thread
+            //        thread = ActiveThread;
+            //    }
+            //    else {
+            //        Debug.Assert(false);
+            //    }
+            //}
+
+            //A "smarter" thing to do would be to have GetRunnableBeneficiary check for
+            //      the ActiveProcessor case.  But as it stands that's info in the scheduler only
+            //      the "good" news is that if we return null based on the active processor case
+            //      we at least know someone is current running on a processor who would inherit
+            //      time from us.
+            Thread temp = /*Active*/OriginalThread.EnclosingThread.GetRunnableBeneficiary();
+            if (temp == null || ((LaxityThread)temp.SchedulerThread).ActiveProcessor != null) {
+                return null;
+            }
+            else {
+                return (LaxityThread)temp.SchedulerThread;
+            }
+        }
+
+        public void StopThreadExecution(LaxityThread thread)
+        {
+            Debug.Assert(thread.ExecutionTime >= initialThreadExecution);
+            constraintExecution += thread.ExecutionTime - initialThreadExecution;
+            //Between two reservations which are atomically stopped/started, some
+            //      time is charged against the default parent resource container.  This
+            //      is because I changed the way we account for tasks to do the general
+            //      rule we wanted.  In particular, I update the scheduling status just
+            //      before resolving a new reservation.  Not sure what the right fix is,
+            //      so I'm leaving it.  The assertion below will reveal the "error."  The
+            //      old code to track CPU usage is still active under constraintExecution,
+            //      but isn't presently exposed to the applications.  Currently UpdateSchedulingStatus()
+            //      updates the CPU resources used for the whole task stack.
+            //Debug.Assert(CpuResource.Provider().TimeToCpu(constraintExecution).Cycles == ((CpuResourceAmount)enclosingTask.resourcesUsed[CpuResource.Provider().ResourceString]).Cycles);
+            //EnclosingTask.AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(constraintExecution));
+        }
+
+        public void StartThreadExecution(LaxityThread thread)
+        {
+            initialThreadExecution = thread.ExecutionTime;
+        }
+
+        public void StartThreadExecution(LaxityThread thread, TimeSpan delta)
+        {
+            initialThreadExecution = thread.ExecutionTime + delta;
+        }
+
+        public static void BeginConstraintBeforeWait(LaxityThread thread, bool endPrevious,
+            TimeConstraint timeConstraint, DateTime timeNow)
+        {
+            OneShotReservation reservation;
+
+            Debug.Assert(thread == LaxityScheduler.GetCurrentThread());
+            Debug.Assert(!Processor.InterruptsDisabled());
+            if (endPrevious) {
+                bool iflag = Processor.DisableInterrupts();
+                EndPreviousConstraint(thread, timeNow);
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            LaxityScheduler.UpdateSchedulingStatus();
+
+            reservation = thread.PendingReservation;
+
+            reservation.StartThreadExecution(thread, (timeNow - LaxityScheduler.SchedulingTime));
+            reservation.constraintExecution = new TimeSpan(0);
+            reservation.Start = timeConstraint.Start;
+            reservation.Deadline = timeConstraint.Deadline;
+            reservation.RelativeDeadline = timeConstraint.RelativeDeadline;
+            reservation.Estimate = timeConstraint.Estimate;
+            reservation.Valid = reservation.Guaranteed = true;
+            reservation.MyLaxityQueueType = LaxityQueueType.NoQueue;
+            reservation.ReservTask = thread;
+            reservation.OriginalThread = /*reservation.ActiveThread =*/ thread;
+            thread.AddRef();
+            //thread.AddRef();
+            //reservation.ActiveThreadEpoch = thread.Epoch;
+            reservation.AssociatedActivity = null;
+            reservation.Next = reservation.Previous = null;
+
+        }
+
+        // DI -- this is a new function used in both Begin and EndConstraint
+        public static bool EndPreviousConstraint(LaxityThread thread, DateTime timeNow)
+        {
+            OneShotReservation reservation, reservationNext;
+            bool            success;
+            LaxityQueueType     tempQueue; //Value assigned but never used.
+
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            reservation = thread.ReservationStack;
+
+            success = (timeNow <= reservation.Deadline);
+            LaxityScheduler.UpdateSchedulingStatus();
+            reservation.StopThreadExecution(thread);
+
+            Debug.Assert(reservation.ConstraintExecution.Ticks >= 0);
+//            if (timeTaken.Ticks != 0) {
+//                timeTaken = reservation.ConstraintExecution;
+//                Debug.Assert( timeTaken.Ticks >= 0);
+//            }
+
+            thread.ReservationStack = reservation.SurroundingReservation;
+            reservation.SurroundingReservation = null;
+
+            if (currentReservation == reservation) {
+                // note that it might be the case that
+                // a reservation for the task id exist on the guaranteed Q but the
+                // the actual (executed) constraint is in the UnfinishedQ
+                currentReservation = null; // ????????????
+                LaxityScheduler.Reschedule();
+            }
+            Debug.Assert(reservation.OriginalThread == thread);
+            Debug.Assert(reservation.Start <= timeNow);
+
+            if (thread.ReservationStack == null) {
+                if (reservation.Estimate >= LaxityScheduler.MinSlice) {
+                    // the constraint used less than estimated:
+                    Debug.Assert(reservation.MyLaxityQueueType == LaxityQueueType.GuaranteedQueue);
+#if false
+                    Debug.Assert((reservation.ActiveThread == null) ||
+                                 (reservation.ActiveThread.Epoch != reservation.ActiveThreadEpoch) ||
+                                 (reservation.ActiveThread == reservation.OriginalThread));
+                    reservation.ActiveThread.ReleaseProtected();
+#endif
+                    reservation.OriginalThread.ReleaseProtected();
+                    reservation.AssociatedActivity = reservation.OriginalThread.AssociatedActivity; // and make it an activity reserv
+                    reservation.OriginalThread = null;
+                    //reservation.ActiveThread = null;
+                    reservation.ReservTask = null;
+                    LaxityScheduler.ActivityObjAddRef(reservation.AssociatedActivity);
+                    // leave it on whatever Q it happens to be on
+                }
+                else {
+                    reservation.DequeueReservation(); // from whatever Q it happens to be on
+                }
+            }
+            else {
+                tempQueue = reservation.MyLaxityQueueType;
+                reservationNext = thread.ReservationStack;
+                reservationNext.Estimate += reservation.Estimate;
+                reservationNext.constraintExecution += reservation.constraintExecution;
+                reservationNext.StartThreadExecution(thread);
+//                Debug.Assert( ((reservation.MyLaxityQueueType == LaxityQueueType.GuaranteedQueue) &&
+//                    (reservationNext.MyLaxityQueueType == LaxityQueueType.NoQueue)) ||
+//                    ((reservation.MyLaxityQueueType == LaxityQueueType.UnfinishedQueue) &&
+//                    ((reservationNext.Estimate.Ticks <= 0) || (reservationNext.MyLaxityQueueType != LaxityQueueType.UnfinishedQueue ))));
+                reservation.Estimate = new TimeSpan(0);
+                Debug.Assert(reservation.Next != null);
+                reservation.DequeueReservation();
+                ReplaceOnLaxityHeap(reservationNext, timeNow);
+
+            }
+            // fprintf(stdout,"EndPrevConstr 0x%x %d\n", reservation, reservation.ReferenceCount);
+            reservation.ReleaseReservationProtected();
+
+            Scheduler.LogEndConstraint();
+
+            if (success == false) {
+                Scheduler.LogSchedulerLate();
+            }
+            return success;
+        }
+
+
+        public static bool ResolveConstraint(LaxityThread thread)
+        {
+            TimeSpan timeLeft, ownNodesTimeToSteal = new TimeSpan(1);
+            DateTime start, deadline;
+            TimeSpan timeInherited;
+            OneShotReservation pendingReservation = thread.PendingReservation, reservationPrevious;
+            DateTime timeNow = SystemClock.GetKernelTime();
+            bool ok = false;
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(pendingReservation != null);
+
+            Scheduler.LogResolveConstraint();
+
+            thread.PendingReservation = null;   // just clean the place
+
+            Debug.Assert(pendingReservation.Start.Ticks >= 0);
+            start = pendingReservation.Start;
+            if (start < timeNow) {
+                start = timeNow;
+            }
+            Debug.Assert(pendingReservation.Deadline.Ticks >= 0);
+            deadline = pendingReservation.Deadline;
+            if (deadline.Ticks == 0) {
+                deadline = timeNow + pendingReservation.RelativeDeadline;
+            }
+
+            if (thread.ReservationStack != null) {
+                OneShotReservation reservation = thread.ReservationStack;
+                while (!reservation.Valid && ((reservation = reservation.SurroundingReservation)!= null)) {
+                    // no body.
+                }
+
+                if (reservation!= null) {
+                    deadline = LaxityScheduler.minTime(deadline, reservation.Deadline);
+                }
+            }
+
+            // update data ure
+            pendingReservation.Start = start;
+            pendingReservation.Deadline = deadline;
+            //TODO: Should be for SIM ONLY!
+            Scheduler.LogReservationId(pendingReservation);           // SIM only
+            timeInherited = new TimeSpan(0);
+            timeLeft = new TimeSpan(0);
+            ok = true;
+            pendingReservation.InitialEstimate = pendingReservation.Estimate;
+            reservationPrevious = thread.ReservationStack;
+            pendingReservation.SurroundingReservation= thread.ReservationStack;
+            thread.ReservationStack = pendingReservation;
+            LaxityScheduler.AddRefReservation(pendingReservation);
+            if (reservationPrevious != null) {
+                reservationPrevious.constraintExecution += pendingReservation.initialThreadExecution -
+                    reservationPrevious.initialThreadExecution;
+            }
+            //
+            // Reschedule()  called if currently we are executing on a pendingReservation
+            //                              and the EarliestDeadlineFirst top changed
+            //              or   the current pendingReservation goes into the idle list
+            //                  solve in SetStateWaiting
+            //
+            pendingReservation.EnqueueReservation(timeNow);
+
+            return ok;
+        }
+
+        void EnqueueReservation(DateTime timeNow)
+        {
+            OneShotReservation temp;
+
+            Debug.Assert((AssociatedActivity != null) ||
+                (OriginalThread != null));
+
+            // dnarayan: for simplicity, we schedule all tasks using global
+            // least-laxity, nothing out of individual resource containers.
+#if false
+            // Infeasible or (Estimate == 0) Reservations:
+            if (Estimate <= LaxityScheduler.AFewSlice) {
+                LaxityActivity activity;
+                Debug.Assert(OriginalThread != null);
+                Debug.Assert(AssociatedActivity == null);
+                activity = OriginalThread.AssociatedActivity;
+                MyLaxityQueueType = LaxityQueueType.UnfinishedQueue;
+                if (activity.UnfinishedConstraints == null) {
+                    Next = Previous = this;
+                    activity.UnfinishedConstraints = this;
+                }
+                else {
+                    // no order enforced
+                    Next = activity.UnfinishedConstraints;
+                    Previous = activity.UnfinishedConstraints.Previous;
+                    activity.UnfinishedConstraints.Previous.Next = this;
+                    activity.UnfinishedConstraints.Previous = this;
+                    activity.UnfinishedConstraints = this; // optional
+                }
+                //  DebugStub.WriteLine("Add: EnqueueReserve  1 0x{0:x} {1}", this, ReferenceCount);
+                LaxityScheduler.AddRefReservation(this);
+                return;
+            }
+            //  Debug.Assert(Valid);
+#endif
+            // Idle Reservations:
+            if (Start > timeNow + LaxityScheduler.AFewSlice) {
+                // take thread off activity Laxity queue and simulate a sleep
+                //    i.e. don't set a timer interrupt
+
+                OriginalThread.InternalSetStateWaiting(DateTime.MaxValue);
+
+#if DEBUG_START_RESERV
+                DebugStub.WriteLine("Put reservation {0}:{1} in IdleQueue\n", OriginalThread,
+                    ReservationId);
+#endif
+                Debug.Assert(OriginalThread != null);
+                MyLaxityQueueType = LaxityQueueType.IdleQueue;
+
+                if (idleReservations == null) {
+                    Next = Previous = this;
+                    idleReservations = this;
+                }
+                else {
+                    temp = idleReservations;
+                    if (Start < temp.Start) {
+                        idleReservations = this;
+                    }
+                    else {
+                        do {
+                            temp = temp.Next;
+                        } while (temp != idleReservations &&
+                                 Start >= temp.Start); // >= is compulsory to keep it 'FIFO'
+                    } // insert before 'temp'
+                    Next = temp;
+                    Previous = temp.Previous;
+                    temp.Previous.Next = this;
+                    temp.Previous = this;
+                }
+                //  fprintf(stdout,"Add: EnqueueReserve  2 0x%x %d\n", this, ReferenceCount);
+                LaxityScheduler.AddRefReservation(this);
+                return;
+            }
+
+            // Guaranteed OneShotReservation:
+            MyLaxityQueueType = LaxityQueueType.GuaranteedQueue;
+            if (GetRunnableThread() != null) {
+                Debug.Assert(guaranteedReservations.Insert(this, Laxity));
+            }
+
+            LaxityScheduler.AddRefReservation(this);
+#if DEBUG_RESERV
+            PrintQueueReserv(guaranteedReservations, timeNow); //TODO: PrintQueueReserv
+#endif
+            return;
+        }
+
+        // XXX dnarayan this is a replacement for ReplaceOnEarliestDeadlineFirst, but I
+        // don't really understand what it's supposed to do, so for now it does nothing (!)
+
+        static void ReplaceOnLaxityHeap(OneShotReservation reservation, DateTime timeNow)
+        {
+#if false
+            while (reservation != null) {
+                if (reservation.Estimate.Ticks > 0) {
+                    if (reservation.MyLaxityQueueType == LaxityQueueType.NoQueue) {
+                        reservation.EnqueueReservation(timeNow);
+                    }
+                    else {
+                        Debug.Assert(reservation.MyLaxityQueueType == LaxityQueueType.GuaranteedQueue);
+                    }
+                    break;
+                }
+                Debug.Assert(reservation.MyLaxityQueueType == LaxityQueueType.NoQueue);
+                reservation.EnqueueReservation(timeNow);
+
+                reservation = reservation.SurroundingReservation;
+            }
+#endif
+        }
+
+#if false
+        public static bool SatisfyAcceptedConstraint(DateTime timeNow)
+        {
+            OneShotReservation    reservation;
+
+            if (currentReservation != null) {
+                currentReservation.Estimate -= timeNow - LaxityScheduler.SchedulingTime;
+                if (currentReservation.Estimate.Ticks <= 0) {
+                    LaxityThread tempThread  = currentReservation.OriginalThread;
+                    currentReservation.DequeueReservation();
+                    if (tempThread != null) {
+                        // activity reservations vanish here
+                        //Debug.Assert(currentReservation.ActiveThread == LaxityScheduler.GetCurrentThread()); // only thread reserv are added to
+                        currentReservation.EnqueueReservation(LaxityScheduler.SchedulingTime); // the UnfinishedConstraints list of the OriginalThread's Activ
+                        OneShotReservation.ReplaceOnEarliestDeadlineFirst(currentReservation.SurroundingReservation, LaxityScheduler.SchedulingTime);
+                    }
+                }
+            }
+
+            reservation = guaranteedReservations;
+            while (reservation != null) {
+                reservation = reservation.Next;
+                if (reservation == guaranteedReservations) {
+                    break;
+                }
+            }
+            reservation = idleReservations;
+            while (reservation != null) {
+                reservation = reservation.Next;
+                if (reservation == idleReservations) {
+                    break;
+                }
+            }
+            return true;
+        }
+#endif
+
+        public static void UpdateCurrentReservation()
+        {
+            if ((currentReservation != null) &&
+                (currentReservation.Estimate <= LaxityScheduler.AFewSlice) ) {
+                // slice used for a reservation (CK: & estimate now empty )
+                LaxityThread tempThread  = currentReservation.OriginalThread;
+                currentReservation.DequeueReservation();
+                if (tempThread != null) {
+                    // activity reservations vanish here
+                    currentReservation.EnqueueReservation(LaxityScheduler.SchedulingTime); // the UnfinishedConstraints list of the OriginalThread's Activ
+                    ReplaceOnLaxityHeap(currentReservation.SurroundingReservation, LaxityScheduler.SchedulingTime);
+                }
+            }
+
+        }
+
+        public static void FreshenReservationQueues()
+        {
+            OneShotReservation tempReservation;
+
+            //  Move 'idle' reservations to the 'active' reservations list, if necessary.
+            //  A reservation is 'idle' until its Start time is reached.
+            //  The 'active' reservation list is ordered 'Earliest Deadline Firts'.
+            //  The 'idle' queue is ordered Earliest Start First.
+            while ((tempReservation = IdleReservations) != null) {
+                if (LaxityScheduler.SchedulingTime + LaxityScheduler.AFewSlice < tempReservation.Start) {
+                    break;
+                }
+                tempReservation.DequeueReservation(); // Remove OneShotReservation from the Idle Queue
+                tempReservation.EnqueueReservation(LaxityScheduler.SchedulingTime); // Earliest Deadline First in the (Non)Guaranteed Queue
+                LaxityScheduler.EnqueueRunThread(tempReservation.OriginalThread, true);
+#if DEBUG_START_RESERV
+                DebugStub.WriteLine("Get reservation {0}:{1} from IdleQueue", tempReservation.OriginalThread,
+                    tempReservation.ReservationId);
+#endif
+
+            }
+
+            // dnarayan: we don't remove deadline-passed tasks from the guaranteed queue,
+            // however they should get penalized by having increasing laxity. We might want
+            // to reconsider this decision.
+#if false
+            // Remove the active reservations from the guaranteed and nonguaranteed queues
+            // if their Deadline is <= CurrentTime.
+            while ((tempReservation = guaranteedReservations) != null) {
+                if (LaxityScheduler.SchedulingTime + LaxityScheduler.AFewSlice < tempReservation.Deadline) {
+                    break;
+                }
+                //      fprintf(stdout,"Add: Reschedule Guaranteed Deadline 0x%x %d\n", tempReservation, tempReservation.ReferenceCount);
+                LaxityScheduler.AddRefReservation(tempReservation);
+                tempReservation.DequeueReservation(); // Remove OneShotReservation from the Guaranteed Queue
+                if ((tempReservation.OriginalThread != null) && // if a thread reservation
+                    (tempReservation.OriginalThread.AssociatedActivity != null)) {
+                    // If a thread reservation.
+                    tempReservation.Estimate = new TimeSpan(0);
+                    tempReservation.EnqueueReservation(LaxityScheduler.SchedulingTime); // add it to the Pending End Constraint List
+                }
+                //  fprintf(stdout,"Reschedule Guaranteed Deadline off 0x%x %d\n", tempReservation, tempReservation.ReferenceCount);
+                tempReservation.ReleaseReservationProtected();
+            }
+#endif
+        }
+
+        int ReleaseReservationProtected()
+        {
+            return LaxityScheduler.ReleaseReservationProtected(this);
+        }
+
+        public void DequeueReservation() //TODO: Should this be a resource container function?
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert((AssociatedActivity != null) ||
+                (OriginalThread != null));
+
+            if (MyLaxityQueueType == LaxityQueueType.GuaranteedQueue) {
+                Debug.Assert(guaranteedReservations.Delete(this));
+            }
+            else {
+                Debug.Assert(MyLaxityQueueType == LaxityQueueType.IdleQueue);
+
+                if (Next != this) {
+                    //If there's another reservation, remove us from the queue
+                    Next.Previous = Previous;
+                    Previous.Next = Next;
+                    Debug.Assert(Next.Deadline.Ticks > 0);
+                }
+                else {
+                    //Otherwise we are only reservation.
+                    Debug.Assert(Previous == this);
+                    Next = null;
+                }
+
+                if (this == IdleReservations) {
+                    // if we were head of the queue
+                    idleReservations = Next;
+                }
+
+                Next = Previous = null;
+                //  DebugStub.WriteLine("DequeueReservation 0x{0:x} {1}", this, ReferenceCount);
+                MyLaxityQueueType = LaxityQueueType.NoQueue;
+                ReleaseReservationProtected();
+            }
+        }
+
+        public static void FindRunnableReservation(ref LaxityThread currentThread)
+        {
+            // dnarayan: this is a bit hokey. What we really want is to maintain the
+            // invariant that the heap only contains tasks with runnable threads. However
+            // this involves hooking all the places where threads get added/removed as
+            // task beneficiaries.
+
+            ArrayList nonRunnableTasks = new ArrayList();
+            currentThread = null;
+            while (((currentReservation = (OneShotReservation) guaranteedReservations.Min)
+                    != null) && (currentThread == null)) {
+                currentThread = currentReservation.GetRunnableThread();
+                if (currentThread == null) {
+                    Debug.Assert(guaranteedReservations.Delete(currentReservation));
+                    nonRunnableTasks.Add(currentReservation);
+                }
+            }
+
+            // Now put all the non-runnable tasks back in the heap (!)
+            foreach (OneShotReservation resv in nonRunnableTasks) {
+                Debug.Assert(guaranteedReservations.Insert(resv, resv.Laxity));
+            }
+        }
+
+        // dnarayan: never called
+#if false
+        public static void InheritAndReplaceOnEarliestDeadlineFirst(OneShotReservation reservation,
+                                                                    TimeSpan timeInherited,
+                                                                    DateTime timeNow)
+        {
+            OneShotReservation current = null;
+
+            while (reservation != null) {
+                if (reservation.Estimate.Ticks > 0) {
+                    if (current == null) {
+                        Debug.Assert(reservation.MyLaxityQueueType != LaxityQueueType.NoQueue);
+                        current = reservation;
+                    }
+                    else {
+                        Debug.Assert(reservation.MyLaxityQueueType == LaxityQueueType.NoQueue);
+                    }
+                }
+                else if (reservation.MyLaxityQueueType != LaxityQueueType.NoQueue) {
+                    Debug.Assert (current != null || reservation.MyLaxityQueueType == LaxityQueueType.UnfinishedQueue);
+                    reservation.DequeueReservation();
+                }
+                Debug.Assert(timeInherited >= reservation.InheritedEstimate);
+                timeInherited -= reservation.InheritedEstimate;
+                Debug.Assert(reservation.Estimate >= reservation.InheritedEstimate);
+                reservation.Estimate -= reservation.InheritedEstimate;
+                reservation = reservation.SurroundingReservation;
+            }
+
+            if (current != null) {
+                if (current == CurrentReservation) {
+                    current.Estimate -= timeNow - LaxityScheduler.SchedulingTime;
+                    currentReservation = null;
+                    LaxityScheduler.Reschedule();
+                }
+                current.DequeueReservation();
+            }
+        }
+#endif
+        public static void InheritOnEarliestDeadlineFirst(OneShotReservation reservation, TimeSpan timeToInherit)
+        {
+            while (reservation != null && timeToInherit.Ticks > 0) {
+
+                Debug.Assert(timeToInherit >= reservation.InheritedEstimate);
+                reservation.Estimate -= reservation.InheritedEstimate;
+                timeToInherit -= reservation.InheritedEstimate;
+                reservation = reservation.SurroundingReservation;
+            }
+        }
+
+        public static void ClearCurrentReservation()
+        {
+            currentReservation = null;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Laxity/RecurringReservation.cs b/base/Kernel/Singularity/Scheduling/Laxity/RecurringReservation.cs
new file mode 100644
index 0000000..3dd29e5
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Laxity/RecurringReservation.cs
@@ -0,0 +1,51 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RecurringReservation.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Laxity
+{
+    /// <summary>
+    /// Summary description for RecurringReservation.
+    /// </summary>
+    public class RecurringReservation : ISchedulerCpuReservation
+    {
+        CpuResourceReservation enclosingCpuReservation;
+
+        public RecurringReservation()
+        {
+        }
+
+#region ISchedulerCpuReservation Members
+
+        public override CpuResourceReservation EnclosingCpuReservation
+        {
+            get { return enclosingCpuReservation; }
+            set { enclosingCpuReservation = value; }
+        }
+
+#endregion
+
+        public TimeSpan Slice;
+        public TimeSpan Period;
+
+        public override CpuResourceAmount ReservedAmount
+        {
+            get { return CpuResource.Provider().TimeToCpu(Slice); }
+        }
+
+        public override TimeSpan ReservedPeriod
+        {
+            get { return Period; }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/ListNode.cs b/base/Kernel/Singularity/Scheduling/ListNode.cs
new file mode 100644
index 0000000..260d9db
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/ListNode.cs
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ListNode.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for ListNode.
+    /// </summary>
+
+    [CLSCompliant(false)]
+    public class ListNode
+    {
+        public ListNode Previous;   // Before this node
+        public ListNode Next;       // After this node
+        public Thread   Data;
+
+        public ListNode()
+        {
+            Previous = null;
+            Next = null;
+        }
+
+        [CLSCompliant(false)]
+        public ListNode(Thread dataref)
+        {
+            Previous = null;
+            Next = null;
+            Data = dataref;
+        }
+
+        // DI -- safe
+        public ListNode ListRemove()
+        {
+            ListNode next;
+
+            if ((next = Next) == this)
+                return null;
+
+            next.Previous = Previous;
+            Previous.Next = next;
+            Previous = Next = this;
+            return next;
+        }
+
+        // DI -- safe
+        public ListNode InsertIntoList(ListNode list)
+        {
+            if (list == null) {
+                Next = Previous = this;
+            }
+            else {
+                Next = list.Next;
+                Next.Previous = this;
+                list.Next = this;
+                Previous = list;
+            }
+            return this;
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Min/MinScheduler.cs b/base/Kernel/Singularity/Scheduling/Min/MinScheduler.cs
new file mode 100644
index 0000000..c33f3ee
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Min/MinScheduler.cs
@@ -0,0 +1,440 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MinScheduler.cs
+//
+//  Note:   Minimal round-robin style without priorities scheduler.
+//
+//          MinScheduler favors thread that have recently become unblocked
+//          and tries to avoid reading the clock or reseting the timer as
+//          much as possible.
+//
+//          The minimal scheduler maintains two queues of threads that can
+//          be scheduled.  The unblockedThreads queue contains threads which
+//          have become unblocked during this scheduling quantum; mostly,
+//          these are threads that were unblocked by the running thread.
+//          The runnableThreads queue contains all other threads that are
+//          currently runnable.  If the current thread blocks, MinScheduler
+//          will schedule threads from the unblockedThread queue, without
+//          reseting the timer.  When the timer finally fires, MinScheduler
+//          moves all unblockedThreads to the end of the runnableThreads
+//          queue and schedules the next runnableThread.
+//
+
+//#define DEBUG_DISPATCH
+//#define DEBUG_TIMER
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Bartok.Options;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Scheduling;
+using Microsoft.Singularity.V1.Threads;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    /// <summary>
+    /// Summary description for MinScheduler.
+    /// </summary>
+    [NoCCtor]
+    [CLSCompliant(false)]
+    [Mixin(typeof(Scheduler))]
+    public class MinScheduler : Scheduler
+    {
+        // List of recently runnable, but unscheduled threads.
+        private static ThreadQueue unblockedThreads;
+
+        // List of runnable, but unscheduled threads.
+        private static ThreadQueue runnableThreads;
+
+        // List of blocked threads, sorted by wait time.
+        private static ThreadQueue blockedThreads;
+
+        // List of frozen threads (unsorted)
+        private static ThreadQueue frozenThreads;
+
+        // set to something large to debug!
+        private static TimeSpan minSlice;
+        private static TimeSpan idleSlice;
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        [MixinExtend("Initialize")]
+        public static void Initialize(Process idleProcess) {
+            Scheduler.Initialize();
+
+            unblockedThreads = new ThreadQueue();
+            runnableThreads = new ThreadQueue();
+            blockedThreads = new ThreadQueue();
+            frozenThreads = new ThreadQueue();
+
+            minSlice = TimeSpan.FromMilliseconds(10);
+            // If busy, don't run for more than 10ms on same task.
+            idleSlice = TimeSpan.FromDays(30);
+            // If idle, wake up once a month whether we need to or not.
+
+            // Create the idle threads and put them on the idleThreads loop.
+            for (int i = 0; i < Processor.processorTable.Length; i++) {
+                Thread idle = Thread.CreateIdleThread(Processor.processorTable[i]);
+                Processor.processorTable[i].IdleThread = idle;
+
+                ThreadHandle handle;
+                idleProcess.AddThread(idle,out handle);
+
+                DispatchLock();
+                idleThreads.EnqueueTail(idle.schedulerEntry);
+                DispatchRelease();
+            }
+
+            bool iflag = Processor.DisableInterrupts();
+            Processor.CurrentProcessor.SetNextTimerInterrupt(
+                SchedulerTime.MinValue + TimeSpan.FromMilliseconds(5)
+                );
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        [MixinExtend("Finalize")]
+        new public static void Finalize()
+        {
+            Scheduler.Finalize();
+        }
+
+        /////////////////////////////////////////// Scheduling Event Handlers.
+        //
+        //  Each of these should be replaced by the scheduler mixin.
+        //
+
+        [MixinOverride]
+        new public static void OnThreadStateInitialize(Thread thread, bool constructorCalled)
+        {
+            // Only initialize thread-local state!  No locks held and interrupts on.
+        }
+
+        [MixinOverride]
+        new public static void OnThreadStart(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            DebugStub.Assert(thread.freezeCount == 0);
+            EnqueueThreadToRun(unblockedThreads, thread);
+        }
+
+        [MixinOverride]
+        new public static Thread OnThreadBlocked(Thread thread, SchedulerTime stop)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+            // First, put the thread on the blocked queue.
+            EnqueueBlockedThread(thread, stop);
+
+            // Now, find a runnable thread
+            return NextRunnableThread();
+        }
+
+        [MixinOverride]
+        [NoHeapAllocation]
+        new public static void OnThreadUnblocked(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+#if DEBUG_DISPATCH
+            DebugStub.WriteLine("OnThreadUnblocked: thread={0:x8} [before]",
+                                __arglist(Kernel.AddressOf(thread)));
+            //#if DEBUG_DISPATCH
+            //DumpBlockedThreads();
+#endif // DEBUG_DISPATCH
+
+            ThreadEntry entry = thread.schedulerEntry;
+            DebugStub.Assert(entry.queue == blockedThreads
+                             || entry.queue == frozenThreads);
+            entry.RemoveFromQueue();
+            EnqueueThreadToRun(unblockedThreads, thread);
+
+#if DEBUG_DISPATCH
+            DebugStub.WriteLine("OnThreadUnblocked: after={0:x8} [before]",
+                                __arglist(Kernel.AddressOf(thread)));
+            DumpBlockedThreads();
+#endif // DEBUG_DISPATCH
+        }
+
+        [MixinOverride]
+        [NoHeapAllocation]
+        new public static Thread OnThreadYield(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+            Thread target = NextRunnableThread();
+            if (target == null) {
+                return thread;
+            }
+            else {
+                EnqueueThreadToRun(runnableThreads, thread);
+                return target;
+            }
+        }
+
+        [MixinOverride]
+        new public static Thread OnThreadStop(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+            return NextRunnableThread();
+        }
+
+        [MixinOverride]
+        new public static void OnThreadFreezeIncrement(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            thread.freezeCount++;
+            if (thread.ActiveProcessor == null) {
+                ThreadEntry entry = thread.schedulerEntry;
+                entry.RemoveFromQueue();
+                frozenThreads.EnqueueTail(entry);
+            }
+            // (If thread.ActiveProcessor != null, thread will move
+            // to frozenThreads when it is descheduled.)
+        }
+
+        [MixinOverride]
+        new public static void OnThreadFreezeDecrement(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            DebugStub.Assert(thread.freezeCount > 0);
+            thread.freezeCount--;
+            if (thread.freezeCount == 0) {
+                ThreadEntry entry = thread.schedulerEntry;
+                frozenThreads.Remove(entry);
+                EnqueueThread(thread);
+            }
+        }
+
+        [MixinOverride]
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        new public static Thread OnTimerInterrupt(Thread thread, SchedulerTime now)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+            ThreadEntry entry;
+
+            // Move the recently unblocked threads to the runnable queue.
+            while ((entry = unblockedThreads.DequeueHead()) != null) {
+                EnqueueThreadToRun(runnableThreads, entry.Thread);
+            }
+
+            // Quantum is up, move current thread back to the runnable list.
+            if (thread != null) {
+                EnqueueThreadToRun(runnableThreads, thread);
+            }
+
+#if DEBUG_DISPATCH
+            DebugStub.WriteLine("OnTimerInterrupt : thread={0:x8} cpu={1} [before]",
+                                __arglist(Kernel.AddressOf(thread),
+                                          Processor.GetCurrentProcessorId()));
+            //#if DEBUG_DISPATCH
+            //DumpBlockedThreads();
+#endif // DEBUG_DISPATCH
+
+            // Now, unblock any threads whose timers have elapsed.
+            while ((entry = blockedThreads.Head) != null &&
+                   entry.Thread.BlockedUntil <= now) {
+
+#if DEBUG_DISPATCH
+                DebugStub.WriteLine("OnTimerInterrupt : thread={0:x8} cpu={1} [will remove]",
+                                    __arglist(Kernel.AddressOf(entry.Thread),
+                                              Processor.GetCurrentProcessorId()));
+#endif // DEBUG_DISPATCH
+
+                blockedThreads.Remove(entry);
+                entry.Thread.WaitFail();
+                EnqueueThreadToRun(runnableThreads, entry.Thread);
+            }
+
+#if DEBUG_DISPATCH
+            DebugStub.WriteLine("OnTimerInterrupt : thread={0:x8} cpu={1} [after]",
+                                __arglist(Kernel.AddressOf(thread),
+                                          Processor.GetCurrentProcessorId()));
+            DumpBlockedThreads();
+#endif // DEBUG_DISPATCH
+
+            DebugStub.Assert(minSlice.Ticks != 0); // Initialization failure
+            DebugStub.Assert(idleSlice.Ticks != 0); // Initialization failure
+
+            // Choose a default timeout depending on whether their are
+            // runnable threads or not.
+            SchedulerTime stop;
+            if (runnableThreads.IsEmpty()) {
+                stop = new SchedulerTime(now.Ticks + idleSlice.Ticks);
+            }
+            else {
+                stop = new SchedulerTime(now.Ticks + minSlice.Ticks);
+            }
+
+            // Then adjust the timeout so that we wake up sooner if
+            // there is a thread waiting on a timer.
+            if (entry != null && entry.Thread.BlockedUntil < stop) {
+                stop = entry.Thread.BlockedUntil;
+            }
+            Processor.CurrentProcessor.SetNextTimerInterrupt(stop);
+
+#if DEBUG_TIMER
+            DebugStub.WriteLine("Next Timer: {0}ms",
+                                __arglist((stop.Ticks - now.Ticks) / TimeSpan.TicksPerMillisecond));
+#endif // DEBUG_TIMER
+
+            VTable.Assert(unblockedThreads.Head == null);
+            return runnableThreads.DequeueHeadThread();
+        }
+
+        [MixinOverride]
+        [NoHeapAllocation]
+        new public static Thread OnIoInterrupt(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+            if (thread != null) {
+                EnqueueThreadToRun(unblockedThreads, thread);
+            }
+            return unblockedThreads.DequeueHeadThread();
+        }
+
+        [MixinOverride]
+        [NoHeapAllocation]
+        new public static void OnProcessorShutdown(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+
+            if (thread != null) {
+                EnqueueThreadToRun(unblockedThreads, thread);
+            }
+        }
+
+        /////////////////////////////////// Helper Methods
+        //
+        [Inline]
+        [NoHeapAllocation]
+        private static Thread NextRunnableThread() {
+            Thread target = unblockedThreads.DequeueHeadThread();
+            if (target == null) {
+                target = runnableThreads.DequeueHeadThread();
+            }
+            return target;
+        }
+
+        private static void EnqueueThread(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            if (thread.blocked) {
+                EnqueueBlockedThread(thread, thread.BlockedUntil);
+            }
+            else {
+                EnqueueThreadToRun(runnableThreads, thread);
+            }
+        }
+
+        // Enqueue ready-to-run thread in queue
+        // (where queue==runnableThreads or queue==unblockedThreads).
+        // Frozen threads are rerouted to the frozen queue.
+        [Inline]
+        [NoHeapAllocation]
+        private static void EnqueueThreadToRun(ThreadQueue queue,
+            Thread thread)
+        {
+            if (thread.freezeCount == 0) {
+                queue.EnqueueTail(thread.schedulerEntry);
+            }
+            else {
+                frozenThreads.EnqueueTail(thread.schedulerEntry);
+            }
+        }
+
+        [Inline]
+        private static void EnqueueBlockedThread(Thread thread, SchedulerTime stop)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            // Put the thread on the blocked queue.
+            bool updateStop = ((blockedThreads.Head == null) ||
+                               (blockedThreads.Head.Thread.BlockedUntil > stop));
+
+            if (updateStop && stop <= SchedulerTime.Now) {
+                // Optimization: don't bother setting a timer for a thread
+                // whose blocking has already timed out.  Wake it immediately.
+                thread.WaitFail();
+                EnqueueThreadToRun(runnableThreads, thread);
+                return;
+            }
+
+            if (stop == SchedulerTime.MaxValue) {
+                blockedThreads.EnqueueTail(thread.schedulerEntry);
+#if DEBUG_DISPATCH
+                DebugStub.Print("OnThreadBlocked  : thread={0:x8} cpu={1} EnqueueTail\n",
+                                __arglist(Kernel.AddressOf(thread),
+                                      Processor.GetCurrentProcessorId()));
+#endif // DEBUG_DISPATCH
+            }
+            else {
+                ThreadEntry entry = blockedThreads.Head;
+#if DEBUG_DISPATCH
+                DebugStub.Print("OnThreadBlocked  : thread={0:x8} cpu={1} stop={2}\n",
+                                __arglist(Kernel.AddressOf(thread),
+                                          Processor.GetCurrentProcessorId(),
+                                          stop.Ticks));
+#endif // DEBUG_DISPATCH
+                while (entry != null && entry.Thread.BlockedUntil <= stop) {
+                    // Loop until we find the first thread with a later stop.
+                    entry = entry.Next;
+#if DEBUG_DISPATCH
+                    DebugStub.Print("OnThreadBlocked  : BlockedUntil={0}\n",
+                                    __arglist(entry.Thread.BlockedUntil.Ticks));
+#endif // DEBUG_DISPATCH
+                }
+
+                blockedThreads.InsertBefore(entry, thread.schedulerEntry);
+            }
+
+            VTable.Assert(blockedThreads.IsEnqueued(thread.schedulerEntry));
+
+
+            if (updateStop) {
+#if DEBUG_DISPATCH
+                DebugStub.Print("OnThreadBlocked  : SetNextTimerInterrupt({0})\n",
+                                __arglist(stop.Ticks));
+#endif // DEBUG_DISPATCH
+                Processor.CurrentProcessor.SetNextTimerInterrupt(stop);
+            }
+            else {
+#if DEBUG_DISPATCH
+                DebugStub.Print("OnThreadBlocked  : No timer update needed\n");
+#endif // DEBUG_DISPATCH
+            }
+
+            DumpBlockedThreads();
+        }
+
+        /////////////////////////////////// Diagnostics and Debugging Support.
+        //
+        [Conditional("DEBUG_DISPATCH")]
+        public static void DumpBlockedThreads()
+        {
+            // First, put the thread on the blocked queue.
+            ThreadEntry entry = blockedThreads.Head;
+            for (; entry != null; entry = entry.Next) {
+                DebugStub.Print("      thread={0:x8} stop= {1}\n",
+                                __arglist(
+                                    Kernel.AddressOf(entry.Thread),
+                                    entry.Thread.BlockedUntil.Ticks));
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/GraphNode.cs b/base/Kernel/Singularity/Scheduling/Rialto/GraphNode.cs
new file mode 100644
index 0000000..73b7ae3
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/GraphNode.cs
@@ -0,0 +1,88 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   GraphNode.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// Nodes represent blocks of the Rialto pre-computed schedule.  A node has a
+    /// period and slice, accounting for its default activity, time to origin in
+    /// the schedule, next execution time, and a set of variables which form the
+    /// tree.  A node tree has strictly increasing periods at each level in the
+    /// tree (it doubles), and a node can have a `next' node (at the same level),
+    /// can branch into left and right nodes (at one level below), or can account
+    /// free time (and have neither).  The type field stores those cases as well
+    /// as the direction of the next branch to follow (Used, Free, LeftBranch,
+    /// RightBranch).  When traversing the tree, the next node can be determined
+    /// by the following steps: (1) If the current node has a next node, select it
+    /// next.  (2) Otherwise, if it has type Left or Right branch, follow the
+    /// branch in that direction, and toggle which branch is stored.  (3) If it is
+    /// a Free node, start back at the root of the tree.
+    /// </summary>
+    public class GraphNode
+    {
+#region Constants and Enumerations
+
+        public enum NodeType
+        {
+            Free = 0,
+            Used = 1,
+            LeftBranch = 2,
+            RightBranch = 3
+        };
+
+        public static readonly int MaxNumReservations = 250;
+
+        public static readonly int MaxProxySplits = 10;
+        public static readonly int MaxMarcelTries = 2000;
+
+#endregion
+
+        public NodeType     Type;       // Free, Used, BRANCH, (Includes mark of what next branch to take is) etc....
+        public TimeSpan     Slice;      // node's slice (time units)
+        public TimeSpan     Period;     // node's period (time units)
+        public DateTime     NextExec;   // start of Next or current CPU slice
+        public TimeSpan     TimeToOrigin;// time to the first node of the tree
+        public RialtoActivity      DefaultActivity;   // default activity for Used nodes
+
+        public int          ReservCount;             // valid entries in the array above
+
+        public GraphNode    Next;       // Next sibling
+        public GraphNode    Left;       // left and right children of a BRANCH node
+        public GraphNode    Right;      // leaf nodes have left == right == Next == null
+        public GraphNode    SameActivityNext; // Next node of the same activity
+        public ReservationSlice[]   ReservationArray; // array of pointers to CPU reservations
+
+        public GraphNode()
+        {
+            ReservationArray = new ReservationSlice[MaxNumReservations];
+        }
+
+        public static GraphNode InitTree()
+        {
+            GraphNode node = new GraphNode();
+
+            node.Type = NodeType.Free;
+            node.Slice = CpuResource.MaxPeriod;
+            node.Period = CpuResource.MaxPeriod;
+            node.TimeToOrigin = CpuResource.MaxPeriod;
+            node.NextExec = new DateTime(0);
+            node.ReservCount = 0;
+            node.Next = null;
+            node.Left = null;
+            node.Right = null;
+            node.SameActivityNext = null;
+            return node;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/NodeProxy.cs b/base/Kernel/Singularity/Scheduling/Rialto/NodeProxy.cs
new file mode 100644
index 0000000..9a622c4
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/NodeProxy.cs
@@ -0,0 +1,54 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NodeProxy.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// NodeProxies are created as temporary activity proxies for use in building a new
+    /// scheduler plan.  The slice, period, and associated activity are relatively easy
+    /// to digest, but there are two variables TreeLevel and FreeLevel which are a bit
+    /// more.  FreeLevel refers to the row in the SchedulerPlan which this node should be
+    /// in based on its period, and TreeLevel represents the exact position in a full
+    /// binary tree of the schedule.  It is computed by 2^row + position in row, and
+    /// corresponds to the position in the FreeSlots[][] (see below).  (For that matter,
+    /// FreeLevel refers to which FreeSlots top level array its time is subtracted from).
+    /// </summary>
+    public class NodeProxy : ICloneable
+    {
+
+        public int          TreeLevel; //TODO: BAD NAME
+        public int          FreeLevel;
+        public TimeSpan     Slice, Period;
+        public RialtoActivity      AssociatedActivity;
+
+        public NodeProxy()
+        {
+        }
+
+#region ICloneable Members
+
+        public object Clone()
+        {
+            NodeProxy newObj = new NodeProxy();
+            newObj.TreeLevel = TreeLevel;
+            newObj.FreeLevel = FreeLevel;
+            newObj.Slice = Slice; //NOTE: A copy of the reference.  But OK since originally was a pointer.
+            newObj.Period = Period;
+            newObj.AssociatedActivity = AssociatedActivity;
+            return newObj;
+        }
+
+#endregion
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/OneShotReservation.cs b/base/Kernel/Singularity/Scheduling/Rialto/OneShotReservation.cs
new file mode 100644
index 0000000..92dde23
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/OneShotReservation.cs
@@ -0,0 +1,787 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   OneShotReservation.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// OneShotReservations are created from tasks for the calling thread.
+    /// It has fields to track the thread calling and the thread waiting on,
+    /// the activity associated when it becomes an activity reservation, its
+    /// surrounding reservation, its place on the free reservation list,
+    /// general bookkeeping, bookkeeping for possible stolen time, and
+    /// references for the general reservation list.
+    /// </summary>
+    public class OneShotReservation : ISchedulerTask
+    {
+
+        static OneShotReservation  guaranteedReservations = null;
+        public static OneShotReservation GuaranteedReservations
+        {
+            get { return guaranteedReservations; }
+        }
+
+        static OneShotReservation  idleReservations = null;
+        public static OneShotReservation IdleReservations
+        {
+            get { return idleReservations; }
+        }
+
+        static OneShotReservation  currentReservation = null;
+        public static OneShotReservation CurrentReservation
+        {
+            get { return currentReservation; }
+            //set { currentReservation = value; }
+        }
+
+        public Hashtable resourcesGranted = new Hashtable();
+        public override Hashtable ResourcesGranted
+        {
+            get {
+                resourcesGranted[CpuResource.Provider().ResourceString] = CpuResource.Provider().TimeToCpu(InitialEstimate);
+                return resourcesGranted;
+            }
+        }
+
+        private Task enclosingTask;
+        public override Task EnclosingTask
+        {
+            get { return enclosingTask; }
+            set { enclosingTask = value; }
+        }
+
+        public OneShotReservation      SurroundingReservation;
+        public OneShotReservation      FreeListNext;
+        public RialtoThread             ReservTask;
+
+        TimeSpan     constraintExecution;
+        public TimeSpan ConstraintExecution
+        {
+            get { return constraintExecution; }
+        }
+
+        TimeSpan     initialThreadExecution;
+
+        public DateTime     Start, Deadline;
+        public TimeSpan        Estimate, RelativeDeadline;
+
+        public TimeSpan     InitialEstimate; // test only
+        public QueueType    MyQueueType;
+        public bool         Guaranteed;
+        public bool         Valid;
+        public bool         Satisfied;
+
+        // Reservations can be made for Threads XOR Activities!.
+        public RialtoThread         OriginalThread;
+        // always the constraint thread -- non-null until the reservation is complete
+        //public RialtoThread           ActiveThread;
+        // the above, or the thread blocking it
+        //public int                ActiveThreadEpoch;
+        public RialtoActivity      AssociatedActivity;        // the two fields above must be null!
+
+
+        public OneShotReservation      Next;
+        public OneShotReservation      Previous;
+
+        public TimeSpan     InheritedEstimate;  // Stolen => Inherited, no longer critical
+        public int          ResolutionEpoch;    // Stolen => Resolution, since not stealing.
+
+        public int              ReferenceCount;
+
+        public OneShotReservation()
+        {
+        }
+
+        public void Clear()
+        {
+            //ActiveThread = null;
+            //ActiveThreadEpoch = 0;
+            constraintExecution = new TimeSpan(0); //Move to enclosing class
+            initialThreadExecution = new TimeSpan(0); //Move to enclosing class
+            Deadline = new DateTime(0);
+            RelativeDeadline = new TimeSpan(0);
+            Estimate = new TimeSpan(0);
+            FreeListNext = null;
+            Guaranteed = false;
+            InitialEstimate = new TimeSpan(0);
+            Next = null;
+            OriginalThread = null;
+            AssociatedActivity = null;
+            Previous = null;
+            MyQueueType = QueueType.NoQueue;
+            ReferenceCount = 0;
+            ReservTask = null;
+            Satisfied = false;
+            Start = new DateTime(0);
+            SurroundingReservation = null;
+            ResolutionEpoch = 0;
+            InheritedEstimate = new TimeSpan(0);
+            Valid = false;
+            if (enclosingTask != null) {
+                enclosingTask.ClearSchedulerTask();
+                enclosingTask = null;
+            }
+        }
+
+        // find the runnable thread of a reservation:
+        public RialtoThread GetRunnableThread()
+        {
+//            RialtoThread thread;
+//
+            if (AssociatedActivity != null) {
+                // if an activity reservation
+                return AssociatedActivity.GetRunnableThread();
+            }
+
+            Debug.Assert(OriginalThread != null);
+
+//            if ((ActiveThread == OriginalThread) &&
+//                (ActiveThread.EnclosingThread.ThreadState == System.Threading.ThreadState.Running))
+//                return ActiveThread;
+//
+//            thread = OriginalThread; // search for active thread starting w/ original thread
+//
+//            if ((ActiveThread != null) &&
+//                (ActiveThread.Epoch == ActiveThreadEpoch)) {
+//                if (ActiveThread.EnclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+//#if DEBUG_MUTEX
+//                  DebugStub.WriteLine("Mutex inheritance (Epoch ok): Orig {0} Active {1} GO ON",
+//                      thread.Id, ActiveThread.Id);
+//#endif
+//                    return ActiveThread;
+//                }
+//            }
+            //CKillian -- can't do this because of the array of blockedOn.
+            //    else if (ActiveThread.EnclosingThread.IsSleeping()) {
+            //        // more efficient: search for active thread starting w/ current active thread
+            //        thread = ActiveThread;
+            //    }
+            //    else {
+            //        Debug.Assert(false);
+            //    }
+            //}
+
+            Thread temp = /*Active*/OriginalThread.EnclosingThread.GetRunnableBeneficiary();
+            if (temp == null) {
+                return null;
+            }
+            else {
+                return (RialtoThread)temp.SchedulerThread;
+            }
+
+        }
+
+        public void StopThreadExecution(RialtoThread thread)
+        {
+            Debug.Assert(thread.ExecutionTime >= initialThreadExecution);
+            constraintExecution += thread.ExecutionTime - initialThreadExecution;
+            //Between two reservations which are atomically stopped/started, some
+            //      time is charged against the default parent resource container.  This
+            //      is because I changed the way we account for tasks to do the general
+            //      rule we wanted.  In particular, I update the scheduling status just
+            //      before resolving a new reservation.  Not sure what the right fix is,
+            //      so I'm leaving it.  The assertion below will reveal the "error."  The
+            //      old code to track CPU usage is still active under constraintExecution,
+            //      but isn't presently exposed to the applications.  Currently UpdateSchedulingStatus()
+            //      updates the CPU resources used for the whole task stack.
+            //Debug.Assert(CpuResource.Provider().TimeToCpu(constraintExecution).Cycles == ((CpuResourceAmount)enclosingTask.resourcesUsed[CpuResource.Provider().ResourceString]).Cycles);
+            //EnclosingTask.AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(constraintExecution));
+        }
+
+        public void StartThreadExecution(RialtoThread thread)
+        {
+            initialThreadExecution = thread.ExecutionTime;
+        }
+
+        public void StartThreadExecution(RialtoThread thread, TimeSpan delta)
+        {
+            initialThreadExecution = thread.ExecutionTime + delta;
+        }
+
+        public static void BeginConstraintBeforeWait(RialtoThread thread,
+                                                            bool endPrevious,
+                                                            TimeConstraint timeConstraint,
+                                                            DateTime timeNow)
+        {
+            OneShotReservation reservation;
+
+            Debug.Assert(thread == RialtoScheduler.GetCurrentThread());
+            Debug.Assert(!Processor.InterruptsDisabled());
+            if (endPrevious) {
+                bool iflag = Processor.DisableInterrupts();
+                EndPreviousConstraint(thread, timeNow);
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            RialtoScheduler.UpdateSchedulingStatus();
+
+            reservation = thread.PendingReservation;
+
+            reservation.StartThreadExecution(thread, (timeNow - RialtoScheduler.SchedulingTime));
+            reservation.constraintExecution = new TimeSpan(0);
+            reservation.Start = timeConstraint.Start;
+            reservation.Deadline = timeConstraint.Deadline;
+            reservation.RelativeDeadline = timeConstraint.RelativeDeadline;
+            reservation.Estimate = timeConstraint.Estimate;
+            reservation.Valid = reservation.Guaranteed = true;
+            reservation.MyQueueType = QueueType.NoQueue;
+            reservation.ReservTask = thread;
+            reservation.OriginalThread = /*reservation.ActiveThread =*/ thread;
+            thread.AddRef();
+            //thread.AddRef();
+            //reservation.ActiveThreadEpoch = thread.Epoch;
+            reservation.AssociatedActivity = null;
+            reservation.Next = reservation.Previous = null;
+        }
+
+        // DI -- this is a new function used in both Begin and EndConstraint
+        public static bool EndPreviousConstraint(RialtoThread thread, DateTime timeNow)
+        {
+            OneShotReservation reservation;
+            OneShotReservation reservationNext;
+            bool            success;
+            QueueType       tempQueue; //Value assigned but never used.
+
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            reservation = thread.ReservationStack;
+
+            success = (timeNow <= reservation.Deadline);
+            RialtoScheduler.UpdateSchedulingStatus();
+            reservation.StopThreadExecution(thread);
+
+            Debug.Assert(reservation.ConstraintExecution.Ticks >= 0);
+//            if (timeTaken.Ticks != 0) {
+//                timeTaken = reservation.ConstraintExecution;
+//                Debug.Assert(timeTaken.Ticks >= 0); //CK: Added = because VPC returns 0 sometimes.
+//            }
+
+            thread.ReservationStack = reservation.SurroundingReservation;
+            reservation.SurroundingReservation = null;
+
+            if (currentReservation == reservation) {
+                // note that it might be the case that
+                // a reservation for the task id exist on the guaranteed Q but the
+                // the actual (executed) constraint is in the UnfinishedQ
+                currentReservation = null; // ????????????
+                RialtoScheduler.Reschedule();
+            }
+            Debug.Assert(reservation.OriginalThread == thread);
+            Debug.Assert(reservation.Start <= timeNow);
+
+            if (thread.ReservationStack == null) {
+                if (reservation.Estimate >= RialtoScheduler.MinSlice) {
+                    // the constraint used less than estimated:
+                    Debug.Assert(reservation.MyQueueType == QueueType.GuaranteedQueue);
+                    //Debug.Assert((reservation.ActiveThread == null) ||
+                    //  (reservation.ActiveThread.Epoch != reservation.ActiveThreadEpoch) ||
+                    //  (reservation.ActiveThread == reservation.OriginalThread));
+                    //  reservation.ActiveThread.ReleaseProtected();
+                    reservation.OriginalThread.ReleaseProtected();
+                    reservation.AssociatedActivity = reservation.OriginalThread.AssociatedActivity; // and make it an activity reserv
+                    reservation.OriginalThread = null;
+                    //reservation.ActiveThread = null;
+                    reservation.ReservTask = null;
+                    RialtoScheduler.ActivityObjAddRef(reservation.AssociatedActivity);
+                    // leave it on whatever Q it happens to be on
+                }
+                else {
+                    reservation.DequeueReservation(); // from whatever Q it happens to be on
+                }
+            }
+            else {
+                tempQueue = reservation.MyQueueType;
+                reservationNext = thread.ReservationStack;
+                reservationNext.Estimate += reservation.Estimate;
+                reservationNext.constraintExecution += reservation.constraintExecution;
+                reservationNext.StartThreadExecution(thread);
+                Debug.Assert(((reservation.MyQueueType == QueueType.GuaranteedQueue) &&
+                    (reservationNext.MyQueueType == QueueType.NoQueue)) ||
+                    ((reservation.MyQueueType == QueueType.UnfinishedQueue) &&
+                    ((reservationNext.Estimate.Ticks <= 0) || (reservationNext.MyQueueType != QueueType.UnfinishedQueue))));
+                reservation.Estimate = new TimeSpan(0);
+                Debug.Assert(reservation.Next != null);
+                reservation.DequeueReservation();
+                ReplaceOnEarliestDeadlineFirst(reservationNext, timeNow);
+
+            }
+            // fprintf(stdout,"EndPrevConstr 0x%x %d\n", reservation, reservation.ReferenceCount);
+            reservation.ReleaseReservationProtected();
+
+            Scheduler.LogEndConstraint();
+
+            if (success == false) {
+                Scheduler.LogSchedulerLate();
+            }
+
+            // DebugStub.WriteLine("EndPreviousConstraint() {0} constraintExecution: {1}", success?"SUCCESS":"FAILURE", reservation.constraintExecution.Ticks);
+
+            return success;
+        }
+
+
+        public static bool ResolveConstraint(RialtoThread thread)
+        {
+            TimeSpan timeLeft, ownNodesTimeToSteal = new TimeSpan(1);
+            DateTime start, deadline;
+            TimeSpan timeInherited;
+            OneShotReservation pendingReservation = thread.PendingReservation;
+            OneShotReservation reservationPrevious;
+            DateTime timeNow = SystemClock.GetKernelTime();
+            bool ok = false;
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(pendingReservation != null);
+
+            Scheduler.LogResolveConstraint();
+
+            thread.PendingReservation = null;   // just clean the place
+
+            Debug.Assert(pendingReservation.Start.Ticks >= 0);
+            start = pendingReservation.Start;
+            if (start < timeNow) {
+                start = timeNow;
+            }
+            Debug.Assert(pendingReservation.Deadline.Ticks >= 0);
+            deadline = pendingReservation.Deadline;
+            if (deadline.Ticks == 0) {
+                deadline = timeNow + pendingReservation.RelativeDeadline;
+            }
+
+            if (thread.ReservationStack != null) {
+                OneShotReservation reservation = thread.ReservationStack;
+                while (!reservation.Valid && ((reservation = reservation.SurroundingReservation)!= null)) {
+                    // no body.
+                }
+
+                if (reservation!= null) {
+                    deadline = RialtoScheduler.minTime(deadline, reservation.Deadline);
+                }
+            }
+
+            // update data ure
+            pendingReservation.Start = start;
+            pendingReservation.Deadline = deadline;
+            //TODO: Should be for SIM ONLY!
+            Scheduler.LogReservationId(pendingReservation);           // SIM only
+            if (start + pendingReservation.Estimate > deadline) {
+                // DebugStub.WriteLine("RialtoScheduler::ResolveConstraint FAIL - start({0}) + pendingReservation.Estimate({1}) > deadline({2})", start.Ticks, pendingReservation.Estimate.Ticks, deadline.Ticks);
+                ok = false;
+                goto Failure;
+            }
+            timeInherited = new TimeSpan(0);
+            RialtoScheduler.ResolutionAttempt++;    // mark a new resolution epoch
+
+            RecurringReservation recurringReservation = thread.AssociatedActivity.MyRecurringCpuReservation;
+            RialtoScheduler.ReserveSlices(start, deadline, pendingReservation.Estimate,
+                thread, out timeLeft, ref timeInherited,
+                pendingReservation, (recurringReservation != null?recurringReservation.AssignedNodes:null), timeNow);
+
+            if (timeLeft.Ticks == 0) {
+                // Success:
+                goto Success;
+            }
+
+            RialtoScheduler.ReserveSlices(start, deadline, timeLeft,
+                thread, out timeLeft, ref timeInherited,
+                pendingReservation, RialtoScheduler.FreeNodes, timeNow);
+            if (timeLeft.Ticks <= 0) {
+                // Success:
+                goto Success;
+            }
+            // DebugStub.WriteLine("RialtoScheduler::ResolveConstraint FAIL - couldn't find time in schedule");
+          Failure:
+            // Failure:
+            pendingReservation.Valid = false;
+            pendingReservation.Start = timeNow;     // no waiting if failed
+            pendingReservation.Estimate = new TimeSpan(0);
+            goto Exit;
+
+          Success:
+
+            // DebugStub.WriteLine("RialtoScheduler::ResolveConstraint SUCCESS");
+            InheritAndReplaceOnEarliestDeadlineFirst(thread.ReservationStack, timeInherited, timeNow);
+            ok = true;
+          Exit:
+            pendingReservation.InitialEstimate = pendingReservation.Estimate;
+            reservationPrevious = thread.ReservationStack;
+            pendingReservation.SurroundingReservation= thread.ReservationStack;
+            thread.ReservationStack = pendingReservation;
+            RialtoScheduler.AddRefReservation(pendingReservation);
+            if (reservationPrevious != null) {
+                reservationPrevious.constraintExecution += pendingReservation.initialThreadExecution -
+                    reservationPrevious.initialThreadExecution;
+            }
+            //
+            // Reschedule()  called if currently we are executing on a pendingReservation
+            //                              and the EarliestDeadlineFirst top changed
+            //              or   the current pendingReservation goes into the idle list
+            //                  solve in SetStateWaiting
+            //
+            pendingReservation.EnqueueReservation(timeNow);
+            RialtoScheduler.DirectSwitchOnConstraint();
+
+#if DEBUG_RESERV
+            PrintReservations(pendingReservation, sc, timeNow);
+#endif
+            return ok;
+        }
+
+        void EnqueueReservation(DateTime timeNow)
+        {
+            OneShotReservation temp;
+
+            Debug.Assert((AssociatedActivity != null) ||
+                (OriginalThread != null));
+
+            // Infeasible or (Estimate == 0) Reservations:
+            if (Estimate <= RialtoScheduler.AFewSlice) {
+                RialtoActivity activity;
+                Debug.Assert(OriginalThread != null);
+                Debug.Assert(AssociatedActivity == null);
+                activity = OriginalThread.AssociatedActivity;
+                MyQueueType = QueueType.UnfinishedQueue;
+                if (activity.UnfinishedConstraints == null) {
+                    Next = Previous = this;
+                    activity.UnfinishedConstraints = this;
+                }
+                else {
+                    // no order enforced
+                    Next = activity.UnfinishedConstraints;
+                    Previous = activity.UnfinishedConstraints.Previous;
+                    activity.UnfinishedConstraints.Previous.Next = this;
+                    activity.UnfinishedConstraints.Previous = this;
+                    activity.UnfinishedConstraints = this; // optional
+                }
+                //  DebugStub.WriteLine("Add: EnqueueReserve  1 0x{0:x} {1}", this, ReferenceCount);
+                RialtoScheduler.AddRefReservation(this);
+                return;
+            }
+            //  Debug.Assert(Valid);
+
+            // Idle Reservations:
+            if (Start > timeNow + RialtoScheduler.AFewSlice) {
+                // take thread off activity RoundRobin queue and simulate a sleep
+                //    i.e. don't set a timer interrupt
+
+                OriginalThread.InternalSetStateWaiting(DateTime.MaxValue);
+
+#if DEBUG_START_RESERV
+                DebugStub.WriteLine("Put reservation {0}:{1} in IdleQueue\n", OriginalThread,
+                    ReservationId);
+#endif
+                Debug.Assert(OriginalThread != null);
+                MyQueueType = QueueType.IdleQueue;
+
+                if (idleReservations == null) {
+                    Next = Previous = this;
+                    idleReservations = this;
+                }
+                else {
+                    temp = idleReservations;
+                    if (Start < temp.Start) {
+                        idleReservations = this;
+                    }
+                    else {
+                        do {
+                            temp = temp.Next;
+                        } while (temp != idleReservations &&
+                                 Start >= temp.Start); // >= is compulsory to keep it 'FIFO'
+                    } // insert before 'temp'
+                    Next = temp;
+                    Previous = temp.Previous;
+                    temp.Previous.Next = this;
+                    temp.Previous = this;
+                }
+                //  fprintf(stdout,"Add: EnqueueReserve  2 0x%x %d\n", this, ReferenceCount);
+                RialtoScheduler.AddRefReservation(this);
+                return;
+            }
+
+            // Guaranteed OneShotReservation:
+            MyQueueType = QueueType.GuaranteedQueue;
+            if (GuaranteedReservations == null) {
+                Next = Previous = this;
+                guaranteedReservations = this;
+            }
+            else {
+                temp = GuaranteedReservations;
+                if (Deadline < GuaranteedReservations.Deadline) {
+                    guaranteedReservations = this;
+                }
+                else {
+                    do {
+                        temp = temp.Next;
+                    } while (temp != guaranteedReservations &&
+                             Deadline > temp.Deadline); // > is compulsory to keep it 'FIFO'
+                } // insert before 'temp'
+                Next = temp;
+                Previous = temp.Previous;
+                temp.Previous.Next = this;
+                temp.Previous = this;
+            }
+            RialtoScheduler.AddRefReservation(this);
+#if DEBUG_RESERV
+            PrintQueueReserv(guaranteedReservations, timeNow); //TODO: PrintQueueReserv
+#endif
+            return;
+        }
+
+
+        static void ReplaceOnEarliestDeadlineFirst(OneShotReservation reservation, DateTime timeNow)
+        {
+            while (reservation != null) {
+                if (reservation.Estimate.Ticks > 0) {
+                    if (reservation.MyQueueType == QueueType.NoQueue) {
+                        reservation.EnqueueReservation(timeNow);
+                    }
+                    else {
+                        Debug.Assert(reservation.MyQueueType == QueueType.GuaranteedQueue);
+                    }
+                    break;
+                }
+                if (reservation.MyQueueType == QueueType.NoQueue) {
+                    reservation.EnqueueReservation(timeNow);
+                }
+                else {
+                    Debug.Assert(reservation.MyQueueType == QueueType.UnfinishedQueue);
+                }
+                reservation = reservation.SurroundingReservation;
+            }
+        }
+
+        public static bool SatisfyAcceptedConstraint(DateTime timeNow)
+        {
+            OneShotReservation    reservation;
+
+            if (currentReservation != null) {
+                currentReservation.Estimate -= timeNow - RialtoScheduler.SchedulingTime;
+                if (currentReservation.Estimate.Ticks <= 0) {
+                    RialtoThread tempThread  = currentReservation.OriginalThread;
+                    currentReservation.DequeueReservation();
+                    if (tempThread != null) {
+                        // activity reservations vanish here
+                        //Debug.Assert(currentReservation.ActiveThread == RialtoScheduler.GetCurrentThread()); // only thread reserv are added to
+                        currentReservation.EnqueueReservation(RialtoScheduler.SchedulingTime); // the UnfinishedConstraints list of the OriginalThread's Activ
+                        OneShotReservation.ReplaceOnEarliestDeadlineFirst(currentReservation.SurroundingReservation, RialtoScheduler.SchedulingTime);
+                    }
+                }
+            }
+
+            reservation = guaranteedReservations;
+            while (reservation != null) {
+                if (!RialtoScheduler.CheckReservation(reservation, timeNow)) {
+                    return false;
+                }
+                reservation = reservation.Next;
+                if (reservation == guaranteedReservations) {
+                    break;
+                }
+            }
+            reservation = idleReservations;
+            while (reservation != null) {
+                if (!RialtoScheduler.CheckReservation(reservation, timeNow)) {
+                    return false;
+                }
+                reservation = reservation.Next;
+                if (reservation == idleReservations) {
+                    break;
+                }
+            }
+            return true;
+        }
+
+        public static void UpdateCurrentReservation()
+        {
+            if ((currentReservation != null) &&
+                (currentReservation.Estimate <= RialtoScheduler.AFewSlice)) {
+                // slice used for a reservation (CK: & estimate now empty)
+                RialtoThread tempThread  = currentReservation.OriginalThread;
+                currentReservation.DequeueReservation();
+                if (tempThread != null) {
+                    // activity reservations vanish here
+                    currentReservation.EnqueueReservation(RialtoScheduler.SchedulingTime); // the UnfinishedConstraints list of the OriginalThread's Activ
+                    ReplaceOnEarliestDeadlineFirst(currentReservation.SurroundingReservation, RialtoScheduler.SchedulingTime);
+                }
+            }
+
+        }
+
+        public static void FreshenReservationQueues()
+        {
+            OneShotReservation tempReservation;
+
+            //  Move 'idle' reservations to the 'active' reservations list, if necessary.
+            //  A reservation is 'idle' until its Start time is reached.
+            //  The 'active' reservation list is ordered 'Earliest Deadline Firts'.
+            //  The 'idle' queue is ordered Earliest Start First.
+            while ((tempReservation = IdleReservations) != null) {
+                if (RialtoScheduler.SchedulingTime + RialtoScheduler.AFewSlice < tempReservation.Start) {
+                    break;
+                }
+                tempReservation.DequeueReservation(); // Remove OneShotReservation from the Idle Queue
+                tempReservation.EnqueueReservation(RialtoScheduler.SchedulingTime); // Earliest Deadline First in the (Non)Guaranteed Queue
+                RialtoScheduler.EnqueueRunThread(tempReservation.OriginalThread);
+#if DEBUG_START_RESERV
+                DebugStub.WriteLine("Get reservation {0}:{1} from IdleQueue", tempReservation.OriginalThread,
+                    tempReservation.ReservationId);
+#endif
+            }
+
+            // Remove the active reservations from the guaranteed and nonguaranteed queues
+            // if their Deadline is <= CurrentTime.
+            while ((tempReservation = guaranteedReservations) != null) {
+                if (RialtoScheduler.SchedulingTime + RialtoScheduler.AFewSlice < tempReservation.Deadline) {
+                    break;
+                }
+                //      fprintf(stdout,"Add: Reschedule Guaranteed Deadline 0x%x %d\n", tempReservation, tempReservation.ReferenceCount);
+                RialtoScheduler.AddRefReservation(tempReservation);
+                tempReservation.DequeueReservation(); // Remove OneShotReservation from the Guaranteed Queue
+                if ((tempReservation.OriginalThread != null) && // if a thread reservation
+                    (tempReservation.OriginalThread.AssociatedActivity != null)) {
+                    // if a thread reservation
+                    tempReservation.Estimate = new TimeSpan(0);
+                    tempReservation.EnqueueReservation(RialtoScheduler.SchedulingTime); // add it to the Pending End Constraint List
+                }
+                //  fprintf(stdout,"Reschedule Guaranteed Deadline off 0x%x %d\n", tempReservation, tempReservation.ReferenceCount);
+                tempReservation.ReleaseReservationProtected();
+            }
+
+        }
+
+        int ReleaseReservationProtected()
+        {
+            return RialtoScheduler.ReleaseReservationProtected(this);
+        }
+
+        public void DequeueReservation() //TODO: Should this be a resource container function?
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            OneShotReservation next;
+            // OneShotReservation pSurrounding = null;
+
+            Debug.Assert((AssociatedActivity != null) ||
+                (OriginalThread != null));
+
+            if (Next != this) {
+                //If there's another reservation, remove us from the queue
+                Next.Previous = Previous;
+                Previous.Next = Next;
+                next = Next;
+                Debug.Assert(next.Deadline.Ticks > 0);
+            }
+            else {
+                //Otherwise we are only reservation.
+                Debug.Assert(Previous == this);
+                next = null;
+            }
+
+            if (this == GuaranteedReservations) {
+                //Take care when we're the head of the list.
+                guaranteedReservations = next;
+#if DEBUG_RESERV
+                DebugStub.WriteLine("Dequeue {0}: {1}", ReservationId, Estimate);
+                //      Debug.Assert(Criticality != CRITICAL || !Valid || Estimate ==0);
+                PrintQueueReserv(GuaranteedReservations, SystemClock.GetKernelTime());
+#endif
+            }
+            else if (this == IdleReservations) {
+                //Or maybe we're the head of this list (but definitely not both).
+                idleReservations = next;
+            }
+            else if ((OriginalThread != null) &&
+                (this == OriginalThread.AssociatedActivity.UnfinishedConstraints)) {
+                //Or else we might be the head of the unfinished constraints list for the activity associated with our original thread.
+                OriginalThread.AssociatedActivity.UnfinishedConstraints = next;
+            } // else { we're OK! }
+
+            Next = Previous = null;
+            //  DebugStub.WriteLine("DequeueReservation 0x{0:x} {1}", this, ReferenceCount);
+            MyQueueType = QueueType.NoQueue;
+            ReleaseReservationProtected();
+        }
+
+        public static void FindRunnableReservation(ref RialtoThread currentThread)
+        {
+            currentReservation = guaranteedReservations;
+            while (currentReservation != null) {
+                if ((currentThread = currentReservation.GetRunnableThread()) != null) {
+                    break;
+                }
+                currentReservation = currentReservation.Next;
+                if (currentReservation == guaranteedReservations) {
+                    break;
+                }
+            }
+        }
+
+        static void InheritAndReplaceOnEarliestDeadlineFirst(OneShotReservation reservation,
+                                                             TimeSpan timeInherited,
+                                                             DateTime timeNow)
+        {
+            OneShotReservation current = null;
+
+            while (reservation != null) {
+                if (reservation.Estimate.Ticks > 0) {
+                    if (current == null) {
+                        Debug.Assert(reservation.MyQueueType != QueueType.NoQueue);
+                        current = reservation;
+                    }
+                    else {
+                        Debug.Assert(reservation.MyQueueType == QueueType.NoQueue);
+                    }
+                }
+                else if (reservation.MyQueueType != QueueType.NoQueue) {
+                    Debug.Assert (current != null || reservation.MyQueueType == QueueType.UnfinishedQueue);
+                    reservation.DequeueReservation();
+                }
+                if (reservation.ResolutionEpoch == RialtoScheduler.ResolutionAttempt) {
+                    Debug.Assert(timeInherited >= reservation.InheritedEstimate);
+                    timeInherited -= reservation.InheritedEstimate;
+                    Debug.Assert(reservation.Estimate >= reservation.InheritedEstimate);
+                    reservation.Estimate -= reservation.InheritedEstimate;
+                }
+                reservation = reservation.SurroundingReservation;
+            }
+            if (current != null) {
+                if (current == CurrentReservation) {
+                    current.Estimate -= timeNow - RialtoScheduler.SchedulingTime;
+                    currentReservation = null;
+                    RialtoScheduler.Reschedule();
+                }
+                current.DequeueReservation();
+            }
+        }
+
+        public static void InheritOnEarliestDeadlineFirst(OneShotReservation reservation,
+                                                          TimeSpan timeToInherit)
+        {
+            while (reservation != null && timeToInherit.Ticks > 0) {
+                if (reservation.ResolutionEpoch == RialtoScheduler.ResolutionAttempt) {
+                    Debug.Assert(timeToInherit >= reservation.InheritedEstimate);
+                    reservation.Estimate -= reservation.InheritedEstimate;
+                    timeToInherit -= reservation.InheritedEstimate;
+                }
+                reservation = reservation.SurroundingReservation;
+            }
+        }
+
+        public static void ClearCurrentReservation() {
+            currentReservation = null;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/RecurringReservation.cs b/base/Kernel/Singularity/Scheduling/Rialto/RecurringReservation.cs
new file mode 100644
index 0000000..8caad28
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/RecurringReservation.cs
@@ -0,0 +1,60 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RecurringReservation.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// Summary description for RecurringReservation.
+    /// </summary>
+    public class RecurringReservation : ISchedulerCpuReservation
+    {
+        private CpuResourceReservation enclosingCpuReservation;
+
+        internal TimeSpan   SliceLeft;
+        // CPU time left from the last run
+        internal GraphNode       AssignedNodes;
+        // nodes assigned to the activity
+        internal GraphNode       TempAssignedNodes;
+        // same as above in the new scheduling plan
+
+
+        internal RecurringReservation()
+        {
+            SliceLeft = new TimeSpan(0);
+            AssignedNodes = null;
+            TempAssignedNodes = null;
+        }
+
+        internal TimeSpan Slice;
+        internal TimeSpan Period;
+
+        public override CpuResourceAmount ReservedAmount
+        {
+            get { return CpuResource.Provider().TimeToCpu(Slice); }
+        }
+
+        public override TimeSpan ReservedPeriod
+        {
+            get { return Period; }
+        }
+
+#region ISchedulerCpuReservation Members
+        public override CpuResourceReservation EnclosingCpuReservation
+        {
+            get { return enclosingCpuReservation; }
+            set { enclosingCpuReservation = value; }
+        }
+#endregion
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/ReservationSlice.cs b/base/Kernel/Singularity/Scheduling/Rialto/ReservationSlice.cs
new file mode 100644
index 0000000..4de6624
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/ReservationSlice.cs
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ReservationSlice.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// A reservation slice is a slice of time assigned to the reservation.  It includes a
+    /// reference to it associated reservation, is stored with the node, and contains a
+    /// flag to say if it’s stolen.  Note that there is no reference from a reservation to
+    /// its slices, only the other way around.
+    /// </summary>
+    public class ReservationSlice : ICloneable
+    {
+
+        public DateTime     Start;      // between [i].Start and [i+1].Start, node is reserved for AssociatedReservation
+        public DateTime     End;
+        public TimeSpan     Available;  // how much RT-time this entry represents
+        public OneShotReservation  AssociatedReservation;
+
+        public ReservationSlice()
+        {
+
+        }
+
+#region ICloneable Members
+
+        public object Clone()
+        {
+            ReservationSlice newObj = new ReservationSlice();
+            newObj.Available = Available;
+            newObj.End = End;
+            newObj.AssociatedReservation = AssociatedReservation; //NOTE: A copy of the reference.  But OK since originally was a pointer.
+            newObj.Start = Start;
+            return newObj;
+        }
+
+#endregion
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/RialtoActivity.cs b/base/Kernel/Singularity/Scheduling/Rialto/RialtoActivity.cs
new file mode 100644
index 0000000..da5644d
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/RialtoActivity.cs
@@ -0,0 +1,158 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RialtoActivity.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// The resource container class includes a recurring reservation
+    /// (k out of every n), a list of runnable threads, unfinished constraints
+    /// (i.e. non-guaranteed or non-feasible), as well as pointers to handle
+    /// its role in lists for the non-blocked activity list and Standby
+    /// activity list.  It also has references for the last node to execute it,
+    /// a node assigned to it (which is a list via SameActivityNext), and a node
+    /// assigned to it under the new scheduling plan.  It also has some bookkeeping.
+    /// </summary>
+    public class RialtoActivity : ISchedulerActivity
+    {
+        private Activity enclosingActivity;
+
+        /// <summary>
+        /// When null, there is no active recurring reservation.
+        /// </summary>
+        internal RecurringReservation MyRecurringCpuReservation;
+
+        public RialtoThread     RunnableThreads;
+        // list of runnable threads, if any
+
+        public GraphNode     LastNode;
+        // last node used to execute the activity
+        // non-null only for incomplete activities
+        // List of Constraints: not accepted || with the estimate consumed
+        public OneShotReservation  UnfinishedConstraints;
+
+        public RialtoActivity      Next;     // Next and previous activities
+        public RialtoActivity      Previous;
+
+        // An activity is incomplete if it didn't use its previous CPU
+        // slice completely. These activities are linked in a separate list.
+        public RialtoActivity  NextStandbyActivity;
+        // Next and previous 'incomplete' activities
+        public RialtoActivity  PreviousStandbyActivity;
+        // NOT a circular list!
+
+        public int  ReferenceCount;
+        public int  CountNodes;
+        public int  Id;
+        public static int nextRCId = 1;
+
+        public RialtoActivity()
+        {
+            //Below is InitializeActivity();
+            ReferenceCount = 1;
+            RunnableThreads = null;
+
+            LastNode = null;
+            NextStandbyActivity = null;
+            PreviousStandbyActivity = null;
+
+            //Commenting out because a null reservation means no reservation.
+            //MyRecurringCpuReservation = new RecurringReservation();
+            //MyRecurringCpuReservation.EnclosingCpuReservation = new CpuResourceReservation(MyRecurringCpuReservation);
+
+            bool iflag = Processor.DisableInterrupts();
+            Id = Interlocked.Increment(ref nextRCId);
+            RialtoScheduler.EnqueueActivity(this); // add in last position in RoundRobin!
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public-normal API
+        //TODO: Call this from finalize?
+        /// <summary>
+        /// ReleaseReference is called when:
+        /// - A thread with this as resource container exits
+        /// - The thread creating the resource container releases it voluntarily
+        /// - A node assigned to this resource container's CPU reservation is removed
+        /// - When a constraint which became a resource container constraint exits
+        ///
+        /// When the only references left are from the nodes assigned, a CPU resource
+        /// reservation for no time is requested.  When there are no additional
+        /// nodes left, the resource container is dequeued.
+        /// </summary>
+        public override void ReleaseReference()
+        {
+            int newrefcnt;
+
+            // DI replaced by AtomicDec(&activity->ReferenceCount);
+            Debug.Assert(ReferenceCount > 0);
+            newrefcnt = Interlocked.Decrement(ref ReferenceCount);
+
+            if (newrefcnt == CountNodes) {
+                if (CountNodes > 0) {
+                    //ISchedulerCpuReservation reservation = ((CpuResourceReservation)EnclosingActivity.GetResourceReservation(CpuResource.Provider().ResourceString)).schedulerReservation;
+                    Debug.Assert(MyRecurringCpuReservation != null);
+                    if (MyRecurringCpuReservation.Slice.Ticks > 0) {
+                        CpuResourceAmount amount = CpuResource.Provider().TimeToCpu(new TimeSpan(0));
+                        TimeSpan period = MyRecurringCpuReservation.Period;
+                        CpuResource.Provider().ReserveCpu(EnclosingActivity, amount, period); //release is a reservation for 0!
+                        Scheduler.LogRecurringCpuReservation(); //TODO: SIM-huh?
+                    }
+                    //system.SetNextThreadContext(GetThread(0)); //TODO: What does nextThread mean here?
+                    //TODO: Shouldn't we be just setting it to null and letting nextThread take care of it?
+                    return;
+                }
+                bool iflag = Processor.DisableInterrupts();
+                RialtoScheduler.DequeueActivity(this); // update RoundRobin queue, if required.
+                Processor.RestoreInterrupts(iflag);
+            }
+            Scheduler.LogDeleteActivity();
+        }
+
+        // find the runnable thread of an activity:
+        public RialtoThread GetRunnableThread()
+        {
+            OneShotReservation reservation = UnfinishedConstraints;
+            Debug.Assert(reservation == null || reservation.AssociatedActivity == null);
+            // avoid stack overflow : GetRunnableThread & GetRunnableThread
+
+            while (reservation != null) {
+                // search in the circular list
+                RialtoThread thread = reservation.GetRunnableThread();
+                if (thread != null) {
+                    return thread;
+                }
+                reservation = reservation.Next;
+                if (reservation == UnfinishedConstraints) {
+                    break;
+                }
+            }
+            return RunnableThreads;
+        }
+
+#region ISchedulerActivity Members
+        public override Activity EnclosingActivity
+        {
+            get { return enclosingActivity; }
+            set { enclosingActivity = value; }
+        }
+
+        public CpuResourceReservation CpuResourceReservation
+        {
+            get { return MyRecurringCpuReservation.EnclosingCpuReservation; }
+        }
+#endregion
+    }
+
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/RialtoProcessor.cs b/base/Kernel/Singularity/Scheduling/Rialto/RialtoProcessor.cs
new file mode 100644
index 0000000..b458387
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/RialtoProcessor.cs
@@ -0,0 +1,34 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RialtoProcessor.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// </summary>
+    public class RialtoProcessor : ISchedulerProcessor
+    {
+        private readonly Processor enclosingProcessor;
+
+        public RialtoProcessor(Processor processor)
+        {
+            enclosingProcessor = processor;
+        }
+
+        public override Processor EnclosingProcessor
+        {
+            get { return enclosingProcessor; }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/RialtoScheduler.cs b/base/Kernel/Singularity/Scheduling/Rialto/RialtoScheduler.cs
new file mode 100644
index 0000000..abe608e
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/RialtoScheduler.cs
@@ -0,0 +1,3162 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RialtoScheduler.cs
+//
+//  Note:
+//
+
+// #define LIFO
+#define ASCEND_RESERV
+#define LOG_SCHEDULER_DETAILS
+// #define DEBUG_TREE
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling
+{
+#if !SIMULATOR
+    public class SystemScheduler
+    {
+        static public void RegisterScheduler()
+        {
+            Rialto.RialtoScheduler.RegisterScheduler();
+        }
+    }
+#endif
+}
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// Summary description for RialtoScheduler.
+    /// </summary>
+    public class RialtoScheduler : ICpuScheduler
+    {
+#region Constants
+        static readonly TimeSpan AmountCpu = CpuResource.MaxPeriod; //(MaxPeriod * 100);
+        //TODO: TICKS vs. TIME_SPAN vs DATE_TIME
+
+        public static readonly TimeSpan ContextSwitch = new TimeSpan(200);
+        public static readonly TimeSpan MinSlice = new TimeSpan(10 * ContextSwitch.Ticks);
+        public static readonly TimeSpan AFewSlice =  new TimeSpan(3 * MinSlice.Ticks);
+        public static readonly TimeSpan RobinSlice = new TimeSpan(10 * TimeSpan.TicksPerMillisecond);
+#endregion
+
+#region Static data members
+        public static OneShotReservation     ReservationFreePool;
+        public static GraphNode SchedulerPlan;
+        //static GraphNode           NextPlan;
+        private static DateTime     changePlanTime;
+        // static Mutex   SchedPlanMutex;
+
+        public static GraphNode      CurrentPlanNode;
+
+        private static RialtoActivity      circularActivityList;
+        private static RialtoActivity      robinActivityNext;
+        private static RialtoActivity      robinActivityCurrent;  // activity currently executing from
+
+        //static TimeSpan       CurrentSlice;
+        private static TimeSpan     idleTime;
+        private static bool         idle;
+
+        private static RialtoThread     currentThreadGlobal;
+        public static bool          EarliestDeadlineFirstBlocked;
+
+        private static RialtoActivity      standbyActivities; // head of the Standby Activities list
+        private static RialtoActivity  currentStandbyActivity; // Standby Activity executing, if any
+
+        private static TimeSpan     robinSliceLeft = RialtoScheduler.RobinSlice; //new TimeSpan(0);  // the round robin list, if any, and its CPU slice
+
+        public static DateTime      SchedulingTime; // moment of the last reschedules
+        private static bool         needToReschedule;
+        private static RialtoThread     directSwitchTo;
+
+        private static TimeSpan     freeCpu;            // (freeCpu/AmountCpu) * 100. == % of CPU free
+
+        //static NodeProxy[]    nodeProxies;
+        private static ArrayList    nodeProxies = new ArrayList();
+        //static int            ProxyCount;
+        //static int            MaxProxies;
+
+        private static TimeSpan[][] freeSlots;       // root of helper data structure
+        //static int            FreeLevels;         // levels in the helper data structures
+
+        public static TimeSpan      LA_Time = RialtoScheduler.MinSlice;
+
+        private static TimeSpan     minPeriod;          // minimum period in the system
+
+        public static GraphNode          FreeNodes;           // list of free nodes in current scheduling tree
+        private static GraphNode         tempFreeNodes;       // list of free nodes in new scheduling tree
+
+        public static int           ResolutionAttempt;
+
+        private static int hackTries;
+
+#endregion
+
+        static public void RegisterScheduler()
+        {
+            CpuResource.RegisterSystemScheduler(new RialtoScheduler());
+        }
+
+        public override ISchedulerProcessor CreateSchedulerProcessor(Processor processor)
+        {
+            return new RialtoProcessor(processor);
+        }
+
+        public override ISchedulerThread CreateSchedulerThread(Thread thread)
+        {
+            return new RialtoThread(thread);
+        }
+
+        public override ISchedulerActivity CreateSchedulerActivity()
+        {
+            return new RialtoActivity();
+        }
+
+        public override ISchedulerCpuReservation ReserveCpu(ISchedulerActivity schedulerActivity, CpuResourceAmount cpuAmount, TimeSpan period)
+        {
+            RialtoActivity activity = (RialtoActivity) schedulerActivity;
+
+            if (activity.MyRecurringCpuReservation == null) {
+                activity.MyRecurringCpuReservation = new RecurringReservation();
+                activity.MyRecurringCpuReservation.Slice = new TimeSpan(0);
+                activity.MyRecurringCpuReservation.Period = CpuResource.MaxPeriod;
+            }
+            //Activity activity = GetActivity(activityId);
+            TimeSpan    oldSlice;
+            TimeSpan    oldPeriod;
+            TimeSpan    amount = CpuResource.Provider().CpuToTime(cpuAmount);
+            GraphNode   newSchedulerPlan;
+            GraphNode   oldSchedulerPlan;
+            TimeSpan    deltaReservation;
+            DateTime    timeNow;
+#if DEBUG_TREE
+            TimeSpan    requestedSlice = amount;
+            TimeSpan    requestedPeriod = period;
+#endif
+            bool    flagContext = false;
+            bool    localNeedToReschedule;
+            //  bool            InterruptsDisableFlag;
+            ulong   start;
+            ulong   stop;
+
+            //  if (InThreadContext()) {
+            //    Mutex_Lock(&SchedPlanMutex);
+            //    flagContext = true;
+            //  }
+            //  else {
+            //    Debug.Assert(Processor.InterruptsDisabled());
+            //  }
+            Scheduler.LogRecurringCpuReservation(); // record fixed cost
+            // hack!!!!
+            hackTries = 0;
+
+            start = Processor.CycleCount;
+
+            localNeedToReschedule = false;
+            oldSlice  = activity.MyRecurringCpuReservation.Slice;
+            oldPeriod = activity.MyRecurringCpuReservation.Period;
+            Debug.Assert(oldPeriod.Ticks != 0);
+
+            if (period.Ticks == 0) {
+                Debug.Assert(amount.Ticks == 0);
+                period = oldPeriod;
+            }
+            else if (amount.Ticks != 0) {
+                if (period > CpuResource.MaxPeriod) {
+                    amount = new TimeSpan((amount.Ticks * CpuResource.MaxPeriod.Ticks)/ period.Ticks);
+                    period = CpuResource.MaxPeriod;
+                }
+
+                if (amount < RialtoScheduler.MinSlice) {
+                    amount = RialtoScheduler.MinSlice;
+                    // DebugStub.Print("ReserveRecurringCpu:: S_FALSE amount < RialtoScheduler.MinSlice.\n");
+                    goto Exit;
+                }
+            }
+            else if (oldSlice.Ticks == 0) {
+                // case slice == 0
+                // DebugStub.Print("ReserveRecurringCpu:: S_OK amount == 0.\n");
+                goto Exit;
+            }
+            deltaReservation = new TimeSpan((amount.Ticks * AmountCpu.Ticks) / period.Ticks - (oldSlice.Ticks * AmountCpu.Ticks)/oldPeriod.Ticks);
+
+            // Handle a simple case first.
+
+            if (deltaReservation > freeCpu) {
+                // not enough free CPU
+                //      slice  = (TIME)((freeCpu + (oldSlice * AmountCpu)/oldPeriod) * period);
+                amount  = new TimeSpan((((freeCpu.Ticks + (oldSlice.Ticks * AmountCpu.Ticks)/oldPeriod.Ticks) * period.Ticks)/ AmountCpu.Ticks));
+                if (amount < RialtoScheduler.MinSlice)
+                    amount = new TimeSpan(0);
+                // DebugStub.Print("ReserveRecurringCpu:: S_FALSE deltaReservation > freeCpu.\n");
+                goto Exit;
+                // return old reservation
+            }
+
+            if (IncrementalReserveActivity(activity, ref amount, ref period)) {
+#if DEBUG_TREE
+                DebugStub.Print("IncReservActivity: 0x{0:x} Req: {1}/{2} Get: " +
+                                "{3}/{4} Activ {5}:{6}\n",
+                                __arglist(
+                                    activity,
+                                    requestedSlice,
+                                    requestedPeriod,
+                                    amount,
+                                    period,
+                                    activity.MyRecurringCpuReservation.Slice,
+                                    activity.MyRecurringCpuReservation.Period));
+
+                timeNow = SystemClock.GetKernelTime();
+
+                PrintSchedPlan(SchedulerPlan, timeNow);
+#endif
+
+                GetActivityRecurringCpuReservation(FreeNodes, out oldPeriod, out oldSlice);
+                freeCpu = new TimeSpan((oldSlice.Ticks * AmountCpu.Ticks) / oldPeriod.Ticks);
+#if VERBOSE
+                DebugStub.Print("ReserveRecurringCpu:: S_OK Via Incremental Reservation.\n");
+#endif
+                goto Exit;
+            }
+
+            activity.MyRecurringCpuReservation.Slice  = amount;
+            activity.MyRecurringCpuReservation.Period = period;
+
+            newSchedulerPlan = BuildSchedulerPlan();
+            // Scheduler.LogReservedActivity(ProxyCount);
+            if (newSchedulerPlan != null) {
+                // if successful
+                bool iflag = Processor.DisableInterrupts();
+
+                timeNow = SystemClock.GetKernelTime();
+                if (!OneShotReservation.SatisfyAcceptedConstraint(timeNow)) {
+                    Processor.RestoreInterrupts(iflag);
+                    FreeSchedulerPlan(newSchedulerPlan);
+                    activity.MyRecurringCpuReservation.Slice  = oldSlice;
+                    activity.MyRecurringCpuReservation.Period = oldPeriod;
+                    amount  = new TimeSpan((period.Ticks * freeCpu.Ticks)/AmountCpu.Ticks);
+#if VERBOSE
+                    DebugStub.Print("ReserveRecurringCpu:: S_FALSE SatisfyAcceptedConstraint false.\n");
+#endif
+                    goto Exit;
+                }
+                // TODO: compute time change
+                //  set a timer interrupt, if needed, for the moment when the plan will
+                //  change
+                oldSchedulerPlan = SynchronizeSchedulerPlans(newSchedulerPlan, timeNow, ref localNeedToReschedule);
+                Processor.RestoreInterrupts(iflag);
+
+                if (oldSchedulerPlan != null) {
+                    // this may execute with preemption enabled
+                    FreeSchedulerPlan(oldSchedulerPlan);
+                }
+                GetActivityRecurringCpuReservation(activity.MyRecurringCpuReservation.AssignedNodes, out period, out amount);
+                activity.MyRecurringCpuReservation.Slice  = amount;
+                activity.MyRecurringCpuReservation.Period = period;
+
+#if DEBUG_TREE
+                DebugStub.Print("ReservActivity: 0x{0:x} Req: {1}/{2} Get {3}/{4} --- {5}:{6}\n",
+                                __arglist(activity,
+                                          requestedSlice,
+                                          requestedPeriod,
+                                          amount,
+                                          period,
+                                          activity.MyRecurringCpuReservation.Slice,
+                                          activity.MyRecurringCpuReservation.Period));
+
+                PrintSchedPlan(newSchedulerPlan, timeNow);
+#endif
+                GetActivityRecurringCpuReservation(FreeNodes, out oldPeriod, out oldSlice);
+                freeCpu = new TimeSpan((oldSlice.Ticks * AmountCpu.Ticks) / oldPeriod.Ticks);
+
+            }
+            else {
+                // otherwise return old reservation (possible null)
+                Debug.Assert(oldPeriod.Ticks != 0);
+                activity.MyRecurringCpuReservation.Slice  = oldSlice;
+                activity.MyRecurringCpuReservation.Period = oldPeriod;
+                amount = new TimeSpan((period.Ticks * freeCpu.Ticks)/AmountCpu.Ticks);
+                minPeriod = SchedulerPlan.Period;
+#if VERBOSE
+                DebugStub.Print("ReserveRecurringCpu:: S_FALSE new scheduler plan null.\n");
+#endif
+            }
+#if VERBOSE
+            DebugStub.Print("ReserveRecurringCpu:: S_OK new scheduler plan.\n");
+#endif
+            Exit:
+                if (flagContext) {
+                    //    Debug.Assert(InThreadContext());
+                    //   if (localNeedToReschedule && !DuringBootstrap()) {
+                    //     RescheduleWithInterruptsEnabled();
+                    //  }
+                    //  localNeedToReschedule = false;
+                    //  Mutex_Unlock(&SchedPlanMutex);
+                }
+                else {
+                    if (localNeedToReschedule) {
+                        localNeedToReschedule = false;
+                        Reschedule();
+                    }
+                }
+                stop = Processor.CycleCount;
+#if PRINT_RESERV_OVERHEAD
+                DebugStub.Print("ReservActivity internal timing: {0} cycles, " +
+                                "Free CPU {0} " +
+                                "hackTries {0}\n",
+                                __arglist(stop-start,
+                                          freeCpu,
+                                          hackTries));
+#endif
+            if (activity.MyRecurringCpuReservation.Slice.Ticks == 0) {
+                activity.MyRecurringCpuReservation = null;
+            }
+            return activity.MyRecurringCpuReservation;
+        }
+
+        public override bool ShouldReschedule()
+        {
+            RialtoThread currentThread = GetCurrentThread();
+            if (Scheduler.TimerInterruptedFlag && currentThread != null) {
+                //SchedulerClock.CheckInterrupt();
+            }
+
+            if (currentThread == null || Scheduler.YieldFlag || currentThread.EnclosingThread.IsWaiting() || currentThread.EnclosingThread.IsStopped()) {
+                Reschedule();
+            }
+            return needToReschedule || Scheduler.TimerInterruptedFlag;
+            // || timer should have fired but didn't?
+        }
+
+        // DI -- this is somehow similar to EnableInterrupts
+        public override bool NextThread(out Thread nextThread)
+        {
+            Debug.Assert(!Processor.InterruptsDisabled());
+            bool iflag = Processor.DisableInterrupts();
+            bool halted = false;
+            RialtoThread currentThread = GetCurrentThread();
+
+            SchedulerClock.CheckInterrupt();
+            if (ShouldReschedule()) {
+                //Debug.Print("Calling RescheduleInterrupt()\n");
+                halted = RescheduleInterrupt(); //TODO: RescheduleInterrupt returns true if the processor needs to be halted.
+                currentThread = GetCurrentThread();
+            }
+            else {
+                //Debug.Print("No call to RescheduleInterrupt()\n");
+            }
+
+            if (currentThread != null) {
+                nextThread = currentThread.EnclosingThread;
+            }
+            else {
+                Debug.Assert(false);
+                nextThread = null;
+            }
+
+            if (nextThread != null) {
+                unchecked {
+                    Tracing.Log(Tracing.Debug, "NextThread => {0}",
+                                (UIntPtr)(uint)nextThread.GetThreadId());
+                }
+            }
+            else {
+                Tracing.Log(Tracing.Debug, "NextThread => none");
+            }
+
+            needToReschedule = false;
+            directSwitchTo = null;
+            // DebugStub.Print("-------------------------currentThread-Id {0}\n",
+            // __arglist(currentThread.Id));
+            //return currentThread;
+            Processor.RestoreInterrupts(iflag);
+            return halted;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //public static void Yield();
+
+        public RialtoScheduler()
+        {
+        }
+
+        public override void Initialize()
+        {
+            RialtoScheduler.InitializeScheduler();
+        }
+
+        /// <summary>
+        /// Initialize types that would otherwise cause dynamic allocations at runtime with preemption disabled
+        /// </summary>
+        static void InitializeSchedulerTypes()
+        {
+            Kernel.InitType(typeof(OneShotReservation));
+        }
+
+        public static void InitializeScheduler()
+        {
+            InitializeSchedulerTypes();
+
+            //TODO: Should all the null's be added in here?
+            SchedulerPlan = GraphNode.InitTree();
+            SchedulerPlan.NextExec = SystemClock.GetKernelTime(); //perhaps this should happen when the first thread is created, instead
+            CurrentPlanNode = SchedulerPlan;
+            FreeNodes    = SchedulerPlan;
+
+            SchedulingTime = SystemClock.GetKernelTime();
+            freeCpu = AmountCpu;
+
+            minPeriod = CpuResource.MaxPeriod;
+
+            TimeSpan currentSliceLeft = SchedulerPlan.Slice;
+            currentSliceLeft /* CurrentSlice */ = minInterval(currentSliceLeft , robinSliceLeft);
+            bool iflag = Processor.DisableInterrupts();
+            SchedulerClock.SetNextInterrupt(SchedulingTime + currentSliceLeft);
+            Processor.RestoreInterrupts(iflag);
+        }
+
+#region ISystemScheduler Members
+
+        public override void BeginDelayedConstraint(Hashtable resourceEstimates,
+                                                    TimeSpan relativeDeadline,
+                                                    ISchedulerTask taskToEnd,
+                                                    out ISchedulerTask schedulerTask)
+        {
+            TimeConstraint timeConstraint = new TimeConstraint();
+            timeConstraint.Estimate = CpuResource.Provider().CpuToTime((CpuResourceAmount)resourceEstimates[CpuResource.Provider().ResourceString]);
+            timeConstraint.Start = new DateTime(0); //Start now.
+            timeConstraint.RelativeDeadline = relativeDeadline;
+            timeConstraint.Deadline = new DateTime(0); //A 0-deadline means relative instead.
+            schedulerTask = Thread.CurrentThread.SchedulerThread.PrepareDelayedTask(taskToEnd, ref timeConstraint, SystemClock.GetKernelTime());
+        }
+
+        //I'm afraid the preemption needs to be disabled here around beginBeforeWait,
+        // but I feel like there was a problem.
+        public override bool BeginConstraint(Hashtable resourceEstimates,
+                                             DateTime deadline,
+                                             ISchedulerTask taskToEnd,
+                                             out ISchedulerTask schedulerTask)
+        {
+            DateTime timeNow = SystemClock.GetKernelTime();
+            RialtoThread thread = GetCurrentThread();
+            ulong start;
+            ulong stop;
+
+            Debug.Assert(!Processor.InterruptsDisabled());
+            Debug.Assert(taskToEnd == null || taskToEnd == thread.ReservationStack);
+
+            bool endPrevious = (taskToEnd != null);
+
+            thread.IpcCheckFreeConstraint();
+
+            start = Processor.CycleCount;
+            TimeConstraint constraint = new TimeConstraint();
+            constraint.Deadline = deadline;
+            constraint.Estimate = CpuResource.Provider().CpuToTime((CpuResourceAmount)resourceEstimates[CpuResource.Provider().ResourceString]);
+            constraint.Start = timeNow;
+
+            bool ok = thread.BeginConstraintBeforeWaitValidate(endPrevious, ref constraint, timeNow);
+            schedulerTask = thread.PendingReservation;
+            if (ok) {
+                OneShotReservation.BeginConstraintBeforeWait(thread, endPrevious, constraint, timeNow);
+                bool iflag = Processor.DisableInterrupts();
+                ok = OneShotReservation.ResolveConstraint(thread);
+                Processor.RestoreInterrupts(iflag);
+            }
+            else {
+                // DebugStub.Print("RialtoScheduler::BeginConstraintBeforeWaitValidate failed\n");
+            }
+            stop = Processor.CycleCount;
+
+            Scheduler.LogBeginConstraint(thread.EnclosingThread, ok, start, stop);
+
+            //TODO: Check if this is a necessity, or if it's only for sim time.  Call in wrapper if necessary.
+            //NextThread();
+            return ok;
+        }
+
+        public override bool EndConstraint(ISchedulerTask taskToEnd)
+        {
+            Debug.Assert(taskToEnd == GetCurrentThread().ReservationStack);
+            Debug.Assert(!Processor.InterruptsDisabled());
+            bool iflag = Processor.DisableInterrupts();
+            bool ok = OneShotReservation.EndPreviousConstraint(GetCurrentThread(), SystemClock.GetKernelTime());
+            //
+            // need to reschedule only if on a reserved slot and the top of EarliestDeadlineFirst doesn't
+            //  belong to this task
+            //
+            if ((OneShotReservation.CurrentReservation != null) &&
+                (OneShotReservation.GuaranteedReservations != null) &&
+                (OneShotReservation.GuaranteedReservations.ReservTask != (GetCurrentThread()))) {
+                Reschedule();
+            }
+
+            Processor.RestoreInterrupts(iflag);
+            Scheduler.LogEndConstraint();
+
+            //TODO: In the system wrapper for BeginConstraint -- it needs to call Yield/NextThread/MaybeYield
+            //NextThread();
+            return ok;
+        }
+
+#endregion
+
+#region Reserve Activity (x out of y) support functions
+
+        public static void FreeCurrentSchedulerPlan()
+        {
+            FreeSchedulerPlan(SchedulerPlan);
+        }
+
+        static void FreeSchedulerPlan(GraphNode oldPlan)
+        {
+            GraphNode leftNode, rightNode;
+            int i;
+
+            //    Debug.Assert(!Processor.InterruptsDisabled());
+            minPeriod = SchedulerPlan.Period;
+
+            if (oldPlan == null)
+                return;
+            if ((oldPlan.Type == GraphNode.NodeType.Free) || (oldPlan.Type == GraphNode.NodeType.Used)) {
+                leftNode = oldPlan.Next; // reuse local
+                FreeSchedulerPlan(leftNode);
+            }
+            else {
+                leftNode = oldPlan.Left;
+                rightNode = oldPlan.Right;
+                FreeSchedulerPlan(leftNode);
+                FreeSchedulerPlan(rightNode);
+            }
+
+            for (i = 0; i < oldPlan.ReservCount; i++) {
+                //  DebugStub.Print("FreeSchedulerPlan {0} {1}\n",
+                // __arglist(POINTER(oldPlan->ReservationArray[i]),
+                // POINTER(oldPlan->ReservationArray[i])->ReferenceCount));
+                ReleaseReservation(oldPlan.ReservationArray[i].AssociatedReservation);
+            }
+            if (oldPlan.Type == GraphNode.NodeType.Used) {
+                Interlocked.Decrement(ref oldPlan.DefaultActivity.CountNodes);
+                ActivityObjRelease(oldPlan.DefaultActivity);
+            }
+            oldPlan = null;    //free(oldPlan);
+        }
+
+        static int  NextProxyOnLevel(int nextProxy, int level)
+        {
+            for (int i = nextProxy; i < nodeProxies.Count; i++) {
+                if (((NodeProxy)nodeProxies[i]).TreeLevel == level) {
+                    return i;
+                }
+            }
+            return nodeProxies.Count;
+        }
+
+        /// <summary>
+        /// Search for the existence of any node with a higher TreeLevel "under" me.
+        /// </summary>
+        /// <param name="Level">TreeLevel (basically tree position, 2^level + place in row)</param>
+        /// <returns></returns>
+        static bool NextProxyOnHigherLevel(int level)
+        {
+            // search for a node w/ TreeLevel in a 'cone' under Level
+            for (int i = 0; i < nodeProxies.Count; i++) {
+                int min = (level << 1) + 1;
+                int max = (level << 1) + 2;
+                while (((NodeProxy)nodeProxies[i]).TreeLevel >= min) {
+                    if (((NodeProxy)nodeProxies[i]).TreeLevel <= max) {
+                        return true;
+                    }
+                    min = (min << 1) + 1;
+                    max = (max << 1) + 2;
+                }
+            }
+            return false;
+        }
+
+        static void ActivityAddNode(RialtoActivity activity)
+        {
+            Interlocked.Increment(ref activity.CountNodes);
+            ActivityObjAddRef(activity);
+        }
+
+        static void ActivityRemoveNode(RialtoActivity activity)
+        {
+            int newrefcnt;
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            ActivityReleaseProtected(activity);
+            newrefcnt = Interlocked.Decrement(ref activity.CountNodes);
+
+            Debug.Assert(newrefcnt >= 0);
+
+        }
+
+        // CK: Recursive function to build the GraphNode tree from the GraphNode Proxies.
+        // NOTE: Level refers to tree position in full binary tree -- not row.
+        static GraphNode BuildLevel(int Level, TimeSpan Period, TimeSpan timeLeft, int NextProxy)
+        {
+            int i;
+            GraphNode ptemp;
+
+            if (timeLeft < RialtoScheduler.MinSlice)
+                return null;
+
+            ptemp = new GraphNode(); //(PNODE)malloc(sizeof (GraphNode));
+            //memset(ptemp, 0, sizeof(GraphNode));
+
+            ptemp.TimeToOrigin = timeLeft;
+            Debug.Assert(Period.Ticks % minPeriod.Ticks == 0);
+            ptemp.Period = Period;
+
+            if ((i = NextProxyOnLevel(NextProxy, Level)) < nodeProxies.Count) {
+                // allocate an Used GraphNode
+
+                ptemp.Type = GraphNode.NodeType.Used;
+                ptemp.Slice = ((NodeProxy)nodeProxies[i]).Slice;
+                Debug.Assert(ptemp.Slice >= RialtoScheduler.MinSlice);
+                Debug.Assert(Period == ((NodeProxy)nodeProxies[i]).Period);
+                ptemp.DefaultActivity = ((NodeProxy)nodeProxies[i]).AssociatedActivity;
+                ActivityAddNode(ptemp.DefaultActivity);
+
+                ptemp.SameActivityNext = ptemp.DefaultActivity.MyRecurringCpuReservation.TempAssignedNodes;
+                ptemp.DefaultActivity.MyRecurringCpuReservation.TempAssignedNodes = ptemp;
+
+                ptemp.Left = ptemp.Right = null;
+                ptemp.Next = BuildLevel(Level, Period,
+                    timeLeft - ptemp.Slice - RialtoScheduler.ContextSwitch, i + 1);
+            }
+            else if (NextProxyOnHigherLevel(Level)) {
+                ptemp.Type = GraphNode.NodeType.LeftBranch;
+                ptemp.Slice = timeLeft;
+                ptemp.Next  = null;
+                ptemp.Left  = BuildLevel(2 * Level + 1, Period+Period, timeLeft, 0);
+                ptemp.Right = BuildLevel(2 * Level + 2, Period+Period, timeLeft, 0);
+            }
+            else {
+                // free node
+                ptemp.Type = GraphNode.NodeType.Free;
+                ptemp.Slice = timeLeft;
+                ptemp.Next  = null;
+                ptemp.SameActivityNext = tempFreeNodes;
+                tempFreeNodes = ptemp;
+            }
+            return ptemp;
+        }
+
+        static void FreeHelperDataStructures()
+        {
+            // Free the (FreeLevels) freeSlots Arrays!
+            if (freeSlots != null) {
+                for (int i = 0; i < freeSlots.Length; i++) {
+                    freeSlots[i] = null; //free(freeSlots[i]);
+                }
+                if (freeSlots != null) {
+                    freeSlots = null; //free(freeSlots);
+                }
+            }
+            nodeProxies = null; //free(nodeProxies); // free the ordered array of reservations
+        }
+
+        static bool BuildHelperDataStructures()
+        {
+            int     count, i;
+            RialtoActivity ptemp;
+            TimeSpan    T;
+
+            // Allocate 'nodeProxies', 'ordered array' of node proxies:
+            nodeProxies = new ArrayList(); //NodeProxy[MaxProxies]; //(NodeProxy*) malloc(MaxProxies * sizeof(NodeProxy));
+            //for (i=0; i<MaxProxies; i++) { nodeProxies.Insert(i, new NodeProxy()); } //memset(nodeProxies, 0, MaxProxies * sizeof(NodeProxy));
+
+            //ProxyCount = 0;
+            minPeriod = CpuResource.MaxPeriod;
+
+            ptemp = circularActivityList;
+
+            // Order Activities w/ a non-zero reservation in the 'nodeProxies' array!
+            do {
+                if (ptemp.MyRecurringCpuReservation != null && ptemp.MyRecurringCpuReservation.Slice.Ticks != 0) {
+                    //Debug.Assert(nodeProxies.Count <= MaxProxies);
+                    for (i = 0; i < nodeProxies.Count; i++) // find the right place
+#if ASCEND_PERIOD //Sort the NodeProxy array in ascending order of period i.e. (out of N)
+                        if ((ptemp.Period   < ((NodeProxy)nodeProxies[i]).Period) ||
+                        ((ptemp.Period == ((NodeProxy)nodeProxies[i]).Period) &&
+                            (ptemp.Slice   > ((NodeProxy)nodeProxies[i]).Slice)))
+                            break;
+# else
+#if ASCEND_RESERV //Sort the NodeProxy array in descending order of fraction of CPU
+                        //NOTE: The multiplication in numerator and denominator is to allow this to be done as integer math.
+                        //This is testing if (ptemp.MyRecurringCpuReservation.Slice.Ticks) / ptemp.MyRecurringCpuReservation.Period.Ticks > (((NodeProxy)nodeProxies[i]).Slice.Ticks) / ((NodeProxy)nodeProxies[i]).Period.Ticks
+                        //Converting to multiply only, for integer math.
+                        if ((ptemp.MyRecurringCpuReservation.Slice.Ticks * ((NodeProxy)nodeProxies[i]).Period.Ticks) >
+                            (((NodeProxy)nodeProxies[i]).Slice.Ticks * ptemp.MyRecurringCpuReservation.Period.Ticks))
+                            break;
+                    //                        if ((ptemp.MyRecurringCpuReservation.Slice.Ticks * AmountCpu.Ticks * 100) / ptemp.MyRecurringCpuReservation.Period.Ticks > //TODO: Is this enough for accurate?  Or just "close enough"?
+                    //                            (((NodeProxy)nodeProxies[i]).Slice.Ticks * AmountCpu.Ticks * 100) / ((NodeProxy)nodeProxies[i]).Period.Ticks)
+                    //                            break;
+#else
+                        break; //TODO: Does this mean anything?
+#endif
+# endif
+                    // make room for the new activity
+
+                    //if (i < ProxyCount)
+                    //Array.Copy(nodeProxies, i, nodeProxies, i+1, ProxyCount - i);
+                    //memmove(&(nodeProxies[i+1]), &(nodeProxies[i]),
+                    //    sizeof(NodeProxy) * (ProxyCount - i));
+                    nodeProxies.Insert(i, new NodeProxy());
+
+                    //ProxyCount++;
+                    //Debug.Assert(nodeProxies.Count <= MaxProxies);
+
+                    ((NodeProxy)nodeProxies[i]).AssociatedActivity = ptemp;
+                    ((NodeProxy)nodeProxies[i]).Slice    = ptemp.MyRecurringCpuReservation.Slice;
+                    ((NodeProxy)nodeProxies[i]).Period  = ptemp.MyRecurringCpuReservation.Period;
+                    ((NodeProxy)nodeProxies[i]).TreeLevel = -1;
+                    if (((NodeProxy)nodeProxies[i]).Period < minPeriod)
+                        minPeriod = ((NodeProxy)nodeProxies[i]).Period;
+                }
+                ptemp = ptemp.Next;
+            } while (ptemp != circularActivityList);
+
+            Debug.Assert(minPeriod <= CpuResource.MaxPeriod);
+            int freeLevels = 0;
+            freeSlots = null;
+            for (i = 0; i < nodeProxies.Count; i++) {
+                T = minPeriod;
+                count = 0;
+
+                while ((((NodeProxy)nodeProxies[i]).Period >= T+T) && (T+T <= CpuResource.MaxPeriod)) {
+                    T = T+T;
+                    count++;
+                }
+
+                if (count > freeLevels) {
+                    //NOTE: Basically FreeLevels is the max height of the tree (free list)
+                    freeLevels = count;
+                }
+
+                //Store the slice as the scaled slice (fraction of the period).
+                ((NodeProxy)nodeProxies[i]).Slice = new TimeSpan((((NodeProxy)nodeProxies[i]).Slice.Ticks * T.Ticks)/((NodeProxy)nodeProxies[i]).Period.Ticks);
+
+                if (((NodeProxy)nodeProxies[i]).Slice < RialtoScheduler.MinSlice) {
+                    //free(nodeProxies);
+                    return false;
+                }
+                Debug.Assert(T.Ticks % minPeriod.Ticks == 0);
+                ((NodeProxy)nodeProxies[i]).Period = T;
+                ((NodeProxy)nodeProxies[i]).FreeLevel = count; //CK NOTE: This is essentially the level in the tree this reservation preferably goes.
+            }
+
+            // Allocate level 0 activities:
+            for (i = 0, T = minPeriod, count = 0; i < nodeProxies.Count; i++) {
+                if (((NodeProxy)nodeProxies[i]).Period == minPeriod) {
+                    ((NodeProxy)nodeProxies[i]).TreeLevel = 0;
+                    T -= RialtoScheduler.ContextSwitch + ((NodeProxy)nodeProxies[i]).Slice;
+                }
+                else {
+                    Debug.Assert(((NodeProxy)nodeProxies[i]).Period.Ticks % minPeriod.Ticks == 0);
+                    count++;
+                }
+            }
+
+            if ((count > 0) && (T < RialtoScheduler.MinSlice)) { //CK- There exist non-level-0 activities, but not enough schedule time Left for more scheduled activities
+                //      free(nodeProxies);
+                return false;
+            }
+
+            // Allocate the (FreeLevels) freeSlots Arrays!
+            freeLevels +=1;
+            freeSlots = new TimeSpan[freeLevels][]; //(FREESLOT**) malloc(FreeLevels * sizeof(FREESLOT *));
+            for (i = 0; i < freeSlots.Length; i++) {
+                freeSlots[i] = new TimeSpan[1 << i]; //(FREESLOT*) malloc((1 << i) * sizeof(FREESLOT));
+            }
+
+            for (i = 0; i < freeSlots.Length; i++) {
+                for (count = 0; count < (1 << i); count++) {
+                    freeSlots[i][count] = T; //CK- Initialize all free slots to have T (time left after level-0 activities)
+                }
+            }
+
+            return true;
+        }
+
+        // <summary>
+        // Returns the first index of a NodeProxy which has TreeLevel == -1
+        // </summary>
+        static int NextProxy(int ProxyIndex)
+        {
+            while ((ProxyIndex < nodeProxies.Count) &&
+                   (((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel != -1)) {
+                ProxyIndex++;
+            }
+            return ProxyIndex;
+        }
+
+        // <summary>
+        // Returns NextProxy(0)
+        // </summary>
+        static int FirstProxy()
+        {
+            return NextProxy(0);
+        }
+
+        /// <summary>
+        /// Updates freeSlots by subtracting the slice from all appropriate descendants and parents.
+        /// </summary>
+        /// <param name="AllocLevel"></param>
+        /// <param name="AllocPosition"></param>
+        /// <param name="Slice"></param>
+        static void SubtractSlice(int AllocLevel, int AllocPosition, TimeSpan Slice)
+        {
+            int Level, Position, Sibling, ParentPosition, i;
+
+            freeSlots[AllocLevel][AllocPosition] -= Slice;
+
+            Debug.Assert(freeSlots[AllocLevel][AllocPosition].Ticks >= 0);
+
+            // update Free Slots; the larger periods first:
+            // CK- At all points in time, freeSlots seems to keep the time available at the slot, to adding to a place in the tree requires reducing all descendants
+            for (i = 1; AllocLevel + i < freeSlots.Length; i++) {
+                for (Position = AllocPosition * (1 << i);
+                     Position < (AllocPosition + 1) * (1 << i); Position++) {
+                    Debug.Assert(freeSlots[AllocLevel + i][Position] >= Slice);
+                    freeSlots[AllocLevel + i][Position] -= Slice;
+                }
+            }
+
+            // smaller periods Next:
+            // CK- Update parent(s) if we now have less than our sibling. (parent is min of me and sibling).
+            for (Level = AllocLevel, Position = AllocPosition;
+                 Level > 0; Level--, Position = ParentPosition) {
+                Sibling = (Position & 0x01)==1 ? Position - 1 : Position + 1;
+                if (freeSlots[Level][Position] >= freeSlots[Level][Sibling]) {
+                    break; // no need to go further
+                }
+                ParentPosition = Position >> 1;
+                freeSlots[Level - 1][ParentPosition] = freeSlots[Level][Position];
+            }
+        }
+
+        /// <summary>
+        /// Updates freeSlots by adding the slice to all appropriate descendants and parents.
+        /// </summary>
+        /// <param name="AllocLevel"></param>
+        /// <param name="AllocPosition"></param>
+        /// <param name="Slice"></param>
+        static void AddSlice(int AllocLevel, int AllocPosition, TimeSpan Slice)
+        {
+            int Level, Position, Sibling, ParentPosition, i;
+
+            freeSlots[AllocLevel][AllocPosition] += Slice;
+
+            //Update Free Slots; the larger periods first:
+            for (i = 1; AllocLevel + i < freeSlots.Length; i++) {
+                for (Position = AllocPosition * (1 << i);
+                     Position < (AllocPosition + 1) * (1 << i);
+                     Position++) {
+                    freeSlots[AllocLevel + i][Position] += Slice;
+                }
+            }
+
+            // smaller periods Next:
+            for (Level = AllocLevel, Position = AllocPosition;
+                 Level > 0; Level--, Position = ParentPosition) {
+                Sibling = (Position & 0x01)==1 ? Position - 1 : Position + 1;
+                ParentPosition = Position >> 1;
+                if (freeSlots[Level][Position] <= freeSlots[Level][Sibling]) {
+                    freeSlots[Level - 1][ParentPosition] = freeSlots[Level][Position];
+                }
+                else {
+                    freeSlots[Level - 1][ParentPosition] = freeSlots[Level][Sibling];
+                }
+            }
+        }
+
+        // Temporarily, it disrupts the order of the 'NodeProxy' array
+        static void SplitSlice(int ProxyIndex, TimeSpan AllocSlice)
+        {
+            Debug.Assert(AllocSlice >= RialtoScheduler.MinSlice);
+
+            //            if (nodeProxies.Count == MaxProxies) {
+            //                MaxProxies += GraphNode.MaxProxySplits;
+            //                //ArrayList already takes care of the allocation
+            //                //nodeProxies = (NodeProxy*) realloc(nodeProxies, MaxProxies * sizeof(NodeProxy));
+            //            }
+            //memmove(&nodeProxies[ProxyIndex + 1], &nodeProxies[ProxyIndex],
+            //    sizeof(NodeProxy) * (ProxyCount - ProxyIndex));
+
+            //ProxyCount++;
+            nodeProxies.Insert(ProxyIndex+1, ((NodeProxy)nodeProxies[ProxyIndex]).Clone());
+            //Debug.Assert(nodeProxies.Count <= MaxProxies);
+
+            ((NodeProxy)nodeProxies[ProxyIndex + 1]).Slice = ((NodeProxy)nodeProxies[ProxyIndex]).Slice - AllocSlice;
+            ((NodeProxy)nodeProxies[ProxyIndex]).Slice = AllocSlice;
+        }
+
+        // Expects the split to be performed by 'SplitSlice' above.
+        static void RestoreSlice(int ProxyIndex)
+        {
+            Debug.Assert(((NodeProxy)nodeProxies[ProxyIndex + 1]).AssociatedActivity == ((NodeProxy)nodeProxies[ProxyIndex]).AssociatedActivity);
+
+            ((NodeProxy)nodeProxies[ProxyIndex]).Slice += ((NodeProxy)nodeProxies[ProxyIndex + 1]).Slice;
+
+            nodeProxies.RemoveAt(ProxyIndex+1);
+        }
+
+        /// <summary>
+        /// Next largest less than previous max.
+        /// </summary>
+        /// <param name="PrevMax"></param>
+        /// <param name="PrevIndex"></param>
+        /// <param name="Level"></param>
+        /// <returns></returns>
+        static int NextLargestFreeSlot(TimeSpan PrevMax, int PrevIndex, int Level)
+        {
+            TimeSpan[]  LevelSlots;
+            int         position, MaxPosition = (1 << Level);
+            TimeSpan        MaxValue = RialtoScheduler.MinSlice;
+
+            LevelSlots = freeSlots[Level];
+            for (position = 0; position < LevelSlots.Length; position++) {
+                if ((LevelSlots[position] < PrevMax) ||
+                    ((LevelSlots[position] == PrevMax) && (position > PrevIndex))) {
+                    if (LevelSlots[position] > MaxValue) {
+                        MaxPosition = position;
+                        MaxValue    = LevelSlots[position];
+                    }
+                }
+            }
+            return MaxPosition;
+        }
+
+        /// <summary>
+        /// Assigns Activities (w/ non-zero reservations) to their Scheduling Tree Branches/SubTrees
+        /// Recursive.
+        /// </summary>
+        /// <param name="ProxyIndex"></param>
+        /// <returns></returns>
+        static bool AssignBranch(int ProxyIndex)
+        {
+            int         level, position;
+            TimeSpan    slice, FirstHalf;
+            TimeSpan[]  LevelSlots;
+
+            if (hackTries++ > GraphNode.MaxMarcelTries) {
+                return false;
+            }
+            if (ProxyIndex >= nodeProxies.Count) {
+                return true;
+            }
+            level = ((NodeProxy)nodeProxies[ProxyIndex]).FreeLevel;
+            Debug.Assert(level >= 0);
+
+            LevelSlots = freeSlots[level];
+            slice = ((NodeProxy)nodeProxies[ProxyIndex]).Slice;
+            if (slice < RialtoScheduler.MinSlice) {
+                return false;
+            }
+
+            // Search for a fit that will leave enough free time in slot:
+            for (position = NextLargestFreeSlot(TimeSpan.MaxValue, 0, level);
+                 position < LevelSlots.Length;
+                 position = NextLargestFreeSlot(LevelSlots[position], position, level)) {
+                if (LevelSlots[position] - slice - RialtoScheduler.ContextSwitch >= RialtoScheduler.MinSlice) {
+                    // try allocation
+                    SubtractSlice(level, position, slice + RialtoScheduler.ContextSwitch);
+                    //Note: TreeLevel is a composite number.  Its value defines both the freelevel and the
+                    //position within that level.  It's of magnitude 1 << level, guaranteeing that
+                    //position is less than 1 << level, so you can tell the level by the magnitude, and the
+                    //position by looking at the remainder, so to speak.
+                    ((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel = (1 << level) - 1 + position;
+                    if (AssignBranch(NextProxy(ProxyIndex))) {
+                        // try allocate Next activity
+                        return true; // look for A solution, not for the BEST one
+                    }
+
+                    ((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel = -1;
+                    AddSlice(level, position, slice + RialtoScheduler.ContextSwitch); // restore the freeSlots[] values
+                }
+                else {
+                    //Since the slot is only getting smaller, no need to continue looking.
+                    break;
+                }
+            }
+
+            // Search for a 'perfect fit':
+            for (position = 0; position < LevelSlots.Length; position++) {
+                if ((slice <= LevelSlots[position]) && // try allocation
+                    (LevelSlots[position] - slice < (RialtoScheduler.AFewSlice))) {
+
+                    ((NodeProxy)nodeProxies[ProxyIndex]).Slice = LevelSlots[position];
+                    SubtractSlice(level, position, LevelSlots[position]);
+
+                    //Note: TreeLevel is a composite number.  Its value defines both the freelevel and the
+                    //position within that level.  It's of magnitude 1 << level, guaranteeing  that
+                    //position is less than 1 << level, so you can tell the level by the magnitude, and the
+                    //position by looking at the remainder, so to speak.
+                    ((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel = (1 << level) - 1 + position; // assign branch
+                    if (AssignBranch(NextProxy(ProxyIndex))) {
+                        // try allocate Next activity
+                        return true; // return if successful (look for A solution, not for the BEST one)
+                    }
+                    ((NodeProxy)nodeProxies[ProxyIndex]).Slice = slice;
+                    ((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel = -1;
+                    AddSlice(level, position, LevelSlots[position]); // restore the freeSlots[] values
+                }
+            }
+
+            // We'll have to split the slice:
+            for (position = NextLargestFreeSlot(TimeSpan.MaxValue, 0, level);
+                position < LevelSlots.Length;
+                position = NextLargestFreeSlot(LevelSlots[position], position, level)) {
+
+                FirstHalf = minInterval(LevelSlots[position] - RialtoScheduler.MinSlice - RialtoScheduler.ContextSwitch,
+                    slice - RialtoScheduler.MinSlice - RialtoScheduler.ContextSwitch);
+                if (FirstHalf >= RialtoScheduler.MinSlice) {
+                    Debug.Assert(LevelSlots[position] >= RialtoScheduler.MinSlice + FirstHalf);
+                    SplitSlice(ProxyIndex, FirstHalf);
+                    SubtractSlice(level, position, FirstHalf + RialtoScheduler.ContextSwitch);
+                    //Note: TreeLevel is a composite number.  Its value defines both the freelevel and the
+                    //position within that level.  It's of magnitude 1 << level, guaranteeing  that
+                    //position is less than 1 << level, so you can tell the level by the magnitude, and the
+                    //position by looking at the remainder, so to speak.
+                    ((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel = (1 << level) - 1 + position;
+                    if (AssignBranch(NextProxy(ProxyIndex))) {
+                        return true; // look for A solution, not for the BEST one
+                    }
+                    ((NodeProxy)nodeProxies[ProxyIndex]).TreeLevel = -1;
+                    AddSlice(level, position, FirstHalf + RialtoScheduler.ContextSwitch); // restore Previous freeSlots[]
+                    RestoreSlice(ProxyIndex);
+                }
+                else {
+                    //No point in continuing, the slots only get smaller.
+                    break;
+                }
+            }
+#if NOT_DEFINED
+            if (slice > (RialtoScheduler.MinSlice << 1)) {
+                FirstHalf = slice >> 1;
+                for (position = 0; position < LevelSlots.Length; position++) {
+                    if (LevelSlots[position] - FirstHalf - RialtoScheduler.ContextSwitch >= RialtoScheduler.MinSlice) {
+                        // try allocation w/ split
+                        Debug.Assert(LevelSlots[position] >= RialtoScheduler.MinSlice);
+                        SplitSlice(ProxyIndex, FirstHalf);
+                        SubtractSlice(level, position, FirstHalf + RialtoScheduler.ContextSwitch);
+                        nodeProxies[ProxyIndex].TreeLevel = (1 << level) - 1 + position;
+                        if (AssignBranch(NextProxy(ProxyIndex))) {
+                            return true; // look for A solution, not for the BEST one
+                        }
+                        nodeProxies[ProxyIndex].TreeLevel = -1;
+                        AddSlice(level, position, FirstHalf + RialtoScheduler.ContextSwitch); // restore Previous freeSlots[]
+                        RestoreSlice(ProxyIndex);
+                    }
+                }
+            }
+#endif
+            // Sorry....
+            return false;
+        }
+
+        static GraphNode BuildSchedulerPlan()
+        {
+            GraphNode newPlan = null;
+
+            if (circularActivityList == null) {
+                // build a 'large' free node
+                newPlan = GraphNode.InitTree();
+            }
+            else {
+                if (BuildHelperDataStructures()) {
+                    // build the sorted nodeProxies and freeSlots arrays
+
+                    Scheduler.LogReservedActivity(nodeProxies.Count); // record additional cost
+                    if (AssignBranch(FirstProxy())) {
+                        newPlan = BuildLevel(0,     // Level
+                                             minPeriod,// Period
+                                             minPeriod,// timeLeft
+                                             0);  // NextProxy
+                    }
+                }
+            }
+            FreeHelperDataStructures();
+            return newPlan;
+        }
+
+        // TODO: (OLD) look only to the list of nodes of the activity
+        static TimeSpan ReservedPeriod(GraphNode plan, RialtoActivity activity)
+        {
+            if (plan == null) {
+                return new TimeSpan(0);
+            }
+
+            switch(plan.Type)
+            {
+                case GraphNode.NodeType.Used:
+                    if (plan.DefaultActivity == activity) {
+                        return maxInterval(plan.Period, ReservedPeriod(plan.Next, activity));
+                    }
+                    else {
+                        return ReservedPeriod(plan.Next, activity);
+                    }
+                case GraphNode.NodeType.Free:
+                    return ReservedPeriod(plan.Next, activity);
+                default:  // branch node
+                    return maxInterval(ReservedPeriod(plan.Left, activity),
+                        ReservedPeriod(plan.Right, activity));
+            }
+        }
+
+        // TODO  - look only to the list of nodes of the activity
+        static TimeSpan ReservedSlice(GraphNode plan, TimeSpan period, RialtoActivity activity)
+        {
+            if (plan == null) {
+                return new TimeSpan(0);
+            }
+
+            switch(plan.Type)
+            {
+                case GraphNode.NodeType.Used:
+                    if (plan.DefaultActivity == activity) {
+                        return (new TimeSpan((plan.Slice.Ticks * period.Ticks) / plan.Period.Ticks) +
+                                ReservedSlice(plan.Next, period, activity));
+                    }
+                    else {
+                        return ReservedSlice(plan.Next, period, activity);
+                    }
+                case GraphNode.NodeType.Free:
+                    return ReservedSlice(plan.Next, period, activity);
+                default: // branch node
+                    return ReservedSlice(plan.Left, period, activity) +
+                        ReservedSlice(plan.Right, period, activity);
+            }
+        }
+
+        static void  GetActivityRecurringCpuReservation(GraphNode startList, out TimeSpan period, out TimeSpan slice)
+        {
+            GraphNode node;
+            TimeSpan  tempPeriod, tempSlice;
+
+            if ((node = startList) == null) {
+                period = CpuResource.MaxPeriod;
+                slice = new TimeSpan(0);
+                return;
+            }
+            tempPeriod = new TimeSpan(0);
+            tempSlice = new TimeSpan(0);
+            while (node != null) {
+                if (node.Period > tempPeriod) tempPeriod = node.Period;
+                node = node.SameActivityNext;
+            }
+            Debug.Assert(tempPeriod.Ticks != 0);
+            node = startList;
+            while (node != null) {
+                tempSlice += new TimeSpan((node.Slice.Ticks * tempPeriod.Ticks) / node.Period.Ticks);
+                node = node.SameActivityNext;
+            }
+            period = tempPeriod;
+            slice = tempSlice;
+            return;
+        }
+
+        static void SetNextExec(GraphNode plan, DateTime time)
+        {
+            if (plan == null) {
+                return;
+            }
+
+            plan.NextExec = time;
+
+            if (plan.Type == GraphNode.NodeType.LeftBranch) {
+                SetNextExec(plan.Left, time);
+                SetNextExec(plan.Right, time + plan.Period);
+            }
+            else if (plan.Type == GraphNode.NodeType.RightBranch) {
+                SetNextExec(plan.Left, time + plan.Period);
+                SetNextExec(plan.Right, time);
+            }
+            else
+                SetNextExec(plan.Next, time + plan.Slice + RialtoScheduler.ContextSwitch);
+
+        }
+
+        static GraphNode SynchronizeSchedulerPlans(GraphNode newPlan,
+                                                   DateTime timeChange,
+                                                   ref bool localNeedToReschedule)
+        {
+            GraphNode oldPlan;
+            RialtoActivity activity = circularActivityList; // any pointer into the activity circular list works
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            // set the pointers to the Used and Free nodes in the new plan:
+            FreeNodes = tempFreeNodes;
+            tempFreeNodes = null;
+            do {
+                if (activity.MyRecurringCpuReservation != null && activity.MyRecurringCpuReservation.Slice.Ticks > 0) {
+                    activity.MyRecurringCpuReservation.AssignedNodes = activity.MyRecurringCpuReservation.TempAssignedNodes;
+                    activity.MyRecurringCpuReservation.TempAssignedNodes = null;
+                }
+                activity = activity.Next;
+            } while (activity != circularActivityList);
+
+#if VERBOSE
+            DebugStub.Print("SettingNextExec: {0}\n", __arglist(timeChange.Ticks));
+#endif
+            SetNextExec(newPlan, timeChange); // TODO: extend later!
+
+            oldPlan = SchedulerPlan;
+            SchedulerPlan = newPlan;
+            CurrentPlanNode = SchedulerPlan;
+            localNeedToReschedule = true;
+
+            return oldPlan;
+        }
+
+        static void ClearActivityNodes(GraphNode startNode,
+                                       RialtoActivity activity)
+        {
+            GraphNode temp;
+
+            if (startNode == null) {
+                return;
+            }
+
+            temp = startNode;
+            Debug.Assert((temp.Type == GraphNode.NodeType.Used) && (temp.DefaultActivity == activity));
+
+            while (temp.SameActivityNext != null) {
+                ActivityRemoveNode(activity);
+                temp.Type = GraphNode.NodeType.Free;
+                temp = temp.SameActivityNext;
+                Debug.Assert((temp.Type == GraphNode.NodeType.Used) && (temp.DefaultActivity == activity));
+            }
+
+            ActivityRemoveNode(activity);   // for the last node in the list
+            temp.Type = GraphNode.NodeType.Free;
+            temp.DefaultActivity = null;
+
+            // this should be non preemptible
+            temp.SameActivityNext = FreeNodes;
+            FreeNodes = startNode;
+        }
+
+        // attaches nodes found to TempAssignedNodes
+        static bool AllocateActivityNodes(RialtoActivity activity,
+                                          ref TimeSpan slice,
+                                          ref TimeSpan period)
+        {
+            GraphNode node, bestNode = null;
+            GraphNode tmpNode, tmpBest = null;
+            TimeSpan  adjustedSlice, bestPeriod = new TimeSpan(0), diffSlice;
+            bool  split = false;
+            bool iflag = false; //So far we haven't disabled preemption.
+            TimeSpan bestDiffSlice = new TimeSpan(0), currentPeriod;
+            bool currentSplit;
+            GraphNode rightNode, leftNode, next, free;
+            for (tmpNode = null, node = FreeNodes; node != null; tmpNode = node, node = node.SameActivityNext) {
+                //node = *tmpNode;
+                Debug.Assert(node.Type == GraphNode.NodeType.Free);
+
+                if (node.Period > period ||
+                    node.Period < bestPeriod) {
+                    continue;
+                }
+
+                // the activity may be assigned a node with reservations
+                //  this increases the chances to find a node, although
+                //  with such a node, the activity will not fully benefit of the
+                //  allocation until the reservations are finished
+                //  The alternative to the current choice:
+                //  if (node.ReservCount > 0)
+                //      continue;
+
+                // S97 -- if the request's period is larger than the maximum period
+                //        in the system, extend the tree with branch and activity
+                //        nodes instead of converting the reservation to the maximum
+                //        existing period
+                //     -- is a request's period is equal to some period in the system, pick
+                //        the best free node (not the first fit node) to make the
+                //        reservation from.
+
+                // - node.Next != null -- can not be transformed in a branch node
+                //                        apply the scaling technique
+                // - node.Next == null
+                if (node.Next != null || node.ReservCount != 0) {
+                    currentPeriod = node.Period;
+                }
+                else {
+                    currentPeriod = period;
+                }
+                diffSlice = new TimeSpan(-1);
+
+
+                while (currentPeriod >= node.Period) {
+                    adjustedSlice = new TimeSpan((slice.Ticks * currentPeriod.Ticks)/ period.Ticks);
+                    if (adjustedSlice < RialtoScheduler.MinSlice) {
+                        break;
+                    }
+                    diffSlice = node.Slice - adjustedSlice - RialtoScheduler.ContextSwitch;
+                    if (diffSlice.Ticks >= 0) {
+                        break;
+                    }
+                    currentPeriod = new TimeSpan(currentPeriod.Ticks / 2);
+                }
+                if (diffSlice.Ticks < 0) {
+                    continue;
+                }
+
+                if (diffSlice >= RialtoScheduler.AFewSlice) {
+                    currentSplit = true;
+                }
+                else {
+                    currentSplit = false;
+                }
+
+                if (currentSplit && diffSlice < RialtoScheduler.MinSlice) {
+                    // the remaining slice is too long to be entirely reserved for the
+                    // current request, but is also too small to represent an
+                    // acceptable slice
+                    continue;
+                }
+                // assume accepted
+
+                if (bestNode == null ||    // no previous fit
+                    currentPeriod > bestPeriod ||  // larger period
+                    // at equal periods...
+                    (split != currentSplit && split) || // the no split has priority
+                    (split == currentSplit &&          // at the same split type...
+                     // is split, larger diff is better, and otherwise,
+                     // smaller diff is better
+                    ((currentSplit  && bestDiffSlice < diffSlice) ||
+                    (!currentSplit && bestDiffSlice > diffSlice)))) {
+                    bestNode = node;
+                    tmpBest = tmpNode;
+                    bestPeriod = currentPeriod;
+                    bestDiffSlice = diffSlice;
+                    split = currentSplit;
+                }
+            }
+
+            if (bestNode == null) {
+                return false;
+            }
+
+            currentPeriod = bestNode.Period;
+            node = null;
+            adjustedSlice = new TimeSpan((slice.Ticks * bestPeriod.Ticks)/ period.Ticks);
+
+            if (currentPeriod != bestPeriod) {
+                // not the same period: need to extend the tree up to bestPeriod.
+
+                // create the subtree, but do not modify yet the bestNode (try
+                // to do atomically the modifications that require preemption disabled.
+                rightNode = new GraphNode(); //(PNODE)malloc(sizeof(GraphNode));
+                //memset(rightNode, 0, sizeof(GraphNode));
+                leftNode = new GraphNode(); //(PNODE)malloc(sizeof(GraphNode));
+                //memset(leftNode, 0, sizeof(GraphNode));
+
+                TimeSpan halfPeriod = currentPeriod; //CK TEST
+
+                // set rightNode as a free node except for SameActivityNext
+                currentPeriod += currentPeriod;
+                rightNode.Type = GraphNode.NodeType.Free;
+                rightNode.Period = currentPeriod;
+                rightNode.Slice = bestNode.Slice;
+                rightNode.NextExec = bestNode.NextExec + halfPeriod; //CK TEST currentPeriod
+                rightNode.TimeToOrigin = bestNode.TimeToOrigin;
+                free = rightNode;
+                // set leftNode as a branch node.
+                node = leftNode;
+
+                for (;;) {
+                    node.Type = GraphNode.NodeType.LeftBranch;
+                    node.Period = currentPeriod;
+                    Debug.Assert(currentPeriod.Ticks % minPeriod.Ticks == 0);
+                    node.Slice = bestNode.Slice;
+                    node.NextExec = bestNode.NextExec;
+                    node.TimeToOrigin = bestNode.TimeToOrigin;
+
+                    if (currentPeriod == bestPeriod) {
+                        break;
+                    }
+
+                    halfPeriod = currentPeriod; //CK TEST
+                    currentPeriod += currentPeriod;
+
+                    // set the right branch.
+                    next = new GraphNode(); // (GraphNode)malloc(sizeof(GraphNode));
+                    //memset(Next, 0, sizeof(GraphNode));
+                    next.Type = GraphNode.NodeType.Free;
+                    next.Period = currentPeriod;
+                    Debug.Assert(currentPeriod.Ticks % minPeriod.Ticks == 0);
+                    next.Slice = bestNode.Slice;
+                    next.NextExec = bestNode.NextExec + halfPeriod; //CK TEST currentPeriod
+                    next.TimeToOrigin = bestNode.TimeToOrigin;
+                    next.SameActivityNext = free;
+                    free = next;
+
+                    node.Right = next;
+                    next = new GraphNode(); // (GraphNode)malloc(sizeof(GraphNode));
+                    //memset(Next, 0, sizeof(GraphNode));
+                    node.Left = next;
+                    node = next;
+                }
+                if (split) {
+                    next = new GraphNode();
+                    iflag = Processor.DisableInterrupts();
+                    // insert Used node before the Free node:
+                    next.Slice = node.Slice - adjustedSlice - RialtoScheduler.ContextSwitch;
+                    node.Slice = adjustedSlice;
+                    node.Next  = next;
+
+                    next.Type            = GraphNode.NodeType.Free;
+                    next.NextExec      = node.NextExec + node.Slice + RialtoScheduler.ContextSwitch;
+                    next.TimeToOrigin    = node.TimeToOrigin - node.Slice - RialtoScheduler.ContextSwitch;
+                    next.SameActivityNext = free;
+                    free = next;
+
+                    // now set all the characteristics the new node
+                    next.Period    = node.Period;
+                    Debug.Assert(node.Period.Ticks % minPeriod.Ticks == 0);
+                    Debug.Assert(next.TimeToOrigin.Ticks >= 0);
+                }
+                else {
+                    iflag = Processor.DisableInterrupts();
+                }
+
+                // modify bestNode.
+                bestNode.Type = GraphNode.NodeType.LeftBranch;
+                bestNode.Slice = bestNode.Slice;
+                bestNode.Left = leftNode;
+                bestNode.Right = rightNode;
+                if (tmpBest == null) {
+                    FreeNodes = bestNode.SameActivityNext;
+                }
+                else {
+                    tmpBest.SameActivityNext = bestNode.SameActivityNext;
+                }
+
+                // add the new free nodes to the global list.
+                rightNode.SameActivityNext = FreeNodes;
+                FreeNodes = free;
+            }
+            else {
+                // allocate node at bestNode's period.
+
+                if (split) {
+                    node = new GraphNode(); //(PNODE)malloc(sizeof(GraphNode));
+                    //memset(node, 0, sizeof(GraphNode));
+
+                    // insert Used node before Free node:
+                    node.Slice     = bestNode.Slice - adjustedSlice - RialtoScheduler.ContextSwitch;
+                    node.NextExec      = bestNode.NextExec + adjustedSlice + RialtoScheduler.ContextSwitch;
+                    node.TimeToOrigin    = bestNode.TimeToOrigin - adjustedSlice - RialtoScheduler.ContextSwitch;
+                    node.Period    = bestNode.Period;
+                    Debug.Assert(node.TimeToOrigin.Ticks >= 0);
+                    Debug.Assert(node.Period.Ticks % minPeriod.Ticks == 0);
+
+                    iflag = Processor.DisableInterrupts();
+                    bestNode.Slice  = adjustedSlice;
+                    bestNode.Next        = node;
+                    if (tmpBest == null) {
+                        FreeNodes = bestNode.SameActivityNext;
+                    }
+                    else {
+                        tmpBest.SameActivityNext = bestNode.SameActivityNext;
+                    }
+
+                    if ((node.ReservCount = bestNode.ReservCount) > 0) {
+                        int i;
+                        node.ReservationArray = (ReservationSlice[])bestNode.ReservationArray.Clone();
+                        //memcpy(node.ReservationArray, bestNode.ReservationArray,
+                        //    sizeof(ReservationSlice) * node.ReservCount);
+                        for (i = 0; i < node.ReservCount; i++) {
+                            node.ReservationArray[i] = (ReservationSlice)node.ReservationArray[i].Clone();
+                            AddRefReservation(node.ReservationArray[i].AssociatedReservation);
+                        }
+                    }
+                    node.SameActivityNext = FreeNodes;
+                    FreeNodes = node;
+                }
+                else {
+                    if (tmpBest == null) {
+                        FreeNodes = bestNode.SameActivityNext;
+                    }
+                    else {
+                        tmpBest.SameActivityNext = bestNode.SameActivityNext;
+                    }
+                }
+                node = bestNode;
+            }
+
+            node.Type      = GraphNode.NodeType.Used;
+            node.DefaultActivity = activity;
+            node.SameActivityNext  = activity.MyRecurringCpuReservation.TempAssignedNodes;
+            activity.MyRecurringCpuReservation.TempAssignedNodes = node;
+
+            Processor.RestoreInterrupts(iflag);
+
+            ActivityAddNode(activity);
+
+            slice  = node.Slice;
+            period = node.Period;
+            Debug.Assert(period.Ticks % minPeriod.Ticks == 0);
+
+            return true;
+        }
+
+        static bool IncrementalReserveActivity(RialtoActivity activity,
+                                                        ref TimeSpan slice,
+                                                        ref TimeSpan period)
+            // preemption disabled for the entire or part of the function
+        {
+            // UNLESS success is returned, DON'T modify slice and period
+            TimeSpan    newSlice, newPeriod;
+            GraphNode    node;
+
+            Debug.Assert(period <= CpuResource.MaxPeriod);
+            // adjust Period and scale Slice down
+            if (slice.Ticks == 0 && activity.MyRecurringCpuReservation.Slice.Ticks > 0) {
+                bool iflag = Processor.DisableInterrupts();
+                node = activity.MyRecurringCpuReservation.AssignedNodes;
+                activity.MyRecurringCpuReservation.AssignedNodes = null;
+                ClearActivityNodes(node, activity);
+                activity.MyRecurringCpuReservation.Slice  = slice;
+                activity.MyRecurringCpuReservation.Period = period;
+
+                Processor.RestoreInterrupts(iflag);
+                return true;
+            }
+            if (period < minPeriod) {
+                return false;
+            }
+
+            for (newPeriod = minPeriod; newPeriod + newPeriod <= period; newPeriod += newPeriod) {
+                // no body.
+            }
+            newSlice  = new TimeSpan((slice.Ticks * newPeriod.Ticks)/ period.Ticks);
+
+            if ((activity.MyRecurringCpuReservation.Slice.Ticks > 0) && (activity.MyRecurringCpuReservation.Period > newPeriod)) {
+                // new period smaller than previous one
+                if (AllocateActivityNodes(activity, ref newSlice, ref newPeriod)) {
+                    // uses TempAssignedNodes
+                    Debug.Assert((newPeriod <= period) && (newSlice.Ticks >= (slice.Ticks * newPeriod.Ticks)/ period.Ticks));
+                    Debug.Assert(newPeriod.Ticks != 0);
+                    bool iflag = Processor.DisableInterrupts();
+                    node = activity.MyRecurringCpuReservation.AssignedNodes;
+                    activity.MyRecurringCpuReservation.AssignedNodes = activity.MyRecurringCpuReservation.TempAssignedNodes;
+                    activity.MyRecurringCpuReservation.TempAssignedNodes = null;
+                    activity.MyRecurringCpuReservation.Slice  = slice  = newSlice;
+                    activity.MyRecurringCpuReservation.Period = period = newPeriod;
+                    Debug.Assert(period == newPeriod);
+                    Debug.Assert(newPeriod.Ticks % minPeriod.Ticks == 0);
+
+                    ClearActivityNodes(node, activity);
+                    Processor.RestoreInterrupts(iflag);
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+
+
+            // compute the additional slice you need to allocate
+            newSlice  -= new TimeSpan((activity.MyRecurringCpuReservation.Slice.Ticks * newPeriod.Ticks)/activity.MyRecurringCpuReservation.Period.Ticks);
+            Debug.Assert(newSlice.Ticks >= 0);
+            if (newSlice < RialtoScheduler.MinSlice) {
+                return false;
+            }
+
+            if (AllocateActivityNodes(activity, ref newSlice, ref newPeriod)) {
+                freeCpu -= new TimeSpan((newSlice.Ticks * AmountCpu.Ticks)/newPeriod.Ticks);
+
+                // transfer the new nodes from the TempAssignedNodes list to the AssignedNodes list:
+                node = activity.MyRecurringCpuReservation.TempAssignedNodes;
+
+                while (node.SameActivityNext != null) {
+                    node = node.SameActivityNext;
+                }
+
+                bool iflag = Processor.DisableInterrupts();
+                node.SameActivityNext = activity.MyRecurringCpuReservation.AssignedNodes;
+                activity.MyRecurringCpuReservation.AssignedNodes = activity.MyRecurringCpuReservation.TempAssignedNodes;
+                activity.MyRecurringCpuReservation.TempAssignedNodes = null;
+                GetActivityRecurringCpuReservation(activity.MyRecurringCpuReservation.AssignedNodes, out newPeriod, out newSlice);
+                activity.MyRecurringCpuReservation.Slice  = slice  = newSlice;
+                activity.MyRecurringCpuReservation.Period = period = newPeriod;
+                Processor.RestoreInterrupts(iflag);
+
+                Debug.Assert(newPeriod.Ticks != 0);
+                // *pNewSlice is the total slice, not only the additional one
+
+                Debug.Assert((newPeriod <= period) && (newSlice.Ticks  >= (slice.Ticks * newPeriod.Ticks)/ period.Ticks));
+                return true;
+            }
+            return false;
+        }
+
+        // Reserve Activity (x out of any y) support functions end.
+        // ----------------------------------------------------------------------------------
+
+#endregion
+
+        // NOTE: 6/15/2004.  This comment copied verbatim from the SOSP'97.  As such, it may not
+        // be fully accurate.  Read for yourself.
+        //
+        // In the following, reservation refers to a data structure allocated
+        // when 'BeginConstraint' is executed.
+        //
+        // IMPORTANT:
+        // The OneShotReservation data structure is always allocated, whether
+        // the constraint is found feasible or not.
+        // The OneShotReservation data structure is freed after the
+        // matching 'EndConstraint' call is executed AND the estimate is exhausted.
+        // Constraints that are not found feasible are assigned a zero estimate.
+        //
+        // At 'BeginConstraint', the new reservation is placed on a stack associated with
+        // the issuing thread; ReservationStack (in Thread) points to the top of the stack and
+        // SurroundingReservation (in OneShotReservation) points to the Next reservation on the stack.
+        // Reservations are removed from this stack at 'EndConstraint'.
+        // The stack mirrors the 'nesting' relationship between constraints.
+        //
+        // In addition, new reservations are placed on a double linked list:
+        // - feasible constraints on the 'GuaranteedReservations' list or, if Start < CurrentTime,
+        //   on the 'IdleReservations' list.
+        // - constraints found non-feasible are placed on the 'UnfinishedConstraints' list
+        //   associated with the activity of the issuing thread; since 'GetRunnableThread' looks for
+        //   a runnable thread in the 'UnfinishedConstraints' list first, the issuing thread has
+        //   'higher priority' than the other threads of the same activity (and the matching
+        //   'EndConstraint' is executed earlier).
+        //
+        // Feasible NonCritical constraints can have their CPU reservation partially stolen by
+        // a Critical Constraint in the same activity.
+        // When this happens, the estimate of the victim reservation is diminished accordingly,
+        // and if the estimate gets to zero it is transfered to the 'UnfinishedConstraints' list
+        //
+        // When a reservation becomes active, it is moved from the 'pIdleReservation' to the
+        // 'GuaranteedReservations'
+        //
+        //  Reservations WITH NO SurroundingReservations(i.e., NOT nested)
+        //  --------------------------------------------------------------
+        // If 'EndConstraint' is executed while the reservation is active, the status of the
+        // reservation changes to an activity reservation, i.e. the remaining CPU is allocated
+        // to the activity and not only to the issuing thread (see 'GetRunnableThread').
+        // The reservation is not removed from the 'p(Non)GuaranteedReservations' lists until its
+        // estimate is exhausted.
+        //
+        // An active reservation is removed from the 'p(Non)GuaranteedReservations' lists
+        // when (see 'Reschedule' and 'EnqueueReservation'):
+        // - CurrentTime >= Deadline or
+        // - Estimate <= 0; the estimate is decremented every time the active thread of the
+        //   reservation (see above and 'GetRunnableThread') is executed. If the matching
+        //   'EndConstraint' has not been executed by the issuing thread, the reservation is
+        //   is placed 'UnfinishedConstraints' list of the issuing thread's activity.
+        //
+        //  Reservations WITH SurroundingReservations(i.e., nested)
+        //  ---------------------------------------------------------
+        // such a reservation may inherit time for any of the reservations on its nested stack.
+        // When an inherit happens, the estimate of the 'giving' reservation is diminished
+        // accordingly.
+        // When a nested reservation is granted (i.e., estimate > 0), it will be positioned on the
+        // idle or Guaranteed lists AND, all other surrounding reservations will be dequeued (from
+        // which ever Guaranteed or Unfinished list they are.
+        // The reservation is not removed from the 'GuaranteedReservations' lists until its
+        // estimate is exhausted or at EndConstraint.
+        //
+        // If 'EndConstraint' is executed
+        //   while the reservation is active (i.e., estimate > 0),
+        //      the estimate is given to the immediately surrounding reservation, and this is
+        //      placed on Guaranteed list.
+        //  while the reservation has no estimate (on the Unfinished list)
+        //      it will be simply removed from the list
+        //
+        // When a reservation gets to estimate 0 before EndConstraint
+        // (see 'Reschedule', StealNonCriticalCpu)
+        //   it is placed on the Unfinished list. The same happen with all the surrounding
+        //   reservations up to the first with estimate non zero which is placed on the
+        //   Guaranteed list.
+        //
+
+#region OneShotCpuReservation related functions
+
+        // OneShotCpuReservation related functions begin:
+
+        public static int ReleaseReservationProtected(OneShotReservation reservation)
+        {
+            int  newrefcnt;
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            Debug.Assert(reservation.ReferenceCount > 0);
+            newrefcnt = Interlocked.Decrement(ref reservation.ReferenceCount);
+
+            if (newrefcnt == 0) {
+                // Estimate may be positive when reservation reaches
+                // its Deadline w/o using its Estimate
+                Debug.Assert((reservation.Next == null) && (reservation.Previous == null));
+                if (reservation.OriginalThread != null) {
+                    reservation.OriginalThread.ReleaseProtected();
+                    //Debug.Assert(reservation.ActiveThread != null);
+                    //reservation.ActiveThread.ReleaseProtected();
+                }
+                else {
+                    Debug.Assert(reservation.AssociatedActivity != null);
+                    ActivityReleaseProtected(reservation.AssociatedActivity);
+                }
+                Debug.Assert(reservation.Next == null);
+                CacheFreeReservation(reservation);
+            }
+            return newrefcnt;
+        }
+
+
+        public static OneShotReservation AllocateReservation()
+        {
+            OneShotReservation reservation;
+
+            //  DisableInterrupts();
+            reservation = IpcAllocateReservation();
+            //  EnableInterrupts();
+
+            if (reservation == null) {
+                reservation = new OneShotReservation(); //(PRESERVATION)malloc(sizeof(struct OneShotReservation)); // to be done while on the I-stack!
+                reservation.Clear();
+            }
+            return reservation;
+        }
+
+        static void FreeReservation(OneShotReservation reservation)
+        {
+            reservation = null; //free(reservation);
+        }
+
+        // Garbage-collect unused Reservations.
+
+        public static int ReleaseReservation(OneShotReservation reservation)
+        {
+            int newrefcnt;
+            // Debug.Assert(!Processor.InterruptsDisabled());
+            Debug.Assert(reservation.ReferenceCount > 0);
+            newrefcnt = reservation.ReferenceCount - 1;
+            reservation.ReferenceCount = newrefcnt;
+
+            if (newrefcnt == 0) {
+                // Estimate may be positive when reservation reaches its Deadline w/o using its Estimate
+                Debug.Assert((reservation.Next == null) && (reservation.Previous == null));
+                if (reservation.OriginalThread != null) {
+                    reservation.OriginalThread.Release();
+                    //Debug.Assert(reservation.ActiveThread != null);
+                    //reservation.ActiveThread.Release();
+                }
+                else if (reservation.AssociatedActivity != null) {
+                    ActivityObjRelease(reservation.AssociatedActivity);
+                }
+                CacheFreeReservation(reservation);
+            }
+            return newrefcnt;
+        }
+
+        // Like CheckFreeConstraint, but callable from the IPC path.
+        // Because we can't call AllocateReservation, we use the helper thread
+        // if there aren't any free Reservations.
+        static void CacheFreeReservation(OneShotReservation reservation)
+        {
+            if (reservation.OriginalThread != null  &&
+                reservation.OriginalThread.FreeReservation == null) {
+                reservation.OriginalThread.FreeReservation = reservation;
+            }
+            else {
+                IpcFreeReservation(reservation);
+            }
+        }
+
+
+        // Callable with preemption disabled. Allocates a OneShotReservation
+        // from the global free list.
+        public static OneShotReservation IpcAllocateReservation()
+        {
+            OneShotReservation reservation;
+
+            if ((reservation = ReservationFreePool) != null) {
+                ReservationFreePool = reservation.FreeListNext;
+            }
+
+            return reservation;
+        }
+
+
+        // Callable with preemption disabled. Frees a OneShotReservation
+        // to the global free list.
+        public static void IpcFreeReservation(OneShotReservation reservation)
+        {
+            Debug.Assert(reservation != null);
+            Debug.Assert(reservation.ReferenceCount == 0);
+
+            reservation.FreeListNext = ReservationFreePool;
+            ReservationFreePool = reservation;
+        }
+
+        //=========================================================
+
+        public static void AddRefReservation(OneShotReservation reservation)
+        {
+            Debug.Assert(reservation.ReferenceCount >= 0);
+            reservation.ReferenceCount++;
+        }
+
+#if DEBUG_RESERV
+        static void PrintQueueReserv(OneShotReservation reservation, DateTime timeNow)
+        {
+            OneShotReservation pSave = reservation;
+
+            DebugStub.Print("ReservQueue {0} {1:d}\n",
+                            __arglist((pSave == null? "null":""), timeNow));
+            while (reservation != null) {
+                DebugStub.Print("R{0} T{1}:A{2} -  Deadline {3:d} Estimate {4:d} Lax {5:d}",
+                                __arglist(
+                                    reservation.ReservationId,
+                                    (reservation.OriginalThread != null
+                                     ? reservation.OriginalThread.Id : -1),
+                                    (reservation.OriginalThread != null
+                                     ? reservation.OriginalThread.pActivity.Id
+                                     : reservation.pActivity.Id),
+                                    reservation.Deadline,
+                                    reservation.Estimate,
+                                    reservation.Deadline - timeNow));
+
+                if ((reservation = reservation.Next) == pSave) {
+                    break;
+                }
+            }
+        }
+#endif
+#endregion
+
+#region Potpourri (Unregioned functions)
+
+        static GraphNode NextNode(GraphNode currentNode)
+        {
+            if (currentNode.Next != null) {
+                currentNode = currentNode.Next;
+            }
+            else {
+                currentNode = SchedulerPlan;
+            }
+
+            while ((currentNode.Type == GraphNode.NodeType.RightBranch) ||
+                   (currentNode.Type == GraphNode.NodeType.LeftBranch)) {
+
+                if (currentNode.Type == GraphNode.NodeType.RightBranch) {
+                    currentNode.Type = GraphNode.NodeType.LeftBranch;    // Next time take the other branch
+                    currentNode = currentNode.Right;
+                }
+                else if (currentNode.Type == GraphNode.NodeType.LeftBranch) {
+                    currentNode.Type = GraphNode.NodeType.RightBranch;// Next time take the other branch
+                    currentNode = currentNode.Left;
+                }
+            }
+            Debug.Assert(currentNode != null);
+            Debug.Assert(currentNode.TimeToOrigin.Ticks >= 0);
+            Debug.Assert(currentNode.Period.Ticks % minPeriod.Ticks == 0);
+
+            return currentNode;
+        }
+
+
+        // returns true if there is at least one free slot left in the array
+        static bool CleanReservationArray(GraphNode node, DateTime timeNow)
+        {
+            int i, j;
+            OneShotReservation reservation;
+
+            for (i = j = 0; i < node.ReservCount; i++) {
+                reservation = node.ReservationArray[i].AssociatedReservation;
+                if (node.ReservationArray[i].End <= timeNow + RialtoScheduler.AFewSlice || !reservation.Valid ||
+                    (reservation.Estimate <= RialtoScheduler.AFewSlice && reservation.OriginalThread == null)) {
+                    //  DebugStub.Print("CleanReservationArray {0} {1}\n",
+                    // __arglist(reservation, reservation.ReferenceCount));
+                    ReleaseReservationProtected(reservation); // each slice has own reference
+                }
+                else {
+                    if (j < i) {
+                        node.ReservationArray[j] = (ReservationSlice)node.ReservationArray[i].Clone();
+                    }
+                    //memcpy(&(node.ReservationArray[j]), &(node.ReservationArray[i]), sizeof(ReservationSlice));
+                    j++;
+                }
+            }
+            node.ReservCount = j;
+            Debug.Assert(node.ReservCount <= GraphNode.MaxNumReservations);
+            return (j < GraphNode.MaxNumReservations);
+        }
+
+        public static RialtoThread GetCurrentThread()
+        {
+            return currentThreadGlobal;
+        }
+
+        public static void IChangeCurrentThread(RialtoThread thread)
+        {
+            currentThreadGlobal = thread;
+        }
+
+        // Auxiliary Routines
+        // TODO: Revisit the necessity of these functions.
+        public static TimeSpan minInterval(TimeSpan TimeInterv0, TimeSpan TimeInterv1)
+        {
+            return (TimeInterv0 < TimeInterv1? TimeInterv0: TimeInterv1);
+        }
+
+        public static DateTime minTime(DateTime Time0, DateTime Time1)
+        {
+            return (Time0 < Time1? Time0: Time1);
+        }
+
+        static TimeSpan maxInterval(TimeSpan TimeInterv0, TimeSpan TimeInterv1)
+        {
+            return (TimeInterv0 < TimeInterv1? TimeInterv1: TimeInterv0);
+        }
+
+        static DateTime maxTime(DateTime Time0, DateTime Time1)
+        {
+            return (Time0 < Time1 ? Time1: Time0);
+        }
+
+        // The Queue of Standby Activities is circular and
+        // standbyActivities points to the Next activity
+        // to get spare CPU. By default, the Queue is FIFO.
+        public static void EnqueueStandbyActivity(RialtoActivity activity)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            activity.LastNode = null;
+
+            if (activity.NextStandbyActivity != null) {
+                Debug.Assert(activity.PreviousStandbyActivity != null);
+                return;
+            }
+
+            if (standbyActivities == null) {
+                activity.PreviousStandbyActivity =
+                    activity.NextStandbyActivity = activity;
+                standbyActivities = activity;
+                return;
+            }
+            // else ...
+            // insert in front of 'standbyActivities'
+            activity.NextStandbyActivity = standbyActivities;
+            activity.PreviousStandbyActivity = standbyActivities.PreviousStandbyActivity;
+            standbyActivities.PreviousStandbyActivity.NextStandbyActivity = activity;
+            standbyActivities.PreviousStandbyActivity = activity;
+#if LIFO
+            standbyActivities = activity;
+#endif
+        }
+
+        static void DequeueStandbyActivity(RialtoActivity activity)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            if (activity.NextStandbyActivity == null) {
+                // if not in Queue, a NOP
+                Debug.Assert(activity.PreviousStandbyActivity == null);
+                return;
+            }
+
+            if (activity.NextStandbyActivity == activity) {
+                // last one in the Queue
+                Debug.Assert(activity.PreviousStandbyActivity == activity);
+                standbyActivities = null;
+            }
+            else {
+                activity.PreviousStandbyActivity.NextStandbyActivity =
+                    activity.NextStandbyActivity;
+                activity.NextStandbyActivity.PreviousStandbyActivity =
+                    activity.PreviousStandbyActivity;
+                if (standbyActivities == activity) {
+                    // advance the Queue head
+                    standbyActivities = activity.NextStandbyActivity;
+                }
+            }
+            activity.NextStandbyActivity = activity.PreviousStandbyActivity = null;
+        }
+
+        // Add Activity in the last Round-Robin position
+        public static void EnqueueActivity(RialtoActivity activity)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            if (circularActivityList == null) {
+                robinActivityNext = circularActivityList = robinActivityCurrent =
+                    activity.Next = activity.Previous = activity;
+            }
+            else {
+                activity.Next = robinActivityNext;
+                activity.Previous = robinActivityNext.Previous;
+                robinActivityNext.Previous.Next = activity;
+                robinActivityNext.Previous = activity;
+            }
+        }
+
+        public static void DequeueActivity(RialtoActivity activity) //TODO: Make an activity function?
+        {
+            // In our simulated environment, Activity 0 is never removed from the Q
+            Debug.Assert(Processor.InterruptsDisabled());
+            //NOTE: Might be replaced with a test and return.
+            Debug.Assert(activity.Next != null);
+            Debug.Assert(activity.Previous != null);
+
+            // Previous. in rialto  if (activity.Id == 0) return;
+
+            DequeueStandbyActivity(activity);
+
+            activity.Next.Previous = activity.Previous;
+            activity.Previous.Next = activity.Next;
+            if (circularActivityList == activity) {
+                circularActivityList = activity.Next;
+            }
+            if (robinActivityNext == activity) {
+                robinActivityNext = activity.Next;
+            }
+        }
+
+        // if possible, places thread in the 2nd position in the RunnableThreads Q
+        // Make this a function on a resource container.
+        public static void EnqueueRunThread(RialtoThread thread)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            RialtoActivity activity = thread.AssociatedActivity;
+            if (thread.Next != null) {
+                Debug.Assert(thread.Previous != null);
+                return;
+            }
+
+            //  Debug.Assert(thread.QueueType == QUEUE_NONE);
+
+            //if (thread.State == RialtoThread.ThreadState.ThreadWaiting) {
+            //    thread.SetState(RialtoThread.ThreadState.ThreadReady);
+            //}
+
+            if (activity.RunnableThreads == null) {
+                thread.Next = thread.Previous = thread;
+                activity.RunnableThreads = thread;
+            }
+            else {
+                thread.Previous = activity.RunnableThreads;
+                thread.Next = activity.RunnableThreads.Next;
+                activity.RunnableThreads.Next.Previous = thread;
+                activity.RunnableThreads.Next = thread;
+            }
+        }
+
+        public static bool DequeueRunThread(RialtoThread thread)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            if (thread.Next == null) {
+                Debug.Assert(thread.Previous == null);
+                return false;
+            }
+
+            if (thread.Next == thread) {
+                Debug.Assert(thread.Previous == thread);
+                thread.AssociatedActivity.RunnableThreads = null;
+                DequeueStandbyActivity(thread.AssociatedActivity);
+            }
+            else {
+                // multiple threads in the RunnableThreads Q
+                thread.Previous.Next = thread.Next;
+                thread.Next.Previous = thread.Previous;
+                if (thread.AssociatedActivity.RunnableThreads == thread) {
+                    thread.AssociatedActivity.RunnableThreads = thread.Next;
+                }
+            }
+            thread.Next = thread.Previous = null;
+            return true;
+        }
+#endregion
+
+#region Additions according to kernel implementation
+
+        static bool ResetTimerTimeout(DateTime NewTimerTimeout)
+        {
+            DateTime timeNow = SchedulingTime;
+
+            if (timeNow > NewTimerTimeout) {
+                return false;
+            }
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            // Debug.Assert(CurrentThread()->GetState() == Thread.ThreadState.ThreadRunning);
+
+            // Debug.Assert(NewTimerTimeout > SchedulingTime);
+
+            //TODO: Need LA_Time?
+            //            if (NewTimerTimeout > SleepTimeout - LA_Time) {
+            //                NewTimerTimeout = SleepTimeout - LA_Time;
+            //            }
+            if (NewTimerTimeout > RialtoThread.GetSleepTimeout()) {
+                NewTimerTimeout = RialtoThread.GetSleepTimeout();
+            }
+
+            //DebugStub.Print("Setting Next Interrupt for: {0} ...\n",
+            // __arglist(NewTimerTimeout.Ticks));
+            bool success = SchedulerClock.SetNextInterrupt(NewTimerTimeout); //TODO: Perhaps only call this if the time changed.
+
+            //DebugStub.Print(success?"SUCCESS\n":"FAILED\n");
+
+            return success;
+        }
+
+        public static void MoveToStandby(RialtoThread thread, bool fromWakeUp)
+        {
+            if (thread.AssociatedActivity.LastNode == null) {
+                if (fromWakeUp) {
+                    // a thread that wakes up always gets a (small) chance to run:
+                    // but ...IReadyThread would not do this enqueue
+                    //thread.AssociatedActivity.MyRecurringCpuReservation.SliceLeft = RialtoScheduler.MinSlice;
+                    EnqueueStandbyActivity(thread.AssociatedActivity);
+                }
+            }
+            else {
+                // sets 'pthd.pActivity.LastNode' to null.
+                EnqueueStandbyActivity(thread.AssociatedActivity);
+                if (CurrentPlanNode == thread.AssociatedActivity.LastNode) {
+                    //TODO: since EnqueueStandbyActivity sets it to null, isn't this a no-op?
+                    Reschedule();
+                }
+            }
+        }
+
+
+        static void UpdateStandbyStatus(RialtoThread thread)
+        {
+            RialtoActivity  activity = thread.AssociatedActivity;
+
+            if ((activity.RunnableThreads == null) &&
+                (CurrentPlanNode.Type == GraphNode.NodeType.Used) &&
+                (CurrentPlanNode.DefaultActivity == activity) &&
+                ((activity.MyRecurringCpuReservation.SliceLeft = CurrentPlanNode.NextExec + CurrentPlanNode.Slice -
+                  SystemClock.GetKernelTime()) >= RialtoScheduler.MinSlice)) {
+                activity.LastNode = CurrentPlanNode; // record it.
+            }
+        }
+
+
+        public static void UpdateSchedulingStatus()
+        {
+            TimeSpan timeRun;
+            RialtoThread currentThread = GetCurrentThread();
+
+            DateTime newSchedulingTime = SystemClock.GetKernelTime();
+
+            timeRun = newSchedulingTime - SchedulingTime;
+            SchedulingTime = newSchedulingTime;
+
+#if false
+            Tracing.Log(Tracing.Debug, "UpdateSchedulingStatus");
+#endif
+
+            if (idle) {
+                // UpdateIdleTime
+                idleTime += timeRun;
+                return;
+            }
+
+            // if IDLE compute CurrentPlanNode & set currentThread to null
+            if (currentThread != null) {
+                // unless thread just exited
+                // Update Thread & Activity execution times
+                currentThread.AddExecutionTime(timeRun);
+                // In the current implementation, the scheduler has to call CurrentTask on the
+                //       known running thread, since the thread may not actually be running when
+                //       UpdateSchedulingStatus() is called.  It may be the scheduler thread running.
+                //       I left things the way they are though since Scheduler is suitable to
+                //       use for any application/non-kernel code.  We may need to document it there
+                //       too, or perhaps have it ask the CpuResource what the default task is at the
+                //       moment, since presumably it may be the CpuResource which actually tracks that.
+                currentThread.EnclosingThread.CurrentTask().AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(timeRun));
+                //Scheduler.CurrentTask().AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(timeRun));
+
+                //                if (currentThread.AssociatedActivity != null) {
+                //                    currentThread.AssociatedActivity.MyRecurringCpuReservation.EnclosingCpuReservation.AddTimeUsed(timeRun);
+                //                }
+            }
+            if (OneShotReservation.CurrentReservation != null) {
+                // slice used for a reservation.
+                OneShotReservation.CurrentReservation.Estimate -= timeRun;
+            }
+            else if (currentStandbyActivity != null) {
+                if (currentStandbyActivity.MyRecurringCpuReservation != null) {
+                    currentStandbyActivity.MyRecurringCpuReservation.SliceLeft -= timeRun;
+                }
+                currentStandbyActivity = null;
+            }
+            else if (robinActivityCurrent != null) {
+                // slice used for RoundRobin.
+                robinSliceLeft -= timeRun;
+                robinActivityCurrent = null;
+            }
+        }
+
+
+        // Always called when another thread needs to be scheduled.
+        static bool RescheduleInterrupt()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(!Processor.InterruptsDisabled());
+            RialtoThread currentThread = GetCurrentThread();
+
+            DateTime nextStart;
+            RialtoThread previousThread;
+
+          RescheduleAgain: // !!!!!!!!!! SIM ONLY !!!!!!!!!
+            if (idle) {
+                currentThread = null;
+            }
+
+            previousThread = currentThread;
+
+            EarliestDeadlineFirstBlocked = false;
+
+            UpdateSchedulingStatus();
+
+            //  if thread was the head of the runnable threads Q:
+            //  Advance the runnable threads Q.
+            if ((currentThread != null) &&
+                (currentThread.AssociatedActivity != null) &&
+                (currentThread.AssociatedActivity.RunnableThreads == currentThread)) {
+                currentThread.AssociatedActivity.RunnableThreads = currentThread.Next;
+                Debug.Assert(currentThread.AssociatedActivity.RunnableThreads != null);
+            }
+
+            OneShotReservation.UpdateCurrentReservation();
+
+#if LOG_SCHEDULER_DETAILS
+            bool logDirectSwitch = (directSwitchTo != null);
+            long logCurrentNodeSliceLeft1 = 0;
+            long logCurrentNodeSliceLeft2 = 0;
+            long logCurrentNodeSliceLeft3 = 0;
+            int logCurrentPlanNodeId = -1;
+            int logReservCount = 0;
+            bool logRunningDefault = false;
+            bool logRunningStandby = false;
+            bool logRunningRobin = false;
+            long logCurrentNodeSliceLeft4 = 0;
+            long logCurrentNodeSliceLeft = 0;
+#endif
+
+            //Why not check this directly?
+            if (directSwitchTo != null) {
+                //Debug.Print("directSwitchTo!\n");
+                Debug.Assert(OneShotReservation.CurrentReservation != null);
+                Scheduler.LogContextSwitch();  // Context Switch statistics
+                //  Debug.Assert(currentThread.QueueType == QUEUE_NONE);
+                currentThread = directSwitchTo;
+                directSwitchTo = null;
+                Scheduler.LogReschedule();
+                // DebugStub.Print("Directed Context Switch.\n");
+                goto exitOK; // don't set TIMER interrupt
+            }
+
+            OneShotReservation.ClearCurrentReservation();
+            currentThread = null;
+
+            // Finished first stage, i.e. updated state.
+            // Start second stage: wakeup threads & select Next CPU slice.
+
+            RialtoThread.WakeThreads();
+
+            // NOTE: In the original Rialto Simulator Code (& MMOSA code)
+            // The call to DrainDeferredConditions() was made here.
+            // In Singularity, this will basically be replaced with a
+            // queue of wait-events to fix.
+
+            OneShotReservation.FreshenReservationQueues();
+
+#if NOT_DEFINED
+            if (SchedulingTime >= changePlanTime) {
+                GraphNode ptemp = SchedulerPlan;
+                SchedulerPlan = pNextPlan;
+                pNextPlan = null;
+                changePlanTime = TIME_FOREVER;
+                Debug.Assert(false);
+                FreeSchedulerPlan(ptemp);
+                CurrentPlanNode = SchedulerPlan;
+            }
+#endif
+            TimeSpan currentNodeSliceLeft;
+            // Compute currentNodeSliceLeft (possible (very) negative).
+
+            Debug.Assert(CurrentPlanNode != null);
+            //DebugStub.Print("Next Exec: {0} Slide: {1} SchedulingTime: {2}\n",
+            //__arglist(CurrentPlanNode.NextExec.Ticks,
+            // CurrentPlanNode.Slice.Ticks,
+            // SchedulingTime.Ticks));
+            currentNodeSliceLeft = CurrentPlanNode.NextExec + CurrentPlanNode.Slice - SchedulingTime;
+
+            Tracing.Log(Tracing.Debug, "Reservation for {0} ticks",
+                        (UIntPtr)unchecked((uint)currentNodeSliceLeft.Ticks));
+
+#if LOG_SCHEDULER_DETAILS
+            logCurrentNodeSliceLeft1 = currentNodeSliceLeft.Ticks;
+#endif
+
+            while (currentNodeSliceLeft.Ticks < 0) {
+                // choose Next node
+                GraphNode tempNode = CurrentPlanNode;
+                DateTime tempTime = CurrentPlanNode.NextExec;
+                CurrentPlanNode.NextExec += CurrentPlanNode.Period; // time of Next execution
+                //  If incomplete, the default activity will be added
+                //  to the 'pStandbyActiv' List when ready
+                CurrentPlanNode = NextNode(CurrentPlanNode);
+                Debug.Assert(CurrentPlanNode.NextExec <= tempNode.NextExec);
+                Debug.Assert(CurrentPlanNode.NextExec > tempTime);
+                Debug.Assert(CurrentPlanNode.NextExec <= SchedulerPlan.NextExec); //In fact, should be min of all nodes.
+                currentNodeSliceLeft = CurrentPlanNode.NextExec + CurrentPlanNode.Slice - SchedulingTime;
+            }
+
+#if LOG_SCHEDULER_DETAILS
+            logCurrentNodeSliceLeft2 = currentNodeSliceLeft.Ticks;
+#endif
+
+            if (currentNodeSliceLeft < RialtoScheduler.MinSlice) {
+                // choose Next node
+                CurrentPlanNode.NextExec += CurrentPlanNode.Period; // time of Next execution
+                //  If incomplete, the default activity will be added
+                //  to the 'pStandbyActiv' List when ready
+                CurrentPlanNode = NextNode(CurrentPlanNode);
+                Debug.Assert(CurrentPlanNode.NextExec <= SchedulerPlan.NextExec);
+                currentNodeSliceLeft = CurrentPlanNode.NextExec + CurrentPlanNode.Slice - SchedulingTime; // don't waste the leftover
+            }
+
+#if LOG_SCHEDULER_DETAILS
+            logCurrentNodeSliceLeft3 = currentNodeSliceLeft.Ticks;
+            logCurrentPlanNodeId = (CurrentPlanNode.DefaultActivity != null) ? CurrentPlanNode.DefaultActivity.Id : -1;
+#endif
+
+            // Do adjustment before computation of CurrentSlice is started
+            //  currentNodeSliceLeft -= RESCHEDULE_OVHD; // !!!!!!!!!!! SIM only !!!!!!!!!!!
+
+            //CurrentSlice = currentNodeSliceLeft;
+            Debug.Assert(currentNodeSliceLeft /* CurrentSlice */ >= RialtoScheduler.MinSlice);
+
+            if (CurrentPlanNode.ReservCount > 0) {
+                if (!CurrentPlanNode.ReservationArray[0].AssociatedReservation.Valid || // need to do some cleaning
+                    (CurrentPlanNode.ReservationArray[0].End <= SchedulingTime + RialtoScheduler.AFewSlice) ||
+                    (CurrentPlanNode.ReservationArray[0].AssociatedReservation.Estimate <= RialtoScheduler.AFewSlice && CurrentPlanNode.ReservationArray[0].AssociatedReservation.OriginalThread == null)) {
+                    CleanReservationArray(CurrentPlanNode, SchedulingTime);
+                }
+
+                if (CurrentPlanNode.ReservCount > 0) {
+                    // are there any active reservation left?
+#if LOG_SCHEDULER_DETAILS
+                    logReservCount = CurrentPlanNode.ReservCount;
+#endif
+
+                    nextStart = CurrentPlanNode.ReservationArray[0].Start;
+
+                    if (nextStart > SchedulingTime + RialtoScheduler.AFewSlice) {
+                        if (nextStart < SchedulingTime + currentNodeSliceLeft) {
+                            // GATECH
+                            currentNodeSliceLeft /* CurrentSlice */ = nextStart - SchedulingTime; // GATECH
+                            Debug.Assert(currentNodeSliceLeft /* CurrentSlice */.Ticks > 0);
+                        }
+                    }
+                    else {
+                        // GraphNode OneShotReservation in effect; find a runnable reservation:
+                        OneShotReservation.FindRunnableReservation(ref currentThread);
+                        if (currentThread != null) {
+                            // a runnable reservation was found:
+                            // TO DO: optimize the comparisons
+                            currentNodeSliceLeft /* CurrentSlice */ = minInterval(currentNodeSliceLeft /* CurrentSlice */,
+                                CurrentPlanNode.ReservationArray[0].End - SchedulingTime);
+                            currentNodeSliceLeft /* CurrentSlice */ = minInterval(currentNodeSliceLeft /* CurrentSlice */, OneShotReservation.CurrentReservation.Estimate);
+                            currentNodeSliceLeft /* CurrentSlice */ = minInterval(currentNodeSliceLeft /* CurrentSlice */,
+                                OneShotReservation.CurrentReservation.Deadline - SchedulingTime);
+                            // DebugStub.Print("OneShotCpuReservation in effect.\n");
+                            goto AdjustSlice;
+                        }
+                        else {
+                            EarliestDeadlineFirstBlocked = true;
+                            OneShotReservation.ClearCurrentReservation();
+                        }
+                    } // else
+                } // 2nd if (CurrentPlanNode.ReservCount > 0)
+            } // 1st if (CurrentPlanNode.ReservCount > 0)
+
+            // No GraphNode OneShotReservation in effect; run default activity, if any:
+            if (CurrentPlanNode.Type == GraphNode.NodeType.Used) {
+                DequeueStandbyActivity(CurrentPlanNode.DefaultActivity); // nop if not on list
+                if ((currentThread = CurrentPlanNode.DefaultActivity.GetRunnableThread()) != null) {
+                    // DebugStub.Print("Running Default Resource Container.\n");
+                    Tracing.Log(Tracing.Debug, "Default resource container.");
+#if LOG_SCHEDULER_DETAILS
+                    logRunningDefault = true;
+#endif
+                    goto AdjustSlice;
+                }
+                else if (CurrentPlanNode.DefaultActivity.LastNode == CurrentPlanNode) {
+                    CurrentPlanNode.DefaultActivity.LastNode = null;
+                }
+            }
+
+            // Current GraphNode is Free or the default activity is not runnable;
+            // Try to use slice for the queue of Standby Activities */
+            while (standbyActivities != null) {
+                // Dequeue some of the activities that have too little left to do!
+                if (standbyActivities.MyRecurringCpuReservation != null && standbyActivities.MyRecurringCpuReservation.SliceLeft < RialtoScheduler.MinSlice) {
+                    DequeueStandbyActivity(standbyActivities);
+                    continue; // if it was the last incomplete activity, exit while
+                }
+
+                currentThread = standbyActivities.GetRunnableThread();
+                currentNodeSliceLeft /* CurrentSlice */ = minInterval(currentNodeSliceLeft /* CurrentSlice */, (standbyActivities.MyRecurringCpuReservation == null? RialtoScheduler.MinSlice: standbyActivities.MyRecurringCpuReservation.SliceLeft));
+                currentStandbyActivity = standbyActivities;
+                if (currentStandbyActivity.MyRecurringCpuReservation == null) {
+                    DequeueStandbyActivity(standbyActivities);
+                }
+                Debug.Assert(currentThread != null);
+                //DebugStub.Print("Running a standby resource container\n");
+#if LOG_SCHEDULER_DETAILS
+                logRunningStandby = true;
+#endif
+                goto AdjustSlice;
+            }
+
+            // Same about Current GraphNode but no Standby Activity to run.
+            // Use slice for the RoundRobin queue (always nonempty).
+            if (robinSliceLeft < RialtoScheduler.MinSlice) {
+                robinActivityNext  = robinActivityNext.Next;    // don't run it again
+                robinSliceLeft = RialtoScheduler.RobinSlice;
+            }
+            // Find Next Runnable Activity.
+            robinActivityCurrent = robinActivityNext; // !!!!!!!!!!!!!SIM ONLY !!!!!!!!!!
+            while ((currentThread = robinActivityNext.GetRunnableThread()) == null) {
+                robinActivityNext = robinActivityNext.Next;
+                robinSliceLeft = RialtoScheduler.RobinSlice;
+                if (robinActivityNext == robinActivityCurrent) {
+                    // !!!!!!!!SIM ONLY !!!!!!!
+                    // in the real scheduler, execute halt
+                    if (OneShotReservation.IdleReservations != null) {
+                        // reuse nextStart
+                        nextStart = minTime(RialtoThread.GetSleepTimeout(), OneShotReservation.IdleReservations.Start);
+                    }
+                    else {
+                        nextStart = RialtoThread.GetSleepTimeout();
+                        //DebugStub.Print("idle, sleeping until {0} cf maxvalue {1}\n",
+                        // __arglist(nextStart.Ticks, DateTime.MaxValue.Ticks));
+                    }
+
+                    if (nextStart == DateTime.MaxValue) {
+                        Scheduler.StopSystem();
+                    }
+                    Tracing.Log(Tracing.Debug, "");
+
+                    if (! ResetTimerTimeout(nextStart)) {
+                        //Error setting timer.  Try scheduling again.
+                        DebugStub.Print("Thought idle, failed to set interrupt.\n");
+                        goto RescheduleAgain;
+                    }
+                    idle = true;
+
+                    // !!!!!!!!SIM ONLY !!!!!!!
+                    currentThread = null;           // !!!!!!!!SIM ONLY !!!!!!!
+                    OneShotReservation.ClearCurrentReservation();
+                    robinActivityCurrent  = null;
+                    currentStandbyActivity = null;
+
+                    if (DateTime.MaxValue != nextStart) {
+                        Scheduler.LogTimeJump();
+                    }
+
+                    //DebugStub.Print("Halted.\n");
+                    return true;            // !!!!!!!!SIM ONLY !!!!!!!
+                }
+                // !!!!!!!!SIM ONLY !!!!!!!
+            }
+            //DebugStub.Print("Running Round Robin Resource Container\n");
+#if LOG_SCHEDULER_DETAILS
+            logRunningRobin = true;
+#endif
+            robinActivityCurrent  = robinActivityNext; // we probably need only one of the two variables
+
+            currentNodeSliceLeft /* CurrentSlice */ = minInterval(currentNodeSliceLeft /* CurrentSlice */, robinSliceLeft);
+
+#if LOG_SCHEDULER_DETAILS
+            logCurrentNodeSliceLeft4 = currentNodeSliceLeft.Ticks;
+#endif
+
+        AdjustSlice: // always set timer before Next wakeup time!
+
+            Debug.Assert(currentThread != null);
+            if (currentThread != previousThread) {
+                Scheduler.LogContextSwitch(); // Context Switch statistics
+            }
+
+            if (OneShotReservation.IdleReservations != null) {
+                // reuse nextStart
+                nextStart = minTime(RialtoThread.GetSleepTimeout(), OneShotReservation.IdleReservations.Start);
+            }
+            else {
+                nextStart = RialtoThread.GetSleepTimeout();
+            }
+
+            if (SchedulingTime + currentNodeSliceLeft /* CurrentSlice */ > nextStart) {
+                currentNodeSliceLeft /* CurrentSlice */ = nextStart - SchedulingTime;
+            }
+
+#if LOG_SCHEDULER_DETAILS
+            logCurrentNodeSliceLeft = currentNodeSliceLeft.Ticks;
+
+#if VERBOSEX
+            unchecked
+            {
+                Tracing.LogSchedulerDetails(
+                    logReservCount, logDirectSwitch, logRunningDefault, logRunningStandby, logRunningRobin,
+                    (int) logCurrentNodeSliceLeft1, (int) logCurrentNodeSliceLeft2, (int) logCurrentNodeSliceLeft3,
+                    (int) logCurrentNodeSliceLeft4, (int) logCurrentNodeSliceLeft, logCurrentPlanNodeId);
+            }
+#endif
+#endif
+
+            Scheduler.LogReschedule();
+            if (!ResetTimerTimeout(SchedulingTime + currentNodeSliceLeft) || Scheduler.TimerInterruptedFlag) {
+                //TODO: What do we REALLY want here?
+                currentThread = null;           // !!!!!!!!SIM ONLY !!!!!!!
+                OneShotReservation.ClearCurrentReservation();
+                robinActivityCurrent  = null;
+                currentStandbyActivity = null;
+                goto RescheduleAgain;
+            }
+
+          exitOK:
+
+            if (currentThread != previousThread) {
+                IChangeCurrentThread(currentThread);
+            }
+            idle = false;
+
+            // Not necessarily true:  Debug.Assert(!Scheduler.TimerInterruptedFlag);
+
+            return false;
+        }
+
+#endregion
+
+#region Constraint feasibility analysis support functions
+        // Constraint Feasibility Analysis support functions begin:
+        // ----------------------------------------------------------------------------------
+        static TimeSpan ComputeAvailableCpu(DateTime begin, DateTime end, GraphNode node)
+        {
+            if (begin >= end) {
+                return new TimeSpan(0);
+            }
+            else {
+                TimeSpan reserved = new TimeSpan(0);
+                DateTime nextExecution;
+                int k;
+
+                if (node == CurrentPlanNode) {
+                    nextExecution = node.NextExec + node.Period;
+                    if (begin < node.NextExec + node.Slice) { // TempStart >= CurrentTime
+                        reserved += node.NextExec + node.Slice - begin;
+                    }
+                }
+                else {
+                    nextExecution = node.NextExec;
+                }
+
+                if (begin > nextExecution) {
+                    k = (int) ((begin - nextExecution).Ticks/node.Period.Ticks);
+                    reserved -= new TimeSpan(k * node.Slice.Ticks) + minInterval(node.Slice,
+                        begin - nextExecution - new TimeSpan(k * node.Period.Ticks));
+                }
+
+                if (end > nextExecution) {
+                    k = (int) ((end - nextExecution).Ticks/node.Period.Ticks);
+                    reserved += new TimeSpan(k * node.Slice.Ticks) + minInterval(node.Slice,
+                        end - nextExecution - new TimeSpan(k * node.Period.Ticks));
+                }
+
+                return reserved;
+            }
+        }
+
+        // GraphNode can provide more than time than necessary between start and deadline; come shorter deadline:
+        static TimeSpan AvailableCpuAndDeadline(DateTime begin,
+                                                DateTime end,
+                                                out DateTime shortDeadline,
+                                                GraphNode node,
+                                                TimeSpan requested)
+        {
+            TimeSpan reserved = new TimeSpan(0);
+            DateTime nextExecution;
+            DateTime temp;
+            TimeSpan tempSpan;
+            int  k;
+
+            shortDeadline = end;
+            if (node == CurrentPlanNode) {
+                //If the node specified is the current one running?
+                if (node.NextExec + node.Slice - begin >= requested) {
+                    //If there's enough time between begin and the end of current node's execution
+                    shortDeadline = begin + requested; //case 1
+                    return requested;
+                }
+                else if (node.NextExec.Ticks + node.Slice.Ticks - begin.Ticks >= 0) {
+                    //case 2
+                    reserved += node.NextExec + node.Slice - begin; // reserved < requested
+                }
+                nextExecution = node.NextExec + node.Period;
+            }
+            else {
+                nextExecution = node.NextExec;
+            }
+
+            if (begin > nextExecution) {
+                //case 3: note -- precludes case 2
+                k = (int) ((begin - nextExecution).Ticks/node.Period.Ticks); // k -> number of complete periods before begin.
+                reserved -= new TimeSpan(k * node.Slice.Ticks) + minInterval(node.Slice,
+                    begin - nextExecution - new TimeSpan(k * node.Period.Ticks)); // calculates the total time remaining before begin we could have reserved -- subtracts it from reserved
+            }
+
+            k = (int) ((requested - reserved).Ticks/node.Slice.Ticks); //case 2 above -- number of remaining slices needed
+            //case 3 above -- number of complete slices in the calculation + number of slices for the request
+            tempSpan = requested - new TimeSpan(k * node.Slice.Ticks) - reserved;   //remainder ms from (requested-reserved)/slice
+            if (tempSpan.Ticks > 0) {
+                temp = nextExecution + new TimeSpan(k * node.Period.Ticks) + tempSpan;
+            }
+            else {
+                temp = nextExecution + new TimeSpan(((k>0)?k-1:0) * node.Period.Ticks) + node.Slice;
+            }
+
+            if (temp <= end) {
+                shortDeadline = temp;
+                return requested;
+            }
+
+            if (end > nextExecution) {
+                k = (int) ((end - nextExecution).Ticks/node.Period.Ticks);
+                reserved += new TimeSpan(k * node.Slice.Ticks) + minInterval(node.Slice,
+                    end - nextExecution - new TimeSpan(k * node.Period.Ticks));
+            }
+            return reserved;
+        }
+
+        // add a new pointer to a reservation to a node and clean the ordered array
+        static void AddReservationToReservationArray(GraphNode node,
+                                                     OneShotReservation reservation,
+                                                     DateTime start,
+                                                     DateTime end,
+                                                     TimeSpan available,
+                                                     DateTime timeNow)
+        {
+            int i, j, insertPosition = -1;
+            int release = 0;
+            OneShotReservation tempReservation;
+
+            Debug.Assert(node.ReservCount < GraphNode.MaxNumReservations);
+            Debug.Assert((start < end) && (available.Ticks > 0));
+            Debug.Assert(node.ReservCount <= GraphNode.MaxNumReservations);
+
+            for (i = j = 0; i < node.ReservCount; i++) {
+                tempReservation = node.ReservationArray[i].AssociatedReservation;
+                if (node.ReservationArray[i].End <= timeNow || !tempReservation.Valid) {
+                    ReleaseReservationProtected(tempReservation);
+                    release++;
+                }
+                else {
+                    if ((insertPosition < 0) && (start < node.ReservationArray[i].Start)) {
+                        insertPosition = j;
+                    }
+                    if (j < i) {
+                        node.ReservationArray[j] = (ReservationSlice)node.ReservationArray[i].Clone();
+                    }
+                    //memcpy(&(node.ReservationArray[j]), &(node.ReservationArray[i]), sizeof(ReservationSlice));
+                    j++;
+                }
+            }
+            if (insertPosition < 0) {
+                insertPosition = j;
+            }
+            else {
+                Array.Copy(node.ReservationArray, insertPosition, node.ReservationArray, insertPosition+1, (j-insertPosition));
+            }
+            //memmove(&(node.ReservationArray[insertPosition+1]), &(node.ReservationArray[insertPosition]),
+            //    sizeof(ReservationSlice) * (j - insertPosition));
+
+            node.ReservationArray[insertPosition] = new ReservationSlice();
+            node.ReservationArray[insertPosition].Start = start;
+            node.ReservationArray[insertPosition].End    = end;
+            node.ReservationArray[insertPosition].Available = available;
+            node.ReservationArray[insertPosition].AssociatedReservation = reservation;
+            AddRefReservation(reservation);
+            Debug.Assert(node.ReservCount == j + release);
+            node.ReservCount = j + 1;
+            Debug.Assert(node.ReservCount <= GraphNode.MaxNumReservations);
+        }
+
+        public static void ReserveSlices(DateTime start,
+                                         DateTime deadline,
+                                         TimeSpan requestedTime,
+                                         RialtoThread task,
+                                         out TimeSpan leftUnreserved,
+                                         ref TimeSpan timeToInherit,
+                                         OneShotReservation reservation,
+                                         GraphNode nodeList,
+                                         DateTime timeNow)
+        {
+            GraphNode        node;
+            OneShotReservation localReservation;
+            int         i;
+            TimeSpan    stillNeeded, toBeInherited, availableCpu, tempSpan;
+            DateTime    tempStart, tempEnd, tempMiddle, newEnd, temp;
+
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            stillNeeded = requestedTime;
+            if (timeToInherit.Ticks >= 0) {
+                toBeInherited = timeToInherit;
+            }
+            else {
+                toBeInherited = new TimeSpan(0);
+            }
+
+            ArrayList newNodeReservations = new ArrayList();
+
+            for (node = nodeList; node != null; node = node.SameActivityNext) {
+
+                //NewReservCount = 0;
+                newNodeReservations.Clear();
+
+                // check if there is room to place another node reservation for this node
+                if ((node.ReservCount == GraphNode.MaxNumReservations) && !CleanReservationArray(node, timeNow)) {
+                    continue; // failed to find room for another reservation
+                }
+
+                tempStart = start; // compute all CPU time available from this node
+                for (i = 0; (i < node.ReservCount) && (tempStart < deadline); i++) {
+                    // the Begin fields are in increasing order:
+                    localReservation = node.ReservationArray[i].AssociatedReservation;
+                    if (!localReservation.Valid) {
+                        continue;
+                    }
+                    tempEnd = node.ReservationArray[i].End;
+                    if (tempEnd <= tempStart) {
+                        continue; // this node reservation doesn't count
+                    }
+
+                    tempMiddle = node.ReservationArray[i].Start;
+
+                    // tempEnd > tempStart
+                    // tempStart..min(tempMiddle, deadline) can be allocated,
+                    // max(tempStart, tempMiddle)..min(tempEnd, deadline) may be stolen or inherited
+
+                    if ((tempMiddle > tempStart) &&
+                        (node.ReservCount + newNodeReservations.Count < GraphNode.MaxNumReservations)) {
+                        // allocate [tempStart , min(tempMiddle, deadline)] or a fraction of it:
+                        temp = minTime(tempMiddle, deadline);
+                        availableCpu = AvailableCpuAndDeadline(tempStart, temp, out newEnd, node, stillNeeded);
+                        Debug.Assert((availableCpu <= stillNeeded) || (newEnd <= temp));
+
+                        if (availableCpu >= stillNeeded) {
+                            // success:
+                            ReservationSlice tempSlice = new ReservationSlice();
+                            tempSlice.Start     = tempStart;
+                            tempSlice.End       = newEnd;
+                            tempSlice.Available = availableCpu;
+                            tempSlice.AssociatedReservation = reservation;
+                            newNodeReservations.Add(tempSlice);
+                            //NewNodeReserv[NewReservCount] = new ReservationSlice();
+                            goto early_exit;
+                        }
+                        else if (availableCpu.Ticks > 0) {
+                            ReservationSlice tempSlice = new ReservationSlice();
+                            stillNeeded -= availableCpu;
+                            tempSlice.Start     = tempStart;
+                            tempSlice.End       = temp;
+                            tempSlice.Available = availableCpu;
+                            tempSlice.AssociatedReservation = reservation;
+                            newNodeReservations.Add(tempSlice);
+                            //NewNodeReserv[NewReservCount] = new ReservationSlice();
+                        }
+                    }
+
+                    // max(tempStart, tempMiddle)..min(tempEnd, deadline) may be inherited:
+                    if ((timeToInherit.Ticks != -1) && (localReservation.ReservTask == task)) {
+                        // not yet stolen slice
+                        // we can count on the time provided by this reservation
+                        // as it is somewhere down the current stack of constraints
+                        if (localReservation.ResolutionEpoch != ResolutionAttempt) {
+                            localReservation.InheritedEstimate = new TimeSpan(0);
+                            localReservation.ResolutionEpoch  = ResolutionAttempt;
+                        }
+                        tempSpan = localReservation.Estimate
+                            - localReservation.InheritedEstimate;
+                        if (OneShotReservation.CurrentReservation == localReservation) {
+                            tempSpan -= timeNow - SchedulingTime;
+                        }
+
+                        if ((tempStart > tempMiddle) || (tempEnd > deadline)) {
+                            // tempStart >= timeNow
+                            availableCpu = minInterval(ComputeAvailableCpu(maxTime(tempStart, tempMiddle),
+                                minTime(tempEnd, deadline), node), tempSpan);
+                        }
+                        else { // use $$-ed value
+                            availableCpu = minInterval(node.ReservationArray[i].Available, tempSpan);
+                        }
+
+                        // inherit no more than needed:
+                        availableCpu = minInterval(availableCpu, stillNeeded);
+                        if (availableCpu.Ticks > 0) {
+                            toBeInherited += availableCpu;
+                            stillNeeded -= availableCpu;
+                            localReservation.InheritedEstimate += availableCpu;
+                            Debug.Assert(localReservation.InheritedEstimate
+                                <= localReservation.Estimate);
+                            if (stillNeeded.Ticks == 0) {
+                                goto exit;
+                            }
+                        }
+                    } // Inherit End.
+
+                    tempStart = tempEnd;
+                } // for (i = 0;......)
+
+                for (i = 0; i < newNodeReservations.Count; i++) {
+                    // add collected slice reservations:
+                    AddReservationToReservationArray(node, ((ReservationSlice)newNodeReservations[i]).AssociatedReservation,
+                        ((ReservationSlice)newNodeReservations[i]).Start,
+                        ((ReservationSlice)newNodeReservations[i]).End,
+                        ((ReservationSlice)newNodeReservations[i]).Available, timeNow);
+                }
+
+                if (node.ReservCount < GraphNode.MaxNumReservations) {
+                    // if there is room for one more reservation
+                    // Compute the last possible CPU slice(s) to be allocated at this node:
+                    availableCpu = AvailableCpuAndDeadline(tempStart, deadline, out newEnd, node, stillNeeded);
+                    if (availableCpu >= stillNeeded) {
+                        AddReservationToReservationArray(node, reservation, tempStart, newEnd, availableCpu, timeNow);
+                        stillNeeded = new TimeSpan(0);
+                        goto exit;
+                    }
+
+                    if (availableCpu.Ticks > 0) {
+                        stillNeeded -= availableCpu;
+                        AddReservationToReservationArray(node, reservation, tempStart, deadline, availableCpu, timeNow);
+                    }
+                }
+            } // for each node IN THE input list (free or from own activity)....
+          exit:
+            leftUnreserved = stillNeeded;
+            if (timeToInherit.Ticks != -1) {
+                timeToInherit  = toBeInherited;
+            }
+            return;
+
+          early_exit:
+            for (i = 0; i < newNodeReservations.Count; i++) {
+                // add collected slice reservations:
+                AddReservationToReservationArray(node,
+                                                 ((ReservationSlice)newNodeReservations[i]).AssociatedReservation,
+                                                 ((ReservationSlice)newNodeReservations[i]).Start,
+                                                 ((ReservationSlice)newNodeReservations[i]).End,
+                                                 ((ReservationSlice)newNodeReservations[i]).Available, timeNow);
+            }
+            goto exit;
+        }
+
+        public static bool CheckReservation(OneShotReservation reservation,
+                                            DateTime timeNow)
+        {
+            TimeSpan                    timeLeft, timeInherited;
+            GraphNode                   nodeList;
+            TimeSpan                    timeToInherit;
+
+            if (reservation.SurroundingReservation != null)  {
+                if (!reservation.Valid) {
+                    return CheckReservation(reservation.SurroundingReservation, timeNow);
+                }
+                if (!CheckReservation(reservation.SurroundingReservation, timeNow)) {
+                    return false;
+                }
+            }
+            else if (!reservation.Valid) {
+                return true;
+            }
+
+            timeInherited = new TimeSpan(0);
+
+            if (reservation.AssociatedActivity != null) {
+                timeToInherit = new TimeSpan(-1);
+                nodeList = reservation.AssociatedActivity.MyRecurringCpuReservation.TempAssignedNodes;
+            }
+            else {
+                ResolutionAttempt++;
+                timeToInherit = timeInherited;
+                nodeList = reservation.OriginalThread.AssociatedActivity.MyRecurringCpuReservation.TempAssignedNodes;
+            }
+
+            TimeSpan foo = new TimeSpan(0); //TODO: May need a separate flag to signal not interested if 0 isn't good enough
+            ReserveSlices(reservation.Start, reservation.Deadline, reservation.Estimate,
+                          reservation.ReservTask, // taskId null Activ Reservs
+                          out timeLeft, ref timeToInherit,
+                          reservation, nodeList, timeNow);
+
+            if (timeLeft.Ticks != 0) {
+                ReserveSlices(reservation.Start, reservation.Deadline, reservation.Estimate,
+                              reservation.ReservTask, // taskId null Activ Reservs
+                              out timeLeft, ref timeToInherit,
+                              reservation, tempFreeNodes, timeNow);
+            }
+
+            if (timeLeft.Ticks > 0) {
+                return false;
+            }
+            if (reservation.OriginalThread != null && timeInherited.Ticks > 0) {
+                OneShotReservation.InheritOnEarliestDeadlineFirst(reservation.SurroundingReservation, timeInherited);
+            }
+
+            return true;
+        }
+
+        public static void DirectSwitchOnWait()
+        {
+            if (SchedulerClock.TimeToInterrupt() < RialtoScheduler.MinSlice) {
+                return; //Don't do a directed context switch if there isn't much time.
+            }
+            if (OneShotReservation.CurrentReservation != null) {
+                Debug.Assert(OneShotReservation.GuaranteedReservations != null);
+                directSwitchTo = OneShotReservation.GuaranteedReservations.GetRunnableThread();
+            }
+            //  else if ((threadWaiter == GetCurrentThread()) &&
+            //       (threadWaiter.AssociatedActivity.RunnableThreads == null)) {
+            //      directSwitchTo = pTH(thread);
+            //  }
+        }
+
+        public static void DirectSwitchOnWakeup()
+        {
+            if (((OneShotReservation.CurrentReservation != null) &&
+                (OneShotReservation.CurrentReservation != OneShotReservation.GuaranteedReservations)) ||
+                EarliestDeadlineFirstBlocked) {
+                Reschedule();
+            }
+        }
+
+        public static void DirectSwitchOnConstraint()
+        {
+            if ((OneShotReservation.CurrentReservation != null) &&
+                (OneShotReservation.GuaranteedReservations != null) &&
+                (OneShotReservation.GuaranteedReservations.ReservTask != (GetCurrentThread()))) {
+                Reschedule();
+            }
+        }
+#endregion
+
+        public static void Reschedule()
+        {
+            needToReschedule = true;
+        }
+
+        public static void ActivityObjAddRef(RialtoActivity activity)
+        {
+            Interlocked.Increment(ref activity.ReferenceCount);
+        }
+
+
+        public static void ActivityObjRelease(RialtoActivity activity)
+        {
+            Debug.Assert(activity.ReferenceCount >= 1);
+            activity.ReleaseReference();
+        }
+
+        public static void ActivityReleaseProtected(RialtoActivity activity)
+        {
+            Debug.Assert(activity.ReferenceCount >= 1);
+            Debug.Assert(Processor.InterruptsDisabled(), "Interrupts not disabled!");
+            // XXX Need to implement HelperActivityRelease() that does release with preemption enabled
+            // activity.ReleaseReference();
+            // DebugStub.Print("Need to implement HelperActivityRelease()\n");
+        }
+
+
+        ///////////////////////////////////////////////////// Debugging Tools.
+        //
+#if DEBUG_TREE
+        static void PrintNode(GraphNode pNode, int level, string indent)
+        {
+            int k;
+            if (pNode == null) {
+                DebugStub.Print("\n");
+                return;
+            }
+            if (pNode.Type == GraphNode.NodeType.Used) {
+                DebugStub.Print("{0}L{1} -- Per {2} --- Act {3} Slice {4}\n",
+                                __arglist(indent, level, pNode.Period,
+                                          pNode.DefaultActivity.Id,
+                                          pNode.Slice));
+            }
+            else if (pNode.Type == GraphNode.NodeType.Free) {
+                DebugStub.Print("{0}L{1} -- Per {2} --- FREE Slice {3}\n",
+                                __arglist(indent, level, pNode.Period,
+                                          pNode.Slice));
+            }
+            else {
+                // BRANCH
+                DebugStub.Print("{0}L{1} -- Per {2} --- BRANCH\n",
+                                __arglist(indent, level, pNode.Period));
+                string newIndent = indent + "  ";
+                PrintNode (pNode.Left, level+1, newIndent);
+                PrintNode (pNode.Right, level+1, newIndent);
+                Debug.Assert(pNode.Next == null);
+            }
+            PrintNode(pNode.Next, level, indent);
+        }
+
+        static void PrintSchedPlan(GraphNode SchedPlan, DateTime StartingAt)
+        {
+            int level= 0;
+            DebugStub.Print("Scheduling plan starting at {0}\n",
+                            __arglist(StartingAt.Ticks));
+            PrintNode(SchedPlan, level, "");
+
+        }
+#endif
+
+#if DEBUG_RESERV
+        // This code was ported over with PrintNode but hasn't been fully converted to working C# yet
+        static TimeSpan ComputeTotalAvailableCpu(GraphNode pNode, int ReservIndex, DateTime TimeNow)
+        {
+            DateTime TempStart, TempEnd;
+            TimeSpan AvailableCpu = 0;
+            PRESERVATION pReserv;
+            PRESERVATION pResInterest;
+            int i;
+            pResInterest = (PRESERVATION) POINTER(pNode.ReservArray[ReservIndex]);
+            TempStart = maxTime(pResInterest->Start, TimeNow);
+            for (i = 0; i < ReservIndex; i++) {
+                // the Begin fields are in increasing order:
+                pReserv = POINTER(pNode.ReservArray[i]);
+
+                if (!pReserv->Valid) {
+                    continue;
+                }
+
+                TempEnd = NODE_DEADLINE(pNode.ReservArray[i]);
+                if (TempEnd <= TempStart) {
+                    continue; // this node reservation doesn't count
+                }
+
+                // TempEnd > TempStart &&  NodeReservation->ReservTaskId != TaskId
+                // TempStart..min(pReserv->Start, Deadline) can be allocated,
+                // max(TempStart, pReserv->Start)..min(TempEnd, Deadline) may be stolen
+                AvailableCpu +=
+                    ComputeAvailableCpu(TempStart, minTime(min(pReserv->Start, TimeNow),
+                    pResInterest->Deadline), pNode);
+                TempStart = TempEnd;
+            }
+            AvailableCpu += ComputeAvailableCpu(TempStart,
+                NODE_DEADLINE(pNode.ReservArray[ReservIndex]), pNode);
+            //  assert (AvailableCpu != 0);
+            return AvailableCpu;
+        }
+
+        static void PrintReservationNode(GraphNode pNode, int level, string indent, DateTime TimeNow)
+        {
+            int i, k;
+            if (pNode == null) {
+                DebugStub.Print("\n");
+                return;
+            }
+
+            if (pNode.Type == GraphNode.NodeType.Used ||
+                pNode.Type == GraphNode.NodeType.Free) {
+
+                if (pNode.Type == GraphNode.NodeType.Used) {
+                    DebugStub.Print("{0}L{1} -- Per {2} --- Act {3} Slice {4}\n",
+                                    __arglist(indent, level, pNode.Period,
+                                              pNode.DefaultActivity.Id,
+                                              pNode.Slice));
+                }
+                else {
+                    // FREE
+                    DebugStub.Print("{0}L{1} -- Per {2} --- FREE Slice {3}\n",
+                                    __arglist(indent, level, pNode.Period,
+                                              pNode.Slice));
+                }
+
+                for (i = 0; i < pNode.ReservCount; i++) {
+                    PRESERVATION pRes = POINTER(pNode.ReservArray[i]);
+                    Debug.Assert(NODE_DEADLINE(pNode.ReservArray[i]) != 0);
+                    DebugStub.Print("{0}  R{1} - T{2}:A{3} (T{4}:A{5}) {6}-{7}"+
+                                    "{8} {9} Av.{10} Est {11}\n",
+                                    __arglist(
+                                        indent,
+                                        pRes->ReservationId,
+                                        (pRes->OriginalThread
+                                         ? pRes->OriginalThread.Id : -1),
+                                        (pRes->OriginalThread
+                                         ? pRes->OriginalThread->pActivity.Id
+                                         : pRes->pActivity.Id),
+                                        (pRes->ActiveThread
+                                         ? pRes->ActiveThread.Id : -1),
+                                        (pRes->ActiveThread
+                                         ? pRes->ActiveThread->pActivity.Id
+                                         : pRes->pActivity.Id),
+                                        pRes->Start,
+                                        NODE_DEADLINE(pNode.ReservArray[i]),
+                                        ((UINT)pNode.ReservArray[i] & 0x02 ? "STL":"NSTL"),
+                                        (pRes->Valid ? "Vld":"NVld"),
+                                        (pRes->Valid
+                                         ? ComputeTotalAvailableCpu(pNode, i, TimeNow.Ticks)
+                                         : -1),
+                                        pRes->Estimate));
+                }
+            }
+            else {
+                // BRANCH
+                DebugStub.Print("{0}L{1} -- Per {2} --- BRANCH\n",
+                                __arglist(indent, level, pNode.Period));
+                string newIndent = indent + "  ";
+                PrintReservationNode (pNode.Left, level+1, newIndent, TimeNow);
+                PrintReservationNode (pNode.Right, level+1, newIndent, TimeNow);
+                Debug.Assert(pNode.Next == null);
+            }
+            PrintReservationNode(pNode.Next, level, indent, TimeNow);
+        }
+
+        void PrintReservations(PRESERVATION pReservation, BOOL ok, DateTime TimeNow)
+        {
+            int level = 0;
+
+            DebugStub.Print("Reserv {0} (T{1}:A{2}): {3} {4} {5} ({6}) {7} at {8}\n",
+                            __arglist(
+                                pReservation->ReservationId,
+                                (pReservation->OriginalThread != null
+                                 ? pReservation->OriginalThread.Id: -1),
+                                (pReservation->OriginalThread != null
+                                 ? pReservation->OriginalThread->pActivity.Id
+                                 : pReservation->pActivity.Id),
+                                pReservation->Start,
+                                pReservation->Deadline,
+                                pReservation->Estimate,
+                                (pReservation->Criticality == CRITICAL ? "CRT":"NCRT"),
+                                (ok ? "OK":"NO"),
+                                TimeNow.Ticks));
+            //  DebugStub.Print(" (O {0} + I {0})\n",
+            // __arglist(pReservation->OwnEstimate, pReservation->InheritedEstimate));
+            PrintReservationNode(pSchedPlan, level, "", TimeNow);
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Rialto/RialtoThread.cs b/base/Kernel/Singularity/Scheduling/Rialto/RialtoThread.cs
new file mode 100644
index 0000000..a6c0b32
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Rialto/RialtoThread.cs
@@ -0,0 +1,554 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RialtoThread.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Rialto
+{
+    /// <summary>
+    /// The kernel structure for the thread.  Contains an associated activity, a
+    /// stack of reservations executing the activity, a reference for a free
+    /// reservation (rather than allocating a new one all the time), a pending
+    /// reservation (used when new constraints are being created), a reference to the
+    /// thread it’s waiting on (for use in scheduling inheritance), the basic thread
+    /// queue and sleep queue pointers, lists of people waiting on mutexes and cv’s
+    /// owned by this thread, bookkeeping for the type of waiting that I’m doing, and
+    /// general bookkeeping.
+    /// </summary>
+    public class RialtoThread : ISchedulerThread
+    {
+        // Thread State values passed to SetState
+        // ThreadReady  0    Able to be run but not yet running
+        // ThreadWaiting    1    Waiting for object and/or timeout
+        // ThreadRunning    2    Current thread (for a given CPU)
+
+        //public enum ThreadState { ThreadReady = 0, ThreadWaiting = 1, ThreadRunning = 2};
+
+        static private ListNode sleepingThreads = null;             // list of sleeping threads
+        static private DateTime sleepTimeout = DateTime.MaxValue;   // Next thread wakeup time
+        private TimeSpan executionTime;
+
+        public override TimeSpan ExecutionTime
+        {
+            get { return executionTime; }
+        }
+
+        public RialtoActivity AssociatedActivity;    // Thread Activity
+        //public RialtoThread.ThreadState       State;      // RUNNING, WAITING, SLEEPING
+
+        public OneShotReservation  ReservationStack;
+        // Stack of Reservations, one per active Constraint
+        public OneShotReservation  FreeReservation;
+        public OneShotReservation  PendingReservation;
+        // PendingConstraint if any
+
+        // DI :: NOTE the Owner field in Kernel is used only for Inheritance control
+        //      need to REMOVE it -- this will help to locate easy all these functions and
+        //      comment them out
+        //public int                Epoch;       // inc-ed at every kernel unlock
+
+        public DateTime     StartTime;  // only while on the sleep Q
+        public RialtoThread Next;       // Next and previous threads
+        public RialtoThread Previous;
+
+        // DI -- ??!! this might replace Next and Previous from above
+        public ListNode Queue;            // List of threads in a queue
+        // DI -- need it as a thread may wait on a condition (i.e. use Queue)
+        // and wait for the timeout (Condition_TimedWait)
+        public ListNode SleepQueue;       // Another queue link, for sleeping only
+
+        public int  ReferenceCount;
+        public readonly Thread enclosingThread;
+
+        //public interface
+        public RialtoThread(Thread thread)
+        {
+            enclosingThread = thread;
+            Queue = new ListNode(this);
+            SleepQueue = new ListNode(this);
+            AssociatedActivity    = null;
+            StartTime  = new DateTime(0);
+            //TODO: BUGBUGBUG
+            //Tid = Id; REPLACE WITH DEFAULT TASK?
+            Queue.Next = Queue.Previous = Queue;
+            SleepQueue.Next = SleepQueue.Previous = SleepQueue;
+            //State = RialtoThread.ThreadState.ThreadWaiting;
+        }
+
+#region ISchedulerThread Members
+
+        public override Thread EnclosingThread
+        {
+            get { return enclosingThread; }
+        }
+
+        //public interface
+        public override void SetActivity(ISchedulerActivity iActivityNew)
+        {
+            // DebugStub.Print("RialtoThread.SetActivity()\n");
+            Debug.Assert(iActivityNew != null);
+            Debug.Assert(iActivityNew is RialtoActivity);
+            RialtoActivity activityNew = (RialtoActivity)iActivityNew;
+            RialtoActivity activityOld = AssociatedActivity;
+
+
+            if (activityOld == activityNew) {
+                return;
+            }
+
+            bool iflag = Processor.DisableInterrupts();
+
+            if (activityOld != null) {
+                //if (State != RialtoThread.ThreadState.ThreadWaiting)
+                if (enclosingThread.ThreadState == System.Threading.ThreadState.Running)
+                    RialtoScheduler.DequeueRunThread(this);
+                RialtoScheduler.ActivityReleaseProtected(activityOld);
+            }
+
+            if (activityNew != null) {
+                //if (State != RialtoThread.ThreadState.ThreadWaiting)
+                if (enclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+                    AssociatedActivity = activityNew;
+                    RialtoScheduler.EnqueueRunThread(this);
+                }
+                RialtoScheduler.ActivityObjAddRef(activityNew);
+            }
+            else if (this == RialtoScheduler.GetCurrentThread()) {
+                //TODO: Double Check! //State == RialtoThread.ThreadState.ThreadRunning)
+                if (this == RialtoScheduler.GetCurrentThread() && activityOld != null) {
+                    RialtoScheduler.UpdateSchedulingStatus();
+                }
+            }
+            AssociatedActivity = activityNew;
+            // DebugStub.Print("Exiting RialtoThread.SetActivity()\n");
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public interface
+        public override void Start()
+        {
+            //TODO: No need for assertion perhaps -- default somehow?
+            Debug.Assert(AssociatedActivity != null);
+            bool iflag = Processor.DisableInterrupts();
+            IReady();
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public interface
+        public override void Cleanup()
+        {
+            OneShotReservation reservation;
+            // DebugStub.Print("Cleaning RialtoThread\n");
+
+            SetStateWaiting(DateTime.MaxValue);
+            // DebugStub.Print("At this point thread is dequeued.\n");
+
+            while ((reservation = ReservationStack) != null) {
+                ReservationStack = reservation.Next; // !!!! don't remove Caller's constraints !!!
+                reservation.DequeueReservation();
+            }
+
+            RialtoScheduler.ActivityObjRelease(AssociatedActivity);
+
+            //TODO: In the "real" system, cleanup is called by someone who will pick next thread, right?
+        }
+
+#endregion
+
+        public static DateTime GetSleepTimeout()
+        {
+            if (sleepingThreads != null) {
+                return sleepTimeout;
+            }
+            else {
+                return DateTime.MaxValue;
+            }
+        }
+
+        public void AddRef()
+        {
+            ReferenceCount++;
+        }
+
+        // DI -- instead of calling this, one should call ::ReleaseActivity
+        public void Release()
+        {
+            ReferenceCount--;
+            Debug.Assert(ReferenceCount >= 0);
+        }
+
+        public void ReleaseProtected()
+        {
+            ReferenceCount--;
+            Debug.Assert(ReferenceCount >= 0);
+        }
+
+        public override void SetStateWaiting(DateTime timeOut)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            InternalSetStateWaiting(timeOut);
+            RialtoScheduler.DirectSwitchOnWait();
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        public void InternalSetStateWaiting(DateTime timeOut)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            // DI -- don't need activity state update
+            //This to handle sleeps and timed waits.
+            if (timeOut != DateTime.MaxValue) {
+                if (timeOut - SystemClock.GetKernelTime() > RialtoScheduler.MinSlice) {
+                    Scheduler.LogSleepAdd();
+                    StartTime = timeOut;
+
+                    PutOnSleepQueue();
+                }
+                else {
+                    //Sleeping for less than MinSlice is treated as not sleeping/yield.
+                    if (PendingReservation != null) {
+                        ResolvePendingReservation();
+                    }
+                    return;
+                }
+            }
+
+            RialtoScheduler.DequeueRunThread(this); // from RunnableThreads
+            if (this == RialtoScheduler.GetCurrentThread()) {
+                // if activity blocks during its own regular CPU slice; same code as in Sleep!
+                if ((AssociatedActivity.RunnableThreads == null) &&
+                   (RialtoScheduler.CurrentPlanNode.Type == GraphNode.NodeType.Used) &&
+                   (RialtoScheduler.CurrentPlanNode.DefaultActivity == AssociatedActivity) &&
+                   ((AssociatedActivity.MyRecurringCpuReservation.SliceLeft =
+                     RialtoScheduler.CurrentPlanNode.NextExec + RialtoScheduler.CurrentPlanNode.Slice
+                     - SystemClock.GetKernelTime()) >= RialtoScheduler.MinSlice)) {
+
+                    AssociatedActivity.LastNode = RialtoScheduler.CurrentPlanNode; // record it
+                }
+            }
+
+        }
+
+
+        // DI -- this is the function in !LAXITY version
+        //TODO: REPLACE WITH ENCLOSING LOGIC!
+        //public void SetState(ThreadState newState)
+        //{
+        //    State = newState;
+        //    Debug.Assert(newState != ThreadState.ThreadWaiting);
+        //}
+
+        // DI -- safe
+        //TODO: REPLACE WITH ENCLOSING LOGIC!
+        void IReady()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            // TODO -- maybe something for directed context switch
+            // DI -- don't need PutThreadOnReadyQueue outside schedule.c
+            // PutThreadOnReadyQueue(thread);
+
+            RialtoScheduler.EnqueueRunThread(this);
+
+            // When an activity becomes runnable during
+            // its own regular CPU slice, a reschedule occurs.
+            if (AssociatedActivity.LastNode != null)
+            {
+                RialtoScheduler.EnqueueStandbyActivity(AssociatedActivity); // sets 'thread.AssociatedActivity.LastNode' to null
+                Debug.Assert(AssociatedActivity.LastNode == null && RialtoScheduler.CurrentPlanNode != null, "Removing unused code! IF EXCEPTION HAPPENS, CODE SHOULD BE REPLACED");
+                //                if (RialtoScheduler.CurrentPlanNode == thread.AssociatedActivity.LastNode) { //TODO: This is really an equivalence with null?
+                //                    RialtoScheduler.Reschedule();
+                //                }
+            }
+        }
+
+        // DI -- this is called only from PutThreadOnSleepQueue
+        // DI -- merge them ??
+        static ListNode InsertThreadOnSleepQueue(RialtoThread thread, ListNode listThreadHead)
+        {
+            RialtoThread threadHead, threadTail, tempThread;
+
+            if (listThreadHead == null) {
+                // Queue empty
+                return thread.SleepQueue;
+            }
+
+            threadHead = GetThreadFromListNode(listThreadHead);
+            threadTail = GetThreadFromListNode(threadHead.SleepQueue.Previous);
+
+            if (thread.StartTime >= threadTail.StartTime) {
+                thread.SleepQueue.InsertIntoList(threadTail.SleepQueue);
+                // DI -- if merge: update sleepTimeout here
+                return threadHead.SleepQueue;
+            }
+
+
+            if (thread.StartTime < threadHead.StartTime) {
+                thread.SleepQueue.InsertIntoList(threadTail.SleepQueue);
+                return thread.SleepQueue;
+            }
+
+            tempThread = GetThreadFromListNode(threadHead.SleepQueue.Next);
+            for (;;) {
+                if (tempThread.StartTime > thread.StartTime) {
+                    thread.SleepQueue.InsertIntoList(tempThread.SleepQueue.Previous);
+                    break;
+                }
+                tempThread = GetThreadFromListNode(tempThread.SleepQueue.Next);
+            }
+
+            return threadHead.SleepQueue;
+        }
+
+        public void PutOnSleepQueue()
+        {
+            sleepingThreads = InsertThreadOnSleepQueue(this,sleepingThreads);
+            sleepTimeout = (GetThreadFromListNode(sleepingThreads)).StartTime;
+        }
+
+
+        //        public void Sleep(DateTime time)
+        //        {
+        //            if (time - SystemClock.GetKernelTime() > GraphNode.MinSlice) {
+        //                RialtoScheduler.LogSleepAdd();
+        //                StartTime = time;
+        //
+        //                SetStateWaiting();
+        //
+        //                // DI -- need it, called from WaitCond also
+        //                PutOnSleepQueue();
+        //            }
+        //        }
+
+        // Di -- safe -- optimized
+        void PullThreadOffSleepQueue()
+        {
+            ListNode listThread, listNewHead;
+
+            listThread = SleepQueue;
+            listNewHead = listThread.ListRemove();
+
+            if (sleepingThreads == listThread) {
+                if ((sleepingThreads = listNewHead) != null) {
+                    sleepTimeout = (GetThreadFromListNode(sleepingThreads)).StartTime;
+                }
+                else {
+                    sleepTimeout = DateTime.MaxValue;
+                }
+            }
+        }
+
+        private void ResolvePendingReservation()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(PendingReservation != null);
+            bool admitted = OneShotReservation.ResolveConstraint(this);
+            //else { DebugStub.WriteLine("Wake()-Resolve returned non S_OK"); }
+            if (ReservationStack.EnclosingTask != null) {
+                // Not clear if this will work in real system or not.  Here for simulator mainly.
+                ReservationStack.EnclosingTask.UpdateSchedulingState(admitted, ReservationStack.Deadline, ReservationStack.ResourcesGranted);
+            }
+            else {
+                Debug.Assert(false);
+            }
+        }
+
+        // DI -- safe
+        public override void Wake()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            PullThreadOffSleepQueue();
+            IReady();
+
+            if (PendingReservation != null) {
+                ResolvePendingReservation();
+            }
+
+            RialtoScheduler.DirectSwitchOnWakeup();
+            Processor.RestoreInterrupts(iflag);
+        }
+
+
+        OneShotReservation AllocationReservation()
+        {
+            OneShotReservation reservation = FreeReservation;
+
+            Debug.Assert(reservation != null);
+            FreeReservation = null;
+            reservation.Clear();
+            return reservation;
+        }
+
+
+        public void IpcCheckFreeConstraint()
+        {
+            if (FreeReservation == null) {
+                OneShotReservation reservation;
+
+                reservation = RialtoScheduler.IpcAllocateReservation();
+
+                if (reservation == null) {
+                    reservation = RialtoScheduler.AllocateReservation();
+                }
+
+                FreeReservation = reservation;
+            }
+        }
+
+        // If this thread doesn't have a free OneShotReservation reserved
+        // for its use, then try to grab one from the global free list.
+        // If there aren't any there, then allocate a new one.
+        void ICheckFreeConstraint()
+        {
+            if (FreeReservation == null) {
+                OneShotReservation reservation;
+
+                reservation = RialtoScheduler.AllocateReservation();
+
+                FreeReservation = reservation;
+            }
+        }
+
+
+        // Free the Reservations associated with a thread.
+        // Used by thread cleanup.
+        public void IFreeConstraints()
+        {
+            OneShotReservation reservation;
+
+            //  Debug.Assert(!Processor.InterruptsDisabled());
+
+            if (FreeReservation != null) {
+                RialtoScheduler.IpcFreeReservation(FreeReservation);
+            }
+
+            while ((reservation = ReservationStack) != null) {
+                ReservationStack = reservation.SurroundingReservation;
+                RialtoScheduler.ReleaseReservation(reservation);
+            }
+        }
+
+        // DI -- safe but optimize to  because don't need QueueType
+        public ListNode Dequeue()
+        {
+            return Queue.ListRemove();
+        }
+
+        public static ListNode QueueFifo(RialtoThread thread, ListNode threadHead)
+        {
+            if (threadHead != null) {
+                thread.Queue.InsertIntoList(threadHead.Previous);
+            }
+            else {
+                threadHead = thread.Queue;
+            }
+            return threadHead;
+        }
+
+        // DI -- safe
+        public static RialtoThread GetThreadFromListNode(ListNode listNode)
+        {
+            Debug.Assert(listNode == null || listNode.Data is RialtoThread);
+            if (listNode == null) {
+                return null;
+            }
+            if (listNode.Data is RialtoThread) {
+                return (RialtoThread)listNode.Data;
+            }
+            else {
+                return null;
+            }
+        }
+
+        public static void WakeThreads()
+        {
+            RialtoThread    ptemp;
+            Debug.Assert(Processor.InterruptsDisabled());
+            while ((ptemp = RialtoThread.GetThreadFromListNode(sleepingThreads)) != null &&
+                  ptemp.StartTime < RialtoScheduler.SchedulingTime + RialtoScheduler.LA_Time) {
+                //TODO: LA_Time here?
+                sleepingThreads = sleepingThreads.ListRemove();
+
+                RialtoScheduler.MoveToStandby(ptemp, true); //NOTE: Sets LastNode to null, prevents IReadythread from also EnqueueingStandbyActivity
+                ptemp.IReady();
+
+                if (ptemp.PendingReservation != null) {
+                    ptemp.ResolvePendingReservation();
+                }
+                Scheduler.LogWakeThread(ptemp.EnclosingThread);
+            }
+
+            if (ptemp != null)
+                sleepTimeout = ptemp.StartTime;
+            else
+                sleepTimeout = DateTime.MaxValue;
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="thread"></param>
+        /// <param name="EndPrevious"></param>
+        /// <param name="timeConstraint"></param>
+        /// <param name="timeNow">TODO: UNUSED</param>
+        /// <returns></returns>
+        public bool BeginConstraintBeforeWaitValidate(bool endPrevious,
+                                                       ref TimeConstraint timeConstraint,
+                                                       DateTime timeNow)
+        {
+            if (endPrevious &&      // check to have a valid constraint in the stack.
+                (ReservationStack == null || ReservationStack.OriginalThread == null)) {
+                return false;
+            }
+
+            if (timeConstraint.Estimate.Ticks < 0) {
+                return false;
+            }
+
+            // By this time, something should be in FreeReservation
+            // grab it now such to enable the EndPreviousConstraint to
+            // save its reservation in the cache
+            Debug.Assert(FreeReservation != null);
+            Debug.Assert(FreeReservation != OneShotReservation.CurrentReservation);
+
+            PendingReservation = AllocationReservation();
+
+            return true;
+        }
+
+        public void AddExecutionTime(TimeSpan delta)
+        {
+            executionTime += delta;
+        }
+
+        public override ISchedulerTask PrepareDelayedTask(ISchedulerTask taskToEnd,
+                                                          ref TimeConstraint timeConstraint,
+                                                          DateTime timeNow)
+        {
+            // DI -- the Next calls are from TimedWaitAndBeginConstraint
+            IpcCheckFreeConstraint();
+
+            Debug.Assert(taskToEnd == null || taskToEnd == ReservationStack);
+            bool endPrevious = (taskToEnd != null);
+
+            if (!BeginConstraintBeforeWaitValidate(endPrevious, ref timeConstraint, timeNow)) {
+                goto Exit;
+            }
+
+            OneShotReservation.BeginConstraintBeforeWait(this, endPrevious, timeConstraint, timeNow);
+          Exit:
+            return PendingReservation;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Robin/OneShotReservation.cs b/base/Kernel/Singularity/Scheduling/Robin/OneShotReservation.cs
new file mode 100644
index 0000000..4030741
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Robin/OneShotReservation.cs
@@ -0,0 +1,748 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   OneShotReservation.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Robin
+{
+    /// <summary>
+    /// OneShotReservations are created from tasks for the calling thread.
+    /// It has fields to track the thread calling and the thread waiting on,
+    /// the activity associated when it becomes an activity reservation, its
+    /// surrounding reservation, its place on the free reservation list,
+    /// general bookkeeping, bookkeeping for possible stolen time, and
+    /// references for the general reservation list.
+    /// </summary>
+    public class OneShotReservation : ISchedulerTask
+    {
+
+        static OneShotReservation  guaranteedReservations = null;
+        public static OneShotReservation GuaranteedReservations
+        {
+            get { return guaranteedReservations; }
+        }
+
+        static OneShotReservation  idleReservations = null;
+        public static OneShotReservation IdleReservations
+        {
+            get { return idleReservations; }
+        }
+
+        static OneShotReservation  currentReservation = null;
+        public static OneShotReservation CurrentReservation
+        {
+            get { return currentReservation; }
+            //set { currentReservation = value; }
+        }
+
+        public Hashtable resourcesGranted = new Hashtable();
+        public override Hashtable ResourcesGranted
+        {
+            get {
+                resourcesGranted[CpuResource.Provider().ResourceString] = CpuResource.Provider().TimeToCpu(InitialEstimate);
+                return resourcesGranted;
+            }
+        }
+
+
+        private Task enclosingTask;
+        public override Task EnclosingTask
+        {
+            get { return enclosingTask; }
+            set { enclosingTask = value; }
+        }
+
+        public OneShotReservation      SurroundingReservation;
+        public OneShotReservation      FreeListNext;
+        public RobinThread             ReservTask;
+
+        TimeSpan     constraintExecution;
+        public TimeSpan ConstraintExecution
+        {
+            get { return constraintExecution; }
+        }
+
+        TimeSpan     initialThreadExecution;
+
+        public DateTime     Start;
+        public DateTime     Deadline;
+        public TimeSpan     Estimate;
+        public TimeSpan     RelativeDeadline;
+
+        public TimeSpan     InitialEstimate; // test only
+        public QueueType    MyQueueType;
+        public bool         Guaranteed;
+        public bool         Valid;
+        public bool         Satisfied;
+
+        // Reservations can be made for Threads XOR Activities!
+        public RobinThread         OriginalThread; // always the constraint thread -- non-null until the reservation is complete
+        //public RobinThread           ActiveThread;   // the above, or the thread blocking it
+        //public int                ActiveThreadEpoch;
+        public RobinActivity      AssociatedActivity;        // the two fields above must be null!
+
+
+        public OneShotReservation      Next;
+        public OneShotReservation      Previous;
+
+        public TimeSpan     InheritedEstimate;  // Stolen => Inherited, no longer critical
+        public int          ResolutionEpoch;    // Stolen => Resolution, since not stealing.
+
+        public int          ReferenceCount;
+
+        public OneShotReservation()
+        {
+        }
+
+        public void Clear()
+        {
+            //ActiveThread = null;
+            //ActiveThreadEpoch = 0;
+            constraintExecution = new TimeSpan(0); //Move to enclosing class
+            initialThreadExecution = new TimeSpan(0); //Move to enclosing class
+            Deadline = new DateTime(0);
+            RelativeDeadline = new TimeSpan(0);
+            Estimate = new TimeSpan(0);
+            FreeListNext = null;
+            Guaranteed = false;
+            InitialEstimate = new TimeSpan(0);
+            Next = null;
+            OriginalThread = null;
+            AssociatedActivity = null;
+            Previous = null;
+            MyQueueType = QueueType.NoQueue;
+            ReferenceCount = 0;
+            ReservTask = null;
+            Satisfied = false;
+            Start = new DateTime(0);
+            SurroundingReservation = null;
+            ResolutionEpoch = 0;
+            InheritedEstimate = new TimeSpan(0);
+            Valid = false;
+            if (enclosingTask != null) {
+                enclosingTask.ClearSchedulerTask();
+                enclosingTask = null;
+            }
+
+        }
+
+        // find the runnable thread of a reservation:
+        public RobinThread GetRunnableThread()
+        {
+//            RobinThread thread;
+//
+            if (AssociatedActivity != null) {
+                // if an activity reservation
+                return AssociatedActivity.GetRunnableThread();
+            }
+
+            Debug.Assert(OriginalThread != null);
+
+//            if (  (ActiveThread == OriginalThread) &&
+//                (ActiveThread.EnclosingThread.ThreadState == System.Threading.ThreadState.Running))
+//                return ActiveThread;
+//
+//            thread = OriginalThread; // search for active thread starting w/ original thread
+//
+//            if ((ActiveThread != null) &&
+//                (ActiveThread.Epoch == ActiveThreadEpoch) ) {
+//                if (ActiveThread.EnclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+//#if DEBUG_MUTEX
+//                  DebugStub.WriteLine("Mutex inheritance (Epoch ok): Orig {0} Active {1} GO ON",
+//                      thread.Id, ActiveThread.Id);
+//#endif
+//                    return ActiveThread;
+//                }
+//            }
+            //CKillian -- can't do this because of the array of blockedOn.
+            //    else if (ActiveThread.EnclosingThread.IsSleeping()) {
+            //        // more efficient: search for active thread starting w/ current active thread
+            //        thread = ActiveThread;
+            //    }
+            //    else {
+            //        Debug.Assert(false);
+            //    }
+            //}
+
+            //A "smarter" thing to do would be to have GetRunnableBeneficiary check for
+            //      the ActiveProcessor case.  But as it stands that's info in the scheduler only
+            //      the "good" news is that if we return null based on the active processor case
+            //      we at least know someone is current running on a processor who would inherit
+            //      time from us.
+            Thread temp = /*Active*/OriginalThread.EnclosingThread.GetRunnableBeneficiary();
+            if (temp == null || ((RobinThread)temp.SchedulerThread).ActiveProcessor != null) {
+                return null;
+            }
+            else {
+                return (RobinThread)temp.SchedulerThread;
+            }
+
+        }
+
+        public void StopThreadExecution(RobinThread thread)
+        {
+            Debug.Assert(thread.ExecutionTime >= initialThreadExecution);
+            constraintExecution += thread.ExecutionTime - initialThreadExecution;
+            //Between two reservations which are atomically stopped/started, some
+            //      time is charged against the default parent resource container.  This
+            //      is because I changed the way we account for tasks to do the general
+            //      rule we wanted.  In particular, I update the scheduling status just
+            //      before resolving a new reservation.  Not sure what the right fix is,
+            //      so I'm leaving it.  The assertion below will reveal the "error."  The
+            //      old code to track CPU usage is still active under constraintExecution,
+            //      but isn't presently exposed to the applications.  Currently UpdateSchedulingStatus()
+            //      updates the CPU resources used for the whole task stack.
+            //Debug.Assert(CpuResource.Provider().TimeToCpu(constraintExecution).Cycles == ((CpuResourceAmount)enclosingTask.resourcesUsed[CpuResource.Provider().ResourceString]).Cycles);
+            //EnclosingTask.AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(constraintExecution));
+        }
+
+        public void StartThreadExecution(RobinThread thread)
+        {
+            initialThreadExecution = thread.ExecutionTime;
+        }
+
+        public void StartThreadExecution(RobinThread thread, TimeSpan delta)
+        {
+            initialThreadExecution = thread.ExecutionTime + delta;
+        }
+
+        public static void BeginConstraintBeforeWait(RobinThread thread,
+                                                            bool endPrevious,
+                                                            TimeConstraint timeConstraint,
+                                                            DateTime timeNow)
+        {
+            OneShotReservation reservation;
+
+            Debug.Assert(thread == RobinScheduler.GetCurrentThread());
+            Debug.Assert(!Processor.InterruptsDisabled());
+            if (endPrevious) {
+                bool iflag = Processor.DisableInterrupts();
+                EndPreviousConstraint(thread, timeNow);
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            RobinScheduler.UpdateSchedulingStatus();
+
+            reservation = thread.PendingReservation;
+
+            reservation.StartThreadExecution(thread, (timeNow - RobinScheduler.SchedulingTime));
+            reservation.constraintExecution = new TimeSpan(0);
+            reservation.Start = timeConstraint.Start;
+            reservation.Deadline = timeConstraint.Deadline;
+            reservation.RelativeDeadline = timeConstraint.RelativeDeadline;
+            reservation.Estimate = timeConstraint.Estimate;
+            reservation.Valid = reservation.Guaranteed = true;
+            reservation.MyQueueType = QueueType.NoQueue;
+            reservation.ReservTask = thread;
+            reservation.OriginalThread = /*reservation.ActiveThread =*/ thread;
+            thread.AddRef();
+            //thread.AddRef();
+            //reservation.ActiveThreadEpoch = thread.Epoch;
+            reservation.AssociatedActivity = null;
+            reservation.Next = reservation.Previous = null;
+
+        }
+
+
+        // DI -- this is a new function used in both Begin and EndConstraint
+        public static bool EndPreviousConstraint(RobinThread thread, DateTime timeNow)
+        {
+            OneShotReservation reservation;
+            OneShotReservation reservationNext;
+            bool            success;
+            QueueType       tempQueue; //Value assigned but never used.
+
+            Debug.Assert(Processor.InterruptsDisabled());
+
+            reservation = thread.ReservationStack;
+
+            success = (timeNow <= reservation.Deadline);
+            RobinScheduler.UpdateSchedulingStatus();
+            reservation.StopThreadExecution(thread);
+
+            Debug.Assert(reservation.ConstraintExecution.Ticks >= 0);
+//            if (timeTaken.Ticks != 0) {
+//                timeTaken = reservation.ConstraintExecution;
+//                Debug.Assert( timeTaken.Ticks >= 0);
+//            }
+
+            thread.ReservationStack = reservation.SurroundingReservation;
+            reservation.SurroundingReservation = null;
+
+            if (currentReservation == reservation) {
+                // note that it might be the case that
+                // a reservation for the task id exist on the guaranteed Q but the
+                // the actual (executed) constraint is in the UnfinishedQ
+                currentReservation = null; // ????????????
+                RobinScheduler.Reschedule();
+            }
+            Debug.Assert(reservation.OriginalThread == thread);
+            Debug.Assert(reservation.Start <= timeNow);
+
+            if (thread.ReservationStack == null) {
+                if (reservation.Estimate >= RobinScheduler.MinSlice) {
+                    // the constraint used less than estimated:
+                    Debug.Assert(reservation.MyQueueType == QueueType.GuaranteedQueue);
+#if false
+                    Debug.Assert((reservation.ActiveThread == null) ||
+                                 (reservation.ActiveThread.Epoch != reservation.ActiveThreadEpoch) ||
+                                 (reservation.ActiveThread == reservation.OriginalThread));
+                    reservation.ActiveThread.ReleaseProtected();
+#endif
+                    reservation.OriginalThread.ReleaseProtected();
+                    reservation.AssociatedActivity = reservation.OriginalThread.AssociatedActivity; // and make it an activity reserv
+                    reservation.OriginalThread = null;
+                    //reservation.ActiveThread = null;
+                    reservation.ReservTask = null;
+                    RobinScheduler.ActivityObjAddRef(reservation.AssociatedActivity);
+                    // leave it on whatever Q it happens to be on
+                }
+                else {
+                    reservation.DequeueReservation(); // from whatever Q it happens to be on
+                }
+            }
+            else {
+                tempQueue = reservation.MyQueueType;
+                reservationNext = thread.ReservationStack;
+                reservationNext.Estimate += reservation.Estimate;
+                reservationNext.constraintExecution += reservation.constraintExecution;
+                reservationNext.StartThreadExecution(thread);
+//                Debug.Assert( ((reservation.MyQueueType == QueueType.GuaranteedQueue) &&
+//                    (reservationNext.MyQueueType == QueueType.NoQueue)) ||
+//                    ((reservation.MyQueueType == QueueType.UnfinishedQueue) &&
+//                    ((reservationNext.Estimate.Ticks <= 0) || (reservationNext.MyQueueType != QueueType.UnfinishedQueue ))));
+                reservation.Estimate = new TimeSpan(0);
+                Debug.Assert(reservation.Next != null);
+                reservation.DequeueReservation();
+                ReplaceOnEarliestDeadlineFirst(reservationNext, timeNow);
+
+            }
+            // fprintf(stdout,"EndPrevConstr 0x%x %d\n", reservation, reservation.ReferenceCount);
+            reservation.ReleaseReservationProtected();
+
+            Scheduler.LogEndConstraint();
+
+            if (success == false) {
+                Scheduler.LogSchedulerLate();
+            }
+            return success;
+        }
+
+        public static bool ResolveConstraint(RobinThread thread)
+        {
+            TimeSpan timeLeft, ownNodesTimeToSteal = new TimeSpan(1);
+            DateTime start, deadline;
+            TimeSpan timeInherited;
+            OneShotReservation pendingReservation = thread.PendingReservation;
+            OneShotReservation reservationPrevious;
+            DateTime timeNow = SystemClock.GetKernelTime();
+            bool ok = false;
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(pendingReservation != null);
+
+            Scheduler.LogResolveConstraint();
+
+            thread.PendingReservation = null;   // just clean the place
+
+            Debug.Assert(pendingReservation.Start.Ticks >= 0);
+            start = pendingReservation.Start;
+            if (start < timeNow) {
+                start = timeNow;
+            }
+            Debug.Assert(pendingReservation.Deadline.Ticks >= 0);
+            deadline = pendingReservation.Deadline;
+            if (deadline.Ticks == 0) {
+                deadline = timeNow + pendingReservation.RelativeDeadline;
+            }
+
+            if (thread.ReservationStack != null) {
+                OneShotReservation reservation = thread.ReservationStack;
+                while (!reservation.Valid && ((reservation = reservation.SurroundingReservation)!= null)) {
+                    // nothing.
+                }
+                if (reservation!= null) {
+                    deadline = RobinScheduler.minTime(deadline, reservation.Deadline);
+                }
+            }
+
+            // update data ure
+            pendingReservation.Start = start;
+            pendingReservation.Deadline = deadline;
+            //TODO: Should be for SIM ONLY!
+            Scheduler.LogReservationId(pendingReservation);           // SIM only
+            timeInherited = new TimeSpan(0);
+            timeLeft = new TimeSpan(0);
+            ok = true;
+            pendingReservation.InitialEstimate = pendingReservation.Estimate;
+            reservationPrevious = thread.ReservationStack;
+            pendingReservation.SurroundingReservation= thread.ReservationStack;
+            thread.ReservationStack = pendingReservation;
+            RobinScheduler.AddRefReservation(pendingReservation);
+            if (reservationPrevious != null) {
+                reservationPrevious.constraintExecution
+                    += pendingReservation.initialThreadExecution
+                    - reservationPrevious.initialThreadExecution;
+            }
+            //
+            // Reschedule()  called if currently we are executing on a pendingReservation
+            //                              and the EarliestDeadlineFirst top changed
+            //              or   the current pendingReservation goes into the idle list
+            //                  solve in SetStateWaiting
+            //
+            pendingReservation.EnqueueReservation(timeNow);
+
+            return ok;
+        }
+
+        void EnqueueReservation(DateTime timeNow)
+        {
+            OneShotReservation temp;
+
+            Debug.Assert((AssociatedActivity != null) ||
+                (OriginalThread != null));
+
+            // Infeasible or (Estimate == 0) Reservations:
+            if (Estimate <= RobinScheduler.AFewSlice) {
+                RobinActivity activity;
+                Debug.Assert(OriginalThread != null);
+                Debug.Assert(AssociatedActivity == null);
+                activity = OriginalThread.AssociatedActivity;
+                MyQueueType = QueueType.UnfinishedQueue;
+                if (activity.UnfinishedConstraints == null) {
+                    Next = Previous = this;
+                    activity.UnfinishedConstraints = this;
+                }
+                else {
+                    // no order enforced
+                    Next = activity.UnfinishedConstraints;
+                    Previous = activity.UnfinishedConstraints.Previous;
+                    activity.UnfinishedConstraints.Previous.Next = this;
+                    activity.UnfinishedConstraints.Previous = this;
+                    activity.UnfinishedConstraints = this; // optional
+                }
+                //  DebugStub.WriteLine("Add: EnqueueReserve  1 0x{0:x} {1}", this, ReferenceCount);
+                RobinScheduler.AddRefReservation(this);
+                return;
+            }
+            //  Debug.Assert(Valid);
+
+            // Idle Reservations:
+            if (Start > timeNow + RobinScheduler.AFewSlice) {
+                // take thread off activity RoundRobin queue and simulate a sleep
+                //    i.e. don't set a timer interrupt
+
+                OriginalThread.InternalSetStateWaiting(DateTime.MaxValue);
+
+#if DEBUG_START_RESERV
+                DebugStub.WriteLine("Put reservation {0}:{1} in IdleQueue\n", OriginalThread,
+                    ReservationId);
+#endif
+                Debug.Assert(OriginalThread != null);
+                MyQueueType = QueueType.IdleQueue;
+
+                if (idleReservations == null) {
+                    Next = Previous = this;
+                    idleReservations = this;
+                }
+                else {
+                    temp = idleReservations;
+                    if (Start < temp.Start) {
+                        idleReservations = this;
+                    }
+                    else {
+                        do {
+                            temp = temp.Next;
+                        } while (temp != idleReservations &&
+                                 Start >= temp.Start); // >= is compulsory to keep it 'FIFO'
+                    } // insert before 'temp'
+                    Next = temp;
+                    Previous = temp.Previous;
+                    temp.Previous.Next = this;
+                    temp.Previous = this;
+                }
+                //  fprintf(stdout,"Add: EnqueueReserve  2 0x%x %d\n", this, ReferenceCount);
+                RobinScheduler.AddRefReservation(this);
+                return;
+            }
+
+            // Guaranteed OneShotReservation:
+            MyQueueType = QueueType.GuaranteedQueue;
+            if (GuaranteedReservations == null) {
+                Next = Previous = this;
+                guaranteedReservations = this;
+            }
+            else {
+                temp = GuaranteedReservations;
+                if (Deadline < GuaranteedReservations.Deadline) {
+                    guaranteedReservations = this;
+                }
+                else {
+                    do {
+                        temp = temp.Next;
+                    } while (temp != guaranteedReservations &&
+                             Deadline > temp.Deadline); // > is compulsory to keep it 'FIFO'
+                } // insert before 'temp'
+                Next = temp;
+                Previous = temp.Previous;
+                temp.Previous.Next = this;
+                temp.Previous = this;
+            }
+            RobinScheduler.AddRefReservation(this);
+#if DEBUG_RESERV
+            PrintQueueReserv(guaranteedReservations, timeNow); //TODO: PrintQueueReserv
+#endif
+            return;
+        }
+
+
+        static void ReplaceOnEarliestDeadlineFirst(OneShotReservation reservation,
+                                                   DateTime timeNow)
+        {
+            while (reservation != null) {
+                if (reservation.Estimate.Ticks > 0) {
+                    if (reservation.MyQueueType == QueueType.NoQueue) {
+                        reservation.EnqueueReservation(timeNow);
+                    }
+                    else {
+                        Debug.Assert(reservation.MyQueueType == QueueType.GuaranteedQueue);
+                    }
+                    break;
+                }
+                if (reservation.MyQueueType == QueueType.NoQueue) {
+                    reservation.EnqueueReservation(timeNow);
+                }
+                else {
+                    Debug.Assert(reservation.MyQueueType == QueueType.UnfinishedQueue);
+                }
+                reservation = reservation.SurroundingReservation;
+            }
+        }
+
+        public static bool SatisfyAcceptedConstraint(DateTime timeNow)
+        {
+            OneShotReservation reservation;
+
+            if (currentReservation != null) {
+                currentReservation.Estimate -= timeNow - RobinScheduler.SchedulingTime;
+                if (currentReservation.Estimate.Ticks <= 0) {
+                    RobinThread tempThread  = currentReservation.OriginalThread;
+                    currentReservation.DequeueReservation();
+                    if (tempThread != null) {
+                        // activity reservations vanish here
+                        //Debug.Assert(currentReservation.ActiveThread == RobinScheduler.GetCurrentThread()); // only thread reserv are added to
+                        currentReservation.EnqueueReservation(RobinScheduler.SchedulingTime); // the UnfinishedConstraints list of the OriginalThread's Activ
+                        OneShotReservation.ReplaceOnEarliestDeadlineFirst(currentReservation.SurroundingReservation, RobinScheduler.SchedulingTime);
+                    }
+                }
+            }
+
+            reservation = guaranteedReservations;
+            while (reservation != null) {
+                reservation = reservation.Next;
+                if (reservation == guaranteedReservations) {
+                    break;
+                }
+            }
+            reservation = idleReservations;
+            while (reservation != null) {
+                reservation = reservation.Next;
+                if (reservation == idleReservations) {
+                    break;
+                }
+            }
+
+            return true;
+        }
+
+        public static void UpdateCurrentReservation()
+        {
+            if ((currentReservation != null) &&
+                (currentReservation.Estimate <= RobinScheduler.AFewSlice) ) {
+                // slice used for a reservation (CK: & estimate now empty )
+                RobinThread tempThread  = currentReservation.OriginalThread;
+                currentReservation.DequeueReservation();
+                if (tempThread != null) {
+                    // activity reservations vanish here
+                    currentReservation.EnqueueReservation(RobinScheduler.SchedulingTime); // the UnfinishedConstraints list of the OriginalThread's Activ
+                    ReplaceOnEarliestDeadlineFirst(currentReservation.SurroundingReservation, RobinScheduler.SchedulingTime);
+                }
+            }
+
+        }
+
+        public static void FreshenReservationQueues()
+        {
+            OneShotReservation tempReservation;
+
+            //  Move 'idle' reservations to the 'active' reservations list, if necessary.
+            //  A reservation is 'idle' until its Start time is reached.
+            //  The 'active' reservation list is ordered 'Earliest Deadline Firts'.
+            //  The 'idle' queue is ordered Earliest Start First.
+            while ((tempReservation = IdleReservations) != null) {
+                if (RobinScheduler.SchedulingTime + RobinScheduler.AFewSlice < tempReservation.Start) {
+                    break;
+                }
+                tempReservation.DequeueReservation(); // Remove OneShotReservation from the Idle Queue
+                tempReservation.EnqueueReservation(RobinScheduler.SchedulingTime); // Earliest Deadline First in the (Non)Guaranteed Queue
+                RobinScheduler.EnqueueRunThread(tempReservation.OriginalThread, true);
+#if DEBUG_START_RESERV
+                DebugStub.WriteLine("Get reservation {0}:{1} from IdleQueue", tempReservation.OriginalThread,
+                    tempReservation.ReservationId);
+#endif
+
+            }
+
+            // Remove the active reservations from the guaranteed and nonguaranteed queues
+            // if their Deadline is <= CurrentTime.
+            while ((tempReservation = guaranteedReservations) != null) {
+                if (RobinScheduler.SchedulingTime + RobinScheduler.AFewSlice < tempReservation.Deadline) {
+                    break;
+                }
+
+                //      fprintf(stdout,"Add: Reschedule Guaranteed Deadline 0x%x %d\n", tempReservation, tempReservation.ReferenceCount);
+                RobinScheduler.AddRefReservation(tempReservation);
+                tempReservation.DequeueReservation(); // Remove OneShotReservation from the Guaranteed Queue
+                if ((tempReservation.OriginalThread != null) && // if a thread reservation
+                    (tempReservation.OriginalThread.AssociatedActivity != null)) {
+                    // If a thread reservation.
+                    tempReservation.Estimate = new TimeSpan(0);
+                    tempReservation.EnqueueReservation(RobinScheduler.SchedulingTime); // add it to the Pending End Constraint List
+                }
+                //  fprintf(stdout,"Reschedule Guaranteed Deadline off 0x%x %d\n", tempReservation, tempReservation.ReferenceCount);
+                tempReservation.ReleaseReservationProtected();
+            }
+
+        }
+
+        int ReleaseReservationProtected()
+        {
+            return RobinScheduler.ReleaseReservationProtected(this);
+        }
+
+        public void DequeueReservation() //TODO: Should this be a resource container function?
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            OneShotReservation next;
+
+            Debug.Assert((AssociatedActivity != null) ||
+                (OriginalThread != null));
+
+            if (Next != this) {
+                //If there's another reservation, remove us from the queue
+                Next.Previous = Previous;
+                Previous.Next = Next;
+                next = Next;
+                Debug.Assert(next.Deadline.Ticks > 0);
+            }
+            else {
+                //Otherwise we are only reservation.
+                Debug.Assert(Previous == this);
+                next = null;
+            }
+
+            if (this == GuaranteedReservations) {
+                //Take care when we're the head of the list.
+                guaranteedReservations = next;
+#if DEBUG_RESERV
+                DebugStub.WriteLine("Dequeue {0}: {1}", ReservationId, Estimate);
+                //      Debug.Assert(Criticality != CRITICAL || !Valid || Estimate ==0);
+                PrintQueueReserv(GuaranteedReservations, SystemClock.GetKernelTime());
+#endif
+            }
+            else if (this == IdleReservations) {
+                //Or maybe we're the head of this list (but definitely not both).
+                idleReservations = next;
+            }
+            else if ((OriginalThread != null) &&
+                (this == OriginalThread.AssociatedActivity.UnfinishedConstraints) ) {
+                //Or else we might be the head of the unfinished constraints list for the activity associated with our original thread.
+                OriginalThread.AssociatedActivity.UnfinishedConstraints = next;
+            } // else { we're OK! }
+
+            Next = Previous = null;
+            //  DebugStub.WriteLine("DequeueReservation 0x{0:x} {1}", this, ReferenceCount);
+            MyQueueType = QueueType.NoQueue;
+            ReleaseReservationProtected();
+        }
+
+        public static void FindRunnableReservation(ref RobinThread currentThread)
+        {
+            currentReservation = guaranteedReservations;
+            while (currentReservation != null) {
+                if ((currentThread = currentReservation.GetRunnableThread()) != null) {
+                    break;
+                }
+                currentReservation = currentReservation.Next;
+                if (currentReservation == guaranteedReservations) {
+                    break;
+                }
+            }
+        }
+
+        static void InheritAndReplaceOnEarliestDeadlineFirst(OneShotReservation reservation,
+                                                             TimeSpan timeInherited,
+                                                             DateTime timeNow)
+        {
+            OneShotReservation current = null;
+
+            while (reservation != null) {
+                if (reservation.Estimate.Ticks > 0) {
+                    if (current == null) {
+                        Debug.Assert(reservation.MyQueueType != QueueType.NoQueue);
+                        current = reservation;
+                    }
+                    else {
+                        Debug.Assert(reservation.MyQueueType == QueueType.NoQueue);
+                    }
+                }
+                else if (reservation.MyQueueType != QueueType.NoQueue) {
+                    Debug.Assert (current != null || reservation.MyQueueType == QueueType.UnfinishedQueue);
+                    reservation.DequeueReservation();
+                }
+                Debug.Assert(timeInherited >= reservation.InheritedEstimate);
+                timeInherited -= reservation.InheritedEstimate;
+                Debug.Assert(reservation.Estimate >= reservation.InheritedEstimate);
+                reservation.Estimate -= reservation.InheritedEstimate;
+                reservation = reservation.SurroundingReservation;
+            }
+            if (current != null) {
+                if (current == CurrentReservation) {
+                    current.Estimate -= timeNow - RobinScheduler.SchedulingTime;
+                    currentReservation = null;
+                    RobinScheduler.Reschedule();
+                }
+                current.DequeueReservation();
+            }
+        }
+
+        public static void InheritOnEarliestDeadlineFirst(OneShotReservation reservation,
+                                                          TimeSpan timeToInherit)
+        {
+            while (reservation != null && timeToInherit.Ticks > 0) {
+                Debug.Assert(timeToInherit >= reservation.InheritedEstimate);
+                reservation.Estimate -= reservation.InheritedEstimate;
+                timeToInherit -= reservation.InheritedEstimate;
+                reservation = reservation.SurroundingReservation;
+            }
+        }
+
+        public static void ClearCurrentReservation()
+        {
+            currentReservation = null;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Robin/RecurringReservation.cs b/base/Kernel/Singularity/Scheduling/Robin/RecurringReservation.cs
new file mode 100644
index 0000000..1e05a06
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Robin/RecurringReservation.cs
@@ -0,0 +1,51 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RecurringReservation.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Robin
+{
+    /// <summary>
+    /// Summary description for RecurringReservation.
+    /// </summary>
+    public class RecurringReservation : ISchedulerCpuReservation
+    {
+        CpuResourceReservation enclosingCpuReservation;
+
+        public RecurringReservation()
+        {
+        }
+
+#region ISchedulerCpuReservation Members
+
+        public override CpuResourceReservation EnclosingCpuReservation
+        {
+            get { return enclosingCpuReservation; }
+            set { enclosingCpuReservation = value; }
+        }
+
+#endregion
+
+        public TimeSpan Slice;
+        public TimeSpan Period;
+
+        public override CpuResourceAmount ReservedAmount
+        {
+            get { return CpuResource.Provider().TimeToCpu(Slice); }
+        }
+
+        public override TimeSpan ReservedPeriod
+        {
+            get { return Period; }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Robin/RobinActivity.cs b/base/Kernel/Singularity/Scheduling/Robin/RobinActivity.cs
new file mode 100644
index 0000000..234b017
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Robin/RobinActivity.cs
@@ -0,0 +1,124 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RobinActivity.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Robin
+{
+    /// <summary>
+    /// The resource container class includes a recurring reservation
+    /// (k out of every n), a list of runnable threads, unfinished constraints
+    /// (i.e. non-guaranteed or non-feasible), as well as pointers to handle
+    /// its role in lists for the non-blocked activity list.
+    //  It also has references for the last node to execute it,
+    /// a node assigned to it (which is a list via SameActivityNext), and a node
+    /// assigned to it under the new scheduling plan.  It also has some bookkeeping.
+    /// </summary>
+    public class RobinActivity : ISchedulerActivity
+    {
+        private Activity enclosingActivity;
+
+        public RecurringReservation MyRecurringCpuReservation;
+        public RobinThread          RunnableThreads;// list of runnable threads, if any
+        public OneShotReservation   UnfinishedConstraints;
+        public RobinActivity        Next;     // Next and previous activities
+        public RobinActivity        Previous;
+        public int ReferenceCount;
+        public int CountNodes;
+
+        public RobinActivity()
+        {
+            //Below is InitializeActivity();
+            ReferenceCount = 1;
+            RunnableThreads = null;
+
+//            MyRecurringCpuReservation = new RecurringReservation();
+//            MyRecurringCpuReservation.EnclosingCpuReservation = new CpuResourceReservation(MyRecurringCpuReservation);
+
+            bool iflag = Processor.DisableInterrupts();
+            RobinScheduler.EnqueueActivity(this); // add in last position in RoundRobin!
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        public void ReleaseActivity()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            RobinScheduler.DequeueActivity(this); // update RoundRobin queue, if required.
+            Processor.RestoreInterrupts(iflag);
+            Scheduler.LogDeleteActivity();
+        }
+
+        //public-normal API
+        //TODO: Call this from finalize?
+        public override void ReleaseReference()
+        {
+            // DI replaced by AtomicDec(&activity->ReferenceCount);
+            Debug.Assert(ReferenceCount > 0);
+            int newrefcnt = Interlocked.Decrement(ref ReferenceCount);
+            if (newrefcnt == CountNodes) {
+                if (CountNodes > 0) {
+                    return;
+                }
+                bool iflag = Processor.DisableInterrupts();
+                RobinScheduler.DequeueActivity(this); // update RoundRobin queue, if required.
+                Processor.RestoreInterrupts(iflag);
+            }
+            Scheduler.LogDeleteActivity();
+        }
+
+        // find the runnable thread of an activity:
+        public RobinThread GetRunnableThread()
+        {
+            OneShotReservation reservation = UnfinishedConstraints;
+            Debug.Assert(reservation == null || reservation.AssociatedActivity == null);       // avoid stack overflow : GetRunnableThread & GetRunnableThread
+            while (reservation != null) {
+                // search in the circular list
+                RobinThread thread = reservation.GetRunnableThread();
+                if (thread != null) {
+                    return thread;
+                }
+                reservation = reservation.Next;
+                if (reservation == UnfinishedConstraints) {
+                    break;
+                }
+            }
+            RobinThread runThread = RunnableThreads;
+            while (runThread != null && runThread.ActiveProcessor != null && runThread != RunnableThreads.Previous) {
+                runThread = runThread.Next;
+            }
+            if (runThread == null || runThread.ActiveProcessor != null) {
+                return null;
+            }
+            else {
+                return runThread;
+            }
+        }
+
+#region ISchedulerActivity Members
+
+        public override Activity EnclosingActivity
+        {
+            get { return enclosingActivity; }
+            set { enclosingActivity = value; }
+        }
+
+        public CpuResourceReservation CpuResourceReservation
+        {
+            get { return MyRecurringCpuReservation.EnclosingCpuReservation; }
+        }
+
+#endregion
+    }
+
+}
diff --git a/base/Kernel/Singularity/Scheduling/Robin/RobinProcessor.cs b/base/Kernel/Singularity/Scheduling/Robin/RobinProcessor.cs
new file mode 100644
index 0000000..29a1686
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Robin/RobinProcessor.cs
@@ -0,0 +1,46 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RobinProcessor.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Robin
+{
+    /// <summary>
+    /// </summary>
+    public class RobinProcessor : ISchedulerProcessor
+    {
+        private readonly Processor enclosingProcessor;
+        public override Processor EnclosingProcessor
+        {
+            get { return enclosingProcessor; }
+        }
+
+        internal RobinActivity CurrentActivity;
+        internal TimeSpan SliceLeft;
+        internal RobinThread RunningThread;
+        internal DateTime SchedulingTime;
+        internal bool NeedToReschedule;
+        internal bool Idle;
+
+        public void Reschedule()
+        {
+            NeedToReschedule = true;
+        }
+
+        public RobinProcessor(Processor processor)
+        {
+            enclosingProcessor = processor;
+            SchedulingTime = SchedulerClock.BootTime;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Robin/RobinScheduler.cs b/base/Kernel/Singularity/Scheduling/Robin/RobinScheduler.cs
new file mode 100644
index 0000000..d2bc813
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Robin/RobinScheduler.cs
@@ -0,0 +1,836 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RobinScheduler.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling
+{
+#if !SIMULATOR
+    public class SystemScheduler
+    {
+        static public void RegisterScheduler()
+        {
+            Robin.RobinScheduler.RegisterScheduler();
+        }
+    }
+#endif
+}
+
+namespace Microsoft.Singularity.Scheduling.Robin
+{
+    /// <summary>
+    /// Summary description for RobinScheduler.
+    /// </summary>
+    public class RobinScheduler : ICpuScheduler
+    {
+        public static readonly TimeSpan ContextSwitch = new TimeSpan(200);
+        // minimum time slice to be worth scheduling the CPU: 1 millisec
+        public static readonly TimeSpan MinSlice = new TimeSpan(10 * ContextSwitch.Ticks);
+        public static readonly TimeSpan AFewSlice = new TimeSpan(3 * MinSlice.Ticks);
+        public static readonly TimeSpan RobinSlice = new TimeSpan(10 * TimeSpan.TicksPerMillisecond);
+
+
+        static public void RegisterScheduler()
+        {
+            CpuResource.RegisterSystemScheduler(new RobinScheduler());
+        }
+
+        public override ISchedulerProcessor CreateSchedulerProcessor(Processor processor)
+        {
+            return new RobinProcessor(processor);
+        }
+
+        public override ISchedulerThread CreateSchedulerThread(Thread thread)
+        {
+            return new RobinThread(thread);
+        }
+
+        public override ISchedulerActivity CreateSchedulerActivity()
+        {
+            return new RobinActivity();
+        }
+
+        public override ISchedulerCpuReservation ReserveCpu(ISchedulerActivity activity,
+                                                                    CpuResourceAmount amount,
+                                                                    TimeSpan period)
+        {
+            return null;
+        }
+
+        public bool ReserveRecurringCpu(Activity activity,
+                                        ref TimeSpan amount,
+                                        ref TimeSpan period)
+        {
+            return true;
+        }
+
+        public override bool ShouldReschedule()
+        {
+            RobinThread currentThread = GetCurrentThread();
+            if (Scheduler.TimerInterruptedFlag && currentThread != null) {
+                //SchedulerClock.CheckInterrupt();
+            }
+
+            if (currentThread == null ||
+                Scheduler.YieldFlag ||
+                currentThread.EnclosingThread.IsWaiting() ||
+                currentThread.EnclosingThread.IsStopped()) {
+
+                Reschedule();
+            }
+            return NeedToReschedule || Scheduler.TimerInterruptedFlag;
+            // || timer should have fired but didn't?
+        }
+
+        // DI -- this is somehow similar to EnableInterrupts
+        public override bool NextThread(out Thread nextThread)
+        {
+            Debug.Assert(!Processor.InterruptsDisabled());
+            bool iflag = Processor.DisableInterrupts();
+            bool halted = false;
+            RobinThread currentThread = GetCurrentThread();
+
+            SchedulerClock.CheckInterrupt();
+            if (ShouldReschedule()) {
+                //Debug.Print("Calling RescheduleInterrupt()\n");
+                halted = RescheduleInterrupt(); //TODO: RescheduleInterrupt returns true if the processor needs to be halted.
+                currentThread = GetCurrentThread();
+            }
+            else {
+                //Debug.Print("No call to RescheduleInterrupt()\n");
+            }
+            if (currentThread != null) {
+                nextThread = currentThread.EnclosingThread;
+            }
+            else {
+                Debug.Assert(halted);
+                nextThread = null;
+            }
+
+            ((RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor).NeedToReschedule = false;
+            // printf("-------------------------currentThread-Id %d\n", currentThread.Id);
+            //return currentThread;
+            Processor.RestoreInterrupts(iflag);
+            return halted;
+        }
+        //public static void Yield();
+
+#region Constants
+
+        // Maximum Scheduling Period is 1 sec (i.e. in 100s of nanoseconds).
+        static readonly TimeSpan AmountCpu = CpuResource.MaxPeriod;
+        //TODO: TICKS vs. TIME_SPAN vs DATE_TIME
+
+#endregion
+
+#region Static data members
+
+        static RobinActivity      CircularActivityList = null;
+        /// <summary>
+        /// This must ALWAYS (when lock not held) point to a current resource
+        /// container in the queue.
+        /// </summary>
+        static internal RobinActivity NextActivity;
+
+
+        //moved to be processor specific
+        //static RobinActivity        RobinActivityNext = null;
+        //static RobinActivity        RobinActivityCurrent = null;  // activity currently executing from
+
+        static OneShotReservation ReservationFreePool;
+        static TimeSpan     IdleTime = new TimeSpan(0);
+        static bool         Idle
+        {
+            get { return GetCurrentProcessor().Idle; }
+        }
+
+        //moved to be processor specific
+        //static RobinThread       CurrentThreadGlobal = null;
+        //static TimeSpan       RobinSliceLeft = RobinScheduler.RobinSlice; //new TimeSpan(0);  // the round robin list, if any, and its CPU slice
+        //public static DateTime        SchedulingTime = new DateTime(0);
+        //static bool           NeedToReschedule = false;
+
+        public static TimeSpan      LA_Time = RobinScheduler.MinSlice;
+
+        public static DateTime SchedulingTime
+        {
+            get {
+                return ((RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor).SchedulingTime;
+            }
+        }
+
+        public static bool NeedToReschedule
+        {
+            get {
+                return ((RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor).NeedToReschedule;
+            }
+        }
+
+#endregion
+
+        public RobinScheduler()
+        {
+        }
+
+        public override void Initialize()
+        {
+            RobinScheduler.InitializeScheduler();
+        }
+
+        public static void InitializeScheduler()
+        { //TODO: Should all the null's be added in here?
+            for (int i=0; i<Processor.processorTable.Length; i++) {
+                ((RobinProcessor)Processor.processorTable[i].SchedulerProcessor).SchedulingTime = SystemClock.GetKernelTime();
+            }
+//
+//            TimeSpan currentSliceLeft = RobinSliceLeft;
+            bool iflag = Processor.DisableInterrupts();
+            SchedulerClock.SetNextInterrupt(SchedulingTime+RobinScheduler.RobinSlice);
+            Processor.RestoreInterrupts(iflag);
+        }
+
+#region ISystemScheduler Members
+
+        public override void BeginDelayedConstraint(Hashtable resourceEstimates, TimeSpan relativeDeadline, ISchedulerTask taskToEnd, out ISchedulerTask schedulerTask)
+        {
+            TimeConstraint timeConstraint = new TimeConstraint();
+            timeConstraint.Estimate = CpuResource.Provider().CpuToTime((CpuResourceAmount)resourceEstimates[CpuResource.Provider().ResourceString]);
+            timeConstraint.Start = new DateTime(0); //Start now.
+            timeConstraint.RelativeDeadline = relativeDeadline;
+            timeConstraint.Deadline = new DateTime(0); //A 0-deadline means relative instead.
+            schedulerTask = Thread.CurrentThread.SchedulerThread.PrepareDelayedTask(taskToEnd, ref timeConstraint, SystemClock.GetKernelTime());
+        }
+
+        public override bool BeginConstraint(Hashtable resourceEstimates, DateTime deadline, ISchedulerTask taskToEnd, out ISchedulerTask schedulerTask)
+        {
+            DateTime    timeNow = SystemClock.GetKernelTime();
+            RobinThread        thread = GetCurrentThread();
+            ulong    start, stop; // S97
+            Debug.Assert(!Processor.InterruptsDisabled());
+
+            thread.IpcCheckFreeConstraint();
+
+            start = Processor.CycleCount;
+
+            Debug.Assert(taskToEnd == null || taskToEnd == thread.ReservationStack);
+            bool end_previous = (taskToEnd != null);
+            TimeConstraint constraint = new TimeConstraint();
+            constraint.Deadline = deadline;
+            constraint.Estimate = CpuResource.Provider().CpuToTime((CpuResourceAmount)resourceEstimates[CpuResource.Provider().ResourceString]);
+            constraint.Start = timeNow;
+
+            bool ok = thread.BeginConstraintBeforeWaitValidate(end_previous, ref constraint, timeNow);
+            schedulerTask = thread.PendingReservation;
+            if (ok) {
+                OneShotReservation.BeginConstraintBeforeWait(thread, end_previous, constraint, timeNow);
+                bool iflag = Processor.DisableInterrupts();
+                ok = OneShotReservation.ResolveConstraint(thread);
+                Processor.RestoreInterrupts(iflag);
+            }
+            stop = Processor.CycleCount;
+
+            Scheduler.LogBeginConstraint(thread.EnclosingThread, ok, start, stop);
+
+            //TODO: Check if this is a necessity, or if it's only for sim time.  Call in wrapper if necessary.
+            //NextThread();
+            return ok;
+        }
+
+        public override bool EndConstraint(ISchedulerTask taskToEnd)
+        {
+            Debug.Assert(!Processor.InterruptsDisabled());
+            Debug.Assert(taskToEnd == GetCurrentThread().ReservationStack);
+            bool iflag = Processor.DisableInterrupts();
+            bool ok = OneShotReservation.EndPreviousConstraint(GetCurrentThread(), SystemClock.GetKernelTime());
+            //
+            // need to reschedule only if on a reserved slot and the top of EarliestDeadlineFirst doesn't
+            //  belong to this task
+            //
+            if ((OneShotReservation.CurrentReservation != null) &&
+                (OneShotReservation.GuaranteedReservations != null) &&
+                (OneShotReservation.GuaranteedReservations.ReservTask != (GetCurrentThread()))) {
+                Reschedule();
+            }
+
+            Processor.RestoreInterrupts(iflag);
+            Scheduler.LogEndConstraint();
+
+            //TODO: In the system wrapper for BeginConstraint -- it needs to call Yield/NextThread/MaybeYield
+            //NextThread();
+            return ok;
+        }
+
+        public static bool ReserveRecurringCpu(RobinActivity activity, ref TimeSpan amount, ref TimeSpan period)
+        {
+            return true;
+        }
+
+#endregion
+
+
+#region OneShotCpuReservation related functions
+        // OneShotCpuReservation related functions begin:
+
+        public static int ReleaseReservationProtected(OneShotReservation reservation)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(reservation.ReferenceCount > 0);
+
+            int newrefcnt = Interlocked.Decrement(ref reservation.ReferenceCount);
+
+            if (newrefcnt == 0) {
+                // Estimate may be positive when reservation reaches
+                // its Deadline w/o using its Estimate
+                Debug.Assert((reservation.Next == null) && (reservation.Previous == null));
+                if (reservation.OriginalThread != null) {
+                    reservation.OriginalThread.ReleaseProtected();
+                    //Debug.Assert(reservation.ActiveThread != null);
+                    //reservation.ActiveThread.ReleaseProtected();
+                }
+                else {
+                    Debug.Assert(reservation.AssociatedActivity != null);
+                    ActivityReleaseProtected(reservation.AssociatedActivity);
+                }
+                Debug.Assert(reservation.Next == null);
+                CacheFreeReservation(reservation);
+            }
+            return newrefcnt;
+        }
+
+
+        public static OneShotReservation AllocateReservation()
+        {
+            OneShotReservation reservation;
+
+            //  DisableInterrupts();
+            reservation = IpcAllocateReservation();
+            //  EnableInterrupts();
+
+            if (reservation == null) {
+                reservation = new OneShotReservation(); //(PRESERVATION)malloc(sizeof(struct OneShotReservation)); // to be done while on the I-stack!
+                reservation.Clear();
+            }
+            return reservation;
+        }
+
+        static void FreeReservation(OneShotReservation reservation)
+        {
+            reservation = null; //free(reservation);
+        }
+
+        // Garbage-collect unused Reservations.
+        public static int ReleaseReservation(OneShotReservation reservation)
+        {
+            // Debug.Assert(!Processor.InterruptsDisabled());
+            Debug.Assert(reservation.ReferenceCount > 0);
+            int newrefcnt = reservation.ReferenceCount - 1;
+            reservation.ReferenceCount = newrefcnt;
+
+            if (newrefcnt == 0) {
+                // Estimate may be positive when reservation reaches its Deadline w/o using its Estimate
+                Debug.Assert((reservation.Next == null) && (reservation.Previous == null));
+                if (reservation.OriginalThread != null) {
+                    reservation.OriginalThread.Release();
+                    //Debug.Assert(reservation.ActiveThread != null);
+                    //reservation.ActiveThread.Release();
+                }
+                else if (reservation.AssociatedActivity != null) {
+                    ActivityObjRelease(reservation.AssociatedActivity);
+                }
+                CacheFreeReservation(reservation);
+            }
+            return newrefcnt;
+        }
+
+        // Like CheckFreeConstraint, but callable from the IPC path.
+        // Because we can't call AllocateReservation, we use the helper thread
+        // if there aren't any free Reservations.
+        static void CacheFreeReservation(OneShotReservation reservation)
+        {
+            if (reservation.OriginalThread != null  &&
+                reservation.OriginalThread.FreeReservation == null) {
+                reservation.OriginalThread.FreeReservation = reservation;
+            }
+            else {
+                IpcFreeReservation(reservation);
+            }
+        }
+
+
+        // Callable with preemption disabled. Allocates a OneShotReservation
+        // from the global free list.
+        public static OneShotReservation IpcAllocateReservation()
+        {
+            OneShotReservation reservation;
+
+            if ((reservation = ReservationFreePool) != null) {
+                ReservationFreePool = reservation.FreeListNext;
+            }
+
+            return reservation;
+        }
+
+        // Callable with preemption disabled. Frees a OneShotReservation
+        // to the global free list.
+        public static void IpcFreeReservation(OneShotReservation reservation)
+        {
+            Debug.Assert(reservation != null);
+            Debug.Assert(reservation.ReferenceCount == 0);
+
+            reservation.FreeListNext = ReservationFreePool;
+            ReservationFreePool = reservation;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+
+        public static void AddRefReservation(OneShotReservation reservation)
+        {
+            Debug.Assert(reservation.ReferenceCount >= 0);
+            reservation.ReferenceCount++;
+        }
+
+#endregion
+
+#region Potpourri (Unregioned functions)
+
+        public static RobinThread GetCurrentThread()
+        {
+            return ((RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor).RunningThread;
+        }
+
+        public static void IChangeCurrentThread(RobinThread thread)
+        {
+            ((RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor).RunningThread = thread;
+        }
+
+        // Auxiliary Routines
+        // TODO: Revisit the necessity of these functions.
+        public static TimeSpan minInterval(TimeSpan TimeInterv0, TimeSpan TimeInterv1)
+        {
+            return (TimeInterv0 < TimeInterv1? TimeInterv0: TimeInterv1);
+        }
+
+        public static DateTime minTime(DateTime Time0, DateTime Time1)
+        {
+            return (Time0 < Time1? Time0: Time1);
+        }
+
+        static TimeSpan maxInterval(TimeSpan TimeInterv0, TimeSpan TimeInterv1)
+        {
+            return (TimeInterv0 < TimeInterv1? TimeInterv1: TimeInterv0);
+        }
+
+        static DateTime maxTime(DateTime Time0, DateTime Time1)
+        {
+            return (Time0 < Time1? Time1: Time0);
+        }
+
+        internal static RobinProcessor GetCurrentProcessor()
+        {
+            return (RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor;
+        }
+
+        // Add Activity in the last Round-Robin position
+        public static void EnqueueActivity(RobinActivity activity)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            if (CircularActivityList == null) {
+                NextActivity = CircularActivityList /*= GetCurrentProcessor().CurrentActivity */=
+                    activity.Next = activity.Previous = activity;
+                //Here modifying other processor specific data rather than global.
+//                for (int i=0; i<Processor.processorTable.Length; i++) {
+//                    ((RobinProcessor)Processor.processorTable[i].SchedulerProcessor).NextActivity = activity;
+//                    ((RobinProcessor)Processor.processorTable[i].SchedulerProcessor).Reschedule();
+//                }
+                SchedulerClock.SignalOtherProcessors();
+            }
+            else {
+                activity.Next = NextActivity;
+                activity.Previous = NextActivity.Previous;
+                NextActivity.Previous.Next = activity;
+                NextActivity.Previous = activity;
+            }
+        }
+
+        public static void DequeueActivity(RobinActivity activity) //TODO: Make an activity function?
+        {
+            // In our simulated environment, Activity 0 is never removed from the Q.
+            Debug.Assert(Processor.InterruptsDisabled());
+            //NOTE: Might be replaced with a test and return.
+            Debug.Assert(activity.Next != null);
+            Debug.Assert(activity.Previous != null);
+
+            // Previous. in RoundRobin  if (activity.Id == 0) return;
+
+            activity.Next.Previous = activity.Previous;
+            activity.Previous.Next = activity.Next;
+            if (CircularActivityList == activity) {
+                CircularActivityList = activity.Next;
+            }
+            if (NextActivity == activity) {
+                NextActivity = activity.Next;
+            }
+//            for (int i=0; i<Processor.processorTable.Length; i++) {
+//                RobinProcessor processor = (RobinProcessor)Processor.processorTable[i].SchedulerProcessor;
+//                if (processor.NextActivity == activity) {
+//                    processor.NextActivity = activity.Next;
+//                }
+//            }
+        }
+
+        // if possible, places thread in the 2nd position in the RunnableThreads Q.
+        // Make this a function on a resource container.
+        public static void EnqueueRunThread(RobinThread thread, bool fromSleeping)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            RobinActivity activity = thread.AssociatedActivity;
+            if (thread.Next != null) {
+                Debug.Assert(thread.Previous != null);
+                return;
+            }
+
+            //  Debug.Assert(thread.QueueType == QUEUE_NONE);
+
+            //if (thread.State == RobinThread.ThreadState.ThreadWaiting)
+            //    thread.SetState(RobinThread.ThreadState.ThreadReady);
+
+            if (activity.RunnableThreads == null) {
+                thread.Next = thread.Previous = thread;
+                activity.RunnableThreads = thread;
+            }
+            else {
+                if (fromSleeping) {
+                    thread.Previous = activity.RunnableThreads;
+                    thread.Next = activity.RunnableThreads.Next;
+                    activity.RunnableThreads.Next.Previous = thread;
+                    activity.RunnableThreads.Next = thread;
+                }
+                else {
+                    //If we weren't sleeping/waiting, then we were running --
+                    // then put thread at end of list, not 2nd.
+                    thread.Next = activity.RunnableThreads;
+                    thread.Previous = activity.RunnableThreads.Previous;
+                    activity.RunnableThreads.Previous.Next = thread;
+                    activity.RunnableThreads.Previous = thread;
+                }
+            }
+
+            //Editing other processor data again.  Here we actually tell all
+            //processors they need to reschedule, since there is a new thread to
+            //consider.  (perhaps wrong).
+            //NOTE: SignalOtherProcessors only alerts those who are halted at the
+            //moment.
+            for (int i=0; i<Processor.processorTable.Length; i++) {
+                ((RobinProcessor)Processor.processorTable[i].SchedulerProcessor).Reschedule();
+            }
+            SchedulerClock.SignalOtherProcessors();
+        }
+
+        public static bool DequeueRunThread(RobinThread thread)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            if (thread.Next == null) {
+                Debug.Assert(thread.Previous == null);
+                return false;
+            }
+
+            if (thread.Next == thread) {
+                Debug.Assert(thread.Previous == thread);
+                thread.AssociatedActivity.RunnableThreads = null;
+            }
+            else {
+                // multiple threads in the RunnableThreads Q
+                thread.Previous.Next = thread.Next;
+                thread.Next.Previous = thread.Previous;
+                if (thread.AssociatedActivity.RunnableThreads == thread)
+                    thread.AssociatedActivity.RunnableThreads = thread.Next;
+            }
+            thread.Next = thread.Previous = null;
+            return true;
+        }
+#endregion
+
+#region Additions according to kernel implementation
+
+        static bool ResetTimerTimeout(DateTime NewTimerTimeout)
+        {
+            DateTime timeNow = SchedulingTime;
+
+            if (timeNow > NewTimerTimeout) {
+                return false;
+            }
+
+            Debug.Assert(Processor.InterruptsDisabled());
+            // Debug.Assert(CurrentThread().GetState() == Thread.ThreadState.ThreadRunning);
+
+            Debug.Assert(NewTimerTimeout > SchedulingTime);
+            // Debug.Assert(SleepTimeout > SchedulingTime);
+
+            //TODO: Need LA_Time?
+            //            if (NewTimerTimeout > SleepTimeout - LA_Time)
+            //                NewTimerTimeout = SleepTimeout - LA_Time;
+            if (NewTimerTimeout > RobinThread.GetSleepTimeout()) {
+                NewTimerTimeout = RobinThread.GetSleepTimeout();
+            }
+
+            //DebugStub.Print("Setting Next Interrupt for: {0}...\n",
+            //__arglist(NewTimerTimeout.Ticks);
+            bool success = SchedulerClock.SetNextInterrupt(NewTimerTimeout); //TODO: Perhaps only call this if the time changed.
+
+            //DebugStub.Print(success ? "SUCCESS\n" : "FAILED\n");
+
+            return success;
+        }
+
+        public static  void UpdateSchedulingStatus()
+        {
+            TimeSpan timeRun;
+            RobinThread currentThread = GetCurrentThread();
+
+            DateTime newSchedulingTime = SystemClock.GetKernelTime();
+
+            timeRun = newSchedulingTime - SchedulingTime;
+            RobinProcessor processor = (RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor;
+            processor.SchedulingTime = newSchedulingTime;
+
+            if (Idle) {
+                // UpdateIdleTime
+                IdleTime += timeRun;
+                return;
+            }
+
+            // if IDLE compute CurrentPlanNode & set currentThread to null.
+            if (currentThread != null) {
+                // unless thread just exited.
+                // Update Thread & Activity execution times.
+                currentThread.AddExecutionTime(timeRun);
+                Scheduler.CurrentTask().AddResourceAmountUsed(CpuResource.Provider().ResourceString, CpuResource.Provider().TimeToCpu(timeRun));
+//                if (currentThread.AssociatedActivity != null) {
+//                    currentThread.AssociatedActivity.MyRecurringCpuReservation.EnclosingCpuReservation.AddTimeUsed(timeRun);
+//                }
+            }
+
+            if (OneShotReservation.CurrentReservation != null) {
+                // Slice used for a reservation.
+                OneShotReservation.CurrentReservation.Estimate -= timeRun;
+            }
+            else if (processor.CurrentActivity != null) {
+                // Slice used for RoundRobin.
+                processor.SliceLeft -= timeRun;
+                processor.CurrentActivity = null;
+            }
+        }
+
+        internal static void CheckInvariants()
+        {
+            if (CircularActivityList != null) {
+                bool listNextFound = (CircularActivityList == NextActivity);
+                RobinActivity start = CircularActivityList, current = CircularActivityList.Next, previous = CircularActivityList;
+                while (current != start) {
+                    //perhaps check thread invariants here too.
+                    Debug.Assert(current != null, "resource container list is not circular");
+                    Debug.Assert(current.Previous == previous, "back pointer doesn't match forward pointer");
+                    if (current == NextActivity) {
+                        listNextFound = true;
+                    }
+                    previous = current;
+                    current = current.Next;
+                }
+                Debug.Assert(listNextFound, "NextActivity isn't in the loop!");
+                Debug.Assert(current.Previous == previous, "Head doesn't point to tail");
+            }
+        }
+
+        // Always called when another thread needs to be scheduled.
+        static bool RescheduleInterrupt()
+        {
+            CheckInvariants();
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(!Processor.InterruptsDisabled());
+            RobinThread currentThread = GetCurrentThread();
+            Debug.Assert(currentThread == null || currentThread.ActiveProcessor == GetCurrentProcessor());
+            if (currentThread != null) {
+                currentThread.ActiveProcessor = null;
+            }
+
+            DateTime nextStart;
+            RobinThread previousThread;
+
+          RescheduleAgain: // !!!!!!!!!! SIM ONLY !!!!!!!!!
+            if (Idle) {
+                currentThread = null;
+            }
+
+            previousThread = currentThread;
+
+            UpdateSchedulingStatus();
+
+            //  if thread was the head of the runnable threads Q:
+            //  Advance the runnable threads Q.
+            if ((currentThread != null) &&
+                (currentThread.AssociatedActivity != null) &&
+                (currentThread.AssociatedActivity.RunnableThreads == currentThread)) {
+
+                currentThread.AssociatedActivity.RunnableThreads = currentThread.Next;
+                Debug.Assert(currentThread.AssociatedActivity.RunnableThreads != null);
+            }
+
+            OneShotReservation.UpdateCurrentReservation();
+            OneShotReservation.ClearCurrentReservation();
+            currentThread = null;
+
+            // Finished first stage, i.e. updated state.
+            // Start second stage: wakeup threads & select Next CPU slice.
+
+            RobinThread.WakeThreads();
+
+            // NOTE: In the original RoundRobin Simulator Code (& MMOSA code)
+            // The call to DrainDeferredConditions() was made here.
+            // In Singularity, this will basically be replaced with a
+            // queue of wait-events to fix.
+
+            OneShotReservation.FreshenReservationQueues();
+
+            TimeSpan currentNodeSliceLeft;
+            RobinProcessor currentProcessor = (RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor;
+            if (currentProcessor.CurrentActivity != null && currentProcessor.SliceLeft >= RobinScheduler.MinSlice) {
+                currentThread = currentProcessor.CurrentActivity.GetRunnableThread();
+                if (currentThread != null) {
+                    goto exit;
+                }
+            }
+
+            // Find Next Runnable Activity.
+            currentProcessor.SliceLeft = RobinScheduler.RobinSlice;
+            currentProcessor.CurrentActivity = NextActivity; // !!!!!!!!!!!!!SIM ONLY !!!!!!!!!!
+            while ((currentThread = NextActivity.GetRunnableThread()) == null) {
+                NextActivity = NextActivity.Next;
+                //currentProcessor.SliceLeft = RobinScheduler.RobinSlice;
+                if (NextActivity == currentProcessor.CurrentActivity) {
+                    // !!!!!!!!SIM ONLY !!!!!!!
+                    // in the real scheduler, execute halt
+                    if (OneShotReservation.IdleReservations != null) {
+                        // reuse nextStart
+                        nextStart = minTime(RobinThread.GetSleepTimeout(), OneShotReservation.IdleReservations.Start);
+                    }
+                    else {
+                        nextStart = RobinThread.GetSleepTimeout();
+                        DebugStub.Print("Idle, sleeping until {0} cf maxvalue {1}\n",
+                                        __arglist(nextStart.Ticks,
+                                                  DateTime.MaxValue.Ticks));
+                    }
+
+                    if (nextStart == DateTime.MaxValue) {
+                        Scheduler.StopSystem();
+                    }
+
+                    if (! ResetTimerTimeout(nextStart)) {
+                        //Error setting timer.  Try scheduling again.
+                        DebugStub.Print("Thought Idle, failed to set interrupt.\n");
+                        goto RescheduleAgain;
+                    }
+                    GetCurrentProcessor().Idle = true;
+
+                    // !!!!!!!!SIM ONLY !!!!!!!
+                    currentThread = null;           // !!!!!!!!SIM ONLY !!!!!!!
+                    OneShotReservation.ClearCurrentReservation();
+                    currentProcessor.CurrentActivity = null;
+
+                    if (DateTime.MaxValue != nextStart) {
+                        //Scheduler.LogTimeJump();
+                    }
+
+                    //DebugStub.Print("Halted.\n");
+                    IChangeCurrentThread(null);
+                    return true;            // !!!!!!!!SIM ONLY !!!!!!!
+                }
+                // !!!!!!!!SIM ONLY !!!!!!!
+            }
+            //DebugStub.Print("Running Round Robin Resource Container\n");
+            currentProcessor.CurrentActivity = NextActivity; // we probably need only one of the two variables
+            NextActivity = NextActivity.Next;
+
+          exit:
+            currentNodeSliceLeft = currentProcessor.SliceLeft;
+
+            Debug.Assert(currentThread != null);
+            if (currentThread != previousThread) {
+                Scheduler.LogContextSwitch(); // Context Switch statistics
+            }
+
+            if (OneShotReservation.IdleReservations != null) {
+                // reuse nextStart
+                nextStart = minTime(RobinThread.GetSleepTimeout(), OneShotReservation.IdleReservations.Start);
+            }
+            else {
+                nextStart = RobinThread.GetSleepTimeout();
+            }
+
+            if (SchedulingTime + currentNodeSliceLeft /* CurrentSlice */ > nextStart) {
+                currentNodeSliceLeft /* CurrentSlice */ = nextStart - currentProcessor.SchedulingTime;
+            }
+
+
+            Scheduler.LogReschedule();
+            if (!ResetTimerTimeout(currentProcessor.SchedulingTime + currentNodeSliceLeft) || Scheduler.TimerInterruptedFlag) {
+                //TODO: What do we REALLY want here?
+                currentThread = null;           // !!!!!!!!SIM ONLY !!!!!!!
+                OneShotReservation.ClearCurrentReservation();
+                currentProcessor.CurrentActivity = null;
+                goto RescheduleAgain;
+            }
+
+            Debug.Assert(currentThread.ActiveProcessor == null);
+            currentThread.ActiveProcessor = GetCurrentProcessor();
+            Debug.Assert(currentThread.ActiveProcessor != null);
+
+            if (currentThread != previousThread) {
+                IChangeCurrentThread(currentThread);
+            }
+            GetCurrentProcessor().Idle = false;
+
+            // Not necessarily true:  Debug.Assert(!Scheduler.TimerInterruptedFlag);
+            CheckInvariants();
+            return false;
+        }
+
+#endregion
+
+        public static void Reschedule()
+        {
+            ((RobinProcessor)Processor.CurrentProcessor.SchedulerProcessor).Reschedule();
+        }
+
+        public static void ActivityObjAddRef(RobinActivity activity)
+        {
+            activity.ReferenceCount++;
+        }
+
+
+        public static void ActivityObjRelease(RobinActivity activity)
+        {
+            Debug.Assert(activity.ReferenceCount >= 1);
+            activity.ReleaseReference();
+        }
+
+        public static void ActivityReleaseProtected(RobinActivity activity)
+        {
+            Debug.Assert(activity.ReferenceCount >= 1);
+            Debug.Assert(Processor.InterruptsDisabled(), "Interrupts Not Disabled!");
+            activity.ReleaseReference();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Robin/RobinThread.cs b/base/Kernel/Singularity/Scheduling/Robin/RobinThread.cs
new file mode 100644
index 0000000..1d4fd56
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Robin/RobinThread.cs
@@ -0,0 +1,522 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RobinThread.cs
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Scheduling;
+
+namespace Microsoft.Singularity.Scheduling.Robin
+{
+    /// <summary>
+    /// The kernel structure for the thread.  Contains an associated activity, a
+    /// stack of reservations executing the activity, a reference for a free
+    /// reservation (rather than allocating a new one all the time), a pending
+    /// reservation (used when new constraints are being created), a reference to the
+    /// thread it’s waiting on (for use in scheduling inheritance), the basic thread
+    /// queue and sleep queue pointers, lists of people waiting on mutexes and cv’s
+    /// owned by this thread, bookkeeping for the type of waiting that I’m doing, and
+    /// general bookkeeping.
+    /// </summary>
+    public class RobinThread : ISchedulerThread
+    {
+        static ListNode     SleepingThreads = null;             // list of sleeping threads
+        static DateTime     SleepTimeout = DateTime.MaxValue;   // Next thread wakeup time
+
+        TimeSpan     executionTime;
+        public override TimeSpan ExecutionTime
+        {
+            get{ return executionTime; }
+        }
+
+        public RobinActivity      AssociatedActivity;    // Thread Activity
+        //public RobinThread.ThreadState       State;      // RUNNING, WAITING, SLEEPING
+
+        public OneShotReservation   ReservationStack;// Stack of Reservations, one per active Constraint
+        public OneShotReservation   FreeReservation;
+        public OneShotReservation   PendingReservation;     // PendingConstraint if any
+        // DI -- corresponds to MMID Tid
+        //TODO: Replace with TASK public int                Tid;        // Id to mark node reservations made for this Constraint Stack
+        // DI :: NOTE the Owner field in Kernel is used only for Inheritance control
+        //      need to REMOVE it -- this will help to locate easy all these functions and
+        //      comment them out
+        //public int                Epoch;       // inc-ed at every kernel unlock
+
+        public DateTime     StartTime;  // only while on the sleep Q
+
+        public RobinThread  Next;       // Next and previous threads
+        public RobinThread  Previous;
+
+        // DI -- maybe don't use it, see vtlb.c
+        // UINT QueueType;            // Type of queue thread is on, if any
+
+        // DI -- ??!! this might replace Next and Previous from above
+        public ListNode Queue;            // List of threads in a queue
+        // DI -- need it as a thread may wait on a condition (i.e. use Queue)
+        // and wait for the timeout (Condition_TimedWait)
+        public ListNode SleepQueue;       // Another queue link, for sleeping only
+
+        public int  ReferenceCount;
+        public readonly Thread enclosingThread;
+
+        public RobinProcessor ActiveProcessor; //Set only when running on processor -- no other processor may take the thread to run.
+
+        //public interface
+        public RobinThread(Thread thread)
+        {
+            enclosingThread = thread;
+            Queue = new ListNode(this);
+            SleepQueue = new ListNode(this);
+            AssociatedActivity = null;
+            StartTime  = new DateTime(0);
+            //TODO: BUGBUGBUG
+            //Tid = Id; REPLACE WITH DEFAULT TASK?
+            Queue.Next = Queue.Previous = Queue;
+            SleepQueue.Next = SleepQueue.Previous = SleepQueue;
+            //State = RobinThread.ThreadState.ThreadWaiting;
+        }
+
+#region ISchedulerThread Members
+
+        public override Thread EnclosingThread
+        {
+            get { return enclosingThread; }
+        }
+
+        //public interface
+        public override void SetActivity(ISchedulerActivity iActivityNew)
+        {
+            DebugStub.Print("RobinThread.SetActivity()\n");
+            Debug.Assert(iActivityNew != null);
+            Debug.Assert(iActivityNew is RobinActivity);
+            Debug.Assert(((RobinActivity)iActivityNew).ReferenceCount > 0);
+            RobinActivity activityNew = (RobinActivity)iActivityNew;
+            RobinActivity activityOld = AssociatedActivity;
+
+
+            if (activityOld == activityNew) {
+                return;
+            }
+
+            bool iflag = Processor.DisableInterrupts();
+
+            if (activityOld != null) {
+                //if (State != RobinThread.ThreadState.ThreadWaiting)
+                if (enclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+                    RobinScheduler.DequeueRunThread(this);
+                }
+                RobinScheduler.ActivityReleaseProtected(activityOld);
+            }
+
+            if (activityNew != null) {
+                //if (State != RobinThread.ThreadState.ThreadWaiting)
+                if (enclosingThread.ThreadState == System.Threading.ThreadState.Running) {
+                    AssociatedActivity = activityNew;
+                    RobinScheduler.EnqueueRunThread(this, false);
+                }
+                RobinScheduler.ActivityObjAddRef(activityNew);
+            }
+            else if (this == RobinScheduler.GetCurrentThread()) {
+                //TODO: Double Check! //State == RobinThread.ThreadState.ThreadRunning)
+                if (this == RobinScheduler.GetCurrentThread() && activityOld != null) {
+                    RobinScheduler.UpdateSchedulingStatus();
+                }
+            }
+            AssociatedActivity = activityNew;
+            DebugStub.Print("Exiting RobinThread.SetActivity()\n");
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public interface
+        public override void Start()
+        {
+            //TODO: No need for assertion perhaps -- default somehow?
+            Debug.Assert(AssociatedActivity != null);
+            bool iflag = Processor.DisableInterrupts();
+            IReady();
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        //public interface
+        public override void Cleanup()
+        {
+            OneShotReservation reservation;
+            DebugStub.Print("Cleaning RobinThread\n");
+
+            SetStateWaiting(DateTime.MaxValue);
+            DebugStub.Print("At this point thread is dequeued.\n");
+
+            while ((reservation = ReservationStack) != null) {
+                ReservationStack = reservation.Next; // !!!! don't remove Caller's constraints !!!
+                reservation.DequeueReservation();
+            }
+
+            RobinScheduler.ActivityObjRelease(AssociatedActivity);
+
+            //TODO: In the "real" system, cleanup is called by someone who will pick next thread, right?
+        }
+
+#endregion
+
+        public static DateTime GetSleepTimeout()
+        {
+            if (SleepingThreads != null) {
+                return SleepTimeout;
+            }
+            else {
+                return DateTime.MaxValue;
+            }
+        }
+
+        public void AddRef()
+        {
+            ReferenceCount++;
+        }
+
+        // DI -- instead of calling this, one should call ::ReleaseActivity
+        public void Release()
+        {
+            ReferenceCount--;
+            Debug.Assert(ReferenceCount >= 0);
+        }
+
+        public void ReleaseProtected()
+        {
+            ReferenceCount--;
+            Debug.Assert(ReferenceCount >= 0);
+        }
+
+        public override void SetStateWaiting(DateTime timeOut)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            InternalSetStateWaiting(timeOut);
+            Processor.RestoreInterrupts(iflag);
+        }
+
+        public void InternalSetStateWaiting(DateTime timeOut)
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            // DI -- don't need activity state update
+            //This to handle sleeps and timed waits.
+            if (timeOut != DateTime.MaxValue) {
+                if (timeOut - SystemClock.GetKernelTime() > RobinScheduler.MinSlice) {
+                    Scheduler.LogSleepAdd();
+                    StartTime = timeOut;
+
+                    PutOnSleepQueue();
+                }
+                else {
+                    //Sleeping for less than MinSlice is treated as not sleeping/yield.
+                    if (PendingReservation != null) {
+                        ResolvePendingReservation();
+                    }
+                    return;
+                }
+            }
+
+            RobinScheduler.DequeueRunThread(this); // from RunnableThreads
+        }
+
+
+        // DI -- this is the function in !LAXITY version
+        //TODO: REPLACE WITH ENCLOSING LOGIC!
+        //public void SetState(ThreadState newState)
+        //{
+        //    State = newState;
+        //    Debug.Assert(newState != ThreadState.ThreadWaiting);
+        //}
+
+        // DI -- safe
+        //TODO: REPLACE WITH ENCLOSING LOGIC!
+        void IReady()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            // TODO -- maybe something for directed context switch
+            // DI -- don't need PutThreadOnReadyQueue outside schedule.c
+            // PutThreadOnReadyQueue(thread);
+
+            RobinScheduler.EnqueueRunThread(this, true);
+        }
+        // DI -- this is called only from PutThreadOnSleepQueue
+        // DI -- merge them ??
+        static ListNode InsertThreadOnSleepQueue(RobinThread thread, ListNode listThreadHead)
+        {
+            RobinThread threadHead, threadTail, tempThread;
+
+            if (listThreadHead == null) {
+                // Queue empty
+                return thread.SleepQueue;
+            }
+
+            threadHead = GetThreadFromListNode(listThreadHead);
+            threadTail = GetThreadFromListNode(threadHead.SleepQueue.Previous);
+
+            if (thread.StartTime >= threadTail.StartTime) {
+                thread.SleepQueue.InsertIntoList(threadTail.SleepQueue);
+                // DI -- if merge: update SleepTimeout here
+                return threadHead.SleepQueue;
+            }
+
+
+            if (thread.StartTime < threadHead.StartTime) {
+                thread.SleepQueue.InsertIntoList(threadTail.SleepQueue);
+                return thread.SleepQueue;
+            }
+
+
+            for (tempThread = GetThreadFromListNode(threadHead.SleepQueue.Next);;
+                 tempThread = GetThreadFromListNode(tempThread.SleepQueue.Next)) {
+
+                if (tempThread.StartTime > thread.StartTime) {
+                    thread.SleepQueue.InsertIntoList(tempThread.SleepQueue.Previous);
+                    break;
+                }
+            }
+
+            return threadHead.SleepQueue;
+        }
+
+        public void PutOnSleepQueue()
+        {
+            SleepingThreads = InsertThreadOnSleepQueue(this,SleepingThreads);
+            SleepTimeout = (GetThreadFromListNode(SleepingThreads)).StartTime;
+        }
+
+
+//        public void Sleep(DateTime time)
+//        {
+//            if (time - SystemClock.GetKernelTime() > RobinScheduler.MinSlice) {
+//
+//                RobinScheduler.LogSleepAdd();
+//                StartTime = time;
+//
+//                SetStateWaiting();
+//
+//                // DI -- need it, called from WaitCond also
+//                PutOnSleepQueue();
+//            }
+//        }
+
+        // Di -- safe -- optimized
+        void PullThreadOffSleepQueue()
+        {
+            ListNode listThread, listNewHead;
+
+            listThread = SleepQueue;
+            listNewHead = listThread.ListRemove();
+
+            if (SleepingThreads == listThread) {
+                if ((SleepingThreads = listNewHead) != null) {
+                    SleepTimeout =(GetThreadFromListNode(SleepingThreads)).StartTime;
+                }
+                else {
+                    SleepTimeout = DateTime.MaxValue;
+                }
+            }
+        }
+
+        private void ResolvePendingReservation()
+        {
+            Debug.Assert(Processor.InterruptsDisabled());
+            Debug.Assert(PendingReservation != null);
+            bool admitted = OneShotReservation.ResolveConstraint(this);
+            if (ReservationStack.EnclosingTask != null) {
+                // Not clear if this will work in real system or not.  Here for simulator mainly.
+                ReservationStack.EnclosingTask.UpdateSchedulingState(admitted, ReservationStack.Deadline, ReservationStack.ResourcesGranted);
+            }
+        }
+
+        // DI -- safe
+        public override void Wake()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            PullThreadOffSleepQueue();
+            IReady();
+
+            if (PendingReservation != null) {
+                ResolvePendingReservation();
+            }
+
+            Processor.RestoreInterrupts(iflag);
+        }
+
+
+        OneShotReservation AllocationReservation()
+        {
+            OneShotReservation reservation = FreeReservation;
+
+            Debug.Assert(reservation != null);
+            FreeReservation = null;
+            reservation.Clear();
+            return reservation;
+        }
+
+
+        public void IpcCheckFreeConstraint()
+        {
+            if (FreeReservation == null) {
+                OneShotReservation reservation;
+                reservation = RobinScheduler.IpcAllocateReservation();
+
+                if (reservation == null) {
+                    reservation = RobinScheduler.AllocateReservation();
+                }
+
+                FreeReservation = reservation;
+            }
+        }
+
+        // If this thread doesn't have a free OneShotReservation reserved
+        // for its use, then try to grab one from the global free list.
+        // If there aren't any there, then allocate a new one.
+        void ICheckFreeConstraint()
+        {
+            if (FreeReservation == null) {
+                OneShotReservation reservation;
+                reservation = RobinScheduler.AllocateReservation();
+                FreeReservation = reservation;
+            }
+        }
+
+
+        // Free the Reservations associated with a thread.
+        // Used by thread cleanup.
+        public void IFreeConstraints()
+        {
+            OneShotReservation reservation;
+
+            //  Debug.Assert(!Processor.InterruptsDisabled());
+
+            if (FreeReservation != null) {
+                RobinScheduler.IpcFreeReservation(FreeReservation);
+            }
+
+            while ((reservation = ReservationStack) != null) {
+                ReservationStack = reservation.SurroundingReservation;
+                RobinScheduler.ReleaseReservation(reservation);
+            }
+        }
+
+        // DI -- safe but optimize to  because don't need QueueType
+        public ListNode Dequeue()
+        {
+            return Queue.ListRemove();
+        }
+
+        public static ListNode QueueFifo(RobinThread thread, ListNode threadHead)
+        {
+            if (threadHead != null) {
+                thread.Queue.InsertIntoList(threadHead.Previous);
+            }
+            else {
+                threadHead = thread.Queue;
+            }
+            return threadHead;
+        }
+
+        // DI -- safe
+        public static RobinThread GetThreadFromListNode(ListNode listNode)
+        {
+            Debug.Assert(listNode == null || listNode.Data is RobinThread);
+            if (listNode == null) {
+                return null;
+            }
+            if (listNode.Data is RobinThread) {
+                return (RobinThread)listNode.Data;
+            }
+            else {
+                return null;
+            }
+        }
+
+        public static void WakeThreads()
+        {
+            RobinThread    ptemp;
+            Debug.Assert(Processor.InterruptsDisabled());
+            while ((ptemp = RobinThread.GetThreadFromListNode(SleepingThreads)) != null &&
+                   ptemp.StartTime < RobinScheduler.SchedulingTime + RobinScheduler.LA_Time) {
+                //TODO: LA_Time here?
+
+                SleepingThreads = SleepingThreads.ListRemove();
+
+                ptemp.IReady();
+
+                if (ptemp.PendingReservation != null) {
+                    ptemp.ResolvePendingReservation();
+                }
+                Scheduler.LogWakeThread(ptemp.EnclosingThread);
+            }
+
+            if (ptemp != null) {
+                SleepTimeout = ptemp.StartTime;
+            }
+            else {
+                SleepTimeout = DateTime.MaxValue;
+            }
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="endPrevious"></param>
+        /// <param name="timeConstraint"></param>
+        /// <param name="timeNow">TODO: UNUSED</param>
+        /// <returns></returns>
+        public bool BeginConstraintBeforeWaitValidate(bool endPrevious,
+                                                       ref TimeConstraint timeConstraint,
+                                                       DateTime timeNow)
+        {
+            if (endPrevious &&
+                (ReservationStack == null ||
+                 ReservationStack.OriginalThread == null)) {
+                // check to have a valid constraint in the stack
+                return false;
+            }
+
+            if (timeConstraint.Estimate.Ticks < 0) {
+                return false;
+            }
+
+            // By this time, something should be in FreeReservation
+            //  grab it now such to enable the EndPreviousConstraint to
+            //  save its reservation in the cache
+            Debug.Assert(FreeReservation != null);
+            Debug.Assert(FreeReservation != OneShotReservation.CurrentReservation);
+
+            PendingReservation = AllocationReservation();
+            return true;
+        }
+
+        public void AddExecutionTime(TimeSpan delta)
+        {
+            executionTime += delta;
+        }
+
+        public override ISchedulerTask PrepareDelayedTask(ISchedulerTask taskToEnd, ref TimeConstraint timeConstraint, DateTime timeNow)
+        {
+            // DI -- the Next calls are from TimedWaitAndBeginConstraint
+            IpcCheckFreeConstraint();
+
+            Debug.Assert(taskToEnd == null || taskToEnd == ReservationStack);
+            bool endPrevious = (taskToEnd != null);
+
+            if (!BeginConstraintBeforeWaitValidate(endPrevious, ref timeConstraint, timeNow)) {
+                goto Exit;
+            }
+
+            OneShotReservation.BeginConstraintBeforeWait(this, endPrevious, timeConstraint, timeNow);
+          Exit:
+            return PendingReservation;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/Scheduler.cs b/base/Kernel/Singularity/Scheduling/Scheduler.cs
new file mode 100644
index 0000000..82cc6eb
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/Scheduler.cs
@@ -0,0 +1,297 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Scheduler.cs
+//
+//  Note:
+//
+
+// #define DEBUG_SCHEDULER
+#if DEBUG
+#define SHOW_TWIDDLE
+#else
+//#define SHOW_TWIDDLE
+#endif
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Hal;
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class Scheduler
+    {
+        // Global
+        [AccessedByRuntime("referenced from halidt.asm")]
+        private static SpinLock dispatchLock;
+
+        // List of per-processor idle threads.
+        protected static ThreadQueue idleThreads;
+
+        [NoHeapAllocation]
+        public static void DispatchLock()
+        {
+            dispatchLock.Acquire();
+        }
+
+        [NoHeapAllocation]
+        public static bool EnsureDispatchLock(int currentThreadIndex) {
+            if (dispatchLock.IsHeldBy(currentThreadIndex)) {
+                return false;
+            } else {
+                DispatchLock();
+                return true;
+            }
+        }
+
+        [NoHeapAllocation]
+        public static void DispatchRelease()
+        {
+            dispatchLock.Release();
+        }
+
+        [Conditional("DEBUG")]
+        [NoHeapAllocation]
+        public static void AssertDispatchLockHeld()
+        {
+            VTable.Assert(Processor.InterruptsDisabled());
+            VTable.Assert(dispatchLock.IsHeldBy(Thread.CurrentThread));
+        }
+
+        public static unsafe void Initialize()
+        {
+            // Scheduler visualization hack
+            // we use unsafe access to minimize the scheduler overhead.
+            screenMem = IoMemory.MapPhysicalMemory(0xb8000, 80*50*2, true, true);
+            screenPos = 0;
+            screenPtr = (ushort *)screenMem.VirtualAddress;
+
+            // Create the idle threads queue
+            idleThreads = new ThreadQueue();
+
+            // Create the twiddle values.
+            twiddles = new ushort[] {
+                (ushort)(0xe000 | '|'),
+                (ushort)(0xe000 | '/'),
+                (ushort)(0xe000 | '-'),
+                (ushort)(0xe000 | '\\')
+            };
+            tpos = 0;
+        }
+
+        public static void Finalize()
+        {
+        }
+
+        ////////////////////////////////////////// Heads-up Scheduler Display.
+        //
+        private static IoMemory screenMem;
+        private static int      screenPos;
+        private static unsafe ushort * screenPtr;
+
+        [Inline]
+        [NoHeapAllocation]
+        private static unsafe void DisplayThread(int id)
+        {
+#if SHOW_TWIDDLE
+            screenPtr[screenPos] = (ushort)(0x2a00| ('@'+id));
+            screenPos = (screenPos + 1) % 80;
+#endif
+        }
+
+        private static ushort[] twiddles;
+
+        private static int tpos;
+
+        [Inline]
+        [NoHeapAllocation]
+        private static unsafe void Twiddle()
+        {
+#if SHOW_TWIDDLE
+            screenPtr[screenPos] = twiddles[tpos];
+            tpos = ++tpos & 3;
+#endif
+        }
+
+        /////////////////////////////////////////////////// Logging Functions.
+        //
+        [NoHeapAllocation]
+        public static void SelectingThread(Thread thread)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            Thread.CurrentThread.ActiveProcessor = null;
+
+            if (thread != null) {
+                int id = thread.GetThreadId();
+
+                DisplayThread(id);
+                thread.ActiveProcessor = Processor.CurrentProcessor;
+#if DEBUG_DISPATCH
+                DebugStub.Print("Thread {0:x8} Selecting {1:x8}\n",
+                                __arglist(
+                                    Kernel.AddressOf(Thread.CurrentThread),
+                                    Kernel.AddressOf(thread)));
+#endif // DEBUG_DISPATCH
+                Tracing.Log(Tracing.Debug, "Selecting tid={0:x3}", (uint)id);
+
+                VTable.Assert(!thread.schedulerEntry.Enqueued);
+            }
+            Twiddle();
+        }
+
+        [NoHeapAllocation]
+        public static bool IsIdleThread(int threadIndex) {
+            Thread thread = Thread.threadTable[threadIndex];
+            return (thread != null &&
+                    idleThreads.IsEnqueued(thread.schedulerEntry));
+        }
+
+        [Conditional("DEBUG_SCHEDULER")]
+        [CLSCompliant(false)]
+        public static void LogWakeThread(Thread thread)
+        {
+        }
+
+        [Conditional("DEBUG_SCHEDULER")]
+        public static void LogSchedulerLate()
+        {
+        }
+
+        [Conditional("DEBUG_SCHEDULER")]
+        public static void LogContextSwitch()
+        {
+        }
+
+        [Conditional("DEBUG_SCHEDULER")]
+        public static void LogTimeJump()
+        {
+        }
+
+        [Conditional("DEBUG_SCHEDULER")]
+        public static void LogSleepAdd()
+        {
+        }
+
+        [Conditional("DEBUG_SCHEDULER")]
+        public static void LogReschedule()
+        {
+        }
+
+        /////////////////////////////////////////// Scheduling Event Handlers.
+        //
+        //  Each of these should be replaced by the scheduler mixin.
+        //
+        [CLSCompliant(false)]
+        public static void OnThreadStateInitialize(Thread thread, bool constructorCalled)
+        {
+            // Only initialize thread-local state!  No locks held and interrupts on.
+            DebugStub.Break();
+        }
+
+        [CLSCompliant(false)]
+        public static void OnThreadStart(Thread thread)
+        {
+            AssertDispatchLockHeld();
+            Debug.Assert(thread.freezeCount == 0);
+            DebugStub.Break();
+        }
+
+        [CLSCompliant(false)]
+        public static Thread OnThreadBlocked(Thread thread, SchedulerTime stop)
+        {
+            // Scheduler should return the target thread.
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+            return null;
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static void OnThreadUnblocked(Thread thread)
+        {
+            // The scheduler should add this thread to the runnable queue,
+            // but should not perform a context switch yet.
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static Thread OnThreadYield(Thread thread)
+        {
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+            return null;
+        }
+
+        [CLSCompliant(false)]
+        public static Thread OnThreadStop(Thread thread)
+        {
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+            return null;
+        }
+
+        [CLSCompliant(false)]
+        public static void OnThreadFreezeIncrement(Thread thread)
+        {
+            // Increment freezeCount and unschedule the thread until
+            // freezeCount==0.  (Used for Thread.Stop, Thread.Suspend,
+            // and modifying a thread's garbage collection state)
+            //
+            // If the thread is already running on a processor,
+            // the scheduler need not unschedule it immediately, but:
+            //   - the thread must be unscheduled within a bounded time
+            //     (e.g. a time slice)
+            //   - once unscheduled, the thread must not be scheduled
+            //     again until freezeCount==0.
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+        }
+
+        [CLSCompliant(false)]
+        public static void OnThreadFreezeDecrement(Thread thread)
+        {
+            // Decrement freezeCount.  If freezeCount reaches 0,
+            // the thread may now be scheduled (if it is
+            // not blocked).
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static Thread OnTimerInterrupt(Thread thread, SchedulerTime now)
+        {
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+            return null;
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static Thread OnIoInterrupt(Thread thread)
+        {
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+            return null;
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static void OnProcessorShutdown(Thread thread)
+        {
+            AssertDispatchLockHeld();
+            DebugStub.Break();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/ThreadEntry.cs b/base/Kernel/Singularity/Scheduling/ThreadEntry.cs
new file mode 100644
index 0000000..9e2769b
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/ThreadEntry.cs
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadEntry.cs
+//
+//  Note:
+//
+
+// #define DEBUG_SCHEDULER
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    [CLSCompliant(false)]
+    public class ThreadEntry
+    {
+        public readonly Thread Thread = null;
+        internal ThreadEntry next = null;
+        internal ThreadEntry prev = null;
+        [AccessedByRuntime("referenced from c++")]
+        internal ThreadQueue queue = null;
+
+        public ThreadEntry(Thread thread)
+        {
+            Thread = thread;
+        }
+
+        public ThreadEntry Next
+        {
+            [NoHeapAllocation]
+            get { return next; }
+        }
+
+        public ThreadEntry Prev
+        {
+            [NoHeapAllocation]
+            get { return prev; }
+        }
+
+        public bool Enqueued
+        {
+            [NoHeapAllocation]
+            get { return (queue != null); }
+        }
+
+        [NoHeapAllocation]
+        public void RemoveFromQueue()
+        {
+            if (queue != null) {
+                queue.Remove(this);
+            }
+
+            VTable.Assert(next == null);
+            VTable.Assert(prev == null);
+            VTable.Assert(queue == null);
+        }
+
+        [NoHeapAllocation]
+        public Thread GetBeneficiary()
+        {
+            return queue.Handle.GetBeneficiary();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Scheduling/ThreadQueue.cs b/base/Kernel/Singularity/Scheduling/ThreadQueue.cs
new file mode 100644
index 0000000..4ef6fba
--- /dev/null
+++ b/base/Kernel/Singularity/Scheduling/ThreadQueue.cs
@@ -0,0 +1,216 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadQueue.cs
+//
+//  Note:
+//
+
+// #define DEBUG_SCHEDULER
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Scheduling
+{
+    // This class is designed to support queues whose enqueue,
+    // dequeue, and remove operations do not allocate memory.
+    // This feature is useful when writing code that needs to
+    // do such operations with interrupts off.
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from c++")]
+    public class ThreadQueue
+    {
+        private ThreadEntry head = null;
+        private ThreadEntry tail = null;
+        private WaitHandle handle = null;
+
+        public ThreadQueue()
+        {
+        }
+
+        public ThreadQueue(WaitHandle handle)
+        {
+            this.handle = handle;
+        }
+
+        public WaitHandle Handle {
+            [NoHeapAllocation]
+            get { return handle; }
+        }
+
+        public ThreadEntry Head
+        {
+            [NoHeapAllocation]
+            get { return head; }
+        }
+
+        [NoHeapAllocation]
+        public bool IsEnqueued(ThreadEntry entry)
+        {
+            return (entry.queue == this);
+        }
+
+        [NoHeapAllocation]
+        public void EnqueueTail(ThreadEntry entry)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            VTable.Assert(entry.next == null);
+            VTable.Assert(entry.prev == null);
+            VTable.Assert(entry.queue == null);
+
+            entry.queue = this;
+            entry.prev = tail;
+
+            if (tail != null) {
+                VTable.Assert(tail.next == null);
+                tail.next = entry;
+            }
+            else {
+                VTable.Assert(head == null);
+                head = entry;
+            }
+
+            tail = entry;
+        }
+
+        [NoHeapAllocation]
+        public void EnqueueHead(ThreadEntry entry)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            VTable.Assert(entry.next == null);
+            VTable.Assert(entry.prev == null);
+            VTable.Assert(entry.queue == null);
+
+            entry.queue = this;
+            entry.next = head;
+
+            if (head != null) {
+                VTable.Assert(head.prev == null);
+                head.prev = entry;
+            }
+            else {
+                VTable.Assert(tail == null);
+                tail = entry;
+            }
+
+            head = entry;
+        }
+
+        [NoHeapAllocation]
+        public void InsertBefore(ThreadEntry position, ThreadEntry entry)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            if (position == null) {
+                EnqueueTail(entry);
+            }
+            else if (position == head) {
+                EnqueueHead(entry);
+            }
+            else {
+                VTable.Assert(head != null);
+                VTable.Assert(entry.queue == null);
+
+                entry.queue = this;
+                entry.prev = position.prev;
+                entry.next = position;
+                position.prev = entry;
+                entry.prev.next = entry;
+            }
+        }
+
+        [NoHeapAllocation]
+        public Thread DequeueHeadThread()
+        {
+            Scheduler.AssertDispatchLockHeld();
+            ThreadEntry entry = DequeueHead();
+            if (entry != null) {
+                return entry.Thread;
+            }
+            return null;
+        }
+
+        [NoHeapAllocation]
+        public Thread DequeueTailThread()
+        {
+            Scheduler.AssertDispatchLockHeld();
+            ThreadEntry entry = DequeueTail();
+            if (entry != null) {
+                return entry.Thread;
+            }
+            return null;
+        }
+
+        [NoHeapAllocation]
+        public ThreadEntry DequeueHead()
+        {
+            Scheduler.AssertDispatchLockHeld();
+            ThreadEntry entry = head;
+
+            if (entry != null) {
+                Remove(entry);
+                return entry;
+            }
+            else {
+                return null;
+            }
+        }
+
+        [NoHeapAllocation]
+        public ThreadEntry DequeueTail()
+        {
+            Scheduler.AssertDispatchLockHeld();
+            ThreadEntry entry = tail;
+
+            if (entry != null) {
+                Remove(entry);
+                return entry;
+            }
+            else {
+                return null;
+            }
+        }
+
+        [NoHeapAllocation]
+        public void Remove(ThreadEntry entry)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            VTable.Assert(entry.queue == this);
+
+            if (entry.next != null) {
+                entry.next.prev = entry.prev;
+            }
+            else {
+                VTable.Assert(entry == tail);
+                tail = entry.prev;
+            }
+
+            if (entry.prev != null) {
+                entry.prev.next = entry.next;
+            }
+            else {
+                VTable.Assert(entry == head);
+                head = entry.next;
+            }
+
+            entry.next = null;
+            entry.prev = null;
+            entry.queue = null;
+        }
+
+        [NoHeapAllocation]
+        public bool IsEmpty()
+        {
+#if false
+            Scheduler.AssertDispatchLockHeld();
+#endif
+            return (head == null);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Security/SecurityAttributes.cs b/base/Kernel/Singularity/Security/SecurityAttributes.cs
new file mode 100644
index 0000000..384d067
--- /dev/null
+++ b/base/Kernel/Singularity/Security/SecurityAttributes.cs
@@ -0,0 +1,65 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DriverAttributes.cs
+//
+//  Warning:  This file is compiled into the kernel, and into the runtime.
+//            In order to get the visibility correct in all cases, some #ifs
+//            are needed
+//
+//  New Design:
+//          This now conforms with the ideas presented in the Genesis papers,
+//          chapter 3.  In particular, a device driver is simply a Category,
+//          and anything that is in an app manifest is either intrinsic to
+//          apps/installations (and hence not a decoration), or else a
+//          PropertySet or Category.
+
+using System;
+using Microsoft.Singularity.Configuration;
+
+namespace Microsoft.Singularity.Security
+{
+
+    //
+    //  Application security specifiers
+    //
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // ApplicationPublisherAttribute
+    //
+    // Purpose: Top-level metadata indicating the publisher name for an
+    //          application.
+    //
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public class ApplicationPublisherAttribute : System.Attribute
+    {
+        private string publisher;
+
+        public ApplicationPublisherAttribute(string _publisher)
+        {
+            this.publisher = _publisher;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // AssertPrivilegeAttribute
+    //
+    // Purpose: Top-level metadata indicating that the publisher asserts that
+    // application is a member of the argument group
+    //
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public class AssertPrivilegeAttribute : System.Attribute
+    {
+        private string privilege;
+
+        public AssertPrivilegeAttribute(string _privilege)
+        {
+            this.privilege = _privilege;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/ServiceRequest.cs b/base/Kernel/Singularity/ServiceRequest.cs
new file mode 100644
index 0000000..a966fac
--- /dev/null
+++ b/base/Kernel/Singularity/ServiceRequest.cs
@@ -0,0 +1,19 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceRequest.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity
+{
+    public abstract class ServiceRequest
+    {
+        internal ServiceRequest next = null;
+        protected internal abstract void Service();
+    }
+}
\ No newline at end of file
diff --git a/base/Kernel/Singularity/ServiceRequestQueue.cs b/base/Kernel/Singularity/ServiceRequestQueue.cs
new file mode 100644
index 0000000..c3bad34
--- /dev/null
+++ b/base/Kernel/Singularity/ServiceRequestQueue.cs
@@ -0,0 +1,75 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceRequestQueue.cs
+//
+//  Note:
+//
+
+using System.Threading;
+
+namespace Microsoft.Singularity
+{
+    public class ServiceRequestQueue
+    {
+        // Invariant: head == null <==> tail == null
+        // tail.next is undefined.
+        private ServiceRequest head = null;
+        private ServiceRequest tail = null;
+        private SpinLock spinLock;
+        private AutoResetEvent enqueueEvent = new AutoResetEvent(false);
+
+        // Insert an element at the tail of the queue.
+        public void Enqueue(ServiceRequest req)
+        {
+            bool iflag = Processor.DisableInterrupts();
+            spinLock.Acquire();
+            try {
+                if (head == null) {
+                    head = req;
+                    tail = req;
+                }
+                else {
+                    tail.next = req;
+                    tail = req;
+                }
+                enqueueEvent.Set();
+            }
+            finally {
+                spinLock.Release();
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        // Block while the queue is empty, then return the head of the queue.
+        public ServiceRequest Dequeue()
+        {
+            while (true) {
+                bool iflag = Processor.DisableInterrupts();
+                spinLock.Acquire();
+                try {
+                    if (tail != null)
+                    {
+                        ServiceRequest req = head;
+                        if (req != tail) {
+                            head = req.next;
+                        }
+                        else {
+                            head = null;
+                            tail = null;
+                        }
+                        return req;
+                    }
+                }
+                finally {
+                    spinLock.Release();
+                    Processor.RestoreInterrupts(iflag);
+                }
+                enqueueEvent.WaitOne();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/ServiceThread.cs b/base/Kernel/Singularity/ServiceThread.cs
new file mode 100644
index 0000000..18a8a27
--- /dev/null
+++ b/base/Kernel/Singularity/ServiceThread.cs
@@ -0,0 +1,39 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ServiceThread.cs
+//
+//  Note:
+//
+
+using System.Threading;
+
+namespace Microsoft.Singularity
+{
+    public class ServiceThread
+    {
+        private static ServiceRequestQueue queue;
+
+        internal static void Initialize()
+        {
+            queue = new ServiceRequestQueue();
+            Thread.CreateThread(Thread.CurrentProcess, new ThreadStart(ServiceLoop)).Start();
+        }
+
+        internal static void Request(ServiceRequest req)
+        {
+            queue.Enqueue(req);
+        }
+
+        private static void ServiceLoop()
+        {
+            while (true) {
+                ServiceRequest req = queue.Dequeue();
+                req.Service();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/SharedHeapWalker.cs b/base/Kernel/Singularity/SharedHeapWalker.cs
new file mode 100644
index 0000000..d86fa2b
--- /dev/null
+++ b/base/Kernel/Singularity/SharedHeapWalker.cs
@@ -0,0 +1,136 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SharedHeapWalker.cs
+//
+//  Note:
+//
+
+using System.Threading;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity
+{
+    internal class SharedHeapWalker
+    {
+        internal static SharedHeapWalker walker;
+
+        private AutoResetEvent doWalkEvent;
+        private unsafe SharedHeap.AllocationOwnerId allocationOwnerId;
+        private unsafe SharedHeap.AllocationOwnerId endpointOwnerId;
+        private SharedHeap.AllocationMatches match;
+        private SharedHeap.AllocationVisitor allocationVisitor;
+        private SharedHeap.AllocationVisitor endpointVisitor;
+
+        internal static unsafe void Initialize(
+            SharedHeap.AllocationOwnerId allocId,
+            SharedHeap.AllocationOwnerId endpointId)
+        {
+            walker = new SharedHeapWalker(allocId, endpointId);
+        }
+
+        private unsafe SharedHeapWalker(
+            SharedHeap.AllocationOwnerId allocId,
+            SharedHeap.AllocationOwnerId endpointId)
+        {
+            doWalkEvent = new AutoResetEvent(false);
+            allocationOwnerId = allocId;
+            endpointOwnerId = endpointId;
+            match = new SharedHeap.AllocationMatches(Matches);
+            allocationVisitor = new SharedHeap.AllocationVisitor(AllocationVisit);
+            endpointVisitor = new SharedHeap.AllocationVisitor(EndpointVisit);
+            Thread.CreateThread(Thread.CurrentProcess,
+                new ThreadStart(Loop)).Start();
+        }
+
+        // Tell the shared heap walker to start a walk at some time in
+        // the future.  Multiple calls to DoWalk may be coalesced together,
+        // resulting in only a single walk.
+        internal void RequestWalk()
+        {
+            doWalkEvent.Set();
+        }
+
+        // Main loop of the shared heap walker.  Walk each node in
+        // the shared heap whenever Signal is called.
+        //
+        // Currently, we signal the walker whenever any process exits,
+        // so that one very small process exit can trigger a traversal
+        // of a large shared heap.  This raises issues:
+        //   - Is this a wise use of resources in the common case?
+        //   - Can a malicious small process leverage the large shared heap
+        //     to deny service to others?
+        // We could avoid these issues by keeping segregated shared
+        // heap allocation lists (one list per process), but we feared
+        // the common case overhead of maintaining these lists (e.g. locking
+        // during Send/Receive).  Furthermore:
+        //   - The shared heap is typically not large, and process
+        //     exit is infrequent compared to other operations, so the common
+        //     case resource usage is not likely to be significant.
+        //   - Only one thread walks the heap, so the denial-of-service
+        //     potential is small.  At worst, such an attack could:
+        //     - Cause the thread below to use some fraction of the CPU time
+        //       (a waste of cycles, but not a denial of service)
+        //     - Try to increase the size of the shared heap in order to
+        //       increase the latency of a shared heap walk (but it's not
+        //       clear that well-behaved apps are affected by this latency)
+        private void Loop()
+        {
+            while (true) {
+                try {
+                    doWalkEvent.WaitOne();
+                    Tracing.Log(Tracing.Audit, "Shared heap walk begin");
+                    allocationOwnerId.IterateMatchingForModify(
+                        match, allocationVisitor);
+                    endpointOwnerId.IterateMatchingForModify(
+                        match, endpointVisitor);
+                    // (Don't visit the endpointPeer list; this gets erased
+                    // as part of walking the endpoint list.)
+                    Tracing.Log(Tracing.Audit, "Shared heap walk end");
+                }
+                catch(System.Exception) {
+                    Tracing.Log(Tracing.Warning, "Exception thrown in shared heap walker");
+                }
+            }
+        }
+
+        // requires alloc's owner locked
+        private unsafe bool Matches(SharedHeap.Allocation* alloc)
+        {
+            // TODO: using an integer id is only an approximate way to
+            // get the right process.  Is this the right design?
+            Process process = Process.GetProcessByID(
+                SharedHeap.Allocation.GetOwnerProcessId(alloc));
+            return process == null;
+        }
+
+        // requires alloc's owner unlocked
+        private unsafe void AllocationVisit(SharedHeap.Allocation* alloc)
+        {
+// TODO: support PAGING
+#if !PAGING
+            SharedHeap.CurrentProcessSharedHeap.Free(alloc, allocationOwnerId);
+#endif //PAGING
+        }
+
+        // requires alloc's owner unlocked
+        private unsafe void EndpointVisit(SharedHeap.Allocation* alloc)
+        {
+// TODO: support PAGING
+#if !PAGING
+            EndpointCore* epData = (EndpointCore*)
+                // Currently use unchecked access here, since the shared heap
+                // walker does not run in the same process as the data.
+                SharedHeap.Allocation.GetDataUnchecked(alloc);
+            if (!epData->Closed()) {
+                epData->Dispose();
+            }
+            EndpointCore.Free(alloc);
+#endif //PAGING
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/SmapInfo.cs b/base/Kernel/Singularity/SmapInfo.cs
new file mode 100644
index 0000000..1b7d5a6
--- /dev/null
+++ b/base/Kernel/Singularity/SmapInfo.cs
@@ -0,0 +1,59 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SmapInfo.sg
+//
+//  Note:
+//       Section 14 System Address Map Interfaces,
+//       ACPI revision 3.0, September 2, 2004
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity
+{
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct SMAPINFO
+    {
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint AddressTypeFree     = 1;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint AddressTypeReserved = 2;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint AddressTypeACPI     = 3;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint AddressTypeNVS      = 4;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint AddressTypeUnusable = 5;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint AddressTypeMax      = 5;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint ExtendedAttributeRangeEnabled = 1;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint ExtendedAttributeRangeNV      = 2;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal ulong      addr;
+        [AccessedByRuntime("referenced from c++")]
+        internal ulong      size;
+        [AccessedByRuntime("referenced from c++")]
+        internal uint       type;
+        [AccessedByRuntime("referenced from c++")]
+        internal uint       extendedAttributes;
+
+        internal enum AddressType : uint
+        {
+            Free     = AddressTypeFree,
+            Reserved = AddressTypeReserved,
+            ACPI     = AddressTypeACPI,
+            NVS      = AddressTypeNVS,
+            Unusable = AddressTypeUnusable,
+            Max      = AddressTypeMax
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/SystemClock.cs b/base/Kernel/Singularity/SystemClock.cs
new file mode 100644
index 0000000..efb1293
--- /dev/null
+++ b/base/Kernel/Singularity/SystemClock.cs
@@ -0,0 +1,110 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SystemClock.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Hal;
+
+namespace Microsoft.Singularity
+{
+    /// <remarks>
+    /// The system clock provides an interface to the clock device that
+    /// caters for the difference between the Clock and UTC.  The Clock time
+    /// is typically held in persistent storage and set by the user.  The
+    /// clock time is typically stored local time rather than UTC.
+    /// </remarks>
+    [CLSCompliant(false)]
+    public class SystemClock
+    {
+        private static HalClock clockDevice;
+        private static long rtcUtcOffset;
+
+        /// <summary>
+        /// Constructor.
+        /// <param name="device">Underlying clock device to use.</param>
+        /// <param name="rtcUtcDelta">The UTC offset of the Real-Time Clock
+        /// associated with the clock device. </param>
+        /// </summary>
+        [NoHeapAllocation]
+        public static void Initialize(HalClock device, long rtcUtcDelta)
+        {
+            clockDevice  = device;
+            rtcUtcOffset = rtcUtcDelta;
+        }
+
+        /// <summary>
+        /// Get the offset applied to the Real-Time Clock device.
+        /// </summary>
+        [NoHeapAllocation]
+        public static long GetRtcUtcOffset(long ticks)
+        {
+            return rtcUtcOffset;
+        }
+
+        /// <summary>
+        /// Set the offset applied to the Real-Time Clock device.
+        /// <param name="ticks">Offset in units of 100ns.</param>
+        /// <returns>true on success, false if offset is greater than 12 hours.
+        /// </returns>
+        /// </summary>
+        [NoHeapAllocation]
+        public static bool SetRtcUtcOffset(long ticks)
+        {
+            if (UtcOffsetValid(ticks) == false)
+                return false;
+            rtcUtcOffset = ticks;
+            return true;
+        }
+
+        public static DateTime GetUtcTime()
+        {
+            DateTime rtc = new DateTime(clockDevice.GetRtcTime());
+            return rtc.AddTicks(rtcUtcOffset);
+        }
+
+        public static void SetUtcTime(DateTime now)
+        {
+            DateTime utc = now.AddTicks(-rtcUtcOffset);
+            clockDevice.SetRtcTime(utc.Ticks);
+        }
+
+        /// <summary> Get the time elapsed since booting.  All
+        /// kernel timers and timing calculations should be
+        /// based on the time returned by this method to avoid
+        /// problems following <c>TimeZone</c> changes or time updates.
+        /// <returns>Time in units of 100ns. </returns>
+        /// </summary>
+        public static TimeSpan KernelUpTime
+        {
+            [NoHeapAllocation]
+            get {
+                return new TimeSpan(clockDevice.GetKernelTicks());
+            }
+        }
+
+        /// <summary> Get the time since booting in kernel ticks of 100ns.
+        /// </summary>
+        /*
+        [NoHeapAllocation]
+        public static long GetKernelTicks()
+        {
+            return clockDevice.GetKernelTicks();
+        }
+        */
+
+        [NoHeapAllocation]
+        private static bool UtcOffsetValid(long offset)
+        {
+            return (offset >= TimeSpan.TicksPerDay / 2 &&
+                    offset <= TimeSpan.TicksPerDay / 2);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Tracing.cs b/base/Kernel/Singularity/Tracing.cs
new file mode 100644
index 0000000..5dbbd0e
--- /dev/null
+++ b/base/Kernel/Singularity/Tracing.cs
@@ -0,0 +1,313 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:  Tracing.cs
+//
+//  Note:  Provides a simple tracing facility to allow for post-facto performance debugging.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity
+{
+    /// <remarks>
+    /// Provides a simple tracing facility.  Writes and displays log records of the form:
+    ///     long    cycleCounter; // GetCycleCounter() value
+    ///     ushort  recordType; // TracingType value
+    ///     ushort  byteCount; // Bytes of data in record including these 12 bytes
+    ///     [type-specific data]
+    ///
+    /// Records are aligned on 8-byte boundaries to make them easier to view in memory dumps.
+    ///
+    /// XXX Code needs to be implemented to allow buffers to be switched, particularly after calling DumpLogRecords()
+    /// </remarks>
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public class Tracing
+    {
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        public struct LogEntry
+        {
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public ulong    cycleCount;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  eip;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public ushort   cpuId;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public ushort   threadId;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public ushort   processId;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public ushort   tag;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public byte     severity;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public byte     strings;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public ushort   padding0;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public unsafe byte * text;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  arg0;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  arg1;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  arg2;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  arg3;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  arg4;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public UIntPtr  arg5;
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            public uint     padding1;
+        }
+
+        public const byte Fatal   = 0xe; // system crashed.
+        public const byte Error   = 0xc; // system will crash.
+        public const byte Warning = 0xa; // cause for immediate concern.
+        public const byte Notice  = 0x8; // might be cause for concern.
+        public const byte Trace   = 0x6; // may be of use in crash.
+        public const byte Audit   = 0x4; // impact on performance.
+        public const byte Debug   = 0x2; // used only for debugging.
+
+        [Flags]
+        public enum Strings
+        {
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            String0 =   0x01,
+            [AccessedByRuntime("referenced from Tracing.cpp")]
+            String1 =   0x02,
+            String2 =   0x04,
+            String3 =   0x08,
+            String4 =   0x10,
+            String5 =   0x20,
+            String6 =   0x40,
+            String7 =   0x80,
+        }
+
+        // Note: These fields are initialized by the code in Tracing.cpp.
+        //
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe byte *    txtBegin;
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe byte *    txtLimit;
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe byte *    txtHead;
+#endif
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe byte **   ptxtHead;
+
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe LogEntry *logBegin;
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe LogEntry *logLimit;
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe LogEntry *logHead;
+#endif
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe LogEntry **plogHead;
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        private static unsafe long *tscOffsets;
+#endif
+        //
+        // End Note.
+
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static extern void Initialize();
+
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static extern void Finalize();
+
+        [NoHeapAllocation]
+        public static unsafe void GetTracingHeaders(out LogEntry *_logBegin,
+                                                    out LogEntry *_logLimit,
+                                                    out LogEntry **_logHead,
+                                                    out byte *_txtBegin,
+                                                    out byte *_txtLimit,
+                                                    out byte **_txtHead)
+        {
+            _logBegin = logBegin;
+            _logLimit = logLimit;
+            _logHead = plogHead;
+
+            _txtBegin = txtBegin;
+            _txtLimit = txtLimit;
+            _txtHead = ptxtHead;
+        }
+
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        private static unsafe extern byte * AddText(byte *buffer, string arg);
+
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        private static unsafe extern LogEntry * CreateLog(byte severity,
+                                                          UIntPtr eip,
+                                                          int chars,
+                                                          out byte *text);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, sbyte * msg);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, sbyte * msg,
+                                             String arg0,
+                                             UIntPtr arg1);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, sbyte * msg,
+                                             String arg0,
+                                             UIntPtr arg1,
+                                             UIntPtr arg2);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             UIntPtr arg0);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             UIntPtr arg0, UIntPtr arg1);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             UIntPtr arg0, UIntPtr arg1, UIntPtr arg2);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             UIntPtr arg0, UIntPtr arg1, UIntPtr arg2,
+                                             UIntPtr arg3);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             UIntPtr arg0, UIntPtr arg1, UIntPtr arg2,
+                                             UIntPtr arg3, UIntPtr arg4);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             UIntPtr arg0, UIntPtr arg1, UIntPtr arg2,
+                                             UIntPtr arg3, UIntPtr arg4, UIntPtr arg5);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             string arg0);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             string arg0, UIntPtr arg1);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             string arg0, UIntPtr arg1, UIntPtr arg2);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             string arg0, UIntPtr arg1, UIntPtr arg2,
+                                             UIntPtr arg3);
+
+        [Conditional("TRACING")]
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static unsafe extern void Log(byte severity, string msg,
+                                             string arg0, string arg1);
+
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("output to header : defined in Tracing.cpp")]
+        [StackBound(64)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static extern void SetTscOffset(long tscOffset);
+#endif // SINGULARITY_KERNEL
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Processes/ProcessHandle.cs b/base/Kernel/Singularity/V1/Processes/ProcessHandle.cs
new file mode 100644
index 0000000..817dbb1
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Processes/ProcessHandle.cs
@@ -0,0 +1,709 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: ProcessHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Loader;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Security;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.X86;
+using Microsoft.Singularity.V1.Types;
+
+using InternalProcessState = System.Threading.ProcessState;
+using ExternalProcessState = Microsoft.Singularity.V1.Processes.ProcessState;
+
+namespace Microsoft.Singularity.V1.Processes
+{
+    public enum ProcessState {
+        Active,
+        Suspended,
+        Stopped,
+    }
+
+    //| <include path='docs/doc[@for="ProcessHandle"]/*' />
+    [CLSCompliant(false)]
+    public struct ProcessHandle
+    {
+        public readonly UIntPtr id;
+
+        public static readonly ProcessHandle Zero = new ProcessHandle();
+
+        internal ProcessHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            char *cmdName,
+            int cmdLength,
+            char *actionName,
+            int actionLength,
+            char *role,
+            int roleLength,
+            ProcessHandle *handle)
+        {
+            return Create(cmdName, cmdLength, actionName, actionLength,
+                role, roleLength, out *handle);
+        }
+
+        public static unsafe bool Create(char *cmdName,
+            int cmdLength,
+            char *actionName,
+            int actionLength,
+            char *role,
+            int roleLength,
+            out ProcessHandle handle) {
+
+            Kernel.Waypoint(550);
+
+            string mycmd = null;
+
+            if (cmdName != null && cmdLength > 0) {
+                mycmd = String.StringCTOR(cmdName, 0, cmdLength);
+            }
+            else {
+                //should never happen
+                DebugStub.Break();
+            }
+
+            string myrole = null;
+
+            if (role != null && roleLength > 0) {
+                myrole = String.StringCTOR(role, 0, roleLength);
+            }
+
+            string myaction = null;
+
+            if (actionName != null && actionLength > 0) {
+                myaction = String.StringCTOR(actionName, 0, actionLength);
+            }
+
+            Kernel.Waypoint(551);
+
+            //
+            // Find image to run.
+            //
+            Manifest appManifest;
+            IoMemory image = Binder.LoadImage(Thread.CurrentProcess,
+                mycmd,
+                out appManifest);
+            Kernel.Waypoint(552);
+            if (image != null && image.Length > 0 && appManifest != null) {
+                //
+                // Check manifest to see what resources are needed
+                //
+
+                //
+                // Create a Managed process, and a handle in the current
+                // process to hold it.
+                //
+
+                // REVIEW create empty args array so that we
+                // do not need to change the process constructor;
+                String[] myargs;
+                if (myaction != null) {
+                    myargs = new String[2];
+                    myargs[1] = myaction;
+                }
+                else myargs = new String[1];
+                myargs[0] = mycmd;
+
+                Process process = new Process(Thread.CurrentProcess,
+                    image,
+                    myrole,
+                    myargs,
+                    appManifest);
+                //
+                // Check manifest to see what resources are needed
+                //
+
+                int epCount = appManifest.SetEndpoints(process, myaction);
+#if VERBOSE
+                DebugStub.WriteLine("new process create: endpoints from manifest {0}",
+                                    __arglist( epCount));
+#endif
+
+                int boolCount, longCount, stringCount, stringArrayCount;
+                bool ok = appManifest.GetParameterCounts(myaction,
+                    out  boolCount,
+                    out  longCount,
+                    out  stringCount,
+                    out  stringArrayCount);
+
+
+                //DebugStub.WriteLine("ProcessHandle: args strings={0}, longs={1}, bools={2}",
+                //    __arglist(stringCount, longCount, boolCount));
+
+                process.SetBoolArgCount(boolCount);
+                process.SetLongArgCount(longCount);
+                process.SetStringArgCount(stringCount);
+                process.SetStringArrayArgCount(stringArrayCount);
+
+                handle = new ProcessHandle(
+                    Thread.CurrentProcess.AllocateHandle(process));
+                Tracing.Log(Tracing.Debug,
+                    "ProcessHandle.Create(out id={0:x8})",
+                    handle.id);
+                Kernel.Waypoint(553);
+                IoMemory.Release(image);
+                appManifest = null;
+                return true;
+            }
+
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Create() failed");
+            handle = new ProcessHandle();
+            Kernel.Waypoint(554);
+            return false;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            char *args,
+            int *argLengths,
+            int argCount,
+            char *role,
+            int roleLength,
+            int endpointCount,
+            ProcessHandle * handle)
+        {
+            return Create(args, argLengths, argCount, role, roleLength,
+                endpointCount, out *handle);
+        }
+
+        public static unsafe bool Create(char *args,
+                                         int *argLengths,
+                                         int argCount,
+                                         char *role,
+                                         int roleLength,
+                                         int endpointCount,
+                                         out ProcessHandle handle)
+        {
+            Kernel.Waypoint(550);
+
+            //
+            // Create a kernel String[] object populated with the argument
+            // values passed in from userland.
+            //
+            String[] arguments = new String[argCount];
+            int offset = 0;
+
+            for (int argument = 0; argument < argCount; argument++) {
+                arguments[argument] = String.StringCTOR(
+                    args, offset, argLengths[argument]);
+                offset += argLengths[argument];
+            }
+
+            string myrole = null;
+
+            if (role != null && roleLength > 0) {
+                myrole = String.StringCTOR(role, 0, roleLength);
+            }
+
+            Kernel.Waypoint(551);
+
+            // haryadi -- this is currently a hack-kind of hook
+            // if the app to be run is HelloMp then we intercept control
+            // and run our own MpLoad, the Ap processor will run the HelloMp
+            if (arguments.Length != 0 && arguments[0] == "hellomp") {
+
+                // IoMemory mpImage = Binder.HelloMpLoadImage();
+                IoMemory mpImage = Binder.LoadRawImage("/init/hellomp", "hellomp.x86");
+                IoMemory mpLoadedImage;
+
+                // mpLoadedImage should have physical address
+                PEImage mpPeImage =
+                    PEImage.HelloMpLoad(Thread.CurrentProcess,
+                                        mpImage, out mpLoadedImage);
+                UIntPtr mpEntryPoint = mpPeImage.GetEntryPoint(mpLoadedImage);
+
+                DebugStub.WriteLine
+                    ("HSG: Sending ApImage e.{0:x}",
+                     __arglist(mpEntryPoint));
+
+                // send IPI
+                bool iflag = Processor.DisableInterrupts();
+                MpExecution.PutIntrApImage(1, mpEntryPoint);
+                MpExecution.SendApImage(0,1);
+                Processor.RestoreInterrupts(iflag);
+
+                // uncomment this if want to run this on BSP
+                // Processor.MpCallEntryPoint(mpEntryPoint);
+
+                // return failure to Shell
+                handle = new ProcessHandle();
+                return false;
+            }
+
+            // haryadi -- intercept TestMpAbi
+            if (arguments.Length != 0 && arguments[0] == "testmpabi") {
+
+                IoMemory mpImage = Binder.LoadRawImage("/init/testmpabi", "testmpabi.x86");
+                IoMemory mpLoadedImage;
+
+                // mpLoadedImage should have physical address
+                bool isForMp = true;
+                PEImage mpPeImage =
+                    PEImage.Load(Thread.CurrentProcess,
+                                 mpImage, out mpLoadedImage, isForMp);
+                UIntPtr mpEntryPoint = mpPeImage.GetEntryPoint(mpLoadedImage);
+
+                // prepare IPI
+                // MpExecution.ApImage apImage = new MpExecution.ApImage();
+                // apImage.virtAddr = mpLoadedImage.VirtualAddress;
+                // apImage.phyAddr = mpLoadedImage.PhysicalAddress.Value;
+                // apImage.length = (UIntPtr)mpLoadedImage.Length;
+                // apImage.entryPoint = mpEntryPoint;
+
+                DebugStub.WriteLine
+                    ("HSG: Sending ApImage e.{0:x}",
+                     __arglist(mpEntryPoint));
+
+                // send IPI
+                bool iflag = Processor.DisableInterrupts();
+                MpExecution.PutIntrApImage(1, mpEntryPoint);
+                MpExecution.SendApImage(0,1);
+                Processor.RestoreInterrupts(iflag);
+
+                // uncomment this if want to run this on BSP
+                // Processor.MpCallEntryPoint(mpEntryPoint);
+
+                // return failure to Shell
+                handle = new ProcessHandle();
+                return false;
+            }
+
+
+            //
+            // Find image to run.
+            //
+            Manifest appManifest;
+            IoMemory image = Binder.LoadImage(Thread.CurrentProcess,
+                                              arguments[0],
+                                              out appManifest);
+            Kernel.Waypoint(552);
+            if (image != null && image.Length > 0 && appManifest != null) {
+                //
+                // Check manifest to see what resources are needed
+                //
+
+                //
+                // Create a Managed process, and a handle in the current
+                // process to hold it.
+                //
+                Process process = new Process(Thread.CurrentProcess,
+                                              image,
+                                              myrole,
+                                              arguments,
+                                              appManifest);
+
+                //
+                // Check manifest to see what resources are needed
+                //
+
+                int epCount = appManifest.SetEndpoints(process,null);
+#if VERBOSE
+                DebugStub.WriteLine("endpoints passed in={0},  endpoints from manifest {1}",
+                                    __arglist(endpointCount, epCount));
+#endif
+                if (epCount == 0) {
+                    process.SetEndpointCount(endpointCount);
+                }
+
+                int boolCount, longCount, stringCount, stringArrayCount;
+                bool ok = appManifest.GetParameterCounts(null,
+                                                         out  boolCount,
+                                                         out  longCount,
+                                                         out  stringCount,
+                                                         out  stringArrayCount);
+
+
+                //DebugStub.WriteLine("ProcessHandle: args strings={0}, longs={1}, bools={2}",
+                //    __arglist(stringCount, longCount, boolCount));
+
+                process.SetBoolArgCount(boolCount);
+                process.SetLongArgCount(longCount);
+                process.SetStringArgCount(stringCount);
+                process.SetStringArrayArgCount(stringArrayCount);
+
+                handle = new ProcessHandle(
+                    Thread.CurrentProcess.AllocateHandle(process));
+                Tracing.Log(Tracing.Debug,
+                            "ProcessHandle.Create(out id={0:x8})",
+                            handle.id);
+                Kernel.Waypoint(553);
+                IoMemory.Release(image);
+                appManifest = null;
+                return true;
+            }
+
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Create() failed");
+            handle = new ProcessHandle();
+            Kernel.Waypoint(554);
+            return false;
+        }
+
+        /// <summary>
+        /// Given 2 system types generate and initialize the two endpoints of
+        /// a channel. The imp side will be set in the processes startup endpoint array
+        /// at position "index". The exp side will be bound to a service based on global policy
+        /// </summary>
+        [ExternalEntryPoint]
+        public  static unsafe bool BindToService(
+                                      ProcessHandle handle,
+                                      SystemType impType,
+                                      SystemType  expType,
+                                      char *contractChars,
+                                      int contractLen,
+                                      int startState,
+                                      int index)
+        {
+            //convert contract to string
+            if (contractLen == 0 ) return false;
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            string contract = String.StringCTOR(contractChars, 0, contractLen);
+            if (contract == null) return false;
+
+            return Binder.BindToService(process,
+                                impType,
+                                expType,
+                                contract,
+                                startState,
+                                index);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool SetStartupEndpoint(ProcessHandle handle,
+                                                     int index,
+                                                     SharedHeapService.Allocation * endpoint)
+        {
+            Tracing.Log(Tracing.Debug,
+                        "ProcessHandle.SetStartupEndpoint(id={0:x8}, ndx={1}, ep={2:x8})",
+                        handle.id, (UIntPtr)index, (UIntPtr)endpoint);
+
+            //
+            // Convert the handle to a process; set the endpoint.
+            //
+            SharedHeap.Allocation *ep = (SharedHeap.Allocation *)endpoint;
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.SetEndpoint(index, ref ep);
+        }
+
+        [ExternalEntryPoint]
+        public static void Dispose(ProcessHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Dispose(id={0:x8})",
+                        handle.id);
+
+            //
+            // Releasing the handle will allow the process to be
+            // garbage-collected.
+            //
+            Thread.CurrentProcess.ReleaseHandle(handle.id);
+        }
+
+        [ExternalEntryPoint]
+        public static bool Start(ProcessHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Start(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Start method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.Start();
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe void JoinImpl(ProcessHandle handle, bool * started)
+        {
+            Join(handle, out *started);
+        }
+
+        public static void Join(ProcessHandle handle, out bool started)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Join(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Join method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+
+            process.Join(out started);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool JoinImpl(
+            ProcessHandle handle,
+            TimeSpan timeout,
+            bool * started)
+        {
+            return Join(handle, timeout, out *started);
+        }
+
+        public static bool Join(ProcessHandle handle,
+                                TimeSpan timeout,
+                                out bool started)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Join(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Join method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            bool ret = process.Join(timeout, out started);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool JoinImpl(
+            ProcessHandle handle,
+            SchedulerTime stop,
+            bool * started)
+        {
+            return Join(handle, stop, out *started);
+        }
+
+        public static bool Join(ProcessHandle handle,
+                                SchedulerTime stop,
+                                out bool started)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Join(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Join method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            bool ret = process.Join(stop, out started);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Suspend(ProcessHandle handle, bool recursive)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Suspend(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Suspend method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.Suspend(recursive);
+        }
+
+        [ExternalEntryPoint]
+        public static bool Resume(ProcessHandle handle, bool recursive)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Resume(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Resume method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.Resume(recursive);
+        }
+
+        [ExternalEntryPoint]
+        public static void Stop(ProcessHandle handle, int exitcode)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.Stop(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; call Stop method.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            process.Stop(exitcode);
+        }
+
+        [ExternalEntryPoint]
+        public static void SuspendBarrier()
+        {
+            Process.SuspendBarrier();
+        }
+
+        [ExternalEntryPoint]
+        public static int GetProcessId(ProcessHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.GetProcessId(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; retrieve ProcessId.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+
+            return process.ProcessId;
+        }
+
+        [ExternalEntryPoint]
+        public static int GetExitCode(ProcessHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.GetExitCode(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a process; retrieve ExitCode.
+            //
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+
+            return process.ExitCode;
+        }
+
+        [ExternalEntryPoint]
+        public static PrincipalHandle GetPrincipalHandle(ProcessHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessHandle.GetPrincipalHandle(id={0:x8})", handle.id);
+
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return new PrincipalHandle(process.Principal.Val);
+        }
+
+        [ExternalEntryPoint]
+        public static ExternalProcessState GetState(ProcessHandle handle)
+        {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            switch (process.State) {
+            case InternalProcessState.Unstarted:
+            case InternalProcessState.Running:
+                return ExternalProcessState.Active;
+
+            case InternalProcessState.Suspending:
+            case InternalProcessState.SuspendingRecursive:
+            case InternalProcessState.Suspended:
+                return ExternalProcessState.Suspended;
+
+            case InternalProcessState.Stopping:
+            case InternalProcessState.Stopped:
+                return ExternalProcessState.Stopped;
+
+            default:
+                // handle new missing case
+                DebugStub.Break();
+                return ExternalProcessState.Stopped;
+            }
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe ParameterCode SetStartupStringArrayArg (
+                                         ProcessHandle handle,
+                                         int index,
+                                         char *args,
+                                         int *argLengths,
+                                         int argCount)
+        {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+
+            //
+            // Create a kernel String[] object populated with the argument
+            // values passed in from userland.
+            //
+            String[] arguments = new String[argCount];
+            int offset = 0;
+
+            for (int argument = 0; argument < argCount; argument++) {
+                arguments[argument] = String.StringCTOR(
+                    args, offset, argLengths[argument]);
+                offset += argLengths[argument];
+            }
+
+           return (ParameterCode) process.SetStartupStringArrayArg(index, arguments);
+        }
+#if false
+        [ExternalEntryPoint]
+        public static int GetStartupStringArgCount(ProcessHandle handle) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.GetStartupStringArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe int GetStartupStringArg(ProcessHandle handle, int arg, char * output, int maxput) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            string s = process.GetStartupStringArg(arg);
+            Tracing.Log(Tracing.Debug,
+                "Process.GetStartupStringArg(arg={0}, out={1:x8}, max={2}) = {3}",
+                (UIntPtr)unchecked((uint)arg),
+                (UIntPtr)output,
+                (UIntPtr)unchecked((uint)maxput),
+                (UIntPtr)unchecked((uint)(s != null ? s.Length : 0)));
+
+            if (s == null) {
+                return 0;
+            }
+            if (output == null) {
+                return s.Length + 1;
+            }
+            return s.InternalGetChars(output, maxput);
+        }
+#endif
+        [ExternalEntryPoint]
+        public static unsafe ParameterCode SetStartupStringArg(
+                ProcessHandle handle, int arg, char * input, int length)
+        {
+            string s;
+            if (length == 0) s = null;
+            else s = String.StringCTOR(input, 0, length);
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return (ParameterCode) process.SetStartupStringArg(arg, s);
+        }
+#if false
+        [ExternalEntryPoint]
+        public static int GetStartupLongArgCount(ProcessHandle handle) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.GetStartupLongArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static ParameterCode GetStartupLongArg(ProcessHandle handle, int index, out long value) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return (ParameterCode) process.GetStartupLongArg(index, out value);
+        }
+#endif
+        [ExternalEntryPoint]
+        public static ParameterCode SetStartupLongArg(ProcessHandle handle, int index, long value) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return (ParameterCode) process.SetStartupLongArg(index, value);
+        }
+#if false
+        [ExternalEntryPoint]
+        public static int GetStartupBoolArgCount(ProcessHandle handle) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return process.GetStartupBoolArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static ParameterCode GetStartupBoolArg(ProcessHandle handle, int index, out bool value) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return (ParameterCode)process.GetStartupBoolArg(index, out value);
+        }
+#endif
+        [ExternalEntryPoint]
+        public static ParameterCode SetStartupBoolArg(ProcessHandle handle, int index, bool value) {
+            Process process = HandleTable.GetHandle(handle.id) as Process;
+            return (ParameterCode) process.SetStartupBoolArg(index, value);
+        }
+
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Security/PrincipalHandle.cs b/base/Kernel/Singularity/V1/Security/PrincipalHandle.cs
new file mode 100644
index 0000000..ab0d5a1
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Security/PrincipalHandle.cs
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: PrincipalId.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity.Security;
+
+namespace Microsoft.Singularity.V1.Security
+{
+    [CLSCompliant(false)]
+    public struct PrincipalHandle
+    {
+        public readonly ulong val;
+
+        internal PrincipalHandle(ulong val)
+        {
+            this.val = val;
+        }
+
+        [ExternalEntryPoint]
+        public static PrincipalHandle SelfPrincipalHandle()
+        {
+            return new PrincipalHandle(Thread.CurrentProcess.Principal.Val);
+        }
+
+        /* For the following routine, assume that the length of the output string
+           is nchars.  If nchars is larger than outNameLength, this routine returns
+           -nchars without touching outName.  Otherwise, the output string is copied
+           into outName, and nchars is returns. */
+        [ExternalEntryPoint]
+        public static unsafe int GetPrincipalNameImpl(PrincipalHandle handle,
+                                                  /*[out]*/ char *outName, int outNameLength)
+        {
+            Principal p = PrincipalImpl.MakePrincipal(handle.val);
+            string name = p.GetName();
+            if (name.Length > outNameLength)
+                return (-name.Length);
+            return name.InternalGetChars(outName, outNameLength);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe int ExpandAclIndirectionImpl(/*[in]*/ char *name, int nameLength,
+                                                  /*[out]*/ char *outText, int outTextLength)
+        {
+            if (name == null || nameLength == 0)
+                return 0;
+
+            string myname = String.StringCTOR(name, 0, nameLength);
+            string res = PrincipalImpl.ExpandAclIndirection(myname);
+            if (res == null || res.Length == 0)
+                return 0;
+            if (res.Length > outTextLength)
+                return (-res.Length);
+            return res.InternalGetChars(outText, outTextLength);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/ChannelService.cs b/base/Kernel/Singularity/V1/Services/ChannelService.cs
new file mode 100644
index 0000000..4cf870d
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/ChannelService.cs
@@ -0,0 +1,468 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI Implementation
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EndpointCore.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Security;
+using Microsoft.Singularity.V1.Threads;
+using Microsoft.Singularity.V1.Types;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    using Allocation = SharedHeapService.Allocation;
+    using EndpointCoreImplementation = Microsoft.Singularity.Channels.EndpointCore;
+
+    [CLSCompliant(false)]
+    public enum ChannelServiceEvent : ushort
+    {
+        TransferBlockOwnership = 1,
+        TransferContentOwnership = 2,
+    }
+
+    [CLSCompliant(false)]
+    unsafe public struct EndpointCore
+    {
+#if !PAGING
+        /// <summary>
+        /// Flag indicating that the endpoint is closed.
+        /// This gets set either by an explicit close, or when
+        /// the kernel determines that the endpoint is not reachable.
+        /// NOTE: A channel only goes away entirely, once both ends are closed!
+        /// </summary>
+        private volatile bool closed;
+
+        /// <summary>
+        /// The endpoint to which this endpoint is connected.
+        /// </summary>
+        private Allocation* /*EndpointCore* opt(ExHeap)*/ peer;
+
+        /// <summary>
+        /// Event on which sends are signaled to this endpoint.
+        /// The handle is owned by the kernel, since the endpoint can move.
+        /// The kernel deallocates the handle when the channel is deallocated.
+        /// NOTE: stays valid until the entire channel gets collected.
+        /// </summary>
+        private AutoResetEventHandle messageEvent;
+
+        /// <summary>
+        /// Event handle in case this endpoint is part of a collection
+        /// </summary>
+        private AutoResetEventHandle collectionEvent;
+
+        /// <summary>
+        /// Contains the process id of the process currently owning this end of the
+        /// channel.
+        /// </summary>
+        private int ownerProcessId;
+
+        /// <summary>
+        /// Contains the principal handle of the process currently owning this end of the
+        /// channel.
+        /// </summary>
+        private PrincipalHandle ownerPrincipalHandle;
+
+        /// <summary>
+        /// Contains the number of sends to this endpoint.
+        /// </summary>
+        private int receiveCount;
+
+        /// <summary>
+        /// Contains the channelId (positive on the EXP endpoint, negative on the imp endpoint)
+        /// </summary>
+        private int channelId;
+#else
+        internal EndpointTrusted* id;
+#endif //PAGING
+
+        /// <summary>
+        /// Used to allocate a channel endpoint. The size must be correctly computed by
+        /// the trusted caller (currently trusted code NewChannel)
+        /// </summary>
+        [ExternalEntryPoint]
+        public static Allocation* /*EndpointCore* opt(ExHeap)!*/
+        Allocate(uint size, SystemType st)
+        {
+            Allocation* ep = (Allocation*) SharedHeap.CurrentProcessSharedHeap.Allocate(
+                size, st.id, 0, SharedHeap.CurrentProcessSharedHeap.EndpointOwnerId);
+            if (ep == null) {
+                throw new ApplicationException("SharedHeap.Allocate returned null");
+            }
+            return ep;
+        }
+
+        /// <summary>
+        /// Closes this end of the channel and frees associated resources, EXCEPT the block
+        /// of memory for this endpoint. It must be released by the caller. Sing# does this
+        /// for the programmer.
+        /// Returns true for success, false for failure.
+        /// </summary>
+        [ExternalEntryPoint]
+        public static bool Dispose(ref EndpointCore endpoint)
+        {
+#if !PAGING
+            fixed (EndpointCore* ep = &endpoint) {
+                EndpointCoreImplementation* epimp = (EndpointCoreImplementation*)ep;
+                return epimp->Dispose();
+            }
+#else
+            try {
+                EndpointCoreImplementation ep = new EndpointCoreImplementation(endpoint.id);
+                EndpointCoreImplementation.Dispose(ref ep);
+                return true;
+            } catch(ApplicationException) {
+                return false;
+            }
+#endif //PAGING
+        }
+
+        /// <summary>
+        /// Deallocates this end of the channel. If other end is also
+        /// deallocated, the entire channel is deallocated.
+        /// </summary>
+        [ExternalEntryPoint]
+        public static void Free(Allocation* /* EndpointCore* opt(ExHeap) */ endpoint)
+        {
+            EndpointCoreImplementation.Free((SharedHeap.Allocation*)endpoint);
+        }
+
+        /// <summary>
+        /// Performs the initialization of the core part of each endpoint and cross links
+        /// them to form a channel.
+        /// </summary>
+        [ExternalEntryPoint]
+        public static void Connect(
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ imp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ exp)
+        {
+            EndpointCoreImplementation.Connect((SharedHeap.Allocation*)imp,
+                                               (SharedHeap.Allocation*)exp);
+        }
+
+        /// <summary>
+        /// Indicates if this endpoint is closed
+        /// </summary>
+#if !PAGING
+        [NoHeapAllocation]
+        public static bool Closed(ref EndpointCore ep)
+        {
+            return ep.closed;
+        }
+
+        [NoHeapAllocation]
+        public static bool PeerClosed(ref EndpointCore ep)
+        {
+            EndpointCore * peer = (EndpointCore*)SharedHeapService.GetData(ep.peer);
+            return peer->closed;
+        }
+#else
+        [ExternalEntryPoint]
+        public static bool Closed(ref EndpointCore ep) {
+            return new EndpointCoreImplementation(ep.id).Closed();
+        }
+        [ExternalEntryPoint]
+        public static bool PeerClosed(ref EndpointCore ep) {
+            return new EndpointCoreImplementation(ep.id).PeerClosed();
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// Set this end to closed
+        /// </summary>
+#if !PAGING
+        public static void Close(ref EndpointCore ep) {
+            ep.closed = true;
+        }
+#else
+        [ExternalEntryPoint]
+        public static void Close(ref EndpointCore ep) {
+            new EndpointCoreImplementation(ep.id).Close();
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// The endpoint to which this endpoint is connected.
+        /// </summary>
+#if !PAGING
+        public static Allocation* /*EndpointCore* opt(ExHeap) */ GetPeer(ref EndpointCore ep,
+                                                                         out bool marshall)
+        {
+            marshall = false;
+            return ep.peer;
+        }
+#else
+        [ExternalEntryPoint]
+        public static Allocation* /*EndpointCore* opt(ExHeap) */ GetPeer(ref EndpointCore ep,
+                                                                         out bool marshall)
+        {
+            return (Allocation*)new EndpointCoreImplementation(ep.id).Peer(out marshall);
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// The event to wait for messages on this endpoint. Used by Select.
+        /// </summary>
+#if !PAGING
+        public static SyncHandle GetWaitHandle(ref EndpointCore ep)
+        {
+            return ep.messageEvent;
+        }
+#else
+        [ExternalEntryPoint]
+        public static SyncHandle GetWaitHandle(ref EndpointCore ep) {
+            return new EndpointCoreImplementation(ep.id).GetWaitHandle();
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// Notify the owner of this endpoint that a message is ready.
+        /// Notifies the set owner if this endpoint is part of a set.
+        /// </summary>
+        [ExternalEntryPoint]
+        public static void NotifyPeer(ref EndpointCore endpoint) {
+#if !PAGING
+            fixed (EndpointCore* ep = &endpoint) {
+                EndpointCoreImplementation* epimp = (EndpointCoreImplementation*)ep;
+                epimp->NotifyPeer();
+            }
+#else
+            new EndpointCoreImplementation(endpoint.id).NotifyPeer();
+#endif //PAGING
+        }
+
+        /// <summary>
+        /// Wait for a message to arrive on this endpoint.
+        /// </summary>
+#if !PAGING
+        public static void Wait(ref EndpointCore ep) {
+          SyncHandle.WaitOne(ep.messageEvent);
+        }
+#else
+        [ExternalEntryPoint]
+        public static void Wait(ref EndpointCore ep) {
+          SyncHandle.WaitOne(GetWaitHandle(ref ep));
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// Transfer the given Allocation block to the target endpoint
+        /// </summary>
+#if !PAGING
+        [ExternalEntryPoint]
+        public static void TransferBlockOwnership(Allocation* ptr, ref EndpointCore target)
+        {
+            Monitoring.Log(Monitoring.Provider.ChannelService,
+                           (ushort)ChannelServiceEvent.TransferBlockOwnership, 0,
+                           (uint)target.channelId, (uint)target.ownerProcessId,
+                           0, 0, 0);
+            SharedHeapService.SetOwnerProcessId(ptr, target.ownerProcessId);
+#if CHANNEL_COUNT
+            EndpointCoreImplementation.IncreaseBytesSentCount((long)SharedHeapService.GetSize(ptr));
+#endif
+        }
+#else
+        [ExternalEntryPoint]
+        // TODO: change "ref EndpointCore" to "EndpointCore"
+        public static void TransferBlockOwnership(Allocation* ptr, ref EndpointCore target)
+        {
+            EndpointCoreImplementation ep = new EndpointCoreImplementation(target.id);
+            EndpointCoreImplementation.TransferBlockOwnership((SharedHeap.Allocation*)ptr, ref ep);
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// Transfer any contents that needs to be adjusted from the transferee to the target
+        /// endpoint. Currently, this means setting the ownerProcessId of the
+        /// transferee to that of the target.
+        /// </summary>
+#if !PAGING
+        [ExternalEntryPoint]
+        public static void TransferContentOwnership(
+           ref EndpointCore transferee,
+           ref EndpointCore target)
+        {
+            Monitoring.Log(Monitoring.Provider.ChannelService,
+                           (ushort)ChannelServiceEvent.TransferContentOwnership, 0,
+                           (uint)transferee.ownerProcessId,
+                           (uint)target.ownerProcessId,
+                           (uint)transferee.channelId,
+                           (uint)target.channelId,
+                           // Not allowed to look at target.peer. We don't own that!
+                           // (uint)((EndpointCore*)(SharedHeapService.GetData(target.peer)))->channelId);
+                           (uint)target.channelId);
+
+            transferee.ownerProcessId = target.ownerProcessId;
+            transferee.ownerPrincipalHandle = target.ownerPrincipalHandle;
+            // also fix up ownership of peer allocation
+            Allocation* transfereePeerAllocation = transferee.peer;
+            TransferBlockOwnership(transfereePeerAllocation, ref target);
+        }
+#else
+        [ExternalEntryPoint]
+        // TODO: change "ref EndpointCore" to "EndpointCore"
+        public static void TransferContentOwnership(
+           ref EndpointCore transferee,
+           ref EndpointCore target)
+        {
+            EndpointCoreImplementation ep1 = new EndpointCoreImplementation(transferee.id);
+            EndpointCoreImplementation ep2 = new EndpointCoreImplementation(target.id);
+            EndpointCoreImplementation.TransferContentOwnership(ref ep1, ref ep2);
+        }
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static int GetChannelID(ref EndpointCore ep)
+        {
+            return ep.channelId;
+        }
+#else
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static int GetChannelID(ref EndpointCore ep)
+        {
+            return new EndpointCoreImplementation(ep.id).ChannelId;
+        }
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static int GetOwnerProcessID(ref EndpointCore ep)
+        {
+            return ep.ownerProcessId;
+        }
+#else
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static int GetOwnerProcessID(ref EndpointCore ep)
+        {
+            return new EndpointCoreImplementation(ep.id).ProcessId;
+        }
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static int GetPeerProcessID(ref EndpointCore ep)
+        {
+            EndpointCore * peer = (EndpointCore*)SharedHeapService.GetData(ep.peer);
+            return peer->ownerProcessId;
+        }
+#else
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static int GetPeerProcessID(ref EndpointCore ep)
+        {
+            return new EndpointCoreImplementation(ep.id).PeerProcessId;
+        }
+#endif //PAGING
+
+        // It is unfortunate that PrincipalHandle and Principal are not
+        // compatible types.  They are only distinct because ABI types are disfavored
+        // for code that doesn't deal directly with the ABI.
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static PrincipalHandle GetPeerPrincipalHandle(ref EndpointCore ep)
+        {
+            EndpointCore * peer = (EndpointCore*)SharedHeapService.GetData(ep.peer);
+            return peer->ownerPrincipalHandle;
+        }
+#else
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static PrincipalHandle GetPeerPrincipalHandle(ref EndpointCore ep)
+        {
+            return new EndpointCoreImplementation(ep.id).PeerPrincipalHandle;
+        }
+#endif
+
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static PrincipalHandle GetOwnerPrincipalHandle(ref EndpointCore ep)
+        {
+            return ep.ownerPrincipalHandle;
+        }
+#else
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static PrincipalHandle GetOwnerPrincipalHandle(ref EndpointCore ep)
+        {
+            return new EndpointCoreImplementation(ep.id).OwnerPrincipalHandle;
+        }
+#endif //PAGING
+
+        /// <summary>
+        /// Instruct the selectable object to signal events on the given AutoResetEvent
+        /// rather than its normal event in order to aggregate signalling into a set.
+        /// A selectable object need only support being part of a single collection at
+        /// any point in time.
+        /// </summary>
+        [ExternalEntryPoint]
+        public static void LinkIntoCollection(ref EndpointCore ep, AutoResetEventHandle ev) {
+#if !PAGING
+            //          Debug.Assert(this.collectionEvent.id == UIntPtr.Zero);
+            ep.collectionEvent = ev;
+#else
+            new EndpointCoreImplementation(ep.id).LinkIntoCollection(ev);
+#endif
+            Tracing.Log(Tracing.Debug, "Ev:{0:x}", ev.id);
+        }
+
+        /// <summary>
+        /// Instruct the selectable object to stop signalling events on the given
+        /// AutoResetEvent.
+        /// </summary>
+        [ExternalEntryPoint]
+        public static void UnlinkFromCollection(ref EndpointCore ep, AutoResetEventHandle ev) {
+#if !PAGING
+            // Debug.Assert(this.collectionEvent.id != UIntPtr.Zero);
+            ep.collectionEvent = new AutoResetEventHandle();
+#else
+            new EndpointCoreImplementation(ep.id).UnlinkFromCollection(ev);
+#endif
+        }
+
+#if PAGING
+        [ExternalEntryPoint]
+        unsafe public static void MarshallMessage(ref EndpointCore ep,
+                                                  byte* basep, byte* source,
+                                                  int* tagAddress, int size)
+        {
+            Tracing.Log(Tracing.Debug,
+                        "source offset:{0:x} tagLoc offset:{1:x} size {2:x}",
+                        (uint)source-(uint)basep, (uint)tagAddress-(uint)basep,
+                        (uint)size);
+
+            new EndpointCoreImplementation(ep.id).BeginUpdate(basep, source, tagAddress, size);
+        }
+
+        [ExternalEntryPoint]
+        unsafe public static void MarshallPointer(ref EndpointCore ep,
+                                                  byte* basep, byte** target, SystemType type)
+        {
+
+            Tracing.Log(Tracing.Debug,
+                        "source offset:{0:x} type:{1}",
+                        (uint)target-(uint)basep, type.id);
+
+            new EndpointCoreImplementation(ep.id).MarshallPointer(basep, (void**)target, type);
+        }
+#endif
+
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/DebugService.cs b/base/Kernel/Singularity/V1/Services/DebugService.cs
new file mode 100644
index 0000000..30c809c
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/DebugService.cs
@@ -0,0 +1,197 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DebugService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct DebugService
+    {
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe void PrintBeginImpl(
+            char * * buffer,
+            int * length)
+        {
+            PrintBegin(out *buffer, out *length);
+        }
+
+        [CLSCompliant(false)]
+        public static unsafe void PrintBegin(out char * buffer, out int length)
+        {
+            DebugStub.PrintBegin(out buffer, out length);
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe void PrintComplete(char * buffer, int used)
+        {
+            DebugStub.PrintComplete(buffer, used);
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe void Print(char * buffer)
+        {
+            DebugStub.Print(buffer);
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe void Print(char * buffer, int length)
+        {
+            DebugStub.Print(buffer, length);
+        }
+
+        [ExternalEntryPoint]
+        public static void Print(bool value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [ExternalEntryPoint]
+        public static void Print(char value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [ExternalEntryPoint]
+        public static void Print(byte value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [ExternalEntryPoint]
+        public static void Print(int value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [CLSCompliant(false)]
+        [ExternalEntryPoint]
+        public static void Print(uint value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [ExternalEntryPoint]
+        public static void Print(long value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [CLSCompliant(false)]
+        [ExternalEntryPoint]
+        public static void Print(ulong value)
+        {
+            DebugStub.Print("{0}", __arglist(value));
+        }
+
+        [ExternalEntryPoint]
+        public static void Break()
+        {
+            Tracing.Log(Tracing.Warning, "DebugService.Break()");
+            DebugStub.Print("DebugService.Break()\n");
+            DebugStub.Break();
+        }
+
+        [ExternalEntryPoint]
+        public static void WalkStack()
+        {
+            Stacks.WalkStack(Processor.GetFramePointer());
+        }
+
+        [ExternalEntryPoint]
+        public static bool IsDebuggerPresent()
+        {
+            return DebugStub.IsDebuggerPresent();
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static ulong ReadPerfCounter(uint which)
+        {
+            switch (which) {
+                case 0: return DebugStub.perfCounter0;
+                case 1: return DebugStub.perfCounter1;
+                case 2: return DebugStub.perfCounter2;
+                case 3: return DebugStub.perfCounter3;
+                case 4: return DebugStub.perfCounter4;
+                case 5: return DebugStub.perfCounter5;
+                case 6: return DebugStub.perfCounter6;
+                case 7: return DebugStub.perfCounter7;
+                case 8: return DebugStub.perfCounter8;
+                case 9: return DebugStub.perfCounter9;
+                case 10: return DebugStub.perfCounter10;
+                case 11: return DebugStub.perfCounter11;
+                case 12: return DebugStub.perfCounter12;
+                case 13: return DebugStub.perfCounter13;
+                case 14: return DebugStub.perfCounter14;
+                case 15: return DebugStub.perfCounter15;
+                default: return 0;
+            }
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static bool WritePerfCounter(uint which, ulong value)
+        {
+            switch (which) {
+                case 0: DebugStub.perfCounter0 = value; return true;
+                case 1: DebugStub.perfCounter1 = value; return true;
+                case 2: DebugStub.perfCounter2 = value; return true;
+                case 3: DebugStub.perfCounter3 = value; return true;
+                case 4: DebugStub.perfCounter4 = value; return true;
+                case 5: DebugStub.perfCounter5 = value; return true;
+                case 6: DebugStub.perfCounter6 = value; return true;
+                case 7: DebugStub.perfCounter7 = value; return true;
+                case 8: DebugStub.perfCounter8 = value; return true;
+                case 9: DebugStub.perfCounter9 = value; return true;
+                case 10: DebugStub.perfCounter10 = value; return true;
+                case 11: DebugStub.perfCounter11 = value; return true;
+                case 12: DebugStub.perfCounter12 = value; return true;
+                case 13: DebugStub.perfCounter13 = value; return true;
+                case 14: DebugStub.perfCounter14 = value; return true;
+                case 15: DebugStub.perfCounter15 = value; return true;
+                default: return false;
+            }
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static bool AddToPerfCounter(uint which, ulong value)
+        {
+            switch (which) {
+                case 0: Interlocked.Add(ref DebugStub.perfCounter0, value); return true;
+                case 1: Interlocked.Add(ref DebugStub.perfCounter1, value); return true;
+                case 2: Interlocked.Add(ref DebugStub.perfCounter2, value); return true;
+                case 3: Interlocked.Add(ref DebugStub.perfCounter3, value); return true;
+                case 4: Interlocked.Add(ref DebugStub.perfCounter4, value); return true;
+                case 5: Interlocked.Add(ref DebugStub.perfCounter5, value); return true;
+                case 6: Interlocked.Add(ref DebugStub.perfCounter6, value); return true;
+                case 7: Interlocked.Add(ref DebugStub.perfCounter7, value); return true;
+                case 8: Interlocked.Add(ref DebugStub.perfCounter8, value); return true;
+                case 9: Interlocked.Add(ref DebugStub.perfCounter9, value); return true;
+                case 10: Interlocked.Add(ref DebugStub.perfCounter10, value); return true;
+                case 11: Interlocked.Add(ref DebugStub.perfCounter11, value); return true;
+                case 12: Interlocked.Add(ref DebugStub.perfCounter12, value); return true;
+                case 13: Interlocked.Add(ref DebugStub.perfCounter13, value); return true;
+                case 14: Interlocked.Add(ref DebugStub.perfCounter14, value); return true;
+                case 15: Interlocked.Add(ref DebugStub.perfCounter15, value); return true;
+                default: return false;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/DeviceService.cs b/base/Kernel/Singularity/V1/Services/DeviceService.cs
new file mode 100644
index 0000000..e1fe751
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/DeviceService.cs
@@ -0,0 +1,506 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DeviceService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    [CLSCompliant(false)]
+    public struct DeviceService
+    {
+        [ExternalEntryPoint]
+        public static unsafe uint GetPnpSignature(int index, /*[out]*/ char * output, uint maxout)
+        {
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+
+            Tracing.Log(Tracing.Debug, "DeviceService.GetPnpSignature({0:x8}, {1})",
+                        (UIntPtr)output, maxout);
+            if (config == null || config.Ids == null || config.Ids.Length == 0) {
+                return 0;
+            }
+
+            if (index < 0)
+                return 0;
+            if (index >= config.Ids.Length)
+                return 0;
+            string id = config.Ids[index];
+
+            Tracing.Log(Tracing.Debug, "  {0}", config.ToString());
+            if (output == null) {
+                return (uint)id.Length + 1;
+            }
+            return (uint)id.InternalGetChars(output, (int)maxout);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetPciConfigImpl(
+            ushort * addrPort,
+            ushort * dataPort,
+            ushort * identifier)
+        {
+            return GetPciConfig(out *addrPort, out *dataPort, out *identifier);
+        }
+
+        public static bool GetPciConfig(out ushort addrPort,
+                                        out ushort dataPort,
+                                        out ushort identifier)
+        {
+            bool ret = false;
+
+
+            addrPort = 0;
+            dataPort = 0;
+            identifier = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+
+            PciConfig pci = config as PciConfig;
+            if (pci != null) {
+                addrPort = pci.AddressPort;
+                dataPort = pci.DataPort;
+                identifier = pci.Identifier;
+                ret = true;
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetPciConfig(out addr={0:x4}, out data={1:x4}, out id={2:x8})",
+                        addrPort, dataPort, identifier);
+            Tracing.Log(Tracing.Debug, "  {0}", config.ToString());
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static uint GetDynamicIoRangeCount()
+        {
+            uint ret = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null) {
+                ret = (uint)config.DynamicRanges.Length;
+            }
+
+            Tracing.Log(Tracing.Debug, "DeviceService.GetDynamicIoRangeCount() = {0}", ret);
+            Tracing.Log(Tracing.Debug, "  {0}", config.ToString());
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetDynamicIoPortRangeImpl(
+            uint range,
+            ushort * port,
+            ushort * size,
+            bool * readable,
+            bool * writable)
+        {
+            return GetDynamicIoPortRange(range, out *port, out *size,
+                out *readable, out *writable);
+        }
+
+        public static bool GetDynamicIoPortRange(uint range,
+                                                 out ushort port,
+                                                 out ushort size,
+                                                 out bool readable,
+                                                 out bool writable)
+        {
+            bool ret = false;
+
+            port = 0;
+            size = 0;
+            readable = false;
+            writable = false;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.DynamicRanges.Length > range) {
+                IoPortRange ipr = config.DynamicRanges[range] as IoPortRange;
+                if (ipr != null) {
+                    port = ipr.Port;
+                    size = ipr.Size;
+                    readable = ipr.Readable;
+                    writable = ipr.Writable;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetDynamicIoPortRange(range={0}, out port={1:x4}, out size={2})",
+                        range, port, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetDynamicIoMemoryRangeImpl(
+            uint range,
+            byte * * data,
+            uint * size,
+            bool * readable,
+            bool * writable)
+        {
+            return GetDynamicIoMemoryRange(range, out *data, out *size,
+                out *readable, out *writable);
+        }
+
+        public static unsafe bool GetDynamicIoMemoryRange(uint range,
+                                                          out byte * data,
+                                                          out uint size,
+                                                          out bool readable,
+                                                          out bool writable)
+        {
+            bool ret = false;
+
+            data = null;
+            size = 0;
+            readable = false;
+            writable = false;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.DynamicRanges.Length > range) {
+                IoMemoryRange imr = config.DynamicRanges[range] as IoMemoryRange;
+                if (imr != null) {
+                    data = (byte *)imr.PhysicalAddress.Value;
+                    size = (uint)imr.Length;
+                    readable = imr.Readable;
+                    writable = imr.Writable;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetDynamicIoMemoryRange(range={0}, out data={1:x8}, out size={2})",
+                        range, (UIntPtr)data, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static int GetIrqCount(byte irq)
+        {
+            int count = Processor.CurrentProcessor.GetIrqCount(irq);
+            Tracing.Log(Tracing.Debug,
+                "DeviceService.GetIrqCount(irq={0:x}, count={1:x8})",(UIntPtr) irq, (UIntPtr) count);
+            return count;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetDynamicIoIrqRangeImpl(
+            uint range,
+            byte * line,
+            byte * size)
+        {
+            return GetDynamicIoIrqRange(range, out *line, out *size);
+        }
+
+        public static bool GetDynamicIoIrqRange(uint range,
+                                                out byte line,
+                                                out byte size)
+        {
+            bool ret = false;
+
+            line = 0;
+            size = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.DynamicRanges.Length > range) {
+                IoIrqRange iir = config.DynamicRanges[range] as IoIrqRange;
+                if (iir != null) {
+                    line = iir.Line;
+                    size = iir.Size;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetDynamicIoIrqRange(range={0}, out line={1:x2}, out size={2:x2})",
+                        range, line, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetDynamicIoDmaRangeImpl(
+            uint range,
+            byte * channel,
+            byte * size)
+        {
+            return GetDynamicIoDmaRange(range, out *channel, out *size);
+        }
+
+        public static bool GetDynamicIoDmaRange(uint range,
+                                                out byte channel,
+                                                out byte size)
+        {
+            bool ret = false;
+
+            channel = 0;
+            size = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.DynamicRanges.Length > range) {
+                IoDmaRange idr = config.DynamicRanges[range] as IoDmaRange;
+                if (idr != null) {
+                    channel = idr.Channel;
+                    size = idr.Size;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetDynamicIoDmaRange(range={0}, out channel={1:x2}, out size={2:x2})",
+                        range, channel, size);
+
+            return ret;
+        }
+
+
+        [ExternalEntryPoint]
+        public static uint GetFixedIoRangeCount()
+        {
+            uint ret = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null) {
+                if (config.FixedRanges != null) {
+                    ret = (uint)config.FixedRanges.Length;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug, "DeviceService.GetFixedIoRangeCount() = {0}", ret);
+            Tracing.Log(Tracing.Debug, "  {0}", config.ToString());
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetFixedIoPortRangeImpl(
+            uint range,
+            ushort * port,
+            ushort * size,
+            bool * readable,
+            bool * writable)
+        {
+            return GetFixedIoPortRange(range, out *port, out *size,
+                out *readable, out *writable);
+        }
+
+        public static bool GetFixedIoPortRange(uint range,
+                                               out ushort port,
+                                               out ushort size,
+                                               out bool readable,
+                                               out bool writable)
+        {
+            bool ret = false;
+
+            port = 0;
+            size = 0;
+            readable = false;
+            writable = false;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.FixedRanges.Length > range) {
+                IoPortRange ipr = config.FixedRanges[range] as IoPortRange;
+                if (ipr != null) {
+                    port = ipr.Port;
+                    size = ipr.Size;
+                    readable = ipr.Readable;
+                    writable = ipr.Writable;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetFixedIoPortRange(range={0}, out port={1:x4}, out size={2})",
+                        range, port, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetFixedIoMemoryRangeImpl(
+            uint range,
+            byte * * data,
+            uint * size,
+            bool * readable,
+            bool * writable)
+        {
+            return GetFixedIoMemoryRange(range, out *data, out *size,
+                out *readable, out *writable);
+        }
+
+        public static unsafe bool GetFixedIoMemoryRange(uint range,
+                                                        out byte * data,
+                                                        out uint size,
+                                                        out bool readable,
+                                                        out bool writable)
+        {
+            bool ret = false;
+
+            data = null;
+            size = 0;
+            readable = false;
+            writable = false;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.FixedRanges.Length > range) {
+                IoMemoryRange imr = config.FixedRanges[range] as IoMemoryRange;
+                if (imr != null) {
+                    data = (byte *)imr.PhysicalAddress.Value;
+                    DebugStub.Assert(data != null);
+                    size = (uint)imr.Length;
+                    readable = imr.Readable;
+                    writable = imr.Writable;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetFixedIoMemoryRange(range={0}, out data={1:x8}, out size={2})",
+                        range, (UIntPtr)data, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetFixedIoIrqRangeImpl(
+            uint range,
+            byte * line,
+            byte * size)
+        {
+            return GetFixedIoIrqRange(range, out *line, out *size);
+        }
+
+        public static bool GetFixedIoIrqRange(uint range,
+                                              out byte line,
+                                              out byte size)
+        {
+            bool ret = false;
+
+            line = 0;
+            size = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.FixedRanges.Length > range) {
+                IoIrqRange iir = config.FixedRanges[range] as IoIrqRange;
+                if (iir != null) {
+                    line = iir.Line;
+                    size = iir.Size;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetFixedIoIrqRange(range={0}, out line={1:x2}, out size={2:x2})",
+                        range, line, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool GetFixedIoDmaRangeImpl(
+            uint range,
+            byte * channel,
+            byte * size)
+        {
+            return GetFixedIoDmaRange(range, out *channel, out *size);
+        }
+
+        public static bool GetFixedIoDmaRange(uint range,
+                                              out byte channel,
+                                              out byte size)
+        {
+            bool ret = false;
+
+            channel = 0;
+            size = 0;
+
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            if (config != null && config.FixedRanges.Length > range) {
+                IoDmaRange idr = config.FixedRanges[range] as IoDmaRange;
+                if (idr != null) {
+                    channel = idr.Channel;
+                    size = idr.Size;
+                    ret = true;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "DeviceService.GetFixedIoDmaRange(range={0}, out channel={1:x2}, out size={2:x2})",
+                        range, channel, size);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static UIntPtr MapPhysicalRange(UIntPtr physStart,
+                                               UIntPtr numBytes,
+                                               bool readable,
+                                               bool writable)
+        {
+            return MemoryManager.UserMapPhysicalMemory(
+                new PhysicalAddress(physStart), numBytes
+                );
+        }
+
+        [ExternalEntryPoint]
+        public static void UnmapPhysicalRange(UIntPtr startAddr,
+                                              UIntPtr limitAddr)
+        {
+            MemoryManager.UserUnmapPhysicalMemory(startAddr, limitAddr);
+        }
+
+        // Resolve a 32-bit virtual address (virtualAddr) to a
+        // 32-bit physical address (physAddr).  If the lookup
+        // succeeds, return true, and set physRemaining to be
+        // the number of bytes on physAddr's physical page whose
+        // address is greater than or equal to physAddr.  For
+        // example, if physAddr is the very last address on the
+        // page, physRemaining will be 1.  TODO: if needed, add
+        // some notion of pinned memory
+        [ExternalEntryPoint]
+        public static unsafe bool GetDmaPhysicalAddressImpl(
+            UIntPtr virtualAddr,
+            UIntPtr * physAddr,
+            UIntPtr * physRemaining)
+        {
+            return GetDmaPhysicalAddress(virtualAddr,
+                                         out *physAddr,
+                                         out *physRemaining);
+        }
+
+        private static bool GetDmaPhysicalAddress(UIntPtr     virtualAddr,
+                                                  out UIntPtr physAddr,
+                                                  out UIntPtr physRemaining)
+        {
+            UIntPtr alignedAddr = MemoryManager.PageAlign(virtualAddr);
+#if PAGING
+            PhysicalAddress phys = VMManager.GetPageMapping(alignedAddr);
+            if (phys != PhysicalAddress.Null) {
+                physAddr = (UIntPtr)phys.Value + (virtualAddr - alignedAddr);
+                physRemaining = MemoryManager.PagePad(physAddr + 1) - physAddr;
+                return true;
+            }
+#else
+            if (virtualAddr != UIntPtr.Zero) {
+                physAddr      = virtualAddr;
+                physRemaining = MemoryManager.PagePad(physAddr + 1) - physAddr;
+                return true;
+            }
+#endif // PAGING
+            physAddr      = UIntPtr.Zero;
+            physRemaining = UIntPtr.Zero;
+            return false;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/PageTableService.cs b/base/Kernel/Singularity/V1/Services/PageTableService.cs
new file mode 100644
index 0000000..05bd762
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/PageTableService.cs
@@ -0,0 +1,310 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PageTableService.cs
+//
+//  Note:
+//
+
+using System;
+using System.GCs;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using MemoryManager = Microsoft.Singularity.Memory.MemoryManager;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    [CLSCompliant(false)]
+    public struct PageTableService
+    {
+        [ExternalEntryPoint]
+        public static unsafe uint * GetPageTable()
+        {
+            uint * pageTable = MemoryManager.UserPageTable;
+
+            Tracing.Log(Tracing.Debug, "PageTableService.GetPageTable() = {0:x8}",
+                        (UIntPtr)pageTable);
+
+            return pageTable;
+        }
+
+#if UINTPTR_SUPPORT_IN_ABI
+        [ExternalEntryPoint]
+        public static UIntPtr GetPageCount()
+        {
+            UIntPtr count = MemoryManager.UserPageCount;
+
+            Tracing.Log(Tracing.Debug, "PageTableService.GetPageCount() = {0}",
+                        count);
+
+            return count;
+        }
+
+        [ExternalEntryPoint]
+        public static UIntPtr GetBaseAddress()
+        {
+            UIntPtr addr = MemoryManager.UserBaseAddr;
+
+            Tracing.Log(Tracing.Debug, "PageTableService.GetBaseAddress() = {0}",
+                        addr);
+
+            return addr;
+        }
+#endif
+
+        [ExternalEntryPoint]
+        public static uint GetProcessTag()
+        {
+            uint tag = Thread.CurrentProcess.ProcessTag;
+
+            Tracing.Log(Tracing.Debug, "PageTableService.GetProcessTag() = {0}",
+                        (UIntPtr)tag);
+
+            return tag;
+        }
+
+        [ExternalEntryPoint]
+        public static UIntPtr Allocate(UIntPtr bytes)
+        {
+            UIntPtr addr = MemoryManager.UserAllocate(
+                MemoryManager.PagesFromBytes(bytes),
+                Thread.CurrentProcess, 0, PageType.Unknown);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.Allocate(bytes={0} addr={1:x8}",
+                        bytes, addr);
+
+            return addr;
+        }
+
+        [ExternalEntryPoint]
+        public static UIntPtr AllocateIOMemory(UIntPtr limit,
+                                               UIntPtr bytes,
+                                               UIntPtr alignment)
+        {
+            UIntPtr addr = MemoryManager.AllocateIOMemory(
+                limit, bytes, alignment, Thread.CurrentProcess);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.AllocateIOMemory(limit={0:x}, bytes={1:x}, alignment={2:x}) addr= {3:x8}",
+                        limit, bytes, alignment, addr);
+
+            return addr;
+        }
+
+        [ExternalEntryPoint]
+        public static void FreeIOMemory(UIntPtr addr,
+                                        UIntPtr bytes)
+        {
+            Tracing.Log(Tracing.Debug, "PageTableService.FreeIOMemory(addr={0:x8}, bytes={1:x})",
+                        addr, bytes);
+
+            MemoryManager.FreeIOMemory(addr, bytes, Thread.CurrentProcess);
+        }
+
+        [ExternalEntryPoint]
+        public static UIntPtr AllocateExtend(UIntPtr addr,
+                                             UIntPtr bytes)
+        {
+            UIntPtr got = MemoryManager.UserExtend(
+                addr, MemoryManager.PagesFromBytes(bytes),
+                Thread.CurrentProcess, PageType.Unknown);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.AllocateExtend(addr={0:x}, bytes={1:x}) addr={2:x8}",
+                        addr, bytes, got);
+
+            return got;
+        }
+
+        [ExternalEntryPoint]
+        public static void Free(UIntPtr addr,
+                                UIntPtr bytes)
+        {
+            Tracing.Log(Tracing.Debug, "PageTableService.Free(addr={0:x8}, bytes={1:x})",
+                        addr, bytes);
+
+            // We always round up block allocations to the nearest page,
+            // so round up when freeing, too.
+            MemoryManager.UserFree(addr,
+                                   MemoryManager.PagesFromBytes(bytes),
+                                   Thread.CurrentProcess);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool QueryImpl(
+            UIntPtr queryAddr,
+            UIntPtr * regionAddr,
+            UIntPtr * regionSize)
+        {
+            return Query(queryAddr, out *regionAddr, out *regionSize);
+        }
+
+        public static bool Query(UIntPtr queryAddr,
+                                 out UIntPtr regionAddr,
+                                 out UIntPtr regionSize)
+        {
+            PageType type = MemoryManager.UserQuery(
+                queryAddr, out regionAddr, out regionSize);
+
+            bool used = (type != PageType.Unknown);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.Query(query={0:x8}, addr={1:x8}, size={2:x}) type={3}",
+                        queryAddr, regionAddr, regionSize, (uint)type);
+
+            return used;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe void GetUsageStatisticsImpl(
+            ulong * allocatedCount,
+            ulong * allocatedBytes,
+            ulong * freedCount,
+            ulong * freedBytes)
+        {
+            GetUsageStatistics(out *allocatedCount, out *allocatedBytes,
+                out *freedCount, out *freedBytes);
+        }
+
+        public static void GetUsageStatistics(out ulong allocatedCount,
+                                              out ulong allocatedBytes,
+                                              out ulong freedCount,
+                                              out ulong freedBytes)
+        {
+            MemoryManager.GetUserStatistics(
+                out allocatedCount,
+                out allocatedBytes,
+                out freedCount,
+                out freedBytes);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+#if !UINTPTR_SUPPORT_IN_ABI
+        [ExternalEntryPoint]
+        public static uint GetPageCount()
+        {
+            uint count = (uint)MemoryManager.UserPageCount;
+
+            Tracing.Log(Tracing.Debug, "PageTableService.GetPageCount() = {0:x8}",
+                        count);
+
+            return count;
+        }
+
+        [ExternalEntryPoint]
+        public static uint GetBaseAddress()
+        {
+            uint addr = (uint)MemoryManager.UserBaseAddr;
+
+            Tracing.Log(Tracing.Debug, "PageTableService.GetBaseAddress() = {0}",
+                        addr);
+
+            return addr;
+        }
+
+        [ExternalEntryPoint]
+        public static uint Allocate(uint bytes)
+        {
+            uint addr = (uint)MemoryManager.UserAllocate(
+                MemoryManager.PagesFromBytes(bytes),
+                Thread.CurrentProcess, 0, PageType.Unknown);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.Allocate(bytes={0} addr={1:x8}",
+                        bytes, addr);
+
+            return addr;
+        }
+
+        [ExternalEntryPoint]
+        public static uint AllocateIOMemory(uint limit,
+                                            uint bytes,
+                                            uint alignment)
+        {
+            uint addr = (uint)MemoryManager.AllocateIOMemory(
+                limit, bytes, alignment, Thread.CurrentProcess);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.AllocateIOMemory(limit={0:x}, bytes={1:x}, alignment={2:x}) addr= {3:x8}",
+                        limit, bytes, alignment, addr);
+
+            return addr;
+        }
+
+        [ExternalEntryPoint]
+        public static uint AllocateExtend(uint addr,
+                                          uint bytes)
+        {
+            uint got = (uint)MemoryManager.UserExtend(
+                addr, MemoryManager.PagesFromBytes(bytes),
+                Thread.CurrentProcess, PageType.Unknown);
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.AllocateExtend(addr={0:x}, bytes={1:x}) addr={2:x8}",
+                        addr, bytes, got);
+
+            return addr;
+        }
+
+        [ExternalEntryPoint]
+        public static void Free(uint addr,
+                                uint bytes)
+        {
+            Tracing.Log(Tracing.Debug, "PageTableService.Free(addr={0:x8}, bytes={1:x})",
+                        addr, bytes);
+
+            // We always round up block allocations to the nearest page,
+            // so round up when freeing, too.
+            MemoryManager.UserFree(addr,
+                                   MemoryManager.PagesFromBytes(bytes),
+                                   Thread.CurrentProcess);
+        }
+
+        [ExternalEntryPoint]
+        public static void FreeIOMemory(uint addr,
+                                        uint bytes)
+        {
+            Tracing.Log(Tracing.Debug, "PageTableService.FreeIOMemory(addr={0:x8}, bytes={1:x})",
+                        addr, bytes);
+
+            MemoryManager.FreeIOMemory(addr, bytes, Thread.CurrentProcess);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool QueryImpl(
+            uint queryAddr,
+            uint * regionAddr,
+            uint * regionSize)
+        {
+            return Query(queryAddr, out *regionAddr, out *regionSize);
+        }
+
+        public static bool Query(uint queryAddr,
+                                 out uint regionAddr,
+                                 out uint regionSize)
+        {
+            UIntPtr ra;
+            UIntPtr rs;
+
+            PageType type = MemoryManager.UserQuery(
+                queryAddr, out ra, out rs);
+
+            bool used = (type != PageType.Unknown);
+
+            regionAddr = (uint)ra;
+            regionSize = (uint)rs;
+
+            Tracing.Log(Tracing.Debug,
+                        "PageTableService.Query(query={0:x8}, addr={1:x8}, size={2:x}) type={3}",
+                        queryAddr, regionAddr, regionSize, (uint)type);
+
+            return used;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/ProcessService.cs b/base/Kernel/Singularity/V1/Services/ProcessService.cs
new file mode 100644
index 0000000..3a704f1
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/ProcessService.cs
@@ -0,0 +1,533 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcessService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.V1.Security;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    [CLSCompliant(false)]
+    public struct LogEntry
+    {
+    }
+
+    public enum  ParameterCode {
+        Success,
+        OutOfRange,
+        NotSet,
+        Retrieved,
+        Undefined,
+    }
+
+    [CLSCompliant(false)]
+    public struct ProcessService
+    {
+        // In order to pass the arguments to the kernel, we first need to
+        // flatten the arguments parameter from an array of strings to
+        // an array of characters (containing the contents of the strings).
+
+        // If argVector is null we compute the the length needed to store
+        // the result. It is up to the calling process to then allocate
+        // the memory and call again.
+        private static unsafe int FlattenStringArray(string[] arguments,
+                                                      int* argLengths,
+                                                      char* argVector
+                                                      )
+        {
+            int totalCharacters = 0;
+
+            int len = arguments.Length;
+            for (int arg = 0; arg < len; arg++) {
+                string argstring = arguments[arg];
+                if (argstring == null) continue;
+                totalCharacters += argstring.Length;
+            }
+
+            if (argVector == null ) {
+                return totalCharacters;
+            }
+
+            int offset = 0;
+            for (int arg = 0; arg < len; arg++) {
+                string argstring = arguments[arg];
+                if (argstring == null) {
+                    argLengths[arg] = 0;
+                    continue;
+                }
+                int alen = argstring.Length;
+                //argstring.CopyTo(0, argVector, offset, alen);
+                for (int i=0; i < alen; i++){
+                    argVector[offset+i] = argstring[i];
+                }
+                offset += alen;
+                argLengths[arg] = alen;
+            }
+           return totalCharacters;
+        }
+
+        [ExternalEntryPoint]
+        public static void Stop(int exitCode)
+        {
+            Tracing.Log(Tracing.Debug, "ProcessService.Stop(exit={0})",
+                        (UIntPtr)unchecked((uint)exitCode));
+
+            Thread.CurrentProcess.Stop(exitCode);
+        }
+
+        [ExternalEntryPoint]
+        public static TimeSpan GetUpTime()
+        {
+            TimeSpan ts = SystemClock.KernelUpTime;
+            return ts;
+        }
+
+        [ExternalEntryPoint]
+        public static DateTime GetUtcTime()
+        {
+            DateTime dt = SystemClock.GetUtcTime();
+            return dt;
+        }
+
+        [ExternalEntryPoint]
+        public static long GetCycleCount()
+        {
+            return (long)Processor.CycleCount;
+        }
+
+        [ExternalEntryPoint]
+        public static long GetCyclesPerSecond()
+        {
+            Kernel.Waypoint(300);
+            return (long)Processor.CyclesPerSecond;
+        }
+
+        [ExternalEntryPoint]
+        public static long GetContextSwitchCount()
+        {
+            return Processor.CurrentProcessor.NumContextSwitches;
+        }
+
+        [ExternalEntryPoint]
+        public static void SetGcPerformanceCounters(TimeSpan spent, long bytes)
+        {
+            Thread.CurrentProcess.SetGcPerformanceCounters(spent, bytes);
+        }
+
+        [ExternalEntryPoint]
+        public static long GetKernelGcCount()
+        {
+            int collectorCount;
+            long collectorMillis;
+            long collectorBytes;
+
+            GC.PerformanceCounters(out collectorCount,
+                                   out collectorMillis,
+                                   out collectorBytes);
+
+            return collectorCount;
+        }
+
+        [ExternalEntryPoint]
+        public static long GetKernelBootCount()
+        {
+            return Resources.GetWarmBootCount();
+        }
+
+        [ExternalEntryPoint]
+        public static long GetKernelInterruptCount()
+        {
+            return Processor.CurrentProcessor.NumInterrupts;
+        }
+
+        [ExternalEntryPoint]
+        public static ushort GetCurrentProcessId()
+        {
+            return (ushort)Thread.CurrentProcess.ProcessId;
+        }
+
+        /*
+          [ExternalEntryPoint]
+        public static PrincipalHandle GetCurrentPrincipal()
+        {
+            return new PrincipalHandle(Thread.CurrentProcess.PrincipalId.val);
+        }
+        */
+
+        [ExternalEntryPoint]
+        // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        public static unsafe SharedHeapService.Allocation * GetNamespaceEndpoint()
+        {
+            return (SharedHeapService.Allocation *)
+                Thread.CurrentProcess.GetNamespaceEndpoint();
+        }
+
+        [ExternalEntryPoint]
+        public static int GetStartupEndpointCount() {
+            return Thread.CurrentProcess.GetStartupEndpointCount();
+        }
+
+        [ExternalEntryPoint]
+        // Return parameter is really: ExtensionContract.Exp opt(ExHeap) *
+        public static unsafe SharedHeapService.Allocation * GetStartupEndpoint(int arg)
+        {
+            return (SharedHeapService.Allocation *)
+                Thread.CurrentProcess.GetStartupEndpoint(arg);
+        }
+
+        [ExternalEntryPoint]
+        // Parameter is really: ExtensionContract.Exp opt(ExHeap) *
+        public static unsafe void SetStartupEndpoint(int arg,
+                                                     SharedHeapService.Allocation * ep)
+        {
+            SharedHeap.Allocation * mep = (SharedHeap.Allocation *)ep;
+            Thread.CurrentProcess.SetEndpoint(arg, ref mep);
+        }
+
+        [ExternalEntryPoint]
+        public static int GetStartupArgCount()
+        {
+            return Thread.CurrentProcess.GetStartupArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe int GetStartupArg(int arg, char * output, int maxput)
+        {
+            string s = Thread.CurrentProcess.GetStartupArg(arg);
+            Tracing.Log(Tracing.Debug,
+                        "Process.GetStartupArg(arg={0}, out={1:x8}, max={2}) = {3}",
+                        (UIntPtr)unchecked((uint)arg),
+                        (UIntPtr)output,
+                        (UIntPtr)unchecked((uint)maxput),
+                        (UIntPtr)unchecked((uint)(s != null ? s.Length : 0)));
+
+            if (s == null) {
+                return 0;
+            }
+            if (output == null) {
+                return s.Length + 1;
+            }
+            return s.InternalGetChars(output, maxput);
+        }
+
+        [ExternalEntryPoint]
+        public static TimeSpan GetThreadTime() {
+            return Thread.CurrentThread.ExecutionTime;
+        }
+
+        [ExternalEntryPoint]
+        public static long GetThreadsCreatedCount() {
+            return PerfCounters.ThreadsCreated;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe void GetTracingHeadersImpl(
+            LogEntry **logBegin,
+            LogEntry **logLimit,
+            LogEntry ***logHead,
+            byte **txtBegin,
+            byte **txtLimit,
+            byte ***txtHead)
+        {
+            GetTracingHeaders(out *logBegin, out *logLimit, out *logHead,
+                out *txtBegin, out *txtLimit, out *txtHead);
+        }
+
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        public static unsafe void GetTracingHeaders(out LogEntry *logBegin,
+                                                    out LogEntry *logLimit,
+                                                    out LogEntry **logHead,
+                                                    out byte *txtBegin,
+                                                    out byte *txtLimit,
+                                                    out byte **txtHead)
+        {
+            Tracing.LogEntry *_logBegin;
+            Tracing.LogEntry *_logLimit;
+            Tracing.LogEntry **_logHead;
+
+            Tracing.GetTracingHeaders(out _logBegin, out _logLimit, out _logHead,
+                                      out txtBegin, out txtLimit, out txtHead);
+
+            logBegin = (LogEntry *)_logBegin;
+            logLimit = (LogEntry *)_logLimit;
+            logHead = (LogEntry **)_logHead;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe void GetMonitoringHeadersImpl(byte * * _buffer)
+        {
+            GetMonitoringHeaders(out *_buffer);
+        }
+
+        [AccessedByRuntime("referenced from Monitoring.cpp")]
+        public static unsafe void GetMonitoringHeaders(out byte * _buffer)
+        {
+            Monitoring.GetMonitoringHeaders(out _buffer);
+        }
+
+
+        [ExternalEntryPoint]
+        public static void Waypoint0()
+        {
+            Kernel.Waypoint0();
+        }
+
+        [ExternalEntryPoint]
+        public static void Waypoint(int num)
+        {
+            Kernel.Waypoint(num);
+        }
+
+        [ExternalEntryPoint]
+        public static void WaypointDone()
+        {
+            Kernel.WaypointDone();
+        }
+
+        [ExternalEntryPoint]
+        public static void WaypointDump()
+        {
+            Kernel.WaypointDump();
+        }
+
+        [ExternalEntryPoint]
+        public static int GetStartupBoolArgCount() {
+            return Thread.CurrentProcess.GetStartupBoolArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static int GetStartupLongArgCount() {
+            return Thread.CurrentProcess.GetStartupLongArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static int GetStartupStringArgCount() {
+            return Thread.CurrentProcess.GetStartupStringArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static int GetStartupStringArrayArgCount() {
+            return Thread.CurrentProcess.GetStartupStringArrayArgCount();
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe ParameterCode GetStartupLongArgImpl(
+            int index,
+            long * value)
+        {
+            return GetStartupLongArg(index, out *value);
+        }
+
+        public static ParameterCode GetStartupLongArg(int index, out long value) {
+            return (ParameterCode) Thread.CurrentProcess.GetStartupLongArg(index, out value);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe ParameterCode GetStartupBoolArgImpl(
+            int index,
+            bool * value)
+        {
+            return GetStartupBoolArg(index, out *value);
+        }
+
+        public static ParameterCode GetStartupBoolArg(int index, out bool value) {
+            return (ParameterCode)Thread.CurrentProcess.GetStartupBoolArg(index, out value);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe ParameterCode GetStartupStringArrayArgImpl(
+                                            int index,
+                                            char *strbuff,
+                                            int  *len,
+                                            int *arrayLength,
+                                            int *totalCharCount)
+        {
+            ParameterCode code;
+            string[] strings;
+            code = (ParameterCode) Thread.CurrentProcess.GetStartupStringArrayArg(index, out strings);
+            if (code != ParameterCode.Success) {
+                *arrayLength = 0;
+                *totalCharCount = 0;
+                return code;
+            }
+            if (strings == null) {
+                *arrayLength = 0;
+                *totalCharCount = 0;
+                return ParameterCode.NotSet;
+            }
+            *totalCharCount = FlattenStringArray(strings, len, strbuff);
+            *arrayLength = strings.Length;
+            return ParameterCode.Success;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe ParameterCode GetStartupStringArgImpl(
+            int arg,
+            char * output,
+            int * maxput)
+        {
+            return GetStartupStringArg(arg, output, ref *maxput);
+        }
+
+        public static unsafe ParameterCode GetStartupStringArg(int arg, char * output, ref int maxput)
+        {
+            string s;
+            ParameterCode code = (ParameterCode)Thread.CurrentProcess.GetStartupStringArg(arg, out s);
+            Tracing.Log(Tracing.Debug,
+                "Process.GetStartupStringArg(arg={0}, out={1:x8}, max={2}) = {3}",
+                (UIntPtr)unchecked((uint)arg),
+                (UIntPtr)output,
+                (UIntPtr)unchecked((uint)maxput),
+                (UIntPtr)unchecked((uint)(s != null ? s.Length : 0)));
+
+            if (code != ParameterCode.Success) {
+                return code;
+            }
+            if (output == null) {
+                if (s == null) maxput = 0;
+                else maxput = s.Length ;
+                return ParameterCode.Success;
+            }
+            if (s != null) s.InternalGetChars(output, maxput);
+            return ParameterCode.Success;
+        }
+
+
+        // haryadi -- interface to run ping pong from app
+        [ExternalEntryPoint]
+        public static int RunPingPongInt(int start)
+        {
+            return Processor.RunPingPongInt(start);
+        }
+
+        // haryadi
+        // Note: [NoHeapAllocation] is bad .. Since HelloProcessABI
+        // is called from Processor.DispatchSpecificInterrupt(), then
+        // every ABI should be annotated with [NoHeapAllocation]
+        // Probably, in the future when we already use the scheduler,
+        // instead of direct invocation during interrupt context, we
+        // don't need [NoHeapAllocation]
+        [ExternalEntryPoint]
+        [ NoHeapAllocation ]
+        public static int HelloProcessABI(int num, int num2)
+        {
+            DebugStub.WriteLine
+                ("HSG: ** cpu.{0} HelloProcessABI({1:x8},{2:x8})",
+                 __arglist(Processor.GetCurrentProcessorId(),
+                           num, num2));
+            // return the power of 2 of the value
+            return num+num2;
+        }
+
+
+
+        [ExternalEntryPoint]
+        [ NoHeapAllocation ]
+        public static unsafe ulong TestAbiCallOne(ulong a) {
+            DebugStub.WriteLine("HSG: ** TestAbiCallOne({0:x16})}",
+                                __arglist(a));
+            return 18000000000000000000 + a; // 64 bit
+        }
+
+
+        [ExternalEntryPoint]
+        [ NoHeapAllocation ]
+        public static unsafe int TestAbiCallTwo(uint a, char *b)
+        {
+            DebugStub.WriteLine("HSG: ** TestAbiCallTwo({0:x8}, {1:x8})}",
+                                __arglist((int)(a), (int)(b)));
+            return ((int)(b) + (int)a);
+        }
+
+        [ExternalEntryPoint]
+        [ NoHeapAllocation ]
+        public static unsafe char* TestAbiCallThree(int a, int *b, byte c)
+        {
+            DebugStub.WriteLine
+                ("HSG: ** TestAbiCallOne({0:x8}, {1:x8}, {2:x8})}",
+                 __arglist((int)(a), (int)(b), (int)(c)));
+
+            return (char*)((int)b + a + (int)c);
+        }
+
+
+
+#if FALSE
+        [ExternalEntryPoint]
+        public static int StubHelloProcessABI2(int num)
+        {
+
+            int ap  = Processor.GetCurrentProcessorId();
+            int bsp = 0;
+
+            DebugStub.WriteLine
+                ("\n\nHSG: ** cpu.{0} ProcessService.StubHelloProcessABI({1})",
+                 __arglist(ap, num));
+            DebugStub.WriteLine("HSG: ** -----------------------------------");
+
+            bool iflag = Processor.DisableInterrupts();
+
+            MpExecution.AbiCall abiCall = new MpExecution.AbiCall();
+
+            // 1) set up all the parameters
+            abiCall.argVal = num;
+
+            // prepare IPI
+            DebugStub.Print
+                ("HSG: ** cpu.{0} PutAbiCall(cpu.{1}, arg.{2}) --> ",
+                 __arglist(ap, bsp, abiCall.argVal));
+
+            // 2) register the abiCall,
+            //    after this, we get the position
+            int pos = MpExecution.PutAbiCall(bsp, abiCall);
+
+            DebugStub.WriteLine("pos.{0}", __arglist(pos));
+
+            DebugStub.WriteLine
+                ("HSG: ** cpu.{0} SendAbiCall(cpu.{1}, cpu.{2})",
+                 __arglist(ap, ap, bsp));
+
+            // 3) send
+            MpExecution.SendAbiCall(ap, bsp);
+
+            DebugStub.WriteLine
+                ("HSG: ** cpu.{0} WaitAbiCall(cpu.{1}, pos.{2}) ... zzz ... zzz ... ",
+                 __arglist(ap, bsp, pos));
+
+            // 4) spin until done
+            MpExecution.WaitAbiCall(bsp, pos, out abiCall);
+
+            // 5) we have the return value
+            int retval = abiCall.retVal;
+
+            DebugStub.WriteLine
+                ("HSG: ** cpu.{0} is waken up and receives retval.{1}",
+                 __arglist(ap, retval));
+
+            DebugStub.WriteLine
+                ("HSG: ** cpu.{0} ReleaseAbiCall(cpu.{1}, pos.{2})",
+                 __arglist(ap, bsp, pos));
+
+            // 6) release abiCall
+            MpExecution.ReleaseAbiCall(bsp, pos);
+
+            Processor.RestoreInterrupts(iflag);
+
+            return retval;
+            }
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/SharedHeapService.cs b/base/Kernel/Singularity/V1/Services/SharedHeapService.cs
new file mode 100644
index 0000000..42a9259
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/SharedHeapService.cs
@@ -0,0 +1,145 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SharedHeapService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Types;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    [CLSCompliant(false)]
+    public struct SharedHeapService
+    {
+        public struct Allocation {
+            // No fields visible to ABI callers.
+        }
+
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetData(Allocation *allocation)
+        {
+            return SharedHeap.Allocation.GetData(
+                (SharedHeap.Allocation *)allocation);
+        }
+
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetSize(Allocation *allocation)
+        {
+            return SharedHeap.Allocation.GetSize(
+                (SharedHeap.Allocation *)allocation);
+        }
+
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetType(Allocation *allocation)
+        {
+            return SharedHeap.Allocation.GetType(
+                (SharedHeap.Allocation *)allocation);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe Allocation *Allocate(UIntPtr size,
+                                                  SystemType type,
+                                                  uint alignment)
+        {
+            return (Allocation *)SharedHeap.CurrentProcessSharedHeap.Allocate(
+                size, type.id, alignment,
+                SharedHeap.CurrentProcessSharedHeap.DataOwnerId);
+        }
+
+        /// <returns>true if last reference was freed</returns>
+        [ExternalEntryPoint]
+        public static unsafe bool Free(Allocation *allocation)
+        {
+            return SharedHeap.CurrentProcessSharedHeap.Free(
+                                   (SharedHeap.Allocation *)allocation,
+                                   SharedHeap.CurrentProcessSharedHeap.DataOwnerId);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe Allocation *Share(Allocation *allocation,
+                                               UIntPtr startOffset,
+                                               UIntPtr endOffset)
+        {
+            return (Allocation *)SharedHeap.CurrentProcessSharedHeap.Share(
+                (SharedHeap.Allocation *)allocation,
+                SharedHeap.CurrentProcessSharedHeap.DataOwnerId,
+                startOffset,
+                endOffset);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe Allocation *Split(Allocation *allocation,
+                                               UIntPtr offset)
+        {
+            return (Allocation *)SharedHeap.CurrentProcessSharedHeap.Split(
+                (SharedHeap.Allocation *)allocation,
+                SharedHeap.CurrentProcessSharedHeap.DataOwnerId,
+                offset);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe void Truncate(Allocation *allocation,
+                                           UIntPtr newLength)
+        {
+            SharedHeap.CurrentProcessSharedHeap.Truncate(
+                (SharedHeap.Allocation *)allocation,
+                newLength
+                );
+        }
+
+        internal static unsafe void SetOwnerProcessId(
+            Allocation *allocation,
+            int newOwnerProcessId)
+        {
+            SharedHeap.Allocation.SetOwnerProcessId(
+                (SharedHeap.Allocation *)allocation,
+                newOwnerProcessId);
+        }
+
+        internal static unsafe void SetType(
+            Allocation *allocation,
+            UIntPtr type)
+        {
+            SharedHeap.Allocation.SetType(
+                (SharedHeap.Allocation *)allocation,
+                type);
+        }
+
+#if NOT_YET
+        [ExternalEntryPoint]
+        public static unsafe void TransferTo(
+            Allocation *allocation,
+            AllocationOwnerId newOwner)
+        {
+            return SharedHeap.TransferOwnership(
+                (SharedHeap.Allocation *)allocation,
+                SharedHeap.CurrentProcessSharedHeap.DataOwnerId,
+                newOwner);
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe void TransferFrom(
+            Allocation *allocation,
+            AllocationOwnerId oldOwner)
+        {
+            return SharedHeap.TransferOwnership(
+                (SharedHeap.Allocation *)allocation,
+                oldOwner,
+                SharedHeap.CurrentProcessSharedHeap.DataOwnerId);
+        }
+#endif
+
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Services/StackService.cs b/base/Kernel/Singularity/V1/Services/StackService.cs
new file mode 100644
index 0000000..2f0dbdc
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Services/StackService.cs
@@ -0,0 +1,83 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: StackService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.Memory;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct StackService
+    {
+        [ExternalEntryPoint]
+        public static void WalkStack()
+        {
+            Stacks.WalkStack(Processor.GetFramePointer());
+        }
+
+        [ExternalEntryPoint]
+        [NoHeapAllocation]
+        [CLSCompliant(false)]
+        public static unsafe void GetUsageStatisticsImpl(ulong *gets, ulong *returns)
+        {
+            GetUsageStatistics(out *gets, out *returns);
+        }
+
+        [NoHeapAllocation]
+        [CLSCompliant(false)]
+        public static void GetUsageStatistics(out ulong gets, out ulong returns)
+        {
+            gets = (ulong)Stacks.GetCount;
+            returns = (ulong)Stacks.ReturnCount;
+        }
+
+        [AccessedByRuntime("referenced from halstack.asm")]
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void LinkSharedStack();
+
+        [AccessedByRuntime("referenced from halstack.asm")]
+        [StackBound(64)]
+        [NoStackLinkCheck]
+        [NoStackOverflowCheck]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void UnlinkSharedStack();
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe UIntPtr LinkNewStackSegment(
+            UIntPtr size,
+            uint *arg2,
+            uint args,
+            UIntPtr esp,
+            UIntPtr begin,
+            UIntPtr limit)
+        {
+            Microsoft.Singularity.X86.ThreadContext* context = Processor.GetCurrentThreadContext();
+            return Microsoft.Singularity.Memory.Stacks.GetStackSegmentAndCopy(
+                size, ref *context, arg2, args, esp, begin, limit);
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        //[NoHeapAllocation]
+        public static unsafe void ReturnStackSegmentRaw(
+            UIntPtr begin,
+            UIntPtr limit)
+        {
+            Microsoft.Singularity.X86.ThreadContext* context = Processor.GetCurrentThreadContext();
+            Microsoft.Singularity.Memory.Stacks.ReturnStackSegmentRaw(
+                ref *context, begin, limit);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Stress/StressDirect.cs b/base/Kernel/Singularity/V1/Stress/StressDirect.cs
new file mode 100644
index 0000000..7420ee7
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Stress/StressDirect.cs
@@ -0,0 +1,28 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressDirect.cs
+//
+//  Note:
+//
+
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Memory;
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Stress
+{
+    [CLSCompliant(false)]
+    public struct StressDirect
+    {
+        [ExternalEntryPoint]
+        static public unsafe uint KPTest(SharedHeapService.Allocation* sharedArgs, int i)
+        {
+            return Microsoft.Singularity.Stress.StressDirect.KPTest((SharedHeap.Allocation*) sharedArgs, i);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/AutoResetEventHandle.cs b/base/Kernel/Singularity/V1/Threads/AutoResetEventHandle.cs
new file mode 100644
index 0000000..ae3dd06
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/AutoResetEventHandle.cs
@@ -0,0 +1,125 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AutoResetEventHandle.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    [CLSCompliant(false)]
+    public struct AutoResetEventHandle // : public SyncHandle
+    {
+        public readonly UIntPtr id; // could be moved to SyncHandle
+
+        public static readonly AutoResetEventHandle Zero = new AutoResetEventHandle();
+
+        internal AutoResetEventHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            bool initialState,
+            AutoResetEventHandle * handle)
+        {
+            return Create(initialState, out *handle);
+        }
+
+        public static bool Create(bool initialState,
+                                  out AutoResetEventHandle handle)
+        {
+            //
+            // Create a new auto-reset event, and a handle in the current
+            // process to hold it.
+            //
+            handle = new AutoResetEventHandle(
+                Thread.CurrentProcess.AllocateHandle(
+                    new AutoResetEvent(initialState)));
+
+            Tracing.Log(Tracing.Debug, "AutoResetEventHandle.Create(state=, out id={0:x8})",
+                        handle.id);
+            return true;
+        }
+
+        [ExternalEntryPoint]
+        public static void Dispose(AutoResetEventHandle handle)
+        {
+            Dispose(Thread.CurrentProcess, handle);
+        }
+
+        internal static void Dispose(Process process,
+                                     AutoResetEventHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "AutoResetEventHandle.Dispose(id={0:x8})",
+                        handle.id);
+            //
+            // Releasing the handle will allow the auto-reset event to be
+            // garbage-collected.
+            //
+            process.ReleaseHandle(handle.id);
+        }
+
+        [ExternalEntryPoint]
+        public static bool Reset(AutoResetEventHandle handle)
+        {
+            //
+            // Convert the handle to an auto-reset event; reset the event.
+            //
+            AutoResetEvent are = HandleTable.GetHandle(handle.id) as AutoResetEvent;
+            bool ret = are.Reset();
+
+            Tracing.Log(Tracing.Debug, "AutoResetEventHandle.Reset(id={0:x8})",
+                        handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Set(AutoResetEventHandle handle)
+        {
+            //
+            // Convert the handle to an auto-reset event; set the event.
+            //
+            AutoResetEvent are = HandleTable.GetHandle(handle.id) as AutoResetEvent;
+            bool ret = are.Set();
+
+            Tracing.Log(Tracing.Debug, "AutoResetEventHandle.Set(id={0:x8})",
+                        handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool SetAll(AutoResetEventHandle handle)
+        {
+            //
+            // Convert the handle to an auto-reset event; set the event.
+            //
+            AutoResetEvent are = HandleTable.GetHandle(handle.id) as AutoResetEvent;
+            bool ret = are.SetAll();
+
+            Tracing.Log(Tracing.Debug, "AutoResetEventHandle.SetAll(id={0:x8})",
+                        handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint(IgnoreCallerTransition=1)]
+        public static bool SetNoGC(AutoResetEventHandle handle) {
+            return Set(handle);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/ContainerHandle.cs b/base/Kernel/Singularity/V1/Threads/ContainerHandle.cs
new file mode 100644
index 0000000..465f257
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/ContainerHandle.cs
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ContainerHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    [CLSCompliant(false)]
+    public struct ContainerHandle
+    {
+        public readonly UIntPtr id;
+
+        public static readonly ContainerHandle Zero = new ContainerHandle();
+
+        internal ContainerHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(ContainerHandle * container)
+        {
+            return Create(out *container);
+        }
+
+        public static bool Create(out ContainerHandle container)
+        {
+            container = new ContainerHandle(Thread.CurrentProcess.AllocateHandle());
+
+            Tracing.Log(Tracing.Debug, "ContainerHandle.Create(out id={0:x8})",
+                        container.id);
+            return true;
+        }
+
+        [ExternalEntryPoint]
+        public static void Dispose(ContainerHandle container)
+        {
+            Tracing.Log(Tracing.Debug, "ContainerHandle.Dispose(id={0:x8})",
+                        container.id);
+
+            Thread.CurrentProcess.ReleaseHandle(container.id);
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/InterruptHandle.cs b/base/Kernel/Singularity/V1/Threads/InterruptHandle.cs
new file mode 100644
index 0000000..cff3175
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/InterruptHandle.cs
@@ -0,0 +1,150 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   InterruptHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    [CLSCompliant(false)]
+    public struct InterruptHandle // : public SyncHandle
+    {
+        public readonly UIntPtr id; // could be moved to SyncHandle
+
+        public static readonly InterruptHandle Zero = new InterruptHandle();
+
+        internal InterruptHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            byte irqNum,
+            InterruptHandle* handle)
+        {
+            return Create(irqNum, out *handle);
+        }
+
+        public static bool Create(byte irqNum,
+                                  out InterruptHandle handle)
+        {
+            bool ret = false;
+            handle = new InterruptHandle();
+
+            //
+            // Create an IoIrq, and a handle in the current process to hold it.
+            //
+            IoConfig config = Thread.CurrentProcess.IoConfig;
+            for (int i = 0; i < config.DynamicRanges.Length; i++) {
+                IoIrqRange iir = config.DynamicRanges[i] as IoIrqRange;
+                if (iir != null && iir.Irq <= irqNum && irqNum < iir.Irq + iir.Size) {
+                    IoIrq irq = iir.IrqAtOffset((byte)(irqNum - iir.Irq));
+
+                    handle = new InterruptHandle(
+                        Thread.CurrentProcess.AllocateHandle(irq));
+                    irq.RegisterInterrupt();
+                    ret = true;
+                    break;
+                }
+            }
+
+            Tracing.Log(Tracing.Debug,
+                        "InterruptHandle.Create(irq={0:x2}, out id={0:x8})",
+                        irqNum, handle.id);
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Dispose(InterruptHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "InterruptHandle.Dispose(id={0:x8})",
+                        handle.id);
+
+            bool ret = false;
+            if (handle.id != UIntPtr.Zero)
+            {
+                //
+                // Releasing the handle will allow the IoIrq event to be
+                // garbage-collected.
+                //
+                IoIrq irq = HandleTable.GetHandle(handle.id) as IoIrq;
+                ret = irq.ReleaseInterrupt();
+                Thread.CurrentProcess.ReleaseHandle(handle.id);
+            }
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Wait(InterruptHandle handle)
+        {
+            if (handle.id == UIntPtr.Zero)
+            {
+                Tracing.Log(Tracing.Error,
+                            "InterruptHandle.Wait(id={0:x8}) on bad handle",
+                            handle.id);
+                return false;
+            }
+
+            //
+            // Convert the handle to a IoIrq and wait on it.
+            //
+            IoIrq irq = HandleTable.GetHandle(handle.id) as IoIrq;
+            bool ret = irq.WaitForInterrupt();
+
+            Tracing.Log(Tracing.Debug, "InterruptHandle.Wait(id={0:x8})", handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static void Pulse(InterruptHandle handle)
+        {
+            if (handle.id == UIntPtr.Zero)
+            {
+                Tracing.Log(Tracing.Error,
+                            "InterruptHandle.Wait(id={0:x8}) on bad handle",
+                            handle.id);
+                return;
+            }
+            IoIrq irq = HandleTable.GetHandle(handle.id) as IoIrq;
+            irq.Pulse();
+            Tracing.Log(Tracing.Debug, "InterruptHandle.Pulse(id={0:x8})",
+                        handle.id);
+        }
+
+        [ExternalEntryPoint]
+        public static bool Ack(InterruptHandle handle)
+        {
+            if (handle.id == UIntPtr.Zero)
+            {
+                Tracing.Log(Tracing.Error,
+                            "InterruptHandle.Ack(id={0:x8}) on bad handle",
+                            handle.id);
+                return false;
+            }
+
+            //
+            // Convert the handle to an auto-reset event; set the event.
+            //
+            IoIrq irq = HandleTable.GetHandle(handle.id) as IoIrq;
+            bool ret = irq.AckInterrupt();
+
+            Tracing.Log(Tracing.Debug, "InterruptHandle.Ack(id={0:x8})", handle.id);
+            return ret;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/ManualResetEventHandle.cs b/base/Kernel/Singularity/V1/Threads/ManualResetEventHandle.cs
new file mode 100644
index 0000000..6db3e2a
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/ManualResetEventHandle.cs
@@ -0,0 +1,100 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ManualResetEventHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    [CLSCompliant(false)]
+    public struct ManualResetEventHandle // : public SyncHandle
+    {
+        public readonly UIntPtr id; // could be moved to SyncHandle
+
+        public static readonly ManualResetEventHandle Zero = new ManualResetEventHandle();
+
+        internal ManualResetEventHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            bool initialState,
+            ManualResetEventHandle * handle)
+        {
+            return Create(initialState, out *handle);
+        }
+
+        public static bool Create(bool initialState,
+                                  out ManualResetEventHandle handle)
+        {
+            //
+            // Create a new manual-reset event, and a handle in the current
+            // process to hold it.
+            //
+            handle = new ManualResetEventHandle(
+                Thread.CurrentProcess.AllocateHandle(
+                    new ManualResetEvent(initialState)));
+
+            Tracing.Log(Tracing.Debug, "ManualResetEventHandle.Create(state=, out id={0:x8})",
+                        handle.id);
+            return true;
+        }
+
+        [ExternalEntryPoint]
+        public static void Dispose(ManualResetEventHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ManualResetEventHandle.Dispose(id={0:x8})",
+                        handle.id);
+
+            //
+            // Releasing the handle will allow the manual-reset event to be
+            // garbage-collected.
+            //
+            Thread.CurrentProcess.ReleaseHandle(handle.id);
+        }
+
+        [ExternalEntryPoint]
+        public static bool Reset(ManualResetEventHandle handle)
+        {
+            //
+            // Convert the handle to a manual-reset event; reset the event.
+            //
+            ManualResetEvent mre = HandleTable.GetHandle(handle.id) as ManualResetEvent;
+            bool ret = mre.Reset();
+
+            Tracing.Log(Tracing.Debug, "ManualResetEventHandle.Reset(id={0:x8})",
+                        handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Set(ManualResetEventHandle handle)
+        {
+            //
+            // Convert the handle to a manual-reset event; set the event.
+            //
+            ManualResetEvent mre = HandleTable.GetHandle(handle.id) as ManualResetEvent;
+            bool ret = mre.Set();
+
+            Tracing.Log(Tracing.Debug, "ManualResetEventHandle.Set(id={0:x8})",
+                        handle.id);
+
+            return ret;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/MutexHandle.cs b/base/Kernel/Singularity/V1/Threads/MutexHandle.cs
new file mode 100644
index 0000000..16ffa19
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/MutexHandle.cs
@@ -0,0 +1,95 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MutexHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    [CLSCompliant(false)]
+    public struct MutexHandle // : public SyncHandle
+    {
+        public readonly UIntPtr id; // could be moved to SyncHandle
+
+        public static readonly MutexHandle Zero = new MutexHandle();
+
+        internal MutexHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            bool initiallyOwned,
+            MutexHandle * handle)
+        {
+            return Create(initiallyOwned, out *handle);
+        }
+
+        public static bool Create(bool initiallyOwned,
+                                  out MutexHandle handle)
+        {
+            //
+            // Create a new mutex, and a handle in the current process
+            // to hold it.
+            //
+            handle = new MutexHandle(Thread.CurrentProcess.AllocateHandle(
+                                         new Mutex(initiallyOwned)));
+
+            Tracing.Log(Tracing.Debug, "MutexHandle.Create(, out id={0:x8})",
+                        handle.id);
+            return true;
+        }
+
+        [ExternalEntryPoint]
+        public static void Dispose(MutexHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "MutexHandle.Dispose(id={0:x8})",
+                        handle.id);
+
+            //
+            // Releasing the handle will allow the mutex to be
+            // garbage-collected.
+            //
+            Thread.CurrentProcess.ReleaseHandle(handle.id);
+        }
+
+        [ExternalEntryPoint]
+        public static void Release(MutexHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "MutexHandle.Release(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a mutex; release the mutex.
+            //
+            Mutex mutex = HandleTable.GetHandle(handle.id) as Mutex;
+            mutex.ReleaseMutex();
+        }
+
+        [ExternalEntryPoint]
+        public static bool IsOwnedByCurrentThread(MutexHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "MutexHandle.IsOwnedByCurrentThread(id={0:x8})",
+                        handle.id);
+
+            //
+            // Convert the handle to a mutex; check the ownership of the mutex.
+            //
+            Mutex mutex = HandleTable.GetHandle(handle.id) as Mutex;
+            return mutex.IsOwnedByCurrentThread();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/SyncHandle.cs b/base/Kernel/Singularity/V1/Threads/SyncHandle.cs
new file mode 100644
index 0000000..d6d0c19
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/SyncHandle.cs
@@ -0,0 +1,188 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SyncHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    [CLSCompliant(false)]
+    public struct SyncHandle
+    {
+        public readonly UIntPtr id;
+
+        public static readonly SyncHandle Zero = new SyncHandle();
+
+        [Inline]
+        public static implicit operator SyncHandle(MutexHandle handle)
+        {
+            return new SyncHandle(handle.id);
+        }
+
+        [Inline]
+        public static implicit operator SyncHandle(AutoResetEventHandle handle)
+        {
+            return new SyncHandle(handle.id);
+        }
+
+        [Inline]
+        public static implicit operator SyncHandle(ManualResetEventHandle handle)
+        {
+            return new SyncHandle(handle.id);
+        }
+
+        internal SyncHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        // The following methods could be moved to WaitHandle if we had
+        // struct inheritance.
+        //
+        [ExternalEntryPoint]
+        public static bool WaitOne(SyncHandle handle)
+        {
+            //
+            // Convert the handle to a waitHandle; wait on the waitHandle.
+            //
+            WaitHandle waitHandle = HandleTable.GetHandle(handle.id) as WaitHandle;
+            bool ret = waitHandle.WaitOne(SchedulerTime.MaxValue);
+
+            Tracing.Log(Tracing.Debug, "SyncHandle.WaitOne(id={0:x8})", handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint(IgnoreCallerTransition=1)]
+        public static bool WaitOneNoGC(SyncHandle handle)
+        {
+            WaitHandle waitHandle =
+                HandleTable.GetHandle(handle.id) as WaitHandle;
+            bool ret = waitHandle.WaitOne(SchedulerTime.MaxValue);
+            Tracing.Log(Tracing.Debug, "SyncHandle.WaitOneNoGC(id={0:x8})",
+                        handle.id);
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool WaitOne(SyncHandle handle,
+                                   TimeSpan timeout)
+        {
+            //
+            // Convert the handle to a waitHandle; wait on the waitHandle.
+            //
+            WaitHandle waitHandle = HandleTable.GetHandle(handle.id) as WaitHandle;
+            bool ret = waitHandle.WaitOne(SchedulerTime.Now + timeout);
+
+            Tracing.Log(Tracing.Debug, "SyncHandle.WaitOne(id={0:x8}, time=)",
+                        handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool WaitOne(SyncHandle handle,
+                                   SchedulerTime stop)
+        {
+            //
+            // Convert the handle to a waitHandle; wait on the waitHandle.
+            //
+            WaitHandle waitHandle = HandleTable.GetHandle(handle.id) as WaitHandle;
+            bool ret = waitHandle.WaitOne(stop);
+
+            Tracing.Log(Tracing.Debug, "SyncHandle.WaitOne(id={0:x8}, stop=)",
+                        handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe int WaitAny(SyncHandle * handles,
+                                         int handleCount)
+        {
+            WaitHandle[] waits = Thread.CurrentThread.GetSyncHandles(handleCount);
+            for (int i = 0; i < handleCount; i++) {
+                waits[i] = HandleTable.GetHandle(handles[i].id) as WaitHandle;;
+            }
+
+            int ret = WaitHandle.WaitAny(waits, handleCount, SchedulerTime.MaxValue);
+
+            Tracing.Log(Tracing.Debug,
+                        "SyncHandle.WaitAny(handles={0:x8}, count={1}) = {2}",
+                        (UIntPtr)handles,
+                        (UIntPtr)unchecked((uint)handleCount),
+                        (UIntPtr)unchecked((uint)ret));
+
+            for (int i = 0; i < handleCount; i++) {
+                waits[i] = null;
+            }
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe int WaitAny(SyncHandle * handles,
+                                         int handleCount,
+                                         TimeSpan timeout)
+        {
+            WaitHandle[] waits = Thread.CurrentThread.GetSyncHandles(handleCount);
+            for (int i = 0; i < handleCount; i++) {
+                waits[i] = HandleTable.GetHandle(handles[i].id) as WaitHandle;;
+            }
+
+            int ret = WaitHandle.WaitAny(waits, handleCount,
+                                         SchedulerTime.Now + timeout);
+
+            Tracing.Log(Tracing.Debug,
+                        "SyncHandle.WaitAny(handles={0:x8}, count={1}, time=) = {2}",
+                        (UIntPtr)handles,
+                        (UIntPtr)unchecked((uint)handleCount),
+                        (UIntPtr)unchecked((uint)ret));
+
+            for (int i = 0; i < handleCount; i++) {
+                waits[i] = null;
+            }
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        public static unsafe int WaitAny(SyncHandle * handles,
+                                         int handleCount,
+                                         SchedulerTime stop)
+        {
+            WaitHandle[] waits = Thread.CurrentThread.GetSyncHandles(handleCount);
+            for (int i = 0; i < handleCount; i++) {
+                waits[i] = HandleTable.GetHandle(handles[i].id) as WaitHandle;;
+            }
+
+            int ret = WaitHandle.WaitAny(waits, handleCount, stop);
+
+            Tracing.Log(Tracing.Debug,
+                        "SyncHandle.WaitAny(handles={0:x8}, count={1}, stop=) = {2}",
+                        (UIntPtr)handles,
+                        (UIntPtr)unchecked((uint)handleCount),
+                        (UIntPtr)unchecked((uint)ret));
+
+            for (int i = 0; i < handleCount; i++) {
+                waits[i] = null;
+            }
+            return ret;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/ThreadHandle.cs b/base/Kernel/Singularity/V1/Threads/ThreadHandle.cs
new file mode 100644
index 0000000..95e6b8e
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/ThreadHandle.cs
@@ -0,0 +1,208 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    //| <include path='docs/doc[@for="ThreadHandle"]/*' />
+    [CLSCompliant(false)]
+    public struct ThreadHandle
+    {
+        public readonly UIntPtr id;
+
+        public static readonly ThreadHandle Zero = new ThreadHandle();
+
+        internal ThreadHandle(UIntPtr id)
+        {
+            this.id = id;
+        }
+
+        [ExternalEntryPoint]
+        public static unsafe bool CreateImpl(
+            int threadIndex,
+            ContainerHandle container,
+            ThreadHandle * handle,
+            UIntPtr * threadContext)
+        {
+            return Create(threadIndex, container, out *handle,
+                out *threadContext);
+        }
+
+        public static unsafe bool Create(int threadIndex,
+                                         ContainerHandle container,
+                                         out ThreadHandle handle,
+                                         out UIntPtr threadContext)
+        {
+            bool ret = Thread.CurrentProcess.CreateThread(threadIndex, out handle, out threadContext);
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Create(index={0}, cont={1:x8}) = {2:x8}",
+                        (UIntPtr)unchecked((uint)threadIndex), container.id, handle.id);
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static void Dispose(ThreadHandle handle)
+        {
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Dispose(id={0:x8})", handle.id);
+            Thread.CurrentProcess.ReleaseHandle(handle.id);
+        }
+
+        [ExternalEntryPoint]
+        public static void Start(ThreadHandle handle)
+        {
+            Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Start(id={0:x8})", handle.id);
+
+            thread.Start();
+        }
+
+        [ExternalEntryPoint]
+        public static ThreadState GetThreadState(ThreadHandle handle)
+        {
+            Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+            ThreadState state = (ThreadState)thread.ThreadState;
+
+            Tracing.Log(Tracing.Debug, "ThreadHandle.GetThreadState(id={0:x8}, out state={1})",
+                        handle.id, (UIntPtr)unchecked((uint)state));
+
+            return state;
+        }
+
+        [ExternalEntryPoint]
+        public static TimeSpan GetExecutionTime(ThreadHandle handle)
+        {
+            Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+            TimeSpan ts = thread.ExecutionTime;
+
+            Tracing.Log(Tracing.Debug, "ThreadHandle.GetExecutionTime(id={0:x8}, out time=)",
+                        handle.id);
+            return ts;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Join(ThreadHandle handle)
+        {
+            Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+
+            bool ret = true;
+            thread.Join();
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Join(id={0:x8})", handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Join(ThreadHandle handle, TimeSpan timeout)
+        {
+            Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+
+            bool ret = thread.Join(timeout);
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Join(id={0:x8}, time=)", handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool Join(ThreadHandle handle, SchedulerTime stop)
+        {
+            Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+
+            bool ret = thread.Join(stop);
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Join(id={0:x8}, stop=)", handle.id);
+
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static ThreadHandle CurrentThread()
+        {
+            Tracing.Log(Tracing.Debug, "ThreadHandle.CurrentThread()");
+            return Thread.CurrentThread.Handle;
+        }
+
+        [CLSCompliant(false)]
+        [ExternalEntryPoint]
+        public static UIntPtr GetThreadLocalValue()
+        {
+            return Thread.GetThreadLocalValue();
+        }
+
+        [CLSCompliant(false)]
+        [ExternalEntryPoint]
+        public static void SetThreadLocalValue(UIntPtr value)
+        {
+            Thread.SetThreadLocalValue(value);
+        }
+
+        [ExternalEntryPoint]
+        public static void Sleep(TimeSpan timeout)
+        {
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Sleep(time=)");
+
+            Thread.Sleep(timeout);
+        }
+
+        [ExternalEntryPoint]
+        public static void Sleep(SchedulerTime stop)
+        {
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Sleep(stop=)");
+
+            Thread.Sleep(stop);
+        }
+
+        [ExternalEntryPoint]
+        public static void Yield()
+        {
+            Tracing.Log(Tracing.Debug, "ThreadHandle.Yield()");
+
+            Thread.Yield();
+        }
+
+        [ExternalEntryPoint]
+        public static void SpinWait(int iterations)
+        {
+            Tracing.Log(Tracing.Debug, "ThreadHandle.SpinWait(iter={0})",
+                        (UIntPtr)unchecked((uint)iterations));
+
+            Thread.SpinWait(iterations);
+        }
+
+        //[ExternalEntryPoint]
+        //public static unsafe uint GetPrincipal(/*[out]*/ char *outprincipal, uint maxout)
+        //{
+        //    Tracing.Log(Tracing.Debug, "ThreadHandle.GetPrincipal (using CurrentThread)");
+
+        //    string name = Thread.CurrentThread.Process.Principal.Name;
+        //    if (outprincipal == null)
+        //        return (uint)name.Length;
+        //    return (uint)name.InternalGetChars(outprincipal, (int)maxout);
+        // }
+
+        //[ExternalEntryPoint]
+        //public static unsafe uint GetPrincipal(ThreadHandle handle, /*[out]*/ char *outprincipal, uint maxout)
+        //{
+        //    Tracing.Log(Tracing.Debug, "ThreadHandle.GetPrincipal (using a handle)");
+
+        //    Thread thread = HandleTable.GetHandle(handle.id) as Thread;
+        //    string name = thread.Process.Principal.Name;
+        //    if (outprincipal == null)
+        //        return (uint)name.Length;
+        //    return (uint)name.InternalGetChars(outprincipal, (int)maxout);
+        //}
+
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Threads/ThreadState.cs b/base/Kernel/Singularity/V1/Threads/ThreadState.cs
new file mode 100644
index 0000000..afa3ef8
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Threads/ThreadState.cs
@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadState.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="ThreadState"]/*' />
+    [Flags]
+    public enum ThreadState
+    {
+        Unstarted           = 0x00,
+        Running             = 0x01,
+        Blocked             = 0x02,
+        Suspended           = 0x04,
+        Stopped             = 0x08,
+    }
+}
diff --git a/base/Kernel/Singularity/V1/Types/SystemType.cs b/base/Kernel/Singularity/V1/Types/SystemType.cs
new file mode 100644
index 0000000..f73b467
--- /dev/null
+++ b/base/Kernel/Singularity/V1/Types/SystemType.cs
@@ -0,0 +1,129 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SystemType.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Types
+{
+    public struct SystemType
+    {
+        /// A handle to a RuntimeSystemType
+        internal readonly UIntPtr id;
+
+        internal SystemType(UIntPtr typeHandle) {
+            this.id = typeHandle;
+        }
+
+        [ExternalEntryPoint]
+        public static SystemType RootSystemType()
+        {
+            UIntPtr rootRuntimeSystemTypeHandle = RuntimeSystemType.GetRootHandle();
+
+            return new SystemType(rootRuntimeSystemTypeHandle);
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        unsafe public static SystemType Register(char* name,
+                                                 int   nameLength,
+                                                 long  lowerHash,
+                                                 long  upperHash,
+                                                 SystemType parent)
+        {
+            string sname = new String(name, 0, nameLength);
+            return Register(sname, lowerHash, upperHash, parent);
+        }
+         
+        /// Called from Binder which lives in a separate dll.
+        public static SystemType Register(string name,
+                                          long lowerHash,
+                                          long upperHash,
+                                          SystemType parent)
+        {
+            RuntimeSystemType parentrts = HandleTable.GetHandle(parent.id) as RuntimeSystemType;
+            /*
+            DebugStub.WriteLine("SystemType.Register '{0}' hash0={1:x8} hash1={2:x8}",
+                                __arglist(name, lowerHash, upperHash));
+            */
+            Tracing.Log(Tracing.Debug, "Type '{0}' (parent={1:x8})",
+                        name, parent.id);
+            Tracing.Log(Tracing.Debug, "hash0={0:x8} hash1={1:x8}",
+                        lowerHash.ToString(), upperHash.ToString());
+
+            UIntPtr childHandle = parentrts.LookupChildHandle(name, lowerHash, upperHash);
+            /*
+            DebugStub.WriteLine("SystemType.Register result {0:x8}",
+                                __arglist(childHandle));
+            */
+            Tracing.Log(Tracing.Debug, "result UIntPtr = {0:x8}", childHandle);
+
+            SystemType ret = new SystemType(childHandle);
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        public static bool IsSubtype(SystemType child,
+                                     SystemType parent)
+        {
+            return IsSubtype(child.id, parent.id);
+        }
+
+        private static bool IsSubtype(UIntPtr childHandle, UIntPtr parentHandle) 
+        {
+            if (childHandle == UIntPtr.Zero) return false;
+            if (parentHandle == UIntPtr.Zero) return false;
+
+            RuntimeSystemType childrts = HandleTable.GetHandle(childHandle) as RuntimeSystemType;
+
+            bool ret = childrts.IsSubtype(parentHandle);
+
+            if (ret) {
+                Tracing.Log(Tracing.Debug,
+                            "SystemType.IsSubtype(parent={0:x8}, child={1:x8}) = [true]",
+                            parentHandle, childHandle);
+            }
+            else {
+                Tracing.Log(Tracing.Debug,
+                            "SystemType.IsSubtype(parent={0:x8}, child={1:x8}) = [false]",
+                            parentHandle, childHandle);
+            }
+            return ret;
+        }
+
+        [ExternalEntryPoint]
+        [CLSCompliant(false)]
+        unsafe public static bool IsSubtype(SharedHeapService.Allocation* childData,
+                                            SystemType parent) 
+        {
+            UIntPtr childHandle = SharedHeapService.GetType(childData);
+            return IsSubtype(childHandle, parent.id);
+        }
+
+        [CLSCompliant(false)]
+        unsafe public static bool IsSubtype(SharedHeap.Allocation* childData,
+                                            SystemType parent) 
+        {
+            UIntPtr childHandle = SharedHeap.Allocation.GetType(childData);
+            return IsSubtype(childHandle, parent.id);
+        }
+
+        public static bool IsNull(SystemType st) { return st.id == UIntPtr.Zero; }
+
+        [CLSCompliant(false)]
+        public UIntPtr TypeId { get { return this.id; } }
+    }
+}
diff --git a/base/Kernel/Singularity/X86/CR0.cs b/base/Kernel/Singularity/X86/CR0.cs
new file mode 100644
index 0000000..cae413a
--- /dev/null
+++ b/base/Kernel/Singularity/X86/CR0.cs
@@ -0,0 +1,46 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CR0.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from asm file")]
+    internal struct CR0
+    {
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint PE      = 0x00000001;
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint MP      = 0x00000002;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const uint EM      = 0x00000004;
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint TS      = 0x00000008;
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint ET      = 0x00000010;
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint NE      = 0x00000020;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const uint WP      = 0x00010000;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const uint AM      = 0x00040000;
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint NW      = 0x20000000;
+        [AccessedByRuntime("referenced from asm file")] 
+        internal const uint CD      = 0x40000000;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const uint PG      = 0x80000000;
+    }
+}
+
diff --git a/base/Kernel/Singularity/X86/CR3.cs b/base/Kernel/Singularity/X86/CR3.cs
new file mode 100644
index 0000000..5c69fe4
--- /dev/null
+++ b/base/Kernel/Singularity/X86/CR3.cs
@@ -0,0 +1,28 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CR3.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("Unknown")]
+    internal struct CR3
+    {
+        [AccessedByRuntime("Unknown")] 
+        internal const uint PWT     = 0x00000008;
+        [AccessedByRuntime("Unknown")] 
+        internal const uint PCD     = 0x00000010;
+    }
+}
+
diff --git a/base/Kernel/Singularity/X86/CR4.cs b/base/Kernel/Singularity/X86/CR4.cs
new file mode 100644
index 0000000..54cd034
--- /dev/null
+++ b/base/Kernel/Singularity/X86/CR4.cs
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   CR4.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("Unknown")]
+    internal struct CR4
+    {
+        [AccessedByRuntime("Unknown")]
+        internal const uint VME     = 0x00000001;
+        [AccessedByRuntime("Unknown")]
+        internal const uint PVI     = 0x00000002;
+        [AccessedByRuntime("Unknown")]
+        internal const uint TSD     = 0x00000004;
+        [AccessedByRuntime("Unknown")]
+        internal const uint DE      = 0x00000008;
+        [AccessedByRuntime("Unknown")]
+        internal const uint PSE     = 0x00000010;
+        [AccessedByRuntime("Unknown")]
+        internal const uint PAE     = 0x00000020;
+        [AccessedByRuntime("Unknown")]
+        internal const uint MCE     = 0x00000040;
+        [AccessedByRuntime("Unknown")]
+        internal const uint PGE     = 0x00000080;
+        [AccessedByRuntime("Unknown")]
+        internal const uint PCE     = 0x00000100;       // Enable access to perf counters.
+        [AccessedByRuntime("Unknown")]
+        internal const uint OSFXSR  = 0x00000200;       // FXSAVE
+        [AccessedByRuntime("Unknown")]
+        internal const uint OSXMMEXCPT = 0x00000400;    // SSE
+    }
+}
diff --git a/base/Kernel/Singularity/X86/EFlags.cs b/base/Kernel/Singularity/X86/EFlags.cs
new file mode 100644
index 0000000..588fb9d
--- /dev/null
+++ b/base/Kernel/Singularity/X86/EFlags.cs
@@ -0,0 +1,69 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EFlags.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from C++")]
+    internal struct EFlags
+    {
+        // System flags in the EFLAGS register
+
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint CF     = 0x00000001;   // Carry
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint VF     = 0x00000002;   // Valid
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint PF     = 0x00000004;   // Parity
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint AF     = 0x00000010;   // Aux. Carry
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint ZF     = 0x00000040;   // Zero
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint SF     = 0x00000080;   // Sign
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint TF     = 0x00000100;   // Trap (SS)
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint IF     = 0x00000200;   // Interruptible
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint DF     = 0x00000400;   // Direction
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint OF     = 0x00000800;   // Overflow
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint IOPL   = 0x00003000;   // I/O Level
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint NT     = 0x00004000;   // Nested Task
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint RF     = 0x00010000;   // Resume
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint VM     = 0x00020000;   // Virtual-8086
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint AC     = 0x00040000;   // Alignment
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint VIF    = 0x00080000;   //
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint VIP    = 0x00100000;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint ID     = 0x00200000;
+    }
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from C++")]
+    internal struct EFlagsShift
+    {
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint IF = 9;
+    }
+}
diff --git a/base/Kernel/Singularity/X86/EVectors.cs b/base/Kernel/Singularity/X86/EVectors.cs
new file mode 100644
index 0000000..bdce1f2
--- /dev/null
+++ b/base/Kernel/Singularity/X86/EVectors.cs
@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EVectors.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from C++")]
+    internal struct EVectors
+    {
+        // Interrupt Vector Assignments
+        // 0..31 Intel defined
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint DivideError                 = 0;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint SingleStep                  = 1;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint Nmi                         = 2;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint Breakpoint                  = 3;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint OverflowException           = 4;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint BoundRangeException         = 5;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint IllegalInstruction          = 6;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint CoprocessorNotAvailable     = 7;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint DoubleFault                 = 8;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint CoprocessorSegmentOverrun   = 9;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint InvalidTss                  = 10;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint SegmentNotPresent           = 11;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint StackSegmentFault           = 12;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint GeneralProtectionFault      = 13;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint PageFault                   = 14;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint IntelReserved               = 14;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint FpuMathFault                = 16;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint AlignmentCheck              = 17;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint MachineCheck                = 18;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint SseMathFault                = 19;
+
+        // Reserved, but used by Singularity
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint FirstChanceException        = 29;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint SecondChanceException       = 30;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint DebuggerBreakRequest        = 31;
+
+        // 32..255 User defined
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint BaseUserException           = 32;
+
+        // haryadi defined
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint PingPongInt                 = 33;
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint ApImage                     = 34;
+
+        // haryadi: currently, this is 1 entry for 1 ABI.
+        // In the future, 1 entry should represents the whole ABI??
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint AbiCall                     = 35;
+
+        [AccessedByRuntime("referenced from C++")]
+        internal const uint HaltApProcessors            = 36;
+    }
+}
diff --git a/base/Kernel/Singularity/X86/Fpcw.cs b/base/Kernel/Singularity/X86/Fpcw.cs
new file mode 100644
index 0000000..734ba76
--- /dev/null
+++ b/base/Kernel/Singularity/X86/Fpcw.cs
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fpcw.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from asm file")]
+    internal struct Fpcw
+    {
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort RoundControlMask      = 0x0c00;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort PrecisionControlMask  = 0x0300;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort PrecisionMask         = 0x0020;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort UnderflowMask         = 0x0010;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort OverflowMask          = 0x0008;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort ZeroDivideMask        = 0x0004;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort DenormalOperandMask   = 0x0002;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort InvalidOperationMask  = 0x0001;
+
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort RoundChop             = 0x0c00;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort RoundUp               = 0x0800;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort RoundDown             = 0x0400;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort RoundNear             = 0x0000;
+
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort Precision24           = 0x0000;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort Precision53           = 0x0200;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort Precision64           = 0x0300;
+    }
+}
+
diff --git a/base/Kernel/Singularity/X86/Fpsw.cs b/base/Kernel/Singularity/X86/Fpsw.cs
new file mode 100644
index 0000000..6183147
--- /dev/null
+++ b/base/Kernel/Singularity/X86/Fpsw.cs
@@ -0,0 +1,54 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fpsw.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from asm file")]
+    internal struct Fpsw
+    {
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort Busy                  = 0x8000;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort C3                    = 0x4000;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort Top                   = 0x3800;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort C2                    = 0x0400;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort C1                    = 0x0200;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort C0                    = 0x0100;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort ErrorSummary          = 0x0080;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort StackFaultError       = 0x0040;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort PrecisionError        = 0x0020;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort UnderflowError        = 0x0010;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort OverflowError         = 0x0008;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort ZeroDivideError       = 0x0004;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort DenormalOperandError  = 0x0002;
+        [AccessedByRuntime("referenced from asm file")]
+        internal const ushort InvalidOperationError = 0x0001;
+
+        internal const ushort ErrorClearMask        = 0xb800;
+    }
+}
+
diff --git a/base/Kernel/Singularity/X86/Gdt.cs b/base/Kernel/Singularity/X86/Gdt.cs
new file mode 100644
index 0000000..d682c62
--- /dev/null
+++ b/base/Kernel/Singularity/X86/Gdt.cs
@@ -0,0 +1,122 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Gdt.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    // A lgdt pointer to the tables
+    //
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from c++")]
+    internal struct GDTP
+    {
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort     pad;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort     limit;
+        [AccessedByRuntime("referenced from c++")]
+        internal uint       addr;
+    };
+
+    /////////////////////////////////////////////// Segment Descriptor Tables.
+    //
+    // An entry in the Global Descriptor Table
+    //
+    [AccessedByRuntime("referenced from c++")]
+    [CLSCompliant(false)]
+    internal struct GDTE
+    {
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort     limit;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort     base0_15;
+        [AccessedByRuntime("referenced from c++")]
+        internal byte       base16_23;
+        [AccessedByRuntime("referenced from c++")]
+        internal byte       access;
+        [AccessedByRuntime("referenced from c++")]
+        internal byte       granularity;
+        [AccessedByRuntime("referenced from c++")]
+        internal byte       base24_31;
+
+        // granularity bits
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint PAGES       = 0x80;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint IS32BIT     = 0x40;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint IS64BIT    = 0x20;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint LIMIT20     = 0x0f;
+
+        // access bits
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint PRESENT     = 0x80;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint RING3       = 0x60;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint RING2       = 0x40;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint RING1       = 0x20;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint RING0       = 0x00;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint USER        = 0x10;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint CODE        = 0x08;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint CONFORMING  = 0x04;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint EXPANDDOWN  = 0x04; // Data
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint READABLE    = 0x02;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint WRITEABLE   = 0x02; // Data
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint ACCESSED    = 0x01;
+
+        // Non-user types:
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Tss16Free   = 0x01;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Ldt         = 0x02;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Tss16Busy   = 0x03;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint CallGate16  = 0x04;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint TaskGate    = 0x05;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint IntGate16   = 0x06;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint TrapGate16  = 0x07;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Reserved8   = 0x08;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Tss32Free   = 0x09;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Reserved10  = 0x0a;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Tss32Busy   = 0x0b;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint CallGate32  = 0x0c;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint Reserved13  = 0x0d;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint IntGate32   = 0x0e;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint TrapGate32  = 0x0f;
+    }
+}
+
diff --git a/base/Kernel/Singularity/X86/Idt.cs b/base/Kernel/Singularity/X86/Idt.cs
new file mode 100644
index 0000000..9d4f628
--- /dev/null
+++ b/base/Kernel/Singularity/X86/Idt.cs
@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Idt.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    // A lidt pointer to the tables
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from c++")]
+    internal struct IDTP
+    {
+        [AccessedByRuntime("referenced from c++")] 
+        internal ushort      pad;
+        [AccessedByRuntime("referenced from c++")] 
+        internal ushort      limit;
+        [AccessedByRuntime("referenced from c++")] 
+        internal uint        addr;
+    };
+
+    [CLSCompliant(false)]
+    [AccessedByRuntime("referenced from c++")]
+    internal struct IDTE
+    {
+        // An entry in the Interrupt Descriptor Table
+        [AccessedByRuntime("referenced from c++")] 
+        internal ushort     offset_0_15;
+        [AccessedByRuntime("referenced from c++")] 
+        internal ushort     selector;
+        [AccessedByRuntime("referenced from c++")] 
+        internal byte       zeros;
+        [AccessedByRuntime("referenced from c++")] 
+        internal byte       access;
+        [AccessedByRuntime("referenced from c++")] 
+        internal ushort     offset_16_31;
+
+        ///////////////////////////////////////// Interrupt Descriptor Tables.
+        //
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint PRESENT      = 0x80;
+        [AccessedByRuntime("referenced from c++")] 
+        internal const uint DPL_RING3    = 0x60;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint DPL_RING2    = 0x40;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint DPL_RING1    = 0x20;
+        [AccessedByRuntime("referenced from c++")] 
+        internal const uint DPL_RING0    = 0x00;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint TASK_GATE    = 0x05;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint CALL_GATE    = 0x0c;
+        [AccessedByRuntime("referenced from c++")] 
+        internal const uint INT_GATE     = 0x0e;
+        [AccessedByRuntime("referenced from c++")]
+        internal const uint TRAP_GATE    = 0x0f;
+    }
+}
diff --git a/base/Kernel/Singularity/X86/MmxContext.cs b/base/Kernel/Singularity/X86/MmxContext.cs
new file mode 100644
index 0000000..9afddd5
--- /dev/null
+++ b/base/Kernel/Singularity/X86/MmxContext.cs
@@ -0,0 +1,108 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MmxContext.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Sequential)]
+    [StructAlign(16)]
+    //[AccessedByRuntime("")]
+    internal struct UINT128
+    {
+        //[AccessedByRuntime("")] 
+        public ulong    lo;
+        //[AccessedByRuntime("")]
+        public ulong    hi;
+    }
+
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Sequential)]
+    [StructAlign(16)]
+    [AccessedByRuntime("referenced from c++")]
+    internal struct MmxContext
+    {
+        [AccessedByRuntime("referenced from c++")]
+        public ushort   fcw;
+        [AccessedByRuntime("referenced from c++")] 
+        public ushort   fsw;
+        [AccessedByRuntime("referenced from c++")]
+        public ushort   ftw;
+        [AccessedByRuntime("referenced from c++")]
+        public ushort   fop;
+        [AccessedByRuntime("referenced from c++")]
+        public uint     eip;
+        [AccessedByRuntime("referenced from c++")] 
+        public uint     cs;
+
+        [AccessedByRuntime("referenced from c++")]
+        public uint     dp;
+        [AccessedByRuntime("referenced from c++")] 
+        public uint     ds;
+        [AccessedByRuntime("referenced from c++")] 
+        public uint     mxcsr;
+        [AccessedByRuntime("referenced from c++")] 
+        public uint     mxcsrmask;
+
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  st0;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  st1;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  st2;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  st3;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  st4;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  st5;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  st6;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  st7;
+
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  xmm0;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  xmm1;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  xmm2;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  xmm3;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  xmm4;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  xmm5;
+        [AccessedByRuntime("referenced from c++")] 
+        public UINT128  xmm6;
+        [AccessedByRuntime("referenced from c++")]
+        public UINT128  xmm7;
+
+        public UINT128  reserved2;
+        public UINT128  reserved3;
+        public UINT128  reserved4;
+        public UINT128  reserved5;
+        public UINT128  reserved6;
+        public UINT128  reserved7;
+        public UINT128  reserved8;
+        public UINT128  reserved9;
+        public UINT128  reservedA;
+        public UINT128  reservedB;
+        public UINT128  reservedC;
+        public UINT128  reservedD;
+        public UINT128  reservedE;
+        public UINT128  reservedF;
+    }
+}
+
diff --git a/base/Kernel/Singularity/X86/Pdt.cs b/base/Kernel/Singularity/X86/Pdt.cs
new file mode 100644
index 0000000..27c2197
--- /dev/null
+++ b/base/Kernel/Singularity/X86/Pdt.cs
@@ -0,0 +1,405 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Pdt.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    ///
+    /// <remarks> PAE Paging Constants. </remarks>
+    ///
+    [CLSCompliant(false)]
+    [AccessedByRuntime("accessed from singldr.cpp")]
+    internal struct PE
+    {
+        // Bit masks
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong VALID        = 0x0000000000000001;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong WRITEABLE    = 0x0000000000000002;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong USER         = 0x0000000000000004;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong WRITETHROUGH = 0x0000000000000008;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong CACHEDISABLE = 0x0000000000000010;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong ACCESSED     = 0x0000000000000020;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong DIRTY        = 0x0000000000000040;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong PAT          = 0x0000000000000080;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong IS2MB        = 0x0000000000000080;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong GLOBAL       = 0x0000000000000100;
+        [AccessedByRuntime("accessed from singldr.cpp")]
+        internal const ulong NX           = 0x8000000000000000;
+
+        // Address mask for 4KB entries
+        internal const ulong ADDRMASK     = 0x000FFFFFFFFFF000;
+
+        // Address mask for 2MB entries
+        internal const ulong ADDRMASK_2MB = 0x000FFFFFFFF00000;
+    }
+
+    ///
+    /// <remarks> X86 PAE Page table entry. </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PTE {
+        private ulong val;
+
+        // These bits must not be set
+        private const ulong MBZ_MASK      = ~(PE.VALID | PE.WRITEABLE | PE.USER |
+                                              PE.WRITETHROUGH | PE.CACHEDISABLE |
+                                              PE.ACCESSED | PE.DIRTY | PE.PAT |
+                                              PE.GLOBAL | PE.ADDRMASK | PE.NX);
+        public bool Valid {
+            get { return (val & PE.VALID) != 0; }
+            set { val = value ? val | PE.VALID : val & (~PE.VALID); }
+        }
+
+        public bool Writeable {
+            get { return (val & PE.WRITEABLE) != 0; }
+            set { val = value ? val | PE.WRITEABLE : val & (~PE.WRITEABLE); }
+        }
+
+        public bool User {
+            get { return (val & PE.USER) != 0; }
+            set { val = value ? val | PE.USER : val & (~PE.USER); }
+        }
+
+        public bool WriteThrough {
+            get { return (val & PE.WRITETHROUGH) != 0; }
+            set { val = value ? val | PE.WRITETHROUGH : val & (~PE.WRITETHROUGH); }
+        }
+
+        public bool CacheDisable {
+            get { return (val & PE.CACHEDISABLE) != 0; }
+            set { val = value ? val | PE.CACHEDISABLE : val & (~PE.CACHEDISABLE); }
+        }
+
+        public bool Accessed {
+            get { return (val & PE.ACCESSED) != 0; }
+            set { val = value ? val | PE.ACCESSED : val & (~PE.ACCESSED); }
+        }
+
+        public bool Dirty {
+            get { return (val & PE.DIRTY) != 0; }
+            set { val = value ? val | PE.DIRTY : val & (~PE.DIRTY); }
+        }
+
+        public bool Global {
+            get { return (val & PE.GLOBAL) != 0; }
+            set { val = value ? val | PE.GLOBAL : val & (~PE.GLOBAL); }
+        }
+
+        public ulong Flags {
+            get { return val & ~PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & PE.ADDRMASK) == 0);
+                DebugStub.Assert((value & MBZ_MASK) == 0);
+                val |= value;
+            }
+        }
+
+        public ulong Address {
+            get { return val & PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & ~PE.ADDRMASK) == 0);
+                val = (val & ~(PE.ADDRMASK)) | (value & PE.ADDRMASK);
+            }
+        }
+
+        public void Init() {
+            val = 0;
+        }
+    };
+
+    ///
+    /// <remarks> X86 PAE Page table. </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PT {
+        private PTE entry/*[512] */;
+
+        public unsafe void Init() {
+            fixed (PTE* pEntry = &entry) {
+                PTE* pte = pEntry;
+
+                for (int i = 0; i < 512; i++) {
+                    pte->Init();
+                    pte++;
+                }
+            }
+        }
+
+        public unsafe PTE* this [ uint idx ]
+        {
+            get {
+                DebugStub.Assert(idx < 512);
+
+                fixed (PTE* pEntry = &entry) {
+                    return &pEntry[idx];
+                }
+            }
+        }
+    };
+
+    ///
+    /// <remarks> X86 PAE Page directory entry. </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PDE {
+        private ulong val;
+
+        private const ulong MBZ_MASK      = ~(PE.VALID | PE.WRITEABLE | PE.USER |
+                                              PE.WRITETHROUGH | PE.CACHEDISABLE |
+                                              PE.ACCESSED | PE.ADDRMASK | PE.NX);
+
+        public bool Valid {
+            get { return (val & PE.VALID) != 0; }
+            set { val = value ? val | PE.VALID : val & (~PE.VALID); }
+        }
+
+        public bool Writeable {
+            get { return (val & PE.WRITEABLE) != 0; }
+            set { val = value ? val | PE.WRITEABLE : val & (~PE.WRITEABLE); }
+        }
+
+        public bool User {
+            get { return (val & PE.USER) != 0; }
+            set { val = value ? val | PE.USER : val & (~PE.USER); }
+        }
+
+        public bool WriteThrough {
+            get { return (val & PE.WRITETHROUGH) != 0; }
+            set { val = value ? val | PE.WRITETHROUGH : val & (~PE.WRITETHROUGH); }
+        }
+
+        public bool CacheDisable {
+            get { return (val & PE.CACHEDISABLE) != 0; }
+            set { val = value ? val | PE.CACHEDISABLE : val & (~PE.CACHEDISABLE); }
+        }
+
+        public bool Accessed {
+            get { return (val & PE.ACCESSED) != 0; }
+            set { val = value ? val | PE.ACCESSED : val & (~PE.ACCESSED); }
+        }
+
+        public ulong Address {
+            get { return val & PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & ~PE.ADDRMASK) == 0);
+                val = (val & ~(PE.ADDRMASK)) | (value & PE.ADDRMASK);
+            }
+        }
+
+        public ulong Flags {
+            get { return val & ~PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & PE.ADDRMASK) == 0);
+                DebugStub.Assert((value & MBZ_MASK) == 0);
+                val |= value;
+            }
+        }
+
+        public void Init() {
+            val = 0;
+        }
+    };
+
+    ///
+    /// <remarks> X86 PAE 2MB Page directory entry </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PDE_2MB {
+        private ulong val;
+
+        private const ulong MBZ_MASK      = ~(PE.VALID | PE.WRITEABLE | PE.USER |
+                                              PE.WRITETHROUGH | PE.CACHEDISABLE |
+                                              PE.ACCESSED | PE.ADDRMASK | PE.NX);
+
+        public bool Valid {
+            get { return (val & PE.VALID) != 0; }
+            set { val = value ? val | PE.VALID : val & (~PE.VALID); }
+        }
+
+        public bool Writeable {
+            get { return (val & PE.WRITEABLE) != 0; }
+            set { val = value ? val | PE.WRITEABLE : val & (~PE.WRITEABLE); }
+        }
+
+        public bool User {
+            get { return (val & PE.USER) != 0; }
+            set { val = value ? val | PE.USER : val & (~PE.USER); }
+        }
+
+        public bool WriteThrough {
+            get { return (val & PE.WRITETHROUGH) != 0; }
+            set { val = value ? val | PE.WRITETHROUGH : val & (~PE.WRITETHROUGH); }
+        }
+
+        public bool CacheDisable {
+            get { return (val & PE.CACHEDISABLE) != 0; }
+            set { val = value ? val | PE.CACHEDISABLE : val & (~PE.CACHEDISABLE); }
+        }
+
+        public bool Accessed {
+            get { return (val & PE.ACCESSED) != 0; }
+            set { val = value ? val | PE.ACCESSED : val & (~PE.ACCESSED); }
+        }
+
+        public bool Dirty {
+            get { return (val & PE.DIRTY) != 0; }
+            set { val = value ? val | PE.DIRTY : val & (~PE.DIRTY); }
+        }
+
+        public bool Global {
+            get { return (val & PE.GLOBAL) != 0; }
+            set { val = value ? val | PE.GLOBAL : val & (~PE.GLOBAL); }
+        }
+
+        public ulong Address {
+            get { return val & PE.ADDRMASK_2MB; }
+            set {
+                DebugStub.Assert((value & ~PE.ADDRMASK_2MB) == 0);
+                val = (val & ~(PE.ADDRMASK_2MB)) | (value & PE.ADDRMASK_2MB);
+            }
+        }
+
+        public ulong Flags {
+            get { return val & ~PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & PE.ADDRMASK) == 0);
+                DebugStub.Assert((value & MBZ_MASK) == 0);
+                val |= value;
+            }
+        }
+
+        public void Init() {
+            // This bit is always set, obviously
+            val = PE.IS2MB;
+        }
+    };
+
+    ///
+    /// <remarks> X86 PAE Page directory table. </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PDT
+    {
+        private PDE entry/*[512] */;
+
+        public unsafe void Init() {
+            fixed (PDE* pEntry = &entry) {
+                PDE* pde = pEntry;
+
+                for (int i = 0; i < 512; i++) {
+                    pde->Init();
+                    pde++;
+                }
+            }
+        }
+
+        public unsafe PDE* this [ uint idx ]
+        {
+            get {
+                DebugStub.Assert(idx < 512);
+
+                fixed (PDE* pEntry = &entry) {
+                    return &pEntry[idx];
+                }
+            }
+        }
+    };
+
+    ///
+    /// <remarks> X86 PAE Page directory pointer entry. </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PDPE {
+        private ulong val;
+
+        private const ulong MBZ_MASK      = ~(PE.VALID | PE.WRITETHROUGH |
+                                              PE.CACHEDISABLE | PE.ADDRMASK);
+
+        public bool Valid {
+            get { return (val & PE.VALID) != 0; }
+            set { val = value ? val | PE.VALID : val & (~PE.VALID); }
+        }
+
+        public bool WriteThrough {
+            get { return (val & PE.WRITETHROUGH) != 0; }
+            set { val = value ? val | PE.WRITETHROUGH : val & (~PE.WRITETHROUGH); }
+        }
+
+        public bool CacheDisable {
+            get { return (val & PE.CACHEDISABLE) != 0; }
+            set { val = value ? val | PE.CACHEDISABLE : val & (~PE.CACHEDISABLE); }
+        }
+
+        public ulong Address {
+            get { return val & PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & ~PE.ADDRMASK) == 0);
+                val = (val & ~(PE.ADDRMASK)) | (value & PE.ADDRMASK);
+            }
+        }
+
+        public ulong Flags {
+            get { return val & ~PE.ADDRMASK; }
+            set {
+                DebugStub.Assert((value & PE.ADDRMASK) == 0);
+                DebugStub.Assert((value & MBZ_MASK) == 0);
+                val |= value;
+            }
+        }
+
+        public void Init() {
+            val = 0;
+        }
+    };
+
+    ///
+    /// <remarks> X86 PAE Page directory pointer table. </remarks>
+    ///
+    [CLSCompliant(false)]
+    internal struct PDPT
+    {
+        private PDPE entry/*[4] */;
+
+        public unsafe void Init() {
+            fixed (PDPE* pEntry = &entry) {
+                PDPE* pdpe = pEntry;
+
+                for (int i = 0; i < 4; i++) {
+                    pdpe->Init();
+                    pdpe++;
+                }
+            }
+        }
+
+        public unsafe PDPE* this [ uint idx ]
+        {
+            get {
+                DebugStub.Assert(idx < 4);
+
+                fixed (PDPE* pEntry = &entry) {
+                    return &pEntry[idx];
+                }
+            }
+        }
+    };
+}
diff --git a/base/Kernel/Singularity/X86/ProcessorContext.cs b/base/Kernel/Singularity/X86/ProcessorContext.cs
new file mode 100644
index 0000000..86181c5
--- /dev/null
+++ b/base/Kernel/Singularity/X86/ProcessorContext.cs
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcessorContext.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    using Microsoft.Singularity.X86;
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ProcessorContext
+    {
+        [AccessedByRuntime("referenced from c++")] private UIntPtr Reserved0;
+
+        // The remaining fields are private to the kernel.
+        [AccessedByRuntime("referenced from c++")] internal unsafe ThreadContext *threadContext;
+        [AccessedByRuntime("referenced from c++")] internal unsafe ProcessorContext *processorContext;
+        [AccessedByRuntime("referenced from c++")] private unsafe Processor *_processor; // Only changed by garbage collector.
+
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr exception;
+
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr schedulerStackBegin;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr schedulerStackLimit;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr interruptStackBegin;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr interruptStackLimit;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr interruptStackPreLimit;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr exceptionStackBegin;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr exceptionStackLimit;
+        [AccessedByRuntime("referenced from c++")] internal UIntPtr exceptionStackPreLimit;
+
+        [AccessedByRuntime("referenced from c++")] internal ThreadContext exceptionContext;
+        [AccessedByRuntime("referenced from c++")] internal ThreadContext thirdContext;
+
+        [AccessedByRuntime("referenced from c++")] internal int cpuId;
+        [AccessedByRuntime("referenced from c++")] internal volatile int ipiFreeze;
+        [AccessedByRuntime("referenced from c++")] internal unsafe ProcessorContext* nextProcessorContext; // singly-linked circular list node for MpExecution use
+
+        //////////////////////////////////////////////// Methods & Properties.
+        //
+        internal Processor processor {
+            [NoHeapAllocation]
+            get { return GetProcessor(); }
+        }
+
+        //////////////////////////////////////////////////// External Methods.
+        //
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        private extern Processor GetProcessor();
+
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal extern void UpdateAfterGC(Processor processor);
+    }
+}
diff --git a/base/Kernel/Singularity/X86/ThreadContext.cs b/base/Kernel/Singularity/X86/ThreadContext.cs
new file mode 100644
index 0000000..0924424
--- /dev/null
+++ b/base/Kernel/Singularity/X86/ThreadContext.cs
@@ -0,0 +1,284 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadContext.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.X86;
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ThreadContext
+    {
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort num;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort regs;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe ThreadContext * prev;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe ThreadContext * next;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr cr2;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr cr3;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe ThreadContext * prevInKern;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe ThreadContext * nextInKern;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe ThreadContext * prevInProc;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe ThreadContext * nextInProc;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr err;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr eip;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr cs0;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr efl;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr eax;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr ebx;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr ecx;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr edx;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr esp;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr ebp;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr esi;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr edi;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr stackBegin;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr stackLimit;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort processId;
+        [AccessedByRuntime("referenced from c++")]
+        internal bool uncaughtFlag; // true means "uncaught exception from process, so throw exception in kernel"
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        internal bool suspendAlert; // true means "check whether thread should suspend"
+
+        // Note: These two forks must be exactly the same size, but their
+        // fields alias differently for kernel or process code.
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe Thread *_thread;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr processThread;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe System.GCs.CallStack.TransitionRecord * stackMarkers;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe System.GCs.CallStack.TransitionRecord * processMarkers;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort threadIndex;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort processThreadIndex;
+#elif SINGULARITY_PROCESS
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr kernelThread;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe Thread *_thread;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe System.GCs.CallStack.TransitionRecord * kernelMarkers;
+        [AccessedByRuntime("referenced from c++")]
+        internal unsafe System.GCs.CallStack.TransitionRecord * stackMarkers;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort kernelThreadIndex;
+        [AccessedByRuntime("referenced from c++")]
+        internal ushort threadIndex;
+#endif
+        [AccessedByRuntime("referenced from halforgc.asm")]
+        internal unsafe int gcStates;
+
+
+        // See ThreadContext.IsInKernelMode
+        private unsafe System.GCs.CallStack.TransitionRecord * modeMarker;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr dr0;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr dr1;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr dr2;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr dr3;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr dr6;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr dr7;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal MmxContext mmx;
+
+#if PAGING
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr abiStackHead;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr abiStackBegin;
+        [AccessedByRuntime("referenced from c++")]
+        internal UIntPtr abiStackLimit;
+#endif
+
+#if THREAD_TIME_ACCOUNTING
+        [AccessedByRuntime("referenced from c++")]
+        internal ulong lastExecutionTimeUpdate;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal ulong executionTime;
+#endif
+        //////////////////////////////////////////////// Methods & Properties.
+        //
+        internal Thread thread {
+            [NoHeapAllocation]
+            get { return GetThread(); }
+        }
+
+        [NoHeapAllocation]
+        internal unsafe bool IsFirst()
+        {
+            return (((UIntPtr)prev) == UIntPtr.Zero);
+        }
+
+        internal bool WasInterrupted {
+            [NoHeapAllocation]
+            get { return (efl & EFlags.IF) != 0; }
+        }
+
+        [AccessedByRuntime("referenced from c++")]
+        // Return true if the thread is in kernel mode, false if the
+        // thread is in process mode.
+        // Note that by the time this method returns, the thread might
+        // have already switched to a different mode; in other words,
+        // don't rely on this result of this method being up-to-date unless
+        // the thread is suspended or blocked.
+        [NoHeapAllocation]
+        internal unsafe bool IsInKernelMode()
+        {
+            // When a thread enters process mode, RuntimeEntryPoint
+            // sets modeMarker=processMarkers.  Thus, in process mode:
+            //
+            //   modeMarker == processMarkers
+            //
+            // When a thread in process mode calls the kernel, pushStackMark
+            // pushes a child process marker onto the stack, so that
+            // modeMarker is left pointing to the new processMarker's
+            // parent (the old processMarker).  Thus, in kernel mode:
+            //
+            //   modeMarker == parent(processMarkers)
+            //
+            // This keeps the mode in sync with the process stack markers,
+            // which is convenient though not essential.  This assumes that
+            // the only reason a process pushes a stack marker is to enter
+            // kernel mode.
+            //
+            // Since processMarkers may be null, ThreadContext.ParentModeMarker
+            // defines a special definition for parent(null).
+#if SINGULARITY_PROCESS
+            System.GCs.CallStack.TransitionRecord * processMarkers =
+                stackMarkers;
+#endif // SINGULARITY_PROCESS
+            if (modeMarker == processMarkers) {
+                return false;
+            }
+            else {
+                VTable.Assert(modeMarker == ParentModeMarker(processMarkers));
+                return true;
+            }
+        }
+
+        [AccessedByRuntime("referenced from c++")]
+        [NoHeapAllocation]
+        internal unsafe void SetKernelMode()
+        {
+#if SINGULARITY_PROCESS
+            System.GCs.CallStack.TransitionRecord * processMarkers =
+                stackMarkers;
+#endif // SINGULARITY_PROCESS
+            modeMarker = ParentModeMarker(processMarkers);
+        }
+
+        [AccessedByRuntime("referenced from c++")]
+        [NoHeapAllocation]
+        internal unsafe void SetProcessMode()
+        {
+#if SINGULARITY_PROCESS
+            System.GCs.CallStack.TransitionRecord * processMarkers =
+                stackMarkers;
+#endif // SINGULARITY_PROCESS
+            modeMarker = processMarkers;
+        }
+
+        [NoHeapAllocation]
+        static private unsafe System.GCs.CallStack.TransitionRecord *
+            ParentModeMarker(System.GCs.CallStack.TransitionRecord * child)
+        {
+            System.GCs.CallStack.TransitionRecord * bottom =
+                (System.GCs.CallStack.TransitionRecord *) (-1);
+
+            VTable.Assert(child != bottom);
+            if (child == null) {
+                return bottom;
+            }
+            else {
+                return child->oldTransitionRecord;
+            }
+        }
+
+        //////////////////////////////////////////////////// External Methods.
+        //
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        private extern Thread GetThread();
+
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal extern void UpdateAfterGC(Thread thread);
+
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal extern void Initialize(int threadIndex, UIntPtr stackBegin, uint cr3);
+
+#if SINGULARITY_KERNEL
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal extern void InitializeIdle(int threadIndex, UIntPtr stackBegin, uint cr3);
+
+#endif
+    }
+}
diff --git a/base/Kernel/Singularity/X86/Tss.cs b/base/Kernel/Singularity/X86/Tss.cs
new file mode 100644
index 0000000..a740a2e
--- /dev/null
+++ b/base/Kernel/Singularity/X86/Tss.cs
@@ -0,0 +1,108 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Tss.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.X86
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    // Task State Segment
+    [AccessedByRuntime("referenced from c++")]
+    [StructLayout(LayoutKind.Sequential, Pack=4)]
+    [CLSCompliant(false)]
+    internal struct TSS
+    {
+        [AccessedByRuntime("referenced in c++")]
+        internal ushort     previous_tss;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     pad0;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       esp0;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     ss0;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     pad1;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       esp1;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     ss1;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     pad2;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       esp2;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     ss2;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     pad3;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       cr3;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       eip;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       eflags;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       eax;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       ecx;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       edx;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       ebx;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       esp;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       ebp;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       esi;
+        [AccessedByRuntime("referenced in c++")] 
+        internal uint       edi;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     es;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     pades;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     cs;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     padcs;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     ss;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     padss;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     ds;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     padds;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     fs;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     padfs;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     gs;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     padgs;
+
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     ldt;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     padldt;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     trap_bit;
+        [AccessedByRuntime("referenced in c++")] 
+        internal ushort     io_bitmap_offset;
+    }
+}
diff --git a/base/Kernel/Singularity/Xml/XmlException.cs b/base/Kernel/Singularity/Xml/XmlException.cs
new file mode 100644
index 0000000..817c1fb
--- /dev/null
+++ b/base/Kernel/Singularity/Xml/XmlException.cs
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace Microsoft.Singularity.Xml
+{
+    /// <summary>
+    /// Summary description for XmlException.
+    /// </summary>
+    public class XmlException : Exception
+    {
+        public readonly int line;
+        public XmlException(int line, string message) : base(message)
+        {
+            this.line = line;
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Xml/XmlNode.cs b/base/Kernel/Singularity/Xml/XmlNode.cs
new file mode 100644
index 0000000..fe7e3cd
--- /dev/null
+++ b/base/Kernel/Singularity/Xml/XmlNode.cs
@@ -0,0 +1,231 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Xml\XmlNode.cs
+//
+//////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Microsoft.Singularity.Xml
+{
+    /// <summary>
+    /// Summary description for XmlNode.
+    /// </summary>
+    public class XmlNode
+    {
+        internal struct XmlAttr
+        {
+            internal readonly string name;
+            internal readonly string value;
+
+            internal XmlAttr(string name, string value)
+            {
+                this.name = name != null ? name : "";
+                this.value = value;
+            }
+        }
+
+        private const int   defaultAttributesCapacity = 8;
+        private const int   defaultChildrenCapacity = 8;
+
+        private readonly string name;
+        private string          text;
+        private XmlAttr[]       attributes;
+        private int             attributesUsed;
+        private XmlNode[]       children;
+        private int             childrenUsed;
+
+        public XmlNode(string name)
+        {
+            this.name = name != null ? name : "";
+            this.text = "";
+        }
+
+        public int CountNamedChildren(string name)
+        {
+            int result = 0;
+            XmlNode[] childs = Children;
+            foreach (XmlNode child in childs) {
+                if (child.Name == name) {
+                    result++;
+                }
+            }
+            return result;
+        }
+
+        public XmlNode GetChild(String[] childNames)
+        {
+            XmlNode node = this;
+
+            for (int i = 0; node != null && i < childNames.Length; i++) {
+                node = node.GetChild(childNames[i]);
+            }
+            return node;
+        }
+
+        public XmlNode GetChild(String childName)
+        {
+            XmlNode[] childs = Children;
+            foreach (XmlNode child in childs) {
+                if (child.Name == childName) {
+                    return child;
+                }
+            }
+            return null;
+        }
+
+        public string Name
+        {
+            get { return name; }
+        }
+
+        public void AddChild(XmlNode node)
+        {
+            if (children == null) {
+                children = new XmlNode[defaultChildrenCapacity];
+            }
+            else if (childrenUsed == children.Length) {
+                XmlNode[] dest = new XmlNode[childrenUsed * 2];
+                for (int i = 0; i < childrenUsed; i++) {
+                    dest[i] = children[i];
+                }
+                children = dest;
+            }
+            children[childrenUsed++] = node;
+        }
+
+        public XmlNode[] Children
+        {
+            get {
+                if (children == null) {
+                    children = new XmlNode[0];
+                }
+                else if (childrenUsed != children.Length) {
+                    // optimize for the case that the XML tree is read once
+                    // and then remains static.
+                    XmlNode[] dest = new XmlNode[childrenUsed];
+                    for (int i = 0; i < childrenUsed; i++) {
+                        dest[i] = children[i];
+                    }
+                    children = dest;
+                }
+                return children;
+            }
+        }
+
+        public void AddText(string text)
+        {
+            this.text += text;
+        }
+
+        public string Text
+        {
+            get { return text; }
+        }
+
+        public string this[string attributeName]
+        {
+            get {
+                for (int i = 0; i < attributesUsed; i++) {
+                    if (attributes[i].name == attributeName) {
+                        return attributes[i].value;
+                    }
+                }
+                return null;
+            }
+        }
+
+        public void AddAttribute(string name, string value)
+        {
+            if (attributes == null) {
+                attributes = new XmlAttr[defaultAttributesCapacity];
+            }
+            else if (attributesUsed == attributes.Length) {
+                XmlAttr[] dest = new XmlAttr[attributesUsed * 2];
+                for (int i = 0; i < attributesUsed; i++) {
+                    dest[i] = attributes[i];
+                }
+                attributes = dest;
+            }
+            attributes[attributesUsed++] = new XmlAttr(name, value);
+        }
+
+        //
+        // Safe access to attributes:
+        //      since the kernel is going to use this object, we should
+        //      push the error-checking into the object instead of risking
+        //      the kernel forgetting to error check in some obscure method
+        //
+
+        public string GetAttribute(string attributeName, string defaultValue)
+        {
+            string value = this[attributeName];
+            if (value == null) {
+                return defaultValue;
+            }
+            return value;
+        }
+
+        public bool GetAttribute(string attributeName, bool defaultValue)
+        {
+            string value = this[attributeName];
+            if (value == null) {
+                return defaultValue;
+            }
+            return (value == "true" || value == "True");
+        }
+
+        public int GetAttribute(string attributeName, int defaultValue)
+        {
+            string value = this[attributeName];
+            if (value == null) {
+                return defaultValue;
+            }
+            if (value.StartsWith("0x") || value.StartsWith("0X")) {
+                return System.Int32.Parse(value, NumberStyles.AllowHexSpecifier);
+            }
+            else {
+                return System.Int32.Parse(value);
+            }
+        }
+
+        [CLSCompliant(false)]
+        public UIntPtr GetAttributeAsUIntPtr(string attributeName, UIntPtr defaultValue)
+        {
+            string value = this[attributeName];
+            if (value == null) {
+                return defaultValue;
+            }
+            if (value.StartsWith("0x") || value.StartsWith("0X")) {
+                return System.UIntPtr.Parse(value, NumberStyles.AllowHexSpecifier);
+            }
+            else {
+                return System.UIntPtr.Parse(value);
+            }
+        }
+
+        public bool HasAttribute(string attributeName)
+        {
+            return this[attributeName] != null;
+        }
+
+        public string GetAttributes()
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < attributesUsed; i++) {
+                sb.Append(" ");
+                sb.Append(attributes[i].name);
+                sb.Append("=\"");
+                sb.Append(attributes[i].value);
+                sb.Append("\"");
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/base/Kernel/Singularity/Xml/XmlReader.cs b/base/Kernel/Singularity/Xml/XmlReader.cs
new file mode 100644
index 0000000..b20f985
--- /dev/null
+++ b/base/Kernel/Singularity/Xml/XmlReader.cs
@@ -0,0 +1,662 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  Note:   This is a very limited Xml Reader, carved out of the
+//          Libraries\Xml implementation.  At the end exists a
+//          very basic stream class, which makes it possible to avoid linking
+//          against System.IO.
+//
+//  Note:   All kernel Xml stream must be encoded as UTF-8.
+//          UTF-8 is a way of writing Unicode characters with variable numbers
+//          of bytes per character, optimized for the lower 127 ASCII
+//          characters.  It's an efficient way of encoding US English in an
+//          internationalizable way.
+//          The UTF-8 byte order mark is simply the Unicode byte order mark
+//          (0xFEFF) written in UTF-8 (0xEF 0xBB 0xBF).  The byte order mark
+//          is used mostly to distinguish UTF-8 text from other encodings, and
+//          doesn't switch the byte orderings.
+//
+//            bytes   bits    UTF-8 representation
+//            -----   ----    -----------------------------------
+//            1        7      0vvvvvvv
+//            2       11      110vvvvv 10vvvvvv
+//            3       16      1110vvvv 10vvvvvv 10vvvvvv
+//            4       21      11110vvv 10vvvvvv 10vvvvvv 10vvvvvv
+//            -----   ----    -----------------------------------
+//
+//          Surrogate:
+//            Real Unicode value = (HighSurrogate - 0xD800) * 0x400 +
+//                                 (LowSurrogate - 0xDC00) + 0x10000
+//
+//  BUG:    The parser cannot handle attributes in single quotes
+//          Actually, that's a feature -- XML requires the quotes.
+//
+//          Use this file for XML processing inside the Kernel
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Xml
+{
+    using System;
+    using System.Collections;
+    using Singularity.Io;
+    using System.Text;
+
+    /// <summary>
+    /// This is a simple XML Parser that does no validation.
+    /// All it does it parse the syntax of XML
+    /// Note - since IoMemory is not CLSCompliant, neither is this!
+    /// </summary>
+    [CLSCompliant(false)]
+    public class XmlReader
+    {
+        private States state;
+        private int lineNumber;
+        private KernelMemoryStream stream;
+        private bool isUtf8;
+        private XmlNode doc;
+        private XmlNode[] stack;
+        private int stackTop;
+        private const int defaultStackDepth = 16;
+
+        private XmlReader()
+        {
+            state = States.START;
+            lineNumber = 1;
+            stack = new XmlNode[defaultStackDepth];
+            stackTop = 0;
+            doc = new XmlNode("::xml");
+        }
+
+        public XmlReader(IoMemory mem)
+            : this()
+        {
+            stream = new KernelIoMemoryStream(mem);
+        }
+
+        public XmlReader(byte[] buffer)
+            : this()
+        {
+            stream = new KernelByteMemoryStream(buffer);
+        }
+
+        private enum TokenType
+        {
+            NAME,
+            STRING_LITERAL,
+            OPERATOR,
+            NONE
+        }
+
+        private enum States
+        {
+            START,
+            NEED_ELEMENT_NAME,
+            NEED_ATTRIBUTE_NAME,
+            NEED_EQUALS_SIGN,
+            NEED_ATTRIBUTE_VALUE,
+            NEED_CLOSURE_BRACKET,
+            NEED_CLOSURE_NAME,
+            NEED_FINAL_BRACKET,
+            QUESTION_MARK_ELEMENT,
+            GET_STRINGS
+        }
+
+        //////////////////////////////////////////////////// Stack Operations.
+        //
+        private void Push(XmlNode node)
+        {
+            if (stackTop >= stack.Length) {
+                XmlNode[] dest = new XmlNode[stack.Length * 2];
+                for (int i = 0; i < stackTop; i++) {
+                    dest[i] = stack[i];
+                }
+                stack = dest;
+            }
+            stack[stackTop++] = node;
+        }
+
+        private XmlNode Pop()
+        {
+            XmlNode node = stack[stackTop - 1];
+            stack[stackTop--] = null; // encourage GC sooner.
+            return node;
+        }
+
+        private XmlNode Peek()
+        {
+            return stack[stackTop - 1];
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        public XmlNode Parse()
+        {
+            if (stream == null) {
+                return doc;
+            }
+
+            TokenType type;
+            string token = null;
+            XmlNode curNode = null;
+            string curAttributeName = null;
+
+            // Check for a UTF-8 preamble.
+            isUtf8 = false;
+            if (PeekCharacter() == 0xef) {
+                if (ReadCharacter() == 0xef &&
+                    ReadCharacter() == 0xbb &&
+                    ReadCharacter() == 0xbf) {
+                    isUtf8 = true;
+                }
+            }
+
+            while (ReadToken(out token, out type)) {
+                switch (state) {
+                    case States.START:
+                        if (type == TokenType.OPERATOR && token.Equals("<")) {
+                            state = States.NEED_ELEMENT_NAME;
+                        }
+                        else {
+                            // All other text is interpreted as freestanding text.
+                            // It had better occur within a tag!
+                            if (stackTop == 0) {
+                                throw new XmlException(lineNumber, "Line " + lineNumber + ": Text must be inside a tag");
+                            }
+
+                            XmlNode lastNode = Peek();
+                            lastNode.AddText(token);
+
+                            // Next state depends on whether we're at the end of
+                            // the text-within-a-tag already or not.
+                            if (PeekCharacter() == '<') {
+                                // Looks like we're already at the end
+                                state = States.START;
+                            }
+                            else {
+                                state = States.GET_STRINGS;
+                            }
+                        }
+                        break;
+
+                    case States.NEED_ELEMENT_NAME:
+                        if (type == TokenType.NAME) {
+                            state = States.NEED_ATTRIBUTE_NAME;
+                            curNode = new XmlNode(token);
+                        }
+                        else if (type == TokenType.OPERATOR && token.Equals("/")) {
+                            state = States.NEED_CLOSURE_NAME;
+                        }
+                        else if (type == TokenType.OPERATOR &&
+                                 (token.Equals("?") ||
+                                  token.Equals("!") ||
+                                  token.Equals('-'))) {
+                            // then go to the question mark state and ignore this element
+                            state = States.QUESTION_MARK_ELEMENT;
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Can only begin a tag with / or a name");
+                        }
+                        break;
+
+                    case States.NEED_ATTRIBUTE_NAME:
+                        if (type == TokenType.NAME) {
+                            state = States.NEED_EQUALS_SIGN;
+                            curAttributeName = token;
+                        }
+                        else if (type == TokenType.OPERATOR && token.Equals(">")) {
+                            // hold onto this node so we can check it later
+                            state = States.START;
+
+                            if (stackTop != 0) {
+                                XmlNode parent = Peek();
+                                parent.AddChild(curNode);
+                            }
+                            else {
+                                doc.AddChild(curNode);
+                            }
+                            Push(curNode);
+                            curNode = null;
+                        }
+                        else if (type == TokenType.OPERATOR && token.Equals("/")) {
+                            // this node is almost complete
+                            state = States.NEED_CLOSURE_BRACKET;
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Must have either attributes, '/>', or '>' after the name of an element");
+                        }
+                        break;
+
+                    case States.NEED_EQUALS_SIGN:
+                        if (type == TokenType.OPERATOR && token.Equals("=")) {
+                            state = States.NEED_ATTRIBUTE_VALUE;
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Need an '=' after an attribute name");
+                        }
+                        break;
+
+                    case States.NEED_ATTRIBUTE_VALUE:
+                        if (type == TokenType.STRING_LITERAL) {
+                            state = States.NEED_ATTRIBUTE_NAME;
+                            string unescaped_attribute_value = ExpandEntityReferences(token);
+                            curNode.AddAttribute(curAttributeName, unescaped_attribute_value);
+                            curAttributeName = null;
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Must have an attribute value after the '=' in an XML node");
+                        }
+                        break;
+
+                    case States.NEED_CLOSURE_BRACKET:
+                        if (type == TokenType.OPERATOR && token.Equals(">")) {
+                            // this node is done, and we don't have to check it
+                            state = States.START;
+
+                            if (stackTop != 0) {
+                                XmlNode parent = Peek();
+                                parent.AddChild(curNode);
+                            }
+                            else {
+                                doc.AddChild(curNode);
+                            }
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Must have a '>' after a closing '/' in an XML node");
+                        }
+                        break;
+
+                    case States.NEED_CLOSURE_NAME:
+                        if (type == TokenType.NAME) {
+                            // pop the last XmlNode and make sure that this name matches.
+                            // Otherwise we don't have balanced open and close tags
+                            state = States.NEED_FINAL_BRACKET;
+                            XmlNode xmln = Pop();
+                            if (!token.Equals(xmln.Name)) {
+                                throw new XmlException(lineNumber, "Line " + lineNumber + ": " + token + " does not match " + xmln.Name);
+                            }
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Must have a name after an opening />");
+                        }
+
+                        break;
+                    case States.NEED_FINAL_BRACKET:
+                        if (type == TokenType.OPERATOR && token.Equals(">")) {
+                            state = States.START;
+                        }
+                        else {
+                            throw new XmlException(lineNumber, "Line " + lineNumber + ": Must have a > after a closure tag's name");
+                        }
+                        break;
+
+                    case States.QUESTION_MARK_ELEMENT:
+                        // just stay in this state until you see a '>'
+                        while ('>' != ReadCharacter()) {
+                            ;
+                        }
+                        state = States.START;
+                        break;
+
+                    case States.GET_STRINGS:
+                        {
+                            // stay in this state until you see a '<'
+                            StringBuilder sb = new StringBuilder();
+                            XmlNode prevNode = Peek();
+
+                            if (type == TokenType.OPERATOR && token.Equals("<")) {
+                                throw new XmlException(lineNumber, "Unexpected tag beginning while in text state");
+                            }
+
+                            sb.Append(token);
+                            while (PeekCharacter() != -1 && PeekCharacter() != '<') {
+                                sb.Append((char)ReadCharacter());
+                            }
+
+                            prevNode.AddText(sb.ToString());
+                            state = States.START;
+                        }
+                        break;
+                }
+            }
+            stream.Close();
+            stream = null;
+            return doc;
+        }
+
+        /// <summary>
+        /// This method expands XML entity references found in an input string.
+        /// If an invalid entity reference is encountered, this method will throw
+        /// XmlException.
+        /// </summary>
+        /// <param name="input">The string to search for entity references.</param>
+        /// <returns>The expanded string.</returns>
+        private string ExpandEntityReferences(string input)
+        {
+            // In most cases, there are no entity references.  Check for that case now.
+            // If we do find an entity reference, then the work isn't wasted.
+            int start = input.IndexOf('&');
+            if (start == -1)
+                return input;
+
+            StringBuilder buffer = new StringBuilder();
+            buffer.Append(input, 0, start);
+            start++;
+
+            for (; ; )
+            {
+                // At this point, 'start' points to a named XML entity.
+                // locate the entity name.
+                int end = input.IndexOf(';', start);
+                if (end == -1)
+                    throw new XmlException(lineNumber, "An invalid entity reference was found.  '&' is present, but there is no matching ';'.");
+
+                int name_length = end - start;
+                if (name_length == 0)
+                    throw new XmlException(lineNumber, "An invalid entity reference was found.  '&;' is not a valid entity reference.");
+
+                string entity_name = input.Substring(start, name_length);
+                string value;
+
+                switch (entity_name)
+                {
+                    case "amp": value = "&"; break;
+                    case "lt": value = "<"; break;
+                    case "gt": value = ">"; break;
+                    case "quot": value = "\""; break;
+                    default:
+                        throw new XmlException(lineNumber, String.Format("An invalid entity reference was found.  The entity '&{0};' is not recognized.", entity_name));
+                }
+
+                buffer.Append(value);
+
+                // Are there any more entity references in this string?
+                int next = input.IndexOf('&', end + 1);
+                if (next == -1)
+                {
+                    // There are no more entity references in the string.
+                    // Append the rest of the string.
+                    buffer.Append(input, end + 1, input.Length - end - 1);
+                    return buffer.ToString();
+                }
+
+                // Yes, there are more references.  Keep looping, preserving
+                // the same meaning of 'start' as when we entered this loop.
+                buffer.Append(input, end + 1, next - (end + 1));
+                start = next + 1; // skip over next '&'
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        private int undoChar;
+
+        private void UndoRead(int c)
+        {
+            undoChar = c;
+        }
+
+        private int PeekCharacter()
+        {
+            if (undoChar == '\0') {
+                undoChar = ReadCharacter();
+            }
+            return undoChar;
+        }
+
+        private int ReadCharacter()
+        {
+            int val;
+            if (undoChar != '\0') {
+                val = undoChar;
+                undoChar = '\0';
+                return val;
+            }
+
+            val = stream.Read();
+            if (val == '\n') {
+                lineNumber++;
+            }
+
+            if (!isUtf8 || val < 0x80) {
+                return val;
+            }
+
+            //  Shared UTF-8 Decoding:
+            //      bytes   bits    UTF-8 representation
+            //      -----   ----    -----------------------------------
+            //      1        7      0vvvvvvv
+            //      2       11      110vvvvv 10vvvvvv
+            //      3       16      1110vvvv 10vvvvvv 10vvvvvv
+            //      4       21      11110vvv 10vvvvvv 10vvvvvv 10vvvvvv
+            //      -----   ----    -----------------------------------
+            //
+            int bytes = 0;
+            if (val <= 0xdf) {
+                bytes = 1;
+                val &= 0x1f;
+            }
+            else if (val <= 0xef) {
+                bytes = 2;
+                val &= 0x0f;
+            }
+            else if (val <= 0xf7) {
+                bytes = 3;
+                    val &= 0x07;
+            }
+
+            while (bytes-- > 0) {
+                int next = stream.Read();
+                if (next < 0x80 || next > 0xbf) {
+                    throw new XmlException(lineNumber, "Buffer_InvalidEncoding");
+                }
+                val = val << 6 | (next & 0x3f);
+            }
+            return val;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        private bool ReadToken(out string token, out TokenType type)
+        {
+            // fortunately for us, the first character tells us exactly which of
+            // the three types of token this is. [a-zA-Z] means it's a NAME, ["]
+            // means it's a STRING_LITERAL and [<>/=] means it's an operator
+            int nextVal = PeekCharacter();
+
+            if (nextVal == -1) {
+                // this is the end of the file
+                token = "";
+                type = TokenType.NONE;
+                return false;
+            }
+
+            char firstChar = unchecked((char)nextVal);
+
+            // if it's in [a-zA-Z]
+            if (('a' <= firstChar && firstChar <= 'z') ||
+                ('A' <= firstChar && firstChar <= 'Z')) {
+                token = ReadName();
+                type = TokenType.NAME;
+                return true;
+            }
+            else if (firstChar == '"') {
+                token = ReadString();
+                type = TokenType.STRING_LITERAL;
+                return true;
+            }
+            else if (firstChar == '<' ||
+                     firstChar == '>' ||
+                     firstChar == '/' ||
+                     firstChar == '=' ||
+                     firstChar == '?' ||
+                     firstChar == '!' ||
+                     firstChar == '-') {
+                ReadCharacter();
+                token = firstChar.ToString();
+                type = TokenType.OPERATOR;
+                return true;
+            }
+            else if (firstChar == ' ' ||
+                     firstChar == '\n' ||
+                     (int)firstChar == 13 ||
+                     firstChar == '\t') {
+                // throw away all whitespace
+                while (firstChar == ' ' ||
+                       firstChar == '\n' ||
+                       (int)firstChar == 13 ||
+                       firstChar == '\t') {
+                    char tempChar = (char)ReadCharacter();
+                    // patch to avoid problems with \n before EOF
+                    if (PeekCharacter() == -1) {
+                        type = TokenType.NONE;
+                        token = "";
+                        return false;
+                    }
+                    else {
+                        firstChar = (char)PeekCharacter();
+                    }
+                }
+                return ReadToken(out token, out type);
+            }
+            else {
+                ReadCharacter();
+                type = TokenType.NONE;
+                token = firstChar.ToString();
+                return true;
+                // throw new XmlException(lineNumber, "Line " + lineNumber + ": '" + firstChar + "' is not a valid first character for a token");
+            }
+        }
+
+        private string ReadName()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            // add characters to our string until we see something that's not in [a-zA-Z0-9_-.:]
+            char read = (char)PeekCharacter();
+
+            while (('a' <= read && read <= 'z') ||
+                   ('A' <= read && read <= 'Z') ||
+                   ('0' <= read && read <= '9') ||
+                   read == '-' ||
+                   read == '_' ||
+                   read == '.' ||
+                   read == ':') {
+                sb.Append((char)ReadCharacter());
+                read = (char)PeekCharacter();
+            }
+            return sb.ToString();
+        }
+
+        private string ReadString()
+        {
+            StringBuilder sb = new StringBuilder();
+            // we need to read this string and translate it into a string literal.
+            // this means that we have (for the moment) two magic characters: \ and "
+            // "\\" means \ and "\"" means "
+            bool translateNext = false;
+            int read_or_eof = PeekCharacter();
+            if (read_or_eof == -1)
+            {
+                throw new XmlException(lineNumber, "Line " + lineNumber + ": Cannot start a string literal at EOF.");
+            }
+            char read = (char)read_or_eof;
+            if (read != '"')
+            {
+                throw new XmlException(lineNumber, "Line " + lineNumber + ": Cannot start a string literal with " + (char)read + ".  You must use a '\"'");
+            }
+            // drop the '"' on the floor
+            ReadCharacter();
+            read = (char)ReadCharacter();
+
+            while (read != '"' || translateNext) {
+                if (!translateNext ) {
+                    if (read == '\\') {
+                        translateNext = true;
+                    }
+                    else {
+                        sb.Append(read);
+                        read = (char)ReadCharacter();
+                    }
+                }
+                else {
+                    translateNext = false;
+                    if (read == '\\') {
+                        sb.Append("\\");
+                        read = (char)ReadCharacter();
+                    }
+                    else if (read == '"') {
+                        sb.Append("\"");
+                        read = (char)ReadCharacter();
+                    }
+                    else {
+                        throw new XmlException(lineNumber, "Line " + lineNumber + ": Invalid escape sequence: \\" + read);
+                    }
+                }
+            }
+
+            return sb.ToString();
+        }
+    }
+
+    abstract class KernelMemoryStream
+    {
+        public void Close()
+        {
+        }
+
+        public abstract int Read();
+    }
+
+    /// <summary>
+    /// This is a wholly unsafe manner of making a byte array look like
+    /// a stream to the KernelXmlReader by giving it Read(), Peek(), and
+    /// Close() methods.
+    /// </summary>
+    class KernelIoMemoryStream : KernelMemoryStream
+    {
+        private IoMemory buffer;   // can access buffer[???] as needed
+        private int      position;
+        private int      size;
+
+        public KernelIoMemoryStream(IoMemory buffer)
+        {
+            this.buffer = buffer;
+            position = 0;
+            size = buffer.Length;
+        }
+
+        public override int Read()
+        {
+            if (position >= size) {
+                return -1;
+            }
+
+            return buffer[position++];
+        }
+    }
+
+    class KernelByteMemoryStream : KernelMemoryStream
+    {
+        private byte[]  buffer;   // can access buffer[???] as needed
+        private int     position;
+        private int     size;
+
+        public KernelByteMemoryStream(byte[] buffer)
+        {
+            this.buffer = buffer;
+            position = 0;
+            size = buffer.Length;
+        }
+
+        public override int Read()
+        {
+            if (position == size) {
+                return -1;
+            }
+            return buffer[position++];
+        }
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/Corlib.Contracts.csproj b/base/Kernel/SpecSharp.Contracts/Corlib.Contracts.csproj
new file mode 100644
index 0000000..5add198
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Corlib.Contracts.csproj
@@ -0,0 +1,53 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>Corlib.Contracts</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants>ENDPOINT_STRUCT;SINGULARITY;PTR_SIZE_32;_NEW_CLASSLOADER;NODEFAULTLIB;NOOWNERSHIPCHECK</DefineConstants>
+    <ShadowAssemblyPath>$(APPRUNTIMEDIR)\Corlib.dll</ShadowAssemblyPath>
+    <NoStdLib>false</NoStdLib>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <OutputPath>$(APPRUNTIMEDIR)</OutputPath>
+    <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <Compile Include="Microsoft.Singularity.Processor.sg"/>
+    <Compile Include="Microsoft.Singularity.Xml.XmlNode.sg"/>
+    <Compile Include="System.Collections.ArrayList.sg"/>
+    <Compile Include="System.Collections.DictionaryEntry.sg"/>
+    <Compile Include="System.Collections.Hashtable.sg"/>
+    <Compile Include="System.Collections.SortedList.sg"/>
+    <Compile Include="System.Boolean.sg"/>
+    <Compile Include="System.Int32.sg"/>
+    <Compile Include="System.Object.sg"/>
+    <Compile Include="System.String.sg"/>
+    <Compile Include="System.Text.Encoding.sg"/>
+    <Compile Include="System.Text.StringBuilder.sg"/>
+    <Compile Include="System.Threading.Thread.sg"/>
+    <Compile Include="System.ValueType.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\App.Corlib.csproj"/>
+    <ProjectReference Include="..\System.Compiler.Runtime\System.Compiler.Runtime.App.csproj"/>
+    <!-- <ProjectReference Include="..\SingSharp.Runtime\Microsoft.SingSharp.Runtime.App.csproj"/> -->
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\AppRuntime.targets"/>
+
+</Project>
diff --git a/base/Kernel/SpecSharp.Contracts/Kernel.Contracts.csproj b/base/Kernel/SpecSharp.Contracts/Kernel.Contracts.csproj
new file mode 100644
index 0000000..2d5f217
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Kernel.Contracts.csproj
@@ -0,0 +1,48 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Kernel.Contracts</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ShadowAssemblyPath>$(KERNEL_IL_DIR)\kernel.exe</ShadowAssemblyPath>
+    <DefineConstants>NOOWNERSHIPCHECK</DefineConstants>
+    <NoStandardLibraries>true</NoStandardLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Microsoft.Singularity.Process.sg"/>
+    <Compile Include="Microsoft.Singularity.Processor.sg"/>
+    <Compile Include="Microsoft.Singularity.Xml.XmlNode.sg"/>
+    <Compile Include="Microsoft.Singularity.Io.IoMemory.sg"/>
+    <Compile Include="Microsoft.Singularity.Io.IoPortRange.sg"/>
+    <Compile Include="System.Collections.DictionaryEntry.sg"/>
+    <Compile Include="System.Collections.Hashtable.sg"/>
+    <Compile Include="System.Collections.SortedList.sg"/>
+    <Compile Include="System.Int32.sg"/>
+    <Compile Include="System.Object.sg"/>
+    <Compile Include="System.String.sg"/>
+    <Compile Include="System.Text.Encoding.sg"/>
+    <Compile Include="System.Text.StringBuilder.sg"/>
+    <Compile Include="System.Threading.Thread.sg"/>
+    <Compile Include="System.ValueType.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Compiler.Runtime\System.Compiler.Runtime.Kernel.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets"/>
+
+</Project>
diff --git a/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Io.IoMemory.sg b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Io.IoMemory.sg
new file mode 100644
index 0000000..bce3e7e
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Io.IoMemory.sg
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+namespace Microsoft.Singularity.Io
+{
+    public sealed class IoMemory
+    {
+        public unsafe IoMemory! AtOffset(uint byteOffset, int count);
+
+        public unsafe IoMemory! AtOffset(uint byteOffset, int count,
+                                         bool read, bool write);
+
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Io.IoPortRange.sg b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Io.IoPortRange.sg
new file mode 100644
index 0000000..f9c07a3
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Io.IoPortRange.sg
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+namespace Microsoft.Singularity.Io
+{
+    public sealed class IoPortRange
+    {
+        public IoPortRange! RangeAtOffset(ushort offset, ushort bytes,
+                                          bool readable, bool writable);
+
+        public IoPort! PortAtOffset(ushort offset, ushort bytes, Access access);
+
+        public IoPort! PortAtOffset(ushort offset, ushort bytes, bool readable, bool writable);
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Process.sg b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Process.sg
new file mode 100644
index 0000000..01d549c
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Process.sg
@@ -0,0 +1,13 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+namespace Microsoft.Singularity
+{
+	public class Process
+	{
+        public static Process[]! processTable;
+	}
+}
diff --git a/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Processor.sg b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Processor.sg
new file mode 100644
index 0000000..eaac7dc
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Processor.sg
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+namespace Microsoft.Singularity
+{
+	public class Processor
+	{
+        public static Processor! CurrentProcessor
+        {
+            get;
+        }
+	}
+}
diff --git a/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Xml.XmlNode.sg b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Xml.XmlNode.sg
new file mode 100644
index 0000000..d0718bd
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/Microsoft.Singularity.Xml.XmlNode.sg
@@ -0,0 +1,70 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Xml
+{
+    using System;
+    //    using System.IO;
+    using System.Collections;
+    /// <summary>
+    /// Summary description for XmlNode.
+    /// </summary>
+    public class XmlNode
+    {
+        public XmlNode(string name);
+
+        public int CountNamedChildren(string name);
+
+        public XmlNode GetNestedChild(String childName);
+
+        public XmlNode GetNestedChild(String[] childNames);
+
+        public string! Name
+        {
+            get;
+        }
+
+        public void AddChild(XmlNode node);
+
+        public ArrayList! Children
+        {
+            get;
+        }
+
+        public void AddText(string text);
+
+        public string Text
+        {
+            get;
+        }
+
+        public string this[string attributeName]
+        {
+            get;
+            set;
+        }
+
+        //
+        // Safe access to attributes:
+        //      since the kernel is going to use this object, we should
+        //      push the error-checking into the object instead of risking
+        //      the kernel forgetting to error check in some obscure method
+        //
+
+        public string GetAttribute(string attributeName,
+                                   string defaultValue);
+
+        public bool GetAttribute(string attributeName,
+                                 bool defaultValue);
+
+        public int GetAttribute(string attributeName,
+                                int defaultValue);
+
+        public UIntPtr GetAttribute(string attributeName,
+                                    UIntPtr defaultValue);
+
+        public bool HasAttribute(string attributeName);
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Boolean.sg b/base/Kernel/SpecSharp.Contracts/System.Boolean.sg
new file mode 100644
index 0000000..251905a
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Boolean.sg
@@ -0,0 +1,14 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace System
+{
+	public struct Boolean
+	{
+        public override string! ToString();
+	}
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Collections.ArrayList.sg b/base/Kernel/SpecSharp.Contracts/System.Collections.ArrayList.sg
new file mode 100644
index 0000000..a77960c
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Collections.ArrayList.sg
@@ -0,0 +1,264 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Contracts;
+
+namespace System.Collections
+{
+
+    public class ArrayList
+    {
+
+        public object this [int index]
+        {
+          [Pure]
+          get
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index < this.Count otherwise ArgumentOutOfRangeException;
+          set
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index < this.Count otherwise ArgumentOutOfRangeException;
+        }
+
+        public int Capacity
+        {
+          [Pure]
+          get
+			ensures result >= 0;
+          set
+			requires value >= this.Count otherwise ArgumentOutOfRangeException;
+        }
+
+        public int Count
+        {
+          [Pure]
+          get
+			ensures result >= 0;
+        }
+
+        public object SyncRoot
+        {
+          [Pure]
+          get;
+        }
+
+        public bool IsSynchronized
+        {
+          [Pure]
+          get;
+        }
+
+        public bool IsFixedSize
+        {
+          [Pure]
+          get;
+        }
+
+        public bool IsReadOnly
+        {
+          [Pure]
+          get;
+        }
+
+        public void TrimToSize ()
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public Array! ToArray (Type! type)
+            requires type != null otherwise ArgumentNullException;
+
+        public object[]! ToArray ();
+
+        public static ArrayList! Synchronized (ArrayList! list)
+            requires list != null otherwise ArgumentNullException;
+            ensures result.IsSynchronized;
+
+        public static IList! Synchronized (IList! list)
+            requires list != null otherwise ArgumentNullException;
+            ensures result.IsSynchronized;
+
+        public void Sort (int index, int count, IComparer comparer)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + count <= Count otherwise ArgumentException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+
+        public void Sort (IComparer comparer)
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+
+        public void Sort ()
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+
+        public ArrayList GetRange (int index, int count)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + count <= Count otherwise ArgumentException;
+
+        public void SetRange (int index, ICollection! c)
+            requires c != null otherwise ArgumentNullException;
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + c.Count <= Count otherwise ArgumentOutOfRangeException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+
+        public void Reverse (int index, int count)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + count <= Count otherwise ArgumentException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+
+        public void Reverse ()
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+
+        public static ArrayList Repeat (object value, int count)
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+
+        public void RemoveRange (int index, int count)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + count <= Count otherwise ArgumentException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public void RemoveAt (int index)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index < Count otherwise ArgumentOutOfRangeException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public void Remove (object obj)
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public static ArrayList! ReadOnly (ArrayList! list)
+            requires list != null otherwise ArgumentNullException;
+            ensures result.IsReadOnly;
+
+        public static IList! ReadOnly (IList! list)
+            requires list != null otherwise ArgumentNullException;
+            ensures result.IsReadOnly;
+
+        public int LastIndexOf (object value, int startIndex, int count)
+            requires 0 <= count otherwise ArgumentOutOfRangeException;
+            requires 0 <= startIndex otherwise ArgumentOutOfRangeException;
+            requires startIndex + count <= Count otherwise ArgumentOutOfRangeException;
+            ensures -1 <= result && result < this.Count;
+
+        public int LastIndexOf (object value, int startIndex)
+            requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex < this.Count otherwise ArgumentOutOfRangeException;
+            ensures -1 <= result && result < this.Count;
+
+        public int LastIndexOf (object value)
+            ensures -1 <= result && result < this.Count;
+
+        public void InsertRange (int index, ICollection! c)
+            requires c != null otherwise ArgumentNullException;
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index <= Count otherwise ArgumentOutOfRangeException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public void Insert (int index, object value)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index <= Count otherwise ArgumentOutOfRangeException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public int IndexOf (object value, int startIndex, int count)
+            requires 0 <= count otherwise ArgumentOutOfRangeException;
+            requires 0 <= startIndex otherwise ArgumentOutOfRangeException;
+            requires startIndex + count <= Count otherwise ArgumentOutOfRangeException;
+            ensures -1 <= result && result < this.Count;
+
+        public int IndexOf (object value, int startIndex)
+            requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex < this.Count otherwise ArgumentOutOfRangeException;
+            ensures -1 <= result && result < this.Count;
+
+        public int IndexOf (object value)
+            ensures -1 <= result && result < this.Count;
+
+        public IEnumerator GetEnumerator (int index, int count)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+
+        public IEnumerator GetEnumerator ();
+
+        public static ArrayList FixedSize (ArrayList! list)
+            requires list != null otherwise ArgumentNullException;
+            ensures result.IsFixedSize;
+
+        public static IList FixedSize (IList! list)
+            requires list != null otherwise ArgumentNullException;
+            ensures result.IsFixedSize;
+
+        public void CopyTo (int index, Array! array, int arrayIndex, int count)
+			requires array != null otherwise ArgumentNullException;
+			requires array.Rank == 1 otherwise ArgumentException;
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires index < this.Count otherwise ArgumentOutOfRangeException;
+            requires arrayIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires arrayIndex < array.Length otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + count <= Count otherwise ArgumentException;
+            requires  arrayIndex + count <= array.Length otherwise ArgumentException;
+
+        public void CopyTo (Array! array, int arrayIndex)
+			requires array != null otherwise ArgumentNullException;
+			requires array.Rank == 1 otherwise ArgumentException;
+            requires arrayIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires arrayIndex < this.Count otherwise ArgumentOutOfRangeException;
+
+        public void CopyTo (Array! array)
+			requires array != null otherwise ArgumentNullException;
+			requires array.Rank == 1 otherwise ArgumentException;
+
+        public bool Contains (object item);
+
+        public object Clone ();
+
+        public void Clear ()
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public int BinarySearch (object value, IComparer comparer)
+            ensures -1 <= result && result < this.Count;
+
+        public int BinarySearch (object value)
+            ensures -1 <= result && result < this.Count;
+
+        public int BinarySearch (int index, int count, object value, IComparer comparer)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires index + count <= Count otherwise ArgumentException;
+            ensures -1 <= result && result < this.Count;
+
+        public void AddRange (ICollection! c)
+			requires c != null otherwise ArgumentNullException;
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public int Add (object value)
+			requires ! this.IsReadOnly otherwise NotSupportedException;
+			requires ! this.IsFixedSize otherwise NotSupportedException;
+
+        public static ArrayList Adapter (IList! list)
+            requires list != null otherwise ArgumentNullException;
+
+        public ArrayList (ICollection! c)
+            requires c != null otherwise ArgumentNullException;
+            ensures this.Capacity == c.Count;
+            ensures this.Count == c.Count;
+
+        public ArrayList (int capacity)
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+            ensures this.Capacity == capacity;
+
+        public ArrayList ()
+			ensures this.Count == 0;
+			ensures this.Capacity == 16; // stated in the documentation
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Collections.DictionaryEntry.sg b/base/Kernel/SpecSharp.Contracts/System.Collections.DictionaryEntry.sg
new file mode 100644
index 0000000..9288e26
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Collections.DictionaryEntry.sg
@@ -0,0 +1,31 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Contracts;
+
+namespace System.Collections
+{
+
+    public struct DictionaryEntry
+    {
+
+        public object! Key
+        {
+          [Pure] get;
+          set
+            requires value != null otherwise ArgumentNullException;
+        }
+
+        public object Value
+        {
+          [Pure] get;
+          set;
+        }
+
+        public DictionaryEntry (object! key, object value)
+            requires key != null otherwise ArgumentNullException;
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Collections.Hashtable.sg b/base/Kernel/SpecSharp.Contracts/System.Collections.Hashtable.sg
new file mode 100644
index 0000000..b086a8a
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Collections.Hashtable.sg
@@ -0,0 +1,115 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Contracts;
+
+
+namespace System.Collections
+{
+
+    public class Hashtable
+    {
+
+        public object this [object! key]
+        {
+          [Pure]
+          get
+            requires key != null otherwise ArgumentNullException;
+          set;
+        }
+
+        public int Count
+        {
+          [Pure]
+          get;
+        }
+
+        public object SyncRoot
+        {
+          get;
+        }
+
+        public ICollection! Keys
+        {
+          [Pure]
+          get;
+        }
+
+        public bool IsSynchronized
+        {
+          get;
+        }
+
+        public bool IsFixedSize
+        {
+          [Pure]
+          get;
+        }
+
+        public ICollection! Values
+        {
+          [Pure]
+          get;
+        }
+
+        public bool IsReadOnly
+        {
+          [Pure]
+          get;
+        }
+
+        public void OnDeserialization (object sender);
+
+        public static Hashtable Synchronized (Hashtable! table)
+            requires table != null otherwise ArgumentNullException;
+
+        public void Remove (object! key)
+            requires key != null otherwise ArgumentNullException;
+
+        public IDictionaryEnumerator GetEnumerator ();
+
+        public void CopyTo (Array! array, int arrayIndex)
+            requires array != null otherwise ArgumentNullException;
+            requires arrayIndex >= 0 otherwise ArgumentOutOfRangeException;
+
+        public bool ContainsValue (object value);
+
+        public bool ContainsKey (object! key)
+            requires key != null otherwise ArgumentNullException;
+
+        public bool Contains (object key);
+
+        public object Clone ();
+
+        public void Clear ();
+
+        public void Add (object! key, object value);
+
+        public Hashtable (IDictionary! d, Single loadFactor, IHashCodeProvider hcp, IComparer comparer)
+            requires d != null otherwise ArgumentNullException;
+
+        public Hashtable (IDictionary d, IHashCodeProvider hcp, IComparer comparer);
+
+        public Hashtable (IDictionary d, Single loadFactor);
+
+        public Hashtable (IDictionary d);
+
+        public Hashtable (int capacity, IHashCodeProvider hcp, IComparer comparer);
+
+        public Hashtable (IHashCodeProvider hcp, IComparer comparer);
+
+        public Hashtable (int capacity, Single loadFactor, IHashCodeProvider hcp, IComparer comparer)
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+            requires loadFactor >= 0 otherwise ArgumentOutOfRangeException;
+            requires loadFactor <= 0 otherwise ArgumentOutOfRangeException;
+
+        public Hashtable (int capacity, Single loadFactor);
+
+        public Hashtable (int capacity);
+
+        public Hashtable ();
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Collections.SortedList.sg b/base/Kernel/SpecSharp.Contracts/System.Collections.SortedList.sg
new file mode 100644
index 0000000..c9ca609
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Collections.SortedList.sg
@@ -0,0 +1,123 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace System.Collections
+{
+
+    public class SortedList
+    {
+
+        public object this [object key]
+        {
+          get;
+          set
+            requires key != null otherwise ArgumentNullException;
+        }
+
+        public int Capacity
+        {
+          get;
+          set;
+        }
+
+        public bool IsFixedSize
+        {
+          get;
+        }
+
+        public ICollection! Values
+        {
+          get;
+        }
+
+        public object SyncRoot
+        {
+          get;
+        }
+
+        public bool IsSynchronized
+        {
+          get;
+        }
+
+        public ICollection! Keys
+        {
+          get;
+        }
+
+        public int Count
+        {
+          get;
+        }
+
+        public bool IsReadOnly
+        {
+          get;
+        }
+
+        public void TrimToSize ();
+
+        public static SortedList! Synchronized (SortedList! list)
+            requires list != null otherwise ArgumentNullException;
+
+        public void SetByIndex (int index, object value)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+
+        public void Remove (object key);
+
+        public void RemoveAt (int index)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+
+        public int IndexOfValue (object value);
+
+        public int IndexOfKey (object! key)
+            requires key != null otherwise ArgumentNullException;
+
+        public IList GetValueList ();
+
+        public IList GetKeyList ();
+
+        public object GetKey (int index)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+
+        public IDictionaryEnumerator GetEnumerator ();
+
+        public object GetByIndex (int index)
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+
+        public void CopyTo (Array! array, int arrayIndex)
+            requires array != null otherwise ArgumentNullException;
+            requires arrayIndex >= 0 otherwise ArgumentOutOfRangeException;
+
+        public bool ContainsValue (object value);
+
+        public bool ContainsKey (object key);
+
+        public bool Contains (object key);
+
+        public object Clone ();
+
+        public void Clear ();
+
+        public void Add (object! key, object value)
+            requires key != null otherwise ArgumentNullException;
+
+        public SortedList (IDictionary! d, IComparer comparer)
+            requires d != null otherwise ArgumentNullException;
+
+        public SortedList (IDictionary d);
+
+        public SortedList (IComparer comparer, int capacity);
+
+        public SortedList (IComparer comparer);
+
+        public SortedList (int initialCapacity)
+            requires initialCapacity >= 0 otherwise ArgumentOutOfRangeException;
+
+        public SortedList ();
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Int32.sg b/base/Kernel/SpecSharp.Contracts/System.Int32.sg
new file mode 100644
index 0000000..171e45f
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Int32.sg
@@ -0,0 +1,13 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+namespace System {
+
+    public struct Int32 {
+
+        public String! ToString();
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Object.sg b/base/Kernel/SpecSharp.Contracts/System.Object.sg
new file mode 100644
index 0000000..8c9f24c
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Object.sg
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SpecSharp.Collections;
+
+namespace System
+{
+	public class Object
+	{
+		public new Type! GetType();
+
+        public string! ToString();
+	}
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.String.sg b/base/Kernel/SpecSharp.Contracts/System.String.sg
new file mode 100644
index 0000000..b9a9d18
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.String.sg
@@ -0,0 +1,344 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace System
+{
+
+    public class String
+    {
+
+        public char this [int index]
+        {
+          get
+			requires 0 <= index && index < this.Length otherwise IndexOutOfRangeException;
+        }
+
+        public int Length
+        {
+            [Microsoft.Contracts.StateIndependent] get
+			ensures result >= 0;
+        }
+
+        public CharEnumerator GetEnumerator ();
+
+        public TypeCode GetTypeCode ();
+
+        public static String IsInterned (String! str)
+            requires str != null otherwise ArgumentNullException;
+            ensures result != null ==> result.Length == str.Length;
+
+        public static String Intern (String! str)
+            requires str != null otherwise ArgumentNullException;
+            ensures result.Length == str.Length;
+
+        public static String! Concat (String[]! values)
+            requires values != null otherwise ArgumentNullException;
+            //ensures result.Length == Sum({ String s in values; s.Length });
+
+        public static String! Concat (String str0, String str1, String str2, String str3)
+			ensures result.Length == 
+				(str0 == null ? 0 : str0.Length) +
+				(str1 == null ? 0 : str1.Length) +
+				(str2 == null ? 0 : str2.Length) +
+				(str3 == null ? 0 : str3.Length);
+
+        public static String! Concat (String str0, String str1, String str2)
+			ensures result.Length == 
+				(str0 == null ? 0 : str0.Length) +
+				(str1 == null ? 0 : str1.Length) +
+				(str2 == null ? 0 : str2.Length);
+
+        public static String! Concat (String str0, String str1)
+			ensures result.Length == 
+				(str0 == null ? 0 : str0.Length) +
+				(str1 == null ? 0 : str1.Length);
+
+        public static String! Concat (object[]! args)
+            requires args != null otherwise ArgumentNullException;
+
+        public static String! Concat (object arg0, object arg1, object arg2, object arg3);
+
+        public static String! Concat (object arg0, object arg1, object arg2);
+
+        public static String! Concat (object arg0, object arg1);
+
+        public static String! Concat (object arg0);
+
+        public static String Copy (String! str)
+            requires str != null otherwise ArgumentNullException;
+
+        public static String! Format (String format, object[] args);
+
+        public static String! Format (String format, object arg0, object arg1, object arg2);
+
+        public static String! Format (String format, object arg0, object arg1);
+
+        public static String! Format (String format, object arg0);
+
+        public String! Remove (int index, int count)
+			requires 0 <= index otherwise ArgumentOutOfRangeException;
+			requires index + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures result.Length == this.Length - count;
+
+        public String! Replace (String! oldValue, String newValue)
+			requires oldValue != null otherwise ArgumentNullException;
+			requires oldValue.Length > 0 otherwise ArgumentException;
+
+        public String! Replace (char oldChar, char newChar);
+
+        public String! Insert (int startIndex, String! value)
+			requires value != null otherwise ArgumentNullException;
+			requires 0 <= startIndex otherwise ArgumentOutOfRangeException;
+			requires startIndex < this.Length otherwise ArgumentOutOfRangeException;
+			ensures result.Length == this.Length + value.Length;
+
+        public String! Trim ();
+
+        public String! ToUpper (System.Globalization.CultureInfo! culture)
+            requires culture != null otherwise ArgumentNullException;
+            ensures result.Length == this.Length; // Are there languages for which this isn't true?!?
+
+        public String! ToUpper ()
+            ensures result.Length == this.Length;
+
+        public String! ToLower (System.Globalization.CultureInfo! culture)
+            requires culture != null otherwise ArgumentNullException;
+            ensures result.Length == this.Length;
+
+        public String! ToLower ()
+            ensures result.Length == this.Length;
+
+        public bool StartsWith (String! value)
+            requires value != null otherwise ArgumentNullException;
+
+        public String! PadRight (int totalWidth, char paddingChar)
+			requires totalWidth >= 0 otherwise ArgumentException;
+			ensures result.Length == totalWidth;
+
+        public String! PadRight (int totalWidth)
+			requires totalWidth >= 0 otherwise ArgumentException;
+			ensures result.Length == totalWidth;
+
+        public String! PadLeft (int totalWidth, char paddingChar)
+			requires totalWidth >= 0 otherwise ArgumentException;
+			ensures result.Length == totalWidth;
+
+        public String! PadLeft (int totalWidth)
+			requires totalWidth >= 0 otherwise ArgumentException;
+			ensures result.Length == totalWidth;
+
+        public int LastIndexOf (String! value, int startIndex, int count)
+			requires value != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOf (String! value, int startIndex)
+			requires value != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOf (String! value)
+			requires value != null otherwise ArgumentNullException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOfAny (char[]! anyOf, int startIndex, int count)
+			requires anyOf != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOfAny (char[]! anyOf, int startIndex)
+			requires anyOf != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOfAny (char[]! anyOf)
+			requires anyOf != null otherwise ArgumentNullException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOf (char arg0, int startIndex, int count)
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOf (char value, int startIndex)
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int LastIndexOf (char value)
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOf (String! value, int startIndex, int count)
+			requires value != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOf (String! value, int startIndex)
+			requires value != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOf (String! value)
+			requires value != null otherwise ArgumentNullException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOfAny (char[]! anyOf, int startIndex, int count)
+			requires anyOf != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOfAny (char[]! anyOf, int startIndex)
+			requires anyOf != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOfAny (char[]! anyOf)
+			requires anyOf != null otherwise ArgumentNullException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOf (char arg0, int startIndex, int count)
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex + count <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOf (char value, int startIndex)
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+			requires startIndex <= Length otherwise ArgumentOutOfRangeException;
+			ensures -1 <= result && result < this.Length;
+
+        public int IndexOf (char value)
+			ensures -1 <= result && result < this.Length;
+
+        public bool EndsWith (String! value)
+            requires value != null otherwise ArgumentNullException;
+
+        public static int CompareOrdinal (String strA, int indexA, String strB, int indexB, int length);
+
+        public static int CompareOrdinal (String strA, String strB);
+
+        public int CompareTo (String strB);
+
+        public int CompareTo (object value);
+
+        public static int Compare (String strA, int indexA, String strB, int indexB, int length, bool ignoreCase, System.Globalization.CultureInfo! culture)
+            requires culture != null otherwise ArgumentNullException;
+
+        public static int Compare (String strA, int indexA, String strB, int indexB, int length, bool ignoreCase);
+
+        public static int Compare (String strA, int indexA, String strB, int indexB, int length);
+
+        public static int Compare (String strA, String strB, bool ignoreCase, System.Globalization.CultureInfo! culture)
+            requires culture != null otherwise ArgumentNullException;
+
+        public static int Compare (String strA, String strB, bool ignoreCase);
+
+        public static int Compare (String strA, String strB);
+
+        public String (char c, int count)
+			ensures this.Length == count;
+
+        public String (char[] array) // maybe null
+			ensures array == null ==> this.Length == 0;
+			ensures array != null ==> this.Length == array.Length;
+
+        public String (char[]! value, int startIndex, int count)
+			requires value != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex + count <= value.Length otherwise ArgumentOutOfRangeException;
+            ensures this.Length == count;
+
+/* These should all be pointer arguments
+
+        public String (ref SByte arg0, int arg1, int arg2, System.Text.Encoding arg3);
+
+        public String (ref SByte arg0, int arg1, int arg2);
+
+        public String (ref SByte arg0);
+
+        public String (ref char arg0, int arg1, int arg2);
+
+        public String (ref char arg0);
+ */
+
+        public String! TrimEnd (params char[] trimChars); // maybe null
+
+        public String! TrimStart (params char[] trimChars); // maybe null
+
+        public String! Trim (params char[] trimChars); // maybe null
+
+        public String! Substring (int startIndex, int length)
+			requires 0 <= startIndex otherwise ArgumentOutOfRangeException;
+			requires 0 <= length otherwise ArgumentOutOfRangeException;
+			requires startIndex + length < this.Length otherwise ArgumentOutOfRangeException;
+			ensures result.Length == length;
+
+        public String! Substring (int startIndex)
+			requires 0 <= startIndex otherwise ArgumentOutOfRangeException;
+			requires startIndex < this.Length otherwise ArgumentOutOfRangeException;
+			ensures result.Length == this.Length - startIndex;
+
+        public String[]! Split (char[] arg0, int arg1);
+			//ensures Forall {int i in (0:result.Length); result[i] != null};
+
+        public String[]! Split (char[] separator);
+			//ensures Forall {int i in (0:result.Length); result[i] != null};
+
+        public char[]! ToCharArray (int startIndex, int length)
+            requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex <= this.Length otherwise ArgumentOutOfRangeException;
+            requires startIndex + length <= this.Length otherwise ArgumentOutOfRangeException;
+            requires length >= 0 otherwise ArgumentOutOfRangeException;
+
+        public char[]! ToCharArray ();
+
+        public void CopyTo (int sourceIndex, char[]! destination, int destinationIndex, int count)
+            requires destination != null otherwise ArgumentNullException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires sourceIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count <= (this.Length - sourceIndex) otherwise ArgumentOutOfRangeException;
+            requires destinationIndex <= (destination.Length - count) otherwise ArgumentOutOfRangeException;
+            requires destinationIndex >= 0 otherwise ArgumentOutOfRangeException;
+
+        public static bool operator != (String a, String b);
+
+        public static bool operator == (String a, String b);
+
+        public static bool Equals (String a, String b);
+
+        public bool Equals (String arg0);
+
+        public static String Join (String separator, String[]! value, int startIndex, int count)
+            requires value != null otherwise ArgumentNullException;
+			requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex + count <= value.Length otherwise ArgumentOutOfRangeException;
+
+        public static String Join (String separator, String[]! value)
+            requires value != null otherwise ArgumentNullException;
+
+        public static String! StringCTOR(char[]! value, int startIndex,
+                                         int length);
+
+
+        public static readonly String! Empty;
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Text.Encoding.sg b/base/Kernel/SpecSharp.Contracts/System.Text.Encoding.sg
new file mode 100644
index 0000000..139b94e
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Text.Encoding.sg
@@ -0,0 +1,156 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace System.Text
+{
+
+    public class Encoding
+    {
+
+        public int WindowsCodePage
+        {
+          get;
+        }
+
+        public bool IsMailNewsDisplay
+        {
+          get;
+        }
+
+        public static Encoding! UTF8
+        {
+          get;
+        }
+
+        public static Encoding! Default
+        {
+          get;
+        }
+
+        public bool IsMailNewsSave
+        {
+          get;
+        }
+
+        public string EncodingName
+        {
+          get;
+        }
+
+        public string BodyName
+        {
+          get;
+        }
+
+        public static Encoding! UTF7
+        {
+          get;
+        }
+
+        public string HeaderName
+        {
+          get;
+        }
+
+        public int CodePage
+        {
+          get;
+        }
+
+        public bool IsBrowserSave
+        {
+          get;
+        }
+
+        public static Encoding! Unicode
+        {
+          get;
+        }
+
+        public string WebName
+        {
+          get;
+        }
+
+        public static Encoding! BigEndianUnicode
+        {
+          get;
+        }
+
+        public static Encoding! ASCII
+        {
+          get;
+        }
+
+        public bool IsBrowserDisplay
+        {
+          get;
+        }
+
+        public string! GetString (byte[] bytes, int index, int count);
+
+        public string! GetString (byte[]! bytes)
+            requires bytes != null otherwise ArgumentNullException;
+
+        public int GetMaxCharCount (int arg0);
+
+        public int GetMaxByteCount (int arg0);
+
+        public Encoder GetEncoder ();
+
+        public Decoder GetDecoder ();
+
+        public int GetChars (byte[] arg0, int arg1, int arg2, char[] arg3, int arg4);
+
+        public char[]! GetChars (byte[] bytes, int index, int count);
+
+        public char[]! GetChars (byte[]! bytes)
+            requires bytes != null otherwise ArgumentNullException;
+
+        public int GetCharCount (byte[] arg0, int arg1, int arg2);
+
+        public int GetCharCount (byte[]! bytes)
+            requires bytes != null otherwise ArgumentNullException;
+
+        public int GetBytes (string! s, int charIndex, int charCount, byte[] bytes, int byteIndex)
+            requires s != null otherwise ArgumentNullException;
+
+        public byte[]! GetBytes (string! s)
+            requires s != null otherwise ArgumentNullException;
+
+        public int GetBytes (char[] arg0, int arg1, int arg2, byte[] arg3, int arg4);
+
+        public byte[]! GetBytes (char[] chars, int index, int count);
+
+        public byte[]! GetBytes (char[]! chars)
+            requires chars != null otherwise ArgumentNullException;
+
+        public int GetByteCount (char[] arg0, int arg1, int arg2);
+
+        public int GetByteCount (string! s)
+            requires s != null otherwise ArgumentNullException;
+
+        public int GetByteCount (char[]! chars)
+            requires chars != null otherwise ArgumentNullException;
+
+        public byte[]! GetPreamble ();
+
+        public static Encoding GetEncoding (string name);
+
+        public static Encoding GetEncoding (int codepage)
+            requires codepage >= 0 otherwise ArgumentOutOfRangeException;
+            requires codepage <= 65535 otherwise ArgumentOutOfRangeException;
+
+        public static byte[] Convert (Encoding! srcEncoding, Encoding! dstEncoding, byte[]! bytes, int index, int count)
+            requires srcEncoding != null otherwise ArgumentNullException;
+            requires dstEncoding != null otherwise ArgumentNullException;
+            requires bytes != null otherwise ArgumentNullException;
+
+        public static byte[] Convert (Encoding srcEncoding, Encoding dstEncoding, byte[]! bytes)
+            requires bytes != null otherwise ArgumentNullException;
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Text.StringBuilder.sg b/base/Kernel/SpecSharp.Contracts/System.Text.StringBuilder.sg
new file mode 100644
index 0000000..c37e251
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Text.StringBuilder.sg
@@ -0,0 +1,173 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace System.Text
+{
+
+    public class StringBuilder
+    {
+
+        public Char this [int index]
+        {
+          get;
+          set;
+        }
+
+        public int MaxCapacity
+        {
+          get;
+        }
+
+        public int Length
+        {
+          get;
+          set;
+        }
+
+        public int Capacity
+        {
+          get;
+          set;
+        }
+
+        public StringBuilder Replace (Char oldChar, Char newChar, int startIndex, int count)
+            requires count >= 0 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder Replace (Char oldChar, Char newChar);
+
+        public bool Equals (StringBuilder sb);
+
+        public StringBuilder Replace (string arg0, string arg1, int arg2, int arg3);
+
+        public StringBuilder Replace (string oldValue, string newValue);
+
+        public StringBuilder AppendFormat (string format, Object[] args);
+
+        public StringBuilder AppendFormat (string format, object arg0, object arg1, object arg2);
+
+        public StringBuilder AppendFormat (string format, object arg0, object arg1);
+
+        public StringBuilder AppendFormat (string format, object arg0);
+
+        public StringBuilder Insert (int index, object value);
+
+        public StringBuilder Insert (int index, UInt64 value);
+
+        public StringBuilder Insert (int index, UInt32 value);
+
+        public StringBuilder Insert (int index, UInt16 value);
+
+        public StringBuilder Insert (int index, Decimal value);
+
+        public StringBuilder Insert (int index, double value);
+
+        public StringBuilder Insert (int index, Single value);
+
+        public StringBuilder Insert (int index, Int64 value);
+
+        public StringBuilder Insert (int index, int value);
+
+        public StringBuilder Insert (int arg0, Char[] arg1, int arg2, int arg3);
+
+        public StringBuilder Insert (int index, Char[] value);
+
+        public StringBuilder Insert (int index, Char value);
+
+        public StringBuilder Insert (int index, Int16 value);
+
+        public StringBuilder Insert (int index, byte value);
+
+        public StringBuilder Insert (int index, SByte value);
+
+        public StringBuilder Insert (int index, bool value);
+
+        public StringBuilder Insert (int index, string value);
+
+        public StringBuilder Append (Char[] value);
+
+        public StringBuilder Append (object value);
+
+        public StringBuilder Append (UInt64 value);
+
+        public StringBuilder Append (UInt32 value);
+
+        public StringBuilder Append (UInt16 value);
+
+        public StringBuilder Append (Decimal value);
+
+        public StringBuilder Append (double value);
+
+        public StringBuilder Append (Single value);
+
+        public StringBuilder Append (Int64 value);
+
+        public StringBuilder Append (int value);
+
+        public StringBuilder Append (Int16 value);
+
+        public StringBuilder Append (Char value);
+
+        public StringBuilder Append (byte value);
+
+        public StringBuilder Append (SByte value);
+
+        public StringBuilder Append (bool value);
+
+        public StringBuilder Remove (int arg0, int arg1);
+
+        public StringBuilder Insert (int index, string! value, int count)
+            requires value != null || index == 0 otherwise ArgumentNullException;
+            requires count == 0 otherwise ArgumentNullException;
+            requires index >= 0 otherwise ArgumentOutOfRangeException;
+            requires count >= 1 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder Append (string! value, int startIndex, int count)
+            requires value != null || startIndex == 0 otherwise ArgumentNullException;
+            requires count == 0 otherwise ArgumentNullException;
+            requires count > 0 || count == 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires startIndex <= (value.Length - count) otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder Append (string value);
+
+        public StringBuilder Append (Char[]! value, int startIndex, int charCount)
+            requires value != null || startIndex == 0 otherwise ArgumentNullException;
+            requires charCount == 0 otherwise ArgumentNullException;
+            requires charCount == 0 || startIndex >= 0 otherwise ArgumentOutOfRangeException;
+            requires charCount >= 0 otherwise ArgumentOutOfRangeException;
+            requires charCount <= (value.Length - startIndex) otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder Append (Char value, int repeatCount)
+            requires repeatCount == 0 || repeatCount >= 0 otherwise ArgumentOutOfRangeException;
+
+        public string! ToString (int startIndex, int length);
+
+        public string! ToString ();
+
+        public int EnsureCapacity (int capacity)
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder (int capacity, int maxCapacity)
+            requires capacity <= maxCapacity otherwise ArgumentOutOfRangeException;
+            requires maxCapacity >= 1 otherwise ArgumentOutOfRangeException;
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder (string value, int startIndex, int length, int capacity)
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+            requires length >= 0 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder (string value, int capacity)
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder (string value);
+
+        public StringBuilder (int capacity)
+            requires capacity >= 0 otherwise ArgumentOutOfRangeException;
+
+        public StringBuilder ();
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.Threading.Thread.sg b/base/Kernel/SpecSharp.Contracts/System.Threading.Thread.sg
new file mode 100644
index 0000000..f9ab9df
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.Threading.Thread.sg
@@ -0,0 +1,164 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Singularity;
+
+namespace System.Threading
+{
+
+    public class Thread
+    {
+
+        public System.Globalization.CultureInfo! CurrentUICulture
+        {
+          get;
+          set
+            requires value != null otherwise ArgumentNullException;
+        }
+
+        public bool IsBackground
+        {
+          get;
+          set;
+        }
+
+        public bool IsThreadPoolThread
+        {
+          get;
+        }
+
+        public static Thread! CurrentThread
+        {
+          get;
+        }
+
+        public ThreadState ThreadState
+        {
+          get;
+        }
+
+        public bool IsAlive
+        {
+          get;
+        }
+
+        public string Name
+        {
+          get;
+          set;
+        }
+
+        public System.Globalization.CultureInfo! CurrentCulture
+        {
+          get;
+          set
+            requires value != null otherwise ArgumentNullException;
+        }
+
+        public static void MemoryBarrier ();
+
+        public static void VolatileWrite (ref object arg0, object arg1);
+
+        public static void VolatileWrite (ref double arg0, double arg1);
+
+        public static void VolatileWrite (ref Single arg0, Single arg1);
+
+        public static void VolatileWrite (ref UInt64 arg0, UInt64 arg1);
+
+        public static void VolatileWrite (ref UInt32 arg0, UInt32 arg1);
+
+        public static void VolatileWrite (ref int arg0, int arg1);
+
+        //public static void VolatileWrite (ref UInt32 arg0, UInt32 arg1);  WHERE DID THE REDUNDANT ONE COME FROM?
+
+        public static void VolatileWrite (ref UInt16 arg0, UInt16 arg1);
+
+        public static void VolatileWrite (ref SByte arg0, SByte arg1);
+
+        public static void VolatileWrite (ref Int64 arg0, Int64 arg1);
+
+        public static void VolatileWrite (ref IntPtr arg0, IntPtr arg1);
+
+        public static void VolatileWrite (ref Int16 arg0, Int16 arg1);
+
+        public static void VolatileWrite (ref byte arg0, byte arg1);
+
+        public static object VolatileRead (ref object arg0);
+
+        public static double VolatileRead (ref double arg0);
+
+        public static Single VolatileRead (ref Single arg0);
+
+        public static UInt64 VolatileRead (ref UInt64 arg0);
+
+        public static UInt32 VolatileRead (ref UInt32 arg0);
+
+        public static int VolatileRead (ref int arg0);
+
+        //public static UInt32 VolatileRead (ref UInt32 arg0);   WHERE DID THE REDUNDANT ONE COME FROM?
+
+        public static UInt16 VolatileRead (ref UInt16 arg0);
+
+        public static SByte VolatileRead (ref SByte arg0);
+
+        public static Int64 VolatileRead (ref Int64 arg0);
+
+        public static int VolatileRead (ref IntPtr arg0);
+
+        public static Int16 VolatileRead (ref Int16 arg0);
+
+        public static byte VolatileRead (ref byte arg0);
+
+        public static int GetDomainID ();
+
+        public static void SetData (LocalDataStoreSlot slot, object data);
+
+        public static object GetData (LocalDataStoreSlot slot);
+
+        public static void FreeNamedDataSlot (string name);
+
+        public static LocalDataStoreSlot GetNamedDataSlot (string name);
+
+        public static LocalDataStoreSlot AllocateNamedDataSlot (string name);
+
+        public static LocalDataStoreSlot AllocateDataSlot ();
+
+        public static void SpinWait (int arg0);
+
+        public static void Sleep (TimeSpan timeout);
+
+        public static void Sleep (int arg0);
+
+        public bool Join (TimeSpan timeout);
+
+        public bool Join (int arg0);
+
+        public void Join ();
+
+        public void Interrupt ();
+
+        public void Resume ();
+
+        public void Suspend ();
+
+        public static void ResetAbort ();
+
+        public void Abort ();
+
+        public void Abort (object stateInfo);
+
+        public void Start ();
+
+        public Thread (ThreadStart! start)
+            requires start != null otherwise ArgumentNullException;
+
+#if SINGULARITY_KERNEL
+        public static Thread! CreateThread(Process process,
+                                           ThreadStart! start);
+#endif
+
+    }
+}
diff --git a/base/Kernel/SpecSharp.Contracts/System.ValueType.sg b/base/Kernel/SpecSharp.Contracts/System.ValueType.sg
new file mode 100644
index 0000000..ca0c202
--- /dev/null
+++ b/base/Kernel/SpecSharp.Contracts/System.ValueType.sg
@@ -0,0 +1,13 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+
+namespace System {
+
+    public class ValueType {
+
+        public override string! ToString();
+    }
+}
diff --git a/base/Kernel/System.Compiler.Runtime/AssemblyInfo.cs b/base/Kernel/System.Compiler.Runtime/AssemblyInfo.cs
new file mode 100644
index 0000000..ff8a43d
--- /dev/null
+++ b/base/Kernel/System.Compiler.Runtime/AssemblyInfo.cs
@@ -0,0 +1,14 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("System.Compiler.Runtime")]
+[assembly: AssemblyDescription("Extensions to the Common Language Runtime used by the Common Compiler Infrastructure")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("Microsoft (R) .NET Framework")]
+[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation.  All rights reserved.")]
+[assembly: AssemblyTrademark("Microsoft and Windows are either registered trademarks or trademarks of Microsoft Corporation in the U.S. and/or other countries")]
+// Singularity specific version of this library
+[assembly: AssemblyVersion("1.0.5031.5")]
+[assembly: AssemblyKeyFile("public.snk")]
+[assembly: AssemblyDelaySign(true)]
+
diff --git a/base/Kernel/System.Compiler.Runtime/Classes.cs b/base/Kernel/System.Compiler.Runtime/Classes.cs
new file mode 100644
index 0000000..24b2e77
--- /dev/null
+++ b/base/Kernel/System.Compiler.Runtime/Classes.cs
@@ -0,0 +1,6451 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+#if WHIDBEYwithGenerics
+#if CCINamespace
+namespace Microsoft.Cci{
+#else
+namespace System.Compiler{
+#endif
+  /// <summary>
+  /// Tells a sympathetic compiler that the name of the entity bearing this attribute should be suppressed. When applied to a class or enum,
+  /// this means that the members of the class or enum should be injected into the same scope as would have contained the class/enum name.
+  /// When applied to a field or property, it means that the members of structure of the type of the field/property should be visible
+  /// without qualification by the field/property name.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Field|AttributeTargets.Property|AttributeTargets.Class|AttributeTargets.Enum)]
+  public sealed class AnonymousAttribute: Attribute{
+    private Anonymity type;
+    public AnonymousAttribute(){
+      this.type = Anonymity.Structural;
+    }
+    public Anonymity Anonymity{
+      get {return this.type;}
+    }
+  }  
+  public enum Anonymity{
+    Unknown,
+    None,
+    Structural,
+    Full
+  }
+  public enum CciMemberKind {
+    Unknown,
+    Regular,
+    Auxiliary,
+    FrameGuardGetter,
+  }
+  [AttributeUsage(AttributeTargets.All)]
+  public class CciMemberKindAttribute : Attribute {
+    public CciMemberKind Kind;
+    public CciMemberKindAttribute(CciMemberKind kind) {
+      this.Kind = kind;
+    }
+  }
+  [AttributeUsage(AttributeTargets.Class)]
+  public sealed class ComposerAttribute: Attribute{
+    public string AssemblyName = null;
+    public string TypeName = null;
+    public ComposerAttribute(){
+    }
+  }
+  [AttributeUsage(AttributeTargets.Assembly|AttributeTargets.Module, AllowMultiple=true)]
+  public sealed class CustomVisitorAttribute : Attribute{
+    public string Assembly;
+    public string Class;
+    public string Phase;
+    public bool Replace;
+    public CustomVisitorAttribute(){
+    }
+  }
+  [AttributeUsage(AttributeTargets.Class|AttributeTargets.Field|AttributeTargets.Property|AttributeTargets.Method)]
+  public sealed class ElementTypeAttribute: Attribute{
+    public Type ElementType = null;
+    public ElementTypeAttribute(){
+    }
+  }  
+  public interface ITemplateParameter{
+  }
+  [AttributeUsage(AttributeTargets.Interface|AttributeTargets.Class|AttributeTargets.Struct)]
+  public sealed class TemplateAttribute : System.Attribute{
+    public Type[] TemplateParameters;
+    public TemplateAttribute(params Type[] parameters){
+      this.TemplateParameters = parameters;
+    }
+  }
+  [AttributeUsage(AttributeTargets.Interface|AttributeTargets.Class|AttributeTargets.Delegate|AttributeTargets.Interface|AttributeTargets.Struct)]
+  public sealed class TemplateInstanceAttribute : System.Attribute{
+    public Type Template;
+    public Type[] TemplateArguments;
+    public TemplateInstanceAttribute(Type template, params Type[] arguments){
+      this.Template = template;
+    }
+  }
+
+  namespace Diagnostics{
+    public sealed class Debug{
+      public static void Assert(bool condition){
+        System.Diagnostics.Debug.Assert(condition);
+      }
+    }
+  }
+}
+namespace System.Data{
+  public interface IDbTransactable{ //TODO: move to Query namespace
+    IDbTransaction BeginTransaction();
+    IDbTransaction BeginTransaction(IsolationLevel level);
+  }
+}
+namespace StructuralTypes{
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+  using System.Collections;
+  using System.Collections.Generic;
+  using SCIEnumerator = System.Collections.IEnumerator;
+ 
+  public interface IConstrainedType{}
+  public interface ITupleType{}
+  public interface ITypeUnion{}
+  public interface ITypeIntersection{}
+  public interface ITypeAlias{}
+  public interface ITypeDefinition{}
+
+  public struct Boxed<ElementType> : IEnumerable<ElementType>, IEnumerable{
+    private ElementType[] box;
+    public Boxed(ElementType value){
+      this.box = new ElementType[]{value};
+    }
+    public ElementType GetValue(){
+      return this.box[0];
+    }
+    public void SetValue(ElementType value){
+      this.box[0] = value;
+    }
+    public object ToObject(){
+      if (this.box == null) return null;
+      return this.box[0];
+    }
+    public bool IsNull(){
+      return this.box == null;
+    }
+    IEnumerator IEnumerable.GetEnumerator() {
+      return new BoxedEnumerator<ElementType>(this.box);
+    }
+    IEnumerator<ElementType> IEnumerable<ElementType>.GetEnumerator(){
+      return new BoxedEnumerator<ElementType>(this.box);
+    }
+    public BoxedEnumerator<ElementType> GetEnumerator(){
+      return new BoxedEnumerator<ElementType>(this.box);
+    }
+    public void Clear(){
+      this.box = null;
+    }
+    public static implicit operator Boxed<ElementType>(ElementType value){
+      return new Boxed<ElementType>(value);
+    }
+    public static explicit operator ElementType(Boxed<ElementType> boxed){
+      return boxed.GetValue();
+    }
+    public static bool operator == (Boxed<ElementType> a, Boxed<ElementType> b){
+      if (a.box == null || b.box == null) return false;
+      return a.box[0].Equals(b.box[0]);
+    }
+    public static bool operator == (Boxed<ElementType> a, object o){
+      return a.Equals(o);
+    }
+    public static bool operator != (Boxed<ElementType> a, object o){
+      return !a.Equals(o);
+    }
+    public static bool operator == (object o, Boxed<ElementType> b){
+      return b.Equals(o);
+    }
+    public static bool operator != (object o, Boxed<ElementType> b){
+      return !b.Equals(o);
+    }
+    public static bool operator != (Boxed<ElementType> a, Boxed<ElementType> b){
+      if (a.box == null || b.box == null) return false;
+      return !a.box[0].Equals(b.box[0]);
+    }
+    public override bool Equals(object o){
+      if (this.box == null) return o == null;
+      if (!(o is Boxed<ElementType>)) return false;
+      Boxed<ElementType> b = (Boxed<ElementType>) o;
+      if (this.box == null || b.box == null) return this.box == b.box;
+      return this.box[0].Equals(b.box[0]);
+ 
+    }
+    public override int GetHashCode(){
+      return this.box[0].GetHashCode();
+    }
+  }
+  public struct BoxedEnumerator<ElementType>: IEnumerator<ElementType>, IEnumerator{
+    private ElementType[] box;
+    private int index;
+    internal BoxedEnumerator(ElementType[] box){
+      this.box = box;
+      this.index = -1;
+    }
+    object IEnumerator.Current{
+      get{
+        return this.box[0];
+      }
+    }
+    public ElementType Current{
+      get{ 
+        return this.box[0];
+      }
+    }
+    void IEnumerator.Reset() {
+      this.index = -1;
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      if (this.box == null) return false;
+      return ++this.index == 0;
+    }
+  }
+  public struct Invariant<ElementType>{
+    private ElementType value;
+    public Invariant(ElementType value){
+      if (value == null) throw new ArgumentNullException();
+      if (value.GetType() != typeof(ElementType)) throw new ArgumentException();
+      this.value = value;
+    }
+    public ElementType GetValue(){
+      return this.value;
+    }
+    public object ToObject(){
+      return this.value;
+    }
+    public static implicit operator ElementType(Invariant<ElementType> invariantValue){
+      return invariantValue.value;
+    }
+    public static implicit operator NonNull<ElementType>(Invariant<ElementType> invariantValue){
+      return new NonNull<ElementType>(invariantValue.value);
+    }
+    public static explicit operator Invariant<ElementType>(ElementType value){
+      return new Invariant<ElementType>(value);
+    }
+  }
+  public struct NonNull<ElementType>: IEnumerable<ElementType>, IEnumerable{
+    private ElementType value;
+    public NonNull(ElementType value){
+      if (value == null) throw new ArgumentNullException();
+      this.value = value;
+    }
+    public ElementType GetValue(){
+      return this.value;
+    }
+    public object ToObject(){
+      return this.value;
+    }
+    IEnumerator IEnumerable.GetEnumerator(){
+        return new ValueEnumerator<ElementType>(this.value);
+    }
+    IEnumerator<ElementType> IEnumerable<ElementType>.GetEnumerator(){
+      return new ValueEnumerator<ElementType>(this.value);
+    }
+    public ValueEnumerator<ElementType> GetEnumerator(){
+      return new ValueEnumerator<ElementType>(this.value);
+    }
+    public static implicit operator ElementType(NonNull<ElementType> nonNullValue){
+      return nonNullValue.value;
+    }
+    public static explicit operator NonNull<ElementType>(ElementType value){
+      return new NonNull<ElementType>(value);
+    }
+  }
+  public struct NonEmptyIEnumerable<ElementType>: IEnumerable<ElementType>, IEnumerable{
+    IEnumerable<ElementType> enumerable;
+    public NonEmptyIEnumerable(IEnumerable<ElementType> enumerable){
+      this.enumerable = enumerable;
+      if (enumerable == null) 
+        throw new ArgumentNullException();
+      if (!(enumerable is IEnumerable))
+        throw new ArgumentException();
+      IEnumerator<ElementType> enumerator = enumerable.GetEnumerator();
+      if (enumerator == null || !enumerator.MoveNext())
+        throw new ArgumentException();
+    }
+    public NonEmptyIEnumerable(ElementType element){
+      this.enumerable = new NonNull<ElementType>(element);
+    }
+    public ElementType GetValue(){
+      IEnumerator<ElementType> e = this.enumerable.GetEnumerator();
+      if (e.MoveNext()){
+        ElementType result = e.Current;
+        if (!e.MoveNext()) return result;
+      }
+      throw new ArgumentOutOfRangeException();
+    }
+    public object ToObject(){
+      if (this.enumerable is NonNull<ElementType>){
+        NonNull<ElementType> nnull = (NonNull<ElementType>)this.enumerable;
+        return nnull.ToObject();
+      }
+      if (this.enumerable is Boxed<ElementType>){
+        Boxed<ElementType> boxed = (Boxed<ElementType>)this.enumerable;
+        return boxed.ToObject();
+      }
+      return this.enumerable;
+    }
+    IEnumerator IEnumerable.GetEnumerator() {
+        return ((IEnumerable)this.enumerable).GetEnumerator();
+    }
+    public IEnumerator<ElementType> GetEnumerator(){
+      return this.enumerable.GetEnumerator();
+    }
+    public static implicit operator NonEmptyIEnumerable<ElementType>(NonNull<ElementType> element){
+      return new NonEmptyIEnumerable<ElementType>((IEnumerable<ElementType>)element);
+    }
+    public static explicit operator NonEmptyIEnumerable<ElementType>(ElementType element){
+      return new NonEmptyIEnumerable<ElementType>(element);
+    }
+    public static explicit operator NonEmptyIEnumerable<ElementType>(Boxed<ElementType> element){
+      return new NonEmptyIEnumerable<ElementType>((IEnumerable<ElementType>)element);
+    }
+    public static explicit operator NonEmptyIEnumerable<ElementType>(ElementType[] array){
+      return new NonEmptyIEnumerable<ElementType>(array);
+    }
+    public static explicit operator NonEmptyIEnumerable<ElementType>(List<ElementType> list){
+      return new NonEmptyIEnumerable<ElementType>(list);
+    }
+    public static explicit operator ElementType(NonEmptyIEnumerable<ElementType> nonEmptyIEnumerable){
+      return nonEmptyIEnumerable.GetValue();
+    }
+  }
+  public sealed class Unboxer<ElementType>{
+    public static object ToObject(IEnumerable<ElementType> collection){
+      if (collection is NonNull<ElementType>)
+        return ((NonNull<ElementType>)collection).ToObject();
+      if (collection is Boxed<ElementType>)
+        return ((Boxed<ElementType>)collection).ToObject();
+      return collection;
+    }
+  }
+  public struct ArrayEnumerator<ElementType>: IEnumerator<ElementType>, SCIEnumerator{
+    private ElementType[] array;
+    private int index;
+    public ArrayEnumerator(ElementType[] array){
+      this.array = array;
+      this.index = -1;
+    }
+    public ElementType Current{
+      get{
+        return this.array[this.index];
+      }
+    }
+    object SCIEnumerator.Current{
+      get{
+        return this.array[this.index];
+      }
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      return ++this.index < this.array.Length;
+    }
+    void SCIEnumerator.Reset(){
+      this.index = -1;
+    }
+  }
+  public sealed class GenericIEnumerableToGenericIListAdapter<ElementType>: IList<ElementType>, IEnumerable{
+    private List<ElementType> list;
+    private IEnumerable<ElementType> collection;
+    public GenericIEnumerableToGenericIListAdapter(IEnumerable<ElementType> collection){
+      if (collection == null) 
+        throw new ArgumentNullException();
+      if (!(collection is IEnumerable))
+        throw new ArgumentException();
+      this.collection = collection;
+    }
+
+    private List<ElementType>/*!*/ List{
+      get{
+        List<ElementType> result = this.list;
+        if (result == null){
+          result = new List<ElementType>();
+          this.list = result;
+          if (this.collection != null){
+            IEnumerator<ElementType> enumerator = this.collection.GetEnumerator();
+            if (enumerator != null){
+              while (enumerator.MoveNext()){
+                //result.Add(enumerator.Current);
+                ElementType curr = enumerator.Current;
+                result.Add(curr);
+              }
+            }
+          }
+        }
+        return result;
+      }
+    }
+    IEnumerator IEnumerable.GetEnumerator() {
+      if (this.list != null)
+        return this.list.GetEnumerator();
+      else
+        return ((IEnumerable)this.collection).GetEnumerator();
+    }
+    public IEnumerator<ElementType> GetEnumerator(){
+      if (this.list != null)
+        return this.list.GetEnumerator();
+      else
+        return this.collection.GetEnumerator();
+    }
+    public int Count{
+      get{
+        return this.List.Count;
+      }
+    }
+    public bool IsSynchronized{
+      get{
+        return false;
+      }
+    }
+    public object SyncRoot{
+      get{
+        return this;
+      }
+    }
+    void ICollection<ElementType>.CopyTo(ElementType[] array, int index){
+      this.List.CopyTo(array, index);
+    }
+
+    public bool IsFixedSize{
+      get{
+        return false;
+      }
+    }
+    public bool IsReadOnly{
+      get{
+        return false;
+      }
+    }
+    public ElementType this[int index]{
+      get{
+        return this.List[index];
+      }
+      set{
+        this.List[index] = value;
+      }
+    }
+    public void Add(ElementType value){
+      this.List.Add(value);
+    }
+    public void Clear(){
+      this.List.Clear();
+    }
+    public bool Contains(ElementType value){
+      return this.List.Contains(value);
+    }
+    public int IndexOf(ElementType value){
+      return this.List.IndexOf(value);
+    }
+    public void Insert(int index, ElementType value){
+      this.List.Insert(index, value);
+    }    
+    public bool Remove(ElementType value){
+      return this.List.Remove(value);
+    }
+    public void RemoveAt(int index){
+      this.List.RemoveAt(index);
+    }
+  }
+  public struct ValueEnumerator<ElementType>: IEnumerator<ElementType>, IEnumerator{
+    private ElementType value;
+    private int index;
+
+    public ValueEnumerator(ElementType value){
+      this.value = value;
+      this.index = -1;
+    }
+
+    object IEnumerator.Current{
+        get{
+            return this.value;
+        }
+    }
+    public ElementType Current{
+      get{
+        return this.value;
+      }
+    }
+    void IEnumerator.Reset(){
+        this.index = -1;
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      return ++this.index == 0;
+    }
+  }
+
+  public sealed class StreamUtility<ElementType>{
+    private StreamUtility(){}
+    public static bool IsNull(IEnumerable<ElementType> stream){
+      if (stream == null) return true;
+      IEnumerator<ElementType> enumerator = stream.GetEnumerator();
+      while (enumerator.MoveNext())
+        if (enumerator.Current != null) return false;
+      return true;
+    }
+  }
+}
+namespace System.Query{ //TODO: rename to Microsoft.Cci.Query
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+  using System.Collections.Generic;
+  using System.Data.SqlTypes;
+  using System.Text;
+
+  //TODO: this class should derive from SystemException and it should not contain a string
+  //The message, if any, should be obtained from a resource file
+  public class StreamNotSingletonException: Exception{
+    public StreamNotSingletonException(): base("Stream not singleton"){
+    }
+  }
+  
+  public interface IAggregate{
+  }
+  public interface IAggregateGroup{
+  }
+
+  public class Min: IAggregateGroup{
+    public struct MinOfByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(byte value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public byte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(short value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public short GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(int value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public int GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(long value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value)
+          this.value = value;
+      }
+      public long GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(float value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public float GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(double value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value)
+          this.value = value;
+      }
+      public double GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfDecimal: IAggregate{
+      decimal value;
+      bool hasValue;
+      public void Add(decimal value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value)
+          this.value = value;
+      }
+      public decimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfString: IAggregate{
+      string value;
+      public void Add(string value){
+        if (value != null){
+          if (this.value == null || value.CompareTo(this.value) < 0)
+            this.value = value;
+        }
+      }
+      public string GetValue(){
+        string result = this.value;
+        this.value = null;
+        return result;
+      }
+    }
+    public struct MinOfDateTime: IAggregate{
+      DateTime value;
+      bool hasValue;
+      public void Add(DateTime value){
+        if (!this.hasValue || value < this.value){
+          this.value = value;
+          this.hasValue = true;
+        }
+      }
+      public DateTime GetValue(){
+        DateTime result = this.value;
+        this.value = new DateTime();
+        this.hasValue = false;
+        return result;
+      }
+    }
+    public struct MinOfSqlByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(SqlByte value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (byte)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (byte)value;
+          }
+        }
+      }
+      public SqlByte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlByte.Null;
+      }
+    }
+    public struct MinOfSqlInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(SqlInt16 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (short)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (short)value;
+          }
+        }
+      }
+      public SqlInt16 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt16.Null;
+      }
+    }
+    public struct MinOfSqlInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (int)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (int)value;
+          }
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt32.Null;
+      }
+    }
+    public struct MinOfSqlInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (long)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (long)value;
+          }
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt64.Null;
+      }
+    }
+    public struct MinOfSqlSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(SqlSingle value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value.Value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = value.Value;
+          }
+        }
+      }
+      public SqlSingle GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlSingle.Null;
+      }
+    }
+    public struct MinOfSqlDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (double)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (double)value;
+          }
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDouble.Null;
+      }
+    }
+    public struct MinOfSqlDecimal: IAggregate{
+      SqlDecimal value;
+      bool hasValue;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = value;
+          }
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDecimal.Null;
+      }
+    }
+    public struct MinOfSqlMoney: IAggregate{
+      SqlMoney value;
+      bool hasValue;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = value;
+          }
+        }
+      }
+      public SqlMoney GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlMoney.Null;
+      }
+    }
+    public struct MinOfSqlString: IAggregate{
+      SqlString value;
+      bool hasValue;
+      public void Add(SqlString value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlString.LessThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlString GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlString.Null;
+      }
+    }
+    public struct MinOfSqlDateTime: IAggregate{
+      SqlDateTime value;
+      bool hasValue;
+      public void Add(SqlDateTime value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlDateTime.LessThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDateTime GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDateTime.Null;
+      }
+    }
+  }
+  public class Max: IAggregateGroup{
+    public struct MaxOfByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(byte value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public byte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(short value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public short GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(int value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public int GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(long value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public long GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(float value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public float GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(double value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public double GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfDecimal: IAggregate{
+      decimal value;
+      bool hasValue;
+      public void Add(decimal value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public decimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfString: IAggregate{
+      string value;
+      public void Add(string value){
+        if (value != null){
+          if (this.value == null || value.CompareTo(this.value) > 0)
+            this.value = value;
+        }
+      }
+      public string GetValue(){
+        string result = this.value;
+        this.value = null;
+        return result;
+      }
+    }
+    public struct MaxOfDateTime: IAggregate{
+      DateTime value;
+      bool hasValue;
+      public void Add(DateTime value){
+        if (!this.hasValue || value > this.value){
+          this.value = value;
+          this.hasValue = true;
+        }
+      }
+      public DateTime GetValue(){
+        DateTime result = this.value;
+        this.value = new DateTime();
+        this.hasValue = false;
+        return result;
+      }
+    }
+    public struct MaxOfSqlByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(SqlByte value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (byte)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (byte)value;
+        }
+      }
+      public SqlByte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlByte.Null;
+      }
+    }
+    public struct MaxOfSqlInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(SqlInt16 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (short)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (short)value;
+        }
+      }
+      public SqlInt16 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt16.Null;
+      }
+    }
+    public struct MaxOfSqlInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (int)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (int)value;
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt32.Null;
+      }
+    }
+    public struct MaxOfSqlInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (long)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (long)value;
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt64.Null;
+      }
+    }
+    public struct MaxOfSqlSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(SqlSingle value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value.Value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = value.Value;
+        }
+      }
+      public SqlSingle GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlSingle.Null;
+      }
+    }
+    public struct MaxOfSqlDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (double)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (double)value;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDouble.Null;
+      }
+    }
+    public struct MaxOfSqlDecimal: IAggregate{
+      SqlDecimal value;
+      bool hasValue;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = value;
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDecimal.Null;
+      }
+    }
+    public struct MaxOfSqlMoney: IAggregate{
+      SqlMoney value;
+      bool hasValue;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = value;
+        }
+      }
+      public SqlMoney GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlMoney.Null;
+      }
+    }
+    public struct MaxOfSqlString: IAggregate{
+      SqlString value;
+      bool hasValue;
+      public void Add(SqlString value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlString.GreaterThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlString GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlString.Null;
+      }
+    }
+    public struct MaxOfSqlDateTime: IAggregate{
+      SqlDateTime value;
+      bool hasValue;
+      public void Add(SqlDateTime value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlDateTime.GreaterThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDateTime GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDateTime.Null;
+      }
+    }
+  }
+  public class Sum: IAggregateGroup{
+    public struct SumOfInt32: IAggregate{
+      int total;
+      public void Add(int value){
+        this.total = this.total + value;
+      }
+      public int GetValue(){
+        int ret = this.total;
+        this.total = 0;
+        return ret;
+      }
+    }
+    public struct SumOfInt64: IAggregate{
+      long total;
+      public void Add(long value){
+        this.total = this.total + value;
+      }
+      public long GetValue(){
+        long ret = this.total;
+        this.total = 0;
+        return ret;
+      }
+    }
+    public struct SumOfDouble: IAggregate{
+      double total;
+      public void Add(double value){
+        this.total = this.total + value;
+      }
+      public double GetValue(){
+        double ret = this.total;
+        this.total = 0.0;
+        return ret;
+      }
+    }
+    public struct SumOfDecimal: IAggregate{
+      decimal total;
+      public void Add(decimal value){
+        this.total = this.total + value;
+      }
+      public decimal GetValue(){
+        decimal ret = this.total;
+        this.total = 0;
+        return ret;
+      }
+    }
+    public struct SumOfSqlInt32: IAggregate{
+      int total;
+      bool hasValue;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + (int) value;
+          else{
+            this.total = (int) value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (!this.hasValue){
+          return SqlInt32.Null;
+        }
+        this.hasValue = false;
+        return (SqlInt32) this.total;
+      }
+    }
+    public struct SumOfSqlInt64: IAggregate{
+      long total;
+      bool hasValue;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + (long) value;
+          else{
+            this.total = (long) value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (!this.hasValue) return SqlInt64.Null;
+        this.hasValue = false;
+        return (SqlInt64) this.total;
+      }
+    }
+    public struct SumOfSqlDouble: IAggregate{
+      SqlDouble total;
+      bool hasValue;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (this.hasValue){
+            this.total = this.total + value;
+          }else{
+            this.total = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDouble GetValue(){
+        if (!this.hasValue) return SqlDouble.Null;
+        this.hasValue = false;
+        return this.total;
+      }
+    }
+    public struct SumOfSqlDecimal: IAggregate{
+      SqlDecimal total;
+      bool hasValue;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + value;
+          else{
+            this.total = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (!this.hasValue) return SqlDecimal.Null;
+        this.hasValue = false;
+        return this.total;
+      }
+    }
+    public struct SumOfSqlMoney: IAggregate{
+      SqlMoney total;
+      bool hasValue;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + value;
+          else{
+            this.total = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlMoney GetValue(){
+        if (!this.hasValue) return SqlMoney.Null;
+        this.hasValue = false;
+        return this.total;
+      }
+    }
+  }
+  public class Avg: IAggregateGroup{
+    public struct AvgOfInt32: IAggregate{
+      long total;
+      long count;
+      public void Add(int value){
+        this.total += value;
+        this.count++;
+      }
+      public int GetValue(){
+        int result = (int)(this.total / this.count);
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfInt64: IAggregate{
+      decimal total;
+      long count;
+      public void Add(long value){
+        this.total += value;
+        this.count++;
+      }
+      public long GetValue(){
+        long result = (long)(this.total / this.count);
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfDouble: IAggregate{
+      double total;
+      long count;
+      public void Add(double value){
+        this.total += value;
+        this.count++;
+      }
+      public double GetValue(){
+        double result = this.total / this.count;
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfDecimal: IAggregate{
+      decimal total;
+      long count;
+      public void Add(decimal value){
+        this.total += value;
+        this.count++;
+      }
+      public decimal GetValue(){
+        decimal result = this.total / this.count;
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlInt32: IAggregate{
+      long total;
+      long count;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = (int)value;
+          else
+            this.total += (int)value;
+          this.count++;
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (this.count == 0) return SqlInt32.Null;
+        int result = (int)(this.total / this.count);
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlInt64: IAggregate{
+      decimal total;
+      long count;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = (long)value;
+          else
+            this.total += (long)value;
+          this.count++;
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (this.count == 0) return SqlInt64.Null;
+        long result = (long)(this.total / this.count);
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlDouble: IAggregate{
+      SqlDouble total;
+      long count;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = value;
+          else
+            this.total += value;
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count == 0) return SqlDouble.Null;
+        SqlDouble result = this.total / count;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlDecimal: IAggregate{
+      SqlDecimal total;
+      long count;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = value;
+          else
+            this.total += value;
+          this.count++;
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (this.count == 0) return SqlDecimal.Null;
+        SqlDecimal result = this.total / count;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlMoney: IAggregate{
+      SqlMoney total;
+      long count;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = value;
+          else
+            this.total += value;
+          this.count++;
+        }
+      }
+      public SqlMoney GetValue(){
+        if (this.count == 0) return SqlMoney.Null;
+        SqlMoney result = this.total / count;
+        this.count = 0;
+        return result;
+      }
+    }
+  }
+  public class Stdev: IAggregateGroup{
+    public struct StdevOfDouble: IAggregate{
+      double sumX;
+      double sumX2;
+      int count;
+      public void Add(double value){
+        this.sumX += value;
+        this.sumX2 += (value * value);
+        this.count++;
+      }
+      public double GetValue(){
+        int c = count - 1;
+        double result = Math.Sqrt((sumX2/c) - ((sumX * sumX)/count/c));
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct StdevOfDecimal: IAggregate{
+      decimal sumX;
+      decimal sumX2;
+      int count;
+      public void Add(decimal value){
+        this.sumX += value;
+        this.sumX2 += (value * value);
+        this.count++;
+      }
+      public double GetValue(){
+        int c = count - 1;
+        // note: using Math.Sqrt(double) would lose precision, so use SqlDecimal.Power
+        SqlDecimal result = SqlDecimal.Power((sumX2/c) - ((sumX * sumX)/count/c), 0.5);
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (double)(SqlDouble)result;
+      }
+    }
+    public struct StdevOfSqlDouble: IAggregate{
+      double sumX;
+      double sumX2;
+      int count;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          double dv = (double) value;
+          this.sumX += dv;
+          this.sumX2 += dv * dv;
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count < 2) return SqlDouble.Null;
+        int c = count - 1;
+        double result = Math.Sqrt((sumX2/c) - ((sumX * sumX)/count/c));
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (SqlDouble) result;
+      }
+    }
+    public struct StdevOfSqlDecimal: IAggregate{
+      SqlDecimal sumX;
+      SqlDecimal sumX2;
+      int count;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (this.count == 0){
+            this.sumX = value;
+            this.sumX2 = value * value;
+          }else{
+            this.sumX += value;
+            this.sumX2 += value * value;
+          }
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count < 2) return SqlDecimal.Null;
+        int c = count - 1;
+        SqlDecimal result = SqlDecimal.Power((sumX2/c) - ((sumX * sumX)/count/c), 0.5);
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (SqlDouble)result;
+      }
+    }
+    public struct StdevOfSqlMoney: IAggregate{
+      SqlMoney sumX;
+      SqlMoney sumX2;
+      int count;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (this.count == 0){
+            this.sumX = value;
+            this.sumX2 = value * value;
+          }else{
+            this.sumX += value;
+            this.sumX2 += value * value;
+          }
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count < 2) return SqlMoney.Null;
+        int c = count - 1;
+        SqlDecimal result = SqlDecimal.Power((sumX2/c) - ((sumX * sumX)/count/c), 0.5);
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (SqlDouble)result;
+      }
+    }
+  }
+  public class Count: IAggregateGroup{
+    public struct CountOfObject: IAggregate{
+      int count;
+      public void Add(object value){
+        count++;
+      }
+      public int GetValue(){
+        int result = count;
+        this.count = 0;
+        return result;
+      }
+    }
+  }
+
+  [Anonymous]
+  public sealed class SqlFunctions{
+    public static SqlByte Abs(SqlByte value){
+      return value;
+    }
+    public static SqlInt16 Abs(SqlInt16 value){
+      if (value.IsNull) return SqlInt16.Null;
+      return Math.Abs((short)value);
+    }
+    public static SqlInt32 Abs(SqlInt32 value){
+      if (value.IsNull) return SqlInt32.Null;
+      return Math.Abs((int)value);
+    }
+    public static SqlInt64 Abs(SqlInt64 value){
+      if (value.IsNull) return SqlInt64.Null;
+      return Math.Abs((long)value);
+    }
+    public static SqlDouble Abs(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Abs((double)value);
+    }
+    public static SqlDecimal Abs(SqlDecimal value){
+      if (value.IsNull) return SqlDecimal.Null;
+      return (value < 0) ? -value : value;
+    }
+    public static SqlMoney Abs(SqlMoney value){
+      if (value.IsNull) return SqlMoney.Null;
+      return (value < 0) ? -value : value;
+    }
+    public static SqlDouble Acos(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Acos((double)value);
+    }
+    public static SqlDouble Asin(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Asin((double)value);
+    }
+    public static SqlDouble Atan(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Atan((double)value);
+    }
+    public static SqlDouble Atn2(SqlDouble value1, SqlDouble value2){
+      if (value1.IsNull || value2.IsNull) return SqlDouble.Null;
+      return Math.Atan2((double)value1, (double)value2);
+    }
+    public static SqlByte Ceiling(SqlByte value){
+      return value;
+    }
+    public static SqlInt16 Ceiling(SqlInt16 value){
+      return value;
+    }
+    public static SqlInt32 Ceiling(SqlInt32 value){
+      return value;
+    }
+    public static SqlInt64 Ceiling(SqlInt64 value){
+      return value;
+    }
+    public static SqlDouble Ceiling(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Ceiling((double)value);
+    }
+    public static SqlDecimal Ceiling(SqlDecimal value){
+      return SqlDecimal.Ceiling(value);
+    }
+    public static SqlMoney Ceiling(SqlMoney value){
+      return (SqlMoney)SqlDecimal.Ceiling(value);
+    }
+    public static SqlInt32 CharIndex(SqlString pattern, SqlString source){
+      if (pattern.IsNull || source.IsNull) return SqlInt32.Null;
+      return ((string/*!*/)source.Value).IndexOf((string/*!*/)pattern.Value) + 1;
+    }
+    public static SqlDouble Cos(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Cos((double)value);
+    }
+    public static SqlDateTime DateAdd(SqlDatePart part, SqlInt32 value, SqlDateTime date){
+      if (value.IsNull || date.IsNull) return SqlDateTime.Null;
+      int incr = (int)value;
+      DateTime dt = (DateTime)date;
+      switch (part){
+        case SqlDatePart.Year:
+          return dt.AddYears(incr);
+        case SqlDatePart.Month:
+          return dt.AddMonths(incr);
+        case SqlDatePart.Day:
+          return dt.AddDays(incr);
+        case SqlDatePart.Hour:
+          return dt.AddHours(incr);
+        case SqlDatePart.Minute:
+          return dt.AddMinutes(incr);
+        case SqlDatePart.Second:
+          return dt.AddSeconds(incr);
+        case SqlDatePart.Millisecond:
+          return dt.AddMilliseconds(incr);
+      }
+      return dt;
+    }
+    public static SqlInt32 DatePart(SqlDatePart part, SqlDateTime date){
+      if (date.IsNull) return SqlInt32.Null;
+      DateTime dt = (DateTime)date;
+      switch (part){
+        case SqlDatePart.Year: 
+          return dt.Year;
+        case SqlDatePart.Month:
+          return dt.Month;
+        case SqlDatePart.Week:
+          return (dt.DayOfYear + 6)/ 7;
+        case SqlDatePart.WeekDay:
+          return (int)dt.DayOfWeek;
+        case SqlDatePart.Day:
+          return dt.Day;
+        case SqlDatePart.DayOfYear:
+          return dt.DayOfYear;
+        case SqlDatePart.Hour:
+          return dt.Hour;
+        case SqlDatePart.Minute:
+          return dt.Minute;
+        case SqlDatePart.Second:
+          return dt.Second;
+        case SqlDatePart.Millisecond:
+          return dt.Millisecond;
+      }
+      return 0;
+    }
+    public static SqlDouble Degrees(SqlDouble radians){
+      if (radians.IsNull) return SqlDouble.Null;
+      return ((double)radians) * Math.PI / 2;
+    }
+    public static SqlDouble Exp(SqlDouble exponent){
+      return Math.Exp((double)exponent);
+    }
+    public static SqlByte Floor(SqlByte value){
+      return value;
+    }
+    public static SqlInt16 Floor(SqlInt16 value){
+      return value;
+    }
+    public static SqlInt32 Floor(SqlInt32 value){
+      return value;
+    }
+    public static SqlInt64 Floor(SqlInt64 value){
+      return value;
+    }
+    public static SqlDouble Floor(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Floor((double)value);
+    }
+    public static SqlDecimal Floor(SqlDecimal value){
+      return SqlDecimal.Floor(value);
+    }
+    public static SqlMoney Floor(SqlMoney value){
+      return (SqlMoney)SqlDecimal.Floor(value);
+    }
+    public static SqlDateTime GetDate(){
+      return DateTime.Now;
+    }
+    public static SqlDateTime GetUtcDate(){
+      return DateTime.UtcNow;
+    }
+    public static SqlBoolean IsDate(SqlString value){
+      if (value.IsNull) return SqlBoolean.Null;
+      try{ DateTime.Parse((string)value); }
+      catch{ return false; }
+      return true;
+    }
+    public static SqlString Left(SqlString value, SqlInt32 length){
+      if (value.IsNull || length.IsNull) return SqlString.Null;
+      int len = (int)length;
+      string str = (string/*!*/)value.Value;
+      return str.Substring(0, len);
+    }
+    public static SqlInt32 Len(SqlString value){
+      if (value.IsNull) return SqlInt32.Null;
+      return ((string/*!*/)value.Value).Length;
+    }
+    public static SqlDouble Log(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Log((double)value);
+    }
+    public static SqlDouble Log10(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Log10((double)value);
+    }
+    public static SqlDouble Power(SqlDouble value, SqlDouble exponent){
+      if (value.IsNull || exponent.IsNull) return SqlDouble.Null;
+      return Math.Pow((double)value, (double)exponent);
+    }
+    public static SqlString Replace(SqlString source, SqlString oldValue, SqlString newValue){
+      if (source.IsNull || oldValue.IsNull || newValue.IsNull) return SqlString.Null;
+      return ((string/*!*/)source.Value).Replace((string/*!*/)oldValue.Value, (string/*!*/)newValue.Value);
+    }
+    public static SqlString Reverse(SqlString value){
+      if (value.IsNull) return SqlString.Null;
+      string str = (string/*!*/)value.Value;
+      StringBuilder sb = new StringBuilder(str.Length);
+      for(int i = str.Length - 1; i >= 0; i--)
+        sb.Append(str[i]);       
+      return sb.ToString();
+    }
+    public static SqlString Right(SqlString value, SqlInt32 length){
+      if (value.IsNull || length.IsNull) return SqlString.Null;
+      string str = (string/*!*/)value.Value;
+      int len = Math.Min((int)length, str.Length);
+      return str.Substring(str.Length - len - 1, len);
+    }
+    public static SqlDouble Round(SqlDouble value, SqlInt32 precision){
+      if (value.IsNull || precision.IsNull) return SqlDouble.Null;
+      return Math.Round((double)value, (int)precision);
+    }
+    public static SqlDecimal Round(SqlDecimal value, SqlInt32 precision){
+      if (value.IsNull || precision.IsNull) return SqlDecimal.Null;
+      return SqlDecimal.Round(value, (int)precision);
+    }
+    public static SqlMoney Round(SqlMoney value, SqlInt32 precision){
+      if (value.IsNull || precision.IsNull) return SqlMoney.Null;
+      return (SqlMoney) SqlDecimal.Round(value, (int)precision);
+    }
+    public static SqlDouble Sin(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Sin((double)value);
+    }
+    public static SqlString Stuff(SqlString source, SqlInt32 position, SqlInt32 length, SqlString value){
+      if (source.IsNull || position.IsNull || length.IsNull) return SqlString.Null;
+      int offset = ((int)position) - 1;
+      string result = ((string/*!*/)source.Value).Remove(offset, (int)length);
+      //^ assume result != null;
+      if (!value.IsNull) result = result.Insert(offset, (string/*!*/)value.Value);
+      //^ assume result != null;
+      return result;
+    }
+    public static SqlString Substring(SqlString source, SqlInt32 position, SqlInt32 length){
+      if (source.IsNull || position.IsNull || length.IsNull) return SqlString.Null;
+      int offset = ((int)position) - 1;
+      return ((string/*!*/)source.Value).Substring(offset, (int)length);
+    }
+  }
+
+  [Anonymous]
+  public enum SqlDatePart{
+    Year,
+    Quarter,
+    Month,
+    Day,
+    DayOfYear,
+    Week,
+    WeekDay,
+    Hour,
+    Minute,
+    Second,
+    Millisecond
+  }
+
+  [Anonymous]
+  public enum SqlHint{
+    HoldLock,
+    Serializable,
+    RepeatableRead,
+    ReadCommitted,
+    ReadUncommitted,
+    NoLock, 
+    RowLock,
+    PageLock,
+    TableLock,
+    TableLockExclusive,
+    ReadPast,
+    UpdateLock,
+    ExclusiveLock,
+  }
+}
+#else
+#if CCINamespace
+namespace Microsoft.Cci{
+#else
+namespace System.Compiler{
+#endif
+  /// <summary>
+  /// Tells a sympathetic compiler that the name of the entity bearing this attribute should be suppressed. When applied to a class or enum,
+  /// this means that the members of the class or enum should be injected into the same scope as would have contained the class/enum name.
+  /// When applied to a field or property, it means that the members of structure of the type of the field/property should be visible
+  /// without qualification by the field/property name.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Field|AttributeTargets.Property|AttributeTargets.Class|AttributeTargets.Enum)]
+  public sealed class AnonymousAttribute: Attribute{
+    private Anonymity type;
+    public AnonymousAttribute(){
+      this.type = Anonymity.Structural;
+    }
+    public Anonymity Anonymity{
+      get {return this.type;}
+    }
+  }  
+  public enum Anonymity{
+    Unknown,
+    None,
+    Structural,
+    Full
+  }
+  public enum CciMemberKind{
+    Unknown,
+    Regular,
+    Auxiliary,
+    FrameGuardGetter,
+  }
+  [AttributeUsage(AttributeTargets.All)]
+  public class CciMemberKindAttribute: Attribute{
+    public CciMemberKind Kind;
+    public CciMemberKindAttribute(CciMemberKind kind){
+      this.Kind = kind;
+    }
+  }
+  [AttributeUsage(AttributeTargets.Class)]
+  public sealed class ComposerAttribute: Attribute{
+    public string AssemblyName = null;
+    public string TypeName = null;
+    public ComposerAttribute(){
+    }
+  }
+  [AttributeUsage(AttributeTargets.Assembly|AttributeTargets.Module, AllowMultiple=true)]
+  public sealed class CustomVisitorAttribute : Attribute{
+    public string Assembly;
+    public string Class;
+    public string Phase;
+    public bool Replace;
+    public CustomVisitorAttribute(){
+    }
+  }
+  [AttributeUsage(AttributeTargets.Class|AttributeTargets.Field|AttributeTargets.Property|AttributeTargets.Method)]
+  public sealed class ElementTypeAttribute: Attribute{
+    public Type ElementType = null;
+    public ElementTypeAttribute(){
+    }
+  }
+  public interface ITemplateParameter{
+  }
+  [AttributeUsage(AttributeTargets.Class|AttributeTargets.Delegate|AttributeTargets.Interface|AttributeTargets.Struct)]
+  public sealed class TemplateAttribute : System.Attribute{
+    public Type[] TemplateParameters;
+    public TemplateAttribute(params Type[] parameters){
+      this.TemplateParameters = parameters;
+    }
+  }
+  [AttributeUsage(AttributeTargets.Class|AttributeTargets.Delegate|AttributeTargets.Interface|AttributeTargets.Struct)]
+  public sealed class TemplateInstanceAttribute : System.Attribute{
+    public Type Template;
+    public Type[] TemplateArguments;
+    public TemplateInstanceAttribute(Type template, params Type[] arguments){
+      this.Template = template;
+    }
+  }
+
+  [AttributeUsage(AttributeTargets.Class|AttributeTargets.Interface|AttributeTargets.Struct)]
+  public sealed class TemplateParameterFlagsAttribute : System.Attribute{
+    public int Flags;
+    public TemplateParameterFlagsAttribute(int flags) {
+      this.Flags = flags;
+    }
+  }
+  namespace Diagnostics{
+    public sealed class Debug{
+      public static void Assert(bool condition){
+        System.Diagnostics.Debug.Assert(condition);
+      }
+    }
+  }
+}
+#if !NoData && !ROTOR
+namespace System.Data{
+  public interface IDbTransactable{
+    IDbTransaction BeginTransaction();
+    IDbTransaction BeginTransaction(IsolationLevel level);
+  }
+}
+#endif
+namespace StructuralTypes{
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+  using System.Collections.Generic;
+ 
+  public interface IConstrainedType{}
+  public interface ITupleType{}
+  public interface ITypeUnion{}
+  public interface ITypeIntersection{}
+  public interface ITypeAlias{}
+  public interface ITypeDefinition{}
+
+  [Template(typeof(ElementType))]
+  public struct Boxed_1 : IEnumerable_1{
+    private ElementType[] box;
+    public Boxed_1(ElementType value){
+      this.box = new ElementType[]{value};
+    }
+    public ElementType GetValue(){
+      return this.box[0];
+    }
+    public void SetValue(ElementType value){
+      this.box[0] = value;
+    }
+    public object ToObject(){
+      if (this.box == null) return null;
+      return this.box[0];
+    }
+    public bool IsNull(){
+      return this.box == null;
+    }
+    IEnumerator_1 IEnumerable_1.GetEnumerator(){
+      return new BoxedEnumerator_1(this.box);
+    }
+    public BoxedEnumerator_1 GetEnumerator(){
+      return new BoxedEnumerator_1(this.box);
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return new BoxedEnumerator_1(this.box);
+    }
+    public void Clear(){
+      this.box = null;
+    }
+    public static implicit operator Boxed_1(ElementType value){
+      return new Boxed_1(value);
+    }
+    public static explicit operator ElementType(Boxed_1 boxed){
+      return boxed.GetValue();
+    }
+    public static bool operator ==(Boxed_1 a, Boxed_1 b){
+      if (a.box == null || b.box == null) return false;
+      return a.box[0].Equals(b.box[0]);
+    }
+    public static bool operator ==(Boxed_1 a, object o){
+      return a.Equals(o);
+    }
+    public static bool operator !=(Boxed_1 a, object o){
+      return !a.Equals(o);
+    }
+    public static bool operator ==(object o, Boxed_1 b){
+      return b.Equals(o);
+    }
+    public static bool operator !=(object o, Boxed_1 b){
+      return !b.Equals(o);
+    }
+    public static bool operator !=(Boxed_1 a, Boxed_1 b){
+      if (a.box == null || b.box == null) return false;
+      return !a.box[0].Equals(b.box[0]);
+    }
+    public override bool Equals(object o){
+      if (this.box == null) return o == null;
+      if (!(o is Boxed_1)) return false;
+      Boxed_1 b = (Boxed_1)o;
+      if (this.box == null || b.box == null) return this.box == b.box;
+      return this.box[0].Equals(b.box[0]);
+    }
+    public override int GetHashCode(){
+      return this.box[0].GetHashCode();
+    }
+  }
+  [Template(typeof(ElementType))]
+  public struct BoxedEnumerator_1: IEnumerator_1{
+    private ElementType[] box;
+    private int index;
+    internal BoxedEnumerator_1(ElementType[] box){
+      this.box = box;
+      this.index = -1;
+    }
+    public ElementType Current{
+      get { 
+        return this.box[0];
+      }
+    }
+    object System.Collections.IEnumerator.Current{
+      get{
+        return this.box[0];
+      }
+    }
+    void System.Collections.IEnumerator.Reset(){
+      this.index = -1;
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      if (this.box == null) return false;
+      return ++this.index == 0;
+    }
+  }
+  [Template(typeof(ElementType))]
+  public struct Invariant_1{
+    private ElementType value;
+    public Invariant_1(ElementType value){
+      if (value == null) throw new ArgumentNullException();
+      if (value.GetType() != typeof(ElementType)) throw new ArgumentException();
+      this.value = value;
+    }
+    public ElementType GetValue(){
+      return this.value;
+    }
+    public object ToObject(){
+      return this.value;
+    }
+    public static implicit operator ElementType(Invariant_1 invariantValue){
+      return invariantValue.value;
+    }
+    public static implicit operator NonNull_1(Invariant_1 invariantValue){
+      return new NonNull_1(invariantValue.value);
+    }
+    public static explicit operator Invariant_1(ElementType value){
+      return new Invariant_1(value);
+    }
+  }
+  [Template(typeof(ElementType))]
+  public struct NonNull_1 : IEnumerable_1{
+    private ElementType value;
+    public NonNull_1(ElementType value){
+      if (value == null) throw new ArgumentNullException();
+      this.value = value;
+    }
+    public ElementType GetValue(){
+      return this.value;
+    }
+    public object ToObject(){
+      return this.value;
+    }
+    IEnumerator_1 IEnumerable_1.GetEnumerator(){
+      return new ValueEnumerator_1(this.value);
+    }
+    public ValueEnumerator_1 GetEnumerator(){
+      return new ValueEnumerator_1(this.value);
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return new ValueEnumerator_1(this.value);
+    }
+    public static implicit operator ElementType(NonNull_1 nonNullValue){
+      return nonNullValue.value;
+    }
+    public static explicit operator NonNull_1(ElementType value){
+      return new NonNull_1(value);
+    }
+  }
+  [Template(typeof(ElementType))]
+  public struct NonEmptyIEnumerable_1 : IEnumerable_1{
+    IEnumerable_1 enumerable;
+    public NonEmptyIEnumerable_1(IEnumerable_1 enumerable){
+      this.enumerable = enumerable;
+      if (enumerable == null) 
+        throw new ArgumentNullException();
+      IEnumerator_1 enumerator = enumerable.GetEnumerator();
+      if (enumerator == null || !enumerator.MoveNext())
+        throw new ArgumentException();
+    }
+    public NonEmptyIEnumerable_1(ElementType element){
+      this.enumerable = new NonNull_1(element);
+    }
+    public ElementType GetValue(){
+      IEnumerator_1 e = this.enumerable.GetEnumerator();
+      if (e.MoveNext()){
+        ElementType result = e.Current;
+        if (!e.MoveNext()) return result;
+      }
+      throw new ArgumentOutOfRangeException();
+    }
+    public object ToObject(){
+      if (this.enumerable is NonNull_1){
+        NonNull_1 nnull = (NonNull_1)this.enumerable;
+        return nnull.ToObject();
+      }
+      if (this.enumerable is Boxed_1){
+        Boxed_1 boxed = (Boxed_1)this.enumerable;
+        return boxed.ToObject();
+      }
+      return this.enumerable;
+    }
+    public IEnumerator_1 GetEnumerator(){
+      return this.enumerable.GetEnumerator();
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return this.enumerable.GetEnumerator();
+    }
+    public static implicit operator NonEmptyIEnumerable_1(NonNull_1 element){
+      return new NonEmptyIEnumerable_1((IEnumerable_1)element);
+    }
+    public static explicit operator NonEmptyIEnumerable_1(ElementType element){
+      return new NonEmptyIEnumerable_1(element);
+    }
+    public static explicit operator NonEmptyIEnumerable_1(Boxed_1 element){
+      return new NonEmptyIEnumerable_1((IEnumerable_1)element);
+    }
+    public static explicit operator NonEmptyIEnumerable_1(ElementType[] array){
+      return new NonEmptyIEnumerable_1(new ArrayToIEnumerableAdapter_1(array));
+    }
+    public static explicit operator NonEmptyIEnumerable_1(List_1 list){
+      return new NonEmptyIEnumerable_1(list);
+    }
+    public static explicit operator ElementType(NonEmptyIEnumerable_1 nonEmptyIEnumerable){
+      return nonEmptyIEnumerable.GetValue();
+    }
+  }
+  [Template(typeof(ElementType))]
+  public sealed class Unboxer_1{
+    public static object ToObject(IEnumerable_1 collection){
+      if (collection is NonNull_1)
+        return ((NonNull_1)collection).ToObject();
+      if (collection is Boxed_1)
+        return ((Boxed_1)collection).ToObject();
+      return collection;
+    }
+  }
+
+  [Template(typeof(ElementType))]
+  public sealed class ArrayToIEnumerableAdapter_1 : IEnumerable_1{
+    private ElementType[] array;
+    public ArrayToIEnumerableAdapter_1(ElementType[] array){
+      this.array = array;
+    }
+    public IEnumerator_1 GetEnumerator(){
+      return new ArrayEnumerator_1(this.array); 
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return new ArrayEnumerator_1(this.array); 
+    }
+  }
+  [Template(typeof(ElementType))]
+  public sealed class GenericIEnumerableToGenericIListAdapter_1 : IList_1{
+    private List_1 list;
+    private IEnumerable_1 collection;
+    public GenericIEnumerableToGenericIListAdapter_1(IEnumerable_1 collection){
+      this.collection = collection;
+    }
+
+    private List_1 List{  
+      get{
+        List_1 result = this.list;
+        if (result == null){
+          result = new List_1();
+          this.list = result;
+          if (this.collection != null){
+            IEnumerator_1 enumerator = this.collection.GetEnumerator();
+            if (enumerator != null){
+              while (enumerator.MoveNext()){
+                ElementType curr = enumerator.Current;
+                result.Add(curr);
+              }
+            }
+          }
+        }
+        return result;
+      }
+    }
+    public IEnumerator_1 GetEnumerator(){
+      if (this.list != null)
+        return this.list.GetEnumerator();
+      else
+        return this.collection.GetEnumerator();
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return this.GetEnumerator(); 
+    }
+    public int Count{
+      get{
+        return this.List.Count;
+      }
+    }
+    public bool IsSynchronized{
+      get{
+        return false;
+      }
+    }
+    public object SyncRoot{
+      get{
+        return this;
+      }
+    }
+    public void CopyTo(Array array, int index){
+      this.List.CopyTo(array, index);
+    }
+    public void CopyTo(ElementType[] array, int index){
+      this.List.CopyTo(array, index);
+    }
+
+    public bool IsFixedSize{
+      get{
+        return false;
+      }
+    }
+    public bool IsReadOnly{
+      get{
+        return false;
+      }
+    }
+    public ElementType this[int index]{
+      get{
+        return this.List[index];
+      }
+      set{
+        this.List[index] = value;
+      }
+    }
+    public void Add(ElementType value){
+      this.List.Add(value);
+    }
+    public void Clear(){
+      this.List.Clear();
+    }
+    public bool Contains(ElementType value){
+      return this.List.Contains(value);
+    }
+    public int IndexOf(ElementType value){
+      return this.List.IndexOf(value);
+    }
+    public void Insert(int index, ElementType value){
+      this.List.Insert(index, value);
+    }
+    public bool Remove(ElementType value){
+      return this.List.Remove(value);
+    }
+    public void RemoveAt(int index){
+      this.List.RemoveAt(index);
+    }
+  }
+  [Template(typeof(ElementType))]
+  public struct ValueEnumerator_1: IEnumerator_1{
+    private ElementType value;
+    private int index;
+
+    public ValueEnumerator_1(ElementType value){
+      this.value = value;
+      this.index = -1;
+    }
+
+    public ElementType Current{
+      get{
+        return this.value;
+      }
+    }
+    object System.Collections.IEnumerator.Current{
+      get{
+        return this.value;
+      }
+    }
+    void System.Collections.IEnumerator.Reset(){
+      this.index = -1;
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      return ++this.index == 0;
+    }
+  }
+
+  [Template(typeof(ElementType))]
+  public sealed class StreamUtility_1{
+    private StreamUtility_1(){}
+    public static bool IsNull(IEnumerable_1 stream){
+      if (stream == null) return true;
+      IEnumerator_1 enumerator = stream.GetEnumerator();
+      while (enumerator.MoveNext())
+        if (enumerator.Current != null) return false;
+      return true;
+    }
+  }
+}
+namespace System{
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+  using System.Collections.Generic;
+
+  [Template(typeof(ElementType))]
+  public struct Nullable_1{
+    internal ElementType value;
+    internal bool hasValue;
+    
+    public Nullable_1(ElementType value){
+      this.value = value;
+      this.hasValue = true;
+    }
+
+    public override bool Equals(object other){
+      if (other is Nullable_1)
+        return Nullable_1.Equals(this, (Nullable_1)other);
+      return false;
+    }
+
+    public override int GetHashCode(){
+      return hasValue ? value.GetHashCode() : 0;
+    }
+
+    public override string ToString(){
+      return hasValue ? value.ToString() : "";
+    }        
+
+    public bool HasValue{
+      get{
+        return hasValue;
+      }
+    }
+
+    public ElementType Value{
+      get{
+        if (!hasValue)
+          throw new InvalidOperationException();
+        return value;
+      }
+    }
+
+    public bool Equals(Nullable_1 other){        
+      return Nullable_1.Equals(this, other);
+    }
+
+    public ElementType GetValueOrDefault(){
+      return value;
+    }
+
+    public ElementType GetValueOrDefault(ElementType defaultValue){
+      return hasValue ? value : defaultValue;
+    }
+
+    public static implicit operator Nullable_1(ElementType value){
+      return new Nullable_1(value);
+    }
+
+    public static explicit operator ElementType(Nullable_1 value){
+      return value.Value;
+    }
+  }
+}
+namespace System.Collections.Generic{
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+  using StructuralTypes;
+  using SCIEnumerable = System.Collections.IEnumerable;
+  using SCIEnumerator = System.Collections.IEnumerator;
+  using SCIList = System.Collections.IList;
+
+  public class ElementType : ITemplateParameter{
+  }
+
+  [Template(typeof(ElementType))]
+  public interface IEnumerable_1 : SCIEnumerable{
+    [return:Microsoft.Contracts.NotNull]
+    new IEnumerator_1 GetEnumerator();
+  }
+
+  [Template(typeof(ElementType))]
+  public interface ICollection_1 : IEnumerable_1, SCIEnumerable{
+    int Count {get;}
+    void Add(ElementType e);
+    void Clear();
+    bool Contains(ElementType e);
+    void CopyTo(ElementType[] array, int index);
+    bool Remove(ElementType e);
+    bool IsReadOnly { get; }
+  }
+
+  [Template(typeof(ElementType))]
+  public interface IList_1 : ICollection_1, IEnumerable_1, IEnumerable{
+    ElementType this[int index] {get; set;}
+    int IndexOf(ElementType value);
+    void Insert(int index, ElementType value);
+    void RemoveAt(int index);
+  }
+  [Template(typeof(ElementType))]
+  public sealed class Stack_1 : IEnumerable_1, ICollection, IEnumerable{
+    private ElementType[] elements;
+    private int capacity;
+    private int count;
+    public Stack_1(){
+      this.capacity = 0;
+      this.count = 0;
+    }
+    public Stack_1(int capacity){
+      this.capacity = capacity;
+      this.count = 0;
+      this.elements = new ElementType[capacity];
+    }
+    public int Count{
+      get{
+        return this.count;
+      }
+    }
+    public void CopyTo(Array array, int index){
+      ElementType[] elements = this.elements;
+      int n = this.count;
+      for (int i = 0; i < n; i++){
+        object elem = elements[i];
+        array.SetValue(elem, index++);
+      }
+    }
+    public bool IsSynchronized{
+      get{
+        return false;
+      }
+    }
+    public bool IsReadOnly{
+      get{
+        return false;
+      }
+    }
+    public object SyncRoot{
+      get{
+        return this;
+      }
+    }
+    IEnumerator_1 IEnumerable_1.GetEnumerator(){
+      return new StackEnumerator_1(this);
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return new StackEnumerator_1(this);
+    }
+    public object Clone(){
+      Stack_1 s = new Stack_1(this.capacity);
+      for (int i = 0, n = this.count; i < n; i++)
+        s.elements[i] = this.elements[i];
+      return s; //REVIEW: should this clone the elements too?
+    }
+    private void DoubleCapacity(){
+      int oldCapacity = this.capacity;
+      if (oldCapacity == 0){
+        this.capacity = 16;
+        this.elements = new ElementType[16];
+        return;
+      }
+      this.capacity = oldCapacity*2;
+      ElementType[] oldElements = this.elements;
+      ElementType[] newElements = this.elements = new ElementType[this.capacity];
+      for (int i = 0, n = this.count; i < n; i++)
+        newElements[i] = oldElements[i];
+    }
+    public void Push(ElementType e){
+      int i = this.count;
+      int ip1 = i+1;
+      if (ip1 > this.capacity) this.DoubleCapacity();
+      this.elements[i] = e;
+      this.count = ip1;
+      return;
+    }
+    public ElementType Pop(){
+      if (this.count == 0)
+        throw new InvalidOperationException("Stack.Pop: empty stack");
+      return this.elements[--this.count];
+    }
+    public bool Empty(){
+      return this.count == 0;
+    }
+    public ElementType Peek(){
+      if (this.count == 0)
+        throw new InvalidOperationException("Stack.Peek: empty stack");
+      return this.elements[this.count-1];
+    }
+    public void Clear() {
+      this.count = 0;
+    }
+  }
+  [Template(typeof(ElementType))]
+  public struct StackEnumerator_1: IEnumerator_1, SCIEnumerator{
+    private ElementType[] contents;
+    private int index;
+    private int count;
+
+    public StackEnumerator_1(Stack_1 stack){
+      this.count = stack.Count;
+      this.contents = new ElementType[this.count];
+      stack.CopyTo(contents,0);
+      this.index = -1;
+    }
+
+    public ElementType Current{
+      get{
+        return this.contents[this.index];
+      }
+    }
+    object SCIEnumerator.Current{
+      get{
+        return this.contents[this.index];
+      }
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      return ++this.index < this.count;
+    }
+    public void Reset(){
+      this.index = -1;
+    }
+  }
+  [Template(typeof(ElementType))]
+  public sealed class List_1 : IList_1, ICollection_1, IEnumerable_1, SCIList, ICollection, IEnumerable{
+    private ElementType[] elements;
+    private int capacity;
+    private int count;
+
+    public List_1(){
+      this.capacity = 0;
+      this.count = 0;
+    }
+    public List_1(int capacity){
+      this.capacity = capacity;
+      this.count = 0;
+      this.elements = new ElementType[capacity];
+    }
+    public List_1(IEnumerable_1 collection)
+      : this(16){
+      IEnumerator_1 enumerator = collection.GetEnumerator();
+      while (enumerator.MoveNext())
+        this.Add(enumerator.Current);
+    }
+
+    public ListEnumerator_1 GetEnumerator(){
+      return new ListEnumerator_1(this);
+    }
+    IEnumerator_1 IEnumerable_1.GetEnumerator(){
+      return new ListEnumerator_1(this);
+    }
+    SCIEnumerator SCIEnumerable.GetEnumerator(){
+      return new ListEnumerator_1(this);
+    }
+    public int Capacity{
+      get{
+        return this.capacity;
+      }
+      set{
+        if (value < this.count) throw new ArgumentOutOfRangeException("value");
+        ElementType[] oldElements = this.elements;
+        ElementType[] newElements = this.elements = new ElementType[this.capacity = value];
+        for (int i = 0, n = this.count; i < n; i++)
+          newElements[i] = oldElements[i];
+      }
+    }
+    public int Count{
+      get{
+        return this.count;
+      }
+    }
+    public bool IsSynchronized{
+      get{
+        return false;
+      }
+    }
+    public object SyncRoot{
+      get{
+        return this;
+      }
+    }
+    public void CopyTo(Array array, int index){
+      ElementType[] elements = this.elements;
+      int n = this.count;
+      for (int i = 0; i < n; i++){
+        object elem = elements[i];
+        array.SetValue(elem, index++);
+      }
+    }
+    public void CopyTo(ElementType[] array, int index){
+      ElementType[] elements = this.elements;
+      int n = this.count;
+      for (int i = 0; i < n; i++){
+        object elem = elements[i];
+        array.SetValue(elem, index++);
+      }
+    }
+    private void DoubleCapacity(){
+      int oldCapacity = this.capacity;
+      if (oldCapacity == 0){
+        this.capacity = 16;
+        this.elements = new ElementType[16];
+        return;
+      }
+      this.Capacity = oldCapacity*2;
+    }
+    public bool IsFixedSize{
+      get{
+        return false;
+      }
+    }
+    public bool IsReadOnly{
+      get{
+        return false;
+      }
+    }
+    public ElementType this[int index]{
+      get{
+        if (index < 0 || index >= this.count) throw new ArgumentOutOfRangeException("index");
+        return this.elements[index];
+      }
+      set{
+        if (index < 0 || index >= this.count) throw new ArgumentOutOfRangeException("index");
+        this.elements[index] = value;
+      }
+    }
+    object SCIList.this[int index]{
+      get{
+        return this[index];
+      }
+      set{
+        this[index] = (ElementType)value;
+      }
+    }
+    public void Add(ElementType value){
+      int i = this.count;
+      int ip1 = i+1;
+      if (ip1 > this.capacity) this.DoubleCapacity();
+      this.elements[i] = value;
+      this.count = ip1;
+    }
+    int SCIList.Add(object value){
+      int i = this.count;
+      this.Add((ElementType)value);
+      return i;
+    }
+    public void Clear(){
+      this.count = 0;
+    }
+    public bool Contains(ElementType value){
+      return this.IndexOf(value) >= 0;
+    }
+    bool SCIList.Contains(object value){
+      return ((SCIList)this).IndexOf(value) >= 0;
+    }
+    public int IndexOf(ElementType value){
+      return Array.IndexOf(this.elements, value, 0, this.count);
+    }
+    int SCIList.IndexOf(object value){
+      return Array.IndexOf(this.elements, value, 0, this.count);
+    }
+    public void Insert(int index, ElementType value){
+      if (index < 0 || index > this.count) throw new ArgumentOutOfRangeException("index");
+      if (index == this.count)
+        this.Add(value);
+      else{
+        int i = this.count;
+        int ip1 = i+1;
+        if (ip1 > this.capacity) this.DoubleCapacity();
+        Array.Copy(this.elements, index, this.elements, index + 1, this.count - index);
+        this.elements[index] = value;
+      }
+    }
+    void SCIList.Insert(int index, object value){
+      this.Insert(index, (ElementType)value);
+    }
+    public bool Remove(ElementType value){
+      object oval = value;
+      for(int i = 0; i < this.count; i++){
+        object oval2 = this.elements[i];
+        if (oval2 == oval || (oval2 != null && oval2.Equals(oval))){
+          this.RemoveAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    void SCIList.Remove(object value){
+      this.Remove((ElementType)value);
+    }
+    public void RemoveAt(int index){
+      if (index < 0 || index > count) throw new ArgumentOutOfRangeException("index");
+      if (index < count - 1){
+        Array.Copy(this.elements, index + 1, this.elements, index, count - index);
+      }
+      this.count -= 1;
+    }
+    public object Clone(){
+      return new List_1(this); //REVIEW: should this clone the elements too?
+    }
+    public void AddRange(IEnumerable_1 elts){
+      foreach (ElementType o in elts)
+        this.Add(o);
+    }
+    public ICollection_1 AsReadOnly(){
+      return this;
+    }
+  }
+
+  [Template(typeof(ElementType))]
+  public sealed class Queue_1 : IEnumerable_1, System.Collections.ICollection, IEnumerable{
+    private ElementType[] elements;
+    private int capacity;
+    private int count;
+
+    public Queue_1(){
+      this.capacity = 0;
+      this.count = 0;
+    }
+    public Queue_1(int capacity){
+      this.capacity = capacity;
+      this.count = 0;
+      this.elements = new ElementType[capacity];
+    }
+    public Queue_1(IEnumerable_1 collection)
+      : this(16){
+      IEnumerator_1 enumerator = collection.GetEnumerator();
+      while (enumerator.MoveNext())
+        this.Enqueue(enumerator.Current);
+    }
+
+    public ArrayEnumerator_1 GetEnumerator(){
+      return new ArrayEnumerator_1(this.elements);
+    }
+    IEnumerator_1 IEnumerable_1.GetEnumerator(){
+      return new ArrayEnumerator_1(this.elements);
+    }
+    SCIEnumerator SCIEnumerable.GetEnumerator(){
+      return new ArrayEnumerator_1(this.elements);
+    }
+    public int Capacity{
+      get{
+        return this.capacity;
+      }
+      set{
+        if (value < this.count) throw new ArgumentOutOfRangeException("value");
+        ElementType[] oldElements = this.elements;
+        ElementType[] newElements = this.elements = new ElementType[this.capacity = value];
+        for (int i = 0, n = this.count; i < n; i++)
+          newElements[i] = oldElements[i];
+      }
+    }
+    public int Count{
+      get{
+        return this.count;
+      }
+    }
+    public bool IsSynchronized{
+      get{
+        return false;
+      }
+    }
+    public object SyncRoot{
+      get{
+        return this;
+      }
+    }
+    public void CopyTo(Array array, int index){
+      ElementType[] elements = this.elements;
+      int n = this.count;
+      for (int i = 0; i < n; i++){
+        object elem = elements[i];
+        array.SetValue(elem, index++);
+      }
+    }
+    private void DoubleCapacity(){
+      int oldCapacity = this.capacity;
+      if (oldCapacity == 0){
+        this.capacity = 16;
+        this.elements = new ElementType[16];
+        return;
+      }
+      this.Capacity = oldCapacity*2;
+    }
+    public bool IsFixedSize{
+      get{
+        return false;
+      }
+    }
+    public bool IsReadOnly{
+      get{
+        return false;
+      }
+    }
+    public void Enqueue(ElementType value){
+      int i = this.count;
+      int ip1 = i+1;
+      if (ip1 > this.capacity) this.DoubleCapacity();
+      this.elements[i] = value;
+      this.count = ip1;
+    }
+    public void Clear(){
+      this.count = 0;
+    }
+    public bool Contains(ElementType value){
+      return Array.IndexOf(this.elements, value, 0, this.count) >= 0;
+    }
+    public ElementType Dequeue(){
+      if (this.count == 0){
+        throw new InvalidOperationException();
+      }
+      ElementType oval = this.elements[0];
+      for(int i = 0; i < this.count-1; i++){
+        this.elements[i] = this.elements[i+1];
+      }
+      this.count--;
+      return oval;
+    }
+    public ElementType Peek(){
+      if (this.count == 0){
+        throw new InvalidOperationException();
+      }
+      return this.elements[0];
+    }
+    public object Clone(){
+      return new Queue_1(this); //REVIEW: should this clone the elements too?
+    }
+  }
+
+  [Template(typeof(ElementType))]
+  public interface IEnumerator_1 : IDisposable, SCIEnumerator{
+    new ElementType Current{get;}
+  }
+
+  [Template(typeof(ElementType))]
+  public struct ArrayEnumerator_1: IEnumerator_1, SCIEnumerator{
+    private ElementType[] array;
+    private int index;
+
+    public ArrayEnumerator_1(ElementType[] array){
+      this.array = array;
+      this.index = -1;
+    }
+
+    public ElementType Current{
+      get{
+        return this.array[this.index];
+      }
+    }
+    object SCIEnumerator.Current{
+      get{
+        return this.array[this.index];
+      }
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      return ++this.index < this.array.Length;
+    }
+    void SCIEnumerator.Reset(){
+      this.index = -1;
+    }
+  }
+
+  [Template(typeof(ElementType))]
+  public struct ListEnumerator_1: IEnumerator_1, SCIEnumerator{
+    private List_1 list;
+    private int index;
+
+    public ListEnumerator_1(List_1 list){
+      this.list = list;
+      this.index = -1;
+    }
+
+    public ElementType Current{
+      get{
+        return this.list[this.index];
+      }
+    }
+    object SCIEnumerator.Current{
+      get{
+        return this.list[this.index];
+      }
+    }
+    void IDisposable.Dispose(){
+    }
+    public bool MoveNext(){
+      return ++this.index < this.list.Count;
+    }
+    public void Reset(){
+      this.index = -1;
+    }
+  }
+}
+
+#if !NoData && !ROTOR
+namespace System.Query{
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+  using System.Collections.Generic;
+  using System.Data.SqlTypes;
+  using System.Text;
+
+  //TODO: this class should derive from SystemException and it should not contain a string
+  //The message, if any, should be obtained from a resource file
+  public class StreamNotSingletonException: Exception{
+    public StreamNotSingletonException(): base("Stream not singleton"){
+    }
+  }
+  
+  public interface IAggregate{
+  }
+  public interface IAggregateGroup{
+  }
+
+  public class Min: IAggregateGroup{
+    public struct MinOfByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(byte value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public byte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(short value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public short GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(int value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public int GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(long value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value)
+          this.value = value;
+      }
+      public long GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(float value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value){
+          this.value = value;
+        }
+      }
+      public float GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(double value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value)
+          this.value = value;
+      }
+      public double GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfDecimal: IAggregate{
+      decimal value;
+      bool hasValue;
+      public void Add(decimal value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value < this.value)
+          this.value = value;
+      }
+      public decimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MinOfString: IAggregate{
+      string value;
+      public void Add(string value){
+        if (value != null){
+          if (this.value == null || value.CompareTo(this.value) < 0)
+            this.value = value;
+        }
+      }
+      public string GetValue(){
+        string result = this.value;
+        this.value = null;
+        return result;
+      }
+    }
+    public struct MinOfDateTime: IAggregate{
+      DateTime value;
+      bool hasValue;
+      public void Add(DateTime value){
+        if (!this.hasValue || value < this.value){
+          this.value = value;
+          this.hasValue = true;
+        }
+      }
+      public DateTime GetValue(){
+        DateTime result = this.value;
+        this.value = new DateTime();
+        this.hasValue = false;
+        return result;
+      }
+    }
+    public struct MinOfSqlByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(SqlByte value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (byte)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (byte)value;
+          }
+        }
+      }
+      public SqlByte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlByte.Null;
+      }
+    }
+    public struct MinOfSqlInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(SqlInt16 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (short)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (short)value;
+          }
+        }
+      }
+      public SqlInt16 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt16.Null;
+      }
+    }
+    public struct MinOfSqlInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (int)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (int)value;
+          }
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt32.Null;
+      }
+    }
+    public struct MinOfSqlInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (long)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (long)value;
+          }
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt64.Null;
+      }
+    }
+    public struct MinOfSqlSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(SqlSingle value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value.Value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = value.Value;
+          }
+        }
+      }
+      public SqlSingle GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlSingle.Null;
+      }
+    }
+    public struct MinOfSqlDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (double)value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = (double)value;
+          }
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDouble.Null;
+      }
+    }
+    public struct MinOfSqlDecimal: IAggregate{
+      SqlDecimal value;
+      bool hasValue;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = value;
+          }
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDecimal.Null;
+      }
+    }
+    public struct MinOfSqlMoney: IAggregate{
+      SqlMoney value;
+      bool hasValue;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value < this.value){
+            this.value = value;
+          }
+        }
+      }
+      public SqlMoney GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlMoney.Null;
+      }
+    }
+    public struct MinOfSqlString: IAggregate{
+      SqlString value;
+      bool hasValue;
+      public void Add(SqlString value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlString.LessThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlString GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlString.Null;
+      }
+    }
+    public struct MinOfSqlDateTime: IAggregate{
+      SqlDateTime value;
+      bool hasValue;
+      public void Add(SqlDateTime value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlDateTime.LessThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDateTime GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDateTime.Null;
+      }
+    }
+  }
+  public class Max: IAggregateGroup{
+    public struct MaxOfByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(byte value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public byte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(short value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public short GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(int value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public int GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(long value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public long GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(float value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public float GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(double value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public double GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfDecimal: IAggregate{
+      decimal value;
+      bool hasValue;
+      public void Add(decimal value){
+        if (!this.hasValue){
+          this.value = value;
+          this.hasValue = true;
+        }
+        if (value > this.value)
+          this.value = value;
+      }
+      public decimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return 0;
+      }
+    }
+    public struct MaxOfString: IAggregate{
+      string value;
+      public void Add(string value){
+        if (value != null){
+          if (this.value == null || value.CompareTo(this.value) > 0)
+            this.value = value;
+        }
+      }
+      public string GetValue(){
+        string result = this.value;
+        this.value = null;
+        return result;
+      }
+    }
+    public struct MaxOfDateTime: IAggregate{
+      DateTime value;
+      bool hasValue;
+      public void Add(DateTime value){
+        if (!this.hasValue || value > this.value){
+          this.value = value;
+          this.hasValue = true;
+        }
+      }
+      public DateTime GetValue(){
+        DateTime result = this.value;
+        this.value = new DateTime();
+        this.hasValue = false;
+        return result;
+      }
+    }
+    public struct MaxOfSqlByte: IAggregate{
+      byte value;
+      bool hasValue;
+      public void Add(SqlByte value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (byte)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (byte)value;
+        }
+      }
+      public SqlByte GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlByte.Null;
+      }
+    }
+    public struct MaxOfSqlInt16: IAggregate{
+      short value;
+      bool hasValue;
+      public void Add(SqlInt16 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (short)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (short)value;
+        }
+      }
+      public SqlInt16 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt16.Null;
+      }
+    }
+    public struct MaxOfSqlInt32: IAggregate{
+      int value;
+      bool hasValue;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (int)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (int)value;
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt32.Null;
+      }
+    }
+    public struct MaxOfSqlInt64: IAggregate{
+      long value;
+      bool hasValue;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (long)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (long)value;
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlInt64.Null;
+      }
+    }
+    public struct MaxOfSqlSingle: IAggregate{
+      float value;
+      bool hasValue;
+      public void Add(SqlSingle value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value.Value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = value.Value;
+        }
+      }
+      public SqlSingle GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlSingle.Null;
+      }
+    }
+    public struct MaxOfSqlDouble: IAggregate{
+      double value;
+      bool hasValue;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = (double)value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = (double)value;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDouble.Null;
+      }
+    }
+    public struct MaxOfSqlDecimal: IAggregate{
+      SqlDecimal value;
+      bool hasValue;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = value;
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDecimal.Null;
+      }
+    }
+    public struct MaxOfSqlMoney: IAggregate{
+      SqlMoney value;
+      bool hasValue;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (!this.hasValue){
+            this.value = value;
+            this.hasValue = true;
+          }
+          if (value > this.value)
+            this.value = value;
+        }
+      }
+      public SqlMoney GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlMoney.Null;
+      }
+    }
+    public struct MaxOfSqlString: IAggregate{
+      SqlString value;
+      bool hasValue;
+      public void Add(SqlString value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlString.GreaterThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlString GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlString.Null;
+      }
+    }
+    public struct MaxOfSqlDateTime: IAggregate{
+      SqlDateTime value;
+      bool hasValue;
+      public void Add(SqlDateTime value){
+        if (!value.IsNull){
+          if (!this.hasValue || (bool)SqlDateTime.GreaterThan(value, this.value)){
+            this.value = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDateTime GetValue(){
+        if (this.hasValue){
+          this.hasValue = false;
+          return this.value;
+        }
+        return SqlDateTime.Null;
+      }
+    }
+  }
+  public class Sum: IAggregateGroup{
+    public struct SumOfInt32: IAggregate{
+      int total;
+      public void Add(int value){
+        this.total = this.total + value;
+      }
+      public int GetValue(){
+        int ret = this.total;
+        this.total = 0;
+        return ret;
+      }
+    }
+    public struct SumOfInt64: IAggregate{
+      long total;
+      public void Add(long value){
+        this.total = this.total + value;
+      }
+      public long GetValue(){
+        long ret = this.total;
+        this.total = 0;
+        return ret;
+      }
+    }
+    public struct SumOfDouble: IAggregate{
+      double total;
+      public void Add(double value){
+        this.total = this.total + value;
+      }
+      public double GetValue(){
+        double ret = this.total;
+        this.total = 0.0;
+        return ret;
+      }
+    }
+    public struct SumOfDecimal: IAggregate{
+      decimal total;
+      public void Add(decimal value){
+        this.total = this.total + value;
+      }
+      public decimal GetValue(){
+        decimal ret = this.total;
+        this.total = 0;
+        return ret;
+      }
+    }
+    public struct SumOfSqlInt32: IAggregate{
+      int total;
+      bool hasValue;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + (int) value;
+          else{
+            this.total = (int) value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (!this.hasValue){
+          return SqlInt32.Null;
+        }
+        this.hasValue = false;
+        return (SqlInt32) this.total;
+      }
+    }
+    public struct SumOfSqlInt64: IAggregate{
+      long total;
+      bool hasValue;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + (long) value;
+          else{
+            this.total = (long) value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (!this.hasValue) return SqlInt64.Null;
+        this.hasValue = false;
+        return (SqlInt64) this.total;
+      }
+    }
+    public struct SumOfSqlDouble: IAggregate{
+      SqlDouble total;
+      bool hasValue;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (this.hasValue){
+            this.total = this.total + value;
+          }else{
+            this.total = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDouble GetValue(){
+        if (!this.hasValue) return SqlDouble.Null;
+        this.hasValue = false;
+        return this.total;
+      }
+    }
+    public struct SumOfSqlDecimal: IAggregate{
+      SqlDecimal total;
+      bool hasValue;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + value;
+          else{
+            this.total = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (!this.hasValue) return SqlDecimal.Null;
+        this.hasValue = false;
+        return this.total;
+      }
+    }
+    public struct SumOfSqlMoney: IAggregate{
+      SqlMoney total;
+      bool hasValue;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (this.hasValue)
+            this.total = this.total + value;
+          else{
+            this.total = value;
+            this.hasValue = true;
+          }
+        }
+      }
+      public SqlMoney GetValue(){
+        if (!this.hasValue) return SqlMoney.Null;
+        this.hasValue = false;
+        return this.total;
+      }
+    }
+  }
+  public class Avg: IAggregateGroup{
+    public struct AvgOfInt32: IAggregate{
+      long total;
+      long count;
+      public void Add(int value){
+        this.total += value;
+        this.count++;
+      }
+      public int GetValue(){
+        int result = (int)(this.total / this.count);
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfInt64: IAggregate{
+      decimal total;
+      long count;
+      public void Add(long value){
+        this.total += value;
+        this.count++;
+      }
+      public long GetValue(){
+        long result = (long)(this.total / this.count);
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfDouble: IAggregate{
+      double total;
+      long count;
+      public void Add(double value){
+        this.total += value;
+        this.count++;
+      }
+      public double GetValue(){
+        double result = this.total / this.count;
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfDecimal: IAggregate{
+      decimal total;
+      long count;
+      public void Add(decimal value){
+        this.total += value;
+        this.count++;
+      }
+      public decimal GetValue(){
+        decimal result = this.total / this.count;
+        this.total = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlInt32: IAggregate{
+      long total;
+      long count;
+      public void Add(SqlInt32 value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = (int)value;
+          else
+            this.total += (int)value;
+          this.count++;
+        }
+      }
+      public SqlInt32 GetValue(){
+        if (this.count == 0) return SqlInt32.Null;
+        int result = (int)(this.total / this.count);
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlInt64: IAggregate{
+      decimal total;
+      long count;
+      public void Add(SqlInt64 value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = (long)value;
+          else
+            this.total += (long)value;
+          this.count++;
+        }
+      }
+      public SqlInt64 GetValue(){
+        if (this.count == 0) return SqlInt64.Null;
+        long result = (long)(this.total / this.count);
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlDouble: IAggregate{
+      SqlDouble total;
+      long count;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = value;
+          else
+            this.total += value;
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count == 0) return SqlDouble.Null;
+        SqlDouble result = this.total / count;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlDecimal: IAggregate{
+      SqlDecimal total;
+      long count;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = value;
+          else
+            this.total += value;
+          this.count++;
+        }
+      }
+      public SqlDecimal GetValue(){
+        if (this.count == 0) return SqlDecimal.Null;
+        SqlDecimal result = this.total / count;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct AvgOfSqlMoney: IAggregate{
+      SqlMoney total;
+      long count;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (this.count == 0)
+            this.total = value;
+          else
+            this.total += value;
+          this.count++;
+        }
+      }
+      public SqlMoney GetValue(){
+        if (this.count == 0) return SqlMoney.Null;
+        SqlMoney result = this.total / count;
+        this.count = 0;
+        return result;
+      }
+    }
+  }
+  public class Stdev: IAggregateGroup{
+    public struct StdevOfDouble: IAggregate{
+      double sumX;
+      double sumX2;
+      int count;
+      public void Add(double value){
+        this.sumX += value;
+        this.sumX2 += (value * value);
+        this.count++;
+      }
+      public double GetValue(){
+        int c = count - 1;
+        double result = Math.Sqrt((sumX2/c) - ((sumX * sumX)/count/c));
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return result;
+      }
+    }
+    public struct StdevOfDecimal: IAggregate{
+      decimal sumX;
+      decimal sumX2;
+      int count;
+      public void Add(decimal value){
+        this.sumX += value;
+        this.sumX2 += (value * value);
+        this.count++;
+      }
+      public double GetValue(){
+        int c = count - 1;
+        // note: using Math.Sqrt(double) would lose precision, so use SqlDecimal.Power
+        SqlDecimal result = SqlDecimal.Power((sumX2/c) - ((sumX * sumX)/count/c), 0.5);
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (double)(SqlDouble)result;
+      }
+    }
+    public struct StdevOfSqlDouble: IAggregate{
+      double sumX;
+      double sumX2;
+      int count;
+      public void Add(SqlDouble value){
+        if (!value.IsNull){
+          double dv = (double) value;
+          this.sumX += dv;
+          this.sumX2 += dv * dv;
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count < 2) return SqlDouble.Null;
+        int c = count - 1;
+        double result = Math.Sqrt((sumX2/c) - ((sumX * sumX)/count/c));
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (SqlDouble) result;
+      }
+    }
+    public struct StdevOfSqlDecimal: IAggregate{
+      SqlDecimal sumX;
+      SqlDecimal sumX2;
+      int count;
+      public void Add(SqlDecimal value){
+        if (!value.IsNull){
+          if (this.count == 0){
+            this.sumX = value;
+            this.sumX2 = value * value;
+          }else{
+            this.sumX += value;
+            this.sumX2 += value * value;
+          }
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count < 2) return SqlDecimal.Null;
+        int c = count - 1;
+        SqlDecimal result = SqlDecimal.Power((sumX2/c) - ((sumX * sumX)/count/c), 0.5);
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (SqlDouble)result;
+      }
+    }
+    public struct StdevOfSqlMoney: IAggregate{
+      SqlMoney sumX;
+      SqlMoney sumX2;
+      int count;
+      public void Add(SqlMoney value){
+        if (!value.IsNull){
+          if (this.count == 0){
+            this.sumX = value;
+            this.sumX2 = value * value;
+          }else{
+            this.sumX += value;
+            this.sumX2 += value * value;
+          }
+          this.count++;
+        }
+      }
+      public SqlDouble GetValue(){
+        if (this.count < 2) return SqlMoney.Null;
+        int c = count - 1;
+        SqlDecimal result = SqlDecimal.Power((sumX2/c) - ((sumX * sumX)/count/c), 0.5);
+        this.sumX = 0;
+        this.sumX2 = 0;
+        this.count = 0;
+        return (SqlDouble)result;
+      }
+    }
+  }
+  public class Count: IAggregateGroup{
+    public struct CountOfObject: IAggregate{
+      int count;
+      public void Add(object value){
+        count++;
+      }
+      public int GetValue(){
+        int result = count;
+        this.count = 0;
+        return result;
+      }
+    }
+  }
+
+  [Anonymous]
+  public sealed class SqlFunctions{
+    public static SqlByte Abs(SqlByte value){
+      return value;
+    }
+    public static SqlInt16 Abs(SqlInt16 value){
+      if (value.IsNull) return SqlInt16.Null;
+      return Math.Abs((short)value);
+    }
+    public static SqlInt32 Abs(SqlInt32 value){
+      if (value.IsNull) return SqlInt32.Null;
+      return Math.Abs((int)value);
+    }
+    public static SqlInt64 Abs(SqlInt64 value){
+      if (value.IsNull) return SqlInt64.Null;
+      return Math.Abs((long)value);
+    }
+    public static SqlDouble Abs(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Abs((double)value);
+    }
+    public static SqlDecimal Abs(SqlDecimal value){
+      if (value.IsNull) return SqlDecimal.Null;
+      return (value < 0) ? -value : value;
+    }
+    public static SqlMoney Abs(SqlMoney value){
+      if (value.IsNull) return SqlMoney.Null;
+      return (value < 0) ? -value : value;
+    }
+    public static SqlDouble Acos(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Acos((double)value);
+    }
+    public static SqlDouble Asin(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Asin((double)value);
+    }
+    public static SqlDouble Atan(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Atan((double)value);
+    }
+    public static SqlDouble Atn2(SqlDouble value1, SqlDouble value2){
+      if (value1.IsNull || value2.IsNull) return SqlDouble.Null;
+      return Math.Atan2((double)value1, (double)value2);
+    }
+    public static SqlByte Ceiling(SqlByte value){
+      return value;
+    }
+    public static SqlInt16 Ceiling(SqlInt16 value){
+      return value;
+    }
+    public static SqlInt32 Ceiling(SqlInt32 value){
+      return value;
+    }
+    public static SqlInt64 Ceiling(SqlInt64 value){
+      return value;
+    }
+    public static SqlDouble Ceiling(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Ceiling((double)value);
+    }
+    public static SqlDecimal Ceiling(SqlDecimal value){
+      return SqlDecimal.Ceiling(value);
+    }
+    public static SqlMoney Ceiling(SqlMoney value){
+      return (SqlMoney)SqlDecimal.Ceiling(value);
+    }
+    public static SqlInt32 CharIndex(SqlString pattern, SqlString source){
+      if (pattern.IsNull || source.IsNull) return SqlInt32.Null;
+      return ((string)source).IndexOf((string)pattern) + 1;
+    }
+    public static SqlDouble Cos(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Cos((double)value);
+    }
+    public static SqlDateTime DateAdd(SqlDatePart part, SqlInt32 value, SqlDateTime date){
+      if (value.IsNull || date.IsNull) return SqlDateTime.Null;
+      int incr = (int)value;
+      DateTime dt = (DateTime)date;
+      switch (part){
+        case SqlDatePart.Year:
+          return dt.AddYears(incr);
+        case SqlDatePart.Month:
+          return dt.AddMonths(incr);
+        case SqlDatePart.Day:
+          return dt.AddDays(incr);
+        case SqlDatePart.Hour:
+          return dt.AddHours(incr);
+        case SqlDatePart.Minute:
+          return dt.AddMinutes(incr);
+        case SqlDatePart.Second:
+          return dt.AddSeconds(incr);
+        case SqlDatePart.Millisecond:
+          return dt.AddMilliseconds(incr);
+      }
+      return dt;
+    }
+    public static SqlInt32 DatePart(SqlDatePart part, SqlDateTime date){
+      if (date.IsNull) return SqlInt32.Null;
+      DateTime dt = (DateTime)date;
+      switch (part){
+        case SqlDatePart.Year: 
+          return dt.Year;
+        case SqlDatePart.Month:
+          return dt.Month;
+        case SqlDatePart.Week:
+          return (dt.DayOfYear + 6)/ 7;
+        case SqlDatePart.WeekDay:
+          return (int)dt.DayOfWeek;
+        case SqlDatePart.Day:
+          return dt.Day;
+        case SqlDatePart.DayOfYear:
+          return dt.DayOfYear;
+        case SqlDatePart.Hour:
+          return dt.Hour;
+        case SqlDatePart.Minute:
+          return dt.Minute;
+        case SqlDatePart.Second:
+          return dt.Second;
+        case SqlDatePart.Millisecond:
+          return dt.Millisecond;
+      }
+      return 0;
+    }
+    public static SqlDouble Degrees(SqlDouble radians){
+      if (radians.IsNull) return SqlDouble.Null;
+      return ((double)radians) * Math.PI / 2;
+    }
+    public static SqlDouble Exp(SqlDouble exponent){
+      return Math.Exp((double)exponent);
+    }
+    public static SqlByte Floor(SqlByte value){
+      return value;
+    }
+    public static SqlInt16 Floor(SqlInt16 value){
+      return value;
+    }
+    public static SqlInt32 Floor(SqlInt32 value){
+      return value;
+    }
+    public static SqlInt64 Floor(SqlInt64 value){
+      return value;
+    }
+    public static SqlDouble Floor(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Floor((double)value);
+    }
+    public static SqlDecimal Floor(SqlDecimal value){
+      return SqlDecimal.Floor(value);
+    }
+    public static SqlMoney Floor(SqlMoney value){
+      return (SqlMoney)SqlDecimal.Floor(value);
+    }
+    public static SqlDateTime GetDate(){
+      return DateTime.Now;
+    }
+    public static SqlDateTime GetUtcDate(){
+      return DateTime.UtcNow;
+    }
+    public static SqlBoolean IsDate(SqlString value){
+      if (value.IsNull) return SqlBoolean.Null;
+      try{ DateTime.Parse((string)value); }
+      catch{ return false; }
+      return true;
+    }
+    public static SqlString Left(SqlString value, SqlInt32 length){
+      if (value.IsNull || length.IsNull) return SqlString.Null;
+      int len = (int)length;
+      string str = (string)value;
+      return str.Substring(0, len);
+    }
+    public static SqlInt32 Len(SqlString value){
+      if (value.IsNull) return SqlInt32.Null;
+      return ((string)value).Length;
+    }
+    public static SqlDouble Log(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Log((double)value);
+    }
+    public static SqlDouble Log10(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Log10((double)value);
+    }
+    public static SqlDouble Power(SqlDouble value, SqlDouble exponent){
+      if (value.IsNull || exponent.IsNull) return SqlDouble.Null;
+      return Math.Pow((double)value, (double)exponent);
+    }
+    public static SqlString Replace(SqlString source, SqlString oldValue, SqlString newValue){
+      if (source.IsNull || oldValue.IsNull || newValue.IsNull) return SqlString.Null;
+      return ((string)source).Replace((string)oldValue, (string)newValue);
+    }
+    public static SqlString Reverse(SqlString value){
+      if (value.IsNull) return SqlString.Null;
+      string str = (string)value;
+      StringBuilder sb = new StringBuilder(str.Length);
+      for(int i = str.Length - 1; i >= 0; i--)
+        sb.Append(str[i]);       
+      return sb.ToString();
+    }
+    public static SqlString Right(SqlString value, SqlInt32 length){
+      if (value.IsNull || length.IsNull) return SqlString.Null;
+      string str = (string)value;
+      int len = Math.Min((int)length, str.Length);
+      return str.Substring(str.Length - len - 1, len);
+    }
+    public static SqlDouble Round(SqlDouble value, SqlInt32 precision){
+      if (value.IsNull || precision.IsNull) return SqlDouble.Null;
+      return Math.Round((double)value, (int)precision);
+    }
+    public static SqlDecimal Round(SqlDecimal value, SqlInt32 precision){
+      if (value.IsNull || precision.IsNull) return SqlDecimal.Null;
+      return SqlDecimal.Round(value, (int)precision);
+    }
+    public static SqlMoney Round(SqlMoney value, SqlInt32 precision){
+      if (value.IsNull || precision.IsNull) return SqlMoney.Null;
+      return (SqlMoney) SqlDecimal.Round(value, (int)precision);
+    }
+    public static SqlDouble Sin(SqlDouble value){
+      if (value.IsNull) return SqlDouble.Null;
+      return Math.Sin((double)value);
+    }
+    public static SqlString Stuff(SqlString source, SqlInt32 position, SqlInt32 length, SqlString value){
+      if (source.IsNull || position.IsNull || length.IsNull) return SqlString.Null;
+      int offset = ((int)position) - 1;
+      string result = ((string)source).Remove(offset, (int)length);
+      if (!value.IsNull) result = result.Insert(offset, (string)value);
+      return result;
+    }
+    public static SqlString Substring(SqlString source, SqlInt32 position, SqlInt32 length){
+      if (source.IsNull || position.IsNull || length.IsNull) return SqlString.Null;
+      int offset = ((int)position) - 1;
+      return ((string)source).Substring(offset, (int)length);
+    }
+  }
+
+  [Anonymous]
+  public enum SqlDatePart{
+    Year,
+    Quarter,
+    Month,
+    Day,
+    DayOfYear,
+    Week,
+    WeekDay,
+    Hour,
+    Minute,
+    Second,
+    Millisecond
+  }
+
+  [Anonymous]
+  public enum SqlHint{
+    HoldLock,
+    Serializable,
+    RepeatableRead,
+    ReadCommitted,
+    ReadUncommitted,
+    NoLock, 
+    RowLock,
+    PageLock,
+    TableLock,
+    TableLockExclusive,
+    ReadPast,
+    UpdateLock,
+    ExclusiveLock,
+  }
+}
+#endif
+#endif
+namespace Microsoft.Contracts{
+
+#if CCINamespace
+  using Microsoft.Cci;
+#else
+  using System.Compiler;
+#endif
+
+  [Template(typeof(ElementTypeAttribute))]
+  public class Range: System.Collections.IEnumerable{
+    public int From, To, Step;
+    public int FromO, ToO;
+    //private bool ok;
+    //public Range(int f, int t, int s) {
+    //From=f-1; To=t; Step=s; ok = false;
+    //}
+    public Range(int f, int t) {
+      From=f; To=t; Step=1; //ok = false;
+    }
+    public RangeEnumerator GetEnumerator(){
+      return new RangeEnumerator(From, To, Step);
+    }
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator(){
+      return new RangeEnumerator(From, To, Step);
+    }
+    
+    public struct RangeEnumerator:System.Collections.IEnumerator{
+      private int from, to, step;
+      private bool ok ;
+      public RangeEnumerator(int f, int t, int s) {
+        from=f; to=t; step=s; ok = false;
+      }
+      public object Current{get {if(ok) return from; else throw new Exception("RangeEnumerator.Current: wrong protocol");}}
+      public bool MoveNext() {if (!ok) ok = true; else from+=step; return from<=to;}
+      public void Reset() {throw new Exception("RangeEnumerator.Reset: not implemented");}
+    }
+  }
+
+  /// <summary>
+  /// Used as an optional modifier on type parameter occurrences to override any non-null
+  /// instantiations.
+  /// </summary>
+  public sealed class NullableType {
+  }
+  public sealed class NonNullType {
+    [Throws("System.NullException")]
+    [StateIndependent]
+    [System.Diagnostics.DebuggerStepThrough]
+    [System.Diagnostics.Conditional("DEBUG")]
+    public static void AssertNotNull([Delayed] UIntPtr ptr) {
+      if (ptr == (UIntPtr)0) {
+#if KERNEL
+        Microsoft.Singularity.DebugStub.Break();
+#else
+        Microsoft.Singularity.V1.Services.DebugService.Break();
+#endif
+        throw new NullException();
+      }
+    }
+    [Throws("System.NullException")]
+    [StateIndependent]
+    [System.Diagnostics.DebuggerStepThrough]
+    [System.Diagnostics.Conditional("DEBUG")]
+    public static void AssertNotNullImplicit([Delayed] UIntPtr ptr) {
+      if (ptr == (UIntPtr)0) {
+#if KERNEL
+        Microsoft.Singularity.DebugStub.Break();
+#else
+        Microsoft.Singularity.V1.Services.DebugService.Break();
+#endif
+        throw new NullException();
+      }
+    }
+    [Throws("System.NullException")]
+    [StateIndependent]
+    [System.Diagnostics.DebuggerStepThrough]
+    [System.Diagnostics.Conditional("DEBUG")]
+    public static void AssertNotNull([Delayed] object obj) {
+      if (obj == null) {
+#if KERNEL
+        Microsoft.Singularity.DebugStub.Break();
+#else
+        Microsoft.Singularity.V1.Services.DebugService.Break();
+#endif
+        throw new NullException();
+      }
+    }
+    [Throws("System.NullException")]
+    [StateIndependent]
+    [System.Diagnostics.DebuggerStepThrough]
+    [System.Diagnostics.Conditional("DEBUG")]
+    public static void AssertNotNullImplicit([Delayed] object obj) {
+      if (obj == null) {
+#if KERNEL
+        Microsoft.Singularity.DebugStub.Break();
+#else
+        Microsoft.Singularity.V1.Services.DebugService.Break();
+#endif
+        throw new NullException();
+      }
+    }
+  }
+  public class AssertHelpers {
+    #region Assert methods
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void Assert(bool b) {
+      if (!b)
+        throw new Contracts.AssertException();
+    }
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void AssertLoopInvariant(bool b) {
+      if (!b)
+        throw new Contracts.LoopInvariantException();
+    }
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void Assert(bool b, string s) {
+      if (!b)
+        throw new Contracts.AssertException(s);
+    }
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void Assert(bool b, string s, Exception inner) {
+      if (!b)
+        throw new Contracts.AssertException(s,inner);
+    }
+    /// <summary>
+    /// Is deserialized by Boogie.
+    /// </summary>
+    /// <param name="condition">Serialized condition</param>
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void AssertStatement(string condition){
+    }
+    /// <summary>
+    /// Is deserialized by Boogie.
+    /// </summary>
+    /// <param name="condition">Serialized condition</param>
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void LoopInvariant(string condition) {
+    }
+    #endregion Assert methods
+    #region Assume methods
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void Assume(bool b) {
+      if (!b)
+        throw new Contracts.AssumeException();
+    }
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void Assume(bool b, string s) {
+      if (!b)
+        throw new Contracts.AssumeException(s);
+    }
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void Assume(bool b, string s, Exception inner) {
+      if (!b)
+        throw new Contracts.AssumeException(s,inner);
+    }
+    /// <summary>
+    /// Is deserialized by Boogie.
+    /// </summary>
+    /// <param name="condition">Serialized condition</param>
+    [System.Diagnostics.DebuggerStepThrough]
+    public static void AssumeStatement(string condition) {
+    }
+    #endregion Assume methods
+    [return: Microsoft.Contracts.NotNull]
+    public static object OwnerIs(object owner, [Microsoft.Contracts.NotNull] object owned_object) { return owned_object; }
+  }
+  #region Exceptions
+  //---------------------------------------------------------------------------
+  //Exceptions
+  //---------------------------------------------------------------------------
+
+  public class NoChoiceException : Exception {}
+  public class IllegalUpcastException : Exception {}
+
+  public interface ICheckedException {}
+  public class CheckedException: Exception, ICheckedException {}
+
+  /// <summary>
+  /// The Spec# compiler emits "throw new UnreachableException();" statements in places that it knows are unreachable, but that are considered reachable by the CLR verifier.
+  /// </summary>
+  public class UnreachableException : Exception {
+    public UnreachableException() { }
+    public UnreachableException(string s) : base(s) { }
+    public UnreachableException(string s, Exception inner) : base(s, inner) { }
+  }
+  public class ContractException : Exception {
+    public ContractException() {}
+    public ContractException(string s) : base(s) {}
+    public ContractException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class AssertException : ContractException {
+    public AssertException() {}
+    public AssertException(string s) : base(s) {}
+    public AssertException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class LoopInvariantException : AssertException {
+    public LoopInvariantException() {}
+    public LoopInvariantException(string s) : base(s) {}
+    public LoopInvariantException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class AssumeException : ContractException {
+    public AssumeException() {}
+    public AssumeException(string s) : base(s) {}
+    public AssumeException(string s, Exception inner) : base(s,inner) {}
+  }
+  /// <summary>
+  /// Thrown when evaluation of a contract clause throws an exception.
+  /// </summary>
+  public class InvalidContractException : ContractException {
+    public InvalidContractException() {}
+    public InvalidContractException(string s) : base(s) {}
+    public InvalidContractException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class RequiresException : ContractException {
+    public RequiresException() {}
+    public RequiresException(string s) : base(s) {}
+    public RequiresException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class EnsuresException : ContractException {
+    public EnsuresException() {}
+    public EnsuresException(string s) : base(s) {}
+    public EnsuresException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class ModifiesException : ContractException {
+    public ModifiesException() {}
+    public ModifiesException(string s) : base(s) {}
+    public ModifiesException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class ThrowsException : ContractException {
+    public ThrowsException() {}
+    public ThrowsException(string s) : base(s) {}
+    public ThrowsException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class DoesException : ContractException {
+    public DoesException() {}
+    public DoesException(string s) : base(s) {}
+    public DoesException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class InvariantException : ContractException {
+    public InvariantException() {}
+    public InvariantException(string s) : base(s) {}
+    public InvariantException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class NullException : ContractException {
+    public NullException() {}
+    public NullException(string s) : base(s) {}
+    public NullException(string s, Exception inner) : base(s,inner) {}
+  }
+  public class ContractMarkerException : ContractException {
+  }
+  #endregion Exceptions
+  #region Attributes
+  //---------------------------------------------------------------------------
+  //Attributes
+  //---------------------------------------------------------------------------
+  internal sealed class SpecTargets{
+    internal const AttributeTargets Code = 
+      AttributeTargets.Constructor|AttributeTargets.Method|AttributeTargets.Property|AttributeTargets.Event|AttributeTargets.Delegate;
+    internal const AttributeTargets Containers = 
+      AttributeTargets.Struct|AttributeTargets.Class|AttributeTargets.Interface;
+    internal const AttributeTargets CodeAndTheirContainers =
+      Code|Containers;
+    internal const AttributeTargets 
+      CodeFieldsAndTheirContainers = CodeAndTheirContainers|AttributeTargets.Field;
+  }
+  /// <summary>
+  /// We serialize constructs like Requires as custom attributes. But then there
+  /// is the problem of how to serialize custom attributes that have been put onto
+  /// such constructs. Since nested attributes are not allowed, we encode them
+  /// by serializing the nested attributes and then emitting an attribute of type
+  /// NestedAttributeCount with the number of nested attributes. That way, upon
+  /// deserialization, as long as the order of the serialized attributes can be
+  /// depended upon, we can reconstitute the nested attributes.
+  /// So the Spec# source:
+  /// "[A][B] requires P"
+  /// would be serialized as
+  /// "A(...), B(...), NestedAttributeCount(2), Requires(P,...)".
+  /// </summary>
+ /*
+  [AttributeUsage(AttributeTargets.All,AllowMultiple=true, Inherited = true)]
+  public class NestedAttributeCount : Attribute{
+    public int numberOfNestedAttributes;
+    public NestedAttributeCount(int _numberOfNestedAttributes){
+      numberOfNestedAttributes = _numberOfNestedAttributes;
+    }
+  }
+  */
+  public class AttributeWithContext : Attribute{
+    public string Filename = "<unknown>";
+    public int StartLine = 0;
+    public int StartColumn = 0;
+    public int EndLine = 0;
+    public int EndColumn = 0;
+    public string SourceText = "";
+    public AttributeWithContext(){}
+    public AttributeWithContext(string filename, int startline, int startcol, int endline, int endcol)
+    : this(filename, startline, startcol, endline, endcol, "")
+    {}
+    public AttributeWithContext(string filename, int startline, int startcol, int endline, int endcol, string sourceText){
+      this.Filename = filename;
+      this.StartLine = startline;
+      this.StartColumn = startcol;
+      this.EndLine = endline;
+      this.EndColumn = endcol;
+      this.SourceText = sourceText;
+    }
+  }
+  [AttributeUsage(Microsoft.Contracts.SpecTargets.Code, AllowMultiple=false, Inherited = true)]
+  public sealed class PureAttribute: Microsoft.Contracts.AttributeWithContext{
+  }
+    /*Diego's Attributes */
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=false, Inherited = true)]
+  public sealed class WriteConfinedAttribute: AttributeWithContext{
+  }
+    [AttributeUsage(SpecTargets.Code,AllowMultiple=false, Inherited = true)]
+  public sealed class GlobalWriteAttribute: AttributeWithContext{
+      public bool Value;
+      GlobalWriteAttribute()
+      {
+          Value = true;
+      }
+      GlobalWriteAttribute(bool value)
+      {
+          this.Value = value;
+      }
+
+  }
+    [AttributeUsage(SpecTargets.Code,AllowMultiple=false, Inherited = true)]
+  public sealed class GlobalReadAttribute: AttributeWithContext{
+      public bool Value;
+      GlobalReadAttribute()
+      {
+          Value = true;
+      }
+      GlobalReadAttribute(bool value)
+      {
+          this.Value = value;
+      }
+
+  }
+    [AttributeUsage(SpecTargets.Code, AllowMultiple = false, Inherited = true)]
+    public sealed class GlobalAccessAttribute : AttributeWithContext
+    {
+        public bool Value;
+        GlobalAccessAttribute()
+        {
+            Value = true;
+        }
+        GlobalAccessAttribute(bool value)
+        {
+            this.Value = value;
+        }
+
+    }
+    [AttributeUsage(SpecTargets.Code | AttributeTargets.ReturnValue | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = true, Inherited = true)]
+  public sealed class FreshAttribute: AttributeWithContext{
+  }
+    [AttributeUsage(SpecTargets.Code | AttributeTargets.Parameter, AllowMultiple = true, Inherited = true)]
+  public sealed class EscapesAttribute: AttributeWithContext{
+      public bool Value;
+      public bool Owned;
+      public EscapesAttribute()
+      {
+          Value = false;
+          Owned = false;
+      }
+      public EscapesAttribute(bool value)
+      {
+          this.Value = value;
+          this.Owned = true;
+      }
+    public EscapesAttribute(bool value, bool own) {
+      this.Value = value;
+      this.Owned = own;
+    }
+  }
+    /**/
+
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=false, Inherited = true)]
+  public sealed class StateIndependentAttribute: AttributeWithContext{
+  }
+  [AttributeUsage(AttributeTargets.ReturnValue|AttributeTargets.Field|AttributeTargets.Parameter,AllowMultiple=true, Inherited = false)]
+  public sealed class NotNullAttribute: AttributeWithContext{
+  }
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+  public sealed class DelayedAttribute : AttributeWithContext {
+  }
+  [AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false)]
+  public sealed class NotDelayedAttribute : AttributeWithContext {
+  }
+  
+  [AttributeUsage(SpecTargets.Containers, AllowMultiple = false, Inherited = false)]
+  public sealed class NotNullGenericArgumentsAttribute : AttributeWithContext {
+    public string PositionOfNotNulls;
+    public NotNullGenericArgumentsAttribute(string positionOfNotNulls) {
+      PositionOfNotNulls = positionOfNotNulls;
+    }
+  }
+  [AttributeUsage(SpecTargets.CodeFieldsAndTheirContainers, AllowMultiple = false, Inherited = false)]
+  public sealed class EncodedTypeSpecAttribute : AttributeWithContext {
+    public int token;
+    public EncodedTypeSpecAttribute(int token) {
+      this.token = token;
+    }
+  }
+  [AttributeUsage(AttributeTargets.Field)]
+  public sealed class StrictReadonlyAttribute: Attribute{
+  }
+  [AttributeUsage(SpecTargets.CodeFieldsAndTheirContainers,AllowMultiple=false, Inherited = true)]
+  public sealed class ModelAttribute: AttributeWithContext{
+  }
+  [AttributeUsage(SpecTargets.CodeFieldsAndTheirContainers,AllowMultiple=false, Inherited = true)]
+  public sealed class SpecPublicAttribute: AttributeWithContext{
+  }
+  [AttributeUsage(SpecTargets.CodeFieldsAndTheirContainers,AllowMultiple=false, Inherited = true)]
+  public sealed class SpecProtectedAttribute: AttributeWithContext{
+  }
+  [AttributeUsage(SpecTargets.CodeFieldsAndTheirContainers,AllowMultiple=false, Inherited = true)]
+  public sealed class SpecInternalAttribute: AttributeWithContext{
+  }
+
+  /// <summary>
+  /// Used to mark the beginning of contracts so that static verification can recognize them
+  /// (either to ignore them or to treat them specially)
+  /// </summary>
+  public sealed class ContractMarkers {
+    public static void BeginRequires() { }
+    public static void EndRequires() { }
+  }
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=true, Inherited = true)]
+  public sealed class RequiresAttribute: AttributeWithContext{
+    public string Requires;
+    public RequiresAttribute(string _requires){
+      Requires = _requires;
+    }
+    public RequiresAttribute(string _requires, string filename, int startline, int startcol, int endline, int endcol)
+      : base(filename,startline,startcol,endline,endcol){
+      Requires = _requires;
+    }
+    public RequiresAttribute(string _requires, string filename, int startline, int startcol, int endline, int endcol, string sourceText)
+      : base(filename,startline,startcol,endline,endcol,sourceText){
+      Requires = _requires;
+    }
+  }
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=true, Inherited = true)]
+  public sealed class EnsuresAttribute: AttributeWithContext{
+    public string Ensures;
+    public EnsuresAttribute(string _ensures) {
+      Ensures = _ensures;
+    }
+    public EnsuresAttribute(string _ensures, string filename, int startline, int startcol, int endline, int endcol)
+      : base(filename,startline,startcol,endline,endcol){
+      Ensures = _ensures;
+    }
+    public EnsuresAttribute(string _ensures, string filename, int startline, int startcol, int endline, int endcol, string sourceText)
+      : base(filename,startline,startcol,endline,endcol,sourceText){
+      Ensures = _ensures;
+    }
+}
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=true, Inherited = true)]
+  public sealed class ModifiesAttribute: AttributeWithContext{
+    public string Modifies;
+    public ModifiesAttribute(string _modifies) {
+      Modifies = _modifies;
+    }
+    public ModifiesAttribute(string _modifies, string filename, int startline, int startcol, int endline, int endcol)
+      : base(filename,startline,startcol,endline,endcol){
+      Modifies = _modifies;
+    }
+    public ModifiesAttribute(string _modifies, string filename, int startline, int startcol, int endline, int endcol, string sourceText)
+      : base(filename,startline,startcol,endline,endcol,sourceText){
+      Modifies = _modifies;
+    }
+  }
+  [AttributeUsage(SpecTargets.Code, AllowMultiple = false, Inherited = false)]
+  public sealed class HasWitnessAttribute : AttributeWithContext {
+  }
+  [AttributeUsage(SpecTargets.Code, AllowMultiple = false, Inherited = false)]
+  public sealed class InferredReturnValueAttribute : AttributeWithContext {
+    public string Value;
+    public InferredReturnValueAttribute(string value) {
+      this.Value = value;
+    }
+  }
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=true, Inherited = true)]
+  public sealed class ThrowsAttribute: AttributeWithContext{
+    public string Throws;
+    public ThrowsAttribute(string _throws) {
+      Throws = _throws;
+    }
+    public ThrowsAttribute(string _throws, string filename, int startline, int startcol, int endline, int endcol)
+      : base(filename,startline,startcol,endline,endcol){
+      Throws = _throws;
+    }
+    public ThrowsAttribute(string _throws, string filename, int startline, int startcol, int endline, int endcol, string sourceText)
+      : base(filename,startline,startcol,endline,endcol,sourceText){
+      Throws = _throws;
+    }
+  }
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property,AllowMultiple=true, Inherited = false)]
+  public sealed class DoesAttribute: AttributeWithContext{
+    public string Does;
+    public DoesAttribute(string _does) {
+      Does = _does;
+    }
+    public DoesAttribute(string _does, string filename, int startline, int startcol, int endline, int endcol)
+      : base(filename,startline,startcol,endline,endcol){
+      Does = _does;
+    }
+    public DoesAttribute(string _does, string filename, int startline, int startcol, int endline, int endcol, string sourceText)
+      : base(filename,startline,startcol,endline,endcol,sourceText){
+      Does = _does;
+    }
+  }
+
+
+
+
+  [AttributeUsage(SpecTargets.Containers,AllowMultiple=true, Inherited = true)]
+  public sealed class InvariantAttribute: AttributeWithContext{
+    public string Invariant;
+    public InvariantAttribute(string _invariant) {
+      Invariant = _invariant;
+    }
+    public InvariantAttribute(string _invariant, string filename, int startline, int startcol, int endline, int endcol) {
+      Invariant = _invariant;
+      Filename = filename;
+      StartLine = startline;
+      StartColumn = startcol;
+      EndLine = endline;
+      EndColumn = endcol;
+    }
+  }
+  
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+  public sealed class ShadowsAssemblyAttribute : System.Attribute{
+    //TODO: we really want a single argument that provides a complete name and then construct an AssemblyReference from it.
+    //TODO: make the Spec# compiler aware of this attribute so that it can check that the argument really is a strong name.
+    public string PublicKey;
+    public string Version;
+    public string Name; 
+    public ShadowsAssemblyAttribute(string publicKey, string version, string name) {PublicKey=publicKey; Version=version; Name=name;}
+  }
+  #endregion Attributes
+}
+
+#if CCINamespace
+namespace Microsoft.Cci.TypeExtensions {
+#else
+namespace System.Compiler.TypeExtensions {
+#endif
+}
+
+#if CCINamespace
+namespace Microsoft.Cci {
+#else
+namespace System.Compiler {
+#endif
+  /// <summary>
+  /// This attribute marks a template parameter T as being instantiable only with unmanaged structs
+  /// thereby allowing types such as T* in the generic code.
+  /// It needs to be present under Everett and Whidbey, since MSIL 2.0 does not have a way to encode
+  /// this AFAIK. [MAF 12/1/05]
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct)]
+  public sealed class UnmanagedStructTemplateParameterAttribute : System.Attribute
+  {
+  }
+
+}
+
+namespace Microsoft.Contracts{
+#if CCINamespace
+  using Microsoft.Cci;
+#endif
+  using System.Collections;
+  using System.Threading;
+
+  /// <summary>
+  /// Called by a <see cref="Guard"/> object to initialize its <i>guard sets</i>.
+  /// </summary>
+  /// <remarks>
+  /// This delegate should not call any methods other than
+  /// <see cref="Guard.AddRep"/>,
+  /// <see cref="Guard.AddRepObject"/>,
+  /// <see cref="Guard.AddImmutableCertificate"/>,
+  /// <see cref="Guard.AddObjectImmutableCertificate"/>,
+  /// <see cref="Guard.AddLockProtectedCertificate"/>, and
+  /// <see cref="Guard.AddObjectLockProtectedCertificate"/>.
+  /// </remarks>
+  public delegate void InitGuardSetsDelegate();
+  // TODO: Remove once the LKG compiler uses CheckInvariantDelegate.
+  public delegate bool InvariantHoldsDelegate();
+  /// <summary>
+  /// Called by a <see cref="Guard"/> object to check that its invariant holds, when it ends writing.
+  /// </summary>
+  /// <param name="throwException">If true and the invariant does not hold, throws an exception. If false and the invariant does not hold, returns false.</param>
+  public delegate bool CheckInvariantDelegate(bool throwException);
+  /// <summary>
+  /// Called by the <see cref="Guard.AcquireForReading"/> and <see cref="Guard.AcquireForWriting"/> methods
+  /// to decide whether to return or to wait.
+  /// </summary>
+  public delegate bool ThreadConditionDelegate();
+  /// <summary>
+  /// Called by the <see cref="System.Threading.ThreadStart"/> delegate returned by the
+  /// <see cref="Guard.CreateThreadStart"/> method.
+  /// </summary>
+  public delegate void GuardThreadStart();
+  /// <summary>
+  /// Delegate that grants access to the frame guards of the objects of a particular type.
+  /// </summary>
+  /// <param name="o">Object whose frame guard to return</param>
+  /// <returns>The frame guard of <paramref name="o"/></returns>
+  [return:NotNull]
+  public delegate Guard FrameGuardGetter(object o);
+  /// <summary>
+  /// Thrown by a <see cref="Guard"/> object whenever a race condition, an ownership violation, or an invariant violation is
+  /// detected.
+  /// </summary>
+  public class GuardException : Exception {
+    public GuardException() {}
+    public GuardException(string message) : base(message) {}
+  }
+
+  /// <summary>
+  /// Indicates the capability of a thread with respect to a guard (and the resource it protects).
+  /// </summary>
+  public enum ThreadCapability{
+    /// <summary>
+    /// The thread cannot access the resource.
+    /// </summary>
+    None,
+    /// <summary>
+    /// The thread can read the resource.
+    /// </summary>
+    Readable,
+    /// <summary>
+    /// The thread can read and write the resource.
+    /// </summary>
+    Writable
+  }
+  /// <summary>
+  /// Indicates the activity being performed by a thread on a guard (and the resource it protects).
+  /// </summary>
+  public enum ThreadActivity{
+    /// <summary>
+    /// The thread is not acting on the resource.
+    /// </summary>
+    None,
+    /// <summary>
+    /// The thread is reading the resource.
+    /// </summary>
+    Reading,
+    /// <summary>
+    /// The thread is writing the resource.
+    /// </summary>
+    Writing
+  }
+  /// <summary>
+  /// Indicates how a thread shares a guard (and the resource it protects).
+  /// </summary>
+  public enum SharingMode{
+    /// <summary>
+    /// The thread does not share the resource.
+    /// </summary>
+    /// <remarks>
+    /// Either the object itself is unshared, or the object is shared but not with the thread.
+    /// </remarks>
+    Unshared,
+    /// <summary>
+    /// The thread shares the lock-protected resource.
+    /// </summary>
+    LockProtected,
+    /// <summary>
+    /// The thread shares the immutable resource.
+    /// </summary>
+    Immutable
+  }
+  /// <summary>
+  /// Helps guard an object or other resource against race conditions, enforce ownership, and enforce invariants.
+  /// </summary>
+  public sealed class Guard {
+    sealed class Commitment {
+      private Guard outer;
+      public Guard owner;
+
+      internal Commitment(Guard outer, Guard owner){
+        this.outer = outer;
+        this.owner = owner;
+      }
+
+      public void Release(){
+        LocalData locals = outer.Locals;
+        outer.owner = null;
+        locals.Capability = ThreadCapability.Writable;
+        outer = null;
+      }
+    }
+    sealed class RepFrame{
+      public Guard/*!*/ frame;
+      public Commitment commitment;
+
+      public RepFrame(Guard/*!*/ frame) {
+        this.frame = frame;
+        //^ base();
+      }
+
+      public void Commit(Guard/*!*/ owner) {
+        commitment = frame.Commit(owner);
+      }
+
+      public void Release(){
+        commitment.Release();
+        commitment = null;
+      }
+    }
+
+    sealed class LocalData {
+      public SharingMode SharingMode;
+      public ThreadCapability Capability;
+      public ThreadActivity Activity;
+      public override string ToString() {
+        return "<" + this.SharingMode.ToString() + "," + this.Capability.ToString() + "," + this.Activity.ToString() + ">";
+      }
+
+    }
+
+    sealed class Scheduler {
+      bool writerActive;
+      int activeReaderCount;
+      QueueEntry nextWriter;
+      /// <summary>
+      /// The queue of entries that will be re-evaluated after the next ReleaseForWriting.
+      /// </summary>
+      Queue queue = new Queue();
+
+      // invariant writerActive ==> (activeReaderCount == 0 && nextWriter == null);
+      // invariant (!writerActive && nextWriter != null) ==> activeReaderCount != 0;
+      // The following invariants assume that IsEnabled changes only when writerActive.
+      // invariant nextWriter != null ==> nextWriter.IsEnabled; 
+      // invariant (!writerActive && nextWriter == null) ==> forall(QueueEntry e in queue; !e.IsReader ==> !e.IsEnabled);
+
+      sealed class QueueEntry {
+        public readonly bool IsReader;
+        readonly ThreadConditionDelegate condition;
+        bool runnable;
+
+        public QueueEntry(bool reader, ThreadConditionDelegate condition){
+          this.IsReader = reader;
+          this.condition = condition;
+        }
+
+        public bool IsEnabled {
+          get {
+            return condition == null || condition();
+          }
+        }
+
+        public void Run(){
+          lock (this){
+            runnable = true;
+            Monitor.Pulse(this);
+          }
+        }
+
+        public void Wait(){
+          lock (this){
+            while (!runnable)
+              Monitor.Wait(this);
+          }
+        }
+      }
+
+      public void AcquireForReading(ThreadConditionDelegate condition){
+        QueueEntry entry = new QueueEntry(true, condition);
+        lock (this){
+          if (writerActive || nextWriter != null || !entry.IsEnabled){
+            // This reader will get a chance after the next ReleaseForWriting
+            queue.Enqueue(entry);
+          } else {
+            activeReaderCount++;
+            entry.Run();
+          }
+        }
+        entry.Wait();
+      }
+
+      public void AcquireForWriting(ThreadConditionDelegate condition){
+        QueueEntry entry = new QueueEntry(false, condition);
+        lock (this){
+          if (writerActive || nextWriter != null || !entry.IsEnabled){
+            // This writer will get a chance after the next ReleaseForWriting
+            queue.Enqueue(entry);
+          } else if (activeReaderCount == 0){
+            writerActive = true;
+            entry.Run();
+          } else {
+            nextWriter = entry;
+          }
+        }
+        entry.Wait();
+      }
+
+      public void ReleaseForReading(){
+        lock (this){
+          activeReaderCount--;
+          if (activeReaderCount == 0 && nextWriter != null){
+            nextWriter.Run();
+            writerActive = true;
+            nextWriter = null;
+          }
+        }
+      }
+
+      public void ReleaseForWriting(){
+        lock (this){
+          writerActive = false;
+          Queue newQueue = new Queue();
+          while (queue.Count > 0){
+            QueueEntry entry = (QueueEntry/*!*/)queue.Dequeue();
+            if (entry.IsReader && entry.IsEnabled){
+              activeReaderCount++;
+              entry.Run();
+            } else if (!entry.IsReader && nextWriter == null && entry.IsEnabled){
+              nextWriter = entry;
+            } else {
+              newQueue.Enqueue(entry);
+            }
+          }
+          queue = newQueue;
+          if (activeReaderCount == 0 && nextWriter != null){
+            nextWriter.Run();
+            writerActive = true;
+            nextWriter = null;
+          }
+        }
+      }
+    }
+
+    readonly InitGuardSetsDelegate initFrameSets;
+    readonly CheckInvariantDelegate checkInvariant;
+    Scheduler scheduler;
+    readonly Hashtable/*!*/ repFrames = new Hashtable();
+    readonly Hashtable/*!*/ sharedFrames = new Hashtable();
+    /// <summary>
+    /// Thread-local data indicating the sharing mode, the capability and the activity of the current thread with respect
+    /// to this object.
+    /// </summary>
+    readonly LocalDataStoreSlot localData = Thread.AllocateDataSlot();
+    object owner;
+
+    class InvariantHoldsAdaptor{
+      InvariantHoldsDelegate invariantHolds;
+
+      public InvariantHoldsAdaptor(InvariantHoldsDelegate invariantHolds){
+        this.invariantHolds = invariantHolds;
+      }
+
+      public bool CheckInvariant(bool throwException){
+        if (!invariantHolds())
+          if (throwException)
+            throw new Microsoft.Contracts.ObjectInvariantException();
+          else
+            return false;
+        return true;
+      }
+    }
+
+    // TODO: Remove once the LKG uses the other constructor.
+    public Guard([Delayed] InitGuardSetsDelegate initGuardSets, [Delayed] InvariantHoldsDelegate invariantHolds)
+      : this(initGuardSets, new CheckInvariantDelegate(new InvariantHoldsAdaptor(invariantHolds).CheckInvariant))
+    {
+    }
+
+    /// <summary>
+    /// Creates a new guard object.
+    /// </summary>
+    /// <remarks>
+    /// Initially, the object is unshared;
+    /// the current thread can write and is writing the guard;
+    /// and no other thread can access the guard.
+    /// </remarks>
+    /// <param name="initGuardSets">A delegate that is called to initialize the guard's <i>guard sets</i>.</param>
+    /// <param name="checkInvariant">A delegate that is called to check the guard's invariant.</param>
+    public Guard([Delayed] InitGuardSetsDelegate initGuardSets, [Delayed] CheckInvariantDelegate checkInvariant){
+      this.initFrameSets = initGuardSets;
+      this.checkInvariant = checkInvariant;
+      LocalData locals = Locals;
+      locals.Capability = ThreadCapability.Writable;
+      locals.Activity = ThreadActivity.Writing;
+    }
+
+    LocalData/*!*/ Locals {
+      get {
+        LocalData locals;
+        object o = Thread.GetData(localData);
+        if (o == null) {
+          locals = new LocalData();
+          Thread.SetData(localData, locals);
+        } else
+          locals = (LocalData) o;
+        return locals;
+      }
+    }
+
+    /// <summary>
+    /// Returns true if the current thread can read the resource; otherwise, returns false.
+    /// </summary>
+    /// <remarks>
+    /// Equivalent to <c>Capability != ThreadCapability.None</c>.
+    /// </remarks>
+    public bool CanRead {
+      get {
+        return Locals.Capability != ThreadCapability.None;
+      }
+    }
+
+    /// <summary>
+    /// Returns true if the current thread can write the resource; otherwise, returns false.
+    /// </summary>
+    /// <remarks>
+    /// Equivalent to <c>Capability == ThreadCapability.Writable</c>.
+    /// </remarks>
+    public bool CanWrite {
+      get {
+        return Locals.Capability == ThreadCapability.Writable;
+      }
+    }
+
+    /// <summary>
+    /// Returns true if the current thread is reading or writing the resource; otherwise, returns false.
+    /// </summary>
+    /// <remarks>
+    /// Equivalent to <c>Activity != ThreadActivity.None</c>.
+    /// </remarks>
+    public bool IsActive {
+      get {
+        return Locals.Activity != ThreadActivity.None;
+      }
+    }
+
+    public void CheckIsReading(){
+      if (Locals.Activity == ThreadActivity.None)
+        throw new GuardException("Thread is not reading object.");
+    }
+
+    public void CheckIsWriting(){
+      if (Locals.Activity != ThreadActivity.Writing)
+        throw new GuardException("Thread is not writing object.");
+    }
+
+    /// <summary>
+    /// Returns the current thread's sharing mode for the resource.
+    /// </summary>
+    public SharingMode SharingMode {
+      get {
+        return Locals.SharingMode;
+      }
+    }
+
+    /// <summary>
+    /// Returns the current thread's capability with respect to the resource.
+    /// </summary>
+    public ThreadCapability Capability {
+      get {
+        return Locals.Capability;
+      }
+    }
+
+    /// <summary>
+    /// Returns the current thread's activity with respect to the resource.
+    /// </summary>
+    public ThreadActivity Activity {
+      get {
+        return Locals.Activity;
+      }
+    }
+
+    /// <summary>
+    /// Starts reading the resource.
+    /// </summary>
+    public void StartReading(){
+      LocalData locals = Locals;
+      if (locals.Capability == ThreadCapability.None)
+        throw new GuardException("Object is not readable by current thread.");
+      if (locals.Activity != ThreadActivity.None)
+        throw new GuardException("Thread is already reading or writing object.");
+      RegisterSharedFrames();
+      locals.Activity = ThreadActivity.Reading;
+      foreach (RepFrame repFrame in repFrames.Values)
+        repFrame.frame.Locals.Capability = ThreadCapability.Readable;
+    }
+
+    /// <summary>
+    /// Starts reading the resource; starts reading any transitive owners as necessary.
+    /// </summary>
+    /// <returns>The furthest transitive owner that was not yet reading.</returns>
+    [return:Microsoft.Contracts.NotNull]
+    public Guard StartReadingTransitively(){
+      Guard rootFrame;
+      Commitment commitment = owner as Commitment;
+      if (commitment != null)
+        rootFrame = commitment.owner.StartReadingTransitively();
+      else
+        rootFrame = this;
+      StartReading();
+      return rootFrame;
+    }
+
+    /// <summary>
+    /// Ends reading the resource.
+    /// </summary>
+    public void EndReading(){
+      EndReading(false);
+    }
+
+    /// <summary>
+    /// Ends reading the resource; ends reading any transitive owned resources as necessary.
+    /// </summary>
+    public void EndReadingTransitively(){
+      EndReading(true);
+    }
+
+    void EndReading(bool transitively){
+      LocalData locals = Locals;
+      if (locals.Activity != ThreadActivity.Reading)
+        throw new GuardException("Thread is not reading object.");
+      foreach (RepFrame repFrame in repFrames.Values)
+        if (repFrame.frame.Locals.Activity == ThreadActivity.Reading)
+          if (transitively)
+            repFrame.frame.EndReading(true);
+          else
+            throw new GuardException("Thread is still reading an owned object.");
+      foreach (RepFrame repFrame in repFrames.Values)
+        repFrame.frame.Locals.Capability = ThreadCapability.None;
+      locals.Activity = ThreadActivity.None;
+    }
+
+    /// <summary>
+    /// Ends writing the resource.
+    /// </summary>
+    [Delayed] // This [Delayed] tag isn't actually verifiable, but we believe it does hold here.
+    public void EndWriting(){
+      EndWriting(false, false);
+    }
+
+    [Pure]
+    public bool CanStartWriting{
+      get {
+        LocalData locals = Locals;
+        if (locals.Capability != ThreadCapability.Writable)
+          return false;
+        if (locals.Activity != ThreadActivity.None)
+          return false;
+        return true;
+      }
+    }
+    [Pure]
+    public bool CheckCanStartWriting(){
+      LocalData locals = Locals;
+      if (locals.Capability != ThreadCapability.Writable)
+        throw new GuardException("Object is not writable by current thread.");
+      if (locals.Activity != ThreadActivity.None)
+        throw new GuardException("Thread is already reading or writing the object.");
+      return true;
+    }
+    [Pure]
+    public bool CanStartWritingTransitively{
+      get {
+        if (this.CanStartWriting)
+          return true;
+        Commitment commitment = owner as Commitment;
+        if (commitment != null)
+          return commitment.owner.CanStartWritingTransitively;
+        else
+          return false;
+      }
+    }
+
+    #region Unpack/Pack methods
+    /// <summary>
+    /// Starts writing the resource; starts writing any transitive owners as necessary.
+    /// </summary>
+    /// <returns>The furthest transitive owner that was not yet writing.</returns>
+    /// 
+    [return:Microsoft.Contracts.NotNull]
+    public Guard/*!*/ StartWritingTransitively(){
+      Guard rootFrame;
+      Commitment commitment = owner as Commitment;
+      if (commitment != null)
+        rootFrame = commitment.owner.StartWritingTransitively();
+      else
+        rootFrame = this;
+      StartWriting();
+      return rootFrame;
+    }
+    /// <summary>
+    /// Ends writing the resource; ends writing any transitive reps as necessary.
+    /// </summary>
+    public void EndWritingTransitively() {
+      EndWriting(true, false);
+    }
+
+    /// <summary>
+    /// Starts writing the resource.
+    /// </summary>
+    public void StartWriting() {
+      //      Console.WriteLine("StartWriting: " + locals.ToString());
+      CheckCanStartWriting();
+      RegisterSharedFrames();
+      Locals.Activity = ThreadActivity.Writing;
+      foreach (RepFrame repFrame in repFrames.Values)
+        repFrame.Release();
+      repFrames.Clear();
+      sharedFrames.Clear();
+    }
+    void EndWriting(bool transitively, bool reflexively) {
+      LocalData locals = Locals;
+      if (locals.Activity != ThreadActivity.Writing)
+        if (reflexively)
+          return;
+        else
+          throw new GuardException("Thread is not writing object.");
+      repFrames.Clear();
+      sharedFrames.Clear();
+      initFrameSets();
+      if (transitively)
+        foreach (RepFrame repFrame in repFrames.Values)
+          repFrame.frame.EndWriting(true, true);
+      checkInvariant(true);
+      foreach (RepFrame repFrame in repFrames.Values)
+        repFrame.Commit(this);
+      locals.Activity = ThreadActivity.None;
+    }
+
+    public static void StartWritingFrame([NotNull] object o, [NotNull] Type t) { }
+    public static void EndWritingFrame([NotNull] object o, [NotNull] Type t) { }
+
+    // The next two pairs of methods are for use when an object is being exposed at
+    // one particular type, *without* being unpacked at all subtypes (which is how
+    // the "normal" unpacking is done).
+
+    // The first pair, WritingAtNop, is for those occurrences where nothing
+    // should be done at runtime, but downstream tools may still need to know
+    // that the object is being unpacked.
+    public static void StartWritingAtNop([NotNull] object o, [NotNull] Type t) { }
+    public static void EndWritingAtNop([NotNull] object o, [NotNull] Type t) { }
+
+    // The second pair, WritingAtTransitively, behaves at runtime just as WritingTransitively,
+    // but it knows to not check the invariant for any subtype below t.
+    [return: Microsoft.Contracts.NotNull]
+    public Guard/*!*/ StartWritingAtTransitively([NotNull] Type t) { return this.StartWritingTransitively(); }
+    public void EndWritingAtTransitively([NotNull] Type t) { this.EndWriting(true, false); }
+    #endregion Unpack/Pack methods
+
+    /// <summary>
+    /// Commits the resource.
+    /// </summary>
+    /// <param name="owner">The new owner.</param>
+    /// <returns>A new commitment.</returns>
+    /// <remarks>
+    /// A thread that calls this method afterwards no longer has access to the object.
+    /// Any thread can gain access to the object by calling the <see cref="Commitment.Release"/> method on the new commitment.
+    /// </remarks>
+    Commitment Commit(Guard/*!*/ owner) {
+      LocalData locals = Locals;
+      if (locals.Capability != ThreadCapability.Writable)
+        throw new GuardException("Object is not writable by current thread.");
+      if (locals.SharingMode != SharingMode.Unshared)
+        throw new GuardException("Object is shared.");
+      if (locals.Activity != ThreadActivity.None)
+        throw new GuardException("Thread is still reading or writing object.");
+      Commitment commitment = new Commitment(this, owner);
+      this.owner = commitment;
+      locals.Capability = ThreadCapability.None;
+      return commitment;
+    }
+
+    /// <summary>
+    /// Adds a resource to this guard's set of <i>reps</i>.
+    /// </summary>
+    /// <param name="rep">The resource being added.</param>
+    /// <remarks>
+    /// When a guard ends writing, it gains ownership of its reps.
+    /// </remarks>
+    public void AddRep(Guard/*!*/ rep) {
+      LocalData locals = Locals;
+      if (locals.Activity != ThreadActivity.Writing)
+        throw new GuardException("Thread is not writing the object.");
+      repFrames[rep] = new RepFrame(rep);
+    }
+
+    /// <summary>
+    /// Adds an object to this guard's set of <i>reps</i>.
+    /// </summary>
+    /// <param name="repObject">The object being added.</param>
+    /// <remarks>
+    /// If <paramref name="repObject"/> is not a guarded object, the method does nothing.
+    /// </remarks>
+    public void AddRepObject(object repObject){
+      if (repObject == null) return;
+      Guard g = Guard.GetObjectGuard(repObject);
+      if (g != null)
+        AddRep(g);
+    }
+
+    /// <summary>
+    /// Adds a frame to this guard's set of <i>reps</i>.
+    /// </summary>
+    /// <remarks>
+    /// If <paramref name="repObject"/> is not a guarded object, the method does nothing.
+    /// </remarks>
+    public void AddRepFrame(object o, Type t){
+      Guard g = Guard.GetFrameGuard(o, t);
+      if (g != null)
+        AddRep(g);
+    }
+
+    /// <summary>
+    /// Turns this unshared resource into a lock-protected resource.
+    /// </summary>
+    /// <remarks>
+    /// When this method returns, only the current thread shares the resource.
+    /// Share the resource with other threads using
+    /// the <see cref="AddLockProtectedCertificate"/> method
+    /// or
+    /// the <see cref="CreateThreadStartForLockProtected"/> method.
+    /// </remarks>
+    public void ShareLockProtected(){
+      Share(SharingMode.LockProtected);
+    }
+
+    /// <summary>
+    /// Turns the unshared resource into an immutable resource.
+    /// </summary>
+    /// <remarks>
+    /// When this method returns, only the current thread shares the resource.
+    /// Share the resource with other threads using
+    /// the <see cref="AddImmutableCertificate"/> method
+    /// or the <see cref="CreateThreadStartForImmutable"/> method.
+    /// </remarks>
+    public void ShareImmutable(){
+      Share(SharingMode.Immutable);
+    }
+
+    void Share(SharingMode mode){
+      LocalData locals = Locals;
+//      Console.WriteLine("Share: " + locals.ToString() + ", asked to share as: " + mode.ToString());
+      if (mode != SharingMode.Unshared && locals.SharingMode == mode)
+        return;
+      if (locals.Capability != ThreadCapability.Writable)
+        throw new GuardException("Object is not writable by the current thread.");
+      if (locals.Activity != ThreadActivity.None)
+        throw new GuardException("Thread is still reading or writing the object.");
+      if (locals.SharingMode != SharingMode.Unshared)
+        throw new GuardException("Object is already shared.");
+      locals.SharingMode = mode;
+      switch (mode){
+        case SharingMode.LockProtected:
+          locals.Capability = ThreadCapability.None;
+          scheduler = new Scheduler();
+          break;
+        case SharingMode.Unshared:
+          locals.Capability = ThreadCapability.None;
+          break;
+        default:
+          // assert mode == SharingMode.Immutable;
+          locals.Capability = ThreadCapability.Readable;
+          break;
+      }
+//      Console.WriteLine("Share: local state now: " + locals.ToString());
+    }
+
+    /// <summary>
+    /// Acquires exclusive access to this resource.
+    /// </summary>
+    /// <param name="condition">If not null, indicates when the thread can acquire the resource.</param>
+    public void AcquireForWriting(ThreadConditionDelegate condition){
+      LocalData locals = Locals;
+      if (locals.SharingMode != SharingMode.LockProtected)
+        throw new GuardException("Object is not lock-protected.");
+      if (locals.Capability != ThreadCapability.None)
+        throw new GuardException("Thread has already acquired the object.");
+      locals.Capability = ThreadCapability.Readable; // Allow condition code to read the object.
+      scheduler.AcquireForWriting(condition);
+      locals.Capability = ThreadCapability.Writable;
+    }
+
+    /// <summary>
+    /// Relinquishes exclusive access to this resource.
+    /// </summary>
+    public void ReleaseForWriting(){
+      LocalData locals = Locals;
+      if (locals.SharingMode != SharingMode.LockProtected)
+        throw new GuardException("Object is not lock-protected.");
+      if (locals.Capability != ThreadCapability.Writable)
+        throw new GuardException("Thread has not acquired the object for writing.");
+      if (locals.Activity != ThreadActivity.None)
+        throw new GuardException("Thread is still reading or writing the object.");
+      locals.Capability = ThreadCapability.Readable; // Allow condition code to read the object.
+      scheduler.ReleaseForWriting();
+      locals.Capability = ThreadCapability.None;
+    }
+
+    /// <summary>
+    /// Acquires read access to this resource.
+    /// </summary>
+    /// <param name="condition">If not null, indicates when the thread can acquire the resource.</param>
+    public void AcquireForReading(ThreadConditionDelegate condition){
+      LocalData locals = Locals;
+      if (locals.SharingMode != SharingMode.LockProtected)
+        throw new GuardException("Object is not lock-protected.");
+      if (locals.Capability != ThreadCapability.None)
+        throw new GuardException("Thread has already acquired the object.");
+      locals.Capability = ThreadCapability.Readable; // Allow condition code to read the object.
+      scheduler.AcquireForReading(condition);
+    }
+
+    /// <summary>
+    /// Relinquishes read access to this resource.
+    /// </summary>
+    public void ReleaseForReading(){
+      LocalData locals = Locals;
+      if (locals.SharingMode != SharingMode.LockProtected)
+        throw new GuardException("Object is not lock-protected.");
+      if (locals.Capability != ThreadCapability.Readable)
+        throw new GuardException("Thread has not acquired the object for reading.");
+      if (locals.Activity != ThreadActivity.None)
+        throw new GuardException("Thread is still reading the object.");
+      scheduler.ReleaseForReading();
+      locals.Capability = ThreadCapability.None;
+    }
+
+    /// <summary>
+    /// Adds a resource to this guard's set of <i>lock-protected certificates</i>.
+    /// </summary>
+    /// <param name="guard">The resource being added.</param>
+    /// <remarks>
+    /// When a thread subsequently starts reading or writing this guard,
+    /// the resource is shared with the thread.
+    /// </remarks>
+    public void AddLockProtectedCertificate(Guard/*!*/ guard) {
+      AddSharedFrame(guard, SharingMode.LockProtected);
+    }
+
+    /// <summary>
+    /// Adds a resource to this guard's set of <i>immutable certificates</i>.
+    /// </summary>
+    /// <param name="guard">The resource being added.</param>
+    /// <remarks>
+    /// When a thread subsequently starts reading or writing this guard,
+    /// the resource is shared with the thread.
+    /// </remarks>
+    public void AddImmutableCertificate(Guard/*!*/ guard) {
+      AddSharedFrame(guard, SharingMode.Immutable);
+    }
+
+    void AddSharedFrame(Guard/*!*/ frame, SharingMode mode) {
+      frame.Share(mode);
+      LocalData locals = Locals;
+      if (locals.Activity != ThreadActivity.Writing)
+        throw new GuardException("Thread is not writing the object.");
+      sharedFrames[frame] = mode;
+    }
+
+    /// <summary>
+    /// Stores a certificate for a lock-protected object.
+    /// Does nothing if the object is not guarded.
+    /// </summary>
+    /// <param name="sharedObject">The object for which a certificate is stored.</param>
+    /// <seealso cref="AddLockProtectedCertificate"/>
+    public void AddObjectLockProtectedCertificate(object sharedObject){
+      if (sharedObject == null) return;
+      Guard g = Guard.GetObjectGuard(sharedObject);
+      if (g != null)
+        AddLockProtectedCertificate(g);
+    }
+
+    /// <summary>
+    /// Stores a certificate for an immutable object.
+    /// Does nothing if the object is not guarded.
+    /// </summary>
+    /// <param name="sharedObject">The object for which a certificate is stored.</param>
+    /// <seealso cref="AddLockProtectedCertificate"/>
+    public void AddObjectImmutableCertificate(object sharedObject){
+      if (sharedObject == null) return;
+      Guard g = Guard.GetObjectGuard(sharedObject);
+      if (g != null)
+        AddImmutableCertificate(g);
+    }
+
+    void RegisterSharingMode(SharingMode mode){
+      LocalData sharedFrameLocals = Locals;
+      sharedFrameLocals.SharingMode = mode;
+      if (mode == SharingMode.Immutable)
+        sharedFrameLocals.Capability = ThreadCapability.Readable;
+      else if (mode == SharingMode.Unshared)
+        sharedFrameLocals.Capability = ThreadCapability.Writable;
+    }
+
+    void RegisterSharedFrames(){
+      foreach (DictionaryEntry entry in sharedFrames){
+        Guard sharedFrame = (Guard)entry.Key;
+        //^ assume sharedFrame != null;
+        object value = entry.Value;
+        if (value == null) continue;
+        SharingMode mode = (SharingMode)value;
+        sharedFrame.RegisterSharingMode(mode);
+      }
+    }
+
+    class ThreadStartTarget{
+      Guard frame;
+      GuardThreadStart threadStart;
+      SharingMode sharingMode;
+
+      public ThreadStartTarget(Guard frame, GuardThreadStart threadStart, SharingMode sharingMode){
+        this.frame = frame;
+        this.threadStart = threadStart;
+        this.sharingMode = sharingMode;
+      }
+
+      public void Start(){
+        if (this.frame == null){
+          // this makes Start() non-re-entrant
+          throw new GuardException("Start() method can be called at most once.");
+        }
+        frame.RegisterSharingMode(sharingMode);
+        this.frame = null;
+        threadStart();
+      }
+    }
+
+    ThreadStart CreateThreadStart(GuardThreadStart threadStart, SharingMode sharingMode){
+      Share(sharingMode);
+      return new ThreadStart(new ThreadStartTarget(this, threadStart, sharingMode).Start);
+    }
+  
+    /// <summary>
+    /// Use this method to share the resource with a new thread.
+    /// </summary>
+    /// <param name="threadStart">A method to be executed by the new sharing thread.</param>
+    /// <returns>A delegate that shares the resource with the thread calling it (which is typically a newly started thread)
+    /// and then calls <paramref name="threadStart"/>.</returns>
+    public ThreadStart CreateThreadStartForImmutable(GuardThreadStart threadStart){
+      return CreateThreadStart(threadStart, SharingMode.Immutable);
+    }
+
+    /// <summary>
+    /// Use this method to share the resource with a new thread.
+    /// </summary>
+    /// <param name="threadStart">A method to be executed by the new sharing thread.</param>
+    /// <returns>A delegate that shares the resource with the thread calling it (which is typically a newly started thread)
+    /// and then calls <paramref name="threadStart"/>.</returns>
+    public ThreadStart CreateThreadStartForLockProtected(GuardThreadStart threadStart){
+      return CreateThreadStart(threadStart, SharingMode.LockProtected);
+    }
+    /// <summary>
+    /// Use this method to transfer the resource to a new thread.
+    /// </summary>
+    /// <param name="threadStart">A method to be executed by the new standalone thread.</param>
+    /// <returns>A delegate that transfers the resource to the thread calling it (which is typically a newly started thread)
+    /// and then calls <paramref name="threadStart"/>.</returns>
+    public ThreadStart CreateThreadStartForOwn(GuardThreadStart threadStart){
+//      Console.WriteLine("CreateThreadStartForOwn: " + threadStart.ToString());
+      return CreateThreadStart(threadStart, SharingMode.Unshared);
+    }
+
+    /// <summary>
+    /// Holds the frame guard getter delegates of the guarded classes loaded into the AppDomain.
+    /// </summary>
+    /// <remarks>
+    /// Lock this object to access it.
+    /// </remarks>
+    static readonly Hashtable/*<Type,FrameGuardGetter!>!*/ frameGuardGetters = new Hashtable();
+
+    public static void RegisterGuardedClass(Type t, FrameGuardGetter getter) {
+      if (getter == null)
+        throw new ArgumentNullException("getter");
+#if !SINGULARITY
+      if (System.Reflection.Assembly.GetCallingAssembly() != t.Assembly)
+        throw new ArgumentException("An assembly can register only its own types.");
+#endif
+      lock (frameGuardGetters) {
+        frameGuardGetters.Add(t, getter);
+      }
+    }
+
+    /// <summary>
+    /// Returns the frame guard of object <paramref name="o"/> at type <paramref name="t"/>,
+    /// or <code>null</code> if <paramref name="t"/> is not a guarded class.
+    /// </summary>
+    public static Guard GetFrameGuard([NotNull] object o, [NotNull] Type t){
+      FrameGuardGetter getter;
+      // The Hashtable documentation allows one writer and multiple readers to access a non-synchronized Hashtable concurrently.
+      // See the documentation for the System.Collections.Hashtable.Synchronized method.
+      getter = (FrameGuardGetter)frameGuardGetters[t];
+      return getter == null ? null : getter(o);
+    }
+
+    /// <summary>
+    /// Returns the guard of object <paramref name="o"/>, or
+    /// <code>null</code> if <paramref name="o"/> is not guarded.
+    /// </summary>
+    public static Guard GetObjectGuard([NotNull] object o){
+      Type t = o.GetType();
+      while (t != null){
+        Guard guard = GetFrameGuard(o, t);
+        if (guard != null)
+          return guard;
+        t = t.BaseType;
+      }
+      return null;
+    }
+
+    [Pure]
+    public static bool IsConsistent([NotNull] object o){
+      Guard objectGuard = GetObjectGuard(o);
+      if (objectGuard != null){
+        return objectGuard.CanStartWriting;
+      }else{
+        return true; // Objects that do not have an invariant are always consistent.
+      }
+    }
+
+    [Pure]
+    public static bool IsPeerConsistent([NotNull] object o){
+      return IsConsistent(o);
+    }
+
+    [Pure]
+    public bool IsExposable{
+      get{
+        return this.CanStartWritingTransitively;
+      }
+    }
+
+    [Pure]
+    public static bool FrameIsExposable([NotNull] object o, [NotNull] Type t){
+      Guard guard = GetFrameGuard(o, t);
+      return guard == null ? true : guard.IsExposable;
+    }
+
+    [Pure]
+    public static bool BaseIsConsistent([NotNull] object o, [NotNull] Type t){
+      // System.Reflection does not seem to allow one to express a base call; this is a workaround.
+      return FrameIsExposable(o, t.BaseType);
+    }
+
+    [Pure]
+    public bool IsExposed{
+      get{
+        return this.Activity == ThreadActivity.Writing;
+      }
+    }
+
+    [Pure]
+    public static bool FrameIsExposed([NotNull] object o, [NotNull] Type t){
+      Guard guard = GetFrameGuard(o, t);
+      return guard == null ? true : guard.IsExposed;
+    }
+
+    [Pure]
+    public bool IsPrevalid{
+      get{
+        LocalData locals = Locals;
+        if (locals.Activity != ThreadActivity.Writing)
+          return false;
+        repFrames.Clear();
+        sharedFrames.Clear();
+        initFrameSets();
+        foreach (RepFrame repFrame in repFrames.Values)
+          if (!repFrame.frame.IsExposable)
+            return false;
+        return true;
+      }
+    }
+
+    [Pure]
+    public static bool FrameIsPrevalid([NotNull] object o, [NotNull] Type t){
+      Guard guard = GetFrameGuard(o, t);
+      return guard == null ? true : guard.IsPrevalid;
+    }
+
+    [Pure]
+    public bool IsValid{
+      get{
+        return this.IsPrevalid && this.checkInvariant(false);
+      }
+    }
+
+    [Pure]
+    public static bool FrameIsValid([NotNull] object o, [NotNull] Type t){
+      Guard guard = GetFrameGuard(o, t);
+      return guard == null ? true : guard.IsValid;
+    }
+
+    public static void ShareLockProtected([NotNull] object o){
+      Guard guard = GetObjectGuard(o);
+      if (guard != null)
+        guard.ShareLockProtected();
+    }
+
+    [Pure]
+    public static bool IsLockProtected(object o){
+      Guard g = GetObjectGuard(o);
+      return g != null ? g.SharingMode == SharingMode.LockProtected : true;
+    }
+
+    [Confined]
+    public static void ModifiesObject(object o){}
+    [Confined]
+    public static void ModifiesArray(object o) { }
+    [Pure]
+    public static void ModifiesPeers(object o) { }
+    [Pure]
+    public static void ModifiesNothing(object o) { }
+
+    /// <summary>
+    /// In a method's ensures clause, indicates that <paramref name="o"/> was not allocated in the pre-state.
+    /// Note: this is a temporary measure that will be replaced with a more modular construct in the future.
+    /// </summary>
+    [Confined]
+    public static bool IsNew(object o) { return true; }
+
+    /// <summary>
+    /// Used in the Boogie bytecode translator.
+    /// </summary>
+    public static void NoOp(){}
+  }
+}
+
+namespace Microsoft.Contracts{
+#if CCINamespace
+  using Microsoft.Cci;
+#endif
+  /// <summary>
+  /// Indicates that the field refers to a lock-protected object.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler to emit a call to the <see cref="Microsoft.Contracts.Guard.AddObjectLockProtectedCertificate"/>
+  /// method in its <see cref="Microsoft.Contracts.InitGuardSetsDelegate"/> implementation.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Field|AttributeTargets.Parameter)]
+  public class LockProtectedAttribute : Attribute {}
+  /// <summary>
+  /// Indicates that the method requires that the target is lock-protected.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler's ThreadStart conversion feature
+  /// to share the lock-protected target object
+  /// with the newly started thread.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Method)]
+  public class RequiresLockProtectedAttribute : Attribute {}
+  /// <summary>
+  /// Indicates that the field refers to an immutable object.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler to emit a call to the <see cref="Microsoft.Contracts.Guard.AddObjectImmutableCertificate"/>
+  /// method in its <see cref="Microsoft.Contracts.InitGuardSetsDelegate"/> implementation.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+  public sealed class ImmutableAttribute : Attribute { }
+  /// <summary>
+  /// Indicates that the method requires that the target is writeable.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler's ThreadStart conversion feature to transfer the target object
+  /// to the newly started thread.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Method)]
+  public class RequiresCanWriteAttribute : Attribute {}
+  /// <summary>
+  /// Indicates that the method requires that the target is immutable.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler's ThreadStart conversion feature to share the immutable target object
+  /// with the newly started thread.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Method)]
+  public class RequiresImmutableAttribute : Attribute {}
+  /// <summary>
+  /// Indicates that the method reads the target.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler to enclose the method's body in a <c>read (this)</c> statement.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Method)]
+  public class ReaderAttribute : Attribute {}
+  /// <summary>
+  /// Indicates that the method writes the target.
+  /// </summary>
+  /// <remarks>
+  /// This attribute causes the Spec# compiler to enclose the method's body in a <c>write (this)</c> statement.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Method)]
+  public class WriterAttribute : Attribute {}
+  [AttributeUsage(SpecTargets.Code,AllowMultiple=false, Inherited = true)]
+  public sealed class ConfinedAttribute: AttributeWithContext{
+  }
+  [Obsolete("Use Microsoft.Contracts.NoDefaultContract instead")]
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Class | AttributeTargets.Constructor, AllowMultiple = true, Inherited = false)]
+  public sealed class NoDefaultActivityAttribute: AttributeWithContext{
+  }
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Class | AttributeTargets.Constructor,AllowMultiple=true, Inherited = false)]
+  public sealed class NoDefaultContractAttribute: AttributeWithContext{
+  }
+  [Obsolete("Use Microsoft.Contracts.Rep or Microsoft.Contracts.Peer instead")]
+  [AttributeUsage(AttributeTargets.Field | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class OwnedAttribute: Attribute{
+    /// <summary>
+    /// True if the field is owned; false otherwise.
+    /// </summary>
+    public bool Value;
+    /// <summary>
+    /// True if the field is a peer field; false otherwise.
+    /// </summary>
+    public bool Peer;
+    public OwnedAttribute() { this.Value = true; this.Peer = false; }
+    public OwnedAttribute(bool value) { this.Value = value; this.Peer = false; }
+    public OwnedAttribute(string value) {
+      switch (value) {
+        case "peer":
+          this.Value = false;
+          this.Peer = true;
+          break;
+        case "this":
+          this.Value = true;
+          this.Peer = false;
+          break;
+        default:
+          System.Diagnostics.Debug.Assert(false);
+          break;
+      }
+    }
+  }
+  [AttributeUsage(AttributeTargets.Field | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class RepAttribute : Attribute {
+  }
+  [AttributeUsage(AttributeTargets.Field | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class PeerAttribute : Attribute {
+  }
+  /// <summary>
+  /// Fields of array-type or subtype of IEnumerable can be marked ElementsRep meaning that the elements of the 
+  /// array or collection are rep of the array or collection. 
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+  public sealed class ElementsRepAttribute : AttributeWithContext {
+  }
+  /// <summary>
+  /// Fields of array-type or subtype of IEnumerable can be marked ElementsPeer meaning that the elements of the 
+  /// array or collection are peer of the array or collection. 
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+  public sealed class ElementsPeerAttribute : AttributeWithContext {
+  }
+  /// <summary>
+  /// Methods of subtypes of IEnumerable can be marked Element meaning that the method returns an 
+  /// element of the collection. 
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class ElementAttribute : AttributeWithContext {
+  }
+  /// <summary>
+  /// Methods of subtypes of IEnumerable can be marked ElementCollection meaning that the method returns 
+  /// a set of elements of the collection. 
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class ElementCollectionAttribute : AttributeWithContext {
+  }
+  /// <summary>
+  /// Used to ensure acyclicity of method call chains in specifications of methods.
+  /// Indicates the maximum number of method calls before the call chain terminates.
+  /// E.g. zero if method's specification does not contain method calls.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class RecursionTerminationAttribute : AttributeWithContext {
+    public int level;
+    public RecursionTerminationAttribute() { this.level = 0; }
+    public RecursionTerminationAttribute(int level) { this.level = level; }
+  }
+  [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class NoReferenceComparisonAttribute : AttributeWithContext {
+  }
+  [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+  public sealed class ResultNotNewlyAllocatedAttribute : AttributeWithContext {
+  }
+  /// <summary>
+  /// Indicates that a parameter, or the receiver parameter if applied to a method or constructor, starts in an unowned state and may cause the owner to change.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple=false)]
+  public sealed class CapturedAttribute : Attribute{
+  }
+  [AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = false)]
+  public sealed class DependentAttribute : Attribute {
+    /// <summary>
+    /// The type that is allowed to have an invariant referring to the field
+    /// this attribute is attached to.
+    /// </summary>
+    public Type otherType;
+    public DependentAttribute(Type otherType) { this.otherType = otherType; }
+  }
+  public sealed class Owner{
+    /// <summary>
+    /// As seen by the static program verifier:  returns true iff c and d are owned by the same owner or
+    /// if they have no owner and belong to the same peer group.
+    /// </summary>
+    /// <param name="c"></param>
+    /// <param name="d"></param>
+    /// <returns></returns>
+    [Pure]
+    public static bool Same([NotNull] object c, [NotNull] object d) { return true; }
+    /// <summary>
+    /// As seen by the static program verifier:  returns true iff subject has no owner.
+    /// Dynamically, this method always returns true.
+    /// </summary>
+    /// <param name="c"></param>
+    /// <returns></returns>
+    [Pure]
+    public static bool None([NotNull] object c) { return true; }
+    /// <summary>
+    /// As seen by the static program verifier:  returns true iff subject is owned by (owner,frame).
+    /// Dynamically, this method always returns true.
+    /// </summary>
+    /// <param name="subject"></param>
+    /// <param name="owner"></param>
+    /// <param name="frame"></param>
+    /// <returns></returns>
+    [Pure]
+    public static bool Is([NotNull] object subject, [NotNull] object owner, [NotNull] Type frame) { return true; }
+    /// <summary>
+    /// As seen by the static program verifier:  returns true iff subject has no owner and is in
+    /// in peer group represented by itself.  That is, returns true iff the subject's owner is
+    /// the same as it is in the post-state of a non-capturing constructor.
+    /// Dynamically, this method always returns true.
+    /// </summary>
+    /// <param name="c"></param>
+    /// <returns></returns>
+    [Pure]
+    public static bool New([NotNull] object c) { return true; }
+    /// <summary>
+    /// As seen by the static program verifier:  Requires that subject initially has no owner, and sets the owner of
+    /// subject and any other objects in its peer group to (owner,frame).
+    /// That is:
+    ///   requires Owner.None(subject);
+    ///   ensures Owner.Is(subject, owner, frame);
+    /// Dynamically, this method is a no-op.
+    /// </summary>
+    /// <param name="subject"></param>
+    /// <param name="owner"></param>
+    /// <param name="frame"></param>
+    public static void Assign([NotNull] object subject, [NotNull] object owner, [NotNull] Type frame) { }
+    /// <summary>
+    /// As seen by the static program verifier:  Requires that "subject" initially has no owner, and sets the owner of
+    /// "subject" and any other objects in its peer group to the same owner or peer group as "peer"..
+    /// That is:
+    ///   requires Owner.None(subject);
+    ///   ensures Owner.Same(subject, peer);
+    /// Dynamically, this method is a no-op.
+    /// </summary>
+    /// <param name="subject"></param>
+    /// <param name="peer"></param>
+    public static void AssignSame([NotNull] object subject, [NotNull] object peer) { }
+  }
+  public class ObjectInvariantException : Microsoft.Contracts.GuardException{
+    public ObjectInvariantException() : base("Object invariant does not hold.") {}
+  }
+  ///<summary>
+  ///Instructs downstream tools to assume the correctness of this assembly, type or member without performing any verification.
+  /// Can use [SkipVerification(false)] to explicitly mark assembly, type or member as one to have verification performed on it.
+  /// Most specific element found (member, type, then assembly) takes precedence.
+  /// (That is useful if downstream tools allow a user to decide which polarity is the default, unmarked case.)
+  ///</summary>
+  ///<remarks>
+  ///Apply this attribute to a type to apply to all members of the type, including nested types.
+  ///Apply this attribute to an assembly to skip verification of all types and members of the assembly.
+  /// Default is true, so [SkipVerification] is the same as [SkipVerification(true)].
+  ///</remarks>
+  [Obsolete("Use Microsoft.Contracts.Verify instead")]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Constructor)]
+  public sealed class SkipVerificationAttribute : Attribute { 
+    public bool Value;
+    public SkipVerificationAttribute() { this.Value = true; }
+    public SkipVerificationAttribute(bool value) { this.Value = value; }
+  }
+  ///<summary>
+  ///Instructs downstream tools whether to assume the correctness of this assembly, type or member without performing any verification or not.
+  /// Can use [Verify(false)] to explicitly mark assembly, type or member as one to *not* have verification performed on it.
+  /// Most specific element found (member, type, then assembly) takes precedence.
+  /// (That is useful if downstream tools allow a user to decide which polarity is the default, unmarked case.)
+  ///</summary>
+  ///<remarks>
+  ///Apply this attribute to a type to apply to all members of the type, including nested types.
+  ///Apply this attribute to an assembly to apply to all types and members of the assembly.
+  /// Apply this attribute to a property to apply to both the getter and setter.
+  ///Default is true, so [Verify] is the same as [Verify(true)].
+  ///</remarks>
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Property)]
+  public sealed class VerifyAttribute : Attribute {
+    public bool Value;
+    public VerifyAttribute() { this.Value = true; }
+    public VerifyAttribute(bool value) { this.Value = value; }
+  }
+
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
+  public sealed class AdditiveAttribute : Attribute 
+  {
+    public bool Value;
+    public AdditiveAttribute() { this.Value = true; }
+    public AdditiveAttribute(bool value) { this.Value = value; }
+  }
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
+  public sealed class InsideAttribute : Attribute {
+    public bool Value;
+    public InsideAttribute() { this.Value = true; }
+    public InsideAttribute(bool value) { this.Value = value; }
+  }
+}
diff --git a/base/Kernel/System.Compiler.Runtime/System.Compiler.Runtime.App.csproj b/base/Kernel/System.Compiler.Runtime/System.Compiler.Runtime.App.csproj
new file mode 100644
index 0000000..3e57277
--- /dev/null
+++ b/base/Kernel/System.Compiler.Runtime/System.Compiler.Runtime.App.csproj
@@ -0,0 +1,38 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Kernel\System.Compiler.Runtime\System.Compiler.Runtime.App.csproj
+#
+#   Note:   This project builds the copy of System.Runtime.Compiler.dll
+#           that applications use (executables outside of the kernel).
+#
+#
+##############################################################################
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>System.Compiler.Runtime</AssemblyName>
+    <OutputType>Library</OutputType>
+    <Language>C#</Language>
+    <DefineConstants>ENDPOINT_STRUCT;SINGULARITY;SINGULARITY_PROCESS;PTR_SIZE_32;_NEW_CLASSLOADER;NODEFAULTLIB;NoData;NOOWNERSHIPCHECK</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs"/>
+    <Compile Include="Classes.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\AppRuntime.targets"/>
+
+</Project>
diff --git a/base/Kernel/System.Compiler.Runtime/System.Compiler.Runtime.Kernel.csproj b/base/Kernel/System.Compiler.Runtime/System.Compiler.Runtime.Kernel.csproj
new file mode 100644
index 0000000..769c233
--- /dev/null
+++ b/base/Kernel/System.Compiler.Runtime/System.Compiler.Runtime.Kernel.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>System.Compiler.Runtime</AssemblyName>
+    <Language>C#</Language>
+    <NoStdlib>true</NoStdlib>
+    <DefineConstants>NoData;NODEFAULTLIB;_NEW_CLASSLOADER</DefineConstants>
+    <NoStandardLibraries>true</NoStandardLibraries>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Classes.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Kernel.Corlib.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+
+</Project>
diff --git a/base/Kernel/System/ApplicationException.cs b/base/Kernel/System/ApplicationException.cs
new file mode 100644
index 0000000..3f01af0
--- /dev/null
+++ b/base/Kernel/System/ApplicationException.cs
@@ -0,0 +1,52 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ApplicationException
+**
+**
+** Purpose: The base class for all "less serious" exceptions that must be
+**          declared or caught.
+**
+** Date: March 11, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    // The ApplicationException is the base class for nonfatal,
+    // application errors that occur.  These exceptions are generated
+    // (i.e., thrown) by an application, not the Runtime. Applications that need
+    // to create their own exceptions do so by extending this class.
+    // ApplicationException extends but adds no new functionality to
+    // RecoverableException.
+    //
+    //| <include path='docs/doc[@for="ApplicationException"]/*' />
+    public class ApplicationException : Exception {
+
+        // Creates a new ApplicationException with its message string set to
+        // the empty string, its HRESULT set to COR_E_APPLICATION,
+        // and its ExceptionInfo reference set to null.
+        //| <include path='docs/doc[@for="ApplicationException.ApplicationException"]/*' />
+        public ApplicationException()
+            : base("Arg_ApplicationException") {
+        }
+
+        // Creates a new ApplicationException with its message string set to
+        // message, its HRESULT set to COR_E_APPLICATION,
+        // and its ExceptionInfo reference set to null.
+        //
+        //| <include path='docs/doc[@for="ApplicationException.ApplicationException1"]/*' />
+        public ApplicationException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="ApplicationException.ApplicationException2"]/*' />
+        public ApplicationException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/ArgIterator.cs b/base/Kernel/System/ArgIterator.cs
new file mode 100644
index 0000000..1d709bd
--- /dev/null
+++ b/base/Kernel/System/ArgIterator.cs
@@ -0,0 +1,98 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System
+{
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    using Microsoft.Bartok.Runtime;
+
+    [NoCCtor]
+    public unsafe struct ArgIterator
+    {
+        [AccessedByRuntime("Referenced from C++")]
+        private IntPtr * nextArg;
+        [AccessedByRuntime("Referenced from C++")]
+        private int remainingArgs;
+
+        [NoHeapAllocation]
+        public ArgIterator(RuntimeArgumentHandle arglist)
+        {
+            int * p = (int *) arglist.Pointer;
+            remainingArgs = *p;
+            nextArg = (IntPtr*)(p+1);
+        }
+
+        [NoHeapAllocation]
+        public int GetRemainingCount() {
+            return remainingArgs;
+        }
+
+        internal int Length {
+            [NoHeapAllocation]
+            get { return remainingArgs; }
+        }
+
+        [NoHeapAllocation]
+        internal RuntimeType GetArg(int arg, out IntPtr value)
+        {
+            if (arg < 0 || arg >= remainingArgs) {
+                value = IntPtr.Zero;
+                return null;
+            }
+
+            value = nextArg[arg * 2];
+            return Magic.toRuntimeType(Magic.fromAddress((UIntPtr)nextArg[arg * 2 + 1]));
+        }
+
+        [NoHeapAllocation]
+        internal RuntimeType PopNextArg(out IntPtr value)
+        {
+            if (remainingArgs == 0) {
+                value = IntPtr.Zero;
+                return null;
+            }
+            else {
+                RuntimeType type;
+
+                value = *nextArg++;
+                type = Magic.toRuntimeType(Magic.fromAddress((UIntPtr)(*nextArg++)));
+                remainingArgs--;
+
+                return type;
+            }
+        }
+
+        [CLSCompliant(false)]
+        public TypedReference GetNextArg()
+        {
+            if (remainingArgs == 0) {
+                throw new InvalidOperationException
+                    ("GetNextArg: No more arguments");
+            }
+
+            IntPtr value = *nextArg++;
+            RuntimeType type = Magic.toRuntimeType(
+                Magic.fromAddress((UIntPtr)(*nextArg++)));
+            remainingArgs--;
+
+            return new TypedReference(value, type);
+        }
+
+        [CLSCompliant(false)]
+        public RuntimeTypeHandle GetNextArgType()
+        {
+            if (remainingArgs == 0) {
+                throw new InvalidOperationException
+                    ("GetNextArgType: No more arguments");
+            }
+            return new RuntimeTypeHandle(Magic.toRuntimeType(
+                                             Magic.fromAddress(
+                                                 (UIntPtr)(nextArg[1]))));
+        }
+    }
+}
diff --git a/base/Kernel/System/ArgumentException.cs b/base/Kernel/System/ArgumentException.cs
new file mode 100644
index 0000000..22ae860
--- /dev/null
+++ b/base/Kernel/System/ArgumentException.cs
@@ -0,0 +1,91 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArgumentException
+**
+**
+** Purpose: Exception class for invalid arguments to a method.
+**
+** Date: March 24, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+
+    // The ArgumentException is thrown when an argument does not meet
+    // the contract of the method.  Ideally it should give a meaningful error
+    // message describing what was wrong and which parameter is incorrect.
+    //
+    //| <include path='docs/doc[@for="ArgumentException"]/*' />
+    public class ArgumentException : SystemException {
+        private String m_paramName;
+
+        // Creates a new ArgumentException with its message
+        // string set to the empty string.
+        //| <include path='docs/doc[@for="ArgumentException.ArgumentException"]/*' />
+        public ArgumentException()
+            : base("Arg_ArgumentException") {
+        }
+
+        // Creates a new ArgumentException with its message
+        // string set to message.
+        //
+        //| <include path='docs/doc[@for="ArgumentException.ArgumentException1"]/*' />
+        public ArgumentException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="ArgumentException.ArgumentException2"]/*' />
+        public ArgumentException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+
+        //| <include path='docs/doc[@for="ArgumentException.ArgumentException3"]/*' />
+        public ArgumentException(String message, String paramName, Exception innerException)
+            : base(message, innerException) {
+            m_paramName = paramName;
+        }
+
+        //| <include path='docs/doc[@for="ArgumentException.ArgumentException4"]/*' />
+        public ArgumentException(String message, String paramName)
+
+            : base (message) {
+            m_paramName = paramName;
+        }
+
+        //| <include path='docs/doc[@for="ArgumentException.Message"]/*' />
+        public override String Message
+        {
+            get {
+                String s = base.Message;
+                if (! ((m_paramName == null) ||
+                       (m_paramName.Length == 0)) )
+                    return s + Environment.NewLine + String.Format("{0}", m_paramName);
+                else
+                    return s;
+            }
+        }
+
+        /*
+        public String ToString()
+        {
+            String s = super.ToString();
+            if (m_paramName != null)
+                return s + "Parameter name: "+m_paramName+"\tActual value: "+(m_actualValue==null ? "<null>" : m_actualValue.ToString());
+            else
+                return s;
+        }
+        */
+
+        //| <include path='docs/doc[@for="ArgumentException.ParamName"]/*' />
+        public virtual String ParamName {
+            get { return m_paramName; }
+        }
+    }
+}
diff --git a/base/Kernel/System/ArgumentNullException.cs b/base/Kernel/System/ArgumentNullException.cs
new file mode 100644
index 0000000..dfdec41
--- /dev/null
+++ b/base/Kernel/System/ArgumentNullException.cs
@@ -0,0 +1,58 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArgumentNullException
+**
+**
+** Purpose: Exception class for null arguments to a method.
+**
+** Date: April 28, 1999
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+
+    // The ArgumentException is thrown when an argument
+    // is null when it shouldn't be.
+    //
+    //| <include path='docs/doc[@for="ArgumentNullException"]/*' />
+    public class ArgumentNullException : ArgumentException
+    {
+        private static String _nullMessage = null;
+
+        private static String NullMessage {
+            get {
+                // Don't bother with synchronization here.  A duplicated string
+                // is not a major problem.
+                if (_nullMessage == null)
+                    _nullMessage = "ArgumentNull_Generic";
+                return _nullMessage;
+            }
+        }
+
+        // Creates a new ArgumentNullException with its message
+        // string set to a default message explaining an argument was null.
+        //| <include path='docs/doc[@for="ArgumentNullException.ArgumentNullException"]/*' />
+        public ArgumentNullException()
+            : base(NullMessage) {
+            // Use E_POINTER - COM used that for null pointers.  Description is "invalid pointer"
+        }
+
+        //| <include path='docs/doc[@for="ArgumentNullException.ArgumentNullException1"]/*' />
+        public ArgumentNullException(String paramName)
+            : base(NullMessage, paramName) {
+        }
+
+        //| <include path='docs/doc[@for="ArgumentNullException.ArgumentNullException2"]/*' />
+        public ArgumentNullException(String paramName, String message)
+            : base(message, paramName) {
+
+        }
+    }
+}
diff --git a/base/Kernel/System/ArgumentOutOfRangeException.cs b/base/Kernel/System/ArgumentOutOfRangeException.cs
new file mode 100644
index 0000000..83c5857
--- /dev/null
+++ b/base/Kernel/System/ArgumentOutOfRangeException.cs
@@ -0,0 +1,91 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArgumentOutOfRangeException
+**
+**
+** Purpose: Exception class for method arguments outside of the legal range.
+**
+** Date: April 28, 1999
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    // The ArgumentOutOfRangeException is thrown when an argument
+    // is outside the legal range for that argument.  This may often be caused
+    // by
+    //
+    //| <include path='docs/doc[@for="ArgumentOutOfRangeException"]/*' />
+    [RequiredByBartok]
+    public class ArgumentOutOfRangeException : ArgumentException {
+
+        private static String _rangeMessage;
+        private Object m_actualValue;
+
+        private static String RangeMessage {
+            get {
+                if (_rangeMessage == null)
+                    _rangeMessage = "Arg_ArgumentOutOfRangeException";
+                return _rangeMessage;
+            }
+        }
+
+        // Creates a new ArgumentOutOfRangeException with its message
+        // string set to a default message explaining an argument was out of range.
+        //| <include path='docs/doc[@for="ArgumentOutOfRangeException.ArgumentOutOfRangeException"]/*' />
+        public ArgumentOutOfRangeException()
+            : base(RangeMessage) {
+        }
+
+        //| <include path='docs/doc[@for="ArgumentOutOfRangeException.ArgumentOutOfRangeException1"]/*' />
+        public ArgumentOutOfRangeException(String paramName)
+            : base(RangeMessage, paramName) {
+        }
+
+        //| <include path='docs/doc[@for="ArgumentOutOfRangeException.ArgumentOutOfRangeException2"]/*' />
+        public ArgumentOutOfRangeException(String paramName, String message)
+            : base(message, paramName) {
+        }
+
+        // We will not use this in the classlibs, but we'll provide it for
+        // anyone that's really interested so they don't have to stick a bunch
+        // of printf's in their code.
+        //| <include path='docs/doc[@for="ArgumentOutOfRangeException.ArgumentOutOfRangeException3"]/*' />
+        public ArgumentOutOfRangeException(String paramName, Object actualValue, String message)
+            : base(message, paramName) {
+            m_actualValue = actualValue;
+        }
+
+        //| <include path='docs/doc[@for="ArgumentOutOfRangeException.Message"]/*' />
+        public override String Message
+        {
+            get {
+                String s = base.Message;
+                if (m_actualValue != null) {
+                    String valueMessage = String.Format("ArgumentOutOfRange_ActualValue", m_actualValue.ToString());
+                    if (s == null)
+                        return valueMessage;
+                    return s + Environment.NewLine + valueMessage;
+                }
+                return s;
+            }
+        }
+
+        // Gets the value of the argument that caused the exception.
+        // Note - we don't set this anywhere in the class libraries in
+        // version 1, but it might come in handy for other developers who
+        // want to avoid sticking printf's in their code.
+        //| <include path='docs/doc[@for="ArgumentOutOfRangeException.ActualValue"]/*' />
+        public virtual Object ActualValue {
+            get { return m_actualValue; }
+        }
+    }
+}
diff --git a/base/Kernel/System/ArithmeticException.cs b/base/Kernel/System/ArithmeticException.cs
new file mode 100644
index 0000000..22b8d74
--- /dev/null
+++ b/base/Kernel/System/ArithmeticException.cs
@@ -0,0 +1,51 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArithmeticException
+**
+**
+** Purpose: Exception class for bad arithmetic conditions!
+**
+** Date: March 17, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    // The ArithmeticException is thrown when overflow or underflow
+    // occurs.
+    //
+    //| <include path='docs/doc[@for="ArithmeticException"]/*' />
+    [RequiredByBartok]
+    public class ArithmeticException : SystemException
+    {
+        // Creates a new ArithmeticException with its message string set to
+        // the empty string, its HRESULT set to COR_E_ARITHMETIC,
+        // and its ExceptionInfo reference set to null.
+        //| <include path='docs/doc[@for="ArithmeticException.ArithmeticException"]/*' />
+        public ArithmeticException()
+            : base("Arg_ArithmeticException") {
+        }
+
+        // Creates a new ArithmeticException with its message string set to
+        // message, its HRESULT set to COR_E_ARITHMETIC,
+        // and its ExceptionInfo reference set to null.
+        //
+        //| <include path='docs/doc[@for="ArithmeticException.ArithmeticException1"]/*' />
+        public ArithmeticException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="ArithmeticException.ArithmeticException2"]/*' />
+        public ArithmeticException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Array.cs b/base/Kernel/System/Array.cs
new file mode 100644
index 0000000..e18b498
--- /dev/null
+++ b/base/Kernel/System/Array.cs
@@ -0,0 +1,2703 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Array
+**
+** Purpose: Base class which can be used to access any array
+**
+===========================================================*/
+namespace System {
+
+    using Microsoft.Bartok.Runtime;
+    using System;
+    using System.Collections;
+    using System.GCs;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    // REVIEW: to be moved/integrated elsewhere
+    // REVIEW: see System.Variant::ClassTypes
+    internal class TypeInfo {
+        internal static VTable[] arrayOfBox = {
+            null, // not array
+            null, // reference
+            null, // untraced pointer
+            null, // struct
+            ((RuntimeType)typeof(Boolean)).classVtable,
+            ((RuntimeType)typeof(Char)).classVtable,
+            ((RuntimeType)typeof(SByte)).classVtable,
+            ((RuntimeType)typeof(Int16)).classVtable,
+            ((RuntimeType)typeof(Int32)).classVtable,
+            ((RuntimeType)typeof(Int64)).classVtable,
+            ((RuntimeType)typeof(Byte)).classVtable,
+            ((RuntimeType)typeof(UInt16)).classVtable,
+            ((RuntimeType)typeof(UInt32)).classVtable,
+            ((RuntimeType)typeof(UInt64)).classVtable,
+            ((RuntimeType)typeof(Single)).classVtable,
+            ((RuntimeType)typeof(Double)).classVtable,
+            ((RuntimeType)typeof(IntPtr)).classVtable,
+            ((RuntimeType)typeof(UIntPtr)).classVtable
+        };
+    }
+
+    //| <include path='docs/doc[@for="Array"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public abstract class Array : ICloneable, IList
+    {
+        // means 4 byte insertion if elements are 8-aligned
+
+        // Vector layout:
+        // length, [spacer], elem0, ...
+
+        // Rect layout:
+        // rank, total_length, base0, length0, ..., basen, lengthn, elem0, ...
+
+        // VTable vtable is inherited from Object
+
+        internal int field1;
+        private int field2;
+        private int field3;
+        private int field4;
+
+        /// <internalonly/>
+        private Array() {}
+
+        // Create instance will create an array
+        //| <include path='docs/doc[@for="Array.CreateInstance"]/*' />
+        public static Array CreateInstance(Type elementType, int length)
+        {
+            if (elementType == null)
+                throw new ArgumentNullException("elementType");
+            RuntimeType t = elementType.UnderlyingSystemType as RuntimeType;
+            if (t == null)
+                throw new ArgumentException("Arg_MustBeType","elementType");
+            if (length < 0)
+                throw new ArgumentOutOfRangeException("length", "ArgumentOutOfRange_NeedNonNegNum");
+            VTable v = t.classVtable.vectorClass;
+            if (v == null) {
+                throw new InvalidCastException("Arg_VectorClassNotFound");
+            }
+            return GC.AllocateVector(v, length);
+        }
+
+        private static void VectorCopy(Object srcObject, int srcOffset,
+                                       Object dstObject, int dstOffset,
+                                       int length) {
+            StructuralType srcArrayOf = srcObject.vtable.arrayOf;
+            StructuralType dstArrayOf = dstObject.vtable.arrayOf;
+            if ( (srcArrayOf == StructuralType.None)
+                 || (srcArrayOf != dstArrayOf) ) {
+                throw new ArrayTypeMismatchException();
+            }
+            if ( (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (length < 0) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            switch (srcArrayOf) {
+              case StructuralType.None:
+                throw new ArrayTypeMismatchException();
+
+              case StructuralType.Bool: {
+                  bool[] srcArray = (bool[])srcObject;
+                  bool[] dstArray = (bool[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Char: {
+                  char[] srcArray = (char[])srcObject;
+                  char[] dstArray = (char[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Int8: {
+                  sbyte[] srcArray = (sbyte[])srcObject;
+                  sbyte[] dstArray = (sbyte[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Int16:  {
+                  short[] srcArray = (short[])srcObject;
+                  short[] dstArray = (short[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Int32: {
+                  int[] srcArray = (int[])srcObject;
+                  int[] dstArray = (int[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Int64: {
+                  long[] srcArray = (long[])srcObject;
+                  long[] dstArray = (long[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.UInt8: {
+                  byte[] srcArray = (byte[])srcObject;
+                  byte[] dstArray = (byte[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.UInt16:  {
+                  ushort[] srcArray = (ushort[])srcObject;
+                  ushort[] dstArray = (ushort[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.UInt32: {
+                  uint[] srcArray = (uint[])srcObject;
+                  uint[] dstArray = (uint[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.UInt64: {
+                  ulong[] srcArray = (ulong[])srcObject;
+                  ulong[] dstArray = (ulong[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Float32: {
+                  float[] srcArray = (float[])srcObject;
+                  float[] dstArray = (float[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Float64: {
+                  double[] srcArray = (double[])srcObject;
+                  double[] dstArray = (double[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              case StructuralType.Reference: {
+                  Object[] srcArray = (Object[])srcObject;
+                  Object[] dstArray = (Object[])dstObject;
+                  Copy(srcArray,srcOffset,dstArray,dstOffset,length);
+                  return;
+              }
+              default:
+                VTable.DebugBreak();
+                return;
+            }
+        }
+
+#if DEBUG_ARRAY
+        private void debug(Object srcArray,int srcOffset,Object dstArray,int dstOffset,
+                           int length)
+        {
+#if TODO
+            DebugPrint("System.Copy(");
+            DebugPrint(srcArray.getClass().getName());
+            DebugPrint(",");
+            DebugPrint(srcOffset);
+            DebugPrint(",");
+            DebugPrint(dstArray.getClass().getName());
+            DebugPrint(",");
+            DebugPrint(dstOffset);
+            DebugPrint(",");
+            DebugPrint(length);
+            DebugPrintln(")");
+#endif
+        }
+#endif
+
+        public static void Copy(bool[] srcArray, int srcOffset, bool[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfBool);
+            }
+#endif
+
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyBoolDown(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyBoolDown(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyBoolUp(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyBoolUp(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(char[] srcArray, int srcOffset, char[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfChar);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyCharDown(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyCharDown(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyCharUp(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyCharUp(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        [CLSCompliant(false)] //
+        public static void Copy(sbyte[] srcArray, int srcOffset, sbyte[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfByte);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt8Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt8Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt8Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt8Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+        }
+
+        public static void Copy(short[] srcArray, int srcOffset, short[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfShort);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt16Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt16Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt16Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt16Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(int[] srcArray, int srcOffset, int[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfInt);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt32Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt32Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.CopyInt32Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt32Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(long[] srcArray, int srcOffset, long[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfLong);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt64Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt64Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyInt64Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyInt64Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(byte[] srcArray, int srcOffset, byte[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfByte);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt8Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt8Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt8Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt8Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+        }
+
+        [CLSCompliant(false)] //
+        public static void Copy(ushort[] srcArray, int srcOffset, ushort[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfShort);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt16Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt16Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt16Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt16Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        [CLSCompliant(false)] //
+        public static void Copy(uint[] srcArray, int srcOffset, uint[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfInt);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt32Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt32Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.CopyUInt32Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt32Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        [CLSCompliant(false)] //
+        public static void Copy(ulong[] srcArray, int srcOffset, ulong[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfLong);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt64Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt64Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyUInt64Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyUInt64Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(float[] srcArray, int srcOffset, float[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfFloat);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyFloat32Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyFloat32Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyFloat32Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyFloat32Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(double[] srcArray, int srcOffset, double[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfDouble);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyFloat64Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyFloat64Down(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            } else {
+                if ( (srcOffset+length <= srcLength)
+                     && (dstOffset+length <= dstLength) ) {
+                    ArrayHelper.UncheckedCopyFloat64Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                } else {
+                    ArrayHelper.CopyFloat64Up(srcArray, srcOffset, dstArray, dstOffset, length);
+                }
+            }
+            return;
+        }
+
+        public static void Copy(Object[] srcArray, int srcOffset, Object[] dstArray, int dstOffset, int length)
+        {
+#if DEBUG_ARRAY
+            debug(srcArray,srcOffset,dstArray,dstOffset,length);
+#endif
+            int srcLength = srcArray.Length;
+            int dstLength = dstArray.Length;
+#if TODO
+            if (VTable.enableLibraryOptions) {
+                Assert(VTable.enableLibraryOptions && EnableLibraryAsserts() &&
+                       srcArray.vtable.arrayOf == Array.OfReference);
+            }
+#endif
+            if ( (length < 0)
+                 || (srcOffset < 0)
+                 || (dstOffset < 0)
+                 || (srcOffset+length > srcLength)
+                 || (dstOffset+length > dstLength) ) {
+                VTable.throwNewArgumentOutOfRangeException();
+            }
+            if ( (srcArray == dstArray)
+                 && (srcOffset < dstOffset)
+                 && (dstOffset < srcOffset+length) ) {
+                int dx = dstOffset+length-1;
+                int sx = srcOffset+length-1;
+                for (int i=length-1; i>=0; i--) {
+                    dstArray[dx] = srcArray[sx];
+                    sx--;
+                    dx--;
+                }
+                //          for (int i=0; i<length; i++) {
+                //              dstArray[dstOffset+length-i-1] = srcArray[srcOffset+length-i-1];
+                //          }
+            } else {
+                int dx = dstOffset;
+                int sx = srcOffset;
+                for (int i=length-1; i>=0; i--) {
+                    dstArray[dx] = srcArray[sx];
+                    sx++;
+                    dx++;
+                }
+                //          for (int i=0; i<length; i++) {
+                //              dstArray[dstOffset+i] = srcArray[srcOffset+i];
+                //          }
+            }
+            return;
+        }
+
+        private enum AssignArray {
+            WrongType, WillWork, MustCast, BoxValueClassOrPrimitive,
+            UnboxValueClassOrPrimitive, PrimitiveWiden
+        }
+
+        private static AssignArray CanAssignArrayType(Array source, Array dest) {
+            VTable.Assert(source != null);
+            VTable.Assert(dest != null);
+
+            VTable sourceVTable = source.vtable;
+            VTable destVTable = dest.vtable;
+            RuntimeType srcType = sourceVTable.vtableType;
+            RuntimeType destType = destVTable.vtableType;
+            if (srcType == destType) {
+                return AssignArray.WillWork;
+            }
+            //
+            // Code review: do we need the following test on element types?
+            //
+            RuntimeType srcElemType = sourceVTable.arrayElementClass.vtableType;
+            RuntimeType destElemType = destVTable.arrayElementClass.vtableType;
+
+            // The next 50 lines are a little tricky.  Change them with great
+            // care.  Make sure you run the ArrayCopy BVT when changing this.
+
+            // (markples) TODO: get an ArrayCopy BVT
+            // (markples) possible BUGBUG: System.Enum[] and System.ValueType[]
+            //   are arrays of references to boxed elements -
+            //   need to be careful there
+
+            if(srcElemType == destElemType) {
+                return AssignArray.WillWork;
+            }
+            // Value class boxing
+            if (srcElemType.IsValueType && !destElemType.IsValueType) {
+                return AssignArray.BoxValueClassOrPrimitive;
+            }
+
+            // Value class unboxing.
+            if (!srcElemType.IsValueType && destElemType.IsValueType) {
+                return AssignArray.UnboxValueClassOrPrimitive;
+            }
+
+            // Copying primitives from one type to another
+            if (srcElemType.IsPrimitive && destElemType.IsPrimitive) {
+                VTable.NotImplemented("arraycopy primitives");
+            }
+
+            if(VTable.isValidAssignment(destElemType, srcElemType)) {
+                return AssignArray.WillWork;
+            }
+            if(VTable.isValidAssignment(srcElemType, destElemType)) {
+                return AssignArray.MustCast;
+            }
+            VTable.NotImplemented("arraycopy more cases to do");
+            return AssignArray.WrongType;
+        }
+
+        private unsafe static void CastCheckEachElement(Array sourceArray,
+                                                        int srcIndex,
+                                                        Array destArray,
+                                                        int destIndex,
+                                                        int len)
+        {
+            // pSrc is either a PTRARRAYREF or a multidimensional array.
+            VTable.Assert(sourceArray != null && srcIndex >= 0 &&
+                          destArray != null && destIndex >= 0 && len >= 0);
+            VTable destVT = destArray.vtable.arrayElementClass;
+            VTable.Assert(destVT != null);
+            // Cache last cast test to speed up cast checks.
+            VTable lastVT = null;
+
+            //const BOOL destIsArray = destTH.IsArray();
+            fixed (int *srcField = &sourceArray.field1) {
+                fixed (int *dstField = &destArray.field1) {
+                    UIntPtr* sourceArrayPtr =(UIntPtr*)
+                        sourceArray.GetFirstElementAddress(srcField);
+                    UIntPtr* destArrayPtr = (UIntPtr*)
+                        destArray.GetFirstElementAddress(dstField);
+                    Object obj;
+                    for(int i=srcIndex; i<srcIndex + len; ++i) {
+                        UIntPtr objAddress = sourceArrayPtr[i];
+                        obj = Magic.fromAddress(objAddress);
+                        // Now that we have grabbed obj, we are no longer
+                        // subject to races from another mutator thread.
+                        if (obj != null) {
+                            VTable objVT = obj.vtable;
+                            if (objVT != lastVT && objVT != destVT) {
+                                lastVT = objVT;
+                                // do cast check
+                                if(!VTable.isValidAssignment
+                                   (destVT.vtableType, objVT.vtableType)) {
+                                    throw new InvalidCastException("InvalidCast_DownCastArrayElement");
+                                }
+                            }
+                        }
+                        VTable.Assert(destArray.vtable.arrayOf !=
+                                      StructuralType.Struct);
+                        if (destArray.vtable.arrayOf == 
+                            StructuralType.Reference) {
+#if REFERENCE_COUNTING_GC
+                            GCs.ReferenceCountingCollector.
+                                IncrementRefCount(obj);
+                            UIntPtr dstAddr =
+                                destArrayPtr[i-srcIndex+destIndex];
+                            Object dst = Magic.fromAddress(dstAddr);
+                            GCs.ReferenceCountingCollector.
+                                DecrementRefCount(dst);
+                            destArrayPtr[i - srcIndex + destIndex] = objAddress;
+#elif DEFERRED_REFERENCE_COUNTING_GC
+                            GCs.DeferredReferenceCountingCollector.
+                                IncrementRefCount(obj);
+                            UIntPtr dstAddr =
+                                destArrayPtr[i-srcIndex+destIndex];
+                            Object dst = Magic.fromAddress(dstAddr);
+                            GCs.DeferredReferenceCountingCollector.
+                                DecrementRefCount(dst);
+                            destArrayPtr[i - srcIndex + destIndex] = objAddress;
+#else
+                            UIntPtr *elementPtr =
+                                destArrayPtr + i - srcIndex + destIndex;
+                            WriteBarrier.StoreIndirect(elementPtr, obj);
+#endif // REFERENCE_COUNTING_GC
+                        } else {
+                            destArrayPtr[i - srcIndex + destIndex] = objAddress;
+                        }
+                        // N.B. CLR uses layers of #defines/methods to do this
+                        // assignment, starting with SetObjectReference
+                    }
+                }
+            }
+        }
+
+        private static void BoxEachElement(Array sourceArray, int srcIndex,
+                                           Array destArray, int destIndex,
+                                           int len) {
+            // For now, use this silly implementation that leans on
+            // SetValue to do the right thing.
+            for (int i = 0; i < len; ++i)
+            { destArray.SetValue(sourceArray.GetValue(srcIndex + i), destIndex + i); }
+        }
+
+        private unsafe static void UnBoxEachElement(Array sourceArray,
+                                                    int srcIndex,
+                                                    Array destArray,
+                                                    int destIndex,
+                                                    int len,
+                                                    bool castEachElement)
+        {
+            VTable.Assert(sourceArray != null && srcIndex >= 0 &&
+                          destArray != null && destIndex >= 0 && len >= 0);
+            VTable destVT = destArray.vtable.arrayElementClass;
+            VTable.Assert(destVT != null);
+            int elementSize = destArray.vtable.arrayElementSize;
+            // Cache last cast test to speed up cast checks.
+            VTable lastVT = null;
+
+            //const BOOL destIsArray = destTH.IsArray();
+            fixed (int *srcField = &sourceArray.field1) {
+                fixed (int *dstField = &destArray.field1) {
+                    UIntPtr* sourceArrayPtr =(UIntPtr*)
+                        sourceArray.GetFirstElementAddress(srcField);
+                    byte* destArrayPtr = (byte*)
+                        destArray.GetFirstElementAddress(dstField);
+                    Object obj;
+                    for(int i=srcIndex; i<srcIndex + len; ++i) {
+                        UIntPtr objAddr = sourceArrayPtr[i];
+                        obj = Magic.fromAddress(objAddr);
+                        if (castEachElement) {
+                            //obj = Magic.fromAddress(objAddr);
+                            // Now that we have grabbed obj, we are no longer
+                            // subject to races from another mutator thread.
+                            if (obj != null) {
+                                VTable objVT = obj.vtable;
+                                if (objVT != lastVT && objVT != destVT) {
+                                    lastVT = objVT;
+                                    // do cast check
+                                    if(!VTable.isValidAssignment
+                                       (destVT.vtableType, objVT.vtableType)) {
+                                        throw new InvalidCastException
+                                            ("InvalidCast_DownCastArrayElement");
+                                    }
+                                }
+                            }
+                        }
+                        int postHeaderSize = PostHeader.Size;
+                        UIntPtr src = objAddr + postHeaderSize;
+                        int offset = (i-srcIndex + destIndex) * elementSize;
+                        UIntPtr dst = (UIntPtr) destArrayPtr + offset;
+                        VTable.Assert(destArray.vtable.arrayOf !=
+                                      StructuralType.Reference);
+                        if (destArray.vtable.arrayOf == 
+                            StructuralType.Struct) {
+                            UIntPtr dstAddr = dst - postHeaderSize;
+#if REFERENCE_COUNTING_GC
+                            GCs.ReferenceCountingCollector.
+                                IncrementReferentRefCounts(objAddr, obj.vtable);
+                            GCs.ReferenceCountingCollector.
+                                DecrementReferentRefCounts(dstAddr, destVT);
+                            Buffer.MoveMemory(dst, src, elementSize);
+#elif DEFERRED_REFERENCE_COUNTING_GC
+                            GCs.DeferredReferenceCountingCollector.
+                                IncrementReferentRefCounts(objAddr, obj.vtable);
+                            GCs.DeferredReferenceCountingCollector.
+                                DecrementReferentRefCounts(dstAddr, destVT);
+                            Buffer.MoveMemory(dst, src, elementSize);
+#else
+                            WriteBarrier.CopyStruct(destVT, src, dst);
+#endif // REFERENCE_COUNTING_GC
+                        } else {
+                            Buffer.MoveMemory((byte *) dst, (byte *) src,
+                                              (UIntPtr) elementSize);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void PrimitiveWiden(Array sourceArray, int srcIndex,
+                                           Array destArray, int destIndex,
+                                           int len) {
+            throw new Exception("System.Array.PrimitiveWiden not implemented in Bartok!");
+        }
+
+        // Copies length elements from sourceArray, starting at index 0, to
+        // destinationArray, starting at index 0.
+        //
+        //| <include path='docs/doc[@for="Array.Copy"]/*' />
+        public static void Copy(Array sourceArray, Array destinationArray, int length)
+        {
+            if (sourceArray == null)
+                throw new ArgumentNullException("sourceArray");
+            if (destinationArray == null)
+                throw new ArgumentNullException("destinationArray");
+            Copy(sourceArray, sourceArray.GetLowerBound(0), destinationArray, destinationArray.GetLowerBound(0), length);
+        }
+
+        // Copies length elements from sourceArray, starting at sourceIndex, to
+        // destinationArray, starting at destinationIndex.
+        //
+        //| <include path='docs/doc[@for="Array.Copy1"]/*' />
+
+
+        //| <include path='docs/doc[@for="Array.Copy2"]/*' />
+        public static void Copy(Array sourceArray, Array destinationArray, long length)
+        {
+            if (length > Int32.MaxValue || length < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("length", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            Array.Copy(sourceArray, destinationArray, (int) length);
+        }
+
+        //| <include path='docs/doc[@for="Array.Copy3"]/*' />
+        public unsafe static void Copy(Array sourceArray, int sourceIndex,
+                                       Array destinationArray,
+                                       int destinationIndex, int length) {
+            if (sourceArray == null) {
+                throw new ArgumentNullException("sourceArray");
+            }
+            if (destinationArray == null) {
+                throw new ArgumentNullException("destinationArray");
+            }
+            if (sourceArray.Rank != destinationArray.Rank) {
+                throw new RankException("Ranks must match");
+            }
+
+            bool castEachElement = false;
+            bool boxEachElement = false;
+            bool unboxEachElement = false;
+            bool primitiveWiden = false;
+
+            AssignArray r;
+
+            // Small perf optimization - we copy from one portion of an array
+            // back to itself a lot when resizing collections, etc.  The cost of
+            // doing the type checking is significant for copying small numbers
+            // of bytes (~half of the time for copying 1 byte within one array
+            // from element 0 to element 1).
+            if (sourceArray == destinationArray) {
+                r = AssignArray.WillWork;
+            } else {
+                r = CanAssignArrayType(sourceArray, destinationArray);
+            }
+
+            // Specialized vector copy
+
+            // Undo support adds logging to array copies which can trigger GCs
+            // at inopportune times so for now we use the specialized copy
+            // routine when possible for correctness.
+            // BUGBUG: arraycopy of struct + logging may lose GC information
+
+            if (r == AssignArray.WillWork
+                && sourceArray.IsVector
+                && (sourceArray.vtable.arrayOf != StructuralType.Struct)) {
+                VectorCopy(sourceArray,sourceIndex,destinationArray,
+                           destinationIndex,length);
+                return;
+            } else {
+                    switch(r) {
+                      case AssignArray.WrongType:
+                        throw new ArrayTypeMismatchException("ArrayTypeMismatch_CantAssignType");
+                      case AssignArray.MustCast:
+                        castEachElement = true;
+                        break;
+                      case AssignArray.WillWork:
+                        break;
+                      case AssignArray.BoxValueClassOrPrimitive:
+                        boxEachElement = true;
+                        break;
+                      case AssignArray.UnboxValueClassOrPrimitive:
+                        castEachElement = true;
+                        unboxEachElement = true;
+                        break;
+                      case AssignArray.PrimitiveWiden:
+                        primitiveWiden = true;
+                        break;
+                      default:
+                        VTable.NotReached("Fell through switch in Array.Copy!");
+                        break;
+                    }
+                }
+            if(length < 0) {
+                throw new ArgumentOutOfRangeException("length", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+
+            int sourceLower = sourceArray.GetLowerBound(0);
+            int destinationLower = destinationArray.GetLowerBound(0);
+            if (sourceIndex < sourceLower ||
+                sourceIndex + length > sourceLower + sourceArray.Length) {
+                throw new ArgumentException("Illegal range from sourceArray");
+            }
+            if (destinationIndex < destinationLower ||
+                destinationIndex + length > destinationLower + destinationArray.Length) {
+                throw new ArgumentException("Illegal range from destinationArray");
+            }
+
+            if(length > 0) {
+                VTable.Assert(!boxEachElement || !castEachElement);
+                if (unboxEachElement) {
+                    UnBoxEachElement(sourceArray, sourceIndex - sourceLower,
+                                     destinationArray,
+                                     destinationIndex - destinationLower,
+                                     length, castEachElement);
+                } else if (boxEachElement) {
+                    BoxEachElement(sourceArray, sourceIndex - sourceLower,
+                                   destinationArray,
+                                   destinationIndex - destinationLower, length);
+                } else if (castEachElement) {
+                    VTable.Assert(!unboxEachElement);   // handled above
+                    CastCheckEachElement(sourceArray, sourceIndex - sourceLower,
+                                         destinationArray,
+                                         destinationIndex - destinationLower,
+                                         length);
+                } else if (primitiveWiden) {
+                    PrimitiveWiden(sourceArray, sourceIndex - sourceLower,
+                                   destinationArray,
+                                   destinationIndex - destinationLower, length);
+                } else {
+#if !REFERENCE_COUNTING_GC && !DEFERRED_REFERENCE_COUNTING_GC
+                    WriteBarrier.ArrayCopy(sourceArray,
+                                           sourceIndex - sourceLower,
+                                           destinationArray,
+                                           destinationIndex - destinationLower,
+                                           length);
+#else
+                    fixed (int *sourceFieldPtr = &sourceArray.field1) {
+                        fixed (int *dstFieldPtr = &destinationArray.field1) {
+                            byte* src = (byte*) sourceArray.GetFirstElementAddress(sourceFieldPtr);
+                            byte* dst = (byte*) destinationArray.GetFirstElementAddress(dstFieldPtr);
+                            int size = sourceArray.vtable.arrayElementSize;
+                            Buffer.MoveMemory(dst + ((destinationIndex - destinationLower)*size),
+                                              src + ((sourceIndex - sourceLower)*size),
+                                              length*size);
+                        }
+                    }
+#endif
+                }
+            }
+        }
+
+        // Sets length elements in array to 0 (or null for Object arrays), starting
+        // at index.
+        //
+        //| <include path='docs/doc[@for="Array.Clear"]/*' />
+        public unsafe static void Clear(Array array, int index, int length) {
+            // cannot pass null for array
+            if (array == null) {
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            }
+
+            // array bounds checking
+            int lb = array.GetLowerBound(0);
+            // are the first two redundant or is there an overflow issue?
+            if(index < lb || (index - lb) < 0 || length < 0) {
+                throw new IndexOutOfRangeException();
+            }
+            if(index - lb > array.Length - length) {
+                throw new IndexOutOfRangeException();
+            }
+
+            if (length > 0) {
+                fixed (int *fieldPtr = &array.field1) {
+                    byte* arrayPtr = (byte*)
+                        array.GetFirstElementAddress(fieldPtr);
+                    int size = array.vtable.arrayElementSize;
+                    VTable.Assert(size >= 1);
+                    // REVIEW (markples): what about structs?
+                    VTable.Assert(size <= 8);
+                    Buffer.ZeroMemory(arrayPtr + (index-lb) * size,
+                                      length * size);
+                }
+            }
+        }
+
+        // The various Get values...
+        //| <include path='docs/doc[@for="Array.GetValue"]/*' />
+        public Object GetValue(params int[] indices)
+        {
+            if (indices == null)
+                throw new ArgumentNullException("indices");
+            if (Rank != indices.Length)
+                throw new ArgumentException("Arg_RankIndices");
+            return InternalGetValueEx(indices);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue1"]/*' />
+        public Object GetValue(int index)
+        {
+            if (Rank != 1)
+                throw new ArgumentException("Arg_Need1DArray");
+            return InternalGetValue(index,0,0);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue2"]/*' />
+        public Object GetValue(int index1, int index2)
+        {
+            if (Rank != 2)
+                throw new ArgumentException("Arg_Need2DArray");
+            return InternalGetValue(index1,index2,0);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue3"]/*' />
+        public Object GetValue(int index1, int index2, int index3)
+        {
+            if (Rank != 3)
+                throw new ArgumentException("Arg_Need3DArray");
+            return InternalGetValue(index1,index2,index3);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue4"]/*' />
+        public Object GetValue(long index)
+        {
+            if (index > Int32.MaxValue || index < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            return this.GetValue((int) index);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue5"]/*' />
+        public Object GetValue(long index1, long index2)
+        {
+            if (index1 > Int32.MaxValue || index1 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index1", "ArgumentOutOfRange_HugeArrayNotSupported");
+            if (index2 > Int32.MaxValue || index2 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index2", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            return this.GetValue((int) index1, (int) index2);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue6"]/*' />
+        public Object GetValue(long index1, long index2, long index3)
+        {
+            if (index1 > Int32.MaxValue || index1 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index1", "ArgumentOutOfRange_HugeArrayNotSupported");
+            if (index2 > Int32.MaxValue || index2 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index2", "ArgumentOutOfRange_HugeArrayNotSupported");
+            if (index3 > Int32.MaxValue || index3 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index3", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            return this.GetValue((int) index1, (int) index2, (int) index3);
+        }
+
+        //| <include path='docs/doc[@for="Array.GetValue7"]/*' />
+        public Object GetValue(params long[] indices)
+        {
+            int[] intIndices = new int[indices.Length];
+
+            for (int i = 0; i < indices.Length; ++i)
+            {
+                long index = indices[i];
+                if (index > Int32.MaxValue || index < Int32.MinValue)
+                    throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_HugeArrayNotSupported");
+                intIndices[i] = (int) index;
+            }
+
+            return this.GetValue(intIndices);
+        }
+
+
+        //| <include path='docs/doc[@for="Array.SetValue"]/*' />
+        public void SetValue(Object value,int index)
+        {
+            if (Rank != 1)
+                throw new ArgumentException("Arg_Need1DArray");
+            InternalSetValue(value,index,0,0);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue1"]/*' />
+        public void SetValue(Object value,int index1, int index2)
+        {
+            if (Rank != 2)
+                throw new ArgumentException("Arg_Need2DArray");
+            InternalSetValue(value,index1,index2,0);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue2"]/*' />
+        public void SetValue(Object value,int index1, int index2, int index3)
+        {
+            if (Rank != 3)
+                throw new ArgumentException("Arg_Need3DArray");
+            InternalSetValue(value,index1,index2,index3);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue3"]/*' />
+        public void SetValue(Object value,params int[] indices)
+        {
+            if (indices == null)
+                throw new ArgumentNullException("indices");
+            if (Rank != indices.Length)
+                throw new ArgumentException("Arg_RankIndices");
+            InternalSetValueEx(value,indices);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue4"]/*' />
+        public void SetValue(Object value, long index)
+        {
+            if (index > Int32.MaxValue || index < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            this.SetValue(value, (int) index);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue5"]/*' />
+        public void SetValue(Object value, long index1, long index2)
+        {
+            if (index1 > Int32.MaxValue || index1 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index1", "ArgumentOutOfRange_HugeArrayNotSupported");
+            if (index2 > Int32.MaxValue || index2 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index2", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            this.SetValue(value, (int) index1, (int) index2);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue6"]/*' />
+        public void SetValue(Object value, long index1, long index2, long index3)
+        {
+            if (index1 > Int32.MaxValue || index1 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index1", "ArgumentOutOfRange_HugeArrayNotSupported");
+            if (index2 > Int32.MaxValue || index2 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index2", "ArgumentOutOfRange_HugeArrayNotSupported");
+            if (index3 > Int32.MaxValue || index3 < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index3", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            this.SetValue(value, (int) index1, (int) index2, (int) index3);
+        }
+
+        //| <include path='docs/doc[@for="Array.SetValue7"]/*' />
+        public void SetValue(Object value, params long[] indices)
+        {
+            int[] intIndices = new int[indices.Length];
+
+            for (int i = 0; i < indices.Length; ++i)
+            {
+                long index = indices[i];
+                if (index > Int32.MaxValue || index < Int32.MinValue)
+                    throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_HugeArrayNotSupported");
+                intIndices[i] = (int) index;
+            }
+
+            this.SetValue(value, intIndices);
+        }
+
+        // These functions are provided to help device drivers.
+        //
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public unsafe UIntPtr AddressOfContent()
+        {
+            if (!IsVector) {
+                return UIntPtr.Zero;
+            }
+
+            // this operation is only legal on a pinned object!
+            UIntPtr addr = UIntPtr.Zero;
+            fixed (int *fieldPtr = &field1) {
+                addr = (UIntPtr)GetFirstElementAddress(fieldPtr);
+            }
+            return addr;
+        }
+
+        [CLSCompliant(false)]
+        public UIntPtr SizeOfContent()
+        {
+            if (!IsVector) {
+                return UIntPtr.Zero;
+            }
+            return (UIntPtr)(GetLengthVector() * vtable.arrayElementSize);
+        }
+
+        // This is the set of native routines that implement the real
+        //  Get/Set Value.  The arguments have been verified that they exist
+        //  before we get to this point.
+        //| <include path='docs/doc[@for="Array.GetLength"]/*' />
+        public int GetLength(int dimension) {
+            if(IsVector) {
+                return GetLengthVector();
+            } else {
+                return GetLengthRectangleArray(dimension);
+            }
+        }
+
+        //| <include path='docs/doc[@for="Array.Length"]/*' />
+        public int Length {
+            get {
+                if(IsVector) {
+                    return GetLengthVector();
+                } else {
+                    return GetLengthRectangleArray();
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="Array.LongLength"]/*' />
+        public long LongLength {
+            get { return Length; }
+        }
+
+        //| <include path='docs/doc[@for="Array.GetLongLength"]/*' />
+        public long GetLongLength(int dimension) {
+            return GetLength(dimension);
+        }
+
+        //| <include path='docs/doc[@for="Array.Rank"]/*' />
+        public int Rank {
+            get {
+                if(IsVector) {
+                    return 1;
+                } else {
+                    return RankRectangleArray;
+                }
+            }
+        }
+
+        // This is to be used only when allocating a vector!
+        [Inline]
+        internal void InitializeVectorLength(int numElements) {
+            this.field1 = numElements;
+        }
+
+        // This is to be used only when allocating an array!
+        [Inline]
+        internal void InitializeArrayLength(int rank, int totalElements) {
+            this.field1 = rank;
+            this.field2 = totalElements;
+        }
+
+        internal bool IsVector {
+            [NoHeapAllocation]
+            get {
+                // REVIEW: information can be closer
+                return this.vtable.vtableType.IsVector;
+            }
+        }
+        private bool IsRectangleArray {
+            [NoHeapAllocation]
+            get {
+                // REVIEW: information can be closer
+                return this.vtable.vtableType.IsRectangleArray;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Array.GetUpperBound"]/*' />
+        public int GetUpperBound(int dimension) {
+            if(dimension >= Rank) {
+                throw new IndexOutOfRangeException("GetUpperBound dimension");
+            }
+            return GetLowerBound(dimension) + GetLength(dimension) - 1;
+        }
+
+        //| <include path='docs/doc[@for="Array.GetLowerBound"]/*' />
+        public int GetLowerBound(int dimension) {
+            if(dimension >= Rank) {
+                throw new IndexOutOfRangeException("GetLowerBound dimension");
+            }
+            if(IsVector) { // zero-based
+                return 0;
+            }
+            // IsRectangleArray() == true
+            return GetLowerBoundRectangleArray(dimension);
+        }
+
+        // Number of elements in the Array.
+        //| <include path='docs/doc[@for="Array.ICollection.Count"]/*' />
+        int ICollection.Count
+        { get { return Length; } }
+
+
+        // Returns an object appropriate for synchronizing access to this
+        // Array.
+        //| <include path='docs/doc[@for="Array.SyncRoot"]/*' />
+        public virtual Object SyncRoot
+        { get { return this; } }
+
+        // Is this Array read-only?
+        //| <include path='docs/doc[@for="Array.IsReadOnly"]/*' />
+        public virtual bool IsReadOnly
+        { get { return false; } }
+
+        //| <include path='docs/doc[@for="Array.IsFixedSize"]/*' />
+        public virtual bool IsFixedSize {
+            get { return true; }
+        }
+
+        // Is this Array synchronized (i.e., thread-safe)?  If you want a synchronized
+        // collection, you can use SyncRoot as an object to synchronize your
+        // collection with.  You could also call GetSynchronized()
+        // to get a synchronized wrapper around the Array.
+        //| <include path='docs/doc[@for="Array.IsSynchronized"]/*' />
+        public virtual bool IsSynchronized
+        { get { return false; } }
+
+
+        //| <include path='docs/doc[@for="Array.IList.this"]/*' />
+        Object IList.this[int index] {
+            get { return GetValue(index); }
+            set { SetValue(value, index); }
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.Add"]/*' />
+        int IList.Add(Object value)
+        {
+            throw new NotSupportedException("NotSupported_FixedSizeCollection");
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.Contains"]/*' />
+        bool IList.Contains(Object value)
+        {
+            return Array.IndexOf(this, value) >= this.GetLowerBound(0);
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.Clear"]/*' />
+        void IList.Clear()
+        {
+            Array.Clear(this, 0, this.Length);
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.IndexOf"]/*' />
+        int IList.IndexOf(Object value)
+        {
+            return Array.IndexOf(this, value);
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.Insert"]/*' />
+        void IList.Insert(int index, Object value)
+        {
+            throw new NotSupportedException("NotSupported_FixedSizeCollection");
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.Remove"]/*' />
+        void IList.Remove(Object value)
+        {
+            throw new NotSupportedException("NotSupported_FixedSizeCollection");
+        }
+
+        //| <include path='docs/doc[@for="Array.IList.RemoveAt"]/*' />
+        void IList.RemoveAt(int index)
+        {
+            throw new NotSupportedException("NotSupported_FixedSizeCollection");
+        }
+
+        // Make a new array which is a deep copy of the original array.
+        //
+        //| <include path='docs/doc[@for="Array.Clone"]/*' />
+        public virtual Object Clone()
+        {
+            return MemberwiseClone();
+        }
+
+        // Searches an array for a given element using a binary search algorithm.
+        // Elements of the array are compared to the search value using the
+        // IComparable interface, which must be implemented by all elements
+        // of the array and the given search value. This method assumes that the
+        // array is already sorted according to the IComparable interface;
+        // if this is not the case, the result will be incorrect.
+        //
+        // The method returns the index of the given value in the array. If the
+        // array does not contain the given value, the method returns a negative
+        // integer. The bitwise complement operator (~) can be applied to a
+        // negative result to produce the index of the first element (if any) that
+        // is larger than the given search value.
+        //
+        //| <include path='docs/doc[@for="Array.BinarySearch"]/*' />
+        public static int BinarySearch(Array array, Object value) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            int lb = array.GetLowerBound(0);
+            return BinarySearch(array, lb, array.Length, value, null);
+        }
+
+        // Searches a section of an array for a given element using a binary search
+        // algorithm. Elements of the array are compared to the search value using
+        // the IComparable interface, which must be implemented by all
+        // elements of the array and the given search value. This method assumes
+        // that the array is already sorted according to the IComparable
+        // interface; if this is not the case, the result will be incorrect.
+        //
+        // The method returns the index of the given value in the array. If the
+        // array does not contain the given value, the method returns a negative
+        // integer. The bitwise complement operator (~) can be applied to a
+        // negative result to produce the index of the first element (if any) that
+        // is larger than the given search value.
+        //
+        //| <include path='docs/doc[@for="Array.BinarySearch1"]/*' />
+        public static int BinarySearch(Array array, int index, int length, Object value) {
+            return BinarySearch(array, index, length, value, null);
+        }
+
+        // Searches an array for a given element using a binary search algorithm.
+        // Elements of the array are compared to the search value using the given
+        // IComparer interface. If comparer is null, elements of the
+        // array are compared to the search value using the IComparable
+        // interface, which in that case must be implemented by all elements of the
+        // array and the given search value. This method assumes that the array is
+        // already sorted; if this is not the case, the result will be incorrect.
+        //
+        // The method returns the index of the given value in the array. If the
+        // array does not contain the given value, the method returns a negative
+        // integer. The bitwise complement operator (~) can be applied to a
+        // negative result to produce the index of the first element (if any) that
+        // is larger than the given search value.
+        //
+        //| <include path='docs/doc[@for="Array.BinarySearch2"]/*' />
+        public static int BinarySearch(Array array, Object value, IComparer comparer) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            int lb = array.GetLowerBound(0);
+            return BinarySearch(array, lb, array.Length, value, comparer);
+        }
+
+        // Searches a section of an array for a given element using a binary search
+        // algorithm. Elements of the array are compared to the search value using
+        // the given IComparer interface. If comparer is null,
+        // elements of the array are compared to the search value using the
+        // IComparable interface, which in that case must be implemented by
+        // all elements of the array and the given search value. This method
+        // assumes that the array is already sorted; if this is not the case, the
+        // result will be incorrect.
+        //
+        // The method returns the index of the given value in the array. If the
+        // array does not contain the given value, the method returns a negative
+        // integer. The bitwise complement operator (~) can be applied to a
+        // negative result to produce the index of the first element (if any) that
+        // is larger than the given search value.
+        //
+        //| <include path='docs/doc[@for="Array.BinarySearch3"]/*' />
+        public static int BinarySearch(Array array, int index, int length, Object value, IComparer comparer) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            int lb = array.GetLowerBound(0);
+            if (index < lb || length < 0)
+                throw new ArgumentOutOfRangeException((index<lb ? "index" : "length"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - index < length)
+                throw new ArgumentException("Argument_InvalidOffLen");
+            if (array.Rank != 1)
+                throw new RankException("Rank_MultiDimNotSupported");
+
+            if (comparer == null) comparer = Comparer.Default;
+            if (comparer == Comparer.Default) {
+                int retval;
+                int r = TrySZBinarySearch(array, index, length, value, out retval);
+                if (r != 0)
+                    return retval;
+            }
+
+            int lo = index;
+            int hi = index + length - 1;
+            Object[] objArray = array as Object[];
+            if(objArray != null) {
+                while (lo <= hi) {
+                    int i = (lo + hi) >> 1;
+                    int c;
+                    try {
+                        c = comparer.Compare(objArray[i], value);
+                    }
+                    catch (Exception e) {
+                        throw new InvalidOperationException("InvalidOperation_IComparerFailed", e);
+                    }
+                    if (c == 0) return i;
+                    if (c < 0) {
+                        lo = i + 1;
+                    }
+                    else {
+                        hi = i - 1;
+                    }
+                }
+            }
+            else {
+                while (lo <= hi) {
+                    int i = (lo + hi) >> 1;
+                    int c;
+                    try {
+                        c = comparer.Compare(array.GetValue(i), value);
+                    }
+                    catch (Exception e) {
+                        throw new InvalidOperationException("InvalidOperation_IComparerFailed", e);
+                    }
+                    if (c == 0) return i;
+                    if (c < 0) {
+                        lo = i + 1;
+                    }
+                    else {
+                        hi = i - 1;
+                    }
+                }
+            }
+            return ~lo;
+        }
+
+        private static int TrySZBinarySearch(Array sourceArray, int sourceIndex, int count, Object value, out int retVal) {
+            // BUGBUG: was fast native primitive type method
+            // returning false (0) means we couldn't handle it
+            retVal = -1;
+            return 0;
+        }
+
+        // CopyTo copies a collection into an Array, starting at a particular
+        // index into the array.
+        //
+        // This method is to support the ICollection interface, and calls
+        // Array.Copy internally.  If you aren't using ICollection explicitly,
+        // call Array.Copy to avoid an extra indirection.
+        //
+        //| <include path='docs/doc[@for="Array.CopyTo"]/*' />
+        public virtual void CopyTo(Array array, int index)
+        {
+            if (array != null && array.Rank != 1)
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            // Note: Array.Copy throws a RankException and we want a consistent ArgumentException for all the IList CopyTo methods.
+            Array.Copy(this, GetLowerBound(0), array, index, Length);
+        }
+
+        //| <include path='docs/doc[@for="Array.CopyTo1"]/*' />
+        public virtual void CopyTo(Array array, long index)
+        {
+            if (index > Int32.MaxValue || index < Int32.MinValue)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_HugeArrayNotSupported");
+
+            this.CopyTo(array, (int) index);
+        }
+
+
+        // GetEnumerator returns an IEnumerator over this Array.
+        //
+        // Currently, only one dimensional arrays are supported.
+        //
+        //| <include path='docs/doc[@for="Array.GetEnumerator"]/*' />
+        public virtual IEnumerator GetEnumerator()
+        {
+            int lowerBound = GetLowerBound(0);
+            if (Rank == 1 && lowerBound == 0)
+                return new SZArrayEnumerator(this);
+            else
+                return new ArrayEnumerator(this, lowerBound, Length);
+        }
+
+        // Returns the index of the first occurrence of a given value in an array.
+        // The array is searched forwards, and the elements of the array are
+        // compared to the given value using the Object.Equals method.
+        //
+        //| <include path='docs/doc[@for="Array.IndexOf"]/*' />
+        public static int IndexOf(Array array, Object value) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            int lb = array.GetLowerBound(0);
+            return IndexOf(array, value, lb, array.Length);
+        }
+
+        // Returns the index of the first occurrence of a given value in a range of
+        // an array. The array is searched forwards, starting at index
+        // startIndex and ending at the last element of the array. The
+        // elements of the array are compared to the given value using the
+        // Object.Equals method.
+        //
+        //| <include path='docs/doc[@for="Array.IndexOf1"]/*' />
+        public static int IndexOf(Array array, Object value, int startIndex) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            int lb = array.GetLowerBound(0);
+            return IndexOf(array, value, startIndex, array.Length - startIndex + lb);
+        }
+
+        // Returns the index of the first occurrence of a given value in a range of
+        // an array. The array is searched forwards, starting at index
+        // startIndex and up to count elements. The
+        // elements of the array are compared to the given value using the
+        // Object.Equals method.
+        //
+        //| <include path='docs/doc[@for="Array.IndexOf2"]/*' />
+        public static int IndexOf(Array array, Object value, int startIndex, int count) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            int lb = array.GetLowerBound(0);
+            if (startIndex < lb || startIndex > array.Length + lb)
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            if (count < 0 || count > array.Length - startIndex + lb)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+            if (array.Rank != 1)
+                throw new RankException("Rank_MultiDimNotSupported");
+
+            // Try calling a quick native method to handle primitive types.
+            int retVal;
+            int r = TrySZIndexOf(array, startIndex, count, value, out retVal);
+            if (r != 0)
+                return retVal;
+
+            Object[] objArray = array as Object[];
+            int endIndex = startIndex + count;
+            if (objArray != null) {
+                if (value == null) {
+                    for (int i = startIndex; i < endIndex; i++) {
+                        if (objArray[i] == null) return i;
+                    }
+                }
+                else {
+                    for (int i = startIndex; i < endIndex; i++) {
+                        Object obj = objArray[i];
+                        if (obj != null && value.Equals(obj)) return i;
+                    }
+                }
+            }
+            else {
+                // This is an array of value classes
+                Debug.Assert(array.GetType().GetElementType().IsValueType, "array.GetType().GetUnderlyingType().IsValueType");
+                if (value==null)
+                    return -1;
+                for (int i = startIndex; i < endIndex; i++) {
+                    Object obj = array.GetValue(i);
+                    if (obj != null && value.Equals(obj)) return i;
+                }
+            }
+            // Return one less than the lower bound of the array.  This way,
+            // for arrays with a lower bound of -1 we will not return -1 when the
+            // item was not found.  And for SZArrays (the vast majority), -1 still
+            // works for them.
+            return lb-1;
+        }
+
+        private static int TrySZIndexOf(Array sourceArray, int sourceIndex, int count, Object value, out int retVal) {
+            // BUGBUG: was fast native primitive type method
+            // returning false (0) means we couldn't handle it
+            retVal = -1;
+            return 0;
+        }
+
+        // Returns the index of the last occurrence of a given value in an array.
+        // The array is searched backwards, and the elements of the array are
+        // compared to the given value using the Object.Equals method.
+        //
+        //| <include path='docs/doc[@for="Array.LastIndexOf"]/*' />
+        public static int LastIndexOf(Array array, Object value) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            int lb = array.GetLowerBound(0);
+            return LastIndexOf(array, value, array.Length - 1 + lb, array.Length);
+        }
+
+        // Returns the index of the last occurrence of a given value in a range of
+        // an array. The array is searched backwards, starting at index
+        // startIndex and ending at index 0. The elements of the array are
+        // compared to the given value using the Object.Equals method.
+        //
+        //| <include path='docs/doc[@for="Array.LastIndexOf1"]/*' />
+        public static int LastIndexOf(Array array, Object value, int startIndex) {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            int lb = array.GetLowerBound(0);
+            return LastIndexOf(array, value, startIndex, startIndex + 1 - lb);
+        }
+
+        // Returns the index of the last occurrence of a given value in a range of
+        // an array. The array is searched backwards, starting at index
+        // startIndex and counting uptocount elements. The elements of
+        // the array are compared to the given value using the Object.Equals
+        // method.
+        //
+        //| <include path='docs/doc[@for="Array.LastIndexOf2"]/*' />
+        public static int LastIndexOf(Array array, Object value, int startIndex, int count) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            if (array.Length == 0) {
+                return -1;
+            }
+            int lb = array.GetLowerBound(0);
+            if (startIndex < lb || startIndex >= array.Length + lb)
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+            if (count > startIndex - lb + 1)
+                throw new ArgumentOutOfRangeException("endIndex", "ArgumentOutOfRange_EndIndexStartIndex");
+            if (array.Rank != 1)
+                throw new RankException("Rank_MultiDimNotSupported");
+
+            // Try calling a quick native method to handle primitive types.
+            int retVal;
+            int r = TrySZLastIndexOf(array, startIndex, count, value, out retVal);
+            if (r != 0)
+                return retVal;
+
+            Object[] objArray = array as Object[];
+            int endIndex = startIndex - count + 1;
+            if (objArray!=null) {
+                if (value == null) {
+                    for (int i = startIndex; i >= endIndex; i--) {
+                        if (objArray[i] == null) return i;
+                    }
+                }
+                else {
+                    for (int i = startIndex; i >= endIndex; i--) {
+                        Object obj = objArray[i];
+                        if (obj != null && value.Equals(obj)) return i;
+                    }
+                }
+            }
+            else {
+                // This is an array of value classes
+                Debug.Assert(array.GetType().GetElementType().IsValueType, "array.GetType().GetUnderlyingType().IsValueType");
+                if (value==null)
+                    return -1;
+                for (int i = startIndex; i >= endIndex; i--) {
+                    Object obj = array.GetValue(i);
+                    if (obj != null && value.Equals(obj)) return i;
+                }
+            }
+            return lb-1;  // Return lb-1 for arrays with negative lower bounds.
+        }
+
+        private static int TrySZLastIndexOf(Array sourceArray, int sourceIndex, int count, Object value, out int retVal) {
+            // BUGBUG: was fast native primitive type method
+            // returning false (0) means we couldn't handle it
+            retVal = -1;
+            return 0;
+        }
+
+        // Reverses all elements of the given array. Following a call to this
+        // method, an element previously located at index i will now be
+        // located at index length - i - 1, where length is the
+        // length of the array.
+        //
+        //| <include path='docs/doc[@for="Array.Reverse"]/*' />
+        public static void Reverse(Array array) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            Reverse(array, array.GetLowerBound(0), array.Length);
+        }
+
+        // Reverses the elements in a range of an array. Following a call to this
+        // method, an element in the range given by index and count
+        // which was previously located at index i will now be located at
+        // index index + (index + count - i - 1).
+        //
+        //| <include path='docs/doc[@for="Array.Reverse1"]/*' />
+        public static void Reverse(Array array, int index, int length) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            if (index < array.GetLowerBound(0) || length < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "length"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - (index - array.GetLowerBound(0)) < length)
+                throw new ArgumentException("Argument_InvalidOffLen");
+            if (array.Rank != 1)
+                throw new RankException("Rank_MultiDimNotSupported");
+
+            bool r = TrySZReverse(array, index, length);
+            if (r)
+                return;
+
+            int i = index;
+            int j = index + length - 1;
+            Object[] objArray = array as Object[];
+            if (objArray!=null) {
+                while (i < j) {
+                    Object temp = objArray[i];
+                    objArray[i] = objArray[j];
+                    objArray[j] = temp;
+                    i++;
+                    j--;
+                }
+            }
+            else {
+                while (i < j) {
+                    Object temp = array.GetValue(i);
+                    array.SetValue(array.GetValue(j), i);
+                    array.SetValue(temp, j);
+                    i++;
+                    j--;
+                }
+            }
+        }
+
+        private static bool TrySZReverse(Array array, int index, int count) {
+            // BUGBUG: was fast native primitive type method
+            // returning false means we couldn't handle it
+            return false;
+        }
+
+        // Sorts the elements of an array. The sort compares the elements to each
+        // other using the IComparable interface, which must be implemented
+        // by all elements of the array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort"]/*' />
+        public static void Sort(Array array) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            Sort(array, null, array.GetLowerBound(0), array.Length, null);
+        }
+
+        // Sorts the elements of two arrays based on the keys in the first array.
+        // Elements in the keys array specify the sort keys for
+        // corresponding elements in the items array. The sort compares the
+        // keys to each other using the IComparable interface, which must be
+        // implemented by all elements of the keys array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort1"]/*' />
+        public static void Sort(Array keys, Array items) {
+            if (keys==null)
+                throw new ArgumentNullException("keys");
+            Sort(keys, items, keys.GetLowerBound(0), keys.Length, null);
+        }
+
+        // Sorts the elements in a section of an array. The sort compares the
+        // elements to each other using the IComparable interface, which
+        // must be implemented by all elements in the given section of the array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort2"]/*' />
+        public static void Sort(Array array, int index, int length) {
+            Sort(array, null, index, length, null);
+        }
+
+        // Sorts the elements in a section of two arrays based on the keys in the
+        // first array. Elements in the keys array specify the sort keys for
+        // corresponding elements in the items array. The sort compares the
+        // keys to each other using the IComparable interface, which must be
+        // implemented by all elements of the keys array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort3"]/*' />
+        public static void Sort(Array keys, Array items, int index, int length) {
+            Sort(keys, items, index, length, null);
+        }
+
+        // Sorts the elements of an array. The sort compares the elements to each
+        // other using the given IComparer interface. If comparer is
+        // null, the elements are compared to each other using the
+        // IComparable interface, which in that case must be implemented by
+        // all elements of the array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort4"]/*' />
+        public static void Sort(Array array, IComparer comparer) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            Sort(array, null, array.GetLowerBound(0), array.Length, comparer);
+        }
+
+        // Sorts the elements of two arrays based on the keys in the first array.
+        // Elements in the keys array specify the sort keys for
+        // corresponding elements in the items array. The sort compares the
+        // keys to each other using the given IComparer interface. If
+        // comparer is null, the elements are compared to each other using
+        // the IComparable interface, which in that case must be implemented
+        // by all elements of the keys array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort5"]/*' />
+        public static void Sort(Array keys, Array items, IComparer comparer) {
+            if (keys==null)
+                throw new ArgumentNullException("keys");
+            Sort(keys, items, keys.GetLowerBound(0), keys.Length, comparer);
+        }
+
+        // Sorts the elements in a section of an array. The sort compares the
+        // elements to each other using the given IComparer interface. If
+        // comparer is null, the elements are compared to each other using
+        // the IComparable interface, which in that case must be implemented
+        // by all elements in the given section of the array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort6"]/*' />
+        public static void Sort(Array array, int index, int length, IComparer comparer) {
+            Sort(array, null, index, length, comparer);
+        }
+
+        // Sorts the elements in a section of two arrays based on the keys in the
+        // first array. Elements in the keys array specify the sort keys for
+        // corresponding elements in the items array. The sort compares the
+        // keys to each other using the given IComparer interface. If
+        // comparer is null, the elements are compared to each other using
+        // the IComparable interface, which in that case must be implemented
+        // by all elements of the given section of the keys array.
+        //
+        //| <include path='docs/doc[@for="Array.Sort7"]/*' />
+        public static void Sort(Array keys, Array items, int index, int length, IComparer comparer) {
+            if (keys==null)
+                throw new ArgumentNullException("keys");
+            if (keys.Rank != 1 || (items != null && items.Rank != 1))
+                throw new RankException("Rank_MultiDimNotSupported");
+            if (items != null && keys.GetLowerBound(0) != items.GetLowerBound(0))
+                throw new ArgumentException("Arg_LowerBoundsMustMatch");
+            if (index < keys.GetLowerBound(0) || length < 0)
+                throw new ArgumentOutOfRangeException((length<0 ? "length" : "index"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (keys.Length - (index+keys.GetLowerBound(0)) < length || (items != null && index > items.Length - length))
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+
+
+            if (length > 1) {
+                if (comparer == Comparer.Default || comparer == null) {
+                    int r = TrySZSort(keys, items, index, index + length - 1);
+                    if (r != 0)
+                        return;
+                }
+
+                Object[] objKeys = keys as Object[];
+                Object[] objItems = null;
+                if (objKeys != null)
+                    objItems = items as Object[];
+                if (objKeys != null && (items==null || objItems != null)) {
+                    SorterObjectArray sorter = new SorterObjectArray(objKeys, objItems, comparer);
+                    sorter.QuickSort(index, index + length - 1);
+                }
+                else {
+                    SorterGenericArray sorter = new SorterGenericArray(keys, items, comparer);
+                    sorter.QuickSort(index, index + length - 1);
+                }
+            }
+        }
+
+        private static int TrySZSort(Array keys, Array items, int left, int right) {
+            // BUGBUG: was fast native primitive type method
+            // returning false (0) means we couldn't handle it
+            return 0;
+        }
+
+        // Private class used by the Sort methods.
+        private class SorterObjectArray
+        {
+            private Object[] keys;
+            private Object[] items;
+            private IComparer comparer;
+
+
+            public SorterObjectArray(Object[] keys, Object[] items, IComparer comparer) {
+                if (comparer == null) comparer = Comparer.Default;
+                this.keys = keys;
+                this.items = items;
+                this.comparer = comparer;
+            }
+
+            public virtual void QuickSort(int left, int right) {
+                // Can use the much faster jit helpers for array access.
+                do {
+                    int i = left;
+                    int j = right;
+                    Object x = keys[(i + j) >> 1];
+                    do {
+                        // Add a try block here to detect IComparers (or their
+                        // underlying IComparables, etc) that are bogus.
+                        try {
+                            while (comparer.Compare(keys[i], x) < 0) i++;
+                            while (comparer.Compare(x, keys[j]) < 0) j--;
+                        }
+                        catch (IndexOutOfRangeException) {
+                            throw new ArgumentException(String.Format("Arg_BogusIComparer", x, x.GetType().Name, comparer));
+                        }
+                        catch (Exception e) {
+                            throw new InvalidOperationException("InvalidOperation_IComparerFailed", e);
+                        }
+                        Debug.Assert(i>=left && j<=right, "(i>=left && j<=right)  Sort failed - Is your IComparer bogus?");
+                        if (i > j) break;
+                        if (i < j) {
+                            Object key = keys[i];
+                            keys[i] = keys[j];
+                            keys[j] = key;
+                            if (items != null) {
+                                Object item = items[i];
+                                items[i] = items[j];
+                                items[j] = item;
+                            }
+                        }
+                        i++;
+                        j--;
+                    } while (i <= j);
+                    if (j - left <= right - i) {
+                        if (left < j) QuickSort(left, j);
+                        left = i;
+                    }
+                    else {
+                        if (i < right) QuickSort(i, right);
+                        right = j;
+                    }
+                } while (left < right);
+            }
+        }
+
+        // Private class used by the Sort methods for instances of System.Array.
+        // This is slower than the one for Object[], since we can't use the JIT helpers
+        // to access the elements.  We must use GetValue & SetValue.
+        private class SorterGenericArray
+        {
+            private Array keys;
+            private Array items;
+            private IComparer comparer;
+
+            public SorterGenericArray(Array keys, Array items, IComparer comparer) {
+                if (comparer == null) comparer = Comparer.Default;
+                this.keys = keys;
+                this.items = items;
+                this.comparer = comparer;
+            }
+
+            public virtual void QuickSort(int left, int right) {
+                // Must use slow Array accessors (GetValue & SetValue)
+                do {
+                    int i = left;
+                    int j = right;
+                    Object x = keys.GetValue((i + j) >> 1);
+                    do {
+                        // Add a try block here to detect IComparers (or their
+                        // underlying IComparables, etc) that are bogus.
+                        try {
+                            while (comparer.Compare(keys.GetValue(i), x) < 0) i++;
+                            while (comparer.Compare(x, keys.GetValue(j)) < 0) j--;
+                        }
+                        catch (IndexOutOfRangeException) {
+                            throw new ArgumentException(String.Format("Arg_BogusIComparer", x, x.GetType().Name, comparer));
+                        }
+                        catch (Exception e) {
+                            throw new InvalidOperationException("InvalidOperation_IComparerFailed", e);
+                        }
+                        Debug.Assert(i>=left && j<=right, "(i>=left && j<=right)  Sort failed - Is your IComparer bogus?");
+                        if (i > j) break;
+                        if (i < j) {
+                            Object key = keys.GetValue(i);
+                            keys.SetValue(keys.GetValue(j), i);
+                            keys.SetValue(key, j);
+                            if (items != null) {
+                                Object item = items.GetValue(i);
+                                items.SetValue(items.GetValue(j), i);
+                                items.SetValue(item, j);
+                            }
+                        }
+                        i++;
+                        j--;
+                    } while (i <= j);
+                    if (j - left <= right - i) {
+                        if (left < j) QuickSort(left, j);
+                        left = i;
+                    }
+                    else {
+                        if (i < right) QuickSort(i, right);
+                        right = j;
+                    }
+                } while (left < right);
+            }
+        }
+
+        private class SZArrayEnumerator : IEnumerator, ICloneable
+        {
+            private Array _array;
+            private int _index;
+            private int _endIndex; // cache array length, since it's a little slow.
+
+            internal SZArrayEnumerator(Array array) {
+                Debug.Assert(array.Rank == 1 && array.GetLowerBound(0) == 0, "SZArrayEnumerator only works on single dimension arrays w/ a lower bound of zero.");
+                _array = array;
+                _index = -1;
+                _endIndex = array.Length;
+            }
+
+            public virtual Object Clone()
+            {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                if (_index < _endIndex) {
+                    _index++;
+                    return (_index < _endIndex);
+                }
+                return false;
+            }
+
+            public virtual Object Current {
+                get {
+                    if (_index < 0) throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                    if (_index >= _endIndex) throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    return _array.GetValue(_index);
+                }
+            }
+
+            public virtual void Reset() {
+                _index = -1;
+            }
+        }
+
+        private class ArrayEnumerator : IEnumerator, ICloneable
+        {
+            private Array array;
+            private int index;
+            private int endIndex;
+            private int startIndex;    // Save for Reset.
+            private int[] _indices;    // The current position in a multidimensional array
+            private bool _complete;
+
+            internal ArrayEnumerator(Array array, int index, int count) {
+                this.array = array;
+                this.index = index - 1;
+                startIndex = index;
+                endIndex = index + count;
+                _indices = new int[array.Rank];
+                int checkForZero = 1;  // Check for dimensions of size 0.
+                for(int i=0; i<array.Rank; i++) {
+                    _indices[i] = array.GetLowerBound(i);
+                    checkForZero *= array.GetLength(i);
+                }
+                // To make MoveNext simpler, decrement least significant index.
+                _indices[_indices.Length-1]--;
+                _complete = (checkForZero == 0);
+            }
+
+            private void IncArray() {
+                // This method advances us to the next valid array index,
+                // handling all the multiple dimension & bounds correctly.
+                // Think of it like an odometer in your car - we start with
+                // the last digit, increment it, and check for rollover.  If
+                // it rolls over, we set all digits to the right and including
+                // the current to the appropriate lower bound.  Do these overflow
+                // checks for each dimension, and if the most significant digit
+                // has rolled over its upper bound, we're done.
+                //
+                // @TODO: Figure out if this slower and/or more complex than
+                // sticking a private method on Array to access it as a flat
+                // structure (ie, reference from 0 to length, ignoring bounds &
+                // dimensions).
+                int rank = array.Rank;
+                _indices[rank-1]++;
+                for(int dim=rank-1; dim>=0; dim--) {
+                    if (_indices[dim] > array.GetUpperBound(dim)) {
+                        if (dim==0) {
+                            _complete = true;
+                            break;
+                        }
+                        for(int j=dim; j<rank; j++)
+                            _indices[j] = array.GetLowerBound(j);
+                        _indices[dim-1]++;
+                    }
+                }
+            }
+
+            public virtual Object Clone()
+            {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                if (_complete) {
+                    index = endIndex;
+                    return false;
+                }
+                index++;
+                IncArray();
+                return !_complete;
+            }
+
+            public virtual Object Current {
+                get {
+                    if (index < startIndex) throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                    if (_complete) throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    return array.GetValue(_indices);
+                }
+            }
+
+            public virtual void Reset() {
+                index = startIndex - 1;
+                int checkForZero = 1;
+                for(int i=0; i<array.Rank; i++) {
+                    _indices[i] = array.GetLowerBound(i);
+                    checkForZero *= array.GetLength(i);
+                }
+                _complete = (checkForZero == 0);
+                // To make MoveNext simpler, decrement least significant index.
+                _indices[_indices.Length-1]--;
+            }
+        }
+
+
+        // if this is an array of value classes and that value class has a default constructor
+        // then this calls this default constructor on every element in the value class array.
+        // otherwise this is a no-op.  Generally this method is called automatically by the compiler
+        //| <include path='docs/doc[@for="Array.Initialize"]/*' />
+        public unsafe void Initialize()
+        {
+            // if it is an array of struct, we need to call the default
+            // constructor for the struct
+            if (this.vtable.arrayOf == StructuralType.Struct) {
+                RuntimeType runtimeType = this.vtable.arrayElementClass.vtableType;
+                UIntPtr fn = runtimeType.ctor;
+                if (fn == UIntPtr.Zero)
+                    return;
+
+                int total = 0;
+                for (int i=0; i<Rank; i++) {
+                    total += GetLength(i);
+                }
+                fixed(int *srcField = &this.field1) {
+                    UIntPtr elementAddress =
+                        new UIntPtr(this.GetFirstElementAddress(srcField));
+                    UIntPtr elementSize =
+                        new UIntPtr(this.vtable.arrayElementSize);
+                    for (int i=0; i<total; i++) {
+                        Magic.calli(runtimeType.ctor, elementAddress);
+                        elementAddress = elementAddress + elementSize;
+                    }
+                }
+            }
+        }
+
+        private int RankRectangleArray {
+            get {
+                return field1;
+            }
+        }
+        private int Length0RectangleArray {
+            get {
+                return field4;
+            }
+        }
+        // PRE: this fixed
+        // REVIEW: return type
+        internal unsafe void* GetFirstDimInfoRectangleArray() {
+            fixed(int* ptr = &field3) {
+                return (void*)ptr;
+            }
+        }
+
+        private unsafe int GetLowerBoundRectangleArray(int dimension) {
+            fixed(int* ptr = &field3) {
+                return ptr[2*dimension];
+            }
+        }
+
+        private int GetLengthVector() {
+            return field1;
+        }
+
+        private unsafe int GetLengthRectangleArray(int dimension) {
+            fixed(int* ptr = &field3) {
+                return ptr[2*dimension+1];
+            }
+        }
+
+        private unsafe int GetLengthRectangleArray() {
+            return field2;
+        }
+
+        // PRE: this fixed
+        // REVIEW: return type
+        [NoHeapAllocation]
+        internal unsafe void* GetFirstElementAddress(int *field1Addr) {
+            return (void*)(((byte*)field1Addr) + this.vtable.baseLength -
+                           (PreHeader.Size + PostHeader.Size));
+        }
+
+        // Calculates the offset from the first element of the array to the
+        // desired element.  This offset is a count -- that is, it does not take
+        // the size of the elements into account (e.g. int_array[2] would lead
+        // to 2, not 2*sizeof(int) = 8).
+        private unsafe int InternalGetOffset(int[] indices) {
+            if(IsVector) {
+                return indices[0];
+            } else {
+                int rank = RankRectangleArray;
+                int dwOffset = 0;
+                int dwMultiplier = 1;
+
+                fixed(int* ptr = &field3) {
+                    for(int i=rank-1; i>=0; i--) {
+                        int dwIndex = indices[i] - ptr[2*i];
+
+                        if(dwIndex >= ptr[2*i+1]) {
+                            throw new IndexOutOfRangeException();
+                        }
+
+                        dwOffset += dwIndex * dwMultiplier;
+                        dwMultiplier *= ptr[2*i+1];
+                    }
+                    return dwOffset;
+                }
+            }
+        }
+
+        // See comment by the other InternalGetOffset
+        private unsafe int InternalGetOffset(int index1, int index2,
+                                             int index3) {
+            if(IsVector) {
+                VTable.Assert(index2 == 0);
+                VTable.Assert(index3 == 0);
+                return index1;
+            } else {
+                int rank = RankRectangleArray;
+                int dwOffset = 0;
+                int dwMultiplier = 1;
+
+                VTable.Assert(rank <= 3);
+
+                fixed(int* ptr = &field3) {
+                    for(int i=rank-1; i>=0; i--) {
+                        int dwIndex;
+                        if(i==2) {
+                            dwIndex = index3 - ptr[2*i];
+                        } else if(i==1) {
+                            dwIndex = index2 - ptr[2*i];
+                        } else {
+                            dwIndex = index1 - ptr[2*i];
+                        }
+
+                        if(dwIndex >= ptr[2*i+1]) {
+                            throw new IndexOutOfRangeException();
+                        }
+                        dwOffset += dwIndex * dwMultiplier;
+                        dwMultiplier *= ptr[2*i+1];
+                    }
+                    return dwOffset;
+                }
+            }
+        }
+
+        // Given an array (this), a pointer to its first element (EA), and
+        // the offset (count of elements -- see InternalGetOffset comment for
+        // what this means), compute the desired element's address, get the
+        // value, box it if necessary, and return it
+        // PRE: 'this' fixed
+        private unsafe Object InternalGetValueHelper(byte *EA, int dwOffset) {
+            int arrayElementSize = this.vtable.arrayElementSize;
+            EA += dwOffset * arrayElementSize;
+
+            // now we have the address of the array element
+            // if it's already an object, return it
+            if(this.vtable.arrayOf == StructuralType.Reference) {
+                return Magic.fromAddress(*(UIntPtr*)EA);
+            }
+
+            // BUGBUG: we won't have the enum type anywhere!
+
+            Object result;
+            switch(this.vtable.arrayOf) {
+              case StructuralType.Struct:
+                // possible GC point -- but 'this' is fixed so EA won't get
+                // invalidated
+
+                Thread thread = Thread.CurrentThread;
+                result = GC.AllocateObject(vtable.arrayElementClass);
+
+                // HACK: depends on value being at same spot in all value types
+                // REVIEW: result is not fixed
+                UIntPtr dst = Magic.addressOf(result) + PostHeader.Size;
+                VTable arrayElementClass = this.vtable.arrayElementClass;
+#if REFERENCE_COUNTING_GC
+                UIntPtr objAddr = (UIntPtr)(EA-PostHeader.Size);
+                GCs.ReferenceCountingCollector.
+                    IncrementReferentRefCounts(objAddr, arrayElementClass);
+                System.IO.__UnmanagedMemoryStream.memcpyimpl(EA, (byte *) dst,
+                                                             arrayElementSize);
+#elif DEFERRED_REFERENCE_COUNTING_GC
+                UIntPtr objAddr =
+                    (UIntPtr)(EA-Object.VTABLE_OFFSET-UIntPtr.Size);
+                GCs.DeferredReferenceCountingCollector.
+                    IncrementReferentRefCounts(objAddr, arrayElementClass);
+                System.IO.__UnmanagedMemoryStream.memcpyimpl(EA, (byte *) dst,
+                                                             arrayElementSize);
+#else
+                WriteBarrier.CopyStruct(arrayElementClass, (UIntPtr) EA, dst);
+#endif // REFERENCE_COUNTING_GC
+                break;
+              case StructuralType.Bool:
+                result = *(bool*)EA;
+                break;
+              case StructuralType.Char:
+                result = *(char*)EA;
+                break;
+              case StructuralType.Int8:
+                result = *(sbyte*)EA;
+                break;
+              case StructuralType.Int16:
+                result = *(short*)EA;
+                break;
+              case StructuralType.Int32:
+                result = *(int*)EA;
+                break;
+              case StructuralType.Int64:
+                result = *(long*)EA;
+                break;
+              case StructuralType.UInt8:
+                result = *(byte*)EA;
+                break;
+              case StructuralType.UInt16:
+                result = *(ushort*)EA;
+                break;
+              case StructuralType.UInt32:
+                result = *(uint*)EA;
+                break;
+              case StructuralType.UInt64:
+                result = *(ulong*)EA;
+                break;
+              case StructuralType.Float32:
+                result = *(float*)EA;
+                break;
+              case StructuralType.Float64:
+                result = *(double*)EA;
+                break;
+              default:
+                VTable.Assert(false, "unreachable array get box");
+                return null;
+            }
+            return result;
+        }
+
+        // Given an array (this), a pointer to its first element (EA), and
+        // the offset (count of elements -- see m_InternalGetOffset comment for
+        // what this means), compute the desired element's address, typecheck
+        // the value against the actual array type, unbox it if necessary, and
+        // put it in the array
+        // PRE: 'this' fixed
+        // BUGBUG: need to support widening of primitives
+        private unsafe void InternalSetValueHelper(byte *EA, int dwOffset,
+                                                   Object value) {
+            int arrayElementSize = this.vtable.arrayElementSize;
+            EA += dwOffset * arrayElementSize;
+
+            // have address to store at, but need to typecheck
+            if(this.vtable.arrayOf == StructuralType.Reference) {
+                VTable.checkArrayStore(this, value);
+
+#if REFERENCE_COUNTING_GC
+                GCs.ReferenceCountingCollector.IncrementRefCount(value);
+                Object old = Magic.fromAddress(*(UIntPtr*)EA);
+                GCs.ReferenceCountingCollector.DecrementRefCount(old);
+                *(UIntPtr *)EA = Magic.addressOf(value);
+#elif DEFERRED_REFERENCE_COUNTING_GC
+                GCs.DeferredReferenceCountingCollector.IncrementRefCount(value);
+                Object old = Magic.fromAddress(*(UIntPtr*)EA);
+                GCs.DeferredReferenceCountingCollector.DecrementRefCount(old);
+                *(UIntPtr *)EA = Magic.addressOf(value);
+#else
+                WriteBarrier.StoreIndirect((UIntPtr *) EA, value);
+#endif // REFERENCE_COUNTING_GC
+                return;
+            }
+
+            // BUGBUG: enum type lost
+
+            VTable vtable;
+            if(this.vtable.arrayOf == StructuralType.Struct) {
+                vtable = this.vtable.arrayElementClass;
+            } else {
+                // assert primitive
+                vtable = TypeInfo.arrayOfBox[(int)this.vtable.arrayOf];
+            }
+
+            // BUGBUG: need to also widening of primitives
+            if(vtable != value.vtable) {
+                throw new InvalidCastException("InvalidCast_StoreArrayElement");
+            }
+
+            // HACK: depends on value being at same spot in all value types
+            // REVIEW: value is not fixed
+            UIntPtr src = Magic.addressOf(value) + PostHeader.Size;
+            if (this.vtable.arrayOf == StructuralType.Struct) {
+#if REFERENCE_COUNTING_GC
+                GCs.ReferenceCountingCollector.
+                    IncrementReferentRefCounts(Magic.addressOf(value), vtable);
+                UIntPtr objAddr =
+                    (UIntPtr)(EA-Object.VTABLE_OFFSET-UIntPtr.Size);
+                GCs.ReferenceCountingCollector.
+                    DecrementReferentRefCounts(objAddr, vtable);
+#elif DEFERRED_REFERENCE_COUNTING_GC
+                GCs.DeferredReferenceCountingCollector.
+                    IncrementReferentRefCounts(Magic.addressOf(value), vtable);
+                UIntPtr objAddr =
+                    (UIntPtr)(EA-Object.VTABLE_OFFSET-UIntPtr.Size);
+                GCs.DeferredReferenceCountingCollector.
+                    DecrementReferentRefCounts(objAddr, vtable);
+#else
+                WriteBarrier.CopyStruct(vtable, src, (UIntPtr) EA);
+                return;
+#endif // REFERENCE_COUNTING_GC
+            }
+
+            Buffer.MoveMemory((byte *) EA, (byte *) src,
+                              (UIntPtr) arrayElementSize);
+        }
+
+
+        // This is the core set routines for Get/Set Value.  The arguments have
+        // been verified that they exist before we get to this point.
+
+        // PRE: rank has been checked (e.g. if rank==1, then index2==index3==0)
+        private unsafe Object InternalGetValue(int index1, int index2, int index3) {
+            fixed(int *o = &this.field1) {
+                byte *EA = (byte*) GetFirstElementAddress(o);
+                int dwOffset = InternalGetOffset(index1, index2, index3);
+                return InternalGetValueHelper(EA, dwOffset);
+            }
+        }
+
+        // PRE: rank has been checked
+        private unsafe Object InternalGetValueEx(int[] indices) {
+            fixed(int *o = &this.field1) {
+                byte *EA = (byte*) GetFirstElementAddress(o);
+                int dwOffset = InternalGetOffset(indices);
+                return InternalGetValueHelper(EA, dwOffset);
+            }
+        }
+
+
+        // PRE: rank has been checked (e.g. if rank==1, then index2==index3==0)
+        // REVIEW: check ordering of errors (e.g. if you try to store the wrong
+        // types of object in an array at an illegal offset, what should happen?)
+        private unsafe void InternalSetValue(Object value, int index1,
+                                             int index2, int index3) {
+            fixed(int *o = &this.field1) {
+                byte *EA = (byte*) GetFirstElementAddress(o);
+                int dwOffset = InternalGetOffset(index1, index2, index3);
+                InternalSetValueHelper(EA, dwOffset, value);
+            }
+        }
+
+        private unsafe void InternalSetValueEx(Object value,int[] indices) {
+            fixed(int *o = &this.field1) {
+                byte *EA = (byte*) GetFirstElementAddress(o);
+                int dwOffset = InternalGetOffset(indices);
+                InternalSetValueHelper(EA, dwOffset, value);
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        extern private static void UnsafeUpdateArray(Array a,Object value,int index);
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        extern private static Object UnsafeReadArray(Array arr,int index);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern Array InternalQuickCreateEx(VTable array_type,int[] lengths,int[] lowerBounds);
+
+    }
+}
diff --git a/base/Kernel/System/ArrayTypeMismatchException.cs b/base/Kernel/System/ArrayTypeMismatchException.cs
new file mode 100644
index 0000000..211cf2d
--- /dev/null
+++ b/base/Kernel/System/ArrayTypeMismatchException.cs
@@ -0,0 +1,49 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ArrayTypeMismatchException
+**
+**
+** Purpose: The arrays are of different primitive types.
+**
+** Date: March 30, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+
+    // The ArrayMismatchException is thrown when an attempt to store
+    // an object of the wrong type within an array occurs.
+    //
+    //| <include path='docs/doc[@for="ArrayTypeMismatchException"]/*' />
+    public class ArrayTypeMismatchException : SystemException {
+
+        // Creates a new ArrayMismatchException with its message string set to
+        // the empty string, its HRESULT set to COR_E_ARRAYTYPEMISMATCH,
+        // and its ExceptionInfo reference set to null.
+        //| <include path='docs/doc[@for="ArrayTypeMismatchException.ArrayTypeMismatchException"]/*' />
+        public ArrayTypeMismatchException()
+            : base("Arg_ArrayTypeMismatchException") {
+        }
+
+        // Creates a new ArrayMismatchException with its message string set to
+        // message, its HRESULT set to COR_E_ARRAYTYPEMISMATCH,
+        // and its ExceptionInfo reference set to null.
+        //
+        //| <include path='docs/doc[@for="ArrayTypeMismatchException.ArrayTypeMismatchException1"]/*' />
+        public ArrayTypeMismatchException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="ArrayTypeMismatchException.ArrayTypeMismatchException2"]/*' />
+        public ArrayTypeMismatchException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/AsyncCallback.cs b/base/Kernel/System/AsyncCallback.cs
new file mode 100644
index 0000000..cf15830
--- /dev/null
+++ b/base/Kernel/System/AsyncCallback.cs
@@ -0,0 +1,17 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface: AsyncCallbackDelegate
+**
+** Purpose: Type of callback for async operations
+**
+===========================================================*/
+namespace System {
+    //| <include path='docs/doc[@for="AsyncCallback"]/*' />
+    public delegate void AsyncCallback(IAsyncResult ar);
+
+}
diff --git a/base/Kernel/System/Attribute.cs b/base/Kernel/System/Attribute.cs
new file mode 100644
index 0000000..7c6fdfb
--- /dev/null
+++ b/base/Kernel/System/Attribute.cs
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Attribute
+**
+**
+** Purpose: The class used as an attribute to denote that
+**          another class can be used as an attribute.
+**
+** Date:  December 7, 1999
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Reflection;
+    using System.Collections;
+
+    //
+    //  This class is a placeholder for the compiler only!
+    //  Singularity and Bartok don't support runtime access to custom attributes.
+
+    //| <include path='docs/doc[@for="Attribute"]/*' />
+    [AttributeUsageAttribute(AttributeTargets.All, Inherited = true, AllowMultiple=false)] // Base class for all attributes
+    public abstract class Attribute {
+        //| <include path='docs/doc[@for="Attribute.Attribute"]/*' />
+        protected Attribute(){}
+    }
+}
diff --git a/base/Kernel/System/AttributeTargets.cs b/base/Kernel/System/AttributeTargets.cs
new file mode 100644
index 0000000..77dc941
--- /dev/null
+++ b/base/Kernel/System/AttributeTargets.cs
@@ -0,0 +1,52 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+namespace System {
+
+    using System;
+
+    // Enum used to indicate all the elements of the
+    // VOS it is valid to attach this element to.
+    //| <include path='docs/doc[@for="AttributeTargets"]/*' />
+    [Flags]
+    public enum AttributeTargets
+    {
+        //| <include path='docs/doc[@for="AttributeTargets.Assembly"]/*' />
+        Assembly      = 0x0001,
+        //| <include path='docs/doc[@for="AttributeTargets.Module"]/*' />
+        Module        = 0x0002,
+        //| <include path='docs/doc[@for="AttributeTargets.Class"]/*' />
+        Class         = 0x0004,
+        //| <include path='docs/doc[@for="AttributeTargets.Struct"]/*' />
+        Struct        = 0x0008,
+        //| <include path='docs/doc[@for="AttributeTargets.Enum"]/*' />
+        Enum          = 0x0010,
+        //| <include path='docs/doc[@for="AttributeTargets.Constructor"]/*' />
+        Constructor   = 0x0020,
+        //| <include path='docs/doc[@for="AttributeTargets.Method"]/*' />
+        Method        = 0x0040,
+        //| <include path='docs/doc[@for="AttributeTargets.Property"]/*' />
+        Property      = 0x0080,
+        //| <include path='docs/doc[@for="AttributeTargets.Field"]/*' />
+        Field         = 0x0100,
+        //| <include path='docs/doc[@for="AttributeTargets.Event"]/*' />
+        Event         = 0x0200,
+        //| <include path='docs/doc[@for="AttributeTargets.Interface"]/*' />
+        Interface     = 0x0400,
+        //| <include path='docs/doc[@for="AttributeTargets.Parameter"]/*' />
+        Parameter     = 0x0800,
+        //| <include path='docs/doc[@for="AttributeTargets.Delegate"]/*' />
+        Delegate      = 0x1000,
+
+        //| <include path='docs/doc[@for="AttributeTargets.ReturnValue"]/*' />
+        ReturnValue   = 0x2000,
+
+        //| <include path='docs/doc[@for="AttributeTargets.All"]/*' />
+        All           = Assembly | Module   | Class | Struct | Enum      | Constructor |
+                        Method   | Property | Field | Event  | Interface | Parameter   | Delegate | ReturnValue,
+    }
+}
diff --git a/base/Kernel/System/AttributeUsageAttribute.cs b/base/Kernel/System/AttributeUsageAttribute.cs
new file mode 100644
index 0000000..fb83974
--- /dev/null
+++ b/base/Kernel/System/AttributeUsageAttribute.cs
@@ -0,0 +1,58 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  AttributeUsageAttribute
+**
+**
+** Purpose: The class denotes how to specify the usage of an attribute
+**
+** Date:  December 7, 1999
+**
+===========================================================*/
+namespace System {
+
+    using System.Reflection;
+    /* By default, attributes are inherited and multiple attributes are not allowed */
+    //| <include path='docs/doc[@for="AttributeUsageAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class, Inherited = true)]
+    public sealed class AttributeUsageAttribute : Attribute
+    {
+        internal AttributeTargets m_attributeTarget = AttributeTargets.All; // Defaults to all
+        internal bool m_allowMultiple = false; // Defaults to false
+        internal bool m_inherited = true; // Defaults to true
+
+        internal static AttributeUsageAttribute Default = new AttributeUsageAttribute(AttributeTargets.All);
+
+       //Constructors
+        //| <include path='docs/doc[@for="AttributeUsageAttribute.AttributeUsageAttribute"]/*' />
+        public AttributeUsageAttribute(AttributeTargets validOn) {
+            m_attributeTarget = validOn;
+        }
+
+
+       //Properties
+        //| <include path='docs/doc[@for="AttributeUsageAttribute.ValidOn"]/*' />
+        public AttributeTargets ValidOn
+        {
+           get{ return m_attributeTarget; }
+        }
+
+        //| <include path='docs/doc[@for="AttributeUsageAttribute.AllowMultiple"]/*' />
+        public bool AllowMultiple
+        {
+            get { return m_allowMultiple; }
+            set { m_allowMultiple = value; }
+        }
+
+        //| <include path='docs/doc[@for="AttributeUsageAttribute.Inherited"]/*' />
+        public bool Inherited
+        {
+            get { return m_inherited; }
+            set { m_inherited = value; }
+        }
+    }
+}
diff --git a/base/Kernel/System/Bartok/Headers.cs b/base/Kernel/System/Bartok/Headers.cs
new file mode 100644
index 0000000..b9da72c
--- /dev/null
+++ b/base/Kernel/System/Bartok/Headers.cs
@@ -0,0 +1,37 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Bartok.Runtime {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    internal struct PreHeader {
+
+        internal MultiUseWord muw;
+
+#if ATOMIC_RC_COLLECTOR
+        internal UIntPtr refCount;
+#endif
+
+#if CONCURRENT_MS_COLLECTOR
+        internal UIntPtr headerQueue;
+#endif
+
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PostHeader {
+
+#if (REFERENCE_COUNTING_GC || DEFERRED_REFERENCE_COUNTING_GC)
+        internal uint refState;
+#endif
+
+        [AccessedByRuntime("Accessed from halexn.cpp")]
+        internal VTable vtableObject;
+
+    }
+
+}
diff --git a/base/Kernel/System/BitConverter.cs b/base/Kernel/System/BitConverter.cs
new file mode 100644
index 0000000..281be8a
--- /dev/null
+++ b/base/Kernel/System/BitConverter.cs
@@ -0,0 +1,476 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  BitConverter
+**
+**
+** Purpose: Allows developers to view the base data types as
+**          an arbitrary array of bits.
+**
+** Date:  August 9, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    // The BitConverter class contains methods for
+    // converting an array of bytes to one of the base data
+    // types, as well as for converting a base data type to an
+    // array of bytes.
+    //
+    //| <include path='docs/doc[@for="BitConverter"]/*' />
+
+    [CCtorIsRunDuringStartup]
+    public sealed class BitConverter {
+
+        // This field indicates the "endianness" of the architecture.
+        // The value is set to true if the architecture is
+        // little endian; false if it is big endian.
+        //| <include path='docs/doc[@for="BitConverter.IsLittleEndian"]/*' />
+        public static readonly bool IsLittleEndian;
+
+        static BitConverter() {
+            byte [] ba = GetBytes((short)0xF);
+            if (ba[0]==0xF) {
+                IsLittleEndian=true;
+            } else {
+                IsLittleEndian=false;
+            }
+        }
+
+        // This class only contains static methods and may not be instantiated.
+        private BitConverter() {
+        }
+
+        // ======================================================================
+        // Convert from primitive types to byte array slices.  These functions
+        // do not perform memory allocation and so are suitable for use in
+        // interrupt handlers and other no-allocation-allowed contexts.
+        // ======================================================================
+
+        // Converts a byte into an existing array slice of bytes with length one.
+        public static void GetBytes(bool value, byte[] array, int startIndex) {
+            const int bytesNeeded = 1;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            array[startIndex] = (value ? (byte)Boolean.True : (byte)Boolean.False );
+        }
+
+        // Converts a char into an existing array slice of bytes with length two.
+        public static unsafe void GetBytes(char value, byte[] array, int startIndex) {
+            const int bytesNeeded = 2;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex]) {
+                *((char *) ptr) = value;
+            }
+        }
+
+        // Converts a short into an existing array slice of bytes with length two.
+        public static unsafe void GetBytes(short value, byte[] array, int startIndex) {
+            const int bytesNeeded = 2;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex]) {
+                *((short *) ptr) = value;
+            }
+        }
+
+        // Converts an int into an existing array slice of bytes with length four.
+        public static unsafe void GetBytes(int value, byte[] array, int startIndex) {
+            const int bytesNeeded = 4;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex]) {
+                *((int *) ptr) = value;
+            }
+        }
+
+        // Converts a long into an existing array slice of bytes with length eight.
+        public static unsafe void GetBytes(long value, byte[] array, int startIndex) {
+            const int bytesNeeded = 8;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex]) {
+                *((long *) ptr) = value;
+            }
+        }
+
+        // Converts an ushort into an existing array slice of bytes with length two.
+        [CLSCompliant(false)]
+        public static unsafe void GetBytes(ushort value, byte[] array, int startIndex) {
+            const int bytesNeeded = 2;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex])
+            {
+                *((ushort *) ptr) = value;
+            }
+        }
+
+        // Converts an uint into an existing array slice of bytes with length four.
+        [CLSCompliant(false)]
+        public static unsafe void GetBytes(uint value, byte[] array, int startIndex) {
+            const int bytesNeeded = 4;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex])
+            {
+                *((uint *) ptr) = value;
+            }
+        }
+
+        // Converts an unsigned long into an existing array slice of bytes with length eight.
+        [CLSCompliant(false)]
+        public static unsafe void GetBytes(ulong value, byte[] array, int startIndex) {
+            const int bytesNeeded = 8;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex])
+            {
+                *((ulong *) ptr) = value;
+            }
+        }
+
+        // Converts a float into an existing array slice of bytes with length four.
+        public unsafe static void GetBytes(float value, byte[] array, int startIndex)
+        {
+            const int bytesNeeded = 4;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex])
+                *((float*) ptr) = value;
+        }
+
+        // Converts a double into an existing array slice of bytes with length eight.
+        public unsafe static void GetBytes(double value, byte[] array, int startIndex)
+        {
+            const int bytesNeeded = 8;
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + bytesNeeded > array.Length) {
+                throw new ArgumentException("Array is too small");
+            }
+            fixed (byte *ptr = &array[startIndex])
+                *((double*) ptr) = value;
+        }
+
+        // ======================================================================
+        // Convert from primitive types to new byte arrays.  These functions
+        // perform memory allocation and so are unsuitable for use in
+        // interrupt handlers and other no-allocation-allowed contexts.
+        // ======================================================================
+
+        // Converts a byte into an array of bytes with length one.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes"]/*' />
+        public static byte[] GetBytes(bool value) {
+            byte[] result = new byte[1];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts a char into an array of bytes with length two.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes1"]/*' />
+        public static unsafe byte[] GetBytes(char value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::CharToBytes
+            byte[] result = new byte[2];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts a short into an array of bytes with length
+        // two.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes2"]/*' />
+        public static unsafe byte[] GetBytes(short value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::I2ToBytes
+            byte[] result = new byte[2];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts an int into an array of bytes with length
+        // four.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes3"]/*' />
+        public static unsafe byte[] GetBytes(int value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::I4ToBytes
+            byte[] result = new byte[4];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts a long into an array of bytes with length
+        // eight.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes4"]/*' />
+        public static unsafe byte[] GetBytes(long value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::I8ToBytes
+            byte[] result = new byte[8];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts an ushort into an array of bytes with
+        // length two.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes5"]/*' />
+        [CLSCompliant(false)]
+        public static unsafe byte[] GetBytes(ushort value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::U2ToBytes
+            byte[] result = new byte[2];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts an uint into an array of bytes with
+        // length four.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes6"]/*' />
+        [CLSCompliant(false)]
+        public static unsafe byte[] GetBytes(uint value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::U4ToBytes
+            byte[] result = new byte[4];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts an unsigned long into an array of bytes with
+        // length eight.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes7"]/*' />
+        [CLSCompliant(false)]
+        public static unsafe byte[] GetBytes(ulong value) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::U8ToBytes
+            byte[] result = new byte[8];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts a float into an array of bytes with length
+        // four.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes8"]/*' />
+        public unsafe static byte[] GetBytes(float value)
+        {
+            byte[] result = new byte[4];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // Converts a double into an array of bytes with length
+        // eight.
+        //| <include path='docs/doc[@for="BitConverter.GetBytes9"]/*' />
+        public unsafe static byte[] GetBytes(double value)
+        {
+            byte[] result = new byte[8];
+            GetBytes(value, result, 0);
+            return result;
+        }
+
+        // ============ Convert from byte array slices to primitive types ============
+
+        // Converts an array of bytes into a char.
+        //| <include path='docs/doc[@for="BitConverter.ToChar"]/*' />
+        public static unsafe char ToChar(byte[] value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToChar
+            char result;
+            fixed (byte *ptr = value) {
+                result = *((char *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into a short.
+        //| <include path='docs/doc[@for="BitConverter.ToInt16"]/*' />
+        public static unsafe short ToInt16(byte[] value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToI2
+            short result;
+            fixed (byte *ptr = value) {
+                result = *((short *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into an int.
+        //| <include path='docs/doc[@for="BitConverter.ToInt32"]/*' />
+        public static unsafe int ToInt32(byte[]value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToI4
+            int result;
+            fixed (byte *ptr = value) {
+                result = *((int *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into a long.
+        //| <include path='docs/doc[@for="BitConverter.ToInt64"]/*' />
+        public static unsafe long ToInt64(byte[] value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToI8
+            long result;
+            fixed (byte *ptr = value) {
+                result = *((long *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into an ushort.
+        //
+        //| <include path='docs/doc[@for="BitConverter.ToUInt16"]/*' />
+        [CLSCompliant(false)] //
+        public static unsafe ushort ToUInt16(byte[] value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToU2
+            ushort result;
+            fixed (byte *ptr = value) {
+                result = *((ushort *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into an uint.
+        //
+        //| <include path='docs/doc[@for="BitConverter.ToUInt32"]/*' />
+        [CLSCompliant(false)] //
+        public static unsafe uint ToUInt32(byte[] value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToU4
+            uint result;
+            fixed (byte *ptr = value) {
+                result = *((uint *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into an unsigned long.
+        //
+        //| <include path='docs/doc[@for="BitConverter.ToUInt64"]/*' />
+        [CLSCompliant(false)] //
+        public static unsafe ulong ToUInt64(byte[] value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToU8
+            ulong result;
+            fixed (byte *ptr = value) {
+                result = *((ulong *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into a float.
+        //| <include path='docs/doc[@for="BitConverter.ToSingle"]/*' />
+        public static unsafe float ToSingle(byte[]value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToR4
+            float result;
+            fixed (byte *ptr = value) {
+                result = *((float *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        // Converts an array of bytes into a double.
+        //| <include path='docs/doc[@for="BitConverter.ToDouble"]/*' />
+        public static unsafe double ToDouble(byte []value, int startIndex) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::BytesToR8
+            double result;
+            fixed (byte *ptr = value) {
+                result = *((double *) (ptr + startIndex));
+            }
+            return result;
+        }
+
+        /*==================================ToBoolean===================================
+        **Action:  Convert an array of bytes to a boolean value.  We treat this array
+        **         as if the first 4 bytes were an Int4 an operate on this value.
+        **Returns: True if the Int4 value of the first 4 bytes is non-zero.
+        **Arguments: value -- The byte array
+        **           startIndex -- The position within the array.
+        **Exceptions: See ToInt4.
+        ==============================================================================*/
+        // Converts an array of bytes into a boolean.
+        //| <include path='docs/doc[@for="BitConverter.ToBoolean"]/*' />
+        public static bool ToBoolean(byte[]value, int startIndex) {
+            if (value==null)
+                throw new ArgumentNullException("value");
+            if (startIndex < 0)
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_NeedNonNegNum");
+            if (startIndex > value.Length - 1)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+
+            return (value[startIndex]==0)?false:true;
+        }
+
+        //| <include path='docs/doc[@for="BitConverter.DoubleToInt64Bits"]/*' />
+        [Inline]
+        public static unsafe long DoubleToInt64Bits(double value) {
+            return *((long *)&value);
+        }
+
+        //| <include path='docs/doc[@for="BitConverter.Int64BitsToDouble"]/*' />
+        [Inline]
+        public static unsafe double Int64BitsToDouble(long value) {
+            return *((double *)&value);
+        }
+
+        //| <include path='docs/doc[@for="BitConverter.DoubleToUInt64Bits"]/*' />
+        [Inline]
+        [CLSCompliant(false)]
+        public static unsafe ulong DoubleToUInt64Bits(double value) {
+            return *((ulong *)&value);
+        }
+
+        //| <include path='docs/doc[@for="BitConverter.UInt64BitsToDouble"]/*' />
+        [Inline]
+        [CLSCompliant(false)]
+        public static unsafe double UInt64BitsToDouble(ulong value) {
+            return *((double *)&value);
+        }
+
+        //| <include path='docs/doc[@for="BitConverter.SingleToUInt32Bits"]/*' />
+        [Inline]
+        [CLSCompliant(false)]
+        public static unsafe uint SingleToUInt32Bits(float value) {
+            return *((uint *)&value);
+        }
+
+        //| <include path='docs/doc[@for="BitConverter.UInt32BitsToSingle"]/*' />
+        [Inline]
+        [CLSCompliant(false)]
+        public static unsafe float UInt32BitsToSingle(uint value) {
+            return *((float *)&value);
+        }
+    }
+}
diff --git a/base/Kernel/System/Boolean.cs b/base/Kernel/System/Boolean.cs
new file mode 100644
index 0000000..45ba356
--- /dev/null
+++ b/base/Kernel/System/Boolean.cs
@@ -0,0 +1,165 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Boolean
+**
+**
+** Purpose: The boolean class serves as a wrapper for the primitive
+** type boolean.
+**
+** Date:  August 8, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    // The Boolean class provides the
+    // object representation of the boolean primitive type.
+    //| <include path='docs/doc[@for="Boolean"]/*' />
+    public struct Boolean : IComparable {
+
+        //
+        // Member Variables
+        //
+        private bool m_value;
+
+
+        //
+        // Public Constants
+        //
+
+        // The true value.
+        //
+        internal const int True = 1;
+
+        // The false value.
+        //
+        internal const int False = 0;
+
+        // The string representation of true.
+        //
+        //| <include path='docs/doc[@for="Boolean.TrueString"]/*' />
+        public static readonly String TrueString  = "True";
+
+        // The string representation of false.
+        //
+        //| <include path='docs/doc[@for="Boolean.FalseString"]/*' />
+        public static readonly String FalseString = "False";
+
+        //
+        // Overridden Instance Methods
+        //
+        /*=================================GetHashCode==================================
+        **Args:  None
+        **Returns: 1 or 0 depending on whether this instance represents true or false.
+        **Exceptions: None
+        **Overridden From: Value
+        ==============================================================================*/
+        // Provides a hash code for this instance.
+        //| <include path='docs/doc[@for="Boolean.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (m_value)?True:False;
+        }
+
+        /*===================================ToString===================================
+        **Args: None
+        **Returns:  "True" or "False" depending on the state of the boolean.
+        **Exceptions: None.
+        ==============================================================================*/
+        // Converts the boolean value of this instance to a String.
+        //| <include path='docs/doc[@for="Boolean.ToString"]/*' />
+        public override String ToString() {
+            if (false == m_value) {
+                return FalseString;
+            }
+            return TrueString;
+        }
+
+        // Determines whether two Boolean objects are equal.
+        //| <include path='docs/doc[@for="Boolean.Equals"]/*' />
+        public override bool Equals (Object obj) {
+            //If it's not a boolean, we're definitely not equal
+            if (!(obj is Boolean)) {
+                return false;
+            }
+
+            return (m_value==((Boolean)obj).m_value);
+        }
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship. For booleans, false sorts before true.
+        // null is considered to be less than any instance.
+        // If object is not of type boolean, this method throws an ArgumentException.
+        //
+        // Returns a value less than zero if this  object
+        //
+        //| <include path='docs/doc[@for="Boolean.CompareTo"]/*' />
+        public int CompareTo(Object obj) {
+            if (obj==null) {
+                return 1;
+            }
+            if (!(obj is Boolean)) {
+                throw new ArgumentException ("Arg_MustBeBoolean");
+            }
+
+            if (m_value==((Boolean)obj).m_value) {
+                return 0;
+            } else if (m_value==false) {
+                return -1;
+            }
+            return 1;
+
+        }
+
+        //
+        // Static Methods
+        //
+
+        // Determines whether a String represents true or false.
+        //
+        //| <include path='docs/doc[@for="Boolean.Parse"]/*' />
+        public static bool Parse(String value) {
+            if (value==null) throw new ArgumentNullException("value");
+            // For perf reasons, let's first see if they're equal, then do the
+            // trim to get rid of white space, and check again.
+            if (0==String.Compare(value, TrueString,true))
+                return true;
+            if (0==String.Compare(value,FalseString,true))
+                return false;
+
+            value = value.Trim();  // Remove leading & trailing white space.
+            if (0==String.Compare(value, TrueString,true))
+                return true;
+            if (0==String.Compare(value,FalseString,true))
+                return false;
+            throw new FormatException("Format_BadBoolean");
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Boolean.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.Boolean;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = m_value;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/Buffer.cs b/base/Kernel/System/Buffer.cs
new file mode 100644
index 0000000..f311c25
--- /dev/null
+++ b/base/Kernel/System/Buffer.cs
@@ -0,0 +1,305 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//
+// Note: These routines assume that the processor supports
+// 32-bit aligned accesses.  Migration to non-x86 platforms will
+// need to examine and tune the implementations accordingly.
+//
+
+#define USE_EXTERNAL_MEMORY_OPERATIONS
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    //| <include path='docs/doc[@for="Buffer"]/*' />
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public sealed class Buffer
+    {
+        private Buffer() {
+        }
+
+        // This is a replacement for the memmove intrinsic.
+        // It performs better than the CRT one and the inline version
+        // originally from Lightning\Src\VM\COMSystem.cpp
+        [NoHeapAllocation]
+        public static unsafe void MoveMemory(byte* dmem, byte* smem, UIntPtr size)
+        {
+            MoveMemory(dmem, smem, (int)size);
+        }
+
+#if USE_EXTERNAL_MEMORY_OPERATIONS
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(64)]
+        [NoHeapAllocation]
+        public static unsafe extern void MoveMemory(byte* dmem, byte* smem, int size);
+#else // !USE_EXTERNAL_MEMORY_OPERATIONS
+        [NoHeapAllocation]
+        public static unsafe void MoveMemory(byte* dmem, byte* smem, int size)
+        {
+            if (dmem <= smem) {
+                // make sure the destination is dword aligned
+                while ((((int)dmem ) & 0x3) != 0 && size >= 3) {
+                    *dmem++ = *smem++;
+                    size -= 1;
+                }
+
+                // copy 16 bytes at a time
+                if (size >= 16) {
+                    size -= 16;
+                    do {
+                        ((int *)dmem)[0] = ((int *)smem)[0];
+                        ((int *)dmem)[1] = ((int *)smem)[1];
+                        ((int *)dmem)[2] = ((int *)smem)[2];
+                        ((int *)dmem)[3] = ((int *)smem)[3];
+                        dmem += 16;
+                        smem += 16;
+                    }
+                    while ((size -= 16) >= 0);
+                }
+
+                // still 8 bytes or more left to copy?
+                if ((size & 8) != 0) {
+                    ((int *)dmem)[0] = ((int *)smem)[0];
+                    ((int *)dmem)[1] = ((int *)smem)[1];
+                    dmem += 8;
+                    smem += 8;
+                }
+
+                // still 4 bytes or more left to copy?
+                if ((size & 4) != 0) {
+                    ((int *)dmem)[0] = ((int *)smem)[0];
+                    dmem += 4;
+                    smem += 4;
+                }
+
+                // still 2 bytes or more left to copy?
+                if ((size & 2) != 0) {
+                    ((short *)dmem)[0] = ((short *)smem)[0];
+                    dmem += 2;
+                    smem += 2;
+                }
+
+                // still 1 byte left to copy?
+                if ((size & 1) != 0) {
+                    dmem[0] = smem[0];
+                    dmem += 1;
+                    smem += 1;
+                }
+            } else {
+                smem += size;
+                dmem += size;
+
+                // make sure the destination is dword aligned
+                while ((((int)dmem) & 0x3) != 0 && size >= 3) {
+                    *--dmem = *--smem;
+                    size -= 1;
+                }
+
+                // copy 16 bytes at a time
+                if (size >= 16) {
+                    size -= 16;
+                    do {
+                        dmem -= 16;
+                        smem -= 16;
+                        ((int *)dmem)[3] = ((int *)smem)[3];
+                        ((int *)dmem)[2] = ((int *)smem)[2];
+                        ((int *)dmem)[1] = ((int *)smem)[1];
+                        ((int *)dmem)[0] = ((int *)smem)[0];
+                    }
+                    while ((size -= 16) >= 0);
+                }
+
+                // still 8 bytes or more left to copy?
+                if ((size & 8) != 0) {
+                    dmem -= 8;
+                    smem -= 8;
+                    ((int *)dmem)[1] = ((int *)smem)[1];
+                    ((int *)dmem)[0] = ((int *)smem)[0];
+                }
+
+                // still 4 bytes or more left to copy?
+                if ((size & 4) != 0) {
+                    dmem -= 4;
+                    smem -= 4;
+                    ((int *)dmem)[0] = ((int *)smem)[0];
+                }
+
+                // still 2 bytes or more left to copy?
+                if ((size & 2) != 0) {
+                    dmem -= 2;
+                    smem -= 2;
+                    ((short *)dmem)[0] = ((short *)smem)[0];
+                }
+
+                // still 1 byte left to copy?
+                if ((size & 1) != 0) {
+                    dmem -= 1;
+                    smem -= 1;
+                    dmem[0] = smem[0];
+                }
+            }
+        }
+#endif // !USE_EXTERNAL_MEMORY_OPERATIONS
+
+        // Copies from one primitive array to another primitive array without
+        // respecting types.  This calls memmove internally.
+        //| <include path='docs/doc[@for="Buffer.BlockCopy"]/*' />
+        public static void BlockCopy(Array src, int srcOffset,
+                                     Array dst, int dstOffset, int count) {
+            if (src == null) {
+                throw new ArgumentNullException("src");
+            }
+            if (dst == null) {
+                throw new ArgumentNullException("dst");
+            }
+            InternalBlockCopy(src, srcOffset, dst, dstOffset, count);
+        }
+
+        // A very simple and efficient array copy that assumes all of the
+        // parameter validation has already been done.  All counts here are
+        // in bytes.
+        internal static unsafe void InternalBlockCopy(Array src, int srcOffset,
+                                                      Array dst, int dstOffset,
+                                                      int count) {
+            VTable.Assert(src != null);
+            VTable.Assert(dst != null);
+
+            // Unfortunately, we must do a check to make sure we're writing
+            // within the bounds of the array.  This will ensure that we don't
+            // overwrite memory elsewhere in the system nor do we write out junk.
+            // This can happen if multiple threads screw with our IO classes
+            // simultaneously without being threadsafe.  Throw here.  -- Brian
+            // Grunkemeyer, 5/9/2001
+            int srcLen = src.Length * src.vtable.arrayElementSize;
+            if (srcOffset < 0 || dstOffset < 0 || count < 0 ||
+                srcOffset > srcLen - count)
+                throw new IndexOutOfRangeException
+                    ("IndexOutOfRange_IORaceCondition");
+            if (src == dst) {
+                if (dstOffset > srcLen - count)
+                    throw new IndexOutOfRangeException
+                        ("IndexOutOfRange_IORaceCondition");
+            } else {
+                int dstLen = dst.Length * dst.vtable.arrayElementSize;
+                if (dstOffset > dstLen - count)
+                    throw new IndexOutOfRangeException
+                        ("IndexOutOfRange_IORaceCondition");
+            }
+
+            // Copy the data.
+            // Call our faster version of memmove, not the CRT one.
+            fixed (int *srcFieldPtr = &src.field1) {
+                fixed (int *dstFieldPtr = &dst.field1) {
+                    byte *srcPtr = (byte *)
+                        src.GetFirstElementAddress(srcFieldPtr);
+                    byte *dstPtr = (byte *)
+                        dst.GetFirstElementAddress(dstFieldPtr);
+                    MoveMemory(dstPtr + dstOffset, srcPtr + srcOffset, count);
+                }
+            }
+        }
+
+        [NoHeapAllocation]
+        internal static unsafe void ZeroMemory(byte* dst, UIntPtr len)
+        {
+            ZeroMemory(dst, (int)len);
+        }
+
+#if USE_EXTERNAL_MEMORY_OPERATIONS
+        [AccessedByRuntime("output to header: defined in c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(64)]
+        [NoHeapAllocation]
+        public static unsafe extern void ZeroMemory(byte* dst, int len);
+#else // !USE_EXTERNAL_MEMORY_OPERATIONS
+        [NoHeapAllocation]
+        public static unsafe void ZeroMemory(byte* dst, int len)
+        {
+            // This is based on Peter Sollich's faster memcpy implementation,
+            // from COMString.cpp.
+            while ( (((int)dst) & 0x03) != 0 && len >= 3 ) {
+                *dst = 0;
+                len -= 1;
+            }
+
+            if (len >= 16) {
+                len -= 16;
+                do {
+                    ((int*)dst)[0] = 0;
+                    ((int*)dst)[1] = 0;
+                    ((int*)dst)[2] = 0;
+                    ((int*)dst)[3] = 0;
+                    dst += 16;
+                } while ((len -= 16) >= 0);
+            }
+            if ((len & 8) > 0) {
+                ((int*)dst)[0] = 0;
+                ((int*)dst)[1] = 0;
+                dst += 8;
+            }
+            if ((len & 4) > 0) {
+                ((int*)dst)[0] = 0;
+                dst += 4;
+            }
+            if ((len & 2) != 0) {
+                ((short*)dst)[0] = 0;
+                dst += 2;
+            }
+            if ((len & 1) != 0)
+                *dst++ = 0;
+        }
+#endif // !USE_EXTERNAL_MEMORY_OPERATIONS
+
+        [AccessedByRuntime("output to header: defined in asm")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern void ZeroPages(byte* dst, int len);
+
+        [AccessedByRuntime("output to header: defined in asm")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(32)]
+        [NoHeapAllocation]
+        internal static unsafe extern void CopyPages(byte* dst, byte *src, int len);
+
+        // Gets a particular byte out of the array.  The array must be an
+        // array of primitives.
+        //
+        // This essentially does the following:
+        // return ((byte*)array) + index.
+        //
+        //| <include path='docs/doc[@for="Buffer.GetByte"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static extern byte GetByte(Array array, int index);
+
+        // Sets a particular byte in an the array.  The array must be an
+        // array of primitives.
+        //
+        // This essentially does the following:
+        // *(((byte*)array) + index) = value.
+        //
+        //| <include path='docs/doc[@for="Buffer.SetByte"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static extern void SetByte(Array array, int index, byte value);
+
+        // Gets a particular byte out of the array.  The array must be an
+        // array of primitives.
+        //
+        // This essentially does the following:
+        // return array.length * sizeof(array.UnderlyingElementType).
+        //
+        //| <include path='docs/doc[@for="Buffer.ByteLength"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        public static extern int ByteLength(Array array);
+    }
+}
diff --git a/base/Kernel/System/Byte.cs b/base/Kernel/System/Byte.cs
new file mode 100644
index 0000000..249e9db
--- /dev/null
+++ b/base/Kernel/System/Byte.cs
@@ -0,0 +1,122 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Byte
+**
+**
+** Purpose: This class will encapsulate a byte and provide an
+**          Object representation of it.
+**
+** Date: August 3, 1998
+**
+===========================================================*/
+
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    // The Byte class extends the Value class and
+    // provides object representation of the byte primitive type.
+    //
+    //| <include path='docs/doc[@for="Byte"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Byte : IComparable, IFormattable
+    {
+        private byte m_value;
+
+        // The maximum value that a Byte may represent: 255.
+        //| <include path='docs/doc[@for="Byte.MaxValue"]/*' />
+        public const byte MaxValue = (byte)0xFF;
+
+        // The minimum value that a Byte may represent: 0.
+        //| <include path='docs/doc[@for="Byte.MinValue"]/*' />
+        public const byte MinValue = 0;
+
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type byte, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Byte.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (!(value is Byte)) {
+                throw new ArgumentException("Arg_MustBeByte");
+            }
+
+            return m_value - (((Byte)value).m_value);
+        }
+
+        // Determines whether two Byte objects are equal.
+        //| <include path='docs/doc[@for="Byte.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Byte)) {
+                return false;
+            }
+            return m_value == ((Byte)obj).m_value;
+        }
+
+        // Gets a hash code for this instance.
+        //| <include path='docs/doc[@for="Byte.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return m_value;
+        }
+
+        //| <include path='docs/doc[@for="Byte.Parse"]/*' />
+        public static byte Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        // Parses an unsigned byte from a String in the given style.  If
+        // a NumberFormatInfo isn't specified, the current culture's
+        // NumberFormatInfo is assumed.
+        //| <include path='docs/doc[@for="Byte.Parse3"]/*' />
+        public static byte Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            int i = Number.ParseInt32(s, style);
+            if (i < MinValue || i > MaxValue) throw new OverflowException("Overflow_Byte");
+            return (byte)i;
+        }
+
+        //| <include path='docs/doc[@for="Byte.ToString"]/*' />
+        public override String ToString() {
+            return Number.FormatInt32(m_value, null);
+        }
+
+        //| <include path='docs/doc[@for="Byte.ToString1"]/*' />
+        public String ToString(String format) {
+            return Number.FormatInt32(m_value, format);
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Byte.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.Byte;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = m_value;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/CLSCompliantAttribute.cs b/base/Kernel/System/CLSCompliantAttribute.cs
new file mode 100644
index 0000000..8f56160
--- /dev/null
+++ b/base/Kernel/System/CLSCompliantAttribute.cs
@@ -0,0 +1,38 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: CLSCompliantAttribute
+**
+**
+** Purpose: Container for assemblies.
+**
+** Date: Jan 28, 2000
+**
+=============================================================================*/
+
+namespace System {
+    //| <include path='docs/doc[@for="CLSCompliantAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.All, Inherited=true, AllowMultiple=false)]
+    public sealed class CLSCompliantAttribute : Attribute
+    {
+        private bool m_compliant;
+
+        //| <include path='docs/doc[@for="CLSCompliantAttribute.CLSCompliantAttribute"]/*' />
+        public CLSCompliantAttribute (bool isCompliant)
+        {
+            m_compliant = isCompliant;
+        }
+        //| <include path='docs/doc[@for="CLSCompliantAttribute.IsCompliant"]/*' />
+        public bool IsCompliant
+        {
+            get
+            {
+                return m_compliant;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Char.cs b/base/Kernel/System/Char.cs
new file mode 100644
index 0000000..9eed763
--- /dev/null
+++ b/base/Kernel/System/Char.cs
@@ -0,0 +1,414 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Char
+**
+**
+** Purpose: This is the value class representing a Unicode character
+** Char methods until we create this functionality.
+**
+** Date:  August 3, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="Char"]/*' />
+    [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
+    public struct Char : IComparable {
+        //
+        // Member Variables
+        //
+        internal char m_value;
+
+        //
+        // Public Constants
+        //
+        // The maximum character value.
+        //| <include path='docs/doc[@for="Char.MaxValue"]/*' />
+        public const char MaxValue =  (char) 0xFFFF;
+        // The minimum character value.
+        //| <include path='docs/doc[@for="Char.MinValue"]/*' />
+        public const char MinValue =  (char) 0x00;
+
+        //
+        // Private Constants
+        //
+
+        //
+        // Overridden Instance Methods
+        //
+
+        // Calculate a hashcode for a 2 byte Unicode character.
+        //| <include path='docs/doc[@for="Char.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (int)m_value | ((int)m_value << 16);
+        }
+
+        // Used for comparing two boxed Char objects.
+        //
+        //| <include path='docs/doc[@for="Char.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Char)) {
+                return false;
+            }
+            return (m_value==((Char)obj).m_value);
+        }
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type Char, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Char.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value==null) {
+                return 1;
+            }
+            if (!(value is Char)) {
+                throw new ArgumentException ("Arg_MustBeChar");
+            }
+
+            return (m_value-((Char)value).m_value);
+        }
+
+        // Overrides System.Object.ToString.
+        //| <include path='docs/doc[@for="Char.ToString"]/*' />
+        public override String ToString() {
+            return Char.ToString(m_value);
+        }
+
+        //
+        // Formatting Methods
+        //
+
+        /*===================================ToString===================================
+        **This static methods takes a character and returns the String representation of it.
+        ==============================================================================*/
+        // Provides a string representation of a character.
+        //| <include path='docs/doc[@for="Char.ToString1"]/*' />
+        public unsafe static String ToString(char c) {
+            char *charPtr = &c;
+            return String.StringCTOR(charPtr, 0, 1);
+        }
+
+        //| <include path='docs/doc[@for="Char.Parse"]/*' />
+        public static char Parse(String s) {
+            if (s==null) {
+                throw new ArgumentNullException("s");
+            }
+            if (s.Length!=1) {
+                throw new FormatException("Format_NeedSingleChar");
+            }
+            return s[0];
+        }
+
+        //
+        // Static Methods
+        //
+        /*=================================ISDIGIT======================================
+        **A wrapper for Char.  Returns a boolean indicating whether    **
+        **character c is considered to be a digit.                                    **
+        ==============================================================================*/
+        // Determines whether a character is a digit.
+        //| <include path='docs/doc[@for="Char.IsDigit"]/*' />
+        public static bool IsDigit(char c) {
+            return CharacterInfo.IsDigit(c);
+        }
+
+        /*=================================ISLETTER=====================================
+        **A wrapper for Char.  Returns a boolean indicating whether    **
+        **character c is considered to be a letter.                                   **
+        ==============================================================================*/
+        // Determines whether a character is a letter.
+        //| <include path='docs/doc[@for="Char.IsLetter"]/*' />
+        public static bool IsLetter(char c) {
+            return CharacterInfo.IsLetter(c);
+        }
+
+        /*===============================ISWHITESPACE===================================
+        **A wrapper for Char.  Returns a boolean indicating whether    **
+        **character c is considered to be a whitespace character.                     **
+        ==============================================================================*/
+        // Determines whether a character is whitespace.
+        //| <include path='docs/doc[@for="Char.IsWhiteSpace"]/*' />
+        public static bool IsWhiteSpace(char c) {
+            return CharacterInfo.IsWhiteSpace(c);
+        }
+
+
+        /*===================================IsUpper====================================
+        **Arguments: c -- the character to be checked.
+        **Returns:  True if c is an uppercase character.
+        ==============================================================================*/
+        // Determines whether a character is upper-case.
+        //| <include path='docs/doc[@for="Char.IsUpper"]/*' />
+        public static bool IsUpper(char c) {
+            return CharacterInfo.IsUpper(c);
+        }
+
+        /*===================================IsLower====================================
+        **Arguments: c -- the character to be checked.
+        **Returns:  True if c is an lowercase character.
+        ==============================================================================*/
+        // Determines whether a character is lower-case.
+        //| <include path='docs/doc[@for="Char.IsLower"]/*' />
+        public static bool IsLower(char c) {
+            return CharacterInfo.IsLower(c);
+        }
+
+        /*================================IsPunctuation=================================
+        **Arguments: c -- the character to be checked.
+        **Returns:  True if c is an punctuation mark
+        ==============================================================================*/
+        // Determines whether a character is a punctuation mark.
+        //| <include path='docs/doc[@for="Char.IsPunctuation"]/*' />
+        public static bool IsPunctuation(char c){
+            return CharacterInfo.IsPunctuation(c);
+        }
+
+        // Determines whether a character is a letter or a digit.
+        //| <include path='docs/doc[@for="Char.IsLetterOrDigit"]/*' />
+        public static bool IsLetterOrDigit(char c) {
+            UnicodeCategory uc = CharacterInfo.GetUnicodeCategory(c);
+            return (uc == UnicodeCategory.UppercaseLetter
+                    || uc == UnicodeCategory.LowercaseLetter
+                    || uc == UnicodeCategory.TitlecaseLetter
+                    || uc == UnicodeCategory.ModifierLetter
+                    || uc == UnicodeCategory.OtherLetter
+                    || uc == UnicodeCategory.DecimalDigitNumber);
+        }
+
+        /*=================================TOUPPER======================================
+        **A wrapper for Char.toUpperCase.  Converts character c to its **
+        **uppercase equivalent.  If c is already an uppercase character or is not an  **
+        **alphabetic, nothing happens.                                                **
+        ==============================================================================*/
+        // Converts a character to upper-case for the default culture.
+        //
+        //| <include path='docs/doc[@for="Char.ToUpper1"]/*' />
+        public static char ToUpper(char c) {
+            return TextInfo.ToUpper(c);
+        }
+
+
+        /*=================================TOLOWER======================================
+        **A wrapper for Char.toLowerCase.  Converts character c to its **
+        **lowercase equivalent.  If c is already a lowercase character or is not an   **
+        **alphabetic, nothing happens.                                                **
+        ==============================================================================*/
+        // Converts a character to lower-case for the default culture.
+        //| <include path='docs/doc[@for="Char.ToLower1"]/*' />
+        public static char ToLower(char c) {
+            return TextInfo.ToLower(c);
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Char.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.Char;
+        }
+
+        //| <include path='docs/doc[@for="Char.IsControl1"]/*' />
+        public static bool IsControl(char c)
+        {
+            return CharacterInfo.IsControl(c);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsControl"]/*' />
+        public static bool IsControl(String s, int index) {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsControl(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsDigit1"]/*' />
+        public static bool IsDigit(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsDigit(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsLetter1"]/*' />
+        public static bool IsLetter(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsLetter(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsLetterOrDigit1"]/*' />
+        public static bool IsLetterOrDigit(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsLetterOrDigit(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsLower1"]/*' />
+        public static bool IsLower(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsLower(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsNumber"]/*' />
+        public static bool IsNumber(char c)
+        {
+            return CharacterInfo.IsNumber(c);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsNumber1"]/*' />
+        public static bool IsNumber(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsNumber(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsPunctuation1"]/*' />
+        public static bool IsPunctuation (String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsPunctuation(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsSeparator"]/*' />
+        public static bool IsSeparator(char c)
+        {
+            return CharacterInfo.IsSeparator(c);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsSeparator1"]/*' />
+        public static bool IsSeparator(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsSeparator(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsSurrogate"]/*' />
+        public static bool IsSurrogate(char c)
+        {
+            return CharacterInfo.IsSurrogate(c);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsSurrogate1"]/*' />
+        public static bool IsSurrogate(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsSurrogate(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsSymbol"]/*' />
+        public static bool IsSymbol(char c)
+        {
+            return CharacterInfo.IsSymbol(c);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsSymbol1"]/*' />
+        public static bool IsSymbol(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsSymbol(s[index]);
+        }
+
+
+        //| <include path='docs/doc[@for="Char.IsUpper1"]/*' />
+        public static bool IsUpper(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsUpper(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.IsWhiteSpace1"]/*' />
+        public static bool IsWhiteSpace(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return IsWhiteSpace(s[index]);
+        }
+
+        //| <include path='docs/doc[@for="Char.GetUnicodeCategory"]/*' />
+        public static UnicodeCategory GetUnicodeCategory(char c)
+        {
+            return CharacterInfo.GetUnicodeCategory(c);
+        }
+
+        //| <include path='docs/doc[@for="Char.GetUnicodeCategory1"]/*' />
+        public static UnicodeCategory GetUnicodeCategory(String s, int index)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            if (((uint)index)>=((uint)s.Length)) {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            return GetUnicodeCategory(s[index]);
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = m_value;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/CharEnumerator.cs b/base/Kernel/System/CharEnumerator.cs
new file mode 100644
index 0000000..32615f1
--- /dev/null
+++ b/base/Kernel/System/CharEnumerator.cs
@@ -0,0 +1,80 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: CharEnumerator
+**
+**
+** Purpose: Enumerates the characters on a string.  skips range
+**          checks.
+**
+** Date: January 3, 2001
+**
+============================================================*/
+namespace System {
+
+    using System.Collections;
+
+    //| <include path='docs/doc[@for="CharEnumerator"]/*' />
+    public sealed class CharEnumerator : IEnumerator, ICloneable {
+        private String str;
+        private int index;
+        private char currentElement;
+
+        internal CharEnumerator(String str) {
+            this.str = str;
+            this.index = -1;
+        }
+
+        //| <include path='docs/doc[@for="CharEnumerator.Clone"]/*' />
+        public Object Clone() {
+            return MemberwiseClone();
+        }
+
+        //| <include path='docs/doc[@for="CharEnumerator.MoveNext"]/*' />
+        public bool MoveNext() {
+            if (index < (str.Length-1)) {
+                index++;
+                currentElement = str[index];
+                return true;
+            }
+            else
+                index = str.Length;
+            return false;
+
+        }
+
+        //| <include path='docs/doc[@for="CharEnumerator.IEnumerator.Current"]/*' />
+        /// <internalonly/>
+        Object IEnumerator.Current {
+            get {
+                if (index == -1)
+                    throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                if (index >= str.Length)
+                    throw new InvalidOperationException("InvalidOperation_EnumEnded");
+
+                return currentElement;
+            }
+        }
+
+        //| <include path='docs/doc[@for="CharEnumerator.Current"]/*' />
+        public char Current {
+            get {
+                if (index == -1)
+                    throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                if (index >= str.Length)
+                    throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                return currentElement;
+            }
+        }
+
+        //| <include path='docs/doc[@for="CharEnumerator.Reset"]/*' />
+        public void Reset() {
+            currentElement = (char)0;
+            index = -1;
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/ArrayList.cs b/base/Kernel/System/Collections/ArrayList.cs
new file mode 100644
index 0000000..6b3c49e
--- /dev/null
+++ b/base/Kernel/System/Collections/ArrayList.cs
@@ -0,0 +1,2319 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  ArrayList
+**
+**
+** Purpose: Implements a dynamically sized List as an array,
+**          and provides many convenience methods for treating
+**          an array as an IList.
+**
+** Date:   October, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+
+    // Implements a variable-size List that uses an array of objects to store the
+    // elements. A ArrayList has a capacity, which is the allocated length
+    // of the internal array. As elements are added to a ArrayList, the capacity
+    // of the ArrayList is automatically increased as required by reallocating the
+    // internal array.
+    //
+    // By Anders Hejlsberg
+    // version 1.00 8/13/98
+    //| <include path='docs/doc[@for="ArrayList"]/*' />
+    public class ArrayList : IList, ICloneable
+    {
+        private Object[] _items;
+        private int _size;
+        private int _version;
+
+        private const int _defaultCapacity = 16;
+
+        // Note: this constructor is a bogus constructor that does nothing
+        // and is for use only with SyncArrayList.
+        internal ArrayList( bool trash )
+        {
+        }
+
+        // Constructs a ArrayList. The list is initially empty and has a capacity
+        // of zero. Upon adding the first element to the list the capacity is
+        // increased to 16, and then increased in multiples of two as required.
+        //| <include path='docs/doc[@for="ArrayList.ArrayList"]/*' />
+        public ArrayList() {
+            _items = new Object[_defaultCapacity];
+        }
+
+        // Constructs a ArrayList with a given initial capacity. The list is
+        // initially empty, but will have room for the given number of elements
+        // before any reallocations are required.
+        //
+        //| <include path='docs/doc[@for="ArrayList.ArrayList1"]/*' />
+         public ArrayList(int capacity) {
+            if (capacity < 0) throw new ArgumentOutOfRangeException("capacity", "ArgumentOutOfRange_SmallCapacity");
+            _items = new Object[capacity];
+        }
+
+        // Constructs a ArrayList, copying the contents of the given collection. The
+        // size and capacity of the new list will both be equal to the size of the
+        // given collection.
+        //
+        //| <include path='docs/doc[@for="ArrayList.ArrayList2"]/*' />
+        public ArrayList(ICollection c) {
+            if (c==null)
+                throw new ArgumentNullException("c", "ArgumentNull_Collection");
+            _items = new Object[c.Count];
+            AddRange(c);
+        }
+
+        // Gets and sets the capacity of this list.  The capacity is the size of
+        // the internal array used to hold items.  When set, the internal
+        // array of the list is reallocated to the given capacity.
+        //
+         //| <include path='docs/doc[@for="ArrayList.Capacity"]/*' />
+         public virtual int Capacity {
+            get { return _items.Length; }
+            set {
+                if (value != _items.Length) {
+                    if (value < _size) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_SmallCapacity");
+                    if (value > 0) {
+                        Object[] newItems = new Object[value];
+                        if (_size > 0) Array.Copy(_items, 0, newItems, 0, _size);
+                        _items = newItems;
+                    }
+                    else {
+                        _items = new Object[_defaultCapacity];
+                    }
+                }
+            }
+        }
+
+        // Read-only property describing how many elements are in the List.
+        //| <include path='docs/doc[@for="ArrayList.Count"]/*' />
+        public virtual int Count {
+            get { return _size; }
+        }
+
+        //| <include path='docs/doc[@for="ArrayList.IsFixedSize"]/*' />
+        public virtual bool IsFixedSize {
+            get { return false; }
+        }
+
+
+        // Is this ArrayList read-only?
+        //| <include path='docs/doc[@for="ArrayList.IsReadOnly"]/*' />
+        public virtual bool IsReadOnly {
+            get { return false; }
+        }
+
+        // Is this ArrayList synchronized (thread-safe)?
+        //| <include path='docs/doc[@for="ArrayList.IsSynchronized"]/*' />
+        public virtual bool IsSynchronized {
+            get { return false; }
+        }
+
+        // Synchronization root for this object.
+        //| <include path='docs/doc[@for="ArrayList.SyncRoot"]/*' />
+        public virtual Object SyncRoot {
+            get { return this; }
+        }
+
+        // Sets or Gets the element at the given index.
+        //
+        //| <include path='docs/doc[@for="ArrayList.this"]/*' />
+        public virtual Object this[int index] {
+            get {
+                if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                return _items[index];
+            }
+            set {
+                if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                _items[index] = value;
+                _version++;
+            }
+        }
+
+        // Creates a ArrayList wrapper for a particular IList.  This does not
+        // copy the contents of the IList, but only wraps the ILIst.  So any
+        // changes to the underlying list will affect the ArrayList.  This would
+        // be useful if you want to Reverse a subrange of an IList, or want to
+        // use a generic BinarySearch or Sort method without implementing one yourself.
+        // However, since these methods are generic, the performance may not be
+        // nearly as good for some operations as they would be on the IList itself.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Adapter"]/*' />
+        public static ArrayList Adapter(IList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new IListWrapper(list);
+        }
+
+        // Adds the given object to the end of this list. The size of the list is
+        // increased by one. If required, the capacity of the list is doubled
+        // before adding the new element.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Add"]/*' />
+        public virtual int Add(Object value) {
+            if (_size == _items.Length) EnsureCapacity(_size + 1);
+            _items[_size] = value;
+            _version++;
+            return _size++;
+        }
+
+        // Adds the elements of the given collection to the end of this list. If
+        // required, the capacity of the list is increased to twice the previous
+        // capacity or the new size, whichever is larger.
+        //
+        //| <include path='docs/doc[@for="ArrayList.AddRange"]/*' />
+        public virtual void AddRange(ICollection c) {
+            InsertRange(_size, c);
+        }
+
+        // Searches a section of the list for a given element using a binary search
+        // algorithm. Elements of the list are compared to the search value using
+        // the given IComparer interface. If comparer is null, elements of
+        // the list are compared to the search value using the IComparable
+        // interface, which in that case must be implemented by all elements of the
+        // list and the given search value. This method assumes that the given
+        // section of the list is already sorted; if this is not the case, the
+        // result will be incorrect.
+        //
+        // The method returns the index of the given value in the list. If the
+        // list does not contain the given value, the method returns a negative
+        // integer. The bitwise complement operator (~) can be applied to a
+        // negative result to produce the index of the first element (if any) that
+        // is larger than the given search value. This is also the index at which
+        // the search value should be inserted into the list in order for the list
+        // to remain sorted.
+        //
+        // The method uses the Array.BinarySearch method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.BinarySearch"]/*' />
+        public virtual int BinarySearch(int index, int count, Object value, IComparer comparer) {
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            return Array.BinarySearch(_items, index, count, value, comparer);
+        }
+
+        //| <include path='docs/doc[@for="ArrayList.BinarySearch1"]/*' />
+        public virtual int BinarySearch(Object value)
+        {
+            return BinarySearch(0,Count,value,null);
+        }
+
+        //| <include path='docs/doc[@for="ArrayList.BinarySearch2"]/*' />
+        public virtual int BinarySearch(Object value, IComparer comparer)
+        {
+            return BinarySearch(0,Count,value,comparer);
+        }
+
+
+        // Clears the contents of ArrayList.
+        //| <include path='docs/doc[@for="ArrayList.Clear"]/*' />
+        public virtual void Clear() {
+            Array.Clear(_items, 0, _size); // Don't need to doc this but we clear the elements so that the GC can reclaim the references.
+            _size = 0;
+            _version++;
+        }
+
+        // Clones this ArrayList, doing a shallow copy.  (A copy is made of all
+        // Object references in the ArrayList, but the Objects pointed to
+        // are not cloned).
+        //| <include path='docs/doc[@for="ArrayList.Clone"]/*' />
+        public virtual Object Clone()
+        {
+            ArrayList la = new ArrayList(_size);
+            la._size = _size;
+            la._version = _version;
+            Array.Copy(_items, 0, la._items, 0, _size);
+            return la;
+        }
+
+
+        // Contains returns true if the specified element is in the ArrayList.
+        // It does a linear, O(n) search.  Equality is determined by calling
+        // item.Equals().
+        //
+        //| <include path='docs/doc[@for="ArrayList.Contains"]/*' />
+        public virtual bool Contains(Object item) {
+            if (item==null) {
+                for(int i=0; i<_size; i++)
+                    if (_items[i]==null)
+                        return true;
+                return false;
+            }
+            else {
+                for(int i=0; i<_size; i++)
+                    if (item.Equals(_items[i]))
+                        return true;
+                return false;
+            }
+        }
+
+        // Copies this ArrayList into array, which must be of a
+        // compatible array type.
+        //
+        //| <include path='docs/doc[@for="ArrayList.CopyTo"]/*' />
+        public virtual void CopyTo(Array array) {
+            CopyTo(array, 0);
+        }
+
+        // Copies this ArrayList into array, which must be of a
+        // compatible array type.
+        //
+        //| <include path='docs/doc[@for="ArrayList.CopyTo1"]/*' />
+        public virtual void CopyTo(Array array, int arrayIndex) {
+            if ((array != null) && (array.Rank != 1))
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            // Delegate rest of error checking to Array.Copy.
+            Array.Copy(_items, 0, array, arrayIndex, _size);
+        }
+
+        // Copies a section of this list to the given array at the given index.
+        //
+        // The method uses the Array.Copy method to copy the elements.
+        //
+        //| <include path='docs/doc[@for="ArrayList.CopyTo2"]/*' />
+        public virtual void CopyTo(int index, Array array, int arrayIndex, int count) {
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+            if ((array != null) && (array.Rank != 1))
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            // Delegate rest of error checking to Array.Copy.
+            Array.Copy(_items, index, array, arrayIndex, count);
+        }
+
+        // Ensures that the capacity of this list is at least the given minimum
+        // value. If the correct capacity of the list is less than min, the
+        // capacity is increased to twice the current capacity or to min,
+        // whichever is larger.
+        private void EnsureCapacity(int min) {
+            if (_items.Length < min) {
+                int newCapacity = _items.Length == 0? 16: _items.Length * 2;
+                if (newCapacity < min) newCapacity = min;
+                Capacity = newCapacity;
+            }
+        }
+
+        // Returns a list wrapper that is fixed at the current size.  Operations
+        // that add or remove items will fail, however, replacing items is allowed.
+        //
+        //| <include path='docs/doc[@for="ArrayList.FixedSize"]/*' />
+        public static IList FixedSize(IList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new FixedSizeList(list);
+        }
+
+        // Returns a list wrapper that is fixed at the current size.  Operations
+        // that add or remove items will fail, however, replacing items is allowed.
+        //
+        //| <include path='docs/doc[@for="ArrayList.FixedSize1"]/*' />
+        public static ArrayList FixedSize(ArrayList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new FixedSizeArrayList(list);
+        }
+
+        // Returns an enumerator for this list with the given
+        // permission for removal of elements. If modifications made to the list
+        // while an enumeration is in progress, the MoveNext and
+        // GetObject methods of the enumerator will throw an exception.
+        //
+        //| <include path='docs/doc[@for="ArrayList.GetEnumerator"]/*' />
+        public virtual IEnumerator GetEnumerator() {
+            return new ArrayListEnumeratorSimple(this);
+        }
+
+        // Returns an enumerator for a section of this list with the given
+        // permission for removal of elements. If modifications made to the list
+        // while an enumeration is in progress, the MoveNext and
+        // GetObject methods of the enumerator will throw an exception.
+        //
+        //| <include path='docs/doc[@for="ArrayList.GetEnumerator1"]/*' />
+        public virtual IEnumerator GetEnumerator(int index, int count) {
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            return new ArrayListEnumerator(this, index, count);
+        }
+
+        // Returns the index of the first occurrence of a given value in a range of
+        // this list. The list is searched forwards from beginning to end.
+        // The elements of the list are compared to the given value using the
+        // Object.Equals method.
+        //
+        // This method uses the Array.IndexOf method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.IndexOf"]/*' />
+        public virtual int IndexOf(Object value) {
+            return Array.IndexOf(_items, value, 0, _size);
+        }
+
+        // Returns the index of the first occurrence of a given value in a range of
+        // this list. The list is searched forwards, starting at index
+        // startIndex and ending at count number of elements. The
+        // elements of the list are compared to the given value using the
+        // Object.Equals method.
+        //
+        // This method uses the Array.IndexOf method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.IndexOf1"]/*' />
+        public virtual int IndexOf(Object value, int startIndex) {
+            if (startIndex > _size)
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            return Array.IndexOf(_items, value, startIndex, _size - startIndex);
+        }
+
+        // Returns the index of the first occurrence of a given value in a range of
+        // this list. The list is searched forwards, starting at index
+        // startIndex and up to count number of elements. The
+        // elements of the list are compared to the given value using the
+        // Object.Equals method.
+        //
+        // This method uses the Array.IndexOf method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.IndexOf2"]/*' />
+        public virtual int IndexOf(Object value, int startIndex, int count) {
+            if (startIndex + count > _size) throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+            return Array.IndexOf(_items, value, startIndex, count);
+        }
+
+        // Inserts an element into this list at a given index. The size of the list
+        // is increased by one. If required, the capacity of the list is doubled
+        // before inserting the new element.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Insert"]/*' />
+        public virtual void Insert(int index, Object value) {
+            // Note that insertions at the end are legal.
+            if (index < 0 || index > _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_ArrayListInsert");
+            if (_size == _items.Length) EnsureCapacity(_size + 1);
+            if (index < _size) {
+                Array.Copy(_items, index, _items, index + 1, _size - index);
+            }
+            _items[index] = value;
+            _size++;
+            _version++;
+        }
+
+        // Inserts the elements of the given collection at a given index. If
+        // required, the capacity of the list is increased to twice the previous
+        // capacity or the new size, whichever is larger.  Ranges may be added
+        // to the end of the list by setting index to the ArrayList's size.
+        //
+        //| <include path='docs/doc[@for="ArrayList.InsertRange"]/*' />
+        public virtual void InsertRange(int index, ICollection c) {
+            if (c==null)
+                throw new ArgumentNullException("c", "ArgumentNull_Collection");
+            if (index < 0 || index > _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            int count = c.Count;
+            if (count > 0) {
+                EnsureCapacity(_size + count);
+                if (index < _size) {
+                    Array.Copy(_items, index, _items, index + count, _size - index);
+                }
+                // Hack hack hack
+                // If we're inserting a ArrayList into itself, we want to be able to deal with that.
+                if (this == c.SyncRoot) {
+                    // Copy first part of _items to insert location
+                    Array.Copy(_items, 0, _items, index, index);
+                    // Copy last part of _items back to inserted location
+                    Array.Copy(_items, index+count, _items, index*2, _size-index);
+                }
+                else
+                    c.CopyTo(_items, index);
+                _size += count;
+                _version++;
+            }
+        }
+
+        // Returns the index of the last occurrence of a given value in a range of
+        // this list. The list is searched backwards, starting at the end
+        // and ending at the first element in the list. The elements of the list
+        // are compared to the given value using the Object.Equals method.
+        //
+        // This method uses the Array.LastIndexOf method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.LastIndexOf"]/*' />
+        public virtual int LastIndexOf(Object value)
+        {
+            return LastIndexOf(value, _size - 1, _size);
+        }
+
+        // Returns the index of the last occurrence of a given value in a range of
+        // this list. The list is searched backwards, starting at index
+        // startIndex and ending at the first element in the list. The
+        // elements of the list are compared to the given value using the
+        // Object.Equals method.
+        //
+        // This method uses the Array.LastIndexOf method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.LastIndexOf1"]/*' />
+        public virtual int LastIndexOf(Object value, int startIndex)
+        {
+            if (startIndex >= _size)
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            return LastIndexOf(value, startIndex, startIndex + 1);
+        }
+
+        // Returns the index of the last occurrence of a given value in a range of
+        // this list. The list is searched backwards, starting at index
+        // startIndex and up to count elements. The elements of
+        // the list are compared to the given value using the Object.Equals
+        // method.
+        //
+        // This method uses the Array.LastIndexOf method to perform the
+        // search.
+        //
+        //| <include path='docs/doc[@for="ArrayList.LastIndexOf2"]/*' />
+        public virtual int LastIndexOf(Object value, int startIndex, int count) {
+            if (_size == 0)
+                return -1;
+            if (startIndex < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((startIndex<0 ? "startIndex" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (startIndex >= _size || count > startIndex + 1)
+                throw new ArgumentOutOfRangeException((startIndex>=_size ? "startIndex" : "count"), "ArgumentOutOfRange_BiggerThanCollection");
+            return Array.LastIndexOf(_items, value, startIndex, count);
+        }
+
+        // Returns a read-only IList wrapper for the given IList.
+        //
+        //| <include path='docs/doc[@for="ArrayList.ReadOnly"]/*' />
+        public static IList ReadOnly(IList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new ReadOnlyList(list);
+        }
+
+        // Returns a read-only ArrayList wrapper for the given ArrayList.
+        //
+        //| <include path='docs/doc[@for="ArrayList.ReadOnly1"]/*' />
+        public static ArrayList ReadOnly(ArrayList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new ReadOnlyArrayList(list);
+        }
+
+        // Removes the element at the given index. The size of the list is
+        // decreased by one.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Remove"]/*' />
+        public virtual void Remove(Object obj) {
+            int index = IndexOf(obj);
+            if (index >=0)
+                RemoveAt(index);
+        }
+
+        // Removes the element at the given index. The size of the list is
+        // decreased by one.
+        //
+        //| <include path='docs/doc[@for="ArrayList.RemoveAt"]/*' />
+        public virtual void RemoveAt(int index) {
+            if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            _size--;
+            if (index < _size) {
+                Array.Copy(_items, index + 1, _items, index, _size - index);
+            }
+            _items[_size] = null;
+            _version++;
+        }
+
+        // Removes a range of elements from this list.
+        //
+        //| <include path='docs/doc[@for="ArrayList.RemoveRange"]/*' />
+        public virtual void RemoveRange(int index, int count) {
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            if (count > 0) {
+                int i = _size;
+                _size -= count;
+                if (index < _size) {
+                    Array.Copy(_items, index + count, _items, index, _size - index);
+                }
+                while (i > _size) _items[--i] = null;
+                _version++;
+            }
+        }
+
+        // Returns an IList that contains count copies of value.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Repeat"]/*' />
+        public static ArrayList Repeat(Object value, int count) {
+            // @CONSIDER: If it turns out this is ABSOLUTELY performance critical
+            // (instead of simply lame), we can write another inner class that
+            // implements IList and write a special enumerator for it, etc.
+            // That's a reasonable amount of complexity though for what we think
+            // will be a very rarely used method.
+
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count","ArgumentOutOfRange_NeedNonNegNum");
+
+            ArrayList list = new ArrayList((count>_defaultCapacity)?count:_defaultCapacity);
+            for(int i=0; i<count; i++)
+                list.Add(value);
+            return list;
+        }
+
+        // Reverses the elements in this list.
+        //| <include path='docs/doc[@for="ArrayList.Reverse"]/*' />
+        public virtual void Reverse() {
+            Reverse(0, Count);
+        }
+
+        // Reverses the elements in a range of this list. Following a call to this
+        // method, an element in the range given by index and count
+        // which was previously located at index i will now be located at
+        // index index + (index + count - i - 1).
+        //
+        // This method uses the Array.Reverse method to reverse the
+        // elements.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Reverse1"]/*' />
+        public virtual void Reverse(int index, int count) {
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+            Array.Reverse(_items, index, count);
+            _version++;
+        }
+
+        // Sets the elements starting at the given index to the elements of the
+        // given collection.
+        //
+        //| <include path='docs/doc[@for="ArrayList.SetRange"]/*' />
+        public virtual void SetRange(int index, ICollection c) {
+            if (c==null) throw new ArgumentNullException("c", "ArgumentNull_Collection");
+            int count = c.Count;
+            if (index < 0 || index > _size - count) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+
+            if (count > 0) {
+                c.CopyTo(_items, index);
+                _version++;
+            }
+        }
+
+        //| <include path='docs/doc[@for="ArrayList.GetRange"]/*' />
+        public virtual ArrayList GetRange(int index, int count) {
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+             return new Range(this,index, count);
+        }
+
+        // Sorts the elements in this list.  Uses the default comparer and
+        // Array.Sort.
+        //| <include path='docs/doc[@for="ArrayList.Sort"]/*' />
+        public virtual void Sort()
+        {
+            Sort(0, Count, Comparer.Default);
+        }
+
+        // Sorts the elements in this list.  Uses Array.Sort with the
+        // provided comparer.
+        //| <include path='docs/doc[@for="ArrayList.Sort1"]/*' />
+        public virtual void Sort(IComparer comparer)
+        {
+            Sort(0, Count, comparer);
+        }
+
+        // Sorts the elements in a section of this list. The sort compares the
+        // elements to each other using the given IComparer interface. If
+        // comparer is null, the elements are compared to each other using
+        // the IComparable interface, which in that case must be implemented by all
+        // elements of the list.
+        //
+        // This method uses the Array.Sort method to sort the elements.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Sort2"]/*' />
+        public virtual void Sort(int index, int count, IComparer comparer) {
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (_size - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            Array.Sort(_items, index, count, comparer);
+            _version++;
+        }
+
+        // Returns a thread-safe wrapper around an IList.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Synchronized"]/*' />
+        public static IList Synchronized(IList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new SyncIList(list);
+        }
+
+        // Returns a thread-safe wrapper around a ArrayList.
+        //
+        //| <include path='docs/doc[@for="ArrayList.Synchronized1"]/*' />
+        public static ArrayList Synchronized(ArrayList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new SyncArrayList(list);
+        }
+
+        // ToArray returns a new Object array containing the contents of the ArrayList.
+        // This requires copying the ArrayList, which is an O(n) operation.
+        //| <include path='docs/doc[@for="ArrayList.ToArray"]/*' />
+        public virtual Object[] ToArray() {
+            Object[] array = new Object[_size];
+            Array.Copy(_items, 0, array, 0, _size);
+            return array;
+        }
+
+        // ToArray returns a new array of a particular type containing the contents
+        // of the ArrayList.  This requires copying the ArrayList and potentially
+        // downcasting all elements.  This copy may fail and is an O(n) operation.
+        // Internally, this implementation calls Array.Copy.
+        //
+        //| <include path='docs/doc[@for="ArrayList.ToArray1"]/*' />
+        public virtual Array ToArray(Type type) {
+            if (type==null)
+                throw new ArgumentNullException("type");
+            Array array = Array.CreateInstance(type, _size);
+            Array.Copy(_items, 0, array, 0, _size);
+            return array;
+        }
+
+        // Sets the capacity of this list to the size of the list. This method can
+        // be used to minimize a list's memory overhead once it is known that no
+        // new elements will be added to the list. To completely clear a list and
+        // release all memory referenced by the list, execute the following
+        // statements:
+        //
+        // list.Clear();
+        // list.TrimToSize();
+        //
+        //| <include path='docs/doc[@for="ArrayList.TrimToSize"]/*' />
+        public virtual void TrimToSize() {
+            Capacity = _size;
+        }
+
+
+        // This class wraps an IList, exposing it as a ArrayList
+        // Note this requires reimplementing half of ArrayList...
+        private class IListWrapper : ArrayList
+        {
+            private IList _list;
+
+            internal IListWrapper(IList list) {
+                _list = list;
+            }
+
+             public override int Capacity {
+                get { return _list.Count; }
+                set {
+                    if (value < _list.Count)
+                        throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_SmallCapacity");
+                }
+            }
+
+            public override int Count {
+                get { return _list.Count; }
+            }
+
+            public override bool IsReadOnly {
+                get { return _list.IsReadOnly; }
+            }
+
+            public override bool IsFixedSize {
+                get { return _list.IsFixedSize; }
+            }
+
+
+            public override bool IsSynchronized {
+                get { return _list.IsSynchronized; }
+            }
+
+             public override Object this[int index] {
+                get {
+                    return _list[index];
+                }
+                set {
+                    _list[index] = value;
+                }
+            }
+
+            public override Object SyncRoot {
+                get { return _list.SyncRoot; }
+            }
+
+            public override int Add(Object obj) {
+                return _list.Add(obj);
+            }
+
+            public override void AddRange(ICollection c) {
+                InsertRange(Count, c);
+            }
+
+            // Other overloads with automatically work
+            public override int BinarySearch(int index, int count, Object value, IComparer comparer)
+            {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                if (comparer == null)
+                    comparer = Comparer.Default;
+
+                int lo = index;
+                int hi = index + count - 1;
+                int mid;
+                while (lo <= hi) {
+                    mid = (lo+hi)/2;
+                    int r = comparer.Compare(value, _list[mid]);
+                    if (r == 0)
+                        return mid;
+                    if (r < 0)
+                        hi = mid-1;
+                    else
+                        lo = mid+1;
+                }
+                // return bitwise complement of the first element greater than value.
+                // Since hi is less than lo now, ~lo is the correct item.
+                return ~lo;
+            }
+
+            public override void Clear() {
+                _list.Clear();
+            }
+
+            public override Object Clone() {
+                // This does not do a shallow copy of _list into a ArrayList!
+                // This clones the IListWrapper, creating another wrapper class!
+                return new IListWrapper(_list);
+            }
+
+            public override bool Contains(Object obj) {
+                return _list.Contains(obj);
+            }
+
+            public override void CopyTo(Array array, int index) {
+                _list.CopyTo(array, index);
+            }
+
+            public override void CopyTo(int index, Array array, int arrayIndex, int count) {
+                if (array==null)
+                    throw new ArgumentNullException("array");
+                if (index < 0 || arrayIndex < 0)
+                    throw new ArgumentOutOfRangeException((index < 0) ? "index" : "arrayIndex", "ArgumentOutOfRange_NeedNonNegNum");
+                if (array.Length - arrayIndex < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                if (array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+
+                for(int i=index; i<index+count; i++)
+                    array.SetValue(_list[i], arrayIndex++);
+            }
+
+            public override IEnumerator GetEnumerator() {
+                return _list.GetEnumerator();
+            }
+
+            public override IEnumerator GetEnumerator(int index, int count) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+
+                return new IListWrapperEnumWrapper(this, index, count);
+            }
+
+            public override int IndexOf(Object value) {
+                return _list.IndexOf(value);
+            }
+
+            public override int IndexOf(Object value, int startIndex) {
+                return IndexOf(value, startIndex, _list.Count - startIndex);
+            }
+
+            public override int IndexOf(Object value, int startIndex, int count) {
+                if (startIndex < 0 || startIndex >= _list.Count) throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+                if (count < 0 || startIndex > _list.Count - count) throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+
+                int endIndex = startIndex + count;
+                if (value == null) {
+                    for(int i=startIndex; i<endIndex; i++)
+                        if (_list[i] == null)
+                            return i;
+                    return -1;
+                } else {
+                    for(int i=startIndex; i<endIndex; i++)
+                        if (value.Equals(_list[i]))
+                            return i;
+                    return -1;
+                }
+            }
+
+            public override void Insert(int index, Object obj) {
+                _list.Insert(index, obj);
+            }
+
+            public override void InsertRange(int index, ICollection c) {
+                if (c==null)
+                    throw new ArgumentNullException("c", "ArgumentNull_Collection");
+                if (index < 0 || index > _list.Count) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+
+                IEnumerator en = c.GetEnumerator();
+                while(en.MoveNext()) {
+                    _list.Insert(index++, en.Current);
+                }
+            }
+
+            public override int LastIndexOf(Object value) {
+                 return LastIndexOf(value,_list.Count - 1, _list.Count);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex) {
+                return LastIndexOf(value, startIndex, startIndex + 1);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex, int count) {
+                if (_list.Count == 0)
+                    return -1;
+
+                if (startIndex < 0 || startIndex >= _list.Count) throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+                if (count < 0 || count > startIndex + 1) throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+
+                int endIndex = startIndex - count + 1;
+                if (value == null) {
+                    for(int i=startIndex; i >= endIndex; i--)
+                        if (_list[i] == null)
+                            return i;
+                    return -1;
+                } else {
+                    for(int i=startIndex; i >= endIndex; i--)
+                        if (value.Equals(_list[i]))
+                            return i;
+                    return -1;
+                }
+            }
+
+            public override void Remove(Object value) {
+                _list.Remove(value);
+            }
+
+            public override void RemoveAt(int index) {
+                _list.RemoveAt(index);
+            }
+
+            public override void RemoveRange(int index, int count) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+
+                while(count > 0) {
+                    _list.RemoveAt(index);
+                    count--;
+                }
+            }
+
+            public override void Reverse(int index, int count) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+
+                int i = index;
+                int j = index + count - 1;
+                while (i < j)
+                {
+                    Object tmp = _list[i];
+                    _list[i++] = _list[j];
+                    _list[j--] = tmp;
+                }
+            }
+
+            public override void SetRange(int index, ICollection c) {
+                if (c==null)
+                    throw new ArgumentNullException("c", "ArgumentNull_Collection");
+                if (index < 0 || index >= _list.Count) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                if (_list.Count - index < c.Count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+
+                IEnumerator en = c.GetEnumerator();
+                while(en.MoveNext()) {
+                    _list[index++] = en.Current;
+                }
+            }
+
+            public override ArrayList GetRange(int index, int count) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                 return new Range(this,index, count);
+            }
+
+            public override void Sort(int index, int count, IComparer comparer) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_list.Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+
+                Object [] array = new Object[count];
+                CopyTo(index, array, 0, count);
+                Array.Sort(array, 0, count, comparer);
+                for(int i=0; i<count; i++)
+                    _list[i+index] = array[i];
+            }
+
+
+            public override Object[] ToArray() {
+                Object[] array = new Object[Count];
+                _list.CopyTo(array, 0);
+                return array;
+            }
+
+            public override Array ToArray(Type type)
+            {
+                if (type==null)
+                    throw new ArgumentNullException("type");
+                Array array = Array.CreateInstance(type, _list.Count);
+                _list.CopyTo(array, 0);
+                return array;
+            }
+
+            public override void TrimToSize()
+            {
+                // Can't really do much here...
+            }
+
+            // This is the enumerator for an IList that's been wrapped in another
+            // class that implements all of ArrayList's methods.
+            private class IListWrapperEnumWrapper : IEnumerator, ICloneable
+            {
+                private IEnumerator _en;
+                private int _remaining;
+                private int _initialStartIndex;   // for reset
+                private int _initialCount;        // for reset
+                private bool _firstCall;       // firstCall to MoveNext
+
+                private IListWrapperEnumWrapper()
+                {
+                }
+
+                internal IListWrapperEnumWrapper(IListWrapper listWrapper, int startIndex, int count)
+                {
+                    _en = listWrapper.GetEnumerator();
+                    _initialStartIndex = startIndex;
+                    _initialCount = count;
+                    while(startIndex-- > 0 && _en.MoveNext());
+                    _remaining = count;
+                    _firstCall = true;
+                }
+
+                public virtual Object Clone() {
+                    // We must clone the underlying enumerator, I think.
+                    IListWrapperEnumWrapper clone = new IListWrapperEnumWrapper();
+                    clone._en = (IEnumerator) ((ICloneable)_en).Clone();
+                    clone._initialStartIndex = _initialStartIndex;
+                    clone._initialCount = _initialCount;
+                    clone._remaining = _remaining;
+                    clone._firstCall = _firstCall;
+                    return clone;
+                }
+
+                public virtual bool MoveNext() {
+                    if (_firstCall) {
+                        _firstCall = false;
+                        return _remaining > 0 && _en.MoveNext();
+                    }
+                    if (_remaining < 0)
+                        return false;
+                    bool r = _en.MoveNext();
+                    return r && _remaining-- > 0;
+                }
+
+                public virtual Object Current {
+                    get {
+                        if (_firstCall)
+                            throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                        if (_remaining < 0)
+                            throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                        return _en.Current;
+                    }
+                }
+
+                public virtual void Reset() {
+                    _en.Reset();
+                    int startIndex = _initialStartIndex;
+                    while(startIndex-- > 0 && _en.MoveNext());
+                    _remaining = _initialCount;
+                    _firstCall = true;
+                }
+            }
+        }
+
+        private class SyncArrayList : ArrayList
+        {
+            private ArrayList _list;
+            private Object _root;
+
+            internal SyncArrayList(ArrayList list)
+                : base( false )
+            {
+                _list = list;
+                _root = list.SyncRoot;
+            }
+
+            public override int Capacity {
+                get {
+                    lock (_root) {
+                        return _list.Capacity;
+                    }
+                }
+                set {
+                    lock (_root) {
+                        _list.Capacity = value;
+                    }
+                }
+            }
+
+            public override int Count {
+                get { lock (_root) { return _list.Count; } }
+            }
+
+            public override bool IsReadOnly {
+                get { return _list.IsReadOnly; }
+            }
+
+            public override bool IsFixedSize {
+                get { return _list.IsFixedSize; }
+            }
+
+
+            public override bool IsSynchronized {
+                get { return true; }
+            }
+
+             public override Object this[int index] {
+                get {
+                    lock (_root) {
+                        return _list[index];
+                    }
+                }
+                set {
+                    lock (_root) {
+                        _list[index] = value;
+                    }
+                }
+            }
+
+            public override Object SyncRoot {
+                get { return _root; }
+            }
+
+            public override int Add(Object value) {
+                lock (_root) {
+                    return _list.Add(value);
+                }
+            }
+
+            public override void AddRange(ICollection c) {
+                lock (_root) {
+                    _list.AddRange(c);
+                }
+            }
+
+            // Other base class overloads of BinarySearch will call into this override and do the locking
+            public override int BinarySearch(int index, int count, Object value, IComparer comparer) {
+                lock (_root) {
+                    return _list.BinarySearch(index, count, value, comparer);
+                }
+            }
+
+            public override void Clear() {
+                lock (_root) {
+                    _list.Clear();
+                }
+            }
+
+            public override Object Clone() {
+                lock (_root) {
+                    return new SyncArrayList((ArrayList)_list.Clone());
+                }
+            }
+
+            public override bool Contains(Object item) {
+                lock (_root) {
+                    return _list.Contains(item);
+                }
+            }
+
+            public override void CopyTo(Array array, int index) {
+                lock (_root) {
+                    _list.CopyTo(array, index);
+                }
+            }
+
+            public override void CopyTo(int index, Array array, int arrayIndex, int count) {
+                lock (_root) {
+                    _list.CopyTo(index, array, arrayIndex, count);
+                }
+            }
+
+            public override IEnumerator GetEnumerator() {
+                lock (_root) {
+                    return _list.GetEnumerator();
+                }
+            }
+
+            public override IEnumerator GetEnumerator(int index, int count) {
+                lock (_root) {
+                    return _list.GetEnumerator(index, count);
+                }
+            }
+
+            public override int IndexOf(Object value) {
+                lock (_root) {
+                    return _list.IndexOf(value);
+                }
+            }
+
+            public override int IndexOf(Object value, int startIndex) {
+                lock (_root) {
+                    return _list.IndexOf(value, startIndex);
+                }
+            }
+
+            public override int IndexOf(Object value, int startIndex, int count) {
+                lock (_root) {
+                    return _list.IndexOf(value, startIndex, count);
+                }
+            }
+
+            public override void Insert(int index, Object value) {
+                lock (_root) {
+                    _list.Insert(index, value);
+                }
+            }
+
+            public override void InsertRange(int index, ICollection c) {
+                lock (_root) {
+                    _list.InsertRange(index, c);
+                }
+            }
+
+            public override int LastIndexOf(Object value) {
+                lock (_root) {
+                    return _list.LastIndexOf(value);
+                }
+            }
+
+            public override int LastIndexOf(Object value, int startIndex) {
+                lock (_root) {
+                    return _list.LastIndexOf(value, startIndex);
+                }
+            }
+
+            public override int LastIndexOf(Object value, int startIndex, int count) {
+                lock (_root) {
+                    return _list.LastIndexOf(value, startIndex, count);
+                }
+            }
+
+            public override void Remove(Object value) {
+                lock (_root) {
+                    _list.Remove(value);
+                }
+            }
+
+            public override void RemoveAt(int index) {
+                lock (_root) {
+                    _list.RemoveAt(index);
+                }
+            }
+
+            public override void RemoveRange(int index, int count) {
+                lock (_root) {
+                    _list.RemoveRange(index, count);
+                }
+            }
+
+            public override void Reverse(int index, int count) {
+                lock (_root) {
+                    _list.Reverse(index, count);
+                }
+            }
+
+            public override void SetRange(int index, ICollection c) {
+                lock (_root) {
+                    _list.SetRange(index, c);
+                }
+            }
+
+            public override ArrayList GetRange(int index, int count) {
+                lock (_root) {
+                    return _list.GetRange(index, count);
+                }
+            }
+
+            public override void Sort(int index, int count, IComparer comparer) {
+                lock (_root) {
+                    _list.Sort(index, count, comparer);
+                }
+            }
+
+            public override Object[] ToArray() {
+                lock (_root) {
+                    return _list.ToArray();
+                }
+            }
+
+            public override Array ToArray(Type type) {
+                lock (_root) {
+                    return _list.ToArray(type);
+                }
+            }
+
+            public override void TrimToSize() {
+                lock (_root) {
+                    _list.TrimToSize();
+                }
+            }
+        }
+
+        private class SyncIList : IList
+        {
+            private IList _list;
+            private Object _root;
+
+            internal SyncIList(IList list) {
+                _list = list;
+                _root = list.SyncRoot;
+            }
+
+            public virtual int Count {
+                get { lock (_root) { return _list.Count; } }
+            }
+
+            public virtual bool IsReadOnly {
+                get { return _list.IsReadOnly; }
+            }
+
+            public virtual bool IsFixedSize {
+                get { return _list.IsFixedSize; }
+            }
+
+
+            public virtual bool IsSynchronized {
+                get { return true; }
+            }
+
+             public virtual Object this[int index] {
+                get {
+                    lock (_root) {
+                        return _list[index];
+                    }
+                }
+                set {
+                    lock (_root) {
+                        _list[index] = value;
+                    }
+                }
+            }
+
+            public virtual Object SyncRoot {
+                get { return _root; }
+            }
+
+            public virtual int Add(Object value) {
+                lock (_root) {
+                    return _list.Add(value);
+                }
+            }
+
+
+            public virtual void Clear() {
+                lock (_root) {
+                    _list.Clear();
+                }
+            }
+
+            public virtual bool Contains(Object item) {
+                lock (_root) {
+                    return _list.Contains(item);
+                }
+            }
+
+            public virtual void CopyTo(Array array, int index) {
+                lock (_root) {
+                    _list.CopyTo(array, index);
+                }
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                lock (_root) {
+                    return _list.GetEnumerator();
+                }
+            }
+
+            public virtual int IndexOf(Object value) {
+                lock (_root) {
+                    return _list.IndexOf(value);
+                }
+            }
+
+            public virtual void Insert(int index, Object value) {
+                lock (_root) {
+                    _list.Insert(index, value);
+                }
+            }
+
+            public virtual void Remove(Object value) {
+                lock (_root) {
+                    _list.Remove(value);
+                }
+            }
+
+            public virtual void RemoveAt(int index) {
+                lock (_root) {
+                    _list.RemoveAt(index);
+                }
+            }
+        }
+
+        private class FixedSizeList : IList
+        {
+            private IList _list;
+
+            internal FixedSizeList(IList l) {
+                _list = l;
+            }
+
+            public virtual int Count {
+                get { return _list.Count; }
+            }
+
+            public virtual bool IsReadOnly {
+                get { return _list.IsReadOnly; }
+            }
+
+            public virtual bool IsFixedSize {
+                get { return true; }
+            }
+
+            public virtual bool IsSynchronized {
+                get { return _list.IsSynchronized; }
+            }
+
+             public virtual Object this[int index] {
+                get {
+                    return _list[index];
+                }
+                set {
+                    _list[index] = value;
+                }
+            }
+
+            public virtual Object SyncRoot {
+                get { return _list.SyncRoot; }
+            }
+
+            public virtual int Add(Object obj) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public virtual void Clear() {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public virtual bool Contains(Object obj) {
+                return _list.Contains(obj);
+            }
+
+            public virtual void CopyTo(Array array, int index) {
+                _list.CopyTo(array, index);
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                return _list.GetEnumerator();
+            }
+
+            public virtual int IndexOf(Object value) {
+                return _list.IndexOf(value);
+            }
+
+            public virtual void Insert(int index, Object obj) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public virtual void Remove(Object value) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public virtual void RemoveAt(int index) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+        }
+
+        private class FixedSizeArrayList : ArrayList
+        {
+            private ArrayList _list;
+
+            internal FixedSizeArrayList(ArrayList l) {
+                _list = l;
+            }
+
+            public override int Count {
+                get { return _list.Count; }
+            }
+
+            public override bool IsReadOnly {
+                get { return _list.IsReadOnly; }
+            }
+
+            public override bool IsFixedSize {
+                get { return true; }
+            }
+
+            public override bool IsSynchronized {
+                get { return _list.IsSynchronized; }
+            }
+
+             public override Object this[int index] {
+                get {
+                    return _list[index];
+                }
+                set {
+                    _list[index] = value;
+                }
+            }
+
+            public override Object SyncRoot {
+                get { return _list.SyncRoot; }
+            }
+
+            public override int Add(Object obj) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override void AddRange(ICollection c) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override int BinarySearch(int index, int count, Object value, IComparer comparer) {
+                return _list.BinarySearch(index, count, value, comparer);
+            }
+
+            public override int Capacity {
+                get { return _list.Capacity; }
+                set { throw new NotSupportedException("NotSupported_FixedSizeCollection"); }
+            }
+
+            public override void Clear() {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override Object Clone() {
+                FixedSizeArrayList arrayList = new FixedSizeArrayList(_list);
+                arrayList._list = (ArrayList)_list.Clone();
+                return arrayList;
+            }
+
+            public override bool Contains(Object obj) {
+                return _list.Contains(obj);
+            }
+
+            public override void CopyTo(Array array, int index) {
+                _list.CopyTo(array, index);
+            }
+
+            public override void CopyTo(int index, Array array, int arrayIndex, int count) {
+                _list.CopyTo(index, array, arrayIndex, count);
+            }
+
+            public override IEnumerator GetEnumerator() {
+                return _list.GetEnumerator();
+            }
+
+            public override IEnumerator GetEnumerator(int index, int count) {
+                return _list.GetEnumerator(index, count);
+            }
+
+            public override int IndexOf(Object value) {
+                return _list.IndexOf(value);
+            }
+
+            public override int IndexOf(Object value, int startIndex) {
+                return _list.IndexOf(value, startIndex);
+            }
+
+            public override int IndexOf(Object value, int startIndex, int count) {
+                return _list.IndexOf(value, startIndex, count);
+            }
+
+            public override void Insert(int index, Object obj) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override void InsertRange(int index, ICollection c) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override int LastIndexOf(Object value) {
+                return _list.LastIndexOf(value);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex) {
+                return _list.LastIndexOf(value, startIndex);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex, int count) {
+                return _list.LastIndexOf(value, startIndex, count);
+            }
+
+            public override void Remove(Object value) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override void RemoveAt(int index) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override void RemoveRange(int index, int count) {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+
+            public override void SetRange(int index, ICollection c) {
+                _list.SetRange(index, c);
+            }
+
+            public override ArrayList GetRange(int index, int count) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                 return new Range(this,index, count);
+            }
+
+            public override void Reverse(int index, int count) {
+                _list.Reverse(index, count);
+            }
+
+            public override void Sort(int index, int count, IComparer comparer) {
+                _list.Sort(index, count, comparer);
+            }
+
+            public override Object[] ToArray() {
+                return _list.ToArray();
+            }
+
+            public override Array ToArray(Type type) {
+                return _list.ToArray(type);
+            }
+
+            public override void TrimToSize() {
+                throw new NotSupportedException("NotSupported_FixedSizeCollection");
+            }
+        }
+
+        private class ReadOnlyList : IList
+        {
+            private IList _list;
+
+            internal ReadOnlyList(IList l) {
+                _list = l;
+            }
+
+            public virtual int Count {
+                get { return _list.Count; }
+            }
+
+            public virtual bool IsReadOnly {
+                get { return true; }
+            }
+
+            public virtual bool IsFixedSize {
+                get { return true; }
+            }
+
+            public virtual bool IsSynchronized {
+                get { return _list.IsSynchronized; }
+            }
+
+             public virtual Object this[int index] {
+                get {
+                    return _list[index];
+                }
+                set {
+                    throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+                }
+            }
+
+            public virtual Object SyncRoot {
+                get { return _list.SyncRoot; }
+            }
+
+            public virtual int Add(Object obj) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public virtual void Clear() {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public virtual bool Contains(Object obj) {
+                return _list.Contains(obj);
+            }
+
+            public virtual void CopyTo(Array array, int index) {
+                _list.CopyTo(array, index);
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                return _list.GetEnumerator();
+            }
+
+            public virtual int IndexOf(Object value) {
+                return _list.IndexOf(value);
+            }
+
+            public virtual void Insert(int index, Object obj) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public virtual void Remove(Object value) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public virtual void RemoveAt(int index) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+        }
+
+        private class ReadOnlyArrayList : ArrayList
+        {
+            private ArrayList _list;
+
+            internal ReadOnlyArrayList(ArrayList l) {
+                _list = l;
+            }
+
+            public override int Count {
+                get { return _list.Count; }
+            }
+
+            public override bool IsReadOnly {
+                get { return true; }
+            }
+
+            public override bool IsFixedSize {
+                get { return true; }
+            }
+
+            public override bool IsSynchronized {
+                get { return _list.IsSynchronized; }
+            }
+
+             public override Object this[int index] {
+                get {
+                    return _list[index];
+                }
+                set {
+                    throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+                }
+            }
+
+            public override Object SyncRoot {
+                get { return _list.SyncRoot; }
+            }
+
+            public override int Add(Object obj) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override void AddRange(ICollection c) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override int BinarySearch(int index, int count, Object value, IComparer comparer) {
+                return _list.BinarySearch(index, count, value, comparer);
+            }
+
+
+            public override int Capacity {
+                get { return _list.Capacity; }
+                set { throw new NotSupportedException("NotSupported_ReadOnlyCollection"); }
+            }
+
+            public override void Clear() {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override Object Clone() {
+                ReadOnlyArrayList arrayList = new ReadOnlyArrayList(_list);
+                arrayList._list = (ArrayList)_list.Clone();
+                return arrayList;
+            }
+
+            public override bool Contains(Object obj) {
+                return _list.Contains(obj);
+            }
+
+            public override void CopyTo(Array array, int index) {
+                _list.CopyTo(array, index);
+            }
+
+            public override void CopyTo(int index, Array array, int arrayIndex, int count) {
+                _list.CopyTo(index, array, arrayIndex, count);
+            }
+
+            public override IEnumerator GetEnumerator() {
+                return _list.GetEnumerator();
+            }
+
+            public override IEnumerator GetEnumerator(int index, int count) {
+                return _list.GetEnumerator(index, count);
+            }
+
+            public override int IndexOf(Object value) {
+                return _list.IndexOf(value);
+            }
+
+            public override int IndexOf(Object value, int startIndex) {
+                return _list.IndexOf(value, startIndex);
+            }
+
+            public override int IndexOf(Object value, int startIndex, int count) {
+                return _list.IndexOf(value, startIndex, count);
+            }
+
+            public override void Insert(int index, Object obj) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override void InsertRange(int index, ICollection c) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override int LastIndexOf(Object value) {
+                return _list.LastIndexOf(value);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex) {
+                return _list.LastIndexOf(value, startIndex);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex, int count) {
+                return _list.LastIndexOf(value, startIndex, count);
+            }
+
+            public override void Remove(Object value) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override void RemoveAt(int index) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override void RemoveRange(int index, int count) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override void SetRange(int index, ICollection c) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override ArrayList GetRange(int index, int count) {
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (Count - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                 return new Range(this,index, count);
+            }
+
+            public override void Reverse(int index, int count) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override void Sort(int index, int count, IComparer comparer) {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+
+            public override Object[] ToArray() {
+                return _list.ToArray();
+            }
+
+            public override Array ToArray(Type type) {
+                return _list.ToArray(type);
+            }
+
+            public override void TrimToSize() {
+                throw new NotSupportedException("NotSupported_ReadOnlyCollection");
+            }
+        }
+
+
+        // Implements an enumerator for a ArrayList. The enumerator uses the
+        // internal version number of the list to ensure that no modifications are
+        // made to the list while an enumeration is in progress.
+        private class ArrayListEnumerator : IEnumerator, ICloneable
+        {
+            private ArrayList list;
+            private int index;
+            private int endIndex;       // Where to stop.
+            private int version;
+            private Object currentElement;
+            private int startIndex;     // Save this for Reset.
+
+            internal ArrayListEnumerator(ArrayList list, int index, int count) {
+                this.list = list;
+                this.index = index;
+                endIndex = index + count;
+                version = list._version;
+                startIndex = index;
+                currentElement = list;
+            }
+
+            public Object Clone() {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                if (version != list._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                if (index < endIndex) {
+                    currentElement = list[index];
+                    index++;
+                    return true;
+                }
+                else
+                {
+                    index = endIndex + 1;
+                    currentElement = list;
+                }
+
+                return false;
+            }
+
+            public virtual Object Current {
+                get {
+                    Object temp = currentElement; // Make sure we never return the internal list in a multi-threaded scenario
+                    if (temp == list) {
+                        if (index <= startIndex)
+                            throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                        else
+                            throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    }
+                    return temp;
+                }
+            }
+
+            public virtual void Reset() {
+                if (version != list._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                index = startIndex;
+                currentElement = list;
+            }
+        }
+
+
+        // Implementation of a generic list subrange. An instance of this class
+        // is returned by the default implementation of List.GetRange.
+        private class Range: ArrayList
+        {
+            private ArrayList _baseList;
+            private int _baseIndex;
+            private int _baseSize;
+            private int _baseVersion;
+
+            internal Range(ArrayList list, int index, int count) {
+                _baseList = list;
+                _baseIndex = index;
+                _baseSize = count;
+                _baseVersion = list._version;
+            }
+
+            private void InternalUpdateRange()
+            {
+                if (_baseVersion != _baseList._version)
+                    throw new InvalidOperationException("InvalidOperation_UnderlyingArrayListChanged");
+            }
+
+
+            public override int Add(Object value) {
+                InternalUpdateRange();
+                _baseList.Insert(_baseIndex + _baseSize, value);
+                _baseVersion++;
+                return _baseSize++;
+            }
+
+            public override void AddRange(ICollection c) {
+                InternalUpdateRange();
+                _baseList.InsertRange(_baseIndex + _baseSize, c);
+                _baseVersion++;
+                _baseSize += c.Count;
+            }
+
+            // Other overloads with automatically work
+            public override int BinarySearch(int index, int count, Object value, IComparer comparer) {
+                InternalUpdateRange();
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                int i = _baseList.BinarySearch(_baseIndex + index, count, value, comparer);
+                if (i >= 0) return i - _baseIndex;
+                return i + _baseIndex;
+            }
+
+            public override int Capacity {
+                get {
+                    return _baseList.Capacity;
+                }
+
+                set {
+                     if (value < Count) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_SmallCapacity");
+                }
+            }
+
+
+            public override void Clear() {
+                InternalUpdateRange();
+                if (_baseSize != 0)
+                {
+                    _baseList.RemoveRange(_baseIndex, _baseSize);
+                    _baseVersion++;
+                    _baseSize = 0;
+                }
+            }
+
+            public override Object Clone() {
+                InternalUpdateRange();
+                Range arrayList = new Range(_baseList,_baseIndex,_baseSize);
+                arrayList._baseList = (ArrayList)_baseList.Clone();
+                return arrayList;
+            }
+
+            public override bool Contains(Object item) {
+              InternalUpdateRange();
+              if (item==null) {
+                    for(int i=0; i<_baseSize; i++)
+                        if (_baseList[_baseIndex + i]==null)
+                            return true;
+                    return false;
+                }
+                else {
+                    for(int i=0; i<_baseSize; i++)
+                        if (item.Equals(_baseList[_baseIndex + i]))
+                            return true;
+                    return false;
+                }
+            }
+
+            public override void CopyTo(Array array, int index) {
+                InternalUpdateRange();
+                if (array==null)
+                    throw new ArgumentNullException("array");
+                if (array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+                if (index < 0)
+                    throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+                if (array.Length - index < _baseSize)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                Array.Copy(_baseList._items, _baseIndex, array, index, _baseSize);
+             }
+
+            public override void CopyTo(int index, Array array, int arrayIndex, int count) {
+                InternalUpdateRange();
+                if (array==null)
+                    throw new ArgumentNullException("array");
+                if (array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (array.Length - arrayIndex < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                Array.Copy(_baseList._items, _baseIndex + index, array, arrayIndex, count);
+            }
+
+            public override int Count {
+                get {
+                 InternalUpdateRange();
+                 return _baseSize;
+                }
+            }
+
+            public override bool IsReadOnly {
+                get { return _baseList.IsReadOnly; }
+            }
+
+            public override bool IsFixedSize {
+                get { return _baseList.IsFixedSize; }
+            }
+
+            public override bool IsSynchronized {
+                get { return _baseList.IsSynchronized; }
+            }
+
+            public override IEnumerator GetEnumerator() {
+                return GetEnumerator(0,_baseSize);
+            }
+
+            public override IEnumerator GetEnumerator(int index, int count) {
+                InternalUpdateRange();
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                return _baseList.GetEnumerator(_baseIndex + index, count);
+            }
+
+            public override ArrayList GetRange(int index, int count) {
+                InternalUpdateRange();
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                return new Range(this, index, count);
+            }
+
+            public override Object SyncRoot {
+                get {
+                    return _baseList.SyncRoot;
+                }
+            }
+
+
+            public override int IndexOf(Object value) {
+                InternalUpdateRange();
+                int i = _baseList.IndexOf(value, _baseIndex, _baseSize);
+                if (i >= 0) return i - _baseIndex;
+                return -1;
+            }
+
+            public override int IndexOf(Object value, int startIndex) {
+                InternalUpdateRange();
+                if (startIndex < 0)
+                    throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_NeedNonNegNum");
+                if (startIndex > _baseSize)
+                    throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+
+                int i = _baseList.IndexOf(value, _baseIndex + startIndex, _baseSize - startIndex);
+                if (i >= 0) return i - _baseIndex;
+                return -1;
+            }
+
+            public override int IndexOf(Object value, int startIndex, int count) {
+                InternalUpdateRange();
+                if (startIndex < 0 || startIndex > _baseSize)
+                    throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+
+                if (count < 0 || (startIndex > _baseSize - count))
+                    throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+
+                int i = _baseList.IndexOf(value, _baseIndex + startIndex, count);
+                if (i >= 0) return i - _baseIndex;
+                return -1;
+            }
+
+            public override void Insert(int index, Object value) {
+                InternalUpdateRange();
+                if (index < 0 || index > _baseSize) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                _baseList.Insert(_baseIndex + index, value);
+                _baseVersion++;
+                _baseSize++;
+            }
+
+            public override void InsertRange(int index, ICollection c) {
+                InternalUpdateRange();
+                if (index < 0 || index > _baseSize) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                _baseList.InsertRange(_baseIndex + index, c);
+                _baseVersion++;
+                _baseSize += c.Count;
+            }
+
+            public override int LastIndexOf(Object value) {
+                InternalUpdateRange();
+                int i = _baseList.LastIndexOf(value, _baseIndex + _baseSize - 1, _baseSize);
+                if (i >= 0) return i - _baseIndex;
+                return -1;
+            }
+
+            public override int LastIndexOf(Object value, int startIndex) {
+                return LastIndexOf(value, startIndex, startIndex + 1);
+            }
+
+            public override int LastIndexOf(Object value, int startIndex, int count) {
+                InternalUpdateRange();
+                if (_baseSize == 0)
+                    return -1;
+
+                if (startIndex >= _baseSize)
+                    throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+                if (startIndex < 0)
+                    throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_NeedNonNegNum");
+
+                int i = _baseList.LastIndexOf(value, _baseIndex + startIndex, count);
+                if (i >= 0) return i - _baseIndex;
+                return -1;
+            }
+
+            // Don't need to override Remove
+
+            public override void RemoveAt(int index) {
+                InternalUpdateRange();
+                if (index < 0 || index >= _baseSize) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                _baseList.RemoveAt(_baseIndex + index);
+                _baseVersion++;
+                _baseSize--;
+            }
+
+            public override void RemoveRange(int index, int count) {
+                InternalUpdateRange();
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                _baseList.RemoveRange(_baseIndex + index, count);
+                _baseVersion++;
+                _baseSize -= count;
+            }
+
+            public override void Reverse(int index, int count) {
+                InternalUpdateRange();
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                _baseList.Reverse(_baseIndex + index, count);
+                _baseVersion++;
+            }
+
+
+            public override void SetRange(int index, ICollection c) {
+                InternalUpdateRange();
+                if (index < 0 || index >= _baseSize) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                _baseList.SetRange(_baseIndex + index, c);
+                _baseVersion++;
+            }
+
+            public override void Sort(int index, int count, IComparer comparer) {
+                InternalUpdateRange();
+                if (index < 0 || count < 0)
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+                if (_baseSize - index < count)
+                    throw new ArgumentException("Argument_InvalidOffLen");
+                _baseList.Sort(_baseIndex + index, count, comparer);
+                _baseVersion++;
+            }
+
+            public override Object this[int index] {
+                get {
+                    InternalUpdateRange();
+                    if (index < 0 || index >= _baseSize) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                        return _baseList[_baseIndex + index];
+                }
+                set {
+                    InternalUpdateRange();
+                    if (index < 0 || index >= _baseSize) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+                    _baseList[_baseIndex + index] = value;
+                    _baseVersion++;
+                }
+            }
+
+            public override Object[] ToArray() {
+                InternalUpdateRange();
+                Object[] array = new Object[_baseSize];
+                Array.Copy(_baseList._items, _baseIndex, array, 0, _baseSize);
+                return array;
+            }
+
+            public override Array ToArray(Type type) {
+                InternalUpdateRange();
+                if (type==null)
+                    throw new ArgumentNullException("type");
+                Array array = Array.CreateInstance(type, _baseSize);
+                Array.Copy(_baseList._items, _baseIndex, array, 0, _baseSize);
+                return array;
+            }
+
+            public override void TrimToSize() {
+                throw new NotSupportedException("NotSupported_RangeCollection");
+            }
+        }
+
+        // For a straightforward enumeration of the entire ArrayList,
+        // this is faster, because it's smaller.  Patrick showed
+        // this with a benchmark.
+        private class ArrayListEnumeratorSimple : IEnumerator, ICloneable
+        {
+            private ArrayList list;
+            private int index;
+            private int version;
+            private Object currentElement;
+
+            internal ArrayListEnumeratorSimple(ArrayList list) {
+                this.list = list;
+                this.index = -1;
+                version = list._version;
+                currentElement = list;
+            }
+
+            public Object Clone() {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                if (version != list._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                if (index < (list.Count-1)) {
+                    index++;
+                    currentElement = list[index];
+                    return true;
+                }
+                else {
+                    currentElement = list;
+                    index = list.Count;
+                }
+                return false;
+
+            }
+
+            public virtual Object Current {
+                get {
+                    Object temp = currentElement;
+                    if (temp == list) {
+                        if (index == -1)
+                            throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                        else
+                            throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    }
+                    return temp;
+                }
+            }
+
+            public virtual void Reset() {
+                if (version != list._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                currentElement = list;
+                index = -1;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/BitArray.cs b/base/Kernel/System/Collections/BitArray.cs
new file mode 100644
index 0000000..e6424ba
--- /dev/null
+++ b/base/Kernel/System/Collections/BitArray.cs
@@ -0,0 +1,493 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: BitArray
+**
+**         Original implementation by Derek Yenzer
+**
+** Purpose: The BitArray class manages a compact array of bit values.
+**
+** Date: October 5, 1999
+**
+=============================================================================*/
+namespace System.Collections {
+    // @Consider: is _ShrinkThreshold (256) ints the correct threshold for shrinking?
+    using System;
+    using System.Diagnostics;
+
+    // A vector of bits.  Use this to store bits efficiently, without having to do bit
+    // shifting yourself.
+    //| <include path='docs/doc[@for="BitArray"]/*' />
+    public sealed class BitArray : ICollection, ICloneable {
+        private BitArray() {
+        }
+
+        /*=========================================================================
+        ** Allocates space to hold length bit values. All of the values in the bit
+        ** array are set to false.
+        **
+        ** Exceptions: ArgumentException if length < 0.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.BitArray"]/*' />
+        public BitArray(int length)
+            : this(length, false) {
+        }
+
+        /*=========================================================================
+        ** Allocates space to hold length bit values. All of the values in the bit
+        ** array are set to defaultValue.
+        **
+        ** Exceptions: ArgumentOutOfRangeException if length < 0.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.BitArray1"]/*' />
+        public BitArray(int length, bool defaultValue) {
+            if (length < 0) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NeedNonNegNum");
+            }
+
+            m_array = new int[(length + 31) / 32];
+            m_length = length;
+
+            int fillValue = defaultValue ? unchecked(((int)0xffffffff)) : 0;
+            for (int i = 0; i < m_array.Length; i++) {
+                m_array[i] = fillValue;
+            }
+
+            _version = 0;
+        }
+
+        /*=========================================================================
+        ** Allocates space to hold the bit values in bytes. bytes[0] represents
+        ** bits 0 - 7, bytes[1] represents bits 8 - 15, etc. The LSB of each byte
+        ** represents the lowest index value; bytes[0] & 1 represents bit 0,
+        ** bytes[0] & 2 represents bit 1, bytes[0] & 4 represents bit 2, etc.
+        **
+        ** Exceptions: ArgumentException if bytes == null.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.BitArray2"]/*' />
+        public BitArray(byte[] bytes) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes");
+            }
+
+            m_array = new int[(bytes.Length + 3) / 4];
+            m_length = bytes.Length * 8;
+
+            int i = 0;
+            int j = 0;
+            while (bytes.Length - j >= 4) {
+                m_array[i++] = (bytes[j] & 0xff) |
+                              ((bytes[j + 1] & 0xff) << 8) |
+                              ((bytes[j + 2] & 0xff) << 16) |
+                              ((bytes[j + 3] & 0xff) << 24);
+                j += 4;
+            }
+
+            Debug.Assert(bytes.Length - j >= 0, "BitArray byteLength problem");
+            Debug.Assert(bytes.Length - j < 4, "BitArray byteLength problem #2");
+
+            switch (bytes.Length - j) {
+                case 3:
+                    m_array[i] = ((bytes[j + 2] & 0xff) << 16);
+                    goto case 2;
+                    // fall through
+                case 2:
+                    m_array[i] |= ((bytes[j + 1] & 0xff) << 8);
+                    goto case 1;
+                    // fall through
+                case 1:
+                    m_array[i] |= (bytes[j] & 0xff);
+            break;
+            }
+
+            _version = 0;
+        }
+
+        //| <include path='docs/doc[@for="BitArray.BitArray3"]/*' />
+        public BitArray(bool[] values) {
+            if (values == null) {
+                throw new ArgumentNullException("values");
+            }
+
+            m_array = new int[(values.Length + 31) / 32];
+            m_length = values.Length;
+
+            for (int i = 0;i<values.Length;i++) {
+                if (values[i])
+                    m_array[i/32] |= (1 << (i%32));
+            }
+
+            _version = 0;
+
+        }
+
+        /*=========================================================================
+        ** Allocates space to hold the bit values in values. values[0] represents
+        ** bits 0 - 31, values[1] represents bits 32 - 63, etc. The LSB of each
+        ** integer represents the lowest index value; values[0] & 1 represents bit
+        ** 0, values[0] & 2 represents bit 1, values[0] & 4 represents bit 2, etc.
+        **
+        ** Exceptions: ArgumentException if values == null.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.BitArray4"]/*' />
+        public BitArray(int[] values) {
+            if (values == null) {
+                throw new ArgumentNullException("values");
+            }
+
+            m_array = new int[values.Length];
+            m_length = values.Length * 32;
+
+            Array.Copy(values, m_array, values.Length);
+
+            _version = 0;
+        }
+
+        /*=========================================================================
+        ** Allocates a new BitArray with the same length and bit values as bits.
+        **
+        ** Exceptions: ArgumentException if bits == null.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.BitArray5"]/*' />
+        public BitArray(BitArray bits) {
+            if (bits == null) {
+                throw new ArgumentNullException("bits");
+            }
+
+            m_array = new int[(bits.m_length + 31) / 32];
+            m_length = bits.m_length;
+
+            Array.Copy(bits.m_array, m_array, (bits.m_length + 31) / 32);
+
+            _version = bits._version;
+        }
+
+        //| <include path='docs/doc[@for="BitArray.this"]/*' />
+        public bool this[int index] {
+                get {
+                    return Get(index);
+                }
+                set {
+                    Set(index,value);
+                }
+         }
+
+        /*=========================================================================
+        ** Returns the bit value at position index.
+        **
+        ** Exceptions: ArgumentOutOfRangeException if index < 0 or
+        **             index >= GetLength().
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.Get"]/*' />
+        public bool Get(int index) {
+            if (index < 0 || index >= m_length) {
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            }
+
+            return (m_array[index / 32] & (1 << (index % 32))) != 0;
+        }
+
+        /*=========================================================================
+        ** Sets the bit value at position index to value.
+        **
+        ** Exceptions: ArgumentOutOfRangeException if index < 0 or
+        **             index >= GetLength().
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.Set"]/*' />
+        public void Set(int index, bool value) {
+            if (index < 0 || index >= m_length) {
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            }
+
+            if (value) {
+                m_array[index / 32] |= (1 << (index % 32));
+            } else {
+                m_array[index / 32] &= ~(1 << (index % 32));
+            }
+
+            _version++;
+        }
+
+        /*=========================================================================
+        ** Sets all the bit values to value.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.SetAll"]/*' />
+        public void SetAll(bool value) {
+            int fillValue = value ? unchecked(((int)0xffffffff)) : 0;
+            int ints = (m_length + 31) / 32;
+            for (int i = 0; i < ints; i++) {
+                m_array[i] = fillValue;
+            }
+
+            _version++;
+        }
+
+        /*=========================================================================
+        ** Returns a reference to the current instance ANDed with value.
+        **
+        ** Exceptions: ArgumentException if value == null or
+        **             value.Length != this.Length.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.And"]/*' />
+        public BitArray And(BitArray value) {
+            if (value==null)
+                throw new ArgumentNullException("value");
+            if (m_length != value.m_length)
+                throw new ArgumentException("Arg_ArrayLengthsDiffer");
+
+            int ints = (m_length + 31) / 32;
+            for (int i = 0; i < ints; i++) {
+                m_array[i] &= value.m_array[i];
+            }
+
+            _version++;
+            return this;
+        }
+
+        /*=========================================================================
+        ** Returns a reference to the current instance ORed with value.
+        **
+        ** Exceptions: ArgumentException if value == null or
+        **             value.Length != this.Length.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.Or"]/*' />
+        public BitArray Or(BitArray value) {
+            if (value==null)
+                throw new ArgumentNullException("value");
+            if (m_length != value.m_length)
+                throw new ArgumentException("Arg_ArrayLengthsDiffer");
+
+            int ints = (m_length + 31) / 32;
+            for (int i = 0; i < ints; i++) {
+                m_array[i] |= value.m_array[i];
+            }
+
+            _version++;
+            return this;
+        }
+
+        /*=========================================================================
+        ** Returns a reference to the current instance XORed with value.
+        **
+        ** Exceptions: ArgumentException if value == null or
+        **             value.Length != this.Length.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.Xor"]/*' />
+        public BitArray Xor(BitArray value) {
+            if (value==null)
+                throw new ArgumentNullException("value");
+            if (m_length != value.m_length)
+                throw new ArgumentException("Arg_ArrayLengthsDiffer");
+
+            int ints = (m_length + 31) / 32;
+            for (int i = 0; i < ints; i++) {
+                m_array[i] ^= value.m_array[i];
+            }
+
+            _version++;
+            return this;
+        }
+
+        /*=========================================================================
+        ** Inverts all the bit values. On/true bit values are converted to
+        ** off/false. Off/false bit values are turned on/true. The current instance
+        ** is updated and returned.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="BitArray.Not"]/*' />
+        public BitArray Not() {
+            int ints = (m_length + 31) / 32;
+            for (int i = 0; i < ints; i++) {
+                m_array[i] = ~m_array[i];
+            }
+
+            _version++;
+            return this;
+        }
+
+
+        //| <include path='docs/doc[@for="BitArray.Length"]/*' />
+        public int Length {
+            get { return m_length; }
+            set {
+                if (value < 0) {
+                    throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NeedNonNegNum");
+                }
+
+                int newints = (value + 31) / 32;
+                if (newints > m_array.Length || newints + _ShrinkThreshold < m_array.Length) {
+                    // grow or shrink (if wasting more than _ShrinkThreshold ints)
+                    int[] newarray = new int[newints];
+                    Array.Copy(m_array, newarray, newints > m_array.Length ? m_array.Length : newints);
+                    m_array = newarray;
+                }
+
+                if (value > m_length) {
+                    // clear high bit values in the last int
+                    int last = ((m_length + 31) / 32) - 1;
+                    int bits = m_length % 32;
+                    if (bits > 0) {
+                        m_array[last] &= (1 << bits) - 1;
+                    }
+
+                    // clear remaining int values
+                    Array.Clear(m_array, last + 1, newints - last - 1);
+                }
+
+                m_length = value;
+                _version++;
+            }
+        }
+
+        // ICollection implementation
+        //| <include path='docs/doc[@for="BitArray.CopyTo"]/*' />
+        public void CopyTo(Array array, int index)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NeedNonNegNum");
+
+            if (array.Rank != 1)
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+
+
+            if (array is int[])
+            {
+                Array.Copy(m_array, 0, array, index, (m_length + 31) / 32);
+            }
+            else if (array is byte[])
+            {
+                if ((array.Length - index) < (m_length + 7)/8)
+                     throw new ArgumentException("Argument_InvalidOffLen");
+
+                byte [] b = (byte[])array;
+                for (int i = 0; i<(m_length + 7)/8;i++)
+                    b[index + i] = (byte)((m_array[i/4] >> ((i%4)*8)) & 0x000000FF); // Shift to bring the required byte to LSB, then mask
+            }
+            else if (array is bool[])
+            {
+                if (array.Length - index < m_length)
+                     throw new ArgumentException("Argument_InvalidOffLen");
+
+                bool [] b = (bool[])array;
+                for (int i = 0;i<m_length;i++)
+                    b[index + i] = ((m_array[i/32] >> (i%32)) & 0x00000001) != 0;
+            }
+            else
+                throw new ArgumentException("Arg_BitArrayTypeUnsupported");
+        }
+
+        //| <include path='docs/doc[@for="BitArray.Count"]/*' />
+        public int Count
+        {
+            get
+            {
+                return m_length;
+            }
+        }
+
+        //| <include path='docs/doc[@for="BitArray.Clone"]/*' />
+        public Object Clone()
+        {
+            BitArray bitArray = new BitArray(m_array);
+            bitArray._version = _version;
+            bitArray.m_length = m_length;
+            return bitArray;
+        }
+
+        //| <include path='docs/doc[@for="BitArray.SyncRoot"]/*' />
+        public Object SyncRoot
+        {
+             get
+             {
+                return this;
+             }
+        }
+
+        //| <include path='docs/doc[@for="BitArray.IsReadOnly"]/*' />
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+
+        //| <include path='docs/doc[@for="BitArray.IsSynchronized"]/*' />
+        public bool IsSynchronized
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        //| <include path='docs/doc[@for="BitArray.GetEnumerator"]/*' />
+        public IEnumerator GetEnumerator()
+        {
+            return new BitArrayEnumeratorSimple(this);
+        }
+
+          // For a straightforward enumeration of the entire ArrayList,
+        // this is faster, because it's smaller.  Patrick showed
+        // this with a benchmark.
+        private class BitArrayEnumeratorSimple : IEnumerator, ICloneable
+        {
+            private BitArray bitarray;
+            private int index;
+            private int version;
+            private bool currentElement;
+
+            internal BitArrayEnumeratorSimple(BitArray bitarray) {
+                this.bitarray = bitarray;
+                this.index = -1;
+                version = bitarray._version;
+            }
+
+            public Object Clone() {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                if (version != bitarray._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                if (index < (bitarray.Count-1)) {
+                    index++;
+                    currentElement = bitarray.Get(index);
+                    return true;
+                }
+                else
+                    index = bitarray.Count;
+
+                return false;
+            }
+
+            public virtual Object Current {
+                get {
+                    if (index == -1)
+                        throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                    if (index >= bitarray.Count)
+                        throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    return currentElement;
+                }
+            }
+
+            public void Reset() {
+                if (version != bitarray._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                index = -1;
+            }
+        }
+
+        private int[] m_array;
+        private int m_length;
+        private int _version;
+
+        private const int _ShrinkThreshold = 256;
+    }
+
+}
diff --git a/base/Kernel/System/Collections/CaseInsensitiveComparer.cs b/base/Kernel/System/Collections/CaseInsensitiveComparer.cs
new file mode 100644
index 0000000..80c85a3
--- /dev/null
+++ b/base/Kernel/System/Collections/CaseInsensitiveComparer.cs
@@ -0,0 +1,54 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: CaseInsensitiveComparer
+**
+**
+** Date: May 17, 2000
+**
+============================================================*/
+namespace System.Collections {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+
+    //| <include path='docs/doc[@for="CaseInsensitiveComparer"]/*' />
+    public class CaseInsensitiveComparer : IComparer {
+        public static readonly CaseInsensitiveComparer Default = new CaseInsensitiveComparer();
+
+        //| <include path='docs/doc[@for="CaseInsensitiveComparer.CaseInsensitiveComparer"]/*' />
+        public CaseInsensitiveComparer() {
+        }
+
+        //| <include path='docs/doc[@for="CaseInsensitiveHashCodeProvider.DefaultInvariant"]/*' />
+        public static CaseInsensitiveComparer DefaultInvariant
+        {
+            get
+            {
+                return Default;
+            }
+        }
+
+        // Behaves exactly like Comparer.Default.Compare except that the comparison is case insensitive
+        // Compares two Objects by calling CompareTo.  If a ==
+        // b,0 is returned.  If a implements
+        // IComparable, a.CompareTo(b) is returned.  If a
+        // doesn't implement IComparable and b does,
+        // -(b.CompareTo(a)) is returned, otherwise an
+        // exception is thrown.
+        //
+        //| <include path='docs/doc[@for="CaseInsensitiveComparer.Compare"]/*' />
+        public int Compare(Object a, Object b) {
+            String sa = a as String;
+            String sb = b as String;
+            if (sa != null && sb != null)
+                return CompareInfo.Compare(sa, sb, CompareOptions.IgnoreCase);
+            else
+                return Comparer.Default.Compare(a,b);
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/CaseInsensitiveHashCodeProvider.cs b/base/Kernel/System/Collections/CaseInsensitiveHashCodeProvider.cs
new file mode 100644
index 0000000..5c9fc35
--- /dev/null
+++ b/base/Kernel/System/Collections/CaseInsensitiveHashCodeProvider.cs
@@ -0,0 +1,57 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: CaseInsensitiveHashCodeProvider
+**
+**
+** Purpose: Designed to support hashtables which require
+** case-insensitive behavior while still maintaining case,
+** this provides an efficient mechanism for getting the
+** hashcode of the string ignoring case.
+**
+** Date: February 13, 2000
+**
+============================================================*/
+namespace System.Collections {
+    using System;
+    using System.Collections;
+    using System.Globalization;
+
+    //| <include path='docs/doc[@for="CaseInsensitiveHashCodeProvider"]/*' />
+    public class CaseInsensitiveHashCodeProvider : IHashCodeProvider {
+
+        public static readonly CaseInsensitiveHashCodeProvider Default
+        = new CaseInsensitiveHashCodeProvider();
+
+        //| <include path='docs/doc[@for="CaseInsensitiveHashCodeProvider.CaseInsensitiveHashCodeProvider"]/*' />
+        public CaseInsensitiveHashCodeProvider() {
+        }
+
+        //| <include path='docs/doc[@for="CaseInsensitiveHashCodeProvider.DefaultInvariant"]/*' />
+        public static CaseInsensitiveHashCodeProvider DefaultInvariant
+        {
+            get
+            {
+                return Default;
+            }
+        }
+
+        //| <include path='docs/doc[@for="CaseInsensitiveHashCodeProvider.GetHashCode"]/*' />
+        public int GetHashCode(Object obj) {
+            if (obj==null) {
+                throw new ArgumentNullException("obj");
+            }
+
+            String s = obj as String;
+            if (s==null) {
+                return obj.GetHashCode();
+            }
+
+            return TextInfo.GetCaseInsensitiveHashCode(s);
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/CollectionBase.cs b/base/Kernel/System/Collections/CollectionBase.cs
new file mode 100644
index 0000000..009f1ab
--- /dev/null
+++ b/base/Kernel/System/Collections/CollectionBase.cs
@@ -0,0 +1,201 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+namespace System.Collections {
+    using System;
+
+    // Useful base class for typed read/write collections where items derive from object
+    //| <include path='docs/doc[@for="CollectionBase"]/*' />
+    public abstract class CollectionBase : IList {
+        ArrayList list;
+
+        //| <include path='docs/doc[@for="CollectionBase.InnerList"]/*' />
+        protected ArrayList InnerList {
+            get {
+                if (list == null)
+                    list = new ArrayList();
+                return list;
+            }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.List"]/*' />
+        protected IList List {
+            get { return (IList)this; }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.Count"]/*' />
+        public int Count {
+            get {
+                return list == null ? 0 : list.Count;
+            }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.Clear"]/*' />
+        public void Clear() {
+            OnClear();
+            InnerList.Clear();
+            OnClearComplete();
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.RemoveAt"]/*' />
+        public void RemoveAt(int index) {
+            if (index < 0 || index >= InnerList.Count)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            Object temp = InnerList[index];
+            OnValidate(temp);
+            OnRemove(index, temp);
+            InnerList.RemoveAt(index);
+            OnRemoveComplete(index, temp);
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.IsReadOnly"]/*' />
+        bool IList.IsReadOnly {
+            get { return InnerList.IsReadOnly; }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.IsFixedSize"]/*' />
+        bool IList.IsFixedSize {
+            get { return InnerList.IsFixedSize; }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.ICollection.IsSynchronized"]/*' />
+        bool ICollection.IsSynchronized {
+            get { return InnerList.IsSynchronized; }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.ICollection.SyncRoot"]/*' />
+        Object ICollection.SyncRoot {
+            get { return InnerList.SyncRoot; }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.ICollection.CopyTo"]/*' />
+        void ICollection.CopyTo(Array array, int index) {
+            InnerList.CopyTo(array, index);
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.this"]/*' />
+        Object IList.this[int index] {
+            get {
+                if (index < 0 || index >= InnerList.Count)
+                    throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+                return InnerList[index];
+            }
+            set {
+                if (index < 0 || index >= InnerList.Count)
+                    throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+                OnValidate(value);
+                Object temp = InnerList[index];
+                OnSet(index, temp, value);
+                InnerList[index] = value;
+                try {
+                    OnSetComplete(index, temp, value);
+                }
+                catch (Exception) {
+                    InnerList[index] = temp;
+                    throw;
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.Contains"]/*' />
+        bool IList.Contains(Object value) {
+            return InnerList.Contains(value);
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.Add"]/*' />
+        int IList.Add(Object value) {
+            OnValidate(value);
+            OnInsert(InnerList.Count, value);
+            int index = InnerList.Add(value);
+            try {
+                OnInsertComplete(index, value);
+            }
+            catch (Exception) {
+                InnerList.RemoveAt(index);
+                throw;
+            }
+            return index;
+        }
+
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.Remove"]/*' />
+        void IList.Remove(Object value) {
+            OnValidate(value);
+            int index = InnerList.IndexOf(value);
+            if (index < 0) throw new ArgumentException("Arg_RemoveArgNotFound");
+            OnRemove(index, value);
+            InnerList.RemoveAt(index);
+            OnRemoveComplete(index, value);
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.IndexOf"]/*' />
+        int IList.IndexOf(Object value) {
+            return InnerList.IndexOf(value);
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.IList.Insert"]/*' />
+        void IList.Insert(int index, Object value) {
+            if (index < 0 || index > InnerList.Count)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Index");
+            OnValidate(value);
+            OnInsert(index, value);
+            InnerList.Insert(index, value);
+            try {
+                OnInsertComplete(index, value);
+            }
+            catch (Exception) {
+                InnerList.RemoveAt(index);
+                throw;
+            }
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.GetEnumerator"]/*' />
+        public IEnumerator GetEnumerator() {
+            return InnerList.GetEnumerator();
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnSet"]/*' />
+        protected virtual void OnSet(int index, Object oldValue, Object newValue) {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnInsert"]/*' />
+        protected virtual void OnInsert(int index, Object value) {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnClear"]/*' />
+        protected virtual void OnClear() {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnRemove"]/*' />
+        protected virtual void OnRemove(int index, Object value) {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnValidate"]/*' />
+        protected virtual void OnValidate(Object value) {
+            if (value == null) throw new ArgumentNullException("value");
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnSetComplete"]/*' />
+        protected virtual void OnSetComplete(int index, Object oldValue, Object newValue) {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnInsertComplete"]/*' />
+        protected virtual void OnInsertComplete(int index, Object value) {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnClearComplete"]/*' />
+        protected virtual void OnClearComplete() {
+        }
+
+        //| <include path='docs/doc[@for="CollectionBase.OnRemoveComplete"]/*' />
+        protected virtual void OnRemoveComplete(int index, Object value) {
+        }
+
+    }
+
+}
diff --git a/base/Kernel/System/Collections/Comparer.cs b/base/Kernel/System/Collections/Comparer.cs
new file mode 100644
index 0000000..9cc3de5
--- /dev/null
+++ b/base/Kernel/System/Collections/Comparer.cs
@@ -0,0 +1,55 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Comparer
+**
+**
+** Purpose: Default IComparer implementation.
+**
+** Date:  October 9, 1999
+**
+===========================================================*/
+namespace System.Collections {
+
+    using System;
+    using System.Globalization;
+    //| <include path='docs/doc[@for="Comparer"]/*' />
+    public sealed class Comparer : IComparer
+    {
+        //| <include path='docs/doc[@for="Comparer.Default"]/*' />
+        public static readonly Comparer Default = new Comparer();
+
+        public Comparer() {
+        }
+
+        // Compares two Objects by calling CompareTo.  If a ==
+        // b,0 is returned.  If a implements
+        // IComparable, a.CompareTo(b) is returned.  If a
+        // doesn't implement IComparable and b does,
+        // -(b.CompareTo(a)) is returned, otherwise an
+        // exception is thrown.
+        //
+        //| <include path='docs/doc[@for="Comparer.Compare"]/*' />
+        public int Compare(Object a, Object b) {
+            if (a == b) return 0;
+            if (a == null) return -1;
+            if (b == null) return 1;
+
+            String sa = a as String;
+            String sb = b as String;
+            if (sa != null && sb != null)
+                return CompareInfo.Compare(sa, sb);
+            IComparable ia = a as IComparable;
+            if (ia != null)
+                return ia.CompareTo(b);
+            IComparable ib = b as IComparable;
+            if (ib != null)
+                return -ib.CompareTo(a);
+            throw new ArgumentException("Argument_ImplementIComparable");
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/DictionaryBase.cs b/base/Kernel/System/Collections/DictionaryBase.cs
new file mode 100644
index 0000000..c423aa4
--- /dev/null
+++ b/base/Kernel/System/Collections/DictionaryBase.cs
@@ -0,0 +1,186 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+namespace System.Collections {
+
+    using System;
+
+    // Useful base class for typed read/write collections where items derive from object
+    //| <include path='docs/doc[@for="DictionaryBase"]/*' />
+    public abstract class DictionaryBase : IDictionary {
+        Hashtable hashtable;
+
+        //| <include path='docs/doc[@for="DictionaryBase.InnerHashtable"]/*' />
+        protected Hashtable InnerHashtable {
+            get {
+                if (hashtable == null)
+                    hashtable = new Hashtable();
+                return hashtable;
+            }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.Dictionary"]/*' />
+        protected IDictionary Dictionary {
+            get { return (IDictionary) this; }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.Count"]/*' />
+        public int Count {
+            // to avoid newing inner list if no items are ever added
+            get { return hashtable == null ? 0 : hashtable.Count; }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.IsReadOnly"]/*' />
+        bool IDictionary.IsReadOnly {
+            get { return InnerHashtable.IsReadOnly; }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.IsFixedSize"]/*' />
+        bool IDictionary.IsFixedSize {
+            get { return InnerHashtable.IsFixedSize; }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.ICollection.IsSynchronized"]/*' />
+        bool ICollection.IsSynchronized {
+            get { return InnerHashtable.IsSynchronized; }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.Keys"]/*' />
+        ICollection IDictionary.Keys {
+            get {
+                return InnerHashtable.Keys;
+            }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.ICollection.SyncRoot"]/*' />
+        Object ICollection.SyncRoot {
+            get { return InnerHashtable.SyncRoot; }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.Values"]/*' />
+        ICollection IDictionary.Values {
+            get {
+                return InnerHashtable.Values;
+            }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.CopyTo"]/*' />
+        public void CopyTo(Array array, int index) {
+            InnerHashtable.CopyTo(array, index);
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.this"]/*' />
+        object IDictionary.this[object key] {
+            get {
+                OnGet(key, InnerHashtable[key]);
+                return InnerHashtable[key];
+            }
+            set {
+                OnValidate(key, value);
+                Object temp = InnerHashtable[key];
+                OnSet(key, temp, value);
+                InnerHashtable[key] = value;
+                try {
+                    OnSetComplete(key, temp, value);
+                }
+                catch (Exception) {
+                   InnerHashtable[key] = temp;
+                   throw;
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.Contains"]/*' />
+        bool IDictionary.Contains(object key) {
+            return InnerHashtable.Contains(key);
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.Add"]/*' />
+        void IDictionary.Add(object key, object value) {
+            OnValidate(key, value);
+            OnInsert(key, value);
+            InnerHashtable.Add(key, value);
+            try {
+                OnInsertComplete(key, value);
+            }
+            catch (Exception) {
+                InnerHashtable.Remove(key);
+                throw;
+            }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.Clear"]/*' />
+        public void Clear() {
+            OnClear();
+            InnerHashtable.Clear();
+            OnClearComplete();
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IDictionary.Remove"]/*' />
+        void IDictionary.Remove(object key) {
+            Object temp = InnerHashtable[key];
+            OnValidate(key, temp);
+            OnRemove(key, temp);
+            InnerHashtable.Remove(key);
+            OnRemoveComplete(key, temp);
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.GetEnumerator"]/*' />
+        public IDictionaryEnumerator GetEnumerator() {
+            return InnerHashtable.GetEnumerator();
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.IEnumerable.GetEnumerator"]/*' />
+        IEnumerator IEnumerable.GetEnumerator() {
+            return InnerHashtable.GetEnumerator();
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnGet"]/*' />
+        protected virtual object OnGet(object key, object currentValue) {
+            return currentValue;
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnSet"]/*' />
+        protected virtual void OnSet(object key, object oldValue, object newValue) {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnInsert"]/*' />
+        protected virtual void OnInsert(object key, object value) {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnClear"]/*' />
+        protected virtual void OnClear() {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnRemove"]/*' />
+        protected virtual void OnRemove(object key, object value) {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnValidate"]/*' />
+        protected virtual void OnValidate(object key, object value) {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnSetComplete"]/*' />
+        protected virtual void OnSetComplete(object key, object oldValue, object newValue) {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnInsertComplete"]/*' />
+        protected virtual void OnInsertComplete(object key, object value) {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnClearComplete"]/*' />
+        protected virtual void OnClearComplete() {
+        }
+
+        //| <include path='docs/doc[@for="DictionaryBase.OnRemoveComplete"]/*' />
+        protected virtual void OnRemoveComplete(object key, object value) {
+        }
+
+    }
+
+}
diff --git a/base/Kernel/System/Collections/DictionaryEntry.cs b/base/Kernel/System/Collections/DictionaryEntry.cs
new file mode 100644
index 0000000..027cc7a
--- /dev/null
+++ b/base/Kernel/System/Collections/DictionaryEntry.cs
@@ -0,0 +1,68 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  DictionaryEntry
+**
+**
+** Purpose: Return Value for IDictionaryEnumerator::GetEntry
+**
+** Date:  September 20, 1999
+**
+===========================================================*/
+namespace System.Collections {
+
+    using System;
+    // A DictionaryEntry holds a key and a value from a dictionary.
+    // It is returned by IDictionaryEnumerator::GetEntry().
+    //| <include path='docs/doc[@for="DictionaryEntry"]/*' />
+    public struct DictionaryEntry
+    {
+        //| <include path='docs/doc[@for="DictionaryEntry._key"]/*' />
+        private Object _key;
+        //| <include path='docs/doc[@for="DictionaryEntry._value"]/*' />
+        private Object _value;
+
+        // Constructs a new DictionaryEnumerator by setting the Key
+        // and Value fields appropriately.
+        //
+        //| <include path='docs/doc[@for="DictionaryEntry.DictionaryEntry"]/*' />
+        public DictionaryEntry(Object key, Object value)
+        {
+            if (key==null)
+                throw new ArgumentNullException("key");
+            _key = key;
+            _value = value;
+        }
+
+        //| <include path='docs/doc[@for="DictionaryEntry.Key"]/*' />
+        public Object Key
+        {
+            get
+            {
+                return _key;
+            }
+
+            set {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+                _key = value;
+            }
+        }
+
+        //| <include path='docs/doc[@for="DictionaryEntry.Value"]/*' />
+        public Object Value
+        {
+            get {
+                return _value;
+            }
+
+            set {
+                _value = value;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/Hashtable.cs b/base/Kernel/System/Collections/Hashtable.cs
new file mode 100644
index 0000000..5580f45
--- /dev/null
+++ b/base/Kernel/System/Collections/Hashtable.cs
@@ -0,0 +1,1188 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Hashtable
+**
+**
+** Purpose: Hash table implementation
+**
+** Date:  September 25, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+
+    // The Hashtable class represents a dictionary of associated keys and
+    // values with constant lookup time.
+    //
+    // Objects used as keys in a hashtable must implement the GetHashCode
+    // and Equals methods (or they can rely on the default implementations
+    // inherited from Object if key equality is simply reference
+    // equality). Furthermore, the GetHashCode and Equals methods of
+    // a key object must produce the same results given the same parameters
+    // for the entire time the key is present in the hashtable. In practical
+    // terms, this means that key objects should be immutable, at least for
+    // the time they are used as keys in a hashtable.
+    //
+    // When entries are added to a hashtable, they are placed into
+    // buckets based on the hashcode of their keys. Subsequent lookups of
+    // keys will use the hashcode of the keys to only search a particular
+    // bucket, thus substantially reducing the number of key comparisons
+    // required to find an entry. A hashtable's maximum load factor, which
+    // can be specified when the hashtable is instantiated, determines the
+    // maximum ratio of hashtable entries to hashtable buckets. Smaller load
+    // factors cause faster average lookup times at the cost of increased
+    // memory consumption. The default maximum load factor of 1.0 generally
+    // provides the best balance between speed and size. As entries are added
+    // to a hashtable, the hashtable's actual load factor increases, and when
+    // the actual load factor reaches the maximum load factor value, the
+    // number of buckets in the hashtable is automatically increased by
+    // approximately a factor of two (to be precise, the number of hashtable
+    // buckets is increased to the smallest prime number that is larger than
+    // twice the current number of hashtable buckets).
+    //
+    // Each object provides their own hash function, accessed by calling
+    // GetHashCode().  However, one can write their own object
+    // implementing IHashCodeProvider and pass it to a constructor on
+    // the Hashtable.  That hash function would be used for all objects in
+    // the table.
+    //
+    // This Hashtable is implemented to support multiple concurrent readers
+    // and one concurrent writer without using any synchronization primitives.
+    // All read methods essentially must protect themselves from a resize
+    // occurring while they are running.  This was done by enforcing an
+    // ordering on inserts & removes, as well as removing some member variables
+    // and special casing the expand code to work in a temporary array instead
+    // of the live bucket array.  All inserts must set a bucket's value and
+    // key before setting the hash code & collision field.  All removes must
+    // clear the hash code & collision field, then the key then value field
+    // (at least value should be set last).
+    //
+    // By Brian Grunkemeyer, algorithm by Patrick Dussud.
+    // Version 1.30 2/20/2000
+    //| <include path='docs/doc[@for="Hashtable"]/*' />
+    [CCtorIsRunDuringStartup]
+    public class Hashtable : IDictionary, ICloneable
+    {
+        /*
+          Implementation Notes:
+
+          This Hashtable uses double hashing.  There are hashsize buckets in
+          the table, and each bucket can contain 0 or 1 element.  We a bit to
+          mark whether there's been a collision when we inserted multiple
+          elements (ie, an inserted item was hashed at least a second time and
+          we probed this bucket, but it was already in use).  Using the
+          collision bit, we can terminate lookups & removes for elements that
+          aren't in the hash table more quickly.  We steal the most
+          significant bit from the hash code to store the collision bit.
+
+          Our hash function is of the following form:
+
+          h(key, n) = h1(key) + n*h2(key)
+
+          where n is the number of times we've hit a collided bucket and
+          rehashed (on this particular lookup).  Here are our hash functions:
+
+          h1(key) = GetHash(key);  // default implementation calls key.GetHashCode();
+          h2(key) = 1 + (((h1(key) >> 5) + 1) % (hashsize - 1));
+
+          The h1 can return any number.  h2 must return a number between 1 and
+          hashsize - 1 that is relatively prime to hashsize (not a problem if
+          hashsize is prime).  (Knuth's Art of Computer Programming, Vol. 3,
+          p. 528-9)
+
+          If this is true, then we are guaranteed to visit every bucket in
+          exactly hashsize probes, since the least common multiple of hashsize
+          and h2(key) will be hashsize * h2(key).  (This is the first number
+          where adding h2 to h1 mod hashsize will be 0 and we will search the
+          same bucket twice).
+
+          We previously used a different h2(key, n) that was not constant.
+          That is a horrifically bad idea, unless you can prove that series
+          will never produce any identical numbers that overlap when you mod
+          them by hashsize, for all subranges from i to i+hashsize, for all i.
+          It's not worth investigating, since there was no clear benefit from
+          using that hash function, and it was broken.
+
+          For efficiency reasons, we've implemented this by storing h1 and h2
+          in a temporary, and setting a variable called seed equal to h1.  We
+          do a probe, and if we collided, we simply add h2 to seed each time
+          through the loop.
+
+          A good test for h2() is to subclass Hashtable, provide your own
+          implementation of GetHash() that returns a constant, then add many
+          items to the hash table.  Make sure Count equals the number of items
+          you inserted.
+
+          Note that when we remove an item from the hash table, we set the key
+          equal to buckets, if there was a collision in this bucket.
+          Otherwise we'd either wipe out the collision bit, or we'd still have
+          an item in the hash table.
+
+          -- Brian Grunkemeyer, 10/28/1999
+        */
+
+        // Table of prime numbers to use as hash table sizes. Each entry is the
+        // smallest prime number larger than twice the previous entry.
+        private readonly static int[] primes = {
+            11,17,23,29,37,47,59,71,89,107,131,163,197,239,293,353,431,521,631,761,919,
+            1103,1327,1597,1931,2333,2801,3371,4049,4861,5839,7013,8419,10103,12143,14591,
+            17519,21023,25229,30293,36353,43627,52361,62851,75431,90523, 108631, 130363,
+            156437, 187751, 225307, 270371, 324449, 389357, 467237, 560689, 672827, 807403,
+            968897, 1162687, 1395263, 1674319, 2009191, 2411033, 2893249, 3471899, 4166287,
+            4999559, 5999471, 7199369
+        };
+
+        private const String LoadFactorName = "LoadFactor";
+        private const String VersionName = "Version";
+        private const String ComparerName = "Comparer";
+        private const String HashCodeProviderName = "HashCodeProvider";
+        private const String HashSizeName = "HashSize";  // Must save buckets.Length
+        private const String KeysName = "Keys";
+        private const String ValuesName = "Values";
+
+        private int GetPrime(int minSize) {
+            if (minSize < 0)
+                throw new ArgumentException("Arg_HTCapacityOverflow");
+            for (int i = 0; i < primes.Length; i++) {
+                int size = primes[i];
+                if (size >= minSize) return size;
+            }
+            return primes[primes.Length-1];
+        }
+
+        // Deleted entries have their key set to buckets
+
+        // The hash table data.
+         // This cannot be serialised
+        private struct bucket {
+            public Object key;
+            public Object val;
+            public int hash_coll;   // Store hash code; sign bit means there was a collision.
+        }
+
+        private bucket[] buckets;
+
+        // The total number of entries in the hash table.
+        private  int count;
+
+        // The total number of collision bits set in the hashtable
+        private int occupancy;
+
+        private  int loadsize;
+        private  int loadFactorPerc;    // 100 = 1.0
+
+        private int version;
+        private ICollection keys;
+        private ICollection values;
+
+        private IHashCodeProvider _hcp;  // An object that can dispense hash codes.
+        private IComparer _comparer;
+
+        //| <include path='docs/doc[@for="Hashtable.hcp"]/*' />
+        protected IHashCodeProvider hcp
+        {
+            get
+            {
+                return _hcp;
+            }
+            set
+            {
+                _hcp = value;
+            }
+        }
+
+
+        //| <include path='docs/doc[@for="Hashtable.comparer"]/*' />
+        protected IComparer comparer
+        {
+            get
+            {
+                return _comparer;
+            }
+            set
+            {
+                _comparer = value;
+            }
+        }
+
+
+        // Constructs a new hashtable. The hashtable is created with an initial
+        // capacity of zero and a load factor of 1.0.
+        //| <include path='docs/doc[@for="Hashtable.Hashtable"]/*' />
+        public Hashtable() : this(0, 100) {
+        }
+
+        // Constructs a new hashtable with the given initial capacity and a load
+        // factor of 1.0. The capacity argument serves as an indication of
+        // the number of entries the hashtable will contain. When this number (or
+        // an approximation) is known, specifying it in the constructor can
+        // eliminate a number of resizing operations that would otherwise be
+        // performed when elements are added to the hashtable.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable1"]/*' />
+        public Hashtable(int capacity) : this(capacity, 100) {
+        }
+
+        //
+        public Hashtable(int capacity, float loadFactor)
+            : this(capacity, (int)(loadFactor * 100), null, null)
+        {
+        }
+
+        //
+        public Hashtable(int capacity, float loadFactor, IHashCodeProvider hcp, IComparer comparer)
+            : this(capacity, (int)(loadFactor * 100), hcp, comparer)
+        {
+        }
+
+        // Constructs a new hashtable with the given initial capacity and load
+        // factor. The capacity argument serves as an indication of the
+        // number of entries the hashtable will contain. When this number (or an
+        // approximation) is known, specifying it in the constructor can eliminate
+        // a number of resizing operations that would otherwise be performed when
+        // elements are added to the hashtable. The loadFactorPerc argument
+        // indicates the maximum ratio of hashtable entries to hashtable buckets.
+        // Smaller load factors cause faster average lookup times at the cost of
+        // increased memory consumption. A load factor of 1.0 generally provides
+        // the best balance between speed and size.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable2"]/*' />
+
+        public Hashtable(int capacity, int loadFactorPerc) : this(capacity, loadFactorPerc, null, null) {
+        }
+
+        // Constructs a new hashtable with the given initial capacity and load
+        // factor. The capacity argument serves as an indication of the
+        // number of entries the hashtable will contain. When this number (or an
+        // approximation) is known, specifying it in the constructor can eliminate
+        // a number of resizing operations that would otherwise be performed when
+        // elements are added to the hashtable. The loadFactorPerc argument
+        // indicates the maximum ratio of hashtable entries to hashtable buckets.
+        // Smaller load factors cause faster average lookup times at the cost of
+        // increased memory consumption. A load factor of 1.0 generally provides
+        // the best balance between speed and size.  The hcp argument
+        // is used to specify an Object that will provide hash codes for all
+        // the Objects in the table.  Using this, you can in effect override
+        // GetHashCode() on each Object using your own hash function.  The
+        // comparer argument will let you specify a custom function for
+        // comparing keys.  By specifying user-defined objects for hcp
+        // and comparer, users could make a hash table using strings
+        // as keys do case-insensitive lookups.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable3"]/*' />
+        public Hashtable(int capacity, int loadFactorPerc, IHashCodeProvider hcp, IComparer comparer) {
+            if (capacity < 0)
+                throw new ArgumentOutOfRangeException("capacity", "ArgumentOutOfRange_NeedNonNegNum");
+            if (!(loadFactorPerc >= 10 && loadFactorPerc <= 100))
+                throw new ArgumentOutOfRangeException("loadFactorPerc", String.Format("ArgumentOutOfRange_HashtableLoadFactor", 10, 100));
+
+            // Based on perf work, .72 is the optimal load factor for this table.
+            this.loadFactorPerc = (loadFactorPerc * 72) / 100;
+
+            int hashsize = GetPrime ((int)(capacity / this.loadFactorPerc));
+            buckets = new bucket[hashsize];
+
+            loadsize = (int)(this.loadFactorPerc * hashsize) / 100;
+            if (loadsize >= hashsize)
+              loadsize = hashsize-1;
+
+            this.hcp = hcp;
+            this.comparer = comparer;
+        }
+
+        // Constructs a new hashtable using a custom hash function
+        // and a custom comparison function for keys.  This will enable scenarios
+        // such as doing lookups with case-insensitive strings.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable4"]/*' />
+        public Hashtable(IHashCodeProvider hcp, IComparer comparer) : this(0, 100, hcp, comparer) {
+        }
+
+        // Constructs a new hashtable using a custom hash function
+        // and a custom comparison function for keys.  This will enable scenarios
+        // such as doing lookups with case-insensitive strings.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable5"]/*' />
+        public Hashtable(int capacity, IHashCodeProvider hcp, IComparer comparer)
+            : this(capacity, 100, hcp, comparer) {
+        }
+
+        // Constructs a new hashtable containing a copy of the entries in the given
+        // dictionary. The hashtable is created with a load factor of 1.0.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable6"]/*' />
+        public Hashtable(IDictionary d) : this(d, 100) {
+        }
+
+        // Constructs a new hashtable containing a copy of the entries in the given
+        // dictionary. The hashtable is created with the given load factor.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Hashtable7"]/*' />
+        public Hashtable(IDictionary d, int loadFactorPerc)
+            : this(d, loadFactorPerc, null, null) {
+        }
+
+        //| <include path='docs/doc[@for="Hashtable.Hashtable8"]/*' />
+        public Hashtable(IDictionary d, IHashCodeProvider hcp, IComparer comparer)
+            : this(d, 100, hcp, comparer)  {
+        }
+
+        //| <include path='docs/doc[@for="Hashtable.Hashtable9"]/*' />
+        public Hashtable(IDictionary d, int loadFactorPerc, IHashCodeProvider hcp, IComparer comparer)
+            : this((d != null ? d.Count : 0), loadFactorPerc, hcp, comparer) {
+            if (d==null)
+                throw new ArgumentNullException("d", "ArgumentNull_Dictionary");
+
+            IDictionaryEnumerator e = d.GetEnumerator();
+            while (e.MoveNext()) Add(e.Key, e.Value);
+        }
+
+        // Computes the hash function:  H(key, i) = h1(key) + i*h2(key, hashSize).
+        // The out parameter seed is h1(key), while the out parameter
+        // incr is h2(key, hashSize).  Callers of this function should
+        // add incr each time through a loop.
+        private uint InitHash(Object key, int hashsize, out uint seed, out uint incr) {
+            // Hashcode must be positive.  Also, we must not use the sign bit, since
+            // that is used for the collision bit.
+            uint hashcode = (uint) GetHash(key) & 0x7FFFFFFF;
+            seed = (uint) hashcode;
+            // Restriction: incr MUST be between 1 and hashsize - 1, inclusive for
+            // the modular arithmetic to work correctly.  This guarantees you'll
+            // visit every bucket in the table exactly once within hashsize
+            // iterations.  Violate this and it'll cause obscure bugs forever.
+            // If you change this calculation for h2(key), update putEntry too!
+            incr = (uint)(1 + (((seed >> 5) + 1) % ((uint)hashsize - 1)));
+            return hashcode;
+        }
+
+        // Adds an entry with the given key and value to this hashtable. An
+        // ArgumentException is thrown if the key is null or if the key is already
+        // present in the hashtable.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Add"]/*' />
+        public virtual void Add(Object key, Object value) {
+            Insert(key, value, true);
+        }
+
+        // Removes all entries from this hashtable.
+        //| <include path='docs/doc[@for="Hashtable.Clear"]/*' />
+        public virtual void Clear() {
+          if (count == 0)
+            return;
+
+          for (int i = 0; i < buckets.Length; i++){
+            buckets[i].hash_coll = 0;
+            buckets[i].key = null;
+            buckets[i].val = null;
+          }
+
+          count = 0;
+          occupancy = 0;
+        }
+
+        // Clone returns a virtually identical copy of this hash table.  This does
+        // a shallow copy - the Objects in the table aren't cloned, only the references
+        // to those Objects.
+        //| <include path='docs/doc[@for="Hashtable.Clone"]/*' />
+        public virtual Object Clone()
+        {
+            bucket[] lbuckets = buckets;
+            Hashtable ht = new Hashtable(count,hcp,comparer);
+            ht.version = version;
+            ht.loadFactorPerc = loadFactorPerc;
+            ht.count = 0;
+
+            int bucket = lbuckets.Length;
+            while (bucket > 0) {
+                    bucket--;
+                    Object keyv = lbuckets[bucket].key;
+                    if ((keyv!= null) && (keyv != lbuckets)) {
+                        ht[keyv] = lbuckets[bucket].val;
+                  }
+            }
+
+            return ht;
+        }
+
+        // Checks if this hashtable contains the given key.
+        //| <include path='docs/doc[@for="Hashtable.Contains"]/*' />
+        public virtual bool Contains(Object key) {
+            return ContainsKey(key);
+        }
+
+        // Checks if this hashtable contains an entry with the given key.  This is
+        // an O(1) operation.
+        //
+        //| <include path='docs/doc[@for="Hashtable.ContainsKey"]/*' />
+        public virtual bool ContainsKey(Object key) {
+            if (key == null) {
+                throw new ArgumentNullException("key", "ArgumentNull_Key");
+            }
+
+            uint seed;
+            uint incr;
+            // Take a snapshot of buckets, in case another thread resizes table
+            bucket[] lbuckets = buckets;
+            uint hashcode = InitHash(key, lbuckets.Length, out seed, out incr);
+            int  ntry = 0;
+
+            bucket b;
+            do {
+                int bucketNumber = (int) (seed % (uint)lbuckets.Length);
+                b = lbuckets[bucketNumber];
+                if (b.key == null) {
+                    return false;
+                }
+                if (((b.hash_coll &  0x7FFFFFFF) == hashcode) &&
+                    KeyEquals (b.key, key))
+                    return true;
+                seed += incr;
+            } while (b.hash_coll < 0 && ++ntry < lbuckets.Length);
+            return false;
+        }
+
+
+
+        // Checks if this hashtable contains an entry with the given value. The
+        // values of the entries of the hashtable are compared to the given value
+        // using the Object.Equals method. This method performs a linear
+        // search and is thus be substantially slower than the ContainsKey
+        // method.
+        //
+        //| <include path='docs/doc[@for="Hashtable.ContainsValue"]/*' />
+        public virtual bool ContainsValue(Object value) {
+            if (value == null) {
+                for (int i = buckets.Length; --i >= 0;) {
+                  if (buckets[i].key != null && buckets[i].val == null)
+                    return true;
+                }
+            }
+            else {
+              for (int i = buckets.Length; --i >= 0;) {
+                  Object val = buckets[i].val;
+                  if (val!=null && value.Equals(val)) return true;
+              }
+            }
+            return false;
+        }
+
+        // Copies the keys of this hashtable to a given array starting at a given
+        // index. This method is used by the implementation of the CopyTo method in
+        // the KeyCollection class.
+        private void CopyKeys(Array array, int arrayIndex) {
+            bucket[] lbuckets = buckets;
+            for (int i = lbuckets.Length; --i >= 0;) {
+              Object keyv = lbuckets[i].key;
+              if ((keyv != null) && (keyv != buckets)){
+                array.SetValue(keyv, arrayIndex++);
+              }
+            }
+        }
+
+        // Copies the keys of this hashtable to a given array starting at a given
+        // index. This method is used by the implementation of the CopyTo method in
+        // the KeyCollection class.
+        private void CopyEntries(Array array, int arrayIndex) {
+            bucket[] lbuckets = buckets;
+            for (int i = lbuckets.Length; --i >= 0;) {
+              Object keyv = lbuckets[i].key;
+              if ((keyv != null) && (keyv != buckets)){
+                DictionaryEntry entry = new DictionaryEntry(keyv,lbuckets[i].val);
+                array.SetValue(entry, arrayIndex++);
+              }
+            }
+        }
+
+        // Copies the values in this hash table to an array at
+        // a given index.  Note that this only copies values, and not keys.
+        //| <include path='docs/doc[@for="Hashtable.CopyTo"]/*' />
+        public virtual void CopyTo(Array array, int arrayIndex)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array", "ArgumentNull_Array");
+            if (array.Rank != 1)
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            if (arrayIndex < 0)
+                throw new ArgumentOutOfRangeException("arrayIndex", "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - arrayIndex < count)
+                throw new ArgumentException("Arg_ArrayPlusOffTooSmall");
+            CopyEntries(array, arrayIndex);
+        }
+
+        // Copies the values of this hashtable to a given array starting at a given
+        // index. This method is used by the implementation of the CopyTo method in
+        // the ValueCollection class.
+        private void CopyValues(Array array, int arrayIndex) {
+            bucket[] lbuckets = buckets;
+            for (int i = lbuckets.Length; --i >= 0;) {
+                Object keyv = lbuckets[i].key;
+                if ((keyv != null) && (keyv != buckets)){
+                    array.SetValue(lbuckets[i].val, arrayIndex++);
+                }
+            }
+        }
+
+        // Returns the value associated with the given key. If an entry with the
+        // given key is not found, the returned value is null.
+        //
+        //| <include path='docs/doc[@for="Hashtable.this"]/*' />
+        public virtual Object this[Object key] {
+          get {
+            if (key == null) {
+              throw new ArgumentNullException("key", "ArgumentNull_Key");
+            }
+            uint seed;
+            uint incr;
+            // Take a snapshot of buckets, in case another thread does a resize
+            bucket[] lbuckets = buckets;
+            uint hashcode = InitHash(key, lbuckets.Length, out seed, out incr);
+            int  ntry = 0;
+
+            bucket b;
+            do
+              {
+                int bucketNumber = (int) (seed % (uint)lbuckets.Length);
+                b = lbuckets[bucketNumber];
+                if (b.key == null) {
+                  return null;
+                }
+                if (((b.hash_coll & 0x7FFFFFFF) == hashcode) &&
+                    KeyEquals (key, b.key))
+                  return b.val;
+                seed += incr;
+              }while (b.hash_coll < 0 && ++ntry < lbuckets.Length);
+            return null;
+          }
+          set {
+            Insert(key, value, false);
+          }
+        }
+
+        // Increases the bucket count of this hashtable. This method is called from
+        // the Insert method when the actual load factor of the hashtable reaches
+        // the upper limit specified when the hashtable was constructed. The number
+        // of buckets in the hashtable is increased to the smallest prime number
+        // that is larger than twice the current number of buckets, and the entries
+        // in the hashtable are redistributed into the new buckets using the cached
+        // hashcodes.
+        private void expand()  {
+            rehash( GetPrime( 1+buckets.Length*2 ) );
+        }
+
+        // We occasionally need to rehash the table to clean up the collision bits.
+        private void rehash() {
+            rehash( buckets.Length );
+        }
+
+        private void rehash( int newsize ) {
+
+            // reset occupancy
+            occupancy=0;
+
+            // Don't replace any internal state until we've finished adding to the
+            // new bucket[].  This serves two purposes:
+            //   1) Allow concurrent readers to see valid hashtable contents
+            //      at all times
+            //   2) Protect against an OutOfMemoryException while allocating this
+            //      new bucket[].
+            bucket[] newBuckets = new bucket[newsize];
+
+            // rehash table into new buckets
+            int nb;
+            for (nb = 0; nb < buckets.Length; nb++){
+                bucket oldb = buckets[nb];
+                if ((oldb.key != null) && (oldb.key != buckets)){
+                    putEntry(newBuckets, oldb.key, oldb.val, oldb.hash_coll & 0x7FFFFFFF);
+                }
+            }
+
+            // New bucket[] is good to go - replace buckets and other internal state.
+            version++;
+            buckets = newBuckets;
+            loadsize = (int)(loadFactorPerc * newsize) / 100;
+
+            if (loadsize >= newsize) {
+                loadsize = newsize-1;
+            }
+
+            return;
+        }
+
+        // Returns an enumerator for this hashtable.
+        // If modifications made to the hashtable while an enumeration is
+        // in progress, the MoveNext and Current methods of the
+        // enumerator will throw an exception.
+        //
+        //| <include path='docs/doc[@for="Hashtable.IEnumerable.GetEnumerator"]/*' />
+        IEnumerator IEnumerable.GetEnumerator() {
+            return new HashtableEnumerator(this, HashtableEnumerator.DictEntry);
+        }
+
+        // Returns a dictionary enumerator for this hashtable.
+        // If modifications made to the hashtable while an enumeration is
+        // in progress, the MoveNext and Current methods of the
+        // enumerator will throw an exception.
+        //
+        //| <include path='docs/doc[@for="Hashtable.GetEnumerator"]/*' />
+        public virtual IDictionaryEnumerator GetEnumerator() {
+            return new HashtableEnumerator(this, HashtableEnumerator.DictEntry);
+        }
+
+        // Internal method to get the hash code for an Object.  This will call
+        // GetHashCode() on each object if you haven't provided an IHashCodeProvider
+        // instance.  Otherwise, it calls hcp.GetHashCode(obj).
+        //| <include path='docs/doc[@for="Hashtable.GetHash"]/*' />
+        protected virtual int GetHash(Object key)
+        {
+            if (hcp!=null)
+                return hcp.GetHashCode(key);
+            return key.GetHashCode();
+        }
+
+        // Is this Hashtable read-only?
+        //| <include path='docs/doc[@for="Hashtable.IsReadOnly"]/*' />
+        public virtual bool IsReadOnly {
+            get { return false; }
+        }
+
+        //| <include path='docs/doc[@for="Hashtable.IsFixedSize"]/*' />
+        public virtual bool IsFixedSize {
+            get { return false; }
+        }
+
+        // Is this Hashtable synchronized?  See SyncRoot property
+        //| <include path='docs/doc[@for="Hashtable.IsSynchronized"]/*' />
+        public virtual bool IsSynchronized {
+            get { return false; }
+        }
+
+        // Internal method to compare two keys.  If you have provided an IComparer
+        // instance in the constructor, this method will call comparer.Compare(item, key).
+        // Otherwise, it will call item.Equals(key).
+        //
+        //| <include path='docs/doc[@for="Hashtable.KeyEquals"]/*' />
+        protected virtual bool KeyEquals(Object item, Object key)
+        {
+            if (comparer!=null)
+                return comparer.Compare(item, key)==0;
+            return item.Equals(key);
+        }
+
+        // Returns a collection representing the keys of this hashtable. The order
+        // in which the returned collection represents the keys is unspecified, but
+        // it is guaranteed to be          buckets = newBuckets; the same order in which a collection returned by
+        // GetValues represents the values of the hashtable.
+        //
+        // The returned collection is live in the sense that any changes
+        // to the hash table are reflected in this collection.  It is not
+        // a static copy of all the keys in the hash table.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Keys"]/*' />
+        public virtual ICollection Keys {
+            get {
+                if (keys == null) keys = new KeyCollection(this);
+                return keys;
+            }
+        }
+
+        // Returns a collection representing the values of this hashtable. The
+        // order in which the returned collection represents the values is
+        // unspecified, but it is guaranteed to be the same order in which a
+        // collection returned by GetKeys represents the keys of the
+        // hashtable.
+        //
+        // The returned collection is live in the sense that any changes
+        // to the hash table are reflected in this collection.  It is not
+        // a static copy of all the keys in the hash table.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Values"]/*' />
+        public virtual ICollection Values {
+            get {
+                if (values == null) values = new ValueCollection(this);
+                return values;
+            }
+        }
+
+        // Inserts an entry into this hashtable. This method is called from the Set
+        // and Add methods. If the add parameter is true and the given key already
+        // exists in the hashtable, an exception is thrown.
+        private void Insert (Object key, Object nvalue, bool add) {
+            if (key == null) {
+                throw new ArgumentNullException("key", "ArgumentNull_Key");
+            }
+            if (count >= loadsize) {
+                expand();
+            }
+            else if(occupancy > loadsize && count > 100) {
+                rehash();
+            }
+
+            uint seed;
+            uint incr;
+            // Assume we only have one thread writing concurrently.  Modify
+            // buckets to contain new data, as long as we insert in the right order.
+            uint hashcode = InitHash(key, buckets.Length, out seed, out incr);
+            int  ntry = 0;
+            int emptySlotNumber = -1; // We use the empty slot number to cache the first empty slot. We chose to reuse slots
+                                      // create by remove that have the collision bit set over using up new slots.
+
+            do {
+                int bucketNumber = (int) (seed % (uint)buckets.Length);
+
+                // Set emptySlot number to current bucket if it is the first available bucket that we have seen
+                // that once contained an entry and also has had a collision.
+                // We need to search this entire collision chain because we have to ensure that there are no
+                // duplicate entries in the table.
+                if (emptySlotNumber == -1 && (buckets[bucketNumber].key == buckets) && (buckets[bucketNumber].hash_coll < 0))//(((buckets[bucketNumber].hash_coll & unchecked(0x80000000))!=0)))
+                    emptySlotNumber = bucketNumber;
+
+                // Insert the key/value pair into this bucket if this bucket is empty and has never contained an entry
+                // OR
+                // This bucket once contained an entry but there has never been a collision
+                if ((buckets[bucketNumber].key == null) ||
+                    (buckets[bucketNumber].key == buckets && ((buckets[bucketNumber].hash_coll & unchecked(0x80000000))==0))) {
+
+                    // If we have found an available bucket that has never had a collision, but we've seen an available
+                    // bucket in the past that has the collision bit set, use the previous bucket instead
+                    if (emptySlotNumber != -1) // Reuse slot
+                        bucketNumber = emptySlotNumber;
+
+                    // We pretty much have to insert in this order.  Don't set hash
+                    // code until the value & key are set appropriately.
+                    buckets[bucketNumber].val = nvalue;
+                    buckets[bucketNumber].key  = key;
+                    buckets[bucketNumber].hash_coll |= (int) hashcode;
+                    count++;
+                    version++;
+                    return;
+                }
+
+                // The current bucket is in use
+                // OR
+                // it is available, but has had the collision bit set and we have already found an available bucket
+                if (((buckets[bucketNumber].hash_coll & 0x7FFFFFFF) == hashcode) &&
+                    KeyEquals (key, buckets[bucketNumber].key)) {
+                    if (add) {
+                        throw new ArgumentException("Argument_AddingDuplicate__" + buckets[bucketNumber].key);
+                    }
+                    buckets[bucketNumber].val = nvalue;
+                    version++;
+                    return;
+                }
+
+                // The current bucket is full, and we have therefore collided.  We need to set the collision bit
+                // UNLESS
+                // we have remembered an available slot previously.
+                if (emptySlotNumber == -1) {// We don't need to set the collision bit here since we already have an empty slot
+                    if( buckets[bucketNumber].hash_coll >= 0 ) {
+                        buckets[bucketNumber].hash_coll |= unchecked((int)0x80000000);
+                        occupancy++;
+                    }
+                }
+                seed += incr;
+            } while (++ntry < buckets.Length);
+
+            // This code is here if and only if there were no buckets without a collision bit set in the entire table
+            if (emptySlotNumber != -1)
+            {
+                    // We pretty much have to insert in this order.  Don't set hash
+                    // code until the value & key are set appropriately.
+                    buckets[emptySlotNumber].val = nvalue;
+                    buckets[emptySlotNumber].key  = key;
+                    buckets[emptySlotNumber].hash_coll |= (int) hashcode;
+                    count++;
+                    version++;
+                    return;
+
+            }
+
+            // If you see this assert, make sure load factor & count are reasonable.
+            // Then verify that our double hash function (h2, described at top of file)
+            // meets the requirements described above. You should never see this assert.
+            Debug.Assert(false, "hash table insert failed!  Load factor too high, or our double hashing function is incorrect.");
+            throw new InvalidOperationException("InvalidOperation_HashInsertFailed");
+        }
+
+        private void putEntry (bucket[] newBuckets, Object key, Object nvalue, int hashcode)
+        {
+            Debug.Assert(hashcode >= 0, "hashcode >= 0");  // make sure collision bit (sign bit) wasn't set.
+
+            uint seed = (uint) hashcode;
+            uint incr = (uint)(1 + (((seed >> 5) + 1) % ((uint)newBuckets.Length - 1)));
+
+            do {
+                int bucketNumber = (int) (seed % (uint)newBuckets.Length);
+
+                if ((newBuckets[bucketNumber].key == null) || (newBuckets[bucketNumber].key == buckets)) {
+                    newBuckets[bucketNumber].val = nvalue;
+                    newBuckets[bucketNumber].key = key;
+                    newBuckets[bucketNumber].hash_coll |= hashcode;
+                    return;
+                }
+
+                if( newBuckets[bucketNumber].hash_coll >= 0 ) {
+                    newBuckets[bucketNumber].hash_coll |= unchecked((int)0x80000000);
+                    occupancy++;
+                }
+                seed += incr;
+            } while( true );
+        }
+
+        // Removes an entry from this hashtable. If an entry with the specified
+        // key exists in the hashtable, it is removed. An ArgumentException is
+        // thrown if the key is null.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Remove"]/*' />
+        public virtual void Remove(Object key) {
+            if (key == null) {
+                throw new ArgumentNullException("key", "ArgumentNull_Key");
+            }
+            uint seed;
+            uint incr;
+            // Assuming only one concurrent writer, write directly into buckets.
+            uint hashcode = InitHash(key, buckets.Length, out seed, out incr);
+            int ntry = 0;
+
+            bucket b;
+            int bn; // bucketNumber
+            do {
+                bn = (int) (seed % (uint)buckets.Length);  // bucketNumber
+                b = buckets[bn];
+                if (((b.hash_coll & 0x7FFFFFFF) == hashcode) &&
+                    KeyEquals (key, b.key)) {
+                    // Clear hash_coll field, then key, then value
+                    buckets[bn].hash_coll &= unchecked((int)0x80000000);
+                    if (buckets[bn].hash_coll != 0) {
+                        buckets[bn].key = buckets;
+                    }
+                    else {
+                        buckets[bn].key = null;
+                    }
+                    buckets[bn].val = null;  // Free object references sooner & simplify ContainsValue.
+                    count--;
+                    version++;
+                    return;
+                }
+                seed += incr;
+            } while (buckets[bn].hash_coll < 0 && ++ntry < buckets.Length);
+
+        //throw new ArgumentException("Arg_RemoveArgNotFound");
+        }
+
+        // Returns the object to synchronize on for this hash table.
+        //| <include path='docs/doc[@for="Hashtable.SyncRoot"]/*' />
+        public virtual Object SyncRoot {
+            get { return this; }
+        }
+
+        // Returns the number of associations in this hashtable.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Count"]/*' />
+        public virtual int Count {
+            get { return count; }
+        }
+
+        // Returns a thread-safe wrapper for a Hashtable.
+        //
+        //| <include path='docs/doc[@for="Hashtable.Synchronized"]/*' />
+        public static Hashtable Synchronized(Hashtable table) {
+            if (table==null)
+                throw new ArgumentNullException("table");
+            return new SyncHashtable(table);
+        }
+
+        // Implements a Collection for the keys of a hashtable. An instance of this
+        // class is created by the GetKeys method of a hashtable.
+        private class KeyCollection : ICollection
+        {
+            private Hashtable _hashtable;
+
+            internal KeyCollection(Hashtable hashtable) {
+                _hashtable = hashtable;
+            }
+
+            public virtual void CopyTo(Array array, int arrayIndex) {
+                if (array==null)
+                    throw new ArgumentNullException("array");
+                if (array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+                if (arrayIndex < 0)
+                    throw new ArgumentOutOfRangeException("arrayIndex", "ArgumentOutOfRange_NeedNonNegNum");
+                if (array.Length - arrayIndex < _hashtable.count)
+                    throw new ArgumentException("Arg_ArrayPlusOffTooSmall");
+                _hashtable.CopyKeys(array, arrayIndex);
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                return new HashtableEnumerator(_hashtable, HashtableEnumerator.Keys);
+            }
+
+            public virtual bool IsReadOnly {
+                get { return true; }
+            }
+
+            public virtual bool IsSynchronized {
+                get { return _hashtable.IsSynchronized; }
+            }
+
+            public virtual Object SyncRoot {
+                get { return _hashtable.SyncRoot; }
+            }
+
+            public virtual int Count {
+                get { return _hashtable.count; }
+            }
+        }
+
+        // Implements a Collection for the values of a hashtable. An instance of
+        // this class is created by the GetValues method of a hashtable.
+        private class ValueCollection : ICollection
+        {
+            private Hashtable _hashtable;
+
+            internal ValueCollection(Hashtable hashtable) {
+                _hashtable = hashtable;
+            }
+
+            public virtual void CopyTo(Array array, int arrayIndex) {
+                if (array==null)
+                    throw new ArgumentNullException("array");
+                if (array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+                if (arrayIndex < 0)
+                    throw new ArgumentOutOfRangeException("arrayIndex", "ArgumentOutOfRange_NeedNonNegNum");
+                if (array.Length - arrayIndex < _hashtable.count)
+                    throw new ArgumentException("Arg_ArrayPlusOffTooSmall");
+                _hashtable.CopyValues(array, arrayIndex);
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                return new HashtableEnumerator(_hashtable, HashtableEnumerator.Values);
+            }
+
+            public virtual bool IsReadOnly {
+                get { return true; }
+            }
+
+            public virtual bool IsSynchronized {
+                get { return _hashtable.IsSynchronized; }
+            }
+
+            public virtual Object SyncRoot {
+                get { return _hashtable.SyncRoot; }
+            }
+
+            public virtual int Count {
+                get { return _hashtable.count; }
+            }
+        }
+
+        // Synchronized wrapper for hashtable
+        private class SyncHashtable : Hashtable
+        {
+            protected Hashtable _table;
+
+            internal SyncHashtable(Hashtable table) {
+                _table = table;
+            }
+
+            public override int Count {
+                get { return _table.Count; }
+            }
+
+            public override bool IsReadOnly {
+                get { return _table.IsReadOnly; }
+            }
+
+            public override bool IsFixedSize {
+                get { return _table.IsFixedSize; }
+            }
+
+            public override bool IsSynchronized {
+                get { return true; }
+            }
+
+            public override Object this[Object key] {
+                get {
+                        return _table[key];
+                }
+                set {
+                    lock (_table.SyncRoot) {
+                        _table[key] = value;
+                    }
+                }
+            }
+
+            public override Object SyncRoot {
+                get { return _table.SyncRoot; }
+            }
+
+            public override void Add(Object key, Object value) {
+                lock (_table.SyncRoot) {
+                    _table.Add(key, value);
+                }
+            }
+
+            public override void Clear() {
+                lock (_table.SyncRoot) {
+                    _table.Clear();
+                }
+            }
+
+            public override bool Contains(Object key) {
+                return _table.Contains(key);
+            }
+
+            public override bool ContainsKey(Object key) {
+                return _table.ContainsKey(key);
+            }
+
+            public override bool ContainsValue(Object key) {
+                return _table.ContainsValue(key);
+            }
+
+            public override void CopyTo(Array array, int arrayIndex) {
+                _table.CopyTo(array, arrayIndex);
+            }
+
+            public override Object Clone() {
+                lock (_table.SyncRoot) {
+                    return Hashtable.Synchronized((Hashtable)_table.Clone());
+                }
+            }
+
+            public override IDictionaryEnumerator GetEnumerator() {
+                return _table.GetEnumerator();
+            }
+
+            protected override int GetHash(Object key) {
+                return _table.GetHash(key);
+            }
+
+            protected override bool KeyEquals(Object item, Object key) {
+                return _table.KeyEquals(item, key);
+            }
+
+            public override ICollection Keys {
+                get {
+                    lock (_table.SyncRoot) {
+                        return _table.Keys;
+                    }
+                }
+            }
+
+            public override ICollection Values {
+                get {
+                    lock (_table.SyncRoot) {
+                        return _table.Values;
+                    }
+                }
+            }
+
+            public override void Remove(Object key) {
+                lock (_table.SyncRoot) {
+                    _table.Remove(key);
+                }
+            }
+        }
+
+
+        // Implements an enumerator for a hashtable. The enumerator uses the
+        // internal version number of the hashtable to ensure that no modifications
+        // are made to the hashtable while an enumeration is in progress.
+        private class HashtableEnumerator : IDictionaryEnumerator, ICloneable
+        {
+            private Hashtable hashtable;
+            private int bucket;
+            private int version;
+            private bool current;
+            private int getObjectRetType;   // What should GetObject return?
+            private Object currentKey;
+            private Object currentValue;
+
+            internal const int Keys = 1;
+            internal const int Values = 2;
+            internal const int DictEntry = 3;
+
+            internal HashtableEnumerator(Hashtable hashtable, int getObjRetType) {
+                this.hashtable = hashtable;
+                bucket = hashtable.buckets.Length;
+                version = hashtable.version;
+                current = false;
+                getObjectRetType = getObjRetType;
+            }
+
+            public Object Clone() {
+                return MemberwiseClone();
+            }
+
+            public virtual Object Key {
+                get {
+                    if (version != hashtable.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                    return currentKey;
+                }
+            }
+
+            public virtual bool MoveNext() {
+                if (version != hashtable.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                while (bucket > 0) {
+                    bucket--;
+                    Object keyv = hashtable.buckets[bucket].key;
+                    if ((keyv!= null) && (keyv != hashtable.buckets)) {
+                        currentKey = keyv;
+                        currentValue = hashtable.buckets[bucket].val;
+                        current = true;
+                        return true;
+                    }
+                }
+                current = false;
+                return false;
+            }
+
+            public virtual DictionaryEntry Entry {
+                get {
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+                    return new DictionaryEntry(currentKey, currentValue);
+                }
+            }
+
+
+            public virtual Object Current {
+                get {
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+
+                    if (getObjectRetType==Keys)
+                        return currentKey;
+                    else if (getObjectRetType==Values)
+                        return currentValue;
+                    else
+                        return new DictionaryEntry(currentKey, currentValue);
+                }
+            }
+
+            public virtual Object Value {
+                get {
+                    if (version != hashtable.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+                    return currentValue;
+                }
+            }
+
+            public virtual void Reset() {
+                if (version != hashtable.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                current = false;
+                bucket = hashtable.buckets.Length;
+                currentKey = null;
+                currentValue = null;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/ICollection.cs b/base/Kernel/System/Collections/ICollection.cs
new file mode 100644
index 0000000..22f1531
--- /dev/null
+++ b/base/Kernel/System/Collections/ICollection.cs
@@ -0,0 +1,69 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  ICollection
+**
+**
+** Purpose: Base interface for all collections.
+**
+** Date:  June 11, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+
+    // Base interface for all collections, defining enumerators, size, and
+    // synchronization methods.
+    //| <include path='docs/doc[@for="ICollection"]/*' />
+    public interface ICollection : IEnumerable
+    {
+        // CopyTo copies a collection into an Array, starting at a particular
+        // index into the array.
+        //
+        //| <include path='docs/doc[@for="ICollection.CopyTo"]/*' />
+        void CopyTo(Array array, int index);
+
+        // Number of items in the collections.
+        //| <include path='docs/doc[@for="ICollection.Count"]/*' />
+        int Count
+        { get; }
+
+
+        // SyncRoot will return an Object to use for synchronization (thread safety).
+        // In the absence of a GetSynchronized() method on a collection,
+        // the expected usage for SyncRoot would look like this:
+        //
+        //
+        // ICollection col = ...
+        // synchronized (col.SyncRoot) {
+        //     // Some operation on the collection, which is now thread safe.
+        // }
+        //
+        //
+        // The system-provided collections have a method called GetSynchronized()
+        // which will create a synchronized wrapper for the collection.  All access
+        // to the collection that you want to be thread-safe should go through that
+        // wrapper collection.
+        //
+        // For collections with no publicly available underlying store, the expected
+        // implementation is to simply return this.  Note that the this
+        // pointer may not be sufficient for collections that wrap other collections;
+        // those should return the underlying collection's SyncRoot property.
+        //| <include path='docs/doc[@for="ICollection.SyncRoot"]/*' />
+        Object SyncRoot
+        { get; }
+
+        // Is this collection synchronized (i.e., thread-safe)?  If you want a synchronized
+        // collection, you can use SyncRoot as an object to synchronize your collection with.
+        // If you're using one of the collections in System.Collections, you could call
+        // GetSynchronized() to get a synchronized wrapper around the underlying
+        // collection.
+        //| <include path='docs/doc[@for="ICollection.IsSynchronized"]/*' />
+        bool IsSynchronized
+        { get; }
+    }
+}
diff --git a/base/Kernel/System/Collections/IComparer.cs b/base/Kernel/System/Collections/IComparer.cs
new file mode 100644
index 0000000..e9a195d
--- /dev/null
+++ b/base/Kernel/System/Collections/IComparer.cs
@@ -0,0 +1,32 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IComparer
+**
+**
+** Purpose: Interface for comparing two Objects.
+**
+** Date:  September 25, 1999
+**
+===========================================================*/
+namespace System.Collections {
+
+    using System;
+    // The IComparer interface implements a method that compares two objects. It is
+    // used in conjunction with the Sort and BinarySearch methods on
+    // the Array and List classes.
+    //
+    //| <include path='docs/doc[@for="IComparer"]/*' />
+    public interface IComparer {
+        // Compares two objects. An implementation of this method must return a
+        // value less than zero if x is less than y, zero if x is equal to y, or a
+        // value greater than zero if x is greater than y.
+        //
+        //| <include path='docs/doc[@for="IComparer.Compare"]/*' />
+        int Compare(Object x, Object y);
+    }
+}
diff --git a/base/Kernel/System/Collections/IDictionary.cs b/base/Kernel/System/Collections/IDictionary.cs
new file mode 100644
index 0000000..ad48f50
--- /dev/null
+++ b/base/Kernel/System/Collections/IDictionary.cs
@@ -0,0 +1,78 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IDictionary
+**
+**
+** Purpose: Base interface for all dictionarys.
+**
+** Date:  September 21, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+
+    // An IDictionary is a possibly unordered set of key-value pairs.
+    // Keys can be any non-null object.  Values can be any object.
+    // You can look up a value in an IDictionary via the default indexed
+    // property, Items.
+    //| <include path='docs/doc[@for="IDictionary"]/*' />
+    public interface IDictionary : ICollection
+    {
+        //| <include path='docs/doc[@for="IDictionary.this"]/*' />
+
+        // The Item property provides methods to read and edit entries
+        // in the Dictionary.
+        Object this[Object key] {
+            get;
+            set;
+        }
+
+        // Returns a collections of the keys in this dictionary.
+        //| <include path='docs/doc[@for="IDictionary.Keys"]/*' />
+        ICollection Keys {
+            get;
+        }
+
+        // Returns a collections of the values in this dictionary.
+        //| <include path='docs/doc[@for="IDictionary.Values"]/*' />
+        ICollection Values {
+            get;
+        }
+
+        // Returns whether this dictionary contains a particular key.
+        //
+        //| <include path='docs/doc[@for="IDictionary.Contains"]/*' />
+        bool Contains(Object key);
+
+        // Adds a key-value pair to the dictionary.
+        //
+        //| <include path='docs/doc[@for="IDictionary.Add"]/*' />
+        void Add(Object key, Object value);
+
+        // Removes all pairs from the dictionary.
+        //| <include path='docs/doc[@for="IDictionary.Clear"]/*' />
+        void Clear();
+        //| <include path='docs/doc[@for="IDictionary.IsReadOnly"]/*' />
+
+        bool IsReadOnly
+        { get; }
+        //| <include path='docs/doc[@for="IDictionary.IsFixedSize"]/*' />
+
+        bool IsFixedSize
+        { get; }
+
+        // Returns an IDictionaryEnumerator for this dictionary.
+        //| <include path='docs/doc[@for="IDictionary.GetEnumerator"]/*' />
+        new IDictionaryEnumerator GetEnumerator();
+
+        // Removes a particular key from the dictionary.
+        //
+        //| <include path='docs/doc[@for="IDictionary.Remove"]/*' />
+        void Remove(Object key);
+    }
+}
diff --git a/base/Kernel/System/Collections/IDictionaryEnumerator.cs b/base/Kernel/System/Collections/IDictionaryEnumerator.cs
new file mode 100644
index 0000000..f549476
--- /dev/null
+++ b/base/Kernel/System/Collections/IDictionaryEnumerator.cs
@@ -0,0 +1,81 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IDictionaryEnumerator
+**
+**
+** Purpose: Base interface for dictionary enumerators.
+**
+** Date:  September 20, 1999
+**
+===========================================================*/
+namespace System.Collections {
+
+    using System;
+    // This interface represents an enumerator that allows sequential access to the
+    // elements of a dictionary. Upon creation, an enumerator is conceptually
+    // positioned before the first element of the enumeration. The first call to the
+    // MoveNext method brings the first element of the enumeration into view,
+    // and each successive call to MoveNext brings the next element into
+    // view until MoveNext returns false, indicating that there are no more
+    // elements to enumerate. Following each call to MoveNext, the
+    // Key and Value methods are used to obtain the key and
+    // value of the element currently in view. The values returned by calls to
+    // Key and Value are undefined before the first call to
+    // MoveNext and following a call to MoveNext that returned false.
+    // Enumerators are typically used in while loops of the form
+    //
+    // IDictionaryEnumerator e = ...;
+    // while (e.MoveNext()) {
+    //     Object key = e.Key;
+    //     Object value = e.Value;
+    //     ...
+    // }
+    //
+    // The IDictionaryEnumerator interface extends the IEnumerator
+    // interface and can thus be used as a regular enumerator. The Current
+    // method of an IDictionaryEnumerator returns a DictionaryEntry containing
+    // the current key and value pair.  However, the GetEntry method will
+    // return the same DictionaryEntry and avoids boxing the DictionaryEntry (boxing
+    // is somewhat expensive).
+    //
+    //| <include path='docs/doc[@for="IDictionaryEnumerator"]/*' />
+    public interface IDictionaryEnumerator : IEnumerator
+    {
+        // Returns the key of the current element of the enumeration. The returned
+        // value is undefined before the first call to GetNext and following
+        // a call to GetNext that returned false. Multiple calls to
+        // GetKey with no intervening calls to GetNext will return
+        // the same object.
+        //
+        //| <include path='docs/doc[@for="IDictionaryEnumerator.Key"]/*' />
+        Object Key {
+            get;
+        }
+
+        // Returns the value of the current element of the enumeration. The
+        // returned value is undefined before the first call to GetNext and
+        // following a call to GetNext that returned false. Multiple calls
+        // to GetValue with no intervening calls to GetNext will
+        // return the same object.
+        //
+        //| <include path='docs/doc[@for="IDictionaryEnumerator.Value"]/*' />
+        Object Value {
+            get;
+        }
+
+        // GetBlock will copy dictionary values into the given Array.  It will either
+        // fill up the array, or if there aren't enough elements, it will
+        // copy as much as possible into the Array.  The number of elements
+        // copied is returned.
+        //
+        //| <include path='docs/doc[@for="IDictionaryEnumerator.Entry"]/*' />
+        DictionaryEntry Entry {
+            get;
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/IEnumerable.cs b/base/Kernel/System/Collections/IEnumerable.cs
new file mode 100644
index 0000000..070d939
--- /dev/null
+++ b/base/Kernel/System/Collections/IEnumerable.cs
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IEnumerable
+**
+**
+** Purpose: Interface for classes providing IEnumerators
+**
+** Date:  November 8, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+    using System.Runtime.InteropServices;
+    // Implement this interface if you need to support VB's foreach semantics.
+    // Also, COM classes that support an enumerator will also implement this interface.
+    //| <include path='docs/doc[@for="IEnumerable"]/*' />
+    public interface IEnumerable
+    {
+        // Returns an IEnumerator for this enumerable Object.  The enumerator provides
+        // a simple way to access all the contents of a collection.
+        //| <include path='docs/doc[@for="IEnumerable.GetEnumerator"]/*' />
+        IEnumerator GetEnumerator();
+    }
+}
diff --git a/base/Kernel/System/Collections/IEnumerator.cs b/base/Kernel/System/Collections/IEnumerator.cs
new file mode 100644
index 0000000..f1a2f77
--- /dev/null
+++ b/base/Kernel/System/Collections/IEnumerator.cs
@@ -0,0 +1,55 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IEnumerator
+**
+**
+** Purpose: Base interface for all enumerators.
+**
+** Date:  June 14, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+    using System.Runtime.InteropServices;
+
+    // Base interface for all enumerators, providing a simple approach
+    // to iterating over a collection.
+    //| <include path='docs/doc[@for="IEnumerator"]/*' />
+    [Guid("496B0ABF-CDEE-11d3-88E8-00902754C43A")]
+    public interface IEnumerator
+    {
+        // Advances the enumerator to the next element of the enumeration and
+        // returns a boolean indicating whether an element is available. Upon
+        // creation, an enumerator is conceptually positioned before the first
+        // element of the enumeration, and the first call to MoveNext
+        // brings the first element of the enumeration into view.
+        //
+        //| <include path='docs/doc[@for="IEnumerator.MoveNext"]/*' />
+        bool MoveNext();
+
+        // Returns the current element of the enumeration. The returned value is
+        // undefined before the first call to MoveNext and following a
+        // call to MoveNext that returned false. Multiple calls to
+        // GetCurrent with no intervening calls to MoveNext
+        // will return the same object.
+        //
+        //| <include path='docs/doc[@for="IEnumerator.Current"]/*' />
+        Object Current {
+            get;
+        }
+
+        // Resets the enumerator to the beginning of the enumeration, starting over.
+        // The preferred behavior for Reset is to return the exact same enumeration.
+        // This means if you modify the underlying collection then call Reset, your
+        // IEnumerator will be invalid, just as it would have been if you had called
+        // MoveNext or Current.
+        //
+        //| <include path='docs/doc[@for="IEnumerator.Reset"]/*' />
+        void Reset();
+    }
+}
diff --git a/base/Kernel/System/Collections/IHashCodeProvider.cs b/base/Kernel/System/Collections/IHashCodeProvider.cs
new file mode 100644
index 0000000..132f610
--- /dev/null
+++ b/base/Kernel/System/Collections/IHashCodeProvider.cs
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface: IHashCodeProvider
+**
+**
+** Purpose: A bunch of strings.
+**
+** Date: July 21, 1999
+**
+===========================================================*/
+namespace System.Collections {
+
+    using System;
+    // Provides a mechanism for a hash table user to override the default
+    // GetHashCode() function on Objects, providing their own hash function.
+    //| <include path='docs/doc[@for="IHashCodeProvider"]/*' />
+    public interface IHashCodeProvider
+    {
+        // Returns a hash code for the given object.
+        //
+        //| <include path='docs/doc[@for="IHashCodeProvider.GetHashCode"]/*' />
+        int GetHashCode (Object obj);
+    }
+}
diff --git a/base/Kernel/System/Collections/IList.cs b/base/Kernel/System/Collections/IList.cs
new file mode 100644
index 0000000..d76243d
--- /dev/null
+++ b/base/Kernel/System/Collections/IList.cs
@@ -0,0 +1,79 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IList
+**
+**
+** Purpose: Base interface for all Lists.
+**
+** Date:  September 21, 1999
+**
+===========================================================*/
+namespace System.Collections {
+
+    using System;
+    // An IList is an ordered collection of objects.  The exact ordering
+    // is up to the implementation of the list, ranging from a sorted
+    // order to insertion order.
+    //| <include path='docs/doc[@for="IList"]/*' />
+    public interface IList : ICollection
+    {
+        // The Item property provides methods to read and edit entries in the List.
+        //| <include path='docs/doc[@for="IList.this"]/*' />
+        Object this[int index] {
+            get;
+            set;
+        }
+
+        // Adds an item to the list.  The exact position in the list is
+        // implementation-dependent, so while ArrayList may always insert
+        // in the last available location, a SortedList most likely would not.
+        // The return value is the position the new element was inserted in.
+        //| <include path='docs/doc[@for="IList.Add"]/*' />
+        int Add(Object value);
+
+        // Returns whether the list contains a particular item.
+        //| <include path='docs/doc[@for="IList.Contains"]/*' />
+        bool Contains(Object value);
+
+        // Removes all items from the list.
+        //| <include path='docs/doc[@for="IList.Clear"]/*' />
+        void Clear();
+        //| <include path='docs/doc[@for="IList.IsReadOnly"]/*' />
+
+        bool IsReadOnly
+        { get; }
+        //| <include path='docs/doc[@for="IList.IsFixedSize"]/*' />
+
+
+        bool IsFixedSize
+        {
+            get;
+        }
+
+
+        // Returns the index of a particular item, if it is in the list.
+        // Returns -1 if the item isn't in the list.
+        //| <include path='docs/doc[@for="IList.IndexOf"]/*' />
+        int IndexOf(Object value);
+
+        // Inserts value into the list at position index.
+        // index must be non-negative and less than or equal to the
+        // number of elements in the list.  If index equals the number
+        // of items in the list, then value is appended to the end.
+        //| <include path='docs/doc[@for="IList.Insert"]/*' />
+        void Insert(int index, Object value);
+
+        // Removes an item from the list.
+        //| <include path='docs/doc[@for="IList.Remove"]/*' />
+        void Remove(Object value);
+
+        // Removes the item at position index.
+        //| <include path='docs/doc[@for="IList.RemoveAt"]/*' />
+        void RemoveAt(int index);
+    }
+}
diff --git a/base/Kernel/System/Collections/Queue.cs b/base/Kernel/System/Collections/Queue.cs
new file mode 100644
index 0000000..5e6887d
--- /dev/null
+++ b/base/Kernel/System/Collections/Queue.cs
@@ -0,0 +1,444 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: Queue
+**
+**         Original implementation by Derek Yenser
+**
+** Purpose: A circular-array implementation of a queue.
+**
+** Date: October 4, 1999
+**
+=============================================================================*/
+namespace System.Collections {
+    using System;
+
+    // A simple Queue of objects.  Internally it is implemented as a circular
+    // buffer, so Enqueue can be O(n).  Dequeue is O(1).
+    //| <include path='docs/doc[@for="Queue"]/*' />
+    public class Queue : ICollection, ICloneable {
+        private Object[] _array;
+        private int _head;       // First valid element in the queue
+        private int _tail;       // Last valid element in the queue
+        private int _size;       // Number of elements.
+        private int _growFactor; // 100 == 1.0, 130 == 1.3, 200 == 2.0
+        private int _version;
+
+        private const int _MinimumGrow = 4;
+        private const int _ShrinkThreshold = 32;
+
+        // Creates a queue with room for capacity objects. The default initial
+        // capacity and grow factor are used.
+        //| <include path='docs/doc[@for="Queue.Queue"]/*' />
+        public Queue()
+            : this(32, 200) {
+        }
+
+        // Creates a queue with room for capacity objects. The default grow factor
+        // is used.
+        //
+        //| <include path='docs/doc[@for="Queue.Queue1"]/*' />
+        public Queue(int capacity)
+            : this(capacity, 200) {
+        }
+
+        // Creates a queue with room for capacity objects. When full, the new
+        // capacity is set to the old capacity * growFactor.
+        //
+        //| <include path='docs/doc[@for="Queue.Queue2"]/*' />
+        public Queue(int capacity, int growFactorPercent) {
+            if (capacity < 0)
+                throw new ArgumentOutOfRangeException("capacity", "ArgumentOutOfRange_NeedNonNegNum");
+            if (!(growFactorPercent >= 100 && growFactorPercent <= 1000)) {
+                throw new ArgumentOutOfRangeException("growFactor", String.Format("ArgumentOutOfRange_QueueGrowFactor", 1, 10));
+            }
+
+            _array = new Object[capacity];
+            _head = 0;
+            _tail = 0;
+            _size = 0;
+            _growFactor = growFactorPercent;
+        }
+
+        // Fills a Queue with the elements of an ICollection.  Uses the enumerator
+        // to get each of the elements.
+        //
+        //| <include path='docs/doc[@for="Queue.Queue3"]/*' />
+        public Queue(ICollection col) : this((col==null ? 32 : col.Count))
+        {
+            if (col==null)
+                throw new ArgumentNullException("col");
+            IEnumerator en = col.GetEnumerator();
+            while(en.MoveNext())
+                Enqueue(en.Current);
+        }
+
+
+        //| <include path='docs/doc[@for="Queue.Count"]/*' />
+        public virtual int Count {
+            get { return _size; }
+        }
+
+        //| <include path='docs/doc[@for="Queue.Clone"]/*' />
+        public virtual Object Clone() {
+            Queue q = new Queue(_size);
+            q._size = _size;
+            Array.Copy(_array, 0, q._array, 0, _size);
+            q._version = _version;
+            return q;
+        }
+
+        //| <include path='docs/doc[@for="Queue.IsSynchronized"]/*' />
+        public virtual bool IsSynchronized {
+            get { return false; }
+        }
+
+        //| <include path='docs/doc[@for="Queue.SyncRoot"]/*' />
+        public virtual Object SyncRoot {
+            get { return this; }
+        }
+
+        // Removes all Objects from the queue.
+        //| <include path='docs/doc[@for="Queue.Clear"]/*' />
+        public virtual void Clear() {
+            if (_head < _tail)
+                Array.Clear(_array, _head, _size);
+            else {
+                Array.Clear(_array, _head, _array.Length - _head);
+                Array.Clear(_array, 0, _tail);
+            }
+
+            _head = 0;
+            _tail = 0;
+            _size = 0;
+            _version++;
+        }
+
+        // CopyTo copies a collection into an Array, starting at a particular
+        // index into the array.
+        //
+        //| <include path='docs/doc[@for="Queue.CopyTo"]/*' />
+        public virtual void CopyTo(Array array, int index)
+        {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            if (array.Rank != 1)
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            int arrayLen = array.Length;
+            if (arrayLen - index < _size)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            int numToCopy = (arrayLen-index < _size) ? arrayLen-index : _size;
+            if (numToCopy==0)
+                return;
+            if (_head < _tail) {
+                Array.Copy(_array, _head, array, index, numToCopy);
+            } else {
+                int firstPart = (_array.Length - _head < numToCopy) ? _array.Length - _head : numToCopy;
+                Array.Copy(_array, _head, array, index, firstPart);
+                numToCopy -= firstPart;
+                Array.Copy(_array, 0, array, index+_array.Length - _head, numToCopy);
+            }
+        }
+
+        // Adds obj to the tail of the queue.
+        //
+        //| <include path='docs/doc[@for="Queue.Enqueue"]/*' />
+        public virtual void Enqueue(Object obj) {
+            if (_size == _array.Length) {
+                int newcapacity = (int)((long)_array.Length * (long)_growFactor / 100);
+                if (newcapacity < _array.Length + _MinimumGrow) {
+                    newcapacity = _array.Length + _MinimumGrow;
+                }
+                SetCapacity(newcapacity);
+            }
+
+            _array[_tail] = obj;
+            _tail = (_tail + 1) % _array.Length;
+            _size++;
+            _version++;
+        }
+
+        // GetEnumerator returns an IEnumerator over this Queue.  This
+        // Enumerator will support removing.
+        //
+        //| <include path='docs/doc[@for="Queue.GetEnumerator"]/*' />
+        public virtual IEnumerator GetEnumerator()
+        {
+            return new QueueEnumerator(this);
+        }
+
+        // Removes the object at the head of the queue and returns it. If the queue
+        // is empty, this method simply returns null.
+        //| <include path='docs/doc[@for="Queue.Dequeue"]/*' />
+        public virtual Object Dequeue() {
+            if (_size == 0)
+                throw new InvalidOperationException("InvalidOperation_EmptyQueue");
+
+            Object removed = _array[_head];
+            _array[_head] = null;
+            _head = (_head + 1) % _array.Length;
+            _size--;
+            _version++;
+            return removed;
+        }
+
+        // Returns the object at the head of the queue. The object remains in the
+        // queue. If the queue is empty, this method throws an
+        // InvalidOperationException.
+        //| <include path='docs/doc[@for="Queue.Peek"]/*' />
+        public virtual Object Peek() {
+            if (_size == 0)
+                throw new InvalidOperationException("InvalidOperation_EmptyQueue");
+
+            return _array[_head];
+        }
+
+        // Returns a synchronized Queue.  Returns a synchronized wrapper
+        // class around the queue - the caller must not use references to the
+        // original queue.
+        //
+        //| <include path='docs/doc[@for="Queue.Synchronized"]/*' />
+        public static Queue Synchronized(Queue queue)
+        {
+            if (queue==null)
+                throw new ArgumentNullException("queue");
+            return new SynchronizedQueue(queue);
+        }
+
+        // Returns true if the queue contains at least one object equal to obj.
+        // Equality is determined using obj.Equals().
+        //
+        // Exceptions: ArgumentNullException if obj == null.
+        //| <include path='docs/doc[@for="Queue.Contains"]/*' />
+        public virtual bool Contains(Object obj) {
+            int index = _head;
+            int count = _size;
+
+            while (count-- > 0) {
+                if (obj == null) {
+                    if (_array[index] == null)
+                        return true;
+                } else if (obj.Equals(_array[index])) {
+                    return true;
+                }
+                index = (index + 1) % _array.Length;
+            }
+
+            return false;
+        }
+
+        internal Object GetElement(int i)
+        {
+            return _array[(_head + i) % _array.Length];
+        }
+
+        // Iterates over the objects in the queue, returning an array of the
+        // objects in the Queue, or an empty array if the queue is empty.
+        // The order of elements in the array is first in to last in, the same
+        // order produced by successive calls to Dequeue.
+        //| <include path='docs/doc[@for="Queue.ToArray"]/*' />
+        public virtual Object[] ToArray()
+        {
+            Object[] arr = new Object[_size];
+            if (_size==0)
+                return arr;
+
+            if (_head < _tail) {
+                Array.Copy(_array, _head, arr, 0, _size);
+            } else {
+                Array.Copy(_array, _head, arr, 0, _array.Length - _head);
+                Array.Copy(_array, 0, arr, _array.Length - _head, _tail);
+            }
+
+            return arr;
+        }
+
+
+        // PRIVATE Grows or shrinks the buffer to hold capacity objects. Capacity
+        // must be >= _size.
+        private void SetCapacity(int capacity) {
+            Object[] newarray = new Object[capacity];
+            if (_size > 0) {
+                if (_head < _tail) {
+                    Array.Copy(_array, _head, newarray, 0, _size);
+                } else {
+                    Array.Copy(_array, _head, newarray, 0, _array.Length - _head);
+                    Array.Copy(_array, 0, newarray, _array.Length - _head, _tail);
+                }
+            }
+
+            _array = newarray;
+            _head = 0;
+            _tail = _size;
+            _version++;
+        }
+
+        //| <include path='docs/doc[@for="Queue.TrimToSize"]/*' />
+        public virtual void TrimToSize()
+        {
+            SetCapacity(_size);
+        }
+
+
+        // Implements a synchronization wrapper around a queue.
+        private class SynchronizedQueue : Queue
+        {
+            private Queue _q;
+            private Object root;
+
+            internal SynchronizedQueue(Queue q) {
+                this._q = q;
+                root = _q.SyncRoot;
+            }
+
+            public override bool IsSynchronized {
+                get { return true; }
+            }
+
+            public override Object SyncRoot {
+                get {
+                    return root;
+                }
+            }
+
+            public override int Count {
+                get {
+                    lock (root) {
+                        return _q.Count;
+                    }
+                }
+            }
+
+            public override void Clear() {
+                lock (root) {
+                    _q.Clear();
+                }
+            }
+
+            public override Object Clone() {
+                lock (root) {
+                    return new SynchronizedQueue((Queue)_q.Clone());
+                }
+            }
+
+            public override bool Contains(Object obj) {
+                lock (root) {
+                    return _q.Contains(obj);
+                }
+            }
+
+            public override void CopyTo(Array array, int arrayIndex) {
+                lock (root) {
+                    _q.CopyTo(array, arrayIndex);
+                }
+            }
+
+            public override void Enqueue(Object value) {
+                lock (root) {
+                    _q.Enqueue(value);
+                }
+            }
+
+            public override Object Dequeue() {
+                lock (root) {
+                    return _q.Dequeue();
+                }
+            }
+
+            public override IEnumerator GetEnumerator() {
+                lock (root) {
+                    return _q.GetEnumerator();
+                }
+            }
+
+            public override Object Peek() {
+                lock (root) {
+                    return _q.Peek();
+                }
+            }
+
+            public override Object[] ToArray() {
+                lock (root) {
+                    return _q.ToArray();
+                }
+            }
+
+            public override void TrimToSize() {
+               lock (root) {
+                    _q.TrimToSize();
+                }
+            }
+        }
+
+
+        // Implements an enumerator for a Queue.  The enumerator uses the
+        // internal version number of the list to ensure that no modifications are
+        // made to the list while an enumeration is in progress.
+        private class QueueEnumerator : IEnumerator, ICloneable
+        {
+            private Queue _q;
+            private int _index;
+            private int _version;
+            private Object currentElement;
+
+            internal QueueEnumerator(Queue q) {
+                _q = q;
+                _version = _q._version;
+                _index = 0;
+                currentElement = _q._array;
+                if (_q._size == 0)
+                    _index = -1;
+            }
+
+            public Object Clone()
+            {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                if (_version != _q._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+
+                if (_index < 0) {
+                    currentElement = _q._array;
+                    return false;
+                }
+
+                currentElement = _q.GetElement(_index);
+                _index++;
+
+                if (_index == _q._size)
+                    _index = -1;
+                return true;
+            }
+
+            public virtual Object Current {
+                get {
+                    if (currentElement == _q._array)
+                    {
+                        if (_index == 0)
+                            throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                        else
+                            throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    }
+                    return currentElement;
+                }
+            }
+
+            public virtual void Reset() {
+                if (_version != _q._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                if (_q._size == 0)
+                    _index = -1;
+                 else
+                     _index = 0;
+                currentElement = _q._array;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/ReadOnlyCollectionBase.cs b/base/Kernel/System/Collections/ReadOnlyCollectionBase.cs
new file mode 100644
index 0000000..909900b
--- /dev/null
+++ b/base/Kernel/System/Collections/ReadOnlyCollectionBase.cs
@@ -0,0 +1,53 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+namespace System.Collections {
+
+    using System;
+
+    // Useful base class for typed readonly collections where items derive from object
+    //| <include path='docs/doc[@for="ReadOnlyCollectionBase"]/*' />
+    public abstract class ReadOnlyCollectionBase : ICollection {
+        ArrayList list;
+
+        //| <include path='docs/doc[@for="ReadOnlyCollectionBase.InnerList"]/*' />
+        protected ArrayList InnerList {
+            get {
+                if (list == null)
+                    list = new ArrayList();
+                 return list;
+            }
+        }
+
+        //| <include path='docs/doc[@for="ReadOnlyCollectionBase.Count"]/*' />
+        public int Count {
+            get { return InnerList.Count; }
+        }
+
+        //| <include path='docs/doc[@for="ReadOnlyCollectionBase.ICollection.IsSynchronized"]/*' />
+        bool ICollection.IsSynchronized {
+            get { return InnerList.IsSynchronized; }
+        }
+
+        //| <include path='docs/doc[@for="ReadOnlyCollectionBase.ICollection.SyncRoot"]/*' />
+        object ICollection.SyncRoot {
+            get { return InnerList.SyncRoot; }
+        }
+
+        //| <include path='docs/doc[@for="ReadOnlyCollectionBase.ICollection.CopyTo"]/*' />
+        void ICollection.CopyTo(Array array, int index) {
+            InnerList.CopyTo(array, index);
+        }
+
+        //| <include path='docs/doc[@for="ReadOnlyCollectionBase.GetEnumerator"]/*' />
+        public IEnumerator GetEnumerator() {
+            return InnerList.GetEnumerator();
+        }
+    }
+
+}
diff --git a/base/Kernel/System/Collections/SortedList.cs b/base/Kernel/System/Collections/SortedList.cs
new file mode 100644
index 0000000..c9a4106
--- /dev/null
+++ b/base/Kernel/System/Collections/SortedList.cs
@@ -0,0 +1,949 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  SortedList
+**
+**         Original implementation by Anders Hejlsberg
+**
+** Purpose: A sorted dictionary.
+**
+** Date:  September 21, 1999
+**
+===========================================================*/
+namespace System.Collections {
+    using System;
+
+    // The SortedList class implements a sorted list of keys and values. Entries in
+    // a sorted list are sorted by their keys and are accessible both by key and by
+    // index. The keys of a sorted list can be ordered either according to a
+    // specific IComparer implementation given when the sorted list is
+    // instantiated, or according to the IComparable implementation provided
+    // by the keys themselves. In either case, a sorted list does not allow entries
+    // with duplicate keys.
+    //
+    // A sorted list internally maintains two arrays that store the keys and
+    // values of the entries. The capacity of a sorted list is the allocated
+    // length of these internal arrays. As elements are added to a sorted list, the
+    // capacity of the sorted list is automatically increased as required by
+    // reallocating the internal arrays.  The capacity is never automatically
+    // decreased, but users can call either TrimToSize or
+    // Capacity explicitly.
+    //
+    // The GetKeyList and GetValueList methods of a sorted list
+    // provides access to the keys and values of the sorted list in the form of
+    // List implementations. The List objects returned by these
+    // methods are aliases for the underlying sorted list, so modifications
+    // made to those lists are directly reflected in the sorted list, and vice
+    // versa.
+    //
+    // The SortedList class provides a convenient way to create a sorted
+    // copy of another dictionary, such as a Hashtable. For example:
+    //
+    // Hashtable h = new Hashtable();
+    // h.Add(...);
+    // h.Add(...);
+    // ...
+    // SortedList s = new SortedList(h);
+    //
+    // The last line above creates a sorted list that contains a copy of the keys
+    // and values stored in the hashtable. In this particular example, the keys
+    // will be ordered according to the IComparable interface, which they
+    // all must implement. To impose a different ordering, SortedList also
+    // has a constructor that allows a specific IComparer implementation to
+    // be specified.
+    //
+    // By Anders Hejlsberg, further work by Brian Grunkemeyer
+    // version 1.10 9/10/98
+    //| <include path='docs/doc[@for="SortedList"]/*' />
+    public class SortedList : IDictionary, ICloneable
+    {
+        private Object[] keys;
+        private Object[] values;
+        private int _size;
+        private int version;
+        private IComparer comparer;
+        private KeyList keyList;
+        private ValueList valueList;
+
+        private const int _defaultCapacity = 16;
+
+        // Constructs a new sorted list. The sorted list is initially empty and has
+        // a capacity of zero. Upon adding the first element to the sorted list the
+        // capacity is increased to 16, and then increased in multiples of two as
+        // required. The elements of the sorted list are ordered according to the
+        // IComparable interface, which must be implemented by the keys of
+        // all entries added to the sorted list.
+        //| <include path='docs/doc[@for="SortedList.SortedList"]/*' />
+        public SortedList() {
+            keys = new Object[_defaultCapacity];
+            values = new Object[_defaultCapacity];
+            comparer = Comparer.Default;
+        }
+
+        // Constructs a new sorted list. The sorted list is initially empty and has
+        // a capacity of zero. Upon adding the first element to the sorted list the
+        // capacity is increased to 16, and then increased in multiples of two as
+        // required. The elements of the sorted list are ordered according to the
+        // IComparable interface, which must be implemented by the keys of
+        // all entries added to the sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.SortedList1"]/*' />
+        public SortedList(int initialCapacity) {
+            if (initialCapacity < 0)
+                throw new ArgumentOutOfRangeException("initialCapacity", "ArgumentOutOfRange_NeedNonNegNum");
+            keys = new Object[initialCapacity];
+            values = new Object[initialCapacity];
+            comparer = Comparer.Default;
+        }
+
+        // Constructs a new sorted list with a given IComparer
+        // implementation. The sorted list is initially empty and has a capacity of
+        // zero. Upon adding the first element to the sorted list the capacity is
+        // increased to 16, and then increased in multiples of two as required. The
+        // elements of the sorted list are ordered according to the given
+        // IComparer implementation. If comparer is null, the
+        // elements are compared to each other using the IComparable
+        // interface, which in that case must be implemented by the keys of all
+        // entries added to the sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.SortedList2"]/*' />
+        public SortedList(IComparer comparer)
+            : this() {
+            if (comparer != null) this.comparer = comparer;
+        }
+
+        // Constructs a new sorted list with a given IComparer
+        // implementation and a given initial capacity. The sorted list is
+        // initially empty, but will have room for the given number of elements
+        // before any reallocations are required. The elements of the sorted list
+        // are ordered according to the given IComparer implementation. If
+        // comparer is null, the elements are compared to each other using
+        // the IComparable interface, which in that case must be implemented
+        // by the keys of all entries added to the sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.SortedList3"]/*' />
+        public SortedList(IComparer comparer, int capacity)
+            : this(comparer) {
+            Capacity = capacity;
+        }
+
+        // Constructs a new sorted list containing a copy of the entries in the
+        // given dictionary. The elements of the sorted list are ordered according
+        // to the IComparable interface, which must be implemented by the
+        // keys of all entries in the the given dictionary as well as keys
+        // subsequently added to the sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.SortedList4"]/*' />
+        public SortedList(IDictionary d)
+            : this(d, null) {
+        }
+
+        // Constructs a new sorted list containing a copy of the entries in the
+        // given dictionary. The elements of the sorted list are ordered according
+        // to the given IComparer implementation. If comparer is
+        // null, the elements are compared to each other using the
+        // IComparable interface, which in that case must be implemented
+        // by the keys of all entries in the the given dictionary as well as keys
+        // subsequently added to the sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.SortedList5"]/*' />
+        public SortedList(IDictionary d, IComparer comparer)
+            : this(comparer, (d != null ? d.Count : 0)) {
+            if (d==null)
+                throw new ArgumentNullException("d", "ArgumentNull_Dictionary");
+            d.Keys.CopyTo(keys, 0);
+            d.Values.CopyTo(values, 0);
+            Array.Sort(keys, values, comparer);
+            _size = d.Count;
+        }
+
+        // Adds an entry with the given key and value to this sorted list. An
+        // ArgumentException is thrown if the key is already present in the sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.Add"]/*' />
+        public virtual void Add(Object key, Object value) {
+            if (key == null) throw new ArgumentNullException("key", "ArgumentNull_Key");
+            int i = Array.BinarySearch(keys, 0, _size, key, comparer);
+            if (i >= 0)
+                throw new ArgumentException("Argument_AddingDuplicate__" + key);
+            Insert(~i, key, value);
+        }
+
+        // Returns the capacity of this sorted list. The capacity of a sorted list
+        // represents the allocated length of the internal arrays used to store the
+        // keys and values of the list, and thus also indicates the maximum number
+        // of entries the list can contain before a reallocation of the internal
+        // arrays is required.
+        //
+         //| <include path='docs/doc[@for="SortedList.Capacity"]/*' />
+         public virtual int Capacity {
+            get {
+                return keys.Length;
+            }
+            set {
+                if (value != keys.Length) {
+                    if (value < _size) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_SmallCapacity");
+                    if (value > 0) {
+                        Object[] newKeys = new Object[value];
+                        Object[] newValues = new Object[value];
+                        if (_size > 0) {
+                            Array.Copy(keys, 0, newKeys, 0, _size);
+                            Array.Copy(values, 0, newValues, 0, _size);
+                        }
+                        keys = newKeys;
+                        values = newValues;
+                    }
+                    else {
+                        keys = new Object[_defaultCapacity];
+                        values = new Object[_defaultCapacity];
+                    }
+                }
+            }
+        }
+
+        // Returns the number of entries in this sorted list.
+        //
+        //| <include path='docs/doc[@for="SortedList.Count"]/*' />
+        public virtual int Count {
+            get {
+                return _size;
+            }
+        }
+
+        // Returns a collection representing the keys of this sorted list. This
+        // method returns the same object as GetKeyList, but typed as an
+        // ICollection instead of an IList.
+        //
+         //| <include path='docs/doc[@for="SortedList.Keys"]/*' />
+         public virtual ICollection Keys {
+            get {
+               return GetKeyList();
+            }
+        }
+
+        // Returns a collection representing the values of this sorted list. This
+        // method returns the same object as GetValueList, but typed as an
+        // ICollection instead of an IList.
+        //
+         //| <include path='docs/doc[@for="SortedList.Values"]/*' />
+         public virtual ICollection Values {
+            get {
+                return GetValueList();
+            }
+        }
+
+        // Is this SortedList read-only?
+        //| <include path='docs/doc[@for="SortedList.IsReadOnly"]/*' />
+        public virtual bool IsReadOnly {
+            get { return false; }
+        }
+
+        //| <include path='docs/doc[@for="SortedList.IsFixedSize"]/*' />
+        public virtual bool IsFixedSize {
+            get { return false; }
+        }
+
+        // Is this SortedList synchronized (thread-safe)?
+        //| <include path='docs/doc[@for="SortedList.IsSynchronized"]/*' />
+        public virtual bool IsSynchronized {
+            get { return false; }
+        }
+
+        // Synchronization root for this object.
+        //| <include path='docs/doc[@for="SortedList.SyncRoot"]/*' />
+        public virtual Object SyncRoot {
+            get { return this; }
+        }
+
+        // Removes all entries from this sorted list.
+        //| <include path='docs/doc[@for="SortedList.Clear"]/*' />
+        public virtual void Clear() {
+            version++;
+            _size = 0;
+            keys = new Object[_defaultCapacity];
+            values = new Object[_defaultCapacity];
+        }
+
+        // Makes a virtually identical copy of this SortedList.  This is a shallow
+        // copy.  IE, the Objects in the SortedList are not cloned - we copy the
+        // references to those objects.
+        //| <include path='docs/doc[@for="SortedList.Clone"]/*' />
+        public virtual Object Clone()
+        {
+            SortedList sl = new SortedList(_size);
+            Array.Copy(keys, 0, sl.keys, 0, _size);
+            Array.Copy(values, 0, sl.values, 0, _size);
+            sl._size = _size;
+            sl.version = version;
+            sl.comparer = comparer;
+            // Don't copy keyList nor valueList.
+            return sl;
+        }
+
+
+        // Checks if this sorted list contains an entry with the given key.
+        //
+        //| <include path='docs/doc[@for="SortedList.Contains"]/*' />
+        public virtual bool Contains(Object key) {
+            return IndexOfKey(key) >= 0;
+        }
+
+        // Checks if this sorted list contains an entry with the given key.
+        //
+        //| <include path='docs/doc[@for="SortedList.ContainsKey"]/*' />
+        public virtual bool ContainsKey(Object key) {
+            // Yes, this is a SPEC'ed duplicate of Contains().
+            return IndexOfKey(key) >= 0;
+        }
+
+        // Checks if this sorted list contains an entry with the given value. The
+        // values of the entries of the sorted list are compared to the given value
+        // using the Object.Equals method. This method performs a linear
+        // search and is substantially slower than the Contains
+        // method.
+        //
+        //| <include path='docs/doc[@for="SortedList.ContainsValue"]/*' />
+        public virtual bool ContainsValue(Object value) {
+            return IndexOfValue(value) >= 0;
+        }
+
+        // Copies the values in this SortedList to an array.
+        //| <include path='docs/doc[@for="SortedList.CopyTo"]/*' />
+        public virtual void CopyTo(Array array, int arrayIndex) {
+            if (array == null)
+            throw new ArgumentNullException("array", "ArgumentNull_Array");
+            if (array.Rank != 1)
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            if (arrayIndex < 0)
+            throw new ArgumentOutOfRangeException("arrayIndex", "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - arrayIndex < Count)
+            throw new ArgumentException("Arg_ArrayPlusOffTooSmall");
+            for (int i = 0; i<Count; i++) {
+        DictionaryEntry entry = new DictionaryEntry(keys[i],values[i]);
+                array.SetValue(entry, i + arrayIndex);
+            }
+        }
+
+        // Ensures that the capacity of this sorted list is at least the given
+        // minimum value. If the correct capacity of the list is less than
+        // min, the capacity is increased to twice the current capacity or
+        // to min, whichever is larger.
+        private void EnsureCapacity(int min) {
+            int newCapacity = keys.Length == 0? 16: keys.Length * 2;
+            if (newCapacity < min) newCapacity = min;
+            Capacity = newCapacity;
+        }
+
+        // Returns the value of the entry at the given index.
+        //
+        //| <include path='docs/doc[@for="SortedList.GetByIndex"]/*' />
+        public virtual Object GetByIndex(int index) {
+            if (index < 0 || index >= _size)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            return values[index];
+        }
+
+        // Returns an IEnumerator for this sorted list.  If modifications
+        // made to the sorted list while an enumeration is in progress,
+        // the MoveNext and Remove methods
+        // of the enumerator will throw an exception.
+        //
+        //| <include path='docs/doc[@for="SortedList.IEnumerable.GetEnumerator"]/*' />
+        IEnumerator IEnumerable.GetEnumerator() {
+            return new SortedListEnumerator(this, 0, _size, SortedListEnumerator.DictEntry);
+        }
+
+        // Returns an IDictionaryEnumerator for this sorted list.  If modifications
+        // made to the sorted list while an enumeration is in progress,
+        // the MoveNext and Remove methods
+        // of the enumerator will throw an exception.
+        //
+        //| <include path='docs/doc[@for="SortedList.GetEnumerator"]/*' />
+        public virtual IDictionaryEnumerator GetEnumerator() {
+            return new SortedListEnumerator(this, 0, _size, SortedListEnumerator.DictEntry);
+        }
+
+        // Returns the key of the entry at the given index.
+        //
+        //| <include path='docs/doc[@for="SortedList.GetKey"]/*' />
+        public virtual Object GetKey(int index) {
+            if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            return keys[index];
+        }
+
+        // Returns an IList representing the keys of this sorted list. The
+        // returned list is an alias for the keys of this sorted list, so
+        // modifications made to the returned list are directly reflected in the
+        // underlying sorted list, and vice versa. The elements of the returned
+        // list are ordered in the same way as the elements of the sorted list. The
+        // returned list does not support adding, inserting, or modifying elements
+        // (the Add, AddRange, Insert, InsertRange,
+        // Reverse, Set, SetRange, and Sort methods
+        // throw exceptions), but it does allow removal of elements (through the
+        // Remove and RemoveRange methods or through an enumerator).
+        // Null is an invalid key value.
+        //
+        //| <include path='docs/doc[@for="SortedList.GetKeyList"]/*' />
+        public virtual IList GetKeyList() {
+            if (keyList == null) keyList = new KeyList(this);
+            return keyList;
+        }
+
+        // Returns an IList representing the values of this sorted list. The
+        // returned list is an alias for the values of this sorted list, so
+        // modifications made to the returned list are directly reflected in the
+        // underlying sorted list, and vice versa. The elements of the returned
+        // list are ordered in the same way as the elements of the sorted list. The
+        // returned list does not support adding or inserting elements (the
+        // Add, AddRange, Insert and InsertRange
+        // methods throw exceptions), but it does allow modification and removal of
+        // elements (through the Remove, RemoveRange, Set and
+        // SetRange methods or through an enumerator).
+        //
+        //| <include path='docs/doc[@for="SortedList.GetValueList"]/*' />
+        public virtual IList GetValueList() {
+            if (valueList == null) valueList = new ValueList(this);
+            return valueList;
+        }
+
+        // Returns the value associated with the given key. If an entry with the
+        // given key is not found, the returned value is null.
+        //
+        //| <include path='docs/doc[@for="SortedList.this"]/*' />
+        public virtual Object this[Object key] {
+            get {
+                int i = IndexOfKey(key);
+                if (i >= 0) return values[i];
+                return null;
+            }
+            set {
+                if (key == null) throw new ArgumentNullException("key", "ArgumentNull_Key");
+                int i = Array.BinarySearch(keys, 0, _size, key, comparer);
+                if (i >= 0) {
+                    values[i] = value;
+                    version++;
+                    return;
+                }
+                Insert(~i, key, value);
+            }
+        }
+
+        // Returns the index of the entry with a given key in this sorted list. The
+        // key is located through a binary search, and thus the average execution
+        // time of this method is proportional to Log2(size), where
+        // size is the size of this sorted list. The returned value is -1 if
+        // the given key does not occur in this sorted list. Null is an invalid
+        // key value.
+        //
+        //| <include path='docs/doc[@for="SortedList.IndexOfKey"]/*' />
+        public virtual int IndexOfKey(Object key) {
+            if (key == null)
+                throw new ArgumentNullException("key", "ArgumentNull_Key");
+            int ret = Array.BinarySearch(keys, 0, _size, key, comparer);
+            return ret >=0 ? ret : -1;
+        }
+
+        // Returns the index of the first occurrence of an entry with a given value
+        // in this sorted list. The entry is located through a linear search, and
+        // thus the average execution time of this method is proportional to the
+        // size of this sorted list. The elements of the list are compared to the
+        // given value using the Object.Equals method.
+        //
+        //| <include path='docs/doc[@for="SortedList.IndexOfValue"]/*' />
+        public virtual int IndexOfValue(Object value) {
+            return Array.IndexOf(values, value, 0, _size);
+        }
+
+        // Inserts an entry with a given key and value at a given index.
+        private void Insert(int index, Object key, Object value) {
+            if (_size == keys.Length) EnsureCapacity(_size + 1);
+            if (index < _size) {
+                Array.Copy(keys, index, keys, index + 1, _size - index);
+                Array.Copy(values, index, values, index + 1, _size - index);
+            }
+            keys[index] = key;
+            values[index] = value;
+            _size++;
+            version++;
+        }
+
+        // Removes the entry at the given index. The size of the sorted list is
+        // decreased by one.
+        //
+        //| <include path='docs/doc[@for="SortedList.RemoveAt"]/*' />
+        public virtual void RemoveAt(int index) {
+            if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            _size--;
+            if (index < _size) {
+                Array.Copy(keys, index + 1, keys, index, _size - index);
+                Array.Copy(values, index + 1, values, index, _size - index);
+            }
+            keys[_size] = null;
+            values[_size] = null;
+            version++;
+        }
+
+        // Removes an entry from this sorted list. If an entry with the specified
+        // key exists in the sorted list, it is removed. An ArgumentException is
+        // thrown if the key is null.
+        //
+        //| <include path='docs/doc[@for="SortedList.Remove"]/*' />
+        public virtual void Remove(Object key) {
+            int i = IndexOfKey(key);
+            if (i >= 0)
+        RemoveAt(i);
+        }
+
+        // Sets the value at an index to a given value.  The previous value of
+        // the given entry is overwritten.
+        //
+        //| <include path='docs/doc[@for="SortedList.SetByIndex"]/*' />
+        public virtual void SetByIndex(int index, Object value) {
+            if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+            values[index] = value;
+            version++;
+        }
+
+        // Returns a thread-safe SortedList.
+        //
+        //| <include path='docs/doc[@for="SortedList.Synchronized"]/*' />
+        public static SortedList Synchronized(SortedList list) {
+            if (list==null)
+                throw new ArgumentNullException("list");
+            return new SyncSortedList(list);
+        }
+
+        // Sets the capacity of this sorted list to the size of the sorted list.
+        // This method can be used to minimize a sorted list's memory overhead once
+        // it is known that no new elements will be added to the sorted list. To
+        // completely clear a sorted list and release all memory referenced by the
+        // sorted list, execute the following statements:
+        //
+        // sortedList.Clear();
+        // sortedList.TrimToSize();
+        //
+        //| <include path='docs/doc[@for="SortedList.TrimToSize"]/*' />
+        public virtual void TrimToSize() {
+            Capacity = _size;
+        }
+
+        private class SyncSortedList : SortedList
+        {
+            private SortedList _list;
+            private Object _root;
+
+            internal SyncSortedList(SortedList list) {
+                _list = list;
+                _root = list.SyncRoot;
+            }
+
+            public override int Count {
+                get { lock (_root) { return _list.Count; } }
+            }
+
+            public override Object SyncRoot {
+                get { return _root; }
+            }
+
+            public override bool IsReadOnly {
+                get { return _list.IsReadOnly; }
+            }
+
+            public override bool IsFixedSize {
+                get { return _list.IsFixedSize; }
+            }
+
+
+            public override bool IsSynchronized {
+                get { return true; }
+            }
+
+            public override Object this[Object key] {
+                get {
+                    lock (_root) {
+                        return _list[key];
+                    }
+                }
+                set {
+                    lock (_root) {
+                        _list[key] = value;
+                    }
+                }
+            }
+
+            public override void Add(Object key, Object value) {
+                lock (_root) {
+                    _list.Add(key, value);
+                }
+            }
+
+            public override int Capacity {
+                get{ lock (_root) {  return _list.Capacity; } }
+            }
+
+            public override void Clear() {
+                lock (_root) {
+                    _list.Clear();
+                }
+            }
+
+            public override Object Clone() {
+                lock (_root) {
+                    return _list.Clone();
+                }
+            }
+
+            public override bool Contains(Object key) {
+                lock (_root) {
+                    return _list.Contains(key);
+                }
+            }
+
+            public override bool ContainsKey(Object key) {
+                lock (_root) {
+                    return _list.ContainsKey(key);
+                }
+            }
+
+            public override bool ContainsValue(Object key) {
+                lock (_root) {
+                    return _list.ContainsValue(key);
+                }
+            }
+
+            public override void CopyTo(Array array, int index) {
+                lock (_root) {
+                    _list.CopyTo(array, index);
+                }
+            }
+
+            public override Object GetByIndex(int index) {
+                lock (_root) {
+                    return _list.GetByIndex(index);
+                }
+            }
+
+            public override IDictionaryEnumerator GetEnumerator() {
+                lock (_root) {
+                    return _list.GetEnumerator();
+                }
+            }
+
+            public override Object GetKey(int index) {
+                lock (_root) {
+                    return _list.GetKey(index);
+                }
+            }
+
+            public override IList GetKeyList() {
+                lock (_root) {
+                    return _list.GetKeyList();
+                }
+            }
+
+            public override IList GetValueList() {
+                lock (_root) {
+                    return _list.GetValueList();
+                }
+            }
+
+            public override int IndexOfKey(Object key) {
+                lock (_root) {
+                    return _list.IndexOfKey(key);
+                }
+            }
+
+            public override int IndexOfValue(Object value) {
+                lock (_root) {
+                    return _list.IndexOfValue(value);
+                }
+            }
+
+            public override void RemoveAt(int index) {
+                lock (_root) {
+                    _list.RemoveAt(index);
+                }
+            }
+
+            public override void Remove(Object key) {
+                lock (_root) {
+                    _list.Remove(key);
+                }
+            }
+
+            public override void SetByIndex(int index, Object value) {
+                lock (_root) {
+                    _list.SetByIndex(index, value);
+                }
+            }
+
+            public override void TrimToSize() {
+                lock (_root) {
+                    _list.TrimToSize();
+                }
+            }
+        }
+
+
+        private class SortedListEnumerator : IDictionaryEnumerator, ICloneable
+        {
+            private SortedList sortedList;
+            private Object key;
+            private Object value;
+            private int index;
+            private int startIndex;        // Store for Reset.
+            private int endIndex;
+            private int version;
+            private bool current;       // Is the current element valid?
+            private int getObjectRetType;  // What should GetObject return?
+
+            internal const int Keys = 1;
+            internal const int Values = 2;
+            internal const int DictEntry = 3;
+
+            internal SortedListEnumerator(SortedList sortedList, int index, int count,
+                                 int getObjRetType) {
+                this.sortedList = sortedList;
+                this.index = index;
+                startIndex = index;
+                endIndex = index + count;
+                version = sortedList.version;
+                getObjectRetType = getObjRetType;
+                current = false;
+            }
+
+            public Object Clone()
+            {
+                return MemberwiseClone();
+            }
+
+            public virtual Object Key {
+                get {
+                    if (version != sortedList.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+                    return key;
+                }
+            }
+
+            public virtual bool MoveNext() {
+                if (version != sortedList.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                if (index < endIndex) {
+                    key = sortedList.keys[index];
+                    value = sortedList.values[index];
+                    index++;
+                    current = true;
+                    return true;
+                }
+                key = null;
+                value = null;
+                current = false;
+                return false;
+            }
+
+            public virtual DictionaryEntry Entry {
+                get {
+                    if (version != sortedList.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+                    return new DictionaryEntry(key, value);
+                }
+            }
+
+            public virtual Object Current {
+                get {
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+
+                    if (getObjectRetType==Keys)
+                        return key;
+                    else if (getObjectRetType==Values)
+                        return value;
+                    else
+                        return new DictionaryEntry(key, value);
+                }
+            }
+
+            public virtual Object Value {
+                get {
+                    if (version != sortedList.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                    if (current == false) throw new InvalidOperationException("InvalidOperation_EnumOpCantHappen");
+                    return value;
+                }
+            }
+
+            public virtual void Reset() {
+                if (version != sortedList.version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                index = startIndex;
+                current = false;
+                key = null;
+                value = null;
+            }
+        }
+
+        private class KeyList : IList
+        {
+            private SortedList sortedList;
+
+            internal KeyList(SortedList sortedList) {
+                this.sortedList = sortedList;
+            }
+
+            public virtual int Count {
+                get { return sortedList._size; }
+            }
+
+            public virtual bool IsReadOnly {
+                get { return true; }
+            }
+
+            public virtual bool IsFixedSize {
+                get { return true; }
+            }
+
+            public virtual bool IsSynchronized {
+                get { return sortedList.IsSynchronized; }
+            }
+
+            public virtual Object SyncRoot {
+                get { return sortedList.SyncRoot; }
+            }
+
+            public virtual int Add(Object key) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+                //            return 0; // suppress compiler warning
+            }
+
+            public virtual void Clear() {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual bool Contains(Object key) {
+                return sortedList.Contains(key);
+            }
+
+            public virtual void CopyTo(Array array, int arrayIndex) {
+                if (array != null && array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+
+                // defer error checking to Array.Copy
+                Array.Copy(sortedList.keys, 0, array, arrayIndex, sortedList.Count);
+            }
+
+            public virtual void Insert(int index, Object value) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual Object this[int index] {
+                get {
+                    return sortedList.GetKey(index);
+                }
+                set {
+                    throw new NotSupportedException("NotSupported_KeyCollectionSet");
+                }
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                return new SortedListEnumerator(sortedList, 0, sortedList.Count, SortedListEnumerator.Keys);
+            }
+
+            public virtual int IndexOf(Object key) {
+                if (key==null)
+                    throw new ArgumentNullException("key", "ArgumentNull_Key");
+
+                int i = Array.BinarySearch(sortedList.keys, 0,
+                                           sortedList.Count, key, sortedList.comparer);
+                if (i >= 0) return i;
+                return -1;
+            }
+
+            public virtual void Remove(Object key) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual void RemoveAt(int index) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+        }
+
+        private class ValueList : IList
+        {
+            private SortedList sortedList;
+
+            internal ValueList(SortedList sortedList) {
+                this.sortedList = sortedList;
+            }
+
+            public virtual int Count {
+                get { return sortedList._size; }
+            }
+
+            public virtual bool IsReadOnly {
+                get { return true; }
+            }
+
+            public virtual bool IsFixedSize {
+                get { return true; }
+            }
+
+            public virtual bool IsSynchronized {
+                get { return sortedList.IsSynchronized; }
+            }
+
+            public virtual Object SyncRoot {
+                get { return sortedList.SyncRoot; }
+            }
+
+            public virtual int Add(Object key) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual void Clear() {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual bool Contains(Object value) {
+                return sortedList.ContainsValue(value);
+            }
+
+            public virtual void CopyTo(Array array, int arrayIndex) {
+                if (array != null && array.Rank != 1)
+                    throw new ArgumentException("Arg_RankMultiDimNotSupported");
+
+                // defer error checking to Array.Copy
+                Array.Copy(sortedList.values, 0, array, arrayIndex, sortedList.Count);
+            }
+
+            public virtual void Insert(int index, Object value) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual Object this[int index] {
+                get {
+                    return sortedList.GetByIndex(index);
+                }
+                set {
+                    sortedList.SetByIndex(index,value);
+                }
+            }
+
+            public virtual IEnumerator GetEnumerator() {
+                return new SortedListEnumerator(sortedList, 0, sortedList.Count, SortedListEnumerator.Values);
+            }
+
+            public virtual int IndexOf(Object value) {
+                return Array.IndexOf(sortedList.values, value, 0, sortedList.Count);
+            }
+
+            public virtual void Remove(Object value) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+            public virtual void RemoveAt(int index) {
+                throw new NotSupportedException("NotSupported_SortedListNestedWrite");
+            }
+
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/Specialized/ListDictionary.cs b/base/Kernel/System/Collections/Specialized/ListDictionary.cs
new file mode 100644
index 0000000..0912d24
--- /dev/null
+++ b/base/Kernel/System/Collections/Specialized/ListDictionary.cs
@@ -0,0 +1,441 @@
+//------------------------------------------------------------------------------
+// <copyright file="ListDictionary.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Collections.Specialized {
+
+    using System.Collections;
+
+    /// <devdoc>
+    ///  <para>
+    ///    This is a simple implementation of IDictionary using a singly linked list. This
+    ///    will be smaller and faster than a Hashtable if the number of elements is 10 or less.
+    ///    This should not be used if performance is important for large numbers of elements.
+    ///  </para>
+    /// </devdoc>
+    public class ListDictionary: IDictionary {
+        DictionaryNode head;
+        int version;
+        int count;
+        IComparer comparer;
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public ListDictionary() {
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public ListDictionary(IComparer comparer) {
+            this.comparer = comparer;
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public object this[object key] {
+            get {
+                if (key == null) {
+                    throw new ArgumentNullException("key");
+                }
+                DictionaryNode node = head;
+                if (comparer == null) {
+                    while (node != null) {
+                        if (key.Equals(node.key)) {
+                            return node.value;
+                        }
+                        node = node.next;
+                    }
+                }
+                else {
+                    while (node != null) {
+                        if (comparer.Compare(key, node.key) == 0) {
+                            return node.value;
+                        }
+                        node = node.next;
+                    }
+                }
+                return null;
+            }
+            set {
+                if (key == null) {
+                    throw new ArgumentNullException("key");
+                }
+                version++;
+                DictionaryNode last = null;
+                DictionaryNode node;
+                for (node = head; node != null; node = node.next) {
+                    if ((comparer == null) ? key.Equals(node.key) : comparer.Compare(key, node.key) == 0) {
+                        break;
+                    }
+                    last = node;
+                }
+                if (node != null) {
+                    // Found it
+                    node.value = value;
+                    return;
+                }
+                // Not found, so add a new one
+                DictionaryNode newNode = new DictionaryNode();
+                newNode.key = key;
+                newNode.value = value;
+                if (last != null) {
+                    last.next = newNode;
+                }
+                else {
+                    head = newNode;
+                }
+                count++;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public int Count {
+            get {
+                return count;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public ICollection Keys {
+            get {
+                return new NodeKeyValueCollection(this, true);
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsReadOnly {
+            get {
+                return false;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsFixedSize {
+            get {
+                return false;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsSynchronized {
+            get {
+                return false;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public object SyncRoot {
+            get {
+                return this;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public ICollection Values {
+            get {
+                return new NodeKeyValueCollection(this, false);
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public void Add(object key, object value) {
+            if (key == null) {
+                throw new ArgumentNullException("key");
+            }
+            version++;
+            DictionaryNode last = null;
+            DictionaryNode node;
+            for (node = head; node != null; node = node.next) {
+                if ((comparer == null) ? key.Equals(node.key) : comparer.Compare(key, node.key) == 0) {
+                    throw new ArgumentException("An entry with the same key already exists.");
+                }
+                last = node;
+            }
+            // Not found, so add a new one
+            DictionaryNode newNode = new DictionaryNode();
+            newNode.key = key;
+            newNode.value = value;
+            if (last != null) {
+                last.next = newNode;
+            }
+            else {
+                head = newNode;
+            }
+            count++;
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public void Clear() {
+            count = 0;
+            head = null;
+            version++;
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool Contains(object key) {
+            if (key == null) {
+                throw new ArgumentNullException("key");
+            }
+            for (DictionaryNode node = head; node != null; node = node.next) {
+                if ((comparer == null) ? key.Equals(node.key) : comparer.Compare(key, node.key) == 0) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public void CopyTo(Array array, int index)  {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index");
+
+            if (array.Length - index < count)
+                throw new ArgumentException("Insufficient space");
+
+            for (DictionaryNode node = head; node != null; node = node.next) {
+                array.SetValue(new DictionaryEntry(node.key, node.value), index);
+                index++;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public IDictionaryEnumerator GetEnumerator() {
+            return new NodeEnumerator(this);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return new NodeEnumerator(this);
+        }
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public void Remove(object key) {
+            if (key == null) {
+                throw new ArgumentNullException("key");
+            }
+            version++;
+            DictionaryNode last = null;
+            DictionaryNode node;
+            for (node = head; node != null; node = node.next) {
+                if ((comparer == null) ? key.Equals(node.key) : comparer.Compare(key, node.key) == 0) {
+                    break;
+                }
+                last = node;
+            }
+            if (node == null) {
+                return;
+            }
+            if (node == head) {
+                head = node.next;
+            } else {
+                last.next = node.next;
+            }
+            count--;
+        }
+
+        private class NodeEnumerator : IDictionaryEnumerator {
+            ListDictionary list;
+            DictionaryNode current;
+            int version;
+            bool start;
+
+
+            public NodeEnumerator(ListDictionary list) {
+                this.list = list;
+                version = list.version;
+                start = true;
+                current = null;
+            }
+
+            public object Current {
+                get {
+                    return Entry;
+                }
+            }
+
+            public DictionaryEntry Entry {
+                get {
+                    if (current == null) {
+                        throw new InvalidOperationException();
+                    }
+                    return new DictionaryEntry(current.key, current.value);
+                }
+            }
+
+            public object Key {
+                get {
+                    if (current == null) {
+                        throw new InvalidOperationException();
+                    }
+                    return current.key;
+                }
+            }
+
+            public object Value {
+                get {
+                    if (current == null) {
+                        throw new InvalidOperationException();
+                    }
+                    return current.value;
+                }
+            }
+
+            public bool MoveNext() {
+                if (version != list.version) {
+                    throw new InvalidOperationException("Collection was modified after the enumerator was instantiated.");
+                }
+                if (start) {
+                    current = list.head;
+                    start = false;
+                }
+                else if(current != null) {
+                    current = current.next;
+                }
+                return (current != null);
+            }
+
+            public void Reset() {
+                if (version != list.version) {
+                    throw new InvalidOperationException("Collection was modified after the enumerator was instantiated.");
+                }
+                start = true;
+                current = null;
+            }
+
+        }
+
+
+        private class NodeKeyValueCollection : ICollection {
+            ListDictionary list;
+            bool isKeys;
+
+            public NodeKeyValueCollection(ListDictionary list, bool isKeys) {
+                this.list = list;
+                this.isKeys = isKeys;
+            }
+
+            void ICollection.CopyTo(Array array, int index)  {
+                if (array==null)
+                    throw new ArgumentNullException("array");
+                if (index < 0)
+                    throw new ArgumentOutOfRangeException("index");
+                for (DictionaryNode node = list.head; node != null; node = node.next) {
+                    array.SetValue(isKeys ? node.key : node.value, index);
+                    index++;
+                }
+            }
+
+            int ICollection.Count {
+                get {
+                    int count = 0;
+                    for (DictionaryNode node = list.head; node != null; node = node.next) {
+                        count++;
+                    }
+                    return count;
+                }
+            }
+
+            bool ICollection.IsSynchronized {
+                get {
+                    return false;
+                }
+            }
+
+            object ICollection.SyncRoot {
+                get {
+                    return list.SyncRoot;
+                }
+            }
+
+            IEnumerator IEnumerable.GetEnumerator() {
+                return new NodeKeyValueEnumerator(list, isKeys);
+            }
+
+
+            private class NodeKeyValueEnumerator: IEnumerator {
+                ListDictionary list;
+                DictionaryNode current;
+                int version;
+                bool isKeys;
+                bool start;
+
+                public NodeKeyValueEnumerator(ListDictionary list, bool isKeys) {
+                    this.list = list;
+                    this.isKeys = isKeys;
+                    this.version = list.version;
+                    this.start = true;
+                    this.current = null;
+                }
+
+                public object Current {
+                    get {
+                        if (current == null) {
+                            throw new InvalidOperationException("Enumerator is positioned before the first element or after the last element of the collection.");
+                        }
+                        return isKeys ? current.key : current.value;
+                    }
+                }
+
+                public bool MoveNext() {
+                    if (version != list.version) {
+                        throw new InvalidOperationException("Collection was modified after the enumerator was instantiated.");
+                    }
+                    if (start) {
+                        current = list.head;
+                        start = false;
+                    }
+                    else {
+                        current = current.next;
+                    }
+                    return (current != null);
+                }
+
+                public void Reset() {
+                    if (version != list.version) {
+                        throw new InvalidOperationException("Collection was modified after the enumerator was instantiated.");
+                    }
+                    start = true;
+                    current = null;
+                }
+            }
+        }
+
+        private class DictionaryNode {
+            public object key;
+            public object value;
+            public DictionaryNode next;
+        }
+    }
+}
diff --git a/base/Kernel/System/Collections/Specialized/StringDictionary.cs b/base/Kernel/System/Collections/Specialized/StringDictionary.cs
new file mode 100644
index 0000000..a3a3083
--- /dev/null
+++ b/base/Kernel/System/Collections/Specialized/StringDictionary.cs
@@ -0,0 +1,163 @@
+//------------------------------------------------------------------------------
+// <copyright file="StringDictionary.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+/*
+ */
+namespace System.Collections.Specialized {
+    using System.Runtime.InteropServices;
+    using System.Diagnostics;
+    using System;
+    using System.Collections;
+    using System.Globalization;
+
+    /// <devdoc>
+    ///    <para>Implements a hashtable with the key strongly typed to be
+    ///       a string rather than an object. </para>
+    /// </devdoc>
+    public class StringDictionary : IEnumerable {
+
+        internal Hashtable contents = new Hashtable();
+
+        /// <devdoc>
+        /// <para>Initializes a new instance of the System.Windows.Forms.StringDictionary class.</para>
+        /// </devdoc>
+        public StringDictionary() {
+        }
+
+
+        /// <devdoc>
+        /// <para>Gets the number of key-and-value pairs in the System.Windows.Forms.StringDictionary.</para>
+        /// </devdoc>
+        public virtual int Count {
+            get {
+                return contents.Count;
+            }
+        }
+
+
+        /// <devdoc>
+        /// <para>Indicates whether access to the System.Windows.Forms.StringDictionary is synchronized (thread-safe). This property is
+        ///    read-only.</para>
+        /// </devdoc>
+        public virtual bool IsSynchronized {
+            get {
+                return contents.IsSynchronized;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>Gets or sets the value associated with the specified key.</para>
+        /// </devdoc>
+        public virtual string this[string key] {
+            get {
+                if( key == null ) {
+                    throw new ArgumentNullException("key");
+                }
+
+                return (string) contents[key.ToLower()];
+            }
+            set {
+                if( key == null ) {
+                    throw new ArgumentNullException("key");
+                }
+
+                contents[key.ToLower()] = value;
+            }
+        }
+
+        /// <devdoc>
+        /// <para>Gets a collection of keys in the System.Windows.Forms.StringDictionary.</para>
+        /// </devdoc>
+        public virtual ICollection Keys {
+            get {
+                return contents.Keys;
+            }
+        }
+
+
+        /// <devdoc>
+        /// <para>Gets an object that can be used to synchronize access to the System.Windows.Forms.StringDictionary.</para>
+        /// </devdoc>
+        public virtual object SyncRoot {
+            get {
+                return contents.SyncRoot;
+            }
+        }
+
+        /// <devdoc>
+        /// <para>Gets a collection of values in the System.Windows.Forms.StringDictionary.</para>
+        /// </devdoc>
+        public virtual ICollection Values {
+            get {
+                return contents.Values;
+            }
+        }
+
+        /// <devdoc>
+        /// <para>Adds an entry with the specified key and value into the System.Windows.Forms.StringDictionary.</para>
+        /// </devdoc>
+        public virtual void Add(string key, string value) {
+            if( key == null ) {
+                throw new ArgumentNullException("key");
+            }
+
+            contents.Add(key.ToLower(), value);
+        }
+
+        /// <devdoc>
+        /// <para>Removes all entries from the System.Windows.Forms.StringDictionary.</para>
+        /// </devdoc>
+        public virtual void Clear() {
+            contents.Clear();
+        }
+
+        /// <devdoc>
+        ///    <para>Determines if the string dictionary contains a specific key</para>
+        /// </devdoc>
+        public virtual bool ContainsKey(string key) {
+            if( key == null ) {
+                throw new ArgumentNullException("key");
+            }
+
+            return contents.ContainsKey(key.ToLower());
+        }
+
+        /// <devdoc>
+        /// <para>Determines if the System.Windows.Forms.StringDictionary contains a specific value.</para>
+        /// </devdoc>
+        public virtual bool ContainsValue(string value) {
+            return contents.ContainsValue(value);
+        }
+
+        /// <devdoc>
+        /// <para>Copies the string dictionary values to a one-dimensional <see cref='System.Array'/> instance at the
+        ///    specified index.</para>
+        /// </devdoc>
+        public virtual void CopyTo(Array array, int index) {
+            contents.CopyTo(array, index);
+        }
+
+        /// <devdoc>
+        ///    <para>Returns an enumerator that can iterate through the string dictionary.</para>
+        /// </devdoc>
+        public virtual IEnumerator GetEnumerator() {
+            return contents.GetEnumerator();
+        }
+
+        /// <devdoc>
+        ///    <para>Removes the entry with the specified key from the string dictionary.</para>
+        /// </devdoc>
+        public virtual void Remove(string key) {
+            if( key == null ) {
+                throw new ArgumentNullException("key");
+            }
+
+            contents.Remove(key.ToLower());
+        }
+
+    }
+
+}
diff --git a/base/Kernel/System/Collections/Stack.cs b/base/Kernel/System/Collections/Stack.cs
new file mode 100644
index 0000000..47c396c
--- /dev/null
+++ b/base/Kernel/System/Collections/Stack.cs
@@ -0,0 +1,341 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: Stack
+**
+**
+** Purpose: An array implementation of a stack.
+**
+** Date: October 7, 1999
+**
+=============================================================================*/
+namespace System.Collections {
+    using System;
+
+    // A simple stack of objects.  Internally it is implemented as an array,
+    // so Push can be O(n).  Pop is O(1).
+    //| <include path='docs/doc[@for="Stack"]/*' />
+    public class Stack : ICollection, ICloneable {
+        private Object[] _array;     // Storage for stack elements
+        private int _size;           // Number of items in the stack.
+        private int _version;        // Used to keep enumerator in sync w/ collection.
+
+        private const int _defaultCapacity = 10;
+
+        //| <include path='docs/doc[@for="Stack.Stack"]/*' />
+        public Stack() {
+            _array = new Object[_defaultCapacity];
+            _size = 0;
+            _version = 0;
+        }
+
+        // Create a stack with a specific initial capacity.  The initial capacity
+        // must be a non-negative number.
+        //| <include path='docs/doc[@for="Stack.Stack1"]/*' />
+        public Stack(int initialCapacity) {
+            if (initialCapacity < 0)
+                throw new ArgumentOutOfRangeException("initialCapacity", "ArgumentOutOfRange_NeedNonNegNum");
+            if (initialCapacity < _defaultCapacity)
+                initialCapacity = _defaultCapacity;  // Simplify doubling logic in Push.
+            _array = new Object[initialCapacity];
+            _size = 0;
+            _version = 0;
+        }
+
+        // Fills a Stack with the contents of a particular collection.  The items are
+        // pushed onto the stack in the same order they are read by the enumerator.
+        //
+        //| <include path='docs/doc[@for="Stack.Stack2"]/*' />
+        public Stack(ICollection col) : this((col==null ? 32 : col.Count))
+        {
+            if (col==null)
+                throw new ArgumentNullException("col");
+            IEnumerator en = col.GetEnumerator();
+            while(en.MoveNext())
+                Push(en.Current);
+        }
+
+        //| <include path='docs/doc[@for="Stack.Count"]/*' />
+        public virtual int Count {
+            get { return _size; }
+        }
+
+        //| <include path='docs/doc[@for="Stack.IsSynchronized"]/*' />
+        public virtual bool IsSynchronized {
+            get { return false; }
+        }
+
+        //| <include path='docs/doc[@for="Stack.SyncRoot"]/*' />
+        public virtual Object SyncRoot {
+            get { return this; }
+        }
+
+        // Removes all Objects from the Stack.
+        //| <include path='docs/doc[@for="Stack.Clear"]/*' />
+        public virtual void Clear() {
+            Array.Clear(_array, 0, _size); // Don't need to doc this but we clear the elements so that the GC can reclaim the references.
+            _size = 0;
+            _version++;
+        }
+
+        //| <include path='docs/doc[@for="Stack.Clone"]/*' />
+        public virtual Object Clone() {
+            Stack s = new Stack(_size);
+            s._size = _size;
+            Array.Copy(_array, 0, s._array, 0, _size);
+            s._version = _version;
+            return s;
+        }
+
+        //| <include path='docs/doc[@for="Stack.Contains"]/*' />
+        public virtual bool Contains(Object obj) {
+            int count = _size;
+
+            while (count-- > 0) {
+                if (obj == null) {
+                    if (_array[count] == null)
+                        return true;
+                }
+                else if (obj.Equals(_array[count])) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        // Copies the stack into an array.
+        //| <include path='docs/doc[@for="Stack.CopyTo"]/*' />
+        public virtual void CopyTo(Array array, int index) {
+            if (array==null)
+                throw new ArgumentNullException("array");
+            if (array.Rank != 1)
+                throw new ArgumentException("Arg_RankMultiDimNotSupported");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - index < _size)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            int i = 0;
+            if (array is Object[]) {
+                Object[] objArray = (Object[]) array;
+                while(i < _size) {
+                    objArray[i+index] = _array[_size-i-1];
+                    i++;
+                }
+            }
+            else {
+                while(i < _size) {
+                    array.SetValue(_array[_size-i-1], i+index);
+                    i++;
+                }
+            }
+        }
+
+        // Returns an IEnumerator for this Stack.
+        //| <include path='docs/doc[@for="Stack.GetEnumerator"]/*' />
+        public virtual IEnumerator GetEnumerator() {
+            return new StackEnumerator(this);
+        }
+
+        // Returns the top object on the stack without removing it.  If the stack
+        // is empty, Peek throws an InvalidOperationException.
+        //| <include path='docs/doc[@for="Stack.Peek"]/*' />
+        public virtual Object Peek() {
+            if (_size==0)
+                throw new InvalidOperationException("InvalidOperation_EmptyStack");
+            return _array[_size-1];
+        }
+
+        // Pops an item from the top of the stack.  If the stack is empty, Pop
+        // throws an InvalidOperationException.
+        //| <include path='docs/doc[@for="Stack.Pop"]/*' />
+        public virtual Object Pop() {
+            if (_size == 0)
+                throw new InvalidOperationException("InvalidOperation_EmptyStack");
+            _version++;
+            Object obj = _array[--_size];
+            _array[_size] = null;     // Free memory quicker.
+            return obj;
+        }
+
+        // Pushes an item to the top of the stack.
+        //
+        //| <include path='docs/doc[@for="Stack.Push"]/*' />
+        public virtual void Push(Object obj) {
+            if (_size == _array.Length) {
+                Object[] newArray = new Object[2*_array.Length];
+                Array.Copy(_array, 0, newArray, 0, _size);
+                _array = newArray;
+            }
+            _array[_size++] = obj;
+            _version++;
+        }
+
+        // Returns a synchronized Stack.
+        //
+        //| <include path='docs/doc[@for="Stack.Synchronized"]/*' />
+        public static Stack Synchronized(Stack stack) {
+            if (stack==null)
+                throw new ArgumentNullException("stack");
+            return new SyncStack(stack);
+        }
+
+
+        // Copies the Stack to an array, in the same order Pop would return the items.
+        //| <include path='docs/doc[@for="Stack.ToArray"]/*' />
+        public virtual Object[] ToArray()
+        {
+            Object[] objArray = new Object[_size];
+            int i = 0;
+            while(i < _size) {
+                objArray[i] = _array[_size-i-1];
+                i++;
+            }
+            return objArray;
+        }
+
+        private class SyncStack : Stack
+        {
+            private Stack _s;
+            private Object _root;
+
+            internal SyncStack(Stack stack) {
+                _s = stack;
+                _root = stack.SyncRoot;
+            }
+
+            public override bool IsSynchronized {
+                get { return true; }
+            }
+
+            public override Object SyncRoot {
+                get {
+                    return _root;
+                }
+            }
+
+            public override int Count {
+                get {
+                    lock (_root) {
+                        return _s.Count;
+                    }
+                }
+            }
+
+            public override bool Contains(Object obj) {
+                lock (_root) {
+                    return _s.Contains(obj);
+                }
+            }
+
+            public override Object Clone()
+            {
+                lock (_root) {
+                    return new SyncStack((Stack)_s.Clone());
+                }
+            }
+
+            public override void Clear() {
+                lock (_root) {
+                    _s.Clear();
+                }
+            }
+
+            public override void CopyTo(Array array, int arrayIndex) {
+                lock (_root) {
+                    _s.CopyTo(array, arrayIndex);
+                }
+            }
+
+            public override void Push(Object value) {
+                lock (_root) {
+                    _s.Push(value);
+                }
+            }
+
+            public override Object Pop() {
+                lock (_root) {
+                    return _s.Pop();
+                }
+            }
+
+            public override IEnumerator GetEnumerator() {
+                lock (_root) {
+                    return _s.GetEnumerator();
+                }
+            }
+
+            public override Object Peek() {
+                lock (_root) {
+                    return _s.Peek();
+                }
+            }
+
+            public override Object[] ToArray() {
+                lock (_root) {
+                    return _s.ToArray();
+                }
+            }
+        }
+
+        private class StackEnumerator : IEnumerator, ICloneable
+        {
+            private Stack _stack;
+            private int _index;
+            private int _version;
+            private Object currentElement;
+
+            internal StackEnumerator(Stack stack) {
+                _stack = stack;
+                _version = _stack._version;
+                _index = -2;
+                currentElement = null;
+            }
+
+            public Object Clone()
+            {
+                return MemberwiseClone();
+            }
+
+            public virtual bool MoveNext() {
+                bool retval;
+                if (_version != _stack._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                if (_index == -2) {  // First call to enumerator.
+                    _index = _stack._size-1;
+                    retval = ( _index >= 0);
+                    if (retval)
+                        currentElement = _stack._array[_index];
+                    return retval;
+                }
+                if (_index == -1) {  // End of enumeration.
+                    return false;
+                }
+
+                retval = (--_index >= 0);
+                if (retval)
+                    currentElement = _stack._array[_index];
+                else
+                    currentElement = null;
+                return retval;
+            }
+
+            public virtual Object Current {
+                get {
+                    if (_index == -2) throw new InvalidOperationException("InvalidOperation_EnumNotStarted");
+                    if (_index == -1) throw new InvalidOperationException("InvalidOperation_EnumEnded");
+                    return currentElement;
+                }
+            }
+
+            public virtual void Reset() {
+                if (_version != _stack._version) throw new InvalidOperationException("InvalidOperation_EnumFailedVersion");
+                _index = -2;
+                currentElement = null;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Console.cs b/base/Kernel/System/Console.cs
new file mode 100644
index 0000000..b784dd2
--- /dev/null
+++ b/base/Kernel/System/Console.cs
@@ -0,0 +1,394 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: Console
+**
+**
+** Purpose: This class provides access to the standard input, standard output
+**          and standard error streams.
+**
+** Date: March 25, 1999
+**
+=============================================================================*/
+namespace System {
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity.Hal;
+
+    using System;
+    using System.Text;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    using System.Runtime.InteropServices;
+
+    // Provides static fields for console input and output.  Use
+    // Console.In for input from the standard input stream (stdin),
+    // Console.Out for output to stdout, and Console.Error
+    // for output to stderr.  If any of those console streams are
+    // redirected from the command line, these streams will be redirected.
+    // A program can also redirect its own output or input with the
+    // SetIn, SetOut, and SetError methods.
+    //
+    // The distinction between Console.Out and Console.Error is useful
+    // for programs that redirect output to a file or a pipe.  Note that
+    // stdout and stderr can be output to different files at the same
+    // time from the DOS command line:
+    //
+    // someProgram 1> out 2> err
+    //
+    //| <include path='docs/doc[@for="Console"]/*' />
+    public sealed class Console
+    {
+        private Console()
+        {
+            throw new NotSupportedException("NotSupported_Constructor");
+        }
+
+        private static Encoding encoding;
+        private static HalScreen screen = null;
+        private static byte[] byteBuffer;
+        private static int byteChars;
+
+        static Console() {
+            encoding = new UTF8Encoding(false);
+            byteBuffer = new byte[256];
+            for (byteChars = byteBuffer.Length; byteChars > 0; byteChars /= 2) {
+                if (encoding.GetMaxByteCount(byteChars) <= byteBuffer.Length) {
+                    break;
+                }
+            }
+            if (byteChars == 0) {
+                byteChars = 1;
+            }
+        }
+
+        [CLSCompliant(false)]
+        public static HalScreen Screen
+        {
+            get { return screen; }
+            set { screen = value; }
+        }
+
+        private static void WriteInternal(char[] buffer, int index, int count)
+        {
+            while (index < count) {
+                int charLen = Math.Min(byteChars, count - index);
+                int byteLen = encoding.GetBytes(buffer, index, charLen, byteBuffer, 0);
+                if (byteLen > 0) {
+                    if (screen != null) {
+                        lock (screen)
+                        {
+                            screen.Write(byteBuffer, 0, byteLen);
+                        }
+                    }
+                }
+                index += charLen;
+            }
+        }
+
+        private static void WriteInternal(String value)
+        {
+            int index = 0;
+            int count = value.Length;
+
+            while (index < count) {
+                int charLen = Math.Min(byteChars, count - index);
+                int byteLen = encoding.GetBytes(value, index, charLen, byteBuffer, 0);
+                if (byteLen > 0) {
+                    if (screen != null) {
+                        lock (screen)
+                        {
+                            screen.Write(byteBuffer, 0, byteLen);
+                        }
+                    }
+                }
+                index += charLen;
+            }
+        }
+
+        private static void WriteNewLine()
+        {
+            WriteInternal(Environment.NewLine);
+        }
+
+        public static void Clear()
+        {
+            if (screen != null)
+            {
+                lock (screen)
+                {
+                    screen.Clear();
+                }
+            }
+        }
+
+        public static void CursorFlash()
+        {
+            if (screen != null)
+            {
+                lock (screen)
+                {
+                    screen.CursorFlash();
+                }
+            }
+        }
+
+        public static void CursorHide()
+        {
+            if (screen != null)
+            {
+                lock (screen)
+                {
+                    screen.CursorHide();
+                }
+            }
+        }
+
+        public static void CursorShow()
+        {
+            if (screen != null)
+            {
+                lock (screen)
+                {
+                    screen.CursorShow();
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine"]/*' />
+        public static void WriteLine()
+        {
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine13"]/*' />
+        public static void WriteLine(String value)
+        {
+            WriteInternal(value);
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine1"]/*' />
+        public static void WriteLine(bool value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine2"]/*' />
+        public static void WriteLine(char value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine3"]/*' />
+        public static void WriteLine(char[] buffer)
+        {
+            WriteInternal(buffer, 0, buffer.Length);
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine4"]/*' />
+        public static void WriteLine(char[] buffer, int index, int count)
+        {
+            WriteInternal(buffer, index, count);
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine5"]/*' />
+        public static void WriteLine(decimal value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine6"]/*' />
+        public static void WriteLine(double value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine7"]/*' />
+        public static void WriteLine(float value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine8"]/*' />
+        public static void WriteLine(int value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine9"]/*' />
+        [CLSCompliant(false)]
+        public static void WriteLine(uint value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine10"]/*' />
+        public static void WriteLine(long value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine11"]/*' />
+        [CLSCompliant(false)]
+        public static void WriteLine(ulong value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine12"]/*' />
+        public static void WriteLine(Object value)
+        {
+            WriteInternal(value.ToString());
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine14"]/*' />
+        public static void WriteLine(String format, Object arg0)
+        {
+            WriteInternal(String.Format(format, arg0));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine15"]/*' />
+        public static void WriteLine(String format, Object arg0, Object arg1)
+        {
+            WriteInternal(String.Format(format, arg0, arg1));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine16"]/*' />
+        public static void WriteLine(String format, Object arg0, Object arg1, Object arg2)
+        {
+            WriteInternal(String.Format(format, arg0, arg1, arg2));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.WriteLine18"]/*' />
+        public static void WriteLine(String format, params Object[] args)
+        {
+            WriteInternal(String.Format(format, args));
+            WriteNewLine();
+        }
+
+        //| <include path='docs/doc[@for="Console.Write"]/*' />
+        public static void Write(String format, Object arg0)
+        {
+            WriteInternal(String.Format(format, arg0));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write1"]/*' />
+        public static void Write(String format, Object arg0, Object arg1)
+        {
+            WriteInternal(String.Format(format, arg0, arg1));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write2"]/*' />
+        public static void Write(String format, Object arg0, Object arg1, Object arg2)
+        {
+            WriteInternal(String.Format(format, arg0, arg1, arg2));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write4"]/*' />
+        public static void Write(String format, params Object[] args)
+        {
+            WriteInternal(String.Format(format, args));
+        }
+
+        //| <include path='docs/doc[@for="Console.Write5"]/*' />
+        public static void Write(bool value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write6"]/*' />
+        public static void Write(char value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write7"]/*' />
+        public static void Write(char[] buffer)
+        {
+            WriteInternal(buffer, 0, buffer.Length);
+        }
+
+        //| <include path='docs/doc[@for="Console.Write8"]/*' />
+        public static void Write(char[] buffer, int index, int count)
+        {
+            WriteInternal(buffer, index, count);
+        }
+
+        //| <include path='docs/doc[@for="Console.Write9"]/*' />
+        public static void Write(double value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write10"]/*' />
+        public static void Write(decimal value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write11"]/*' />
+        public static void Write(float value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write12"]/*' />
+        public static void Write(int value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write13"]/*' />
+        [CLSCompliant(false)]
+        public static void Write(uint value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write14"]/*' />
+        public static void Write(long value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write15"]/*' />
+        [CLSCompliant(false)]
+        public static void Write(ulong value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write16"]/*' />
+        public static void Write(Object value)
+        {
+            WriteInternal(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="Console.Write17"]/*' />
+        public static void Write(String value)
+        {
+            WriteInternal(value);
+        }
+    }
+}
diff --git a/base/Kernel/System/DateTime.cs b/base/Kernel/System/DateTime.cs
new file mode 100644
index 0000000..ba10538
--- /dev/null
+++ b/base/Kernel/System/DateTime.cs
@@ -0,0 +1,770 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using Microsoft.Singularity;
+
+    using System;
+    using System.Threading;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using CultureInfo = System.Globalization.CultureInfo;
+
+    // This value type represents a date and time.  Every DateTime
+    // object has a private field (Ticks) of type Int64 that stores the
+    // date and time as the number of 100 nanosecond intervals since
+    // 12:00 AM January 1, year 1 A.D. in the proleptic Gregorian Calendar.
+    //
+    // DateTime spans from 1 A.D. to ~29247 A.D.
+    //
+    // For a description of various calendar issues, look at
+    //
+    // Calendar Studies web site, at
+    // http://serendipity.nofadz.com/hermetic/cal_stud.htm.
+    //
+    //
+    // Warning about 2 digit years
+    // As a temporary hack until we get new DateTime <;->; String code,
+    // some systems won't be able to round trip dates less than 1930.  This
+    // is because we're using OleAut's string parsing routines, which look
+    // at your computer's default short date string format, which uses 2 digit
+    // years on most computers.  To fix this, go to Control Panel ->; Regional
+    // Settings ->; Date and change the short date style to something like
+    // "M/d/yyyy" (specifying four digits for the year).
+    //
+    //| <include path='docs/doc[@for="DateTime"]/*' />
+    [StructLayout(LayoutKind.Auto)]
+    public struct DateTime : IComparable, IFormattable
+    {
+        // Number of 100ns ticks per time unit
+        public const long TicksPerMillisecond = 10000;
+        public const long TicksPerSecond = TicksPerMillisecond * 1000;
+        public const long TicksPerMinute = TicksPerSecond * 60;
+        public const long TicksPerHour = TicksPerMinute * 60;
+        public const long TicksPerDay = TicksPerHour * 24;
+
+        // Number of milliseconds per time unit
+        private const int MillisPerSecond = 1000;
+        private const int MillisPerMinute = MillisPerSecond * 60;
+        private const int MillisPerHour = MillisPerMinute * 60;
+        private const int MillisPerDay = MillisPerHour * 24;
+
+        // Number of days in a non-leap year
+        private const int DaysPerYear = 365;
+        // Number of days in 4 years
+        private const int DaysPer4Years = DaysPerYear * 4 + 1;
+        // Number of days in 100 years
+        private const int DaysPer100Years = DaysPer4Years * 25 - 1;
+        // Number of days in 400 years
+        private const int DaysPer400Years = DaysPer100Years * 4 + 1;
+
+        // Number of days from 1/1/0001 to 12/31/1600
+        private const int DaysTo1601 = DaysPer400Years * 4;
+        // Number of days from 1/1/0001 to 12/30/1899
+        private const int DaysTo1899 = DaysPer400Years * 4 + DaysPer100Years * 3 - 367;
+        // Number of days from 1/1/0001 to 12/31/9999
+        private const int DaysTo10000 = DaysPer400Years * 25 - 366;
+
+        private const long MinTicks = 0;
+        private const long MaxTicks = DaysTo10000 * TicksPerDay - 1;
+        private const long MaxMillis = (long)DaysTo10000 * MillisPerDay;
+
+        private const long FileTimeOffset = DaysTo1601 * TicksPerDay;
+
+        private const int DatePartYear = 0;
+        private const int DatePartDayOfYear = 1;
+        private const int DatePartMonth = 2;
+        private const int DatePartDay = 3;
+
+        private static readonly int[] DaysToMonth365 = {
+            0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
+        private static readonly int[] DaysToMonth366 = {
+            0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366};
+
+        //| <include path='docs/doc[@for="DateTime.MinValue"]/*' />
+        public static readonly DateTime MinValue = new DateTime(MinTicks);
+        //| <include path='docs/doc[@for="DateTime.MaxValue"]/*' />
+        public static readonly DateTime MaxValue = new DateTime(MaxTicks);
+
+        //
+        // NOTE yslin: Before the time zone is introduced, ticks is based on 1/1/0001 local time.
+        //
+        private long ticks;
+
+        // Constructs a DateTime from a tick count. The ticks
+        // argument specifies the date as the number of 100-nanosecond intervals
+        // that have elapsed since 1/1/0001 12:00am.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime"]/*' />
+        public DateTime(long ticks) {
+            if (ticks < MinTicks || ticks > MaxTicks)
+                throw new ArgumentOutOfRangeException("ticks", "ArgumentOutOfRange_DateTimeBadTicks");
+            this.ticks = ticks;
+        }
+
+#if SINGULARITY_KERNEL
+        [NoHeapAllocation]
+        public DateTime(long ticksFound, bool ignoreMe) {
+            this.ticks = ticksFound;
+            if (ticks < MinTicks || ticks > MaxTicks)
+                DebugStub.Break();
+        }
+#endif
+
+        // Constructs a DateTime from a given year, month, and day. The
+        // time-of-day of the resulting DateTime is always midnight.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime1"]/*' />
+        public DateTime(int year, int month, int day) {
+            ticks = DateToTicks(year, month, day);
+        }
+
+        // Constructs a DateTime from a given year, month, day, hour,
+        // minute, and second.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime3"]/*' />
+        public DateTime(int year, int month, int day, int hour, int minute, int second) {
+            ticks = DateToTicks(year, month, day) + TimeToTicks(hour, minute, second);
+        }
+
+        // Constructs a DateTime from a given year, month, day, hour,
+        // minute, and second.
+        //
+        //| <include path='docs/doc[@for="DateTime.DateTime5"]/*' />
+        public DateTime(int year, int month, int day, int hour, int minute, int second, int millisecond) {
+            ticks = DateToTicks(year, month, day) + TimeToTicks(hour, minute, second);
+            if (millisecond < 0 || millisecond >= MillisPerSecond) {
+                throw new ArgumentOutOfRangeException("millisecond", String.Format("ArgumentOutOfRange_Range", 0, MillisPerSecond - 1));
+            }
+            ticks += millisecond * TicksPerMillisecond;
+            if (ticks < MinTicks || ticks > MaxTicks)
+                throw new ArgumentException("Arg_DateTimeRange");
+        }
+
+        // Returns the DateTime resulting from adding the given
+        // TimeSpan to this DateTime.
+        //
+        //| <include path='docs/doc[@for="DateTime.Add"]/*' />
+        public DateTime Add(TimeSpan value) {
+            return new DateTime(ticks + value._ticks);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // time units to this DateTime.
+        private DateTime Add(long value, int scale) {
+            long millis = value * scale;
+            if (millis <= -MaxMillis || millis >= MaxMillis) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_AddValue");
+            }
+            return new DateTime(ticks + millis * TicksPerMillisecond);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // days to this DateTime. The result is computed by rounding the
+        // fractional number of days given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddDays"]/*' />
+        public DateTime AddDays(long value) {
+            return Add(value, MillisPerDay);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // hours to this DateTime. The result is computed by rounding the
+        // fractional number of hours given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddHours"]/*' />
+        public DateTime AddHours(long value) {
+            return Add(value, MillisPerHour);
+        }
+
+        // Returns the DateTime resulting from the given number of
+        // milliseconds to this DateTime. The result is computed by rounding
+        // the number of milliseconds given by value to the nearest integer,
+        // and adding that interval to this DateTime. The value
+        // argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddMilliseconds"]/*' />
+        public DateTime AddMilliseconds(long value) {
+            return Add(value, 1);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // minutes to this DateTime. The result is computed by rounding the
+        // fractional number of minutes given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddMinutes"]/*' />
+        public DateTime AddMinutes(long value) {
+            return Add(value, MillisPerMinute);
+        }
+
+        // Returns the DateTime resulting from adding the given number of
+        // months to this DateTime. The result is computed by incrementing
+        // (or decrementing) the year and month parts of this DateTime by
+        // months months, and, if required, adjusting the day part of the
+        // resulting date downwards to the last day of the resulting month in the
+        // resulting year. The time-of-day part of the result is the same as the
+        // time-of-day part of this DateTime.
+        //
+        // In more precise terms, considering this DateTime to be of the
+        // form y / m / d + t, where y is the
+        // year, m is the month, d is the day, and t is the
+        // time-of-day, the result is y1 / m1 / d1 + t,
+        // where y1 and m1 are computed by adding months months
+        // to y and m, and d1 is the largest value less than
+        // or equal to d that denotes a valid day in month m1 of year
+        // y1.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddMonths"]/*' />
+        public DateTime AddMonths(int months) {
+            if (months < -120000 || months > 120000) throw new ArgumentOutOfRangeException("months", "ArgumentOutOfRange_DateTimeBadMonths");
+            int y = GetDatePart(DatePartYear);
+            int m = GetDatePart(DatePartMonth);
+            int d = GetDatePart(DatePartDay);
+            int i = m - 1 + months;
+            if (i >= 0) {
+                m = i % 12 + 1;
+                y = y + i / 12;
+            }
+            else {
+                m = 12 + (i + 1) % 12;
+                y = y + (i - 11) / 12;
+            }
+            int days = DaysInMonth(y, m);
+            if (d > days) d = days;
+            return new DateTime(DateToTicks(y, m, d) + ticks % TicksPerDay);
+        }
+
+        // Returns the DateTime resulting from adding a number of
+        // seconds to this DateTime. The result is computed by rounding the
+        // fractional number of seconds given by value to the nearest
+        // millisecond, and adding that interval to this DateTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddSeconds"]/*' />
+        public DateTime AddSeconds(long value) {
+            return Add(value, MillisPerSecond);
+        }
+
+        // Returns the DateTime resulting from adding the given number of
+        // 100-nanosecond ticks to this DateTime. The value argument
+        // is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddTicks"]/*' />
+        public DateTime AddTicks(long value) {
+            return new DateTime(ticks + value);
+        }
+
+        // Returns the DateTime resulting from adding the given number of
+        // years to this DateTime. The result is computed by incrementing
+        // (or decrementing) the year part of this DateTime by value
+        // years. If the month and day of this DateTime is 2/29, and if the
+        // resulting year is not a leap year, the month and day of the resulting
+        // DateTime becomes 2/28. Otherwise, the month, day, and time-of-day
+        // parts of the result are the same as those of this DateTime.
+        //
+        //| <include path='docs/doc[@for="DateTime.AddYears"]/*' />
+        public DateTime AddYears(int value) {
+            return AddMonths(value * 12);
+        }
+
+
+
+        // Compares two DateTime values, returning an integer that indicates
+        // their relationship.
+        //
+        //| <include path='docs/doc[@for="DateTime.Compare"]/*' />
+        public static int Compare(DateTime t1, DateTime t2) {
+            if (t1.ticks > t2.ticks) return 1;
+            if (t1.ticks < t2.ticks) return -1;
+            return 0;
+        }
+
+        // Compares this DateTime to a given object. This method provides an
+        // implementation of the IComparable interface. The object
+        // argument must be another DateTime, or otherwise an exception
+        // occurs.  Null is considered less than any instance.
+        //
+        // Returns a value less than zero if this  object
+        //| <include path='docs/doc[@for="DateTime.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) return 1;
+            if (!(value is DateTime)) {
+                throw new ArgumentException("Arg_MustBeDateTime");
+            }
+
+            long t = ((DateTime)value).ticks;
+            if (ticks > t) return 1;
+            if (ticks < t) return -1;
+            return 0;
+        }
+
+        // Returns the tick count corresponding to the given year, month, and day.
+        // Will check the if the parameters are valid.
+        private static long DateToTicks(int year, int month, int day) {
+            if (year >= 1 && year <= 9999 && month >= 1 && month <= 12) {
+                int[] days = IsLeapYear(year)? DaysToMonth366: DaysToMonth365;
+                if (day >= 1 && day <= days[month] - days[month - 1]) {
+                    int y = year - 1;
+                    int n = y * 365 + y / 4 - y / 100 + y / 400 + days[month - 1] + day - 1;
+                    return n * TicksPerDay;
+                }
+            }
+            throw new ArgumentOutOfRangeException("ArgumentOutOfRange_BadYearMonthDay");
+        }
+
+        // Return the tick count corresponding to the given hour, minute, second.
+        // Will check the if the parameters are valid.
+        private static long TimeToTicks(int hour, int minute, int second)
+        {
+            //TimeSpan.TimeToTicks is a family access function which does no error checking, so
+            //we need to put some error checking out here.
+            if (hour >= 0 && hour < 24 && minute >= 0 && minute < 60 && second >=0 && second < 60)
+            {
+                return (TimeSpan.TimeToTicks(hour, minute, second));
+            }
+            throw new ArgumentOutOfRangeException("ArgumentOutOfRange_BadHourMinuteSecond");
+        }
+
+        // Returns the number of days in the month given by the year and
+        // month arguments.
+        //
+        //| <include path='docs/doc[@for="DateTime.DaysInMonth"]/*' />
+        public static int DaysInMonth(int year, int month) {
+            if (month < 1 || month > 12) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_Month");
+            int[] days = IsLeapYear(year)? DaysToMonth366: DaysToMonth365;
+            return days[month] - days[month - 1];
+        }
+
+        // Checks if this DateTime is equal to a given object. Returns
+        // true if the given object is a boxed DateTime and its value
+        // is equal to the value of this DateTime. Returns false
+        // otherwise.
+        //
+        //| <include path='docs/doc[@for="DateTime.Equals"]/*' />
+        public override bool Equals(Object value) {
+            if (value is DateTime) {
+                return ticks == ((DateTime)value).ticks;
+            }
+            return false;
+        }
+
+        // Compares two DateTime values for equality. Returns true if
+        // the two DateTime values are equal, or false if they are
+        // not equal.
+        //
+        //| <include path='docs/doc[@for="DateTime.Equals1"]/*' />
+        public static bool Equals(DateTime t1, DateTime t2) {
+            return t1.ticks == t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.FromFileTimeUtc"]/*' />
+        public static DateTime FromFileTimeUtc(long fileTime) {
+            if (fileTime < 0)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_FileTimeInvalid");
+
+            // This is the ticks in Universal time for this fileTime.
+            long universalTicks = fileTime + FileTimeOffset;
+            return new DateTime(universalTicks);
+        }
+
+        // Returns the date part of this DateTime. The resulting value
+        // corresponds to this DateTime with the time-of-day part set to
+        // zero (midnight).
+        //
+        //| <include path='docs/doc[@for="DateTime.Date"]/*' />
+        public DateTime Date {
+            get { return new DateTime(ticks - ticks % TicksPerDay); }
+        }
+
+        // Returns a given date part of this DateTime. This method is used
+        // to compute the year, day-of-year, month, or day part.
+        [NoHeapAllocation]
+        private int GetDatePart(int part) {
+            // n = number of days since 1/1/0001
+            int n = (int)(ticks / TicksPerDay);
+            // y400 = number of whole 400-year periods since 1/1/0001
+            int y400 = n / DaysPer400Years;
+            // n = day number within 400-year period
+            n -= y400 * DaysPer400Years;
+            // y100 = number of whole 100-year periods within 400-year period
+            int y100 = n / DaysPer100Years;
+            // Last 100-year period has an extra day, so decrement result if 4
+            if (y100 == 4) y100 = 3;
+            // n = day number within 100-year period
+            n -= y100 * DaysPer100Years;
+            // y4 = number of whole 4-year periods within 100-year period
+            int y4 = n / DaysPer4Years;
+            // n = day number within 4-year period
+            n -= y4 * DaysPer4Years;
+            // y1 = number of whole years within 4-year period
+            int y1 = n / DaysPerYear;
+            // Last year has an extra day, so decrement result if 4
+            if (y1 == 4) y1 = 3;
+            // If year was requested, compute and return it
+            if (part == DatePartYear) {
+                return y400 * 400 + y100 * 100 + y4 * 4 + y1 + 1;
+            }
+            // n = day number within year
+            n -= y1 * DaysPerYear;
+            // If day-of-year was requested, return it
+            if (part == DatePartDayOfYear) return n + 1;
+            // Leap year calculation looks different from IsLeapYear since y1, y4,
+            // and y100 are relative to year 1, not year 0
+            bool leapYear = y1 == 3 && (y4 != 24 || y100 == 3);
+            int[] days = leapYear? DaysToMonth366: DaysToMonth365;
+            // All months have less than 32 days, so n >> 5 is a good conservative
+            // estimate for the month
+            int m = n >> 5 + 1;
+            // m = 1-based month number
+            while (n >= days[m]) m++;
+            // If month was requested, return it
+            if (part == DatePartMonth) return m;
+            // Return 1-based day-of-month
+            return n - days[m - 1] + 1;
+        }
+
+        // Returns the day-of-month part of this DateTime. The returned
+        // value is an integer between 1 and 31.
+        //
+        //| <include path='docs/doc[@for="DateTime.Day"]/*' />
+        public int Day {
+            [NoHeapAllocation]
+            get { return GetDatePart(DatePartDay); }
+        }
+
+        // Returns the day-of-week part of this DateTime. The returned value
+        // is an integer between 0 and 6, where 0 indicates Sunday, 1 indicates
+        // Monday, 2 indicates Tuesday, 3 indicates Wednesday, 4 indicates
+        // Thursday, 5 indicates Friday, and 6 indicates Saturday.
+        //
+        //| <include path='docs/doc[@for="DateTime.DayOfWeek"]/*' />
+        public DayOfWeek DayOfWeek {
+            get { return (DayOfWeek)((ticks / TicksPerDay + 1) % 7); }
+        }
+
+        // Returns the day-of-year part of this DateTime. The returned value
+        // is an integer between 1 and 366.
+        //
+        //| <include path='docs/doc[@for="DateTime.DayOfYear"]/*' />
+        public int DayOfYear {
+            get { return GetDatePart(DatePartDayOfYear); }
+        }
+
+        // Returns the hash code for this DateTime.
+        //
+        //| <include path='docs/doc[@for="DateTime.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (int)ticks ^ (int)(ticks >> 32);
+        }
+
+        // Returns the hour part of this DateTime. The returned value is an
+        // integer between 0 and 23.
+        //
+        //| <include path='docs/doc[@for="DateTime.Hour"]/*' />
+        public int Hour {
+            get { return (int)((ticks / TicksPerHour) % 24); }
+        }
+
+        // Returns the millisecond part of this DateTime. The returned value
+        // is an integer between 0 and 999.
+        //
+        //| <include path='docs/doc[@for="DateTime.Millisecond"]/*' />
+        public int Millisecond {
+            get { return (int)((ticks / TicksPerMillisecond) % 1000); }
+        }
+
+        // Returns the minute part of this DateTime. The returned value is
+        // an integer between 0 and 59.
+        //
+        //| <include path='docs/doc[@for="DateTime.Minute"]/*' />
+        public int Minute {
+            get { return (int)((ticks / TicksPerMinute) % 60); }
+        }
+
+        // Returns the month part of this DateTime. The returned value is an
+        // integer between 1 and 12.
+        //
+        //| <include path='docs/doc[@for="DateTime.Month"]/*' />
+        public int Month {
+            get { return GetDatePart(DatePartMonth); }
+        }
+
+        private static DateTime GetUtcTime()
+        {
+            return SystemClock.GetUtcTime();
+        }
+
+        // Returns a DateTime representing the current date and time. The
+        // resolution of the returned value depends on the system timer. For
+        // Windows NT 3.5 and later the timer resolution is approximately 10ms,
+        // for Windows NT 3.1 it is approximately 16ms, and for Windows 95 and 98
+        // it is approximately 55ms.
+        //
+        //| <include path='docs/doc[@for="DateTime.Now"]/*' />
+        public static DateTime Now {
+            get { return GetUtcTime(); }
+        }
+
+        //| <include path='docs/doc[@for="DateTime.UtcNow"]/*' />
+        public static DateTime UtcNow {
+            get { return GetUtcTime(); }
+        }
+
+        public static DateTime BootTime {
+            get { return Now - SystemClock.KernelUpTime; }
+        }
+
+        // Returns the second part of this DateTime. The returned value is
+        // an integer between 0 and 59.
+        //
+        //| <include path='docs/doc[@for="DateTime.Second"]/*' />
+        public int Second {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerSecond) % 60); }
+        }
+
+        // Returns the tick count for this DateTime. The returned value is
+        // the number of 100-nanosecond intervals that have elapsed since 1/1/0001
+        // 12:00am.
+        //
+        //| <include path='docs/doc[@for="DateTime.Ticks"]/*' />
+        public long Ticks {
+            [NoHeapAllocation]
+            get { return ticks; }
+        }
+
+        // Returns the time-of-day part of this DateTime. The returned value
+        // is a TimeSpan that indicates the time elapsed since midnight.
+        //
+        //| <include path='docs/doc[@for="DateTime.TimeOfDay"]/*' />
+        public TimeSpan TimeOfDay {
+            get { return new TimeSpan(ticks % TicksPerDay); }
+        }
+
+        // Returns a DateTime representing the current date. The date part
+        // of the returned value is the current date, and the time-of-day part of
+        // the returned value is zero (midnight).
+        //
+        //| <include path='docs/doc[@for="DateTime.Today"]/*' />
+        public static DateTime Today {
+            get {
+                long ticks = Now.Ticks;
+                return new DateTime(ticks - ticks % TicksPerDay);
+            }
+        }
+
+        // Returns the year part of this DateTime. The returned value is an
+        // integer between 1 and 9999.
+        //
+        //| <include path='docs/doc[@for="DateTime.Year"]/*' />
+        public int Year {
+            [NoHeapAllocation]
+            get { return GetDatePart(DatePartYear); }
+        }
+
+        // Checks whether a given year is a leap year. This method returns true if
+        // year is a leap year, or false if not.
+        //
+        //| <include path='docs/doc[@for="DateTime.IsLeapYear"]/*' />
+        [NoHeapAllocation]
+        public static bool IsLeapYear(int year) {
+            return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0);
+        }
+
+        // Constructs a DateTime from a string. The string must specify a
+        // date and optionally a time in a culture-specific or universal format.
+        // Leading and trailing whitespace characters are allowed.
+        //
+        //| <include path='docs/doc[@for="DateTime.Parse"]/*' />
+        public static DateTime Parse(String s) {
+            throw new Exception("Parse not supported in Bartok");
+        }
+
+        // Constructs a DateTime from a string. The string must specify a
+        // date and optionally a time in a culture-specific or universal format.
+        // Leading and trailing whitespace characters are allowed.
+        //
+        //| <include path='docs/doc[@for="DateTime.ParseExact"]/*' />
+        public static DateTime ParseExact(String s, String format) {
+            throw new Exception("Parse not supported in Bartok");
+        }
+
+        //| <include path='docs/doc[@for="DateTime.Subtract"]/*' />
+        public TimeSpan Subtract(DateTime value) {
+            return new TimeSpan(ticks - value.ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.Subtract1"]/*' />
+        public DateTime Subtract(TimeSpan value) {
+            return new DateTime(ticks - value._ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToFileTimeUtc"]/*' />
+        public long ToFileTimeUtc() {
+            long t = this.ticks - FileTimeOffset;
+            if (t < 0) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_FileTimeInvalid");
+            return t;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToLongDateString"]/*' />
+        public String ToLongDateString() {
+            return (ToString("D"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToLongTimeString"]/*' />
+        public String ToLongTimeString() {
+            return (ToString("T"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToShortDateString"]/*' />
+        public String ToShortDateString() {
+            return (ToString("d"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToShortTimeString"]/*' />
+        public String ToShortTimeString() {
+            return (ToString("t"));
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToString3"]/*' />
+        public String ToString(String format) {
+            // US-centric representation for now, until we have proper
+            // globalization in Singularity.
+            //
+            // The only special support here is for RFC1123 ("R" / "r")
+            if (format != null && (format.Equals("R") || format.Equals("r"))) {
+                return String.Format("{0:s}, {1:d02} {2:s} {3:d} {4:d02}:{5:d02}:{6:d02} GMT",
+                                     GetShortWeekday(), Day, GetShortMonth(), Year,
+                                     Hour, Minute, Second);
+            } else {
+                return String.Format("{0:d}/{1:d}/{2:d} {3:d}:{4:d}:{5:d}",
+                                     Month, Day, Year, Hour, Minute, Second);
+            }
+        }
+
+        public DateTime ToLocalTime() {
+            long tickCount = this.ticks;
+            return new DateTime(tickCount);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.ToUniversalTime"]/*' />
+        public DateTime ToUniversalTime() {
+            long tickCount = this.ticks;
+            return new DateTime(tickCount);
+        }
+
+
+        //| <include path='docs/doc[@for="DateTime.operatorADD"]/*' />
+        public static DateTime operator +(DateTime d, TimeSpan t) {
+            return new DateTime(d.ticks + t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorSUB"]/*' />
+        public static DateTime operator -(DateTime d, TimeSpan t) {
+            return new DateTime(d.ticks - t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorSUB1"]/*' />
+        public static TimeSpan operator -(DateTime d1, DateTime d2) {
+            return new TimeSpan(d1.ticks - d2.ticks);
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorEQ"]/*' />
+        [NoHeapAllocation]
+        public static bool operator ==(DateTime d1, DateTime d2) {
+            return d1.ticks == d2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorNE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator !=(DateTime d1, DateTime d2) {
+            return d1.ticks != d2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorLT"]/*' />
+        [NoHeapAllocation]
+        public static bool operator <(DateTime t1, DateTime t2) {
+            return t1.ticks < t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorLE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator <=(DateTime t1, DateTime t2) {
+            return t1.ticks <= t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorGT"]/*' />
+        [NoHeapAllocation]
+        public static bool operator >(DateTime t1, DateTime t2) {
+            return t1.ticks > t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="DateTime.operatorGE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator >=(DateTime t1, DateTime t2) {
+            return t1.ticks >= t2.ticks;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="DateTime.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.DateTime;
+        }
+
+        private string GetShortWeekday()
+        {
+            // Hardcoded USA-English until we support globalization
+            switch(DayOfWeek) {
+                case DayOfWeek.Monday : return "Mon";
+                case DayOfWeek.Tuesday : return "Tue";
+                case DayOfWeek.Wednesday : return "Wed";
+                case DayOfWeek.Thursday : return "Thu";
+                case DayOfWeek.Friday : return "Fri";
+                case DayOfWeek.Saturday : return "Sat";
+                case DayOfWeek.Sunday : return "Sun";
+            }
+
+            return null;
+        }
+
+        private string GetShortMonth()
+        {
+            // Hardcoded USA-English until we support globalization
+            switch(Month) {
+                case 1 : return "Jan";
+                case 2 : return "Feb";
+                case 3 : return "Mar";
+                case 4 : return "Apr";
+                case 5 : return "May";
+                case 6 : return "Jun";
+                case 7 : return "Jul";
+                case 8 : return "Aug";
+                case 9 : return "Sep";
+                case 10 : return "Oct";
+                case 11 : return "Nov";
+                case 12 : return "Dec";
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/base/Kernel/System/DayOfWeek.cs b/base/Kernel/System/DayOfWeek.cs
new file mode 100644
index 0000000..82a05bb
--- /dev/null
+++ b/base/Kernel/System/DayOfWeek.cs
@@ -0,0 +1,35 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: DayOfWeek
+**
+**
+** Purpose: Enum for the day of the week.
+**
+** Date: November 28, 2000
+**
+============================================================*/
+namespace System {
+
+    //| <include path='docs/doc[@for="DayOfWeek"]/*' />
+    public enum DayOfWeek {
+        //| <include path='docs/doc[@for="DayOfWeek.Sunday "]/*' />
+        Sunday = 0,
+        //| <include path='docs/doc[@for="DayOfWeek.Monday "]/*' />
+        Monday = 1,
+        //| <include path='docs/doc[@for="DayOfWeek.Tuesday "]/*' />
+        Tuesday = 2,
+        //| <include path='docs/doc[@for="DayOfWeek.Wednesday "]/*' />
+        Wednesday = 3,
+        //| <include path='docs/doc[@for="DayOfWeek.Thursday "]/*' />
+        Thursday = 4,
+        //| <include path='docs/doc[@for="DayOfWeek.Friday "]/*' />
+        Friday = 5,
+        //| <include path='docs/doc[@for="DayOfWeek.Saturday "]/*' />
+        Saturday = 6,
+    }
+}
diff --git a/base/Kernel/System/Decimal.cs b/base/Kernel/System/Decimal.cs
new file mode 100644
index 0000000..bcb6b0b
--- /dev/null
+++ b/base/Kernel/System/Decimal.cs
@@ -0,0 +1,993 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    // Implements the Decimal data type. The Decimal data type can
+    // represent values ranging from -79,228,162,514,264,337,593,543,950,335 to
+    // 79,228,162,514,264,337,593,543,950,335 with 28 significant digits. The
+    // Decimal data type is ideally suited to financial calculations that
+    // require a large number of significant digits and no round-off errors.
+    //
+    // The finite set of values of type Decimal are of the form m
+    // / 10e, where m is an integer such that
+    // -296 < m < 296, and e is an integer
+    // between 0 and 28 inclusive.
+    //
+    // Contrary to the float and double data types, decimal
+    // fractional numbers such as 0.1 can be represented exactly in the
+    // Decimal representation. In the float and double
+    // representations, such numbers are often infinite fractions, making those
+    // representations more prone to round-off errors.
+    //
+    // The Decimal class implements widening conversions from the
+    // ubyte, char, short, int, and long types
+    // to Decimal. These widening conversions never loose any information
+    // and never throw exceptions. The Decimal class also implements
+    // narrowing conversions from Decimal to ubyte, char,
+    // short, int, and long. These narrowing conversions round
+    // the Decimal value towards zero to the nearest integer, and then
+    // converts that integer to the destination type. An OverflowException
+    // is thrown if the result is not within the range of the destination type.
+    //
+    // The Decimal class provides narrowing conversions to and from the
+    // float and double types. A conversion from Decimal to
+    // float or double may loose precision, but will not loose
+    // information about the overall magnitude of the numeric value, and will never
+    // throw an exception. A conversion from float or double to
+    // Decimal throws an OverflowException if the value is not within
+    // the range of the Decimal type.
+    //| <include path='docs/doc[@for="Decimal"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Decimal : IFormattable, IComparable
+    {
+        // Sign mask for the flags field. A value of zero in this bit indicates a
+        // positive Decimal value, and a value of one in this bit indicates a
+        // negative Decimal value.
+        //
+        // Look at OleAut's DECIMAL_NEG constant to check for negative values
+        // in native code.
+        //| <include path='docs/doc[@for="Decimal.SignMask"]/*' />
+        private const int SignMask  = unchecked((int)0x80000000);
+
+        // Scale mask for the flags field. This byte in the flags field contains
+        // the power of 10 to divide the Decimal value by. The scale byte must
+        // contain a value between 0 and 28 inclusive.
+        //| <include path='docs/doc[@for="Decimal.ScaleMask"]/*' />
+        private const int ScaleMask = 0x00FF0000;
+
+        // Number of bits scale is shifted by.
+        private const int ScaleShift = 16;
+
+        // Constant representing the Decimal value 0.
+        //| <include path='docs/doc[@for="Decimal.Zero"]/*' />
+        public const Decimal Zero = 0m;
+
+        // Constant representing the Decimal value 1.
+        //| <include path='docs/doc[@for="Decimal.One"]/*' />
+        public const Decimal One = 1m;
+
+        // Constant representing the Decimal value -1.
+        //| <include path='docs/doc[@for="Decimal.MinusOne"]/*' />
+        public const Decimal MinusOne = -1m;
+
+        // Constant representing the largest possible Decimal value. The value of
+        // this constant is 79,228,162,514,264,337,593,543,950,335.
+        //| <include path='docs/doc[@for="Decimal.MaxValue"]/*' />
+        public const Decimal MaxValue = 79228162514264337593543950335m;
+
+        // Constant representing the smallest possible Decimal value. The value of
+        // this constant is -79,228,162,514,264,337,593,543,950,335.
+        //| <include path='docs/doc[@for="Decimal.MinValue"]/*' />
+        public const Decimal MinValue = -79228162514264337593543950335m;
+
+
+        // The lo, mid, hi, and flags fields contain the representation of the
+        // Decimal value. The lo, mid, and hi fields contain the 96-bit integer
+        // part of the Decimal. Bits 0-15 (the lower word) of the flags field are
+        // unused and must be zero; bits 16-23 contain must contain a value between
+        // 0 and 28, indicating the power of 10 to divide the 96-bit integer part
+        // by to produce the Decimal value; bits 24-30 are unused and must be zero;
+        // and finally bit 31 indicates the sign of the Decimal value, 0 meaning
+        // positive and 1 meaning negative.
+        //
+        // NOTE: Do not change the order in which these fields are declared. The
+        // native methods in this class rely on this particular order.
+        private int flags;
+        private int hi;
+        private int lo;
+        private int mid;
+
+        internal short reserved {
+            get { return unchecked((short) (this.flags & 0xFFFF)); }
+            set { this.flags = ((this.flags & ~0xFFFF) | (value & 0xFFFF)); }
+        }
+
+        internal byte scale {
+            get { return unchecked((byte) (this.flags >> 16)); }
+            set { this.flags = ((this.flags & ~0xFF0000) | (value << 16)); }
+        }
+
+        internal bool negative {
+            get { return (this.flags < 0); }
+            set { this.flags = (value ? (this.flags & 0x00FFFFFF) : (this.flags | ~0x7FFFFFFF)); }
+        }
+
+        internal uint hi32 {
+            get { return unchecked((uint) this.hi); }
+            set { this.hi = unchecked((int) value); }
+        }
+
+        internal uint mid32 {
+            get { return unchecked((uint) this.mid); }
+            set { this.mid = unchecked((int) value); }
+        }
+
+        internal uint lo32 {
+            get { return unchecked((uint) this.lo); }
+            set { this.lo = unchecked((int) value); }
+        }
+
+        // Constructs a zero Decimal.
+        //public Decimal() {
+        //    lo = 0;
+        //    mid = 0;
+        //    hi = 0;
+        //    flags = 0;
+        //}
+
+        // Constructs a Decimal from an integer value.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal"]/*' />
+        public Decimal(int value) {
+            if (value >= 0) {
+                flags = 0;
+            }
+            else {
+                flags = SignMask;
+                value = -value;
+            }
+            lo = value;
+            mid = 0;
+            hi = 0;
+        }
+
+        // Constructs a Decimal from an unsigned integer value.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal1"]/*' />
+        [CLSCompliant(false)]
+        public Decimal(uint value) {
+            flags = 0;
+            lo = (int) value;
+            mid = 0;
+            hi = 0;
+        }
+
+        // Constructs a Decimal from a long value.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal2"]/*' />
+        public Decimal(long value) {
+            if (value >= 0) {
+                flags = 0;
+            }
+            else {
+                flags = SignMask;
+                value = -value;
+            }
+            lo = (int)value;
+            mid = (int)(value >> 32);
+            hi = 0;
+        }
+
+        // Constructs a Decimal from an unsigned long value.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal3"]/*' />
+        [CLSCompliant(false)]
+        public Decimal(ulong value) {
+            flags = 0;
+            lo = (int)value;
+            mid = (int)(value >> 32);
+            hi = 0;
+        }
+
+        // Constructs a Decimal from a float value.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal4"]/*' />
+        public Decimal(float value) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::InitSingle
+            if (DecimalFromFloat(value, out this) < 0) {
+                throw new OverflowException("Overflow_Decimal");
+            }
+            this.reserved = 0;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        [GCAnnotation(GCOption.NONE)]
+        private static extern int DecimalFromFloat(float f, out Decimal result);
+
+        // Constructs a Decimal from a double value.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal5"]/*' />
+        public Decimal(double value) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::InitDouble
+            if (DecimalFromDouble(value, out this) < 0) {
+                throw new OverflowException("Overflow_Decimal");
+            }
+            this.reserved = 0;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalFromDouble(double d, out Decimal result);
+
+        // Constructs a Decimal from an integer array containing a binary
+        // representation. The bits argument must be a non-null integer
+        // array with four elements. bits[0], bits[1], and
+        // bits[2] contain the low, middle, and high 32 bits of the 96-bit
+        // integer part of the Decimal. bits[3] contains the scale factor
+        // and sign of the Decimal: bits 0-15 (the lower word) are unused and must
+        // be zero; bits 16-23 must contain a value between 0 and 28, indicating
+        // the power of 10 to divide the 96-bit integer part by to produce the
+        // Decimal value; bits 24-30 are unused and must be zero; and finally bit
+        // 31 indicates the sign of the Decimal value, 0 meaning positive and 1
+        // meaning negative.
+        //
+        // Note that there are several possible binary representations for the
+        // same numeric value. For example, the value 1 can be represented as {1,
+        // 0, 0, 0} (integer value 1 with a scale factor of 0) and equally well as
+        // {1000, 0, 0, 0x30000} (integer value 1000 with a scale factor of 3).
+        // The possible binary representations of a particular value are all
+        // equally valid, and all are numerically equivalent.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal7"]/*' />
+        public Decimal(int[] bits) {
+            if (bits==null)
+                throw new ArgumentNullException("bits");
+            if (bits.Length == 4) {
+                int f = bits[3];
+                if ((f & ~(SignMask | ScaleMask)) == 0 && (f & ScaleMask) <= (28 << 16)) {
+                    lo = bits[0];
+                    mid = bits[1];
+                    hi = bits[2];
+                    flags = f;
+                    return;
+                }
+            }
+            throw new ArgumentException("Arg_DecBitCtor");
+        }
+
+        // Constructs a Decimal from its constituent parts.
+        //
+        //| <include path='docs/doc[@for="Decimal.Decimal8"]/*' />
+        public Decimal(int lo, int mid, int hi, bool isNegative, byte scale) {
+            if (scale > 28)
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_DecimalScale");
+            this.lo = lo;
+            this.mid = mid;
+            this.hi = hi;
+            this.flags = ((int)scale) << 16;
+            if (isNegative)
+                this.flags |= SignMask;
+        }
+
+        // Constructs a Decimal from its constituent parts.
+        private Decimal(int lo, int mid, int hi, int flags) {
+            this.lo = lo;
+            this.mid = mid;
+            this.hi = hi;
+            this.flags = flags;
+        }
+
+        // Returns the absolute value of the given Decimal. If d is
+        // positive, the result is d. If d is negative, the result
+        // is -d.
+        //
+        //| <include path='docs/doc[@for="Decimal.Abs"]/*' />
+        internal static Decimal Abs(Decimal d) {
+            return new Decimal(d.lo, d.mid, d.hi, d.flags & ~SignMask);
+        }
+
+        // Adds two Decimal values.
+        //
+        //| <include path='docs/doc[@for="Decimal.Add"]/*' />
+        public static Decimal Add(Decimal d1, Decimal d2) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Add
+            Decimal result;
+            if (DecimalAdd(ref d2, ref d1, out result) < 0) {
+                throw new OverflowException("Decimal.Add");
+            }
+            result.reserved = 0;
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalAdd(ref Decimal d1, ref Decimal d2,
+                                             out Decimal result);
+
+
+        // Compares two Decimal values, returning an integer that indicates their
+        // relationship.
+        //
+        //| <include path='docs/doc[@for="Decimal.Compare"]/*' />
+        public static int Compare(Decimal d1, Decimal d2) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Compare
+            return (DecimalCompare(ref d2, ref d1) - 1);
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalCompare(ref Decimal d1, ref Decimal d2);
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type Decimal, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Decimal.CompareTo"]/*' />
+        public int CompareTo(Object value)
+        {
+            if (value == null)
+                return 1;
+            if (!(value is Decimal))
+                throw new ArgumentException("Arg_MustBeDecimal");
+
+            return Decimal.Compare(this, (Decimal)value);
+        }
+
+        // Divides two Decimal values.
+        //
+        //| <include path='docs/doc[@for="Decimal.Divide"]/*' />
+        public static Decimal Divide(Decimal d1, Decimal d2) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Divide
+            Decimal result;
+            if (DecimalDivide(ref d2, ref d1, out result) < 0) {
+                throw new OverflowException("Decimal.Divide");
+            }
+            result.reserved = 0;
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalDivide(ref Decimal d1, ref Decimal d2,
+                                                out Decimal result);
+
+        // Checks if this Decimal is equal to a given object. Returns true
+        // if the given object is a boxed Decimal and its value is equal to the
+        // value of this Decimal. Returns false otherwise.
+        //
+        //| <include path='docs/doc[@for="Decimal.Equals"]/*' />
+        public override bool Equals(Object value) {
+            if (value is Decimal) {
+                return Compare(this, (Decimal)value) == 0;
+            }
+            return false;
+        }
+
+
+        // Returns the hash code for this Decimal.
+        //
+        //| <include path='docs/doc[@for="Decimal.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::GetHashCode
+            double dbl;
+            if (DoubleFromDecimal(ref this, out dbl) != 0) {
+                throw new Exception("Decimal.GetHashCode failure");
+            }
+            return dbl.GetHashCode();
+        }
+
+        // Compares two Decimal values for equality. Returns true if the two
+        // Decimal values are equal, or false if they are not equal.
+        //
+        //| <include path='docs/doc[@for="Decimal.Equals1"]/*' />
+        public static bool Equals(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) == 0;
+        }
+
+
+        // Rounds a Decimal to an integer value. The Decimal argument is rounded
+        // towards negative infinity.
+        //
+        //| <include path='docs/doc[@for="Decimal.Floor"]/*' />
+        public static Decimal Floor(Decimal d) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Floor
+            Decimal result;
+            DecimalFloor(ref d, out result);
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalFloor(ref Decimal d, out Decimal result);
+
+        // Converts this Decimal to a string. The resulting string consists of an
+        // optional minus sign ("-") followed to a sequence of digits ("0" - "9"),
+        // optionally followed by a decimal point (".") and another sequence of
+        // digits.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+
+        //| <include path='docs/doc[@for="Decimal.ToString1"]/*' />
+        public String ToString(String format) {
+            return Number.FormatDecimal(this, format);
+        }
+
+
+        // Converts a string to a Decimal. The string must consist of an optional
+        // minus sign ("-") followed by a sequence of digits ("0" - "9"). The
+        // sequence of digits may optionally contain a single decimal point (".")
+        // character. Leading and trailing whitespace characters are allowed.
+        // Parse also a trailing negative sign, and parentheses in the number.
+        //
+        //| <include path='docs/doc[@for="Decimal.Parse"]/*' />
+        public static Decimal Parse(String s) {
+            return Parse(s, NumberStyles.Number);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.Parse1"]/*' />
+        public static Decimal Parse(String s, NumberStyles style) {
+            return Number.ParseDecimal(s, style);
+        }
+
+        /* Returns a binary representation of a <i>Decimal</i>. The return value is an
+         * integer array with four elements. Elements 0, 1, and 2 contain the low,
+         * middle, and high 32 bits of the 96-bit integer part of the <i>Decimal</i>.
+         * Element 3 contains the scale factor and sign of the <i>Decimal</i>: bits 0-15
+         * (the lower word) are unused; bits 16-23 contain a value between 0 and
+         * 28, indicating the power of 10 to divide the 96-bit integer part by to
+         * produce the <i>Decimal</i> value; bits 24-30 are unused; and finally bit 31
+         * indicates the sign of the <i>Decimal</i> value, 0 meaning positive and 1
+         * meaning negative.
+         *
+         * @param d A <i>Decimal</i> value.
+         * @return An integer array with four elements containing the binary
+         * representation of the argument.
+         * @see Decimal(int[])
+         */
+        //| <include path='docs/doc[@for="Decimal.GetBits"]/*' />
+        public static int[] GetBits(Decimal d) {
+            return new int[] {d.lo, d.mid, d.hi, d.flags};
+        }
+
+        public static void GetBytes(Decimal d, byte [] buffer) {
+            if (buffer == null || buffer.Length < 16) {
+                throw new ArgumentException("Arg_MustBe16Bytes");
+            }
+
+            buffer[0] = (byte) d.lo;
+            buffer[1] = (byte) (d.lo >> 8);
+            buffer[2] = (byte) (d.lo >> 16);
+            buffer[3] = (byte) (d.lo >> 24);
+
+            buffer[4] = (byte) d.mid;
+            buffer[5] = (byte) (d.mid >> 8);
+            buffer[6] = (byte) (d.mid >> 16);
+            buffer[7] = (byte) (d.mid >> 24);
+
+            buffer[8] = (byte) d.hi;
+            buffer[9] = (byte) (d.hi >> 8);
+            buffer[10] = (byte) (d.hi >> 16);
+            buffer[11] = (byte) (d.hi >> 24);
+
+            buffer[12] = (byte) d.flags;
+            buffer[13] = (byte) (d.flags >> 8);
+            buffer[14] = (byte) (d.flags >> 16);
+            buffer[15] = (byte) (d.flags >> 24);
+        }
+
+        public static decimal ToDecimal(byte [] buffer) {
+            if (buffer == null || buffer.Length < 16) {
+                throw new ArgumentException("Arg_MustBe16Bytes");
+            }
+
+            int lo = ((int)buffer[0]) | ((int)buffer[1] << 8) | ((int)buffer[2] << 16) | ((int)buffer[3] << 24);
+            int mid = ((int)buffer[4]) | ((int)buffer[5] << 8) | ((int)buffer[6] << 16) | ((int)buffer[7] << 24);
+            int hi = ((int)buffer[8]) | ((int)buffer[9] << 8) | ((int)buffer[10] << 16) | ((int)buffer[11] << 24);
+            int flags = ((int)buffer[12]) | ((int)buffer[13] << 8) | ((int)buffer[14] << 16) | ((int)buffer[15] << 24);
+            return new Decimal(lo,mid,hi,flags);
+        }
+
+
+        // Returns the larger of two Decimal values.
+        //
+        //| <include path='docs/doc[@for="Decimal.Max"]/*' />
+        internal static Decimal Max(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) >= 0? d1: d2;
+        }
+
+        // Returns the smaller of two Decimal values.
+        //
+        //| <include path='docs/doc[@for="Decimal.Min"]/*' />
+        internal static Decimal Min(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) < 0? d1: d2;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.Remainder"]/*' />
+        public static Decimal Remainder(Decimal d1, Decimal d2) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Remainder
+            Decimal tmp = Truncate(Divide(d1, d2));
+            return Subtract(d1, Multiply(d2, tmp));
+        }
+
+        // Multiplies two Decimal values.
+        //
+        //| <include path='docs/doc[@for="Decimal.Multiply"]/*' />
+        public static Decimal Multiply(Decimal d1, Decimal d2) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Multiply
+            Decimal result;
+            if (DecimalMultiply(ref d1, ref d2, out result) < 0) {
+                throw new OverflowException("Decimal.Multiply");
+            }
+            result.reserved = 0;
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalMultiply(ref Decimal d1, ref Decimal d2,
+                                                  out Decimal result);
+
+        // Returns the negated value of the given Decimal. If d is non-zero,
+        // the result is -d. If d is zero, the result is zero.
+        //
+        //| <include path='docs/doc[@for="Decimal.Negate"]/*' />
+        public static Decimal Negate(Decimal d) {
+            return new Decimal(d.lo, d.mid, d.hi, d.flags ^ SignMask);
+        }
+
+        // Rounds a Decimal value to a given number of decimal places. The value
+        // given by d is rounded to the number of decimal places given by
+        // decimals. The decimals argument must be an integer between
+        // 0 and 28 inclusive.
+        //
+        // The operation Decimal.Round(d, dec) conceptually
+        // corresponds to evaluating Decimal.Truncate(d *
+        // 10^dec + delta) / 10^dec, where
+        // delta is 0.5 for positive values of d and -0.5 for
+        // negative values of d.
+        //
+        //| <include path='docs/doc[@for="Decimal.Round"]/*' />
+        public static Decimal Round(Decimal d1, int decimals) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Round
+            Decimal result;
+            if (decimals < 0 || decimals > 28) {
+                throw new ArgumentOutOfRangeException("decimals");
+            }
+            if (DecimalRound(ref d1, decimals, out result) < 0) {
+                throw new OverflowException("Decimal.Round");
+            }
+            result.reserved = 0;
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalRound(ref Decimal d, int decimals,
+                                               out Decimal result);
+
+        // Subtracts two Decimal values.
+        //
+        //| <include path='docs/doc[@for="Decimal.Subtract"]/*' />
+        public static Decimal Subtract(Decimal d1, Decimal d2) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp::Subtract
+            Decimal result;
+            if (DecimalSubtract(ref d1, ref d2, out result) < 0) {
+                throw new OverflowException("Decimal.Subtract");
+            }
+            result.reserved = 0;
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalSubtract(ref Decimal d1, ref Decimal d2,
+                                                  out Decimal result);
+
+        // Converts a Decimal to an unsigned byte. The Decimal value is rounded
+        // towards zero to the nearest integer value, and the result of this
+        // operation is returned as a byte.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToByte"]/*' />
+        public static byte ToByte(Decimal value) {
+            uint temp =  ToUInt32(value);
+            if (temp < Byte.MinValue || temp > Byte.MaxValue) throw new OverflowException("Overflow_Byte");
+            return (byte)temp;
+
+        }
+
+        // Converts a Decimal to a signed byte. The Decimal value is rounded
+        // towards zero to the nearest integer value, and the result of this
+        // operation is returned as a byte.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToSByte"]/*' />
+        [CLSCompliant(false)]
+        public static sbyte ToSByte(Decimal value) {
+            int temp =  ToInt32(value);
+            if (temp < SByte.MinValue || temp > SByte.MaxValue) throw new OverflowException("Overflow_SByte");
+            return (sbyte)temp;
+        }
+
+        // Converts a Decimal to a short. The Decimal value is
+        // rounded towards zero to the nearest integer value, and the result of
+        // this operation is returned as a short.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToInt16"]/*' />
+        public static short ToInt16(Decimal value) {
+            int temp =  ToInt32(value);
+            if (temp < Int16.MinValue || temp > Int16.MaxValue) throw new OverflowException("Overflow_Int16");
+            return (short)temp;
+        }
+
+        // Converts a Decimal to a double. Since a double has fewer significant
+        // digits than a Decimal, this operation may produce round-off errors.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToDouble"]/*' />
+        public static double ToDouble(Decimal d) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp
+            double result;
+            DoubleFromDecimal(ref d, out result);
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DoubleFromDecimal(ref Decimal d, out double result);
+
+        // Converts a Decimal to an integer. The Decimal value is rounded towards
+        // zero to the nearest integer value, and the result of this operation is
+        // returned as an integer.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToInt32"]/*' />
+        public static int ToInt32(Decimal d) {
+            if ((d.flags & ScaleMask) != 0) d = Truncate(d);
+            if (d.hi == 0 && d.mid == 0) {
+                int i = d.lo;
+                if (d.flags >= 0) {
+                    if (i >= 0) return i;
+                }
+                else {
+                    i = -i;
+                    if (i <= 0) return i;
+                }
+            }
+            throw new OverflowException("Overflow_Int32");
+        }
+
+        // Converts a Decimal to a long. The Decimal value is rounded towards zero
+        // to the nearest integer value, and the result of this operation is
+        // returned as a long.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToInt64"]/*' />
+        public static long ToInt64(Decimal d) {
+            if ((d.flags & ScaleMask) != 0) d = Truncate(d);
+            if (d.hi == 0) {
+                long l = d.lo & 0xFFFFFFFFL | (long)d.mid << 32;
+                if (d.flags >= 0) {
+                    if (l >= 0) return l;
+                }
+                else {
+                    l = -l;
+                    if (l <= 0) return l;
+                }
+            }
+            throw new OverflowException("Overflow_Int64");
+        }
+
+        // Converts a Decimal to an ushort. The Decimal
+        // value is rounded towards zero to the nearest integer value, and the
+        // result of this operation is returned as an ushort.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToUInt16"]/*' />
+        [CLSCompliant(false)]
+        public static ushort ToUInt16(Decimal value) {
+            uint temp =  ToUInt32(value);
+            if (temp < UInt16.MinValue || temp > UInt16.MaxValue) throw new OverflowException("Overflow_UInt16");
+            return (ushort)temp;
+        }
+
+        // Converts a Decimal to an unsigned integer. The Decimal
+        // value is rounded towards zero to the nearest integer value, and the
+        // result of this operation is returned as an unsigned integer.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToUInt32"]/*' />
+        [CLSCompliant(false)]
+        public static uint ToUInt32(Decimal d) {
+            if ((d.flags & ScaleMask) != 0) d = Truncate(d);
+            if (d.hi == 0 && d.mid == 0) {
+                uint i = (uint) d.lo;
+                if (d.flags >= 0 || i == 0)
+                    return i;
+            }
+            throw new OverflowException("Overflow_UInt32");
+        }
+
+        // Converts a Decimal to an unsigned long. The Decimal
+        // value is rounded towards zero to the nearest integer value, and the
+        // result of this operation is returned as a long.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToUInt64"]/*' />
+        [CLSCompliant(false)]
+        public static ulong ToUInt64(Decimal d) {
+            if ((d.flags & ScaleMask) != 0) d = Truncate(d);
+            if (d.hi == 0) {
+                ulong l = ((ulong)(uint)d.lo) | ((ulong)(uint)d.mid << 32);
+                if (d.flags >= 0 || l == 0)
+                    return l;
+            }
+            throw new OverflowException("Overflow_UInt64");
+        }
+
+        // Converts a Decimal to a float. Since a float has fewer significant
+        // digits than a Decimal, this operation may produce round-off errors.
+        //
+        //| <include path='docs/doc[@for="Decimal.ToSingle"]/*' />
+        public static float ToSingle(Decimal d) {
+            // rusa: see also Lightning\Src\VM\COMDecimal.cpp
+            float result;
+            FloatFromDecimal(ref d, out result);
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int FloatFromDecimal(ref Decimal d, out float result);
+
+        // Truncates a Decimal to an integer value. The Decimal argument is rounded
+        // towards zero to the nearest integer value, corresponding to removing all
+        // digits after the decimal point.
+        //
+        //| <include path='docs/doc[@for="Decimal.Truncate"]/*' />
+        public static Decimal Truncate(Decimal d) {
+            Decimal result;
+            DecimalTruncate(ref d, out result);
+            return result;
+        }
+
+        [AccessedByRuntime("Output to header:defined in Decimal.cpp")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(1024)]
+        private static extern int DecimalTruncate(ref Decimal d, out Decimal result);
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal"]/*' />
+        public static implicit operator Decimal(byte value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal1"]/*' />
+        [CLSCompliant(false)]
+        public static implicit operator Decimal(sbyte value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal2"]/*' />
+        public static implicit operator Decimal(short value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal3"]/*' />
+        [CLSCompliant(false)]
+        public static implicit operator Decimal(ushort value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal4"]/*' />
+        public static implicit operator Decimal(char value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal5"]/*' />
+        public static implicit operator Decimal(int value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal6"]/*' />
+        [CLSCompliant(false)]
+        public static implicit operator Decimal(uint value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal7"]/*' />
+        public static implicit operator Decimal(long value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal8"]/*' />
+        [CLSCompliant(false)]
+        public static implicit operator Decimal(ulong value) {
+            return new Decimal(value);
+        }
+
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal9"]/*' />
+        public static explicit operator Decimal(float value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDecimal10"]/*' />
+        public static explicit operator Decimal(double value) {
+            return new Decimal(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorbyte"]/*' />
+        public static explicit operator byte(Decimal value) {
+            return ToByte(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorsbyte"]/*' />
+        [CLSCompliant(false)]
+        public static explicit operator sbyte(Decimal value) {
+            return ToSByte(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorchar"]/*' />
+        public static explicit operator char(Decimal value) {
+            return (char)ToUInt16(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorshort"]/*' />
+        public static explicit operator short(Decimal value) {
+            return ToInt16(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorushort"]/*' />
+        [CLSCompliant(false)]
+        public static explicit operator ushort(Decimal value) {
+            return ToUInt16(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorint"]/*' />
+        public static explicit operator int(Decimal value) {
+            return ToInt32(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatoruint"]/*' />
+        [CLSCompliant(false)]
+        public static explicit operator uint(Decimal value) {
+            return ToUInt32(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorlong"]/*' />
+        public static explicit operator long(Decimal value) {
+            return ToInt64(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorulong"]/*' />
+        [CLSCompliant(false)]
+        public static explicit operator ulong(Decimal value) {
+            return ToUInt64(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorfloat"]/*' />
+        public static explicit operator float(Decimal value) {
+            return ToSingle(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatordouble"]/*' />
+        public static explicit operator double(Decimal value) {
+            return ToDouble(value);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorADD1"]/*' />
+        public static Decimal operator +(Decimal d) {
+            return d;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorSUB1"]/*' />
+        public static Decimal operator -(Decimal d) {
+            return Negate(d);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorINC"]/*' />
+        public static Decimal operator ++(Decimal d) {
+            return Add(d, One);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDEC"]/*' />
+        public static Decimal operator --(Decimal d) {
+            return Subtract(d, One);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorADD2"]/*' />
+        public static Decimal operator +(Decimal d1, Decimal d2) {
+            return Add(d1, d2);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorSUB2"]/*' />
+        public static Decimal operator -(Decimal d1, Decimal d2) {
+            return Subtract(d1, d2);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorMUL"]/*' />
+        public static Decimal operator *(Decimal d1, Decimal d2) {
+            return Multiply(d1, d2);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorDIV"]/*' />
+        public static Decimal operator /(Decimal d1, Decimal d2) {
+            return Divide(d1, d2);
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorMOD"]/*' />
+        public static Decimal operator %(Decimal d1, Decimal d2) {
+            return Remainder(d1, d2);
+        }
+
+        /*private static bool operator equals(Decimal d1, Decimal d2) {
+          return Compare(d1, d2) == 0;
+          }
+
+          private static int operator compare(Decimal d1, Decimal d2) {
+          int c = Compare(d1, d2);
+          if (c < 0) return -1;
+          if (c > 0) return 1;
+          return 0;
+          }*/
+
+        //| <include path='docs/doc[@for="Decimal.operatorEQ"]/*' />
+        public static bool operator ==(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) == 0;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorNE"]/*' />
+        public static bool operator !=(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) != 0;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorLT"]/*' />
+        public static bool operator <(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) < 0;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorLE"]/*' />
+        public static bool operator <=(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) <= 0;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorGT"]/*' />
+        public static bool operator >(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) > 0;
+        }
+
+        //| <include path='docs/doc[@for="Decimal.operatorGE"]/*' />
+        public static bool operator >=(Decimal d1, Decimal d2) {
+            return Compare(d1, d2) >= 0;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Decimal.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.Decimal;
+        }
+    }
+}
diff --git a/base/Kernel/System/Delegate.cs b/base/Kernel/System/Delegate.cs
new file mode 100644
index 0000000..6917855
--- /dev/null
+++ b/base/Kernel/System/Delegate.cs
@@ -0,0 +1,522 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+// Verbose runtime tracing
+//#define ENABLE_DEBUG_PRINT
+
+// This class provides runtime support for managing delegates that may have
+// been passed in to native code.
+//
+// The problem with these delegates is that the GC may move the delegate
+// object without being aware of references from native code.  Rather than
+// pinning the objects (which currently operates at a page granularity), we
+// allocate GC-stable indexes ("delegate idxs") which the native code uses in
+// place of the underlying Delegate reference.
+//
+// The entry points from compiled code are:
+//
+//   GetCodePtr, which allocates a short function to enter a delegate, passing
+//   in the delegate idx.
+//
+//   ReleaseCodePtr, which deallocates the function and releases the delegate
+//   idx.
+//
+// The NativeDelegateTable is used to map delegate idxs to Delegate references.
+// References from this table are ordinary strong references as far as the GC
+// is concerned.
+namespace System {
+
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    //| <include path='docs/doc[@for="Delegate"]/*' />
+    [CCtorIsRunDuringStartup]
+    [NoLoggingForUndo]
+    public abstract class Delegate : ICloneable
+    {
+        private IntPtr CodePtr;
+
+        // _method is the MethodInfo representing the target, this is set by
+        //  InternalCreate.
+        [RequiredByBartok]
+        private IntPtr _methodPtr;
+
+        // _target is the object we will invoke o
+        [RequiredByBartok]
+        private Object      _target;
+
+        // In the case of a static method passed to a delegate, this field stores
+        // whatever _methodPtr would have stored: and _methodPtr points to a
+        // small thunk which removes the "this" pointer before going on
+        // to _methodPtrAux.
+        [RequiredByBartok]
+        private IntPtr _methodPtrAux = IntPtr.Zero;
+
+        // Protect the default constructor so you can't build a delegate
+        internal Delegate() {}
+
+        // equals returns true IIF the delegate is not null and has the
+        //      same target, method and invocation list as this object
+        //| <include path='docs/doc[@for="Delegate.Equals"]/*' />
+        public override bool Equals(Object obj)
+        {
+            if (obj != null && obj is Delegate) {
+                Delegate d = (Delegate) obj;
+                if (IsStatic()) {
+                    if (_methodPtrAux==d._methodPtrAux) {
+                        return true;
+                    }
+                } else {
+                    if (d._target == _target &&
+                        d._methodPtr == _methodPtr) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        //| <include path='docs/doc[@for="Delegate.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            if (IsStatic())
+                return this._methodPtrAux.ToInt32();
+            else
+                return this._methodPtr.ToInt32();
+        }
+
+        // Combine creates a new delegate based upon the contents of the
+        //  delegates passed in.
+        //| <include path='docs/doc[@for="Delegate.Combine"]/*' />
+        public static Delegate Combine(Delegate a, Delegate b)
+        {
+            //@TODO: Should this really check to see that they are both multicast
+            //      because it really is an error to try and combine non-multicasts?
+            //      Spec says that it returns null and only does the check if a and b
+            //      are both null.
+
+            // boundary conditions -- if either (or both) delegates is null
+            //      return the other.
+            if (a == null)
+                return b;
+            if (b == null)
+                return a;
+
+            // Verify that the types are the same...
+            if (a.GetType() != b.GetType())
+                throw new ArgumentException("Arg_DlgtTypeMis");
+            return  a.CombineImpl(b);
+        }
+
+        // This method creates a new delegate based upon the passed
+        //  array of delegates.
+        //| <include path='docs/doc[@for="Delegate.Combine1"]/*' />
+        public static Delegate Combine(Delegate[] delegates)
+        {
+            if (delegates == null || delegates.Length == 0)
+                return null;
+
+            Delegate d = delegates[0];
+            for (int i = 1; i < delegates.Length; i++)
+                d = Combine(d,delegates[i]);
+            return d;
+        }
+
+        // Return an array of delegates that represent the invocation list.
+        // This is basically THIS for a Delegate.  MulticastDelegates may
+        // have multiple members.
+        //| <include path='docs/doc[@for="Delegate.GetInvocationList"]/*' />
+        public virtual Delegate[] GetInvocationList() {
+            Delegate[] d = new Delegate[1];
+            d[0] = this;
+            return d;
+        }
+
+        // This routine will return the target
+        //| <include path='docs/doc[@for="Delegate.Target"]/*' />
+        public Object Target
+        {
+            get {return IsStatic() ? null : _target;}
+        }
+
+
+
+        //A quick test to see if this is a delegate to a static method.
+        //@ToDo: Verify with DarylO that this is a sufficient test.
+        private bool IsStatic() {
+            if (_target is Delegate) {
+                return true;
+            }
+            return false;
+        }
+
+        // This will remove the value delegate from the source delegate
+        //  if it found.
+        //| <include path='docs/doc[@for="Delegate.Remove"]/*' />
+        public static Delegate Remove(Delegate source, Delegate value)
+        {
+            if (source == null)
+                return null;
+            if (value == null)
+                return source;
+            return source.RemoveImpl(value);
+        }
+
+        //| <include path='docs/doc[@for="Delegate.RemoveAll"]/*' />
+        public static Delegate RemoveAll(Delegate source, Delegate value)
+        {
+            Delegate newDelegate = null;
+            do {
+                newDelegate = source;
+                source = Remove(source, value);
+            } while (newDelegate != source);
+            return newDelegate;
+        }
+
+        // This is an internal routine that is called to do the combine.  We
+        //  use this to do the combine because the Combine routines are static
+        //  final methods.  In Delegate, this simply throws a MulticastNotSupportedException
+        //  error.  Multicast delegate must implement this.
+        //| <include path='docs/doc[@for="Delegate.CombineImpl"]/*' />
+        protected virtual Delegate CombineImpl(Delegate d)
+        {
+            throw new MulticastNotSupportedException("Multicast_Combine");
+        }
+
+        // This is an internal routine that is called to do the remove.  We use this
+        //  to do the remove because Remove is a static final method.  Here we simply
+        //  make sure that d is equal to this and return null or this.
+        //| <include path='docs/doc[@for="Delegate.RemoveImpl"]/*' />
+        protected virtual Delegate RemoveImpl(Delegate d)
+        {
+            if (_target == d._target && _methodPtr == d._methodPtr)
+                return null;
+            else
+                return this;
+        }
+
+        //| <include path='docs/doc[@for="Delegate.Clone"]/*' />
+        public virtual Object Clone()
+        {
+            return MemberwiseClone();
+        }
+
+        //| <include path='docs/doc[@for="Delegate.operatorEQ"]/*' />
+        public static bool operator ==(Delegate d1, Delegate d2) {
+            if ((Object)d1 == null)
+                return (Object)d2 == null;
+            return d1.Equals(d2);
+        }
+
+        //| <include path='docs/doc[@for="Delegate.operatorNE"]/*' />
+        public static bool operator != (Delegate d1, Delegate d2) {
+            if ((Object)d1 == null)
+                return (Object)d2 != null;
+            return !d1.Equals(d2);
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            _methodPtr = IntPtr.Zero;
+            _target = null;
+        }
+#endif
+
+        // GetCodePtr should be called by the marshalling code with the
+        // delegate and the address of the call back stub for that
+        // delegate class.
+        [RequiredByBartok]
+        private static IntPtr GetCodePtr(Delegate d,IntPtr callBackStub)
+        {
+            IntPtr codePtr = d.CodePtr;
+            if (codePtr == IntPtr.Zero) {
+
+                CriticalSection.AcquireMutex();
+                try {
+                    codePtr = d.CodePtr;
+                    if (codePtr == IntPtr.Zero) {
+                        int idx = AllocateNativeDelegateRecord(d);
+                        codePtr = CreateCodePtr(idx, callBackStub);
+                        d.CodePtr = codePtr;
+                    }
+                } finally {
+                    CriticalSection.ReleaseMutex();
+                }
+            }
+            return codePtr;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        internal static IntPtr FixedAlloc(int sizetdwBytes)
+        {
+            VTable.DebugBreak();
+            return IntPtr.Zero;
+        }
+
+        internal static void FixedFree(IntPtr handle)
+        {
+            VTable.DebugBreak();
+        }
+
+        // Create a little piece of assembly code that adds idx onto the
+        // argument list (by pushing it onto the stack) and jumps to the
+        // call back stub.
+
+        // The idx is added as the first argument.   The calling
+        // convention is assumed to be STDCALL.
+        //
+        // The call back stub is a function created by the Bartok code
+        // generator and:
+        // 1. Uses the idx to get to the delegate via the NativeDelegateTable
+        // 2. Calls the invoke method of the delegate
+
+        private static unsafe IntPtr CreateCodePtr(int idx,
+                                                   IntPtr callBackStub) {
+            IntPtr buffer = FixedAlloc(32);
+            if (buffer == IntPtr.Zero) {
+                return IntPtr.Zero;
+            }
+            // The desired instructions:
+            //      push [sp]
+            //      mov [sp+4], idx
+            //      jmp callBackStub
+            //
+            byte*  codeBuffer = (byte *) buffer.ToPointer();
+            // push [sp]
+            *(codeBuffer) = 0xFF;
+            *(codeBuffer+1) = 0x34;
+            *(codeBuffer+2) = 0x24;
+            // mov [sp+4], idx
+            *(codeBuffer+3) = 0xC7;
+            *(codeBuffer+4) = 0x44;
+            *(codeBuffer+5) = 0x24;
+            *(codeBuffer+6) = 0x04;
+            *((int*) (codeBuffer+7)) = idx;
+            // jmp callBackStub
+            *(codeBuffer+11) = 0xE9;
+            IntPtr disp = callBackStub - buffer;
+            *((int *) (codeBuffer+12)) = (disp - 16).ToInt32();
+            //
+            // pad the rest of the buffer with int 3
+            //
+
+            for (int i=16; i<32; i++) {
+                *(codeBuffer+i) = 0xcc;
+            }
+            return buffer;
+        }
+
+        // This method accepts a code pointer and allows the NativeDelegateRecord
+        // associated with it to be collected. In order to call this method
+        // safely it must be certain that no references to the code ptr exist
+        // in native code.
+        private static unsafe void ReleaseCodePtr(IntPtr codePtr) {
+            byte* codeBuffer = (byte *)codePtr.ToPointer();
+            int idx = *(int*)(codeBuffer+7);
+            Delegate del = IdxToDelegate(idx);
+            del.CodePtr = IntPtr.Zero;
+            CriticalSection.AcquireMutex();
+            try {
+                FreeNativeDelegateRecord(idx);
+            } finally {
+                CriticalSection.ReleaseMutex();
+            }
+            FixedFree(codePtr);
+        }
+
+        // <summary>
+        // The CriticalSection protects the CodePtr fields during
+        // initialization and the NativeDelegateTable arrays when claiming
+        // indexes in them.
+        // </summary>
+        private static readonly Mutex CriticalSection;
+
+        // <summary>
+        // The NativeDelegateTable is held as a triangular array, starting
+        // with small arrays of NativeDelegateRecord structures and using
+        // successively larger arrays as the table is expanded.  This avoids
+        // frequent allocations in programs that pass a lot of delegates
+        // to native code, and allows an idx to map to a (table,offset) pair
+        // in O(log n) steps.
+        // </summary>
+        private static NativeDelegateRecord[][] NativeDelegateTable;
+
+        // In a debug build, start the NativeDelegateTable size very small in order to
+        // force testing of table expansion
+#if DEBUG
+        private const int FIRST_TABLE_SIZE = 1;
+#else
+        private const int FIRST_TABLE_SIZE = 16;
+#endif
+
+        // <summary>
+        // FreeListStartIdx is the idx is the head of the list of NativeDelegateTable
+        // entries that have been freed.  -1 indicates that the free list is empty.
+        // </summary>
+        private static int FreeListStartIdx;
+        private const int FREE_LIST_EMPTY = -1;
+
+        // <summary>
+        // FreeExtentStartIdx is the idx of the start of the contiguous
+        // extent of NativeDelegateTable entries.  These are logically
+        // considered at the end of the free list: we use entries from the free
+        // list in preference to using 'pristine' space from the free extent.
+        // </summary>
+        private static int FreeExtentStartIdx;
+
+        // <summary>
+        // Each entry in the NativeDelegateTable currently holds an ordinary
+        // reference to the Delegate and an integer used to form the free list
+        // of unused records.  We could overload a single field, but note that
+        // (a) we would then need to special-case the GC visiting code and
+        // that (b) during GC we could not simply iterate through the arrays because
+        // we couldn't distinguish free-list entries for allocated ones.
+        //
+        // Of course, we could steal a bit in the object reference to distinguish
+        // the free list, using odd values for the free list to avoid needing
+        // to mask the contents in IdxToDelegate.
+        //
+        // Seems like needless complexity unless we find the table is getting
+        // large.
+        //
+        //  -- tharris
+        // </summary>
+        private struct NativeDelegateRecord {
+            Delegate del;
+            int nextIdx;
+
+            internal void Allocate(Delegate del) {
+                VTable.Assert(this.del == null);
+                this.del = del;
+            }
+
+            internal void DeAllocate(int nextIdx) {
+                VTable.Assert(this.del != null);
+                this.del = null;
+                this.nextIdx = nextIdx;
+            }
+
+            internal Delegate Delegate() {
+                VTable.Assert(this.del != null);
+                return this.del;
+            }
+
+            internal int NextIdx() {
+                VTable.Assert(this.del == null);
+                return this.nextIdx;
+            }
+        }
+
+        // Allocate a native delegate record for "del".  The caller must hold
+        // the CriticalSection.
+        private static int AllocateNativeDelegateRecord(Delegate del) {
+            int idx;
+            int table;
+            int offset;
+
+            DebugPrint("AllocateNativeDelegateRecord (list={0}, extent {1})\n",
+                       __arglist(FreeListStartIdx, FreeExtentStartIdx));
+
+            if (FreeListStartIdx != FREE_LIST_EMPTY) {
+                // There's space in the free list: use that
+                int nextFreeIdx;
+                idx = FreeListStartIdx;
+                SplitIdx (idx, out table, out offset);
+                nextFreeIdx = NativeDelegateTable[table][offset].NextIdx();
+                FreeListStartIdx = nextFreeIdx;
+            } else {
+                // There's no space in the free list, use the next slot in the
+                // free extent.
+                idx = FreeExtentStartIdx;
+                SplitIdx (idx, out table, out offset);
+                FreeExtentStartIdx ++;
+                if (offset + 1 == NativeDelegateTable[table].Length) {
+                    // We've used the last slot in the free extent: allocate some
+                    // more.
+                    int currentLength = NativeDelegateTable[table].Length;
+                    int nextLength = currentLength * 2;
+                    DebugPrint("AllocateNativeDelegateRecord expanding to {0} len {1}\n",
+                               __arglist(table + 1, nextLength));
+                    NativeDelegateTable[table + 1] = new NativeDelegateRecord[nextLength];
+                }
+            }
+
+            NativeDelegateTable[table][offset].Allocate(del);
+
+            DebugPrint("AllocateNativeDelegateRecord got {0} (list={1}, extent {2})\n",
+                       __arglist(idx, FreeListStartIdx, FreeExtentStartIdx));
+
+            return idx;
+        }
+
+        private static void FreeNativeDelegateRecord(int idx) {
+            int table;
+            int offset;
+
+            DebugPrint("FreeNativeDelegateRecord {0} (list={1}, extent {2})\n",
+                       __arglist(idx, FreeListStartIdx, FreeExtentStartIdx));
+
+            SplitIdx (idx, out table, out offset);
+            NativeDelegateTable[table][offset].DeAllocate(FreeListStartIdx);
+            FreeListStartIdx = idx;
+        }
+
+        [RequiredByBartok]
+        private static Delegate IdxToDelegate(int idx) {
+            int table;
+            int offset;
+            Delegate result;
+
+            SplitIdx (idx, out table, out offset);
+            result = NativeDelegateTable[table][offset].Delegate();
+            DebugPrint("IdxToDelegate {0} -> {1}\n", __arglist(idx, result));
+
+            return result;
+        }
+
+        private static void SplitIdx(int idx, out int table, out int offset) {
+            table = 0;
+            offset = idx;
+            while (offset >= NativeDelegateTable[table].Length) {
+                offset -= NativeDelegateTable[table].Length;
+                table ++;
+            }
+            DebugPrint("SplitIdx {0} -> {1}.{2}\n", __arglist(idx, table, offset));
+        }
+
+        static Delegate() {
+            CriticalSection = new Mutex();
+            NativeDelegateTable = new NativeDelegateRecord[24][];
+            NativeDelegateTable[0] = new NativeDelegateRecord[FIRST_TABLE_SIZE];
+            FreeExtentStartIdx = 0;
+            FreeListStartIdx = FREE_LIST_EMPTY;
+
+#if FALSE // Enable this code to force testing of the FreeNativeDelegateRecord fn
+            for (int i = 0; i < FIRST_TABLE_SIZE * 2; i ++) {
+                int idx = AllocateNativeDelegateRecord(CriticalSection);
+                VTable.Assert (idx == i);
+            }
+            for (int i = 0; i < FIRST_TABLE_SIZE * 2; i ++) {
+                FreeNativeDelegateRecord(i);
+            }
+#endif
+        }
+
+        [System.Diagnostics.Conditional("ENABLE_DEBUG_PRINT")]
+        [NoInline]
+        internal static void DebugPrint(String v, __arglist)
+        {
+            VTable.DebugPrint(v, new ArgIterator(__arglist));
+        }
+    }
+}
diff --git a/base/Kernel/System/Diagnostics/Assert.cs b/base/Kernel/System/Diagnostics/Assert.cs
new file mode 100644
index 0000000..bc0b919
--- /dev/null
+++ b/base/Kernel/System/Diagnostics/Assert.cs
@@ -0,0 +1,102 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Diagnostics {
+    using System;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity;
+
+    // Class which handles code asserts.  Asserts are used to explicitly protect
+    // assumptions made in the code.  In general if an assert fails, it indicates
+    // a program bug so is immediately called to the attention of the user.
+    //| <include path='docs/doc[@for="Assert"]/*' />
+    internal class Assert
+    {
+        private static AssertFilter[] ListOfFilters = null;
+        private static int iNumOfFilters = 0;
+        private static int iFilterArraySize = 0;
+        private static AssertFilter DefFil = new DefaultFilter();
+
+        // AddFilter adds a new assert filter. This replaces the current
+        // filter, unless the filter returns FailContinue.
+        //
+        //| <include path='docs/doc[@for="Assert.AddFilter"]/*' />
+        public static void AddFilter(AssertFilter filter)
+        {
+            if (iFilterArraySize <= iNumOfFilters)
+            {
+                    AssertFilter[] newFilterArray = new AssertFilter [iFilterArraySize+2];
+
+                    if (iNumOfFilters > 0)
+                        Array.Copy(ListOfFilters, newFilterArray, iNumOfFilters);
+
+                    iFilterArraySize += 2;
+
+                    ListOfFilters = newFilterArray;
+            }
+
+            ListOfFilters [iNumOfFilters++] = filter;
+        }
+
+        // Called when an assertion is being made.
+        //
+        //| <include path='docs/doc[@for="Assert.Check"]/*' />
+        public static void Check(bool condition, String conditionString, String message)
+        {
+            if (!condition)
+            {
+                Fail (conditionString, message);
+            }
+        }
+
+
+        //| <include path='docs/doc[@for="Assert.Fail"]/*' />
+        public static void Fail(String conditionString, String message)
+        {
+            // Run through the list of filters backwards (the last filter in the list
+            // is the default filter. So we're guaranteed that there will be at least
+            // one filter to handle the assert.
+
+            int iTemp = iNumOfFilters;
+            while (iTemp > 0)
+            {
+
+                AssertFilters iResult = ListOfFilters [--iTemp].AssertFailure (conditionString, message);
+
+                if (iResult == AssertFilters.FailDebug)
+                {
+#if SINGULARITY_KERNEL
+                    DebugStub.Break();
+#elif SINGULARITY_PROCESS
+                    VTable.DebugBreak();
+#endif
+                    break;
+                }
+                else if (iResult == AssertFilters.FailTerminate)
+#if SINGULARITY_KERNEL
+                    Kernel.Shutdown(-1);
+#elif SINGULARITY_PROCESS
+                    AppRuntime.Stop(-1);
+#endif
+                else if (iResult == AssertFilters.FailIgnore)
+                    break;
+
+                // If none of the above, it means that the Filter returned FailContinue.
+                // So invoke the next filter.
+            }
+
+        }
+
+      // Called when an assertion fails.
+      //
+      //| <include path='docs/doc[@for="Assert.ShowDefaultAssertDialog"]/*' />
+      public static int ShowDefaultAssertDialog(String conditionString, String message) {
+          throw new Exception("System.Diagnostics.Assert.ShowDefaultAssertDialog not implemented in Bartok!");
+      }
+    }
+
+
+}
diff --git a/base/Kernel/System/Diagnostics/AssertFilter.cs b/base/Kernel/System/Diagnostics/AssertFilter.cs
new file mode 100644
index 0000000..33e4f95
--- /dev/null
+++ b/base/Kernel/System/Diagnostics/AssertFilter.cs
@@ -0,0 +1,49 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Diagnostics {
+
+
+    using System;
+    // A Filter is used to decide whether an assert failure
+    // should terminate the program (or invoke the debugger).
+
+    abstract internal class AssertFilter
+    {
+
+        // Called when an assert fails.  This should be overridden with logic which
+        // determines whether the program should terminate or not.  Typically this
+        // is done by asking the user.
+        //
+        // condition - String describing condition which failed
+        // message - String with message describing problem
+        //
+        // Returns an enum do determine behavior -
+        // FailDebug indicates the debugger should be invoked
+        // FailIgnore indicates the failure should be ignored & the
+        //          program continued
+        // FailTerminate indicates that the program should be terminated
+        // FailContinue indicates that no decision is made -
+        //      the previous Filter should be invoked
+        abstract public AssertFilters  AssertFailure(String condition, String message);
+
+    }
+
+    internal class DefaultFilter : AssertFilter
+    {
+        internal DefaultFilter()
+        {
+            Assert.AddFilter (this);
+        }
+
+        public override AssertFilters  AssertFailure(String condition, String message)
+
+        {
+            // @COOLPORT: We need to remove this cast.
+            return (AssertFilters) Assert.ShowDefaultAssertDialog (condition, message);
+        }
+    }
+
+}
diff --git a/base/Kernel/System/Diagnostics/AssertFilters.cs b/base/Kernel/System/Diagnostics/AssertFilters.cs
new file mode 100644
index 0000000..6bf9b09
--- /dev/null
+++ b/base/Kernel/System/Diagnostics/AssertFilters.cs
@@ -0,0 +1,24 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Diagnostics {
+
+    /*
+     * FailDebug indicates the debugger should be invoked
+     * FailIgnore indicates the failure should be ignored & the
+     *          program continued
+     * FailTerminate indicates that the program should be terminated
+     * FailContinue indicates that no decision is made -
+     *      the previous Filter should be invoked
+     */
+    using System;
+    internal enum AssertFilters
+    {
+        FailDebug           = 0,
+        FailIgnore          = 1,
+        FailTerminate       = 2,
+        FailContinueFilter  = 3,
+    }
+}
diff --git a/base/Kernel/System/Diagnostics/ConditionalAttribute.cs b/base/Kernel/System/Diagnostics/ConditionalAttribute.cs
new file mode 100644
index 0000000..1bbd402
--- /dev/null
+++ b/base/Kernel/System/Diagnostics/ConditionalAttribute.cs
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+using System;
+
+namespace System.Diagnostics {
+    //| <include path='docs/doc[@for="ConditionalAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple=true)]
+    public sealed class ConditionalAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="ConditionalAttribute.ConditionalAttribute"]/*' />
+        public ConditionalAttribute(String conditionString)
+        {
+            m_conditionString = conditionString;
+        }
+
+        //| <include path='docs/doc[@for="ConditionalAttribute.ConditionString"]/*' />
+        public String ConditionString {
+            get {
+                return m_conditionString;
+            }
+        }
+
+        private String m_conditionString;
+    }
+}
diff --git a/base/Kernel/System/Diagnostics/Debug.cs b/base/Kernel/System/Diagnostics/Debug.cs
new file mode 100644
index 0000000..50aa8d6
--- /dev/null
+++ b/base/Kernel/System/Diagnostics/Debug.cs
@@ -0,0 +1,30 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace System.Diagnostics
+{
+
+    public sealed class Debug {
+
+        [Conditional("DEBUG")]
+        public static void Assert(bool truth)
+        {
+            VTable.Assert(truth);
+        }
+
+        [Conditional("DEBUG")]
+        public static void Assert(bool truth, string statement)
+        {
+            VTable.Assert(truth, statement);
+        }
+
+        public static void AssertValidReference(Object obj) {
+            VTable.Assert(obj == null || obj.vtable != null);
+        }
+    }
+}
diff --git a/base/Kernel/System/Diagnostics/DebuggerAttributes.cs b/base/Kernel/System/Diagnostics/DebuggerAttributes.cs
new file mode 100644
index 0000000..3bd0a76
--- /dev/null
+++ b/base/Kernel/System/Diagnostics/DebuggerAttributes.cs
@@ -0,0 +1,72 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  DebuggerAttributes
+**
+**
+** Purpose: Attributes for debugger
+**
+** Date:  Feb 01, 2000
+**
+===========================================================*/
+
+
+
+namespace System.Diagnostics {
+    //| <include path='docs/doc[@for="DebuggerStepThroughAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Constructor, Inherited = false)]
+    public sealed class DebuggerStepThroughAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="DebuggerStepThroughAttribute.DebuggerStepThroughAttribute"]/*' />
+        public DebuggerStepThroughAttribute () {}
+    }
+
+    //| <include path='docs/doc[@for="DebuggerHiddenAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Constructor, Inherited = false)]
+    public sealed class DebuggerHiddenAttribute : Attribute
+    {
+       //| <include path='docs/doc[@for="DebuggerHiddenAttribute.DebuggerHiddenAttribute"]/*' />
+       public DebuggerHiddenAttribute () {}
+    }
+
+   // Attribute class used by the compiler to mark modules.
+    // If present, then debugging information for everything in the
+   // assembly was generated by the compiler, and will be preserved
+   // by the Runtime so that the debugger can provide full functionality
+   // in the case of JIT attach. If not present, then the compiler may
+   // or may not have included debugging information, and the Runtime
+   // won't preserve the debugging info, which will make debugging after
+   // a JIT attach difficult.
+    //| <include path='docs/doc[@for="DebuggableAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly|AttributeTargets.Module, AllowMultiple = false)]
+    public sealed class DebuggableAttribute : Attribute
+    {
+        bool m_isJITTrackingEnabled;
+        bool m_isJITOptimizerDisabled;
+
+        //| <include path='docs/doc[@for="DebuggableAttribute.DebuggableAttribute"]/*' />
+        public DebuggableAttribute(bool isJITTrackingEnabled,
+                                   bool isJITOptimizerDisabled)
+        {
+            m_isJITTrackingEnabled = isJITTrackingEnabled;
+            m_isJITOptimizerDisabled = isJITOptimizerDisabled;
+        }
+
+        //| <include path='docs/doc[@for="DebuggableAttribute.IsJITTrackingEnabled"]/*' />
+        public bool IsJITTrackingEnabled
+        {
+            get { return m_isJITTrackingEnabled; }
+        }
+
+        //| <include path='docs/doc[@for="DebuggableAttribute.IsJITOptimizerDisabled"]/*' />
+        public bool IsJITOptimizerDisabled
+        {
+            get { return m_isJITOptimizerDisabled; }
+        }
+    }
+}
+
diff --git a/base/Kernel/System/DivideByZeroException.cs b/base/Kernel/System/DivideByZeroException.cs
new file mode 100644
index 0000000..b54e076
--- /dev/null
+++ b/base/Kernel/System/DivideByZeroException.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: DivideByZeroException
+**
+**
+** Purpose: Exception class for bad arithmetic conditions!
+**
+** Date: March 17, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    [RequiredByBartok]
+    //| <include path='docs/doc[@for="DivideByZeroException"]/*' />
+    public class DivideByZeroException : ArithmeticException {
+        //| <include path='docs/doc[@for="DivideByZeroException.DivideByZeroException"]/*' />
+        [AccessedByRuntime("referenced from halasm.asm")]
+        public DivideByZeroException()
+            : base("Arg_DivideByZero") {
+        }
+
+        //| <include path='docs/doc[@for="DivideByZeroException.DivideByZeroException1"]/*' />
+        public DivideByZeroException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="DivideByZeroException.DivideByZeroException2"]/*' />
+        public DivideByZeroException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Double.cs b/base/Kernel/System/Double.cs
new file mode 100644
index 0000000..21391e5
--- /dev/null
+++ b/base/Kernel/System/Double.cs
@@ -0,0 +1,209 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Double
+**
+**
+** Purpose: A representation of an IEEE double precision
+**          floating point number.
+**
+** Date: July 23, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="Double"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Double : IComparable, IFormattable
+    {
+        internal double m_value;
+
+        //
+        // Public Constants
+        //
+        //| <include path='docs/doc[@for="Double.MinValue"]/*' />
+        public const double MinValue = -1.7976931348623157E+308;
+        //| <include path='docs/doc[@for="Double.MaxValue"]/*' />
+        public const double MaxValue = 1.7976931348623157E+308;
+        // Real value of Epsilon: 4.9406564584124654e-324 (0x1), but JVC misparses that
+        // number, giving 2*Epsilon (0x2).
+        //| <include path='docs/doc[@for="Double.Epsilon"]/*' />
+        public const double Epsilon  = 4.9406564584124650E-324;
+        //| <include path='docs/doc[@for="Double.NegativeInfinity"]/*' />
+        public const double NegativeInfinity = (double)-1.0 / (double)(0.0);
+        //| <include path='docs/doc[@for="Double.PositiveInfinity"]/*' />
+        public const double PositiveInfinity = (double)1.0 / (double)(0.0);
+        //| <include path='docs/doc[@for="Double.NaN"]/*' />
+        public const double NaN = (double)0.0 / (double)0.0;
+
+        //
+        // Private constants
+        //
+        private const ulong PositiveInfinityAsUInt64 = 0x7ff0000000000000;
+        private const ulong NegativeInfinityAsUInt64 = 0xfff0000000000000;
+
+        private const ulong ExponentAsUInt64 = 0xfff0000000000000;
+        private const ulong MantissaAsUInt64 = 0x000fffffffffffff;
+
+        //
+        // Native Declarations
+        //
+        //| <include path='docs/doc[@for="Double.IsInfinity"]/*' />
+        public static bool IsInfinity(double d) {
+            ulong v = BitConverter.DoubleToUInt64Bits(d);
+            return (v == PositiveInfinityAsUInt64 ||
+                    v == NegativeInfinityAsUInt64);
+        }
+
+        //| <include path='docs/doc[@for="Double.IsPositiveInfinity"]/*' />
+        public static bool IsPositiveInfinity(double d) {
+            ulong v = BitConverter.DoubleToUInt64Bits(d);
+            return (v == PositiveInfinityAsUInt64);
+        }
+
+        //| <include path='docs/doc[@for="Double.IsNegativeInfinity"]/*' />
+        public static bool IsNegativeInfinity(double d) {
+            ulong v = BitConverter.DoubleToUInt64Bits(d);
+            return (v == NegativeInfinityAsUInt64);
+        }
+
+        //| <include path='docs/doc[@for="Double.IsNaN"]/*' />
+        public static bool IsNaN(double d) {
+            // rusa: see also Lightning\Src\ClassLibNative\Float\COMFloat::IsNAN
+            ulong v = BitConverter.DoubleToUInt64Bits(d);
+            return (((v & PositiveInfinityAsUInt64) == v) &&
+                    ((v & MantissaAsUInt64) != 0));
+        }
+
+        // Compares this object to another object, returning an instance of System.Relation.
+        // Null is considered less than any instance.
+        //
+        // If object is not of type Double, this method throws an ArgumentException.
+        //
+        // Returns a value less than zero if this  object
+        //
+        //| <include path='docs/doc[@for="Double.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is Double) {
+                double d = (double)value;
+                if (m_value < d) return -1;
+                if (m_value > d) return 1;
+                if (m_value == d) return 0;
+
+                // At least one of the values is NaN.
+                // This is busted; NaNs should never compare equal
+                if (IsNaN(m_value))
+                    return (IsNaN(d) ? 0 : -1);
+                else
+                    return 1;
+            }
+            throw new ArgumentException("Arg_MustBeDouble");
+        }
+
+        // True if obj is another Double with the same value as the current instance.  This is
+        // a method of object equality, that only returns true if obj is also a double.
+        //| <include path='docs/doc[@for="Double.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Double)) {
+                return false;
+            }
+            double temp = ((Double)obj).m_value;
+            // This code below is written this way for performance reasons i.e the != and == check is intentional.
+            if (temp == m_value) {
+                return true;
+            }
+            return IsNaN(temp) && IsNaN(m_value);
+        }
+
+        //The hashcode for a double is the absolute value of the integer representation
+        //of that double.
+        //
+        //| <include path='docs/doc[@for="Double.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            long value = unchecked((long)BitConverter.DoubleToUInt64Bits(m_value));
+            return ((int)value) ^ ((int)(value >> 32));
+        }
+
+        //| <include path='docs/doc[@for="Double.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+
+        //| <include path='docs/doc[@for="Double.ToString1"]/*' />
+        public String ToString(String format) {
+            return Number.FormatDouble(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="Double.Parse"]/*' />
+        public static double Parse(String s) {
+            return Parse(s, NumberStyles.Float| NumberStyles.AllowThousands);
+        }
+
+        //| <include path='docs/doc[@for="Double.Parse1"]/*' />
+        public static double Parse(String s, NumberStyles style) {
+            try {
+                return Number.ParseDouble(s, style);
+            } catch (FormatException) {
+                //If we caught a FormatException, it may be from one of our special strings.
+                //Check the three with which we're concerned and rethrow if it's not one of
+                //those strings.
+                String sTrim = s.Trim();
+                if (sTrim.Equals(NumberFormatInfo.positiveInfinitySymbol)) {
+                    return PositiveInfinity;
+                }
+                if (sTrim.Equals(NumberFormatInfo.negativeInfinitySymbol)) {
+                    return NegativeInfinity;
+                }
+                if (sTrim.Equals(NumberFormatInfo.nanSymbol)) {
+                    return NaN;
+                }
+                //Rethrow the previous exception;
+                throw;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Double.TryParse"]/*' />
+        public static bool TryParse(String s, NumberStyles style, out double result) {
+            if (s == null) {
+                result = 0;
+                return false;
+            }
+            bool success = Number.TryParseDouble(s, style, out result);
+            if (!success) {
+                String sTrim = s.Trim();
+                if (sTrim.Equals(NumberFormatInfo.positiveInfinitySymbol)) {
+                    result = PositiveInfinity;
+                } else if (sTrim.Equals(NumberFormatInfo.negativeInfinitySymbol)) {
+                    result = NegativeInfinity;
+                } else if (sTrim.Equals(NumberFormatInfo.nanSymbol)) {
+                    result = NaN;
+                } else
+                    return false; // We really failed
+            }
+            return true;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Double.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.Double;
+        }
+    }
+}
diff --git a/base/Kernel/System/Empty.cs b/base/Kernel/System/Empty.cs
new file mode 100644
index 0000000..e700835
--- /dev/null
+++ b/base/Kernel/System/Empty.cs
@@ -0,0 +1,31 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+// Void
+//  This class represents an empty variant
+////////////////////////////////////////////////////////////////////////////////
+
+namespace System {
+
+    using System;
+
+    //| <include path='docs/doc[@for="Empty"]/*' />
+    internal sealed class Empty
+    {
+        //Package private constructor
+        internal Empty() {
+        }
+
+        //| <include path='docs/doc[@for="Empty.Value"]/*' />
+        public static readonly Empty Value = new Empty();
+
+        //| <include path='docs/doc[@for="Empty.ToString"]/*' />
+        public override String ToString()
+        {
+            return String.Empty;
+        }
+    }
+}
diff --git a/base/Kernel/System/Enum.cs b/base/Kernel/System/Enum.cs
new file mode 100644
index 0000000..4fd4333
--- /dev/null
+++ b/base/Kernel/System/Enum.cs
@@ -0,0 +1,125 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+    using System.Diagnostics;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Bartok.Runtime;
+
+    //| <include path='docs/doc[@for="Enum"]/*' />
+    public abstract class Enum : ValueType, IComparable, IFormattable
+    {
+        //| <include path='docs/doc[@for="Enum.Equals"]/*' />
+        public override bool Equals(Object obj)
+        {
+            Enum that = obj as Enum;
+            if (that == null || this.GetType() != obj.GetType())
+                return false;
+            return this.GetValue().Equals(that.GetValue());
+        }
+
+        //| <include path='docs/doc[@for="Enum.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            return GetValue().GetHashCode();
+        }
+
+        // Compares this enum and the object.
+        // They have to be of the same type or a ArgumentException is thrown
+        // Returns 0 if equal, -1 if less than, or 1 greater then the target
+        //| <include path='docs/doc[@for="Enum.CompareTo"]/*' />
+        public int CompareTo(Object target)
+        {
+            return ((IComparable)GetValue()).CompareTo(target);
+        }
+
+        //| <include path='docs/doc[@for="Enum.ToString"]/*' />
+        public String ToString(String format)
+        {
+            return ((IFormattable)GetValue()).ToString(format);
+        }
+
+        public override String ToString()
+        {
+            return GetValue().ToString();
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Enum.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            StructuralType type = this.vtable.structuralView;
+
+            switch (type) {
+                case StructuralType.Int8:
+                    return TypeCode.SByte;
+                case StructuralType.Int16:
+                    return TypeCode.Int16;
+                case StructuralType.Int32:
+                    return TypeCode.Int32;
+                case StructuralType.Int64:
+                    return TypeCode.Int64;
+                case StructuralType.UInt8:
+                    return TypeCode.Byte;
+                case StructuralType.UInt16:
+                    return TypeCode.UInt16;
+                case StructuralType.UInt32:
+                    return TypeCode.UInt32;
+                case StructuralType.UInt64:
+                    return TypeCode.UInt64;
+                default:
+                    VTable.NotReached("bad enum in InternalGetValue");
+                    return TypeCode.Object;
+            }
+        }
+
+        private Object GetValue()
+        {
+            StructuralType type = this.vtable.structuralView;
+            Object result;
+
+            switch (type) {
+                case StructuralType.Int8:
+                    result = (sbyte) (Object) this;
+                    break;
+                case StructuralType.Int16:
+                    result = (short) (Object) this;
+                    break;
+                case StructuralType.Int32:
+                    result = (int) (Object) this;
+                    break;
+                case StructuralType.Int64:
+                    result = (long) (Object) this;
+                    break;
+                case StructuralType.UInt8:
+                    result = (byte) (Object) this;
+                    break;
+                case StructuralType.UInt16:
+                    result = (ushort) (Object) this;
+                    break;
+                case StructuralType.UInt32:
+                    result = (uint) (Object) this;
+                    break;
+                case StructuralType.UInt64:
+                    result = (ulong) (Object) this;
+                    break;
+                default:
+                    VTable.NotReached("bad enum in InternalGetValue");
+                    result = null;
+                    break;
+            }
+            return result;
+        }
+    }
+}
+
+
+
+
diff --git a/base/Kernel/System/Environment.cs b/base/Kernel/System/Environment.cs
new file mode 100644
index 0000000..083f48c
--- /dev/null
+++ b/base/Kernel/System/Environment.cs
@@ -0,0 +1,60 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: Environment
+**
+**
+** Purpose: Provides some basic access to some environment
+** functionality.
+**
+** Date: March 3, 2000
+**
+============================================================*/
+namespace System {
+    using System.Globalization;
+    using System.Collections;
+    using System.Text;
+    using System.Runtime.InteropServices;
+    using System.Reflection;
+    using System.Diagnostics;
+    using Microsoft.Singularity;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="Environment"]/*' />
+    public sealed class Environment {
+
+        private Environment() {}              // Prevent from begin created
+
+        /*==================================TickCount===================================
+        **Action: Gets the number of ticks since the system was started.
+        **Returns: The number of ticks since the system was started.
+        **Arguments: None
+        **Exceptions: None
+        ==============================================================================*/
+        //| <include path='docs/doc[@for="Environment.TickCount"]/*' />
+        public static int TickCount {
+            get {
+                // 100ns to millisecond conversion.
+                return unchecked((int)(SystemClock.KernelUpTime.Milliseconds));
+            }
+        }
+
+        /*===================================NewLine====================================
+        **Action: A property which returns the appropriate newline string for the given
+        **        platform.
+        **Returns: \r\n on Win32.
+        **Arguments: None.
+        **Exceptions: None.
+        ==============================================================================*/
+        //| <include path='docs/doc[@for="Environment.NewLine"]/*' />
+        public static String NewLine {
+            get {
+                return "\r\n";
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/EventArgs.cs b/base/Kernel/System/EventArgs.cs
new file mode 100644
index 0000000..2c0aedf
--- /dev/null
+++ b/base/Kernel/System/EventArgs.cs
@@ -0,0 +1,23 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*
+ * Information Contained Herein is Proprietary and Confidential.
+ */
+namespace System {
+
+    using System;
+    // The base class for all event classes.
+    //| <include path='docs/doc[@for="EventArgs"]/*' />
+    public class EventArgs {
+        //| <include path='docs/doc[@for="EventArgs.Empty"]/*' />
+        public static readonly EventArgs Empty = new EventArgs();
+
+        //| <include path='docs/doc[@for="EventArgs.EventArgs"]/*' />
+        public EventArgs()
+        {
+        }
+    }
+}
diff --git a/base/Kernel/System/EventHandler.cs b/base/Kernel/System/EventHandler.cs
new file mode 100644
index 0000000..41030dc
--- /dev/null
+++ b/base/Kernel/System/EventHandler.cs
@@ -0,0 +1,14 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*
+ * Information Contained Herein is Proprietary and Confidential.
+ */
+namespace System {
+
+    using System;
+    //| <include path='docs/doc[@for="EventHandler"]/*' />
+    public delegate void EventHandler(Object sender, EventArgs e);
+}
diff --git a/base/Kernel/System/Exception.cs b/base/Kernel/System/Exception.cs
new file mode 100644
index 0000000..23cb789
--- /dev/null
+++ b/base/Kernel/System/Exception.cs
@@ -0,0 +1,179 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: Exception
+**
+**
+** Purpose: The base class for all exceptional conditions.
+**
+** Date: March 11, 1998
+**
+=============================================================================*/
+
+namespace System {
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Diagnostics;
+    using System.Text;
+    using System.Reflection;
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity;
+#elif SINGULARITY_PROCESS
+    using Microsoft.Singularity.V1.Services;
+#endif // SINGULARITY_PROCESS
+
+
+    //| <include path='docs/doc[@for="Exception"]/*' />
+    [RequiredByBartok]
+    public class Exception
+    {
+        //| <include path='docs/doc[@for="Exception.Exception"]/*' />
+        public Exception() {
+            _message = null;
+#if SINGULARITY_KERNEL
+            //DebugStub.Break();
+#elif SINGULARITY_PROCESS
+            //DebugService.Break();
+#endif // SINGULARITY_PROCESS
+        }
+
+        //| <include path='docs/doc[@for="Exception.Exception1"]/*' />
+        public Exception(String message) {
+            _message = message;
+#if SINGULARITY_KERNEL
+            //DebugStub.Break();
+#elif SINGULARITY_PROCESS
+            //DebugService.Break();
+#endif // SINGULARITY_PROCESS
+        }
+
+        // Creates a new Exception.  All derived classes should
+        // provide this constructor.
+        // Note: the stack trace is not started until the exception
+        // is thrown
+        //
+        //| <include path='docs/doc[@for="Exception.Exception2"]/*' />
+        public Exception (String message, Exception innerException)
+        {
+            // TODO: The innerException will be provided by the runtime
+            // in the M9 time frame. Until then, we need this method.
+            _message = message;
+            _innerException = innerException;
+        }
+
+        //| <include path='docs/doc[@for="Exception.Message"]/*' />
+        public virtual String Message {
+               get {
+                if (_message == null) {
+                    return "Exception_WasThrown";
+                } else {
+                    return _message;
+                }
+            }
+        }
+
+        private String GetClassName() {
+            return this.vtable.vtableType.FullName;
+        }
+
+        // Retrieves the lowest exception (inner most) for the given Exception.
+        // This will traverse exceptions using the innerException property.
+        //
+        //| <include path='docs/doc[@for="Exception.GetBaseException"]/*' />
+        public virtual Exception GetBaseException()
+        {
+            Exception inner = InnerException;
+            Exception back = this;
+
+            while (inner != null) {
+                back = inner;
+                inner = inner.InnerException;
+            }
+
+            return back;
+        }
+
+        // Returns the inner exception contained in this exception
+        //
+        //| <include path='docs/doc[@for="Exception.InnerException"]/*' />
+        public Exception InnerException {
+            get { return _innerException; }
+        }
+
+        //| <include path='docs/doc[@for="Exception.ToString"]/*' />
+        public override String ToString() {
+            String message = Message;
+
+            if (_innerException!=null) {
+                message = message + " ---> " + _innerException.ToString() + "\r\n" + "   " + "Exception_EndOfInnerExceptionStack";
+            }
+
+            return message;
+        }
+
+        [AccessedByRuntime("referenced from halasm.asm")]
+        internal static unsafe bool IsUnlinkStack(UIntPtr throwAddr) {
+            UIntPtr unlinkBegin;
+            UIntPtr unlinkLimit;
+
+            fixed (byte *begin = &Microsoft.Singularity.Memory.Stacks.UnlinkStackBegin) {
+                unlinkBegin = (UIntPtr)begin;
+            }
+            fixed (byte *limit = &Microsoft.Singularity.Memory.Stacks.UnlinkStackLimit) {
+                unlinkLimit = (UIntPtr)limit;
+            }
+
+            if(throwAddr >= unlinkBegin && throwAddr <= unlinkLimit) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        // The following functions are for tryall support.
+        // This is the function actually called by the internal runtime
+        [NoLoggingForUndo]
+        [RequiredByBartok]
+        private Exception internalCloneForUndo() {
+            /* this function is not allowed to throw an exception. */
+            try {
+                return cloneForUndo();
+            } catch (Exception ex) {
+                return ex;
+            }
+        }
+        // This is the function that users can override
+
+        // BUGBUG: provide a better default (probably deep copy).  The
+        // current one does not deal with references well, and so, is
+        // not even a good shallow copy (it should at least null out the
+        // references).
+        virtual protected Exception cloneForUndo() {
+            return (Exception)this.MemberwiseClone();
+        }
+
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        internal String _message;
+
+        private Exception _innerException;
+
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        private UIntPtr _throwAddress;
+
+        [AccessedByRuntime("referenced from halexn.cpp")]
+        private bool _notifiedDebugger; // True if debugger first chance already thrown.
+
+        //
+        public string StackTrace
+        {
+            get {
+                return "<no.stack.trace>";
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/FlagsAttribute.cs b/base/Kernel/System/FlagsAttribute.cs
new file mode 100644
index 0000000..7c5e639
--- /dev/null
+++ b/base/Kernel/System/FlagsAttribute.cs
@@ -0,0 +1,24 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+namespace System {
+
+    using System;
+    // Custom attribute to indicate that the enum
+    // should be treated as a bitfield (or set of flags).
+    // An IDE may use this information to provide a richer
+    // development experience.
+    //| <include path='docs/doc[@for="FlagsAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Enum, Inherited = false)]
+    public class  FlagsAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="FlagsAttribute.FlagsAttribute"]/*' />
+        public FlagsAttribute()
+        {
+        }
+    }
+}
diff --git a/base/Kernel/System/FormatException.cs b/base/Kernel/System/FormatException.cs
new file mode 100644
index 0000000..7f8511a
--- /dev/null
+++ b/base/Kernel/System/FormatException.cs
@@ -0,0 +1,36 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  FormatException
+**
+**
+** Purpose: Exception to designate an illegal argument to Format.
+**
+** Date:  February 10, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    //| <include path='docs/doc[@for="FormatException"]/*' />
+    public class FormatException : SystemException {
+        //| <include path='docs/doc[@for="FormatException.FormatException"]/*' />
+        public FormatException()
+            : base("Arg_FormatException") {
+        }
+
+        //| <include path='docs/doc[@for="FormatException.FormatException1"]/*' />
+        public FormatException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="FormatException.FormatException2"]/*' />
+        public FormatException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/GCs/BartokMemoryManagement.pdf b/base/Kernel/System/GCs/BartokMemoryManagement.pdf
new file mode 100644
index 0000000..6306c44
Binary files /dev/null and b/base/Kernel/System/GCs/BartokMemoryManagement.pdf differ
diff --git a/base/Kernel/System/GCs/Monitoring.cs b/base/Kernel/System/GCs/Monitoring.cs
new file mode 100644
index 0000000..a822b98
--- /dev/null
+++ b/base/Kernel/System/GCs/Monitoring.cs
@@ -0,0 +1,28 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:  Monitoring.cs
+//
+//  This is a dummy file used in the generation of the NullRuntime
+//  See  Applications\NullRuntime Makefile for reference 
+
+using System; 
+
+namespace Microsoft.Singularity
+{
+    [CLSCompliant(false)]
+     public class Monitoring
+    {
+            public struct Provider {
+                public const ushort GC = 25;
+            }
+            
+       	    public static void Log(ushort provider, ushort type) 
+            {
+            }
+
+    }
+}
diff --git a/base/Kernel/System/Globalization/CharacterInfo.cs b/base/Kernel/System/Globalization/CharacterInfo.cs
new file mode 100644
index 0000000..318bcc9
--- /dev/null
+++ b/base/Kernel/System/Globalization/CharacterInfo.cs
@@ -0,0 +1,685 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////
+//
+//  Class:    CharacterInfo
+//
+//
+//  Purpose:  This class implements a set of methods for retrieving
+//            character type information.  Character type information is
+//            independent of culture and region.
+//
+//  Date:     August 12, 1998
+//
+////////////////////////////////////////////////////////////////////////////
+
+namespace System.Globalization {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    internal class CharacterInfo : System.Object
+    {
+        private CharacterInfo() {}   // Prevent from being created
+
+        //--------------------------------------------------------------------//
+        //                        Internal Information                        //
+        //--------------------------------------------------------------------//
+
+        //
+        internal const char  HIGH_SURROGATE_START  = '\ud800';
+        internal const char  HIGH_SURROGATE_END    = '\udbff';
+        internal const char  LOW_SURROGATE_START   = '\udc00';
+        internal const char  LOW_SURROGATE_END     = '\udfff';
+
+        internal static bool IsHighSurrogate(char c)
+        {
+            return ((c >= CharacterInfo.HIGH_SURROGATE_START) && (c <= CharacterInfo.HIGH_SURROGATE_END));
+        }
+        internal static bool IsLowSurrogate(char c)
+        {
+            return ((c >= CharacterInfo.LOW_SURROGATE_START) && (c <= CharacterInfo.LOW_SURROGATE_END));
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsLetter
+        //
+        //  Determines if the given character is an alphabetic character.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static bool IsLetter(char ch) {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            return (uc == UnicodeCategory.UppercaseLetter
+                    || uc == UnicodeCategory.LowercaseLetter
+                    || uc == UnicodeCategory.TitlecaseLetter
+                    || uc == UnicodeCategory.ModifierLetter
+                    || uc == UnicodeCategory.OtherLetter);
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsLower
+        //
+        //  Determines if the given character is a lower case character.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static bool IsLower(char c)
+        {
+            return (GetUnicodeCategory(c) == UnicodeCategory.LowercaseLetter);
+        }
+
+
+        /*=================================IsMark==========================
+        **Action: Returns true if and only if the character c has one of the properties NonSpacingMark, SpacingCombiningMark,
+        ** or EnclosingMark. Marks usually modify one or more other
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        ============================================================================*/
+
+        public static bool IsMark(char ch) {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            return (uc == UnicodeCategory.NonSpacingMark
+                    || uc == UnicodeCategory.SpacingCombiningMark
+                    || uc == UnicodeCategory.EnclosingMark);
+        }
+
+        /*=================================IsNumber==========================
+        **Action: Returns true if and only if the character c has one of the properties DecimalDigitNumber,
+        ** LetterNumber, or OtherNumber. Use the GetNumericValue method to determine the numeric value.
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        **Note: GetNuemricValue is not yet implemented.
+        ============================================================================*/
+        public static bool IsNumber(char ch) {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            return (uc == UnicodeCategory.DecimalDigitNumber
+                    || uc == UnicodeCategory.LetterNumber
+                    || uc == UnicodeCategory.OtherNumber);
+        }
+
+        /*=================================IsDigit==========================
+        **Action: Returns true if and only if the character c has the property DecimalDigitNumber.
+        ** Use the GetNumericValue method to determine the numeric value.
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        **Note: GetNuemricValue is not yet implemented.
+        ============================================================================*/
+
+        public static bool IsDigit(char ch) {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            return (uc == UnicodeCategory.DecimalDigitNumber);
+        }
+
+        /*=================================IsSeparator==========================
+        **Action: Returns true if and only if the character c has one of the properties SpaceSeparator, LineSeparator
+        **or ParagraphSeparator.
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        ============================================================================*/
+        public static bool IsSeparator(char ch) {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            return (uc == UnicodeCategory.SpaceSeparator || uc == UnicodeCategory.LineSeparator || uc == UnicodeCategory.ParagraphSeparator);
+        }
+
+        /*=================================IsControl==========================
+        **Action: Returns true if and only if the character c has the property Control.
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        ============================================================================*/
+
+        public static bool IsControl(char ch) {
+            return (GetUnicodeCategory(ch) == UnicodeCategory.Control);
+        }
+
+        /*=================================IsSurrogate==========================
+        **Action: Returns true if and only if the character c has the property PrivateUse.
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        ============================================================================*/
+
+        public static bool IsSurrogate(char ch) {
+            return (GetUnicodeCategory(ch) == UnicodeCategory.Surrogate);
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsPunctuation
+        //
+        //  Determines if the given character is a punctuation character.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static bool IsPunctuation(char ch)
+        {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            switch (uc) {
+                case UnicodeCategory.ConnectorPunctuation:
+                case UnicodeCategory.DashPunctuation:
+                case UnicodeCategory.OpenPunctuation:
+                case UnicodeCategory.ClosePunctuation:
+                case UnicodeCategory.InitialQuotePunctuation:
+                case UnicodeCategory.FinalQuotePunctuation:
+                case UnicodeCategory.OtherPunctuation:
+                    return (true);
+            }
+            return (false);
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsSymbol
+        //
+        //  Determines if the given character is a symbol character.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static bool IsSymbol(char ch)
+        {
+            UnicodeCategory uc = GetUnicodeCategory(ch);
+            return (uc == UnicodeCategory.MathSymbol
+                    || uc == UnicodeCategory.CurrencySymbol
+                    || uc == UnicodeCategory.ModifierSymbol
+                    || uc == UnicodeCategory.OtherSymbol);
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsTitleCase
+        //
+        //  Determines if the given character is a title case character.
+        //  The title case characters are:
+        //      \u01c5  (Dz with Caron)
+        //      \u01c8  (Lj)
+        //      \u01cb  (Nj)
+        //      \u01f2  (Dz)
+        //  A title case character is a concept that is useful for only 4
+        //  Unicode characters.  This has to do with the mapping of some
+        //  Cyrillic/Serbian characters to the Latin alphabet.  For example,
+        //  the Cyrillic character LJ looks just like 'L' and 'J' in the Latin
+        //  alphabet.  However, when LJ is used in a book title, the
+        //  capitalized form is 'Lj' instead of 'LJ'.
+        //
+        //  These 4 characters are the only ones in Unicode that have a
+        //  character type of both Upper and Lower case.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        internal static bool IsTitleCase(char c)
+        {
+            return (GetUnicodeCategory(c) == UnicodeCategory.TitlecaseLetter);
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsUpper
+        //
+        //  Determines if the given character is an upper case character.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static bool IsUpper(char c)
+        {
+            return (GetUnicodeCategory(c) == UnicodeCategory.UppercaseLetter);
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  WhiteSpaceChars
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        internal static readonly char [] WhitespaceChars =
+        { '\x9', '\xA', '\xB', '\xC', '\xD', '\x20', '\xA0',
+          '\x2000', '\x2001', '\x2002', '\x2003', '\x2004', '\x2005',
+          '\x2006', '\x2007', '\x2008', '\x2009', '\x200A', '\x200B',
+          '\x3000', '\xFEFF' };
+
+        // BUGBUG YSLin: Leave this for now because System.Char still has this function.
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsWhiteSpace
+        //
+        //  Determines if the given character is a white space character.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static bool IsWhiteSpace(char c)
+        {
+            // NOTENOTE YSLin:
+            // There are characters which belong to UnicodeCategory.Control but are considered as white spaces.
+            // We use code point comparisons for these characters here as a temporary fix.
+            // The compiler should be smart enough to do a range comparison to optimize this (U+0009 ~ U+000d).
+            // Also provide a shortcut here for the space character (U+0020)
+            switch (c) {
+                case ' ':
+                case '\x0009' :
+                case '\x000a' :
+                case '\x000b' :
+                case '\x000c' :
+                case '\x000d' :
+                case '\x0085' :
+                    return (true);
+            }
+
+            // In Unicode 3.0, U+2028 is the only character which is under the category "LineSeparator".
+            // And U+2029 is the only character which is under the category "ParagraphSeparator".
+            switch ((int)GetUnicodeCategory(c)) {
+                case ((int)UnicodeCategory.SpaceSeparator):
+                case ((int)UnicodeCategory.LineSeparator):
+                case ((int)UnicodeCategory.ParagraphSeparator):
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        /*=================================IsCombiningCharacter==========================
+        **Action: Returns if the specified character is a combining character.
+        **Returns:
+        **  TRUE if ch is a combining character.
+        **Arguments:
+        **  ch  a Unicode character
+        **Exceptions:
+        **  None
+        **Notes:
+        **  Used by StringInfo.ParseCombiningCharacter.
+        ============================================================================*/
+        internal static bool IsCombiningCharacter(char ch) {
+            UnicodeCategory uc = CharacterInfo.GetUnicodeCategory(ch);
+            return (
+                uc == UnicodeCategory.NonSpacingMark ||
+                uc == UnicodeCategory.SpacingCombiningMark ||
+                uc == UnicodeCategory.EnclosingMark
+                );
+        }
+
+
+        private static byte[] level1CategoryTable = new byte[256] {
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+            16, 17, 18, 19, 20, 21, 22, 23, 24, 8, 8, 8, 8, 8, 25, 26,
+            27, 28, 29, 30, 31, 32, 33, 34, 35, 8, 8, 8, 8, 8, 36, 37,
+            38, 39, 40, 41, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 42, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 43,
+            21, 21, 21, 21, 44, 8, 8, 8, 8, 8, 8, 8, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 45, 46, 46, 46, 46, 46, 46, 46, 46,
+            47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+            47, 47, 47, 47, 47, 47, 47, 47, 47, 21, 48, 49, 21, 50, 51, 52
+        };
+        private static ushort[] level2CategoryTable = new ushort[848] {
+            0, 0, 16, 32, 48, 64, 80, 96, 0, 0, 112, 128, 144, 160, 176, 192,
+            208, 208, 208, 224, 240, 208, 208, 256, 272, 288, 304, 320, 336, 352, 208, 368,
+            208, 208, 384, 400, 416, 176, 176, 176, 176, 176, 432, 448, 464, 464, 480, 416,
+            496, 496, 496, 496, 512, 416, 528, 544, 560, 576, 592, 176, 608, 624, 208, 640,
+            144, 144, 144, 176, 176, 176, 208, 208, 656, 208, 208, 208, 672, 208, 208, 688,
+            416, 416, 416, 704, 144, 720, 736, 176, 752, 768, 784, 800, 816, 832, 848, 864,
+            880, 896, 912, 848, 928, 944, 960, 976, 832, 832, 832, 832, 832, 992, 1008, 1024,
+            1040, 1056, 1072, 496, 1088, 416, 416, 416, 832, 832, 1104, 1120, 416, 416, 416, 416,
+            416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,
+            1136, 832, 832, 1152, 1168, 1184, 1200, 1216, 1232, 1248, 1264, 1280, 1296, 1312, 1328, 1344,
+            1360, 1248, 1264, 1376, 1392, 1408, 1424, 1440, 1456, 1472, 1264, 1488, 1504, 1520, 1536, 416,
+            1232, 1248, 1264, 1552, 1568, 1584, 1600, 1616, 1632, 1648, 1664, 1680, 1696, 1712, 1728, 1744,
+            1760, 1776, 1264, 1792, 1808, 1824, 1600, 416, 1840, 1776, 1264, 1856, 1872, 1888, 1600, 416,
+            1840, 1776, 1264, 1904, 1920, 1712, 1600, 416, 1936, 1952, 832, 1968, 1984, 2000, 416, 2016,
+            912, 832, 832, 2032, 2048, 2064, 416, 416, 2080, 2096, 2112, 2128, 2144, 2160, 416, 416,
+            2176, 2192, 2208, 2224, 2240, 832, 848, 2256, 2272, 2288, 496, 2304, 2320, 416, 416, 416,
+            832, 832, 2336, 2352, 2368, 2384, 416, 416, 416, 416, 144, 144, 2400, 832, 832, 2416,
+            832, 832, 832, 832, 832, 2432, 832, 832, 832, 832, 2448, 832, 832, 832, 832, 2464,
+            2480, 832, 832, 832, 2496, 2496, 832, 832, 2496, 832, 2512, 2528, 2528, 2480, 2512, 832,
+            2512, 2528, 832, 832, 2480, 848, 2544, 2560, 416, 416, 832, 832, 832, 832, 832, 2576,
+            912, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832,
+            832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832,
+            832, 832, 832, 832, 832, 832, 2592, 2608, 2624, 2640, 832, 832, 832, 832, 2656, 2672,
+            416, 416, 416, 416, 416, 416, 416, 416, 832, 832, 832, 2688, 2704, 2720, 2736, 416,
+            2752, 2736, 832, 832, 2768, 832, 832, 2784, 832, 832, 2800, 416, 416, 416, 416, 416,
+            208, 208, 208, 208, 208, 208, 208, 208, 208, 2816, 208, 208, 208, 208, 208, 2832,
+            2848, 2864, 2848, 2848, 2864, 2880, 2848, 432, 2896, 2896, 2896, 2912, 2928, 2944, 2960, 2976,
+            2992, 3008, 3024, 3040, 3056, 416, 3072, 3088, 3104, 416, 3120, 416, 416, 3136, 3152, 416,
+            3168, 3184, 3200, 3216, 416, 3232, 3248, 3248, 3264, 3280, 3296, 3312, 3328, 3344, 3312, 3360,
+            3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3392,
+            3408, 3312, 3424, 3312, 3312, 3312, 3312, 3440, 3312, 3456, 416, 416, 416, 416, 416, 416,
+            3312, 3312, 3472, 416, 3456, 416, 3488, 3488, 3488, 3504, 3312, 3312, 3312, 3312, 3520, 416,
+            3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3536, 3312, 3552, 3568, 3312, 3312, 3584,
+            3312, 3600, 3312, 3312, 3312, 3312, 3616, 3632, 416, 416, 416, 416, 416, 416, 416, 416,
+            3648, 3312, 3664, 3312, 3680, 3696, 3712, 3728, 3488, 3744, 3312, 3760, 416, 416, 416, 416,
+            3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312,
+            416, 416, 416, 416, 416, 416, 416, 416, 3312, 3776, 3312, 3312, 3312, 3312, 3312, 3360,
+            3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3312, 3536, 416, 3792,
+            3808, 3824, 3840, 3856, 912, 832, 832, 832, 832, 3872, 912, 832, 832, 832, 832, 3888,
+            3904, 832, 1072, 912, 832, 832, 832, 832, 2512, 3920, 832, 2784, 416, 416, 416, 416,
+            3312, 3936, 3952, 3312, 3360, 416, 3312, 3968, 3952, 3312, 3312, 1616, 3792, 3312, 3312, 3984,
+            3312, 3312, 3312, 3312, 3312, 3312, 3312, 4000, 3312, 3312, 3312, 3312, 3312, 4016, 3312, 3984,
+            832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 4032, 416, 416, 416, 416,
+            832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 4032, 416, 416, 416, 416, 416,
+            832, 832, 832, 832, 832, 832, 832, 832, 1072, 3312, 4048, 4064, 4080, 416, 416, 416,
+            832, 832, 832, 832, 832, 832, 832, 832, 832, 832, 4096, 416, 416, 416, 416, 416,
+            4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112,
+            4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128,
+            832, 832, 4144, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,
+            4160, 4176, 4192, 4208, 4224, 832, 832, 832, 832, 832, 832, 4240, 416, 4256, 832, 832,
+            832, 832, 832, 4272, 416, 832, 832, 832, 832, 4288, 832, 832, 2784, 416, 416, 4304,
+            416, 416, 4320, 4336, 4352, 4368, 4384, 4400, 832, 832, 832, 832, 832, 832, 832, 4416,
+            4432, 32, 48, 64, 80, 4448, 4464, 4480, 832, 4496, 832, 2512, 4512, 4528, 4544, 4560
+        };
+        private static byte[] level3CategoryTable = new byte[4576] {
+            14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+            11, 24, 24, 24, 26, 24, 24, 24, 20, 21, 24, 25, 24, 19, 24, 24,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 25, 25, 25, 24,
+            24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 24, 21, 27, 18,
+            27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 20, 25, 21, 25, 14,
+            11, 24, 26, 26, 26, 26, 28, 28, 27, 28, 1, 22, 25, 19, 28, 27,
+            28, 25, 10, 10, 27, 1, 28, 24, 27, 10, 1, 23, 10, 10, 10, 24,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 25, 1, 1, 1, 1, 1, 1, 1, 1,
+            0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+            0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+            1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1,
+            0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1,
+            1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0,
+            0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0,
+            0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0,
+            1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 4, 0, 1, 1, 1,
+            4, 4, 4, 4, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 1, 0,
+            1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1,
+            1, 0, 2, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1,
+            29, 29, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+            0, 1, 0, 1, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 29, 29,
+            3, 3, 3, 3, 3, 3, 3, 3, 3, 27, 27, 3, 3, 3, 3, 3,
+            3, 3, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+            3, 3, 3, 3, 3, 27, 27, 27, 27, 27, 27, 27, 27, 27, 3, 29,
+            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 29,
+            5, 5, 5, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 29, 27, 27, 29, 29, 29, 29, 3, 29, 29, 29, 24, 29,
+            29, 29, 29, 29, 27, 27, 0, 24, 0, 0, 0, 29, 0, 29, 0, 0,
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 29,
+            1, 1, 0, 0, 0, 1, 1, 1, 29, 29, 0, 1, 0, 1, 0, 1,
+            1, 1, 1, 1, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            0, 1, 28, 5, 5, 5, 5, 29, 7, 7, 29, 29, 0, 1, 0, 1,
+            0, 0, 1, 0, 1, 29, 29, 0, 1, 29, 29, 0, 1, 29, 29, 29,
+            0, 1, 0, 1, 0, 1, 29, 29, 0, 1, 29, 29, 29, 29, 29, 29,
+            29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 29, 29, 3, 24, 24, 24, 24, 24, 24,
+            29, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 29, 24, 19, 29, 29, 29, 29, 29,
+            29, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 29, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 29, 5, 5, 5, 24, 5,
+            24, 5, 5, 24, 5, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 29,
+            4, 4, 4, 24, 24, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 24, 29, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 24, 29, 29, 29, 24,
+            29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 5, 5, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, 29, 29,
+            5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 24, 4, 5, 5, 5, 5, 5, 5, 5, 7, 7, 5,
+            5, 5, 5, 5, 5, 3, 3, 5, 5, 28, 5, 5, 5, 5, 29, 29,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 28, 28, 29,
+            24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 29, 15,
+            4, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29,
+            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+            5, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 5, 5, 6, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 5, 4, 6, 6,
+            6, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 5, 29, 29,
+            4, 5, 5, 5, 5, 29, 29, 29, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 5, 5, 24, 24, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            24, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 5, 6, 6, 29, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 4,
+            4, 29, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 4,
+            4, 29, 4, 29, 29, 29, 4, 4, 4, 4, 29, 29, 5, 29, 6, 6,
+            6, 5, 5, 5, 5, 29, 29, 6, 6, 29, 29, 6, 6, 5, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 6, 29, 29, 29, 29, 4, 4, 29, 4,
+            4, 4, 5, 5, 29, 29, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            4, 4, 26, 26, 10, 10, 10, 10, 10, 10, 28, 29, 29, 29, 29, 29,
+            29, 29, 5, 29, 29, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 4,
+            4, 29, 4, 4, 29, 4, 4, 29, 4, 4, 29, 29, 5, 29, 6, 6,
+            6, 5, 5, 29, 29, 29, 29, 5, 5, 29, 29, 5, 5, 5, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 29, 29, 4, 4, 4, 4, 29, 4, 29,
+            29, 29, 29, 29, 29, 29, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            5, 5, 4, 4, 4, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 5, 5, 6, 29, 4, 4, 4, 4, 4, 4, 4, 29, 4, 29, 4,
+            4, 4, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 29, 4, 4, 29, 4, 4, 4, 4, 4, 29, 29, 5, 4, 6, 6,
+            6, 5, 5, 5, 5, 5, 29, 5, 5, 6, 29, 6, 6, 5, 29, 29,
+            4, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 29, 29, 29, 29, 29, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            4, 29, 4, 4, 29, 29, 4, 4, 4, 4, 29, 29, 5, 4, 6, 5,
+            6, 5, 5, 5, 29, 29, 29, 6, 6, 29, 29, 6, 6, 5, 29, 29,
+            29, 29, 29, 29, 29, 29, 5, 6, 29, 29, 29, 29, 4, 4, 29, 4,
+            4, 4, 29, 29, 29, 29, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 5, 6, 29, 4, 4, 4, 4, 4, 4, 29, 29, 29, 4, 4,
+            4, 29, 4, 4, 4, 4, 29, 29, 29, 4, 4, 29, 4, 29, 4, 4,
+            29, 29, 29, 4, 4, 29, 29, 29, 4, 4, 4, 29, 29, 29, 4, 4,
+            4, 4, 4, 4, 4, 4, 29, 4, 4, 4, 29, 29, 29, 29, 6, 6,
+            5, 6, 6, 29, 29, 29, 6, 6, 6, 29, 6, 6, 6, 5, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 6, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            10, 10, 10, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 6, 6, 6, 29, 4, 4, 4, 4, 4, 4, 4, 4, 29, 4, 4,
+            4, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 29, 29, 29, 29, 5, 5,
+            5, 6, 6, 6, 6, 29, 5, 5, 5, 29, 5, 5, 5, 5, 29, 29,
+            29, 29, 29, 29, 29, 5, 5, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 6, 6, 29, 4, 4, 4, 4, 4, 4, 4, 4, 29, 4, 4,
+            4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 29, 29, 29, 29, 6, 5,
+            6, 6, 6, 6, 6, 29, 5, 6, 6, 29, 6, 6, 5, 5, 29, 29,
+            29, 29, 29, 29, 29, 6, 6, 29, 29, 29, 29, 29, 29, 29, 4, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 6, 6,
+            6, 5, 5, 5, 29, 29, 6, 6, 6, 29, 6, 6, 6, 5, 29, 29,
+            29, 29, 6, 6, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 4, 4, 4, 4, 4, 4,
+            4, 4, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 4, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 5, 29, 29, 29, 29, 6,
+            6, 6, 5, 5, 5, 29, 5, 29, 6, 6, 6, 6, 6, 6, 6, 6,
+            29, 29, 6, 6, 24, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 29, 29, 29, 29, 26,
+            4, 4, 4, 4, 4, 4, 3, 5, 5, 5, 5, 5, 5, 5, 5, 24,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 29, 29, 29, 29,
+            29, 4, 4, 29, 4, 29, 29, 4, 4, 29, 4, 29, 29, 4, 29, 29,
+            29, 29, 29, 29, 4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 4, 4,
+            29, 4, 4, 4, 29, 4, 29, 4, 29, 29, 4, 4, 29, 4, 4, 4,
+            4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 29, 5, 5, 4, 29, 29,
+            4, 4, 4, 4, 4, 29, 3, 29, 5, 5, 5, 5, 5, 5, 29, 29,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 29, 29, 4, 4, 29, 29,
+            4, 28, 28, 28, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+            24, 24, 24, 28, 28, 28, 28, 28, 5, 5, 28, 28, 28, 28, 28, 28,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10,
+            10, 10, 10, 10, 28, 5, 28, 5, 28, 5, 20, 21, 20, 21, 6, 6,
+            4, 4, 4, 4, 4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 4, 4,
+            29, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6,
+            5, 5, 5, 5, 5, 24, 5, 5, 4, 4, 4, 4, 29, 29, 29, 29,
+            5, 5, 5, 5, 5, 5, 5, 5, 29, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 29, 28, 28,
+            28, 28, 28, 28, 28, 28, 5, 28, 28, 28, 28, 28, 28, 29, 29, 28,
+            4, 4, 29, 4, 4, 4, 4, 4, 29, 4, 4, 29, 6, 5, 5, 5,
+            5, 6, 5, 29, 29, 29, 5, 5, 6, 5, 29, 29, 29, 29, 29, 29,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, 24, 24,
+            4, 4, 4, 4, 4, 4, 6, 6, 5, 5, 29, 29, 29, 29, 29, 29,
+            0, 0, 0, 0, 0, 0, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 24, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 29, 4,
+            4, 4, 4, 29, 29, 29, 29, 29, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 29, 4, 29, 4, 4, 4, 4, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29,
+            4, 29, 4, 4, 4, 4, 29, 29, 4, 4, 4, 4, 4, 4, 4, 29,
+            29, 24, 24, 24, 24, 24, 24, 24, 24, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 29, 29, 29,
+            4, 4, 4, 4, 4, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 24, 24, 4,
+            4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            11, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 20, 21, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 24, 24, 24, 10, 10,
+            10, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 6, 6,
+            6, 6, 6, 6, 6, 6, 5, 6, 6, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 24, 24, 24, 24, 24, 24, 24, 26, 24, 29, 29, 29,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 29, 29, 29, 29, 29, 29,
+            24, 24, 24, 24, 24, 24, 19, 24, 24, 24, 24, 15, 15, 15, 15, 29,
+            4, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 29, 29, 29, 29, 29, 29,
+            0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 29, 29, 29, 29,
+            0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 29, 29, 29, 29, 29, 29,
+            1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+            1, 1, 1, 1, 1, 1, 29, 29, 0, 0, 0, 0, 0, 0, 29, 29,
+            1, 1, 1, 1, 1, 1, 1, 1, 29, 0, 29, 0, 29, 0, 29, 0,
+            1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2,
+            1, 1, 1, 1, 1, 29, 1, 1, 0, 0, 0, 0, 2, 27, 1, 27,
+            27, 27, 1, 1, 1, 29, 1, 1, 0, 0, 0, 0, 2, 27, 27, 27,
+            1, 1, 1, 1, 29, 29, 1, 1, 0, 0, 0, 0, 29, 27, 27, 27,
+            1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 27, 27, 27,
+            29, 29, 1, 1, 1, 29, 1, 1, 0, 0, 0, 0, 2, 27, 27, 29,
+            11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 15, 15, 15, 15,
+            19, 19, 19, 19, 19, 19, 24, 24, 22, 23, 20, 22, 22, 23, 20, 22,
+            24, 24, 24, 24, 24, 24, 24, 24, 12, 13, 15, 15, 15, 15, 15, 11,
+            24, 24, 24, 24, 24, 24, 24, 24, 24, 22, 23, 24, 24, 24, 24, 18,
+            18, 24, 24, 24, 25, 20, 21, 29, 24, 24, 24, 24, 24, 24, 29, 29,
+            29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 15, 15, 15, 15, 15, 15,
+            10, 29, 29, 29, 10, 10, 10, 10, 10, 10, 25, 25, 25, 20, 21, 1,
+            10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 25, 25, 25, 20, 21, 29,
+            26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7, 7, 7,
+            7, 5, 7, 7, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            28, 28, 0, 28, 28, 28, 28, 0, 28, 28, 1, 0, 0, 0, 1, 1,
+            0, 0, 0, 1, 28, 0, 28, 28, 28, 0, 0, 0, 0, 0, 28, 28,
+            28, 28, 28, 28, 0, 28, 0, 28, 0, 28, 0, 0, 0, 0, 28, 1,
+            0, 0, 28, 0, 1, 4, 4, 4, 4, 1, 28, 29, 29, 29, 29, 29,
+            29, 29, 29, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+            9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+            9, 9, 9, 9, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            25, 25, 25, 25, 25, 28, 28, 28, 28, 28, 25, 25, 28, 28, 28, 28,
+            25, 28, 28, 25, 28, 28, 25, 28, 28, 28, 28, 28, 28, 28, 25, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 25, 25,
+            28, 28, 25, 28, 25, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+            25, 25, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            28, 28, 28, 28, 28, 28, 28, 28, 25, 25, 25, 25, 28, 28, 28, 28,
+            25, 25, 28, 28, 28, 28, 28, 28, 28, 20, 21, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29,
+            28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+            10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 10, 29, 29, 29, 29, 29,
+            28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            28, 28, 28, 28, 28, 28, 28, 25, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 25, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29,
+            28, 28, 28, 28, 29, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 25,
+            28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 28, 28, 28, 28, 29, 28, 28, 28, 28, 29, 29, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 29, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 28, 29, 28,
+            28, 28, 28, 29, 29, 29, 28, 29, 28, 28, 28, 28, 28, 28, 28, 29,
+            29, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 29, 29, 29, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+            10, 10, 10, 10, 28, 29, 29, 29, 28, 28, 28, 28, 28, 28, 28, 28,
+            29, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29,
+            11, 24, 24, 24, 28, 3, 4, 9, 20, 21, 20, 21, 20, 21, 20, 21,
+            20, 21, 28, 28, 20, 21, 20, 21, 20, 21, 20, 21, 19, 20, 21, 21,
+            28, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 5, 5, 5, 5, 5,
+            19, 3, 3, 3, 3, 3, 28, 28, 9, 9, 9, 29, 29, 29, 28, 28,
+            4, 4, 4, 4, 4, 29, 29, 29, 29, 5, 5, 27, 27, 3, 3, 29,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 18, 3, 3, 3, 29,
+            29, 29, 29, 29, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            28, 28, 10, 10, 10, 10, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29,
+            10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29,
+            28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29,
+            4, 4, 4, 4, 4, 4, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            28, 28, 29, 29, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 28, 28, 28, 29, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+            28, 29, 28, 28, 28, 29, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            4, 4, 4, 4, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+            17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29,
+            1, 1, 1, 1, 1, 1, 1, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 1, 1, 1, 1, 1, 29, 29, 29, 29, 29, 4, 5, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 25, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 29, 4, 4, 4, 4, 4, 29, 4, 29,
+            4, 4, 29, 4, 4, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            29, 29, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 20, 21,
+            29, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 29, 29,
+            5, 5, 5, 5, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+            24, 19, 19, 18, 18, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20,
+            21, 20, 21, 20, 21, 29, 29, 29, 29, 24, 24, 24, 24, 18, 18, 18,
+            24, 24, 24, 29, 24, 24, 24, 24, 19, 20, 21, 20, 21, 20, 21, 24,
+            24, 24, 25, 19, 25, 25, 25, 29, 24, 26, 24, 24, 29, 29, 29, 29,
+            4, 4, 4, 29, 4, 29, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 29, 29, 15,
+            29, 24, 24, 24, 26, 24, 24, 24, 20, 21, 24, 25, 24, 19, 24, 24,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 20, 25, 21, 25, 29,
+            29, 24, 20, 21, 24, 18, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3,
+            29, 29, 4, 4, 4, 4, 4, 4, 29, 29, 4, 4, 4, 4, 4, 4,
+            29, 29, 4, 4, 4, 4, 4, 4, 29, 29, 4, 4, 4, 29, 29, 29,
+            26, 26, 25, 27, 28, 26, 26, 29, 28, 25, 25, 25, 25, 28, 28, 29,
+            29, 29, 29, 29, 29, 29, 29, 29, 29, 15, 15, 15, 28, 28, 29, 29
+        };
+
+        public static UnicodeCategory GetUnicodeCategory(char ch) {
+            byte index1 = level1CategoryTable[ch >> 8];
+            ushort index2 = level2CategoryTable[(index1<<4) + ((ch>>4) & 0xf)];
+            byte result = level3CategoryTable[index2 + (ch & 0xf)];
+            return (UnicodeCategory) result;
+        }
+    }
+}
diff --git a/base/Kernel/System/Globalization/CompareInfo.cs b/base/Kernel/System/Globalization/CompareInfo.cs
new file mode 100644
index 0000000..f38007b
--- /dev/null
+++ b/base/Kernel/System/Globalization/CompareInfo.cs
@@ -0,0 +1,2133 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////
+//
+//  Class:    CompareInfo
+//
+//
+//  Purpose:  This class implements a set of methods for comparing
+//            strings.
+//
+//  Date:     August 12, 1998
+//
+////////////////////////////////////////////////////////////////////////////
+
+namespace System.Globalization {
+
+    //
+    // NOTE NOTE NOTE
+    //
+    // We're dependent on the SortingTable getting created when an instance of the
+    // class is initialized (through a call to InitializeCompareInfo).  When in
+    // native, we assume that the table has already been allocated.  If we decide
+    // to delay-allocate any of the tables (as we may do for US English), we should
+    // modify SortingTable::Get.
+    //
+
+    using System;
+    using System.Collections;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="CompareOptions"]/*' />
+    [Flags]
+    public enum CompareOptions
+    {
+        //| <include path='docs/doc[@for="CompareOptions.None"]/*' />
+        None = 0x00000000,
+        //| <include path='docs/doc[@for="CompareOptions.IgnoreCase"]/*' />
+        IgnoreCase      = 0x00000001,
+        //| <include path='docs/doc[@for="CompareOptions.Ordinal"]/*' />
+        Ordinal         = 0x40000000,   // This flag can not be used with other flags.
+    }
+
+    //| <include path='docs/doc[@for="CompareInfo"]/*' />
+    public class CompareInfo
+    {
+        private const int ValidMaskOffFlags =
+        ~((int)CompareOptions.IgnoreCase);
+
+        // from ClassLibNative\NLS\SortingTable.h
+        // original name is all caps and without the "ScriptMember_"
+        private const int ScriptMember_Unsortable = 0;
+
+        private const int ScriptMember_Punctuation = 6;
+
+        private const int ScriptMember_Symbol_1 = 7;
+        private const int ScriptMember_Symbol_2 = 8;
+        private const int ScriptMember_Symbol_4 = 10;
+        private const int ScriptMember_Symbol_5 = 11;
+
+        private const int ScriptMember_Digit = 12;
+        private const int ScriptMember_Latin = 14;
+
+        // from VC7\PlatformSDK\winnls.h
+        private const int CSTR_LESS_THAN = 1;     // string1 < string2
+        private const int CSTR_EQUAL = 2;         // string1 = string2
+        private const int CSTR_GREATER_THAN = 3;  // string1 > string2
+
+        // from ClassLibNative\NLS\SortingTable.h
+        private const byte CMP_MASKOFF_NONE = 0xff;
+        private const byte CMP_MASKOFF_CW   = 0xe7;
+
+        private const int STATE_DW          = 1; // normal diacritic weight state
+        private const int STATE_CW          = 4; // case weight state
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  Compare
+        //
+        //  Compares the two strings with the given options.  Returns 0 if the
+        //  two strings are equal, a number less than 0 if string1 is less
+        //  than string2, and a number greater than 0 if string1 is greater
+        //  than string2.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        public static int Compare(String string1, String string2)
+        {
+            return (Compare(string1, string2, CompareOptions.None));
+        }
+
+        // INT32 __stdcall
+        // COMNlsInfo::Compare(CompareInfo_CompareStringArgs* pargs)
+        // dwFlags --> options
+        public static int Compare(String string1,
+                                  String string2,
+                                  CompareOptions options) {
+
+            //Our paradigm is that null sorts less than any other string and
+            //that two nulls sort as equal.
+            if (string1 == null) {
+                if (string2 == null) {
+                    return (0);     // Equal
+                }
+                return (-1);    // null < non-null
+            }
+            if (string2 == null) {
+                return (1);     // non-null > null
+            }
+            //
+            //  Check the parameters.
+            //
+
+            if (options < 0) {
+                throw new ArgumentOutOfRangeException("flags", "ArgumentOutOfRange_MustBePositive");
+            }
+
+            //
+            // Check if we can use the highly optimized comparisons
+            //
+
+            if ((options & CompareOptions.Ordinal) != 0) {
+                if (options == CompareOptions.Ordinal) {
+                    // Ordinal means the code-point comparison.  This option can
+                    // not be used with other options.
+
+                    //  Compare the two strings to the length of the shorter
+                    //  string.  If they're not equal lengths, and the heads are
+                    //  equal, then the longer string is greater.
+                    return CompareOrdinal(string1, 0, string1.Length,
+                                          string2, 0, string2.Length);
+                } else {
+                    throw new ArgumentException("options", "Argument_CompareOptionOrdinal");
+                }
+            }
+
+            // The return value of NativeCompareInfo::CompareString() is
+            // Native-style value (1=less, 2=equal, 3=larger).  So subtract by
+            // two to get the NLS+ value.  Will change NativeCompareInfo to
+            // return the correct value later s.t. we don't have to subtract 2.
+
+            // NativeCompareInfo::CompareString() won't take -1 as the end of
+            // string anymore.  Therefore, pass the correct string length.  The
+            // change is for adding the null-embedded string support in
+            // CompareString().
+
+            // (markples) REVIEW: CLR has C# pass in a C++ object pointer that
+            // it finds this CompareString() method in.  Do we need to do this,
+            // or do we have enough state in the CompareInfo object?
+
+            return CompareString(options,
+                                 string1, 0, string1.Length,
+                                 string2, 0, string2.Length) - 2;
+        }
+
+        public static int Compare(String string1, int offset1, int length1,
+                                  String string2, int offset2, int length2) {
+            return CompareRegion(string1, offset1, length1,
+                                 string2, offset2, length2,
+                                 CompareOptions.None);
+        }
+
+        public static int Compare(String string1, int offset1,
+                                  String string2, int offset2,
+                                  CompareOptions options) {
+            return CompareRegion(string1, offset1, -1, string2, offset2, -1,
+                                 options);
+        }
+
+        public static int Compare(String string1, int offset1,
+                                  String string2, int offset2) {
+            return CompareRegion(string1, offset1, -1, string2, offset2, -1,
+                                 CompareOptions.None);
+        }
+
+        public static int Compare(String string1, int offset1, int length1,
+                                  String string2, int offset2, int length2,
+                                  CompareOptions options) {
+            if (length1 < 0 || length2 < 0) {
+                throw new ArgumentOutOfRangeException
+                    ((length1 < 0) ? "length1" : "length2",
+                     "Need positive length");
+            }
+            return CompareRegion(string1, offset1, length1,
+                                 string2, offset2, length2,
+                                 options);
+        }
+
+        private static int CompareRegion(String string1, int offset1, int length1,
+                                         String string2, int offset2, int length2,
+                                         CompareOptions options) {
+
+            //
+            // Check for the null case.
+            //
+            if (string1 == null) {
+                if (offset1 != 0 || (length1 != 0 && length1 != -1)) {
+                    throw new ArgumentOutOfRangeException
+                        ("string1", "ArgumentOutOfRange_OffsetLength");
+                }
+                if (string2 == null) {
+                    if (offset2 != 0 || (length2 != 0 && length2 != -1)) {
+                        throw new ArgumentOutOfRangeException
+                            ("string2", "ArgumentOutOfRange_OffsetLength");
+                    }
+                    return (0);
+                }
+                return (-1);
+            }
+            if (string2 == null) {
+                if (offset2 != 0 || (length2 != 0 && length2 != -1)) {
+                    throw new ArgumentOutOfRangeException
+                        ("string2", "ArgumentOutOfRange_OffsetLength");
+                }
+                return (1);
+            }
+            //
+            //  Get the full length of the two strings.
+            //
+            int realLen1 = string1.Length;
+            int realLen2 = string2.Length;
+
+            //check the arguments.
+            // Criteria:
+            // OffsetX >= 0
+            // LengthX >= 0 || LengthX == -1 (that is, LengthX >= -1)
+            // If LengthX >= 0, OffsetX + LengthX <= realLenX
+            if (offset1<0) {
+                throw new ArgumentOutOfRangeException
+                    ("offset1", "ArgumentOutOfRange_Index");
+            }
+            if (offset2<0) {
+                throw new ArgumentOutOfRangeException
+                    ("offset2", "ArgumentOutOfRange_Index");
+            }
+            if (length1 >= 0 && length1>realLen1 - offset1) {
+                throw new ArgumentOutOfRangeException
+                    ("string1", "ArgumentOutOfRange_OffsetLength");
+            }
+            if (length2 >= 0 && length2>realLen2 - offset2){
+                throw new ArgumentOutOfRangeException
+                    ("string2", "ArgumentOutOfRange_OffsetLength");
+            }
+
+            // NativeCompareInfo::CompareString() won't take -1 as the end of
+            // string anymore.  Therefore, pass the correct string length.  The
+            // change is for adding the null-embedded string support in
+            // CompareString().  Therefore, if the length is -1, we have to get
+            // the correct string length here.
+
+            if (length1 == -1) {
+                length1 = realLen1 - offset1;
+            }
+
+            if (length2 == -1) {
+                length2 = realLen2 - offset2;
+            }
+
+            if (length1 < 0) {
+                throw new ArgumentOutOfRangeException
+                    ("length1", "ArgumentOutOfRange_NegativeLength");
+            }
+            if (length2 < 0) {
+                throw new ArgumentOutOfRangeException
+                    ("length2", "ArgumentOutOfRange_NegativeLength");
+            }
+
+            if (options == CompareOptions.Ordinal) {
+                return CompareOrdinal(string1, offset1, length1,
+                                      string2, offset2, length2);
+            }
+
+            return CompareString(options,
+                                 string1, offset1, length1,
+                                 string2, offset2, length2) - 2;
+        }
+
+        // INT32 COMNlsInfo::CompareOrdinal(WCHAR* string1, int Length1,
+        //                                  WCHAR* string2, int Length2 )
+        private static int CompareOrdinal(String string1,int index1,int Length1,
+                                          String string2,int index2,int Length2){
+            //
+            // NOTENOTE The code here should be in sync with
+            // COMString::FCCompareOrdinal
+            //
+            int strIndex1=index1;
+            int strIndex2=index2;
+
+            // If the strings are the same length, compare exactly
+            // the right # of chars.  If they are different,
+            // compare the shortest # + 1 (the '\0').
+            int count = Length1;
+            if (count > Length2)
+                count = Length2;
+
+            // markples: simplified and removed optimizations
+
+            while (--count >= 0) {
+                if(string1[strIndex1] != string2[strIndex2]) {
+                    return string1[strIndex1] - string2[strIndex2];
+                }
+                ++strIndex1;
+                ++strIndex2;
+            }
+
+            return Length1 - Length2;
+        }
+
+
+        /*============================CompareString==========================
+        **Action: Compare two string in a linguistic way.
+        **Returns:
+        **Arguments:
+        **Exceptions:
+        =======================================================================*/
+        private static int CompareString(CompareOptions dwCmpFlags,
+                                         String lpString1,
+                                         int lpStringIndex1,
+                                         int cchCount1,
+                                         String lpString2,
+                                         int lpStringIndex2,
+                                         int cchCount2) {
+            // Make sure that we call InitSortingData() after ctor.
+            String pString1;
+            int pStringIndex1;
+            String pString2;
+            int pStringIndex2;
+            bool fIgnorePunct;        // flag to ignore punctuation (not symbol)
+            int State;                // state table
+            byte Mask;                // mask for weights
+
+            int WhichDiacritic = 0;   // DW => 1 = str1 smaller, 3 = str2 smaller
+            int WhichCase = 0;        // CW => 1 = str1 smaller, 3 = str2 smaller
+            int WhichPunct1 = 0;      // SW => 1 = str1 smaller, 3 = str2 smaller
+            int WhichPunct2 = 0;      // SW => 1 = str1 smaller, 3 = str2 smaller
+
+            //cchCount1 is also used a counter to track the
+            //characters that we are tracing right now.
+            //cchCount2 is also used a counter to track the
+            //characters that we are tracing right now.
+
+            //  Call longer compare string if any of the following is true:
+            //     - locale is invalid
+            //     - either count is not -1
+            //     - dwCmpFlags is not 0 or ignore case   (see NOTE below)
+            //     - locale is Korean - script member weight adjustment needed
+            //
+            //  NOTE: If the value of COMPARE_OPTIONS_IGNORECASE
+            //  ever changes, this code should check for:
+            //            ( (dwCmpFlags != 0) && (dwCmpFlags !=
+            //            COMPARE_OPTIONS_IGNORECASE) )
+            //         Since COMPARE_OPTIONS_IGNORECASE is equal
+            //         to 1, we can optimize this by checking for > 1.
+            //
+
+            // From now on, in this function, we don't rely on
+            // scanning null string as the end of the string.
+            // Instead, we use cchCount1/cchCount2 to track the
+            // end of the string.  Therefore, cchCount1/cchCount2
+            // can not be -1 anymore.  we make sure in here about
+            // the assumption.
+            //_ASSERTE(cchCount1 >= 0 && cchCount2 >= 0);
+
+            if (dwCmpFlags != CompareOptions.None &&
+                dwCmpFlags != CompareOptions.IgnoreCase) {
+
+                throw new Exception("CompareInfo.LongCompareStringW not implemented in Bartok!");
+            }
+
+            //  Initialize string pointers.
+            pString1 = lpString1; // (LPWSTR)lpString1;
+            pStringIndex1 = lpStringIndex1;
+            pString2 = lpString2; // (LPWSTR)lpString2;
+            pStringIndex2 = lpStringIndex2;
+
+            //  Invalid Parameter Check:
+            //    - null string pointers
+            //
+            // We have already validate pString1 and pString2 in
+            // COMNlsInfo::CompareString().
+            //
+            // _ASSERTE(pString1 != null && pString2 != null);
+
+            //  Do a wchar by wchar compare.
+            // markples: collapsed 8 times unrolled loop
+            while((cchCount1 != 0 && cchCount2 != 0) &&
+                  (pString1[pStringIndex1] == pString2[pStringIndex2])) {
+
+                pStringIndex1++; pStringIndex2++;
+                cchCount1--; cchCount2--;
+            }
+
+            //  If strings are both at null terminators, return equal.
+            if ((cchCount1 == 0) && (cchCount2 == 0)) {
+                return (CSTR_EQUAL);
+            }
+            if (cchCount1 == 0 || cchCount2 == 0) {
+                goto ScanLongerString;
+            }
+
+            //  Initialize flags, pointers, and counters.
+            fIgnorePunct = false;
+
+            //  Switch on the different flag options.  This will speed up
+            //  the comparisons of two strings that are different.
+            //
+            //  The only two possibilities in this optimized section are
+            //  no flags and the ignore case flag.
+            if (dwCmpFlags == CompareOptions.None) {
+                Mask = CMP_MASKOFF_NONE;
+            } else {
+                Mask = CMP_MASKOFF_CW;
+            }
+
+            State = STATE_DW | STATE_CW;
+
+            //  Compare each character's sortkey weight in the two strings.
+            while ((cchCount1 != 0) && (cchCount2 != 0)) {
+                byte dw1 = GetDiacritic(pString1[pStringIndex1]);
+                byte dw2 = GetDiacritic(pString2[pStringIndex2]);
+                byte cw1 = (byte)(GetCase(pString1[pStringIndex1]) & Mask);
+                byte cw2 = (byte)(GetCase(pString2[pStringIndex2]) & Mask);
+                ushort uw1 = GetUnicode(pString1[pStringIndex1]);
+                ushort uw2 = GetUnicode(pString2[pStringIndex2]);
+
+                if (uw1 != uw2 || dw1 != dw2 || cw1 != cw2) {
+                    byte sm1 = GET_SCRIPT_MEMBER(uw1);    // script member 1
+                    byte sm2 = GET_SCRIPT_MEMBER(uw2);    // script member 2
+                    bool fContinue;                      // flag to continue loop
+
+                    // If Unicode Weights are different and no special cases,
+                    // then we're done.  Otherwise, we need to do extra checking.
+                    //
+                    // Must check ENTIRE string for any possibility of Unicode
+                    // Weight differences.  As soon as a Unicode Weight
+                    // difference is found, then we're done.  If no UW
+                    // difference is found, then the first Diacritic Weight
+                    // difference is used.  If no DW difference is found, then
+                    // use the first Case Difference.  If no CW difference is
+                    // found, then use the first Extra difference.  If no XW
+                    // difference is found, then use the first Special Weight
+                    // difference.
+                    if (uw1 != uw2) {
+                        //  Initialize the continue flag.
+                        fContinue = false;
+
+                        //  Check for Unsortable characters and skip them.  This
+                        //  needs to be outside the switch statement.  If EITHER
+                        //  character is unsortable, must skip it and start
+                        //  over.
+                        if (sm1 == ScriptMember_Unsortable) {
+                            pStringIndex1++; cchCount1--;
+                            fContinue = true;
+                        }
+                        if (sm2 == ScriptMember_Unsortable) {
+                            pStringIndex2++; cchCount2--;
+                            fContinue = true;
+                        }
+                        if (fContinue) {
+                            continue;
+                        }
+
+                        //  Switch on the script member of string 1 and take
+                        //  care of any special cases.
+                        switch (sm1) {
+                          case ( ScriptMember_Punctuation ) : {
+                              //  If the ignore punctuation flag is set, then
+                              //  skip over the punctuation.
+                              if (fIgnorePunct) {
+                                  pStringIndex1++; cchCount1--;
+                                  fContinue = true;
+                              } else if (sm2 != ScriptMember_Punctuation) {
+                                  //  The character in the second string is
+                                  //  NOT punctuation.
+                                  if (WhichPunct2 != 0) {
+                                      //  Set WP 2 to show that string 2 is smaller,
+                                      //  since a punctuation char had already been
+                                      //  found at an earlier position in string 2.
+                                      //
+                                      //  Set the Ignore Punctuation flag so we just
+                                      //  skip over any other punctuation chars in
+                                      //  the string.
+                                      WhichPunct2 = CSTR_GREATER_THAN;
+                                      fIgnorePunct = true;
+                                  } else {
+                                      //  Set WP 1 to show that string 2 is smaller,
+                                      //  and that string 1 has had a punctuation
+                                      //  char - since no punctuation chars have
+                                      //  been found in string 2.
+                                      WhichPunct1 = CSTR_GREATER_THAN;
+                                  }
+                                  //  Advance pointer 1, and set flag to true.
+                                  pStringIndex1++; cchCount1--;
+                                  fContinue = true;
+                              }
+
+                              //  Do NOT want to advance the pointer in string 1
+                              //  if string 2 is also a punctuation char.  This
+                              //  will be done later.
+                              break;
+                          }
+                          case ( ScriptMember_Unsortable ): {
+                              //  Fill out the case statement so the compiler
+                              //  will use a jump table.
+                              break;
+                          }
+                        }
+
+                        //  Switch on the script member of string 2 and take care
+                        //  of any special cases.
+                        switch (sm2) {
+                          case ( ScriptMember_Punctuation ) : {
+                              // If the ignore punctuation flag is set, then skip
+                              // over the punctuation.
+                              if (fIgnorePunct) {
+                                  //  Pointer 2 will be advanced after if-else
+                                  //  statement.
+                                  ;
+                              } else if (sm1 != ScriptMember_Punctuation) {
+                                  //  The character in the first string is
+                                  //  NOT punctuation.
+                                  if (WhichPunct1 != 0) {
+                                      //  Set WP 1 to show that string 1 is smaller,
+                                      //  since a punctuation char had already
+                                      //  been found at an earlier position in
+                                      //  string 1.
+                                      //
+                                      //  Set the Ignore Punctuation flag so we just
+                                      //  skip over any other punctuation in the
+                                      //  string.
+                                      WhichPunct1 = CSTR_LESS_THAN;
+                                      fIgnorePunct = true;
+                                  } else {
+                                      //  Set WP 2 to show that string 1 is smaller,
+                                      //  and that string 2 has had a punctuation
+                                      //  char - since no punctuation chars have
+                                      //  been found in string 1.
+                                      WhichPunct2 = CSTR_LESS_THAN;
+                                  }
+
+                                  //  Pointer 2 will be advanced after if-else
+                                  //  statement.
+                              } else {
+                                  //  Both code points are punctuation.
+                                  //
+                                  // See if either of the strings has encountered
+                                  //  punctuation chars previous to this.
+                                  if (WhichPunct1 != 0) {
+                                      //  String 1 has had a punctuation char, so
+                                      //  it should be the smaller string (since
+                                      //  both have punctuation chars).
+                                      WhichPunct1 = CSTR_LESS_THAN;
+                                  } else if (WhichPunct2 != 0) {
+                                      //  String 2 has had a punctuation char, so
+                                      //  it should be the smaller string (since
+                                      //  both have punctuation chars).
+                                      WhichPunct2 = CSTR_GREATER_THAN;
+                                  } else {
+                                      //  Position is the same, so compare the
+                                      //  special weights.  Set WhichPunct1 to
+                                      //  the smaller special weight.
+                                      WhichPunct1 =
+                                          (((GET_ALPHA_NUMERIC(uw1) <
+                                             GET_ALPHA_NUMERIC(uw2)))
+                                           ? CSTR_LESS_THAN
+                                           : CSTR_GREATER_THAN);
+                                  }
+
+                                  //Set the Ignore Punctuation flag so we just
+                                  //skip over any other punctuation in the string
+                                  fIgnorePunct = true;
+
+                                  //  Advance pointer 1.  Pointer 2 will be
+                                  //  advanced after if-else statement.
+                                  pStringIndex1++; cchCount1--;
+                              }
+
+                              //  Advance pointer 2 and set flag to true.
+                              pStringIndex2++; cchCount2--;
+                              fContinue = true;
+
+                              break;
+                          }
+                          case ( ScriptMember_Unsortable ): {
+                              //  Fill out the case statement so the compiler
+                              //  will use a jump table.
+                              break;
+                          }
+                        }
+
+                        //  See if the comparison should start again.
+                        if (fContinue) {
+                            continue;
+                        }
+
+                        //  We're not supposed to drop down into the state table
+                        //  if unicode weights are different, so stop comparison
+                        //  and return result of unicode weight comparison.
+                        if (uw1 != uw2) {
+                            return (uw1 < uw2) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;
+                        }
+                    }
+
+                    //  For each state in the state table, do the appropriate
+                    //  comparisons.     (UW1 == UW2)
+                    if ((State & STATE_DW) != 0) {
+                        if (dw1 != dw2) {
+                            //  Save which string has the smaller diacritic
+                            //  weight if the diacritic weights are still
+                            //  different.
+                            WhichDiacritic = (dw1 < dw2) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;
+
+                            //  Remove state from state machine.
+                            State &= ~STATE_DW;
+                        }
+                    }
+                    if ((State & STATE_CW) != 0) {
+                        //  Get the case weights.
+                        if (cw1 != cw2) {
+                            //  Save which string has the smaller case weight.
+                            WhichCase = (cw1 < cw2) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;
+
+                            //  Remove state from state machine.
+                            State &= ~STATE_CW;
+                        }
+                    }
+                }
+
+                // Advance the string pointers.
+                pStringIndex1++; cchCount1--;
+                pStringIndex2++; cchCount2--;
+            }
+
+          ScanLongerString:
+            //  If the end of BOTH strings has been reached, then the unicode
+            //  weights match exactly.  Check the diacritic, case and special
+            //  weights.  If all are zero, then return success.  Otherwise,
+            //  return the result of the weight difference.
+            //
+            //  NOTE:  The following checks MUST REMAIN IN THIS ORDER:
+            //            Diacritic, Case, Punctuation.
+            if (cchCount1 == 0) {
+                if (cchCount2 == 0) {
+                    // Both of the strings have reached the end.
+                    if (WhichDiacritic != 0) {
+                        return (WhichDiacritic);
+                    }
+                    if (WhichCase != 0) {
+                        return (WhichCase);
+                    }
+                    if (WhichPunct1 != 0) {
+                        return (WhichPunct1);
+                    }
+                    if (WhichPunct2 != 0) {
+                        return (WhichPunct2);
+                    }
+                    return (CSTR_EQUAL);
+                } else {
+                    //  String 2 is longer.
+                    pString1 = pString2;
+                    pStringIndex1 = pStringIndex2;
+                    cchCount1 = cchCount2;
+                }
+            }
+
+            //  Scan to the end of the longer string.
+            return QuickScanLongerString(pString1, pStringIndex1, cchCount1,
+                                         ((cchCount2 == 0) ? CSTR_GREATER_THAN : CSTR_LESS_THAN),
+                                         WhichDiacritic, WhichCase, WhichPunct1,
+                                         WhichPunct2);
+        }
+
+
+        //int NativeCompareInfo::QUICK_SCAN_LONGER_STRING
+        //(LPCWSTR ptr, int cchCount1, int ret, int& WhichDiacritic,
+        // int& WhichCase, int& WhichPunct1, int& WhichPunct2)
+        private static int QuickScanLongerString(String ptr, int ptrIndex, int cchCount1,
+                                                 int ret, int WhichDiacritic, int WhichCase, int WhichPunct1,
+                                                 int WhichPunct2) {
+
+            // Search through the rest of the longer string to make sure all
+            // characters are not to be ignored.  If find a character that
+            // should not be ignored, return the given return value immediately.
+
+            // The only exception to this is when a nonspace mark is found.  If
+            // another DW difference has been found earlier, then use that.
+
+            while (cchCount1 != 0) {
+                switch (GET_SCRIPT_MEMBER(GetUnicode(ptr[ptrIndex]))) {
+                  case ( ScriptMember_Unsortable ): {
+                      break;
+                  }
+                  default : {
+                      return (ret);
+                  }
+                }
+
+                // Advance pointer.
+                ptrIndex++; cchCount1--;
+            }
+
+            // Need to check diacritic, case, extra, and special weights for
+            // final return value.  Still could be equal if the longer part of
+            // the string contained only unsortable characters.
+
+            // NOTE: The following checks MUST REMAIN IN THIS ORDER: Diacritic,
+            // Case, Punctuation.
+
+            if (WhichDiacritic != 0) {
+                return (WhichDiacritic);
+            }
+            if (WhichCase != 0) {
+                return (WhichCase);
+            }
+            if (WhichPunct1 != 0) {
+                return (WhichPunct1);
+            }
+            if (WhichPunct2 != 0) {
+                return (WhichPunct2);
+            }
+
+            return (CSTR_EQUAL);
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsPrefix
+        //
+        //  Determines whether prefix is a prefix of string.  If prefix equals
+        //  String.Empty, true is returned.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        //| <include path='docs/doc[@for="CompareInfo.IsPrefix"]/*' />
+        public static bool IsPrefix(String source, String prefix,
+                                    CompareOptions options) {
+            if (source == null || prefix == null) {
+                throw new ArgumentNullException(source==null?"source":"prefix",
+                                                "Argument is null");
+            }
+            int prefixLen = prefix.Length;
+            if (prefixLen == 0) {
+                return true;
+            }
+            if (((uint) options & ValidMaskOffFlags) != 0 &&
+                (options != CompareOptions.Ordinal)) {
+                throw new ArgumentException("Invalid flags", "options");
+            }
+            int sourceLen = source.Length;
+            if (options == CompareOptions.Ordinal) {
+                if (prefixLen > sourceLen) {
+                    return false;
+                }
+                for (int i = 0; i < prefixLen; i++) {
+                    if (prefix[i] != source[i]) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            int result = IndexOf(source, prefix, 0, options);
+            return (result == 0);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IsPrefix1"]/*' />
+        public static bool IsPrefix(String source, String prefix)
+        {
+            return (IsPrefix(source, prefix, 0));
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IsSuffix
+        //
+        //  Determines whether suffix is a suffix of string.  If suffix equals
+        //  String.Empty, true is returned.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        //| <include path='docs/doc[@for="CompareInfo.IsSuffix"]/*' />
+        public static bool IsSuffix(String source, String suffix,
+                                    CompareOptions options) {
+            if (source == null || suffix == null) {
+                throw new ArgumentNullException(source==null?"source":"suffix",
+                                                "Argument is null");
+            }
+            int suffixLen = suffix.Length;
+            if (suffixLen == 0) {
+                return true;
+            }
+            if (((uint) options & ValidMaskOffFlags) != 0 &&
+                (options != CompareOptions.Ordinal)) {
+                throw new ArgumentException("Invalid flags", "options");
+            }
+            // native boundary
+            // BUGBUG: fast string testing goes here: COMNlsInfo::nativeIsSuffix
+            int matchEnd;
+            int result = LastIndexOfString(source, suffix, source.Length-1,
+                                           source.Length, options, out matchEnd);
+            if (result >= 0) {
+                int sourceLen = source.Length;
+                if (matchEnd == sourceLen) {
+                    return true;
+                }
+                if (matchEnd < sourceLen) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IsSuffix1"]/*' />
+        public static bool IsSuffix(String source, String suffix)
+        {
+            return (IsSuffix(source, suffix, 0));
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  IndexOf
+        //
+        //  Returns the first index where value is found in string.  The
+        //  search starts from startIndex and ends at endIndex.  If endIndex
+        //  is -1, then it will go to the end of the string.  Returns -1 if
+        //  the specified value is not found.  If value equals String.Empty,
+        //  startIndex is returned.  Throws IndexOutOfRange if startIndex or
+        //  endIndex is less than zero or greater than the length of string.
+        //  Throws ArgumentException if value is null.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf"]/*' />
+        public static int IndexOf(String source, char value) {
+            return IndexOfChar(source, value, 0, -1, CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf1"]/*' />
+        public static int IndexOf(String source, String value) {
+            return IndexOfString(source, value, 0, -1, CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf2"]/*' />
+        public static int IndexOf(String source, char value, CompareOptions options) {
+            return IndexOfChar(source, value, 0, -1, options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf3"]/*' />
+        public static int IndexOf(String source, String value, CompareOptions options) {
+            return IndexOfString(source, value, 0, -1, options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf4"]/*' />
+        public static int IndexOf(String source, char value, int startIndex) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            if (startIndex > source.Length) {
+                throw new ArgumentOutOfRangeException("startIndex",
+                                                      "greater than string len");
+            }
+            return IndexOfChar(source, value, startIndex, -1, CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf10"]/*' />
+        public static int IndexOf(String source, char value, int startIndex,
+                                   CompareOptions options) {
+            return IndexOfChar(source, value, startIndex, -1, options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf5"]/*' />
+        public static int IndexOf(String source, char value,
+                                   int startIndex, int count) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            return IndexOfChar(source, value, startIndex, count, CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf6"]/*' />
+        public static int IndexOf(String source, String value, int startIndex) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            if (startIndex > source.Length) {
+                throw new ArgumentOutOfRangeException("startIndex",
+                                                      "greater than string len");
+            }
+            return IndexOfString(source, value, startIndex, -1,
+                                 CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf11"]/*' />
+        public static int IndexOf(String source, String value,
+                                  int startIndex, CompareOptions options) {
+            return IndexOfString(source, value, startIndex, -1, options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf7"]/*' />
+        public static int IndexOf(String source, String value,
+                                  int startIndex, int count) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            return IndexOfString(source, value, startIndex, count,
+                                 CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf8"]/*' />
+        public static int IndexOf(String source, char value,
+                                   int startIndex, int count,
+                                   CompareOptions options) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            return IndexOfChar(source, value, startIndex, count, options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.IndexOf9"]/*' />
+        public static int IndexOf(String source, String value,
+                                   int startIndex, int count,
+                                   CompareOptions options) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            return IndexOfString(source, value, startIndex, count, options);
+        }
+
+        private static int IndexOfChar(String source, char value,
+                                       int startIndex, int count,
+                                       CompareOptions options) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            int stringLen = source.Length;
+            if (stringLen == 0) {
+                return -1;
+            }
+            if (startIndex < 0 || startIndex > stringLen) {
+                throw new ArgumentOutOfRangeException("startIndex");
+            }
+            if (count == -1) {
+                count = stringLen - startIndex;
+            } else if (count < 0 || count + startIndex > stringLen) {
+                throw new ArgumentOutOfRangeException("count");
+            }
+            int endIndex = startIndex + count - 1;
+            bool fAscii = false;
+            if (options != CompareOptions.Ordinal) {
+                if(source.StringState == StringState.Undetermined) {
+                    source.CheckHighChars();
+                }
+                fAscii = ((source.IsFastIndex() && value < 0x7f) || value == 0);
+            }
+            if ((fAscii && options == CompareOptions.None) ||
+                (options == CompareOptions.Ordinal)) {
+                for (int i = startIndex; i <= endIndex; i++) {
+                    if (source[i] == value) {
+                        return i;
+                    }
+                }
+                return -1;
+            } else if (fAscii && options == CompareOptions.IgnoreCase) {
+                char lowerValue = value;
+                if (value >= 'A' && value <= 'Z') {
+                    lowerValue = (char) (value | 0x20);
+                }
+                for (int i = startIndex; i <= endIndex; i++) {
+                    char sourceValue = source[i];
+                    if (sourceValue >= 'A' && sourceValue <= 'Z') {
+                        sourceValue = (char) (sourceValue | 0x20);
+                    }
+                    if (lowerValue == sourceValue) {
+                        return i;
+                    }
+                }
+                return -1;
+            } else {
+                return SlowIndexOfString(source, String.StringCTOR(value, 1),
+                                         startIndex, endIndex, options);
+            }
+        }
+
+        private static int IndexOfString(String source, String value,
+                                         int startIndex, int count,
+                                         CompareOptions options) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            if (value == null) {
+                throw new ArgumentNullException("value");
+            }
+            int sourceLen = source.Length;
+            int valueLen = value.Length;
+            if (sourceLen == 0) {
+                if (valueLen == 0) {
+                    return 0;
+                } else {
+                    return -1;
+                }
+            }
+            if (startIndex < 0 || startIndex > sourceLen) {
+                throw new ArgumentOutOfRangeException("startIndex");
+            }
+            if (count == -1) {
+                count = sourceLen - startIndex;
+            } else if (count < 0 || count + startIndex > sourceLen) {
+                throw new ArgumentOutOfRangeException("count");
+            }
+            if (valueLen == 0) {
+                return startIndex;
+            }
+            int endIndex = startIndex + count - 1;
+
+            // NOTE Currently we do not support cultures, so make
+            // requests for default comparisons the same as 'Ordinal' (fast,
+            // unicode-value-based). When we add proper support for
+            // cultures, take out the == CompareOptions.None case.
+            if ((options == CompareOptions.Ordinal) ||
+                (options == CompareOptions.None))
+            {
+                return FastIndexOfString(source, startIndex, endIndex, value);
+            }
+
+            return SlowIndexOfString(source, value, startIndex, endIndex, options);
+        }
+
+        private static int FastIndexOfString(String source, int startIndex,
+                                             int endIndex, String value) {
+            int valueLen = value.Length;
+            int endPattern = endIndex - valueLen + 1;
+            if (endPattern < 0) {
+                return -1;
+            }
+            if (valueLen <= 0) {
+                return startIndex;
+            }
+
+            for (int i = startIndex; i <= endPattern; i++) {
+                int j = 0;
+                while (source[i+j] == value[j]) {
+                    j++;
+                    if (j == valueLen) {
+                        return i;
+                    }
+                }
+            }
+
+            return -1;
+        }
+
+        private static int FastIndexOfStringInsensitive(String source,
+                                                        int startIndex,
+                                                        int endIndex,
+                                                        String pattern) {
+            char srcChar, patChar;
+            int endPattern = endIndex - pattern.Length + 1;
+
+            if(endPattern < 0) {
+                return -1;
+            }
+
+            for(int ctrSrc = startIndex; ctrSrc <= endPattern; ctrSrc++) {
+                int ctrPat;
+                for(ctrPat = 0; ctrPat < pattern.Length; ctrPat++) {
+                    srcChar = source[ctrSrc + ctrPat];
+                    if(srcChar >= 'A' && srcChar <= 'Z') {
+                        srcChar |= (char)0x20;
+                    }
+                    patChar = pattern[ctrPat];
+                    if(patChar >= 'A' && patChar <= 'Z') {
+                        patChar |= (char)0x20;
+                    }
+                    if(srcChar != patChar) {
+                        break;
+                    }
+                }
+
+                if(ctrPat == pattern.Length) {
+                    return ctrSrc;
+                }
+            }
+            return -1;
+        }
+
+        private static int SlowIndexOfString(String source, String value,
+                                             int startIndex, int endIndex,
+                                             CompareOptions options) {
+            throw new Exception("CompareInfo.SlowIndexOfString not implemented in Bartok!");
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  LastIndexOf
+        //
+        //  Returns the last index where value is found in string.  The
+        //  search starts from startIndex and ends at endIndex.  If endIndex
+        //  is -1, then it will go to the end of the string.  Returns -1 if
+        //  the specified value is not found.  If value equals String.Empty,
+        //  endIndex is returned.  Throws IndexOutOfRange if startIndex or
+        //  endIndex is less than zero or greater than the length of string.
+        //  Throws ArgumentException if value is null.
+        //
+        ////////////////////////////////////////////////////////////////////////
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf"]/*' />
+        public static int LastIndexOf(String source, char value) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            return LastIndexOfChar(source, value,
+                                   source.Length-1, source.Length,
+                                   CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf1"]/*' />
+        public static int LastIndexOf(String source, String value) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            int ignore;
+            return LastIndexOfString(source, value,
+                                     source.Length-1, source.Length,
+                                     CompareOptions.None, out ignore);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf2"]/*' />
+        public static int LastIndexOf(String source, char value,
+                                       CompareOptions options) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            return LastIndexOfChar(source, value,
+                                   source.Length-1, source.Length,
+                                   options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf3"]/*' />
+        public static int LastIndexOf(String source, String value,
+                                       CompareOptions options) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            int ignore;
+            return LastIndexOfString(source, value,
+                                     source.Length-1, source.Length,
+                                     options, out ignore);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf4"]/*' />
+        public static int LastIndexOf(String source, char value,
+                                       int startIndex) {
+            return LastIndexOfChar(source, value, startIndex, startIndex+1,
+                                   CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf11"]/*' />
+        public static int LastIndexOf(String source, char value,
+                                       int startIndex, CompareOptions options) {
+            return LastIndexOfChar(source, value, startIndex, startIndex+1,
+                                   options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf5"]/*' />
+        public static int LastIndexOf(String source, char value,
+                                       int startIndex, int count) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            return LastIndexOfChar(source, value, startIndex, count,
+                                   CompareOptions.None);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf6"]/*' />
+        public static int LastIndex(String source, String value,
+                                     int startIndex) {
+            int ignore;
+            return LastIndexOfString(source, value,
+                                     startIndex, startIndex+1,
+                                     CompareOptions.None, out ignore);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf10"]/*' />
+        public static int LastIndexOf(String source, String value,
+                                       int startIndex, CompareOptions options) {
+            int ignore;
+            return LastIndexOfString(source, value,
+                                     startIndex, startIndex+1,
+                                     options, out ignore);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf7"]/*' />
+        public static int LastIndexOf(String source, String value,
+                                       int startIndex, int count) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            int ignore;
+            return LastIndexOfString(source, value, startIndex, count,
+                                     CompareOptions.None, out ignore);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf8"]/*' />
+        public static int LastIndexOf(String source, char value,
+                                       int startIndex, int count,
+                                       CompareOptions options) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            return LastIndexOfChar(source, value, startIndex, count,
+                                   options);
+        }
+
+        //| <include path='docs/doc[@for="CompareInfo.LastIndexOf9"]/*' />
+        public static int LastIndexOf(String source, String value,
+                                       int startIndex, int count,
+                                       CompareOptions options) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            int ignore;
+            return LastIndexOfString(source, value, startIndex, count,
+                                     options, out ignore);
+        }
+
+        internal static int LastIndexOfChar(String source, char value,
+                                            int startIndex, int count,
+                                            CompareOptions options) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            int stringLen = source.Length;
+            if (stringLen == 0) {
+                return -1;
+            }
+            if (startIndex < 0 || startIndex > stringLen) {
+                throw new ArgumentOutOfRangeException("startIndex");
+            }
+            int endIndex;
+            if (count == -1) {
+                endIndex = 0;
+                count = startIndex + 1; // REVIEW: not the same as BCL code
+            } else if (count < 0 || count > startIndex + 1) {
+                throw new ArgumentOutOfRangeException("count");
+            } else {
+                endIndex = startIndex - count + 1;
+            }
+            bool fAscii = false;
+            if (options != CompareOptions.Ordinal) {
+                if(source.StringState == StringState.Undetermined) {
+                    source.CheckHighChars();
+                }
+                fAscii = (source.IsFastIndex() && value < 0x7f) || value == 0;
+            }
+            if ((fAscii && options == CompareOptions.None) ||
+                (options == CompareOptions.Ordinal)) {
+                for (int i = startIndex; i >= endIndex; i--) {
+                    if (source[i] == value) {
+                        return i;
+                    }
+                }
+                return -1;
+            } else if (fAscii && options == CompareOptions.IgnoreCase) {
+                char lowerValue = value;
+                if (value >= 'A' && value <= 'Z') {
+                    lowerValue = (char) (value | 0x20);
+                }
+                for (int i = startIndex; i >= endIndex; i--) {
+                    char sourceValue = source[i];
+                    if (sourceValue >= 'A' && sourceValue <= 'Z') {
+                        sourceValue = (char) (sourceValue | 0x20);
+                    }
+                    if (lowerValue == sourceValue) {
+                        return i;
+                    }
+                }
+                return -1;
+            } else {
+                // probably wrong, but needed for Bartok.
+                // throw new Exception("CompareInfo.SlowLastIndexOfChar not implemented in Bartok!");
+                for (int i = startIndex; i >= endIndex; i--) {
+                    if (source[i] == value) {
+                        return i;
+                    }
+                }
+                return -1;
+            }
+        }
+
+        internal static int LastIndexOfString(String source, String value,
+                                              int startIndex, int count,
+                                              CompareOptions options,
+                                              out int matchEndIndex) {
+            if (source == null) {
+                throw new ArgumentNullException("source");
+            }
+            if (value == null) {
+                throw new ArgumentNullException("value");
+            }
+            int sourceLen = source.Length;
+            int valueLen = value.Length;
+            if (sourceLen == 0) {
+                if (valueLen == 0) {
+                    matchEndIndex = 0;
+                    return 0;
+                } else {
+                    matchEndIndex = -1; // REVIEW: not the same as BCL
+                    return -1;
+                }
+            }
+            if (startIndex < 0 || startIndex > sourceLen) {
+                throw new ArgumentOutOfRangeException("startIndex");
+            }
+            int endIndex;
+            if (count == -1) {
+                endIndex = 0;
+                count = startIndex + 1; // REVIEW: not the same as BCL
+            } else if (count < 0 || count - 1 > startIndex) {
+                throw new ArgumentOutOfRangeException("count");
+            } else {
+                endIndex = startIndex - count + 1;
+            }
+            if (valueLen == 0) {
+                matchEndIndex = startIndex; // REVIEW: not the same as BCL
+                return startIndex;
+            }
+            if (options == CompareOptions.Ordinal) {
+                return FastLastIndexOfString(source, startIndex, endIndex,
+                                             value, out matchEndIndex);
+            }
+
+            // NOTE Currently we do not support cultures, so make
+            // requests for default comparisons the same as 'Ordinal' (fast,
+            // unicode-value-based). When we add proper support for
+            // cultures, take out the == CompareOptions.None case.
+            if ((options == CompareOptions.Ordinal) ||
+                (options == CompareOptions.None))
+            {
+                return FastLastIndexOfString(source, startIndex, endIndex, value,
+                                             out matchEndIndex);
+            }
+            matchEndIndex = -1;
+            return -1;
+            // throw new Exception("CompareInfo.SlowLastIndexOfString not implemented in Bartok!");
+        }
+
+        private static int FastLastIndexOfString(String source, int startIndex,
+                                                 int endIndex, String value,
+                                                 out int matchEndIndex) {
+            int valueLen = value.Length;
+            int startPattern = startIndex - valueLen + 1;
+            if (startPattern < 0) {
+                matchEndIndex = -1;
+                return -1;
+            }
+
+            for (int ctrSrc = startPattern; ctrSrc >= endIndex; ctrSrc--) {
+                int ctrPat;
+                for (ctrPat = 0;
+                     (ctrPat < valueLen)
+                         && (source[ctrSrc + ctrPat] == value[ctrPat]);
+                     ctrPat++) {
+                    //Deliberately empty.
+                }
+                if (ctrPat == valueLen) {
+                    matchEndIndex = ctrSrc;
+                    return ctrSrc;
+                }
+            }
+            matchEndIndex = -1;
+            return -1;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        private static byte GET_SCRIPT_MEMBER(ushort pwt) {
+            return (byte) ((pwt & 0xff00) >> 8);
+        }
+
+        private static byte GET_ALPHA_NUMERIC(ushort pwt) {
+            return (byte) (pwt & 0x00ff);
+        }
+
+        private static ushort GetUnicode(char c) {
+            short firstIndex = unicodeTableLevel1[c >> 8];
+            short secondIndex = unicodeTableLevel2[firstIndex + ((c >> 4) & 0xf)];
+            return unicodeTableLevel3[secondIndex + (c & 0xf)];
+        }
+
+        private static byte GetDiacritic(char c) {
+            short firstIndex = diacriticTableLevel1[c >> 8];
+            short secondIndex = diacriticTableLevel2[firstIndex + ((c >> 4) & 0xf)];
+            return diacriticTableLevel3[secondIndex + (c & 0xf)];
+        }
+
+        private static byte GetCase(char c) {
+            short firstIndex = caseTableLevel1[c >> 8];
+            short secondIndex = caseTableLevel2[firstIndex + ((c >> 4) & 0xf)];
+            return caseTableLevel3[secondIndex + (c & 0xf)];
+        }
+
+        private static short[] unicodeTableLevel1 = new short[256] {
+            0   ,16  ,32  ,48  ,64  ,80  ,96  ,112 ,128 ,144 ,160 ,176 ,192 ,208 ,224 ,128 , // 0
+            240 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,256 ,128 , // 16
+            272 ,288 ,304 ,128 ,320 ,128 ,336 ,352 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 32
+            368 ,128 ,384 ,400 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 48
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 64
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 80
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 96
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 112
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 128
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 144
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 160
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 176
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 192
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 208
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 224
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,416 ,128 ,128 ,432 ,448 , // 240
+        };
+        private static short[] unicodeTableLevel2 = new short[464] {
+            0   ,16  ,32  ,48  ,64  ,80  ,96  ,112 ,128 ,144 ,160 ,176 ,192 ,208 ,192 ,224 , // 0
+            240 ,256 ,272 ,288 ,304 ,320 ,336 ,352 ,368 ,384 ,400 ,416 ,432 ,448 ,464 ,480 , // 16
+            496 ,512 ,528 ,528 ,528 ,544 ,560 ,576 ,592 ,608 ,624 ,640 ,656 ,672 ,688 ,528 , // 32
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,704 ,720 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 48
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,736 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 64
+            528 ,528 ,528 ,528 ,528 ,752 ,528 ,528 ,768 ,528 ,528 ,784 ,800 ,528 ,528 ,816 , // 80
+            832 ,848 ,528 ,528 ,864 ,880 ,896 ,528 ,528 ,528 ,528 ,528 ,528 ,912 ,528 ,928 , // 96
+            944 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 112
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 128
+            528 ,528 ,528 ,960 ,528 ,976 ,992 ,1008,528 ,528 ,528 ,528 ,528 ,528 ,1024,1040, // 144
+            528 ,528 ,528 ,528 ,528 ,528 ,1056,528 ,528 ,528 ,528 ,528 ,528 ,528 ,1072,528 , // 160
+            528 ,528 ,528 ,528 ,528 ,528 ,1088,528 ,528 ,528 ,528 ,528 ,528 ,528 ,1104,1120, // 176
+            528 ,528 ,528 ,528 ,528 ,528 ,1136,528 ,528 ,528 ,528 ,528 ,528 ,528 ,1152,528 , // 192
+            528 ,528 ,528 ,528 ,528 ,528 ,1168,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 208
+            528 ,528 ,528 ,1184,528 ,1200,528 ,528 ,528 ,528 ,528 ,528 ,528 ,1216,528 ,528 , // 224
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,1232, // 240
+            1248,1264,1280,1296,1312,1328,1344,1360,1376,1392,1408,1424,1440,1456,1472,1488, // 256
+            1504,1520,1536,1552,1568,528 ,528 ,1584,1600,528 ,1616,528 ,528 ,528 ,528 ,528 , // 272
+            1632,1648,1664,1680,528 ,1696,1712,1728,1744,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 288
+            1760,1776,1792,1808,1824,1840,1856,1872,1888,1904,1920,1936,1952,1968,1984,2000, // 304
+            2016,2032,2048,528 ,2064,528 ,2080,2096,2112,2128,2144,2160,2176,2192,2208,528 , // 320
+            2224,2240,2256,2272,2288,2304,2320,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 336
+            2336,2352,2368,2384,2400,2416,2432,2448,2464,2480,528 ,528 ,528 ,528 ,528 ,528 , // 352
+            2496,2512,2528,2544,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,2560, // 368
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,2576,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 384
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,2592,2608,2624,2640,2656,2672,528 ,528 , // 400
+            2688,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 416
+            528 ,528 ,528 ,2704,2720,2736,2752,2768,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 , // 432
+            2784,48  ,64  ,80  ,96  ,2800,2816,528 ,528 ,528 ,528 ,528 ,528 ,528 ,2832,528 , // 448
+        };
+        private static ushort[] unicodeTableLevel3 = new ushort[2848] {
+            0x0000,0x0603,0x0604,0x0605,0x0606,0x0607,0x0608,0x0609, // 0
+            0x060a,0x0705,0x0706,0x0707,0x0708,0x0709,0x060b,0x060c,
+            0x060d,0x060e,0x060f,0x0610,0x0611,0x0612,0x0613,0x0614, // 16
+            0x0615,0x0616,0x0617,0x0618,0x0619,0x061a,0x061b,0x061c,
+            0x0702,0x071c,0x071d,0x071f,0x0721,0x0723,0x0725,0x0680, // 32
+            0x0727,0x072a,0x072d,0x0803,0x072f,0x0682,0x0733,0x0735,
+            0x0c03,0x0c21,0x0c33,0x0c46,0x0c58,0x0c6a,0x0c7d,0x0c90, // 48
+            0x0ca2,0x0cb4,0x0737,0x073a,0x080e,0x0812,0x0814,0x073c,
+            0x073e,0x0e02,0x0e09,0x0e0a,0x0e1a,0x0e21,0x0e23,0x0e25, // 64
+            0x0e2c,0x0e32,0x0e35,0x0e36,0x0e48,0x0e51,0x0e70,0x0e7c,
+            0x0e7e,0x0e89,0x0e8a,0x0e91,0x0e99,0x0e9f,0x0ea2,0x0ea4, // 80
+            0x0ea6,0x0ea7,0x0ea9,0x073f,0x0741,0x0742,0x0743,0x0744,
+            0x0748,0x0e02,0x0e09,0x0e0a,0x0e1a,0x0e21,0x0e23,0x0e25, // 96
+            0x0e2c,0x0e32,0x0e35,0x0e36,0x0e48,0x0e51,0x0e70,0x0e7c,
+            0x0e7e,0x0e89,0x0e8a,0x0e91,0x0e99,0x0e9f,0x0ea2,0x0ea4, // 112
+            0x0ea6,0x0ea7,0x0ea9,0x074a,0x074c,0x074e,0x0750,0x061d,
+            0x061e,0x061f,0x0620,0x0621,0x0622,0x0623,0x0624,0x0625, // 128
+            0x0626,0x0627,0x0628,0x0629,0x062a,0x062b,0x062c,0x062d,
+            0x062e,0x062f,0x0630,0x0631,0x0632,0x0633,0x0634,0x0635, // 144
+            0x0636,0x0637,0x0638,0x0639,0x063a,0x063b,0x063c,0x063d,
+            0x0704,0x0751,0x0a02,0x0a03,0x0a04,0x0a05,0x0752,0x0a06, // 160
+            0x0753,0x0a07,0x0e02,0x0818,0x0a08,0x0683,0x0a09,0x0754,
+            0x0a0a,0x0817,0x0c33,0x0c46,0x0755,0x0a0b,0x0a0c,0x0a0d, // 176
+            0x0756,0x0c21,0x0e7c,0x081a,0x0c15,0x0c19,0x0c1d,0x0757,
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e0a, // 192
+            0x0e21,0x0e21,0x0e21,0x0e21,0x0e32,0x0e32,0x0e32,0x0e32,
+            0x0e1a,0x0e70,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x081c, // 208
+            0x0e7c,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0ea7,0x0e99,0x0e91,
+            0x0e1a,0x0e70,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x081d, // 224
+            0x0e7c,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0ea7,0x0e99,0x0ea7,
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e0a,0x0e0a, // 240
+            0x0e0a,0x0e0a,0x0e0a,0x0e0a,0x0e0a,0x0e0a,0x0e1a,0x0e1a,
+            0x0e1a,0x0e1a,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21, // 256
+            0x0e21,0x0e21,0x0e21,0x0e21,0x0e25,0x0e25,0x0e25,0x0e25,
+            0x0e25,0x0e25,0x0e25,0x0e25,0x0e2c,0x0e2c,0x0e2c,0x0e2c, // 272
+            0x0e32,0x0e32,0x0e32,0x0e32,0x0e32,0x0e32,0x0e32,0x0e32,
+            0x0e32,0x0e32,0x0e32,0x0e32,0x0e35,0x0e35,0x0e36,0x0e36, // 288
+            0x0e36,0x0e48,0x0e48,0x0e48,0x0e48,0x0e48,0x0e48,0x0e48,
+            0x0e48,0x0e48,0x0e48,0x0e70,0x0e70,0x0e70,0x0e70,0x0e70, // 304
+            0x0e70,0x0e70,0x0e74,0x0e74,0x0e7c,0x0e7c,0x0e7c,0x0e7c,
+            0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e8a,0x0e8a,0x0e8a,0x0e8a, // 320
+            0x0e8a,0x0e8a,0x0e91,0x0e91,0x0e91,0x0e91,0x0e91,0x0e91,
+            0x0e91,0x0e91,0x0e99,0x0e99,0x0e99,0x0e99,0x0e9e,0x0e9e, // 336
+            0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,
+            0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0ea4,0x0ea4,0x0ea7,0x0ea7, // 352
+            0x0ea7,0x0ea9,0x0ea9,0x0ea9,0x0ea9,0x0ea9,0x0ea9,0x0e96,
+            0x0e09,0x0e09,0x0e09,0x0e09,0x0e09,0x0e09,0x0e0a,0x0e0a, // 368
+            0x0e0a,0x0e1b,0x0e1a,0x0e1a,0x0e1a,0x0e1a,0x0e21,0x0e21,
+            0x0e21,0x0e23,0x0e23,0x0e25,0x0e25,0x0e2c,0x0e32,0x0e32, // 384
+            0x0e36,0x0e36,0x0e48,0x0e48,0x0e51,0x0e70,0x0e70,0x0e7c,
+            0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7e,0x0e7e,0x0e8a,0x0e91, // 400
+            0x0e91,0x0e91,0x0e91,0x0e99,0x0e99,0x0e99,0x0e99,0x0e9f,
+            0x0e9f,0x0e9f,0x0ea2,0x0ea7,0x0ea7,0x0ea9,0x0ea9,0x0eaa, // 416
+            0x0eaa,0x0eaa,0x0eaa,0x0c33,0x0c6b,0x0c6b,0x0eb3,0x0ea4,
+            0x081e,0x081f,0x0820,0x0758,0x0e1a,0x0e1a,0x0e1a,0x0e48, // 432
+            0x0e48,0x0e48,0x0e70,0x0e70,0x0e70,0x0e02,0x0e02,0x0e32,
+            0x0e32,0x0e7c,0x0e7c,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f, // 448
+            0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e21,0x0e02,0x0e02,
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e25,0x0e25,0x0e25,0x0e25, // 464
+            0x0e36,0x0e36,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0eaa,0x0eaa,
+            0x0e35,0x0e1a,0x0e1a,0x0e1a,0x0e25,0x0e25,0x0000,0x0000, // 480
+            0x0000,0x0000,0x0e02,0x0e02,0x0e02,0x0e02,0x0e7c,0x0e7c,
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e21,0x0e21,0x0e21,0x0e21, // 496
+            0x0e32,0x0e32,0x0e32,0x0e32,0x0e7c,0x0e7c,0x0e7c,0x0e7c,
+            0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e9f,0x0e9f,0x0e9f,0x0e9f, // 512
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 528
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0e02,0x0e02,0x0e02,0x0e09,0x0e0a,0x0e0a,0x0e1a,0x0e1a, // 544
+            0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e35,
+            0x0e25,0x0e25,0x0e25,0x0e25,0x0e25,0x0e2c,0x0e2c,0x0e2d, // 560
+            0x0e32,0x0e32,0x0e32,0x0e48,0x0e48,0x0e48,0x0e48,0x0e51,
+            0x0e51,0x0e51,0x0e70,0x0e70,0x0e70,0x0e7c,0x0e7c,0x0e7c, // 576
+            0x0e7e,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,
+            0x0e8a,0x0e8a,0x0e91,0x0e21,0x0e35,0x0e21,0x0e21,0x0e99, // 592
+            0x0e99,0x0e9f,0x0e9f,0x0ea2,0x0ea2,0x0ea4,0x0ea7,0x0ea7,
+            0x0ea9,0x0ea9,0x0eaa,0x0eaa,0x0eb3,0x0eb3,0x0eb3,0x0e0a, // 608
+            0x0eb4,0x0e09,0x0e21,0x0e25,0x0e2c,0x0e35,0x0e36,0x0e48,
+            0x0e89,0x0eb3,0x0eb3,0x0e1c,0x0e1a,0x0e1c,0x0e9d,0x0e99, // 624
+            0x0e99,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0e2c,0x0e2c,0x0e35,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0ea4, // 640
+            0x0ea7,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0743,0x0759, // 656
+            0x0000,0x0754,0x0755,0x0748,0x0000,0x0000,0x0000,0x0000,
+            0x07db,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 672
+            0x0759,0x075a,0x075b,0x075c,0x075d,0x075e,0x0000,0x0000,
+            0x0e25,0x0e48,0x0e91,0x0ea6,0x0000,0x0000,0x0000,0x0000, // 688
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x075f,0x0760,0x0000,0x0000, // 704
+            0x0000,0x0000,0x0761,0x0000,0x0000,0x0000,0x0762,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0763,0x0764,0x0000,0x0000, // 720
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0cdb,0x0000,0x0000,0x0000,0x0000,0x0000, // 736
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 752
+            0x0000,0x0000,0x0000,0x0765,0x0766,0x0767,0x0768,0x0769,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 768
+            0x0000,0x076a,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 784
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x076b,0x0000,
+            0x0000,0x0000,0x0000,0x076d,0x0000,0x0000,0x0000,0x0000, // 800
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x076e,0x076f,0x0000,0x0000,0x0000, // 816
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 832
+            0x0000,0x0000,0x0000,0x0000,0x0770,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 848
+            0x0000,0x0000,0x0000,0x0771,0x0000,0x0000,0x0000,0x0772,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 864
+            0x0000,0x0000,0x0000,0x06a0,0x06a1,0x06a2,0x06a3,0x06a4,
+            0x06a5,0x06a7,0x06a6,0x0000,0x0000,0x0000,0x0000,0x0000, // 880
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0c04,0x0c22,0x0c35,0x0c47,0x0c59,0x0c6c,0x0c7f,0x0c91, // 896
+            0x0ca3,0x0cb5,0x0773,0x0774,0x0775,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0776,0x0000,0x0000,0x0000, // 912
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0c05,0x0c23,0x0c36,0x0c48,0x0c5a,0x0c6d,0x0c80,0x0c92, // 928
+            0x0ca4,0x0cb6,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x07e2,0x07e3,0x07e4,0x07e5,0x07e6,0x07e7,0x07e8,0x07e9, // 944
+            0x07ea,0x07eb,0x07ec,0x07ed,0x07ee,0x07ef,0x0000,0x07f0,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 960
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x07de,0x0000,0x0000,
+            0x07dd,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 976
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x07df,0x07e0,0x0c06,0x0c24, // 992
+            0x0c37,0x0c49,0x0c5b,0x0c6e,0x0c81,0x0c93,0x0ca5,0x0cb7,
+            0x07e1,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 1008
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c07,0x0c25, // 1024
+            0x0c38,0x0c4a,0x0c5c,0x0c6f,0x0c82,0x0c94,0x0ca6,0x0cb8,
+            0x0000,0x0000,0x0000,0x0000,0x0c25,0x0c38,0x0c4a,0x0c5c, // 1040
+            0x0c02,0x0cd2,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c08,0x0c26, // 1056
+            0x0c39,0x0c4b,0x0c5d,0x0c70,0x0c83,0x0c95,0x0ca7,0x0cb9,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c09,0x0c27, // 1072
+            0x0c3a,0x0c4c,0x0c5e,0x0c71,0x0c84,0x0c96,0x0ca8,0x0cba,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c0a,0x0c28, // 1088
+            0x0c3b,0x0c4d,0x0c5f,0x0c72,0x0c85,0x0c97,0x0ca9,0x0cbb,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c29, // 1104
+            0x0c3c,0x0c4e,0x0c60,0x0c73,0x0c86,0x0c98,0x0caa,0x0cbc,
+            0x0cc7,0x0cd8,0x0cdc,0x0000,0x0000,0x0000,0x0000,0x0000, // 1120
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c0b,0x0c2a, // 1136
+            0x0c3d,0x0c4f,0x0c61,0x0c74,0x0c87,0x0c99,0x0cab,0x0cbd,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c0c,0x0c2b, // 1152
+            0x0c3e,0x0c50,0x0c62,0x0c75,0x0c88,0x0c9a,0x0cac,0x0cbe,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c0d,0x0c2c, // 1168
+            0x0c3f,0x0c51,0x0c63,0x0c76,0x0c89,0x0c9b,0x0cad,0x0cbf,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 1184
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0af9,
+            0x0c0e,0x0c2d,0x0c40,0x0c52,0x0c64,0x0c77,0x0c8a,0x0c9c, // 1200
+            0x0cae,0x0cc0,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0c0f,0x0c2e,0x0c41,0x0c53,0x0c65,0x0c78,0x0c8b,0x0c9d, // 1216
+            0x0caf,0x0cc1,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 1232
+            0x0000,0x0000,0x0000,0x07dc,0x0000,0x0000,0x0000,0x0000,
+            0x0e02,0x0e02,0x0e09,0x0e09,0x0e09,0x0e09,0x0e09,0x0e09, // 1248
+            0x0e0a,0x0e0a,0x0e1a,0x0e1a,0x0e1a,0x0e1a,0x0e1a,0x0e1a,
+            0x0e1a,0x0e1a,0x0e1a,0x0e1a,0x0e21,0x0e21,0x0e21,0x0e21, // 1264
+            0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e23,0x0e23,
+            0x0e25,0x0e25,0x0e2c,0x0e2c,0x0e2c,0x0e2c,0x0e2c,0x0e2c, // 1280
+            0x0e2c,0x0e2c,0x0e2c,0x0e2c,0x0e32,0x0e32,0x0e32,0x0e32,
+            0x0e36,0x0e36,0x0e36,0x0e36,0x0e36,0x0e36,0x0e48,0x0e48, // 1296
+            0x0e48,0x0e48,0x0e48,0x0e48,0x0e48,0x0e48,0x0e51,0x0e51,
+            0x0e51,0x0e51,0x0e51,0x0e51,0x0e70,0x0e70,0x0e70,0x0e70, // 1312
+            0x0e70,0x0e70,0x0e70,0x0e70,0x0e7c,0x0e7c,0x0e7c,0x0e7c,
+            0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7e,0x0e7e,0x0e7e,0x0e7e, // 1328
+            0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,0x0e8a,
+            0x0e91,0x0e91,0x0e91,0x0e91,0x0e91,0x0e91,0x0e91,0x0e91, // 1344
+            0x0e91,0x0e91,0x0e99,0x0e99,0x0e99,0x0e99,0x0e99,0x0e99,
+            0x0e99,0x0e99,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f, // 1360
+            0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0ea2,0x0ea2,0x0ea2,0x0ea2,
+            0x0ea4,0x0ea4,0x0ea4,0x0ea4,0x0ea4,0x0ea4,0x0ea4,0x0ea4, // 1376
+            0x0ea4,0x0ea4,0x0ea6,0x0ea6,0x0ea6,0x0ea6,0x0ea7,0x0ea7,
+            0x0ea9,0x0ea9,0x0ea9,0x0ea9,0x0ea9,0x0ea9,0x0e2c,0x0e99, // 1392
+            0x0ea4,0x0ea7,0x0e02,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02, // 1408
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,
+            0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02,0x0e02, // 1424
+            0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,
+            0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21,0x0e21, // 1440
+            0x0e32,0x0e32,0x0e32,0x0e32,0x0e7c,0x0e7c,0x0e7c,0x0e7c,
+            0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c, // 1456
+            0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e7c,
+            0x0e7c,0x0e7c,0x0e7c,0x0e7c,0x0e9f,0x0e9f,0x0e9f,0x0e9f, // 1472
+            0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,0x0e9f,
+            0x0e9f,0x0e9f,0x0ea7,0x0ea7,0x0ea7,0x0ea7,0x0ea7,0x0ea7, // 1488
+            0x0ea7,0x0ea7,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x070a,0x070b,0x070c,0x070d,0x070e,0x070f,0x0710,0x0711, // 1504
+            0x0712,0x0713,0x0714,0x0715,0x0000,0x0000,0x0000,0x0000,
+            0x0684,0x0685,0x0688,0x0689,0x068b,0x068c,0x0777,0x0778, // 1520
+            0x0779,0x077a,0x077b,0x077c,0x077d,0x077e,0x077f,0x0780,
+            0x0a0f,0x0a10,0x0a11,0x0a12,0x0a13,0x0a14,0x0a15,0x0686, // 1536
+            0x0717,0x0718,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0a16,0x0a17,0x0781,0x0782,0x0783,0x0784,0x0785,0x0786, // 1552
+            0x0787,0x0788,0x0789,0x0a18,0x078a,0x078b,0x078c,0x078d,
+            0x0a19,0x0a1a,0x0a1b,0x0687,0x0807,0x073f,0x0742,0x0000, // 1568
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0c03,0x0000,0x0000,0x0000,0x0c58,0x0c6a,0x0c7d,0x0c90, // 1584
+            0x0ca2,0x0cb4,0x0803,0x0682,0x0812,0x0727,0x072a,0x0e70,
+            0x0c03,0x0c21,0x0c33,0x0c46,0x0c58,0x0c6a,0x0c7d,0x0c90, // 1600
+            0x0ca2,0x0cb4,0x0803,0x0682,0x0812,0x0727,0x072a,0x0000,
+            0x0a1c,0x0a1d,0x0a1e,0x0a1f,0x0a20,0x0a21,0x0a22,0x0a23, // 1616
+            0x0a24,0x0a25,0x0a26,0x0a27,0x0afb,0x0000,0x0000,0x0000,
+            0x0e05,0x0e07,0x0e0a,0x0e0a,0x0e13,0x0e18,0x0e19,0x0e21, // 1632
+            0x0e92,0x0e23,0x0e25,0x0e2c,0x0e2c,0x0e2c,0x0e2c,0x0e2c,
+            0x0e32,0x0e32,0x0e48,0x0e48,0x0e49,0x0e70,0x0e71,0x0afa, // 1648
+            0x0e7e,0x0e7e,0x0e89,0x0e8a,0x0e8a,0x0e8a,0x0e8b,0x0e8c,
+            0x0e93,0x0e9a,0x0e9c,0x0ea3,0x0ea9,0x0ea9,0x0000,0x0000, // 1664
+            0x0ea9,0x0000,0x0e37,0x0e02,0x0e09,0x0e0a,0x0e21,0x0e21,
+            0x0e21,0x0e23,0x0e23,0x0e51,0x0e7c,0x0000,0x0000,0x0000, // 1680
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0c16,0x0c1c,0x0c14,0x0c18,0x0c1a, // 1696
+            0x0c1e,0x0c13,0x0c1f,0x0c12,0x0c17,0x0c1b,0x0c20,0x0c21,
+            0x0c30,0x0c43,0x0c55,0x0c67,0x0c7a,0x0c8d,0x0c9f,0x0cb1, // 1712
+            0x0cc3,0x0cc8,0x0ccb,0x0ccd,0x0cd7,0x0cd9,0x0cda,0x0cdd,
+            0x0c30,0x0c43,0x0c55,0x0c67,0x0c7a,0x0c8d,0x0c9f,0x0cb1, // 1728
+            0x0cc3,0x0cc8,0x0ccb,0x0ccd,0x0cd7,0x0cd9,0x0cda,0x0cde,
+            0x0cdf,0x0ce0,0x0ce1,0x0000,0x0000,0x0000,0x0000,0x0000, // 1744
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0821,0x0822,0x0823,0x0824,0x0825,0x0826,0x0827,0x0828, // 1760
+            0x0829,0x082a,0x082b,0x082c,0x082d,0x082e,0x082f,0x0830,
+            0x0831,0x0832,0x0804,0x080c,0x0833,0x0808,0x0834,0x0809, // 1776
+            0x080a,0x080b,0x0835,0x0836,0x0837,0x0838,0x0cff,0x0839,
+            0x083a,0x083b,0x083c,0x083d,0x083e,0x083f,0x0840,0x0841, // 1792
+            0x0842,0x0843,0x0844,0x0845,0x0846,0x0847,0x0848,0x0849,
+            0x084a,0x084b,0x084c,0x084d,0x084e,0x084f,0x0850,0x0851, // 1808
+            0x0852,0x0853,0x0854,0x0855,0x0856,0x0857,0x0858,0x0859,
+            0x085a,0x085b,0x085c,0x085d,0x085e,0x085f,0x0860,0x0861, // 1824
+            0x0862,0x0863,0x0864,0x0865,0x0866,0x0867,0x0868,0x0869,
+            0x086a,0x086b,0x086c,0x086d,0x086e,0x086f,0x0870,0x0871, // 1840
+            0x0872,0x0873,0x0874,0x0875,0x0876,0x0877,0x0878,0x0879,
+            0x087a,0x087b,0x087c,0x087d,0x087e,0x087f,0x0880,0x0881, // 1856
+            0x0882,0x0883,0x0819,0x081b,0x0884,0x0885,0x0886,0x0887,
+            0x0888,0x0889,0x088a,0x088b,0x088c,0x088d,0x088e,0x088f, // 1872
+            0x0890,0x0891,0x080f,0x0815,0x0892,0x0893,0x0894,0x0895,
+            0x0896,0x0897,0x0898,0x0899,0x089a,0x089b,0x089c,0x089d, // 1888
+            0x089e,0x089f,0x08a0,0x08a1,0x08a2,0x08a3,0x08a4,0x08a5,
+            0x08a6,0x08a7,0x08a8,0x08a9,0x08aa,0x0803,0x0804,0x0806, // 1904
+            0x0808,0x080b,0x080a,0x0809,0x0812,0x0805,0x0803,0x0804,
+            0x0806,0x080b,0x08ab,0x08ac,0x08ad,0x08ae,0x08af,0x08b0, // 1920
+            0x08b1,0x08b2,0x08b3,0x08b4,0x08b5,0x08b6,0x08b7,0x08b8,
+            0x0810,0x0816,0x08b9,0x08ba,0x08bb,0x08bc,0x08bd,0x08be, // 1936
+            0x08bf,0x08c0,0x08c1,0x08c2,0x08c3,0x08c4,0x08c5,0x08c6,
+            0x08c7,0x08c8,0x08c9,0x08ca,0x08cb,0x08cc,0x08cd,0x08ce, // 1952
+            0x08cf,0x08d0,0x08d1,0x08d2,0x08d3,0x08d4,0x08d5,0x08d6,
+            0x08d7,0x08d8,0x08d9,0x08da,0x08db,0x08dc,0x08dd,0x08de, // 1968
+            0x08df,0x08e0,0x08e1,0x08e2,0x08e3,0x08e4,0x08e5,0x08e6,
+            0x08e7,0x08e8,0x08e9,0x08ea,0x08eb,0x08ec,0x08ed,0x08ee, // 1984
+            0x08ef,0x08f0,0x08f1,0x08f2,0x08f3,0x08f4,0x08f5,0x08f6,
+            0x08f7,0x08f8,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 2000
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x07b6,0x07b7,0x07b8,0x07b9,0x07ba,0x07bb,0x07bc,0x07bd, // 2016
+            0x07be,0x07bf,0x07c0,0x07c1,0x07c2,0x07c3,0x07c4,0x07c5,
+            0x07c6,0x07c7,0x07c8,0x07c9,0x07ca,0x07cb,0x07cc,0x07cd, // 2032
+            0x07ce,0x07cf,0x07d0,0x07d1,0x07d2,0x07d3,0x07d4,0x07d5,
+            0x07d6,0x07d7,0x0719,0x071a,0x07d8,0x0000,0x0000,0x0000, // 2048
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0aee,0x0aef,0x0af0,0x0af1,0x0af2,0x0af3,0x0af4,0x0af5, // 2064
+            0x0af6,0x0af7,0x0af8,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0c21,0x0c33,0x0c46,0x0c58,0x0c6a,0x0c7d,0x0c90,0x0ca2, // 2080
+            0x0cb4,0x0cc6,0x0cca,0x0ccc,0x0cce,0x0ccf,0x0cd0,0x0cd1,
+            0x0cd3,0x0cd4,0x0cd5,0x0cd6,0x0c21,0x0c33,0x0c46,0x0c58, // 2096
+            0x0c6a,0x0c7d,0x0c90,0x0ca2,0x0cb4,0x0cc6,0x0cca,0x0ccc,
+            0x0cce,0x0ccf,0x0cd0,0x0cd1,0x0cd3,0x0cd4,0x0cd5,0x0cd6, // 2112
+            0x0c21,0x0c33,0x0c46,0x0c58,0x0c6a,0x0c7d,0x0c90,0x0ca2,
+            0x0cb4,0x0cc6,0x0cca,0x0ccc,0x0cce,0x0ccf,0x0cd0,0x0cd1, // 2128
+            0x0cd3,0x0cd4,0x0cd5,0x0cd6,0x0e02,0x0e09,0x0e0a,0x0e1a,
+            0x0e21,0x0e23,0x0e25,0x0e2c,0x0e32,0x0e35,0x0e36,0x0e48, // 2144
+            0x0e51,0x0e70,0x0e7c,0x0e7e,0x0e89,0x0e8a,0x0e91,0x0e99,
+            0x0e9f,0x0ea2,0x0ea4,0x0ea6,0x0ea7,0x0ea9,0x0e02,0x0e09, // 2160
+            0x0e0a,0x0e1a,0x0e21,0x0e23,0x0e25,0x0e2c,0x0e32,0x0e35,
+            0x0e36,0x0e48,0x0e51,0x0e70,0x0e7c,0x0e7e,0x0e89,0x0e8a, // 2176
+            0x0e91,0x0e99,0x0e9f,0x0ea2,0x0ea4,0x0ea6,0x0ea7,0x0ea9,
+            0x0e02,0x0e09,0x0e0a,0x0e1a,0x0e21,0x0e23,0x0e25,0x0e2c, // 2192
+            0x0e32,0x0e35,0x0e36,0x0e48,0x0e51,0x0e70,0x0e7c,0x0e7e,
+            0x0e89,0x0e8a,0x0e91,0x0e99,0x0e9f,0x0ea2,0x0ea4,0x0ea6, // 2208
+            0x0ea7,0x0ea9,0x0c03,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0a2f,0x0a30,0x0a31,0x0a32,0x0a33,0x0a35,0x0a34,0x0a36, // 2224
+            0x0a37,0x0a38,0x0a39,0x0a3a,0x0a3b,0x0a3c,0x0a3d,0x0a3e,
+            0x0a3f,0x0a40,0x0a41,0x0a42,0x0000,0x0000,0x0000,0x0000, // 2240
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0a43,0x0a44,0x0a45,0x0a46,0x0a47,0x0a48,0x0a49,0x0a4a, // 2256
+            0x0a4b,0x0a4c,0x0a4d,0x0a4e,0x0a4f,0x0a50,0x0a51,0x0a52,
+            0x0a53,0x0a54,0x0a55,0x0a56,0x0a57,0x0a58,0x0a59,0x0a5a, // 2272
+            0x0a5b,0x0a5c,0x0a5d,0x0a5e,0x0a5f,0x0a60,0x0a61,0x0a62,
+            0x0a63,0x0a64,0x0a65,0x0a66,0x0a67,0x0a68,0x0a69,0x0a6a, // 2288
+            0x0a6b,0x0a6c,0x0a6d,0x0a6e,0x0a6f,0x0a70,0x0a71,0x0a72,
+            0x0a73,0x0a74,0x0a75,0x0a76,0x0a77,0x0a78,0x0a79,0x0a7a, // 2304
+            0x0a7b,0x0a7c,0x0a7d,0x0a7e,0x0a7f,0x0a80,0x0a81,0x0a82,
+            0x0a83,0x0a84,0x0a85,0x0a86,0x0a87,0x0a88,0x0a89,0x0a8a, // 2320
+            0x0a8b,0x0a8c,0x0a8d,0x0a8e,0x0a8f,0x0a90,0x0a91,0x0a92,
+            0x0000,0x0a93,0x0a94,0x0a95,0x0a96,0x0000,0x0a97,0x0a98, // 2336
+            0x0a99,0x0a9a,0x0000,0x0000,0x0a9b,0x0a9c,0x0a9d,0x0a9e,
+            0x0a9f,0x0aa0,0x0aa1,0x0aa2,0x0aa3,0x0aa4,0x0aa5,0x0aa6, // 2352
+            0x0aa7,0x0aa8,0x0aa9,0x0aaa,0x0aab,0x0aac,0x0aad,0x0aae,
+            0x0aaf,0x0ab0,0x0ab1,0x0ab2,0x0ab3,0x0ab4,0x0ab5,0x0ab6, // 2368
+            0x0000,0x0ab7,0x0abe,0x0ab9,0x0aba,0x0abb,0x0abc,0x0abd,
+            0x0ab8,0x0abf,0x0ac0,0x0ac1,0x0ac2,0x0ac3,0x0ac4,0x0ac5, // 2384
+            0x0ac6,0x0ac7,0x0ac8,0x0ac9,0x0aca,0x0acb,0x0acc,0x0acd,
+            0x0ace,0x0acf,0x0ad0,0x0ad1,0x0ad2,0x0ad3,0x0ad4,0x0ad5, // 2400
+            0x0ad6,0x0ad7,0x0ad8,0x0ad9,0x0000,0x0ada,0x0000,0x0adb,
+            0x0adc,0x0add,0x0ade,0x0000,0x0000,0x0000,0x0adf,0x0000, // 2416
+            0x0ae0,0x0ae1,0x0ae2,0x0ae3,0x0ae4,0x0ae5,0x0ae6,0x0000,
+            0x0000,0x0ae7,0x0ae8,0x0ae9,0x0aea,0x0aeb,0x0aec,0x0aed, // 2432
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0c21,0x0c33, // 2448
+            0x0c46,0x0c58,0x0c6a,0x0c7d,0x0c90,0x0ca2,0x0cb4,0x0cc6,
+            0x0c21,0x0c33,0x0c46,0x0c58,0x0c6a,0x0c7d,0x0c90,0x0ca2, // 2464
+            0x0cb4,0x0cc6,0x0c21,0x0c33,0x0c46,0x0c58,0x0c6a,0x0c7d,
+            0x0c90,0x0ca2,0x0cb4,0x0cc6,0x0000,0x0000,0x0000,0x0000, // 2480
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0702,0x0731,0x0734,0x07d9,0x0a2d,0x0000,0x07da,0x0000, // 2496
+            0x0793,0x0795,0x0797,0x0799,0x079b,0x079d,0x079f,0x07a1,
+            0x07a3,0x07a5,0x0a28,0x0a29,0x07a8,0x07ab,0x07ad,0x07ae, // 2512
+            0x07af,0x07b0,0x07b1,0x07b2,0x068d,0x07b3,0x07b4,0x07b5,
+            0x0a2a,0x0c32,0x0c45,0x0c57,0x0c69,0x0c7c,0x0c8f,0x0ca1, // 2528
+            0x0cb3,0x0cc5,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x068e,0x0000,0x0000,0x0000,0x0000,0x0000,0x0a2b,0x0000, // 2544
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0a2c,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 2560
+            0x0000,0x0000,0x0000,0x0a0e,0x0000,0x0000,0x0000,0x0000,
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 2576
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0a2e,
+            0x0e80,0x0e76,0x0e64,0x0e57,0x0e39,0x0e3a,0x0e58,0x0e28, // 2592
+            0x0e10,0x0e3b,0x0e81,0x0e77,0x0e65,0x0e66,0x0e5a,0x0e3c,
+            0x0e31,0x0e3d,0x0e5b,0x0e29,0x0e9b,0x0e67,0x0e5d,0x0e20, // 2608
+            0x0e3f,0x0e24,0x0e78,0x0e68,0x0e5e,0x0e14,0x0e40,0x0e60,
+            0x0e16,0x0e56,0x0e43,0x0e5f,0x0e15,0x0e52,0x0e42,0x0e54, // 2624
+            0x0e55,0x0e7f,0x0e44,0x0e62,0x0e2a,0x0e8e,0x0e8f,0x0e90,
+            0x0e86,0x0e79,0x0e69,0x0e63,0x0e87,0x0e7a,0x0e6a,0x0e6c, // 2640
+            0x0e46,0x0e6d,0x0e88,0x0e7b,0x0e6b,0x0e6e,0x0e47,0x0e6f,
+            0x0e38,0x0e53,0x0e06,0x0e08,0x0e11,0x0e12,0x0e0f,0x0e17, // 2656
+            0x0e1f,0x0e2b,0x0e2f,0x0e30,0x0e34,0x0e3e,0x0e41,0x0e45,
+            0x0e4d,0x0e4e,0x0e4f,0x0e50,0x0e59,0x0e5c,0x0e61,0x0e82, // 2672
+            0x0e83,0x0e84,0x0e85,0x0e94,0x0e95,0x0ea5,0x0000,0x0000,
+            0x0e23,0x0e23,0x0e23,0x0e23,0x0e23,0x0e96,0x0e91,0x0000, // 2688
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0738,0x068f,0x0690,0x078d,0x0792,0x0728,0x072b,0x074b, // 2704
+            0x074f,0x07a9,0x07ac,0x07a4,0x07a6,0x0798,0x079a,0x0794,
+            0x0796,0x079c,0x079e,0x07a0,0x07a2,0x0000,0x0000,0x0000, // 2720
+            0x0000,0x078e,0x078f,0x0790,0x0791,0x0745,0x0746,0x0747,
+            0x072e,0x0730,0x0732,0x0000,0x0739,0x0736,0x073b,0x071b, // 2736
+            0x068a,0x0726,0x0729,0x0749,0x074d,0x07a7,0x07aa,0x071e,
+            0x0724,0x072c,0x0802,0x0681,0x080d,0x0813,0x0811,0x0000, // 2752
+            0x0740,0x0720,0x0722,0x073d,0x0000,0x0000,0x0000,0x0000,
+            0x06a0,0x06a0,0x06a1,0x0000,0x06a2,0x0000,0x06a3,0x06a3, // 2768
+            0x06a4,0x06a4,0x06a5,0x06a5,0x0000,0x0000,0x06a6,0x06a6,
+            0x0000,0x071c,0x071d,0x071f,0x0721,0x0723,0x0725,0x0680, // 2784
+            0x0727,0x072a,0x072d,0x0803,0x072f,0x0682,0x0733,0x0735,
+            0x0e7e,0x0e89,0x0e8a,0x0e91,0x0e99,0x0e9f,0x0ea2,0x0ea4, // 2800
+            0x0ea6,0x0ea7,0x0ea9,0x074a,0x074c,0x074e,0x0750,0x0000,
+            0x0000,0x0734,0x079b,0x079d,0x0731,0x0a0e,0x0000,0x0000, // 2816
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+            0x0a02,0x0a03,0x0a08,0x0754,0x0752,0x0a05,0x0a25,0x0000, // 2832
+            0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+        };
+        private static short[] diacriticTableLevel1 = new short[256] {
+            0   ,16  ,32  ,48  ,64  ,80  ,96  ,112 ,128 ,144 ,160 ,176 ,192 ,208 ,224 ,128 , // 0
+            240 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,256 ,128 , // 16
+            272 ,288 ,304 ,128 ,320 ,128 ,336 ,352 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 32
+            368 ,128 ,384 ,400 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 48
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 64
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 80
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 96
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 112
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 128
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 144
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 160
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 176
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 192
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 208
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 224
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,416 ,128 ,128 ,432 ,448 , // 240
+        };
+        private static short[] diacriticTableLevel2 = new short[464] {
+            0   ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,32  ,32  ,48  ,64  ,48  ,80  , // 0
+            96  ,112 ,128 ,144 ,160 ,176 ,192 ,208 ,224 ,240 ,256 ,272 ,288 ,304 ,320 ,336 , // 16
+            352 ,368 ,384 ,384 ,384 ,400 ,416 ,432 ,448 ,464 ,480 ,496 ,512 ,528 ,544 ,384 , // 32
+            384 ,384 ,384 ,384 ,384 ,384 ,384 ,560 ,576 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 48
+            384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,592 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 64
+            384 ,384 ,384 ,384 ,384 ,608 ,384 ,384 ,624 ,384 ,384 ,640 ,656 ,384 ,384 ,672 , // 80
+            688 ,704 ,384 ,384 ,608 ,720 ,736 ,384 ,384 ,384 ,384 ,384 ,384 ,752 ,384 ,768 , // 96
+            784 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 112
+            384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 128
+            384 ,384 ,384 ,800 ,384 ,816 ,832 ,816 ,384 ,384 ,384 ,384 ,384 ,384 ,848 ,864 , // 144
+            384 ,384 ,384 ,384 ,384 ,384 ,880 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,896 ,384 , // 160
+            384 ,384 ,384 ,384 ,384 ,384 ,912 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,928 ,944 , // 176
+            384 ,384 ,384 ,384 ,384 ,384 ,960 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,976 ,384 , // 192
+            384 ,384 ,384 ,384 ,384 ,384 ,992 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 208
+            384 ,384 ,384 ,1008,384 ,1024,384 ,384 ,384 ,384 ,384 ,384 ,384 ,1040,384 ,384 , // 224
+            384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,1056, // 240
+            1072,1088,1104,1120,1136,1152,1168,1184,1200,1216,1232,1248,1264,1280,1296,1312, // 256
+            1328,16  ,1344,16  ,1360,384 ,384 ,1376,1392,384 ,1408,384 ,384 ,384 ,384 ,384 , // 272
+            1424,1440,1456,1472,384 ,1488,1504,1504,1520,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 288
+            16  ,16  ,16  ,16  ,16  ,16  ,1536,16  ,16  ,1552,1568,16  ,16  ,16  ,16  ,1584, // 304
+            16  ,16  ,1600,384 ,1616,384 ,1632,1648,1664,1680,1696,1712,1632,1632,1728,384 , // 320
+            16  ,1744,16  ,16  ,16  ,16  ,16  ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 336
+            1760,16  ,1776,16  ,1792,1808,1824,1840,1632,1856,384 ,384 ,384 ,384 ,384 ,384 , // 352
+            1872,16  ,1888,1904,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,1056, // 368
+            384 ,384 ,384 ,384 ,384 ,384 ,384 ,1008,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 384
+            384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,16  ,16  ,16  ,16  ,16  ,1920,384 ,384 , // 400
+            1936,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 416
+            384 ,384 ,384 ,16  ,1952,1968,1984,2000,384 ,384 ,384 ,384 ,384 ,384 ,384 ,384 , // 432
+            0   ,16  ,16  ,16  ,16  ,1392,2016,384 ,384 ,384 ,384 ,384 ,384 ,384 ,1936,384 , // 448
+        };
+        private static byte[] diacriticTableLevel3 = new byte[2032] {
+            0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 0
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 16
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x03,0x02,0x02,0x02,0x02,0x02, // 32
+            0x0f,0x0e,0x12,0x19,0x13,0x1a,0x02,0x1c,0x0f,0x0e,0x12,0x13,0x0f,0x0e,0x12,0x13, // 48
+            0x68,0x19,0x0f,0x0e,0x12,0x19,0x13,0x02,0x21,0x0f,0x0e,0x12,0x13,0x0e,0x02,0x02, // 64
+            0x68,0x19,0x0f,0x0e,0x12,0x19,0x13,0x02,0x21,0x0f,0x0e,0x12,0x13,0x0e,0x02,0x13, // 80
+            0x17,0x17,0x15,0x15,0x1b,0x1b,0x0e,0x0e,0x12,0x12,0x10,0x10,0x14,0x14,0x14,0x14, // 96
+            0x1e,0x1e,0x17,0x17,0x15,0x15,0x10,0x10,0x1b,0x1b,0x14,0x14,0x12,0x12,0x15,0x15, // 112
+            0x10,0x10,0x1c,0x1c,0x12,0x12,0x1e,0x1e,0x19,0x19,0x17,0x17,0x15,0x15,0x1b,0x1b, // 128
+            0x10,0x03,0x02,0x02,0x12,0x12,0x1c,0x1c,0x03,0x0e,0x0e,0x1c,0x1c,0x14,0x14,0x11, // 144
+            0x11,0x1f,0x1f,0x0e,0x0e,0x1c,0x1c,0x14,0x14,0x48,0x02,0x02,0x17,0x17,0x15,0x15, // 160
+            0x1d,0x1d,0x02,0x02,0x0e,0x0e,0x1c,0x1c,0x14,0x14,0x0e,0x0e,0x12,0x12,0x1c,0x1c, // 176
+            0x14,0x14,0x1c,0x1c,0x14,0x14,0x1e,0x1e,0x19,0x19,0x17,0x17,0x15,0x15,0x1a,0x1a, // 192
+            0x1d,0x1d,0x1b,0x1b,0x12,0x12,0x12,0x12,0x13,0x0e,0x0e,0x10,0x10,0x14,0x14,0x02, // 208
+            0x1e,0x43,0x68,0x68,0x87,0x87,0x7d,0x43,0x43,0x04,0x43,0x1e,0x1e,0x7c,0x7d,0x7e, // 224
+            0x7b,0x43,0x7b,0x43,0x7b,0x7b,0x7b,0x1e,0x43,0x43,0x1e,0x20,0x7b,0x43,0x7b,0x20, // 240
+            0x52,0x52,0x7c,0x7c,0x43,0x43,0x7b,0x87,0x87,0x7c,0x7f,0x57,0x43,0x43,0x59,0x52, // 256
+            0x52,0x7b,0x7b,0x43,0x43,0x1e,0x1e,0x02,0x7c,0x7c,0x7d,0x03,0x03,0x03,0x02,0x7b, // 272
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x14,0x14,0x14, // 288
+            0x14,0x14,0x14,0x14,0x14,0x28,0x28,0x1f,0x1f,0x25,0x25,0x20,0x20,0x7d,0x28,0x28, // 304
+            0x25,0x25,0x17,0x17,0x1e,0x1e,0x14,0x14,0x14,0x14,0x1b,0x1b,0x30,0x30,0x14,0x14, // 320
+            0x14,0x02,0x02,0x02,0x0e,0x0e,0x00,0x00,0x00,0x00,0x26,0x26,0x0e,0x0e,0x2b,0x2b, // 336
+            0x44,0x44,0x46,0x46,0x44,0x44,0x46,0x46,0x44,0x44,0x46,0x46,0x44,0x44,0x46,0x46, // 352
+            0x44,0x44,0x46,0x46,0x44,0x44,0x46,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 368
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 384
+            0x7b,0x7c,0x7d,0x43,0x7b,0x7c,0x59,0x43,0x80,0x7e,0x7f,0x7b,0x81,0x82,0x83,0x1e, // 400
+            0x43,0x7d,0x02,0x7b,0x7c,0x7c,0x43,0x43,0x1e,0x7b,0x02,0x19,0x7b,0x59,0x7c,0x7b, // 416
+            0x7c,0x43,0x43,0x59,0x02,0x20,0x7b,0x7e,0x7b,0x7b,0x7c,0x7d,0x7e,0x43,0x7f,0x80, // 432
+            0x02,0x7b,0x43,0x7c,0x43,0x84,0x85,0x7b,0x59,0x1e,0x7b,0x7b,0x7c,0x7c,0x7b,0x02, // 448
+            0x59,0x7e,0x02,0x7e,0x03,0x04,0x05,0x88,0x02,0x02,0x86,0x43,0x02,0x7b,0x7b,0x02, // 464
+            0x43,0x06,0x0b,0x7b,0x7b,0x7c,0x7b,0x7c,0x7d,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 480
+            0x7e,0x7f,0x7e,0x81,0x82,0x83,0x84,0x7e,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 496
+            0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x02,0x00,0x03,0x03,0x03,0x00,0x00,0x00,0x00, // 512
+            0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x02,0x02,0x02,0x02,0x02,0x00,0x00, // 528
+            0x7e,0x7e,0x7e,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 544
+            0x00,0x00,0x00,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00, // 560
+            0x00,0x00,0x00,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 576
+            0x00,0x00,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 592
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02, // 608
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00, // 624
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00, // 640
+            0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 656
+            0x00,0x00,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 672
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, // 688
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02, // 704
+            0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 720
+            0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x02,0x02,0x02,0x00,0x00,0x00, // 736
+            0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 752
+            0x39,0x39,0x39,0x39,0x39,0x39,0x39,0x39,0x39,0x39,0x00,0x00,0x00,0x00,0x00,0x00, // 768
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02, // 784
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00, // 800
+            0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 816
+            0x00,0x00,0x00,0x00,0x02,0x02,0x3a,0x3a,0x3a,0x3a,0x3a,0x3a,0x3a,0x3a,0x3a,0x3a, // 832
+            0x00,0x00,0x00,0x00,0x00,0x00,0x3b,0x3b,0x3b,0x3b,0x3b,0x3b,0x3b,0x3b,0x3b,0x3b, // 848
+            0x00,0x00,0x00,0x00,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x00,0x00,0x00,0x00,0x00,0x00, // 864
+            0x00,0x00,0x00,0x00,0x00,0x00,0x3d,0x3d,0x3d,0x3d,0x3d,0x3d,0x3d,0x3d,0x3d,0x3d, // 880
+            0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x3e,0x3e,0x3e,0x3e,0x3e,0x3e,0x3e,0x3e,0x3e, // 896
+            0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f, // 912
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, // 928
+            0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 944
+            0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41, // 960
+            0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42, // 976
+            0x00,0x00,0x00,0x00,0x00,0x00,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43, // 992
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 1008
+            0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,0x00,0x00,0x00, // 1024
+            0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x00,0x00,0x00,0x00,0x00,0x00, // 1040
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, // 1056
+            0x5a,0x5a,0x10,0x10,0x58,0x58,0x55,0x55,0x28,0x28,0x10,0x10,0x58,0x58,0x55,0x55, // 1072
+            0x1c,0x1c,0x60,0x60,0x24,0x24,0x23,0x23,0x60,0x60,0x63,0x63,0x2f,0x2f,0x10,0x10, // 1088
+            0x17,0x17,0x10,0x10,0x58,0x58,0x13,0x13,0x1c,0x1c,0x61,0x61,0x63,0x63,0x1f,0x1f, // 1104
+            0x0e,0x0e,0x58,0x58,0x55,0x55,0x58,0x58,0x6e,0x6e,0x55,0x55,0x60,0x60,0x0e,0x0e, // 1120
+            0x10,0x10,0x58,0x58,0x10,0x10,0x58,0x58,0x55,0x55,0x60,0x60,0x25,0x25,0x2a,0x2a, // 1136
+            0x24,0x24,0x23,0x23,0x0e,0x0e,0x10,0x10,0x10,0x10,0x58,0x58,0x6e,0x6e,0x55,0x55, // 1152
+            0x10,0x10,0x58,0x58,0x1d,0x1d,0x22,0x22,0x68,0x68,0x10,0x10,0x58,0x58,0x55,0x55, // 1168
+            0x60,0x60,0x59,0x59,0x63,0x63,0x5a,0x5a,0x25,0x25,0x28,0x28,0x19,0x19,0x58,0x58, // 1184
+            0x0f,0x0f,0x0e,0x0e,0x13,0x13,0x10,0x10,0x58,0x58,0x10,0x10,0x13,0x13,0x10,0x10, // 1200
+            0x12,0x12,0x58,0x58,0x55,0x55,0x55,0x13,0x1a,0x1a,0x69,0x00,0x00,0x00,0x00,0x00, // 1216
+            0x59,0x59,0x43,0x43,0x1e,0x1e,0x1f,0x1f,0x55,0x55,0x29,0x29,0x6a,0x6a,0x21,0x21, // 1232
+            0x22,0x22,0x58,0x58,0x2c,0x2c,0x6d,0x6d,0x58,0x58,0x43,0x43,0x19,0x19,0x1e,0x1e, // 1248
+            0x1f,0x1f,0x55,0x55,0x29,0x29,0x6a,0x6a,0x43,0x43,0x58,0x58,0x58,0x58,0x43,0x43, // 1264
+            0x1e,0x1e,0x1f,0x1f,0x55,0x55,0x29,0x29,0x6a,0x6a,0x60,0x60,0x61,0x61,0x95,0x95, // 1280
+            0x69,0x69,0xaa,0xaa,0x58,0x58,0x43,0x43,0x60,0x60,0x61,0x61,0x95,0x95,0x69,0x69, // 1296
+            0xaa,0xaa,0x0f,0x0f,0x58,0x58,0x44,0x44,0x19,0x19,0x00,0x00,0x00,0x00,0x00,0x00, // 1312
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00, // 1328
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00, // 1344
+            0x02,0x02,0x02,0x02,0x02,0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1360
+            0x02,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1376
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00, // 1392
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00, // 1408
+            0x02,0x02,0x03,0x04,0x02,0x02,0x02,0x64,0x02,0x04,0x03,0x05,0x04,0x03,0x03,0x68, // 1424
+            0x04,0x05,0x04,0x04,0x02,0x03,0x02,0x02,0x04,0x03,0x03,0x04,0x05,0x03,0x02,0x02, // 1440
+            0x02,0x02,0x02,0x02,0x03,0x63,0x00,0x00,0x05,0x00,0x02,0x1a,0x04,0x05,0x05,0x04, // 1456
+            0x04,0x05,0x03,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1472
+            0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x03, // 1488
+            0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x47, // 1504
+            0x47,0x47,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1520
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x03,0x03,0x02,0x02,0x02,0x02, // 1536
+            0x02,0x02,0x02,0x02,0x02,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xef,0xef, // 1552
+            0xef,0xef,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1568
+            0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1584
+            0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1600
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00, // 1616
+            0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee, // 1632
+            0xee,0xee,0xee,0xee,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3, // 1648
+            0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4, // 1664
+            0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf4,0xf3,0xf3,0xf3,0xf3, // 1680
+            0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xf3, // 1696
+            0xf3,0xf3,0xf3,0xf3,0xf3,0xf3,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee, // 1712
+            0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0x00,0x00,0x00,0x00,0x00, // 1728
+            0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1744
+            0x00,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x00,0x00,0x02,0x02,0x02,0x02, // 1760
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1776
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x00,0x02, // 1792
+            0x02,0x02,0x02,0x00,0x00,0x00,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00, // 1808
+            0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1824
+            0x00,0x00,0x00,0x00,0x00,0x00,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee,0xee, // 1840
+            0xee,0xee,0xee,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1856
+            0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1872
+            0x02,0x4e,0x4e,0x4e,0x4e,0x4e,0x4e,0x4e,0x4e,0x4e,0x00,0x00,0x00,0x00,0x00,0x00, // 1888
+            0x02,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 1904
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00, // 1920
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1936
+            0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1952
+            0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1968
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00, // 1984
+            0x02,0x02,0x02,0x00,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x02,0x02, // 2000
+            0x00,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 2016
+        };
+        private static short[] caseTableLevel1 = new short[256] {
+            0   ,16  ,32  ,48  ,64  ,80  ,96  ,112 ,128 ,144 ,160 ,176 ,160 ,192 ,208 ,128 , // 0
+            224 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,240 ,128 , // 16
+            256 ,272 ,288 ,128 ,304 ,128 ,320 ,336 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 32
+            352 ,128 ,368 ,384 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 48
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 64
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 80
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 96
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 112
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 128
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 144
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 160
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 176
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 192
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 208
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 , // 224
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,400 ,128 ,128 ,416 ,432 , // 240
+        };
+        private static short[] caseTableLevel2 = new short[448] {
+            0   ,16  ,16  ,16  ,32  ,48  ,16  ,16  ,16  ,16  ,64  ,80  ,96  ,112 ,16  ,16  , // 0
+            128 ,128 ,128 ,144 ,160 ,128 ,128 ,176 ,192 ,208 ,224 ,240 ,256 ,272 ,128 ,288 , // 16
+            128 ,304 ,320 ,320 ,320 ,16  ,336 ,352 ,368 ,384 ,400 ,416 ,432 ,448 ,464 ,320 , // 32
+            320 ,320 ,320 ,320 ,320 ,320 ,320 ,480 ,496 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 48
+            320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,512 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 64
+            320 ,320 ,320 ,320 ,320 ,528 ,320 ,320 ,544 ,320 ,320 ,560 ,576 ,320 ,320 ,592 , // 80
+            608 ,624 ,320 ,320 ,528 ,640 ,656 ,320 ,320 ,320 ,320 ,320 ,320 ,672 ,320 ,688 , // 96
+            704 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 112
+            320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 128
+            320 ,320 ,320 ,720 ,320 ,736 ,752 ,736 ,320 ,320 ,320 ,320 ,320 ,320 ,768 ,784 , // 144
+            320 ,320 ,320 ,320 ,320 ,320 ,768 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,768 ,320 , // 160
+            320 ,320 ,320 ,320 ,320 ,320 ,768 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,800 ,640 , // 176
+            320 ,320 ,320 ,320 ,320 ,320 ,768 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 192
+            320 ,320 ,320 ,816 ,320 ,688 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,688 ,320 ,320 , // 208
+            320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,832 , // 224
+            128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,128 ,848 ,128 ,128 ,128 ,128 ,128 ,864 , // 240
+            880 ,16  ,688 ,16  ,896 ,320 ,320 ,912 ,928 ,320 ,656 ,320 ,320 ,320 ,320 ,320 , // 256
+            944 ,960 ,976 ,992 ,320 ,1008,96  ,16  ,1024,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 272
+            16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,1040, // 288
+            16  ,16  ,1056,320 ,1072,320 ,16  ,16  ,16  ,16  ,16  ,1088,96  ,16  ,1072,320 , // 304
+            16  ,464 ,16  ,16  ,16  ,16  ,16  ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 320
+            1104,16  ,1120,16  ,1136,1152,1168,1184,1200,1216,320 ,320 ,320 ,320 ,320 ,320 , // 336
+            1232,16  ,688 ,1248,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,1264, // 352
+            320 ,320 ,320 ,320 ,320 ,320 ,320 ,816 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 368
+            320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,16  ,16  ,16  ,16  ,16  ,1280,320 ,320 , // 384
+            896 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 400
+            320 ,320 ,320 ,16  ,1296,1312,1328,1344,320 ,320 ,320 ,320 ,320 ,320 ,320 ,320 , // 416
+            1360,1376,1392,1408,1376,1424,1440,320 ,320 ,320 ,320 ,320 ,320 ,320 ,1456,320 , // 432
+        };
+        private static byte[] caseTableLevel3 = new byte[1472] {
+            0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 0
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 16
+            0x02,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, // 32
+            0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x02,0x02,0x02,0x02,0x02, // 48
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x0e,0x02,0x02,0x02,0x02,0x02, // 64
+            0x02,0x02,0x0e,0x0e,0x02,0x02,0x02,0x02,0x02,0x0e,0x0e,0x02,0x02,0x02,0x02,0x02, // 80
+            0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, // 96
+            0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x02,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x02, // 112
+            0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02, // 128
+            0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12, // 144
+            0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x02,0x12,0x02,0x12,0x02,0x12,0x02, // 160
+            0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x12,0x02,0x12,0x02,0x12,0x02,0x02, // 176
+            0x02,0x12,0x12,0x02,0x12,0x02,0x12,0x12,0x02,0x12,0x12,0x12,0x02,0x02,0x12,0x12, // 192
+            0x12,0x12,0x02,0x12,0x12,0x02,0x12,0x12,0x12,0x02,0x02,0x02,0x12,0x12,0x02,0x12, // 208
+            0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x12,0x02,0x12,0x02,0x02,0x12,0x02,0x12,0x12, // 224
+            0x02,0x12,0x12,0x12,0x02,0x12,0x02,0x12,0x12,0x02,0x02,0x02,0x12,0x02,0x02,0x02, // 240
+            0x02,0x02,0x02,0x02,0x12,0x12,0x02,0x12,0x12,0x02,0x12,0x12,0x02,0x12,0x02,0x12, // 256
+            0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x02,0x12,0x02, // 272
+            0x02,0x12,0x12,0x02,0x12,0x02,0x00,0x00,0x00,0x00,0x12,0x02,0x12,0x02,0x12,0x02, // 288
+            0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 304
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 320
+            0x02,0x02,0x0a,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x0a,0x02,0x02,0x02,0x02,0x02, // 336
+            0x02,0x02,0x02,0x02,0x0a,0x02,0x0a,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 352
+            0x0a,0x0a,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x0a, // 368
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x0a,0x02,0x0a,0x0a,0x02,0x02,0x0a, // 384
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 400
+            0x02,0x02,0x02,0x02,0x02,0x02,0x0a,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 416
+            0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x00,0x02,0x02,0x02,0x00,0x00,0x00,0x00, // 432
+            0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00, // 448
+            0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 464
+            0x00,0x00,0x00,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00, // 480
+            0x00,0x00,0x00,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 496
+            0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 512
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02, // 528
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00, // 544
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00, // 560
+            0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 576
+            0x00,0x00,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 592
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, // 608
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02, // 624
+            0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 640
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00, // 656
+            0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 672
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00, // 688
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02, // 704
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00, // 720
+            0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 736
+            0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 752
+            0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 768
+            0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00, // 784
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 800
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 816
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, // 832
+            0x12,0x02,0x12,0x02,0x12,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00, // 848
+            0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x12,0x02,0x00,0x00,0x00,0x00,0x00,0x00, // 864
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00, // 880
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 896
+            0x0e,0x00,0x00,0x00,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e, // 912
+            0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00, // 928
+            0x02,0x02,0x12,0x12,0x1a,0x02,0x02,0x12,0x12,0x12,0x02,0x12,0x12,0x12,0x02,0x02, // 944
+            0x12,0x12,0x12,0x02,0x02,0x12,0x12,0x02,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, // 960
+            0x12,0x12,0x12,0x12,0x12,0x12,0x00,0x00,0x12,0x00,0x12,0x1a,0x12,0x12,0x02,0x02, // 976
+            0x12,0x12,0x12,0x12,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 992
+            0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1008
+            0x02,0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1024
+            0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1040
+            0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1056
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00, // 1072
+            0x02,0x02,0x02,0x02,0x02,0x02,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, // 1088
+            0x00,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x00,0x00,0x02,0x02,0x02,0x02, // 1104
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1120
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x00,0x02, // 1136
+            0x02,0x02,0x02,0x00,0x00,0x00,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00, // 1152
+            0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1168
+            0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06, // 1184
+            0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e, // 1200
+            0x0e,0x0e,0x0e,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1216
+            0x03,0x03,0x03,0x02,0x02,0x00,0x02,0x00,0x02,0x02,0x02,0x02,0x03,0x03,0x02,0x02, // 1232
+            0x02,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 1248
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00, // 1264
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00, // 1280
+            0x02,0x02,0x0c,0x02,0x02,0x00,0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1296
+            0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, // 1312
+            0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00, // 1328
+            0x02,0x02,0x02,0x00,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x02,0x02, // 1344
+            0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03, // 1360
+            0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03, // 1376
+            0x03,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13, // 1392
+            0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x03,0x03,0x03,0x03,0x03, // 1408
+            0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00, // 1424
+            0x00,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1440
+            0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 1456
+        };
+    }
+}
diff --git a/base/Kernel/System/Globalization/CultureInfo.cs b/base/Kernel/System/Globalization/CultureInfo.cs
new file mode 100644
index 0000000..37aa036
--- /dev/null
+++ b/base/Kernel/System/Globalization/CultureInfo.cs
@@ -0,0 +1,156 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////
+//
+//  Class:    CultureInfo
+//
+//
+//  Purpose:  This class represents the software preferences of a particular
+//            culture or community.  It includes information such as the
+//            language, writing system, and a calendar used by the culture
+//            as well as methods for common operations such as printing
+//            dates and sorting strings.
+//
+//  Date:     March 31, 1999
+//
+////////////////////////////////////////////////////////////////////////////
+
+namespace System.Globalization {
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using Microsoft.Singularity;
+
+    //| <include path='docs/doc[@for="CultureInfo"]/*' />
+    public class CultureInfo {
+        // singleton to simplify porting of parsing code
+        private static CultureInfo currentCulture;
+
+        static CultureInfo()
+        {
+            currentCulture = new CultureInfo();
+        }
+
+        private CultureInfo() {}   // Prevent from being created
+
+        public static String Name {
+            get { return sName; }
+        }
+
+        public static String DisplayName {
+            get { return sName; }
+        }
+
+        public static String NativeName {
+            get { return sNativeDisplayName; }
+        }
+
+        public static String EnglishName {
+            get { return sEngDisplayName; }
+        }
+
+        public static String TwoLetterISOLanguageName {
+            get { return sIso639LangName; }
+        }
+
+        public static String ThreeLetterISOLanguageName {
+            get { return sIso639LangName2; }
+        }
+
+        public static String ThreeLetterWindowsLanguageName {
+            get { return sAbbrevLangName; }
+        }
+
+        internal static ushort iDigits              = 2;     // iDigits
+        internal static ushort iNegNumber           = 1;     // iNegNumber
+        internal static ushort iCalendarType        = 1;     // iCalendarType
+        internal static ushort iFirstDayOfWeek      = 0;     // iFirstDayOfWeek
+        internal static ushort iFirstWeekOfYear     = 0;     // iFirstWeekOfYear
+        internal static ushort iLanguage            = 127;   // iLanguage
+        internal static ushort NativeLangId         = 127;   // NativeLangId
+        internal static ushort iNegativePercent     = 0;     // iNegativePercent
+        internal static ushort iPositivePercent     = 0;     // iPositivePercent
+
+        internal static string sList                = ",";
+        internal static string sDecimal             = ".";
+        internal static string sThousand            = ",";
+        internal static int[]  nGrouping            = new int[] {3};
+        internal static string sMonDecimalSep       = ".";
+        internal static string sMonThousandSep      = ",";
+        internal static int[]  nMonGrouping         = new int[] {3};
+        internal static string sPositiveSign        = "+";
+        internal static string sNegativeSign        = "-";
+        internal static string[] sTimeFormat        = new string[] {
+            "HH:mm:ss" };
+        internal static string sTime                = ":";
+        internal static string s1159                = "AM";
+        internal static string s2359                = "PM";
+        internal static string[] sShortDate         = new string[] {
+            "MM/dd/yyyy" };
+        internal static string sDate                = "/";
+        internal static string[] sLongDate          = new string[] {
+            "dddd, dd MMMM yyyy", };
+        internal static string sName                = "";
+        internal static string sEngDisplayName      = "Invariant Language (Invariant Country)";
+        internal static string sAbbrevLangName      = "IVL";
+        internal static string sIso639LangName      = "iv";
+        internal static string sIso639LangName2     = "IVL";
+        internal static string sNativeDisplayName   = "Invariant Language (Invariant Country)";
+        internal static string sPercent             = "%";
+        internal static string sNan                 = "NaN";
+        internal static string sPosInfinity         = "Infinity";
+        internal static string sNegInfinity         = "-Infinity";
+        internal static string[] sShortTime         = new string[] {
+            "HH:mm", "hh:mm tt", "H:mm", "h:mm tt", };
+        internal static string sYearMonth           = "yyyy MMMM";
+        internal static string sMonthDay            = "MMMM dd";
+        internal static string[] sDayNames          = new string[7] {
+            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
+        internal static string[] sAbbrevDayName     = new string[7] {
+            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+        internal static string[] sMonthNames        = new string[13] {
+            "January", "February", "March", "April",
+            "May", "June", "July", "August", "September",
+            "October", "November", "December",
+            "" };
+        internal static string[] sAbbrevMonthNames  = new string[13] {
+            "Jan", "Feb", "Mar", "Apr",
+            "May", "Jun", "Jul", "Aug",
+            "Sep", "Oct", "Nov", "Dec",
+            "" };
+        internal static string sADEra               = "A.D.";
+        internal static string[] sDateWords         = new string[] {};
+        internal static string sAbbevADEra          = "AD";
+        internal static string[] sMonthGenitiveName = new string[] {};
+        internal static string[] sAbbrevMonthGenitiveName   = new string[] {};
+
+        // E.g. "1;6"
+        // 0:sTimeFormat
+        // 1:sShortDate
+        // 2:sLongDate
+        // 3:sShortTime
+        // 4:sDateWords
+
+        // added to support System.Text.RegularExpressions
+
+        public static CultureInfo CurrentCulture
+        {
+            get
+            {
+                return currentCulture;
+            }
+        }
+
+        public static CultureInfo InvariantCulture
+        {
+            get
+            {
+                return currentCulture;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Globalization/NumberFormatInfo.cs b/base/Kernel/System/Globalization/NumberFormatInfo.cs
new file mode 100644
index 0000000..0330d8c
--- /dev/null
+++ b/base/Kernel/System/Globalization/NumberFormatInfo.cs
@@ -0,0 +1,99 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Globalization {
+    using System;
+
+    //| <include path='docs/doc[@for="NumberFormatInfo"]/*' />
+    sealed public class NumberFormatInfo {
+        private NumberFormatInfo() {}   // Prevent from being created
+
+        internal static bool validForParseAsNumber
+        {
+            get { return true; }
+#if DONT
+            get { return CultureInfo.sDecimal != sThousand; }
+#endif
+        }
+
+        internal static String perMilleSymbol = "\u2030";
+
+        internal static String negativeInfinitySymbol {
+            get { return CultureInfo.sNegInfinity; }
+        }
+
+        internal static String positiveInfinitySymbol {
+            get { return CultureInfo.sPosInfinity; }
+        }
+
+        internal static int[] numberGroupSizes {
+            get { return CultureInfo.nGrouping; }
+        }
+
+        internal static int[] percentGroupSizes {
+            get { return CultureInfo.nGrouping; }
+        }
+
+        internal static String nanSymbol {
+            get { return CultureInfo.sNan; }
+        }
+
+        internal static int numberNegativePattern {
+            get { return CultureInfo.iNegNumber; }
+        }
+
+        internal static int percentPositivePattern {
+            get { return CultureInfo.iPositivePercent; }
+        }
+
+        internal static int percentNegativePattern {
+            get { return CultureInfo.iNegativePercent; }
+        }
+
+        internal static String negativeSign {
+            get { return CultureInfo.sNegativeSign; }
+        }
+
+        internal static int numberDecimalDigits {
+            get { return CultureInfo.iDigits; }
+        }
+
+        internal static String numberDecimalSeparator {
+            get { return CultureInfo.sDecimal; }
+        }
+
+        internal static String numberGroupSeparator {
+            get { return CultureInfo.sThousand; }
+        }
+
+        internal static String positiveSign {
+            get { return CultureInfo.sPositiveSign; }
+        }
+
+        internal static int percentDecimalDigits {
+            get { return CultureInfo.iDigits; }
+        }
+
+        internal static String percentDecimalSeparator {
+            get { return CultureInfo.sDecimal; }
+        }
+
+        internal static String percentGroupSeparator {
+            get { return CultureInfo.sThousand; }
+        }
+
+        internal static String percentSymbol {
+            get { return CultureInfo.sPercent; }
+        }
+
+        internal static void ValidateParseStyle(NumberStyles style) {
+            if ((style & NumberStyles.AllowHexSpecifier) != 0) { // Check for hex number
+                if ((style & ~NumberStyles.HexNumber) != 0)
+                    throw new ArgumentException("Arg_InvalidHexStyle");
+            }
+        }
+
+    } // NumberFormatInfo
+}
diff --git a/base/Kernel/System/Globalization/NumberStyles.cs b/base/Kernel/System/Globalization/NumberStyles.cs
new file mode 100644
index 0000000..7d37055
--- /dev/null
+++ b/base/Kernel/System/Globalization/NumberStyles.cs
@@ -0,0 +1,65 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Enum:  NumberStyles.cool
+**
+**
+** Purpose: Contains valid formats for Numbers recognized by
+** the Number class' parsing code.
+**
+** Date:  August 9, 1999
+**
+===========================================================*/
+namespace System.Globalization {
+
+    using System;
+    //| <include path='docs/doc[@for="NumberStyles"]/*' />
+    [Flags]
+    public enum NumberStyles {
+        // Bit flag indicating that leading whitespace is allowed. Character values
+        // 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, and 0x0020 are considered to be
+        // whitespace.
+
+        //| <include path='docs/doc[@for="NumberStyles.None"]/*' />
+        None                  = 0x00000000,
+        //| <include path='docs/doc[@for="NumberStyles.AllowLeadingWhite"]/*' />
+        AllowLeadingWhite     = 0x00000001,
+        //| <include path='docs/doc[@for="NumberStyles.AllowTrailingWhite"]/*' />
+        AllowTrailingWhite    = 0x00000002, //Bitflag indicating trailing whitespace is allowed.
+        //| <include path='docs/doc[@for="NumberStyles.AllowLeadingSign"]/*' />
+        AllowLeadingSign      = 0x00000004, //Can the number start with a sign char.
+                                            //Specified by NumberFormatInfo.PositiveSign and NumberFormatInfo.NegativeSign
+        //| <include path='docs/doc[@for="NumberStyles.AllowTrailingSign"]/*' />
+        AllowTrailingSign     = 0x00000008, //Allow the number to end with a sign char
+        //| <include path='docs/doc[@for="NumberStyles.AllowParentheses"]/*' />
+        AllowParentheses      = 0x00000010, //Allow the number to be enclosed in parens
+        //| <include path='docs/doc[@for="NumberStyles.AllowDecimalPoint"]/*' />
+        AllowDecimalPoint     = 0x00000020, //Allow a decimal point
+        //| <include path='docs/doc[@for="NumberStyles.AllowThousands"]/*' />
+        AllowThousands        = 0x00000040, //Allow thousands separators (more properly, allow group separators)
+        //| <include path='docs/doc[@for="NumberStyles.AllowExponent"]/*' />
+        AllowExponent         = 0x00000080, //Allow an exponent
+        //| <include path='docs/doc[@for="NumberStyles.AllowHexSpecifier"]/*' />
+        AllowHexSpecifier     = 0x00000200, //Allow specifying hexadecimal.
+        //Common uses.  These represent some of the most common combinations of these flags.
+
+        //| <include path='docs/doc[@for="NumberStyles.Integer"]/*' />
+        Integer  = AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign,
+        //| <include path='docs/doc[@for="NumberStyles.HexNumber"]/*' />
+        HexNumber = AllowLeadingWhite | AllowTrailingWhite | AllowHexSpecifier,
+        //| <include path='docs/doc[@for="NumberStyles.Number"]/*' />
+        Number   = AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | AllowTrailingSign |
+                   AllowDecimalPoint | AllowThousands,
+        //| <include path='docs/doc[@for="NumberStyles.Float"]/*' />
+        Float    = AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign |
+                   AllowDecimalPoint | AllowExponent,
+        //| <include path='docs/doc[@for="NumberStyles.Any"]/*' />
+        Any      = AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | AllowTrailingSign |
+                   AllowParentheses  | AllowDecimalPoint | AllowThousands | AllowExponent,
+
+    }
+}
diff --git a/base/Kernel/System/Globalization/TextInfo.cs b/base/Kernel/System/Globalization/TextInfo.cs
new file mode 100644
index 0000000..ac92144
--- /dev/null
+++ b/base/Kernel/System/Globalization/TextInfo.cs
@@ -0,0 +1,259 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////
+//
+//  Class:    TextInfo
+//
+//
+//  Purpose:  This Class defines behaviors specific to a writing system.
+//            A writing system is the collection of scripts and
+//            orthographic rules required to represent a language as text.
+//
+//  Date:     March 31, 1999
+//
+////////////////////////////////////////////////////////////////////////////
+
+namespace System.Globalization {
+    using System.Text;
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="TextInfo"]/*' />
+    public class TextInfo
+    {
+        private TextInfo() {}   // Prevent from being created
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  ToLower
+        //
+        //  Converts the character or string to lower case.  Certain locales
+        //  have different casing semantics from the file systems in Native.
+        //
+        ////////////////////////////////////////////////////////////////////////
+        //| <include path='docs/doc[@for="TextInfo.ToLower"]/*' />
+        public static char ToLower(char c) {
+            return GetLowerUpperCase(lowerCaseTable, c);
+        }
+        //| <include path='docs/doc[@for="TextInfo.ToLower1"]/*' />
+        public static String ToLower(String str) {
+            if (str == null) {
+                throw new ArgumentNullException("str");
+            }
+            if (str.Length == 0) {
+                return str;
+            }
+            char[] chars = str.ToCharArray();
+            int length = chars.Length;
+            for (int i = 0; i < length; i++) {
+                chars[i] = GetLowerUpperCase(lowerCaseTable, chars[i]);
+            }
+            return String.StringCTOR(chars, 0, length);
+        }
+
+        internal static int GetCaseInsensitiveHashCode(String str) {
+            String upperString = ToUpper(str);
+            return upperString.GetHashCode();
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //
+        //  ToUpper
+        //
+        //  Converts the character or string to upper case.  Certain locales
+        //  have different casing semantics from the file systems in Native.
+        //
+        ////////////////////////////////////////////////////////////////////////
+        //| <include path='docs/doc[@for="TextInfo.ToUpper"]/*' />
+        public static char ToUpper(char c) {
+            return GetLowerUpperCase(upperCaseTable, c);
+        }
+
+        public static String ToUpper(String str) {
+            if (str == null) {
+                throw new ArgumentNullException("str");
+            }
+            if (str.Length == 0) {
+                return str;
+            }
+            char[] chars = str.ToCharArray();
+            int length = chars.Length;
+            for (int i = 0; i < length; i++) {
+                chars[i] = GetLowerUpperCase(upperCaseTable, chars[i]);
+            }
+            return String.StringCTOR(chars, 0, length);
+        }
+
+        private static char GetLowerUpperCase(short[] table, char c) {
+            short firstIndex = table[c >> 8];
+            short secondIndex = table[firstIndex + ((c >> 4) & 0xf)];
+            return unchecked((char) (c + table[secondIndex + (c & 0xf)]));
+        }
+
+        private static bool IsLetterCategory(UnicodeCategory uc) {
+            return (uc == UnicodeCategory.UppercaseLetter
+                    || uc == UnicodeCategory.LowercaseLetter
+                    || uc == UnicodeCategory.TitlecaseLetter
+                    || uc == UnicodeCategory.ModifierLetter
+                    || uc == UnicodeCategory.OtherLetter);
+        }
+
+        private static short[] upperCaseTable = new short[1152] {
+            // firstIndex [0..255]
+            256 ,272 ,288 ,304 ,320 ,336 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 0
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,368 ,384 , // 16
+            352 ,400 ,352 ,352 ,416 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 32
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 48
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 64
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 80
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 96
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 112
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 128
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 144
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 160
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 176
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 192
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 208
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 224
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,432 , // 240
+            // secondIndex [256..447]
+            448 ,448 ,448 ,448 ,448 ,448 ,464 ,480 ,448 ,448 ,448 ,448 ,448 ,448 ,496 ,512 , // 256
+            528 ,528 ,528 ,544 ,560 ,528 ,528 ,576 ,592 ,608 ,624 ,640 ,656 ,672 ,528 ,688 , // 272
+            528 ,704 ,448 ,448 ,448 ,720 ,736 ,752 ,768 ,784 ,448 ,448 ,448 ,448 ,448 ,448 , // 288
+            448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,800 ,464 ,816 ,448 ,832 ,448 , // 304
+            448 ,448 ,448 ,496 ,496 ,848 ,528 ,528 ,864 ,528 ,528 ,528 ,880 ,528 ,896 ,912 , // 320
+            448 ,448 ,448 ,448 ,448 ,448 ,928 ,944 ,960 ,448 ,448 ,448 ,448 ,448 ,448 ,448 , // 336
+            448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 , // 352
+            528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,528 ,976 ,528 ,528 ,528 ,528 ,528 ,992 , // 368
+            1008,1024,1008,1008,1024,1040,1008,1056,448 ,448 ,448 ,1072,448 ,1072,1088,448 , // 384
+            448 ,448 ,448 ,448 ,448 ,448 ,448 ,1104,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 , // 400
+            448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,1120,1136,448 , // 416
+            448 ,448 ,448 ,448 ,464 ,480 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 ,448 , // 432
+            // adjustments [448..1151]
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 448
+            0   ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 , // 464
+            -32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,0   ,0   ,0   ,0   ,0   , // 480
+            -32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 , // 496
+            -32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,0   ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,121 , // 512
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  , // 528
+            0   ,0   ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   , // 544
+            -1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,-1  ,0   ,-1  ,0   ,-1  , // 560
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   , // 576
+            0   ,0   ,0   ,-1  ,0   ,-1  ,0   ,0   ,-1  ,0   ,0   ,0   ,-1  ,0   ,0   ,0   , // 592
+            0   ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   , // 608
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,-1  ,0   ,0   ,0   ,0   ,-1  ,0   ,0   , // 624
+            -1  ,0   ,0   ,0   ,-1  ,0   ,-1  ,0   ,0   ,-1  ,0   ,0   ,0   ,-1  ,0   ,0   , // 640
+            0   ,0   ,0   ,0   ,0   ,0   ,-2  ,0   ,0   ,-2  ,0   ,0   ,-2  ,0   ,-1  ,0   , // 656
+            -1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,-79 ,0   ,-1  , // 672
+            0   ,0   ,0   ,-2  ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,-1  ,0   ,-1  ,0   ,-1  , // 688
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 704
+            0   ,0   ,0   ,-210,-206,0   ,-205,-205,0   ,-202,0   ,-203,0   ,0   ,0   ,0   , // 720
+            -205,0   ,0   ,-207,0   ,0   ,0   ,0   ,-209,-211,0   ,0   ,0   ,0   ,0   ,-211, // 736
+            0   ,0   ,-213,0   ,0   ,-214,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 752
+            0   ,0   ,0   ,-218,0   ,0   ,0   ,0   ,-218,0   ,-217,-217,0   ,0   ,0   ,0   , // 768
+            0   ,0   ,-219,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 784
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-38 ,-37 ,-37 ,-37 , // 800
+            -32 ,-32 ,-31 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-32 ,-64 ,-63 ,-63 ,0   , // 816
+            0   ,0   ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  , // 832
+            0   ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,-80 ,0   ,-80 ,-80 , // 848
+            0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 864
+            0   ,0   ,-1  ,0   ,-1  ,0   ,0   ,0   ,-1  ,0   ,0   ,0   ,-1  ,0   ,0   ,0   , // 880
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,0   ,-1  , // 896
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   , // 912
+            0   ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 , // 928
+            -48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 , // 944
+            -48 ,-48 ,-48 ,-48 ,-48 ,-48 ,-48 ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 960
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 976
+            0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,-1  ,0   ,0   ,0   ,0   ,0   ,0   , // 992
+            8   ,8   ,8   ,8   ,8   ,8   ,8   ,8   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 1008
+            8   ,8   ,8   ,8   ,8   ,8   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 1024
+            0   ,8   ,0   ,8   ,0   ,8   ,0   ,8   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 1040
+            74  ,74  ,86  ,86  ,86  ,86  ,100 ,100 ,128 ,128 ,112 ,112 ,126 ,126 ,0   ,0   , // 1056
+            8   ,8   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 1072
+            8   ,8   ,0   ,0   ,0   ,7   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 1088
+            -16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 ,-16 , // 1104
+            -26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 , // 1120
+            -26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,-26 ,0   ,0   ,0   ,0   ,0   ,0   , // 1136
+        };
+
+        private static short[] lowerCaseTable = new short[1136] {
+            // firstIndex [0..255]
+            256 ,272 ,288 ,304 ,320 ,336 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 0
+            368 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,384 ,400 , // 16
+            352 ,416 ,352 ,352 ,432 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 32
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 48
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 64
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 80
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 96
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 112
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 128
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 144
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 160
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 176
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 192
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 208
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 , // 224
+            352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,352 ,448 , // 240
+            // secondIndex [256..463]
+            464 ,464 ,464 ,464 ,480 ,496 ,464 ,464 ,464 ,464 ,464 ,464 ,512 ,528 ,464 ,464 , // 256
+            544 ,544 ,544 ,560 ,576 ,544 ,544 ,592 ,608 ,624 ,640 ,656 ,672 ,688 ,544 ,704 , // 272
+            544 ,720 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 , // 288
+            464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,736 ,480 ,752 ,464 ,464 ,464 ,768 ,464 , // 304
+            784 ,512 ,512 ,464 ,464 ,464 ,544 ,544 ,800 ,544 ,544 ,544 ,816 ,544 ,832 ,848 , // 320
+            464 ,464 ,464 ,864 ,880 ,896 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 , // 336
+            464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 , // 352
+            464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,880 ,880 ,912 ,464 ,464 ,464 , // 368
+            544 ,544 ,544 ,544 ,544 ,544 ,544 ,544 ,544 ,928 ,544 ,544 ,544 ,544 ,544 ,944 , // 384
+            960 ,976 ,960 ,960 ,976 ,992 ,960 ,464 ,464 ,464 ,464 ,1008,1024,1040,1056,1072, // 400
+            464 ,464 ,464 ,464 ,464 ,464 ,1088,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 , // 416
+            464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,1104,1120,464 ,464 ,464 , // 432
+            464 ,464 ,480 ,496 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 ,464 , // 448
+            // adjustments [464..1135]
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 464
+            0   ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  , // 480
+            32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,0   ,0   ,0   ,0   ,0   , // 496
+            32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  , // 512
+            32  ,32  ,32  ,32  ,32  ,32  ,32  ,0   ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,0   , // 528
+            1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   , // 544
+            0   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   , // 560
+            0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,0   ,1   ,0   ,1   ,0   ,1   ,0   , // 576
+            1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,-121,1   ,0   ,1   ,0   ,1   ,0   ,0   , // 592
+            0   ,210 ,1   ,0   ,1   ,0   ,206 ,1   ,0   ,205 ,205 ,1   ,0   ,0   ,79  ,202 , // 608
+            203 ,1   ,0   ,205 ,207 ,0   ,211 ,209 ,1   ,0   ,0   ,0   ,211 ,213 ,0   ,214 , // 624
+            1   ,0   ,1   ,0   ,1   ,0   ,0   ,1   ,0   ,218 ,0   ,0   ,1   ,0   ,218 ,1   , // 640
+            0   ,217 ,217 ,1   ,0   ,1   ,0   ,219 ,1   ,0   ,0   ,0   ,1   ,0   ,0   ,0   , // 656
+            0   ,0   ,0   ,0   ,2   ,0   ,0   ,2   ,0   ,0   ,2   ,0   ,0   ,1   ,0   ,1   , // 672
+            0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,0   ,1   ,0   , // 688
+            0   ,2   ,0   ,0   ,1   ,0   ,0   ,0   ,0   ,0   ,1   ,0   ,1   ,0   ,1   ,0   , // 704
+            1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 720
+            0   ,0   ,0   ,0   ,0   ,0   ,38  ,0   ,37  ,37  ,37  ,0   ,64  ,0   ,63  ,63  , // 736
+            32  ,32  ,0   ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,32  ,0   ,0   ,0   ,0   , // 752
+            0   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   , // 768
+            0   ,80  ,80  ,80  ,80  ,80  ,80  ,80  ,80  ,80  ,80  ,80  ,80  ,0   ,80  ,80  , // 784
+            1   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 800
+            0   ,1   ,0   ,1   ,0   ,0   ,0   ,1   ,0   ,0   ,0   ,1   ,0   ,0   ,0   ,0   , // 816
+            1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,0   ,0   ,1   ,0   , // 832
+            1   ,0   ,1   ,0   ,1   ,0   ,0   ,0   ,1   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 848
+            0   ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  , // 864
+            48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  ,48  , // 880
+            48  ,48  ,48  ,48  ,48  ,48  ,48  ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 896
+            48  ,48  ,48  ,48  ,48  ,48  ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 912
+            1   ,0   ,1   ,0   ,1   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 928
+            1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,1   ,0   ,0   ,0   ,0   ,0   ,0   ,0   , // 944
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-8  ,-8  ,-8  ,-8  ,-8  ,-8  ,-8  ,-8  , // 960
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-8  ,-8  ,-8  ,-8  ,-8  ,-8  ,0   ,0   , // 976
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-8  ,0   ,-8  ,0   ,-8  ,0   ,-8  , // 992
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-8  ,-8  ,-74 ,-74 ,0   ,0   ,0   ,0   , // 1008
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-86 ,-86 ,-86 ,-86 ,0   ,0   ,0   ,0   , // 1024
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-8  ,-8  ,-100,-100,0   ,0   ,0   ,0   , // 1040
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-8  ,-8  ,-112,-112,-7  ,0   ,0   ,0   , // 1056
+            0   ,0   ,0   ,0   ,0   ,0   ,0   ,0   ,-128,-128,-126,-126,0   ,0   ,0   ,0   , // 1072
+            16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  ,16  , // 1088
+            0   ,0   ,0   ,0   ,0   ,0   ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  , // 1104
+            26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  ,26  , // 1120
+        };
+    }
+}
diff --git a/base/Kernel/System/Globalization/UnicodeCategory.cs b/base/Kernel/System/Globalization/UnicodeCategory.cs
new file mode 100644
index 0000000..96b6b8d
--- /dev/null
+++ b/base/Kernel/System/Globalization/UnicodeCategory.cs
@@ -0,0 +1,80 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: UnicodeCategory
+**
+**
+** Purpose:
+**
+** Date:
+**
+============================================================*/
+namespace System.Globalization {
+    //| <include path='docs/doc[@for="UnicodeCategory"]/*' />
+    public enum UnicodeCategory {
+        //| <include path='docs/doc[@for="UnicodeCategory.UppercaseLetter"]/*' />
+        UppercaseLetter = 0,
+        //| <include path='docs/doc[@for="UnicodeCategory.LowercaseLetter"]/*' />
+        LowercaseLetter = 1,
+        //| <include path='docs/doc[@for="UnicodeCategory.TitlecaseLetter"]/*' />
+        TitlecaseLetter = 2,
+        //| <include path='docs/doc[@for="UnicodeCategory.ModifierLetter"]/*' />
+        ModifierLetter = 3,
+        //| <include path='docs/doc[@for="UnicodeCategory.OtherLetter"]/*' />
+        OtherLetter = 4,
+        //| <include path='docs/doc[@for="UnicodeCategory.NonSpacingMark"]/*' />
+        NonSpacingMark = 5,
+        //| <include path='docs/doc[@for="UnicodeCategory.SpacingCombiningMark"]/*' />
+        SpacingCombiningMark = 6,
+        //| <include path='docs/doc[@for="UnicodeCategory.EnclosingMark"]/*' />
+        EnclosingMark = 7,
+        //| <include path='docs/doc[@for="UnicodeCategory.DecimalDigitNumber"]/*' />
+        DecimalDigitNumber = 8,
+        //| <include path='docs/doc[@for="UnicodeCategory.LetterNumber"]/*' />
+        LetterNumber = 9,
+        //| <include path='docs/doc[@for="UnicodeCategory.OtherNumber"]/*' />
+        OtherNumber = 10,
+        //| <include path='docs/doc[@for="UnicodeCategory.SpaceSeparator"]/*' />
+        SpaceSeparator = 11,
+        //| <include path='docs/doc[@for="UnicodeCategory.LineSeparator"]/*' />
+        LineSeparator = 12,
+        //| <include path='docs/doc[@for="UnicodeCategory.ParagraphSeparator"]/*' />
+        ParagraphSeparator = 13,
+        //| <include path='docs/doc[@for="UnicodeCategory.Control"]/*' />
+        Control = 14,
+        //| <include path='docs/doc[@for="UnicodeCategory.Format"]/*' />
+        Format = 15,
+        //| <include path='docs/doc[@for="UnicodeCategory.Surrogate"]/*' />
+        Surrogate = 16,
+        //| <include path='docs/doc[@for="UnicodeCategory.PrivateUse"]/*' />
+        PrivateUse = 17,
+        //| <include path='docs/doc[@for="UnicodeCategory.ConnectorPunctuation"]/*' />
+        ConnectorPunctuation = 18,
+        //| <include path='docs/doc[@for="UnicodeCategory.DashPunctuation"]/*' />
+        DashPunctuation = 19,
+        //| <include path='docs/doc[@for="UnicodeCategory.OpenPunctuation"]/*' />
+        OpenPunctuation = 20,
+        //| <include path='docs/doc[@for="UnicodeCategory.ClosePunctuation"]/*' />
+        ClosePunctuation = 21,
+        //| <include path='docs/doc[@for="UnicodeCategory.InitialQuotePunctuation"]/*' />
+        InitialQuotePunctuation = 22,
+        //| <include path='docs/doc[@for="UnicodeCategory.FinalQuotePunctuation"]/*' />
+        FinalQuotePunctuation = 23,
+        //| <include path='docs/doc[@for="UnicodeCategory.OtherPunctuation"]/*' />
+        OtherPunctuation = 24,
+        //| <include path='docs/doc[@for="UnicodeCategory.MathSymbol"]/*' />
+        MathSymbol = 25,
+        //| <include path='docs/doc[@for="UnicodeCategory.CurrencySymbol"]/*' />
+        CurrencySymbol = 26,
+        //| <include path='docs/doc[@for="UnicodeCategory.ModifierSymbol"]/*' />
+        ModifierSymbol = 27,
+        //| <include path='docs/doc[@for="UnicodeCategory.OtherSymbol"]/*' />
+        OtherSymbol = 28,
+        //| <include path='docs/doc[@for="UnicodeCategory.OtherNotAssigned"]/*' />
+        OtherNotAssigned = 29,
+    }
+}
diff --git a/base/Kernel/System/Guid.cs b/base/Kernel/System/Guid.cs
new file mode 100644
index 0000000..f314556
--- /dev/null
+++ b/base/Kernel/System/Guid.cs
@@ -0,0 +1,779 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Diagnostics;
+    using System.Text;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Globalization;
+
+    // Represents a Globally Unique Identifier.
+        //| <include path='docs/doc[@for="Guid"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Guid : IFormattable, IComparable
+    {
+        //| <include path='docs/doc[@for="Guid.Empty"]/*' />
+        public static readonly Guid Empty = new Guid();
+        ////////////////////////////////////////////////////////////////////////////////
+        //  Member variables
+        ////////////////////////////////////////////////////////////////////////////////
+        private int        _a;
+        private short      _b;
+        private short      _c;
+        private byte       _d;
+        private byte       _e;
+        private byte       _f;
+        private byte       _g;
+        private byte       _h;
+        private byte       _i;
+        private byte       _j;
+        private byte       _k;
+
+        ////////////////////////////////////////////////////////////////////////////////
+        //  Constructors
+        ////////////////////////////////////////////////////////////////////////////////
+
+        // Creates a new guid from an array of bytes.
+        //
+        //| <include path='docs/doc[@for="Guid.Guid"]/*' />
+        public Guid(byte[] b)
+        {
+            if (b==null)
+                throw new ArgumentNullException("b");
+            if (b.Length != 16)
+                throw new ArgumentException(String.Format("Arg_GuidArrayCtor", "16"));
+            _a = BitConverter.ToInt32(b, 0);
+            _b = BitConverter.ToInt16(b, 4);
+            _c = BitConverter.ToInt16(b, 6);
+            _d = b[8];
+            _e = b[9];
+            _f = b[10];
+            _g = b[11];
+            _h = b[12];
+            _i = b[13];
+            _j = b[14];
+            _k = b[15];
+        }
+
+        //| <include path='docs/doc[@for="Guid.Guid1"]/*' />
+        [CLSCompliant(false)]
+        public Guid (uint a, ushort b, ushort c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k)
+        {
+            _a = (int)a;
+            _b = (short)b;
+            _c = (short)c;
+            _d = d;
+            _e = e;
+            _f = f;
+            _g = g;
+            _h = h;
+            _i = i;
+            _j = j;
+            _k = k;
+        }
+
+        // Creates a new guid with all contents having value of 0
+        private Guid(bool blank)
+        {
+            // Must initialize value class members even if the native
+            // function reinitializes them.  Compiler appeasement.
+            _a = 0;
+            _b = 0;
+            _c = 0;
+            _d = 0;
+            _e = 0;
+            _f = 0;
+            _g = 0;
+            _h = 0;
+            _i = 0;
+            _j = 0;
+            _k = 0;
+            if (!blank) {
+                // Create a new Guid...
+                VTable.DebugPrint("CreateGuid.Guid()\n");
+            }
+        }
+
+        // Creates a new guid based on the value in the string.  The value is made up
+        // of hex digits speared by the dash ("-"). The string may begin and end with
+        // brackets ("{", "}").
+        //
+        // The string must be of the form dddddddd-dddd-dddd-dddd-dddddddddddd. where
+        // d is a hex digit. (That is 8 hex digits, followed by 4, then 4, then 4,
+        // then 12) such as: "CA761232-ED42-11CE-BACD-00AA0057B223"
+        //
+        //| <include path='docs/doc[@for="Guid.Guid2"]/*' />
+        public Guid(String g)
+        {
+            if (g==null)
+                throw new ArgumentNullException("g", "ArgumentNull_String");
+
+            int startPos=0;
+            long _dTemp;
+            int _dStartTemp = 0;
+            int[] spArray = new int[1];
+            byte []dstartArray;
+            byte []dArray;
+
+            try
+            {
+                // Check if it's of the form dddddddd-dddd-dddd-dddd-dddddddddddd
+                if(g.IndexOf('-', 0) >= 0)
+                {
+
+                    String guidString = g.Trim();  //Remove Whitespace
+
+                    // check to see that it's the proper length
+                    if (guidString[0]=='{') {
+                        if (guidString.Length!=38 || guidString[37]!='}') {
+                            throw new FormatException("Format_GuidInvLen");
+                        }
+                        startPos=1;
+                    }
+                    else if (guidString[0]=='(')
+                    {
+                        if (guidString.Length!=38 || guidString[37]!=')')
+                        {
+                            throw new FormatException("Format_GuidInvLen");
+                        }
+                        startPos=1;
+                    }
+                    else if(guidString.Length != 36) {
+                        throw new FormatException("Format_GuidInvLen");
+                    }
+                    if (guidString[8+startPos] != '-' ||
+                        guidString[13+startPos] != '-' ||
+                        guidString[18+startPos] != '-' ||
+                        guidString[23+startPos] != '-') {
+                        throw new FormatException("Format_GuidDashes");
+                    }
+
+                    spArray[0]=startPos;
+                    _a = TryParse(guidString, spArray,8);
+                    spArray[0]++; //Increment past the '-';
+                    _b = (short)TryParse(guidString, spArray,4);
+                    spArray[0]++; //Increment past the '-';
+                    _c = (short)TryParse(guidString, spArray,4);
+                    spArray[0]++; //Increment past the '-';
+                    _dStartTemp =TryParse(guidString, spArray,4);
+                    spArray[0]++; //Increment past the '-';
+                    startPos=spArray[0];
+                    _dTemp = ParseNumbers.StringToLong(guidString, 16, 0, spArray);
+                    if (spArray[0]-startPos!=12) {
+                        throw new FormatException(String.Format("Format_GuidInvLen"));
+                    }
+                    dstartArray = BitConverter.GetBytes(_dStartTemp);
+                    dArray = BitConverter.GetBytes(_dTemp);
+
+                    if (BitConverter.IsLittleEndian) {
+                        _d = dstartArray[1];
+                        _e = dstartArray[0];
+                        _f = dArray[5];
+                        _g = dArray[4];
+                        _h = dArray[3];
+                        _i = dArray[2];
+                        _j = dArray[1];
+                        _k = dArray[0];
+                    } else {
+                        _d = dstartArray[0];
+                        _e = dstartArray[1];
+                        _f = dArray[0];
+                        _g = dArray[1];
+                        _h = dArray[2];
+                        _i = dArray[3];
+                        _j = dArray[4];
+                        _k = dArray[5];
+                    }
+                }
+
+                // Else check if it is of the form
+                // {0xdddddddd,0xdddd,0xdddd,{0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd}}
+                else if(g.IndexOf('{', 0) >= 0)
+                {
+                    int numStart = 0;
+                    int numLen = 0;
+
+                    // Convert to lower case
+                    //g = g.ToLower();
+
+                    // Eat all of the whitespace
+                    g = EatAllWhitespace(g);
+
+                    // Check for leading '{'
+                    if(g[0] != '{')
+                        throw new FormatException("Format_GuidBrace");
+
+                    // Check for '0x'
+                    if(!IsHexPrefix(g, 1))
+                        throw new FormatException(String.Format("Format_GuidHexPrefix", "{0xdddddddd, etc}"));
+
+                    // Find the end of this hex number (since it is not fixed length)
+                    numStart = 3;
+                    numLen = g.IndexOf(',', numStart) - numStart;
+                    if(numLen <= 0)
+                        throw new FormatException("Format_GuidComma");
+
+                    // Read in the number
+                    _a = (int) ParseNumbers.StringToInt(g.Substring(numStart, numLen), // first DWORD
+                                                        16,                            // hex
+                                                        ParseNumbers.IsTight);         // tight parsing
+
+                    // Check for '0x'
+                    if(!IsHexPrefix(g, numStart+numLen+1))
+                        throw new FormatException(String.Format("Format_GuidHexPrefix", "{0xdddddddd, 0xdddd, etc}"));
+
+                    // +3 to get by ',0x'
+                    numStart = numStart + numLen + 3;
+                    numLen = g.IndexOf(',', numStart) - numStart;
+                    if(numLen <= 0)
+                        throw new FormatException("Format_GuidComma");
+
+                    // Read in the number
+                    _b = (short) ParseNumbers.StringToInt(
+                                                          g.Substring(numStart, numLen), // first DWORD
+                                                          16,                            // hex
+                                                          ParseNumbers.IsTight);         // tight parsing
+
+                    // Check for '0x'
+                    if(!IsHexPrefix(g, numStart+numLen+1))
+                        throw new FormatException(String.Format("Format_GuidHexPrefix", "{0xdddddddd, 0xdddd, 0xdddd, etc}"));
+
+                    // +3 to get by ',0x'
+                    numStart = numStart + numLen + 3;
+                    numLen = g.IndexOf(',', numStart) - numStart;
+                    if(numLen <= 0)
+                        throw new FormatException("Format_GuidComma");
+
+                    // Read in the number
+                    _c = (short) ParseNumbers.StringToInt(
+                                                          g.Substring(numStart, numLen), // first DWORD
+                                                          16,                            // hex
+                                                          ParseNumbers.IsTight);         // tight parsing
+
+                    // Check for '{'
+                    if(g.Length <= numStart+numLen+1 || g[numStart+numLen+1] != '{')
+                        throw new FormatException("Format_GuidBrace");
+
+                    // Prepare for loop
+                    numLen++;
+                    byte[] bytes = new byte[8];
+
+                    for(int i = 0; i < 8; i++)
+                    {
+                        // Check for '0x'
+                        if(!IsHexPrefix(g, numStart+numLen+1))
+                            throw new FormatException(String.Format("Format_GuidHexPrefix", "{... { ... 0xdd, ...}}"));
+
+                        // +3 to get by ',0x' or '{0x' for first case
+                        numStart = numStart + numLen + 3;
+
+                        // Calculate number length
+                        if(i < 7)  // first 7 cases
+                        {
+                            numLen = g.IndexOf(',', numStart) - numStart;
+                        }
+                        else       // last case ends with '}', not ','
+                        {
+                            numLen = g.IndexOf('}', numStart) - numStart;
+                        }
+                        if(numLen <= 0)
+                            throw new FormatException("Format_GuidComma");
+
+                        // Read in the number
+                        bytes[i] = (byte)ParseNumbers.StringToInt(g.Substring(numStart, numLen),
+                                                                  16,
+                                                                  ParseNumbers.IsTight);
+                    }
+
+                    _d = bytes[0];
+                    _e = bytes[1];
+                    _f = bytes[2];
+                    _g = bytes[3];
+                    _h = bytes[4];
+                    _i = bytes[5];
+                    _j = bytes[6];
+                    _k = bytes[7];
+
+                    // Check for last '}'
+                    if(numStart+numLen+1 >= g.Length || g[numStart+numLen+1] != '}')
+                        throw new FormatException("Format_GuidEndBrace");
+
+                    return;
+                }
+                else
+                // Check if it's of the form dddddddddddddddddddddddddddddddd
+                {
+                    String guidString = g.Trim();  //Remove Whitespace
+
+                    if(guidString.Length != 32) {
+                        throw new FormatException("Format_GuidInvLen");
+                    }
+
+                    _a = (int) ParseNumbers.StringToInt(g.Substring(startPos, 8), // first DWORD
+                                                        16,                            // hex
+                                                        ParseNumbers.IsTight);         // tight parsing
+                    startPos += 8;
+                    _b = (short) ParseNumbers.StringToInt(g.Substring(startPos, 4),
+                                                        16,
+                                                        ParseNumbers.IsTight);
+                    startPos += 4;
+                    _c = (short) ParseNumbers.StringToInt(g.Substring(startPos, 4),
+                                                        16,
+                                                        ParseNumbers.IsTight);
+
+                    startPos += 4;
+                    _dStartTemp =(short) ParseNumbers.StringToInt(g.Substring(startPos, 4),
+                                                        16,
+                                                        ParseNumbers.IsTight);
+                    startPos += 4;
+                    spArray[0] = startPos;
+                    _dTemp = ParseNumbers.StringToLong(guidString, 16, startPos, spArray);
+                    if (spArray[0]-startPos!=12) {
+                        throw new FormatException(String.Format("Format_GuidInvLen"));
+                    }
+                    dstartArray = BitConverter.GetBytes(_dStartTemp);
+                    dArray = BitConverter.GetBytes(_dTemp);
+
+                    if (BitConverter.IsLittleEndian) {
+                        _d = dstartArray[1];
+                        _e = dstartArray[0];
+                        _f = dArray[5];
+                        _g = dArray[4];
+                        _h = dArray[3];
+                        _i = dArray[2];
+                        _j = dArray[1];
+                        _k = dArray[0];
+                    } else {
+                        _d = dstartArray[0];
+                        _e = dstartArray[1];
+                        _f = dArray[0];
+                        _g = dArray[1];
+                        _h = dArray[2];
+                        _i = dArray[3];
+                        _j = dArray[4];
+                        _k = dArray[5];
+                    }
+                }
+            }
+            catch(IndexOutOfRangeException)
+            {
+                throw new FormatException("Format_GuidUnrecognized");
+            }
+        }
+
+        // Creates a new GUID initialized to the value represented by the arguments.
+        //
+        //| <include path='docs/doc[@for="Guid.Guid3"]/*' />
+        public Guid(int a, short b, short c, byte[] d)
+        {
+            if (d==null)
+                throw new ArgumentNullException("d");
+            // Check that array is not too big
+            if(d.Length != 8)
+                throw new ArgumentException(String.Format("Arg_GuidArrayCtor", "8"));
+
+            _a  = a;
+            _b  = b;
+            _c  = c;
+            _d = d[0];
+            _e = d[1];
+            _f = d[2];
+            _g = d[3];
+            _h = d[4];
+            _i = d[5];
+            _j = d[6];
+            _k = d[7];
+        }
+
+        // Creates a new GUID initialized to the value represented by the
+        // arguments.  The bytes are specified like this to avoid endianness issues.
+        //
+        //| <include path='docs/doc[@for="Guid.Guid4"]/*' />
+        public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k)
+        {
+            _a = a;
+            _b = b;
+            _c = c;
+            _d = d;
+            _e = e;
+            _f = f;
+            _g = g;
+            _h = h;
+            _i = i;
+            _j = j;
+            _k = k;
+        }
+
+
+        private static int TryParse(String str, int []parsePos, int requiredLength) {
+            int currStart = parsePos[0];
+            int retVal;
+            try
+            {
+                retVal = ParseNumbers.StringToInt(str, 16, 0, parsePos);
+            }
+            catch (FormatException)
+            {
+               throw new FormatException("Format_GuidUnrecognized");
+            }
+
+            //If we didn't parse enough characters, there's clearly an error.
+            if (parsePos[0]-currStart!=requiredLength) {
+                throw new FormatException("Format_GuidUnrecognized");
+            }
+            return retVal;
+        }
+
+        private static String EatAllWhitespace(String str)
+        {
+            int newLength = 0;
+            char[] chArr = new char[str.Length];
+            char curChar;
+
+            // Now get each char from str and if it is not whitespace add it to chArr
+            for(int i = 0; i < str.Length; i++)
+            {
+                curChar = str[i];
+                if(!Char.IsWhiteSpace(curChar))
+                {
+                    chArr[newLength++] = curChar;
+                }
+            }
+
+            // Return a new string based on chArr
+            return new String(chArr, 0, newLength);
+        }
+
+        private static bool IsHexPrefix(String str, int i)
+        {
+            if(str[i] == '0' && (Char.ToLower(str[i+1]) == 'x'))
+                return true;
+            else
+                return false;
+        }
+
+
+        // Returns an unsigned byte array containing the GUID.
+        //| <include path='docs/doc[@for="Guid.ToByteArray"]/*' />
+        public byte[] ToByteArray()
+        {
+            byte[] g = new byte[16];
+            byte[] tmp = BitConverter.GetBytes(_a);
+            for(int i=0; i<4; i++)
+                g[i] = tmp[i];
+            tmp = BitConverter.GetBytes(_b);
+            for(int i=0; i<2; i++)
+                g[i+4] = tmp[i];
+            tmp = BitConverter.GetBytes(_c);
+            for(int i=0; i<2; i++)
+                g[i+6] = tmp[i];
+
+            g[8] = _d;
+            g[9] = _e;
+            g[10] = _f;
+            g[11] = _g;
+            g[12] = _h;
+            g[13] = _i;
+            g[14] = _j;
+            g[15] = _k;
+
+            return g;
+        }
+
+
+        // Returns the guid in "registry" format.
+        //| <include path='docs/doc[@for="Guid.ToString"]/*' />
+        public override String ToString()
+        {
+            return ToString("D");
+        }
+
+        //| <include path='docs/doc[@for="Guid.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            return _a ^ (((int)_b << 16) | (int)(ushort)_c) ^ (((int)_f << 24) | _k);
+        }
+
+        // Returns true if and only if the guid represented
+        //  by o is the same as this instance.
+        //| <include path='docs/doc[@for="Guid.Equals"]/*' />
+        public override bool Equals(Object o)
+        {
+            Guid g;
+            // Check that o is a Guid first
+            if(o == null || !(o is Guid))
+                return false;
+            else g = (Guid) o;
+
+            // Now compare each of the elements
+            if(g._a != _a)
+                return false;
+            if(g._b != _b)
+                return false;
+            if(g._c != _c)
+                return false;
+            if (g._d != _d)
+                return false;
+            if (g._e != _e)
+                return false;
+            if (g._f != _f)
+                return false;
+            if (g._g != _g)
+                return false;
+            if (g._h != _h)
+                return false;
+            if (g._i != _i)
+                return false;
+            if (g._j != _j)
+                return false;
+            if (g._k != _k)
+                return false;
+
+            return true;
+        }
+
+        private int GetResult(uint me, uint them) {
+            if (me<them) {
+                return -1;
+            }
+            return 1;
+        }
+
+        //| <include path='docs/doc[@for="Guid.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (!(value is Guid)) {
+                throw new ArgumentException("Arg_MustBeGuid");
+            }
+            Guid g = (Guid)value;
+
+            if (g._a!=this._a) {
+                return GetResult((uint)this._a, (uint)g._a);
+            }
+
+            if (g._b!=this._b) {
+                return GetResult((uint)this._b, (uint)g._b);
+            }
+
+            if (g._c!=this._c) {
+                return GetResult((uint)this._c, (uint)g._c);
+            }
+
+            if (g._d!=this._d) {
+                return GetResult((uint)this._d, (uint)g._d);
+            }
+
+            if (g._e!=this._e) {
+                return GetResult((uint)this._e, (uint)g._e);
+            }
+
+            if (g._f!=this._f) {
+                return GetResult((uint)this._f, (uint)g._f);
+            }
+
+            if (g._g!=this._g) {
+                return GetResult((uint)this._g, (uint)g._g);
+            }
+
+            if (g._h!=this._h) {
+                return GetResult((uint)this._h, (uint)g._h);
+            }
+
+            if (g._i!=this._i) {
+                return GetResult((uint)this._i, (uint)g._i);
+            }
+
+            if (g._j!=this._j) {
+                return GetResult((uint)this._j, (uint)g._j);
+            }
+
+            if (g._k!=this._k) {
+                return GetResult((uint)this._k, (uint)g._k);
+            }
+
+            return 0;
+        }
+
+        // Compares two Guids by calling Guid.Equals(Guid).
+    /*  private static bool operator equals(Guid a, Guid b)
+        {
+            return a.Equals(b);
+        }*/
+
+        //| <include path='docs/doc[@for="Guid.operatorEQ"]/*' />
+        public static bool operator ==(Guid a, Guid b)
+        {
+            return a.Equals(b);
+        }
+
+        //| <include path='docs/doc[@for="Guid.operatorNE"]/*' />
+        public static bool operator !=(Guid a, Guid b)
+        {
+            return !a.Equals(b);
+        }
+
+        // This will create a new guid.  Since we've now decided that constructors should 0-init,
+        // we need a method that allows users to create a guid.
+        //| <include path='docs/doc[@for="Guid.NewGuid"]/*' />
+        public static Guid NewGuid() {
+            return new Guid(false);
+        }
+
+        private char HexToChar(int a)
+        {
+            Debug.Assert(a <= 0xf,"argument must be less than 0xf");
+            return (char) ((a > 9) ? a - 10 + 0x61 : a + 0x30);
+        }
+
+        // IFormattable interface
+        // We currently ignore provider
+        //| <include path='docs/doc[@for="Guid.ToString2"]/*' />
+        public String ToString(String format)
+        {
+            if (format == null || format.Length == 0)
+                format = "D";
+
+            char[] guidChars;
+            int offset = 0;
+            byte[] tmp;
+            int i;
+
+            if (format.Equals("N") || format.Equals("n"))
+            {
+                guidChars = new char[32];
+                tmp = BitConverter.GetBytes(_a);
+                for (i = 3; i >= 0; i--)
+                {
+                    guidChars[offset++] = HexToChar((tmp[i]>>4) & 0xf);
+                    guidChars[offset++] = HexToChar(tmp[i] & 0xf);
+                }
+
+                tmp = BitConverter.GetBytes(_b);
+                for (i = 1; i >= 0; i--)
+                {
+                    guidChars[offset++] = HexToChar((tmp[i]>>4) & 0xf);
+                    guidChars[offset++] = HexToChar(tmp[i] & 0xf);
+
+                }
+
+                tmp = BitConverter.GetBytes(_c);
+                for (i = 1; i >= 0; i--)
+                {
+                    guidChars[offset++] = HexToChar((tmp[i]>>4) & 0xf);
+                    guidChars[offset++] = HexToChar(tmp[i] & 0xf);
+                }
+
+                guidChars[offset++] = HexToChar((_d>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_d & 0xf);
+
+                guidChars[offset++] = HexToChar((_e>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_e & 0xf);
+
+                guidChars[offset++] = HexToChar((_f>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_f & 0xf);
+
+                guidChars[offset++] = HexToChar((_g>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_g & 0xf);
+
+                guidChars[offset++] = HexToChar((_h>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_h & 0xf);
+
+                guidChars[offset++] = HexToChar((_i>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_i & 0xf);
+
+                guidChars[offset++] = HexToChar((_j>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_j & 0xf);
+
+                guidChars[offset++] = HexToChar((_k>>4) & 0xf);
+                guidChars[offset++] = HexToChar(_k & 0xf);
+                return new string(guidChars, 0, 32);
+            }
+
+            int strLength = 38;
+            if (format.Equals("B") || format.Equals("b"))
+            {
+                guidChars = new char[38];
+                guidChars[offset++] = '{';
+                guidChars[37] = '}';
+            }
+            if (format.Equals("P") || format.Equals("p"))
+            {
+                guidChars = new char[38];
+                guidChars[offset++] = '(';
+                guidChars[37] = ')';
+            }
+            if (format.Equals("D") || format.Equals("d"))
+            {
+                guidChars = new char[36];
+                strLength = 36;
+            }
+            else
+            {
+                throw new FormatException("Format_InvalidGuidFormatSpecification");
+            }
+
+            tmp = BitConverter.GetBytes(_a);
+            for (i = 3; i >= 0; i--)
+            {
+                guidChars[offset++] = HexToChar((tmp[i]>>4) & 0xf);
+                guidChars[offset++] = HexToChar(tmp[i] & 0xf);
+            }
+
+            guidChars[offset++] = '-';
+
+            tmp = BitConverter.GetBytes(_b);
+            for (i = 1; i >= 0; i--)
+            {
+                guidChars[offset++] = HexToChar((tmp[i]>>4) & 0xf);
+                guidChars[offset++] = HexToChar(tmp[i] & 0xf);
+
+            }
+
+            guidChars[offset++] = '-';
+
+            tmp = BitConverter.GetBytes(_c);
+            for (i = 1; i >= 0; i--)
+            {
+                guidChars[offset++] = HexToChar((tmp[i]>>4) & 0xf);
+                guidChars[offset++] = HexToChar(tmp[i] & 0xf);
+            }
+
+            guidChars[offset++] = '-';
+
+            guidChars[offset++] = HexToChar((_d>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_d & 0xf);
+
+            guidChars[offset++] = HexToChar((_e>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_e & 0xf);
+
+            guidChars[offset++] = '-';
+
+            guidChars[offset++] = HexToChar((_f>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_f & 0xf);
+
+            guidChars[offset++] = HexToChar((_g>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_g & 0xf);
+
+            guidChars[offset++] = HexToChar((_h>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_h & 0xf);
+
+            guidChars[offset++] = HexToChar((_i>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_i & 0xf);
+
+            guidChars[offset++] = HexToChar((_j>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_j & 0xf);
+
+            guidChars[offset++] = HexToChar((_k>>4) & 0xf);
+            guidChars[offset++] = HexToChar(_k & 0xf);
+
+            return String.StringCTOR(guidChars, 0, strLength);
+        }
+    }
+}
diff --git a/base/Kernel/System/IAsyncResult.cs b/base/Kernel/System/IAsyncResult.cs
new file mode 100644
index 0000000..3b6ed39
--- /dev/null
+++ b/base/Kernel/System/IAsyncResult.cs
@@ -0,0 +1,38 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface: IAsyncResult
+**
+** Purpose: Interface to encapsulate the results of an async
+**          operation
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Threading;
+    //| <include path='docs/doc[@for="IAsyncResult"]/*' />
+    [CLSCompliant(false)]
+    public interface IAsyncResult
+    {
+        //| <include path='docs/doc[@for="IAsyncResult.IsCompleted"]/*' />
+        bool IsCompleted { get; }
+
+        //| <include path='docs/doc[@for="IAsyncResult.AsyncWaitHandle"]/*' />
+        WaitHandle AsyncWaitHandle { get; }
+
+
+        //| <include path='docs/doc[@for="IAsyncResult.AsyncState"]/*' />
+        Object     AsyncState      { get; }
+
+        //| <include path='docs/doc[@for="IAsyncResult.CompletedSynchronously"]/*' />
+        bool       CompletedSynchronously { get; }
+
+
+    }
+
+}
diff --git a/base/Kernel/System/ICloneable.cs b/base/Kernel/System/ICloneable.cs
new file mode 100644
index 0000000..facae1e
--- /dev/null
+++ b/base/Kernel/System/ICloneable.cs
@@ -0,0 +1,31 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  ICloneable
+**
+** This interface is implemented by classes that support cloning.
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    // Defines an interface indicating that an object may be cloned.  Only objects
+    // that implement ICloneable may be cloned. The interface defines a single
+    // method which is called to create a clone of the object.   Object defines a method
+    // MemberwiseClone to support default clone operations.
+    //
+    //| <include path='docs/doc[@for="ICloneable"]/*' />
+    public interface ICloneable
+    {
+        //| <include path='docs/doc[@for="ICloneable.Clone"]/*' />
+        // Make a new object which is a copy of the object instanced.  This object may be either
+        // deep copy or a shallow copy depending on the implementation of clone.  The default
+        // Object support for clone does a shallow copy.
+        //
+        Object Clone();
+    }
+}
diff --git a/base/Kernel/System/IComparable.cs b/base/Kernel/System/IComparable.cs
new file mode 100644
index 0000000..07babdc
--- /dev/null
+++ b/base/Kernel/System/IComparable.cs
@@ -0,0 +1,26 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    // The IComparable interface is implemented by classes that support an
+    // ordering of instances of the class. The ordering represented by
+    // IComparable can be used to sort arrays and collections of objects
+    // that implement the interface.
+    //
+    //| <include path='docs/doc[@for="IComparable"]/*' />
+    public interface IComparable
+    {
+        //| <include path='docs/doc[@for="IComparable.CompareTo"]/*' />
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship. An implementation of this method must return
+        // a value less than zero if this is less than object, zero
+        // if this is equal to object, or a value greater than zero
+        // if this is greater than object.
+        //
+        int CompareTo(Object obj);
+    }
+}
diff --git a/base/Kernel/System/IDisposable.cs b/base/Kernel/System/IDisposable.cs
new file mode 100644
index 0000000..1682d4d
--- /dev/null
+++ b/base/Kernel/System/IDisposable.cs
@@ -0,0 +1,61 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Interface:  IDisposable
+**
+**
+** Purpose: Interface for assisting with deterministic finalization.
+**
+** Date:  September 29, 2000
+**
+===========================================================*/
+namespace System {
+    // IDisposable is an attempt at helping to solve problems with deterministic
+    // finalization.  The GC of course doesn't leave any way to deterministically
+    // know when a finalizer will run.  This forces classes that hold onto OS
+    // resources or some sort of important state (such as a FileStream or a
+    // network connection) to provide a Close or Dispose method so users can
+    // run clean up code deterministically.  We have formalized this into an
+    // interface with one method.  Classes may privately implement IDisposable and
+    // provide a Close method instead, if that name is by far the expected name
+    // for objects in that domain (ie, you don't Dispose of a FileStream, you Close
+    // it).
+    //
+    // This interface could be theoretically used as a marker by a compiler to
+    // ensure a disposable object has been cleaned up along all code paths if it's
+    // been allocated in that method, though in practice any compiler that
+    // draconian may tick off any number of people.  Perhaps an external tool (like
+    // like Purify or BoundsChecker) could do this.  Instead, C# has added a using
+    // clause, which will generate a try/finally statement where the resource
+    // passed into the using clause will always have its Dispose method called.
+    // Syntax is using(FileStream fs = ...) { .. };
+    //
+    // Dispose should meet the following conditions:
+    // 1) Be safely callable multiple times
+    // 2) Release any resources associated with the instance
+    // 3) Call the base class's Dispose method, if necessary
+    // 4) Suppress finalization of this class to help the GC by reducing the
+    //    number of objects on the finalization queue.
+    // 5) Dispose shouldn't generally throw exceptions, except for very serious
+    //    errors that are particularly unexpected. (ie, OutOfMemoryException)
+    //    Ideally, nothing should go wrong with your object by calling Dispose.
+    //
+    // If possible, a class should define a finalizer that calls Dispose.
+    // However, in many situations, this is impractical.  For instance, take the
+    // classic example of a Stream and a StreamWriter (which has an internal
+    // buffer of data to write to the Stream).  If both objects are collected
+    // before Close or Dispose has been called on either, then the GC may run the
+    // finalizer for the Stream first, before the StreamWriter.  At that point, any
+    // data buffered by the StreamWriter cannot be written to the Stream.  In this
+    // case, it doesn't make much sense to provide a finalizer on the StreamWriter
+    // since you cannot solve this problem correctly.
+    //| <include path='docs/doc[@for="IDisposable"]/*' />
+    public interface IDisposable {
+        //| <include path='docs/doc[@for="IDisposable.Dispose"]/*' />
+        void Dispose();
+    }
+}
diff --git a/base/Kernel/System/IFormattable.cs b/base/Kernel/System/IFormattable.cs
new file mode 100644
index 0000000..5a8fd65
--- /dev/null
+++ b/base/Kernel/System/IFormattable.cs
@@ -0,0 +1,15 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    //| <include path='docs/doc[@for="IFormattable"]/*' />
+    public interface IFormattable
+    {
+        //| <include path='docs/doc[@for="IFormattable.ToString"]/*' />
+        String ToString(String format);
+    }
+}
diff --git a/base/Kernel/System/IndexOutOfRangeException.cs b/base/Kernel/System/IndexOutOfRangeException.cs
new file mode 100644
index 0000000..5bf2f1a
--- /dev/null
+++ b/base/Kernel/System/IndexOutOfRangeException.cs
@@ -0,0 +1,40 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: IndexOutOfRangeException
+**
+**
+** Purpose: Exception class for invalid array indices.
+**
+** Date: March 24, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="IndexOutOfRangeException"]/*' />
+    [RequiredByBartok]
+    public sealed class IndexOutOfRangeException : SystemException {
+        //| <include path='docs/doc[@for="IndexOutOfRangeException.IndexOutOfRangeException"]/*' />
+        public IndexOutOfRangeException()
+            : base("Arg_IndexOutOfRangeException") {
+        }
+
+        //| <include path='docs/doc[@for="IndexOutOfRangeException.IndexOutOfRangeException1"]/*' />
+        public IndexOutOfRangeException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="IndexOutOfRangeException.IndexOutOfRangeException2"]/*' />
+        public IndexOutOfRangeException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Int16.cs b/base/Kernel/System/Int16.cs
new file mode 100644
index 0000000..eb45e48
--- /dev/null
+++ b/base/Kernel/System/Int16.cs
@@ -0,0 +1,124 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Int16.cool
+**
+**
+** Purpose: This class will encapsulate a short and provide an
+**          Object representation of it.
+**
+** Date:  August 3, 1998
+**
+===========================================================*/
+
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    //| <include path='docs/doc[@for="Int16"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Int16 : IComparable, IFormattable
+    {
+        internal short m_value;
+
+        //| <include path='docs/doc[@for="Int16.MaxValue"]/*' />
+        public const short MaxValue = (short)0x7FFF;
+        //| <include path='docs/doc[@for="Int16.MinValue"]/*' />
+        public const short MinValue = unchecked((short)0x8000);
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type Int16, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Int16.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+
+            if (value is Int16) {
+                return m_value - ((Int16)value).m_value;
+            }
+
+            throw new ArgumentException("Arg_MustBeInt16");
+        }
+
+        //| <include path='docs/doc[@for="Int16.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Int16)) {
+                return false;
+            }
+            return m_value == ((Int16)obj).m_value;
+        }
+
+        // Returns a HashCode for the Int16
+        //| <include path='docs/doc[@for="Int16.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return ((int)((ushort)m_value) | (((int)m_value) << 16));
+        }
+
+
+        //| <include path='docs/doc[@for="Int16.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="Int16.ToString2"]/*' />
+        public String ToString(String format) {
+            if (m_value<0 && format!=null && format.Length>0 && (format[0]=='X' || format[0]=='x')) {
+                uint temp = (uint)(m_value & 0x0000FFFF);
+                return Number.FormatUInt32(temp,format);
+            }
+            return Number.FormatInt32(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="Int16.Parse"]/*' />
+        public static short Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        //| <include path='docs/doc[@for="Int16.Parse3"]/*' />
+        public static short Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+
+            int i = Number.ParseInt32(s, style);
+
+            // We need this check here since we don't allow signs to specified in hex numbers. So we fixup the result
+            // for negative numbers
+            if (((style & NumberStyles.AllowHexSpecifier) != 0) && (i <= UInt16.MaxValue)) // We are parsing a hexadecimal number
+                return (short)i;
+
+            if (i < MinValue || i > MaxValue) throw new OverflowException("Overflow_Int16");
+            return (short)i;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Int16.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.Int16;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/Int32.cs b/base/Kernel/System/Int32.cs
new file mode 100644
index 0000000..6a5aacd
--- /dev/null
+++ b/base/Kernel/System/Int32.cs
@@ -0,0 +1,119 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Int32
+**
+**
+** Purpose: A representation of a 32 bit 2's complement
+**          integer.
+**
+** Date: July 23, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    //| <include path='docs/doc[@for="Int32"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Int32 : IComparable, IFormattable
+    {
+        internal int m_value;
+
+        //| <include path='docs/doc[@for="Int32.MaxValue"]/*' />
+        public const int MaxValue = 0x7fffffff;
+        //| <include path='docs/doc[@for="Int32.MinValue"]/*' />
+        public const int MinValue = unchecked((int)0x80000000);
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this < object, equal to zero
+        // if this == object, and greater than one if this > object.
+        // null is considered to be less than any instance.
+        // If object is not of type Int32, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Int32.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is Int32) {
+                // Need to use compare because subtraction will wrap
+                // to positive for very large neg numbers, etc.
+                int i = (int)value;
+                if (m_value < i) return -1;
+                if (m_value > i) return 1;
+                return 0;
+            }
+            throw new ArgumentException ("Arg_MustBeInt32");
+        }
+
+        //| <include path='docs/doc[@for="Int32.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Int32)) {
+                return false;
+            }
+            return m_value == ((Int32)obj).m_value;
+        }
+
+        // The absolute value of the int contained.
+        //| <include path='docs/doc[@for="Int32.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return m_value;
+        }
+
+
+        //| <include path='docs/doc[@for="Int32.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="Int32.ToString2"]/*' />
+        public String ToString(String format) {
+            return Number.FormatInt32(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="Int32.Parse"]/*' />
+        public static int Parse(String s) {
+            return Number.ParseInt32(s, NumberStyles.Integer);
+        }
+
+        // Parses an integer from a String in the given style.  If
+        // a NumberFormatInfo isn't specified, the current culture's
+        // NumberFormatInfo is assumed.
+        //
+        //| <include path='docs/doc[@for="Int32.Parse3"]/*' />
+        public static int Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            return Number.ParseInt32(s, style);
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Int32.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.Int32;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/Int64.cs b/base/Kernel/System/Int64.cs
new file mode 100644
index 0000000..c10d2aa
--- /dev/null
+++ b/base/Kernel/System/Int64.cs
@@ -0,0 +1,117 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Int64.cool
+**
+**
+** Purpose: This class will encapsulate a long and provide an
+**          Object representation of it.
+**
+** Date:  August 3, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    //| <include path='docs/doc[@for="Int64"]/*' />
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Int64 : IComparable, IFormattable
+    {
+        internal long m_value;
+
+        //| <include path='docs/doc[@for="Int64.MaxValue"]/*' />
+        public const long MaxValue = 0x7fffffffffffffffL;
+        //| <include path='docs/doc[@for="Int64.MinValue"]/*' />
+        public const long MinValue = unchecked((long)0x8000000000000000L);
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type Int64, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Int64.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is Int64) {
+                // Need to use compare because subtraction will wrap
+                // to positive for very large neg numbers, etc.
+                long i = (long)value;
+                if (m_value < i) return -1;
+                if (m_value > i) return 1;
+                return 0;
+            }
+            throw new ArgumentException ("Arg_MustBeInt64");
+        }
+
+        //| <include path='docs/doc[@for="Int64.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Int64)) {
+                return false;
+            }
+            return m_value == ((Int64)obj).m_value;
+        }
+
+        // The value of the lower 32 bits XORed with the upper 32 bits.
+        //| <include path='docs/doc[@for="Int64.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return ((int)m_value ^ (int)(m_value >> 32));
+        }
+
+        //| <include path='docs/doc[@for="Int64.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="Int64.ToString2"]/*' />
+        public String ToString(String format) {
+            return Number.FormatInt64(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="Int64.Parse"]/*' />
+        public static long Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        // Parses a long from a String in the given style.  If
+        // a NumberFormatInfo isn't specified, the current culture's
+        // NumberFormatInfo is assumed.
+        //
+        //| <include path='docs/doc[@for="Int64.Parse3"]/*' />
+        public static long Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            return Number.ParseInt64(s, style);
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Int64.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.Int64;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/IntPtr.cs b/base/Kernel/System/IntPtr.cs
new file mode 100644
index 0000000..38df30c
--- /dev/null
+++ b/base/Kernel/System/IntPtr.cs
@@ -0,0 +1,158 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  IntPtr
+**
+**
+** Purpose: Platform neutral integer
+**
+** Date: July 21, 2000
+**
+===========================================================*/
+
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="IntPtr"]/*' />
+    [NoCCtor]
+    public struct IntPtr
+    {
+        unsafe private void* m_value; // The compiler treats void* closest to uint hence explicit casts are required to preserve int behavior
+
+        //| <include path='docs/doc[@for="IntPtr.Zero"]/*' />
+        [Intrinsic]
+        public static readonly IntPtr Zero;
+
+        //| <include path='docs/doc[@for="IntPtr.Size"]/*' />
+        [Intrinsic]
+        public static readonly int Size;
+
+        //| <include path='docs/doc[@for="IntPtr.IntPtr"]/*' />
+        [Intrinsic]
+        public extern IntPtr(int value);
+
+        //| <include path='docs/doc[@for="IntPtr.IntPtr1"]/*' />
+        [Intrinsic]
+        public extern IntPtr(long value);
+
+        //| <include path='docs/doc[@for="IntPtr.IntPtr2"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        public extern unsafe IntPtr(void* value);
+
+        //| <include path='docs/doc[@for="IntPtr.Equals"]/*' />
+        public unsafe override bool Equals(Object obj)
+        {
+            if (obj is IntPtr) {
+                return (m_value == ((IntPtr)obj).m_value);
+            }
+            return false;
+        }
+
+        //| <include path='docs/doc[@for="IntPtr.GetHashCode"]/*' />
+        public unsafe override int GetHashCode()
+        {
+            return (int)m_value;
+        }
+
+        //| <include path='docs/doc[@for="IntPtr.ToInt32"]/*' />
+        [Intrinsic]
+        public extern int ToInt32();
+
+        //| <include path='docs/doc[@for="IntPtr.ToInt64"]/*' />
+        [Intrinsic]
+        public extern long ToInt64();
+
+        //| <include path='docs/doc[@for="IntPtr.ToString"]/*' />
+        [Inline]
+        public unsafe override String ToString()
+        {
+            if(sizeof(IntPtr) == 4) {
+                return this.ToInt32().ToString();
+            }
+            return this.ToInt64().ToString();
+        }
+
+        //| <include path='docs/doc[@for="IntPtr.operatorvoidMUL"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        public extern static unsafe explicit operator void* (IntPtr value);
+
+        [CLSCompliant(false)] //
+        [Intrinsic]
+        public extern static explicit operator UIntPtr (IntPtr value);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorIntPtr"]/*' />
+        [Intrinsic]
+        public extern static explicit operator IntPtr (int value);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorIntPtr1"]/*' />
+        [Intrinsic]
+        public extern static explicit operator IntPtr (long value);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorIntPtr2"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        public extern static unsafe explicit operator IntPtr (void* value);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorint"]/*' />
+        [Intrinsic]
+        public extern static explicit operator int (IntPtr value);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorlong"]/*' />
+        [Intrinsic]
+        public extern static explicit operator long (IntPtr value);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorEQ"]/*' />
+        [Intrinsic]
+        public extern static bool operator == (IntPtr value1, IntPtr value2);
+
+        //| <include path='docs/doc[@for="IntPtr.operatorNE"]/*' />
+        [Intrinsic]
+        public extern static bool operator != (IntPtr value1, IntPtr value2);
+
+        //| <include path='docs/doc[@for="IntPtr.ToPointer"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        public extern unsafe void* ToPointer();
+
+        [Intrinsic]
+        public extern static IntPtr operator - (IntPtr value1, IntPtr value2);
+
+        [Intrinsic]
+        public extern static IntPtr operator - (IntPtr value1, int value2);
+
+        [Intrinsic]
+        public extern static IntPtr operator -- (IntPtr value);
+
+        [CLSCompliant(false)] //
+        [Intrinsic]
+        public extern static unsafe sbyte * operator + (sbyte* value1,
+                                                        IntPtr value2);
+
+        [Intrinsic]
+        public extern static IntPtr operator + (IntPtr value1, IntPtr value2);
+
+        [Intrinsic]
+        public extern static IntPtr operator ++ (IntPtr value);
+
+        [Intrinsic]
+        public extern static bool operator < (IntPtr value1, IntPtr value2);
+
+        [Intrinsic]
+        public extern static bool operator > (IntPtr value1, IntPtr value2);
+
+        [Intrinsic]
+        public extern static bool operator <= (IntPtr value1, IntPtr value2);
+
+        [Intrinsic]
+        public extern static bool operator >= (IntPtr value1, IntPtr value2);
+    }
+}
diff --git a/base/Kernel/System/Internal.cs b/base/Kernel/System/Internal.cs
new file mode 100644
index 0000000..7ac9747
--- /dev/null
+++ b/base/Kernel/System/Internal.cs
@@ -0,0 +1,19 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** This file exists to contain module-level custom attributes
+**  for the BCL.
+**
+**
+** Date:  March 9, 2000
+**
+===========================================================*/
+using System.Runtime.InteropServices;
+
+[assembly:Guid("BED7F4EA-1A96-11d2-8F08-00A0C9A6186D")]
+[assembly:System.CLSCompliantAttribute(true)]
+[assembly:System.Reflection.AssemblyDescriptionAttribute("Common Language Runtime Library")]
diff --git a/base/Kernel/System/InvalidCastException.cs b/base/Kernel/System/InvalidCastException.cs
new file mode 100644
index 0000000..fa8f9ad
--- /dev/null
+++ b/base/Kernel/System/InvalidCastException.cs
@@ -0,0 +1,39 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: InvalidCastException
+**
+**
+** Purpose: Exception class for bad cast conditions!
+**
+** Date: March 17, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="InvalidCastException"]/*' />
+    public class InvalidCastException : SystemException {
+        //| <include path='docs/doc[@for="InvalidCastException.InvalidCastException"]/*' />
+        public InvalidCastException()
+            : base("Arg_InvalidCastException") {
+        }
+
+        //| <include path='docs/doc[@for="InvalidCastException.InvalidCastException1"]/*' />
+        public InvalidCastException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="InvalidCastException.InvalidCastException2"]/*' />
+        public InvalidCastException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/InvalidOperationException.cs b/base/Kernel/System/InvalidOperationException.cs
new file mode 100644
index 0000000..c4c5fe8
--- /dev/null
+++ b/base/Kernel/System/InvalidOperationException.cs
@@ -0,0 +1,40 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: InvalidOperationException
+**
+**
+** Purpose: Exception class for denoting an object was in a state that
+** made calling a method illegal.
+**
+** Date: March 24, 1999
+**
+=============================================================================*/
+namespace System {
+
+    using System;
+
+    //| <include path='docs/doc[@for="InvalidOperationException"]/*' />
+    public class InvalidOperationException : SystemException
+    {
+        //| <include path='docs/doc[@for="InvalidOperationException.InvalidOperationException"]/*' />
+        public InvalidOperationException()
+            : base("Arg_InvalidOperationException") {
+        }
+
+        //| <include path='docs/doc[@for="InvalidOperationException.InvalidOperationException1"]/*' />
+        public InvalidOperationException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="InvalidOperationException.InvalidOperationException2"]/*' />
+        public InvalidOperationException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
+
diff --git a/base/Kernel/System/Math.cs b/base/Kernel/System/Math.cs
new file mode 100644
index 0000000..7d9a92c
--- /dev/null
+++ b/base/Kernel/System/Math.cs
@@ -0,0 +1,622 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Math
+**
+**
+** Purpose: Some floating-point math operations
+**
+** Date:  July 8, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    //| <include path='docs/doc[@for="Math"]/*' />
+    [CCtorIsRunDuringStartup]
+    public sealed class Math {
+
+        // Prevent from begin created
+        private Math() {}
+
+        //| <include path='docs/doc[@for="Math.PI"]/*' />
+        public const double PI = 3.14159265358979323846;
+        //| <include path='docs/doc[@for="Math.E"]/*' />
+        public const double E  = 2.7182818284590452354;
+
+
+        //| <include path='docs/doc[@for="Math.Acos"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Acos(double d);
+
+        //| <include path='docs/doc[@for="Math.Asin"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Asin(double d);
+
+        //| <include path='docs/doc[@for="Math.Atan"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Atan(double d);
+
+        //| <include path='docs/doc[@for="Math.Atan2"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Atan2(double y, double x);
+
+        //| <include path='docs/doc[@for="Math.Cos"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Cos(double d);
+
+        //| <include path='docs/doc[@for="Math.Sin"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Sin(double a);
+
+        //| <include path='docs/doc[@for="Math.Tan"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Tan(double a);
+
+        //| <include path='docs/doc[@for="Math.Cosh"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(512)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Cosh(double value);
+
+        //| <include path='docs/doc[@for="Math.Sinh"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(512)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Sinh(double value);
+
+        //| <include path='docs/doc[@for="Math.Tanh"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(256)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Tanh(double value);
+
+        //| <include path='docs/doc[@for="Math.Round"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Round(double a);
+
+        private static double NegativeZero
+        = BitConverter.UInt64BitsToDouble(0x8000000000000000);
+
+        private const int maxRoundingDigits = 15;
+        //| <include path='docs/doc[@for="Math.Round2"]/*' />
+        public static double Round(double value, int digits)
+        {
+            if ((digits < 0) || (digits > maxRoundingDigits)) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_RoundingDigits");
+            }
+            return InternalRound(value,digits);
+        }
+
+        private static double InternalRound(double d, int digits) {
+            // rusa: see also Lightning\Src\ClassLibNative\Float\COMFloat.cpp::RoundDigits
+            // Managed code ensures that (digits >= 0 && digits <= 15)
+            if (Abs(d) < 1E16) {
+                d *= dblPower10[digits];
+                // There is a short x86 code sequence for the Round operation
+                // __asm {
+                //     fld d;
+                //     frndint
+                //     fstp d;
+                // }
+                d = Round(d);
+                d /= dblPower10[digits];
+            }
+            return d;
+        }
+
+        private static readonly double[] dblPower10 = new double[16] {
+            1E0, 1E1, 1E2, 1E3, 1E4, 1E5, 1E6, 1E7, 1E8,
+            1E9, 1E10, 1E11, 1E12, 1E13, 1E14, 1E15
+        };
+
+        //| <include path='docs/doc[@for="Math.Round1"]/*' />
+        public static Decimal Round(Decimal d)
+        {
+            return Decimal.Round(d,0);
+        }
+
+        //| <include path='docs/doc[@for="Math.Round3"]/*' />
+        public static Decimal Round(Decimal d, int decimals)
+        {
+            return Decimal.Round(d,decimals);
+        }
+
+        //| <include path='docs/doc[@for="Math.Ceiling"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Ceiling(double a);
+
+        //| <include path='docs/doc[@for="Math.Floor"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Floor(double d);
+
+        //| <include path='docs/doc[@for="Math.Sqrt"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Sqrt(double d);
+
+        //| <include path='docs/doc[@for="Math.Log"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Log(double d);
+
+        //| <include path='docs/doc[@for="Math.Log10"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Log10(double d);
+
+        //| <include path='docs/doc[@for="Math.Exp"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Exp(double d);
+
+        //| <include path='docs/doc[@for="Math.Pow"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Pow(double x, double y);
+
+        //| <include path='docs/doc[@for="Math.Mod"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        public static extern double Mod(double x, double y);
+
+        //| <include path='docs/doc[@for="Math.IEEERemainder"]/*' />
+        [GCAnnotation(GCOption.NOGC)]
+        public static double IEEERemainder(double x, double y)
+        {
+            double val = (x - (y * (Math.Round(x / y))));
+            if (val == 0) {
+                if (x < 0) {
+                    return NegativeZero; // this can be turned into a static if people like
+                }
+            }
+            return val;
+        }
+
+        /*================================Abs=========================================
+        **Returns the absolute value of its argument.
+        ============================================================================*/
+        //| <include path='docs/doc[@for="Math.Abs"]/*' />
+        [CLSCompliant(false)]
+        public static sbyte Abs(sbyte value) {
+            if (value >= 0) {
+                return value;
+            }
+            else {
+                return AbsHelper(value);
+            }
+        }
+
+        private static sbyte AbsHelper(sbyte value)
+        {
+            if (value < 0) {
+                if (value == SByte.MinValue) {
+                    throw new OverflowException("Overflow_NegateTwosCompNum");
+                }
+                return ((sbyte)(-value));
+            }
+            return value;
+        }
+
+        //| <include path='docs/doc[@for="Math.Abs1"]/*' />
+        public static short Abs(short value) {
+            if (value >= 0) {
+                return value;
+            }
+            else {
+                return AbsHelper(value);
+            }
+        }
+
+        private static short AbsHelper(short value) {
+            if (value < 0) {
+                if (value == Int16.MinValue) {
+                    throw new OverflowException("Overflow_NegateTwosCompNum");
+                }
+                return (short) -value;
+            }
+            return value;
+        }
+
+        //| <include path='docs/doc[@for="Math.Abs2"]/*' />
+        public static int Abs(int value) {
+            if (value >= 0) {
+                return value;
+            }
+            else {
+                return AbsHelper(value);
+            }
+        }
+
+        private static int AbsHelper(int value) {
+            if (value < 0) {
+                if (value == Int32.MinValue) {
+                    throw new OverflowException("Overflow_NegateTwosCompNum");
+                }
+                return -value;
+            }
+            return value;
+        }
+
+        //| <include path='docs/doc[@for="Math.Abs3"]/*' />
+        public static long Abs(long value) {
+            if (value >= 0) {
+                return value;
+            }
+            else {
+                return AbsHelper(value);
+            }
+        }
+
+        private static long AbsHelper(long value) {
+            if (value < 0) {
+                if (value == Int64.MinValue) {
+                    throw new OverflowException("Overflow_NegateTwosCompNum");
+                }
+                return -value;
+            }
+            return value;
+        }
+
+        //| <include path='docs/doc[@for="Math.Abs4"]/*' />
+        [Intrinsic]
+        extern public static float Abs(float value);
+        // This is special code to handle NaN (We need to make sure NaN's aren't
+        // negated).  In Cool, the else clause here should always be taken if
+        // value is NaN, since the normal case is taken if and only if value < 0.
+        // To illustrate this completely, a compiler has translated this into:
+        // "load value; load 0; bge; ret -value ; ret value".
+        // The bge command branches for comparisons with the unordered NaN.  So
+        // it runs the else case, which returns +value instead of negating it.
+        //  return (value < 0) ? -value : value;
+
+        //| <include path='docs/doc[@for="Math.Abs5"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [StackBound(128)]
+        [AccessedByRuntime("output to header : defined in Math.cpp")]
+        extern public static double Abs(double value);
+        // This is special code to handle NaN (We need to make sure NaN's aren't
+        // negated).  In Cool, the else clause here should always be taken if
+        // value is NaN, since the normal case is taken if and only if value < 0.
+        // To illustrate this completely, a compiler has translated this into:
+        // "load value; load 0; bge; ret -value ; ret value".
+        // The bge command branches for comparisons with the unordered NaN.  So
+        // it runs the else case, which returns +value instead of negating it.
+        // return (value < 0) ? -value : value;
+
+        //| <include path='docs/doc[@for="Math.Abs6"]/*' />
+        public static Decimal Abs(Decimal value)
+        {
+            return Decimal.Abs(value);
+        }
+
+        /*================================MAX=========================================
+        **Returns the larger of val1 and val2
+        ============================================================================*/
+        //| <include path='docs/doc[@for="Math.Max"]/*' />
+        [CLSCompliant(false)]
+        public static sbyte Max(sbyte val1, sbyte val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max1"]/*' />
+        public static byte Max(byte val1, byte val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max2"]/*' />
+        public static short Max(short val1, short val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max3"]/*' />
+        [CLSCompliant(false)]
+        public static ushort Max(ushort val1, ushort val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max4"]/*' />
+        public static int Max(int val1, int val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max5"]/*' />
+        [CLSCompliant(false)]
+        public static uint Max(uint val1, uint val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max6"]/*' />
+        public static long Max(long val1, long val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max7"]/*' />
+        [CLSCompliant(false)]
+        public static ulong Max(ulong val1, ulong val2) {
+            return (val1 >= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max8"]/*' />
+        public static float Max(float val1, float val2) {
+            if (val1 > val2) {
+                return val1;
+            }
+            if (Single.IsNaN(val1)) {
+                return val1;
+            }
+            return val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max9"]/*' />
+        public static double Max(double val1, double val2) {
+            if (val1 > val2) {
+                return val1;
+            }
+            if (Double.IsNaN(val1)) {
+                return val1;
+            }
+            return val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Max10"]/*' />
+        public static Decimal Max(Decimal val1, Decimal val2) {
+            return Decimal.Max(val1, val2);
+        }
+
+        /*================================MIN=========================================
+        **Returns the smaller of val1 and val2.
+        ============================================================================*/
+        //| <include path='docs/doc[@for="Math.Min"]/*' />
+        [CLSCompliant(false)]
+        public static sbyte Min(sbyte val1, sbyte val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min1"]/*' />
+        public static byte Min(byte val1, byte val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min2"]/*' />
+        public static short Min(short val1, short val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min3"]/*' />
+        [CLSCompliant(false)]
+        public static ushort Min(ushort val1, ushort val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min4"]/*' />
+        public static int Min(int val1, int val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min5"]/*' />
+        [CLSCompliant(false)]
+        public static uint Min(uint val1, uint val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min6"]/*' />
+        public static long Min(long val1, long val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min7"]/*' />
+        [CLSCompliant(false)]
+        public static ulong Min(ulong val1, ulong val2) {
+            return (val1 <= val2) ? val1 : val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min8"]/*' />
+        public static float Min(float val1, float val2) {
+            if (val1 < val2) {
+                return val1;
+            }
+            if (Single.IsNaN(val1)) {
+                return val1;
+            }
+            return val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min9"]/*' />
+        public static double Min(double val1, double val2) {
+            if (val1 < val2) {
+                return val1;
+            }
+            if (Double.IsNaN(val1)) {
+                return val1;
+            }
+            return val2;
+        }
+
+        //| <include path='docs/doc[@for="Math.Min10"]/*' />
+        public static Decimal Min(Decimal val1, Decimal val2) {
+            return Decimal.Min(val1, val2);
+        }
+
+        /*=====================================Log======================================
+        **
+        ==============================================================================*/
+        //| <include path='docs/doc[@for="Math.Log1"]/*' />
+        public static double Log(double a, double newBase) {
+            return (Log(a) / Log(newBase));
+        }
+
+        // Sign function for VB.  Returns -1, 0, or 1 if the sign of the number
+        // is negative, 0, or positive.  Throws for floating point NaN's.
+        //| <include path='docs/doc[@for="Math.Sign"]/*' />
+        [CLSCompliant(false)]
+        public static int Sign(sbyte value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        // Sign function for VB.  Returns -1, 0, or 1 if the sign of the number
+        // is negative, 0, or positive.  Throws for floating point NaN's.
+        //| <include path='docs/doc[@for="Math.Sign1"]/*' />
+        public static int Sign(short value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        // Sign function for VB.  Returns -1, 0, or 1 if the sign of the number
+        // is negative, 0, or positive.  Throws for floating point NaN's.
+        //| <include path='docs/doc[@for="Math.Sign2"]/*' />
+        public static int Sign(int value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Math.Sign3"]/*' />
+        public static int Sign(long value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Math.Sign4"]/*' />
+        public static int Sign(float value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else if (value == 0) {
+                return 0;
+            }
+            throw new ArithmeticException("Arithmetic_NaN");
+        }
+
+        //| <include path='docs/doc[@for="Math.Sign5"]/*' />
+        public static int Sign(double value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else if (value == 0) {
+                return 0;
+            }
+            throw new ArithmeticException("Arithmetic_NaN");
+        }
+
+        //| <include path='docs/doc[@for="Math.Sign6"]/*' />
+        public static int Sign(Decimal value)
+        {
+            if (value < 0) {
+                return -1;
+            }
+            else if (value > 0) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Math.BigMul"]/*' />
+        public static long BigMul(int a, int b) {
+            return ((long)a) * b;
+        }
+
+        //| <include path='docs/doc[@for="Math.DivRem"]/*' />
+        public static int DivRem(int a, int b, out int result) {
+            result = a % b;
+            return a / b;
+        }
+
+        //| <include path='docs/doc[@for="Math.DivRem1"]/*' />
+        public static long DivRem(long a, long b, out long result) {
+            result = a % b;
+            return a / b;
+        }
+    }
+}
diff --git a/base/Kernel/System/MulticastDelegate.cs b/base/Kernel/System/MulticastDelegate.cs
new file mode 100644
index 0000000..feafba2
--- /dev/null
+++ b/base/Kernel/System/MulticastDelegate.cs
@@ -0,0 +1,194 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+    using System;
+    using System.Reflection;
+
+    //| <include path='docs/doc[@for="MulticastDelegate"]/*' />
+    public abstract class MulticastDelegate : Delegate
+    {
+        // This is a pointer to a delegate that is logically the
+        //  delegate before this one.
+        [System.Runtime.CompilerServices.RequiredByBartok]
+        private MulticastDelegate _prev;
+
+        internal MulticastDelegate Previous
+        {
+            get{return _prev;}
+            set{_prev = value;}
+        }
+
+        // equals returns true IIF the delegate is not null and has the
+        //  same target, method and invocation list as this object
+        //| <include path='docs/doc[@for="MulticastDelegate.Equals"]/*' />
+        public override sealed bool Equals(Object obj)
+        {
+            if (!base.Equals(obj))
+                return false;
+            if (_prev != null)
+                return _prev.InvocationListEquals(((MulticastDelegate) obj)._prev);
+            else
+            {   // if we got here, "this" is a Multicast with only one listener.
+                if (obj is MulticastDelegate)
+                    return ((MulticastDelegate)obj)._prev == null;
+                else if (obj is Delegate)
+                    return true;
+                else
+                    return false;
+            }
+        }
+
+        // Recursive function which will check for equality of the invocation list.
+        private bool InvocationListEquals(MulticastDelegate d)
+        {
+            if (!base.Equals(d))
+                return false;
+            if (_prev == d._prev)
+                return true;
+            if (_prev == null)
+                return (d._prev == null) ? true : false;
+            return _prev.InvocationListEquals(d._prev);
+        }
+
+        // This method will combine this delegate with the passed delegate
+        //  to form a new delegate.
+        //| <include path='docs/doc[@for="MulticastDelegate.CombineImpl"]/*' />
+        protected override sealed Delegate CombineImpl(Delegate follow)
+        {
+                    // Verify that the types are the same...
+            if (this.GetType() != follow.GetType())
+                throw new ArgumentException("Arg_DlgtTypeMis");
+
+            // We always clone the delegate because this delegate is
+            //  not changed by combine and remove.  We can safely tack
+            //  the follow delegate onto the end of the copy.
+            MulticastDelegate d = (MulticastDelegate) ((MulticastDelegate) follow).MemberwiseClone();
+            MulticastDelegate root = d;
+            while (d._prev != null) {
+                d._prev = (MulticastDelegate) d._prev.MemberwiseClone();
+                d = d._prev;
+            }
+            d._prev = (MulticastDelegate) this;
+            return root;
+        }
+
+        // This method currently looks backward on the invocation list
+        //  for an element that has Delegate based equality with value.  (Doesn't
+        //  look at the invocation list.)  If this is found we remove it from
+        //  this list and return a new delegate.  If its not found a copy of the
+        //  current list is returned.
+        //| <include path='docs/doc[@for="MulticastDelegate.RemoveImpl"]/*' />
+        protected override sealed Delegate RemoveImpl(Delegate value)
+        {
+            // There is a special case were we are removing using a delegate as
+            //  the value we need to check for this case
+            //
+            if (!(value is MulticastDelegate)) {
+                if (base.Equals(value))
+                    return _prev;
+                return this;
+            }
+
+            // Look for the delegate...
+            MulticastDelegate v = (MulticastDelegate) value;
+            if (InternalEquals(v)) {
+                int size = v.DelSize();
+                MulticastDelegate p = _prev;
+                while (--size != 0)
+                    p = p._prev;
+                return p;
+            }
+
+            MulticastDelegate d = (MulticastDelegate) this.MemberwiseClone();
+            MulticastDelegate root = d;
+            while (d._prev != null && d._prev.InternalEquals(v) != true) {
+                d._prev = (MulticastDelegate) d._prev.MemberwiseClone();
+                d = d._prev;
+            }
+
+            if (d._prev != null) {
+                int size = v.DelSize();
+                MulticastDelegate p = d._prev._prev;
+                while (--size != 0)
+                    p = p._prev;
+                d._prev = p;
+            }
+            return root;
+        }
+        private int DelSize()
+        {
+            int i=0;
+            MulticastDelegate d = this;
+            while (d != null) {
+                i++;
+                d = d._prev;
+            }
+            return i;
+        }
+
+
+        // Stupid helper function to check equality based upon the super class.
+        private bool InternalEquals(Delegate d)
+        {
+            if (!base.Equals(d))
+                return false;
+            if (((MulticastDelegate) d)._prev != null) {
+                if (_prev == null)
+                    return false;
+                return _prev.InternalEquals(((MulticastDelegate) d)._prev);
+            }
+            return true;
+        }
+
+
+        // This method returns the Invocation list of this multicast delegate.
+        //| <include path='docs/doc[@for="MulticastDelegate.GetInvocationList"]/*' />
+        public override sealed Delegate[] GetInvocationList() {
+            int i = 0;
+            MulticastDelegate p;
+
+            // How big is the invocation list?
+            for (p = this; p != null; p = p._prev)
+                i++;
+
+            // Create an array of delegate copies and each
+            //  element into the array (Need to reverse the order and make sure
+            //  we set the _prev to null.
+            Delegate[] del = new Delegate[i];
+            for (p = this; p != null; p = p._prev) {
+                del[--i] = (Delegate) p.MemberwiseClone();
+                ((MulticastDelegate) del[i])._prev = null;
+            }
+            return del;
+        }
+
+    /*  private static bool operator equals(MulticastDelegate d1, MulticastDelegate d2) {
+            if ((Object)d1 == null)
+                return (Object)d2 == null;
+            return d1.Equals(d2);
+        }*/
+
+        //| <include path='docs/doc[@for="MulticastDelegate.operatorEQ"]/*' />
+        public static bool operator ==(MulticastDelegate d1, MulticastDelegate d2) {
+            if ((Object)d1 == null)
+                return (Object)d2 == null;
+            return d1.Equals(d2);
+        }
+
+        //| <include path='docs/doc[@for="MulticastDelegate.operatorNE"]/*' />
+        public static bool operator !=(MulticastDelegate d1, MulticastDelegate d2) {
+            if ((Object)d1 == null)
+                return (Object)d2 != null;
+            return !d1.Equals(d2);
+        }
+
+        //| <include path='docs/doc[@for="MulticastDelegate.GetHashCode"]/*' />
+        public override sealed int GetHashCode() {
+            return base.GetHashCode();
+        }
+
+    }
+}
diff --git a/base/Kernel/System/MulticastNotSupportedException.cs b/base/Kernel/System/MulticastNotSupportedException.cs
new file mode 100644
index 0000000..1fbd40e
--- /dev/null
+++ b/base/Kernel/System/MulticastNotSupportedException.cs
@@ -0,0 +1,33 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+// MulticastNotSupportedException
+// This is thrown when you add multiple callbacks to a non-multicast delegate.
+////////////////////////////////////////////////////////////////////////////////
+
+namespace System {
+
+    using System;
+
+    //| <include path='docs/doc[@for="MulticastNotSupportedException"]/*' />
+    public sealed class MulticastNotSupportedException : SystemException {
+
+        //| <include path='docs/doc[@for="MulticastNotSupportedException.MulticastNotSupportedException"]/*' />
+        public MulticastNotSupportedException()
+            : base("Arg_MulticastNotSupportedException") {
+        }
+
+        //| <include path='docs/doc[@for="MulticastNotSupportedException.MulticastNotSupportedException1"]/*' />
+        public MulticastNotSupportedException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="MulticastNotSupportedException.MulticastNotSupportedException2"]/*' />
+        public MulticastNotSupportedException(String message, Exception inner)
+            : base(message, inner) {
+        }
+    }
+}
diff --git a/base/Kernel/System/NotSupportedException.cs b/base/Kernel/System/NotSupportedException.cs
new file mode 100644
index 0000000..bc5cb82
--- /dev/null
+++ b/base/Kernel/System/NotSupportedException.cs
@@ -0,0 +1,39 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: NotSupportedException
+**
+**
+** Purpose: For methods that should be implemented on subclasses.
+**
+** Date: September 28, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+
+    //| <include path='docs/doc[@for="NotSupportedException"]/*' />
+    public class NotSupportedException : SystemException
+    {
+        //| <include path='docs/doc[@for="NotSupportedException.NotSupportedException"]/*' />
+        public NotSupportedException()
+            : base("Arg_NotSupportedException") {
+        }
+
+        //| <include path='docs/doc[@for="NotSupportedException.NotSupportedException1"]/*' />
+        public NotSupportedException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="NotSupportedException.NotSupportedException2"]/*' />
+        public NotSupportedException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/NullReferenceException.cs b/base/Kernel/System/NullReferenceException.cs
new file mode 100644
index 0000000..0bfd435
--- /dev/null
+++ b/base/Kernel/System/NullReferenceException.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: NullReferenceException
+**
+**
+** Purpose: Exception class for dereferencing a null reference.
+**
+** Date: March 17, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="NullReferenceException"]/*' />
+    [RequiredByBartok]
+    public class NullReferenceException : SystemException {
+        //| <include path='docs/doc[@for="NullReferenceException.NullReferenceException"]/*' />
+        [AccessedByRuntime("referenced from halasm.asm")]
+        public NullReferenceException()
+            : base("Arg_NullReferenceException") {
+        }
+
+        //| <include path='docs/doc[@for="NullReferenceException.NullReferenceException1"]/*' />
+        public NullReferenceException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="NullReferenceException.NullReferenceException2"]/*' />
+        public NullReferenceException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Number.cs b/base/Kernel/System/Number.cs
new file mode 100644
index 0000000..c4daef1
--- /dev/null
+++ b/base/Kernel/System/Number.cs
@@ -0,0 +1,2338 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using NumberFormatInfo = System.Globalization.NumberFormatInfo;
+    using NumberStyles = System.Globalization.NumberStyles;
+
+    // The Number class implements methods for formatting and parsing
+    // numeric values. To format and parse numeric values, applications should
+    // use the Format and Parse methods provided by the numeric
+    // classes (Byte, Int16, Int32, Int64,
+    // Single, Double, and Decimal). Those
+    // Format and Parse methods share a common implementation
+    // provided by this class, and are thus documented in detail here.
+    //
+    // Formatting
+    //
+    // The Format methods provided by the numeric classes are all of the
+    // form
+    //
+    //  public static String Format(XXX value, String format);
+    //
+    // where XXX is the name of the particular numeric class. The methods convert
+    // the numeric value to a string using the format string given by the
+    // format parameter. If the format parameter is null or
+    // an empty string, the number is formatted as if the string "G" (general
+    // format) was specified.
+    //
+    // Format strings fall into two categories: Standard format strings and
+    // user-defined format strings. A format string consisting of a single
+    // alphabetic character (A-Z or a-z), optionally followed by a sequence of
+    // digits (0-9), is a standard format string. All other format strings are
+    // used-defined format strings.
+    //
+    // A standard format string takes the form Axx, where A is an
+    // alphabetic character called the format specifier and xx is a
+    // sequence of digits called the precision specifier. The format
+    // specifier controls the type of formatting applied to the number and the
+    // precision specifier controls the number of significant digits or decimal
+    // places of the formatting operation. The following table describes the
+    // supported standard formats.
+    //
+    //
+    // FormatDescription
+    //
+    // DdDecimal format. This format is
+    // supported for integral types only. The number is converted to a string of
+    // decimal digits, prefixed by a minus sign if the number is negative. The
+    // precision specifier indicates the minimum number of digits desired in the
+    // resulting string. If required, the number will be left-padded with zeros to
+    // produce the number of digits given by the precision specifier.
+    //
+    // EeEngineering (scientific) format.
+    // The number is converted to a string of the form
+    // "-d.ddd...E+ddd" or "-d.ddd...e+ddd", where each
+    // 'd' indicates a digit (0-9). The string starts with a minus sign if the
+    // number is negative, and one digit always precedes the decimal point. The
+    // precision specifier indicates the desired number of digits after the decimal
+    // point. If the precision specifier is omitted, a default of 6 digits after
+    // the decimal point is used. The format specifier indicates whether to prefix
+    // the exponent with an 'E' or an 'e'. The exponent is always consists of a
+    // plus or minus sign and three digits.
+    //
+    // FfFixed point format. The number is
+    // converted to a string of the form "-ddd.ddd....", where each
+    // 'd' indicates a digit (0-9). The string starts with a minus sign if the
+    // number is negative. The precision specifier indicates the desired number of
+    // decimal places. If the precision specifier is omitted, the default numeric
+    // precision is used.
+    //
+    // GgGeneral format. The number is
+    // converted to the shortest possible decimal representation using fixed point
+    // or scientific format. The precision specifier determines the number of
+    // significant digits in the resulting string. If the precision specifier is
+    // omitted, the number of significant digits is determined by the type of the
+    // number being converted (10 for int, 19 for long, 7 for
+    // float, 15 for double, and 29 for
+    // Decimal). Trailing zeros after the decimal point are removed, and the
+    // resulting string contains a decimal point only if required. The resulting
+    // string uses fixed point format if the exponent of the number is less than
+    // the number of significant digits and greater than or equal to -4. Otherwise,
+    // the resulting string uses scientific format, and the case of the format
+    // specifier controls whether the exponent is prefixed with an 'E' or an
+    // 'e'.
+    //
+    // NnNumber format. The number is
+    // converted to a string of the form "-d,ddd,ddd.ddd....", where
+    // each 'd' indicates a digit (0-9). The string starts with a minus sign if the
+    // number is negative. Thousand separators are inserted between each group of
+    // three digits to the left of the decimal point. The precision specifier
+    // indicates the desired number of decimal places. If the precision specifier
+    // is omitted, the default numeric precision is used.
+    //
+    // XxHexadecimal format. This format is
+    // supported for integral types only. The number is converted to a string of
+    // hexadecimal digits. The format specifier indicates whether to use upper or
+    // lower case characters for the hexadecimal digits above 9 ('X' for 'ABCDEF',
+    // and 'x' for 'abcdef'). The precision specifier indicates the minimum number
+    // of digits desired in the resulting string. If required, the number will be
+    // left-padded with zeros to produce the number of digits given by the
+    // precision specifier.
+    //
+    //
+    //
+    // Some examples of standard format strings and their results are shown in the
+    // table below.
+    //
+    //
+    // ValueFormatResult
+    // 12345.6789C$12,345.68
+    // -12345.6789C($12,345.68)
+    // 12345D12345
+    // 12345D800012345
+    // 12345.6789E1.234568E+004
+    // 12345.6789E101.2345678900E+004
+    // 12345.6789e41.2346e+004
+    // 12345.6789F12345.68
+    // 12345.6789F012346
+    // 12345.6789F612345.678900
+    // 12345.6789G12345.6789
+    // 12345.6789G712345.68
+    // 123456789G71.234568E8
+    // 12345.6789N12,345.68
+    // 123456789N4123,456,789.0000
+    // 0x2c45ex2c45e
+    // 0x2c45eX2C45E
+    // 0x2c45eX80002C45E
+    //
+    //
+    // Format strings that do not start with an alphabetic character, or that start
+    // with an alphabetic character followed by a non-digit, are called
+    // user-defined format strings. The following table describes the formatting
+    // characters that are supported in user defined format strings.
+    //
+    //
+    // CharacterDescription
+    //
+    // 0Digit placeholder. If the value being
+    // formatted has a digit in the position where the '0' appears in the format
+    // string, then that digit is copied to the output string. Otherwise, a '0' is
+    // stored in that position in the output string. The position of the leftmost
+    // '0' before the decimal point and the rightmost '0' after the decimal point
+    // determines the range of digits that are always present in the output
+    // string.
+    //
+    // #Digit placeholder. If the value being
+    // formatted has a digit in the position where the '#' appears in the format
+    // string, then that digit is copied to the output string. Otherwise, nothing
+    // is stored in that position in the output string.
+    //
+    // .Decimal point. The first '.' character
+    // in the format string determines the location of the decimal separator in the
+    // formatted value; any additional '.' characters are ignored. The actual
+    // character used as a the decimal separator in the output string is given by
+    // the NumberFormatInfo used to format the number.
+    //
+    // ,Thousand separator and number scaling.
+    // The ',' character serves two purposes. First, if the format string contains
+    // a ',' character between two digit placeholders (0 or #) and to the left of
+    // the decimal point if one is present, then the output will have thousand
+    // separators inserted between each group of three digits to the left of the
+    // decimal separator. The actual character used as a the decimal separator in
+    // the output string is given by the NumberFormatInfo used to format the
+    // number. Second, if the format string contains one or more ',' characters
+    // immediately to the left of the decimal point, or after the last digit
+    // placeholder if there is no decimal point, then the number will be divided by
+    // 1000 times the number of ',' characters before it is formatted. For example,
+    // the format string '0,,' will represent 100 million as just 100. Use of the
+    // ',' character to indicate scaling does not also cause the formatted number
+    // to have thousand separators. Thus, to scale a number by 1 million and insert
+    // thousand separators you would use the format string '#,##0,,'.
+    //
+    // %Percentage placeholder. The presence of
+    // a '%' character in the format string causes the number to be multiplied by
+    // 100 before it is formatted. The '%' character itself is inserted in the
+    // output string where it appears in the format string.
+    //
+    // E+E-e+e-Scientific notation.
+    // If any of the strings 'E+', 'E-', 'e+', or 'e-' are present in the format
+    // string and are immediately followed by at least one '0' character, then the
+    // number is formatted using scientific notation with an 'E' or 'e' inserted
+    // between the number and the exponent. The number of '0' characters following
+    // the scientific notation indicator determines the minimum number of digits to
+    // output for the exponent. The 'E+' and 'e+' formats indicate that a sign
+    // character (plus or minus) should always precede the exponent. The 'E-' and
+    // 'e-' formats indicate that a sign character should only precede negative
+    // exponents.
+    //
+    // \Literal character. A backslash character
+    // causes the next character in the format string to be copied to the output
+    // string as-is. The backslash itself isn't copied, so to place a backslash
+    // character in the output string, use two backslashes (\\) in the format
+    // string.
+    //
+    // 'ABC'"ABC"Literal string. Characters
+    // enclosed in single or double quotation marks are copied to the output string
+    // as-is and do not affect formatting.
+    //
+    // ;Section separator. The ';' character is
+    // used to separate sections for positive, negative, and zero numbers in the
+    // format string.
+    //
+    // OtherAll other characters are copied to
+    // the output string in the position they appear.
+    //
+    //
+    //
+    // For fixed point formats (formats not containing an 'E+', 'E-', 'e+', or
+    // 'e-'), the number is rounded to as many decimal places as there are digit
+    // placeholders to the right of the decimal point. If the format string does
+    // not contain a decimal point, the number is rounded to the nearest
+    // integer. If the number has more digits than there are digit placeholders to
+    // the left of the decimal point, the extra digits are copied to the output
+    // string immediately before the first digit placeholder.
+    //
+    // For scientific formats, the number is rounded to as many significant digits
+    // as there are digit placeholders in the format string.
+    //
+    // To allow for different formatting of positive, negative, and zero values, a
+    // user-defined format string may contain up to three sections separated by
+    // semicolons. The results of having one, two, or three sections in the format
+    // string are described in the table below.
+    //
+    //
+    // SectionsResult
+    //
+    // OneThe format string applies to all
+    // values.
+    //
+    // TwoThe first section applies to positive values
+    // and zeros, and the second section applies to negative values. If the number
+    // to be formatted is negative, but becomes zero after rounding according to
+    // the format in the second section, then the resulting zero is formatted
+    // according to the first section.
+    //
+    // ThreeThe first section applies to positive
+    // values, the second section applies to negative values, and the third section
+    // applies to zeros. The second section may be left empty (by having no
+    // characters between the semicolons), in which case the first section applies
+    // to all non-zero values. If the number to be formatted is non-zero, but
+    // becomes zero after rounding according to the format in the first or second
+    // section, then the resulting zero is formatted according to the third
+    // section.
+    //
+    //
+    //
+    // For both standard and user-defined formatting operations on values of type
+    // float and double, if the value being formatted is a NaN (Not
+    // a Number) or a positive or negative infinity, then regardless of the format
+    // string, the resulting string is given by the NaNSymbol,
+    // PositiveInfinitySymbol, or NegativeInfinitySymbol property of
+    // the NumberFormatInfo used to format the number.
+    //
+    // Parsing
+    //
+    // The Parse methods provided by the numeric classes are all of the form
+    //
+    //  public static XXX Parse(String s);
+    //  public static XXX Parse(String s, int style);
+    //
+    // where XXX is the name of the particular numeric class. The methods convert a
+    // string to a numeric value. The optional style parameter specifies the
+    // permitted style of the numeric string. It must be a combination of bit flags
+    // from the NumberStyles enumeration. The optional info parameter
+    // specifies the NumberFormatInfo instance to use when parsing the
+    // string. If the info parameter is null or omitted, the numeric
+    // formatting information is obtained from the current culture.
+    //
+    // Numeric strings produced by the Format methods using the
+    // Decimal, Engineering, Fixed point, General, or Number standard formats
+    // (the C, D, E, F, G, and N format specifiers) are guaranteed to be parsable
+    // by the Parse methods if the NumberStyles.Any style is
+    // specified. Note, however, that the Parse methods do not accept
+    // NaNs or Infinities.
+    //
+    internal class Number
+    {
+        private Number() {
+        }
+
+        private Number(ref Decimal value) {
+            this.precision = DecimalPrecision;
+            this.negative = value.negative;
+            int index = NumberMaxDigits;
+            while (value.mid32 != 0 || value.hi32 != 0) {
+                Int32ToDecChars(this.digits, ref index, DecDivMod1E9(ref value), 9);
+            }
+            Int32ToDecChars(this.digits, ref index, value.lo32, 0);
+            int digitCount = NumberMaxDigits - index;
+            this.scale = digitCount - value.scale;
+            int destIndex = 0;
+            while (digitCount > 0) {
+                this.digits[destIndex] = this.digits[index];
+                destIndex++;
+                index++;
+                digitCount--;
+            }
+            this.digits[destIndex] = '\0';
+        }
+
+        private Number(int value) {
+            this.precision = INT32_PRECISION;
+            if (value >= 0) {
+                this.negative = false;
+            } else {
+                this.negative = true;
+                value = -value;
+            }
+            int index = INT32_PRECISION;
+            Int32ToDecChars(this.digits, ref index, unchecked((uint) value), 0);
+            int digitCount = INT32_PRECISION - index;
+            int destIndex = 0;
+            this.scale = digitCount;
+            while (digitCount > 0) {
+                this.digits[destIndex] = this.digits[index];
+                destIndex++;
+                index++;
+                digitCount--;
+            }
+            this.digits[destIndex] = '\0';
+        }
+
+        private Number(uint value)
+        {
+            this.precision = INT32_PRECISION;
+            this.negative = false;
+            int index = INT32_PRECISION;
+            Int32ToDecChars(this.digits, ref index, value, 0);
+            int digitCount = INT32_PRECISION - index;
+            int destIndex = 0;
+            this.scale = digitCount;
+            while (digitCount > 0) {
+                this.digits[destIndex] = this.digits[index];
+                destIndex++;
+                index++;
+                digitCount--;
+            }
+            this.digits[destIndex] = '\0';
+        }
+
+        private Number(long value) {
+            this.precision = INT64_PRECISION;
+            if (value >= 0) {
+                this.negative = false;
+            } else {
+                this.negative = true;
+                value = -value;
+            }
+            int index = INT64_PRECISION;
+            Int64ToDecChars(this.digits, ref index, unchecked((ulong) value), 0);
+            int digitCount = INT64_PRECISION - index;
+            int destIndex = 0;
+            this.scale = digitCount;
+            while (digitCount > 0) {
+                this.digits[destIndex] = this.digits[index];
+                destIndex++;
+                index++;
+                digitCount--;
+            }
+            this.digits[destIndex] = '\0';
+        }
+
+        private Number(ulong value) {
+            this.precision = INT64_PRECISION;
+            this.negative = false;
+            int index = INT64_PRECISION;
+            Int64ToDecChars(this.digits, ref index, value, 0);
+            int digitCount = INT64_PRECISION - index;
+            int destIndex = 0;
+            this.scale = digitCount;
+            while (digitCount > 0) {
+                this.digits[destIndex] = this.digits[index];
+                destIndex++;
+                index++;
+                digitCount--;
+            }
+            this.digits[destIndex] = '\0';
+        }
+
+        // inline this!!!
+        private static bool EndString(String s, int p) {
+            return p==s.Length || s[p] == '\0';
+        }
+
+        // inline void AddStringRef(wchar** ppBuffer, STRINGREF strRef)
+        private static int AddStringRef(char[] ppBuffer, int index,
+                                        String strRef) {
+            int length = strRef.Length;
+            for (int str = 0; str < length; index++, str++) {
+                ppBuffer[index] = strRef[str];
+            }
+            return index;
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        // wchar* MatchChars(wchar* p, wchar* str)
+        // will now return -1 instead of NULL on failure
+        private static int MatchChars(String str1, int p, String str) {
+            int str_i=0;
+            if (EndString(str,str_i)) return -1;
+            for (; !EndString(str,str_i); p++, str_i++)
+            {
+                if (str1[p] != str[str_i]) //We only hurt the failure case
+                {
+                    if ((str[str_i] == 0xA0) && (str1[p] == 0x20))
+                        // This fix is for French or Kazakh cultures.
+                        // Since a user cannot type 0xA0 as a space
+                        // character we use 0x20 space character
+                        // instead to mean the same.
+                        continue;
+                    return -1;
+                }
+            }
+            return p;
+        }
+
+        // REVIEW: (markples) why is this the only thing that is hardcoded
+        // anywhere in the system?
+        private bool ISWHITE(char ch) {
+            return (((ch) == 0x20)||((ch) >= 0x09 && (ch) <= 0x0D));
+        }
+
+        private const int STATE_SIGN     = 0x0001;
+        private const int STATE_PARENS   = 0x0002;
+        private const int STATE_DIGITS   = 0x0004;
+        private const int STATE_NONZERO  = 0x0008;
+        private const int STATE_DECIMAL  = 0x0010;
+        private const int STATE_HEXLEAD  = 0x0020;
+
+        // #defines in Lightning\Src\VM\COMNumber.cpp
+        private const int NUMBER_MAXDIGITS = 31;
+        private const int INT32_PRECISION = 10;
+        private const int UINT32_PRECISION = 10;
+        private const int INT64_PRECISION = 20;
+        private const int UINT64_PRECISION = 20;
+        private const int FLOAT_PRECISION = 7;
+        private const int DOUBLE_PRECISION = 15;
+        private const int MIN_BUFFER_SIZE = 105;
+        private const int SCALE_NAN = unchecked((int)0x80000000);
+        private const int SCALE_INF = 0x7FFFFFFF;
+
+        private static String[] posPercentFormats = {
+            "# %", "#%", "%#"
+        };
+
+        // BUGBUG yslin: have to verify on the negative Percent
+        // format for real format.
+        private static String[] negPercentFormats = {
+            "-# %", "-#%", "-%#"
+        };
+        private static String[] negNumberFormats = {
+            "(#)", "-#", "- #", "#-", "# -"
+        };
+        private static String posNumberFormat = "#";
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        private static extern bool ecvt(double value,
+                                        int digits,
+                                        char[] buf,
+                                        out int decimalpoint,
+                                        out bool negative);
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        //  void DoubleToNumber(double value, int precision, NUMBER* number)
+        private Number(double value, int precision) {
+            this.precision = precision;
+            ecvt(value, precision, digits, out this.scale, out this.negative);
+        }
+
+        // code below depends on seeing the null terminator...
+        private static char Get(String str, int i) {
+            return i<str.Length ? str[i] : '\0';
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        //  int ParseNumber(wchar** str, int options,
+        //                  NUMBER* number, NUMFMTREF numfmt)
+        // clr behavior: return nonzero on failure and update *str
+        // new behavior: return false iff broken (error or *str != \0 at end)
+        private bool ParseNumber(String str, NumberStyles style) {
+            this.scale = 0;
+            this.negative = false;
+            String decSep = NumberFormatInfo.numberDecimalSeparator;
+            String groupSep = NumberFormatInfo.numberGroupSeparator;
+
+            int state = 0;
+            bool signflag = false; // Cache the results of
+            // "style & NumberStyles.AllowLeadingSign &&
+            // !(state & STATE_SIGN)"
+            // to avoid doing this twice
+            int p = 0;
+            int next;
+
+            if ((style & NumberStyles.AllowHexSpecifier) != 0 &&
+                str.Length >= 2) {
+                if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) {
+                    p = 2;
+                }
+            }
+
+            char ch = Get(str, p);
+
+            while (true) {
+                //Eat whitespace unless we've found a sign.
+                if (ISWHITE(ch)
+                    && ((style & NumberStyles.AllowLeadingWhite) != 0)
+                    && (!((state & STATE_SIGN) != 0) ||
+                        (((state & STATE_SIGN) != 0) &&
+                         (NumberFormatInfo.numberNegativePattern == 2)))) {
+                    // Do nothing here. We will increase p at the end of the loop
+                } else if ((signflag =
+                            (((style & NumberStyles.AllowLeadingSign) != 0) &&
+                             !((state & STATE_SIGN) != 0))) &&
+                           (next = MatchChars(str, p, NumberFormatInfo.positiveSign)) != -1) {
+                    state |= STATE_SIGN;
+                    p = next - 1;
+                } else if (signflag &&
+                           (next = MatchChars(str, p, NumberFormatInfo.negativeSign)) != -1){
+                    state |= STATE_SIGN;
+                    this.negative = true;
+                    p = next - 1;
+                } else if (ch == '(' &&
+                           ((style & NumberStyles.AllowParentheses) != 0) &&
+                           !((state & STATE_SIGN) != 0)) {
+                    state |= STATE_SIGN | STATE_PARENS;
+                    this.negative = true;
+                } else {
+                    break;
+                }
+                ch = Get(str, ++p);
+            }
+            int digCount = 0;
+            int digEnd = 0;
+            while (true) {
+                if ((ch >= '0' && ch <= '9') ||
+                    ( ((style & NumberStyles.AllowHexSpecifier) != 0) &&
+                      ((ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F')))) {
+                    state |= STATE_DIGITS;
+                    if (ch != '0' || ((state & STATE_NONZERO) != 0)) {
+                        if (digCount < NUMBER_MAXDIGITS) {
+                            this.digits[digCount++] = ch;
+                            if (ch != '0') digEnd = digCount;
+                        }
+                        if (!((state & STATE_DECIMAL) != 0)) this.scale++;
+                        state |= STATE_NONZERO;
+                    } else if ((state & STATE_DECIMAL) != 0) this.scale--;
+                } else if (((style & NumberStyles.AllowDecimalPoint) != 0) &&
+                           !((state & STATE_DECIMAL) != 0) &&
+                           ((next = MatchChars(str, p, decSep)) != -1)) {
+                    state |= STATE_DECIMAL;
+                    p = next - 1;
+                } else if (((style & NumberStyles.AllowThousands) != 0) &&
+                           ((state & STATE_DIGITS) != 0) &&
+                           !((state & STATE_DECIMAL) != 0) &&
+                           ((next = MatchChars(str, p, groupSep)) != -1)) {
+                    p = next - 1;
+                } else {
+                    break;
+                }
+                ch = Get(str, ++p);
+            }
+
+            bool negExp = false;
+            this.precision = digEnd;
+            this.digits[digEnd] = '\0';
+            if ((state & STATE_DIGITS) != 0) {
+                if ((ch == 'E' || ch == 'e') &&
+                    ((style & NumberStyles.AllowExponent) != 0)) {
+                    int temp = p;
+                    ch = Get(str, ++p);
+                    if ((next = MatchChars(str, p, NumberFormatInfo.positiveSign)) != -1) {
+                        ch = Get(str, p = next);
+                    } else
+                        if ((next = MatchChars(str, p, NumberFormatInfo.negativeSign))!= -1){
+                            ch = Get(str, p = next);
+                            negExp = true;
+                        }
+                    if (ch >= '0' && ch <= '9') {
+                        int exp = 0;
+                        do {
+                            exp = exp * 10 + (ch - '0');
+                            ch = Get(str, ++p);
+                            if (exp>1000) {
+                                exp=9999;
+                                while(ch>='0' && ch<='9') {
+                                    ch = Get(str, ++p);
+                                }
+                            }
+                        } while (ch >= '0' && ch <= '9');
+                        if (negExp) exp = -exp;
+                        this.scale += exp;
+                    } else {
+                        p = temp;
+                        ch = Get(str, p);
+                    }
+                }
+                while (true) {
+                    if (ISWHITE(ch) &&
+                        ((style & NumberStyles.AllowTrailingWhite) != 0)) {
+                        // do nothing
+                    } else if ((signflag =
+                                (((style & NumberStyles.AllowTrailingSign) != 0)
+                                 &&
+                                 !((state & STATE_SIGN) != 0))) &&
+                               (next =
+                                MatchChars(str, p, NumberFormatInfo.positiveSign)) != -1) {
+                        state |= STATE_SIGN;
+                        p = next - 1;
+                    } else if (signflag &&
+                               (next = MatchChars(str, p,
+                                                  NumberFormatInfo.negativeSign)) != -1) {
+                        state |= STATE_SIGN;
+                        this.negative = true;
+                        p = next - 1;
+                    } else if (ch == ')' && ((state & STATE_PARENS) != 0)) {
+                        state &= ~STATE_PARENS;
+                    } else {
+                        break;
+                    }
+                    ch = Get(str, ++p);
+                }
+                if (!((state & STATE_PARENS) != 0)) {
+                    if (!((state & STATE_NONZERO) != 0)) {
+                        this.scale = 0;
+                        if (!((state & STATE_DECIMAL) != 0)) {
+                            this.negative = false;
+                        }
+                    }
+                    // *str = p;
+                    // return 1;
+                    return EndString(str, p);
+                }
+            }
+            // *str = p;
+            // return 0;
+            return false;
+        }
+
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        //void StringToNumber(STRINGREF str, int options,
+        //                    NUMBER* number, NUMFMTREF numfmt)
+        private Number(String str, NumberStyles style) {
+            {
+                //THROWSCOMPLUSEXCEPTION();
+
+                if (str == null) {
+                    throw new NullReferenceException();
+                }
+
+                if (!NumberFormatInfo.validForParseAsNumber) {
+                    throw new ArgumentException("Argument_AmbiguousNumberInfo");
+                }
+                //wchar* p = str->GetBuffer();
+                if (!ParseNumber(str, style)) {
+                    throw new FormatException("Format_InvalidString");
+                }
+            }
+        }
+
+        public static String FormatDecimal(Decimal value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatDecimal
+            if (format == null) {
+                throw new ArgumentNullException("format");
+            }
+            Number number = new Number(ref value);
+            return FPNumberToString(number, format);
+        }
+
+        public static String FormatDouble(double value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatDouble
+
+            Number number;
+            int digits;
+            double dTest;
+            char fmt = ParseFormatSpecifier(format, out digits);
+            char val = (char) (fmt & 0xFFDF);
+            int precision = DOUBLE_PRECISION;
+            switch (val) {
+              case 'R':
+                //In order to give numbers that are both
+                //friendly to display and round-trippable, we
+                //parse the number using 15 digits and then
+                //determine if it round trips to the same value.
+                //If it does, we convert that NUMBER to a
+                //string, otherwise we reparse using 17 digits
+                //and display that.
+
+                number = new Number(value, DOUBLE_PRECISION);
+
+                if (number.scale == SCALE_NAN) {
+                    return NumberFormatInfo.nanSymbol;
+                }
+                if (number.scale == SCALE_INF) {
+                    return number.negative ? NumberFormatInfo.negativeInfinitySymbol
+                        : NumberFormatInfo.positiveInfinitySymbol;
+                }
+
+                NumberToDouble(number, out dTest);
+
+                if (dTest == value) {
+                    return number.ToString('G', DOUBLE_PRECISION);
+                }
+
+                number = new Number(value, 17);
+                return number.ToString('G', 17);
+
+              case 'E':
+                // Here we round values less than E14 to 15 digits
+                if (digits > 14) {
+                    precision = 17;
+                }
+                break;
+
+              case 'G':
+                // Here we round values less than G15 to 15
+                // digits, G16 and G17 will not be touched
+                if (digits > 15) {
+                    precision = 17;
+                }
+                break;
+
+            }
+
+            number = new Number(value, precision);
+            return FPNumberToString(number, format);
+        }
+
+        public static String FormatInt32(int value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatInt32
+            int digits;
+            char fmt = ParseFormatSpecifier(format, out digits);
+            switch (fmt) {
+              case 'g':
+              case 'G': {
+                  if (digits > 0) break;
+                  goto case 'D';
+              }
+              case 'd':
+              case 'D': {
+                  return Int32ToDecString(value, digits, NumberFormatInfo.negativeSign);
+              }
+              case 'x':
+              case 'X': {
+                  return Int32ToHexString(unchecked((uint) value),
+                                          (char) (fmt-('X'-'A'+10)),
+                                          digits);
+              }
+              default: {
+                  break;
+              }
+            }
+            Number number = new Number(value);
+            if (fmt == 0) {
+                return number.ToStringFormat(format);
+            } else {
+                return number.ToString(fmt, digits);
+            }
+        }
+
+        public static String FormatUInt32(uint value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatUInt32
+            int digits;
+            char fmt = ParseFormatSpecifier(format, out digits);
+            switch (fmt) {
+              case 'g':
+              case 'G': {
+                  if (digits > 0) break;
+                  goto case 'D';
+              }
+              case 'd':
+              case 'D': {
+                  return UInt32ToDecString(value, digits);
+              }
+              case 'x':
+              case 'X': {
+                  return Int32ToHexString(value,
+                                          (char) (fmt-('X'-'A'+10)),
+                                          digits);
+              }
+              default: {
+                  break;
+              }
+            }
+            Number number = new Number(value);
+            if (fmt == 0) {
+                return number.ToStringFormat(format);
+            } else {
+                return number.ToString(fmt, digits);
+            }
+        }
+
+        public static String FormatInt64(long value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatInt64
+            int digits;
+            char fmt = ParseFormatSpecifier(format, out digits);
+            switch (fmt) {
+              case 'g':
+              case 'G': {
+                  if (digits > 0) break;
+                  goto case 'D';
+              }
+              case 'd':
+              case 'D': {
+                  return Int64ToDecString(value, digits, NumberFormatInfo.negativeSign);
+              }
+              case 'x':
+              case 'X': {
+                  return Int64ToHexString(unchecked((ulong) value),
+                                          (char) (fmt-('X'-'A'+10)),
+                                          digits);
+              }
+              default: {
+                  break;
+              }
+            }
+            Number number = new Number(value);
+            if (fmt == 0) {
+                return number.ToStringFormat(format);
+            } else {
+                return number.ToString(fmt, digits);
+            }
+        }
+
+        public static String FormatUInt64(ulong value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatUInt64
+            int digits;
+            char fmt = ParseFormatSpecifier(format, out digits);
+            switch (fmt) {
+              case 'g':
+              case 'G': {
+                  if (digits > 0) break;
+                  goto case 'D';
+              }
+              case 'd':
+              case 'D': {
+                  return UInt64ToDecString(value, digits);
+              }
+              case 'x':
+              case 'X': {
+                  return Int64ToHexString(value, (char) (fmt-('X'-'A'+10)), digits);
+              }
+              default: {
+                  break;
+              }
+            }
+            Number number = new Number(value);
+            if (fmt == 0) {
+                return number.ToStringFormat(format);
+            } else {
+                return number.ToString(fmt, digits);
+            }
+        }
+
+        public static String FormatSingle(float value, String format) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::FormatSingle
+
+            Number number;
+            int digits;
+            double dTest;
+            double argsValue = value;
+            char fmt = ParseFormatSpecifier(format, out digits);
+            char val = (char) (fmt & 0xFFDF);
+            int precision = FLOAT_PRECISION;
+            switch (val) {
+              case 'R':
+                //In order to give numbers that are both
+                //friendly to display and round-trippable, we
+                //parse the number using 7 digits and then
+                //determine if it round trips to the same value.
+                //If it does, we convert that NUMBER to a
+                //string, otherwise we reparse using 9 digits
+                //and display that.
+
+                number = new Number(argsValue, FLOAT_PRECISION);
+
+                if (number.scale == SCALE_NAN) {
+                    return NumberFormatInfo.nanSymbol;
+                }
+                if (number.scale == SCALE_INF) {
+                    return number.negative ? NumberFormatInfo.negativeInfinitySymbol
+                        : NumberFormatInfo.positiveInfinitySymbol;
+                }
+
+                NumberToDouble(number, out dTest);
+
+                // HACK: force restriction to float
+                float[] hack = new float[1];
+                hack[0] = (float) dTest;
+                float fTest = hack[0];
+
+                if (fTest == value) {
+                    return number.ToString('G', FLOAT_PRECISION);
+                }
+
+                number = new Number(argsValue, 9);
+                return number.ToString('G', 9);
+
+              case 'E':
+                // Here we round values less than E14 to 15 digits
+                if (digits > 6) {
+                    precision = 9;
+                }
+                break;
+
+              case 'G':
+                // Here we round values less than G15 to 15
+                // digits, G16 and G17 will not be touched
+                if (digits > 7) {
+                    precision = 9;
+                }
+                break;
+            }
+
+            number = new Number(value, precision);
+            return FPNumberToString(number, format);
+
+        }
+
+        public static Decimal ParseDecimal(String s, NumberStyles style) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::ParseDecimal
+            Number number = new Number(s, style);
+            Decimal result;
+            if (!NumberToDecimal(number, out result)) {
+                throw new OverflowException("Overflow_Decimal");
+            }
+            return result;
+        }
+
+        public static double ParseDouble(String s, NumberStyles style) {
+            Number number = new Number(s, style);
+            double result;
+            NumberToDouble(number, out result);
+            return result;
+        }
+
+        public static int ParseInt32(String s, NumberStyles style) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::ParseInt32
+            Number number = new Number(s, style);
+            int result;
+            if ((style & NumberStyles.AllowHexSpecifier) != 0) {
+                uint temp;
+                if (!HexNumberToUInt32(number, out temp)) {
+                    throw new OverflowException("Overflow_Int32");
+                }
+                result = unchecked((int) temp);
+            } else {
+                if (!NumberToInt32(number, out result)) {
+                    throw new OverflowException("Overflow_Int32");
+                }
+            }
+            return result;
+        }
+
+        public static uint ParseUInt32(String s, NumberStyles style) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::ParseUInt32
+            Number number = new Number(s, style);
+            uint result;
+            if ((style & NumberStyles.AllowHexSpecifier) != 0) {
+                if (!HexNumberToUInt32(number, out result)) {
+                    throw new OverflowException("Overflow_UInt32");
+                }
+            } else {
+                if (!NumberToUInt32(number, out result)) {
+                    throw new OverflowException("Overflow_UInt32");
+                }
+            }
+            return result;
+        }
+
+        public static long ParseInt64(String s, NumberStyles style) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::ParseInt64
+            Number number = new Number(s, style);
+            long result;
+            if ((style & NumberStyles.AllowHexSpecifier) != 0) {
+                ulong temp;
+                if (!HexNumberToUInt64(number, out temp)) {
+                    throw new OverflowException("Overflow_UInt32");
+                }
+                result = unchecked((long) temp);
+            } else {
+                if (!NumberToInt64(number, out result)) {
+                    throw new OverflowException("Overflow_UInt32");
+                }
+            }
+            return result;
+        }
+
+        public static ulong ParseUInt64(String s, NumberStyles style) {
+            // rusa: see also Lightning\Src\VM\COMNumber.cpp::ParseUInt64
+            Number number = new Number(s, style);
+            ulong result;
+            if ((style & NumberStyles.AllowHexSpecifier) != 0) {
+                if (!HexNumberToUInt64(number, out result)) {
+                    throw new OverflowException("Overflow_UInt32");
+                }
+            } else {
+                if (!NumberToUInt64(number, out result)) {
+                    throw new OverflowException("Overflow_UInt32");
+                }
+            }
+            return result;
+        }
+
+        public static float ParseSingle(String s, NumberStyles style) {
+            return (float)ParseDouble(s, style);
+        }
+
+        // STRINGREF FPNumberToString(NUMBER* number, STRINGREF str,
+        //                            NUMFMTREF numfmt)
+        private static String FPNumberToString(Number number, String format) {
+            char fmt;
+            int digits;
+            if (number.scale == SCALE_NAN) {
+                return NumberFormatInfo.nanSymbol;
+            }
+            if (number.scale == SCALE_INF) {
+                return number.negative ? NumberFormatInfo.negativeInfinitySymbol
+                    : NumberFormatInfo.positiveInfinitySymbol;
+            }
+
+            fmt = ParseFormatSpecifier(format, out digits);
+            if (fmt != 0) {
+                return number.ToString(fmt, digits);
+            }
+            return number.ToStringFormat(format);
+        }
+
+        // STRINGREF NumberToString(NUMBER* number, wchar format,
+        //                          int digits, NUMFMTREF numfmt)
+        private String ToString(char format, int digits) {
+            long newBufferLen = MIN_BUFFER_SIZE;
+
+            //CQuickBytesSpecifySize<LARGE_BUFFER_SIZE * sizeof(WCHAR)> buf;
+
+            char[] buffer = null;
+            int dst; // wchar* dst = NULL;
+            char ftype = (char) (format & 0xFFDF);
+            int digCount = 0;
+
+            switch (ftype) {
+              case 'F':
+                if (digits < 0) digits = NumberFormatInfo.numberDecimalDigits;
+
+                if (this.scale < 0)
+                    digCount = 0;
+                else
+                    digCount = this.scale + digits;
+
+                newBufferLen += digCount;
+
+                // For number and exponent
+                newBufferLen += NumberFormatInfo.negativeSign.Length;
+
+                newBufferLen += NumberFormatInfo.numberDecimalSeparator.Length;
+
+                //newBufferLen = newBufferLen * sizeof(WCHAR);
+                //_ASSERTE(newBufferLen >= MIN_BUFFER_SIZE * sizeof(WCHAR));
+                buffer = new char[newBufferLen];
+                //if (!buffer)
+                //    COMPlusThrowOM();
+                dst = 0; // buffer;
+
+                RoundNumber(this.scale + digits);
+                if (this.negative) {
+                    dst = AddStringRef(buffer, dst, NumberFormatInfo.negativeSign);
+                }
+                dst = FormatFixed(buffer, dst, digits, null,
+                                  NumberFormatInfo.numberDecimalSeparator, null);
+                break;
+              case 'N':
+                // Since we are using digits in our calculation
+                if (digits < 0) digits = NumberFormatInfo.numberDecimalDigits;
+
+                if (this.scale < 0)
+                    digCount = 0;
+                else
+                    digCount = this.scale + digits;
+
+                newBufferLen += digCount;
+
+                // For number and exponent
+                newBufferLen += NumberFormatInfo.negativeSign.Length;
+
+                // For all the grouping sizes
+                newBufferLen += NumberFormatInfo.numberGroupSeparator.Length * digCount;
+                newBufferLen += NumberFormatInfo.numberDecimalSeparator.Length;
+
+                //newBufferLen = newBufferLen * sizeof(WCHAR);
+                //_ASSERTE(newBufferLen >= MIN_BUFFER_SIZE * sizeof(WCHAR));
+                buffer = new char[newBufferLen];
+                //if (!buffer)
+                //    COMPlusThrowOM();
+                dst = 0; // buffer;
+
+                RoundNumber(this.scale + digits);
+                dst = FormatNumber(buffer, dst, digits);
+                break;
+              case 'E':
+                if (digits < 0) digits = 6;
+                digits++;
+
+                newBufferLen += digits;
+
+                // For number and exponent
+                newBufferLen += (NumberFormatInfo.negativeSign.Length +
+                                 NumberFormatInfo.positiveSign.Length) * 2;
+                newBufferLen += NumberFormatInfo.numberDecimalSeparator.Length;
+
+                //newBufferLen = newBufferLen * sizeof(WCHAR);
+                //_ASSERTE(newBufferLen >= MIN_BUFFER_SIZE * sizeof(WCHAR));
+                buffer = new char[newBufferLen];
+                //if (!buffer)
+                //    COMPlusThrowOM();
+                dst = 0;  // buffer;
+
+                RoundNumber(digits);
+                if (this.negative) {
+                    dst = AddStringRef(buffer, dst, NumberFormatInfo.negativeSign);
+                }
+                dst = FormatScientific(buffer, dst, digits, format);
+                break;
+              case 'G':
+                if (digits < 1) digits = this.precision;
+                newBufferLen += digits;
+
+                // For number and exponent
+                newBufferLen += (NumberFormatInfo.negativeSign.Length +
+                                 NumberFormatInfo.positiveSign.Length) *2;
+                newBufferLen += NumberFormatInfo.numberDecimalSeparator.Length;
+
+                //newBufferLen = newBufferLen * sizeof(WCHAR);
+                //_ASSERTE(newBufferLen >= MIN_BUFFER_SIZE * sizeof(WCHAR));
+                buffer = new char[newBufferLen];
+                //if (!buffer)
+                //    COMPlusThrowOM();
+                dst = 0;  // buffer;
+
+                RoundNumber(digits);
+                if (this.negative) {
+                    dst = AddStringRef(buffer, dst, NumberFormatInfo.negativeSign);
+                }
+                dst = FormatGeneral(buffer, dst, digits,
+                                    (char) (format - ('G' - 'E')));
+                break;
+              case 'P':
+                if (digits < 0) digits = NumberFormatInfo.percentDecimalDigits;
+                this.scale += 2;
+
+                if (this.scale < 0)
+                    digCount = 0;
+                else
+                    digCount = this.scale + digits;
+
+                newBufferLen += digCount;
+
+                // For number and exponent
+                newBufferLen += NumberFormatInfo.negativeSign.Length;
+
+                // For all the grouping sizes
+                newBufferLen += NumberFormatInfo.percentGroupSeparator.Length * digCount;
+                newBufferLen += NumberFormatInfo.percentDecimalSeparator.Length;
+                newBufferLen += NumberFormatInfo.percentSymbol.Length;
+
+                //newBufferLen = newBufferLen * sizeof(WCHAR);
+                //_ASSERTE(newBufferLen >= MIN_BUFFER_SIZE * sizeof(WCHAR));
+                buffer = new char[newBufferLen];
+                //if (!buffer)
+                //    COMPlusThrowOM();
+                dst = 0;  // buffer;
+
+                RoundNumber(this.scale + digits);
+                dst = FormatPercent(buffer, dst, digits);
+                break;
+              default:
+                  throw new FormatException("Format_BadFormatSpecifier");
+                // COMPlusThrow(kFormatException,L"Format_BadFormatSpecifier");
+            }
+            //_ASSERTE((dst - buffer >= 0) && (dst - buffer) <= newBufferLen);
+            return String.StringCTOR(buffer, 0, dst);
+        }
+
+        private static bool NumberToDecimal(Number number, out Decimal value) {
+            throw new Exception("System.Number.NumberToDecimal not implemented in Bartok!");
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [GCAnnotation(GCOption.NOGC)]
+        [StackBound(1024)]
+        private static extern double atof(byte[] s);
+
+        private static void NumberToDouble(Number number, out double value) {
+            if (number.digits[0] != 0) {
+                byte[] buffer = new byte[64];
+                int index = 0;
+                char[] src = number.digits;
+                if (number.negative) buffer[index++] = (byte) '-';
+                for (int j=0; j<src.Length; j++) {
+                    if (src[j] == '\0') {
+                        break;
+                    } else {
+                        buffer[index++] = (byte) src[j];
+                    }
+                }
+                int i = number.scale - number.precision;
+                if (i != 0) {
+                    buffer[index++] = (byte) 'e';
+                    if (i < 0) {
+                        buffer[index++] = (byte) '-';
+                        i = -i;
+                    }
+                    if (i >= 100) {
+                        if (i > 999) i = 999;
+                        buffer[index++] = (byte) (i / 100 + (int) '0');
+                        i %= 100;
+                    }
+                    buffer[index++] = (byte) (i / 10 + (int) '0');
+                    buffer[index++] = (byte) (i % 10 + (int) '0');
+                }
+                buffer[index] = (byte)'\0';
+                value = atof(buffer);
+            }
+            else {
+                value = 0;
+            }
+
+        }
+
+        // int NumberToInt32(NUMBER* number, int* value)
+        // Returns 1 (true) on success, 0 (false) for fail.
+        private static bool NumberToInt32(Number number, out int value) {
+            // markples: see also Lightning\Src\VM\COMNumber.cpp::NumberToInt32
+            int i = number.scale;
+            if (i > INT32_PRECISION || i < number.precision) goto broken;
+            char[] c = number.digits;
+            int p = 0;
+            int n = 0;
+            while (--i >= 0) {
+                if ((uint)n > (0x7FFFFFFF / 10)) goto broken;
+                n *= 10;
+                if (c[p] != '\0') n += c[p++] - '0';
+            }
+            if (number.negative) {
+                n = -n;
+                if (n > 0) goto broken;
+            } else {
+                if (n < 0) goto broken;
+            }
+            value = n;
+            return true;
+
+          broken:
+            value = 0;
+            return false;
+        }
+
+        private static bool NumberToUInt32(Number number, out uint value) {
+            // markples: see also Lightning\Src\VM\COMNumber.cpp::NumberToInt32
+            int i = number.scale;
+            if (i > UINT32_PRECISION || i < number.precision) goto broken;
+            if (number.negative) goto broken;
+            char[] c = number.digits;
+            int p = 0;
+            uint n = 0;
+            while (--i >= 0) {
+                if ((uint)n > (0xFFFFFFFF / 10)) goto broken;
+                n *= 10;
+                if (c[p] != '\0') n += (uint)(c[p++] - '0');
+            }
+            value = n;
+            return true;
+
+          broken:
+            value = 0;
+            return false;
+        }
+
+        private static bool NumberToInt64(Number number, out long value) {
+            // markples: see also Lightning\Src\VM\COMNumber.cpp::NumberToInt32
+            int i = number.scale;
+            if (i > UINT64_PRECISION || i < number.precision) goto broken;
+            char[] c = number.digits;
+            int p = 0;
+            long n = 0;
+            while (--i >= 0) {
+                if ((ulong)n > (0x7FFFFFFFFFFFFFFF / 10)) goto broken;
+                n *= 10;
+                if (c[p] != '\0') n += c[p++] - '0';
+            }
+            if (number.negative) {
+                n = -n;
+                if (n > 0) goto broken;
+            } else {
+                if (n < 0) goto broken;
+            }
+            value = n;
+            return true;
+
+          broken:
+            value = 0;
+            return false;
+        }
+
+        private static bool NumberToUInt64(Number number, out ulong value)
+        {
+            // markples: see also Lightning\Src\VM\COMNumber.cpp::NumberToInt32
+            int i = number.scale;
+            if (i > INT64_PRECISION || i < number.precision) goto broken;
+            if (number.negative) goto broken;
+            char[] c = number.digits;
+            int p = 0;
+            ulong n = 0;
+            while (--i >= 0) {
+                if ((ulong)n > (0xFFFFFFFFFFFFFFFF / 10)) goto broken;
+                n *= 10;
+                if (c[p] != '\0') n += (ulong)(c[p++] - '0');
+            }
+            value = n;
+            return true;
+
+          broken:
+            value = 0;
+            return false;
+        }
+
+        private static bool HexNumberToUInt32(Number number, out uint value)
+        {
+            // markples: see also Lightning\Src\VM\COMNumber.cpp::HexNumberToInt32
+            int i = number.scale;
+            if (i > UINT32_PRECISION || i < number.precision) {
+                goto broken;
+            }
+            if (number.negative) {
+                goto broken;
+            }
+            char[] c = number.digits;
+            int p = 0;
+            uint n = 0;
+            while (--i >= 0) {
+                if ((uint)n > (0xFFFFFFFF / 16)) {
+                    goto broken;
+                }
+                n *= 16;
+                if (c[p] >= '0' && c[p] <= '9') {
+                    n += (uint)(c[p++] - '0');
+                }
+                else if (c[p] >= 'a' && c[p] <= 'f') {
+                    n += 10 + (uint)(c[p++] - 'a');
+                }
+                else if (c[p] >= 'A' && c[p] <= 'F') {
+                    n += 10 + (uint)(c[p++] - 'A');
+                }
+            }
+            value = n;
+            return true;
+
+          broken:
+            value = 0;
+            return false;
+        }
+
+        private static bool HexNumberToUInt64(Number number, out ulong value) {
+            // markples: see also Lightning\Src\VM\COMNumber.cpp::HexNumberToInt32
+            int i = number.scale;
+            if (i > INT64_PRECISION || i < number.precision) {
+                goto broken;
+            }
+            if (number.negative) {
+                goto broken;
+            }
+            char[] c = number.digits;
+            int p = 0;
+            ulong n = 0;
+            while (--i >= 0) {
+                if ((ulong)n > (0xFFFFFFFFFFFFFFFF / 16)) {
+                    goto broken;
+                }
+                n *= 16;
+                if (c[p] >= '0' && c[p] <= '9') {
+                    n += (uint)(c[p++] - '0');
+                }
+                else if (c[p] >= 'a' && c[p] <= 'f') {
+                    n += 10 + (uint)(c[p++] - 'a');
+                }
+                else if (c[p] >= 'A' && c[p] <= 'F') {
+                    n += 10 + (uint)(c[p++] - 'A');
+                }
+            }
+            value = n;
+            return true;
+
+          broken:
+            value = 0;
+            return false;
+        }
+
+        private static char ParseFormatSpecifier(string format, out int digits)
+        {
+            if (format != null) {
+                int index = 0;
+                char c = Get(format, index);
+                if (c != 0) {
+                    if (c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z') {
+                        index++;
+                        int n = -1;
+                        c = Get(format, index);
+                        if (c >= '0' && c <= '9') {
+                            n = (c - '0');
+                            index++;
+                            c = Get(format, index);
+                            while (c >= '0' && c <= '9') {
+                                n = n * 10 + (c - '0');
+                                index++;
+                                c = Get(format, index);
+                                if (n >= 10) break;
+                            }
+                        }
+                        if (c == 0) {
+                            digits = n;
+                            return Get(format, 0);
+                        }
+                    }
+                    digits = -1;
+                    return '\0';
+                }
+            }
+            digits = -1;
+            return 'G';
+        }
+
+        // rusa: see also Lightning\Src\VM\COMNumber.cpp::NumberToStringFormat
+        private String ToStringFormat(String format) {
+            int thousandCount = 0;
+            int section = (this.digits[0] == 0 ? 2 : (this.negative ? 1 : 0));
+            int sectionOffset = FindSection(format, section);
+            int firstDigit;
+            int lastDigit;
+            bool scientific;
+            int decimalPos;
+            int src;
+            int percent;
+            int permille;
+            int thousandSeps;
+            char ch;
+            while (true) {
+                int digitCount = 0;
+                decimalPos = -1;
+                firstDigit = 0x7FFFFFFF;
+                lastDigit = 0;
+                scientific = false;
+                percent = 0;
+                permille = 0;
+                int thousandPos = -1;
+                thousandSeps = 0;
+                int scaleAdjust = 0;
+                src = sectionOffset;
+                ch = Get(format, src);
+                src++;
+                while (ch != '\0' && ch != ';') {
+                    switch (ch) {
+                      case '#':
+                        digitCount++;
+                        break;
+                      case '0':
+                        if (firstDigit == 0x7FFFFFFF) {
+                            firstDigit = digitCount;
+                        }
+                        digitCount++;
+                        lastDigit = digitCount;
+                        break;
+                      case '.':
+                        if (decimalPos < 0) {
+                            decimalPos = digitCount;
+                        }
+                        break;
+                      case ',':
+                        if (digitCount > 0 && decimalPos < 0) {
+                            if (thousandPos >= 0) {
+                                if (thousandPos == digitCount) {
+                                    thousandCount++;
+                                    break;
+                                }
+                                thousandSeps = 1;
+                            }
+                            thousandPos = digitCount;
+                            thousandCount = 1;
+                        }
+                        break;
+                      case '%':
+                        percent++;
+                        scaleAdjust += 2;
+                        break;
+                      case '\u2030':
+                        permille++;
+                        scaleAdjust += 3;
+                        break;
+                      case '\'':
+                      case '"':
+                        while (Get(format, src) != 0 &&
+                               Get(format, src) != ch) {
+                            src++;
+                        }
+                        break;
+                      case '\\':
+                        if (Get(format, src) != 0) {
+                            src++;
+                        }
+                        break;
+                      case 'E':
+                        if (Get(format, src) == '0' ||
+                            ((Get(format, src) == '+' ||
+                              Get(format, src) == '-') &&
+                             Get(format, src+1) == '0')) {
+                            do {
+                                src++;
+                            } while (Get(format, src) != 0);
+                            scientific = true;
+                        }
+                        break;
+                    }
+                    ch = Get(format, src);
+                    src++;
+                }
+                if (decimalPos < 0) {
+                    decimalPos = digitCount;
+                }
+                if (thousandPos >= 0) {
+                    if (thousandPos == decimalPos) {
+                        scaleAdjust -= thousandCount * 3;
+                    } else {
+                        thousandSeps = 1;
+                    }
+                }
+                if (this.digits[0] != 0) {
+                    this.scale += scaleAdjust;
+                    int pos = (scientific ?
+                               digitCount :
+                               (this.scale + digitCount - decimalPos));
+                    this.RoundNumber(pos);
+                    if (this.digits[0] == 0) {
+                        src = FindSection(format, 2);
+                        if (src != sectionOffset) {
+                            sectionOffset = src;
+                            continue;
+                        }
+                    }
+                } else {
+                    this.negative = false;
+                }
+                break;
+            }
+            firstDigit = (firstDigit < decimalPos) ? decimalPos - firstDigit : 0;
+            lastDigit = (lastDigit > decimalPos) ? decimalPos - lastDigit : 0;
+            int digPos;
+            int adjust;
+            if (scientific) {
+                digPos = decimalPos;
+                adjust = 0;
+            } else {
+                digPos = (this.scale > decimalPos) ? this.scale : decimalPos;
+                adjust = this.scale - decimalPos;
+            }
+            src = sectionOffset;
+            ulong maxStrIncLen = unchecked((ulong) (this.negative ?
+                                                    NumberFormatInfo.negativeSign.Length :
+                                                    NumberFormatInfo.positiveSign.Length));
+            maxStrIncLen += (uint) NumberFormatInfo.numberDecimalSeparator.Length;
+            if (scientific) {
+                int inc1 = NumberFormatInfo.positiveSign.Length;
+                int inc2 = NumberFormatInfo.negativeSign.Length;
+                maxStrIncLen += (uint) ((inc1 > inc2) ? inc1 : inc2);
+            }
+            if (percent > 0) {
+                maxStrIncLen += (ulong) ((NumberFormatInfo.percentSymbol.Length) * percent);
+            }
+            if (permille > 0) {
+                maxStrIncLen += (ulong) ((NumberFormatInfo.perMilleSymbol.Length) * permille);
+            }
+            ulong adjustLength = (adjust > 0) ? (uint) adjust : 0U;
+            int bufferLength = 125;
+            int[] thousandSepPos = null;
+            int thousandSepCtr = -1;
+            if (thousandSeps != 0) {
+                int groupSizeLen = NumberFormatInfo.numberGroupSizes.Length;
+                if (groupSizeLen == 0) {
+                    thousandSeps = 0;
+                } else {
+                    thousandSepPos = new int[bufferLength];
+                    long groupTotalSizeCount = NumberFormatInfo.numberGroupSizes[0];
+                    int groupSizeIndex = 0;
+                    int groupSize = (int) groupTotalSizeCount;
+                    int totalDigits = digPos + ((adjust < 0) ? adjust : 0);
+                    int numDigits =
+                        (firstDigit > totalDigits) ? firstDigit : totalDigits;
+                    while (numDigits > groupTotalSizeCount) {
+                        if (groupSize == 0) {
+                            break;
+                        }
+                        thousandSepCtr++;
+                        thousandSepPos[thousandSepCtr] = (int) groupTotalSizeCount;
+                        if (groupSizeIndex < groupSizeLen - 1) {
+                            groupSizeIndex++;
+                            groupSize = NumberFormatInfo.numberGroupSizes[groupSizeIndex];
+                        }
+                        groupTotalSizeCount += groupSize;
+                        if (bufferLength - thousandSepCtr < 10) {
+                            bufferLength *= 2;
+                            int[] oldThousandSepPos = thousandSepPos;
+                            thousandSepPos = new int[bufferLength];
+                            for (int i = 0; i < thousandSepCtr; i++) {
+                                thousandSepPos[i] = oldThousandSepPos[i];
+                            }
+                        }
+                    }
+                    adjustLength += (ulong) ((thousandSepCtr + 1) * NumberFormatInfo.numberGroupSeparator.Length);
+                }
+            }
+            maxStrIncLen += adjustLength;
+            ulong tempLen = ((ulong) format.Length + maxStrIncLen + 10U);
+            if (tempLen > 0x7FFFFFFF) {
+                throw new OutOfMemoryException("Cannot create a formatted string that big!");
+            }
+            uint bufferLen = (uint) tempLen;
+            if (bufferLen < 250) {
+                bufferLen = 250;
+            }
+            int bufferIndex = 0;
+            char[] buffer = new char[bufferLen];
+            int dst = 0;
+            if (this.negative && sectionOffset == 0) {
+                bufferIndex =
+                    AddStringRef(buffer, bufferIndex, NumberFormatInfo.negativeSign);
+            }
+            ch = Get(format, src);
+            src++;
+            int digitOffset = 0;
+            while (ch != 0 && ch != ';') {
+                if (bufferLength - dst < 10) {
+                    bufferLen *= 2;
+                    char[] oldBuffer = buffer;
+                    buffer = new char[bufferLen];
+                    for (int i = 0; i < dst; i++) {
+                        buffer[i] = oldBuffer[i];
+                    }
+                }
+                switch (ch) {
+                  case '#':
+                  case '0': {
+                      while (adjust > 0) {
+                          buffer[dst] = ((this.digits[digitOffset] != 0) ?
+                                         this.digits[digitOffset++] :
+                                         '0');
+                          dst++;
+                          if (thousandSeps != 0 &&
+                              digPos > 1 &&
+                              thousandSepCtr >= 0) {
+                              if (digPos == thousandSepPos[thousandSepCtr] + 1) {
+                                  dst = AddStringRef(buffer, dst, NumberFormatInfo.numberGroupSeparator);
+                                  thousandSepCtr--;
+                              }
+                          }
+                          digPos--;
+                          adjust--;
+                      }
+                      if (adjust < 0) {
+                          adjust++;
+                          ch = (digPos <= firstDigit) ? '0' : '\0';
+                      } else {
+                          ch = ((this.digits[digitOffset] != 0) ?
+                                this.digits[digitOffset++] :
+                                ((digPos > lastDigit) ? '0' : '\0'));
+                      }
+                      if (ch != 0) {
+                          if (digPos == 0) {
+                              dst = AddStringRef(buffer, dst, NumberFormatInfo.numberDecimalSeparator);
+                          }
+                          buffer[dst] = ch;
+                          dst++;
+                          if (thousandSeps != 0 &&
+                              digPos > 1 &&
+                              thousandSepCtr >= 0) {
+                              if (digPos == thousandSepPos[thousandSepCtr] + 1) {
+                                  dst = AddStringRef(buffer, dst, NumberFormatInfo.numberGroupSeparator);
+                                  thousandSepCtr--;
+                              }
+                          }
+                      }
+                      digPos--;
+                      break;
+                  }
+                  case '.':
+                    break;
+                  case '\u2030':
+                    dst = AddStringRef(buffer, dst, NumberFormatInfo.perMilleSymbol);
+                    break;
+                  case '%':
+                    dst = AddStringRef(buffer, dst, NumberFormatInfo.percentSymbol);
+                    break;
+                  case ',':
+                    break;
+                  case '\'':
+                  case '"':
+                    while (Get(format, src) != 0 && Get(format, src) != ch) {
+                        buffer[dst] = Get(format, src);
+                        dst++;
+                        src++;
+                        if (dst == bufferLen-1) {
+                            if ((ulong) (bufferLen - dst) < maxStrIncLen) {
+                                bufferLen *= 2;
+                                char[] oldBuffer = buffer;
+                                buffer = new char[bufferLen];
+                                for (int i = 0; i < dst; i++) {
+                                    buffer[i] = oldBuffer[i];
+                                }
+                            }
+                        }
+                    }
+                    if (Get(format, src) != 0) {
+                        src++;
+                    }
+                    break;
+                  case '\\':
+                    if (Get(format, src) != 0) {
+                        buffer[dst] = Get(format, src);
+                        dst++;
+                        src++;
+                    }
+                    break;
+                  case 'E':
+                  case 'e': {
+                      String sign = null;
+                      int i = 0;
+                      if (scientific) {
+                          if (Get(format, src) == '0') {
+                              i++;
+                          } else if (Get(format, src) == '+' &&
+                                     Get(format, src+1) == '0') {
+                              sign = NumberFormatInfo.positiveSign;
+                          } else if (Get(format, src) == '-' &&
+                                     Get(format, src+1) == '0') {
+                              // Do nothing
+                          } else {
+                              buffer[dst] = ch;
+                              dst++;
+                              break;
+                          }
+                          while (Get(format, ++src) == '0') {
+                              i++;
+                          }
+                          if (i > 10) {
+                              i = 10;
+                          }
+                          int exp = ((this.digits[0] == 0) ?
+                                     0 :
+                                     (this.scale - decimalPos));
+                          dst = FormatExponent(buffer, dst, exp, ch, sign, NumberFormatInfo.negativeSign, i);
+                          scientific = false;
+                      } else {
+                          buffer[dst] = ch;
+                          dst++;
+                          if (Get(format, src) == '+' || Get(format, src) == '-') {
+                              buffer[dst] = Get(format, src);
+                              dst++;
+                              src++;
+                          }
+                          while (Get(format, src) != 0) {
+                              buffer[dst] = Get(format, src);
+                              dst++;
+                              src++;
+                          }
+                      }
+                      break;
+                  }
+                  default:
+                    buffer[dst] = ch;
+                    dst++;
+                    break;
+                }
+                ch = Get(format, src);
+                src++;
+            }
+            return String.StringCTOR(buffer, 0, dst);
+        }
+
+        private static int FindSection(String format, int section) {
+            if (section == 0) {
+                return 0;
+            }
+            int src = 0;
+            while (true) {
+                char ch = Get(format, src);
+                src++;
+                switch (ch) {
+                  case '\'':
+                  case '"':
+                    while (Get(format, src) != '\0' && Get(format, src) != ch) {
+                        src++;
+                    }
+                    break;
+                  case '\\':
+                    if (Get(format, src) != 0) {
+                        src++;
+                    }
+                    break;
+                  case ';':
+                    section--;
+                    if (section != 0) {
+                        break;
+                    }
+                    if (Get(format, src) != 0 && Get(format, src) != ';') {
+                        return src;
+                    }
+                    return 0;
+                  case '\0':
+                    return 0;
+                }
+            }
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        // STRINGREF Int32ToDecStr(int value, int digits, STRINGREF sNegative)
+        private static String Int32ToDecString(int value, int digits, String sign) {
+            //THROWSCOMPLUSEXCEPTION();
+            //CQuickBytes buf;
+
+            int bufferLength = 100; // was UINT
+            int negLength = 0;
+            // wchar* src = NULL;
+            if (digits < 1) digits = 1;
+
+            if (value < 0) {
+                //src = sNegative->GetBuffer();
+                negLength = sign.Length;
+                if (negLength > 85) {
+                    bufferLength = negLength + 15; //was implicit C++ cast
+                }
+            }
+
+            char[] buffer = new char[bufferLength];
+            //if (!buffer)
+            //    COMPlusThrowOM();
+
+            int p = bufferLength;
+            Int32ToDecChars(buffer, ref p, (uint)(value >= 0? value: -value), digits);
+            if (value < 0) {
+                for (int i = negLength - 1; i >= 0; i--) {
+                    buffer[--p] = sign[i];
+                    // *(--p) = *(src+i);
+                }
+            }
+
+            // _ASSERTE( buffer + bufferLength - p >=0 && buffer <= p);
+            return String.StringCTOR(buffer, p, bufferLength-p);
+            // return COMString::NewString(p, buffer + bufferLength - p);
+        }
+
+        private static String Int32ToHexString(uint value,
+                                               char hexBase,
+                                               int digits) {
+            char[] buffer = new char[100];
+            if (digits < 1) {
+                digits = 1;
+            }
+            int start = Int32ToHexChars(buffer, 100, value, hexBase, digits);
+            return String.StringCTOR(buffer, start, 100-start);
+        }
+
+        private static int Int32ToHexChars(char[] buffer, int offset, uint value,
+                                           char hexBase, int digits) {
+            while (digits > 0 || value != 0) {
+                digits--;
+                uint digit = value & 0xf;
+                offset--;
+                buffer[offset] = (char) (digit + (digit < 10 ? '0' : hexBase));
+                value >>= 4;
+            }
+            return offset;
+        }
+
+        private static String UInt32ToDecString(uint value, int digits) {
+            int bufferLength = 100;
+            if (digits < 1) digits = 1;
+            char[] buffer = new char[bufferLength];
+            int p = bufferLength;
+            Int32ToDecChars(buffer, ref p, value, digits);
+            return String.StringCTOR(buffer, p, bufferLength-p);
+        }
+
+        // used to be macros
+        private static uint LO32(ulong x) { return (uint)(x); }
+        private static uint HI32(ulong x) {
+            return (uint)((((ulong)x) & 0xFFFFFFFF00000000L) >> 32);
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        //STRINGREF Int64ToDecStr(__int64 value, int digits, STRINGREF sNegative)
+        private static String Int64ToDecString(long value, int digits, String sign) {
+            //THROWSCOMPLUSEXCEPTION();
+            //CQuickBytes buf;
+
+            if (digits < 1) digits = 1;
+            int signNum = (int)HI32(unchecked((ulong)value));
+            int bufferLength = 100; // was UINT
+
+            if (signNum < 0) {
+                value = -value;
+                int negLength = sign.Length;
+                if (negLength > 75) {// Since max is 20 digits
+                    bufferLength = negLength + 25;
+                }
+            }
+
+            char[] buffer = new char[bufferLength];
+            //if (!buffer)
+            //    COMPlusThrowOM();
+            int p = bufferLength;
+            while (HI32(unchecked((ulong)value)) != 0) {
+                uint rem;
+                value = (long) Int64DivMod1E9((ulong)value, out rem);
+                Int32ToDecChars(buffer, ref p, rem, 9);
+                digits -= 9;
+            }
+            Int32ToDecChars(buffer, ref p, LO32(unchecked((ulong)value)), digits);
+            if (signNum < 0) {
+                for (int i=sign.Length - 1; i >= 0; i--) {
+                    buffer[--p] = sign[i];
+                }
+            }
+            return String.StringCTOR(buffer, p, bufferLength-p);
+        }
+
+        private static int Int64ToHexChars(char[] buffer, int offset, ulong value,
+                                           char hexBase, int digits) {
+            while (digits > 0 || value != 0) {
+                digits--;
+                uint digit = ((uint)value) & 0xf;
+                offset--;
+                buffer[offset] = (char) (digit + (digit < 10 ? '0' : hexBase));
+                value >>= 4;
+            }
+            return offset;
+        }
+
+        private static String Int64ToHexString(ulong value,
+                                               char hexBase,
+                                               int digits) {
+            char[] buffer = new char[100];
+            if (digits < 1) {
+                digits = 1;
+            }
+            int start = Int64ToHexChars(buffer, 100, value, hexBase, digits);
+            return String.StringCTOR(buffer, start, 100-start);
+        }
+
+        private static String UInt64ToDecString(ulong value, int digits) {
+            int bufferLength = 100;
+            char[] buffer = new char[bufferLength];
+            if (digits < 1) digits = 1;
+            int p = bufferLength;
+            while (HI32(value) != 0) {
+                uint rem;
+                value = Int64DivMod1E9(value, out rem);
+                Int32ToDecChars(buffer, ref p, rem, 9);
+                digits -= 9;
+            }
+            Int32ToDecChars(buffer, ref p, LO32(value), digits);
+            return String.StringCTOR(buffer, p, bufferLength-p);
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        // wchar* Int32ToDecChars(wchar* p, unsigned int value, int digits)
+        // There's a x86 asm version there too.
+        private static void Int32ToDecChars(char[] buffer, ref int bufferIndex,
+                                            uint value, int digits) {
+            while (--digits >= 0 || value != 0) {
+                buffer[--bufferIndex] = (char) (value % 10 + '0');
+                value /= 10;
+            }
+        }
+
+        private static void Int64ToDecChars(char[] buffer, ref int bufferIndex,
+                                            ulong value, int digits) {
+            while (--digits >= 0 || value != 0) {
+                buffer[--bufferIndex] = (char) (value % 10 + '0');
+                value /= 10;
+            }
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        // void RoundNumber(NUMBER* number, int pos)
+        private void RoundNumber(int pos) {
+            int i = 0;
+            while (i < pos && this.digits[i] != 0) i++;
+            if (i == pos && this.digits[i] >= '5') {
+                while (i > 0 && this.digits[i - 1] == '9') i--;
+                if (i > 0) {
+                    this.digits[i - 1]++;
+                } else {
+                    this.scale++;
+                    this.digits[0] = '1';
+                    i = 1;
+                }
+            } else {
+                while (i > 0 && this.digits[i - 1] == '0') i--;
+            }
+            if (i == 0) {
+                this.scale = 0;
+                this.negative = false;
+            }
+            this.digits[i] = '\0';
+        }
+
+        // wchar* FormatExponent(wchar* buffer, int value, wchar expChar,
+        //                       STRINGREF posSignStr, STRINGREF negSignStr,
+        //                       int minDigits)
+        private int FormatExponent(char[] buffer, int bufferIndex, int value,
+                                   char expChar, String posSignStr,
+                                   String negSignStr, int minDigits) {
+            char[] digits = new char[11];
+            buffer[bufferIndex++] = expChar;
+            if (value < 0) {
+                bufferIndex = AddStringRef(buffer, bufferIndex, negSignStr);
+                value = -value;
+            } else {
+                if (posSignStr != null) {
+                    bufferIndex = AddStringRef(buffer, bufferIndex, posSignStr);
+                }
+            }
+            int p = 10;
+            // REVIEW: (int) was implicit in C++ code
+            Int32ToDecChars(digits, ref p, checked((uint)value), minDigits);
+            int i = 10 - p;
+            while (--i >= 0) buffer[bufferIndex++] = digits[p++];
+            return bufferIndex;
+        }
+
+        //wchar* FormatGeneral(wchar* buffer, NUMBER* number, int digits,
+        //                     wchar expChar, NUMFMTREF numfmt)
+        private int FormatGeneral(char[] buffer, int bufferIndex,
+                                  int digits, char expChar) {
+            int digPos = this.scale;
+            bool scientific = false;
+            if (digPos > digits || digPos < -3) {
+                digPos = 1;
+                scientific = true;
+            }
+            int dig = 0; // number->digits;
+            if (digPos > 0) {
+                do {
+                    buffer[bufferIndex++] =
+                        this.digits[dig] != 0 ? this.digits[dig++] : '0';
+                } while (--digPos > 0);
+            }
+            else {
+                buffer[bufferIndex++] = '0';
+            }
+            if (this.digits[dig] != 0) {
+                bufferIndex = AddStringRef(buffer, bufferIndex,
+                                           NumberFormatInfo.numberDecimalSeparator);
+                while (digPos < 0) {
+                    buffer[bufferIndex++] = '0';
+                    digPos++;
+                }
+                do {
+                    buffer[bufferIndex++] = this.digits[dig++];
+                } while (this.digits[dig] != 0);
+            }
+            if (scientific) {
+                bufferIndex = FormatExponent(buffer, bufferIndex,
+                                             this.scale - 1, expChar,
+                                             NumberFormatInfo.positiveSign,
+                                             NumberFormatInfo.negativeSign, 2);
+            }
+            return bufferIndex;
+        }
+
+        // wchar* FormatScientific(wchar* buffer, NUMBER* number,
+        //                         int digits, wchar expChar, NUMFMTREF numfmt)
+        private int FormatScientific(char[] buffer, int bufferIndex, int digits,
+                                     char expChar) {
+            int dig = 0;  // number->digits;
+            buffer[bufferIndex++] =
+                this.digits[dig] != 0 ? this.digits[dig++] : '0';
+            if (digits != 1) {
+                // For E0 we would like to suppress the decimal point
+                bufferIndex = AddStringRef(buffer, bufferIndex,
+                                           NumberFormatInfo.numberDecimalSeparator);
+            }
+            while (--digits > 0) {
+                buffer[bufferIndex++] =
+                    this.digits[dig] != 0 ? this.digits[dig++] : '0';
+            }
+            int e = this.digits[0] == 0 ? 0 : this.scale - 1;
+            bufferIndex = FormatExponent(buffer, bufferIndex, e, expChar,
+                                         NumberFormatInfo.positiveSign,
+                                         NumberFormatInfo.negativeSign,
+                                         3);
+            return bufferIndex;
+        }
+
+        // REVIEW: call the real wcslen?
+        private static int wcslen(char[] c, int i) {
+            int j;
+            for(j=i; j<c.Length; ++j) {
+                if(c[j] == '\0') break;
+            }
+            return j-i;
+        }
+
+        // wchar* FormatFixed(wchar* buffer, NUMBER* number, int digits,
+        //                    I4ARRAYREF groupDigitsRef, STRINGREF sDecimal,
+        //                    STRINGREF sGroup)
+        private int FormatFixed(char[] buffer, int bufferIndex, int digits,
+                                int[] groupDigits, String sDecimal,
+                                String sGroup) {
+            //          int bufferSize = 0;   // the length of the result buffer string.
+            int digPos = this.scale;
+            int dig = 0; // = number->digits;
+
+            if (digPos > 0) {
+                if (groupDigits != null) {
+                    // index into the groupDigits array.
+                    int groupSizeIndex = 0;
+                    // the current total of group size.
+                    int groupSizeCount = groupDigits[groupSizeIndex];
+                    // the length of groupDigits array.
+                    int groupSizeLen   = groupDigits.Length;
+                    // the length of the result buffer string.
+                    int bufferSize     = digPos;
+                    // the length of the group separator string.
+                    int groupSeparatorLen = sGroup.Length;
+                    // the current group size.
+                    int groupSize = 0;
+
+                    //
+                    // Find out the size of the string buffer for the result.
+                    //
+                    if (groupSizeLen != 0) // You can pass in 0 length arrays
+                    {
+                        while (digPos > groupSizeCount) {
+                            groupSize = groupDigits[groupSizeIndex];
+                            if (groupSize == 0) {
+                                break;
+                            }
+
+                            bufferSize += groupSeparatorLen;
+                            if (groupSizeIndex < groupSizeLen - 1) {
+                                groupSizeIndex++;
+                            }
+                            groupSizeCount += groupDigits[groupSizeIndex];
+                            if (groupSizeCount < 0 || bufferSize < 0) {
+                                throw new ArgumentOutOfRangeException();
+                                // if we overflow
+                                //COMPlusThrow(kArgumentOutOfRangeException);
+                            }
+                        }
+                        // If you passed in an array with one
+                        // entry as 0, groupSizeCount == 0
+                        if (groupSizeCount == 0)
+                            groupSize = 0;
+                        else
+                            groupSize = groupDigits[0];
+                    }
+
+                    groupSizeIndex = 0;
+                    int digitCount = 0;
+                    int digStart;
+                    int digLength = (int)wcslen(this.digits, dig);
+                    digStart = (digPos<digLength)?digPos:digLength;
+                    int p = bufferIndex + bufferSize - 1;
+                    // wchar* p = buffer + bufferSize - 1;
+
+                    for (int i = digPos - 1; i >=0; i--) {
+                        buffer[p--] = (i<digStart) ? this.digits[dig+i] : '0';
+
+                        if (groupSize > 0) {
+                            digitCount++;
+                            if (digitCount == groupSize && i != 0) {
+                                for (int j = groupSeparatorLen - 1; j >=0; j--) {
+                                    buffer[p--] = sGroup[j];
+                                }
+
+                                if (groupSizeIndex < groupSizeLen - 1) {
+                                    groupSizeIndex++;
+                                    groupSize = groupDigits[groupSizeIndex];
+                                }
+                                digitCount = 0;
+                            }
+                        }
+                    }
+                    bufferIndex += bufferSize;
+                    dig += digStart;
+                } else {
+                    do {
+                        buffer[bufferIndex++] =
+                            this.digits[dig] != 0 ? this.digits[dig++] : '0';
+                    } while (--digPos > 0);
+                }
+            }
+            else {
+                buffer[bufferIndex++] = '0';
+            }
+            if (digits > 0) {
+                bufferIndex = AddStringRef(buffer, bufferIndex, sDecimal);
+                while (digPos < 0 && digits > 0) {
+                    buffer[bufferIndex++] = '0';
+                    digPos++;
+                    digits--;
+                }
+                while (digits > 0) {
+                    buffer[bufferIndex++] =
+                        this.digits[dig] != 0 ? this.digits[dig++] : '0';
+                    digits--;
+                }
+            }
+            return bufferIndex;
+        }
+
+        // wchar* FormatNumber(wchar* buffer, NUMBER* number,
+        //                     int digits, NUMFMTREF numfmt)
+        private int FormatNumber(char[] buffer, int bufferIndex,
+                                 int digits) {
+            char ch;
+            String fmt = this.negative ?
+                negNumberFormats[NumberFormatInfo.numberNegativePattern] :
+                posNumberFormat;
+            int fmtIndex = 0;
+
+            for (; fmtIndex < fmt.Length; fmtIndex++) {
+                ch = fmt[fmtIndex];
+                switch (ch) {
+                  case '#':
+                    bufferIndex = FormatFixed(buffer, bufferIndex, digits,
+                                              NumberFormatInfo.numberGroupSizes,
+                                              NumberFormatInfo.numberDecimalSeparator,
+                                              NumberFormatInfo.numberGroupSeparator);
+                    break;
+                  case '-':
+                    bufferIndex = AddStringRef(buffer, bufferIndex,
+                                               NumberFormatInfo.negativeSign);
+                    break;
+                  default:
+                    buffer[bufferIndex++] = ch;
+                    break;
+                }
+            }
+            return bufferIndex;
+        }
+
+        // wchar* FormatPercent(wchar* buffer, NUMBER* number,
+        //                      int digits, NUMFMTREF numfmt)
+        private int FormatPercent(char[] buffer, int bufferIndex,
+                                  int digits) {
+            char ch;
+            String fmt = this.negative ?
+                negPercentFormats[NumberFormatInfo.percentNegativePattern] :
+                posPercentFormats[NumberFormatInfo.percentPositivePattern];
+            int fmtIndex = 0;
+
+            while ((ch = fmt[fmtIndex++]) != 0) {
+                switch (ch) {
+                  case '#':
+                    bufferIndex = FormatFixed(buffer, bufferIndex, digits,
+                                              NumberFormatInfo.percentGroupSizes,
+                                              NumberFormatInfo.percentDecimalSeparator,
+                                              NumberFormatInfo.percentGroupSeparator);
+                    break;
+                  case '-':
+                    bufferIndex = AddStringRef(buffer, bufferIndex,
+                                               NumberFormatInfo.negativeSign);
+                    break;
+                  case '%':
+                    bufferIndex = AddStringRef(buffer, bufferIndex,
+                                               NumberFormatInfo.percentSymbol);
+                    break;
+                  default:
+                    buffer[bufferIndex++] = ch;
+                    break;
+                }
+            }
+            return bufferIndex;
+        }
+
+        private uint D32DivMod1E9(uint hi32, uint lo32, out uint newlo32) {
+            ulong n = (((ulong) hi32) << 32) | lo32;
+            newlo32 = (uint) (n / 1000000000);
+            return (uint) (n % 1000000000);
+        }
+
+        private uint DecDivMod1E9(ref Decimal value) {
+            uint newhi, newmid, newlo;
+            uint result = D32DivMod1E9(D32DivMod1E9(D32DivMod1E9(0,
+                                                                 value.hi32,
+                                                                 out newhi),
+                                                    value.mid32,
+                                                    out newmid),
+                                       value.lo32,
+                                       out newlo);
+            value.hi32 = newhi;
+            value.mid32 = newmid;
+            value.lo32 = newlo;
+            return result;
+        }
+
+        // markples: see also Lightning\Src\VM\COMNumber.cpp::
+        // unsigned int Int64DivMod1E9(unsigned __int64* value)
+        // There's a x86 asm version there too.
+        // The interface is different because Bartok does not support
+        // taking the address of 64 bit values.
+        private static ulong Int64DivMod1E9(ulong value, out uint rem) {
+            rem = (uint)(value % 1000000000);
+            value /= 1000000000;
+            return value;
+        }
+
+        public static bool TryParseDouble(String s, NumberStyles style,out double result) {
+            throw new Exception("System.Number.TryParseDouble not implemented in Bartok!");
+        }
+
+
+        private const int DecimalPrecision = 29;
+        private const int NumberMaxDigits = 31;
+
+        private int precision;
+        private int scale;
+        private bool negative;
+        private char[] digits = new char[NumberMaxDigits+1];
+    }
+}
diff --git a/base/Kernel/System/Object.cs b/base/Kernel/System/Object.cs
new file mode 100644
index 0000000..5aec123
--- /dev/null
+++ b/base/Kernel/System/Object.cs
@@ -0,0 +1,322 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Object
+**
+**
+** Object is the root class for all CLR objects.  This class
+** defines only the basics.
+**
+** Date:  January 29, 1998
+**
+===========================================================*/
+
+namespace System {
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using CultureInfo = System.Globalization.CultureInfo;
+    using System.Threading;
+
+    using Microsoft.Bartok.Runtime;
+
+    // The Object is the root class for all object in the CLR System. Object
+    // is the super class for all other CLR objects and provide a set of methods and low level
+    // services to subclasses.  These services include object synchronization and support for clone
+    // operations.
+    //
+    //| <include path='docs/doc[@for="Object"]/*' />
+    [NoCCtor]
+    public class Object
+    {
+        internal PreHeader preHeader;
+        [AccessedByRuntime("Accessed from halexn.cpp")]
+        internal PostHeader postHeader;
+
+        // Allow us to pretend that the vtable field lives directly in Object.
+        internal VTable vtable {
+            [NoHeapAllocation]
+                [Inline]
+                get { return this.postHeader.vtableObject; }
+            [NoHeapAllocation]
+                [Inline]
+                set { this.postHeader.vtableObject = value; }
+        }
+
+        internal unsafe UIntPtr* VTableFieldAddr {
+            [NoHeapAllocation]
+            get { return Magic.toPointer(ref this.postHeader.vtableObject); }
+        }
+
+#if REFERENCE_COUNTING_GC
+      internal uint REF_STATE {
+          [Inline]
+          [ManualRefCounts]
+          [NoHeapAllocation]
+          get {
+              return this.postHeader.refState;
+          }
+          [Inline]
+          [ManualRefCounts]
+          [NoHeapAllocation]
+          set {
+              this.postHeader.refState = value;
+          }
+      }
+#else // REFERENCE_COUNTING_GC
+      internal uint REF_STATE {
+          [NoHeapAllocation]
+          [Inline]
+          get {
+              return 1;
+          }
+          [NoHeapAllocation]
+          [Inline]
+          set {
+          }
+      }
+#endif
+
+        // Creates a new instance of an Object.
+        //| <include path='docs/doc[@for="Object.Object"]/*' />
+        [Inline]
+        public Object()
+        {
+        }
+
+        // Returns a String which represents the object instance.  The default
+        // for an object is to return the fully qualified name of the class.
+        //
+        //| <include path='docs/doc[@for="Object.ToString"]/*' />
+        public virtual String ToString()
+        {
+            return GetType().FullName;
+        }
+
+        // Returns a boolean indicating if the passed in object obj is
+        // Equal to this.  Equality is defined as object equality for reference
+        // types and bitwise equality for value types using a loader trick to
+        // replace Equals with EqualsValue for value types).
+        //
+        //| <include path='docs/doc[@for="Object.Equals"]/*' />
+        [RequiredByBartok]
+        public virtual bool Equals(Object obj)
+        {
+            // This method is overridden for value types
+            return (this == obj);
+        }
+
+        //| <include path='docs/doc[@for="Object.Equals1"]/*' />
+        public static bool Equals(Object objA, Object objB) {
+            if (objA==objB) {
+                return true;
+            }
+            if (objA==null || objB==null) {
+                return false;
+            }
+            return objA.Equals(objB);
+        }
+
+        //| <include path='docs/doc[@for="Object.ReferenceEquals"]/*' />
+        public static bool ReferenceEquals (Object objA, Object objB) {
+            return objA == objB;
+        }
+
+        // GetHashCode is intended to serve as a hash function for this object.
+        // Based on the contents of the object, the hash function will return a suitable
+        // value with a relatively random distribution over the various inputs.
+        //
+        // The default implementation returns the sync block index for this instance.
+        // Calling it on the same object multiple times will return the same value, so
+        // it will technically meet the needs of a hash function, but it's pretty lame.
+        // Objects (& especially value classes) should override this method.
+        //
+        //| <include path='docs/doc[@for="Object.GetHashCode"]/*' />
+        public virtual int GetHashCode()
+        {
+            return MultiUseWord.GetHashCode(this);
+        }
+
+        /// <summary>
+        /// Test and set the state of the GC mark bit to be the same
+        /// as the passed flag. Note that this operation is not
+        /// synchronized so it is possible for multiple marking threads
+        /// to 'mark' the same object.
+        /// </summary>
+        [NoHeapAllocation]
+        internal unsafe bool GcMark(UIntPtr flag) {
+            UIntPtr *loc = this.VTableFieldAddr;
+            UIntPtr val = *loc;
+            VTable.Deny(val == UIntPtr.Zero);
+
+            if ((val & (UIntPtr)3) != flag) {
+                *loc = (val & ~(UIntPtr)3) + flag;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Return the current state of the GC mark bit.
+        /// </summary>
+        [NoHeapAllocation]
+        internal unsafe UIntPtr GcMark() {
+            UIntPtr *loc = this.VTableFieldAddr;
+            UIntPtr val = *loc;
+            return (val & 3);
+        }
+
+        internal unsafe VTable GcUnmarkedVTable {
+            [Inline]
+            [NoHeapAllocation]
+            get {
+                UIntPtr *loc = this.VTableFieldAddr;
+                return Magic.toVTable(Magic.fromAddress(~(UIntPtr)3 & *loc));
+            }
+        }
+
+        // Returns a Type object which represent this object instance.
+        //
+        //| <include path='docs/doc[@for="Object.GetType"]/*' />
+        [NoHeapAllocation]
+        public Type GetType()
+        {
+            return vtable.vtableType;
+        }
+
+        [NoHeapAllocation]
+        public virtual TypeCode GetTypeCode()
+        {
+            return TypeCode.Object;
+        }
+
+        // Allow an object to free resources before the object is reclaimed by the GC.
+        // Note: This defines a protected method called Finalize.
+        //| <include path='docs/doc[@for="Object.Finalize"]/*' />
+        [RequiredByBartok]
+        ~Object()
+        {
+        }
+
+        // Returns a new object instance that is a memberwise copy of this
+        // object.  This is always a shallow copy of the instance. The method is protected
+        // so that other object may only call this method on themselves.  It is intended to
+        // support the ICloneable interface.
+        //
+        //| <include path='docs/doc[@for="Object.MemberwiseClone"]/*' />
+        // BUGBUG: maybe we can try harder to mess up the GC?
+        protected Object MemberwiseClone()
+        {
+            if(this is String) {
+                return this;
+                // REVIEW: ok, but what in the world is the CLR doing?
+            }
+            Thread thread = Thread.CurrentThread;
+            if(this is Array) {
+                Array srcArray = (Array) this;
+                Array cloneArray;
+                int srcLength = srcArray.Length;
+                if (srcArray.IsVector) {
+                    cloneArray = GC.AllocateVector(srcArray.vtable, srcLength);
+                    CloneVectorContents(srcArray, cloneArray);
+                } else {
+                    int rank = srcArray.Rank;
+                    cloneArray =
+                        GC.AllocateArray(srcArray.vtable, rank, srcLength);
+                    CloneArrayContents(srcArray, cloneArray);
+                }
+                return cloneArray;
+            } else {
+                Object clone = GC.AllocateObject(this.vtable);
+                CloneObjectContents(this, clone);
+                return clone;
+            }
+        }
+
+#if !REFERENCE_COUNTING_GC && !DEFERRED_REFERENCE_COUNTING_GC
+
+      private unsafe static void CloneObjectContents(Object src, Object dst)
+      {
+          System.GCs.WriteBarrier.Clone(src, dst);
+      }
+
+      private unsafe static void CloneVectorContents(Array srcArray,
+                                                     Array dstArray)
+      {
+          System.GCs.WriteBarrier.Clone(srcArray, dstArray);
+      }
+
+      private unsafe static void CloneArrayContents(Array srcArray,
+                                                    Array dstArray)
+      {
+          System.GCs.WriteBarrier.Clone(srcArray, dstArray);
+      }
+
+#else
+
+        private unsafe static void CloneObjectContents(Object src, Object dst)
+        {
+            byte * dstNOTFIXED = (byte *)(Magic.addressOf(dst) + PostHeader.Size);
+            byte * srcNOTFIXED = (byte *)(Magic.addressOf(src) + PostHeader.Size);
+            int size = unchecked((int) src.vtable.baseLength);
+            // We don't copy the header fields, the vtable or the RS field!
+            size -= (PreHeader.Size + PostHeader.Size);
+#if REFERENCE_COUNTING_GC
+            GCs.ReferenceCountingCollector.
+                IncrementReferentRefCounts(Magic.addressOf(src), src.vtable);
+            GCs.ReferenceCountingCollector.
+                DecrementReferentRefCounts(Magic.addressOf(dst), dst.vtable);
+#elif DEFERRED_REFERENCE_COUNTING_GC
+            GCs.DeferredReferenceCountingCollector.
+                IncrementReferentRefCounts(Magic.addressOf(src), src.vtable);
+            GCs.DeferredReferenceCountingCollector.
+                DecrementReferentRefCounts(Magic.addressOf(dst), dst.vtable);
+#endif // REFERENCE_COUNTING_GC
+            Buffer.MoveMemory(dstNOTFIXED,srcNOTFIXED,size);
+        }
+
+        private unsafe static void CloneVectorContents(Array srcArray,
+                                                       Array dstArray)
+        {
+            int srcLength = srcArray.Length;
+            fixed (int *srcFieldPtr = &srcArray.field1) {
+                fixed (int *dstFieldPtr = &dstArray.field1) {
+                    byte *srcDataPtr = (byte *)
+                        srcArray.GetFirstElementAddress(srcFieldPtr);
+                    byte *dstDataPtr = (byte *)
+                        dstArray.GetFirstElementAddress(dstFieldPtr);
+                    int size = srcArray.vtable.arrayElementSize * srcLength;
+                    Buffer.MoveMemory(dstDataPtr, srcDataPtr, size);
+                }
+            }
+        }
+
+        private unsafe static void CloneArrayContents(Array srcArray,
+                                                      Array dstArray)
+        {
+            int srcLength = srcArray.Length;
+            fixed (int *srcFieldPtr = &srcArray.field1) {
+                fixed (int *dstFieldPtr = &dstArray.field1) {
+                    byte *srcDataPtr = (byte *)
+                        srcArray.GetFirstElementAddress(srcFieldPtr);
+                    byte *dstDataPtr = (byte *)
+                        dstArray.GetFirstElementAddress(dstFieldPtr);
+                    byte *srcDimPtr = (byte *)
+                        srcArray.GetFirstDimInfoRectangleArray();
+                    int dimInfoSize = (int) (srcDataPtr - srcDimPtr);
+                    int size = srcArray.vtable.arrayElementSize * srcLength;
+                    Buffer.MoveMemory(dstDataPtr - dimInfoSize,
+                                      srcDataPtr - dimInfoSize,
+                                      size + dimInfoSize);
+                }
+            }
+        }
+
+#endif
+
+    }
+}
diff --git a/base/Kernel/System/ObjectDisposedException.cs b/base/Kernel/System/ObjectDisposedException.cs
new file mode 100644
index 0000000..a6663fd
--- /dev/null
+++ b/base/Kernel/System/ObjectDisposedException.cs
@@ -0,0 +1,55 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+    using System;
+
+    //| <include path='docs/doc[@for="ObjectDisposedException"]/*' />
+    /// <devdoc>
+    ///    <para> The exception that is thrown when accessing an object that was
+    ///       disposed.</para>
+    /// </devdoc>
+    public class ObjectDisposedException : InvalidOperationException {
+        private String objectName;
+
+        //| <include path='docs/doc[@for="ObjectDisposedException.ObjectDisposedException"]/*' />
+        /// <devdoc>
+        /// <para>Initializes a new instance of the <see cref='System.ObjectDisposedException'/> class.</para>
+        /// </devdoc>
+        public ObjectDisposedException(String objectName) : base(String.Format("ObjectDisposed_Generic_ObjectName", objectName)) {
+            this.objectName = objectName;
+        }
+
+        //| <include path='docs/doc[@for="ObjectDisposedException.ObjectDisposedException2"]/*' />
+        /// <devdoc>
+        /// <para>Initializes a new instance of the <see cref='System.ObjectDisposedException'/> class.</para>
+        /// </devdoc>
+        public ObjectDisposedException(String objectName, String message) : base(message) {
+            this.objectName = objectName;
+        }
+
+        //| <include path='docs/doc[@for="ObjectDisposedException.Message"]/*' />
+        /// <devdoc>
+        ///    <para>Gets the text for the message for this exception.</para>
+        /// </devdoc>
+        public override String Message {
+            get {
+                String name = ObjectName;
+                if (name == null || name.Length == 0)
+                    return base.Message;
+                return base.Message + Environment.NewLine + String.Format("ObjectDisposed_ObjectName_Name", name);
+            }
+        }
+
+        //| <include path='docs/doc[@for="ObjectDisposedException.ObjectName"]/*' />
+        public String ObjectName {
+            get {
+                if (objectName == null)
+                    return String.Empty;
+                return objectName;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/ObsoleteAttribute.cs b/base/Kernel/System/ObsoleteAttribute.cs
new file mode 100644
index 0000000..f53a3fb
--- /dev/null
+++ b/base/Kernel/System/ObsoleteAttribute.cs
@@ -0,0 +1,68 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  ObsoleteAttribute
+**
+**
+** Purpose: Attribute for functions, etc that will be removed.
+**
+** Date:  September 22, 1999
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    // This attribute is attached to members that are not to be used any longer.
+    // Message is some human readable explanation of what to use
+    // Error indicates if the compiler should treat usage of such a method as an
+    //   error. (this would be used if the actual implementation of the obsolete
+    //   method's implementation had changed).
+    //
+    // Issue: do we need to be able to localize this message string?
+    //
+    //| <include path='docs/doc[@for="ObsoleteAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum |
+        AttributeTargets.Interface | AttributeTargets.Constructor | AttributeTargets.Method| AttributeTargets.Property  | AttributeTargets.Field | AttributeTargets.Event | AttributeTargets.Delegate
+        , Inherited = false)]
+    public sealed class ObsoleteAttribute : Attribute
+    {
+        private String _message;
+        private bool _error;
+
+        //| <include path='docs/doc[@for="ObsoleteAttribute.ObsoleteAttribute"]/*' />
+        public ObsoleteAttribute ()
+        {
+            _message = null;
+            _error = false;
+        }
+
+        //| <include path='docs/doc[@for="ObsoleteAttribute.ObsoleteAttribute1"]/*' />
+        public ObsoleteAttribute (String message)
+        {
+            _message = message;
+            _error = false;
+        }
+
+        //| <include path='docs/doc[@for="ObsoleteAttribute.ObsoleteAttribute2"]/*' />
+        public ObsoleteAttribute (String message, bool error)
+        {
+            _message = message;
+            _error = error;
+        }
+
+        //| <include path='docs/doc[@for="ObsoleteAttribute.Message"]/*' />
+        public String Message {
+            get {return _message;}
+        }
+
+        //| <include path='docs/doc[@for="ObsoleteAttribute.IsError"]/*' />
+        public bool IsError{
+            get {return _error;}
+        }
+
+    }
+}
diff --git a/base/Kernel/System/OutOfMemoryException.cs b/base/Kernel/System/OutOfMemoryException.cs
new file mode 100644
index 0000000..69ae2da
--- /dev/null
+++ b/base/Kernel/System/OutOfMemoryException.cs
@@ -0,0 +1,39 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: OutOfMemoryException
+**
+**
+** Purpose: The exception class for OOM.
+**
+** Date: March 17, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="OutOfMemoryException"]/*' />
+    public class OutOfMemoryException : SystemException {
+        //| <include path='docs/doc[@for="OutOfMemoryException.OutOfMemoryException"]/*' />
+        public OutOfMemoryException()
+            : base("Arg_OutOfMemoryException") {
+        }
+
+        //| <include path='docs/doc[@for="OutOfMemoryException.OutOfMemoryException1"]/*' />
+        public OutOfMemoryException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="OutOfMemoryException.OutOfMemoryException2"]/*' />
+        public OutOfMemoryException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/OverflowException.cs b/base/Kernel/System/OverflowException.cs
new file mode 100644
index 0000000..44b39a2
--- /dev/null
+++ b/base/Kernel/System/OverflowException.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: OverflowException
+**
+**
+** Purpose: Exception class for Arithmetic Overflows.
+**
+** Date: August 31, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="OverflowException"]/*' />
+    [RequiredByBartok]
+    public class OverflowException : ArithmeticException {
+        //| <include path='docs/doc[@for="OverflowException.OverflowException"]/*' />
+        [AccessedByRuntime("referenced from halasm.asm")]
+        public OverflowException()
+            : base("Arg_OverflowException") {
+        }
+
+        //| <include path='docs/doc[@for="OverflowException.OverflowException1"]/*' />
+        public OverflowException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="OverflowException.OverflowException2"]/*' />
+        public OverflowException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/ParamArrayAttribute.cs b/base/Kernel/System/ParamArrayAttribute.cs
new file mode 100644
index 0000000..29ec46c
--- /dev/null
+++ b/base/Kernel/System/ParamArrayAttribute.cs
@@ -0,0 +1,25 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ParamArrayAttribute
+**
+**
+** Purpose: Container for assemblies.
+**
+** Date: Mar 01, 2000
+**
+=============================================================================*/
+namespace System
+{
+   //| <include path='docs/doc[@for="ParamArrayAttribute"]/*' />
+   [AttributeUsage (AttributeTargets.Parameter, Inherited=true, AllowMultiple=false)]
+   public sealed class ParamArrayAttribute : Attribute
+   {
+      //| <include path='docs/doc[@for="ParamArrayAttribute.ParamArrayAttribute"]/*' />
+      public ParamArrayAttribute () {}
+   }
+}
diff --git a/base/Kernel/System/ParseNumbers.cs b/base/Kernel/System/ParseNumbers.cs
new file mode 100644
index 0000000..3790732
--- /dev/null
+++ b/base/Kernel/System/ParseNumbers.cs
@@ -0,0 +1,581 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  ParseNumbers
+**
+**
+** Purpose: Methods for Parsing numbers and Strings.
+** All methods are implemented in native.
+**
+** Date:  April 7, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    internal class ParseNumbers {
+        internal const int PrintAsI1=0x40;
+        internal const int PrintAsI2=0x80;
+        internal const int PrintAsI4=0x100;
+        internal const int TreatAsUnsigned=0x200;
+        internal const int TreatAsI1=0x400;
+        internal const int TreatAsI2=0x800;
+        internal const int IsTight=0x1000;
+        internal static readonly int[] ZeroStart = {0};
+
+        //
+        // NATIVE METHODS
+        // For comments on these methods please see $\src\vm\COMUtilNative.cpp
+        //
+        public static long StringToLong(System.String s, int radix, int flags) {
+            int [] zeroStart = {0};
+            return StringToLong(s,radix,flags,zeroStart);
+        }
+
+        public static int StringToInt(System.String s, int radix, int flags) {
+            int [] zeroStart = {0};
+            return StringToInt(s,radix,flags,zeroStart);
+        }
+
+        // From Lightning\Src\VM\COMUtilNative.cpp:: enum FmtFlags
+        internal const int LeftAlign = 0x1;
+        internal const int CenterAlign = 0x2;
+        internal const int RightAlign = 0x4;
+        internal const int PrefixSpace = 0x8;
+        internal const int PrintSign = 0x10;
+        internal const int PrintBase = 0x20;
+        //internal const int TreatAsUnsigned = 0x10;
+        //internal const int PrintAsI1 = 0x40;
+        //internal const int PrintAsI2 = 0x80;
+        //internal const int PrintAsI4 = 0x100;
+        internal const int PrintRadixBase = 0x200;
+        internal const int AlternateForm = 0x400;
+
+        internal const int MinRadix=2;
+        internal const int MaxRadix=36;
+
+        static private int EatWhiteSpace(String buffer, int length, int i) {
+            for (; i<length && Char.IsWhiteSpace(buffer[i]); i++);
+            return i;
+        }
+
+        static private uint GrabInts(uint radix, String buffer, int length,
+                                     ref int i,bool isUnsigned) {
+            uint result=0;
+            uint value;
+            uint maxVal;
+#if DEBUG
+            if (!(radix==2 || radix==8 || radix==10 || radix==16)) {
+                VTable.DebugBreak();
+            }
+#endif
+            // Allow all non-decimal numbers to set the sign bit.
+            if (radix==10 && !isUnsigned) {
+                maxVal = (0x7FFFFFFF / 10);
+                while (i < length && IsDigit(buffer[i], radix, out value)) {
+                    // Read all of the digits and convert to a number
+                    // Check for overflows - this is sufficient & correct.
+                    if (result > maxVal || ((int)result)<0) {
+                        throw new OverflowException("Overflow_Int32");
+                    }
+                    result = result * radix + value;
+                    i++;
+                }
+                if ((int)result<0 && result!=0x80000000) {
+                    throw new OverflowException("Overflow_Int32");
+                }
+            } else {
+                maxVal = UInt32.MaxValue / radix;
+                while (i < length && IsDigit(buffer[i], radix, out value)) {
+                    // Read all of the digits and convert to a number
+                    // Check for overflows - this is sufficient & correct.
+                    if (result > maxVal) {
+                        throw new OverflowException("Overflow_UInt32");
+                    }
+                    result = result * radix + value;
+                    i++;
+                }
+            }
+            return result;
+        }
+
+        static private ulong GrabLongs(uint radix, String buffer, int length,
+                                       ref int i, bool isUnsigned) {
+            ulong result = 0;
+            uint value;
+            ulong maxVal;
+            // Allow all non-decimal numbers to set the sign bit.
+            if (radix == 10 && !isUnsigned) {
+                maxVal = (0x7FFFFFFFFFFFFFFF / 10);
+                while (i < length && IsDigit(buffer[i], radix, out value)) {
+                    // Read all of the digits and convert to a number
+                    // Check for overflows - this is sufficient & correct.
+                    if (result > maxVal || ((long) result) < 0) {
+                        throw new OverflowException("Overflow_Int64");
+                    }
+                    result = result * radix + value;
+                    i++;
+                }
+                if ((long) result < 0 && result != 0x8000000000000000) {
+                    throw new OverflowException("Overflow_Int64");
+                }
+            } else {
+                maxVal = unchecked((ulong) -1L) / radix;
+                while (i < length && IsDigit(buffer[i], radix, out value)) {
+                    // Read all of the digits and convert to a number
+                    // Check for overflows - this is sufficient & correct.
+                    if (result > maxVal) {
+                        throw new OverflowException("Overflow_Int64");
+                    }
+                    result = result * radix + value;
+                    i++;
+                }
+            }
+            return result;
+        }
+
+        static bool IsDigit(char c, uint radix, out uint result) {
+            if (c>='0' && c<='9') {
+                result = (uint) (c-'0');
+            } else {
+                char d = Char.ToLower(c);
+                if (d>='a' && d<='z') {
+                    //+10 is necessary because a is actually 10, etc.
+                    result = (uint) (d-'a'+10);
+                } else {
+                    result = 0;
+                    return false;
+                }
+            }
+            return (result < radix);
+        }
+
+        public static int StringToInt(String s, int radix, int flags,
+                                      int[] currPos)
+        {
+            if (s == null) {
+                return 0;
+            }
+            int i = currPos[0];
+            //Do some radix checking.
+            //A radix of -1 says to use whatever base is spec'd on the number.
+            //Parse in Base10 until we figure out what the base actually is.
+            uint r = (-1==radix)?10U:(uint)radix;
+            if (r!=2 && r!=10 && r!=8 && r!=16) {
+                throw new ArgumentException("Arg_InvalidBase");
+            }
+            int length = s.Length;
+            if (i <0 || i>=length) {
+                throw new ArgumentOutOfRangeException("startIndex(currPos[0])");
+            }
+            // Get rid of the whitespace and then check that we've still got
+            // some digits to parse.
+            if ((flags & IsTight) != 0) {
+                i = EatWhiteSpace(s,length,i);
+                if (i==length) {
+                    throw new FormatException("Format_EmptyInputString");
+                }
+            }
+            int sign = 1;
+            bool isUnsigned = ((flags & TreatAsUnsigned) != 0);
+            if (s[i]=='-') { // Check for a sign
+                if (r != 10) {
+                    throw new ArgumentException("ArgCannotHaveNegativeValue");
+                }
+                if (isUnsigned) {
+                    throw new OverflowException("Overflow_NegativeUnsigned");
+                }
+                sign = -1;
+                i++;
+            } else if (s[i]=='+') {
+                i++;
+            }
+            //Consume the 0x if we're in an unknown base or in base 16.
+            if ((radix==-1||radix==16) && (i+1<length) && s[i]=='0') {
+                if (s[i+1]=='x' || s[i+1]=='X') {
+                    r=16;
+                    i+=2;
+                }
+            }
+            int grabNumbersStart=i;
+            uint result = GrabInts(r,s,length,ref i, isUnsigned);
+            if (i==grabNumbersStart) {
+                throw new FormatException("Format_NoParsibleDigits");
+            }
+            if ((flags & IsTight) != 0) {
+                //   i = EatWhiteSpace(s,length,i);
+                //If we've got effluvia left at the end of the string, complain.
+                if (i<(length)) {
+                    throw new FormatException("Format_ExtraJunkAtEnd");
+                }
+            }
+            //Put the current index back into the correct place.
+            currPos[0]=i;
+            //Return the value properly signed.
+            if ((flags & TreatAsI1) != 0) {
+                if (result > 0xFF) {
+                    throw new OverflowException("Overflow_SByte");
+                }
+                // _ASSERTE(sign==1 || r==10);  // result looks positive when parsed as an I4
+                if (result >= 0x80){
+                    sign = -1;
+                }
+            } else if ((flags & TreatAsI2) != 0) {
+                if (result > 0xFFFF) {
+                    throw new OverflowException("Overflow_Int16");
+                }
+                // _ASSERTE(sign==1 || r==10);  // result looks positive when parsed as an I4
+                if (result >= 0x8000) {
+                    sign = -1;
+                }
+            } else if (result == 0x80000000 && sign==1 && r==10) {
+                throw new OverflowException("Overflow_Int32");
+            }
+            if (r == 10) {
+                return unchecked((int)result) * sign;
+            } else {
+                return unchecked((int) result);
+            }
+        }
+
+        public static long StringToLong(String s, int radix, int flags, int[] currPos) {
+            if (s == null) {
+                return 0L;
+            }
+            int i = currPos[0];
+            //Do some radix checking.
+            //A radix of -1 says to use whatever base is spec'd on the number.
+            //Parse in Base10 until we figure out what the base actually is.
+            uint r = (-1==radix)?10U:(uint)radix;
+            if (r!=2 && r!=10 && r!=8 && r!=16) {
+                throw new ArgumentException("Arg_InvalidBase");
+            }
+            int length = s.Length;
+            if (i < 0 || i >= length) {
+                throw new ArgumentOutOfRangeException("startIndex(currPos[0])");
+            }
+            // Get rid of the whitespace and then check that we've still
+            // got some digits to parse.
+            if ((flags & IsTight) != 0) {
+                i = EatWhiteSpace(s,length,i);
+                if (i == length) {
+                    throw new FormatException("EmptyInputString");
+                }
+            }
+            int sign = 1;
+            bool isUnsigned = ((flags & TreatAsUnsigned) != 0);
+            if (s[i] == '-') {
+                if (r != 10) {
+                    throw new ArgumentException("Negative non-base-10 number");
+                }
+                if (isUnsigned) {
+                    throw new OverflowException("Negative unsigned number");
+                }
+                sign = -1;
+                i++;
+            } else if (s[i] == '+') {
+                i++;
+            }
+            //Consume the 0x if we're in an unknown base or in base 16.
+            if ((radix==-1||radix==16) && (i+1<length) && s[i]=='0') {
+                if (s[i+1]=='x' || s[i+1]=='X') {
+                    r=16;
+                    i+=2;
+                }
+            }
+            int grabNumbersStart = i;
+            ulong result = GrabLongs(r,s,length,ref i,isUnsigned);
+            if (i == grabNumbersStart) {
+                throw new FormatException("No parsable digits");
+            }
+            if ((flags & IsTight) != 0) {
+                if (i < length) {
+                    throw new FormatException("Extra junk at end");
+                }
+            }
+            //Put the current index back into the correct place.
+            currPos[0]=i;
+            //Return the value properly signed.
+            if (result == 0x8000000000000000 && sign==1 && r==10) {
+                throw new OverflowException("Overflow_Int64");
+            }
+            if (r == 10) {
+                return unchecked((long) result) * sign;
+            } else {
+                return unchecked((long) result);
+            }
+        }
+
+        public static String IntToDecimalString(int i) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::IntToDecimalString
+            int count;
+            char[] buffer = IntToDecimalChars(i, out count);
+            return String.StringCTOR(buffer, 0, count);
+        }
+
+        internal static char[] IntToDecimalChars(int value, out int count) {
+            char[] result = new char[66];
+            bool isNegative;
+            uint uValue;
+            if (value == 0) {
+                result[0] = '0';
+                count = 1;
+                return result;
+            }
+            if (value < 0) {
+                isNegative = true;
+                uValue = (uint) -value;
+            } else {
+                isNegative = false;
+                uValue =  (uint) value;
+            }
+            int index = 0;
+            do {
+                result[index] = (char) ((uValue % 10) + '0');
+                index++;
+                uValue = uValue / 10;
+            } while (uValue != 0);
+            if (isNegative) {
+                result[index] = '-';
+                index++;
+            }
+            // Reverse the characters in the buffer
+            int limit = index / 2;
+            count = limit;
+            int i = 0;
+            index--;
+            while (i < index) {
+                char t = result[i];
+                result[i] = result[index];
+                result[index] = t;
+                i++;
+                index--;
+            }
+            return result;
+        }
+
+        //FCIMPL5(LPVOID, ParseNumbers::IntToString, INT32 n, INT32 radix,
+        //        INT32 width, WCHAR paddingChar, INT32 flags);
+        public static String IntToString(int n, int radix, int width,
+                                         char paddingChar, int flags) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::IntToString
+
+            // changed to fill the char[] backwards to call a normal
+            // stringCTOR and not have an additional copy
+
+            bool isNegative = false;
+            int charVal;
+            int buffLength;
+            uint l;
+
+            // Longest possible string length for an integer in
+            // binary notation with prefix
+            int bufSize = 66;
+            char[] buffer = new char[bufSize];
+            int index=bufSize;
+
+            if (radix<MinRadix || radix>MaxRadix) {
+                throw new ArgumentException("Argument_InvalidBase");
+                //COMPlusThrowArgumentException(L"radix", L"Arg_InvalidBase");
+            }
+
+            //If the number is negative, make it positive and remember the sign.
+            //If the number is MIN_VALUE, this will still be negative,
+            //so we'll have to special case this later.
+            if (n<0) {
+                isNegative=true;
+                // For base 10, write out -num, but other bases write out the
+                // 2's complement bit pattern
+                if (10==radix)
+                    l = (uint)(-n);
+                else
+                    l = (uint)n; // REVIEW: markples: comment suggests ~n wanted
+            } else {
+                l=(uint)n;
+            }
+
+            //The conversion to a UINT will sign extend the number.  In order to
+            //ensure that we only get as many bits as we expect, we chop the
+            //number.
+            if ((flags & PrintAsI1) != 0) {
+                l = l&0xFF;
+            } else if ((flags & PrintAsI2) != 0) {
+                l = l&0xFFFF;
+            } else if ((flags & PrintAsI4) != 0) {
+                l=l&0xFFFFFFFF;
+            }
+
+            if (0==l) { //Special case the 0.
+                buffer[--index]='0';
+            } else {
+                do {
+                    charVal = (int) (l%(uint)radix);
+                    l=l/(uint)radix;
+                    if (charVal<10) {
+                        buffer[--index] = (char)(charVal + '0');
+                    } else {
+                        buffer[--index] = (char)(charVal + 'a' - 10);
+                    }
+                } while (l!=0);
+            }
+            //If they want the base, append that to the string (in reverse order)
+            if (radix!=10 && ((flags & PrintBase)!=0)) {
+                if (16==radix) {
+                    buffer[--index]='x';
+                    buffer[--index]='0';
+                } else if (8==radix) {
+                    buffer[--index]='0';
+                }
+            }
+
+            if (10==radix) {
+                if (isNegative) {
+                    //If it was negative, append the sign.
+                    buffer[--index]='-';
+                } else if ((flags&PrintSign)!=0) {
+                    //else if they requested, add the '+';
+                    buffer[--index]='+';
+                } else if ((flags&PrefixSpace)!=0) {
+                    //If they requested a leading space, put it on.
+                    buffer[--index]=' ';
+                }
+            }
+
+            //Figure out the size of our string.
+            if (width<=bufSize-index) {
+                buffLength=bufSize-index;
+            } else {
+                buffLength=width;
+            }
+
+            String local = String.StringCTOR(buffer, index, bufSize-index);
+
+            //markples: Pad if necessary, open up access to String if you
+            //don't want to make a new string here
+            if ((flags&LeftAlign)!=0) {
+                local = local.PadRight(buffLength,paddingChar);
+            } else {
+                local = local.PadLeft(buffLength,paddingChar);
+            }
+
+            return local;
+        }
+
+        //FCIMPL5(LPVOID, ParseNumbers::LongToString, INT32 radix, INT32 width,
+        //        INT64 n, WCHAR paddingChar, INT32 flags)
+        public static String LongToString(long n, int radix, int width,
+                                          char paddingChar, int flags) {
+            // rusa: see also Lightning\Src\VM\COMUtilNative.cpp::LongToString,
+            bool isNegative = false;
+            int charVal;
+            ulong l;
+            int buffLength=0;
+
+            //Longest possible string length for an integer in
+            //binary notation with prefix
+            int bufSize = 67;
+            char[] buffer = new char[67];
+            int index=bufSize;
+
+            if (radix<MinRadix || radix>MaxRadix) {
+                throw new ArgumentException("Argument_InvalidBase");
+                //COMPlusThrowArgumentException(L"radix", L"Arg_InvalidBase");
+            }
+
+            //If the number is negative, make it positive and remember the sign.
+            if (n<0) {
+                isNegative=true;
+                // For base 10, write out -num, but other bases write out the
+                // 2's complement bit pattern
+                if (10==radix)
+                    l = (ulong)(-n);
+                else
+                    l = (ulong)n; // REVIEW: markples: comment suggests ~n wanted
+            } else {
+                l=(ulong)n;
+            }
+
+            if ((flags & PrintAsI1) != 0) {
+                l = l&0xFF;
+            } else if ((flags&PrintAsI2) != 0) {
+                l = l&0xFFFF;
+            } else if ((flags&PrintAsI4) != 0) {
+                l=l&0xFFFFFFFF;
+            }
+
+            //Special case the 0.
+            if (0==l) {
+                buffer[--index]='0';
+            } else {
+                //Pull apart the number and put the digits (in
+                //reverse order) into the buffer.
+                for ( ; l>0; l=l/(ulong)radix) {
+                    if ((charVal=(int)(l%(ulong)radix))<10) {
+                        buffer[--index] = (char)(charVal + '0');
+                    } else {
+                        buffer[--index] = (char)(charVal + 'a' - 10);
+                    }
+                }
+            }
+
+            //If they want the base, append that to the string (in reverse order)
+            if (radix!=10 && ((flags&PrintBase)!=0)) {
+                if (16==radix) {
+                    buffer[--index]='x';
+                    buffer[--index]='0';
+                } else if (8==radix) {
+                    buffer[--index]='0';
+                } else if ((flags&PrintRadixBase)!=0) {
+                    buffer[--index]='#';
+                    buffer[--index]=(char)((radix%10)+'0');
+                    buffer[--index]=(char)((radix/10)+'0');
+                }
+            }
+
+            if (10==radix) {
+                if (isNegative) {
+                    //If it was negative, append the sign.
+                    buffer[--index]='-';
+                } else if ((flags&PrintSign)!=0) {
+                    //else if they requested, add the '+';
+                    buffer[--index]='+';
+                } else if ((flags&PrefixSpace)!=0) {
+                    //If they requested a leading space, put it on.
+                    buffer[--index]=' ';
+                }
+            }
+
+            //Figure out the size of our string.
+            if (width<=bufSize-index) {
+                buffLength=bufSize-index;
+            } else {
+                buffLength=width;
+            }
+
+            String local = String.StringCTOR(buffer, index, bufSize-index);
+
+            //markples: Pad if necessary, open up access to String if you
+            //don't want to make a new string here
+            if ((flags&LeftAlign)!=0) {
+                local = local.PadRight(buffLength,paddingChar);
+            } else {
+                local = local.PadLeft(buffLength,paddingChar);
+            }
+
+            return local;
+        }
+
+        private static String LongToString(int radix, int width, long l, char paddingChar, int flags) {
+            // Just in case the C# compiler gets smart enough to inline the
+            // original version of the above method (which calls the original
+            // version of this method to avoid a problem with fastcall not
+            // liking int64 as a first argument).
+            return LongToString(l, radix, width, paddingChar, flags);
+        }
+    }
+}
diff --git a/base/Kernel/System/ProcessExitCode.cs b/base/Kernel/System/ProcessExitCode.cs
new file mode 100644
index 0000000..44454bb
--- /dev/null
+++ b/base/Kernel/System/ProcessExitCode.cs
@@ -0,0 +1,19 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public enum ProcessExitCode : int
+    {
+        Success = 0,
+        ErrorDefault = -1,
+        MainMax = 0x3fffffff,
+        MainMin = -0x3fffffff,
+        StopMax = -0x7fff0000,
+        StopMin = Int32.MinValue,
+        StopDefault = StopMin,
+    }
+}
diff --git a/base/Kernel/System/ProcessStateException.cs b/base/Kernel/System/ProcessStateException.cs
new file mode 100644
index 0000000..81eae6b
--- /dev/null
+++ b/base/Kernel/System/ProcessStateException.cs
@@ -0,0 +1,24 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System
+{
+    public class ProcessStateException : SystemException
+    {
+        public ProcessStateException() : base("Arg_ProcessStateException")
+        {
+        }
+
+        public ProcessStateException(String message) : base(message)
+        {
+        }
+
+        public ProcessStateException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/base/Kernel/System/Random.cs b/base/Kernel/System/Random.cs
new file mode 100644
index 0000000..720e901
--- /dev/null
+++ b/base/Kernel/System/Random.cs
@@ -0,0 +1,196 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Random.cool
+**
+**
+** Purpose: A random number generator.
+**
+** Date:  July 8, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    //| <include path='docs/doc[@for="Random"]/*' />
+
+    public class Random {
+      //
+      // Private Constants
+      //
+      private const int MBIG =  Int32.MaxValue;
+      private const int MSEED = 161803398;
+      private const int MZ = 0;
+
+
+      //
+      // Member Variables
+      //
+      private int inext, inextp;
+      private int[] SeedArray = new int[56];
+
+      //
+      // Public Constants
+      //
+
+      //
+      // Native Declarations
+      //
+
+      //
+      // Constructors
+      //
+
+      //| <include path='docs/doc[@for="Random.Random"]/*' />
+      public Random()
+        : this(Environment.TickCount) {
+      }
+
+      //| <include path='docs/doc[@for="Random.Random1"]/*' />
+      public Random(int Seed) {
+        int ii;
+        int mj, mk;
+
+        //Initialize our Seed array.
+        //This algorithm comes from Numerical Recipes in C (2nd Ed.)
+        mj = MSEED - Math.Abs(Seed);
+        SeedArray[55]=mj;
+        mk=1;
+        for (int i=1; i<55; i++) {  //Apparently the range [1..55] is special (Knuth) and so we're wasting the 0'th position.
+          ii = (21*i)%55;
+          SeedArray[ii]=mk;
+          mk = mj - mk;
+          if (mk<0) mk+=MBIG;
+          mj=SeedArray[ii];
+        }
+        for (int k=1; k<5; k++) {
+          for (int i=1; i<56; i++) {
+        SeedArray[i] -= SeedArray[1+(i+30)%55];
+        if (SeedArray[i]<0) SeedArray[i]+=MBIG;
+          }
+        }
+        inext=0;
+        inextp = 21;
+        Seed = 1;
+      }
+
+      //
+      // Package Private Methods
+      //
+
+      /*====================================Sample====================================
+      **Action: Return a new random number [0..1) and reSeed the Seed array.
+      **Returns: A double [0..1)
+      **Arguments: None
+      **Exceptions: None
+      ==============================================================================*/
+      //| <include path='docs/doc[@for="Random.Sample"]/*' />
+      protected virtual double Sample() {
+          int retVal;
+          int locINext = inext;
+          int locINextp = inextp;
+
+          if (++locINext >=56) locINext=1;
+          if (++locINextp>= 56) locINextp = 1;
+
+          retVal = SeedArray[locINext]-SeedArray[locINextp];
+
+          if (retVal<0) retVal+=MBIG;
+
+          SeedArray[locINext]=retVal;
+
+          inext = locINext;
+          inextp = locINextp;
+
+          //Including this division at the end gives us significantly improved
+          //random number distribution.
+          return (retVal*(1.0/MBIG));
+      }
+
+      //
+      // Public Instance Methods
+      //
+
+
+      /*=====================================Next=====================================
+      **Returns: An int [0.._int4.MaxValue)
+      **Arguments: None
+      **Exceptions: None.
+      ==============================================================================*/
+      //| <include path='docs/doc[@for="Random.Next"]/*' />
+      public virtual int Next() {
+        return (int)(Sample()*Int32.MaxValue);
+      }
+
+      /*=====================================Next=====================================
+      **Returns: An int [minvalue..maxvalue)
+      **Arguments: minValue -- the least legal value for the Random number.
+      **           maxValue -- the greatest legal return value.
+      **Exceptions: None.
+      ==============================================================================*/
+      //| <include path='docs/doc[@for="Random.Next1"]/*' />
+      public virtual int Next(int minValue, int maxValue) {
+          if (minValue>maxValue) {
+              throw new ArgumentOutOfRangeException("minValue",String.Format("Argument_MinMaxValue", "minValue", "maxValue"));
+          }
+
+          int range = (maxValue-minValue);
+
+          //This is the case where we flipped around (e.g. MaxValue-MinValue);
+          if (range<0) {
+              long longRange = (long)maxValue-(long)minValue;
+              return (int)(((long)(Sample()*((double)longRange)))+minValue);
+          }
+
+          return ((int)(Sample()*(range)))+minValue;
+      }
+
+
+      /*=====================================Next=====================================
+      **Returns: An int [0..maxValue)
+      **Arguments: maxValue -- the greatest legal return value.
+      **Exceptions: None.
+      ==============================================================================*/
+      //| <include path='docs/doc[@for="Random.Next2"]/*' />
+      public virtual int Next(int maxValue) {
+          if (maxValue<0) {
+              throw new ArgumentOutOfRangeException("maxValue", String.Format("ArgumentOutOfRange_MustBePositive", "maxValue"));
+          }
+          return (int)(Sample()*maxValue);
+      }
+
+
+      /*=====================================Next=====================================
+      **Returns: A double [0..1)
+      **Arguments: None
+      **Exceptions: None
+      ==============================================================================*/
+      //| <include path='docs/doc[@for="Random.NextDouble"]/*' />
+      public virtual double NextDouble() {
+        return Sample();
+      }
+
+
+      /*==================================NextBytes===================================
+      **Action:  Fills the byte array with random bytes [0..0x7f].  The entire array is filled.
+      **Returns:Void
+      **Arguments:  buffer -- the array to be filled.
+      **Exceptions: None
+      ==============================================================================*/
+      //| <include path='docs/doc[@for="Random.NextBytes"]/*' />
+      public virtual void NextBytes(byte [] buffer){
+        if (buffer==null) throw new ArgumentNullException("buffer");
+        for (int i=0; i<buffer.Length; i++) {
+          buffer[i]=(byte)(Sample()*(Byte.MaxValue+1));
+        }
+      }
+    }
+
+
+
+}
diff --git a/base/Kernel/System/RankException.cs b/base/Kernel/System/RankException.cs
new file mode 100644
index 0000000..35f2b20
--- /dev/null
+++ b/base/Kernel/System/RankException.cs
@@ -0,0 +1,40 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: RankException
+**
+**
+** Purpose: For methods that are passed arrays with the wrong number of
+**          dimensions.
+**
+** Date: April 7, 1999
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+
+    //| <include path='docs/doc[@for="RankException"]/*' />
+    public class RankException : SystemException
+    {
+        //| <include path='docs/doc[@for="RankException.RankException"]/*' />
+        public RankException()
+            : base("Arg_RankException") {
+        }
+
+        //| <include path='docs/doc[@for="RankException.RankException1"]/*' />
+        public RankException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="RankException.RankException2"]/*' />
+        public RankException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Reflection/Assembly.cs b/base/Kernel/System/Reflection/Assembly.cs
new file mode 100644
index 0000000..d2c0008
--- /dev/null
+++ b/base/Kernel/System/Reflection/Assembly.cs
@@ -0,0 +1,112 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: Assembly
+**
+**
+** Purpose: For Assembly-related stuff.
+**
+** Date: April 1, 1999
+**
+=============================================================================*/
+
+namespace System.Reflection {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="Assembly"]/*' />
+    [RequiredByBartok]
+    public class Assembly
+    {
+        // ---------- Bartok code ----------
+
+        public AssemblyName Name
+        {
+            get {
+                return this.assemblyName;
+            }
+        }
+
+        internal String nGetSimpleName() {
+            return this.assemblyName.Name;
+        }
+
+        private String GetFullName() {
+            String name =
+                this.nGetSimpleName()
+                + ", Version=" + this.assemblyName.Version.Major
+                + "." + this.assemblyName.Version.Minor
+                + "." + this.assemblyName.Version.Build
+                + "." + this.assemblyName.Version.Revision
+                + ", Culture="
+                + (this.assemblyName.Culture != ""
+                   ? this.assemblyName.Culture
+                   : "neutral")
+                + ", PublicKeyToken="
+                + (this.assemblyName.GetPublicKeyToken() != null
+                   ? (Assembly.EncodeHexString
+                      (this.assemblyName.GetPublicKeyToken()))
+                   : "null");
+            return name;
+        }
+
+        // ---------- copied from mscorlib System.Security.Util.Hex ----------
+
+        // changed to lowercase to avoid ToLower call since the code is no
+        // longer shared in Util.Hex
+        private static char[] hexValues =
+        { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+          'a', 'b', 'c', 'd', 'e', 'f' };
+
+        private static String EncodeHexString(byte[] sArray)
+        {
+            String result = null;
+
+            if(sArray != null) {
+                char[] hexOrder = new char[sArray.Length * 2];
+
+                int digit;
+                for(int i = 0, j = 0; i < sArray.Length; i++) {
+                    digit = (int)((sArray[i] & 0xf0) >> 4);
+                    hexOrder[j++] = hexValues[digit];
+                    digit = (int)(sArray[i] & 0x0f);
+                    hexOrder[j++] = hexValues[digit];
+                }
+                result = new String(hexOrder);
+            }
+            return result;
+        }
+
+        [RequiredByBartok]
+        private AssemblyName assemblyName;
+
+        // ---------- mscorlib code ----------
+        // (some modifications to pull in less code)
+
+        //| <include path='docs/doc[@for="Assembly.FullName"]/*' />
+        public virtual String FullName {
+            get {
+                // If called by Object.ToString(), return val may be NULL.
+                String s;
+
+                /* <markples> not implementing InternalCache for now
+                if ((s = (String)Cache[CacheObjType.AssemblyName]) != null)
+                    return s;
+                */
+
+                s = GetFullName();
+                /* <markples> not implementing InternalCache for now
+                if (s != null)
+                    Cache[CacheObjType.AssemblyName] = s;
+                */
+
+                return s;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Reflection/AssemblyAttributes.cs b/base/Kernel/System/Reflection/AssemblyAttributes.cs
new file mode 100644
index 0000000..c8c7b50
--- /dev/null
+++ b/base/Kernel/System/Reflection/AssemblyAttributes.cs
@@ -0,0 +1,149 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** File: AssemblyAttributes
+**
+**
+** Purpose: For Assembly-related custom attributes.
+**
+** Date: April 12, 2000
+**
+=============================================================================*/
+
+namespace System.Reflection {
+
+    using System;
+
+    //| <include path='docs/doc[@for="AssemblyCultureAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyCultureAttribute : Attribute
+    {
+        private String m_culture;
+
+        //| <include path='docs/doc[@for="AssemblyCultureAttribute.AssemblyCultureAttribute"]/*' />
+        public AssemblyCultureAttribute(String culture)
+        {
+            m_culture = culture;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyCultureAttribute.Culture"]/*' />
+        public String Culture
+        {
+            get { return m_culture; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyVersionAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyVersionAttribute : Attribute
+    {
+        private String m_version;
+
+        //| <include path='docs/doc[@for="AssemblyVersionAttribute.AssemblyVersionAttribute"]/*' />
+        public AssemblyVersionAttribute(String version)
+        {
+            m_version = version;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyVersionAttribute.Version"]/*' />
+        public String Version
+        {
+            get { return m_version; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyKeyFileAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyKeyFileAttribute : Attribute
+    {
+        private String m_keyFile;
+
+        //| <include path='docs/doc[@for="AssemblyKeyFileAttribute.AssemblyKeyFileAttribute"]/*' />
+        public AssemblyKeyFileAttribute(String keyFile)
+        {
+            m_keyFile = keyFile;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyKeyFileAttribute.KeyFile"]/*' />
+        public String KeyFile
+        {
+            get { return m_keyFile; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyKeyNameAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyKeyNameAttribute : Attribute
+    {
+        private String m_keyName;
+
+        //| <include path='docs/doc[@for="AssemblyKeyNameAttribute.AssemblyKeyNameAttribute"]/*' />
+        public AssemblyKeyNameAttribute(String keyName)
+        {
+            m_keyName = keyName;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyKeyNameAttribute.KeyName"]/*' />
+        public String KeyName
+        {
+            get { return m_keyName; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyDelaySignAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyDelaySignAttribute : Attribute
+    {
+        private bool m_delaySign;
+
+        //| <include path='docs/doc[@for="AssemblyDelaySignAttribute.AssemblyDelaySignAttribute"]/*' />
+        public AssemblyDelaySignAttribute(bool delaySign)
+        {
+            m_delaySign = delaySign;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyDelaySignAttribute.DelaySign"]/*' />
+        public bool DelaySign
+        { get
+            { return m_delaySign; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyFlagsAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyFlagsAttribute : Attribute
+    {
+        private uint m_flags;
+
+        //| <include path='docs/doc[@for="AssemblyFlagsAttribute.AssemblyFlagsAttribute"]/*' />
+        [CLSCompliant(false)]
+        public AssemblyFlagsAttribute(uint flags)
+        {
+            m_flags = flags;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyFlagsAttribute.AssemblyFlagsAttribute1"]/*' />
+        public AssemblyFlagsAttribute(int assemblyFlags)
+        {
+            m_flags = (uint)assemblyFlags;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyFlagsAttribute.Flags"]/*' />
+        [CLSCompliant(false)]
+        public uint Flags
+        {
+            get { return m_flags; }
+        }
+
+        //| <include path='docs/doc[@for="AssemblyFlagsAttribute.AssemblyFlags"]/*' />
+        public int AssemblyFlags
+        {
+            get { return (int)m_flags; }
+        }
+    }
+}
+
diff --git a/base/Kernel/System/Reflection/AssemblyName.cs b/base/Kernel/System/Reflection/AssemblyName.cs
new file mode 100644
index 0000000..2c145a9
--- /dev/null
+++ b/base/Kernel/System/Reflection/AssemblyName.cs
@@ -0,0 +1,77 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** File:    AssemblyName
+**
+**
+** Purpose: Used for binding and retrieving info about an assembly
+**
+** Date:    June 4, 1999
+**
+===========================================================*/
+namespace System.Reflection {
+    using System.Runtime.CompilerServices;
+
+    [RequiredByBartok]
+    public class AssemblyName {
+        // ---------- Bartok code ----------
+
+        [RequiredByBartok]
+        private String _Culture;
+
+        public String Culture {
+            get { return _Culture; }
+        }
+
+        // ---------- mscorlib code ----------
+        // (some modifications to pull in less code)
+
+        [RequiredByBartok]
+        private String          _Name;                  // Name
+        [RequiredByBartok]
+        private byte[]          _PublicKeyToken;
+        [RequiredByBartok]
+        private Version         _Version;
+
+        // Set and get the name of the assembly. If this is a weak Name
+        // then it optionally contains a site. For strong assembly names,
+        // the name partitions up the strong name's namespace
+        //| <include path='docs/doc[@for="AssemblyName.Name"]/*' />
+        public String Name
+        {
+            get { return _Name; }
+            /* <markples> not needed for now
+            set { _Name = value; }
+            */
+        }
+
+        //| <include path='docs/doc[@for="AssemblyName.Version"]/*' />
+        public Version Version
+        {
+            get {
+                return _Version;
+            }
+            /* <markples> not needed for now
+            set {
+                _Version = value;
+            }
+            */
+        }
+
+        // The compressed version of the public key formed from a truncated hash.
+        //| <include path='docs/doc[@for="AssemblyName.GetPublicKeyToken"]/*' />
+        public byte[] GetPublicKeyToken()
+        {
+            /* <markples> not needed for now
+            if ((_PublicKeyToken == null) &&
+                (_Flags & AssemblyNameFlags.PublicKey) != 0)
+                    _PublicKeyToken = nGetPublicKeyToken();
+            */
+            return _PublicKeyToken;
+        }
+    }
+}
diff --git a/base/Kernel/System/Reflection/AssemblyReflectionAttributes.cs b/base/Kernel/System/Reflection/AssemblyReflectionAttributes.cs
new file mode 100644
index 0000000..9f4e121
--- /dev/null
+++ b/base/Kernel/System/Reflection/AssemblyReflectionAttributes.cs
@@ -0,0 +1,191 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** File: AssemblyReflectionAttributes.cool
+**
+**
+** Purpose: For Assembly-related reflection custom attributes.
+**
+** Date: April 12, 2000
+**
+=============================================================================*/
+
+namespace System.Reflection {
+
+    using System;
+
+    //| <include path='docs/doc[@for="AssemblyCopyrightAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyCopyrightAttribute : Attribute
+    {
+        private String m_copyright;
+
+        //| <include path='docs/doc[@for="AssemblyCopyrightAttribute.AssemblyCopyrightAttribute"]/*' />
+        public AssemblyCopyrightAttribute(String copyright)
+        {
+            m_copyright = copyright;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyCopyrightAttribute.Copyright"]/*' />
+        public String Copyright
+        {
+            get { return m_copyright; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyTrademarkAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyTrademarkAttribute : Attribute
+    {
+        private String m_trademark;
+
+        //| <include path='docs/doc[@for="AssemblyTrademarkAttribute.AssemblyTrademarkAttribute"]/*' />
+        public AssemblyTrademarkAttribute(String trademark)
+        {
+            m_trademark = trademark;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyTrademarkAttribute.Trademark"]/*' />
+        public String Trademark
+        {
+            get { return m_trademark; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyProductAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyProductAttribute : Attribute
+    {
+        private String m_product;
+
+        //| <include path='docs/doc[@for="AssemblyProductAttribute.AssemblyProductAttribute"]/*' />
+        public AssemblyProductAttribute(String product)
+        {
+            m_product = product;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyProductAttribute.Product"]/*' />
+        public String Product
+        {
+            get { return m_product; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyCompanyAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyCompanyAttribute : Attribute
+    {
+        private String m_company;
+
+        //| <include path='docs/doc[@for="AssemblyCompanyAttribute.AssemblyCompanyAttribute"]/*' />
+        public AssemblyCompanyAttribute(String company)
+        {
+            m_company = company;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyCompanyAttribute.Company"]/*' />
+        public String Company
+        {
+            get { return m_company; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyDescriptionAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyDescriptionAttribute : Attribute
+    {
+        private String m_description;
+
+        //| <include path='docs/doc[@for="AssemblyDescriptionAttribute.AssemblyDescriptionAttribute"]/*' />
+        public AssemblyDescriptionAttribute(String description)
+        {
+            m_description = description;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyDescriptionAttribute.Description"]/*' />
+        public String Description
+        {
+            get { return m_description; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyTitleAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyTitleAttribute : Attribute
+    {
+        private String m_title;
+
+        //| <include path='docs/doc[@for="AssemblyTitleAttribute.AssemblyTitleAttribute"]/*' />
+        public AssemblyTitleAttribute(String title)
+        {
+            m_title = title;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyTitleAttribute.Title"]/*' />
+        public String Title
+        {
+            get { return m_title; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyConfigurationAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyConfigurationAttribute : Attribute
+    {
+        private String m_configuration;
+
+        //| <include path='docs/doc[@for="AssemblyConfigurationAttribute.AssemblyConfigurationAttribute"]/*' />
+        public AssemblyConfigurationAttribute(String configuration)
+        {
+            m_configuration = configuration;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyConfigurationAttribute.Configuration"]/*' />
+        public String Configuration
+        {
+            get { return m_configuration; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyDefaultAliasAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyDefaultAliasAttribute : Attribute
+    {
+        private String m_defaultAlias;
+
+        //| <include path='docs/doc[@for="AssemblyDefaultAliasAttribute.AssemblyDefaultAliasAttribute"]/*' />
+        public AssemblyDefaultAliasAttribute(String defaultAlias)
+        {
+            m_defaultAlias = defaultAlias;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyDefaultAliasAttribute.DefaultAlias"]/*' />
+        public String DefaultAlias
+        {
+            get { return m_defaultAlias; }
+        }
+    }
+
+    //| <include path='docs/doc[@for="AssemblyInformationalVersionAttribute"]/*' />
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false)]
+    public sealed class AssemblyInformationalVersionAttribute : Attribute
+    {
+        private String m_informationalVersion;
+
+        //| <include path='docs/doc[@for="AssemblyInformationalVersionAttribute.AssemblyInformationalVersionAttribute"]/*' />
+        public AssemblyInformationalVersionAttribute(String informationalVersion)
+        {
+            m_informationalVersion = informationalVersion;
+        }
+
+        //| <include path='docs/doc[@for="AssemblyInformationalVersionAttribute.InformationalVersion"]/*' />
+        public String InformationalVersion
+        {
+            get { return m_informationalVersion; }
+        }
+    }
+}
diff --git a/base/Kernel/System/Reflection/DefaultMemberAttribute.cs b/base/Kernel/System/Reflection/DefaultMemberAttribute.cs
new file mode 100644
index 0000000..2242cdc
--- /dev/null
+++ b/base/Kernel/System/Reflection/DefaultMemberAttribute.cs
@@ -0,0 +1,40 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// DefaultMemberAttribute is defines the Member of a Type that is the "default"
+//  member used by Type.InvokeMember.  The default member is simply a name given
+//  to a type.
+//
+// Date: Oct 99
+//
+namespace System.Reflection {
+
+    using System;
+
+    //| <include path='docs/doc[@for="DefaultMemberAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
+    public sealed class DefaultMemberAttribute : Attribute
+    {
+        // The name of the member
+        private String m_memberName;
+
+        // You must provide the name of the member, this is required
+        //| <include path='docs/doc[@for="DefaultMemberAttribute.DefaultMemberAttribute"]/*' />
+        public DefaultMemberAttribute(String memberName) {
+            m_memberName = memberName;
+        }
+
+        // A get accessor to return the name from the attribute.
+        // NOTE: There is no setter because the name must be provided
+        //  to the constructor.  The name is not optional.
+        //| <include path='docs/doc[@for="DefaultMemberAttribute.MemberName"]/*' />
+        public String MemberName {
+            get {return m_memberName;}
+        }
+    }
+}
diff --git a/base/Kernel/System/Reflection/Module.cs b/base/Kernel/System/Reflection/Module.cs
new file mode 100644
index 0000000..7701c90
--- /dev/null
+++ b/base/Kernel/System/Reflection/Module.cs
@@ -0,0 +1,28 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// The Module class represents a module in the COM+ runtime.  A module
+//  may consist of one or more classes and interfaces and represents a physical
+//  deployment such as a DLL or EXE of those classes. There may be multiple namespaces
+//  contained in a single module and a namespace may be span multiple modules.
+//
+// The runtime supports a special type of module that are dynamically created.  New
+//  classes can be created through the dynamic IL generation process.
+//
+// Date: April 98
+//
+namespace System.Reflection {
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="Module"]/*' />
+    [RequiredByBartok]
+    public class Module
+    {
+    }
+}
diff --git a/base/Kernel/System/Reflection/TypeAttributes.cs b/base/Kernel/System/Reflection/TypeAttributes.cs
new file mode 100644
index 0000000..8c451de
--- /dev/null
+++ b/base/Kernel/System/Reflection/TypeAttributes.cs
@@ -0,0 +1,88 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Reflection {
+    using System.Runtime.InteropServices;
+    using System;
+    // This Enum matches the CorTypeAttr defined in CorHdr.h
+    //| <include path='docs/doc[@for="TypeAttributes"]/*' />
+    [Flags]
+    public enum TypeAttributes
+    {
+        //| <include path='docs/doc[@for="TypeAttributes.VisibilityMask"]/*' />
+        VisibilityMask    =   0x00000007,
+        //| <include path='docs/doc[@for="TypeAttributes.NotPublic"]/*' />
+        NotPublic         =   0x00000000,     // Class is not public scope.
+        //| <include path='docs/doc[@for="TypeAttributes.Public"]/*' />
+        Public            =   0x00000001,     // Class is public scope.
+        //| <include path='docs/doc[@for="TypeAttributes.NestedPublic"]/*' />
+        NestedPublic      =   0x00000002,     // Class is nested with public visibility.
+        //| <include path='docs/doc[@for="TypeAttributes.NestedPrivate"]/*' />
+        NestedPrivate     =   0x00000003,     // Class is nested with private visibility.
+        //| <include path='docs/doc[@for="TypeAttributes.NestedFamily"]/*' />
+        NestedFamily      =   0x00000004,     // Class is nested with family visibility.
+        //| <include path='docs/doc[@for="TypeAttributes.NestedAssembly"]/*' />
+        NestedAssembly    =   0x00000005,     // Class is nested with assembly visibility.
+        //| <include path='docs/doc[@for="TypeAttributes.NestedFamANDAssem"]/*' />
+        NestedFamANDAssem =   0x00000006,     // Class is nested with family and assembly visibility.
+        //| <include path='docs/doc[@for="TypeAttributes.NestedFamORAssem"]/*' />
+        NestedFamORAssem  =   0x00000007,     // Class is nested with family or assembly visibility.
+
+        // Use this mask to retrieve class layout information
+        // 0 is AutoLayout, 0x2 is SequentialLayout, 4 is ExplicitLayout
+        //| <include path='docs/doc[@for="TypeAttributes.LayoutMask"]/*' />
+        LayoutMask        =   0x00000018,
+        //| <include path='docs/doc[@for="TypeAttributes.AutoLayout"]/*' />
+        AutoLayout        =   0x00000000,     // Class fields are auto-laid out
+        //| <include path='docs/doc[@for="TypeAttributes.SequentialLayout"]/*' />
+        SequentialLayout  =   0x00000008,     // Class fields are laid out sequentially
+        //| <include path='docs/doc[@for="TypeAttributes.ExplicitLayout"]/*' />
+        ExplicitLayout    =   0x00000010,     // Layout is supplied explicitly
+        // end layout mask
+
+        // Use this mask to distinguish a type declaration as a Class, ValueType or Interface
+        //| <include path='docs/doc[@for="TypeAttributes.ClassSemanticsMask"]/*' />
+        ClassSemanticsMask=   0x00000020,
+        //| <include path='docs/doc[@for="TypeAttributes.Class"]/*' />
+        Class             =   0x00000000,     // Type is a class.
+        //| <include path='docs/doc[@for="TypeAttributes.Interface"]/*' />
+        Interface         =   0x00000020,     // Type is an interface.
+        // end semantics mask
+
+        // Special semantics in addition to class semantics.
+        //| <include path='docs/doc[@for="TypeAttributes.Abstract"]/*' />
+        Abstract          =   0x00000080,     // Class is abstract
+        //| <include path='docs/doc[@for="TypeAttributes.Sealed"]/*' />
+        Sealed            =   0x00000100,     // Class is concrete and may not be extended
+        //| <include path='docs/doc[@for="TypeAttributes.SpecialName"]/*' />
+        SpecialName       =   0x00000400,     // Class name is special.  Name describes how.
+
+        // Implementation attributes.
+        //| <include path='docs/doc[@for="TypeAttributes.Import"]/*' />
+        Import            =   0x00001000,     // Class / interface is imported
+        //| <include path='docs/doc[@for="TypeAttributes.Serializable"]/*' />
+        Serializable      =   0x00002000,   // The class is Serializable.
+
+        // Use tdStringFormatMask to retrieve string information for native interop
+        //| <include path='docs/doc[@for="TypeAttributes.StringFormatMask"]/*' />
+        StringFormatMask  =   0x00030000,
+        //| <include path='docs/doc[@for="TypeAttributes.AnsiClass"]/*' />
+        AnsiClass         =   0x00000000,     // LPTSTR is interpreted as ANSI in this class
+        //| <include path='docs/doc[@for="TypeAttributes.UnicodeClass"]/*' />
+        UnicodeClass      =   0x00010000,     // LPTSTR is interpreted as UNICODE
+        //| <include path='docs/doc[@for="TypeAttributes.AutoClass"]/*' />
+        AutoClass         =   0x00020000,     // LPTSTR is interpreted automatically
+        // end string format mask
+
+        //| <include path='docs/doc[@for="TypeAttributes.BeforeFieldInit"]/*' />
+        BeforeFieldInit   =   0x00100000,     // Initialize the class any time before first static field access.
+
+        // Flags reserved for runtime use.
+        //| <include path='docs/doc[@for="TypeAttributes.ReservedMask"]/*' />
+        ReservedMask      =   0x00040800,
+        //| <include path='docs/doc[@for="TypeAttributes.RTSpecialName"]/*' />
+        RTSpecialName     =   0x00000800,     // Runtime should check name encoding.
+   }
+}
diff --git a/base/Kernel/System/Runtime/CompilerServices/Attributes.cs b/base/Kernel/System/Runtime/CompilerServices/Attributes.cs
new file mode 100644
index 0000000..6291ab1
--- /dev/null
+++ b/base/Kernel/System/Runtime/CompilerServices/Attributes.cs
@@ -0,0 +1,336 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.Runtime.CompilerServices {
+
+  // phx whidbey
+
+  // Indicates that the modified type is const (i.e. has a const modifier)
+  public class IsConst
+  {
+  }
+  public class IsImplicitlyDereferenced
+  {
+  }
+  public class IsSignUnspecifiedByte
+  {
+  }
+  public class IsLong
+  {
+  }
+  public class IsBoxed
+  {
+  }
+  public class UnsafeValueTypeAttribute : Attribute
+  {
+  }
+  public class FixedAddressValueTypeAttribute : Attribute
+  {
+  }
+
+  // end phx whidbey
+
+  [AttributeUsage(AttributeTargets.Constructor|
+                  AttributeTargets.Method)]
+  internal sealed class InlineAttribute: Attribute {
+
+  }
+
+  [AttributeUsage(AttributeTargets.Constructor|
+                  AttributeTargets.Method)]
+  internal sealed class NoInlineAttribute: Attribute {
+
+  }
+
+  [AttributeUsage(AttributeTargets.Struct)]
+  internal sealed class InlineCopyAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Constructor|
+                  AttributeTargets.Method)]
+  internal sealed class DisableBoundsChecksAttribute: Attribute {
+
+  }
+
+  [AttributeUsage(AttributeTargets.Constructor|
+                  AttributeTargets.Method)]
+  internal sealed class DisableNullChecksAttribute: Attribute {
+
+  }
+
+  [AttributeUsage(AttributeTargets.Constructor|
+                  AttributeTargets.Method)]
+  internal sealed class InlineIntoOnceAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Interface|
+                  AttributeTargets.Class|
+                  AttributeTargets.Struct,
+                  Inherited=false)]
+  public sealed class CCtorIsRunDuringStartupAttribute : Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Interface|
+                  AttributeTargets.Class|
+                  AttributeTargets.Struct,
+                  Inherited=false)]
+  public sealed class NoCCtorAttribute : Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Constructor|
+                  AttributeTargets.Method)]
+  public sealed class NoHeapAllocationAttribute : Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Class|
+                  AttributeTargets.Struct|
+                  AttributeTargets.Interface|
+                  AttributeTargets.Method|
+                  AttributeTargets.Constructor|
+                  AttributeTargets.Field,
+                  Inherited=false)]
+  [RequiredByBartok]
+  internal sealed class AccessedByRuntimeAttribute: Attribute {
+      public AccessedByRuntimeAttribute(string reason) {
+          this.reason = reason;
+      }
+
+      public int Option {
+          get { return option; }
+          set { option = value; }
+      }
+      int option;
+      string reason;
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor|
+                  AttributeTargets.Field,
+                  Inherited=false)]
+  public sealed class ProvidedByOverrideAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Field)]
+  public sealed class ExternalStaticDataAttribute : Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Struct)]
+  public sealed class StructAlignAttribute : Attribute {
+      public StructAlignAttribute(int align) {}
+  }
+
+  [AttributeUsage(AttributeTargets.Method,
+                  Inherited=false)]
+  public sealed class StackBoundAttribute: Attribute {
+      public StackBoundAttribute(int bound) {}
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor,
+                  Inherited=false)]
+  public sealed class StackLinkCheckAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor,
+                  Inherited=false)]
+  public sealed class RequireStackLinkAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor,
+                  Inherited=false)]
+  public sealed class NoStackLinkCheckAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor,
+                  Inherited=false)]
+  public sealed class NoStackLinkCheckTransAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor,
+                  Inherited=false)]
+  public sealed class NoStackOverflowCheckAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Field|
+                  AttributeTargets.Method|
+                  AttributeTargets.Constructor,
+                  Inherited=false)]
+  public sealed class IntrinsicAttribute: Attribute {
+      // Intrinsics should never have bodies.  However, csc complains if we
+      // mark a property on a struct extern, so we have to give those bodies.
+      // Hence this flag.  IgnoreBody=true means discard the body.
+      // IgnoreBody=false means it is an error to supply a body.
+      public bool IgnoreBody {
+          get { return ignoreBody; }
+          set { ignoreBody = value; }
+      }
+      bool ignoreBody;
+  }
+
+  [AttributeUsage(AttributeTargets.Field)]
+  internal sealed class InlineVectorAttribute : Attribute {
+      public InlineVectorAttribute(int numElements) {}
+  }
+
+  // This attribute is used to mark method that needs pushStackMark
+  // and popStackMark around calls to it.
+  [AttributeUsage(AttributeTargets.Method,
+                  Inherited=false)]
+  [RequiredByBartok]
+  public sealed class OutsideGCDomainAttribute: Attribute {
+  }
+
+  // This attribute is used to mark method that needs enterGCSafteState
+  // and leaveGCSafeState around its definition
+  [AttributeUsage(AttributeTargets.Method,
+                  Inherited=false)]
+  public sealed class ExternalEntryPointAttribute: Attribute {
+      public int Option {
+          get { return option; }
+          set { option = value; }
+      }
+      public int IgnoreCallerTransition {
+          get { return ignoreCallerTransition; }
+          set { option = value; }
+      }
+      int option, ignoreCallerTransition;
+  }
+
+  // This attribute is used to mark type/field/methods that are required
+  // by Bartok compiler.
+  [AttributeUsage(AttributeTargets.Class |
+                  AttributeTargets.Struct |
+                  AttributeTargets.Enum |
+                  AttributeTargets.Interface |
+                  AttributeTargets.Delegate |
+                  AttributeTargets.Method |
+                  AttributeTargets.Constructor |
+                  AttributeTargets.Field,
+                  Inherited=false)]
+  public sealed class RequiredByBartokAttribute: Attribute {
+      public RequiredByBartokAttribute() {}
+      public RequiredByBartokAttribute(string reason) {
+          this.reason = reason;
+      }
+      string reason;
+  }
+
+  /// <summary>
+  /// This attribute must be placed on override types that override the class
+  /// constructor.  It is a compile-time error if the attribute is missing
+  /// during an override.  It is also a compile-time error if it exists and
+  /// either the original or the override type does not have a class
+  /// constructor.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class|
+                  AttributeTargets.Struct|
+                  AttributeTargets.Interface)]
+  internal sealed class OverrideCctorAttribute : Attribute {
+  }
+
+  /// <summary>
+  /// This attribute must be placed on override types that mean to override the
+  /// base class.  If a base class is overridden, then either this attribute or
+  /// IgnoreOverrideExtendsAttribute must be present.  It is also a compile-time
+  /// error if this attribute exists and the override base class is the same as
+  /// the original base class.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class)]
+  internal sealed class OverrideExtendsAttribute : Attribute {
+  }
+
+  /// <summary>
+  /// This attribute must be placed on override types that override the base
+  /// class in the override assembly but do not mean to override the base class
+  /// in the actual type.  If a base class is overridden, then either this
+  /// attribute or OverrideExtendsAttribute must be present.  It is also a
+  /// compile-time error if this attribute exists and the override base class is
+  /// the same as the original base class.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class)]
+  internal sealed class IgnoreOverrideExtendsAttribute : Attribute {
+  }
+
+  /// <summary>
+  /// This attribute is placed on override types to delete the built-in class
+  /// constructor.  Using this is better than overriding with an empty method.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class|
+                  AttributeTargets.Struct|
+                  AttributeTargets.Interface)]
+  internal sealed class DeleteCctorAttribute : Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Struct)]
+  public sealed class OverrideLayoutAttribute : Attribute {
+  }
+
+  // There are at least three reasons why one would need to prevent
+  // the automatic insertion of vanilla reference counting (RC) code
+  // into the body of a method, property or constructor:
+  //
+  //     1. To suppress reference counting before a reference to
+  //        the installed GC is set up.
+  //
+  //     2. Methods that directly manipulate reference counts such
+  //        as allocation routines.
+  //
+  //     3. To suppress the insertion of RC code into code bodies
+  //        that may be directly or indirectly invoked from the
+  //        IncrementRefCount or DecrementRefCount methods of the
+  //        reference counting collector.
+  //
+  // The IrRCUpdate compiler phase can be made to skip code bodies for
+  // any of the above reasons by affixing one of two special attributes
+  // to their declarations. Currently, the [PreInitRefCounts] attribute
+  // is used to mark code that could be invoked before the GC gets set
+  // up and that, in its absence, may cause the IrRCUpdate phase to
+  // insert RC increment and decrement code. The [ManualRefCounts]
+  // attribute models cases in which the code writer takes the onus of
+  // maintaining consistent reference counts.
+  //
+  // The reason for separating the preinitialization case from the
+  // other two is because special RC updates, which test for
+  // initialization of the GC before incrementing or decrementing the
+  // reference counts, could still have been inserted into code bodies
+  // marked as [PreInitRefCounts]. However, if the same code body is
+  // called after initialization, such updates may slow down the
+  // common case. This provides an optimization opportunity for the
+  // compiler in which a method f marked with [PreInitRefCounts] could
+  // be cloned into a version f' that contains plain RC code and that
+  // is actually called wherever a non-[PreInitRefCounts] method such
+  // as g calls f.
+  //
+  // If a method h has the [ManualRefCounts] attribute and if reference
+  // counts are directly read or written in h, then the code must either
+  // be also marked as [NoInline] or must only be called from methods
+  // that also have the [ManualRefCounts] attribute. This is because if
+  // h were inlined into a method in which reference counting is on by
+  // default, the injected RC code may cause the reference counts
+  // to become inconsistent.
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor)]
+  [RequiredByBartok]
+  internal sealed class PreInitRefCountsAttribute: Attribute {
+  }
+  [AttributeUsage(AttributeTargets.Method|
+                  AttributeTargets.Constructor)]
+  [RequiredByBartok]
+  internal sealed class ManualRefCountsAttribute: Attribute {
+  }
+  // This marks classes that are acyclic reference types.
+  // (See IrAcyclicRefTypes.cs.)
+  [AttributeUsage(AttributeTargets.Class)]
+  [RequiredByBartok]
+  internal sealed class AcyclicRefTypeAttribute: Attribute {
+  }
+
+  [AttributeUsage(AttributeTargets.Field)]
+  internal sealed class TrustedNonNullAttribute: Attribute {
+  }
+}
diff --git a/base/Kernel/System/Runtime/CompilerServices/DecimalConstantAttribute.cs b/base/Kernel/System/Runtime/CompilerServices/DecimalConstantAttribute.cs
new file mode 100644
index 0000000..7f478b5
--- /dev/null
+++ b/base/Kernel/System/Runtime/CompilerServices/DecimalConstantAttribute.cs
@@ -0,0 +1,36 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    //| <include path='docs/doc[@for="DecimalConstantAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter, Inherited=false)]
+    [CLSCompliant(false)]
+    public sealed class DecimalConstantAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="DecimalConstantAttribute.DecimalConstantAttribute"]/*' />
+        public DecimalConstantAttribute(
+            byte scale,
+            byte sign,
+            uint hi,
+            uint mid,
+            uint low
+        )
+        {
+            dec = new System.Decimal((int) low, (int)mid, (int)hi, (sign != 0), scale);
+        }
+
+        //| <include path='docs/doc[@for="DecimalConstantAttribute.Value"]/*' />
+        public System.Decimal Value
+        {
+            get {
+                return dec;
+            }
+        }
+
+        private System.Decimal dec;
+    }
+}
+
diff --git a/base/Kernel/System/Runtime/CompilerServices/IndexerNameAttribute.cs b/base/Kernel/System/Runtime/CompilerServices/IndexerNameAttribute.cs
new file mode 100644
index 0000000..47f6ddb
--- /dev/null
+++ b/base/Kernel/System/Runtime/CompilerServices/IndexerNameAttribute.cs
@@ -0,0 +1,18 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    using System;
+
+    //| <include path='docs/doc[@for="IndexerNameAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Property, Inherited = true)]
+    public sealed class IndexerNameAttribute: Attribute
+    {
+        //| <include path='docs/doc[@for="IndexerNameAttribute.IndexerNameAttribute"]/*' />
+        public IndexerNameAttribute(String indexerName)
+        {}
+    }
+}
diff --git a/base/Kernel/System/Runtime/CompilerServices/IsVolatile.cs b/base/Kernel/System/Runtime/CompilerServices/IsVolatile.cs
new file mode 100644
index 0000000..c95459d
--- /dev/null
+++ b/base/Kernel/System/Runtime/CompilerServices/IsVolatile.cs
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices
+{
+    //| <include path='docs/doc[@for="IsVolatile"]/*' />
+    public sealed class IsVolatile
+    {
+        // no instantiation, please!
+        private IsVolatile()
+        {}
+    }
+}
+
diff --git a/base/Kernel/System/Runtime/CompilerServices/MethodImplAttribute.cs b/base/Kernel/System/Runtime/CompilerServices/MethodImplAttribute.cs
new file mode 100644
index 0000000..7819c7e
--- /dev/null
+++ b/base/Kernel/System/Runtime/CompilerServices/MethodImplAttribute.cs
@@ -0,0 +1,56 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.CompilerServices {
+
+    using System;
+
+
+    // This Enum matches the miImpl flags defined in corhdr.h. It is used to specify
+    // certain method properties.
+
+    //| <include path='docs/doc[@for="MethodImplOptions"]/*' />
+    [Flags]
+    public enum MethodImplOptions
+    {
+        //| <include path='docs/doc[@for="MethodImplOptions.Unmanaged"]/*' />
+        Unmanaged       =   0x0004,
+        //| <include path='docs/doc[@for="MethodImplOptions.ForwardRef"]/*' />
+        ForwardRef      =   0x0010,
+        //| <include path='docs/doc[@for="MethodImplOptions.InternalCall"]/*' />
+        InternalCall    =   0x1000,
+        //| <include path='docs/doc[@for="MethodImplOptions.Synchronized"]/*' />
+        Synchronized    =   0x0020,
+        //| <include path='docs/doc[@for="MethodImplOptions.NoInlining"]/*' />
+        NoInlining      =   0x0008,
+    }
+
+    // Custom attribute to specify additional method properties.
+    //| <include path='docs/doc[@for="MethodImplAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor, Inherited = false)]
+    sealed public class MethodImplAttribute : Attribute
+    {
+        internal MethodImplOptions  _val;
+
+        //| <include path='docs/doc[@for="MethodImplAttribute.MethodImplAttribute"]/*' />
+        public MethodImplAttribute(MethodImplOptions methodImplOptions)
+        {
+            _val = methodImplOptions;
+        }
+        //| <include path='docs/doc[@for="MethodImplAttribute.MethodImplAttribute1"]/*' />
+        public MethodImplAttribute(short value)
+        {
+            _val = (MethodImplOptions)value;
+        }
+        //| <include path='docs/doc[@for="MethodImplAttribute.MethodImplAttribute2"]/*' />
+        public MethodImplAttribute()
+        {
+        }
+
+        //| <include path='docs/doc[@for="MethodImplAttribute.Value"]/*' />
+        public MethodImplOptions Value { get {return _val;} }
+    }
+
+}
diff --git a/base/Kernel/System/Runtime/CompilerServices/RuntimeHelpers.cs b/base/Kernel/System/Runtime/CompilerServices/RuntimeHelpers.cs
new file mode 100644
index 0000000..f61fe5d
--- /dev/null
+++ b/base/Kernel/System/Runtime/CompilerServices/RuntimeHelpers.cs
@@ -0,0 +1,85 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// RuntimeHelpers
+//  This class defines a set of static methods that provide support for compilers.
+//
+// Date: April 2000
+//
+namespace System.Runtime.CompilerServices {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    //| <include path='docs/doc[@for="RuntimeHelpers"]/*' />
+
+    public sealed class RuntimeHelpers
+    {
+        private RuntimeHelpers() {}
+
+        //| <include path='docs/doc[@for="RuntimeHelpers.InitializeArray"]/*' />
+        [Intrinsic]
+        public static extern void InitializeArray(Array array,RuntimeFieldHandle fldHandle);
+
+        // GetObjectValue is intended to allow value classes to be manipulated as 'Object'
+        // but have aliasing behavior of a value class.  The intent is that you would use
+        // this function just before an assignment to a variable of type 'Object'.  If the
+        // value being assigned is a mutable value class, then a shallow copy is returned
+        // (because value classes have copy semantics), but otherwise the object itself
+        // is returned.
+        //
+        // Note: VB calls this method when they're about to assign to an Object
+        // or pass it as a parameter.  The goal is to make sure that boxed
+        // value types work identical to unboxed value types - ie, they get
+        // cloned when you pass them around, and are always passed by value.
+        // Of course, reference types are not cloned.  -- BrianGru  7/12/2001
+        //
+        //| <include path='docs/doc[@for="RuntimeHelpers.GetObjectValue"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern Object GetObjectValue(Object obj);
+
+        // RunClassConstructor causes the class constructor for the given type to be triggered
+        // in the current domain.  After this call returns, the class constructor is guaranteed to
+        // have at least been started by some thread.  In the absence of class constructor
+        // deadlock conditions, the call is further guaranteed to have completed.
+        //
+        // This call will generate an exception if the specified class constructor threw an
+        // exception when it ran.
+
+        //| <include path='docs/doc[@for="RuntimeHelpers.RunClassConstructor"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void RunClassConstructor(RuntimeTypeHandle type);
+
+        //| <include path='docs/doc[@for="RuntimeHelpers.GetHashCode"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetHashCode(Object o);
+
+        //| <include path='docs/doc[@for="RuntimeHelpers.Equals"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public new static extern bool Equals(Object o1, Object o2);
+
+        //| <include path='docs/doc[@for="RuntimeHelpers.OffsetToStringData"]/*' />
+        public static int OffsetToStringData
+        {
+            get {
+                // Number of bytes from the address pointed to by a reference to
+                // a String to the first 16-bit character in the String.  Skip
+                // over the MethodTable pointer, String capacity, & String
+                // length.  Of course, the String reference points to the memory
+                // after the sync block, so don't count that.
+                // This property allows C#'s fixed statement to work on Strings.
+                // On 64 bit platforms, this should be 16.  -- BrianGru
+#if PTR_SIZE_32
+                return 12;
+#else
+                return 16;
+#endif
+            }
+        }
+    }
+}
+
diff --git a/base/Kernel/System/Runtime/InteropServices/Attributes.cs b/base/Kernel/System/Runtime/InteropServices/Attributes.cs
new file mode 100644
index 0000000..1db63d7
--- /dev/null
+++ b/base/Kernel/System/Runtime/InteropServices/Attributes.cs
@@ -0,0 +1,109 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+namespace System.Runtime.InteropServices {
+
+    using System;
+
+    //| <include path='docs/doc[@for="GuidAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct | AttributeTargets.Delegate, Inherited = false)]
+    public sealed class GuidAttribute : Attribute
+    {
+        internal String _val;
+        //| <include path='docs/doc[@for="GuidAttribute.GuidAttribute"]/*' />
+        public GuidAttribute(String guid)
+        {
+            _val = guid;
+        }
+        //| <include path='docs/doc[@for="GuidAttribute.Value"]/*' />
+        public String Value { get {return _val;} }
+    }
+
+    //| <include path='docs/doc[@for="InAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    public sealed class InAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="InAttribute.InAttribute"]/*' />
+        public InAttribute()
+        {
+        }
+    }
+
+    //| <include path='docs/doc[@for="OutAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    public sealed class OutAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="OutAttribute.OutAttribute"]/*' />
+        public OutAttribute()
+        {
+        }
+    }
+
+    //| <include path='docs/doc[@for="OptionalAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    public sealed class OptionalAttribute : Attribute
+    {
+        //| <include path='docs/doc[@for="OptionalAttribute.OptionalAttribute"]/*' />
+        public OptionalAttribute()
+        {
+        }
+    }
+
+    //| <include path='docs/doc[@for="StructLayoutAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, Inherited = false)]
+    public sealed class StructLayoutAttribute : Attribute
+    {
+        internal LayoutKind _val;
+        //| <include path='docs/doc[@for="StructLayoutAttribute.StructLayoutAttribute"]/*' />
+        public StructLayoutAttribute(LayoutKind layoutKind)
+        {
+            _val = layoutKind;
+        }
+        //| <include path='docs/doc[@for="StructLayoutAttribute.StructLayoutAttribute1"]/*' />
+        public StructLayoutAttribute(short layoutKind)
+        {
+            _val = (LayoutKind)layoutKind;
+        }
+        //| <include path='docs/doc[@for="StructLayoutAttribute.Value"]/*' />
+        public LayoutKind Value { get {return _val;} }
+        //| <include path='docs/doc[@for="StructLayoutAttribute.Pack"]/*' />
+        public int                Pack;
+        //| <include path='docs/doc[@for="StructLayoutAttribute.Size"]/*' />
+        public int            Size;
+        //| <include path='docs/doc[@for="StructLayoutAttribute.CharSet"]/*' />
+        public CharSet	      CharSet;
+    }
+
+    //| <include path='docs/doc[@for="FieldOffsetAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Field, Inherited = false)]
+    public sealed class FieldOffsetAttribute : Attribute
+    {
+        internal int _val;
+        //| <include path='docs/doc[@for="FieldOffsetAttribute.FieldOffsetAttribute"]/*' />
+        public FieldOffsetAttribute(int offset)
+        {
+            _val = offset;
+        }
+        //| <include path='docs/doc[@for="FieldOffsetAttribute.Value"]/*' />
+        public int Value { get {return _val;} }
+    }
+
+    public enum GCOption {
+        NONE = 0,
+        GCFRIEND = 1,
+        NOGC = 2,
+        NOSTGC = 3,
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
+    public sealed class GCAnnotationAttribute : Attribute {
+        internal GCOption _options;
+        public GCAnnotationAttribute(GCOption options ) {
+            _options = options;
+        }
+    }
+}
diff --git a/base/Kernel/System/Runtime/InteropServices/CharSet.cs b/base/Kernel/System/Runtime/InteropServices/CharSet.cs
new file mode 100644
index 0000000..036d548
--- /dev/null
+++ b/base/Kernel/System/Runtime/InteropServices/CharSet.cs
@@ -0,0 +1,22 @@
+// ==++==
+// 
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+// 
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+namespace System.Runtime.InteropServices {
+	using System;
+    //| <include path='docs/doc[@for="CharSet"]/*' />
+	public enum CharSet
+    {
+    	//| <include path='docs/doc[@for="CharSet.None"]/*' />
+    	None = 1,		// User didn't specify how to marshal strings.
+    	//| <include path='docs/doc[@for="CharSet.Ansi"]/*' />
+    	Ansi = 2,		// Strings should be marshalled as ANSI 1 byte chars. 
+    	//| <include path='docs/doc[@for="CharSet.Unicode"]/*' />
+    	Unicode = 3,    // Strings should be marshalled as Unicode 2 byte chars.
+    	//| <include path='docs/doc[@for="CharSet.Auto"]/*' />
+    	Auto = 4,		// Marshal Strings in the right way for the target system. 
+    }
+}
diff --git a/base/Kernel/System/Runtime/InteropServices/GcHandle.cs b/base/Kernel/System/Runtime/InteropServices/GcHandle.cs
new file mode 100644
index 0000000..a593a09
--- /dev/null
+++ b/base/Kernel/System/Runtime/InteropServices/GcHandle.cs
@@ -0,0 +1,283 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Runtime.InteropServices {
+
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+
+    // These are the types of handles used by the EE.  IMPORTANT: These must
+    // match the definitions in ObjectHandle.h in the EE.
+    //| <include path='docs/doc[@for="GCHandleType"]/*' />
+    public enum GCHandleType
+    {
+        //| <include path='docs/doc[@for="GCHandleType.Weak"]/*' />
+        Weak = 0,
+        //| <include path='docs/doc[@for="GCHandleType.WeakTrackResurrection"]/*' />
+        WeakTrackResurrection = 1,
+        //| <include path='docs/doc[@for="GCHandleType.Normal"]/*' />
+        Normal = 2,
+        //| <include path='docs/doc[@for="GCHandleType.Pinned"]/*' />
+        Pinned = 3
+    }
+
+    // This class allows you to create an opaque, GC handle to any
+    // managed object. A GC handle is used when an object reference must be
+    // reachable from unmanaged memory.  There are 3 kinds of roots:
+    // Normal - keeps the object from being collected.
+    // Weak - allows object to be collected and handle contents will be zeroed.
+    //          Weak references are zeroed before the finalizer runs, so if the
+    //          object is resurrected in the finalizer the weak reference is
+    //          still zeroed.
+    // WeakTrackResurrection - Same as weak, but stays until after object is
+    //          really gone.
+    // Pinned - same as normal, but allows the address of the actual object
+    //          to be taken.
+    //
+    //| <include path='docs/doc[@for="GCHandle"]/*' />
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)]
+    public struct GCHandle
+    {
+        // Allocate a handle storing the object and the type.
+        internal GCHandle(Object value, GCHandleType type)
+        {
+            m_handle = InternalAlloc(value, type);
+
+            // Record if the handle is pinned.
+            if (type == GCHandleType.Pinned)
+                m_handle |= 1;
+        }
+
+        // Used in the conversion functions below.
+        internal GCHandle(IntPtr handle)
+        {
+            InternalCheckDomain((int) handle);
+            m_handle = (int)handle;
+        }
+
+        // Creates a new GC handle for an object.
+        //
+        // value - The object that the GC handle is created for.
+        // type - The type of GC handle to create.
+        //
+        // returns a new GC handle that protects the object.
+        //| <include path='docs/doc[@for="GCHandle.Alloc"]/*' />
+        public static GCHandle Alloc(Object value)
+        {
+            return new GCHandle(value, GCHandleType.Normal);
+        }
+
+        //| <include path='docs/doc[@for="GCHandle.Alloc1"]/*' />
+        public static GCHandle Alloc(Object value, GCHandleType type)
+        {
+            return new GCHandle(value, type);
+        }
+
+        // Frees a GC handle.  The caller must provide synchronization to
+        // prevent multiple threads from executing this simultaneously for
+        // a given handle. If you modify this method please modify the
+        // __InternalFree also which is the internal without the link-time check.
+        //| <include path='docs/doc[@for="GCHandle.Free"]/*' />
+        public void Free()
+        {
+            // Check if the handle was never initialized for was freed.
+            if (m_handle == 0)
+                throw new InvalidOperationException("InvalidOperation_HandleIsNotInitialized");
+
+            // Free the handle.
+            InternalFree(m_handle & ~0x1);
+            m_handle = 0;
+        }
+
+        internal void __InternalFree()
+        {
+            // Check if the handle was never initialized for was freed.
+            if (m_handle == 0)
+                throw new InvalidOperationException("InvalidOperation_HandleIsNotInitialized");
+
+            // Free the handle.
+            InternalFree(m_handle & ~0x1);
+            m_handle = 0;
+        }
+
+        // Target property - allows getting / updating of the handle's referent. If you modify this method
+
+        // then modify the __InternalTarget too which is the internal method without the link-time check.
+        //| <include path='docs/doc[@for="GCHandle.Target"]/*' />
+        public Object Target
+        {
+            get
+            {
+                // Check if the handle was never initialized or was freed.
+                if (m_handle == 0)
+                    throw new InvalidOperationException("InvalidOperation_HandleIsNotInitialized");
+
+                return InternalGet(m_handle & ~0x1);
+            }
+
+            set
+            {
+                // Check if the handle was never initialized or was freed.
+                if (m_handle == 0)
+                    throw new InvalidOperationException("InvalidOperation_HandleIsNotInitialized");
+
+                InternalSet(m_handle & ~0x1, value, (m_handle & 0x1) != 0 /* isPinned */);
+            }
+        }
+
+        internal Object __InternalTarget
+        {
+            get
+            {
+                // Check if the handle was never initialized or was freed.
+                if (m_handle == 0)
+                    throw new InvalidOperationException("InvalidOperation_HandleIsNotInitialized");
+
+                return InternalGet(m_handle & ~0x1);
+            }
+        }
+
+        // Retrieve the address of an object in a Pinned handle.  This throws
+        // an exception if the handle is any type other than Pinned.
+        //| <include path='docs/doc[@for="GCHandle.AddrOfPinnedObject"]/*' />
+        public IntPtr AddrOfPinnedObject()
+        {
+            // Check if the handle was not a pinned handle.
+            if ((m_handle & 1) == 0)
+            {
+                // Check if the handle was never initialized for was freed.
+                if (m_handle == 0)
+                    throw new InvalidOperationException("InvalidOperation_HandleIsNotInitialized");
+
+                // You can only get the address of pinned handles.
+                throw new InvalidOperationException("InvalidOperation_HandleIsNotPinned");
+            }
+
+            // Get the address.
+            return InternalAddrOfPinnedObject(m_handle & ~0x1);
+        }
+
+        // Determine whether this handle has been allocated or not.
+        //| <include path='docs/doc[@for="GCHandle.IsAllocated"]/*' />
+        public bool IsAllocated
+        {
+            get
+            {
+                return m_handle != 0;
+            }
+        }
+
+        // Used to create a GCHandle from an int.  This is intended to
+        // be used with the reverse conversion.
+        //| <include path='docs/doc[@for="GCHandle.operatorGCHandle"]/*' />
+        public static explicit operator GCHandle(IntPtr value)
+        {
+            return new GCHandle(value);
+        }
+
+        // Used to get the internal integer representation of the handle out.
+        //| <include path='docs/doc[@for="GCHandle.operatorIntPtr"]/*' />
+        public static explicit operator IntPtr(GCHandle value)
+        {
+            return (IntPtr)value.m_handle;
+        }
+
+        // Internal native calls that this implementation uses.
+        internal static int InternalAlloc(Object value, GCHandleType type)
+        {
+            int result, newIndex;
+            if (type == GCHandleType.Pinned) {
+                throw new Exception("GCHandle for pinned objects not yet implemented");
+            }
+            do {
+                if (nextFreeIndex < 0) {
+                    lock (handleToken) {
+                        if (nextFreeIndex < 0) {
+                            if (handleTable == null) {
+                                handleTable = new HandleData[3];
+                                handleTable[0].nextIndex = -1;
+                                handleTable[1].nextIndex = 2;
+                                handleTable[2].nextIndex = -1;
+                                nextFreeIndex = 1;
+                            } else {
+                                int oldLength = handleTable.Length;
+                                int newLength = oldLength * 2;
+                                HandleData[] newTable = new HandleData[newLength];
+                                Array.Copy(handleTable, 0, newTable, 0, oldLength);
+                                handleTable = newTable;
+                                for (int i = oldLength+1; i < newLength; i++) {
+                                    handleTable[i].nextIndex = i + 1;
+                                }
+                                handleTable[newLength-1].nextIndex = -1;
+                                nextFreeIndex = oldLength+1;
+                            }
+                        }
+                    }
+                }
+                result = nextFreeIndex;
+                newIndex = handleTable[result].nextIndex;
+            } while (Interlocked.CompareExchange(ref nextFreeIndex, newIndex, result) != result);
+            handleTable[result].obj = value;
+            handleTable[result].type = type;
+            // TODO: We should probably maintain a list of handles of each type
+            return result;
+        }
+
+        internal static void InternalFree(int handle)
+        {
+            handleTable[handle].obj = null;
+            int oldFreeIndex = nextFreeIndex;
+            handleTable[handle].nextIndex = oldFreeIndex;
+            while (Interlocked.CompareExchange(ref nextFreeIndex, handle, oldFreeIndex) != oldFreeIndex) {
+                oldFreeIndex = nextFreeIndex;
+                handleTable[handle].nextIndex = oldFreeIndex;
+            }
+        }
+
+        internal static Object InternalGet(int handle)
+        {
+            return handleTable[handle].obj;
+        }
+
+        internal static void InternalSet(int handle, Object value, bool isPinned)
+        {
+            throw new Exception("System.Runtime.InteropServices.GCHandle.InternalSet not implemented in Bartok!");
+        }
+
+        internal static void InternalCompareExchange(int handle, Object value, Object oldValue, bool isPinned)
+        {
+            if (isPinned) {
+                throw new Exception("CompareExchange on a pinned object?!?");
+            }
+            Interlocked.CompareExchange(ref handleTable[handle].obj, value, oldValue);
+        }
+
+        internal static IntPtr InternalAddrOfPinnedObject(int handle)
+        {
+            throw new Exception("System.Runtime.InteropServices.GCHandle.InternalAddrOfPinnedObject not implemented in Bartok!");
+        }
+
+        internal static void InternalCheckDomain(int handle)
+        {
+            throw new Exception("System.Runtime.InteropServices.GCHandle.InternalCheckDomain not implemented in Bartok!");
+        }
+
+        // The actual integer handle value that the EE uses internally.
+        private int m_handle;
+
+        private static HandleData[] handleTable;
+
+        private static int nextFreeIndex = -1;
+
+        private static Object handleToken = new Object();
+
+        private struct HandleData {
+            public Object obj;
+            public GCHandleType type;
+            public int nextIndex;
+        }
+    }
+}
diff --git a/base/Kernel/System/Runtime/InteropServices/LayoutKind.cs b/base/Kernel/System/Runtime/InteropServices/LayoutKind.cs
new file mode 100644
index 0000000..86167da
--- /dev/null
+++ b/base/Kernel/System/Runtime/InteropServices/LayoutKind.cs
@@ -0,0 +1,21 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+namespace System.Runtime.InteropServices {
+    using System;
+    // Used in the StructLayoutAttribute class
+    //| <include path='docs/doc[@for="LayoutKind"]/*' />
+    public enum LayoutKind
+    {
+        //| <include path='docs/doc[@for="LayoutKind.Sequential"]/*' />
+        Sequential      = 0, // 0x00000008,
+        //| <include path='docs/doc[@for="LayoutKind.Explicit"]/*' />
+        Explicit        = 2, // 0x00000010,
+        //| <include path='docs/doc[@for="LayoutKind.Auto"]/*' />
+        Auto            = 3, // 0x00000000,
+    }
+}
diff --git a/base/Kernel/System/Runtime/InteropServices/Marshal.cs b/base/Kernel/System/Runtime/InteropServices/Marshal.cs
new file mode 100644
index 0000000..5e47596
--- /dev/null
+++ b/base/Kernel/System/Runtime/InteropServices/Marshal.cs
@@ -0,0 +1,85 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: Marshal
+**
+**
+** Purpose: This class contains methods that are mainly used to marshal
+**          between unmanaged and managed types.
+**
+** Date: January 31, 2000
+**
+=============================================================================*/
+
+namespace System.Runtime.InteropServices {
+
+    using Microsoft.Bartok.Runtime;
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //========================================================================
+    // All public methods, including PInvoke, are protected with linkchecks.
+    // Remove the default demands for all PInvoke methods with this global
+    // declaration on the class.
+    //========================================================================
+
+    //| <include path='docs/doc[@for="Marshal"]/*' />
+    public sealed class Marshal
+    {
+        //====================================================================
+        // SizeOf()
+        //====================================================================
+        //| <include path='docs/doc[@for="Marshal.SizeOf"]/*' />
+        // TODO PORTING: For 64 bit port, Ati considered making SizeOf return an IntPtr instead of an Int.  Consider making that change AND updating ECALL method sig.
+        public static int SizeOf(Object structure)
+        {
+            VTable vtable = structure.vtable;
+            if (vtable.arrayOf == StructuralType.None) {
+                if (vtable.Equals("string".vtable)) {
+                    throw new Exception("SizeOf not implemented for string objects");
+                } else {
+                    return vtable.marshalSize;
+                }
+            } else {
+                int elementSize = vtable.arrayElementSize;
+                int elementMask = elementSize - 1;
+                int numElements = ((Array) structure).Length;
+                return ((int)vtable.baseLength +
+                        numElements * elementSize +
+                        elementMask) & ~elementMask;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Marshal.SizeOf1"]/*' />
+        public static int SizeOf(Type t)
+        {
+            RuntimeType runtimeType = (RuntimeType) t;
+            VTable vtable = runtimeType.classVtable;
+            if (vtable.arrayOf == StructuralType.None &&
+                !t.Equals("string".GetType())) {
+                return vtable.marshalSize;
+            } else {
+                throw new Exception("SizeOf not implemented for type "+t);
+            }
+        }
+
+        ///
+        /// Used by the shared heap to allocate structs.
+        ///
+        public static int StructSize(Type t)
+        {
+            RuntimeType runtimeType = (RuntimeType) t;
+            VTable vtable = runtimeType.classVtable;
+            if (vtable.arrayOf == StructuralType.None &&
+                !t.Equals("string".GetType())) {
+                return vtable.arrayElementSize;
+            } else {
+                throw new Exception("SizeOf not implemented for type "+t);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/RuntimeArgumentHandle.cs b/base/Kernel/System/RuntimeArgumentHandle.cs
new file mode 100644
index 0000000..f2d3a87
--- /dev/null
+++ b/base/Kernel/System/RuntimeArgumentHandle.cs
@@ -0,0 +1,39 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+    //  This value type is used for constructing System.ArgIterator.
+    //
+    //  SECURITY : m_ptr cannot be set to anything other than null by untrusted
+    //  code.
+    //
+    //  This corresponds to EE VARARGS cookie.
+
+    //| <include path='docs/doc[@for="RuntimeArgumentHandle"]/*' />
+    public unsafe struct RuntimeArgumentHandle {
+        // Bartok will override type of m_ptr to be VarargList&
+        // [TracedPointer(VarargList)].
+        private VarargList* m_ptr;
+
+      internal IntPtr Pointer {
+          [NoHeapAllocation]
+          get { return (IntPtr) (UIntPtr) m_ptr; }
+      }
+
+      [RequiredByBartok]
+      [NoHeapAllocation]
+      // Bartok will override type of arguments to be VarargList&
+      // [TracedPointer(VarargList)].
+      internal static RuntimeArgumentHandle Arglist
+      (VarargList* arguments) {
+          RuntimeArgumentHandle h;
+          h.m_ptr = arguments;
+          return h;
+      }
+  }
+}
diff --git a/base/Kernel/System/RuntimeFieldHandle.cs b/base/Kernel/System/RuntimeFieldHandle.cs
new file mode 100644
index 0000000..046fa2e
--- /dev/null
+++ b/base/Kernel/System/RuntimeFieldHandle.cs
@@ -0,0 +1,29 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Reflection;
+
+    //  This value type is used for making classlib type safe.
+    //
+    //  SECURITY : m_ptr cannot be set to anything other than null by untrusted
+    //  code.
+    //
+    //  This corresponds to EE FieldDesc.
+    //| <include path='docs/doc[@for="RuntimeFieldHandle"]/*' />
+    public struct RuntimeFieldHandle
+    {
+        private IntPtr m_ptr;
+
+        //| <include path='docs/doc[@for="RuntimeFieldHandle.Value"]/*' />
+        public IntPtr Value {
+            get {
+                return m_ptr;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/RuntimeMethodHandle.cs b/base/Kernel/System/RuntimeMethodHandle.cs
new file mode 100644
index 0000000..01d85cb
--- /dev/null
+++ b/base/Kernel/System/RuntimeMethodHandle.cs
@@ -0,0 +1,30 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+
+    //  This value type is used for making classlib type safe.
+    //
+    //  SECURITY : m_ptr cannot be set to anything other than null by untrusted
+    //  code.
+    //
+    //  This corresponds to EE MethodDesc.
+    //| <include path='docs/doc[@for="RuntimeMethodHandle"]/*' />
+    public struct RuntimeMethodHandle
+    {
+        private IntPtr m_ptr;
+
+        //| <include path='docs/doc[@for="RuntimeMethodHandle.Value"]/*' />
+        public IntPtr Value {
+            get {
+                return m_ptr;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/RuntimeType.cs b/base/Kernel/System/RuntimeType.cs
new file mode 100644
index 0000000..af68b15
--- /dev/null
+++ b/base/Kernel/System/RuntimeType.cs
@@ -0,0 +1,394 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// __RuntimeType is the basic Type object representing classes as found in the
+//      system.  This type is never creatable by users, only by the system itself.
+//      The internal structure is known about by the runtime. __RuntimeXXX classes
+//      are created only once per object in the system and support == comparisons.
+//
+// Date: March 98
+//
+namespace System {
+
+    using Microsoft.Bartok.Runtime;
+    using System;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System.Text;
+    using Thread = System.Threading.Thread;
+    using SystemType = Microsoft.Singularity.V1.Types.SystemType;
+
+    [CCtorIsRunDuringStartup]
+    [StructLayout(LayoutKind.Sequential)]
+    internal sealed class RuntimeType : Type, ICloneable
+    {
+        // expand as needed, but also see/use TypeAttributes
+        // matches convert\ContainerInfo.cs::Enum_Kind
+        internal enum Enum_Kind {
+            NotSpecial     = 0,
+            Vector         = 1,
+            RectangleArray = 2,
+            Primitive      = 3,
+            Enum           = 4,
+            OtherValueType = 5
+        };
+
+        private readonly Assembly assembly;
+        [RequiredByBartok]
+        private readonly RuntimeType enclosingType;
+        [AccessedByRuntime("Referenced from C++")]
+        [RequiredByBartok]
+        private readonly String name;
+        [RequiredByBartok]
+        private readonly String nameSpace;
+
+        [RequiredByBartok]
+        internal readonly RuntimeType baseType;
+        [RequiredByBartok]
+        internal readonly System.RuntimeType[] interfaces;
+        [RequiredByBartok]
+        internal readonly Enum_Kind kind;
+        [RequiredByBartok]
+        internal readonly int rank;
+        [RequiredByBartok]
+        internal readonly TypeAttributes attributes;
+        [AccessedByRuntime("Referenced from C++")]
+        [RequiredByBartok]
+        internal readonly VTable classVtable;
+
+        // Putting these here for now because we need them for classes
+        // and interfaces, and I don't think we build VTable objects for
+        // interfaces:
+
+        [RequiredByBartok]
+        internal readonly System.UIntPtr cctor; // HACK: function pointer
+        [RequiredByBartok]
+        internal readonly System.UIntPtr ctor;  // HACK: function pointer
+        [RequiredByBartok]
+        internal Exception cctorException;
+        [RequiredByBartok]
+        internal TypeInitState cctorState;
+        [RequiredByBartok]
+        internal System.Threading.Thread cctorThread;
+
+        // Prevent from begin created
+        internal RuntimeType() {
+            throw new Exception("RuntimeType constructor not supported");
+        }
+
+        // Given a class handle, this will return the class for that handle.
+        [NoHeapAllocation]
+        public unsafe static Type GetTypeFromHandleImpl(RuntimeTypeHandle handle) {
+            IntPtr handleAddress = handle.Value;
+            Object obj = Magic.fromAddress((UIntPtr) handleAddress);
+            return Magic.toType(obj);
+        }
+
+        // Return the name of the class.  The name does not contain the namespace.
+        public override String Name {
+            [NoHeapAllocation]
+            get { return name; }
+        }
+
+        public override int GetHashCode() {
+            return ((int)this.classVtable.arrayOf << 8 + rank)
+                + (int)this.classVtable.structuralView;
+        }
+
+        // Return the name of the class.  The name does not contain the namespace.
+        public override String ToString(){
+            return InternalGetProperlyQualifiedName();
+        }
+
+        private String InternalGetProperlyQualifiedName() {
+            // markples: see also Lightning\Src\VM\COMClass.cpp::GetProperName
+            return FullName;
+        }
+
+        private void AddFullName(StringBuilder sb) {
+            RuntimeType enclosing = this.enclosingType;
+            while(enclosing != null) {
+                enclosing.AddFullName(sb);
+                sb.Append('+');
+                enclosing = enclosing.enclosingType;
+            }
+            if(nameSpace != null) {
+                sb.Append(nameSpace);
+                sb.Append('.');
+            }
+            sb.Append(name);
+        }
+
+        // Return the fully qualified name.  The name does contain the
+        // namespace.
+        public override String FullName {
+            get {
+                StringBuilder sb = new StringBuilder();
+                AddFullName(sb);
+                return sb.ToString();
+            }
+        }
+
+        // Return the name of the type including the assembly from which it came.
+        // This name can be persisted and used to reload the type at a later
+        // time.
+        public override String AssemblyQualifiedName {
+            get {
+                StringBuilder sb = new StringBuilder();
+                AddFullName(sb);
+                sb.Append(", ");
+                sb.Append(this.assembly.FullName);
+                return sb.ToString();
+            }
+        }
+
+        public override Assembly Assembly {
+            [NoHeapAllocation]
+            get { return assembly; }
+        }
+
+        // Return the name space.
+        public override String Namespace
+        {
+            [NoHeapAllocation]
+            get { return nameSpace; }
+        }
+
+        // Returns the base class for a class.  If this is an interface or has
+        // no base class null is returned.  Object is the only Type that does not
+        // have a base class.
+        public override Type BaseType {
+            [NoHeapAllocation]
+            get { return baseType; }
+        }
+
+
+        public override int GetArrayRank() {
+            return rank;
+        }
+
+        // GetInterfaces
+        // This method will return all of the interfaces implemented by a
+        //  class
+        public override Type[] GetInterfaces()
+        {
+            return interfaces;
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+        //
+        // Attributes
+        //
+        //   The attributes are all treated as read-only properties on a class.  Most of
+        //  these boolean properties have flag values defined in this class and act like
+        //  a bit mask of attributes.  There are also a set of boolean properties that
+        //  relate to the classes relationship to other classes and to the state of the
+        //  class inside the runtime.
+        //
+        ////////////////////////////////////////////////////////////////////////////////
+
+        // Internal routine to get the attributes.
+        [NoHeapAllocation]
+        protected override TypeAttributes GetAttributeFlagsImpl() {
+            return attributes;
+        }
+
+        // Internal routine to determine if this class represents an Array
+        [NoHeapAllocation]
+        protected override bool IsArrayImpl() {
+            return this.classVtable.arrayOf != StructuralType.None;
+        }
+
+        // Internal routine to determine if this class represents a primitive type
+        [NoHeapAllocation]
+        protected override bool IsPrimitiveImpl()
+        {
+            return kind == Enum_Kind.Primitive;
+        }
+
+        internal bool IsVector {
+            [NoHeapAllocation]
+            get {
+                return kind == Enum_Kind.Vector;
+            }
+        }
+
+        internal bool IsRectangleArray {
+            [NoHeapAllocation]
+            get {
+                return kind == Enum_Kind.RectangleArray;
+            }
+        }
+
+        [NoHeapAllocation]
+        public override Type GetElementType()
+        {
+            VTable element = this.classVtable.arrayElementClass;
+            return (element != null) ? element.vtableType : null;
+        }
+
+        [NoHeapAllocation]
+        protected override bool HasElementTypeImpl()
+        {
+            return (IsArray);
+        }
+
+        // Return the underlying Type that represents the IReflect Object.  For expando object,
+        // this is the (Object) IReflectInstance.GetType().  For Type object it is this.
+        public override Type UnderlyingSystemType {
+            [NoHeapAllocation]
+            get {return this;}
+        }
+
+        //
+        // ICloneable Implementation
+        //
+
+        // RuntimeType's are unique in the system, so the only thing that we should do to clone them is
+        // return the current instance.
+        public Object Clone() {
+            return this;
+        }
+
+        [NoHeapAllocation]
+        public override bool IsSubclassOf(Type c) {
+            Type p = this;
+            if (p == c) {
+                return false;
+            }
+            while (p != null) {
+                if (p == c) {
+                    return true;
+                }
+                p = p.BaseType;
+            }
+            return false;
+        }
+
+        [NoHeapAllocation]
+        internal override TypeCode GetTypeCodeInternal()
+        {
+            switch (classVtable.structuralView) {
+                case StructuralType.Bool:
+                    return TypeCode.Boolean;
+                case StructuralType.Char:
+                    return TypeCode.Object;
+                case StructuralType.Int8:
+                    return TypeCode.SByte;
+                case StructuralType.Int16:
+                    return TypeCode.Int16;
+                case StructuralType.Int32:
+                    return TypeCode.Int32;
+                case StructuralType.Int64:
+                    return TypeCode.Int64;
+                case StructuralType.UInt8:
+                    return TypeCode.Byte;
+                case StructuralType.UInt16:
+                    return TypeCode.UInt16;
+                case StructuralType.UInt32:
+                    return TypeCode.UInt32;
+                case StructuralType.UInt64:
+                    return TypeCode.UInt64;
+                case StructuralType.Float32:
+                    return TypeCode.Single;
+                case StructuralType.Float64:
+                    return TypeCode.Double;
+                default:
+                    return TypeCode.Object;
+            }
+        }
+
+        // This is a cache for the corresponding system-wide type
+        private SystemType systemType;
+
+        public override SystemType GetSystemType() {
+            if (SystemType.IsNull(this.systemType)) {
+                // initialize it
+                if (this.baseType == null) {
+                    this.systemType = SystemType.RootSystemType();
+                }
+                else {
+                    SystemType baseSt = this.baseType.GetSystemType();
+                    long lower, upper;
+                    string fullname = this.FullName;
+                    // for now compute an MD5 over the full name
+
+#if SINGULARITY_PROCESS                    
+                    unsafe {
+                        byte[] nameArray =
+                            RuntimeTypeHash.ComputeHashAndReturnName(fullname,
+                                                                     out lower,
+                                                                     out upper);
+                        fixed(byte* dataptr = &nameArray[0]) {
+                            char* name = (char*)dataptr;
+                            this.systemType = SystemType.Register(name,
+                                                                  fullname.Length,
+                                                                  lower, upper, baseSt);
+                        }
+                    }
+#else
+                    RuntimeTypeHash.ComputeHash(fullname, out lower, out upper);
+                    this.systemType = SystemType.Register(fullname,
+                                                          lower, 
+                                                          upper,
+                                                          baseSt);
+#endif
+                }
+            }
+            return this.systemType;
+        }
+
+    }
+
+
+    // Pulled these methods out of the main class in order to give
+    // the IoSystem access to the ComputeHash function when prebinding endpoints
+    public class RuntimeTypeHash
+    {
+        public static void ComputeHash(string fullname,
+                                       out long lower,
+                                       out long upper)
+        {
+            ComputeHashAndReturnName(fullname, out lower, out upper);
+        }
+
+        unsafe internal static byte[] ComputeHashAndReturnName(string fullname,
+                                                               out long lower,
+                                                               out long upper)
+        {
+            byte[] data = new byte[fullname.Length*sizeof(char)];
+            String.InternalCopy(fullname, data, fullname.Length);
+            ComputeHash(data, out lower, out upper);
+            return data;
+        }
+        ///
+        ///  Needs to be replaced with real hash computed over the
+        ///  signature of the type
+        ///
+        unsafe internal static void ComputeHash(byte[] fullname,
+                                              out long lower,
+                                              out long upper)
+        {
+            byte[] md5 = new Microsoft.Singularity.Crypto.MD5().Hash(fullname);
+
+            lower = ConvertToLong(md5, 0);
+            upper = ConvertToLong(md5, 8);
+        }
+
+        private static long ConvertToLong(byte[] data, int start) {
+            long result = data[start];
+            for (int i=1; i<8; i++) {
+                result = result << 8;
+                result |= data[start+i];
+            }
+            return result;
+        }
+
+    }
+}
diff --git a/base/Kernel/System/RuntimeTypeHandle.cs b/base/Kernel/System/RuntimeTypeHandle.cs
new file mode 100644
index 0000000..e2c6314
--- /dev/null
+++ b/base/Kernel/System/RuntimeTypeHandle.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using Microsoft.Bartok.Runtime;
+
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using System;
+    //  This value type is used for making Type.GetTypeFromHandle() type safe.
+    //
+    //  SECURITY : m_ptr cannot be set to anything other than null by untrusted
+    //  code.
+    //
+    //  This corresponds to EE TypeHandle.
+    //| <include path='docs/doc[@for="RuntimeTypeHandle"]/*' />
+    public struct RuntimeTypeHandle
+    {
+        private IntPtr m_ptr;
+
+        // The CLR appears to do this in native code.  We add this constructor
+        // so that we can do it from C#.  Note that by using "IntPtr" type we
+        // are using the assumption that the GC will not move RuntimeType
+        // objects.
+        [NoHeapAllocation]
+        internal RuntimeTypeHandle(RuntimeType type) {
+            this.m_ptr = (IntPtr) Magic.addressOf(type);
+        }
+
+        //| <include path='docs/doc[@for="RuntimeTypeHandle.Value"]/*' />
+        public IntPtr Value {
+            [NoHeapAllocation]
+            get {
+                return m_ptr;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/SByte.cs b/base/Kernel/System/SByte.cs
new file mode 100644
index 0000000..7809280
--- /dev/null
+++ b/base/Kernel/System/SByte.cs
@@ -0,0 +1,132 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  SByte
+**
+**
+** Purpose:
+**
+** Date:  March 15, 1998
+**
+===========================================================*/
+namespace System {
+    using System.Globalization;
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    // A place holder class for signed bytes.
+    //| <include path='docs/doc[@for="SByte"]/*' />
+    [CLSCompliant(false)]
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)]
+    public struct SByte : IComparable, IFormattable
+    {
+        private sbyte m_value;
+
+        // The maximum value that a Byte may represent: 127.
+        //| <include path='docs/doc[@for="SByte.MaxValue"]/*' />
+        public const sbyte MaxValue = (sbyte)0x7F;
+
+        // The minimum value that a Byte may represent: -128.
+        //| <include path='docs/doc[@for="SByte.MinValue"]/*' />
+        public const sbyte MinValue = unchecked((sbyte)0x80);
+
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type SByte, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="SByte.CompareTo"]/*' />
+        public int CompareTo(Object obj) {
+            if (obj == null) {
+                return 1;
+            }
+            if (!(obj is SByte)) {
+                throw new ArgumentException ("Arg_MustBeSByte");
+            }
+            return m_value - ((SByte)obj).m_value;
+        }
+
+        // Determines whether two Byte objects are equal.
+        //| <include path='docs/doc[@for="SByte.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is SByte)) {
+                return false;
+            }
+            return m_value == ((SByte)obj).m_value;
+        }
+
+
+        // Gets a hash code for this instance.
+        //| <include path='docs/doc[@for="SByte.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return ((int)m_value ^ (int)m_value << 8);
+        }
+
+
+        // Provides a string representation of a byte.
+        //| <include path='docs/doc[@for="SByte.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="SByte.ToString1"]/*' />
+        public String ToString(String format) {
+            if (m_value<0 && format!=null && format.Length>0 && (format[0]=='X' || format[0]=='x')) {
+                uint temp = (uint)(m_value & 0x000000FF);
+                return Number.FormatUInt32(temp,format);
+            }
+            return Number.FormatInt32(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="SByte.Parse"]/*' />
+        [CLSCompliant(false)]
+        public static sbyte Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        // Parses a signed byte from a String in the given style.  If
+        // a NumberFormatInfo isn't specified, the current culture's
+        // NumberFormatInfo is assumed.
+        //
+        //| <include path='docs/doc[@for="SByte.Parse3"]/*' />
+        [CLSCompliant(false)]
+        public static sbyte Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            int i = Number.ParseInt32(s, style);
+
+            if (((style & NumberStyles.AllowHexSpecifier) != 0) && (i <= Byte.MaxValue)) // We are parsing a hexadecimal number
+                    return (sbyte)i;
+
+            if (i < MinValue || i > MaxValue) throw new OverflowException("Overflow_SByte");
+            return (sbyte)i;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="SByte.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.SByte;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = m_value;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/SchedulerTime.cs b/base/Kernel/System/SchedulerTime.cs
new file mode 100644
index 0000000..6938cee
--- /dev/null
+++ b/base/Kernel/System/SchedulerTime.cs
@@ -0,0 +1,414 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//   Defines absolute time as used by the scheduler that is independent of the
+//   DateTime/timezone settings.
+//
+//   Used to keep track of timeouts and deadline in thread scheduling
+//
+// ==--==
+namespace System {
+
+    using Microsoft.Singularity;
+
+    using System;
+    using System.Threading;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using CultureInfo = System.Globalization.CultureInfo;
+
+#if !SINGULARITY_KERNEL
+    using Microsoft.Singularity.V1.Services;
+#endif
+
+    // This value type represents an absolute time on the scheduler timeline,
+    // which is kernel time increasing monotonically and independently of 
+    // the world time the machine thinks it is on. 
+    // The reason to separate world time and scheduler time is that world time can
+    // change at any time due to users changing the time and date, or due to
+    // adjustments for accuracy or daylight-savings.
+    //
+    [StructLayout(LayoutKind.Auto)]
+    [AccessedByRuntime("referenced by c++ via Thread")]
+    public struct SchedulerTime : IComparable
+    {
+        // Number of 100ns ticks per time unit
+        public const long TicksPerMillisecond = 10000;
+        public const long TicksPerSecond = TicksPerMillisecond * 1000;
+        public const long TicksPerMinute = TicksPerSecond * 60;
+        public const long TicksPerHour = TicksPerMinute * 60;
+        public const long TicksPerDay = TicksPerHour * 24;
+
+        // Number of milliseconds per time unit
+        private const int MillisPerSecond = 1000;
+        private const int MillisPerMinute = MillisPerSecond * 60;
+        private const int MillisPerHour = MillisPerMinute * 60;
+        private const int MillisPerDay = MillisPerHour * 24;
+
+        // Number of days in a non-leap year
+        private const int DaysPerYear = 365;
+        // Number of days in 4 years
+        private const int DaysPer4Years = DaysPerYear * 4 + 1;
+        // Number of days in 100 years
+        private const int DaysPer100Years = DaysPer4Years * 25 - 1;
+        // Number of days in 400 years
+        private const int DaysPer400Years = DaysPer100Years * 4 + 1;
+
+        private const int DaysTo10000 = DaysPer400Years * 25;
+
+        private const long MinTicks = 0;
+        private const long MaxTicks = DaysTo10000 * TicksPerDay - 1;
+        private const long MaxMillis = (long)DaysTo10000 * MillisPerDay;
+
+        //| <include path='docs/doc[@for="SchedulerTime.MinValue"]/*' />
+        public static readonly SchedulerTime MinValue = new SchedulerTime(MinTicks);
+        //| <include path='docs/doc[@for="SchedulerTime.MaxValue"]/*' />
+        public static readonly SchedulerTime MaxValue = new SchedulerTime(MaxTicks);
+
+        //
+        // NOTE yslin: Before the time zone is introduced, ticks is based on 1/1/0001 local time.
+        //
+        private long ticks;
+
+        // Constructs a SchedulerTime from a tick count. The ticks
+        // argument specifies the date as the number of 100-nanosecond intervals
+        // that have elapsed since 1/1/0001 12:00am.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.SchedulerTime"]/*' />
+        [NoHeapAllocation]
+        public SchedulerTime(long ticks) {
+            if (ticks < MinTicks) {
+                this.ticks = MinTicks;
+            }
+            else if (ticks > MaxTicks) {
+                this.ticks = MaxTicks;
+            }
+            else {
+                this.ticks = ticks;
+            }
+        }
+
+
+
+        // Returns the SchedulerTime resulting from adding the given
+        // TimeSpan to this SchedulerTime.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Add"]/*' />
+        [NoHeapAllocation]
+        public SchedulerTime Add(TimeSpan value) {
+            return new SchedulerTime(ticks + value._ticks);
+        }
+
+        // Returns the SchedulerTime resulting from adding a number of
+        // time units to this SchedulerTime.
+        private SchedulerTime Add(long value, int scale) {
+            long millis = value * scale;
+            if (millis <= -MaxMillis || millis >= MaxMillis) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_AddValue");
+            }
+            return new SchedulerTime(ticks + millis * TicksPerMillisecond);
+        }
+
+        // Returns the SchedulerTime resulting from adding a number of
+        // days to this SchedulerTime. The result is computed by rounding the
+        // fractional number of days given by value to the nearest
+        // millisecond, and adding that interval to this SchedulerTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.AddDays"]/*' />
+        public SchedulerTime AddDays(long value) {
+            return Add(value, MillisPerDay);
+        }
+
+        // Returns the SchedulerTime resulting from adding a number of
+        // hours to this SchedulerTime. The result is computed by rounding the
+        // fractional number of hours given by value to the nearest
+        // millisecond, and adding that interval to this SchedulerTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.AddHours"]/*' />
+        public SchedulerTime AddHours(long value) {
+            return Add(value, MillisPerHour);
+        }
+
+        // Returns the SchedulerTime resulting from the given number of
+        // milliseconds to this SchedulerTime. The result is computed by rounding
+        // the number of milliseconds given by value to the nearest integer,
+        // and adding that interval to this SchedulerTime. The value
+        // argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.AddMilliseconds"]/*' />
+        public SchedulerTime AddMilliseconds(long value) {
+            return Add(value, 1);
+        }
+
+        // Returns the SchedulerTime resulting from adding a number of
+        // minutes to this SchedulerTime. The result is computed by rounding the
+        // fractional number of minutes given by value to the nearest
+        // millisecond, and adding that interval to this SchedulerTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.AddMinutes"]/*' />
+        public SchedulerTime AddMinutes(long value) {
+            return Add(value, MillisPerMinute);
+        }
+
+        // Returns the SchedulerTime resulting from adding a number of
+        // seconds to this SchedulerTime. The result is computed by rounding the
+        // fractional number of seconds given by value to the nearest
+        // millisecond, and adding that interval to this SchedulerTime. The
+        // value argument is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.AddSeconds"]/*' />
+        public SchedulerTime AddSeconds(long value) {
+            return Add(value, MillisPerSecond);
+        }
+
+        // Returns the SchedulerTime resulting from adding the given number of
+        // 100-nanosecond ticks to this SchedulerTime. The value argument
+        // is permitted to be negative.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.AddTicks"]/*' />
+        public SchedulerTime AddTicks(long value) {
+            return new SchedulerTime(ticks + value);
+        }
+
+
+        // Compares two SchedulerTime values, returning an integer that indicates
+        // their relationship.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Compare"]/*' />
+        [NoHeapAllocation]
+        public static int Compare(SchedulerTime t1, SchedulerTime t2) {
+            if (t1.ticks > t2.ticks) return 1;
+            if (t1.ticks < t2.ticks) return -1;
+            return 0;
+        }
+
+        // Compares this SchedulerTime to a given object. This method provides an
+        // implementation of the IComparable interface. The object
+        // argument must be another SchedulerTime, or otherwise an exception
+        // occurs.  Null is considered less than any instance.
+        //
+        // Returns a value less than zero if this  object
+        //| <include path='docs/doc[@for="SchedulerTime.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) return 1;
+            if (!(value is SchedulerTime)) {
+                throw new ArgumentException("Arg_MustBeSchedulerTime");
+            }
+
+            long t = ((SchedulerTime)value).ticks;
+            if (ticks > t) return 1;
+            if (ticks < t) return -1;
+            return 0;
+        }
+
+
+        // Return the tick count corresponding to the given hour, minute, second.
+        // Will check the if the parameters are valid.
+        private static long TimeToTicks(int hour, int minute, int second)
+        {
+            //TimeSpan.TimeToTicks is a family access function which does no error checking, so
+            //we need to put some error checking out here.
+            if (hour >= 0 && hour < 24 && minute >= 0 && minute < 60 && second >=0 && second < 60)
+            {
+                return (TimeSpan.TimeToTicks(hour, minute, second));
+            }
+            throw new ArgumentOutOfRangeException("ArgumentOutOfRange_BadHourMinuteSecond");
+        }
+
+
+        // Checks if this SchedulerTime is equal to a given object. Returns
+        // true if the given object is a boxed SchedulerTime and its value
+        // is equal to the value of this SchedulerTime. Returns false
+        // otherwise.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Equals"]/*' />
+        public override bool Equals(Object value) {
+            if (value is SchedulerTime) {
+                return ticks == ((SchedulerTime)value).ticks;
+            }
+            return false;
+        }
+
+        // Compares two SchedulerTime values for equality. Returns true if
+        // the two SchedulerTime values are equal, or false if they are
+        // not equal.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Equals1"]/*' />
+        [NoHeapAllocation]
+        public static bool Equals(SchedulerTime t1, SchedulerTime t2) {
+            return t1.ticks == t2.ticks;
+        }
+
+        // Returns the date part of this SchedulerTime. The resulting value
+        // corresponds to this SchedulerTime with the time-of-day part set to
+        // zero (midnight).
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Date"]/*' />
+        public SchedulerTime Date {
+            get { return new SchedulerTime(ticks - ticks % TicksPerDay); }
+        }
+
+        // Returns the hash code for this SchedulerTime.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (int)ticks ^ (int)(ticks >> 32);
+        }
+
+        public long TotalDays {
+            [NoHeapAllocation]
+            get { return (ticks / TicksPerDay); }
+        }
+
+        // Returns the hour part of this SchedulerTime. The returned value is an
+        // integer between 0 and 23.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Hour"]/*' />
+        public int Hour {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerHour) % 24); }
+        }
+
+        // Returns the millisecond part of this SchedulerTime. The returned value
+        // is an integer between 0 and 999.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Millisecond"]/*' />
+        public int Millisecond {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerMillisecond) % 1000); }
+        }
+
+        // Returns the minute part of this SchedulerTime. The returned value is
+        // an integer between 0 and 59.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Minute"]/*' />
+        public int Minute {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerMinute) % 60); }
+        }
+
+
+        // Returns a SchedulerTime representing the current date and time. The
+        // resolution of the returned value depends on the system timer. For
+        // Windows NT 3.5 and later the timer resolution is approximately 10ms,
+        // for Windows NT 3.1 it is approximately 16ms, and for Windows 95 and 98
+        // it is approximately 55ms.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Now"]/*' />
+        public static SchedulerTime Now {
+            [NoHeapAllocation]
+#if SINGULARITY_KERNEL
+            get { return new SchedulerTime(SystemClock.KernelUpTime.Ticks); }
+#else
+            get { return new SchedulerTime(ProcessService.GetUpTime().Ticks); }
+#endif
+        }
+
+        // Returns the second part of this SchedulerTime. The returned value is
+        // an integer between 0 and 59.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Second"]/*' />
+        public int Second {
+            [NoHeapAllocation]
+            get { return (int)((ticks / TicksPerSecond) % 60); }
+        }
+
+        // Returns the tick count for this SchedulerTime. The returned value is
+        // the number of 100-nanosecond intervals that have elapsed since 1/1/0001
+        // 12:00am.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.Ticks"]/*' />
+        public long Ticks {
+            [NoHeapAllocation]
+            get { return ticks; }
+        }
+
+        // Returns the time-of-day part of this SchedulerTime. The returned value
+        // is a TimeSpan that indicates the time elapsed since midnight.
+        //
+        //| <include path='docs/doc[@for="SchedulerTime.TimeOfDay"]/*' />
+        public TimeSpan TimeOfDay {
+            get { return new TimeSpan(ticks % TicksPerDay); }
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.Subtract"]/*' />
+        public TimeSpan Subtract(SchedulerTime value) {
+            return new TimeSpan(ticks - value.ticks);
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.Subtract1"]/*' />
+        public SchedulerTime Subtract(TimeSpan value) {
+            return new SchedulerTime(ticks - value._ticks);
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.ToString3"]/*' />
+        public override String ToString() {
+            return String.Format("{0:d} days {1:d}:{2:d}:{3:d}",
+                                 TotalDays, Hour, Minute, Second);
+        }
+
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorADD"]/*' />
+        [NoHeapAllocation]
+        public static SchedulerTime operator +(SchedulerTime d, TimeSpan t) {
+            if (t == TimeSpan.Infinite) {
+                return MaxValue;
+            }
+            return new SchedulerTime(d.ticks + t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorSUB"]/*' />
+        [NoHeapAllocation]
+        public static SchedulerTime operator -(SchedulerTime d, TimeSpan t) {
+            return new SchedulerTime(d.ticks - t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorSUB1"]/*' />
+        [NoHeapAllocation]
+        public static TimeSpan operator -(SchedulerTime d1, SchedulerTime d2) {
+            return new TimeSpan(d1.ticks - d2.ticks);
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorEQ"]/*' />
+        [NoHeapAllocation]
+        public static bool operator ==(SchedulerTime d1, SchedulerTime d2) {
+            return d1.ticks == d2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorNE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator !=(SchedulerTime d1, SchedulerTime d2) {
+            return d1.ticks != d2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorLT"]/*' />
+        [NoHeapAllocation]
+        public static bool operator <(SchedulerTime t1, SchedulerTime t2) {
+            return t1.ticks < t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorLE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator <=(SchedulerTime t1, SchedulerTime t2) {
+            return t1.ticks <= t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorGT"]/*' />
+        [NoHeapAllocation]
+        public static bool operator >(SchedulerTime t1, SchedulerTime t2) {
+            return t1.ticks > t2.ticks;
+        }
+
+        //| <include path='docs/doc[@for="SchedulerTime.operatorGE"]/*' />
+        [NoHeapAllocation]
+        public static bool operator >=(SchedulerTime t1, SchedulerTime t2) {
+            return t1.ticks >= t2.ticks;
+        }
+
+    }
+}
diff --git a/base/Kernel/System/Security/Attributes.cs b/base/Kernel/System/Security/Attributes.cs
new file mode 100644
index 0000000..4141a01
--- /dev/null
+++ b/base/Kernel/System/Security/Attributes.cs
@@ -0,0 +1,16 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Security
+{
+    // UnverifiableCodeAttribute:
+    //  Indicates that the target module contains unverifiable code.
+    //| <include path='docs/doc[@for="UnverifiableCodeAttribute"]/*' />
+    [AttributeUsage(AttributeTargets.Module, AllowMultiple = true, Inherited = false )]
+    sealed public class UnverifiableCodeAttribute : System.Attribute
+    {
+    }
+}
diff --git a/base/Kernel/System/Single.cs b/base/Kernel/System/Single.cs
new file mode 100644
index 0000000..cb1f1e4
--- /dev/null
+++ b/base/Kernel/System/Single.cs
@@ -0,0 +1,196 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Single
+**
+**
+** Purpose: A wrapper class for the primitive type float.
+**
+** Date:  August 3, 1998
+**
+===========================================================*/
+namespace System {
+
+    using System.Globalization;
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="Single"]/*' />
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)]
+    public struct Single : IComparable, IFormattable
+    {
+        internal float m_value;
+
+        //
+        // Public constants
+        //
+        //| <include path='docs/doc[@for="Single.MinValue"]/*' />
+        public const float MinValue = (float)-3.40282346638528859e+38;
+        //| <include path='docs/doc[@for="Single.Epsilon"]/*' />
+        public const float Epsilon = (float)1.4e-45;
+        //| <include path='docs/doc[@for="Single.MaxValue"]/*' />
+        public const float MaxValue = (float)3.40282346638528859e+38;
+        //| <include path='docs/doc[@for="Single.PositiveInfinity"]/*' />
+        public const float PositiveInfinity = (float)1.0 / (float)0.0;
+        //| <include path='docs/doc[@for="Single.NegativeInfinity"]/*' />
+        public const float NegativeInfinity = (float)-1.0 / (float)0.0;
+        //| <include path='docs/doc[@for="Single.NaN"]/*' />
+        public const float NaN = (float)0.0 / (float)0.0;
+
+        //
+        // Private constants
+        //
+        private const ulong PositiveInfinityAsUInt32 = 0x7f800000;
+        private const ulong NegativeInfinityAsUInt32 = 0xff800000;
+
+        private const ulong ExponentAsUInt32 = 0xff80000;
+        private const ulong MantissaAsUInt32 = 0x007ffff;
+
+        //
+        // Native Declarations
+        //
+        //| <include path='docs/doc[@for="Single.IsInfinity"]/*' />
+        public static bool IsInfinity(float f) {
+            uint v = BitConverter.SingleToUInt32Bits(f);
+            return (v == PositiveInfinityAsUInt32 ||
+                    v == NegativeInfinityAsUInt32);
+        }
+
+        //| <include path='docs/doc[@for="Single.IsPositiveInfinity"]/*' />
+        public static bool IsPositiveInfinity(float f) {
+            uint v = BitConverter.SingleToUInt32Bits(f);
+            return (v == PositiveInfinityAsUInt32);
+        }
+
+        //| <include path='docs/doc[@for="Single.IsNegativeInfinity"]/*' />
+        public static bool IsNegativeInfinity(float f) {
+            uint v = BitConverter.SingleToUInt32Bits(f);
+            return (v == NegativeInfinityAsUInt32);
+        }
+
+        //| <include path='docs/doc[@for="Single.IsNa
+        public static bool IsNaN(float f) {
+            // rusa: see also Lightning\Src\ClassLibNative\Float\COMFloat::IsNAN
+            uint v = BitConverter.SingleToUInt32Bits(f);
+            return (((v & PositiveInfinityAsUInt32) == v) &&
+                    ((v & MantissaAsUInt32) != 0));
+        }
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type Single, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="Single.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is Single) {
+                float f = (float)value;
+                if (m_value < f) return -1;
+                if (m_value > f) return 1;
+                if (m_value == f) return 0;
+
+                // At least one of the values is NaN.
+                if (IsNaN(m_value))
+                    return (IsNaN(f) ? 0 : -1);
+                else // f is NaN.
+                    return 1;
+            }
+            throw new ArgumentException ("Arg_MustBeSingle");
+        }
+
+        //| <include path='docs/doc[@for="Single.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is Single)) {
+                return false;
+            }
+            float temp = ((Single)obj).m_value;
+            if (temp == m_value) {
+                return true;
+            }
+
+            return IsNaN(temp) && IsNaN(m_value);
+        }
+
+        //| <include path='docs/doc[@for="Single.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return unchecked((int)BitConverter.SingleToUInt32Bits(m_value));
+        }
+
+        //| <include path='docs/doc[@for="Single.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="Single.ToString1"]/*' />
+        public String ToString(String format) {
+            return Number.FormatSingle(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="Single.Parse"]/*' />
+        public static float Parse(String s) {
+            return Parse(s, NumberStyles.Float | NumberStyles.AllowThousands);
+        }
+
+        // Parses a float from a String in the given style.  If
+        // a NumberFormatInfo isn't specified, the current culture's
+        // NumberFormatInfo is assumed.
+        //
+        // This method will not throw an OverflowException, but will return
+        // PositiveInfinity or NegativeInfinity for a number that is too
+        // large or too small.
+        //
+        //| <include path='docs/doc[@for="Single.Parse3"]/*' />
+        public static float Parse(String s, NumberStyles style) {
+            try {
+                return Number.ParseSingle(s, style);
+            } catch (FormatException) {
+                //If we caught a FormatException, it may be from one of our special strings.
+                //Check the three with which we're concerned and rethrow if it's not one of
+                //those strings.
+                String sTrim = s.Trim();
+                if (sTrim.Equals(NumberFormatInfo.positiveInfinitySymbol)) {
+                    return PositiveInfinity;
+                }
+                if (sTrim.Equals(NumberFormatInfo.negativeInfinitySymbol)) {
+                    return NegativeInfinity;
+                }
+                if (sTrim.Equals(NumberFormatInfo.nanSymbol)) {
+                    return NaN;
+                }
+                //Rethrow the previous exception;
+                throw;
+            }
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="Single.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.Single;
+        }
+
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/StackOverflowException.cs b/base/Kernel/System/StackOverflowException.cs
new file mode 100644
index 0000000..4934ce4
--- /dev/null
+++ b/base/Kernel/System/StackOverflowException.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: StackOverflowException
+**
+**
+** Purpose: The exception class for stack overflow.
+**
+** Date: March 25, 1998
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="StackOverflowException"]/*' />
+    [AccessedByRuntime("referenced from halasm.asm/brtasm.asm")]
+    public sealed class StackOverflowException : SystemException {
+        //| <include path='docs/doc[@for="StackOverflowException.StackOverflowException"]/*' />
+        [AccessedByRuntime("referenced from halasm.asm")]
+        public StackOverflowException()
+            : base("Arg_StackOverflowException") {
+        }
+
+        //| <include path='docs/doc[@for="StackOverflowException.StackOverflowException1"]/*' />
+        public StackOverflowException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="StackOverflowException.StackOverflowException2"]/*' />
+        public StackOverflowException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/String.cs b/base/Kernel/System/String.cs
new file mode 100644
index 0000000..0d09436
--- /dev/null
+++ b/base/Kernel/System/String.cs
@@ -0,0 +1,3140 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  String
+**
+**
+** Purpose: Contains headers for the String class.  Actual implementations
+** are in String.cpp
+**
+** Date:  March 15, 1998
+**
+===========================================================*/
+namespace System {
+    using System.Text;
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Threading;
+    using System.Collections;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+    using Microsoft.Bartok.Runtime;
+
+    //
+    // For Information on these methods, please see COMString.cpp
+    //
+    // The String class represents a static string of characters.  Many of
+    // the String methods perform some type of transformation on the current
+    // instance and return the result as a new String. All comparison methods are
+    // implemented as a part of String.  As with arrays, character positions
+    // (indices) are zero-based.
+    //
+    //| <include path='docs/doc[@for="String"]/*' />
+    [CCtorIsRunDuringStartup]
+    public sealed class String : IComparable, ICloneable, IEnumerable {
+
+        //
+        //NOTE NOTE NOTE NOTE
+        //These fields map directly onto the fields in an EE StringObject.  See object.h for the layout.
+        //Don't change these fields or add any new fields without first talking to JRoxe.
+        //
+        [RequiredByBartok]
+        private int  m_arrayLength;
+        [AccessedByRuntime("referenced from c++")]
+        private int  m_stringLength;
+        [AccessedByRuntime("referenced from c++")]
+        private char m_firstChar;
+
+        //private static readonly char FmtMsgMarkerChar='%';
+        //private static readonly char FmtMsgFmtCodeChar='!';
+        //These are defined in Com99/src/vm/COMStringCommon.h and must be kept in sync.
+        private const int TrimHead = 0;
+        private const int TrimTail = 1;
+        private const int TrimBoth = 2;
+
+        // The Empty constant holds the empty string value.
+        //We need to call the String constructor so that the compiler doesn't mark this as a literal.
+        //Marking this as a literal would mean that it doesn't show up as a field which we can access
+        //from native.
+        //| <include path='docs/doc[@for="String.Empty"]/*' />
+        public static readonly String Empty = "";
+
+        //
+        //Native Static Methods
+        //
+
+        // Joins an array of strings together as one string with a separator between each original string.
+        //
+        //| <include path='docs/doc[@for="String.Join"]/*' />
+        public static String Join(String separator, String[] value) {
+            if (value==null) {
+                throw new ArgumentNullException("value");
+            }
+            return Join(separator, value, 0, value.Length);
+        }
+
+        /**
+         * Joins an array of strings together as one string with a separator
+         * between each original string.
+         *
+         * @param separator the string used as a separator.
+         * @param value the array of strings to be joined.
+         * @param startIndex the position within the array to start using
+         *  strings.
+         * @param count the number of strings to take from the array.
+         *
+         * @return a string consisting of the strings contained in <i>value</i>
+         *  from <EM>startIndex</EM> to <EM>startIndex</EM> + <EM>count</EM>
+         *  joined together to form a single string, with each of the original
+         *  strings separated by <i>separator</i>.
+         */
+        //| <include path='docs/doc[@for="String.Join1"]/*' />
+        public static String Join(String separator, String[] value,
+                                  int startIndex, int count)
+        {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::JoinArray
+            if (separator == null) {
+                separator = String.Empty;
+            }
+            if (value == null) {
+                throw new ArgumentNullException("value array is null");
+            }
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count is negative");
+            }
+            if (startIndex + count > value.Length) {
+                throw new ArgumentOutOfRangeException("startIndex+count>value.Length");
+            }
+            // Special case the empty list of strings
+            if (count == 0) {
+                return String.Empty;
+            }
+            // Compute the length of the new string
+            int newLength = 0;
+            int limit = startIndex + count;
+            for (int i = startIndex; i < limit; i++) {
+                String s = value[i];
+                if (s != null) {
+                    newLength += s.m_stringLength;
+                }
+            }
+            newLength += (count - 1) * separator.m_stringLength;
+            // Create a new String
+            String result = FastAllocateString(newLength);
+            if (newLength == 0) {
+                return result;
+            }
+            // Fill in the string
+            int dstIndex = 0;
+            String firstString = value[startIndex];
+            if (firstString != null) {
+                FillString(result, 0, firstString);
+                dstIndex = firstString.m_stringLength;
+            }
+            for (int i = startIndex+1; i < limit; i++) {
+                FillString(result, dstIndex, separator);
+                dstIndex += separator.m_stringLength;
+                String elementString = value[i];
+                if (elementString != null) {
+                    FillString(result, dstIndex, elementString);
+                    dstIndex += elementString.m_stringLength;
+                }
+            }
+            return result;
+        }
+
+        private unsafe static bool CaseInsensitiveCompHelper(char * strAChars,
+                                                             char * strBChars,
+                                                             int aLength,
+                                                             int bLength,
+                                                             out int result) {
+            char charA;
+            char charB;
+            char *strAStart;
+
+            strAStart = strAChars;
+
+            result = 0;
+
+            // setup the pointers so that we can always increment them.
+            // We never access these pointers at the negative offset.
+            strAChars--;
+            strBChars--;
+
+            do {
+                strAChars++; strBChars++;
+
+                charA = *strAChars;
+                charB = *strBChars;
+
+                //Case-insensitive comparison on chars greater than 0x80 requires
+                //a locale-aware casing operation and we're not going there.
+                if (charA>=0x80 || charB>=0x80) {
+                    //[SOSP] we should be able to fix this.
+                    return false;
+                }
+
+                // Do the right thing if they differ in case only.
+                // We depend on the fact that the uppercase and lowercase letters
+                // in the range which we care about (A-Z,a-z) differ only by the
+                // 0x20 bit.
+                // The check below takes the xor of the two characters and
+                // determines if this bit is only set on one of them.
+                // If they're different cases, we know that we need to execute
+                // only one of the conditions within block.
+                if (((charA^charB)&0x20) != 0) {
+                    if (charA>='A' && charA<='Z') {
+                        charA |= (char)0x20;
+                    } else if (charB>='A' && charB<='Z') {
+                        charB |= (char)0x20;
+                    }
+                }
+            } while (charA==charB && charA!=0);
+
+            // Return the (case-insensitive) difference between them.
+            if (charA!=charB) {
+                result = (int)(charA-charB);
+                return true;
+            }
+
+            // The length of b was unknown because it was just a pointer to a
+            // null-terminated string.
+            // If we get here, we know that both A and B are pointing at a null.
+            // However, A can have an embedded null.  Check the number of
+            // characters that we've walked in A against the expected length.
+            if (bLength==-1) {
+                if ((strAChars - strAStart)!=aLength) {
+                    result = 1;
+                    return true;
+                }
+                result=0;
+                return true;
+            }
+
+            result = (aLength - bLength);
+            return true;
+        }
+
+        internal unsafe static int nativeCompareOrdinal(String strA, String strB,
+                                                        bool bIgnoreCase)
+        {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::FCCompareOrdinal
+            int strALength = strA.Length;
+            int strBLength = strB.Length;
+            fixed(char * strAChars = &strA.m_firstChar) {
+                fixed(char * strBCharsStart = &strB.m_firstChar) {
+
+                    // Need copy because fixed vars are readonly
+                    char * strBChars = strBCharsStart;
+
+                    // Handle the comparison where we wish to ignore case.
+                    if (bIgnoreCase) {
+                        int result;
+                        if (CaseInsensitiveCompHelper(strAChars, strBChars,
+                                                      strALength, strBLength,
+                                                      out result)) {
+                            return result;
+                        } else {
+                            // This will happen if we have characters greater
+                            // than 0x7F.
+                            throw new ArgumentException();
+                        }
+                    }
+
+                    // If the strings are the same length, compare exactly the
+                    // right # of chars.  If they are different, compare the
+                    // shortest # + 1 (the '\0').
+                    int count = strALength;
+                    if (count > strBLength)
+                        count = strBLength;
+
+                    long diff = (byte*)strAChars - (byte*)strBChars;
+
+                    // Loop comparing a DWORD at a time.
+                    while ((count -= 2) >= 0) {
+                        if(((*(int*)((byte*)strBChars + diff))
+                            - *(int*)strBChars) != 0) {
+                            char * ptr1 = (char*)((byte*)strBChars + diff);
+                            char * ptr2 = strBChars;
+                            if (*ptr1 != *ptr2) {
+                                return ((int)*ptr1 - (int)*ptr2);
+                            }
+                            return ((int)*(ptr1+1) - (int)*(ptr2+1));
+                        }
+
+                        // differs from COMString.cpp because they have DWORD*
+                        // and we use char*
+                        strBChars += 2;
+                    }
+
+                    // Handle an extra WORD.
+                    int c;
+                    if (count == -1) {
+                        c = *((char*)((byte*)strBChars+diff)) - *strBChars;
+                        if(c != 0) {
+                            return c;
+                        }
+                    }
+                    return strALength - strBLength;
+                }
+            }
+        }
+
+        internal static int nativeCompareOrdinalEx(String strA, int indexA,
+                                                   String strB, int indexB,
+                                                   int count)
+        {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::CompareOrdinalEx
+            throw new Exception("System.String.nativeCompareOrdinalEx not implemented in Bartok!");
+        }
+
+        //
+        // This is a helper method for the security team.  They need to uppercase some strings (guaranteed to be less
+        // than 0x80) before security is fully initialized.  Without security initialized, we can't grab resources (the nlp's)
+        // from the assembly.  This provides a workaround for that problem and should NOT be used anywhere else.
+        //
+        internal static String SmallCharToUpper(String strA)
+        {
+            String newString = FastAllocateString(strA.Length);
+            nativeSmallCharToUpper(strA, newString);
+            return newString;
+        }
+
+        private static void nativeSmallCharToUpper(String strIn, String strOut)
+        {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::SmallCharToUpper
+            throw new Exception("System.String.nativeSmallCharToUpper not implemented in Bartok!");
+        }
+
+        // This is a helper method for the security team.  They need to construct strings from a char[]
+        // within their homebrewed XML parser.  They guarantee that the char[] they pass in isn't null and
+        // that the provided indices are valid so we just stuff real fast.
+        internal static String CreateFromCharArray(char[] array, int start, int count)
+        {
+            String newString = FastAllocateString(count);
+            FillStringArray(newString, 0, array, start, count);
+            return newString;
+        }
+
+        //
+        //
+        // NATIVE INSTANCE METHODS
+        //
+        //
+
+        //
+        // Search/Query methods
+        //
+
+        // Determines whether two strings match.
+        //| <include path='docs/doc[@for="String.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (obj is String) {
+                return this.Equals((String) obj);
+            } else {
+                return false;
+            }
+        }
+
+        // Determines whether two strings match.
+        //| <include path='docs/doc[@for="String.Equals1"]/*' />
+        public unsafe bool Equals(String value) {
+            if (value == null) {
+                return false;
+            }
+            if (this.m_stringLength != value.m_stringLength) {
+                return false;
+            }
+            fixed (char *thisCharPtr = &this.m_firstChar) {
+                fixed (char *valueCharPtr = &value.m_firstChar) {
+                    char *thisCursor = thisCharPtr;
+                    char *valueCursor = valueCharPtr;
+                    for (int i = this.m_stringLength; i > 0; i--) {
+                        if (*thisCursor != *valueCursor) {
+                            return false;
+                        }
+                        thisCursor++;
+                        valueCursor++;
+                    }
+                }
+            }
+            return true;
+        }
+
+        // Determines whether two Strings match.
+        //| <include path='docs/doc[@for="String.Equals2"]/*' />
+        public static bool Equals(String a, String b) {
+            if ((Object)a==(Object)b) {
+                return true;
+            }
+
+            if ((Object)a==null || (Object)b==null) {
+                return false;
+            }
+
+            return a.Equals(b);
+        }
+
+        //| <include path='docs/doc[@for="String.operatorEQ"]/*' />
+        public static bool operator == (String a, String b)
+        {
+            return String.Equals(a, b);
+        }
+
+        //| <include path='docs/doc[@for="String.operatorNE"]/*' />
+        public static bool operator != (String a, String b)
+        {
+            return !String.Equals(a, b);
+        }
+
+        internal unsafe char InternalGetChar(int index)
+        {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::GetCharAt
+            if ((uint) index >= (uint) this.m_stringLength) {
+                throw new IndexOutOfRangeException();
+            }
+            fixed (char *charPtr = &this.m_firstChar) {
+                return charPtr[index];
+            }
+        }
+
+        // Gets the character at a specified position.
+        //
+        //| <include path='docs/doc[@for="String.this"]/*' />
+        public char this[int index] {
+            get { return InternalGetChar(index); }
+        }
+
+        internal unsafe int InternalGetChars(char *output, int maxput)
+        {
+            fixed (char *charPtr = &this.m_firstChar) {
+                int i;
+                for (i = 0; i < m_stringLength && i < maxput; i++) {
+                    output[i] = charPtr[i];
+                }
+                return i;
+            }
+        }
+
+        // Converts a substring of this string to an array of characters.  Copies the
+        // characters of this string beginning at position startIndex and ending at
+        // startIndex + length - 1 to the character array buffer, beginning
+        // at bufferStartIndex.
+        //
+        //| <include path='docs/doc[@for="String.CopyTo"]/*' />
+        public void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count)
+        {
+            if (destination == null)
+                throw new ArgumentNullException("destination");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NegativeCount");
+            if (sourceIndex < 0)
+                throw new ArgumentOutOfRangeException("sourceIndex", "ArgumentOutOfRange_Index");
+            if (count > Length - sourceIndex)
+                throw new ArgumentOutOfRangeException("sourceIndex", "ArgumentOutOfRange_IndexCount");
+            if (destinationIndex > destination.Length-count || destinationIndex < 0)
+                throw new ArgumentOutOfRangeException("destinationIndex", "ArgumentOutOfRange_IndexCount");
+            InternalCopyTo(sourceIndex, destination, destinationIndex, count);
+        }
+
+        internal unsafe void InternalCopyTo(int sourceIndex, char[] destination,
+                                            int destinationIndex, int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::GetPreallocatedCharArray
+            if (sourceIndex + count > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException();
+            }
+            if (count > 0) {
+                // Necessary test as &destination[0] is illegal for empty array
+                fixed (char *srcPtrFixed = &this.m_firstChar) {
+                    fixed (char *dstPtrFixed = destination) {
+                        char *srcPtr = srcPtrFixed + sourceIndex;
+                        char *dstPtr = dstPtrFixed + destinationIndex;
+                        Buffer.MoveMemory((byte *)dstPtr, (byte *)srcPtr,
+                                          count * sizeof(char));
+                    }
+                }
+            }
+        }
+
+        internal unsafe void CopyToByteArray(int sourceIndex, byte[] destination,
+                                      int destinationIndex, int charCount)
+        {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::InternalCopyToByteArray
+            // Rusa: apparently there are no calls to this method
+            // arlied: Actually, there is at least one call to this method, and I need to use it.
+            // arlied: It's called by System.Text.UnicodeEncoding.GetBytes() for little-endian Unicode.
+
+            if (destination == null)
+                throw new ArgumentNullException("destination");
+            if (charCount < 0)
+                throw new ArgumentOutOfRangeException("charCount");
+            if (destinationIndex < 0)
+                throw new ArgumentOutOfRangeException("destinationIndex");
+            if (sourceIndex < 0)
+                throw new ArgumentOutOfRangeException("sourceIndex");
+            if (sourceIndex + charCount > this.m_stringLength)
+                throw new ArgumentOutOfRangeException("charCount");
+
+            int byteCount = charCount * 2;
+            if (destinationIndex + byteCount > destination.Length)
+                throw new ArgumentOutOfRangeException("destinationLength");
+
+            if (charCount > 0) {
+                fixed (byte* dest = &destination[destinationIndex])
+                fixed (char* src_char0 = &this.m_firstChar) {
+                    byte* src_bytes = (byte*)(&src_char0[sourceIndex]);
+                    Buffer.MoveMemory(dest, src_bytes, byteCount);
+                }
+            }
+        }
+
+        // Returns the entire string as an array of characters.
+        //| <include path='docs/doc[@for="String.ToCharArray"]/*' />
+        public char[] ToCharArray() {
+            return ToCharArray(0,Length);
+        }
+
+        // Returns a substring of this string as an array of characters.
+        //
+        //| <include path='docs/doc[@for="String.ToCharArray1"]/*' />
+        public char[] ToCharArray(int startIndex, int length)
+        {
+            // Range check everything.
+            if (startIndex < 0 || startIndex > Length || startIndex > Length - length)
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            if (length < 0)
+                throw new ArgumentOutOfRangeException("length", "ArgumentOutOfRange_Index");
+
+            char[] chars = new char[length];
+            InternalCopyTo(startIndex, chars, 0, length);
+            return chars;
+        }
+
+        // Gets a hash code for this string.  If strings A and B are such that A.Equals(B), then
+        // they will return the same hash code.
+        //| <include path='docs/doc[@for="String.GetHashCode"]/*' />
+        public unsafe override int GetHashCode() {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::GetHashCode
+            fixed (char *charPtrFixed = &this.m_firstChar) {
+                char *charPtr = charPtrFixed;
+                if (charPtr[this.m_stringLength] != 0) {
+                    throw new Exception("Bartok string is not null terminated");
+                }
+                // Rusa: see also Lightning\Src\UtilCode.h::HashString
+                uint hash = 5381;
+                char c = *charPtr;
+                while (c != 0) {
+                    hash = ((hash << 5) + hash) ^ c;
+                    charPtr++;
+                    c = *charPtr;
+                }
+                return (int) hash;
+            }
+        }
+
+        // Gets the length of this string
+        //| <include path='docs/doc[@for="String.Length"]/*' />
+        public int Length {
+            get { return InternalLength(); }
+        }
+
+        /// This is a EE implemented function so that the JIT can recognise it and
+        /// treat it specially by eliminating checks on character fetches.
+        private int InternalLength() {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::Length
+            // Rusa: see also Lightning\Src\VM\object.h::GetStringLength
+            return this.m_stringLength;
+        }
+
+        ///<internalonly/>
+        internal int ArrayLength {
+            get { return (m_arrayLength); }
+        }
+
+        // Used by StringBuilder
+        internal int Capacity {
+            get { return (m_arrayLength - 1); }
+        }
+
+        // Creates an array of strings by splitting this string at each
+        // occurrence of a separator.  The separator is searched for, and if found,
+        // the substring preceding the occurrence is stored as the first element in
+        // the array of strings.  We then continue in this manner by searching
+        // the substring that follows the occurrence.  On the other hand, if the separator
+        // is not found, the array of strings will contain this instance as its only element.
+        // If the separator is null
+        // whitespace (i.e., Character.IsWhitespace) is used as the separator.
+        //
+        //| <include path='docs/doc[@for="String.Split"]/*' />
+        public String [] Split(params char [] separator) {
+            return Split(separator, Int32.MaxValue);
+        }
+
+        /*==============================MakeSeparatorList========================
+        **Args: baseString -- the string to parse for the given list of
+        **                    separator chars.
+        **      Separator  -- A string containing all of the split characters.
+        **      list       -- a pointer to a caller-allocated array of ints for
+        **                    split char indices.
+        **      listLength -- the number of slots allocated in list.
+        **Returns: A list of all of the places within baseString where instances
+        **         of characters in Separator occur.
+        **Exceptions: None.
+        **N.B.:  This just returns silently if the caller hasn't allocated
+        **       enough space for the int list.
+        =======================================================================*/
+
+        // WCHAR * -> char *
+        // int * -> int[]
+
+        // CHARARRAYREF --> char[]
+        // c->GetNumComponents --> c.Length
+
+        // STRINGREF --> String
+        // s->GetStringLength --> s.Length
+        // s->GetBuffer --> fixed(&s.m_firstChar)
+
+        // COMNlsInfo::nativeIsWhiteSpace --> Char.IsWhiteSpace
+        // ArrayContains(char,char* start,char* end)
+        //   --> ArrayContains(char, char[] buf)
+        private unsafe static int MakeSeparatorList(String baseString, char[] Separator, int[] list, int listLength) {
+            // markples: from Lightning\Src\VM\COMString.cpp::MakeSeparatorList
+            int i;
+            int foundCount=0;
+            fixed (char *thisChars = &baseString.m_firstChar) {
+                int thisLength = baseString.Length;
+
+                if (Separator==null || Separator.Length==0) {
+                    //If they passed null or an empty string,
+                    //look for whitespace.
+                    for (i=0; i<thisLength && foundCount < listLength; i++) {
+                        // was nativeIsWhiteSpace()
+                        if (Char.IsWhiteSpace(thisChars[i])) {
+                            list[foundCount++]=i;
+                        }
+                    }
+                } else {
+                    //WCHAR *searchChars = (WCHAR *)Separator->GetDataPtr();
+
+                    int searchLength = Separator.Length;
+                    //If they passed in a string of chars,
+                    //actually look for those chars.
+                    for (i=0; i<thisLength && foundCount < listLength; i++) {
+                        if (ArrayContains(thisChars[i],Separator) >= 0) {
+                            list[foundCount++]=i;
+                        }
+                    }
+                }
+                return foundCount;
+            }
+        }
+
+        // Creates an array of strings by splitting this string at each
+        // occurrence of a separator.  The separator is searched for, and if found,
+        // the substring preceding the occurrence is stored as the first element in
+        // the array of strings.  We then continue in this manner by searching
+        // the substring that follows the occurrence.  On the other hand, if the separator
+        // is not found, the array of strings will contain this instance as its only element.
+        // If the separator is the empty string (i.e., String.Empty), then
+        // whitespace (i.e., Character.IsWhitespace) is used as the separator.
+        // If there are more than count different strings, the last n-(count-1)
+        // elements are concatenated and added as the last String.
+        //
+        //| <include path='docs/doc[@for="String.Split1"]/*' />
+        //| <include path='docs/doc[@for="String.Split1"]/*' />
+
+        // STRINGREF --> String
+        // PTRARRAYREF --> String[]
+        // p->SetAt(0, v) --> p[0] = v
+        //
+        // LPVOID --> gone
+        // CQuickBytes --> gone
+
+        // AllocateObjectArray(x,g_pStringClass) --> new String[x]
+        // NewString(&ref, index, size) --> ref.Substring(index, size)
+
+        public String[] Split(char[] separator, int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::Split
+            // markples: this implementation based on COMString
+
+            int numReplaces;
+            int numActualReplaces;
+            int[] sepList;
+            int currIndex=0;
+            int arrIndex=0;
+            //char *thisChars;
+            int thisLength;
+            int i;
+            String[] splitStrings;
+            String temp;
+
+            if (count<0) {
+                throw new ArgumentOutOfRangeException
+                    ("count", "ArgumentOutOfRange_Negative");
+            }
+
+            //Allocate space and fill an array of ints with a list of everyplace
+            //within our String that a separator character occurs.
+            sepList = new int[this.Length];
+            numReplaces = MakeSeparatorList(this, separator, sepList, this.Length);
+            //Handle the special case of no replaces.
+            if (0==numReplaces) {
+                splitStrings = new String[1];
+                splitStrings[0] = this;
+                return splitStrings;
+            }
+            thisLength = Length;
+
+            count--;
+            numActualReplaces = (numReplaces<count) ? numReplaces : count;
+
+            //Allocate space for the new array.
+            //+1 for the string from the end of the last replace to the end
+            //of the String.
+            splitStrings = new String[numActualReplaces+1];
+
+            for (i=0; i<numActualReplaces && currIndex<thisLength; i++) {
+                temp = this.Substring(currIndex, sepList[i]-currIndex);
+
+                splitStrings[arrIndex++] = temp;
+                currIndex=sepList[i]+1;
+            }
+
+            //Handle the last string at the end of the array if there is one.
+
+            if (currIndex<thisLength) {
+                temp = this.Substring(currIndex, thisLength-currIndex);
+                splitStrings[arrIndex] = temp;
+            } else if (arrIndex==numActualReplaces) {
+                //We had a separator character at the end of a string.  Rather than just allowing
+                //a null character, we'll replace the last element in the array with an empty string.
+                temp = Empty;
+                splitStrings[arrIndex] = temp;
+            }
+
+            return splitStrings;
+        }
+
+        // Returns a substring of this string.
+        //
+        //| <include path='docs/doc[@for="String.Substring"]/*' />
+        public String Substring(int startIndex) {
+            return this.Substring (startIndex, Length-startIndex);
+        }
+
+        // Returns a substring of this string.
+        //
+        //| <include path='docs/doc[@for="String.Substring1"]/*' />
+        public String Substring(int startIndex, int length) {
+
+            int thisLength = Length;
+
+            //Bounds Checking.
+            if (startIndex<0) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_StartIndex");
+            }
+
+            if (length<0) {
+                throw new ArgumentOutOfRangeException("length", "ArgumentOutOfRange_NegativeLength");
+            }
+
+            if (startIndex > thisLength-length) {
+                throw new ArgumentOutOfRangeException("length", "ArgumentOutOfRange_IndexLength");
+            }
+
+            String s = FastAllocateString(length);
+            FillSubstring(s, 0, this, startIndex, length);
+
+            return s;
+        }
+
+        internal String TrimHelper(char[] trimChars, int trimType)
+        {
+            // Rusa: see also Lighting\Src\VM\COMString.cpp::TrimHelper
+            int stringLength = this.m_stringLength;
+            int iLeft = 0;
+            int iRight = stringLength - 1;
+            this.TrimHelper(trimChars, trimType, ref iLeft, ref iRight);
+            int newLength = iRight - iLeft + 1;
+            if (newLength == stringLength) {
+                return this;
+            } else if (newLength == 0) {
+                return String.Empty;
+            } else {
+                String result = FastAllocateString(newLength);
+                FillSubstring(result, 0, this, iLeft, newLength);
+                return result;
+            }
+        }
+
+        private unsafe void TrimHelper(char[] trimChars, int trimType,
+                                       ref int iLeft, ref int iRight)
+        {
+            fixed (char *charPtr = &this.m_firstChar) {
+                if (trimType == String.TrimHead ||
+                    trimType == String.TrimBoth) {
+                    while (iLeft <= iRight &&
+                           ArrayContains(charPtr[iLeft], trimChars) >= 0) {
+                        iLeft++;
+                    }
+                }
+                if (trimType == String.TrimTail ||
+                    trimType == String.TrimBoth) {
+                    while (iRight >= iLeft &&
+                           ArrayContains(charPtr[iRight], trimChars) >= 0) {
+                        iRight--;
+                    }
+                }
+            }
+        }
+
+        private static int ArrayContains(char c, char[] charArray) {
+            int limit = charArray.Length;
+            for (int i = 0; i < limit; i++) {
+                if (charArray[i] == c) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        /**
+         * Creates a new string from the characters in a subarray.  The new
+         * string will be created from the characters in <i>value</i> between
+         * <i>startIndex</i> and <i>startIndex</i> + <i>length</i> - 1.
+         *
+         * @param value an array of characters.
+         * @param startIndex the index at which the subarray begins.
+         * @param length the length of the subarray.
+         *
+         * @exception ArgumentException if value is <b>null</b>.
+         * @exception ArgumentException if <i>startIndex</i> or
+         *  <i>startIndex</i>+<i>length</i>-1 are not valid indices of
+         *  <i>value</i>.
+         */
+        //| <include path='docs/doc[@for="String.String7"]/*' />
+
+        public static String StringCTOR(char[] value, int startIndex,
+                                        int length) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitCharArray
+            if (value == null) {
+                throw new ArgumentNullException("array value is null");
+            }
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (length < 0) {
+                throw new ArgumentOutOfRangeException("length is negative");
+            }
+            if (length == 0) {
+                return String.Empty;
+            } else {
+                String result = FastAllocateString(length);
+                FillStringArray(result, 0, value, startIndex, length);
+                return result;
+            }
+        }
+
+        /**
+         * Creates a new string from the characters in a subarray.  The new
+         * string will be created from the characters in <i>value</i>.
+         *
+         * @param value an array of characters.
+         *
+         * @exception ArgumentException if value is <b>null</b>.
+         */
+        //| <include path='docs/doc[@for="String.String5"]/*' />
+        public static String StringCTOR(char[] value) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitChars
+            if (value == null) {
+                return String.Empty;
+            }
+            int length = value.Length;
+            if (length == 0) {
+                return String.Empty;
+            }
+            String result = FastAllocateString(length);
+            FillStringArray(result, 0, value, 0, length);
+            return result;
+        }
+
+        internal static String NewString(String curr,int start,int copyLen,
+                                         int capacity) {
+            String result = FastAllocateString(capacity);
+            FillSubstring(result, 0, curr, start, copyLen);
+            return result;
+        }
+
+        //| <include path='docs/doc[@for="String.String6"]/*' />
+        public static String StringCTOR(char c, int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitCharCount
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count is negative");
+            }
+            if (count == 0) {
+                return String.Empty;
+            } else {
+                String result = FastAllocateString(count);
+                FillStringChar(result, 0, c, count);
+                return result;
+            }
+        }
+
+        // Removes a string of characters from the ends of this string.
+        //| <include path='docs/doc[@for="String.Trim"]/*' />
+        public String Trim(params char[] trimChars) {
+            if (null==trimChars || trimChars.Length == 0) {
+                trimChars=CharacterInfo.WhitespaceChars;
+            }
+            return TrimHelper(trimChars,TrimBoth);
+        }
+
+        // Removes a string of characters from the beginning of this string.
+        //| <include path='docs/doc[@for="String.TrimStart"]/*' />
+        public String TrimStart(params char[] trimChars) {
+            if (null==trimChars || trimChars.Length == 0) {
+                trimChars=CharacterInfo.WhitespaceChars;
+            }
+            return TrimHelper(trimChars,TrimHead);
+        }
+
+
+        // Removes a string of characters from the end of this string.
+        //| <include path='docs/doc[@for="String.TrimEnd"]/*' />
+        public String TrimEnd(params char[] trimChars) {
+            if (null==trimChars || trimChars.Length == 0) {
+                trimChars=CharacterInfo.WhitespaceChars;
+            }
+            return TrimHelper(trimChars,TrimTail);
+        }
+
+
+        // Creates a new string with the characters copied in from ptr. If
+        // ptr is null, a string initialized to ";<;No Object>;"; (i.e.,
+        // String.NullString) is created.
+        //
+        // Issue: This method is only accessible from VC.
+        //| <include path='docs/doc[@for="String.String"]/*' />
+        [CLSCompliant(false), MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public extern String(char *value);
+        //| <include path='docs/doc[@for="String.String1"]/*' />
+        [CLSCompliant(false), MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public extern String(char *value, int startIndex, int length);
+
+        //| <include path='docs/doc[@for="String.String2"]/*' />
+        [CLSCompliant(false), MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public extern String(sbyte *value);
+        //| <include path='docs/doc[@for="String.String3"]/*' />
+        [CLSCompliant(false), MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public extern String(sbyte *value, int startIndex, int length);
+
+        //| <include path='docs/doc[@for="String.String4"]/*' />
+        [CLSCompliant(false), MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public extern String(sbyte *value, int startIndex, int length, Encoding enc);
+
+        unsafe static private String CreateString(sbyte *value, int startIndex, int length, Encoding enc) {
+            if (enc == null)
+                return new String(value, startIndex, length); // default to ANSI
+            if (length < 0)
+                throw new ArgumentOutOfRangeException("length","ArgumentOutOfRange_NeedNonNegNum");
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex","ArgumentOutOfRange_StartIndex");
+            }
+            if ((value + startIndex) < value) {
+                // overflow check
+                throw new ArgumentOutOfRangeException("startIndex","ArgumentOutOfRange_PartialWCHAR");
+            }
+            byte [] b = new byte[length];
+            if (length > 0) {
+                fixed(byte* pDest = b) {
+                    Buffer.MoveMemory(pDest, ((byte*)value)+startIndex, length);
+                }
+            }
+            return enc.GetString(b);
+        }
+
+        // For ASCIIEncoding::GetString()
+        unsafe static internal String CreateStringFromASCII(byte[] bytes, int startIndex, int length) {
+            Debug.Assert(bytes != null, "need a byte[].");
+            Debug.Assert(startIndex >= 0 && (startIndex < bytes.Length || bytes.Length == 0), "startIndex >= 0 && startIndex < bytes.Length");
+            Debug.Assert(length >= 0 && length <= bytes.Length - startIndex, "length >= 0 && length <= bytes.Length - startIndex");
+            if (length == 0)
+                return String.Empty;
+            String s = FastAllocateString(length);
+            fixed(char* pChars = &s.m_firstChar) {
+                for(int i=0; i<length; i++)
+                    pChars[i] = (char) (bytes[i+startIndex] & 0x7f);
+            }
+            return s;
+        }
+
+        // For Latin1Encoding::GetString()
+        unsafe static internal String CreateStringFromLatin1(byte[] bytes, int startIndex, int length) {
+            Debug.Assert(bytes != null, "need a byte[].");
+            Debug.Assert(startIndex >= 0 && (startIndex < bytes.Length || bytes.Length == 0), "startIndex >= 0 && startIndex < bytes.Length");
+            Debug.Assert(length >= 0 && length <= bytes.Length - startIndex, "length >= 0 && length <= bytes.Length - startIndex");
+            if (length == 0)
+                return String.Empty;
+            String s = FastAllocateString(length);
+            fixed(char* pChars = &s.m_firstChar) {
+                for(int i=0; i<length; i++)
+                    pChars[i] = (char) (bytes[i+startIndex]);
+            }
+            return s;
+        }
+
+        /**
+         * Creates a new string with the characters copied in from <i>ptr</i>. If
+         * <i>ptr</i> is null, a string initialized to
+         * &quot;&lt;No Object&gt;&quot; (i.e., <code>String.NullString</code>)
+         * is created.
+         *
+         * Issue: This method is only accessible from VC.
+         * @issue The verifier needs to recognize that this is not necessarily
+         *  secure.
+         *
+         * @param ptr this is a WCHAR *.
+         *
+         */
+        //| <include path='docs/doc[@for="String.String"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static String StringCTOR(char *valuePtr) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitWCHARPtr
+            if (valuePtr == null) {
+                return String.Empty;
+            }
+            // First figure out how many characters the string has
+            int count = 0;
+            char *cursor = valuePtr;
+            int c = *cursor;
+            while (c != 0) {
+                count++;
+                cursor++;
+                c = *cursor;
+            }
+            // Allocate and fill in the string object
+            if (count == 0) {
+                return String.Empty;
+            } else {
+                String result = FastAllocateString(count);
+                FillStringCharPtr(result, 0, valuePtr, count);
+                return result;
+            }
+        }
+
+        //| <include path='docs/doc[@for="String.String1"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static String StringCTOR(char *valuePtr, int startIndex,
+                                               int length) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitWCHARPtrPartial
+            if (valuePtr == null) {
+                return String.Empty;
+            }
+            if (length < 0) {
+                throw new ArgumentOutOfRangeException("length is negative");
+            }
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (length == 0) {
+                return String.Empty;
+            } else {
+                String result = FastAllocateString(length);
+                FillStringCharPtr(result, 0, valuePtr + startIndex, length);
+                return result;
+            }
+        }
+
+        //| <include path='docs/doc[@for="String.String1"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static String StringCTOR(byte *valuePtr, int startIndex,
+                                               int length) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitWCHARPtrPartial
+            if (valuePtr == null) {
+                return String.Empty;
+            }
+            if (length < 0) {
+                throw new ArgumentOutOfRangeException("length is negative");
+            }
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (length == 0) {
+                return String.Empty;
+            } else {
+                String result = FastAllocateString(length);
+                FillStringBytePtr(result, 0, valuePtr + startIndex, length);
+                return result;
+            }
+        }
+
+        //| <include path='docs/doc[@for="String.String2"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static String StringCTOR(sbyte *valuePtr) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitCharPtr
+            return StringInitCharHelper(valuePtr, -1);
+        }
+
+        //| <include path='docs/doc[@for="String.String3"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static String StringCTOR(sbyte *valuePtr, int startIndex,
+                                               int length) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitCharPtrPartial
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (length < 0) {
+                throw new ArgumentOutOfRangeException("length is negative");
+            }
+            return StringInitCharHelper(valuePtr + startIndex, length);
+        }
+
+        private unsafe static String StringInitCharHelper(sbyte *valuePtr,
+                                                          int length) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitCharHelper
+            throw new Exception("StringInitCharHelper is not implemented in Bartok!");
+        }
+
+        //| <include path='docs/doc[@for="String.String4"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static String StringCTOR(sbyte *value, int startIndex,
+                                               int length, Encoding enc) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::StringInitSBytPtrPartialEx
+            throw new Exception("String(sbyte*, int, int, Encoding) not implemented in Bartok!");
+        }
+
+        private static String FastAllocateString(int stringLength) {
+            return GC.AllocateString(stringLength);
+        }
+
+        [Inline]
+        internal void InitializeStringLength(int stringLength) {
+            this.m_arrayLength = stringLength+1;
+            this.m_stringLength = stringLength;
+        }
+
+        private unsafe static void FillString(String dest, int destPos,
+                                              String src) {
+            fixed (char *srcPtr = &src.m_firstChar) {
+                FillStringCharPtr(dest, destPos, srcPtr, src.m_stringLength);
+            }
+        }
+
+        private unsafe static void FillStringChecked(String dest, int destPos,
+                                                     String src) {
+            if (! (src.Length <= dest.ArrayLength - destPos)) {
+                throw new IndexOutOfRangeException(); // REVIEW: param?
+            }
+            fixed (char *srcPtr = &src.m_firstChar) {
+                FillStringCharPtr(dest, destPos, srcPtr, src.m_stringLength);
+            }
+        }
+
+        private unsafe static void FillStringEx(String dest, int destPos,
+                                                String src,int srcLength) {
+            // ASSERT(srcLength <= dest.ArrayLength - destPos);
+            fixed (char *srcPtr = &src.m_firstChar) {
+                FillStringCharPtr(dest, destPos, srcPtr, srcLength);
+            }
+        }
+
+        private unsafe static void FillStringChar(String dest, int destPos,
+                                                  char c, int count) {
+            fixed (char *destPtr = &dest.m_firstChar) {
+                char *charPtr = destPtr + destPos;
+                // Set the odd leader char if necessary
+                if (destPos % 2 == 1) {
+                    *charPtr = c;
+                    charPtr++;
+                    count--;
+                }
+                // Set the buffer 2 chars at a time
+                int c2 = (c << 16) | c;
+                int *intPtr = (int *) charPtr;
+                count--;              // Prevent overruns from odd lengths
+                while (count > 0) {
+                    *intPtr = c2;
+                    intPtr++;
+                    count -= 2;
+                }
+                // Set the odd trailer char if necessary
+                if (count == 0) {
+                    *((char *) intPtr) = c;
+                }
+            }
+        }
+
+        private unsafe static void FillStringCharPtr(String dest, int destPos,
+                                                     char *srcPtr, int count) {
+            fixed (char *charPtr = &dest.m_firstChar) {
+                char *destPtr = charPtr + destPos;
+                Buffer.MoveMemory((byte *)destPtr, (byte *)srcPtr, count * sizeof(char));
+            }
+        }
+
+        private unsafe static void FillStringBytePtr(String dest, int destPos,
+                                                     byte *srcPtr, int count) {
+            fixed (char *charPtr = &dest.m_firstChar) {
+                char *destPtr = charPtr + destPos;
+                for (int i = 0; i < count; i++) {
+                    *destPtr++ = (char)*srcPtr++;
+                }
+            }
+        }
+
+        private unsafe static void FillStringArray(String dest, int stringStart,
+                                                   char[] array, int charStart,
+                                                   int count) {
+            fixed (char *destPtr = &array[charStart]) {
+                FillStringCharPtr(dest, stringStart, destPtr, count);
+            }
+        }
+
+        private unsafe static void FillSubstring(String dest, int destPos,
+                                                 String src, int startPos,
+                                                 int count) {
+            fixed (char *srcPtr = &src.m_firstChar) {
+                FillStringCharPtr(dest, destPos, srcPtr + startPos, count);
+            }
+        }
+
+        // Creates a new string from the characters in a subarray.  The new string will
+        // be created from the characters in value between startIndex and
+        // startIndex + length - 1.
+        //
+        //| <include path='docs/doc[@for="String.String7"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public extern String(char [] value, int startIndex, int length);
+
+        // Creates a new string from the characters in a subarray.  The new string will be
+        // created from the characters in value.
+        //
+        //| <include path='docs/doc[@for="String.String5"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public extern String(char [] value);
+
+        //| <include path='docs/doc[@for="String.String6"]/*' />
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public extern String(char c, int count);
+
+
+        //
+        //
+        // INSTANCE METHODS
+        //
+        //
+
+        // Provides a culture-correct string comparison. StrA is compared to StrB
+        // to determine whether it is lexicographically less, equal, or greater, and then returns
+        // either a negative integer, 0, or a positive integer; respectively.
+        //
+        //| <include path='docs/doc[@for="String.Compare"]/*' />
+        public static int Compare(String strA, String strB) {
+            return CompareInfo.Compare(strA, strB, CompareOptions.None);
+        }
+
+        // Provides a culture-correct string comparison. strA is compared to strB
+        // to determine whether it is lexicographically less, equal, or greater, and then a
+        // negative integer, 0, or a positive integer is returned; respectively.
+        // The case-sensitive option is set by ignoreCase
+        //
+        //| <include path='docs/doc[@for="String.Compare1"]/*' />
+        public static int Compare(String strA, String strB, bool ignoreCase) {
+            if (ignoreCase) {
+                return CompareInfo.Compare(strA, strB, CompareOptions.IgnoreCase);
+            }
+            return CompareInfo.Compare(strA, strB, CompareOptions.None);
+        }
+
+        //
+        public static int Compare(String strA, String strB, bool ignoreCase,
+                                  CultureInfo info)
+        {
+            return Compare(strA, strB, ignoreCase);
+        }
+
+        // Determines whether two string regions match.  The substring of strA beginning
+        // at indexA of length count is compared with the substring of strB
+        // beginning at indexB of the same length.
+        //
+        //| <include path='docs/doc[@for="String.Compare3"]/*' />
+        public static int Compare(String strA, int indexA, String strB, int indexB, int length) {
+            int lengthA = length;
+            int lengthB = length;
+
+            if (strA!=null) {
+                if (strA.Length - indexA < lengthA) {
+                    lengthA = (strA.Length - indexA);
+                }
+            }
+
+            if (strB!=null) {
+                if (strB.Length - indexB < lengthB) {
+                    lengthB = (strB.Length - indexB);
+                }
+            }
+            return CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.None);
+        }
+
+
+        // Determines whether two string regions match.  The substring of strA beginning
+        // at indexA of length count is compared with the substring of strB
+        // beginning at indexB of the same length.  Case sensitivity is determined by the ignoreCase boolean.
+        //
+        //| <include path='docs/doc[@for="String.Compare4"]/*' />
+        public static int Compare(String strA, int indexA, String strB, int indexB, int length, bool ignoreCase) {
+            int lengthA = length;
+            int lengthB = length;
+
+            if (strA!=null) {
+                if (strA.Length - indexA < lengthA) {
+                    lengthA = (strA.Length - indexA);
+                }
+            }
+
+            if (strB!=null) {
+                if (strB.Length - indexB < lengthB) {
+                    lengthB = (strB.Length - indexB);
+                }
+            }
+
+            if (ignoreCase) {
+                return CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.IgnoreCase);
+            }
+            return CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.None);
+        }
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship. This method returns a value less than 0 if this is less than value, 0
+        // if this is equal to value, or a value greater than 0
+        // if this is greater than value.  Strings are considered to be
+        // greater than all non-String objects.  Note that this means sorted
+        // arrays would contain nulls, other objects, then Strings in that order.
+        //
+        //| <include path='docs/doc[@for="String.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+
+            if (!(value is String)) {
+                throw new ArgumentException("Arg_MustBeString");
+            }
+
+            return String.Compare(this,(String)value);
+        }
+
+        // Determines the sorting relation of StrB to the current instance.
+        //
+        //| <include path='docs/doc[@for="String.CompareTo1"]/*' />
+        public int CompareTo(String strB) {
+            if (strB==null) {
+                return 1;
+            }
+            return CompareInfo.Compare(this, strB, 0);
+        }
+
+        // Compares strA and strB using an ordinal (code-point) comparison.
+        //
+        //| <include path='docs/doc[@for="String.CompareOrdinal"]/*' />
+        public static int CompareOrdinal(String strA, String strB) {
+            if (strA == null || strB == null) {
+                if ((Object)strA==(Object)strB) { //they're both null;
+                    return 0;
+                }
+                return (strA==null)? -1 : 1; //-1 if A is null, 1 if B is null.
+            }
+
+            return nativeCompareOrdinal(strA, strB, false);
+        }
+
+        // Compares strA and strB using an ordinal (code-point) comparison.
+        //
+        //| <include path='docs/doc[@for="String.CompareOrdinal"]/*' />
+        public static int CompareOrdinal(String strA, String strB, bool ignoreCase) {
+            if (strA == null || strB == null) {
+                if ((Object)strA==(Object)strB) { //they're both null;
+                    return 0;
+                }
+                return (strA==null)? -1 : 1; //-1 if A is null, 1 if B is null.
+            }
+
+            return nativeCompareOrdinal(strA, strB, ignoreCase);
+        }
+
+        // Compares strA and strB using an ordinal (code-point) comparison.
+        //
+        //| <include path='docs/doc[@for="String.CompareOrdinal1"]/*' />
+        public static int CompareOrdinal(String strA, int indexA, String strB, int indexB, int length) {
+            if (strA == null || strB == null) {
+                if ((Object)strA==(Object)strB) { //they're both null;
+                    return 0;
+                }
+
+                return (strA==null)? -1 : 1; //-1 if A is null, 1 if B is null.
+            }
+
+            return nativeCompareOrdinalEx(strA, indexA, strB, indexB, length);
+        }
+
+
+        // Determines whether a specified string is a suffix of the the current instance.
+        //
+        // The case-sensitive and culture-sensitive option is set by options,
+        // and the default culture is used.
+        //
+        //| <include path='docs/doc[@for="String.EndsWith"]/*' />
+        public bool EndsWith(String value) {
+            if (null==value) {
+                throw new ArgumentNullException("value");
+            }
+            int valueLen = value.Length;
+            int thisLen = this.Length;
+            if (valueLen>thisLen) {
+                return false;
+            }
+            return (0==Compare(this, thisLen-valueLen, value, 0, valueLen));
+        }
+
+        public bool EndsWith(char value) {
+            int thisLen = this.Length;
+            if (thisLen != 0) {
+                if (this[thisLen - 1] == value)
+                    return true;
+            }
+            return false;
+        }
+
+
+        // Returns the index of the first occurrence of value in the current instance.
+        // The search starts at startIndex and runs thorough the next count characters.
+        //
+        //| <include path='docs/doc[@for="String.IndexOf"]/*' />
+        public int IndexOf(char value) {
+            return IndexOf(value, 0, this.Length);
+        }
+
+        //| <include path='docs/doc[@for="String.IndexOf1"]/*' />
+        public int IndexOf(char value, int startIndex) {
+            return IndexOf(value, startIndex, this.Length - startIndex);
+        }
+
+        //| <include path='docs/doc[@for="String.IndexOf2"]/*' />
+        public unsafe int IndexOf(char value, int startIndex, int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::IndexOfChar
+            if (startIndex < 0 || startIndex > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("startIndex out of range");
+            }
+            if (count < 0 || startIndex + count > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("count out of range");
+            }
+            fixed (char *charPtr = &this.m_firstChar) {
+                char *cursor = charPtr + startIndex;
+                for (int i = count; i > 0; i--) {
+                    if (*cursor == value) {
+                        return (startIndex + (count - i));
+                    }
+                    cursor++;
+                }
+            }
+            return -1;
+        }
+
+        // Returns the index of the first occurrence of any character in value in the current instance.
+        // The search starts at startIndex and runs to endIndex-1. [startIndex,endIndex).
+        //
+
+        //| <include path='docs/doc[@for="String.IndexOfAny1"]/*' />
+        public int IndexOfAny(char [] anyOf) {
+            return IndexOfAny(anyOf,0, this.Length);
+        }
+
+        //| <include path='docs/doc[@for="String.IndexOfAny2"]/*' />
+        public int IndexOfAny(char [] anyOf, int startIndex) {
+            return IndexOfAny(anyOf, startIndex, this.Length - startIndex);
+        }
+
+        //| <include path='docs/doc[@for="String.IndexOfAny3"]/*' />
+        public unsafe int IndexOfAny(char [] anyOf, int startIndex, int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::IndexOfCharArray
+            if (anyOf == null) {
+                throw new ArgumentNullException("anyOf array is null");
+            }
+            if (startIndex < 0 || startIndex > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("startIndex out of range");
+            }
+            if (count < 0 || startIndex + count > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("count out of range");
+            }
+            fixed (char *charPtr = &this.m_firstChar) {
+                char *cursor = charPtr + startIndex;
+                for (int i = count; i > 0; i--) {
+                    if (ArrayContains(*cursor, anyOf) >= 0) {
+                        return (startIndex + (count - i));
+                    }
+                    cursor++;
+                }
+            }
+            return -1;
+        }
+
+        // Determines the position within this string of the first occurrence of the specified
+        // string, according to the specified search criteria.  The search begins at
+        // the first character of this string, it is case-sensitive and culture-sensitive,
+        // and the default culture is used.
+        //
+        //| <include path='docs/doc[@for="String.IndexOf6"]/*' />
+        public int IndexOf(String value) {
+            return CompareInfo.IndexOf(this,value);
+        }
+
+        // Determines the position within this string of the first occurrence of the specified
+        // string, according to the specified search criteria.  The search begins at
+        // startIndex, it is case-sensitive and culture-sensitve, and the default culture is used.
+        //
+        //| <include path='docs/doc[@for="String.IndexOf7"]/*' />
+        public int IndexOf(String value, int startIndex){
+            return CompareInfo.IndexOf(this,value,startIndex);
+        }
+
+        // Determines the position within this string of the first occurrence of the specified
+        // string, according to the specified search criteria.  The search begins at
+        // startIndex, ends at endIndex and the default culture is used.
+        //
+        //| <include path='docs/doc[@for="String.IndexOf8"]/*' />
+        public int IndexOf(String value, int startIndex, int count){
+            if (startIndex + count > this.Length) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Index");
+            }
+            return CompareInfo.IndexOf(this, value, startIndex, count, CompareOptions.None);
+        }
+
+
+        // Returns the index of the last occurrence of value in the current instance.
+        // The search starts at startIndex and runs to endIndex. [startIndex,endIndex].
+        // The character at position startIndex is included in the search.  startIndex is the larger
+        // index within the string.
+        //
+        //| <include path='docs/doc[@for="String.LastIndexOf"]/*' />
+        public int LastIndexOf(char value) {
+            return LastIndexOf(value, this.Length-1, this.Length);
+        }
+
+        //| <include path='docs/doc[@for="String.LastIndexOf1"]/*' />
+        public int LastIndexOf(char value, int startIndex){
+            return LastIndexOf(value,startIndex,startIndex + 1);
+        }
+
+        //| <include path='docs/doc[@for="String.LastIndexOf2"]/*' />
+        public unsafe int LastIndexOf(char value, int startIndex, int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::LastIndexOfChar
+            if (this.m_stringLength == 0) {
+                return -1;
+            }
+            if (startIndex < 0 || startIndex >= this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("startIndex out of range");
+            }
+            if (count < 0 || count - 1 > startIndex) {
+                throw new ArgumentOutOfRangeException("count out of range");
+            }
+            fixed (char *charPtr = &this.m_firstChar) {
+                char *cursor = charPtr + startIndex;
+                for (int i = count; i > 0; i--) {
+                    if (*cursor == value) {
+                        return (startIndex - (count - i));
+                    }
+                    cursor--;
+                }
+            }
+            return -1;
+        }
+
+        // Returns the index of the last occurrence of any character in value in the current instance.
+        // The search starts at startIndex and runs to endIndex. [startIndex,endIndex].
+        // The character at position startIndex is included in the search.  startIndex is the larger
+        // index within the string.
+        //
+
+        //| <include path='docs/doc[@for="String.LastIndexOfAny1"]/*' />
+        public int LastIndexOfAny(char [] anyOf) {
+            return LastIndexOfAny(anyOf,this.Length-1,this.Length);
+        }
+
+        //| <include path='docs/doc[@for="String.LastIndexOfAny2"]/*' />
+        public int LastIndexOfAny(char [] anyOf, int startIndex) {
+            return LastIndexOfAny(anyOf,startIndex,startIndex + 1);
+        }
+
+        //| <include path='docs/doc[@for="String.LastIndexOfAny3"]/*' />
+        public unsafe int LastIndexOfAny(char [] anyOf, int startIndex,
+                                         int count) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::LastIndexOfCharArray
+            if (anyOf == null) {
+                throw new ArgumentNullException("anyOf array is null");
+            }
+            if (this.m_stringLength == 0) {
+                return -1;
+            }
+            if (startIndex < 0 || startIndex >= this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("startIndex out of range");
+            }
+            if (count < 0 || count - 1 > startIndex) {
+                throw new ArgumentOutOfRangeException("count out of range");
+            }
+            fixed (char *charPtr = &this.m_firstChar) {
+                char *cursor = charPtr + startIndex;
+                for (int i = count; i > 0; i--) {
+                    if (ArrayContains(*cursor, anyOf) >= 0) {
+                        return (startIndex - (count - 1));
+                    }
+                    cursor--;
+                }
+            }
+            return -1;
+        }
+
+        // Returns the index of the last occurrence of any character in value in the current instance.
+        // The search starts at startIndex and runs to endIndex. [startIndex,endIndex].
+        // The character at position startIndex is included in the search.  startIndex is the larger
+        // index within the string.
+        //
+        //| <include path='docs/doc[@for="String.LastIndexOf6"]/*' />
+        public int LastIndexOf(String value) {
+            return LastIndexOf(value, this.Length-1,this.Length);
+        }
+
+        //| <include path='docs/doc[@for="String.LastIndexOf7"]/*' />
+        public int LastIndexOf(String value, int startIndex) {
+            return LastIndexOf(value, startIndex, startIndex + 1);
+        }
+
+        //| <include path='docs/doc[@for="String.LastIndexOf8"]/*' />
+        public int LastIndexOf(String value, int startIndex, int count) {
+            if (count<0) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Count");
+            }
+            return CompareInfo.LastIndexOf(this, value, startIndex, count, CompareOptions.None);
+        }
+
+
+        //
+        //
+        //| <include path='docs/doc[@for="String.PadLeft"]/*' />
+        public String PadLeft(int totalWidth) {
+            return PadHelper(totalWidth, ' ', false);
+        }
+
+        //| <include path='docs/doc[@for="String.PadLeft1"]/*' />
+        public String PadLeft(int totalWidth, char paddingChar) {
+            return PadHelper(totalWidth, paddingChar, false);
+        }
+
+        //| <include path='docs/doc[@for="String.PadRight"]/*' />
+        public String PadRight(int totalWidth) {
+            return PadHelper(totalWidth, ' ', true);
+        }
+
+        //| <include path='docs/doc[@for="String.PadRight1"]/*' />
+        public String PadRight(int totalWidth, char paddingChar) {
+            return PadHelper(totalWidth, paddingChar, true);
+        }
+
+        private String PadHelper(int totalWidth, char paddingChar,
+                                 bool isRightPadded) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::PadHelper
+            if (totalWidth < 0) {
+                throw new ArgumentOutOfRangeException("totalWidth is negative");
+            }
+            if (totalWidth <= this.m_stringLength) {
+                return this;
+            }
+            int padCount = totalWidth - this.m_stringLength;
+            String result = FastAllocateString(totalWidth);
+            if (isRightPadded) {
+                FillString(result, 0, this);
+                FillStringChar(result, this.m_stringLength,
+                               paddingChar, padCount);
+            } else {
+
+                FillStringChar(result, 0, paddingChar, padCount);
+                FillString(result, padCount, this);
+            }
+            return result;
+        }
+
+        // Determines whether a specified string is a prefix of the current instance
+        //
+        //| <include path='docs/doc[@for="String.StartsWith"]/*' />
+        public bool StartsWith(String value) {
+            if (null==value) {
+                throw new ArgumentNullException("value");
+            }
+            if (this.Length<value.Length) {
+                return false;
+            }
+            return (0==Compare(this,0, value,0, value.Length));
+        }
+
+        // Creates a copy of this string in lower case.
+        //| <include path='docs/doc[@for="String.ToLower"]/*' />
+        public String ToLower() {
+            return TextInfo.ToLower(this);
+        }
+
+        // Creates a copy of this string in upper case.
+        //| <include path='docs/doc[@for="String.ToUpper"]/*' />
+        public String ToUpper() {
+            return TextInfo.ToUpper(this);
+        }
+
+        // Returns this string.
+        //| <include path='docs/doc[@for="String.ToString"]/*' />
+        public override String ToString() {
+            return this;
+        }
+
+        // Method required for the ICloneable interface.
+        // There's no point in cloning a string since they're immutable, so we simply return this.
+        //| <include path='docs/doc[@for="String.Clone"]/*' />
+        public Object Clone() {
+            return this;
+        }
+
+
+        // Trims the whitespace from both ends of the string.  Whitespace is defined by
+        // CharacterInfo.WhitespaceChars.
+        //
+        //| <include path='docs/doc[@for="String.Trim1"]/*' />
+        public String Trim() {
+            return this.Trim(CharacterInfo.WhitespaceChars);
+        }
+
+        //
+        //
+        //| <include path='docs/doc[@for="String.Insert"]/*' />
+        public String Insert(int startIndex, String value) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::Insert
+            if (startIndex < 0 || startIndex > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("startIndex out of range");
+            }
+            if (value == null) {
+                throw new ArgumentNullException("value string is null");
+            }
+            int newLength = this.m_stringLength + value.m_stringLength;
+            String result = FastAllocateString(newLength);
+            FillSubstring(result, 0, this, 0, startIndex);
+            FillSubstring(result, startIndex, value, 0, value.m_stringLength);
+            FillSubstring(result, startIndex + value.m_stringLength,
+                          this, startIndex, this.m_stringLength - startIndex);
+            return result;
+        }
+
+        internal unsafe void InsertHoleInString(int startIndex, int holeSize) {
+            int tail = this.m_stringLength - startIndex;
+            this.m_stringLength += holeSize;
+            if (tail > 0) {
+                fixed (char *charPtr = &this.m_firstChar) {
+                    char *srcPtr = charPtr + startIndex;
+                    char *dstPtr = charPtr + holeSize;
+                    Buffer.MoveMemory((byte *)dstPtr, (byte *)srcPtr,
+                                      tail * sizeof(char));
+                }
+            }
+        }
+
+        internal unsafe void InsertStringOverwrite(String value, int startIndex, int valueLength) {
+            fixed (char *charPtr = &this.m_firstChar) {
+                char *dstPtr = charPtr + startIndex;
+                fixed (char *srcPtr = &value.m_firstChar) {
+                    Buffer.MoveMemory((byte *)dstPtr, (byte *)srcPtr,
+                                      valueLength * sizeof(char));
+                }
+            }
+        }
+
+        // Replaces all instances of oldChar with newChar.
+        //
+        //| <include path='docs/doc[@for="String.Replace"]/*' />
+        public String Replace(char oldChar, char newChar) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::Replace
+            String result = FastAllocateString(this.m_stringLength);
+            this.Replace(oldChar, newChar, result);
+            return result;
+        }
+
+        private unsafe void Replace(char oldChar, char newChar, String newString) {
+            fixed (char *srcPtr = &this.m_firstChar) {
+                fixed (char *destPtr = &newString.m_firstChar) {
+                    char *srcCursor = srcPtr;
+                    char *destCursor = destPtr;
+                    for (int i = this.m_stringLength; i > 0; i--) {
+                        char c = *srcCursor;
+                        *destCursor = (c == oldChar) ? newChar : c;
+                        srcCursor++;
+                        destCursor++;
+                    }
+                }
+            }
+        }
+
+        // This method contains the same functionality as StringBuilder Replace. The only difference is that
+        // a new String has to be allocated since Strings are immutable
+        //| <include path='docs/doc[@for="String.Replace1"]/*' />
+        public String Replace(String oldValue, String newValue) {
+            // Rusa: see also Lightning\Src\VM\COMString.cpp::ReplaceString
+            if (oldValue == null) {
+                throw new ArgumentNullException("oldString is null");
+            }
+            if (newValue == null) {
+                newValue = String.Empty;
+            }
+            if (oldValue.m_stringLength == 0) {
+                throw new ArgumentException("oldString is empty string");
+            }
+            int matchIndex = LocalIndexOfString(oldValue, 0);
+            if (matchIndex < 0) {
+                return this;
+            }
+            // Compute a table of where to insert newValue
+            int replaceCount = 0;
+            int[] replacementTable = new int[(this.m_stringLength - matchIndex) / oldValue.m_stringLength + 1];
+            do {
+                replacementTable[replaceCount] = matchIndex;
+                replaceCount++;
+                matchIndex = LocalIndexOfString(oldValue, matchIndex+oldValue.m_stringLength);
+            } while (matchIndex >= 0);
+            int newLength = this.m_stringLength + replaceCount * (newValue.m_stringLength - oldValue.m_stringLength);
+            String result = FastAllocateString(newLength);
+            int srcIndex = 0;
+            int destIndex = 0;
+            for (int replIndex = 0; replIndex < replaceCount; replIndex++) {
+                int count = replacementTable[replIndex] - srcIndex;
+                FillSubstring(result, destIndex, this, srcIndex, count);
+                srcIndex += count + oldValue.m_stringLength;
+                destIndex += count;
+                FillString(result, destIndex, newValue);
+                destIndex += newValue.m_stringLength;
+            }
+            FillSubstring(result, destIndex, this, srcIndex,
+                          this.m_stringLength - srcIndex);
+            return result;
+        }
+
+        private unsafe int LocalIndexOfString(String pattern, int startPos) {
+            fixed (char *stringPtr = &this.m_firstChar) {
+                fixed (char *patternPtr = &pattern.m_firstChar) {
+                    char *stringCharPtr = stringPtr + startPos;
+                    int count = this.m_stringLength - pattern.m_stringLength -
+                        startPos + 1;
+                    for (int index = 0; index < count; index++) {
+                        char *stringCursor = stringCharPtr + index;
+                        char *patternCursor = patternPtr;
+                        int i = pattern.m_stringLength;
+                        while (i > 0 && *stringCursor == *patternCursor) {
+                            i--;
+                            stringCursor++;
+                            patternCursor++;
+                        }
+                        if (i == 0) {
+                            return (startPos + index);
+                        }
+                    }
+                }
+            }
+            return -1;
+        }
+
+        //| <include path='docs/doc[@for="String.Remove"]/*' />
+        public String Remove(int startIndex, int count) {
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count is negative");
+            }
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("startIndex is negative");
+            }
+            if (startIndex + count > this.m_stringLength) {
+                throw new ArgumentOutOfRangeException("startIndex+count>Length");
+            }
+            int newLength = this.m_stringLength - count;
+            String result = FastAllocateString(newLength);
+            FillSubstring(result, 0, this, 0, startIndex);
+            FillSubstring(result, startIndex, this, startIndex + count,
+                          newLength - startIndex);
+            return result;
+        }
+
+        internal unsafe void RemoveRange(int startIndex, int count) {
+            int tail = this.m_stringLength - startIndex;
+            this.m_stringLength -= count;
+            if (tail > 0) {
+                fixed (char *charPtr = &this.m_firstChar) {
+                    char *dstPtr = charPtr + startIndex;
+                    char *srcPtr = dstPtr + count;
+                    Buffer.MoveMemory((byte *)dstPtr, (byte *)srcPtr,
+                                      tail * sizeof(char));
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="String.Format"]/*' />
+        public static String Format(String format, Object arg0) {
+            return Format(format, new Object[] {arg0});
+        }
+
+        //| <include path='docs/doc[@for="String.Format1"]/*' />
+        public static String Format(String format, Object arg0, Object arg1) {
+            return Format(format, new Object[] {arg0, arg1});
+        }
+
+        //| <include path='docs/doc[@for="String.Format2"]/*' />
+        public static String Format(String format, Object arg0, Object arg1, Object arg2) {
+            return Format(format, new Object[] {arg0, arg1, arg2});
+        }
+
+        //| <include path='docs/doc[@for="String.Format3"]/*' />
+        public static String Format(String format, params Object[] args) {
+            if (format == null || args == null)
+                throw new ArgumentNullException((format==null)?"format":"args");
+            StringBuilder sb = new StringBuilder(format.Length + args.Length * 8);
+            sb.AppendFormat(format,args);
+            return sb.ToString();
+        }
+
+        //| <include path='docs/doc[@for="String.Copy"]/*' />
+        public static String Copy (String str) {
+            if (str==null) {
+                throw new ArgumentNullException("str");
+            }
+
+            int length = str.Length;
+
+            String result = FastAllocateString(length);
+            FillString(result, 0, str);
+            return result;
+        }
+
+        // Used by StringBuilder to avoid data corruption
+        internal static String InternalCopy (String str) {
+            int length = str.Length;
+            String result = FastAllocateString(length);
+            FillStringEx(result, 0, str, length); // The underlying's String can changed length is StringBuilder
+            return result;
+        }
+
+        //| <include path='docs/doc[@for="String.Concat"]/*' />
+        public static String Concat(Object arg0) {
+            if (arg0==null) {
+                return String.Empty;
+            }
+            return arg0.ToString();
+        }
+
+        //| <include path='docs/doc[@for="String.Concat1"]/*' />
+        public static String Concat(Object arg0, Object arg1) {
+            if (arg0==null) {
+                arg0 = String.Empty;
+            }
+
+            if (arg1==null) {
+                arg1 = String.Empty;
+            }
+            return Concat(arg0.ToString(), arg1.ToString());
+        }
+
+        //| <include path='docs/doc[@for="String.Concat2"]/*' />
+        public static String Concat(Object arg0, Object arg1, Object arg2) {
+            if (arg0==null) {
+                arg0 = String.Empty;
+            }
+
+            if (arg1==null) {
+                arg1 = String.Empty;
+            }
+
+            if (arg2==null) {
+                arg2 = String.Empty;
+            }
+
+            return Concat(arg0.ToString(), arg1.ToString(), arg2.ToString());
+        }
+
+        //| <include path='docs/doc[@for="String.Concat4"]/*' />
+        public static String Concat(params Object[] args) {
+            if (args==null) {
+                throw new ArgumentNullException("args");
+            }
+
+            String[] sArgs = new String[args.Length];
+            int totalLength=0;
+
+            for (int i=0; i<args.Length; i++) {
+                object value = args[i];
+                sArgs[i] = ((value==null)?(String.Empty):(value.ToString()));
+                totalLength += sArgs[i].Length;
+                // check for overflow
+                if (totalLength < 0) {
+                    throw new OutOfMemoryException();
+                }
+            }
+            return ConcatArray(sArgs, totalLength);
+        }
+
+
+        //| <include path='docs/doc[@for="String.Concat5"]/*' />
+        public static String Concat(String str0, String str1) {
+            if (str0 == null) {
+                if (str1==null) {
+                    return String.Empty;
+                }
+                return str1;
+            }
+
+            if (str1==null) {
+                return str0;
+            }
+
+            int str0Length = str0.Length;
+
+            String result = FastAllocateString(str0Length + str1.Length);
+
+            FillStringChecked(result, 0,        str0);
+            FillStringChecked(result, str0Length, str1);
+
+            return result;
+        }
+
+        //| <include path='docs/doc[@for="String.Concat6"]/*' />
+        public static String Concat(String str0, String str1, String str2) {
+            if (str0==null && str1==null && str2==null) {
+                return String.Empty;
+            }
+
+            if (str0==null) {
+                str0 = String.Empty;
+            }
+
+            if (str1==null) {
+                str1 = String.Empty;
+            }
+
+            if (str2 == null) {
+                str2 = String.Empty;
+            }
+
+            int totalLength = str0.Length + str1.Length + str2.Length;
+
+            String result = FastAllocateString(totalLength);
+            FillStringChecked(result, 0, str0);
+            FillStringChecked(result, str0.Length, str1);
+            FillStringChecked(result, str0.Length + str1.Length, str2);
+
+            return result;
+        }
+
+        //| <include path='docs/doc[@for="String.Concat7"]/*' />
+        public static String Concat(String str0, String str1, String str2, String str3) {
+            if (str0==null && str1==null && str2==null && str3==null) {
+                return String.Empty;
+            }
+
+            if (str0==null) {
+                str0 = String.Empty;
+            }
+
+            if (str1==null) {
+                str1 = String.Empty;
+            }
+
+            if (str2 == null) {
+                str2 = String.Empty;
+            }
+
+            if (str3 == null) {
+                str3 = String.Empty;
+            }
+
+            int totalLength = str0.Length + str1.Length + str2.Length + str3.Length;
+
+            String result = FastAllocateString(totalLength);
+            FillStringChecked(result, 0, str0);
+            FillStringChecked(result, str0.Length, str1);
+            FillStringChecked(result, str0.Length + str1.Length, str2);
+            FillStringChecked(result, str0.Length + str1.Length + str2.Length, str3);
+
+            return result;
+        }
+
+        private static String ConcatArray(String[] values, int totalLength) {
+            String result =  FastAllocateString(totalLength);
+            int currPos=0;
+
+            for (int i=0; i<values.Length; i++) {
+                Debug.Assert((currPos + values[i].Length <= totalLength),
+                                "[String.ConcatArray](currPos + values[i].Length <= totalLength)");
+
+                FillStringChecked(result, currPos, values[i]);
+                currPos+=values[i].Length;
+            }
+
+            return result;
+        }
+
+        // poor man's varargs for String.Concat: 8 strings
+        public static String Concat(object obj0, object obj1, object obj2,
+                                    object obj3, string obj4, string obj5,
+                                    string obj6, string obj7) {
+            String[] strs = new String[8];
+            strs[0] = obj0.ToString();
+            strs[1] = obj1.ToString();
+            strs[2] = obj2.ToString();
+            strs[3] = obj3.ToString();
+            strs[4] = obj4.ToString();
+            strs[5] = obj5.ToString();
+            strs[6] = obj6.ToString();
+            strs[7] = obj7.ToString();
+            return Join(null,strs,0,8);
+        }
+
+        private static String[] CopyArrayOnNull(String[] values, out int totalLength) {
+            totalLength = 0;
+
+            String[] outValues = new String[values.Length];
+
+            for (int i=0; i<values.Length; i++) {
+                outValues[i] = ((values[i]==null)?String.Empty:values[i]);
+                totalLength += outValues[i].Length;
+            }
+            return outValues;
+        }
+
+        //| <include path='docs/doc[@for="String.Concat8"]/*' />
+        public static String Concat(params String[] values) {
+            int totalLength=0;
+
+            if (values==null) {
+                throw new ArgumentNullException("values");
+            }
+
+            // Always make a copy to prevent changing the array on another thread.
+            String[] internalValues = new String[values.Length];
+
+            for (int i = 0; i< values.Length; i++) {
+                string value = values[i];
+                internalValues[i] = ((value==null)?(String.Empty):(value));
+                totalLength += internalValues[i].Length;
+                // check for overflow
+                if (totalLength < 0) {
+                    throw new OutOfMemoryException();
+                }
+            }
+
+            return ConcatArray(internalValues, totalLength);
+        }
+
+        //| <include path='docs/doc[@for="String.Intern"]/*' />
+        public static String Intern(String str) {
+            str.CheckHighChars();
+            if (str == null) {
+                throw new ArgumentNullException("str");
+            }
+            if (internedStringVector == null) {
+                InitializeInternedTable();
+            }
+            int code = str.GetHashCode();
+            lock (internedStringVector) {
+                int[] codeTable= internedStringHashCodes;
+                String[] stringTable = internedStringVector;
+                int tableSize = codeTable.Length;
+                int indexMask = tableSize - 1;
+                int hx = code & indexMask;
+                //Scan up from our initial hash index guess
+                while (true) {    // It is guaranteed there are holes in table
+                    int tableCode = codeTable[hx];
+                    if (tableCode == code) {
+                        String s = stringTable[hx];
+                        if (str.Equals(s)) {
+                            return s;
+                        }
+                    } else if (tableCode == 0 && stringTable[hx] == null) {
+                        // We need to insert the string here!
+                        int stringLength = str.Length;
+                        if (str.m_arrayLength > stringLength+1) {
+                            str = NewString(str, 0, stringLength, stringLength);
+                        }
+                        internedStringCount++;
+                        stringTable[hx] = str; // Set string entry first
+                        codeTable[hx] = code; // then set code!
+                        if (internedStringCount >= internedStringBound) {
+                            RehashInternedStrings();
+                        }
+                        return str;
+                    }
+                    hx++;
+                    hx &= indexMask;
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="String.IsInterned"]/*' />
+        public static String IsInterned(String str) {
+            if (str == null) {
+                throw new ArgumentNullException("str");
+            }
+            if (internedStringVector == null) {
+                InitializeInternedTable();
+            }
+            int code = str.GetHashCode();
+            int[] codeTable;
+            String[] stringTable;
+            do {
+                codeTable = internedStringHashCodes;
+                stringTable = internedStringVector;
+            } while (codeTable.Length != stringTable.Length);
+            int tableSize = codeTable.Length;
+            int indexMask = tableSize - 1;
+            int hx = code & indexMask;
+            // Scan up from our initial hash index guess
+            while (true) {        // It is guaranteed there are holes in table
+                int tableCode = codeTable[hx];
+                if (tableCode == code) {
+                    String s = stringTable[hx];
+                    if (str.Equals(s)) {
+                        return s;
+                    }
+                } else if (tableCode == 0 && stringTable[hx] == null) {
+                    return null;
+                }
+                hx++;
+                hx &= indexMask;
+            }
+        }
+
+        private static void InitializeInternedTable() {
+            lock (typeof(String)) {
+                if (internedStringVector != null) {
+                    return;
+                }
+                int tableSize = 128;
+                int constantCount = internedStringConstants.Length;
+                while (tableSize <= constantCount) {
+                    tableSize <<= 1;
+                }
+                int indexMask = tableSize - 1;
+                String[] stringTable = new String[tableSize];
+                int[] codeTable = new int[tableSize];
+                for (int i = 0; i < constantCount; i++) {
+                    String s = internedStringConstants[i];
+                    int code = s.GetHashCode();
+                    int hx = code & indexMask;
+                    while (true) {
+                        int tableCode = codeTable[hx];
+                        VTable.Assert(tableCode != code ||
+                                      !s.Equals(stringTable[hx]),
+                                      "Duplicate interned strings!");
+                        if (tableCode == 0 && stringTable[hx] == null) {
+                            internedStringCount++;
+                            stringTable[hx] = s;
+                            codeTable[hx] = code;
+                            break;
+                        }
+                        hx++;
+                        hx &= indexMask;
+                    }
+                }
+                internedStringBound = tableSize >> 1;
+                internedStringHashCodes = codeTable;
+                internedStringVector = stringTable;
+            }
+        }
+
+        private static void RehashInternedStrings() {
+            int[] oldCodeTable = internedStringHashCodes;
+            String[] oldStringTable = internedStringVector;
+            int oldSize = oldCodeTable.Length;
+            int oldIndexMask = oldSize - 1;
+            int newSize = oldSize << 1;
+            int newIndexMask = newSize -1;
+            int[] newCodeTable = new int[newSize];
+            String[] newStringTable = new String[newSize];
+            for (int i = 0; i < oldSize; i++) {
+                String s = oldStringTable[i];
+                if (s != null) {
+                    int code = oldCodeTable[i];
+                    int hx = code & newIndexMask;
+                    while (true) {
+                        if (newCodeTable[hx] == 0 &&
+                            newStringTable[hx] == null) {
+                            newStringTable[hx] = s;
+                            newCodeTable[hx] = code;
+                            break;
+                        }
+                        hx++;
+                        hx &= newIndexMask;
+                    }
+                }
+            }
+            internedStringBound = newSize >> 1;
+            internedStringHashCodes = newCodeTable;
+            internedStringVector = newStringTable;
+        }
+
+        private static int internedStringCount;
+        private static int internedStringBound;
+        private static int[] internedStringHashCodes;
+        private static String[] internedStringVector;
+        private static String[] internedStringConstants;
+
+        private static readonly bool [] HighCharTable = {
+            false, // 0x00, 0x0
+            true,  // 0x01, .
+            true,  // 0x02, .
+            true,  // 0x03, .
+            true,  // 0x04, .
+            true,  // 0x05, .
+            true,  // 0x06, .
+            true,  // 0x07, .
+            true,  // 0x08, .
+            false, // 0x09,
+            false, // 0x0A,
+            false, // 0x0B, .
+            false, // 0x0C, .
+            false, // 0x0D,
+            true,  // 0x0E, .
+            true,  // 0x0F, .
+            true,  // 0x10, .
+            true,  // 0x11, .
+            true,  // 0x12, .
+            true,  // 0x13, .
+            true,  // 0x14, .
+            true,  // 0x15, .
+            true,  // 0x16, .
+            true,  // 0x17, .
+            true,  // 0x18, .
+            true,  // 0x19, .
+            true,  // 0x1A,
+            true,  // 0x1B, .
+            true,  // 0x1C, .
+            true,  // 0x1D, .
+            true,  // 0x1E, .
+            true,  // 0x1F, .
+            false, // 0x20,
+            false, // 0x21, !
+            false, // 0x22, "
+            false, // 0x23, #
+            false, // 0x24, $
+            false, // 0x25, %
+            false, // 0x26, &
+            true,  // 0x27, '
+            false, // 0x28, (
+            false, // 0x29, )
+            false, // 0x2A  *
+            false, // 0x2B, +
+            false, // 0x2C, ,
+            true,  // 0x2D, -
+            false, // 0x2E, .
+            false, // 0x2F, /
+            false, // 0x30, 0
+            false, // 0x31, 1
+            false, // 0x32, 2
+            false, // 0x33, 3
+            false, // 0x34, 4
+            false, // 0x35, 5
+            false, // 0x36, 6
+            false, // 0x37, 7
+            false, // 0x38, 8
+            false, // 0x39, 9
+            false, // 0x3A, :
+            false, // 0x3B, ;
+            false, // 0x3C, <
+            false, // 0x3D, =
+            false, // 0x3E, >
+            false, // 0x3F, ?
+            false, // 0x40, @
+            false, // 0x41, A
+            false, // 0x42, B
+            false, // 0x43, C
+            false, // 0x44, D
+            false, // 0x45, E
+            false, // 0x46, F
+            false, // 0x47, G
+            false, // 0x48, H
+            false, // 0x49, I
+            false, // 0x4A, J
+            false, // 0x4B, K
+            false, // 0x4C, L
+            false, // 0x4D, M
+            false, // 0x4E, N
+            false, // 0x4F, O
+            false, // 0x50, P
+            false, // 0x51, Q
+            false, // 0x52, R
+            false, // 0x53, S
+            false, // 0x54, T
+            false, // 0x55, U
+            false, // 0x56, V
+            false, // 0x57, W
+            false, // 0x58, X
+            false, // 0x59, Y
+            false, // 0x5A, Z
+            false, // 0x5B, [
+            false, // 0x5C, \
+            false, // 0x5D, ]
+            false, // 0x5E, ^
+            false, // 0x5F, _
+            false, // 0x60, `
+            false, // 0x61, a
+            false, // 0x62, b
+            false, // 0x63, c
+            false, // 0x64, d
+            false, // 0x65, e
+            false, // 0x66, f
+            false, // 0x67, g
+            false, // 0x68, h
+            false, // 0x69, i
+            false, // 0x6A, j
+            false, // 0x6B, k
+            false, // 0x6C, l
+            false, // 0x6D, m
+            false, // 0x6E, n
+            false, // 0x6F, o
+            false, // 0x70, p
+            false, // 0x71, q
+            false, // 0x72, r
+            false, // 0x73, s
+            false, // 0x74, t
+            false, // 0x75, u
+            false, // 0x76, v
+            false, // 0x77, w
+            false, // 0x78, x
+            false, // 0x79, y
+            false, // 0x7A, z
+            false, // 0x7B, {
+            false, // 0x7C, |
+            false, // 0x7D, }
+            false, // 0x7E, ~
+            true,  // 0x7F, 
+        };
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="String.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode() {
+            return TypeCode.String;
+        }
+
+        // Is this a string that can be compared quickly (that is it has only characters > 0x80
+        // and not a - or '
+        internal bool IsFastSort() {
+            return ((StringState & StringState.SpecialSort) != 0);
+        }
+
+        internal bool IsSlowSort() {
+            return !IsFastSort();
+        }
+
+        internal bool IsFastOpsExceptSort() {
+            return ((StringState & StringState.SpecialSort) != 0 ||
+                    (StringState & StringState.FastOps) != 0);
+        }
+
+        internal bool IsFastCasing() {
+            return ((StringState & StringState.SpecialSort) != 0 ||
+                    (StringState & StringState.FastOps) != 0);
+        }
+
+        internal bool IsFastIndex() {
+            return ((StringState & StringState.SpecialSort) != 0 ||
+                    (StringState & StringState.FastOps) != 0);
+        }
+
+        internal bool IsStringStateUndetermined() {
+            return (StringState == StringState.Undetermined);
+        }
+
+        internal bool HasHighChars() {
+            return (StringState == StringState.HighChars);
+        }
+
+
+        /// <summary>
+        /// Get or set the string state for this string.
+        /// </summary>
+        internal unsafe StringState StringState {
+            [NoLoggingForUndo]
+                get {
+                StringState result = MultiUseWord.GetStringState(this);
+                return (StringState)result;
+            }
+            [NoLoggingForUndo]
+                set {
+                MultiUseWord.SetStringState(this, value);
+            }
+        }
+
+        internal unsafe StringState CheckHighChars() {
+            char c;
+            StringState ss = StringState.FastOps;
+            int length = m_stringLength;
+            fixed(char *charPtr = &this.m_firstChar) {
+                for(int i = 0; i < length; i++) {
+                    c = charPtr[i];
+                    if(c>=0x80) {
+                        StringState = StringState.HighChars;
+                        return StringState;
+                    }
+                    else if (HighCharTable[(int)c]) {
+                        ss = StringState.SpecialSort;
+                    }
+                }
+            }
+
+            StringState = ss;
+            return StringState;
+        }
+
+        ///<internalonly/>
+        unsafe internal void SetChar(int index, char value)
+        {
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            //Bounds check and then set the actual bit.
+            if ((UInt32)index >= (UInt32)Length)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_Index");
+
+            fixed (char *p = &this.m_firstChar) {
+                // Set the character.
+                p[index] = value;
+            }
+        }
+
+#if _DEBUG
+        // Only used in debug build. Insure that the HighChar state information for a string is not set as known
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private bool ValidModifiableString() {
+            throw new Exception("System.String.ValidModifiableString not implemented in Bartok!");
+        }
+#endif
+
+        ///<internalonly/>
+        unsafe internal void AppendInPlace(char value,int currentLength)
+        {
+            Debug.Assert(currentLength < m_arrayLength, "[String.AppendInPlace(char)currentLength < m_arrayLength");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            fixed (char *p = &this.m_firstChar)
+            {
+                // Append the character.
+                p[currentLength] = value;
+                p[++currentLength] = '\0';
+                m_stringLength = currentLength;
+            }
+        }
+
+
+        ///<internalonly/>
+        unsafe internal void AppendInPlace(char value, int repeatCount, int currentLength)
+        {
+            Debug.Assert(currentLength+repeatCount < m_arrayLength, "[String.AppendInPlace]currentLength+repeatCount < m_arrayLength");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            int newLength = currentLength + repeatCount;
+
+
+            fixed (char *p = &this.m_firstChar)
+            {
+                int i;
+                for (i=currentLength; i<newLength; i++) {
+                    p[i] = value;
+                }
+                p[i] = '\0';
+            }
+            this.m_stringLength = newLength;
+        }
+
+        ///<internalonly/>
+        internal unsafe void AppendInPlace(String value, int currentLength) {
+            Debug.Assert(value!=null, "[String.AppendInPlace]value!=null");
+            Debug.Assert(value.Length + currentLength < this.m_arrayLength, "[String.AppendInPlace]Length is wrong.");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            FillString(this, currentLength, value);
+            SetLength(currentLength + value.Length);
+            NullTerminate();
+        }
+
+        internal void AppendInPlace(String value, int startIndex, int count, int currentLength) {
+            Debug.Assert(value!=null, "[String.AppendInPlace]value!=null");
+            Debug.Assert(count + currentLength < this.m_arrayLength, "[String.AppendInPlace]count + currentLength < this.m_arrayLength");
+            Debug.Assert(count>=0, "[String.AppendInPlace]count>=0");
+            Debug.Assert(startIndex>=0, "[String.AppendInPlace]startIndex>=0");
+            Debug.Assert(startIndex <= (value.Length - count), "[String.AppendInPlace]startIndex <= (value.Length - count)");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            FillSubstring(this, currentLength, value, startIndex, count);
+            SetLength(currentLength + count);
+            NullTerminate();
+        }
+
+        internal unsafe void AppendInPlace(char *value, int count,int currentLength) {
+            Debug.Assert(value!=null, "[String.AppendInPlace]value!=null");
+            Debug.Assert(count + currentLength < this.m_arrayLength, "[String.AppendInPlace]count + currentLength < this.m_arrayLength");
+            Debug.Assert(count>=0, "[String.AppendInPlace]count>=0");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+            fixed(char *p = &this.m_firstChar) {
+                int i;
+                for (i=0; i<count; i++) {
+                    p[currentLength+i] = value[i];
+                }
+            }
+            SetLength(currentLength + count);
+            NullTerminate();
+        }
+
+
+        ///<internalonly/>
+        internal unsafe void AppendInPlace(char[] value, int start, int count, int currentLength) {
+            Debug.Assert(value!=null, "[String.AppendInPlace]value!=null");
+            Debug.Assert(count + currentLength < this.m_arrayLength, "[String.AppendInPlace]Length is wrong.");
+            Debug.Assert(value.Length-count>=start, "[String.AppendInPlace]value.Length-count>=start");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            FillStringArray(this, currentLength, value, start, count);
+            this.m_stringLength = (currentLength + count);
+            this.NullTerminate();
+        }
+
+
+        ///<internalonly/>
+        unsafe internal void ReplaceCharInPlace(char oldChar, char newChar, int startIndex, int count,int currentLength) {
+            Debug.Assert(startIndex>=0, "[String.ReplaceCharInPlace]startIndex>0");
+            Debug.Assert(startIndex<=currentLength, "[String.ReplaceCharInPlace]startIndex>=Length");
+            Debug.Assert((startIndex<=currentLength-count), "[String.ReplaceCharInPlace]count>0 && startIndex<=currentLength-count");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+
+            int endIndex = startIndex+count;
+
+            fixed (char *p = &this.m_firstChar) {
+                for (int i=startIndex;i<endIndex; i++) {
+                    if (p[i]==oldChar) {
+                        p[i]=newChar;
+                    }
+                }
+            }
+        }
+
+
+        ///<internalonly/>
+        internal static String GetStringForStringBuilder(String value, int capacity) {
+            Debug.Assert(value!=null, "[String.GetStringForStringBuilder]value!=null");
+            Debug.Assert(capacity>=value.Length,  "[String.GetStringForStringBuilder]capacity>=value.Length");
+
+            String newStr = FastAllocateString(capacity);
+            if (value.Length==0) {
+                newStr.m_stringLength=0;
+                newStr.m_firstChar='\0';
+                return newStr;
+            }
+            FillString(newStr, 0, value);
+            newStr.m_stringLength = value.m_stringLength;
+            return newStr;
+        }
+
+        ///<internalonly/>
+        private unsafe void NullTerminate() {
+            fixed(char *p = &this.m_firstChar) {
+                p[m_stringLength] = '\0';
+            }
+        }
+
+        ///<internalonly/>
+        unsafe internal void ClearPostNullChar() {
+            int newLength = Length+1;
+            if (newLength<m_arrayLength) {
+                fixed(char *p = &this.m_firstChar) {
+                    p[newLength] = '\0';
+                }
+            }
+        }
+
+        ///<internalonly/>
+        internal void SetLength(int newLength) {
+            Debug.Assert(newLength <= m_arrayLength, "newLength<=m_arrayLength");
+            m_stringLength = newLength;
+        }
+
+
+
+        //| <include path='docs/doc[@for="String.GetEnumerator"]/*' />
+        public CharEnumerator GetEnumerator() {
+            return new CharEnumerator(this);
+        }
+
+        //| <include path='docs/doc[@for="String.IEnumerable.GetEnumerator"]/*' />
+        /// <internalonly/>
+        IEnumerator IEnumerable.GetEnumerator() {
+            return new CharEnumerator(this);
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_arrayLength = 0;
+            m_stringLength = 0;
+            m_firstChar = m_firstChar;
+        }
+#endif
+
+        internal unsafe void InternalSetCharNoBoundsCheck(int index, char value) {
+            fixed (char *p = &this.m_firstChar) {
+                p[index] = value;
+            }
+        }
+
+
+#if false // Unused
+
+        // NOTE: len is not the length in characters, but the length in bytes
+
+        // Copies the source String (byte buffer) to the destination IntPtr memory allocated with len bytes.
+        internal unsafe static void InternalCopy(String src, IntPtr dest,int len)
+        {
+            if (len == 0)
+                return;
+            fixed(char* charPtr = &src.m_firstChar) {
+                byte* srcPtr = (byte*) charPtr;
+                byte* dstPtr = (byte*) dest.ToPointer();
+                Buffer.MoveMemory(dstPtr, srcPtr, len);
+            }
+        }
+
+        // memcopies characters inside a String.
+        internal unsafe static void InternalMemCpy(String src, int srcOffset, String dst, int destOffset, int len)
+        {
+            if (len == 0)
+                return;
+            fixed(char* srcPtr = &src.m_firstChar) {
+                fixed(char* dstPtr = &dst.m_firstChar) {
+                    Buffer.MoveMemory((byte*)(dstPtr + destOffset),
+                                      (byte*)(srcPtr + srcOffset),
+                                      len);
+                }
+            }
+        }
+#endif
+
+        // Copies the source String to the destination byte[]
+        internal unsafe static void InternalCopy(String src, byte[] dest, int stringLength)
+        {
+            if (stringLength == 0)
+                return;
+            int len = stringLength * sizeof(char);
+
+            Debug.Assert(dest.Length >= len);
+
+            fixed(char* charPtr = &src.m_firstChar) {
+                fixed(byte* destPtr = &dest[0]) {
+                    byte* srcPtr = (byte*) charPtr;
+                    Buffer.MoveMemory(destPtr, srcPtr, len);
+                }
+            }
+        }
+
+        internal unsafe void InsertInPlace(int index, String value, int repeatCount, int currentLength, int requiredLength) {
+            Debug.Assert(requiredLength  < m_arrayLength, "[String.InsertString] requiredLength  < m_arrayLength");
+            Debug.Assert(index + value.Length * repeatCount < m_arrayLength, "[String.InsertString] index + value.Length * repeatCount < m_arrayLength");
+#if _DEBUG
+            Debug.Assert(ValidModifiableString(), "Modifiable string must not have highChars flags set");
+#endif
+            //Copy the old characters over to make room and then insert the new characters.
+            fixed(char* srcPtr = &this.m_firstChar) {
+                fixed(char* valuePtr = &value.m_firstChar) {
+                    Buffer.MoveMemory((byte*)(srcPtr + index + value.Length * repeatCount),
+                                   (byte*)(srcPtr + index),
+                                   (currentLength - index) * sizeof(char));
+                    for (int i = 0; i < repeatCount; i++) {
+                        Buffer.MoveMemory((byte*)(srcPtr + index + i * value.Length),
+                                       (byte*)valuePtr,
+                                       value.Length * sizeof(char));
+                    }
+                }
+                srcPtr[requiredLength] = '\0';
+            }
+            this.m_stringLength = requiredLength;
+        }
+
+        [AccessedByRuntime("referenced from c++")]
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static unsafe int LimitedFormatTo(String format,
+                                                 ArgIterator args,
+                                                 char *buffer,
+                                                 int length)
+        {
+            unchecked {
+
+            fixed (char *fmtBeg = &format.m_firstChar) {
+                char *fmtPtr = fmtBeg;
+                char *fmtEnd = fmtBeg + format.m_stringLength;
+
+                char *outPtr = buffer;
+                char *outEnd = buffer + length;
+
+                while (fmtPtr < fmtEnd && outPtr < outEnd) {
+                    if (*fmtPtr == '{') {
+                        char * fmtPos = fmtPtr;
+                        bool bad = false;
+                        fmtPtr++;
+
+                        int ndx = 0;
+                        int aln = 0;
+                        int wid = 0;
+                        char fmt = 'd';
+
+                        if (*fmtPtr == '{') {
+                            *outPtr++ = *fmtPtr++;
+                        }
+                        else if (*fmtPtr >= '0' && *fmtPtr <= '9') {
+
+                            // {index,alignment:type width}
+                            // Get Index
+                            while (*fmtPtr >= '0' && *fmtPtr <= '9') {
+                                ndx = ndx * 10 + (*fmtPtr++ - '0');
+                            }
+
+                            // Get Alignment
+                            if (*fmtPtr == ',') {
+                                fmtPtr++;
+                                if (*fmtPtr == '-') {
+                                    // We just ignore left alignment for now.
+                                    fmtPtr++;
+                                }
+                                while (*fmtPtr >= '0' && *fmtPtr <= '9') {
+                                    aln = aln * 10 + (*fmtPtr++ - '0');
+                                }
+                            }
+
+                            // Get FormatString
+                            if (*fmtPtr == ':') {
+                                fmtPtr++;
+                                if (*fmtPtr >= 'a' && *fmtPtr <= 'z') {
+                                    fmt = *fmtPtr++;
+                                }
+                                else if (*fmtPtr >= 'A' && *fmtPtr <= 'Z') {
+                                    fmt = (char)(*fmtPtr++ - ('A' + 'a'));
+                                }
+                                while (*fmtPtr >= '0' && *fmtPtr <= '9') {
+                                    wid = wid * 10 + (*fmtPtr++ - '0');
+                                }
+                            }
+
+                            // Get closing brace.
+                            if (*fmtPtr == '}') {
+                                fmtPtr++;
+                            }
+                            else {
+                                bad = true;
+                            }
+
+                            if (ndx >= args.Length) {
+                                bad = true;
+                            }
+
+                            if (bad) {
+                                for (; fmtPos < fmtPtr; fmtPos++) {
+                                    if (outPtr < outEnd) {
+                                        *outPtr++ = *fmtPos;
+                                    }
+                                }
+                            }
+                            else {
+                                // Get the value
+                                char cvalue = '\0';
+                                long ivalue = 0;
+                                string svalue = null;
+                                ulong value = 0;
+                                IntPtr pvalue;
+                                RuntimeType type;
+
+                                type = args.GetArg(ndx, out pvalue);
+
+                                switch (type.classVtable.structuralView) {
+                                    case StructuralType.Bool:
+                                        svalue =*(bool *)pvalue ? "true" : "false";
+                                        break;
+                                    case StructuralType.Char:
+                                        cvalue = *(char *)pvalue;
+                                        break;
+                                    case StructuralType.Int8:
+                                        ivalue = *(sbyte *)pvalue;
+                                        break;
+                                    case StructuralType.Int16:
+                                        ivalue = *(short *)pvalue;
+                                        break;
+                                    case StructuralType.Int32:
+                                        ivalue = *(int *)pvalue;
+                                        break;
+                                    case StructuralType.Int64:
+                                        ivalue = *(long *)pvalue;
+                                        break;
+                                    case StructuralType.UInt8:
+                                        value = *(byte *)pvalue;
+                                        break;
+                                    case StructuralType.UInt16:
+                                        value = *(ushort *)pvalue;
+                                        break;
+                                    case StructuralType.UInt32:
+                                        value = *(uint *)pvalue;
+                                        break;
+                                    case StructuralType.UInt64:
+                                        value = *(ulong *)pvalue;
+                                        break;
+                                    case StructuralType.IntPtr:
+                                        value = (ulong)*(IntPtr *)pvalue;
+                                        break;
+                                    case StructuralType.UIntPtr:
+                                        value = (ulong)*(UIntPtr *)pvalue;
+                                        break;
+                                    case StructuralType.Reference:
+                                        if (type == typeof(String)) {
+                                            svalue = Magic.toString(
+                                                Magic.fromAddress(*(UIntPtr *)pvalue));
+                                        }
+                                        else {
+                                            svalue = type.Name;
+                                        }
+                                        break;
+                                    default:
+                                        svalue = "???";
+                                        break;
+                                }
+
+                                if (cvalue != '\0') {
+                                    outPtr = AddChar(outPtr, outEnd, *(char *)pvalue, aln);
+                                }
+                                else if (svalue != null) {
+                                    outPtr = AddString(outPtr, outEnd, svalue, aln);
+                                }
+                                else {
+                                    if (aln < wid) {
+                                        aln = wid;
+                                    }
+
+                                    if (fmt == 'x') {
+                                        if (ivalue != 0) {
+                                            value = (ulong)ivalue;
+                                        }
+                                        outPtr = AddNumber(outPtr, outEnd, value, aln, 16, '0', '\0');
+                                    }
+                                    else {
+                                        char sign = '\0';
+                                        if (ivalue < 0) {
+                                            sign = '-';
+                                            value = unchecked((ulong)-ivalue);
+                                        }
+                                        else if (ivalue > 0) {
+                                            value = unchecked((ulong)ivalue);
+                                        }
+                                        outPtr = AddNumber(outPtr, outEnd, value, aln, 10, ' ', sign);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if (*fmtPtr == '}') {
+                        if (outPtr < outEnd) {
+                            *outPtr++ = *fmtPtr;
+                        }
+                        fmtPtr++;
+                    }
+                    else {
+                        if (outPtr < outEnd) {
+                            *outPtr++ = *fmtPtr;
+                        }
+                        fmtPtr++;
+                    }
+                }
+                return (int)(outPtr - buffer);
+            }
+            }
+        }
+
+        [NoHeapAllocation]
+        private static int CountDigits(ulong value, uint valueBase)
+        {
+            int used = 0;
+            do {
+                value /= valueBase;
+                used++;
+            } while (value != 0);
+
+            return used;
+        }
+
+        [NoHeapAllocation]
+        private static unsafe char * AddNumber(char *output, char *limit,
+                                               ulong value, int width, uint valueBase,
+                                               char fill, char sign)
+        {
+            // Make sure we won't overfill the buffer.
+            if (output >= limit) {
+                return output;
+            }
+
+            // Figure out how wide the string will be.
+            int used = CountDigits(value, valueBase);
+
+            // Check for overflow.
+            if (output + used + ((sign != '\0') ? 1 : 0) > limit) {
+                while (width > 0) {
+                    *output++ = '#';
+                    width--;
+                }
+                return output;
+            }
+
+            // Handle sign and space fill.
+            if (sign != '\0' && used < width) {
+                if (fill == ' ') {
+                    while (width > used + 1) {
+                        *output++ = fill;
+                        width--;
+                    }
+                    fill = '\0';
+                }
+                *output++ = sign;
+            }
+
+            // Handle other non-zero fills.
+            if (fill != '\0') {
+                while (width > used) {
+                    *output++ = fill;
+                    width--;
+                }
+            }
+
+            // Write the characters into the buffer.
+            char *outp = output + used;
+            do {
+                uint digit = (uint)(value % valueBase);
+                value /= valueBase;
+
+                if (digit >= 0 && digit <= 9) {
+                    *--outp = (char)('0' + digit);
+                }
+                else {
+                    *--outp = (char)('a' + (digit - 10));
+                }
+            } while (value != 0);
+
+            return output + used;
+        }
+
+        [NoHeapAllocation]
+        private static unsafe char * AddString(char *output, char *limit,
+                                               string value, int width)
+        {
+            fixed (char *pwString = &value.m_firstChar) {
+                return AddString(output, limit, pwString, value.m_stringLength, width);
+            }
+        }
+
+        [NoHeapAllocation]
+        private static unsafe char * AddString(char *output, char *limit,
+                                               char *pwString, int cwString,
+                                               int width)
+        {
+            // width < 0: left justified at -width.
+            // width = 0: no specified width.
+            // width > 0: right justified at width.
+            if (width == 0) {
+                width = cwString;
+            }
+            else if (width < 0) {
+                width = -width;
+                for (; width > cwString; width--) {
+                    if (output < limit) {
+                        *output++ = ' ';
+                    }
+                }
+            }
+
+            while (cwString > 0 && width > 0) {
+                if (output < limit) {
+                    *output++ = (char)*pwString++;
+                }
+                width--;
+                cwString--;
+            }
+
+            for (; width > 0; width--) {
+                if (output < limit) {
+                    *output++ = ' ';
+                }
+            }
+            return output;
+        }
+
+        [NoHeapAllocation]
+        private static unsafe char * AddChar(char *output, char *limit, char value, int width)
+        {
+            // width < 0: left justified at -width.
+            // width = 0: no specified width.
+            // width > 0: right justified at width.
+            if (width == 0) {
+                width = 1;
+            }
+            else if (width < 0) {
+                width = -width;
+                for (; width > 1; width--) {
+                    if (output < limit) {
+                        *output++ = ' ';
+                    }
+                }
+            }
+
+            if (width > 0) {
+                if (output < limit) {
+                    *output++ = (char)value;
+                }
+                width--;
+            }
+
+            for (; width > 0; width--) {
+                if (output < limit) {
+                    *output++ = ' ';
+                }
+            }
+            return output;
+        }
+    }
+}
diff --git a/base/Kernel/System/SystemException.cs b/base/Kernel/System/SystemException.cs
new file mode 100644
index 0000000..eda1ec6
--- /dev/null
+++ b/base/Kernel/System/SystemException.cs
@@ -0,0 +1,27 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    using System;
+    //| <include path='docs/doc[@for="SystemException"]/*' />
+    public class SystemException : Exception
+    {
+        //| <include path='docs/doc[@for="SystemException.SystemException"]/*' />
+        public SystemException()
+            : base("Arg_SystemException") {
+        }
+
+        //| <include path='docs/doc[@for="SystemException.SystemException1"]/*' />
+        public SystemException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="SystemException.SystemException2"]/*' />
+        public SystemException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Text/ASCIIEncoding.cs b/base/Kernel/System/Text/ASCIIEncoding.cs
new file mode 100644
index 0000000..46d53f6
--- /dev/null
+++ b/base/Kernel/System/Text/ASCIIEncoding.cs
@@ -0,0 +1,210 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Text {
+    using System.Text;
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="ASCIIEncoding"]/*' />
+    [RequiredByBartok]
+    public class ASCIIEncoding : Encoding
+    {
+        private const int ASCII_CODEPAGE=20127;
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.ASCIIEncoding"]/*' />
+        [RequiredByBartok]
+        public ASCIIEncoding() : base(ASCII_CODEPAGE) {
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetByteCount"]/*' />
+        public override int GetByteCount(char[] chars, int index, int count) {
+            if (chars == null) {
+                throw new ArgumentNullException("chars", "ArgumentNull_Array");
+            }
+            if (index < 0 || count < 0) {
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - index < count) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCountBuffer");
+            }
+
+            return (count);
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetByteCount1"]/*' />
+        public override int GetByteCount(String chars) {
+            if (chars == null) {
+                throw new ArgumentNullException("chars", "ArgumentNull_Array");
+            }
+            return chars.Length;
+        }
+
+         //| <include path='docs/doc[@for="ASCIIEncoding.GetBytes"]/*' />
+        public override int GetBytes(char[] chars, int charIndex, int charCount,
+            byte[] bytes, int byteIndex) {
+            if (chars == null || bytes == null) {
+                throw new ArgumentNullException((chars == null ? "chars" : "bytes"),
+                      "ArgumentNull_Array");
+            }
+            if (charIndex < 0 || charCount < 0) {
+                throw new ArgumentOutOfRangeException((charIndex<0 ? "charIndex" : "charCount"),
+                      "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - charIndex < charCount) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            if (byteIndex < 0 || byteIndex > bytes.Length) {
+                throw new ArgumentOutOfRangeException("byteIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            if (bytes.Length - byteIndex < charCount) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+            int charEnd = charIndex + charCount;
+
+            while (charIndex < charEnd) {
+                char ch = chars[charIndex++];
+                if (ch >= 0x0080) ch = '?';
+                bytes[byteIndex++] = (byte)ch;
+            }
+            return charCount;
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetBytes1"]/*' />
+        public override int GetBytes(String chars, int charIndex, int charCount,
+            byte[] bytes, int byteIndex) {
+            if (chars == null || bytes == null) {
+                throw new ArgumentNullException((chars == null ? "chars" : "bytes"),
+                      "ArgumentNull_Array");
+            }
+            if (charIndex < 0 || charCount < 0) {
+                throw new ArgumentOutOfRangeException((charIndex<0 ? "charIndex" : "charCount"),
+                      "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - charIndex < charCount) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCount");
+            }
+            if (byteIndex < 0 || byteIndex > bytes.Length) {
+                throw new ArgumentOutOfRangeException("byteIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            if (bytes.Length - byteIndex < charCount) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+            int charEnd = charIndex + charCount;
+
+            while (charIndex < charEnd) {
+                char ch = chars[charIndex++];
+                if (ch >= 0x0080) ch = '?';
+                bytes[byteIndex++] = (byte)ch;
+            }
+            return charCount;
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetCharCount"]/*' />
+        public override int GetCharCount(byte[] bytes, int index, int count) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                    "ArgumentNull_Array");
+            }
+            if (index < 0 || count < 0) {
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (bytes.Length - index < count) {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            return (count);
+
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetChars"]/*' />
+        public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+            char[] chars, int charIndex) {
+            if (bytes == null || chars == null) {
+                throw new ArgumentNullException((bytes == null ? "bytes" : "chars"),
+                    "ArgumentNull_Array");
+            }
+            if (byteIndex < 0 || byteCount < 0) {
+                throw new ArgumentOutOfRangeException((byteIndex<0 ? "byteIndex" : "byteCount"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if ( bytes.Length - byteIndex < byteCount)
+            {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            if (charIndex < 0 || charIndex > chars.Length) {
+                throw new ArgumentOutOfRangeException("charIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            if (chars.Length - charIndex < byteCount) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+            int byteEnd = byteIndex + byteCount;
+            while (byteIndex < byteEnd) {
+                byte b = bytes[byteIndex++];
+                if (b > 0x7f) {
+                    // This is an invalid byte in the ASCII encoding.
+                    chars[charIndex++] = '?';
+                } else {
+                    chars[charIndex++] = (char)b;
+                }
+            }
+            return (byteCount);
+
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetString"]/*' />
+        public override String GetString(byte[] bytes)
+        {
+            if (bytes == null)
+                throw new ArgumentNullException("bytes", "ArgumentNull_Array");
+            return String.CreateStringFromASCII(bytes, 0, bytes.Length);
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetString1"]/*' />
+        public override String GetString(byte[] bytes, int byteIndex, int byteCount)
+        {
+            if (bytes == null)
+                throw new ArgumentNullException("bytes", "ArgumentNull_Array");
+            if (byteIndex < 0 || byteCount < 0) {
+                throw new ArgumentOutOfRangeException((byteIndex<0 ? "byteIndex" : "byteCount"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (bytes.Length - byteIndex < byteCount)
+            {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            return String.CreateStringFromASCII(bytes, byteIndex, byteCount);
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetMaxByteCount"]/*' />
+        public override int GetMaxByteCount(int charCount) {
+            if (charCount < 0) {
+               throw new ArgumentOutOfRangeException("charCount",
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+
+            return (charCount);
+        }
+
+        //| <include path='docs/doc[@for="ASCIIEncoding.GetMaxCharCount"]/*' />
+        public override int GetMaxCharCount(int byteCount) {
+            if (byteCount < 0) {
+               throw new ArgumentOutOfRangeException("byteCount",
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            return byteCount;
+        }
+    }
+}
diff --git a/base/Kernel/System/Text/Decoder.cs b/base/Kernel/System/Text/Decoder.cs
new file mode 100644
index 0000000..68c3eb2
--- /dev/null
+++ b/base/Kernel/System/Text/Decoder.cs
@@ -0,0 +1,57 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Text {
+    using System.Text;
+    using System;
+    // A Decoder is used to decode a sequence of blocks of bytes into a
+    // sequence of blocks of characters. Following instantiation of a decoder,
+    // sequential blocks of bytes are converted into blocks of characters through
+    // calls to the GetChars method. The decoder maintains state between the
+    // conversions, allowing it to correctly decode byte sequences that span
+    // adjacent blocks.
+    //
+    // Instances of specific implementations of the Decoder abstract base
+    // class are typically obtained through calls to the GetDecoder method
+    // of Encoding objects.
+    //
+    //| <include path='docs/doc[@for="Decoder"]/*' />
+    public abstract class Decoder
+    {
+
+        //| <include path='docs/doc[@for="Decoder.Decoder"]/*' />
+        protected Decoder() {
+        }
+
+        // Returns the number of characters the next call to GetChars will
+        // produce if presented with the given range of bytes. The returned value
+        // takes into account the state in which the decoder was left following the
+        // last call to GetChars. The state of the decoder is not affected
+        // by a call to this method.
+        //
+        //| <include path='docs/doc[@for="Decoder.GetCharCount"]/*' />
+        public abstract int GetCharCount(byte[] bytes, int index, int count);
+
+        // Decodes a range of bytes in a byte array into a range of characters
+        // in a character array. The method decodes byteCount bytes from
+        // bytes starting at index byteIndex, storing the resulting
+        // characters in chars starting at index charIndex. The
+        // decoding takes into account the state in which the decoder was left
+        // following the last call to this method.
+        //
+        // An exception occurs if the character array is not large enough to
+        // hold the complete decoding of the bytes. The GetCharCount method
+        // can be used to determine the exact number of characters that will be
+        // produced for a given range of bytes. Alternatively, the
+        // GetMaxCharCount method of the Encoding that produced this
+        // decoder can be used to determine the maximum number of characters that
+        // will be produced for a given number of bytes, regardless of the actual
+        // byte values.
+        //
+        //| <include path='docs/doc[@for="Decoder.GetChars"]/*' />
+        public abstract int GetChars(byte[] bytes, int byteIndex, int byteCount,
+            char[] chars, int charIndex);
+    }
+}
diff --git a/base/Kernel/System/Text/Encoder.cs b/base/Kernel/System/Text/Encoder.cs
new file mode 100644
index 0000000..0ef5d16
--- /dev/null
+++ b/base/Kernel/System/Text/Encoder.cs
@@ -0,0 +1,62 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Text {
+    using System.Text;
+    using System;
+    // An Encoder is used to encode a sequence of blocks of characters into
+    // a sequence of blocks of bytes. Following instantiation of an encoder,
+    // sequential blocks of characters are converted into blocks of bytes through
+    // calls to the GetBytes method. The encoder maintains state between the
+    // conversions, allowing it to correctly encode character sequences that span
+    // adjacent blocks.
+    //
+    // Instances of specific implementations of the Encoder abstract base
+    // class are typically obtained through calls to the GetEncoder method
+    // of Encoding objects.
+    //
+    //| <include path='docs/doc[@for="Encoder"]/*' />
+    public abstract class Encoder
+    {
+        //| <include path='docs/doc[@for="Encoder.Encoder"]/*' />
+        protected Encoder() {
+            //A do-nothing constructor.
+        }
+
+        // Returns the number of bytes the next call to GetBytes will
+        // produce if presented with the given range of characters and the given
+        // value of the flush parameter. The returned value takes into
+        // account the state in which the encoder was left following the last call
+        // to GetBytes. The state of the encoder is not affected by a call
+        // to this method.
+        //
+        //| <include path='docs/doc[@for="Encoder.GetByteCount"]/*' />
+        public abstract int GetByteCount(char[] chars, int index, int count,
+            bool flush);
+
+        // Encodes a range of characters in a character array into a range of bytes
+        // in a byte array. The method encodes charCount characters from
+        // chars starting at index charIndex, storing the resulting
+        // bytes in bytes starting at index byteIndex. The encoding
+        // takes into account the state in which the encoder was left following the
+        // last call to this method. The flush parameter indicates whether
+        // the encoder should flush any shift-states and partial characters at the
+        // end of the conversion. To ensure correct termination of a sequence of
+        // blocks of encoded bytes, the last call to GetBytes should specify
+        // a value of true for the flush parameter.
+        //
+        // An exception occurs if the byte array is not large enough to hold the
+        // complete encoding of the characters. The GetByteCount method can
+        // be used to determine the exact number of bytes that will be produced for
+        // a given range of characters. Alternatively, the GetMaxByteCount
+        // method of the Encoding that produced this encoder can be used to
+        // determine the maximum number of bytes that will be produced for a given
+        // number of characters, regardless of the actual character values.
+        //
+        //| <include path='docs/doc[@for="Encoder.GetBytes"]/*' />
+        public abstract int GetBytes(char[] chars, int charIndex, int charCount,
+            byte[] bytes, int byteIndex, bool flush);
+    }
+}
diff --git a/base/Kernel/System/Text/Encoding.cs b/base/Kernel/System/Text/Encoding.cs
new file mode 100644
index 0000000..a6e11fe
--- /dev/null
+++ b/base/Kernel/System/Text/Encoding.cs
@@ -0,0 +1,471 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Text {
+
+    using System;
+    using System.Collections;
+    using System.Runtime.CompilerServices;
+    using System.Globalization;
+
+    // This abstract base class represents a character encoding. The class provides
+    // methods to convert arrays and strings of Unicode characters to and from
+    // arrays of bytes. A number of Encoding implementations are provided in
+    // the System.Text package, including:
+    //
+    // ASCIIEncoding, which encodes Unicode characters as single 7-bit
+    // ASCII characters. This encoding only supports character values between 0x00
+    // and 0x7F.
+    // UnicodeEncoding, which encodes each Unicode character as two
+    // consecutive bytes. Both little-endian (code page 1200) and big-endian (code
+    // page 1201) encodings are supported.
+    // UTF8Encoding, which encodes Unicode characters using the UTF-8
+    // encoding (UTF-8 stands for UCS Transformation Format, 8-bit form). This
+    // encoding supports all Unicode character values, and can also be accessed
+    // as code page 65001.
+    //
+    // In addition to directly instantiating Encoding objects, an
+    // application can use the ForCodePage, GetASCII,
+    // GetDefault, GetUnicode, and GetUTF8
+    // methods in this class to obtain encodings.
+    //
+    // Through an encoding, the GetBytes method is used to convert arrays
+    // of characters to arrays of bytes, and the GetChars method is used to
+    // convert arrays of bytes to arrays of characters. The GetBytes and
+    // GetChars methods maintain no state between conversions, and are
+    // generally intended for conversions of complete blocks of bytes and
+    // characters in one operation. When the data to be converted is only available
+    // in sequential blocks (such as data read from a stream) or when the amount of
+    // data is so large that it needs to be divided into smaller blocks, an
+    // application may choose to use a Decoder or an Encoder to
+    // perform the conversion. Decoders and encoders allow sequential blocks of
+    // data to be converted and they maintain the state required to support
+    // conversions of data that spans adjacent blocks. Decoders and encoders are
+    // obtained using the GetDecoder and GetEncoder methods.
+    //
+    // The core GetBytes and GetChars methods require the caller
+    // to provide the destination buffer and ensure that the buffer is large enough
+    // to hold the entire result of the conversion. When using these methods,
+    // either directly on an Encoding object or on an associated
+    // Decoder or Encoder, an application can use one of two methods
+    // to allocate destination buffers.
+    //
+    // The GetByteCount and GetCharCount methods can be used to
+    // compute the exact size of the result of a particular conversion, and an
+    // appropriately sized buffer for that conversion can then be allocated.
+    // The GetMaxByteCount and GetMaxCharCount methods can be
+    // be used to compute the maximum possible size of a conversion of a given
+    // number of bytes or characters, and a buffer of that size can then be reused
+    // for multiple conversions.
+    //
+    // The first method generally uses less memory, whereas the second method
+    // generally executes faster.
+    //
+    //| <include path='docs/doc[@for="Encoding"]/*' />
+    [RequiredByBartok]
+    public abstract class Encoding
+    {
+        private static Encoding unicodeEncoding;
+        private static Encoding bigEndianUnicode;
+        private static Encoding utf8Encoding;
+        private static Encoding asciiEncoding;
+        private static Hashtable encodings;
+
+        internal int m_codePage;
+
+        // Useful for Encodings whose GetPreamble method must return an
+        // empty byte array.
+        internal static readonly byte[] emptyByteArray = new byte[0];
+
+        //| <include path='docs/doc[@for="Encoding.Encoding"]/*' />
+        protected Encoding() : this(0) {
+        }
+
+        //| <include path='docs/doc[@for="Encoding.Encoding1"]/*' />
+        protected Encoding(int codePage) {
+            if (codePage<0) {
+                throw new ArgumentOutOfRangeException("codePage");
+            }
+            m_codePage = codePage;
+        }
+
+        // Converts a byte array from one encoding to another. The bytes in the
+        // bytes array are converted from srcEncoding to
+        // dstEncoding, and the returned value is a new byte array
+        // containing the result of the conversion.
+        //
+        //| <include path='docs/doc[@for="Encoding.Convert"]/*' />
+        public static byte[] Convert(Encoding srcEncoding, Encoding dstEncoding,
+                                     byte[] bytes) {
+            if (bytes==null)
+                throw new ArgumentNullException("bytes");
+            return Convert(srcEncoding, dstEncoding, bytes, 0, bytes.Length);
+        }
+
+        // Converts a range of bytes in a byte array from one encoding to another.
+        // This method converts count bytes from bytes starting at
+        // index index from srcEncoding to dstEncoding, and
+        // returns a new byte array containing the result of the conversion.
+        //
+        //| <include path='docs/doc[@for="Encoding.Convert1"]/*' />
+        public static byte[] Convert(Encoding srcEncoding, Encoding dstEncoding,
+                                     byte[] bytes, int index, int count) {
+            if (srcEncoding == null || dstEncoding == null) {
+                throw new ArgumentNullException((srcEncoding == null ? "srcEncoding" : "dstEncoding"),
+                                                "ArgumentNull_Array");
+            }
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                                                "ArgumentNull_Array");
+            }
+            return dstEncoding.GetBytes(srcEncoding.GetChars(bytes, index, count));
+        }
+
+        //| <include path='docs/doc[@for="Encoding.GetPreamble"]/*' />
+        public virtual byte[] GetPreamble()
+        {
+            return emptyByteArray;
+        }
+
+        // Returns an encoding for the ASCII character set. The returned encoding
+        // will be an instance of the ASCIIEncoding class.
+        //
+        //| <include path='docs/doc[@for="Encoding.ASCII"]/*' />
+        public static Encoding ASCII {
+            get {
+                if (asciiEncoding == null) asciiEncoding = new ASCIIEncoding();
+                return asciiEncoding;
+            }
+        }
+
+        // Returns the number of bytes required to encode the given character
+        // array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetByteCount"]/*' />
+        public virtual int GetByteCount(char[] chars) {
+            if (chars == null) {
+                throw new ArgumentNullException("chars",
+                                                "ArgumentNull_Array");
+            }
+            return GetByteCount(chars, 0, chars.Length);
+        }
+
+        //| <include path='docs/doc[@for="Encoding.GetByteCount2"]/*' />
+        public virtual int GetByteCount(String s)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            char[] chars = s.ToCharArray();
+            return GetByteCount(chars, 0, chars.Length);
+        }
+
+        // Returns the number of bytes required to encode a range of characters in
+        // a character array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetByteCount1"]/*' />
+        public abstract int GetByteCount(char[] chars, int index, int count);
+
+        // Returns a byte array containing the encoded representation of the given
+        // character array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetBytes"]/*' />
+        public virtual byte[] GetBytes(char[] chars) {
+            if (chars == null) {
+                throw new ArgumentNullException("chars",
+                                                "ArgumentNull_Array");
+            }
+            return GetBytes(chars, 0, chars.Length);
+        }
+
+        // Returns a byte array containing the encoded representation of a range
+        // of characters in a character array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetBytes1"]/*' />
+        public virtual byte[] GetBytes(char[] chars, int index, int count) {
+            byte[] result = new byte[GetByteCount(chars, index, count)];
+            GetBytes(chars, index, count, result, 0);
+            return result;
+        }
+
+        // Encodes a range of characters in a character array into a range of bytes
+        // in a byte array. An exception occurs if the byte array is not large
+        // enough to hold the complete encoding of the characters. The
+        // GetByteCount method can be used to determine the exact number of
+        // bytes that will be produced for a given range of characters.
+        // Alternatively, the GetMaxByteCount method can be used to
+        // determine the maximum number of bytes that will be produced for a given
+        // number of characters, regardless of the actual character values.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetBytes2"]/*' />
+        public abstract int GetBytes(char[] chars, int charIndex, int charCount,
+                                     byte[] bytes, int byteIndex);
+
+        // Returns a byte array containing the encoded representation of the given
+        // string.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetBytes3"]/*' />
+        public virtual byte[] GetBytes(String s) {
+            if (s == null) {
+                throw new ArgumentNullException("s",
+                                                "ArgumentNull_String");
+            }
+            char[] chars = s.ToCharArray();
+            return GetBytes(chars, 0, chars.Length);
+        }
+
+        //| <include path='docs/doc[@for="Encoding.GetBytes4"]/*' />
+        public virtual int GetBytes(String s, int charIndex, int charCount,
+                                    byte[] bytes, int byteIndex)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+            return GetBytes(s.ToCharArray(), charIndex, charCount, bytes, byteIndex);
+        }
+
+        // Returns the number of characters produced by decoding the given byte
+        // array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetCharCount"]/*' />
+        public virtual int GetCharCount(byte[] bytes) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                                                "ArgumentNull_Array");
+            }
+            return GetCharCount(bytes, 0, bytes.Length);
+        }
+
+        // Returns the number of characters produced by decoding a range of bytes
+        // in a byte array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetCharCount1"]/*' />
+        public abstract int GetCharCount(byte[] bytes, int index, int count);
+
+        // Returns a character array containing the decoded representation of a
+        // given byte array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetChars"]/*' />
+        public virtual char[] GetChars(byte[] bytes) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                                                "ArgumentNull_Array");
+            }
+            return GetChars(bytes, 0, bytes.Length);
+        }
+
+        // Returns a character array containing the decoded representation of a
+        // range of bytes in a byte array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetChars1"]/*' />
+        public virtual char[] GetChars(byte[] bytes, int index, int count) {
+            char[] result = new char[GetCharCount(bytes, index, count)];
+            GetChars(bytes, index, count, result, 0);
+            return result;
+        }
+
+        // Decodes a range of bytes in a byte array into a range of characters in a
+        // character array. An exception occurs if the character array is not large
+        // enough to hold the complete decoding of the bytes. The
+        // GetCharCount method can be used to determine the exact number of
+        // characters that will be produced for a given range of bytes.
+        // Alternatively, the GetMaxCharCount method can be used to
+        // determine the maximum number of characters that will be produced for a
+        // given number of bytes, regardless of the actual byte values.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetChars2"]/*' />
+        public abstract int GetChars(byte[] bytes, int byteIndex, int byteCount,
+                                     char[] chars, int charIndex);
+
+        // Returns a Decoder object for this encoding. The returned object
+        // can be used to decode a sequence of bytes into a sequence of characters.
+        // Contrary to the GetChars family of methods, a Decoder can
+        // convert partial sequences of bytes into partial sequences of characters
+        // by maintaining the appropriate state between the conversions.
+        //
+        // This default implementation returns a Decoder that simply
+        // forwards calls to the GetCharCount and GetChars methods to
+        // the corresponding methods of this encoding. Encodings that require state
+        // to be maintained between successive conversions should override this
+        // method and return an instance of an appropriate Decoder
+        // implementation.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetDecoder"]/*' />
+        public virtual Decoder GetDecoder() {
+            return new DefaultDecoder(this);
+        }
+
+        // Returns an encoding for the system's current ANSI code page.
+        // Singularity always defaults to UTF8 encoding.
+        //
+        //| <include path='docs/doc[@for="Encoding.Default"]/*' />
+        public static Encoding Default {
+            get {
+                return UTF8;
+            }
+        }
+
+        // Returns an Encoder object for this encoding. The returned object
+        // can be used to encode a sequence of characters into a sequence of bytes.
+        // Contrary to the GetBytes family of methods, an Encoder can
+        // convert partial sequences of characters into partial sequences of bytes
+        // by maintaining the appropriate state between the conversions.
+        //
+        // This default implementation returns an Encoder that simply
+        // forwards calls to the GetByteCount and GetBytes methods to
+        // the corresponding methods of this encoding. Encodings that require state
+        // to be maintained between successive conversions should override this
+        // method and return an instance of an appropriate Encoder
+        // implementation.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetEncoder"]/*' />
+        public virtual Encoder GetEncoder() {
+            return new DefaultEncoder(this);
+        }
+
+        // Returns the maximum number of bytes required to encode a given number of
+        // characters. This method can be used to determine an appropriate buffer
+        // size for byte arrays passed to the GetBytes method of this
+        // encoding or the GetBytes method of an Encoder for this
+        // encoding. All encodings must guarantee that no buffer overflow
+        // exceptions will occur if buffers are sized according to the results of
+        // this method.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetMaxByteCount"]/*' />
+        public abstract int GetMaxByteCount(int charCount);
+
+        // Returns the maximum number of characters produced by decoding a given
+        // number of bytes. This method can be used to determine an appropriate
+        // buffer size for character arrays passed to the GetChars method of
+        // this encoding or the GetChars method of a Decoder for this
+        // encoding. All encodings must guarantee that no buffer overflow
+        // exceptions will occur if buffers are sized according to the results of
+        // this method.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetMaxCharCount"]/*' />
+        public abstract int GetMaxCharCount(int byteCount);
+
+        // Returns a string containing the decoded representation of a given byte
+        // array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetString"]/*' />
+        public virtual String GetString(byte[] bytes) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                                                "ArgumentNull_Array");
+            }
+            return new String(GetChars(bytes));
+        }
+
+        // Returns a string containing the decoded representation of a range of
+        // bytes in a byte array.
+        //
+        //| <include path='docs/doc[@for="Encoding.GetString1"]/*' />
+        public virtual String GetString(byte[] bytes, int index, int count) {
+            return new String(GetChars(bytes, index, count));
+        }
+
+        // Returns an encoding for Unicode format. The returned encoding will be
+        // an instance of the UnicodeEncoding class.
+        //
+        // It will use little endian byte order, but will detect
+        // input in big endian if it finds a byte order mark
+        // (see Unicode 2.0 spec).
+        //
+        //| <include path='docs/doc[@for="Encoding.Unicode"]/*' />
+        public static Encoding Unicode {
+            get {
+                if (unicodeEncoding == null)
+                    unicodeEncoding = new UnicodeEncoding(false, true);
+                return unicodeEncoding;
+            }
+        }
+
+        // Returns an encoding for Unicode format. The returned encoding will be
+        // an instance of the UnicodeEncoding class.
+        //
+        // It will use big endian byte order, but will detect
+        // input in little endian if it finds a byte order mark
+        // (see Unicode 2.0 spec).
+        //
+        //| <include path='docs/doc[@for="Encoding.BigEndianUnicode"]/*' />
+        public static Encoding BigEndianUnicode {
+            get {
+                if (bigEndianUnicode == null)
+                    bigEndianUnicode = new UnicodeEncoding(true, true);
+                return bigEndianUnicode;
+            }
+        }
+
+        // Returns an encoding for the UTF-8 format. The returned encoding will be
+        // an instance of the UTF8Encoding class.
+        //
+        //| <include path='docs/doc[@for="Encoding.UTF8"]/*' />
+        public static Encoding UTF8 {
+            get {
+                if (utf8Encoding == null)
+                    utf8Encoding = new UTF8Encoding(true);
+                return utf8Encoding;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Encoding.Equals"]/*' />
+        public override bool Equals(Object value) {
+            Encoding enc = value as Encoding;
+            if (enc != null)
+                return (m_codePage == enc.m_codePage);
+            return (false);
+        }
+
+        //| <include path='docs/doc[@for="Encoding.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return m_codePage;
+        }
+
+        // Default decoder implementation. The GetCharCount and
+        // GetChars methods simply forward to the corresponding methods of
+        // the encoding. This implementation is appropriate for encodings that do
+        // not require state to be maintained between successive conversions.
+        private class DefaultDecoder : Decoder
+        {
+            private Encoding encoding;
+
+            public DefaultDecoder(Encoding encoding) {
+                this.encoding = encoding;
+            }
+
+            public override int GetCharCount(byte[] bytes, int index, int count) {
+                return encoding.GetCharCount(bytes, index, count);
+            }
+
+            public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+                                         char[] chars, int charIndex) {
+                return encoding.GetChars(bytes, byteIndex, byteCount,
+                                         chars, charIndex);
+            }
+        }
+
+        // Default encoder implementation. The GetByteCount and
+        // GetBytes methods simply forward to the corresponding methods of
+        // the encoding. This implementation is appropriate for encodings that do
+        // not require state to be maintained between successive conversions.
+        private class DefaultEncoder : Encoder
+        {
+            private Encoding encoding;
+
+            public DefaultEncoder(Encoding encoding) {
+                this.encoding = encoding;
+            }
+
+            public override int GetByteCount(char[] chars, int index, int count, bool flush) {
+                return encoding.GetByteCount(chars, index, count);
+            }
+
+            public override int GetBytes(char[] chars, int charIndex, int charCount,
+                                         byte[] bytes, int byteIndex, bool flush) {
+                return encoding.GetBytes(chars, charIndex, charCount,
+                                         bytes, byteIndex);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regex.cs b/base/Kernel/System/Text/RegularExpressions/regex.cs
new file mode 100644
index 0000000..69d6df4
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regex.cs
@@ -0,0 +1,1207 @@
+//------------------------------------------------------------------------------
+// <copyright file="Regex.cs" company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// The Regex class represents a single compiled instance of a regular
+// expression.
+//
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System;
+    using System.Threading;
+    using System.Collections;
+    //using System.Runtime.Serialization;
+    //using System.Reflection;
+    //using System.Reflection.Emit;
+    using System.Globalization;
+
+    //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Represents an immutable, compiled regular expression. Also
+    ///       contains static methods that allow use of regular expressions without instantiating
+    ///       a Regex explicitly.
+    ///    </para>
+    /// </devdoc>
+    //[ Serializable() ]
+    public class Regex {//: ISerializable {
+
+        // Fields used by precompiled regexes
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.pattern"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal string pattern;
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.factory"]/*' />
+#if false
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal RegexRunnerFactory factory;       // if compiled, this is the RegexRunner subclass
+#endif
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.roptions"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal RegexOptions roptions;            // the top-level options from the options string
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.caps"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal Hashtable caps;                   // if captures are sparse, this is the hashtable capnum->index
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.capnames"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal Hashtable capnames;               // if named captures are used, this maps names->index
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.capslist"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal String[]  capslist;               // if captures are sparse or named captures are used, this is the sorted list of names
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.capsize"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        protected internal int       capsize;                // the size of the capture array
+
+        internal  ExclusiveReference runnerref;              // cached runner
+        internal  SharedReference    replref;                // cached parsed replacement pattern
+        internal  RegexCode          code;                   // if interpreted, this is the code for RegexIntepreter
+        internal  CachedCodeEntry    cachedentry;
+        internal  bool refsInitialized = false;
+
+        internal static Hashtable livecode = new Hashtable();// the cached of code and factories that are currently loaded
+
+        internal const int MaxOptionShift = 10;
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Regex2"]/*' />
+        protected Regex() {
+        }
+
+        // Compiles and returns a Regex object corresponding to the given pattern
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Regex"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Creates and compiles a regular expression object for the specified regular
+        ///       expression.
+        ///    </para>
+        /// </devdoc>
+        public Regex(String pattern) : this(pattern, RegexOptions.None) {
+        }
+
+        // Returns a Regex object corresponding to the given pattern, compiled with
+        // the specified options.
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Regex1"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Creates and compiles a regular expression object for the
+        ///       specified regular expression
+        ///       with options that modify the pattern.
+        ///    </para>
+        /// </devdoc>
+        public Regex(String pattern, RegexOptions options) {
+            RegexTree tree;
+            CachedCodeEntry cached;
+
+            if (pattern == null)
+                throw new ArgumentNullException("pattern");
+
+
+            if (options < RegexOptions.None || ( ((int) options) >> MaxOptionShift) != 0)
+                throw new ArgumentOutOfRangeException("options");
+            if ((options &   RegexOptions.ECMAScript) != 0
+             && (options & ~(RegexOptions.ECMAScript | RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.Compiled
+#if DBG
+                           | RegexOptions.Debug
+#endif
+                                               )) != 0)
+                throw new ArgumentOutOfRangeException("options");
+
+            //XXX: String key = ((int) options).ToString(NumberFormatInfo.InvariantInfo) + ":" + pattern;
+            String key = ((int) options).ToString() + ":" + pattern;
+
+#if REGEX_USE_CACHE
+            cached = LookupCached(key);
+#else
+            cached = null;
+#endif
+            this.pattern = pattern;
+            this.roptions = options;
+
+            if (cached == null) {
+                // Parse the input
+                tree = RegexParser.Parse(pattern, roptions);
+
+                // Extract the relevant information
+                capnames   = tree._capnames;
+                capslist   = tree._capslist;
+                code       = RegexWriter.Write(tree);
+                caps       = code._caps;
+                capsize    = code._capsize;
+
+                InitializeReferences();
+
+                tree = null;
+#if REGEX_USE_CACHE
+                cachedentry= CacheCode(key);
+#endif
+            }
+            else {
+                caps       = cached._caps;
+                capnames   = cached._capnames;
+                capslist   = cached._capslist;
+                capsize    = cached._capsize;
+                code       = cached._code;
+//                factory    = cached._factory;
+                runnerref  = cached._runnerref;
+                replref    = cached._replref;
+                refsInitialized = true;
+
+                cachedentry     = cached;
+            }
+/*
+ * Singularity does not support compilation of regular expressions
+            // if the compile option is set, then compile the code if it's not already
+            if (UseOptionC() && factory == null) {
+                factory = Compile(code, roptions);
+                cachedentry.AddCompiled(factory);
+                code = null;
+            }
+            */
+        }
+/*
+        //  ISerializable constructor
+        private Regex(SerializationInfo info, StreamingContext context) : this(info.GetString("pattern"), (RegexOptions) info.GetInt32("options")) {
+        }
+
+        //  ISerializable method
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.ISerializable.GetObjectData"]/*' />
+        /// <internalonly/>
+        void ISerializable.GetObjectData(SerializationInfo si, StreamingContext context) {
+            si.AddValue("pattern", this.ToString());
+            si.AddValue("options", this.Options);
+        }
+       // This method is here for perf reasons: if the call to RegexCompiler is NOT in the
+       // Regex constructor, we don't load RegexCompiler and its reflection classes when
+       // instantiating a non-compiled regex
+       // This method is internal virtual so the jit does not inline it.
+        internal virtual RegexRunnerFactory Compile(RegexCode code, RegexOptions roptions) {
+            return RegexCompiler.Compile(code, roptions);
+        }
+*/
+        // No refs -> we can release our ref on the cached code
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Finalize"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        ~Regex() {
+            UncacheCode();
+        }
+
+        // Escape metacharacters within the string
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Escape"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Escapes
+        ///          a minimal set of metacharacters (\, *, +, ?, |, {, [, (, ), ^, $, ., #, and
+        ///          whitespace) by replacing them with their \ codes. This converts a string so that
+        ///          it can be used as a constant within a regular expression safely. (Note that the
+        ///          reason # and whitespace must be escaped is so the string can be used safely
+        ///          within an expression parsed with x mode. If future Regex features add
+        ///          additional metacharacters, developers should depend on Escape to escape those
+        ///          characters as well.)
+        ///       </para>
+        ///    </devdoc>
+        public static String Escape(String str) {
+            if (str==null)
+                throw new ArgumentNullException("str");
+
+            return RegexParser.Escape(str);
+        }
+
+        // Unescape character codes within the string
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Unescape"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Unescapes any escaped characters in the input string.
+        ///    </para>
+        /// </devdoc>
+        public static String Unescape(String str) {
+            if (str==null)
+                throw new ArgumentNullException("str");
+
+            return RegexParser.Unescape(str);
+        }
+
+        // True if the regex is leftward
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.RightToLeft"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Indicates whether the regular expression matches from right to
+        ///       left.
+        ///    </para>
+        /// </devdoc>
+        public bool RightToLeft {
+            get {
+                return UseOptionR();
+            }
+        }
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.ToString"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the regular expression pattern passed into the constructor
+        ///    </para>
+        /// </devdoc>
+        public override string ToString() {
+            return pattern;
+        }
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Options"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the options passed into the constructor
+        ///    </para>
+        /// </devdoc>
+        public RegexOptions Options {
+            get { return roptions;}
+        }
+
+        // Returns an array of the group names that are used to capture groups
+        // in the regular expression. Only needed if the regex is not known until
+        // runtime, and one wants to extract captured groups. (Probably unusual,
+        // but supplied for completeness.)
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.GetGroupNames"]/*' />
+        /// <devdoc>
+        ///    Returns
+        ///       the GroupNameCollection for the regular expression. This collection contains the
+        ///       set of strings used to name capturing groups in the expression.
+        ///    </devdoc>
+        public String[] GetGroupNames() {
+            String[] result;
+
+            if (capslist == null) {
+                int max = capsize;
+                result = new String[max];
+
+                for (int i = 0; i < max; i++) {
+                    result[i] = i.ToString(); //Convert.ToString(i);
+                }
+            }
+            else {
+                result = new String[capslist.Length];
+
+                System.Array.Copy(capslist, 0, result, 0, capslist.Length);
+            }
+
+            return result;
+        }
+
+        // Returns an array of the group numbers that are used to capture groups
+        // in the regular expression. Only needed if the regex is not known until
+        // runtime, and one wants to extract captured groups. (Probably unusual,
+        // but supplied for completeness.)
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.GetGroupNumbers"]/*' />
+        /// <devdoc>
+        ///    returns
+        ///       the integer group number corresponding to a group name.
+        ///    </devdoc>
+        public int[] GetGroupNumbers() {
+            int[] result;
+
+            if (caps == null) {
+                int max = capsize;
+                result = new int[max];
+
+                for (int i = 0; i < max; i++) {
+                    result[i] = i;
+                }
+            }
+            else {
+                result = new int[caps.Count];
+
+                IDictionaryEnumerator de = caps.GetEnumerator();
+                while (de.MoveNext()) {
+                    result[(int)de.Value] = (int)de.Key;
+                }
+            }
+
+            return result;
+        }
+
+        // Given a group number, maps it to a group name. Note that numbered
+        // groups automatically get a group name that is the decimal string
+        // equivalent of its number.
+        //
+        // Returns null if the number is not a recognized group number.
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.GroupNameFromNumber"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Retrieves a group name that corresponds to a group number.
+        ///    </para>
+        /// </devdoc>
+        public String GroupNameFromNumber(int i) {
+            if (capslist == null) {
+                if (i >= 0 && i < capsize)
+                    return i.ToString();
+
+                return String.Empty;
+            }
+            else {
+                if (caps != null) {
+                    Object obj = caps[i];
+                    if (obj == null)
+                        return String.Empty;
+
+                    i = (int)obj;
+                }
+
+                if (i >= 0 && i < capslist.Length)
+                    return capslist[i];
+
+                return String.Empty;
+            }
+        }
+
+        // Given a group name, maps it to a group number. Note that numbered
+        // groups automatically get a group name that is the decimal string
+        // equivalent of its number.
+        //
+        // Returns -1 if the name is not a recognized group name.
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.GroupNumberFromName"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns a group number that corresponds to a group name.
+        ///    </para>
+        /// </devdoc>
+        public int GroupNumberFromName(String name) {
+            int result = -1;
+
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            // look up name if we have a hashtable of names
+            if (capnames != null) {
+                Object ret = capnames[name];
+
+                if (ret == null)
+                    return -1;
+
+                return(int)ret;
+            }
+
+            // convert to an int if it looks like a number
+            result = 0;
+            for (int i = 0; i < name.Length; i++) {
+                char ch = name[i];
+
+                if (ch > '9' || ch < '0')
+                    return -1;
+
+                result *= 10;
+                result += (ch - '0');
+            }
+
+            // return int if it's in range
+            if (result >= 0 && result < capsize)
+                return result;
+
+            return -1;
+        }
+
+        // Static version of simple IsMatch call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.IsMatch"]/*' />
+        ///    <devdoc>
+        ///       <para>
+        ///          Searches the input
+        ///             string for one or more occurrences of the text supplied in the pattern
+        ///             parameter.
+        ///       </para>
+        ///    </devdoc>
+        public static bool IsMatch(String input, String pattern) {
+            return new Regex(pattern).IsMatch(input);
+        }
+
+        // Static version of simple IsMatch call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.IsMatch1"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Searches the input string for one or more occurrences of the text
+        ///          supplied in the pattern parameter with matching options supplied in the options
+        ///          parameter.
+        ///       </para>
+        ///    </devdoc>
+        public static bool IsMatch(String input, String pattern, RegexOptions options) {
+            return new Regex(pattern, options).IsMatch(input);
+        }
+
+        // Returns true if the regex finds a match within the specified string
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.IsMatch2"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Searches the input string for one or
+        ///          more matches using the previous pattern, options, and starting
+        ///          position.
+        ///       </para>
+        ///    </devdoc>
+        public bool IsMatch(String input) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return(null == Run(true, -1, input, 0, input.Length, UseOptionR() ? input.Length : 0));
+        }
+
+        // Returns true if the regex finds a match after the specified position
+        // (proceeding leftward if the regex is leftward and rightward otherwise)
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.IsMatch3"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Searches the input
+        ///          string for one or more matches using the previous pattern and options, with
+        ///          a new starting position.
+        ///    </para>
+        /// </devdoc>
+        public bool IsMatch(String input, int startat) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return(null == Run(true, -1, input, 0, input.Length, startat));
+        }
+
+        // Static version of simple Match call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Match"]/*' />
+        ///    <devdoc>
+        ///       <para>
+        ///          Searches the input string for one or more occurrences of the text
+        ///             supplied in the pattern parameter.
+        ///       </para>
+        ///    </devdoc>
+        public static Match Match(String input, String pattern) {
+            return new Regex(pattern).Match(input);
+        }
+
+        // Static version of simple Match call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Match1"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Searches the input string for one or more occurrences of the text
+        ///          supplied in the pattern parameter. Matching is modified with an option
+        ///          string.
+        ///       </para>
+        ///    </devdoc>
+        public static Match Match(String input, String pattern, RegexOptions options) {
+            return new Regex(pattern, options).Match(input);
+        }
+
+        // Finds the first match for the regular expression starting at the beginning
+        // of the string (or at the end of the string if the regex is leftward)
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Match2"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Matches a regular expression with a string and returns
+        ///       the precise result as a RegexMatch object.
+        ///    </para>
+        /// </devdoc>
+        public Match Match(String input) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return Run(false, -1, input, 0, input.Length, UseOptionR() ? input.Length : 0);
+        }
+
+        // Finds the first match, starting at the specified position
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Match3"]/*' />
+        /// <devdoc>
+        ///    Matches a regular expression with a string and returns
+        ///    the precise result as a RegexMatch object.
+        /// </devdoc>
+        public Match Match(String input, int startat) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return Run(false, -1, input, 0, input.Length, startat);
+        }
+
+        // Finds the first match, restricting the search to the specified interval of
+        // the char array.
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Match4"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Matches a
+        ///       regular expression with a string and returns the precise result as a
+        ///       RegexMatch object.
+        ///    </para>
+        /// </devdoc>
+        public Match Match(String input, int beginning, int length) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return Run(false, -1, input, beginning, length, UseOptionR() ? beginning + length : beginning);
+        }
+
+        // Static version of simple Matches call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Matches"]/*' />
+        ///    <devdoc>
+        ///       <para>
+        ///          Returns all the successful matches as if Match were
+        ///          called iteratively numerous times.
+        ///       </para>
+        ///    </devdoc>
+        public static MatchCollection Matches(String input, String pattern) {
+            return new Regex(pattern).Matches(input);
+        }
+
+        // Static version of simple Matches call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Matches1"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns all the successful matches as if Match were called iteratively
+        ///       numerous times.
+        ///    </para>
+        /// </devdoc>
+        public static MatchCollection Matches(String input, String pattern, RegexOptions options) {
+            return new Regex(pattern, options).Matches(input);
+        }
+
+        // Finds the first match for the regular expression starting at the beginning
+        // of the string Enumerator(or at the end of the string if the regex is leftward)
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Matches2"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns
+        ///       all the successful matches as if Match was called iteratively numerous
+        ///       times.
+        ///    </para>
+        /// </devdoc>
+        public MatchCollection Matches(String input) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return new MatchCollection(this, input, 0, input.Length, UseOptionR() ? input.Length : 0);
+        }
+
+        // Finds the first match, starting at the specified position
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Matches3"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns
+        ///       all the successful matches as if Match was called iteratively numerous
+        ///       times.
+        ///    </para>
+        /// </devdoc>
+        public MatchCollection Matches(String input, int startat) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return new MatchCollection(this, input, 0, input.Length, startat);
+        }
+
+        // Static version of simple Replace call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Replaces
+        ///          all occurrences of the pattern with the <paramref name="replacement"/> pattern, starting at
+        ///          the first character in the input string.
+        ///       </para>
+        ///    </devdoc>
+        public static String Replace(String input, String pattern, String replacement) {
+            return new Regex(pattern).Replace(input, replacement);
+        }
+
+        // Static version of simple Replace call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace1"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Replaces all occurrences of
+        ///          the <paramref name="pattern "/>with the <paramref name="replacement "/>
+        ///          pattern, starting at the first character in the input string.
+        ///       </para>
+        ///    </devdoc>
+        public static String Replace(String input, String pattern, String replacement, RegexOptions options) {
+            return new Regex(pattern, options).Replace(input, replacement);
+        }
+
+        // Does the replacement
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace2"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Replaces all occurrences of
+        ///          the <paramref name="pattern "/> with the <paramref name="replacement"/> pattern, starting at the
+        ///          first character in the input string, using the previous patten.
+        ///       </para>
+        ///    </devdoc>
+        public String Replace(String input, String replacement) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return Replace(input, replacement, -1, UseOptionR() ? input.Length : 0);
+        }
+
+        // Does the replacement
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace3"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the (previously defined) <paramref name="pattern "/>with the
+        ///    <paramref name="replacement"/> pattern, starting at the first character in the input string.
+        /// </para>
+        /// </devdoc>
+        public String Replace(String input, String replacement, int count) {
+            if (input == null)
+                throw new ArgumentNullException("input");
+
+            return Replace(input, replacement, count, UseOptionR() ? input.Length : 0);
+        }
+
+        // Does the replacement
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace4"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the <paramref name="pattern "/>with the recent
+        ///    <paramref name="replacement"/> pattern, starting at the character position
+        ///    <paramref name="startat."/>
+        /// </para>
+        /// </devdoc>
+        public String Replace(String input, String replacement, int count, int startat) {
+            RegexReplacement repl;
+
+            if (input == null)
+                throw new ArgumentNullException("input");
+            if (replacement == null)
+                throw new ArgumentNullException("replacement");
+
+            // a little code to grab a cached parsed replacement object
+            repl = (RegexReplacement)replref.Get();
+
+            if (repl == null || !repl.Pattern.Equals(replacement)) {
+                repl = RegexParser.ParseReplacement(replacement, caps, capsize, capnames, this.roptions);
+                replref.Cache(repl);
+            }
+
+            return repl.Replace(this, input, count, startat);
+        }
+
+        // Static version of simple Replace call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace5"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the <paramref name="pattern "/>with the
+        ///    <paramref name="replacement"/> pattern
+        ///    <paramref name="."/>
+        /// </para>
+        /// </devdoc>
+        public static String Replace(String input, String pattern, MatchEvaluator evaluator) {
+            return new Regex(pattern).Replace(input, evaluator);
+        }
+
+        // Static version of simple Replace call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace6"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the <paramref name="pattern "/>with the recent
+        ///    <paramref name="replacement"/> pattern, starting at the first character<paramref name="."/>
+        /// </para>
+        /// </devdoc>
+        public static String Replace(String input, String pattern, MatchEvaluator evaluator, RegexOptions options) {
+            return new Regex(pattern, options).Replace(input, evaluator);
+        }
+
+        // Does the replacement
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace7"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the <paramref name="pattern "/>with the recent
+        ///    <paramref name="replacement"/> pattern, starting at the first character
+        ///    position<paramref name="."/>
+        /// </para>
+        /// </devdoc>
+        public String Replace(String input, MatchEvaluator evaluator) {
+            if (input==null)
+                throw new ArgumentNullException("input");
+
+            return Replace(input, evaluator, -1, UseOptionR() ? input.Length : 0);
+        }
+
+        // Does the replacement
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace8"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the <paramref name="pattern "/>with the recent
+        ///    <paramref name="replacement"/> pattern, starting at the first character
+        ///    position<paramref name="."/>
+        /// </para>
+        /// </devdoc>
+        public String Replace(String input, MatchEvaluator evaluator, int count) {
+            if (input==null)
+                throw new ArgumentNullException("input");
+
+            return Replace(input, evaluator, count, UseOptionR() ? input.Length : 0);
+        }
+
+        // Does the replacement
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Replace9"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///    Replaces all occurrences of the (previously defined) <paramref name="pattern "/>with
+        ///       the recent <paramref name="replacement"/> pattern, starting at the character
+        ///    position<paramref name=" startat."/>
+        /// </para>
+        /// </devdoc>
+        public String Replace(String input, MatchEvaluator evaluator, int count, int startat) {
+            if (input==null)
+                throw new ArgumentNullException("input");
+
+            return RegexReplacement.Replace(evaluator, this, input, count, startat);
+        }
+
+        // Static version of simple Split call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Split"]/*' />
+        ///    <devdoc>
+        ///       <para>
+        ///          Splits the <paramref name="input "/>string at the position defined
+        ///          by <paramref name="pattern"/>.
+        ///       </para>
+        ///    </devdoc>
+        public static String[] Split(String input, String pattern) {
+            return new Regex(pattern).Split(input);
+        }
+
+        // Static version of simple Split call
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Split1"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Splits the <paramref name="input "/>string at the position defined by <paramref name="pattern"/>.
+        ///    </para>
+        /// </devdoc>
+        public static String[] Split(String input, String pattern, RegexOptions options) {
+            return new Regex(pattern, options).Split(input);
+        }
+
+        // Does a split
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Split2"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Splits the <paramref name="input "/>string at the position defined by
+        ///       a previous <paramref name="pattern"/>
+        ///       .
+        ///    </para>
+        /// </devdoc>
+        public String[] Split(String input) {
+            if (input==null)
+                throw new ArgumentNullException("input");
+
+            return Split(input, 0, UseOptionR() ? input.Length : 0);
+        }
+
+        // Does a split
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Split3"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Splits the <paramref name="input "/>string at the position defined by a previous
+        ///    <paramref name="pattern"/> .
+        ///    </para>
+        /// </devdoc>
+        public String[] Split(String input, int count) {
+            if (input==null)
+                throw new ArgumentNullException("input");
+
+            return RegexReplacement.Split(this, input, count, UseOptionR() ? input.Length : 0);
+        }
+
+        // Does a split
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Split4"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Splits the <paramref name="input "/>string at the position defined by a previous
+        ///    <paramref name="pattern"/> .
+        ///    </para>
+        /// </devdoc>
+        public String[] Split(String input, int count, int startat) {
+            if (input==null)
+                throw new ArgumentNullException("input");
+
+            return RegexReplacement.Split(this, input, count, startat);
+        }
+
+#if COMPILE
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.CompileToAssembly"]/*' />
+        /// <devdoc>
+        /// </devdoc>
+        public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname) {
+            CompileToAssembly(regexinfos, assemblyname, null, null);
+        }
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.CompileToAssembly1"]/*' />
+        /// <devdoc>
+        /// </devdoc>
+        public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes) {
+            CompileToAssembly(regexinfos, assemblyname, attributes, null);
+        }
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.CompileToAssembly2"]/*' />
+        public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes, String resourceFile) {
+            if (assemblyname == null)
+                throw new ArgumentNullException("assemblyname");
+
+            if (regexinfos == null)
+                throw new ArgumentNullException("regexinfos");
+
+            RegexCompiler.CompileToAssembly(regexinfos, assemblyname, attributes, resourceFile);
+        }
+#endif
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.InitializeReferences"]/*' />
+        /// <devdoc>
+        /// </devdoc>
+        protected void InitializeReferences() {
+            if (refsInitialized)
+                throw new NotSupportedException("Only Allowed Once");//XXX: SR.GetString(SR.OnlyAllowedOnce));
+
+            refsInitialized = true;
+            runnerref  = new ExclusiveReference();
+            replref    = new SharedReference();
+        }
+
+        // Internal worker called by all the public APIs
+        internal Match Run(bool quick, int prevlen, String input, int beginning, int length, int startat) {
+            Match match;
+            RegexRunner runner = null;
+
+            if (startat < 0 || startat > input.Length)
+                throw new ArgumentOutOfRangeException("start", ""); //XXX: SR.GetString(SR.BeginIndexNotNegative));
+
+            if (length < 0 || length > input.Length)
+                throw new ArgumentOutOfRangeException("length", ""); //XXX: SR.GetString(SR.LengthNotNegative));
+
+            // There may be a cached runner; grab ownership of it if we can.
+
+            runner = (RegexRunner)runnerref.Get();
+
+            // Create a RegexRunner instance if we need to
+
+            if (runner == null) {
+                // Use the compiled RegexRunner factory if the code was compiled to MSIL
+
+//                if (factory != null)
+//                    runner = factory.CreateInstance();
+//                else
+                    runner = new RegexInterpreter(code, UseOptionInvariant() ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture);
+            }
+
+            // Do the scan starting at the requested position
+
+            match = runner.Scan(this, input, beginning, beginning + length, startat, prevlen, quick);
+
+            // Release or fill the cache slot
+
+            runnerref.Release(runner);
+
+#if DBG
+            if (UseOptionDebug())
+                match.Dump();
+#endif
+            return match;
+        }
+
+        // Find code cache based on options+pattern
+        private static CachedCodeEntry LookupCached(String key) {
+            CachedCodeEntry cached;
+
+            lock (livecode) {
+                cached = (CachedCodeEntry)livecode[key];
+                if (cached != null)
+                    cached.AddRef();
+            }
+
+            return cached;
+        }
+
+        // Add current code to the cache
+        private CachedCodeEntry CacheCode(String key) {
+            CachedCodeEntry newcached;
+
+            newcached = new CachedCodeEntry(roptions, capnames, capslist, code, caps, capsize, runnerref, replref);
+
+            lock (livecode) {
+                livecode[key] = newcached;
+            }
+
+            return newcached;
+        }
+
+        // Release current code (and remove from cache if last ref)
+        private void UncacheCode() {
+            // Note that cachedentry can be null if the constructor never
+            // completed because of an exception. The finalizer can
+            // still be called.
+
+            if (cachedentry == null)
+                return;
+
+            cachedentry.Release();
+            //XXX: String key = ((int) roptions).ToString(NumberFormatInfo.InvariantInfo) + ":" + pattern;
+
+            String key = ((int) roptions).ToString() + ":" + pattern;
+
+            if (cachedentry.NoReferences()) {
+                lock (livecode) {
+                    if (cachedentry.NoReferences()) {
+                        if (livecode[key] == cachedentry)
+                            livecode.Remove(key);
+                    }
+                }
+            }
+        }
+
+        // True if the O option was set
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.UseOptionC"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        protected bool UseOptionC() {
+            return(roptions & RegexOptions.Compiled) != 0;
+        }
+
+        // True if the L option was set
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.UseOptionR"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        protected bool UseOptionR() {
+            return(roptions & RegexOptions.RightToLeft) != 0;
+        }
+
+        internal bool UseOptionInvariant() {
+            return(roptions & RegexOptions.CultureInvariant) != 0;
+        }
+
+
+#if DBG
+        // True if the regex has debugging enabled
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Debug"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        public virtual bool Debug {
+            get {
+                return UseOptionDebug();
+            }
+        }
+
+        // True if the Debug option was set
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.UseOptionDebug"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        protected bool UseOptionDebug() {
+            return(roptions & RegexOptions.Debug) != 0;
+        }
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Dump"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        public virtual String Dump() {
+            String key = roptions + ":" + pattern;
+            if (key[0] == ':')
+                return key.Substring(1, key.Length - 1);
+
+            return key;
+        }
+
+        //| <include file='doc\Regex.uex' path='docs/doc[@for="Regex.Dump1"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        public virtual String Dump(String indent) {
+            return indent + Dump() + "\n";
+        }
+#endif
+    }
+
+
+    // Callback class
+    //| <include file='doc\Regex.uex' path='docs/doc[@for="MatchEvaluator"]/*' />
+    /// <devdoc>
+    /// </devdoc>
+    //[ Serializable() ]
+    public delegate String MatchEvaluator(Match match);
+
+
+    // Used to cache byte codes or compiled factories
+    internal sealed class CachedCodeEntry {
+        internal int _references;
+
+        internal RegexCode _code;
+        internal RegexOptions _options;
+        internal Hashtable _caps;
+        internal Hashtable _capnames;
+        internal String[]  _capslist;
+        internal int       _capsize;
+        //internal RegexRunnerFactory _factory;
+        internal ExclusiveReference _runnerref;
+        internal SharedReference _replref;
+
+        internal CachedCodeEntry(RegexOptions options, Hashtable capnames, String[] capslist, RegexCode code, Hashtable caps, int capsize, ExclusiveReference runner, SharedReference repl) {
+
+            _options    = options;
+            _capnames   = capnames;
+            _capslist   = capslist;
+
+            _code       = code;
+            _caps       = caps;
+            _capsize    = capsize;
+
+            _runnerref     = runner;
+            _replref       = repl;
+
+            _references = 1;
+        }
+
+        internal CachedCodeEntry AddRef() {
+            lock (this) {
+                _references += 1;
+                return this;
+            }
+        }
+
+        internal void Release() {
+            lock (this) {
+                _references -= 1;
+            }
+        }
+
+        internal bool NoReferences() {
+            return(_references == 0);
+        }
+
+        /*
+        internal void AddCompiled(RegexRunnerFactory factory) {
+            lock (this) {
+                _code = null;
+                _factory = factory;
+                _references += 1;   // will never be balanced since we never unload the type
+            }
+        }
+        */
+    }
+
+    // Used to cache one exclusive weak reference
+    internal sealed class ExclusiveReference {
+        WeakReference _ref = new WeakReference(null);
+        Object _obj;
+        int _locked;
+
+        // Return an object and grab an exclusive lock.
+        //
+        // If the exclusive lock can't be obtained, null is returned;
+        // if the object can't be returned, the lock is released.
+        //
+        // Note that _ref.Target is referenced only under the protection
+        // of the lock. (Is this necessary?)
+        internal Object Get() {
+            // try to obtain the lock
+
+            if (0 == Interlocked.Exchange(ref _locked, 1)) {
+                // grab reference
+
+                Object obj = _ref.Target;
+
+                // release the lock and return null if no reference
+
+                if (obj == null) {
+                    _locked = 0;
+                    return null;
+                }
+
+                // remember the reference and keep the lock
+
+                _obj = obj;
+                return obj;
+            }
+
+            return null;
+        }
+
+        // Release an object back to the cache
+        //
+        // If the object is the one that's under lock, the lock
+        // is released.
+        //
+        // If there is no cached object, then the lock is obtained
+        // and the object is placed in the cache.
+        //
+        // Note that _ref.Target is referenced only under the protection
+        // of the lock. (Is this necessary?)
+        internal void Release(Object obj) {
+            if (obj == null)
+                throw new ArgumentNullException("obj");
+
+            // if this reference owns the lock, release it
+
+            if (_obj == obj) {
+                _obj = null;
+                _locked = 0;
+                return;
+            }
+
+            // if no reference owns the lock, try to cache this reference
+
+            if (_obj == null) {
+                // try to obtain the lock
+
+                if (0 == Interlocked.Exchange(ref _locked, 1)) {
+                    // if there's really no reference, cache this reference
+
+                    if (_ref.Target == null)
+                        _ref.Target = obj;
+
+                    // release the lock
+
+                    _locked = 0;
+                    return;
+                }
+            }
+        }
+    }
+
+    // Used to cache a weak reference in a threadsafe way
+    internal sealed class SharedReference {
+        WeakReference _ref = new WeakReference(null);
+        int _locked;
+
+        // Return an object from a weakref, protected by a lock.
+        //
+        // If the exclusive lock can't be obtained, null is returned;
+        //
+        // Note that _ref.Target is referenced only under the protection
+        // of the lock. (Is this necessary?)
+        internal  Object Get() {
+            if (0 == Interlocked.Exchange(ref _locked, 1)) {
+                Object obj = _ref.Target;
+                _locked = 0;
+                return obj;
+            }
+
+            return null;
+        }
+
+        // Suggest an object into a weakref, protected by a lock.
+        //
+        // Note that _ref.Target is referenced only under the protection
+        // of the lock. (Is this necessary?)
+        internal void Cache(Object obj) {
+            if (0 == Interlocked.Exchange(ref _locked, 1)) {
+                _ref.Target = obj;
+                _locked = 0;
+            }
+        }
+    }
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexboyermoore.cs b/base/Kernel/System/Text/RegularExpressions/regexboyermoore.cs
new file mode 100644
index 0000000..eb0199a
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexboyermoore.cs
@@ -0,0 +1,343 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// The RegexBoyerMoore object precomputes the Boyer-Moore
+// tables for fast string scanning. These tables allow
+// you to scan for the first occurrence of a string within
+// a large body of text without examining every character.
+// The performance of the heuristic depends on the actual
+// string and the text being searched, but usually, the longer
+// the string that is being searched for, the fewer characters
+// need to be examined.
+//
+
+namespace System.Text.RegularExpressions
+{
+
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Globalization;
+
+    internal sealed class RegexBoyerMoore {
+        internal int[] _positive;
+        internal int[] _negativeASCII;
+        internal int[][] _negativeUnicode;
+        internal String _pattern;
+        internal int _lowASCII;
+        internal int _highASCII;
+        internal bool _rightToLeft;
+        internal bool _caseInsensitive;
+        internal CultureInfo _culture;
+
+        internal const int infinite = 0x7FFFFFFF;
+
+        // Constructs a Boyer-Moore state machine for searching for the string
+        // pattern. The string must not be zero-length.
+        internal RegexBoyerMoore(String pattern, bool caseInsensitive, bool rightToLeft, CultureInfo culture) {
+            Debug.Assert(pattern.Length != 0, "RegexBoyerMoore called with an empty string.  This is bad for perf");
+
+            int beforefirst;
+            int last;
+            int bump;
+            int examine;
+            int scan;
+            int match;
+            char ch;
+
+
+            if (caseInsensitive)
+            {
+                //                pattern = pattern.ToLower(culture);
+                pattern = pattern.ToLower();
+            }
+
+            _pattern = pattern;
+            _rightToLeft = rightToLeft;
+            _caseInsensitive = caseInsensitive;
+            _culture = culture;
+
+            if (!rightToLeft) {
+                beforefirst = -1;
+                last = pattern.Length - 1;
+                bump = 1;
+            }
+            else {
+                beforefirst = pattern.Length;
+                last = 0;
+                bump = -1;
+            }
+
+            // PART I - the good-suffix shift table
+            //
+            // compute the positive requirement:
+            // if char "i" is the first one from the right that doesn't match,
+            // then we know the matcher can advance by _positive[i].
+            //
+            _positive = new int[pattern.Length];
+
+            examine = last;
+            ch = pattern[examine];
+            _positive[examine] = bump;
+            examine -= bump;
+
+            for (;;) {
+                // find an internal char (examine) that matches the tail
+
+                for (;;) {
+                    if (examine == beforefirst)
+                        goto OuterloopBreak;
+                    if (pattern[examine] == ch)
+                        break;
+                    examine -= bump;
+                }
+
+                match = last;
+                scan = examine;
+
+                // find the length of the match
+
+                for (;;) {
+                    if (scan == beforefirst || pattern[match] != pattern[scan]) {
+                        // at the end of the match, note the difference in _positive
+                        // this is not the length of the match, but the distance from the internal match
+                        // to the tail suffix.
+                        if (_positive[match] == 0)
+                            _positive[match] = match - scan;
+
+                        // System.Diagnostics.Debug.WriteLine("Set positive[" + match + "] to " + (match - scan));
+
+                        break;
+                    }
+
+                    scan -= bump;
+                    match -= bump;
+                }
+
+                examine -= bump;
+            }
+
+            OuterloopBreak:
+
+            match = last - bump;
+
+            // scan for the chars for which there are no shifts that yield a different candidate
+
+            while (match != beforefirst) {
+                if (_positive[match] == 0)
+                    _positive[match] = bump;
+
+                match -= bump;
+            }
+
+            //System.Diagnostics.Debug.WriteLine("good suffix shift table:");
+            //for (int i=0; i<_positive.Length; i++)
+            //    System.Diagnostics.Debug.WriteLine("\t_positive[" + i + "] = " + _positive[i]);
+
+
+            // PART II - the bad-character shift table
+            //
+            // compute the negative requirement:
+            // if char "ch" is the reject character when testing position "i",
+            // we can slide up by _negative[ch];
+            // (_negative[ch] = str.Length - 1 - str.LastIndexOf(ch))
+            //
+            // the lookup table is divided into ASCII and Unicode portions;
+            // only those parts of the Unicode 16-bit code set that actually
+            // appear in the string are in the table. (Maximum size with
+            // Unicode is 65K; ASCII only case is 512 bytes.)
+
+            _negativeASCII = new int[128];
+
+            for (int i = 0; i < 128; i++)
+                _negativeASCII[i] = last - beforefirst;
+
+            _lowASCII = 127;
+            _highASCII = 0;
+
+            for (examine = last; examine != beforefirst; examine -= bump) {
+                ch = pattern[examine];
+
+                if (ch < 128) {
+                    if (_lowASCII > ch)
+                        _lowASCII = ch;
+
+                    if (_highASCII < ch)
+                        _highASCII = ch;
+
+                    if (_negativeASCII[ch] == last - beforefirst)
+                        _negativeASCII[ch] = last - examine;
+                }
+                else {
+                    int i = ch >> 8;
+                    int j = ch & 0xFF;
+
+                    if (_negativeUnicode == null) {
+                        _negativeUnicode = new int[256][];
+                    }
+
+                    if (_negativeUnicode[i] == null) {
+                        int[] newarray = new int[256];
+
+                        for (int k = 0; k < 256; k++)
+                            newarray[k] = last - beforefirst;
+
+                        if (i == 0) {
+                            System.Array.Copy(_negativeASCII, newarray, 128);
+                            _negativeASCII = newarray;
+                        }
+
+                        _negativeUnicode[i] = newarray;
+                    }
+
+                    if (_negativeUnicode[i][j] == last - beforefirst)
+                        _negativeUnicode[i][j] = last - examine;
+                }
+            }
+        }
+
+        // When a regex is anchored, we can do a quick IsMatch test instead of a Scan
+        internal bool IsMatch(String text, int index, int beglimit, int endlimit) {
+
+            if (!_rightToLeft) {
+                if (index < beglimit || endlimit - index < _pattern.Length)
+                    return false;
+
+                return(0 == String.Compare(_pattern, 0, text, index, _pattern.Length, _caseInsensitive));//, _culture));
+            }
+            else {
+                if (index > endlimit || index - beglimit < _pattern.Length)
+                    return false;
+
+                return(0 == String.Compare(_pattern, 0, text, index - _pattern.Length, _pattern.Length, _caseInsensitive));//, _culture));
+            }
+        }
+
+
+        // Scan uses the Boyer-Moore algorithm to find the first occurrence
+        // of the specified string within text, beginning at index, and
+        // constrained within beglimit and endlimit.
+        //
+        // The direction and case-sensitivity of the match is determined
+        // by the arguments to the RegexBoyerMoore constructor.
+        internal int Scan(String text, int index, int beglimit, int endlimit) {
+            int test;
+            int test2;
+            int match;
+            int startmatch;
+            int endmatch;
+            int advance;
+            int defadv;
+            int bump;
+            char chMatch;
+            char chTest;
+            int[] unicodeLookup;
+
+            if (!_rightToLeft) {
+                defadv = _pattern.Length;
+                startmatch = _pattern.Length - 1;
+                endmatch = 0;
+                test = index + defadv - 1;
+                bump = 1;
+            }
+            else {
+                defadv = -_pattern.Length;
+                startmatch = 0;
+                endmatch = -defadv - 1;
+                test = index + defadv;
+                bump = -1;
+            }
+
+            chMatch = _pattern[startmatch];
+
+            for (;;) {
+                if (test >= endlimit || test < beglimit)
+                    return -1;
+
+                chTest = text[test];
+
+                if (_caseInsensitive)
+                    chTest = Char.ToLower(chTest);//, _culture);
+
+                if (chTest != chMatch) {
+                    if (chTest < 128)
+                        advance = _negativeASCII[chTest];
+                    else if (null != _negativeUnicode && (null != (unicodeLookup = _negativeUnicode[chTest >> 8])))
+                        advance = unicodeLookup[chTest & 0xFF];
+                    else
+                        advance = defadv;
+
+                    test += advance;
+                }
+                else { // if (chTest == chMatch)
+                    test2 = test;
+                    match = startmatch;
+
+                    for (;;) {
+                        if (match == endmatch)
+                            return(_rightToLeft ? test2 + 1 : test2);
+
+                        match -= bump;
+                        test2 -= bump;
+
+                        chTest = text[test2];
+
+                        if (_caseInsensitive)
+                            chTest = Char.ToLower(chTest);//, _culture);
+
+                        if (chTest != _pattern[match]) {
+                            advance = _positive[match];
+                            if ((chTest & 0xFF80) == 0)
+                                test2 = (match - startmatch) + _negativeASCII[chTest];
+                            else if (null != _negativeUnicode && (null != (unicodeLookup = _negativeUnicode[chTest >> 8])))
+                                test2 = (match - startmatch) + unicodeLookup[chTest & 0xFF];
+                            else {
+                                test += advance;
+                                break;
+                            }
+
+                            if (_rightToLeft ? test2 < advance : test2 > advance)
+                                advance = test2;
+
+                            test += advance;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Used when dumping for debugging.
+        public override String ToString() {
+            return _pattern;
+        }
+
+#if DBG
+        public String Dump(String indent) {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append(indent + "BM Pattern: " + _pattern + "\n");
+            sb.Append(indent + "Positive: ");
+            for (int i = 0; i < _positive.Length; i++) {
+                sb.Append(_positive[i].ToString() + " ");
+            }
+            sb.Append("\n");
+
+            if (_negativeASCII != null) {
+                sb.Append(indent + "Negative table\n");
+                for (int i = 0; i < _negativeASCII.Length; i++) {
+                    if (_negativeASCII[i] != _pattern.Length) {
+                        sb.Append(indent + "  " + Regex.Escape(Convert.ToString((char)i)) + " " + _negativeASCII[i].ToString() + "\n");
+                    }
+                }
+            }
+
+            return sb.ToString();
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexcapture.cs b/base/Kernel/System/Text/RegularExpressions/regexcapture.cs
new file mode 100644
index 0000000..6c78f0b
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexcapture.cs
@@ -0,0 +1,115 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// Capture is just a location/length pair that indicates the
+// location of a regular expression match. A single regexp
+// search may return multiple Capture within each capturing
+// RegexGroup.
+//
+
+namespace System.Text.RegularExpressions {
+
+    //| <include file='doc\RegexCapture.uex' path='docs/doc[@for="Capture"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Represents the results from a single subexpression capture. The object represents
+    ///       one substring for a single successful capture.</para>
+    /// </devdoc>
+    //[ Serializable() ]
+    public class Capture {
+        internal String _text;
+        internal int _index;
+        internal int _length;
+
+        internal Capture(String text, int i, int l) {
+            _text = text;
+            _index = i;
+            _length = l;
+        }
+
+        // The index of the beginning of the matched capture
+        //| <include file='doc\RegexCapture.uex' path='docs/doc[@for="Capture.Index"]/*' />
+        /// <devdoc>
+        ///    <para>Returns the position in the original string where the first character of
+        ///       captured substring was found.</para>
+        /// </devdoc>
+        public int Index {
+            get {
+                return _index;
+            }
+        }
+
+        // The length of the matched capture
+        //| <include file='doc\RegexCapture.uex' path='docs/doc[@for="Capture.Length"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the length of the captured substring.
+        ///    </para>
+        /// </devdoc>
+        public int Length {
+            get {
+                return _length;
+            }
+        }
+
+        //| <include file='doc\RegexCapture.uex' path='docs/doc[@for="Capture.Value"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public string Value {
+            get {
+                return _text.Substring(_index, _length);
+            }
+        }
+
+        // The capture as a string
+        //| <include file='doc\RegexCapture.uex' path='docs/doc[@for="Capture.ToString"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns
+        ///          the substring that was matched.
+        ///       </para>
+        ///    </devdoc>
+        override public String ToString() {
+            return Value;
+        }
+
+        // The original string
+        internal String GetOriginalString() {
+            return _text;
+        }
+
+        // The substring to the left of the capture
+        internal String GetLeftSubstring() {
+            return _text.Substring(0, _index);
+        }
+
+        // The substring to the right of the capture
+        internal String GetRightSubstring() {
+            return _text.Substring(_index + _length, _text.Length - _index - _length);
+        }
+
+#if DBG
+        internal virtual String Description() {
+            StringBuilder Sb = new StringBuilder();
+
+            Sb.Append("(I = ");
+            Sb.Append(_index);
+            Sb.Append(", L = ");
+            Sb.Append(_length);
+            Sb.Append("): ");
+            Sb.Append(_text, _index, _length);
+
+            return Sb.ToString();
+        }
+#endif
+    }
+
+
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexcapturecollection.cs b/base/Kernel/System/Text/RegularExpressions/regexcapturecollection.cs
new file mode 100644
index 0000000..e7f0cad
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexcapturecollection.cs
@@ -0,0 +1,194 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// The CaptureCollection lists the captured Capture numbers
+// contained in a compiled Regex.
+//
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+
+    // This collection returns the Captures for a group
+    // in the order in which they were matched (left to right
+    // or right to left). It is created by Group.Captures
+    //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Represents a sequence of capture substrings. The object is used
+    ///       to return the set of captures done by a single capturing group.
+    ///    </para>
+    /// </devdoc>
+    //[ Serializable() ]
+    public class CaptureCollection : ICollection {
+        internal Group _group;
+        internal int _capcount;
+        internal Capture[] _captures;
+
+        // Nonpublic constructor
+        internal CaptureCollection(Group group) {
+            _group = group;
+            _capcount = _group._capcount;
+        }
+
+        // The object on which to synchronize
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.SyncRoot"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public Object SyncRoot {
+            get {
+                return _group;
+            }
+        }
+
+        // ICollection
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.IsSynchronized"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsSynchronized {
+            get {
+                return false;
+            }
+        }
+
+        // ICollection
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.IsReadOnly"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsReadOnly {
+            get {
+                return true;
+            }
+        }
+
+        // The number of captures for the group
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.Count"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the number of captures.
+        ///    </para>
+        /// </devdoc>
+        public int Count {
+            get {
+                return _capcount;
+            }
+        }
+
+        // The ith capture in the group
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.this"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Provides a means of accessing a specific capture in the collection.
+        ///    </para>
+        /// </devdoc>
+        public Capture this[int i]
+        {
+            get {
+                return GetCapture(i);
+            }
+        }
+
+        // As required by ICollection
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.CopyTo"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Copies all the elements of the collection to the given array
+        ///       beginning at the given index.
+        ///    </para>
+        /// </devdoc>
+        public void CopyTo(Array array, int arrayIndex) {
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            for (int i = arrayIndex, j = 0; j < Count; i++, j++) {
+                array.SetValue(this[j], i);
+            }
+        }
+
+        // As required by ICollection
+        //| <include file='doc\RegexCaptureCollection.uex' path='docs/doc[@for="CaptureCollection.GetEnumerator"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Provides an enumerator in the same order as Item[].
+        ///    </para>
+        /// </devdoc>
+        public IEnumerator GetEnumerator() {
+            return new CaptureEnumerator(this);
+        }
+
+        // Nonpublic code to return set of captures for the group
+        internal Capture GetCapture(int i) {
+            if (i == _capcount - 1 && i >= 0)
+                return _group;
+
+            if (i >= _capcount || i < 0)
+                throw new ArgumentOutOfRangeException("i");
+
+            // first time a capture is accessed, compute them all
+            if (_captures == null) {
+                _captures = new Capture[_capcount];
+                for (int j = 0; j < _capcount - 1; j++) {
+                    _captures[j] = new Capture(_group._text, _group._caps[j * 2], _group._caps[j * 2 + 1]);
+                }
+            }
+
+            return _captures[i];
+        }
+    }
+
+
+    // This non-public enumerator lists all the captures
+    // Should it be public?
+    //[ Serializable() ]
+    internal class CaptureEnumerator : IEnumerator {
+        internal CaptureCollection _rcc;
+        internal int _curindex;
+
+        // Nonpublic constructor
+        internal CaptureEnumerator(CaptureCollection rcc) {
+            _curindex = -1;
+            _rcc = rcc;
+        }
+
+        // As required by IEnumerator
+        public bool MoveNext() {
+            int size = _rcc.Count;
+
+            if (_curindex >= size)
+                return false;
+
+            _curindex++;
+
+            return(_curindex < size);
+        }
+
+        // As required by IEnumerator
+        public Object Current {
+            get { return Capture;}
+        }
+
+        // Returns the current capture
+        public Capture Capture {
+            get {
+                if (_curindex < 0 || _curindex > _rcc.Count)
+                    throw new InvalidOperationException("Enum not started");//XXX: SR.GetString(SR.EnumNotStarted));
+
+                return _rcc[_curindex];
+            }
+        }
+
+        // Reset to before the first item
+        public void Reset() {
+            _curindex = -1;
+        }
+    }
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexcharclass.cs b/base/Kernel/System/Text/RegularExpressions/regexcharclass.cs
new file mode 100644
index 0000000..293eb5f
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexcharclass.cs
@@ -0,0 +1,1204 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexCharClass class provides the "set of Unicode chars" functionality
+// used by the regexp engine.
+//
+
+// RegexCharClass supports a "string representation" of a character class.
+// The string representation is NOT human-readable. It is a sequence of
+// strictly increasing Unicode characters that begin ranges of characters
+// that are alternately included in and excluded from the class.
+//
+// Membership of a character in the class can be determined by binary
+// searching the string representation and determining if the including
+// range is at an even or odd index.
+//
+// The RegexCharClass class itself is a builder class. One can add char ranges
+// or sets or invert the class; then, the class can be converted to its
+// string representation via RegexCharClass.ToSet().
+//
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Globalization;
+    using System.Diagnostics;
+
+    internal sealed class RegexCharClass {
+        internal const char   Nullchar   = '\0';
+        internal const char   Lastchar   = '\uFFFF';
+
+        internal const String Any      = "\0";
+        internal const String Empty    = "";
+        internal const char GroupChar = (char) 0;
+        internal static readonly RegexCharClass AnyClass      = new RegexCharClass("\0");
+        internal static readonly RegexCharClass EmptyClass    = new RegexCharClass(String.Empty);
+
+        internal static readonly String Word;
+        internal static readonly String NotWord;
+
+        internal const short SpaceConst = 100;
+        internal const short NotSpaceConst = -100;
+        internal static readonly String Space = ((char) SpaceConst).ToString();
+        internal static readonly String NotSpace = NegateCategory(Space);
+
+        internal const String ECMASpace    = "\u0009\u000E\u0020\u0021";
+        internal const String NotECMASpace = "\0\u0009\u000E\u0020\u0021";
+        internal const String ECMAWord     = "\u0030\u003A\u0041\u005B\u005F\u0060\u0061\u007B\u0130\u0131";
+        internal const String NotECMAWord  = "\0\u0030\u003A\u0041\u005B\u005F\u0060\u0061\u007B\u0130\u0131";
+        internal const String ECMADigit    = "\u0030\u003A";
+        internal const String NotECMADigit = "\0\u0030\u003A";
+
+        internal static Hashtable          _definedCategories;
+
+        internal ArrayList          _rangelist;
+        internal StringBuilder      _categories;
+        internal bool               _canonical;
+        internal bool               _negate;
+
+
+        static RegexCharClass() {
+            _definedCategories = new Hashtable(31);
+
+            char[] groups = new char[9];
+            StringBuilder word = new StringBuilder(11);
+
+            word.Append(GroupChar);
+            groups[0] = GroupChar;
+
+            // We need the UnicodeCategory enum values as a char so we can put them in a string
+            // in the hashtable.  In order to get there, we first must cast to an int,
+            // then cast to a char
+            // Also need to distinguish between positive and negative values.  UnicodeCategory is zero
+            // based, so we add one to each value and subtract it off later
+
+            // Others
+            groups[1] = (char) ((int) UnicodeCategory.Control + 1);
+            _definedCategories["Cc"] = groups[1].ToString();     // Control
+            groups[2] = (char) ((int) UnicodeCategory.Format + 1);
+            _definedCategories["Cf"] = groups[2].ToString();     // Format
+            groups[3] = (char) ((int) UnicodeCategory.OtherNotAssigned + 1);
+            _definedCategories["Cn"] = groups[3].ToString();     // Not assigned
+            groups[4] = (char) ((int) UnicodeCategory.PrivateUse + 1);
+            _definedCategories["Co"] = groups[4].ToString();     // Private use
+            groups[5] = (char) ((int) UnicodeCategory.Surrogate + 1);
+            _definedCategories["Cs"] = groups[5].ToString();     // Surrogate
+
+            groups[6] = GroupChar;
+            _definedCategories["C"] = new String(groups, 0, 7);
+
+            // Letters
+            groups[1] = (char) ((int) UnicodeCategory.LowercaseLetter + 1);
+            _definedCategories["Ll"] = groups[1].ToString();     // Lowercase
+            groups[2] = (char) ((int) UnicodeCategory.ModifierLetter + 1);
+            _definedCategories["Lm"] = groups[2].ToString();     // Modifier
+            groups[3] = (char) ((int) UnicodeCategory.OtherLetter + 1);
+            _definedCategories["Lo"] = groups[3].ToString();     // Other
+            groups[4] = (char) ((int) UnicodeCategory.TitlecaseLetter + 1);
+            _definedCategories["Lt"] = groups[4].ToString();     // Titlecase
+            groups[5] = (char) ((int) UnicodeCategory.UppercaseLetter + 1);
+            _definedCategories["Lu"] = groups[5].ToString();     // Uppercase
+
+            //groups[6] = GroupChar;
+            _definedCategories["L"] = new String(groups, 0, 7);
+            word.Append(groups[1]);
+            word.Append(new String(groups, 3, 3));
+
+            // Marks
+            groups[1] = (char) ((int) UnicodeCategory.SpacingCombiningMark + 1);
+            _definedCategories["Mc"] = groups[1].ToString();     // Spacing combining
+            groups[2] = (char) ((int) UnicodeCategory.EnclosingMark + 1);
+            _definedCategories["Me"] = groups[2].ToString();     // Enclosing
+            groups[3] = (char) ((int) UnicodeCategory.NonSpacingMark + 1);
+            _definedCategories["Mn"] = groups[3].ToString();     // Non-spacing
+
+            groups[4] = GroupChar;
+            _definedCategories["M"] = new String(groups, 0, 5);
+            //word.Append(groups[1]);
+            //word.Append(groups[3]);
+
+            // Numbers
+            groups[1] = (char) ((int) UnicodeCategory.DecimalDigitNumber + 1);
+            _definedCategories["Nd"] = groups[1].ToString();     // Decimal digit
+            groups[2] = (char) ((int) UnicodeCategory.LetterNumber + 1);
+            _definedCategories["Nl"] = groups[2].ToString();     // Letter
+            groups[3] = (char) ((int) UnicodeCategory.OtherNumber + 1);
+            _definedCategories["No"] = groups[3].ToString();     // Other
+
+            //groups[4] = GroupChar;
+            _definedCategories["N"] = new String(groups, 0, 5);
+            word.Append(groups[1]);
+            //word.Append(new String(groups, 1, 3));
+
+            // Punctuation
+            groups[1] = (char) ((int) UnicodeCategory.ConnectorPunctuation + 1);
+            _definedCategories["Pc"] = groups[1].ToString();     // Connector
+            groups[2] = (char) ((int) UnicodeCategory.DashPunctuation + 1);
+            _definedCategories["Pd"] = groups[2].ToString();     // Dash
+            groups[3] = (char) ((int) UnicodeCategory.ClosePunctuation + 1);
+            _definedCategories["Pe"] = groups[3].ToString();     // Close
+            groups[4] = (char) ((int) UnicodeCategory.OtherPunctuation + 1);
+            _definedCategories["Po"] = groups[4].ToString();     // Other
+            groups[5] = (char) ((int) UnicodeCategory.OpenPunctuation + 1);
+            _definedCategories["Ps"] = groups[5].ToString();     // Open
+            groups[6] = (char) ((int) UnicodeCategory.FinalQuotePunctuation + 1);
+            _definedCategories["Pi"] = groups[6].ToString();     // Initial quote
+            groups[7] = (char) ((int) UnicodeCategory.InitialQuotePunctuation + 1);
+            _definedCategories["Pf"] = groups[7].ToString();     // Final quote
+
+            groups[8] = GroupChar;
+            _definedCategories["P"] = new String(groups, 0, 9);
+            word.Append(groups[1]);
+
+            // Symbols
+            groups[1] = (char) ((int) UnicodeCategory.CurrencySymbol + 1);
+            _definedCategories["Sc"] = groups[1].ToString();     // Currency
+            groups[2] = (char) ((int) UnicodeCategory.ModifierSymbol + 1);
+            _definedCategories["Sk"] = groups[2].ToString();     // Modifier
+            groups[3] = (char) ((int) UnicodeCategory.MathSymbol + 1);
+            _definedCategories["Sm"] = groups[3].ToString();     // Math
+            groups[4] = (char) ((int) UnicodeCategory.OtherSymbol + 1);
+            _definedCategories["So"] = groups[4].ToString();     // Other
+
+            groups[5] = GroupChar;
+            _definedCategories["S"] = new String(groups, 0, 6);
+
+            // Separators
+            groups[1] = (char) ((int) UnicodeCategory.LineSeparator + 1);
+            _definedCategories["Zl"] = groups[1].ToString();     // Line
+            groups[2] = (char) ((int) UnicodeCategory.ParagraphSeparator + 1);
+            _definedCategories["Zp"] = groups[2].ToString();     // Paragraph
+            groups[3] = (char) ((int) UnicodeCategory.SpaceSeparator + 1);
+            _definedCategories["Zs"] = groups[3].ToString();     // Space
+
+            groups[4] = GroupChar;
+            _definedCategories["Z"] = new String(groups, 0, 5);
+
+
+            word.Append(GroupChar);
+            Word = word.ToString();
+            NotWord = NegateCategory(Word);
+
+#if DBG
+            // make sure the _propTable is correctly ordered
+            int len = _propTable.GetLength(0);
+            for (int i=0; i<len-1; i++)
+                Debug.Assert(String.Compare(_propTable[i,0], _propTable[i+1,0], false, CultureInfo.InvariantCulture) < 0, "RegexCharClass _propTable is out of order at (" + _propTable[i,0] +", " + _propTable[i+1,0] + ")");
+#endif
+        }
+
+        // RegexCharClass()
+        //
+        // Creates an empty character class.
+        internal RegexCharClass() {
+            _rangelist = new ArrayList(6);
+            _canonical = true;
+            _categories = new StringBuilder();
+
+        }
+
+        // RegexCharClass()
+        //
+        // Creates a character class out of a string representation.
+        internal RegexCharClass(String set) {
+            _rangelist = new ArrayList((set.Length + 1) / 2);
+            _canonical = true;
+            _categories = new StringBuilder();
+
+            AddSet(set);
+        }
+
+        // RegexCharClass()
+        //
+        // Creates a character class with a single range.
+        internal RegexCharClass(char first, char last) {
+            _rangelist = new ArrayList(1);
+            _rangelist.Add(new SingleRange(first, last));
+            _canonical = true;
+            _categories = new StringBuilder();
+        }
+
+        internal static RegexCharClass CreateFromCategory(string categoryName, bool invert, bool caseInsensitive, string pattern) {
+            RegexCharClass cc = new RegexCharClass();
+            cc.AddCategoryFromName(categoryName, invert, caseInsensitive, pattern);
+            return cc;
+        }
+
+
+        // AddCharClass()
+        //
+        // Adds a regex char class
+        internal void AddCharClass(RegexCharClass cc) {
+            int i;
+
+            if (_canonical && RangeCount() > 0 && cc.RangeCount() > 0 &&
+                cc.Range(cc.RangeCount() - 1)._last <= Range(RangeCount() - 1)._last)
+                _canonical = false;
+
+            for (i = 0; i < cc.RangeCount(); i += 1) {
+                _rangelist.Add(cc.Range(i));
+            }
+
+            _categories.Append(cc._categories.ToString());
+        }
+
+        // AddSet()
+        //
+        // Adds a set (specified by its string representation) to the class.
+        internal void AddSet(String set) {
+            int i;
+
+            if (_canonical && RangeCount() > 0 && set.Length > 0 &&
+                set[0] <= Range(RangeCount() - 1)._last)
+                _canonical = false;
+
+            for (i = 0; i < set.Length - 1; i += 2) {
+                _rangelist.Add(new SingleRange(set[i], (char)(set[i + 1] - 1)));
+            }
+
+            if (i < set.Length) {
+                _rangelist.Add(new SingleRange(set[i], Lastchar));
+            }
+        }
+
+        // AddRange()
+        //
+        // Adds a single range of characters to the class.
+        internal void AddRange(char first, char last) {
+            _rangelist.Add(new SingleRange(first, last));
+            if (_canonical && _rangelist.Count > 0 &&
+                first <= ((SingleRange)_rangelist[_rangelist.Count - 1])._last) {
+                _canonical = false;
+            }
+        }
+
+        internal string Category {
+            get {
+                //if (_negate)
+                //    return NegateCategory(_categories.ToString());
+                //else
+                    return _categories.ToString();
+            }
+        }
+
+        internal bool Negate {
+            set { _negate = value; }
+        }
+
+        internal void AddCategoryFromName(string categoryName, bool invert, bool caseInsensitive, string pattern) {
+
+            object cat = _definedCategories[categoryName];
+            if (cat != null) {
+                string catstr = (string) cat;
+
+                if (caseInsensitive) {
+                    if (categoryName.Equals("Lu") || categoryName.Equals("Lt"))
+                        catstr = /*catstr +*/ (string) _definedCategories["Ll"];
+                }
+
+                if (invert)
+                    catstr = NegateCategory(catstr); // negate the category
+
+                _categories.Append((string) catstr);
+            }
+            else
+                AddSet(SetFromProperty(categoryName, invert, pattern));
+        }
+
+        internal void AddCategory(string category) {
+            _categories.Append(category);
+        }
+
+
+        /***************************************************************************
+            Let U be the set of Unicode character values and let L be the lowercase
+            function, mapping from U to U. To perform case insensitive matching of
+            character sets, we need to be able to map an interval I in U, say
+
+                I = [chMin, chMax] = { ch : chMin <= ch <= chMax }
+
+            to a set A such that A contains L(I) and A is contained in the union of
+            I and L(I).
+
+            The table below partitions U into intervals on which L is non-decreasing.
+            Thus, for any interval J = [a, b] contained in one of these intervals,
+            L(J) is contained in [L(a), L(b)].
+
+            It is also true that for any such J, [L(a), L(b)] is contained in the
+            union of J and L(J). This does not follow from L being non-decreasing on
+            these intervals. It follows from the nature of the L on each interval.
+            On each interval, L has one of the following forms:
+
+                (1) L(ch) = constant            (LowercaseSet)
+                (2) L(ch) = ch + offset         (LowercaseAdd)
+                (3) L(ch) = ch | 1              (LowercaseBor)
+                (4) L(ch) = ch + (ch & 1)       (LowercaseBad)
+
+            It is easy to verify that for any of these forms [L(a), L(b)] is
+            contained in the union of [a, b] and L([a, b]).
+        ***************************************************************************/
+
+        internal const int LowercaseSet = 0;    // Set to arg.
+        internal const int LowercaseAdd = 1;    // Add arg.
+        internal const int LowercaseBor = 2;    // Bitwise or with 1.
+        internal const int LowercaseBad = 3;    // Bitwise and with 1 and add original.
+
+        // Lower case mapping descriptor.
+        private sealed class LC {
+            internal LC(char chMin, char chMax, int lcOp, int data) {
+                _chMin = chMin;
+                _chMax = chMax;
+                _lcOp  = lcOp;
+                _data  = data;
+            }
+
+            internal char _chMin;
+            internal char _chMax;
+            internal int _lcOp;
+            internal int _data;
+        }
+
+
+        private static readonly LC[] _lcTable = new LC[]
+        {
+            new LC('\u0041', '\u005A', LowercaseAdd, 32),
+            new LC('\u00C0', '\u00DE', LowercaseAdd, 32),
+            new LC('\u0100', '\u012E', LowercaseBor, 0),
+            new LC('\u0130', '\u0130', LowercaseSet, 0x0069),
+            new LC('\u0132', '\u0136', LowercaseBor, 0),
+            new LC('\u0139', '\u0147', LowercaseBad, 0),
+            new LC('\u014A', '\u0176', LowercaseBor, 0),
+            new LC('\u0178', '\u0178', LowercaseSet, 0x00FF),
+            new LC('\u0179', '\u017D', LowercaseBad, 0),
+            new LC('\u0181', '\u0181', LowercaseSet, 0x0253),
+            new LC('\u0182', '\u0184', LowercaseBor, 0),
+            new LC('\u0186', '\u0186', LowercaseSet, 0x0254),
+            new LC('\u0187', '\u0187', LowercaseSet, 0x0188),
+            new LC('\u0189', '\u018A', LowercaseAdd, 205),
+            new LC('\u018B', '\u018B', LowercaseSet, 0x018C),
+            new LC('\u018E', '\u018F', LowercaseAdd, 202),
+            new LC('\u0190', '\u0190', LowercaseSet, 0x025B),
+            new LC('\u0191', '\u0191', LowercaseSet, 0x0192),
+            new LC('\u0193', '\u0193', LowercaseSet, 0x0260),
+            new LC('\u0194', '\u0194', LowercaseSet, 0x0263),
+            new LC('\u0196', '\u0196', LowercaseSet, 0x0269),
+            new LC('\u0197', '\u0197', LowercaseSet, 0x0268),
+            new LC('\u0198', '\u0198', LowercaseSet, 0x0199),
+            new LC('\u019C', '\u019C', LowercaseSet, 0x026F),
+            new LC('\u019D', '\u019D', LowercaseSet, 0x0272),
+            new LC('\u01A0', '\u01A4', LowercaseBor, 0),
+            new LC('\u01A7', '\u01A7', LowercaseSet, 0x01A8),
+            new LC('\u01A9', '\u01A9', LowercaseSet, 0x0283),
+            new LC('\u01AC', '\u01AC', LowercaseSet, 0x01AD),
+            new LC('\u01AE', '\u01AE', LowercaseSet, 0x0288),
+            new LC('\u01AF', '\u01AF', LowercaseSet, 0x01B0),
+            new LC('\u01B1', '\u01B2', LowercaseAdd, 217),
+            new LC('\u01B3', '\u01B5', LowercaseBad, 0),
+            new LC('\u01B7', '\u01B7', LowercaseSet, 0x0292),
+            new LC('\u01B8', '\u01B8', LowercaseSet, 0x01B9),
+            new LC('\u01BC', '\u01BC', LowercaseSet, 0x01BD),
+            new LC('\u01C4', '\u01C5', LowercaseSet, 0x01C6),
+            new LC('\u01C7', '\u01C8', LowercaseSet, 0x01C9),
+            new LC('\u01CA', '\u01CB', LowercaseSet, 0x01CC),
+            new LC('\u01CD', '\u01DB', LowercaseBad, 0),
+            new LC('\u01DE', '\u01EE', LowercaseBor, 0),
+            new LC('\u01F1', '\u01F2', LowercaseSet, 0x01F3),
+            new LC('\u01F4', '\u01F4', LowercaseSet, 0x01F5),
+            new LC('\u01FA', '\u0216', LowercaseBor, 0),
+            new LC('\u0386', '\u0386', LowercaseSet, 0x03AC),
+            new LC('\u0388', '\u038A', LowercaseAdd, 37),
+            new LC('\u038C', '\u038C', LowercaseSet, 0x03CC),
+            new LC('\u038E', '\u038F', LowercaseAdd, 63),
+            new LC('\u0391', '\u03AB', LowercaseAdd, 32),
+            new LC('\u03E2', '\u03EE', LowercaseBor, 0),
+            new LC('\u0401', '\u040F', LowercaseAdd, 80),
+            new LC('\u0410', '\u042F', LowercaseAdd, 32),
+            new LC('\u0460', '\u0480', LowercaseBor, 0),
+            new LC('\u0490', '\u04BE', LowercaseBor, 0),
+            new LC('\u04C1', '\u04C3', LowercaseBad, 0),
+            new LC('\u04C7', '\u04C7', LowercaseSet, 0x04C8),
+            new LC('\u04CB', '\u04CB', LowercaseSet, 0x04CC),
+            new LC('\u04D0', '\u04EA', LowercaseBor, 0),
+            new LC('\u04EE', '\u04F4', LowercaseBor, 0),
+            new LC('\u04F8', '\u04F8', LowercaseSet, 0x04F9),
+            new LC('\u0531', '\u0556', LowercaseAdd, 48),
+            new LC('\u10A0', '\u10C5', LowercaseAdd, 48),
+            new LC('\u1E00', '\u1EF8', LowercaseBor, 0),
+            new LC('\u1F08', '\u1F0F', LowercaseAdd, -8),
+            new LC('\u1F18', '\u1F1F', LowercaseAdd, -8),
+            new LC('\u1F28', '\u1F2F', LowercaseAdd, -8),
+            new LC('\u1F38', '\u1F3F', LowercaseAdd, -8),
+            new LC('\u1F48', '\u1F4D', LowercaseAdd, -8),
+            new LC('\u1F59', '\u1F59', LowercaseSet, 0x1F51),
+            new LC('\u1F5B', '\u1F5B', LowercaseSet, 0x1F53),
+            new LC('\u1F5D', '\u1F5D', LowercaseSet, 0x1F55),
+            new LC('\u1F5F', '\u1F5F', LowercaseSet, 0x1F57),
+            new LC('\u1F68', '\u1F6F', LowercaseAdd, -8),
+            new LC('\u1F88', '\u1F8F', LowercaseAdd, -8),
+            new LC('\u1F98', '\u1F9F', LowercaseAdd, -8),
+            new LC('\u1FA8', '\u1FAF', LowercaseAdd, -8),
+            new LC('\u1FB8', '\u1FB9', LowercaseAdd, -8),
+            new LC('\u1FBA', '\u1FBB', LowercaseAdd, -74),
+            new LC('\u1FBC', '\u1FBC', LowercaseSet, 0x1FB3),
+            new LC('\u1FC8', '\u1FCB', LowercaseAdd, -86),
+            new LC('\u1FCC', '\u1FCC', LowercaseSet, 0x1FC3),
+            new LC('\u1FD8', '\u1FD9', LowercaseAdd, -8),
+            new LC('\u1FDA', '\u1FDB', LowercaseAdd, -100),
+            new LC('\u1FE8', '\u1FE9', LowercaseAdd, -8),
+            new LC('\u1FEA', '\u1FEB', LowercaseAdd, -112),
+            new LC('\u1FEC', '\u1FEC', LowercaseSet, 0x1FE5),
+            new LC('\u1FF8', '\u1FF9', LowercaseAdd, -128),
+            new LC('\u1FFA', '\u1FFB', LowercaseAdd, -126),
+            new LC('\u1FFC', '\u1FFC', LowercaseSet, 0x1FF3),
+            new LC('\u2160', '\u216F', LowercaseAdd, 16),
+            new LC('\u24B6', '\u24D0', LowercaseAdd, 26),
+            new LC('\uFF21', '\uFF3A', LowercaseAdd, 32),
+        };
+
+        // AddLowerCase()
+        //
+        // Adds to the class any lowercase versions of characters already
+        // in the class. Used for case-insensitivity.
+        internal void AddLowercase(CultureInfo culture) {
+            int i;
+            int origSize;
+            SingleRange range;
+
+            _canonical = false;
+
+            for (i = 0, origSize = _rangelist.Count; i < origSize; i++) {
+                range = (SingleRange)_rangelist[i];
+                if (range._first == range._last)
+                    range._first = range._last = Char.ToLower(range._first);//, culture);
+                else
+                    AddLowercaseImpl(range._first, range._last, culture);
+            }
+        }
+
+        // AddLowerCaseImpl()
+        //
+        // For a single range that's in the set, adds any additional ranges
+        // necessary to ensure that lowercase equivalents are also included.
+        internal void AddLowercaseImpl(char chMin, char chMax, CultureInfo culture) {
+            int i, iMax, iMid;
+            char chMinT, chMaxT;
+            LC lc;
+
+            if (chMin == chMax) {
+                chMin = Char.ToLower(chMin);//, culture);
+                if (chMin != chMax)
+                    AddRange(chMin, chMin);
+                return;
+            }
+
+            for (i = 0, iMax = _lcTable.Length; i < iMax; ) {
+                iMid = (i + iMax) / 2;
+                if (_lcTable[iMid]._chMax < chMin)
+                    i = iMid + 1;
+                else
+                    iMax = iMid;
+            }
+
+            if (i >= _lcTable.Length)
+                return;
+
+            for ( ; i < _lcTable.Length && (lc = _lcTable[i])._chMin <= chMax; i++) {
+                if ((chMinT = lc._chMin) < chMin)
+                    chMinT = chMin;
+
+                if ((chMaxT = lc._chMax) > chMax)
+                    chMaxT = chMax;
+
+                switch (lc._lcOp) {
+                    case LowercaseSet:
+                        chMinT = (char)lc._data;
+                        chMaxT = (char)lc._data;
+                        break;
+                    case LowercaseAdd:
+                        chMinT += (char)lc._data;
+                        chMaxT += (char)lc._data;
+                        break;
+                    case LowercaseBor:
+                        chMinT |= (char)1;
+                        chMaxT |= (char)1;
+                        break;
+                    case LowercaseBad:
+                        chMinT += (char)(chMinT & 1);
+                        chMaxT += (char)(chMaxT & 1);
+                        break;
+                }
+
+                if (chMinT < chMin || chMaxT > chMax)
+                    AddRange(chMinT, chMaxT);
+            }
+        }
+
+
+        // ToSet()
+        //
+        // Constructs the string representation of the class.
+        internal String ToSet() {
+            int i;
+            StringBuilder sb;
+
+            if (!_canonical)
+                Canonicalize();
+
+            if (_negate) {
+                sb = new StringBuilder(_rangelist.Count * 2 + 2);
+                sb.Append(Nullchar);
+                sb.Append(Nullchar);
+            }
+            else
+                sb = new StringBuilder(_rangelist.Count * 2);
+
+
+            for (i = 0; i < _rangelist.Count; i++) {
+                sb.Append(((SingleRange)_rangelist[i])._first);
+
+                if (((SingleRange)_rangelist[i])._last != Lastchar)
+                    sb.Append((char)(((SingleRange)_rangelist[i])._last + 1));
+            }
+
+            return sb.ToString();
+        }
+
+        // ToSetCi()
+        //
+        // Constructs the string representation of the class.
+        internal String ToSetCi(bool caseInsensitive, CultureInfo culture) {
+            if (caseInsensitive)
+                AddLowercase(culture);
+
+            return ToSet();
+        }
+
+        // SetSize()
+        //
+        // Returns the number of characters included in the set.
+        internal static int SetSize(String set) {
+            int i;
+            int c;
+
+            c = 0;
+
+            for (i = 0; i < set.Length - 1; i += 2) {
+                c += set[i + 1] - set[i];
+            }
+
+            if (i < set.Length) {
+                c += 0x10000 - set[i];
+            }
+
+            return c;
+        }
+
+        // SetInverse()
+        //
+        // Inverts a string representation of a class directly.
+        internal static String SetInverse(String set) {
+            if (set.Length == 0 || set[0] != Nullchar)
+                return Any + set;
+
+            if (set.Length == 1)
+                return Empty;
+
+            return set.Substring(1, set.Length - 1);
+        }
+
+
+        // SetUnion()
+        //
+        // Builds the union of two string representations of a class directly.
+        internal static String SetUnion(String setI, String setJ) {
+            int i;
+            int j;
+            int s;
+            String swap;
+            StringBuilder sb;
+            char chExc;
+
+            if (setI.Equals(Empty) || setJ.Equals(Any))
+                return setJ;
+
+            if (setJ.Equals(Empty) || setI.Equals(Any))
+                return setI;
+
+            if (setI == setJ)
+                return setI;
+
+            i = 0;
+            j = 0;
+            sb = new StringBuilder(setI.Length + setJ.Length);
+
+            for (;;) {
+                if (j == setJ.Length) {
+                    sb.Append(setI, i, setI.Length - i);
+                    break;
+                }
+
+                if (i == setI.Length) {
+                    sb.Append(setJ, j, setJ.Length - j);
+                    break;
+                }
+
+                if (setJ[j] > setI[i]) {
+                    s = i;
+                    i = j;
+                    j = s;
+                    swap = setI;
+                    setI = setJ;
+                    setJ = swap;
+                }
+
+                sb.Append(setJ[j++]);
+                if (j == setJ.Length)
+                    break;
+
+                chExc = setJ[j++];
+
+                for (;;) {
+                    while (i < setI.Length && setI[i] <= chExc)
+                        i++;
+
+                    if ((i & 0x1) == 0) {
+                        sb.Append(chExc);
+                        goto OuterContinue;
+                    }
+                    else {
+                        if (i == setI.Length)
+                            goto OuterBreak;
+
+                        chExc = setI[i++];
+                    }
+
+                    s = i;
+                    i = j;
+                    j = s;
+                    swap = setI;
+                    setI = setJ;
+                    setJ = swap;
+                }
+
+                OuterContinue:
+                ;
+            }
+
+            OuterBreak:
+            ;
+
+            return sb.ToString();
+        }
+
+        internal static String CategoryUnion(string catI, string catJ) {
+            return catI + catJ;
+        }
+
+        // SetFromChar()
+        //
+        // Builds the string representations of a class with a single character.
+        internal static String SetFromChar(char ch) {
+            StringBuilder sb = new StringBuilder(2);
+
+            sb.Append(ch);
+
+            if (ch != Lastchar)
+                sb.Append((char)(ch + 1));
+
+            return sb.ToString();
+        }
+
+        // SetInverseFromChar()
+        //
+        // Builds the string representation of a class that omits a single character.
+        internal static String SetInverseFromChar(char ch) {
+            StringBuilder sb = new StringBuilder(3);
+
+            if (ch != Nullchar) {
+                sb.Append(Nullchar);
+                sb.Append(ch);
+            }
+
+            if (ch != Lastchar)
+                sb.Append((char)(ch + 1));
+
+            return sb.ToString();
+        }
+
+        // IsSingleton()
+        //
+        // True if the set contains a single character only
+        internal static bool IsSingleton(String set) {
+            return(set.Length == 2 && set[0] == set[1] - 1); // && _categories.Length == 0);
+        }
+
+        // SingletonChar()
+        //
+        // Returns the char
+        internal static char SingletonChar(String set) {
+            return set[0];
+        }
+
+        internal static bool IsECMAWordChar(char ch) {
+            return CharInSet(ch, ECMAWord, String.Empty);
+        }
+
+        internal static bool IsWordChar(char ch) {
+            return CharInCategory(ch, Word);
+        }
+
+        internal static bool CharInSet(char ch, String set, String category) {
+            bool b = CharInSetInternal(ch, set, category);
+
+            if (set.Length >= 2 && (set[0] == 0) && (set[1] == 0))
+                return !b;
+            else
+                return b;
+        }
+
+        // CharInSet()
+        //
+        // Determines a character's membership in a character class (via the
+        // string representation of the class).
+        internal static bool CharInSetInternal(char ch, string set, String category) {
+            int min;
+            int max;
+            int mid;
+            min = 0;
+            max = set.Length;
+
+            while (min != max) {
+                mid = (min + max) / 2;
+                if (ch < set[mid])
+                    max = mid;
+                else
+                    min = mid + 1;
+            }
+
+            if ((min & 0x1) != 0)
+                return true;
+            else
+                return CharInCategory(ch, category);
+        }
+
+        internal static bool CharInCategory(char ch, string category) {
+
+            if (category.Length == 0)
+                return false;
+
+            UnicodeCategory chcategory = char.GetUnicodeCategory(ch);
+
+            int i=0;
+            while (i<category.Length) {
+                int curcat = (short) category[i];
+
+                if (curcat == 0) {
+                    // zero is our marker for a group of categories - treated as a unit
+                    if (CharInCategoryGroup(ch, chcategory, category, ref i))
+                        return true;
+                }
+                else if (curcat > 0) {
+                    // greater than zero is a positive case
+
+                    if (curcat  == SpaceConst) {
+                        if (Char.IsWhiteSpace(ch))
+                            return true;
+                        else  {
+                            i++;
+                            continue;
+                        }
+                    }
+                    --curcat;
+
+                    if (chcategory == (UnicodeCategory) curcat)
+                        return true;
+                }
+                else {
+                    // less than zero is a negative case
+                    if (curcat == NotSpaceConst) {
+                        if (!Char.IsWhiteSpace(ch))
+                            return true;
+                        else  {
+                            i++;
+                            continue;
+                        }
+                    }
+
+                    curcat = -curcat;
+                    --curcat;
+
+                    if (chcategory != (UnicodeCategory) curcat)
+                        return true;
+                }
+                i++;
+            }
+            return false;
+        }
+
+       //  CharInCategoryGroup
+       //  This is used for categories which are composed of other categories - L, N, Z, W...
+       //  These groups need special treatment when they are negated
+        private static bool CharInCategoryGroup(char ch, UnicodeCategory chcategory, string category, ref int i) {
+            i++;
+
+            int curcat = (short) category[i];
+            if (curcat > 0) {
+                // positive case - the character must be in ANY of the categories in the group
+                bool answer = false;
+
+                while (curcat != 0) {
+                    if (!answer) {
+                        --curcat;
+                        if (chcategory == (UnicodeCategory) curcat)
+                            answer = true;
+                    }
+                    i++;
+                    curcat = (short) category[i];
+                }
+                return answer;
+            }
+            else {
+
+                // negative case - the character must be in NONE of the categories in the group
+                bool answer = true;
+
+                while (curcat != 0) {
+                    if (answer) {
+                        curcat = -curcat;
+                        --curcat;
+                        if (chcategory == (UnicodeCategory) curcat)
+                            answer = false;
+                    }
+                    i++;
+                    curcat = (short) category[i];
+                }
+                return answer;
+            }
+        }
+
+        internal static string NegateCategory(string category) {
+            if (category == null)
+                return null;
+
+            StringBuilder sb = new StringBuilder();
+
+            for (int i=0; i<category.Length; i++) {
+                short ch = (short) category[i];
+                sb.Append( (char) -ch);
+            }
+            return sb.ToString();
+        }
+
+        // RangeCount()
+        //
+        // The number of single ranges that have been accumulated so far.
+        private int RangeCount() {
+            return _rangelist.Count;
+        }
+
+        // Range(int i)
+        //
+        // The ith range.
+        private SingleRange Range(int i) {
+            return(SingleRange)_rangelist[i];
+        }
+
+        // SingleRangeComparer
+        //
+        // For sorting ranges; compare based on the first char in the range.
+        private sealed class SingleRangeComparer : IComparer {
+            public int Compare(Object x, Object y) {
+                return(((SingleRange)x)._first < ((SingleRange)y)._first ? -1
+                       : (((SingleRange)x)._first > ((SingleRange)y)._first ? 1 : 0));
+            }
+        }
+
+        // SingleRange
+        //
+        // A first/last pair representing a single range of characters.
+        private sealed class SingleRange {
+            internal SingleRange(char first, char last) {
+                _first = first;
+                _last = last;
+            }
+
+            internal char _first;
+            internal char _last;
+        }
+
+        // Canonicalize()
+        //
+        // Logic to reduce a character class to a unique, sorted form.
+        private void Canonicalize() {
+            SingleRange CurrentRange;
+            int i;
+            int j;
+            char last;
+            bool Done;
+
+            _canonical = true;
+            _rangelist.Sort(0, _rangelist.Count, new SingleRangeComparer());
+
+            //
+            // Find and eliminate overlapping or abutting ranges
+            //
+
+            if (_rangelist.Count > 1) {
+                Done = false;
+
+                for (i = 1, j = 0; ; i++) {
+                    for (last = ((SingleRange)_rangelist[j])._last; ; i++) {
+                        if (i == _rangelist.Count || last == Lastchar) {
+                            Done = true;
+                            break;
+                        }
+
+                        if ((CurrentRange = (SingleRange)_rangelist[i])._first > last + 1)
+                            break;
+
+                        if (last < CurrentRange._last)
+                            last = CurrentRange._last;
+                    }
+
+                    ((SingleRange)_rangelist[j])._last = last;
+
+                    j++;
+
+                    if (Done)
+                        break;
+
+                    if (j < i)
+                        _rangelist[j] = _rangelist[i];
+                }
+                _rangelist.RemoveRange(j, _rangelist.Count - j);
+            }
+        }
+
+        //   The property table contains all the block definitions defined in the
+        //   XML schema spec (http://www.w3.org/TR/2001/PR-xmlschema-2-20010316/#charcter-classes), Unicode 3.0 spec (www.unicode.org),
+        //   and Perl 5.6 (see Programming Perl, 3rd edition page 167).   Three blocks defined by Perl (and here) may
+        //   not be in the Unicode: IsHighPrivateUseSurrogates, IsHighSurrogates, and IsLowSurrogates.
+        //
+        //   In addition, there was some inconsistency in the definition of IsTibetan and IsArabicPresentationForms-B.
+        //   Regex goes with with the XML spec on both of these, since it seems to be (oddly enough) more correct than the Unicode spec!
+        //
+        //   This is what we use:
+        //   IsTibetan:  0xF00 - 0x0FFF
+        //   IsArabicPresentationForms-B: 0xFE70-0xFEFE
+        //
+        //   The Unicode spec is inconsistent for IsTibetan.  Its range is 0x0F00 - 0x0FBF.  However, it clearly defines
+        //   Tibetan characters above 0x0FBF.  This appears to be an error between the 2.0 and 3.0 spec.
+        //
+        //   The Unicode spec is also unclear on IsArabicPresentationForms-B, defining it as 0xFE70-0xFEFF.
+        //   There is only one character different here, 0xFEFF, which is a byte-order mark character and
+        //   is labeled in the spec as special.  I have excluded it from IsArabicPresentationForms-B and left it in IsSpecial.
+        // Has to be sorted by the first column
+        private static readonly String[,] _propTable = {
+            {"_xmlC", /* Name Char              */   "\u002D\u002F\u0030\u003B\u0041\u005B\u005F\u0060\u0061\u007B\u00AA\u00AB\u00B2\u00B4\u00B5\u00B6\u00B9\u00BB\u00BC\u00BF\u00C0\u00D7\u00D8\u00F7\u00F8\u01AA\u01AB\u01BB\u01BC\u01BE\u01C4\u01F6\u01FA\u0218\u0250\u02A9\u0386\u0387\u0388\u038B\u038C\u038D\u038E\u03A2\u03A3\u03CF\u03D0\u03D7\u03DA\u03DB\u03DC\u03DD\u03DE\u03DF\u03E0\u03E1\u03E2\u03F3\u0401\u040D\u040E\u0450\u0451\u045D\u045E\u0482\u0490\u04C0\u04C1\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04EC\u04EE\u04F6\u04F8\u04FA\u0531\u0557\u0561\u0588\u0660\u066A\u06F0\u06FA\u0966\u0970\u09E6\u09F0\u09F4\u09FA\u0A66\u0A70\u0AE6\u0AF0\u0B66\u0B70\u0BE7\u0BF3\u0C66\u0C70\u0CE6\u0CF0\u0D66\u0D70\u0E50\u0E5A\u0ED0\u0EDA\u0F20\u0F34\u10A0\u10C6\u10D0\u10F7\u1E00\u1E9C\u1EA0\u1EFA\u1F00\u1F16\u1F18\u1F1E\u1F20\u1F46\u1F48\u1F4E\u1F50\u1F58\u1F59\u1F5A\u1F5B\u1F5C\u1F5D\u1F5E\u1F5F\u1F7E\u1F80\u1FB5\u1FB6\u1FBD\u1FBE\u1FBF\u1FC2\u1FC5\u1FC6\u1FCD\u1FD0\u1FD4\u1FD6\u1FDC\u1FE0\u1FED\u1FF2\u1FF5\u1FF6\u1FFD\u2070\u2071\u2074"
+                +"\u207A\u207F\u208A\u20A8\u20A9\u2102\u2103\u2107\u2108\u210A\u2114\u2115\u211E\u2120\u2123\u2124\u2125\u2126\u2127\u2128\u2129\u212A\u2132\u2133\u2135\u2153\u2183\u2460\u249C\u24B6\u24EB\u2776\u2794\u3007\u3008\u3021\u302A\u3280\u328A\u3372\u3375\u3376\u3377\u3385\u338A\u338D\u3391\u3399\u339F\u33A9\u33AA\u33AD\u33AE\u33B0\u33B4\u33B9\u33BA\u33BF\u33C0\u33C1\u33C2\u33C3\u33C6\u33C7\u33C8\u33C9\u33D8\u33D9\u33DE"},
+            {"_xmlD",                                "\u0030\u003A\u0660\u066A\u06F0\u06FA\u0966\u0970\u09E6\u09F0\u0A66\u0A70\u0AE6\u0AF0\u0B66\u0B70\u0BE7\u0BF0\u0C66\u0C70\u0CE6\u0CF0\u0D66\u0D70\u0E50\u0E5A\u0ED0\u0EDA\u0F20\u0F2A\u2070\u2071\u2074\u207A\u2080\u208A"},
+            {"_xmlI", /* Start Name Char       */   "\u003A\u003B\u0041\u005B\u005F\u0060\u0061\u007B\u00A8\u00A9\u00AA\u00AB\u00AF\u00B0\u00B4\u00B6\u00B8\u00B9\u00BA\u00BB\u00C0\u00D7\u00D8\u00F7\u00F8\u01F6\u01FA\u0218\u0250\u02A9\u02B0\u02DF\u02E0\u02EA\u0374\u0375\u037A\u037B\u0384\u0387\u0388\u038B\u038C\u038D\u038E\u03A2\u03A3\u03CF\u03D0\u03D7\u03DA\u03DB\u03DC\u03DD\u03DE\u03DF\u03E0\u03E1\u03E2\u03F4\u0401\u040D\u040E\u0450\u0451\u045D\u045E\u0482\u0490\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04EC\u04EE\u04F6\u04F8\u04FA\u0531\u0557\u0559\u055A\u0561\u0588\u05D0\u05EB\u05F0\u05F3\u0621\u063B\u0640\u064B\u0671\u06B8\u06BA\u06BF\u06C0\u06CF\u06D0\u06D4\u06D5\u06D6\u06E5\u06E7\u0905\u093A\u0958\u0962\u0985\u098D\u098F\u0991\u0993\u09A9\u09AA\u09B1\u09B2\u09B3\u09B6\u09BA\u09DC\u09DE\u09DF\u09E2\u09F0\u09F2\u0A05\u0A0B\u0A0F\u0A11\u0A13\u0A29\u0A2A\u0A31\u0A32\u0A34\u0A35\u0A37\u0A38\u0A3A\u0A59\u0A5D\u0A5E\u0A5F\u0A85\u0A8C\u0A8D\u0A8E\u0A8F\u0A92\u0A93\u0AA9\u0AAA\u0AB1\u0AB2\u0AB4\u0AB5\u0ABA\u0AE0\u0AE1\u0B05"
+                +"\u0B0D\u0B0F\u0B11\u0B13\u0B29\u0B2A\u0B31\u0B32\u0B34\u0B36\u0B3A\u0B5C\u0B5E\u0B5F\u0B62\u0B85\u0B8B\u0B8E\u0B91\u0B92\u0B96\u0B99\u0B9B\u0B9C\u0B9D\u0B9E\u0BA0\u0BA3\u0BA5\u0BA8\u0BAB\u0BAE\u0BB6\u0BB7\u0BBA\u0C05\u0C0D\u0C0E\u0C11\u0C12\u0C29\u0C2A\u0C34\u0C35\u0C3A\u0C60\u0C62\u0C85\u0C8D\u0C8E\u0C91\u0C92\u0CA9\u0CAA\u0CB4\u0CB5\u0CBA\u0CDE\u0CDF\u0CE0\u0CE2\u0D05\u0D0D\u0D0E\u0D11\u0D12\u0D29\u0D2A\u0D3A\u0D60\u0D62\u0E01\u0E31\u0E32\u0E34\u0E40\u0E47\u0E4F\u0E50\u0E5A\u0E5C\u0E81\u0E83\u0E84\u0E85\u0E87\u0E89\u0E8A\u0E8B\u0E8D\u0E8E\u0E94\u0E98\u0E99\u0EA0\u0EA1\u0EA4\u0EA5\u0EA6\u0EA7\u0EA8\u0EAA\u0EAC\u0EAD\u0EAF\u0EB0\u0EB1\u0EB2\u0EB4\u0EBD\u0EBE\u0EC0\u0EC5\u0EDC\u0EDE\u0F18\u0F1A\u0F40\u0F48\u0F49\u0F6A\u10A0\u10C6\u10D0\u10F7\u1100\u115A\u115F\u11A3\u11A8\u11FA\u1E00\u1E9C\u1EA0\u1EFA\u1F00\u1F16\u1F18\u1F1E\u1F20\u1F46\u1F48\u1F4E\u1F50\u1F58\u1F59\u1F5A\u1F5B\u1F5C\u1F5D\u1F5E\u1F5F\u1F7E\u1F80\u1FB5\u1FB6\u1FC5\u1FC6\u1FD4\u1FD6\u1FDC\u1FDD\u1FF0"
+                +"\u1FF2\u1FF5\u1FF6\u1FFF\u207F\u2080\u20A8\u20A9\u2102\u2103\u2107\u2108\u210A\u2114\u2115\u211E\u2120\u2123\u2124\u2125\u2126\u2127\u2128\u2129\u212A\u2132\u2133\u2139\u24B6\u24EA\u3041\u3095\u309B\u309F\u30A1\u30FB\u30FC\u30FF\u3105\u312D\u3131\u318F\u3192\u31A0\u3260\u327C\u328A\u32B1\u32D0\u32FF\u3300\u3358\u3371\u3377\u337B\u3395\u3399\u339F\u33A9\u33AE\u33B0\u33C2\u33C3\u33C6\u33C7\u33D8\u33D9\u33DE\u4E00\u4E01\u9FA5\u9FA6\uAC00\uAC01\uD7A3\uD7A4\uF900"},
+            {"_xmlW",                                "\u0023\u0025\u0026\u0027\u002A\u002C\u0030\u003A\u003C\u003F\u0040\u005B\u005E\u007B\u007C\u007D\u007E\u007F\u00A2\u00AB\u00AC\u00AD\u00AE\u00B7\u00B8\u00BB\u00BC\u00BF\u00C0\u037E\u037F\u0387\u0388\u055A\u0560\u0589\u058A\u05BE\u05BF\u05C0\u05C1\u05C3\u05C4\u05F3\u05F5\u060C\u060D\u061B\u061C\u061F\u0620\u06D4\u06D5\u093D\u093E\u0970\u0971\u0ABD\u0ABE\u0B3D\u0B3E\u0EAF\u0EB0\u0F04\u0F13\u0F3A\u0F3E\u0F85\u0F86\u10FB\u10FC\u2000\u202F\u2030\u203D\u2045\u2047\u206A\u2070\u207D\u207F\u208D\u208F\u2329\u232B\u3000\u3004\u3005\u3007\u3008\u3012\u3014\u301D\u3030\u3031\u30FB\u30FC\uD800\uD801\uDB7F\uDB81\uDBFF\uDC01\uDFFF\uE001\uF8FF\uF900\uFD3E\uFD40\uFE30\uFE33\uFE35\uFE45\uFE50\uFE53\uFE54\uFE5F\uFE63\uFE64\uFE68\uFE69\uFE6A\uFE6B\uFEFF\uFF00\uFF01\uFF03\uFF05\uFF06\uFF07\uFF0A\uFF0C\uFF10\uFF1A\uFF1C\uFF1F\uFF20\uFF3B\uFF3E\uFF5B\uFF5C\uFF5D\uFF5E\uFF61\uFF66"},
+
+            {"IsAlphabeticPresentationForms",       "\uFB00\uFB50"},
+            {"IsArabic",                            "\u0600\u0700"},
+            {"IsArabicPresentationForms-A",         "\uFB50\uFE00"},
+            {"IsArabicPresentationForms-B",         "\uFE70\uFEFF"},
+            {"IsArmenian",                          "\u0530\u0590"},
+            {"IsArrows",                            "\u2190\u2200"},
+            {"IsBasicLatin",                        "\u0000\u0080"},
+            {"IsBengali",                           "\u0980\u0A00"},
+            {"IsBlockElements",                     "\u2580\u25A0"},
+            {"IsBopomofo",                          "\u3100\u3130"},
+            {"IsBopomofoExtended",                  "\u31A0\u31C0"},
+            {"IsBoxDrawing",                        "\u2500\u2580"},
+            {"IsBraillePatterns",                   "\u2800\u2900"},
+            {"IsCherokee",                          "\u13A0\u1400"},
+            {"IsCJKCompatibility",                  "\u3300\u3400"},
+            {"IsCJKCompatibilityForms",             "\uFE30\uFE50"},
+            {"IsCJKCompatibilityIdeographs",        "\uF900\uFB00"},
+            {"IsCJKRadicalsSupplement",             "\u2E80\u2F00"},
+            {"IsCJKSymbolsandPunctuation",          "\u3000\u3040"},
+            {"IsCJKUnifiedIdeographs",              "\u4E00\uA000"},
+            {"IsCJKUnifiedIdeographsExtensionA",    "\u3400\u4DB6"},
+            {"IsCombiningDiacriticalMarks",         "\u0300\u0370"},
+            {"IsCombiningHalfMarks",                "\uFE20\uFE30"},
+            {"IsCombiningMarksforSymbols",          "\u20D0\u2100"},
+            {"IsControlPictures",                   "\u2400\u2440"},
+            {"IsCurrencySymbols",                   "\u20A0\u20D0"},
+            {"IsCyrillic",                          "\u0400\u0500"},
+            {"IsDevanagari",                        "\u0900\u0980"},
+            {"IsDingbats",                          "\u2700\u27C0"},
+            {"IsEnclosedAlphanumerics",             "\u2460\u2500"},
+            {"IsEnclosedCJKLettersandMonths",       "\u3200\u3300"},
+            {"IsEthiopic",                          "\u1200\u1380"},
+            {"IsGeneralPunctuation",                "\u2000\u2070"},
+            {"IsGeometricShapes",                   "\u25A0\u2600"},
+            {"IsGeorgian",                          "\u10A0\u1100"},
+            {"IsGreek",                             "\u0370\u0400"},
+            {"IsGreekExtended",                     "\u1F00\u2000"},
+            {"IsGujarati",                          "\u0A80\u0B00"},
+            {"IsGurmukhi",                          "\u0A00\u0A80"},
+            {"IsHalfwidthandFullwidthForms",        "\uFF00\uFFF0"},
+            {"IsHangulCompatibilityJamo",           "\u3130\u3190"},
+            {"IsHangulJamo",                        "\u1100\u1200"},
+            {"IsHangulSyllables",                   "\uAC00\uD7A4"},
+            {"IsHebrew",                            "\u0590\u0600"},
+            {"IsHighPrivateUseSurrogates",          "\uDB80\uDC00"},
+            {"IsHighSurrogates",                    "\uD800\uDB80"},
+            {"IsHiragana",                          "\u3040\u30A0"},
+            {"IsIdeographicDescriptionCharacters",  "\u2FF0\u3000"},
+            {"IsIPAExtensions",                     "\u0250\u02B0"},
+            {"IsKanbun",                            "\u3190\u31A0"},
+            {"IsKangxiRadicals",                    "\u2F00\u2FE0"},
+            {"IsKannada",                           "\u0C80\u0D00"},
+            {"IsKatakana",                          "\u30A0\u3100"},
+            {"IsKhmer",                             "\u1780\u1800"},
+            {"IsLao",                               "\u0E80\u0F00"},
+            {"IsLatin-1Supplement",                 "\u0080\u0100"},
+            {"IsLatinExtended-A",                   "\u0100\u0180"},
+            {"IsLatinExtendedAdditional",           "\u1E00\u1F00"},
+            {"IsLatinExtended-B",                   "\u0180\u0250"},
+            {"IsLetterlikeSymbols",                 "\u2100\u2150"},
+            {"IsLowSurrogates",                     "\uDC00\uE000"},
+            {"IsMalayalam",                         "\u0D00\u0D80"},
+            {"IsMathematicalOperators",             "\u2200\u2300"},
+            {"IsMiscellaneousSymbols",              "\u2600\u2700"},
+            {"IsMiscellaneousTechnical",            "\u2300\u2400"},
+            {"IsMongolian",                         "\u1800\u18B0"},
+            {"IsMyanmar",                           "\u1000\u10A0"},
+            {"IsNumberForms",                       "\u2150\u2190"},
+            {"IsOgham",                             "\u1680\u16A0"},
+            {"IsOpticalCharacterRecognition",       "\u2440\u2460"},
+            {"IsOriya",                             "\u0B00\u0B80"},
+            {"IsPrivateUse",                        "\uE000\uF900"},
+            {"IsRunic",                             "\u16A0\u1700"},
+            {"IsSinhala",                           "\u0D80\u0E00"},
+            {"IsSmallFormVariants",                 "\uFE50\uFE70"},
+            {"IsSpacingModifierLetters",            "\u02B0\u0300"},
+            {"IsSpecials",                          "\uFEFF\uFF00\uFFF0\uFFFE"},
+            {"IsSuperscriptsandSubscripts",         "\u2070\u20A0"},
+            {"IsSyriac",                            "\u0700\u0750"},
+            {"IsTamil",                             "\u0B80\u0C00"},
+            {"IsTelugu",                            "\u0C00\u0C80"},
+            {"IsThaana",                            "\u0780\u07C0"},
+            {"IsThai",                              "\u0E00\u0E80"},
+            {"IsTibetan",                           "\u0F00\u1000"},
+            {"IsUnifiedCanadianAboriginalSyllabics","\u1400\u1680"},
+            {"IsYiRadicals",                        "\uA490\uA4D0"},
+            {"IsYiSyllables",                       "\uA000\uA490"},
+        };
+
+        internal static String SetFromProperty(String capname, bool invert, string pattern) {
+            int min = 0;
+            int max = _propTable.GetLength(0);
+            while (min != max) {
+                int mid = (min + max) / 2;
+                int res = String.Compare(capname, _propTable[mid,0], false);//, CultureInfo.InvariantCulture);
+                if (res < 0)
+                    max = mid;
+                else if (res > 0)
+                    min = mid + 1;
+                else {
+                    String set = _propTable[mid,1];
+                    return invert ? SetInverse(set): set;
+                }
+            }
+            throw new ArgumentException("Unknown property");//XXX: SR.GetString(SR.MakeException, pattern, SR.GetString(SR.UnknownProperty, capname)), pattern);
+            //return invert ? Any : Empty ;
+        }
+
+#if DBG
+        // SetDescription()
+        //
+        // Produces a human-readable description for a set string.
+        internal static String SetDescription(String set) {
+            if (set.Equals(Any))
+                return "[^]";
+
+            if (set.Equals(Empty))
+                return "[]";
+
+            StringBuilder desc = new StringBuilder("[");
+
+            int index;
+            char ch1;
+            char ch2;
+
+            if (set[0] == Nullchar) {
+                index = 1;
+                desc.Append('^');
+            }
+            else {
+                index = 0;
+            }
+
+            while (index < set.Length) {
+                ch1 = set[index];
+                if (index + 1 < set.Length)
+                    ch2 = (char)(set[index + 1] - 1);
+                else
+                    ch2 = Lastchar;
+
+                desc.Append(CharDescription(ch1));
+
+                if (ch2 != ch1) {
+                    if (ch1 + 1 != ch2)
+                        desc.Append('-');
+                    desc.Append(CharDescription(ch2));
+                }
+                index += 2;
+            }
+
+            desc.Append(']');
+
+            return desc.ToString();
+        }
+
+        internal static readonly char [] Hex = new char [] {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+        // CharDescription()
+        //
+        // Produces a human-readable description for a single character.
+        internal static String CharDescription(char ch) {
+            StringBuilder sb = new StringBuilder();
+            int shift;
+
+            if (ch == '\\')
+                return "\\\\";
+
+            if (ch >= ' ' && ch <= '~') {
+                sb.Append(ch);
+                return sb.ToString();
+            }
+
+            if (ch < 256) {
+                sb.Append("\\x");
+                shift = 8;
+            }
+            else {
+                sb.Append("\\u");
+                shift = 16;
+            }
+
+            while (shift > 0) {
+                shift -= 4;
+                sb.Append(Hex[(ch >> shift) & 0xF]);
+            }
+
+            return sb.ToString();
+        }
+#endif
+
+    }
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexcode.cs b/base/Kernel/System/Text/RegularExpressions/regexcode.cs
new file mode 100644
index 0000000..ad4b4dd
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexcode.cs
@@ -0,0 +1,394 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexCode class is internal to the regular expression package.
+// It provides operator constants for use by the Builder and the Machine.
+//
+
+// Implementation notes:
+//
+// Regexps are built into RegexCodes, which contain an operation array,
+// a string table, and some constants.
+//
+// Each operation is one of the codes below, followed by the integer
+// operands specified for each op.
+//
+// Strings and sets are indices into a string table.
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Diagnostics;
+
+    internal sealed class RegexCode {
+        // the following primitive operations come directly from the parser
+
+        // lef/back operands        description
+
+        internal const int Onerep         = 0;    // lef,back char,min,max    a {n}
+        internal const int Notonerep      = 1;    // lef,back char,min,max    .{n}
+        internal const int Setrep         = 2;    // lef,back set,min,max     [\d]{n}
+
+        internal const int Oneloop        = 3;    // lef,back char,min,max    a {,n}
+        internal const int Notoneloop     = 4;    // lef,back char,min,max    .{,n}
+        internal const int Setloop        = 5;    // lef,back set,min,max     [\d]{,n}
+
+        internal const int Onelazy        = 6;    // lef,back char,min,max    a {,n}?
+        internal const int Notonelazy     = 7;    // lef,back char,min,max    .{,n}?
+        internal const int Setlazy        = 8;    // lef,back set,min,max     [\d]{,n}?
+
+        internal const int One            = 9;    // lef      char            a
+        internal const int Notone         = 10;   // lef      char            [^a]
+        internal const int Set            = 11;   // lef      set             [a-z\s]  \w \s \d
+
+        internal const int Multi          = 12;   // lef      string          abcd
+        internal const int Ref            = 13;   // lef      group           \#
+
+        internal const int Bol            = 14;   //                          ^
+        internal const int Eol            = 15;   //                          $
+        internal const int Boundary       = 16;   //                          \b
+        internal const int Nonboundary    = 17;   //                          \B
+        internal const int Beginning      = 18;   //                          \A
+        internal const int Start          = 19;   //                          \G
+        internal const int EndZ           = 20;   //                          \Z
+        internal const int End            = 21;   //                          \Z
+
+        internal const int Nothing        = 22;   //                          Reject!
+
+        // primitive control structures
+
+        internal const int Lazybranch     = 23;   // back     jump            straight first
+        internal const int Branchmark     = 24;   // back     jump            branch first for loop
+        internal const int Lazybranchmark = 25;   // back     jump            straight first for loop
+        internal const int Nullcount      = 26;   // back     val             set counter, null mark
+        internal const int Setcount       = 27;   // back     val             set counter, make mark
+        internal const int Branchcount    = 28;   // back     jump,limit      branch++ if zero<=c<limit
+        internal const int Lazybranchcount= 29;   // back     jump,limit      same, but straight first
+        internal const int Nullmark       = 30;   // back                     save position
+        internal const int Setmark        = 31;   // back                     save position
+        internal const int Capturemark    = 32;   // back     group           define group
+        internal const int Getmark        = 33;   // back                     recall position
+        internal const int Setjump        = 34;   // back                     save backtrack state
+        internal const int Backjump       = 35;   //                          zap back to saved state
+        internal const int Forejump       = 36;   //                          zap backtracking state
+        internal const int Testref        = 37;   //                          backtrack if ref undefined
+        internal const int Goto           = 38;   //          jump            just go
+
+        internal const int Prune          = 39;   //                          prune it baby
+        internal const int Stop           = 40;   //                          done!
+
+        internal const int ECMABoundary   = 41;   //                          \b
+        internal const int NonECMABoundary= 42;   //                          \B
+
+        // modifiers for alternate modes
+
+        internal const int Mask           = 63;   // Mask to get unmodified ordinary operator
+        internal const int Rtl            = 64;   // bit to indicate that we're reverse scanning.
+        internal const int Back           = 128;  // bit to indicate that we're backtracking.
+        internal const int Back2          = 256;  // bit to indicate that we're backtracking on a second branch.
+        internal const int Ci             = 512;  // bit to indicate that we're case-insensitive.
+
+        internal const int infinite = RegexNode.infinite;
+
+        // the code
+
+        internal int[]           _codes;                 // the code
+        internal String[]        _strings;               // the string/set table
+        // not used! internal int[]           _sparseIndex;           // a list of the groups that are used
+        internal int             _trackcount;            // how many instructions use backtracking
+        internal Hashtable       _caps;                  // mapping of user group numbers -> impl group slots
+        internal int             _capsize;               // number of impl group slots
+        internal RegexPrefix     _fcPrefix;              // the set of candidate first characters (may be null)
+        internal RegexPrefix     _scPrefix;              // the set of scanned characters (may be null)
+        internal RegexBoyerMoore _bmPrefix;              // the fixed prefix string as a Boyer-Moore machine (may be null)
+        internal int             _anchors;               // the set of zero-length start anchors (RegexFCD.Bol, etc)
+        internal bool         _rightToLeft;           // true if right to left
+
+        // optimizations
+
+        // constructor
+
+        internal RegexCode(int [] codes, ArrayList stringlist, int trackcount,
+                           Hashtable caps, int capsize,
+                           RegexBoyerMoore bmPrefix, RegexPrefix fcPrefix, RegexPrefix scPrefix,
+                           int anchors, bool rightToLeft) {
+            _codes = codes;
+            _strings = new String[stringlist.Count];
+            _trackcount = trackcount;
+            _caps = caps;
+            _capsize = capsize;
+            _bmPrefix = bmPrefix;
+            _fcPrefix = fcPrefix;
+            _scPrefix = scPrefix;
+            _anchors = anchors;
+            _rightToLeft = rightToLeft;
+            stringlist.CopyTo(0, _strings, 0, stringlist.Count);
+        }
+
+        internal static bool OpcodeBacktracks(int Op) {
+            Op &= Mask;
+
+            switch (Op) {
+                case Oneloop:
+                case Notoneloop:
+                case Setloop:
+                case Onelazy:
+                case Notonelazy:
+                case Setlazy:
+                case Lazybranch:
+                case Branchmark:
+                case Lazybranchmark:
+                case Nullcount:
+                case Setcount:
+                case Branchcount:
+                case Lazybranchcount:
+                case Setmark:
+                case Capturemark:
+                case Getmark:
+                case Setjump:
+                case Backjump:
+                case Forejump:
+                case Goto:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        internal static int OpcodeSize(int Opcode) {
+            Opcode &= Mask;
+
+            switch (Opcode) {
+                case Nothing:
+                case Bol:
+                case Eol:
+                case Boundary:
+                case Nonboundary:
+                case ECMABoundary:
+                case NonECMABoundary:
+                case Beginning:
+                case Start:
+                case EndZ:
+                case End:
+
+                case Nullmark:
+                case Setmark:
+                case Getmark:
+                case Setjump:
+                case Backjump:
+                case Forejump:
+                case Stop:
+
+                    return 1;
+
+                case One:
+                case Notone:
+                case Multi:
+                case Ref:
+                case Testref:
+
+
+                case Goto:
+                case Nullcount:
+                case Setcount:
+                case Lazybranch:
+                case Branchmark:
+                case Lazybranchmark:
+                case Prune:
+
+                    return 2;
+
+                case Capturemark:
+                case Branchcount:
+                case Lazybranchcount:
+                case Set:
+
+                case Onerep:
+                case Notonerep:
+                case Oneloop:
+                case Notoneloop:
+                case Onelazy:
+                case Notonelazy:
+
+                    return 3;
+
+                case Setlazy:
+                case Setrep:
+                case Setloop:
+
+                    return 4;
+
+                default:
+
+                    throw MakeException("Unexpected Opcode"); // XXX: SR.GetString(SR.UnexpectedOpcode, Opcode.ToString()));
+            }
+        }
+
+        internal static ArgumentException MakeException(String message) {
+            return new ArgumentException(message);
+        }
+
+        // Debug only code below
+
+#if DBG
+        internal static String[] CodeStr = new String[]
+        {
+            "Onerep", "Notonerep", "Setrep",
+            "Oneloop", "Notoneloop", "Setloop",
+            "Onelazy", "Notonelazy", "Setlazy",
+            "One", "Notone", "Set",
+            "Multi", "Ref",
+            "Bol", "Eol", "Boundary", "Nonboundary", "Beginning", "Start", "EndZ", "End",
+            "Nothing",
+            "Lazybranch", "Branchmark", "Lazybranchmark",
+            "Nullcount", "Setcount", "Branchcount", "Lazybranchcount",
+            "Nullmark", "Setmark", "Capturemark", "Getmark",
+            "Setjump", "Backjump", "Forejump", "Testref", "Goto",
+            "Prune", "Stop",
+            "ECMABoundary", "NonECMABoundary",
+        };
+
+        internal static String OperatorDescription(int Opcode) {
+            bool isCi   = ((Opcode & Ci) != 0);
+            bool isRtl  = ((Opcode & Rtl) != 0);
+            bool isBack = ((Opcode & Back) != 0);
+            bool isBack2 = ((Opcode & Back2) != 0);
+
+            return CodeStr[Opcode & Mask] +
+            (isCi ? "-Ci" : "") + (isRtl ? "-Rtl" : "") + (isBack ? "-Back" : "") + (isBack2 ? "-Back2" : "");
+        }
+
+        internal String OpcodeDescription(int offset) {
+            StringBuilder sb = new StringBuilder();
+            int opcode = _codes[offset];
+
+            sb.AppendFormat("{0:D6} ", offset);
+            sb.Append(OpcodeBacktracks(opcode & Mask) ? '*' : ' ');
+            sb.Append(OperatorDescription(opcode));
+            sb.Append('(');
+
+            opcode &= Mask;
+
+            switch (opcode) {
+                case One:
+                case Notone:
+                case Onerep:
+                case Notonerep:
+                case Oneloop:
+                case Notoneloop:
+                case Onelazy:
+                case Notonelazy:
+                    sb.Append("Ch = ");
+                    sb.Append(RegexCharClass.CharDescription((char)_codes[offset+1]));
+                    break;
+
+                case Set:
+                case Setrep:
+                case Setloop:
+                case Setlazy:
+                    sb.Append("Set = ");
+                    sb.Append(RegexCharClass.SetDescription(_strings[_codes[offset+1]]));
+                    break;
+
+                case Multi:
+                    sb.Append("String = ");
+                    sb.Append(_strings[_codes[offset+1]]);
+                    break;
+
+                case Ref:
+                case Testref:
+                    sb.Append("Index = ");
+                    sb.Append(_codes[offset+1]);
+                    break;
+
+                case Capturemark:
+                    sb.Append("Index = ");
+                    sb.Append(_codes[offset+1]);
+                    if (_codes[offset+2] != -1) {
+                        sb.Append(", Unindex = ");
+                        sb.Append(_codes[offset+2]);
+                    }
+                    break;
+
+                case Nullcount:
+                case Setcount:
+                    sb.Append("Value = ");
+                    sb.Append(_codes[offset+1]);
+                    break;
+
+                case Goto:
+                case Lazybranch:
+                case Branchmark:
+                case Lazybranchmark:
+                case Branchcount:
+                case Lazybranchcount:
+                    sb.Append("Addr = ");
+                    sb.Append(_codes[offset+1]);
+                    break;
+            }
+
+            switch (opcode) {
+                case Onerep:
+                case Notonerep:
+                case Oneloop:
+                case Notoneloop:
+                case Onelazy:
+                case Notonelazy:
+                case Setrep:
+                case Setloop:
+                case Setlazy:
+                    sb.Append(", Rep = ");
+                    if (_codes[offset + 2] == infinite)
+                        sb.Append("inf");
+                    else
+                        sb.Append(_codes[offset + 2]);
+                    break;
+
+                case Branchcount:
+                case Lazybranchcount:
+                    sb.Append(", Limit = ");
+                    if (_codes[offset + 2] == infinite)
+                        sb.Append("inf");
+                    else
+                        sb.Append(_codes[offset + 2]);
+                    break;
+            }
+
+            sb.Append(")");
+
+            return sb.ToString();
+        }
+
+        internal void Dump() {
+            int i;
+
+            Debug.WriteLine("Direction:  " + (_rightToLeft ? "right-to-left" : "left-to-right"));
+            Debug.WriteLine("Firstchars: " + (_fcPrefix == null ? "n/a" : RegexCharClass.SetDescription(_fcPrefix.Prefix)));
+            Debug.WriteLine("Prefix:     " + (_bmPrefix == null ? "n/a" : Regex.Escape(_bmPrefix.ToString())));
+            Debug.WriteLine("Anchors:    " + RegexFCD.AnchorDescription(_anchors));
+            Debug.WriteLine("Scanchars:  " + (_scPrefix == null ? "n/a" : RegexCharClass.SetDescription(_scPrefix.Prefix)));
+            Debug.WriteLine("");
+            /*
+            if (_bmPrefix != null) {
+                Debug.WriteLine("BoyerMoore:");
+                Debug.WriteLine(_bmPrefix.Dump("    "));
+            }
+            */
+            for (i = 0; i < _codes.Length;) {
+                Debug.WriteLine(OpcodeDescription(i));
+                i += OpcodeSize(_codes[i]);
+            }
+
+            Debug.WriteLine("");
+        }
+#endif
+
+    }
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexcompilationinfo.cs b/base/Kernel/System/Text/RegularExpressions/regexcompilationinfo.cs
new file mode 100644
index 0000000..40da0bf
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexcompilationinfo.cs
@@ -0,0 +1,109 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Text.RegularExpressions {
+    using System;
+
+    //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       [To be supplied]
+    ///    </para>
+    /// </devdoc>
+    //[ Serializable() ]
+    public class RegexCompilationInfo {
+        private String           pattern;
+        private RegexOptions     options;
+        private String           name;
+        private String           nspace;
+        private bool             isPublic;
+
+        //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo.RegexCompilationInfo"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied]
+        ///    </para>
+        /// </devdoc>
+        public RegexCompilationInfo(String pattern, RegexOptions options, String name, String fullnamespace, bool ispublic) {
+            Pattern = pattern;
+            Name = name;
+            Namespace = fullnamespace;
+            this.options = options;
+            isPublic = ispublic;
+        }
+
+        //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo.Pattern"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied]
+        ///    </para>
+        /// </devdoc>
+        public String Pattern {
+            get { return pattern; }
+            set {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+                pattern = value;
+            }
+        }
+
+        //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo.Options"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied]
+        ///    </para>
+        /// </devdoc>
+        public RegexOptions Options {
+            get { return options; }
+            set { options = value;}
+        }
+
+        //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo.Name"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied]
+        ///    </para>
+        /// </devdoc>
+        public String Name {
+            get { return name; }
+            set {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+                name = value;
+            }
+        }
+
+        //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo.Namespace"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied]
+        ///    </para>
+        /// </devdoc>
+        public String Namespace {
+            get { return nspace; }
+            set {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+                nspace = value;
+            }
+        }
+
+        //| <include file='doc\RegexCompilationInfo.uex' path='docs/doc[@for="RegexCompilationInfo.IsPublic"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied]
+        ///    </para>
+        /// </devdoc>
+        public bool IsPublic {
+            get { return isPublic; }
+            set { isPublic = value;}
+        }
+    }
+}
+
+
diff --git a/base/Kernel/System/Text/RegularExpressions/regexfcd.cs b/base/Kernel/System/Text/RegularExpressions/regexfcd.cs
new file mode 100644
index 0000000..b45826f
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexfcd.cs
@@ -0,0 +1,653 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexFCD class is internal to the Regex package.
+// It builds a bunch of FC information (RegexFC) about
+// the regex for optimization purposes.
+//
+
+// Implementation notes:
+//
+// This step is as simple as walking the tree and emitting
+// sequences of codes.
+//
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Globalization;
+
+    internal sealed class RegexFCD {
+        internal int[]      _intStack;
+        internal int        _intDepth;
+        internal RegexFC[]  _fcStack;
+        internal int        _fcDepth;
+        internal bool    _earlyexit;
+        internal bool    _skipchild;
+
+        internal const int BeforeChild = 64;
+        internal const int AfterChild = 128;
+
+        // where the regex can be pegged
+
+        internal const int Beginning  = 0x0001;
+        internal const int Bol        = 0x0002;
+        internal const int Start      = 0x0004;
+        internal const int Eol        = 0x0008;
+        internal const int EndZ       = 0x0010;
+        internal const int End        = 0x0020;
+        internal const int Boundary   = 0x0040;
+        internal const int ECMABoundary = 0x0080;
+
+        internal const int infinite = RegexCode.infinite;
+
+        // This is the one of the only two functions that should be called from outside.
+        // It takes a RegexTree and computes the set of chars that can start it.
+        internal static RegexPrefix FirstChars(RegexTree t) {
+            RegexFCD s = new RegexFCD();
+            RegexFC fc = s.RegexFCFromRegexTree(t);
+
+            if (fc._nullable)
+                return null;
+
+            CultureInfo culture = ((t._options & RegexOptions.CultureInvariant) != 0) ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture;
+            return new RegexPrefix(fc.GetFirstChars(culture), fc.IsCaseInsensitive());
+        }
+
+        // This is a related computation: it takes a RegexTree and computes the
+        // leading substring if it see one. It's quite trivial and gives up easily.
+        internal static RegexPrefix Prefix(RegexTree tree) {
+            RegexNode curNode;
+            RegexNode concatNode = null;
+            int nextChild = 0;
+
+            curNode = tree._root;
+
+            for (;;) {
+                switch (curNode._type) {
+                    case RegexNode.Concatenate:
+                        if (curNode.ChildCount() > 0) {
+                            concatNode = curNode;
+                            nextChild = 0;
+                        }
+                        break;
+
+                    case RegexNode.Greedy:
+                    case RegexNode.Capture:
+                        curNode = curNode.Child(0);
+                        concatNode = null;
+                        continue;
+
+                    case RegexNode.Oneloop:
+                    case RegexNode.Onelazy:
+                    case RegexNode.Multi:
+                        goto OuterloopBreak;
+
+                    case RegexNode.Bol:
+                    case RegexNode.Eol:
+                    case RegexNode.Boundary:
+                    case RegexNode.ECMABoundary:
+                    case RegexNode.Beginning:
+                    case RegexNode.Start:
+                    case RegexNode.EndZ:
+                    case RegexNode.End:
+                    case RegexNode.Empty:
+                    case RegexNode.Require:
+                    case RegexNode.Prevent:
+                        break;
+
+                    default:
+                        return RegexPrefix.Empty;
+                }
+
+                if (concatNode == null || nextChild >= concatNode.ChildCount())
+                    return RegexPrefix.Empty;
+
+                curNode = concatNode.Child(nextChild++);
+            }
+
+            OuterloopBreak:
+            ;
+
+            switch (curNode._type) {
+                case RegexNode.Multi:
+                    return new RegexPrefix(curNode._str, 0 != (curNode._options & RegexOptions.IgnoreCase));
+
+                case RegexNode.Oneloop:
+                    goto
+                case RegexNode.Onelazy;
+                case RegexNode.Onelazy:
+                    if (curNode._m > 0) {
+                        StringBuilder sb = new StringBuilder();
+                        sb.Append(curNode._ch, curNode._m);
+                        return new RegexPrefix(sb.ToString(), 0 != (curNode._options & RegexOptions.IgnoreCase));
+                    }
+                    // else fall through
+                    goto default;
+
+                default:
+                    return RegexPrefix.Empty;
+            }
+        }
+
+        // This is a related computation: it takes a RegexTree and computes the
+        // leading []* construct if it see one. It's quite trivial and gives up easily.
+        internal static RegexPrefix ScanChars(RegexTree tree) {
+            RegexNode curNode;
+            RegexNode concatNode = null;
+            int nextChild = 0;
+            String foundSet = null;
+            bool caseInsensitive = false;
+
+            curNode = tree._root;
+
+            for (;;) {
+                switch (curNode._type) {
+                    case RegexNode.Concatenate:
+                        if (curNode.ChildCount() > 0) {
+                            concatNode = curNode;
+                            nextChild = 0;
+                        }
+                        break;
+
+                    case RegexNode.Greedy:
+                    case RegexNode.Capture:
+                        curNode = curNode.Child(0);
+                        concatNode = null;
+                        continue;
+
+                    case RegexNode.Bol:
+                    case RegexNode.Eol:
+                    case RegexNode.Boundary:
+                    case RegexNode.ECMABoundary:
+                    case RegexNode.Beginning:
+                    case RegexNode.Start:
+                    case RegexNode.EndZ:
+                    case RegexNode.End:
+                    case RegexNode.Empty:
+                    case RegexNode.Require:
+                    case RegexNode.Prevent:
+                        break;
+
+                    case RegexNode.Oneloop:
+                    case RegexNode.Onelazy:
+                        if (curNode._n != infinite)
+                            return null;
+
+                        foundSet = RegexCharClass.SetFromChar(curNode._ch);
+                        caseInsensitive = (0 != (curNode._options & RegexOptions.IgnoreCase));
+                        break;
+
+                    case RegexNode.Notoneloop:
+                    case RegexNode.Notonelazy:
+                        if (curNode._n != infinite)
+                            return null;
+
+                        foundSet = RegexCharClass.SetInverseFromChar(curNode._ch);
+                        caseInsensitive = (0 != (curNode._options & RegexOptions.IgnoreCase));
+                        break;
+
+                    case RegexNode.Setloop:
+                    case RegexNode.Setlazy:
+                        if (curNode._n != infinite || (curNode._str2 != null && curNode._str2.Length != 0))
+                            return null;
+
+                        foundSet = curNode._str;
+                        caseInsensitive = (0 != (curNode._options & RegexOptions.IgnoreCase));
+                        break;
+
+                    default:
+                        return null;
+                }
+
+                if (foundSet != null)
+                    return new RegexPrefix(foundSet, caseInsensitive);
+
+                if (concatNode == null || nextChild >= concatNode.ChildCount())
+                    return null;
+
+                curNode = concatNode.Child(nextChild++);
+            }
+        }
+
+        // Yet another related computation: it takes a RegexTree and computes the
+        // leading anchors that it encounters.
+        internal static int Anchors(RegexTree tree) {
+            RegexNode curNode;
+            RegexNode concatNode = null;
+            int nextChild = 0;
+            int result = 0;
+
+            curNode = tree._root;
+
+            for (;;) {
+                switch (curNode._type) {
+                    case RegexNode.Concatenate:
+                        if (curNode.ChildCount() > 0) {
+                            concatNode = curNode;
+                            nextChild = 0;
+                        }
+                        break;
+
+                    case RegexNode.Greedy:
+                    case RegexNode.Capture:
+                        curNode = curNode.Child(0);
+                        concatNode = null;
+                        continue;
+
+                    case RegexNode.Bol:
+                    case RegexNode.Eol:
+                    case RegexNode.Boundary:
+                    case RegexNode.ECMABoundary:
+                    case RegexNode.Beginning:
+                    case RegexNode.Start:
+                    case RegexNode.EndZ:
+                    case RegexNode.End:
+                        return result | AnchorFromType(curNode._type);
+
+                    case RegexNode.Empty:
+                    case RegexNode.Require:
+                    case RegexNode.Prevent:
+                        break;
+
+                    default:
+                        return result;
+                }
+
+                if (concatNode == null || nextChild >= concatNode.ChildCount())
+                    return result;
+
+                curNode = concatNode.Child(nextChild++);
+            }
+        }
+
+        // Convert anchor type to anchor bit.
+        internal static int AnchorFromType(int type) {
+            switch (type) {
+                case RegexNode.Bol:             return Bol;
+                case RegexNode.Eol:             return Eol;
+                case RegexNode.Boundary:        return Boundary;
+                case RegexNode.ECMABoundary:    return ECMABoundary;
+                case RegexNode.Beginning:       return Beginning;
+                case RegexNode.Start:           return Start;
+                case RegexNode.EndZ:            return EndZ;
+                case RegexNode.End:             return End;
+                default:                        return 0;
+            }
+        }
+
+#if DBG
+        internal static String AnchorDescription(int anchors) {
+            StringBuilder sb = new StringBuilder();
+
+            if (0 != (anchors & Beginning))     sb.Append(", Beginning");
+            if (0 != (anchors & Start))         sb.Append(", Start");
+            if (0 != (anchors & Bol))           sb.Append(", Bol");
+            if (0 != (anchors & Boundary))      sb.Append(", Boundary");
+            if (0 != (anchors & ECMABoundary))  sb.Append(", ECMABoundary");
+            if (0 != (anchors & Eol))           sb.Append(", Eol");
+            if (0 != (anchors & End))           sb.Append(", End");
+            if (0 != (anchors & EndZ))          sb.Append(", EndZ");
+
+            if (sb.Length >= 2)
+                return(sb.ToString(2, sb.Length - 2));
+
+            return "None";
+        }
+#endif
+
+        // private constructor; can't be created outside
+        private RegexFCD() {
+            _fcStack = new RegexFC[32];
+            _intStack = new int[32];
+        }
+
+        // To avoid recursion, we use a simple integer stack.
+        // This is the push.
+        internal void PushInt(int I) {
+            if (_intDepth >= _intStack.Length) {
+                int [] expanded = new int[_intDepth * 2];
+
+                System.Array.Copy(_intStack, 0, expanded, 0, _intDepth);
+
+                _intStack = expanded;
+            }
+
+            _intStack[_intDepth++] = I;
+        }
+
+        // True if the stack is empty.
+        internal bool EmptyInt() {
+            return _intDepth == 0;
+        }
+
+        // This is the pop.
+        internal int PopInt() {
+            return _intStack[--_intDepth];
+        }
+
+         // We also use a stack of RegexFC objects.
+         // This is the push.
+        internal void PushFC(RegexFC fc) {
+            if (_fcDepth >= _fcStack.Length) {
+                RegexFC[] expanded = new RegexFC[_fcDepth * 2];
+
+                System.Array.Copy(_fcStack, 0, expanded, 0, _fcDepth);
+                _fcStack = expanded;
+            }
+
+            _fcStack[_fcDepth++] = fc;
+        }
+
+        // True if the stack is empty.
+        internal bool EmptyFC() {
+            return _fcDepth == 0;
+        }
+
+        // This is the pop.
+        internal RegexFC PopFC() {
+            return _fcStack[--_fcDepth];
+        }
+
+        // This is the top.
+        internal RegexFC TopFC() {
+            return _fcStack[_fcDepth - 1];
+        }
+
+        // The main FC computation. It does a shortcutted depth-first walk
+        // through the tree and calls CalculateFC to emits code before
+        // and after each child of an interior node, and at each leaf.
+        internal RegexFC RegexFCFromRegexTree(RegexTree tree) {
+            RegexNode curNode;
+            int curChild;
+
+            curNode = tree._root;
+            curChild = 0;
+
+            for (;;) {
+                if (curNode._children == null) {
+                    CalculateFC(curNode._type, curNode, 0);
+                }
+                else if (curChild < curNode._children.Count && !_earlyexit) {
+                    CalculateFC(curNode._type | BeforeChild, curNode, curChild);
+
+                    if (!_skipchild) {
+                        curNode = (RegexNode)curNode._children[curChild];
+                        PushInt(curChild);
+                        curChild = 0;
+                    }
+                    else {
+                        curChild++;
+                        _skipchild = false;
+                    }
+                    continue;
+                }
+
+                _earlyexit = false;
+
+                if (EmptyInt())
+                    break;
+
+                curChild = PopInt();
+                curNode = curNode._next;
+
+                CalculateFC(curNode._type | AfterChild, curNode, curChild);
+                curChild++;
+            }
+
+            if (EmptyFC())
+                return new RegexFC(RegexCharClass.Any, true, false);
+
+            return PopFC();
+        }
+
+        // Called in AfterChild to prevent processing of the rest of the children at the current level
+        internal void EarlyExit() {
+            _earlyexit = true;
+        }
+
+        // Called in Beforechild to prevent further processing of the current child
+        internal void SkipChild() {
+            _skipchild = true;
+        }
+
+        // FC computation and shortcut cases for each node type
+        internal void CalculateFC(int NodeType, RegexNode node, int CurIndex) {
+            bool ci = false;
+            bool rtl = false;
+
+            if (NodeType <= RegexNode.Ref) {
+                if ((node._options & RegexOptions.IgnoreCase) != 0)
+                    ci = true;
+                if ((node._options & RegexOptions.RightToLeft) != 0)
+                    rtl = true;
+            }
+
+            switch (NodeType) {
+                case RegexNode.Concatenate | BeforeChild:
+                case RegexNode.Alternate | BeforeChild:
+                case RegexNode.Testref | BeforeChild:
+                case RegexNode.Loop | BeforeChild:
+                case RegexNode.Lazyloop | BeforeChild:
+                    break;
+
+                case RegexNode.Testgroup | BeforeChild:
+                    if (CurIndex == 0)
+                        SkipChild();
+                    break;
+
+                case RegexNode.Empty:
+                    PushFC(new RegexFC(true));
+                    break;
+
+                case RegexNode.Concatenate | AfterChild:
+                    if (CurIndex != 0) {
+                        RegexFC child = PopFC();
+                        RegexFC cumul = TopFC();
+
+                        cumul.AddFC(child, true);
+                    }
+
+                    if (!TopFC()._nullable)
+                        EarlyExit();
+                    break;
+
+                case RegexNode.Testgroup | AfterChild:
+                    if (CurIndex > 1) {
+                        RegexFC child = PopFC();
+                        RegexFC cumul = TopFC();
+
+                        cumul.AddFC(child, false);
+                    }
+                    break;
+
+                case RegexNode.Alternate | AfterChild:
+                case RegexNode.Testref | AfterChild:
+                    if (CurIndex != 0) {
+                        RegexFC child = PopFC();
+                        RegexFC cumul = TopFC();
+
+                        cumul.AddFC(child, false);
+                    }
+                    break;
+
+                case RegexNode.Loop | AfterChild:
+                case RegexNode.Lazyloop | AfterChild:
+                    if (node._m == 0)
+                        TopFC()._nullable = true;
+                    break;
+
+                case RegexNode.Group | BeforeChild:
+                case RegexNode.Group | AfterChild:
+                case RegexNode.Capture | BeforeChild:
+                case RegexNode.Capture | AfterChild:
+                case RegexNode.Greedy | BeforeChild:
+                case RegexNode.Greedy | AfterChild:
+                    break;
+
+                case RegexNode.Require | BeforeChild:
+                case RegexNode.Prevent | BeforeChild:
+                    SkipChild();
+                    PushFC(new RegexFC(true));
+                    break;
+
+                case RegexNode.Require | AfterChild:
+                case RegexNode.Prevent | AfterChild:
+                    break;
+
+                case RegexNode.One:
+                case RegexNode.Notone:
+                    PushFC(new RegexFC(node._ch, NodeType == RegexNode.Notone, false, ci));
+                    break;
+
+                case RegexNode.Oneloop:
+                case RegexNode.Onelazy:
+                    PushFC(new RegexFC(node._ch, false, node._m == 0, ci));
+                    break;
+
+                case RegexNode.Notoneloop:
+                case RegexNode.Notonelazy:
+                    PushFC(new RegexFC(node._ch, true, node._m == 0, ci));
+                    break;
+
+                case RegexNode.Multi:
+                    if (node._str.Length == 0)
+                        PushFC(new RegexFC(true));
+                    else if (!rtl)
+                        PushFC(new RegexFC(node._str[0], false, false, ci));
+                    else
+                        PushFC(new RegexFC(node._str[node._str.Length - 1], false, false, ci));
+                    break;
+
+                case RegexNode.Set:
+                    // mark this node as nullable if we have some categories
+                    PushFC(new RegexFC(node._str, !(node._str2 == null || node._str2.Length == 0), ci));
+                    break;
+
+                case RegexNode.Setloop:
+                case RegexNode.Setlazy:
+                    // don't need to worry about categories since this is nullable
+                    PushFC(new RegexFC(node._str, true, ci));
+                    break;
+
+                case RegexNode.Ref:
+                    PushFC(new RegexFC(RegexCharClass.Any, true, false));
+                    break;
+
+                case RegexNode.Nothing:
+                case RegexNode.Bol:
+                case RegexNode.Eol:
+                case RegexNode.Boundary:
+                case RegexNode.Nonboundary:
+                case RegexNode.ECMABoundary:
+                case RegexNode.NonECMABoundary:
+                case RegexNode.Beginning:
+                case RegexNode.Start:
+                case RegexNode.EndZ:
+                case RegexNode.End:
+                    PushFC(new RegexFC(true));
+                    break;
+
+                default:
+                    throw new ArgumentException("Unexpected Opcode");//XXX: SR.GetString(SR.UnexpectedOpcode, NodeType.ToString()));
+            }
+        }
+    }
+
+    internal sealed class RegexFC {
+        internal RegexCharClass _cc;
+        internal bool _nullable;
+        internal bool _caseInsensitive;
+
+        internal RegexFC(bool nullable) {
+            _cc = new RegexCharClass();
+            _nullable = nullable;
+        }
+
+        internal RegexFC(char ch, bool not, bool nullable, bool caseInsensitive) {
+            _cc = new RegexCharClass();
+
+            if (not) {
+                if (ch > 0)
+                    _cc.AddRange('\0', (char)(ch - 1));
+                if (ch < 0xFFFF)
+                    _cc.AddRange((char)(ch + 1), '\uFFFF');
+            }
+            else {
+                _cc.AddRange(ch, ch);
+            }
+
+            _caseInsensitive = caseInsensitive;
+            _nullable = nullable;
+        }
+
+        internal RegexFC(String set, bool nullable, bool caseInsensitive) {
+            _cc = new RegexCharClass();
+
+            _cc.AddSet(set);
+            _nullable = nullable;
+            _caseInsensitive = caseInsensitive;
+        }
+
+        internal void AddFC(RegexFC fc, bool concatenate) {
+            if (concatenate) {
+                if (!_nullable)
+                    return;
+
+                if (!fc._nullable)
+                    _nullable = false;
+            }
+            else {
+                if (fc._nullable)
+                    _nullable = true;
+            }
+
+            _caseInsensitive |= fc._caseInsensitive;
+            _cc.AddCharClass(fc._cc);
+        }
+
+        internal String GetFirstChars(CultureInfo culture) {
+            return _cc.ToSetCi(_caseInsensitive, culture);
+        }
+
+        internal bool IsCaseInsensitive() {
+            return _caseInsensitive;
+        }
+    }
+
+    internal sealed class RegexPrefix {
+        internal RegexPrefix(String prefix, bool ci) {
+            _prefix = prefix;
+            _caseInsensitive = ci;
+        }
+
+        internal String Prefix {
+            get {
+                return _prefix;
+            }
+        }
+
+        internal bool CaseInsensitive {
+            get {
+                return _caseInsensitive;
+            }
+        }
+
+        internal String _prefix;
+        internal bool _caseInsensitive;
+
+        internal static RegexPrefix _empty = new RegexPrefix(String.Empty, false);
+
+        internal static RegexPrefix Empty {
+            get {
+                return _empty;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexgroup.cs b/base/Kernel/System/Text/RegularExpressions/regexgroup.cs
new file mode 100644
index 0000000..b23db75
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexgroup.cs
@@ -0,0 +1,96 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// Group represents the substring or substrings that
+// are captured by a single capturing group after one
+// regular expression match.
+//
+
+namespace System.Text.RegularExpressions {
+
+    //| <include file='doc\RegexGroup.uex' path='docs/doc[@for="Group"]/*' />
+    /// <devdoc>
+    ///    Group
+    ///       represents the results from a single capturing group. A capturing group can
+    ///       capture zero, one, or more strings in a single match because of quantifiers, so
+    ///       Group supplies a collection of Capture objects.
+    ///    </devdoc>
+    //[ Serializable() ]
+    public class Group : Capture {
+        // the empty group object
+        internal static Group   _emptygroup = new Group(String.Empty, new int[0], 0);
+
+        internal int[] _caps;
+        internal int _capcount;
+        internal CaptureCollection _capcoll;
+
+        internal Group(String text, int[] caps, int capcount)
+
+        : base(text, capcount == 0 ? 0 : caps[(capcount - 1) * 2],
+               capcount == 0 ? 0 : caps[(capcount * 2) - 1]) {
+
+            _caps = caps;
+            _capcount = capcount;
+        }
+
+        // True if the match was successful
+        //| <include file='doc\RegexGroup.uex' path='docs/doc[@for="Group.Success"]/*' />
+        /// <devdoc>
+        ///    <para>Indicates whether the match is successful.</para>
+        /// </devdoc>
+        public bool Success {
+            get {
+                return _capcount != 0;
+            }
+        }
+
+        // The collection of all captures for this group
+        //| <include file='doc\RegexGroup.uex' path='docs/doc[@for="Group.Captures"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns a collection of all the captures matched by the capturing
+        ///       group, in innermost-leftmost-first order (or innermost-rightmost-first order if
+        ///       compiled with the "r" option). The collection may have zero or more items.
+        ///    </para>
+        /// </devdoc>
+        public CaptureCollection Captures {
+            get {
+                if (_capcoll == null)
+                    _capcoll = new CaptureCollection(this);
+
+                return _capcoll;
+            }
+        }
+
+        // Convert to a thread-safe object by precomputing cache contents
+        //| <include file='doc\RegexGroup.uex' path='docs/doc[@for="Group.Synchronized"]/*' />
+        /// <devdoc>
+        ///    <para>Returns
+        ///       a Group object equivalent to the one supplied that is safe to share between
+        ///       multiple threads.</para>
+        /// </devdoc>
+        static public Group Synchronized(Group inner) {
+            if (inner == null)
+                throw new ArgumentNullException("inner");
+
+            // force Captures to be computed.
+
+            CaptureCollection capcoll;
+            Capture dummy;
+
+            capcoll = inner.Captures;
+
+            if (inner._capcount > 0)
+                dummy = capcoll[0];
+
+            return inner;
+        }
+    }
+
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexgroupcollection.cs b/base/Kernel/System/Text/RegularExpressions/regexgroupcollection.cs
new file mode 100644
index 0000000..1f7863e
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexgroupcollection.cs
@@ -0,0 +1,221 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// The GroupCollection lists the captured Capture numbers
+// contained in a compiled Regex.
+//
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+
+    //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Represents a sequence of capture substrings. The object is used
+    ///       to return the set of captures done by a single capturing group.
+    ///    </para>
+    /// </devdoc>
+    //[ Serializable() ]
+    public class GroupCollection : ICollection {
+        internal Match _match;
+        internal Hashtable _captureMap;
+
+        // cache of Group objects fed to the user
+        internal Group[]             _groups;
+
+        // Nonpublic constructor
+        internal GroupCollection(Match match, Hashtable caps) {
+            _match = match;
+            _captureMap = caps;
+        }
+
+        // The object on which to synchronize
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.SyncRoot"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public Object SyncRoot {
+            get {
+                return _match;
+            }
+        }
+
+        // ICollection
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.IsSynchronized"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsSynchronized {
+            get {
+                return false;
+            }
+        }
+
+        // ICollection
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.IsReadOnly"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsReadOnly {
+            get {
+                return true;
+            }
+        }
+
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.Count"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the number of groups.
+        ///    </para>
+        /// </devdoc>
+        public int Count {
+            get {
+                return _match._matchcount.Length;
+            }
+        }
+
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.this"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public Group this[int groupnum]
+        {
+            get {
+                return GetGroup(groupnum);
+            }
+        }
+
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.this1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public Group this[String groupname] {
+            get {
+                if (_match._regex == null)
+                    return Group._emptygroup;
+
+                return GetGroup(_match._regex.GroupNumberFromName(groupname));
+            }
+        }
+
+        internal Group GetGroup(int groupnum) {
+            if (_captureMap != null) {
+                Object o;
+
+                o = _captureMap[groupnum];
+                if (o == null)
+                    return Group._emptygroup;
+                    //throw new ArgumentOutOfRangeException("groupnum");
+
+                return GetGroupImpl((int)o);
+            }
+            else {
+                //if (groupnum >= _match._regex.CapSize || groupnum < 0)
+                //   throw new ArgumentOutOfRangeException("groupnum");
+                if (groupnum >= _match._matchcount.Length || groupnum < 0)
+                    return Group._emptygroup;
+
+                return GetGroupImpl(groupnum);
+            }
+        }
+
+
+        // Caches the group objects
+        internal Group GetGroupImpl(int groupnum) {
+            if (groupnum == 0)
+                return _match;
+
+            // Construct all the Group objects the first time GetGroup is called
+
+            if (_groups == null) {
+                _groups = new Group[_match._matchcount.Length - 1];
+                for (int i = 0; i < _groups.Length; i++) {
+                    _groups[i] = new Group(_match._text, _match._matches[i + 1], _match._matchcount[i + 1]);
+                }
+            }
+
+            return _groups[groupnum - 1];
+        }
+
+        // As required by ICollection
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.CopyTo"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Copies all the elements of the collection to the given array
+        ///       beginning at the given index.
+        ///    </para>
+        /// </devdoc>
+        public void CopyTo(Array array, int arrayIndex) {
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            for (int i = arrayIndex, j = 0; j < Count; i++, j++) {
+                array.SetValue(this[j], i);
+            }
+        }
+
+        // As required by ICollection
+        //| <include file='doc\RegexGroupCollection.uex' path='docs/doc[@for="GroupCollection.GetEnumerator"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Provides an enumerator in the same order as Item[].
+        ///    </para>
+        /// </devdoc>
+        public IEnumerator GetEnumerator() {
+            return new GroupEnumerator(this);
+        }
+    }
+
+
+    // This non-public enumerator lists all the captures
+    // Should it be public?
+    internal class GroupEnumerator : IEnumerator {
+        internal GroupCollection _rgc;
+        internal int _curindex;
+
+        // Nonpublic constructor
+        internal GroupEnumerator(GroupCollection rgc) {
+            _curindex = -1;
+            _rgc = rgc;
+        }
+
+        // As required by IEnumerator
+        public bool MoveNext() {
+            int size = _rgc.Count;
+
+            if (_curindex >= size)
+                return false;
+
+            _curindex++;
+
+            return(_curindex < size);
+        }
+
+        // As required by IEnumerator
+        public Object Current {
+            get { return Capture;}
+        }
+
+        // Returns the current capture
+        public Capture Capture {
+            get {
+                if (_curindex < 0 || _curindex > _rgc.Count)
+                    throw new InvalidOperationException("Enum not started");//XXX: SR.GetString(SR.EnumNotStarted));
+
+                return _rgc[_curindex];
+            }
+        }
+
+        // Reset to before the first item
+        public void Reset() {
+            _curindex = -1;
+        }
+    }
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexinterpreter.cs b/base/Kernel/System/Text/RegularExpressions/regexinterpreter.cs
new file mode 100644
index 0000000..e01a010
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexinterpreter.cs
@@ -0,0 +1,1071 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexInterpreter class is internal to the RegularExpression package.
+// It executes a block of regular expression codes while consuming
+// input.
+//
+
+// Implementation notes:
+//
+//
+#define ECMA
+
+namespace System.Text.RegularExpressions
+{
+
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Globalization;
+
+    internal sealed class RegexInterpreter : RegexRunner {
+        internal int runoperator;
+        internal int [] runcodes;
+        internal int runcodepos;
+        internal String [] runstrings;
+        internal RegexCode runcode;
+        internal RegexPrefix runfcPrefix;
+        internal RegexPrefix runscPrefix;
+        internal RegexBoyerMoore runbmPrefix;
+        internal int runanchors;
+        internal bool runrtl;
+        internal bool runci;
+        internal CultureInfo runculture;
+
+        internal const int infinite = RegexNode.infinite;
+
+        internal RegexInterpreter(RegexCode code, CultureInfo culture) {
+            runcode       = code;
+            runcodes      = code._codes;
+            runstrings    = code._strings;
+            runfcPrefix   = code._fcPrefix;
+            runscPrefix   = code._scPrefix;
+            runbmPrefix   = code._bmPrefix;
+            runanchors    = code._anchors;
+            runculture    = culture;
+        }
+
+        protected override void InitTrackCount() {
+            runtrackcount = runcode._trackcount;
+        }
+
+        private void Advance() {
+            Advance(0);
+        }
+
+        private void Advance(int i) {
+            runcodepos += (i + 1);
+            SetOperator(runcodes[runcodepos]);
+        }
+
+        private void Goto(int newpos) {
+            // when branching backward, ensure storage
+            if (newpos < runcodepos)
+                EnsureStorage();
+
+            SetOperator(runcodes[newpos]);
+            runcodepos = newpos;
+        }
+
+        private void Textto(int newpos) {
+            runtextpos = newpos;
+        }
+
+        private void Trackto(int newpos) {
+            runtrackpos = runtrack.Length - newpos;
+        }
+
+        private int Textstart() {
+            return runtextstart;
+        }
+
+        private int Textpos() {
+            return runtextpos;
+        }
+
+        // push onto the backtracking stack
+        private int Trackpos() {
+            return runtrack.Length - runtrackpos;
+        }
+
+        private void Track() {
+            runtrack[--runtrackpos] = runcodepos;
+        }
+
+        private void Track(int I1) {
+            runtrack[--runtrackpos] = I1;
+            runtrack[--runtrackpos] = runcodepos;
+        }
+
+        private void Track(int I1, int I2) {
+            runtrack[--runtrackpos] = I1;
+            runtrack[--runtrackpos] = I2;
+            runtrack[--runtrackpos] = runcodepos;
+        }
+
+        private void Track(int I1, int I2, int I3) {
+            runtrack[--runtrackpos] = I1;
+            runtrack[--runtrackpos] = I2;
+            runtrack[--runtrackpos] = I3;
+            runtrack[--runtrackpos] = runcodepos;
+        }
+
+        private void Track2(int I1) {
+            runtrack[--runtrackpos] = I1;
+            runtrack[--runtrackpos] = -runcodepos;
+        }
+
+        private void Track2(int I1, int I2) {
+            runtrack[--runtrackpos] = I1;
+            runtrack[--runtrackpos] = I2;
+            runtrack[--runtrackpos] = -runcodepos;
+        }
+
+        private void Backtrack() {
+            int newpos = runtrack[runtrackpos++];
+            if (newpos < 0) {
+                newpos = -newpos;
+                SetOperator(runcodes[newpos] | RegexCode.Back2);
+            }
+            else {
+                SetOperator(runcodes[newpos] | RegexCode.Back);
+            }
+
+            // When branching backward, ensure storage
+            if (newpos < runcodepos)
+                EnsureStorage();
+
+            runcodepos = newpos;
+        }
+
+        private void SetOperator(int op) {
+            runci         = (0 != (op & RegexCode.Ci));
+            runrtl        = (0 != (op & RegexCode.Rtl));
+            runoperator   = op & ~(RegexCode.Rtl | RegexCode.Ci);
+        }
+
+        // pop framesize items from the backtracking stack
+        private void Trackframe(int framesize) {
+            runtrackpos += framesize;
+        }
+
+        // get the ith element down on the backtracking stack
+        private int Tracked(int i) {
+            return runtrack[runtrackpos - i - 1];
+        }
+
+        // Push onto the grouping stack
+        private void Stack(int I1) {
+            runstack[--runstackpos] = I1;
+        }
+
+        private void Stack(int I1, int I2) {
+            runstack[--runstackpos] = I1;
+            runstack[--runstackpos] = I2;
+        }
+
+        // pop framesize items from the grouping stack
+        private void Stackframe(int framesize) {
+            runstackpos += framesize;
+        }
+
+        // get the ith element down on the grouping stack
+        private int Stacked(int i) {
+            return runstack[runstackpos - i - 1];
+        }
+
+        private int Operator() {
+            return runoperator;
+        }
+
+        private int Operand(int i) {
+            return runcodes[runcodepos + i + 1];
+        }
+
+        private int Leftchars() {
+            return runtextpos - runtextbeg;
+        }
+
+        private int Rightchars() {
+            return runtextend - runtextpos;
+        }
+
+        private int Bump() {
+            return runrtl ? -1 : 1;
+        }
+
+        private int Forwardchars() {
+            return runrtl ? runtextpos - runtextbeg : runtextend - runtextpos;
+        }
+
+        private char Forwardcharnext() {
+            char ch = (runrtl ? runtext[--runtextpos] : runtext[runtextpos++]);
+
+            //return(runci ? Char.ToLower(ch, runculture) : ch);
+            return(runci ? Char.ToLower(ch) : ch);
+        }
+
+        private bool Stringmatch(String str) {
+            int c;
+            int pos;
+
+            if (!runrtl) {
+                if (runtextend - runtextpos < (c = str.Length))
+                    return false;
+
+                pos = runtextpos + c;
+            }
+            else {
+                if (runtextpos - runtextbeg < (c = str.Length))
+                    return false;
+
+                pos = runtextpos;
+            }
+
+            if (!runci) {
+                while (c != 0)
+                    if (str[--c] != runtext[--pos])
+                        return false;
+            }
+            else {
+                while (c != 0)
+                    if (str[--c] != Char.ToLower(runtext[--pos]))//, runculture))
+                        return false;
+            }
+
+            if (!runrtl) {
+                pos += str.Length;
+            }
+
+            runtextpos = pos;
+
+            return true;
+        }
+
+        private bool Refmatch(int index, int len) {
+            int c;
+            int pos;
+            int cmpos;
+
+            if (!runrtl) {
+                if (runtextend - runtextpos < len)
+                    return false;
+
+                pos = runtextpos + len;
+            }
+            else {
+                if (runtextpos - runtextbeg < len)
+                    return false;
+
+                pos = runtextpos;
+            }
+            cmpos = index + len;
+
+            c = len;
+
+            if (!runci) {
+                while (c-- != 0)
+                    if (runtext[--cmpos] != runtext[--pos])
+                        return false;
+            }
+            else {
+                while (c-- != 0)
+//                    if (Char.ToLower(runtext[--cmpos], runculture) != Char.ToLower(runtext[--pos], runculture))
+                    if (Char.ToLower(runtext[--cmpos]) != Char.ToLower(runtext[--pos]))
+                        return false;
+            }
+
+            if (!runrtl) {
+                pos += len;
+            }
+
+            runtextpos = pos;
+
+            return true;
+        }
+
+        private void Backwardnext() {
+            runtextpos += runrtl ? 1 : -1;
+        }
+
+        private char CharAt(int j) {
+            return runtext[j];
+        }
+
+        protected override bool FindFirstChar() {
+            int i;
+            String set;
+
+            if (0 != (runanchors & (RegexFCD.Beginning | RegexFCD.Start | RegexFCD.EndZ | RegexFCD.End))) {
+                if (!runcode._rightToLeft) {
+                    if ((0 != (runanchors & RegexFCD.Beginning) && runtextpos > runtextbeg) ||
+                        (0 != (runanchors & RegexFCD.Start) && runtextpos > runtextstart)) {
+                        runtextpos = runtextend;
+                        return false;
+                    }
+                    if (0 != (runanchors & RegexFCD.EndZ) && runtextpos < runtextend - 1) {
+                        runtextpos = runtextend - 1;
+                    }
+                    else if (0 != (runanchors & RegexFCD.End) && runtextpos < runtextend) {
+                        runtextpos = runtextend;
+                    }
+                }
+                else {
+                    if ((0 != (runanchors & RegexFCD.End) && runtextpos < runtextend) ||
+                        (0 != (runanchors & RegexFCD.EndZ) && (runtextpos < runtextend - 1 ||
+                                                               (runtextpos == runtextend - 1 && CharAt(runtextpos) != '\n'))) ||
+                        (0 != (runanchors & RegexFCD.Start) && runtextpos < runtextstart)) {
+                        runtextpos = runtextbeg;
+                        return false;
+                    }
+                    if (0 != (runanchors & RegexFCD.Beginning) && runtextpos > runtextbeg) {
+                        runtextpos = runtextbeg;
+                    }
+                }
+
+                if (runbmPrefix != null) {
+                    return runbmPrefix.IsMatch(runtext, runtextpos, runtextbeg, runtextend);
+                }
+            }
+            else if (runbmPrefix != null) {
+                runtextpos = runbmPrefix.Scan(runtext, runtextpos, runtextbeg, runtextend);
+
+                if (runtextpos == -1) {
+                    runtextpos = (runcode._rightToLeft ? runtextbeg : runtextend);
+                    return false;
+                }
+
+                return true;
+            }
+
+            if (runfcPrefix == null)
+                return true;
+
+            runrtl = runcode._rightToLeft;
+            runci = runfcPrefix.CaseInsensitive;
+            set = runfcPrefix.Prefix;
+
+            if (RegexCharClass.IsSingleton(set)) {
+                char ch = RegexCharClass.SingletonChar(set);
+
+                for (i = Forwardchars(); i > 0; i--) {
+                    if (ch == Forwardcharnext()) {
+                        Backwardnext();
+                        return true;
+                    }
+                }
+            }
+            else {
+                for (i = Forwardchars(); i > 0; i--) {
+                    if (RegexCharClass.CharInSet(Forwardcharnext(), set, String.Empty)) {
+                        Backwardnext();
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        protected override void Go() {
+            Goto(0);
+
+            for (;;) {
+#if DBG
+                if (runmatch.Debug) {
+                    DumpState();
+                }
+#endif
+
+                switch (Operator()) {
+                    case RegexCode.Stop:
+                        return;
+
+                    case RegexCode.Nothing:
+                        break;
+
+                    case RegexCode.Goto:
+                        Goto(Operand(0));
+                        continue;
+
+                    case RegexCode.Testref:
+                        if (!IsMatched(Operand(0)))
+                            break;
+                        Advance(1);
+                        continue;
+
+                    case RegexCode.Lazybranch:
+                        Track(Textpos());
+                        Advance(1);
+                        continue;
+
+                    case RegexCode.Lazybranch | RegexCode.Back:
+                        Trackframe(1);
+                        Textto(Tracked(0));
+                        Goto(Operand(0));
+                        continue;
+
+                    case RegexCode.Setmark:
+                        Stack(Textpos());
+                        Track();
+                        Advance();
+                        continue;
+
+                    case RegexCode.Nullmark:
+                        Stack(-1);
+                        Track();
+                        Advance();
+                        continue;
+
+                    case RegexCode.Setmark | RegexCode.Back:
+                    case RegexCode.Nullmark | RegexCode.Back:
+                        Stackframe(1);
+                        break;
+
+                    case RegexCode.Getmark:
+                        Stackframe(1);
+                        Track(Stacked(0));
+                        Textto(Stacked(0));
+                        Advance();
+                        continue;
+
+                    case RegexCode.Getmark | RegexCode.Back:
+                        Trackframe(1);
+                        Stack(Tracked(0));
+                        break;
+
+                    case RegexCode.Capturemark:
+                        if (Operand(1) != -1 && !IsMatched(Operand(1)))
+                            break;
+                        Stackframe(1);
+                        if (Operand(1) != -1)
+                            TransferCapture(Operand(0), Operand(1), Stacked(0), Textpos());
+                        else
+                            Capture(Operand(0), Stacked(0), Textpos());
+                        Track(Stacked(0));
+
+                        Advance(2);
+
+                        /*
+
+                                */
+                        continue;
+
+                    case RegexCode.Capturemark | RegexCode.Back:
+                        Trackframe(1);
+                        Stack(Tracked(0));
+                        Uncapture();
+                        if (Operand(0) != -1 && Operand(1) != -1)
+                            Uncapture();
+
+                        break;
+
+                    case RegexCode.Branchmark:
+                        {
+                            int matched;
+                            Stackframe(1);
+
+                            matched = Textpos() - Stacked(0);
+
+                            if (matched != 0) {                                   // Nonempty match -> loop now
+                                Track(Stacked(0), Textpos());   // Save old mark, textpos
+                                Stack(Textpos());               // Make new mark
+                                Goto(Operand(0));               // Loop
+                            }
+                            else {                                   // Empty match -> straight now
+                                Track2(Stacked(0));             // Save old mark
+                                Advance(1);                     // Straight
+                            }
+                            continue;
+                        }
+
+                    case RegexCode.Branchmark | RegexCode.Back:
+                        Trackframe(2);
+                        Stackframe(1);
+                        Textto(Tracked(1));                     // Recall position
+                        Track2(Tracked(0));                     // Save old mark
+                        Advance(1);                             // Straight
+                        continue;
+
+                    case RegexCode.Branchmark | RegexCode.Back2:
+                        Trackframe(1);
+                        Stack(Tracked(0));                      // Recall old mark
+                        break;                                  // Backtrack
+
+                    case RegexCode.Lazybranchmark:
+                        {
+                            int matched;
+                            Stackframe(1);
+
+                            matched = Textpos() - Stacked(0);
+
+                            if (matched != 0) {                                   // Nonempty match -> next loop
+                                Track(Stacked(0), Textpos());   // Save old mark, textpos
+                            }
+                            else {                                   // Empty match -> no loop
+                                Track2(Stacked(0));             // Save old mark
+                            }
+                            Advance(1);
+                            continue;
+                        }
+
+                    case RegexCode.Lazybranchmark | RegexCode.Back:
+                        {
+                            int pos;
+
+                            Trackframe(2);
+                            pos = Tracked(1);
+                            Track2(Tracked(0));                 // Save old mark
+                            Stack(pos);                         // Make new mark
+                            Textto(pos);                        // Recall position
+                            Goto(Operand(0));                   // Loop
+                            continue;
+                        }
+
+                    case RegexCode.Lazybranchmark | RegexCode.Back2:
+                        Stackframe(1);
+                        Trackframe(1);
+                        Stack(Tracked(0));                      // Recall old mark
+                        break;
+
+                    case RegexCode.Setcount:
+                        Stack(Textpos(), Operand(0));
+                        Track();
+                        Advance(1);
+                        continue;
+
+                    case RegexCode.Nullcount:
+                        Stack(-1, Operand(0));
+                        Track();
+                        Advance(1);
+                        continue;
+
+                    case RegexCode.Setcount | RegexCode.Back:
+                        Stackframe(2);
+                        break;
+
+                    case RegexCode.Nullcount | RegexCode.Back:
+                        Stackframe(2);
+                        break;
+
+                    case RegexCode.Branchcount:
+                        // Stack:
+                        //  0: Mark
+                        //  1: Count
+                        {
+                            Stackframe(2);
+                            int mark = Stacked(0);
+                            int count = Stacked(1);
+                            int matched = Textpos() - mark;
+
+                            if (count >= Operand(1) || (matched == 0 && count >= 0)) {                                   // Max loops or empty match -> straight now
+                                Track2(mark, count);            // Save old mark, count
+                                Advance(2);                     // Straight
+                            }
+                            else {                                   // Nonempty match -> count+loop now
+                                Track(mark);                    // remember mark
+                                Stack(Textpos(), count + 1);    // Make new mark, incr count
+                                Goto(Operand(0));               // Loop
+                            }
+                            continue;
+                        }
+
+                    case RegexCode.Branchcount | RegexCode.Back:
+                        // Track:
+                        //  0: Previous mark
+                        // Stack:
+                        //  0: Mark (= current pos, discarded)
+                        //  1: Count
+                        Trackframe(1);
+                        Stackframe(2);
+                        if (Stacked(1) > 0) {                     // Positive -> can go straight
+                            Textto(Stacked(0));                 // Zap to mark
+                            Track2(Tracked(0), Stacked(1) - 1); // Save old mark, old count
+                            Advance(2);                         // Straight
+                            continue;
+                        }
+                        Stack(Tracked(0), Stacked(1) - 1);      // recall old mark, old count
+                        break;
+
+                    case RegexCode.Branchcount | RegexCode.Back2:
+                        // Track:
+                        //  0: Previous mark
+                        //  1: Previous count
+                        Trackframe(2);
+                        Stack(Tracked(0), Tracked(1));          // Recall old mark, old count
+                        break;                                  // Backtrack
+
+
+                    case RegexCode.Lazybranchcount:
+                        // Stack:
+                        //  0: Mark
+                        //  1: Count
+                        {
+                            Stackframe(2);
+                            int mark = Stacked(0);
+                            int count = Stacked(1);
+
+                            if (count < 0) {                                   // Negative count -> loop now
+                                Track2(mark);                   // Save old mark
+                                Stack(Textpos(), count + 1);    // Make new mark, incr count
+                                Goto(Operand(0));               // Loop
+                            }
+                            else {                                   // Nonneg count -> straight now
+                                Track(mark, count, Textpos());  // Save mark, count, position
+                                Advance(2);                     // Straight
+                            }
+                            continue;
+                        }
+
+                    case RegexCode.Lazybranchcount | RegexCode.Back:
+                        // Track:
+                        //  0: Mark
+                        //  1: Count
+                        //  2: Textpos
+                        {
+                            Trackframe(3);
+                            int mark = Tracked(0);
+                            int textpos = Tracked(2);
+                            if (Tracked(1) <= Operand(1) && textpos != mark) {                                       // Under limit and not empty match -> loop
+                                Textto(textpos);                    // Recall position
+                                Stack(textpos, Tracked(1) + 1);     // Make new mark, incr count
+                                Track2(mark);                       // Save old mark
+                                Goto(Operand(0));                   // Loop
+                                continue;
+                            }
+                            else {                                       // Max loops or empty match -> backtrack
+                                Stack(Tracked(0), Tracked(1));      // Recall old mark, count
+                                break;                              // backtrack
+                            }
+                        }
+
+                    case RegexCode.Lazybranchcount | RegexCode.Back2:
+                        // Track:
+                        //  0: Previous mark
+                        // Stack:
+                        //  0: Mark (== current pos, discarded)
+                        //  1: Count
+                        Trackframe(1);
+                        Stackframe(2);
+                        Stack(Tracked(0), Stacked(1) - 1);  // Recall old mark, count
+                        break;                              // Backtrack
+
+                    case RegexCode.Setjump:
+                        Stack(Trackpos(), Crawlpos());
+                        Track();
+                        Advance();
+                        continue;
+
+                    case RegexCode.Setjump | RegexCode.Back:
+                        Stackframe(2);
+                        break;
+
+                    case RegexCode.Backjump:
+                        // Stack:
+                        //  0: Saved trackpos
+                        //  1: Crawlpos
+                        Stackframe(2);
+                        Trackto(Stacked(0));
+
+                        while (Crawlpos() != Stacked(1))
+                            Uncapture();
+
+                        break;
+
+                    case RegexCode.Forejump:
+                        // Stack:
+                        //  0: Saved trackpos
+                        //  1: Crawlpos
+                        Stackframe(2);
+                        Trackto(Stacked(0));
+                        Track(Stacked(1));
+                        Advance();
+                        continue;
+
+                    case RegexCode.Forejump | RegexCode.Back:
+                        // Track:
+                        //  0: Crawlpos
+                        Trackframe(1);
+
+                        while (Crawlpos() != Tracked(0))
+                            Uncapture();
+
+                        break;
+
+                    case RegexCode.Bol:
+                        if (Leftchars() > 0 && CharAt(Textpos() - 1) != '\n')
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.Eol:
+                        if (Rightchars() > 0 && CharAt(Textpos()) != '\n')
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.Boundary:
+                        if (!IsBoundary(Textpos(), runtextbeg, runtextend))
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.Nonboundary:
+                        if (IsBoundary(Textpos(), runtextbeg, runtextend))
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.ECMABoundary:
+                        if (!IsECMABoundary(Textpos(), runtextbeg, runtextend))
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.NonECMABoundary:
+                        if (IsECMABoundary(Textpos(), runtextbeg, runtextend))
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.Beginning:
+                        if (Leftchars() > 0)
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.Start:
+                        if (Textpos() != Textstart())
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.EndZ:
+                        if (Rightchars() > 1 || Rightchars() == 1 && CharAt(Textpos()) != '\n')
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.End:
+                        if (Rightchars() > 0)
+                            break;
+                        Advance();
+                        continue;
+
+                    case RegexCode.One:
+                        if (Forwardchars() < 1 || Forwardcharnext() != (char)Operand(0))
+                            break;
+
+                        Advance(1);
+                        continue;
+
+                    case RegexCode.Notone:
+                        if (Forwardchars() < 1 || Forwardcharnext() == (char)Operand(0))
+                            break;
+
+                        Advance(1);
+                        continue;
+
+                    case RegexCode.Set:
+                        if (Forwardchars() < 1 || !RegexCharClass.CharInSet(Forwardcharnext(), runstrings[Operand(0)], runstrings[Operand(1)]))
+                            break;
+
+                        Advance(2);
+                        continue;
+
+                    case RegexCode.Multi:
+                        {
+                            if (!Stringmatch(runstrings[Operand(0)]))
+                                break;
+
+                            Advance(1);
+                            continue;
+                        }
+
+                    case RegexCode.Ref:
+                        {
+                            int capnum = Operand(0);
+
+                            if (IsMatched(capnum)) {
+                                if (!Refmatch(MatchIndex(capnum), MatchLength(capnum)))
+                                    break;
+                            } else {
+                                if ((runregex.roptions & RegexOptions.ECMAScript) == 0)
+                                    break;
+                            }
+
+                            Advance(1);
+                            continue;
+                        }
+
+                    case RegexCode.Onerep:
+                        {
+                            int c = Operand(1);
+
+                            if (Forwardchars() < c)
+                                break;
+
+                            char ch = (char)Operand(0);
+
+                            while (c-- > 0)
+                                if (Forwardcharnext() != ch)
+                                    goto BreakBackward;
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Notonerep:
+                        {
+                            int c = Operand(1);
+
+                            if (Forwardchars() < c)
+                                break;
+
+                            char ch = (char)Operand(0);
+
+                            while (c-- > 0)
+                                if (Forwardcharnext() == ch)
+                                    goto BreakBackward;
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Setrep:
+                        {
+                            int c = Operand(2);
+
+                            if (Forwardchars() < c)
+                                break;
+
+                            String set = runstrings[Operand(0)];
+                            String cat = runstrings[Operand(1)];
+
+                            while (c-- > 0)
+                                if (!RegexCharClass.CharInSet(Forwardcharnext(), set, cat))
+                                    goto BreakBackward;
+
+                            Advance(3);
+                            continue;
+                        }
+
+                    case RegexCode.Oneloop:
+                        {
+                            int c = Operand(1);
+
+                            if (c > Forwardchars())
+                                c = Forwardchars();
+
+                            char ch = (char)Operand(0);
+                            int i;
+
+                            for (i = c; i > 0; i--) {
+                                if (Forwardcharnext() != ch) {
+                                    Backwardnext();
+                                    break;
+                                }
+                            }
+
+                            if (c > i)
+                                Track(c - i - 1, Textpos() - Bump());
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Notoneloop:
+                        {
+                            int c = Operand(1);
+
+                            if (c > Forwardchars())
+                                c = Forwardchars();
+
+                            char ch = (char)Operand(0);
+                            int i;
+
+                            for (i = c; i > 0; i--) {
+                                if (Forwardcharnext() == ch) {
+                                    Backwardnext();
+                                    break;
+                                }
+                            }
+
+                            if (c > i)
+                                Track(c - i - 1, Textpos() - Bump());
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Setloop:
+                        {
+                            int c = Operand(2);
+
+                            if (c > Forwardchars())
+                                c = Forwardchars();
+
+                            String set = runstrings[Operand(0)];
+                            String cat = runstrings[Operand(1)];
+                            int i;
+
+                            for (i = c; i > 0; i--) {
+                                if (!RegexCharClass.CharInSet(Forwardcharnext(), set, cat)) {
+                                    Backwardnext();
+                                    break;
+                                }
+                            }
+
+                            if (c > i)
+                                Track(c - i - 1, Textpos() - Bump());
+
+                            Advance(3);
+                            continue;
+                        }
+
+                    case RegexCode.Oneloop | RegexCode.Back:
+                    case RegexCode.Notoneloop | RegexCode.Back:
+                        {
+                            Trackframe(2);
+                            int i   = Tracked(0);
+                            int pos = Tracked(1);
+
+                            Textto(pos);
+
+                            if (i > 0)
+                                Track(i - 1, pos - Bump());
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Setloop | RegexCode.Back:
+                        {
+                            Trackframe(2);
+                            int i   = Tracked(0);
+                            int pos = Tracked(1);
+
+                            Textto(pos);
+
+                            if (i > 0)
+                                Track(i - 1, pos - Bump());
+
+                            Advance(3);
+                            continue;
+                        }
+
+                    case RegexCode.Onelazy:
+                    case RegexCode.Notonelazy:
+                        {
+                            int c = Operand(1);
+
+                            if (c > Forwardchars())
+                                c = Forwardchars();
+
+                            if (c > 0)
+                                Track(c - 1, Textpos());
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Setlazy:
+                        {
+                            int c = Operand(2);
+
+                            if (c > Forwardchars())
+                                c = Forwardchars();
+
+                            if (c > 0)
+                                Track(c - 1, Textpos());
+
+                            Advance(3);
+                            continue;
+                        }
+
+                    case RegexCode.Onelazy | RegexCode.Back:
+                        {
+                            Trackframe(2);
+                            int pos = Tracked(1);
+                            Textto(pos);
+
+                            if (Forwardcharnext() != (char)Operand(0))
+                                break;
+
+                            int i = Tracked(0);
+
+                            if (i > 0)
+                                Track(i - 1, pos + Bump());
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Notonelazy | RegexCode.Back:
+                        {
+                            Trackframe(2);
+                            int pos = Tracked(1);
+                            Textto(pos);
+
+                            if (Forwardcharnext() == (char)Operand(0))
+                                break;
+
+                            int i = Tracked(0);
+
+                            if (i > 0)
+                                Track(i - 1, pos + Bump());
+
+                            Advance(2);
+                            continue;
+                        }
+
+                    case RegexCode.Setlazy | RegexCode.Back:
+                        {
+                            Trackframe(2);
+                            int pos = Tracked(1);
+                            Textto(pos);
+
+                            if (!RegexCharClass.CharInSet(Forwardcharnext(), runstrings[Operand(0)], runstrings[Operand(1)]))
+                                break;
+
+                            int i = Tracked(0);
+
+                            if (i > 0)
+                                Track(i - 1, pos + Bump());
+
+                            Advance(3);
+                            continue;
+                        }
+
+                    default:
+                        throw new Exception("Unimplemented State");//XXX: SR.GetString(SR.UnimplementedState));
+                        //NotImplementedException("Unimplemented State");//XXX: SR.GetString(SR.UnimplementedState));
+                }
+
+                BreakBackward:
+                ;
+
+                // "break Backward" comes here:
+                Backtrack();
+            }
+
+        }
+
+#if DBG
+        public override void DumpState() {
+            base.DumpState();
+            Debug.WriteLine("       " + runcode.OpcodeDescription(runcodepos) +
+                              ((runoperator & RegexCode.Back) != 0 ? " Back" : "") +
+                              ((runoperator & RegexCode.Back2) != 0 ? " Back2" : ""));
+        }
+#endif
+
+    }
+
+
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexmatch.cs b/base/Kernel/System/Text/RegularExpressions/regexmatch.cs
new file mode 100644
index 0000000..489b530
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexmatch.cs
@@ -0,0 +1,392 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// Match is the result class for a regex search.
+// It returns the location, length, and substring for
+// the entire match as well as every captured group.
+//
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Diagnostics;
+
+    //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Represents
+    ///          the results from a single regular expression match.
+    ///       </para>
+    ///    </devdoc>
+    //[ Serializable() ]
+    public class Match : Group {
+        internal static Match _empty = new Match(null, 1, String.Empty, 0, 0, 0);
+        internal GroupCollection _groupcoll;
+
+        // input to the match
+        internal Regex               _regex;
+        internal int                 _textbeg;
+        internal int                 _textpos;
+        internal int                 _textend;
+        internal int                 _textstart;
+
+        // output from the match
+        internal int[][]             _matches;
+        internal int[]               _matchcount;
+        internal bool                _balancing;
+
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.Empty"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns an empty Match object.
+        ///    </para>
+        /// </devdoc>
+        public static Match Empty {
+            get {
+                return _empty;
+            }
+        }
+
+        // Nonpublic constructor
+        internal Match(Regex regex, int capcount, String text, int begpos, int len, int startpos)
+
+        : base(text, new int[2], 0) {
+
+            _regex      = regex;
+            _matchcount = new int[capcount];
+
+            _matches    = new int[capcount][];
+            _matches[0] = _caps;
+            _textbeg    = begpos;
+            _textend    = begpos + len;
+            _textstart  = startpos;
+            _balancing  = false;
+
+            // No need for an exception here.  This is only called internally, so we'll use an Assert instead
+            //if (_textbeg < 0 || _textstart < _textbeg || _textend < _textstart || _text.Length < _textend)
+            //    throw new ArgumentOutOfRangeException();
+
+            System.Diagnostics.Debug.Assert(!(_textbeg < 0 || _textstart < _textbeg || _textend < _textstart || _text.Length < _textend),
+                                            "The parameters are out of range.");
+
+        }
+
+        // Nonpublic set-text method
+        internal virtual void Reset(Regex regex, String text, int textbeg, int textend, int textstart) {
+            _regex = regex;
+            _text = text;
+            _textbeg = textbeg;
+            _textend = textend;
+            _textstart = textstart;
+
+            for (int i = 0; i < _matchcount.Length; i++) {
+                _matchcount[i] = 0;
+            }
+
+            _balancing = false;
+        }
+
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.Groups"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual GroupCollection Groups {
+            get {
+                if (_groupcoll == null)
+                    _groupcoll = new GroupCollection(this, null);
+
+                return _groupcoll;
+            }
+        }
+
+        // Returns the next match
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.NextMatch"]/*' />
+        /// <devdoc>
+        ///    <para>Returns a new Match with the results for the next match, starting
+        ///       at the position at which the last match ended (at the character beyond the last
+        ///       matched character).</para>
+        /// </devdoc>
+        public Match NextMatch() {
+            if (_regex == null)
+                return this;
+
+            return _regex.Run(false, _length, _text, _textbeg, _textend - _textbeg, _textpos);
+        }
+
+
+        // Return the result string (using the replacement pattern)
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.Result"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the expansion of the passed replacement pattern. For
+        ///       example, if the replacement pattern is ?$1$2?, Result returns the concatenation
+        ///       of Group(1).ToString() and Group(2).ToString().
+        ///    </para>
+        /// </devdoc>
+        public virtual String Result(String replacement) {
+            RegexReplacement repl;
+
+            if (replacement == null)
+                throw new ArgumentNullException("replacement");
+
+            if (_regex == null)
+                throw new NotSupportedException("No result on failed");//XXX: SR.GetString(SR.NoResultOnFailed));
+
+            repl = (RegexReplacement)_regex.replref.Get();
+
+            if (repl == null || !repl.Pattern.Equals(replacement)) {
+                repl = RegexParser.ParseReplacement(replacement, _regex.caps, _regex.capsize, _regex.capnames, _regex.roptions);
+                _regex.replref.Cache(repl);
+            }
+
+            return repl.Replacement(this);
+        }
+
+        // Used by the replacement code
+        internal virtual String GroupToStringImpl(int groupnum) {
+            int c = _matchcount[groupnum];
+            if (c == 0)
+                return String.Empty;
+
+            int [] matches = _matches[groupnum];
+
+            return _text.Substring(matches[(c - 1) * 2], matches[(c * 2) - 1]);
+        }
+
+        // Used by the replacement code
+        internal String LastGroupToStringImpl() {
+            return GroupToStringImpl(_matchcount.Length - 1);
+        }
+
+
+        // Convert to a thread-safe object by precomputing cache contents
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.Synchronized"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns a Match instance equivalent to the one supplied that is safe to share
+        ///       between multiple threads.
+        ///    </para>
+        /// </devdoc>
+        static public Match Synchronized(Match inner) {
+            if (inner == null)
+                throw new ArgumentNullException("inner");
+
+            int numgroups = inner._matchcount.Length;
+
+            // Populate all groups by looking at each one
+            for (int i = 0; i < numgroups; i++) {
+                Group group = inner.Groups[i];
+
+                // Depends on the fact that Group.Synchronized just
+                // operates on and returns the same instance
+                System.Text.RegularExpressions.Group.Synchronized(group);
+            }
+
+            return inner;
+        }
+
+        // Nonpublic builder: adds a group match by capnum
+        internal virtual void AddMatch(int cap, int i, int l) {
+            int capcount;
+
+            if (_matches[cap] == null)
+                _matches[cap] = new int[2];
+
+            capcount = _matchcount[cap];
+
+            if (capcount * 2 + 2 > _matches[cap].Length) {
+                int[] oldmatches = _matches[cap];
+                int[] newmatches = new int[capcount * 8];
+                for (int j = 0; j < capcount * 2; j++)
+                    newmatches[j] = oldmatches[j];
+                _matches[cap] = newmatches;
+            }
+
+            _matches[cap][capcount * 2] = i;
+            _matches[cap][capcount * 2 + 1] = l;
+            _matchcount[cap] = capcount + 1;
+        }
+
+        // Nonpublic builder: adds a group match by capnum
+        internal virtual void BalanceMatch(int cap) {
+            int capcount;
+            int target;
+
+            _balancing = true;
+
+            capcount = _matchcount[cap];
+
+            target = capcount * 2 - 2;
+
+            if (_matches[cap][target] < 0)
+                target = -3 - _matches[cap][target];
+
+            target -= 2;
+
+            if (target >= 0 && _matches[cap][target] < 0)
+                target = -3 - _matches[cap][target];
+
+            AddMatch(cap, -3 - target, -4 - target);
+        }
+
+        // Nonpublic builder: removes a group match by capnum
+        internal virtual void RemoveMatch(int cap) {
+            _matchcount[cap]--;
+        }
+
+        // Nonpublic: tells if a group was matched by capnum
+        internal virtual bool IsMatched(int cap) {
+            return cap < _matchcount.Length && _matchcount[cap] > 0 && _matches[cap][_matchcount[cap] * 2 - 1] != (-3 + 1);
+        }
+
+        // Nonpublic: returns the index of the last specified matched group by capnum
+        internal virtual int MatchIndex(int cap) {
+            int i = _matches[cap][_matchcount[cap] * 2 - 2];
+            if (i >= 0)
+                return i;
+
+            return _matches[cap][-3 - i];
+        }
+
+        // Nonpublic: returns the length of the last specified matched group by capnum
+        internal virtual int MatchLength(int cap) {
+            int i = _matches[cap][_matchcount[cap] * 2 - 1];
+            if (i >= 0)
+                return i;
+
+            return _matches[cap][-3 - i];
+        }
+
+        /*
+                */
+
+
+        // Nonpublic: tidy the match so that it can be used as an immutable result
+        internal virtual void Tidy(int textpos) {
+            int[] interval;
+
+            interval  = _matches[0];
+            _index    = interval[0];
+            _length   = interval[1];
+            _textpos  = textpos;
+            _capcount = _matchcount[0];
+
+            if (_balancing) {
+                for (int cap = 0; cap < _matchcount.Length; cap++) {
+                    int limit;
+                    int[] matcharray;
+
+                    limit = _matchcount[cap] * 2;
+                    matcharray = _matches[cap];
+
+                    int i = 0;
+                    int j;
+
+                    for (i = 0; i < limit; i++) {
+                        if (matcharray[i] < 0)
+                            break;
+                    }
+
+                    for (j = i; i < limit; i++) {
+                        if (matcharray[i] < 0) {
+                            j--;
+                        }
+                        else {
+                            if (i != j)
+                                matcharray[j] = matcharray[i];
+                            j++;
+                        }
+                    }
+
+                    _matchcount[cap] = j / 2;
+                }
+
+                _balancing = false;
+            }
+        }
+
+#if DBG
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.Debug"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        public bool Debug {
+            get {
+                if (_regex == null)
+                    return false;
+
+                return _regex.Debug;
+            }
+        }
+
+        //| <include file='doc\RegexMatch.uex' path='docs/doc[@for="Match.Dump"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        /// </devdoc>
+        public virtual void Dump() {
+            int i,j;
+
+            for (i = 0; i < _matchcount.Length; i++) {
+                System.Diagnostics.Debug.WriteLine("Capnum " + i.ToString() + ":");
+
+                for (j = 0; j < _matchcount[i]; j++) {
+                    String text = "";
+
+                    if (_matches[i][j * 2] >= 0)
+                        text = _text.Substring(_matches[i][j * 2], _matches[i][j * 2 + 1]);
+
+                    System.Diagnostics.Debug.WriteLine("  (" + _matches[i][j * 2].ToString() + "," + _matches[i][j * 2 + 1].ToString() + ") " + text);
+                }
+            }
+        }
+#endif
+    }
+
+
+    // MatchSparse is for handling the case where slots are
+    // sparsely arranged (e.g., if somebody says use slot 100000)
+    internal class MatchSparse : Match {
+        // the lookup hashtable
+        new internal Hashtable _caps;
+
+        // Nonpublic constructor
+        internal MatchSparse(Regex regex, Hashtable caps, int capcount,
+                             String text, int begpos, int len, int startpos)
+
+        : base(regex, capcount, text, begpos, len, startpos) {
+
+            _caps = caps;
+        }
+
+        public override GroupCollection Groups {
+            get {
+                if (_groupcoll == null)
+                    _groupcoll = new GroupCollection(this, _caps);
+
+                return _groupcoll;
+            }
+        }
+
+#if DBG
+        public override void Dump() {
+            if (_caps != null) {
+                IEnumerator e = _caps.Keys.GetEnumerator();
+
+                while (e.MoveNext()) {
+                    System.Diagnostics.Debug.WriteLine("Slot " + e.Current.ToString() + " -> " + _caps[e.Current].ToString());
+                }
+            }
+
+            base.Dump();
+        }
+#endif
+
+    }
+
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexmatchcollection.cs b/base/Kernel/System/Text/RegularExpressions/regexmatchcollection.cs
new file mode 100644
index 0000000..145dacd
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexmatchcollection.cs
@@ -0,0 +1,233 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// The MatchCollection lists the successful matches that
+// result when searching a string for a regular expression.
+//
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+
+
+    // This collection returns a sequence of successful match results, either
+    // from GetMatchCollection() or GetExecuteCollection(). It stops when the
+    // first failure is encountered (it does not return the failed match).
+    //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Represents the set of names appearing as capturing group
+    ///       names in a regular expression.
+    ///    </para>
+    /// </devdoc>
+    //[ Serializable() ]
+    public class MatchCollection : ICollection {
+        internal Regex _regex;
+        internal ArrayList _matches;
+        internal bool _done;
+        internal String _input;
+        internal int _beginning;
+        internal int _length;
+        internal int _startat;
+        internal int _prevlen;
+
+        private static int infinite = 0x7FFFFFFF;
+
+        // Nonpublic constructor
+        internal MatchCollection(Regex regex, String input, int beginning, int length, int startat) {
+            if (startat < 0 || startat > input.Length)
+                throw new ArgumentOutOfRangeException("startat", "Begin index not negative");//XXX: SR.GetString(SR.BeginIndexNotNegative));
+
+            _regex = regex;
+            _input = input;
+            _beginning = beginning;
+            _length = length;
+            _startat = startat;
+            _prevlen = -1;
+            _matches = new ArrayList();
+            _done = false;
+        }
+
+        internal Match GetMatch(int i) {
+            if (i < 0)
+                return null;
+
+            if (_matches.Count > i)
+                return(Match)_matches[i];
+
+            if (_done)
+                return null;
+
+            Match match;
+
+            do {
+                match = _regex.Run(false, _prevlen, _input, _beginning, _length, _startat);
+
+                if (!match.Success) {
+                    _done = true;
+                    return null;
+                }
+
+                _matches.Add(match);
+
+                _prevlen = match._length;
+                _startat = match._textpos;
+
+            } while (_matches.Count <= i);
+
+            return match;
+        }
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.Count"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the number of captures.
+        ///    </para>
+        /// </devdoc>
+        public int Count {
+            get {
+                if (_done)
+                    return _matches.Count;
+
+                GetMatch(infinite);
+
+                return _matches.Count;
+            }
+        }
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.SyncRoot"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public Object SyncRoot {
+            get {
+                return this;
+            }
+        }
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.IsSynchronized"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsSynchronized {
+            get {
+                return false;
+            }
+        }
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.IsReadOnly"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool IsReadOnly {
+            get {
+                return true;
+            }
+        }
+
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.this"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the ith Match in the collection.
+        ///    </para>
+        /// </devdoc>
+        public virtual Match this[int i]
+        {
+            get {
+                Match match;
+
+                match = GetMatch(i);
+
+                if (match == null)
+                    throw new ArgumentOutOfRangeException("i");
+
+                return match;
+            }
+        }
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.CopyTo"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Copies all the elements of the collection to the given array
+        ///       starting at the given index.
+        ///    </para>
+        /// </devdoc>
+        public void CopyTo(Array array, int arrayIndex) {
+            // property access to force computation of whole array
+            int count = Count;
+
+            _matches.CopyTo(array, arrayIndex);
+        }
+
+        //| <include file='doc\RegexMatchCollection.uex' path='docs/doc[@for="MatchCollection.GetEnumerator"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       Provides an enumerator in the same order as Item[i].
+        ///    </para>
+        /// </devdoc>
+        public IEnumerator GetEnumerator() {
+            return new MatchEnumerator(this);
+        }
+    }
+
+    // This non-public enumerator lists all the group matches.
+    // Should it be public?
+    //[ Serializable() ]
+    internal class MatchEnumerator : IEnumerator {
+        internal MatchCollection _matchcoll;
+        internal Match _match = null;
+        internal int _curindex;
+        internal bool _done;
+
+        // Nonpublic constructor
+        internal MatchEnumerator(MatchCollection matchcoll) {
+            _matchcoll = matchcoll;
+        }
+
+        // Advance to the next match
+        public bool MoveNext() {
+            if (_done)
+                return false;
+
+            _match = _matchcoll.GetMatch(_curindex++);
+
+            if (_match == null) {
+                _done = true;
+                return false;
+            }
+
+            return true;
+        }
+
+        // The current match
+        public Object Current {
+            get {
+                if (_match == null)
+                    throw new InvalidOperationException("Enum not Started");//XXX: SR.GetString(SR.EnumNotStarted));
+                return _match;
+            }
+        }
+
+        // The current match
+        public Match Match {
+            get {
+                return _match;
+            }
+        }
+
+        // Position before the first item
+        public void Reset() {
+            _curindex = 0;
+        }
+    }
+
+
+
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexnode.cs b/base/Kernel/System/Text/RegularExpressions/regexnode.cs
new file mode 100644
index 0000000..bb92460
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexnode.cs
@@ -0,0 +1,669 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexNode class is internal to the Regex package.
+// It is built into a parsed tree for a regular expression.
+//
+
+// Implementation notes:
+//
+// Since the node tree is a temporary data structure only used
+// during compilation of the regexp to integer codes, it's
+// designed for clarity and convenience rather than
+// space efficiency.
+//
+// RegexNodes are built into a tree, linked by the _children list.
+// Each node also has a _parent and _ichild member indicating
+// its parent and which child # it is in its parent's list.
+//
+// RegexNodes come in as many types as there are constructs in
+// a regular expression, for example, "concatenate", "alternate",
+// "one", "rept", "group". There are also node types for basic
+// peephole optimizations, e.g., "onerep", "notsetrep", etc.
+//
+// Because perl 5 allows "lookback" groups that scan backwards,
+// each node also gets a "direction". Normally the value of
+// boolean _backward = false.
+//
+// During parsing, top-level nodes are also stacked onto a parse
+// stack (a stack of trees). For this purpose we have a _next
+// pointer. [Note that to save a few bytes, we could overload the
+// _parent pointer instead.]
+//
+// On the parse stack, each tree has a "role" - basically, the
+// nonterminal in the grammar that the parser has currently
+// assigned to the tree. That code is stored in _role.
+//
+// Finally, some of the different kinds of nodes have data.
+// Two integers (for the looping constructs) are stored in
+// _operands, an an object (either a string or a set)
+// is stored in _data
+//
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Diagnostics;
+
+    internal sealed class RegexNode {
+        // RegexNode types
+        //
+
+        // the following are leaves, and correspond to primitive operations
+
+        //    static final int Onerep     = RegexCode.Onerep;     // c,n      a {n}
+        //    static final int Notonerep  = RegexCode.Notonerep;  // c,n      .{n}
+        //    static final int Setrep     = RegexCode.Setrep;     // set,n    \d {n}
+
+        internal const int Oneloop    = RegexCode.Oneloop;    // c,n      a*
+        internal const int Notoneloop = RegexCode.Notoneloop; // c,n      .*
+        internal const int Setloop    = RegexCode.Setloop;    // set,n    \d*
+
+        internal const int Onelazy    = RegexCode.Onelazy;    // c,n      a*?
+        internal const int Notonelazy = RegexCode.Notonelazy; // c,n      .*?
+        internal const int Setlazy    = RegexCode.Setlazy;    // set,n    \d*?
+
+        internal const int One        = RegexCode.One;        // char     a
+        internal const int Notone     = RegexCode.Notone;     // char     . [^a]
+        internal const int Set        = RegexCode.Set;        // set      [a-z] \w \s \d
+
+        internal const int Multi      = RegexCode.Multi;      // string   abcdef
+        internal const int Ref        = RegexCode.Ref;        // index    \1
+
+        internal const int Bol        = RegexCode.Bol;        //          ^
+        internal const int Eol        = RegexCode.Eol;        //          $
+        internal const int Boundary   = RegexCode.Boundary;   //          \b
+        internal const int Nonboundary= RegexCode.Nonboundary;//          \B
+        internal const int ECMABoundary   = RegexCode.ECMABoundary;    // \b
+        internal const int NonECMABoundary= RegexCode.NonECMABoundary; // \B
+        internal const int Beginning  = RegexCode.Beginning;  //          \A
+        internal const int Start      = RegexCode.Start;      //          \G
+        internal const int EndZ       = RegexCode.EndZ;       //          \Z
+        internal const int End        = RegexCode.End;        //          \z
+
+        // (note: End               = 21;)
+
+        // interior nodes do not correspond to primitive operations, but
+        // control structures compositing other operations
+
+        // concat and alternate take n children, and can run forward or backwards
+
+        internal const int Nothing    = 22;                   //          []
+        internal const int Empty      = 23;                   //          ()
+
+        internal const int Alternate  = 24;                   //          a|b
+        internal const int Concatenate= 25;                   //          ab
+
+        internal const int Loop       = 26;                   // m,x      * + ? {,}
+        internal const int Lazyloop   = 27;                   // m,x      *? +? ?? {,}?
+
+        internal const int Capture    = 28;                   // n        ()
+        internal const int Group      = 29;                   //          (?:)
+        internal const int Require    = 30;                   //          (?=) (?<=)
+        internal const int Prevent    = 31;                   //          (?!) (?<!)
+        internal const int Greedy     = 32;                   //          (?>) (?<)
+        internal const int Testref    = 33;                   //          (?(n) | )
+        internal const int Testgroup  = 34;                   //          (?(...) | )
+
+        internal const int infinite = 0x7FFFFFFF;
+
+        // RegexNode data members
+        //
+
+        internal int            _type;
+
+        internal ArrayList      _children;
+
+        internal String         _str;
+        internal String         _str2;
+        internal char           _ch;
+        internal int            _m;
+        internal int            _n;
+        internal RegexOptions   _options;
+
+        internal RegexNode   _next;
+
+        internal RegexNode(int type, RegexOptions options) {
+            _type = type;
+            _options = options;
+        }
+
+        internal RegexNode(int type, RegexOptions options, char ch) {
+            _type = type;
+            _options = options;
+            _ch = ch;
+        }
+
+        internal RegexNode(int type, RegexOptions options, String str) {
+            _type = type;
+            _options = options;
+            _str = str;
+        }
+
+        internal RegexNode(int type, RegexOptions options, String str, String str2) {
+            _type = type;
+            _options = options;
+            _str = str;
+            _str2 = str2;
+        }
+
+        internal RegexNode(int type, RegexOptions options, int m) {
+            _type = type;
+            _options = options;
+            _m = m;
+        }
+
+        internal RegexNode(int type, RegexOptions options, int m, int n) {
+            _type = type;
+            _options = options;
+            _m = m;
+            _n = n;
+        }
+
+        internal RegexNode() {
+        }
+
+        internal bool UseOptionR() {
+            return(_options & RegexOptions.RightToLeft) != 0;
+        }
+
+        internal RegexNode ReverseLeft() {
+            if (UseOptionR() && _type == Concatenate && _children != null) {
+                _children.Reverse(0, _children.Count);
+            }
+
+            return this;
+        }
+
+
+        // Pass type as OneLazy or OneLoop
+        internal void MakeRep(int type, int min, int max) {
+            _type += (type - One);
+            _m = min;
+            _n = max;
+        }
+
+        // Reduce
+        //
+        // Removes redundant nodes from the subtree, and returns a reduced subtree.
+        internal RegexNode Reduce() {
+            RegexNode n;
+
+            switch (Type()) {
+                case Alternate:
+                    n = ReduceAlternation();
+                    break;
+
+                case Concatenate:
+                    n = ReduceConcatenation();
+                    break;
+
+                case Loop:
+                case Lazyloop:
+                    n = ReduceRep();
+                    break;
+
+                case Group:
+                    n = ReduceGroup();
+                    break;
+
+                case Set:
+                case Setloop:
+                    n = ReduceSet();
+                    break;
+
+                default:
+                    n = this;
+                    break;
+            }
+
+            return n;
+        }
+
+
+        // StripEnation:
+        //
+        // Simple optimization. If a concatenation or alternation has only
+        // one child strip out the intermediate node. If it has zero children,
+        // turn it into an empty.
+        //
+
+        internal RegexNode StripEnation(int emptyType) {
+            switch (ChildCount()) {
+                case 0:
+                    return new RegexNode(emptyType, _options);
+                case 1:
+                    return Child(0);
+                default:
+                    return this;
+            }
+        }
+
+        // ReduceGroup:
+        //
+        // Simple optimization. Once parsed into a tree, noncapturing groups
+        // serve no function, so strip them out.
+
+        internal RegexNode ReduceGroup() {
+            RegexNode u;
+
+            for (u = this; u.Type() == Group; )
+                u = u.Child(0);
+
+            return u;
+        }
+
+        // ReduceRep:
+        //
+        // Nested repeaters just get multiplied with each other if they're not
+        // too lumpy
+
+        internal RegexNode ReduceRep() {
+            RegexNode u;
+            RegexNode child;
+            int type;
+            int min;
+            int max;
+
+            u = this;
+            type = Type();
+            min = _m;
+            max = _n;
+
+            for (;;) {
+                if (u.ChildCount() == 0)
+                    break;
+
+                child = u.Child(0);
+
+                // multiply reps of the same type only
+                if (child.Type() != type) {
+                    int childType = child.Type();
+
+                    if (!(childType >= Oneloop && childType <= Setloop && type == Loop ||
+                          childType >= Onelazy && childType <= Setlazy && type == Lazyloop))
+                        break;
+                }
+
+                // child can be too lumpy to blur, e.g., (a {100,105}) {3} or (a {2,})?
+                // [but things like (a {2,})+ are not too lumpy...]
+                if (u._m == 0 && child._m > 1 || child._n < child._m * 2)
+                    break;
+
+                u = child;
+                if (u._m > 0)
+                    u._m = min = ((infinite - 1) / u._m < min) ? infinite : u._m * min;
+                if (u._n > 0)
+                    u._n = max = ((infinite - 1) / u._n < max) ? infinite : u._n * max;
+            }
+
+            return min == infinite ? new RegexNode(Nothing, _options) : u;
+        }
+
+        // ReduceSet:
+        //
+        // Simple optimization. If a set is a singleton, an inverse singleton,
+        // or empty, it's transformed accordingly.
+
+        internal RegexNode ReduceSet() {
+            // Extract empty-set, one and not-one case as special
+
+            if (_str2 == String.Empty) {
+                if (_str == RegexCharClass.Empty) {
+                    _type = Nothing;
+                    _str = null;
+                }
+                else if (_str.Length == 2 && _str[0] + 1 == _str[1]) {
+                    _ch = _str[0];
+                    _str = null;
+                    _type += (One - Set);
+                }
+                else if (_str.Length == 3 && _str[0] == '\0' && (char)(_str[1] + 1) == _str[2]) {
+                    _ch = _str[1];
+                    _str = null;
+                    _type += (Notone - Set);
+                }
+            }
+
+            return this;
+        }
+
+        // ReduceAlternation:
+        //
+        // Basic optimization. Single-letter alternations can be replaced
+        // by faster set specifications, and nested alternations with no
+        // intervening operators can be flattened:
+        //
+        // a|b|c|def|g|h -> [a-c]|def|[gh]
+        // apple|(?:orange|pear)|grape -> apple|orange|pear|grape
+        //
+
+        internal RegexNode ReduceAlternation() {
+            // Combine adjacent sets/chars
+
+            bool wasLastSet;
+            RegexOptions optionsLast;
+            RegexOptions optionsAt;
+            int i;
+            int j;
+            RegexNode at;
+            RegexNode prev;
+
+            if (_children == null)
+                return new RegexNode(RegexNode.Nothing, _options);
+
+            wasLastSet = false;
+            optionsLast = 0;
+
+            for (i = 0, j = 0; i < _children.Count; i++, j++) {
+                at = (RegexNode)_children[i];
+
+                if (j < i)
+                    _children[j] = at;
+
+                for (;;) {
+                    if (at._type == Alternate) {
+                        for (int k = 0; k < at._children.Count; k++)
+                            ((RegexNode)at._children[k])._next = this;
+
+                        _children.InsertRange(i + 1, at._children);
+                        j--;
+                    }
+                    else if (at._type == Set || at._type == One) {
+                        // Cannot merge sets if L or I options differ
+                        optionsAt = at._options & (RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
+
+                        if (!wasLastSet || optionsLast != optionsAt) {
+                            wasLastSet = true;
+                            optionsLast = optionsAt;
+                            break;
+                        }
+
+                        // The last node was a Set or a One, we're a Set or One and our options are the same.
+                        // Merge the two nodes.
+                        prev = (RegexNode)_children[--j];
+
+                        if (prev._type == RegexNode.One) {
+                            prev._type = RegexNode.Set;
+                            prev._str = RegexCharClass.SetFromChar(prev._ch);
+                        }
+
+                        if (at._type == RegexNode.One)
+                            prev._str = RegexCharClass.SetUnion(prev._str, RegexCharClass.SetFromChar(at._ch)); // no categories to worry about
+                        else {
+                            prev._str  = RegexCharClass.SetUnion(prev._str, at._str);
+                            prev._str2 = RegexCharClass.CategoryUnion(prev._str2, at._str2);
+                        }
+                    }
+                    else if (at._type == RegexNode.Nothing) {
+                        j--;
+                    }
+                    else {
+                        wasLastSet = false;
+                    }
+                    break;
+                }
+            }
+
+            if (j < i)
+                _children.RemoveRange(j, i - j);
+
+            return StripEnation(RegexNode.Nothing);
+        }
+
+        // ReduceConcatenation:
+        //
+        // Basic optimization. Adjacent strings can be concatenated.
+        //
+        // (?:abc)(?:def) -> abcdef
+
+        internal RegexNode ReduceConcatenation() {
+            // Eliminate empties and concat adjacent strings/chars
+
+            bool wasLastString;
+            RegexOptions optionsLast;
+            RegexOptions optionsAt;
+            int i;
+            int j;
+
+            if (_children == null)
+                return new RegexNode(RegexNode.Empty, _options);
+
+            wasLastString = false;
+            optionsLast = 0;
+
+            for (i = 0, j = 0; i < _children.Count; i++, j++) {
+                RegexNode at;
+                RegexNode prev;
+
+                at = (RegexNode)_children[i];
+
+                if (j < i)
+                    _children[j] = at;
+
+                if (at._type == RegexNode.Concatenate &&
+                    ((at._options & RegexOptions.RightToLeft) == (_options & RegexOptions.RightToLeft))) {
+                    for (int k = 0; k < at._children.Count; k++)
+                        ((RegexNode)at._children[k])._next = this;
+
+                    _children.InsertRange(i + 1, at._children);
+                    j--;
+                }
+                else if (at._type == RegexNode.Multi ||
+                         at._type == RegexNode.One) {
+                    // Cannot merge strings if L or I options differ
+                    optionsAt = at._options & (RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
+
+                    if (!wasLastString || optionsLast != optionsAt) {
+                        wasLastString = true;
+                        optionsLast = optionsAt;
+                        continue;
+                    }
+
+                    prev = (RegexNode)_children[--j];
+
+                    if (prev._type == RegexNode.One) {
+                        prev._type = RegexNode.Multi;
+                        prev._str = prev._ch.ToString(); //Convert.ToString(prev._ch);
+                    }
+
+                    if ((optionsAt & RegexOptions.RightToLeft) == 0) {
+                        if (at._type == RegexNode.One)
+                            prev._str += at._ch.ToString();
+                        else
+                            prev._str += at._str;
+                    }
+                    else {
+                        if (at._type == RegexNode.One)
+                            prev._str = at._ch.ToString() + prev._str;
+                        else
+                            prev._str = at._str + prev._str;
+                    }
+
+                }
+                else if (at._type == RegexNode.Empty) {
+                    j--;
+                }
+                else {
+                    wasLastString = false;
+                }
+            }
+
+            if (j < i)
+                _children.RemoveRange(j, i - j);
+
+            return StripEnation(RegexNode.Empty);
+        }
+
+        internal RegexNode MakeQuantifier(bool lazy, int min, int max) {
+            RegexNode result;
+
+            if (min == 0 && max == 0)
+                return new RegexNode(RegexNode.Empty, _options);
+
+            if (min == 1 && max == 1)
+                return this;
+
+            switch (_type) {
+                case RegexNode.One:
+                case RegexNode.Notone:
+                case RegexNode.Set:
+
+                    MakeRep(lazy ? RegexNode.Onelazy : RegexNode.Oneloop, min, max);
+                    return this;
+
+                default:
+                    result = new RegexNode(lazy ? RegexNode.Lazyloop : RegexNode.Loop, _options, min, max);
+                    result.AddChild(this);
+                    return result;
+            }
+        }
+
+
+        internal void AddChild(RegexNode newChild) {
+            RegexNode reducedChild;
+
+            if (_children == null)
+                _children = new ArrayList(4);
+
+            reducedChild = newChild.Reduce();
+
+            _children.Add(reducedChild);
+            reducedChild._next = this;
+        }
+        internal RegexNode Child(int i) {
+            return(RegexNode)_children[i];
+        }
+
+        internal int ChildCount() {
+            return _children == null ? 0 : _children.Count;
+        }
+
+        internal int Type() {
+            return _type;
+        }
+
+#if DBG
+        internal static String[] TypeStr = new String[] {
+            "Onerep", "Notonerep", "Setrep",
+            "Oneloop", "Notoneloop", "Setloop",
+            "Onelazy", "Notonelazy", "Setlazy",
+            "One", "Notone", "Set",
+            "Multi", "Ref",
+            "Bol", "Eol", "Boundary", "Nonboundary",
+            "ECMABoundary", "NonECMABoundary",
+            "Beginning", "Start", "EndZ", "End",
+            "Nothing", "Empty",
+            "Alternate", "Concatenate",
+            "Loop", "Lazyloop",
+            "Capture", "Group", "Require", "Prevent", "Greedy",
+            "Testref", "Testgroup"};
+
+        internal String Description() {
+
+            StringBuilder ArgSb = new StringBuilder();
+
+            ArgSb.Append(TypeStr[_type]);
+
+            if ((_options & RegexOptions.ExplicitCapture) != 0)
+                ArgSb.Append("-C");
+            if ((_options & RegexOptions.IgnoreCase) != 0)
+                ArgSb.Append("-I");
+            if ((_options & RegexOptions.RightToLeft) != 0)
+                ArgSb.Append("-L");
+            if ((_options & RegexOptions.Multiline) != 0)
+                ArgSb.Append("-M");
+            if ((_options & RegexOptions.Singleline) != 0)
+                ArgSb.Append("-S");
+            if ((_options & RegexOptions.IgnorePatternWhitespace) != 0)
+                ArgSb.Append("-X");
+            if ((_options & RegexOptions.ECMAScript) != 0)
+                ArgSb.Append("-E");
+
+            switch (_type) {
+                case Oneloop:
+                case Notoneloop:
+                case Onelazy:
+                case Notonelazy:
+                case One:
+                case Notone:
+                    ArgSb.Append("(Ch = " + RegexCharClass.CharDescription(_ch) + ")");
+                    break;
+                case Capture:
+                    ArgSb.Append("(index = " + _m.ToString() + ", unindex = " + _n.ToString() + ")");
+                    break;
+                case Ref:
+                case Testref:
+                    ArgSb.Append("(index = " + _m.ToString() + ")");
+                    break;
+                case Multi:
+                    ArgSb.Append("(String = " + _str + ")");
+                    break;
+                case Set:
+                case Setloop:
+                case Setlazy:
+                    ArgSb.Append("(Set = " + RegexCharClass.SetDescription(_str) + ")");
+                    break;
+            }
+
+            switch (_type) {
+                case Oneloop:
+                case Notoneloop:
+                case Onelazy:
+                case Notonelazy:
+                case Setloop:
+                case Setlazy:
+                case Loop:
+                case Lazyloop:
+                    ArgSb.Append("(Min = " + _m.ToString() + ", Max = " + (_n == infinite ? "inf" : Convert.ToString(_n)) + ")");
+            break;
+            }
+
+            return ArgSb.ToString();
+        }
+
+        internal const String Space = "                                ";
+
+        internal void Dump() {
+            ArrayList Stack = new ArrayList();
+            RegexNode CurNode;
+            int CurChild;
+
+            CurNode = this;
+            CurChild = 0;
+
+            Debug.WriteLine(CurNode.Description());
+
+            for (;;) {
+                if (CurNode._children != null && CurChild < CurNode._children.Count) {
+                    Stack.Add(CurChild + 1);
+                    CurNode = (RegexNode)CurNode._children[CurChild];
+                    CurChild = 0;
+
+                    int Depth = Stack.Count;
+                    if (Depth > 32)
+                        Depth = 32;
+
+                    Debug.WriteLine(Space.Substring(0, Depth) + CurNode.Description());
+                }
+                else {
+                    if (Stack.Count == 0)
+                        break;
+
+                    CurChild = (Int32)Stack[Stack.Count - 1];
+                    Stack.RemoveAt(Stack.Count - 1);
+                    CurNode = CurNode._next;
+                }
+            }
+        }
+#endif
+
+    }
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexoptions.cs b/base/Kernel/System/Text/RegularExpressions/regexoptions.cs
new file mode 100644
index 0000000..c6f94fa
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexoptions.cs
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+#define ECMA
+
+
+namespace System.Text.RegularExpressions {
+
+using System;
+
+    //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions"]/*' />
+    /// <devdoc>
+    ///    <para>[To be supplied.]</para>
+    /// </devdoc>
+    [Flags]
+    public enum RegexOptions {
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.None"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        None =                     0x0000,
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.IgnoreCase"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        IgnoreCase =               0x0001,      // "i"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.Multiline"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Multiline =                0x0002,      // "m"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.ExplicitCapture"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        ExplicitCapture =          0x0004,      // "n"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.Compiled"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Compiled =                 0x0008,      // "c"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.Singleline"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Singleline =               0x0010,      // "s"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.IgnorePatternWhitespace"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        IgnorePatternWhitespace =  0x0020,      // "x"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.RightToLeft"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        RightToLeft =              0x0040,      // "r"
+
+#if DBG
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.Debug"]/*' />
+        /// <internalonly/>
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Debug=                     0x0080,      // "d"
+#endif
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.ECMAScript"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        ECMAScript =                  0x0100,      // "e"
+
+        //| <include file='doc\RegexOptions.uex' path='docs/doc[@for="RegexOptions.CultureInvariant"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        CultureInvariant =                  0x0200,
+    }
+
+
+}
+
diff --git a/base/Kernel/System/Text/RegularExpressions/regexparser.cs b/base/Kernel/System/Text/RegularExpressions/regexparser.cs
new file mode 100644
index 0000000..7d7c646
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexparser.cs
@@ -0,0 +1,1962 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexParser class is internal to the Regex package.
+// It builds a tree of RegexNodes from a regular expression
+//
+
+// Implementation notes:
+//
+// It would be nice to get rid of the comment modes, since the
+// ScanBlank() calls are just kind of duct-taped in.
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Globalization;
+
+    internal sealed class RegexParser {
+        internal RegexNode _stack;
+        internal RegexNode _group;
+        internal RegexNode _alternation;
+        internal RegexNode _concatenation;
+        internal RegexNode _unit;
+
+        internal String _pattern;
+        internal int _currentPos;
+        internal CultureInfo _culture;
+
+        internal int _autocap;
+        internal int _capcount;
+        internal int _captop;
+        internal int _capsize;
+        internal Hashtable _caps;
+        internal Hashtable _capnames;
+        internal Object[] _capnumlist;
+        internal ArrayList _capnamelist;
+
+        internal RegexOptions _options;
+        internal ArrayList _optionsStack;
+
+        internal bool _ignoreNextParen = false;
+
+        internal const int infinite = RegexNode.infinite;
+
+        // This static call constructs a RegexTree from a regular expression
+        // pattern string and an option string.
+        //
+        // The method creates, drives, and drops a parser instance.
+        internal static RegexTree Parse(String re, RegexOptions op) {
+            RegexParser p;
+            RegexNode root;
+            String[] capnamelist;
+
+            p = new RegexParser((op & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture);
+
+            p._options = op;
+
+            p.SetPattern(re);
+            p.CountCaptures();
+            p.Reset(op);
+            root = p.ScanRegex();
+
+            if (p._capnamelist == null)
+                capnamelist = null;
+            else
+                capnamelist = (String[])p._capnamelist.ToArray(typeof(String));
+
+            return new RegexTree(root, p._caps, p._capnumlist, p._captop, p._capnames, capnamelist, op);
+        }
+
+        // This static call constructs a flat concatenation node given
+        // a replacement pattern.
+        internal static RegexReplacement ParseReplacement(String rep, Hashtable caps, int capsize, Hashtable capnames, RegexOptions op) {
+            RegexParser p;
+            RegexNode root;
+
+            p = new RegexParser((op & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture);
+
+            p._options = op;
+
+            p.NoteCaptures(caps, capsize, capnames);
+            p.SetPattern(rep);
+            root = p.ScanReplacement();
+
+            return new RegexReplacement(rep, root, caps);
+        }
+
+        // Escapes all metacharacters (including |,(,),[,{,|,^,$,*,+,?,\, spaces and #)
+        internal static String Escape(String input) {
+            for (int i = 0; i < input.Length; i++) {
+                if (IsMetachar(input[i])) {
+                    StringBuilder sb = new StringBuilder();
+                    char ch = input[i];
+                    int lastpos;
+
+                    sb.Append(input, 0, i);
+                    do {
+                        sb.Append('\\');
+                        switch (ch) {
+                            case '\n':
+                                ch = 'n';
+                                break;
+                            case '\r':
+                                ch = 'r';
+                                break;
+                            case '\t':
+                                ch = 't';
+                                break;
+                            case '\f':
+                                ch = 'f';
+                                break;
+                        }
+                        sb.Append(ch);
+                        i++;
+                        lastpos = i;
+
+                        while (i < input.Length) {
+                            ch = input[i];
+                            if (IsMetachar(ch))
+                                break;
+
+                            i++;
+                        }
+
+                        sb.Append(input, lastpos, i - lastpos);
+
+                    } while (i < input.Length);
+
+                    return sb.ToString();
+                }
+            }
+
+            return input;
+        }
+
+        // Escapes all metacharacters (including (,),[,],{,},|,^,$,*,+,?,\, spaces and #)
+        internal static String Unescape(String input) {
+            for (int i = 0; i < input.Length; i++) {
+                if (input[i] == '\\') {
+                    StringBuilder sb = new StringBuilder();
+                    RegexParser p = new RegexParser(CultureInfo.InvariantCulture);
+                    int lastpos;
+                    p.SetPattern(input);
+
+                    sb.Append(input, 0, i);
+                    do {
+                        i++;
+                        p.Textto(i);
+                        if (i < input.Length)
+                            sb.Append(p.ScanCharEscape());
+                        i = p.Textpos();
+                        lastpos = i;
+                        while (i < input.Length && input[i] != '\\')
+                            i++;
+                        sb.Append(input, lastpos, i - lastpos);
+
+                    } while (i < input.Length);
+
+                    return sb.ToString();
+                }
+            }
+
+            return input;
+        }
+
+        // Private constructor.
+        private RegexParser(CultureInfo culture) {
+            _culture = culture;
+            _optionsStack = new ArrayList();
+            _caps = new Hashtable();
+        }
+
+        // Drops a string into the pattern buffer.
+        internal void SetPattern(String Re) {
+            if (Re == null)
+                Re = String.Empty;
+            _pattern = Re;
+            _currentPos = 0;
+        }
+
+        // Resets parsing to the beginning of the pattern.
+        internal void Reset(RegexOptions topopts) {
+            _currentPos = 0;
+            _autocap = 1;
+            _ignoreNextParen = false;
+
+            if (_optionsStack.Count > 0)
+                _optionsStack.RemoveRange(0, _optionsStack.Count - 1);
+
+            _options = topopts;
+            _stack = null;
+        }
+
+        // The main parsing function.
+        internal RegexNode ScanRegex() {
+            char ch = '@'; // nonspecial ch, means at beginning
+            bool isQuantifier = false;
+
+            StartGroup(new RegexNode(RegexNode.Capture, _options, 0, -1));
+
+            while (CharsRight() > 0) {
+                bool wasPrevQuantifier = isQuantifier;
+                isQuantifier = false;
+
+                ScanBlank();
+
+                int startpos = Textpos();
+
+                if (UseOptionX())
+                    while (CharsRight() > 0 && (!IsStopperX(ch = RightChar()) || ch == '{' && !IsTrueQuantifier()))
+                        RightNext();
+                else
+                    while (CharsRight() > 0 && (!IsSpecial(ch = RightChar()) || ch == '{' && !IsTrueQuantifier()))
+                        RightNext();
+
+                int endpos = Textpos();
+
+                ScanBlank();
+
+                if (CharsRight() == 0)
+                    ch = '!'; // nonspecial, means at end
+                else if (IsSpecial(ch = RightChar())) {
+                    isQuantifier = IsQuantifier(ch);
+                    RightNext();
+                } else
+                    ch = ' '; // nonspecial, means at ordinary char
+
+                if (startpos < endpos) {
+                    int cchUnquantified = endpos - startpos - (isQuantifier ? 1 : 0);
+
+                    wasPrevQuantifier = false;
+
+                    if (cchUnquantified > 0)
+                        AddConcatenate(startpos, cchUnquantified, false);
+
+                    if (isQuantifier)
+                        AddUnitOne(CharAt(endpos - 1));
+                }
+
+                switch (ch) {
+                    case '!':
+                        goto BreakOuterScan;
+
+                    case ' ':
+                        goto ContinueOuterScan;
+
+                    case '[':
+                        AddUnitSet(ScanCharClass(UseOptionI()));
+                        if (CharsRight() == 0 || RightCharNext() != ']')
+                            throw MakeException("Unterminated Bracket");// XXX: SR.GetString(SR.UnterminatedBracket));
+                        break;
+
+                    case '(': {
+                            RegexNode grouper;
+
+                            PushOptions();
+
+                            if (null == (grouper = ScanGroupOpen())) {
+                                PopKeepOptions();
+                            }
+                            else {
+                                PushGroup();
+                                StartGroup(grouper);
+                            }
+                        }
+                        continue;
+
+                    case '|':
+                        AddAlternate();
+                        goto ContinueOuterScan;
+
+                    case ')':
+                        if (EmptyStack())
+                            throw MakeException("Too many parens");//XXX: R.GetString(SR.TooManyParens));
+
+                        AddGroup();
+                        PopGroup();
+                        PopOptions();
+
+                        if (Unit() == null)
+                            goto ContinueOuterScan;
+                        break;
+
+                    case '\\':
+                        AddUnitNode(ScanBackslash());
+                        break;
+
+                    case '^':
+                        AddUnitType(UseOptionM() ? RegexNode.Bol : RegexNode.Beginning);
+                        break;
+
+                    case '$':
+                        AddUnitType(UseOptionM() ? RegexNode.Eol : RegexNode.EndZ);
+                        break;
+
+                    case '.':
+                        if (UseOptionS())
+                            AddUnitSet(RegexCharClass.AnyClass);
+                        else
+                            AddUnitNotone('\n');
+                        break;
+
+                    case '{':
+                    case '*':
+                    case '+':
+                    case '?':
+                        if (Unit() == null)
+                            throw MakeException(wasPrevQuantifier ?
+                                "Nested Quantify": "Quantify After Nothing");
+//XXX                        throw MakeException(wasPrevQuantifier ?
+//                                                SR.GetString(SR.NestedQuantify, ch.ToString()) :
+//                                                SR.GetString(SR.QuantifyAfterNothing));
+                        LeftNext();
+                        break;
+
+                    default:
+                        throw MakeException("Internal Error"); // XXX: SR.GetString(SR.InternalError));
+                }
+
+                ScanBlank();
+
+                if (CharsRight() == 0 || !(isQuantifier = IsTrueQuantifier())) {
+                    AddConcatenate();
+                    goto ContinueOuterScan;
+                }
+
+                ch = RightCharNext();
+
+                // Handle quantifiers
+                while (Unit() != null) {
+                    int min;
+                    int max;
+                    bool lazy;
+
+                    switch (ch) {
+                        case '*':
+                            min = 0;
+                            max = infinite;
+                            break;
+
+                        case '?':
+                            min = 0;
+                            max = 1;
+                            break;
+
+                        case '+':
+                            min = 1;
+                            max = infinite;
+                            break;
+
+                        case '{': {
+                                startpos = Textpos();
+                                max = min = ScanDecimal();
+                                if (startpos < Textpos()) {
+                                    if (CharsRight() > 0 && RightChar() == ',') {
+                                        RightNext();
+                                        if (CharsRight() == 0 || RightChar() == '}')
+                                            max = infinite;
+                                        else
+                                            max = ScanDecimal();
+                                    }
+                                }
+
+                                if (startpos == Textpos() || CharsRight() == 0 || RightCharNext() != '}') {
+                                    AddConcatenate();
+                                    Textto(startpos - 1);
+                                    goto ContinueOuterScan;
+                                }
+                            }
+
+                            break;
+
+                        default:
+                            throw MakeException("Internal Error");//XXX: SR.GetString(SR.InternalError));
+                    }
+
+                    ScanBlank();
+
+                    if (CharsRight() == 0 || RightChar() != '?')
+                        lazy = false;
+                    else {
+                        RightNext();
+                        lazy = true;
+                    }
+
+                    if (min > max)
+                        throw MakeException("Illegal Range"); //SR.GetString(SR.IllegalRange));
+
+                    AddConcatenate(lazy, min, max);
+                }
+
+                ContinueOuterScan:
+                ;
+            }
+
+            BreakOuterScan:
+            ;
+
+            if (!EmptyStack())
+                throw MakeException("Not enough Parens"); // XXX: SR.GetString(SR.NotEnoughParens));
+
+            AddGroup();
+
+            return Unit();
+        }
+
+        // Simple parsing for replacement patterns
+        internal RegexNode ScanReplacement() {
+            int c;
+            int startpos;
+
+            _concatenation = new RegexNode(RegexNode.Concatenate, _options);
+
+            for (;;) {
+                c = CharsRight();
+                if (c == 0)
+                    break;
+
+                startpos = Textpos();
+
+                while (c > 0 && RightChar() != '$') {
+                    RightNext();
+                    c--;
+                }
+
+                AddConcatenate(startpos, Textpos() - startpos, true);
+
+                if (c > 0) {
+                    if (RightCharNext() == '$')
+                        AddUnitNode(ScanDollar());
+                    AddConcatenate();
+                }
+            }
+
+            return _concatenation;
+        }
+
+        // Scans contents of [] (not including []'s), and converts to a
+        // RegexCharClass.
+        internal RegexCharClass ScanCharClass(bool caseInsensitive) {
+            return ScanCharClass(caseInsensitive, false);
+        }
+
+        // Scans contents of [] (not including []'s), and converts to a
+        // RegexCharClass.
+        internal RegexCharClass ScanCharClass(bool caseInsensitive, bool scanOnly) {
+            char    ch = '\0';
+            bool inRange;
+            bool firstChar;
+            char    chPrev = '\0';
+
+            RegexCharClass cc;
+
+            cc = scanOnly ? null : new RegexCharClass();
+
+            if (CharsRight() > 0 && RightChar() == '^') {
+                RightNext();
+                firstChar = false;
+                if (!scanOnly)
+                    cc.Negate = true;
+            }
+
+            inRange = false;
+
+            for (firstChar = true; CharsRight() > 0; firstChar = false) {
+                switch (ch = RightCharNext()) {
+                    case ']':
+                        if (!firstChar) {
+                            LeftNext();
+                            goto BreakScan;
+                        }
+                        break;
+
+                    case '\\':
+                        if (CharsRight() > 0) {
+                            switch (ch = RightCharNext()) {
+                                case 'd':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range");//XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        if (UseOptionE())
+                                            cc.AddSet(RegexCharClass.ECMADigit);
+                                        else
+                                            cc.AddCategoryFromName("Nd", false, false, _pattern);
+                                    }
+                                    continue;
+
+                                case 'D':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range"); //XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        if (UseOptionE())
+                                            cc.AddSet(RegexCharClass.NotECMADigit);
+                                        else
+                                            cc.AddCategoryFromName("Nd", true, false, _pattern);
+                                    }
+                                    continue;
+
+                                case 's':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range");//XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        if (UseOptionE())
+                                            cc.AddSet(RegexCharClass.ECMASpace);
+                                        else
+                                            cc.AddCategory(RegexCharClass.Space);
+                                    }
+                                    continue;
+
+                                case 'S':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range");//XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        if (UseOptionE())
+                                            cc.AddSet(RegexCharClass.NotECMASpace);
+                                        else
+                                            cc.AddCategory(RegexCharClass.NotSpace);
+                                    }
+                                    continue;
+
+                                case 'w':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range");//XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        if (UseOptionE())
+                                            cc.AddSet(RegexCharClass.ECMAWord);
+                                        else
+                                            cc.AddCategory(RegexCharClass.Word);
+                                    }
+                                    continue;
+
+
+                                case 'W':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range");//XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        if (UseOptionE())
+                                            cc.AddSet(RegexCharClass.NotECMAWord);
+                                        else
+                                            cc.AddCategory(RegexCharClass.NotWord);
+                                    }
+                                    continue;
+
+
+                                case 'p':
+                                case 'P':
+                                    if (!scanOnly) {
+                                        if (inRange)
+                                            throw MakeException("Bad class in char range"); //XXX: SR.GetString(SR.BadClassInCharRange, ch.ToString()));
+                                        cc.AddCategoryFromName(ParseProperty(), (ch != 'p'), caseInsensitive, _pattern);
+                                    }
+                                    else
+                                        ParseProperty();
+
+                                    continue;
+
+
+                                default:
+                                    LeftNext();
+                                    ch = ScanCharEscape();
+                                    break;
+                            }
+                        }
+                        break;
+
+                    case '[':
+                        if (CharsRight() > 0 && RightChar() == ':' && !inRange) {
+                            String name;
+                            int savePos = Textpos();
+
+                            RightNext();
+                            name = ScanCapname();
+                            if (CharsRight() < 2 || RightCharNext() != ':' || RightCharNext() != ']')
+                                Textto(savePos);
+                            // else lookup name (not yet implemented)
+                        }
+                        break;
+                }
+
+                if (inRange) {
+                    inRange = false;
+                    if (!scanOnly) {
+                        if (chPrev > ch)
+                            throw MakeException("Reversed char range");//XXX: SR.GetString(SR.ReversedCharRange));
+                        cc.AddRange(chPrev, ch);
+                    }
+                }
+                else if (CharsRight() >= 2 && RightChar() == '-' && RightChar(1) != ']') {
+                    chPrev = ch;
+                    inRange = true;
+                    RightNext();
+                }
+                else {
+                    if (!scanOnly)
+                        cc.AddRange(ch, ch);
+                }
+            }
+
+            BreakScan:
+            ;
+
+            return cc;
+        }
+
+        // Scans chars following a '(' (not counting the '('), and returns
+        // a RegexNode for the type of group scanned, or null if the group
+        // simply changed options (?cimsx-cimsx) or was a comment (#...).
+        internal RegexNode ScanGroupOpen() {
+            char ch = '\0';
+            int NodeType;
+            char close = '>';
+
+
+            // just return a RegexNode if we have:
+            // 1. "(" followed by nothing
+            // 2. "(x" where x != ?
+            // 3. "(?)"
+            if (CharsRight() == 0 || RightChar() != '?' || (RightChar() == '?' && RightChar(1) == ')')) {
+                if (UseOptionN() || _ignoreNextParen) {
+                    _ignoreNextParen = false;
+                    return new RegexNode(RegexNode.Group, _options);
+                }
+                else
+                    return new RegexNode(RegexNode.Capture, _options, _autocap++, -1);
+            }
+
+            RightNext();
+
+            for (;;) {
+                if (CharsRight() == 0)
+                    break;
+
+                switch (ch = RightCharNext()) {
+                    case ':':
+                        NodeType = RegexNode.Group;
+                        break;
+
+                    case '=':
+                        _options &= ~(RegexOptions.RightToLeft);
+                        NodeType = RegexNode.Require;
+                        break;
+
+                    case '!':
+                        _options &= ~(RegexOptions.RightToLeft);
+                        NodeType = RegexNode.Prevent;
+                        break;
+
+                    case '>':
+                        NodeType = RegexNode.Greedy;
+                        break;
+
+                    case '\'':
+                        close = '\'';
+                        goto case '<';
+                        // fall through
+
+                    case '<':
+                        if (CharsRight() == 0)
+                            goto BreakRecognize;
+
+                        switch (ch = RightCharNext()) {
+                            case '=':
+                                if (close == '\'')
+                                    goto BreakRecognize;
+
+                                _options |= RegexOptions.RightToLeft;
+                                NodeType = RegexNode.Require;
+                                break;
+
+                            case '!':
+                                if (close == '\'')
+                                    goto BreakRecognize;
+
+                                _options |= RegexOptions.RightToLeft;
+                                NodeType = RegexNode.Prevent;
+                                break;
+
+                            default:
+                                LeftNext();
+                                int capnum = -1;
+                                int uncapnum = -1;
+                                bool proceed = false;
+
+                                // grab part before -
+
+                                if (ch >= '0' && ch <= '9') {
+                                    capnum = ScanDecimal();
+
+                                    if (!IsCaptureSlot(capnum))
+                                        capnum = -1;
+
+                                    // check if we have bogus characters after the number
+                                    if (CharsRight() > 0 && !(RightChar() == close || RightChar() == '-'))
+                                        throw MakeException("Invalid group name");//XXX: SR.GetString(SR.InvalidGroupName));
+                                    if (capnum == 0)
+                                        throw MakeException("Capnum not zero"); //XXX: SR.GetString(SR.CapnumNotZero));
+                                }
+                                else if (RegexCharClass.IsWordChar(ch)) {
+                                    String capname = ScanCapname();
+
+                                    if (IsCaptureName(capname))
+                                        capnum = CaptureSlotFromName(capname);
+
+                                    // check if we have bogus character after the name
+                                    if (CharsRight() > 0 && !(RightChar() == close || RightChar() == '-'))
+                                        throw MakeException("Invalid group name"); //XXX: SR.GetString(SR.InvalidGroupName));
+                                }
+                                else if (ch == '-') {
+                                    proceed = true;
+                                }
+                                else {
+                                    // bad group name - starts with something other than a word character and isn't a number
+                                    throw MakeException("Invalid group name"); //XXX: SR.GetString(SR.InvalidGroupName));
+                                }
+
+                                // grab part after - if any
+
+                                if ((capnum != -1 || proceed == true) && CharsRight() > 0 && RightChar() == '-') {
+                                    RightNext();
+                                    ch = RightChar();
+
+                                    if (ch >= '0' && ch <= '9') {
+                                        uncapnum = ScanDecimal();
+
+                                        if (!IsCaptureSlot(uncapnum))
+                                            throw MakeException("Undefined backreference");//XXX: SR.GetString(SR.UndefinedBackref, uncapnum));
+
+                                        // check if we have bogus characters after the number
+                                        if (CharsRight() > 0 && RightChar() != close)
+                                            throw MakeException("Invalid group name");//XXX: SR.GetString(SR.InvalidGroupName));
+                                    }
+                                    else if (RegexCharClass.IsWordChar(ch)) {
+                                        String uncapname = ScanCapname();
+
+                                        if (IsCaptureName(uncapname))
+                                            uncapnum = CaptureSlotFromName(uncapname);
+                                        else
+                                            throw MakeException("Undefined name reference"); //XXX: SR.GetString(SR.UndefinedNameRef, uncapname));
+
+                                        // check if we have bogus character after the name
+                                        if (CharsRight() > 0 && RightChar() != close)
+                                            throw MakeException("Invalid group name"); //XXX: SR.GetString(SR.InvalidGroupName));
+                                    }
+                                    else {
+                                        // bad group name - starts with something other than a word character and isn't a number
+                                        throw MakeException("Invalid group name"); //XXX: SR.GetString(SR.InvalidGroupName));
+                                    }
+                                }
+
+                                // actually make the node
+
+                                if ((capnum != -1 || uncapnum != -1) && CharsRight() > 0 && RightCharNext() == close) {
+                                    return new RegexNode(RegexNode.Capture, _options, capnum, uncapnum);
+                                }
+                                goto BreakRecognize;
+                        }
+                        break;
+
+                    case '(':
+                        // alternation construct (?(...) | )
+                        int parenPos = Textpos();
+
+                        ch = RightChar();
+
+                        // check if the alternation condition is a backref
+                        if (ch >= '0' && ch <= '9') {
+                            int capnum = ScanDecimal();
+                            if (CharsRight() > 0 && RightCharNext() == ')') {
+                                if (IsCaptureSlot(capnum))
+                                    return new RegexNode(RegexNode.Testref, _options, capnum);
+                                else
+                                    throw MakeException("Undefined reference"); //XXX: SR.GetString(SR.UndefinedReference, capnum.ToString()));
+                            }
+                            else
+                                throw MakeException("Malformed reference"); //XXX: SR.GetString(SR.MalformedReference, capnum.ToString()));
+
+                        }
+                        else if (RegexCharClass.IsWordChar(ch)) {
+                            String capname = ScanCapname();
+
+                            if (IsCaptureName(capname) && CharsRight() > 0 && RightCharNext() == ')')
+                                return new RegexNode(RegexNode.Testref, _options, CaptureSlotFromName(capname));
+                        }
+
+                        // not a backref
+                        NodeType = RegexNode.Testgroup;
+                        Textto(parenPos - 1);       // jump to the start of the parentheses
+                        _ignoreNextParen = true;    // but make sure we don't try to capture the insides
+
+                        int charsRight = CharsRight();
+                        if (charsRight >= 3 && RightChar(1) == '?') {
+                            char rightchar2 = RightChar(2);
+                            // disallow comments in the condition
+                            if (rightchar2 == '#')
+                                throw MakeException("Alternation cannnot have comment"); //XXX: SR.GetString(SR.AlternationCantHaveComment));
+
+                            // disallow named capture group (?<..>..) in the condition
+                            if (rightchar2 == '\'' )
+                                throw MakeException("Alternation cannot capture"); //XXX: SR.GetString(SR.AlternationCantCapture));
+                            else {
+                                if (charsRight >=4 && (rightchar2 == '<' && RightChar(3) != '!' && RightChar(3) != '='))
+                                    throw MakeException("Alternation cannot capture"); //XXX: SR.GetString(SR.AlternationCantCapture));
+                            }
+                        }
+
+                        break;
+
+
+                    default:
+                        LeftNext();
+
+                        NodeType = RegexNode.Group;
+                        ScanOptions();
+                        if (CharsRight() == 0)
+                            goto BreakRecognize;
+
+                        if ((ch = RightCharNext()) == ')')
+                            return null;
+
+                        if (ch != ':')
+                            goto BreakRecognize;
+                        break;
+                }
+
+                return new RegexNode(NodeType, _options);
+            }
+
+            BreakRecognize:
+            ;
+            // break Recognize comes here
+
+            throw MakeException("Unrecognized grouping"); //XXX: SR.GetString(SR.UnrecognizedGrouping));
+        }
+
+        // Scans whitespace or x-mode comments.
+        internal void ScanBlank() {
+            if (UseOptionX()) {
+                for (;;) {
+                    while (CharsRight() > 0 && IsSpace(RightChar()))
+                        RightNext();
+
+                    if (CharsRight() == 0)
+                        break;
+
+                    if (RightChar() == '#') {
+                        while (CharsRight() > 0 && RightChar() != '\n')
+                            RightNext();
+                    }
+                    else if (CharsRight() >= 3 && RightChar(2) == '#' &&
+                             RightChar(1) == '?' && RightChar() == '(') {
+                        while (CharsRight() > 0 && RightChar() != ')')
+                            RightNext();
+                        if (CharsRight() == 0)
+                            throw MakeException("Unterminated comment"); //SR.GetString(SR.UnterminatedComment));
+                        RightNext();
+                    }
+                    else
+                        break;
+                }
+            }
+            else {
+                for (;;) {
+                    if (CharsRight() < 3 || RightChar(2) != '#' ||
+                        RightChar(1) != '?' || RightChar() != '(')
+                        return;
+
+                    while (CharsRight() > 0 && RightChar() != ')')
+                        RightNext();
+                    if (CharsRight() == 0)
+                        throw MakeException("Unterminated comment"); //XXX: SR.GetString(SR.UnterminatedComment));
+                    RightNext();
+                }
+            }
+        }
+
+        // Scans chars following a '\' (not counting the '\'), and returns
+        // a RegexNode for the type of atom scanned.
+        internal RegexNode ScanBackslash() {
+            char ch;
+            RegexCharClass cc;
+
+            if (CharsRight() == 0)
+                throw MakeException("IllegalEnd Escape"); //SR.GetString(SR.IllegalEndEscape));
+
+            switch (ch = RightChar()) {
+                case 'b':
+                case 'B':
+                case 'A':
+                case 'G':
+                case 'Z':
+                case 'z':
+                    RightNext();
+                    return new RegexNode(TypeFromCode(ch), _options);
+
+                case 'w':
+                    RightNext();
+                    if (UseOptionE())
+                        return new RegexNode(RegexNode.Set, _options, RegexCharClass.ECMAWord, String.Empty);
+                    return new RegexNode(RegexNode.Set, _options, String.Empty, RegexCharClass.Word);
+
+                case 'W':
+                    RightNext();
+                    if (UseOptionE())
+                        return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotECMAWord, String.Empty);
+                    return new RegexNode(RegexNode.Set, _options, String.Empty, RegexCharClass.NotWord);
+
+                case 's':
+                    RightNext();
+                    if (UseOptionE())
+                        return new RegexNode(RegexNode.Set, _options, RegexCharClass.ECMASpace, String.Empty);
+                    return new RegexNode(RegexNode.Set, _options, String.Empty, RegexCharClass.Space);
+
+                case 'S':
+                    RightNext();
+                    if (UseOptionE())
+                        return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotECMASpace, String.Empty);
+                    return new RegexNode(RegexNode.Set, _options, String.Empty, RegexCharClass.NotSpace);
+
+                case 'd':
+                    RightNext();
+                    if (UseOptionE())
+                        return new RegexNode(RegexNode.Set, _options, RegexCharClass.ECMADigit, String.Empty);
+                    cc = RegexCharClass.CreateFromCategory("Nd", false, false, _pattern);
+                    return new RegexNode(RegexNode.Set, _options, String.Empty, cc.Category);
+
+                case 'D':
+                    RightNext();
+                    if (UseOptionE())
+                        return new RegexNode(RegexNode.Set, _options, RegexCharClass.NotECMADigit, String.Empty);
+                    cc = RegexCharClass.CreateFromCategory("Nd", true, false, _pattern);
+                    return new RegexNode(RegexNode.Set, _options, String.Empty, cc.Category);
+
+                case 'p':
+                case 'P':
+                    RightNext();
+                    cc = RegexCharClass.CreateFromCategory(ParseProperty(), (ch != 'p'), UseOptionI(), _pattern);
+                    return new RegexNode(RegexNode.Set, _options, cc.ToSetCi(UseOptionI(), _culture), cc.Category);
+
+                default:
+                    return ScanBasicBackslash();
+            }
+        }
+
+        // Scans \-style backreferences and character escapes
+        internal RegexNode ScanBasicBackslash() {
+            if (CharsRight() == 0)
+                throw MakeException("Illegal end escape"); //XXX: SR.GetString(SR.IllegalEndEscape));
+
+            char ch;
+            bool angled = false;
+            char close = '\0';
+            int backpos;
+
+            backpos = Textpos();
+            ch = RightChar();
+
+            // allow \k<foo> instead of <foo>, which is now deprecated
+
+            if (ch == 'k') {
+                if (CharsRight() >= 2) {
+                    RightNext();
+                    ch = RightCharNext();
+
+                    if (ch == '<' || ch == '\'') {
+                        angled = true;
+                        close = (ch == '\'') ? '\'' : '>';
+                    }
+                }
+
+                if (!angled)
+                    throw MakeException("Malformed name reference"); //XXX: SR.GetString(SR.MalformedNameRef));
+
+                ch = RightChar();
+            }
+
+            // Note angle without \g
+
+            else if ((ch == '<' || ch == '\'') && CharsRight() > 1) {
+                angled = true;
+                close = (ch == '\'') ? '\'' : '>';
+
+                RightNext();
+                ch = RightChar();
+            }
+
+            // Try to parse backreference: <1> or <cap>
+
+            if (angled && ch >= '0' && ch <= '9') {
+                int capnum = ScanDecimal();
+
+                if (CharsRight() > 0 && RightCharNext() == close) {
+                    if (IsCaptureSlot(capnum))
+                        return new RegexNode(RegexNode.Ref, _options, capnum);
+                    else
+                        throw MakeException("Undefined back reference"); //XXX: SR.GetString(SR.UndefinedBackref, capnum.ToString()));
+                }
+            }
+
+            // Try to parse backreference or octal: \1
+
+            else if (!angled && ch >= '1' && ch <= '9') {
+                if (UseOptionE()) {
+                    int capnum = -1;
+                    int newcapnum = (int)(ch - '0');
+                    int pos = Textpos() - 1;
+                    while (newcapnum <= _captop) {
+                        if (IsCaptureSlot(newcapnum) && (_caps == null || (int)_caps[newcapnum] < pos))
+                            capnum = newcapnum;
+                        RightNext();
+                        if (CharsRight() == 0 || (ch = RightChar()) < '0' || ch > '9')
+                            break;
+                        newcapnum = newcapnum * 10 + (int)(ch - '0');
+                    }
+                    if (capnum >= 0)
+                        return new RegexNode(RegexNode.Ref, _options, capnum);
+                } else
+                {
+
+                  int capnum = ScanDecimal();
+                  if (IsCaptureSlot(capnum))
+                      return new RegexNode(RegexNode.Ref, _options, capnum);
+                  else if (capnum <= 9)
+                      throw MakeException("Undefined back reference"); //XXX: SR.GetString(SR.UndefinedBackref, capnum.ToString()));
+                }
+            }
+
+            else if (angled && RegexCharClass.IsWordChar(ch)) {
+                String capname = ScanCapname();
+
+                if (CharsRight() > 0 && RightCharNext() == close) {
+                    if (IsCaptureName(capname))
+                        return new RegexNode(RegexNode.Ref, _options, CaptureSlotFromName(capname));
+                    else
+                        throw MakeException("Undefined name reference"); //XXX: SR.GetString(SR.UndefinedNameRef, capname));
+                }
+            }
+
+            // Not backreference: must be char code
+
+            Textto(backpos);
+            ch = ScanCharEscape();
+
+            if (UseOptionI())
+                ch = Char.ToLower(ch);//, _culture);
+
+            return new RegexNode(RegexNode.One, _options, ch);
+        }
+
+        // Scans $ patterns recognized within replacment patterns
+        internal RegexNode ScanDollar() {
+            if (CharsRight() == 0)
+                return new RegexNode(RegexNode.One, _options, '$');
+
+            char ch;
+            bool angled;
+            int backpos;
+
+            backpos = Textpos();
+            ch = RightChar();
+
+            // Note angle
+
+            if (ch == '{' && CharsRight() > 1) {
+                angled = true;
+                RightNext();
+                ch = RightChar();
+            }
+            else {
+                angled = false;
+            }
+
+            // Try to parse backreference: \1 or \{1} or \{cap}
+
+            if (ch >= '0' && ch <= '9') {
+                if (!angled && UseOptionE()) {
+                    int capnum = -1;
+                    int newcapnum = (int)(ch - '0');
+                    int pos = Textpos() - 1;
+                    while (newcapnum <= _capsize) {
+                        if (IsCaptureSlot(newcapnum))
+                            capnum = newcapnum;
+                        RightNext();
+                        if (CharsRight() == 0 || (ch = RightChar()) < '0' || ch > '9')
+                            break;
+                        newcapnum = newcapnum * 10 + (int)(ch - '0');
+                    }
+                    if (capnum >= 0)
+                        return new RegexNode(RegexNode.Ref, _options, capnum);
+                }
+                else
+                {
+                    int capnum = ScanDecimal();
+                    if (!angled || CharsRight() > 0 && RightCharNext() == '}') {
+                        if (IsCaptureSlot(capnum))
+                            return new RegexNode(RegexNode.Ref, _options, capnum);
+                    }
+                }
+            }
+            else if (angled && RegexCharClass.IsWordChar(ch)) {
+                String capname = ScanCapname();
+
+                if (CharsRight() > 0 && RightCharNext() == '}') {
+                    if (IsCaptureName(capname))
+                        return new RegexNode(RegexNode.Ref, _options, CaptureSlotFromName(capname));
+                }
+            }
+            else if (!angled) {
+                int capnum = 1;
+
+                switch (ch) {
+                    case '$':
+                        RightNext();
+                        return new RegexNode(RegexNode.One, _options, '$');
+
+                    case '&':
+                        capnum = 0;
+                        break;
+
+                    case '`':
+                        capnum = RegexReplacement.LeftPortion;
+                        break;
+
+                    case '\'':
+                        capnum = RegexReplacement.RightPortion;
+                        break;
+
+                    case '+':
+                        capnum = RegexReplacement.LastGroup;
+                        break;
+
+                    case '_':
+                        capnum = RegexReplacement.WholeString;
+                        break;
+                }
+
+                if (capnum != 1) {
+                    RightNext();
+                    return new RegexNode(RegexNode.Ref, _options, capnum);
+                }
+            }
+
+            // unrecognized $: literalize
+
+            Textto(backpos);
+            return new RegexNode(RegexNode.One, _options, '$');
+        }
+
+        // Scans a capture name: consumes word chars
+        internal String ScanCapname() {
+            int startpos = Textpos();
+
+            while (CharsRight() > 0) {
+                if (!RegexCharClass.IsWordChar(RightCharNext())) {
+                    LeftNext();
+                    break;
+                }
+            }
+
+            return _pattern.Substring(startpos, Textpos() - startpos);
+        }
+
+
+        // Scans up to three octal digits (stops before exceeding 0377).
+        internal char ScanOctal() {
+            int d;
+            int i;
+            int c;
+
+            // Consume octal chars only up to 3 digits and value 0377
+
+            c = 3;
+
+            if (c > CharsRight())
+                c = CharsRight();
+
+            for (i = 0; c > 0 && (uint)(d = RightChar() - '0') <= 7; c -= 1) {
+                RightNext();
+                i *= 8;
+                i += d;
+                if (UseOptionE() && i >= 0x20)
+                    break;
+            }
+
+            // Octal codes only code from 0-127
+            i &= 0x7F;
+
+            return(char)i;
+        }
+
+        // Scans any number of decimal digits (pegs value at 2^31-1 if too large)
+        internal int ScanDecimal() {
+            int i = 0;
+            int d;
+
+            while (CharsRight() > 0 && (uint)(d = (char)(RightChar() - '0')) <= 9) {
+                RightNext();
+
+                if (i > (infinite / 10) || i == (infinite / 10) && d > (infinite % 10))
+                    i = infinite;
+
+                i *= 10;
+                i += d;
+            }
+
+            return i;
+        }
+
+        // Scans exactly c hex digits (c=2 for \xFF, c=4 for \uFFFF)
+        internal char ScanHex(int c) {
+            int i;
+            int d;
+
+            i = 0;
+
+            if (CharsRight() >= c) {
+                for (; c > 0 && ((d = HexDigit(RightCharNext())) >= 0); c -= 1) {
+                    i *= 0x10;
+                    i += d;
+                }
+            }
+
+            if (c > 0)
+                throw MakeException("Too few hex"); //XXX: SR.GetString(SR.TooFewHex));
+
+            return(char)i;
+        }
+
+        // Returns n <= 0xF for a hex digit.
+        internal static int HexDigit(char ch) {
+            int d;
+
+            if ((uint)(d = ch - '0') <= 9)
+                return d;
+
+            if ((uint)(d = ch - 'a') <= 5)
+                return d + 0xa;
+
+            if ((uint)(d = ch - 'A') <= 5)
+                return d + 0xa;
+
+            return -1;
+        }
+
+        // Grabs and converts an ascii control character
+        internal char ScanControl() {
+            char ch;
+
+            if (CharsRight() <= 0)
+                throw MakeException("Missing control"); //XXX: SR.GetString(SR.MissingControl));
+
+            ch = RightCharNext();
+
+            // \ca interpreted as \cA
+
+            if (ch >= 'a' && ch <= 'z')
+                ch = (char)(ch - ('a' - 'A'));
+
+            if ((ch = (char)(ch - '@')) < ' ')
+                return ch;
+
+            throw MakeException("Unrecognized Control"); //XXX: SR.GetString(SR.UnrecognizedControl));
+        }
+
+        // Returns true for options allowed only at the top level
+        internal bool IsOnlyTopOption(RegexOptions option) {
+            return(option == RegexOptions.RightToLeft
+                || option == RegexOptions.Compiled
+                || option == RegexOptions.CultureInvariant
+                || option == RegexOptions.ECMAScript
+            );
+        }
+
+        // Scans cimsx-cimsx option string, stops at the first unrecognized char.
+        internal void ScanOptions() {
+            char ch;
+            bool off;
+            RegexOptions option;
+
+            for (off = false; CharsRight() > 0; RightNext()) {
+                ch = RightChar();
+
+                if (ch == '-') {
+                    off = true;
+                }
+                else if (ch == '+') {
+                    off = false;
+                }
+                else {
+                    option = OptionFromCode(ch);
+                    if (option == 0 || IsOnlyTopOption(option))
+                        return;
+
+                    if (off)
+                        _options &= ~option;
+                    else
+                        _options |= option;
+                }
+            }
+        }
+
+        // Scans \ code for escape codes that map to single unicode chars.
+        internal char ScanCharEscape() {
+            char ch;
+
+            ch = RightCharNext();
+
+            if (ch >= '0' && ch <= '7') {
+                LeftNext();
+                return ScanOctal();
+            }
+
+            switch (ch) {
+                case 'x':
+                    return ScanHex(2);
+                case 'u':
+                    return ScanHex(4);
+                case 'a':
+                    return '\u0007';
+                case 'b':
+                    return '\b';
+                case 'e':
+                    return '\u001B';
+                case 'f':
+                    return '\f';
+                case 'n':
+                    return '\n';
+                case 'r':
+                    return '\r';
+                case 't':
+                    return '\t';
+                case 'v':
+                    return '\u000B';
+                case 'c':
+                    return ScanControl();
+                default:
+                    if (
+                        !UseOptionE() &&
+                        RegexCharClass.IsWordChar(ch))
+                        throw MakeException("Unrecognized Escape"); //XXX: SR.GetString(SR.UnrecognizedEscape, ch.ToString()));
+                    return ch;
+            }
+        }
+
+        // Scans X for \p{X} or \P{X}
+        internal String ParseProperty() {
+            if (CharsRight() < 3) {
+                throw MakeException("Incomplete Slash P"); //XXX: SR.GetString(SR.IncompleteSlashP));
+            }
+            char ch = RightCharNext();
+            if (ch != '{') {
+                throw MakeException("Malformed Slash P"); //XXX: SR.GetString(SR.MalformedSlashP));
+            }
+            String capname = ScanCapname();
+
+            if (CharsRight() == 0 || RightCharNext() != '}')
+                throw MakeException("Incomplete Slash P"); //XXX: SR.GetString(SR.IncompleteSlashP));
+
+            return capname;
+        }
+
+        // Returns ReNode type for zero-length assertions with a \ code.
+        internal int TypeFromCode(char ch) {
+            switch (ch) {
+                case 'b':
+                    return
+                        UseOptionE() ? RegexNode.ECMABoundary :
+                        RegexNode.Boundary;
+                case 'B':
+                    return
+                        UseOptionE() ? RegexNode.NonECMABoundary :
+                        RegexNode.Nonboundary;
+                case 'A':
+                    return RegexNode.Beginning;
+                case 'G':
+                    return RegexNode.Start;
+                case 'Z':
+                    return RegexNode.EndZ;
+                case 'z':
+                    return RegexNode.End;
+                default:
+                    return RegexNode.Nothing;
+            }
+        }
+
+        // Returns option bit from single-char (?cimsx) code.
+        internal static RegexOptions OptionFromCode(char ch) {
+            // case-insensitive
+            if (ch >= 'A' && ch <= 'Z')
+                ch += (char)('a' - 'A');
+
+            switch (ch) {
+                case 'c':
+                    return RegexOptions.Compiled;
+                case 'i':
+                    return RegexOptions.IgnoreCase;
+                case 'r':
+                    return RegexOptions.RightToLeft;
+                case 'm':
+                    return RegexOptions.Multiline;
+                case 'n':
+                    return RegexOptions.ExplicitCapture;
+                case 's':
+                    return RegexOptions.Singleline;
+                case 'x':
+                    return RegexOptions.IgnorePatternWhitespace;
+#if DBG
+                case 'd':
+                    return RegexOptions.Debug;
+#endif
+                case 'e':
+                    return RegexOptions.ECMAScript;
+                default:
+                    return 0;
+            }
+        }
+
+        // a prescanner for deducing the slots used for
+        // captures by doing a partial tokenization of the pattern.
+        internal void CountCaptures() {
+            char ch;
+
+            NoteCaptureSlot(0, 0);
+
+            _autocap = 1;
+
+            while (CharsRight() > 0) {
+                int pos = Textpos();
+                ch = RightCharNext();
+                switch (ch) {
+                    case '\\':
+                        if (CharsRight() > 0)
+                            RightNext();
+                        break;
+
+                    case '#':
+                        if (UseOptionX()) {
+                            LeftNext();
+                            ScanBlank();
+                        }
+                        break;
+
+                    case '[':
+                        ScanCharClass(false, true);
+                        break;
+
+                    case ')':
+                        if (!EmptyOptionsStack())
+                            PopOptions();
+                        break;
+
+                    case '(':
+                        if (CharsRight() >= 2 && RightChar(1) == '#' && RightChar() == '?') {
+                            LeftNext();
+                            ScanBlank();
+                        }
+                        else {
+
+                            PushOptions();
+                            if (CharsRight() > 0 && RightChar() == '?') {
+                                // we have (?...
+                                RightNext();
+
+                                if (CharsRight() > 1 && (RightChar() == '<' || RightChar() == '\'')) {
+                                    // named group: (?<... or (?'...
+
+                                    RightNext();
+                                    ch = RightChar();
+
+                                    if (ch != '0' && RegexCharClass.IsWordChar(ch)) {
+                                        //if (_ignoreNextParen)
+                                        //    throw MakeException(SR.GetString(SR.AlternationCantCapture));
+                                        if (ch >= '1' && ch <= '9')
+                                            NoteCaptureSlot(ScanDecimal(), pos);
+                                        else
+                                            NoteCaptureName(ScanCapname(), pos);
+                                    }
+                                }
+                                else {
+                                    // (?...
+
+                                    // get the options if it's an option construct (?cimsx-cimsx...)
+                                    ScanOptions();
+
+                                    if (CharsRight() > 0) {
+                                        if (RightChar() == ')') {
+                                            // (?cimsx-cimsx)
+                                            RightNext();
+                                            PopKeepOptions();
+                                        }
+                                        else if (RightChar() == '(') {
+                                            // alternation construct: (?(foo)yes|no)
+                                            // ignore the next paren so we don't capture the condition
+                                            _ignoreNextParen = true;
+
+                                            // break from here so we don't reset _ignoreNextParen
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            else {
+                                if (!UseOptionN() && !_ignoreNextParen)
+                                    NoteCaptureSlot(_autocap++, pos);
+                            }
+                        }
+
+                        _ignoreNextParen = false;
+                        break;
+                }
+            }
+
+            AssignNameSlots();
+        }
+
+        // Notes a used capture slot
+        internal void NoteCaptureSlot(int i, int pos) {
+            if (!_caps.ContainsKey(i)) {
+                // the rhs of the hashtable isn't used in the parser
+
+                _caps.Add(i, pos);
+                _capcount++;
+
+                if (_captop <= i)
+                    _captop = i + 1;
+            }
+        }
+
+        // Notes a used capture slot
+        internal void NoteCaptureName(String name, int pos) {
+            if (_capnames == null) {
+                _capnames = new Hashtable();
+                _capnamelist = new ArrayList();
+            }
+
+            if (!_capnames.ContainsKey(name)) {
+                _capnames.Add(name, pos);
+                _capnamelist.Add(name);
+            }
+        }
+
+        // For when all the used captures are known: note them all at once
+        internal void NoteCaptures(Hashtable caps, int capsize, Hashtable capnames) {
+            _caps = caps;
+            _capsize = capsize;
+            _capnames = capnames;
+        }
+
+        // Assigns unused slot numbers to the capture names
+        internal void AssignNameSlots() {
+            if (_capnames != null) {
+                for (int i = 0; i < _capnamelist.Count; i++) {
+                    while (IsCaptureSlot(_autocap))
+                        _autocap++;
+                    string name = (string)_capnamelist[i];
+                    int pos = (int)_capnames[name];
+                    _capnames[name] = _autocap;
+                    NoteCaptureSlot(_autocap, pos);
+
+                    _autocap++;
+                }
+            }
+
+            // if the caps array has at least one gap, construct the list of used slots
+
+            if (_capcount < _captop) {
+                _capnumlist = new Object[_capcount];
+                int i = 0;
+
+                for (IDictionaryEnumerator de = _caps.GetEnumerator(); de.MoveNext(); )
+                    _capnumlist[i++] = de.Key;
+
+                //XXX:  System.Array.Sort(_capnumlist, InvariantComparer.Default);
+                System.Array.Sort(_capnumlist, System.Collections.Comparer.Default);
+
+            }
+
+            // merge capsnumlist into capnamelist
+
+            if (_capnames != null || _capnumlist != null) {
+                ArrayList oldcapnamelist;
+                int next;
+                int k = 0;
+
+                if (_capnames == null) {
+                    oldcapnamelist = null;
+                    _capnames = new Hashtable();
+                    _capnamelist = new ArrayList();
+                    next = -1;
+                }
+                else {
+                    oldcapnamelist = _capnamelist;
+                    _capnamelist = new ArrayList();
+                    next = (int)_capnames[oldcapnamelist[0]];
+                }
+
+                for (int i = 0; i < _capcount; i++) {
+                    int j = (_capnumlist == null) ? i : (int)_capnumlist[i];
+
+                    if (next == j) {
+                        _capnamelist.Add((String)oldcapnamelist[k++]);
+                        next = (k == oldcapnamelist.Count) ? -1 : (int)_capnames[oldcapnamelist[k]];
+                    }
+                    else {
+                        String str = j.ToString(); //Convert.ToString(j);
+                        _capnamelist.Add(str);
+                        _capnames[str] = j;
+                    }
+                }
+            }
+        }
+
+        // Looks up the slot number for a given name
+        internal int CaptureSlotFromName(String capname) {
+            return(int)_capnames[capname];
+        }
+
+        // True if the capture slot was noted
+        internal bool IsCaptureSlot(int i) {
+            if (_caps != null)
+                return _caps.ContainsKey(i);
+
+            return(i >= 0 && i < _capsize);
+        }
+
+        // Looks up the slot number for a given name
+        internal bool IsCaptureName(String capname) {
+            if (_capnames == null)
+                return false;
+
+            return _capnames.ContainsKey(capname);
+        }
+
+        // True if N option disabling '(' autocapture is on.
+        internal bool UseOptionN() {
+            return(_options & RegexOptions.ExplicitCapture) != 0;
+        }
+
+        // True if I option enabling case-insensitivity is on.
+        internal bool UseOptionI() {
+            return(_options & RegexOptions.IgnoreCase) != 0;
+        }
+
+        // True if M option altering meaning of $ and ^ is on.
+        internal bool UseOptionM() {
+            return(_options & RegexOptions.Multiline) != 0;
+        }
+
+        // True if S option altering meaning of . is on.
+        internal bool UseOptionS() {
+            return(_options & RegexOptions.Singleline) != 0;
+        }
+
+        // True if X option enabling whitespace/comment mode is on.
+        internal bool UseOptionX() {
+            return(_options & RegexOptions.IgnorePatternWhitespace) != 0;
+        }
+
+        // True if E option enabling ECMAScript behavior is on.
+        internal bool UseOptionE() {
+            return(_options & RegexOptions.ECMAScript) != 0;
+        }
+
+        internal const byte Q = 5;    // quantifier
+        internal const byte S = 4;    // ordinary stopper
+        internal const byte Z = 3;    // ScanBlank stopper
+        internal const byte X = 2;    // whitespace
+        internal const byte E = 1;    // should be escaped
+
+        // For categorizing ascii characters.
+        internal static readonly byte[] _category = new byte[] {
+            // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F
+               0,0,0,0,0,0,0,0,0,X,X,0,X,X,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            //   ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+               X,0,0,Z,S,0,0,0,S,S,Q,Q,0,0,S,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,Q,
+            // @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _
+               0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,S,S,0,S,0,
+            // ' a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~
+               0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,Q,S,0,0,0};
+
+        // Returns true for those characters that terminate a string of ordinary chars.
+        internal static bool IsSpecial(char ch) {
+            return(ch <= '|' && _category[ch] >= S);
+        }
+
+        // Returns true for those characters that terminate a string of ordinary chars.
+        internal static bool IsStopperX(char ch) {
+            return(ch <= '|' && _category[ch] >= X);
+        }
+
+        // Returns true for those characters that begin a quantifier.
+        internal static bool IsQuantifier(char ch) {
+            return(ch <= '{' && _category[ch] >= Q);
+        }
+
+        internal bool IsTrueQuantifier() {
+            int nChars = CharsRight();
+            if (nChars == 0)
+                return false;
+            int startpos = Textpos();
+            char ch = CharAt(startpos);
+            if (ch != '{')
+                return ch <= '{' && _category[ch] >= Q;
+            int pos = startpos;
+            while (--nChars > 0 && (ch = CharAt(++pos)) >= '0' && ch <= '9') ;
+            if (nChars == 0 || pos - startpos == 1)
+                return false;
+            if (ch == '}')
+                return true;
+            if (ch != ',')
+                return false;
+            while (--nChars > 0 && (ch = CharAt(++pos)) >= '0' && ch <= '9') ;
+            return nChars > 0 && ch == '}';
+        }
+
+        // Returns true for whitespace.
+        internal static bool IsSpace(char ch) {
+            return(ch <= ' ' && _category[ch] == X);
+        }
+
+        // Returns true for chars that should be escaped.
+        internal static bool IsMetachar(char ch) {
+            return(ch <= '|' && _category[ch] >= E);
+        }
+
+
+        // Add a string to the last concatenate.
+        internal void AddConcatenate(int pos, int cch, bool isReplacement) {
+            RegexNode node;
+
+            if (cch == 0)
+                return;
+
+            if (cch > 1) {
+                String str = _pattern.Substring(pos, cch);
+
+                if (UseOptionI() && !isReplacement)
+                    str = str.ToLower();//_culture);
+
+                node = new RegexNode(RegexNode.Multi, _options, str);
+            }
+            else {
+                char ch = _pattern[pos];
+
+                if (UseOptionI() && !isReplacement)
+                    ch = Char.ToLower(ch);//, _culture);
+
+                node = new RegexNode(RegexNode.One, _options, ch);
+            }
+
+            _concatenation.AddChild(node);
+        }
+
+        // Push the parser state (in response to an open paren)
+        internal void PushGroup() {
+            _group._next = _stack;
+            _alternation._next = _group;
+            _concatenation._next = _alternation;
+            _stack = _concatenation;
+        }
+
+        // Remember the pushed state (in response to a ')')
+        internal void PopGroup() {
+            _concatenation = _stack;
+            _alternation = _concatenation._next;
+            _group = _alternation._next;
+            _stack = _group._next;
+
+            // The first () inside a Testgroup group goes directly to the group
+            if (_group.Type() == RegexNode.Testgroup && _group.ChildCount() == 0) {
+                if (_unit == null)
+                    throw MakeException("Illegal Condition"); // XXX: SR.GetString(SR.IllegalCondition));
+
+                _group.AddChild(_unit);
+                _unit = null;
+            }
+        }
+
+        // True if the group stack is empty.
+        internal bool EmptyStack() {
+            return _stack == null;
+        }
+
+        // Start a new round for the parser state (in response to an open paren or string start)
+        internal void StartGroup(RegexNode openGroup) {
+            _group = openGroup;
+            _alternation = new RegexNode(RegexNode.Alternate, _options);
+            _concatenation = new RegexNode(RegexNode.Concatenate, _options);
+        }
+
+        // Finish the current concatenation (in response to a |)
+        internal void AddAlternate() {
+            // The | parts inside a Testgroup group go directly to the group
+
+            if (_group.Type() == RegexNode.Testgroup || _group.Type() == RegexNode.Testref) {
+                _group.AddChild(_concatenation.ReverseLeft());
+            }
+            else {
+                _alternation.AddChild(_concatenation.ReverseLeft());
+            }
+
+            _concatenation = new RegexNode(RegexNode.Concatenate, _options);
+        }
+
+        // Finish the current quantifiable (when a quantifier is not found or is not possible)
+        internal void AddConcatenate() {
+            // The first (| inside a Testgroup group goes directly to the group
+
+            _concatenation.AddChild(_unit);
+            _unit = null;
+        }
+
+        // Finish the current quantifiable (when a quantifier is found)
+        internal void AddConcatenate(bool lazy, int min, int max) {
+            _concatenation.AddChild(_unit.MakeQuantifier(lazy, min, max));
+            _unit = null;
+        }
+
+        // Returns the current unit
+        internal RegexNode Unit() {
+            return _unit;
+        }
+
+        // Sets the current unit to a single char node
+        internal void AddUnitOne(char ch) {
+            if (UseOptionI())
+                ch = Char.ToLower(ch);//, _culture);
+
+            _unit = new RegexNode(RegexNode.One, _options, ch);
+        }
+
+        // Sets the current unit to a single inverse-char node
+        internal void AddUnitNotone(char ch) {
+            if (UseOptionI())
+                ch = Char.ToLower(ch);//, _culture);
+
+            _unit = new RegexNode(RegexNode.Notone, _options, ch);
+        }
+
+        // Sets the current unit to a single set node
+        internal void AddUnitSet(RegexCharClass cc) {
+            _unit = new RegexNode(RegexNode.Set, _options, cc.ToSetCi(UseOptionI(), _culture), cc.Category);
+        }
+
+        // Sets the current unit to a subtree
+        internal void AddUnitNode(RegexNode node) {
+            _unit = node;
+        }
+
+        // Sets the current unit to an assertion of the specified type
+        internal void AddUnitType(int type) {
+            _unit = new RegexNode(type, _options);
+        }
+
+        // Finish the current group (in response to a ')' or end)
+        internal void AddGroup() {
+            if (_group.Type() == RegexNode.Testgroup || _group.Type() == RegexNode.Testref) {
+                _group.AddChild(_concatenation.ReverseLeft());
+
+                if (_group.Type() == RegexNode.Testref && _group.ChildCount() > 2 || _group.ChildCount() > 3)
+                    throw MakeException("Too many alternatives"); //SR.GetString(SR.TooManyAlternates));
+            }
+            else {
+                _alternation.AddChild(_concatenation.ReverseLeft());
+                _group.AddChild(_alternation);
+            }
+
+            /*
+                    */
+
+            _unit = _group;
+        }
+
+        // Saves options on a stack.
+        internal void PushOptions() {
+            _optionsStack.Add(_options);
+        }
+
+        // Recalls options from the stack.
+        internal void PopOptions() {
+            _options = (RegexOptions) _optionsStack[_optionsStack.Count - 1];
+            _optionsStack.RemoveAt(_optionsStack.Count - 1);
+        }
+
+        // True if options stack is empty.
+        internal bool EmptyOptionsStack() {
+            return(_optionsStack.Count == 0);
+        }
+
+        // Pops the option stack, but keeps the current options unchanged.
+        internal void PopKeepOptions() {
+            _optionsStack.RemoveAt(_optionsStack.Count - 1);
+        }
+
+        // Fills in an ArgumentException
+        internal ArgumentException MakeException(String message) {
+// XXX:            return new ArgumentException(SR.GetString(SR.MakeException, _pattern, message), _pattern);
+            return new ArgumentException(message, _pattern);
+        }
+
+        // Returns the current parsing position.
+        internal int Textpos() {
+            return _currentPos;
+        }
+
+        // Zaps to a specific parsing position.
+        internal void Textto(int pos) {
+            _currentPos = pos;
+        }
+
+        // Returns the char at the right of the current parsing position and advances to the right.
+        internal char RightCharNext() {
+            return _pattern[_currentPos++];
+        }
+
+        // Returns the char at the right of the current parsing position and advances to the right.
+        internal char RightNext() {
+            return _pattern[_currentPos++];
+        }
+
+        // Moves the current parsing position one to the left.
+        internal void LeftNext() {
+            --_currentPos;
+        }
+
+        // Returns the char left of the current parsing position.
+        internal char CharAt(int i) {
+            return _pattern[i];
+        }
+
+        // Returns the char right of the current parsing position.
+        internal char RightChar() {
+            return _pattern[_currentPos];
+        }
+
+        // Returns the char i chars right of the current parsing position.
+        internal char RightChar(int i) {
+            return _pattern[_currentPos + i];
+        }
+
+        // Number of characters to the right of the current parsing position.
+        internal int CharsRight() {
+            return _pattern.Length - _currentPos;
+        }
+
+        // Number of characters to the left of the current parsing position.
+        //internal int CharsLeft() {
+        //    return _currentPos;
+        //}
+
+        // Returns the char left of the current parsing position.
+        //internal char LeftChar() {
+        //    return _pattern[_currentPos - 1];
+        //}
+
+    }
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexreplacement.cs b/base/Kernel/System/Text/RegularExpressions/regexreplacement.cs
new file mode 100644
index 0000000..f4fe1f3
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexreplacement.cs
@@ -0,0 +1,383 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// The RegexReplacement class represents a substitution string for
+// use when using regexs to search/replace, etc. It's logically
+// a sequence intermixed (1) constant strings and (2) group numbers.
+//
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+
+    internal sealed class RegexReplacement {
+        // Since RegexReplacement shares the same parser as Regex,
+        // the constructor takes a RegexNode which is a concatenation
+        // of constant strings and backreferences.
+        internal RegexReplacement(String rep, RegexNode concat, Hashtable _caps) {
+            StringBuilder sb;
+            ArrayList strings;
+            ArrayList rules;
+            int slot;
+
+            _rep = rep;
+
+            if (concat.Type() != RegexNode.Concatenate)
+                throw new ArgumentException("Replacement Error");
+                //XXX: throw new ArgumentException(SR.GetString(SR.ReplacementError));
+
+            sb = new StringBuilder();
+            strings = new ArrayList();
+            rules = new ArrayList();
+
+            for (int i = 0; i < concat.ChildCount(); i++) {
+                RegexNode child = concat.Child(i);
+
+                switch (child.Type()) {
+                    case RegexNode.Multi:
+                        sb.Append(child._str);
+                        break;
+                    case RegexNode.One:
+                        sb.Append(child._ch);
+                        break;
+                    case RegexNode.Ref:
+                        if (sb.Length > 0) {
+                            rules.Add(strings.Count);
+                            strings.Add(sb.ToString());
+                            sb.Length = 0;
+                        }
+                        slot = child._m;
+
+                        if (_caps != null && slot >= 0)
+                            slot = (int)_caps[slot];
+
+                        rules.Add(-Specials - 1 - slot);
+                        break;
+                    default:
+                        throw new ArgumentException("Replacement Error");//XXX: SR.GetString(SR.ReplacementError));
+                }
+            }
+
+            if (sb.Length > 0) {
+                rules.Add(strings.Count);
+                strings.Add(sb.ToString());
+            }
+
+            _strings = strings;
+            _rules = rules;
+        }
+
+        internal String _rep;
+        internal ArrayList  _strings;          // table of string constants
+        internal ArrayList  _rules;            // negative -> group #, positive -> string #
+
+        // constants for special insertion patterns
+
+        internal const int Specials       = 4;
+        internal const int LeftPortion    = -1;
+        internal const int RightPortion   = -2;
+        internal const int LastGroup      = -3;
+        internal const int WholeString    = -4;
+
+
+        // Given a Match, emits into the StringBuilder the evaluated
+        // substitution pattern.
+        private void ReplacementImpl(StringBuilder sb, Match match) {
+            for (int i = 0; i < _rules.Count; i++) {
+                int r = (int) _rules[i];
+                if (r >= 0)
+                    sb.Append((string) _strings[r]);
+                else if (r < -Specials)
+                    sb.Append(match.GroupToStringImpl(-Specials - 1 - r));
+                else {
+                    switch (-Specials - 1 - r) {
+                        case LeftPortion:
+                            sb.Append(match.GetLeftSubstring());
+                            break;
+                        case RightPortion:
+                            sb.Append(match.GetRightSubstring());
+                            break;
+                        case LastGroup:
+                            sb.Append(match.LastGroupToStringImpl());
+                            break;
+                        case WholeString:
+                            sb.Append(match.GetOriginalString());
+                            break;
+                    }
+                }
+            }
+        }
+
+        // The original pattern string
+        internal String Pattern {
+            get {
+                return _rep;
+            }
+        }
+
+        // Returns the replacement result for a single match
+        internal String Replacement(Match match) {
+            StringBuilder sb = new StringBuilder();
+
+            ReplacementImpl(sb, match);
+
+            return sb.ToString();
+        }
+
+        // Three very similar algorithms appear below: replace (pattern),
+        // replace (evaluator), and split.
+
+
+        // Replaces all occurrences of the regex in the string with the
+        // replacement pattern.
+        //
+        // Note that the special case of no matches is handled on its own:
+        // with no matches, the input string is returned unchanged.
+        // The right-to-left case is split out because StringBuilder
+        // doesn't handle right-to-left string building directly very well.
+        internal String Replace(Regex regex, String input, int count, int startat) {
+            Match match;
+
+            if (count < -1)
+                throw new ArgumentOutOfRangeException("count", "Count too Small");//XXX: SR.GetString(SR.CountTooSmall));
+            if (startat < 0 || startat > input.Length)
+                throw new ArgumentOutOfRangeException("startat", "Begin Index Not Negative");//SR.GetString(SR.BeginIndexNotNegative));
+
+            if (count == 0)
+                return input;
+
+            match = regex.Match(input, startat);
+            if (!match.Success) {
+                return input;
+            }
+            else {
+                StringBuilder sb;
+
+                if (!regex.RightToLeft) {
+                    sb = new StringBuilder();
+                    int prevat = 0;
+
+                    do {
+                        if (match.Index != prevat)
+                            sb.Append(input, prevat, match.Index - prevat);
+
+                        prevat = match.Index + match.Length;
+                        ReplacementImpl(sb, match);
+                        if (--count == 0)
+                            break;
+
+                        match = match.NextMatch();
+                    } while (match.Success);
+
+                    if (prevat < input.Length)
+                        sb.Append(input, prevat, input.Length - prevat);
+                }
+                else {
+                    ArrayList al = new ArrayList();
+                    int prevat = input.Length;
+
+                    do {
+                        if (match.Index + match.Length != prevat)
+                            al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length));
+
+                        prevat = match.Index;
+
+                        for (int i = _rules.Count - 1; i >= 0; i--) {
+                            int r = (int) _rules[i];
+                            if (r >= 0)
+                                al.Add((string) _strings[r]);
+                            else
+                                al.Add(match.GroupToStringImpl(-Specials - 1 - r));
+                        }
+
+                        if (--count == 0)
+                            break;
+
+                        match = match.NextMatch();
+                    } while (match.Success);
+
+                    sb = new StringBuilder();
+
+                    if (prevat > 0)
+                        sb.Append(input, 0, prevat);
+
+                    for (int i = al.Count - 1; i >= 0; i--) {
+                        sb.Append((String)al[i]);
+                    }
+                }
+
+                return sb.ToString();
+            }
+        }
+
+        // Replaces all occurrences of the regex in the string with the
+        // replacement evaluator.
+        //
+        // Note that the special case of no matches is handled on its own:
+        // with no matches, the input string is returned unchanged.
+        // The right-to-left case is split out because StringBuilder
+        // doesn't handle right-to-left string building directly very well.
+        internal static String Replace(MatchEvaluator evaluator, Regex regex,
+                                       String input, int count, int startat) {
+            Match match;
+
+            if (evaluator == null)
+                throw new ArgumentNullException("evaluator");
+            if (count < -1)
+                throw new ArgumentOutOfRangeException("count", ""); //XXX: SR.GetString(SR.CountTooSmall));
+            if (startat < 0 || startat > input.Length)
+                throw new ArgumentOutOfRangeException("startat", ""); //XXX: SR.GetString(SR.BeginIndexNotNegative));
+
+            if (count == 0)
+                return input;
+
+            match = regex.Match(input, startat);
+
+            if (!match.Success) {
+                return input;
+            }
+            else {
+                StringBuilder sb;
+
+                if (!regex.RightToLeft) {
+                    sb = new StringBuilder();
+                    int prevat = 0;
+
+                    do {
+                        if (match.Index != prevat)
+                            sb.Append(input, prevat, match.Index - prevat);
+
+                        prevat = match.Index + match.Length;
+
+                        sb.Append(evaluator(match));
+
+                        if (--count == 0)
+                            break;
+
+                        match = match.NextMatch();
+                    } while (match.Success);
+
+                    if (prevat < input.Length)
+                        sb.Append(input, prevat, input.Length - prevat);
+                }
+                else {
+                    ArrayList al = new ArrayList();
+                    int prevat = input.Length;
+
+                    do {
+                        if (match.Index + match.Length != prevat)
+                            al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length));
+
+                        prevat = match.Index;
+
+                        al.Add(evaluator(match));
+
+                        if (--count == 0)
+                            break;
+
+                        match = match.NextMatch();
+                    } while (match.Success);
+
+                    sb = new StringBuilder();
+
+                    if (prevat > 0)
+                        sb.Append(input, 0, prevat);
+
+                    for (int i = al.Count - 1; i >= 0; i--) {
+                        sb.Append((String)al[i]);
+                    }
+                }
+
+                return sb.ToString();
+            }
+        }
+
+        // Does a split. In the right-to-left case we reorder the
+        // array to be forwards.
+        internal static String[] Split(Regex regex, String input, int count, int startat) {
+            Match match;
+            String[] result;
+
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", ""); // XXX: SR.GetString(SR.CountTooSmall));
+
+            if (startat < 0 || startat > input.Length)
+                throw new ArgumentOutOfRangeException("startat", ""); // XXX: SR.GetString(SR.BeginIndexNotNegative));
+
+            if (count == 1) {
+                result = new String[1];
+                result[0] = input;
+                return result;
+            }
+
+            count -= 1;
+
+            match = regex.Match(input, startat);
+
+            if (!match.Success) {
+                result = new String[1];
+                result[0] = input;
+                return result;
+            }
+            else {
+                ArrayList al = new ArrayList();
+
+                if (!regex.RightToLeft) {
+                    int prevat = 0;
+
+                    for (;;) {
+                        al.Add(input.Substring(prevat, match.Index - prevat));
+
+                        prevat = match.Index + match.Length;
+
+                        // add all matched capture groups to the list.
+                        int i = 1;
+                        while (match.IsMatched(i)) {
+                            al.Add(match.Groups[i].ToString());
+                            i++;
+                        }
+
+                        if (--count == 0)
+                            break;
+
+                        match = match.NextMatch();
+
+                        if (!match.Success)
+                            break;
+                    }
+
+                    al.Add(input.Substring(prevat, input.Length - prevat));
+                }
+                else {
+                    int prevat = input.Length;
+
+                    for (;;) {
+                        al.Add(input.Substring(match.Index + match.Length, prevat - match.Index - match.Length));
+
+                        prevat = match.Index;
+
+                        if (--count == 0)
+                            break;
+
+                        match = match.NextMatch();
+
+                        if (!match.Success)
+                            break;
+                    }
+
+                    al.Add(input.Substring(0, prevat));
+
+                    al.Reverse(0, al.Count);
+                }
+
+                return(String[])al.ToArray(typeof(String));
+            }
+        }
+    }
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexrunner.cs b/base/Kernel/System/Text/RegularExpressions/regexrunner.cs
new file mode 100644
index 0000000..32dd6bb
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexrunner.cs
@@ -0,0 +1,480 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexRunner class is a base class for compiled regex code.
+//
+
+// Implementation notes:
+//
+// RegexRunner provides a common calling convention and a common
+// runtime environment for the interpreter and the compiled code.
+//
+// It provides the driver code that call's the subclass's Go()
+// method for either scanning or direct execution.
+//
+// It also maintains memory allocation for the backtracking stack,
+// the grouping stack and the longjump crawlstack, and provides
+// methods to push new subpattern match results into (or remove
+// backtracked results from) the Match instance.
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    using System.Diagnostics;
+    //using System.ComponentModel;
+
+    //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner"]/*' />
+    /// <internalonly/>
+    abstract public class RegexRunner {
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtextbeg"]/*' />
+        protected internal int runtextbeg;         // beginning of text to search
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtextend"]/*' />
+        protected internal int runtextend;         // end of text to search
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtextstart"]/*' />
+        protected internal int runtextstart;       // starting point for search
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtext"]/*' />
+        protected internal String runtext;         // text to search
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtextpos"]/*' />
+        protected internal int runtextpos;         // current position in text
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtrack"]/*' />
+        protected internal int [] runtrack;        // backtracking stack
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtrackpos"]/*' />
+        protected internal int runtrackpos;        // current position in backtracking stack
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runstack"]/*' />
+        protected internal int [] runstack;        // ordinary stack
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runstackpos"]/*' />
+        protected internal int runstackpos;        // current position in ordinary stack
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runcrawl"]/*' />
+        protected internal int [] runcrawl;        // longjump crawl stack
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runcrawlpos"]/*' />
+        protected internal int runcrawlpos;        // current position in crawl stack
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runtrackcount"]/*' />
+        protected internal int runtrackcount;      // count of states that may do backtracking
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runmatch"]/*' />
+        protected internal Match runmatch;         // result object
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.runregex"]/*' />
+        protected internal Regex runregex;         // regex object
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.RegexRunner"]/*' />
+        protected internal RegexRunner() {}
+
+        // Scans the string to find the first match. Uses the Match object
+        // both to feed text in and as a place to store matches that come out.
+        //
+        // All the action is in the abstract Go() method defined by subclasses. Our
+        // responsibility is to load up the class members (as done here) before
+        // calling Go.
+        //
+        //
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Scan"]/*' />
+        protected internal Match Scan(Regex regex, String text, int textbeg, int textend, int textstart, int prevlen, bool quick) {
+            int bump;
+            int stoppos;
+            bool initted = false;
+
+            runregex      = regex;
+            runtext       = text;
+            runtextbeg    = textbeg;
+            runtextend    = textend;
+            runtextstart  = textstart;
+
+            bump    = runregex.RightToLeft ? -1 : 1;
+            stoppos = runregex.RightToLeft ? runtextbeg : runtextend;
+
+            runtextpos    = textstart;
+
+            // If previous match was empty or failed, advance by one before matching
+
+            if (prevlen == 0) {
+                if (runtextpos == stoppos)
+                    return Match.Empty;
+
+                runtextpos += bump;
+            }
+
+            for (;;) {
+#if DBG
+                if (runregex.Debug) {
+                    Debug.WriteLine("");
+                    Debug.WriteLine("Search range: from " + runtextbeg.ToString() + " to " + runtextend.ToString());
+                    Debug.WriteLine("Firstchar search starting at " + runtextpos.ToString() + " stopping at " + stoppos.ToString());
+                }
+#endif
+                if (FindFirstChar()) {
+                    if (!initted) {
+                        InitMatch();
+                        initted = true;
+                    }
+#if DBG
+                    if (runregex.Debug) {
+                        Debug.WriteLine("Executing engine starting at " + runtextpos.ToString());
+                        Debug.WriteLine("");
+                    }
+#endif
+                    Go();
+
+                    if (runmatch._matchcount[0] > 0) {
+                        return TidyMatch(quick);
+                    }
+
+                    // reset state for another go
+                    runtrackpos = runtrack.Length;
+                    runstackpos = runstack.Length;
+                    runcrawlpos = runcrawl.Length;
+                }
+
+                // failure!
+
+                if (runtextpos == stoppos) {
+                    TidyMatch(true);
+                    return Match.Empty;
+                }
+
+
+                // Bump by one and start again
+
+                runtextpos += bump;
+            }
+
+        }
+
+        // The responsibility of Go() is to run the regular expression at
+        // runtextpos and call Capture() on all the captured subexpressions,
+        // then to leave runtextpos at the ending position. It should leave
+        // runtextpos where it started if there was no match.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Go"]/*' />
+        protected abstract void Go();
+
+        // The responsibility of FindFirstChar() is to advance runtextpos
+        // until it is at the next position which is a candidate for the
+        // beginning of a successful match.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.FindFirstChar"]/*' />
+        protected abstract bool FindFirstChar();
+
+        // InitTrackCount must initialize the runtrackcount field; this is
+        // used to know how large the initial runtrack and runstack arrays
+        // must be.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.InitTrackCount"]/*' />
+        protected abstract void InitTrackCount();
+
+        // Initializes all the data members that are used by Go()
+        private void InitMatch() {
+            // Use a hashtable'ed Match object if the capture numbers are sparse
+
+            if (runmatch == null) {
+                if (runregex.caps != null)
+                    runmatch = new MatchSparse(runregex, runregex.caps, runregex.capsize, runtext, runtextbeg, runtextend - runtextbeg, runtextstart);
+                else
+                    runmatch = new Match(runregex, runregex.capsize, runtext, runtextbeg, runtextend - runtextbeg, runtextstart);
+            }
+            else {
+                runmatch.Reset(runregex, runtext, runtextbeg, runtextend, runtextstart);
+            }
+
+            // note we test runcrawl, because it is the last one to be allocated
+            // If there is an alloc failure in the middle of the three allocations,
+            // we may still return to reuse this instance, and we want to behave
+            // as if the allocations didn't occur. (we used to test _trackcount != 0)
+
+            if (runcrawl != null) {
+                runtrackpos = runtrack.Length;
+                runstackpos = runstack.Length;
+                runcrawlpos = runcrawl.Length;
+                return;
+            }
+
+            InitTrackCount();
+
+            int tracksize = runtrackcount * 8;
+            int stacksize = runtrackcount * 8;
+
+            if (tracksize < 32)
+                tracksize = 32;
+            if (stacksize < 16)
+                stacksize = 16;
+
+            runtrack = new int[tracksize];
+            runtrackpos = tracksize;
+
+            runstack = new int[stacksize];
+            runstackpos = stacksize;
+
+            runcrawl = new int[32];
+            runcrawlpos = 32;
+        }
+
+        // Put match in its canonical form before returning it.
+        private Match TidyMatch(bool quick) {
+            if (!quick) {
+                Match match = runmatch;
+
+                runmatch = null;
+
+                match.Tidy(runtextpos);
+                return match;
+            }
+            else {
+                // in quick mode, a successful match returns null, and
+                // the allocated match object is left in the cache
+
+                return null;
+            }
+        }
+
+        // Called by the implementation of Go() to increase the size of storage
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.EnsureStorage"]/*' />
+        protected void EnsureStorage() {
+            if (runstackpos < runtrackcount * 4)
+                DoubleStack();
+            if (runtrackpos < runtrackcount * 4)
+                DoubleTrack();
+        }
+
+        // Called by the implementation of Go() to decide whether the pos
+        // at the specified index is a boundary or not. It's just not worth
+        // emitting inline code for this logic.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.IsBoundary"]/*' />
+        protected bool IsBoundary(int index, int startpos, int endpos) {
+            return (index > startpos && RegexCharClass.IsWordChar(runtext[index - 1])) !=
+                   (index < endpos && RegexCharClass.IsWordChar(runtext[index]));
+        }
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.IsECMABoundary"]/*' />
+        protected bool IsECMABoundary(int index, int startpos, int endpos) {
+            return (index > startpos && RegexCharClass.IsECMAWordChar(runtext[index - 1])) !=
+                   (index < endpos && RegexCharClass.IsECMAWordChar(runtext[index]));
+        }
+
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.CharInSet"]/*' />
+        protected static bool CharInSet(char ch, String set, String category) {
+            return RegexCharClass.CharInSet(ch, set, category);
+        }
+
+        // Called by the implementation of Go() to increase the size of the
+        // backtracking stack.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.DoubleTrack"]/*' />
+        protected void DoubleTrack() {
+            int[] newtrack;
+
+            newtrack = new int[runtrack.Length * 2];
+
+            System.Array.Copy(runtrack, 0, newtrack, runtrack.Length, runtrack.Length);
+            runtrackpos += runtrack.Length;
+            runtrack = newtrack;
+        }
+
+        // Called by the implementation of Go() to increase the size of the
+        // grouping stack.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.DoubleStack"]/*' />
+        protected void DoubleStack() {
+            int[] newstack;
+
+            newstack = new int[runstack.Length * 2];
+
+            System.Array.Copy(runstack, 0, newstack, runstack.Length, runstack.Length);
+            runstackpos += runstack.Length;
+            runstack = newstack;
+        }
+
+        // Increases the size of the longjump unrolling stack.
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.DoubleCrawl"]/*' />
+        protected void DoubleCrawl() {
+            int[] newcrawl;
+
+            newcrawl = new int[runcrawl.Length * 2];
+
+            System.Array.Copy(runcrawl, 0, newcrawl, runcrawl.Length, runcrawl.Length);
+            runcrawlpos += runcrawl.Length;
+            runcrawl = newcrawl;
+        }
+
+        // Save a number on the longjump unrolling stack
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Crawl"]/*' />
+        protected void Crawl(int i) {
+            if (runcrawlpos == 0)
+                DoubleCrawl();
+
+            runcrawl[--runcrawlpos] = i;
+        }
+
+        // Remove a number from the longjump unrolling stack
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Popcrawl"]/*' />
+        protected int Popcrawl() {
+            return runcrawl[runcrawlpos++];
+        }
+
+        // Get the height of the stack
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Crawlpos"]/*' />
+        protected int Crawlpos() {
+            return runcrawl.Length - runcrawlpos;
+        }
+
+        // Called by Go() to capture a subexpression. Note that the
+        // capnum used here has already been mapped to a non-sparse
+        // index (by the code generator RegexWriter).
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Capture"]/*' />
+        protected void Capture(int capnum, int start, int end) {
+            if (end < start) {
+                int T;
+
+                T = end;
+                end = start;
+                start = T;
+            }
+
+            Crawl(capnum);
+            runmatch.AddMatch(capnum, start, end - start);
+        }
+
+        // Called by Go() to capture a subexpression. Note that the
+        // capnum used here has already been mapped to a non-sparse
+        // index (by the code generator RegexWriter).
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.TransferCapture"]/*' />
+        protected void TransferCapture(int capnum, int uncapnum, int start, int end) {
+            int start2;
+            int end2;
+
+            // these are the two intervals that are cancelling each other
+
+            if (end < start) {
+                int T;
+
+                T = end;
+                end = start;
+                start = T;
+            }
+
+            start2 = MatchIndex(uncapnum);
+            end2 = start2 + MatchLength(uncapnum);
+
+            // The new capture gets the innermost defined interval
+
+            if (start >= end2) {
+                end = start;
+                start = end2;
+            }
+            else if (end <= start2) {
+                start = start2;
+            }
+            else {
+                if (end > end2)
+                    end = end2;
+                if (start2 > start)
+                    start = start2;
+            }
+
+            Crawl(uncapnum);
+            runmatch.BalanceMatch(uncapnum);
+
+            if (capnum != -1) {
+                Crawl(capnum);
+                runmatch.AddMatch(capnum, start, end - start);
+            }
+        }
+
+        // Called by Go() to revert the last capture
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.Uncapture"]/*' />
+        protected void Uncapture() {
+            int capnum = Popcrawl();
+            runmatch.RemoveMatch(capnum);
+        }
+
+        // Call out to runmatch to get around visibility issues
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.IsMatched"]/*' />
+        protected bool IsMatched(int cap) {
+            return runmatch.IsMatched(cap);
+        }
+
+        // Call out to runmatch to get around visibility issues
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.MatchIndex"]/*' />
+        protected int MatchIndex(int cap) {
+            return runmatch.MatchIndex(cap);
+        }
+
+        // Call out to runmatch to get around visibility issues
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.MatchLength"]/*' />
+        protected int MatchLength(int cap) {
+            return runmatch.MatchLength(cap);
+        }
+
+#if DBG
+        // Dump the current state
+        //| <include file='doc\RegexRunner.uex' path='docs/doc[@for="RegexRunner.DumpState"]/*' />
+        public virtual void DumpState() {
+            Debug.WriteLine("Text:  " + TextposDescription());
+            Debug.WriteLine("Track: " + StackDescription(runtrack, runtrackpos));
+            Debug.WriteLine("Stack: " + StackDescription(runstack, runstackpos));
+        }
+
+        internal static String StackDescription(int[] A, int Index) {
+            StringBuilder Sb = new StringBuilder();
+
+            Sb.Append(A.Length - Index);
+            Sb.Append('/');
+            Sb.Append(A.Length);
+
+            if (Sb.Length < 8)
+                Sb.Append(' ',8 - Sb.Length);
+
+            Sb.Append("(");
+
+            for (int i = Index; i < A.Length; i++) {
+                if (i > Index)
+                    Sb.Append(' ');
+                Sb.Append(A[i]);
+            }
+
+            Sb.Append(')');
+
+            return Sb.ToString();
+        }
+
+        internal virtual String TextposDescription() {
+            StringBuilder Sb = new StringBuilder();
+            int remaining;
+
+            Sb.Append(runtextpos);
+
+            if (Sb.Length < 8)
+                Sb.Append(' ',8 - Sb.Length);
+
+            if (runtextpos > runtextbeg)
+                Sb.Append(RegexCharClass.CharDescription(runtext[runtextpos - 1]));
+            else
+                Sb.Append('^');
+
+            Sb.Append('>');
+
+            remaining = runtextend - runtextpos;
+
+            for (int i = runtextpos; i < runtextend; i++) {
+                Sb.Append(RegexCharClass.CharDescription(runtext[i]));
+            }
+            if (Sb.Length >= 64) {
+                Sb.Length = 61;
+                Sb.Append("...");
+            }
+            else {
+                Sb.Append('$');
+            }
+
+            return Sb.ToString();
+        }
+#endif
+    }
+
+
+
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regextree.cs b/base/Kernel/System/Text/RegularExpressions/regextree.cs
new file mode 100644
index 0000000..ab30793
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regextree.cs
@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// RegexTree is just a wrapper for a node tree with some
+// global information attached.
+//
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+
+    internal sealed class RegexTree {
+        internal RegexTree(RegexNode root, Hashtable caps, Object[] capnumlist, int captop, Hashtable capnames, String[] capslist, RegexOptions opts) {
+            _root = root;
+            _caps = caps;
+            _capnumlist = capnumlist;
+            _capnames = capnames;
+            _capslist = capslist;
+            _captop = captop;
+            _options = opts;
+        }
+
+        internal RegexNode _root;
+        internal Hashtable _caps;
+        internal Object[]  _capnumlist;
+        internal Hashtable _capnames;
+        internal String[]  _capslist;
+        internal RegexOptions _options;
+        internal int       _captop;
+
+#if DBG
+        internal void Dump() {
+            _root.Dump();
+        }
+
+        internal bool Debug {
+            get {
+                return(_options & RegexOptions.Debug) != 0;
+            }
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/Text/RegularExpressions/regexwriter.cs b/base/Kernel/System/Text/RegularExpressions/regexwriter.cs
new file mode 100644
index 0000000..193eaca
--- /dev/null
+++ b/base/Kernel/System/Text/RegularExpressions/regexwriter.cs
@@ -0,0 +1,539 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// </copyright>
+//------------------------------------------------------------------------------
+
+// This RegexWriter class is internal to the Regex package.
+// It builds a block of regular expression codes (RegexCode)
+// from a RegexTree parse tree.
+//
+
+// Implementation notes:
+//
+// This step is as simple as walking the tree and emitting
+// sequences of codes.
+//
+#define ECMA
+
+namespace System.Text.RegularExpressions {
+
+    using System.Collections;
+    //using System.Collections.Specialized;
+    using System.Globalization;
+
+    internal sealed class RegexWriter {
+        internal int[]       _intStack;
+        internal int         _depth;
+        internal int[]       _emitted;
+        internal int         _curpos;
+        internal IDictionary   _stringhash;
+        internal ArrayList   _stringtable;
+        // not used! internal int         _stringcount;
+        internal bool     _counting;
+        internal int         _count;
+        internal int         _trackcount;
+        internal Hashtable   _caps;
+
+        internal const int BeforeChild = 64;
+        internal const int AfterChild = 128;
+        internal const int infinite = RegexCode.infinite;
+
+        // This is the only function that should be called from outside.
+        // It takes a RegexTree and creates a corresponding RegexCode.
+        internal static RegexCode Write(RegexTree t) {
+            RegexWriter w = new RegexWriter();
+            RegexCode retval = w.RegexCodeFromRegexTree(t);
+#if DBG
+            if (t.Debug) {
+                retval.Dump();
+            }
+#endif
+            return retval;
+        }
+
+        // private constructor; can't be created outside
+        private RegexWriter() {
+            _intStack = new int[32];
+            _emitted = new int[32];
+            _stringhash = new Hashtable(); //HybridDictionary();
+            _stringtable = new ArrayList();
+        }
+
+        // To avoid recursion, we use a simple integer stack.
+        // This is the push.
+        internal void PushInt(int I) {
+            if (_depth >= _intStack.Length) {
+                int [] expanded = new int[_depth * 2];
+
+                System.Array.Copy(_intStack, 0, expanded, 0, _depth);
+
+                _intStack = expanded;
+            }
+
+            _intStack[_depth++] = I;
+        }
+
+        // True if the stack is empty.
+        internal bool EmptyStack() {
+            return _depth == 0;
+        }
+
+        // This is the pop.
+        internal int PopInt() {
+            return _intStack[--_depth];
+        }
+
+        // Returns the current position in the emitted code.
+        internal int CurPos() {
+            return _curpos;
+        }
+
+        // Fixes up a jump instruction at the specified offset
+        // so that it jumps to the specified jumpDest.
+        internal void PatchJump(int Offset, int jumpDest) {
+            _emitted[Offset + 1] = jumpDest;
+        }
+
+        // Emits a zero-argument operation. Note that the emit
+        // functions all run in two modes: they can emit code, or
+        // they can just count the size of the code.
+        internal void Emit(int op) {
+            if (_counting) {
+                _count += 1;
+                if (RegexCode.OpcodeBacktracks(op))
+                    _trackcount += 1;
+                return;
+            }
+            _emitted[_curpos++] = op;
+        }
+
+        // Emits a one-argument operation.
+        internal void Emit(int op, int opd1) {
+            if (_counting) {
+                _count += 2;
+                if (RegexCode.OpcodeBacktracks(op))
+                    _trackcount += 1;
+                return;
+            }
+            _emitted[_curpos++] = op;
+            _emitted[_curpos++] = opd1;
+        }
+
+        // Emits a two-argument operation.
+        internal void Emit(int op, int opd1, int opd2) {
+            if (_counting) {
+                _count += 3;
+                if (RegexCode.OpcodeBacktracks(op))
+                    _trackcount += 1;
+                return;
+            }
+            _emitted[_curpos++] = op;
+            _emitted[_curpos++] = opd1;
+            _emitted[_curpos++] = opd2;
+        }
+
+        // Emits a three-argument operation.
+        internal void Emit(int op, int opd1, int opd2, int opd3) {
+            if (_counting) {
+                _count += 4;
+                if (RegexCode.OpcodeBacktracks(op))
+                    _trackcount += 1;
+                return;
+            }
+            _emitted[_curpos++] = op;
+            _emitted[_curpos++] = opd1;
+            _emitted[_curpos++] = opd2;
+            _emitted[_curpos++] = opd3;
+        }
+
+        // Returns an index in the string table for a string;
+        // uses a hashtable to eliminate duplicates.
+        internal int StringCode(String str) {
+            Int32 i;
+
+            if (_counting)
+                return 0;
+
+            if (str == null)
+                str = String.Empty;
+
+            if (_stringhash.Contains(str)) {
+                i = (Int32)_stringhash[str];
+            }
+            else {
+                i = _stringtable.Count;
+                _stringhash[str] = i;
+                _stringtable.Add(str);
+            }
+
+            return i;
+        }
+
+        // Just returns an exception; should be dead code
+        internal ArgumentException MakeException(String message) {
+            return new ArgumentException(message);
+        }
+
+
+        // When generating code on a regex that uses a sparse set
+        // of capture slots, we hash them to a dense set of indices
+        // for an array of capture slots. Instead of doing the hash
+        // at match time, it's done at compile time, here.
+        internal int MapCapnum(int capnum) {
+            if (capnum == -1)
+                return -1;
+
+            if (_caps != null)
+                return(Int32)_caps[capnum];
+            else
+                return capnum;
+        }
+
+        // The top level RegexCode generator. It does a depth-first walk
+        // through the tree and calls EmitFragment to emits code before
+        // and after each child of an interior node, and at each leaf.
+        //
+        // It runs two passes, first to count the size of the generated
+        // code, and second to generate the code.
+        //
+        internal RegexCode RegexCodeFromRegexTree(RegexTree tree) {
+            RegexNode curNode;
+            int curChild;
+            int capsize;
+            RegexPrefix fcPrefix;
+            RegexPrefix scPrefix;
+            RegexPrefix prefix;
+            int anchors;
+            RegexBoyerMoore bmPrefix;
+            bool rtl;
+
+            // construct sparse capnum mapping if some numbers are unused
+
+            if (tree._capnumlist == null || tree._captop == tree._capnumlist.Length) {
+                capsize = tree._captop;
+                _caps = null;
+            }
+            else {
+                capsize = tree._capnumlist.Length;
+                _caps = tree._caps;
+                for (int i = 0; i < tree._capnumlist.Length; i++)
+                    _caps[tree._capnumlist[i]] = i;
+            }
+
+            _counting = true;
+
+            for (;;) {
+                if (!_counting)
+                    _emitted = new int[_count];
+
+                curNode = tree._root;
+                curChild = 0;
+
+                Emit(RegexCode.Lazybranch, 0);
+
+                for (;;) {
+                    if (curNode._children == null) {
+                        EmitFragment(curNode._type, curNode, 0);
+                    }
+                    else if (curChild < curNode._children.Count) {
+                        EmitFragment(curNode._type | BeforeChild, curNode, curChild);
+
+                        curNode = (RegexNode)curNode._children[curChild];
+                        PushInt(curChild);
+                        curChild = 0;
+                        continue;
+                    }
+
+                    if (EmptyStack())
+                        break;
+
+                    curChild = PopInt();
+                    curNode = curNode._next;
+
+                    EmitFragment(curNode._type | AfterChild, curNode, curChild);
+                    curChild++;
+                }
+
+                PatchJump(0, CurPos());
+                Emit(RegexCode.Stop);
+
+                if (!_counting)
+                    break;
+
+                _counting = false;
+            }
+
+            // if the set of possible first chars is very large,
+            // don't bother scanning for it (common case: . == [^\n])
+
+            fcPrefix = RegexFCD.FirstChars(tree);
+
+
+            if (fcPrefix != null && RegexCharClass.SetSize(fcPrefix.Prefix) > 0)
+                fcPrefix = null;
+
+            scPrefix = null; //RegexFCD.ScanChars(tree);
+            prefix = RegexFCD.Prefix(tree);
+            rtl = ((tree._options & RegexOptions.RightToLeft) != 0);
+
+            CultureInfo culture = (tree._options & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture;
+            if (prefix != null && prefix.Prefix.Length > 0)
+                bmPrefix = new RegexBoyerMoore(prefix.Prefix, prefix.CaseInsensitive, rtl, culture);
+            else
+                bmPrefix = null;
+
+            anchors = RegexFCD.Anchors(tree);
+
+            return new RegexCode(_emitted, _stringtable, _trackcount, _caps, capsize, bmPrefix, fcPrefix, scPrefix, anchors, rtl);
+        }
+
+        // The main RegexCode generator. It does a depth-first walk
+        // through the tree and calls EmitFragment to emits code before
+        // and after each child of an interior node, and at each leaf.
+        internal void EmitFragment(int nodetype, RegexNode node, int CurIndex) {
+            int bits = 0;
+
+            if (nodetype <= RegexNode.Ref) {
+                if (node.UseOptionR())
+                    bits |= RegexCode.Rtl;
+                if ((node._options & RegexOptions.IgnoreCase) != 0)
+                    bits |= RegexCode.Ci;
+            }
+
+            switch (nodetype) {
+                case RegexNode.Concatenate | BeforeChild:
+                case RegexNode.Concatenate | AfterChild:
+                case RegexNode.Empty:
+                    break;
+
+                case RegexNode.Alternate | BeforeChild:
+                    if (CurIndex < node._children.Count - 1) {
+                        PushInt(CurPos());
+                        Emit(RegexCode.Lazybranch, 0);
+                    }
+                    break;
+
+                case RegexNode.Alternate | AfterChild: {
+
+                        if (CurIndex < node._children.Count - 1) {
+                            int LBPos = PopInt();
+                            PushInt(CurPos());
+                            Emit(RegexCode.Goto, 0);
+                            PatchJump(LBPos, CurPos());
+                        }
+                        else {
+                            int I;
+                            for (I = 0; I < CurIndex; I++) {
+                                PatchJump(PopInt(), CurPos());
+                            }
+                        }
+                        break;
+                    }
+
+                case RegexNode.Testref | BeforeChild:
+                    switch (CurIndex) {
+                        case 0:
+                            Emit(RegexCode.Setjump);
+                            PushInt(CurPos());
+                            Emit(RegexCode.Lazybranch, 0);
+                            Emit(RegexCode.Testref, MapCapnum(node._m));
+                            Emit(RegexCode.Forejump);
+                            break;
+                    }
+                    break;
+
+                case RegexNode.Testref | AfterChild:
+                    switch (CurIndex) {
+                        case 0: {
+                                int Branchpos = PopInt();
+                                PushInt(CurPos());
+                                Emit(RegexCode.Goto, 0);
+                                PatchJump(Branchpos, CurPos());
+                                Emit(RegexCode.Forejump);
+                                if (node._children.Count > 1)
+                                    break;
+                                // else fall through
+                                goto case 1;
+                            }
+                        case 1:
+                            PatchJump(PopInt(), CurPos());
+                            break;
+                    }
+                    break;
+
+                case RegexNode.Testgroup | BeforeChild:
+                    switch (CurIndex) {
+                        case 0:
+                            Emit(RegexCode.Setjump);
+                            Emit(RegexCode.Setmark);
+                            PushInt(CurPos());
+                            Emit(RegexCode.Lazybranch, 0);
+                            break;
+                    }
+                    break;
+
+                case RegexNode.Testgroup | AfterChild:
+                    switch (CurIndex) {
+                        case 0:
+                            Emit(RegexCode.Getmark);
+                            Emit(RegexCode.Forejump);
+                            break;
+                        case 1:
+                            int Branchpos = PopInt();
+                            PushInt(CurPos());
+                            Emit(RegexCode.Goto, 0);
+                            PatchJump(Branchpos, CurPos());
+                            Emit(RegexCode.Getmark);
+                            Emit(RegexCode.Forejump);
+
+                            if (node._children.Count > 2)
+                                break;
+                            // else fall through
+                            goto case 2;
+                        case 2:
+                            PatchJump(PopInt(), CurPos());
+                            break;
+                    }
+                    break;
+
+                case RegexNode.Loop | BeforeChild:
+                case RegexNode.Lazyloop | BeforeChild:
+
+                    if (node._n < infinite || node._m > 1)
+                        Emit(node._m == 0 ? RegexCode.Nullcount : RegexCode.Setcount, node._m == 0 ? 0 : 1 - node._m);
+                    else
+                        Emit(node._m == 0 ? RegexCode.Nullmark : RegexCode.Setmark);
+
+                    if (node._m == 0) {
+                        PushInt(CurPos());
+                        Emit(RegexCode.Goto, 0);
+                    }
+                    PushInt(CurPos());
+                    break;
+
+                case RegexNode.Loop | AfterChild:
+                case RegexNode.Lazyloop | AfterChild: {
+                        int StartJumpPos = CurPos();
+                        int Lazy = (nodetype - (RegexNode.Loop | AfterChild));
+
+                        if (node._n < infinite || node._m > 1)
+                            Emit(RegexCode.Branchcount + Lazy, PopInt(), node._n == infinite ? infinite : node._n - node._m);
+                        else
+                            Emit(RegexCode.Branchmark + Lazy, PopInt());
+
+                        if (node._m == 0)
+                            PatchJump(PopInt(), StartJumpPos);
+                    }
+                    break;
+
+                case RegexNode.Group | BeforeChild:
+                case RegexNode.Group | AfterChild:
+                    break;
+
+                case RegexNode.Capture | BeforeChild:
+                    Emit(RegexCode.Setmark);
+                    break;
+
+                case RegexNode.Capture | AfterChild:
+                    Emit(RegexCode.Capturemark, MapCapnum(node._m), MapCapnum(node._n));
+                    break;
+
+                case RegexNode.Require | BeforeChild:
+                    // NOTE: the following line causes lookahead/lookbehind to be
+                    // NON-BACKTRACKING. It can be commented out with (*)
+                    Emit(RegexCode.Setjump);
+
+
+                    Emit(RegexCode.Setmark);
+                    break;
+
+                case RegexNode.Require | AfterChild:
+                    Emit(RegexCode.Getmark);
+
+                    // NOTE: the following line causes lookahead/lookbehind to be
+                    // NON-BACKTRACKING. It can be commented out with (*)
+                    Emit(RegexCode.Forejump);
+
+                    break;
+
+                case RegexNode.Prevent | BeforeChild:
+                    Emit(RegexCode.Setjump);
+                    PushInt(CurPos());
+                    Emit(RegexCode.Lazybranch, 0);
+                    break;
+
+                case RegexNode.Prevent | AfterChild:
+                    Emit(RegexCode.Backjump);
+                    PatchJump(PopInt(), CurPos());
+                    Emit(RegexCode.Forejump);
+                    break;
+
+                case RegexNode.Greedy | BeforeChild:
+                    Emit(RegexCode.Setjump);
+                    break;
+
+                case RegexNode.Greedy | AfterChild:
+                    Emit(RegexCode.Forejump);
+                    break;
+
+                case RegexNode.One:
+                case RegexNode.Notone:
+                    Emit(node._type | bits, (int)node._ch);
+                    break;
+
+                case RegexNode.Notoneloop:
+                case RegexNode.Notonelazy:
+                case RegexNode.Oneloop:
+                case RegexNode.Onelazy:
+                    if (node._m > 0)
+                        Emit(((node._type == RegexNode.Oneloop || node._type == RegexNode.Onelazy) ?
+                              RegexCode.Onerep : RegexCode.Notonerep) | bits, (int)node._ch, node._m);
+                    if (node._n > node._m)
+                        Emit(node._type | bits, (int)node._ch, node._n == infinite ?
+                             infinite : node._n - node._m);
+                    break;
+
+                case RegexNode.Setloop:
+                case RegexNode.Setlazy:
+                    if (node._m > 0)
+                        Emit(RegexCode.Setrep | bits, StringCode(node._str), StringCode(node._str2), node._m);
+                    if (node._n > node._m)
+                        Emit(node._type | bits, StringCode(node._str), StringCode(node._str2),
+                             (node._n == infinite) ? infinite : node._n - node._m);
+                    break;
+
+                case RegexNode.Multi:
+                    Emit(node._type | bits, StringCode(node._str));
+                    break;
+
+                case RegexNode.Set:
+                    Emit(node._type | bits, StringCode(node._str), StringCode(node._str2));
+                    break;
+
+                case RegexNode.Ref:
+                    Emit(node._type | bits, MapCapnum(node._m));
+                    break;
+
+                case RegexNode.Nothing:
+                case RegexNode.Bol:
+                case RegexNode.Eol:
+                case RegexNode.Boundary:
+                case RegexNode.Nonboundary:
+                case RegexNode.ECMABoundary:
+                case RegexNode.NonECMABoundary:
+                case RegexNode.Beginning:
+                case RegexNode.Start:
+                case RegexNode.EndZ:
+                case RegexNode.End:
+                    Emit(node._type);
+                    break;
+
+                default:
+                    throw MakeException("Unexpected Opcode"); //XXX: SR.GetString(SR.UnexpectedOpcode, nodetype.ToString()));
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Text/StringBuilder.cs b/base/Kernel/System/Text/StringBuilder.cs
new file mode 100644
index 0000000..9cffa0c
--- /dev/null
+++ b/base/Kernel/System/Text/StringBuilder.cs
@@ -0,0 +1,1275 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  StringBuilder
+**
+**
+** Purpose: A prototype implementation of the StringBuilder
+** class.
+**
+** Date:  December 8, 1997
+** Last Updated:  March 31, 1998
+**
+===========================================================*/
+namespace System.Text {
+    using System.Text;
+    using System.Threading;
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+
+    // This class represents a mutable string.  It is convenient for situations in
+    // which it is desirable to modify a string, perhaps by removing, replacing, or
+    // inserting characters, without creating a new String subsequent to
+    // each modification.
+    //
+    // The methods contained within this class do not return a new StringBuilder
+    // object unless specified otherwise.  This class may be used in conjunction with the String
+    // class to carry out modifications upon strings.
+    //
+    // When passing null into a constructor in VJ and VC, the null
+    // should be explicitly type cast.
+    // For Example:
+    // StringBuilder sb1 = new StringBuilder((StringBuilder)null);
+    // StringBuilder sb2 = new StringBuilder((String)null);
+    //
+    //| <include path='docs/doc[@for="StringBuilder"]/*' />
+    [NoCCtor]
+    [RequiredByBartok]
+    public sealed class StringBuilder {
+
+        //
+        //
+        //  CLASS VARIABLES
+        //
+        //
+        internal int m_currentThread = InternalGetCurrentThread();
+        internal int m_MaxCapacity = 0;
+        [RequiredByBartok]
+        internal String m_StringValue = null;
+
+
+        //
+        //
+        // STATIC CONSTANTS
+        //
+        //
+        private const int DEFAULT_CAPACITY = 16;
+        private const int DEFAULT_MAX_CAPACITY = 0x7FFFFFFF;
+
+        //
+        //
+        //CONSTRUCTORS
+        //
+        //
+
+        // Creates a new empty string builder (i.e., it represents String.Empty)
+        // with the default capacity (16 characters).
+        //| <include path='docs/doc[@for="StringBuilder.StringBuilder"]/*' />
+        public StringBuilder()
+            : this(DEFAULT_CAPACITY) {
+        }
+
+        // Create a new empty string builder (i.e., it represents String.Empty)
+        // with the specified capacity.
+        //| <include path='docs/doc[@for="StringBuilder.StringBuilder1"]/*' />
+        public StringBuilder(int capacity) {
+            if (capacity<0) {
+                throw new ArgumentOutOfRangeException("capacity");
+            }
+
+            if (capacity == 0) { // MakeFromString enforces this
+                capacity = DEFAULT_CAPACITY;
+            }
+
+            m_StringValue = String.GetStringForStringBuilder(String.Empty, capacity);
+            m_MaxCapacity = Int32.MaxValue;
+        }
+
+        /*=======================CalculateCapacity===============================
+         * Calculates the new capacity of our buffer.  If the size of the
+         * buffer is less than a fixed number (10000 in this case), we just
+         * double the buffer until we have enough space.  Once we get larger
+         * than 10000, we use a series of heuristics to determine the most
+         * appropriate size.
+         ======================================================================*/
+        private int CalculateCapacity(int currentCapacity, int neededCapacity)
+        {
+            // rusa: see also Lightning\Src\VM\COMStringBuffer.cpp::CalculateCapaity
+            int newCapacity = neededCapacity;
+            if (newCapacity == 0) {
+                newCapacity = DEFAULT_CAPACITY;
+            }
+            if (neededCapacity > this.m_MaxCapacity) {
+                throw new ArgumentOutOfRangeException("exceeding max capacity");
+            }
+            while (newCapacity < neededCapacity && newCapacity > 0) {
+                newCapacity <<= 1;
+            }
+            // Check for overflow
+            if (newCapacity <= 0) {
+                // The C++ code throws on overflow, but it really should not
+                newCapacity = this.m_MaxCapacity;
+            } else if (newCapacity > this.m_MaxCapacity) {
+                // We doubled past the max capacity, so back down a bit
+                newCapacity = this.m_MaxCapacity;
+            }
+            return newCapacity;
+        }
+
+        // Creates a new string builder from the specified string.  If value
+        // is a null String (i.e., if it represents String.NullString)
+        // then the new string builder will also be null (i.e., it will also represent
+        //  String.NullString).
+        //
+        //| <include path='docs/doc[@for="StringBuilder.StringBuilder2"]/*' />
+        public StringBuilder(String value){
+            MakeFromString(value, 0, -1, -1);
+        }
+
+        // Creates a new string builder from the specified string with the specified
+        // capacity.  If value is a null String (i.e., if it represents
+        // String.NullString) then the new string builder will also be null
+        // (i.e., it will also represent String.NullString).
+        // The maximum number of characters this string may contain is set by capacity.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.StringBuilder3"]/*' />
+        public StringBuilder(String value, int capacity) {
+            if (capacity<0) {
+                throw new ArgumentOutOfRangeException("capacity",
+                                                      String.Format("ArgumentOutOfRange_MustBePositive", "capacity"));
+            }
+
+            MakeFromString(value, 0, -1, capacity);
+        }
+        // Creates a new string builder from the specified substring with the specified
+        // capacity.  The maximum number of characters is set by capacity.
+        //
+
+        //| <include path='docs/doc[@for="StringBuilder.StringBuilder4"]/*' />
+        public StringBuilder(String value, int startIndex, int length, int capacity) {
+            if (capacity<0) {
+                throw new ArgumentOutOfRangeException("capacity",
+                                                      String.Format("ArgumentOutOfRange_MustBePositive", "capacity"));
+            }
+            if (length<0) {
+                throw new ArgumentOutOfRangeException("length",
+                                                      String.Format("ArgumentOutOfRange_MustBeNonNegNum", "length"));
+            }
+
+            MakeFromString(value, startIndex, length, capacity);
+        }
+
+        // Creates an empty StringBuilder with a minimum capacity of capacity
+        // and a maximum capacity of maxCapacity.
+        //| <include path='docs/doc[@for="StringBuilder.StringBuilder5"]/*' />
+        public StringBuilder(int capacity, int maxCapacity) {
+            if (capacity>maxCapacity) {
+                throw new ArgumentOutOfRangeException("capacity", "ArgumentOutOfRange_Capacity");
+            }
+            if (maxCapacity<1) {
+                throw new ArgumentOutOfRangeException("maxCapacity", "ArgumentOutOfRange_SmallMaxCapacity");
+            }
+
+            if (capacity<0) {
+                throw new ArgumentOutOfRangeException("capacity",
+                                                      String.Format("ArgumentOutOfRange_MustBePositive", "capacity"));
+            }
+            if (capacity == 0) {
+                capacity = DEFAULT_CAPACITY;
+            }
+
+            m_StringValue = String.GetStringForStringBuilder(String.Empty, capacity);
+            m_MaxCapacity = maxCapacity;
+
+        }
+
+        private String GetThreadSafeString(out int tid) {
+             String temp = m_StringValue;
+             tid = InternalGetCurrentThread();
+             if (m_currentThread == tid)
+                return temp;
+             return String.GetStringForStringBuilder(temp, temp.Capacity);
+        }
+
+        private static int InternalGetCurrentThread()
+        {
+            return Thread.CurrentThread.GetThreadId();
+        }
+
+        //
+        // Private native functions
+        //
+        /*=========================MakeFromString================================
+        ** If value is null, we simply create an empty string with a default
+        ** length.  If it does contain data, we allocate space for twice this
+        ** amount of data, copy the data, associate it with the StringBuffer
+        ** and clear the CopyOnWrite bit.
+        =======================================================================*/
+        private void MakeFromString(String value, int startIndex, int length, int capacity)
+        {
+            // rusa: see also Lightning\Src\VM\COMStringBuffer.cpp::MakeFromString
+            if (capacity <= 0) {
+                capacity = DEFAULT_CAPACITY;
+            }
+            this.m_MaxCapacity = DEFAULT_MAX_CAPACITY;
+            if (value != null) {
+                if (startIndex < 0) {
+                    throw new ArgumentOutOfRangeException("negative startIndex");
+                }
+                int stringLength = value.Length;
+                if (length == -1) {
+                    length = stringLength - startIndex;
+                } else if (length + startIndex > stringLength) {
+                    throw new ArgumentOutOfRangeException("exceeding string length");
+                }
+                int newCapacity = this.CalculateCapacity(capacity, length);
+                String newString =
+                    String.GetStringForStringBuilder(String.Empty, newCapacity);
+                newString.AppendInPlace(value, startIndex, length, 0);
+                this.m_StringValue = newString;
+            } else if (capacity == 0) {
+                this.m_StringValue = String.Empty;
+            } else {
+                this.m_StringValue =
+                    String.GetStringForStringBuilder(String.Empty, capacity);
+            }
+        }
+
+         //| <include path='docs/doc[@for="StringBuilder.Capacity"]/*' />
+         public int Capacity {
+             get {return m_StringValue.Capacity;} //-1 to account for terminating null.
+             set {InternalSetCapacity(value);}
+        }
+
+
+        //| <include path='docs/doc[@for="StringBuilder.MaxCapacity"]/*' />
+        public int MaxCapacity {
+            get { return m_MaxCapacity; }
+
+        }
+
+        // Read-Only Property
+        // Ensures that the capacity of this string builder is at least the specified value.
+        // If capacity is greater than the capacity of this string builder, then the capacity
+        // is set to capacity; otherwise the capacity is unchanged.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.EnsureCapacity"]/*' />
+        public int EnsureCapacity(int capacity) {
+            if (capacity<0) {
+                throw new ArgumentOutOfRangeException("capacity", "ArgumentOutOfRange_NeedPosCapacity");
+            }
+
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+
+            //If we need more space or the COW bit is set, copy the buffer.
+            if (!NeedsAllocation(currentString,capacity)) {
+                return currentString.Capacity;
+            }
+
+            String newString = GetNewString(currentString,capacity);
+            ReplaceString(tid,newString);
+            return newString.Capacity;
+        }
+
+        //Sets the capacity to be capacity.  If capacity is less than the current
+        //instance an ArgumentException is thrown.  If capacity is greater than the current
+        //instance, memory is allocated to allow the StringBuilder to grow.
+        //
+        internal int InternalSetCapacity(int capacity)
+        {
+            // rusa: see also Lighting\Src\VM\COMStringBuffer.cpp::SetCapacity
+            // The return value of the native code is a pointer to 'this', but
+            // since it isn't ever used, we return 0;
+
+            int tid;
+            String thisString = GetThreadSafeString(out tid);
+            if (capacity < 0) {
+                throw new ArgumentOutOfRangeException("capacity is negative");
+            }
+            if (capacity < thisString.Length) {
+                throw new ArgumentOutOfRangeException("capacity lesser than size");
+            }
+            if (capacity > this.m_MaxCapacity) {
+                throw new ArgumentOutOfRangeException("exceeds max capacity");
+            }
+            if (capacity != this.m_StringValue.ArrayLength-1) {
+                this.m_StringValue = CopyString(this,thisString,capacity);
+                this.m_currentThread = tid;
+            }
+            return 0;
+        }
+
+        private String CopyString(StringBuilder thisRef,String CurrString,
+                                  int newCapacity)
+        {
+            int CurrLen = CurrString.Length;
+            int copyLength;
+            if (newCapacity >= CurrLen) {
+                copyLength = CurrLen;
+            } else {
+                copyLength = newCapacity;
+            }
+            return String.NewString(CurrString,0,copyLength,newCapacity);
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.ToString"]/*' />
+        public override String ToString() {
+            String currentString = m_StringValue;
+            int currentThread = m_currentThread;
+            if (currentThread != 0 && currentThread != InternalGetCurrentThread()) {
+                return String.InternalCopy(currentString);
+            }
+
+            if ((2 *  currentString.Length) <  currentString.ArrayLength) {
+                return String.InternalCopy(currentString);
+            }
+
+            currentString.ClearPostNullChar();
+            m_currentThread = 0;
+            return  currentString;
+        }
+
+        // Converts a substring of this string builder to a String.
+        //| <include path='docs/doc[@for="StringBuilder.ToString1"]/*' />
+        public String ToString(int startIndex, int length) {
+            return  m_StringValue.Substring(startIndex, length);
+        }
+
+        // Sets the length of the String in this buffer.  If length is less than the current
+        // instance, the StringBuilder is truncated.  If length is greater than the current
+        // instance, nulls are appended.  The capacity is adjusted to be the same as the length.
+
+        //| <include path='docs/doc[@for="StringBuilder.Length"]/*' />
+        public int Length {
+            get {
+               return  m_StringValue.Length;
+            }
+            set {
+                int tid;
+                String currentString = GetThreadSafeString(out tid);
+
+                if (value==0) { //the user is trying to clear the string
+                     currentString.SetLength(0);
+                     ReplaceString(tid,currentString);
+                     return;
+                }
+
+                int currentLength = currentString.Length;
+                int newlength = value;
+                //If our length is less than 0 or greater than our Maximum capacity, bail.
+                if (newlength<0) {
+                    throw new ArgumentOutOfRangeException("newlength", "ArgumentOutOfRange_NegativeLength");
+                }
+
+                if (newlength>MaxCapacity) {
+                    throw new ArgumentOutOfRangeException("capacity", "ArgumentOutOfRange_SmallCapacity");
+                }
+
+                //Jump out early if our requested length our currentlength.
+                //This will be a pretty rare branch.
+                if (newlength == currentLength) {
+                    return;
+                }
+
+
+                //If the StringBuilder has never been converted to a string, simply set the length
+                //without allocating a new string.
+                if (newlength <= currentString.Capacity) {
+                        if (newlength > currentLength) {
+                            for (int i = currentLength ; i < newlength; i++) // This is a rare case anyway.
+                                currentString.InternalSetCharNoBoundsCheck(i,'\0');
+                        }
+
+                        currentString.InternalSetCharNoBoundsCheck(newlength,'\0'); //Null terminate.
+                        currentString.SetLength(newlength);
+                        ReplaceString(tid,currentString);
+
+                        return;
+                }
+
+                // CopyOnWrite set we need to allocate a String
+                int newCapacity = (newlength>currentString.Capacity)?newlength:currentString.Capacity;
+                String newString = String.GetStringForStringBuilder(currentString, newCapacity);
+
+                //We know exactly how many characters we need, so embed that knowledge in the String.
+                newString.SetLength(newlength);
+                ReplaceString(tid,newString);
+            }
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.this"]/*' />
+        public char this[int index] {
+            get {
+                return  m_StringValue[index];
+            }
+            set {
+                int tid;
+                String currentString = GetThreadSafeString(out tid);
+                currentString.SetChar(index, value);
+                ReplaceString(tid,currentString);
+            }
+        }
+
+        // Appends a character at the end of this string builder. The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append"]/*' />
+        public StringBuilder Append(char value, int repeatCount) {
+            if (repeatCount==0) {
+                return this;
+            }
+            if (repeatCount<0) {
+                throw new ArgumentOutOfRangeException("repeatCount", "ArgumentOutOfRange_NegativeCount");
+            }
+
+
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+
+            int currentLength = currentString.Length;
+            int requiredLength = currentLength + repeatCount;
+
+            if (requiredLength < 0)
+                throw new OutOfMemoryException();
+
+            if (!NeedsAllocation(currentString,requiredLength)) {
+                currentString.AppendInPlace(value, repeatCount,currentLength);
+                ReplaceString(tid,currentString);
+                return this;
+            }
+
+            String newString = GetNewString(currentString,requiredLength);
+            newString.AppendInPlace(value, repeatCount,currentLength);
+            ReplaceString(tid,newString);
+            return this;
+        }
+
+        // Appends an array of characters at the end of this string builder. The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append1"]/*' />
+        public StringBuilder Append(char[] value, int startIndex, int charCount) {
+            int requiredLength;
+
+            if (value==null) {
+                if (startIndex==0 && charCount==0) {
+                    return this;
+                }
+                throw new ArgumentNullException("value");
+            }
+
+            if (charCount==0) {
+                return this;
+            }
+
+            if (startIndex<0) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_GenericPositive");
+            }
+            if (charCount<0) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_GenericPositive");
+            }
+            if (charCount>value.Length-startIndex) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Index");
+            }
+
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+
+            int currentLength = currentString.Length;
+            requiredLength = currentLength + charCount;
+            if (NeedsAllocation(currentString,requiredLength)) {
+                String newString = GetNewString(currentString,requiredLength);
+                newString.AppendInPlace(value, startIndex, charCount,currentLength);
+                ReplaceString(tid,newString);
+            } else {
+                currentString.AppendInPlace(value, startIndex, charCount,currentLength);
+                ReplaceString(tid,currentString);
+            }
+
+            return this;
+        }
+
+        // Appends a copy of this string at the end of this string builder.
+        //| <include path='docs/doc[@for="StringBuilder.Append2"]/*' />
+        public StringBuilder Append(String value) {
+            //If the value being added is null, eat the null
+            //and return.
+            if (value==null) {
+                return this;
+            }
+
+            int tid;
+            // hand inlining of GetThreadSafeString
+            String currentString = m_StringValue;
+            tid = InternalGetCurrentThread();
+            if (m_currentThread != tid)
+                currentString = String.GetStringForStringBuilder(currentString, currentString.Capacity);
+
+            int currentLength = currentString.Length;
+
+            int requiredLength = currentLength + value.Length;
+
+            if (NeedsAllocation(currentString,requiredLength)) {
+                String newString = GetNewString(currentString,requiredLength);
+                newString.AppendInPlace(value,currentLength);
+                ReplaceString(tid,newString);
+            } else {
+                currentString.AppendInPlace(value,currentLength);
+                ReplaceString(tid,currentString);
+            }
+
+            return this;
+        }
+
+        internal unsafe StringBuilder Append(char *value, int count) {
+            //If the value being added is null, eat the null
+            //and return.
+            if (value==null) {
+                return this;
+            }
+
+
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+            int currentLength = currentString.Length;
+
+            int requiredLength = currentLength + count;
+
+            if (NeedsAllocation(currentString,requiredLength)) {
+                String newString = GetNewString(currentString,requiredLength);
+                newString.AppendInPlace(value, count,currentLength);
+                ReplaceString(tid,newString);
+            } else {
+                currentString.AppendInPlace(value,count,currentLength);
+                ReplaceString(tid,currentString);
+            }
+
+            return this;
+        }
+
+        private bool NeedsAllocation(String currentString,int requiredLength) {
+            //<= accounts for the terminating 0 which we require on strings.
+            return (currentString.ArrayLength<=requiredLength);
+        }
+
+        private String GetNewString(String currentString, int requiredLength) {
+            int newCapacity;
+
+            requiredLength++; //Include the terminating null.
+
+            if (requiredLength < 0) {
+                throw new OutOfMemoryException();
+            }
+
+            if (requiredLength >  m_MaxCapacity) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NegativeCapacity",
+                                                      "requiredLength");
+            }
+
+            newCapacity = ( currentString.Capacity)*2; // To force a predictable growth of 160,320 etc. for testing purposes
+
+            if (newCapacity<requiredLength) {
+                newCapacity = requiredLength;
+            }
+
+            if (newCapacity> m_MaxCapacity) {
+                newCapacity = m_MaxCapacity;
+            }
+
+            if (newCapacity<=0) {
+                throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NegativeCapacity");
+            }
+
+            return String.GetStringForStringBuilder( currentString, newCapacity);
+        }
+
+        private void ReplaceString(int tid, String value) {
+            Debug.Assert(value!=null, "[StringBuilder.ReplaceString]value!=null");
+
+            m_currentThread = tid; // new owner
+            m_StringValue = value;
+        }
+
+        // Appends a copy of the characters in value from startIndex to startIndex +
+        // count at the end of this string builder.
+        //| <include path='docs/doc[@for="StringBuilder.Append3"]/*' />
+        public StringBuilder Append(String value, int startIndex, int count) {
+            //If the value being added is null, eat the null
+            //and return.
+            if (value==null) {
+                if (startIndex==0 && count==0) {
+                    return this;
+                }
+                throw new ArgumentNullException("value");
+            }
+
+            if (count<=0) {
+                if (count==0) {
+                    return this;
+                }
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_GenericPositive");
+            }
+
+            if (startIndex<0 || (startIndex>value.Length - count)) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            }
+
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+            int currentLength = currentString.Length;
+
+            int requiredLength = currentLength + count;
+
+            if (NeedsAllocation(currentString,requiredLength)) {
+                String newString = GetNewString(currentString,requiredLength);
+                newString.AppendInPlace(value, startIndex, count, currentLength);
+                ReplaceString(tid,newString);
+            } else {
+                currentString.AppendInPlace(value, startIndex, count, currentLength);
+                ReplaceString(tid,currentString);
+            }
+
+            return this;
+        }
+
+        // Inserts multiple copies of a string into this string builder at the specified position.
+        // Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, this
+        // string builder is not changed. Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert"]/*' />
+        public unsafe StringBuilder Insert(int index, String value, int count) {
+              int tid;
+              String currentString = GetThreadSafeString(out tid);
+              int currentLength = currentString.Length;
+
+              //If value isn't null, get all of our required values.
+              if (value == null) {
+                    if (index == 0 && count == 0) {
+                         return this;
+                    }
+                    throw new ArgumentNullException("ArgumentNull_String");
+              }
+
+              //Range check the index.
+              if (index < 0 || index > currentLength) {
+                  throw new ArgumentOutOfRangeException("index","ArgumentOutOfRange_Index");
+              }
+
+              if (count < 1) {
+                  throw new ArgumentOutOfRangeException("count","ArgumentOutOfRange_GenericPositive");
+              }
+
+               //Calculate the new length, ensure that we have the space and set the space variable for this buffer
+               int requiredLength;
+                try {
+                   requiredLength = checked(currentLength + (value.Length * count));
+                }
+                catch (Exception) {
+                   throw new OutOfMemoryException();
+                }
+
+               if (NeedsAllocation(currentString,requiredLength)) {
+                    String newString = GetNewString(currentString,requiredLength);
+                    newString.InsertInPlace(index, value, count, currentLength, requiredLength);
+                    ReplaceString(tid,newString);
+               }
+               else {
+                    currentString.InsertInPlace(index, value, count, currentLength, requiredLength);
+                    ReplaceString(tid,currentString);
+               }
+               return this;
+         }
+
+
+
+        // Property.
+        // Removes the specified characters from this string builder.
+        // The length of this string builder is reduced by
+        // length, but the capacity is unaffected.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Remove"]/*' />
+        public StringBuilder Remove(int startIndex, int length)
+        {
+            // rusa: see also Lightning\Src\VM\COMStringBuffer.cpp::Remove
+            int tid;
+            String thisString = GetThreadSafeString(out tid);
+            int thisLength = thisString.ArrayLength-1;
+            if (length < 0) {
+                throw new ArgumentOutOfRangeException("Negative length");
+            }
+            if (startIndex < 0) {
+                throw new ArgumentOutOfRangeException("Negative start index");
+            }
+            if (startIndex + length > thisLength) {
+                throw new ArgumentOutOfRangeException("Exceeding string length");
+            }
+            thisString.RemoveRange(startIndex, length);
+            this.m_StringValue = thisString;
+            this.m_currentThread = tid;
+            return this;
+        }
+
+        //
+        //
+        // PUBLIC INSTANCE FUNCTIONS
+        //
+        //
+
+        /*====================================Append====================================
+        **
+        ==============================================================================*/
+        // Appends a boolean to the end of this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append4"]/*' />
+        public StringBuilder Append(bool value) {
+            return Append(value.ToString());
+        }
+
+        // Appends an sbyte to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append5"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Append(sbyte value) {
+            return Append(value.ToString());
+        }
+
+        // Appends a ubyte to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append6"]/*' />
+        public StringBuilder Append(byte value) {
+            return Append(value.ToString());
+        }
+
+        // Appends a character at the end of this string builder. The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append7"]/*' />
+        public StringBuilder Append(char value) {
+            int tid;
+
+            // hand inlining of GetThreadSafeString
+            String currentString = m_StringValue;
+            tid = InternalGetCurrentThread();
+            if (m_currentThread != tid)
+                currentString = String.GetStringForStringBuilder(currentString, currentString.Capacity);
+
+            int currentLength = currentString.Length;
+            if (!NeedsAllocation(currentString,currentLength+1)) {
+                currentString.AppendInPlace(value,currentLength);
+                ReplaceString(tid,currentString);
+                return this;
+            }
+
+            String newString = GetNewString(currentString,currentLength+1);
+            newString.AppendInPlace(value,currentLength);
+            ReplaceString(tid,newString);
+            return this;
+        }
+
+        // Appends a short to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append8"]/*' />
+        public StringBuilder Append(short value) {
+            return Append(value.ToString());
+        }
+
+        // Appends an int to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append9"]/*' />
+        public StringBuilder Append(int value) {
+            return Append(value.ToString());
+        }
+
+        // Appends a long to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append10"]/*' />
+        public StringBuilder Append(long value) {
+            return Append(value.ToString());
+        }
+
+        // Appends a float to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append11"]/*' />
+        public StringBuilder Append(float value) {
+            return Append(value.ToString());
+        }
+
+        // Appends a double to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append12"]/*' />
+        public StringBuilder Append(double value) {
+            return Append(value.ToString());
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.Append13"]/*' />
+        public StringBuilder Append(decimal value) {
+            return Append(value.ToString());
+        }
+
+        // Appends an ushort to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append14"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Append(ushort value) {
+            return Append(value.ToString());
+        }
+
+        // Appends an uint to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append15"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Append(uint value) {
+            return Append(value.ToString());
+        }
+
+        // Appends an unsigned long to this string builder.
+        // The capacity is adjusted as needed.
+
+        //| <include path='docs/doc[@for="StringBuilder.Append16"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Append(ulong value) {
+            return Append(value.ToString());
+        }
+
+        // Appends an Object to this string builder.
+        // The capacity is adjusted as needed.
+        //| <include path='docs/doc[@for="StringBuilder.Append17"]/*' />
+        public StringBuilder Append(Object value) {
+            if (null==value) {
+                //Appending null is now a no-op.
+                return this;
+            }
+            return Append(value.ToString());
+        }
+
+        // Appends all of the characters in value to the current instance.
+        //| <include path='docs/doc[@for="StringBuilder.Append18"]/*' />
+        public StringBuilder Append(char[] value) {
+            if (null==value) {
+                return this;
+            }
+
+            int valueLength = value.Length;
+
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+
+            int currentLength = currentString.Length;
+            int requiredLength = currentLength + value.Length;
+            if (NeedsAllocation(currentString,requiredLength)) {
+                String newString = GetNewString(currentString,requiredLength);
+                newString.AppendInPlace(value, 0, valueLength,currentLength);
+                ReplaceString(tid,newString);
+            } else {
+                currentString.AppendInPlace(value, 0, valueLength, currentLength);
+                ReplaceString(tid,currentString);
+            }
+            return this;
+        }
+
+        /*====================================Insert====================================
+        **
+        ==============================================================================*/
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert1"]/*' />
+        public StringBuilder Insert(int index, String value) {
+            if (value == null) // This is to do the index validation
+                return Insert(index,value,0);
+            else
+                return Insert(index,value,1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert2"]/*' />
+        public StringBuilder Insert( int index, bool value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert3"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Insert(int index, sbyte value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert4"]/*' />
+        public StringBuilder Insert(int index, byte value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert5"]/*' />
+        public StringBuilder Insert(int index, short value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert6"]/*' />
+        public StringBuilder Insert(int index, char value) {
+            return Insert(index,Char.ToString(value),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert7"]/*' />
+        public StringBuilder Insert(int index, char[] value) {
+            if (null==value) {
+                return Insert(index, value, 0, 0);
+            }
+            return Insert(index, value, 0, value.Length);
+        }
+
+        // Returns a reference to the StringBuilder with charCount characters from
+        // value inserted into the buffer at index.  Existing characters are shifted
+        // to make room for the new text and capacity is adjusted as required.  If value is null, the StringBuilder
+        // is unchanged.  Characters are taken from value starting at position startIndex.
+        //| <include path='docs/doc[@for="StringBuilder.Insert8"]/*' />
+        public StringBuilder Insert(int index, char []value, int startIndex, int charCount)
+        {
+            throw new Exception("System.Text.StringBuilder.Insert not implemented in Bartok");
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert9"]/*' />
+        public StringBuilder Insert(int index, int value){
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert10"]/*' />
+        public StringBuilder Insert(int index, long value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert11"]/*' />
+        public StringBuilder Insert(int index, float value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+
+        // Returns a reference to the StringBuilder with ; value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. ; Inserts ";<;no object>;"; if value
+        // is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert12"]/*' />
+        public StringBuilder Insert(int index, double value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.Insert13"]/*' />
+        public StringBuilder Insert(int index, decimal value) {
+            return Insert(index,value.ToString(),1);
+        }
+
+        // Returns a reference to the StringBuilder with value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert14"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Insert(int index, ushort value) {
+            return Insert(index, value.ToString(),1);
+        }
+
+
+        // Returns a reference to the StringBuilder with value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert15"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Insert(int index, uint value) {
+            return Insert(index, value.ToString(), 1);
+        }
+
+        // Returns a reference to the StringBuilder with value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the new text.
+        // The capacity is adjusted as needed.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert16"]/*' />
+        [CLSCompliant(false)]
+        public StringBuilder Insert(int index, ulong value) {
+            return Insert(index, value.ToString(), 1);
+        }
+
+        // Returns a reference to this string builder with value inserted into
+        // the buffer at index. Existing characters are shifted to make room for the
+        // new text.  The capacity is adjusted as needed. If value equals String.Empty, the
+        // StringBuilder is not changed. No changes are made if value is null.
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Insert17"]/*' />
+        public StringBuilder Insert(int index, Object value) {
+            //If we get a null
+            if (null==value) {
+                return this;
+            }
+            return Insert(index,value.ToString(),1);
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.AppendFormat"]/*' />
+        public StringBuilder AppendFormat(String format, Object arg0) {
+            return AppendFormat(format, new Object[] {arg0});
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.AppendFormat1"]/*' />
+        public StringBuilder AppendFormat(String format, Object arg0, Object arg1) {
+            return AppendFormat(format, new Object[] {arg0, arg1});
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.AppendFormat2"]/*' />
+        public StringBuilder AppendFormat(String format, Object arg0, Object arg1, Object arg2) {
+            return AppendFormat(format, new Object[] {arg0, arg1, arg2});
+        }
+
+        private static void FormatError() {
+            throw new FormatException("Format_InvalidString");
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.AppendFormat4"]/*' />
+        public StringBuilder AppendFormat(String format, params Object[] args) {
+            if (format == null || args == null) {
+                throw new ArgumentNullException((format==null)?"format":"args");
+            }
+            char[] chars = format.ToCharArray(0, format.Length);
+            int pos = 0;
+            int len = chars.Length;
+            char ch = '\x0';
+
+            while (true) {
+                int p = pos;
+                int i = pos;
+                while (pos < len) {
+                    ch = chars[pos];
+
+                    pos++;
+                    if (ch == '}')
+                    {
+                        if(pos < len && chars[pos]=='}') // Treat as escape character for }}
+                            pos++;
+                        else
+                            FormatError();
+                    }
+
+                    if (ch == '{')
+                    {
+                        if(pos < len && chars[pos]=='{') // Treat as escape character for {{
+                            pos++;
+                        else
+                        {
+                            pos--;
+                            break;
+                        }
+                    }
+
+                    chars[i++] = ch;
+                }
+                if (i > p) Append(chars, p, i - p);
+                if (pos == len) break;
+                pos++;
+                if (pos == len || (ch = chars[pos]) < '0' || ch > '9') FormatError();
+                int index = 0;
+                do {
+                    index = index * 10 + ch - '0';
+                    pos++;
+                    if (pos == len) FormatError();
+                    ch = chars[pos];
+                } while (ch >= '0' && ch <= '9' && index < 1000000);
+                if (index >= args.Length) throw new FormatException("Format_IndexOutOfRange");
+                while (pos < len && (ch=chars[pos]) == ' ') pos++;
+                bool leftJustify = false;
+                int width = 0;
+                if (ch == ',') {
+                    pos++;
+                    while (pos < len && chars[pos] == ' ') pos++;
+
+                    if (pos == len) FormatError();
+                    ch = chars[pos];
+                    if (ch == '-') {
+                        leftJustify = true;
+                        pos++;
+                        if (pos == len) FormatError();
+                        ch = chars[pos];
+                    }
+                    if (ch < '0' || ch > '9') FormatError();
+                    do {
+                        width = width * 10 + ch - '0';
+                        pos++;
+                        if (pos == len) FormatError();
+                        ch = chars[pos];
+                    } while (ch >= '0' && ch <= '9' && width < 1000000);
+                }
+
+                while (pos < len && (ch=chars[pos]) == ' ') pos++;
+                Object arg = args[index];
+                String fmt = null;
+                if (ch == ':') {
+                    pos++;
+                    p = pos;
+                    i = pos;
+                    while (true) {
+                        if (pos == len) FormatError();
+                        ch = chars[pos];
+                        pos++;
+                        if (ch == '{')
+                        {
+                            if(pos < len && chars[pos]=='{')  // Treat as escape character for {{
+                                pos++;
+                            else
+                                FormatError();
+                        }
+                        else if (ch == '}')
+                        {
+                            if(pos < len && chars[pos]=='}')  // Treat as escape character for }}
+                                pos++;
+                            else
+                            {
+                                pos--;
+                                break;
+                            }
+                        }
+
+                        chars[i++] = ch;
+                    }
+                    if (i > p) fmt = new String(chars, p, i - p);
+                }
+                if (ch != '}') FormatError();
+                pos++;
+                String s = null;
+
+                if (s==null) {
+                    if (arg is IFormattable) {
+                        s = ((IFormattable)arg).ToString(fmt);
+                    } else if (arg != null) {
+                        s = arg.ToString();
+                    }
+                }
+
+                if (s == null) s = String.Empty;
+                int pad = width - s.Length;
+                if (!leftJustify && pad > 0) Append(' ', pad);
+                Append(s);
+                if (leftJustify && pad > 0) Append(' ', pad);
+            }
+            return this;
+        }
+
+        // Returns a reference to the current StringBuilder with all instances of oldString
+        // replaced with newString.  If startIndex and count are specified,
+        // we only replace strings completely contained in the range of startIndex to startIndex +
+        // count.  The strings to be replaced are checked on an ordinal basis (e.g. not culture aware).  If
+        // newValue is null, instances of oldValue are removed (e.g. replaced with nothing.).
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Replace"]/*' />
+        public StringBuilder Replace(String oldValue, String newValue) {
+            return Replace(oldValue, newValue, 0, Length);
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.Replace1"]/*' />
+        public StringBuilder Replace(String oldValue, String newValue, int startIndex, int count)
+        {
+            throw new Exception("System.Text.StringBuilder.Replace not implemented in Bartok");
+        }
+
+        //| <include path='docs/doc[@for="StringBuilder.Equals"]/*' />
+        public bool Equals(StringBuilder sb)
+        {
+            if (sb == null)
+                return false;
+            return ((this.Capacity == sb.Capacity) && (this.MaxCapacity == sb.MaxCapacity) && (this. m_StringValue.Equals(sb. m_StringValue)));
+        }
+
+        // Returns a StringBuilder with all instances of oldChar replaced with
+        // newChar.  The size of the StringBuilder is unchanged because we're only
+        // replacing characters.  If startIndex and count are specified, we
+        // only replace characters in the range from startIndex to startIndex+count
+        //
+        //| <include path='docs/doc[@for="StringBuilder.Replace2"]/*' />
+        public StringBuilder Replace(char oldChar, char newChar) {
+            return Replace(oldChar, newChar, 0, Length);
+        }
+        //| <include path='docs/doc[@for="StringBuilder.Replace3"]/*' />
+        public StringBuilder Replace(char oldChar, char newChar, int startIndex, int count) {
+            int tid;
+            String currentString = GetThreadSafeString(out tid);
+            int currentLength = currentString.Length;
+
+            if ((uint)startIndex > (uint)currentLength) {
+                throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index");
+            }
+
+            if (count<0 || startIndex > currentLength-count) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_Index");
+            }
+
+            if (!NeedsAllocation(currentString,currentLength)) {
+                currentString.ReplaceCharInPlace(oldChar, newChar, startIndex, count, currentLength);
+                ReplaceString(tid,currentString);
+                return this;
+            }
+
+            String newString = GetNewString(currentString,currentLength);
+            newString.ReplaceCharInPlace(oldChar, newChar, startIndex, count, currentLength);
+            ReplaceString(tid,newString);
+            return this;
+        }
+    }
+}
+
+
+
diff --git a/base/Kernel/System/Text/UTF8Encoding.cs b/base/Kernel/System/Text/UTF8Encoding.cs
new file mode 100644
index 0000000..c6f18e2
--- /dev/null
+++ b/base/Kernel/System/Text/UTF8Encoding.cs
@@ -0,0 +1,804 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Text {
+
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    // Encodes text into and out of UTF-8.  UTF-8 is a way of writing
+    // Unicode characters with variable numbers of bytes per character,
+    // optimized for the lower 127 ASCII characters.  It's an efficient way
+    // of encoding US English in an internationalizable way.
+    //
+    // The UTF-8 byte order mark is simply the Unicode byte order mark
+    // (0xFEFF) written in UTF-8 (0xEF 0xBB 0xBF).  The byte order mark is
+    // used mostly to distinguish UTF-8 text from other encodings, and doesn't
+    // switch the byte orderings.
+    //| <include path='docs/doc[@for="UTF8Encoding"]/*' />
+    public class UTF8Encoding : Encoding {
+        /*
+            bytes   bits    UTF-8 representation
+            -----   ----    -----------------------------------
+            1        7      0vvvvvvv
+            2       11      110vvvvv 10vvvvvv
+            3       16      1110vvvv 10vvvvvv 10vvvvvv
+            4       21      11110vvv 10vvvvvv 10vvvvvv 10vvvvvv
+            -----   ----    -----------------------------------
+
+            Surrogate:
+            Real Unicode value = (HighSurrogate - 0xD800) * 0x400 + (LowSurrogate - 0xDC00) + 0x10000
+         */
+
+        private const int UTF8_CODEPAGE=65001;
+
+        // Yes, the idea of emitting U+FEFF as a UTF-8 identifier has made it into
+        // the standard.
+        private bool emitUTF8Identifier;
+
+        private bool isThrowException = false;
+
+        //| <include path='docs/doc[@for="UTF8Encoding.UTF8Encoding"]/*' />
+        public UTF8Encoding(): this(false) {
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.UTF8Encoding1"]/*' />
+        public UTF8Encoding(bool encoderShouldEmitUTF8Identifier):
+            this(encoderShouldEmitUTF8Identifier, false) {
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.UTF8Encoding2"]/*' />
+        public UTF8Encoding(bool encoderShouldEmitUTF8Identifier, bool throwOnInvalidBytes):
+            base(UTF8_CODEPAGE) {
+            this.emitUTF8Identifier = encoderShouldEmitUTF8Identifier;
+            this.isThrowException = throwOnInvalidBytes;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetByteCount"]/*' />
+        public override int GetByteCount(char[] chars, int index, int count) {
+            return (GetByteCount(chars, index, count, null));
+        }
+
+        internal unsafe int GetByteCount(char[] chars, int index, int count, UTF8Encoder encoder) {
+            if (chars == null) {
+                throw new ArgumentNullException("chars",
+                    "ArgumentNull_Array");
+            }
+            if (index < 0 || count < 0) {
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - index < count) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCountBuffer");
+            }
+
+            int retVal = -1;
+            if (chars.Length == 0) {
+                return 0;
+            }
+
+            fixed (char *p = chars) {
+                retVal = GetByteCount(p, index, count, encoder);
+            }
+            Debug.Assert(retVal!=-1, "[UTF8Encoding.GetByteCount]retVal!=-1");
+            return retVal;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetByteCount1"]/*' />
+        public unsafe override int GetByteCount(String chars) {
+            if (chars==null)
+                throw new ArgumentNullException("chars");
+            int retVal = -1;
+            fixed (char *p = chars) {
+                retVal = GetByteCount(p, 0, chars.Length, null);
+            }
+
+            Debug.Assert(retVal!=-1, "[UTF8Encoding.GetByteCount]retVal!=-1");
+            return retVal;
+        }
+
+        internal unsafe int GetByteCount(char *chars, int index, int count, UTF8Encoder encoder) {
+
+            Debug.Assert(chars!=null, "[UTF8Encoding.GetByteCount]chars!=null");
+
+            int end = index + count;
+            int byteCount = 0;
+
+            bool inSurrogate;
+
+            if (encoder == null || !encoder.storedSurrogate) {
+                inSurrogate = false;
+            }
+            else {
+                inSurrogate = true;
+            }
+
+            while (index < end && byteCount >= 0) {
+                char ch = chars[index++];
+
+                if (inSurrogate) {
+                    //
+                    // In previous char, we encounter a high surrogate, so we are expecting a low surrogate here.
+                    //
+                    if (CharacterInfo.IsLowSurrogate(ch)) {
+                        inSurrogate = false;
+                        //
+                        // One surrogate pair will be translated into 4 bytes UTF8.
+                        //
+                        byteCount += 4;
+                    }
+                    else if (CharacterInfo.IsHighSurrogate(ch)) {
+                        // We have two high surrogates.
+                        if (isThrowException) {
+                            throw new ArgumentException("Argument_InvalidHighSurrogate");
+                        }
+                        // Encode the previous high-surrogate char.
+                        byteCount += 3;
+                        // The isSurrogate is still true, because this could be the start of another valid surrogate pair.
+                    } else {
+                        if (isThrowException) {
+                            throw new ArgumentException("Argument_InvalidHighSurrogate");
+                        }
+                        // Encode the previous high-surrogate char.
+                        byteCount += 3;
+                        // Not a surrogate. Put the char back so that we can restart the encoding.
+                        inSurrogate = false;
+                        index--;
+                    }
+                } else if (ch < 0x0080)
+                    byteCount++;
+                else if (ch < 0x0800) {
+                    byteCount += 2;
+                } else {
+                    if (CharacterInfo.IsHighSurrogate(ch)) {
+                        //
+                        // Found the start of a surrogate.
+                        //
+                        inSurrogate = true;
+                    }
+                    else if (CharacterInfo.IsLowSurrogate(ch) && isThrowException) {
+                        //
+                        // Found a low surrogate without encountering a high surrogate first.
+                        //
+                        throw new ArgumentException("Argument_InvalidLowSurrogate");
+                    }
+                    else {
+                        byteCount += 3;
+                    }
+                }
+            }
+
+            // Check for overflows.
+            if (byteCount < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_GetByteCountOverflow");
+
+            if (inSurrogate) {
+                if (encoder == null || encoder.mustFlush) {
+                    if (isThrowException) {
+                        throw new ArgumentException("Argument_InvalidHighSurrogate");
+                    }
+                    byteCount += 3;
+                }
+            }
+            return byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetBytes"]/*' />
+        public override int GetBytes(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex) {
+            return GetBytes(chars, charIndex, charCount, bytes, byteIndex, null);
+        }
+
+        private void EncodeThreeBytes(int ch, byte[] bytes, ref int byteIndex) {
+            bytes[byteIndex++] = (byte)(0xE0 | ch >> 12 & 0x0F);
+            bytes[byteIndex++] = (byte)(0x80 | ch >> 6 & 0x3F);
+            bytes[byteIndex++] = (byte)(0x80 | ch & 0x3F);
+        }
+
+        private unsafe int GetBytes(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex, UTF8Encoder encoder) {
+            if (chars == null || bytes == null) {
+                throw new ArgumentNullException((chars == null ? "chars" : "bytes"),
+                      "ArgumentNull_Array");
+            }
+            if (charIndex < 0 || charCount < 0) {
+                throw new ArgumentOutOfRangeException((charIndex<0 ? "charIndex" : "charCount"),
+                      "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - charIndex < charCount) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            if (byteIndex < 0 || byteIndex > bytes.Length) {
+                throw new ArgumentOutOfRangeException("byteIndex",
+                     "ArgumentOutOfRange_Index");
+            }
+
+            int retVal = -1;
+            if (chars.Length==0) {
+                return 0;
+            }
+            fixed (char *p = chars) {
+                retVal = GetBytes(p, charIndex, charCount, bytes, byteIndex, encoder);
+            }
+            Debug.Assert(retVal!=-1, "[UTF8Encoding.GetByteCount]retVal!=-1");
+            return retVal;
+        }
+
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetBytes2"]/*' />
+        public override byte[] GetBytes(String s) {
+            if (s == null) {
+                throw new ArgumentNullException("s",
+                    "ArgumentNull_String");
+            }
+            int byteLen = GetByteCount(s);
+            byte[] bytes = new byte[byteLen];
+            GetBytes(s, 0, s.Length, bytes, 0);
+            return bytes;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetBytes1"]/*' />
+        public unsafe override int GetBytes(String s, int charIndex, int charCount, byte[] bytes, int byteIndex) {
+            if (s == null || bytes == null) {
+                throw new ArgumentNullException((s == null ? "s" : "bytes"),
+                    "ArgumentNull_String");
+            }
+
+            if (charIndex < 0 || charCount < 0) {
+                throw new ArgumentOutOfRangeException((charIndex<0 ? "charIndex" : "charCount"),
+                      "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (s.Length - charIndex < charCount) {
+                throw new ArgumentOutOfRangeException("s",
+                      "ArgumentOutOfRange_IndexCount");
+            }
+            if (byteIndex < 0 || byteIndex > bytes.Length) {
+                throw new ArgumentOutOfRangeException("byteIndex",
+                     "ArgumentOutOfRange_Index");
+            }
+
+            int retVal = -1;
+            fixed (char *p = s) {
+                retVal = GetBytes(p, charIndex, charCount, bytes, byteIndex, null);
+            }
+            Debug.Assert(retVal!=-1, "[UTF8Encoding.GetByteCount]retVal!=-1");
+            return retVal;
+        }
+
+        private unsafe int GetBytes(char *chars, int charIndex, int charCount, byte[] bytes, int byteIndex, UTF8Encoder encoder) {
+            Debug.Assert(chars!=null, "[UTF8Encoding.GetBytes]chars!=null");
+
+            int charEnd = charIndex + charCount;
+            int byteStart = byteIndex;
+
+            int surrogateChar;
+            if (encoder == null || !encoder.storedSurrogate) {
+                surrogateChar = -1;
+            }
+            else {
+                surrogateChar = encoder.surrogateChar;
+                encoder.storedSurrogate = false;
+            }
+
+            try {
+                while (charIndex < charEnd) {
+                    char ch = chars[charIndex++];
+                    //
+                    // In previous byte, we encounter a high surrogate, so we are expecting a low surrogate here.
+                    //
+                    if (surrogateChar > 0) {
+                        if (CharacterInfo.IsLowSurrogate(ch)) {
+                            // We have a complete surrogate pair.
+                            surrogateChar = (surrogateChar - CharacterInfo.HIGH_SURROGATE_START) << 10;    // (ch - 0xd800) * 0x400
+                            surrogateChar += (ch - CharacterInfo.LOW_SURROGATE_START);
+                            surrogateChar += 0x10000;
+                            bytes[byteIndex++] = (byte)(0xF0 | (surrogateChar >> 18) & 0x07);
+                            bytes[byteIndex++] = (byte)(0x80 | (surrogateChar >> 12) & 0x3F);
+                            bytes[byteIndex++] = (byte)(0x80 | (surrogateChar >> 6) & 0x3F);
+                            bytes[byteIndex++] = (byte)(0x80 | surrogateChar & 0x3F);
+                            surrogateChar = -1;
+                        } else if (CharacterInfo.IsHighSurrogate(ch)) {
+                            // We have two high surrogate.
+                            if (isThrowException) {
+                                throw new ArgumentException("Argument_InvalidHighSurrogate");
+                            }
+                            // Encode the previous high-surrogate char.
+                            EncodeThreeBytes(surrogateChar, bytes, ref byteIndex);
+                            surrogateChar = ch;
+                        } else {
+                            if (isThrowException) {
+                                throw new ArgumentException("Argument_InvalidHighSurrogate");
+                            }
+
+                            // Encode the previous high-surrogate char.
+                            EncodeThreeBytes(surrogateChar, bytes, ref byteIndex);
+                            // Not a surrogate. Put the char back so that we can restart the encoding.
+                            surrogateChar = -1;
+                            charIndex--;
+                        }
+                    } else if (ch < 0x0080) {
+                        bytes[byteIndex++] = (byte)ch;
+                    } else if (ch < 0x0800) {
+                        bytes[byteIndex++] = (byte)(0xC0 | ch >> 6 & 0x1F);
+                        bytes[byteIndex++] = (byte)(0x80 | ch & 0x3F);
+                    } else if (CharacterInfo.IsHighSurrogate(ch)) {
+                        //
+                        // Found the start of a surrogate.
+                        //
+                        surrogateChar = ch;
+                    } else if (CharacterInfo.IsLowSurrogate(ch) && isThrowException) {
+                        throw new ArgumentException("Argument_InvalidLowSurrogate");
+                    } else { //we now know that the char is >=0x0800 and isn't a high surrogate
+                        bytes[byteIndex++] = (byte)(0xE0 | ch >> 12 & 0x0F);
+                        bytes[byteIndex++] = (byte)(0x80 | ch >> 6 & 0x3F);
+                        bytes[byteIndex++] = (byte)(0x80 | ch & 0x3F);
+                    }
+                }
+                if (surrogateChar > 0) {
+                    if (encoder != null && !encoder.mustFlush) {
+                        encoder.surrogateChar = surrogateChar;
+                        encoder.storedSurrogate = true;
+                    }
+                    else {
+                        if (isThrowException) {
+                            throw new ArgumentException("Argument_InvalidHighSurrogate");
+                        }
+                        EncodeThreeBytes(surrogateChar, bytes, ref byteIndex);
+                    }
+                }
+            } catch (IndexOutOfRangeException) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+
+            return byteIndex - byteStart;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetCharCount"]/*' />
+        public override int GetCharCount(byte[] bytes, int index, int count) {
+            return GetCharCount(bytes, index, count, null);
+        }
+
+        internal virtual int GetCharCount(byte[] bytes, int index, int count, UTF8Decoder decoder) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                    "ArgumentNull_Array");
+            }
+            if (index < 0 || count < 0) {
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (bytes.Length - index < count) {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            int charCount = 0;
+            int trailCount = 0;
+
+            // Indicate the current chunk of bytes is a 2-byte, 3-byte or 4-byte UTF8 sequence.
+            // This is used to detect non-shortest form.
+            // It will be reset to 0 when the 2nd byte of the UTF8 sequence is read, so that
+            // we don't check for non-shortest form again.
+            int byteSequence = 0;
+            bool isSurrogate = false;
+            int bits = 0;
+            if (decoder != null) {
+                trailCount = decoder.trailCount;
+                isSurrogate = decoder.isSurrogate;
+                byteSequence = decoder.byteSequence;
+                bits = decoder.bits;
+            }
+
+            int end = index + count;
+            while (index < end) {
+                byte b = bytes[index++];
+                if (trailCount == 0) {
+                    if ((b & 0x80) == 0) {
+                        // This is an ASCII.
+                        charCount++;
+                    } else {
+                        byte temp = b;
+                        while ((temp & 0x80) != 0) {
+                            temp <<= 1;
+                            trailCount++;
+                        }
+                        switch (trailCount) {
+                            case 1:
+                                trailCount = 0;
+                                break;
+                            case 2:
+                                // Make sure that bit 8 ~ bit 11 is not all zero.
+                                // 110XXXXx 10xxxxxx
+                                if ((b & 0x1e) == 0) {
+                                    trailCount = 0;
+                                }
+                                break;
+                            case 3:
+                                byteSequence = 3;
+                                break;
+                            case 4:
+                                isSurrogate = true;
+                                byteSequence = 4;
+                                break;
+                            default:
+                                trailCount = 0;
+                                break;
+                        }
+                        if (trailCount == 0) {
+                            if (isThrowException) {
+                                throw new ArgumentException("Argument_InvalidByteSequence");
+                            }
+                        } else {
+                            bits = temp >> trailCount;
+                            trailCount--;
+                        }
+                    }
+                } else {
+                    // We are expecting to see trailing bytes like 10vvvvvv
+                    if ((b & 0xC0) != 0x80) {
+                        // If not, this is NOT a valid sequence.
+                        if (isThrowException) {
+                            throw new ArgumentException("Argument_InvalidByteSequence");
+                        }
+                        index--;
+                        trailCount = 0;
+                        isSurrogate = false;
+                    } else {
+                        switch (byteSequence) {
+                            case 3:
+                                // Check 3-byte sequence for non-shortest form.
+                                // 1110XXXX 10Xxxxxx 10xxxxxx
+                                if (bits == 0 && (b & 0x20) == 0) {
+                                    if (isThrowException) {
+                                        throw new ArgumentException("Argument_InvalidByteSequence");
+                                    }
+                                    trailCount = -1;
+                                }
+                                // We are done checking the non-shortest form, reset byteSequence to 0, so that we don't
+                                // do the extra check for the remaining byte of the 3-byte chunk.
+                                byteSequence = 0;
+                                break;
+                            case 4:
+                                // Check 4-byte sequence for non-shortest form.
+                                // 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx
+                                if (bits == 0) {
+                                    if ((b & 0x30) == 0) {
+                                        if (isThrowException) {
+                                            throw new ArgumentException("Argument_InvalidByteSequence");
+                                        }
+                                        trailCount = -1;
+                                    }
+                                } else if ((bits & 0x04) != 0) {
+                                    // Make sure that the resulting Unicode is within the valid surrogate range.
+                                    // The 4 byte code sequence can hold up to 21 bits, and the maximum valid code point range
+                                    // that Unicode (with surrogate) could represent are from U+000000 ~ U+10FFFF.
+                                    // Therefore, if the 21 bit (the most significant bit) is 1, we should verify that the 17 ~ 20
+                                    // bit are all zero.
+                                    // I.e., in 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx,
+                                    // XXXXX can only be 10000.
+                                    if ((bits & 0x03) != 0 || (b & 0x30) != 0) {
+                                        if (isThrowException) {
+                                            throw new ArgumentException("Argument_InvalidByteSequence");
+                                        }
+                                        trailCount = -1;
+                                    }
+                                }
+                                byteSequence = 0;
+                                break;
+                        }
+
+                        if (--trailCount == 0) {
+                            charCount++;
+                            if (isSurrogate) {
+                                charCount++;
+                                isSurrogate = false;
+                            }
+                        }
+                    }
+                }
+            }
+            return charCount;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetChars"]/*' />
+        public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+            char[] chars, int charIndex) {
+            return GetChars(bytes, byteIndex, byteCount, chars, charIndex, null);
+        }
+
+
+        internal virtual int GetChars(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex, UTF8Decoder decoder) {
+            if (bytes == null || chars == null) {
+                throw new ArgumentNullException(bytes == null ? "bytes" : "chars",
+                    "ArgumentNull_Array");
+            }
+            if (byteIndex < 0 || byteCount < 0) {
+                throw new ArgumentOutOfRangeException((byteIndex<0 ? "byteIndex" : "byteCount"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if ( bytes.Length - byteIndex < byteCount)
+            {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            if (charIndex < 0 || charIndex > chars.Length) {
+                throw new ArgumentOutOfRangeException("charIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            int bits = 0;
+            int trailCount = 0;
+            bool isSurrogate = false;
+
+            // Indicate the current chunk of bytes is a 2-byte, 3-byte or 4-byte UTF8 sequence.
+            // This is used to detect non-shortest form.
+            // It will be reset to 0 when the 2nd byte of the UTF8 sequence is read, so that
+            // we don't check for non-shortest form again.
+            int byteSequence = 0;
+            if (decoder != null) {
+                bits = decoder.bits;
+                trailCount = decoder.trailCount;
+                isSurrogate = decoder.isSurrogate;
+                byteSequence = decoder.byteSequence;
+            }
+            int byteEnd = byteIndex + byteCount;
+            int charStart = charIndex;
+            try {
+                while (byteIndex < byteEnd) {
+                    byte b = bytes[byteIndex++];
+                    if (trailCount == 0) {
+                        //
+                        // We are not at a trailing byte.
+                        //
+                        if ((b & 0x80) == 0) {
+                            // This is the ASCII case.
+                            //   1        7      0vvvvvvv
+                            //
+                            // Found an ASCII character.
+                            //
+                            chars[charIndex++] = (char)b;
+                        } else {
+                            // Check if this is a valid starting byte.
+                            byte temp = (byte)b;
+                            while ((temp & 0x80) != 0) {
+                                temp <<= 1;
+                                trailCount++;
+                            }
+                            switch (trailCount) {
+                                case 1:
+                                    trailCount = 0;
+                                    break;
+                                case 2:
+                                    // Make sure that bit 8 ~ bit 11 is not all zero.
+                                    // 110XXXXx 10xxxxxx
+                                    if ((b & 0x1e) == 0) {
+                                        trailCount = 0;
+                                    }
+                                    break;
+                                case 3:
+                                    byteSequence = 3;
+                                    break;
+                                case 4:
+                                    //
+                                    // This is a surrogate unicode pair
+                                    //
+                                    byteSequence = 4;
+                                    break;
+                                default:
+                                    trailCount = 0;
+                                    break;
+                            }
+                            if (trailCount == 0) {
+                                if (isThrowException) {
+                                    throw new ArgumentException("Argument_InvalidByteSequence");
+                                }
+                            } else {
+                                isSurrogate = (trailCount == 4);
+                                bits = temp >> trailCount;
+                                trailCount--;
+                        }
+                    }
+                    } else {
+                        // We are expecting to see bytes like 10vvvvvv
+                        if ((b & 0xC0) != 0x80) {
+                            // If not, this is NOT a valid sequence.
+                            if (isThrowException) {
+                                throw new ArgumentException("Argument_InvalidByteSequence");
+                            }
+                            // At this point, we are seeing an invalid trailing byte.
+                            // However, this can be a valid starting byte for another UTF8 byte sequence (e.g.
+                            // this character could be under 0x7f, or a valid leading byte like 110xxxxx).
+                            // So let's put the current byte back, and try to see if this is a valid byte
+                            // for another UTF8 byte sequence.
+                            byteIndex--;
+                            bits = 0;
+                            trailCount = 0;
+                        } else {
+                            switch (byteSequence) {
+                                case 3:
+                                    // Check 3-byte sequence for non-shortest form.
+                                    // 1110XXXX 10Xxxxxx 10xxxxxx
+                                    if (bits == 0 && (b & 0x20) == 0) {
+                                        if (isThrowException) {
+                                            throw new ArgumentException("Argument_InvalidByteSequence");
+                                        }
+                                        trailCount = -1;
+                                    }
+                                    // Rest byteSequence to zero since we are done with non-shortest form check.
+                                    byteSequence = 0;
+                                    break;
+                                case 4:
+                                    // Check 4-byte sequence for non-shortest form.
+                                    // 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx
+                                    if (bits == 0) {
+                                        if ((b & 0x30) == 0) {
+                                            if (isThrowException) {
+                                                throw new ArgumentException("Argument_InvalidByteSequence");
+                                            }
+                                            trailCount = -1;
+                                        }
+                                    } else if ((bits & 0x04) != 0) {
+                                        // Make sure that the resulting Unicode is within the valid surrogate range.
+                                        // The 4 byte code sequence can hold up to 21 bits, and the maximum valid code point range
+                                        // that Unicode (with surrogate) could represent are from U+000000 ~ U+10FFFF.
+                                        // Therefore, if the 21 bit (the most significant bit) is 1, we should verify that the 17 ~ 20
+                                        // bit are all zero.
+                                        // I.e., in 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx,
+                                        // XXXXX can only be 10000.
+                                        if ((bits & 0x03) != 0 || (b & 0x30) != 0) {
+                                            if (isThrowException) {
+                                                throw new ArgumentException("Argument_InvalidByteSequence");
+                                            }
+                                            trailCount = -1;
+                                        }
+                                    }
+                                    byteSequence = 0;
+                                    break;
+                            }
+                            if (--trailCount >= 0) {
+                                bits = bits << 6 | (b & 0x3F);
+                                if (trailCount == 0) {
+                                    if (!isSurrogate) {
+                                        chars[charIndex++] = (char)bits;
+                                    }
+                                    else {
+                                        //
+                                        // bits >= 0x10000, use surrogate.
+                                        //
+                                        chars[charIndex++] = (char)(0xD7C0 + (bits >> 10));
+                                        chars[charIndex++] = (char)(CharacterInfo.LOW_SURROGATE_START + (bits & 0x3FF));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (IndexOutOfRangeException) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+            if (decoder != null) {
+                decoder.bits = bits;
+                decoder.trailCount = trailCount;
+                decoder.isSurrogate = isSurrogate;
+                decoder.byteSequence = byteSequence;
+            }
+            return charIndex - charStart;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetDecoder"]/*' />
+        public override Decoder GetDecoder() {
+            return new UTF8Decoder(this);
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetEncoder"]/*' />
+        public override Encoder GetEncoder() {
+            return new UTF8Encoder(this);
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetMaxByteCount"]/*' />
+        public override int GetMaxByteCount(int charCount) {
+            if (charCount < 0) {
+               throw new ArgumentOutOfRangeException("charCount",
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            long byteCount = (long)charCount * 4;
+            if (byteCount > 0x7fffffff)
+                throw new ArgumentOutOfRangeException("charCount", "ArgumentOutOfRange_GetByteCountOverflow");
+            return (int)byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetMaxCharCount"]/*' />
+        public override int GetMaxCharCount(int byteCount) {
+            if (byteCount < 0) {
+               throw new ArgumentOutOfRangeException("byteCount",
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            return byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetPreamble"]/*' />
+        public override byte[] GetPreamble()
+        {
+            if (emitUTF8Identifier) {
+                // Allocate new array to prevent users from modifying it.
+                return new byte[3] { 0xEF, 0xBB, 0xBF };
+            }
+            else
+                return Encoding.emptyByteArray;
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.Equals"]/*' />
+        public override bool Equals(Object value) {
+            UTF8Encoding that = value as UTF8Encoding;
+            if (that != null) {
+                return (emitUTF8Identifier == that.emitUTF8Identifier);
+            }
+            return (false);
+        }
+
+        //| <include path='docs/doc[@for="UTF8Encoding.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            //Not great distribution, but this is relatively unlikely to be used as the key in a hashtable.
+            return UTF8_CODEPAGE + (isThrowException?1:0) + (emitUTF8Identifier?1:0);
+        }
+
+        internal class UTF8Encoder : Encoder
+        {
+            private UTF8Encoding encoding;
+            // We must save a high surrogate value until the next call, looking
+            // for a low surrogate value.  surrogateChar is the bitshifted value,
+            // which can validly be 0.  Since it can be 0, we need storedSurrogate.
+            internal int surrogateChar;
+            internal bool storedSurrogate;
+            // The mustFlush parameter means whether we should throw for a dangling
+            // high surrogate at the end of the char[].  It is only true when
+            // the user of this encoding is writing the last block.
+            internal bool mustFlush;
+
+            public UTF8Encoder(UTF8Encoding encoding) {
+                this.encoding = encoding;
+                surrogateChar = 0;
+                storedSurrogate = false;
+            }
+
+            public override int GetByteCount(char[] chars, int index, int count, bool flush) {
+                mustFlush = flush;
+                return encoding.GetByteCount(chars, index, count, this);
+            }
+
+            public override int GetBytes(char[] chars, int charIndex, int charCount,
+                byte[] bytes, int byteIndex, bool flush) {
+                mustFlush = flush;
+                return encoding.GetBytes(chars, charIndex, charCount, bytes, byteIndex, this);
+            }
+        }
+
+        internal class UTF8Decoder : Decoder
+        {
+            private UTF8Encoding encoding;
+            internal int bits;
+            internal int trailCount;
+            // We need to maintain the status that if we are decoding a surrogate (which has 4-byte UTF8), so
+            // that GetCharCount() can generate correct char count.
+            // The flag is needed because GetCharCount(), unlike GetChars(), does not really calculate the bits, so it has no way
+            // to know if the decoder bytes is a surrogate or not.
+            internal bool isSurrogate;
+            internal int byteSequence;
+
+            public UTF8Decoder(UTF8Encoding encoding) {
+                this.encoding = encoding;
+            }
+
+            //| <include path='docs/doc[@for="UTF8Encoding.UTF8Decoder.GetCharCount"]/*' />
+            public override int GetCharCount(byte[] bytes, int index, int count) {
+                return encoding.GetCharCount(bytes, index, count, this);
+            }
+
+            public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+                char[] chars, int charIndex) {
+                return encoding.GetChars(bytes, byteIndex, byteCount, chars,
+                    charIndex, this);
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Text/UnicodeEncoding.cs b/base/Kernel/System/Text/UnicodeEncoding.cs
new file mode 100644
index 0000000..24c5b2b
--- /dev/null
+++ b/base/Kernel/System/Text/UnicodeEncoding.cs
@@ -0,0 +1,361 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Text {
+    using System;
+    //| <include path='docs/doc[@for="UnicodeEncoding"]/*' />
+    public class UnicodeEncoding : Encoding
+    {
+        internal bool bigEndian;
+        internal bool byteOrderMark;
+
+        // Unicode version 2.0 character size in bytes
+        //| <include path='docs/doc[@for="UnicodeEncoding.CharSize"]/*' />
+        public const int CharSize = 2;
+
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.UnicodeEncoding"]/*' />
+        public UnicodeEncoding()
+            : this(false, true) {
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.UnicodeEncoding1"]/*' />
+        public UnicodeEncoding(bool bigEndian, bool byteOrderMark)
+            : base(bigEndian? 1201 : 1200) { //Set the data item.
+            this.bigEndian = bigEndian;
+            this.byteOrderMark = byteOrderMark;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetByteCount"]/*' />
+        public override int GetByteCount(char[] chars, int index, int count) {
+            if (chars == null) {
+                throw new ArgumentNullException("chars",
+                    "ArgumentNull_Array");
+            }
+            if (index < 0 || count < 0) {
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - index < count) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCountBuffer");
+            }
+
+            int byteCount = count * CharSize;
+            // check for overflow
+            if (byteCount < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_GetByteCountOverflow");
+            return byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetByteCount1"]/*' />
+        public override int GetByteCount(String s)
+        {
+            if (s==null)
+                throw new ArgumentNullException("s");
+
+            int byteCount = s.Length * CharSize;
+            // check for overflow
+            if (byteCount < 0)
+                throw new ArgumentOutOfRangeException("s", "ArgumentOutOfRange_GetByteCountOverflow");
+
+            return byteCount;
+        }
+
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetBytes"]/*' />
+        public override int GetBytes(char[] chars, int charIndex, int charCount,
+            byte[] bytes, int byteIndex) {
+            int byteCount = charCount * CharSize;
+            if (chars == null || bytes == null) {
+                throw new ArgumentNullException((chars == null ? "chars" : "bytes"),
+                      "ArgumentNull_Array");
+            }
+            if (charIndex < 0 || charCount < 0) {
+                throw new ArgumentOutOfRangeException((charIndex<0 ? "charIndex" : "charCount"),
+                      "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (chars.Length - charIndex < charCount) {
+                throw new ArgumentOutOfRangeException("chars",
+                      "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            if (byteIndex < 0 || byteIndex > bytes.Length) {
+                throw new ArgumentOutOfRangeException("byteIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            if (bytes.Length - byteIndex < byteCount) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+            if (bigEndian) {
+                int charEnd = charIndex + charCount;
+                while (charIndex < charEnd) {
+                    char ch = chars[charIndex++];
+                    bytes[byteIndex++] = (byte)(ch >> 8);
+                    bytes[byteIndex++] = (byte)ch;
+                }
+            }
+            else {
+                Buffer.InternalBlockCopy(chars, charIndex * CharSize, bytes, byteIndex, byteCount);
+            }
+            return byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetBytes2"]/*' />
+        public override byte[] GetBytes(String s) {
+            if (s == null) {
+                throw new ArgumentNullException("s",
+                    "ArgumentNull_String");
+            }
+            int byteLen = GetByteCount(s);
+            byte[] bytes = new byte[byteLen];
+            GetBytes(s, 0, s.Length, bytes, 0);
+            return bytes;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetBytes1"]/*' />
+        public override int GetBytes(String s, int charIndex, int charCount,
+            byte[] bytes, int byteIndex) {
+            int byteCount = charCount * CharSize;
+            if (s == null || bytes == null) {
+                throw new ArgumentNullException((s == null ? "s" : "bytes"),
+                      "ArgumentNull_Array");
+            }
+            if (charIndex < 0 || charCount < 0) {
+                throw new ArgumentOutOfRangeException((charIndex<0 ? "charIndex" : "charCount"),
+                      "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (s.Length - charIndex < charCount) {
+                throw new ArgumentOutOfRangeException("s",
+                      "ArgumentOutOfRange_IndexCount");
+            }
+            if (byteIndex < 0 || byteIndex > bytes.Length) {
+                throw new ArgumentOutOfRangeException("byteIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            if (bytes.Length - byteIndex < byteCount) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+            if (bigEndian) {
+                int charEnd = charIndex + charCount;
+                while (charIndex < charEnd) {
+                    char ch = s[charIndex++];
+                    bytes[byteIndex++] = (byte)(ch >> 8);
+                    bytes[byteIndex++] = (byte)ch;
+                }
+            }
+            else {
+                // @TODO: Consider pinning the String here and then using a managed
+                // memcpy implementation (see VTable).  This would
+                // require a C# compiler that can get an interior pointer to a
+                // String, probably via the fixed statement.  -- BrianGru, 12/6/2000
+                s.CopyToByteArray(charIndex, bytes, byteIndex, charCount);
+            }
+            return byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetCharCount"]/*' />
+        public override int GetCharCount(byte[] bytes, int index, int count) {
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes",
+                    "ArgumentNull_Array");
+            }
+            if (index < 0 || count < 0) {
+                throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if ( bytes.Length - index < count)
+            {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            return (count / CharSize);
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetChars"]/*' />
+        public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+            char[] chars, int charIndex) {
+            int charCount = byteCount / CharSize;
+            if (bytes == null || chars == null) {
+                throw new ArgumentNullException((bytes == null ? "bytes" : "chars"),
+                    "ArgumentNull_Array");
+            }
+            if (byteIndex < 0 || byteCount < 0) {
+                throw new ArgumentOutOfRangeException((byteIndex<0 ? "byteIndex" : "byteCount"),
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if ( bytes.Length - byteIndex < byteCount)
+            {
+                throw new ArgumentOutOfRangeException("bytes",
+                    "ArgumentOutOfRange_IndexCountBuffer");
+            }
+            if (charIndex < 0 || charIndex > chars.Length) {
+                throw new ArgumentOutOfRangeException("charIndex",
+                    "ArgumentOutOfRange_Index");
+            }
+            if (chars.Length - charIndex < charCount) {
+                throw new ArgumentException("Argument_ConversionOverflow");
+            }
+
+            byteCount = charCount * CharSize;
+            if (bigEndian) {
+                int byteEnd = byteIndex + byteCount;
+                while (byteIndex < byteEnd) {
+                    int hi = bytes[byteIndex++];
+                    int lo = bytes[byteIndex++];
+                    chars[charIndex++] = (char)(hi << 8 | lo);
+                }
+            }
+            else {
+                Buffer.InternalBlockCopy(bytes, byteIndex, chars, charIndex * CharSize, byteCount);
+            }
+            return charCount;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetDecoder"]/*' />
+        public override System.Text.Decoder GetDecoder() {
+            return new Decoder(this);
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetPreamble"]/*' />
+        public override byte[] GetPreamble()
+        {
+            if (byteOrderMark) {
+                // Note - we must allocate new byte[]'s here to prevent someone
+                // from modifying a cached byte[].
+                if (bigEndian)
+                    return new byte[2] { 0xfe, 0xff };
+                else
+                    return new byte[2] { 0xff, 0xfe };
+            }
+            return emptyByteArray;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetMaxByteCount"]/*' />
+        public override int GetMaxByteCount(int charCount) {
+            if (charCount < 0) {
+               throw new ArgumentOutOfRangeException("charCount",
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            long byteCount = (long)charCount * CharSize;
+            if (byteCount > 0x7fffffff)
+                throw new ArgumentOutOfRangeException("charCount", "ArgumentOutOfRange_GetByteCountOverflow");
+            return (int)byteCount;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetMaxCharCount"]/*' />
+        public override int GetMaxCharCount(int byteCount) {
+            if (byteCount < 0) {
+               throw new ArgumentOutOfRangeException("byteCount",
+                    "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            long result = ((long)byteCount + 1) / CharSize;
+            if (result > 0x7fffffff) {
+                throw new ArgumentOutOfRangeException("byteCount", "ArgumentOutOfRange_GetCharCountOverflow");
+            }
+            return (int)result;
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.Equals"]/*' />
+        public override bool Equals(Object value) {
+            UnicodeEncoding uenc = value as UnicodeEncoding;
+            if (uenc != null) {
+                //
+                // Big Endian Unicode has different code page (1201) than small Endian one (1200),
+                // so we still have to check m_codePage here.
+                //
+                return (m_codePage == uenc.m_codePage &&
+                        byteOrderMark == uenc.byteOrderMark);
+            }
+            return (false);
+        }
+
+        //| <include path='docs/doc[@for="UnicodeEncoding.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            return m_codePage;
+        }
+
+        private class Decoder : System.Text.Decoder
+        {
+            private bool bigEndian;
+            private int lastByte;
+
+            public Decoder(UnicodeEncoding encoding) {
+                bigEndian = encoding.bigEndian;
+                lastByte = -1;
+            }
+
+            public override int GetCharCount(byte[] bytes, int index, int count) {
+                if (bytes == null) {
+                    throw new ArgumentNullException("bytes",
+                        "ArgumentNull_Array");
+                }
+                if (index < 0 || count < 0) {
+                    throw new ArgumentOutOfRangeException((index<0 ? "index" : "count"),
+                        "ArgumentOutOfRange_NeedNonNegNum");
+                }
+                if (bytes.Length - index < count) {
+                    throw new ArgumentOutOfRangeException("bytes",
+                        "ArgumentOutOfRange_IndexCountBuffer");
+                }
+                if (lastByte >= 0) count++;
+                return count / CharSize;
+            }
+
+            public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+                char[] chars, int charIndex) {
+                if (bytes == null || chars == null) {
+                    throw new ArgumentNullException((bytes == null ? "bytes" : "chars"),
+                        "ArgumentNull_Array");
+                }
+                if (byteIndex < 0 || byteCount < 0) {
+                    throw new ArgumentOutOfRangeException((byteIndex<0 ? "byteIndex" : "byteCount"),
+                        "ArgumentOutOfRange_NeedNonNegNum");
+                }
+                if (bytes.Length - byteIndex < byteCount)
+                {
+                    throw new ArgumentOutOfRangeException("bytes",
+                        "ArgumentOutOfRange_IndexCountBuffer");
+                }
+                if (charIndex < 0 || charIndex > chars.Length) {
+                    throw new ArgumentOutOfRangeException("charIndex",
+                        "ArgumentOutOfRange_Index");
+                }
+                int charCount = GetCharCount(bytes, byteIndex, byteCount);
+                if (chars.Length - charIndex < charCount) {
+                    throw new ArgumentException("Argument_ConversionOverflow");
+                }
+
+                if (lastByte >= 0) {
+                    if (byteCount == 0) return charCount;
+                    int nextByte = bytes[byteIndex++];
+                    byteCount--;
+                    if (bigEndian) {
+                        chars[charIndex++] = (char)(lastByte << 8 | nextByte);
+                    }
+                    else {
+                        chars[charIndex++] = (char)(nextByte << 8 | lastByte);
+                    }
+                    lastByte = -1;
+                }
+                if ((byteCount & 1) != 0) {
+                    lastByte = bytes[byteIndex + --byteCount];
+                }
+                if (bigEndian) {
+                    int byteEnd = byteIndex + byteCount;
+                    while (byteIndex < byteEnd) {
+                        ushort hi = bytes[byteIndex++];
+                        byte lo = bytes[byteIndex++];
+                        chars[charIndex++] = (char)(hi << 8 | lo);
+                    }
+                }
+                else {
+                    Buffer.InternalBlockCopy(bytes, byteIndex, chars, charIndex * CharSize, byteCount);
+                }
+                return charCount;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/AutoResetEvent.cs b/base/Kernel/System/Threading/AutoResetEvent.cs
new file mode 100644
index 0000000..48ec82d
--- /dev/null
+++ b/base/Kernel/System/Threading/AutoResetEvent.cs
@@ -0,0 +1,169 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AutoResetEvent.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Scheduling;
+
+namespace System.Threading
+{
+    [CLSCompliant(false)]
+    public enum AutoResetEventEvent : ushort
+    {
+        Acquire = 1,
+        Enqueue = 2
+    }
+
+    //| <include path='docs/doc[@for="AutoResetEvent"]/*' />
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public sealed class AutoResetEvent : WaitHandle
+    {
+        //| <include path='docs/doc[@for="AutoResetEvent.AutoResetEvent"]/*' />
+        public AutoResetEvent(bool initialState) :
+            base(initialState ? 1 : 0)
+        {
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEvent.Reset"]/*' />
+        [NoHeapAllocation]
+        public bool Reset()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+#if DEBUG_DISPATCH
+                    DebugStub.Print("Thread {0:x8}  AutoResetEvent.Reset() on {1:x8}\n",
+                                    __arglist(
+                                        Kernel.AddressOf(Thread.CurrentThread),
+                                        Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+                    signaled = 0;
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+            return true;
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEvent.Set"]/*' />
+        [NoHeapAllocation]
+        public bool Set()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    if (NotifyOne()) {
+#if DEBUG_DISPATCH
+                        DebugStub.Print("Thread {0:x8} AutoResetEvent.Set() on {1:x8}" +
+                                        "unblocked  {2:x8}\n",
+                                        __arglist(
+                                            Kernel.AddressOf(Thread.CurrentThread),
+                                            Kernel.AddressOf(this),
+                                            Kernel.AddressOf(owner)));
+#endif // DEBUG_DISPATCH
+                        signaled = 0;
+                    }
+                    else {
+#if DEBUG_DISPATCH
+                        DebugStub.Print("Thread {0:x8} AutoResetEvent.Set() on {1:x8} ready\n",
+                                        __arglist(
+                                            Kernel.AddressOf(Thread.CurrentThread),
+                                            Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+                        signaled = 1;
+                    }
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+            return true;
+        }
+
+        //| <include path='docs/doc[@for="AutoResetEvent.Set"]/*' />
+        public bool SetAll()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    if (NotifyAll()) {
+                        signaled = 0;
+                    }
+                    else {
+                        signaled = 1;
+                    }
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+            return true;
+        }
+
+        // Called with dispatch lock held and interrupts off.
+        // Returns true if the AutoResetEvent was signaled.
+        internal override bool AcquireOrEnqueue(ThreadEntry entry)
+        {
+            if (signaled != 0) {
+#if DEBUG_DISPATCH
+                DebugStub.Print("Thread {0:x8} AutoResetEvent.Acquire on {1:x8}\n",
+                                __arglist(
+                                    Kernel.AddressOf(Thread.CurrentThread),
+                                    Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+                signaled = 0;
+                Monitoring.Log(Monitoring.Provider.AutoResetEvent,
+                               (ushort)AutoResetEventEvent.Acquire, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return true;
+            }
+            else {
+#if DEBUG_DISPATCH
+                DebugStub.Print("Thread {0:x8} AutoResetEvent.Enqueue on {1:x8}\n",
+                                __arglist(
+                                    Kernel.AddressOf(Thread.CurrentThread),
+                                    Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+
+                queue.EnqueueTail(entry);
+                Monitoring.Log(Monitoring.Provider.AutoResetEvent,
+                               (ushort)AutoResetEventEvent.Enqueue, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return false;
+            }
+        }
+
+        // Return thread who could use our priority.
+        [NoHeapAllocation]
+        internal override Thread GetBeneficiary()
+        {
+            return null;
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/HandleCreateException.cs b/base/Kernel/System/Threading/HandleCreateException.cs
new file mode 100644
index 0000000..35dcfe1
--- /dev/null
+++ b/base/Kernel/System/Threading/HandleCreateException.cs
@@ -0,0 +1,24 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Threading
+{
+    public class HandleCreateException : SystemException
+    {
+        public HandleCreateException() : base("Arg_HandleCreateException")
+        {
+        }
+
+        public HandleCreateException(String message) : base(message)
+        {
+        }
+
+        public HandleCreateException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/Interlocked.cs b/base/Kernel/System/Threading/Interlocked.cs
new file mode 100644
index 0000000..274b22d
--- /dev/null
+++ b/base/Kernel/System/Threading/Interlocked.cs
@@ -0,0 +1,167 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System.Threading {
+
+    using System;
+    using System.Runtime.CompilerServices;
+
+#if SINGULARITY_KERNEL
+    using Microsoft.Singularity.Memory;
+#endif
+
+    //| <include path='docs/doc[@for="Interlocked"]/*' />
+    public sealed class Interlocked
+    {
+        private Interlocked() {
+        }
+
+        //| <include path='docs/doc[@for="Interlocked.Increment"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern int Increment(ref int location);
+
+        //| <include path='docs/doc[@for="Interlocked.Decrement"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern int Decrement(ref int location);
+
+        //| <include path='docs/doc[@for="Interlocked.Increment1"]/*' />
+        [NoHeapAllocation]
+        public static long Increment(ref long location) {
+            long value = location;
+            while (CompareExchange(ref location, value+1, value) != value) {
+                value = location;
+            }
+            return value+1;
+        }
+
+        //| <include path='docs/doc[@for="Interlocked.Decrement1"]/*' />
+        [NoHeapAllocation]
+        public static long Decrement(ref long location) {
+            long value = location;
+            while (CompareExchange(ref location, value-1, value) != value) {
+                value = location;
+            }
+            return value-1;
+        }
+
+        [CLSCompliant(false)]
+        [NoHeapAllocation]
+        public static ulong Add(ref ulong location, ulong value)
+        {
+            ulong ov = location;
+            ulong nv = ov + value;
+            while (CompareExchange(ref location, nv, ov) != ov) {
+                ov = location;
+                nv = ov + value;
+            }
+            return nv;
+        }
+
+        //| <include path='docs/doc[@for="Interlocked.Exchange"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern int Exchange(ref int location1, int value);
+
+
+        //| <include path='docs/doc[@for="Interlocked.CompareExchange"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern int CompareExchange(ref int location1, int value, int comparand);
+
+        //| <include path='docs/doc[@for="Interlocked.Exchange1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern float Exchange(ref float location1, float value);
+
+
+        //| <include path='docs/doc[@for="Interlocked.CompareExchange1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern float CompareExchange(ref float location1, float value, float comparand);
+
+        // added for thread initialization.
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern ThreadState CompareExchange(ref ThreadState location1, ThreadState value, ThreadState comparand);
+
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern long CompareExchange(ref long location1, long value, long comparand);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern ulong CompareExchange(ref ulong location1, ulong value, ulong comparand);
+
+
+        //| <include path='docs/doc[@for="Interlocked.Exchange2"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern Object Exchange(ref Object location1, Object value);
+
+        //| <include path='docs/doc[@for="Interlocked.CompareExchange2"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern Object CompareExchange(ref Object location1, Object value, Object comparand);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern uint Exchange(ref uint location1, uint value);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern uint CompareExchange(ref uint location1, uint value, uint comparand);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern UIntPtr Exchange(ref UIntPtr location1, UIntPtr value);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern UIntPtr CompareExchange(ref UIntPtr location1, UIntPtr value, UIntPtr comparand);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern unsafe UIntPtr Exchange(UIntPtr * location1, UIntPtr value);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern unsafe UIntPtr CompareExchange(UIntPtr * location1, UIntPtr value, UIntPtr comparand);
+
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern unsafe void * CompareExchange(ref void * location1, void * value, void * comparand);
+
+#if SINGULARITY_KERNEL
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern unsafe HandleTable.HandlePage * CompareExchange(
+            ref HandleTable.HandlePage * location1,
+            HandleTable.HandlePage * value,
+            HandleTable.HandlePage * comparand);
+
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        internal static extern unsafe HandleTable.HandleEntry * CompareExchange(
+            ref HandleTable.HandleEntry * location1,
+            HandleTable.HandleEntry * value,
+            HandleTable.HandleEntry * comparand);
+#endif
+
+    }
+}
diff --git a/base/Kernel/System/Threading/ManualResetEvent.cs b/base/Kernel/System/Threading/ManualResetEvent.cs
new file mode 100644
index 0000000..dd93931
--- /dev/null
+++ b/base/Kernel/System/Threading/ManualResetEvent.cs
@@ -0,0 +1,109 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Thread.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Scheduling;
+
+namespace System.Threading
+{
+    [CLSCompliant(false)]
+    public enum ManualResetEventEvent : ushort
+    {
+        Acquire = 1,
+        Enqueue = 2
+    }
+
+    //| <include path='docs/doc[@for="ManualResetEvent"]/*' />
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public sealed class ManualResetEvent : WaitHandle
+    {
+        //| <include path='docs/doc[@for="ManualResetEvent.ManualResetEvent"]/*' />
+        public ManualResetEvent(bool initialState)
+            : base(initialState ? 1 : 0)
+        {
+        }
+
+        //| <include path='docs/doc[@for="ManualResetEvent.Reset"]/*' />
+        public bool Reset()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    signaled = 0;
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+            return true;
+        }
+
+        //| <include path='docs/doc[@for="ManualResetEvent.Set"]/*' />
+        public bool Set()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    signaled = 1;
+                    NotifyAll();
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+            return true;
+        }
+
+        // Called with dispatch lock held and interrupts off.
+        // Returns true if the ManuelResetEvent was signaled.
+        internal override bool AcquireOrEnqueue(ThreadEntry entry)
+        {
+#if DEBUG_DISPATCH
+            DebugStub.Print("ManualResetEvent:AcquireOrEnqueue 001\n");
+#endif // DEBUG_DISPATCH
+
+            if (signaled > 0) {
+                Monitoring.Log(Monitoring.Provider.ManualResetEvent,
+                               (ushort)ManualResetEventEvent.Acquire, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return true;
+            }
+            else {
+                queue.EnqueueTail(entry);
+                Monitoring.Log(Monitoring.Provider.ManualResetEvent,
+                               (ushort)ManualResetEventEvent.Enqueue, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return false;
+            }
+        }
+
+        // Return thread who could use our priority.
+        [NoHeapAllocation]
+        internal override Thread GetBeneficiary()
+        {
+            return null;
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/Monitor.cs b/base/Kernel/System/Threading/Monitor.cs
new file mode 100644
index 0000000..f5fc1f1
--- /dev/null
+++ b/base/Kernel/System/Threading/Monitor.cs
@@ -0,0 +1,416 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.Threading {
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    using Microsoft.Bartok.Runtime;
+
+    using Microsoft.Singularity;
+
+    /// <summary>
+    /// A monitor is used for synchronization. Only a single thread can
+    /// hold the monitor at any given time.
+    ///
+    /// The monitor maintains two lists of threads: one for threads waiting
+    /// to enter the monitor, and one for threads waiting for a pulse within
+    /// the monitor.
+    /// </summary>
+    [NoCCtor]
+    public sealed class Monitor {
+        /// <summary>
+        /// Private so that only we can create instances.
+        /// </summary>
+        internal Monitor()
+        {
+            this.mutex = new Mutex();
+            this.depth = 0;
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, blocking until it is held.
+        /// </summary>
+        [Intrinsic]
+        public static extern void Enter(Object obj);
+
+        [RequiredByBartok("Enter gets lowered to this")]
+        private static void EnterImpl(Object obj) {
+            Monitor monitor = GetMonitorFromObject(obj);
+            monitor.Enter();
+        }
+
+        /// <summary>
+        /// Exit the monitor.
+        /// </summary>
+        [Intrinsic]
+        public static extern void Exit(Object obj);
+
+        [RequiredByBartok("Exit gets lowered to this")]
+        public static void ExitImpl(Object obj) {
+            Monitor monitor = GetMonitorFromObject(obj);
+            monitor.Exit();
+        }
+
+        /// <summary>
+        /// Wake up a thread waiting on the monitor.
+        /// </summary>
+        public static void Pulse(Object obj)
+        {
+            Monitor monitor = GetMonitorFromObject(obj);
+            monitor.Pulse();
+        }
+
+        /// <summary>
+        /// Wake up all threads waiting on the monitor.
+        /// </summary>
+        public static void PulseAll(Object obj)
+        {
+            Monitor monitor = GetMonitorFromObject(obj);
+            monitor.PulseAll();
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, returning immediately if it is
+        /// already held by another thread.
+        /// </summary>
+        public static bool TryEnter(Object obj)
+        {
+            Monitor monitor = GetMonitorFromObject(obj);
+            return monitor.TryEnter();
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, returning if it can not be taken
+        /// within the specified timeout.
+        /// </summary>
+        public static bool TryEnter(Object obj, TimeSpan timeout)
+        {
+            Monitor monitor = GetMonitorFromObject(obj);
+            return monitor.TryEnter(SchedulerTime.Now + timeout);
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor.
+        /// </summary>
+        public static bool Wait(Object obj)
+        {
+            Monitor monitor = GetMonitorFromObject(obj);
+            return monitor.Wait(SchedulerTime.MaxValue);
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. Give up after
+        /// a specified timeout.
+        /// </summary>
+        public static bool Wait(Object obj, TimeSpan timeout)
+        {
+            Monitor monitor = GetMonitorFromObject(obj);
+            return monitor.Wait(SchedulerTime.Now + timeout);
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. Give up after
+        /// a specified timeout.
+        ///
+        /// Overload exists to match the CLR. Exit Context not supported.
+        /// </summary>
+        public static bool Wait(Object obj,
+                                TimeSpan timeout,
+                                bool exitContext)
+        {
+            if (exitContext) {
+                DebugStub.Break();
+                throw new NotSupportedException("exitContext not supported!");
+            }
+            Monitor monitor = GetMonitorFromObject(obj);
+            return monitor.Wait(SchedulerTime.Now + timeout);
+        }
+
+        /// <summary>
+        /// Enter the monitor, blocking until it is held.
+        /// </summary>
+        internal void Enter()
+        {
+            TryEnter(SchedulerTime.MaxValue);
+        }
+
+        /// <summary>
+        /// Exit the monitor.
+        /// </summary>
+        internal void Exit()
+        {
+            if (!mutex.IsOwnedByCurrentThread()) {
+                DebugStub.Break();
+                throw new SynchronizationLockException("Monitor not held on Exit");
+            }
+
+            depth--;
+            if (depth == 0) {
+                mutex.ReleaseMutex();
+            }
+        }
+
+        /// <summary>
+        /// Wake up a single thread waiting on the monitor.
+        /// </summary>
+        internal void Pulse()
+        {
+            if (!mutex.IsOwnedByCurrentThread()) {
+                DebugStub.Break();
+                throw new SynchronizationLockException("Monitor not held on Pulse");
+            }
+
+            // Wake up thread at the head of the wait list.
+            if (waitListHead != null) {
+                Thread t = Dequeue();
+                if (t != null) {
+                    t.nextThread = null;
+                    t.SignalMonitor();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Wake up all threads waiting on the monitor.
+        /// </summary>
+        internal void PulseAll()
+        {
+            if (!mutex.IsOwnedByCurrentThread()) {
+                DebugStub.Break();
+                throw new SynchronizationLockException("Monitor not held on PulseAll");
+            }
+
+            // Wake up all threads the wait list.
+            if (waitListHead != null) {
+                Thread t = waitListHead;
+                while (t != null) {
+                    Thread next = t.nextThread;
+                    t.nextThread = null;
+                    t.SignalMonitor();
+                    t = next;
+                }
+                waitListHead = null;
+                waitListTail = null;
+            }
+        }
+
+        /// <summary>
+        /// Try to enter the monitor, returning immediately if it is
+        /// already held.
+        /// </summary>
+        internal bool TryEnter()
+        {
+            return TryEnter(new SchedulerTime(0));
+        }
+
+        /// <summary>
+        /// Try to enter the monitor, giving up if it cannot be
+        /// entered after a timeout.
+        /// </summary>
+        internal bool TryEnter(SchedulerTime stop)
+        {
+            if (mutex.IsOwnedByCurrentThread()) {
+                depth++;
+                return true;
+            }
+
+            if (mutex.AcquireMutex(stop)) {
+                depth = 1;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Wait within the monitor for a Pulse.
+        /// </summary>
+        internal bool Wait(SchedulerTime stop)
+        {
+            Thread currentThread = Thread.CurrentThread;
+            if (!mutex.IsOwnedByCurrentThread()) {
+                DebugStub.Break();
+                throw new SynchronizationLockException("Monitor not held on Wait");
+            }
+
+            int rememberedDepth = depth;
+            depth = 0;
+
+            // Add me onto the waiting list.
+            Enqueue(currentThread);
+
+            // Exit the monitor
+            mutex.ReleaseMutex();
+
+            // Wait
+            currentThread.WaitForMonitor(stop);
+
+            // Re-enter the monitor
+            mutex.AcquireMutex();
+            depth = rememberedDepth;
+
+            bool success = !Remove(currentThread);
+
+            if (!success && stop == SchedulerTime.MaxValue) {
+                VTable.DebugBreak();
+            }
+
+            return success;
+        }
+
+        /// <summary>
+        /// Ensure that the passed object has a monitor (and associated
+        /// SyncBlock) allocated.
+        /// </summary>
+        internal static void CreateMonitor(Object obj)
+        {
+            GetMonitorFromObject(obj);
+        }
+
+        // BUGBUG: The garbage collectors will not collect monitors that are
+        // in use.  Use a very defensive strategy for now.
+        internal bool IsInUse() {
+            return true;
+        }
+
+        /// <summary>
+        /// Internal Type conversion method.
+        /// Note: we don't use VTable.fromAddress because we
+        /// cannot do a checked cast from Object to Monitor during GC
+        /// (because the GC may be using the vtable word)
+        /// </summary>
+        ///
+        internal static Monitor FromAddress(UIntPtr v) {
+            return Magic.toMonitor(Magic.fromAddress(v));
+        }
+
+        /// <summary>
+        /// Look up the Monitor for the specified object in the SyncBlock
+        /// tables. If no Monitor exists for the object then one is created.
+        /// </summary>
+        private static Monitor GetMonitorFromObject(Object obj)
+        {
+            if (obj == null) {
+                DebugStub.Break();
+                throw new ArgumentNullException("obj");
+            }
+            Monitor result = MultiUseWord.GetMonitor(obj);
+            return result;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        // Linked list of threads waiting for a Pulse in a monitor.
+        private Thread waitListHead;
+        private Thread waitListTail;
+
+        /// <summary>
+        /// Dequeue a thread from the singly linked list from head to tail,
+        /// acquiring the ListLock if necessary.
+        ///
+        /// If the list is empty then this method returns null.
+        /// </summary>
+        [Inline]
+        private Thread Dequeue()
+        {
+            Thread result;
+            if (waitListHead == null) {
+                // Empty list
+                result = null;
+            }
+            else if (waitListHead == waitListTail) {
+                // Single entry on list
+                VTable.Assert(waitListHead.nextThread == null);
+                result = waitListHead;
+                waitListHead = waitListTail = null;
+            }
+            else {
+                // Multiple entries on list
+                result = waitListHead;
+                waitListHead = waitListHead.nextThread;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Search the linked list and remove the specified thread if
+        /// it is linked in.
+        ///
+        /// Acquires the ListLock if necessary.
+        /// </summary>
+        [Inline]
+        private bool Remove(Thread target)
+        {
+            if (waitListHead == null) {
+                return false;
+            }
+
+            if (waitListHead == waitListTail) {
+                // Single entry on list
+                VTable.Assert(waitListHead.nextThread == null);
+
+                if (waitListHead != target) {
+                    // Not on list
+                    return false;
+                }
+
+                waitListHead = waitListTail = null;
+            }
+            else if (waitListHead == target) {
+                // At waitListHead of list
+                waitListHead = target.nextThread;
+                target.nextThread = null;
+            }
+            else {
+                // Multiple entries on list
+                Thread next = waitListHead;
+                while (next != null && next.nextThread != target) {
+                    next = next.nextThread;
+                }
+
+                if (next == null) {
+                    // Not on list
+                    return false;
+                }
+
+                if (waitListTail == target) {
+                    // Update the waitListTail
+                    waitListTail = next;
+                }
+
+                next.nextThread = target.nextThread;
+                target.nextThread = null;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Append a thread at the tail of a queue. If the queue is
+        /// currently null this method initializes it.
+        ///
+        /// Acquires the ListLock if necessary.
+        /// </summary>
+        [Inline]
+        private void Enqueue(Thread target)
+        {
+            if (waitListHead == null) {
+                waitListHead = waitListTail = target;
+            } else {
+                waitListTail.nextThread = target;
+                waitListTail = target;
+            }
+        }
+
+        /// <summary>
+        /// The recursion depth of the current holder of the monitor.
+        /// </summary>
+        private int depth;
+
+        /// <summary>
+        /// The mutex that is held by the thread that holds the monitor
+        /// </summary>
+        private Mutex mutex;
+    }
+}
diff --git a/base/Kernel/System/Threading/MonitorWaitHandle.cs b/base/Kernel/System/Threading/MonitorWaitHandle.cs
new file mode 100644
index 0000000..4f683e5
--- /dev/null
+++ b/base/Kernel/System/Threading/MonitorWaitHandle.cs
@@ -0,0 +1,293 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.Threading {
+
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// A monitor is used for synchronization. Only a single thread can
+    /// hold the monitor at any given time. 
+    /// 
+    /// The monitor maintains two lists of threads: one for threads waiting 
+    /// to enter the monitor, and one for threads waiting for a pulse within 
+    /// the monitor.
+    /// </summary>
+    public sealed class Monitor {
+        /// <summary>
+        /// Private so that only we can create instances.
+        /// </summary>
+        private Monitor() {
+            this.Mutex = new Mutex();
+            this.WaitEvent = new AutoResetEvent(false);
+            this.Depth = 0;
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, blocking until it is held.
+        /// </summary>
+        public static void Enter(Object obj) {
+            VTable.DebugBreak();
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            monitor.Enter();
+        }
+
+        /// <summary>
+        /// Exit the monitor.
+        /// </summary>
+        public static void Exit(Object obj) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            monitor.Exit();
+        }
+
+        /// <summary>
+        /// Wake up a thread waiting on the monitor.
+        /// </summary>
+        public static void Pulse(Object obj) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            monitor.Pulse();
+        }
+        
+        /// <summary>
+        /// Wake up all threads waiting on the monitor.
+        /// </summary>
+        public static void PulseAll(Object obj) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            monitor.PulseAll();
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, returning immediately if it is 
+        /// already held by another thread.
+        /// </summary>
+        public static bool TryEnter(Object obj) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.TryEnter();
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, returning if it can not be taken
+        /// within the specified timeout.
+        /// </summary>
+        public static bool TryEnter(Object obj, int millisecondTimeout) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.TryEnter(millisecondTimeout);
+        }
+
+        /// <summary>
+        /// Attempt to enter the monitor, returning if it can not be taken
+        /// within the specified timeout.
+        /// </summary>
+        public static bool TryEnter(Object obj, TimeSpan timeout) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.TryEnter(GetMillisecondTimeout(timeout));
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. 
+        /// </summary>
+        public static bool Wait(Object obj) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.Wait(Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. Give up after
+        /// a specified timeout. 
+        /// </summary>
+        public static bool Wait(Object obj, int millisecondsTimeout) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.Wait(millisecondsTimeout);
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. Give up after
+        /// a specified timeout. 
+        /// </summary>
+        public static bool Wait(Object obj, TimeSpan timeout) {
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.Wait(GetMillisecondTimeout(timeout));
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. Give up after
+        /// a specified timeout. 
+        /// 
+        /// Overload exists to match the CLR. Exit Context not supported.
+        /// </summary>
+        public static bool Wait(Object obj, 
+                                int millisecondsTimeout, 
+                                bool exitContext) {
+            if (exitContext)
+                throw new NotSupportedException("exitContext not supported!");
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.Wait(millisecondsTimeout);
+        }
+
+        /// <summary>
+        /// Wait to be woken up by a holder of the monitor. Give up after
+        /// a specified timeout. 
+        /// 
+        /// Overload exists to match the CLR. Exit Context not supported.
+        /// </summary>
+        public static bool Wait(Object obj, 
+                                TimeSpan timeout, 
+                                bool exitContext) {
+            if (exitContext)
+                throw new NotSupportedException("exitContext not supported!");
+            Monitor monitor = GetMonitorFromSyncBlock(obj);
+            return monitor.Wait(GetMillisecondTimeout(timeout));
+        }
+
+        /// <summary>
+        /// Extract Milliseconds from a TimeSpan
+        /// </summary>
+        [Inline]
+        private static int GetMillisecondTimeout(TimeSpan timeout) {
+            int tm = (int)timeout.TotalMilliseconds;
+            if (tm < -1 || tm > Int32.MaxValue) {
+                throw new ArgumentOutOfRangeException("timeout", 
+                    "ArgumentOutOfRange_NeedNonNegOrNegative1");
+            }
+            return tm;
+        }
+  
+        /// <summary>
+        /// Enter the monitor, blocking until it is held.
+        /// </summary>
+        internal void Enter() {
+            TryEnter(Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Exit the monitor.
+        /// </summary>
+        internal void Exit() {
+            Thread currentThread = Thread.CurrentThread;
+            if (this.Mutex.GetBeneficiary() != currentThread) {
+                throw new SynchronizationLockException("Monitor not held on Exit");
+            }
+
+            this.Depth--;
+            if (this.Depth == 0) {
+                this.Mutex.ReleaseMutex();
+            }
+        }
+
+        /// <summary>
+        /// Wake up a single thread waiting on the monitor.
+        /// </summary>
+        internal void Pulse() {
+            Thread currentThread = Thread.CurrentThread;
+            if (this.Mutex.GetBeneficiary() != currentThread) {
+                throw new SynchronizationLockException("Monitor not held on Pulse");
+            }
+
+            this.WaitEvent.NotifyOne();
+        }
+
+        /// <summary>
+        /// Wake up all threads waiting on the monitor.
+        /// </summary>
+        internal void PulseAll() {
+            Thread currentThread = Thread.CurrentThread;
+            if (this.Mutex.GetBeneficiary() != currentThread) {
+                throw new SynchronizationLockException("Monitor not held on PulseAll");
+            }
+
+            this.WaitEvent.NotifyAll();
+        }
+
+        /// <summary>
+        /// Try to enter the monitor, returning immediately if it is
+        /// already held.
+        /// </summary>
+        internal bool TryEnter() {
+            return TryEnter(0);
+        }
+
+        /// <summary>
+        /// Try to enter the monitor, giving up if it cannot be 
+        /// entered after a timeout.
+        /// </summary>
+        internal bool TryEnter(int timeout) {
+            Thread currentThread = Thread.CurrentThread;
+            if (this.Mutex.GetBeneficiary() == currentThread) {
+                this.Depth++;
+                return true;
+            }
+
+            this.Depth = 0;
+            return Mutex.WaitOne(timeout);
+        }
+
+        /// <summary>
+        /// Wait within the monitor for a Pulse.
+        /// </summary>
+        internal bool Wait(int timeout) {
+            Thread currentThread = Thread.CurrentThread;
+            if (this.Mutex.GetBeneficiary() != currentThread) {
+                throw new SynchronizationLockException("Monitor not held on Wait");
+            }
+
+            int rememberedDepth = this.Depth;
+            this.Mutex.ReleaseMutex();
+            bool waitSuccess = this.WaitEvent.WaitOne();
+            this.Mutex.WaitOne();
+            this.Depth = rememberedDepth;
+            
+            return waitSuccess;
+        }
+
+        /// <summary>
+        /// Ensure that the passed object has a monitor (and associated 
+        /// SyncBlock) allocated.
+        /// </summary>
+        internal static void CreateMonitor(Object obj) {
+            GetMonitorFromSyncBlock(obj);
+        }
+
+        /// <summary>
+        /// Look up the Monitor for the specified object in the SyncBlock
+        /// tables. If no Monitor exists for the object then one is created.
+        /// </summary>
+        private static Monitor GetMonitorFromSyncBlock(Object obj) {
+            if (obj == null) {
+                throw new ArgumentNullException();
+            }
+            SyncBlock[] table;
+            int index = SyncBlock.GetSyncBlockIndex(obj, out table);
+            if (index < 0 || table[index].Monitor == null) {
+                if (index < 0) {
+                    index = SyncBlock.LazyCreateSyncBlock(obj, out table);
+                }
+                Monitor monitor = table[index].Monitor;
+                if (monitor == null) {
+                    monitor = new Monitor();
+                    table[index].Monitor = monitor;
+                }
+                return monitor;
+            } else {
+                return table[index].Monitor;
+            }
+        }
+
+        /// <summary>
+        /// The recursion depth of the current holder of the monitor.
+        /// </summary>
+        internal int Depth;
+
+        /// <summary>
+        /// The mutex that is held by the thread that holds the monitor
+        /// </summary>
+        internal Mutex Mutex;
+
+        /// <summary>
+        /// The event that is used for threads waiting for Pulses
+        /// </summary>
+        internal AutoResetEvent WaitEvent;
+    }
+
+}
diff --git a/base/Kernel/System/Threading/Mutex.cs b/base/Kernel/System/Threading/Mutex.cs
new file mode 100644
index 0000000..a36aa43
--- /dev/null
+++ b/base/Kernel/System/Threading/Mutex.cs
@@ -0,0 +1,160 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Mutex.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Scheduling;
+
+namespace System.Threading
+{
+    [CLSCompliant(false)]
+    public enum MutexEvent
+    {
+        AcquireAgain = 1,
+        Acquire = 2,
+        Enqueue = 3,
+    }
+
+    //| <include path='docs/doc[@for="Mutex"]/*' />
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public sealed class Mutex : WaitHandle
+    {
+        private int acquired = 0;   // Number of times acquired by same thread.
+
+        //| <include path='docs/doc[@for="Mutex.Mutex2"]/*' />
+        public Mutex(bool initiallyOwned)
+            : base(initiallyOwned ? 0 : 1)
+        {
+            if (initiallyOwned) {
+                owner = Thread.CurrentThread;
+                acquired = 1;
+            }
+        }
+
+        //| <include path='docs/doc[@for="Mutex.Mutex3"]/*' />
+        public Mutex()
+            : base(1)
+        {
+        }
+
+        public bool AcquireMutex()
+        {
+            return WaitOne();
+        }
+
+        public bool AcquireMutex(SchedulerTime stop)
+        {
+            return WaitOne(stop);
+        }
+
+        //| <include path='docs/doc[@for="Mutex.ReleaseMutex"]/*' />
+        public void ReleaseMutex()
+        {
+#if DEBUG_DISPATCH
+            DebugStub.Print("Mutex:ReleaseMutex 001\n");
+#endif // DEBUG_DISPATCH
+            if (Thread.CurrentThread != owner) {
+                VTable.Assert(Thread.CurrentThread == owner);
+                return;
+            }
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    VTable.Assert(acquired >= 0);
+
+                    acquired--;
+                    if (acquired == 0) {
+#if DEBUG_DISPATCH
+                        DebugStub.Print("Mutex:ReleaseMutex 002\n");
+#endif // DEBUG_DISPATCH
+                        if (NotifyOne()) {
+#if DEBUG_DISPATCH
+                            DebugStub.Print("Mutex:ReleaseMutex 003\n");
+#endif // DEBUG_DISPATCH
+                            signaled = 0;
+                            acquired = 1;
+                        }
+                        else {
+                            signaled = 1;
+                            owner = null;
+                        }
+                    }
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        // Called by monitor to see if its lock is held by the current thread.
+        internal bool IsOwnedByCurrentThread()
+        {
+            return (Thread.CurrentThread == owner);
+        }
+
+        // Called with dispatch lock held and interrupts off.
+        // Returns true if the mutex was acquired.
+        internal override bool AcquireOrEnqueue(ThreadEntry entry)
+        {
+            if (owner == entry.Thread) {
+#if DEBUG_DISPATCH
+                DebugStub.Print("Mutex:AcquireOrEnqueue 001\n");
+#endif // DEBUG_DISPATCH
+                acquired++;
+                Monitoring.Log(Monitoring.Provider.Mutex,
+                               (ushort)MutexEvent.AcquireAgain, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return true;
+            }
+            else if (signaled != 0) {
+#if DEBUG_DISPATCH
+                DebugStub.Print("Mutex:AcquireOrEnqueue 002\n");
+#endif // DEBUG_DISPATCH
+                signaled = 0;
+                owner = entry.Thread;
+                acquired = 1;
+                Monitoring.Log(Monitoring.Provider.Mutex,
+                               (ushort)MutexEvent.Acquire, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return true;
+            }
+            else {
+#if DEBUG_DISPATCH
+                DebugStub.Print("Mutex:AcquireOrEnqueue 003\n");
+#endif // DEBUG_DISPATCH
+                queue.EnqueueTail(entry);
+                Monitoring.Log(Monitoring.Provider.Mutex,
+                               (ushort)MutexEvent.Enqueue, 0,
+                               (uint)this.id, (uint)entry.Thread.threadIndex,
+                               0, 0, 0);
+                return false;
+            }
+        }
+
+        // Return mutex owner.
+        [NoHeapAllocation]
+        internal override Thread GetBeneficiary()
+        {
+            return owner;
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/SmartSpinlock.cs b/base/Kernel/System/Threading/SmartSpinlock.cs
new file mode 100644
index 0000000..0b81e64
--- /dev/null
+++ b/base/Kernel/System/Threading/SmartSpinlock.cs
@@ -0,0 +1,54 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProtectionDomain.cs
+//
+//  Note:
+//
+//  SmartSpinlock is an object that wraps the SpinLock struct
+//  and avoids actually interlocking memory on a single-processor
+//  box.
+//
+
+using Microsoft.Singularity;
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+    public class SmartSpinlock
+    {
+#if SINGULARITY_MP
+        private SpinLock spin;
+#endif
+
+        public SmartSpinlock()
+        {
+#if SINGULARITY_MP
+            this.spin = new SpinLock();
+#endif
+        }
+
+        [Inline]
+        public bool Lock()
+        {
+            bool enabled = Processor.DisableInterrupts();
+#if SINGULARITY_MP
+            spin.Acquire(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            return enabled;
+        }
+
+        [Inline]
+        public void Unlock(bool iflag)
+        {
+#if SINGULARITY_MP
+            spin.Release(Thread.CurrentThread);
+#endif // SINGULARITY_MP
+            Processor.RestoreInterrupts(iflag);
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/SpinLock.cs b/base/Kernel/System/Threading/SpinLock.cs
new file mode 100644
index 0000000..41aef76
--- /dev/null
+++ b/base/Kernel/System/Threading/SpinLock.cs
@@ -0,0 +1,166 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System.Threading {
+
+    using Microsoft.Singularity;
+
+    using System.Runtime.CompilerServices;
+    using System;
+
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public struct SpinLock
+    {
+        [NoHeapAllocation]
+        public void Acquire()
+        {
+            Acquire(Thread.CurrentThread);
+        }
+
+        // Note: any changes to this code must be reflected in
+        // the Release code in SwitchToThreadContext in halidt.asm.
+        [NoHeapAllocation]
+        public void Release()
+        {
+            Release(Thread.CurrentThread);
+        }
+
+        [NoHeapAllocation]
+        public void Acquire(Thread thread)
+        {
+#if TRACE
+            Tracing.Log(Tracing.Debug, "SpinLock.Acquire({0:x8},{1})",
+                        VTable.addressOf(thread),
+                        (UIntPtr)unchecked((uint)(thread != null ? thread.threadIndex : -1)));
+#endif
+            AcquireInternal(thread.GetThreadId() + 1);
+        }
+
+        // Note: any changes to this code must be reflected in
+        // the Release code in SwitchToThreadContext in halidt.asm.
+        [NoHeapAllocation]
+        public void Release(Thread thread)
+        {
+#if TRACE
+            Tracing.Log(Tracing.Debug, "SpinLock.Release({0:x8},{1})",
+                        VTable.addressOf(thread),
+                        (UIntPtr)unchecked((uint)(thread != null ? thread.threadIndex : -1)));
+#endif
+            ReleaseInternal(thread.GetThreadId() + 1);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoHeapAllocation]
+        public void AssertHeldBy(Thread thread)
+        {
+            VTable.Assert(IsHeldBy(thread));
+        }
+
+        [NoHeapAllocation]
+        public bool IsHeldBy(Thread thread)
+        {
+#if TRACE
+            Tracing.Log(Tracing.Debug, "SpinLock.IsHeldBy({0:x8},{1})",
+                        VTable.addressOf(thread),
+                        (UIntPtr)unchecked((uint)(thread != null ? thread.threadIndex : -1)));
+#endif
+            return IsHeldByInternal(thread.GetThreadId() + 1);
+        }
+
+        [NoHeapAllocation]
+        public void Acquire(int threadId)
+        {
+            AcquireInternal(threadId + 1);
+        }
+
+        [NoHeapAllocation]
+        public void Release(int threadId)
+        {
+            ReleaseInternal(threadId + 1);
+        }
+
+        [System.Diagnostics.Conditional("DEBUG")]
+        [NoHeapAllocation]
+        public void AssertHeldBy(int threadId)
+        {
+            VTable.Assert(IsHeldByInternal(threadId + 1));
+        }
+
+        [NoHeapAllocation]
+        public bool IsHeldBy(int threadId)
+        {
+            return IsHeldByInternal(threadId + 1);
+        }
+
+        [NoHeapAllocation]
+        private void AcquireInternal(int currentThreadIndexPlusOne)
+        {
+            // SpinLocks are *NOT* re-entrant.
+            VTable.Assert(lockingThreadIndexPlusOne !=
+                          currentThreadIndexPlusOne);
+            VTable.Assert(Processor.InterruptsDisabled());
+
+            int result = Interlocked.Exchange(ref this.lockWord, 1);
+            if (result != 0) {
+                // spin for exponentially backed off delay
+                int count = 31;
+                while (true) {
+#if SINGULARITY_KERNEL
+                    Kernel.Waypoint(888);
+#endif // SINGULARITY_KERNEL
+                    Thread.SpinWait(count);
+                    result = Interlocked.Exchange(ref this.lockWord, 1);
+                    if (result == 0) {
+                        break;
+                    }
+#if !SINGULARITY_KERNEL
+                    // We yield to allow the thread holding the lock to run
+                    Thread.Yield();
+                    // check the lock word once after yielding
+                    result = Interlocked.Exchange(ref this.lockWord, 1);
+                    if (result == 0) {
+                        break;
+                    }
+#endif // !SINGULARITY_KERNEL
+                    count = (count == 0x7ffffffu) ? count : count + count + 1;
+                } // while
+            }
+
+            VTable.Assert(lockWord == 1 && lockingThreadIndexPlusOne == 0);
+            this.lockingThreadIndexPlusOne = currentThreadIndexPlusOne;
+        }
+
+        // Note: any changes to this code must be reflected in
+        // the Release code in SwitchToThreadContext in halidt.asm.
+        [NoHeapAllocation]
+        private void ReleaseInternal(int currentThreadIndexPlusOne)
+        {
+            VTable.Assert(lockWord == 1 &&
+                          lockingThreadIndexPlusOne == currentThreadIndexPlusOne);
+            VTable.Assert(Processor.InterruptsDisabled());
+
+            this.lockingThreadIndexPlusOne = 0;
+            this.lockWord = 0;
+        }
+
+        [NoHeapAllocation]
+        private bool IsHeldInternal()
+        {
+            return this.lockWord != 0;
+        }
+
+        [NoHeapAllocation]
+        private bool IsHeldByInternal(int threadIndexPlusOne)
+        {
+            return (this.lockWord != 0 &&
+                    this.lockingThreadIndexPlusOne == threadIndexPlusOne);
+        }
+
+        [AccessedByRuntime("referenced from halidt.asm")]
+        private int lockWord;
+        [AccessedByRuntime("referenced from halidt.asm")]
+        private int lockingThreadIndexPlusOne; // Thread.GetThreadId() + 1
+    }
+}
diff --git a/base/Kernel/System/Threading/SynchronizationLockException.cs b/base/Kernel/System/Threading/SynchronizationLockException.cs
new file mode 100644
index 0000000..181cd41
--- /dev/null
+++ b/base/Kernel/System/Threading/SynchronizationLockException.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: SynchronizationLockException
+**
+**
+** Purpose: Wait(), Notify() or NotifyAll() was called from an unsynchronized
+**          block of code.
+**
+** Date: March 30, 1998
+**
+=============================================================================*/
+
+namespace System.Threading {
+
+    using System;
+
+    //| <include path='docs/doc[@for="SynchronizationLockException"]/*' />
+    public class SynchronizationLockException : SystemException {
+        //| <include path='docs/doc[@for="SynchronizationLockException.SynchronizationLockException"]/*' />
+        public SynchronizationLockException()
+            : base("Arg_SynchronizationLockException") {
+        }
+
+        //| <include path='docs/doc[@for="SynchronizationLockException.SynchronizationLockException1"]/*' />
+        public SynchronizationLockException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="SynchronizationLockException.SynchronizationLockException2"]/*' />
+        public SynchronizationLockException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
+
+
diff --git a/base/Kernel/System/Threading/Thread.cs b/base/Kernel/System/Threading/Thread.cs
new file mode 100644
index 0000000..8c6d40b
--- /dev/null
+++ b/base/Kernel/System/Threading/Thread.cs
@@ -0,0 +1,2266 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Thread.cs
+//
+//  Note:
+//
+//      The Thread class and the Scheduler interact through three mechanisms.
+//
+//      First, the synchronization operations acquire the Scheduler's dispatch
+//      lock (via Scheduler.DispatchLock() and Scheduler.DispatchRelease()
+//      to ensure that no two processors ever attempt to dispatch on the block
+//      or release threads at exactly the same time.
+//
+//      Second, the Thread class notifies the Scheduler of important events
+//      in the life of each thread.  These notifications are done via overrides
+//      on the thread class.  The mixin overrides are:
+//          Scheduler.OnThreadStateInitialize(): Thread has been created.
+//          Scheduler.OnThreadStart():      Thread is ready to start.
+//          Scheduler.OnThreadBlocked():    Thread just blocked on a handle.
+//          Scheduler.OnThreadUnblocked():  Thread is now runnable.
+//          Scheduler.OnThreadYield():      Thread yields processor.
+//          Scheduler.OnThreadStop():       Thread is ready to stop.
+//          Scheduler.OnThreadFreezeIncrement(): Freeze thread, incr count.
+//          Scheduler.OnThreadFreezeDecrement(): Decrement count, if 0 then unfreeze
+//
+//      Third, the Scheduler calls Thread.Stopped() when it has finish with a
+//      thread that is no longer runnable.
+//
+
+// #define DEBUG_SWITCH
+
+namespace System.Threading
+{
+    using System.Threading;
+    using System.Runtime.InteropServices;
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.GCs;
+    using System.Collections;
+    using System.Runtime.CompilerServices;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Hal;
+    using Microsoft.Singularity.Scheduling;
+    using Microsoft.Singularity.Security;
+    using Microsoft.Singularity.V1.Threads;
+    using Microsoft.Singularity.X86;
+    using Microsoft.Singularity.Memory;
+    using Microsoft.Bartok.Runtime;
+
+    [CLSCompliant(false)]
+    public enum ThreadEvent : ushort
+    {
+        CreateIdle = 12,
+        Create = 13,
+        WaitAny = 30,
+        WaitFail = 31,
+        SwitchTo = 3,
+        ThreadPackageInit = 10
+    }
+
+    //| <include path='docs/doc[@for="Thread"]/*' />
+    [CCtorIsRunDuringStartup]
+    [CLSCompliant(false)]
+    [RequiredByBartok]
+    public class Thread
+    {
+        // GC fields.
+        [RequiredByBartok] // Thread-specific alloc heap
+        internal SegregatedFreeList segregatedFreeList;
+        [RequiredByBartok] // Thread-specific bump allocator
+        internal BumpAllocator bumpAllocator;
+
+        // MultiUseWord (object header) fields.
+        internal UIntPtr externalMultiUseObjAllocListHead;
+        internal UIntPtr externalMultiUseObjAllocListTail;
+
+        // Scheduling fields.
+        internal int processThreadIndex;
+        internal int threadIndex;
+        private ThreadStart threadStart;
+        private ThreadState threadState; // acquire Process.processLock when changing unstarted->running
+
+        private AutoResetEvent autoEvent;
+        private bool gcEventBlocked; // Are we blocked on the gcEvent?
+        private bool gcEventSignaled; // Has the gcEvent been signaled
+        private ManualResetEvent joinEvent;
+        internal Thread blockingCctorThread;
+        internal ThreadLocalServiceRequest localServiceRequest;
+
+        // Scheduler dispatching fields.
+        [AccessedByRuntime("referenced from c++")]
+        internal bool blocked;                          // Thread blocked on something.
+        [AccessedByRuntime("referenced from c++")]
+        private ThreadEntry[] blockedOn;                // WaitHandles blocked on (if any).
+        [AccessedByRuntime("referenced from c++")]
+        private int blockedOnCount;                     // Number of valid WaitHandles.
+        [AccessedByRuntime("referenced from c++")]
+        private SchedulerTime blockedUntil;             // Timeout of Wait.
+        public SchedulerTime BlockedUntil
+        {
+            [NoHeapAllocation]
+            get { return blockedUntil; }
+        }
+        private volatile int unblockedBy;               // WaitHandle signaled in unblock.
+        internal int freezeCount;                       // >0 prevents thread from being scheduled.
+
+        [AccessedByRuntime("referenced from c++")]
+        public ThreadEntry schedulerEntry;              // Entry for some scheduler queue.
+        public Processor ActiveProcessor;               // Processor running this thread (null if not running).
+        public Processor AffinityProcessor;             // Soft affinity.
+        public Processor LockedProcessor;               // non-null if thread dedicated.
+
+        // Singularity specific fields
+        [AccessedByRuntime("referenced from c++")]
+        internal ThreadContext context;
+
+        [AccessedByRuntime("referenced from c++")]
+        internal Process process;
+        internal ThreadHandle threadHandle;
+        internal UIntPtr threadLocalValue;
+
+        // Most recently thrown exception object that the thread
+        // did not catch at all (i.e. that propagated to the bottom
+        // of the stack without encountering an appropriate catch clause).
+        internal Exception lastUncaughtException;
+
+        // Monitor fields.
+        // Remove these (& Monitor) as soon as stack is out of kernel.
+        internal Thread nextThread; // Link for linked lists of threads
+
+        private Object exceptionStateInfo;            // Exception info latched to the thread on a thread abort
+
+        // Bartok specific fields
+        [RequiredByBartok]
+        internal TryAllManager tryAllManager;
+
+        private static long totalArrayAllocations;
+        private static long totalArrayBytesAllocated;
+        private static long totalBytes;
+        private static long totalStructBytesAllocated;
+
+        internal static Thread[] threadTable;
+        private static SpinLock threadTableLock;
+
+        private static LocalDataStore localDataStore;
+
+        internal static Thread initialThread;
+
+        private static SpinLock threadStopLock;
+        private static ProcessStopException processStopException;
+
+#if PAGING
+        // For use when we temporarily switch to a different domain
+        private ProtectionDomain tempDomain;
+#endif
+
+        // This is used by the Bartok backend. When Bartok try to generate
+        // callback stub for delegate, it checks to see if it is
+        // ThreadProc, if it is not, Bartok adds leaveGCSafeState and
+        // enterGCSafeState around the delegate call.
+        [RequiredByBartok]
+        private unsafe delegate uint ThreadProc(void *param);
+
+        //////////////////////////////////////////////////////////////////////
+        // This manager is responsible for storing the global data that is
+        // shared amongst all the thread local stores.
+        //
+        static private LocalDataStoreMgr m_LocalDataStoreMgr;
+
+        //////////////////////////////////////////////////////////////////////
+        // Creates a new Thread object which will begin execution at
+        // start.ThreadStart on a new thread when the Start method is called.
+        //
+        // Exceptions: ArgumentNullException if start == null.
+        //
+        //| <include path='docs/doc[@for="Thread.Thread"]/*' />
+        internal const int maxThreads = 1024; // Must be power of 2 >= 64
+        private static int threadIndexGenerator;
+
+        private Thread(Process process)
+        {
+            this.processThreadIndex = -1;
+            this.threadIndex = -1;
+            this.threadState = ThreadState.Unstarted;
+            this.SetKernelMode();
+            this.process = process;
+
+            context.threadIndex = unchecked((ushort)-1);
+            context.processThreadIndex = unchecked((ushort)-1);
+            context.processId = unchecked((ushort)-1);
+            Transitions.InitializeStatusWord(ref context);
+
+            // Allocate the kernel objects needed by the thread.
+            autoEvent = new AutoResetEvent(false);
+            joinEvent = new ManualResetEvent(false);
+            localServiceRequest = new ThreadLocalServiceRequest();
+            schedulerEntry = new ThreadEntry(this);
+            this.GetWaitEntries(1); // Cache allows wait without allocation
+
+            // Try to put the thread in the thread table.
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                threadTableLock.Acquire(CurrentThread);
+                try {
+                    for (int i = 0; i < threadTable.Length; i++) {
+                        int index = (threadIndexGenerator + i) % threadTable.Length;
+                        if (threadTable[index] == null) {
+                            threadTable[index] = this;
+                            this.threadIndex = index;
+                            threadIndexGenerator = index + 1;
+                            // NB: We call this once, subsequently the GC visitor calls it.
+                            context.UpdateAfterGC(this);
+                            break;
+                        }
+                    }
+                }
+                finally {
+                    threadTableLock.Release(CurrentThread);
+                }
+
+                // Save the TID and PID into the thread context.
+                context.threadIndex = unchecked((ushort)(threadIndex));
+                Transitions.InitializeStatusWord(ref context);
+                if (process != null)
+                {
+                    context.processId = unchecked((ushort)(process.ProcessId));
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            // Allocate the thread's stack.
+            context.stackBegin = 0;
+            context.stackLimit = 0;
+        }
+
+        // Constructor for processor idle threads.
+        protected Thread(bool idle)
+            : this(Process.idleProcess)
+        {
+            UIntPtr stackSegment = Stacks.GetInitialStackSegment(ref context);
+            DebugStub.Assert(stackSegment != UIntPtr.Zero);
+#if PAGING
+            context.InitializeIdle(threadIndex, stackSegment,
+                                   unchecked((uint)Process.kernelProcess.Domain.AddressSpace.PdptPage.Value));
+#else
+            context.InitializeIdle(threadIndex, stackSegment, 0);
+#endif
+            Monitoring.Log(Monitoring.Provider.Thread,
+                           (ushort)ThreadEvent.CreateIdle, 0,
+                           (uint)threadIndex, 0, 0, 0, 0);
+        }
+
+        // Constructor for all other threads.
+        protected Thread(Process process, ThreadStart start)
+            : this(process)
+        {
+            if (start == null) {
+                throw new ArgumentNullException("start");
+            }
+
+            this.threadStart = start;
+
+#if PAGING
+            context.abiStackHead = Stacks.GetStackSegment(0, ref context);
+            context.abiStackBegin = context.stackBegin;
+            context.abiStackLimit = context.stackLimit;
+            context.stackBegin = 0;
+            context.stackLimit = 0;
+#endif
+            UIntPtr stackSegment = Stacks.GetInitialStackSegment(ref context);
+            DebugStub.Assert(stackSegment != UIntPtr.Zero);
+#if PAGING
+            context.Initialize(threadIndex, stackSegment,
+                               unchecked((uint)(Process.Domain.AddressSpace.PdptPage.Value)));
+#else
+            context.Initialize(threadIndex, stackSegment, 0);
+#endif
+            Monitoring.Log(Monitoring.Provider.Thread,
+                           (ushort)ThreadEvent.Create, 0,
+                           (uint)threadIndex, 0, 0, 0, 0);
+        }
+
+        // To create a new idle thread.
+        public static Thread CreateIdleThread(Processor processor)
+        {
+            // Allocate the thread.
+            Thread idle = new Thread(true);
+
+            if (idle.threadIndex < 0) {
+                Tracing.Log(Tracing.Warning, "Thread table is full.");
+                DebugStub.Break();
+                return null;
+            }
+
+            //MemoryBarrier();?
+
+            DebugStub.WriteLine("CreateIdleThread tid={0:x3}, proc={1:x3}",
+                                __arglist(idle.threadIndex,
+                                          processor.processorIndex));
+            idle.LockedProcessor = processor;
+            return idle;
+        }
+
+        // Entry point for kernel to create new process threads.
+        public static Thread CreateThread(Process process,
+                                          ThreadStart start)
+        {
+            if (process == null) {
+                process = CurrentProcess;
+            }
+
+            // Allocate the thread.
+            Thread thread = new Thread(process, start);
+
+            if (thread.threadIndex < 0) {
+                Tracing.Log(Tracing.Warning, "Thread table is full.");
+                DebugStub.Break();
+                return null;
+            }
+
+            ThreadHandle handle;
+
+            process.AddThread(thread, out handle);
+
+            //MemoryBarrier();?
+
+            // Tell the scheduler to initialize the thread.
+            Scheduler.OnThreadStateInitialize(thread, true);
+
+            PerfCounters.IncrementThreadsCreated();
+
+            return thread;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Spawns off a new thread which will begin executing at the
+        // ThreadStart delegate passed in the constructor. Once the thread is
+        // dead, it cannot be restarted with another call to Start.
+        //
+        // Exceptions: ThreadStateException if the thread has already been started.
+        //
+        //| <include path='docs/doc[@for="Thread.Start"]/*' />
+        public void Start()
+        {
+            process.StartThread(ref threadState);
+            StartRunningThread();
+        }
+
+        // precondition: process.processLock held
+        internal void SetMainThreadRunning()
+        {
+            VTable.Assert(threadState == ThreadState.Unstarted);
+            process.StartMainThread(ref threadState);
+        }
+
+        internal void StartRunningThread()
+        {
+            VTable.Assert(threadState == ThreadState.Running);
+
+            // Tell the GC that we have created the thread
+            GC.NewThreadNotification(this, false);
+
+            // Tell the scheduler to start the thread.
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    //Kernel.Waypoint(1);
+                    Scheduler.OnThreadStart(this);
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                //Kernel.Waypoint(114);
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+
+        // ThreadContext.InitializeIdle sets ThreadIdleStub as the first instruction to be
+        // executed in a new thread context.
+        [AccessedByRuntime("referenced from c++")]
+        private static unsafe void ThreadIdleStub(int index)
+        {
+            for (;;) {
+                // Check for a debug break.
+                // Tell the scheduler to start the thread.
+                bool iflag = Processor.DisableInterrupts();
+                try {
+                    Processor.NextSampleIsIdle();
+                    if (DebugStub.PollForBreak()) {
+                        DebugStub.Print("Debugger breakin.\n");
+                        DebugStub.Break();
+                    }
+                }
+                finally {
+                    //Kernel.Waypoint(114);
+                    Processor.RestoreInterrupts(iflag);
+                }
+                Processor.HaltUntilInterrupt();
+            }
+        }
+
+        // ThreadContext.Initialize sets ThreadStub as the first instruction to be
+        // executed in a new thread context.
+        [AccessedByRuntime("referenced from c++")]
+        private static unsafe void ThreadStub(int threadIndex)
+        {
+            Thread currentThread = threadTable[threadIndex];
+
+#if PAGING
+            // Give our Protection Domain a chance to set up
+            // if we're first in here. Run this before anything
+            // else!
+            currentThread.process.Domain.InitHook();
+#endif
+
+            Transitions.ThreadStart();
+            GC.ThreadStartNotification(threadIndex);
+            Tracing.Log(Tracing.Trace, "ThreadStub() entered");
+            ThreadStart startFun = currentThread.threadStart;
+
+            Processor.InitFpu();
+
+            try {
+                startFun();
+            }
+            catch (ProcessStopException) {
+                // Ok, exit thread without failure.
+            }
+            catch (Exception e) {
+                // Not ok, fail.
+                Tracing.Log(Tracing.Notice,
+                            "Thread failed with exception {0}.{1}",
+                            e.GetType().Namespace, e.GetType().Name);
+                Tracing.Log(Tracing.Trace, "Exception message was {0}",
+                            e.Message);
+                DebugStub.Assert(e == null,
+                                 "Thread {0} failed w/ exception {1}.{2}: {3}",
+                                 __arglist(threadIndex,
+                                           e.GetType().Namespace,
+                                           e.GetType().Name,
+                                           e.Message));
+            }
+
+            Tracing.Log(Tracing.Trace, "{0:x} ThreadStub() stopping",
+                        Kernel.AddressOf(currentThread));
+
+            currentThread.threadState = ThreadState.Stopping;
+            currentThread.joinEvent.Set();
+
+            // The scheduler takes care of exiting MutatorState, so we
+            // don't need the following call.
+            // Transitions.ThreadEnd(threadIndex);
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Thread target = null;
+
+                // Block the ServiceStopped method until we acquire DispatchLock
+                // (but don't acquire DispatchLock yet, because
+                // CurrentThreadStopped would try to double-acquire it).
+                threadStopLock.Acquire();
+
+                // Tell service thread to call currentThread.ServiceStopped()
+                ThreadLocalServiceRequest.CurrentThreadStopped();
+
+                Scheduler.DispatchLock();
+                try {
+                    threadStopLock.Release();
+                    Kernel.Waypoint(1);
+
+                    // We change to the Stopped state here so that
+                    // Process.ServiceSuspend can stop waiting for us.
+                    // (We can't wait for the service thread to
+                    // set the Stopped state, because if the
+                    // service thread is running Process.ServiceSuspend
+                    // it could deadlock.)
+                    currentThread.threadState = ThreadState.Stopped;
+                    target = Scheduler.OnThreadStop(currentThread);
+                    Scheduler.SelectingThread(target);
+                }
+                catch(Exception e) {
+                    Scheduler.DispatchRelease();
+                    throw e;
+                }
+
+                if (target == null) {
+                    target = Processor.CurrentProcessor.IdleThread;
+                }
+
+                target.SwitchTo();
+            }
+            finally {
+                //Kernel.Waypoint(114);
+                Processor.RestoreInterrupts(iflag);
+            }
+            DebugStub.Break();
+        }
+
+        // ServiceStopped is called by the service thread when the thread is stopped.
+        internal void ServiceStopped()
+        {
+            // Make sure ThreadStub has gotten a chance to exit before
+            // we deallocate its stack:
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                threadStopLock.Acquire();
+                Scheduler.DispatchLock();
+                Scheduler.DispatchRelease();
+                threadStopLock.Release();
+            } finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            VTable.Assert(threadState == ThreadState.Stopped);
+            VTable.Assert(threadIndex > 0);
+            VTable.Deny(Transitions.InMutatorState(threadIndex));
+
+            GC.DeadThreadNotification(this);
+
+#if !PAGING
+            while (context.stackBegin != 0) {
+                Stacks.ReturnStackSegment(ref context);
+            }
+#else
+            int count = 0;
+            while (context.stackBegin != 0) {
+                // HACK: if the thread stops abruptly, the stack
+                // may contain the abi segment
+                if (context.stackBegin == context.abiStackBegin) {
+                    context.abiStackBegin = 0;
+                    context.abiStackLimit = 0;
+                }
+
+                Stacks.ReturnStackSegment(ref context);
+                count++;
+            }
+//            VTable.Assert(count == 1); // due to unimplemented exception handling code, count may be >1
+#endif
+
+            VTable.Assert(context.stackLimit == 0);
+            VTable.Assert(context.stackBegin == 0);
+
+#if PAGING
+            // See HACK above for why abiStackBegin may be 0
+            if (context.abiStackBegin != 0) {
+                context.stackLimit = context.abiStackLimit;
+                context.stackBegin = context.abiStackBegin;
+                Stacks.ReturnStackSegment(ref context);
+            }
+#endif
+
+            Thread currentThread = Thread.CurrentThread;
+
+            iflag = Processor.DisableInterrupts();
+            try {
+                threadTableLock.Acquire(currentThread);
+                try {
+                    threadTable[threadIndex] = null;
+                    Transitions.DeadThreadNotification(threadIndex);
+                } finally {
+                    threadTableLock.Release(currentThread);
+                }
+            } finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+
+            if (process != null) {
+                process.ServiceOnThreadStop(this);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Returns true if the thread has been started and is not dead.
+        //
+        //| <include path='docs/doc[@for="Thread.IsAlive"]/*' />
+        public bool IsAlive {
+            get { return (threadState == ThreadState.Running); }
+        }
+
+#if false
+        // Returns a TimeSpan target for timeout.
+        static internal SchedulerTime GetTimeoutTarget(TimeSpan delay)
+        {
+            if (delay == TimeSpan.Infinite) {
+#if DEBUG_SLEEP
+                DebugStub.Print("  GetTimeTarget(Infinite) = {0}\n",
+                                __arglist(SchedulerTime.MaxValue.Ticks));
+#endif
+                return SchedulerTime.MaxValue;
+            }
+            else if (delay < TimeSpan.Zero) {
+                throw new ArgumentOutOfRangeException("delay", "ArgumentOutOfRange_AddTimeout");
+            }
+            SchedulerTime now = SchedulerTime.Now;
+#if DEBUG_SLEEP
+            DebugStub.Print("  GetTimeTarget({0}) = {1:d12} + {2:d12} => {3:d12}\n",
+                            __arglist(
+                                delay.ToString(),
+                                now.Ticks,
+                                delay.Ticks,
+                                (now + delay).Ticks));
+#endif
+            return now + delay;
+        }
+#endif
+
+        [Inline]
+        static internal bool TimeoutTargetPassed(SchedulerTime target)
+        {
+            return SchedulerTime.Now >= target;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Waits for the thread to die.
+        //
+        // Exceptions: ThreadStateException if the thread has not been started yet.
+        //
+        //| <include path='docs/doc[@for="Thread.Join"]/*' />
+        public void Join()
+        {
+            Join(SchedulerTime.MaxValue);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Waits for the thread to die or for timeout milliseconds to elapse.
+        // Returns true if the thread died, or false if the wait timed out.
+        //
+        // Exceptions: ArgumentException if timeout < 0.
+        //             ThreadStateException if the thread has not been started.
+        //
+        //| <include path='docs/doc[@for="Thread.Join2"]/*' />
+        public bool Join(TimeSpan timeout)
+        {
+            if (threadState == ThreadState.Unstarted) {
+                throw new ThreadStateException();
+            }
+            else if (threadState == ThreadState.Stopped) {
+                return true;
+            }
+            return joinEvent.WaitOne(timeout);
+        }
+
+        public bool Join(SchedulerTime timeout)
+        {
+            if (threadState == ThreadState.Unstarted) {
+                throw new ThreadStateException();
+            }
+            else if (threadState == ThreadState.Stopped) {
+                return true;
+            }
+            return joinEvent.WaitOne(timeout);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Suspends the current thread for timeout milliseconds. If timeout
+        // == 0, forces the thread to give up the remainder of its timeslice.
+        //
+        // Exceptions: ArgumentException if timeout < 0.
+        //
+        public static void Sleep(int milliseconds)
+        {
+            Sleep(TimeSpan.FromMilliseconds(milliseconds));
+        }
+
+        //| <include path='docs/doc[@for="Thread.Sleep"]/*' />
+        public static void Sleep(SchedulerTime stop)
+        {
+            Tracing.Log(Tracing.Audit, "Sleep until stop");
+            Thread.CurrentThread.WaitAny(null, 0, stop);
+            Tracing.Log(Tracing.Audit, "Sleep until stop finished");
+        }
+
+        //| <include path='docs/doc[@for="Thread.Sleep"]/*' />
+        public static void Sleep(TimeSpan timeout)
+        {
+            Tracing.Log(Tracing.Audit, "Sleep until time");
+            SchedulerTime stop = SchedulerTime.Now + timeout;
+            Thread.CurrentThread.WaitAny(null, 0, stop);
+            Tracing.Log(Tracing.Audit, "Sleep until time finished");
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Wait for a length of time proportional to 'iterations'.  Each
+        // iteration is should only take a few machine instructions.  Calling
+        // this method is preferable to coding an explicit busy loop because the
+        // hardware can be informed that it is busy waiting.
+        //
+        //| <include path='docs/doc[@for="Thread.SpinWait"]/*' />
+        [NoHeapAllocation]
+        public static void SpinWait(int iterations)
+        {
+            for (int i = iterations; i > 0; i--) {
+                // Ensure that the optimizer doesn't remove this
+                NativeNoOp();
+            }
+        }
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void NativeNoOp();
+
+        internal static int GetCurrentProcessIndex() {
+            return Thread.CurrentProcess.ProcessId;
+        }
+
+        internal bool WaitForMonitor(SchedulerTime stop)
+        {
+            return autoEvent.WaitOne(stop);
+        }
+
+        internal bool WaitForEvent(SchedulerTime stop)
+        {
+            return autoEvent.WaitOne(stop);
+        }
+
+        internal bool WaitForEvent(TimeSpan timeout)
+        {
+            return autoEvent.WaitOne(timeout);
+        }
+
+        internal static void WaitForGCEvent(int currentThreadIndex)
+        {
+            Tracing.Log(Tracing.Audit, "WaitForGCEvent({0})",
+                        (UIntPtr) currentThreadIndex);
+            VTable.Deny(Scheduler.IsIdleThread(currentThreadIndex));
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                bool didLock =
+                    Scheduler.EnsureDispatchLock(currentThreadIndex);
+                Thread target = null;
+                Thread currentThread = threadTable[currentThreadIndex];
+                try {
+                    if (currentThread.gcEventSignaled) {
+                        // Reset the flag, fall out and keep running.
+                        currentThread.gcEventSignaled = false;
+                        if (didLock) {
+                            Scheduler.DispatchRelease();
+                        }
+                        return;
+                    }
+                    currentThread.gcEventBlocked = true;
+                    target = Scheduler.OnThreadBlocked(currentThread,
+                                                       SchedulerTime.MaxValue);
+                    if (target == null) {
+                        target = Processor.CurrentProcessor.IdleThread;
+                    } else {
+                        // This should not be called passing the idle thread
+                        Scheduler.SelectingThread(target);
+                    }
+                } catch {
+                    if (didLock) {
+                        Scheduler.DispatchRelease();
+                    }
+                    throw;
+                }
+                Processor.CurrentProcessor.NumContextSwitches++;
+                // This has the side effect of releasing the dispatcher lock.
+                Processor.SwitchToThreadContextNoGC(ref target.context);
+            } finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        internal void SignalEvent()
+        {
+            autoEvent.Set();
+        }
+
+        internal void SignalMonitor()
+        {
+            autoEvent.Set();
+        }
+
+        [Inline]
+        internal static void SignalGCEvent(int threadIndex) {
+            SignalGCEvent(Thread.GetCurrentThreadIndex(), threadIndex);
+        }
+
+        internal static void SignalGCEvent(int currentThreadIndex,
+                                           int threadIndex)
+        {
+            Tracing.Log(Tracing.Audit, "SignalGCEvent({0})",
+                        (UIntPtr) threadIndex);
+            VTable.Deny(Scheduler.IsIdleThread(threadIndex));
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                bool didLock =
+                    Scheduler.EnsureDispatchLock(currentThreadIndex);
+                try {
+                    Thread targetThread = threadTable[threadIndex];
+                    if (targetThread == null) {
+                        // There is nothing to signal, so just keep going.
+                    } else if (targetThread.gcEventBlocked) {
+                        targetThread.gcEventBlocked = false;
+                        Scheduler.OnThreadUnblocked(targetThread);
+                    } else {
+                        // Nobody was waiting for the event.
+                        targetThread.gcEventSignaled = true;
+                    }
+                } finally {
+                    if (didLock) {
+                        Scheduler.DispatchRelease();
+                    }
+                }
+            } finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        //| <include path='docs/doc[@for="Thread.CurrentThread"]/*' />
+        public static extern Thread CurrentThread
+        {
+            [NoStackLinkCheck]
+            [NoHeapAllocation]
+            [Intrinsic]
+            get;
+        }
+
+        public static Process CurrentProcess
+        {
+            [NoStackLinkCheck]
+            [NoHeapAllocation]
+            get {
+                return Processor.GetCurrentThread().process;
+            }
+        }
+
+        public Process Process
+        {
+            [NoHeapAllocation]
+            get { return process; }
+        }
+
+        public ThreadHandle Handle
+        {
+            [NoHeapAllocation]
+            get { return threadHandle; }
+        }
+
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        private static Thread GetCurrentThreadNative()
+        {
+            return Processor.GetCurrentThread();
+        }
+
+        [NoStackLinkCheck]
+        [RequiredByBartok]
+        [NoHeapAllocation]
+        public static int GetCurrentThreadIndex()
+        {
+            return Processor.GetCurrentThread().threadIndex;
+        }
+
+        [NoHeapAllocation]
+        public static UIntPtr GetThreadLocalValue()
+        {
+            return Processor.GetCurrentThread().threadLocalValue;
+        }
+
+        [NoHeapAllocation]
+        public static void SetThreadLocalValue(UIntPtr value)
+        {
+            Processor.GetCurrentThread().threadLocalValue = value;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Return the thread state as a consistent set of bits.  This is more
+        // general then IsAlive or IsBackground.
+        //
+        //| <include path='docs/doc[@for="Thread.ThreadState"]/*' />
+        public ThreadState ThreadState
+        {
+            [NoHeapAllocation]
+            get { return threadState; }
+        }
+
+        [NoHeapAllocation]
+        public int GetThreadId()
+        {
+            return threadIndex;
+        }
+
+        // Return true if the thread is in kernel mode, false if the
+        // thread is in process mode.
+        // Note that by the time this method returns, the thread might
+        // have already switched to a different mode; in other words,
+        // don't rely on this result of this method being up-to-date unless
+        // the thread is suspended or blocked.
+        [NoHeapAllocation]
+        public unsafe bool IsInKernelMode()
+        {
+            return context.IsInKernelMode();
+        }
+
+        [NoHeapAllocation]
+        internal unsafe void SetKernelMode()
+        {
+            context.SetKernelMode();
+        }
+
+        [NoHeapAllocation]
+        internal unsafe void SetProcessMode()
+        {
+            context.SetProcessMode();
+        }
+
+        // Briefly suspend a thread in order to modify its state.
+        // When Freeze() returns, the thread is guaranteed to:
+        //   - be unscheduled (not running on any processor)
+        //   - not to be inside a DisableInterrupts block
+        //     (unless that block voluntarily context switches)
+        //   - not to hold the dispatch lock (because
+        //     CurrentThread holds the dispatch lock)
+        // These guarantees hold only until the dispatch lock
+        // is released.
+        //
+        // No other guarantees are made about the thread state; in particular,
+        // the thread could be in the middle of a kernel operation.  (This
+        // distinguishes Freeze from Suspend.)
+        //
+        // A thread should not try to freeze itself
+        // (this would deadlock, as can many other uses of Freeze).
+        //
+        // precondition: interrupts enabled
+        // precondition: dispatch lock not acquired
+        //   (so that other processor schedulers can run)
+        // postcondition: interrupts disabled
+        // postcondition: dispatch lock acquired
+        // postcondition: ActiveProcessor == null
+        // postcondition: freezeCount > 0
+        //
+        // Example:
+        //   t.Freeze();
+        //   ...(do some stuff, without releasing dispatch lock)...
+        //   Scheduler.DispatchRelease();
+        //   Processor.RestoreInterrupts(true);
+        internal void Freeze()
+        {
+            Debug.Assert(this != CurrentThread);
+            bool iflag = Processor.DisableInterrupts();
+            Debug.Assert(iflag);
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    switch (threadState) {
+                        case ThreadState.Unstarted:
+                        case ThreadState.Stopped:
+                        case ThreadState.Suspended:
+                            break;
+                        case ThreadState.Running:
+                        case ThreadState.Stopping:
+                            if (ActiveProcessor == null) {
+                                break;
+                            }
+                            Scheduler.OnThreadFreezeIncrement(this);
+                            WaitUntilInactive();
+                            // (Try to be courteous to the scheduler -- don't
+                            // ask it to resume a stopped thread.)
+                            if (threadState != ThreadState.Stopped) {
+                                Scheduler.OnThreadFreezeDecrement(this);
+                            }
+                            break;
+                        default:
+                            Debug.Assert(false, "unreachable default case");
+                            return;
+                    }
+                }
+                catch(Exception e) {
+                    Scheduler.DispatchRelease();
+                    throw e;
+                }
+            }
+            catch(Exception e) {
+                Processor.RestoreInterrupts(iflag);
+                throw e;
+            }
+            Debug.Assert(ActiveProcessor == null);
+            Scheduler.AssertDispatchLockHeld();
+        }
+
+        internal void Unfreeze()
+        {
+            Scheduler.DispatchRelease();
+            Processor.RestoreInterrupts(true);
+        }
+
+        // precondition: interrupts disabled with iflag==true
+        // precondition: dispatch lock acquired
+        // invariant: freezeCount > 0
+        // postcondition: interrupts disabled with iflag==true
+        // postcondition: dispatch lock acquired
+        // postcondition: ActiveProcessor == null
+        private void WaitUntilInactive()
+        {
+            Scheduler.AssertDispatchLockHeld();
+            Debug.Assert(this != CurrentThread);
+            Debug.Assert(freezeCount > 0);
+            if (ActiveProcessor != null) {
+                // TODO: send interrupt to ActiveProcessor
+
+                // spin for exponentially backed off delay
+                int count = 31;
+                while (ActiveProcessor != null) {
+                    Scheduler.DispatchRelease();
+                    Processor.RestoreInterrupts(true);
+                    Thread.SpinWait(count);
+                    count = (count == 0x7ffffffu) ? count : count + count + 1;
+                    bool iflag = Processor.DisableInterrupts();
+                    Debug.Assert(iflag);
+                    Scheduler.DispatchLock();
+                }
+            }
+        }
+
+        // Do not call Thread.Suspend unless you are suspending all the
+        // threads in a process.  This should only be called from the
+        // kernel service thread.
+        //
+        // Return value:
+        //   true means the thread is now suspended, unstarted, or stopped.
+        //   false means the thread must be allowed to run a little longer,
+        //     so try calling Suspend later.
+        //
+        // precondition: interrupts enabled
+        // precondition: dispatch lock not acquired
+        // postcondition: interrupts enabled
+        // postcondition: dispatch lock not acquired
+        internal bool Suspend(bool aboutToStop)
+        {
+            /*
+            case (kernel,  unblocked, running):   return false;
+            case (kernel,  unblocked, stopping):  return false;
+            case (process, unblocked, running):   DoSuspend(); return true;
+            case (kernel,  blocked,   running):   DoSuspend(); return true;
+            case (kernel,  unblocked, unstarted): return true;
+            case (_,       _,         suspended): return true;
+            case (kernel,  unblocked, stopped):   return true;
+            case _: error
+            // Also: in the (kernel, blocked, running) case, if
+            // aboutToStop==true, call WaitDone().
+            */
+            Freeze();
+            try {
+                if (threadState == ThreadState.Suspended) {
+                    return true;
+                }
+                else if (IsInKernelMode()) { // in kernel mode, not suspended
+                    if (blocked) {
+                        if (threadState == ThreadState.Running) {
+                            DoSuspend();
+                            if (aboutToStop) {
+                                WaitDone(null);
+                            }
+                            return true;
+                        }
+                        else {
+                            Debug.Assert(false, "unexpected thread state");
+                            return false;
+                        }
+                    }
+                    else { // in kernel mode, unblocked, not suspended
+                        switch (threadState) {
+                            case ThreadState.Running:
+                            case ThreadState.Stopping:
+                                // Let the thread run a while longer, but
+                                // let it know that eventually, it should
+                                // suspend:
+                                // MULTIPROCESSOR NOTE: halforgc.asm reads
+                                // suspendAlert with no explicit
+                                // synchronization.  We don't need the
+                                // read to be consistent with the
+                                // following write immediately, but it
+                                // must become consistent eventually.
+                                context.suspendAlert = true;
+                                return false;
+                            case ThreadState.Unstarted:
+                            case ThreadState.Stopped:
+                                // Note: now that process.state==Suspending[Recursive], a barrier
+                                // prevents starting threads, an Unstarted thread stays
+                                // Unstarted.
+                                return true;
+                            case ThreadState.Suspended:
+                                Debug.Assert(false, "unexpected thread state");
+                                return false;
+                            default:
+                                Debug.Assert(false, "unreachable default case");
+                                return false;
+                        }
+                    }
+                }
+                else { // in process mode, not suspended
+                    if (!blocked && threadState == ThreadState.Running) {
+                        DoSuspend();
+                        return true;
+                    }
+                    else {
+                        Debug.Assert(false, "unexpected thread state");
+                        return false;
+                    }
+                }
+            }
+            finally {
+                Scheduler.DispatchRelease();
+                Processor.RestoreInterrupts(true);
+            }
+        }
+
+        private void DoSuspend()
+        {
+            threadState = ThreadState.Suspended;
+            Scheduler.OnThreadFreezeIncrement(this);
+        }
+
+        // Do not call Thread.Resume unless you are resuming all the
+        // threads in a process.  This should only be called from the
+        // kernel service thread.
+        internal void Resume()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Scheduler.DispatchLock();
+                try {
+                    if (threadState == ThreadState.Suspended) {
+                        threadState = ThreadState.Running;
+                        Scheduler.OnThreadFreezeDecrement(this);
+                    }
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                }
+            }
+            finally {
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        // Do not call Thread.Stop unless you are stopping all the
+        // threads in a process.  This should only be called from the
+        // kernel service thread.
+        //
+        // precondition: interrupts enabled
+        // precondition: dispatch lock not acquired
+        // postcondition: interrupts enabled
+        // postcondition: dispatch lock not acquired
+        internal void Stop()
+        {
+            /*
+            case (kernel,  unblocked, unstarted): return;
+            case (kernel,  unblocked, stopped): return;
+            case (kernel,  _,         suspended):
+                if (blocked) WaitDone(null);
+                t.throw ProcessStopException
+                threadState = ThreadState.Running;
+                Scheduler.OnThreadFreezeDecrement(this);
+                return;
+            case (process, unblocked, suspended):
+                t.(pop frames and throw ProcessStopException)
+                threadState = ThreadState.Running;
+                Scheduler.OnThreadFreezeDecrement(this);
+                return;
+            case _: error
+            */
+            Freeze();
+            try {
+                bool kernelMode = IsInKernelMode();
+                if (threadState == ThreadState.Suspended) {
+                    if (kernelMode) {
+                        if (blocked) {
+                            WaitDone(null);
+                        }
+                        // context.eip = __throwBeyondMarker;
+                        // context.eax = context.stackMarkers; // kernel->kernel marker;
+                        // context.ecx = processStopException;
+                        setStopContext(this, processStopException);
+                    }
+                    else if (!kernelMode && !blocked) {
+                        // context.eip = __throwBeyondMarker;
+                        // context.eax = context.stackMarkers; // kernel->process marker;
+                        // context.ecx = processStopException;
+                        setStopContext(this, processStopException);
+                    }
+                    else {
+                        Debug.Assert(false, "unexpected thread state");
+                    }
+                    Debug.Assert(!blocked);
+                    threadState = ThreadState.Running;
+                    Scheduler.OnThreadFreezeDecrement(this);
+                }
+                else if (
+                    kernelMode && !blocked &&
+                    (      threadState == ThreadState.Stopped
+                        || threadState == ThreadState.Unstarted)) {
+                    // nothing needs to happen here.
+                }
+                else {
+                    Debug.Assert(false, "unexpected thread state");
+                }
+            }
+            finally {
+                Scheduler.DispatchRelease();
+                Processor.RestoreInterrupts(true);
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        [NoHeapAllocation]
+        [StackBound(4)]
+        private static extern void setStopContext(Thread t, Exception exn);
+
+        //////////////////////////////////////////////////////////////////////
+        // Allocates an un-named data slot. The slot is allocated on ALL the
+        // threads.
+        //| <include path='docs/doc[@for="Thread.AllocateDataSlot"]/*' />
+        public static LocalDataStoreSlot AllocateDataSlot()
+        {
+            return m_LocalDataStoreMgr.AllocateDataSlot();
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Allocates a named data slot. The slot is allocated on ALL the
+        // threads.  Named data slots are "public" and can be manipulated by
+        // anyone.
+        //| <include path='docs/doc[@for="Thread.AllocateNamedDataSlot"]/*' />
+        public static LocalDataStoreSlot AllocateNamedDataSlot(String name)
+        {
+            return m_LocalDataStoreMgr.AllocateNamedDataSlot(name);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Looks up a named data slot. If the name has not been used, a new
+        // slot is allocated.  Named data slots are "public" and can be
+        // manipulated by anyone.
+        //| <include path='docs/doc[@for="Thread.GetNamedDataSlot"]/*' />
+        public static LocalDataStoreSlot GetNamedDataSlot(String name)
+        {
+            return m_LocalDataStoreMgr.GetNamedDataSlot(name);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Frees a named data slot. The slot is allocated on ALL the
+        // threads.  Named data slots are "public" and can be manipulated by
+        // anyone.
+        //| <include path='docs/doc[@for="Thread.FreeNamedDataSlot"]/*' />
+        public static void FreeNamedDataSlot(String name)
+        {
+            m_LocalDataStoreMgr.FreeNamedDataSlot(name);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Retrieves the value from the specified slot on the current thread.
+        //| <include path='docs/doc[@for="Thread.GetData"]/*' />
+        public static Object GetData(LocalDataStoreSlot slot)
+        {
+            m_LocalDataStoreMgr.ValidateSlot(slot);
+
+            if (localDataStore != null) {
+                return localDataStore.GetData(slot);
+            }
+            return null;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // Sets the data in the specified slot on the currently running thread.
+        //| <include path='docs/doc[@for="Thread.SetData"]/*' />
+        public static void SetData(LocalDataStoreSlot slot, Object data)
+        {
+            // Create new DLS if one hasn't been created for this thread.
+            if (localDataStore == null) {
+                localDataStore = m_LocalDataStoreMgr.CreateLocalDataStore();
+            }
+            localDataStore.SetData(slot, data);
+        }
+
+        /*=============================================================*/
+
+        internal Object ExceptionState
+        {
+            [NoHeapAllocation]
+            get { return exceptionStateInfo;}
+            [NoHeapAllocation]
+            set { exceptionStateInfo = value;}
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis()
+        {
+            threadStart = null;
+            m_Priority = 0;
+        }
+#endif
+        //////////////////////////////////////////////////////////////////////
+        // Volatile Read & Write and MemoryBarrier methods.
+        // Provides the ability to read and write values ensuring that the values
+        // are read/written each time they are accessed.
+        //
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern byte VolatileRead(ref byte address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern short VolatileRead(ref short address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead2"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern int VolatileRead(ref int address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead3"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern long VolatileRead(ref long address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead4"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern sbyte VolatileRead(ref sbyte address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead5"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern ushort VolatileRead(ref ushort address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead6"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern uint VolatileRead(ref uint address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead7"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern IntPtr VolatileRead(ref IntPtr address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead8"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern UIntPtr VolatileRead(ref UIntPtr address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead9"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern ulong VolatileRead(ref ulong address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead10"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern float VolatileRead(ref float address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead11"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern double VolatileRead(ref double address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileRead12"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern Object VolatileRead(ref Object address);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref byte address, byte value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref short address, short value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite2"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref int address, int value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite3"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref long address, long value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite4"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref sbyte address, sbyte value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite5"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref ushort address, ushort value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite6"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref uint address, uint value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite7"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref IntPtr address, IntPtr value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite8"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref UIntPtr address, UIntPtr value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite9"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref ulong address, ulong value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite10"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref float address, float value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite11"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref double address, double value);
+
+        //| <include path='docs/doc[@for="Thread.VolatileWrite12"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void VolatileWrite(ref Object address, Object value);
+
+        //| <include path='docs/doc[@for="Thread.MemoryBarrier"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public static extern void MemoryBarrier();
+
+        [NoHeapAllocation]
+        internal static unsafe void DisplayAbbrev(ref ThreadContext context, String s)
+        {
+            fixed (ThreadContext * pContext = &context) {
+                DebugStub.Print("{0}: ctx={1:x8} esp={2:x8} ebp={3:x8} eip={4:x8} " +
+                                "thr={5:x8} efl={6:x8} p={7:x8} n={8:x8}\n",
+                                __arglist(
+                                    s,
+                                    (UIntPtr)pContext,
+                                    context.esp,
+                                    context.ebp,
+                                    context.eip,
+                                    Kernel.AddressOf(context.thread),
+                                    context.efl,
+                                    (UIntPtr)context.prev,
+                                    (UIntPtr)context.next));
+            }
+        }
+
+        [NoHeapAllocation]
+        internal static unsafe void Display(ref ThreadContext context, String s)
+        {
+            fixed (ThreadContext * pContext = &context) {
+                DebugStub.Print("{0}: ctx={1:x8} num={2:x2}\n",
+                                __arglist(
+                                    s,
+                                    (UIntPtr)pContext,
+                                    context.num));
+            }
+
+            DebugStub.Print("  thr={0:x8} prv={1:x8} nxt={2:x8}\n",
+                            __arglist(
+                                (UIntPtr)Kernel.AddressOf(context.thread),
+                                (UIntPtr)context.prev,
+                                (UIntPtr)context.next));
+
+            DebugStub.Print("  eax={0:x8} ebx={1:x8} ecx={2:x8} edx={3:x8}\n",
+                            __arglist(
+                                context.eax,
+                                context.ebx,
+                                context.ecx,
+                                context.edx));
+
+            DebugStub.Print("  esp={0:x8} ebp={1:x8} esi={2:x8} edi={3:x8}\n",
+                            __arglist(
+                                context.esp,
+                                context.ebp,
+                                context.esi,
+                                context.edi));
+
+            DebugStub.Print("  eip={0:x8} efl={1:x8} err={2:x8} cr2={3:x8}\n",
+                            __arglist(
+                                context.eip,
+                                context.efl,
+                                context.err,
+                                context.cr2));
+        }
+
+        ///////////////////////////////////////////////// Blocking operations.
+        //
+        internal int WaitAny(WaitHandle[] waitHandles,
+                             int waitHandlesCount,
+                             TimeSpan timeout)
+        {
+            SchedulerTime stop = SchedulerTime.Now + timeout;
+            return WaitAny(waitHandles, waitHandlesCount, stop);
+        }
+
+        internal int WaitAny(WaitHandle[] waitHandles,
+                             int waitHandlesCount,
+                             SchedulerTime stop)
+        {
+            VTable.Assert(threadState == ThreadState.Running);
+            VTable.Assert(!blocked);
+
+            Kernel.Waypoint(100);
+            ThreadEntry[] entries = GetWaitEntries(waitHandlesCount);
+
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Thread target = null;
+
+                Scheduler.DispatchLock();
+                try {
+                    Kernel.Waypoint(101);
+
+                    // Enqueue on all of the non-signaled handles.
+                    for (int marked = 0; marked < waitHandlesCount; marked++) {
+                        if (waitHandles[marked].AcquireOrEnqueue(entries[marked])) {
+                            // If one of the handles was signaled, then abort waits...
+#if DEBUG_DISPATCH
+                            DebugStub.Print("Thread {0:x8} WaitAny 004 [Presignal] "+
+                                            "on {1:x8}\n",
+                                            __arglist(
+                                                Kernel.AddressOf(this),
+                                                Kernel.AddressOf(waitHandles[marked])));
+#endif // DEBUG_DISPATCH
+                            for (int released = 0; released < marked; released++) {
+                                entries[released].RemoveFromQueue();
+                            }
+                            Scheduler.DispatchRelease();
+                            return marked;
+                        }
+                    }
+
+                    blocked = true;
+                    blockedOn = entries;
+                    blockedOnCount = waitHandlesCount;
+                    blockedUntil = stop;
+                    Monitoring.Log(Monitoring.Provider.Thread,
+                                   (ushort)ThreadEvent.WaitAny, 0,
+                                   (uint)stop.Ticks, (uint)(stop.Ticks >> 32),
+                                   (uint)this.threadIndex, 0, 0);
+                    unblockedBy = WaitHandle.WaitTimeout;
+
+#if DEBUG_DISPATCH
+                    DebugStub.Print("Thread {0:x8} WaitAny 007 [Blocking] on\n",
+                                    __arglist(Kernel.AddressOf(this)));
+                    for (int i = 0; i < waitHandlesCount; i++) {
+                        DebugStub.Print("   {0:d3}: {1:x8}\n",
+                                        __arglist(i, Kernel.AddressOf(waitHandles[i])));
+                    }
+#endif // DEBUG_DISPATCH
+
+                    target = Scheduler.OnThreadBlocked(this, stop);
+                    Scheduler.SelectingThread(target);
+                }
+                catch(Exception e) {
+                    Scheduler.DispatchRelease();
+                    throw e;
+                }
+
+                if (target == null) {
+#if DEBUG_DISPATCH
+                    DebugStub.Print("Thread {0:x8} WaitAny 013 [Idle Thread]\n",
+                                    __arglist(Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+                    target = Processor.CurrentProcessor.IdleThread;
+                    VTable.Deny(Transitions.UnderGCControl(target.threadIndex));
+                }
+#if DEBUG_DISPATCH
+                DebugStub.Print("Thread {0:x8} WaitAny 014 [SwitchTo] thread {1:x8}\n",
+                                __arglist(
+                                    Kernel.AddressOf(this),
+                                    Kernel.AddressOf(target)));
+#endif // DEBUG_DISPATCH
+                target.SwitchTo();
+
+                // Execution will return here only after either the timeout
+                // period has been passed or one of the handles has been
+                // signalled. If we were unblocked, then WaitDone will have
+                // been called and unblockedBy will not be WaitHandle.WaitTimeout.
+                // If we timed out, then WaitFail will have been called.
+
+            }
+            finally {
+                //Kernel.Waypoint(114);
+                Processor.RestoreInterrupts(iflag);
+#if DEBUG_DISPATCH
+                DebugStub.Print("Thread {0:x8} WaitAny 019\n",
+                                __arglist(Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+            }
+
+            return unblockedBy;
+        }
+
+        // This method should only be called by low-level synchronization
+        // primitives derived from WaitHandle.  If you need to cause a
+        // thread to sleep or wake up, you should use those primitives
+        // instead.
+        [NoHeapAllocation]
+        internal void WaitDone(ThreadEntry entry)
+        {
+            Scheduler.AssertDispatchLockHeld();
+            // DebugStub.Break();  //
+
+            for (int i = 0; i < blockedOnCount; i++) {
+                if (blockedOn[i] == entry) {
+                    unblockedBy = i;
+                }
+                else {
+                    blockedOn[i].RemoveFromQueue();
+                }
+            }
+
+            // Tell the scheduler this thread is no longer blocked.
+            Scheduler.OnThreadUnblocked(this);
+
+            // Clear out the blocked information, after we know we won't want it.
+            blocked = false;
+            blockedOn = null; //No more beneficiaries of inherited time.
+            blockedOnCount = 0;
+        }
+
+        // This method is called when the scheduler has timed-out the wait.
+        [NoHeapAllocation]
+        internal void WaitFail()
+        {
+            Scheduler.AssertDispatchLockHeld();
+            // DebugStub.Break();  //
+
+#if DEBUG_DISPATCH
+            DebugStub.Print("Thread {0:x8} [WaitFail]\n",
+                            __arglist(Kernel.AddressOf(this)));
+#endif // DEBUG_DISPATCH
+
+            VTable.Assert(unblockedBy == WaitHandle.WaitTimeout);
+
+            for (int i = 0; i < blockedOnCount; i++) {
+                blockedOn[i].RemoveFromQueue();
+            }
+
+            Monitoring.Log(Monitoring.Provider.Thread,
+                           (ushort)ThreadEvent.WaitFail, 0,
+                           (uint)blockedUntil.Ticks,
+                           (uint)(blockedUntil.Ticks >> 32),
+                           (uint)this.threadIndex, 0, 0);
+
+            // Clear out the blocked information, after we know we won't want it.
+            blocked = false;
+            blockedOn = null; //No more beneficiaries of inherited time.
+            blockedOnCount = 0;
+        }
+
+        ///////////////////////////////////////////////// Context Switch Code.
+        //
+
+        // This method should only be called by the scheduler and by Yield().
+        //  precondition: Scheduler.dispatchLock held
+        // postcondition: Scheduler.dispatchLock released
+        [NoHeapAllocation]
+        private void SwitchTo()
+        {
+            Thread currentThread = CurrentThread;
+#if DONT
+
+            Tracing.Log(Tracing.Audit, "Schedule(old={0:x}, new={1:x})",
+                        Kernel.AddressOf(currentThread),
+                        Kernel.AddressOf(this));
+#endif
+#if DEBUG_SWITCH
+            Display(ref this.context, "New Context");
+#endif
+            Scheduler.AssertDispatchLockHeld();
+            Processor.CurrentProcessor.NumContextSwitches++;
+            //Tracing.LogContextSwitch(CurrentThread.GetThreadId(), this.GetThreadId());
+#if DEBUG_SWITCH
+            Thread.DisplayAbbrev(ref currentThread.context, "swi bef");
+#endif
+            Kernel.Waypoint(2);
+            Monitoring.Log(Monitoring.Provider.Thread,
+                           (ushort)ThreadEvent.SwitchTo, 0,
+                           (uint)this.context.threadIndex, 0, 0, 0, 0);
+            Processor.SwitchToThreadContext(ref currentThread.context,
+                                            ref this.context);
+            // Kernel.Waypoint(7);
+#if DEBUG_SWITCH
+            Thread.DisplayAbbrev(ref Thread.CurrentThread.context, "swi aft");
+#endif
+#if DONT
+            Display(ref currentThread.context, "Old Context");
+
+            Display(ref threadTable[0].context, "[0] Context");
+            Display(ref threadTable[1].context, "[1] Context");
+#endif
+        }
+
+
+        //
+        //////////////////////////////////////////////////////////////////////
+
+        [NoHeapAllocation]
+        public static void Yield()
+        {
+            bool iflag = Processor.DisableInterrupts();
+            try {
+                Thread target = CurrentThread;
+
+                Scheduler.DispatchLock();
+                try {
+                    Kernel.Waypoint(1);
+                    target = Scheduler.OnThreadYield(CurrentThread);
+#if DEBUG_DISPATCH
+                    DebugStub.Print("Yield.Selecting\n");
+#endif // DEBUG_DISPATCH
+                    Scheduler.SelectingThread(target);
+                }
+                catch(Exception e) {
+                    Scheduler.DispatchRelease();
+                    throw e;
+                }
+
+                if (target == null) {
+                    target = CurrentThread;
+                }
+                target.SwitchTo();
+            }
+            finally {
+                //Kernel.Waypoint(114);
+                Processor.RestoreInterrupts(iflag);
+            }
+        }
+
+        [NoHeapAllocation]
+        public bool IsWaiting()
+        {
+            return blocked;
+        }
+
+        [NoHeapAllocation]
+        public bool IsStopped()
+        {
+            return (threadState == ThreadState.Stopped);
+        }
+
+        [NoHeapAllocation]
+        public bool IsStopping()
+        {
+            return (threadState == ThreadState.Stopping ||
+                    threadState == ThreadState.Stopped);
+        }
+
+        [PreInitRefCounts]
+        static unsafe Thread()
+        {
+            threadIndexGenerator = 1;
+
+            DebugStub.Print("Thread()");
+
+            // Enable Thread.CurrentThread as soon as we can!
+            initialThread = Magic.toThread(GCs.BootstrapMemory.Allocate(typeof(Thread)));
+            initialThread.threadState = ThreadState.Running;
+            initialThread.SetKernelMode();
+            initialThread.threadIndex = 0;
+
+            // Allocate tables for thread management
+            threadTable = (Thread[])
+                GCs.BootstrapMemory.Allocate(typeof(Thread[]), maxThreads);
+
+            // Initialize the thread and event tables
+            threadTable[initialThread.threadIndex] = initialThread;
+
+            initialThread.context.threadIndex =
+                unchecked((ushort)(initialThread.threadIndex));
+            Transitions.InitializeStatusWord(ref initialThread.context);
+            initialThread.context.processId = unchecked((ushort)(1));
+
+            // Prevent stack linking.
+            initialThread.context.stackBegin = 0;
+            initialThread.context.stackLimit = 0;
+            initialThread.context.UpdateAfterGC(initialThread);
+            Processor.SetCurrentThreadContext(ref initialThread.context);
+
+#if DEBUG_THREAD_CONTEXT_ALIGNMENT
+            Tracing.Log(Tracing.Debug, "Thread.alignment = {0}",
+                        (((RuntimeType)typeof(Thread)).classVtable).baseAlignment);
+            Tracing.Log(Tracing.Debug, "ThreadContext.alignment = {0}",
+                        (((RuntimeType)typeof(ThreadContext)).classVtable).baseAlignment);
+            Tracing.Log(Tracing.Debug, "MmxContext.alignment = {0}",
+                        (((RuntimeType)typeof(MmxContext)).classVtable).baseAlignment);
+
+            Tracing.Log(Tracing.Debug, "&initialThread         = {0:x8}",
+                        Kernel.AddressOf(initialThread));
+            fixed (void *v = &initialThread.context) {
+                Tracing.Log(Tracing.Debug, "&initialThread.context = {0:x8}",
+                            (UIntPtr)v);
+            }
+            fixed (void *v = &initialThread.context.mmx) {
+                Tracing.Log(Tracing.Debug, "&initialThread.context.mmx = {0:x8}",
+                            (UIntPtr)v);
+            }
+            fixed (void *v = &initialThread.context.mmx.st0) {
+                Tracing.Log(Tracing.Debug, "&initialThread.context.mmx.st0 = {0:x8}",
+                            (UIntPtr)v);
+            }
+#endif
+
+            VTable.Assert((int)(((RuntimeType)typeof(Thread)).classVtable).baseAlignment == 16);
+            VTable.Assert((int)(((RuntimeType)typeof(ThreadContext)).classVtable).baseAlignment == 16);
+            VTable.Assert((int)(((RuntimeType)typeof(MmxContext)).classVtable).baseAlignment == 16);
+
+            Tracing.Log(Tracing.Debug, "InitialThread={0:x8}",
+                        Kernel.AddressOf(initialThread));
+            Monitoring.Log(Monitoring.Provider.Thread,
+                           (ushort)ThreadEvent.ThreadPackageInit);
+            initialThread.bumpAllocator.Dump();
+
+            Tracing.Log(Tracing.Debug, "Class constructor Thread() exiting\n");
+        }
+
+        internal static unsafe void FinishInitializeThread()
+        {
+            // Set the fields of initialThread
+            int stackVariable;
+            initialThread.context.stackBegin =
+                (new UIntPtr(&stackVariable) + 0xfff) & new UIntPtr(~0xfffU);
+            initialThread.context.stackLimit = 0;
+
+            initialThread.autoEvent = new AutoResetEvent(false);
+            initialThread.joinEvent = new ManualResetEvent(false);
+            initialThread.schedulerEntry = new ThreadEntry(initialThread);
+            initialThread.GetWaitEntries(1); // Cache allows wait without alloc
+            Transitions.RuntimeInitialized();
+            Transitions.ThreadStart();
+
+            // Instantiate the static variable that needs to be initialized
+            m_LocalDataStoreMgr = new LocalDataStoreMgr();
+
+            processStopException = new ProcessStopException();
+
+            // Tell the scheduler to initialize the thread.
+            Scheduler.OnThreadStateInitialize(initialThread, false);
+        }
+
+        /// <summary> Prepares a new Thread to take on role as kernel thread
+        /// for upcoming processor.  Called by Bootstrap processor. </summary>
+        public static Thread PrepareKernelThread()
+        {
+            Thread kernelThread = new Thread(null);
+            GC.NewThreadNotification(kernelThread, false);
+            return kernelThread;
+        }
+
+        public static void BindKernelThread(Thread  kernelThread,
+                                            UIntPtr stackBegin,
+                                            UIntPtr stackLimit)
+        {
+            kernelThread.context.processId  = initialThread.context.processId;
+            kernelThread.context.stackBegin = stackBegin;
+            kernelThread.context.stackLimit = 0/* stackLimit */;
+
+            kernelThread.context.UpdateAfterGC(kernelThread);
+            Processor.SetCurrentThreadContext(ref kernelThread.context);
+            kernelThread.threadState = ThreadState.Running;
+            Transitions.ThreadStart();
+        }
+
+        [NoHeapAllocation]
+        public void DumpStackInfo()
+        {
+            Tracing.Log(Tracing.Debug, "<< thr={0:x8} beg={1:x8} lim={2:x8} ptr={3:x8} >>",
+                        Kernel.AddressOf(this),
+                        context.stackBegin,
+                        context.stackLimit,
+                        Processor.GetStackPointer());
+        }
+
+        public Thread GetRunnableBeneficiary()
+        {
+            // this does a depth first search, not sure if that is a good idea.
+            if (threadState == ThreadState.Running) {
+                return this;
+            }
+            Thread tempThread;
+            for (int i = 0; blockedOn != null && i < blockedOnCount; i++) {
+                if (blockedOn[i] != null) {
+                    tempThread = blockedOn[i].GetBeneficiary();
+                    if (tempThread != null) {
+                        tempThread = tempThread.GetRunnableBeneficiary();
+                    }
+                    if (tempThread != null) {
+                        return tempThread;
+                    }
+                }
+            }
+            return null;
+        }
+
+#if THREAD_TIME_ACCOUNTING
+        // timestamp of last update for ExecutionTime
+        internal ulong LastUpdateTime
+        {
+            [NoHeapAllocation]
+            get { return context.lastExecutionTimeUpdate; }
+            [NoHeapAllocation]
+            set { context.lastExecutionTimeUpdate = value; }
+        }
+
+        // fixme: where to init. this one ???
+        //        FinishInitializeThread() seems to be called before
+        //        Processor.CyclesPerSecond is set up
+        //static private ulong multiplier = Processor.CyclesPerSecond /
+        //                                  TimeSpan.TicksPerSecond
+#else
+        protected TimeSpan executionTime;
+#endif
+        public TimeSpan ExecutionTime
+        {
+#if THREAD_TIME_ACCOUNTING
+            //[NoHeapAllocation]
+            get
+            {
+                ulong m = Processor.CyclesPerSecond / TimeSpan.TicksPerSecond;
+
+                bool saved = Processor.DisableInterrupts();
+                try
+                {
+                    if (Processor.GetCurrentThread() == this)
+                    {
+                        ulong now = Processor.CycleCount;
+                        context.executionTime += now -
+                            context.lastExecutionTimeUpdate;
+                        LastUpdateTime = now;
+                    }
+                }
+                finally
+                {
+                    Processor.RestoreInterrupts(saved);
+                }
+
+                // fixme: this division is bad (slow), hot to get rid of it?
+                return new TimeSpan((long)(context.executionTime / m));
+            }
+#else
+            [NoHeapAllocation]
+            get { return executionTime; }
+#endif
+        }
+
+#if THREAD_TIME_ACCOUNTING
+        // This provides access to the raw cycle counter, so access to it
+        // should be fast, compared to ExecutionTime.  This might be useful
+        // for monitoring code which calls this often and can postprocess
+        // these times otherwise
+        public ulong RawExecutionTime
+        {
+            //[NoHeapAllocation]
+            get
+            {
+                bool saved = Processor.DisableInterrupts();
+                try
+                {
+                    if (Processor.GetCurrentThread() == this)
+                    {
+                        ulong now = Processor.CycleCount;
+                        context.executionTime += now -
+                            context.lastExecutionTimeUpdate;
+                        LastUpdateTime = now;
+                    }
+                }
+                finally
+                {
+                    Processor.RestoreInterrupts(saved);
+                }
+
+                return context.executionTime;
+            }
+        }
+#endif
+
+        internal static
+        void VisitBootstrapData(NonNullReferenceVisitor visitor)
+        {
+            visitor.VisitReferenceFields(initialThread);
+            visitor.VisitReferenceFields(threadTable);
+        }
+
+        internal static void UpdateAfterGC()
+        {
+            // Update all the thread pointers in the thread contexts
+            for (int i = 0; i < threadTable.Length; i++) {
+                Thread thread = threadTable[i];
+                if (thread != null) {
+                    thread.context.UpdateAfterGC(thread);
+                }
+            }
+        }
+
+        // Cache for ABI synchronization
+        private WaitHandle[] syncHandles;
+        internal WaitHandle[] GetSyncHandles(int num)
+        {
+            if (syncHandles == null || syncHandles.Length < num) {
+                syncHandles = new WaitHandle[num + 8];
+            }
+            return syncHandles;
+        }
+
+        // Cache for handle synchronization
+        private ThreadEntry[] entries;
+        internal ThreadEntry[] GetWaitEntries(int num)
+        {
+            if (entries == null || entries.Length < num) {
+                num += 8;   // So we don't have to do this too frequently.
+                entries = new ThreadEntry[num];
+                for (int i = 0; i < num; i++) {
+                    entries[i] = new ThreadEntry(this);
+                }
+            }
+            return entries;
+        }
+
+        // Caches for Select synchronization
+        // We use stacks, because selectable abstractions might
+        // internally implement HeadMatches using select receive
+        // which is called from within an outer select.
+        // NOTE however that internal selects should never block
+        // (use timeout)
+        private Stack selectBoolsStack;
+        private Stack selectObjectsStack;
+        private Stack selectSyncHandlesStack;
+
+        public bool[] PopSelectBools(int size)
+        {
+            if (selectBoolsStack == null) {
+                selectBoolsStack = new Stack();
+            }
+            if (selectBoolsStack.Count == 0) {
+                return new bool [size];
+            }
+            bool[] selectBools = (bool[])selectBoolsStack.Pop();
+            if (selectBools.Length < size) {
+                return new bool [size];
+            }
+            return selectBools;
+        }
+
+        public void PushSelectBools(bool[] cache) {
+            selectBoolsStack.Push(cache);
+        }
+
+        public ISelectable[] PopSelectObjects(int size)
+        {
+            if (selectObjectsStack == null) {
+                selectObjectsStack = new Stack();
+            }
+            if (selectObjectsStack.Count == 0) {
+                return new ISelectable [size];
+            }
+            ISelectable[] selectObjects = (ISelectable[])selectObjectsStack.Pop();
+            if (selectObjects.Length < size) {
+                return new ISelectable [size];
+            }
+            return selectObjects;
+        }
+        public void PushSelectObjects(ISelectable[] cache) {
+            for (int i=0; i<cache.Length; i++) {
+                cache[i] = null;
+            }
+            selectObjectsStack.Push(cache);
+        }
+
+        public SyncHandle[] PopSelectSyncHandles(int size)
+        {
+            if (selectSyncHandlesStack == null) {
+                selectSyncHandlesStack = new Stack();
+            }
+            if (selectSyncHandlesStack.Count == 0) {
+                return new SyncHandle [size];
+            }
+            SyncHandle[] selectSyncHandles = (SyncHandle[])selectSyncHandlesStack.Pop();
+            if (selectSyncHandles.Length < size) {
+                return new SyncHandle [size];
+            }
+            return selectSyncHandles;
+        }
+        public void PushSelectSyncHandles(SyncHandle[] cache) {
+            for (int i=0; i<cache.Length; i++) {
+                cache[i] = new SyncHandle();
+            }
+            selectSyncHandlesStack.Push(cache);
+        }
+
+
+        // Given a frame's range in memory (its esp/ebp), check whether
+        // the frame contains the top transition record.  If so,
+        // prepare to skip over a process's frames.
+        [AccessedByRuntime("referenced from halasm.asm")]
+        [NoStackLinkCheck] // We don't want to throw an exception here;
+            // Therefore, we cannot risk allocating stack segments,
+            // and we should only call other NoStackLinkCheck functions (XXX).
+        internal static unsafe UIntPtr CheckKernelProcessBoundary(UIntPtr esp, UIntPtr ebp, Exception exn)
+        {
+            ThreadContext *context = Processor.GetCurrentThreadContext();
+            System.GCs.CallStack.TransitionRecord *topMarker = context->processMarkers;
+            System.GCs.CallStack.TransitionRecord *secondMarker = context->stackMarkers;
+            UIntPtr topMarkerPtr = (UIntPtr) topMarker;
+            // If the top marker is in our frame, we've reached a boundary:
+            if (esp < topMarkerPtr && topMarkerPtr <= ebp) {
+                Thread.CurrentThread.lastUncaughtException = exn;
+                //   Is this a ProcessStopException?  If not, it's a bug; log the bug.
+                if (!(exn is ProcessStopException)) {
+                    // Log the bug, but don't do anything that could
+                    // throw another exception (e.g. memory allocation).
+                    // XXX: what if stack allocation throws an exception here?
+                    DebugStub.Print("Bug: kernel exception thrown to process (saved to Thread.LastUncaughtException)\n");
+                    Tracing.Log(Tracing.Warning, "Bug: kernel exception thrown to process (saved to Thread.LastUncaughtException)\n");
+                }
+                //   atomic
+                //   {   // do these together so we never enter process mode
+                //       remove top process->kernel marker from marker list
+                //       remove top kernel->process marker from marker list
+                //   }
+                bool iflag = Processor.DisableInterrupts();
+                Scheduler.DispatchLock();
+                try {
+                    context->processMarkers = context->processMarkers->oldTransitionRecord;
+                    context->stackMarkers = context->stackMarkers->oldTransitionRecord;
+                    context->SetKernelMode();
+                }
+                finally {
+                    Scheduler.DispatchRelease();
+                    Processor.RestoreInterrupts(iflag);
+                }
+
+                //Return the kernel->process marker, in preparation for these operations:
+                //   edx := retAddr from *stackBottom from kernel->process marker
+                //   restore esp,ebp from kernel->process marker
+                //   while(top kernel->process marker not in stack segment)
+                //       pop (and free) stack segment
+                //   restore ebx,edi,esi from kernel->process marker
+                return new UIntPtr(secondMarker);
+            }
+            else {
+                return 0;
+            }
+        }
+
+        // Discard any garbage stack segments that follow the segment
+        // containing the marker.  After this runs, the topmost stack
+        // segment will contain the marker.
+        [AccessedByRuntime("referenced from halasm.asm")]
+        [NoStackLinkCheck]
+        internal static unsafe void DiscardSkippedStackSegments(System.GCs.CallStack.TransitionRecord *marker)
+        {
+            ThreadContext *context = Processor.GetCurrentThreadContext();
+            UIntPtr markerPtr = new UIntPtr(marker);
+            //   while(top kernel->process marker not in stack segment)
+            //       pop (and free) stack segment
+
+            //
+            // HACKHACK think about what this is doing. The topmost
+            // stack segment is the one *currently in use*. On a paging
+            // system, freeing it unmaps the underlying physical page.
+            // Needless to say, our ability to use esp after that is
+            // severely compromised.
+            //
+#if !PAGING
+            while ((context->stackBegin != 0) && !(context->stackLimit <= markerPtr && markerPtr < context->stackBegin)) {
+                Microsoft.Singularity.Memory.Stacks.ReturnStackSegment(ref *context);
+            }
+#endif
+
+            // Unlink marker:
+            context->stackMarkers = marker->oldTransitionRecord;
+        }
+
+        // Most recently thrown exception object that the thread
+        // did not catch at all (i.e. that propagated to the bottom
+        // of the stack without encountering an appropriate catch clause).
+        public Exception LastUncaughtException
+        {
+            [NoHeapAllocation]
+            get {
+                return lastUncaughtException;
+            }
+        }
+
+#if PAGING
+        // Switch to a different protection domain. This is an advanced stunt
+        // for use by kernel threads only
+        internal static void SwitchToDomain(ProtectionDomain newDomain)
+        {
+            Thread currentThread = CurrentThread;
+            currentThread.CheckAddressSpaceConsistency();
+
+            AddressSpace processorSpace = Processor.GetCurrentAddressSpace();
+            AddressSpace newSpace = newDomain.AddressSpace;
+
+            if (newSpace != processorSpace) {
+                Processor.ChangeAddressSpace(newSpace);
+                currentThread.tempDomain = newDomain;
+            }
+
+            currentThread.CheckAddressSpaceConsistency();
+        }
+
+        // Call this to snap back to our parent process' domain.
+        internal static void RevertToParentDomain()
+        {
+            Thread currentThread = CurrentThread;
+            currentThread.CheckAddressSpaceConsistency();
+            Processor.ChangeAddressSpace(currentThread.process.Domain.AddressSpace);
+            currentThread.tempDomain = null;
+            currentThread.CheckAddressSpaceConsistency();
+        }
+
+        // This property provides the correct answer even when an
+        // arbitrary protection domain is temporarily being used
+        internal ProtectionDomain CurrentDomain {
+            get {
+                CheckAddressSpaceConsistency();
+                return (tempDomain != null) ? tempDomain : process.Domain;
+            }
+        }
+
+        [Inline]
+        private void CheckAddressSpaceConsistency()
+        {
+            ProtectionDomain currentDomain = (tempDomain != null) ? tempDomain : process.Domain;
+            DebugStub.Assert(Processor.GetCurrentAddressSpace() ==
+                             currentDomain.AddressSpace);
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/Threading/ThreadLocalServiceRequest.cs b/base/Kernel/System/Threading/ThreadLocalServiceRequest.cs
new file mode 100644
index 0000000..fb4610f
--- /dev/null
+++ b/base/Kernel/System/Threading/ThreadLocalServiceRequest.cs
@@ -0,0 +1,120 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadLocalServiceRequest.cs
+//
+//  Note:
+//
+
+using Microsoft.Singularity;
+
+namespace System.Threading
+{
+    internal enum ThreadLocalServiceRequestTag
+    {
+        SuspendProcess,
+        SuspendProcessRecursive,
+        ResumeProcess,
+        ResumeProcessRecursive,
+        StopProcess,
+        ThreadStopped,
+    }
+
+    // Some service request objects should not be allocated on demand, because
+    // they are needed in low-memory situations.  To handle these situations, each
+    // thread contains a preallocated, reusable ThreadLocalServiceRequest
+    // object whose tag describes the precise purpose of each request.
+    // This object should only be used by its own thread.  The thread
+    // will block until the request is finished.  After one request finishes,
+    // the thread may reuse its ThreadLocalServiceRequest for another
+    // request.
+    public class ThreadLocalServiceRequest : ServiceRequest
+    {
+        ThreadLocalServiceRequestTag tag;
+        Process targetProcess; // only relevant to SuspendProcess, SuspendProcessRecursive, ResumeProcess, ResumeProcessRecursive, StopProcess
+        Thread targetThread; // only relevant to ThreadStopped
+        int exitCode; // only relevant to StopProcess
+        AutoResetEvent requestFinished = new AutoResetEvent(false);
+        bool processStarted; // only relevant to SuspendProcess, ResumeProcess
+
+        [CLSCompliant(false)]
+        public static bool SuspendProcess(Process process, bool recursive)
+        {
+            ThreadLocalServiceRequest req = Thread.CurrentThread.localServiceRequest;
+            req.tag = (recursive)?
+                (ThreadLocalServiceRequestTag.SuspendProcessRecursive):
+                (ThreadLocalServiceRequestTag.SuspendProcess);
+            req.targetProcess = process;
+            ServiceThread.Request(req);
+            req.requestFinished.WaitOne();
+            return req.processStarted;
+        }
+
+        [CLSCompliant(false)]
+        public static bool ResumeProcess(Process process, bool recursive)
+        {
+            ThreadLocalServiceRequest req = Thread.CurrentThread.localServiceRequest;
+            req.tag = (recursive)?
+                (ThreadLocalServiceRequestTag.ResumeProcessRecursive):
+                (ThreadLocalServiceRequestTag.ResumeProcess);
+            req.targetProcess = process;
+            ServiceThread.Request(req);
+            req.requestFinished.WaitOne();
+            return req.processStarted;
+        }
+
+        [CLSCompliant(false)]
+        public static void StopProcess(Process process, int exitCode)
+        {
+            ThreadLocalServiceRequest req = Thread.CurrentThread.localServiceRequest;
+            req.tag = ThreadLocalServiceRequestTag.StopProcess;
+            req.targetProcess = process;
+            req.exitCode = exitCode;
+            ServiceThread.Request(req);
+            req.requestFinished.WaitOne();
+            process.Join();
+        }
+
+        public static void CurrentThreadStopped()
+        {
+            ThreadLocalServiceRequest req = Thread.CurrentThread.localServiceRequest;
+            req.tag = ThreadLocalServiceRequestTag.ThreadStopped;
+            req.targetThread = Thread.CurrentThread;
+            ServiceThread.Request(req);
+            // Do not wait for requestFinished; let the current thread die instead.
+            // (This is the last request this thread ever makes.)
+        }
+
+        protected override internal void Service()
+        {
+            try {
+                switch (tag) {
+                    case ThreadLocalServiceRequestTag.SuspendProcess:
+                        processStarted = targetProcess.ServiceSuspend(false);
+                        break;
+                    case ThreadLocalServiceRequestTag.SuspendProcessRecursive:
+                        processStarted = targetProcess.ServiceSuspend(true);
+                        break;
+                    case ThreadLocalServiceRequestTag.ResumeProcess:
+                        processStarted = targetProcess.ServiceResume(false);
+                        break;
+                    case ThreadLocalServiceRequestTag.ResumeProcessRecursive:
+                        processStarted = targetProcess.ServiceResume(true);
+                        break;
+                    case ThreadLocalServiceRequestTag.StopProcess:
+                        targetProcess.ServiceStop(exitCode);
+                        break;
+                    case ThreadLocalServiceRequestTag.ThreadStopped:
+                        targetThread.ServiceStopped();
+                        break;
+                }
+            }
+            finally {
+                requestFinished.Set();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/ThreadStart.cs b/base/Kernel/System/Threading/ThreadStart.cs
new file mode 100644
index 0000000..f3da99e
--- /dev/null
+++ b/base/Kernel/System/Threading/ThreadStart.cs
@@ -0,0 +1,26 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ThreadStart
+**
+**
+** Purpose: This class is a Delegate which defines the start method
+**  for starting a thread.  That method must match this delegate.
+**
+** Date: August 1998
+**
+=============================================================================*/
+
+namespace System.Threading {
+    using System.Threading;
+
+    // Define the delegate
+    // NOTE: If you change the signature here, there is code in COMSynchronization
+    //  that invokes this delegate in native.
+    //| <include path='docs/doc[@for="ThreadStart"]/*' />
+    public delegate void ThreadStart();
+}
diff --git a/base/Kernel/System/Threading/ThreadState.cs b/base/Kernel/System/Threading/ThreadState.cs
new file mode 100644
index 0000000..b111b28
--- /dev/null
+++ b/base/Kernel/System/Threading/ThreadState.cs
@@ -0,0 +1,35 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ThreadState
+**
+**
+** Purpose: Enum to represent the different thread states
+**
+** Date: Feb 2, 2000
+**
+=============================================================================*/
+
+namespace System.Threading {
+
+    //| <include path='docs/doc[@for="ThreadState"]/*' />
+    public enum ThreadState
+    {
+        /*=========================================================================
+        ** Constants for thread states.
+        =========================================================================*/
+        //| <include path='docs/doc[@for="ThreadState.Running"]/*' />
+        Running = 0,
+        //| <include path='docs/doc[@for="ThreadState.Unstarted"]/*' />
+        Unstarted = 1,
+        //| <include path='docs/doc[@for="ThreadState.Stopping"]/*' />
+        Stopping = 2,
+        //| <include path='docs/doc[@for="ThreadState.Stopped"]/*' />
+        Stopped = 3,
+        Suspended = 4,
+    }
+}
diff --git a/base/Kernel/System/Threading/ThreadStateException.cs b/base/Kernel/System/Threading/ThreadStateException.cs
new file mode 100644
index 0000000..dd453a9
--- /dev/null
+++ b/base/Kernel/System/Threading/ThreadStateException.cs
@@ -0,0 +1,38 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: ThreadStateException
+**
+**
+** Purpose: An exception class to indicate that the Thread class is in an
+**          invalid state for the method.
+**
+** Date: April 1, 1998
+**
+=============================================================================*/
+
+namespace System.Threading {
+    using System;
+
+    //| <include path='docs/doc[@for="ThreadStateException"]/*' />
+    public class ThreadStateException : SystemException {
+        //| <include path='docs/doc[@for="ThreadStateException.ThreadStateException"]/*' />
+        public ThreadStateException()
+            : base("Arg_ThreadStateException") {
+        }
+
+        //| <include path='docs/doc[@for="ThreadStateException.ThreadStateException1"]/*' />
+        public ThreadStateException(String message)
+            : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="ThreadStateException.ThreadStateException2"]/*' />
+        public ThreadStateException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Kernel/System/Threading/Timeout.cs b/base/Kernel/System/Threading/Timeout.cs
new file mode 100644
index 0000000..ce73b5e
--- /dev/null
+++ b/base/Kernel/System/Threading/Timeout.cs
@@ -0,0 +1,25 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Threading {
+    using System.Threading;
+    using System;
+    // A constant used by methods that take a timeout (Object.Wait, Thread.Sleep
+    // etc) to indicate that no timeout should occur.
+    //
+    // @todo: this should become an enum.
+    //| <include path='docs/doc[@for="Timeout"]/*' />
+    public sealed class Timeout
+    {
+        private Timeout()
+        {
+        }
+
+        //| <include path='docs/doc[@for="Timeout.Infinite"]/*' />
+        public const int Infinite = -1;
+    }
+
+}
diff --git a/base/Kernel/System/Threading/WaitHandle.cs b/base/Kernel/System/Threading/WaitHandle.cs
new file mode 100644
index 0000000..f17e8b3
--- /dev/null
+++ b/base/Kernel/System/Threading/WaitHandle.cs
@@ -0,0 +1,147 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System.Threading {
+    using System;
+    using System.Threading;
+    using System.Runtime.CompilerServices;
+    using System.Collections;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Io;
+    using Microsoft.Singularity.Scheduling;
+
+    [CLSCompliant(false)]
+    public enum WaitHandleEvent : ushort
+    {
+        WaitDone = 10,
+    }
+
+    //| <include path='docs/doc[@for="WaitHandle"]/*' />
+    [NoCCtor]
+    [CLSCompliant(false)]
+    public abstract class WaitHandle
+    {
+        // These two fields should only be accessed with interrupts off.
+        protected volatile int signaled;
+        protected volatile Thread owner;     // Last thread to be notified by this signal.
+        protected ThreadQueue queue;
+        protected int id;                     // unique ID for this waithandle
+        private static int idGenerator;
+
+        // This field is an array of length 1 containing 'this'.
+        // It is used to avoid allocation when calling WaitAny from WaitOne.
+        internal WaitHandle[] singleHandle;
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitTimeout"]/*' />
+        public const int WaitTimeout = -1;
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitHandle"]/*' />
+        protected WaitHandle(int initialState)
+        {
+            id = ++idGenerator;
+            owner = null;
+            queue = new ThreadQueue(this);
+            signaled = initialState;
+            singleHandle = new WaitHandle [1] { this };
+        }
+
+        // Called with dispatch lock held and interrupts off.
+        [NoHeapAllocation]
+        protected bool NotifyOne()
+        {
+            Kernel.Waypoint(201);
+
+            ThreadEntry entry = queue.DequeueHead();
+            if (entry != null) {
+                //Kernel.Waypoint(202);
+                owner = entry.Thread;
+                Monitoring.Log(Monitoring.Provider.WaitHandle,
+                               (ushort)WaitHandleEvent.WaitDone, 0,
+                               (uint)this.id, (uint)owner.threadIndex,
+                               0, 0, 0);
+                entry.Thread.WaitDone(entry);
+                //Kernel.Waypoint(203);
+                return true;
+            }
+            return false;
+        }
+
+        // Called with dispatch lock held and interrupts off.
+        [NoHeapAllocation]
+        protected bool NotifyAll()
+        {
+            Kernel.Waypoint(204);
+            bool notified = false;
+
+            for (ThreadEntry entry; (entry = queue.DequeueHead()) != null;) {
+                //Kernel.Waypoint(205);
+                owner = entry.Thread;
+                Monitoring.Log(Monitoring.Provider.WaitHandle,
+                               (ushort)WaitHandleEvent.WaitDone, 0,
+                               (uint)this.id, (uint)owner.threadIndex,
+                               0, 0, 0);
+                entry.Thread.WaitDone(entry);
+                //Kernel.Waypoint(206);
+                notified = true;
+            }
+            //Kernel.Waypoint(207);
+            return notified;
+        }
+
+        // Called with interrupts off.
+        internal abstract bool AcquireOrEnqueue(ThreadEntry entry);
+
+        /// Used to return a thread which can make progress on this object.
+        [NoHeapAllocation]
+        internal abstract Thread GetBeneficiary();
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne"]/*' />
+        public bool WaitOne(TimeSpan timeout)
+        {
+            return Thread.CurrentThread.WaitAny(singleHandle, 1, timeout) != WaitTimeout;
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne1"]/*' />
+        internal bool WaitOne(SchedulerTime stop)
+        {
+            return Thread.CurrentThread.WaitAny(singleHandle, 1, stop) != WaitTimeout;
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitOne2"]/*' />
+        public bool WaitOne()
+        {
+            return WaitOne(SchedulerTime.MaxValue);
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitAny"]/*' />
+        public static int WaitAny(WaitHandle[] waitHandles,
+                                  TimeSpan timeout)
+        {
+            return Thread.CurrentThread.WaitAny(waitHandles, waitHandles.Length, timeout);
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitAny"]/*' />
+        public static int WaitAny(WaitHandle[] waitHandles,
+                                  SchedulerTime stop)
+        {
+            return Thread.CurrentThread.WaitAny(waitHandles, waitHandles.Length, stop);
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitAny"]/*' />
+        public static int WaitAny(WaitHandle[] waitHandles,
+                                  int waitHandlesCount,
+                                  SchedulerTime stop)
+        {
+            return Thread.CurrentThread.WaitAny(waitHandles, waitHandlesCount, stop);
+        }
+
+        //| <include path='docs/doc[@for="WaitHandle.WaitAny2"]/*' />
+        public static int WaitAny(WaitHandle[] waitHandles)
+        {
+            return WaitAny(waitHandles, SchedulerTime.MaxValue);
+        }
+    }
+}
diff --git a/base/Kernel/System/TimeSpan.cs b/base/Kernel/System/TimeSpan.cs
new file mode 100644
index 0000000..a4b9e5a
--- /dev/null
+++ b/base/Kernel/System/TimeSpan.cs
@@ -0,0 +1,487 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+    using System.Text;
+    using System.Runtime.CompilerServices;
+    using System;
+
+    // TimeSpan represents a duration of time.  A TimeSpan can be negative
+    // or positive.
+    //
+    // TimeSpan is internally represented as a number of ticks (100ns).  While
+    // this maps well into units of time such as hours and days, any
+    // periods longer than that aren't representable in a nice fashion.
+    // For instance, a month can be between 28 and 31 days, while a year
+    // can contain 365 or 364 days.  A decade can have between 1 and 3 leap years,
+    // depending on when you map the TimeSpan into the calendar.  This is why
+    // we do not provide Years() or Months().
+    //
+    // TimeSpans are limited to approximately 14623 years.
+    //
+    //| <include path='docs/doc[@for="TimeSpan"]/*' />
+    public struct TimeSpan : IComparable
+    {
+        //| <include path='docs/doc[@for="TimeSpan.TicksPerMillisecond"]/*' />
+        public const long TicksPerMillisecond = 10000;
+        //| <include path='docs/doc[@for="TimeSpan.TicksPerSecond"]/*' />
+        public const long TicksPerSecond = TicksPerMillisecond * 1000;
+        //| <include path='docs/doc[@for="TimeSpan.TicksPerMinute"]/*' />
+        public const long TicksPerMinute = TicksPerSecond * 60;
+        //| <include path='docs/doc[@for="TimeSpan.TicksPerHour"]/*' />
+        public const long TicksPerHour = TicksPerMinute * 60;
+        //| <include path='docs/doc[@for="TimeSpan.TicksPerDay"]/*' />
+        public const long TicksPerDay = TicksPerHour * 24;
+
+        private const int MillisPerSecond = 1000;
+        private const int MillisPerMinute = MillisPerSecond * 60;
+        private const int MillisPerHour = MillisPerMinute * 60;
+        private const int MillisPerDay = MillisPerHour * 24;
+
+        private const long MaxSeconds = Int64.MaxValue / TicksPerSecond;
+        private const long MinSeconds = Int64.MinValue / TicksPerSecond;
+
+        private const long MaxMilliSeconds = Int64.MaxValue / TicksPerMillisecond;
+        private const long MinMilliSeconds = Int64.MinValue / TicksPerMillisecond;
+
+
+        //| <include path='docs/doc[@for="TimeSpan.Zero"]/*' />
+        public static readonly TimeSpan Zero = new TimeSpan(0);
+
+        //| <include path='docs/doc[@for="TimeSpan.MaxValue"]/*' />
+        public static readonly TimeSpan MaxValue = new TimeSpan(Int64.MaxValue);
+        //| <include path='docs/doc[@for="TimeSpan.MinValue"]/*' />
+        public static readonly TimeSpan MinValue = new TimeSpan(Int64.MinValue);
+
+        public static readonly TimeSpan Infinite = new TimeSpan(Int64.MaxValue);
+
+        // internal so that DateTime doesn't have to call an extra get
+        // method for some arithmetic operations.
+        internal long _ticks;
+
+        //public TimeSpan() {
+        //    _ticks = 0;
+        //}
+
+        //| <include path='docs/doc[@for="TimeSpan.TimeSpan"]/*' />
+        [NoHeapAllocation]
+        public TimeSpan(long ticks) {
+            this._ticks = ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TimeSpan1"]/*' />
+        public TimeSpan(int hours, int minutes, int seconds) {
+            _ticks = TimeToTicks(hours, minutes, seconds);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TimeSpan2"]/*' />
+        public TimeSpan(int days, int hours, int minutes, int seconds)
+            : this(days,hours,minutes,seconds,0)
+        {
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TimeSpan3"]/*' />
+        public TimeSpan(int days, int hours, int minutes, int seconds, int milliseconds)
+        {
+            long totalMilliSeconds = ((long)days * 3600 * 24 + hours * 3600 + minutes * 60 + seconds) * 1000 + milliseconds;
+            if (totalMilliSeconds > MaxMilliSeconds || totalMilliSeconds < MinMilliSeconds)
+                throw new ArgumentOutOfRangeException("Overflow_TimeSpanTooLong");
+            _ticks =  (long)totalMilliSeconds * TicksPerMillisecond;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Ticks"]/*' />
+        public long Ticks {
+            [NoHeapAllocation]
+            get { return _ticks; }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Days"]/*' />
+        public int Days {
+            get { return (int)(_ticks / TicksPerDay); }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Hours"]/*' />
+        public int Hours {
+            get { return (int)((_ticks / TicksPerHour) % 24); }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Milliseconds"]/*' />
+        public int Milliseconds {
+            get { return (int)((_ticks / TicksPerMillisecond) % 1000); }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Minutes"]/*' />
+        public int Minutes {
+            get { return (int)((_ticks / TicksPerMinute) % 60); }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Seconds"]/*' />
+        public int Seconds {
+            get { return (int)((_ticks / TicksPerSecond) % 60); }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TotalDays"]/*' />
+        public long TotalDays {
+            get { return _ticks / TicksPerDay; }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TotalHours"]/*' />
+        public long TotalHours {
+            get { return _ticks / TicksPerHour; }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TotalMilliseconds"]/*' />
+        public long TotalMilliseconds {
+            get {
+                return _ticks / TicksPerMillisecond;
+            }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TotalMinutes"]/*' />
+        public long TotalMinutes {
+            get { return _ticks / TicksPerMinute; }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.TotalSeconds"]/*' />
+        public long TotalSeconds {
+            get { return _ticks / TicksPerSecond; }
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Add"]/*' />
+        public TimeSpan Add(TimeSpan ts) {
+            long result = _ticks + ts._ticks;
+            // Overflow if signs of operands was identical and result's
+            // sign was opposite.
+            // >> 63 gives the sign bit (either 64 1's or 64 0's).
+            if ((_ticks >> 63 == ts._ticks >> 63) && (_ticks >> 63 != result >> 63))
+                throw new OverflowException("Overflow_TimeSpanTooLong");
+            return new TimeSpan(result);
+        }
+
+        [NoHeapAllocation]
+        public TimeSpan AddNoAlloc(TimeSpan ts) {
+            long result = _ticks + ts._ticks;
+            // Overflow if signs of operands was identical and result's
+            // sign was opposite.
+            // >> 63 gives the sign bit (either 64 1's or 64 0's).
+            if ((_ticks >> 63 == ts._ticks >> 63) && (_ticks >> 63 != result >> 63))
+                return TimeSpan.Infinite;
+            return new TimeSpan(result);
+        }
+
+
+        // Compares two TimeSpan values, returning an integer that indicates their
+        // relationship.
+        //
+        //| <include path='docs/doc[@for="TimeSpan.Compare"]/*' />
+        public static int Compare(TimeSpan t1, TimeSpan t2) {
+            if (t1._ticks > t2._ticks) return 1;
+            if (t1._ticks < t2._ticks) return -1;
+            return 0;
+        }
+
+        // Returns a value less than zero if this object
+        //| <include path='docs/doc[@for="TimeSpan.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) return 1;
+            if (!(value is TimeSpan))
+                throw new ArgumentException("Arg_MustBeTimeSpan");
+            long t = ((TimeSpan)value)._ticks;
+            if (_ticks > t) return 1;
+            if (_ticks < t) return -1;
+            return 0;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.FromDays"]/*' />
+        public static TimeSpan FromDays(long value) {
+            return Interval(value, MillisPerDay);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Duration"]/*' />
+        public TimeSpan Duration() {
+            if (_ticks == TimeSpan.MinValue._ticks)
+                throw new OverflowException("Overflow_NegateTwosCompNum");
+            return new TimeSpan(_ticks >= 0? _ticks: -_ticks);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Equals"]/*' />
+        public override bool Equals(Object value) {
+            if (value is TimeSpan) {
+                return _ticks == ((TimeSpan)value)._ticks;
+            }
+            return false;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Equals1"]/*' />
+        public static bool Equals(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks == t2._ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (int)_ticks ^ (int)(_ticks >> 32);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.FromHours"]/*' />
+        public static TimeSpan FromHours(long value) {
+            return Interval(value, MillisPerHour);
+        }
+
+        private static TimeSpan Interval(long value, int scale) {
+            long millis = value * scale;
+            if ((millis > MaxMilliSeconds) || (millis < MinMilliSeconds)) {
+                throw new OverflowException("Overflow_TimeSpanTooLong");
+            }
+            return new TimeSpan(millis * TicksPerMillisecond);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.FromMilliseconds"]/*' />
+        public static TimeSpan FromMilliseconds(long value) {
+            return Interval(value, 1);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.FromMinutes"]/*' />
+        public static TimeSpan FromMinutes(long value) {
+            return Interval(value, MillisPerMinute);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Negate"]/*' />
+        public TimeSpan Negate() {
+            if (_ticks==TimeSpan.MinValue._ticks)
+                throw new OverflowException("Overflow_NegateTwosCompNum");
+            return new TimeSpan(-_ticks);
+        }
+
+        // Constructs a TimeSpan from a string.  Leading and trailing white
+        // space characters are allowed.
+        //
+        //| <include path='docs/doc[@for="TimeSpan.Parse"]/*' />
+        public static TimeSpan Parse(String s) {
+            return new TimeSpan(new StringParser().Parse(s, true));
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.FromSeconds"]/*' />
+        public static TimeSpan FromSeconds(long value) {
+            return Interval(value, MillisPerSecond);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.Subtract"]/*' />
+        public TimeSpan Subtract(TimeSpan ts) {
+            long result = _ticks - ts._ticks;
+            // Overflow if signs of operands was different and result's
+            // sign was opposite from the first argument's sign.
+            // >> 63 gives the sign bit (either 64 1's or 64 0's).
+            if ((_ticks >> 63 != ts._ticks >> 63) && (_ticks >> 63 != result >> 63))
+                throw new OverflowException("Overflow_TimeSpanTooLong");
+            return new TimeSpan(result);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.FromTicks"]/*' />
+        public static TimeSpan FromTicks(long value) {
+            return new TimeSpan(value);
+        }
+
+        internal static long TimeToTicks(int hour, int minute, int second) {
+            // totalSeconds is bounded by 2^31 * 2^12 + 2^31 * 2^8 + 2^31,
+            // which is less than 2^44, meaning we won't overflow totalSeconds.
+            long totalSeconds = (long)hour * 3600 + (long)minute * 60 + (long)second;
+            if (totalSeconds > MaxSeconds || totalSeconds < MinSeconds)
+                throw new ArgumentOutOfRangeException("Overflow_TimeSpanTooLong");
+            return totalSeconds * TicksPerSecond;
+        }
+
+        private String IntToString(int n, int digits) {
+            return ParseNumbers.IntToString(n, 10, digits, '0', 0);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.ToString"]/*' />
+        public override String ToString() {
+            StringBuilder sb = new StringBuilder();
+            int day = (int)(_ticks / TicksPerDay);
+            long time = _ticks % TicksPerDay;
+            if (_ticks < 0) {
+                sb.Append("-");
+                day = -day;
+                time = -time;
+            }
+            if (day != 0) {
+                sb.Append(day);
+                sb.Append(".");
+            }
+            sb.Append(IntToString((int)(time / TicksPerHour % 24), 2));
+            sb.Append(":");
+            sb.Append(IntToString((int)(time / TicksPerMinute % 60), 2));
+            sb.Append(":");
+            sb.Append(IntToString((int)(time / TicksPerSecond % 60), 2));
+            int t = (int)(time % TicksPerSecond);
+            if (t != 0) {
+                sb.Append(".");
+                sb.Append(IntToString(t, 7));
+            }
+            return sb.ToString();
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorSUB1"]/*' />
+        public static TimeSpan operator -(TimeSpan t) {
+            if (t._ticks==TimeSpan.MinValue._ticks)
+                throw new OverflowException("Overflow_NegateTwosCompNum");
+            return new TimeSpan(-t._ticks);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorSUB2"]/*' />
+        public static TimeSpan operator -(TimeSpan t1, TimeSpan t2) {
+            return t1.Subtract(t2);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorADD1"]/*' />
+        public static TimeSpan operator +(TimeSpan t) {
+            return t;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorADD2"]/*' />
+        public static TimeSpan operator +(TimeSpan t1, TimeSpan t2) {
+            return t1.Add(t2);
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorEQ"]/*' />
+        [NoHeapAllocation]
+        public static bool operator ==(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks == t2._ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorNE"]/*' />
+        public static bool operator !=(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks != t2._ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorLT"]/*' />
+        public static bool operator <(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks < t2._ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorLE"]/*' />
+        public static bool operator <=(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks <= t2._ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorGT"]/*' />
+        public static bool operator >(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks > t2._ticks;
+        }
+
+        //| <include path='docs/doc[@for="TimeSpan.operatorGE"]/*' />
+        public static bool operator >=(TimeSpan t1, TimeSpan t2) {
+            return t1._ticks >= t2._ticks;
+        }
+
+        private class StringParser
+        {
+            private String str;
+            private char ch;
+            private int pos;
+            private int len;
+
+            internal static void Error() {
+                throw new FormatException("Format_InvalidString");
+            }
+
+            internal static void OverflowError() {
+                throw new OverflowException("Overflow_TimeSpanTooLong");
+            }
+
+            internal void NextChar() {
+                if (pos < len) pos++;
+                ch = pos < len? str[pos]: (char) 0;
+            }
+
+            internal char NextNonDigit() {
+                int i = pos;
+                while (i < len) {
+                    char ch = str[i];
+                    if (ch < '0' || ch > '9') return ch;
+                    i++;
+                }
+                return (char) 0;
+            }
+
+            internal long Parse(String s, bool allowWhiteSpace) {
+                if (s == null) throw new ArgumentNullException("s");
+                str = s;
+                len = s.Length;
+                pos = -1;
+                NextChar();
+                if (allowWhiteSpace)
+                    SkipBlanks();
+                bool negative = false;
+                if (ch == '-') {
+                    negative = true;
+                    NextChar();
+                }
+                long time;
+                if (NextNonDigit() == ':') {
+                    time = ParseTime();
+                }
+                else {
+                    time = ParseInt((int)(0x7FFFFFFFFFFFFFFFL / TicksPerDay)) * TicksPerDay;
+                    if (ch == '.') {
+                        NextChar();
+                        time += ParseTime();
+                    }
+                }
+                if (negative) {
+                    time = -time;
+                    // Allow -0 as well
+                    if (time > 0) OverflowError();
+                }
+                else {
+                    if (time < 0) OverflowError();
+                }
+                if (allowWhiteSpace)
+                    SkipBlanks();
+                if (pos < len) Error();
+                return time;
+            }
+
+            internal int ParseInt(int max) {
+                int i = 0;
+                int p = pos;
+                while (ch >= '0' && ch <= '9') {
+                    if ((i & 0xF0000000) != 0) OverflowError();
+                    i = i * 10 + ch - '0';
+                    if (i < 0) OverflowError();
+                    NextChar();
+                }
+                if (p == pos) Error();
+                if (i > max) OverflowError();
+                return i;
+            }
+
+            internal long ParseTime() {
+                long time = ParseInt(23) * TicksPerHour;
+                if (ch != ':') Error();
+                NextChar();
+                time += ParseInt(59) * TicksPerMinute;
+                if (ch == ':') {
+                    NextChar();
+                    time += ParseInt(59) * TicksPerSecond;
+                    if (ch == '.') {
+                        NextChar();
+                        int f = (int)TicksPerSecond;
+                        while (f > 1 && ch >= '0' && ch <= '9') {
+                            f /= 10;
+                            time += (ch - '0') * f;
+                            NextChar();
+                        }
+                    }
+                }
+                return time;
+            }
+
+            internal void SkipBlanks() {
+                while (ch == ' ' || ch == '\t') NextChar();
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/Type.cs b/base/Kernel/System/Type.cs
new file mode 100644
index 0000000..fcf3e71
--- /dev/null
+++ b/base/Kernel/System/Type.cs
@@ -0,0 +1,389 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// Type is the root of all reflection and the Object that represents
+//  a type inside the system.  Type is an abstract base class that allows multiple
+//      implementations.  The system will always provide the subclass __RuntimeType.
+//      In Reflection all of the __RuntimeXXX classes are created only once per object
+//      in the system and support == comparisons.
+//
+// Date: March 98
+//
+namespace System {
+
+    using System;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Runtime.CompilerServices;
+    using DebuggerStepThroughAttribute = System.Diagnostics.DebuggerStepThroughAttribute;
+
+    //| <include path='docs/doc[@for="Type"]/*' />
+    [CCtorIsRunDuringStartup]
+    [RequiredByBartok]
+    public abstract class Type
+    {
+        //| <include path='docs/doc[@for="Type.Delimiter"]/*' />
+        public static readonly char Delimiter = '.';
+
+        // Prevent from begin created, and allow subclass
+        //      to create.
+        //| <include path='docs/doc[@for="Type.Type"]/*' />
+        protected Type() {}
+
+        // GetTypeCode
+        // This method will return a TypeCode for the passed
+        //  type.
+        //| <include path='docs/doc[@for="Type.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public static TypeCode GetTypeCode(Type type)
+        {
+            if (type == null)
+                return TypeCode.Empty;
+            return type.GetTypeCodeInternal();
+        }
+
+        [NoHeapAllocation]
+        internal virtual TypeCode GetTypeCodeInternal()
+        {
+            Type type = this;
+
+            if (type != type.UnderlyingSystemType)
+                return Type.GetTypeCode(type.UnderlyingSystemType);
+
+            return TypeCode.Object;
+        }
+
+        //| <include path='docs/doc[@for="Type.GetTypeFromHandle"]/*' />
+        [NoHeapAllocation]
+        public static Type GetTypeFromHandle(RuntimeTypeHandle handle)
+        {
+            return RuntimeType.GetTypeFromHandleImpl(handle);
+        }
+
+        // Property representing the name of the Member.
+        //| <include path='docs/doc[@for="MemberInfo.Name"]/*' />
+        public abstract String Name {
+            [NoHeapAllocation] get;
+        }
+
+        // Return the fully qualified name.  The name does contain the namespace.
+        //| <include path='docs/doc[@for="Type.FullName"]/*' />
+        public abstract String FullName {
+            get;
+        }
+
+        // Return the name space of the class.
+        //| <include path='docs/doc[@for="Type.Namespace"]/*' />
+        public abstract String Namespace {
+            [NoHeapAllocation]
+            get;
+        }
+
+        public abstract Assembly Assembly {
+            [NoHeapAllocation]
+            get;
+        }
+
+        //| <include path='docs/doc[@for="Type.AssemblyQualifiedName"]/*' />
+        public abstract String AssemblyQualifiedName {
+            get;
+        }
+
+        // @TODO: Next integration make this method abstract
+        //| <include path='docs/doc[@for="Type.GetArrayRank"]/*' />
+        public virtual int GetArrayRank() {
+            throw new NotSupportedException("NotSupported_SubclassOverride");
+        }
+
+        // Returns the base class for a class.  If this is an interface or has
+        // no base class null is returned.  Object is the only Type that does not
+        // have a base class.
+        //| <include path='docs/doc[@for="Type.BaseType"]/*' />
+        public abstract Type BaseType {
+            [NoHeapAllocation]
+            get;
+        }
+
+
+        // GetInterfaces
+        // This method will return all of the interfaces implemented by a
+        //  class
+        //| <include path='docs/doc[@for="Type.GetInterfaces"]/*' />
+        abstract public Type[] GetInterfaces();
+
+    ////////////////////////////////////////////////////////////////////////////////
+    //
+    // Attributes
+    //
+    //   The attributes are all treated as read-only properties on a class.  Most of
+    //  these boolean properties have flag values defined in this class and act like
+    //  a bit mask of attributes.  There are also a set of boolean properties that
+    //  relate to the classes relationship to other classes and to the state of the
+    //  class inside the runtime.
+    //
+    ////////////////////////////////////////////////////////////////////////////////
+
+        // The attribute property on the Type.
+        //| <include path='docs/doc[@for="Type.Attributes"]/*' />
+        public TypeAttributes Attributes     {
+            [NoHeapAllocation]
+            get {return GetAttributeFlagsImpl();}
+        }
+        //| <include path='docs/doc[@for="Type.IsNotPublic"]/*' />
+        public bool IsNotPublic {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.NotPublic);}
+        }
+        //| <include path='docs/doc[@for="Type.IsPublic"]/*' />
+        public bool IsPublic {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.Public);}
+        }
+        //| <include path='docs/doc[@for="Type.IsNestedPublic"]/*' />
+        public bool IsNestedPublic {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPublic);}
+        }
+        //| <include path='docs/doc[@for="Type.IsNestedPrivate"]/*' />
+        public bool IsNestedPrivate {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPrivate);}
+        }
+        //| <include path='docs/doc[@for="Type.IsNestedFamily"]/*' />
+        public bool IsNestedFamily {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamily);}
+        }
+        //| <include path='docs/doc[@for="Type.IsNestedFamANDAssem"]/*' />
+        public bool IsNestedFamANDAssem {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamANDAssem);}
+        }
+        //| <include path='docs/doc[@for="Type.IsNestedFamORAssem"]/*' />
+        public bool IsNestedFamORAssem{
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamORAssem);}
+        }
+
+        //| <include path='docs/doc[@for="Type.IsAutoLayout"]/*' />
+        public bool IsAutoLayout {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.LayoutMask) == TypeAttributes.AutoLayout);}
+        }
+        //| <include path='docs/doc[@for="Type.IsLayoutSequential"]/*' />
+        public bool IsLayoutSequential {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.LayoutMask) == TypeAttributes.SequentialLayout);}
+        }
+        //| <include path='docs/doc[@for="Type.IsExplicitLayout"]/*' />
+        public bool IsExplicitLayout {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.LayoutMask) == TypeAttributes.ExplicitLayout);}
+        }
+
+        //| <include path='docs/doc[@for="Type.IsClass"]/*' />
+        public bool IsClass {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.ClassSemanticsMask) == TypeAttributes.Class && !IsSubclassOf(Type.valueType));}
+        }
+        //| <include path='docs/doc[@for="Type.IsInterface"]/*' />
+        public bool IsInterface {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.ClassSemanticsMask) == TypeAttributes.Interface);}
+        }
+        //| <include path='docs/doc[@for="Type.IsValueType"]/*' />
+        public bool IsValueType {
+            [NoHeapAllocation]
+            get {return IsValueTypeImpl();}
+        }
+
+        //| <include path='docs/doc[@for="Type.IsAbstract"]/*' />
+        public bool IsAbstract {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.Abstract) != 0);}
+        }
+        //| <include path='docs/doc[@for="Type.IsSealed"]/*' />
+        public bool IsSealed {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.Sealed) != 0);}
+        }
+        //| <include path='docs/doc[@for="Type.IsEnum"]/*' />
+        public bool IsEnum {
+            [NoHeapAllocation]
+            get {return IsSubclassOf(Type.enumType);}
+        }
+        //| <include path='docs/doc[@for="Type.IsSpecialName"]/*' />
+        public bool IsSpecialName {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.SpecialName) != 0);}
+        }
+        //| <include path='docs/doc[@for="Type.IsImport"]/*' />
+        public bool IsImport {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.Import) != 0);}
+        }
+
+        //| <include path='docs/doc[@for="Type.IsAnsiClass"]/*' />
+        public bool IsAnsiClass {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.StringFormatMask) == TypeAttributes.AnsiClass);}
+        }
+        //| <include path='docs/doc[@for="Type.IsUnicodeClass"]/*' />
+        public bool IsUnicodeClass {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.StringFormatMask) == TypeAttributes.UnicodeClass);}
+        }
+        //| <include path='docs/doc[@for="Type.IsAutoClass"]/*' />
+        public bool IsAutoClass {
+            [NoHeapAllocation]
+            get {return ((GetAttributeFlagsImpl() & TypeAttributes.StringFormatMask) == TypeAttributes.AutoClass);}
+        }
+
+        // These are not backed up by attributes.  Instead they are implemented
+        //      based internally.
+        //| <include path='docs/doc[@for="Type.IsArray"]/*' />
+        public bool IsArray {
+            [NoHeapAllocation]
+            get {return IsArrayImpl();}
+        }
+
+        //| <include path='docs/doc[@for="Type.IsPrimitive"]/*' />
+        public bool IsPrimitive {
+            [NoHeapAllocation]
+            get {return IsPrimitiveImpl();}
+        }
+        //| <include path='docs/doc[@for="Type.HasElementType"]/*' />
+        public bool HasElementType {
+            [NoHeapAllocation]
+            get {return HasElementTypeImpl();}
+        }
+
+        // Protected routine to determine if this class represents a value class
+        //| <include path='docs/doc[@for="Type.IsValueTypeImpl"]/*' />
+        [NoHeapAllocation]
+        protected virtual bool IsValueTypeImpl() {
+            Type type = this;
+            if (type == Type.valueType || type == Type.enumType) {
+                return false;
+            }
+            return IsSubclassOf(Type.valueType);
+        }
+
+        // Protected routine to get the attributes.
+        //| <include path='docs/doc[@for="Type.GetAttributeFlagsImpl"]/*' />
+        [NoHeapAllocation]
+        abstract protected TypeAttributes GetAttributeFlagsImpl();
+
+        // Protected routine to determine if this class represents an Array
+        //| <include path='docs/doc[@for="Type.IsArrayImpl"]/*' />
+        [NoHeapAllocation]
+        abstract protected bool IsArrayImpl();
+
+        // Protected routine to determine if this class represents a primitive type
+        //| <include path='docs/doc[@for="Type.IsPrimitiveImpl"]/*' />
+        [NoHeapAllocation]
+        abstract protected bool IsPrimitiveImpl();
+
+        //| <include path='docs/doc[@for="Type.GetElementType"]/*' />
+        [NoHeapAllocation]
+        abstract public Type GetElementType();
+
+        //| <include path='docs/doc[@for="Type.HasElementTypeImpl"]/*' />
+        [NoHeapAllocation]
+        abstract protected bool HasElementTypeImpl();
+
+        // Return the underlying Type that represents the IReflect Object.  For expando object,
+        // this is the (Object) IReflectInstance.GetType().  For Type object it is this.
+        //| <include path='docs/doc[@for="Type.UnderlyingSystemType"]/*' />
+        public abstract Type UnderlyingSystemType {
+            [NoHeapAllocation]
+            get;
+        }
+
+        // Returns true of this class is a true subclass of c.  Everything
+        // else returns false.  If this class and c are the same class false is
+        // returned.
+        //
+        //| <include path='docs/doc[@for="Type.IsSubclassOf"]/*' />
+        [NoHeapAllocation]
+        public virtual bool IsSubclassOf(Type c)
+        {
+            Type p = this;
+            if (p == c) {
+                return false;
+            }
+            while (p != null) {
+                if (p == c) {
+                    return true;
+                }
+                p = p.BaseType;
+            }
+            return false;
+        }
+
+        // ToString
+        // Print the String Representation of the Type
+        //| <include path='docs/doc[@for="Type.ToString"]/*' />
+        public override String ToString()
+        {
+            return "Type: "+Name;
+        }
+
+        // This method will return an array of classes based upon the array of
+        // types.
+        //| <include path='docs/doc[@for="Type.GetTypeArray"]/*' />
+        public static Type[] GetTypeArray(Object[] args)
+        {
+            if (args == null) {
+                throw new ArgumentNullException("args");
+            }
+            Type[] cls = new Type[args.Length];
+            for (int i=0;i<cls.Length;i++) {
+                cls[i] = args[i].GetType();
+            }
+            return cls;
+        }
+
+        //| <include path='docs/doc[@for="Type.Equals"]/*' />
+        public override bool Equals(Object o)
+        {
+            if (o == null) {
+                return false;
+            }
+            if (!(o is Type)) {
+                return false;
+            }
+            return (this.UnderlyingSystemType == ((Type) o).UnderlyingSystemType);
+        }
+
+        //| <include path='docs/doc[@for="Type.Equals1"]/*' />
+        public bool Equals(Type o)
+        {
+            if (o == null) {
+                return false;
+            }
+            return (this.UnderlyingSystemType == o.UnderlyingSystemType);
+        }
+
+        //| <include path='docs/doc[@for="Type.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            Type SystemType = UnderlyingSystemType;
+            if (SystemType != this) {
+                return SystemType.GetHashCode();
+            }
+            return base.GetHashCode();
+        }
+
+        // private convenience data
+        private static readonly Type valueType = typeof(System.ValueType);
+        private static readonly Type enumType = typeof(System.Enum);
+
+        public abstract Microsoft.Singularity.V1.Types.SystemType GetSystemType();
+    }
+}
diff --git a/base/Kernel/System/TypeCode.cs b/base/Kernel/System/TypeCode.cs
new file mode 100644
index 0000000..e4b18af
--- /dev/null
+++ b/base/Kernel/System/TypeCode.cs
@@ -0,0 +1,66 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+// The TypeCode enum represents the type code of an object. To obtain the
+// TypeCode for a given object, use the Value.GetTypeCode() method. The
+// TypeCode.Empty value represents a null object reference. The TypeCode.Object
+// value represents an object that doesn't implement the IValue interface. The
+// TypeCode.DBNull value represents the database null, which is distinct and
+// different from a null reference. The other type codes represent values that
+// use the given simple type encoding.
+//
+// Note that when an object has a given TypeCode, there is no guarantee that
+// the object is an instance of the corresponding System.XXX value class. For
+// example, an object with the type code TypeCode.Int32 might actually be an
+// instance of a nullable 32-bit integer type (with a value that isn't the
+// database null).
+//
+// There are no type codes for "Missing" and "Error".
+// These types of values are instead represented as classes. When the type code
+// of an object is TypeCode.Object, a further instance-of check can be used to
+// determine if the object is one of these values.
+namespace System {
+    //| <include path='docs/doc[@for="TypeCode"]/*' />
+    public enum TypeCode {
+        //| <include path='docs/doc[@for="TypeCode.Empty"]/*' />
+        Empty = 0,          // Null reference
+            //| <include path='docs/doc[@for="TypeCode.Object"]/*' />
+            Object = 1,         // Instance that isn't a value
+            //| <include path='docs/doc[@for="TypeCode.DBNull"]/*' />
+            DBNull = 2,         // Database null value
+            //| <include path='docs/doc[@for="TypeCode.Boolean"]/*' />
+            Boolean = 3,        // Boolean
+            //| <include path='docs/doc[@for="TypeCode.Char"]/*' />
+            Char = 4,           // Unicode character
+            //| <include path='docs/doc[@for="TypeCode.SByte"]/*' />
+            SByte = 5,          // Signed 8-bit integer
+            //| <include path='docs/doc[@for="TypeCode.Byte"]/*' />
+            Byte = 6,           // Unsigned 8-bit integer
+            //| <include path='docs/doc[@for="TypeCode.Int16"]/*' />
+            Int16 = 7,          // Signed 16-bit integer
+            //| <include path='docs/doc[@for="TypeCode.UInt16"]/*' />
+            UInt16 = 8,         // Unsigned 16-bit integer
+            //| <include path='docs/doc[@for="TypeCode.Int32"]/*' />
+            Int32 = 9,          // Signed 32-bit integer
+            //| <include path='docs/doc[@for="TypeCode.UInt32"]/*' />
+            UInt32 = 10,        // Unsigned 32-bit integer
+            //| <include path='docs/doc[@for="TypeCode.Int64"]/*' />
+            Int64 = 11,         // Signed 64-bit integer
+            //| <include path='docs/doc[@for="TypeCode.UInt64"]/*' />
+            UInt64 = 12,        // Unsigned 64-bit integer
+            //| <include path='docs/doc[@for="TypeCode.Single"]/*' />
+            Single = 13,        // IEEE 32-bit float
+            //| <include path='docs/doc[@for="TypeCode.Double"]/*' />
+            Double = 14,        // IEEE 64-bit double
+            //| <include path='docs/doc[@for="TypeCode.Decimal"]/*' />
+            Decimal = 15,       // Decimal
+            //| <include path='docs/doc[@for="TypeCode.DateTime"]/*' />
+            DateTime = 16,      // DateTime
+            //| <include path='docs/doc[@for="TypeCode.String"]/*' />
+            String = 18,        // Unicode character string
+    }
+}
+
+
diff --git a/base/Kernel/System/TypeInitializationException.cs b/base/Kernel/System/TypeInitializationException.cs
new file mode 100644
index 0000000..8aeb103
--- /dev/null
+++ b/base/Kernel/System/TypeInitializationException.cs
@@ -0,0 +1,53 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: TypeInitializationException
+**
+**
+** Purpose: The exception class to wrap exceptions thrown by
+**          a type's class initializer (.cctor).  This is sufficiently
+**          distinct from a TypeLoadException, which means we couldn't
+**          find the type.
+**
+** Date: May 10, 2000
+**
+=============================================================================*/
+using System;
+
+namespace System {
+    //| <include path='docs/doc[@for="TypeInitializationException"]/*' />
+    public sealed class TypeInitializationException : SystemException {
+        private String _typeName;
+
+        // This exception is not creatable without specifying the
+        //  inner exception.
+        private TypeInitializationException()
+            : base("TypeInitialization_Default") {
+        }
+
+        // This is called from within the runtime.  I believe this is necessary
+        // for Interop only, though it's not particularly useful.
+        private TypeInitializationException(String message) : base(message) {
+        }
+
+        //| <include path='docs/doc[@for="TypeInitializationException.TypeInitializationException"]/*' />
+        public TypeInitializationException(String fullTypeName, Exception innerException) : base(String.Format("TypeInitialization_Type", fullTypeName), innerException) {
+            _typeName = fullTypeName;
+        }
+
+        //| <include path='docs/doc[@for="TypeInitializationException.TypeName"]/*' />
+        public String TypeName
+        {
+            get {
+                if (_typeName == null) {
+                    return String.Empty;
+                }
+                return _typeName;
+            }
+        }
+    }
+}
diff --git a/base/Kernel/System/TypedReference.cs b/base/Kernel/System/TypedReference.cs
new file mode 100644
index 0000000..71574a2
--- /dev/null
+++ b/base/Kernel/System/TypedReference.cs
@@ -0,0 +1,80 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+namespace System {
+
+    // TypedReference is basically only ever seen on the call stack, and in param arrays.
+    //  These are blobs that must be dealt with by the compiler.
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    //| <include path='docs/doc[@for="TypedReference"]/*' />
+    [CLSCompliant(false)] // TODO put this back in, System.Runtime.CompilerServices.NotInGCHeap]
+    [StructLayout(LayoutKind.Sequential)]
+    public struct TypedReference
+    {
+        // Bartok will override type of Value to be void& [TracedPointer(void)]
+        [AccessedByRuntime("Referenced from C++")]
+        [RequiredByBartok]
+        private IntPtr Value;
+        [AccessedByRuntime("Referenced from C++")]
+        [RequiredByBartok]
+        private RuntimeType Type;
+
+
+        internal TypedReference(IntPtr value, RuntimeType type) {
+            this.Value = value;
+            this.Type = type;
+        }
+
+        [RequiredByBartok]
+        internal static TypedReference MakeRefAny(IntPtr value, RuntimeType type)
+        {
+            TypedReference tr = new TypedReference(value, type);
+            return tr;
+        }
+
+        [RequiredByBartok]
+        internal static RuntimeTypeHandle RefAnyType(TypedReference tr) {
+            return new RuntimeTypeHandle(tr.Type);
+        }
+
+        [RequiredByBartok]
+        internal static IntPtr RefAnyValue(TypedReference tr, RuntimeType type)
+        {
+            if(tr.Type != type) {
+                throw new InvalidCastException();
+            }
+
+            return RefAnyValueUnsafe(tr);
+        }
+
+        [RequiredByBartok]
+        internal static IntPtr RefAnyValueUnsafe(TypedReference tr)
+        {
+            return tr.Value;
+        }
+
+        public static Object ToObject(TypedReference value) {
+            throw new Exception("System.TypedReference.ToObject not implemented in Bartok!");
+        }
+
+        //| <include path='docs/doc[@for="TypedReference.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            if (Type == null)
+                return 0;
+            else
+                return __reftype(this).GetHashCode();
+        }
+
+        //| <include path='docs/doc[@for="TypedReference.Equals"]/*' />
+        public override bool Equals(Object o)
+        {
+            throw new NotSupportedException("NotSupported_NYI");
+        }
+    }
+}
diff --git a/base/Kernel/System/UInt16.cs b/base/Kernel/System/UInt16.cs
new file mode 100644
index 0000000..71b3d4c
--- /dev/null
+++ b/base/Kernel/System/UInt16.cs
@@ -0,0 +1,116 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  UInt16
+**
+**         and Daryl Olander (darylo)
+**
+** Purpose: This class will encapsulate a short and provide an
+**          Object representation of it.
+**
+** Date:  March 4, 1999
+**
+===========================================================*/
+namespace System {
+    using System.Globalization;
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    // Wrapper for unsigned 16 bit integers.
+    //| <include path='docs/doc[@for="UInt16"]/*' />
+    [CLSCompliant(false)]
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)]
+    public struct UInt16 : IComparable, IFormattable
+    {
+        private ushort m_value;
+
+        //| <include path='docs/doc[@for="UInt16.MaxValue"]/*' />
+        public const ushort MaxValue = (ushort)0xFFFF;
+        //| <include path='docs/doc[@for="UInt16.MinValue"]/*' />
+        public const ushort MinValue = 0;
+
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type UInt16, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="UInt16.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is UInt16) {
+                return ((int)m_value - (int)(((UInt16)value).m_value));
+            }
+            throw new ArgumentException("Arg_MustBeUInt16");
+        }
+
+        //| <include path='docs/doc[@for="UInt16.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is UInt16)) {
+                return false;
+            }
+            return m_value == ((UInt16)obj).m_value;
+        }
+
+        // Returns a HashCode for the UInt16
+        //| <include path='docs/doc[@for="UInt16.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return (int)m_value;
+        }
+
+        // Converts the current value to a String in base-10 with no extra padding.
+        //| <include path='docs/doc[@for="UInt16.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="UInt16.ToString2"]/*' />
+        public String ToString(String format) {
+            return Number.FormatUInt32(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="UInt16.Parse"]/*' />
+        [CLSCompliant(false)]
+        public static ushort Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        //| <include path='docs/doc[@for="UInt16.Parse3"]/*' />
+        [CLSCompliant(false)]
+        public static ushort Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            uint i = Number.ParseUInt32(s, style);
+            if (i > MaxValue) throw new OverflowException("Overflow_UInt16");
+            return (ushort)i;
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="UInt16.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.UInt16;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/UInt32.cs b/base/Kernel/System/UInt32.cs
new file mode 100644
index 0000000..2a7e434
--- /dev/null
+++ b/base/Kernel/System/UInt32.cs
@@ -0,0 +1,118 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  UInt32
+**
+**
+** Purpose: This class will encapsulate an uint and
+**          provide an Object representation of it.
+**
+** Date:  March 4, 1999
+**
+===========================================================*/
+namespace System {
+    using System.Globalization;
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    // * Wrapper for unsigned 32 bit integers.
+    //| <include path='docs/doc[@for="UInt32"]/*' />
+    [CLSCompliant(false)]
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)]
+    public struct UInt32 : IComparable, IFormattable
+    {
+        private uint m_value;
+
+        //| <include path='docs/doc[@for="UInt32.MaxValue"]/*' />
+        public const uint MaxValue = (uint)0xffffffff;
+        //| <include path='docs/doc[@for="UInt32.MinValue"]/*' />
+        public const uint MinValue = 0U;
+
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type UInt32, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="UInt32.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is UInt32) {
+                // Need to use compare because subtraction will wrap
+                // to positive for very large neg numbers, etc.
+                uint i = (uint)value;
+                if (m_value < i) return -1;
+                if (m_value > i) return 1;
+                return 0;
+            }
+            throw new ArgumentException("Arg_MustBeUInt32");
+        }
+
+        //| <include path='docs/doc[@for="UInt32.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is UInt32)) {
+                return false;
+            }
+            return m_value == ((UInt32)obj).m_value;
+        }
+
+        // The absolute value of the int contained.
+        //| <include path='docs/doc[@for="UInt32.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return ((int) m_value);
+        }
+
+        // The base 10 representation of the number with no extra padding.
+        //| <include path='docs/doc[@for="UInt32.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="UInt32.ToString2"]/*' />
+        public String ToString(String format) {
+            return Number.FormatUInt32(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="UInt32.Parse"]/*' />
+        [CLSCompliant(false)]
+        public static uint Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        //| <include path='docs/doc[@for="UInt32.Parse3"]/*' />
+        [CLSCompliant(false)]
+        public static uint Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            return Number.ParseUInt32(s, style);
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="UInt32.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.UInt32;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/UInt64.cs b/base/Kernel/System/UInt64.cs
new file mode 100644
index 0000000..7120a63
--- /dev/null
+++ b/base/Kernel/System/UInt64.cs
@@ -0,0 +1,117 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  UInt64
+**
+**         and Daryl Olander (darylo)
+**
+** Purpose: This class will encapsulate an unsigned long and
+**          provide an Object representation of it.
+**
+** Date:  March 4, 1999
+**
+===========================================================*/
+namespace System {
+    using System.Globalization;
+    using System;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
+
+    // Wrapper for unsigned 64 bit integers.
+    //| <include path='docs/doc[@for="UInt64"]/*' />
+    [CLSCompliant(false)]
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)]
+    public struct UInt64 : IComparable, IFormattable
+    {
+        private ulong m_value;
+
+        //| <include path='docs/doc[@for="UInt64.MaxValue"]/*' />
+        public const ulong MaxValue = (ulong) 0xffffffffffffffffL;
+        //| <include path='docs/doc[@for="UInt64.MinValue"]/*' />
+        public const ulong MinValue = 0x0;
+
+        // Compares this object to another object, returning an integer that
+        // indicates the relationship.
+        // Returns a value less than zero if this  object
+        // null is considered to be less than any instance.
+        // If object is not of type UInt64, this method throws an ArgumentException.
+        //
+        //| <include path='docs/doc[@for="UInt64.CompareTo"]/*' />
+        public int CompareTo(Object value) {
+            if (value == null) {
+                return 1;
+            }
+            if (value is UInt64) {
+                // Need to use compare because subtraction will wrap
+                // to positive for very large neg numbers, etc.
+                ulong i = (ulong)value;
+                if (m_value < i) return -1;
+                if (m_value > i) return 1;
+                return 0;
+            }
+            throw new ArgumentException ("Arg_MustBeUInt64");
+        }
+
+        //| <include path='docs/doc[@for="UInt64.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (!(obj is UInt64)) {
+                return false;
+            }
+            return m_value == ((UInt64)obj).m_value;
+        }
+
+        // The value of the lower 32 bits XORed with the upper 32 bits.
+        //| <include path='docs/doc[@for="UInt64.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            return ((int)m_value) ^ (int)(m_value >> 32);
+        }
+
+        //| <include path='docs/doc[@for="UInt64.ToString"]/*' />
+        public override String ToString() {
+            return ToString(null);
+        }
+
+        //| <include path='docs/doc[@for="UInt64.ToString2"]/*' />
+        public String ToString(String format) {
+            return Number.FormatUInt64(m_value, format);
+        }
+
+        //| <include path='docs/doc[@for="UInt64.Parse"]/*' />
+        [CLSCompliant(false)]
+        public static ulong Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        //| <include path='docs/doc[@for="UInt64.Parse2"]/*' />
+        [CLSCompliant(false)]
+        public static ulong Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            return Number.ParseUInt64(s, style);
+        }
+
+        //
+        // IValue implementation
+        //
+
+        //| <include path='docs/doc[@for="UInt64.GetTypeCode"]/*' />
+        [NoHeapAllocation]
+        public override TypeCode GetTypeCode()
+        {
+            return TypeCode.UInt64;
+        }
+
+        //
+        // This is just designed to prevent compiler warnings.
+        // This field is used from native, but we need to prevent the compiler warnings.
+        //
+#if _DEBUG
+        private void DontTouchThis() {
+            m_value = 0;
+        }
+#endif
+    }
+}
diff --git a/base/Kernel/System/UIntPtr.cs b/base/Kernel/System/UIntPtr.cs
new file mode 100644
index 0000000..1904e62
--- /dev/null
+++ b/base/Kernel/System/UIntPtr.cs
@@ -0,0 +1,288 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+namespace System {
+
+    using System;
+    using System.Globalization;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="UIntPtr"]/*' />
+    [CLSCompliant(false)]
+    [NoCCtor]
+    public struct UIntPtr : IFormattable
+    {
+        unsafe private void* m_value;
+
+        //| <include path='docs/doc[@for="UIntPtr.Zero"]/*' />
+        [Intrinsic]
+        public static readonly UIntPtr Zero;
+
+        //| <include path='docs/doc[@for="UIntPtr.MaxValue"]/*' />
+        [Intrinsic]
+        public static readonly UIntPtr MaxValue;
+
+        //| <include path='docs/doc[@for="UIntPtr.Size"]/*' />
+        [Intrinsic]
+        public static readonly int Size;
+
+        //| <include path='docs/doc[@for="UIntPtr.UIntPtr"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern UIntPtr(uint value);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern UIntPtr(int value);
+
+        //| <include path='docs/doc[@for="UIntPtr.UIntPtr1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern UIntPtr(ulong value);
+
+        //| <include path='docs/doc[@for="UIntPtr.UIntPtr2"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern unsafe UIntPtr(void* value);
+
+        //| <include path='docs/doc[@for="UIntPtr.Equals"]/*' />
+        [Inline]
+        public unsafe override bool Equals(Object obj)
+        {
+            if (obj is UIntPtr) {
+                return (m_value == ((UIntPtr)obj).m_value);
+            }
+            else {
+                return false;
+            }
+        }
+
+        //| <include path='docs/doc[@for="UIntPtr.GetHashCode"]/*' />
+        [Inline]
+        public unsafe override int GetHashCode()
+        {
+            return (int)m_value & 0x7fffffff;
+        }
+
+        //| <include path='docs/doc[@for="UIntPtr.ToUInt32"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern uint ToUInt32();
+
+        //| <include path='docs/doc[@for="UIntPtr.ToUInt64"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern ulong ToUInt64();
+
+        //| <include path='docs/doc[@for="UIntPtr.ToString"]/*' />
+        [Inline]
+        public unsafe override String ToString()
+        {
+            if (sizeof(UIntPtr) == 4) {
+                return this.ToUInt32().ToString();
+            }
+            else {
+                return this.ToUInt64().ToString();
+            }
+        }
+
+        [Inline]
+        public unsafe String ToString(String format)
+        {
+            if (sizeof(UIntPtr) == 4) {
+                return this.ToUInt32().ToString(format);
+            }
+            else {
+                return this.ToUInt64().ToString(format);
+            }
+        }
+
+        //| <include path='docs/doc[@for="UInt32.Parse"]/*' />
+        [CLSCompliant(false)]
+        public static UIntPtr Parse(String s) {
+            return Parse(s, NumberStyles.Integer);
+        }
+
+        //| <include path='docs/doc[@for="UInt32.Parse3"]/*' />
+        [CLSCompliant(false)]
+        public unsafe static UIntPtr Parse(String s, NumberStyles style) {
+            NumberFormatInfo.ValidateParseStyle(style);
+            if (sizeof(UIntPtr) == 4) {
+                return Number.ParseUInt32(s, style);
+            }
+            else {
+                return Number.ParseUInt64(s, style);
+            }
+        }
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorUIntPtr"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static implicit operator UIntPtr (uint value);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorUIntPtr1"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static implicit operator UIntPtr (ulong value);
+
+#if false
+        [NoHeapAllocation]
+        public static implicit operator UIntPtr (int value)
+        {
+            return (UIntPtr)unchecked((uint)value);
+        }
+#endif
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static explicit operator IntPtr (UIntPtr value);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatoruint"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static explicit operator uint (UIntPtr value);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorulong"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static explicit operator ulong (UIntPtr value);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorUIntPtr2"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe explicit operator UIntPtr (void* value);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorvoidMUL"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe explicit operator void* (UIntPtr value);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorEQ"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static bool operator == (UIntPtr value1, UIntPtr value2);
+
+        //| <include path='docs/doc[@for="UIntPtr.operatorNE"]/*' />
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static bool operator != (UIntPtr value1, UIntPtr value2);
+
+        //| <include path='docs/doc[@for="UIntPtr.ToPointer"]/*' />
+        [CLSCompliant(false)]
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern unsafe void* ToPointer();
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator - (UIntPtr value1, UIntPtr value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator - (UIntPtr value1, uint value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator - (UIntPtr value1, int value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator -- (UIntPtr value);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator + (UIntPtr value1, UIntPtr value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator + (UIntPtr value1, uint value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator + (UIntPtr value1, int value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe sbyte * operator + (sbyte *value1,
+                                                        UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe byte * operator + (byte *value1,
+                                                     UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe short * operator + (short *value1,
+                                                        UIntPtr value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe uint * operator + (uint* value1,
+                                                       UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe short * operator - (short *value1,
+                                                        UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static unsafe uint * operator - (uint* value1,
+                                                       UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator ++ (UIntPtr value);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator * (UIntPtr value1, uint value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator * (UIntPtr value1, UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator / (UIntPtr value1, uint value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator >> (UIntPtr value, int shift);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator << (UIntPtr value, int shift);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static uint operator & (UIntPtr value1, uint value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator & (UIntPtr value1, UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator | (UIntPtr value1, UIntPtr value2);
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static UIntPtr operator ~ (UIntPtr value);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static bool operator < (UIntPtr value1, UIntPtr value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static bool operator > (UIntPtr value1, UIntPtr value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static bool operator <= (UIntPtr value1, UIntPtr value2);
+
+        [Intrinsic]
+        [NoHeapAllocation]
+        public extern static bool operator >= (UIntPtr value1, UIntPtr value2);
+    }
+}
diff --git a/base/Kernel/System/ValueType.cs b/base/Kernel/System/ValueType.cs
new file mode 100644
index 0000000..0f1e462
--- /dev/null
+++ b/base/Kernel/System/ValueType.cs
@@ -0,0 +1,50 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:   ValueType
+**
+**
+** Purpose: Base class for all value classes.
+**
+** Date:    January 4, 2000
+**
+===========================================================*/
+namespace System {
+    using System;
+    using System.Runtime.CompilerServices;
+
+    //| <include path='docs/doc[@for="ValueType"]/*' />
+    [NoCCtor]
+    public abstract class ValueType {
+
+        //| <include path='docs/doc[@for="ValueType.Equals"]/*' />
+        public override bool Equals (Object obj) {
+            throw new Exception("System.ValueType.Equals not implemented in Bartok!");
+        }
+
+        /*=================================GetHashCode==================================
+        **Action: Our algorithm for returning the hashcode is a little bit complex.  We look
+        **        for the first non-static field and get its hashcode.  If the type has no
+        **        non-static fields, we return the hashcode of the type.  We can't take the
+        **        hashcode of a static member because if that member is of the same type as
+        **        the original type, we'll end up in an infinite loop.
+        **Returns: The hashcode for the type.
+        **Arguments: None.
+        **Exceptions: None.
+        ==============================================================================*/
+        //| <include path='docs/doc[@for="ValueType.GetHashCode"]/*' />
+        public override int GetHashCode() {
+            throw new Exception("System.ValueType.GetHashCode not implemented in Bartok!");
+        }
+
+        //| <include path='docs/doc[@for="ValueType.ToString"]/*' />
+        public override String ToString() {
+            Type thisType = this.GetType();
+            return thisType.FullName;
+        }
+    }
+}
diff --git a/base/Kernel/System/VarargList.cs b/base/Kernel/System/VarargList.cs
new file mode 100644
index 0000000..2ee1dd8
--- /dev/null
+++ b/base/Kernel/System/VarargList.cs
@@ -0,0 +1,21 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace System {
+
+  using System.Runtime.CompilerServices;
+
+  [RequiredByBartok]
+  internal struct VarargList {
+      internal int count;
+      // TODO: inline vector of typed references will go here
+
+      [RequiredByBartok]
+      internal static VarargList Create(int count) {
+          VarargList v;
+          v.count = count;
+          return v;
+      }
+  }
+}
diff --git a/base/Kernel/System/Version.cs b/base/Kernel/System/Version.cs
new file mode 100644
index 0000000..4caaefd
--- /dev/null
+++ b/base/Kernel/System/Version.cs
@@ -0,0 +1,300 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** File:    Version
+**
+**
+** Purpose:
+**
+** Date:    June 4, 1999
+**
+===========================================================*/
+namespace System {
+
+    using System.Runtime.CompilerServices;
+    using CultureInfo = System.Globalization.CultureInfo;
+
+    // A Version object contains four hierarchical numeric components: major, minor,
+    // build and revision.  Build and revision may be unspecified, which is represented
+    // internally as a -1.  By definition, an unspecified component matches anything
+    // (both unspecified and specified), and an unspecified component is "less than" any
+    // specified component.
+
+    //| <include path='docs/doc[@for="Version"]/*' />
+    [RequiredByBartok]
+    public sealed class Version : ICloneable, IComparable
+    {
+        private int _Major;
+        private int _Minor;
+        private int _Build = -1;
+        private int _Revision = -1;
+
+        //| <include path='docs/doc[@for="Version.Version"]/*' />
+        public Version(int major, int minor, int build, int revision) {
+            if (major < 0)
+              throw new ArgumentOutOfRangeException("major","ArgumentOutOfRange_Version");
+
+            if (minor < 0)
+              throw new ArgumentOutOfRangeException("minor","ArgumentOutOfRange_Version");
+
+            if (build < 0)
+              throw new ArgumentOutOfRangeException("build","ArgumentOutOfRange_Version");
+
+            if (revision < 0)
+              throw new ArgumentOutOfRangeException("revision","ArgumentOutOfRange_Version");
+
+            _Major = major;
+            _Minor = minor;
+            _Build = build;
+            _Revision = revision;
+        }
+
+        //| <include path='docs/doc[@for="Version.Version1"]/*' />
+        public Version(int major, int minor, int build) {
+            if (major < 0)
+                throw new ArgumentOutOfRangeException("major","ArgumentOutOfRange_Version");
+
+            if (minor < 0)
+              throw new ArgumentOutOfRangeException("minor","ArgumentOutOfRange_Version");
+
+            if (build < 0)
+              throw new ArgumentOutOfRangeException("build","ArgumentOutOfRange_Version");
+
+
+            _Major = major;
+            _Minor = minor;
+            _Build = build;
+        }
+
+        //| <include path='docs/doc[@for="Version.Version2"]/*' />
+        public Version(int major, int minor) {
+            if (major < 0)
+                throw new ArgumentOutOfRangeException("major","ArgumentOutOfRange_Version");
+
+            if (minor < 0)
+                throw new ArgumentOutOfRangeException("minor","ArgumentOutOfRange_Version");
+
+            _Major = major;
+            _Minor = minor;
+        }
+
+        //| <include path='docs/doc[@for="Version.Version3"]/*' />
+        public Version(String version) {
+            if ((Object) version == null)
+                throw new ArgumentNullException("version");
+
+            String[] parsedComponents = version.Split(new char[] {'.'});
+            int parsedComponentsLength = parsedComponents.Length;
+            if ((parsedComponentsLength < 2) || (parsedComponentsLength > 4)) throw new ArgumentException("Arg_VersionString");
+            _Major = Int32.Parse(parsedComponents[0]);
+            if (_Major < 0)
+              throw new ArgumentOutOfRangeException("version","ArgumentOutOfRange_Version");
+
+            _Minor = Int32.Parse(parsedComponents[1]);
+            if (_Minor < 0)
+              throw new ArgumentOutOfRangeException("version","ArgumentOutOfRange_Version");
+
+            parsedComponentsLength -= 2;
+            if (parsedComponentsLength > 0) {
+                _Build = Int32.Parse(parsedComponents[2]);
+                if (_Build < 0)
+                  throw new ArgumentOutOfRangeException("build","ArgumentOutOfRange_Version");
+
+                parsedComponentsLength--;
+                if (parsedComponentsLength > 0) {
+                    _Revision = Int32.Parse(parsedComponents[3]);
+                    if (_Revision < 0)
+                      throw new ArgumentOutOfRangeException("revision","ArgumentOutOfRange_Version");
+                }
+            }
+        }
+
+        //| <include path='docs/doc[@for="Version.Version4"]/*' />
+        public Version()
+        {
+            _Major = 0;
+            _Minor = 0;
+        }
+
+        // Properties for setting and getting version numbers
+        //| <include path='docs/doc[@for="Version.Major"]/*' />
+        public int Major {
+            get { return _Major; }
+        }
+
+        //| <include path='docs/doc[@for="Version.Minor"]/*' />
+        public int Minor {
+            get { return _Minor; }
+        }
+
+        //| <include path='docs/doc[@for="Version.Build"]/*' />
+        public int Build {
+            get { return _Build; }
+        }
+
+        //| <include path='docs/doc[@for="Version.Revision"]/*' />
+        public int Revision {
+            get { return _Revision; }
+        }
+
+        //| <include path='docs/doc[@for="Version.Clone"]/*' />
+        public Object Clone() {
+            Version v = new Version();
+            v._Major = _Major;
+            v._Minor = _Minor;
+            v._Build = _Build;
+            v._Revision = _Revision;
+            return(v);
+        }
+
+        //| <include path='docs/doc[@for="Version.CompareTo"]/*' />
+        public int CompareTo(Object version)
+        {
+            if (version == null)
+                return 1;
+
+            if (!(version is Version))
+                throw new ArgumentException("Arg_MustBeVersion");
+
+            Version v = (Version) version;
+
+            if (this._Major != v._Major)
+                if (this._Major > v._Major)
+                    return 1;
+                else
+                    return -1;
+
+            if (this._Minor != v._Minor)
+                if (this._Minor > v._Minor)
+                    return 1;
+                else
+                    return -1;
+
+            if (this._Build != v._Build)
+                if (this._Build > v._Build)
+                    return 1;
+                else
+                    return -1;
+
+            if (this._Revision != v._Revision)
+                if (this._Revision > v._Revision)
+                    return 1;
+                else
+                    return -1;
+
+            return 0;
+        }
+
+        //| <include path='docs/doc[@for="Version.Equals"]/*' />
+        public override bool Equals(Object obj) {
+            if (((Object) obj == null) ||
+                (!(obj is Version)))
+                return false;
+
+            Version v = (Version) obj;
+            // check that major, minor, build & revision numbers match
+            if ((this._Major != v._Major) ||
+                (this._Minor != v._Minor) ||
+                (this._Build != v._Build) ||
+                (this._Revision != v._Revision))
+                return false;
+
+            return true;
+        }
+
+        //| <include path='docs/doc[@for="Version.GetHashCode"]/*' />
+        public override int GetHashCode()
+        {
+            // Let's assume that most version numbers will be pretty small and just
+            // OR some lower order bits together.
+
+            int accumulator = 0;
+
+            accumulator |= (this._Major & 0x0000000F) << 28;
+            accumulator |= (this._Minor & 0x000000FF) << 20;
+            accumulator |= (this._Build & 0x000000FF) << 12;
+            accumulator |= (this._Revision & 0x00000FFF);
+
+            return accumulator;
+        }
+
+        //| <include path='docs/doc[@for="Version.ToString"]/*' />
+        public override String ToString() {
+            if (_Build == -1) return(ToString(2));
+            if (_Revision == -1) return(ToString(3));
+            return(ToString(4));
+        }
+
+        //| <include path='docs/doc[@for="Version.ToString1"]/*' />
+        public String ToString(int fieldCount) {
+            switch (fieldCount) {
+            case 0:
+                return(String.Empty);
+            case 1:
+                return(String.Concat(_Major));
+            case 2:
+                return(String.Concat(_Major,".",_Minor));
+            default:
+                if (_Build == -1)
+                    throw new ArgumentException(String.Format("ArgumentOutOfRange_Bounds_Lower_Upper", "0", "2"), "fieldCount");
+                if (fieldCount == 3)
+                    return( _Major + "." + _Minor + "." + _Build );
+
+                if (_Revision == -1)
+                    throw new ArgumentException(String.Format("ArgumentOutOfRange_Bounds_Lower_Upper", "0", "3"), "fieldCount");
+
+                if (fieldCount == 4)
+                    return( Major + "." + _Minor + "." + _Build + "." + _Revision );
+
+                throw new ArgumentException(String.Format("ArgumentOutOfRange_Bounds_Lower_Upper", "0", "4"), "fieldCount");
+            }
+        }
+
+        //| <include path='docs/doc[@for="Version.operatorEQ"]/*' />
+        public static bool operator ==(Version v1, Version v2) {
+            if ((Object) v1 == null) {
+                if ((Object) v2 == null)
+                    return true;
+                else
+                    return false;
+            }
+            if ((Object) v2 == null)
+               return false;
+
+            return v1.Equals(v2);
+        }
+
+        //| <include path='docs/doc[@for="Version.operatorNE"]/*' />
+        public static bool operator !=(Version v1, Version v2) {
+            return !(v1 == v2);
+        }
+
+        //| <include path='docs/doc[@for="Version.operatorLT"]/*' />
+        public static bool operator <(Version v1, Version v2) {
+            if ((Object) v1 == null)
+                throw new ArgumentNullException("v1");
+            return (v1.CompareTo(v2) < 0);
+        }
+
+        //| <include path='docs/doc[@for="Version.operatorLE"]/*' />
+        public static bool operator <=(Version v1, Version v2) {
+            if ((Object) v1 == null)
+                throw new ArgumentNullException("v1");
+            return (v1.CompareTo(v2) <= 0);
+        }
+
+        //| <include path='docs/doc[@for="Version.operatorGT"]/*' />
+        public static bool operator >(Version v1, Version v2) {
+            return (v2 < v1);
+        }
+
+        //| <include path='docs/doc[@for="Version.operatorGE"]/*' />
+        public static bool operator >=(Version v1, Version v2) {
+            return (v2 <= v1);
+        }
+    }
+}
diff --git a/base/Kernel/System/Void.cs b/base/Kernel/System/Void.cs
new file mode 100644
index 0000000..fe00308
--- /dev/null
+++ b/base/Kernel/System/Void.cs
@@ -0,0 +1,19 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+////////////////////////////////////////////////////////////////////////////////
+// Void
+//  This class represents the void return type
+////////////////////////////////////////////////////////////////////////////////
+
+namespace System {
+
+    using System;
+    //| <include path='docs/doc[@for="Void"]/*' />
+
+    public struct Void
+    {
+    }
+}
diff --git a/base/Kernel/System/_LocalDataStore.cs b/base/Kernel/System/_LocalDataStore.cs
new file mode 100644
index 0000000..be10616
--- /dev/null
+++ b/base/Kernel/System/_LocalDataStore.cs
@@ -0,0 +1,131 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: LocalDataStore
+**
+**
+** Purpose: Class that stores local data. This class is used in cooperation
+**          with the _LocalDataStoreMgr class.
+**
+** Date: March 25, 1999
+**
+=============================================================================*/
+
+namespace System {
+
+    using System;
+
+    internal class LocalDataStore
+    {
+        /*=========================================================================
+        ** DON'T CHANGE THESE UNLESS YOU MODIFY LocalDataStoreBaseObject in vm\object.h
+        =========================================================================*/
+        private Object[] m_DataTable;
+        private LocalDataStoreMgr m_Manager;
+
+        /*=========================================================================
+        ** Initialize the data store.
+        =========================================================================*/
+        public LocalDataStore(LocalDataStoreMgr mgr, int InitialCapacity)
+        {
+            if (null == mgr)
+                throw new ArgumentNullException("mgr");
+
+            // Store the manager of the local data store.
+            m_Manager = mgr;
+
+            // Allocate the array that will contain the data.
+            m_DataTable = new Object[InitialCapacity];
+        }
+
+        /*=========================================================================
+        ** Retrieves the value from the specified slot.
+        =========================================================================*/
+        public Object GetData(LocalDataStoreSlot slot)
+        {
+            Object o = null;
+
+            // Validate the slot.
+            m_Manager.ValidateSlot(slot);
+
+            // Cache the slot index to avoid synchronization issues.
+            int slotIdx = slot.Slot;
+
+            if (slotIdx >= 0)
+            {
+                // Delay expansion of m_DataTable if we can
+                if (slotIdx >= m_DataTable.Length)
+                    return null;
+
+                // Retrieve the data from the given slot.
+                o = m_DataTable[slotIdx];
+            }
+
+            // Check if the slot has become invalid.
+            if (!slot.IsValid())
+                throw new InvalidOperationException("InvalidOperation_SlotHasBeenFreed");
+            return o;
+        }
+
+        /*=========================================================================
+        ** Sets the data in the specified slot.
+        =========================================================================*/
+        public void SetData(LocalDataStoreSlot slot, Object data)
+        {
+            // Validate the slot.
+            m_Manager.ValidateSlot(slot);
+
+            // I can't think of a way to avoid the race described in the
+            // LocalDataStoreSlot finalizer method without a lock.
+            lock (m_Manager)
+            {
+                if (!slot.IsValid())
+                    throw new InvalidOperationException("InvalidOperation_SlotHasBeenFreed");
+
+                // Do the actual set operation.
+                SetDataInternal(slot.Slot, data, true /*bAlloc*/ );
+            }
+        }
+
+        /*=========================================================================
+        ** This method does the actual work of setting the data.
+        =========================================================================*/
+        internal void SetDataInternal(int slot, Object data, bool bAlloc)
+        {
+            // We try to delay allocate the dataTable (in cases like the manager clearing a
+            // just-freed slot in all stores
+            if (slot >= m_DataTable.Length)
+            {
+                if (!bAlloc)
+                    return;
+                SetCapacity(m_Manager.GetSlotTableLength());
+            }
+
+            // Set the data on the given slot.
+            m_DataTable[slot] = data;
+        }
+
+        /*=========================================================================
+        ** Method used to set the capacity of the local data store.
+        =========================================================================*/
+        private void SetCapacity(int capacity)
+        {
+            // Validate that the specified capacity is larger than the current one.
+            if (capacity < m_DataTable.Length)
+            throw new ArgumentException("Argument_ALSInvalidCapacity");
+
+            // Allocate the new data table.
+            Object[] NewDataTable = new Object[capacity];
+
+            // Copy all the objects into the new table.
+            Array.Copy(m_DataTable, NewDataTable, m_DataTable.Length);
+
+            // Save the new table.
+            m_DataTable = NewDataTable;
+        }
+    }
+}
diff --git a/base/Kernel/System/_LocalDataStoreMgr.cs b/base/Kernel/System/_LocalDataStoreMgr.cs
new file mode 100644
index 0000000..8eb66eb
--- /dev/null
+++ b/base/Kernel/System/_LocalDataStoreMgr.cs
@@ -0,0 +1,295 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*=============================================================================
+**
+** Class: LocalDataStoreMgr
+**
+**
+** Purpose: Class that manages stores of local data. This class is used in
+**          cooperation with the LocalDataStore class.
+**
+** Date: March 25, 1999
+**
+=============================================================================*/
+namespace System {
+
+    using System;
+    using System.Collections;
+
+    // This is a cheesy internal helper class that is used to make sure memory
+    // is actually being accessed and not some cached copy of a field in a
+    // register.
+    // WARNING: If we every do type analysis to eliminate virtual functions,
+    // this will break.
+    internal class LdsSyncHelper
+    {
+        internal virtual int Get(ref int slot)
+        {
+            return slot;
+        }
+    }
+
+    // This class is an encapsulation of a slot so that it is managed in a secure fashion.
+    // It is constructed by the LocalDataStoreManager, holds the slot and the manager
+    // and cleans up when it is finalized.
+    //| <include path='docs/doc[@for="LocalDataStoreSlot"]/*' />
+    public sealed class LocalDataStoreSlot
+    {
+        private static LdsSyncHelper m_helper = new LdsSyncHelper();
+
+        private LocalDataStoreMgr m_mgr;
+        private int m_slot;
+
+        // Construct the object to encapsulate the slot.
+        internal LocalDataStoreSlot(LocalDataStoreMgr mgr, int slot)
+        {
+            m_mgr = mgr;
+            m_slot = slot;
+        }
+
+        // Accessors for the two fields of this class.
+        internal LocalDataStoreMgr Manager
+        {
+            get
+            {
+                return m_mgr;
+            }
+        }
+        internal int Slot
+        {
+            get
+            {
+                return m_slot;
+            }
+        }
+
+        // This is used to make sure we are actually reading and writing to
+        // memory to fetch the slot (rather than possibly using a value
+        // cached in a register).
+        internal bool IsValid()
+        {
+            return m_helper.Get(ref m_slot) != -1;
+        }
+
+        // Release the slot reserved by this object when this object goes away.
+        // There is  a race condition that can happen in the face of
+        // resurrection where another thread is fetching values or assigning
+        // while the finalizer thread is here.  We are counting on the fact
+        // that code that fetches values calls IsValid after fetching a value
+        // and before giving it to anyone.  See LocalDataStore for the other
+        // half of this.  We are also counting on code that sets values locks
+        // the manager.
+        //| <include path='docs/doc[@for="LocalDataStoreSlot.Finalize"]/*' />
+        ~LocalDataStoreSlot()
+        {
+            int slot = m_slot;
+
+            // This lock fixes synchronization with the assignment of values.
+            lock (m_mgr)
+            {
+                // Mark the slot as free.
+                m_slot = -1;
+
+                m_mgr.FreeDataSlot(slot);
+            }
+        }
+    }
+
+    internal class LocalDataStoreMgr
+    {
+        private const byte DataSlotOccupied             = 0x01;
+
+        private const int InitialSlotTableSize          = 64;
+        private const int SlotTableDoubleThreshold      = 512;
+        private const int LargeSlotTableSizeIncrease    = 128;
+
+        /*=========================================================================
+        ** Create a data store to be managed by this manager and add it to the
+        ** list. The initial size of the new store matches the number of slots
+        ** allocated in this manager.
+        =========================================================================*/
+        public LocalDataStore CreateLocalDataStore()
+        {
+            // Create a new local data store.
+            LocalDataStore Store = new LocalDataStore(this, m_SlotInfoTable.Length);
+
+            lock (this) {
+                // Add the store to the array list and return it.
+                m_ManagedLocalDataStores.Add(Store);
+            }
+            return Store;
+        }
+
+        /*=========================================================================
+         * Remove the specified store from the list of managed stores..
+        =========================================================================*/
+        public void DeleteLocalDataStore(LocalDataStore store)
+        {
+            lock (this) {
+                // Remove the store to the array list and return it.
+                m_ManagedLocalDataStores.Remove(store);
+            }
+        }
+
+        /*=========================================================================
+        ** Allocates a data slot by finding an available index and wrapping it
+        ** an object to prevent clients from manipulating it directly, allowing us
+        ** to make assumptions its integrity.
+        =========================================================================*/
+        public LocalDataStoreSlot AllocateDataSlot()
+        {
+            lock (this) {
+                int i;
+                LocalDataStoreSlot slot;
+
+                // Retrieve the current size of the table.
+                int SlotTableSize = m_SlotInfoTable.Length;
+
+                // Check if there are any slots left.
+                if (m_FirstAvailableSlot < SlotTableSize)
+                {
+                    // Save the first available slot.
+                    slot = new LocalDataStoreSlot(this, m_FirstAvailableSlot);
+                    m_SlotInfoTable[m_FirstAvailableSlot] = DataSlotOccupied;
+
+                    // Find the next available slot.
+                    for (i=m_FirstAvailableSlot+1; i < SlotTableSize; ++i)
+                        if (0 == (m_SlotInfoTable[i] & DataSlotOccupied))
+                            break;
+
+                    // Save the new "first available slot".
+                    m_FirstAvailableSlot = i;
+
+                    // Return the slot index.
+                    return slot;
+                }
+
+                // The table is full so we need to increase its size.
+                int NewSlotTableSize;
+                if (SlotTableSize < SlotTableDoubleThreshold)
+                {
+                    // The table is still relatively small so double it.
+                    NewSlotTableSize = SlotTableSize * 2;
+                }
+                else
+                {
+                    // The table is relatively large so simply increase its size by a given amount.
+                    NewSlotTableSize = SlotTableSize + LargeSlotTableSizeIncrease;
+                }
+
+                // Allocate the new slot info table.
+                byte[] NewSlotInfoTable = new byte[NewSlotTableSize];
+
+                // Copy the old array into the new one.
+                Array.Copy(m_SlotInfoTable, NewSlotInfoTable, SlotTableSize);
+                m_SlotInfoTable = NewSlotInfoTable;
+
+                // SlotTableSize is the index of the first empty slot in the expanded table.
+                slot = new LocalDataStoreSlot(this, SlotTableSize);
+                m_SlotInfoTable[SlotTableSize] = DataSlotOccupied;
+                m_FirstAvailableSlot = SlotTableSize + 1;
+
+                // Return the selected slot
+                return slot;
+            }
+        }
+
+        /*=========================================================================
+        ** Allocate a slot and associate a name with it.
+        =========================================================================*/
+        public LocalDataStoreSlot AllocateNamedDataSlot(String name)
+        {
+            lock (this)
+            {
+                // Allocate a normal data slot.
+                LocalDataStoreSlot slot = AllocateDataSlot();
+
+                // Insert the association between the name and the data slot number
+                // in the hash table.
+                m_KeyToSlotMap.Add(name, slot);
+                return slot;
+            }
+        }
+
+        /*=========================================================================
+        ** Retrieve the slot associated with a name, allocating it if no such
+        ** association has been defined.
+        =========================================================================*/
+        public LocalDataStoreSlot GetNamedDataSlot(String name)
+        {
+            lock (this)
+            {
+                // Lookup in the hashtable to try find a slot for the name.
+                LocalDataStoreSlot slot = (LocalDataStoreSlot) m_KeyToSlotMap[name];
+
+                // If the name is not yet in the hashtable then add it.
+                if (null == slot)
+                    return AllocateNamedDataSlot(name);
+
+                // The name was in the hashtable so return the associated slot.
+                return slot;
+            }
+        }
+
+        /*=========================================================================
+        ** Eliminate the association of a name with a slot.  The actual slot will
+        ** be reclaimed when the finalizer for the slot object runs.
+        =========================================================================*/
+        public void FreeNamedDataSlot(String name)
+        {
+            lock (this)
+            {
+                // Remove the name slot association from the hashtable.
+                m_KeyToSlotMap.Remove(name);
+            }
+        }
+
+        /*=========================================================================
+        ** Free's a previously allocated data slot on ALL the managed data stores.
+        =========================================================================*/
+        internal void FreeDataSlot(int slot)
+        {
+            lock (this) {
+                // Go thru all the managed stores and set the data on the specified slot to 0.
+                for (int i=0; i < m_ManagedLocalDataStores.Count; i++)
+                {
+                    ((LocalDataStore)m_ManagedLocalDataStores[i]).SetDataInternal(
+                                                                      slot,
+                                                                      null,
+                                                                      false);
+                }
+
+                // Mark the slot as being no longer occupied.
+                m_SlotInfoTable[slot] = 0;
+                if (slot < m_FirstAvailableSlot)
+                    m_FirstAvailableSlot = slot;
+            }
+        }
+
+        /*=========================================================================
+        ** Return the number of allocated slots in this manager.
+        =========================================================================*/
+        public void ValidateSlot(LocalDataStoreSlot slot)
+        {
+            // Make sure the slot was allocated for this store.
+            if (slot==null || slot.Manager != this)
+                throw new ArgumentException("Argument_ALSInvalidSlot");
+        }
+
+        /*=========================================================================
+        ** Return the number of allocated slots in this manager.
+        =========================================================================*/
+        internal int GetSlotTableLength()
+        {
+                return m_SlotInfoTable.Length;
+        }
+
+        private byte[] m_SlotInfoTable = new byte[InitialSlotTableSize];
+        private int m_FirstAvailableSlot = 0;
+        private ArrayList m_ManagedLocalDataStores = new ArrayList();
+        private Hashtable m_KeyToSlotMap = new Hashtable();
+    }
+}
diff --git a/base/Kernel/abi2def.cmd b/base/Kernel/abi2def.cmd
new file mode 100644
index 0000000..c99535a
--- /dev/null
+++ b/base/Kernel/abi2def.cmd
@@ -0,0 +1,70 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+if .==.%1 goto usage
+if .%1==./? goto usage
+
+REM
+REM Process arguments.
+REM
+
+set _OBJS=
+set _DEFS=singularity.V999.def
+set _SRCH="@Struct_Microsoft_Singularity_V[0-9]*_"
+:parse
+if .==.%1 goto good
+
+if /I ./?==./1 (
+  shift /1
+  goto usage
+)
+if /I .%1==.-? (
+  shift /1
+  goto usage
+)
+if /I .%1==./help (
+  shift /1
+  goto usage
+)
+if /I .%1==./version (
+  set _SRCH="@Struct_Microsoft_Singularity_V%2_"
+  shift /1
+  shift /1
+  goto parse
+)
+if /I .%1==./def (
+  set _DEFS=%2
+  shift /1
+  shift /1
+  goto parse
+)
+
+set _OBJS=%_OBJS% %1
+shift /1
+goto parse
+
+:good
+rem echo _OBJS=%_OBJS%
+rem echo _DEFS=%_DEFS%
+rem echo _SRCH=%_SRCH%
+rem goto exit
+echo EXPORTS > %_DEFS%
+
+set FindStr=%SYSTEMROOT%\system32\findstr
+dumpbin /symbols %_OBJS% | %FindStr% "External" | %FindStr% -v "\$" | %FindStr% "\?g_[A-z]" | %FindStr% %_SRCH% | substitute.exe ".*(?<x>\?g_[^ ]*).*" "    ${x}" >> %_DEFS%
+goto exit
+
+:usage
+echo.Usage:
+echo.    ABI2DEF.CMD [/VERSION number] [/DEF output] {objs}
+echo.
+echo.Summary:
+echo.    Creates the .DEF for the specified version of the Singularity ABI by
+echo.    parsing the symbols exported from the named .obj and .lib files.
+echo.    If version isn't specified, create a file for all versions.
+echo.
+echo.Options:
+echo.    /VERSION number        ABI version number.
+echo.    /DEF output            Output .def file.
+echo.
+
+:exit
diff --git a/base/Kernel/dummysysentry.cpp b/base/Kernel/dummysysentry.cpp
new file mode 100644
index 0000000..9f789cc
--- /dev/null
+++ b/base/Kernel/dummysysentry.cpp
@@ -0,0 +1,6 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+int syscallEntryTable[] = {0};
diff --git a/base/Kernel/linkdate.cpp b/base/Kernel/linkdate.cpp
new file mode 100644
index 0000000..6c16474
--- /dev/null
+++ b/base/Kernel/linkdate.cpp
@@ -0,0 +1,9 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define __T(x)      L ## x
+#define _T(x)       __T(x)
+
+wchar_t _LinkDate[] = _T(__DATE__) _T(" ") _T(__TIME__);
diff --git a/base/Kernel/testpe.cpp b/base/Kernel/testpe.cpp
new file mode 100644
index 0000000..54494c0
--- /dev/null
+++ b/base/Kernel/testpe.cpp
@@ -0,0 +1,112 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  testpe.cpp - Singularity Hardware Abstraction Layer
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+typedef unsigned short      bartok_char;
+typedef signed short        int16;
+typedef signed int          int32;
+typedef __int64             int64;
+typedef unsigned char       uint8;
+typedef unsigned short      uint16;
+typedef unsigned int        uint32;
+typedef unsigned __int64    uint64;
+
+struct Struct_System_ObjectHeader
+{
+    int32  syncBlockValue;
+};
+
+struct Class_System_Object
+{
+    void * f_vtable;
+};
+
+struct Class_System_VTable : Class_System_Object
+{
+};
+
+struct Struct_Microsoft_Singularity_V1_Services_DebugService
+{
+    static void g_Break();
+    static void g_Print(bool);
+    static void g_Print(bartok_char);
+    static void g_Print(int32);
+    static void g_Print(int64);
+    static void g_Print(uint32);
+    static void g_Print(uint64);
+    static void g_Print(uint8);
+};
+
+struct Struct_Microsoft_Singularity_V1_Services_ProcessService
+{
+    static void g_Waypoint(int32);
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+uint8 __fastcall test8()
+{
+    return 0;
+}
+
+uint16 __fastcall test16()
+{
+    return 0;
+}
+
+uint32 __fastcall test32()
+{
+    return 0;
+}
+
+uint64 __fastcall test64()
+{
+    return 0;
+}
+
+struct Struct_Microsoft_Singularity_V1_Services_StackService
+{
+    static void g_GetUnlinkStackRange(uint64 *unlinkBegin, uint64 *unlinkLimit);
+    static void g_WalkStack();
+};
+
+extern "C" int32 __fastcall entry(int32 threadIndex)
+{
+    if (threadIndex == -1) {
+#if MAXIMUM
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('-');
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('H');
+
+        uint64 unlinkBegin = 0;
+        uint64 unlinkLimit = 0;
+
+        Struct_Microsoft_Singularity_V1_Services_StackService::g_GetUnlinkStackRange
+            (&unlinkBegin, &unlinkLimit);
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print(unlinkBegin);
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print(' ');
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print(unlinkLimit);
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('\n');
+
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('-');
+        Struct_Microsoft_Singularity_V1_Services_StackService::g_WalkStack();
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('-');
+#else
+        Struct_Microsoft_Singularity_V1_Services_ProcessService::g_Waypoint(999);
+#endif
+    }
+    else {
+#if MAXIMUM
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('T');
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print(threadIndex);
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('\n');
+#else
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('T');
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print(threadIndex);
+        Struct_Microsoft_Singularity_V1_Services_DebugService::g_Print('\n');
+#endif
+    }
+    return 0;
+}
diff --git a/base/Kernel/testpe.manifest b/base/Kernel/testpe.manifest
new file mode 100644
index 0000000..1e5b4af
--- /dev/null
+++ b/base/Kernel/testpe.manifest
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<application name="testpe" processes="1">
+  <process id="0" main="true" path="testpe.x86" cache="testpe.x86" categories="0"/>
+</application>
diff --git a/base/Kernel/validabi.cmd b/base/Kernel/validabi.cmd
new file mode 100644
index 0000000..baa26ef
--- /dev/null
+++ b/base/Kernel/validabi.cmd
@@ -0,0 +1,52 @@
+@echo off
+if .==.%1 goto usage
+if .%1==./? goto usage
+
+echo VALIDABI: Checking for object references.
+findstr Class_ %*
+if %ERRORLEVEL%==0 (
+echo ERROR: Object references are illegal in the Singularity ABI.
+exit /b 999
+)
+
+echo VALIDABI: Checking for member functions.
+findstr /c:"?m_" %*
+if %ERRORLEVEL%==0 (
+echo ERROR: Member functions are illegal in the Singularity ABI.
+exit /b 999
+)
+
+echo VALIDABI: Checking for exported const fields.
+findstr /c:"?c_" %*
+if %ERRORLEVEL%==0 (
+echo ERROR: Exported constant values are illegal in the Singularity ABI.
+exit /b 999
+)
+
+echo VALIDABI: Checking for fields.
+findstr /c:"?s_" %*
+if %ERRORLEVEL%==0 (
+echo ERROR: Exported global variables are illegal in the Singularity ABI.
+exit /b 999
+)
+
+echo VALIDABI: ABI successfully validated.
+exit /b 0
+goto exit
+
+:usage
+echo.Usage:
+echo.    VALIDABI.CMD [abifile}
+echo.
+echo.Summary:
+echo.    Check the .DEF file for violations of the follwing ABI invariants:
+echo.        * Object references never cross the ABI boundary.
+echo.        * Member functions are never exported as ABI functions.
+echo.        * Constant values are never exported in the ABI.
+echo.        * Global variables are never exported in the ABI.
+echo.
+echo.    Returns 0 if the ABI is valid.
+echo.    Returns 999 if the ABI is invalid.
+echo.
+
+:exit
diff --git a/base/Libraries/CLRProfiler/CLRProfiler.csproj b/base/Libraries/CLRProfiler/CLRProfiler.csproj
new file mode 100644
index 0000000..5a28028
--- /dev/null
+++ b/base/Libraries/CLRProfiler/CLRProfiler.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\xxx\xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>CLRProfiler</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="CLRProfiler.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Runtime\Corlibsg.csproj"/> -->
+    <ProjectReference Include="..\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+    <!-- <ProjectReference Include="..\Singularity.V1\Singularity.V1.csproj"/> -->
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/CLRProfiler/CLRProfiler.sg b/base/Libraries/CLRProfiler/CLRProfiler.sg
new file mode 100644
index 0000000..a20074c
--- /dev/null
+++ b/base/Libraries/CLRProfiler/CLRProfiler.sg
@@ -0,0 +1,794 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Diagnostics
+{
+    using FileSystem.Utils;
+
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+    using Microsoft.Singularity.V1.Services;
+
+    using System;
+    using System.Collections;
+    using System.GCs;
+    using System.IO;
+    using System.Runtime.CompilerServices;
+    using System.Threading;
+
+    // Receive notifications from the GC and deliver them to a profiler, via a log file.
+    public class CLRProfiler : GCProfiler
+    {
+        // The public API for a typical client app.
+        static public void StartProfiling()
+        {
+            CLRProfiler prof = new CLRProfiler();
+            prof.Initialize();
+            GC.SetProfiler(prof);
+        }
+
+        internal abstract class Buffer
+        {
+            // This must be big enough for whatever the biggest logical entry is that someone
+            // might write from a mutator thread.  The GC thread has unbounded entries and
+            // doesn't need to observe this rule.  I think the biggest entry is probably a
+            // typeName, which could be 512 bytes for the name, plus some slop.
+            //
+            // In a checked build, we assert that we remain within this requirement.  In a
+            // retail build, we quietly generate a corrupt log with entries intermingled.
+            // If you don't like this policy, change LocalBuffer.FlushOnOverflow to do
+            // something different.
+            protected const int  bufferSize = 800;
+            protected byte[]!    data;                  // data buffer
+            protected int        iBuff;                 // index into data buffer
+
+            protected Buffer()
+            {
+                data = new byte[bufferSize];
+                iBuff = 0;
+                base();
+            }
+
+            // Write a byte
+            internal void Write(byte c)
+            {
+                if (iBuff >= bufferSize) {
+                    DebugStub.Assert(iBuff == bufferSize);
+                    FlushOnOverflow();
+                    DebugStub.Assert(iBuff == 0);      // no races possible
+                }
+                data[iBuff++] = c;
+            }
+
+            // Write a byte and a space-separator
+            internal void WritePair(byte c)
+            {
+                Write(c);
+                Write(' ');
+            }
+
+            // Perform a Write of the number.ToString -- without allocating anything, with
+            // a space-separator
+            internal void WriteNumber(ulong ul)
+            {
+                if (ul == 0) {
+                    WritePair('0');
+                    return;
+                }
+
+                Write('0');
+                Write('x');
+
+                bool leadingZero = true;
+                byte nybble;
+
+                // 16 nybbles in an 8-byte quantity
+                for (int i=0; i<16; i++) {
+                    nybble = (byte) ((ul & 0xf000000000000000) >> 60);
+                    ul <<= 4;
+
+                    if (leadingZero) {
+                        if (nybble == 0) {
+                            continue;       // no need to print leading zeroes
+                        }
+                        else {
+                            leadingZero = false;
+                        }
+                    }
+
+                    nybble += (byte) ((nybble > 9) ? 'a'-10 : '0');
+                    Write(nybble);
+                }
+                Write(' ');
+            }
+
+            // No space-separator!
+            internal void WriteString(string! s)
+            {
+                for (int i=0; i<s.Length; i++) {
+                    Write((byte) s[i]);     // simplest Unicode -> ASCII
+                }
+            }
+
+            // Terminate an entry
+            internal void WriteCRLF()
+            {
+                Write('\r');
+                Write('\n');
+            }
+
+            // For some buffer subtypes, it is a bug to overflow an entry while writing a
+            // partial entry.  That's why we distinguish the overflow and consistent
+            // forms of flush.
+            internal virtual void FlushOnOverflow()
+            {
+                FlushConsistentEntry();
+            }
+
+            internal abstract void FlushConsistentEntry();
+
+            // A child buffer can ask its parent to accept some bytes.  The parent is responsible
+            // for the appropriate synchronization (including with the GC!).
+            internal abstract void TakeBytes(byte[]! bytes, int count);
+        }
+
+        // A LocalBuffer that -- when completely consistent -- can flush up to its Parent.
+        internal class LocalBuffer : Buffer
+        {
+            private Buffer!             parent;
+
+            // With everyone allocating and using local buffers, we need at least a minimal
+            // cache for recycling.
+            private LocalBuffer         next;       // create linked list for a cache of buffers
+
+            static private LocalBuffer  cache;
+            static private SpinLock     cacheLock;
+
+            internal LocalBuffer(Buffer! parent)
+            {
+                this.parent = parent;
+                base();
+            }
+
+            // The LocalBuffers are supposed to be large enough to be accommodate any non-GC
+            // logging.  This isn't the case, and we are about to corrupt the log by interleaving
+            // output from multiple entries.
+            internal override void FlushOnOverflow()
+            {
+#if _DEBUG
+                DebugStub.Assert(false);
+#endif
+                base.FlushOnOverflow();             // emit a corruption
+            }
+
+            internal override void FlushConsistentEntry()
+            {
+                if (iBuff > 0) {
+                    parent.TakeBytes(data, iBuff);
+                    iBuff = 0;
+                }
+            }
+
+            internal override void TakeBytes(byte[]! bytes, int count)
+            {
+                DebugStub.Assert(false, "Never implemented arbitrarily nested LocalBuffers");
+            }
+
+            // We don't want to create a new buffer on every log entry.  Recycle
+            // buffers using a pool.
+            static internal LocalBuffer! FindOrCreateBuffer(FileBuffer! fileBuffer)
+            {
+                cacheLock.Acquire();
+                LocalBuffer temp = cache;
+                if (temp != null) {
+                    cache = temp.next;
+                    temp.next = null;
+                }
+                cacheLock.Release();
+                if (temp != null) {
+                    // Not a very general cache.  Make sure it isn't being abused.
+                    DebugStub.Assert(fileBuffer == temp.parent);
+                    return temp;
+                }
+                // cache underflow:
+                return new LocalBuffer(fileBuffer);
+            }
+
+            // The below is unsafe.  If there are any outstanding references to this buffer, then
+            // we no longer have single-threaded access and the entries will become corrupt.
+            internal void Recycle()
+            {
+                FlushConsistentEntry();
+
+                cacheLock.Acquire();        // cache grows to a high water mark
+                this.next = cache;
+                cache = this;
+                cacheLock.Release();
+            }
+        }
+
+        // A buffer associated with a file to which it directly writes.
+        internal class FileBuffer : Buffer
+        {
+            private TRef<FileContract.Imp:Ready>! connRef;
+            private long       filePos;
+            private SpinLock   fileLock;
+            private Thread     owningThread;
+
+            internal FileBuffer(TRef<FileContract.Imp:Ready>! connRef)
+            {
+                this.connRef = connRef;
+                base();
+            }
+
+            internal override void FlushConsistentEntry()
+            {
+                if (iBuff > 0) {
+                    FileContract.Imp conn = connRef.Acquire();
+                    byte[]! in ExHeap bytes = Bitter.FromByteArray(data, 0, iBuff);
+
+                    try {
+                        long bytesWritten;
+                        int error;
+
+                        conn.SendWrite(bytes, 0, filePos, bytes.Length);
+                        conn.RecvAckWrite(out bytes, out bytesWritten, out error);
+                        delete bytes;
+
+                        filePos += bytesWritten;
+                        if (error != 0) {
+                            Console.WriteLine("Failed to write to GC Profiler log\n");
+                            // TODO: We need a real error story for the platform.
+                            throw new Exception("Failed to write to GC Profiler log");
+                        }
+                    }
+                    finally {
+                        // Other threads could have passed their 'enabled' check and be
+                        // blocked on the monitor.  So even on failure we must empty
+                        // the buffer
+                        iBuff = 0;
+                        connRef.Release(conn);
+                    }
+                }
+            }
+
+            // TakeBytes from a child LocalBuffer in a single consistent cycle.  And do
+            // so without allocating or making a kernel transition or otherwise yielding
+            // to the GC.
+            //
+            // If the FileBuffer is currently Owned for exclusive access (i.e. the GC is
+            // streaming inconsistent records of arbitrary size and cannot be interrupted)
+            // then Yield to the GC and try again.  Sleeping should go through the kernel
+            // and provide an adequate Transition.
+            //
+            // Everything happens in a SpinLock because these locks don't themselves
+            // allocate.  Also, the SpinLock guarantees a consistent read of state like
+            // 'OwningThread' across all the CPUs.
+            internal override void TakeBytes(byte[]! bytes, int count)
+            {
+                DebugStub.Assert(count <= bufferSize);     // Guaranteed.
+                while (true) {
+                    fileLock.Acquire();
+
+                    // Is the GC thread holding onto exclusive access right now?
+                    if (OwningThread != null) {
+                        DebugStub.Assert(OwningThread != Thread.CurrentThread);
+                        fileLock.Release();
+                        Thread.Sleep(0);                // yield to the GC
+
+                        // It's possible that OwningThread has changed again (though
+                        // not in a manner that involves the current thread).  Start over.
+                        continue;
+                    }
+
+                    // Ensure there is enough space in the FileBuffer for all our
+                    // bytes.  Once we start accepting bytes, there must be no
+                    // allocations.  And we cannot write to disk while holding the
+                    // spinlock.
+                    if (iBuff + count > bufferSize) {
+                        fileLock.Release();
+                        FlushConsistentEntry();
+
+                        // It's possible that OwningThread has changed, or another
+                        // writer has intruded.  Start over.
+                        continue;
+                    }
+
+                    // We are holding the lock.  The GC hasn't taken control from us.
+                    // There is room for our entry.  Blast it without allocating or yielding.
+                    for (int i=0; i<count; i++) {
+                        data[iBuff++] = bytes[i];
+                    }
+                    fileLock.Release();
+                    return;                             // success.
+                }
+            }
+
+            // A FileBuffer can be owned by a client thread, in which case it will not TakeBytes
+            // from any children.
+            internal Thread OwningThread
+            {
+                get {
+                    // Reads are either performed for Assertion purposes by the thread that
+                    // is the owner, or they are only performed by threads that hold the
+                    // spinlock.  However, this invariant cannot be easily expressed in an
+                    // Assert.
+                    return owningThread;
+                }
+                set {
+                    fileLock.Acquire();
+                    owningThread = value;
+                    fileLock.Release();
+                }
+            }
+        }
+
+        private bool        enabled;                  // profiling is enabled?
+
+        private ulong       lastCycle;                // time entries
+        private ulong       firstCycle;
+        private const int   cycleGranularity = 5000000;
+
+        private const int   maxGeneration = 3;        // CLR Profiler only handles this many
+        private int[]!      generations;
+
+        private TRef<FileContract.Imp:Ready> connRef;
+
+        private Hashtable!  typeTable;                // hash of types->ids
+        private Hashtable!  stackTable;               // hash of stacks->ids
+        private Hashtable!  funcTable;                // hash of Eips->ids
+
+        private uint        nextTypeNo;               // hand out IDs monotonically
+        private uint        nextStackNo;
+        private uint        nextFuncNo;
+
+        private FileBuffer  _fileBuffer;
+        private FileBuffer! fileBuffer {
+            get {
+                // We can't capture the specs (in the type system) that
+                // one needs to call Initialize before any other ops
+                assert _fileBuffer != null;
+                return _fileBuffer;
+            }
+            set {
+                this._fileBuffer = value;
+            }
+        }
+
+        private int         rootCount;                // break up 'r' entries into chunks
+
+        private Thread      recurseThread;            // prevent recursion when the profiler allocates
+        private SpinLock    allocationLock;
+
+        // For stack traces, the Eips and corresponding stack numbers
+        private const int   stackSize = 8;            // increase for bigger / slower stack traces
+        private UIntPtr[]!  stackEips;
+        private uint[]!     stackNos;
+
+        internal CLRProfiler()
+        {
+            this.generations = new int[maxGeneration];
+            this.typeTable = new Hashtable();
+            this.stackTable = new Hashtable();
+            this.funcTable = new Hashtable();
+            this.stackEips = new UIntPtr[stackSize];
+            this.stackNos = new uint[stackSize];
+            firstCycle = Processor.CycleCount;
+            base();
+        }
+
+        // Initialization, prior to attempting to set this profiler into the GC.  It's
+        // inappropriate to do this stuff inside a constructor.
+        internal void Initialize()
+        {
+            string logDirectory = "/fs/gcProfiler";
+            bool   isDirectory;
+
+            if ((DirectoryUtils.PathIsDirectory(logDirectory, out isDirectory) != 0) ||
+                !isDirectory) {
+
+                // If it doesn't look like a healthy directory, try & create it.  There
+                // seems to be a bug where valid nested directories fail the PathIsDirectory
+                // call.  So make a best effort to create it, but if it already exists this
+                // will be a NOP.  Therefore, ignore failure at this stage.
+                DirectoryUtils.CreateDirectory(logDirectory);
+            }
+
+            ushort pid = ProcessService.GetCurrentProcessId();
+
+            string logFile = logDirectory + "/" + pid.ToString();
+
+            // If the file already exists, blow it away.  Don't worry about failures on the
+            // delete... Create & Open are what we really care about.
+            FileUtils.DeleteFile(logFile);
+
+            if (FileUtils.CreateFile(logFile) != 0) {
+                Console.WriteLine("Couldn't create file '" + logFile + "'");
+                return;
+            }
+
+            FileContract.Imp conn = FileUtils.OpenFile(logFile);
+            if (conn == null) {
+                Console.WriteLine("Couldn't open file '" + logFile + "'");
+                return;
+            }
+
+            connRef = new TRef<FileContract.Imp:Ready>(conn);
+            fileBuffer = new FileBuffer(connRef);
+
+            // Write out the log header, while we are still single-threaded.
+            WriteHeader(fileBuffer);
+
+            // When we set this, we are no longer single-threaded:
+            this.enabled = true;
+        }
+
+        // the API by which our base class calls us
+
+        protected override void Shutdown()
+        {
+            // This is presumed to be called when the process is single-threaded, since
+            // the entire GC heap is shutting down.
+            if (enabled) {
+                // flush & close the log
+                fileBuffer.FlushConsistentEntry();
+                enabled = false;
+            }
+        }
+
+        // There are 3 entry points that must write to the log, causing multi-threaded
+        // concerns.
+        //
+        // 1.  PreGC
+        // 2.  PostGC
+        // 3.  Allocation
+        //
+        // Here are those concerns:
+        //
+        // o  Multiple Allocation notifications will race with each other.
+        // 
+        // o  Some GCs might use multiple threads.  For now, I assume a single-threaded
+        //    GC.
+        //
+        // o  Some GCs might be concurrent with the application.  For now, I assume that
+        //    GC allows mutator threads to run, so long as they don't allocate, make a
+        //    user/kernel transition, or otherwise synchronize with the GC.
+        //
+        // o  Some GCs might relocate objects.  I haven't implemented the notifications
+        //    for this yet.
+        //
+        // The solution is that non-GC logging is performed to LocalBuffers.  When a buffer
+        // is in a consistent state, it can be flushed to the shared FileBuffer.
+        // There are some subtleties to this:
+        //
+        // 1.  The GC writes some entries that are unbounded in size (like the elements
+        //     coming out of a huge object array).  So it cannot use a LocalBuffer.
+        //
+        // 2.  The mutator threads might have to write a set of entries like a stack
+        //     trace, a type definition, and an allocation entry which are all related.
+        //
+        // The second issue is addressed by making the local buffers big enough to write
+        // fully formed consistent entries without overflowing.  We also tolerate races
+        // in the definitions of some of the related entries, leading to duplicates.
+        //
+        // The first issue is addressed by putting the GC in a special position where
+        // it can stream to the file on overflow, and prevent any mutator threads from
+        // injecting their consistent entries into that stream, thereby corrupting it.
+        // This means that a mutator might allocate in one GC, but not report that
+        // allocation until the next GC.  The CLR Profiler tool seems resilient to these
+        // anomalies.
+
+        // A GC is about to start.  The world is in a sane place, except that we may
+        // have stopped the mutator threads if this is a StopTheWorld collection.
+        protected override void PreGC(int generation)
+        {
+            try {
+                // Take ownership of the fileBuffer to prevent mutating threads from
+                // interleaving with us.
+                DebugStub.Assert(fileBuffer.OwningThread == null);
+                fileBuffer.OwningThread = Thread.CurrentThread;
+
+                // emit the fact that a GC will occur
+                MaybeTick(fileBuffer);
+
+                if (generation >= maxGeneration) {
+                    generation = maxGeneration-1;
+                }
+                generations[generation]++;
+
+                fileBuffer.WritePair('g');
+                fileBuffer.WriteNumber((ulong) generations[0]);
+                fileBuffer.WriteNumber((ulong) generations[1]);
+                fileBuffer.WriteNumber((ulong) generations[2]);
+                fileBuffer.WriteCRLF();
+            }
+            catch (Exception) {
+                enabled = false;
+                throw;
+            }
+        }
+
+        // A GC has finished.  The world is in a sane place, except that we might not
+        // have started up all the mutator threads if this is a StopTheWorld collection.
+        protected override void PostGC()
+        {
+            try {
+                // emit the fact a GC has happened, including the state of the heap.
+                MaybeTick(fileBuffer);
+
+                // Write all the Roots
+                fileBuffer.WritePair('r');
+                rootCount = 0;
+                ScanRoots();
+                fileBuffer.WriteCRLF();        // finish off the open log entry
+
+                // Write all the reachability graph of the heap
+                ScanObjects();
+
+                // Once we have finished writing everything, we can allow mutator threads to
+                // share access to the fileBuffer with their own consistent entries.
+                fileBuffer.FlushConsistentEntry();
+                DebugStub.Assert(fileBuffer.OwningThread == Thread.CurrentThread);
+                fileBuffer.OwningThread = null;
+            }
+            catch (Exception) {
+                enabled = false;
+                throw;
+            }
+        }
+
+        // In the list of roots, we have found another object
+        protected override void ScanOneRoot(UIntPtr objectAddress)
+        {
+            if (objectAddress != 0) {
+                // We want to put a reasonable chunk into each 'r' entry and then use multiple
+                // such entries.  But I'm tempted to say there is a bug in CLR Profiler that
+                // prevents it from correctly handling multiple consecutive 'r' log entries.
+                // So make the chunk size enormous for now.
+                if (rootCount > 10000) {
+                    fileBuffer.WriteCRLF();
+                    fileBuffer.WritePair('r');
+                    rootCount = 0;
+                }
+                fileBuffer.WriteNumber((ulong) objectAddress);
+                rootCount++;
+            }
+        }
+
+        // In the heap reachability graph, we are starting to dump a new object
+        protected override void StartScanOneObject(UIntPtr objectAddress, Type type, UIntPtr size)
+        {
+            uint typeNo = MaybeWriteType(fileBuffer, (!)type);
+
+            fileBuffer.WritePair('o');
+            fileBuffer.WriteNumber((ulong) objectAddress);
+            fileBuffer.WriteNumber((ulong) typeNo);
+            fileBuffer.WriteNumber((ulong) size);
+
+            // This will be followed by repeated calls to ScanOneObjectField, then
+            // EndScanOneObject
+        }
+
+        // This is one of the references that the current object holds.
+        protected override void ScanOneObjectField(UIntPtr objectAddress)
+        {
+            if (objectAddress != 0) {
+                fileBuffer.WriteNumber((ulong) objectAddress);
+            }
+        }
+
+        // We are finished scanning one object
+        protected override void EndScanOneObject()
+        {
+            fileBuffer.WriteCRLF();
+        }
+
+        // Create a log entry for the allocation that just occurred on this thread.
+        protected override void Allocation(UIntPtr objAddr, Type type, UIntPtr size)
+        {
+            // We cannot recurse inside an Allocation notification, or we will simply
+            // blow the stack on the first entry.  Also, we don't want to log allocations
+            // that occur as a consequence of logging the state of the GC heap -- though
+            // we could support that if we chose to.
+            if (enabled &&
+                recurseThread != Thread.CurrentThread &&            // recurse?
+                fileBuffer.OwningThread != Thread.CurrentThread) {  // GC logging?
+                allocationLock.Acquire();
+                try {
+                    DebugStub.Assert(recurseThread == null);
+                    recurseThread = Thread.CurrentThread;
+                    // record the fact that an object was allocated, into a local
+                    // buffer that will be written to the fileBuffer only when we
+                    // are no longer subject to the GC.
+                    LocalBuffer! localBuffer = LocalBuffer.FindOrCreateBuffer(fileBuffer);
+                    MaybeTick(localBuffer);
+
+                    // Emit a stack trace.
+                    // TODO: Processor.GetStackEips doesn't indicate how much of the array
+                    // it modified, so we have to zero it before each call.  Better to change
+                    // the GetStackEips API!
+                    for (int i=0; i<stackEips.Length; i++) {
+                        stackEips[i] = 0;
+                    }
+                    Processor.GetStackEips(stackEips);
+                    uint stkNo = MaybeWriteStack(localBuffer, (!) type, size, stackEips);
+
+                    localBuffer.WritePair('!');
+                    localBuffer.WriteNumber((ulong) Thread.CurrentThread.GetThreadId());
+                    localBuffer.WriteNumber((ulong) objAddr);
+                    localBuffer.WriteNumber((ulong) stkNo);
+                    localBuffer.WriteCRLF();
+
+                    localBuffer.Recycle();
+                }
+                finally {
+                    recurseThread = null;
+                    allocationLock.Release();
+                }
+            }
+        }
+
+        // The rest of our implementation details:
+
+        private uint MaybeWriteStack(Buffer! buffer, Type! type, UIntPtr size, UIntPtr[]! stackEips)
+        {
+            // First make sure that we have a type record for the object being
+            // instantiated at this stack.
+            uint typeNo = MaybeWriteType(buffer, type);
+
+            // Then, make sure we have a function record for each Eip in the stack.  Of course
+            // we don't know when a bunch of Eips map to different offsets in the same function.
+            // So make a function for each unique Eip & fix it up in the post-processing.
+            // Hopefully there aren't too many unique call sites in each method.
+            ulong hash = typeNo; // perhaps "typeNo ^ size" ?
+            int   edge = -1;
+            for (int i=0; i<stackEips.Length && stackEips[i] != 0; i++) {
+                edge++;
+                // Map the individual Eips into their corresponding functions
+                stackNos[i] = MaybeWriteFunction(buffer, stackEips[i]);
+                hash = (hash << 11) + (hash ^ stackNos[i]);
+            }
+
+            // Note that we will statistically map some distinct stacks into the same
+            // stack if they have the same hash.  Oh well.
+            object o = stackTable[hash];
+            if (o != null) {
+                return (uint) o;
+            }
+
+            // It's a novel stack.  Note that we embed the size into the stack, but we
+            // don't include the size in the hash.  There's a technique for sharing
+            // prefixes of stacks that could be explored here to get more accurate profiles
+            // without huge stack expansion.
+            // TODO: consider the above.
+            uint stackNo = nextStackNo++;
+
+            buffer.WritePair('n');
+            buffer.WriteNumber((ulong) stackNo);
+            buffer.WritePair('1');     // bits to indicate variant of record
+            buffer.WriteNumber((ulong) typeNo);
+            buffer.WriteNumber((ulong) size);
+
+            // Stacks are emitted backwards, presumably to support common prefixes better.
+            for (int i=edge; i>=0; i--) {
+                buffer.WriteNumber((ulong) stackNos[i]);
+            }
+            buffer.WriteCRLF();
+
+            // Flush this entry before putting it into the hashtable, where other threads might
+            // see it.  This means we may have duplicate conflicting entries for the same logical
+            // stack, but this is tolerated by the profiler.
+            buffer.FlushConsistentEntry();
+            stackTable[hash] = stackNo;
+
+            return stackNo;
+        }
+
+        private uint MaybeWriteFunction(Buffer! buffer, UIntPtr eip)
+        {
+            // Given the EIP of a Function, make sure the function has been defined.  Since we
+            // don't have enough runtime information to map Eips to functions, we must rely on
+            // post-processing.
+            object o = funcTable[eip];
+            if (o != null) {
+                return (uint) o;
+            }
+
+            uint funcNo = nextFuncNo++;
+
+            // Emit the function record
+
+            buffer.WritePair('f');
+            buffer.WriteNumber(funcNo);
+            buffer.WriteString("Function_EIP_");
+            buffer.WriteNumber((ulong) eip);
+            buffer.WriteString("(UNKNOWN ARGUMENTS) 0 0");
+            buffer.WriteCRLF();
+
+            // Flush this entry before putting it into the hashtable, where other threads might
+            // see it.  This means we may have duplicate conflicting entries for the same logical
+            // type, but this is tolerated by the profiler.
+            buffer.FlushConsistentEntry();
+            funcTable[eip] = funcNo;
+
+            return funcNo;
+        }
+
+        private uint MaybeWriteType(Buffer! buffer, Type! type)
+        {
+            // Given a Type, make sure that it has been defined.
+            object o = typeTable[type];
+            if (o != null) {
+                return (uint) o;
+            }
+
+            uint typeNo = nextTypeNo++;
+
+            // Emit the type record
+
+            buffer.WritePair('t');
+            buffer.WriteNumber((ulong) typeNo);
+            buffer.WritePair('0');  // TODO: assume not Finalizable for now
+            buffer.WriteString((!)type.FullName);
+            buffer.WriteCRLF();
+
+            // Flush this entry before putting it into the hashtable, where other threads might
+            // see it.  This means we may have duplicate conflicting entries for the same logical
+            // type, but this is tolerated by the profiler.
+            buffer.FlushConsistentEntry();
+            typeTable[type] = typeNo;
+
+            return typeNo;
+        }
+
+        // Use the fast 'rdtsc' to decide when to emit a tick value.
+        private void MaybeTick(Buffer! buffer)
+        {
+            ulong nowCycle = Processor.CycleCount;
+
+            // Emit a tick-count record only if it's been a while since the last one.
+            if (nowCycle > lastCycle + cycleGranularity) {
+                lastCycle = nowCycle;
+                Tick(buffer);
+            }
+        }
+
+        private void Tick(Buffer! buffer)
+        {
+            // Time since profiling began on this application.
+            buffer.WritePair('i');
+            buffer.WriteNumber((ulong) ((lastCycle - firstCycle) / 1000000));
+            buffer.WriteCRLF();
+        }
+
+        // Write the start of the Log file.
+        [MethodImplAttribute(MethodImplOptions.NoInlining)]
+        private void WriteHeader(Buffer! buffer)
+        {
+            // We need a comment record that gives the address of a well-known symbol.  This
+            // allows us to adjust all the EIPs in the log for the actual load address.
+            // Obtain the value before doing anything else, so the only noise in the address
+            // comes from the method prolog.
+            UIntPtr eip = GetAddressOfWriteHeader();
+            MaybeTick(buffer);
+
+            buffer.WritePair('z');
+            buffer.WriteNumber((ulong) eip);
+            buffer.WriteString("CLRProfiler_WriteHeader");
+            buffer.WriteCRLF();
+
+            buffer.FlushConsistentEntry();
+        }
+
+        [MethodImplAttribute(MethodImplOptions.NoInlining)]
+        private UIntPtr GetAddressOfWriteHeader()
+        {
+            // Well, this actually includes the prolog of this method, so it is off by a
+            // few bytes.
+            return Processor.GetCallerEip();
+        }
+    }
+}
+
diff --git a/base/Libraries/CredentialsManager/CredentialsManager.Library.csproj b/base/Libraries/CredentialsManager/CredentialsManager.Library.csproj
new file mode 100644
index 0000000..86b25ae
--- /dev/null
+++ b/base/Libraries/CredentialsManager/CredentialsManager.Library.csproj
@@ -0,0 +1,33 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\xxx\xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>CredentialsManagerLib</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CredentialsManager.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\CredentialsManager.Contracts\CredentialsManager.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/CredentialsManager/CredentialsManager.sg b/base/Libraries/CredentialsManager/CredentialsManager.sg
new file mode 100644
index 0000000..0b850a9
--- /dev/null
+++ b/base/Libraries/CredentialsManager/CredentialsManager.sg
@@ -0,0 +1,497 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries/CredentialsManager/CredentialsManager.sg
+//
+//  Note:
+//
+//		This library is mostly a wrapper for the CredentialsManagerContract.
+//		It simplifies connecting to and using the Credentials Manager service.
+//		Most of the request/response messages of the CredentialsManagerContract
+//		are exposed as static methods on the CredentialsManager class.
+//
+//		For each request, two static methods are provided; one that borrows a 
+//		reference to CredentialsManagerContract.Imp, and one that does not.
+//		The methods that do not take a reference will create and connect a 
+//		channel to the Credentials Manager service, perform the request (by
+//      calling the other method overload) and then delete the channel.
+//      Applications that need issue only a small number of requests can use the
+//       no-reference variations; apps that will issue many requests can call the 
+//      ConnectService() method, and call the variations that do take an endpoint,
+//      then delete the endpoint when necessary.
+//
+
+using System;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Security
+{
+    public sealed /* static */ class CredentialsManager
+    {
+        private CredentialsManager() {}
+        
+        public static CredentialsManagerContract.Imp! ConnectService()
+        {
+            CredentialsManagerContract.Imp! manager;
+            CredentialsManagerContract.Exp! manager_exp;
+            CredentialsManagerContract.NewChannel(out manager, out manager_exp);
+        
+            DirectoryServiceContract.Imp! rootds = DirectoryService.NewClientEndpoint();
+            
+            rootds.SendBind(Bitter.FromString2(CredentialsManagerContract.ChannelPath), manager_exp);
+            
+            switch receive {
+                case rootds.AckBind():
+                    break;
+                    
+                case rootds.NakBind(exp, error):
+                    delete exp;
+                    delete manager;
+                    delete rootds;
+                    throw new Exception(String.Format("Failed to bind to control channel '{0}': error {1}", CredentialsManagerContract.ChannelPath, error));
+            }
+            
+            delete rootds;
+            switch receive {
+                case manager.Success():
+                    return manager;
+            }
+        }
+
+
+        public static string! CredErrorToString(CredError error)
+        {
+            switch (error) {
+                case CredError.NoError: return "No error";
+                case CredError.InternalError: return "Internal error";
+                case CredError.NoMatchingCredentials: return "No matching credentials";
+                case CredError.MatchingEntryExists: return "A matching entry already exists";
+                case CredError.NoMatchingAuthenticationProtocol: return "No authentication protocol exists with that name.";
+                case CredError.NoEntryFound: return "No matching entry was found.";
+                case CredError.ContractNotSupported: return "The channel provided does not implement any supported contract.";
+                case CredError.InvalidArguments: return "Invalid arguments were provided.";
+                case CredError.EvidenceTypeNotSupported: return "The authentication protocol that was selected does not support the type of evidence used by the credentials.";
+                default: return "(" + ((int)error) + ")";
+            }
+        }
+        
+        public static string! GssErrorCodeToString(GssErrorCode error)
+        {
+            switch (error) {
+                case GssErrorCode.InternalError: return "Internal error";
+                case GssErrorCode.ServerRefusedAuthentication: return "The server refused authentication.";
+                default:
+                    return ((int)error).ToString();
+            }
+        }
+
+        public static void CreateSupplicant(
+            CredentialsManagerContract.Imp! manager,
+            string! authenticationProtocol,
+            string! credentialsName,
+            string! tag,
+            [Claims]ServiceContract.Exp! exp)
+        {
+            CredentialsId id = new CredentialsId();
+            id.CredentialsName = Bitter.FromString2(credentialsName);
+            id.Tag = Bitter.FromString2(tag);		
+            manager.SendCreateSupplicant(Bitter.FromString2(authenticationProtocol), id, exp);
+            
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(error):
+                    throw new CredentialsManagerException("The supplicant could not be created.", error);
+            }			
+        }
+        
+        public static void CreateSupplicant(
+            string! authenticationProtocol,
+            string! credentialsName,
+            string! tag,
+            [Claims]ServiceContract.Exp! exp)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                CreateSupplicant(
+                    manager,
+                    authenticationProtocol,
+                    credentialsName,
+                    tag,
+                    exp);					
+            } finally {
+                delete manager;
+            }
+        }
+                
+        public static void CreateSupplicantForProtocol(
+            CredentialsManagerContract.Imp! manager,
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm,
+            [Claims]ServiceContract.Exp:Start! exp,
+            out string! credentialsName,
+            out string! tag)
+        {
+            ProtocolTuple tuple = new ProtocolTuple();
+            tuple.ApplicationProtocol = Bitter.FromString2(applicationProtocol);
+            tuple.ServiceAddress = Bitter.FromString2(serviceAddress);
+            tuple.AuthenticationProtocol = Bitter.FromString2(authenticationProtocol);
+            tuple.Realm = Bitter.FromString2(realm);
+            
+            manager.SendCreateSupplicantForProtocol(tuple, exp);
+            
+            switch receive {
+                case manager.AckCreateSupplicantForProtocol(credentialsSelected):
+                    credentialsName = Bitter.ToString2(credentialsSelected.CredentialsName);
+                    tag = Bitter.ToString2(credentialsSelected.Tag);
+                    credentialsSelected.Dispose();
+                    break;
+                    
+                case manager.RequestFailed(error):
+                    throw new CredentialsManagerException("The authentication supplicant could not be created.", error);
+            }
+        }
+        
+        public static void CreateSupplicantForProtocol(
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm,
+            [Claims]ServiceContract.Exp:Start! exp,
+            out string! credentialsName,
+            out string! tag)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                CreateSupplicantForProtocol(
+                    manager,
+                    applicationProtocol,
+                    serviceAddress,
+                    authenticationProtocol,
+                    realm,
+                    exp,
+                    out credentialsName,
+                    out tag);
+            } finally {
+                delete manager;
+            }
+        }
+        
+        public static void AddCredentials(
+            CredentialsManagerContract.Imp! manager,
+            string! credentialsName,
+            string! tag,
+            string! password,
+            bool replace)
+        {
+            CredentialsId id = new CredentialsId();
+            id.CredentialsName = Bitter.FromString2(credentialsName);
+            id.Tag = Bitter.FromString2(tag);
+            
+            manager.SendAddCredentials(id, Bitter.FromString2(password), replace);
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(CredError error):
+                    throw new CredentialsManagerException("The request to add credentials failed.", error);
+                    
+                case manager.ChannelClosed():
+                    throw new CredentialsManagerException(ChannelClosedMsg);
+            }
+        }
+        
+        public static void AddCredentials(
+            string! credentialsName,
+            string! tag,
+            string! password,
+            bool replace)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                AddCredentials(manager, credentialsName, tag, password, replace);
+            } finally {
+                delete manager;
+            }
+        }
+        
+        public static void DeleteCredentials(
+            CredentialsManagerContract.Imp! manager,
+            string! credentialsName,
+            string! tag)
+        {
+            CredentialsId id = new CredentialsId();
+            id.CredentialsName = Bitter.FromString2(credentialsName);
+            id.Tag = Bitter.FromString2(tag);
+
+            manager.SendDeleteCredentials(id);
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(CredError error):
+                    throw new CredentialsManagerException("The request to delete credentials failed.", error);
+                    
+                case manager.ChannelClosed():
+                    throw new CredentialsManagerException(ChannelClosedMsg);
+            }
+        }
+        
+        public static void DeleteCredentials(
+            string! credentialsName,
+            string! tag)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                DeleteCredentials(manager, credentialsName, tag);
+            } finally {
+                delete manager;
+            }
+        }
+        
+        public static void DeleteAllCredentials(CredentialsManagerContract.Imp! manager)
+        {
+            manager.SendDeleteAllCredentials();
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(CredError error):
+                    throw new CredentialsManagerException("The request to delete all credentials failed.", error);
+
+                case manager.ChannelClosed():
+                    throw new CredentialsManagerException(ChannelClosedMsg);
+            }
+        }
+        
+        public static void DeleteAllCredentials()
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                DeleteAllCredentials(manager);
+            } finally {
+                delete manager;
+            }
+        }
+        
+        public static void AddProtocolMapping(
+            CredentialsManagerContract.Imp! manager,
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm,
+            string! credentialsName,
+            string! tag,
+            bool replace)
+        {
+            ProtocolTuple tuple = new ProtocolTuple();
+            tuple.ApplicationProtocol = Bitter.FromString2(applicationProtocol);
+            tuple.ServiceAddress = Bitter.FromString2(serviceAddress);
+            tuple.AuthenticationProtocol = Bitter.FromString2(authenticationProtocol);
+            tuple.Realm = Bitter.FromString2(realm);
+            
+            CredentialsId id = new CredentialsId();
+            id.CredentialsName = Bitter.FromString2(credentialsName);
+            id.Tag = Bitter.FromString2(tag);
+            
+            manager.SendAddProtocolMapping(tuple, id, replace);
+            
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(CredError error):
+                    throw new CredentialsManagerException("The request to add a protocol mapping failed.", error);
+            }
+        }
+
+        public static void AddProtocolMapping(
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm,
+            string! credentialsName,
+            string! tag,
+            bool replace)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                AddProtocolMapping(
+                    manager,
+                    applicationProtocol,
+                    serviceAddress,
+                    authenticationProtocol,
+                    realm,
+                    credentialsName,
+                    tag,
+                    replace);
+            } finally {
+                delete manager;
+            }
+        }
+                
+        public static void DeleteProtocolMapping(
+            CredentialsManagerContract.Imp! manager,
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm)
+        {
+            ProtocolTuple tuple = new ProtocolTuple();
+            tuple.ApplicationProtocol = Bitter.FromString2(applicationProtocol);
+            tuple.ServiceAddress = Bitter.FromString2(serviceAddress);
+            tuple.AuthenticationProtocol = Bitter.FromString2(authenticationProtocol);
+            tuple.Realm = Bitter.FromString2(realm);
+            
+            manager.SendDeleteProtocolMapping(tuple);
+            
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(CredError error):
+                    throw new CredentialsManagerException("The request to delete a protocol mapping failed.", error);
+            }
+        }
+        
+        public static void DeleteProtocolMapping(
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                DeleteProtocolMapping(
+                    manager,
+                    applicationProtocol,
+                    serviceAddress,
+                    authenticationProtocol,
+                    realm);
+            } finally {
+                delete manager;
+            }
+        }
+        
+        public static void DeleteAllProtocolMappings(CredentialsManagerContract.Imp! manager)
+        {
+            manager.SendDeleteAllProtocolMappings();
+            
+            switch receive {
+                case manager.Ok():
+                    break;
+                    
+                case manager.RequestFailed(CredError error):
+                    throw new CredentialsManagerException("The request to delete all protocol mappings failed.", error);
+            }
+        }
+
+        public static void DeleteAllProtocolMappings()
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                DeleteAllProtocolMappings(manager);
+            } finally {
+                delete manager;
+            }
+        }
+        
+        public static bool FindMatchingProtocolMapping(
+            CredentialsManagerContract.Imp! manager,
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm,
+            bool useWildcard,
+            out string! credentialsName,
+            out string! tag)
+        {
+            ProtocolTuple tuple = new ProtocolTuple();
+            tuple.ApplicationProtocol = Bitter.FromString2(applicationProtocol);
+            tuple.ServiceAddress = Bitter.FromString2(serviceAddress);
+            tuple.AuthenticationProtocol = Bitter.FromString2(authenticationProtocol);
+            tuple.Realm = Bitter.FromString2(realm);
+            
+            manager.SendFindMatchingProtocolMapping(tuple, useWildcard);
+            
+            switch receive {
+                case manager.NoMatchingProtocolMapping():
+                    credentialsName = "";
+                    tag = "";
+                    return false;
+                
+                case manager.MatchingProtocolMapping(CredentialsId credentials):
+                    credentialsName = Bitter.ToString2(credentials.CredentialsName);
+                    tag = Bitter.ToString2(credentials.Tag);
+                    credentials.Dispose();
+                    return true;
+                    
+                case manager.RequestFailed(error):
+                    throw new CredentialsManagerException("The request to find a protocol mapping failed.", error);
+            }
+        }
+            
+        public static bool FindMatchingProtocolMapping(
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm,
+            bool useWildcard,
+            out string! credentialsName,
+            out string! tag)
+        {
+            CredentialsManagerContract.Imp! manager = ConnectService();
+            try {
+                return FindMatchingProtocolMapping(
+                    manager,
+                    applicationProtocol,
+                    serviceAddress,
+                    authenticationProtocol,
+                    realm,
+                    useWildcard,
+                    out credentialsName,
+                    out tag);
+            } finally {
+                delete manager;
+            }
+        }
+                    
+
+
+        const string! ChannelClosedMsg = "The request failed because the Credentials Manager service closed the control channel.";
+        
+
+    }
+    
+    public class CredentialsManagerException : Exception
+    {
+        public CredentialsManagerException(CredError error)
+        {
+            string! msg = CredentialsManager.CredErrorToString(error);
+            base(msg);
+        }
+
+        public CredentialsManagerException(string! msg, CredError error)
+        {
+            string! errorText = CredentialsManager.CredErrorToString(error);
+            base(msg + "  Error: " + errorText);
+        }
+        
+        public CredentialsManagerException(string! msg)
+        {
+            base(msg);
+        }		
+    }
+}
+
+
diff --git a/base/Libraries/Crypto/Crypto.csproj b/base/Libraries/Crypto/Crypto.csproj
new file mode 100644
index 0000000..27e4d18
--- /dev/null
+++ b/base/Libraries/Crypto/Crypto.csproj
@@ -0,0 +1,43 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Crypto\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Crypto</AssemblyName>
+    <OutputType>Library</OutputType>
+    <Language>C#</Language>
+    <AssemblyEnvironment>none</AssemblyEnvironment>
+    <WarningLevel>2</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Digit.cs" />
+    <Compile Include="Digit2.cs" />
+    <Compile Include="Digits.cs" />
+    <!-- # already part of kernel.exe and corlib.dll   MD5.cs -->
+    <Compile Include="Modular.cs" />
+    <Compile Include="Modulus.cs" />
+    <Compile Include="Prime.cs" />
+    <Compile Include="Random.cs" />
+    <Compile Include="Des.cs" />
+    <Compile Include="MD4.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Libraries/Crypto/Des.cs b/base/Libraries/Crypto/Des.cs
new file mode 100644
index 0000000..7946e96
--- /dev/null
+++ b/base/Libraries/Crypto/Des.cs
@@ -0,0 +1,1004 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ 
+Data Encryption Standard (DES)
+------------------------------
+
+This is an implementation of the standard 56-bit DES symmetric encryption algorithm.
+DES56 is generally considered a weak algorithm, due to its short key length.
+However, it is still in use for many purposes.  I implemented it in order to implement
+the NTLM Challenge/Response authentication protocol, which uses DES to generate
+"password equivalents" from cleartext passwords.
+
+Implemented by Arlie Davis (arlied), June 2006.
+
+
+Implementation Notes
+--------------------
+
+This is a fairly straight-forward implementation of DES.  As such, it isn't very fast.
+I've done some work to improve performance, but performance has not been the goal,
+since the application for which I implemented it (NTLM) required only a few handful
+of DES transforms.  The priority is therefore simplicity and correctness; this isn't
+an implementation you would use for a key-space search.
+
+DES operates on 64 bit message and cipher blocks, and internally, on values that have
+several lengths: 4 bits, 6 bits, 32 bits, 48 bits, 56 bits, and 64 bits.  In many
+implementations (especially in C/C++) these values are are stored in arrays of bytes.
+I chose to store most values in 64-bit values (ulong/UInt64), partly because ulong
+is a value-type (can be stored on the stack), and partly because it makes some of the
+bit manipulation easy, and in some cases slightly parallel.
+
+I have not tested this, but my hope is that this implementation works well on 64-bit
+processors.
+
+
+Potential Performance Improvements
+----------------------------------
+
+As I said above, performance is NOT the priority of this implementation.  This code
+runs at about 1/3 the speed of another implementation that I tested against, which
+is good enough for my (current) purposes.  But we all like performance, so here are
+some ideas for improvement.
+
+    * S-box access could be improved.  The classic S-boxes are represented as 8 separate
+      arrays, each of which has 64 values, and each value of the array contains a 4-bit
+      substitution value.  This works, and is simple enough, but the data density is
+      rather low; only 4 bits of each array value are used.  So a simple improvement
+      might be to combine the 8 S-box arrays into 4 S-double-box arrays, with each
+      array containing two S-box values, one in the high nibble and one in the low.
+
+    * The permutation code could be better.  Right now, it's a loop that runs 32 or
+      48 or 64 times, and each loop iteration consists of a shift, a mask, a shift,
+      and an OR.  This could almost certainly be improved.
+
+
+References
+----------
+ 
+There are many references on DES.  I used:
+
+    * FIPS 46-3
+      http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
+
+    * http://www.en.wikipedia.org/wiki/Data_Encryption_Standard
+
+
+
+*/
+
+
+
+using System;
+using System.Text;
+using System.Diagnostics;
+
+namespace System.Security.Cryptography
+{
+    /// <summary>
+    /// This class implements the 56-bit DES algorithm.
+    /// </summary>
+    public sealed class Des
+    {
+        /// <summary>
+        /// This is a "static" class in C# 2.0, but sgc doesn't support static classes.
+        /// </summary>
+        private Des() { }
+
+        #region Bit Permutation Tables
+        // These tables are defined in the DES specification.
+        // Each table defines a permutation of a 64-bit block.
+        //
+        // The INDEX of each array slot is the bit (counting from the "left" or MSB)
+        // of the OUTPUT, and is ZERO-based (like all sane arrays).  But the VALUE
+        // of each array slot is the bit (counting from the "left" or MSB) of the
+        // INPUT, and is ONE-based.  Note that the method FixPermutationTable()
+        // adjusts the array value by subtracting 1.  This may seem silly, but it
+        // allows us to do the subtraction at class initialization, instead of once
+        // per loop iteration.
+        //
+        // Note that the length of each table is the number of bits that are in the
+        // OUTPUT of the permutation.  The number may be less than or equal to 64.
+
+        /// <summary>
+        /// This method just runs through a shift table and converts one-based
+        /// MSB-relative values to zero-based LSB-relative values (bit shift
+        /// indexes).  This is a tiny, trivial improvement for ComputePermutation.
+        /// </summary>
+        /// <param name="shifts"></param>
+        static void AdjustPermutationTable(byte[] shifts)
+        {
+            for (int i = 0; i < shifts.Length; i++)
+            {
+                shifts[i] = (byte)(64 - shifts[i]);
+            }
+        }
+
+        /// <summary>
+        /// This method performs an N-bit choice/permutation from a 64-bit input.
+        /// The 'shifts' argument controls which bits are chosen for the output.
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="shifts"></param>
+        /// <returns></returns>
+        static ulong ComputePermutation(ulong input, byte[] shifts)
+        {
+            ulong result = 0;
+            for (int i = 0; i < shifts.Length; i++)
+            {
+                result = (result << 1) | ((input >> shifts[i]) & 1);
+            }
+
+            // If the shift table contained less than 64 values, shift
+            // the return value so that it is left-aligned (MSB-aligned).
+            return result << (64 - shifts.Length);
+        }
+
+        /// <summary>
+        /// This is the shift table for the Permuted Choice 1 (PC-1) permutation.
+        /// </summary>
+        static byte[] _pc1_shifts = new byte[56]
+        {
+              57,   49,    41,   33,    25,    17,    9,
+               1,   58,    50,   42,    34,    26,   18,
+              10,    2,    59,   51,    43,    35,   27,
+              19,   11,     3,   60,    52,    44,   36,
+              63,   55,    47,   39,    31,    23,   15,
+               7,   62,    54,   46,    38,    30,   22,
+              14,    6,    61,   53,    45,    37,   29,
+              21,   13,     5,   28,    20,    12,    4,
+        };
+
+        /// <summary>
+        /// This is the shift table for the Permuted Choice 2 (PC-2) permutation.
+        /// </summary>
+        static byte[] _pc2_shifts = new byte[48]
+        {
+             14,    17,   11,    24,     1,    5,
+              3,    28,   15,     6,    21,   10,
+             23,    19,   12,     4,    26,    8,
+             16,     7,   27,    20,    13,    2,
+             41,    52,   31,    37,    47,   55,
+             30,    40,   51,    45,    33,   48,
+             44,    49,   39,    56,    34,   53,
+             46,    42,   50,    36,    29,   32,
+        };
+
+        /// <summary>
+        /// Expansion Permutation (E).
+        /// This isn't directly used any more.  Instead, we use hard-coded shifts/masks,
+        /// but those shifts/masks are generated from this table.
+        /// </summary>
+        static readonly byte[] _expand_shifts = new byte[48]
+            {
+                 32,     1,    2,     3,     4,    5,
+                  4,     5,    6,     7,     8,    9,
+                  8,     9,   10,    11,    12,   13,
+                 12,    13,   14,    15,    16,   17,
+                 16,    17,   18,    19,    20,   21,
+                 20,    21,   22,    23,    24,   25,
+                 24,    25,   26,    27,    28,   29,
+                 28,    29,   30,    31,    32,    1,
+            };
+
+        /// <summary>
+        /// This is a 32-bit to 32-bit choice.  We use the usual 64-bit permutation logic for this,
+        /// we just keep the value in the top 32 bits of the 64-bit ulong.
+        /// </summary>
+        static readonly byte[] _P_shifts = new byte[32]
+            {
+                16,   7,  20,  21,
+                 29,  12,  28,  17,
+                  1,  15,  23,  26,
+                  5,  18,  31,  10,
+                  2,   8,  24,  14,
+                 32,  27,   3,   9,
+                 19,  13,  30,   6,
+                 22,  11,   4,  25,
+            };
+
+        /// <summary>
+        /// Inverse Initial Permutation (IP^-1)
+        /// </summary>
+        static readonly byte[] _ip_inverse_shifts = new byte[64]
+            {
+            40,     8,   48,    16,    56,   24,    64,   32,
+            39,     7,   47,    15,    55,   23,    63,   31,
+            38,     6,   46,    14,    54,   22,    62,   30,
+            37,     5,   45,    13,    53,   21,    61,   29,
+            36,     4,   44,    12,    52,   20,    60,   28,
+            35,     3,   43,    11,    51,   19,    59,   27,
+            34,     2,   42,    10,    50,   18,    58,   26,
+            33,     1,   41,     9,    49,   17,    57,   25,
+            };
+
+        /// <summary>
+        /// Initial Permutation (IP)
+        /// </summary>
+        static readonly byte[] _ip_shifts = new byte[64]
+            {
+            58,    50,   42,    34,    26,   18,    10,    2,
+            60,    52,   44,    36,    28,   20,    12,    4,
+            62,    54,   46,    38,    30,   22,    14,    6,
+            64,    56,   48,    40,    32,   24,    16,    8,
+            57,    49,   41,    33,    25,   17,     9,    1,
+            59,    51,   43,    35,    27,   19,    11,    3,
+            61,    53,   45,    37,    29,   21,    13,    5,
+            63,    55,   47,    39,    31,   23,    15,    7,
+            };
+
+        #endregion
+        
+        #region Key schedule generation
+
+#if false
+        /// <summary>
+        /// This is the key rotate schedule, from the DES specification.
+        /// It's used during the generation of the key table.
+        /// 
+        /// This is included for reference, but this implementation actually
+        /// uses a slightly different means to compute the shift schedule.
+        /// Instead, we store all of the bits in a single 16-bit constant,
+        /// KeyRotateSchedule.
+        /// </summary>
+        static readonly byte[] _key_rotate_schedule =
+            {
+                1, 1, 2, 2, // backwards = c
+                2, 2, 2, 2, // backwards = f
+                1, 2, 2, 2, // backwards = e
+                2, 2, 2, 1, // backwards = 7
+            };
+#endif
+
+        /// <summary>
+        /// This constant looks magical, but it's a very simple translation of the DES key shift schedule.
+        /// The schedule is: 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1.
+        /// From left to right, it is the number of bit rotates that occur on each iteration of the loop
+        /// that generates keys in the key table, in the NewComputeKeyTable method.
+        /// 
+        /// Instead of storing the number of rotates, we just store a single bit.  If the bit is 0, then
+        /// we shift once; if the bit is 1, then we shift twice.  So the schedule becomes:
+        /// 
+        ///     0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 0
+        /// 
+        /// Next, rewrite this so that it is backwards, so that the MSB is on the left, which matches the
+        /// usual reading order for binary/hex/decimal numbers.  Also, group them into 4-bit nybbles and
+        /// convert to hexadecimal
+        /// 
+        ///     0 1 1 1   1 1 1 0   1 1 1 1   1 1 0 0
+        ///           7         e         f         c
+        /// 
+        /// And you have the value of KeyRotateSchedule.  In the loop, we decide whether to shift once
+        /// or twice if the "i"th bit in KeyRotateSchedule is set to 1, with i being the zero-based loop index.
+        /// </summary>
+        const ushort KeyRotateSchedule = 0x7efc;
+
+        /// <summary>
+        /// This method computes the key table, also known as the "key schedule".  The key table consists 
+        /// of 16 pairs (C,D) of 24-bit values.  We store each pair in a single 64-bit value, with the
+        /// C value MSB-aligned (occupying bits 63-40) and D immediately following (occupying bits 39-16).
+        /// Bits 15-0 of each 64-bit quantity are undefined, but in practice are zero.
+        /// </summary>
+        /// <param name="key">The 64-bit key.  Only 56 bits are used.
+        /// Bits 0, 8, 16, 24, 32, 40, 48, and 56 are ignored (LSB-relative zero-based bit indices).
+        /// See the notes on PackBe and UnpackBe for information on bit order.
+        /// </param>
+        /// <param name="encipher">
+        /// Specifies whether the keys are for enciphering or deciphering.
+        /// A value of true indicates that the keys are for enciphering;
+        /// the order of keys in the returned array matches the order in which they are generated.
+        /// A value of false indicates that the keys are for deciphering;
+        /// the order of the output array is reversed.
+        /// </param>
+        /// <returns>
+        /// The allocated array of keys, also known as the "key schedule".
+        /// </returns>
+        static ulong[] ComputeKeyTable(ulong key, bool encipher)
+        {
+            // 'key' is a 64-bit quantity, aligned in "big endian" order.
+            // The usual way to represent a DES key is an array of 8 bytes.
+            // These bytes are stored in 'key' in big endian form.
+            // Byte 0 occupies bits 63-48
+            // Byte 1 occupies bits 47-40
+            // ...
+            // Byte 7 occupies bits 7-0
+            // 
+            // DES keys are 56 bits, not 64 bits.  So the first step is to compute the 
+            // Permuted Choice 1 (PC-1) function.  This selects the 56 bits that we want,
+            // and compacts them in the top 56 bits of an unsigned 64-bit integer.
+            // Bits 7-0 will always be zero.
+            //
+            ulong keyplus = ComputePermutation(key, _pc1_shifts);
+            Debug.Assert((keyplus & 0xff) == 0);
+
+#if DES_TRACING
+            Debug.WriteLine("key+:           " + ToBitStringBe(keyplus, 56, 7));
+#endif
+            // In DES, next we form c0 and d0.  These are two 28-bit quantities.
+            // But instead of manipulating two separate 32-bit variables, we keep
+            // them both (as a 56-bit quantity) in a single 64-bit variable, cd0.
+            // Because our ComputePermutation deals with bits aligned to the MSB
+            // of the 64-bit quantity, we don't have to do anything here.
+            //
+            // The variable 'cd' stores the 56-bit quantity CnDn, MSB-aligned.
+            // Its initial value is K+.
+            ulong cd = keyplus;
+
+#if DES_TRACING
+            Debug.WriteLine("cd0:            " + ToBitStringBe(cd, 56, 7));
+#endif
+
+            ulong[] keytable = new ulong[16];
+
+            for (int i = 0; i < 16; i++)
+            {
+                Debug.Assert((cd & 0xff) == 0);
+
+                // Next, we left-rotate Cn and Dn *independently* by either 1 or 2 bits.
+                // By independently I mean that bit 27 of Cn becomes bit 0 of Cn, not of Dn,
+                // and similarly bit 27 of Dn becomes bit 0 of Dn, not Cn.
+                // The key rotate schedule tells us whether to rotate by 1 or 2 bits.
+                // Because we store both C and D in a single register, we can do the
+                // shifts and masks in parallel...  aren't we smart?
+                bool shift2 = (KeyRotateSchedule & (1 << i)) != 0;
+
+                if (shift2)
+                {
+                    cd = ((cd << 2) & 0xffffffcffffffc00UL)     // shift 2 sets of 27 bits left by 2
+                        | ((cd >> 26) & 0x0000003000000300UL);
+                }
+                else
+                {
+                    // Left-rotate 2 sets of 28 bits by 1 position.
+                    cd = ((cd << 1) & 0xffffffeffffffe00UL)
+                        | ((cd >> 27) & 0x0000001000000100UL);
+                }
+
+                ulong k_n = ComputePermutation(cd, _pc2_shifts);
+                // If we're enciphering, then store the keys sequentially.
+                // For deciphering, just reverse the order of the keys.
+                keytable[encipher ? i : 15 - i] = k_n;
+
+#if false
+                Debug.WriteLine(String.Format("i = {0,-2} rot={4}    c{1,-2} = {2}    d{1,-2} = {3}  k = {5}",
+                    i, i + 1,
+                    ToBitStringBe(cd, 28, 7),
+                    ToBitStringBe(cd << 28, 28, 7),
+                    shift2 ? "2" : "1",
+                    ToBitStringBe(k_n, 48, 6)
+                    ));
+#endif
+
+            }
+
+            return keytable;
+        }
+
+        #endregion
+        
+        #region Substitution Boxes (S-boxes)
+
+        /// <summary>
+        /// This method modifies an S-box array, so that we don't need to move bits around
+        /// while processing ciphers.  The DES specification, the input to each S-box
+        /// lookup is a 6-bit value.  The "outer" bits (bits 5 and 0) form the row index,
+        /// and the "inner" bits (bits 4-1 inclusive) form the column index.  These rows and
+        /// columns have been preserved for clarity.  However, this arrangement is basically
+        /// meaningless at run-time -- it's just a 6-bit table lookup.  So during class
+        /// initialization, we run through all of the S-box tables and adjust rearrange
+        /// the values so that we can do a direct table look-up.
+        /// </summary>
+        /// <param name="sbox">The S-box contents.</param>
+        /// <returns>The "adjusted" S-box</returns>
+        static byte[] AdjustSbox(byte[] sbox)
+        {
+            // In the input, bits 5 and 0 select the row, and bits 4-1 select the column.
+            // Compute the index into the array.
+            // (Yes, we should precompute this at some point.)
+            // int i = ((input >> 1) & 0xf) | ((input << 4) & 0x10) | (input & 0x20);
+            byte[] adjusted = new byte[64];
+
+            for (int i = 0; i < 64; i++)
+            {
+                int j = ((i >> 1) & 0xf) | ((i << 4) & 0x10) | (i & 0x20);
+                adjusted[i] = sbox[j];
+            }
+
+            return adjusted;
+        }
+
+
+        static readonly byte[] _sbox1_original = new byte[]
+            {
+                14,  4,  13,  1,   2, 15,  11,  8,   3, 10,   6, 12,   5,  9,   0,  7,
+                0,  15,   7,  4,  14,  2,  13,  1,  10,  6,  12, 11,   9,  5,   3,  8,
+                4,   1,  14,  8,  13,  6,   2, 11,  15, 12,   9,  7,   3, 10,   5,  0,
+                15, 12,   8,  2,   4,  9,   1,  7,   5, 11,   3, 14,  10,  0,   6, 13,
+            };
+
+
+        static readonly byte[] _sbox2_original = new byte[]
+        {
+         15,  1,   8, 14,   6, 11,   3,  4,   9,  7,   2, 13,  12,  0,   5, 10,
+          3, 13,   4,  7,  15,  2,   8, 14,  12,  0,   1, 10,   6,  9,  11,  5,
+          0, 14,   7, 11,  10,  4,  13,  1,   5,  8,  12,  6,   9,  3,   2, 15,
+         13,  8,  10,  1,   3, 15,   4,  2,  11,  6,   7, 12,   0,  5,  14,  9,
+        };
+        static readonly byte[] _sbox3_original = new byte[]
+        {
+             10,  0,   9, 14,   6,  3,  15,  5,   1, 13,  12,  7,  11,  4,   2,  8,
+             13,  7,   0,  9,   3,  4,   6, 10,   2,  8,   5, 14,  12, 11,  15,  1,
+             13,  6,   4,  9,   8, 15,   3,  0,  11,  1,   2, 12,   5, 10,  14,  7,
+              1, 10,  13,  0,   6,  9,   8,  7,   4, 15,  14,  3,  11,  5,   2, 12,
+        };
+
+        static readonly byte[] _sbox4_original = new byte[]
+        {
+
+              7, 13,  14,  3,   0,  6,   9, 10,   1,  2,   8,  5,  11, 12,   4, 15,
+             13,  8,  11,  5,   6, 15,   0,  3,   4,  7,   2, 12,   1, 10,  14,  9,
+             10,  6,   9,  0,  12, 11,   7, 13,  15,  1,   3, 14,   5,  2,   8,  4,
+              3, 15,   0,  6,  10,  1,  13,  8,   9,  4,   5, 11,  12,  7,   2, 14,
+        };
+
+        static readonly byte[] _sbox5_original = new byte[]
+        {
+
+              2, 12,   4,  1,   7, 10,  11,  6,   8,  5,   3, 15,  13,  0,  14,  9,
+             14, 11,   2, 12,   4,  7,  13,  1,   5,  0,  15, 10,   3,  9,   8,  6,
+              4,  2,   1, 11,  10, 13,   7,  8,  15,  9,  12,  5,   6,  3,   0, 14,
+             11,  8,  12,  7,   1, 14,   2, 13,   6, 15,   0,  9,  10,  4,   5,  3,
+        };
+
+        static readonly byte[] _sbox6_original = new byte[]
+        {
+
+             12,  1,  10, 15,   9,  2,   6,  8,   0, 13,   3,  4,  14,  7,   5, 11,
+             10, 15,   4,  2,   7, 12,   9,  5,   6,  1,  13, 14,   0, 11,   3,  8,
+              9, 14,  15,  5,   2,  8,  12,  3,   7,  0,   4, 10,   1, 13,  11,  6,
+              4,  3,   2, 12,   9,  5,  15, 10,  11, 14,   1,  7,   6,  0,   8, 13,
+        };
+
+        static readonly byte[] _sbox7_original = new byte[]
+        {
+              4, 11,   2, 14,  15,  0,   8, 13,   3, 12,   9,  7,   5, 10,   6,  1,
+             13,  0,  11,  7,   4,  9,   1, 10,  14,  3,   5, 12,   2, 15,   8,  6,
+              1,  4,  11, 13,  12,  3,   7, 14,  10, 15,   6,  8,   0,  5,   9,  2,
+              6, 11,  13,  8,   1,  4,  10,  7,   9,  5,   0, 15,  14,  2,   3, 12,
+        };
+
+        static readonly byte[] _sbox8_original = new byte[]
+        {
+             13,  2,   8,  4,   6, 15,  11,  1,  10,  9,   3, 14,   5,  0,  12,  7,
+              1, 15,  13,  8,  10,  3,   7,  4,  12,  5,   6, 11,   0, 14,   9,  2,
+              7, 11,   4,  1,   9, 12,  14,  2,   0,  6,  10, 13,  15,  3,   5,  8,
+              2,  1,  14,  7,   4, 10,   8, 13,  15, 12,   9,  0,   3,  5,   6, 11,
+        };
+
+        static readonly byte[] _sbox1;
+        static readonly byte[] _sbox2;
+        static readonly byte[] _sbox3;
+        static readonly byte[] _sbox4;
+        static readonly byte[] _sbox5;
+        static readonly byte[] _sbox6;
+        static readonly byte[] _sbox7;
+        static readonly byte[] _sbox8;
+
+        #endregion
+
+        #region Class initialization
+
+        static Des()
+        {
+            // Fix the S-box tables, so that we can use direct addressing, so we can eliminate
+            // the bit shifting in GetSboxValue.
+            _sbox1 = AdjustSbox(_sbox1_original);
+            _sbox2 = AdjustSbox(_sbox2_original);
+            _sbox3 = AdjustSbox(_sbox3_original);
+            _sbox4 = AdjustSbox(_sbox4_original);
+            _sbox5 = AdjustSbox(_sbox5_original);
+            _sbox6 = AdjustSbox(_sbox6_original);
+            _sbox7 = AdjustSbox(_sbox7_original);
+            _sbox8 = AdjustSbox(_sbox8_original);
+
+            AdjustPermutationTable(_pc1_shifts);
+            AdjustPermutationTable(_pc2_shifts);
+            AdjustPermutationTable(_ip_shifts);
+            AdjustPermutationTable(_expand_shifts);
+            AdjustPermutationTable(_ip_inverse_shifts);
+            AdjustPermutationTable(_P_shifts);
+        }
+
+        #endregion
+
+        #region DES Design time stuff
+        // This section contains stuff that isn't intended to be used by the DES library
+        // or its users during runtime.  It's here so that I can fiddle with performance,
+        // generate code, etc.
+
+#if DES_DESIGN_TIME_STUFF
+
+        public static void GenExpansionCode()
+        {
+            byte[] shifts = _expand_shifts;
+
+            const int result_length = 48;
+
+            for (int kind = 0; kind < 2; kind++)
+            {
+
+                bool shift_then_mask = (kind == 0);
+                Console.WriteLine();
+                Console.WriteLine(shift_then_mask ? "SHIFT before MASK:" : "MASK before SHIFT:");
+                Console.WriteLine();
+
+
+                StringBuilder sb = new StringBuilder();
+
+                // used for verifying the mask on shift-before-mask.
+                ulong total_mask_sum = 0;
+
+                // pos counts from the LEFT (MSB) to the RIGHT (MSB) of the output word.
+                // the count is ZERO-based.
+                int pos = 0; // index into result, counting from LEFT (MSB)
+                while (pos < result_length)
+                {
+
+                    // destination of the shift/mask, counting from LEFT (MSB) within the destination word,
+                    // and counting is ZERO based.
+                    int dest = pos;
+
+
+                    // source of the shift, counting from LEFT (MSB) within the source word, and counting
+                    // is ONE based.
+                    int src = shifts[dest];
+
+                    // Find out how many bits we can move in a single shift/mask
+                    pos++;
+                    while (pos < result_length && (shifts[pos] == shifts[pos - 1] + 1))
+                        pos++;
+                    int run_length = pos - dest;
+
+
+                    // Adjust src so that it is ZERO based, so I don't lose my mind.
+                    // Note that src still counts from LEFT (MSB) to RIGHT (LSB).
+                    // Now src and dest are in the same units, same direction, same offset.
+                    Debug.Assert(src > 0);
+                    --src;
+
+                    // Compute a mask that will select the number of bits in the current run.
+                    // Then shift it so that it will overlay the bits in the SOURCE word,
+                    // since we emit the mask before the shift.
+                    ulong before_mask = ((1UL << run_length) - 1) << (64 - src - run_length);
+                    ulong after_mask = ((1UL << run_length) - 1) << (64 - dest - run_length);
+
+                    if ((total_mask_sum & after_mask) != 0)
+                    {
+                        Debug.WriteLine("OVERLAPPING BITS IN AFTER-MASK!");
+                        Debugger.Break();
+                    }
+                    total_mask_sum ^= after_mask;
+
+
+                    // positive means >>
+                    // negative means <<
+                    int right_shift = dest - src;
+                    string shift_string;
+                    if (right_shift > 0)
+                        shift_string = String.Format(">> {0,2}", right_shift);
+                    else if (right_shift < 0)
+                        shift_string = String.Format("<< {0,2}", -right_shift);
+                    else
+                        shift_string = "";
+
+                    if (shift_then_mask)
+                    {
+                        Console.WriteLine("result |= (input {1,7}) & 0x{0:x16}UL; // src={2,2} dest={3,2} len = {4}",
+                            after_mask,
+                            shift_string,
+                            src,
+                            dest,
+                            run_length);
+                    }
+                    else
+                    {
+                        Console.WriteLine("result |= (input & 0x{0:x16}UL){1,7}; // src={2,2} dest={3,2} len = {4}",
+                            before_mask,
+                            shift_string,
+                            src,
+                            dest,
+                            run_length);
+                    }
+                    // sb.AppendLine();
+                    // 
+                }
+
+                Console.WriteLine();
+
+                if (shift_then_mask)
+                {
+                    Console.WriteLine("total mask: 0x{0:x16}", total_mask_sum);
+                    Console.WriteLine();
+                }
+
+            }
+
+            //Console.Write(sb.ToString());
+            Console.WriteLine("---");
+        }
+
+        static ulong ComputeExpansionPermutation(ulong input)
+        {
+            // input is 32 bits, left-aligned
+            // result is 48 bits, left-aligned
+
+#if check_expand
+            ulong known_good_result = ComputePermutation(input, _expand_shifts);
+#endif
+
+#if !false
+            ulong result =
+
+              ((input << 31) & 0x8000000000000000UL) // src=31 dest= 0 len = 1
+            | ((input >> 1) & 0x7c00000000000000UL) // src= 0 dest= 1 len = 5
+            | ((input >> 3) & 0x03f0000000000000UL) // src= 3 dest= 6 len = 6
+            | ((input >> 5) & 0x000fc00000000000UL) // src= 7 dest=12 len = 6
+            | ((input >> 7) & 0x00003f0000000000UL) // src=11 dest=18 len = 6
+            | ((input >> 9) & 0x000000fc00000000UL) // src=15 dest=24 len = 6
+            | ((input >> 11) & 0x00000003f0000000UL) // src=19 dest=30 len = 6
+            | ((input >> 13) & 0x000000000fc00000UL) // src=23 dest=36 len = 6
+            | ((input >> 15) & 0x00000000003e0000UL) // src=27 dest=42 len = 5
+            | ((input >> 47) & 0x0000000000010000UL) // src= 0 dest=47 len = 1
+            ;
+
+#if check_expand
+            Debug.WriteLine("input:               " + ToBitStringBe(input, 32, 4));
+            Debug.WriteLine("known good result:   " + ToBitStringBe(known_good_result, 48, 6));
+            Debug.WriteLine("bogus result:        " + ToBitStringBe(result, 48, 6));
+            Debug.WriteLine("difference:          " + ToBitStringBe(result ^ known_good_result, 48, 6, '-', 'x'));
+            if (result != known_good_result)
+            {
+                Debug.WriteLine("results differ.");
+                Debugger.Break();
+            }
+#endif
+#endif
+
+            return result;
+        }
+#endif // DES_DESIGN_TIME_STUFF
+        #endregion
+
+        #region Transform algorithm
+
+        static ulong Transform(ulong[] keytable, ulong message)
+        {
+            // Initial Permutation
+            ulong ip = ComputePermutation(message, _ip_shifts);
+            // ulong ip = ComputeIP(message);
+
+#if DES_TRACE
+            if (_trace)
+            {
+                Debug.WriteLine("transform:  message: " + ToBitStringBe(message, 64, 8));
+                Debug.WriteLine("            ip:      " + ToBitStringBe(ip, 64, 8));
+            }
+#endif
+
+            // We keep L and R packed into a 64-bit quantity.
+            // L is the top 32 bits (bits 63-32)
+            // R is the bottom 32 bits (bits 31-0)
+            ulong lr = ip;
+
+            for (int i = 0; i < 16; i++)
+            {
+                // First, we compute the Expansion function of R(n-1).
+                // This expands a 32 bit quantity to 48 bits.
+                // This is done using a permutation table that repeats some bits in R(n-1).
+                // (lr << 32) moves R(n-1) into the high bits of a 64-bit quantity (MSB alignment).
+                // ulong expanded = ComputePermutation(lr << 32, _expand_shifts); // known good
+
+                ulong r = (lr & 0xffffffffu) << 0x20;
+
+                // These were generated by GenExpansionCode().  They are equivalent to:
+                // ulong expanded = ComputePermutation(r, _expand_shifts);
+
+                ulong expanded =
+                  ((r << 31) & 0x8000000000000000UL) // src=31 dest= 0 len = 1
+                | ((r >> 1) & 0x7c00000000000000UL) // src= 0 dest= 1 len = 5
+                | ((r >> 3) & 0x03f0000000000000UL) // src= 3 dest= 6 len = 6
+                | ((r >> 5) & 0x000fc00000000000UL) // src= 7 dest=12 len = 6
+                | ((r >> 7) & 0x00003f0000000000UL) // src=11 dest=18 len = 6
+                | ((r >> 9) & 0x000000fc00000000UL) // src=15 dest=24 len = 6
+                | ((r >> 11) & 0x00000003f0000000UL) // src=19 dest=30 len = 6
+                | ((r >> 13) & 0x000000000fc00000UL) // src=23 dest=36 len = 6
+                | ((r >> 15) & 0x00000000003e0000UL) // src=27 dest=42 len = 5
+                | ((r >> 47) & 0x0000000000010000UL) // src= 0 dest=47 len = 1
+                ;
+#if DEBUG
+                ulong expanded_old_school = ComputePermutation(r, _expand_shifts);
+                Debug.Assert(expanded == expanded_old_school);
+#endif
+
+
+                // 'expanded' now contains E(R(n-1)), but it's aligned to the top of the 64-bit register.
+                // Debug.Assert((expanded & 0xffffu) == 0);
+
+                ulong k_n = keytable[i];
+                ulong b = expanded ^ k_n;
+
+                // b is a 48-bit quantity.  We're going to collapse it down to a 32-bit quantity, using
+                // the substitution boxes (S-boxes).
+
+                ulong pre_f =
+                    ((uint)_sbox1[(int)((b >> (64 - 6)) & 0x3f)] << 28) |
+                    ((uint)_sbox2[(int)((b >> (64 - 12)) & 0x3f)] << 24) |
+                    ((uint)_sbox3[(int)((b >> (64 - 18)) & 0x3f)] << 20) |
+                    ((uint)_sbox4[(int)((b >> (64 - 24)) & 0x3f)] << 16) |
+                    ((uint)_sbox5[(int)((b >> (64 - 30)) & 0x3f)] << 12) |
+                    ((uint)_sbox6[(int)((b >> (64 - 36)) & 0x3f)] << 8) |
+                    ((uint)_sbox7[(int)((b >> (64 - 42)) & 0x3f)] << 4) |
+                    ((uint)_sbox8[(int)((b >> (64 - 48)) & 0x3f)] << 0);
+
+                uint f = (uint)(ComputePermutation(pre_f << 32, _P_shifts) >> 32);
+                // f_p appears to be correct now
+                
+                ulong next_l = lr & 0xffffffffu;
+                ulong next_r = (lr >> 0x20);
+                next_r ^= f;
+
+                ulong next_lr = (next_l << 0x20) | next_r;
+
+                lr = next_lr;
+
+#if DES_TRACE
+                if (_trace)
+                {
+                    Debug.WriteLine(String.Format("n={0}  e(R(n-1))={1}  e(R(n-1))+k={2} sbox={3} f={4} L({0})={5} R({0})={6}  ",
+                        (i + 1).ToString().PadRight(2),
+                        ToBitStringBe(expanded, 48, 6),
+                        ToBitStringBe(b, 48, 6),                // expanded + k
+                        ToBitStringBe((ulong)pre_f << 32, 32, 4),
+                        ToBitStringBe((ulong)f << 32, 32, 4),
+                        ToBitStringBe(lr, 32, 4),               // L
+                        ToBitStringBe(lr << 32, 32, 4)          // R
+                        ));
+                }
+#endif
+            }
+
+#if DES_TRACE
+            if (_trace)
+            {
+                Debug.WriteLine("");
+                Debug.WriteLine("LR final : " + ToBitStringBe(lr, 64, 8));
+            }
+#endif
+
+            ulong rl = (lr << 0x20) | (lr >> 0x20);
+
+            ulong result = ComputePermutation(rl, _ip_inverse_shifts);
+
+#if DES_TRACE
+            if (_trace)
+                Debug.WriteLine("result: " + ToBitStringBe(result, 64, 8));
+#endif
+            return result;
+        }
+
+        #endregion
+
+        #region Public encrypt / decrypt methods
+
+        public static ulong Encrypt(ulong key, ulong message)
+        {
+            ulong[] keytable = ComputeKeyTable(key, true);
+            return Transform(keytable, message);
+        }
+
+        public static void Encrypt(byte[] key, byte[] message, byte[] output)
+        {
+            ulong cipher = Encrypt(PackBe(key), PackBe(message));
+            UnpackBe(cipher, output, 0);
+        }
+
+        public static void Encrypt(byte[] key, byte[] message, int message_offset, byte[] output, int output_offset)
+        {
+            ulong cipher = Encrypt(PackBe(key), PackBe(message, message_offset));
+            UnpackBe(cipher, output, output_offset);
+        }
+
+        public static ulong Decrypt(ulong key, ulong message)
+        {
+            ulong[] keytable = ComputeKeyTable(key, false);
+            return Transform(keytable, message);
+        }
+
+        public static void Decrypt(byte[] key, byte[] message, byte[] output)
+        {
+            ulong cipher = Decrypt(PackBe(key), PackBe(message));
+            UnpackBe(cipher, output, 0);
+        }
+
+        public static void Decrypt(byte[] key, byte[] message, int message_offset, byte[] output, int output_offset)
+        {
+            ulong cipher = Decrypt(PackBe(key), PackBe(message, message_offset));
+            UnpackBe(cipher, output, output_offset);
+        }
+
+        static ulong EncryptDecrypt(ulong key, ulong message, bool encipher)
+        {
+            ulong[] keytable = ComputeKeyTable(key, encipher);
+            return Transform(keytable, message);
+        }
+
+        public static void EncryptDecrypt(byte[] key, byte[] message, byte[] result, bool encrypt)
+        {
+            ulong key_packed = PackBe(key);
+            ulong[] keytable = ComputeKeyTable(key_packed, encrypt);
+            ulong output = Transform(keytable, PackBe(message));
+            UnpackBe(output, result, 0);
+        }
+
+        #endregion
+
+        #region Bit packing
+
+        /// <summary>
+        /// Packs an array of 8 bytes into a single unsigned 64-bit integer.
+        /// The packing is "big-endian"; the first byte (array[0]) is stored in bits 56-63 (inclusive)
+        /// in the result, the second byte (array[1]) is stored in bits 57-48, and the last byte
+        /// (array[7]) is stored in bits 7-0.
+        /// </summary>
+        /// <param name="array">An array of bytes to pack.</param>
+        /// <returns>The packed 64-bit quantity.</returns>
+        public static ulong PackBe(byte[] array)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            if (array.Length < 8)
+                throw new ArgumentException("The input array is too short.");
+
+            return
+                (((ulong)array[0]) << 0x38) |
+                (((ulong)array[1]) << 0x30) |
+                (((ulong)array[2]) << 0x28) |
+                (((ulong)array[3]) << 0x20) |
+                (((ulong)array[4]) << 0x18) |
+                (((ulong)array[5]) << 0x10) |
+                (((ulong)array[6]) << 0x08) |
+                (((ulong)array[7]));
+        }
+
+        /// <summary>
+        /// Packs an array of 8 bytes into a single unsigned 64-bit integer.
+        /// The packing is "big-endian"; the first byte (array[offset]) is stored in bits 56-63 (inclusive)
+        /// in the result, the second byte (array[offset + 1]) is stored in bits 57-48, and the last byte
+        /// (array[offset + 7]) is stored in bits 7-0.
+        /// </summary>
+        /// <param name="array">An array of bytes to pack.</param>
+        /// <param name="offset">The offset within 'array' where the bytes to read begin.</param>
+        /// <returns>The packed 64-bit quantity.</returns>
+        public static ulong PackBe(byte[] array, int offset)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            if (offset < 0)
+                throw new ArgumentOutOfRangeException("offset");
+            if (array.Length < 8)
+                throw new ArgumentException("The input array is too short.");
+
+            return
+                (((ulong)array[offset + 0]) << 0x38) |
+                (((ulong)array[offset + 1]) << 0x30) |
+                (((ulong)array[offset + 2]) << 0x28) |
+                (((ulong)array[offset + 3]) << 0x20) |
+                (((ulong)array[offset + 4]) << 0x18) |
+                (((ulong)array[offset + 5]) << 0x10) |
+                (((ulong)array[offset + 6]) << 0x08) |
+                (((ulong)array[offset + 7]));
+        }
+
+        /// <summary>
+        /// This method unpacks a 64-bit quantity into an array of 8 bytes.
+        /// The unpacking is big-endian.
+        /// See the notes on PackBe for more information.
+        /// </summary>
+        /// <param name="v">The value to unpack</param>
+        /// <returns>An allocated array which contains the unpacked bytes.
+        /// The length of this array is always 8.</returns>
+        public static byte[] UnpackBe(ulong v)
+        {
+            byte[] array = new byte[8];
+            array[0] = (byte)((v >> 0x38) & 0xff);
+            array[1] = (byte)((v >> 0x30) & 0xff);
+            array[2] = (byte)((v >> 0x28) & 0xff);
+            array[3] = (byte)((v >> 0x20) & 0xff);
+            array[4] = (byte)((v >> 0x18) & 0xff);
+            array[5] = (byte)((v >> 0x10) & 0xff);
+            array[6] = (byte)((v >> 0x08) & 0xff);
+            array[7] = (byte)(v & 0xff);
+            return array;
+        }
+
+        /// <summary>
+        /// This method unpacks a 64-bit quantity into an array of 8 bytes.
+        /// The unpacking is big-endian.
+        /// See the notes on PackBe for more information.        /// </summary>
+        /// <param name="v">The value to unpack</param>
+        /// <param name="array">The array in which to store the unpacked bytes.</param>
+        /// <param name="offset">The offset within 'array' of the first byte.
+        /// The length of the array must be at least offset + 8.</param>
+        public static void UnpackBe(ulong v, byte[] array, int offset)
+        {
+            array[offset + 0] = (byte)((v >> 0x38) & 0xff);
+            array[offset + 1] = (byte)((v >> 0x30) & 0xff);
+            array[offset + 2] = (byte)((v >> 0x28) & 0xff);
+            array[offset + 3] = (byte)((v >> 0x20) & 0xff);
+            array[offset + 4] = (byte)((v >> 0x18) & 0xff);
+            array[offset + 5] = (byte)((v >> 0x10) & 0xff);
+            array[offset + 6] = (byte)((v >> 0x08) & 0xff);
+            array[offset + 7] = (byte)(v & 0xff);
+        }
+
+        #endregion
+
+        #region Debugging
+
+#if DES_DEBUGGING
+        
+#if DES_TRACE
+        static bool _trace;
+#endif
+
+        static string ToHexStringBe(ulong v)
+        {
+            return Convert.ToString((long)v, 0x10);
+        }
+
+        static string ToBitStringBe(ulong v)
+        {
+            System.Text.StringBuilder buffer = new System.Text.StringBuilder();
+            for (int i = 0; i < 64; i++)
+            {
+                if (i > 0 && (i % 8) == 0)
+                    buffer.Append('.');
+
+                byte b = (byte)((v >> (63 - i)) & 1);
+                buffer.Append(b != 0 ? '1' : '0');
+            }
+
+            return buffer.ToString();
+        }
+
+        static string ToBitStringBe(ulong v, int length, int groupsize)
+        {
+            return ToBitStringBe(v, length, groupsize, '0', '1');
+        }
+
+        static string ToBitStringBe(ulong v, int length, int groupsize, char c0, char c1)
+        {
+            System.Text.StringBuilder buffer = new System.Text.StringBuilder();
+            for (int i = 0; i < length; i++)
+            {
+                if (i > 0 && (i % groupsize) == 0)
+                    buffer.Append('.');
+
+                byte b = (byte)((v >> (63 - i)) & 1);
+                buffer.Append(b != 0 ? c1 : c0);
+            }
+
+            return buffer.ToString();
+        }
+
+#endif
+        #endregion
+    }
+}
diff --git a/base/Libraries/Crypto/Digit.cs b/base/Libraries/Crypto/Digit.cs
new file mode 100644
index 0000000..58e54e0
--- /dev/null
+++ b/base/Libraries/Crypto/Digit.cs
@@ -0,0 +1,94 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    struct Digit {
+        readonly UInt32 _digit;
+        Digit(UInt32 digit) { _digit = digit; }
+        public static implicit operator UInt32(Digit d) { return d._digit; }
+        public static explicit operator long(Digit d) {
+            return (long)d._digit;
+        }
+        public static implicit operator Digit(UInt32 digit) {
+            return new Digit(digit);
+        }
+        public override string ToString() { return _digit.ToString(); }
+        public static Digit operator <<(Digit d, int n) {
+            Debug.Assert(0 <= n && n < BitN, "internal error");
+            return new Digit(d._digit << n);
+        }
+        public static Digit operator >>(Digit d, int n) {
+            Debug.Assert(0 <= n && n < BitN, "internal error");
+            return new Digit(d._digit >> n);
+        }
+        internal const int BitN = 32;
+        internal const UInt32 MaxValue = UInt32.MaxValue;
+        static byte[]
+            leadingZeroBitN
+          = new byte[] { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
+        internal static int SigBitN(Digit d) {
+            d |= 1;
+            int bitN = BitN;
+            while (d < 1U << BitN - 5) { bitN -= 5; d <<= 5; }
+            return bitN - leadingZeroBitN[d >> BitN - 4];
+        }
+        internal static Digit TwoAdicInverse(Digit d) {
+            if ((d & 1) == 0) { throw new ArgumentException(); }
+            UInt32 dInverse = unchecked(3 * d ^ 2)
+                 , error = unchecked(1 - d * dInverse);
+            Debug.Assert((error & 31) == 0, "internal error");
+            for (int bitN = 5; bitN < BitN / 2; bitN *= 2) {
+                unchecked {
+                    dInverse += dInverse * error;
+                    error = error * error;
+                    Debug.Assert(error == 1 - d * dInverse, "internal error");
+                }
+            }
+            return unchecked(dInverse * error + dInverse);
+        }
+        static byte[]
+            trailingZeroN
+          = new byte[] { 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 };
+        internal static Digit OddGcd(Digit d1, Digit d2) {
+            if (((d1 | d2) & 1) == 0) { throw new ArgumentException(); }
+            if (d1 == 0 || d2 == 0) {
+                Debug.Assert(false, "untested code");
+                return d1 + d2;
+            }
+            do { d1 >>= trailingZeroN[d1 & 15]; } while ((d1 & 1) == 0);
+            do { d2 >>= trailingZeroN[d2 & 15]; } while ((d2 & 1) == 0);
+            while (d1 != d2) {
+                int sh1 = 1 + trailingZeroN[(d1 ^ d2) >> 1 & 15];
+                UInt32 n12Max = d1 > d2 ? d1 : d2;
+                d1 = d1 ^ d2 ^ n12Max;
+                d2 = n12Max - d1 >> sh1;
+                do { d2 >>= trailingZeroN[d2 & 15]; } while ((d2 & 1) == 0);
+                Debug.Assert((d1 & d2 & 1) != 0, "internal error");
+            }
+            return d1;
+        }
+        internal static Digit Random(Random generator) {
+            return (UInt32)generator.Next(65536) << 16
+                 | (UInt32)generator.Next(65536);
+        }
+        internal static Digit
+        Random(UInt32 dlow, UInt32 dhigh, Random generator) {
+            if (dhigh < dlow) { throw new ArgumentException(); }
+            UInt32 spread = dhigh - dlow;
+            int shiftBitN = BitN - SigBitN(spread | 1);
+            UInt32 result = 0;
+            do {
+                result = Random(generator)._digit >> shiftBitN;
+            } while (result > spread);
+            return dlow + result;
+        }
+    }
+}
diff --git a/base/Libraries/Crypto/Digit2.cs b/base/Libraries/Crypto/Digit2.cs
new file mode 100644
index 0000000..5642c75
--- /dev/null
+++ b/base/Libraries/Crypto/Digit2.cs
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    internal class Digit2 {
+        internal static Digit Lo(UInt64 x) {
+            return unchecked((UInt32)(x & Digit.MaxValue));
+        }
+        internal static Digit Hi(UInt64 x) {
+            Digit hi = unchecked((UInt32)(x >> Digit.BitN));
+            return hi;
+        }
+        internal static void
+        Div(UInt64 num, Digit denom, out Digit q, out Digit r) {
+            Digit numHi = Hi(num), numLo = Lo(num);
+            if (numHi >= denom) { throw new ArgumentException(); }
+            q = (Digit)(num / denom);
+            r = unchecked(numLo - denom * q);
+            Digit rr = unchecked((Digit)(num - denom * q));
+            Debug.Assert(rr == r, "internal error");
+        }
+        internal static void Div(
+            UInt64 num
+          , Digit denom
+          , Reciprocal recip
+          , out Digit q
+          , out Digit r
+        ) {
+            Digit numHi = Hi(num)
+                , numLo = Lo(num)
+                , qEst = Digit.MaxValue - recip.EstQuotient(numHi, numLo, 0);
+            UInt64 rEst = unchecked(
+                              ((UInt64)(numHi - denom) << Digit.BitN | numLo)
+                            + (UInt64)qEst * denom
+                          );
+            q = unchecked((Digit)(Hi(rEst) - qEst));
+            r = unchecked(Lo(rEst) + (denom & Hi(rEst)));
+            Digit qq, rr;
+            Div(num, denom, out qq, out rr);
+            Debug.Assert(qq == q && rr == r, "internal error");
+        }
+    }
+}
diff --git a/base/Libraries/Crypto/Digits.cs b/base/Libraries/Crypto/Digits.cs
new file mode 100644
index 0000000..dfcac56
--- /dev/null
+++ b/base/Libraries/Crypto/Digits.cs
@@ -0,0 +1,885 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    class Digits {
+        readonly Digit[] _digits;
+        readonly int _digitI;
+        internal Digits(int n) { _digits = new Digit[n]; _digitI = 0; }
+        internal Digits(Digit[] digits) { _digits = digits; _digitI = 0; }
+        Digits(Digit[] digits, int digitI) {
+            _digits = digits;
+            _digitI = digitI;
+        }
+        internal Digit this[int i] {
+            get {
+                if (_digitI + i < _digits.Length) {
+                    return _digits[_digitI + i];
+                } else {
+                    return 0;
+                }
+            }
+            set {
+                if (_digitI + i < _digits.Length) {
+                    _digits[_digitI + i] = value;
+                } else {
+                    Debug.Assert(value == 0, "internal error");
+                }
+            }
+        }
+        int _N { get { return _digits.Length - _digitI; } }
+        internal void _Set(Digits from, int n) {
+            for (int i = 0; i < n; i++) { this[i] = from[i]; }
+        }
+        internal void _SetAll(Digit val, int n) {
+            for (int i = 0; i < n; i++) { this[i] = val; }
+        }
+        internal bool _Overlaps(Digits that) {
+            return _digits.Equals(that._digits);
+        }
+        public static Digits operator +(Digits digits, int i) {
+            return new Digits(digits._digits, digits._digitI + i);
+        }
+        public override string ToString() {
+            string s = "(";
+            for (int i = _digitI; i < _N; i++) {
+                if (i > _digitI) { s += ","; }
+                s += _digits[i].ToString();
+            }
+            return s + ")";
+        }
+        internal static void Set(Digits a, int aN, Digits b, int bN) {
+            b._Set(a, aN);
+            (b + aN)._SetAll(0, bN - aN);
+        }
+        internal static Digit GetBit(Digits a, int i) {
+            return a[i / Digit.BitN] >> i % Digit.BitN & 1;
+        }
+        internal static void SetBit(Digits a, int i, uint bit) {
+            int j = i / Digit.BitN, k = i % Digit.BitN;
+            a[j] = a[j] & ~((1U & ~bit) << k) | (1U & bit) << k;
+        }
+        internal static int Compare(Digits a, Digit ivalue, int aN) {
+            return Compare(a, aN, new Digits(new Digit[] { ivalue }), 1);
+        }
+        internal static int SigDigitN(Digits a, int aN) {
+            int i = aN;
+            while (i != 0 && a[i - 1] == 0) { i--; }
+            return i;
+        }
+        internal static int SigBitN(Digits a, int aN) {
+            int sigDigitN = SigDigitN(a, aN);
+            if (sigDigitN == 0) {
+                Debug.Assert(false, "untested code");
+                return 0;
+            }
+            return (int)((sigDigitN - 1) * Digit.BitN
+                       + Digit.SigBitN(a[sigDigitN - 1]));
+        }
+        internal static Digit
+        Accumulate(Digits a, Digit mult, Digits b, int n) {
+            Digit carry = 0;
+            for (int i = 0; i != n; i++) {
+                UInt64 dtemp = (UInt64)mult * a[i] + b[i] + carry;
+                b[i] = Digit2.Lo(dtemp);
+                carry = Digit2.Hi(dtemp);
+            }
+            return carry;
+        }
+        internal static Digit
+        Decumulate(Digits a, Digit mult, Digits b, int n) {
+            Digit borrow = 0;
+            for (int i = 0; i != n; i++) {
+                UInt64 dtemp;
+                unchecked {
+                    dtemp = (UInt64)b[i] - borrow - (UInt64)mult * a[i];
+                }
+                b[i] = Digit2.Lo(dtemp);
+                unchecked { borrow = 0 - Digit2.Hi(dtemp); }
+            }
+            return borrow;
+        }
+        internal static void Shift(Digits a, int shiftBitN, Digits b, int n) {
+            int itranslate = shiftBitN >= 0
+                           ? shiftBitN / Digit.BitN
+                           : -(-shiftBitN / Digit.BitN);
+            ShiftLost(a, shiftBitN - Digit.BitN * itranslate, b, n);
+            if (itranslate < 0) {
+                Debug.Assert(false, "untested code");
+                int dtranslate = -itranslate;
+                for (int i = 0; i != n; i++) {
+                    Debug.Assert(false, "untested code");
+                    b[i] = i + dtranslate < n ? b[i + dtranslate] : 0;
+                }
+            } else if (itranslate > 0) {
+                Debug.Assert(false, "untested code");
+                int dtranslate = itranslate;
+                for (int i = n; i-- != 0; ) {
+                    Debug.Assert(false, "untested code");
+                    b[i] = i >= dtranslate ? b[i - dtranslate] : 0;
+                }
+            }
+        }
+        internal static Digit
+        ShiftLost(Digits a, int bitScale, Digits b, int n) {
+            if (n == 0) { Debug.Assert(false, "untested code"); return 0; }
+            if (bitScale == 0) {
+                Debug.Assert(false, "untested code");
+                b._Set(a, n);
+                return 0;
+            }
+            Digit bitNLost = 0;
+            if (bitScale > 0) {
+                if (bitScale > Digit.BitN) { throw new ArgumentException(); }
+                if (bitScale == Digit.BitN) {
+                    bitNLost = a[n - 1];
+                    for (int i = n - 1; i != 0; i--) { b[i] = a[i - 1]; }
+                    b[0] = 0;
+                } else {
+                    for (int i = 0; i != n; i++) {
+                        Digit bNew = a[i] << bitScale | bitNLost;
+                        bitNLost = a[i] >> Digit.BitN - bitScale;
+                        b[i] = bNew;
+                    }
+                }
+            } else {
+                if (bitScale < -Digit.BitN) { throw new ArgumentException(); }
+                if (bitScale == -Digit.BitN) {
+                    bitNLost = a[0];
+                    for (int i = 1; i != n; i++) { b[i - 1] = a[i]; }
+                    b[n - 1] = 0;
+                } else {
+                    for (int i = n; i-- != 0; ) {
+                        Digit bNew = a[i] >> -bitScale | bitNLost;
+                        bitNLost = a[i] << Digit.BitN + bitScale;
+                        b[i] = bNew;
+                    }
+                    bitNLost >>= Digit.BitN + bitScale;
+                }
+            }
+            return bitNLost;
+        }
+        internal static void
+        Mul(Digits a, int aN, Digits b, int bN, Digits c) {
+            Debug.Assert(!c._Overlaps(a) && !c._Overlaps(b)
+                       , "overlapping arguments");
+            Digits p1, p2;
+            int i, n1, n2;
+            if (aN > bN) {
+                p1 = a;
+                p2 = b;
+                n1 = aN;
+                n2 = bN;
+            } else {
+                p2 = a;
+                p1 = b;
+                n2 = aN;
+                n1 = bN;
+            }
+            if (n2 == 0) {
+                Debug.Assert(false, "untested code");
+                c._SetAll(0, n1);
+                return;
+            }
+            c[n1] = Mul(p1, p2[0], c, n1);
+            for (i = 1; i != n2; i++) {
+                c[i + n1] = Accumulate(p1, p2[i], c + i, n1);
+            }
+        }
+        internal static Digit Mul(Digits a, Digit mult, Digits b, int n) {
+            Digit carry = 0;
+            for (int i = 0; i != n; i++) {
+                UInt64 dtemp = (UInt64)mult * a[i] + carry;
+                b[i] = Digit2.Lo(dtemp);
+                carry = Digit2.Hi(dtemp);
+            }
+            return carry;
+        }
+        internal static void
+        BytesToDigits(byte[] bytes, int bytesI, Digits digits, int bitN) {
+            if (bitN == 0) { Debug.Assert(false, "untested code"); return; }
+            int digitN = (bitN + (Digit.BitN - 1)) / Digit.BitN;
+            digits._SetAll(0, digitN);
+            for (int iDigit = 0; iDigit != digitN; iDigit++) {
+                int byteNLeft = (bitN + 7) / 8 - 4 * iDigit;
+                Digit digit = 0;
+                for (
+                    int iByte = 0;
+                    iByte != (4 > byteNLeft ? byteNLeft : 4);
+                    iByte++
+                ) {
+                    digit
+                 ^= (Digit)bytes[bytesI + byteNLeft - 1 - iByte] << 8 * iByte;
+                }
+                digits[iDigit] = digit;
+            }
+            digits[digitN - 1] &= Digit.MaxValue >> Digit.BitN * digitN - bitN;
+        }
+        internal static void
+        DigitsToBytes(Digits digits, byte[] bytes, int byteI, int bitN) {
+            for (int i = 0; i != (bitN + (Digit.BitN - 1)) / Digit.BitN; i++) {
+                Digit dvalue = digits[i];
+                int byteNLeft = (bitN + 7) / 8 - 4 * i;
+                for (int j = 0; j != (byteNLeft > 4 ? 4 : byteNLeft); j++) {
+                    bytes[byteI + byteNLeft - 1 - j] = (byte)(dvalue & 0xff);
+                    dvalue >>= 8;
+                }
+            }
+        }
+        internal static void Div(
+            Digits num
+          , int numN
+          , Digits denom
+          , int denomN
+          , Reciprocal recip
+          , Digits q
+          , Digits r
+        ) {
+            if (denomN == 0) { throw new DivideByZeroException(); }
+            if (num == null || denom == null || r == null) {
+                throw new ArgumentNullException();
+            }
+            Debug.Assert(!r._Overlaps(num) && !r._Overlaps(denom)
+                       , "overlapping arguments");
+            if (q != null) {
+                Debug.Assert(
+                    !q._Overlaps(num) && !q._Overlaps(denom) && !r._Overlaps(q)
+                  , "overlapping arguments"
+                );
+            }
+            Digit dlead = denom[denomN - 1];
+            if (dlead == 0) { throw new ArgumentException(); }
+            if (numN < denomN) {
+                Debug.Assert(false, "untested code");
+                Set(num, numN, r, denomN);
+                return;
+            }
+            if (denomN == 1) { Div(num, dlead, recip, q, numN, r); return; }
+            if (recip == null) {
+                recip = new Reciprocal();
+                DivPrecondition(denom, denomN, recip);
+            }
+            r[denomN - 1] = 0;
+            r._Set(num + (numN - denomN + 1), denomN - 1);
+            for (int iq = numN - denomN + 1; iq-- != 0; ) {
+                Digit rTop = r[denomN - 1];
+                for (int i = denomN - 1; i != 0; i--) { r[i] = r[i - 1]; }
+                r[0] = num[iq];
+                Digit qest;
+                if (rTop == 0 && Compare(r, denom, denomN) < 0) {
+                    qest = 0;
+                } else {
+                    qest
+                  = recip.EstQuotient(rTop, r[denomN - 1], r[denomN - 2]);
+                    if (qest < Digit.MaxValue) { qest += 1; }
+                    Digit borrow = Decumulate(denom, qest, r, denomN);
+                    if (borrow > rTop) {
+                        qest -= 1;
+                        borrow -= Add(r, denom, r, denomN);
+                    }
+                    Debug.Assert(borrow == rTop, "internal error");
+                }
+                if (q != null) { q[iq] = qest; }
+            }
+        }
+        static void Div(
+            Digits numer
+          , Digit den
+          , Reciprocal recip
+          , Digits q
+          , int n
+          , Digits r
+        ) {
+            Digit carry = 0;
+            int nLeft = n;
+            if (nLeft > 0 && numer[nLeft - 1] < den) {
+                nLeft--;
+                carry = numer[nLeft];
+                if (q != null) { q[nLeft] = 0; }
+            }
+            if (recip == null && nLeft < 2) {
+                for (int i = nLeft; i-- != 0; ) {
+                    Digit qest = 0;
+                    Digit2.Div((UInt64)carry << Digit.BitN | numer[i]
+                             , den
+                             , out qest
+                             , out carry);
+                    if (q != null) { q[i] = qest; }
+                }
+            } else {
+                if (recip == null) {
+                    recip = new Reciprocal();
+                    DivPrecondition(new Digits(new Digit[] { den }), 1, recip);
+                }
+                for (int i = nLeft; i-- != 0; ) {
+                    Digit qest = 0;
+                    Digit2.Div((UInt64)carry << Digit.BitN | numer[i]
+                             , den
+                             , recip
+                             , out qest
+                             , out carry);
+                    if (q != null) { q[i] = qest; }
+                }
+            }
+            r[0] = carry;
+        }
+        internal static void
+        DivPrecondition(Digits denom, int denomN, Reciprocal recip) {
+            if (denom == null) { throw new ArgumentNullException(); }
+            if (denomN == 0 || denom[denomN - 1] == 0) {
+                throw new ArgumentException();
+            }
+            int recipBitShift = Digit.BitN - Digit.SigBitN(denom[denomN - 1]);
+            Digit dlead2 = denom[denomN - 1]
+                , dlead1 = denomN >= 2 ? denom[denomN - 2] : 0
+                , dlead0 = denomN >= 3 ? denom[denomN - 3] : 0
+                , dShiftHi = dlead2 << recipBitShift
+                           | dlead1 >> 1 >> Digit.BitN - 1 - recipBitShift
+                , dShiftLo = dlead1 << recipBitShift
+                           | dlead0 >> 1 >> Digit.BitN - 1 - recipBitShift;
+            Digit recipMpy, r;
+            Digit2.Div((UInt64)(Digit.MaxValue - dShiftHi) << Digit.BitN
+                     | Digit.MaxValue - dShiftLo
+                     , dShiftHi
+                     , out recipMpy
+                     , out r);
+            if (Digit2.Hi((UInt64)recipMpy * dShiftLo) > r) { recipMpy -= 1; }
+            r = (Digit.MaxValue >> recipBitShift) - denom[denomN - 1];
+            for (int id = denomN; id-- != 0 && r < recipMpy; ) {
+                UInt64 test1 = (UInt64)r << Digit.BitN
+                             | Digit.MaxValue - (id > 0 ? denom[id - 1] : 0)
+                     , test2 = (UInt64)recipMpy * denom[id];
+                if (test2 > test1) { recipMpy -= 1; break; }
+                test1 = test1 - test2;
+                r = Digit2.Lo(test1);
+                if (Digit2.Hi(test1) != 0) { break; }
+            }
+            recip._shiftBitN = recipBitShift;
+            recip._multiplier = recipMpy;
+        }
+        static uint Add(Digits a, int aN, Digits b, int bN, Digits c) {
+            if (aN < bN || aN < 0 || bN < 0) { throw new ArgumentException(); }
+            uint carry = Add(a, b, c, bN);
+            return Add(a + bN, carry, c + bN, aN - bN);
+        }
+        static void
+        AddFull(Digits a, int aN, Digits b, int bN, Digits c, out int cN) {
+            uint carry;
+            if (aN < bN) {
+                Debug.Assert(false, "untested code");
+                carry = Add(b, bN, a, aN, c);
+                cN = bN;
+            } else {
+                carry = Add(a, aN, b, bN, c);
+                cN = aN;
+            }
+            if (carry != 0) {
+                Debug.Assert(false, "untested code");
+                c[cN++] = carry;
+            }
+        }
+        internal static uint Add(Digits a, Digit immediate, Digits b, int n) {
+            uint carry = immediate;
+            for (int i = 0; i != n; i++) {
+                Digit bi = a[i] + carry;
+                b[i] = bi;
+                if (bi >= carry) {
+                    if (a != b) { (b + i + 1)._Set(a + i + 1, n - i - 1); }
+                    return 0;
+                }
+                carry = 1;
+            }
+            return carry;
+        }
+        internal static uint Add(Digits a, Digits b, Digits c, int n) {
+            uint carry = 0;
+            for (int i = 0; i != n; i++) {
+                Digit ai = a[i], bi = b[i], sum = unchecked(carry + (ai + bi));
+                c[i] = sum;
+                carry = ((ai | bi) ^ (ai ^ bi) & sum) >> Digit.BitN - 1;
+            }
+            return carry;
+        }
+        internal static int
+        AddSub(Digits a, Digits b, Digits c, Digits d, int n) {
+            uint carry1 = 0, carry2 = 0;
+            for (int i = 0; i != n; i++) {
+                Digit ai = a[i]
+                    , bi = b[i]
+                    , ci = c[i]
+                    , sum1 = unchecked(ai + bi + carry1)
+                    , sum2 = unchecked(sum1 - ci - carry2);
+                d[i] = sum2;
+                carry1 = (sum1 ^ (sum1 ^ ai | sum1 ^ bi)) >> Digit.BitN - 1;
+                carry2 = (sum1 ^ (sum1 ^ ci | sum1 ^ sum2)) >> Digit.BitN - 1;
+            }
+            return (int)carry1 - (int)carry2;
+        }
+        internal static int Compare(Digits a, int aN, Digits b, int bN) {
+            int la = aN, lb = bN;
+            while (la > lb) { if (a[la - 1] != 0) { return +1; } la--; }
+            while (lb > la) { if (b[lb - 1] != 0) { return -1; } lb--; }
+            Debug.Assert(la == lb, "internal error");
+            while (la != 0) {
+                if (a[la - 1] != b[la - 1]) {
+                    return a[la - 1] > b[la - 1] ? +1 : -1;
+                }
+                la--;
+            }
+            return 0;
+        }
+        internal static int Compare(Digits a, Digits b, int n) {
+            for (int i = n; i-- != 0; ) {
+                if (a[i] != b[i]) { return a[i] > b[i] ? +1 : -1; }
+            }
+            return 0;
+        }
+        internal static int CompareSum(Digits a, Digits b, Digits c, int n) {
+            int sumPrev = 0;
+            for (int i = n; i-- != 0; ) {
+                Digit aval = a[i]
+                    , bval = b[i]
+                    , cval = c[i]
+                    , sumNow = unchecked(aval + bval);
+                Debug.Assert(sumPrev == 0 || sumPrev == -1, "internal error");
+                sumPrev += (sumNow < aval ? 1 : 0) - (sumNow < cval ? 1 : 0);
+                unchecked { sumNow -= cval; }
+                if (
+                    sumPrev != unchecked((int)(uint)sumNow)
+                 || unchecked(sumPrev + 3 & 2) == 0
+                ) {
+                    return (sumPrev + 2 & 2) - 1;
+                }
+            }
+            return sumPrev;
+        }
+        internal static int Sub(Digits a, Digit isub, Digits b, int n) {
+            Digit borrow = isub;
+            for (int i = 0; i != n; i++) {
+                Digit ai = a[i];
+                b[i] = ai - borrow;
+                if (ai >= borrow) {
+                    if (a != b) { (b + i + 1)._Set(a + i + 1, n - i - 1); }
+                    return 0;
+                }
+                borrow = 1;
+            }
+            return (int)borrow;
+        }
+        internal static uint Sub(Digits a, Digits b, Digits c, int n) {
+            uint borrow = 0;
+            for (int i = 0; i != n; i++) {
+                Digit ai = a[i], bi = b[i], sum = unchecked(ai - bi - borrow);
+                c[i] = sum;
+                borrow = (ai ^ (ai ^ bi | ai ^ sum)) >> Digit.BitN - 1;
+            }
+            return borrow;
+        }
+        internal static void ExtendedGcd(
+            Digits a
+          , int aN
+          , Digits b
+          , int bN
+          , Digits ainvmodb
+          , Digits binvmoda
+          , Digits gcd
+          , out int lgcd
+        ) {
+            Debug.Assert(!gcd._Overlaps(a)
+                      && !gcd._Overlaps(b)
+                      && !ainvmodb._Overlaps(a)
+                      && !ainvmodb._Overlaps(b)
+                      && !ainvmodb._Overlaps(gcd)
+                       , "overlapping arguments");
+            int aSigDigitN = SigDigitN(a, aN), bSigDigitN = SigDigitN(b, bN);
+            if (aSigDigitN == 0 || bSigDigitN == 0) {
+                throw new ArgumentException();
+            }
+            int[] abN = new int[2] { aSigDigitN, bSigDigitN };
+            if (a == null || b == null || gcd == null || ainvmodb == null) {
+                throw new ArgumentNullException();
+            }
+            int maxDigitN = aN > bN ? aN : bN;
+            Digits ab0Padded = new Digits(maxDigitN + 2)
+                 , ab1Padded = new Digits(maxDigitN + 2)
+                 , tempProd = new Digits(2 * maxDigitN)
+                 , tempQ = new Digits(maxDigitN + 1);
+            Digits[] ab = new Digits[] { ab0Padded + 1, ab1Padded + 1 };
+            ab[0]._Set(a, aSigDigitN);
+            ab[1]._Set(b, bSigDigitN);
+            Digits[]
+                tempsMul
+              = new Digits[] { new Digits(maxDigitN), new Digits(maxDigitN) };
+            tempsMul[0][0] = 1;
+            int mulN = 1, iterations = 0;
+            while (abN[0] != 0 && abN[1] != 0) {
+                int abN0 = abN[0], abN1 = abN[1];
+                Digits pab0top = ab[0] + (abN0 - 1)
+                     , pab1top = ab[1] + (abN1 - 1);
+                Digit topword0 = pab0top[0], topword1 = pab1top[0];
+                int topsigbitN0 = Digit.SigBitN(topword0)
+                  , topsigbitN1 = Digit.SigBitN(topword1)
+                  , sigbitN0 = Digit.BitN * (abN0 - 1) + topsigbitN0
+                  , sigbitN1 = Digit.BitN * (abN1 - 1) + topsigbitN1
+                  , maxSigBitN = sigbitN0 > sigbitN1 ? sigbitN0 : sigbitN1
+                  , maxlab = abN0 > abN1 ? abN0 : abN1
+                  , ibig = Compare(ab[1], abN1, ab[0], abN0) > 0 ? 1 : 0
+                  , ismall = 1 - ibig;
+                Digit[] mat22 = new Digit[4];
+                iterations++;
+                Debug.Assert(iterations <= Digit.BitN * (aN + bN + 1)
+                           , "too many iterations");
+                if (maxlab == 1) {
+                    Digit ab0, ab1, m00, m01, m10, m11;
+                    if (topword0 > Digit.MaxValue - topword1) {
+                        if (ibig == 0) {
+                            topword0 -= topword1;
+                        } else {
+                            topword1 -= topword0;
+                        }
+                        Digit carry = Add(tempsMul[0]
+                                        , tempsMul[1]
+                                        , tempsMul[ibig]
+                                        , mulN);
+                        if (carry != 0) {
+                            Debug.Assert(false, "untested code");
+                            Debug.Assert(mulN < bN, "internal error");
+                            tempsMul[ibig][mulN] = carry;
+                            mulN++;
+                        }
+                    }
+                    ab0 = topword0;
+                    ab1 = topword1;
+                    m00 = 1;
+                    m01 = 0;
+                    m10 = 0;
+                    m11 = 1;
+                    while (ab1 != 0) {
+                        if (ab0 >= ab1) {
+                            if (ab0 >> 2 >= ab1) {
+                                Digit q = ab0 / ab1;
+                                ab0 -= q * ab1;
+                                m00 += q * m10;
+                                m01 += q * m11;
+                            } else {
+                                do {
+                                    ab0 -= ab1;
+                                    m00 += m10;
+                                    m01 += m11;
+                                } while (ab0 >= ab1);
+                            }
+                        }
+                        Debug.Assert(ab1 > ab0, "internal error");
+                        if (ab0 == 0) { break; }
+                        if (ab1 >> 2 >= ab0) {
+                            Digit q = ab1 / ab0;
+                            ab1 -= q * ab0;
+                            m10 += q * m00;
+                            m11 += q * m01;
+                        } else {
+                            do {
+                                ab1 -= ab0;
+                                m10 += m00;
+                                m11 += m01;
+                            } while (ab1 >= ab0);
+                        }
+                        Debug.Assert(ab0 > ab1, "internal error");
+                    }
+                    ab[0][0] = ab0;
+                    ab[1][0] = ab1;
+                    abN[0] = ab0 != 0 ? 1 : 0;
+                    abN[1] = ab1 != 0 ? 1 : 0;
+                    mat22[0] = m00;
+                    mat22[1] = m01;
+                    mat22[2] = m10;
+                    mat22[3] = m11;
+                    Digits carrys = new Digits(2);
+                    Mul22U(mat22, tempsMul[0], tempsMul[1], mulN, carrys);
+                    if (carrys[0] == 0 && carrys[1] == 0) {
+                    } else {
+                        Debug.Assert(mulN < bN, "internal error");
+                        tempsMul[0][mulN] = carrys[0];
+                        tempsMul[1][mulN] = carrys[1];
+                        mulN++;
+                    }
+                } else if (
+                    sigbitN0 > sigbitN1 + Digit.BitN / 2
+                 || sigbitN1 > sigbitN0 + Digit.BitN / 2
+                ) {
+                    int smallMulN = SigDigitN(tempsMul[ismall], mulN);
+                    Div(ab[ibig]
+                      , abN[ibig]
+                      , ab[ismall]
+                      , abN[ismall]
+                      , null
+                      , tempQ
+                      , tempProd);
+                    int lQ = SigDigitN(tempQ, abN[ibig] - abN[ismall] + 1);
+                    abN[ibig] = SigDigitN(tempProd, abN[ismall]);
+                    ab[ibig]._Set(tempProd, abN[ibig]);
+                    Mul(tempQ, lQ, tempsMul[ismall], smallMulN, tempProd);
+                    AddFull(tempProd
+                          , SigDigitN(tempProd, lQ + smallMulN)
+                          , tempsMul[ibig]
+                          , mulN
+                          , tempsMul[ibig]
+                          , out mulN);
+                } else {
+                    int norm = (int)(Digit.BitN * maxlab - maxSigBitN);
+                    pab0top[1] = pab1top[1] = 0;
+                    Debug.Assert(maxlab >= 2, "internal error");
+                    UInt64 lead0
+                         = (UInt64)
+                           (ab[0][maxlab - 1] << norm
+                          | ab[0][maxlab - 2] >> 1 >> Digit.BitN - 1 - norm)
+                        << Digit.BitN
+                         | (ab[0][maxlab - 2] << norm
+                          | ab[0][maxlab - 3] >> 1 >> Digit.BitN - 1 - norm)
+                         , lead1
+                         = (UInt64)
+                           (ab[1][maxlab - 1] << norm
+                          | ab[1][maxlab - 2] >> 1 >> Digit.BitN - 1 - norm)
+                        << Digit.BitN
+                         | (ab[1][maxlab - 2] << norm
+                          | ab[1][maxlab - 3] >> 1 >> Digit.BitN - 1 - norm);
+                    LehmerMat22(lead0, lead1, mat22);
+                    if ((mat22[1] | mat22[2]) == 0) {
+                        Debug.Assert(false, "untested code");
+                        Debug.Assert(
+                            mat22[0] == 1 && mat22[3] == 1, "internal error");
+                        mat22[ibig + 1] = 1;
+                    }
+                    int lab = abN0 > abN1 ? abN0 : abN1;
+                    int[] scarrys = new int[2];
+                    Mul22S(mat22, ab[0], ab[1], lab, scarrys);
+                    Debug.Assert(scarrys[0] == 0 && scarrys[1] == 0
+                               , "internal error");
+                    int abN0Sig = lab, abN1Sig = lab;
+                    while (abN0Sig != 0 && ab[0][abN0Sig - 1] == 0) {
+                        abN0Sig--;
+                    }
+                    while (abN1Sig != 0 && ab[1][abN1Sig - 1] == 0) {
+                        abN1Sig--;
+                    }
+                    abN[0] = abN0Sig;
+                    abN[1] = abN1Sig;
+                    Digits carrys = new Digits(2);
+                    Mul22U(mat22, tempsMul[0], tempsMul[1], mulN, carrys);
+                    if (carrys[0] == 0 && carrys[1] == 0) {
+                    } else {
+                        Debug.Assert(mulN < bN, "internal error");
+                        tempsMul[0][mulN] = carrys[0];
+                        tempsMul[1][mulN] = carrys[1];
+                        mulN++;
+                    }
+                }
+            }
+            Digit igcd = (Digit)(abN[0] == 0 ? 1U : 0U);
+            lgcd = abN[igcd];
+            gcd._Set(ab[igcd], lgcd);
+            Debug.Assert(Compare(b, tempsMul[1 - igcd], bN) >= 0
+                      && Compare(tempsMul[1 - igcd], tempsMul[igcd], bN) >= 0
+                       , "internal error");
+            if (igcd == 0) {
+                ainvmodb._Set(tempsMul[0], bN);
+            } else {
+                Sub(tempsMul[0], tempsMul[1], ainvmodb, bN);
+            }
+            if (binvmoda != null) {
+                Sub(tempsMul[1 - igcd], ainvmodb, tempsMul[1 - igcd], bN);
+                Mul(a, aN, tempsMul[1 - igcd], bN, tempProd);
+                Add(tempProd, aN + bN, gcd, lgcd, tempProd);
+                Div(tempProd
+                  , aN + bSigDigitN
+                  , b
+                  , bSigDigitN
+                  , null
+                  , tempQ
+                  , tempsMul[1 - igcd]);
+                Debug.Assert(SigDigitN(tempsMul[1 - igcd], bSigDigitN) == 0
+                           , "internal error");
+                binvmoda._Set(tempQ, aN);
+            }
+        }
+        static void
+        LehmerMat22(UInt64 lead0orig, UInt64 lead1orig, Digit[] mat22) {
+            Digit lead0h = Digit2.Hi(lead0orig)
+                , lead0l = Digit2.Lo(lead0orig)
+                , lead1h = Digit2.Hi(lead1orig)
+                , lead1l = Digit2.Lo(lead1orig);
+            bool progress = true;
+            Digit m00 = 1, m01 = 0, m10 = 0, m11 = 1;
+            Debug.Assert(lead0h != 0
+                      && lead1h != 0
+                      && ((lead0h | lead1h) & 1U << Digit.BitN - 1) != 0
+                       , "internal error");
+            while (progress) {
+                progress = false;
+                if (lead0h - 1 > lead1h && lead0h != 0) {
+                    if (lead0h >> 2 >= lead1h + 2) {
+                        Digit q = lead0h / (lead1h + 2);
+                        UInt64 prod10By11 = (UInt64)q * (m10 + m11)
+                             , prod1l = (UInt64)q * lead1l;
+                        Debug.Assert(q > 3, "internal error");
+                        if (
+                            Digit2.Hi(prod10By11) == 0
+                         && Digit2.Lo(prod10By11)
+                         <= Digit.MaxValue / 2 - m00 - m01
+                        ) {
+                            Digit prod10 = q * m10;
+                            progress = true;
+                            lead0h
+                         -= (Digit)((long)(UInt32)q * lead1h
+                                  + Digit2.Hi(prod1l)
+                                  + (Digit2.Lo(prod1l) > lead0l ? 1L : 0L));
+                            unchecked { lead0l -= Digit2.Lo(prod1l); }
+                            m00 += prod10;
+                            m01 += Digit2.Lo(prod10By11) - prod10;
+                            Debug.Assert((m00 | m01) < 1U << Digit.BitN - 1
+                                       , "internal error");
+                        }
+                    } else {
+                        Digit overflowTest;
+                        do {
+                            m00 += m10;
+                            m01 += m11;
+                            overflowTest = (m00 | m01) & 1U << Digit.BitN - 1;
+                            lead0h -= lead1h + (lead1l > lead0l ? 1U : 0U);
+                            unchecked { lead0l -= lead1l; }
+                        } while (overflowTest == 0 && lead0h >= lead1h + 2);
+                        progress = true;
+                        if (overflowTest != 0) {
+                            progress = false;
+                            m00 -= m10;
+                            m01 -= m11;
+                        }
+                    }
+                }
+                if (lead1h - 1 > lead0h && lead1h != 0) {
+                    if (lead1h >> 2 >= lead0h + 2) {
+                        Digit q = lead1h / (lead0h + 2);
+                        UInt64 prod00And01 = (UInt64)q * (m00 + m01)
+                             , prod0l = (UInt64)q * lead0l;
+                        Debug.Assert(q > 3, "internal error");
+                        if (
+                            Digit2.Hi(prod00And01) == 0
+                         && Digit2.Lo(prod00And01)
+                         <= Digit.MaxValue / 2 - m10 - m11
+                        ) {
+                            Digit prod00 = q * m00;
+                            progress = true;
+                            lead1h -= q * lead0h
+                                    + Digit2.Hi(prod0l)
+                                    + (Digit2.Lo(prod0l) > lead1l ? 1U : 0U);
+                            unchecked { lead1l -= Digit2.Lo(prod0l); }
+                            m10 += prod00;
+                            m11 += Digit2.Lo(prod00And01) - prod00;
+                            Debug.Assert((m10 | m11) < 1U << Digit.BitN - 1
+                                       , "internal error");
+                        }
+                    } else {
+                        Digit overflowTest;
+                        do {
+                            m10 += m00;
+                            m11 += m01;
+                            overflowTest = (m10 | m11) & 1U << Digit.BitN - 1;
+                            lead1h -= lead0h + (lead0l > lead1l ? 1U : 0U);
+                            unchecked { lead1l -= lead0l; }
+                        } while (overflowTest == 0 && lead1h >= lead0h + 2);
+                        progress = true;
+                        if (overflowTest != 0) {
+                            progress = false;
+                            m10 -= m00;
+                            m11 -= m01;
+                        }
+                    }
+                }
+            }
+            Debug.Assert(((m00 | m01 | m10 | m11) & 1U << Digit.BitN - 1) == 0
+                       , "internal error");
+            mat22[0] = m00;
+            mat22[1] = m01;
+            mat22[2] = m10;
+            mat22[3] = m11;
+        }
+        static void Mul22U(
+            Digit[] mat
+          , Digits vec1
+          , Digits vec2
+          , int lvec
+          , Digits carrys
+        ) {
+            Digit carry1 = 0, carry2 = 0;
+            Digit m11 = mat[0], m12 = mat[1], m21 = mat[2], m22 = mat[3];
+            if (m12 > Digit.MaxValue - m11 || m21 > Digit.MaxValue - m22) {
+                throw new ArgumentException();
+            }
+            for (int i = 0; i != lvec; i++) {
+                UInt64 prod11 = (UInt64)m11 * vec1[i] + carry1
+                     , prod21 = (UInt64)m21 * vec1[i] + carry2
+                     , prod12 = (UInt64)m12 * vec2[i] + Digit2.Lo(prod11)
+                     , prod22 = (UInt64)m22 * vec2[i] + Digit2.Lo(prod21);
+                vec1[i] = Digit2.Lo(prod12);
+                vec2[i] = Digit2.Lo(prod22);
+                carry1 = Digit2.Hi(prod11) + Digit2.Hi(prod12);
+                carry2 = Digit2.Hi(prod21) + Digit2.Hi(prod22);
+            }
+            carrys[0] = carry1;
+            carrys[1] = carry2;
+        }
+        static void
+        Mul22S(Digit[] mat, Digits vec1, Digits vec2, int lvec, int[] carrys) {
+            int carry1 = 0, carry2 = 0;
+            Digit m11 = mat[0], m12 = mat[1], m21 = mat[2], m22 = mat[3];
+            if (((m11 | m12 | m21 | m22) & 1U << Digit.BitN - 1) != 0) {
+                throw new ArgumentException();
+            }
+            for (int i = 0; i != lvec; i++) {
+                UInt64 prod11 = (UInt64)m11 * vec1[i]
+                     , prod12 = (UInt64)m12 * vec2[i]
+                     , prod21 = (UInt64)m21 * vec1[i]
+                     , prod22 = (UInt64)m22 * vec2[i]
+                     , prod1 = unchecked(prod11 + (UInt64)carry1)
+                     , prod2 = unchecked(prod22 + (UInt64)carry2);
+                prod1 = unchecked(prod1 - prod12);
+                prod2 = unchecked(prod2 - prod21);
+                vec1[i] = Digit2.Lo(prod1);
+                vec2[i] = Digit2.Lo(prod2);
+                carry1 = unchecked((int)Digit2.Hi(prod1));
+                carry2 = unchecked((int)Digit2.Hi(prod2));
+            }
+            carrys[0] = carry1;
+            carrys[1] = carry2;
+        }
+        internal static void
+        Random(Digits digits, int digitN, Random generator) {
+            for (int i = 0; i < digitN; i++) {
+                digits[i] = Digit.Random(generator);
+            }
+        }
+    }
+    public class Reciprocal {
+        internal Digit _multiplier;
+        internal int _shiftBitN;
+        internal Digit EstQuotient(Digit n2, Digit n1, Digit n0) {
+            Digit nShiftHi
+                = n2 << _shiftBitN | n1 >> 1 >> Digit.BitN - 1 - _shiftBitN
+                , nShiftLo
+                = n1 << _shiftBitN | n0 >> 1 >> Digit.BitN - 1 - _shiftBitN;
+            UInt64 qprod = ((UInt64)nShiftHi << Digit.BitN | nShiftLo)
+                         + (UInt64)nShiftHi * _multiplier;
+            if ((nShiftLo & 1U << Digit.BitN - 1) != 0) {
+                qprod += _multiplier >> 1;
+            }
+            return Digit2.Hi(qprod);
+        }
+    }
+}
diff --git a/base/Libraries/Crypto/MD4.cs b/base/Libraries/Crypto/MD4.cs
new file mode 100644
index 0000000..84a120c
--- /dev/null
+++ b/base/Libraries/Crypto/MD4.cs
@@ -0,0 +1,452 @@
+/*
+
+This file contains an implementation of the MD4 hash algorithm.
+The implementation was derived from the example source code that
+is provided in RFC 1320 - "The MD4 Message-Digest Algorithm".
+
+The code has been ported from C to C# by Arlie Davis (arlied), June 2006.
+The original copyright is preserved here.
+
+
+   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD4 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+
+*/
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace System.Security.Cryptography
+{
+
+    /// <summary>
+    /// This class implements the MD4 message digest algorithm.
+    /// The implementation is a C# port of the original RSA C implementation that is
+    /// provided in RFC 1320.
+    /// </summary>
+    public class MD4Context
+    {
+        public MD4Context()
+        {
+            Reset();
+        }
+
+        public const int DigestLength = 16;
+
+        /// <summary>
+        /// This field is "true" if GetDigest has been called.
+        /// It cannot be called again, unless Reset is called.
+        /// </summary>
+        bool _done;
+
+        public void Clear()
+        {
+            _state0 = 0;
+            _state1 = 0;
+            _state2 = 0;
+            _state3 = 0;
+            _count = 0;
+            for (int i = 0; i < 64; i++)
+                _buffer[i] = 0;
+        }
+
+        /// <summary>
+        /// This method can be used to reset the state of the MD4 context.  After returning, the
+        /// state of the MD4Context is equivalent to its state immediately after the constructor
+        /// finished.
+        /// </summary>
+        public void Reset()
+        {
+            // Load magic initialization constants.
+            _count = 0;
+            _state0 = 0x67452301;
+            _state1 = 0xefcdab89;
+            _state2 = 0x98badcfe;
+            _state3 = 0x10325476;
+            _done = false;
+        }
+
+        /*
+        MD4 basic transformation. Transforms state based on block.
+         */
+        void Transform(byte[]/*!*/ block, int offset)
+        {
+            if (offset < 0)
+                throw new ArgumentException("offset cannot be negative.");
+
+            Decode(_block, 0, block, offset, 64);
+            Transform(_block);
+
+            // Zeroize sensitive information.
+            // MD4_memset ((POINTER)x, 0, sizeof (x));
+        }
+
+        #region Constants for MD4Transform routine.
+        const int S11 = 3;
+        const int S12 = 7;
+        const int S13 = 11;
+        const int S14 = 19;
+        const int S21 = 3;
+        const int S22 = 5;
+        const int S23 = 9;
+        const int S24 = 13;
+        const int S31 = 3;
+        const int S32 = 9;
+        const int S33 = 11;
+        const int S34 = 15;
+        #endregion
+
+        /// <summary>
+        /// This routine transforms the current MD4 context, using a block of input.
+        /// The input is 16 words, where each word is 32 unsigned bits.  This method
+        /// is the core of the MD4 algorithm.
+        /// </summary>
+        /// <param name="x">The message data to use to transform the context.</param>
+        void Transform(uint[] x)
+        {
+            uint a = _state0;
+            uint b = _state1;
+            uint c = _state2;
+            uint d = _state3;
+
+            /* Round 1 */
+            a = FF(a, b, c, d, x[00], S11); /* 1 */
+            d = FF(d, a, b, c, x[01], S12); /* 2 */
+            c = FF(c, d, a, b, x[02], S13); /* 3 */
+            b = FF(b, c, d, a, x[03], S14); /* 4 */
+            a = FF(a, b, c, d, x[04], S11); /* 5 */
+            d = FF(d, a, b, c, x[05], S12); /* 6 */
+            c = FF(c, d, a, b, x[06], S13); /* 7 */
+            b = FF(b, c, d, a, x[07], S14); /* 8 */
+            a = FF(a, b, c, d, x[08], S11); /* 9 */
+            d = FF(d, a, b, c, x[09], S12); /* 10 */
+            c = FF(c, d, a, b, x[10], S13); /* 11 */
+            b = FF(b, c, d, a, x[11], S14); /* 12 */
+            a = FF(a, b, c, d, x[12], S11); /* 13 */
+            d = FF(d, a, b, c, x[13], S12); /* 14 */
+            c = FF(c, d, a, b, x[14], S13); /* 15 */
+            b = FF(b, c, d, a, x[15], S14); /* 16 */
+
+            /* Round 2 */
+            a = GG(a, b, c, d, x[00], S21); /* 17 */
+            d = GG(d, a, b, c, x[04], S22); /* 18 */
+            c = GG(c, d, a, b, x[08], S23); /* 19 */
+            b = GG(b, c, d, a, x[12], S24); /* 20 */
+            a = GG(a, b, c, d, x[01], S21); /* 21 */
+            d = GG(d, a, b, c, x[05], S22); /* 22 */
+            c = GG(c, d, a, b, x[09], S23); /* 23 */
+            b = GG(b, c, d, a, x[13], S24); /* 24 */
+            a = GG(a, b, c, d, x[02], S21); /* 25 */
+            d = GG(d, a, b, c, x[06], S22); /* 26 */
+            c = GG(c, d, a, b, x[10], S23); /* 27 */
+            b = GG(b, c, d, a, x[14], S24); /* 28 */
+            a = GG(a, b, c, d, x[03], S21); /* 29 */
+            d = GG(d, a, b, c, x[07], S22); /* 30 */
+            c = GG(c, d, a, b, x[11], S23); /* 31 */
+            b = GG(b, c, d, a, x[15], S24); /* 32 */
+
+            /* Round 3 */
+            a = HH(a, b, c, d, x[00], S31); /* 33 */
+            d = HH(d, a, b, c, x[08], S32); /* 34 */
+            c = HH(c, d, a, b, x[04], S33); /* 35 */
+            b = HH(b, c, d, a, x[12], S34); /* 36 */
+            a = HH(a, b, c, d, x[02], S31); /* 37 */
+            d = HH(d, a, b, c, x[10], S32); /* 38 */
+            c = HH(c, d, a, b, x[06], S33); /* 39 */
+            b = HH(b, c, d, a, x[14], S34); /* 40 */
+            a = HH(a, b, c, d, x[01], S31); /* 41 */
+            d = HH(d, a, b, c, x[09], S32); /* 42 */
+            c = HH(c, d, a, b, x[05], S33); /* 43 */
+            b = HH(b, c, d, a, x[13], S34); /* 44 */
+            a = HH(a, b, c, d, x[03], S31); /* 45 */
+            d = HH(d, a, b, c, x[11], S32); /* 46 */
+            c = HH(c, d, a, b, x[07], S33); /* 47 */
+            b = HH(b, c, d, a, x[15], S34); /* 48 */
+
+            _state0 = unchecked(_state0 + a);
+            _state1 = unchecked(_state1 + b);
+            _state2 = unchecked(_state2 + c);
+            _state3 = unchecked(_state3 + d);
+        }
+
+        public const int BytesPerTransform = 64;
+        public const int WordsPerTransform = 16;
+
+        uint _state0;             // state A
+        uint _state1;             // state B
+        uint _state2;             // state C
+        uint _state3;             // state D
+        Int64 _count;              // number of bits, modulo 2^64
+
+        /// <summary>
+        /// This buffer holds data that was submitted using the Update method, but which
+        /// was too short to complete a full transform block (64 bytes).
+        /// </summary>
+        readonly byte[]/*!*/ _buffer = new byte[BytesPerTransform];
+
+        /// <summary>
+        /// This buffer contains the current block (of message data) that is being transformed.
+        /// </summary>
+        readonly uint[]/*!*/ _block = new uint[WordsPerTransform];
+
+        static MD4Context()
+        {
+            PADDING = new byte[BytesPerTransform];
+            Array.Clear(PADDING, 0, 64);
+            PADDING[0] = 0x80;
+        }
+
+        static readonly byte[]/*!*/ PADDING;
+        /*
+        {
+            0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        };
+        */
+
+        /* F, G and H are basic MD4 functions.
+        */
+        static uint F(uint x, uint y, uint z) { return (x & y) | ((~x) & z); }
+        static uint G(uint x, uint y, uint z) { return (x & y) | (x & z) | (y & z); }
+        static uint H(uint x, uint y, uint z) { return x ^ y ^ z; }
+
+        /* ROTATE_LEFT rotates x left n bits.
+        */
+        static uint RotateLeft(uint x, int n)
+        {
+            return (x << n) | (x >> (32 - n));
+        }
+
+        /* FF, GG and HH are transformations for rounds 1, 2 and 3 */
+        /* Rotation is separate from addition to prevent recomputation */
+        /* (Or at least it used to be, when these were C macros. */
+
+        static uint FF(uint a, uint b, uint c, uint d, uint x, int s)
+        {
+            a = unchecked(a + F(b, c, d) + x);
+            return RotateLeft(a, s);
+        }
+
+        static uint GG(uint a, uint b, uint c, uint d, uint x, int s)
+        {
+            a = unchecked(a + G(b, c, d) + x + (uint)0x5a827999);
+            return RotateLeft(a, s);
+        }
+
+        static uint HH(uint a, uint b, uint c, uint d, uint x, int s)
+        {
+            a = unchecked(a + H(b, c, d) + x + (uint)0x6ed9eba1);
+            return RotateLeft(a, s);
+        }
+
+
+        /* Decodes input (unsigned char) into output (uint). Assumes len is
+             a multiple of 4.
+
+         */
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="output"></param>
+        /// <param name="outputoffset"></param>
+        /// <param name="input"></param>
+        /// <param name="inputoffset"></param>
+        /// <param name="length">number of BYTES to transfer</param>
+        static void Decode(uint[]/*!*/ output, int outputoffset, byte[]/*!*/ input, int inputoffset, int length)
+        {
+            Debug.Assert(length % 4 == 0);
+
+            int outpos = outputoffset;
+
+            for (int j = 0; j < length; j += 4)
+            {
+                uint value = ((uint)input[inputoffset + j])
+                    | (((uint)input[inputoffset + j + 1]) << 8)
+                    | (((uint)input[inputoffset + j + 2]) << 16)
+                    | (((uint)input[inputoffset + j + 3]) << 24);
+                output[outpos] = value;
+
+                outpos++;
+            }
+        }
+
+        static void EncodeLe(uint value, byte[]/*!*/ output, int pos)
+        {
+            output[pos] = (byte)(value & 0xff);
+            output[pos + 1] = (byte)((value >> 8) & 0xff);
+            output[pos + 2] = (byte)((value >> 16) & 0xff);
+            output[pos + 3] = (byte)((value >> 24) & 0xff);
+        }
+
+        /// <summary>
+        /// MD4 block update operation. Continues an MD4 message-digest operation,
+        /// processing another message block, and updating the context.
+        /// </summary>
+        /// <param name="input">The buffer containing data to process.</param>
+        /// <param name="offset">The offset within the buffer where the data begins.</param>
+        /// <param name="length">The length of the data.</param>
+        public void Update(byte[]/*!*/ input, int offset, int length)
+        {
+            if (_done)
+                throw new InvalidOperationException("The hash context has been closed (GetDigest has been called).  It cannot be reused until Reset is called.");
+
+            if (length == 0)
+                return;
+
+            /* Compute number of bytes mod 64 */
+            int index = (int)((_count >> 3) & 0x3F);
+            _count += length << 3;
+
+            int partLen = 64 - index;
+
+            /* Transform as many times as possible.
+            */
+            int i;
+            if (length >= partLen)
+            {
+                // MD4_memcpy((POINTER)&buffer_pinned[index], (POINTER)&input[offset], partLen);
+                Array.Copy(input, offset, _buffer, index, partLen);
+                Transform(_buffer, 0);
+
+                for (i = partLen; i + 63 < length; i += 64)
+                    Transform(input, offset + i);
+
+                index = 0;
+            }
+            else
+                i = 0;
+
+            /* Buffer remaining input */
+            // MD4_memcpy((POINTER)&_buffer[index], (POINTER)&input[i], inputLen-i);
+            // MD4_memcpy((POINTER)&buffer_pinned[index], (POINTER)&input[offset + i], inputLen-i);
+            Array.Copy(input, offset + i, _buffer, index, length - i);
+        }
+
+
+        public static MD4Digest GetDigest(byte[]/*!*/ buffer)
+        {
+            return GetDigest(buffer, 0, buffer.Length);
+        }
+
+        public static MD4Digest GetDigest(byte[]/*!*/ buffer, int offset, int length)
+        {
+            MD4Context context = new MD4Context();
+            context.Update(buffer, offset, length);
+            return context.GetDigest();
+        }
+
+        /* MD4 finalization. Ends an MD4 message-digest operation, writing the
+             the message digest and zeroizing the context.
+         */
+        public MD4Digest GetDigest()
+        {
+            if (_done)
+                throw new InvalidOperationException("GetDigest cannot be called twice for a single hash sequence.  Call Reset() to reset the context.");
+
+            byte[]/*!*/ bits = new byte[8];
+
+            /* Save number of bits */
+            EncodeLe((uint)(_count & 0xffffffffu), bits, 0);
+            EncodeLe((uint)(_count >> 32), bits, 4);
+
+            // Pad out to 56 mod 64.
+            int index = (int)((_count >> 3) & 0x3f);
+            int padLen = (index < 56) ? (56 - index) : (120 - index);
+            Update(PADDING, 0, padLen);
+
+            // Append length (before padding)
+            Update(bits, 0, 8);
+
+            // Store state in digest
+
+            MD4Digest digest;
+            digest.state0 = _state0;
+            digest.state1 = _state1;
+            digest.state2 = _state2;
+            digest.state3 = _state3;
+
+            Clear();
+
+            _done = true;
+
+            return digest;
+        }
+    }
+
+    public struct MD4Digest
+    {
+        public uint state0;
+        public uint state1;
+        public uint state2;
+        public uint state3;
+
+        static void PackLe(byte[]/*!*/ dest, int offset, uint value)
+        {
+            dest[offset + 0] = (byte)((value) & 0xff);
+            dest[offset + 1] = (byte)((value >> 8) & 0xff);
+            dest[offset + 2] = (byte)((value >> 16) & 0xff);
+            dest[offset + 3] = (byte)((value >> 24) & 0xff);
+        }
+
+        public const int DigestLength = 16;
+
+        public byte[]/*!*/ ToArray()
+        {
+            byte[] result = new byte[DigestLength];
+            ToArray(result);
+            return result;
+        }
+
+        public void ToArray(byte[]/*!*/ result)
+        {
+            if (result.Length < 0x10)
+                throw new ArgumentException("Input array is too short.");
+
+            PackLe(result, 0, state0);
+            PackLe(result, 4, state1);
+            PackLe(result, 8, state2);
+            PackLe(result, 12, state3);
+        }
+
+        public static implicit operator byte[]/*!*/(MD4Digest digest)
+        {
+            return digest.ToArray();
+        }
+
+        override public string/*!*/ ToString()
+        {
+            string hex = "0123456789abcdef";
+            byte[] arr = ToArray();
+            StringBuilder buffer = new StringBuilder(DigestLength * 2);
+            for (int i = 0; i < 0x10; i++)
+            {
+                byte b = arr[i];
+                buffer.Append(hex[b >> 4]);
+                buffer.Append(hex[b & 0xf]);
+            }
+            return buffer.ToString();
+        }
+    }
+
+}
diff --git a/base/Libraries/Crypto/MD5.cs b/base/Libraries/Crypto/MD5.cs
new file mode 100644
index 0000000..339cd0b
--- /dev/null
+++ b/base/Libraries/Crypto/MD5.cs
@@ -0,0 +1,374 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MD5.cs
+//
+//  Note:
+//    A simple MD5 hash implementation. Ported from C++ code,
+//    originally written by Peter L. Montgomery, used in the
+//    Rotor / Coriolis codebase. Port by maiken.
+//
+//      For algorithmic background see (for example)
+//
+//           Bruce Schneier
+//           Applied Cryptography
+//           Protocols, Algorithms, and Source Code in C
+//           Second Edition
+//           Wiley, 1996
+//           ISBN 0-471-12845-7
+//           QA76.9 A25S35
+//
+//           Alfred J. Menezes et al
+//           Handbook of Applied Cryptography
+//          The CRC Press Series on Discrete Mathematics
+//                  and its Applications
+//           CRC Press LLC, 1997
+//           ISBN 0-8495-8523-7
+//           QA76.9A25M643
+//
+//       Also see RFC (Request For Comments) 1321 from April, 1992.
+//       A July 2000 search for "rfc md5" or "rfc 1321"
+//       at www.yahoo.com found the document at
+//
+//           http://www.cis.ohio-state.edu/htbin/rfc/rfc1321.html
+//
+//       and other sites.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto
+{
+    public class MD5
+    {
+        // Data awaiting full 512-bit block.
+        // Length (nbit_total[0] % 512) bits.
+        // Unused part of buffer (at end) is zero.
+        private uint[] Waiting_Data; // uint[16]
+
+        // Hash through last full block
+        private uint[] Partial_Hash; // uint[4]
+
+        // Total length of message so far
+        // (bits, mod 2^64)
+        private uint[] NBit_Total; // uint[2]
+
+        private static readonly uint[] MD5_Const = new uint[] {
+            // Round 1
+            0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+            0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+            0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+            0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+
+            // Round 2
+            0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+            0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
+            0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+            0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+
+            // Round 3
+            0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+            0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+            0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
+            0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+
+            // Round 4
+            0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+            0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+            0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+            0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
+        };
+
+        public MD5()
+        {
+			Waiting_Data = new uint[16];
+			NBit_Total = new uint[2];
+			Partial_Hash = new uint[4];
+		}
+
+        public byte[] Hash(byte[] data)
+        {
+			Reset();
+            Update(data);
+            return Finish();
+        }
+
+		private void Reset()
+		{
+			for (uint i = 0; i != 16; i++)
+			{
+				Waiting_Data[i] = 0;
+			}
+			
+			NBit_Total[0] = NBit_Total[1] = 0;
+
+			/*
+			   Initialize hash variables.
+
+			   N.B.  The initial values in RFC 1321 appear
+			   in byte-reversed order.  Bruce Schneier's
+			   2nd edition neglects to rearrange them.
+			*/
+			Partial_Hash[0] = 0x67452301;
+			Partial_Hash[1] = 0xefcdab89;
+			Partial_Hash[2] = ~Partial_Hash[0];
+			Partial_Hash[3] = ~Partial_Hash[1];
+		}
+
+        // Shift val left by num bits, wrapping bits around.
+        private uint RotL(uint val, byte num)
+        {
+            Debug.Assert(num < 32);
+            uint overflowBits = val >> (32 - num);
+            val = val << num;
+            val |= overflowBits;
+            return val;
+        }
+
+        /*
+          Update the MD5 hash from a fresh 64 bytes of data.
+        */
+        private void ProcessBlock()
+        {
+            uint a = Partial_Hash[0], b = Partial_Hash[1];
+            uint c = Partial_Hash[2], d = Partial_Hash[3];
+            uint[] msg16 = new uint[32];   // Two copies of message
+            int i;
+            int consindex = 0;
+
+            for (i = 0; i != 16; i++)
+            {
+                // Copy to local array, zero original
+                // Make two copies, to simplify indexing
+                uint datval = Waiting_Data[i];
+                Waiting_Data[i] = 0;
+                msg16[i] = msg16[i+16] = datval;
+            }
+
+            // Round 1
+            for (i = -16; i != 0; i += 4)
+            {
+                // Rewrite (X & Y) | (~X & Z)  as  Z ^ (X & (Y ^ Z))
+                // [Easily validated by checking X = 0 and X = 1 cases.]
+                // This avoids ANDNOT (which X86 lacks) and needs only
+                // one temporary register.
+                // On register-rich architectures, the Y ^ Z computation
+                // can start early, before X is computed.
+                a += msg16[i+16] + MD5_Const[consindex] + (d ^ (b & (c ^ d)));
+                a = b + RotL(a, 7);
+                consindex++;
+
+                d += msg16[i+17] + MD5_Const[consindex] + (c ^ (a & (b ^ c)));
+                d = a + RotL(d, 12);
+                consindex++;
+
+                c += msg16[i+18] + MD5_Const[consindex] + (b ^ (d & (a ^ b)));
+                c = d + RotL(c, 17);
+                consindex++;
+
+                b += msg16[i+19] + MD5_Const[consindex] + (a ^ (c & (d ^ a)));
+                b = c + RotL(b, 22);
+                consindex++;
+            }
+
+            // Round 2
+            for (i = -16; i != 0; i += 4)
+            {
+                // Rewrite (Z & X) | (~Z & Y)  as  Y ^ (Z & (X ^ Y))
+                a += msg16[i+17] + MD5_Const[consindex] + (c ^ (d & (b ^ c)));
+                a = b + RotL(a, 5);
+                consindex++;
+
+                d += msg16[i+22] + MD5_Const[consindex] + (b ^ (c & (a ^ b)));
+                d = a + RotL(d, 9);
+                consindex++;
+
+                c += msg16[i+27] + MD5_Const[consindex] + (a ^ (b & (d ^ a)));
+                c = d + RotL(c, 14);
+                consindex++;
+
+                b += msg16[i+16] + MD5_Const[consindex] + (d ^ (a & (c ^ d)));
+                b = c + RotL(b, 20);
+                consindex++;
+            }
+
+            // Round 3
+            for (i = 16; i != 0; i -= 4)
+            {
+                a += msg16[i+5]  + MD5_Const[consindex] + ((b ^ c) ^ d);
+                a = b + RotL(a, 4);
+                consindex++;
+
+                d += msg16[i+8]  + MD5_Const[consindex] + (a ^ (b ^ c));
+                d = a + RotL(d, 11);
+                consindex++;
+
+                c += msg16[i+11] + MD5_Const[consindex] + ((d ^ a) ^ b);
+                c = d + RotL(c, 16);
+                consindex++;
+
+                b += msg16[i+14] + MD5_Const[consindex] + (c ^ (d ^ a));
+                b = c + RotL(b, 23);
+                consindex++;
+            }
+
+            // Round 4
+            for (i = 16; i != 0; i -= 4)
+            {
+                a += msg16[i  ]  + MD5_Const[consindex] + (c ^ (~d | b));
+                a = b + RotL(a, 6);
+                consindex++;
+
+                d += msg16[i+7]  + MD5_Const[consindex] + (b ^ (~c | a));
+                d = a + RotL(d, 10);
+                consindex++;
+
+                c += msg16[i+14] + MD5_Const[consindex] + (a ^ (~b | d));
+                c = d + RotL(c, 15);
+                consindex++;
+
+                b += msg16[i+5]  + MD5_Const[consindex] + (d ^ (~a | c));
+                b = c + RotL(b, 21);
+                consindex++;
+            }
+
+            Debug.Assert(consindex == 64);
+
+            Partial_Hash[0] = unchecked(Partial_Hash[0] + a);
+            Partial_Hash[1] = unchecked(Partial_Hash[1] + b);
+            Partial_Hash[2] = unchecked(Partial_Hash[2] + c);
+            Partial_Hash[3] = unchecked(Partial_Hash[3] + d);
+        }
+
+        /*
+          Append data to a partially hashed MD5 message.
+        */
+        private void Update(byte[] data)
+        {
+            uint nbit_occupied = NBit_Total[0] & 511;
+            uint nbitnew_low = unchecked((uint)(8 * data.Length));
+            uint dataIndex = 0, waitingDataIndex;
+
+            Debug.Assert((nbit_occupied & 7) == 0);   // Partial bytes not implemented
+            NBit_Total[0] += nbitnew_low;
+            NBit_Total[1] += (uint)(data.Length >> 29);
+
+            if (NBit_Total[0] < nbitnew_low)
+            {
+                // Overflow (?)
+                NBit_Total[1]++;
+            }
+
+            /* Advance to word boundary in waiting_data */
+            if ((nbit_occupied & 31) != 0)
+            {
+                waitingDataIndex = nbit_occupied / 32;
+
+                while ((nbit_occupied & 31) != 0 && dataIndex < data.Length)
+                {
+                    Waiting_Data[waitingDataIndex] |= (uint)data[dataIndex] << (int)(nbit_occupied & 31);
+                    dataIndex++;
+                    nbit_occupied += 8;
+                }
+            } // if nbit_occupied
+
+            /* Transfer 4 bytes at a time */
+            do
+            {
+                uint nword_occupied = nbit_occupied/32;
+                uint nwcopy = Math.Min((uint)((data.Length - dataIndex)/4), (uint)(16 - nword_occupied));
+                Debug.Assert(nbit_occupied <= 512);
+                Debug.Assert((nbit_occupied & 31) == 0 || (dataIndex == data.Length));
+                waitingDataIndex = nword_occupied;
+                nbit_occupied += 32*nwcopy;
+
+                while (nwcopy != 0)
+                {
+                    uint byte0 = (uint)data[dataIndex++];
+                    uint byte1 = (uint)data[dataIndex++];
+                    uint byte2 = (uint)data[dataIndex++];
+                    uint byte3 = (uint)data[dataIndex++];
+                    Waiting_Data[waitingDataIndex++] = /* Little endian */
+                        byte0 | (byte1 << 8) | (byte2 << 16) | (byte3 << 24);
+                    nwcopy--;
+                }
+
+                if (nbit_occupied == 512)
+                {
+                    ProcessBlock();
+                    nbit_occupied = 0;
+                    waitingDataIndex -= 16;
+                    Debug.Assert(waitingDataIndex == 0);
+                }
+            } while (dataIndex <= (data.Length - 4));
+
+            Debug.Assert(waitingDataIndex == nbit_occupied/32);
+
+            while (dataIndex < data.Length)
+            {
+                uint new_byte = (uint)data[dataIndex++];
+                Debug.Assert((nbit_occupied & 31) <= 16);
+                Waiting_Data[waitingDataIndex] |= new_byte << (int)(nbit_occupied & 31);
+                nbit_occupied += 8;
+            }
+
+            Debug.Assert(nbit_occupied == (NBit_Total[0] & 511));
+        }
+
+        /*
+          Finish an MD5 hash.
+        */
+        private byte[] Finish()
+        {
+            uint nbit0 = NBit_Total[0];
+            uint nbit1 = NBit_Total[1];
+            uint nbit_occupied = nbit0 & 511;
+            uint i;
+
+            Debug.Assert((nbit_occupied & 7) == 0);
+
+            // Append a 1 bit
+            Waiting_Data[nbit_occupied/32] |=
+                (uint)0x80 << (int)(nbit_occupied & 31);
+
+            nbit_occupied += 8;
+
+            // TBD -- Above seems weird -- why number bytes from the
+            //        least significant end but number bits the other way?
+
+            // Append zero bits until length (in bits) is 448 mod 512.
+            // Then append the length, in bits.
+            // Here we assume the buffer was zeroed earlier.
+            if (nbit_occupied > 448)  // If fewer than 64 bits left
+            {
+                ProcessBlock();
+                nbit_occupied = 0;
+            }
+
+            Waiting_Data[14] = nbit0;
+            Waiting_Data[15] = nbit1;
+            ProcessBlock();
+
+            /* Copy final digest to byte array */
+
+            byte[] digest = new byte[16];
+
+            for (i = 0; i != 4; i++)
+            {
+                uint dwi = Partial_Hash[i];
+
+                // Little-endian
+                digest[4*i    ] = (byte)(dwi         & 255);
+                digest[4*i + 1] = (byte)((dwi >>  8) & 255);
+                digest[4*i + 2] = (byte)((dwi >> 16) & 255);
+                digest[4*i + 3] = (byte)((dwi >> 24) & 255);
+            }
+
+            return digest;
+        }
+    }
+}
diff --git a/base/Libraries/Crypto/Modular.cs b/base/Libraries/Crypto/Modular.cs
new file mode 100644
index 0000000..a13ed4b
--- /dev/null
+++ b/base/Libraries/Crypto/Modular.cs
@@ -0,0 +1,104 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    class Modular {
+        internal static void
+        Add(Digits a, Digits b, Digits c, Digits mod, int n) {
+            Debug.Assert(n != 0, "internal error");
+            Digit alead = a[n - 1], blead = b[n - 1], mlead = mod[n - 1];
+            if (alead >= mlead) { ValidateData(a, mod, n); }
+            if (blead >= mlead) { ValidateData(b, mod, n); }
+            int test;
+            if (blead > mlead - alead) {
+                test = +1;
+            } else if (mlead - alead - blead > 1) {
+                test = -1;
+            } else {
+                test = Digits.CompareSum(a, b, mod, n);
+            }
+            if (test >= 0) {
+                int carry = Digits.AddSub(a, b, mod, c, n);
+                Debug.Assert(carry == 0, "internal error");
+            } else {
+                uint carry = Digits.Add(a, b, c, n);
+                Debug.Assert(carry == 0, "internal error");
+            }
+        }
+        internal static void Neg(Digits a, Digits b, Digits mod, int n) {
+            Digit allZero = 0;
+            for (int i = 0; i != n; i++) { allZero |= a[i]; b[i] = a[i]; }
+            if (allZero != 0) {
+                if (Digits.Sub(mod, b, b, n) != 0) {
+                    throw new ArgumentException();
+                }
+            }
+        }
+        internal static void
+        Sub(Digits a, Digits b, Digits c, Digits mod, int n) {
+            Debug.Assert(n > 0, "internal error");
+            Digit alead = a[n - 1], blead = b[n - 1], mlead = mod[n - 1];
+            int itest;
+            if (alead == blead) {
+                itest = Digits.Compare(a, b, n - 1);
+            } else {
+                itest = alead < blead ? -1 : +1;
+            }
+            if (itest < 0) {
+                if (blead >= mlead) { ValidateData(b, mod, n); }
+                int carry = Digits.AddSub(a, mod, b, c, n);
+                Debug.Assert(carry == 0, "internal error");
+            } else {
+                if (alead >= mlead) {
+                    Debug.Assert(false, "untested code");
+                    ValidateData(a, mod, n);
+                }
+                uint borrow = Digits.Sub(a, b, c, n);
+                Debug.Assert(borrow == 0, "internal error");
+            }
+        }
+        internal static void ValidateData(Digits data, Digits mod, int n) {
+            if (Digits.Compare(data, mod, n) >= 0) {
+                throw new ArgumentException();
+            }
+        }
+        static void Random(Digits mod, Digits arr, int n, Random generator) {
+            Debug.Assert(!arr._Overlaps(mod), "overlapping arguments");
+            int sigDigitN = n;
+            while (sigDigitN > 0 && mod[sigDigitN - 1] == 0) {
+                Debug.Assert(false, "untested code");
+                arr[sigDigitN - 1] = 0;
+                sigDigitN--;
+            }
+            if (sigDigitN == 0) { throw new ArgumentException(); }
+            Digit nlead = mod[sigDigitN - 1];
+            int ntry = 0;
+            do {
+                ntry++;
+                Debug.Assert(ntry <= 100, "too many iterations");
+                Digits.Random(arr, sigDigitN - 1, generator);
+                arr[sigDigitN - 1] = Digit.Random(0, nlead, generator);
+            } while (Digits.Compare(arr, mod, sigDigitN) >= 0);
+        }
+        internal static void
+        NonZeroRandom(Digits mod, Digits arr, int n, Random generator) {
+            if (Digits.Compare(mod, 1U, n) <= 0) {
+                throw new ArgumentException();
+            }
+            int ntry = 0;
+            do {
+                ntry++;
+                Debug.Assert(ntry <= 100, "too many iterations");
+                Random(mod, arr, n, generator);
+            } while (Digits.SigDigitN(arr, n) == 0);
+        }
+    }
+}
diff --git a/base/Libraries/Crypto/Modulus.cs b/base/Libraries/Crypto/Modulus.cs
new file mode 100644
index 0000000..fab6d69
--- /dev/null
+++ b/base/Libraries/Crypto/Modulus.cs
@@ -0,0 +1,324 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    class Modulus {
+        internal readonly int _digitN;
+        readonly int _scaleBitN;
+        readonly bool _fromRight;
+        readonly Reciprocal _leftRecip;
+        readonly Digit _rightRecip;
+        internal readonly Digits _mod;
+        readonly Digits _multiplier1;
+        readonly Digits _multiplier2;
+        internal readonly Digits _one;
+        MulAlgorithm _algorithm;
+        internal Modulus(Digits mod, int digitN, bool fromRight) {
+            if (digitN == 0 || mod[digitN - 1] == 0) {
+                throw new ArgumentException();
+            }
+            _mod = mod;
+            _digitN = digitN;
+            _fromRight = fromRight;
+            _one = new Digits(digitN);
+            _multiplier1 = new Digits(digitN);
+            _multiplier2 = new Digits(digitN);
+            // this.mod.Set(this.mod, _digitN);
+            _leftRecip = new Reciprocal();
+            Digits.DivPrecondition(mod, digitN, _leftRecip);
+            Digit mod0inv = 0;
+            if ((mod[0] & 1) != 0) { mod0inv = Digit.TwoAdicInverse(mod[0]); }
+            _rightRecip = mod0inv;
+            int digitN2 = (digitN + 1) / 2;
+            Digits temp = new Digits(digitN + digitN2);
+            if (!fromRight) {
+                _algorithm = new MulAlgorithm(_MulFromLeft);
+                int dividendN = digitN + digitN2;
+                _scaleBitN = 0;
+                for (int i = 0; i != dividendN; i++) {
+                    temp[i] = Digit.MaxValue;
+                }
+                temp[dividendN - 1] = Digit.MaxValue >> _leftRecip._shiftBitN;
+                Digits q = new Digits(digitN2 + 1);
+                Digits r = new Digits(digitN);
+                Digits.Div(temp, dividendN, mod, digitN, _leftRecip, q, r);
+                Debug.Assert(q[digitN2] == 1, "internal error");
+                Digits.Add(r, 1U, r, digitN);
+                Digits.Sub(mod, r, r, digitN);
+            } else {
+                _algorithm = new MulAlgorithm(_MulFromRight);
+                _scaleBitN = Digit.BitN * digitN;
+                if (mod0inv == 0) { throw new ArgumentException(); }
+                _multiplier2[0] = mod0inv;
+                temp[digitN] = Digits.Mul(mod, mod0inv, temp, digitN);
+                Debug.Assert(temp[0] == 1, "internal error");
+                for (int i = 1; i != digitN2; i++) {
+                    Digit mul = unchecked(0 - mod0inv * temp[i]);
+                    _multiplier2[i] = mul;
+                    temp[i + digitN]
+                  = Digits.Accumulate(mod, mul, temp + i, digitN);
+                    Debug.Assert(temp[i] == 0, "internal error");
+                }
+                _multiplier1._Set(temp + digitN2, digitN);
+            }
+            _ToModular(new Digits(new Digit[] { 1 }), 1, _one);
+        }
+        void _BasePowerSquaring(Digits basepower) {
+            _Mul(basepower, basepower, basepower);
+        }
+        class Temps2000 {
+            internal Modulus _modulus;
+            internal Digits[] _bucket = new Digits[1L << 5];
+            internal bool[] _bucketBusy = new bool[1L << 5];
+        }
+        void _BucketMul(UInt32 ibucket, Digits mult, Temps2000 temps) {
+            Digits bloc = temps._bucket[ibucket];
+            if (temps._bucketBusy[ibucket]) {
+                _Mul(bloc, mult, bloc);
+            } else {
+                temps._bucketBusy[ibucket] = true;
+                bloc._Set(mult, _digitN);
+            }
+        }
+        internal void
+        _Exp(Digits @base, Digits exp, int expDigitN, Digits answer) {
+            int expBitNUsed = Digits.SigBitN(exp, expDigitN);
+            ushort[] widthCutoffs = new ushort[] { 6, 24, 80, 240, 672 };
+            Digits basepower = answer;
+            int bucketWidth = 1;
+            while (
+                bucketWidth < 5 && widthCutoffs[bucketWidth - 1] < expBitNUsed
+            ) {
+                bucketWidth++;
+            }
+            Modular.ValidateData(@base, _mod, _digitN);
+            UInt32 bucketMask = (1U << bucketWidth) - 1;
+            UInt32 maxBucket = bucketMask;
+            Digits bucketData = new Digits((int)(_digitN * maxBucket));
+            Temps2000 temps = new Temps2000();
+            temps._modulus = this;
+            temps._bucket[0] = null;
+            Modular.Add(_one, _one, bucketData, _mod, _digitN);
+            bool base2 = Digits.Compare(@base, bucketData, _digitN) == 0;
+            if (base2 && expBitNUsed != 0) {
+                int shiftMax
+                  = Digit.BitN * _digitN > 1024 ? 1024 : Digit.BitN * _digitN;
+                int highExponBitN = 0;
+                bool bighBitNProcessed = false;
+                Digits temp = bucketData;
+                for (int i = expBitNUsed; i-- != 0; ) {
+                    Digit expBit = Digits.GetBit(exp, i);
+                    if (bighBitNProcessed) {
+                        _Mul(temp, temp, temp);
+                        if (expBit != 0) {
+                            Modular.Add(temp, temp, temp, _mod, _digitN);
+                        }
+                    } else {
+                        highExponBitN = (int)(2 * highExponBitN + expBit);
+                        if (i == 0 || 2 * highExponBitN >= shiftMax) {
+                            bighBitNProcessed = true;
+                            _Shift(_one, highExponBitN, temp);
+                        }
+                    }
+                }
+                temps._bucket[1] = temp;
+                Debug.Assert(bighBitNProcessed, "internal error");
+            } else {
+                UInt32 ibucket;
+                for (ibucket = 1; ibucket <= maxBucket; ibucket++) {
+                    Digits bloc = bucketData
+                                + (int)(_digitN
+                                      * (ibucket
+                                       - 1
+                                       + ((ibucket & 1) == 0 ? maxBucket : 0))
+                                      / 2);
+                    temps._bucket[ibucket] = bloc;
+                    temps._bucketBusy[ibucket] = false;
+                    bloc._Set(_one, _digitN);
+                }
+                basepower._Set(@base, _digitN);
+                Digit carried = 0;
+                int ndoubling = 0;
+                for (int i = 0; i != expBitNUsed; i++) {
+                    Digit bitNow = Digits.GetBit(exp, i);
+                    Debug.Assert(carried >> bucketWidth + 2 == 0
+                               , "internal error");
+                    if (bitNow != 0) {
+                        while (ndoubling >= bucketWidth + 1) {
+                            if ((carried & 1) != 0) {
+                                ibucket = carried & bucketMask;
+                                carried -= ibucket;
+                                temps._modulus
+                               ._BucketMul(ibucket, basepower, temps);
+                            }
+                            temps._modulus._BasePowerSquaring(basepower);
+                            carried /= 2;
+                            ndoubling--;
+                        }
+                        carried |= 1U << ndoubling;
+                    }
+                    ndoubling++;
+                }
+                while (carried != 0) {
+                    bool squareNow = false;
+                    if (carried <= maxBucket) {
+                        ibucket = carried;
+                    } else if ((carried & 1) == 0) {
+                        squareNow = true;
+                    } else if (carried <= 3 * maxBucket) {
+                        ibucket = maxBucket;
+                    } else {
+                        Debug.Assert(false, "untested code");
+                        ibucket = carried & bucketMask;
+                    }
+                    if (squareNow) {
+                        carried /= 2;
+                        temps._modulus._BasePowerSquaring(basepower);
+                    } else {
+                        carried -= ibucket;
+                        temps._modulus._BucketMul(ibucket, basepower, temps);
+                    }
+                }
+                for (ibucket = maxBucket; ibucket >= 2; ibucket--) {
+                    if (temps._bucketBusy[ibucket]) {
+                        bool found = false;
+                        UInt32 jbucket, jbucketMax, kbucket;
+                        Digits bloci;
+                        if ((ibucket & 1) == 0) {
+                            jbucketMax = ibucket / 2;
+                        } else {
+                            jbucketMax = 1;
+                        }
+                        for (
+                            jbucket = ibucket >> 1;
+                            jbucket != ibucket && !found;
+                            jbucket++
+                        ) {
+                            if (temps._bucketBusy[jbucket]) {
+                                jbucketMax = jbucket;
+                                found = temps._bucketBusy[ibucket - jbucket];
+                            }
+                        }
+                        jbucket = jbucketMax;
+                        kbucket = ibucket - jbucket;
+                        bloci = temps._bucket[ibucket];
+                        temps._modulus._BucketMul(jbucket, bloci, temps);
+                        temps._modulus._BucketMul(kbucket, bloci, temps);
+                    }
+                }
+            }
+            answer._Set(temps._bucket[1], _digitN);
+        }
+        void _MulFromLeft(Digits a, Digits b, Digits c) {
+            Digits product = new Digits(2 * _digitN);
+            Digits.Mul(a, _digitN, b, _digitN, product);
+            Digits
+           .Div(product, 2 * _digitN, _mod, _digitN, _leftRecip, null, c);
+        }
+        void _MulFromRight(Digits a, Digits b, Digits c) {
+            Digit minv = _rightRecip
+                , minva0 = unchecked(minv * a[0])
+                , mul1 = b[0]
+                , mul2 = unchecked(minva0 * mul1)
+                , carry1 = Digit2.Hi((UInt64)mul1 * a[0])
+                , carry2 = Digit2.Hi((UInt64)mul2 * _mod[0]);
+            UInt64 prod1, prod2;
+            Debug.Assert(unchecked(mul1 * a[0]) == unchecked(mul2 * _mod[0])
+                       , "internal error");
+            Digits temp1 = new Digits(_digitN), temp2 = new Digits(_digitN);
+            for (int i = 1; i != _digitN; i++) {
+                prod1 = (UInt64)mul1 * a[i] + carry1;
+                prod2 = (UInt64)mul2 * _mod[i] + carry2;
+                temp1[i - 1] = Digit2.Lo(prod1);
+                temp2[i - 1] = Digit2.Lo(prod2);
+                carry1 = Digit2.Hi(prod1);
+                carry2 = Digit2.Hi(prod2);
+            }
+            temp1[_digitN - 1] = carry1;
+            temp2[_digitN - 1] = carry2;
+            for (int j = 1; j != _digitN; j++) {
+                mul1 = b[j];
+                mul2 = unchecked(minva0 * mul1 + minv * (temp1[0] - temp2[0]));
+                prod1 = (UInt64)mul1 * a[0] + temp1[0];
+                prod2 = (UInt64)mul2 * _mod[0] + temp2[0];
+                Debug.Assert(Digit2.Lo(prod1) == Digit2.Lo(prod2)
+                           , "internal error");
+                carry1 = Digit2.Hi(prod1);
+                carry2 = Digit2.Hi(prod2);
+                for (int i = 1; i != _digitN; i++) {
+                    prod1 = (UInt64)mul1 * a[i] + temp1[i] + carry1;
+                    prod2 = (UInt64)mul2 * _mod[i] + temp2[i] + carry2;
+                    temp1[i - 1] = Digit2.Lo(prod1);
+                    temp2[i - 1] = Digit2.Lo(prod2);
+                    carry1 = Digit2.Hi(prod1);
+                    carry2 = Digit2.Hi(prod2);
+                }
+                temp1[_digitN - 1] = carry1;
+                temp2[_digitN - 1] = carry2;
+            }
+            Modular.Sub(temp1, temp2, c, _mod, _digitN);
+        }
+        internal void _FromModular(Digits a, Digits b) {
+            Modular.ValidateData(a, _mod, _digitN);
+            _Shift(a, -_scaleBitN, b);
+        }
+        internal void _Mul(Digits a, Digits b, Digits c) {
+            Modular.ValidateData(a, _mod, _digitN);
+            if (a != b) { Modular.ValidateData(b, _mod, _digitN); }
+            _algorithm(a, b, c);
+        }
+        void _Shift(Digits a, int n, Digits b) {
+            if (a != b) { b._Set(a, _digitN); }
+            Modular.ValidateData(a, _mod, _digitN);
+            if (n < 0 && (_mod[0] & 1) == 0) { throw new ArgumentException(); }
+            while (n > 0) {
+                int shiftNow = n > Digit.BitN ? Digit.BitN : n;
+                Digit carryOut = Digits.ShiftLost(b, shiftNow, b, _digitN)
+                    , qest = _leftRecip
+                            .EstQuotient(carryOut
+                                       , b[_digitN - 1]
+                                       , _digitN >= 2 ? b[_digitN - 2] : 0);
+                carryOut -= Digits.Decumulate(_mod, qest, b, _digitN);
+                if (carryOut != 0 || Digits.Compare(b, _mod, _digitN) >= 0) {
+                    carryOut -= Digits.Sub(b, _mod, b, _digitN);
+                }
+                Debug.Assert(carryOut == 0, "internal error");
+                n -= shiftNow;
+            }
+            while (n < 0) {
+                int shiftNow = -n > Digit.BitN ? Digit.BitN : -n;
+                Digit mul = unchecked(0 - _rightRecip * b[0])
+                          & Digit.MaxValue >> Digit.BitN - shiftNow
+                    , carry = Digits.Accumulate(_mod, mul, b, _digitN)
+                    , lowBitNLost = Digits.ShiftLost(b, -shiftNow, b, _digitN);
+                b[_digitN - 1] |= carry << Digit.BitN - shiftNow;
+                Debug.Assert(lowBitNLost == 0, "internal error");
+                n += shiftNow;
+            }
+        }
+        internal void _ToModular(Digits a, int aDigitN, Digits b) {
+            Digits aR;
+            int aRDigitN;
+            if (Digits.Compare(a, aDigitN, _mod, _digitN) >= 0) {
+                aR = new Digits(_digitN);
+                Digits.Div(a, aDigitN, _mod, _digitN, _leftRecip, null, aR);
+                aRDigitN = _digitN;
+            } else {
+                aR = a;
+                aRDigitN = aDigitN;
+            }
+            aRDigitN = Digits.SigDigitN(aR, aRDigitN);
+            Digits.Set(aR, aRDigitN, b, _digitN);
+            _Shift(b, _scaleBitN, b);
+        }
+        delegate void MulAlgorithm(Digits arg0, Digits arg1, Digits arg2);
+    }
+}
diff --git a/base/Libraries/Crypto/Prime.cs b/base/Libraries/Crypto/Prime.cs
new file mode 100644
index 0000000..b4e8c8d
--- /dev/null
+++ b/base/Libraries/Crypto/Prime.cs
@@ -0,0 +1,98 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    class Prime {
+        const uint _RabinTestN = 50;
+        const uint _IterationsAllowed = 5000;
+        internal static Digits NewPrime(int pBitN, Random generator) {
+            if (pBitN < Digit.BitN) { throw new ArgumentException(); }
+            int pDigitN = (pBitN + (Digit.BitN - 1)) / Digit.BitN;
+            Digits p = new Digits(pDigitN);
+            while (true) {
+                for (
+                    int iteration = 0;
+                    iteration < _IterationsAllowed;
+                    iteration++
+                ) {
+                    Digits.Random(p, pDigitN, generator);
+                    p[pDigitN - 1] >>= Digit.BitN * pDigitN - pBitN;
+                    p[0] |= 1;
+                    Digits.SetBit(p, pBitN - 1, 1);
+                    Digits.SetBit(p, pBitN - 2, 1);
+                    if (DivisibleBySomeLowPrime(p, pDigitN)) { continue; }
+                    Modulus modulus = new Modulus(p, pDigitN, true);
+                    Digits minus1 = new Digits(pDigitN);
+                    Modular
+                   .Neg(modulus._one, minus1, modulus._mod, modulus._digitN);
+                    Digits exp = new Digits(pDigitN);
+                    Digits.Shift(p, -1, exp, pDigitN);
+                    Digits @base = new Digits(pDigitN);
+                    for (int i = 1; i <= _RabinTestN; i++) {
+                        if (i == 1) {
+                            Modular.Add(modulus._one
+                                      , modulus._one
+                                      , @base
+                                      , modulus._mod
+                                      , modulus._digitN);
+                        } else {
+                            Modular.NonZeroRandom(
+                                p, @base, pDigitN, generator);
+                        }
+                        Digits result = new Digits(pDigitN);
+                        modulus._Exp(@base, exp, pDigitN, result);
+                        if (Digits.Compare(result, minus1, pDigitN) == 0) {
+                            return p;
+                        }
+                        if (
+                            Digits.Compare(result, modulus._one, pDigitN) != 0
+                        ) {
+                            break;
+                        }
+                    }
+                }
+                Debug.Assert(false, "too many iterations");
+            }
+        }
+        static Digit[]
+            LowPrimesProduct
+          = new Digit[] {
+                4240068105U, 3842999413U, 3059475739U, 4294251953U, 4294770617U
+              , 4294737533U, 4293835597U, 4294901213U, 4294933861U, 1353041857U
+              , 4148193053U, 4286755457U, 4291682933U, 4294875479U
+              , 4294914791U, 4294097393U, 4289642801U, 4280410741U
+              , 4294824337U, 4294927237U, 4294924747U, 4294928843U
+            };
+        internal static bool DivisibleBySomeLowPrime(Digits digits, int n) {
+            if (n == 0 || (digits[0] & 1) == 0) {
+                Debug.Assert(false, "untested code");
+                return true;
+            }
+            for (int l = 0; l != LowPrimesProduct.Length; l++) {
+                Digit product = LowPrimesProduct[l]
+                    , productInverse = Digit.TwoAdicInverse(product)
+                    , r = 0;
+                for (int i = 0; i != n; i++) {
+                    Digit mulby;
+                    unchecked {
+                        r += digits[i];
+                        if (r < digits[i]) { r -= product; }
+                        mulby = productInverse * r;
+                        Debug.Assert(mulby * product == r, "internal error");
+                    }
+                    r = product - Digit2.Hi((UInt64)mulby * product);
+                }
+                if (Digit.OddGcd(r, product) != 1) { return true; }
+            }
+            return false;
+        }
+    }
+}
diff --git a/base/Libraries/Crypto/Random.cs b/base/Libraries/Crypto/Random.cs
new file mode 100644
index 0000000..6038ddb
--- /dev/null
+++ b/base/Libraries/Crypto/Random.cs
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace Microsoft.Singularity.Crypto.PublicKey {
+    public class Random {
+        uint[] _state;
+        const int _N = 8;
+        void _Mix() {
+            uint[] square = new uint[_N];
+            ulong carry = 0;
+            for (int n = 0; n < _N; n++) {
+                ulong t = carry;
+                carry = 0;
+                for (int i = 0; i <= n; i++) {
+                    int j = n - i;
+                    t += (ulong)_state[i] * _state[j];
+                    carry += t >> 32;
+                    t = unchecked((uint)t);
+                }
+                square[n] = (uint)t;
+                carry += t >> 32;
+            }
+            square[0] |= 5;
+            carry = 0;
+            for (int i = 0; i < _N; i++) {
+                ulong t = carry + _state[i] + square[i];
+                _state[i] = unchecked((uint)t);
+                carry = t >> 32;
+            }
+        }
+        public uint Next() { _Mix(); return _state[_N - 1]; }
+        public uint Next(uint n) {
+            if (n <= 0) { throw new ArgumentException(); }
+            uint mask = 1;
+            while (mask < n - 1) { mask = mask << 1 | 1; }
+            while (true) {
+                uint next = Next() & mask;
+                if (next < n) { return next; }
+            }
+        }
+        public uint Next(uint lo, uint hi) {
+            if (lo >= hi) { throw new ArgumentException(); }
+            return lo + Next(hi - lo);
+        }
+        public Random(uint n) {
+            _state = new uint[_N];
+            for (int i = 0; i < _N; i++) {
+                _state[i] = n;
+            }
+        }
+        public Random() : this(250787849) {
+            // John DeTreville's Social Security Number
+        }
+    }
+}
diff --git a/base/Libraries/DirectoryService.AclUtils/DirectoryService.AclUtils.csproj b/base/Libraries/DirectoryService.AclUtils/DirectoryService.AclUtils.csproj
new file mode 100644
index 0000000..1d30068
--- /dev/null
+++ b/base/Libraries/DirectoryService.AclUtils/DirectoryService.AclUtils.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\DirectoryServices.AclUtils\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>DirectoryServices.AclUtils</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+  </ItemGroup>  
+  
+  <ItemGroup>
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Directory\SdsUtilsAcl.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Libraries/DirectoryService.Utils/DirectoryService.Utils.csproj b/base/Libraries/DirectoryService.Utils/DirectoryService.Utils.csproj
new file mode 100644
index 0000000..5346591
--- /dev/null
+++ b/base/Libraries/DirectoryService.Utils/DirectoryService.Utils.csproj
@@ -0,0 +1,30 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\DirectoryServices.Utils\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>DirectoryService.Utils</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity.Directory\SdsUtils.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Libraries/Drivers.Net/ByteOrder.cs b/base/Libraries/Drivers.Net/ByteOrder.cs
new file mode 100644
index 0000000..18c1891
--- /dev/null
+++ b/base/Libraries/Drivers.Net/ByteOrder.cs
@@ -0,0 +1,310 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Netstack / Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ByteOrder.cs
+//
+//  Note:   Provides endian conversion routines.  Requires LITTLE_ENDIAN or
+//          BIG_ENDIAN to be defined.
+//
+
+using System;
+
+#if !SINGULARITY
+namespace Drivers.Net
+{
+    [ CLSCompliant(false) ]
+    public sealed class ByteOrder
+    {
+        private ByteOrder()
+        {
+        }
+
+        static public short Swap(short value)
+        {
+            return (short)((value << 8) | ((value >> 8) & 0xff));
+        }
+
+        static public ushort Swap(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int Swap(int value)
+        {
+            return
+                ((value >> 24) & 0x000000ff) | ((value >>  8) & 0x0000ff00) |
+                ((value <<  8) & 0x00ff0000) | ((value << 24));
+        }
+
+        static public uint Swap(uint value)
+        {
+            return
+                ((value >> 24) & 0x000000ffu) | ((value >>  8) & 0x0000ff00u) |
+                ((value <<  8) & 0x00ff0000u) | ((value << 24));
+        }
+
+        static public long Swap(long value)
+        {
+            return ((long)(Swap((int)(value))) << 32) + (long)Swap((int)(value >> 32));
+        }
+
+        static public ulong Swap(ulong value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+#if BIG_ENDIAN
+        static public short  HostToBigEndian(short  value)
+        {
+            return value;
+        }
+
+        static public int    HostToBigEndian(int    value)
+        {
+            return value;
+        }
+
+        static public long   HostToBigEndian(long   value)
+        {
+            return value;
+        }
+
+        static public ushort HostToBigEndian(ushort value)
+        {
+            return value;
+        }
+
+        static public uint   HostToBigEndian(uint   value)
+        {
+            return value;
+        }
+
+        static public ulong  HostToBigEndian(ulong  value)
+        {
+            return value;
+        }
+
+        static public short  BigEndianToHost(short  value)
+        {
+            return value;
+        }
+
+        static public ushort BigEndianToHost(ushort value)
+        {
+            return value;
+        }
+
+        static public int    BigEndianToHost(int    value)
+        {
+            return value;
+        }
+
+        static public uint   BigEndianToHost(uint   value)
+        {
+            return value;
+        }
+
+        static public long   BigEndianToHost(long   value)
+        {
+            return value;
+        }
+
+        static public ulong  BigEndianToHost(ulong  value)
+        {
+            return value;
+        }
+
+
+        static public short  HostToLittleEndian(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort HostToLittleEndian(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    HostToLittleEndian(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   HostToLittleEndian(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   HostToLittleEndian(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  HostToLittleEndian(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+        static public short  LittleEndianToHost(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort LittleEndianToHost(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    LittleEndianToHost(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   LittleEndianToHost(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   LittleEndianToHost(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  LittleEndianToHost(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+#elif LITTLE_ENDIAN
+        static public short  HostToLittleEndian(short  value)
+        {
+            return value;
+        }
+
+        static public int    HostToLittleEndian(int    value)
+        {
+            return value;
+        }
+
+        static public long   HostToLittleEndian(long   value)
+        {
+            return value;
+        }
+
+        static public ushort HostToLittleEndian(ushort value)
+        {
+            return value;
+        }
+
+        static public uint   HostToLittleEndian(uint   value)
+        {
+            return value;
+        }
+
+        static public ulong  HostToLittleEndian(ulong  value)
+        {
+            return value;
+        }
+
+        static public short  LittleEndianToHost(short  value)
+        {
+            return value;
+        }
+
+        static public ushort LittleEndianToHost(ushort value)
+        {
+            return value;
+        }
+
+        static public int    LittleEndianToHost(int    value)
+        {
+            return value;
+        }
+
+        static public uint   LittleEndianToHost(uint   value)
+        {
+            return value;
+        }
+
+        static public long   LittleEndianToHost(long   value)
+        {
+            return value;
+        }
+
+        static public ulong  LittleEndianToHost(ulong  value)
+        {
+            return value;
+        }
+
+
+        static public short  HostToBigEndian(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort HostToBigEndian(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    HostToBigEndian(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   HostToBigEndian(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   HostToBigEndian(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  HostToBigEndian(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+        static public short  BigEndianToHost(short  value)
+        {
+            return Swap(value);
+        }
+
+        static public ushort BigEndianToHost(ushort value)
+        {
+            return (ushort)Swap((short)value);
+        }
+
+        static public int    BigEndianToHost(int    value)
+        {
+            return Swap(value);
+        }
+
+        static public uint   BigEndianToHost(uint   value)
+        {
+            return (uint)Swap((int)value);
+        }
+
+        static public long   BigEndianToHost(long   value)
+        {
+            return Swap(value);
+        }
+
+        static public ulong  BigEndianToHost(ulong  value)
+        {
+            return (ulong)Swap((long)value);
+        }
+
+
+#else
+#error "Endian conversion routines expect BIG_ENDIAN or LITTLE_ENDIAN to be defined"
+#endif // LITTLE_ENDIAN
+    } // ByteOrder
+} // namespace Drivers.Net
+#endif // SINGULARITY
+
diff --git a/base/Libraries/Drivers.Net/Drivers.Net.csproj b/base/Libraries/Drivers.Net/Drivers.Net.csproj
new file mode 100644
index 0000000..9adc560
--- /dev/null
+++ b/base/Libraries/Drivers.Net/Drivers.Net.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Drivers.Net\Drivers.Net.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Drivers.Net</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ByteOrder.cs" />
+    <Compile Include="EthernetAddress.cs" />
+    <Compile Include="NetworkBitConverter.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Drivers.Net/EthernetAddress.cs b/base/Libraries/Drivers.Net/EthernetAddress.cs
new file mode 100644
index 0000000..0a21170
--- /dev/null
+++ b/base/Libraries/Drivers.Net/EthernetAddress.cs
@@ -0,0 +1,335 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EthernetAddress.cs
+//
+//
+
+using System;
+
+namespace Drivers.Net
+{
+    /// <summary>
+    /// Structure representing an Ethernet address.
+    /// </summary>
+    public struct EthernetAddress : IComparable
+    {
+        /// <summary>
+        /// Length of an Ethernet address in bytes.
+        /// </summary>
+        public const int Length = 6;
+
+        private uint    u03;    // bytes 0-3
+        private ushort  u45;    // bytes 4-5
+
+        /// <summary>
+        /// Ethernet broadcast address.
+        /// </summary>
+        public static readonly EthernetAddress Broadcast =
+            new EthernetAddress(0xff, 0xff, 0xff, 0xff, 0xff, 0xff);
+
+        /// <summary>
+        /// The all-zeros address.
+        /// </summary>
+        public static readonly EthernetAddress Zero =
+            new EthernetAddress(0, 0, 0, 0, 0, 0);
+
+        /// <summary>
+        /// Bridge Group Address.
+        ///  Reserved by IEEE 802.1D, Table 7-9, 1998 Edition:
+        /// ...-00 is the Bridge Group Address, used for Spanning Tree Protocol
+        /// </summary>
+        public static readonly EthernetAddress Bridge =
+            new EthernetAddress(0x01, 0x80, 0xC2, 0x00, 0x00, 0x00);
+
+        /// <summary>
+        /// Full Duplex PAUSE operation address.
+        /// </summary>
+        public static readonly EthernetAddress PAUSE =
+            new EthernetAddress(0x01, 0x80, 0xC2, 0x00, 0x00, 0x01);
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="pa0">Most significant byte</param>
+        /// <param name="pa1">Second most significant byte</param>
+        /// <param name="pa2"></param>
+        /// <param name="pa3"></param>
+        /// <param name="pa4"></param>
+        /// <param name="pa5">Least significant byte</param>
+        public EthernetAddress(byte pa0, byte pa1, byte pa2,
+                               byte pa3, byte pa4, byte pa5)
+        {
+            u03  = ((uint)pa0) << 24;
+            u03 |= ((uint)pa1) << 16;
+            u03 |= ((uint)pa2) << 8;
+            u03 |= ((uint)pa3);
+            u45  = (ushort)((int)pa4 << 8);
+            u45 |= (ushort)pa5;
+        }
+
+        public EthernetAddress(byte [] addressBytes)
+        {
+            if (addressBytes == null)
+            {
+                throw new ArgumentNullException();
+            }
+            if (addressBytes.Length != Length)
+            {
+                throw new ArgumentException();
+            }
+            u03  = ((uint)addressBytes[0]) << 24;
+            u03 |= ((uint)addressBytes[1]) << 16;
+            u03 |= ((uint)addressBytes[2]) << 8;
+            u03 |= ((uint)addressBytes[3]);
+            u45  = (ushort)((int)addressBytes[4] << 8);
+            u45 |= (ushort)addressBytes[5];
+        }
+
+        private EthernetAddress(uint u03, ushort u45)
+        {
+            this.u03 = u03;
+            this.u45 = u45;
+        }
+
+        public EthernetAddress(EthernetAddress other)
+        {
+            this.u03 = other.u03;
+            this.u45 = other.u45;
+        }
+
+        public static bool operator < (EthernetAddress lhs,
+                                       EthernetAddress rhs)
+        {
+            if (lhs.u03 != rhs.u03)
+                return lhs.u03 < rhs.u03;
+            return lhs.u45 < rhs.u45;
+        }
+
+        public static bool operator <= (EthernetAddress lhs,
+                                        EthernetAddress rhs)
+        {
+            if (lhs.u03 > rhs.u03)
+                return false;
+            return lhs.u45 <= rhs.u45;
+        }
+
+        public static bool operator > (EthernetAddress lhs,
+                                       EthernetAddress rhs)
+        {
+            if (lhs.u03 != rhs.u03)
+                return lhs.u03 > rhs.u03;
+            return lhs.u45 > rhs.u45;
+        }
+
+        public static bool operator >= (EthernetAddress lhs,
+                                        EthernetAddress rhs)
+        {
+            if (lhs.u03 < rhs.u03)
+                return false;
+            return lhs.u45 >= rhs.u45;
+        }
+
+        public static bool operator == (EthernetAddress lhs,
+                                        EthernetAddress rhs)
+        {
+            return (lhs.u03 == rhs.u03) && (lhs.u45 == rhs.u45);
+        }
+
+        public static bool operator != (EthernetAddress lhs,
+                                        EthernetAddress rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public static EthernetAddress operator & (EthernetAddress lhs,
+                                                  EthernetAddress rhs)
+        {
+            return new EthernetAddress(lhs.u03 & rhs.u03,
+                                       (ushort) (lhs.u45 & rhs.u45));
+        }
+
+        public static EthernetAddress operator | (EthernetAddress lhs,
+                                                  EthernetAddress rhs)
+        {
+            return new EthernetAddress(lhs.u03 | rhs.u03,
+                                       (ushort) (lhs.u45 | rhs.u45));
+        }
+
+        public static EthernetAddress operator ^ (EthernetAddress lhs,
+                                                  EthernetAddress rhs)
+        {
+            return new EthernetAddress(lhs.u03 ^ rhs.u03,
+                                       (ushort) (lhs.u45 ^ rhs.u45));
+        }
+
+        public static EthernetAddress operator ~ (EthernetAddress ea)
+        {
+            return new EthernetAddress(~ea.u03, (ushort) (~ea.u45));
+        }
+
+        public static EthernetAddress operator ++ (EthernetAddress ea)
+        {
+            ushort u45 = (ushort) (ea.u45 + 1);
+            if (u45 > ea.u45)
+                return new EthernetAddress(ea.u03, u45);
+            uint u03 = ea.u03 + 1;
+            return new EthernetAddress(u03, u45);
+        }
+
+        public static EthernetAddress operator -- (EthernetAddress ea)
+        {
+            ushort u45 = (ushort) (ea.u45 - 1);
+            if (u45 < ea.u45)
+                return new EthernetAddress(ea.u03, u45);
+            uint u03 = ea.u03 - 1;
+            return new EthernetAddress(u03, u45);
+        }
+
+        public override bool Equals(object o)
+        {
+            if (o is EthernetAddress)
+            {
+                return this == (EthernetAddress) o;
+            }
+            return false;
+        }
+
+        public byte[]! GetAddressBytes()
+        {
+            return new byte[6] {
+                (byte)(u03 >> 24), (byte)(u03 >> 16), (byte)(u03 >>  8),
+                (byte)(u03),       (byte)(u45 >>  8), (byte)(u45)
+            };
+        }
+
+        public override int GetHashCode()
+        {
+            return (int)u03 ^ (int)u45;
+        }
+
+        public override string! ToString()
+        {
+            return String.Format("{0:x2}:{1:x2}:{2:x2}:{3:x2}:{4:x2}:{5:x2}",
+                                 (byte)(u03 >> 24), (byte)(u03 >> 16),
+                                 (byte)(u03 >>  8), (byte)(u03),
+                                 (byte)(u45 >>  8), (byte)(u45));
+        }
+
+        // returns the address with custom separator, so it can
+        // be used as a filename.
+        public string ToString(string separator)
+        {
+            return String.Format("{0:x2}{6}{1:x2}{6}{2:x2}{6}" +
+                                 "{3:x2}{6}{4:x2}{6}{5:x2}",
+                                 (byte)(u03 >> 24), (byte)(u03 >> 16),
+                                 (byte)(u03 >>  8), (byte)(u03),
+                                 (byte)(u45 >>  8), (byte)(u45),
+                                 separator);
+        }
+
+        // accepts either aa:bb:cc:dd:ee:ff (widely used) or
+        // aa-bb-cc-dd-ee-ff (IEEE) formats
+        public static EthernetAddress Parse(string raw)
+        {
+            const string hexdigits = "00112233445566778899aAbBcCdDeEfF";
+            char [] separators = {'-', ':'};
+
+            if (raw == null)
+                throw new ArgumentNullException();
+
+            byte [] b = new byte[6];
+            string [] tokens = raw.Split(separators);
+            if (tokens.Length != 6)
+                throw new FormatException();
+
+            for (int i = 0; i < 6; i++)
+            {
+                string ti = (!)tokens[i];
+                if (ti.Length != 2)
+                    throw new FormatException();
+
+                int u = hexdigits.IndexOf(ti[0]);
+                int l = hexdigits.IndexOf(ti[1]);
+
+                if ((u < 0) || (l < 0))
+                    throw new FormatException();
+                // Note there are 32 digits in hexdigits so we divide by 2
+                u >>= 1;
+                l >>= 1;
+
+                b[i] = (byte)(((u << 4) & 0xf0) | l);
+            }
+
+            return new EthernetAddress(b);
+        }
+
+        /// <summary>
+        /// Converts an string into an EthernetAddress instance.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if
+        /// <c>macString</c> is null.</exception>
+        /// <returns> <c>true</c> on success, <c>false</c> on failure.</returns>
+        public static bool Parse(string macString, out EthernetAddress address)
+        {
+            try
+            {
+                address = Parse(macString);
+            }
+            catch (FormatException)
+            {
+                address = EthernetAddress.Zero;
+                return false;
+            }
+            return true;
+        }
+
+        public static EthernetAddress ParseBytes(byte[] data, int offset)
+        {
+            if (data == null)
+            {
+                throw new ArgumentNullException();
+            }
+            if (data.Length - offset < Length)
+            {
+                throw new ArgumentException("Byte array too short.");
+            }
+            return new EthernetAddress(data[offset], data[offset + 1],
+                                       data[offset + 2], data[offset + 3],
+                                       data[offset + 4], data[offset + 5]);
+        }
+
+        public static EthernetAddress ParseBytes(byte[] data)
+        {
+            return new EthernetAddress(data);
+        }
+
+        public int CopyOut(byte []! buffer, int outputOffset)
+        {
+            buffer[outputOffset + 0] = (byte)(u03 >> 24);
+            buffer[outputOffset + 1] = (byte)(u03 >> 16);
+            buffer[outputOffset + 2] = (byte)(u03 >>  8);
+            buffer[outputOffset + 3] = (byte)(u03);
+            buffer[outputOffset + 4] = (byte)(u45 >>  8);
+            buffer[outputOffset + 5] = (byte)(u45);
+            return Length;
+        }
+
+        public int CompareTo(object other)
+        {
+            if (other == null)
+                return 1;
+            if (other is EthernetAddress)
+            {
+                EthernetAddress value = (EthernetAddress) other;
+                if (this < value) return -1;
+                if (this > value) return +1;
+                return 0;
+            }
+            throw new ArgumentException ("Arg_MustBeEthernetAddress");
+        }
+    }
+} // namespace Drivers.Net
diff --git a/base/Libraries/Drivers.Net/NetworkBitConverter.cs b/base/Libraries/Drivers.Net/NetworkBitConverter.cs
new file mode 100644
index 0000000..690ae25
--- /dev/null
+++ b/base/Libraries/Drivers.Net/NetworkBitConverter.cs
@@ -0,0 +1,260 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: NetworkBitConverter.cs
+//
+
+using System;
+
+#if SINGULARITY
+using Microsoft.Singularity.Io;
+#endif
+
+namespace Drivers.Net
+{
+    /// <summary>
+    /// Converts host ordered integer base types to network
+    /// ordered array of bytes, and vice-versa.
+    /// </summary>
+    public sealed class NetworkBitConverter
+    {
+        /// <returns>
+        /// Returns a host-order 16-bit signed integer converted from
+        /// two bytes in a byte array.
+        /// </returns>
+        public static short ToInt16(byte[] value, int startIndex)
+        {
+            return ByteOrder.BigEndianToHost(
+                BitConverter.ToInt16(value, startIndex)
+                );
+        }
+
+        /// <returns>
+        /// Returns a host-order 16-bit unsigned integer converted from
+        /// two bytes in a byte array.
+        /// </returns>
+        public static ushort ToUInt16(byte[] value, int startIndex)
+        {
+            return ByteOrder.BigEndianToHost(
+                BitConverter.ToUInt16(value, startIndex)
+                );
+        }
+
+        /// <returns>
+        /// Returns a host-order 32-bit signed integer converted from
+        /// two bytes in a byte array.
+        /// </returns>
+        public static int ToInt32(byte[] value, int startIndex)
+        {
+            return ByteOrder.BigEndianToHost(
+                BitConverter.ToInt32(value, startIndex)
+                );
+        }
+
+        /// <returns>
+        /// Returns a host-order 32-bit unsigned integer converted from
+        /// two bytes in a byte array.
+        /// </returns>
+        public static uint ToUInt32(byte[] value, int startIndex)
+        {
+            return ByteOrder.BigEndianToHost(
+                BitConverter.ToUInt32(value, startIndex)
+                );
+        }
+
+        /// <returns>
+        /// Returns a host-order 64-bit signed integer converted from
+        /// two bytes in a byte array.
+        /// </returns>
+        public static long ToInt64(byte[] value, int startIndex)
+        {
+            return ByteOrder.BigEndianToHost(
+                BitConverter.ToInt64(value, startIndex)
+                );
+        }
+
+        /// <returns>
+        /// Returns a host-order 64-bit unsigned integer converted from
+        /// two bytes in a byte array.
+        /// </returns>
+        public static ulong ToUInt64(byte[] value, int startIndex)
+        {
+            return ByteOrder.BigEndianToHost(
+                BitConverter.ToUInt64(value, startIndex)
+                );
+        }
+
+        /// <returns>
+        /// Returns network ordered bytes representing 16-bit signed integer.
+        /// </returns>
+        public static byte[] GetBytes(short value)
+        {
+            return BitConverter.GetBytes(
+                ByteOrder.HostToBigEndian(value)
+                );
+        }
+
+        /// <returns>
+        /// Returns network ordered bytes representing 16-bit unsigned integer.
+        /// </returns>
+        public static byte[] GetBytes(ushort value)
+        {
+            return BitConverter.GetBytes(
+                ByteOrder.HostToBigEndian(value)
+                );
+        }
+
+        /// <returns>
+        /// Returns network ordered bytes representing 32-bit signed integer.
+        /// </returns>
+        public static byte[] GetBytes(int value)
+        {
+            return BitConverter.GetBytes(
+                ByteOrder.HostToBigEndian(value)
+                );
+        }
+
+        /// <returns>
+        /// Returns network ordered bytes representing 32-bit unsigned integer.
+        /// </returns>
+        public static byte[] GetBytes(uint value)
+        {
+            return BitConverter.GetBytes(
+                ByteOrder.HostToBigEndian(value)
+                );
+        }
+
+        /// <returns>
+        /// Returns network ordered bytes representing 64-bit signed integer.
+        /// </returns>
+        public static byte[] GetBytes(long value)
+        {
+            return BitConverter.GetBytes(
+                ByteOrder.HostToBigEndian(value)
+                );
+        }
+
+        /// <returns>
+        /// Returns network ordered bytes representing 64-bit unsigned integer.
+        /// </returns>
+        public static byte[] GetBytes(ulong value)
+        {
+            return BitConverter.GetBytes(
+                ByteOrder.HostToBigEndian(value)
+                );
+        }
+
+        /// <summary>
+        /// Convert a host-ordered 16-bit signed integer into network order
+        /// and place result in a byte array.
+        /// <param name = "value"> Value to be placed into byte array.</param>
+        /// <param name = "dstBuffer"> Byte array to receive value.</param>
+        /// <param name = "dstOffset"> Offset in buffer to place value.
+        /// </param>
+        /// </summary>
+        public static int PutBytes(short   value,
+                                   byte[]! dstBuffer,
+                                   int     dstOffset)
+        {
+            dstBuffer[dstOffset]     = (byte) (value >> 8);
+            dstBuffer[dstOffset + 1] = (byte) value;
+            return 2;
+        }
+
+        /// <summary>
+        /// Convert a host-ordered 16-bit unsigned integer into network order
+        /// and place result in a byte array.
+        /// <param name = "value"> Value to be placed into byte array.</param>
+        /// <param name = "dstBuffer"> Byte array to receive value.</param>
+        /// <param name = "dstOffset"> Offset in buffer to place value.
+        /// </param>
+        /// </summary>
+        public static int PutBytes(ushort   value,
+                                   byte[]!  dstBuffer,
+                                   int      dstOffset)
+        {
+            dstBuffer[dstOffset]     = (byte) (value >> 8);
+            dstBuffer[dstOffset + 1] = (byte) value;
+            return 2;
+        }
+
+        /// <summary>
+        /// Convert a host-ordered 32-bit signed integer into network order
+        /// and place result in a byte array.
+        /// <param name = "value"> Value to be placed into byte array.</param>
+        /// <param name = "dstBuffer"> Byte array to receive value.</param>
+        /// <param name = "dstOffset"> Offset in buffer to place value.
+        /// </param>
+        /// </summary>
+        public static int PutBytes(int     value,
+                                   byte[]! dstBuffer,
+                                   int     dstOffset)
+        {
+            dstBuffer[dstOffset]     = (byte) (value >> 24);
+            dstBuffer[dstOffset + 1] = (byte) (value >> 16);
+            dstBuffer[dstOffset + 2] = (byte) (value >> 8);
+            dstBuffer[dstOffset + 3] = (byte) (value);
+            return 4;
+        }
+
+        /// <summary>
+        /// Convert a host-ordered 32-bit unsigned integer into network order
+        /// and place result in a byte array.
+        /// <param name = "value"> Value to be placed into byte array.</param>
+        /// <param name = "dstBuffer"> Byte array to receive value.</param>
+        /// <param name = "dstOffset"> Offset in buffer to place value.
+        /// </param>
+        /// </summary>
+        public static int PutBytes(uint    value,
+                                   byte[]! dstBuffer,
+                                   int     dstOffset)
+        {
+            dstBuffer[dstOffset]     = (byte) (value >> 24);
+            dstBuffer[dstOffset + 1] = (byte) (value >> 16);
+            dstBuffer[dstOffset + 2] = (byte) (value >> 8);
+            dstBuffer[dstOffset + 3] = (byte) (value);
+            return 4;
+        }
+
+        /// <summary>
+        /// Convert a host-ordered 64-bit signed integer into network order
+        /// and place result in a byte array.
+        /// <param name = "value"> Value to be placed into byte array.</param>
+        /// <param name = "dstBuffer"> Byte array to receive value.</param>
+        /// <param name = "dstOffset"> Offset in buffer to place value.
+        /// </param>
+        /// </summary>
+        public static int PutBytes(long    value,
+                                   byte[]! dstBuffer,
+                                   int     dstOffset)
+        {
+            PutBytes((int) (value >> 32), dstBuffer, dstOffset);
+            PutBytes((uint) (value), dstBuffer, dstOffset + 4);
+            return 8;
+        }
+
+        /// <summary>
+        /// Convert a host-ordered 64-bit unsigned integer into network order
+        /// and place result in a byte array.
+        /// <param name = "value"> Value to be placed into byte array.</param>
+        /// <param name = "dstBuffer"> Byte array to receive value.</param>
+        /// <param name = "dstOffset"> Offset in buffer to place value.
+        /// </param>
+        /// </summary>
+        public static int PutBytes(ulong   value,
+                                   byte[]! dstBuffer,
+                                   int     dstOffset)
+        {
+            PutBytes((uint) (value >> 32), dstBuffer, dstOffset);
+            PutBytes((uint) (value), dstBuffer, dstOffset + 4);
+            return 8;
+        }
+
+        private NetworkBitConverter()
+        {
+        }
+    }
+} // namespace Drivers.Net
diff --git a/base/Libraries/FileSystem.Utils/DirectoryUtils.sg b/base/Libraries/FileSystem.Utils/DirectoryUtils.sg
new file mode 100644
index 0000000..180e9a7
--- /dev/null
+++ b/base/Libraries/FileSystem.Utils/DirectoryUtils.sg
@@ -0,0 +1,202 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryUtils.sg
+//
+//  Note:
+//
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+namespace FileSystem.Utils
+{
+    public class DirectoryUtils
+    {
+        // Find the directory that encloses the named file/dir
+        internal static DirectoryServiceContract.Imp:Ready FindDir(string! path)
+        {
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+            try {
+                return FindDir(path, rootNS); 
+            }
+            finally {
+                delete rootNS; 
+            }
+        }
+
+        // Find the directory that encloses the named file/dir
+        internal static DirectoryServiceContract.Imp:Ready FindDir(string! path,  DirectoryServiceContract.Imp! ds)
+        {
+            string dirPath, leafName;
+            PathUtils.SplitPath(path, out dirPath, out leafName);
+
+            if ((dirPath == null) || (dirPath == ""))
+            {
+                // Invalid path; no leading directory component
+                return null;
+            }
+
+            // Ask for just the enclosing directory
+            return OpenDir(dirPath, ds);
+        }
+
+        public static DirectoryServiceContract.Imp:Ready OpenDir(string! dirPath)
+        {
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                return OpenDir(dirPath, rootNS);
+            }
+            finally {
+                delete rootNS;
+            }
+        }
+
+        public static DirectoryServiceContract.Imp:Ready OpenDir(string! dirPath, DirectoryServiceContract.Imp! rootNS)
+        {
+            DirectoryServiceContract.Imp! dirClient;
+            DirectoryServiceContract.Exp! dirServer;
+            DirectoryServiceContract.NewChannel(out dirClient, out dirServer);
+
+            ErrorCode errorOut; 
+            bool ok = SdsUtils.Bind(dirPath, rootNS, dirServer, out errorOut);
+            if (!ok) {
+                delete dirClient; 
+                return null;
+            } 
+            else {
+                dirClient.RecvSuccess();
+                return dirClient;
+            }
+        }
+
+        // 0 is success
+        public static int DeleteDirectory (string! dirPath)
+        {
+            string dirName = PathUtils.FileFromPath(dirPath);
+
+            if (dirName == null) {
+                // No trailing file part
+                return -1;
+            }
+
+            DirectoryServiceContract.Imp dirClient = FindDir(dirPath);
+
+            if (dirClient == null)
+            {
+                // Couldn't open enclosing directory
+                return -1;
+            }
+
+            dirClient.SendDeleteDirectory(Bitter.FromString2(dirName));
+
+            switch receive {
+                case dirClient.NakDeleteDirectory(error):
+                    // Failed; no such directory?
+                    delete dirClient;
+                    return -1;
+
+                case dirClient.AckDeleteDirectory():
+                    break;
+
+                case dirClient.ChannelClosed():
+                    // Unexpected
+                    delete dirClient;
+                    return -1;
+            }
+
+            delete dirClient;
+            return 0;
+        } //DeleteDirectory
+
+#if !REMOVE
+        //REMOVE version that does not have ds endpoint
+        public static int CreateDirectory (string! dirPath)
+        {
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+            try {
+                return CreateDirectory(dirPath, rootNS); 
+            }
+            finally {
+                delete rootNS; 
+            }
+        }
+#endif
+        public static int CreateDirectory (string! dirPath, DirectoryServiceContract.Imp! ds)
+        {
+            string dirName = PathUtils.FileFromPath(dirPath);
+
+            if (dirName == null) {
+                // No trailing file part
+                return -1;
+            }
+
+            DirectoryServiceContract.Imp dirClient = FindDir(dirPath);
+
+            if (dirClient == null)
+            {
+                // Couldn't open enclosing directory
+                return -1;
+            }
+
+            dirClient.SendCreateDirectory(Bitter.FromString2(dirName));
+
+            switch receive {
+                case dirClient.NakCreateDirectory(error):
+                    // Failure
+                    delete dirClient;
+                    return -1;
+
+                case dirClient.AckCreateDirectory():
+                    // Success
+                    break;
+
+                case dirClient.ChannelClosed():
+                    // Unexpected
+                    delete dirClient;
+                    return -1;
+            }
+
+            delete dirClient;
+            return 0;
+        } //CreateDirectory
+
+        // Outparam is only valid if return value is 0 (success)
+        public static int PathIsDirectory(string! dirPath, out bool isDir)
+        {
+            isDir = false;
+
+            // Get attributes as though this is a file
+            NodeType nodeType;
+            long size;
+            ErrorCode error;
+                
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+            bool ok  = FileUtils.GetAttributes(dirPath, rootNS, out size, out nodeType, out  error);
+            delete rootNS; 
+            
+            if (!ok)
+            {
+                return -1;
+            }
+
+            if (nodeType != NodeType.Directory)
+            {
+                Debug.Assert(size == 0);
+                isDir = true;
+            }
+
+            return 0;
+        } //PathIsDirectory
+    }
+}
diff --git a/base/Libraries/FileSystem.Utils/FileSystem.Utils.csproj b/base/Libraries/FileSystem.Utils/FileSystem.Utils.csproj
new file mode 100644
index 0000000..154db8d
--- /dev/null
+++ b/base/Libraries/FileSystem.Utils/FileSystem.Utils.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\FileSystem.Utils\FileSystem.Utils.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>FileSystem.Utils</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="DirectoryUtils.sg" />
+    <Compile Include="FileUtils.sg" />
+    <Compile Include="PathUtils.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Libraries/FileSystem.Utils/FileUtils.sg b/base/Libraries/FileSystem.Utils/FileUtils.sg
new file mode 100644
index 0000000..28db0f9
--- /dev/null
+++ b/base/Libraries/FileSystem.Utils/FileUtils.sg
@@ -0,0 +1,375 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FileUtils.sg
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+namespace FileSystem.Utils
+{
+    public class FileUtils
+    {
+        public static object lockTarget     = new object();
+        public static bool recording        = false;
+        public static TimeSpan bindTime     = new TimeSpan(0);
+        public static long bindCount        = 0;
+
+        private static TRef<DirectoryServiceContract.Imp:Ready>! m_epNS = 
+            new TRef<DirectoryServiceContract.Imp:Ready>(DirectoryService.NewClientEndpoint());
+
+        private static DirectoryServiceContract.Imp:Ready! GetDirectoryServiceContract()
+        {
+            return m_epNS.Acquire();
+        }
+
+        private static void ReleaseDirectoryServiceContract([Claims] DirectoryServiceContract.Imp:Ready! imp)
+        {
+            m_epNS.Release(imp);
+        }
+
+
+        public static FileContract.Imp:Ready OpenFile(string! filePath)
+        {
+            DirectoryServiceContract.Imp! rootNS = GetDirectoryServiceContract();
+            try {
+                return OpenFile(filePath, rootNS);
+            }
+            finally {
+                ReleaseDirectoryServiceContract(rootNS);
+            }
+        }
+
+        public static FileContract.Imp:Ready OpenFile(string! filePath, out ErrorCode error)
+        {
+            DirectoryServiceContract.Imp! rootNS = GetDirectoryServiceContract();
+            try {
+                return OpenFile(filePath, rootNS, out error);
+            }
+            finally {
+                ReleaseDirectoryServiceContract(rootNS);
+            }
+        }
+
+        public static FileContract.Imp:Ready OpenFile(string! filePath, DirectoryServiceContract.Imp! rootNS)
+        {
+            ErrorCode error;
+            return OpenFile(filePath, rootNS, out error);
+        }
+
+        public static FileContract.Imp:Ready OpenFile(string! filePath,
+                                                      DirectoryServiceContract.Imp! rootNS,
+                                                      out ErrorCode errorOut)
+        {
+            FileContract.Imp! fileClient;
+            FileContract.Exp! fileServer;
+            FileContract.NewChannel(out fileClient, out fileServer);
+
+            TimeSpan start = ProcessService.GetUpTime();
+            bool ok = SdsUtils.Bind(filePath, rootNS, fileServer, out errorOut);
+            if (recording) {
+                TimeSpan duration = ProcessService.GetUpTime() - start;
+                lock (lockTarget) {
+                    bindTime += duration;
+                    ++bindCount;
+                }
+            }
+            if (!ok) {
+                delete fileClient;
+                return null;
+            }
+            else {
+            }
+            fileClient.RecvSuccess();
+
+            return fileClient;
+        }
+
+        public static bool FileExists(DirectoryServiceContract.Imp:Ready! dsRoot,string! filePath)
+        {
+            ErrorCode error;
+            long size;
+            NodeType nodeType;
+
+            return  GetAttributes(filePath, dsRoot, out size, out nodeType, out  error);
+        }
+
+#if !REMOVE
+        // REMOVE 
+        public static int CreateFile(string! filePath)
+        {
+            DirectoryServiceContract.Imp! rootNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                return CreateFile(filePath, rootNS);
+            }
+            finally {
+                delete rootNS;
+            }
+        }
+#endif
+        public static int CreateFile(string! filePath, DirectoryServiceContract.Imp! ds)
+        {
+            ErrorCode errorCode; 
+            if (!CreateFile(filePath, ds, out errorCode)) {
+                return -1; 
+            }
+            else return 0; 
+        }
+
+        public static bool CreateFile(string! filePath, DirectoryServiceContract.Imp! ds, out ErrorCode errorCode)
+        {
+            errorCode = ErrorCode.Unknown; 
+            
+            string fileName = PathUtils.FileFromPath(filePath);
+
+            if (fileName == null) {
+                // No trailing file part
+                return false;
+            }
+
+            DirectoryServiceContract.Imp dirClient = DirectoryUtils.FindDir(filePath, ds);
+
+            if (dirClient == null)
+            {
+                // Couldn't open enclosing directory
+                return false;
+            }
+
+            dirClient.SendCreateFile(Bitter.FromString2(fileName));
+
+            switch receive {
+                case dirClient.NakCreateFile(error):
+                    // Failure
+                    errorCode = error; 
+                    delete dirClient;
+                    return false;
+
+                case dirClient.AckCreateFile():
+                    // Success
+                    break;
+
+                case dirClient.ChannelClosed():
+                    // Channel closed unexpectedly
+                    errorCode = ErrorCode.ChannelClosed; 
+                    delete dirClient;
+                    return false;
+            }
+
+            delete dirClient;
+            return true;
+        } //createFile
+
+        // 0 is success
+        public static bool GetAttributes(string! filePath,
+                                      DirectoryServiceContract.Imp! ds,
+                                      out long size,
+                                      out NodeType nodeType,
+                                      out ErrorCode errorOut)
+        {
+            bool ok = SdsUtils.GetAttributes(filePath, ds, out size, out nodeType, out errorOut);
+            return ok;
+        }
+
+        // 0 is success
+        public static bool GetAttributes(string! filePath,
+                                         out long size,
+                                         out NodeType nodeType,
+                                         out ErrorCode errorOut)
+        {
+            bool ok = false;
+            nodeType = NodeType.BadNode;
+            errorOut = ErrorCode.Unknown;
+            size = 0;
+            DirectoryServiceContract.Imp! rootNS = GetDirectoryServiceContract();
+            try {
+                ok = GetAttributes(filePath, rootNS, out size, out nodeType, out errorOut);
+            }
+            catch (Exception e) {
+                Console.WriteLine("FileUtils.GetAttributes exception: {0}", e.Message);
+            }
+            finally {
+                ReleaseDirectoryServiceContract(rootNS);
+            }
+            return ok;
+        }
+
+#if !REMOVE
+        // REMOVE version that does not have ep 
+        public static int DeleteFile(string! filePath)
+        {
+            DirectoryServiceContract.Imp! ds = GetDirectoryServiceContract();
+            ErrorCode errorOut = ErrorCode.Unknown;
+            try {
+                DeleteFile(filePath, ds, out errorOut); 
+            }
+            catch (Exception e) {
+                Console.WriteLine("FileUtils.DeleteFile exception: {0}", e.Message);
+            }
+            finally {
+                ReleaseDirectoryServiceContract(ds);
+            }
+            return (int) errorOut;  
+        }
+#endif
+         public static int DeleteFile(string! filePath,  DirectoryServiceContract.Imp! ds, out ErrorCode errorOut )
+        {
+            string fileName = PathUtils.FileFromPath(filePath);
+            errorOut = ErrorCode.Unknown; 
+            
+            if (fileName == null) {
+                // No trailing filename
+                errorOut = ErrorCode.NotFound; 
+                return -1;
+            }
+
+            DirectoryServiceContract.Imp dirClient = DirectoryUtils.FindDir(filePath, ds);
+
+            if (dirClient == null)
+            {
+                // Couldn't open enclosing directory
+                errorOut = ErrorCode.NotFound; 
+                return -1;
+            }
+
+            dirClient.SendDeleteFile(Bitter.FromString2(fileName));
+
+            switch receive {
+                case dirClient.NakDeleteFile(error):
+                    errorOut = error; 
+                    // Failed; no such file?
+                    delete dirClient;
+                    return (int) errorOut; 
+
+                case dirClient.AckDeleteFile():
+                    errorOut = ErrorCode.NoError;
+                    // Success
+                    break;
+
+                case dirClient.ChannelClosed():
+                    // Channel closed unexpectedly
+                    errorOut = ErrorCode.ChannelClosed;
+                    delete dirClient;
+                    return (int) errorOut;
+            }
+
+            delete dirClient;
+            return 0;
+        } //DeleteFile
+
+        public static byte[] ReadEntireFile(
+            string! filePath,
+            DirectoryServiceContract.Imp! ds)
+        {
+            FileContract.Imp:Ready fileEP = OpenFile(filePath, ds);
+
+            if (fileEP == null) {
+                delete fileEP;
+                return null;
+            }
+
+            long size;
+            NodeType ignored;
+            ErrorCode err;
+
+            if (!GetAttributes(filePath, out size, out ignored, out err)) {
+                delete fileEP;
+                return null;
+            }
+
+            byte[] data = new byte[size];
+
+            if (Read(fileEP, 0, (int)size, 0, data) != size) {
+                delete fileEP;
+                return null;
+            }
+
+            delete fileEP;
+            return data;
+        }
+
+        public static long Read(
+            FileContract.Imp:Ready! fileClient,
+            int bufOffset,
+            int readSize,
+            long fileOffset,
+            byte[]! buf)
+        {
+            long readCount = 0;
+            int error;
+            byte[]! in ExHeap readBytes = new[ExHeap] byte[readSize];
+            fileClient.SendRead(readBytes, 0, fileOffset, readBytes.Length);
+            fileClient.RecvAckRead(out readBytes, out readCount, out error);
+
+            if (error == 0) {
+                Bitter.ToByteArray(readBytes, 0, (int)readCount, buf, (int)bufOffset);
+            } else {
+                readCount = 0;
+            }
+
+            delete readBytes;
+            return readCount;
+        }
+
+        public static long Write(
+            FileContract.Imp:Ready! fileClient,
+            int bufOffset,
+            int writeSize,
+            long fileOffset,
+            byte[]! buf)
+        {
+            long writeCount = 0;
+            int error;
+            byte[]! in ExHeap writeBytes = new[ExHeap] byte[writeSize];
+
+            Bitter.FromByteArray(writeBytes, 0, writeSize, buf, bufOffset);
+            fileClient.SendWrite(writeBytes, 0, fileOffset, writeSize);
+            fileClient.RecvAckWrite(out writeBytes, out writeCount, out error);
+
+            if (error != 0) {
+                writeCount = 0;
+            }
+
+            delete writeBytes;
+            return writeCount;
+        }
+
+        public static long Write(
+            FileContract.Imp:Ready! fileClient,
+            long offset,
+            byte[]! data)
+        {
+            return Write(fileClient, 0, data.Length, offset, data);
+        }
+
+        // we'll do something more intelligent than this later
+        public static long Write(
+            FileContract.Imp:Ready! fileClient,
+            long offset,
+            string! line) {
+
+            return Write(fileClient, offset, Encoding.UTF8.GetBytes(line));
+        }
+
+        public static long WriteLine(
+            FileContract.Imp:Ready! fileClient,
+            long offset,
+            string line) {
+
+            return Write(fileClient, offset, line+"\r\n");
+        }
+    }
+}
diff --git a/base/Libraries/FileSystem.Utils/PathUtils.sg b/base/Libraries/FileSystem.Utils/PathUtils.sg
new file mode 100644
index 0000000..c7757ee
--- /dev/null
+++ b/base/Libraries/FileSystem.Utils/PathUtils.sg
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PathUtils.sg
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+
+namespace FileSystem.Utils
+{
+    public class PathUtils
+    {
+        internal static string FileFromPath(string! filePath)
+        {
+            string dirPath, fileName;
+            SplitPath(filePath, out dirPath, out fileName);
+            return fileName;
+        }
+
+        // Splits a file path into its directory and filename
+        // components
+        internal static void SplitPath(string! filePath,
+                                       out string dirPath,
+                                       out string fileName)
+        {
+            dirPath = String.Empty;
+            fileName = String.Empty;
+
+            string[]! parts = filePath.Split('/');
+            if ((parts == null) || (parts.Length <= 1)) {
+                // Not even a leading slash? Bah!
+                return;
+            }
+
+            fileName = (!)parts[parts.Length-1];
+
+            // The directory path is the full path minus
+            // the trailing leaf part
+            // need to special case Directory Service root. Need to return "/" as dirPath
+            int len = (filePath.Length - fileName.Length - 1) > 0? filePath.Length - fileName.Length - 1 : 1; 
+            dirPath = filePath.Substring(0, len);
+        }
+    }
+}
diff --git a/base/Libraries/Libraries.proj b/base/Libraries/Libraries.proj
new file mode 100644
index 0000000..8b70a98
--- /dev/null
+++ b/base/Libraries/Libraries.proj
@@ -0,0 +1,36 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <ItemGroup>
+    <ProjectReference Include="CLRProfiler\CLRProfiler.csproj"/>
+    <ProjectReference Include="Chore\Chore.csproj"/>
+    <ProjectReference Include="CredentialsManager\CredentialsManager.Library.csproj"/>
+    <ProjectReference Include="Crypto\Crypto.csproj"/>
+    <ProjectReference Include="DirectoryService.AclUtils\DirectoryService.AclUtils.csproj"/>
+    <ProjectReference Include="DirectoryService.Utils\DirectoryService.Utils.csproj"/>
+    <ProjectReference Include="Drivers.Net\Drivers.Net.csproj"/>
+    <ProjectReference Include="FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="Manifest\Manifest.csproj"/>
+    <ProjectReference Include="NetStack.Channels.Public\NetStack.Channels.Public.csproj"/>
+    <ProjectReference Include="Ntlm\Ntlm.csproj"/>
+    <ProjectReference Include="Policy\Policy.csproj"/>
+    <ProjectReference Include="Promise\Promise.csproj"/>
+    <ProjectReference Include="ProtoLisp\ProtoLisp.csproj"/>
+    <ProjectReference Include="Security\Security.csproj"/>
+    <ProjectReference Include="Security\SecurityDiagnostics.csproj"/>
+    <ProjectReference Include="Services\Services.Utils.csproj"/>
+    <ProjectReference Include="Singularity.V1\Singularity.V1.csproj"/>
+    <ProjectReference Include="System.IO\System.IO.csproj"/>
+    <ProjectReference Include="System.Net\System.Net.csproj"/>
+    <ProjectReference Include="System.Net.IP\System.Net.IP.csproj"/>
+    <ProjectReference Include="System.Web\System.Web.csproj"/>
+    <ProjectReference Include="Tpm\Tpm.csproj"/>
+    <ProjectReference Include="TpmClient\TpmClient.csproj"/>
+    <ProjectReference Include="UnitTest\UnitTestLib.csproj"/>
+    <ProjectReference Include="WebApps\WebAppsLib.csproj"/>
+    <ProjectReference Include="Xml\Xml.csproj"/>
+    <ProjectReference Include="Xml2\Singularity.Xml2.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+</Project>
diff --git a/base/Libraries/Manifest/Binder.sg b/base/Libraries/Manifest/Binder.sg
new file mode 100644
index 0000000..dc23ff0
--- /dev/null
+++ b/base/Libraries/Manifest/Binder.sg
@@ -0,0 +1,296 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Binder.cs
+//
+//  Note:
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Text;
+using System.GCs;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.V1.Types;
+using EndpointImplementation = Microsoft.Singularity.Channels.Endpoint;
+
+namespace Microsoft.Singularity.Applications
+{
+    [CLSCompliant(false)]
+    public class Binder
+    {
+        // duplicate of Directory Service consts
+        public const string ManifestFile = "manifest";
+        public const string ExecutableExtension = ".x86";
+        public const string ManifestExtension = ".manifest";
+        public const string ExecutablesNamespace = "init";
+
+        private static StringBuilder sb;
+        private static bool isInitialized = false;
+
+        const string NameXmlTag = "name";
+        const string StartStatedIdXmlAttribute = "startStateId";
+        const string EndpointClassName = "Microsoft.Singularity.Channels.Endpoint";
+
+        public static void Initialize()
+        {
+            if (isInitialized) return;
+            sb = new StringBuilder(512);   // cache away a string form manipulation
+            isInitialized = true;
+        }
+
+
+        public static Manifest LoadManifest(DirectoryServiceContract.Imp:Ready! ds, String application)
+        {
+            if (application == null) return null;
+
+            application = (!)application.ToLower();
+            string folderName = application;
+            string appName = application;
+
+
+            // Open the directory containing the manifest and the .x86
+            // remove the ".x86" extension if present
+            if (application.EndsWith(ExecutableExtension)) {
+                folderName =(!)(application.Substring(0, application.Length - ((!)ExecutableExtension).Length));
+                appName = folderName;
+            }
+
+            if (folderName.Length == 0) {
+                // invalid application name
+                return null;
+            }
+
+            if  (sb == null) {
+                sb = new StringBuilder(512);   // cache away a string form manipulation
+                isInitialized = true;
+            }
+            // if the first character of the folder name is not "/",
+            // then we will redirect to the init namespace.
+            if (folderName[0] != '/') {
+                appName = folderName;
+                sb.Length = 0; //reset the buffer
+                sb.Append("/");
+                sb.Append(ExecutablesNamespace);
+                sb.Append("/");
+                sb.Append(appName);
+
+                folderName = (!)sb.ToString();
+            }
+            else {
+                // need to strip off all but last part.
+                appName = folderName.Substring(folderName.LastIndexOf('/')+1);
+            }
+#if DEBUG2
+            DebugStub.WriteLine("Binder.LoadManifest: application={0},folder={1},appName={2}",
+                                __arglist (application,folderName,appName));
+#endif
+
+            DirectoryServiceContract.Imp:Ready dirEP = openDir(ds, folderName);
+
+            if (dirEP == null) {
+#if DEBUG
+                DebugStub.WriteLine("Binder.LoadManifest: unable to open ,folder={0}",
+                                __arglist (folderName));
+#endif
+                return null;
+            }
+            Manifest man = GetManifest(ManifestFile, dirEP);
+            delete dirEP;
+            return man;
+        }
+
+
+        public static byte [] FindAndReadManifest(string! file,
+                                             DirectoryServiceContract.Imp:Ready! dirClient)
+        {
+            long size = 0;
+            NodeType nodeType;
+            ErrorCode errorOut;
+
+            long readSize = 4096;
+
+            bool ok = SdsUtils.GetAttributes(file,
+                                    dirClient,
+                                    out size,
+                                    out nodeType,
+                                    out errorOut );
+            if (!ok) return null;
+
+
+            // bind to file
+
+            FileContract.Imp! fileClient;
+            FileContract.Exp! fileServer;
+            FileContract.NewChannel(out fileClient, out fileServer);
+
+            ok = SdsUtils.Bind(file,dirClient,fileServer, out errorOut);
+            if (!ok) {
+                delete fileClient;
+                return null;
+            }
+            fileClient.RecvSuccess();
+
+            //  Now read file
+
+            if (fileClient != null) {
+                // allocate memory and read file
+                byte [] region = new byte[size];
+                if (region == null) {
+                    delete fileClient;
+                    return null;
+                }
+
+                byte[] in ExHeap buf = new[ExHeap] byte[readSize];
+                long readOffset = 0;
+
+                while (true) {
+                    // invariant: we own the non-null buffer buf at the
+                    //            loop head
+                    //       and  we don't own the buffer at the loop exit.
+                    //
+                    Tracing.Log(Tracing.Debug,"FindImage pre SendRead");
+                    fileClient.SendRead(buf, 0, readOffset, readSize);
+
+                    switch receive {
+                        case fileClient.AckRead(localbuf, bytesRead, error) :
+                            Tracing.Log(Tracing.Debug,"FindImage Post SendRead");
+                            Bitter.ToByteArray(localbuf, 0, (int)bytesRead,
+                                              region, (int)readOffset);
+                            if (bytesRead == readSize) {
+                                // see if there is more
+                                readOffset += bytesRead;
+                                buf = localbuf;
+                                continue;
+                            }
+                            delete localbuf;
+                            break;
+
+                        case fileClient.ChannelClosed() :
+                            break;
+                        case unsatisfiable :
+                            break;
+                    }
+                    // Get out of loop
+                    break;
+                }
+                delete fileClient;
+                return region;
+            }
+            return null;
+        }
+
+        private static DirectoryServiceContract.Imp:Ready openDir(DirectoryServiceContract.Imp:Ready! ds, string! filePath)
+        {
+            assert ds != null;
+
+            DirectoryServiceContract.Imp! dirClient;
+            DirectoryServiceContract.Exp! dirServer;
+            DirectoryServiceContract.NewChannel(
+                out dirClient, out dirServer);
+
+            ErrorCode errorCode;
+            bool ok = SdsUtils.Bind(filePath, ds, dirServer, out errorCode);
+            if (!ok) {
+                delete dirClient;
+                return null;
+            }
+
+            dirClient.RecvSuccess();
+            return dirClient;
+        }
+
+        private static Manifest GetManifest(string! name,
+                                            DirectoryServiceContract.Imp:Ready! dirEP)
+        {
+            Manifest manifest = null;
+
+            Tracing.Log(Tracing.Debug, "Binder.GetManifest: path={0}", name);
+            try {
+                byte [] manifestMemory = FindAndReadManifest(name,dirEP);
+                if (manifestMemory != null) {
+                    manifest = new Manifest(manifestMemory);
+                }
+                else {
+                    DebugStub.WriteLine(" no manifest! file={0}",__arglist(name));
+                }
+            }
+            catch (Exception e) {
+                DebugStub.WriteLine("Exception in GetManifest: {0}", __arglist(e.Message));
+                Tracing.Log(Tracing.Debug, "Exception in GetManifest: {0}", e.Message);
+            }
+            return manifest;
+        }
+
+
+        // utility function for getting SystemTypes from strings in the manifest
+        private static SystemType GetEndpointType(XmlNode! metadata)
+        {
+
+            // everything must derive from Endpoint
+            SystemType epSystemType = typeof(Channels.Endpoint).GetSystemType();
+
+            // now traverse the metadata to the types, in order:
+            foreach (XmlNode! child in metadata.Children) {
+                string! name = (!)child.GetAttribute(NameXmlTag, "");
+
+                long lower, upper;
+                // [TODO] the encoding of types will change, and when
+                // it does, this will need to change.  Right now, we create the
+                // type name of foo.imp as foo+foo.imp (same for exp)
+                if (name.EndsWith(".Exp") || name.EndsWith(".Imp")) {
+                    name = name.Remove(name.Length - 4, 4) + "+" + name;
+                }
+
+                // get the hash for this type:
+                System.RuntimeTypeHash.ComputeHash(name, out lower, out upper);
+
+                // If this isn't the base of our derivation, get the type
+                if (name != EndpointClassName) {
+                    epSystemType = EndpointImplementation.RegisterSystemType(name,lower, upper, epSystemType);
+                }
+            }
+            return epSystemType;
+        }
+
+        /// <summary>
+        /// Given information in the application manifest attempt to create and bind a channel to
+        /// a service conforming to the contract specified.  This routine parses the manifest
+        /// metadata then makes an ABI call to generate the endpoints, connect them, add the
+        /// imp endpoint to the process StartupEndpoint array at "index", and attempt to bind
+        /// the exp endpoint to a service provider using system policy.
+        /// </summary>
+         public static  bool BindServiceUser(Process! process,
+                                                  int index,
+                                                  string! contract,
+                                                  XmlNode! metadata)
+        {
+            // get the metadata for both sides of the channel
+            XmlNode! impNode = (!)metadata.GetChild("imp");
+            XmlNode! expNode = (!)metadata.GetChild("exp");
+
+            // get the initial state as an integer
+            int initialState = metadata.GetAttribute(StartStatedIdXmlAttribute, 0);
+
+            // now get the SystemType of each endpoint's type (we don't actually
+            // know the type in the kernel, but we can discern it using the
+            // fullname from the metadata)
+            SystemType impType = GetEndpointType(impNode);
+            SystemType expType = GetEndpointType(expNode);
+
+            bool ok = process.BindToService(impType, expType, contract, initialState, index);
+            return ok;
+        }
+    }
+}
diff --git a/base/Libraries/Manifest/Manifest.csproj b/base/Libraries/Manifest/Manifest.csproj
new file mode 100644
index 0000000..8e2bae0
--- /dev/null
+++ b/base/Libraries/Manifest/Manifest.csproj
@@ -0,0 +1,39 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Manifest\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Manifest</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>SIMPLE_SECLIB</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Binder.sg" />
+    <Compile Include="Manifest.sg" />
+    <Compile Include="job.sg" />
+    <Compile Include="parameters.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="..\Xml2\Singularity.Xml2.csproj" />
+    <ProjectReference Include="..\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Manifest/Manifest.sg b/base/Libraries/Manifest/Manifest.sg
new file mode 100644
index 0000000..c32c42b
--- /dev/null
+++ b/base/Libraries/Manifest/Manifest.sg
@@ -0,0 +1,380 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Manifest.cs
+//
+//  Note:   Creates and binds endpoints using a manifest.
+//
+
+using System;
+using System.Text;
+using System.Collections;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Memory;
+using Microsoft.Singularity.Xml;
+
+namespace Microsoft.Singularity.Applications
+{
+
+    /// <summary>
+    /// This is a placeholder class for an application's manifest.
+    /// At present the application manifest is represented by a hashtable.
+    /// The hashtable has several important properties:
+    ///  - name: the name of the application
+    ///  - path: path to the application executable
+    /// </summary>
+    public class Manifest
+    {
+        /// <summary>
+        /// We treat the application manifest as a collection of
+        /// key, value pairs.
+        /// </summary>
+
+
+        private Hashtable! data = new Hashtable();
+        private const string pipeContract = "Microsoft.Singularity.Io.UnicodePipeContract";
+
+        private string name;
+        private string path;
+
+        private readonly XmlNode!       applicationNode;
+        private readonly XmlNode!       processNode;
+        private readonly XmlNode        actionNode;
+        private readonly XmlNode        categoriesNode;
+        private readonly XmlNode        stringParametersNode;
+        private readonly XmlNode        stringArrayParametersNode;
+        private readonly XmlNode        longParametersNode;
+        private readonly XmlNode        boolParametersNode;
+        private static StringBuilder    sb;
+
+        /// <summary>
+        /// Create a manifest object from the given xml representation
+        /// </summary>
+
+        [Microsoft.Contracts.NotDelayed]
+        public Manifest(byte[] xml)
+        {
+            XmlReader! reader = new XmlReader(xml);
+            XmlNode! doc = (!)reader.Parse();
+
+            this(doc);
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        private Manifest(XmlNode! doc)
+        {
+            XmlNode app = (!)doc.GetChild("application");
+            name = app["name"];
+            XmlNode proc = null;
+            foreach (XmlNode! process in app.Children) {
+                if (process.Name != "process") {
+                    continue;
+                }
+                if (process.GetAttribute("main", "false") == "true") {
+                    path = process["path"];
+                    proc = process;
+                    break;
+                }
+            }
+            applicationNode = app;
+            XmlNode! processNode = this.processNode = (!)proc;
+            base();
+
+            categoriesNode = processNode.GetChild("categories");
+
+            if (categoriesNode != null) {
+                    return;
+            }
+            else {
+#if DEBUG
+                DebugStub.WriteLine("no category found in Manifest");
+#endif
+            }
+        }
+
+        public XmlNode GetCategoriesNode()
+        {
+            return categoriesNode;
+        }
+
+
+        public void SetProperty(object! name, object value)
+        {
+            data[name] = value;
+        }
+
+        public string Name
+        {
+            get {
+                return name;
+            }
+        }
+
+        public string Path
+        {
+            get {
+                return path;
+            }
+        }
+
+        public  string  GetHelpMessage(XmlNode categoryNode)
+        {
+                return categoryNode == null?  null :  categoryNode.GetAttribute("HelpMessage", null);
+        }
+
+
+        // given an action find the corresponding category node
+        public  XmlNode GetCategoryNode(string actionName) {
+            if (categoriesNode == null) {
+                return null;
+            }
+            if (actionName == null) {
+                foreach (XmlNode! c in categoriesNode.Children) {
+                    bool present = c.GetAttribute("DefaultAction",false);
+                    if (present) return c;
+                }
+               return null;
+            }
+            else {
+                foreach (XmlNode! c in categoriesNode.Children) {
+                    string a = c.GetAttribute("Action",null);
+                    if ( a != null && a == actionName) {
+                        return c;
+                    }
+                }
+                return null;
+            }
+        }
+
+        // Finds a category node by name
+        public  XmlNode GetCategoryNodeByName(string! name) {
+            if (categoriesNode == null) {
+                return null;
+            }
+
+            foreach (XmlNode! c in categoriesNode.Children) {
+                string a = c.GetAttribute("name",null);
+                if ( a != null && a == name) {
+                    return c;
+                }
+            }
+            return null;
+        }
+
+        public  XmlNode GetBoolParameterNode(XmlNode! category)
+        {
+            return category.GetChild("BoolParameters");
+        }
+
+        public  XmlNode GetStringArrayParameterNode(XmlNode! category)
+        {
+            return category.GetChild("StringArrayParameters");
+        }
+
+        public  XmlNode GetStringParameterNode(XmlNode! category)
+        {
+            return category.GetChild("StringParameters");
+        }
+
+        public  XmlNode GetLongParameterNode(XmlNode! category)
+        {
+            return category.GetChild("LongParameters");
+        }
+
+        public bool HasParameters()
+        {
+            return (categoriesNode != null);
+        }
+
+#if false
+        public void ShowParameters()
+        {
+            if (categoryNode == null) {
+                Console.WriteLine("::: no category");
+                return;
+            }
+            if (stringParametersNode == null) {
+                Console.WriteLine("::: no strings");
+            }
+            if (longParametersNode == null) {
+                Console.WriteLine("::: no integers");
+            }
+        }
+#endif
+        private  int GetPipeIndex(string action, string! direction,  string! desiredKind)
+        {
+            // walk the XmlTree looking InputPipe or  UnicodePipe co
+            // these will be used by the binder to setup and transfer to
+            // the starting process much like what is done for drivers
+
+            XmlNode categoryNode = GetCategoryNode(action);
+            if (categoryNode == null) {
+                Console.WriteLine("No endpoints in console app!");
+                return -1;
+            }
+
+            XmlNode endpoints = categoryNode.GetChild("endpoints");
+            if (endpoints == null) {
+                return -1;
+            }
+            int endpointCount = endpoints.GetAttribute("length", 0);
+            if (endpointCount == 0) {
+                return -1;
+            }
+
+            string manifestKind;
+            foreach (XmlNode! ep in endpoints.Children) {
+                if (ep.Name == direction) {
+                    manifestKind = ep.GetAttribute("Kind", "");
+                    if (manifestKind == desiredKind) {
+                        int idx = ep.GetAttribute("id",-1);
+                        //DebugStub.WriteLine("Found {0} at index {1}", __arglist(direction,idx));
+                        return idx;
+                    }
+                }
+            }
+
+           //the code below this line should be removed when everything is converted over
+            DebugStub.WriteLine("No {0} endpoint found looking for old form", __arglist(direction));
+
+            if (desiredKind == "control") {
+               return -1;
+            }
+
+            foreach (XmlNode! endpoint in endpoints.Children) {
+                string! contract
+                    = (!)endpoint.GetAttribute("contractName", "");
+                int index = endpoint.GetAttribute("id", -1);
+
+                //should really look at Imp vs Exp as well
+                if (endpoint.Name == "endpoint") {
+                    if (direction == "inputPipe") {
+                        if (contract == pipeContract && index == 0 ) {
+                            return 0;
+                        }
+                    }
+                    else {
+                        if (contract == pipeContract && index == 1 ) {
+                            return 1;
+                        }
+                    }
+                }
+            }
+
+            return -1;
+        }
+
+
+        public  int GetOutputPipeIndex(string action, string! desiredKind)
+        {
+            return GetPipeIndex(action, "outputPipe", desiredKind);
+        }
+
+        public  int GetInputPipeIndex(string action, string! desiredKind)
+        {
+            return GetPipeIndex(action, "inputPipe", desiredKind);
+        }
+
+
+        public int SetEndpoints(Process process, string action, bool show)
+        {
+            // walk the XmlTree looking endpoints
+            // these will be used by the binder to setup and transfer to
+            // the starting process much like what is done for drivers
+
+            XmlNode categoryNode = GetCategoryNode(action);
+            //Console.WriteLine(" Set endpoints");
+            if (categoryNode == null) {
+                Console.WriteLine("No endpoints in console app!");
+                //DebugStub.Break();
+                return 0;
+            }
+
+            XmlNode endpoints = categoryNode.GetChild("endpoints");
+            if (endpoints == null) {
+                //DebugStub.Break();
+                return 0;
+            }
+            int endpointCount = endpoints.GetAttribute("length", 0);
+            if (endpointCount == 0) {
+                DebugStub.Break();
+                return 0;
+            }
+
+            //fill in ep set
+            foreach (XmlNode! endpoint in endpoints.Children) {
+                string! contract
+                    = (!)endpoint.GetAttribute("contractName", "");
+                int index = endpoint.GetAttribute("id", -1);
+
+                if (endpoint.Name == "endpoint") {
+                    // FIXFIX -- if it is a pipe ignore it for now
+                    if (show) {
+                        Console.WriteLine(" endpoint({0}): {1}", index, contract);
+                    }
+                    else {
+                        if (contract != pipeContract) {
+                            // get a pre-bound generic endpoint to a service from the
+                            // resource tracker
+                            if (process == null) {
+                                throw new Exception("Process arg was null.");
+                            }
+                            if (!Binder.BindServiceUser(process, index, contract, endpoint)) {
+                                DebugStub.WriteLine("SetEndpoints Binder.BindServiceUser failed for {0} @ index {1}", __arglist(contract, index));
+                                return -1;
+                            }
+                        }
+                        else {
+                            DebugStub.WriteLine("shell.manifest.SetEndpoints: skipping pipe at {0}", __arglist(index));
+                        }
+                    }
+                }
+            }
+            return endpointCount;
+        }
+
+#if false
+        public override string! ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.AppendFormat("<application name=\"{0}\">", Name);
+
+            // the main executable
+            sb.AppendFormat("<process main=\"true\" path=\"{0}\"/>", Path);
+
+            foreach(DataItem item in data.Values) {
+                if (item.Directory == null) {
+                    sb.AppendFormat("<data name=\"{0}\" value=\"{1}\"/>",
+                                    item.Name, item.Value);
+                }
+                else {
+                    sb.AppendFormat("<data namespace=\"{0}\" name=\"{1}\" value=\"{2}\"/>",
+                                    item.Directory, item.Name, item.Value);
+                }
+            }
+
+            sb.Append("</process>");
+            sb.Append("</application>");
+            sb.Append("<signature>");
+            sb.Append("</signature>");
+
+            return sb.ToString();
+        }
+
+        public byte[] Serialize()
+        {
+            return (new UTF8Encoding()).GetBytes(ToString());
+        }
+#endif
+    }
+}
diff --git a/base/Libraries/Manifest/Parameters.sg b/base/Libraries/Manifest/Parameters.sg
new file mode 100644
index 0000000..f05007d
--- /dev/null
+++ b/base/Libraries/Manifest/Parameters.sg
@@ -0,0 +1,1152 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Parameter.cs
+//
+//  Note:
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Text;
+using System.Collections;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.V1.Services;
+using System.Globalization;
+
+namespace Microsoft.Singularity.Applications
+{
+    [CLSCompliant(false)]
+    public class ParameterProcessor
+    {
+        private Parameter[]  parameterSet; 
+        private Parameter[]  positionSet; 
+        private bool         havePositional; 
+        private string       appName; 
+        private int          totalCount;
+        private string       helpMsg; 
+        private int  boolCount, longCount, stringCount, stringArrayCount; 
+
+        public ParameterProcessor() 
+        {
+        }
+        
+        private enum pType {
+            boolType,
+            longType, 
+            stringType,
+            stringArrayType
+        }
+       
+        private class Parameter
+        {
+            public  string  Name; 
+            public  bool    Mandatory; 
+            public  string  Default; 
+            public  int     Position; 
+            public  int     Index; 
+            public  pType   Kind; 
+            public bool     Resolved; 
+            public string   HelpMsg; 
+            
+            public Parameter(pType kind) {
+                Resolved    = false; 
+                Name        = null; 
+                Kind        = kind; 
+                
+            }
+        }
+        
+        private string CodeToString(ParameterCode code)
+        {
+            switch (code) {
+                case ParameterCode.Success:
+                    return "Success"; 
+                    break; 
+                case ParameterCode.OutOfRange:
+                    return "OutOfRange"; 
+                    break; 
+                case ParameterCode.NotSet:
+                    return "NotSet"; 
+                    break; 
+                case ParameterCode.Retrieved:
+                    return "Retrieved"; 
+                    break; 
+                case ParameterCode.Undefined:
+                    return "Undefined"; 
+                    break; 
+                default:
+                    return "This should never happen"; 
+                    break; 
+            }   
+            return null; 
+        }
+        
+        private bool StringToBool (string arg, out bool value)
+        {
+            
+            value = false; 
+            bool ok = false; 
+            if (arg == null) return false; 
+            
+            string s = arg.ToLower(); 
+            
+            if (s == "true") {
+                value = true; 
+                ok = true; 
+            }
+            
+            if (s == "false") {
+                value = false; 
+                ok = true; 
+            }
+            
+            return ok; 
+        }
+        
+        private bool StringToLong (string arg, out long value) 
+        {
+           value = -1; 
+           int start = 0; 
+           bool doHex = false; 
+        
+            if (arg == null) return false; 
+            if (arg.StartsWith("0x") || arg.StartsWith("0X")) {
+                if (arg.Length == 2) return false; 
+                doHex = true; 
+                start = 2; 
+            }
+            else { 
+                for (int i=start; i < arg.Length; i++) {
+                    if (!Char.IsNumber(arg[i]) && arg[i] != '-' ) return false; 
+                }
+            }
+            try {
+                if (doHex) value = System.Int64.Parse(arg, NumberStyles.AllowHexSpecifier); 
+                else value = System.Int64.Parse(arg);
+            }
+            catch (Exception e) {
+                Console.WriteLine("Exception: converting {0} to Long. error={1}",arg,e.Message); 
+                return false; 
+            }
+            return true; 
+        }
+        
+        private Parameter! GetXmlAttributes(XmlNode! p, pType t)
+        {
+            
+             Parameter a = new Parameter(t); 
+             assert a != null; 
+             
+             a.Position     = p.GetAttribute("Position", -1);
+             a.Index        = p.GetAttribute("id", -1);
+             a.Mandatory    = p.GetAttribute("Mandatory", false);
+             a.Name         = p.GetAttribute("Name",null); 
+             a.Default      = p.GetAttribute("Default",null); 
+             a.HelpMsg      = p.GetAttribute("HelpMessage",null); 
+
+             //Console.WriteLine("name=({0}), Mandatory={1}, id={2}, position={3}",
+             //   a.Name, a.Mandatory, a.Index, a.Position); 
+             return a;
+        }
+
+        private static bool InSeparators(char c, char []! separators)
+        {
+            for (int i = 0; i < separators.Length; i++)
+            {
+                if (separators[i] == c)
+                    return true;
+            }
+            return false;
+        }
+
+        
+        private static ArrayList! Tokenize(string! input, int last,
+                                           char []! separators)
+        {
+            ArrayList tokens = new ArrayList();
+
+            for (int i = 0; i <= last;)
+            {
+                // Skip separators
+                while (i <= last && InSeparators(input[i], separators))
+                {
+                    i++;
+                }
+
+                if (i > last)
+                    break;
+
+                // Try to slurp word
+                int start = i;
+                while (i <= last &&
+                       !InSeparators(input[i], separators) &&
+                       input[i] != '\'')
+                {
+                    i++;
+                }
+                if (i != start)
+                {
+                    tokens.Add(input.Substring(start, i - start));
+                }
+
+                // Skip separators
+                while (i <= last && InSeparators(input[i], separators))
+                {
+                    i++;
+                }
+
+                if (i > last)
+                    break;
+
+                // Try to quoted slurp word
+                if (input[i] == '\'')
+                {
+                    start = i;
+                    i++;
+                    while (i <= last && input[i] != '\'')
+                    {
+                        i++;
+                    }
+
+                    if (i <= last && input[i] == '\'')
+                    {
+                        tokens.Add(input.Substring(start + 1, i - start - 1));
+                        i++;
+                    }
+                    else
+                    {
+                        tokens.Add(input.Substring(start, i - start));
+                        i++;
+                    }
+                }
+            } // end for
+
+            return tokens;
+        }
+        
+        private Parameter FindParameter(string name)
+        {
+            if (parameterSet != null) {
+                for (int i=0; i < parameterSet.Length; i++) {
+                    Parameter a = parameterSet[i]; 
+                    if (a == null) continue; 
+                    assert a.Name != null; 
+                    if ( a.Name == name)  return parameterSet[i];
+                }
+            }
+
+        
+            return null; 
+           
+        }
+        
+        private bool ParseAndSetParameter(Process! p, Parameter! a, string! value)
+        {
+            bool ok; 
+            ParameterCode code; 
+            bool boolValue; 
+            long longValue; 
+            
+            switch (a.Kind) {
+                case pType.boolType:
+                    ok = StringToBool(value, out boolValue); 
+                    if (!ok) {
+                        Console.WriteLine("{0} for {1} is not a bool value.", value, a.Name); 
+                    }
+                    else {
+                        code = p.SetStartupBoolArg(a.Index, boolValue); 
+                        if (code != ParameterCode.Success){ 
+                           Console.WriteLine("unable to set bool index {0} to {1} for arg {2}. error={3}",
+                                a.Index, boolValue, a.Name, CodeToString(code) ); 
+                           return false; 
+                        } 
+                        a.Resolved = true; 
+                        return true; 
+                    }
+                    break; 
+                case pType.longType:
+                    ok = StringToLong(value, out longValue); 
+                    if (!ok) {
+                        Console.WriteLine("{0} for {1} is not a integer value.", value, a.Name); 
+                    }
+                    else {
+                        code = p.SetStartupLongArg(a.Index, longValue); 
+                        if (code != ParameterCode.Success){ 
+                           Console.WriteLine("unable to set string. index {0} to {1} for arg {2}. error={3}",
+                                a.Index, longValue, a.Name, CodeToString(code)); 
+                           return false; 
+                        } 
+                        a.Resolved = true; 
+                        return true; 
+                    }
+                    break; 
+                case pType.stringType:
+                    code = p.SetStartupStringArg(a.Index, value); 
+                    if (code != ParameterCode.Success){ 
+                        Console.WriteLine("unable to set string. index {0} to {1} for arg {2}. error={3}",
+                            a.Index, value, a.Name, CodeToString(code)); 
+                        return false; 
+                    } 
+                    a.Resolved = true; 
+                    return true; 
+                    break; 
+            }
+            return false; 
+        }
+        
+        private string! KindToString(pType t)
+        {
+            switch (t) {
+                case pType.boolType:
+                    return "bool"; 
+                case pType.longType:
+                    return "int"; 
+                case pType.stringType:
+                    return "string"; 
+                case pType.stringArrayType:
+                    return "strings"; 
+                default:
+                    return "???";
+            }
+        }
+
+#if false        
+        public void Show(string action, Manifest! manifest, bool verbose) 
+        {
+            if (action != null) {
+                Console.Write("\n    {0}  @{1} ", appName, action); 
+                InitializeParameters(action, manifest);
+                ShowArgs(action, manifest);
+                 return;
+            }
+
+            XmlNode catNode = manifest.GetCategoriesNode(); 
+            if (catNode == null ) { 
+                Console.WriteLine(" unable to find categories node!"); 
+                return;
+            } 
+            ArrayList actions = new ArrayList(); 
+            
+            assert catNode != null;
+            foreach ( XmlNode n in catNode.Children) {
+                assert n != null; 
+                string s = n.GetAttribute("Action", null); 
+                actions.Add(s); 
+            }
+            
+            if (actions.Count > 0 ) { 
+                Console.Write("\n   {0} Actions: ", appName);
+                for (int i=0; i < actions.Count; i++) {
+                    Console.Write("{0} ",actions[i]); 
+                } 
+                Console.WriteLine("\n"); 
+            }
+
+			if (verbose) {
+				for (int i=0; i < actions.Count; i++) {
+					string a = (string) actions[i]; 
+					if (a != null ) Console.Write("\n Configuration Parameters for action @{0}",a);
+					InitializeParameters(a, manifest);
+					ShowArgs(action, manifest);
+				}
+			} else {
+				// Show a reasonably-short list of commands.
+			    ShowCommandsSummary(manifest);			    
+			}            
+       }
+#endif
+       
+        /// <summary>
+        /// This method shows a list of all of the commands (actions) that an
+        /// application provides, as defined in its manifest.  The list simply
+        /// shows the names of each command, and the helptext for each.
+        /// </summary>
+       void ShowCommandsSummary(Manifest! manifest)
+       {
+            XmlNode catNode = manifest.GetCategoriesNode(); 
+            if (catNode == null ) { 
+                Console.WriteLine(" unable to find categories node!"); 
+                return;
+            } 
+            
+            const string format = "{0,-16}  {1}";
+            
+            bool any = false;
+            
+            foreach ( XmlNode node in catNode.Children) {
+                assert node != null; 
+                
+                if (node.Name != "category")
+                    continue;
+                    
+                string action;
+                string actionWithAt;
+                
+                // Is it the default action?
+                string value = node.GetAttribute("DefaultAction", null);
+                bool isDefault = value != null && value.Length != 0;
+                if (isDefault) {
+                    action = "";
+                    actionWithAt = "";
+                } else {
+                    action = node.GetAttribute("Action", null); 
+                    if (action == null)
+                        continue;
+                    actionWithAt = "@" + action;                    
+                }
+                
+                string! help = GetHelpMessage(node);
+                
+                if (!any) {
+                    any = true;
+                    Console.WriteLine("The program supports the following actions:");
+                    Console.WriteLine();
+                }
+                
+                actionWithAt = this.appName + " " + actionWithAt;
+                
+                const int max_help_length = 60;
+                
+                if (help.Length > max_help_length) {
+                    string[]! help_lines = BreakLineAtWords(help, max_help_length);
+                    bool first = true;
+                    foreach (string! help_line in help_lines) {
+                        if (first) {
+                            Console.WriteLine(format, actionWithAt, help_line);
+                            first = false;
+                        } else {
+                            Console.WriteLine(format, "", help_line);
+                        }
+                    }
+                } else {
+                    Console.WriteLine(format, actionWithAt, help);
+                }
+            }
+            
+            if (!any) {
+                Console.WriteLine("The program does not support any commands.");
+            } else {
+                Console.WriteLine();            
+			    // Console.WriteLine("Use -?? for verbose info on all actions.");
+			    Console.WriteLine("Use '@cmd -?' for detailed help on a particular command.");
+            }
+       }
+
+        /// <summary>
+        /// This method breaks a string into a list of strings, each of which is at most 'maxlength'
+        /// in length, if possible.  The method tries to break the string at whitespace boundaries.
+        /// Note that it is possible for entries returned to be longer than 'maxlength', so don't
+        /// rely on that behavior.
+        /// </summary>       
+       string[]! BreakLineAtWords(string! line, int maxlength)
+       {
+            if (line.Length < maxlength)
+                return new string[] { line };
+            
+            ArrayList list = new ArrayList();
+            
+            int pos = 0;
+            for (;;) {
+                if (pos >= line.Length)
+                    break;
+                 
+                int remaining = line.Length - pos;
+                if (remaining <= maxlength) {
+                    // No need to break anymore.
+                    list.Add(line.Substring(pos, remaining));
+                    break;
+                }
+                
+                int len = maxlength;
+                assert len < remaining;
+
+                // Move backward and find the first whitespace char.
+                while (len > 0 && !Char.IsWhiteSpace(line[pos + len - 1]))
+                    len--;
+                
+                // Remove whitespace from the end of the current line.
+                while (len > 0 && Char.IsWhiteSpace(line[pos + len - 1]))
+                    len--;
+                
+                if (len == 0) {
+                    // Uh oh.  The current line is one big long non-breaking string.
+                    // Just break it at maxlength.  Ugly.
+                    len = maxlength;
+                }
+                
+                list.Add(line.Substring(pos, len));
+                
+                pos += len;
+                
+                // Skip whitespace.
+                while (pos < line.Length && Char.IsWhiteSpace(line[pos]))
+                    pos++;                
+            }
+            
+            Array obj_array = list.ToArray(typeof(string));
+            return (string[])obj_array;
+       }
+       
+       string! GetHelpMessage(XmlNode! actionNode)
+       {
+            string value = actionNode.GetAttribute("HelpMessage", null);
+            if (value != null)
+                return value;
+            else
+                return "";
+       }
+
+        /// <summary>
+        /// This method shows a summary of all of the commands (actions) defined in
+        /// an application manifest.
+        /// </summary>       
+       void ShowCommandsSummaryWithArgs(Manifest! manifest)
+       {
+			// Show a reasonably-short list of commands.
+
+            string[] actions = GetAllActions(manifest);			
+            
+			if (actions.Length > 0 ) {
+			    foreach (string action in actions) {
+			        InitializeParameters(action, manifest);
+    				
+				    string! line = GetParameterSyntaxSummary(manifest, action);
+				    Console.WriteLine(line);
+				    
+				    if (this.helpMsg != null) {
+				        string! help = this.helpMsg;
+				        const int max_length = 70;
+				        if (help.Length > max_length) {
+				            string[]! help_lines = BreakLineAtWords(help, max_length);
+				            for (int i = 0; i < help_lines.Length; i++) {
+				                Console.WriteLine("    " + help_lines[i]);
+				            }
+				        } else {
+    				        Console.WriteLine("    " + this.helpMsg);
+				        }
+				        Console.WriteLine();
+				    }
+				}
+			}
+
+			Console.WriteLine("Use '" + this.appName + " @cmd -?' for detailed help on a particular command.");
+			Console.WriteLine("Use '" + this.appName + " -??' for detailed help on all commands.");
+       }
+
+        /// <summary>
+        /// Builds a 
+        /// </summary>       
+       string! GetParameterSyntaxSummary(Manifest! manifest, string action)
+       {
+            StringBuilder buffer = new StringBuilder();
+            
+			if (action != null) {
+				buffer.Append(appName);
+				buffer.Append(" @");
+				buffer.Append(action);
+			} else {
+				buffer.Append(appName);
+			}
+			
+			// First pass, show positional arguments.
+				
+			if (positionSet != null)
+			{
+				foreach (Parameter p in positionSet) {
+					if (p == null)
+						continue;
+						
+					buffer.Append(' ');
+
+					if (!p.Mandatory)
+						buffer.Append('[');
+					
+					buffer.Append('<');
+					buffer.Append(p.Name);
+					buffer.Append('>');
+					
+					if (!p.Mandatory)
+						buffer.Append(']');
+				}
+			}
+			
+			// Next, show non-positional arguments (-foo=x)
+			if (parameterSet != null) {
+				foreach (Parameter p in parameterSet) {
+					if (p == null)
+						continue;
+
+					// Positional parameters are apparently in both lists.
+					// Screen them out.
+					bool skip = false;
+					if (positionSet != null) {
+						foreach (Parameter positional in positionSet) {
+							if (positional == p) {
+								skip = true;
+								break;
+							}
+						}
+					}
+					if (skip)
+						continue;
+						
+					buffer.Append(' ');
+
+					if (!p.Mandatory)
+						buffer.Append('[');
+					
+					buffer.Append('-');
+					buffer.Append(p.Name);
+					
+					switch (p.Kind) {
+						case pType.boolType:
+							break;
+							
+						case pType.longType:
+							buffer.Append("=nn");
+							break;
+							
+						default:
+							buffer.Append("=...");
+							break;
+					}
+					
+					if (!p.Mandatory)
+						buffer.Append(']');
+				}
+			}
+				
+			return buffer.ToString();
+       }
+
+        /// <summary>
+        /// Builds a list of all of the actions (commands) defined in a manifest.
+        /// Note: This CAN return a null entry (an array containing a null entry),
+        /// if the program has a default action, and most do.
+        /// </summary>       
+       string[]! GetAllActions(Manifest! manifest)
+       {
+            XmlNode catNode = manifest.GetCategoriesNode(); 
+            if (catNode == null ) { 
+                Console.WriteLine(" unable to find categories node!"); 
+                return new string[0];
+            } 
+            ArrayList actions = new ArrayList(); 
+            
+            foreach ( XmlNode n in catNode.Children) {
+                assert n != null; 
+                string s = n.GetAttribute("Action", null); 
+                actions.Add(s); 
+            }
+            
+            Array actions_array = actions.ToArray(typeof(string));
+            return (string[])actions_array;
+       }
+       
+       void ShowVerboseCommandHelpAll(Manifest! manifest)
+       {
+            string[]! actions = GetAllActions(manifest);
+            
+            foreach (string action in actions) {
+                InitializeParameters(action, manifest);
+                ShowVerboseCommandHelp(manifest, action);
+                Console.WriteLine();
+            }
+       }
+       
+       /**
+       <summary>
+            This method shows detailed help for a specific command.
+            It shows the command syntax, and information on each
+            parameter.
+       </summary>
+       */
+       void ShowVerboseCommandHelp(Manifest! manifest, string action)
+       {
+            Console.WriteLine("Help for command: " + action);
+
+            InitializeParameters(action, manifest);
+       
+            if (this.helpMsg != null) {
+                Console.WriteLine();
+                string[]! lines = BreakLineAtWords(this.helpMsg, 70);
+                foreach (string line in lines) {
+                    Console.WriteLine("    " + line);
+                }
+            }
+            
+            Console.WriteLine();
+            Console.WriteLine("Usage:");
+            string! syntax_summary = GetParameterSyntaxSummary(manifest, action);
+            Console.WriteLine("    " + syntax_summary);
+            
+            Console.WriteLine();
+            
+            // Now show parameter details.
+
+            if (parameterSet != null && parameterSet.Length != 0) {
+                Console.WriteLine("Parameters:");
+                Console.WriteLine();
+                
+                // 0 = parameter name
+                // 1 = parameter type
+                // 2 = mandatory?
+                // 3 = help text
+                const string parameter_format = "{0,-10} {1,-8} {2,-6} {3}";
+                
+                Console.WriteLine(parameter_format, "Name", "Type", "Req'd?", "Description");
+                Console.WriteLine(parameter_format, "====", "====", "======", "===========");
+                
+                if (parameterSet != null) {
+                    foreach (Parameter a in parameterSet) {
+                        if (a == null)
+                            continue;
+                        
+                        string! typestring = KindToString(a.Kind);
+                        const int max_length = 40;
+                        string! help = a.HelpMsg != null ? a.HelpMsg : "";
+                        if (help.Length > max_length) {
+                            string[]! help_lines = BreakLineAtWords(help, max_length);
+                            for (int i = 0; i < help_lines.Length; i++) {
+                                if (i == 0)
+                                    Console.WriteLine(parameter_format, a.Name, typestring, a.Mandatory ? "yes" : "no", help_lines[i]);
+                                else
+                                    Console.WriteLine(parameter_format, "", "", "", help_lines[i]);
+                            }
+                        } else {
+                            Console.WriteLine(parameter_format, a.Name, typestring, a.Mandatory ? "yes" : "no", a.HelpMsg != null ? a.HelpMsg : "");
+                        }
+                    }
+                }
+            }
+
+            // Console.WriteLine("\nExternal Channels needed:"); 
+            // manifest.SetEndpoints(null, action, true); 
+        } 
+        
+        private bool Parse(String[]! cmd, Manifest! manifest, out Process process, out string action)
+        {
+            string name; 
+            action = null; 
+            process = null; 
+            String[]  args = cmd; 
+            
+            // see if we have an action verb. If so determine if it is valid.
+            // if it is valid prime the parameter set based on it. 
+            if (cmd.Length > 1 && cmd[1] != null) {
+                assert cmd[1] != null; 
+                string! s = (!)cmd[1]; 
+                 if ( s[0] == '@'){
+                // we have an action.
+                    action = s.Substring(1);
+                    //Console.WriteLine("Action encountered action={0}",action); 
+                    if (!InitializeParameters(action,  manifest)) {
+                        Console.WriteLine("action init failed"); 
+                        return false; 
+                    }
+                    args = new String[cmd.Length -1];
+                    Array.Copy(cmd, 1, args, 0, cmd.Length-1);
+                }
+                else {
+                    if (!InitializeParameters(null, manifest)) {
+                        Console.WriteLine("parameter init failed"); 
+                        return false; 
+                    }
+                }
+            }
+            else {
+                if (!InitializeParameters(null, manifest)) {
+                    Console.WriteLine("parameter init failed"); 
+                    return false; 
+                }
+            }
+
+            //if ( cmd.Length == 1 ) return false; 
+            
+            appName = cmd[0]; 
+            assert appName != null; 
+            
+            if (args.Length > 1 && args[1] != null && args[1] == "-?") {
+                if (action != null) {
+                    ShowVerboseCommandHelp(manifest, action);
+                } else {
+                    ShowCommandsSummaryWithArgs(manifest); 
+                }
+                return false; 
+            }
+            
+            if (args.Length > 1 && args[1] != null && args[1] == "-??"){
+				ShowVerboseCommandHelpAll(manifest);
+				return false;
+            }
+
+            // FIXFIX: should really parse and validate all the args and cache values 
+            // BEFORE creating the process. Need to change data structures
+            //DebugStub.WriteLine("parameters.Parse creating new process"); 
+            process = new Process(appName, action, null); 
+            if (process == null) {
+                Console.WriteLine("Unable to create process {0} with action={1}",appName,action); 
+            }
+            
+            ArrayList extras = new ArrayList(); 
+                        
+            bool seenPositional = false; 
+            int positionalBase = 0; 
+            
+            Parameter a; 
+            for (int i=1; i < args.Length ; i++){
+                string p = args[i];
+                assert p != null; 
+                //Console.WriteLine("processing {0}", p); 
+                if (p[0] == '-') {
+                    // this is an optional arg 
+                    p = p.Substring(1);  
+                    if ( p== null || p == "") {
+                        Console.WriteLine("'-' with no parameter name is invalid");
+                        return false; 
+                    }
+                    ArrayList tokens = Tokenize(p, p.Length - 1, new char[] {'=', ':'});
+                    name = (string) tokens[0]; 
+                    a = FindParameter(name); 
+                    if (a != null) {
+                        //Console.WriteLine("found a match name={0}, rest={1} ", 
+                        //       a.Name, tokens.Count >=2 ? tokens[1]: "empty");
+                                
+                        if (tokens.Count == 1) { 
+                            //this is  potentially a bool parameter with no value 
+                            if (a.Kind == pType.boolType) {
+                                // set to opposite of default 
+                                string val = a.Default == "False" ? "True" : "False"; 
+                                bool ok =  ParseAndSetParameter(process, a, val); 
+                                if (!ok) return false;
+                                //Console.WriteLine("Setting {0} to {1}", a.Name, val); 
+                                    
+                            }
+                            else {
+                                Console.WriteLine("invalid parameter assignment");
+                                return false; 
+                            }
+                        } 
+                        if (tokens.Count == 2) {
+                            bool ok =  ParseAndSetParameter(process, a, (string)(!) tokens[1]); 
+                            if (!ok) return false;
+                        }
+                    }
+                    else {
+                        //unknown parameter 
+                        Console.WriteLine("Unknown parameter not set");
+                        return false; 
+                    } 
+                }
+                else {
+                    a = null; 
+                    if (!seenPositional) {
+                        seenPositional = true; 
+                        positionalBase = i;
+                    }
+                    assert i-positionalBase >= 0; 
+                    if (positionSet != null && (i-positionalBase) <  positionSet.Length ) {
+                        a = positionSet[i-positionalBase];
+                    }
+                    if (a != null) {
+                        //Console.WriteLine("Positional match: for {0} at {1} arrayIdx={2}",
+                        //   a.Name, a.Position, i); 
+                        bool ok =  ParseAndSetParameter(process, a, (string)(!) args[i]); 
+                        if (!ok) return false;
+                        
+                    }
+                    else {
+                        if (stringArrayCount != 1) {
+                            Console.WriteLine("{0} is not a known parameter.", p); 
+                        } 
+                        // add it to the Array List 
+                        // After processing all the tokens the list will be 
+                        // converted to  StringArray parameter if present
+                        extras.Add(args[i]);
+                        //return false; 
+                    }
+                }
+            }
+            
+             // check to see if all positional args were resolved
+             bool status = true; 
+             if (positionSet != null) {
+                for (int i=0; i < positionSet.Length; i++ ){
+                    Parameter p = positionSet[i];  
+                    if (p != null) {
+                        assert p.Name != null; 
+                        if (p.Resolved != true){
+                                if (p.Mandatory) { 
+                                    Console.WriteLine("Mandatory positional Parameter {0} at {1} not set.", 
+                                        p.Name, i); 
+                                    status = false; 
+                                }
+                        }
+                    }
+                }
+            }
+            
+             
+             // check to see if all mandatory args were resolved
+            if  (status == true) {
+             if (parameterSet != null) {
+                    for (int i=0; i < parameterSet.Length; i++ ){
+                        Parameter p = parameterSet[i];  
+                        assert p != null; 
+                        assert p.Name != null; 
+                     
+                        if (p.Mandatory == true){
+                            if (p.Resolved != true){
+                                Console.WriteLine("Mandatory Parameter {0} not set.", p.Name); 
+                                status = false; 
+                            }
+                        }
+                    }
+                }
+             }
+             // Set default values if needed on non mandatory parameters
+            if  (status == true) {
+                if (parameterSet != null) {
+                    for (int i=0; i < parameterSet.Length; i++ ){
+                        Parameter p = parameterSet[i];  
+                        assert p != null; 
+                        assert p.Name != null; 
+                        if (p.Kind == pType.stringArrayType) {
+                            // ignore defaults for string type.. 
+                            continue; 
+                        }
+                        if (p.Resolved != true && p.Default != null){
+                            //Console.WriteLine("setting default: {0}={1}", p.Name, p.Default); 
+                            ParseAndSetParameter(process, p, p.Default); 
+                        }
+                    }
+                }
+            }
+            // see if there were any extra args. If so pass them on to the process  
+            // if the manifest defined a StringArrayParameter
+            string[] strings = null; 
+            if (extras.Count > 0)  { 
+                // is there 1 ArrayParameter defined in the manifest?
+                //Console.WriteLine("extras={0}, arrayCount={1}", extras.Count, stringArrayCount); 
+                if (stringArrayCount == 1) {
+                    // Always send in if app requests is, even if 0 extra args
+                    strings = new string[extras.Count]; 
+                    for (int i=0; i < extras.Count; i++) {
+                        strings[i] = (string) extras[i]; 
+                        //Console.WriteLine("  strings[{0}]={1}",i,strings[i]); 
+                    }
+                    Console.WriteLine("Setting Strings to {0}", strings); 
+                    process.SetStartupStringArrayArg(0, strings);
+                }
+                else {
+                    Console.WriteLine("There is not exactly ONE StringArray parameter.\n " +  
+                    "Unsure where to place strings.\n" +
+                    "#of String Array parameters={0}",stringArrayCount); 
+                    return false; 
+                }
+            }
+            return status   ; 
+        }
+        
+        public bool ProcessParameters( String[] commandLine, Manifest manifest, out Process p, out string action)
+        {
+            ParameterCode code; 
+            long longValue; 
+            string stringValue; 
+            bool boolValue;
+            
+            action = null; 
+            p = null; 
+                
+            if (manifest == null) return false;
+            if (commandLine == null) return false; 
+            
+            return Parse( commandLine, manifest, out p, out action);
+        }
+    
+        private bool SetPosition(Parameter! p) 
+        {
+            bool result = true; 
+            if (p != null) {
+                if (p.Position != -1) {
+                    if (p.Position < 0 || p.Position > totalCount-1) {
+                        Console.WriteLine("{0} position index out of range ({1})",
+                            p.Name, p.Position); 
+                        result = false; 
+                    }
+                    else {
+                       if (positionSet != null) {
+                         positionSet[p.Position] = p; 
+                       }
+                       result = true; 
+                    }
+                }
+            }
+            return result; 
+        }
+        
+        public bool InitializeParameters(string actionName, Manifest! manifest)
+        {   
+            XmlNode  bools; 
+            XmlNode  strings; 
+            XmlNode  stringArrays; 
+            XmlNode  longs; 
+            XmlNode  ActionNode; 
+            int     pIndex; 
+
+            longCount   = 0; 
+            boolCount   = 0;
+            stringCount = 0; 
+            stringArrayCount = 0; 
+             
+            bools = null;
+            longs = null; 
+            strings = null;
+            stringArrays = null; 
+            parameterSet = null; 
+            positionSet = null;
+          
+            // Use Action to determine which set of parameters are going to be used. 
+            // If action is null we need to ensure there is 1 Parameter configuration 
+            // and its DefaultAction parameter is set to true. 
+            XmlNode actionNode  = manifest.GetCategoryNode(actionName);
+            if (actionNode == null)  {
+                if (actionName != null) {
+                    Console.WriteLine("Unknown action {0} recognized", actionName); 
+                }
+                else {
+                    Console.WriteLine("Unable to find default action"); 
+                }
+                return false; 
+            }
+
+            string categoryName = actionNode.GetAttribute("name","");
+
+#if VERBOSE
+            Console.WriteLine(" using category {0},  action={1}, default={2}",
+                    categoryName,
+                    actionNode.GetAttribute("Action",""),
+                    actionNode.GetAttribute("DefaultAction",false)); 
+#endif
+            if (categoryName  != "console") {
+                Console.WriteLine("This manifest's category is not 'console': ({0})", categoryName);
+                return false; 
+            }    
+                         
+            bools   = manifest.GetBoolParameterNode(actionNode); 
+            longs   = manifest.GetLongParameterNode(actionNode); 
+            strings = manifest.GetStringParameterNode(actionNode); 
+            stringArrays = manifest.GetStringArrayParameterNode(actionNode); 
+            helpMsg = manifest.GetHelpMessage(actionNode); 
+           
+            if ( bools == null && longs == null && strings == null && stringArrays == null) {
+                parameterSet = new Parameter[0]; 
+                positionSet = new Parameter[0]; 
+                return true; 
+            }
+            
+            if ( bools != null ) {
+                 boolCount = bools.GetAttribute("length", 0);
+            }
+
+            if ( longs != null ) {
+                longCount = longs.GetAttribute("length", 0);
+            }
+
+            if ( strings != null ) {
+                stringCount = strings.GetAttribute("length", 0);
+            }
+
+            if ( stringArrays != null ) {
+                stringArrayCount = stringArrays.GetAttribute("length", 0);
+            }
+
+            totalCount = stringCount + stringArrayCount + longCount + boolCount; 
+            
+            parameterSet = new Parameter[totalCount]; 
+            positionSet = new Parameter[totalCount]; 
+            if (totalCount == 0 ) return true; 
+
+            assert positionSet != null; 
+            assert parameterSet != null; 
+            
+            pIndex = 0; 
+            if ( bools != null ) {
+                if (boolCount > 0 ) {
+                    foreach (XmlNode! bp in bools.Children) {
+                        if ( bp.Name == "BoolParameter") {
+                            Parameter p = GetXmlAttributes(bp, pType.boolType); 
+                            if (!SetPosition(p)) return false;
+                            parameterSet[pIndex++] = p;
+                        }
+                    }
+                }
+            }
+
+            if ( longs != null ) {
+                if (longCount > 0 ) {
+                    foreach (XmlNode! lp in longs.Children) {
+                        if ( lp.Name == "LongParameter") {
+                            Parameter p = GetXmlAttributes(lp, pType.longType); 
+                            if (!SetPosition(p)) return false;
+                            parameterSet[pIndex++] = p;
+                        }
+                    }
+                }
+            }
+
+            if ( strings != null ) {
+                if (stringCount > 0 ) {
+                    foreach (XmlNode! sp in strings.Children) {
+                        if ( sp.Name == "StringParameter") {
+                            Parameter p = GetXmlAttributes(sp, pType.stringType); 
+                            if (!SetPosition(p)) return false;
+                            parameterSet[pIndex++] = p;
+                        }
+                    }
+                }
+            }
+
+            if ( stringArrays != null ) {
+                if (stringArrayCount > 0 ) {
+                    foreach (XmlNode! sp in stringArrays.Children) {
+                        if ( sp.Name == "StringArrayParameter") {
+                            Parameter p = GetXmlAttributes(sp, pType.stringArrayType); 
+                            if (!SetPosition(p)) return false;
+                            parameterSet[pIndex++] = p;
+                        }
+                    }
+                }
+            }
+
+            if ( positionSet != null && positionSet[0] != null) {   
+                havePositional = true;
+                bool seenNull = false;  
+                for (int i=0; i < positionSet.Length; i++) {
+                    if ( positionSet[i] == null ) {
+                        seenNull = true; 
+                        continue; 
+                    }
+                    if (seenNull) {
+                        Console.Write("Positional indices not contiguous!");  
+                        for (int j=0; j < positionSet.Length; j++) {
+                            Parameter p = positionSet[j];
+                            if (  p != null ) {
+                                Console.Write("{0}({1}) ",j, p.Name); 
+                            }              
+                        } 
+                        Console.WriteLine(); 
+                        return false; 
+                    } 
+                }
+            }
+            return true; 
+        }
+    }
+}
diff --git a/base/Libraries/Manifest/job.sg b/base/Libraries/Manifest/job.sg
new file mode 100644
index 0000000..6975c81
--- /dev/null
+++ b/base/Libraries/Manifest/job.sg
@@ -0,0 +1,491 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Job.cs
+//
+//  Note:
+//
+
+using System;
+using System.Text;
+using System.GC;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Processes;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Applications; 
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.ConsoleApplications
+{
+    // See WaitForChildThread below
+    internal contract WaitForChildContract {
+        out message Finish();
+        state Start: one {Finish! -> Done;}
+        state Done: one {}
+    }
+
+#region JobClasses 
+    public abstract class Job {
+        private string! commandLine;
+        protected TRef<UnicodePipeContract.Imp:READY>! stdinCell;
+        public readonly int Id;
+
+        private static int IdGenerator = 0;
+
+        public string Name {
+            get { return commandLine; }
+        }
+
+        protected Job(string! command, [Claims] UnicodePipeContract.Imp:READY! stdin) {
+            this.commandLine = command;
+            this.stdinCell = new TRef<UnicodePipeContract.Imp:READY>(stdin);
+            this.Id = IdGenerator++;
+        }
+
+        public UnicodePipeContract.Imp:READY! AcquireStdin() {
+            return this.stdinCell.Acquire();
+        }
+
+        public void ReleaseStdin([Claims] UnicodePipeContract.Imp:READY! stdin) {
+            this.stdinCell.Release(stdin);
+        }
+
+
+        public string StatusName {
+            get {
+                switch (this.Status) {
+                case ProcessState.Stopped:
+                    return "Stopped";
+                case ProcessState.Suspended:
+                    return "Suspended";
+                case ProcessState.Active:
+                    return "Active";
+                default:
+                    return "Unknown";
+                }
+            }
+        }
+
+        public ProcessState Status {
+            get {
+                Process p = this.Process;
+                if (p == null) {
+                    return ProcessState.Stopped;
+                }
+                return p.State;
+            }
+        }
+
+        public int ExitCode {
+            get {
+                Process p = this.Process;
+                if (p == null) {
+                    return 0;
+                }
+                return p.ExitCode;
+            }
+        }
+
+        public virtual void Dispose() {
+        }
+
+        public abstract Process Process { get; }
+
+        public void Stop() {
+            Process p = this.Process;
+            if (p != null) {
+                p.Stop();
+            }
+        }
+
+        public void Suspend() {
+            Process p = this.Process;
+            if (p != null) {
+                p.Suspend(false);
+            }
+        }
+
+        public void Resume() {
+            Process p = this.Process;
+            if (p != null) {
+                p.Resume(false);
+            }
+        }
+    }
+
+    public class SingleProcessJob : Job {
+
+        Process process;
+
+        private static string! CommandLineString(string[]! command)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach(string s in command) {
+                sb.Append(s);
+                sb.Append(' ');
+            }
+            return sb.ToString();
+        }
+
+        public SingleProcessJob(string[]! command, Process p,
+                                [Claims] UnicodePipeContract.Imp:READY! stdin)
+            : base(CommandLineString(command), stdin)
+        {
+            this.process = p;
+        }
+
+        public override Process Process {
+            get { return this.process; }
+        }
+
+        public override void Dispose() {
+            Process p = this.process;
+            if (p != null) {
+                p.Dispose(true);
+            }
+            base.Dispose();
+        }
+    }
+
+    public class PipeJob : Job {
+        Process[]! processes ;
+
+        public PipeJob(string! command,
+                       [Claims] UnicodePipeContract.Imp:READY! stdin,
+                       Process[]! processes)
+            : base(command, stdin)
+        {
+            this.processes = processes;
+        }
+
+        public override Process Process {
+            get {
+                int c = processes.Length;
+                if (c <= 0) return null;
+
+                return (Process)this.processes[c-1];
+            }
+        }
+
+        public override void Dispose() {
+            foreach (Process! p in this.processes) {
+                p.Dispose(true);
+            }
+            base.Dispose();
+        }
+    }
+
+#endregion
+    public class JobControl : ITracked {
+
+        PipeMultiplexer! outputControl;
+        Hashtable! jobs; // maps ints to jobs
+        ParameterProcessor  parameterProcessor; 
+        
+        public JobControl([Claims] PipeMultiplexer! outputControl) {
+            this.outputControl = outputControl;
+            this.jobs = new Hashtable();
+        }
+
+        public UnicodePipeContract.Imp:READY FreshStdout() {
+            expose(this) {
+                return this.outputControl.FreshClient();
+            }
+        }
+
+        private void RemoveStoppedJobs() {
+            ArrayList toRemove = new ArrayList();
+            foreach (int i in jobs.Keys) {
+                Job job = (Job)this.jobs[i];
+                assert job != null;
+                if (job.Status == ProcessState.Stopped) {
+                    job.Dispose();
+                    toRemove.Add(i);
+                }
+            }
+            foreach (int i in toRemove) {
+                Console.WriteLine("[{0}] Done.", i);
+                this.jobs.Remove(i);
+            }
+        }
+        /// <summary>
+        /// Provides enumeration of non-exited jobs
+        /// </summary>
+        public IEnumerator GetEnumerator() {
+            RemoveStoppedJobs();
+            return this.jobs.Keys.GetEnumerator();
+        }
+
+        public Job this[int i] {
+            get {
+                return (Job)this.jobs[i];
+            }
+        }
+
+        public void Add(Job! job) {
+            jobs[job.Id] = job;
+        }
+
+        public void Dispose()
+        {
+            this.outputControl.Dispose();
+        }
+
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+    }
+
+    public class ConsoleJob : ITracked
+    {
+        private Process process;
+        private string[] cmdLine; 
+        private string cmdName;
+        private Job job;
+        
+        public ConsoleJob()
+        {
+            Binder.Initialize();
+        }
+        
+        public  bool CreateProcess(  DirectoryServiceContract.Imp:Ready! ds,
+                                     JobControl! jobControl,
+                                     String[]! commandLine,
+                                     ParameterProcessor! parameterProcessor 
+                                     )
+        {
+            string path;
+            string action;
+            bool ok; 
+            
+            assert parameterProcessor != null;
+            assert jobControl != null; 
+            assert ds != null; 
+            
+            if ( !ds.InState(DirectoryServiceContract.Ready.Value) ) {
+                Console.WriteLine("ConsoleJob:CreateProcess: directory service endpoint not in Ready state"); 
+                return false;
+            }
+
+            //DebugStub.Break();
+            string cmdName  = commandLine[0]; 
+            if (cmdName == null) {
+                Console.WriteLine("ConsoleJob.CreateProcess: no command name given");
+                return false; 
+            }
+            Console.Write(" ConsoleJob.CreateProcess: cmd=");
+            for (int i=0; i < commandLine.Length; i++) {
+                Console.Write("{0} ",commandLine[i]);
+            }
+            Console.Write("\n");
+            
+            try {
+                 UnicodePipeContract.Imp:READY childStdout;
+                expose(this) {
+                   childStdout = jobControl.FreshStdout();
+                }
+                if (childStdout == null) {
+                    // output multiplexer dead (which means that we shouldn't use Console.WriteLine
+                    DebugStub.WriteLine("-- Can't get new output pipe");
+                    return false;
+                }
+
+                
+                Manifest manifest = Binder.LoadManifest(ds, cmdName);
+                if (manifest != null) {
+                    if (manifest.HasParameters()) {
+                        //Console.WriteLine("Has parameters");
+                        ok = false; 
+                        action = null;
+                        if (parameterProcessor != null) {
+                            ok = parameterProcessor.ProcessParameters(commandLine,
+                                    manifest, out process, out action);
+                        }
+                        if (!ok) {
+                            //Console.WriteLine(" failed to process parameters"); 
+                            delete childStdout;
+                            return false;
+                        }
+                        else {
+                            assert process != null;
+                            Console.WriteLine(" ConsoleJob: setting endpoints for {0}, action=({1})",  cmdName, action);
+                            int result = manifest.SetEndpoints(process, action, false);
+                            if (result < 0) {
+                                Console.WriteLine("Unable to set all endpoints for this process.");
+                                delete childStdout;
+                                return false;
+                            }
+                        }
+                    }
+                    else {
+                        DebugStub.WriteLine("manifest has no parameters. Must be old style: NOT SUPPORTED");
+                        //Console.WriteLine("manifest has no parameters");
+                        //this.process = new Process(commandLine, null, 2);
+                        delete childStdout;
+                        return false;
+                    }
+                }
+                else {
+                    Console.WriteLine("'{0}' is not a command or has no manifest",
+                                        commandLine[0]);
+                    //process = new Process(commandLine, null, 2);
+                    delete childStdout;
+                    return false;
+                }
+
+                UnicodePipeContract.Imp! stdinImp;
+                UnicodePipeContract.Exp! stdinExp;
+                UnicodePipeContract.NewChannel(out stdinImp, out stdinExp);
+
+                this.job = new SingleProcessJob(commandLine, this.process, stdinImp);
+
+                this.process.SetStartupEndpoint(0, (Endpoint * in ExHeap) stdinExp);
+                this.process.SetStartupEndpoint(1, (Endpoint * in ExHeap) childStdout);
+
+                jobControl.Add(this.job);
+                ok = true; 
+
+            }
+            catch (ProcessCreateException) {
+                Console.Write("Unsupported command: {0}", commandLine[0]);
+                ok = false;
+            }
+            catch (Exception e) {
+                Console.Write("Can't create {0}: Exception '{1}' caught.", commandLine[0],
+                                e.Message);
+                 ok = false;
+            }
+            return ok;
+        }
+        
+        public bool Start()
+        {
+            if (this.process == null) return false; 
+            this.process.Start(); 
+            return true; 
+        }
+
+       
+        public  void Dispose() {
+            Job j = this.job;
+            if (j != null) {
+                j.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Copy and echo characters from shell stdin to job stdin.
+        /// Wait for either the job to exit gracefully, or for the user
+        /// to press control-c or control-z.
+        ///
+        /// Known limitation: if the child process opens
+        /// its own keyboard channel, the shell may never see the control-c
+        /// message.
+        /// </summary>
+        public   int WaitForJob()
+        {
+            if (this.job == null) {
+                DebugStub.WriteLine("ConsoleJob.WaitForJob: job is null!"); 
+                return -1; 
+            } 
+            if ( this.process == null) {
+                DebugStub.WriteLine("ConsoleJob.WaitForJob: process is null!"); 
+                return -1; 
+            }
+
+            WaitForChildContract.Imp! imp;
+            WaitForChildContract.Exp! exp;
+            WaitForChildContract.NewChannel(out imp, out exp);
+
+            try {
+                WaitForChildThread.StartWaiting(job.Process,
+                                                new TRef<WaitForChildContract.Exp:Start>(exp));
+
+                while (true) {
+                    // invariant exChar != null && childStdInReady.Head(ep) ||
+                    //           exChar == null && childStdInReady.Empty
+                    switch receive {
+
+                        case imp.Finish():
+                            //Console.WriteLine("finish");
+                            int exitCode = job.ExitCode;
+                            job.Dispose();
+                            return exitCode;
+                    }
+                }
+            }
+            finally {
+                delete imp;
+            }
+        }
+
+        // [Hawblitzel] TODO: better ways to wait on a child process
+        private class WaitForChildThread
+        {
+            private Process! process;
+            private TRef<WaitForChildContract.Exp:Start>! expRef;
+
+            private WaitForChildThread(Process! process,
+                                       TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                this.process = process;
+                this.expRef = expRef;
+                base();
+            }
+
+            public static void StartWaiting(Process process,
+                                            TRef<WaitForChildContract.Exp:Start>! expRef)
+            {
+                if (process == null) {
+                    WaitForChildContract.Exp exp = expRef.Acquire();
+                    exp.SendFinish();
+                    delete exp;
+                    return;
+                }
+
+                WaitForChildThread wft = new WaitForChildThread(process, expRef);
+                Thread t = new Thread(new ThreadStart(wft.Wait));
+                t.Start();
+            }
+
+            private void Wait()
+            {
+                process.Join();
+                WaitForChildContract.Exp exp = expRef.Acquire();
+                exp.SendFinish();
+                delete exp;
+            }
+        }
+
+        public static JobControl! StartOutputPipeThread() {
+            UnicodePipeContract.Exp! newOutputExp;
+            UnicodePipeContract.Imp! newOutputImp;
+            UnicodePipeContract.NewChannel(out newOutputImp, out newOutputExp);
+
+            UnicodePipeContract.Imp stdOut = ConsoleOutput.Swap(newOutputImp);
+            if (stdOut == null) {
+                DebugStub.WriteLine("Shell not connected to a pipe output!");
+                throw new ApplicationException("Can't go on");
+            }
+            PipeMultiplexer pm = PipeMultiplexer.Start(stdOut, newOutputExp);
+            return new JobControl(pm);
+        }
+        
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+    }
+}
diff --git a/base/Libraries/NetStack.Channels.Public/ChannelUtils.sg b/base/Libraries/NetStack.Channels.Public/ChannelUtils.sg
new file mode 100644
index 0000000..79eff84
--- /dev/null
+++ b/base/Libraries/NetStack.Channels.Public/ChannelUtils.sg
@@ -0,0 +1,52 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelUtils.sg
+//  Note:   Utilities for using the NetStack channels
+//
+
+using System;
+using System.Net.IP;
+using NetStack.Contracts;
+
+namespace NetStack.Channels.Public
+{
+    public class ChannelUtils
+    {
+        public static string AddressToString(uint address)
+        {
+            return String.Format("{0}.{1}.{2}.{3}",
+                                 (address & 0xff000000) >> 24,
+                                 (address & 0x00ff0000) >> 16,
+                                 (address & 0x0000ff00) >> 8,
+                                 (address & 0x000000ff));
+        }
+
+        public static string HardwareAddressToString(HardwareAddress addr)
+        {
+            return String.Format("{0:x2}:{1:x2}:{2:x2}:{3:x2}:{4:x2}:{5:x2}",
+                                 addr.b0, addr.b1, addr.b2, addr.b3, addr.b4, addr.b5);
+        }
+
+        public static string NetworkToString(Network nwrk)
+        {
+            return AddressToString(nwrk.network) + " / " + AddressToString(nwrk.netmask);
+        }
+
+        public static Network NetworkToChannelNetwork(IPv4Network nwrk)
+        {
+            Network retval = new Network();
+            retval.network = (uint)nwrk.Network;
+            retval.netmask = (uint)nwrk.NetMask;
+            return retval;
+        }
+
+        public static IPv4Network ChannelNetworkToNetwork(Network nwrk)
+        {
+            return new IPv4Network(new IPv4(nwrk.network), new IPv4(nwrk.netmask));
+        }
+    }
+}
diff --git a/base/Libraries/NetStack.Channels.Public/DNSImpConnection.sg b/base/Libraries/NetStack.Channels.Public/DNSImpConnection.sg
new file mode 100644
index 0000000..c8e90c2
--- /dev/null
+++ b/base/Libraries/NetStack.Channels.Public/DNSImpConnection.sg
@@ -0,0 +1,113 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DNSImpConnection.gs
+//  Note:   Client-side helper for the IP Channel Contract
+//
+
+using System;
+using System.Threading;
+using System.Net.IP;
+using Drivers.Net;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Runtime;
+
+namespace NetStack.Channels.Public
+{
+    public class DNSImpConnection
+    {
+        // Converts the results of GerNameServers to IPv4 structures
+        public static IPv4[]! GetNameServers(DNSContract.Imp:ReadyState! ep)
+        {
+            uint[] in ExHeap addrList;
+            ep.SendGetNameServers();
+            ep.RecvAddressList(out addrList);
+
+            try
+            {
+                IPv4[] retval;
+                if (addrList == null) {
+                    retval = new IPv4[0];
+                }
+                else {
+                    retval = new IPv4[addrList.Length];
+                    for (int i = 0; i < addrList.Length; ++i)
+                    { 
+                        retval[i] = new IPv4(addrList[i]); 
+                    }
+                }
+
+                return retval;
+            }
+            finally
+            {
+                delete addrList;
+            }
+        }
+
+        // Converts the retrieved address(es) to IPv4 structures.
+        // Returns true iff the named host was found successfully.
+        public static bool Resolve(DNSContract.Imp! ep, string name,
+                                   out string[] aliases, out IPv4[] addrs)
+        {
+            aliases = null;
+            addrs = null;
+
+            ep.SendResolve(Bitter.FromString(name));
+
+            switch receive
+            {
+                case ep.RecvDNSResults(uint[] in ExHeap addrList,
+                                       char[][] in ExHeap aliasesResult) :
+                {
+                    try
+                    {
+                        if (aliasesResult != null)
+                        {
+                            aliases = new string[aliasesResult.Length];
+
+                            for (int i = 0; i < aliasesResult.Length; ++i)
+                            {
+                                expose (aliasesResult[i]) {
+                                    aliases[i] = Bitter.ToString(aliasesResult[i]);
+                                }
+                            }
+                        }
+                        else {
+                            aliases = new string[0];
+                        }
+                        if (addrList != null) {
+                            addrs = new IPv4[addrList.Length];
+
+                            for (int i = 0; i < addrList.Length; ++i)
+                            { addrs[i] = new IPv4(addrList[i]); }
+                        }
+                        else {
+                            addrs = new IPv4[0];
+                        }
+                        return true; // success;
+                    }
+                    finally
+                    {
+                        delete aliasesResult; // does deep freeing
+                        delete addrList;
+                    }
+                }
+                break;
+
+                case ep.RecvNotFound() :
+                    return false; // failure
+                    break;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/base/Libraries/NetStack.Channels.Public/NetStack.Channels.Public.csproj b/base/Libraries/NetStack.Channels.Public/NetStack.Channels.Public.csproj
new file mode 100644
index 0000000..1e426cf
--- /dev/null
+++ b/base/Libraries/NetStack.Channels.Public/NetStack.Channels.Public.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Netstack.Channels.Public\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <ItemGroup>
+    <Compile Include="ChannelUtils.sg" />
+    <Compile Include="DNSImpConnection.sg" />    
+  </ItemGroup>
+
+  <PropertyGroup>
+    <AssemblyName>NetStack.Channels.Public</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="..\Drivers.Net\Drivers.Net.csproj" />
+    <ProjectReference Include="..\System.Net.IP\System.Net.IP.csproj" />
+  </ItemGroup>
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Libraries/Ntlm/Ntlm.csproj b/base/Libraries/Ntlm/Ntlm.csproj
new file mode 100644
index 0000000..f40f1af
--- /dev/null
+++ b/base/Libraries/Ntlm/Ntlm.csproj
@@ -0,0 +1,35 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Xxx\Xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>System.Security.Protocols.Ntlm</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="NtlmMessages.sg" />
+    <Compile Include="NtlmSupplicant.sg" />
+    <Compile Include="NtlmUtil.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Crypto\Crypto.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Ntlm/NtlmClientCredentials.sg b/base/Libraries/Ntlm/NtlmClientCredentials.sg
new file mode 100644
index 0000000..828300e
--- /dev/null
+++ b/base/Libraries/Ntlm/NtlmClientCredentials.sg
@@ -0,0 +1,5 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
diff --git a/base/Libraries/Ntlm/NtlmMessages.sg b/base/Libraries/Ntlm/NtlmMessages.sg
new file mode 100644
index 0000000..9f22641
--- /dev/null
+++ b/base/Libraries/Ntlm/NtlmMessages.sg
@@ -0,0 +1,243 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NtlmMessages.cs
+//
+//  Note:
+//
+//		This file contains structures and enumerated types of the NTLM 
+//		authentication protocol.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace System.Security.Protocols.Ntlm
+{
+    class NtlmConstants
+    {
+#if false
+        public static readonly byte[]! MessageSignature = {
+            (byte)'N',
+            (byte)'T',
+            (byte)'L',
+            (byte)'M',
+            (byte)'S',
+            (byte)'S',
+            (byte)'P',
+            0
+        };
+#endif
+        
+        // This is the NTLM message signature, encoded as a little-endian ulong.
+        public const ulong MessageSignature64Le = 
+			((ulong)'N')
+			| (((ulong)'T') << 8)
+			| (((ulong)'L') << 0x10)
+			| (((ulong)'M') << 0x18)
+			| (((ulong)'S') << 0x20)
+			| (((ulong)'S') << 0x28)
+			| (((ulong)'P') << 0x30)
+			/* 0x38 position is zero */;
+
+        public const int HeaderLength = 0x10;
+
+        public const int ChallengeLength = 8;
+
+    }
+
+    public enum NtlmMessageType
+    {
+        Negotiate = 1,
+        Challenge = 2,
+        Response = 3,
+    }
+
+	/**
+		<summary>
+			All NTLMSSP messages begin with this header.
+		</summary>
+	*/
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct NtlmMessageHeader
+	{
+		/** <summary>
+			This value should always be "NTLMSSP\0", encoded as a little-endian 64-bit ulong.
+			NtlmConstants.MessageSignature64Le encodes this value.
+			</summary>
+		*/
+		public ulong Signature;
+		
+		/** <summary>A value from NtlmMessageType.</summary> */
+		public uint MessageType;
+	}
+	
+    /**
+		<summary>
+			The Negotiate message is the first message in an NTLM exchange.
+			The client (supplicant) sends this message to the server, requesting a session
+			and indicating what kind of options this client supports.  The OemDomainName
+			and OemWorkstationName values can be provided for diagnostics and logging,
+			but the server is under no obligation to trust them.
+		</summary>
+    */
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct NtlmNegotiateMessage
+	{
+		public NtlmMessageHeader Header;
+		public uint NegotiateFlags;
+		public BufferRegion OemDomainName;
+		public BufferRegion OemWorkstationName;
+		public ulong Version;
+	}
+
+    [Flags]
+    public enum NtlmNegotiateFlags
+    {
+        None = 0,
+
+		/** <summary>Text strings are in unicode</summary> */
+        NegotiateUnicode = 0x00000001,
+        
+        /** <summary>Text strings are in OEM</summary> */
+        NegotiateOem = 0x00000002,
+        
+        /** <summary>Server should return its authentication realm</summary> */
+        RequestTarget = 0x00000004,
+
+		/** <summary>Request signature capability</summary> */
+        NegotiateSign = 0x00000010,
+        
+        /** <summary>Request confidentiality</summary> */
+        NegotiateSeal = 0x00000020,
+        
+        /** <summary>Use datagram style authentication</summary> */
+        NegotiateDatagram = 0x00000040,
+        
+        /** <summary>Use LM session key for sign/seal</summary> */
+        NegotiateLmKey = 0x00000080,
+
+		/** <summary>NetWare authentication</summary> */
+        NegotiateNetware = 0x00000100,
+        
+        /** <summary>NTLM authentication</summary> */
+        NegotiateNtlm = 0x00000200,
+        
+        /** <summary>NT authentication only (no LM)</summary> */
+        NegotiateNtOnly = 0x00000400,
+        
+        /** <summary>NULL Sessions on NT 5.0 and beyond</summary> */
+        NegotiateNullSession = 0x00000800,
+
+		/** <summary>Domain Name supplied on negotiate</summary> */
+        NegotiateOemDomainSupplied = 0x1000,
+        
+        /** <summary>Workstation Name supplied on negotiate</summary> */
+        NegotiateOemWorkstationSupplied = 0x2000,
+        
+        /** <summary>Indicates client/server are same machine</summary> */
+        NegotiateLocalCall = 0x00004000,
+        
+        /** <summary>Sign for all security levels</summary> */
+        NegotiateAlwaysSign = 0x00008000,
+    }
+
+	/**
+	<summary>
+		<para>
+			Describes the header for the NTLM "Challenge" message.  This message is also known as an
+			NTLM "Type 3" message.  This message is sent from a server (authenticator) to a client 
+			(supplicant).  The server generates a random 8-byte challenge (nonce).
+		</para>
+	</summary>
+	*/
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct NtlmChallengeMessage
+	{
+		public NtlmMessageHeader Header;
+		
+		/**
+		<summary>
+			The domain name (realm name) of the server.  This value may or may not be present.
+			If the NtlmNegotiateFlag.RequestTarget flag is set in the Negotiate message, then 
+			the client requests this field, but the server is not obligated to send this value.
+		</summary>
+		*/
+		public BufferRegion TargetName;
+
+		/** <summary>The set of negotiation flags that the server has agreed to.</summary> */
+		public uint NegotiateFlags;
+		
+		/** <summary>The 8-byte challenge, encoded as a 64-bit integer.</summary> */
+		public ulong PackedChallenge;
+		
+		// The contents of the TargetName follow.
+	}	
+
+
+	/**
+	<summary>
+		<para>
+			This structure describes the header for the NTLM "Response" message, also known as the NTLM
+			"Type 3" message.  This message is sent from the client (supplicant) to the server (authenticator),
+			and is the last message in the exchange.  This message proves that the client has valid credentials.
+		</para>
+	</summary>
+	*/	
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct NtlmResponseMessage
+	{
+		public NtlmMessageHeader Header;
+		
+		/** <summary>Describes the size and location of the LAN Manager response.</summary> */
+		public BufferRegion LmChallengeResponse;
+		
+		/** <summary>Describes the size and location of the NT response.</summary> */
+		public BufferRegion NtChallengeResponse;
+		
+		/** <summary>Describes the size and location of the domain name of the authenticating user.</summary> */
+		public BufferRegion DomainName;
+		
+		/** <summary>Describes the size and location of the username of the authenticating user.</summary> */
+		public BufferRegion UserName;
+		
+		/** <summary>Describes the size and location of the workstation name (computer name) of the client's computer.</summary> */
+		public BufferRegion Workstation;		
+		
+		// The contents of the many BufferRegion fields follow.
+	}
+
+	/**
+	<summary>
+		<para>
+			Identifies a region within a buffer.  This structure is compatible with the STRING32 structure
+			used by NT, which is used to describe the offset and length of variable-length strings that are
+			stored after a fixed-length message header.
+		</para>
+		
+		<para>			
+			NTLM uses this structure to describe the size and location variable-length strings in NTLMSSP messages.
+		</para>
+	</summary>
+	*/
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct BufferRegion
+	{
+		public ushort Length;				// the length in bytes of the string
+		public ushort MaximumLength;		// the maximum number of bytes to write to the buffer (n/a in networking!)
+		public ushort Offset;				// offset within the message of this string
+		public ushort Reserved;				// always zero
+		
+		public BufferRegion(ushort length, ushort maximumLength, ushort offset)
+		{
+			this.Length = length;
+			this.MaximumLength = maximumLength;
+			this.Offset = offset;
+			this.Reserved = 0;
+		}
+	}
+}
diff --git a/base/Libraries/Ntlm/NtlmSupplicant.sg b/base/Libraries/Ntlm/NtlmSupplicant.sg
new file mode 100644
index 0000000..5c1da67
--- /dev/null
+++ b/base/Libraries/Ntlm/NtlmSupplicant.sg
@@ -0,0 +1,565 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NtlmSupplicant.cs
+//
+//  Note:
+//
+//		This file contains an implementation of the NTLM v1 authentication 
+//		protocol.
+//
+//		This implementation contains only the logic for building, parsing, and
+//		validating, etc. NTLM messages and hashes.  This code does not handle
+//		anything related to a specific application of NTLM; it does not handle
+//		storing or retrieving credentials, nor does it handle transmitting
+//		NTLM messages to or from remote applications.  All of that logic depends
+//		on the situation in which NTLM is used, and so is omitted.
+//
+//		The NtlmSupplicant class provides methods for computing the NTLM v1
+//		hashes (both Lan Man and NT hashes), given a username, password, and
+//		a challenge (nonce) received from the authenticator (server).  These
+//		methods can be used in two different ways: they can act directly on
+//		already-parsed fields (useful when the application carries the fields
+//		separately, as basic SMB authentication does), or they can act on
+//		NTLMSSP messages.
+//
+//		NTLMSSP messages are those that are produced and consumed by the Windows
+//		NTLM SSPI package.  These messages are treated as opaque byte blobs by
+//		application protocols, and the NTLM SSPI package handles building and
+//		parsing these messages.  This simplifies integration of NTLM into
+//		application protocols, and also enables NTLM to be used with the SPNEGO
+//		multi-protocol negotiation protocol.
+//
+//
+// TODO:
+//
+//		*	Only the supplicant logic is provided.  Need to provide the methods that
+//			an authenticator would need.
+//
+//		*	Byte-order cleanup.  The protocol is little-endian.
+//
+//		*	NTLM v2
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.Singularity;
+using System.Security.Cryptography;
+using Utils;
+
+namespace System.Security.Protocols.Ntlm
+{
+	/**
+	<summary>
+		<para>
+			Implements the NTLM authentication protocol.
+		</para>
+		<para>
+			This is a "static" class; there are no instance fields or methods.
+			None of the methods of this class have any side-effects, outside of
+			operating on the parameters passed to them.
+		</para>
+	</summary>
+	*/
+    public /*static*/ sealed class NtlmSupplicant 
+    {
+		private NtlmSupplicant() {}
+		
+		/**
+			<summary>
+				Builds an NTLMSSP "Negotiate" message, which begins an NTLM authentication exchange.
+				The caller supplies negotiation flags, which request certain behaviors, as well as
+				the domain name and workstation name of the client computer.
+			</summary>
+
+			<remarks>
+				<para>
+					The caller can also provide the domain name and workstation name of the client.
+					These values are not required, and are usually used for event logging.
+				</para>
+				<para>
+					This method does not have any side-effects.
+				</para>
+			</remarks>
+			
+			<param name="flags">
+				Enables certain NTLM options.  See the NtlmNegotiateFlags enumerated type for more info.
+			</param>	
+			<param name="domain">
+				The domain name of the client computer.  If the caller does not want
+				to provide this information, pass an empty string.
+			</param>
+			<param name="workstation">
+				The name of the client computer.  If the caller does not want to provide this information,
+				then pass an empty string.
+			</param>
+			<returns>
+				A buffer containing the encoded NTLMSSP "Negotiate" message.  This message should be sent 
+				to any application that supports NTLM authentication, using whatever transport mechanism 
+				is appropriate for the application.
+			</returns>
+		*/
+        public static byte[]! GetNegotiate(NtlmNegotiateFlags flags, string! domain, string! workstation)
+        {
+            Encoding encoding = Encoding.Unicode;
+            
+			// Build the fixed-length header of the message.  Also, compute the offsets and lengths
+			// of the variable-length fields (the strings).			
+
+			NtlmNegotiateMessage negotiate;			
+			negotiate.Header.MessageType = (uint)NtlmMessageType.Negotiate;
+			negotiate.Header.Signature = NtlmConstants.MessageSignature64Le;
+			negotiate.NegotiateFlags = (uint)(flags |
+                NtlmNegotiateFlags.RequestTarget
+                | NtlmNegotiateFlags.NegotiateNtlm
+                | NtlmNegotiateFlags.NegotiateNtOnly
+                | NtlmNegotiateFlags.NegotiateLmKey
+                | NtlmNegotiateFlags.NegotiateUnicode);
+            negotiate.Version = 0;
+            negotiate.OemDomainName = new BufferRegion((ushort)encoding.GetByteCount(domain), 0, (ushort)sizeof(NtlmNegotiateMessage));
+			negotiate.OemWorkstationName = new BufferRegion((ushort)encoding.GetByteCount(workstation), 0, (ushort)(sizeof(NtlmNegotiateMessage) + negotiate.OemDomainName.Length));
+
+			// Next, allocate the buffer, store the fixed-length header, and store the variable-length strings.
+			int messageLength = sizeof(NtlmNegotiateMessage) + negotiate.OemDomainName.Length + negotiate.OemWorkstationName.Length;
+			byte[]! negotiateBuffer = new byte[messageLength];
+			
+			ref NtlmNegotiateMessage negotiate_ref = ref negotiateBuffer[0];
+			negotiate_ref = negotiate; // copy the header
+			encoding.GetBytes(domain, 0, domain.Length, negotiateBuffer, negotiate.OemDomainName.Offset);
+			encoding.GetBytes(workstation, 0, workstation.Length, negotiateBuffer, negotiate.OemWorkstationName.Offset);
+
+            return negotiateBuffer;
+        }
+
+		#region From my DES port
+		
+        static byte[]! Convert7ByteKeyTo8ByteKey(byte[]! input)
+        {
+            // we pack the input into the HIGH bits of a 64-bit unsigned int
+            ulong x =
+                ((ulong)input[0] << 0x38) |
+                ((ulong)input[1] << 0x30) |
+                ((ulong)input[2] << 0x28) |
+                ((ulong)input[3] << 0x20) |
+                ((ulong)input[4] << 0x18) |
+                ((ulong)input[5] << 0x10) |
+                ((ulong)input[6] << 0x08);
+
+
+            ulong a = x;
+
+            byte[]! result = new byte[8];
+            for (int i = 0; i < 8; i++)
+            {
+                // the LOWEST bit is the parity bit
+                // right now, we always set the parity bit to 0
+                byte b = (byte)((a >> 56) & 0xfe);
+                b = FixParity0(b); // this isn't actually necessary
+                result[i] = b;
+
+                a <<= 7;
+            }
+
+            return result;
+        }
+
+        // bit 0 is the parity bit!
+        static byte FixParity0(byte b)
+        {
+            byte temp = b;
+
+            int parity = 0;
+            for (int i = 1; i < 8; i++)
+            {
+                parity ^= temp & 2;
+                temp >>= 1;
+            }
+
+            if (parity == 0)
+                return (byte)(b | 1);
+            else
+                return (byte)(b & 0xfe);
+        }
+        #endregion
+
+		/**
+		<summary>
+			<para>	
+				This method computes part of the NTLM hash function.  It operates on part of the password, 7 characters
+				at a time, and computes a hash of them.  The hash is then stored in the 'output' buffer at the offset
+				'outputindex'.  The hash is always 8 bytes long, so the 'output' buffer needs to have a length of at
+				least outputindex + 8.
+			</para>
+			<para>
+				This hash function is known to be cryptographically weak.
+			</para>
+			<para>
+				This method only works on passwords that contain only 7-bit ASCII character.
+				Lower-case characters are forced to upper-case.
+			</para>
+		</summary>
+		<param name="password">
+			The cleartext password of the user.
+			The method will read up to 7 characters of the password, starting at 'passwordindex'.
+		</param>
+		<param name="passwordindex">
+			The index of the first character within 'password' to read.
+			This value may legally be greater than or equal to the length of 'password'.
+			The method will read the first 7 characters, beginning at this index, and if there
+			are fewer than 7 valid characters (including no characters), the method will pad
+			with zeroes.
+		</param>
+		<param name="output">
+			The output buffer in which to store the 8-byte hash of the portion of the password.
+			The length of this buffer must be at least 'outputindex' + 8.
+		</param>
+		<param name="outputindex">The position within the 'output' buffer to store the hash.</param>
+		*/
+        static void ComputeLmResponseHalf(string! password, int passwordindex, byte[]! output, int outputindex)
+			requires passwordindex >= 0;
+			// requires passwordindex <= password.Length; <-- This is *NOT* a precondition!
+			requires outputindex >= 0;
+			requires outputindex + 8 <= output.Length;
+        {
+            byte[]! desKey7 = new byte[7];
+            for (int i = 0; i < 7; i++)
+            {
+                if (i + passwordindex < password.Length) {
+					char c = password[passwordindex + i];
+					if (c >= 0x80)
+						throw new ArgumentException("The password provided cannot be encoded.  NTLM/LM v1 does not support non-ASCII characters.");
+                    desKey7[i] = (byte)Char.ToUpper(c);
+                }
+                else
+                    desKey7[i] = 0;
+            }
+
+            byte[]! desKey8 = Convert7ByteKeyTo8ByteKey(desKey7);
+            byte[]! cleartext = new byte[8];
+            
+            const string cleartext_string = "KGS!@#$%";
+            
+            for (int i = 0; i < 8; i++)
+                cleartext[i] = (byte)cleartext_string[i];
+
+            byte[]! cipher = new byte[8];
+            Des.Encrypt(desKey8, cleartext, cipher);
+            for (int i = 0; i < 8; i++)
+                output[i + outputindex] = cipher[i];
+        }
+
+		/**
+		<summary>
+			This method computes the NTLM v1 One-Way Function.
+		</summary>
+		<param name="challenge">Contains the 8-byte challenge (nonce) generated by the server.</param>
+		<param name="hash">
+			Contains the 21-byte intermediate password hash.
+			This buffer must be exactly 21 bytes long.
+		</param>
+		<returns>
+			The computed One-Way Function.  This is the value that is sent to the NTLM authenticator.
+		</returns>
+		*/
+        public static byte[]! ComputeOwf(byte[]! challenge, byte[]! hash)
+			requires challenge.Length >= 8;
+			requires hash.Length == 21;
+			ensures result.Length == 24;
+        {
+            if (hash.Length != 21)
+                throw new Exception("Hash is wrong length");
+
+#if NOISY
+            DebugLine("ComputeOwf: challenge=" + Util.ByteArrayToStringHex(challenge) + " hash=" + Util.ByteArrayToStringHex(hash));
+            DebugLine("    challenge: " + Util.ByteArrayToStringBitsLe(challenge));
+#endif
+
+            byte[] response = new byte[24];
+            for (int r = 0; r < 3; r++)
+            {
+#if NOISY
+                DebugLine("    r = " + r);
+#endif
+
+                // Next, we encrypt the server's challenge three times, using the DES algorithm.
+                // The result is the LM response.
+                byte[] thirdKey7 = new byte[7];
+                Array.Copy(hash, r * 7, thirdKey7, 0, 7);
+
+                
+                byte[] thirdKey8 = Convert7ByteKeyTo8ByteKey(thirdKey7);
+#if NOISY
+                DebugLine("        key7 = " + Util.ByteArrayToStringHex(thirdKey7));
+                //DebugLine("        key7 = " + Util.ByteArrayToStringBitsLe(thirdKey7));
+                DebugLine("        key7 = " + Util.ByteArrayToStringBitsBe(thirdKey7));
+                DebugLine("        key8 = " + Util.ByteArrayToStringHex(thirdKey8));
+                //DebugLine("        key8 = " + Util.ByteArrayToStringBitsLe(thirdKey8));
+                DebugLine("        key8 = " + Util.ByteArrayToStringBitsBe(thirdKey8));
+#endif
+
+                byte[] cipher = new byte[8];
+                Des.Encrypt(thirdKey8, challenge, cipher);
+                Array.Copy(cipher, 0, response, r * 8, 8);
+
+#if NOISY
+                DebugLine("        cipher = " + Util.ByteArrayToStringBitsBe(cipher));
+                DebugLine("        cipher = " + Util.ByteArrayToStringHex(cipher));
+#endif
+            }
+
+#if NOISY
+            DebugLine("    response: " + Util.ByteArrayToStringHex(response));
+#endif
+            return response;
+        }
+
+		/**
+		<summary>
+			<para>
+				This method computes the NTLM v1 "LAN Manager" authentication response.
+				This response is known to be very weak, cryptographically.
+			</para>
+			<para>
+				The 'challenge' parameter contains the 8-byte challenge nonce, which was
+				generated by the NTLMSSP running in the context of the server application.
+				The 'password' parameter contains the clear-text user password.
+			</para>
+			<para>
+				This method does not have any side-effects.
+			</para>
+		</summary>
+		<param name="challenge">The 8-byte challenge (nonce) generated by the server.</param>
+		<param name="password">The cleartext password of the authenticating user.</param>
+		<returns>
+			The return value is a newly-allocated buffer containing the encoded NTLM
+			response hash, which proves that the client is in possession of the password
+			for an identified account.  This buffer is always 24 bytes in length.
+		</returns>
+		*/
+        public static byte[]! ComputeLmResponse(byte[]! challenge, string! password)
+			requires challenge.Length == 8;
+			ensures result.Length == 24;
+        {
+            byte[]! hash = new byte[21];
+            ComputeLmResponseHalf(password, 0, hash, 0);
+            ComputeLmResponseHalf(password, 7, hash, 8);
+            for (int i = 16; i < 21; i++)
+                hash[i] = 0;
+
+            byte[]! response = ComputeOwf(challenge, hash);
+#if NOISY
+            DebugLine("LM response: " + Util.ByteArrayToStringHex(response));
+#endif
+            return response;
+        }
+
+		/**
+		<summary>
+			<para>
+				This method computes the NTLM v1 "NT" authentication response.
+				This response is known to be weak, cryptographically, but is better than
+				the NTLM v1 "LAN Manager" response.
+			</para>
+			<para>
+				This method does not have any side-effects.
+			</para>
+		</summary>
+
+		<param name="challenge">		
+			Contains the 8-byte challenge nonce, which was generated by the NTLMSSP running 
+			in the context of the server application.
+		</param>
+		<param name="password">Contains the clear-text user password.</param>
+		<returns>
+			A buffer containing the encoded NTLM response hash, which proves that the client 
+			is in possession of the password for an identified account.  This buffer is always 
+			24 bytes in length.
+		</returns>
+		*/
+        public static byte[]! ComputeNtResponse(byte[]! challenge, string! password)
+			requires challenge.Length == 8;
+			ensures result.Length == 24;
+        {
+            byte[]! password_bytes = (!)Encoding.Unicode.GetBytes(password);
+#if true // THIS CAUSES BARTOK TO THROW AN UNHANDLED EXCEPTION!
+            byte[]! digest = (!)(MD4Context.GetDigest(password_bytes).ToArray());
+#else // compiler shuts up, but obviously the code doesn't work
+			IgnoreConsume(password_bytes);
+            byte[]! digest = new byte[0];
+#endif
+
+#if NOISY
+            DebugLine("Computing NTLM v1 response:");
+            DebugLine("    challenge:         " + Util.ByteArrayToStringHex(challenge));
+            DebugLine("    password:          " + password);
+            DebugLine("    password bytes:    " + Util.ByteArrayToStringHex(password_bytes));
+            DebugLine("    MD4(pw bytes):     " + Util.ByteArrayToStringHex(digest));
+#endif
+
+            // The hash is the MD4 digest, padded with zeroes to a length of 21.
+            // assert digest.Length == 16;
+            byte[]! hash = new byte[21];
+            ArrayCopy(digest, 0, hash, 0, 16);
+            ArrayClear(hash, 16, 5);
+
+            byte[]! response = ComputeOwf(challenge, hash);
+#if NOISY
+            DebugLine("NTLM v1 response: " + Util.ByteArrayToStringHex(response));
+#endif
+            return response;
+        }
+        
+        static void ArrayCopy(byte[]! src, int srcoffset, byte[]! dst, int dstoffset, int length)
+        {
+			for (int i = 0; i < length; i++)
+				dst[dstoffset + i] = src[srcoffset + i];
+        }
+        
+        static void ArrayClear(byte[]! dst, int offset, int length)
+        {
+			for (int i = 0; i < length; i++)
+				dst[offset + i] = 0;
+        }
+        
+        public const int ChallengeLength = 8;
+        public const int ResponseLength = 24;
+
+		/**
+		<summary>
+			This method generates an NTLMSSP "Response" message, given valid client credentials and
+			an NTLMSSP "Challenge" message.
+		</summary>
+		
+		<param name="challenge_buffer">
+			Contains the encoded NTLMSSP "Response" message, which was generated by the remote 
+			NTLM-enabled application.
+		</param>
+		<param name="domain">The domain name of the authenticating user.</param>
+		<param name="username">The username of the authenticating user.</param>
+		<param name="password">The cleartext password of the authenticating user.</param>
+		<returns>
+			A buffer containing the encoded NTLMSSP "Response" message.  This buffer should be 
+			sent to the remote application, using whatever transport is appropriate.
+		</returns>
+		*/
+        public static byte[]! GetResponse(
+			byte[]! challenge_buffer,
+			string! domain,
+			string! username,
+			string! workstation,
+			string! password)
+        {
+			if (challenge_buffer.Length < sizeof(NtlmChallengeMessage))
+				throw new Exception("The buffer supplied contains too little data to contain a valid NTLM challenge message.");
+				
+			ref NtlmChallengeMessage challenge_msg = ref challenge_buffer[0];
+			if (challenge_msg.Header.Signature != NtlmConstants.MessageSignature64Le)
+				throw new Exception("The NTLM message has an invalid signature.");
+			
+			if (challenge_msg.Header.MessageType != (uint)NtlmMessageType.Challenge)
+				throw new Exception("The NTLM message provided is not a Challenge message.");
+
+            byte[]! challenge_bytes = NtlmUtil.GetSubArray(challenge_buffer, 0x18, NtlmConstants.ChallengeLength);
+            
+// known good here			
+#if NOISY
+            string TargetName = NtlmUtil.GetCountedStringAt(challenge_buffer, challenge_msg.TargetName.Offset);
+            DebugLine("    TargetName:     " + TargetName);
+            DebugLine("    Challenge:      " + Util.ByteArrayToStringHex(challenge_bytes));
+#endif
+
+            //
+            // First, compute the ancient, horrible, insecure LM response.
+            //
+
+            byte[]! Lm_response = ComputeLmResponse(challenge_bytes, password);
+            byte[]! Nt_response = ComputeNtResponse(challenge_bytes, password);
+            
+            // assert Lm_response.Length == 24;
+            // assert Nt_response.Length == 24;
+
+			//
+			// Next, build the Authenticate message.  The message has a fixed-length header, described
+			// by NtlmAuthenticateMessage, followed by the string bodies.
+			//
+
+			System.Text.Encoding encoding = System.Text.Encoding.Unicode;
+			byte[]! domainBytes = (!)encoding.GetBytes(domain);
+			byte[]! usernameBytes = (!)encoding.GetBytes(username);
+			byte[]! workstationBytes = (!)encoding.GetBytes(workstation);
+			
+			int responseBufferLength = sizeof(NtlmResponseMessage)
+				+ Lm_response.Length
+				+ Nt_response.Length
+				+ domainBytes.Length
+				+ usernameBytes.Length
+				+ workstationBytes.Length;
+// known bad
+			
+            // Now we know the size of the entire response message.  Allocate it.
+            byte[]! responseBuffer = new byte[responseBufferLength];
+            
+            ref NtlmResponseMessage response = ref responseBuffer[0];
+            response.Header.Signature = NtlmConstants.MessageSignature64Le;
+            response.Header.MessageType = (uint)NtlmMessageType.Response;
+
+            byte[]![]! strings = {
+                Lm_response,
+                Nt_response,
+                domainBytes,
+                usernameBytes,
+                workstationBytes
+            };
+
+            // Scan through the variable-length strings again and store the string headers.
+            // Also copy the string body into place.
+            int write_pos = sizeof(NtlmResponseMessage);
+            for (int i = 0; i < strings.Length; i++)
+            {
+				byte[]! stringbytes = strings[i];
+				ref BufferRegion region = ref responseBuffer[sizeof(NtlmMessageHeader) + i * sizeof(BufferRegion)];
+				region = new BufferRegion((ushort)stringbytes.Length, (ushort)stringbytes.Length, (ushort)write_pos);
+				Array.Copy(stringbytes, 0, responseBuffer, write_pos, stringbytes.Length);
+				write_pos += stringbytes.Length;
+            }
+            
+			return responseBuffer;
+        }
+
+#if NOISY
+		static void DebugLine(string msg)
+		{
+			DebugStub.WriteLine("NTLM: " + msg);
+		}
+#endif
+
+        static string! PadTruncate(string! s, int length)
+        {
+            if (s.Length == length)
+                return s;
+            if (s.Length > length)
+                return s.Substring(0, length);
+            return s.PadRight((Char)0);
+        }
+    }
+    
+    /*static*/ sealed class ByteOrder
+    {
+		private ByteOrder() {}
+		
+		public static ushort UInt16LeToHost(ushort value)
+		{
+			return value;
+		}
+		
+		public static uint UInt32LeToHost(uint value)
+		{
+			return value;
+		}
+    }
+}
diff --git a/base/Libraries/Ntlm/NtlmUtil.sg b/base/Libraries/Ntlm/NtlmUtil.sg
new file mode 100644
index 0000000..35d1605
--- /dev/null
+++ b/base/Libraries/Ntlm/NtlmUtil.sg
@@ -0,0 +1,161 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NtlmUtil.sg
+//
+//  Note:
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.Singularity;
+using Util = Utils.Util;
+
+namespace System.Security.Protocols.Ntlm
+{
+    public class NtlmUtil
+    {
+        public static ushort GetUInt16(byte[]! message, int pos)
+        {
+            return (ushort)(message[pos] + (message[pos + 1] << 8));
+        }
+
+        public static byte[]! GetCountedBytesAt(byte[]! message, int pos)
+			requires pos >= 0;
+			requires pos < message.Length;
+        {
+            int length = GetUInt16(message, pos + 0);
+            //int maxlength = GetUInt16(message, pos + 2);
+            int offset = GetUInt16(message, pos + 4);
+
+            if (offset >= message.Length)
+                throw new Exception("String has invalid offset");
+
+            if (offset + length > message.Length)
+                throw new Exception("String has invalid offset / length");
+
+            return NtlmUtil.GetSubArray(message, offset, length);
+        }
+        
+		public static byte[]! GetSubArray(byte[]! arr, int index, int length)
+			requires index >= 0;
+			requires index + length <= arr.Length;
+			ensures result.Length == length;
+		{
+			byte[] result = new byte[length];
+			Array.Copy(arr, index, result, 0, length);
+			return result;
+		}
+
+        public static string GetCountedStringAt(byte[]! message, int pos)
+			requires pos >= 0;
+			requires pos + sizeof(BufferRegion) <= message.Length;
+        {
+			ref BufferRegion region = ref message[pos];
+			
+            int length = ByteOrder.UInt16LeToHost(region.Length);
+            // int maxlength = GetUInt16(message, pos + 2);
+            int offset = ByteOrder.UInt16LeToHost(region.Offset);
+
+            if (offset >= message.Length)
+                throw new Exception("String has invalid offset");
+
+            if (offset + length > message.Length)
+                throw new Exception("String has invalid offset / length");
+
+            string result = Encoding.Unicode.GetString(message, offset, length);
+            return result;
+        }
+        
+#if NOISY
+
+        public static void DumpMessage(byte[]! message)
+        {
+            DumpMessage(message, message.Length);
+        }
+
+        public static void DumpMessage(byte[]! message, int length)
+        {
+            DebugLine("");
+            DebugLine("NTLM message:");
+            Util.DumpBuffer(message, 0, length);
+
+            if (length < NtlmConstants.HeaderLength)
+            {
+                DebugLine("    Message is invalid; too short");
+                return;
+            }
+
+            for (int i = 0; i < NtlmConstants.MessageSignature.Length; i++)
+            {
+                if (message[i] != NtlmConstants.MessageSignature[i])
+                {
+                    DebugLine("    Message is invalid; signature does not match");
+                    return;
+                }
+            }
+
+            NtlmMessageType type = (NtlmMessageType)message[8];
+
+            switch (type)
+            {
+                case NtlmMessageType.Negotiate:
+                    {
+                        DebugLine("    Type: Negotiate");
+                        NtlmNegotiateFlags flags = (NtlmNegotiateFlags)GetUInt16(message, 12);
+                        DebugLine(String.Format("    Flags: 0x{0:x8}  {1}", (UInt32)flags, flags.ToString()));
+                        string domain = GetCountedStringAt(message, 0x10);
+                        DebugLine("    Domain: " + domain);
+                    }
+
+                    break;
+
+                case NtlmMessageType.Challenge:
+                    {
+                        DebugLine("    Type: Challenge");
+                        string TargetName = GetCountedStringAt(message, 0x0c);
+                        byte[] Challenge = Util.GetSubArray(message, 0x14, NtlmConstants.ChallengeLength);
+                        DebugLine("    TargetName:     " + TargetName);
+                        DebugLine("    Challenge:      " + Util.ByteArrayToStringHex(Challenge));
+
+                    }
+                    break;
+
+                case NtlmMessageType.Response:
+                    {
+                        DebugLine("    Type: Response");
+                        byte[] LmChallengeResponse = GetCountedbytesAt(message, 0x0c);
+                        byte[] NtChallengeResponse = GetCountedbytesAt(message, 0x14);
+                        string DomainName = GetCountedStringAt(message, 28);
+                        string UserName = GetCountedStringAt(message, 36);
+                        string Workstation = GetCountedStringAt(message, 42);
+
+                        DebugLine("    LmChallengeResponse:  " + Util.ByteArrayToStringHex(LmChallengeResponse));
+                        DebugLine("    NtChallengeResponse:  " + Util.ByteArrayToStringHex(NtChallengeResponse));
+
+                        DebugLine("    DomainName:   " + DomainName);
+                        DebugLine("    UserName:     " + UserName);
+                        DebugLine("    Workstation:  " + Workstation);
+                    }
+                    break;
+
+                default:
+                    DebugLine("    Message is invalid; message type byte is not recognized");
+                    return;
+            }
+
+            DebugLine("");
+
+        }
+    
+		static void DebugLine(string msg)
+		{
+			DebugStub.WriteLine("NTLM: " + msg);
+		}
+#endif
+    }
+}
diff --git a/base/Libraries/Policy/Address.cs b/base/Libraries/Policy/Address.cs
new file mode 100644
index 0000000..f630c57
--- /dev/null
+++ b/base/Libraries/Policy/Address.cs
@@ -0,0 +1,79 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // An Address is an index into an Area.
+    internal class Address {
+        readonly uint _at;
+        readonly Area _in;
+        internal Address(Area @in, uint @at) { _in = @in; _at = @at; }
+        internal uint At { get { return _at; } }
+        internal uint Order { get { return _in._order; } }
+        internal object this[int i] {
+            get { return _in[(uint)(_at + i)]; }
+            set { _in[(uint)(_at + i)] = value; }
+        }
+        internal object this[
+            uint i
+        ] { get { return _in[_at + i]; } set { _in[_at + i] = value; } }
+        internal object _object {
+            get { return this[0]; }
+            set { this[0] = value; }
+        }
+        internal Address _address {
+            get { return (Address)this[0]; }
+            set { this[0] = value; }
+        }
+        internal Cell _cell {
+            get { return (Cell)this[0]; }
+            set { this[0] = value; }
+        }
+        internal Instruction _instruction {
+            get { return (Instruction)this[0]; }
+            set { this[0] = value; }
+        }
+        public static Address operator +(Address a, int i) {
+            return new Address(a._in, (uint)(a._at + i));
+        }
+        public static Address operator +(Address a, uint i) {
+            return new Address(a._in, (uint)(a._at + i));
+        }
+        public static Address operator -(Address a, int i) {
+            return new Address(a._in, (uint)(a._at - i));
+        }
+        public static Address operator -(Address a, uint i) {
+            return new Address(a._in, (uint)(a._at - i));
+        }
+        public static bool operator ==(Address a0, Address a1) {
+            if ((object)a0 == null) { return (object)a1 == null; }
+            if ((object)a1 == null) { return false; }
+            return a0._at == a1._at && a0._in == a1._in;
+        }
+        public static bool operator !=(Address a0, Address a1) {
+            return !(a0 == a1);
+        }
+        public override bool Equals(object obj) {
+            if (obj == null) { return false; }
+            Address that = obj as Address;
+            if (that == null) { return false; }
+            return this == that;
+        }
+        public override int GetHashCode() {
+            return _at.GetHashCode() ^ unchecked((int)_in._order);
+        }
+        public override string ToString() {
+            return _in.ToString()
+                 + "@"
+                 + _at.ToString()
+                 + " => "
+                 + this._object.ToString();
+        }
+    }
+}
diff --git a/base/Libraries/Policy/Area.cs b/base/Libraries/Policy/Area.cs
new file mode 100644
index 0000000..66d323e
--- /dev/null
+++ b/base/Libraries/Policy/Area.cs
@@ -0,0 +1,35 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System.Collections;
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // An Area is a contiguous region of objects, indexed by uints.
+
+    // The contents of an Area are held in a Hashtable.
+    // An optimization would use an object[] array.
+    internal class Area {
+        Hashtable _contents;
+        string _name;
+        internal readonly uint _order;
+        internal object this[
+            uint i
+        ] { get { return _contents[i]; } set { _contents[i] = value; } }
+        internal Area(string name, uint order) {
+            _contents = new Hashtable();
+            _name = name;
+            _order = order;
+        }
+        internal Area(string name, Area area) {
+            _contents = area._contents;
+            _name = name;
+            _order = area._order;
+        }
+        public override string ToString() { return _name; }
+    }
+}
diff --git a/base/Libraries/Policy/Cell.cs b/base/Libraries/Policy/Cell.cs
new file mode 100644
index 0000000..10127d2
--- /dev/null
+++ b/base/Libraries/Policy/Cell.cs
@@ -0,0 +1,12 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // A Cell is a value held in the heap or the stack.
+    internal abstract class Cell { }
+}
diff --git a/base/Libraries/Policy/ChoicePoint.cs b/base/Libraries/Policy/ChoicePoint.cs
new file mode 100644
index 0000000..3aad3db
--- /dev/null
+++ b/base/Libraries/Policy/ChoicePoint.cs
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // A ChoicePoint is a single Cell containing a choice point. This replaces
+    // the multiple cells used in the WAM in a more strongly typed way. The
+    // ChoicePoint is followed on the stack by copies of the arguments.
+    internal class ChoicePoint : Cell {
+        internal readonly uint _n;
+        internal readonly Address _ce;
+        internal readonly Address _cp;
+        internal readonly Address _b;
+        internal /* not readonly */ Address _bp;
+        internal readonly Address _tr;
+        internal readonly Address _h;
+        internal readonly Address _hb;
+        internal ChoicePoint(
+            uint n
+          , Address ce
+          , Address cp
+          , Address b
+          , Address bp
+          , Address tr
+          , Address h
+          , Address hb
+        ) {
+            _n = n;
+            _ce = ce;
+            _cp = cp;
+            _b = b;
+            _bp = bp;
+            _tr = tr;
+            _h = h;
+            _hb = hb;
+        }
+        public override string ToString() {
+            return "<CHOICEPOINT "
+                 + _n.ToString()
+                 + " "
+                 + _ce.ToString()
+                 + " "
+                 + _cp.ToString()
+                 + " "
+                 + _b.ToString()
+                 + " "
+                 + _bp.ToString()
+                 + " "
+                 + _tr.ToString()
+                 + " "
+                 + _h.ToString()
+                 + " "
+                 + _hb.ToString()
+                 + ">";
+        }
+    }
+}
diff --git a/base/Libraries/Policy/Environment.cs b/base/Libraries/Policy/Environment.cs
new file mode 100644
index 0000000..8b3c2ed
--- /dev/null
+++ b/base/Libraries/Policy/Environment.cs
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // An Environment is a single Cell containing an environment. This replaces
+    // the multiple cells used in the WAM in a more strongly typed way. The
+    // Environment is followed on the stack by the permanent arguments.
+    internal class Environment : Cell {
+        internal readonly uint _n;
+        internal readonly Address _ce;
+        internal readonly Address _cp;
+        internal Environment(uint n, Address ce, Address cp) {
+            _n = n;
+            _ce = ce;
+            _cp = cp;
+        }
+        public override string ToString() {
+            return "<ENVIRONMENT "
+                 + _n.ToString()
+                 + " "
+                 + _ce.ToString()
+                 + " "
+                 + _cp.ToString()
+                 + ">";
+        }
+    }
+}
diff --git a/base/Libraries/Policy/Functor.cs b/base/Libraries/Policy/Functor.cs
new file mode 100644
index 0000000..5a0a660
--- /dev/null
+++ b/base/Libraries/Policy/Functor.cs
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // A Functor contains a symbol and an arity. The
+    // functor f/3 is represented by new Functor("f", 3).
+    internal class Functor : Cell {
+        readonly string _name;
+        readonly uint _arity;
+        internal Functor(string name, uint arity) {
+            _name = name;
+            _arity = arity;
+        }
+        internal uint Arity { get { return _arity; } }
+        public static bool operator ==(Functor f0, Functor f1) {
+            return f0._name == f1._name && f0._arity == f1._arity;
+        }
+        public static bool operator !=(Functor f0, Functor f1) {
+            return !(f0 == f1);
+        }
+        public override bool Equals(object obj) {
+            if (obj == null) { return false; }
+            Functor that = obj as Functor;
+            if ((object)that == null) { return false; }
+            return this == that;
+        }
+        public override int GetHashCode() {
+            return _name.GetHashCode() ^ _arity.GetHashCode();
+        }
+        public override string ToString() {
+            return _name + "/" + _arity.ToString();
+        }
+    }
+}
diff --git a/base/Libraries/Policy/Instruction.cs b/base/Libraries/Policy/Instruction.cs
new file mode 100644
index 0000000..dc111eb
--- /dev/null
+++ b/base/Libraries/Policy/Instruction.cs
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Policy.Engine {
+    internal delegate void Execute();
+    // An Instruction represents an abstract WAM instruction,
+    // using a method delegate. All instructions have length 1.
+    internal class Instruction {
+        internal Execute _execute;
+        internal Instruction(Execute execute) { _execute = execute; }
+    }
+}
diff --git a/base/Libraries/Policy/Policy.csproj b/base/Libraries/Policy/Policy.csproj
new file mode 100644
index 0000000..27d3ea6
--- /dev/null
+++ b/base/Libraries/Policy/Policy.csproj
@@ -0,0 +1,39 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Policy\Policy.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Policy</AssemblyName>
+    <Language>C#</Language>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Address.cs" />
+    <Compile Include="Area.cs" />
+    <Compile Include="Cell.cs" />
+    <Compile Include="ChoicePoint.cs" />
+    <Compile Include="Environment.cs" />
+    <Compile Include="Functor.cs" />
+    <Compile Include="Instruction.cs" />
+    <Compile Include="Ref.cs" />
+    <Compile Include="Str.cs" />
+    <Compile Include="Wam.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Policy/Ref.cs b/base/Libraries/Policy/Ref.cs
new file mode 100644
index 0000000..85ffb15
--- /dev/null
+++ b/base/Libraries/Policy/Ref.cs
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // A Ref is a Cell containing an Address. A new
+    // <REF addr> is represented by a new Ref(addr).
+    internal class Ref : Cell {
+        Address _value;
+        internal Address Value { get { return _value; } set { _value = value; } }
+        internal Ref(Address value) { _value = value; }
+        public override string ToString() {
+            if (_value._cell == this) {
+                return "<REF>";
+            } else {
+                return "<REF " + _value.ToString() + ">";
+            }
+        }
+    }
+}
diff --git a/base/Libraries/Policy/Str.cs b/base/Libraries/Policy/Str.cs
new file mode 100644
index 0000000..1a6d04e
--- /dev/null
+++ b/base/Libraries/Policy/Str.cs
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // A Str is a Cell containing the Address of a functor cell.
+    // A new <STR addr> is represented by a new Str(addr).
+    class Str : Cell {
+        readonly Address _value;
+        internal Address Value { get { return _value; } }
+        internal Str(Address value) { _value = value; }
+        public override string ToString() {
+            return "<STR " + _value.ToString() + ">";
+        }
+    }
+}
diff --git a/base/Libraries/Policy/Wam.cs b/base/Libraries/Policy/Wam.cs
new file mode 100644
index 0000000..0b329dd
--- /dev/null
+++ b/base/Libraries/Policy/Wam.cs
@@ -0,0 +1,374 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Policy.Engine {
+    // The Wam class implements a restricted version of the Warren
+    // Abstract Machine, as described in "Warren's Abstract
+    // Machine: A Tutorial Reconstruction" by Hassan Ait-Kaci
+    // (February 18, 1999, reprinted from the MIT Press version).
+
+    // All variables are treated as permanent,
+    // so there are no temporary Xn registers.
+
+    // The code area is an Area of Instructions.
+
+    // The heap is an Area of Cells, where a
+    // Cell can be a Ref, a Str, or a Functor.
+
+    // The stack is an Area of Cells, where a Cell can also be an Environment
+    // or a ChoicePoint. These are stored as single cells with a strongly
+    // typed internal structure. The cells for permanent variables follow an
+    // Environment; the cells for copies of arguments follow a ChoicePoint.
+
+    // Argument registers are stored in a separate Area of Cells.
+
+    // The trail is an Area of Addresses of Cells
+    // that must be unbound upon backtracking.
+
+    // The PDL is local to the Unify procedure, and is a .NET Stack.
+
+    // There are no anonymous variables: set_void and unify_void are
+    // unimplemented. Anonymous variables can be added as an optimization.
+
+    // There is no environment trimming: the WAM instruction
+    // "call P, N" is replaced by the simpler "call P".
+    // Environment trimming can be added as an optimization.
+
+    // There is no TCO: execute, put_unsafe_value,
+    // set_local_value, and unify_local_value are
+    // unimplemented. TCO can be added as an optimization.
+
+    // There are no list instructions: put_list and get_list are
+    // unimplemented. List instructions can be added as an optimization.
+
+    // There are no constant instructions: put_constant, set_constant,
+    // get_constant, and unify-constant are unimplemented.
+    // Constant instructions can be added as an optimization.
+
+    // There are no indexing instructions: switch_on_term, switch_on_constant,
+    // switch_on_structure, try, retry, and trust are unimplemented.
+    // Indexing instructions can be added as an optimization.
+    internal class Wam {
+        Area _heap = new Area("HEAP", 1);
+        Address _h, _s;
+        Area _a;
+        // _code really shouldn't be visible
+        internal Area _code = new Area("CODE", 0);
+        Address _p, _cp;
+        // _label really shouldn't be visible
+        internal Hashtable _label = new Hashtable();
+        Area _stack = new Area("STACK", 2);
+        // _e really shouldn't be visible
+        internal Address _e;
+        enum Mode { None, Read, Write };
+        Mode _mode = Mode.None;
+        internal Area A { get { return _a; } }
+        // BACKTRACKING
+        Address _b, _hb;
+        // CUT
+        Address _b0;
+        // TRAIL
+        Area _trail = new Area("TRAIL", 3);
+        Address _tr;
+        // failure
+        bool _fail = false;
+
+        // Put instructions. There is no TCO, so put_unsafe_value
+        // is unimplemented. There are no list instructions,
+        // so put_list is unimplemented. There are no constant
+        // instructions, so put_constant is unimplemented.
+
+        // PutVariable always allocates a heap cell.
+        internal void PutVariable(Address yn, Address ai) {
+            ai._cell = yn._cell = _h._cell = new Ref(_h);
+            _h = _h + 1;
+        }
+        internal void PutValue(Address yn, Address ai) { ai._cell = yn._cell; }
+        // PutStructure always allocates a STR cell on the heap.
+        internal void PutStructure(Functor fn, Address yn) {
+            _h[0] = new Str(_h);
+            _h[1] = fn;
+            yn._cell = _h._cell;
+            _h = _h + 2;
+        }
+
+        // Get instructions. There are no list instructions,
+        // so get_list is unimplemented. There are no constant
+        // instructions, so get_constant is unimplemented.
+        internal void GetVariable(Address yn, Address ai) {
+            yn._cell = ai._cell;
+        }
+        internal void GetValue(Address yn, Address ai) {
+            Unify(yn, ai);
+            if (_fail) { Backtrack(); }
+        }
+        internal void GetStructure(Functor fn, Address ai) {
+            Address addr = Deref(ai);
+            if (addr._cell is Ref) {
+                _h[0] = new Str(_h + 1);
+                _h[1] = fn;
+                Bind(addr, _h);
+                _h = _h + 2;
+                // Is this right? It conflicts with the errata.
+                _s = null;
+                _mode = Mode.Write;
+            } else if (addr._cell is Str) {
+                Address a = ((Str)addr._cell).Value;
+                if (a._cell.Equals(fn)) {
+                    _s = a + 1;
+                    _mode = Mode.Read;
+                } else {
+                    _fail = true;
+                }
+            } else {
+                _fail = true;
+            }
+            if (_fail) { Backtrack(); }
+        }
+
+        // Set instructions. There is no TCO, so set_local_value
+        // is unimplemented. There are no constant instructions,
+        // so set_constant is unimplemented. There are no
+        // anonymous variables, so set_void is unimplemented.
+        internal void SetVariable(Address yn) {
+            yn._cell = _h._cell = new Ref(_h);
+            _h = _h + 1;
+        }
+        internal void SetValue(Address yn) { _h[0] = yn._cell; _h = _h + 1; }
+
+        // Unify instructions. There is no TCO, so unify_local_value
+        // is unimplemented. There are no constant instructions,
+        // so unify-constant is unimplemented. There are no
+        // anonymous variables, so unify_void is unimplemented.
+        internal void UnifyVariable(Address yn) {
+            switch (_mode) {
+            case Mode.Read:
+                yn._cell = _s._cell;
+                break;
+            case Mode.Write:
+                yn._cell = _h._cell = new Ref(_h);
+                _h = _h + 1;
+                break;
+            default:
+                throw new Exception();
+            }
+            _s = _s + 1;
+        }
+        internal void UnifyValue(Address yn) {
+            switch (_mode) {
+            case Mode.Read:
+                Unify(yn, _s);
+                break;
+            case Mode.Write:
+                _h[0] = yn._cell;
+                _h = _h + 1;
+                break;
+            default:
+                throw new Exception();
+            }
+            _s = _s + 1;
+            if (_fail) { Backtrack(); }
+        }
+
+        // Control instructions. There is no environment trimming,
+        // so the WAM instruction "call P, N" is replaced with
+        // "call P". There is no TCO, so execute is unimplemented.
+        internal void Allocate(uint n) {
+            Address e;
+            if (Greater(_e, _b)) {
+                e = _e + 1 + ((Environment)_e._cell)._n;
+            } else {
+                e = _b + 1 + ((ChoicePoint)_b._cell)._n;
+            }
+            e._cell = new Environment(n, _e, _cp);
+            _e = e;
+        }
+        internal void Deallocate() {
+            _cp = ((Environment)_e._cell)._cp;
+            _e = ((Environment)_e._cell)._ce;
+        }
+        internal void Call(Functor P) {
+            if (_label.ContainsKey(P)) {
+                _cp = _p;
+                _p = (Address)_label[P];
+            } else {
+                Backtrack();
+            }
+        }
+        internal void Proceed() { _p = _cp; }
+
+        // Choice instructions. There are no indexing instructions,
+        // so try, retry, and trust are unimplemented.
+        internal void TryMeElse(Address L, uint n) {
+            Address b;
+            if (Greater(_e, _b)) {
+                b = _e + 1 + ((Environment)_e._cell)._n;
+            } else {
+                b = _b + 1 + ((ChoicePoint)_b._cell)._n;
+            }
+            ChoicePoint b_ = new ChoicePoint(n, _e, _cp, _b, L, _tr, _h, _hb);
+            b._cell = b_;
+            for (uint i = 1; i <= n; i++) { b[i] = _a[i]; }
+            _b = b;
+            _hb = _h;
+        }
+        internal void RetryMeElse(Address L) {
+            ChoicePoint b_ = (ChoicePoint)_b._cell;
+            uint n = b_._n;
+            for (uint i = 1; i <= n; i++) { _a[i] = _b[i]; }
+            _e = b_._ce;
+            _cp = b_._cp;
+            b_._bp = L;
+            UnwindTrail(b_._tr._address, _tr._address);
+            _tr = b_._tr;
+            _h = b_._h;
+            _hb = _h;
+        }
+        internal void TrustMe() {
+            ChoicePoint b_ = (ChoicePoint)_b._cell;
+            uint n = b_._n;
+            for (uint i = 1; i <= n; i++) { _a[i] = _b[i]; }
+            _e = b_._ce;
+            _cp = b_._cp;
+            UnwindTrail(b_._tr._address, _tr._address);
+            _tr = b_._tr;
+            _h = b_._h;
+            _b = b_._b;
+            _hb = ((ChoicePoint)_b._cell)._hb;
+        }
+
+        // Cut instructions.
+        void NeckCut() { if (Greater(_b, _b0)) { _b = _b0; TidyTrail(); } }
+        void GetLevel(Address yn) { yn._address = _b0; }
+        void Cut(Address yn) {
+            if (Greater(_b, yn._address)) { _b0 = yn._address; TidyTrail(); }
+        }
+
+        // Ancillary functions.
+        internal void Backtrack() {
+            _fail = false;
+            if (_b == null) {
+                throw new Exception("fail and exit program");
+            } else {
+                _p = ((ChoicePoint)_b._cell)._bp;
+            }
+        }
+        Address Deref(Address a) {
+            if (a._cell is Ref) {
+                Address value = (a._cell as Ref).Value;
+                if (value != a) { return Deref(value); }
+            }
+            return a;
+        }
+        void Bind(Address a1, Address a2) {
+            // should add an occurs-check
+            if (a1._cell is Ref && (!(a2._cell is Ref) || Less(a2, a1))) {
+                a1._cell = a2._cell;
+                Trail(a1);
+            } else {
+                a2._cell = a1._cell;
+                Trail(a2);
+            }
+        }
+        void Trail(Address a) {
+            if (Less(a, _hb) || Less(_h, a) && Less(a, _b)) {
+                _tr._address = a;
+                _tr = _tr + 1;
+            }
+        }
+        void UnwindTrail(Address a1, Address a2) {
+            Address a = a1;
+            while (Less(a, a2)) { a._cell = new Ref(a); a = a + 1; }
+        }
+        void TidyTrail() {
+            Address i = ((ChoicePoint)_b._cell)._tr;
+            while (Less(i, _tr)) {
+                if (
+                    Less(i._address, _hb)
+                 || Less(_h, i._address) && Less(i._address, _b)
+                ) {
+                    i = i + 1;
+                } else {
+                    _tr = _tr - 1;
+                    i._cell = _tr._cell;
+                }
+            }
+        }
+        void Unify(Address a1, Address a2) {
+            Stack pdl = new Stack();
+            pdl.Push(a1);
+            pdl.Push(a2);
+            _fail = false;
+            while (!(pdl.Count == 0 || _fail)) {
+                Address d1 = Deref((Address)pdl.Pop());
+                Address d2 = Deref((Address)pdl.Pop());
+                if (d1 != d2) {
+                    Cell cell1 = d1._cell;
+                    Cell cell2 = d2._cell;
+                    if (cell1 is Ref) {
+                        Bind(d1, d2);
+                    } else {
+                        if (cell2 is Ref) {
+                            Bind(d1, d2);
+                        } else if (cell2 is Str) {
+                            if (!(cell1 is Str)) {
+                                _fail = true;
+                            } else {
+                                Address v1 = ((Str)cell1).Value;
+                                Address v2 = ((Str)cell2).Value;
+                                Functor f1 = (Functor)v1._cell;
+                                Functor f2 = (Functor)v2._cell;
+                                if (f1 != f2) {
+                                    _fail = true;
+                                } else {
+                                    for (int i = 1; i <= f1.Arity; i++) {
+                                        pdl.Push(v1 + i);
+                                        pdl.Push(v2 + i);
+                                    }
+                                }
+                            }
+                        } else {
+                            _fail = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Other functions
+        bool Less(Address a, Address b) {
+            return a.Order < b.Order || a.Order == b.Order && a.At < b.At;
+        }
+        bool Greater(Address a, Address b) { return Less(b, a); }
+
+        // Run starts execution of the WAM at _p (the current instruction).
+        internal void Run() {
+            while (_p != null) {
+                Instruction instr = _p._instruction;
+                _p = _p + 1;
+                instr._execute();
+            }
+        }
+
+        // The constructor.
+        internal Wam() {
+            _h = _hb = new Address(_heap, 0);
+            _a = new Area("A", 9);
+            _p = new Address(_code, 0);
+            _b = new Address(_stack, 0);
+            _b[0]
+          = new ChoicePoint(0, null, null, null, null, null, null, null);
+            _e = _b + 1;
+            _e[0] = new Environment(0, null, null);
+            _tr = new Address(_trail, 0);
+        }
+    }
+}
diff --git a/base/Libraries/ProtoLisp/Engine.cs b/base/Libraries/ProtoLisp/Engine.cs
new file mode 100644
index 0000000..f3e7cdc
--- /dev/null
+++ b/base/Libraries/ProtoLisp/Engine.cs
@@ -0,0 +1,76 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Text;
+using System.IO;
+
+namespace ProtoLisp
+{
+    class Engine
+    {
+        private Interpreter interpreter;
+
+        public Engine()
+        {
+            interpreter = new Interpreter();
+        }
+
+        public string EvalAll(string lispExpr, bool printEveryExpression, bool debugTrace)
+        {
+            MemoryStream stream = new MemoryStream(Encoding.ASCII.GetBytes(lispExpr));
+            return EvalAll(stream, printEveryExpression, debugTrace);
+        }
+
+        public string EvalAll(Stream stream, bool printEveryExpression, bool debugTrace)
+        {
+            MemoryStream outputStream = new MemoryStream();
+            StreamWriter writer = new StreamWriter(outputStream);
+
+            Lexer lexer = new Lexer(stream);
+            PLObject lastVal = null;
+
+            try
+            {
+                PLObject obj;
+
+                while ((obj = lexer.GetExpression()) != null)
+                {
+                    if (debugTrace)
+                    {
+                        lastVal = interpreter.Eval(obj, null, outputStream);
+                    }
+                    else
+                    {
+                        lastVal = interpreter.Eval(obj, null, null);
+                    }
+
+                    if (printEveryExpression)
+                    {
+                        writer.WriteLine(Interpreter.ExpressionToString(lastVal));
+                        writer.Flush();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                writer.WriteLine("Exception caught: " + e);
+            }
+
+            if (!printEveryExpression)
+            {
+                writer.WriteLine(Interpreter.ExpressionToString(lastVal));
+            }
+
+            writer.Flush();
+
+            int length = (int)outputStream.Length;
+            return Encoding.ASCII.GetString(outputStream.GetBuffer(), 0, length);
+        }
+    }
+}
diff --git a/base/Libraries/ProtoLisp/Interpreter.cs b/base/Libraries/ProtoLisp/Interpreter.cs
new file mode 100644
index 0000000..3284f45
--- /dev/null
+++ b/base/Libraries/ProtoLisp/Interpreter.cs
@@ -0,0 +1,639 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+//
+// This "Proto-Lisp" interpreter can evaluate simple LISP-like expressions.
+// Proto-Lisp is lexically scoped (not dynamically scoped like the original
+// LISP), and provides simple "closures". The idea of Proto-Lisp is to
+// create a minimally powerful language to allow further refinements to
+// be created on top of it. For example, you could write a more fully-
+// featured LISP interpreter in Proto-Lisp.
+//
+// Currently, the interpreter has the following classic LISP primitives:
+//
+//          atom, eq, car, cdr, cons, cond
+//
+// In addition, (define <x> <y>) is provided, which binds the variable
+// name x to the expression y in the global environment.
+//
+// Also, the (lambda (<arglist>) (<bodyexpr>)) primitive is provided.
+// The lambda primitive creates a "closure" by capturing the lexical
+// environment it is evaluated in. This lets you pull stunts like:
+//
+// (define multiplier (factor) (lambda (x) (* x factor)))
+//
+// evaluating "(multiplier 5)", say, returns a function that takes one
+// argument and multiplies it by 5.
+//
+// (defun <name> (<arglist>) (<bodyexpr>)) is provided as syntactic
+// sugar, signifying (define <name> (lambda (<arglist>) (<bodyexpr>)))
+//
+
+namespace ProtoLisp
+{
+    class Interpreter
+    {
+        private PLEnvironment globalEnv; // Top-level environment
+
+        public Interpreter()
+        {
+            globalEnv = new PLEnvironment();
+        }
+
+        // Convert a C# boolean value to a ProtoLisp expression
+        private PLObject BoolToExpr(bool b)
+        {
+            // True is "t", false is the empty list
+            if (b)
+            {
+                return new PLStringAtom("t");
+            }
+            else
+            {
+                return new PLList();
+            }
+        }
+
+        // Convert a ProtoLisp expression to a native C# bool value
+        private bool ExprToBool(PLObject expr)
+        {
+            // Anything that is not "t" is false
+            return ((expr is PLStringAtom) && (expr.Equals("t")));
+        }
+
+        // Write a string to a stream as ASCII
+        private void StreamWriteLine(Stream stream, string text)
+        {
+            byte[] bytes = Encoding.ASCII.GetBytes(text + "\r\n");
+            stream.Write(bytes, 0, bytes.Length);
+        }
+
+        //
+        // ---------------- PRIMITIVE FUNCTIONS ----------------
+        //
+
+        // atom: indicates whether its (one) argument is an atom
+        private PLObject atom_fun(PLObject expr)
+        {
+            // An atom is an object that is an instance of PLAtom, or
+            // the empty list (considered "false")
+            if (expr is PLAtom)
+            {
+                return BoolToExpr(true);
+            }
+            else if ((expr is PLList) && (((PLList)expr).Count == 0))
+            {
+                return BoolToExpr(true);
+            }
+
+            return BoolToExpr(false);
+        }
+
+        // eq: indicates whether its (two) arguments are equal.
+        private PLObject eq_fun(PLObject a, PLObject b)
+        {
+            if ((a is PLAtom) && (b is PLAtom))
+            {
+                // Two atoms compare by value
+                return BoolToExpr(a.Equals(b));
+            }
+            else
+            {
+                // Two empty lists are equal
+                if ((a is PLList) && (((PLList)a).Count == 0) &&
+                    (b is PLList) && (((PLList)b).Count == 0))
+                {
+                    return BoolToExpr(true);
+                }
+            }
+
+            return BoolToExpr(false);
+        }
+
+        // car: returns the first value in a list
+        private PLObject car_fun(PLList list)
+        {
+            return list[0];
+        }
+
+        // cdr: returns the remainder of a list
+        private PLList cdr_fun(PLList list)
+        {
+            PLList retval = new PLList();
+
+            for (int i = 1; i < list.Count; ++i)
+            {
+                retval.Add(list[i]);
+            }
+
+            return retval;
+        }
+
+        // cons: creates a list from an expression and an existing list
+        private PLList cons_fun(PLObject a, PLList b)
+        {
+            PLList retval = new PLList();
+            retval.Add(a);
+
+            for (int i = 0; i < b.Count; ++i)
+            {
+                retval.Add(b[i]);
+            }
+
+            return retval;
+        }
+
+        // cond: examines a sequence of pairs. Its result is the second
+        // item in the first pair whose first element evaluates to true.
+        private PLObject cond_fun(PLList condPLList, PLEnvironment localEnv, Stream traceStream)
+        {
+            for (int i = 0; i < condPLList.Count; ++i)
+            {
+                if (!(condPLList[i] is PLList))
+                {
+                    throw new Exception("An argument passed to the 'cond' primitive was not a list");
+                }
+
+                PLList condition = (PLList)condPLList[i];
+
+                if (condition.Count != 2)
+                {
+                    throw new Exception("An argument passed to the 'cond' primitive was not a 2-item list");
+                }
+
+                PLObject carVal = Eval(car_fun(condition), localEnv, traceStream);
+
+                if (ExprToBool(carVal))
+                {
+                    // This subexpression evaluated to true. Evaluate
+                    // the second part of the condition.
+                    return Eval(condition[1], localEnv, traceStream);
+                }
+            }
+
+            return BoolToExpr(false);
+        }
+
+        // define: Binds a name to an expression in the global context
+        private PLObject define_fun(string name, PLObject obj)
+        {
+            globalEnv.Put(name, obj);
+            return new PLStringAtom(name);
+        }
+
+        // lambda: Creates an evaluatable closure.
+        private PLObject lambda_fun(PLList args, PLObject body, PLEnvironment env)
+        {
+            return new PLClosure(args, body, env);
+        }
+
+        //
+        // Primitive arithmetic operations
+        //
+        private PLNumberAtom plus_fun(PLNumberAtom a, PLNumberAtom b)
+        {
+            return a + b;
+        }
+
+        private PLNumberAtom minus_fun(PLNumberAtom a, PLNumberAtom b)
+        {
+            return a - b;
+        }
+
+        private PLNumberAtom mult_fun(PLNumberAtom a, PLNumberAtom b)
+        {
+            return a * b;
+        }
+
+        private PLNumberAtom div_fun(PLNumberAtom a, PLNumberAtom b)
+        {
+            return a / b;
+        }
+
+        //
+        // ---------------- end of primitives ----------------
+        //
+
+        // Execute a given closure, with a given set of argument values
+        private PLObject Execute(PLClosure fun, PLList argVals, Stream traceStream)
+        {
+            if (traceStream != null)
+            {
+                StreamWriteLine(traceStream, "** Executing a closure...");
+            }
+
+            // Check the argument list
+            if (fun.argNames.Count != argVals.Count)
+            {
+                throw new Exception ("Function invoked with wrong number of arguments");
+            }
+
+            // Augment the closure's environment with additional
+            // entries that bind the argument values to their
+            // symbolic names, then evaluate the function body.
+            PLEnvironment funEnv;
+
+            if (fun.env != null)
+            {
+                funEnv = (PLEnvironment)fun.env.Clone();
+            }
+            else
+            {
+                funEnv = new PLEnvironment();
+            }
+
+            for (int i = 0; i < fun.argNames.Count; ++i)
+            {
+                funEnv.Put(((PLStringAtom)fun.argNames[i]).ToString(), argVals[i]);
+            }
+
+            return Eval(fun.body, funEnv, traceStream);
+        }
+
+        // Apply the specified argument list to the function indicated
+        // by the provided expression. The function expression may simply
+        // be the symbolic name of a function, or it may be an evaluatable
+        // expression in its own right.
+        private PLObject Apply(PLObject func, PLList args, PLEnvironment localEnv, Stream traceStream)
+        {
+            if (traceStream != null)
+            {
+                StreamWriteLine(traceStream, "** Evaluating the expression \"" + ExpressionToString(func) + "\" as a function");
+            }
+
+            if (func is PLStringAtom)
+            {
+                // Function is named by a symbol
+
+                if (func.Equals("atom"))
+                {
+                    if (args.Count != 1)
+                    {
+                        throw new Exception("Incorrect number of arguments passed to the 'atom' primitive");
+                    }
+
+                    return atom_fun(args[0]);
+                }
+                else if (func.Equals("eq"))
+                {
+                    if (args.Count != 2)
+                    {
+                        throw new Exception("Incorrect number of arguments passed to the 'eq' primitive");
+                    }
+
+                    return eq_fun(args[0], args[1]);
+                }
+                else if (func.Equals("car"))
+                {
+                    if (args.Count != 1)
+                    {
+                        throw new Exception("Incorrect number of arguments passed to the 'car' primitive");
+                    }
+
+                    if (!(args[0] is PLList))
+                    {
+                        throw new Exception("The argument passed to the 'car' primitive was not a list");
+                    }
+
+                    return car_fun((PLList)args[0]);
+                }
+                else if (func.Equals("cdr"))
+                {
+                    if (args.Count != 1)
+                    {
+                        throw new Exception("Incorrect number of arguments passed to the 'cdr' primitive");
+                    }
+
+                    if (!(args[0] is PLList))
+                    {
+                        throw new Exception("The argument passed to the 'cdr' primitive was not a list");
+                    }
+
+                    return cdr_fun((PLList)args[0]);
+                }
+                else if (func.Equals("cons"))
+                {
+                    if (args.Count != 2)
+                    {
+                        throw new Exception("Incorrect number of arguments passed to the 'cons' primitive");
+                    }
+
+                    if (!(args[1] is PLList))
+                    {
+                        throw new Exception("The second argument passed to the 'cons' primitive was not a list");
+                    }
+
+                    return cons_fun(args[0], (PLList)args[1]);
+                }
+                else if (func.Equals("+"))
+                {
+                    if (args.Count != 2)
+                    {
+                        throw new Exception("Incorrect number of arguments pass to the '+' primitive");
+                    }
+
+                    if (!(args[0] is PLNumberAtom) ||
+                        !(args[1] is PLNumberAtom))
+                    {
+                        throw new Exception("Both arguments to the '+' primitive must be numbers");
+                    }
+
+                    return plus_fun((PLNumberAtom)args[0], (PLNumberAtom)args[1]);
+                }
+                else if (func.Equals("-"))
+                {
+                    if (args.Count != 2)
+                    {
+                        throw new Exception("Incorrect number of arguments pass to the '-' primitive");
+                    }
+
+                    if (!(args[0] is PLNumberAtom) ||
+                        !(args[1] is PLNumberAtom))
+                    {
+                        throw new Exception("Both arguments to the '-' primitive must be numbers");
+                    }
+
+                    return minus_fun((PLNumberAtom)args[0], (PLNumberAtom)args[1]);
+                }
+                else if (func.Equals("*"))
+                {
+                    if (args.Count != 2)
+                    {
+                        throw new Exception("Incorrect number of arguments pass to the '*' primitive");
+                    }
+
+                    if (!(args[0] is PLNumberAtom) ||
+                        !(args[1] is PLNumberAtom))
+                    {
+                        throw new Exception("Both arguments to the '*' primitive must be numbers");
+                    }
+
+                    return mult_fun((PLNumberAtom)args[0], (PLNumberAtom)args[1]);
+                }
+                else if (func.Equals("/"))
+                {
+                    if (args.Count != 2)
+                    {
+                        throw new Exception("Incorrect number of arguments pass to the '/' primitive");
+                    }
+
+                    if (!(args[0] is PLNumberAtom) ||
+                        !(args[1] is PLNumberAtom))
+                    {
+                        throw new Exception("Both arguments to the '/' primitive must be numbers");
+                    }
+
+                    return div_fun((PLNumberAtom)args[0], (PLNumberAtom)args[1]);
+                }
+
+                // The name does not indicate a built-in primitive.
+                // Look up the function in our environment
+                PLObject funObj = Lookup(func.ToString(), localEnv);
+
+                if (!(funObj is PLClosure))
+                {
+                    throw new Exception ("The symbolic name \"" + func + "\" is not bound to a function");
+                }
+
+                // Run the function!
+                return Execute((PLClosure)funObj, args, traceStream);
+            }
+            else
+            {
+                // The function is an expression, not just a name. This expression
+                // had better evaluate to a closure.
+                PLObject funObj = Eval(func, localEnv, traceStream);
+
+                if (! (funObj is PLClosure))
+                {
+                    throw new Exception ("Expression \"" + ExpressionToString(func) + "\" does not evaluate to a function");
+                }
+
+                // Run this function expression
+                return Execute((PLClosure)funObj, args, traceStream);
+            }
+        }
+
+        // Evaluate a list of expressions. Return a new list that gives the
+        // value for each expression.
+        private PLList EvalPLList(PLList list, PLEnvironment localEnv, Stream traceStream)
+        {
+            PLList retval = new PLList();
+
+            for (int i = 0; i < list.Count; ++i)
+            {
+                retval.Add(Eval(list[i], localEnv, traceStream));
+            }
+
+            return retval;
+        }
+
+        // Look up the value that a symbolic name is bound to; check the
+        // provided local environment as well as the global environment.
+        private PLObject Lookup(string name, PLEnvironment localEnv)
+        {
+            PLObject retval;
+
+            if (localEnv != null)
+            {
+                retval = localEnv.Lookup(name);
+
+                if (retval != null)
+                {
+                    return retval;
+                }
+            }
+
+            return globalEnv.Lookup(name);
+        }
+
+        public PLObject Eval(PLObject expr, PLEnvironment localEnv, Stream traceStream)
+        {
+            if (traceStream != null)
+            {
+                StreamWriteLine(traceStream, "** Evaluating: " + ExpressionToString(expr));
+            }
+
+            if (expr is PLAtom)
+            {
+                PLAtom atomExpr = (PLAtom)expr;
+
+                if (atomExpr is PLNumberAtom)
+                {
+                    // Numbers eval to themselves
+                    return atomExpr;
+                }
+                else
+                {
+                    if (atomExpr.Equals("t"))
+                    {
+                        // "t" (True) evals to itself
+                        return atomExpr;
+                    }
+                    else if (atomExpr.Equals("nil"))
+                    {
+                        // Return whatever our native representation for false is
+                        return BoolToExpr(false);
+                    }
+                    else
+                    {
+                        PLObject retval = Lookup(atomExpr.ToString(), localEnv);
+
+                        if (retval == null)
+                        {
+                            throw new Exception("The symbolic name \"" + atomExpr + "\" is not bound.");
+                        }
+
+                        return retval;
+                    }
+                }
+            }
+            else if (expr is PLList)
+            {
+                PLList listExpr = ((PLList)expr);
+
+                // The empty list evaluates to itself
+                if(listExpr.Count == 0)
+                {
+                    return listExpr;
+                }
+
+                PLObject carVal = car_fun(listExpr);
+
+                // Check for special-case primitives
+                if (carVal is PLStringAtom)
+                {
+                    if (carVal.Equals("cond"))
+                    {
+                        if (listExpr.Count < 2)
+                        {
+                            throw new Exception("Must pass at least one argument to the 'cond' primitive");
+                        }
+
+                        return cond_fun(cdr_fun(listExpr), localEnv, traceStream);
+                    }
+                    else if (carVal.Equals("quote"))
+                    {
+                        if (listExpr.Count != 2)
+                        {
+                            throw new Exception("Incorrect number of arguments passed to the 'quote' primitive");
+                        }
+
+                        // Return the second portion of the list
+                        return listExpr[1];
+                    }
+                    else if (carVal.Equals("define"))
+                    {
+                        if (listExpr.Count != 3)
+                        {
+                            throw new Exception ("Incorrect number of arguments passed to the 'define' primitive");
+                        }
+
+                        if (! (listExpr[1] is PLStringAtom))
+                        {
+                            throw new Exception ("The first argument passed to the 'define' primitive was not a string");
+                        }
+
+                        return define_fun(((PLStringAtom)listExpr[1]).ToString(),
+                                          Eval(listExpr[2], localEnv, traceStream));
+                    }
+                    else if (carVal.Equals("lambda"))
+                    {
+                        if (listExpr.Count != 3)
+                        {
+                            throw new Exception ("Incorrect number of arguments passed to the 'lambda' primitive");
+                        }
+
+                        if (! (listExpr[1] is PLList))
+                        {
+                            throw new Exception ("The first argument to the 'lambda' primitive was not a list");
+                        }
+
+                        return lambda_fun((PLList)listExpr[1], listExpr[2], localEnv);
+                    }
+                    else if (carVal.Equals("defun"))
+                    {
+                        // Syntactic sugar for (define <name> (lambda ...
+                        if (listExpr.Count != 4)
+                        {
+                            throw new Exception ("Incorrect number of arguments passed to the 'defun' primitive");
+                        }
+
+                        if (! (listExpr[1] is PLStringAtom))
+                        {
+                            throw new Exception ("The first argument passed to the 'defun' primitive was not a simple name");
+                        }
+
+                        if (! (listExpr[2] is PLList))
+                        {
+                            throw new Exception ("The second argument passed to the 'defun' argument was not a list");
+                        }
+
+                        return define_fun(((PLStringAtom)listExpr[1]).ToString(),
+                                          lambda_fun((PLList)listExpr[2], listExpr[3], localEnv));
+                    }
+                }
+
+                // Assume a general function invocation. Evaluate all the
+                // arguments and invoke.
+                PLList args = EvalPLList(cdr_fun(listExpr), localEnv, traceStream);
+                return Apply(listExpr[0], args, localEnv, traceStream);
+            }
+            else
+            {
+                throw new Exception("Unrecognized type passed to Eval()");
+            }
+        }
+
+        // Turn a ProtoLisp expression into a printable string
+        public static string ExpressionToString(PLObject obj)
+        {
+            if (obj is PLStringAtom)
+            {
+                return ((PLStringAtom)obj).ToString();
+            }
+
+            else if (obj is PLNumberAtom)
+            {
+                return ((PLNumberAtom)obj).ToString();
+            }
+
+            else if (obj is PLList)
+            {
+                PLList list = (PLList)obj;
+                string retval = "(";
+
+                for(int i = 0; i < list.Count; ++i)
+                {
+                    retval += ExpressionToString(list[i]);
+
+                    if (i < list.Count -1)
+                    {
+                        retval += " ";
+                    }
+                }
+
+                retval += ")";
+                return retval;
+            }
+            else if (obj is PLClosure)
+            {
+                return "<<closure>>";
+            }
+            else
+            {
+                return "???";
+            }
+        }
+    }
+}
diff --git a/base/Libraries/ProtoLisp/Lexer.cs b/base/Libraries/ProtoLisp/Lexer.cs
new file mode 100644
index 0000000..d3de420
--- /dev/null
+++ b/base/Libraries/ProtoLisp/Lexer.cs
@@ -0,0 +1,210 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Text;
+using System.IO;
+using System.Diagnostics;
+
+//
+// The Lexer class tokenizes an input stream of text
+// and can also read off complete Proto-Lisp expressions
+// for evaluation.
+//
+// The lexer has a one-character lookahead buffer.
+//
+namespace ProtoLisp
+{
+    class Lexer
+    {
+        // Constructor
+        public Lexer(Stream stream)
+        {
+            inputStream = stream;
+            haveLookAhead = false;
+        }
+
+        // Returns the next character in the input stream.
+        // The stream is not (conceptually) advanced.
+        // Calling PeekNextChar or GetNextChar will
+        // return the same character.
+        //
+        // Returns null if the end of the stream has been
+        // reached.
+        private bool PeekNextChar(out char val)
+        {
+            if (haveLookAhead)
+            {
+                val = lookAheadVal;
+                return true;
+            }
+            else
+            {
+                int nextVal = inputStream.ReadByte();
+
+                if (nextVal == -1)
+                {
+                    // Nothing more to read
+                    val = '\0';
+                    return false;
+                }
+                else
+                {
+                    haveLookAhead = true;
+                    // Hacky cast: just assume everything is 1-byte ASCII
+                    lookAheadVal = (char)nextVal;
+                    val = lookAheadVal;
+                    return true;
+                }
+            }
+        }
+
+        // Retrieves the next character, and advances the stream.
+        // Returns null if the end has already been reached.
+        private bool GetNextChar(out char val)
+        {
+            char dummy;
+
+            if (!PeekNextChar(out dummy))
+            {
+                val = '\0';
+                return false;
+            }
+
+            Debug.Assert(haveLookAhead);
+            val = lookAheadVal;
+            haveLookAhead = false;
+            return true;
+        }
+
+        // Advances the stream without returning the current
+        // character.
+        private void DiscardNextChar()
+        {
+            char dummyChar;
+            GetNextChar(out dummyChar);
+        }
+
+        // Get the next token.
+        private string GetToken()
+        {
+            char peekChar;
+
+            // Skip whitespace
+            if (!PeekNextChar(out peekChar))
+            {
+                return null;
+            }
+
+            while (Char.IsWhiteSpace(peekChar))
+            {
+                // Throw away the whitespace char
+                DiscardNextChar();
+                if (!PeekNextChar(out peekChar))
+                {
+                    return null;
+                }
+            }
+
+            // Special one-character tokens
+            if ((peekChar == '(') || (peekChar == ')') || (peekChar == '\''))
+            {
+                // Consume and return this character
+                DiscardNextChar();
+                return new String(peekChar, 1);
+            }
+
+            String token = "";
+
+            do
+            {
+                token += peekChar;
+                DiscardNextChar();
+
+                if (!PeekNextChar(out peekChar))
+                {
+                    // Ran into the end of the stream
+                    return token;
+                }
+            } while ((!Char.IsWhiteSpace(peekChar)) && (peekChar != '(') && (peekChar != ')'));
+
+            return token;
+        }
+
+        public PLObject GetExpression()
+        {
+            string token = GetToken();
+
+            if (token == null)
+            {
+                return null;
+            }
+
+            if (token.Equals("'"))
+            {
+                // The "'" character means "quote", and preserve
+                // the next expression.
+                PLList retval = new PLList();
+                retval.Add(new PLStringAtom("quote"));
+
+                PLObject nextExpr = GetExpression();
+
+                if (nextExpr == null)
+                {
+                    throw new Exception("'quote' was not followed by a complete expression");
+                }
+
+                retval.Add(nextExpr);
+                return retval;
+            }
+
+            if  (!token.Equals("("))
+            {
+                // Not the beginning of a list; the expression is
+                // simply this token. See if it's a number or a
+                // plain string.
+                try
+                {
+                    return new PLNumberAtom(token);
+                }
+                catch (Exception)
+                {
+                    // Just treat it as a regular string
+                    return new PLStringAtom(token);
+                }
+            }
+            else
+            {
+                // We have the beginning of a list, which can contain
+                // any number of expressions. Keep building our list
+                // until we encounter the closing paren.
+                PLList retval = new PLList();
+
+                PLObject nextExpr = GetExpression();
+
+                while (! nextExpr.Equals(")"))
+                {
+                    retval.Add(nextExpr);
+
+                    nextExpr = GetExpression();
+
+                    if (nextExpr == null)
+                    {
+                        throw new Exception("Incomplete expression (unbalanced parens?");
+                    }
+                }
+
+                return retval;
+            }
+        }
+
+        private Stream inputStream;
+        private bool haveLookAhead;
+        private char lookAheadVal;
+    }
+}
diff --git a/base/Libraries/ProtoLisp/ProtoLisp.csproj b/base/Libraries/ProtoLisp/ProtoLisp.csproj
new file mode 100644
index 0000000..7ff8249
--- /dev/null
+++ b/base/Libraries/ProtoLisp/ProtoLisp.csproj
@@ -0,0 +1,34 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\xxx\xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>ProtoLisp</AssemblyName>
+    <Language>C#</Language>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Engine.cs" />
+    <Compile Include="Interpreter.cs" />
+    <Compile Include="Lexer.cs" />
+    <Compile Include="Types.cs" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/ProtoLisp/Types.cs b/base/Libraries/ProtoLisp/Types.cs
new file mode 100644
index 0000000..e1347c0
--- /dev/null
+++ b/base/Libraries/ProtoLisp/Types.cs
@@ -0,0 +1,222 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+
+//
+// This file defines the family of objects that are used to
+// represent basic Proto-Lisp objects. They exist in order
+// to make it easy to replace their implementation with
+// more efficient versions if necessary, and to enable
+// somewhat stronger type-checking for the Interpreter
+// code.
+//
+namespace ProtoLisp
+{
+    // This is the common base class of ProtoLisp objects
+    class PLObject
+    {
+        // empty
+    }
+
+    // This is the common base class of ProtoLisp atoms
+    class PLAtom : PLObject
+    {
+        // empty
+    }
+
+    // A string atom is a non-number atom. It's a pass-through
+    // container for a String.
+    class PLStringAtom : PLAtom
+    {
+        public PLStringAtom(string s)
+        {
+            myval = s;
+        }
+
+        public override bool Equals(Object other)
+        {
+            if (other is PLStringAtom)
+            {
+                return myval.Equals(((PLStringAtom)other).myval);
+            }
+            else
+            {
+                return myval.Equals(other);
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return myval.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return myval;
+        }
+
+        private string myval;
+    }
+
+    // A numeric atom. Currently implemented with a plain int,
+    // which means floating-point isn't supported.
+    class PLNumberAtom : PLAtom
+    {
+        public PLNumberAtom(string s)
+        {
+            myval = Int32.Parse(s);
+        }
+
+        private PLNumberAtom(int val)
+        {
+            myval = val;
+        }
+
+        public override bool Equals(Object other)
+        {
+            if (other is PLNumberAtom)
+            {
+                return myval.Equals(((PLNumberAtom)other).myval);
+            }
+            else
+            {
+                return myval.Equals(other);
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return myval.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return myval.ToString();
+        }
+
+        public static PLNumberAtom operator+ (PLNumberAtom a, PLNumberAtom b)
+        {
+            return new PLNumberAtom(a.myval + b.myval);
+        }
+
+        public static PLNumberAtom operator- (PLNumberAtom a, PLNumberAtom b)
+        {
+            return new PLNumberAtom(a.myval - b.myval);
+        }
+
+        public static PLNumberAtom operator* (PLNumberAtom a, PLNumberAtom b)
+        {
+            return new PLNumberAtom(a.myval * b.myval);
+        }
+
+        public static PLNumberAtom operator/ (PLNumberAtom a, PLNumberAtom b)
+        {
+            return new PLNumberAtom(a.myval / b.myval);
+        }
+
+        private int myval;
+    }
+
+    // The internal representation of lists.
+    class PLList : PLObject
+    {
+        public PLList()
+        {
+            myval = new ArrayList();
+        }
+
+        public void Add(PLObject o)
+        {
+            myval.Add(o);
+        }
+
+        public PLObject this[int index]
+        {
+            get { return (PLObject)myval[index]; }
+            set { myval[index] = value; }
+        }
+
+        public int Count
+        {
+            get { return myval.Count; }
+        }
+
+        public override int GetHashCode()
+        {
+            return myval.GetHashCode();
+        }
+
+        private ArrayList myval;
+    }
+
+    // Our internal representation of an "environment" (a binding of
+    // symbolic names to values)
+    class PLEnvironment : ICloneable
+    {
+        public PLEnvironment()
+        {
+            table = new Hashtable();
+        }
+
+        private PLEnvironment(PLEnvironment other)
+        {
+            // Snapshot the other
+            table = (Hashtable)other.table.Clone();
+        }
+
+        public void Put(string name, PLObject val)
+        {
+            table[name] = val;
+        }
+
+        public PLObject Lookup(string name)
+        {
+            return (PLObject)table[name];
+        }
+
+        public object Clone()
+        {
+            return new PLEnvironment(this);
+        }
+
+        private Hashtable table;
+    }
+
+    // The internal representation of function closures
+    // (function arg list, body expression, plus environment for free variables)
+    class PLClosure : PLObject
+    {
+        // The constructor clones the environment to capture the closure
+        public PLClosure(PLList funArgs, PLObject funBody, PLEnvironment environment)
+        {
+            // Check argument names
+            for (int i = 0; i < funArgs.Count; ++i)
+            {
+                if (! (funArgs[i] is PLStringAtom))
+                {
+                    throw new Exception("Attempt to define a procedure with arguments that are not string atoms");
+                }
+            }
+
+            argNames = funArgs;
+            body = funBody;
+
+            // Snapshot the environment
+            if (environment != null)
+            {
+                env = (PLEnvironment)environment.Clone();
+            }
+        }
+
+        public readonly PLList argNames;
+        public readonly PLObject body;
+        public readonly PLEnvironment env;
+    }
+}
diff --git a/base/Libraries/Resiliency/DirectoryServiceProxy.sg b/base/Libraries/Resiliency/DirectoryServiceProxy.sg
new file mode 100644
index 0000000..b453094
--- /dev/null
+++ b/base/Libraries/Resiliency/DirectoryServiceProxy.sg
@@ -0,0 +1,572 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\DirectoryServiceProxy.sg
+//
+//  Note:   Intermediary of DirectoryServiceContract
+//
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    internal sealed class DirectoryServiceProxy : IRunnable, IRecoveryAware
+    {
+        private bool                                        recovery;
+        private Object!                                     recoveryLock;
+        private ServiceProxy!                               manager;
+        private IList!                                      providerList;
+        private JournaletFactory!                           factory;
+        private PersistentMemory!                           objectStore;
+        private TRef<DirectoryServiceContract.Imp:Ready>    rootDsRef;
+        private TRef<DirectoryServiceContract.Exp:Ready>    myDsRef;
+        private TRef<ServiceProxyContract.Exp:Ready>        proxyRef;
+        private TRef<ThreadTerminationContract.Exp:Start>   signalRef;
+        private TRef<SignalContract.Imp:Start>   senderRef;
+        private TRef<SignalContract.Exp:Start>   receiverRef;
+
+        /// dep     Channel to the (root) directory service.  This channel is
+        ///         necessary to intercept the connection request from a client
+        ///         to the server.
+        /// fep     Channel from the target server.  This channel acts as the
+        ///         directory service for the server.
+        internal DirectoryServiceProxy(ServiceProxy! proxy,
+                                       JournaletFactory! factory,
+                                       [Claims]DirectoryServiceContract.Imp:Ready! dep,
+                                       [Claims]DirectoryServiceContract.Exp:Ready! fep,
+                                       [Claims]ServiceProxyContract.Exp:Ready! xep)
+        {
+            SignalContract.Imp!  imp;
+            SignalContract.Exp!  exp;
+
+            this.manager = proxy;
+            this.factory = factory;
+            this.providerList = new ArrayList();
+            this.objectStore = new PersistentMemory();
+            this.recoveryLock = new Object();
+
+            this.myDsRef = new TRef<DirectoryServiceContract.Exp:Ready>(fep);
+            this.proxyRef = new TRef<ServiceProxyContract.Exp:Ready>(xep);
+            this.rootDsRef = new TRef<DirectoryServiceContract.Imp:Ready>(dep);
+
+            SignalContract.NewChannel(out imp, out exp);
+            senderRef = new TRef<SignalContract.Imp:Start>(imp);
+            receiverRef = new TRef<SignalContract.Exp:Start>(exp);
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            signalRef = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        // Proxy recovers from server failure by itself.
+        public void Run()
+        {
+            DirectoryServiceContract.Exp:Ready  newEP;
+            ServiceProxyContract.Exp:Ready      newPx;
+            SignalContract.Imp:Start!           signal;
+
+            for (;;) {
+                DebugStub.Print("DPx: HandleProxyService\n");
+                if (!HandleProxyService()) {
+                    break;
+                }
+
+                manager.RecoverService(out newEP, out newPx);
+
+                if (newEP == null || newPx == null) {
+                    delete newEP;
+                    delete newPx;
+                    break;
+                }
+                DebugStub.Print("DPx: Replace DS\n");
+                // replace with the new endpoint
+                delete myDsRef.Acquire();
+                myDsRef.Release(newEP);
+                DebugStub.Print("DPx: Replace proxy\n");
+                delete proxyRef.Acquire();
+                proxyRef.Release(newPx);
+            }
+
+            delete signalRef.Acquire();
+        }
+
+        ///
+        /// Handles DirectoryService and ServiceProvider
+        ///
+        private bool HandleProxyService()
+        {
+            DirectoryServiceContract.Exp:Ready!     myDS;
+            ServiceProxyContract.Exp:Ready!         proxy;
+            DirectoryServiceContract.Imp:Ready!     rootDS;
+            ThreadTerminationContract.Exp:Start!    signalFromManager;
+            SignalContract.Exp:Start!               signalInternal;
+            int     currentGeneration = -1;
+            int     previousGeneration = 0;
+            Random  random = new Random();
+
+            if (signalRef == null) {
+                DebugStub.Print("DPx: signal is not set!\n");
+                return recovery;
+            }
+
+            myDS = myDsRef.Acquire();
+            rootDS = rootDsRef.Acquire();
+            proxy = proxyRef.Acquire();
+            signalFromManager = signalRef.Acquire();
+            signalInternal = receiverRef.Acquire();
+            recovery = false;
+
+            for (;;) {
+                switch receive {
+                    // BEGIN SWR LEVEL0
+                    // From the service process
+                    case myDS.Register(path, imp):
+                    {
+                        string!                             pathName;
+                        ServiceProviderProxy                provider;
+                        ServiceProviderContract.Imp!        client;
+                        ServiceProviderContract.Exp!        server;
+                        ServiceProviderContract.Imp:Start!  oldEp;
+
+                        pathName = Bitter.ToString2(path);
+                        DebugStub.Print("DPx: Register '{0}'\n",
+                                        __arglist(pathName));
+
+                        provider = LookupProviderProxy(pathName);
+                        if (provider != null) {     // We already have the one.
+                            provider.Stop(out oldEp);
+                            delete oldEp;
+                            provider.Start(imp);
+                            myDS.SendAckRegister();
+                            delete path;
+                            break;
+                        }
+
+                        // Register the JP's endpoint to the NS.
+                        ServiceProviderContract.NewChannel(out client,
+                                                           out server);
+                        rootDS.SendRegister(path, client);
+
+                        // BEGIN SWR LEVEL1
+                        switch receive {
+                            // From the root DS
+                            case rootDS.AckRegister():
+                            {
+                                myDS.SendAckRegister();
+                                CreateProviderProxy(pathName, imp, server);
+                                break;
+                            }
+                            // From the root DS
+                            case rootDS.NakRegister(rejected, error):
+                            {
+                                myDS.SendNakRegister(imp, error);
+
+                                delete rejected;
+                                delete server;
+                                break;
+                            }
+                            // From the root DS
+                            case rootDS.NakRegisterReparse(npath, rest,
+                                                           link, rejected):
+                            {
+                                DebugStub.Print("DPx: NakRegisterReparse\n");
+                                myDS.SendNakRegisterReparse(npath, rest,
+                                                            link, imp);
+                                delete rejected;
+                                delete server;
+                                break;
+                            }
+                            // internal communication
+                            case signalFromManager.Stop():
+                            {
+                                signalFromManager.SendAckStop();
+                                delete server;
+                                delete imp;
+                                goto exit;
+                                break;
+                            }
+                            // internal communication
+                            case signalFromManager.ChannelClosed():
+                            {
+                                delete server;
+                                delete imp;
+                                goto exit;
+                                break;
+                            }
+                            case unsatisfiable:
+                            {
+                                // protocol mismatch
+                                delete server;
+                                delete imp;
+                                break;
+                            }
+                        } // END SWR LEVEL1
+                        break;
+                    }
+                    // From the service process
+                    case myDS.Deregister(path):
+                    {
+                        string!                 pathName;
+                        ServiceProviderProxy    provider;
+
+                        pathName = Bitter.ToString2(path);
+                        DebugStub.Print("DPx: Deregister '{0}'\n",
+                                        __arglist(pathName));
+                        rootDS.SendDeregister(path);
+
+                        switch receive {
+                            // From the root DS
+                            case rootDS.AckDeregister(ep):
+                            {
+                                provider = LookupProviderProxy(pathName);
+                                if (provider != null) {
+                                    ServiceProviderContract.Imp:Start! endpoint;
+                                    provider.Terminate(out endpoint);
+                                    myDS.SendAckDeregister(endpoint);
+                                    RemoveProviderProxy(provider);
+                                }
+                                else {
+                                    myDS.SendNakDeregister(ErrorCode.NotFound);
+                                }
+                                delete ep;
+                                break;
+                            }
+                            // From the root DS
+                            case rootDS.NakDeregister(error):
+                            {
+                                myDS.SendNakDeregister(error);
+                                break;
+                            }
+                            case rootDS.NakDeregisterReparse(npath, rest, link):
+                            {
+                                myDS.SendNakDeregisterReparse(npath, rest,
+                                                              link);
+                                break;
+                            }
+                        } // END SWR LEVEL1
+                        break;
+                    }
+
+                    //
+                    // PRef style
+                    //NOTE: Not tested yet
+                    case proxy.Allocate(obj):
+                    {
+                        proxy.SendNakAllocate(obj);
+                        break;
+                    }
+                    case proxy.Deallocate(id):
+                    {
+                        proxy.SendNakDeallocate();
+                        break;
+                    }
+                    case proxy.AcquireObject(id):
+                    {
+                        proxy.SendNakAcquireObject();
+                        break;
+                    }
+                    case proxy.ReleaseObject(obj):
+                    {
+                        proxy.SendNakReleaseObject();
+                        break;
+                    }
+
+                    //
+                    // Serialization style
+                    //
+                    case proxy.Upload(data):
+                    {
+                        proxy.SendAckUpload();
+                        objectStore.Store(data);
+                        break;
+                    }
+                    case proxy.Download():
+                    {
+                        byte[] in ExHeap buffer = objectStore.Restore();
+                        if (buffer != null) {
+                            proxy.SendAckDownload(buffer);
+                        }
+                        else {
+                            proxy.SendNakDownload();
+                        }
+                        break;
+                    }
+
+                    //
+                    // Checkpoint update protocol
+                    //NOTE: not tested yet
+                    case proxy.Suspend(/* journalet id */):
+                    {
+                        proxy.SendAckSuspend(currentGeneration);
+                        SuspendProviderProxies();
+                        break;
+                    } 
+                    case proxy.Resume(generation):
+                    {
+                        proxy.SendAckResume();
+                        if (generation == currentGeneration) {
+                            ResumeProviderProxies();
+                        }
+                        break;
+                    }
+                    case proxy.Update(generation):
+                    {
+                        proxy.SendAckUpdate();
+                        if (generation == currentGeneration) {
+                            objectStore.Flush();
+                            UpdateProviderProxies();
+                            previousGeneration = currentGeneration;
+                            do {
+                                currentGeneration = random.Next();
+                            } while (currentGeneration == previousGeneration);
+                        }
+                        break;
+                    }
+
+                    case proxy.ChannelClosed():
+                    {
+                        DebugStub.Print("DPx: Server channel closed. " +
+                                        "Recover.\n");
+                        objectStore.Undo();
+                        recovery = true;
+                        goto exit;
+                        break;
+                    }
+                    // From the service process
+                    case myDS.ChannelClosed():
+                    {
+                        DebugStub.Print("DPx: Server channel closed. " +
+                                        "Recover.\n");
+                        objectStore.Undo();
+                        recovery = true;
+                        goto exit;
+                        break;
+                    }
+                    // From the root DS
+                    case rootDS.ChannelClosed():
+                    {
+                        DebugStub.Print("DPx: DS channel closed. Exit.\n");
+                        goto exit;
+                        break;
+                    }
+                    case signalFromManager.Stop():
+                    {
+                        TerminateProviderProxies();
+                        signalFromManager.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    case signalFromManager.ChannelClosed():
+                    {
+                        TerminateProviderProxies();
+                        goto exit;
+                        break;
+                    }
+                    case signalInternal.Stop():
+                    {
+                        recovery = true;
+                        signalInternal.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    // this works with the proxy initiation style
+                    case signalInternal.Update():
+                    {
+                        DebugStub.Print("DPx: Update Master\n");
+                        objectStore.Flush();
+                        signalInternal.SendAckUpdate();
+                        break;
+                    }
+                    case signalInternal.ChannelClosed():
+                    {
+                        TerminateProviderProxies();
+                        goto exit;
+                        break;
+                    }
+                } // END SWR LEVEL0
+            } // END OF LOOP
+exit:
+            signalRef.Release(signalFromManager);
+            receiverRef.Release(signalInternal);
+
+            myDsRef.Release(myDS);
+            rootDsRef.Release(rootDS);
+            proxyRef.Release(proxy);
+
+            return recovery;
+        } // HandleDirectoryService
+
+        private void CreateProviderProxy(string! path,
+                                         [Claims]ServiceProviderContract.Imp:Start! provider,
+                                         [Claims]ServiceProviderContract.Exp:Start! myProvider)
+        {
+            ServiceProviderProxy pp = new ServiceProviderProxy(this, path,
+                                                               factory,
+                                                               myProvider);
+            lock (providerList) {
+                providerList.Add(pp);
+            }
+            pp.Start(provider);
+        }
+
+        private ServiceProviderProxy LookupProviderProxy(string! path)
+        {
+            ServiceProviderProxy    pp;
+
+            lock (providerList) {
+                foreach (Object obj in providerList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    pp = obj as ServiceProviderProxy;
+                    if (pp == null) {
+                        continue;
+                    }
+                    if (pp.Path == path) {
+                        return pp;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private void RemoveProviderProxy(ServiceProviderProxy! sp)
+        {
+            lock (providerList) {
+                providerList.Remove(sp);
+            }
+        }
+
+        private void TerminateProviderProxies()
+        {
+            ServiceProviderProxy                pp;
+            ServiceProviderContract.Imp:Start!  ep;
+
+            //DebugStub.Print("DPx: Enter TerminateProviderProxies\n");
+            lock (providerList) {
+                foreach (Object obj in providerList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    pp = obj as ServiceProviderProxy;
+                    if (pp == null) {
+                        continue;
+                    }
+                    pp.Terminate(out ep);
+                    delete ep;
+                }
+            }
+            //DebugStub.Print("DPx: Exit TerminateProviderProxies\n");
+        }
+
+        private void SuspendProviderProxies()
+        {
+            ServiceProviderProxy    pp;
+
+            lock (providerList) {
+                foreach (Object obj in providerList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    pp = obj as ServiceProviderProxy;
+                    if (pp == null) {
+                        continue;
+                    }
+                    pp.Suspend();
+                }
+            }
+        }
+
+        private void ResumeProviderProxies()
+        {
+            ServiceProviderProxy    pp;
+            
+            lock (providerList) {
+                foreach (Object obj in providerList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    pp = obj as ServiceProviderProxy;
+                    if (pp == null) {
+                        break;
+                    }
+                    pp.Resume();
+                }
+            }
+        }
+
+        private void UpdateProviderProxies()
+        {
+            ServiceProviderProxy    pp;
+            
+            lock (providerList) {
+                foreach (Object obj in providerList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    pp = obj as ServiceProviderProxy;
+                    if (pp == null) {
+                        break;
+                    }
+                    pp.Flush();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Signal to the main loop for recovering the server.
+        /// Invoked by ServiceProviderProxy.
+        /// </summary>
+        public void NotifyRecovery()
+        {
+            SignalContract.Imp:Start!    signal;
+
+            if (!Monitor.TryEnter(recoveryLock)) {
+                return;
+            }
+
+            if (!recovery) {
+                signal = senderRef.Acquire();
+                signal.SendStop();
+                switch receive {
+                    case signal.AckStop():
+                        break;
+                    case unsatisfiable:
+                        break;
+                }
+                senderRef.Release(signal);
+            }
+
+            Monitor.Exit(recoveryLock);
+        }
+
+        public void UpdateCheckpoint()
+        {
+            SignalContract.Imp:Start!   signal;
+
+            //DebugStub.Print("DPx: Enter UpdateCheckpoint\n");
+            signal = senderRef.Acquire();
+            SuspendProviderProxies();
+            signal.SendUpdate();
+            switch receive {
+                case signal.AckUpdate():
+                    break;
+            }
+            UpdateProviderProxies();
+            ResumeProviderProxies();
+            senderRef.Release(signal);
+            //DebugStub.Print("DPx: Exit UpdateCheckpoint\n");
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/ICheckpoint.sg b/base/Libraries/Resiliency/ICheckpoint.sg
new file mode 100644
index 0000000..d4e4db9
--- /dev/null
+++ b/base/Libraries/Resiliency/ICheckpoint.sg
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\ICheckpoint.sg
+//
+//  Note:   
+//
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public interface ICheckpoint
+    {
+        void Suspend();
+        void Flush();
+        void Resume();
+    }
+}
diff --git a/base/Libraries/Resiliency/IRecoveryAware.sg b/base/Libraries/Resiliency/IRecoveryAware.sg
new file mode 100644
index 0000000..24aadaf
--- /dev/null
+++ b/base/Libraries/Resiliency/IRecoveryAware.sg
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\IRecoveryAware.sg
+//
+//  Note:   
+//
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public interface IRecoveryAware
+    {
+        void NotifyRecovery();
+        void UpdateCheckpoint();
+    }
+}
diff --git a/base/Libraries/Resiliency/JournalProducer.sg b/base/Libraries/Resiliency/JournalProducer.sg
new file mode 100644
index 0000000..6a05fd0
--- /dev/null
+++ b/base/Libraries/Resiliency/JournalProducer.sg
@@ -0,0 +1,769 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\JournalProducer.sg
+//
+//  Note:   Logging Worker Creator Template
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Services;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public abstract class JournalProducer
+    {
+        protected Thread    dsThread;
+        protected Thread    managerThread;
+        protected Thread    providerThread;
+
+        protected TRef<DirectoryServiceContract.Imp:Ready>  rootDsRef;
+        protected TRef<DirectoryServiceContract.Exp:Ready>  myDsRef;
+        protected TRef<ServiceProviderContract.Imp:Start>   providerRef;
+        protected TRef<ServiceProviderContract.Exp:Start>   myProviderRef;
+        protected TRef<ManagedServiceContract.Exp:Ready>    serviceRef;
+        protected TRef<ServiceControlContract.Imp:Ready>    controlRef;
+        protected TRef<ManagedProxyContract.Imp:Ready>      managerRef;
+
+        protected TRef<ThreadTerminationContract.Imp:Start> dsSignalSenderRef;
+        protected TRef<ThreadTerminationContract.Exp:Start> dsSignalReceiverRef;
+        protected TRef<ThreadTerminationContract.Imp:Start> mgSignalSenderRef;
+        protected TRef<ThreadTerminationContract.Exp:Start> mgSignalReceiverRef;
+        protected TRef<ThreadTerminationContract.Imp:Start> spSignalSenderRef;
+        protected TRef<ThreadTerminationContract.Exp:Start> spSignalReceiverRef;
+        protected TRef<ThreadTerminationContract.Imp:Start> recoverySignalSenderRef;
+        protected TRef<ThreadTerminationContract.Exp:Start> recoverySignalReceiverRef;
+
+        protected IList!  journaletList;
+        protected Object! journaletListLock;
+
+        public JournalProducer()
+        {
+            this.journaletList = new ArrayList();
+            this.journaletListLock = new Object();
+        }
+
+        /// <summary>
+        /// Checks the type of this endpoint is that of the subclass can handle.
+        /// </summary>
+        protected abstract bool Accept(ServiceContract.Exp:Start! ep);
+
+        /// <summary>
+        /// Substitutes the ServiceContract with a new one in order to
+        /// intercept the messages exchanged through the given ServiceContract.
+        /// </summary>
+        protected abstract void Substitute([Claims]ServiceContract.Exp:Start! ep,
+                                           out ServiceContract.Exp! newEp);
+
+        public void RegisterJournalet(Journalet j)
+        {
+            if (j != null) {
+                lock (journaletListLock) {
+                    try {
+                        journaletList.Add(j);
+                    }
+                    catch (Exception) {}
+                }
+            }
+        }
+
+        public void DeregisterJournalet(Journalet j)
+        {
+            if (j != null) {
+                lock (journaletListLock) {
+                    try {
+                        journaletList.Remove(j);
+                    }
+                    catch (Exception) {}
+                }
+            }
+        }
+
+        /// <summary>
+        /// This actually launches the JournalProducer.  The management thread
+        /// is started here.
+        ///
+        /// JournalProducer is initialized with three channels.
+        /// mep     Channel from the service manager.  JournalProducer is a
+        ///         kind of service, so it has to be controlled by the service
+        ///         manager.
+        /// dep     Channel to the (root) directory service.  This channel is
+        ///         necessary to intercept the connection request from a client
+        ///         to the server that JournalProducer supports.
+        /// fep     Channel from the target service.  This channel pretends the
+        ///         root directory service.
+        ///
+        /// NOTE: x is an temporal solution so that JournalProducer receives a
+        /// new DS channel during the service recovery.
+        /// </summary>
+        public void Start([Claims]ManagedServiceContract.Exp:Start! mep,
+                          [Claims]DirectoryServiceContract.Imp:Ready! dep,
+                          [Claims]DirectoryServiceContract.Exp:Start! fep,
+                          [Claims]ManagedProxyContract.Imp:Start! pep)
+        {
+            ThreadTerminationContract.Imp! sender;
+            ThreadTerminationContract.Exp! receiver;
+
+            //
+            // The root directory service
+            //
+            rootDsRef = new TRef<DirectoryServiceContract.Imp:Ready>(dep);
+
+            //
+            // Initialize connection to the service manager
+            //
+            mep.SendSuccess();
+            serviceRef = new TRef<ManagedServiceContract.Exp:Ready>(mep);
+            ThreadTerminationContract.NewChannel(out sender, out receiver);
+            mgSignalSenderRef = new TRef<ThreadTerminationContract.Imp:Start>(sender);
+            mgSignalReceiverRef = new TRef<ThreadTerminationContract.Exp:Start>(receiver);
+
+            //
+            // Initialize my directory service
+            //
+            fep.SendSuccess();
+            myDsRef = new TRef<DirectoryServiceContract.Exp:Ready>(fep);
+
+            //
+            // Initialize the channel to the service process
+            //
+//            xep.SendSuccess();
+//            proxyRef = new TRef<ProxyContract.Exp:Ready>(xep);
+
+            //
+            // Set up another connection for recovery to the service manager
+            //
+            switch receive {
+                case pep.Success():
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+            managerRef = new TRef<ManagedProxyContract.Imp:Ready>(pep);
+            ThreadTerminationContract.NewChannel(out sender, out receiver);
+            recoverySignalSenderRef = new TRef<ThreadTerminationContract.Imp:Start>(sender);
+            recoverySignalReceiverRef = new TRef<ThreadTerminationContract.Exp:Start>(receiver);
+
+            //
+            // Set up the service controller
+            //
+            /*
+            cep.RecvSuccess();
+            controlRef = new TRef<ServiceControlContract.Imp:Ready>(cep);
+            */
+
+            //
+            // Set up the thread terminator for the substitute DS thread
+            //
+            ThreadTerminationContract.NewChannel(out sender, out receiver);
+            dsSignalSenderRef = new TRef<ThreadTerminationContract.Imp:Start>(sender);
+            dsSignalReceiverRef = new TRef<ThreadTerminationContract.Exp:Start>(receiver);
+
+            //
+            // Set up the thread terminator for the producer thread
+            //
+            ThreadTerminationContract.NewChannel(out sender, out receiver);
+            spSignalSenderRef = new TRef<ThreadTerminationContract.Imp:Start>(sender);
+            spSignalReceiverRef = new TRef<ThreadTerminationContract.Exp:Start>(receiver);
+
+            //
+            // Create the substitute DS thread
+            //
+            dsThread = new Thread(new ThreadStart(DirectoryServiceThread));
+
+            //
+            // Create the journalet producer thread
+            //
+            providerThread = new Thread(new ThreadStart(ProviderThread));
+
+            //
+            // Create and start the service management thread
+            //
+            managerThread = new Thread(new ThreadStart(ManagerThread));
+            managerThread.Start();
+        }
+
+        /// <summary>
+        /// JournalProducer provides a directory service on behalf of the
+        /// root DirectoryService so that it intercepts all outputs of
+        /// a service process.
+        ///
+        /// Here you will see the first logic of the directory service. It
+        /// transits back and forth between the normal state and the recovery
+        /// state. This seems simple but it's a bit tricky.  The normal operation
+        /// state normally deals with DirectoryServiceContract, but it also
+        /// creates or deletes logging workers.
+        ///
+        /// The recovery operation state recovers the service registration
+        /// state.  A service process registers its ServiceProviderContract
+        /// to the DirectoryService.  JournalProducer intercepts this
+        /// registration and registers another ServiceProviderContract to the
+        /// DirectoryService.  The recovery operation doesn't create and
+        /// register a new ServiceProvider because it is already registered
+        /// to the DirectoryService.
+        /// </summary>
+        /// NOTE: Current implementation doesn't support all protocols of the
+        /// DirectoryServiceContract.
+        protected void DirectoryServiceThread()
+        {
+            ThreadTerminationContract.Imp:Start!    signalToManager;
+
+            signalToManager = mgSignalSenderRef.Acquire();
+            for (;;) {
+                if (!HandleDirectoryService()) {
+                    break;
+                }
+
+                // Trigger the recovery
+                signalToManager.SendStop();
+                switch receive {
+                    case signalToManager.AckStop():
+                        // Transit to the recovery mode
+                        if (!RecoverDirectoryService()) {
+                            goto exit;
+                        }
+                        break;
+                    case signalToManager.ChannelClosed():
+                        // Recovery failed
+                        goto exit;
+                        break;
+                }
+            }
+exit:
+            mgSignalSenderRef.Release(signalToManager);
+        }
+
+        /// <summary>
+        /// Emulates a directory service.
+        /// </summary>
+        protected bool HandleDirectoryService()
+        {
+            // Flag for the recovery mode outside this method
+            bool recovery = false;
+            DirectoryServiceContract.Exp:Ready!     myDS;
+            DirectoryServiceContract.Imp:Ready!     rootDS;
+            ThreadTerminationContract.Exp:Start!    signalFromManager;
+            ThreadTerminationContract.Exp:Start!    signalFromProvider;
+            ThreadTerminationContract.Imp:Start!    signalToProvider;
+
+            myDS = myDsRef.Acquire();
+            rootDS = rootDsRef.Acquire();
+            signalToProvider = spSignalSenderRef.Acquire();
+            signalFromManager = dsSignalReceiverRef.Acquire();
+            signalFromProvider = recoverySignalReceiverRef.Acquire();
+
+            for (;;) {
+                switch receive {
+                    //
+                    // The following 4 cases are message from the service
+                    // process.
+                    //
+                    case myDS.Bind(path, exp):
+                    {
+                        DebugStub.Print("JP DS: Bind, break\n");
+                        DebugStub.Break();
+                        delete path;
+                        delete exp;
+                        break;
+                    }
+                    case myDS.Register(path, imp):
+                    {
+                        ServiceProviderContract.Imp! client;
+                        ServiceProviderContract.Exp! server;
+
+                        // HI: Current implementation can handle only one name
+                        // per service.
+                        DebugStub.Print("JP DS: Register @ '{0}'\n",
+                                        __arglist(Bitter.ToString2(path)));
+                        providerRef = new TRef<ServiceProviderContract.Imp:Start>(imp);
+                        ServiceProviderContract.NewChannel(out client, out server);
+                        myProviderRef = new TRef<ServiceProviderContract.Exp:Start>(server);
+                        // Now register the JP's endpoint to the NS.
+                        rootDS.SendRegister(path, client);
+                        break;
+                    }
+                    case myDS.Deregister(path):
+                    {
+                        DebugStub.Print("JP DS: Deregister\n");
+                        rootDS.SendDeregister(path);
+                        break;
+                    }
+                    case myDS.ChannelClosed():
+                    {
+                        DebugStub.Print("JP DS: Server channel closed." +
+                                        " Waits for provider's signal.\n");
+                        switch receive {
+                            case signalFromProvider.Stop():
+                            {
+                                signalFromProvider.SendAckStop();
+                                recovery = true;
+                                break;
+                            }
+                            case signalFromProvider.ChannelClosed():
+                            {
+                                recovery = true;
+                                break;
+                            }
+                            case signalFromManager.Stop():
+                            {
+                                signalToProvider.SendStop();
+                                signalToProvider.RecvAckStop();
+                                delete myProviderRef.Acquire();
+                                delete providerRef.Acquire();
+                                providerRef = null;
+                                signalFromManager.SendAckStop();
+                                goto exit;
+                                break;
+                            }
+                            case signalFromManager.ChannelClosed():
+                            {
+                                goto exit;
+                                break;
+                            }
+                        }
+                        DebugStub.Print("JP DS: Provider's signal received.\n");
+                        goto exit;
+                        break;
+                    }
+
+                    //
+                    // The following messages are delivered from DS.
+                    // 
+                    case rootDS.AckRegister():
+                    {
+                        DebugStub.Print("JP DS: AckRegister\n");
+                        myDS.SendAckRegister();
+                        //
+                        // HI: At this point producer thread is allowed to
+                        // start.
+                        //
+                        providerThread.Start();
+                        break;
+                    }
+                    case rootDS.NakRegister(ep, error):
+                    {
+                        DebugStub.Print("JP DS: NakRegister\n");
+                        delete ep;
+                        delete myProviderRef.Acquire();
+                        myDS.SendNakRegister(providerRef.Acquire(), error);
+                        providerRef = null;
+                        break;
+                    }
+                    case rootDS.NakRegisterReparse(path, rest, link, ep):
+                    {
+                        DebugStub.Print("JP DS: NakRegisterReparse\n");
+                        delete ep;
+                        delete myProviderRef.Acquire();
+                        myDS.SendNakRegisterReparse(path, rest, link,
+                                                    providerRef.Acquire());
+                        providerRef = null;
+                        break;
+                    }
+                    case rootDS.AckDeregister(ep):
+                    {
+                        DebugStub.Print("JP DS: AckDeregister\n");
+                        delete ep;
+                        signalToProvider.SendStop();
+                        signalToProvider.RecvAckStop();
+                        delete myProviderRef.Acquire();
+                        myDS.SendAckDeregister(providerRef.Acquire());
+                        providerRef = null;
+                        break;
+                    }
+                    case rootDS.NakDeregister(error):
+                    {
+                        DebugStub.Print("JP DS: NakDeregister\n");
+                        myDS.SendNakDeregister(error);
+                        break;
+                    }
+                    case rootDS.NakDeregisterReparse(path, rest, link):
+                    {
+                        DebugStub.Print("JP DS: NakDeregisterReparse\n");
+                        myDS.SendNakDeregisterReparse(path, rest, link);
+                        break;
+                    }
+                    case rootDS.ChannelClosed():
+                    {
+                        DebugStub.Print("JP DS: DS channel closed. Break.\n");
+                        // Emulate channel closing
+                        delete providerRef.Acquire();
+                        providerRef = null;
+                        DebugStub.Break();
+                        break;
+                    }
+
+                    case signalFromManager.Stop():
+                    {
+                        signalToProvider.SendStop();
+                        signalToProvider.RecvAckStop();
+
+                        delete myProviderRef.Acquire();
+                        delete providerRef.Acquire();
+                        providerRef = null;
+                        signalFromManager.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+
+                    //
+                    // Signal from ProviderThread in this object.  This is the
+                    // trigger to start recovery.
+                    //
+                    case signalFromProvider.Stop():
+                        DebugStub.Print("JP DS: Received signal." +
+                                        " Start recovery.\n");
+                        recovery = true;
+                        signalFromProvider.SendAckStop();
+                        goto exit;
+                        break;
+                }
+            }
+exit:
+            recoverySignalReceiverRef.Release(signalFromProvider);
+            spSignalSenderRef.Release(signalToProvider);
+            dsSignalReceiverRef.Release(signalFromManager);
+
+            myDsRef.Release(myDS);
+            rootDsRef.Release(rootDS);
+
+            return recovery;
+        } // HandleDirectoryService
+
+        protected bool RecoverDirectoryService()
+        {
+            DirectoryServiceContract.Exp:Ready! substitute;
+
+            DebugStub.Print("JP: ENTER RecoveryOperation\n");
+            //
+            // get a new Directory Service endpoint
+            //
+            substitute = myDsRef.Acquire();
+            DebugStub.Print("JP: Get new substitute.");
+            switch receive {
+                case substitute.Register(path, imp):
+                {
+                    DebugStub.Print("JP DS Recovery: Re-register '{0}'\n",
+                                    __arglist(Bitter.ToString2(path)));
+                    //
+                    // Refresh the server-side ServiceProviderContract
+                    //
+                    DebugStub.Print("JP: Replacing the server-side channel... ");
+                    delete providerRef.Acquire();
+                    providerRef.Release(imp);
+                    DebugStub.Print("done\n");
+
+                    //
+                    // This time, we immediately send back the ack.
+                    //
+                    substitute.SendAckRegister();
+
+                    delete path;
+                    break;
+                }
+            }
+            myDsRef.Release(substitute);
+
+            new Thread(new ThreadStart(RecoveryThread)).Start();
+            //DebugStub.Print("JP: EXIT RecoveryOperation\n");
+            return true;
+
+        }
+
+        /// <summary>
+        /// This thread communicates with SMS and deals with general stuff on
+        /// the service management.
+        /// </summary>
+        // Communicates with DirectoryServiceThread
+        protected void ManagerThread()
+        {
+            ManagedServiceContract.Exp:Ready!       manager;
+            ManagedProxyContract.Imp:Ready!         managerRecovery;
+            ThreadTerminationContract.Imp:Start!    signalToDs;
+            ThreadTerminationContract.Exp:Start!    signalFromDs;
+
+            manager = serviceRef.Acquire();
+            managerRecovery = managerRef.Acquire();
+            signalToDs = dsSignalSenderRef.Acquire();
+            signalFromDs = mgSignalReceiverRef.Acquire();
+
+            for (;;) {
+                //DebugStub.Print("JP Manager th: Set\n");
+                switch receive {
+                    case manager.StartService():
+                    {
+                        dsThread.Start();
+                        manager.SendAckStartService();
+                        //else {
+                        //    manager.SendNakStartService();
+                        //}
+                        break;
+                    }
+                    case manager.StopService():
+                    {
+                        //DebugStub.Print("JPMan: StopService\n");
+                        //providerThread.Stop();
+                        manager.SendAckStopService();
+                        break;
+                    }
+                    case manager.RestartService():
+                    {
+                        DebugStub.Print("JPMan: RestartService\n");
+                        DebugStub.Break();
+                        //providerThread.Stop();
+                        //providerThread.Start();
+                        manager.SendAckRestartService();
+                        break;
+                    }
+                    case manager.Knock():
+                    {
+                        manager.SendAlive();
+                        break;
+                    }
+                    case manager.Stop():
+                    {
+                        signalToDs.SendStop();
+                        break;
+                    }
+                    case manager.Restart():
+                    {
+                        DebugStub.Break();
+                        break;
+                    }
+                    case signalFromDs.Stop():
+                    {
+                        delete myDsRef.Acquire();
+                        managerRecovery.SendRequestDSRecovery();
+                        break;
+                    }
+                    // Receives a new DirectoryServiceContract for the
+                    // restarted service process. JP provides the directory
+                    // service again with this endpoint.
+                    case managerRecovery.AckDSRecovery(directory):
+                    {
+                        directory.SendSuccess();
+                        myDsRef.Release(directory);
+                        signalFromDs.SendAckStop();
+                        break;
+                    }
+                    case managerRecovery.NakDSRecovery():
+                    {
+                        goto exit;
+                    }
+                    case managerRecovery.ChannelClosed():
+                    {
+                        goto exit;
+                    }
+                    case signalToDs.AckStop():
+                    {
+                        manager.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            delete manager;
+            delete managerRecovery;
+            delete signalFromDs;
+            delete signalToDs;
+        }
+
+        /// <summary>
+        /// Creates a Journalet for each C-S connection.
+        /// </summary>
+        protected void ProviderThread()
+        {
+            bool release = false;
+            bool signal = false;
+            bool recovery = false;
+
+            // From the root directory service
+            ServiceProviderContract.Exp:Start!      providerFromRootDs;
+            // To the resilient service
+            ServiceProviderContract.Imp:Start!      provider;
+            ThreadTerminationContract.Imp:Start!    dsSignal;
+            ThreadTerminationContract.Exp:Start!    signalFromDs;
+            ThreadTerminationContract.Imp:Start!    signalToDs;
+
+            providerFromRootDs = myProviderRef.Acquire();
+            signalFromDs = spSignalReceiverRef.Acquire();
+            signalToDs = recoverySignalSenderRef.Acquire();
+
+            //
+            // lock the server
+            //
+            provider = providerRef.Acquire();
+
+            for (;;) {
+                switch receive {
+                    case providerFromRootDs.Connect(ep):
+                    {
+                        //DebugStub.Print("JP Producer: received" +
+                        //                " client connection request ... ");
+                        if (Accept(ep)) {
+                            //DebugStub.Print("accepted.\n");
+                            ServiceContract.Exp! newExp;
+
+                            Substitute(ep, out newExp);
+                            provider.SendConnect(newExp);
+                            switch receive {
+                                case provider.AckConnect():
+                                    providerFromRootDs.SendAckConnect();
+                                    break;
+                                case provider.NackConnect(rejected):
+                                    delete rejected;
+                                    providerFromRootDs.SendNackConnect(null);
+                                    break;
+                                case provider.ChannelClosed():
+                                    //
+                                    // Try to recover
+                                    //
+                                    providerFromRootDs.SendNackConnect(null);
+                                    release = true;
+                                    signal = false;
+                                    recovery = true;
+                                    goto exit;
+                                    break;
+                            }
+                        }
+                        else {
+                            //DebugStub.Print("denied\n");
+                            providerFromRootDs.SendNackConnect(ep);
+                        }
+                        break;
+                    }
+                    case providerFromRootDs.ChannelClosed():
+                    {
+                        goto exit;
+                        break;
+                    }
+                    case signalFromDs.Stop():
+                    {
+                        release = false;
+                        signal = true;
+                        goto exit;
+                        break;
+                    }
+                    case signalFromDs.ChannelClosed():
+                    {
+                        goto exit;
+                        release = false;
+                        break;
+                    }
+                    case provider.ChannelClosed():
+                    {
+                        // Recovery
+                        DebugStub.Print("JP: Service provider lost. " +
+                                        "Recover.\n");
+                        release = true;
+                        signal = false;
+                        recovery = true;
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            
+            // Unlock the server
+            // This allows the DirectoryServiceThread to replace the
+            // ServiceProviderContract with a new one.
+            providerRef.Release(provider);
+
+            if (recovery) {
+                // Notify the internal DS to restart
+                signalToDs.SendStop();
+                signalToDs.RecvAckStop();
+            }
+
+            // No matter if it recovers or not, sends a signal to get the
+            // DirectoryServiceThread out of the loop.
+            recoverySignalSenderRef.Release(signalToDs);
+
+            if (release) {
+                myProviderRef.Release(providerFromRootDs);
+            }
+            else {
+                // Disconnect from the root DS.
+                delete providerFromRootDs;
+            }
+
+            if (signal) {
+                // It's over.  Get the ManagerThread out of loop.
+                signalFromDs.SendAckStop();
+            }
+            spSignalReceiverRef.Release(signalFromDs);
+        }
+
+        /// <summary>
+        /// Runs Journalets to replay their logs to the restarted and refreshed
+        /// service process.  Each Journalet emulates normal operations: create
+        /// a new pair of ServiceContract, deliver an endpoint through the
+        /// ServiceProviderContract, then interacts with the service process.
+        ///
+        /// Each Journalet has its own thread to replay the log, so they are
+        /// running concurrently.
+        /// </summary>
+        protected virtual void RecoveryThread()
+        {
+            Journalet journalet;
+            ServiceContract.Exp:Start! ep;
+            ServiceProviderContract.Imp:Start! provider;
+
+            //DebugStub.Print("JP: ENTER Recovery Thread\n");
+                    
+            // Lock the server. This blocks new clients to connect the service
+            // process.
+            provider = providerRef.Acquire();
+            lock (journaletListLock) {
+                foreach (Object obj in journaletList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    journalet = obj as Journalet;
+                    if (journalet == null) {
+                        continue;
+                    }
+
+                    journalet.CreateServerEndpoint(out ep);
+
+                    provider.SendConnect(ep);
+                    switch receive {
+                        case provider.AckConnect():
+                            break;
+                        case provider.NackConnect(rejected):
+                            delete rejected;
+                            DebugStub.Print("JP Recovery Th: " +
+                                            "Provider connection rejected\n");
+                            break;
+                        case provider.ChannelClosed():
+                            DebugStub.Print("Server lost during recovery." +
+                                            " Break,\n");
+                            DebugStub.Break();
+                            break;
+                    }
+                }
+            }
+            // unlock the server
+            providerRef.Release(provider);
+
+            providerThread = new Thread(new ThreadStart(ProviderThread));
+            providerThread.Start();
+
+            //DebugStub.Print("JP: EXIT Recovery Thread\n");
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/Journalet.sg b/base/Libraries/Resiliency/Journalet.sg
new file mode 100644
index 0000000..1205e3a
--- /dev/null
+++ b/base/Libraries/Resiliency/Journalet.sg
@@ -0,0 +1,88 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\Journalet.sg
+//
+//  Note:   Logging Worker Template
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public abstract class Journalet
+    {
+        protected JournalProducer!  producer;
+        protected Thread            serviceThread;
+
+        protected TRef<ServiceContract.Exp:Start> clientRef;
+
+        public Journalet(JournalProducer! producer,
+                         [Claims]ServiceContract.Exp:Start! ep)
+        {
+            this.producer = producer;
+            this.clientRef = new TRef<ServiceContract.Exp:Start>(ep);
+        }
+
+        public abstract void CreateServerEndpoint(out ServiceContract.Exp:Start! ep);
+
+        protected virtual bool Initialize()
+        {
+            return true;
+        }
+
+        protected virtual bool HandleMessages()
+        {
+            return true;
+        }
+
+        protected virtual bool Recover()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// This thread interposes between the client and the server.
+        /// </summary>
+        protected virtual void ProxyThread() {
+            if (!Initialize()) {
+                goto exit;
+            }
+
+            for (;;) {
+                if (!HandleMessages()) {
+                    goto exit;
+                }
+                try {
+                    if (!Recover()) {
+                        goto exit;
+                    }
+                }
+                catch (Exception e) {
+                    DebugStub.WriteLine("ProxyThread: Exception caught.");
+                    DebugStub.WriteLine(e.ToString());
+                }
+            }
+exit:
+            producer.DeregisterJournalet(this);
+            return;
+        }
+
+        public void Start() {
+            ThreadTerminationContract.Imp! sender;
+            ThreadTerminationContract.Exp! receiver;
+
+            serviceThread = new Thread(new ThreadStart(ProxyThread));
+            serviceThread.Start();
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/Journalet2.sg b/base/Libraries/Resiliency/Journalet2.sg
new file mode 100644
index 0000000..0f19cfa
--- /dev/null
+++ b/base/Libraries/Resiliency/Journalet2.sg
@@ -0,0 +1,148 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\Journalet2.sg
+//
+//  Note:   
+//
+using System;
+using System.Threading;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public enum ProxyState : uint {
+        Waiting,
+        Running,
+        Synchronize,
+    }
+
+    public abstract class Journalet2 : ICheckpoint
+    {
+        protected bool              running;
+        protected Thread            thread;
+        protected JournaletGroup    group;
+        protected ManualResetEvent  recoveryEvent;
+        protected ManualResetEvent  suspendEvent;
+        protected ProxyState        proxyState;
+
+        public Journalet2()
+        {
+            this.recoveryEvent = new ManualResetEvent(false);
+            this.suspendEvent = new ManualResetEvent(false);
+            this.proxyState = ProxyState.Waiting;
+        }
+
+        //NOTE: Be sure the thread is stopped when calling this.
+        public abstract void CreateEndpoint(out ServiceContract.Exp! newExp);
+        protected abstract bool Initialize();
+        protected abstract bool HandleMessages();
+        protected abstract bool Recover();
+
+        public virtual void Start()
+        {
+            if (thread == null) {
+                thread = new Thread(new ThreadStart(Run));
+                thread.Start();
+            }
+            else {
+                recoveryEvent.Set();
+            }
+        }
+
+        public virtual void Stop() {}
+
+        public virtual void Run() {
+            if (group == null) {
+                DebugStub.Print("J: group is not set!\n");
+                return;
+            }
+
+            if (!Initialize()) {
+                return;
+            }
+
+            for (;;) {
+                if (!HandleMessages()) {
+                    break;
+                }
+                // Now you can create another endpoint.
+
+                running = false;
+                group.NotifyRecovery();
+
+                recoveryEvent.WaitOne();
+
+                DebugStub.Print("J: Start recovery\n");
+                try {
+                    if (!Recover()) {
+                        break;
+                    }
+                }
+                catch (ChannelClosedException) {
+                    DebugStub.Print("Channel closed during recovery.\n");
+                    break;
+                }
+                recoveryEvent.Reset();
+                Thread.Sleep(0);
+            }
+        }
+
+        ///
+        /// Suspends this journalet at the nearest synchronization point.
+        /// This method blocks the caller until the journalet suspends.
+        ///
+        public void Suspend()
+        {
+            if (running && group != null && group.SyncRequest) {
+                suspendEvent.WaitOne();
+            }
+        }
+
+        public abstract void Flush();
+        public void Resume() {}
+
+        // Checks if receiving a synchronization request.
+        protected void Sync()
+        {
+            proxyState = ProxyState.Synchronize;
+            if (group != null && group.SyncRequest) {
+                running = false;
+                suspendEvent.Set();
+                DebugStub.Print("J: Syncronize\n");
+                group.SyncEvent.WaitOne();
+                running = true;
+            }
+        }
+
+        protected void Checkpoint()
+        {
+            //DebugStub.Print("J: Enter Checkpoint\n");
+            group.UpdateCheckpoint();
+            //DebugStub.Print("J: Exit Checkpoint\n");
+        }
+
+        public ProxyState State
+        {
+            get { return proxyState; }
+            private set
+            {
+                lock (this) {
+                    proxyState = value;
+                }
+            }
+        }
+
+        // Invoked by JournaletGroup.
+        internal JournaletGroup Group
+        {
+            get { return group; }
+            set { group = value; }
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/JournaletFactory.sg b/base/Libraries/Resiliency/JournaletFactory.sg
new file mode 100644
index 0000000..355fcba
--- /dev/null
+++ b/base/Libraries/Resiliency/JournaletFactory.sg
@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\JournaletFactory.sg
+//
+//  Note:   
+//
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public interface JournaletFactory
+    {
+        bool Accept(ServiceContract.Exp:Start! ep);
+        Journalet2! CreateJournalet([Claims]ServiceContract.Exp:Start! ep,
+                                    out ServiceContract.Exp! newEp);
+    }
+}
diff --git a/base/Libraries/Resiliency/JournaletGroup.sg b/base/Libraries/Resiliency/JournaletGroup.sg
new file mode 100644
index 0000000..2311452
--- /dev/null
+++ b/base/Libraries/Resiliency/JournaletGroup.sg
@@ -0,0 +1,238 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\JournaletGroup.sg
+//
+//  Note:   
+//
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public class JournaletGroup : IEnumerable, IRecoveryAware, ICheckpoint
+    {
+        protected IRecoveryAware    parent;
+        protected bool              syncRequest; 
+        protected bool              recoveringState;
+        protected bool              checkpointingState = false;
+        protected Object!           recoveryLock;
+        protected IList!            journaletList;
+        protected Object!           listLock;
+        protected ManualResetEvent! syncEvent;
+
+        public JournaletGroup()
+        {
+            recoveryLock = new Object();
+            listLock = new Object();
+            journaletList = new ArrayList();
+            syncEvent = new ManualResetEvent(false);
+        }
+
+        /// 
+        /// Adds the specified journalet to the group
+        ///
+        public void Add(Journalet2 journalet)
+        {
+            if (journalet != null) {
+                lock (listLock) {
+                    journaletList.Add(journalet);
+                    journalet.Group = this;
+                }
+            }
+        }
+
+        ///
+        /// Removes the specified journalet from the group
+        ///
+        public void Remove(Journalet2 journalet)
+        {
+            if (journalet != null) {
+                lock (listLock) {
+                    journaletList.Remove(journalet);
+                    journalet.Group = null;
+                }
+            }
+        }
+
+        //
+        // Invoked either when the proxy starts up or when the recovery ends.
+        //
+        public void Start()
+        {
+            Journalet2 j;
+
+            DebugStub.Print("JournaletGroup: Enter Start\n");
+            DebugStub.Print("JournaletGroup: {0} journalets\n",
+                            __arglist(journaletList.Count));
+            syncRequest = false;
+            recoveringState = false;
+            lock (listLock) {
+                foreach (Object obj in journaletList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    j = obj as Journalet2;
+                    if (j == null) {
+                        continue;
+                    }
+                    j.Start();
+                    DebugStub.Print("JournaletGroup: J started\n");
+                }
+            }
+        }
+
+        public void Stop()
+        {
+            Journalet2 j;
+            
+            recoveringState = true;  // to prevent subsequent recovery
+
+            lock (listLock) {
+                foreach (Object obj in journaletList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    j = obj as Journalet2;
+                    if (j == null) {
+                        continue;
+                    }
+                    j.Stop();
+                }
+            }
+        }
+
+        public void Suspend()
+        {
+            Journalet2  journalet;
+
+            syncRequest = true;
+
+            lock (listLock) {
+                foreach (Object obj in journaletList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    journalet = obj as Journalet2;
+                    if (journalet != null) {
+                        journalet.Suspend();
+                    }
+                }
+            }
+        }
+
+        public void Flush()
+        {
+            Journalet2  journalet;
+
+            lock (listLock) {
+                foreach (Object obj in journaletList) {
+                    if (obj == null) {
+                        break;
+                    }
+                    journalet = obj as Journalet2;
+                    if (journalet != null) {
+                        journalet.Flush();
+                    }
+                }
+            }
+        }
+
+        public void Resume()
+        {
+            syncRequest = false;
+            syncEvent.Set();
+        }
+
+        public bool SyncRequest
+        {
+            get { return syncRequest; }
+            private set {}
+        }
+
+        public ManualResetEvent! SyncEvent
+        {
+            get { return syncEvent; }
+            private set {}
+        }
+
+        internal IRecoveryAware Parent
+        {
+            get { return parent; }
+            set { parent = value; }
+        }
+
+        public void NotifyRecovery()
+        {
+            DebugStub.Print("JGroup: Enter NotifyRecovery\n");
+            // this doesn't immediately returns if the lock
+            // is already acquired.
+            //if (!Monitor.TryEnter(recoveryLock)) {
+            //    DebugStub.Print("JGroup: Exit NotifyRecovery\n");
+            //    return;
+            //}
+
+            lock (recoveryLock) {
+                if (recoveringState) {
+                    DebugStub.Print("JGroup: Exit NotifyRecovery\n");
+                    return;
+                }
+                else {
+                    recoveringState = true;
+                }
+            }
+
+            if (parent != null || !recoveringState) {
+                parent.NotifyRecovery();
+                //recoveringState = true;
+            }
+            //Monitor.Exit(recoveryLock);
+
+            DebugStub.Print("JGroup: Exit NotifyRecovery\n");
+        }
+
+        public void UpdateCheckpoint()
+        {
+            //DebugStub.Print("JGroup: Enter UpdateCheckpoint\n");
+            //Doesn't seem work
+            //if (!Monitor.TryEnter(recoveryLock)) {
+            //    DebugStub.Print("JGroup: Exit UpdateCheckpoint\n");
+            //    return;
+            //}
+            lock (recoveryLock) {
+                if (checkpointingState) {
+                    //DebugStub.Print("JGroup: Exit UpdateCheckpoint\n");
+                    return;
+                }
+                else {
+                    checkpointingState = true;
+                }
+            }
+
+            // Suspend all other journalets
+            Suspend();
+
+            // Notify to ServiceProviderProxy
+            if (parent != null) {
+                parent.UpdateCheckpoint();
+            }
+
+            checkpointingState = false;
+            // Resume the journalets
+            Resume();
+
+            //Monitor.Exit(recoveryLock);
+            //DebugStub.Print("JGroup: Exit UpdateCheckpoint\n");
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return journaletList.GetEnumerator();
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/Log.sg b/base/Libraries/Resiliency/Log.sg
new file mode 100644
index 0000000..51fae7e
--- /dev/null
+++ b/base/Libraries/Resiliency/Log.sg
@@ -0,0 +1,97 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\Log.sg
+//
+//  Note:   
+//
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public class Log : IEnumerable
+    {
+        protected IList!        log;
+        protected IEnumerator   enumerator;
+
+        public Log()
+        {
+            log = new ArrayList();
+        }
+
+        public void Record(uint msg, IList args)
+        {
+            if (enumerator != null) {
+                enumerator = null;
+            }
+            log.Add(new LogData(msg, args));
+        }
+
+        public void Record(uint msg)
+        {
+            this.Record(msg, null);
+        }
+
+        public bool Playback(out uint message, out IList args)
+        {
+            LogData data;
+
+            if (enumerator == null) {
+                enumerator = log.GetEnumerator();
+            }
+
+            try {
+                enumerator.MoveNext();
+            }
+            catch (Exception) {
+                enumerator.Reset();
+                enumerator = null;
+                message = 0;
+                args = null;
+                return false;
+            }
+
+            try {
+                data = (LogData)enumerator.Current;
+                if (data == null) {
+                    enumerator = null;
+                    message = 0;
+                    args = null;
+                    return false;
+                }
+                else {
+                    message = data.Message;
+                    args = data.Arguments;
+                    return true;
+                }
+            }
+            catch (Exception) {
+                //DebugStub.Print("Log: {0}\n", __arglist(e.ToString()));
+                message = 0;
+                args = null;
+                return false;
+            }
+        }
+
+        public void Flush()
+        {
+            enumerator = null;
+            log.Clear();
+        }
+
+        public int Count
+        {
+            get { return log.Count; }
+            private set {}
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return log.GetEnumerator();
+        }
+    } // class
+}
diff --git a/base/Libraries/Resiliency/LogData.sg b/base/Libraries/Resiliency/LogData.sg
new file mode 100644
index 0000000..49a5d36
--- /dev/null
+++ b/base/Libraries/Resiliency/LogData.sg
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\LogData.sg
+//
+//  Note:   
+//
+using System.Collections;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public class LogData
+    {
+        protected readonly uint message;
+        protected readonly IList arguments;
+
+        public LogData(uint message, IList arguments)
+        {
+            this.message = message;
+            this.arguments = arguments;
+        }
+
+        public uint Message
+        {
+            get { return message; }
+            private set{}
+        }
+
+        public IList Arguments
+        {
+            get { return arguments; }
+            private set {}
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/PersistentMemory.sg b/base/Libraries/Resiliency/PersistentMemory.sg
new file mode 100644
index 0000000..f316303
--- /dev/null
+++ b/base/Libraries/Resiliency/PersistentMemory.sg
@@ -0,0 +1,185 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\UndoableMemory.sg
+//
+//  Note:   
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public class PersistentMemory
+    {
+        private IDictionary!    table;
+
+        public PersistentMemory()
+        {
+            table = new ListDictionary();
+        }
+
+        public void Store([Claims]byte[]! in ExHeap buffer)
+        {
+            int             offset = 0;
+            int             length = buffer.Length;
+            int             index;
+            int             count;
+            UndoableMemory  memoryObject;
+            byte[]!         copyBuffer = Bitter.ToByteArray(buffer);
+            byte[]          storeBuffer;
+
+            //DebugStub.Print("PMem: Enter Store\n");
+            //DebugStub.Print("PMem: Buffer length {0}\n",
+            //                __arglist(buffer.Length));
+
+            while (offset + 8 < length) {
+                //
+                // Deserialize
+                //
+                // length
+                count = BitConverter.ToInt32(copyBuffer, offset);
+                offset += sizeof(int);
+                if (offset >= length) {
+                    DebugStub.Print("PMem: deserialize err\n");
+                    break;
+                }
+
+                // index
+                index = BitConverter.ToInt32(copyBuffer, offset);
+                offset += sizeof(int);
+                if (offset >= length) {
+                    DebugStub.Print("PMem: deserialize err\n");
+                    break;
+                }
+
+                // contents
+                storeBuffer = new byte[count];
+                Buffer.BlockCopy(copyBuffer, offset, storeBuffer, 0, count);
+                offset += count;
+
+                //DebugStub.Print("PMem: [{0}] {1}:{2}\n",
+                //                __arglist(index, count, offset));
+
+                //
+                // Store the data
+                //
+                Object obj = table[index];
+                if (obj == null) {
+                    memoryObject = new UndoableMemory();
+                    table[index] = memoryObject;
+                }
+                else {
+                    memoryObject = obj as UndoableMemory;
+                }
+
+                if (memoryObject != null) {
+                    memoryObject.Store(storeBuffer);
+                }
+            }
+            delete buffer;
+            //DebugStub.Print("PMem: Exit Store\n");
+        }
+
+        public byte[] in ExHeap Restore()
+        {
+            byte[]          buffer = null;
+            int             offset;
+            int             length;
+            UndoableMemory  memoryObject;
+
+            DebugStub.Print("PMem: Enter Restore\n");
+            if (table.Count == 0) {
+                return null;
+            }
+
+            length = 0;
+            foreach (DictionaryEntry entry in table) {
+                memoryObject = entry.Value as UndoableMemory;
+                if (memoryObject != null) {
+                    memoryObject.Flush();
+                    length += memoryObject.Length;
+                }
+                length += sizeof(int) * 2;
+            }
+
+            if (length > Int32.MaxValue) {
+                throw new Exception();
+            }
+
+            DebugStub.Print("PMem: Serialize\n");
+            //
+            // Serialize
+            //
+            buffer = new byte[length];
+            offset = 0;
+            foreach (DictionaryEntry entry in table) {
+                int index = (int)entry.Key;
+                memoryObject = entry.Value as UndoableMemory;
+
+                if (memoryObject == null) {
+                    // length
+                    for (int i = 0; i < sizeof(int); i++) {
+                        buffer[offset + i] = 0;
+                    }
+                    offset += sizeof(int);
+
+                    // index
+                    Buffer.BlockCopy(BitConverter.GetBytes(index), 0,
+                                     buffer, offset, sizeof(int));
+                    offset += sizeof(int);
+                }
+                else {
+                    // length
+                    Buffer.BlockCopy(BitConverter.GetBytes(memoryObject.Length),
+                                     0, buffer, offset, sizeof(int));
+                    offset += sizeof(int);
+
+                    // index
+                    Buffer.BlockCopy(BitConverter.GetBytes(index), 0,
+                                     buffer, offset, sizeof(int));
+                    offset += sizeof(int);
+
+                    // contents
+                    Buffer.BlockCopy(memoryObject.Restore(), 0,
+                                     buffer, offset, memoryObject.Length);
+                    offset += memoryObject.Length;
+                }
+            }
+
+            DebugStub.Print("PMem: Exit Restore\n");
+            return Bitter.FromByteArray(buffer);
+        }
+
+        public void Flush()
+        {
+            //DebugStub.Print("PMem: Enter Flush\n");
+            foreach (DictionaryEntry entry in table) {
+                UndoableMemory memoryObject = entry.Value as UndoableMemory;
+                if (memoryObject != null) {
+                    //DebugStub.Print("[{0}]\n", __arglist((int)entry.Key));
+                    memoryObject.Flush();
+                }
+            }
+            //DebugStub.Print("PMem: Exit Flush\n");
+            //DebugStub.Break();
+        }
+
+        public void Undo()
+        {
+            foreach (DictionaryEntry entry in table) {
+                UndoableMemory memoryObject = entry.Value as UndoableMemory;
+                if (memoryObject != null) {
+                    memoryObject.Undo();
+                }
+            }
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/Resiliency.csproj b/base/Libraries/Resiliency/Resiliency.csproj
new file mode 100644
index 0000000..74855b1
--- /dev/null
+++ b/base/Libraries/Resiliency/Resiliency.csproj
@@ -0,0 +1,48 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\xxx\xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Resiliency</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Journalet2.sg" />
+    <Compile Include="JournaletFactory.sg" />
+    <Compile Include="JournaletGroup.sg" />
+    <Compile Include="Log.sg" />
+    <Compile Include="LogData.sg" />
+    <Compile Include="DirectoryServiceProxy.sg" />
+    <Compile Include="ServiceProviderProxy.sg" />
+    <Compile Include="ServiceProxy.sg" />
+    <Compile Include="PersistentMemory.sg" />
+    <Compile Include="UndoableMemory.sg" />
+    <Compile Include="IRecoveryAware.sg" />
+    <Compile Include="ICheckpoint.sg" />
+    <Compile Include="SignalContract.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj"   />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj"   />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Resiliency/ServiceProviderProxy.sg b/base/Libraries/Resiliency/ServiceProviderProxy.sg
new file mode 100644
index 0000000..e1de431
--- /dev/null
+++ b/base/Libraries/Resiliency/ServiceProviderProxy.sg
@@ -0,0 +1,332 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\ServiceProviderProxy.sg
+//
+//  Note:   
+//
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    internal sealed class ServiceProviderProxy : IRecoveryAware, ICheckpoint
+    {
+        private readonly string!                            path;
+        private IRecoveryAware!                             dsProxy;
+        private JournaletFactory!                           factory;
+        private JournaletGroup!                             group;
+        private IList!                                      blackList;
+        private Thread                                      thread;
+        private bool                                        running;
+        private TRef<ServiceProviderContract.Imp:Start>     providerRef;
+        private TRef<ServiceProviderContract.Exp:Start>     myProviderRef;
+        private TRef<ThreadTerminationContract.Imp:Start>   internalImpRef;
+        private TRef<ThreadTerminationContract.Exp:Start>   internalExpRef;
+
+        internal ServiceProviderProxy(IRecoveryAware! dsProxy,
+                                      string! path,
+                                      JournaletFactory! factory,
+                                      [Claims]ServiceProviderContract.Exp:Start! ep)
+        {
+            this.dsProxy = dsProxy;
+            this.path = path;
+            this.factory = factory;
+            this.group = new JournaletGroup();
+            this.blackList = new ArrayList();
+            this.myProviderRef = new TRef<ServiceProviderContract.Exp:Start>(ep);
+
+            ThreadTerminationContract.Imp!  imp;
+            ThreadTerminationContract.Exp!  exp;
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+            internalImpRef = new TRef<ThreadTerminationContract.Imp:Start>(imp);
+            internalExpRef = new TRef<ThreadTerminationContract.Exp:Start>(exp);
+        }
+
+        private void Run()
+        {
+            ServiceProviderContract.Exp:Start!      ep;
+            ThreadTerminationContract.Exp:Start!    signal;
+
+            if (myProviderRef == null) {
+                DebugStub.Print("PPx: not initialized!\n");
+                return;
+            }
+
+
+            lock (this) {
+                running = true;
+            }
+
+            try {
+                Recover();
+            }
+            catch (Exception) {
+                DebugStub.Print("PPx: exception during recovery\n");
+                group.Stop();
+                return;
+            }
+
+            ep = myProviderRef.Acquire();
+            signal = internalExpRef.Acquire();
+
+            for (;;) {
+                DebugStub.Print("PPx: set\n");
+                switch receive {
+                    case ep.Connect(serviceEp):
+                    {
+                        if (factory.Accept(serviceEp)) {
+                            try {
+                                if (CreateJournalet(serviceEp)) {
+                                    ep.SendAckConnect();
+                                }
+                                else {
+                                    ep.SendNackConnect(null);
+                                }
+                            }
+                            catch (Exception) {
+                                ep.SendNackConnect(null);
+                                dsProxy.NotifyRecovery();
+                                goto exit;
+                            }
+                        }
+                        else {
+                            ep.SendNackConnect(serviceEp);
+                        }
+                        break;
+                    }
+                    case ep.ChannelClosed():
+                    {
+                        group.Stop();
+                        goto exit;
+                        break;
+                    }
+                    // FIXME: This is confusing because the Stop message is
+                    // used to trigger the recovery action; it's used to
+                    // terminate threads in other parts of the proxy.
+                    case signal.Stop():
+                    {
+                        signal.SendAckStop();
+                        dsProxy.NotifyRecovery();
+                        goto exit;
+                        break;
+                    }
+                    // An explicit channel close terminates this thread.
+                    case signal.ChannelClosed():
+                    {
+                        group.Stop();
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            myProviderRef.Release(ep);
+            internalExpRef.Release(signal);
+
+            lock (this) {
+                running = false;
+            }
+            DebugStub.Print("PPx: Quit\n");
+        }
+
+        /// 
+        /// Creates and activates a new Journalet with the specified endpoint.
+        ///
+        private bool CreateJournalet([Claims]ServiceContract.Exp:Start! ep)
+        {
+            bool                                success = false;
+            bool                                throwException = false;
+            Journalet2!                         journalet;
+            ServiceContract.Exp!                newEp;
+            ServiceProviderContract.Imp:Start!  provider;
+
+            journalet = factory.CreateJournalet(ep, out newEp);
+
+            provider = providerRef.Acquire();
+            provider.SendConnect(newEp);
+            switch receive {
+                case provider.AckConnect():
+                    success = true;
+                    break;
+                case provider.NackConnect(rejected):
+                    delete rejected;
+                    break;
+                case provider.ChannelClosed():
+                    // recovery
+                    throwException = true;
+                    break;
+            }
+            providerRef.Release(provider);
+
+            if (throwException) {
+                throw new ChannelClosedException();
+            }
+
+            if (success) {
+                if (group.Parent == null) {
+                    group.Parent = this;
+                }
+
+                group.Add(journalet);
+                journalet.Start();
+            }
+            
+            return success;
+        }
+
+        private void Recover()
+        {
+            bool                                throwException = false;
+            Journalet2                          journalet;
+            ServiceContract.Exp!                newEp;
+            ServiceProviderContract.Imp:Start!  provider;
+
+            DebugStub.Print("PPx: Enter Recovery\n");
+            provider = providerRef.Acquire();
+            foreach (Object obj in group) {
+                if (obj == null) {
+                    break;
+                }
+                journalet = obj as Journalet2;
+                if (journalet == null) {
+                    continue;
+                }
+
+                // journalet must be inactive.
+                journalet.CreateEndpoint(out newEp);
+
+                provider.SendConnect(newEp);
+                switch receive {
+                    case provider.AckConnect():
+                        journalet.Start();
+                        break;
+                    case provider.NackConnect(rejected):
+                        delete rejected;
+                        blackList.Add(journalet);
+                        break;
+                    case provider.ChannelClosed():
+                        throwException = true;
+                        break;
+                }
+
+                if (throwException) {
+                    providerRef.Release(provider);
+                    throw new ChannelClosedException();
+                }
+            }
+
+            foreach (Object obj in blackList) {
+                if (obj == null) {
+                    break;
+                }
+                journalet = obj as Journalet2;
+                if (journalet != null) {
+                    group.Remove(journalet);
+                }
+            }
+            blackList.Clear();
+
+            //
+            // Restart journalets
+            //
+            group.Start();
+            providerRef.Release(provider);
+            DebugStub.Print("PPx: Exit Recovery\n");
+        }
+
+        public void NotifyRecovery()
+        {
+            ThreadTerminationContract.Imp:Start!    signal;
+            DebugStub.Print("PPx: NotifyRecovery\n");
+            
+            //
+            // Terminates itself, then the thread reports to Directory Proxy
+            //
+            signal = internalImpRef.Acquire();
+            signal.SendStop();
+            switch receive {
+                case signal.AckStop():
+                    break;
+                case unsatisfiable:
+                    //DebugStub.Break();
+                    break;
+            }
+            internalImpRef.Release(signal);
+        }
+
+        public void UpdateCheckpoint()
+        {
+            //DebugStub.Print("PPx: Enter UpdateCheckpoint\n");
+            dsProxy.UpdateCheckpoint();
+            //DebugStub.Print("PPx: Exit UpdateCheckpoint\n");
+        }
+
+        internal void Start([Claims]ServiceProviderContract.Imp:Start! ep)
+        {
+            assert !running;
+
+            thread = new Thread(new ThreadStart(Run));
+
+            if (providerRef == null) {
+                providerRef = new TRef<ServiceProviderContract.Imp:Start>(ep);
+            }
+            else {
+                providerRef.Release(ep);
+            }
+
+            thread.Start();
+        }
+
+        internal void Stop(out ServiceProviderContract.Imp:Start! ep)
+        {
+            TRef<ServiceProviderContract.Imp:Start> reference;
+
+            DebugStub.Print("PPx: Stop\n");
+            if (running) {
+                // Stop the thread
+                NotifyRecovery();
+                thread.Join();
+                DebugStub.Print("PPx: Joined\n");
+            }
+
+            ep = providerRef.Acquire();
+        }
+
+        internal void Terminate(out ServiceProviderContract.Imp:Start! ep)
+        {
+            delete internalImpRef.Acquire();
+            ep = providerRef.Acquire();
+        }
+
+        public void Suspend()
+        {
+            group.Suspend();
+        }
+
+        public void Flush()
+        {
+            group.Flush();
+        }
+
+        public void Resume()
+        {
+            group.Resume();
+        }
+
+        internal string! Path
+        {
+            get { return path; }
+            private set {}
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/ServiceProxy.sg b/base/Libraries/Resiliency/ServiceProxy.sg
new file mode 100644
index 0000000..85c1ab7
--- /dev/null
+++ b/base/Libraries/Resiliency/ServiceProxy.sg
@@ -0,0 +1,187 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\Proxy.sg
+//
+//  Note:   
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Services;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public sealed class ServiceProxy
+    {
+        private Thread                                      serviceThread;
+        private JournaletFactory!                           factory;
+        private TRef<ManagedServiceContract.Exp:Ready>      serviceRef;
+        private TRef<ManagedProxyContract.Imp:Ready>        recoveryRef;
+        private TRef<DirectoryServiceContract.Imp:Ready>    rootDsRef;
+        private TRef<DirectoryServiceContract.Exp:Ready>    myDsRef;
+        private TRef<ServiceProxyContract.Exp:Ready>        proxyRef;
+ 
+        public ServiceProxy(JournaletFactory! factory,
+                            [Claims]ManagedServiceContract.Exp:Start! mep,
+                            [Claims]ManagedProxyContract.Imp:Start! pep,
+                            [Claims]DirectoryServiceContract.Imp:Ready! dep,
+                            [Claims]DirectoryServiceContract.Exp:Start! fep,
+                            [Claims]ServiceProxyContract.Exp:Start! xep)
+        {
+            this.factory = factory;
+            this.rootDsRef = new TRef<DirectoryServiceContract.Imp:Ready>(dep);
+
+            fep.SendSuccess();
+            this.myDsRef = new TRef<DirectoryServiceContract.Exp:Ready>(fep);
+
+            mep.SendSuccess();
+            this.serviceRef = new TRef<ManagedServiceContract.Exp:Ready>(mep);
+
+            switch receive {
+                case pep.Success():
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+            this.recoveryRef = new TRef<ManagedProxyContract.Imp:Ready>(pep);
+
+            xep.SendSuccess();
+            this.proxyRef = new TRef<ServiceProxyContract.Exp:Ready>(xep);
+        }
+
+        public void Start()
+        {
+            if (serviceThread == null) {
+                serviceThread = new Thread(new ThreadStart(Run));
+            }
+            serviceThread.Start();
+        }
+
+        public void Run()
+        {
+            Thread                                  thread = null;
+            DirectoryServiceProxy                   dsProxy;
+            ManagedServiceContract.Exp:Ready!       manager;
+            ThreadTerminationContract.Imp!          imp;
+            ThreadTerminationContract.Exp!          exp;
+
+            DebugStub.Print("-- Start proxy\n");
+
+            dsProxy = new DirectoryServiceProxy(this,
+                                                factory,
+                                                rootDsRef.Acquire(),
+                                                myDsRef.Acquire(),
+                                                proxyRef.Acquire());
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+            dsProxy.Signal(exp);
+
+            manager = serviceRef.Acquire();
+            for (;;) {
+                switch receive {
+                    case manager.StartService():
+                    {
+                        if (thread == null) {
+                            thread = new Thread(new ThreadStart(dsProxy.Run));
+                        }
+                        thread.Start();
+                        manager.SendAckStartService();
+                        break;
+                    }
+                    case manager.StopService():
+                    {
+                        DebugStub.Print("Px: recv stop service\n");
+                        imp.SendStop();
+                        switch receive {
+                            case imp.AckStop():
+                                manager.SendAckStopService();
+                                break;
+                            case unsatisfiable:
+                                manager.SendBusy();
+                                break;
+                        }
+                        thread = null;
+                        break;
+                    }
+                    case manager.RestartService():
+                    {
+                        manager.SendAckRestartService();
+                        break;
+                    }
+                    case manager.Knock():
+                    {
+                        manager.SendAlive();
+                        break;
+                    }
+                    case manager.Stop():
+                    {
+                        imp.SendStop();
+                        switch receive {
+                            case unsatisfiable:
+                                break;
+                        }
+                        manager.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    case manager.Restart():
+                    {
+                        DebugStub.Break();
+                        manager.SendAckRestart();
+                        break;
+                    }
+                }
+            }
+exit:
+            delete manager;
+            delete recoveryRef.Acquire();
+            delete imp;
+        }
+
+        /// <summary>
+        /// Asks ServiceManager to recover the corresponding service and
+        /// the initial direct channels to the service.
+        /// </summary>
+        internal void RecoverService(out DirectoryServiceContract.Exp:Ready ep,
+                                     out ServiceProxyContract.Exp:Ready xep)
+        {
+            ManagedProxyContract.Imp:Ready! manager;
+            DebugStub.Print("Px: Enter RecoverService\n");
+
+            manager = recoveryRef.Acquire();
+#if COMPATIBLE_V1
+            manager.SendRequestDSRecovery();
+            switch receive {
+                case manager.AckDSRecovery(proxy):
+#else
+            manager.SendRequestRecovery();
+            switch receive {
+                case manager.AckRecovery(directory, proxy):
+#endif
+                {
+                    directory.SendSuccess();
+                    proxy.SendSuccess();
+                    ep = directory;
+                    xep = proxy;
+                    break;
+                }
+                case unsatisfiable:
+                {
+                    ep = null;
+                    xep = null;
+                    break;
+                }
+            }
+            recoveryRef.Release(manager);
+            DebugStub.Print("Px: Exit RecoverService\n");
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/SignalContract.sg b/base/Libraries/Resiliency/SignalContract.sg
new file mode 100644
index 0000000..123dcfe
--- /dev/null
+++ b/base/Libraries/Resiliency/SignalContract.sg
@@ -0,0 +1,30 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\DirectoryServiceProxy.sg
+//
+//  Note:   Intermediary of DirectoryServiceContract
+//
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    public contract SignalContract
+    {
+        in  message Stop();
+        in  message Suspend();
+        in  message Update();
+        out message AckStop();
+        out message AckSuspend();
+        out message AckUpdate();
+
+        state Start : one {
+            Stop? -> AckStop! -> Start;
+            Suspend? -> AckSuspend! -> Start;
+            Update? -> AckUpdate! -> Start;
+        }
+    }
+}
diff --git a/base/Libraries/Resiliency/UndoableMemory.sg b/base/Libraries/Resiliency/UndoableMemory.sg
new file mode 100644
index 0000000..a08a396
--- /dev/null
+++ b/base/Libraries/Resiliency/UndoableMemory.sg
@@ -0,0 +1,201 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Resiliency\UndoableMemory.sg
+//
+//  Note:   
+//
+using System;
+using System.Collections;
+using System.IO;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Resiliency
+{
+    internal class UndoableMemory
+    {
+        private const int   DefaultCapacity = 256;
+        private byte[]!     master;
+        private byte[]      shadow;
+        private byte[]      backup;
+        private int         capacity;
+        private int         length;
+
+        internal UndoableMemory() : this(0) {}
+
+        internal UndoableMemory(int capacity)
+            requires (capacity >= 0);
+        {
+            this.master = this.shadow = new byte[capacity];
+            this.capacity = capacity;
+        }
+
+        internal byte[]! Restore()
+        {
+            byte[] buffer = new byte[length];
+
+            if (length <= 8) {
+                int byteCount = length;
+                while (--byteCount >= 0) {
+                    buffer[byteCount] = shadow[byteCount];
+                }
+            }
+            else {
+                Buffer.BlockCopy(shadow, 0, buffer, 0, length);
+            }
+            return buffer;
+        }
+
+        internal void Store(byte[]! buffer)
+        {
+            int count = buffer.Length;
+
+            if (master == shadow) {
+                if (backup != null) {
+                    shadow = backup;
+                }
+                else {
+                    shadow = new byte[capacity];
+                    Buffer.BlockCopy(master, 0, shadow, 0, capacity);
+                }
+            }
+
+            if (count >= length) {
+                int newLength = count + 1;
+                bool mustZero = count > length;
+                if (newLength >= capacity) {
+                    bool allocatedNewArray = EnsureCapacity(newLength);
+                    if (allocatedNewArray) {
+                        mustZero = false;
+                    }
+                }
+                if (mustZero) {
+                    Array.Clear(shadow, length, count - length);
+                }
+                length = newLength;
+            }
+
+            if (count <= 8) {
+                int byteCount = count;
+                while (--byteCount >= 0) {
+                    shadow[byteCount] = buffer[byteCount];
+                }
+            }
+            else {
+                Buffer.BlockCopy(buffer, 0, shadow, 0, buffer.Length);
+            }
+            length = buffer.Length;
+        }
+
+        internal void DirectStore(byte[]! buffer)
+        {
+            shadow = (byte[])buffer;
+            length = buffer.Length;
+            capacity = buffer.Length;
+            backup = null;
+        }
+
+        private bool EnsureCapacity(int value)
+            requires (value >= 0);
+        {
+            if (value > capacity) {
+                int newCapacity = value;
+                if (newCapacity < DefaultCapacity) {
+                    newCapacity = DefaultCapacity;
+                }
+                if (newCapacity < capacity * 2) {
+                    newCapacity = capacity * 2;
+                }
+                Capacity = newCapacity;
+                return true;
+            }
+            return false;
+        }
+        
+        internal void Flush()
+        {
+            if (master != shadow) {
+                if (shadow != null) {
+                    //DumpMaster();
+                    //DumpShadow();
+                    if (master.Length < length) {
+                        master = new byte[capacity];
+                    }
+                    Buffer.BlockCopy(shadow, 0, master, 0, length);
+                    backup = shadow;
+                }
+                else {
+                    Array.Clear(master, 0, length);
+                }
+            }
+            shadow = master;
+        }
+
+        internal void Undo()
+        {
+            shadow = master;
+            backup = null;
+        }
+
+        internal int Capacity
+        {
+            get { return capacity; }
+            set
+            {
+                if (value != capacity) {
+                    if (value < length) {
+                        throw new ArgumentOutOfRangeException(
+                            "value", "ArgumentOutOfRange_SmallCapacity");
+                    }
+                    if (value > 0) {
+                        byte[] newBuffer = new byte[value];
+                        if (length > 0) {
+                            Buffer.BlockCopy(shadow, 0, newBuffer, 0, length);
+                        }
+                        shadow = newBuffer;
+                    }
+                    else {
+                        shadow = null;
+                    }
+                    capacity = value;
+                }
+            }
+        }
+
+        internal int Length
+        {
+            get { return length; }
+        }
+
+        private void Dump(byte[]! buffer)
+        {
+            /*
+            for (int i = 0; i < buffer.Length; i += 20) {
+                for (int j = 0; j < 20 && i + j < buffer.Length; j++) {
+                    DebugStub.Print("{0:X2} ", __arglist(buffer[i + j]));
+                }
+                DebugStub.WriteLine();
+            }
+            */
+            for (int i = 0; i < buffer.Length && i < 20; i++) {
+                 DebugStub.Print("{0:X2} ", __arglist(buffer[i]));
+            }
+            DebugStub.WriteLine();
+        }
+
+        internal void DumpMaster()
+        {
+            DebugStub.Print("-- Dump Master\n");
+            Dump(master);
+        }
+
+        internal void DumpShadow()
+        {
+            DebugStub.Print("-- Dump Shadow\n");
+            Dump(shadow);
+        }
+    }
+}
diff --git a/base/Libraries/Security/ChannelPool.sg b/base/Libraries/Security/ChannelPool.sg
new file mode 100644
index 0000000..5133286
--- /dev/null
+++ b/base/Libraries/Security/ChannelPool.sg
@@ -0,0 +1,137 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+    using System.Collections;
+    using System.Threading;
+
+    using Microsoft.SingSharp;
+    using Microsoft.Contracts;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+
+    /// <summary>
+    /// A <code>ChannelPool</code> maintains a pool of open channels.
+    /// (to the security service). It should be possible to parameterize this
+    /// class for general use.
+    /// </summary>
+    internal class ChannelPool
+    {
+
+#if POOLED
+        const int POOL_CAPACITY = 10;
+#else
+        const int POOL_CAPACITY = 1;
+#endif
+
+        /// <summary>
+        /// The unused channels
+        /// </summary>
+        TRef<SecurityDiagnosticsContract.Imp, SecurityDiagnosticsContract.ReadyState>[]! trefs;
+        int capacity = POOL_CAPACITY;
+        int nalloc = 0;
+        int navail = 0;
+        /// <summary>
+        /// Synchronization token
+        /// </summary>
+        object token;
+        bool disposed;
+
+        public ChannelPool()
+        {
+            int i;
+            trefs = new TRef<SecurityDiagnosticsContract.Imp, SecurityDiagnosticsContract.ReadyState>[capacity];
+            token = new object();
+            disposed = false;
+        }
+
+        // opens a connection to the security service
+        private static SecurityDiagnosticsContract.Imp  OpenChannel()
+        {
+            SecurityDiagnosticsContract.Imp! imp;
+            SecurityDiagnosticsContract.Exp! exp;
+            SecurityDiagnosticsContract.NewChannel(out imp, out exp);
+            // open a channel to the nameservice
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+            // try to bind
+            ns.SendBind(Bitter.FromString2(SecurityDiagnosticsContract.ModuleName), exp);
+
+            switch receive
+            {
+            case ns.AckBind():
+                break;
+            case ns.NakBind(rejected, error):
+                delete imp;
+                delete rejected;
+                delete ns;
+                return null;
+            }
+            delete ns;
+
+            imp.RecvReady();
+            return imp;
+        }
+
+        /// <summary>
+        /// Returns a free channel. Blocks if none is available.
+        /// </summary>
+        public SecurityDiagnosticsContract.Imp! Acquire()
+        {
+            lock (token)
+            {
+                // wait if no channel is available
+                while (true) {
+                    if (navail != 0) {
+                        navail--;
+                        return ((!)trefs[navail]).Acquire();
+                    }
+                    if (nalloc < capacity) {
+                        SecurityDiagnosticsContract.Imp imp = OpenChannel();
+                        if (imp != null) {
+                            trefs[nalloc] = new
+                                TRef<SecurityDiagnosticsContract.Imp, SecurityDiagnosticsContract.ReadyState>
+                                (imp);
+                            return ((!)trefs[nalloc++]).Acquire();
+                        }
+                    }
+                    Monitor.Wait(token);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Releases a channel
+        /// </summary>
+        public void Release([Claims]SecurityDiagnosticsContract.Imp! imp)
+        {
+            lock (token)
+            {
+                ((!)trefs[navail++]).Release(imp);
+                Monitor.PulseAll(token);
+            }
+        }
+
+        /// <summary>
+        /// Closes the channels
+        /// </summary>
+        public void Dispose()
+        {
+            lock (token)
+            {
+                if (!disposed){
+                    int i;
+                    for (i=0; i<navail; i++) {
+                        SecurityDiagnosticsContract.Imp! imp = ((!)trefs[i]).Acquire();
+                        delete imp;
+                    }
+                    disposed = true;
+                }
+            }
+        }
+    }
+}
+
diff --git a/base/Libraries/Security/Security.csproj b/base/Libraries/Security/Security.csproj
new file mode 100644
index 0000000..f2a3955
--- /dev/null
+++ b/base/Libraries/Security/Security.csproj
@@ -0,0 +1,40 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Security\Security.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Security</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessMode.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AclCore.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\Cache.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\AclConverter.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\AclParser.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\AclToken.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\AclTokenType.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\DataReader.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\AccessControl\StringReader.sg" />
+    <Compile Include="..\..\Kernel\Singularity.Security\SDS\SdsAcl.sg"/>
+    <Compile Include="..\..\Kernel\Singularity.Security\SDS\SdsAclImpl.sg"/>
+    <Compile Include="..\..\Kernel\Singularity.Security\SDS\SdsAclPerms.sg"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Security/SecurityDiagnostics.csproj b/base/Libraries/Security/SecurityDiagnostics.csproj
new file mode 100644
index 0000000..0b92363
--- /dev/null
+++ b/base/Libraries/Security/SecurityDiagnostics.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Security\SecurityDiagnostics.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>SecurityDiagnostics</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SecurityDiagnostics.sg" />
+    <Compile Include="ChannelPool.sg" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Security/SecurityDiagnostics.sg b/base/Libraries/Security/SecurityDiagnostics.sg
new file mode 100644
index 0000000..8912a6c
--- /dev/null
+++ b/base/Libraries/Security/SecurityDiagnostics.sg
@@ -0,0 +1,103 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace Microsoft.Singularity.Security
+{
+    using System;
+
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+    using Microsoft.Singularity.Security;
+
+    /// <summary>
+    /// This is a client-library proxy to the security service.
+    /// </summary>
+
+    public class SecurityDiagnostics
+    {
+        private ChannelPool! pool;
+
+        public SecurityDiagnostics()
+        {
+            pool = new ChannelPool();
+        }
+
+        public string! GetStatistics()
+        {
+            string result = String.Empty;
+            SecurityDiagnosticsContract.Imp! imp = pool.Acquire();
+            try
+            {
+                imp.SendGetStatistics();
+                switch receive
+                {
+                case imp.GetStatisticsAck(stats):
+                    result = Bitter.ToString2(stats);
+                    delete stats;
+                    break;
+                }
+            }
+            finally
+            {
+                pool.Release(imp);
+            }
+            return result;
+        }
+
+        public void ClearStatistics()
+        {
+            SecurityDiagnosticsContract.Imp! imp = pool.Acquire();
+            try
+            {
+                imp.SendClearStatistics();
+                switch receive
+                {
+                case imp.Ack():
+                    break;
+                }
+            }
+            finally
+            {
+                pool.Release(imp);
+            }
+        }
+
+        public void Disable(bool yes)
+        {
+            SecurityDiagnosticsContract.Imp! imp = pool.Acquire();
+            try
+            {
+                imp.SendDisable(yes);
+                switch receive
+                {
+                case imp.Ack():
+                    break;
+                }
+            }
+            finally
+            {
+                pool.Release(imp);
+            }
+        }
+
+        public void FlushCaches()
+        {
+            SecurityDiagnosticsContract.Imp! imp = pool.Acquire();
+            try
+            {
+                imp.SendFlushCaches();
+                switch receive
+                {
+                case imp.Ack():
+                    break;
+                }
+            }
+            finally
+            {
+                pool.Release(imp);
+            }
+        }
+    }
+}
diff --git a/base/Libraries/Services/IRunnable.sg b/base/Libraries/Services/IRunnable.sg
new file mode 100644
index 0000000..98b74e4
--- /dev/null
+++ b/base/Libraries/Services/IRunnable.sg
@@ -0,0 +1,21 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\Calculator\IRunnable.sg
+//
+//  Note:   
+//
+using Microsoft.SingSharp;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services
+{
+    public interface IRunnable
+    {
+        void Run();
+        void Signal([Claims]ThreadTerminationContract.Exp:Start! ep);
+    }
+}
diff --git a/base/Libraries/Services/ManagementExec.sg b/base/Libraries/Services/ManagementExec.sg
new file mode 100644
index 0000000..23b777b
--- /dev/null
+++ b/base/Libraries/Services/ManagementExec.sg
@@ -0,0 +1,122 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Libraries\Services\ManagementExec.sg
+//
+//  Note:   Managed service provider base template
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services
+{
+    public class ManagementExec : IRunnable
+    {
+        protected readonly IRunnable! service;
+        protected readonly TRef<ManagedServiceContract.Exp:Ready>   endpoint;
+        protected TRef<ThreadTerminationContract.Imp:Start>         signal;
+
+        public ManagementExec([Claims]ManagedServiceContract.Exp:Start! ep,
+                              IRunnable! service)
+        {
+            ep.SendSuccess();
+            endpoint = new TRef<ManagedServiceContract.Exp:Ready>(ep);
+            this.service = service;
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            delete ep;
+        }
+
+        public void Run()
+        {
+            Thread                                  serviceThread = null;
+            ManagedServiceContract.Exp:Ready!       ep;
+            ThreadTerminationContract.Imp:Start!    sig;
+            ThreadTerminationContract.Imp!          imp;
+            ThreadTerminationContract.Exp!          exp;
+
+            ep = endpoint.Acquire();
+            for (;;) {
+                // HI: can't fully hoist ep and sig together because there
+                // can be a situation where sig is closed but ep waits for
+                // messages from Service Manager.
+                switch receive {
+                    case ep.StartService():
+                    {
+                        ThreadTerminationContract.NewChannel(out imp, out exp);
+                        signal = new TRef<ThreadTerminationContract.Imp:Start>(imp);
+                        service.Signal(exp);
+                        serviceThread = new Thread(new ThreadStart(service.Run));
+                        serviceThread.Start();
+                        ep.SendAckStartService();
+                        break;
+                    }
+                    case ep.StopService():
+                    {
+                        if (signal != null && serviceThread != null) {
+                            sig = signal.Acquire();
+                            try {
+                                sig.SendStop();
+                                switch receive {
+                                    case sig.AckStop():
+                                        break;
+                                    case sig.ChannelClosed():
+                                        break;
+                                }
+                            }
+                            catch (Exception) {
+                                DebugStub.Print("ManagementExec: " +
+                                                "already closed\n");
+                            }
+                            signal.Release(sig);
+                            serviceThread.Join();
+                        }
+                        ep.SendAckStopService();
+                        break;
+                    }
+                    case ep.RestartService():
+                    {
+                        ep.SendAckRestartService();
+                        break;
+                    }
+                    case ep.Knock():
+                    {
+                        ep.SendAlive();
+                        break;
+                    }
+                    case ep.Restart():
+                    {
+                        ep.SendAckRestart();
+                        break;
+                    }
+                    case ep.Stop():
+                    {
+                        ep.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    case ep.ChannelClosed():
+                    {
+                        DebugStub.Print("ManagementExec: Bug? " +
+                                        "Manager channel closed.\n");
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            delete ep;
+            return;
+        }
+    } // class
+}
diff --git a/base/Libraries/Services/ServiceExec.sg b/base/Libraries/Services/ServiceExec.sg
new file mode 100644
index 0000000..3acdce9
--- /dev/null
+++ b/base/Libraries/Services/ServiceExec.sg
@@ -0,0 +1,113 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\Calculator\ServiceExec.sg
+//
+//  Note:   A generic worker-style server implementation
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services
+{
+    // To inherit this class, what you need to do is:
+    // 1) To call the base constructor from your sub class.
+    // 2) To implement Listen method.
+    public abstract class ServiceExec : IRunnable
+    {
+        protected readonly string!                          path;
+        protected TRef<DirectoryServiceContract.Imp:Ready>  directoryRef;
+        protected TRef<ThreadTerminationContract.Exp:Start> signalRef;
+
+        /// <summary>
+        /// Waits for a client request.  An implementation of this method is
+        /// strongly recommended to handle the signal from the parent thread for
+        /// terminating the entire process.  Otherwise, the child thread leaks.
+        /// </summary>
+        protected abstract bool Listen(ServiceProviderContract.Exp:Start! provider,
+                                       ThreadTerminationContract.Exp:Start! signal);
+
+        public ServiceExec([Claims]DirectoryServiceContract.Imp:Ready! ep,
+                           string! path)
+        {
+            this.path = path;
+            this.directoryRef = new TRef<DirectoryServiceContract.Imp:Ready>(ep);
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            this.signalRef = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        public virtual void Run()
+        {
+            ServiceProviderContract.Exp!            provider;
+            ThreadTerminationContract.Exp:Start!    signal;
+
+            if (signalRef == null) {
+                throw new Exception("Signal is empty.");
+            }
+
+            if (!RegisterName(out provider)) {
+                delete provider;
+                return;
+            }
+
+            signal = signalRef.Acquire();
+            while (Listen(provider, signal));
+            signalRef.Release(signal);
+
+            DeregisterName(provider);
+        }
+
+        protected virtual bool RegisterName(out ServiceProviderContract.Exp! ep)
+        {
+            bool success = false;
+            DirectoryServiceContract.Imp:Ready! ds;
+            ServiceProviderContract.Imp!        imp;
+            ServiceProviderContract.Exp!        exp;
+
+            ds = directoryRef.Acquire();
+            ServiceProviderContract.NewChannel(out imp, out exp);
+            ds.SendRegister(Bitter.FromString2(path), imp);
+            switch receive {
+                case ds.AckRegister():
+                    success = true;
+                    break;
+                case ds.NakRegister(rejected, error):
+                    delete rejected;
+                    success = false;
+                    break;
+                case ds.ChannelClosed():
+                    success = false;
+                    break;
+            }
+            directoryRef.Release(ds);
+            ep = exp;
+            return success;
+        }
+
+        protected virtual void DeregisterName([Claims]ServiceProviderContract.Exp! ep)
+        {
+            DirectoryServiceContract.Imp:Ready! ds;
+            ds = directoryRef.Acquire();
+            ds.SendDeregister(Bitter.FromString2(path));
+            switch receive {
+                case ds.AckDeregister(imp):
+                    delete imp;
+                    delete ep;
+                    break;
+            }
+            directoryRef.Release(ds);
+        }
+    } // class
+}
diff --git a/base/Libraries/Services/Services.Utils.csproj b/base/Libraries/Services/Services.Utils.csproj
new file mode 100644
index 0000000..33637ed
--- /dev/null
+++ b/base/Libraries/Services/Services.Utils.csproj
@@ -0,0 +1,38 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\xxx\xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Services.Utils</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IRunnable.sg" />
+    <Compile Include="ManagementExec.sg" />
+    <Compile Include="ServiceExec.sg" />
+    <Compile Include="WorkerServiceExec.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Services/WorkerServiceExec.sg b/base/Libraries/Services/WorkerServiceExec.sg
new file mode 100644
index 0000000..23095d0
--- /dev/null
+++ b/base/Libraries/Services/WorkerServiceExec.sg
@@ -0,0 +1,145 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\Calculator\ServiceExec.sg
+//
+//  Note:   A generic worker-style server implementation
+//
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services
+{
+    // To inherit this class, what you need to do is:
+    // 1)   To call the base constructor in your constructor.
+    // 2)   To implement Accept and NewWorker methods.  This class
+    //      automatically creates and assigns threads to Run method of your
+    //      worker object.
+    public abstract class WorkerServiceExec : ServiceExec
+    {
+        protected IList serviceSignalList;
+
+        public WorkerServiceExec([Claims]DirectoryServiceContract.Imp:Ready! ep,
+                                 string! path)
+        {
+            base(ep, path);
+            serviceSignalList = new ArrayList();
+        }
+
+        /// <summary>
+        /// Checks if the request channel type is acceptable.
+        /// </summary>
+        protected abstract bool Accept(ServiceContract.Exp:Start! ep);
+
+        /// <summary>
+        /// Create a new worker object for the specified channel.  The worker
+        /// created by this method is assigned to a thread by this class.
+        /// </summary>
+        protected abstract IRunnable NewWorker([Claims]ServiceContract.Exp:Start! ep);
+
+        protected override bool Listen(ServiceProviderContract.Exp:Start! provider,
+                                       ThreadTerminationContract.Exp:Start! signal)
+        {
+            bool    result = true;
+            Thread  worker;
+
+            switch receive {
+                case provider.Connect(serviceEp):
+                {
+                    if (Accept(serviceEp)) {
+                        worker = CreateWorker(serviceEp);
+                        if (worker == null) {
+                            provider.SendNackConnect(null);
+                        }
+                        else {
+                            provider.SendAckConnect();
+                            worker.Start();
+                        }
+                    }
+                    else {
+                        provider.SendNackConnect(serviceEp);
+                    }
+                    break;
+                }
+                case provider.ChannelClosed():
+                {
+                    TerminateWorkers();
+                    result = false;
+                    break;
+                }
+                case signal.Stop():
+                {
+                    TerminateWorkers();
+                    signal.SendAckStop();
+                    result = false;
+                    break;
+                }
+                case signal.ChannelClosed():
+                {
+                    TerminateWorkers();
+                    result = false;
+                    break;
+                }
+            }
+            return result;
+        }
+
+        protected Thread CreateWorker([Claims]ServiceContract.Exp:Start! ep)
+        {
+            IRunnable worker;
+            CPTestContract.Exp:Start!       server;
+            ThreadTerminationContract.Imp!  imp;
+            ThreadTerminationContract.Exp!  exp;
+
+            worker = NewWorker(ep);
+            if (worker == null) {
+                return null;
+            }
+
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+            worker.Signal(exp);
+            lock (this) {
+                serviceSignalList.Add(new TRef<ThreadTerminationContract.Imp:Start>(imp));
+            }
+            return new Thread(new ThreadStart(worker.Run));
+        }
+
+        private void TerminateWorkers()
+        {
+            TRef<ThreadTerminationContract.Imp:Start>   signalRef;
+            ThreadTerminationContract.Imp:Start         signal;
+
+            lock (this) {
+                foreach (Object obj in serviceSignalList)
+                {
+                    if (obj != null) {
+                        signalRef = obj
+                                as TRef<ThreadTerminationContract.Imp:Start>;
+                        if (signalRef != null) {
+                            signal = signalRef.Acquire();
+                            signal.SendStop();
+                            switch receive {
+                                case signal.AckStop():
+                                    break;
+                                case signal.ChannelClosed():
+                                    break;
+                            }
+                            signalRef.Release(signal);
+                        }
+                    }
+                }
+                serviceSignalList.Clear();
+            }
+        }
+ 
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Processes/ProcessHandle.cs b/base/Libraries/Singularity.V1/Processes/ProcessHandle.cs
new file mode 100644
index 0000000..988409f
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Processes/ProcessHandle.cs
@@ -0,0 +1,315 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: ProcessHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Security;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.V1.Types;
+
+namespace Microsoft.Singularity.V1.Processes
+{
+    public enum ProcessState {
+        Active,
+        Suspended,
+        Stopped,
+    }
+
+    public struct ProcessHandle
+    {
+        public readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static unsafe bool Create(
+            char *args,
+            int *argLengths,
+            int argCount,
+            char *role,
+            int roleLength,
+            int endpointCount,
+            out ProcessHandle handle)
+        {
+            fixed (ProcessHandle *handlePtr = &handle) {
+                return CreateImpl(args, argLengths, argCount, role, roleLength,
+                    endpointCount, handlePtr);
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(3456)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(char *args,
+            int *argLengths,
+            int argCount,
+            char *role,
+            int roleLength,
+            int endpointCount,
+            ProcessHandle *handle);
+
+
+        [NoHeapAllocation]
+        public static unsafe bool Create(
+            char *cmd,
+            int cmdLength,
+            char *action,
+            int actionLength,
+            char *role,
+            int roleLength,
+            out ProcessHandle handle)
+        {
+            fixed (ProcessHandle *handlePtr = &handle) {
+                return CreateImpl(cmd, cmdLength, action, actionLength, role,
+                    roleLength, handlePtr);
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(3456)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(char *cmd,
+            int cmdLength,
+            char *action,
+            int actionLength,
+            char *role,
+            int roleLength,
+            ProcessHandle * handle);
+
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool SetStartupEndpoint(ProcessHandle handle,
+                                                            int index,
+                                                            SharedHeapService.Allocation * endpoint);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Dispose(ProcessHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Start(ProcessHandle handle);
+
+        [NoHeapAllocation]
+        public static void Join(ProcessHandle handle, out bool started)
+        {
+            unsafe {
+                fixed (bool *startedPtr = &started) {
+                    JoinImpl(handle, startedPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1170)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void JoinImpl(
+            ProcessHandle handle,
+            bool *started);
+
+        [NoHeapAllocation]
+        public static bool Join(ProcessHandle handle,
+                                TimeSpan timeout,
+                                out bool started)
+        {
+            unsafe {
+                fixed (bool *startedPtr = &started) {
+                    return JoinImpl(handle, timeout, startedPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1182)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool JoinImpl(
+            ProcessHandle handle,
+            TimeSpan timeout,
+            bool *started);
+
+        [NoHeapAllocation]
+        public static bool Join(ProcessHandle handle,
+                                SchedulerTime stop,
+                                out bool started)
+        {
+            unsafe {
+                fixed (bool *startedPtr = &started) {
+                    return JoinImpl(handle, stop, startedPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1182)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool JoinImpl(
+            ProcessHandle handle,
+            SchedulerTime stop,
+            bool *started);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Suspend(ProcessHandle handle,
+                                          bool recursive);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Resume(ProcessHandle handle,
+                                         bool recursive);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Stop(ProcessHandle handle,
+                                       int exitcode);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [AccessedByRuntime("called from halforgc.asm")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void SuspendBarrier();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetProcessId(ProcessHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetExitCode(ProcessHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern PrincipalHandle GetPrincipalHandle(ProcessHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ProcessState GetState(ProcessHandle handle);
+
+        /// <summary>
+        /// Given 2 system types generate and initialize the two endpoints of
+        /// a channel. The imp side will be set in the processes startup endpoint array
+        /// at position "index". The exp side will be bound to a service based on global policy
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern bool BindToService(
+            ProcessHandle handle,
+            SystemType impType,
+            SystemType expType,
+            char *contract,
+            int  contractLen,
+            int startState,
+            int index
+            );
+
+        // String Parameters
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode SetStartupStringArrayArg(
+                                                ProcessHandle handle,
+                                                int index,
+                                                char *args,
+                                                int *argLengths,
+                                                int argCount
+                                         );
+
+#if false
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupStringArgCount(ProcessHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe int GetStartupStringArg(ProcessHandle handle,
+                                            int arg, char * output, int maxout);
+#endif
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode SetStartupStringArg(ProcessHandle handle,
+                                            int arg, char * input, int length);
+
+        // Long Parameters
+#if false
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupLongArgCount(ProcessHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ParameterCode GetStartupLongArg(ProcessHandle handle,
+                                                int index, out long value);
+#endif
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ParameterCode SetStartupLongArg(ProcessHandle handle,
+                                            int index, long value);
+
+        // Bool Parameters
+#if false
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ParameterCode GetStartupBoolArg(ProcessHandle handle,
+                                            int index, out bool value);
+#endif
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode SetStartupBoolArg(ProcessHandle handle,
+                                                        int index, bool value);
+
+
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Security/PrincipalHandle.cs b/base/Libraries/Singularity.V1/Security/PrincipalHandle.cs
new file mode 100644
index 0000000..5b14df0
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Security/PrincipalHandle.cs
@@ -0,0 +1,83 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: PrincipalHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Security
+{
+    public struct PrincipalHandle
+    {
+        public readonly long val;
+
+        private const int DefaultPrincipalSize = 40;
+        private const int DefaultAclIndirectSize = 200;
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern PrincipalHandle SelfPrincipalHandle();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern unsafe int GetPrincipalNameImpl(PrincipalHandle handle,
+                                                  /*[out]*/ char *outName, int outNameLength);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern unsafe int ExpandAclIndirectionImpl(
+                                                  /*[in]*/ char *name, int nameLength,
+                                                  /*[out]*/ char *outText, int outTextLength);
+
+        public static unsafe string GetPrincipalName(PrincipalHandle handle)
+        {
+            int size = DefaultPrincipalSize;
+            for (;;) {
+                char[] name = new char[size];
+                fixed (char *namePtr = &name[0]) {
+                    int len = GetPrincipalNameImpl(handle, namePtr, size);
+                    if (len >= 0)
+                        return String.StringCTOR(name, 0, len);
+                    size = -len;
+                }
+            }
+        }
+
+        public static unsafe string ExpandAclIndirection(string name)
+        {
+            if (name == null)
+                return null;
+
+            int size = DefaultAclIndirectSize;
+            // convert string to char* and length
+            char [] strChar = new char[name.Length];
+            name.CopyTo(0, strChar, 0, name.Length);
+            fixed (char *inname = &strChar[0]) {
+                for (;;) {
+                    char[] result = new char[size];
+                    fixed (char *resultPtr = &result[0]) {
+                        int len = ExpandAclIndirectionImpl(inname, name.Length, resultPtr, size);
+                        if (len == 0)
+                            return null;
+                        if (len > 0)
+                            return String.StringCTOR(result, 0, len);
+                        size = -len;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Services/ChannelService.cs b/base/Libraries/Singularity.V1/Services/ChannelService.cs
new file mode 100644
index 0000000..9adf42f
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/ChannelService.cs
@@ -0,0 +1,415 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI Shim
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelService.csi
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Security;
+using Microsoft.Singularity.V1.Types;
+using Microsoft.Singularity.V1.Threads;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    using Allocation = SharedHeapService.Allocation;
+
+    [CLSCompliant(false)]
+    unsafe public struct EndpointCore
+    {
+#if !PAGING
+        /// <summary>
+        /// Flag indicating that the endpoint is closed.
+        /// This gets set either by an explicit close, or when
+        /// the kernel determines that the endpoint is not reachable.
+        /// NOTE: A channel only goes away entirely, once both ends are closed!
+        /// </summary>
+        private volatile bool closed;
+
+        /// <summary>
+        /// The endpoint to which this endpoint is connected.
+        /// </summary>
+        private Allocation* /*EndpointCore* opt(ExHeap)*/ peer;
+
+        /// <summary>
+        /// Event on which sends are signaled to this endpoint.
+        /// The handle is owned by the kernel, since the endpoint can move.
+        /// The kernel deallocates the handle when the channel is deallocated.
+        /// NOTE: stays valid until the entire channel gets collected.
+        /// </summary>
+        private AutoResetEventHandle messageEvent;
+
+        /// <summary>
+        /// Event handle in case this endpoint is part of a collection
+        /// </summary>
+        private AutoResetEventHandle collectionEvent;
+
+        /// <summary>
+        /// Contains the process id of the process currently owning this end of the
+        /// channel.
+        /// </summary>
+        private int ownerProcessId;
+
+        /// <summary>
+        /// Contains the security principal that is the current owner of this end of the
+        /// channel.
+        /// </summary>
+        private PrincipalHandle ownerPrincipalHandle;
+
+        /// <summary>
+        /// Contains the number of sends to this endpoint.
+        /// </summary>
+        private int receiveCount;
+
+        /// <summary>
+        /// Contains the channelId (positive on the EXP endpoint, negative on the imp endpoint)
+        /// </summary>
+        private int channelId;
+#else
+        public readonly UIntPtr id; // handle id
+#endif //PAGING
+
+        /// <summary>
+        /// Used to allocate a channel endpoint. The size must be correctly computed by
+        /// the trusted caller (currently trusted code NewChannel)
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern Allocation* /*EndpointCore* opt(ExHeap)!*/
+        Allocate(uint size, SystemType st);
+
+        /// <summary>
+        /// Closes this end of the channel and frees associated resources, EXCEPT the block
+        /// of memory for this endpoint. It must be released by the caller. Sing# does this
+        /// for the programmer.
+        /// Returns true for success, false for failure.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Dispose(ref EndpointCore endpoint);
+
+        /// <summary>
+        /// Deallocates this end of the channel. If other end is also
+        /// deallocated, the entire channel is deallocated.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Free(Allocation* /* EndpointCore* opt(ExHeap) */ endpoint);
+
+        /// <summary>
+        /// Performs the initialization of the core part of each endpoint and cross links
+        /// them to form a channel.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Connect(
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ imp,
+            Allocation* /*EndpointCore* opt(ExHeap)!*/ exp);
+
+        /// <summary>
+        /// Indicates if this endpoint is closed
+        /// </summary>
+#if !PAGING
+        [NoHeapAllocation]
+        public static bool Closed(ref EndpointCore ep)
+        {
+            return ep.closed;
+        }
+
+        [NoHeapAllocation]
+        public static bool PeerClosed(ref EndpointCore ep)
+        {
+            EndpointCore * peer = (EndpointCore*)SharedHeapService.GetData(ep.peer);
+            return peer->closed;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Closed(ref EndpointCore ep);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool PeerClosed(ref EndpointCore ep);
+#endif //PAGING
+
+        /// <summary>
+        /// Set this end to closed
+        /// </summary>
+#if !PAGING
+        [NoHeapAllocation]
+        public static void Close(ref EndpointCore ep)
+        {
+            ep.closed = true;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Close(ref EndpointCore ep);
+#endif //PAGING
+
+        /// <summary>
+        /// The endpoint to which this endpoint is connected.
+        /// </summary>
+#if !PAGING
+        [NoHeapAllocation]
+        public static Allocation* /*EndpointCore* opt(ExHeap) */ GetPeer(ref EndpointCore ep,
+                                                                         out bool marshall)
+        {
+            marshall = false;
+            return ep.peer;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern Allocation* GetPeer(ref EndpointCore ep,
+                                                 out bool marshall);
+#endif //PAGING
+
+        /// <summary>
+        /// The event to wait for messages on this endpoint. Used by Select.
+        /// </summary>
+#if !PAGING
+        [NoHeapAllocation]
+        public static SyncHandle GetWaitHandle(ref EndpointCore ep)
+        {
+            return ep.messageEvent;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern SyncHandle GetWaitHandle(ref EndpointCore ep);
+#endif //PAGING
+
+        /// <summary>
+        /// Notify the owner of this endpoint that a message is ready.
+        /// Notifies the set owner if this endpoint is part of a set.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void NotifyPeer(ref EndpointCore ep);
+
+
+        /// <summary>
+        /// Wait for a message to arrive on this endpoint.
+        /// </summary>
+#if !PAGING
+        [NoHeapAllocation]
+        public static void Wait(ref EndpointCore ep) {
+            SyncHandle.WaitOne(ep.messageEvent);
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Wait(ref EndpointCore ep);
+#endif //PAGING
+
+        /// <summary>
+        /// Transfer the given Allocation block to the target endpoint
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+#if !PAGING
+        public static extern void TransferBlockOwnership(Allocation* ptr, ref EndpointCore target);
+#else
+        // TODO: change "ref EndpointCore" to "EndpointCore"
+        public static extern void TransferBlockOwnership(Allocation* ptr, ref EndpointCore target);
+#endif //PAGING
+
+        /// <summary>
+        /// Transfer any contents that needs to be adjusted from the transferee to the target
+        /// endpoint.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+#if !PAGING
+        public static extern void TransferContentOwnership(
+           ref EndpointCore transferee,
+           ref EndpointCore target);
+#else
+        // TODO: change "ref EndpointCore" to "EndpointCore"
+        public static extern void TransferContentOwnership(
+           ref EndpointCore transferee,
+           ref EndpointCore target);
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static int GetOwnerProcessID(ref EndpointCore ep)
+        {
+            return ep.ownerProcessId;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetOwnerProcessID(ref EndpointCore ep);
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static int GetChannelID(ref EndpointCore ep)
+        {
+            return ep.channelId;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetChannelID(ref EndpointCore ep);
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static int GetPeerProcessID(ref EndpointCore ep)
+        {
+            EndpointCore * peer = (EndpointCore*)SharedHeapService.GetData(ep.peer);
+            return peer->ownerProcessId;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetPeerProcessID(ref EndpointCore ep);
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static PrincipalHandle GetOwnerPrincipalHandle(ref EndpointCore ep)
+        {
+            return ep.ownerPrincipalHandle;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern PrincipalHandle GetOwnerPrincipalHandle(ref EndpointCore ep);
+#endif //PAGING
+
+#if !PAGING
+        [NoHeapAllocation]
+        public static PrincipalHandle GetPeerPrincipalHandle(ref EndpointCore ep)
+        {
+            EndpointCore * peer = (EndpointCore*)SharedHeapService.GetData(ep.peer);
+            return peer->ownerPrincipalHandle;
+        }
+#else
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern PrincipalHandle GetPeerPrincipalHandle(ref EndpointCore ep);
+#endif //PAGING
+
+#if !PAGING
+        /// <summary>
+        /// Instruct the selectable object to signal events on the given AutoResetEvent
+        /// rather than its normal event in order to aggregate signalling into a set.
+        /// A selectable object need only support being part of a single collection at
+        /// any point in time.
+        /// </summary>
+        public static void LinkIntoCollection(ref EndpointCore ep,
+                                              AutoResetEventHandle ev) {
+            //          Debug.Assert(this.collectionEvent.id == UIntPtr.Zero);
+            ep.collectionEvent = ev;
+        }
+
+        /// <summary>
+        /// Instruct the selectable object to stop signalling events on the given
+        /// AutoResetEvent.
+        /// </summary>
+        public static void UnlinkFromCollection(ref EndpointCore ep,
+                                                AutoResetEventHandle ev) {
+            // Debug.Assert(this.collectionEvent.id != UIntPtr.Zero);
+            ep.collectionEvent = new AutoResetEventHandle();
+        }
+
+#else
+        /// <summary>
+        /// Instruct the selectable object to signal events on the given AutoResetEvent
+        /// rather than its normal event in order to aggregate signalling into a set.
+        /// A selectable object need only support being part of a single collection at
+        /// any point in time.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void LinkIntoCollection(ref EndpointCore ep,
+                                                     AutoResetEventHandle ev);
+
+        /// <summary>
+        /// Instruct the selectable object to stop signalling events on the given
+        /// AutoResetEvent.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void UnlinkFromCollection(ref EndpointCore ep,
+                                                       AutoResetEventHandle ev);
+
+        /// <summary>
+        /// Called when sending a message across domains. Instructs the kernel
+        /// to prepare an update record to push into the peer when the peer
+        /// is running.
+        ///
+        /// This call starts a sequence of MarshallPointer calls that will
+        /// end with a call to NotifyPeer.
+        /// </summary>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public static extern void MarshallMessage(ref EndpointCore ep,
+                                                         byte* basep, byte* source,
+                                                         int* tagAddress, int size);
+
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public static extern void MarshallPointer(ref EndpointCore ep,
+                                                         byte* basep, byte** target, SystemType type);
+
+#endif //PAGING
+
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Services/DebugService.cs b/base/Libraries/Singularity.V1/Services/DebugService.cs
new file mode 100644
index 0000000..45622d5
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/DebugService.cs
@@ -0,0 +1,135 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DebugService.cs
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct DebugService
+    {
+        //private readonly int id;
+
+        [NoHeapAllocation]
+        public static unsafe void PrintBegin(out char * buffer, out int length)
+        {
+            fixed (char * * bufferPtr = &buffer) {
+                fixed (int * lengthPtr = &length) {
+                    PrintBeginImpl(bufferPtr, lengthPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1170)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void PrintBeginImpl(
+            char * * buffer,
+            int * length);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(768)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void PrintComplete(char * buffer, int used);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(768)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void Print(char * buffer);
+
+        [AccessedByRuntime("Required by hal.cpp")]
+        [OutsideGCDomain]
+        [StackBound(768)]
+        [NoHeapAllocation]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void Print(char * buffer, int length);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(bool value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(char value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(byte value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(int value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(uint value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(long value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(832)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Print(ulong value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(768)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Break();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1088)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void WalkStack();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool IsDebuggerPresent();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ulong ReadPerfCounter(uint which);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool WritePerfCounter(uint which, ulong value);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool AddToPerfCounter(uint which, ulong value);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Services/DeviceService.cs b/base/Libraries/Singularity.V1/Services/DeviceService.cs
new file mode 100644
index 0000000..bcb4a5a
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/DeviceService.cs
@@ -0,0 +1,309 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DeviceService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct DeviceService
+    {
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe uint GetPnpSignature(int index, /*[out]*/ char * output,
+                                                         uint maxout);
+
+        [NoHeapAllocation]
+        public static bool GetPciConfig(
+            out ushort pciAddressPort,
+            out ushort pciDataPort,
+            out ushort identifier)
+        {
+            unsafe {
+                fixed (ushort * pciAddressPortPtr = &pciAddressPort,
+                                pciDataPortPtr = &pciDataPort,
+                                identifierPtr = &identifier) {
+                    return GetPciConfigImpl(pciAddressPortPtr, pciDataPortPtr,
+                        identifierPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetPciConfigImpl(
+            ushort * pciAddressPort,
+            ushort * pciDataPort,
+            ushort * identifier);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetIrqCount(byte irq);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint GetDynamicIoRangeCount();
+
+        [NoHeapAllocation]
+        public static bool GetDynamicIoPortRange(uint range,
+                                                 out ushort port,
+                                                 out ushort size,
+                                                 out bool readable,
+                                                 out bool writable)
+        {
+            unsafe {
+                fixed (ushort * portPrt = &port, sizePtr = &size) {
+                    fixed (bool * readablePtr = &readable,
+                                  writablePtr = &writable) {
+                        return GetDynamicIoPortRangeImpl(range, portPrt,
+                            sizePtr, readablePtr, writablePtr);
+                    }
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1186)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetDynamicIoPortRangeImpl(
+            uint range,
+            ushort * port,
+            ushort * size,
+            bool * readable,
+            bool * writable);
+
+        [NoHeapAllocation]
+        public static unsafe bool GetDynamicIoMemoryRange(uint range,
+                                                          out byte * data,
+                                                          out uint size,
+                                                          out bool readable,
+                                                          out bool writable)
+        {
+            fixed (byte * * dataPtr = &data) {
+                fixed (uint * sizePtr = &size) {
+                    fixed (bool * readablePtr = &readable,
+                                  writablePtr = &writable) {
+                        return GetDynamicIoMemoryRangeImpl(range, dataPtr,
+                            sizePtr, readablePtr, writablePtr);
+                    }
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1186)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetDynamicIoMemoryRangeImpl(
+            uint range,
+            byte * * data,
+            uint * size,
+            bool * readable,
+            bool * writable);
+
+        [NoHeapAllocation]
+        public static bool GetDynamicIoIrqRange(uint range,
+                                                out byte line,
+                                                out byte size)
+        {
+            unsafe {
+                fixed (byte * linePtr = &line, sizePtr = &size) {
+                    return GetDynamicIoIrqRangeImpl(range, linePtr, sizePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetDynamicIoIrqRangeImpl(
+            uint range,
+            byte * line,
+            byte * size);
+
+        [NoHeapAllocation]
+        public static bool GetDynamicIoDmaRange(uint range,
+                                                out byte channel,
+                                                out byte size)
+        {
+            unsafe {
+                fixed (byte * channelPtr = &channel, sizePtr = &size) {
+                    return GetDynamicIoDmaRangeImpl(range, channelPtr, sizePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetDynamicIoDmaRangeImpl(
+            uint range,
+            byte * channel,
+            byte * size);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint GetFixedIoRangeCount();
+
+        public static bool GetFixedIoPortRange(uint range,
+                                               out ushort port,
+                                               out ushort size,
+                                               out bool readable,
+                                               out bool writable)
+        {
+            unsafe {
+                fixed (ushort * portPrt = &port, sizePtr = &size) {
+                    fixed (bool * readablePtr = &readable,
+                                  writablePtr = &writable) {
+                        return GetFixedIoPortRangeImpl(range, portPrt, sizePtr,
+                            readablePtr, writablePtr);
+                    }
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1186)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetFixedIoPortRangeImpl(
+            uint range,
+            ushort * port,
+            ushort * size,
+            bool * readable,
+            bool * writable);
+
+        [NoHeapAllocation]
+        public static unsafe bool GetFixedIoMemoryRange(uint range,
+                                                        out byte * data,
+                                                        out uint size,
+                                                        out bool readable,
+                                                        out bool writable)
+        {
+            fixed (byte * * dataPtr = &data) {
+                fixed (uint * sizePtr = &size) {
+                    fixed (bool * readablePtr = &readable,
+                                  writablePtr = &writable) {
+                        return GetFixedIoMemoryRangeImpl(range, dataPtr,
+                            sizePtr, readablePtr, writablePtr);
+                    }
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1186)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetFixedIoMemoryRangeImpl(
+            uint range,
+            byte * * data,
+            uint * size,
+            bool * readable,
+            bool * writable);
+
+        [NoHeapAllocation]
+        public static bool GetFixedIoIrqRange(uint range,
+                                              out byte line,
+                                              out byte size)
+        {
+            unsafe {
+                fixed (byte * linePtr = &line, sizePtr = &size) {
+                    return GetFixedIoIrqRangeImpl(range, linePtr, sizePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetFixedIoIrqRangeImpl(
+            uint range,
+            byte * line,
+            byte * size);
+
+        [NoHeapAllocation]
+        public static bool GetFixedIoDmaRange(uint range,
+                                              out byte channel,
+                                              out byte size)
+        {
+            unsafe {
+                fixed (byte * channelPtr = &channel, sizePtr = &size) {
+                    return GetFixedIoDmaRangeImpl(range, channelPtr, sizePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetFixedIoDmaRangeImpl(
+            uint range,
+            byte * channel,
+            byte * size);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr MapPhysicalRange(UIntPtr physStart,
+                                                      UIntPtr numBytes,
+                                                      bool readable,
+                                                      bool writable);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void UnmapPhysicalRange(UIntPtr startAddr,
+                                                     UIntPtr limitAddr);
+
+        [NoHeapAllocation]
+        public static bool GetDmaPhysicalAddress(UIntPtr virtualAddr,
+                                                 out UIntPtr physicalAddr,
+                                                 out UIntPtr physicalRemaining)
+        {
+            unsafe {
+                fixed (UIntPtr * physicalAddrPtr = &physicalAddr,
+                       physicalRemainingPtr = &physicalRemaining) {
+                    return GetDmaPhysicalAddressImpl(virtualAddr,
+                                                     physicalAddrPtr,
+                                                     physicalRemainingPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool GetDmaPhysicalAddressImpl(
+            UIntPtr virtualAddr,
+            UIntPtr * physicalAddr,
+            UIntPtr * physicalRemaining);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Services/PageTableService.cs b/base/Libraries/Singularity.V1/Services/PageTableService.cs
new file mode 100644
index 0000000..86514ef
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/PageTableService.cs
@@ -0,0 +1,202 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PageTableService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct PageTableService
+    {
+        //private readonly int id;
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe uint * GetPageTable();
+
+#if UINTPTR_SUPPORT_IN_ABI
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr GetPageCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr GetBaseAddress();
+#endif
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint GetProcessTag();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr Allocate(UIntPtr bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr AllocateIOMemory(UIntPtr limit,
+                                                      UIntPtr bytes,
+                                                      UIntPtr alignment);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr AllocateExtend(UIntPtr addr,
+                                                    UIntPtr bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Free(UIntPtr addr,
+                                       UIntPtr bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void FreeIOMemory(UIntPtr addr,
+                                               UIntPtr bytes);
+
+        [NoHeapAllocation]
+        public static bool Query(UIntPtr queryAddr,
+                                 out UIntPtr regionAddr,
+                                 out UIntPtr regionSize)
+        {
+            unsafe {
+                fixed (UIntPtr * regionAddrPtr = &regionAddr,
+                                 regionSizePtr = &regionSize) {
+                    return QueryImpl(queryAddr, regionAddrPtr, regionSizePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool QueryImpl(UIntPtr queryAddr,
+                                                   UIntPtr * regionAddr,
+                                                   UIntPtr * regionSize);
+
+        [NoHeapAllocation]
+        public static void GetUsageStatistics(out ulong allocatedCount,
+                                              out ulong allocatedBytes,
+                                              out ulong freedCount,
+                                              out ulong freedBytes)
+        {
+            unsafe {
+                fixed (ulong * allocatedCountPtr = &allocatedCount,
+                               allocatedBytesPtr = &allocatedBytes,
+                               freedCountPtr = &freedCount,
+                               freedBytesPtr = &freedBytes) {
+                    GetUsageStatisticsImpl(allocatedCountPtr,
+                        allocatedBytesPtr, freedCountPtr, freedBytesPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void GetUsageStatisticsImpl(
+            ulong * allocatedCount,
+            ulong * allocatedBytes,
+            ulong * freedCount,
+            ulong * freedBytes);
+
+        //////////////////////////////////////////////////////////////////////
+        //
+#if !UINTPTR_SUPPORT_IN_ABI
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint GetPageCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint GetBaseAddress();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint Allocate(uint bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint AllocateIOMemory(uint limit,
+                                                   uint bytes,
+                                                   uint alignment);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern uint AllocateExtend(uint addr,
+                                                 uint bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Free(uint addr,
+                                       uint bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void FreeIOMemory(uint addr,
+                                               uint bytes);
+
+        [NoHeapAllocation]
+        public static bool Query(uint queryAddr,
+                                 out uint regionAddr,
+                                 out uint regionSize)
+        {
+            unsafe {
+                fixed (uint * regionAddrPtr = &regionAddr,
+                              regionSizePtr = &regionSize) {
+                    return QueryImpl(queryAddr, regionAddrPtr, regionSizePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool QueryImpl(uint queryAddr,
+                                                   uint * regionAddr,
+                                                   uint * regionSize);
+#endif
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Services/ProcessService.cs b/base/Libraries/Singularity.V1/Services/ProcessService.cs
new file mode 100644
index 0000000..dd3159d
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/ProcessService.cs
@@ -0,0 +1,409 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ProcessService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Reflection;
+using Microsoft.Singularity.V1.Security;
+
+[assembly: AssemblyTitle("Microsoft.Singularity.V1 ABI")]
+[assembly: AssemblyProduct("Microsoft Research Singularity Operating System")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyVersion("1.0.0.1")]
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct LogEntry
+    {
+    }
+
+    public enum  ParameterCode {
+        Success,
+        OutOfRange,
+        NotSet,
+        Retrieved,
+        Undefined,
+    }
+
+    public struct ProcessService
+    {
+        //private readonly int id;
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Stop(int exitCode);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern TimeSpan GetUpTime();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern DateTime GetUtcTime();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetCycleCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetContextSwitchCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void SetGcPerformanceCounters(TimeSpan time, long bytes);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetKernelGcCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetKernelBootCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetKernelInterruptCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetCyclesPerSecond();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ushort GetCurrentProcessId();
+
+        /*
+          [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern PrincipalHandle GetCurrentPrincipal();
+        */
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupArgCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe int GetStartupArg(int arg, char * output, int maxout);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupEndpointCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        // Return parameter is really: ExtensionContract.Exp opt(ExHeap) *
+        public static extern unsafe SharedHeapService.Allocation * GetStartupEndpoint(int arg);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(896)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        // Parameter is really: ExtensionContract.Exp opt(ExHeap) *
+        public static extern unsafe void SetStartupEndpoint(int arg, SharedHeapService.Allocation * ep);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1472)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+            // Return parameter is really: DirectoryService.Imp opt(ExHeap) *
+        public static extern unsafe SharedHeapService.Allocation * GetNamespaceEndpoint();
+
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern TimeSpan GetThreadTime();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern long GetThreadsCreatedCount();
+
+
+        [NoHeapAllocation]
+        [AccessedByRuntime("referenced from Tracing.cpp")]
+        public static unsafe void GetTracingHeaders(out LogEntry *logBegin,
+                                                    out LogEntry *logLimit,
+                                                    out LogEntry **logHead,
+                                                    out byte *txtBegin,
+                                                    out byte *txtLimit,
+                                                    out byte **txtHead)
+        {
+            fixed (LogEntry **logBeginPtr = &logBegin,
+                              logLimitPtr = &logLimit) {
+                fixed (LogEntry ***logHeadPtr = &logHead) {
+                    fixed (byte **txtBeginPtr = &txtBegin,
+                                  txtLimitPtr = &txtLimit) {
+                        fixed (byte ***txtHeadPtr = &txtHead) {
+                            GetTracingHeadersImpl(logBeginPtr, logLimitPtr,
+                                logHeadPtr, txtBeginPtr, txtLimitPtr,
+                                txtHeadPtr);
+                        }
+                    }
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1186)]
+        [AccessedByRuntime("referenced from c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void GetTracingHeadersImpl(
+            LogEntry **logBegin,
+            LogEntry **logLimit,
+            LogEntry ***logHead,
+            byte **txtBegin,
+            byte **txtLimit,
+            byte ***txtHead);
+
+        [NoHeapAllocation]
+        [AccessedByRuntime("referenced from Monitoring.cpp")]
+        public static unsafe void GetMonitoringHeaders(out byte * buffer)
+        {
+            unsafe {
+                fixed (byte * * bufferPtr = &buffer) {
+                    GetMonitoringHeadersImpl(bufferPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1166)]
+        [AccessedByRuntime("referenced from c++")]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void GetMonitoringHeadersImpl(
+            byte * * buffer);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Waypoint0();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Waypoint(int num);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void WaypointDone();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void WaypointDump();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupStringArgCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupStringArrayArgCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupLongArgCount();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int GetStartupBoolArgCount();
+
+        [NoHeapAllocation]
+        public static unsafe ParameterCode GetStartupStringArg(
+            int arg,
+            char * output,
+            ref int inOutLength)
+        {
+            fixed (int * inOutLengthPtr = &inOutLength) {
+                return GetStartupStringArgImpl(arg, output, inOutLengthPtr);
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1178)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode GetStartupStringArgImpl(
+            int arg,
+            char * output,
+            int * inOutLength);
+
+        [NoHeapAllocation]
+        public static ParameterCode GetStartupLongArg(
+            int index,
+            out long value)
+        {
+            unsafe {
+                fixed (long * valuePtr = &value) {
+                    return GetStartupLongArgImpl(index, valuePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode GetStartupLongArgImpl(
+            int index,
+            long * value);
+
+        [NoHeapAllocation]
+        public static ParameterCode GetStartupBoolArg(
+            int index,
+            out bool value)
+        {
+            unsafe {
+                fixed (bool * valuePtr = &value) {
+                    return GetStartupBoolArgImpl(index, valuePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode GetStartupBoolArgImpl(
+            int index,
+            bool * value);
+
+        [NoHeapAllocation]
+        public static unsafe ParameterCode GetStartupStringArrayArg(
+                                                int index,
+                                                char *args,
+                                                int *argLengths,
+                                                out int arrayLength,
+                                                out int totalCharCount
+                                         )
+        {
+            fixed (int * arrayLengthPtr = &arrayLength,
+                         totalCharCountPtr = &totalCharCount) {
+                return GetStartupStringArrayArgImpl(index, args, argLengths,
+                    arrayLengthPtr, totalCharCountPtr);
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1186)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ParameterCode GetStartupStringArrayArgImpl(
+                                                int index,
+                                                char *args,
+                                                int *argLengths,
+                                                int *arrayLength,
+                                                int *totalCharCount
+                                         );
+
+
+        // haryadi -- ping pong interface to app
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int RunPingPongInt(int start);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern int HelloProcessABI(int num, int num2);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe ulong TestAbiCallOne(ulong a);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe int TestAbiCallTwo(uint a, char *b);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe char* TestAbiCallThree(int a, int *b, byte c);
+
+
+        public static unsafe void TestAbiCallAll()
+        {
+            ulong a1= 33;
+            ulong r1 = ProcessService.TestAbiCallOne(a1);
+
+            char x1 = 'a';
+            char *b2 =  &x1;
+            uint a2 = 10;
+            int r2 = ProcessService.TestAbiCallTwo(a2, b2);
+
+            int a3 = 44;
+            int *b3 = & a3;
+            byte c3 = 1;
+            char *r3 = ProcessService.TestAbiCallThree(a3, b3, c3);
+        }
+
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Services/SharedHeapService.cs b/base/Libraries/Singularity.V1/Services/SharedHeapService.cs
new file mode 100644
index 0000000..0e6b0b9
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/SharedHeapService.cs
@@ -0,0 +1,156 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SharedHeapService.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Microsoft.Singularity.V1.Types;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct SharedHeapService
+    {
+        public struct AllocationOwnerId {
+            // No fields visible to ABI callers.
+        }
+#if !ROUTE_INDIRECTION_THROUGH_KERNEL
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Allocation {
+            public UIntPtr data;  // Address of the allocated memory region.
+            public UIntPtr size;  // Size of above in bytes.
+            public UIntPtr type;  // Type information.
+            private UIntPtr next;  // Next on owner's list.
+            private UIntPtr prev;  // Previous on owner's list.
+            public int owner;
+        }
+
+#if DEBUG
+        [Inline]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetData(Allocation *allocation)
+        {
+            // CANNOT CHECK THE OWNER HERE UNLESS WE MAKE CURRENTPROCESS visible
+            // to this compilation
+            //
+            // Check owner!
+            //            if (allocation->owner != Thread.CurrentProcess.ProcessId) {
+            //                DebugStub.Break();
+            //            }
+            return allocation->data;
+        }
+#else
+        [Inline]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetData(Allocation *allocation)
+        {
+            return allocation->data;
+        }
+
+#endif
+        [Inline]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetSize(Allocation *allocation)
+        {
+            return allocation->size;
+            // return (allocation != null) ? allocation->size : UIntPtr.Zero;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public static unsafe UIntPtr GetType(Allocation *allocation)
+        {
+            return allocation->type;
+        }
+
+#else // ROUTE_INDIRECTION_THROUGH_KERNEL
+
+        public struct Allocation {
+            // No fields visible to ABI callers.
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe UIntPtr GetData(Allocation *allocation);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe UIntPtr GetSize(Allocation *allocation);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe UIntPtr GetType(Allocation *allocation);
+
+#endif // ROUTE_INDIRECTION_THROUGH_KERNEL
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe Allocation *Allocate(UIntPtr size,
+                                                         SystemType type,
+                                                         uint alignment);
+
+        /// <returns>true if last reference was freed</returns>
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool Free(Allocation *allocation);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe Allocation *Share(Allocation *allocation,
+                                                      UIntPtr startOffset,
+                                                      UIntPtr endOffset);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe Allocation *Split(Allocation *allocation,
+                                                      UIntPtr offset);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void Truncate(Allocation *allocation,
+                                                  UIntPtr offset);
+
+#if NOT_YET
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe void TransferTo(
+            Allocation *allocation,
+            AllocationOwnerId newOwner);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(256)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe void TransferFrom(
+            Allocation *allocation,
+            AllocationOwnerId oldOwner);
+#endif
+
+    }
+
+}
diff --git a/base/Libraries/Singularity.V1/Services/StackService.cs b/base/Libraries/Singularity.V1/Services/StackService.cs
new file mode 100644
index 0000000..ace2cbf
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Services/StackService.cs
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StackService.cs
+//
+//  Note:
+//
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Singularity.V1.Services
+{
+    public struct StackService
+    {
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1088)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void WalkStack();
+
+        [NoHeapAllocation]
+        public static void GetUsageStatistics(
+            out ulong gets,
+            out ulong returns)
+        {
+            unsafe {
+                fixed (ulong * getsPtr = &gets, returnsPtr = &returns) {
+                    GetUsageStatisticsImpl(getsPtr, returnsPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1170)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe void GetUsageStatisticsImpl(
+            ulong * gets,
+            ulong * returns);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Singularity.V1.csproj b/base/Libraries/Singularity.V1/Singularity.V1.csproj
new file mode 100644
index 0000000..ef73d53
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Singularity.V1.csproj
@@ -0,0 +1,64 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Singularity.V1\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>Singularity.V1</AssemblyName>
+    <OutputType>Library</OutputType>
+    <WarningLevel>2</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Language>C#</Language>
+    <OutputPath>$(LIBSDIR)</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)'=='CE_PC'">
+    <DefineConstants Condition="'$(DefineConstants)'!=''">$(DefineConstants);</DefineConstants>
+    <DefineConstants>$(DefineConstants)CE_PC</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Basetypes\Basetypes.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Baseattrs\Baseattrs.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="Processes\ProcessHandle.cs"/>
+    <Compile Include="Security\PrincipalHandle.cs"/>
+    <Compile Include="Services\ChannelService.cs"/>
+    <Compile Include="Services\DebugService.cs"/>
+    <Compile Include="Services\DeviceService.cs"/>
+    <Compile Include="Services\PageTableService.cs"/>
+    <Compile Include="Services\ProcessService.cs"/>
+    <Compile Include="Services\SharedHeapService.cs"/>
+    <Compile Include="Services\StackService.cs"/>
+    <Compile Include="Stress\StressDirect.cs"/>
+    <Compile Include="Threads\AutoResetEventHandle.cs"/>
+    <Compile Include="Threads\ContainerHandle.cs"/>
+    <Compile Include="Threads\InterruptHandle.cs"/>
+    <Compile Include="Threads\ManualResetEventHandle.cs"/>
+    <Compile Include="Threads\MutexHandle.cs"/>
+    <Compile Include="Threads\SyncHandle.cs"/>
+    <Compile Include="Threads\ThreadHandle.cs"/>
+    <Compile Include="Threads\ThreadState.cs"/>
+    <Compile Include="Types\SystemType.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\SingSharp.targets"/>
+
+</Project>
diff --git a/base/Libraries/Singularity.V1/Stress/StressDirect.cs b/base/Libraries/Singularity.V1/Stress/StressDirect.cs
new file mode 100644
index 0000000..c749a6e
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Stress/StressDirect.cs
@@ -0,0 +1,26 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StressDirect.sg
+//  Note:   Kernel diagnostics (testing and debugging)
+//
+//  (non-shipping extensions to kernel ABI, for testing and debugging)
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Stress
+{
+    public struct StressDirect
+    {
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1024)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe uint KPTest(SharedHeapService.Allocation* sharedArgs, int i);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/AutoResetEventHandle.cs b/base/Libraries/Singularity.V1/Threads/AutoResetEventHandle.cs
new file mode 100644
index 0000000..1208052
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/AutoResetEventHandle.cs
@@ -0,0 +1,70 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AutoResetEventHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct AutoResetEventHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(
+            bool initialState,
+            out AutoResetEventHandle handle)
+        {
+            unsafe {
+                fixed (AutoResetEventHandle * handlePtr = &handle) {
+                    return CreateImpl(initialState, handlePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(
+            bool initialState,
+            AutoResetEventHandle * handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Dispose(AutoResetEventHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(320)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Reset(AutoResetEventHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Set(AutoResetEventHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool SetAll(AutoResetEventHandle handle);
+
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool SetNoGC(AutoResetEventHandle handle);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/ContainerHandle.cs b/base/Libraries/Singularity.V1/Threads/ContainerHandle.cs
new file mode 100644
index 0000000..b7445f5
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/ContainerHandle.cs
@@ -0,0 +1,43 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ContainerHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct ContainerHandle
+    {
+        public readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static bool Create(out ContainerHandle container)
+        {
+            unsafe {
+                fixed (ContainerHandle * containerPtr = &container) {
+                    return CreateImpl(containerPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1170)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(ContainerHandle * container);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Dispose(ContainerHandle container);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/InterruptHandle.cs b/base/Libraries/Singularity.V1/Threads/InterruptHandle.cs
new file mode 100644
index 0000000..5b880c3
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/InterruptHandle.cs
@@ -0,0 +1,65 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   InterruptHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct InterruptHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(
+            byte irq,
+            out InterruptHandle handle)
+        {
+            unsafe {
+                fixed (InterruptHandle * handlePtr = &handle) {
+                    return CreateImpl(irq, handlePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(
+            byte irq,
+            InterruptHandle * handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Dispose(InterruptHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Wait(InterruptHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Pulse(InterruptHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Ack(InterruptHandle handle);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/ManualResetEventHandle.cs b/base/Libraries/Singularity.V1/Threads/ManualResetEventHandle.cs
new file mode 100644
index 0000000..94df390
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/ManualResetEventHandle.cs
@@ -0,0 +1,58 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ManualResetEventHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct ManualResetEventHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(bool initialState,
+                                  out ManualResetEventHandle handle)
+        {
+            unsafe {
+                fixed (ManualResetEventHandle * handlePtr = &handle) {
+                    return CreateImpl(initialState, handlePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(
+            bool initialState,
+            ManualResetEventHandle * handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Dispose(ManualResetEventHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(320)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Reset(ManualResetEventHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Set(ManualResetEventHandle handle);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/MutexHandle.cs b/base/Libraries/Singularity.V1/Threads/MutexHandle.cs
new file mode 100644
index 0000000..5bce876
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/MutexHandle.cs
@@ -0,0 +1,58 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MutexHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct MutexHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [NoHeapAllocation]
+        public static bool Create(bool initiallyOwned,
+                                  out MutexHandle handle)
+        {
+            unsafe {
+                fixed (MutexHandle * handlePtr = &handle) {
+                    return CreateImpl(initiallyOwned, handlePtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1174)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe bool CreateImpl(
+            bool initiallyOwned,
+            MutexHandle * handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Dispose(MutexHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(960)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Release(MutexHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool IsOwnedByCurrentThread(MutexHandle handle);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/SyncHandle.cs b/base/Libraries/Singularity.V1/Threads/SyncHandle.cs
new file mode 100644
index 0000000..97b27d9
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/SyncHandle.cs
@@ -0,0 +1,101 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SyncHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct SyncHandle // : public WaitHandle
+    {
+        public readonly UIntPtr id; // could be moved to WaitHandle
+
+        [Inline]
+        [NoHeapAllocation]
+        private SyncHandle(UIntPtr id)
+        {
+            this.id  = id;
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public static implicit operator SyncHandle(MutexHandle handle)
+        {
+            return new SyncHandle(handle.id);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public static implicit operator SyncHandle(AutoResetEventHandle handle)
+        {
+            return new SyncHandle(handle.id);
+        }
+
+        [Inline]
+        [NoHeapAllocation]
+        public static implicit operator SyncHandle(ManualResetEventHandle handle)
+        {
+            return new SyncHandle(handle.id);
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        // The following methods could be moved to WaitHandle if we had
+        // struct inheritance.
+        //
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool WaitOne(SyncHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool WaitOne(SyncHandle handle,
+                                          TimeSpan timeout);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool WaitOne(SyncHandle handle,
+                                          SchedulerTime stop);
+
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool WaitOneNoGC(SyncHandle handle);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe int WaitAny(SyncHandle * handles,
+                                                int handleCount);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe int WaitAny(SyncHandle * handles,
+                                                int handleCount,
+                                                TimeSpan timeout);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern unsafe int WaitAny(SyncHandle * handles,
+                                                int handleCount,
+                                                SchedulerTime stop);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/ThreadHandle.cs b/base/Libraries/Singularity.V1/Threads/ThreadHandle.cs
new file mode 100644
index 0000000..cdaa636
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/ThreadHandle.cs
@@ -0,0 +1,140 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadHandle.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    public struct ThreadHandle
+    {
+        public readonly UIntPtr id;
+
+        [NoHeapAllocation]
+        public static unsafe bool Create(int threadIndex,
+                                         ContainerHandle container,
+                                         out ThreadHandle thread,
+                                         out UIntPtr threadContext)
+        {
+            fixed (ThreadHandle * threadPtr = &thread) {
+                fixed (UIntPtr * threadContextPtr = &threadContext) {
+                    return CreateImpl(threadIndex, container, threadPtr,
+                        threadContextPtr);
+                }
+            }
+        }
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1182)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static unsafe extern bool CreateImpl(
+            int threadIndex,
+            ContainerHandle container,
+            ThreadHandle * thread,
+            UIntPtr * threadContext);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(192)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Dispose(ThreadHandle thread);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1408)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Start(ThreadHandle thread);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ThreadState GetThreadState(ThreadHandle thread);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern TimeSpan GetExecutionTime(ThreadHandle thread);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Join(ThreadHandle thread);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Join(ThreadHandle thread,
+                                       TimeSpan timeout);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1216)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool Join(ThreadHandle thread,
+                                       SchedulerTime stop);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern ThreadHandle CurrentThread();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern UIntPtr GetThreadLocalValue();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void SetThreadLocalValue(UIntPtr value);
+
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Sleep(TimeSpan timeout);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1152)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Sleep(SchedulerTime stop);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(512)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void Yield();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern void SpinWait(int iterations);
+
+        //        [OutsideGCDomain]
+        // [MethodImpl(MethodImplOptions.InternalCall)]
+        // public static extern unsafe uint GetPrincipal(/*[out]*/ char *outprincipal, uint maxout);
+
+        //[OutsideGCDomain]
+        //[MethodImpl(MethodImplOptions.InternalCall)]
+        // public static extern unsafe uint GetPrincipal(ThreadHandle handler, /*[out]*/ char *outprincipal, uint maxout);
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Threads/ThreadState.cs b/base/Libraries/Singularity.V1/Threads/ThreadState.cs
new file mode 100644
index 0000000..307f93f
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Threads/ThreadState.cs
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ThreadState.cs
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.V1.Threads
+{
+    //| <include path='docs/doc[@for="ThreadState"]/*' />
+    [Flags]
+    public enum ThreadState
+    {
+        Unstarted           = 0x00,
+        Running             = 0x01,
+        Blocked             = 0x02,
+        Suspended           = 0x04,
+        Stopped             = 0x08,
+    }
+}
diff --git a/base/Libraries/Singularity.V1/Types/SystemType.cs b/base/Libraries/Singularity.V1/Types/SystemType.cs
new file mode 100644
index 0000000..e16cde3
--- /dev/null
+++ b/base/Libraries/Singularity.V1/Types/SystemType.cs
@@ -0,0 +1,69 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity - Singularity ABI
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: SystemType.cs
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity.V1.Services;
+
+namespace Microsoft.Singularity.V1.Types
+{
+    public struct SystemType
+    {
+        /// A handle to a RuntimeSystemType
+        private readonly UIntPtr id;
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(320)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern SystemType RootSystemType();
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(1472)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public static extern SystemType Register(char* name,
+                                                        int nameLength,
+                                                        long lowerHash,
+                                                        long upperHash,
+                                                        SystemType parent);
+
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public static extern bool IsSubtype(SystemType child,
+                                            SystemType parent);
+
+        [OutsideGCDomain]
+        [NoHeapAllocation]
+        [StackBound(128)]
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        unsafe public static extern bool IsSubtype(SharedHeapService.Allocation* childData,
+                                                   SystemType parent);
+
+        [NoHeapAllocation]
+        public static bool IsNull(SystemType st)
+        {
+            return st.id == UIntPtr.Zero;
+        }
+
+        [CLSCompliant(false)]
+        public UIntPtr TypeId
+        {
+            [NoHeapAllocation]
+            get {
+                return this.id;
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/BinaryReader.cs b/base/Libraries/System.IO/BinaryReader.cs
new file mode 100644
index 0000000..4bbd182
--- /dev/null
+++ b/base/Libraries/System.IO/BinaryReader.cs
@@ -0,0 +1,498 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class: BinaryReader
+**
+**
+** Purpose: Wraps a stream and provides convenient read functionality
+** for strings and primitive types.
+**
+** Date: April 8, 2000
+**
+============================================================*/
+namespace System.IO {
+
+    using System;
+    using System.Diagnostics;
+    using System.Text;
+
+    //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader"]/*' />
+    public class BinaryReader : IDisposable
+    {
+        private const int MaxCharBytesSize = 128;
+
+        private Stream   m_stream;
+        private byte[]   m_buffer;
+        private Decoder  m_decoder;
+        private byte[]   m_charBytes;
+        private char[]   m_singleChar;
+        private char[]   m_charBuffer;
+
+        // Performance optimization for Read() w/ Unicode.  Speeds us up by ~40%
+        private bool     m_2BytesPerChar;
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.BinaryReader"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public BinaryReader(Stream input) : this(input, new UTF8Encoding()) {
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.BinaryReader1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public BinaryReader(Stream input, Encoding encoding) {
+            if (input==null) {
+                throw new ArgumentNullException("input");
+            }
+            if (encoding==null) {
+                throw new ArgumentNullException("encoding");
+            }
+            if (!input.CanRead)
+                throw new ArgumentException("Argument_StreamNotReadable");
+            m_stream = input;
+            m_decoder = encoding.GetDecoder();
+            int minBufferSize = encoding.GetMaxByteCount(1);  // max bytes per one char
+            if (minBufferSize < 16)
+                minBufferSize = 16;
+            m_buffer = new byte[minBufferSize];
+            m_charBuffer = null;
+            m_charBytes  = null;
+
+            // Performance hack - for Encodings that always use 2 bytes per char
+            // (or more), special case them here to make Read() & Peek() faster.
+            m_2BytesPerChar = encoding is UnicodeEncoding;
+
+            Debug.Assert(m_decoder!=null, "[BinaryReader.ctor]m_decoder!=null");
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.BaseStream"]/*' />
+        public virtual Stream BaseStream {
+            get {
+                return m_stream;
+            }
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.Close"]/*' />
+        public virtual void Close() {
+            Dispose(true);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.Dispose"]/*' />
+        protected virtual void Dispose(bool disposing) {
+            if (disposing) {
+                // Close in a thread-safe way (multiple calls to Close are safe)
+                Stream copyOfStream = m_stream;
+                m_stream = null;
+                if (copyOfStream != null)
+                    copyOfStream.Close();
+            }
+            m_stream = null;
+            m_buffer = null;
+            m_decoder = null;
+            m_charBytes = null;
+            m_singleChar = null;
+            m_charBuffer = null;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.IDisposable.Dispose"]/*' />
+        /// <internalonly/>
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.PeekChar"]/*' />
+        public virtual int PeekChar() {
+            if (m_stream==null) __Error.FileNotOpen();
+
+            if (!m_stream.CanSeek)
+                return -1;
+            long origPos = m_stream.Position;
+            int ch = Read();
+            m_stream.Position = origPos;
+            return ch;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.Read"]/*' />
+        public virtual int Read() {
+            if (m_stream==null) {
+                __Error.FileNotOpen();
+            }
+            return InternalReadOneChar();
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadBoolean"]/*' />
+        public virtual bool ReadBoolean(){
+            FillBuffer(1);
+            return (m_buffer[0]!=0);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadByte"]/*' />
+        public virtual byte ReadByte() {
+            FillBuffer(1);
+            return (m_buffer[0]);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadSByte"]/*' />
+        [CLSCompliant(false)]
+        public virtual sbyte ReadSByte() {
+            FillBuffer(1);
+            return (sbyte)(m_buffer[0]);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadChar"]/*' />
+        public virtual char ReadChar() {
+            int value = Read();
+            if (value==-1) {
+                __Error.EndOfFile();
+            }
+            return (char)value;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadInt16"]/*' />
+        public virtual short ReadInt16() {
+            FillBuffer(2);
+            return (short)(m_buffer[0] & 0xFF | m_buffer[1] << 8);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadUInt16"]/*' />
+        [CLSCompliant(false)]
+        public virtual ushort ReadUInt16(){
+            FillBuffer(2);
+            return (ushort)(m_buffer[0] & 0xFF | m_buffer[1] << 8);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadInt32"]/*' />
+        public virtual int ReadInt32() {
+            FillBuffer(4);
+            return (int)((m_buffer[0]&0xFF) | m_buffer[1] << 8 | m_buffer[2] << 16 | m_buffer[3] << 24);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadUInt32"]/*' />
+        [CLSCompliant(false)]
+        public virtual uint ReadUInt32() {
+            FillBuffer(4);
+            return (uint)(m_buffer[0] | (m_buffer[1]) << 8 | (m_buffer[2]) << 16 | m_buffer[3] << 24);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadInt64"]/*' />
+        public virtual long ReadInt64() {
+            FillBuffer(8);
+            uint lo = (uint)(m_buffer[0] | (m_buffer[1]) << 8 |
+                             (m_buffer[2]) << 16 | m_buffer[3] << 24);
+            uint hi = (uint)(m_buffer[4] | (m_buffer[5]) << 8 |
+                             (m_buffer[6]) << 16 | m_buffer[7] << 24);
+            return (long) ((ulong)hi) << 32 | lo;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadUInt64"]/*' />
+        [CLSCompliant(false)]
+        public virtual ulong ReadUInt64() {
+            FillBuffer(8);
+            uint lo = (uint)(m_buffer[0] | (m_buffer[1]) << 8 |
+                             (m_buffer[2]) << 16 | m_buffer[3] << 24);
+            uint hi = (uint)(m_buffer[4] | (m_buffer[5]) << 8 |
+                             (m_buffer[6]) << 16 | m_buffer[7] << 24);
+            return ((ulong)hi) << 32 | lo;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadSingle"]/*' />
+        public virtual float ReadSingle() {
+            FillBuffer(4);
+            return BitConverter.UInt32BitsToSingle(
+                (uint)(m_buffer[0] | (m_buffer[1]) << 8 |
+                       (m_buffer[2]) << 16 | m_buffer[3] << 24));
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadDouble"]/*' />
+        public virtual double ReadDouble() {
+            FillBuffer(8);
+            uint lo = (uint)(m_buffer[0] | (m_buffer[1]) << 8 |
+                             (m_buffer[2]) << 16 | m_buffer[3] << 24);
+            uint hi = (uint)(m_buffer[4] | (m_buffer[5]) << 8 |
+                             (m_buffer[6]) << 16 | m_buffer[7] << 24);
+            return BitConverter.UInt64BitsToDouble(((ulong)hi) << 32 | lo);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadDecimal"]/*' />
+        public virtual decimal ReadDecimal() {
+            FillBuffer(16);
+            return Decimal.ToDecimal(m_buffer);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadString"]/*' />
+        public virtual String ReadString() {
+            int currPos = 0;
+            int n;
+            int stringLength;
+            int readLength;
+            int charsRead;
+
+            if (m_stream==null)
+                __Error.FileNotOpen();
+
+            // Length of the string in bytes, not chars
+            stringLength = Read7BitEncodedInt();
+            if (stringLength<0) {
+                throw new IOException(String.Format("IO.IO_InvalidStringLen_Len", stringLength));
+            }
+
+            if (stringLength==0) {
+                return String.Empty;
+            }
+
+            if (m_charBytes==null) {
+                m_charBytes  = new byte[MaxCharBytesSize];
+            }
+
+            if (m_charBuffer == null) {
+                m_charBuffer = new char[MaxCharBytesSize];
+            }
+
+            StringBuilder sb = null;
+            do
+            {
+                readLength = ((stringLength - currPos)>MaxCharBytesSize)?MaxCharBytesSize:(stringLength - currPos);
+
+                n = m_stream.Read(m_charBytes, 0, readLength);
+                if (n==0) {
+                    __Error.EndOfFile();
+                }
+
+                charsRead = m_decoder.GetChars(m_charBytes, 0, n, m_charBuffer, 0);
+
+                if (currPos == 0 && n == stringLength)
+                    return new String(m_charBuffer, 0, charsRead);
+
+                if (sb == null)
+                    sb = new StringBuilder(stringLength); // Actual string length in chars may be smaller.
+                sb.Append(m_charBuffer, 0, charsRead);
+                currPos +=n;
+
+            } while (currPos<stringLength);
+
+            return sb.ToString();
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.Read1"]/*' />
+        public virtual int Read(char[] buffer, int index, int count) {
+            if (buffer==null) {
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            }
+            if (index < 0) {
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            if (buffer.Length - index < count) {
+                throw new ArgumentException("Argument_InvalidOffLen");
+            }
+
+            if (m_stream==null)
+                __Error.FileNotOpen();
+
+            return InternalReadChars(buffer, index, count);
+        }
+
+        private int InternalReadChars(char[] buffer, int index, int count) {
+            int charsRead = 0;
+            int numBytes = 0;
+            int charsRemaining = count;
+
+            if (m_charBytes==null) {
+                m_charBytes = new byte[MaxCharBytesSize];
+            }
+
+            while (charsRemaining>0) {
+                // We really want to know what the minimum number of bytes per char
+                // is for our encoding.  Otherwise for UnicodeEncoding we'd have to
+                // do ~1+log(n) reads to read n characters.
+                numBytes = charsRemaining;
+                if (m_2BytesPerChar)
+                    numBytes <<= 1;
+                if (numBytes > MaxCharBytesSize)
+                    numBytes = MaxCharBytesSize;
+
+                numBytes = m_stream.Read(m_charBytes, 0, numBytes);
+
+                if (numBytes==0) {
+                    //  Console.WriteLine("Found no bytes.  We're outta here.");
+                    return (count - charsRemaining);
+                }
+                charsRead = m_decoder.GetChars(m_charBytes, 0, numBytes, buffer, index);
+                charsRemaining -= charsRead;
+                index+=charsRead;
+                //                Console.WriteLine("That became: " + charsRead + " characters.");
+            }
+            Debug.Assert(charsRemaining == 0, "We didn't read all the chars we thought we would.");
+            return count;
+        }
+
+        private int InternalReadOneChar() {
+            // I know having a separate InternalReadOneChar method seems a little
+            // redundant, but this makes a scenario like the security parser code
+            // 20% faster, in addition to the optimizations for UnicodeEncoding I
+            // put in InternalReadChars.   -- BrianGru, 5/8/2001
+            int charsRead = 0;
+            int numBytes = 0;
+
+            if (m_charBytes==null) {
+                m_charBytes = new byte[MaxCharBytesSize];
+            }
+            if (m_singleChar==null) {
+                m_singleChar = new char[1];
+            }
+
+            while (charsRead == 0) {
+                // We really want to know what the minimum number of bytes per char
+                // is for our encoding.  Otherwise for UnicodeEncoding we'd have to
+                // do ~1+log(n) reads to read n characters.
+                // Assume 1 byte can be 1 char unless m_2BytesPerChar is true.
+                numBytes = m_2BytesPerChar ? 2 : 1;
+
+                int r = m_stream.ReadByte();
+                m_charBytes[0] = (byte) r;
+                if (r == -1)
+                    numBytes = 0;
+                if (numBytes == 2) {
+                    r = m_stream.ReadByte();
+                    m_charBytes[1] = (byte) r;
+                    if (r == -1)
+                        numBytes = 1;
+                }
+
+                if (numBytes==0) {
+                    // Console.WriteLine("Found no bytes.  We're outta here.");
+                    return -1;
+                }
+
+                Debug.Assert(numBytes == 1 || numBytes == 2, "BinaryReader::InternalReadOneChar assumes it's reading one or 2 bytes only.");
+
+                charsRead = m_decoder.GetChars(m_charBytes, 0, numBytes, m_singleChar, 0);
+                Debug.Assert(charsRead < 2, "InternalReadOneChar - assuming we only got 0 or 1 char, not 2!");
+                //                Console.WriteLine("That became: " + charsRead + " characters.");
+            }
+            if (charsRead == 0)
+                return -1;
+            return m_singleChar[0];
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadChars"]/*' />
+        public virtual char[] ReadChars(int count) {
+            if (m_stream==null) {
+                __Error.FileNotOpen();
+            }
+            if (count<0) {
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            }
+            char[] chars = new char[count];
+            int n = InternalReadChars(chars, 0, count);
+            if (n!=count) {
+                char[] copy = new char[n];
+                Buffer.BlockCopy(chars, 0, copy, 0, 2*n); // sizeof(char)
+                chars = copy;
+            }
+
+            return chars;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.Read2"]/*' />
+        public virtual int Read(byte[] buffer, int index, int count) {
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            if (m_stream==null) __Error.FileNotOpen();
+            return m_stream.Read(buffer, index, count);
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.ReadBytes"]/*' />
+        public virtual byte[] ReadBytes(int count) {
+            if (count < 0) throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (m_stream==null) __Error.FileNotOpen();
+
+            byte[] result = new byte[count];
+
+            int numRead = 0;
+            do {
+                int n = m_stream.Read(result, numRead, count);
+                if (n == 0)
+                    break;
+                numRead += n;
+                count -= n;
+            } while (count > 0);
+
+            if (numRead != result.Length) {
+                // Trim array.  This should happen on EOF & possibly net streams.
+                byte[] copy = new byte[numRead];
+                Buffer.BlockCopy(result, 0, copy, 0, numRead);
+                result = copy;
+            }
+
+            return result;
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.FillBuffer"]/*' />
+        protected virtual void FillBuffer(int numBytes) {
+            Debug.Assert(m_buffer==null || (numBytes>0 && numBytes<=m_buffer.Length), "[FillBuffer]numBytes>0 && numBytes<=m_buffer.Length");
+            int bytesRead=0;
+            int n = 0;
+
+            if (m_stream==null) __Error.FileNotOpen();
+
+            // @TODO: Find a good threshold for calling ReadByte() repeatedly
+            // vs. calling Read(byte[], int, int) for both buffered & unbuffered
+            // streams.
+            if (numBytes==1) {
+                n = m_stream.ReadByte();
+                if (n==-1)
+                    __Error.EndOfFile();
+                m_buffer[0] = (byte)n;
+                return;
+            }
+
+            do {
+                n = m_stream.Read(m_buffer, bytesRead, numBytes-bytesRead);
+                if (n==0) {
+                    __Error.EndOfFile();
+                }
+                bytesRead+=n;
+            } while (bytesRead<numBytes);
+#if false // uncomment to debug buffer fill.
+            Console.WriteLine(" FillBuffer({0} : {1:x2}{2:x2}{3:x2}{4:x2} {5:x2}{6:x2}{7:x2}{8:x2}",
+                              numBytes,
+                              (byte)(numBytes > 0 ? m_buffer[0] : (byte)0),
+                              (byte)(numBytes > 1 ? m_buffer[1] : (byte)0),
+                              (byte)(numBytes > 2 ? m_buffer[2] : (byte)0),
+                              (byte)(numBytes > 3 ? m_buffer[3] : (byte)0),
+                              (byte)(numBytes > 4 ? m_buffer[4] : (byte)0),
+                              (byte)(numBytes > 5 ? m_buffer[5] : (byte)0),
+                              (byte)(numBytes > 6 ? m_buffer[6] : (byte)0),
+                              (byte)(numBytes > 7 ? m_buffer[7] : (byte)0));
+#endif
+        }
+
+        //| <include file='doc\BinaryReader.uex' path='docs/doc[@for="BinaryReader.Read7BitEncodedInt"]/*' />
+        protected int Read7BitEncodedInt() {
+            // Read out an int 7 bits at a time.  The high bit
+            // of the byte when on means to continue reading more bytes.
+            int count = 0;
+            int shift = 0;
+            byte b;
+            do {
+                b = ReadByte();
+                count |= (b & 0x7F) << shift;
+                shift += 7;
+            } while ((b & 0x80) != 0);
+            return count;
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/BinaryWriter.cs b/base/Libraries/System.IO/BinaryWriter.cs
new file mode 100644
index 0000000..9fda15f
--- /dev/null
+++ b/base/Libraries/System.IO/BinaryWriter.cs
@@ -0,0 +1,397 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  BinaryWriter
+**
+**         Original implementation by Craig Sinclair (CraigSi)
+**
+** Purpose: Provides a way to write primitives types in
+** binary from a Stream, while also supporting writing Strings
+** in a particular encoding.
+**
+** Date:   March 7, 2000
+**
+===========================================================*/
+using System;
+using System.Text;
+using System.Diagnostics;
+
+namespace System.IO {
+    // This abstract base class represents a writer that can write
+    // primitives to an arbitrary stream. A subclass can override methods to
+    // give unique encodings.
+    //
+    //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter"]/*' />
+    public class BinaryWriter : IDisposable
+    {
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Null"]/*' />
+        public static readonly BinaryWriter Null = new BinaryWriter();
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.OutStream"]/*' />
+        protected Stream OutStream;
+        private byte[] _buffer;    // temp space for writing primitives to.
+        private Encoding _encoding;
+        private Encoder _encoder;
+        private char[] _tmpOneCharBuffer = new char[1];
+
+        // Perf optimization stuff
+        private byte[] _largeByteBuffer;  // temp space for writing chars.
+        private int _maxChars;   // max # of chars we can put in _largeByteBuffer
+        // Size should be around the max number of chars/string * Encoding's max bytes/char
+        private const int LargeByteBufferSize = 256;
+
+        // Protected default constructor that sets the output stream
+        // to a null stream (a bit bucket).
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.BinaryWriter"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        protected BinaryWriter()
+        {
+            OutStream = Stream.Null;
+            _buffer = new byte[16];
+            _encoding = new UTF8Encoding(false, true);
+            _encoder = _encoding.GetEncoder();
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.BinaryWriter1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public BinaryWriter(Stream output) : this(output, new UTF8Encoding(false, true))
+        {
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.BinaryWriter2"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public BinaryWriter(Stream output, Encoding encoding)
+        {
+            if (output==null)
+                throw new ArgumentNullException("output");
+            if (encoding==null)
+                throw new ArgumentNullException("encoding");
+            if (!output.CanWrite)
+                throw new ArgumentException("Argument_StreamNotWritable");
+
+            OutStream = output;
+            _buffer = new byte[16];
+            _encoding = encoding;
+            _encoder = _encoding.GetEncoder();
+        }
+
+        // Closes this writer and releases any system resources associated with the
+        // writer. Following a call to Close, any operations on the writer
+        // may raise exceptions.
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Close"]/*' />
+        public virtual void Close()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Dispose"]/*' />
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+                OutStream.Close();
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.IDisposable.Dispose"]/*' />
+        /// <internalonly/>
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+        }
+
+        /*
+         * Returns the stream associate with the writer. It flushes all pending
+         * writes before returning. All subclasses should override Flush to
+         * ensure that all buffered data is sent to the stream.
+         */
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.BaseStream"]/*' />
+        public virtual Stream BaseStream {
+            get {
+                Flush();
+                return OutStream;
+            }
+        }
+
+        // Clears all buffers for this writer and causes any buffered data to be
+        // written to the underlying device.
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Flush"]/*' />
+        public virtual void Flush()
+        {
+            OutStream.Flush();
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Seek"]/*' />
+        public virtual long Seek(int offset, SeekOrigin origin)
+        {
+            return OutStream.Seek(offset, origin);
+        }
+
+        // Writes a boolean to this stream. A single byte is written to the stream
+        // with the value 0 representing false or the value 1 representing true.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write"]/*' />
+        public virtual void Write(bool value) {
+            _buffer[0] = (byte) (value ? 1 : 0);
+            OutStream.Write(_buffer, 0, 1);
+        }
+
+        // Writes a byte to this stream. The current position of the stream is
+        // advanced by one.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write1"]/*' />
+        public virtual void Write(byte value)
+        {
+            OutStream.WriteByte(value);
+        }
+
+        // Writes a signed byte to this stream. The current position of the stream
+        // is advanced by one.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write2"]/*' />
+        [CLSCompliant(false)]
+        public virtual void Write(sbyte value)
+        {
+            OutStream.WriteByte((byte) value);
+        }
+
+        // Writes a byte array to this stream.
+        //
+        // This default implementation calls the Write(Object, int, int)
+        // method to write the byte array.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write3"]/*' />
+        public virtual void Write(byte[] buffer) {
+            if (buffer == null)
+                throw new ArgumentNullException("buffer");
+            OutStream.Write(buffer, 0, buffer.Length);
+        }
+
+        // Writes a section of a byte array to this stream.
+        //
+        // This default implementation calls the Write(Object, int, int)
+        // method to write the byte array.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write4"]/*' />
+        public virtual void Write(byte[] buffer, int index, int count) {
+            OutStream.Write(buffer, index, count);
+        }
+
+
+        // Writes a character to this stream. The current position of the stream is
+        // advanced by two.
+        // Note this method cannot handle surrogates properly in UTF-8.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write5"]/*' />
+        public virtual void Write(char ch) {
+            Debug.Assert(_encoding.GetMaxByteCount(1) <= 8, "_encoding.GetMaxByteCount(1) <= 8)");
+            _tmpOneCharBuffer[0] = ch;
+            int numBytes = _encoding.GetBytes(_tmpOneCharBuffer, 0, 1, _buffer, 0);
+            OutStream.Write(_buffer, 0, numBytes);
+        }
+
+        // Writes a character array to this stream.
+        //
+        // This default implementation calls the Write(Object, int, int)
+        // method to write the character array.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write6"]/*' />
+        public virtual void Write(char[] chars)
+        {
+            if (chars == null)
+                throw new ArgumentNullException("chars");
+
+            byte[] bytes = _encoding.GetBytes(chars, 0, chars.Length);
+            OutStream.Write(bytes, 0, bytes.Length);
+        }
+
+        // Writes a section of a character array to this stream.
+        //
+        // This default implementation calls the Write(Object, int, int)
+        // method to write the character array.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write7"]/*' />
+        public virtual void Write(char[] chars, int index, int count)
+        {
+            byte[] bytes = _encoding.GetBytes(chars, index, count);
+            OutStream.Write(bytes, 0, bytes.Length);
+        }
+
+
+        // Writes a double to this stream. The current position of the stream is
+        // advanced by eight.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write8"]/*' />
+        public virtual void Write(double value)
+        {
+            Write(BitConverter.DoubleToUInt64Bits(value));
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write9"]/*' />
+        public virtual void Write(decimal value)
+        {
+            Decimal.GetBytes(value,_buffer);
+            OutStream.Write(_buffer, 0, 16);
+        }
+
+        // Writes a two-byte signed integer to this stream. The current position of
+        // the stream is advanced by two.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write10"]/*' />
+        public virtual void Write(short value)
+        {
+            _buffer[0] = (byte) value;
+            _buffer[1] = (byte) (value >> 8);
+            OutStream.Write(_buffer, 0, 2);
+        }
+
+        // Writes a two-byte unsigned integer to this stream. The current position
+        // of the stream is advanced by two.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write11"]/*' />
+        [CLSCompliant(false)]
+        public virtual void Write(ushort value)
+        {
+            _buffer[0] = (byte) value;
+            _buffer[1] = (byte) (value >> 8);
+            OutStream.Write(_buffer, 0, 2);
+        }
+
+        // Writes a four-byte signed integer to this stream. The current position
+        // of the stream is advanced by four.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write12"]/*' />
+        public virtual void Write(int value)
+        {
+            _buffer[0] = (byte) value;
+            _buffer[1] = (byte) (value >> 8);
+            _buffer[2] = (byte) (value >> 16);
+            _buffer[3] = (byte) (value >> 24);
+            OutStream.Write(_buffer, 0, 4);
+        }
+
+        // Writes a four-byte unsigned integer to this stream. The current position
+        // of the stream is advanced by four.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write13"]/*' />
+        [CLSCompliant(false)]
+        public virtual void Write(uint value)
+        {
+            _buffer[0] = (byte) value;
+            _buffer[1] = (byte) (value >> 8);
+            _buffer[2] = (byte) (value >> 16);
+            _buffer[3] = (byte) (value >> 24);
+            OutStream.Write(_buffer, 0, 4);
+        }
+
+        // Writes an eight-byte signed integer to this stream. The current position
+        // of the stream is advanced by eight.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write14"]/*' />
+        public virtual void Write(long value)
+        {
+            _buffer[0] = (byte) value;
+            _buffer[1] = (byte) (value >> 8);
+            _buffer[2] = (byte) (value >> 16);
+            _buffer[3] = (byte) (value >> 24);
+            _buffer[4] = (byte) (value >> 32);
+            _buffer[5] = (byte) (value >> 40);
+            _buffer[6] = (byte) (value >> 48);
+            _buffer[7] = (byte) (value >> 56);
+            OutStream.Write(_buffer, 0, 8);
+        }
+
+        // Writes an eight-byte unsigned integer to this stream. The current
+        // position of the stream is advanced by eight.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write15"]/*' />
+        [CLSCompliant(false)]
+        public virtual void Write(ulong value)
+        {
+            _buffer[0] = (byte) value;
+            _buffer[1] = (byte) (value >> 8);
+            _buffer[2] = (byte) (value >> 16);
+            _buffer[3] = (byte) (value >> 24);
+            _buffer[4] = (byte) (value >> 32);
+            _buffer[5] = (byte) (value >> 40);
+            _buffer[6] = (byte) (value >> 48);
+            _buffer[7] = (byte) (value >> 56);
+            OutStream.Write(_buffer, 0, 8);
+        }
+
+        // Writes a float to this stream. The current position of the stream is
+        // advanced by four.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write16"]/*' />
+        public virtual void Write(float value)
+        {
+            Write(BitConverter.SingleToUInt32Bits(value));
+        }
+
+
+        // Writes a length-prefixed string to this stream in the BinaryWriter's
+        // current Encoding. This method first writes the length of the string as
+        // a four-byte unsigned integer, and then writes that many characters
+        // to the stream.
+        //
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write17"]/*' />
+        public virtual void Write(String value)
+        {
+            if (value==null)
+                throw new ArgumentNullException("value");
+
+            int len = _encoding.GetByteCount(value);
+            Write7BitEncodedInt(len);
+
+            if (_largeByteBuffer == null) {
+                _largeByteBuffer = new byte[LargeByteBufferSize];
+                _maxChars = LargeByteBufferSize / _encoding.GetMaxByteCount(1);
+            }
+
+            if (len <= LargeByteBufferSize) {
+                //Debug.Assert(len == _encoding.GetBytes(chars, 0, chars.Length, _largeByteBuffer, 0), "encoding's GetByteCount & GetBytes gave different answers!  encoding type: "+_encoding.GetType().Name);
+                _encoding.GetBytes(value, 0, value.Length, _largeByteBuffer, 0);
+                OutStream.Write(_largeByteBuffer, 0, len);
+            }
+            else {
+                // Use an Encoder to write out the string correctly (handling
+                // surrogates crossing buffer boundaries properly).  Must
+                // convert String to char[] though - we should fix this later.
+                char[] chars = value.ToCharArray();
+                int charStart = 0;
+                int numLeft = value.Length;
+#if _DEBUG
+                int totalBytes = 0;
+#endif
+                while (numLeft > 0) {
+                    // Figure out how many chars to process this round.
+                    int charCount = (numLeft > _maxChars) ? _maxChars : numLeft;
+                    int byteLen = _encoder.GetBytes(chars, charStart, charCount, _largeByteBuffer, 0, charCount == numLeft);
+                    OutStream.Write(_largeByteBuffer, 0, byteLen);
+                    charStart += charCount;
+                    numLeft -= charCount;
+#if _DEBUG
+                    totalBytes += byteLen;
+#endif
+                }
+#if _DEBUG
+                Debug.Assert(totalBytes == len, "BinaryWriter::Write(String) - Didn't write out all the bytes!");
+#endif
+            }
+        }
+
+        //| <include file='doc\BinaryWriter.uex' path='docs/doc[@for="BinaryWriter.Write7BitEncodedInt"]/*' />
+        protected void Write7BitEncodedInt(int value) {
+            // Write out an int 7 bits at a time.  The high bit of the byte,
+            // when on, tells reader to continue reading more bytes.
+            uint v = (uint) value;   // support negative numbers
+            while (v >= 0x80) {
+                Write((byte) (v | 0x80));
+                v >>= 7;
+            }
+            Write((byte)v);
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/BufferedStream.cs b/base/Libraries/System.IO/BufferedStream.cs
new file mode 100644
index 0000000..a9d7728
--- /dev/null
+++ b/base/Libraries/System.IO/BufferedStream.cs
@@ -0,0 +1,421 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  BufferedStream
+**
+**         Original design by Anders Hejlsberg (AndersH)
+**
+** Purpose: A composable Stream that buffers reads & writes
+** to the underlying stream.
+**
+** Date:  February 19, 2000
+**
+===========================================================*/
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.IO {
+    // Implementation notes:
+    // This is a somewhat complex but efficient implementation.  The biggest
+    // design goal here is to prevent the buffer from getting in the way and slowing
+    // down IO accesses when it isn't needed.  If you always read & write for sizes
+    // greater than the internal buffer size, then this class may not even allocate
+    // the internal buffer.  Secondly, it buffers reads & writes in a shared buffer.
+    // (If you maintained two buffers separately, one operation would always trash
+    // the other buffer anyways, so we might as well use one buffer.)  The
+    // assumption here is you will almost always be doing a series of reads or
+    // writes, but rarely alternate between the two of them on the same stream.
+    //
+    // This code is based on Anders' original implementation of his adaptive
+    // buffering code.  I had some ideas to make the pathological case better
+    // here, but the pathological cases for the new code would have avoided
+    // memcpy's by introducing more disk writes (which are 3 orders of magnitude
+    // slower). I've made some optimizations, fixed several bugs, and
+    // tried documenting this code.  -- BrianGru, 5/30/2000
+    //
+    // Possible future perf optimization:
+    // When we have more time to look at buffering perf, consider the following
+    // scenario for improving writing (and reading):
+    // Consider a 4K buffer and three write requests, one for 3K, one for 2K, then
+    // another for 3K in that order.  In the current implementation, we will copy
+    // the first 3K into our buffer, copy the first 1K of the 2K second write into
+    // our buffer, write that 4K to disk, write the remaining 1K from the second
+    // write to the disk, then copy the following 3K buffer to our internal buffer.
+    // If we then closed the file, we would have to write the remaining 3K to disk.
+    // We could possibly avoid a disk write by buffering the second half of the 2K
+    // write.  This may be a perf optimization, but there is a threshold where we
+    // won't be winning anything (in fact, we'd be taking an extra memcpy).  If we
+    // have buffered data plus data to write that is bigger than 2x our buffer size,
+    // we're better off writing our buffered data to disk then our given byte[] to
+    // avoid a call to memcpy.  But for cases when we have less data, it might be
+    // better to copy any spilled over data into our internal buffer.  Consider
+    // implementing this and looking at perf results on many random sized writes.
+    // Also, this should apply to Read trivially.   -- BrianGru, 5/30/2000
+    //
+    // Class Invariants:
+    // The class has one buffer, shared for reading & writing.  It can only be
+    // used for one or the other at any point in time - not both.  The following
+    // should be true:
+    //   0 <= _readPos <= _readLen < _bufferSize
+    //   0 <= _writePos < _bufferSize
+    //   _readPos == _readLen && _readPos > 0 implies the read buffer is valid,
+    //     but we're at the end of the buffer.
+    //   _readPos == _readLen == 0 means the read buffer contains garbage.
+    //   Either _writePos can be greater than 0, or _readLen & _readPos can be
+    //     greater than zero, but neither can be greater than zero at the same time.
+    //
+    //                                   -- Brian Grunkemeyer, 3/11/2002
+    //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream"]/*' />
+    public sealed class BufferedStream : Stream {
+        private Stream _s;         // Underlying stream.  Close sets _s to null.
+        private byte[] _buffer;    // Shared read/write buffer.  Alloc on first use.
+        private int _readPos;      // Read pointer within shared buffer.
+        private int _readLen;      // Number of bytes read in buffer from _s.
+        private int _writePos;     // Write pointer within shared buffer.
+        private int _bufferSize;   // Length of internal buffer, if it's allocated.
+
+
+        private const int _DefaultBufferSize = 4096;
+
+        [Microsoft.Contracts.NotDelayed]
+        private BufferedStream() {}
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.BufferedStream"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public BufferedStream(Stream stream) : this(stream, _DefaultBufferSize)
+        {
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.BufferedStream1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public BufferedStream(Stream stream, int bufferSize)
+        {
+            if (stream==null)
+                throw new ArgumentNullException("stream");
+            if (bufferSize <= 0)
+                throw new ArgumentOutOfRangeException("bufferSize", String.Format("ArgumentOutOfRange_MustBePositive", "bufferSize"));
+            Debug.Assert(!(stream is FileStream), "FileStream is buffered - don't wrap it in a BufferedStream");
+            Debug.Assert(!(stream is MemoryStream), "MemoryStream shouldn't be wrapped in a BufferedStream!");
+
+            _s = stream;
+            _bufferSize = bufferSize;
+            // Allocate _buffer on its first use - it will not be used if all reads
+            // & writes are greater than or equal to buffer size.
+            if (!_s.CanRead && !_s.CanWrite) __Error.StreamIsClosed();
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.CanRead"]/*' />
+        public override bool CanRead {
+            get { return _s != null && _s.CanRead; }
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.CanWrite"]/*' />
+        public override bool CanWrite {
+            get { return _s != null && _s.CanWrite; }
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.CanSeek"]/*' />
+        public override bool CanSeek {
+            get { return _s != null && _s.CanSeek; }
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Length"]/*' />
+        public override long Length {
+            get {
+                if (_s==null) __Error.StreamIsClosed();
+                if (_writePos > 0) FlushWrite();
+                return _s.Length;
+            }
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Position"]/*' />
+        public override long Position {
+            get {
+                if (_s==null) __Error.StreamIsClosed();
+                if (!_s.CanSeek) __Error.SeekNotSupported();
+                //              return _s.Seek(0, SeekOrigin.Current) + (_readPos + _writePos - _readLen);
+                return _s.Position + (_readPos - _readLen + _writePos);
+            }
+            set {
+                if (value < 0) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_NeedNonNegNum");
+                if (_s==null) __Error.StreamIsClosed();
+                if (!_s.CanSeek) __Error.SeekNotSupported();
+                if (_writePos > 0) FlushWrite();
+                _readPos = 0;
+                _readLen = 0;
+                _s.Seek(value, SeekOrigin.Begin);
+            }
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Close"]/*' />
+        public override void Close() {
+            if (_s != null) {
+                Flush();
+                _s.Close();
+            }
+            _s = null;
+            _buffer = null;
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Flush"]/*' />
+        public override void Flush() {
+            if (_s==null) __Error.StreamIsClosed();
+            if (_writePos > 0) {
+                FlushWrite();
+            }
+            else if (_readPos < _readLen && _s.CanSeek) {
+                FlushRead();
+            }
+        }
+
+        // Reading is done by blocks from the file, but someone could read
+        // 1 byte from the buffer then write.  At that point, the OS's file
+        // pointer is out of sync with the stream's position.  All write
+        // functions should call this function to preserve the position in the file.
+        private void FlushRead() {
+            Debug.Assert(_writePos == 0, "BufferedStream: Write buffer must be empty in FlushRead!");
+            if (_readPos - _readLen != 0)
+                _s.Seek(_readPos - _readLen, SeekOrigin.Current);
+            _readPos = 0;
+            _readLen = 0;
+        }
+
+        // Writes are buffered.  Anytime the buffer fills up
+        // (_writePos + delta > _bufferSize) or the buffer switches to reading
+        // and there is dirty data (_writePos > 0), this function must be called.
+        private void FlushWrite() {
+            Debug.Assert(_readPos == 0 && _readLen == 0, "BufferedStream: Read buffer must be empty in FlushWrite!");
+            _s.Write(_buffer, 0, _writePos);
+            _writePos = 0;
+            _s.Flush();
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Read"]/*' />
+        public override int Read([In, Out] byte[] array, int offset, int count) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Buffer");
+            if (offset < 0)
+                throw new ArgumentOutOfRangeException("offset", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - offset < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            if (_s==null) __Error.StreamIsClosed();
+
+            int n = _readLen - _readPos;
+            // if the read buffer is empty, read into either user's array or our
+            // buffer, depending on number of bytes user asked for and buffer size.
+            if (n == 0) {
+                if (!_s.CanRead) __Error.ReadNotSupported();
+                if (_writePos > 0) FlushWrite();
+                if (count >= _bufferSize) {
+                    n = _s.Read(array, offset, count);
+                    // Throw away read buffer.
+                    _readPos = 0;
+                    _readLen = 0;
+                    return n;
+                }
+                if (_buffer == null) _buffer = new byte[_bufferSize];
+                n = _s.Read(_buffer, 0, _bufferSize);
+                if (n == 0) return 0;
+                _readPos = 0;
+                _readLen = n;
+            }
+            // Now copy min of count or numBytesAvailable (ie, near EOF) to array.
+            if (n > count) n = count;
+            Buffer.BlockCopy(_buffer, _readPos, array, offset, n);
+            _readPos += n;
+            // If we hit the end of the buffer and didn't have enough bytes, we must
+            // read some more from the underlying stream.
+            if (n < count) {
+                int moreBytesRead = _s.Read(array, offset + n, count - n);
+                n += moreBytesRead;
+                _readPos = 0;
+                _readLen = 0;
+            }
+            return n;
+        }
+
+        // Reads a byte from the underlying stream.  Returns the byte cast to an int
+        // or -1 if reading from the end of the stream.
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.ReadByte"]/*' />
+        public override int ReadByte() {
+            if (_s==null) __Error.StreamIsClosed();
+            if (_readLen==0 && !_s.CanRead) __Error.ReadNotSupported();
+            if (_readPos == _readLen) {
+                if (_writePos > 0) FlushWrite();
+                if (_buffer == null) _buffer = new byte[_bufferSize];
+                _readLen = _s.Read(_buffer, 0, _bufferSize);
+                _readPos = 0;
+            }
+            if (_readPos == _readLen) return -1;
+
+            return _buffer[_readPos++];
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Write"]/*' />
+        public override void Write(byte[] array, int offset, int count) {
+            if (array == null) {
+                throw new ArgumentNullException("array", "buffer is null");
+            }
+            if (offset < 0) {
+                throw new ArgumentOutOfRangeException("offset", "negative");
+            }
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "negative");
+            }
+            if (array.Length < offset + count) {
+                throw new ArgumentException("offset+length larger than buffer");
+            }
+            if (_s == null) {
+                throw new ObjectDisposedException("Stream is closed");
+            }
+            if (_writePos == 0) {
+                if (!_s.CanWrite) {
+                    throw new NotSupportedException("Unwritable stream");
+                }
+                if (_readPos < _readLen) {
+                    FlushRead();
+                }
+            }
+            if (_writePos > 0) {
+                int numBytes = _bufferSize - _writePos;
+                if (numBytes > 0) {
+                    if (numBytes > count) {
+                        numBytes = count;
+                    }
+                    for (int i = 0; i < numBytes; i++) {
+                        _buffer[_writePos + i] = array[offset + i];
+                    }
+                    _writePos += numBytes;
+                    if (count == numBytes) {
+                        return;
+                    }
+                    offset += numBytes;
+                    count -= numBytes;
+                }
+                _s.Write(_buffer, 0, _writePos);
+                _writePos = 0;
+            }
+            if (count >= _bufferSize) {
+                _s.Write(array, offset, count);
+                return;
+            }
+            if (_buffer == null) {
+                _buffer = new byte[_bufferSize];
+            }
+            for (int i = 0; i < count; i++) {
+                _buffer[_writePos + i] = array[offset + i];
+            }
+            _writePos = count;
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.WriteByte"]/*' />
+        public override void WriteByte(byte value) {
+            if (_s==null) __Error.StreamIsClosed();
+            if (_writePos==0) {
+                if (!_s.CanWrite) __Error.WriteNotSupported();
+                if (_readPos < _readLen)
+                    FlushRead();
+                else {
+                    _readPos = 0;
+                    _readLen = 0;
+                }
+                if (_buffer==null) _buffer = new byte[_bufferSize];
+            }
+            if (_writePos == _bufferSize)
+                FlushWrite();
+
+            _buffer[_writePos++] = value;
+        }
+
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.Seek"]/*' />
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            if (_s==null) __Error.StreamIsClosed();
+            if (!_s.CanSeek) __Error.SeekNotSupported();
+            // If we've got bytes in our buffer to write, write them out.
+            // If we've read in and consumed some bytes, we'll have to adjust
+            // our seek positions ONLY IF we're seeking relative to the current
+            // position in the stream.
+            Debug.Assert(_readPos <= _readLen, "_readPos <= _readLen");
+            if (_writePos > 0) {
+                FlushWrite();
+            }
+            else if (origin == SeekOrigin.Current) {
+                // Don't call FlushRead here, which would have caused an infinite
+                // loop.  Simply adjust the seek origin.  This isn't necessary
+                // if we're seeking relative to the beginning or end of the stream.
+                Debug.Assert(_readLen - _readPos >= 0, "_readLen ("+_readLen+") - _readPos ("+_readPos+") >= 0");
+                offset -= (_readLen - _readPos);
+            }
+            /*
+              _readPos = 0;
+              _readLen = 0;
+              return _s.Seek(offset, origin);
+            */
+            long oldPos = _s.Position + (_readPos - _readLen);
+            long pos = _s.Seek(offset, origin);
+
+            // We now must update the read buffer.  We can in some cases simply
+            // update _readPos within the buffer, copy around the buffer so our
+            // Position property is still correct, and avoid having to do more
+            // reads from the disk.  Otherwise, discard the buffer's contents.
+            if (_readLen > 0) {
+                // We can optimize the following condition:
+                // oldPos - _readPos <= pos < oldPos + _readLen - _readPos
+                if (oldPos == pos) {
+                    if (_readPos > 0) {
+                        //Console.WriteLine("Seek: seeked for 0, adjusting buffer back by: "+_readPos+"  _readLen: "+_readLen);
+                        Buffer.BlockCopy(_buffer, _readPos, _buffer, 0, _readLen - _readPos);
+                        _readLen -= _readPos;
+                        _readPos = 0;
+                    }
+                    // If we still have buffered data, we must update the stream's
+                    // position so our Position property is correct.
+                    if (_readLen > 0)
+                        _s.Seek(_readLen, SeekOrigin.Current);
+                }
+                else if (oldPos - _readPos < pos && pos < oldPos + _readLen - _readPos) {
+                    int diff = (int)(pos - oldPos);
+                    //Console.WriteLine("Seek: diff was "+diff+", readpos was "+_readPos+"  adjusting buffer - shrinking by "+ (_readPos + diff));
+                    Buffer.BlockCopy(_buffer, _readPos+diff, _buffer, 0, _readLen - (_readPos + diff));
+                    _readLen -= (_readPos + diff);
+                    _readPos = 0;
+                    if (_readLen > 0)
+                        _s.Seek(_readLen, SeekOrigin.Current);
+                }
+                else {
+                    // Lose the read buffer.
+                    _readPos = 0;
+                    _readLen = 0;
+                }
+                Debug.Assert(_readLen >= 0 && _readPos <= _readLen, "_readLen should be nonnegative, and _readPos should be less than or equal _readLen");
+                Debug.Assert(pos == Position, "Seek optimization: pos != Position!  Buffer math was mangled.");
+            }
+            return pos;
+        }
+
+        //| <include file='doc\BufferedStream.uex' path='docs/doc[@for="BufferedStream.SetLength"]/*' />
+        public override void SetLength(long value) {
+            if (value < 0) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_NegFileSize");
+            if (_s==null) __Error.StreamIsClosed();
+            if (!_s.CanSeek) __Error.SeekNotSupported();
+            if (!_s.CanWrite) __Error.WriteNotSupported();
+            if (_writePos > 0) {
+                FlushWrite();
+            }
+            else if (_readPos < _readLen) {
+                FlushRead();
+            }
+            _s.SetLength(value);
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/Directory.cs b/base/Libraries/System.IO/Directory.cs
new file mode 100644
index 0000000..3d95d2a
--- /dev/null
+++ b/base/Libraries/System.IO/Directory.cs
@@ -0,0 +1,686 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Directory
+**
+**
+** Purpose: Exposes routines for enumerating through a
+** directory.
+**
+** Date:  March 5, 2000
+**        April 11,2000
+**
+===========================================================*/
+
+using System;
+using System.Collections;
+using Microsoft.Singularity;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using Microsoft.Singularity.Directory;
+
+namespace System.IO {
+    //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory"]/*' />
+    public sealed class Directory {
+        private Directory()
+        {
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetParent"]/*' />
+        public static DirectoryInfo GetParent(String path)
+        {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            if (path.Length==0)
+                throw new ArgumentException("Argument_PathEmpty", "path");
+
+            String fullPath = Path.GetFullPathInternal(path);
+
+            String s = Path.GetDirectoryName(fullPath);
+            if (s==null)
+                 return null;
+            return new DirectoryInfo(s);
+        }
+
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.CreateDirectory"]/*' />
+        public static DirectoryInfo CreateDirectory(String path) {
+            if (path==null)
+                throw new ArgumentNullException("path");
+            if (path.Length == 0)
+                throw new ArgumentException("Argument_PathEmpty");
+
+            String fullPath = Path.GetFullPathInternal(path);
+
+            // You need read access to the directory to be returned back and write access to all the directories
+            // that you need to create. If we fail any security checks we will not create any directories at all.
+            // We attempt to create directories only after all the security checks have passed. This is avoid doing
+            // a demand at every level.
+            InternalCreateDirectory(fullPath,path);
+
+            return new DirectoryInfo(fullPath, false);
+        }
+
+        internal static void InternalCreateDirectory(String! fullPath, String path) {
+            int length = fullPath.Length;
+
+            // We need to trim the trailing slash or the code will try to create 2 directories of the same name.
+            if (length >= 2 && Path.IsDirectorySeparator(fullPath[length - 1]))
+                length--;
+            int i = Path.GetRootLength(fullPath);
+
+            // For UNC paths that are only // or ///
+            if (length == 2 && Path.IsDirectorySeparator(fullPath[1]))
+                throw new IOException(String.Format("IO.IO_CannotCreateDirectory",path));
+
+            ArrayList list = new ArrayList();
+
+            while (i < length) {
+                i++;
+                while (i < length && fullPath[i] != Path.DirectorySeparatorChar && fullPath[i] != Path.AltDirectorySeparatorChar) i++;
+                String dir = fullPath.Substring(0, i);
+
+                if (!InternalExists(dir)) { // Create only the ones missing
+                    list.Add(dir);
+                }
+            }
+
+            if (list.Count != 0)
+            {
+                String [] securityList = (String[])list.ToArray(typeof(String));
+                for (int j = 0 ; j < securityList.Length; j++)
+                    securityList[j] += "\\."; // leafs will never has a slash at the end
+            }
+
+
+            // We need this check to mask OS differences
+            // Handle CreateDirectory("X:\\") when X: doesn't exist. Similarly for n/w paths.
+            String root = InternalGetDirectoryRoot(fullPath);
+            if (!InternalExists(root)) {
+                // Extract the root from the passed in path again for security.
+                __Error.WinIOError(Native.ERROR_PATH_NOT_FOUND, InternalGetDirectoryRoot(path));
+            }
+
+            bool r = true;
+            int firstError = 0;
+            // If all the security checks succeeded create all the directories
+            for (int j = 0; j < list.Count; j++)
+            {
+                String name = (String!)list[j];
+                if (name.Length > Path.MAX_DIRECTORY_PATH)
+                    throw new PathTooLongException("IO.PathTooLong");
+                r = Native.CreateDirectory(name, 0);
+                if (!r && (firstError == 0)) {
+                    firstError = Native.ERROR_PATH_EXISTS;
+                }
+            }
+
+            if (!r && (firstError != 0)) {
+                __Error.WinIOError(firstError, path);
+            }
+        }
+
+
+        // Tests if the given path refers to an existing DirectoryInfo on disk.
+        //
+        // Your application must have Read permission to the directory's
+        // contents.
+        //
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.Exists"]/*' />
+        public static bool Exists(String path) {
+            try
+            {   if (path==null)
+                    return false;
+                if (path.Length==0)
+                    return false;
+
+                // Get fully qualified file name ending in \* for security check
+
+                String fullPath = Path.GetFullPathInternal(path);
+                return InternalExists(fullPath);
+            }
+            catch(ArgumentException) {}
+            catch(NotSupportedException) {} // To deal with the fact that security can now throw this on :
+            catch(IOException) {}
+            return false;
+        }
+
+        // Determine whether path describes an existing directory
+        // on disk, avoiding security checks.
+        internal static bool InternalExists(String path) {
+            Native.FILE_ATTRIBUTE_DATA data = new Native.FILE_ATTRIBUTE_DATA();
+            int dataInitialised = File.FillAttributeInfo(path,ref data);
+            if (dataInitialised != 0)
+                return false;
+
+            return data.fileAttributes != -1 && (data.fileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY) != 0;
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.SetCreationTime"]/*' />
+        public static void SetCreationTime(String! path, DateTime creationTime)
+        {
+            SetCreationTimeUtc(path, creationTime.ToUniversalTime());
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.SetCreationTimeUtc"]/*' />
+        public static void SetCreationTimeUtc(String! path, DateTime creationTimeUtc)
+        {
+            IntPtr handle = Directory.OpenHandle(path);
+            bool r = Native.SetFileTime(handle,  new long[] {creationTimeUtc.ToFileTimeUtc()}, null, null);
+            if (!r)
+            {
+                Native.CloseHandle(handle);
+                __Error.WinIOError(1, path);
+            }
+            Native.CloseHandle(handle);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetCreationTimeUtc"]/*' />
+        public static DateTime GetCreationTimeUtc(String! path)
+        {
+            return File.GetCreationTimeUtc(path);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.SetLastWriteTimeUtc"]/*' />
+        public static void SetLastWriteTimeUtc(String! path, DateTime lastWriteTimeUtc)
+        {
+            IntPtr handle = Directory.OpenHandle(path);
+            bool r = Native.SetFileTime(handle,  null, null, new long[] {lastWriteTimeUtc.ToFileTimeUtc()});
+            if (!r)
+            {
+                Native.CloseHandle(handle);
+                __Error.WinIOError(1, path);
+            }
+            Native.CloseHandle(handle);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetLastWriteTimeUtc"]/*' />
+        public static DateTime GetLastWriteTimeUtc(String! path)
+        {
+            return File.GetLastWriteTimeUtc(path);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.SetLastAccessTimeUtc"]/*' />
+        public static void SetLastAccessTimeUtc(String! path, DateTime lastAccessTimeUtc)
+        {
+            IntPtr handle = Directory.OpenHandle(path);
+            bool r = Native.SetFileTime(handle,  null, new long[] {lastAccessTimeUtc.ToFileTimeUtc()}, null);
+            if (!r)
+            {
+                Native.CloseHandle(handle);
+                __Error.WinIOError(1, path);
+            }
+            Native.CloseHandle(handle);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetLastAccessTimeUtc"]/*' />
+        public static DateTime GetLastAccessTimeUtc(String! path)
+        {
+            return File.GetLastAccessTimeUtc(path);
+        }
+
+
+       // Returns an array of Files in the DirectoryInfo specified by path
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetFiles"]/*' />
+        public static String[] GetFiles(String path)
+        {
+            return GetFiles(path,"*");
+        }
+
+        // Returns an array of Files in the current DirectoryInfo matching the
+        // given search criteria (ie, "*.txt").
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetFiles1"]/*' />
+        public static String[] GetFiles(String path,String searchPattern)
+        {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            if (searchPattern==null)
+                throw new ArgumentNullException("searchPattern");
+
+            searchPattern = searchPattern.TrimEnd();
+            if (searchPattern.Length == 0)
+                return new String[0];
+
+            // Must fully qualify the path for the security check
+            String fullPath = Path.GetFullPathInternal(path);
+
+            String searchPath = Path.GetDirectoryName(searchPattern);
+            if (searchPath != null && searchPath != String.Empty) // For filters like foo\*.cs we need to verify if the directory foo is not denied access.
+            {
+                path = Path.Combine(path,searchPath); // Need to add the searchPath to return correct path and for right security checks
+            }
+
+            // Note - fileNames returned by InternalGetFiles are not fully qualified.
+            String [] fileNames = InternalGetFiles(fullPath, path, searchPattern);
+            for(int i=0; i<fileNames.Length; i++)
+                fileNames[i] = Path.InternalCombine(path, fileNames[i]);
+            return fileNames;
+        }
+
+        // Internal helper function with no security checks
+        // Note - fileNames returned by InternalGetFiles are not fully qualified.
+        // Path should be fully qualified.  userPath is used in exceptions.
+        internal static String[]! InternalGetFiles(String path, String userPath, String searchPattern)
+        {
+            String fullPath = Path.InternalCombine(path, searchPattern);
+            String[] fileNames = InternalGetFileDirectoryNames(fullPath, userPath, true);
+            return fileNames;
+        }
+
+        // Returns an array of Directories in the current directory.
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetDirectories"]/*' />
+        public static String[] GetDirectories(String path)
+        {
+            return GetDirectories(path,"*");
+        }
+
+        // Returns an array of Directories in the current DirectoryInfo matching the
+        // given search criteria (ie, "*.txt").
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetDirectories1"]/*' />
+        public static String[] GetDirectories(String path,String searchPattern)
+        {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            if (searchPattern==null)
+                throw new ArgumentNullException("searchPattern");
+
+            searchPattern = searchPattern.TrimEnd();
+            if (searchPattern.Length == 0)
+                return new String[0];
+
+            // Must fully qualify the path for the security check
+            String fullPath = Path.GetFullPathInternal(path);
+
+            String searchPath = Path.GetDirectoryName(searchPattern);
+            if (searchPath != null && searchPath != String.Empty) // For filters like foo\*.cs we need to verify if the directory foo is not denied access.
+            {
+                path = Path.Combine(path,searchPath); // Need to add the searchPath to return correct path and for right security checks
+            }
+
+            String [] dirNames = InternalGetDirectories(fullPath, path, searchPattern);
+            for(int i=0; i<dirNames.Length; i++)
+                dirNames[i] = Path.InternalCombine(path, dirNames[i]);
+            return dirNames;
+        }
+
+        // Internal helper function that has no security checks
+        // Note - InternalGetDirectories returns non-qualified directory names.
+        // Path should be fully qualified.  userPath is used in exceptions.
+        internal static String[]! InternalGetDirectories(String path, String userPath, String searchPattern)
+        {
+            String fullPath = Path.InternalCombine(path, searchPattern);
+            String[] dirNames = InternalGetFileDirectoryNames(fullPath, userPath, false);
+            return dirNames;
+        }
+
+
+        // Returns an array of strongly typed FileSystemInfo entries in the path
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetFileSystemEntries"]/*' />
+        public static String[] GetFileSystemEntries(String path)
+        {
+            return GetFileSystemEntries(path,"*");
+        }
+
+
+        // Returns an array of strongly typed FileSystemInfo entries in the path with the
+        // given search criteria (ie, "*.txt"). We disallow .. as a part of the search criteria
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetFileSystemEntries1"]/*' />
+        public static String[] GetFileSystemEntries(String path,String searchPattern)
+        {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            if (searchPattern==null)
+                throw new ArgumentNullException("searchPattern");
+
+            searchPattern = searchPattern.TrimEnd();
+            if (searchPattern.Length == 0)
+                return new String[0];
+
+            // Must fully qualify the path for the security check
+            String fullPath = Path.GetFullPathInternal(path);
+            String searchPath = Path.GetDirectoryName(searchPattern);
+            if (searchPath != null && searchPath != String.Empty) // For filters like foo\*.cs we need to verify if the directory foo is not denied access.
+            {
+               path = Path.Combine(path,searchPath); // Need to add the searchPath to return correct path and for right security checks
+            }
+
+            String [] dirs = InternalGetDirectories(fullPath, path, searchPattern);
+            String [] files = InternalGetFiles(fullPath, path, searchPattern);
+            String [] fileSystemEntries = new String[dirs.Length + files.Length];
+
+            int count = 0;
+            for (int i = 0;i<dirs.Length;i++)
+                fileSystemEntries[count++] = Path.InternalCombine(path, dirs[i]);
+
+            for (int i = 0;i<files.Length;i++)
+                fileSystemEntries[count++] = Path.InternalCombine(path, files[i]);
+
+            return fileSystemEntries;
+        }
+
+        // Private helper function that does not do any security checks
+        internal static String[]! InternalGetFileDirectoryNames(String! fullPath, String userPath, bool file)
+        {
+            // If path ends in a trailing slash (\), append a * or we'll
+            // get a "Cannot find the file specified" exception
+            char lastChar = fullPath[fullPath.Length-1];
+            if (lastChar == Path.DirectorySeparatorChar || lastChar == Path.AltDirectorySeparatorChar || lastChar == Path.VolumeSeparatorChar)
+                fullPath = fullPath + '*';
+
+            String[] list = new String[10];
+            int listSize = 0;
+            Native.FIND_DATA data = new Native.FIND_DATA();
+
+            // Open a Find handle (Win32 is weird)
+            IntPtr hnd = Native.FindFirstFile(fullPath, out data);
+            if (hnd == IntPtr.Zero) {
+                return new String[0];
+            }
+
+            // Keep asking for more matching files, adding file names to list
+            int numEntries = 0;  // Number of DirectoryInfo entities we see.
+            do {
+                assert data != null; // implied by result of FindFirst/Next not being Zero
+                bool includeThis;  // Should this file/DirectoryInfo be included in the output?
+                if (file)
+                    includeThis = (0==(data.dwFileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY));
+                else {
+                    includeThis = (0!=(data.dwFileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY));
+                    // Don't add "." nor ".."
+                    if (includeThis && (data.cFileName.Equals(".") || data.cFileName.Equals("..")))
+                        includeThis = false;
+                }
+
+                if (includeThis) {
+                    numEntries++;
+                    if (listSize==list.Length) {
+                        String[] newList = new String[list.Length*2];
+                        Array.Copy(list, 0, newList, 0, listSize);
+                        list = newList;
+                    }
+                    list[listSize++] = data.cFileName;
+                }
+
+            } while (Native.FindNextFile(hnd, out data));
+
+            // Make sure we quit with a sensible error.
+            Native.FindClose(hnd);  // Close Find handle in all cases.
+
+            // Check for a string such as "C:\tmp", in which case we return
+            // just the DirectoryInfo name.  FindNextFile fails first time, and
+            // data still contains a directory.
+
+            //  the above comment seems wrong. I don't see why data should still be
+            // non-null here.
+            assert data != null;
+
+            if (!file && numEntries==1 && (0!=(data.dwFileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY))) {
+                String[] sa = new String[1];
+                sa[0] = data.cFileName;
+                return sa;
+            }
+
+            // Return list of files/directories as an array of strings
+            if (listSize == list.Length)
+                return list;
+            String[] items = new String[listSize];
+            Array.Copy(list, 0, items, 0, listSize);
+            return items;
+        }
+
+        // Retrieves the names of the logical drives on this machine in the
+        // form "C:\".
+        //
+        // Your application must have System Info permission.
+        //
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetLogicalDrives"]/*' />
+        public static String[] GetLogicalDrives()
+        {
+            int drives = Native.GetLogicalDrives();
+            if (drives==0)
+                __Error.WinIOError();
+            uint d = (uint)drives;
+            int count = 0;
+            while (d != 0) {
+                if (((int)d & 1) != 0) count++;
+                d >>= 1;
+            }
+            String[] result = new String[count];
+            char[] root = new char[] {'A', ':', '\\'};
+            d = (uint)drives;
+            count = 0;
+            while (d != 0) {
+                if (((int)d & 1) != 0) {
+                    result[count++] = new String(root);
+                }
+                d >>= 1;
+                root[0]++;
+            }
+            return result;
+        }
+
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetDirectoryRoot"]/*' />
+        public static String GetDirectoryRoot(String path) {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            String fullPath = Path.GetFullPathInternal(path);
+            return fullPath.Substring(0, Path.GetRootLength(fullPath));
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.InternalGetDirectoryRoot"]/*' />
+        internal static String InternalGetDirectoryRoot(String path) {
+            if (path == null) return null;
+            return path.Substring(0, Path.GetRootLength(path));
+        }
+
+        /*===============================CurrentDirectory===============================
+        **Action:  Provides a getter and setter for the current directory.  The original
+        **         current DirectoryInfo is the one from which the process was started.
+        **Returns: The current DirectoryInfo (from the getter).  Void from the setter.
+        **Arguments: The current DirectoryInfo to which to switch to the setter.
+        **Exceptions:
+        ==============================================================================*/
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.GetCurrentDirectory"]/*' />
+        public static String GetCurrentDirectory()
+        {
+            StringBuilder sb = new StringBuilder(Path.MAX_PATH + 1);
+            if (Native.GetCurrentDirectory(sb.Capacity, sb) == 0)
+                System.IO.__Error.WinIOError();
+            String currentDirectory = sb.ToString();
+            return currentDirectory;
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.SetCurrentDirectory"]/*' />
+        public static void SetCurrentDirectory(String path)
+        {
+            if (path==null)
+                throw new ArgumentNullException("value");
+            if (path.Length==0)
+                throw new ArgumentException("Argument_PathEmpty");
+            if (path.Length >= Path.MAX_PATH)
+                throw new PathTooLongException("IO.PathTooLong");
+
+            // This will have some huge effects on the rest of the runtime
+            // and every other application.  Make sure app is highly trusted.
+            String fulldestDirName = Path.GetFullPathInternal(path);
+
+            // If path doesn't exist, this sets last error to 3 (Path not Found).
+            if (!Native.SetCurrentDirectory(fulldestDirName))
+                System.IO.__Error.WinIOError(1, path);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.Move"]/*' />
+        public static void Move(String sourceDirName,String destDirName) {
+            if (sourceDirName==null)
+                throw new ArgumentNullException("sourceDirName");
+            if (sourceDirName.Length==0)
+                throw new ArgumentException("Argument_EmptyFileName", "sourceDirName");
+
+            if (destDirName==null)
+                throw new ArgumentNullException("destDirName");
+            if (destDirName.Length==0)
+                throw new ArgumentException("Argument_EmptyFileName", "destDirName");
+
+            String fullsourceDirName = Path.GetFullPathInternal(sourceDirName);
+            String fulldestDirName = Path.GetFullPathInternal(destDirName);
+
+            String sourcePath;
+            if (fullsourceDirName.EndsWith( '\\' ))
+                sourcePath = fullsourceDirName;
+            else
+                sourcePath = fullsourceDirName + "\\";
+
+            String destPath;
+            if (fulldestDirName.EndsWith( '\\' ))
+                destPath = fulldestDirName;
+            else
+                destPath = fulldestDirName + "\\";
+
+            if (CompareInfo.Compare(sourcePath, destPath, CompareOptions.IgnoreCase) == 0)
+                throw new IOException("IO.IO_SourceDestMustBeDifferent");
+
+            String sourceRoot = Path.GetPathRoot(sourcePath);
+            String destinationRoot = Path.GetPathRoot(destPath);
+            if (CompareInfo.Compare(sourceRoot, destinationRoot, CompareOptions.IgnoreCase) != 0)
+                throw new IOException("IO.IO_SourceDestMustHaveSameRoot");
+
+            if (!Native.MoveFile(sourceDirName, destDirName))
+            {
+                __Error.WinIOError(1,String.Empty);
+            }
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.Delete"]/*' />
+        public static void Delete(String! path)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+            Delete(fullPath, path, false);
+        }
+
+        //| <include file='doc\Directory.uex' path='docs/doc[@for="Directory.Delete1"]/*' />
+        public static void Delete(String! path, bool recursive)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+            Delete(fullPath, path, recursive);
+        }
+
+        // Called from DirectoryInfo as well.  FullPath is fully qualified,
+        // while the user path is used for feedback in exceptions.
+        internal static void Delete(String fullPath, String userPath, bool recursive)
+        {
+            DeleteHelper(fullPath, userPath, recursive);
+        }
+
+        // Note that fullPath is fully qualified, while userPath may be
+        // relative.  Use userPath for all exception messages to avoid leaking
+        // fully qualified path information.
+        private static void DeleteHelper(String fullPath, String userPath, bool recursive)
+        {
+            bool r;
+            Exception ex = null;
+            ErrorCode error; 
+            
+            if (recursive) {
+                Native.FIND_DATA data = new Native.FIND_DATA();
+
+                // Open a Find handle (Win32 is weird)
+                IntPtr hnd = Native.FindFirstFile(fullPath+Path.DirectorySeparatorChar+"*", out data);
+                if (hnd == IntPtr.Zero) {
+                    __Error.WinIOError(1, userPath);
+                }
+
+                do {
+                    assert data != null; // implied by FindFirst/NextFile and return status
+                    bool isDir = (0!=(data.dwFileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY));
+                    if (isDir) {
+                        if (data.cFileName.Equals(".") || data.cFileName.Equals(".."))
+                            continue;
+
+                        // recurse
+                        String newFullPath = Path.InternalCombine(fullPath, data.cFileName);
+                        String newUserPath = Path.InternalCombine(userPath, data.cFileName);
+                        try {
+                            DeleteHelper(newFullPath, newUserPath, recursive);
+                        }
+                        catch(Exception e) {
+                            if (ex == null) {
+                                ex = e;
+                            }
+                        }
+                    }
+                    else {
+                        String fileName = fullPath + Path.DirectorySeparatorChar + data.cFileName;
+                        r = Native.DeleteFile(fileName, out error);
+                        if (!r) {
+                           // __Error.WinIOError(1, data.cFileName);
+                            __Error.SingularityIOError(error,data.cFileName); 
+                        }
+                    }
+                } while (Native.FindNextFile(hnd, out data));
+
+                // Make sure we quit with a sensible error.
+                Native.FindClose(hnd);  // Close Find handle in all cases.
+                if (ex != null)
+                    throw ex;
+            }
+
+            r = Native.RemoveDirectory(fullPath, out error);
+            if (!r)
+                //__Error.WinIOError(1, userPath);
+                __Error.SingularityIOError(error,fullPath); 
+        }
+
+
+        internal static void VerifyDriveExists(String! root)
+        {
+            int drives = Native.GetLogicalDrives();
+            if (drives==0)
+                __Error.WinIOError();
+            uint d = (uint)drives;
+            char drive = Char.ToLower(root[0]);
+            if ((d & (1 << (drive - 'a'))) == 0)
+                throw new DirectoryNotFoundException(String.Format("IO.DriveNotFound_Drive", root));
+        }
+
+
+        private static IntPtr OpenHandle(String! path)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+            String root = Path.GetPathRoot(fullPath);
+            assert root != null;
+            if (root == fullPath && root[1] == Path.VolumeSeparatorChar)
+                throw new ArgumentException("Arg_PathIsVolume");
+
+            IntPtr handle = Native.CreateFile(
+                fullPath,
+                GENERIC_WRITE,
+                FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                OPEN_EXISTING,
+                FILE_FLAG_BACKUP_SEMANTICS
+            );
+
+            if (handle == IntPtr.Zero) {
+                __Error.WinIOError(1, path);
+            }
+            return handle;
+        }
+
+        private const int FILE_ATTRIBUTE_DIRECTORY = 0x00000010;
+        private const int GENERIC_WRITE = unchecked((int)0x40000000);
+        private const int FILE_SHARE_WRITE = 0x00000002;
+        private const int FILE_SHARE_DELETE = 0x00000004;
+        private const int OPEN_EXISTING = 0x00000003;
+        private const int FILE_FLAG_BACKUP_SEMANTICS = 0x02000000;
+    }
+}
diff --git a/base/Libraries/System.IO/DirectoryInfo.cs b/base/Libraries/System.IO/DirectoryInfo.cs
new file mode 100644
index 0000000..c3fca35
--- /dev/null
+++ b/base/Libraries/System.IO/DirectoryInfo.cs
@@ -0,0 +1,378 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  DirectoryInfo
+**
+**
+** Purpose: Exposes routines for enumerating through a
+** directory.
+**
+** Date:  March 5, 2000
+**        April 11,2000
+**
+===========================================================*/
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Singularity;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Globalization;
+
+//@TODO: Add a static SystemDirectoryInfo property returning a URI
+namespace System.IO {
+    //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo"]/*' />
+    public sealed class DirectoryInfo : FileSystemInfo {
+        private DirectoryInfo() {
+        }
+
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.DirectoryInfo"]/*' />
+        public DirectoryInfo(String path)
+        {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            OriginalPath = path;
+
+            // Must fully qualify the path for the security check
+            String fullPath = Path.GetFullPathInternal(path);
+            FullPath = fullPath;
+
+        }
+
+        internal DirectoryInfo(String! fullPath, bool junk)
+        {
+            Debug.Assert(Path.GetRootLength(fullPath) > 0, "fullPath must be fully qualified!");
+            // Fast path when we know a DirectoryInfo exists.
+            OriginalPath = Path.GetFileName(fullPath);
+            FullPath = fullPath;
+        }
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Name"]/*' />
+        public override String Name {
+            get {
+                // FullPath might be either "c:\bar" or "c:\bar\".  Handle
+                // those cases, as well as avoiding mangling "c:\".
+                String s = FullPath;
+                if (s.Length > 3) {
+                    if (s.EndsWith(Path.DirectorySeparatorChar))
+                        s = FullPath.Substring(0, FullPath.Length - 1);
+                    return Path.GetFileName(s);
+                }
+                return FullPath;  // For rooted paths, like "c:\"
+            }
+        }
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Parent"]/*' />
+        public DirectoryInfo Parent {
+            get {
+                String parentName;
+                // FullPath might be either "c:\bar" or "c:\bar\".  Handle
+                // those cases, as well as avoiding mangling "c:\".
+                String s = FullPath;
+                if (s.Length > 3 && s.EndsWith(Path.DirectorySeparatorChar))
+                    s = FullPath.Substring(0, FullPath.Length - 1);
+                parentName = Path.GetDirectoryName(s);
+                if (parentName==null)
+                    return null;
+                DirectoryInfo dir = new DirectoryInfo(parentName,false);
+                return dir;
+            }
+        }
+
+
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.CreateSubdirectory"]/*' />
+        public DirectoryInfo CreateSubdirectory(String path) {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            String newDirs = Path.InternalCombine(FullPath, path);
+            String fullPath = Path.GetFullPathInternal(newDirs);
+
+            if (0!=String.Compare(FullPath,0,fullPath,0, FullPath.Length,true))
+                throw new ArgumentException(String.Format("Argument_InvalidSubPath",path,OriginalPath));
+
+            Directory.InternalCreateDirectory(fullPath,path);
+            return new DirectoryInfo(fullPath, false);
+        }
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Create"]/*' />
+        public void Create()
+        {
+            Directory.InternalCreateDirectory(FullPath,OriginalPath);
+        }
+
+        // Tests if the given path refers to an existing DirectoryInfo on disk.
+        //
+        // Your application must have Read permission to the directory's
+        // contents.
+        //
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Exists"]/*' />
+        public override bool Exists {
+            get
+            {
+                try
+                {
+                    if (_dataInitialised == -1)
+                        Refresh();
+                    if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                        return false;
+
+                    return _data.fileAttributes != -1 && (_data.fileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY) != 0;
+                }
+                catch(Exception)
+                {
+                    return false;
+                }
+            }
+        }
+
+
+
+
+        // Returns an array of Files in the current DirectoryInfo matching the
+        // given search criteria (ie, "*.txt").
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.GetFiles"]/*' />
+        public FileInfo[] GetFiles(String searchPattern)
+        {
+            if (searchPattern==null)
+                throw new ArgumentNullException("searchPattern");
+
+            searchPattern = searchPattern.TrimEnd();
+            if (searchPattern.Length == 0)
+                return new FileInfo[0];
+
+            String path = FullPath;
+
+            String searchPath = Path.GetDirectoryName(searchPattern);
+
+            if (searchPath != null && searchPath != String.Empty) // For filters like foo\*.cs we need to verify if the directory foo is not denied access.
+            {
+                path = Path.Combine(path,searchPath);
+            }
+
+            String[] fileNames = Directory.InternalGetFiles(FullPath, OriginalPath, searchPattern);
+            for (int i = 0; i < fileNames.Length; i++)
+                fileNames[i] = Path.InternalCombine(path, fileNames[i]);
+            FileInfo[] files = new FileInfo[fileNames.Length];
+            for(int i=0; i<fileNames.Length; i++)
+                files[i] = new FileInfo((!)fileNames[i], false);
+            return files;
+        }
+
+
+
+       // Returns an array of Files in the DirectoryInfo specified by path
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.GetFiles1"]/*' />
+        public FileInfo[] GetFiles()
+        {
+            return GetFiles("*");
+        }
+
+
+
+
+        // Returns an array of Directories in the current directory.
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.GetDirectories"]/*' />
+        public DirectoryInfo[] GetDirectories()
+        {
+            return GetDirectories("*");
+        }
+
+
+
+
+
+
+        // Returns an array of strongly typed FileSystemInfo entries in the path with the
+        // given search criteria (ie, "*.txt").
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.GetFileSystemInfos"]/*' />
+        public FileSystemInfo[] GetFileSystemInfos(String searchPattern)
+        {
+            if (searchPattern==null)
+                throw new ArgumentNullException("searchPattern");
+
+            searchPattern = searchPattern.TrimEnd();
+            if (searchPattern.Length == 0)
+                return new FileSystemInfo[0];
+
+            String path = FullPath;
+
+            String searchPath = Path.GetDirectoryName(searchPattern);
+            if (searchPath != null && searchPath != String.Empty) // For filters like foo\*.cs we need to verify if the directory foo is not denied access.
+            {
+                path = Path.Combine(path,searchPath);
+            }
+
+            String [] dirNames = Directory.InternalGetDirectories(FullPath, OriginalPath, searchPattern);
+            String [] fileNames = Directory.InternalGetFiles(FullPath, OriginalPath, searchPattern);
+            FileSystemInfo [] fileSystemEntries = new FileSystemInfo[dirNames.Length + fileNames.Length];
+            String[] permissionNames = new String[dirNames.Length];
+
+            for (int i = 0;i<dirNames.Length;i++) {
+                dirNames[i] = Path.InternalCombine(path, dirNames[i]);
+                permissionNames[i] = dirNames[i] +  "\\.";
+            }
+
+            for (int i = 0;i<fileNames.Length;i++)
+                fileNames[i] = Path.InternalCombine(path, fileNames[i]);
+
+            int count = 0;
+            for (int i = 0;i<dirNames.Length;i++)
+                fileSystemEntries[count++] = new DirectoryInfo((!)dirNames[i], false);
+
+            for (int i = 0;i<fileNames.Length;i++)
+                fileSystemEntries[count++] = new FileInfo((!)fileNames[i], false);
+
+            return fileSystemEntries;
+        }
+
+
+
+        // Returns an array of strongly typed FileSystemInfo entries which will contain a listing
+        // of all the files and directories.
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.GetFileSystemInfos1"]/*' />
+        public FileSystemInfo[] GetFileSystemInfos()
+        {
+           return GetFileSystemInfos("*");
+        }
+
+        // Returns an array of Directories in the current DirectoryInfo matching the
+        // given search criteria (ie, "System*" could match the System & System32
+        // directories).
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.GetDirectories1"]/*' />
+        public DirectoryInfo[] GetDirectories(String searchPattern)
+        {
+            if (searchPattern==null)
+                throw new ArgumentNullException("searchPattern");
+
+            searchPattern = searchPattern.TrimEnd();
+            if (searchPattern.Length == 0)
+                return new DirectoryInfo[0];
+
+            String path = FullPath;
+
+            String searchPath = Path.GetDirectoryName(searchPattern);
+            if (searchPath != null && searchPath != String.Empty) // For filters like foo\*.cs we need to verify if the directory foo is not denied access.
+            {
+                path = Path.Combine(path,searchPath);
+            }
+
+            String fullPath = Path.InternalCombine(FullPath, searchPattern);
+
+            String[] dirNames = Directory.InternalGetFileDirectoryNames(fullPath, OriginalPath, false);
+            String[] permissionNames = new String[dirNames.Length];
+            for (int i = 0; i<dirNames.Length; i++) {
+                dirNames[i] = Path.InternalCombine(path, dirNames[i]);
+                permissionNames[i] = dirNames[i] + "\\."; // these will never have a slash at end
+            }
+            DirectoryInfo[] dirs = new DirectoryInfo[dirNames.Length];
+            for(int i=0; i<dirNames.Length; i++)
+                dirs[i] = new DirectoryInfo((!)dirNames[i], false);
+            return dirs;
+        }
+
+
+
+
+
+        // Returns the root portion of the given path. The resulting string
+        // consists of those rightmost characters of the path that constitute the
+        // root of the path. Possible patterns for the resulting string are: An
+        // empty string (a relative path on the current drive), "\" (an absolute
+        // path on the current drive), "X:" (a relative path on a given drive,
+        // where X is the drive letter), "X:\" (an absolute path on a given drive),
+        // and "\\server\share" (a UNC path for a given server and share name).
+        // The resulting string is null if path is null.
+        //
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Root"]/*' />
+        public DirectoryInfo Root {
+            get
+            {
+                int rootLength = Path.GetRootLength(FullPath);
+                String rootPath = FullPath.Substring(0, rootLength);
+                return new DirectoryInfo(rootPath);
+            }
+        }
+
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.MoveTo"]/*' />
+        public void MoveTo(String destDirName) {
+            if (destDirName==null)
+                throw new ArgumentNullException("destDirName");
+            if (destDirName.Length==0)
+                throw new ArgumentException("Argument_EmptyFileName", "destDirName");
+
+            String fullDestDirName = Path.GetFullPathInternal(destDirName);
+            if (!fullDestDirName.EndsWith( '\\'))
+                fullDestDirName = fullDestDirName + "\\";
+
+            String fullSourcePath;
+            if (FullPath.EndsWith( '\\' ))
+                fullSourcePath = FullPath;
+            else
+                fullSourcePath = FullPath + "\\";
+
+            if (CompareInfo.Compare(fullSourcePath, fullDestDirName, CompareOptions.IgnoreCase) == 0)
+                throw new IOException("IO.IO_SourceDestMustBeDifferent");
+
+            String sourceRoot = Path.GetPathRoot(fullSourcePath);
+            String destinationRoot = Path.GetPathRoot(fullDestDirName);
+
+            if (CompareInfo.Compare(sourceRoot, destinationRoot, CompareOptions.IgnoreCase) != 0)
+                throw new IOException("IO.IO_SourceDestMustHaveSameRoot");
+
+            if (!Native.MoveFile(FullPath, destDirName))
+            {
+                __Error.WinIOError(Native.ERROR_PATH_NOT_FOUND, OriginalPath);
+            }
+            FullPath = fullDestDirName;
+            OriginalPath = destDirName;
+
+            // Flush any cached information about the directory.
+            _dataInitialised = -1;
+        }
+
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Delete"]/*' />
+        public override void Delete()
+        {
+            Directory.Delete(FullPath, OriginalPath, false);
+        }
+
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.Delete1"]/*' />
+        public void Delete(bool recursive)
+        {
+            Directory.Delete(FullPath, OriginalPath, recursive);
+        }
+
+
+
+
+
+        // Returns the fully qualified path
+        //| <include file='doc\DirectoryInfo.uex' path='docs/doc[@for="DirectoryInfo.ToString"]/*' />
+#if false
+        public override String ToString()
+        {
+            return OriginalPath;
+        }
+#endif
+
+
+        // Constants defined in WINBASE.H
+        private const int GetFileExInfoStandard = 0;
+
+        // Defined in WinError.h
+        private const int ERROR_SUCCESS = 0;
+    }
+
+}
diff --git a/base/Libraries/System.IO/DirectoryNotFoundException.cs b/base/Libraries/System.IO/DirectoryNotFoundException.cs
new file mode 100644
index 0000000..8a5b0fe
--- /dev/null
+++ b/base/Libraries/System.IO/DirectoryNotFoundException.cs
@@ -0,0 +1,41 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  DirectoryNotFoundException
+**
+**
+** Purpose: Exception for accessing a path that doesn't exist.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+using System;
+
+namespace System.IO {
+    /*
+     * Thrown when trying to access a file that doesn't exist on disk.
+     * Note this is thrown for 2 HRESULTS: The Win32 errorcode-as-HRESULT
+     * ERROR_PATH_NOT_FOUND (0x80070003) and STG_E_PATHNOTFOUND (0x80030003).
+     */
+    //| <include file='doc\DirectoryNotFoundException.uex' path='docs/doc[@for="DirectoryNotFoundException"]/*' />
+    public class DirectoryNotFoundException : IOException {
+        //| <include file='doc\DirectoryNotFoundException.uex' path='docs/doc[@for="DirectoryNotFoundException.DirectoryNotFoundException"]/*' />
+        public DirectoryNotFoundException()
+            : base("Arg_DirectoryNotFoundException") {
+        }
+
+        //| <include file='doc\DirectoryNotFoundException.uex' path='docs/doc[@for="DirectoryNotFoundException.DirectoryNotFoundException1"]/*' />
+        public DirectoryNotFoundException(String message)
+            : base(message) {
+        }
+
+        //| <include file='doc\DirectoryNotFoundException.uex' path='docs/doc[@for="DirectoryNotFoundException.DirectoryNotFoundException2"]/*' />
+        public DirectoryNotFoundException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/EndOfStreamException.cs b/base/Libraries/System.IO/EndOfStreamException.cs
new file mode 100644
index 0000000..6487bcd
--- /dev/null
+++ b/base/Libraries/System.IO/EndOfStreamException.cs
@@ -0,0 +1,38 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  EndOfStreamException
+**
+**
+** Purpose: Exception to be thrown when reading past end-of-file.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+    //| <include file='doc\EndOfStreamException.uex' path='docs/doc[@for="EndOfStreamException"]/*' />
+    public class EndOfStreamException : IOException
+    {
+        //| <include file='doc\EndOfStreamException.uex' path='docs/doc[@for="EndOfStreamException.EndOfStreamException"]/*' />
+        public EndOfStreamException()
+            : base("Arg_EndOfStreamException") {
+        }
+
+        //| <include file='doc\EndOfStreamException.uex' path='docs/doc[@for="EndOfStreamException.EndOfStreamException1"]/*' />
+        public EndOfStreamException(String message)
+            : base(message) {
+        }
+
+        //| <include file='doc\EndOfStreamException.uex' path='docs/doc[@for="EndOfStreamException.EndOfStreamException2"]/*' />
+        public EndOfStreamException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/File.cs b/base/Libraries/System.IO/File.cs
new file mode 100644
index 0000000..c393d25
--- /dev/null
+++ b/base/Libraries/System.IO/File.cs
@@ -0,0 +1,401 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  File
+**
+**
+** Purpose: A collection of methods for manipulating Files.
+**
+** Date:  February 22, 2000
+**        April 09,2000 (some design refactorization)
+**
+===========================================================*/
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using FileSystem.Utils;
+using Microsoft.Singularity.Directory;
+
+namespace System.IO {
+    // Class for creating FileStream objects, and some basic file management
+    // routines such as Delete, etc.
+    //| <include file='doc\File.uex' path='docs/doc[@for="File"]/*' />
+    public sealed class File
+    {
+        private const int GetFileExInfoStandard = 0;
+
+        private File()
+        {
+        }
+
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.OpenText"]/*' />
+        public static StreamReader OpenText(String path)
+        {
+            if (path == null)
+                throw new ArgumentNullException("path");
+            return new StreamReader(path);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.CreateText"]/*' />
+        public static StreamWriter CreateText(String path)
+        {
+            if (path == null)
+                throw new ArgumentNullException("path");
+            return new StreamWriter(path,false);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.AppendText"]/*' />
+        public static StreamWriter AppendText(String path)
+        {
+            if (path == null)
+                throw new ArgumentNullException("path");
+            return new StreamWriter(path,true);
+        }
+
+
+        // Copies an existing file to a new file. An exception is raised if the
+        // destination file already exists. Use the
+        // Copy(String, String, boolean) method to allow
+        // overwriting an existing file.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Copy"]/*' />
+        public static void Copy(String sourceFileName, String destFileName) {
+            Copy(sourceFileName, destFileName, false);
+        }
+
+        // Copies an existing file to a new file. If overwrite is
+        // false, then an IOException is thrown if the destination file
+        // already exists.  If overwrite is true, the file is
+        // overwritten.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Copy1"]/*' />
+        public static void Copy(String sourceFileName, String destFileName, bool overwrite) {
+            InternalCopy(sourceFileName, destFileName,overwrite);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.InternalCopy"]/*' />
+        /// <devdoc>
+        ///    Note: This returns the fully qualified name of the destination file.
+        /// </devdoc>
+        internal static String! InternalCopy(String sourceFileName, String destFileName, bool overwrite) {
+            if (sourceFileName==null || destFileName==null)
+                throw new ArgumentNullException((sourceFileName==null ? "sourceFileName" : "destFileName"), "ArgumentNull_FileName");
+            if (sourceFileName.Length==0 || destFileName.Length==0)
+                throw new ArgumentException("Argument_EmptyFileName", (sourceFileName.Length==0 ? "sourceFileName" : "destFileName"));
+
+            String fullSourceFileName = Path.GetFullPathInternal(sourceFileName);
+            String fullDestFileName = Path.GetFullPathInternal(destFileName);
+
+            bool r = Native.CopyFile(fullSourceFileName, fullDestFileName, !overwrite);
+            if (!r) {
+                __Error.WinIOError(0, destFileName);
+            }
+
+            return fullDestFileName;
+        }
+
+
+        // Creates a file in a particular path.  If the file exists, it is replaced.
+        // The file is opened with ReadWrite accessand cannot be opened by another
+        // application until it has been closed.  An IOException is thrown if the
+        // directory specified doesn't exist.
+        //
+        // Your application must have Create, Read, and Write permissions to
+        // the file.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Create"]/*' />
+        public static FileStream Create(String path) {
+            return Create(path, FileStream.DefaultBufferSize);
+        }
+
+        // Creates a file in a particular path.  If the file exists, it is replaced.
+        // The file is opened with ReadWrite access and cannot be opened by another
+        // application until it has been closed.  An IOException is thrown if the
+        // directory specified doesn't exist.
+        //
+        // Your application must have Create, Read, and Write permissions to
+        // the file.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Create1"]/*' />
+        public static FileStream Create(String path, int bufferSize) {
+            return new FileStream(path, FileMode.Create, FileAccess.ReadWrite,
+                                  FileShare.None, bufferSize);
+        }
+
+        // Deletes a file. The file specified by the designated path is deleted.
+        // If the file does not exist, Delete succeeds without throwing
+        // an exception.
+        //
+        // On NT, Delete will fail for a file that is open for normal I/O
+        // or a file that is memory mapped.
+        //
+        // Your application must have Delete permission to the target file.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Delete"]/*' />
+        public static void Delete(String path) {
+            if (path==null)
+                throw new ArgumentNullException("path");
+
+            String fullPath = Path.GetFullPathInternal(path);
+            ErrorCode error;
+            bool r = Native.DeleteFile(fullPath, out error);
+            if (!r) {
+                //int err =  __Error.ErrorCodeToWin32Error(error);
+                //__Error.WinIOError(err, path);
+                __Error.SingularityIOError(error,path);
+            }
+        }
+
+        // Tests if a file exists. The result is true if the file
+        // given by the specified path exists; otherwise, the result is
+        // false.  Note that if path describes a directory,
+        // Exists will return true.
+        //
+        // Your application must have Read permission for the target directory.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Exists"]/*' />
+        public static bool Exists(String! path)
+        {
+            DirectoryServiceContract.Imp dsRoot = DirectoryService.NewClientEndpoint();
+            if (dsRoot == null) throw new Exception("No directory service endpoint.");
+            bool ok = Exists(dsRoot, path);
+            delete dsRoot;
+            return ok;
+        }
+
+        public static bool Exists(DirectoryServiceContract.Imp:Ready! dsRoot, String! path) {
+        try
+            {
+                path = Path.GetFullPathInternal(path);
+                if (path==null)
+                    return false;
+                if (path.Length==0)
+                    return false;
+                return FileUtils.FileExists(dsRoot, (!)path);
+            }
+            catch(ArgumentException) {}
+            catch(NotSupportedException) {} // To deal with the fact that security can now throw this on :
+            catch(IOException) {}
+            return false;
+        }
+
+        internal static bool InternalExists(String path) {
+            Native.FILE_ATTRIBUTE_DATA data = new Native.FILE_ATTRIBUTE_DATA();
+            int dataInitialised = FillAttributeInfo(path,ref data);
+            if (dataInitialised != 0)
+                return false;
+
+            return (data.fileAttributes  & Native.FILE_ATTRIBUTE_DIRECTORY) == 0;
+        }
+
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Open"]/*' />
+        public static FileStream Open(String path,FileMode mode) {
+            return Open(path, mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.None);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Open1"]/*' />
+        public static FileStream Open(String path,FileMode mode, FileAccess access) {
+            return Open(path,mode, access, FileShare.None);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Open2"]/*' />
+        public static FileStream Open(String path, FileMode mode, FileAccess access, FileShare share) {
+            return new FileStream(path, mode, access, share);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.SetCreationTime"]/*' />
+        public static void SetCreationTime(String path, DateTime creationTime)
+        {
+            SetCreationTimeUtc(path, creationTime.ToUniversalTime());
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.SetCreationTimeUtc"]/*' />
+        public static void SetCreationTimeUtc(String path, DateTime creationTimeUtc)
+        {
+            IntPtr handle = IntPtr.Zero;
+            FileStream fs = OpenFile(path, FileAccess.Write, ref handle);
+
+            bool r = Native.SetFileTime(handle,  new long[] {creationTimeUtc.ToFileTimeUtc()}, null, null);
+            if (!r)
+            {
+                 fs.Close();
+                __Error.WinIOError(0, path);
+            }
+            fs.Close();
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.GetCreationTimeUtc"]/*' />
+        public static DateTime GetCreationTimeUtc(String! path)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+
+            Native.FILE_ATTRIBUTE_DATA data = new Native.FILE_ATTRIBUTE_DATA();
+            int dataInitialised = FillAttributeInfo(fullPath,ref data);
+            if (dataInitialised != 0)
+                __Error.WinIOError(dataInitialised, path);
+
+            if (data.fileAttributes == -1)
+                throw new IOException(String.Format("IO.PathNotFound_Path", path));
+
+            return DateTime.FromFileTimeUtc(data.ftCreationTime);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.SetLastAccessTimeUtc"]/*' />
+        public static void SetLastAccessTimeUtc(String path, DateTime lastAccessTimeUtc)
+        {
+            IntPtr handle = IntPtr.Zero;
+            FileStream fs = OpenFile(path, FileAccess.Write, ref handle);
+
+            bool r = Native.SetFileTime(handle, null, new long[] {lastAccessTimeUtc.ToFileTimeUtc()},  null);
+            if (!r)
+            {
+                 fs.Close();
+                __Error.WinIOError(0, path);
+            }
+
+            fs.Close();
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.GetLastAccessTimeUtc"]/*' />
+        public static DateTime GetLastAccessTimeUtc(String! path)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+
+            Native.FILE_ATTRIBUTE_DATA data = new Native.FILE_ATTRIBUTE_DATA();
+            int dataInitialised = FillAttributeInfo(fullPath,ref data);
+            if (dataInitialised != 0)
+                __Error.WinIOError(dataInitialised, path);
+
+            if (data.fileAttributes == -1)
+                throw new IOException(String.Format("IO.PathNotFound_Path", path));
+
+            return DateTime.FromFileTimeUtc(data.ftLastAccessTime);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.SetLastWriteTimeUtc"]/*' />
+        public static void SetLastWriteTimeUtc(String path, DateTime lastWriteTimeUtc)
+        {
+            IntPtr handle = IntPtr.Zero;
+            FileStream fs = OpenFile(path, FileAccess.Write, ref handle);
+
+            bool r = Native.SetFileTime(handle, null, null, new long[] {lastWriteTimeUtc.ToFileTimeUtc()});
+            if (!r)
+            {
+                 fs.Close();
+                __Error.WinIOError(0, path);
+            }
+            fs.Close();
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.GetLastWriteTimeUtc"]/*' />
+        public static DateTime GetLastWriteTimeUtc(String! path)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+
+            Native.FILE_ATTRIBUTE_DATA data = new Native.FILE_ATTRIBUTE_DATA();
+            int dataInitialised = FillAttributeInfo(fullPath,ref data);
+            if (dataInitialised != 0)
+                __Error.WinIOError(dataInitialised, path);
+
+            if (data.fileAttributes == -1)
+                throw new IOException(String.Format("IO.PathNotFound_Path", path));
+
+            return DateTime.FromFileTimeUtc(data.ftLastWriteTime);
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.GetAttributes"]/*' />
+        public static FileAttributes GetAttributes(String! path)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+
+            Native.FILE_ATTRIBUTE_DATA data = new Native.FILE_ATTRIBUTE_DATA();
+            int dataInitialised = FillAttributeInfo(fullPath,ref data);
+            if (dataInitialised != 0)
+                __Error.WinIOError(dataInitialised, path);
+
+            if (data.fileAttributes == -1)
+                __Error.WinIOError(Native.ERROR_FILE_NOT_FOUND, path);
+
+            return (FileAttributes) data.fileAttributes;
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.SetAttributes"]/*' />
+        public static void SetAttributes(String! path,FileAttributes fileAttributes)
+        {
+            String fullPath = Path.GetFullPathInternal(path);
+            bool r = Native.SetFileAttributes(fullPath, (int) fileAttributes);
+            if (!r) {
+                 __Error.WinIOError(0, path);
+            }
+        }
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.OpenRead"]/*' />
+        public static FileStream OpenRead(String path) {
+            return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+        }
+
+
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.OpenWrite"]/*' />
+        public static FileStream OpenWrite(String path) {
+            return new FileStream(path, FileMode.OpenOrCreate,
+                                  FileAccess.Write, FileShare.None);
+        }
+
+
+
+        // Moves a specified file to a new location and potentially a new file name.
+        // This method does work across volumes.
+        //
+        //| <include file='doc\File.uex' path='docs/doc[@for="File.Move"]/*' />
+        public static void Move(String sourceFileName, String destFileName) {
+            if (sourceFileName==null || destFileName==null)
+                throw new ArgumentNullException((sourceFileName==null ? "sourceFileName" : "destFileName"), "ArgumentNull_FileName");
+            if (sourceFileName.Length==0 || destFileName.Length==0)
+                throw new ArgumentException("Argument_EmptyFileName", (sourceFileName.Length==0 ? "sourceFileName" : "destFileName"));
+
+            String fullSourceFileName = Path.GetFullPathInternal(sourceFileName);
+            String fullDestFileName = Path.GetFullPathInternal(destFileName);
+
+            if (!InternalExists(fullSourceFileName))
+                __Error.WinIOError(Native.ERROR_FILE_NOT_FOUND,sourceFileName);
+
+            if (!Native.MoveFile(fullSourceFileName, fullDestFileName))
+            {
+                __Error.WinIOError(0, destFileName);
+            }
+        }
+
+        internal static int FillAttributeInfo(String path, ref Native.FILE_ATTRIBUTE_DATA data)
+        {
+            int dataInitialised = 0;
+
+            // For floppy drives, normally the OS will pop up a dialog saying
+            // there is no disk in drive A:, please insert one.  We don't want that.
+            bool success = Native.GetFileAttributesEx(path, GetFileExInfoStandard, ref data);
+
+            if (!success) {
+                data.fileAttributes = -1;
+                dataInitialised = 0;
+            }
+            return dataInitialised;
+        }
+
+        private static FileStream! OpenFile(String path, FileAccess access, ref IntPtr handle)
+        {
+            return new FileStream(path, FileMode.Open, access, FileShare.ReadWrite, 1);
+        }
+
+
+         // Defined in WinError.h
+        private const int ERROR_INVALID_PARAMETER = 87;
+        private const int ERROR_ACCESS_DENIED = 0x5;
+
+    }
+}
diff --git a/base/Libraries/System.IO/FileAccess.cs b/base/Libraries/System.IO/FileAccess.cs
new file mode 100644
index 0000000..bb5192c
--- /dev/null
+++ b/base/Libraries/System.IO/FileAccess.cs
@@ -0,0 +1,44 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Enum:   FileAccess
+**
+**
+** Purpose: Enum describing whether you want read and/or write
+** permission to a file.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+    // Contains constants for specifying the access you want for a file.
+    // You can have Read, Write or ReadWrite access.
+    //
+    //| <include file='doc\FileAccess.uex' path='docs/doc[@for="FileAccess"]/*' />
+    [Flags]
+    public enum FileAccess
+    {
+        // Specifies read access to the file. Data can be read from the file and
+        // the file pointer can be moved. Combine with WRITE for read-write access.
+        //| <include file='doc\FileAccess.uex' path='docs/doc[@for="FileAccess.Read"]/*' />
+        Read = 1,
+
+        // Specifies write access to the file. Data can be written to the file and
+        // the file pointer can be moved. Combine with READ for read-write access.
+        //| <include file='doc\FileAccess.uex' path='docs/doc[@for="FileAccess.Write"]/*' />
+        Write = 2,
+
+        // Specifies read and write access to the file. Data can be written to the
+        // file and the file pointer can be moved. Data can also be read from the
+        // file.
+        //| <include file='doc\FileAccess.uex' path='docs/doc[@for="FileAccess.ReadWrite"]/*' />
+        ReadWrite = 3,
+    }
+}
diff --git a/base/Libraries/System.IO/FileAttributes.cs b/base/Libraries/System.IO/FileAttributes.cs
new file mode 100644
index 0000000..b0e61d5
--- /dev/null
+++ b/base/Libraries/System.IO/FileAttributes.cs
@@ -0,0 +1,56 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  FileAttributes
+**
+**
+** Purpose: File attribute flags corresponding to NT's flags.
+**
+** Date:   February 16, 1999
+**
+===========================================================*/
+using System;
+
+namespace System.IO {
+    // File attributes for use with the FileEnumerator class.
+    // These constants correspond to the constants in WinNT.h.
+    //
+    //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes"]/*' />
+    [Flags]
+    public enum FileAttributes
+    {
+        // From WinNT.h (FILE_ATTRIBUTE_XXX)
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.ReadOnly"]/*' />
+        ReadOnly = 0x1,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Hidden"]/*' />
+        Hidden = 0x2,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.System"]/*' />
+        System = 0x4,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Directory"]/*' />
+        Directory = 0x10,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Archive"]/*' />
+        Archive = 0x20,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Device"]/*' />
+        Device = 0x40,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Normal"]/*' />
+        Normal = 0x80,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Temporary"]/*' />
+        Temporary = 0x100,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.SparseFile"]/*' />
+        SparseFile = 0x200,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.ReparsePoint"]/*' />
+        ReparsePoint = 0x400,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Compressed"]/*' />
+        Compressed = 0x800,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Offline"]/*' />
+        Offline = 0x1000,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.NotContentIndexed"]/*' />
+        NotContentIndexed = 0x2000,
+        //| <include file='doc\FileAttributes.uex' path='docs/doc[@for="FileAttributes.Encrypted"]/*' />
+        Encrypted = 0x4000,
+    }
+}
diff --git a/base/Libraries/System.IO/FileInfo.cs b/base/Libraries/System.IO/FileInfo.cs
new file mode 100644
index 0000000..1b547c8
--- /dev/null
+++ b/base/Libraries/System.IO/FileInfo.cs
@@ -0,0 +1,279 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  File
+**
+**
+** Purpose: A collection of methods for manipulating Files.
+**
+** Date:  February 22, 2000
+**        April 09,2000 (some design refactorization)
+**
+===========================================================*/
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Singularity.Directory;
+
+namespace System.IO {
+    // Class for creating FileStream objects, and some basic file management
+    // routines such as Delete, etc.
+    //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo"]/*' />
+    public sealed class FileInfo: FileSystemInfo
+    {
+        private String _name;
+
+        [Microsoft.Contracts.NotDelayed]
+        private FileInfo() {
+        }
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.FileInfo"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileInfo(String fileName)
+        {
+            if (fileName==null)
+                 throw new ArgumentNullException("fileName");
+
+            OriginalPath = fileName;
+            // Must fully qualify the path for the security check
+            String fullPath = Path.GetFullPathInternal(fileName);
+
+            _name = Path.GetFileName(fileName);
+            FullPath = fullPath;
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        internal FileInfo(String! fullPath, bool ignoreThis)
+        {
+            Debug.Assert(Path.GetRootLength(fullPath) > 0, "fullPath must be fully qualified!");
+            _name = Path.GetFileName(fullPath);
+            OriginalPath = _name;
+            FullPath = fullPath;
+        }
+
+            //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Name"]/*' />
+        public override String Name {
+            get { return _name; }
+        }
+
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Length"]/*' />
+        public long Length {
+            get {
+                if (_dataInitialised == -1)
+                    Refresh();
+
+                if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                    __Error.WinIOError(_dataInitialised, OriginalPath);
+
+                if ((_data.fileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY) != 0)
+                    __Error.WinIOError(Native.ERROR_FILE_NOT_FOUND,OriginalPath);
+
+                return _data.fileSize;
+            }
+        }
+
+        /* Returns the name of the directory that the file is in */
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.DirectoryName"]/*' />
+        public String DirectoryName
+        {
+            get
+            {
+                String directoryName = Path.GetDirectoryName(FullPath);
+                return directoryName;
+            }
+        }
+
+        /* Creates an instance of the the parent directory */
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Directory"]/*' />
+        public DirectoryInfo Directory
+        {
+            get
+            {
+                String dirName = DirectoryName;
+                if (dirName == null)
+                    return null;
+                return new DirectoryInfo(dirName);
+            }
+        }
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.OpenText"]/*' />
+        public StreamReader OpenText()
+        {
+            return new StreamReader(FullPath, Encoding.UTF8, true, StreamReader.DefaultBufferSize);
+        }
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.CreateText"]/*' />
+        public StreamWriter CreateText()
+        {
+            return new StreamWriter(FullPath,false);
+        }
+
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.AppendText"]/*' />
+        public StreamWriter AppendText()
+        {
+            return new StreamWriter(FullPath,true);
+        }
+
+
+        // Copies an existing file to a new file. An exception is raised if the
+        // destination file already exists. Use the
+        // Copy(String, String, boolean) method to allow
+        // overwriting an existing file.
+        //
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.CopyTo"]/*' />
+        public FileInfo CopyTo(String! destFileName) {
+            return CopyTo(destFileName, false);
+        }
+
+    //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Create"]/*' />
+
+        public FileStream Create() {
+            return File.Create(FullPath);
+        }
+
+        // Copies an existing file to a new file. If overwrite is
+        // false, then an IOException is thrown if the destination file
+        // already exists.  If overwrite is true, the file is
+        // overwritten.
+        //
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.CopyTo1"]/*' />
+        public FileInfo CopyTo(String! destFileName, bool overwrite) {
+            destFileName = File.InternalCopy(FullPath, destFileName, overwrite);
+            return new FileInfo(destFileName, false);
+        }
+
+        // Deletes a file. The file specified by the designated path is deleted.
+        // If the file does not exist, Delete succeeds without throwing
+        // an exception.
+        //
+        // On NT, Delete will fail for a file that is open for normal I/O
+        // or a file that is memory mapped.  On Win95, the file will be
+        // deleted regardless of whether the file is being used.
+        //
+        // Your application must have Delete permission to the target file.
+        //
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Delete"]/*' />
+        public override void Delete() {
+            // For security check, path should be resolved to an absolute path.
+            ErrorCode error;
+            bool r = Native.DeleteFile(FullPath, out error);
+            if (!r) {
+               // __Error.WinIOError(0, OriginalPath);
+                __Error.SingularityIOError(error,OriginalPath); 
+            }
+        }
+
+
+
+        // Tests if the given file exists. The result is true if the file
+        // given by the specified path exists; otherwise, the result is
+        // false.  Note that if path describes a directory,
+        // Exists will return true.
+        //
+        // Your application must have Read permission for the target directory.
+        //
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Exists"]/*' />
+        public override bool Exists {
+            get
+            {
+                try
+                {
+                    if (_dataInitialised == -1)
+                        Refresh();
+                    if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                        __Error.WinIOError(_dataInitialised, OriginalPath);
+
+                    return (_data.fileAttributes & Native.FILE_ATTRIBUTE_DIRECTORY) == 0;
+                }
+                catch(Exception)
+                {
+                    return false;
+                }
+            }
+        }
+
+
+
+
+        // User must explicitly specify opening a new file or appending to one.
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Open"]/*' />
+        public FileStream Open(FileMode mode) {
+            return Open(mode, FileAccess.ReadWrite, FileShare.None);
+        }
+
+
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Open1"]/*' />
+        public FileStream Open(FileMode mode, FileAccess access) {
+            return Open(mode, access, FileShare.None);
+        }
+
+
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.Open2"]/*' />
+        public FileStream Open(FileMode mode, FileAccess access, FileShare share) {
+            return new FileStream(FullPath, mode, access, share);
+        }
+
+
+
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.OpenRead"]/*' />
+        public FileStream OpenRead() {
+            return new FileStream(FullPath, FileMode.Open, FileAccess.Read,
+                                  FileShare.Read);
+        }
+
+
+
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.OpenWrite"]/*' />
+        public FileStream OpenWrite() {
+            return new FileStream(FullPath, FileMode.OpenOrCreate,
+                                  FileAccess.Write, FileShare.None);
+        }
+
+
+
+
+
+
+        // Moves a given file to a new location and potentially a new file name.
+        // This method does work across volumes.
+        //
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.MoveTo"]/*' />
+        public void MoveTo(String destFileName) {
+            if (destFileName==null)
+                throw new ArgumentNullException("destFileName");
+            if (destFileName.Length==0)
+                throw new ArgumentException("Argument_EmptyFileName", "destFileName");
+
+            String fullDestFileName = Path.GetFullPathInternal(destFileName);
+
+            if (!Native.MoveFile(FullPath, fullDestFileName))
+                __Error.WinIOError();
+            FullPath = fullDestFileName;
+            OriginalPath = destFileName;
+            _name = Path.GetFileName(fullDestFileName);
+
+            // Flush any cached information about the file.
+            _dataInitialised = -1;
+        }
+
+#if false
+        // Returns the fully qualified path
+        //| <include file='doc\FileInfo.uex' path='docs/doc[@for="FileInfo.ToString"]/*' />
+        public override String ToString()
+        {
+            return OriginalPath;
+        }
+#endif
+    }
+}
diff --git a/base/Libraries/System.IO/FileLoadException.cs b/base/Libraries/System.IO/FileLoadException.cs
new file mode 100644
index 0000000..58915cd
--- /dev/null
+++ b/base/Libraries/System.IO/FileLoadException.cs
@@ -0,0 +1,90 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  FileLoadException
+**
+**
+** Purpose: Exception for failure to load a file that was successfully found.
+**
+** Date:  February 12, 2001
+**
+===========================================================*/
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.IO {
+
+    //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException"]/*' />
+    public class FileLoadException : IOException {
+
+        private String _fileName;   // the name of the file we could not load.
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.FileLoadException"]/*' />
+        public FileLoadException()
+            : base("IO.FileLoad") {
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.FileLoadException1"]/*' />
+        public FileLoadException(String message)
+            : base(message) {
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.FileLoadException2"]/*' />
+        public FileLoadException(String message, Exception inner)
+            : base(message, inner) {
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.FileLoadException3"]/*' />
+        public FileLoadException(String message, String fileName) : base(message)
+        {
+            _fileName = fileName;
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.FileLoadException4"]/*' />
+        public FileLoadException(String message, String fileName, Exception inner)
+            : base(message, inner) {
+            _fileName = fileName;
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.Message"]/*' />
+        public override String Message
+        {
+            get {
+                String message = base.Message;
+                if (message == null) {
+                    if (_fileName == null)
+                        return "IO.FileLoad";
+                    else
+                        return "IO.FileLoad" + _fileName;
+                }
+                else {
+                    return message;
+                }
+            }
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.FileName"]/*' />
+        public String FileName {
+            get { return _fileName; }
+        }
+
+        //| <include file='doc\FileLoadException.uex' path='docs/doc[@for="FileLoadException.ToString"]/*' />
+        public override String ToString()
+        {
+            String s = GetType().FullName + ": " + Message;
+
+            if (_fileName != null && _fileName.Length != 0)
+                s += Environment.NewLine + String.Format("IO.FileName_Name", _fileName);
+
+            if (InnerException != null)
+                s = s + " ---> " + InnerException.ToString();
+
+            return s;
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/FileMode.cs b/base/Libraries/System.IO/FileMode.cs
new file mode 100644
index 0000000..d67278f
--- /dev/null
+++ b/base/Libraries/System.IO/FileMode.cs
@@ -0,0 +1,59 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Enum:   FileMode
+**
+**
+** Purpose: Enum describing whether to create a new file or
+** open an existing one.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+    // Contains constants for specifying how the OS should open a file.
+    // These will control whether you overwrite a file, open an existing
+    // file, or some combination thereof.
+    //
+    // To append to a file, use Append (which maps to OpenOrCreate then we seek
+    // to the end of the file).  To truncate a file or create it if it doesn't
+    // exist, use Create.
+    //
+    //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode"]/*' />
+    public enum FileMode
+    {
+        // Creates a new file. An exception is raised if the file already exists.
+        //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode.CreateNew"]/*' />
+        CreateNew = 1,
+
+        // Creates a new file. If the file already exists, it is overwritten.
+        //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode.Create"]/*' />
+        Create = 2,
+
+        // Opens an existing file. An exception is raised if the file does not exist.
+        //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode.Open"]/*' />
+        Open = 3,
+
+        // Opens the file if it exists. Otherwise, creates a new file.
+        //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode.OpenOrCreate"]/*' />
+        OpenOrCreate = 4,
+
+        // Opens an existing file. Once opened, the file is truncated so that its
+        // size is zero bytes. The calling process must open the file with at least
+        // WRITE access. An exception is raised if the file does not exist.
+        //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode.Truncate"]/*' />
+        Truncate = 5,
+
+        // Opens the file if it exists and seeks to the end.  Otherwise,
+        // creates a new file.
+        //| <include file='doc\FileMode.uex' path='docs/doc[@for="FileMode.Append"]/*' />
+        Append = 6,
+    }
+}
diff --git a/base/Libraries/System.IO/FileNotFoundException.cs b/base/Libraries/System.IO/FileNotFoundException.cs
new file mode 100644
index 0000000..d1937f7
--- /dev/null
+++ b/base/Libraries/System.IO/FileNotFoundException.cs
@@ -0,0 +1,90 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  FileNotFoundException
+**
+**
+** Purpose: Exception for accessing a file that doesn't exist.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+    // Thrown when trying to access a file that doesn't exist on disk.
+    //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException"]/*' />
+    public class FileNotFoundException : IOException {
+
+        private String _fileName;  // The name of the file that isn't found.
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.FileNotFoundException"]/*' />
+        public FileNotFoundException()
+            : base("IO.FileNotFound") {
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.FileNotFoundException1"]/*' />
+        public FileNotFoundException(String message)
+            : base(message) {
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.FileNotFoundException2"]/*' />
+        public FileNotFoundException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.FileNotFoundException3"]/*' />
+        public FileNotFoundException(String message, String fileName) : base(message)
+        {
+            _fileName = fileName;
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.FileNotFoundException4"]/*' />
+        public FileNotFoundException(String message, String fileName, Exception innerException)
+            : base(message, innerException) {
+            _fileName = fileName;
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.Message"]/*' />
+        public override String Message
+        {
+            get {
+                String message = base.Message;
+                if (message == null) {
+                    if (_fileName == null)
+                        return "IO.FileNotFound";
+                    else
+                        return "IO.FileNotFound" + _fileName;
+                }
+                else {
+                    return message;
+                }
+            }
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.FileName"]/*' />
+        public String FileName {
+            get { return _fileName; }
+        }
+
+        //| <include file='doc\FileNotFoundException.uex' path='docs/doc[@for="FileNotFoundException.ToString"]/*' />
+        public override String ToString()
+        {
+            String s = GetType().FullName + ": " + Message;
+
+            if (_fileName != null && _fileName.Length != 0)
+                s += Environment.NewLine + String.Format("IO.FileName_Name", _fileName);
+
+            if (InnerException != null)
+                s = s + " ---> " + InnerException.ToString();
+
+            return s;
+        }
+    }
+}
+
diff --git a/base/Libraries/System.IO/FileShare.cs b/base/Libraries/System.IO/FileShare.cs
new file mode 100644
index 0000000..68655a5
--- /dev/null
+++ b/base/Libraries/System.IO/FileShare.cs
@@ -0,0 +1,59 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Enum:   FileShare
+**
+**
+** Purpose: Enum describing how to share files with other
+** processes - ie, whether two processes can simultaneously
+** read from the same file.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+    // Contains constants for controlling file sharing options while
+    // opening files.  You can specify what access other processes trying
+    // to open the same file concurrently can have.
+    //
+    //| <include file='doc\FileShare.uex' path='docs/doc[@for="FileShare"]/*' />
+    [Flags]
+    public enum FileShare
+    {
+        // No sharing. Any request to open the file (by this process or another
+        // process) will fail until the file is closed.
+        //| <include file='doc\FileShare.uex' path='docs/doc[@for="FileShare.None"]/*' />
+        None = 0,
+
+        // Allows subsequent opening of the file for reading. If this flag is not
+        // specified, any request to open the file for reading (by this process or
+        // another process) will fail until the file is closed.
+        //| <include file='doc\FileShare.uex' path='docs/doc[@for="FileShare.Read"]/*' />
+        Read = 1,
+
+        // Allows subsequent opening of the file for writing. If this flag is not
+        // specified, any request to open the file for writing (by this process or
+        // another process) will fail until the file is closed.
+        //| <include file='doc\FileShare.uex' path='docs/doc[@for="FileShare.Write"]/*' />
+        Write = 2,
+
+        // Allows subsequent opening of the file for writing or reading. If this flag
+        // is not specified, any request to open the file for writing or reading (by
+        // this process or another process) will fail until the file is closed.
+        //| <include file='doc\FileShare.uex' path='docs/doc[@for="FileShare.ReadWrite"]/*' />
+        ReadWrite = 3,
+
+
+        // Whether the file handle should be inheritable by child processes.
+        // Note this is not directly supported like this by Win32.
+        //| <include file='doc\FileShare.uex' path='docs/doc[@for="FileShare.Inheritable"]/*' />
+        Inheritable = 0x10,
+    }
+}
diff --git a/base/Libraries/System.IO/FileStream.cs b/base/Libraries/System.IO/FileStream.cs
new file mode 100644
index 0000000..3753494
--- /dev/null
+++ b/base/Libraries/System.IO/FileStream.cs
@@ -0,0 +1,768 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  FileStream
+**
+**
+** Purpose: Exposes a Stream around a file, with full
+** synchronous and asynchronous support, and buffering.
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+#define BLACKHOLE
+
+using System;
+using Microsoft.Singularity;
+using System.Diagnostics;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.FileSystem;
+using Microsoft.Singularity.V1.Services;
+using FileSystem.Utils;
+
+/*
+ * Implementation notes:
+ *
+ * I've added buffering into FileStream as well.  I folded in the
+ * code from BufferedStream, so all the comments about it being mostly
+ * aggressive (and the possible perf improvement) apply to FileStream as
+ * well.
+ *
+ * Class Invariants:
+ * The class has one buffer, shared for reading & writing.  It can only be
+ * used for one or the other at any point in time - not both.  The following
+ * should be true:
+ *   0 <= _readPos <= _readLen < _bufferSize
+ *   0 <= _writePos < _bufferSize
+ *   _readPos == _readLen && _readPos > 0 implies the read buffer is valid,
+ *     but we're at the end of the buffer.
+ *   _readPos == _readLen == 0 means the read buffer contains garbage.
+ *   Either _writePos can be greater than 0, or _readLen & _readPos can be
+ *     greater than zero, but neither can be greater than zero at the same time.
+ *
+ *                                   -- Brian Grunkemeyer, 3/11/2002
+ */
+
+namespace System.IO {
+    //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream"]/*' />
+    public class FileStream : Stream
+    {
+        internal const int DefaultBufferSize = 4096;
+        private TRef<FileContract.Imp:Ready> _imp;
+        private byte[] _buffer;   // Shared read/write buffer.  Alloc on first use.
+        private String _fileName; // Fully qualified file name.
+        private bool _canRead;
+        private bool _canWrite;
+        private bool _canSeek;
+#if BLACKHOLE
+        private bool _isBlackHole;// Absorbs writes and gives nothing back.
+#endif
+        private int _readPos;     // Read pointer within shared buffer.
+        private int _readLen;     // Number of bytes read in buffer from file.
+        private int _writePos;    // Write pointer within shared buffer.
+        private int _bufferSize;  // Length of internal buffer, if it's allocated.
+        private long _pos;        // Cache current location in the file.
+        private long _len;
+
+        private IntPtr _handle;
+        private long _appendStart;// When appending, prevent overwriting file.
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(DirectoryServiceContract.Imp:Ready! dsRoot, String path, FileMode mode)
+            : this(dsRoot, path, mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.Read, DefaultBufferSize, Path.GetFileName(path), false) {
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(String path, FileMode mode)
+        {
+            DirectoryServiceContract.Imp dsRoot = DirectoryService.NewClientEndpoint();
+            this(dsRoot, path, mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.Read, DefaultBufferSize, Path.GetFileName(path), false);
+            delete dsRoot;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(DirectoryServiceContract.Imp:Ready! dsRoot, String path, FileMode mode, FileAccess access)
+            : this(dsRoot, path, mode, access, FileShare.Read, DefaultBufferSize, Path.GetFileName(path), false) {
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(String path, FileMode mode, FileAccess access)
+        {
+            DirectoryServiceContract.Imp dsRoot = DirectoryService.NewClientEndpoint();
+            this(dsRoot, path, mode, access, FileShare.Read, DefaultBufferSize, Path.GetFileName(path), false);
+            delete dsRoot;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream2"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(String path, FileMode mode, FileAccess access, FileShare share)
+        {
+            DirectoryServiceContract.Imp dsRoot = DirectoryService.NewClientEndpoint();
+            this(dsRoot, path, mode, access, share, DefaultBufferSize, Path.GetFileName(path), false);
+            delete dsRoot;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream3"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(String path, FileMode mode, FileAccess access, FileShare share, int bufferSize)
+        {
+            DirectoryServiceContract.Imp dsRoot = DirectoryService.NewClientEndpoint();
+            this(dsRoot, path, mode, access, share, bufferSize, Path.GetFileName(path), false);
+            delete dsRoot;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.FileStream3"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public FileStream(DirectoryServiceContract.Imp:Ready! dsRoot, String path, FileMode mode, FileAccess access, FileShare share, int bufferSize)
+            : this(dsRoot, path, mode, access, share, bufferSize, Path.GetFileName(path), false) {
+        }
+
+        [Microsoft.Contracts.NotDelayed]
+        internal FileStream(DirectoryServiceContract.Imp:Ready! dsRoot, String path, FileMode mode, FileAccess access, FileShare share, int bufferSize, String msgPath, bool bFromProxy)
+        {
+            // Note: msgPath must be safe to hand back to untrusted code.
+
+            _fileName = msgPath;  // To handle odd cases of finalizing partially constructed objects.
+
+            if (path == null)
+                throw new ArgumentNullException("path", "ArgumentNull_Path");
+            if (path.Length == 0)
+                throw new ArgumentException("Argument_EmptyPath");
+            if (mode < FileMode.CreateNew || mode > FileMode.Append ||
+                access < FileAccess.Read || access > FileAccess.ReadWrite ||
+                share < FileShare.None || share > FileShare.ReadWrite) {
+                String badArg = "mode";
+                if (access < FileAccess.Read || access > FileAccess.ReadWrite)
+                    badArg = "access";
+                if (share < FileShare.None || share > FileShare.ReadWrite)
+                    badArg = "share";
+                throw new ArgumentOutOfRangeException(badArg, "ArgumentOutOfRange_Enum");
+            }
+            if (bufferSize <= 0)
+                throw new ArgumentOutOfRangeException("bufferSize", "ArgumentOutOfRange_NeedPosNum");
+
+            path = Path.GetFullPath(path);
+#if false // uncomment to debug file access.
+            Console.WriteLine("FileStream({0})", path);
+#endif
+
+            _fileName = path;
+
+            NodeType node;
+            ErrorCode error;
+            FileUtils.GetAttributes(path, dsRoot, out _len, out node, out error);
+
+            // Build up security permissions required, as well as validate we
+            // have a sensible set of parameters.  IE, creating a brand new file
+            // for reading doesn't make much sense.
+            if ((access & FileAccess.Read) != 0) {
+                if (mode==FileMode.Append)
+                    throw new ArgumentException("Argument_InvalidAppendMode");
+            }
+
+#if BLACKHOLE
+            if (error == ErrorCode.NotFound &&
+                (access & FileAccess.Write) != 0 &&
+                path.StartsWith("/blackhole/")) {
+                // We only hand the case where attempting to write to
+                // a non-existent file, in which we create a block hole for
+                // Bartok.
+
+                _canRead = (access & FileAccess.Read) != 0;
+                _canWrite = (access & FileAccess.Write) != 0;
+                _canSeek = true;
+                _pos = 0;
+                _bufferSize = bufferSize;
+                _readPos = 0;
+                _readLen = 0;
+                _writePos = 0;
+                _appendStart = -1;
+                _isBlackHole = true;
+                return;
+            }
+#endif
+
+            // I can't think of any combos of FileMode we should disallow if we
+            // don't have read access.  Writing would pretty much always be valid
+            // in those cases.
+            if ((access & FileAccess.Write) != 0) {
+            }
+            else {
+                // No write access
+                if (mode==FileMode.Truncate || mode==FileMode.CreateNew || mode==FileMode.Create || mode==FileMode.Append)
+                    throw new ArgumentException(String.Format("Argument_InvalidFileMode&AccessCombo", mode, access));
+            }
+
+            bool seekToEnd = (mode == FileMode.Append);
+            // Must use a valid Win32 constant here...
+            if (mode == FileMode.Append)
+                mode = FileMode.OpenOrCreate;
+
+            if (mode == FileMode.CreateNew || mode == FileMode.Create) {
+                if (FileUtils.CreateFile(path) != 0) {
+#if false
+                    Console.WriteLine("FileUtils.CreateFile({0}) failed", path);
+#endif
+                    if (mode == FileMode.Create) {
+                        __Error.WinIOError(-1, _fileName);
+                        assume false; // never get here
+                    }
+                }
+            }
+
+            FileContract.Imp fi = FileUtils.OpenFile(path, dsRoot, out error);
+            if (error != ErrorCode.NoError || fi == null) {
+#if false
+                Console.WriteLine("FileUtils.OpenFile({0}, out {1})",
+                                  path, (int)error);
+#endif
+                // Return a meaningful error, using the RELATIVE path to
+                // the file to avoid returning extra information to the caller
+                // unless they have path discovery permission, in which case
+                // the full path is fine & useful.
+                __Error.WinIOError((int)error, _fileName);
+                assume false; // never get here
+            }
+
+
+            _imp = new TRef<FileContract.Imp:Ready>(fi);
+            _canRead = (access & FileAccess.Read) != 0;
+            _canWrite = (access & FileAccess.Write) != 0;
+            _canSeek = true;
+            _pos = 0;
+            _bufferSize = bufferSize;
+            _readPos = 0;
+            _readLen = 0;
+            _writePos = 0;
+
+            // For Append mode...
+            if (seekToEnd) {
+                _appendStart = SeekCore(0, SeekOrigin.End);
+            }
+            else {
+                _appendStart = -1;
+            }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.CanRead"]/*' />
+        public override bool CanRead {
+            get { return _canRead; }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.CanWrite"]/*' />
+        public override bool CanWrite {
+            get { return _canWrite; }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.CanSeek"]/*' />
+        public override bool CanSeek {
+            get { return _canSeek; }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Length"]/*' />
+        public override long Length {
+            get {
+                if (!CanSeek) __Error.SeekNotSupported();
+#if false
+                long len = 0;
+#else
+                long len = Native.GetFileSize(_handle);
+#endif
+
+                // If we're writing near the end of the file, we must include our
+                // internal buffer in our Length calculation.
+                if (_writePos > 0 && _pos + _writePos > len)
+                    len = _writePos + _pos;
+                return len;
+            }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Name"]/*' />
+        public String Name {
+            get {
+                if (_fileName == null)
+                    return "IO_UnknownFileName";
+                return _fileName;
+            }
+        }
+
+        internal String NameInternal {
+            get {
+                if (_fileName == null)
+                    return "<UnknownFileName>";
+                return _fileName;
+            }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Position"]/*' />
+        public override long Position {
+            get {
+                if (!CanSeek) __Error.SeekNotSupported();
+                Debug.Assert((_readPos==0 && _readLen==0 && _writePos >= 0) || (_writePos==0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
+
+                return _pos + (_readPos - _readLen + _writePos);
+            }
+            set {
+                if (value < 0) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_NeedNonNegNum");
+                if (_writePos > 0) FlushWrite();
+                _readPos = 0;
+                _readLen = 0;
+                Seek(value, SeekOrigin.Begin);
+            }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Close"]/*' />
+        public override void Close()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Dispose"]/*' />
+        protected virtual void Dispose(bool disposing)
+        {
+            // Nothing will be done differently based on whether we are
+            // disposing vs. finalizing.
+#if false
+            if (_handle != IntPtr.Zero) {
+                Flush();
+                _handle = IntPtr.Zero;
+            }
+#endif
+            _canRead = false;
+            _canWrite = false;
+            _canSeek = false;
+            _buffer = null;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Finalize"]/*' />
+        ~FileStream()
+        {
+#if false
+            if (_handle != IntPtr.Zero) {
+                Dispose(false);
+            }
+#endif
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Flush"]/*' />
+        public override void Flush()
+        {
+            if (_writePos > 0) {
+                FlushWrite();
+            }
+            else if (_readPos < _readLen && CanSeek) {
+                FlushRead();
+            }
+        }
+
+        // Reading is done by blocks from the file, but someone could read
+        // 1 byte from the buffer then write.  At that point, the OS's file
+        // pointer is out of sync with the stream's position.  All write
+        // functions should call this function to preserve the position in the file.
+        private void FlushRead() {
+            Debug.Assert(_writePos == 0, "FileStream: Write buffer must be empty in FlushRead!");
+            if (_readPos - _readLen != 0)
+                SeekCore(_readPos - _readLen, SeekOrigin.Current);
+            _readPos = 0;
+            _readLen = 0;
+        }
+
+        // Writes are buffered.  Anytime the buffer fills up
+        // (_writePos + delta > _bufferSize) or the buffer switches to reading
+        // and there is dirty data (_writePos > 0), this function must be called.
+        private void FlushWrite() {
+            Debug.Assert(_readPos == 0 && _readLen == 0, "FileStream: Read buffer must be empty in FlushWrite!");
+            WriteCore(_buffer, 0, _writePos);
+            _writePos = 0;
+        }
+
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.SetLength"]/*' />
+        public override void SetLength(long value)
+        {
+            if (value < 0)
+                throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_NeedNonNegNum");
+            if (!CanSeek) __Error.SeekNotSupported();
+            if (!CanWrite) __Error.WriteNotSupported();
+            // Handle buffering updates.
+            if (_writePos > 0) {
+                FlushWrite();
+            }
+            else if (_readPos < _readLen) {
+                FlushRead();
+            }
+            if (_appendStart != -1 && value < _appendStart)
+                throw new IOException("IO.IO_SetLengthAppendTruncate");
+            long origPos = _pos;
+            if (_pos != value)
+                SeekCore(value, SeekOrigin.Begin);
+#if false
+            if (!Native.SetEndOfFile(_handle)) {
+                __Error.WinIOError(0, String.Empty);
+            }
+#endif
+            // Return file pointer to where it was before setting length
+            if (origPos != value) {
+                if (origPos < value)
+                    SeekCore(origPos, SeekOrigin.Begin);
+                else
+                    SeekCore(0, SeekOrigin.End);
+            }
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Read"]/*' />
+        public override int Read([In, Out] byte[] array, int offset, int count) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Buffer");
+            if (offset < 0)
+                throw new ArgumentOutOfRangeException("offset", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - offset < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+
+            Debug.Assert((_readPos==0 && _readLen==0 && _writePos >= 0) || (_writePos==0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
+
+            bool isBlocked = false;
+            int n = _readLen - _readPos;
+            // if the read buffer is empty, read into either user's array or our
+            // buffer, depending on number of bytes user asked for and buffer size.
+            if (n == 0) {
+                if (!CanRead) __Error.ReadNotSupported();
+                if (_writePos > 0) FlushWrite();
+                if (count >= _bufferSize) {
+                    n = ReadCore(array, offset, count);
+                    // Throw away read buffer.
+                    _readPos = 0;
+                    _readLen = 0;
+                    return n;
+                }
+                if (_buffer == null) _buffer = new byte[_bufferSize];
+                n = ReadCore(_buffer, 0, _bufferSize);
+                if (n == 0) return 0;
+                isBlocked = n < _bufferSize;
+                _readPos = 0;
+                _readLen = n;
+            }
+            // Now copy min of count or numBytesAvailable (ie, near EOF) to array.
+            if (n > count) n = count;
+            Buffer.BlockCopy(_buffer, _readPos, array, offset, n);
+            _readPos += n;
+
+            // If we hit the end of the buffer and didn't have enough bytes, we must
+            // read some more from the underlying stream.  However, if we got
+            // fewer bytes from the underlying stream than we asked for (ie, we're
+            // probably blocked), don't ask for more bytes.
+            if (n < count && !isBlocked) {
+                Debug.Assert(_readPos == _readLen, "Read buffer should be empty!");
+                int moreBytesRead = ReadCore(array, offset + n, count - n);
+                n += moreBytesRead;
+                // We've just made our buffer inconsistent with our position
+                // pointer.  We must throw away the read buffer.
+                _readPos = 0;
+                _readLen = 0;
+            }
+
+            return n;
+        }
+
+        private int ReadCore(byte[] buffer, int offset, int count) {
+            Debug.Assert(CanRead, "CanRead");
+            Debug.Assert(_writePos == 0, "_writePos == 0");
+
+#if BLACKHOLE
+            if (_isBlackHole) {
+                return 0;
+            }
+#endif
+
+            FileContract.Imp fi = _imp.Acquire();
+#if false
+            Console.WriteLine("ReadCore(offset={0}, count={1}, _pos={2}/{3})",
+                              offset, count, _pos, _len);
+            if (offset != 0) {
+                DebugStub.Break();
+            }
+#endif
+            long r = FileUtils.Read(fi, offset, count, _pos, (!)buffer);
+            if (r == -1) {
+                __Error.WinIOError(1, String.Empty);
+            }
+#if false // uncomment to debug file access.
+            Console.WriteLine("  {0:x2}{1:x2}{2:x2}{3:x2} {4:x2}{5:x2}{6:x2}{7:x2}" +
+                              " {8:x2}{9:x2}{10:x2}{11:x2} {12:x2}{13:x2}{14:x2}{15:x2}",
+                              (byte)(r > 0 ? buffer[0] : (byte)0),
+                              (byte)(r > 1 ? buffer[1] : (byte)0),
+                              (byte)(r > 2 ? buffer[2] : (byte)0),
+                              (byte)(r > 3 ? buffer[3] : (byte)0),
+                              (byte)(r > 4 ? buffer[4] : (byte)0),
+                              (byte)(r > 5 ? buffer[5] : (byte)0),
+                              (byte)(r > 6 ? buffer[6] : (byte)0),
+                              (byte)(r > 7 ? buffer[7] : (byte)0),
+                              (byte)(r > 8 ? buffer[8] : (byte)0),
+                              (byte)(r > 9 ? buffer[9] : (byte)0),
+                              (byte)(r > 10 ? buffer[10] : (byte)0),
+                              (byte)(r > 11 ? buffer[11] : (byte)0),
+                              (byte)(r > 12 ? buffer[12] : (byte)0),
+                              (byte)(r > 13 ? buffer[13] : (byte)0),
+                              (byte)(r > 14 ? buffer[14] : (byte)0),
+                              (byte)(r > 15 ? buffer[15] : (byte)0));
+#endif
+            _imp.Release(fi);
+            _pos += r;
+
+            return (int)r;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Seek"]/*' />
+        public override long Seek(long offset, SeekOrigin origin) {
+            if (origin<SeekOrigin.Begin || origin>SeekOrigin.End)
+                throw new ArgumentException("Argument_InvalidSeekOrigin");
+            if (!CanSeek) __Error.SeekNotSupported();
+
+            Debug.Assert((_readPos==0 && _readLen==0 && _writePos >= 0) || (_writePos==0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
+
+            // If we've got bytes in our buffer to write, write them out.
+            // If we've read in and consumed some bytes, we'll have to adjust
+            // our seek positions ONLY IF we're seeking relative to the current
+            // position in the stream.  This simulates doing a seek to the new
+            // position, then a read for the number of bytes we have in our buffer.
+            if (_writePos > 0) {
+                FlushWrite();
+            }
+            else if (origin == SeekOrigin.Current) {
+                // Don't call FlushRead here, which would have caused an infinite
+                // loop.  Simply adjust the seek origin.  This isn't necessary
+                // if we're seeking relative to the beginning or end of the stream.
+                offset -= (_readLen - _readPos);
+            }
+
+            long oldPos = _pos + (_readPos - _readLen);
+            long pos = SeekCore(offset, origin);
+
+            // Prevent users from overwriting data in a file that was opened in
+            // append mode.
+            if (_appendStart != -1 && pos < _appendStart) {
+                SeekCore(oldPos, SeekOrigin.Begin);
+                throw new IOException("IO.IO_SeekAppendOverwrite");
+            }
+
+            // We now must update the read buffer.  We can in some cases simply
+            // update _readPos within the buffer, copy around the buffer so our
+            // Position property is still correct, and avoid having to do more
+            // reads from the disk.  Otherwise, discard the buffer's contents.
+            if (_readLen > 0) {
+                // We can optimize the following condition:
+                // oldPos - _readPos <= pos < oldPos + _readLen - _readPos
+                if (oldPos == pos) {
+                    if (_readPos > 0) {
+                        //Console.WriteLine("Seek: seeked for 0, adjusting buffer back by: "+_readPos+"  _readLen: "+_readLen);
+                        Buffer.BlockCopy(_buffer, _readPos, _buffer, 0, _readLen - _readPos);
+                        _readLen -= _readPos;
+                        _readPos = 0;
+                    }
+                    // If we still have buffered data, we must update the stream's
+                    // position so our Position property is correct.
+                    if (_readLen > 0)
+                        SeekCore(_readLen, SeekOrigin.Current);
+                }
+                else if (oldPos - _readPos < pos && pos < oldPos + _readLen - _readPos) {
+                    int diff = (int)(pos - oldPos);
+                    //Console.WriteLine("Seek: diff was "+diff+", readpos was "+_readPos+"  adjusting buffer - shrinking by "+ (_readPos + diff));
+                    Buffer.BlockCopy(_buffer, _readPos+diff, _buffer, 0, _readLen - (_readPos + diff));
+                    _readLen -= (_readPos + diff);
+                    _readPos = 0;
+                    if (_readLen > 0)
+                        SeekCore(_readLen, SeekOrigin.Current);
+                }
+                else {
+                    // Lose the read buffer.
+                    _readPos = 0;
+                    _readLen = 0;
+                }
+                Debug.Assert(_readLen >= 0 && _readPos <= _readLen, "_readLen should be nonnegative, and _readPos should be less than or equal _readLen");
+                Debug.Assert(pos == Position, "Seek optimization: pos != Position!  Buffer math was mangled.");
+            }
+            return pos;
+        }
+
+        // This doesn't do argument checking.  Necessary for SetLength, which must
+        // set the file pointer beyond the end of the file.
+        private long SeekCore(long offset, SeekOrigin origin) {
+            Debug.Assert(origin>=SeekOrigin.Begin && origin<=SeekOrigin.End, "origin>=SeekOrigin.Begin && origin<=SeekOrigin.End");
+
+#if false
+            int hr = 0;
+            long ret = 0;
+            ret = Native.SetFilePointer(_handle, offset, origin);
+            if (ret == -1) __Error.WinIOError(hr, String.Empty);
+            _pos = ret;
+            return ret;
+#else
+            // mostly ignores origin.
+            if (origin == SeekOrigin.Begin) {
+                _pos = offset;
+            }
+            else if (origin == SeekOrigin.Current) {
+                _pos += offset;
+            }
+            else if (origin == SeekOrigin.End) {
+                _pos = _len + offset;
+            }
+            return _pos;
+#endif
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Write"]/*' />
+        public override void Write(byte[] array, int offset, int count) {
+            if (array==null)
+                throw new ArgumentNullException("array", "ArgumentNull_Buffer");
+            if (offset < 0)
+                throw new ArgumentOutOfRangeException("offset", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (array.Length - offset < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            if (_writePos==0) {
+                // Ensure we can write to the stream, and ready buffer for writing.
+                if (!CanWrite) __Error.WriteNotSupported();
+                if (_readPos < _readLen) FlushRead();
+                _readPos = 0;
+                _readLen = 0;
+            }
+
+            // If our buffer has data in it, copy data from the user's array into
+            // the buffer, and if we can fit it all there, return.  Otherwise, write
+            // the buffer to disk and copy any remaining data into our buffer.
+            // The assumption here is memcpy is cheaper than disk (or net) IO.
+            // (10 milliseconds to disk vs. ~20-30 microseconds for a 4K memcpy)
+            // So the extra copying will reduce the total number of writes, in
+            // non-pathological cases (ie, write 1 byte, then write for the buffer
+            // size repeatedly)
+            if (_writePos > 0) {
+                int numBytes = _bufferSize - _writePos;   // space left in buffer
+                if (numBytes > 0) {
+                    if (numBytes > count)
+                        numBytes = count;
+                    Buffer.BlockCopy(array, offset, _buffer, _writePos, numBytes);
+                    _writePos += numBytes;
+                    if (count==numBytes) return;
+                    offset += numBytes;
+                    count -= numBytes;
+                }
+                // Reset our buffer.  We essentially want to call FlushWrite
+                // without calling Flush on the underlying Stream.
+                WriteCore(_buffer, 0, _writePos);
+                _writePos = 0;
+            }
+            // If the buffer would slow writes down, avoid buffer completely.
+            if (count >= _bufferSize) {
+                Debug.Assert(_writePos == 0, "FileStream cannot have buffered data to write here!  Your stream will be corrupted.");
+                WriteCore(array, offset, count);
+                return;
+            }
+            else if (count == 0)
+                return;  // Don't allocate a buffer then call memcpy for 0 bytes.
+            if (_buffer==null) _buffer = new byte[_bufferSize];
+            // Copy remaining bytes into buffer, to write at a later date.
+            Buffer.BlockCopy(array, offset, _buffer, _writePos, count);
+            _writePos = count;
+            return;
+        }
+
+        private void WriteCore(byte[]! buffer, int offset, int count) {
+            Debug.Assert(CanWrite, "CanWrite");
+            Debug.Assert(_readPos == _readLen, "_readPos == _readLen");
+
+#if BLACKHOLE
+            if (_isBlackHole) {
+                _pos += count;
+                return;
+            }
+#endif
+
+            FileContract.Imp fi = _imp.Acquire();
+            long r = FileUtils.Write(fi, offset, count, _pos, (!)buffer);
+            _imp.Release(fi);
+            if (r == -1) {
+                __Error.WinIOError(1, String.Empty);
+            }
+            _pos += r;
+            return;
+        }
+
+        // Reads a byte from the file stream.  Returns the byte cast to an int
+        // or -1 if reading from the end of the stream.
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.ReadByte"]/*' />
+        public override int ReadByte() {
+            if (_readLen==0 && !CanRead) __Error.ReadNotSupported();
+            Debug.Assert((_readPos==0 && _readLen==0 && _writePos >= 0) || (_writePos==0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
+            if (_readPos == _readLen) {
+                if (_writePos > 0) FlushWrite();
+                Debug.Assert(_bufferSize > 0, "_bufferSize > 0");
+                if (_buffer == null) _buffer = new byte[_bufferSize];
+                _readLen = ReadCore(_buffer, 0, _bufferSize);
+                _readPos = 0;
+            }
+            if (_readPos == _readLen)
+                return -1;
+
+            return _buffer[_readPos++];
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.WriteByte"]/*' />
+        public override void WriteByte(byte value)
+        {
+            if (_writePos==0) {
+                if (!CanWrite) __Error.WriteNotSupported();
+                if (_readPos < _readLen) FlushRead();
+                _readPos = 0;
+                _readLen = 0;
+                Debug.Assert(_bufferSize > 0, "_bufferSize > 0");
+                if (_buffer==null) _buffer = new byte[_bufferSize];
+            }
+            if (_writePos == _bufferSize)
+                FlushWrite();
+
+            _buffer[_writePos++] = value;
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Lock"]/*' />
+        public virtual void Lock(long position, long length) {
+            if (position < 0 || length < 0)
+                throw new ArgumentOutOfRangeException((position < 0 ? "position" : "length"), "ArgumentOutOfRange_NeedNonNegNum");
+
+#if false
+            if (!Native.LockFile(_handle, position, length))
+                __Error.WinIOError();
+#endif
+        }
+
+        //| <include file='doc\FileStream.uex' path='docs/doc[@for="FileStream.Unlock"]/*' />
+        public virtual void Unlock(long position, long length) {
+            if (position < 0 || length < 0)
+                throw new ArgumentOutOfRangeException((position < 0 ? "position" : "length"), "ArgumentOutOfRange_NeedNonNegNum");
+
+#if false
+            if (!Native.UnlockFile(_handle, position, length))
+                __Error.WinIOError();
+#endif
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/FileSystemInfo.cs b/base/Libraries/System.IO/FileSystemInfo.cs
new file mode 100644
index 0000000..637361d
--- /dev/null
+++ b/base/Libraries/System.IO/FileSystemInfo.cs
@@ -0,0 +1,218 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  FileSystemInfo
+**
+**
+** Purpose:
+**
+** Date:  April 7, 2000
+**
+===========================================================*/
+
+using System;
+using System.Collections;
+using Microsoft.Singularity;
+using System.Text;
+using System.Runtime.InteropServices;
+
+//@TODO: Add a static SystemDirectory property returning a URI
+namespace System.IO {
+    //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo"]/*' />
+
+    public abstract class FileSystemInfo {
+        internal Native.FILE_ATTRIBUTE_DATA _data; // Cache the file information
+        internal int _dataInitialised = -1; // We use this field in conjunction with the Refresh methods, if we succeed
+                                           // we store a zero, on failure we store the HResult in it so that we can
+                                           // give back a generic error back.
+
+        private const int ERROR_INVALID_PARAMETER = 87;
+        internal const int ERROR_ACCESS_DENIED = 0x5;
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.FullPath"]/*' />
+        protected String FullPath;  // fully qualified path of the directory
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.OriginalPath"]/*' />
+        protected String OriginalPath; // path passed in by the user
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.FileSystemInfo"]/*' />
+        protected FileSystemInfo()
+        {
+        }
+
+        // Full path of the directory/file
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.FullName"]/*' />
+        public virtual String FullName {
+            get
+            {
+                return FullPath;
+            }
+        }
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.Extension"]/*' />
+        public String Extension
+        {
+            get
+            {
+                // GetFullPathInternal would have already stripped out the terminating "." if present.
+               int length = FullPath.Length;
+                for (int i = length; --i >= 0;) {
+                    char ch = FullPath[i];
+                    if (ch == '.')
+                        return FullPath.Substring(i, length - i);
+                    if (ch == Path.DirectorySeparatorChar || ch == Path.AltDirectorySeparatorChar || ch == Path.VolumeSeparatorChar)
+                        break;
+                }
+                return String.Empty;
+            }
+        }
+
+        // For files name of the file is returned, for directories the last directory in hierarchy is returned if possible,
+        // otherwise the fully qualified name s returned
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.Name"]/*' />
+        public abstract String Name {
+            get;
+        }
+
+        // Whether a file/directory exists
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.Exists"]/*' />
+        public abstract bool Exists
+        {
+            get;
+        }
+
+        // Delete a file/directory
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.Delete"]/*' />
+        public abstract void Delete();
+
+        public DateTime CreationTime {
+            get {
+                return CreationTimeUtc.ToLocalTime();
+            }
+
+            set {
+                CreationTimeUtc = value.ToUniversalTime();
+            }
+        }
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.CreationTimeUtc"]/*' />
+        public DateTime CreationTimeUtc {
+            get {
+                if (_dataInitialised == -1) {
+                    _data = new Native.FILE_ATTRIBUTE_DATA();
+                    Refresh();
+                }
+
+                if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                    __Error.WinIOError(_dataInitialised, OriginalPath);
+
+                return DateTime.FromFileTimeUtc(_data.ftCreationTime);
+
+            }
+
+            set {
+                if (this is DirectoryInfo)
+                    Directory.SetCreationTimeUtc(FullPath,value);
+                else
+                    File.SetCreationTimeUtc(FullPath,value);
+                _dataInitialised = -1;
+            }
+        }
+
+        public DateTime LastAccessTime {
+            get {
+                return LastAccessTimeUtc.ToLocalTime();
+            }
+
+            set {
+                LastAccessTimeUtc = value.ToUniversalTime();
+            }
+        }
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.LastAccessTimeUtc"]/*' />
+        public DateTime LastAccessTimeUtc {
+            get {
+                if (_dataInitialised == -1) {
+                    _data = new Native.FILE_ATTRIBUTE_DATA();
+                    Refresh();
+                }
+
+                if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                    __Error.WinIOError(_dataInitialised, OriginalPath);
+
+                return DateTime.FromFileTimeUtc(_data.ftLastAccessTime);
+
+            }
+            set {
+                if (this is DirectoryInfo)
+                    Directory.SetLastAccessTimeUtc(FullPath,value);
+                else
+                    File.SetLastAccessTimeUtc(FullPath,value);
+                _dataInitialised = -1;
+            }
+        }
+
+        public DateTime LastWriteTime {
+            get {
+                return LastWriteTimeUtc.ToLocalTime();
+            }
+
+            set {
+                LastWriteTimeUtc = value.ToUniversalTime();
+            }
+        }
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.LastWriteTimeUtc"]/*' />
+        public DateTime LastWriteTimeUtc {
+            get {
+                if (_dataInitialised == -1) {
+                    _data = new Native.FILE_ATTRIBUTE_DATA();
+                    Refresh();
+                }
+
+                if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                    __Error.WinIOError(_dataInitialised, OriginalPath);
+
+                return DateTime.FromFileTimeUtc(_data.ftLastWriteTime);
+            }
+            set {
+                if (this is DirectoryInfo)
+                    Directory.SetLastWriteTimeUtc(FullPath,value);
+                else
+                    File.SetLastWriteTimeUtc(FullPath,value);
+                _dataInitialised = -1;
+            }
+        }
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.Refresh"]/*' />
+        public void Refresh()
+        {
+            _dataInitialised = File.FillAttributeInfo(FullPath,ref _data);
+        }
+
+        //| <include file='doc\FileSystemInfo.uex' path='docs/doc[@for="FileSystemInfo.GetAttributes"]/*' />
+        public FileAttributes GetAttributes {
+            get {
+                if (_dataInitialised == -1) {
+                    _data = new Native.FILE_ATTRIBUTE_DATA();
+                    Refresh(); // Call refresh to initialise the data
+                }
+
+                if (_dataInitialised != 0) // Refresh was unable to initialise the data
+                    __Error.WinIOError(_dataInitialised, OriginalPath);
+
+                return (FileAttributes) _data.fileAttributes;
+            }
+            set {
+                bool r = Native.SetFileAttributes(FullPath, (int) value);
+                if (!r) {
+                    __Error.WinIOError(0, OriginalPath);
+                }
+                _dataInitialised = -1;
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/IOException.cs b/base/Libraries/System.IO/IOException.cs
new file mode 100644
index 0000000..19116cc
--- /dev/null
+++ b/base/Libraries/System.IO/IOException.cs
@@ -0,0 +1,44 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  IOException
+**
+**
+** Purpose: Exception for a generic IO error.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+
+    //| <include file='doc\IOException.uex' path='docs/doc[@for="IOException"]/*' />
+    public class IOException : SystemException
+    {
+        //| <include file='doc\IOException.uex' path='docs/doc[@for="IOException.IOException"]/*' />
+        public IOException()
+            : base("Arg_IOException") {
+        }
+
+        //| <include file='doc\IOException.uex' path='docs/doc[@for="IOException.IOException1"]/*' />
+        public IOException(String message)
+            : base(message) {
+        }
+
+        //| <include file='doc\IOException.uex' path='docs/doc[@for="IOException.IOException2"]/*' />
+        public IOException(String message, int hresult)
+            : base(message) {
+        }
+
+        //| <include file='doc\IOException.uex' path='docs/doc[@for="IOException.IOException3"]/*' />
+        public IOException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/MemoryStream.cs b/base/Libraries/System.IO/MemoryStream.cs
new file mode 100644
index 0000000..78fc07f
--- /dev/null
+++ b/base/Libraries/System.IO/MemoryStream.cs
@@ -0,0 +1,389 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  MemoryStream
+**
+**
+** Purpose: A Stream whose backing store is memory.  Great
+** for temporary storage without creating a temp file.  Also
+** lets users expose a byte[] as a stream.
+**
+** Date:  February 19, 2000
+**
+===========================================================*/
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.IO {
+    // A MemoryStream represents a Stream in memory (ie, it has no backing store).
+    // This stream may reduce the need for temporary buffers and files in
+    // an application.
+    //
+    // There are two ways to create a MemoryStream.  You can initialize one
+    // from an unsigned byte array, or you can create an empty one.  Empty
+    // memory streams are resizable, while ones created with a byte array provide
+    // a stream "view" of the data.
+    //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream"]/*' />
+    public class MemoryStream : Stream
+    {
+        private byte[] _buffer;    // Either allocated internally or externally.
+        private int _origin;       // For user-provided arrays, start at this origin
+        private int _position;     // read/write head.
+        private int _length;       // Number of bytes within the memory stream
+        private int _capacity;     // length of usable portion of buffer for stream
+        // Note that _capacity == _buffer.Length for non-user-provided byte[]'s
+
+        private bool _expandable;  // User-provided buffers aren't expandable.
+        private bool _writable;    // Can user write to this stream?
+        private bool _exposable;   // Whether the array can be returned to the user.
+        private bool _isOpen;      // Is this stream open or closed?
+
+        // In V2, if we get support for arrays of more than 2 GB worth of elements,
+        // consider removing this constraint, or setting it to Int64.MaxValue.
+        private const int MemStreamMaxLength = Int32.MaxValue;
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream"]/*' />
+        public MemoryStream()
+            : this(0) {
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream1"]/*' />
+        public MemoryStream(int capacity) {
+            if (capacity < 0) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NegativeCapacity");
+            _buffer = new byte[capacity];
+            _capacity = capacity;
+            _expandable = true;
+            _writable = true;
+            _exposable = true;
+            _origin = 0;      // Must be 0 for byte[]'s created by MemoryStream
+            _isOpen = true;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream2"]/*' />
+        public MemoryStream(byte[] buffer)
+            : this(buffer, true) {
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream3"]/*' />
+        public MemoryStream(byte[] buffer, bool writable) {
+            if (buffer == null) throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            _buffer = buffer;
+            _length = _capacity = buffer.Length;
+            _writable = writable;
+            _exposable = false;
+            _origin = 0;
+            _isOpen = true;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream4"]/*' />
+        public MemoryStream(byte[] buffer, int index, int count)
+            : this(buffer, index, count, true, false) {
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream5"]/*' />
+        public MemoryStream(byte[] buffer, int index, int count, bool writable)
+            : this(buffer, index, count, writable, false) {
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.MemoryStream6"]/*' />
+        public MemoryStream(byte[] buffer, int index, int count, bool writable, bool publiclyVisible) {
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            _buffer = buffer;
+            _origin = _position = index;
+            _length = _capacity = index + count;
+            _writable = writable;
+            _exposable = publiclyVisible;  // Can GetBuffer return the array?
+            _expandable = false;
+            _isOpen = true;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.CanRead"]/*' />
+        public override bool CanRead {
+            get { return _isOpen; }
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.CanSeek"]/*' />
+        public override bool CanSeek {
+            get { return _isOpen; }
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.CanWrite"]/*' />
+        public override bool CanWrite {
+            get { return _writable; }
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Close"]/*' />
+        public override void Close() {
+            _isOpen = false;
+            _writable = false;
+            _expandable = false;
+            // Don't set buffer to null - allow GetBuffer & ToArray to work.
+        }
+
+        // returns a bool saying whether we allocated a new array.
+        private bool EnsureCapacity(int value) {
+            // Check for overflow
+            if (value < 0)
+                throw new IOException("IO.IO_StreamTooLong");
+            if (value > _capacity) {
+                int newCapacity = value;
+                if (newCapacity < 256)
+                    newCapacity = 256;
+                if (newCapacity < _capacity * 2)
+                    newCapacity = _capacity * 2;
+                Capacity = newCapacity;
+                return true;
+            }
+            return false;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Flush"]/*' />
+        public override void Flush() {
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.GetBuffer"]/*' />
+        public virtual byte[] GetBuffer() {
+            return _buffer;
+        }
+
+        // Gets and sets the capacity (number of bytes allocated) for this stream.
+        // The capacity cannot be set to a value less than the current length
+        // of the stream.
+        //
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Capacity"]/*' />
+        public virtual int Capacity {
+            get {
+                if (!_isOpen) __Error.StreamIsClosed();
+                return _capacity - _origin;
+            }
+            set {
+                if (!_isOpen) __Error.StreamIsClosed();
+                if (value != _capacity) {
+                    if (!_expandable) __Error.MemoryStreamNotExpandable();
+                    if (value < _length) throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_SmallCapacity");
+                    if (value > 0) {
+                        byte[] newBuffer = new byte[value];
+                        if (_length > 0) Buffer.BlockCopy(_buffer, 0, newBuffer, 0, _length);
+                        _buffer = newBuffer;
+                    }
+                    else {
+                        _buffer = null;
+                    }
+                    _capacity = value;
+                }
+            }
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Length"]/*' />
+        public override long Length {
+            get {
+                if (!_isOpen) __Error.StreamIsClosed();
+                return _length - _origin;
+            }
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Position"]/*' />
+        public override long Position {
+            get {
+                if (!_isOpen) __Error.StreamIsClosed();
+                return _position - _origin;
+            }
+            set {
+                if (!_isOpen) __Error.StreamIsClosed();
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_NeedNonNegNum");
+                if (value > MemStreamMaxLength)
+                    throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_MemStreamLength");
+                _position = _origin + (int)value;
+            }
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Read"]/*' />
+      public override int Read([In, Out] byte[] buffer, int offset, int count) {
+            if (!_isOpen) __Error.StreamIsClosed();
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (offset < 0)
+                throw new ArgumentOutOfRangeException("offset", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - offset < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            int n = _length - _position;
+            if (n > count) n = count;
+            if (n <= 0)
+                return 0;
+
+            Debug.Assert(_position + n >= 0, "_position + n >= 0");  // len is less than 2^31 -1.
+
+            if (n <= 8)
+            {
+                int byteCount = n;
+                while (--byteCount >= 0)
+                    buffer[offset + byteCount] = _buffer[_position + byteCount];
+            }
+            else
+                Buffer.BlockCopy(_buffer, _position, buffer, offset, n);
+            _position += n;
+            return n;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.ReadByte"]/*' />
+        public override int ReadByte() {
+            if (!_isOpen) __Error.StreamIsClosed();
+            if (_position >= _length) return -1;
+            return _buffer[_position++];
+        }
+
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Seek"]/*' />
+        public override long Seek(long offset, SeekOrigin loc) {
+            if (!_isOpen) __Error.StreamIsClosed();
+            if (offset > MemStreamMaxLength)
+                throw new ArgumentOutOfRangeException("offset", "ArgumentOutOfRange_MemStreamLength");
+            switch(loc) {
+            case SeekOrigin.Begin:
+                if (offset < 0)
+                    throw new IOException("IO.IO_SeekBeforeBegin");
+                _position = _origin + (int)offset;
+                break;
+
+            case SeekOrigin.Current:
+                if (offset + _position < _origin)
+                    throw new IOException("IO.IO_SeekBeforeBegin");
+                _position += (int)offset;
+                break;
+
+            case SeekOrigin.End:
+                if (_length + offset < _origin)
+                    throw new IOException("IO.IO_SeekBeforeBegin");
+                _position = _length + (int)offset;
+                break;
+
+            default:
+                throw new ArgumentException("Argument_InvalidSeekOrigin");
+            }
+
+            Debug.Assert(_position >= 0, "_position >= 0");
+            return _position;
+        }
+
+        // Sets the length of the stream to a given value.  The new
+        // value must be nonnegative and less than the space remaining in
+        // the array, Int32.MaxValue - origin
+        // Origin is 0 in all cases other than a MemoryStream created on
+        // top of an existing array and a specific starting offset was passed
+        // into the MemoryStream constructor.  The upper bounds prevents any
+        // situations where a stream may be created on top of an array then
+        // the stream is made longer than the maximum possible length of the
+        // array (Int32.MaxValue).
+        //
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.SetLength"]/*' />
+        public override void SetLength(long value) {
+            if (!_writable) __Error.WriteNotSupported();
+            if (value > MemStreamMaxLength)
+                throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_MemStreamLength");
+            if (value < 0 || value > (Int32.MaxValue - _origin)) {
+                throw new ArgumentOutOfRangeException("value", "ArgumentOutOfRange_MemStreamLength");
+            }
+            int newLength = _origin + (int)value;
+            bool allocatedNewArray = EnsureCapacity(newLength);
+            if (!allocatedNewArray && newLength > _length)
+                Array.Clear(_buffer, _length, newLength - _length);
+            _length = newLength;
+            if (_position > newLength) _position = newLength;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.ToArray"]/*' />
+        public virtual byte[] ToArray() {
+            Debug.Assert(_exposable, "MemoryStream::GetBuffer will let you avoid a copy.");
+            byte[] copy = new byte[_length - _origin];
+            Buffer.BlockCopy(_buffer, _origin, copy, 0, _length - _origin);
+            return copy;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.Write"]/*' />
+        public override void Write(byte[] buffer, int offset, int count) {
+            if (!_isOpen) __Error.StreamIsClosed();
+            if (!_writable) __Error.WriteNotSupported();
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (offset < 0)
+                throw new ArgumentOutOfRangeException("offset", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - offset < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            int i = _position + count;
+            // Check for overflow
+            if (i < 0)
+                throw new IOException("IO.IO_StreamTooLong");
+
+            if (i > _length) {
+                bool mustZero = _position > _length;
+                if (i > _capacity) {
+                    bool allocatedNewArray = EnsureCapacity(i);
+                    if (allocatedNewArray)
+                        mustZero = false;
+                }
+                if (mustZero)
+                    Array.Clear(_buffer, _length, i - _length);
+                _length = i;
+            }
+            if (count <= 8)
+            {
+                int byteCount = count;
+                while (--byteCount >= 0)
+                    _buffer[_position + byteCount] = buffer[offset + byteCount];
+            }
+            else
+                Buffer.BlockCopy(buffer, offset, _buffer, _position, count);
+            _position = i;
+            return;
+        }
+
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.WriteByte"]/*' />
+        public override void WriteByte(byte value) {
+            if (!_isOpen) __Error.StreamIsClosed();
+            if (!_writable) __Error.WriteNotSupported();
+            if (_position >= _length) {
+                int newLength = _position + 1;
+                bool mustZero = _position > _length;
+                if (newLength >= _capacity) {
+                    bool allocatedNewArray = EnsureCapacity(newLength);
+                    if (allocatedNewArray)
+                        mustZero = false;
+                }
+                if (mustZero)
+                    Array.Clear(_buffer, _length, _position - _length);
+                _length = newLength;
+            }
+            _buffer[_position++] = value;
+        }
+
+        // Writes this MemoryStream to another stream.
+        //| <include file='doc\MemoryStream.uex' path='docs/doc[@for="MemoryStream.WriteTo"]/*' />
+        public virtual void WriteTo(Stream stream) {
+            if (!_isOpen) __Error.StreamIsClosed();
+            if (stream==null)
+                throw new ArgumentNullException("stream", "ArgumentNull_Stream");
+            stream.Write(_buffer, _origin, _length - _origin);
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/Native.cs b/base/Libraries/System.IO/Native.cs
new file mode 100644
index 0000000..994b85e
--- /dev/null
+++ b/base/Libraries/System.IO/Native.cs
@@ -0,0 +1,484 @@
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using FileSystem.Utils;
+using Microsoft.Singularity.V1.Services;
+
+namespace System
+{
+    [CLSCompliant(false)] //
+    internal sealed class Native
+    {
+    
+        internal static int GetFileType(IntPtr handle)
+        {
+            throw new NotSupportedException();
+        }
+
+        // Note, these are const used to extract handles, and are NOT handles.
+        internal const int STD_INPUT_HANDLE = -10;
+        internal const int STD_OUTPUT_HANDLE = -11;
+        internal const int STD_ERROR_HANDLE = -12;
+
+        // From WinBase.h
+        internal const int FILE_TYPE_DISK = 0x0001;
+        internal const int FILE_TYPE_CHAR = 0x0002;
+        internal const int FILE_TYPE_PIPE = 0x0003;
+
+        // Error codes from WinError.h
+        internal const int ERROR_FILE_NOT_FOUND = 0x2;
+        internal const int ERROR_PATH_NOT_FOUND = 0x3;
+        internal const int ERROR_ACCESS_DENIED  = 0x5;
+        internal const int ERROR_INVALID_HANDLE = 0x6;
+        internal const int ERROR_NO_MORE_FILES = 0x12;
+        internal const int ERROR_NOT_READY = 0x15;
+        internal const int ERROR_SHARING_VIOLATION = 0x20;
+        internal const int ERROR_FILE_EXISTS = 0x50;
+        internal const int ERROR_INVALID_PARAMETER = 0x57;
+        internal const int ERROR_CALL_NOT_IMPLEMENTED = 0x78;
+        internal const int ERROR_PATH_EXISTS = 0xB7;
+        internal const int ERROR_FILENAME_EXCED_RANGE = 0xCE;  // filename too long.
+        internal const int ERROR_DLL_INIT_FAILED = 0x45A;
+        
+        internal const int ERROR_NOT_SUPPORTED = 50; 
+        internal const int ERROR_DUP_NAME = 52; 
+        internal const int ERROR_DISK_FULL = 112; 
+        internal const int ERROR_DIR_NOT_EMPTY = 145; 
+        internal const int ERROR_ALREADY_EXISTS = 183; 
+
+        //////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////
+
+        internal struct FILE_ATTRIBUTE_DATA {
+            internal int fileAttributes;
+            internal long ftCreationTime;
+            internal long ftLastAccessTime;
+            internal long ftLastWriteTime;
+            internal long fileSize;
+        }
+
+        private static TRef<DirectoryServiceContract.Imp:Ready>       m_epDS= null;
+
+        private static DirectoryServiceContract.Imp:Ready! GetDirectoryServiceContract() 
+        {
+            if (m_epDS == null) {
+                m_epDS = new TRef<DirectoryServiceContract.Imp:Ready>(DirectoryService.NewClientEndpoint());
+            }
+
+            return m_epDS.Acquire();
+       }
+
+        private static void ReleaseDirectoryServiceContract([Claims] DirectoryServiceContract.Imp:Ready! imp) 
+        {
+            m_epDS.Release(imp);
+        }
+
+        // From WinBase.h
+        internal static int ExpandEnvironmentStrings(String lpSrc, StringBuilder lpDst, int nSize)
+        {
+            throw new NotSupportedException();
+        }
+
+        // Called by System.Runtime.InteropServices.Marshal.AllocHGlobal
+        //           for creation of delegates.
+        internal static IntPtr LocalAlloc(int sizetdwBytes)
+        {
+            throw new NotSupportedException();
+        }
+
+        // Called by System.Runtime.InteropServices.Marshal.FreeHGlobal
+        //           for destruction of delegates.
+        internal static IntPtr LocalFree(IntPtr handle)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static uint GetTempPath(int bufferLen, StringBuilder buffer)
+        {
+            throw new NotSupportedException();
+        }
+
+        // For GetFullPathName, the last param is a useless TCHAR**, set by native.
+        internal static int GetFullPathName(String path, int numBufferChars, StringBuilder! buffer)
+        {
+#if false // uncomment to debug file access.
+            Console.WriteLine("GetFullPathName({0})", path);
+#endif
+            buffer.Append(path);
+            return buffer.Length;
+        }
+
+        internal static int SearchPath(String path, String fileName, String extension, int numBufferChars, StringBuilder buffer, int[] filePart)
+        {
+            throw new NotSupportedException();
+        }
+
+        // Do not use these directly, use the safe or unsafe versions above.
+        // The safe version does not support devices (aka if will only open
+        // files on disk), while the unsafe version give you the full semantic
+        // of the native version.
+
+        internal static IntPtr CreateFile(String lpFileName,
+                                          int dwDesiredAccess,
+                                          int dwShareMode,
+                                          int dwCreationDisposition,
+                                          int dwFlagsAndAttributes)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool CloseHandle(IntPtr handle)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool SetEndOfFile(IntPtr hFile)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static long SetFilePointer(IntPtr handle, long offset, System.IO.SeekOrigin origin)
+        {
+            return 0;
+        }
+
+        internal static int GetSystemDirectory(StringBuilder sb, int length)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool GetFileTime(IntPtr hFile, long[] creationTime,
+                                                long[] lastAccessTime, long[] lastWriteTime)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool SetFileTime(IntPtr hFile, long[] creationTime,
+                                                long[] lastAccessTime, long[] lastWriteTime)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static long GetFileSize(IntPtr hFile)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool LockFile(IntPtr handle, long offset, long count)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool UnlockFile(IntPtr handle,long offset,long count)
+        {
+            throw new NotSupportedException();
+        }
+
+        // Constants from WinNT.h
+        internal const int FILE_ATTRIBUTE_DIRECTORY = 0x10;
+
+        // Win32 Structs in N/Direct style
+        internal class FIND_DATA {
+            internal int  dwFileAttributes = 0;
+            // ftCreationTime was a by-value FILETIME structure
+            internal long ftCreationTime = 0 ;
+            // ftLastAccessTime was a by-value FILETIME structure
+            internal long ftLastAccessTime = 0;
+            // ftLastWriteTime was a by-value FILETIME structure
+            internal long  ftLastWriteTime = 0;
+            internal long  nFileSize = 0;
+            internal String   cFileName = null;
+            internal String   cAlternateFileName = null;
+        }
+
+        internal static bool CopyFile(String src, String dst, bool failIfExists) {
+            // Modifications to try to make this work on Singularity - VSee, 6/9/2006
+            
+            // FOR DEBUG
+            // Console.WriteLine("Entering Native.CopyFile");
+            // Console.WriteLine("src = {0}, dst = {1}, failIfExists = {2}", src, dst, failIfExists);
+            // END DEBUG
+            ErrorCode error = ErrorCode.Unknown;            
+
+            if (src == null) {
+                return false;
+            }
+            if (dst == null) {
+                return false;
+            }
+            DirectoryServiceContract.Imp ds = GetDirectoryServiceContract();
+            if (ds == null) {
+                throw new Exception("Unable to acquire handle to the directory");
+            }
+            
+            if (failIfExists) {
+                // FOR DEBUG
+                // Console.WriteLine("Native.CopyFile: before existence check on dst");
+                // END DEBUG
+                bool good = FileUtils.FileExists(ds, dst);
+                if (!good) {
+                    // FOR DEBUG
+                    // Console.WriteLine("File copy failed - destination exists and overwrite not set");
+                    // END DEBUG
+                    ReleaseDirectoryServiceContract(ds);
+                    return good;
+                }
+            }
+            // FOR DEBUG
+            // Console.WriteLine("Native.CopyFile: before copy");
+            // END DEBUG
+            bool ok = CopyFile(src, dst, ds, out error);
+            ReleaseDirectoryServiceContract(ds);
+            return ok;
+
+        } // end CopyFile(String src, String dst, bool failIfExists)
+
+        // true is success
+        internal static bool CopyFile(String! srcpath, String! destpath, DirectoryServiceContract.Imp:Ready! ds, out ErrorCode error) {
+            int readSize = 4096;
+            long readOffset = 0;
+            long bytesRead;
+            long bytesWrite;
+            byte [] bytes = new byte[readSize];
+
+            error = ErrorCode.Unknown;
+
+            if (!FileUtils.CreateFile(destpath, ds, out error)) {
+                // FOR DEBUG
+                // Console.WriteLine("Native.CopyFile: destination file creation failed");
+                // END DEBUG
+                return false;
+            }
+
+            FileContract.Imp:Ready fileImp = FileUtils.OpenFile(srcpath, ds);
+            if (fileImp == null) {
+                delete fileImp;
+                error = ErrorCode.NotFound;
+                // FOR DEBUG
+                // Console.WriteLine("Native.CopyFile: unable to open file " + srcpath);
+                // END DEBUG
+                return false;
+            }
+
+            FileContract.Imp:Ready fileOut = FileUtils.OpenFile(destpath, ds, out error);
+            if (fileOut == null) {
+                delete fileOut;
+                // FOR DEBUG
+                //Console.WriteLine("Native.CopyFile: unable to open file " + destpath + ". Reason=" + SdsUtils.ErrorCodeToString(error));
+                // END DEBUG
+                delete fileImp;
+                return false;
+            }
+
+            do
+            {
+                bytesRead = FileUtils.Read(fileImp, 0, readSize, readOffset, bytes);
+                bytesWrite = FileUtils.Write(fileOut, 0, (int)bytesRead, readOffset, bytes);
+                if (bytesRead < readSize) { // error or done with the file
+                    break;
+                }
+                if (bytesWrite < bytesRead) { // error on write
+                    // FOR DEBUG
+                    // Console.WriteLine("Native.CopyFile: error writing " + destpath);
+                    // END DEBUG
+                    delete fileImp;
+                    delete fileOut;
+                    error = ErrorCode.Unknown;
+                    return false;
+                    break;
+                }
+                readOffset += bytesRead; // if we got to this point, increment the offset...
+            } while (true);
+            delete fileImp;
+            delete fileOut;
+            return true;
+
+        } // end CopyFile (src, dst, ds, out error)
+
+        internal static bool CreateDirectory(
+            String path, int lpSecurityAttributes)
+        {
+            throw new NotSupportedException();
+        }
+
+#if false
+    internal static bool DeleteFile(String path) 
+    {
+        ErrorCode error;
+        if (path == null) {
+            return false;
+        }
+        DirectoryServiceContract.Imp ds = GetDirectoryServiceContract();
+        bool ok = DeleteFile(path, ds, out error); 
+        ReleaseDirectoryServiceContract(ds);
+        return ok;  
+    }
+#endif        
+    
+    internal static bool DeleteFile(String path, out ErrorCode error) {
+        error = ErrorCode.Unknown;
+        if (path == null) {
+            return false;
+        }
+        DirectoryServiceContract.Imp ds = GetDirectoryServiceContract();
+        bool ok = DeleteFile(path, ds, out error); 
+        ReleaseDirectoryServiceContract(ds);
+        return ok;  
+        }
+
+        internal static bool DeleteFile(String! path, DirectoryServiceContract.Imp:Ready! ds, out ErrorCode error) 
+        {
+            FileUtils.DeleteFile(path, ds, out error);
+            bool ok = (error == ErrorCode.NoError);
+            if (!ok) {
+                Console.WriteLine(" File ({0}) delete failed. reason:{1}",
+                  path, SdsUtils.ErrorCodeToString(error) ); 
+            } 
+            return ok; 
+        }
+
+        internal static bool FindClose(IntPtr hndFindFile)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static IntPtr FindFirstFile(String pFileName,
+                                             out FIND_DATA pFindFileData)
+        {
+            pFindFileData = null;
+            throw new NotSupportedException();
+        }
+
+        internal static bool FindNextFile(IntPtr hndFindFile,
+                                                 out FIND_DATA lpFindFileData)
+        {
+            lpFindFileData = null;
+            throw new NotSupportedException();
+        }
+
+        internal static int GetCurrentDirectory(
+            int nBufferLength,
+            StringBuilder lpBuffer)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool GetFileAttributesEx(String name,
+                                                        int fileInfoLevel,
+                                                        ref FILE_ATTRIBUTE_DATA lpFileInformation)
+        {
+#if MOVE_TO_APP_SPACE
+            //
+            //this will be used to determine if a file exists
+            bool result = false;
+
+            DirectoryServiceContract.Imp epNS = Directory.NewClientEndpoint();
+            prefix = Bitter.FromString(name);
+            epNS.SendFindFirst(prefix);
+            switch receive
+            {
+                case epNS.AckFindFirst(path,code):
+                    p = Bitter.ToString(path);
+                    result = true;
+                    break;
+                case epNS.NakFindFirst():
+                    result = false;
+                    break;
+                case unsatisfiable:
+                    break;
+            }
+            delete epNS;
+            return result;
+#endif
+            return false;
+        }
+
+        internal static bool SetFileAttributes(String name, int attr)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static int GetLogicalDrives()
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static uint GetTempFileName(String tmpPath, String prefix, uint uniqueIdOrZero, StringBuilder tmpFileName)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool MoveFile(String src, String dst)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool RemoveDirectory(String path, out ErrorCode error)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool SetCurrentDirectory(String path)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal const int SHGFP_TYPE_CURRENT               = 0;             // the current (user) folder path setting
+        internal const int UOI_FLAGS                        = 1;
+        internal const int WSF_VISIBLE                      = 1;
+        internal const int CSIDL_APPDATA                    = 0x001a;
+        internal const int CSIDL_COMMON_APPDATA             = 0x0023;
+        internal const int CSIDL_LOCAL_APPDATA              = 0x001c;
+        internal const int CSIDL_COOKIES                    = 0x0021;
+        internal const int CSIDL_FAVORITES                  = 0x0006;
+        internal const int CSIDL_HISTORY                    = 0x0022;
+        internal const int CSIDL_INTERNET_CACHE             = 0x0020;
+        internal const int CSIDL_PROGRAMS                   = 0x0002;
+        internal const int CSIDL_RECENT                     = 0x0008;
+        internal const int CSIDL_SENDTO                     = 0x0009;
+        internal const int CSIDL_STARTMENU                  = 0x000b;
+        internal const int CSIDL_STARTUP                    = 0x0007;
+        internal const int CSIDL_SYSTEM                     = 0x0025;
+        internal const int CSIDL_TEMPLATES                  = 0x0015;
+        internal const int CSIDL_DESKTOPDIRECTORY           = 0x0010;
+        internal const int CSIDL_PERSONAL                   = 0x0005;
+        internal const int CSIDL_PROGRAM_FILES              = 0x0026;
+        internal const int CSIDL_PROGRAM_FILES_COMMON       = 0x002b;
+        internal const int CSIDL_DESKTOP                    = 0x0000;
+        internal const int CSIDL_DRIVES                     = 0x0011;
+        internal const int CSIDL_MYMUSIC                    = 0x000d;
+        internal const int CSIDL_MYPICTURES                 = 0x0027;
+
+
+        internal static int GetModuleFileName(IntPtr hModule, StringBuilder buffer, int length)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool GetUserName(StringBuilder lpBuffer, int[] nSize)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static int SHGetFolderPath(IntPtr hwndOwner, int nFolder, IntPtr hToken, int dwFlags, StringBuilder lpszPath)
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static bool LookupAccountName(string machineName, string accountName, byte[] sid,
+                                               ref int sidLen, StringBuilder domainName, ref int domainNameLen, out int peUse)
+        {
+            peUse = 0;
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/Path.cs b/base/Libraries/System.IO/Path.cs
new file mode 100644
index 0000000..061be90
--- /dev/null
+++ b/base/Libraries/System.IO/Path.cs
@@ -0,0 +1,574 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Path
+**
+**
+** Purpose: A collection of path manipulation methods.
+**
+** Date:  February 22, 2000
+**
+===========================================================*/
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Globalization;
+
+namespace System.IO {
+    // Provides methods for processing directory strings in an ideally
+    // cross-platform manner.  Most of the methods don't do a complete
+    // full parsing (such as examining a UNC hostname), but they will
+    // handle most string operations.
+    //
+    // File names cannot contain backslash (\), slash (/), colon (:),
+    // asterisk (*), question mark (?), quote ("), less than (<),
+    // greater than (>), or pipe (|).  The first three are used as directory
+    // separators on various platforms.  Asterisk and question mark are treated
+    // as wild cards.  Less than, Greater than, and pipe all redirect input
+    // or output from a program to a file or some combination thereof.  Quotes
+    // are special.
+    //
+    // We are guaranteeing that Path.SeparatorChar is the correct
+    // directory separator on all platforms, and we will support
+    // Path.AltSeparatorChar as well.  To write cross platform
+    // code with minimal pain, you can use slash (/) as a directory separator in
+    // your strings.
+    // Class contains only static data, no need to serialize
+    //| <include file='doc\Path.uex' path='docs/doc[@for="Path"]/*' />
+    public sealed class Path
+    {
+
+        private Path() {
+        }
+
+        // Platform specific directory separator character.  This is backslash
+        // ('\') on Windows, slash ('/') on Unix, and colon (':') on Mac.
+        //
+        // @TODO porting: Make this platform specific when we port.
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.DirectorySeparatorChar"]/*' />
+        public static readonly char DirectorySeparatorChar = '/';
+
+        // Platform specific alternate directory separator character.
+        // This is backslash ('\') on Unix, and slash ('/') on Windows
+        // and MacOS.
+        //
+        // @TODO porting: Make this platform specific when we port.
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.AltDirectorySeparatorChar"]/*' />
+        public static readonly char AltDirectorySeparatorChar = '\\';
+
+        // Platform specific volume separator character.  This is colon (':')
+        // on Windows and MacOS, and slash ('/') on Unix.  This is mostly
+        // useful for parsing paths like "c:\windows" or "MacVolume:System Folder".
+        //
+        // @TODO porting: Make this platform specific when we port.
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.VolumeSeparatorChar"]/*' />
+        public static readonly char VolumeSeparatorChar = ':';
+
+        // Platform specific invalid list of characters in a path.
+        //
+        // @TODO porting: Make this platform specific when we port.
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.InvalidPathChars"]/*' />
+        public static readonly char[] InvalidPathChars = { '\"', '<', '>', '|', '\0', '\b', (Char)16, (Char)17, (Char)18, (Char)20, (Char)21, (Char)22, (Char)23, (Char)24, (Char)25 };
+
+        internal static readonly char[] InternalInvalidPathChars = { '\"', '<', '>', '|', '\0', '\b', (Char)16, (Char)17, (Char)18, (Char)20, (Char)21, (Char)22, (Char)23, (Char)24, (Char)25 };
+
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.PathSeparator"]/*' />
+        public static readonly char PathSeparator = ';';
+
+
+        // Changes the extension of a file path. The path parameter
+        // specifies a file path, and the extension parameter
+        // specifies a file extension (with a leading period, such as
+        // ".exe" or ".cool").
+        //
+        // The function returns a file path with the same root, directory, and base
+        // name parts as path, but with the file extension changed to
+        // the specified extension. If path is null, the function
+        // returns null. If path does not contain a file extension,
+        // the new file extension is appended to the path. If extension
+        // is null, any existing extension is removed from path.
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.ChangeExtension"]/*' />
+        public static String ChangeExtension(String path, String extension) {
+            if (path != null) {
+                CheckInvalidPathChars(path);
+
+                String s = path;
+                for (int i = path.Length; --i >= 0;) {
+                    char ch = path[i];
+                    if (ch == '.') {
+                        s = path.Substring(0, i);
+                        break;
+                    }
+                    if (ch == DirectorySeparatorChar || ch == AltDirectorySeparatorChar || ch == VolumeSeparatorChar) break;
+                }
+                if (extension != null && path.Length != 0) {
+                    if (extension.Length == 0 || extension[0] != '.') {
+                        s = s + ".";
+                    }
+                    s = s + extension;
+                }
+                return s;
+            }
+            return null;
+        }
+
+
+        // Returns the directory path of a file path. This method effectively
+        // removes the last element of the given file path, i.e. it returns a
+        // string consisting of all characters up to but not including the last
+        // backslash ("\") in the file path. The returned value is null if the file
+        // path is null or if the file path denotes a root (such as "\", "C:", or
+        // "\\server\share").
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetDirectoryName"]/*' />
+        public static String GetDirectoryName(String path) {
+            if (path != null) {
+                CheckInvalidPathChars(path);
+                int root = GetRootLength(path);
+                int i = path.Length;
+                if (i > root) {
+                    i = path.Length;
+                    if (i == root) return null;
+                    while (i > root && path[--i] != DirectorySeparatorChar && path[i] != AltDirectorySeparatorChar);
+                    return path.Substring(0, i);
+                }
+            }
+            return null;
+        }
+
+        // Gets the length of the root DirectoryInfo or whatever DirectoryInfo markers
+        // are specified for the first part of the DirectoryInfo name.
+        //
+        internal static int GetRootLength(String! path) {
+            CheckInvalidPathChars(path);
+
+            int i = 0;
+            int length = path.Length;
+            if (length >= 1 && (IsDirectorySeparator(path[0]))) {
+                // handles UNC names and directories off current drive's root.
+                i = 1;
+                if (length >= 2 && (IsDirectorySeparator(path[1]))) {
+                    i = 2;
+                    int n = 2;
+                    while (i < length && ((path[i] != DirectorySeparatorChar && path[i] != AltDirectorySeparatorChar) || --n > 0)) i++;
+                }
+            }
+            else if (length >= 2 && path[1] == VolumeSeparatorChar) {
+                // handles A:\foo.
+                i = 2;
+                if (length >= 3 && (IsDirectorySeparator(path[2]))) i++;
+            }
+            return i;
+        }
+
+        internal static bool IsDirectorySeparator(char c) {
+            return (c==DirectorySeparatorChar || c == AltDirectorySeparatorChar);
+        }
+
+
+        // Returns the extension of the given path. The returned value includes the
+        // period (".") character of the extension except when you have a terminal period when you get String.Empty, such as ".exe" or
+        // ".cpp". The returned value is null if the given path is
+        // null or if the given path does not include an extension.
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetExtension"]/*' />
+        public static String GetExtension(String path) {
+            if (path==null)
+                return null;
+
+            CheckInvalidPathChars(path);
+            int length = path.Length;
+            for (int i = length; --i >= 0;) {
+                char ch = path[i];
+                if (ch == '.')
+                {
+                    if (i != length - 1)
+                        return path.Substring(i, length - i);
+                    else
+                        return String.Empty;
+                }
+                if (ch == DirectorySeparatorChar || ch == AltDirectorySeparatorChar || ch == VolumeSeparatorChar)
+                    break;
+            }
+            return String.Empty;
+        }
+
+        // Expands the given path to a fully qualified path. The resulting string
+        // consists of a drive letter, a colon, and a root relative path. This
+        // function does not verify that the resulting path is valid or that it
+        // refers to an existing file or DirectoryInfo on the associated volume.
+        //
+        // Your application must have unrestricted Environment permission.
+        //
+
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetFullPath"]/*' />
+        public static String! GetFullPath(String! path) {
+            String fullPath = GetFullPathInternal(path);
+            return fullPath;
+        }
+
+        // This method is internal to let us quickly get a string name
+        // while avoiding a security check.  This also serves a slightly
+        // different purpose - when we open a file, we need to resolve the
+        // path into a fully qualified, non-relative path name.  This
+        // method does that, finding the current drive & directory.  But
+        // as long as we don't return this info to the user, we're good.  However,
+        // the public GetFullPath does need to do a security check.
+        internal static String! GetFullPathInternal(String! path) {
+            if (path == null) {
+                throw new ArgumentNullException("path");
+            }
+            // BUGBUG: We removed a comparison for URI prefixes
+            String newPath;
+            int hresult = nGetFullPathHelper(path,
+                                             InternalInvalidPathChars,
+                                             new char[] {' '},
+                                             DirectorySeparatorChar,
+                                             AltDirectorySeparatorChar,
+                                             true,
+                                             out newPath);
+            if (hresult != 0 || newPath == null) {
+                __Error.WinIOError(hresult, path);
+                assume false; // never get here
+            }
+            newPath = newPath.TrimStart();
+            return newPath.ToLower();
+        }
+
+        internal static int nGetFullPathHelper(String! path,
+                                               char[]! invalidPathChars,
+                                               char[]! whitespaceChars,
+                                               char directorySeparator,
+                                               char altDirectorySeparator,
+                                               char volumeSeparator,
+                                               bool fullCheck,
+                                               out String newPath) {
+            return nGetFullPathHelper(path,invalidPathChars,whitespaceChars,directorySeparator,
+                                      altDirectorySeparator,fullCheck,out newPath);
+        }
+
+        internal static int nGetFullPathHelper(String! path,
+                                               char[]! invalidPathChars,
+                                               char[]! whitespaceChars,
+                                               char directorySeparator,
+                                               char altDirectorySeparator,
+                                               bool fullCheck,
+                                               out String newPath) {
+            int pathLength = path.Length;
+            if (pathLength >= MAX_PATH) {
+                throw new PathTooLongException("Max is "+MAX_PATH+" characters");
+            }
+            int whiteCount = whitespaceChars.Length;
+            if (fullCheck) {
+                while (pathLength > 0) {
+                    bool foundMatch = false;
+                    char lastChar = path[pathLength-1];
+                    for (int whiteIndex = 0; whiteIndex < whiteCount; whiteIndex++) {
+                        if (lastChar == whitespaceChars[whiteIndex]) {
+                            foundMatch = true;
+                            break;
+                        }
+                    }
+                    if (!foundMatch) {
+                        break;
+                    }
+                    pathLength--;
+                }
+            }
+            if (pathLength == 0) {
+                throw new ArgumentException("Empty path");
+            }
+            int invalidCount = invalidPathChars.Length;
+            if (fullCheck) {
+                for (int index = 0; index < pathLength; index++) {
+                    char currentChar = path[index];
+                    for (int invalidIndex = 0; invalidIndex < invalidCount; invalidIndex++) {
+                        if (currentChar == invalidPathChars[invalidIndex]) {
+                            throw new ArgumentException("Path has invalid character");
+                        }
+                    }
+                }
+            }
+            int numDots = 0;
+            int numSpaces = 0;
+            bool fixupDirectorySeparator = false;
+            bool fixupDotSeparator = true;
+            int currentIndex = 0;
+            char[] newBuffer = new char[pathLength+1];
+            int newBufferIndex = 0;
+            if (path[0] == '/' || path[0] == '\\') {
+                newBuffer[newBufferIndex] = '/';
+                newBufferIndex++;
+                currentIndex++;
+            }
+            while (currentIndex < pathLength) {
+                char currentChar = path[currentIndex];
+                if (currentChar == directorySeparator ||
+                    currentChar == altDirectorySeparator) {
+                    if (fixupDotSeparator && numDots > 2) {
+                        numDots = 2;
+                    }
+                    for (int count = 0; count < numDots; count++) {
+                        newBuffer[newBufferIndex] = '.';
+                        newBufferIndex++;
+                    }
+                    numSpaces = 0;
+                    numDots = 0;
+                    fixupDotSeparator = true;
+                    if (!fixupDirectorySeparator) {
+                        fixupDirectorySeparator = true;
+                        newBuffer[newBufferIndex] = directorySeparator;
+                        newBufferIndex++;
+                    }
+                } else if (currentChar == '.' && fixupDotSeparator) {
+                    numDots++;
+                    fixupDirectorySeparator = false;
+                    numSpaces = 0;
+                } else {
+                    fixupDirectorySeparator = false;
+                    if (currentChar == ' ') {
+                        numSpaces++;
+                    } else {
+                        for (int count = 0; count < numDots; count++) {
+                            newBuffer[newBufferIndex] = '.';
+                            newBufferIndex++;
+                        }
+                        numDots = 0;
+                        fixupDotSeparator = false;
+                        for (int count = 0; count < numSpaces; count++) {
+                            newBuffer[newBufferIndex] = ' ';
+                            newBufferIndex++;
+                        }
+                        numSpaces = 0;
+                        newBuffer[newBufferIndex] = currentChar;
+                        newBufferIndex++;
+                    }
+                }
+                currentIndex++;
+            }
+            if (fixupDotSeparator && numDots > 2) {
+                numDots = 2;
+            }
+            for (int count = 0; count < numDots; count++) {
+                newBuffer[newBufferIndex] = '.';
+                newBufferIndex++;
+            }
+            if (newBufferIndex == 0) {
+                throw new ArgumentException("Empty path");
+            }
+            newBuffer[newBufferIndex] = '\0';
+            if (newBuffer[0] == '\\' && newBuffer[1] == '\\') {
+                int startIndex = 2;
+                while (startIndex < newBufferIndex) {
+                    if (newBuffer[startIndex] == '/') {
+                        startIndex++;
+                        break;
+                    } else {
+                        startIndex++;
+                    }
+                }
+                if (startIndex == newBufferIndex) {
+                    throw new ArgumentException("UNC path without share name");
+                }
+            }
+            if (fullCheck) {
+                System.Text.StringBuilder resultBuffer =
+                    new System.Text.StringBuilder(MAX_PATH+1);
+                String initialPath =
+                    String.StringCTOR(newBuffer, 0, newBufferIndex);
+                int expandedLength = Native.GetFullPathName(initialPath,
+                                                            MAX_PATH+1,
+                                                            resultBuffer);
+                if (expandedLength >= MAX_PATH) {
+                    throw new PathTooLongException("FullPath is too long");
+                }
+                if (expandedLength == 0) {
+                    newPath = null;
+                    return -1;
+                }
+                newPath = resultBuffer.ToString();
+            } else {
+                newPath = String.StringCTOR(newBuffer, 0, newBufferIndex);
+            }
+            return 0;
+        }
+
+        // Returns the name and extension parts of the given path. The resulting
+        // string contains the characters of path that follow the last
+        // backslash ("\"), slash ("/"), or colon (":") character in
+        // path. The resulting string is the entire path if path
+        // contains no backslash after removing trailing slashes, slash, or colon characters. The resulting
+        // string is null if path is null.
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetFileName"]/*' />
+        public static String GetFileName(String path) {
+            if (path != null) {
+                CheckInvalidPathChars(path);
+
+                int length = path.Length;
+                for (int i = length; --i >= 0;) {
+                    char ch = path[i];
+                    if (ch == DirectorySeparatorChar || ch == AltDirectorySeparatorChar || ch == VolumeSeparatorChar)
+                        return path.Substring(i + 1, length - i - 1);
+
+                }
+            }
+            return path;
+        }
+
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetFileNameWithoutExtension"]/*' />
+        public static String GetFileNameWithoutExtension(String path) {
+            path = GetFileName(path);
+            if (path != null)
+            {
+                int i;
+                if ((i=path.LastIndexOf('.')) == -1)
+                    return path; // No path extension found
+                else
+                    return path.Substring(0,i);
+            }
+            return null;
+        }
+
+
+
+        // Returns the root portion of the given path. The resulting string
+        // consists of those rightmost characters of the path that constitute the
+        // root of the path. Possible patterns for the resulting string are: An
+        // empty string (a relative path on the current drive), "\" (an absolute
+        // path on the current drive), "X:" (a relative path on a given drive,
+        // where X is the drive letter), "X:\" (an absolute path on a given drive),
+        // and "\\server\share" (a UNC path for a given server and share name).
+        // The resulting string is null if path is null.
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetPathRoot"]/*' />
+        public static String GetPathRoot(String path) {
+            if (path == null) return null;
+            return path.Substring(0, GetRootLength(path));
+        }
+
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetTempPath"]/*' />
+        public static String GetTempPath()
+        {
+            StringBuilder sb = new StringBuilder(MAX_PATH);
+            uint r = Native.GetTempPath(MAX_PATH, sb);
+            String path = sb.ToString();
+            if (r==0) __Error.WinIOError();
+            return path;
+        }
+
+        // Returns a unique temporary file name, and creates a 0-byte file by that
+        // name on disk.
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.GetTempFileName"]/*' />
+        public static String GetTempFileName()
+        {
+            String path = GetTempPath();
+            StringBuilder sb = new StringBuilder(MAX_PATH);
+            uint r = Native.GetTempFileName(path, "tmp", 0, sb);
+            if (r==0) __Error.WinIOError();
+            return sb.ToString();
+        }
+
+        // Tests if a path includes a file extension. The result is
+        // true if the characters that follow the last directory
+        // separator ('\\' or '/') or volume separator (':') in the path include
+        // a period (".") other than a terminal period. The result is false otherwise.
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.HasExtension"]/*' />
+        public static bool HasExtension(String path) {
+            if (path != null) {
+                CheckInvalidPathChars(path);
+
+                for (int i = path.Length; --i >= 0;) {
+                    char ch = path[i];
+                    if (ch == '.') {
+                        if ( i != path.Length - 1)
+                            return true;
+                        else
+                            return false;
+                    }
+                    if (ch == DirectorySeparatorChar || ch == AltDirectorySeparatorChar || ch == VolumeSeparatorChar) break;
+                }
+            }
+            return false;
+        }
+
+
+        // Tests if the given path contains a root. A path is considered rooted
+        // if it starts with a backslash ("\") or a drive letter and a colon (":").
+        //
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.IsPathRooted"]/*' />
+        public static bool IsPathRooted(String path) {
+            if (path != null) {
+                CheckInvalidPathChars(path);
+
+                int length = path.Length;
+                if (length >= 1 && (path[0] == DirectorySeparatorChar || path[0] == AltDirectorySeparatorChar) ||
+                    length >= 2 && path[1] == VolumeSeparatorChar) return true;
+            }
+            return false;
+        }
+
+        //| <include file='doc\Path.uex' path='docs/doc[@for="Path.Combine"]/*' />
+        public static String Combine(String path1, String path2) {
+            if (path1==null || path2==null)
+                throw new ArgumentNullException((path1==null) ? "path1" : "path2");
+            CheckInvalidPathChars(path1);
+            CheckInvalidPathChars(path2);
+
+            if (path2.Length == 0)
+                return path1;
+
+            if (path1.Length == 0)
+                return path2;
+
+            if (IsPathRooted(path2))
+                return path2;
+
+            char ch = path1[path1.Length - 1];
+            if (ch != DirectorySeparatorChar && ch != AltDirectorySeparatorChar && ch != VolumeSeparatorChar)
+                return path1 + DirectorySeparatorChar + path2;
+            return path1 + path2;
+        }
+
+
+        internal static void CheckInvalidPathChars(String! path)
+        {
+            //if (path==null)
+            //  return;
+            if (-1 != path.IndexOfAny(InternalInvalidPathChars))
+                throw new ArgumentException("Argument_InvalidPathChars");
+        }
+
+
+        internal static String! InternalCombine(String path1, String path2) {
+            if (path1==null || path2==null)
+                throw new ArgumentNullException((path1==null) ? "path1" : "path2");
+            CheckInvalidPathChars(path1);
+            CheckInvalidPathChars(path2);
+
+            if (path2.Length == 0)
+                throw new ArgumentException("Argument_PathEmpty", "path2");
+            if (IsPathRooted(path2))
+                throw new ArgumentException("Arg_Path2IsRooted", "path2");
+            int i = path1.Length;
+            if (i == 0) return path2;
+            char ch = path1[i - 1];
+            if (ch != DirectorySeparatorChar && ch != AltDirectorySeparatorChar && ch != VolumeSeparatorChar)
+                return path1 + DirectorySeparatorChar + path2;
+            return path1 + path2;
+        }
+
+        // Windows API definitions
+        internal const int MAX_PATH = 260;  // From WinDef.h
+        internal const int ERROR_SUCCESS = 0;  // From WinError.h
+        internal const int MAX_DIRECTORY_PATH = 248;   // cannot create directories greater than 248 characters
+    }
+}
diff --git a/base/Libraries/System.IO/PathTooLongException.cs b/base/Libraries/System.IO/PathTooLongException.cs
new file mode 100644
index 0000000..259f105
--- /dev/null
+++ b/base/Libraries/System.IO/PathTooLongException.cs
@@ -0,0 +1,40 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  PathTooLongException
+**
+**
+** Purpose: Exception for paths and/or filenames that are
+** too long.
+**
+** Date:   March 24, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+
+    //| <include file='doc\PathTooLongException.uex' path='docs/doc[@for="PathTooLongException"]/*' />
+    public class PathTooLongException : IOException
+    {
+        //| <include file='doc\PathTooLongException.uex' path='docs/doc[@for="PathTooLongException.PathTooLongException"]/*' />
+        public PathTooLongException()
+            : base("IO.PathTooLong") {
+        }
+
+        //| <include file='doc\PathTooLongException.uex' path='docs/doc[@for="PathTooLongException.PathTooLongException1"]/*' />
+        public PathTooLongException(String message)
+            : base(message) {
+        }
+
+        //| <include file='doc\PathTooLongException.uex' path='docs/doc[@for="PathTooLongException.PathTooLongException2"]/*' />
+        public PathTooLongException(String message, Exception innerException)
+            : base(message, innerException) {
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/SeekOrigin.cs b/base/Libraries/System.IO/SeekOrigin.cs
new file mode 100644
index 0000000..47b5eb9
--- /dev/null
+++ b/base/Libraries/System.IO/SeekOrigin.cs
@@ -0,0 +1,34 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Enum:   SeekOrigin
+**
+**
+** Purpose: Enum describing locations in a stream you could
+** seek relative to.
+**
+** Date:  February 18, 2000
+**
+===========================================================*/
+
+using System;
+
+namespace System.IO {
+    // Provides seek reference points.  To seek to the end of a stream,
+    // call stream.Seek(0, SeekOrigin.End).
+    //| <include file='doc\SeekOrigin.uex' path='docs/doc[@for="SeekOrigin"]/*' />
+    public enum SeekOrigin
+    {
+        // These constants match Native's FILE_BEGIN, FILE_CURRENT, and FILE_END
+        //| <include file='doc\SeekOrigin.uex' path='docs/doc[@for="SeekOrigin.Begin"]/*' />
+        Begin = 0,
+        //| <include file='doc\SeekOrigin.uex' path='docs/doc[@for="SeekOrigin.Current"]/*' />
+        Current = 1,
+        //| <include file='doc\SeekOrigin.uex' path='docs/doc[@for="SeekOrigin.End"]/*' />
+        End = 2,
+    }
+}
diff --git a/base/Libraries/System.IO/Stream.cs b/base/Libraries/System.IO/Stream.cs
new file mode 100644
index 0000000..7ceebdd
--- /dev/null
+++ b/base/Libraries/System.IO/Stream.cs
@@ -0,0 +1,316 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  Stream
+**
+**
+** Purpose: Abstract base class for all Streams.  Provides
+** default implementations of asynchronous reads & writes, in
+** terms of the synchronous reads & writes (and vice versa).
+**
+** Date:  February 15, 2000
+**
+===========================================================*/
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace System.IO {
+    //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream"]/*' />
+
+    [CCtorIsRunDuringStartup]
+    public abstract class Stream : IDisposable {
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Null"]/*' />
+        public static readonly Stream Null = new NullStream();
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.CanRead"]/*' />
+        public abstract bool CanRead {
+            get;
+        }
+
+        // If CanSeek is false, Position, Seek, Length, and SetLength should throw.
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.CanSeek"]/*' />
+        public abstract bool CanSeek {
+            get;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.CanWrite"]/*' />
+        public abstract bool CanWrite {
+            get;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Length"]/*' />
+        public abstract long Length {
+            get;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Position"]/*' />
+        public abstract long Position {
+            get;
+            set;
+        }
+
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Close"]/*' />
+        public virtual void Close()
+        {
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.IDisposable.Dispose"]/*' />
+        /// <internalonly/>
+        void IDisposable.Dispose()
+        {
+            Close();
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Flush"]/*' />
+        public abstract void Flush();
+
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.CreateWaitHandle"]/*' />
+        [CLSCompliant(false)]
+        protected virtual WaitHandle CreateWaitHandle()
+        {
+            return new ManualResetEvent(false);
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.BeginRead"]/*' />
+        public virtual IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, Object _state)
+        {
+            if (!CanRead) __Error.ReadNotSupported();
+
+            // To avoid a race with a stream's position pointer & generating race
+            // conditions with internal buffer indexes in our own streams that
+            // don't natively support async IO operations when there are multiple
+            // async requests outstanding, we will block the application's main
+            // thread and do the IO synchronously.
+            SynchronousAsyncResult asyncResult = new SynchronousAsyncResult(_state, false);
+            try {
+                int numRead = Read(buffer, offset, count);
+                asyncResult._numRead = numRead;
+                asyncResult._isCompleted = true;
+                asyncResult._waitHandle.Set();
+            }
+            catch (IOException e) {
+                asyncResult._exception = e;
+            }
+
+            if (callback != null)
+                callback(asyncResult);
+
+            return asyncResult;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.EndRead"]/*' />
+        public virtual int EndRead(IAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            SynchronousAsyncResult ar = asyncResult as SynchronousAsyncResult;
+            if (ar == null || ar.IsWrite) {
+                __Error.WrongAsyncResult();
+                assume false; // never gets here
+            }
+            if (ar._EndXxxCalled) {
+                __Error.EndReadCalledTwice();
+                assume false; // never gets here
+            }
+            ar._EndXxxCalled = true;
+
+            if (ar._exception != null)
+                throw ar._exception;
+
+            return ar._numRead;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.BeginWrite"]/*' />
+        public virtual IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, Object _state)
+        {
+            if (!CanWrite) __Error.WriteNotSupported();
+
+            // To avoid a race with a stream's position pointer & generating race
+            // conditions with internal buffer indexes in our own streams that
+            // don't natively support async IO operations when there are multiple
+            // async requests outstanding, we will block the application's main
+            // thread and do the IO synchronously.
+            SynchronousAsyncResult asyncResult = new SynchronousAsyncResult(_state, true);
+            try {
+                Write(buffer, offset, count);
+                asyncResult._isCompleted = true;
+                asyncResult._waitHandle.Set();
+            }
+            catch (IOException e) {
+                asyncResult._exception = e;
+            }
+
+            if (callback != null)
+                callback.BeginInvoke(asyncResult, null, null);
+
+            return asyncResult;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.EndWrite"]/*' />
+        public virtual void EndWrite(IAsyncResult asyncResult)
+        {
+            if (asyncResult==null)
+                throw new ArgumentNullException("asyncResult");
+
+            SynchronousAsyncResult ar = asyncResult as SynchronousAsyncResult;
+            if (ar == null || !ar.IsWrite) {
+                __Error.WrongAsyncResult();
+                assume false; // never gets here
+            }
+            if (ar._EndXxxCalled) {
+                __Error.EndWriteCalledTwice();
+                assume false; // never gets here
+            }
+            ar._EndXxxCalled = true;
+
+            if (ar._exception != null)
+                throw ar._exception;
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Seek"]/*' />
+        public abstract long Seek(long offset, SeekOrigin origin);
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.SetLength"]/*' />
+        public abstract void SetLength(long value);
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Read"]/*' />
+        public abstract int Read([In, Out] byte[] buffer, int offset, int count);
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.ReadByte"]/*' />
+        public virtual int ReadByte()
+        {
+            // Reads one byte from the stream by calling Read(byte[], int, int).
+            // Will return an unsigned byte cast to an int or -1 on end of stream.
+            // The performance of the default implementation on Stream is bad,
+            // and any subclass with an internal buffer should override this method.
+            byte[] oneByteArray = new byte[1];
+            int r = Read(oneByteArray, 0, 1);
+            if (r==0)
+                return -1;
+            return oneByteArray[0];
+        }
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.Write"]/*' />
+        public abstract void Write(byte[] buffer, int offset, int count);
+
+        //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.WriteByte"]/*' />
+        public virtual void WriteByte(byte value)
+        {
+            // Writes one byte from the stream by calling Write(byte[], int, int).
+            // The performance of the default implementation on Stream is bad,
+            // and any subclass with an internal buffer should override this method.
+            byte[] oneByteArray = new byte[1];
+            oneByteArray[0] = value;
+            Write(oneByteArray, 0, 1);
+        }
+
+        // No data, no need to serialize
+        private class NullStream : Stream
+        {
+            protected internal NullStream() {}
+
+            //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.NullStream.CanRead"]/*' />
+            public override bool CanRead {
+                get { return true; }
+            }
+
+            //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.NullStream.CanWrite"]/*' />
+            public override bool CanWrite {
+                get { return true; }
+            }
+
+            //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.NullStream.CanSeek"]/*' />
+            public override bool CanSeek {
+                get { return true; }
+            }
+
+            //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.NullStream.Length"]/*' />
+            public override long Length {
+                get { return 0; }
+            }
+
+            //| <include file='doc\Stream.uex' path='docs/doc[@for="Stream.NullStream.Position"]/*' />
+            public override long Position {
+                get { return 0; }
+                set {}
+            }
+
+            public override void Close()
+            {
+            }
+
+            public override void Flush()
+            {
+            }
+
+            public override int Read([In, Out] byte[] buffer, int offset, int count)
+            {
+                return 0;
+            }
+
+            public override void Write(byte[] buffer, int offset, int count)
+            {
+            }
+
+            public override long Seek(long offset, SeekOrigin origin)
+            {
+                return 0;
+            }
+
+            public override void SetLength(long length)
+            {
+            }
+        }
+
+        // Used as the IAsyncResult object when using asynchronous IO methods
+        // on the base Stream class.  Note I'm not using async delegates, so
+        // this is necessary.
+        private sealed class SynchronousAsyncResult : IAsyncResult
+        {
+            internal ManualResetEvent _waitHandle;
+            internal Object _stateObject;
+            internal int _numRead;
+            internal bool _isCompleted;
+            internal bool _isWrite;
+            internal bool _EndXxxCalled;
+            internal Exception _exception;
+
+            internal SynchronousAsyncResult(Object asyncStateObject, bool isWrite)
+            {
+                _stateObject = asyncStateObject;
+                _isWrite = isWrite;
+                _waitHandle = new ManualResetEvent(false);
+            }
+
+            public bool IsCompleted {
+                get { return _isCompleted; }
+            }
+
+            public WaitHandle AsyncWaitHandle {
+                get { return _waitHandle; }
+            }
+
+            public Object AsyncState {
+                get { return _stateObject; }
+            }
+
+            public bool CompletedSynchronously {
+                get { return true; }
+            }
+
+            internal bool IsWrite {
+                get { return _isWrite; }
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/StreamReader.cs b/base/Libraries/System.IO/StreamReader.cs
new file mode 100644
index 0000000..3403c5f
--- /dev/null
+++ b/base/Libraries/System.IO/StreamReader.cs
@@ -0,0 +1,570 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  StreamReader
+**
+**
+** Purpose: For reading text from streams in a particular
+** encoding.
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace System.IO {
+    // This class implements a TextReader for reading characters to a Stream.
+    // This is designed for character input in a particular Encoding,
+    // whereas the Stream class is designed for byte input and output.
+    //
+    //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader"]/*' />
+    public class StreamReader : TextReader
+    {
+#if DONT
+        // Note StreamReader.Null is threadsafe.
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.Null"]/*' />
+        public new static readonly StreamReader Null = new NullStreamReader();
+#endif
+
+        // Using a 1K byte buffer and a 4K FileStream buffer works out pretty well
+        // perf-wise.  On even a 40 MB text file, any perf loss by using a 4K
+        // buffer is negated by the win of allocating a smaller byte[], which
+        // saves construction time.  This does break Anders' adaptive buffering,
+        // but that shouldn't be a problem since this is slightly faster.  The
+        // web services guys will benefit here the most.  -- Brian  7/9/2001
+        internal const int DefaultBufferSize = 1024;  // Byte buffer size
+        private const int DefaultFileStreamBufferSize = 4096;
+        private const int MinBufferSize = 128;
+
+        private Stream stream;
+        private Encoding encoding;
+        private Decoder decoder;
+        private byte[] byteBuffer;
+        private char[] charBuffer;
+        private byte[] _preamble;   // Encoding's preamble, which identifies this encoding.
+        private int charPos;
+        private int charLen;
+        // Record the number of valid bytes in the byteBuffer, for a few checks.
+        private int byteLen;
+
+        // This is the maximum number of chars we can get from one call to
+        // ReadBuffer.  Used so ReadBuffer can tell when to copy data into
+        // a user's char[] directly, instead of our internal char[].
+        private int _maxCharsPerBuffer;
+
+        // We will support looking for byte order marks in the stream and trying
+        // to decide what the encoding might be from the byte order marks, IF they
+        // exist.  But that's all we'll do.  Note this is fragile.
+        private bool _detectEncoding;
+
+        // Whether we must still check for the encoding's given preamble at the
+        // beginning of this file.
+        private bool _checkPreamble;
+
+        // Whether the stream is most likely not going to give us back as much
+        // data as we want the next time we call it.  We must do the computation
+        // before we do any byte order mark handling and save the result.  Note that
+        // we need this to allow people to handle streams where they block waiting
+        // for you to send a response, like logging in on a Unix machine.
+        private bool _isBlocked;
+
+        [Microsoft.Contracts.NotDelayed]
+        internal StreamReader() {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(Stream stream)
+            : this(stream, Encoding.UTF8, true, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader8"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(Stream stream, bool detectEncodingFromByteOrderMarks)
+            : this(stream, Encoding.UTF8, detectEncodingFromByteOrderMarks, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(Stream stream, Encoding encoding)
+            : this(stream, encoding, true, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader2"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
+            : this(stream, encoding, detectEncodingFromByteOrderMarks, DefaultBufferSize) {
+        }
+
+        // Creates a new StreamReader for the given stream.  The
+        // character encoding is set by encoding and the buffer size,
+        // in number of 16-bit characters, is set by bufferSize.
+        //
+        // Note that detectEncodingFromByteOrderMarks is a very
+        // loose attempt at detecting the encoding by looking at the first
+        // 3 bytes of the stream.  It will recognize UTF-8, little endian
+        // unicode, and big endian unicode text, but that's it.  If neither
+        // of those three match, it will use the Encoding you provided.
+        //
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader3"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)
+        {
+            if (stream==null || encoding==null)
+                throw new ArgumentNullException((stream==null ? "stream" : "encoding"));
+            if (!stream.CanRead)
+                throw new ArgumentException("Argument_StreamNotReadable");
+            if (bufferSize <= 0)
+                throw new ArgumentOutOfRangeException("bufferSize", "ArgumentOutOfRange_NeedPosNum");
+
+            Init(stream, encoding, detectEncodingFromByteOrderMarks, bufferSize);
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader4"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(String path)
+            : this(path, Encoding.UTF8, true, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader9"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(String path, bool detectEncodingFromByteOrderMarks)
+            : this(path, Encoding.UTF8, detectEncodingFromByteOrderMarks, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader5"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(String path, Encoding encoding)
+            : this(path, encoding, true, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader6"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(String path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
+            : this(path, encoding, detectEncodingFromByteOrderMarks, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.StreamReader7"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamReader(String path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)
+        {
+            // Don't open a Stream before checking for invalid arguments,
+            // or we'll create a FileStream on disk and we won't close it until
+            // the finalizer runs, causing problems for applications.
+            if (path==null || encoding==null)
+                throw new ArgumentNullException((path==null ? "path" : "encoding"));
+            if (path.Length==0)
+                throw new ArgumentException("Argument_EmptyPath");
+            if (bufferSize <= 0)
+                throw new ArgumentOutOfRangeException("bufferSize", "ArgumentOutOfRange_NeedPosNum");
+
+            Stream stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize);
+            Init(stream, encoding, detectEncodingFromByteOrderMarks, bufferSize);
+        }
+
+        private void Init(Stream stream, Encoding! encoding, bool detectEncodingFromByteOrderMarks, int bufferSize) {
+            this.stream = stream;
+            this.encoding = encoding;
+            decoder = encoding.GetDecoder();
+            if (bufferSize < MinBufferSize) bufferSize = MinBufferSize;
+            byteBuffer = new byte[bufferSize];
+            _maxCharsPerBuffer = encoding.GetMaxCharCount(bufferSize);
+            charBuffer = new char[_maxCharsPerBuffer];
+            byteLen = 0;
+            _detectEncoding = detectEncodingFromByteOrderMarks;
+            _preamble = encoding.GetPreamble();
+            _checkPreamble = (_preamble.Length > 0);
+            _isBlocked = false;
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.Close"]/*' />
+        public override void Close()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.Dispose"]/*' />
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) {
+                if (stream != null)
+                    stream.Close();
+            }
+            if (stream != null) {
+                stream = null;
+                encoding = null;
+                decoder = null;
+                byteBuffer = null;
+                charBuffer = null;
+                charPos = 0;
+                charLen = 0;
+            }
+            base.Dispose(disposing);
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.CurrentEncoding"]/*' />
+        public virtual Encoding CurrentEncoding {
+            get { return encoding; }
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.BaseStream"]/*' />
+        public virtual Stream BaseStream {
+            get { return stream; }
+        }
+
+        // DiscardBufferedData tells StreamReader to throw away its internal
+        // buffer contents.  This is useful if the user needs to seek on the
+        // underlying stream to a known location then wants the StreamReader
+        // to start reading from this new point.  This method should be called
+        // very sparingly, if ever, since it can lead to very poor performance.
+        // However, it may be the only way of handling some scenarios where
+        // users need to re-read the contents of a StreamReader a second time.
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.DiscardBufferedData"]/*' />
+        public void DiscardBufferedData() {
+            byteLen = 0;
+            charLen = 0;
+            charPos = 0;
+            decoder = encoding.GetDecoder();
+            _isBlocked = false;
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.Peek"]/*' />
+        public override int Peek() {
+            if (stream == null)
+                __Error.ReaderClosed();
+
+            if (charPos == charLen) {
+                if (_isBlocked || ReadBuffer() == 0) return -1;
+            }
+            return charBuffer[charPos];
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.Read"]/*' />
+        public override int Read() {
+            if (stream == null)
+                __Error.ReaderClosed();
+
+            if (charPos == charLen) {
+                if (ReadBuffer() == 0) return -1;
+            }
+            return charBuffer[charPos++];
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.Read1"]/*' />
+        public override int Read([In, Out] char[] buffer, int index, int count) {
+            if (stream == null)
+                __Error.ReaderClosed();
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0 || count < 0)
+                throw new ArgumentOutOfRangeException((index < 0 ? "index" : "count"), "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            int charsRead = 0;
+            // As a perf optimization, if we had exactly one buffer's worth of
+            // data read in, let's try writing directly to the user's buffer.
+            bool readToUserBuffer = false;
+            while (count > 0) {
+                int n = charLen - charPos;
+                if (n == 0) n = ReadBuffer(buffer, index + charsRead, count, out readToUserBuffer);
+                if (n == 0) break;  // We're at EOF
+                if (n > count) n = count;
+                if (!readToUserBuffer) {
+                    Buffer.BlockCopy(charBuffer, charPos * 2, buffer, (index + charsRead) * 2, n*2);
+                    charPos += n;
+                }
+                charsRead += n;
+                count -= n;
+                // This function shouldn't block for an indefinite amount of time,
+                // or reading from a network stream won't work right.  If we got
+                // fewer bytes than we requested, then we want to break right here.
+                if (_isBlocked)
+                    break;
+            }
+            return charsRead;
+        }
+
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.ReadToEnd"]/*' />
+        public override String ReadToEnd()
+        {
+            if (stream == null)
+                __Error.ReaderClosed();
+
+            // For performance, call Read(char[], int, int) with a buffer
+            // as big as the StreamReader's internal buffer, to get the
+            // readToUserBuffer optimization.
+            char[] chars = new char[charBuffer.Length];
+            int len;
+            StringBuilder sb = new StringBuilder(charBuffer.Length);
+            while((len=Read(chars, 0, chars.Length)) != 0) {
+                sb.Append(chars, 0, len);
+            }
+            return sb.ToString();
+        }
+
+        // Trims n bytes from the front of the buffer.
+        private void CompressBuffer(int n)
+        {
+            Buffer.BlockCopy(byteBuffer, n, byteBuffer, 0, byteLen - n);
+            byteLen -= n;
+        }
+
+        // returns whether the first array starts with the second array.
+        private static bool BytesMatch(byte[]! buffer, byte[]! compareTo)
+        {
+            Debug.Assert(buffer.Length >= compareTo.Length, "Your Encoding's Preamble array is pretty darn huge!");
+            for(int i=0; i<compareTo.Length; i++)
+                if (buffer[i] != compareTo[i])
+                    return false;
+            return true;
+        }
+
+        private void DetectEncoding()
+        {
+            if (byteLen < 2)
+                return;
+            _detectEncoding = false;
+            bool changedEncoding = false;
+            if (byteBuffer[0]==0xFE && byteBuffer[1]==0xFF) {
+                // Big Endian Unicode
+                encoding = new UnicodeEncoding(true, true);
+                decoder = encoding.GetDecoder();
+                CompressBuffer(2);
+                changedEncoding = true;
+            }
+            else if (byteBuffer[0]==0xFF && byteBuffer[1]==0xFE) {
+                // Little Endian Unicode
+                encoding = new UnicodeEncoding(false, true);
+                decoder = encoding.GetDecoder();
+                CompressBuffer(2);
+                changedEncoding = true;
+            }
+            else if (byteLen >= 3 && byteBuffer[0]==0xEF && byteBuffer[1]==0xBB && byteBuffer[2]==0xBF) {
+                // UTF-8
+                encoding = Encoding.UTF8;
+                decoder = encoding.GetDecoder();
+                CompressBuffer(3);
+                changedEncoding = true;
+            }
+            else if (byteLen == 2)
+                _detectEncoding = true;
+            // Note: in the future, if we change this algorithm significantly,
+            // we can support checking for the preamble of the given encoding.
+
+            if (changedEncoding) {
+                _maxCharsPerBuffer = encoding.GetMaxCharCount(byteBuffer.Length);
+                charBuffer = new char[_maxCharsPerBuffer];
+            }
+        }
+
+
+        private int ReadBuffer() {
+            charLen = 0;
+            byteLen = 0;
+            charPos = 0;
+            do {
+                byteLen = stream.Read(byteBuffer, 0, byteBuffer.Length);
+
+                if (byteLen == 0)  // We're at EOF
+                    return charLen;
+
+                // _isBlocked == whether we read fewer bytes than we asked for.
+                // Note we must check it here because CompressBuffer or
+                // DetectEncoding will screw with byteLen.
+                _isBlocked = (byteLen < byteBuffer.Length);
+
+                if (_checkPreamble && byteLen >= _preamble.Length) {
+                    _checkPreamble = false;
+                    if (BytesMatch(byteBuffer, _preamble)) {
+                        _detectEncoding = false;
+                        CompressBuffer(_preamble.Length);
+                    }
+                }
+
+                // If we're supposed to detect the encoding and haven't done so yet,
+                // do it.  Note this may need to be called more than once.
+                if (_detectEncoding && byteLen >= 2)
+                    DetectEncoding();
+
+                charLen += decoder.GetChars(byteBuffer, 0, byteLen, charBuffer, charLen);
+            } while (charLen == 0);
+            //Console.WriteLine("ReadBuffer called.  chars: "+charLen);
+            return charLen;
+        }
+
+
+        // This version has a perf optimization to decode data DIRECTLY into the
+        // user's buffer, bypassing StreamWriter's own buffer.
+        // This gives a > 20% perf improvement for our encodings across the board,
+        // but only when asking for at least the number of characters that one
+        // buffer's worth of bytes could produce.
+        // This optimization, if run, will break SwitchEncoding, so we must not do
+        // this on the first call to ReadBuffer.
+        private int ReadBuffer(char[] userBuffer, int userOffset, int desiredChars, out bool readToUserBuffer) {
+            charLen = 0;
+            byteLen = 0;
+            charPos = 0;
+            int charsRead = 0;
+
+            // As a perf optimization, we can decode characters DIRECTLY into a
+            // user's char[].  We absolutely must not write more characters
+            // into the user's buffer than they asked for.  Calculating
+            // encoding.GetMaxCharCount(byteLen) each time is potentially very
+            // expensive - instead, cache the number of chars a full buffer's
+            // worth of data may produce.  Yes, this makes the perf optimization
+            // less aggressive, in that all reads that asked for fewer than AND
+            // returned fewer than _maxCharsPerBuffer chars won't get the user
+            // buffer optimization.  This affects reads where the end of the
+            // Stream comes in the middle somewhere, and when you ask for
+            // fewer chars than than your buffer could produce.
+            readToUserBuffer = desiredChars >= _maxCharsPerBuffer;
+
+            do {
+                byteLen = stream.Read(byteBuffer, 0, byteBuffer.Length);
+
+                if (byteLen == 0)  // EOF
+                    return charsRead;
+
+                // _isBlocked == whether we read fewer bytes than we asked for.
+                // Note we must check it here because CompressBuffer or
+                // DetectEncoding will screw with byteLen.
+                _isBlocked = (byteLen < byteBuffer.Length);
+
+                // On the first call to ReadBuffer, if we're supposed to detect the encoding, do it.
+                if (_detectEncoding && byteLen >= 2) {
+                    DetectEncoding();
+                    // DetectEncoding changes some buffer state.  Recompute this.
+                    readToUserBuffer = desiredChars >= _maxCharsPerBuffer;
+                }
+
+                if (_checkPreamble && byteLen >= _preamble.Length) {
+                    _checkPreamble = false;
+                    if (BytesMatch(byteBuffer, _preamble)) {
+                        _detectEncoding = false;
+                        CompressBuffer(_preamble.Length);
+                        // CompressBuffer changes some buffer state.  Recompute this.
+                        readToUserBuffer = desiredChars >= _maxCharsPerBuffer;
+                    }
+                }
+
+                /*
+                if (readToUserBuffer)
+                    Console.Write('.');
+                else {
+                    Console.WriteLine("Desired chars is wrong.  byteBuffer.length: "+byteBuffer.Length+"  max chars is: "+encoding.GetMaxCharCount(byteLen)+"  desired: "+desiredChars);
+                }
+                */
+
+                charPos = 0;
+                if (readToUserBuffer) {
+                    charsRead += decoder.GetChars(byteBuffer, 0, byteLen, userBuffer, userOffset + charsRead);
+                    charLen = 0;  // StreamReader's buffer is empty.
+                }
+                else {
+                    charsRead = decoder.GetChars(byteBuffer, 0, byteLen, charBuffer, charsRead);
+                    charLen += charsRead;  // Number of chars in StreamReader's buffer.
+                }
+            } while (charsRead == 0);
+            //Console.WriteLine("ReadBuffer: charsRead: "+charsRead+"  readToUserBuffer: "+readToUserBuffer);
+            return charsRead;
+        }
+
+
+        // Reads a line. A line is defined as a sequence of characters followed by
+        // a carriage return ('\r'), a line feed ('\n'), or a carriage return
+        // immediately followed by a line feed. The resulting string does not
+        // contain the terminating carriage return and/or line feed. The returned
+        // value is null if the end of the input stream has been reached.
+        //
+        //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.ReadLine"]/*' />
+        public override String ReadLine() {
+            if (stream == null)
+                __Error.ReaderClosed();
+
+            if (charPos == charLen) {
+                if (ReadBuffer() == 0) return null;
+            }
+            StringBuilder sb = null;
+            do {
+                int i = charPos;
+                do {
+                    char ch = charBuffer[i];
+                    // Note the following common line feed chars:
+                    // \n - UNIX   \r\n - DOS   \r - Mac
+                    if (ch == '\r' || ch == '\n') {
+                        String s;
+                        if (sb != null) {
+                            sb.Append(charBuffer, charPos, i - charPos);
+                            s = sb.ToString();
+                        }
+                        else {
+                            s = new String(charBuffer, charPos, i - charPos);
+                        }
+                        charPos = i + 1;
+                        if (ch == '\r' && (charPos < charLen || ReadBuffer() > 0)) {
+                            if (charBuffer[charPos] == '\n') charPos++;
+                        }
+                        return s;
+                    }
+                    i++;
+                } while (i < charLen);
+                i = charLen - charPos;
+                if (sb == null) sb = new StringBuilder(i + 80);
+                sb.Append(charBuffer, charPos, i);
+            } while (ReadBuffer() > 0);
+            return sb.ToString();
+        }
+
+        // No data, class doesn't need to be serializable.
+        // Note this class is threadsafe.
+        private class NullStreamReader : StreamReader
+        {
+            [Microsoft.Contracts.NotDelayed]
+            public NullStreamReader()
+            {
+            }
+
+            public override Stream BaseStream {
+                get { return Stream.Null; }
+            }
+
+            public override Encoding CurrentEncoding {
+                get { return Encoding.Unicode; }
+            }
+
+            public override int Peek()
+            {
+                return -1;
+            }
+
+            public override int Read()
+            {
+                return -1;
+            }
+
+            //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.NullStreamReader.Read"]/*' />
+            public override int Read(char[] buffer, int index, int count) {
+                return 0;
+            }
+
+            //| <include file='doc\StreamReader.uex' path='docs/doc[@for="StreamReader.NullStreamReader.ReadLine"]/*' />
+            public override String ReadLine() {
+                return null;
+            }
+
+            public override String ReadToEnd()
+            {
+                return String.Empty;
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/StreamWriter.cs b/base/Libraries/System.IO/StreamWriter.cs
new file mode 100644
index 0000000..4bde8ec
--- /dev/null
+++ b/base/Libraries/System.IO/StreamWriter.cs
@@ -0,0 +1,359 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  StreamWriter
+**
+**
+** Purpose: For writing text to streams in a particular
+** encoding.
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace System.IO {
+    // This class implements a TextWriter for writing characters to a Stream.
+    // This is designed for character output in a particular Encoding,
+    // whereas the Stream class is designed for byte input and output.
+    //
+    //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter"]/*' />
+    public class StreamWriter : TextWriter
+    {
+        // For UTF-8, the values of 1K for the default buffer size and 4K for the
+        // file stream buffer size are reasonable & give very reasonable
+        // performance for in terms of construction time for the StreamWriter and
+        // write perf.  Note that for UTF-8, we end up allocating a 4K byte buffer,
+        // which means we take advantage of Anders' adaptive buffering code.
+        // The performance using UnicodeEncoding is acceptable.  -- Brian 7/9/2001
+        private const int DefaultBufferSize = 1024;   // char[]
+        private const int DefaultFileStreamBufferSize = 4096;
+        private const int MinBufferSize = 128;
+
+#if DONT
+        // Bit bucket - Null has no backing store.
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Null"]/*' />
+        public new static readonly StreamWriter Null = new StreamWriter(Stream.Null, new UTF8Encoding(false, true), 128);
+#endif
+
+        internal Stream stream;
+        private Encoding encoding;
+        private Encoder encoder;
+        internal byte[] byteBuffer;
+        internal char[] charBuffer;
+        internal int charPos;
+        internal int charLen;
+        internal bool autoFlush;
+        private bool haveWrittenPreamble;
+        private bool closable;  // For Console.Out - should Finalize call Dispose?
+
+#if _DEBUG
+        private String allocatedFrom = String.Empty;
+#endif
+
+        [Microsoft.Contracts.NotDelayed]
+        internal StreamWriter() {
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(Stream stream)
+            : this(stream, new UTF8Encoding(false, true), DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter1"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(Stream stream, Encoding encoding)
+            : this(stream, encoding, DefaultBufferSize) {
+        }
+
+        // Creates a new StreamWriter for the given stream.  The
+        // character encoding is set by encoding and the buffer size,
+        // in number of 16-bit characters, is set by bufferSize.
+        //
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter2"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(Stream stream, Encoding encoding, int bufferSize) {
+            if (stream==null || encoding==null)
+                throw new ArgumentNullException((stream==null ? "stream" : "encoding"));
+            if (!stream.CanWrite)
+                throw new ArgumentException("Argument_StreamNotWritable");
+            if (bufferSize <= 0) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NeedPosNum");
+
+            Init(stream, encoding, bufferSize);
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter3"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(String path)
+            : this(path, false, new UTF8Encoding(false, true), DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter4"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(String path, bool append)
+            : this(path, append, new UTF8Encoding(false, true), DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter5"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(String path, bool append, Encoding encoding)
+            : this(path, append, encoding, DefaultBufferSize) {
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.StreamWriter6"]/*' />
+        [Microsoft.Contracts.NotDelayed]
+        public StreamWriter(String path, bool append, Encoding encoding, int bufferSize) {
+            if (path==null || encoding==null)
+                throw new ArgumentNullException((path==null ? "path" : "encoding"));
+            if (bufferSize <= 0) throw new ArgumentOutOfRangeException("ArgumentOutOfRange_NeedPosNum");
+
+            Stream stream = CreateFile(path, append);
+            Init(stream, encoding, bufferSize);
+        }
+
+        private void Init(Stream! stream, Encoding! encoding, int bufferSize)
+        {
+            this.stream = stream;
+            this.encoding = encoding;
+            this.encoder = encoding.GetEncoder();
+            if (bufferSize < MinBufferSize) bufferSize = MinBufferSize;
+            charBuffer = new char[bufferSize];
+            byteBuffer = new byte[encoding.GetMaxByteCount(bufferSize)];
+            charLen = bufferSize;
+            // If we're appending to a Stream that already has data, don't write
+            // the preamble junk.
+            if (stream.CanSeek && stream.Position > 0)
+                haveWrittenPreamble = true;
+            closable = true;
+        }
+
+        private static Stream! CreateFile(String path, bool append) {
+            FileMode mode = append? FileMode.Append: FileMode.Create;
+            FileStream f = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize);
+            return f;
+        }
+
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Close"]/*' />
+        public override void Close() {
+            Dispose(true);
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Dispose"]/*' />
+        protected override void Dispose(bool disposing) {
+            // Dispose of our resources if this StreamWriter is closable.
+            // Note that Console.Out should not be closable.
+            if (disposing) {
+                if (stream != null) {
+                    Flush(true, true);
+                    if (Closable)
+                        stream.Close();
+                }
+            }
+            if (Closable && stream != null) {
+                stream = null;
+                byteBuffer = null;
+                charBuffer = null;
+                encoding = null;
+                encoder = null;
+                charLen = 0;
+                base.Dispose(disposing);
+            }
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Finalize"]/*' />
+        ~StreamWriter()
+        {
+            // Make sure people closed this StreamWriter, but of course, make
+            // allowances for BufferedStream (used by Console.Out & Error) and
+            // StreamWriter::Null.
+#if _DEBUG
+            Debug.Correctness(charPos == 0, "You didn't close a StreamWriter, and you lost data!\r\nStream type: "+(stream==null ? "<null>" : stream.GetType().FullName)+((stream != null && stream is FileStream) ? "  File name: "+((FileStream)stream).NameInternal : "")+"\r\nAllocated from:\r\n"+allocatedFrom);
+#endif
+            Dispose(false);
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Flush"]/*' />
+        public override void Flush() {
+            Flush(true, true);
+        }
+
+        private void Flush(bool flushStream, bool flushEncoder) {
+            // flushEncoder should be true at the end of the file and if
+            // the user explicitly calls Flush (though not if AutoFlush is true).
+            // This is required to flush any dangling characters from our UTF-7
+            // and UTF-8 encoders.
+            if (stream == null)
+                __Error.WriterClosed();
+
+            // Perf boost for Flush on non-dirty writers.
+            if (charPos==0 && !flushStream && !flushEncoder)
+                return;
+
+            if (!haveWrittenPreamble) {
+                haveWrittenPreamble = true;
+                byte[] preamble = encoding.GetPreamble();
+                if (preamble.Length > 0)
+                    stream.Write(preamble, 0, preamble.Length);
+            }
+
+            int count = encoder.GetBytes(charBuffer, 0, charPos, byteBuffer, 0, flushEncoder);
+            charPos = 0;
+            if (count > 0)
+                stream.Write(byteBuffer, 0, count);
+            // By definition, calling Flush should flush the stream, but this is
+            // only necessary if we passed in true for flushStream.  The Web
+            // Services guys have some perf tests where flushing needlessly hurts.
+            if (flushStream)
+                stream.Flush();
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.AutoFlush"]/*' />
+        public virtual bool AutoFlush {
+            get { return autoFlush; }
+            set {
+                autoFlush = value;
+                if (value) Flush(true, false);
+            }
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.BaseStream"]/*' />
+        public virtual Stream BaseStream {
+            get { return stream; }
+        }
+
+        internal bool Closable {
+            get { return closable; }
+            set { closable = value; }
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Encoding"]/*' />
+        public override Encoding Encoding {
+            get { return encoding; }
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Write"]/*' />
+        public override void Write(char value) {
+            if (charPos == charLen) Flush(false, false);
+            charBuffer[charPos++] = value;
+            if (autoFlush) Flush(true, false);
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Write1"]/*' />
+        public override void Write(char[] buffer) {
+            if (buffer == null) {
+                return;
+            }
+            int index = 0;
+            int count = buffer.Length;
+            while (count > 0) {
+                int limit = this.charLen - this.charPos;
+                if (limit <= 0) {
+                    this.Flush(false, false);
+                    limit = this.charLen - this.charPos;
+                }
+                if (limit > count) {
+                    limit = count;
+                }
+                Buffer.BlockCopy(buffer, index*2,
+                                         charBuffer, charPos*2,
+                                         limit*2);
+                this.charPos += limit;
+                index += limit;
+                count -= limit;
+            }
+            if (this.autoFlush) {
+                this.Flush(true, false);
+            }
+        }
+
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Write2"]/*' />
+        public override void Write(char[] buffer, int index, int count) {
+            if (buffer == null) {
+                throw new ArgumentNullException("buffer", "Buffer is null");
+            }
+            if (index < 0) {
+                throw new ArgumentOutOfRangeException("index", "index is negative");
+            }
+            if (count < 0) {
+                throw new ArgumentOutOfRangeException("count", "count is negative");
+            }
+            if (buffer.Length < index + count) {
+                throw new ArgumentException("index + count greater than buffer length");
+            }
+            while (count > 0) {
+                int limit = this.charLen - this.charPos;
+                if (limit <= 0) {
+                    this.Flush(false, false);
+                    limit = this.charLen - this.charPos;
+                }
+                if (limit > count) {
+                    limit = count;
+                }
+                for (int i = 0; i < limit; i++) {
+                    charBuffer[this.charPos + i] = buffer[index + i];
+                }
+                this.charPos += limit;
+                index += limit;
+                count -= limit;
+            }
+            if (this.autoFlush) {
+                this.Flush(true, false);
+            }
+        }
+
+        //| <include file='doc\StreamWriter.uex' path='docs/doc[@for="StreamWriter.Write3"]/*' />
+        public override void Write(String value) {
+            if (value != null) {
+                int count = value.Length;
+                int index = 0;
+                while (count > 0) {
+                    if (charPos == charLen) Flush(false, false);
+                    int n = charLen - charPos;
+                    if (n > count) n = count;
+                    Debug.Assert(n > 0, "StreamWriter::Write(String) isn't making progress!  This is most likely a race condition in user code.");
+                    value.CopyTo(index, charBuffer, charPos, n);
+                    charPos += n;
+                    index += n;
+                    count -= n;
+                }
+                if (autoFlush) Flush(true, false);
+            }
+        }
+
+        /*
+        // This method is more efficient for long strings outputted to streams
+        // than the one on TextWriter, and won't cause any problems in terms of
+        // hiding methods on TextWriter as long as languages respect the
+        // hide-by-name-and-sig metadata flag.
+        public override void WriteLine(String value) {
+        if (value != null) {
+        int count = value.Length;
+        int index = 0;
+        while (count > 0) {
+        if (charPos == charLen) Flush(false);
+        int n = charLen - charPos;
+        if (n > count) n = count;
+        Debug.Assert(n > 0, "StreamWriter::WriteLine(String) isn't making progress!  This is most likely a race condition in user code.");
+        value.CopyTo(index, charBuffer, charPos, n);
+        charPos += n;
+        index += n;
+        count -= n;
+        }
+        }
+        if (charPos >= charLen - 2) Flush(false);
+        Buffer.BlockCopy(CoreNewLine, 0, charBuffer, charPos*2, CoreNewLine.Length * 2);
+        charPos += CoreNewLine.Length;
+        if (autoFlush) Flush(true, false);
+        }
+        */
+    }
+}
diff --git a/base/Libraries/System.IO/StringReader.cs b/base/Libraries/System.IO/StringReader.cs
new file mode 100644
index 0000000..2c4f654
--- /dev/null
+++ b/base/Libraries/System.IO/StringReader.cs
@@ -0,0 +1,148 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  StringReader
+**
+**         Original implementation by Anders Hejlsberg (AndersH)
+**
+** Purpose: For reading text from strings
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace System.IO {
+    // This class implements a text reader that reads from a string.
+    //
+    //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader"]/*' />
+    public class StringReader : TextReader
+    {
+        private String _s;
+        private int _pos;
+        private int _length;
+
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.StringReader"]/*' />
+        public StringReader(String s) {
+            if (s == null)
+                throw new ArgumentNullException("s");
+            _s = s;
+            _length = s == null? 0: s.Length;
+        }
+
+        // Closes this StringReader. Following a call to this method, the String
+        // Reader will throw an ObjectDisposedException.
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.Close"]/*' />
+        public override void Close() {
+            Dispose(true);
+        }
+
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.Dispose"]/*' />
+        protected override void Dispose(bool disposing) {
+            _s = null;
+            _pos = 0;
+            _length = 0;
+            base.Dispose(disposing);
+        }
+
+        // Returns the next available character without actually reading it from
+        // the underlying string. The current position of the StringReader is not
+        // changed by this operation. The returned value is -1 if no further
+        // characters are available.
+        //
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.Peek"]/*' />
+        public override int Peek() {
+            if (_s == null)
+                __Error.ReaderClosed();
+            if (_pos == _length) return -1;
+            return _s[_pos];
+        }
+
+        // Reads the next character from the underlying string. The returned value
+        // is -1 if no further characters are available.
+        //
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.Read"]/*' />
+        public override int Read() {
+            if (_s == null)
+                __Error.ReaderClosed();
+            if (_pos == _length) return -1;
+            return _s[_pos++];
+        }
+
+        // Reads a block of characters. This method will read up to count
+        // characters from this StringReader into the buffer character
+        // array starting at position index. Returns the actual number of
+        // characters read, or zero if the end of the string is reached.
+        //
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.Read1"]/*' />
+        public override int Read([In, Out] char[] buffer, int index, int count) {
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+            if (_s == null)
+                __Error.ReaderClosed();
+
+            int n = _length - _pos;
+            if (n > 0) {
+                if (n > count) n = count;
+                _s.CopyTo(_pos, buffer, index, n);
+                _pos += n;
+            }
+            return n;
+        }
+
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.ReadToEnd"]/*' />
+        public override String ReadToEnd()
+        {
+            if (_s == null)
+                __Error.ReaderClosed();
+            String s;
+            if (_pos==0)
+                s = _s;
+            else
+                s = _s.Substring(_pos, _length - _pos);
+            _pos = _length;
+            return s;
+        }
+
+        // Reads a line. A line is defined as a sequence of characters followed by
+        // a carriage return ('\r'), a line feed ('\n'), or a carriage return
+        // immediately followed by a line feed. The resulting string does not
+        // contain the terminating carriage return and/or line feed. The returned
+        // value is null if the end of the underlying string has been reached.
+        //
+        //| <include file='doc\StringReader.uex' path='docs/doc[@for="StringReader.ReadLine"]/*' />
+        public override String ReadLine() {
+            if (_s == null)
+                __Error.ReaderClosed();
+            int i = _pos;
+            while (i < _length) {
+                char ch = _s[i];
+                if (ch == '\r' || ch == '\n') {
+                    String result = _s.Substring(_pos, i - _pos);
+                    _pos = i + 1;
+                    if (ch == '\r' && _pos < _length && _s[_pos] == '\n') _pos++;
+                    return result;
+                }
+                i++;
+            }
+            if (i > _pos) {
+                String result = _s.Substring(_pos, i - _pos);
+                _pos = i;
+                return result;
+            }
+            return null;
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/StringWriter.cs b/base/Libraries/System.IO/StringWriter.cs
new file mode 100644
index 0000000..326ac74
--- /dev/null
+++ b/base/Libraries/System.IO/StringWriter.cs
@@ -0,0 +1,135 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  StringWriter
+**
+**         Original implementation by Anders Hejlsberg (AndersH)
+**
+** Purpose: For writing text to a string
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+
+using System;
+using System.Text;
+
+namespace System.IO {
+    // This class implements a text writer that writes to a string buffer and allows
+    // the resulting sequence of characters to be presented as a string.
+    //
+    //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter"]/*' />
+    public class StringWriter : TextWriter
+    {
+        private static UnicodeEncoding m_encoding=null;
+
+        private StringBuilder _sb;
+        private bool _isOpen;
+
+        // Constructs a new StringWriter. A new StringBuilder is automatically
+        // created and associated with the new StringWriter.
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.StringWriter"]/*' />
+        public StringWriter()
+            : this(new StringBuilder()) {
+        }
+
+        // Constructs a new StringWriter that writes to the given StringBuilder.
+        //
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.StringWriter1"]/*' />
+        public StringWriter(StringBuilder sb) {
+            if (sb==null)
+                throw new ArgumentNullException("sb", "ArgumentNull_Buffer");
+            _sb = sb;
+            _isOpen = true;
+        }
+
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.Close"]/*' />
+        public override void Close()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.Dispose"]/*' />
+        protected override void Dispose(bool disposing)
+        {
+            // Do not destroy _sb, so that we can extract this after we are
+            // done writing (similar to MemoryStream's GetBuffer & ToArray methods)
+            _isOpen = false;
+            base.Dispose(disposing);
+        }
+
+
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.Encoding"]/*' />
+        public override Encoding Encoding {
+            get {
+                if (m_encoding==null) {
+                    m_encoding = new UnicodeEncoding(false, false);
+                }
+                return m_encoding;
+            }
+        }
+
+        // Returns the underlying StringBuilder. This is either the StringBuilder
+        // that was passed to the constructor, or the StringBuilder that was
+        // automatically created.
+        //
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.GetStringBuilder"]/*' />
+        public virtual StringBuilder GetStringBuilder() {
+            return _sb;
+        }
+
+        // Writes a character to the underlying string buffer.
+        //
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.Write"]/*' />
+        public override void Write(char value) {
+            if (!_isOpen)
+                __Error.WriterClosed();
+            _sb.Append(value);
+        }
+
+        // Writes a range of a character array to the underlying string buffer.
+        // This method will write count characters of data into this
+        // StringWriter from the buffer character array starting at position
+        // index.
+        //
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.Write1"]/*' />
+        public override void Write(char[] buffer, int index, int count) {
+            if (!_isOpen)
+                __Error.WriterClosed();
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            _sb.Append(buffer, index, count);
+        }
+
+        // Writes a string to the underlying string buffer. If the given string is
+        // null, nothing is written.
+        //
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.Write2"]/*' />
+        public override void Write(String value) {
+            if (!_isOpen)
+                __Error.WriterClosed();
+            if (value != null) _sb.Append(value);
+        }
+
+        // Returns a string containing the characters written to this TextWriter
+        // so far.
+        //
+        //| <include file='doc\StringWriter.uex' path='docs/doc[@for="StringWriter.ToString"]/*' />
+#if false
+        public override string ToString() {
+            return _sb.ToString();
+        }
+#endif
+    }
+}
diff --git a/base/Libraries/System.IO/System.IO.csproj b/base/Libraries/System.IO/System.IO.csproj
new file mode 100644
index 0000000..147ac32
--- /dev/null
+++ b/base/Libraries/System.IO/System.IO.csproj
@@ -0,0 +1,70 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\System.IO\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>System.IO</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="Native.cs" />
+    <Compile Include="BinaryReader.cs" />
+    <Compile Include="BinaryWriter.cs" />
+    <Compile Include="BufferedStream.cs" />
+    <Compile Include="Directory.cs" />
+    <Compile Include="DirectoryInfo.cs" />
+    <Compile Include="DirectoryNotFoundException.cs" />
+    <Compile Include="EndOfStreamException.cs" />
+    <Compile Include="File.cs" />
+    <Compile Include="FileAccess.cs" />
+    <Compile Include="FileAttributes.cs" />
+    <Compile Include="FileInfo.cs" />
+    <Compile Include="FileLoadException.cs" />
+    <Compile Include="FileMode.cs" />
+    <Compile Include="FileNotFoundException.cs" />
+    <Compile Include="FileShare.cs" />
+    <Compile Include="FileStream.cs" />
+    <Compile Include="FileSystemInfo.cs" />
+    <Compile Include="IOException.cs" />
+    <Compile Include="MemoryStream.cs" />
+    <Compile Include="Path.cs" />
+    <Compile Include="PathTooLongException.cs" />
+    <Compile Include="SeekOrigin.cs" />
+    <Compile Include="Stream.cs" />
+    <Compile Include="StreamReader.cs" />
+    <Compile Include="StreamWriter.cs" />
+    <Compile Include="StringReader.cs" />
+    <Compile Include="StringWriter.cs" />
+    <Compile Include="TextReader.cs" />
+    <Compile Include="TextWriter.cs" />
+    <Compile Include="__ConsoleTextWriter.cs" />
+    <Compile Include="__DebugOutputTextWriter.cs" />
+    <Compile Include="__Error.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+  
+</Project>
+ 
diff --git a/base/Libraries/System.IO/TextReader.cs b/base/Libraries/System.IO/TextReader.cs
new file mode 100644
index 0000000..7524fc8
--- /dev/null
+++ b/base/Libraries/System.IO/TextReader.cs
@@ -0,0 +1,239 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  TextReader
+**
+**
+** Purpose: Abstract base class for all Text-only Readers.
+** Subclasses will include StreamReader & StringReader.
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Reflection;
+
+namespace System.IO {
+    // This abstract base class represents a reader that can read a sequential
+    // stream of characters.  This is not intended for reading bytes -
+    // there are methods on the Stream class to read bytes.
+    // A subclass must minimally implement the Peek() and Read() methods.
+    //
+    // This class is intended for character input, not bytes.
+    // There are methods on the Stream class for reading bytes.
+    //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader"]/*' />
+    public abstract class TextReader : IDisposable
+    {
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Null"]/*' />
+        public static readonly TextReader Null = new NullTextReader();
+
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.TextReader"]/*' />
+        protected TextReader() {}
+
+        // Closes this TextReader and releases any system resources associated with the
+        // TextReader. Following a call to Close, any operations on the TextReader
+        // may raise exceptions.
+        //
+        // This default method is empty, but descendant classes can override the
+        // method to provide the appropriate functionality.
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Close"]/*' />
+        public virtual void Close()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.IDisposable.Dispose"]/*' />
+        /// <internalonly/>
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+        }
+
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Dispose"]/*' />
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        // Returns the next available character without actually reading it from
+        // the input stream. The current position of the TextReader is not changed by
+        // this operation. The returned value is -1 if no further characters are
+        // available.
+        //
+        // This default method simply returns -1.
+        //
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Peek"]/*' />
+        public virtual int Peek()
+        {
+            return -1;
+        }
+
+        // Reads the next character from the input stream. The returned value is
+        // -1 if no further characters are available.
+        //
+        // This default method simply returns -1.
+        //
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Read"]/*' />
+        public virtual int Read()
+        {
+            return -1;
+        }
+
+        // Reads a block of characters. This method will read up to
+        // count characters from this TextReader into the
+        // buffer character array starting at position
+        // index. Returns the actual number of characters read.
+        //
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Read1"]/*' />
+        public virtual int Read([In, Out] char[] buffer, int index, int count)
+        {
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            int n = 0;
+            do {
+                int ch = Read();
+                if (ch == -1) break;
+                buffer[index + n++] = (char)ch;
+            } while (n < count);
+            return n;
+        }
+
+        // Reads all characters from the current position to the end of the
+        // TextReader, and returns them as one string.
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.ReadToEnd"]/*' />
+        public virtual String ReadToEnd()
+        {
+            char[] chars = new char[4096];
+            int len;
+            StringBuilder sb = new StringBuilder(4096);
+            while((len=Read(chars, 0, chars.Length)) != 0)
+            {
+                sb.Append(chars, 0, len);
+            }
+            return sb.ToString();
+        }
+
+        // Blocking version of read.  Returns only when count
+        // characters have been read or the end of the file was reached.
+        //
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.ReadBlock"]/*' />
+        public virtual int ReadBlock([In, Out] char[] buffer, int index, int count)
+        {
+            int i, n = 0;
+            do {
+                n += (i = Read(buffer, index + n, count - n));
+            } while (i > 0 && n < count);
+            return n;
+        }
+
+        // Reads a line. A line is defined as a sequence of characters followed by
+        // a carriage return ('\r'), a line feed ('\n'), or a carriage return
+        // immediately followed by a line feed. The resulting string does not
+        // contain the terminating carriage return and/or line feed. The returned
+        // value is null if the end of the input stream has been reached.
+        //
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.ReadLine"]/*' />
+        public virtual String ReadLine()
+        {
+            StringBuilder sb = new StringBuilder();
+            while (true) {
+                int ch = Read();
+                if (ch == -1) break;
+                if (ch == '\r' || ch == '\n')
+                {
+                    if (ch == '\r' && Peek() == '\n') Read();
+                    return sb.ToString();
+                }
+                sb.Append((char)ch);
+            }
+            if (sb.Length > 0) return sb.ToString();
+            return null;
+        }
+
+
+        //| <include file='doc\TextReader.uex' path='docs/doc[@for="TextReader.Synchronized"]/*' />
+        public static TextReader Synchronized(TextReader reader)
+        {
+            if (reader==null)
+                throw new ArgumentNullException("reader");
+            if (reader is SyncTextReader)
+                return reader;
+
+            return new SyncTextReader(reader);
+        }
+
+        // No data, no need to serialize
+        private class NullTextReader : TextReader
+        {
+            public override int Read(char[] buffer, int index, int count)
+            {
+                return 0;
+            }
+
+            public override String ReadLine()
+            {
+                return null;
+            }
+        }
+
+        internal class SyncTextReader : TextReader
+        {
+            internal TextReader _in;
+
+            internal SyncTextReader(TextReader t)
+            {
+                _in = t;
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Close()
+            {
+                _in.Close();
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override int Peek()
+            {
+                return _in.Peek();
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override int Read()
+            {
+                return _in.Read();
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override int Read([In, Out] char[] buffer, int index, int count)
+            {
+                return _in.Read(buffer, index, count);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override int ReadBlock(char[] buffer, int index, int count)
+            {
+                return _in.ReadBlock(buffer, index, count);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override String ReadLine()
+            {
+                return _in.ReadLine();
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/TextWriter.cs b/base/Libraries/System.IO/TextWriter.cs
new file mode 100644
index 0000000..5d586ff
--- /dev/null
+++ b/base/Libraries/System.IO/TextWriter.cs
@@ -0,0 +1,706 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  TextWriter
+**
+**
+** Purpose: Abstract base class for Text-only Writers.
+** Subclasses will include StreamWriter & StringWriter.
+**
+** Date:  February 21, 2000
+**
+===========================================================*/
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Reflection;
+
+namespace System.IO {
+    // This abstract base class represents a writer that can write a sequential
+    // stream of characters. A subclass must minimally implement the
+    // Write(char) method.
+    //
+    // This class is intended for character output, not bytes.
+    // There are methods on the Stream class for writing bytes.
+    //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter"]/*' />
+    public abstract class TextWriter : IDisposable
+    {
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Null"]/*' />
+        public static readonly TextWriter Null = new NullTextWriter();
+
+        // @TODO PORTING: This should be initialized to Environment.NewLine, but
+        // we don't want to load Environment unnecessarily so I've duplicated
+        // the value here.
+        private const String InitialNewLine = "\r\n";
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.CoreNewLine"]/*' />
+        protected char[] CoreNewLine = InitialNewLine.ToCharArray();
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.TextWriter"]/*' />
+        protected TextWriter()
+        {
+        }
+
+        // Closes this TextWriter and releases any system resources associated with the
+        // TextWriter. Following a call to Close, any operations on the TextWriter
+        // may raise exceptions. This default method is empty, but descendant
+        // classes can override the method to provide the appropriate
+        // functionality.
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Close"]/*' />
+        public virtual void Close() {
+            Dispose(true);
+        }
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Dispose"]/*' />
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.IDisposable.Dispose"]/*' />
+        /// <internalonly/>
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+        }
+
+        // Clears all buffers for this TextWriter and causes any buffered data to be
+        // written to the underlying device. This default method is empty, but
+        // descendant classes can override the method to provide the appropriate
+        // functionality.
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Flush"]/*' />
+        public virtual void Flush() {
+        }
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Encoding"]/*' />
+        public abstract Encoding Encoding {
+            get;
+        }
+
+        // Returns the line terminator string used by this TextWriter. The default line
+        // terminator string is a carriage return followed by a line feed ("\r\n").
+        //
+        // Sets the line terminator string for this TextWriter. The line terminator
+        // string is written to the text stream whenever one of the
+        // WriteLine methods are called. In order for text written by
+        // the TextWriter to be readable by a TextReader, only one of the following line
+        // terminator strings should be used: "\r", "\n", or "\r\n".
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.NewLine"]/*' />
+        public virtual String NewLine {
+            get { return new String(CoreNewLine); }
+            set {
+                if (value == null)
+                    value = InitialNewLine;
+                CoreNewLine = value.ToCharArray();
+            }
+        }
+
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Synchronized"]/*' />
+        public static TextWriter Synchronized(TextWriter writer) {
+            if (writer==null)
+                throw new ArgumentNullException("writer");
+            if (writer is SyncTextWriter)
+                return writer;
+
+            return new SyncTextWriter(writer);
+        }
+
+        // Writes a character to the text stream. This default method is empty,
+        // but descendant classes can override the method to provide the
+        // appropriate functionality.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write"]/*' />
+        public virtual void Write(char value) {
+        }
+
+        // Writes a character array to the text stream. This default method calls
+        // Write(char) for each of the characters in the character array.
+        // If the character array is null, nothing is written.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write1"]/*' />
+        public virtual void Write(char[] buffer) {
+            if (buffer != null) Write(buffer, 0, buffer.Length);
+        }
+
+        // Writes a range of a character array to the text stream. This method will
+        // write count characters of data into this TextWriter from the
+        // buffer character array starting at position index.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write2"]/*' />
+        public virtual void Write(char[] buffer, int index, int count) {
+            if (buffer==null)
+                throw new ArgumentNullException("buffer", "ArgumentNull_Buffer");
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "ArgumentOutOfRange_NeedNonNegNum");
+            if (count < 0)
+                throw new ArgumentOutOfRangeException("count", "ArgumentOutOfRange_NeedNonNegNum");
+            if (buffer.Length - index < count)
+                throw new ArgumentException("Argument_InvalidOffLen");
+
+            for (int i = 0; i < count; i++) Write(buffer[index + i]);
+        }
+
+        // Writes the text representation of a boolean to the text stream. This
+        // method outputs either Boolean.TrueString or Boolean.FalseString.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write3"]/*' />
+        public virtual void Write(bool value) {
+            Write(value ? Boolean.TrueString : Boolean.FalseString);
+        }
+
+        // Writes the text representation of an integer to the text stream. The
+        // text representation of the given value is produced by calling the
+        // Int32.ToString() method.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write4"]/*' />
+        public virtual void Write(int value) {
+            Write(value.ToString());
+        }
+
+        // Writes the text representation of an integer to the text stream. The
+        // text representation of the given value is produced by calling the
+        // UInt32.ToString() method.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write5"]/*' />
+        [CLSCompliant(false)]
+        public virtual void Write(uint value) {
+            Write(value.ToString());
+        }
+
+        // Writes the text representation of a long to the text stream. The
+        // text representation of the given value is produced by calling the
+        // Int64.ToString() method.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write6"]/*' />
+        public virtual void Write(long value) {
+            Write(value.ToString());
+        }
+
+        // Writes the text representation of an unsigned long to the text
+        // stream. The text representation of the given value is produced
+        // by calling the UInt64.ToString() method.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write7"]/*' />
+        [CLSCompliant(false)]
+        public virtual void Write(ulong value) {
+            Write(value.ToString());
+        }
+
+        // Writes the text representation of a float to the text stream. The
+        // text representation of the given value is produced by calling the
+        // Float.toString(float) method.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write8"]/*' />
+        public virtual void Write(float value) {
+            Write(value.ToString());
+        }
+
+        // Writes the text representation of a double to the text stream. The
+        // text representation of the given value is produced by calling the
+        // Double.toString(double) method.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write9"]/*' />
+        public virtual void Write(double value) {
+            Write(value.ToString());
+        }
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write10"]/*' />
+        public virtual void Write(Decimal value) {
+            Write(value.ToString());
+        }
+
+        // Writes a string to the text stream. If the given string is null, nothing
+        // is written to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write11"]/*' />
+        public virtual void Write(String value) {
+            if (value != null) Write(value.ToCharArray());
+        }
+
+        // Writes the text representation of an object to the text stream. If the
+        // given object is null, nothing is written to the text stream.
+        // Otherwise, the object's ToString method is called to produce the
+        // string representation, and the resulting string is then written to the
+        // output stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write12"]/*' />
+        public virtual void Write(Object value) {
+            if (value != null) {
+                Write(value.ToString());
+            }
+        }
+
+    //      // Converts the wchar * to a string and writes this to the stream.
+    //      //
+    //      __attribute NonCLSCompliantAttribute()
+    //      public void Write(wchar *value) {
+    //          Write(new String(value));
+    //      }
+
+    //      // Treats the byte* as a LPCSTR, converts it to a string, and writes it to the stream.
+    //      //
+    //      __attribute NonCLSCompliantAttribute()
+    //      public void Write(byte *value) {
+    //          Write(new String(value));
+    //      }
+
+
+        // Writes out a formatted string.  Uses the same semantics as
+        // String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write13"]/*' />
+        public virtual void Write(String format, Object arg0)
+        {
+            Write(String.Format(format, arg0));
+        }
+
+        // Writes out a formatted string.  Uses the same semantics as
+        // String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write14"]/*' />
+        public virtual void Write(String format, Object arg0, Object arg1)
+        {
+            Write(String.Format(format, arg0, arg1));
+        }
+
+        // Writes out a formatted string.  Uses the same semantics as
+        // String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write15"]/*' />
+        public virtual void Write(String format, Object arg0, Object arg1, Object arg2)
+        {
+            Write(String.Format(format, arg0, arg1, arg2));
+        }
+
+        // Writes out a formatted string.  Uses the same semantics as
+        // String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.Write16"]/*' />
+        public virtual void Write(String format, params Object[] arg)
+        {
+            Write(String.Format(format, arg));
+        }
+
+
+        // Writes a line terminator to the text stream. The default line terminator
+        // is a carriage return followed by a line feed ("\r\n"), but this value
+        // can be changed by setting the NewLine property.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine"]/*' />
+        public virtual void WriteLine() {
+            Write(CoreNewLine);
+        }
+
+        // Writes a character followed by a line terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine1"]/*' />
+        public virtual void WriteLine(char value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes an array of characters followed by a line terminator to the text
+        // stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine2"]/*' />
+        public virtual void WriteLine(char[] buffer) {
+            Write(buffer);
+            WriteLine();
+        }
+
+        // Writes a range of a character array followed by a line terminator to the
+        // text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine3"]/*' />
+        public virtual void WriteLine(char[] buffer, int index, int count) {
+            Write(buffer, index, count);
+            WriteLine();
+        }
+
+        // Writes the text representation of a boolean followed by a line
+        // terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine4"]/*' />
+        public virtual void WriteLine(bool value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes the text representation of an integer followed by a line
+        // terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine5"]/*' />
+        public virtual void WriteLine(int value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes the text representation of an unsigned integer followed by
+        // a line terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine6"]/*' />
+        [CLSCompliant(false)]
+        public virtual void WriteLine(uint value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes the text representation of a long followed by a line terminator
+        // to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine7"]/*' />
+        public virtual void WriteLine(long value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes the text representation of an unsigned long followed by
+        // a line terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine8"]/*' />
+        [CLSCompliant(false)]
+        public virtual void WriteLine(ulong value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes the text representation of a float followed by a line terminator
+        // to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine9"]/*' />
+        public virtual void WriteLine(float value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes the text representation of a double followed by a line terminator
+        // to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine10"]/*' />
+        public virtual void WriteLine(double value) {
+            Write(value);
+            WriteLine();
+        }
+
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine11"]/*' />
+        public virtual void WriteLine(decimal value) {
+            Write(value);
+            WriteLine();
+        }
+
+        // Writes a string followed by a line terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine12"]/*' />
+        public virtual void WriteLine(String value) {
+
+            if (value==null) {
+                WriteLine();
+            }
+            else {
+                // We'd ideally like WriteLine to be atomic, in that one call
+                // to WriteLine equals one call to the OS (ie, so writing to
+                // console while simultaneously calling printf will guarantee we
+                // write out a string and new line chars, without any interference).
+                // Additionally, we need to call ToCharArray on Strings anyways,
+                // so allocating a char[] here isn't any worse than what we were
+                // doing anyways.  We do reduce the number of calls to the
+                // backing store this way, potentially.
+                int vLen = value.Length;
+                int nlLen = CoreNewLine.Length;
+                char[] chars = new char[vLen+nlLen];
+                value.CopyTo(0, chars, 0, vLen);
+                // CoreNewLine will almost always be 2 chars, and possibly 1.
+                if (nlLen == 2) {
+                    chars[vLen] = CoreNewLine[0];
+                    chars[vLen+1] = CoreNewLine[1];
+                }
+                else if (nlLen == 1)
+                    chars[vLen] = CoreNewLine[0];
+                else
+                    Buffer.BlockCopy(CoreNewLine, 0, chars, vLen * 2, nlLen * 2);
+                Write(chars, 0, vLen + nlLen);
+            }
+            /*
+            Write(value);  // We could call Write(String) on StreamWriter...
+            WriteLine();
+            */
+        }
+
+        // Writes the text representation of an object followed by a line
+        // terminator to the text stream.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine13"]/*' />
+        public virtual void WriteLine(Object value) {
+            if (value==null) {
+                WriteLine();
+            }
+            else {
+                WriteLine(value.ToString());
+            }
+        }
+
+    //      // Converts the wchar * to a string and writes this to the stream.
+    //      //
+    //      __attribute NonCLSCompliantAttribute()
+    //      public void WriteLine(wchar *value) {
+    //          Write(value);
+    //          WriteLine();
+    //      }
+
+    //      // Treats the byte* as a LPCSTR, converts it to a string, and writes it to the stream.
+    //      //
+    //      __attribute NonCLSCompliantAttribute()
+    //      public void WriteLine(byte *value) {
+    //          Write(value);
+    //          WriteLine();
+    //      }
+
+        // Writes out a formatted string and a new line.  Uses the same
+        // semantics as String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine14"]/*' />
+        public virtual void WriteLine(String format, Object arg0)
+        {
+            WriteLine(String.Format(format, arg0));
+        }
+
+        // Writes out a formatted string and a new line.  Uses the same
+        // semantics as String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine15"]/*' />
+        public virtual void WriteLine (String format, Object arg0, Object arg1)
+        {
+            WriteLine(String.Format(format, arg0, arg1));
+        }
+
+        // Writes out a formatted string and a new line.  Uses the same
+        // semantics as String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine16"]/*' />
+        public virtual void WriteLine (String format, Object arg0, Object arg1, Object arg2)
+        {
+            WriteLine(String.Format(format, arg0, arg1, arg2));
+        }
+
+        // Writes out a formatted string and a new line.  Uses the same
+        // semantics as String.Format.
+        //
+        //| <include file='doc\TextWriter.uex' path='docs/doc[@for="TextWriter.WriteLine17"]/*' />
+        public virtual void WriteLine (String format, params Object[] arg)
+        {
+            WriteLine(String.Format(format, arg));
+        }
+
+        // No data, no need to serialize
+        private sealed class NullTextWriter : TextWriter
+        {
+            public override Encoding Encoding {
+                get { return Encoding.Default;  }
+            }
+
+            public override void Write(char[] buffer, int index, int count) {
+            }
+
+            public override void Write(String value) {
+            }
+        }
+
+        internal sealed class SyncTextWriter : TextWriter
+        {
+            private TextWriter _out;
+
+            internal SyncTextWriter(TextWriter t) {
+                _out = t;
+            }
+
+            public override Encoding Encoding {
+                get { return _out.Encoding;  }
+            }
+
+            public override  String NewLine {
+                [MethodImpl(MethodImplOptions.Synchronized)]
+                get { return _out.NewLine; }
+                [MethodImpl(MethodImplOptions.Synchronized)]
+                set { _out.NewLine = value; }
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Close() {
+                _out.Close();
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Flush() {
+                _out.Flush();
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(char value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(char[] buffer) {
+                _out.Write(buffer);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(char[] buffer, int index, int count) {
+                _out.Write(buffer, index, count);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(bool value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(int value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized), CLSCompliant(false)]
+            public override void Write(uint value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(long value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized), CLSCompliant(false)]
+            public override void Write(ulong value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(float value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(double value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(String value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(Object value) {
+                _out.Write(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(String format, Object arg0) {
+                _out.Write(format, arg0);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(String format, Object arg0, Object arg1) {
+                _out.Write(format, arg0, arg1);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(String format, Object arg0, Object arg1, Object arg2) {
+                _out.Write(format, arg0, arg1, arg2);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void Write(String format, Object[] arg) {
+                _out.Write(format, arg);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(char value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(char[] buffer) {
+                _out.WriteLine(buffer);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(char[] buffer, int index, int count) {
+                _out.WriteLine(buffer, index, count);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(bool value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(int value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized), CLSCompliant(false)]
+            public override void WriteLine(uint value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(long value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized), CLSCompliant(false)]
+            public override void WriteLine(ulong value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(float value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(double value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(String value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(Object value) {
+                _out.WriteLine(value);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(String format, Object arg0) {
+                _out.WriteLine(format, arg0);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(String format, Object arg0, Object arg1) {
+                _out.WriteLine(format, arg0, arg1);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(String format, Object arg0, Object arg1, Object arg2) {
+                _out.WriteLine(format, arg0, arg1, arg2);
+            }
+
+            [MethodImpl(MethodImplOptions.Synchronized)]
+            public override void WriteLine(String format, Object[] arg) {
+                _out.WriteLine(format, arg);
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/__ConsoleTextWriter.cs b/base/Libraries/System.IO/__ConsoleTextWriter.cs
new file mode 100644
index 0000000..3f9db86
--- /dev/null
+++ b/base/Libraries/System.IO/__ConsoleTextWriter.cs
@@ -0,0 +1,45 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.IO;
+using System.Text;
+using System.Runtime.InteropServices;
+
+//
+namespace System {
+    public class __ConsoleTextWriter : TextWriter {
+        public __ConsoleTextWriter()
+        {
+        }
+
+        public override Encoding Encoding {
+            get {
+                return Encoding.Default;
+            }
+        }
+
+        public override void Write(char[] buffer, int index, int count)
+        {
+            Console.Write(buffer, index, count);
+        }
+
+        public override void Write(String str)
+        {
+            Console.Write(str);
+        }
+
+        public override void WriteLine(char[] buffer, int index, int count)
+        {
+            Console.WriteLine(buffer, index, count);
+        }
+
+        public override void WriteLine(String str)
+        {
+            Console.WriteLine(str);
+        }
+    }
+}
diff --git a/base/Libraries/System.IO/__DebugOutputTextWriter.cs b/base/Libraries/System.IO/__DebugOutputTextWriter.cs
new file mode 100644
index 0000000..6f74060
--- /dev/null
+++ b/base/Libraries/System.IO/__DebugOutputTextWriter.cs
@@ -0,0 +1,63 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+#if _DEBUG
+// This class writes to wherever OutputDebugString writes to.  If you don't have
+// a Windows app (ie, something hosted in IE), you can use this to redirect Console
+// output for some good old-fashioned console spew in MSDEV's debug output window.
+
+// This really shouldn't ship at all, but is intended as a quick, inefficient hack
+// for debugging.  -- BrianGru, 9/26/2000
+
+using System;
+using System.IO;
+using System.Text;
+using System.Runtime.InteropServices;
+using Native = Microsoft.Singularity.Native
+
+namespace System.IO {
+    internal class __DebugOutputTextWriter : TextWriter {
+        private readonly String _consoleType;
+
+        internal __DebugOutputTextWriter(String consoleType)
+        {
+            _consoleType = consoleType;
+        }
+
+        public override Encoding Encoding {
+            get {
+                return new UnicodeEncoding(false, false);
+            }
+        }
+
+        public override void Write(char c)
+        {
+            Native.DebugPrintString(c.ToString());
+        }
+
+        public override void Write(String str)
+        {
+            Native.DebugPrintString(str);
+        }
+
+        public override void Write(char[] array)
+        {
+            if (array != null)
+                Native.DebugPrintString(new String(array));
+        }
+
+        public override void WriteLine(String str)
+        {
+            if (str != null)
+                Native.DebugPrintString(_consoleType + str);
+            else
+                Native.DebugPrintString("<null>");
+            Native.DebugPrintString(new String(CoreNewLine));
+        }
+    }
+}
+
+#endif // _DEBUG
diff --git a/base/Libraries/System.IO/__Error.cs b/base/Libraries/System.IO/__Error.cs
new file mode 100644
index 0000000..110252e
--- /dev/null
+++ b/base/Libraries/System.IO/__Error.cs
@@ -0,0 +1,185 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+/*============================================================
+**
+** Class:  __Error
+**
+**
+** Purpose: Centralized error methods for the IO package.
+** Mostly useful for translating Win32 HRESULTs into meaningful
+** error strings & exceptions.
+**
+** Date:  February 15, 2000
+**
+===========================================================*/
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Singularity.Directory;
+
+
+namespace System.IO {
+    // Only static data no need to serialize
+    internal sealed class __Error
+    {
+        private __Error() {
+        }
+
+        internal static void EndOfFile() {
+            throw new EndOfStreamException("IO.EOF_ReadBeyondEOF");
+        }
+
+        private static String GetMessage(int errorCode) {
+            return String.Format("IO_UnknownError {0}", errorCode);
+        }
+
+        internal static void FileNotOpen() {
+            throw new ObjectDisposedException(null, "ObjectDisposed_FileClosed");
+        }
+
+        internal static void StreamIsClosed() {
+            throw new ObjectDisposedException(null, "ObjectDisposed_StreamClosed");
+        }
+
+        internal static void MemoryStreamNotExpandable() {
+            throw new NotSupportedException("NotSupported_MemStreamNotExpandable");
+        }
+
+        internal static void ReaderClosed() {
+            throw new ObjectDisposedException(null, "ObjectDisposed_ReaderClosed");
+        }
+
+        internal static void ReadNotSupported() {
+            throw new NotSupportedException("NotSupported_UnreadableStream");
+        }
+
+        internal static void SeekNotSupported() {
+            throw new NotSupportedException("NotSupported_UnseekableStream");
+        }
+
+        internal static void WrongAsyncResult() {
+            throw new ArgumentException("Arg_WrongAsyncResult");
+        }
+
+        internal static void EndReadCalledTwice() {
+            throw new InvalidOperationException("InvalidOperation_EndReadCalledMultiple");
+        }
+
+        internal static void EndWriteCalledTwice() {
+            throw new InvalidOperationException("InvalidOperation_EndWriteCalledMultiple");
+        }
+
+        internal static void WinIOError() {
+            WinIOError(0, String.Empty);
+        }
+
+        internal static void SingularityIOError(ErrorCode code, String str) {
+            string errString = SdsUtils.ErrorCodeToString(code);
+            switch (code) {
+                 case ErrorCode.NotFound :{
+                    throw new FileNotFoundException(String.Format("FileNotFound: {0}", str));
+                }
+                default: {
+                    throw new IOException(String.Format("{0}: {1}", errString, str));
+                }
+            }
+        }
+
+        internal  static int ErrorCodeToWin32Error(ErrorCode  code)
+        {
+            Console.WriteLine("Converting error {0}", SdsUtils.ErrorCodeToString(code));
+            int win32 = 0; 
+            switch (code) {
+                case ErrorCode.NoError :
+                    win32 = 0; 
+                    break;
+                case ErrorCode.AccessDenied :
+                    win32 = ERROR_ACCESS_DENIED; 
+                    break;
+                case ErrorCode.AlreadyExists :
+                    win32 = ERROR_FILE_EXISTS; 
+                    break;
+                case ErrorCode.BadArguments:
+                    win32 = ERROR_INVALID_PARAMETER; 
+                    break;
+                case ErrorCode.ContractNotSupported :
+                    win32 = ERROR_INVALID_PARAMETER; 
+                    break;
+                case ErrorCode.NotFound :
+                    win32 = ERROR_FILE_NOT_FOUND; 
+                    break;
+                case ErrorCode.NotSupported :
+                    win32 = ERROR_INVALID_PARAMETER; 
+                    break;
+                default :
+                    win32 = ERROR_INVALID_PARAMETER; 
+                    break;
+            }
+            return win32; 
+        }
+
+        // After calling GetLastWin32Error(), it clears the last error field,
+        // so you must save the HResult and pass it to this method.  This method
+        // will determine the appropriate exception to throw dependent on your
+        // error, and depending on the error, insert a string into the message
+        // gotten from the ResourceManager.
+        internal static void WinIOError(int errorCode, String str) {
+            switch (errorCode) {
+              case ERROR_FILE_NOT_FOUND: {
+                  throw new FileNotFoundException("FileNotFound");
+              }
+              case ERROR_PATH_NOT_FOUND: {
+                  throw new DirectoryNotFoundException("PathNotFound");
+              }
+              case ERROR_FILENAME_EXCED_RANGE: {
+                  throw new PathTooLongException("PathTooLong");
+              }
+              case ERROR_INVALID_PARAMETER: {
+                  throw new IOException("Invalid Parameter");
+              }
+              case ERROR_SHARING_VIOLATION: {
+                  throw new IOException("SharingViolation");
+              }
+              case ERROR_FILE_EXISTS: {
+                  throw new IOException("FileExists");
+              }
+              default: {
+                  throw new IOException("Unexpanded error code");
+              }
+            }
+        }
+
+        internal static void WriteNotSupported() {
+            throw new NotSupportedException("NotSupported_UnwritableStream");
+        }
+
+        internal static void WriterClosed() {
+            throw new ObjectDisposedException(null, "ObjectDisposed_WriterClosed");
+        }
+
+        private const int FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200;
+        private const int FORMAT_MESSAGE_FROM_SYSTEM    = 0x00001000;
+        private const int FORMAT_MESSAGE_ARGUMENT_ARRAY = 0x00002000;
+
+        // From WinError.h
+        internal const int ERROR_FILE_NOT_FOUND = Native.ERROR_FILE_NOT_FOUND;
+        internal const int ERROR_PATH_NOT_FOUND = Native.ERROR_PATH_NOT_FOUND;
+        internal const int ERROR_ACCESS_DENIED  = Native.ERROR_ACCESS_DENIED;
+        internal const int ERROR_INVALID_PARAMETER = Native.ERROR_INVALID_PARAMETER;
+        internal const int ERROR_FILENAME_EXCED_RANGE = 0xCE;
+        internal const int ERROR_SHARING_VIOLATION = 0x20;
+        internal const int ERROR_FILE_EXISTS = 0x50;
+
+        internal const int ERROR_NOT_SUPPORTED = Native.ERROR_NOT_SUPPORTED; 
+        internal const int ERROR_DUP_NAME = Native.ERROR_DUP_NAME; 
+        internal const int ERROR_DISK_FULL = Native.ERROR_DISK_FULL; 
+        internal const int ERROR_CALL_NOT_IMPLEMENTED = Native.ERROR_CALL_NOT_IMPLEMENTED; 
+        internal const int ERROR_DIR_NOT_EMPTY = Native.ERROR_DIR_NOT_EMPTY; 
+        internal const int ERROR_ALREADY_EXISTS = Native.ERROR_ALREADY_EXISTS; 
+
+    }
+}
diff --git a/base/Libraries/System.Net.IP/IPAddressUtils.cs b/base/Libraries/System.Net.IP/IPAddressUtils.cs
new file mode 100644
index 0000000..ee22f87
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPAddressUtils.cs
@@ -0,0 +1,303 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPAddressUtils.cs
+//
+
+using System;
+
+#if !SINGULARITY
+using System.Net;
+using System.Net.Sockets;
+#endif
+
+namespace System.Net.IP
+{
+    public sealed class IncompatibleAddressFamiliesException : SystemException
+    {
+        public IncompatibleAddressFamiliesException()
+            : base("Attempting operation on addresses from incompatible "
+                   + "families.")
+        {
+        }
+    }
+
+    public sealed class IPAddressBitwise
+    {
+        /// <summary>
+        /// Perform the bitwise AND operation on two IPAddress
+        /// objects and return a new IPAddress containing the
+        /// result.
+        ///
+        /// <exception cref="IncompatibleAddressFamiliesException"></exception>
+        /// </summary>
+        public static IPAddress And(IPAddress l, IPAddress r)
+        {
+            if (l.AddressFamily != r.AddressFamily)
+                throw new IncompatibleAddressFamiliesException();
+
+            byte [] bl = l.GetAddressBytes();
+            byte [] br = r.GetAddressBytes();
+
+            if (l.AddressFamily == AddressFamily.InterNetwork)
+            {
+                bl[0] &= br[0];
+                bl[1] &= br[1];
+                bl[2] &= br[2];
+                bl[3] &= br[3];
+                int tmp = (bl[0] << 24) | (bl[1] << 16) | (bl[2] << 8) | bl[3];
+                return new IPAddress(((long)tmp) & 0xffffffff);
+            }
+            bl[0] &= br[0];
+            bl[1] &= br[1];
+            bl[2] &= br[2];
+            bl[3] &= br[3];
+            bl[4] &= br[4];
+            bl[5] &= br[5];
+            bl[6] &= br[6];
+            bl[7] &= br[7];
+            bl[8] &= br[8];
+            bl[9] &= br[9];
+            bl[10] &= br[10];
+            bl[11] &= br[11];
+            bl[12] &= br[12];
+            bl[13] &= br[13];
+            bl[14] &= br[14];
+            bl[15] &= br[15];
+            return new IPAddress(bl);
+        }
+
+        /// <summary>
+        /// Perform the bitwise OR operation on two
+        /// IPAddress objects and return a new IPAddress
+        /// containing the result.
+        ///
+        /// <exception cref="IncompatibleAddressFamiliesException"></exception>
+        /// </summary>
+        public static IPAddress Or(IPAddress l, IPAddress r)
+        {
+            if (l.AddressFamily != r.AddressFamily)
+                throw new IncompatibleAddressFamiliesException();
+
+            byte [] bl = l.GetAddressBytes();
+            byte [] br = r.GetAddressBytes();
+
+            if (l.AddressFamily == AddressFamily.InterNetwork)
+            {
+                bl[0] |= br[0];
+                bl[1] |= br[1];
+                bl[2] |= br[2];
+                bl[3] |= br[3];
+                int tmp = (bl[0] << 24) | (bl[1] << 16) | (bl[2] << 8) | bl[3];
+                return new IPAddress(((long)tmp) & 0xffffffff);
+            }
+
+            bl[0] |= br[0];
+            bl[1] |= br[1];
+            bl[2] |= br[2];
+            bl[3] |= br[3];
+            bl[4] |= br[4];
+            bl[5] |= br[5];
+            bl[6] |= br[6];
+            bl[7] |= br[7];
+            bl[8] |= br[8];
+            bl[9] |= br[9];
+            bl[10] |= br[10];
+            bl[11] |= br[11];
+            bl[12] |= br[12];
+            bl[13] |= br[13];
+            bl[14] |= br[14];
+            bl[15] |= br[15];
+            return new IPAddress(bl);
+        }
+
+        /// <summary>
+        /// Perform the bitwise eXclusive-OR operation on two
+        /// IPAddress objects and return a new IPAddress
+        /// containing the result.
+        ///
+        /// <exception cref="IncompatibleAddressFamiliesException"></exception>
+        /// </summary>
+        public static IPAddress Xor(IPAddress l, IPAddress r)
+        {
+            if (l.AddressFamily != r.AddressFamily)
+                throw new IncompatibleAddressFamiliesException();
+
+            byte [] bl = l.GetAddressBytes();
+            byte [] br = r.GetAddressBytes();
+
+            if (l.AddressFamily == AddressFamily.InterNetwork)
+            {
+                bl[0] ^= br[0];
+                bl[1] ^= br[1];
+                bl[2] ^= br[2];
+                bl[3] ^= br[3];
+                int tmp = (bl[0] << 24) | (bl[1] << 16) | (bl[2] << 8) | bl[3];
+                return new IPAddress(((long)tmp) & 0xffffffff);
+            }
+
+            bl[0] ^= br[0];
+            bl[1] ^= br[1];
+            bl[2] ^= br[2];
+            bl[3] ^= br[3];
+            bl[4] ^= br[4];
+            bl[5] ^= br[5];
+            bl[6] ^= br[6];
+            bl[7] ^= br[7];
+            bl[8] ^= br[8];
+            bl[9] ^= br[9];
+            bl[10] ^= br[10];
+            bl[11] ^= br[11];
+            bl[12] ^= br[12];
+            bl[13] ^= br[13];
+            bl[14] ^= br[14];
+            bl[15] ^= br[15];
+            return new IPAddress(bl);
+        }
+
+        /// <summary>
+        /// Perform the bitwise NOT operation on an IPAddress
+        /// and return a new IPAddress containing the result.
+        ///
+        /// <exception cref="IncompatibleAddressFamiliesException"></exception>
+        /// </summary>
+        public static IPAddress Not(IPAddress l)
+        {
+            byte [] bl = l.GetAddressBytes();
+
+            if (l.AddressFamily == AddressFamily.InterNetwork)
+            {
+                bl[0] = (byte) ~bl[0];
+                bl[1] = (byte) ~bl[1];
+                bl[2] = (byte) ~bl[2];
+                bl[3] = (byte) ~bl[3];
+                int tmp = (bl[0] << 24) | (bl[1] << 16) | (bl[2] << 8) | bl[3];
+                return new IPAddress(((long)tmp) & 0xffffffff);
+            }
+
+            bl[0] = (byte) ~bl[0];
+            bl[1] = (byte) ~bl[1];
+            bl[2] = (byte) ~bl[2];
+            bl[3] = (byte) ~bl[3];
+            bl[4] = (byte) ~bl[4];
+            bl[5] = (byte) ~bl[5];
+            bl[6] = (byte) ~bl[6];
+            bl[7] = (byte) ~bl[7];
+            bl[8] = (byte) ~bl[8];
+            bl[9] = (byte) ~bl[9];
+            bl[10] = (byte) ~bl[10];
+            bl[11] = (byte) ~bl[11];
+            bl[12] = (byte) ~bl[12];
+            bl[13] = (byte) ~bl[13];
+            bl[14] = (byte) ~bl[14];
+            bl[15] = (byte) ~bl[15];
+            return new IPAddress(bl);
+        }
+
+        static IPAddressBitwise()
+        {
+        }
+
+        private IPAddressBitwise()
+        {
+        }
+    }
+
+    public sealed class IPAddressCompare
+    {
+        public static bool LessThan(IPAddress l, IPAddress r)
+        {
+            if (l.AddressFamily != r.AddressFamily)
+                throw new IncompatibleAddressFamiliesException();
+
+            byte [] bl = l.GetAddressBytes();
+            byte [] br = r.GetAddressBytes();
+
+            uint ul = 0;
+            uint ur = 0;
+
+            for (int i = 0; i < bl.Length; i += 4)
+            {
+                ul = (uint)((bl[i + 0] << 24) | (bl[i + 1] << 16) |
+                            (bl[i + 2] <<  8) | (bl[i + 3]));
+                ur = (uint)((br[i + 0] << 24) | (br[i + 1] << 16) |
+                            (br[i + 2] <<  8) | (br[i + 3]));
+                if (ul > ur)
+                    return false;
+            }
+            return ul < ur;
+        }
+
+        public static bool LessThanEqualTo(IPAddress l, IPAddress r)
+        {
+            if (l.AddressFamily != r.AddressFamily)
+                throw new IncompatibleAddressFamiliesException();
+
+            byte [] bl = l.GetAddressBytes();
+            byte [] br = r.GetAddressBytes();
+
+            uint ul = 0;
+            uint ur = 0;
+
+            for (int i = 0; i < bl.Length; i += 4)
+            {
+                ul = (uint)((bl[i + 0] << 24) | (bl[i + 1] << 16) |
+                            (bl[i + 2] <<  8) | (bl[i + 3]));
+                ur = (uint)((br[i + 0] << 24) | (br[i + 1] << 16) |
+                            (br[i + 2] <<  8) | (br[i + 3]));
+                if (ul > ur)
+                    return false;
+            }
+            return ul <= ur;
+        }
+
+        public static bool GreaterThan(IPAddress l, IPAddress r)
+        {
+            return !LessThanEqualTo(l, r);
+        }
+
+        public static bool GreaterThanEqualTo(IPAddress l, IPAddress r)
+        {
+            return !LessThan(l, r);
+        }
+
+        private IPAddressCompare()
+        {
+        }
+    }
+
+#if TEST_IPADDRESS_UTILS
+    public class Test
+    {
+        static void Output(string format, params object[] args)
+        {
+            Console.Write(format, args);
+        }
+
+        static void Main()
+        {
+            IPAddress a = IPAddress.Parse("10.0.0.1");
+            IPAddress b = IPAddress.Parse("192.168.0.1");
+            IPAddress c = IPAddress.Parse("170.170.170.170");
+            IPAddress d = IPAddress.Parse("255.255.255.255");
+            IPAddress e = IPAddress.Parse("85.85.85.85");
+
+            IPAddress x = new IPAddress(IPAddress.IPv6Any.GetAddressBytes());
+
+            Output("Expect: a < b  {0}\n",
+                   IPAddressCompare.LessThan(a, b));
+            Output("Expect: a <= a {0}\n",
+                   IPAddressCompare.LessThanEqualTo(a, a));
+
+            Output("c AND d == d {0}\n", IPAddressBitwise.And(c, d).Equals(c));
+            Output("c AND e == d {0}\n", IPAddressBitwise.Or(c, e).Equals(d));
+            Output("c XOR d == e {0}\n", IPAddressBitwise.Xor(c, e).Equals(d));
+            Output("c XOR d == 0 {0}\n", IPAddressBitwise.Xor(c, c).Equals(IPAddress.Any));
+            Output("NOT c == e {0}\n", IPAddressBitwise.Not(c).Equals(e));
+        }
+    }
+#endif
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/IPv4.cs b/base/Libraries/System.Net.IP/IPv4.cs
new file mode 100644
index 0000000..87b288e
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPv4.cs
@@ -0,0 +1,615 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: IPv4.cs
+//
+
+using System;
+
+namespace System.Net.IP
+{
+    /// <summary>
+    /// IPv4 Address Structure.
+    /// </summary>
+    [ CLSCompliant(false) ]
+    public struct IPv4 : IComparable
+    {
+        private uint addr;  // Host order
+
+        /// <summary>
+        /// The number of bytes in an IPv4 address.
+        /// </summary>
+        public const int Length = 4;
+
+        /// <summary>
+        /// The number of bits in a IPv4 address.
+        /// </summary>
+        public const int BitCount = 32;
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="hostOrderAddress">A 32-bit value representing an
+        /// IPv4 address in host-order.</param>
+        public IPv4(uint hostOrderAddress)
+        {
+            addr = hostOrderAddress;
+        }
+
+        /// <summary>
+        /// Copy-constructor
+        /// </summary>
+        /// <param name="IPv4 other">Another IPv4 instance</param>
+        public IPv4(IPv4 other)
+        {
+            addr = other.addr;
+        }
+
+#if HAVE_SYSTEM_NET_IPADDRESS
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="ipa">An instance of the
+        /// System.Net.IPAddress class.</param>
+        /// <exception cref="ArgumentNullException">Thrown when
+        /// argument is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when
+        /// AddressFamily of <c>ipa</c>is other than
+        /// InterNetwork</exception>
+        public IPv4(IPAddress ipa)
+        {
+            if (ipa == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            byte [] quad = ipa.GetAddressBytes();
+            if (quad.Length != Length)
+            {
+                throw new ArgumentException();
+            }
+            addr =(uint)((quad[0] << 24) | (quad[1] << 16) |
+                         (quad[2] << 8) | quad[3]);
+}
+#endif // HAVE_SYSTEM_NET_IPADDRESS
+
+        /// <summary>
+        /// Provide a copy of the <c>IPv4</c> address as an array of bytes.
+        /// </summary>
+        /// <returns>Array of bytes, ordered MSB to LSB.</returns>
+        public byte[]! GetAddressBytes()
+        {
+            return new byte[Length] {
+                (byte)(addr >> 24), (byte)(addr >> 16),
+                (byte)(addr >>  8), (byte)(addr)
+            };
+        }
+
+        /// <summary>
+        /// Create an IPv4 address representing a netmask.
+        /// </summary>
+        /// <param name="maskLength"></param>
+        /// <returns>An IPv4 instance.</returns>
+        /// <exception cref="ArgumentException">Thrown if maskLength is
+        /// outside of the range [0,32].</exception>
+        public static IPv4 NetMask(int maskLength)
+        {
+            if ((maskLength > BitCount) || (maskLength < 0))
+            {
+                throw new
+                    ArgumentException("Mask length greater than possible.");
+            }
+            return IPv4.AllOnes << (BitCount - maskLength);
+        }
+
+        /// <summary>
+        /// Create an IPv4 address from bytes in an array.  The bytes
+        /// are assumed to be in the order of MSB to LSB.
+        /// </summary>
+        /// <param name="data">Byte array to read address from.</param>
+        /// <param name="offset">Offset in bytes of starting point.</param>
+        /// <exception cref="ArgumentNullException">Thrown if the array
+        /// is null.</exception>
+        /// <exception cref="ArgumentException">Thrown if there are less
+        /// than 4 bytes from the offset to the end of the array.</exception>
+        public static IPv4 ParseBytes(byte [] data, int offset)
+        {
+            if (data == null)
+            {
+                throw new ArgumentNullException();
+            }
+            if (data.Length - offset < Length)
+            {
+                throw new ArgumentException("Byte array too short.");
+            }
+            return new IPv4((uint)((data[offset + 0] << 24) |
+                                   (data[offset + 1] << 16) |
+                                   (data[offset + 2] << 8)  |
+                                   (data[offset + 3]))
+                            );
+        }
+
+        /// <summary>
+        /// Create an IPv4 address from bytes in an array.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if the array
+        /// is null.</exception>
+        /// <exception cref="ArgumentException">Thrown if there are less
+        /// than 4 bytes in the array.</exception>
+        public static IPv4 ParseBytes(byte [] data)
+        {
+            return ParseBytes(data, 0);
+        }
+
+        private static bool ParseHexQuad(string! quad, out uint value)
+        {
+            const string hex = "00112233445566778899aAbBcCdDeEfF";
+            value = 0;
+            if (quad.Length < 3 || quad.Length > 4)
+                return false;
+            if ((quad[0] != '0') || (quad[1] != 'x'))
+                return false;
+            int u = (quad.Length == 4) ? hex.IndexOf(quad[2]) : 0;
+            int l = hex.IndexOf(quad[quad.Length - 1]);
+            value = (uint)(((u << 3) & 0xf0) | (l >> 1));
+
+            return (u >= 0) && (l >= 0);
+        }
+
+        private static bool ParseOctalQuad(string! quad, out uint value)
+        {
+            value = 0;
+            if (quad.Length < 2 || quad.Length > 4)
+                return false;
+
+            if (quad[0] != '0')
+                return false;
+
+            int result = 0;
+            for (int i = 1; i < quad.Length; i++)
+            {
+                int tmp = quad[i] - '0';
+                if (tmp < 0 || tmp > 7)
+                    return false;
+                result = result * 8 + tmp;
+            }
+
+            value = (uint)result;
+            return result <= 255;
+        }
+
+        private static bool ParseDecimalQuad(string! quad, out uint value)
+        {
+            value = 0;
+
+            if (quad.Length == 0 || quad.Length > 3)
+                return false;
+
+            int result = 0;
+            for (int i = 0; i < quad.Length; i++)
+            {
+                int tmp = quad[i] - '0';
+                if (tmp < 0 || tmp > 9)
+                    return false;
+                result = result * 10 + tmp;
+            }
+            value = (uint)result;
+
+            return result <= 255;
+        }
+
+        private static bool ParseQuad(string! quad, out uint value)
+        {
+            if (ParseHexQuad(quad, out value) == true)
+                return true;
+            if (ParseOctalQuad(quad, out value) == true)
+                return true;
+            return ParseDecimalQuad(quad, out value);
+        }
+
+        /// <summary>
+        /// Converts an IP address string into an IPv4 instance.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if
+        /// <c>ipString</c> is null.</exception>
+        /// <exception cref="FormatException">Thrown if
+        /// <c>ipString</c> is invalid.</exception>
+        public static IPv4 Parse(string ipString)
+        {
+            const string malformed = "Malformed address";
+
+            if (ipString == null)
+            {
+                throw new ArgumentNullException("ipString");
+            }
+
+            string [] quads = ipString.Split('.');
+            if (quads.Length == 0 || quads.Length > 4)
+            {
+                throw new FormatException(malformed);
+            }
+
+            uint address = 0;
+            uint tmp = 0;
+            int i;
+            for (i = 0; i < quads.Length - 1; i++)
+            {
+                if (ParseQuad((!)quads[i], out tmp) == false)
+                {
+                    throw new FormatException(malformed);
+                }
+                address |= (tmp) << (24 - i * 8);
+            }
+            if (ParseQuad((!)quads[i], out tmp) == false)
+            {
+                throw new FormatException(malformed);
+            }
+            address |= tmp;
+            return new IPv4(address);
+        }
+
+        /// <summary>
+        /// Converts an IP address string into an IPv4 instance.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if
+        /// <c>ipString</c> is null.</exception>
+        /// <returns> <c>true</c> on success, <c>false</c> on failure.</returns>
+        public static bool Parse(string ipString, out IPv4 address)
+        {
+            try
+            {
+                address = Parse(ipString);
+            }
+            catch (FormatException)
+            {
+                address = IPv4.Zero;
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Writes network-order byte representation of IPv4 address
+        /// into buffer at a specified offset.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if <c>buffer</c>
+        /// argument is null. </exception>
+        /// <exception cref="ArgumentException">Thrown if there is
+        /// insufficient space between <c>outputOffset</c> and the end of
+        /// <c>buffer</c> to write out the IP address.</exception>
+        public int CopyOut(byte[] buffer, int outputOffset)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException();
+            }
+            if (buffer.Length - outputOffset < Length)
+            {
+                throw new ArgumentException("Byte array too short.");
+            }
+            buffer[outputOffset + 0] = (byte)(addr >> 24);
+            buffer[outputOffset + 1] = (byte)(addr >> 16);
+            buffer[outputOffset + 2] = (byte)(addr >> 8);
+            buffer[outputOffset + 3] = (byte)(addr);
+            return Length;
+        }
+
+        /// <summary>
+        /// The less-than operator for two IPv4 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 32-bit number representing the <c>lhs</c>
+        /// is less than <c>rhs</c>.</returns>
+        public static bool operator < (IPv4 lhs, IPv4 rhs)
+        {
+            return lhs.addr < rhs.addr;
+        }
+
+        /// <summary>
+        /// The less-than-or-equal-to operator for two IPv4 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 32-bit number representing the <c>lhs</c>
+        /// is less than or equal to <c>rhs</c>.</returns>
+        public static bool operator <= (IPv4 lhs, IPv4 rhs)
+        {
+            return lhs.addr <= rhs.addr;
+        }
+
+        /// <summary>
+        /// The greater-than operator for two IPv4 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 32-bit number representing the <c>lhs</c>
+        /// is greater than <c>rhs</c>.</returns>
+        public static bool operator > (IPv4 lhs, IPv4 rhs)
+        {
+            return lhs.addr > rhs.addr;
+        }
+
+        /// <summary>
+        /// The greater-than-or-equal-to operator for two IPv4 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 32-bit number representing the <c>lhs</c>
+        /// is greater than or equal to <c>rhs</c>.</returns>
+        public static bool operator >= (IPv4 lhs, IPv4 rhs)
+        {
+            return lhs.addr >= rhs.addr;
+        }
+
+        /// <summary>
+        /// Equals operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the addresses represented by <c>lhs</c> and
+        /// <c>rhs</c> are the same.</returns>
+        public static bool operator == (IPv4 lhs, IPv4 rhs)
+        {
+            return lhs.addr == rhs.addr;
+        }
+
+        /// <summary>
+        /// Not-equals operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the addresses represented by <c>lhs</c> and
+        /// <c>rhs</c> are different.</returns>
+        public static bool operator != (IPv4 lhs, IPv4 rhs)
+        {
+            return lhs.addr != rhs.addr;
+        }
+
+        /// <summary>
+        /// Bit-wise AND operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>An IPv4 instance.</returns>
+        public static IPv4 operator & (IPv4 lhs, IPv4 rhs)
+        {
+            return new IPv4(lhs.addr & rhs.addr);
+        }
+
+        /// <summary>
+        /// Bit-wise OR operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>An IPv4 instance.</returns>
+        public static IPv4 operator | (IPv4 lhs, IPv4 rhs)
+        {
+            return new IPv4(lhs.addr | rhs.addr);
+        }
+
+        /// <summary>
+        /// Bit-wise XOR operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>An IPv4 instance.</returns>
+        public static IPv4 operator ^ (IPv4 lhs, IPv4 rhs)
+        {
+            return new IPv4(lhs.addr ^ rhs.addr);
+        }
+
+        /// <summary>
+        /// Bit-wise NOT operator.
+        /// </summary>
+        /// <param name="ipv4"></param>
+        /// <returns>An IPv4 instance.</returns>
+        public static IPv4 operator ~ (IPv4 ipv4)
+        {
+            return new IPv4(~ipv4.addr);
+        }
+
+        /// <summary>
+        /// Increment IPv4 address.
+        /// </summary>
+        /// <param name="ipv4"></param>
+        /// <returns>An IPv4 instance.</returns>
+        public static IPv4 operator ++ (IPv4 ipv4)
+        {
+            return new IPv4(ipv4.addr + 1);
+        }
+
+        /// <summary>
+        /// Decrement IPv4 address.
+        /// </summary>
+        /// <param name="ipv4"></param>
+        /// <returns>An IPv4 instance.</returns>
+        public static IPv4 operator -- (IPv4 ipv4)
+        {
+            return new IPv4(ipv4.addr - 1);
+        }
+
+        /// <summary>
+        /// Right-shift operator.
+        /// </summary>
+        /// <param name="ipv4">Address to be shifted.</param>
+        /// <param name="n">Number of bits to shift-by.</param>
+        /// <returns>An IPv4 address.</returns>
+        public static IPv4 operator >> (IPv4 ipv4, int n)
+        {
+            if (n < BitCount)
+            {
+                return new IPv4(ipv4.addr >> n);
+            }
+            return IPv4.Zero;
+        }
+
+        /// <summary>
+        /// Left-shift operator.
+        /// </summary>
+        /// <param name="ipv4">Address to be shifted.</param>
+        /// <param name="n">Number of bits to shift-by.</param>
+        /// <returns>An IPv4 address.</returns>
+        public static IPv4 operator << (IPv4 ipv4, int n)
+        {
+            if (n < BitCount)
+            {
+                return new IPv4(ipv4.addr << n);
+            }
+            return IPv4.Zero;
+        }
+
+        /// <summary>
+        /// Get a single bit from an IPv4 address.
+        /// </summary>
+        /// <param name="bitIndex">Index of bit (ordered from msb-to-lsb)
+        /// </param>
+        /// <returns>Returns <c>true</c> if bit is set, false if
+        /// bit is unset or <paramref name="bitIndex" /> is out
+        /// of range.
+        /// </returns>
+        public bool GetBit(int bitIndex)
+        {
+            if (bitIndex < 0 || bitIndex >= BitCount)
+            {
+                return false;
+            }
+            uint mask = 1u << (31 - bitIndex);
+            return (addr & mask) == mask;
+        }
+
+        /// <summary>
+        /// Get the mask length from an IPv4 address representing a netmask.
+        /// </summary>
+        /// <param name="netmask"></param>
+        public static int GetMaskLength(IPv4 netmask)
+        {
+            int i = 0;
+            while (netmask.GetBit(i) == true)
+            {
+                i++;
+            }
+            return i;
+        }
+
+#if HAVE_SYSTEM_NET_IPADDRESS
+        /// <summary>
+        /// Cast <c>IPv4</c> instance into a <c>System.Net.IPAddress</c>
+        /// </summary>
+        /// <param name="ipv4"></param>
+        /// <returns>An <c>IPAddress</c> instance.</returns>
+        public static explicit operator IPAddress(IPv4 ipv4)
+        {
+            int netOrder = IPAddress.HostToNetworkOrder((int)ipv4.addr);
+            return new IPAddress(((long)netOrder) & 0xffffffff);
+        }
+#endif // HAVE_SYSTEM_NET_IPADDRESS
+
+        /// <summary>
+        /// Cast <c>IPv4</c> instance into an unsigned integer.
+        /// </summary>
+        /// <param name="ipv4"></param>
+        /// <returns>An unsigned integer.</returns>
+        public static explicit operator uint(IPv4 ipAddress)
+        {
+            return ipAddress.addr;
+        }
+
+        /// <summary>
+        /// Determines whether two Object instances are equal.
+        /// </summary>
+        /// <param name="other">Object to be compared to.</param>
+        /// <returns>True if <c>o</c> is an IPv4 address and numerically
+        /// the same as instance.</returns>
+        public override bool Equals(object other)
+        {
+            if (other is IPv4)
+            {
+                return addr == ((IPv4)other).addr;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Compute numeric hash of IPv4 instance.  Value is
+        /// suitable for use in hashing algorithms and data
+        /// structures like a hash table.
+        /// </summary>
+        public override int GetHashCode()
+        {
+            return (int)addr;
+        }
+
+        /// <summary>
+        /// Indicates whether instance represents a loopback address.
+        /// </summary>
+        /// <returns>True if instance represents a loopback
+        /// address.</returns>
+        public bool IsLoopback()
+        {
+            return (addr & 0xff000000) == 0x7f000000;
+        }
+
+        /// <summary>
+        /// Indicates whether instance represents a multicast address.
+        /// </summary>
+        /// <returns>True if instance represents a multicast
+        /// address.</returns>
+        public bool IsMulticast()
+        {
+            return (addr & 0xf0000000) == 0xe0000000;
+        }
+
+        /// <summary>
+        /// Returns a string representing IPv4 instance.
+        /// </summary>
+        public override string! ToString()
+        {
+            return String.Format("{0}.{1}.{2}.{3}",
+                                 addr >> 24, (addr >> 16) & 0xff,
+                                 (addr >> 8) & 0xff, addr & 0xff);
+        }
+
+        public int CompareTo(object other)
+        {
+            if (other == null)
+                return 1;
+            if (other is IPv4)
+            {
+                IPv4 value = (IPv4) other;
+                if (this < value) return -1;
+                if (this > value) return +1;
+                return 0;
+            }
+            throw new ArgumentException ("Arg_MustBeIPv4");
+        }
+
+        /// <summary>
+        /// IPv4 address representing an unspecified host.
+        /// </summary>
+        public static readonly IPv4 Any = new IPv4(0U);
+
+        /// <summary>
+        /// IPv4 address with all bits set to zero.
+        /// </summary>
+        public static readonly IPv4 Zero = new IPv4(0U);
+
+        /// <summary>
+        /// IPv4 loopback address.
+        /// </summary>
+        public static readonly IPv4 Loopback = new IPv4(0x7f000001U);
+
+        /// <summary>
+        /// IPv4 broadcast address.
+        /// </summary>
+        public static readonly IPv4 Broadcast = new IPv4(~0U);
+
+        /// <summary>
+        /// IPv4 address with all bits set to one.
+        /// </summary>
+        public static readonly IPv4 AllOnes = new IPv4(~0U);
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/IPv4HostEntry.cs b/base/Libraries/System.Net.IP/IPv4HostEntry.cs
new file mode 100644
index 0000000..cc8b7d9
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPv4HostEntry.cs
@@ -0,0 +1,35 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: IPv4HostEntry.cs
+//
+
+namespace System.Net.IP
+{
+    public class IPv4HostEntry
+    {
+        private string[]! aliases;
+        private IPv4[]!   addresses;
+
+        public string[]! Aliases
+        {
+            get { return aliases; }
+            set { aliases = value; }
+        }
+
+        public IPv4[]! AddressList
+        {
+            get { return addresses; }
+            set { addresses = value; }
+        }
+
+        public IPv4HostEntry(string[]! aliases, IPv4[]! addresses) {
+            this.aliases = aliases;
+            this.addresses = addresses;
+            base();
+        } 
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/IPv4Network.cs b/base/Libraries/System.Net.IP/IPv4Network.cs
new file mode 100644
index 0000000..ef8ebeb
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPv4Network.cs
@@ -0,0 +1,222 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPv4Network.cs
+//
+
+using System;
+
+namespace System.Net.IP
+{
+    /// <summary>
+    /// IPv4 Network Structure.
+    /// </summary>
+    [ CLSCompliant(false) ]
+    public struct IPv4Network
+    {
+        private IPv4 ipNetwork;
+        private int maskLength;
+
+        public IPv4Network(IPv4 ipNetwork, int maskLength)
+        {
+            if (maskLength < 0 || maskLength > IPv4.BitCount)
+            {
+                throw new ArgumentException();
+            }
+            this.maskLength = maskLength;
+            this.ipNetwork  = ipNetwork & IPv4.NetMask(maskLength);
+        }
+
+        public IPv4Network(IPv4 networkAddress, IPv4 networkMask)
+        {
+            this.maskLength = IPv4.GetMaskLength(networkMask);
+            this.ipNetwork  = networkAddress & IPv4.NetMask(this.maskLength);
+        }
+
+        public IPv4 Network
+        {
+            get { return ipNetwork; }
+        }
+
+        public int MaskLength
+        {
+            get { return maskLength; }
+        }
+
+        public IPv4 NetMask
+        {
+            get { return IPv4.NetMask(maskLength); }
+        }
+
+        public IPv4 LowerBound
+        {
+            get { return ipNetwork; }
+        }
+
+        public IPv4 UpperBound
+        {
+            get { return ipNetwork | ~NetMask; }
+        }
+
+        public bool IsMoreSpecificThan(IPv4Network other)
+        {
+            return maskLength > other.maskLength;
+        }
+
+        public bool IsLessSpecificThan(IPv4Network other)
+        {
+            return maskLength < other.maskLength;
+        }
+
+        public bool Contains(IPv4Network network)
+        {
+            return ( (maskLength <= network.maskLength) &&
+                     ((network.ipNetwork & this.NetMask) == this.ipNetwork) );
+        }
+
+        public bool Contains(IPv4 ipAddress)
+        {
+            return (ipAddress & this.NetMask) == this.ipNetwork;
+        }
+
+        public static bool operator == (IPv4Network x, IPv4Network y)
+        {
+            return ( (x.maskLength == y.maskLength) &&
+                     (x.ipNetwork  == y.ipNetwork) );
+        }
+
+        public static bool operator < (IPv4Network x, IPv4Network y)
+        {
+            if (x.maskLength == y.maskLength)
+            {
+                return x.ipNetwork < y.ipNetwork;
+            }
+            return x.maskLength < y.maskLength;
+        }
+
+        public static bool operator <= (IPv4Network x, IPv4Network y)
+        {
+            if (x.maskLength == y.maskLength)
+            {
+                return x.ipNetwork <= y.ipNetwork;
+            }
+            return x.maskLength <= y.maskLength;
+        }
+
+        public static bool operator != (IPv4Network x, IPv4Network y)
+        {
+            return !(x == y);
+        }
+
+        public static bool operator > (IPv4Network x, IPv4Network y)
+        {
+            return !(x <= y);
+        }
+
+        public static bool operator >= (IPv4Network x, IPv4Network y)
+        {
+            return !(x < y);
+        }
+
+        public override string! ToString()
+        {
+            return String.Format("{0}/{1}", ipNetwork, maskLength);
+        }
+
+        /// <summary>
+        ///
+        /// Parse an IPv4 network string representation into an IPv4Network.
+        ///
+        /// <para> The representation should either be <ipAddress/> or
+        ///        <ipAddress/>/<masklength/>.
+        /// </para>
+        ///
+        /// <para> Example forms of IPv4 Networks are: 10.0.2.0/24,
+        ///        10.0.0.1.
+        /// </para>
+        ///
+        /// </summary>
+        ///
+        /// <exception cref="ArgumentNullException"></exception>
+        ///
+        /// <exception cref="FormatException">
+        /// Thrown when IP address component of format is invalid or too many
+        /// slashes appear in string argument, or netmask length is not a valid
+        /// integer.
+        /// </exception>
+        ///
+        /// <exception cref="ArgumentException">
+        /// Thrown when specified mask length is greater than
+        /// <c>IPv4.BitCount</c>or less than zero.
+        /// </exception>
+        ///
+        /// <exception cref="OverflowException">
+        /// Netmask length overflows valid values for integers
+        /// </exception>
+        ///
+        public static IPv4Network Parse(string ipNetwork)
+        {
+            if (ipNetwork == null)
+                throw new ArgumentNullException("ipNetwork");
+
+            string [] pieces = ipNetwork.Split('/');
+
+            if (pieces.Length > 2)
+                throw new FormatException("slash overload");
+
+            int maskLength = IPv4.BitCount;
+            if (pieces.Length == 2)
+                maskLength = Int32.Parse(pieces[1]);
+
+            return new IPv4Network(IPv4.Parse(pieces[0]), maskLength);
+        }
+
+        /// <summary>
+        /// Exception-lite IPv4 network address parser.
+        /// </summary>
+        ///
+        /// <returns><c>true</c> on success, <c>false</c> if supplied address
+        /// is not a valid IPv4 string representation.
+        /// </returns>
+        ///
+        /// <exception cref = "ArgumentNullException"></exception>
+        ///
+        public static bool Parse(string ipNetwork, out IPv4Network network)
+        {
+            try
+            {
+                network = Parse(ipNetwork);
+                return true;
+            }
+            catch (ArgumentException) {}
+            catch (FormatException) {}
+            catch (OverflowException) {}
+
+            network = Default;
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return ipNetwork.GetHashCode() ^ (int)maskLength;
+        }
+
+        public override bool Equals(object other)
+        {
+            if (other is IPv4Network)
+            {
+                return (this == (IPv4Network)other);
+            }
+            return false;
+        }
+
+        public static readonly IPv4Network Default =
+            new IPv4Network(IPv4.Zero, 0);
+
+        public static readonly IPv4Network Loopback =
+            new IPv4Network(IPv4.Loopback, 8);
+    } // struct IPv4Network
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/IPv6.cs b/base/Libraries/System.Net.IP/IPv6.cs
new file mode 100644
index 0000000..9104e46
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPv6.cs
@@ -0,0 +1,881 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / NetStack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPv6.cs
+//
+
+using System;
+using System.Text;
+
+namespace System.Net.IP
+{
+    /// <summary>
+    /// IPv6 Address Structure.
+    /// </summary>
+    [ CLSCompliant(false) ]
+    public struct IPv6 : IComparable
+    {
+        private uint u0, u1, u2, u3;
+
+        /// <summary>
+        /// The number of bytes in an IPv6 address.
+        /// </summary>
+        public const int Length = 16;
+
+        /// <summary>
+        /// The number of bits in an IPv6 address.
+        /// </summary>
+        public const int BitCount = 128;
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="q0">The most significant 32-bits in
+        /// host order.</param>
+        /// <param name="q1">The next significant 32-bits in
+        /// host order.</param>
+        /// <param name="q2">The next significant 32-bits in
+        /// host order.</param>
+        /// <param name="q3">The least significant 32-bits in
+        /// host order.</param>
+        public IPv6(uint q0, uint q1, uint q2, uint q3)
+        {
+            u0 = q0;
+            u1 = q1;
+            u2 = q2;
+            u3 = q3;
+        }
+
+#if HAVE_SYSTEM_NET_IPADDRESS
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="ipa">An instance of the
+        /// System.Net.IPAddress class.</param>
+        /// <exception cref="ArgumentNullException">Thrown when
+        /// argument is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when
+        /// AddressFamily of <c>ipa</c>is other than
+        /// InterNetwork6</exception>
+        public IPv6(IPAddress ipa)
+        {
+            if (ipa == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            byte [] data = ipa.GetAddressBytes();
+            if (data.Length != Length)
+            {
+                throw new ArgumentException();
+            }
+            u0 = (uint)((data[0] << 24) | (data[1] << 16) |
+                        (data[2] << 8)  | (data[3]));
+            u1 = (uint)((data[4] << 24) | (data[5] << 16) |
+                        (data[6] << 8)  | (data[7]));
+            u2 = (uint)((data[8] << 24) | (data[9] << 16) |
+                        (data[10] << 8)  | (data[11]));
+            u3 = (uint)((data[12] << 24) | (data[13] << 16) |
+                        (data[14] << 8)  | (data[15]));
+        }
+#endif // HAVE_SYSTEM_NET_IPADDRESS
+
+        /// <summary>
+        /// Provide a copy of the <c>IPv6</c> address as an array of bytes.
+        /// </summary>
+        /// <returns>Array of bytes, ordered MSB to LSB.</returns>
+        public byte[] GetAddressBytes()
+        {
+            return new byte[Length] {
+                (byte)(u0 >> 24), (byte)(u0 >> 16),
+                (byte)(u0 >>  8), (byte)(u0),
+                (byte)(u1 >> 24), (byte)(u1 >> 16),
+                (byte)(u1 >>  8), (byte)(u1),
+                (byte)(u2 >> 24), (byte)(u2 >> 16),
+                (byte)(u2 >>  8), (byte)(u2),
+                (byte)(u3 >> 24), (byte)(u3 >> 16),
+                (byte)(u3 >>  8), (byte)(u3)
+            };
+        }
+
+        /// <summary>
+        /// Create an IPv6 address representing a netmask.
+        /// </summary>
+        /// <param name="maskLength"></param>
+        /// <returns>An IPv6 instance.</returns>
+        /// <exception cref="ArgumentException">Thrown if maskLength is
+        /// outside of the range [0,128].</exception>
+        public static IPv6 NetMask(int maskLength)
+        {
+            if ((maskLength > BitCount) || (maskLength < 0))
+            {
+                throw new
+                    ArgumentException("Mask length greater than possible.");
+            }
+            return IPv6.AllOnes << (BitCount - maskLength);
+        }
+
+        /// <summary>
+        /// Create an IPv6 address representing an IPv4 node that is only
+        /// IPv4 capable.
+        /// </summary>
+        public static IPv6 CreateIPv4OnlyNodeAddress(IPv4 a)
+        {
+            return new IPv6(0, 0, 0xffff, (uint)a);
+        }
+
+        /// <summary>
+        /// Create an IPv6 address representing an IPv4 node is IPv4
+        /// and IPv6 capable.
+        /// </summary>
+        public static IPv6 CreateIPv4NodeAddress(IPv4 a)
+        {
+            return new IPv6(0, 0, 0x0, (uint)a);
+        }
+
+        /// <summary>
+        /// Create an IPv6 address from bytes in an array.  The bytes
+        /// are assumed to be in the order of MSB to LSB.
+        /// </summary>
+        /// <param name="data">Byte array to read address from.</param>
+        /// <param name="offset">Offset in bytes of starting point.</param>
+        /// <exception cref="ArgumentNullException">Thrown if the array
+        /// is null.</exception>
+        /// <exception cref="ArgumentException">Thrown if there are less
+        /// than 16 bytes from the offset to the end of the array.</exception>
+        public static IPv6 ParseBytes(byte [] data, int offset)
+        {
+            if (data == null)
+            {
+                throw new ArgumentNullException();
+            }
+            if (data.Length - offset < Length)
+            {
+                throw new ArgumentException("Byte array length not 16.");
+            }
+            return new IPv6((uint)((data[offset + 0] << 24) |
+                                   (data[offset + 1] << 16) |
+                                   (data[offset + 2] << 8)  |
+                                   (data[offset + 3])),
+                            (uint)((data[offset + 4] << 24) |
+                                   (data[offset + 5] << 16) |
+                                   (data[offset + 6] << 8)  |
+                                   (data[offset + 7])),
+                            (uint)((data[offset + 8] << 24) |
+                                   (data[offset + 9] << 16) |
+                                   (data[offset + 10] << 8) |
+                                   (data[offset + 11])),
+                            (uint)((data[offset + 12] << 24) |
+                                   (data[offset + 13] << 16) |
+                                   (data[offset + 14] << 8)  |
+                                   (data[offset + 15]))
+                            );
+        }
+
+        /// <summary>
+        /// Create an IPv6 address from bytes in an array.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if the array
+        /// is null.</exception>
+        /// <exception cref="ArgumentException">Thrown if there are less
+        /// than 16 bytes in the array.</exception>
+        public static IPv6 ParseBytes(byte [] data)
+        {
+            return ParseBytes(data, 0);
+        }
+
+        /// <summary>
+        /// Converts characters in a range to parts of an IPv6 address.
+        /// <param name="ipString">Input string.</param>
+        /// <param name="start">Start position in <c>ipString</c></param>
+        /// <param name="end">End position in <c>ipString</c></param>
+        /// <param name="maxValues">The maximum number of 16bit address
+        ///   components to accept.</param>
+        /// <param name="values">Array to receive 16bit address components.
+        /// </param>
+        /// </summary>
+        private static int Parse(string! ipString, int start, int end,
+                                 int maxValues, ref ushort[]! values)
+        {
+            const string hex = "00112233445566778899aAbBcCdDeEfF";
+
+            int valueIndex = 0;
+            int digits = 0;
+
+            for (int i = start; i < end; i++)
+            {
+                int n = hex.IndexOf(ipString[i]);
+                digits ++;
+                if (n >= 0)
+                {
+                    if (valueIndex == maxValues || digits > 4)
+                    {
+                        // About to access value beyond specified range
+                        throw new FormatException();
+                    }
+                    uint v = values[valueIndex];
+                    v = v * 16 + (uint)(n / 2);
+                    if (v > 0xffffu)
+                    {
+                        throw new FormatException();
+                    }
+                    values[valueIndex] = (ushort)v;
+                }
+                else if (ipString[i] == ':')
+                {
+                    // Reached Separator or end
+                    valueIndex++;
+                    digits = 0;
+                }
+                else
+                {
+                    // Invalid Character
+                    throw new FormatException();
+                }
+            }
+            return valueIndex + 1;
+        }
+
+        /// <summary>
+        /// Converts an IP address string into an IPv6 instance.  This string
+        /// must be a pure IPv6 representation -- IPv4 representations are not
+        /// supported.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if
+        /// <c>ipString</c> is null.</exception>
+        /// <exception cref="FormatException">Thrown if
+        /// <c>ipString</c> is invalid.</exception>
+        public static IPv6 Parse(string ipString)
+        {
+            if (ipString == null)
+                throw new ArgumentNullException();
+
+            int zeroSep = ipString.IndexOf("::");
+
+            ushort[]! lhs = new ushort [8];
+            int nlhs;
+
+            if (zeroSep >= 0)
+            {
+                nlhs = Parse(ipString, 0, zeroSep, 8, ref lhs);
+                ushort[]! rhs = new ushort [8];
+                int nrhs = Parse(ipString, zeroSep + 2, ipString.Length,
+                                 8 - nlhs, ref rhs);
+                if (nrhs + nlhs > 8)
+                {
+                    throw new FormatException("Too many address components");
+                }
+                for (int i = 0; i < nrhs; i++)
+                {
+                    lhs[8 - nrhs + i] = rhs[i];
+                }
+            }
+            else
+            {
+                nlhs = Parse(ipString, 0, ipString.Length, 8, ref lhs);
+            }
+
+            return new IPv6( ((uint)lhs[0] << 16) | ((uint)lhs[1]),
+                             ((uint)lhs[2] << 16) | ((uint)lhs[3]),
+                             ((uint)lhs[4] << 16) | ((uint)lhs[5]),
+                             ((uint)lhs[6] << 16) | ((uint)lhs[7])
+                             );
+        }
+
+        /// <summary>
+        /// Converts an IP address string into an IPv6 instance.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if
+        /// <c>ipString</c> is null.</exception>
+        /// <returns> <c>true</c> on success, <c>false</c> on failure.</returns>
+        public static bool Parse(string ipString, out IPv6 address)
+        {
+            try
+            {
+                address = Parse(ipString);
+            }
+            catch (FormatException)
+            {
+                address = IPv6.Zero;
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Writes network-order byte representation of IPv6 address
+        /// into buffer at a specified offset.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if <c>buffer</c>
+        /// argument is null. </exception>
+        /// <exception cref="ArgumentException">Thrown if there is
+        /// insufficient space between <c>outputOffset</c> and the end of
+        /// <c>buffer</c> to write out the IP address.</exception>
+        public int CopyOut(byte[] buffer, int outputOffset)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException();
+            }
+            if (buffer.Length - outputOffset < Length)
+            {
+                throw new ArgumentException("Byte array too short.");
+            }
+            buffer[outputOffset + 0] = (byte)(u0 >> 24);
+            buffer[outputOffset + 1] = (byte)(u0 >> 16);
+            buffer[outputOffset + 2] = (byte)(u0 >> 8);
+            buffer[outputOffset + 3] = (byte)(u0);
+
+            buffer[outputOffset + 4] = (byte)(u1 >> 24);
+            buffer[outputOffset + 5] = (byte)(u1 >> 16);
+            buffer[outputOffset + 6] = (byte)(u1 >> 8);
+            buffer[outputOffset + 7] = (byte)(u1);
+
+            buffer[outputOffset + 8]  = (byte)(u2 >> 24);
+            buffer[outputOffset + 9]  = (byte)(u2 >> 16);
+            buffer[outputOffset + 10] = (byte)(u2 >> 8);
+            buffer[outputOffset + 11] = (byte)(u2);
+
+            buffer[outputOffset + 12] = (byte)(u3 >> 24);
+            buffer[outputOffset + 13] = (byte)(u3 >> 16);
+            buffer[outputOffset + 14] = (byte)(u3 >> 8);
+            buffer[outputOffset + 15] = (byte)(u3);
+
+            return Length;
+        }
+
+        /// <summary>
+        /// The less-than operator for two IPv6 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 128-bit number representing the <c>lhs</c>
+        /// is less than <c>rhs</c>.</returns>
+        public static bool operator < (IPv6 lhs, IPv6 rhs)
+        {
+            if (lhs.u0 != rhs.u0)
+                return lhs.u0 < rhs.u0;
+            if (lhs.u1 != rhs.u1)
+                return lhs.u1 < rhs.u1;
+            if (lhs.u2 != rhs.u2)
+                return lhs.u2 < rhs.u2;
+            return lhs.u3 < rhs.u3;
+        }
+
+        /// <summary>
+        /// The less-than-or-equal-to operator for two IPv6 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 128-bit number representing the <c>lhs</c>
+        /// is less than or equal to <c>rhs</c>.</returns>
+        public static bool operator <= (IPv6 lhs, IPv6 rhs)
+        {
+            if (rhs.u0 > lhs.u0 || rhs.u1 > lhs.u1 || rhs.u2 > lhs.u2)
+                return false;
+
+            return lhs.u3 <= rhs.u3;
+        }
+
+        /// <summary>
+        /// The greater-than operator for two IPv6 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 128-bit number representing the <c>lhs</c>
+        /// is greater than <c>rhs</c>.</returns>
+        public static bool operator > (IPv6 lhs, IPv6 rhs)
+        {
+            if (lhs.u0 != rhs.u0)
+                return lhs.u0 > rhs.u0;
+            if (lhs.u1 != rhs.u1)
+                return lhs.u1 > rhs.u1;
+            if (lhs.u2 != rhs.u2)
+                return lhs.u2 > rhs.u2;
+            return lhs.u3 > rhs.u3;
+        }
+
+        /// <summary>
+        /// The greater-than-or-equal-to operator for two IPv6 addresses.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the 128-bit number representing the <c>lhs</c>
+        /// is greater than or equal to <c>rhs</c>.</returns>
+        public static bool operator >= (IPv6 lhs, IPv6 rhs)
+        {
+            if (lhs.u0 < rhs.u0 || lhs.u1 < rhs.u1 || lhs.u2 < rhs.u2)
+                return false;
+
+            return lhs.u3 >= rhs.u3;
+        }
+
+        /// <summary>
+        /// Equals operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the addresses represented by <c>lhs</c> and
+        /// <c>rhs</c> are the same.</returns>
+        public static bool operator == (IPv6 lhs, IPv6 rhs)
+        {
+            return ((lhs.u0 == rhs.u0) && (lhs.u1 == rhs.u1) &&
+                    (lhs.u2 == rhs.u2) && (lhs.u3 == rhs.u3));
+        }
+
+        /// <summary>
+        /// Not-equals operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>True if the addresses represented by <c>lhs</c> and
+        /// <c>rhs</c> are different.</returns>
+        public static bool operator != (IPv6 lhs, IPv6 rhs)
+        {
+            return ((lhs.u0 != rhs.u0) || (lhs.u1 != rhs.u1) ||
+                    (lhs.u2 != rhs.u2) || (lhs.u3 != rhs.u3));
+        }
+
+        /// <summary>
+        /// Bit-wise AND operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>An IPv6 instance.</returns>
+        public static IPv6 operator & (IPv6 lhs, IPv6 rhs)
+        {
+            return new IPv6(lhs.u0 & rhs.u0, lhs.u1 & rhs.u1,
+                            lhs.u2 & rhs.u2, lhs.u3 & rhs.u3);
+        }
+
+        /// <summary>
+        /// Bit-wise OR operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>An IPv6 instance.</returns>
+        public static IPv6 operator | (IPv6 lhs, IPv6 rhs)
+        {
+            return new IPv6(lhs.u0 | rhs.u0, lhs.u1 | rhs.u1,
+                            lhs.u2 | rhs.u2, lhs.u3 | rhs.u3);
+        }
+
+        /// <summary>
+        /// Bit-wise XOR operator.
+        /// </summary>
+        /// <param name="lhs"></param>
+        /// <param name="rhs"></param>
+        /// <returns>An IPv6 instance.</returns>
+        public static IPv6 operator ^ (IPv6 lhs, IPv6 rhs)
+        {
+            return new IPv6(lhs.u0 ^ rhs.u0, lhs.u1 ^ rhs.u1,
+                            lhs.u2 ^ rhs.u2, lhs.u3 ^ rhs.u3);
+        }
+
+        /// <summary>
+        /// Bit-wise NOT operator.
+        /// </summary>
+        /// <param name="ipv6"></param>
+        /// <returns>An IPv6 instance.</returns>
+        public static IPv6 operator ~ (IPv6 ipv6)
+        {
+            return new IPv6(~ipv6.u0, ~ipv6.u1, ~ipv6.u2, ~ipv6.u3);
+        }
+
+        /// <summary>
+        /// Increment IPv6 address.
+        /// </summary>
+        /// <param name="ipv6"></param>
+        /// <returns>An IPv6 instance.</returns>
+        public static IPv6 operator ++ (IPv6 ipv6)
+        {
+            uint u3 = ipv6.u3 + 1;
+            if (u3 > ipv6.u3)
+                return new IPv6(ipv6.u0, ipv6.u1, ipv6.u2, u3);
+            uint u2 = ipv6.u2 + 1;
+            if (u2 > ipv6.u2)
+                return new IPv6(ipv6.u0, ipv6.u1, u2, u3);
+            uint u1 = ipv6.u1 + 1;
+            if (u1 > ipv6.u1)
+                return new IPv6(ipv6.u0, u1, u2, u3);
+            uint u0 = ipv6.u0 + 1;
+            return new IPv6(u0, u1, u2, u3);
+        }
+
+        /// <summary>
+        /// Decrement IPv6 address.
+        /// </summary>
+        /// <param name="ipv6"></param>
+        /// <returns>An IPv6 instance.</returns>
+        public static IPv6 operator -- (IPv6 ipv6)
+        {
+            uint u3 = ipv6.u3 - 1;
+            if (u3 < ipv6.u3)
+                return new IPv6(ipv6.u0, ipv6.u1, ipv6.u2, u3);
+            uint u2 = ipv6.u2 - 1;
+            if (u2 < ipv6.u2)
+                return new IPv6(ipv6.u0, ipv6.u1, u2, u3);
+            uint u1 = ipv6.u1 - 1;
+            if (u1 < ipv6.u1)
+                return new IPv6(ipv6.u0, u1, u2, u3);
+            uint u0 = ipv6.u0 - 1;
+            return new IPv6(u0, u1, u2, u3);
+        }
+
+        /// <summary>
+        /// Right-shift operator.
+        /// </summary>
+        /// <param name="addr">Address to be shifted.</param>
+        /// <param name="n">Number of bits to shift-by.</param>
+        /// <returns>An IPv6 address.</returns>
+        public static IPv6 operator >> (IPv6 addr, int n)
+        {
+            switch (n >> 5)
+            {
+                case 3:
+                    addr.u3 = addr.u0;
+                    addr.u0 = addr.u1 = addr.u2 = 0;
+                    break;
+                case 2:
+                    addr.u3 = addr.u1;
+                    addr.u2 = addr.u0;
+                    addr.u0 = addr.u1 = 0;
+                    break;
+                case 1:
+                    addr.u3 = addr.u2;
+                    addr.u2 = addr.u1;
+                    addr.u1 = addr.u0;
+                    addr.u0 = 0;
+                    break;
+                case 0:
+                    break;
+                default:
+                    if (n < 0)
+                        return addr << (-n);
+                    return Zero;
+            }
+
+            n = n & 0x1f;
+            if (n != 0)
+            {
+                int m = 32 - n;
+                addr.u3 = (addr.u3 >> n) | (addr.u2 << m);
+                addr.u2 = (addr.u2 >> n) | (addr.u1 << m);
+                addr.u1 = (addr.u1 >> n) | (addr.u0 << m);
+                addr.u0 = (addr.u0 >> n);
+            }
+            return new IPv6(addr.u0, addr.u1, addr.u2, addr.u3);
+        }
+
+        /// <summary>
+        /// Left-shift operator.
+        /// </summary>
+        /// <param name="addr">Address to be shifted.</param>
+        /// <param name="n">Number of bits to shift-by.</param>
+        /// <returns>An IPv6 address.</returns>
+        public static IPv6 operator << (IPv6 addr, int n)
+        {
+            switch (n >> 5)
+            {
+                case 3:
+                    addr.u0 = addr.u3;
+                    addr.u1 = addr.u2 = addr.u3 = 0;
+                    break;
+                case 2:
+                    addr.u0 = addr.u2;
+                    addr.u1 = addr.u3;
+                    addr.u2 = addr.u3 = 0;
+                    break;
+                case 1:
+                    addr.u0 = addr.u1;
+                    addr.u1 = addr.u2;
+                    addr.u2 = addr.u3;
+                    addr.u3 = 0;
+                    break;
+                case 0:
+                    break;
+                default:
+                    if (n < 0)
+                        return addr >> (-n);
+                    return Zero;
+            }
+            n = n & 0x1f;
+            if (n != 0)
+            {
+                int m = 32 - n;
+                addr.u0 = (addr.u0 << n) | (addr.u1 >> m);
+                addr.u1 = (addr.u1 << n) | (addr.u2 >> m);
+                addr.u2 = (addr.u2 << n) | (addr.u3 >> m);
+                addr.u3 = (addr.u3 << n);
+            }
+            return new IPv6(addr.u0, addr.u1, addr.u2, addr.u3);
+        }
+
+        /// <summary>
+        /// Get a single bit from an IPv6 address.
+        /// </summary>
+        /// <param name="bitIndex">Index of bit (ordered from msb-to-lsb)
+        /// </param>
+        /// <returns>Returns <c>true</c> if bit is set, false if
+        /// bit is unset or <paramref name="bitIndex" /> is out
+        /// of range.
+        /// </returns>
+        public bool GetBit(int bitIndex)
+        {
+            if (bitIndex < 0 || bitIndex >= BitCount)
+            {
+                return false;
+            }
+
+            int dwordIndex  = bitIndex / 32;
+            uint mask = 1u << (31 - (bitIndex & 31));
+
+            switch (dwordIndex)
+            {
+                case 0:
+                    return (u0 & mask) == mask;
+                case 1:
+                    return (u1 & mask) == mask;
+                case 2:
+                    return (u2 & mask) == mask;
+            }
+            return (u3 & mask) == mask;
+        }
+
+        /// <summary>
+        /// Get the mask length from an IPv6 address representing a netmask.
+        /// </summary>
+        /// <param name="netmask"></param>
+        public static int GetMaskLength(IPv6 netmask)
+        {
+            int i = 0;
+            while (netmask.GetBit(i) == true)
+            {
+                i++;
+            }
+            return i;
+        }
+
+#if HAVE_SYSTEM_NET_IPADDRESS
+        /// <summary>
+        /// Cast <c>IPv6</c> instance into a <c>System.Net.IPAddress</c>
+        /// </summary>
+        /// <param name="ipv6"></param>
+        /// <returns>An <c>IPAddress</c> instance.</returns>
+        public static explicit operator IPAddress(IPv6 ipv6)
+        {
+            return new IPAddress(ipv6.GetAddressBytes());
+        }
+#endif // HAVE_SYSTEM_NET_IPADDRESS
+
+        /// <summary>
+        /// Determines whether two Object instances are equal.
+        /// </summary>
+        /// <param name="o">Object to be compared to.</param>
+        /// <returns>True if <c>o</c> is an IPv6 address and numerically
+        /// the same as instance.</returns>
+        public override bool Equals(object o)
+        {
+            if (o is IPv6)
+            {
+                IPv6 ipo = (IPv6)o;
+                return this == ipo;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Compute numeric hash of IPv6 instance.  Value is
+        /// suitable for use in hashing algorithms and data
+        /// structures like a hash table.
+        /// </summary>
+        public override int GetHashCode()
+        {
+            return (int)(u0 ^ u1 ^ u2 ^ u3);
+        }
+
+        /// <summary>
+        /// Determine if IPv6 address represents an IPv4 capable node.
+        /// </summary>
+        public bool RepresentsIPv4Address()
+        {
+            // RFC1884 Section 2.4.4
+            return (u0 == 0) && (u1 == 0) && ((u2 >> 16) == 0) &&
+                ((u2 & 0xffff) == 0xffff ||
+                 ((u2 & 0xffff) == 0) && (u3 != 0));
+        }
+
+        /// <summary>
+        /// Determine if IPv6 address represents IPv4 only capable node.
+        /// </summary>
+        public bool RepresentsIPv4OnlyAddress()
+        {
+            // RFC1884 Section 2.4.4
+            return (u0 == 0) && (u1 == 0) && ((u2 >> 16) == 0) &&
+                ((u2 & 0xffff) == 0xffff);
+        }
+
+        /// <summary>
+        /// Determine if IPv6 address represents a link-local address.
+        /// </summary>
+        public bool IsLinkLocalAddress()
+        {
+            return (u0 & 0xffc00000) == 0xfe800000;     // RFC1884 Section 2.3
+        }
+
+        /// <summary>
+        /// Determine if IPv6 address represents a site-local address.
+        /// </summary>
+        public bool IsSiteLocalAddress()
+        {
+            return (u0 & 0xffc00000) == 0xfec00000;     // RFC1884 Section 2.3
+        }
+
+        /// <summary>
+        /// Indicates whether instance represents a native IPv6
+        /// loopback address.
+        /// </summary>
+        /// <returns>True if instance represents a loopback
+        /// address.</returns>
+        public bool IsLoopback()
+        {
+            return (this == IPv6.Loopback);
+        }
+
+        /// <summary>
+        /// Determine if IPv6 address represents a native IPv6
+        /// multicast address.
+        /// </summary>
+        public bool IsMulticast()
+        {
+            return ((u0 & 0xff000000) == 0xff000000);
+        }
+
+        /// <summary>
+        /// Extract embedded IPv4 address.
+        /// </summary>
+        /// <returns>Returns IPv4 address on success and <c>IPv4.Any</c>
+        /// if address does not represent an IPv4 address.</returns>
+        public IPv4 GetIPv4Address()
+        {
+            if (u0 == 0 && u1 == 0 && (u2 == 0 || u2 == 0xffff))
+            {
+                return new IPv4(u3);
+            }
+            return IPv4.Any;
+        }
+
+        private string! NativeStringRepresentation()
+        {
+            // Copy address into array of ushorts to make it easy to find
+            // region a region of zeroes per RFC 1884.  We only find the
+            // first region rather than attempt to find the longest.
+            ushort [] words = new ushort [8] {
+                (ushort)(u0 >> 16), (ushort)(u0 & 0xffffU),
+                (ushort)(u1 >> 16), (ushort)(u1 & 0xffffU),
+                (ushort)(u2 >> 16), (ushort)(u2 & 0xffffU),
+                (ushort)(u3 >> 16), (ushort)(u3 & 0xffffU)
+            };
+
+            // Find start of the zero block
+            int zStart;
+            for (zStart = 0; zStart < words.Length; zStart++)
+            {
+                if (words[zStart] == 0)
+                    break;
+            }
+
+            // Find the end of the zero block
+            int zEnd;
+            for (zEnd = zStart + 1; zEnd < words.Length; zEnd++)
+            {
+                if (words[zEnd] != 0)
+                    break;
+            }
+
+            // Max size is 8 * 4 hexdigits + 7 * 1 digit separator
+            StringBuilder sb = new StringBuilder(null, 8 * 4 + 7 * 1);
+            for (int i = 0; i < zStart; i++)
+            {
+                if (i > 0)
+                    sb.AppendFormat(":{0:x}", words[i]);
+                else
+                    sb.AppendFormat("{0:x}", words[i]);
+            }
+
+            if (zStart == words.Length)
+                return sb.ToString();
+
+            sb.Append("::");
+            for (int i = zEnd; i < words.Length; i++)
+            {
+                if (i > zEnd)
+                    sb.AppendFormat(":{0:x}", words[i]);
+                else
+                    sb.AppendFormat("{0:x}", words[i]);
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns a string representing IPv6 instance.
+        /// </summary>
+        public override string! ToString()
+        {
+#if NOTYET
+            if (RepresentsIPv4OnlyAddress() == true)
+            {
+                return String.Format("::ffff:{0}.{1}.{2}.{3}", u3 >> 24,
+                                     (u3 >> 16) & 0xff, (u3 >> 8) & 0xff,
+                                     u3 & 0xff);
+            }
+            else if (RepresentsIPv4Address() == true)
+            {
+                return String.Format("::{0}.{1}.{2}.{3}", u3 >> 24,
+                                     (u3 >> 16) & 0xff, (u3 >> 8) & 0xff,
+                                     u3 & 0xff);
+            }
+#endif // NOTYET
+            return NativeStringRepresentation();
+        }
+
+        public int CompareTo(object other)
+        {
+            if (other == null)
+                return 1;
+            if (other is IPv6)
+            {
+                IPv6 value = (IPv6) other;
+                if (this < value) return -1;
+                if (this > value) return +1;
+                return 0;
+            }
+            throw new ArgumentException ("Arg_MustBeIPv6");
+        }
+
+
+        /// <summary>
+        /// IPv6 address representing unspecified address.
+        /// </summary>
+        public static readonly IPv6 Any = new IPv6(0U, 0U, 0U, 0U);
+
+        /// <summary>
+        /// IPv6 address with all bits set to zero.
+        /// </summary>
+        public static readonly IPv6 Zero = new IPv6(0U, 0U, 0U, 0U);
+
+        /// <summary>
+        /// IPv6 loopback address.
+        /// </summary>
+        public static readonly IPv6 Loopback = new IPv6(0U, 0U, 0U, 1U);
+
+        /// <summary>
+        /// IPv6 address with all bits set to one.
+        /// </summary>
+        public static readonly IPv6 AllOnes = new IPv6(~0U, ~0U, ~0U, ~0U);
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/IPv6HostEntry.cs b/base/Libraries/System.Net.IP/IPv6HostEntry.cs
new file mode 100644
index 0000000..57ed6c2
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPv6HostEntry.cs
@@ -0,0 +1,29 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: IPv6HostEntry.cs
+//
+
+namespace System.Net.IP
+{
+    public class IPv6HostEntry
+    {
+        private string [] aliases;
+        private IPv6 []   addresses;
+
+        public string [] Aliases
+        {
+            get { return aliases; }
+            set { aliases = value; }
+        }
+
+        public IPv6 [] AddressList
+        {
+            get { return addresses; }
+            set { addresses = value; }
+        }
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/IPv6Network.cs b/base/Libraries/System.Net.IP/IPv6Network.cs
new file mode 100644
index 0000000..712479a
--- /dev/null
+++ b/base/Libraries/System.Net.IP/IPv6Network.cs
@@ -0,0 +1,221 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPv6Network.cs
+//
+
+using System;
+
+namespace System.Net.IP
+{
+    /// <summary>
+    /// IPv6 Network Structure.
+    /// </summary>
+    [ CLSCompliant(false) ]
+    public struct IPv6Network
+    {
+        private IPv6 ipNetwork;
+        private int maskLength;
+
+        public IPv6Network(IPv6 ipNetwork, int maskLength)
+        {
+            if (maskLength < 0 || maskLength > IPv6.BitCount)
+            {
+                throw new ArgumentException();
+            }
+            this.maskLength = maskLength;
+            this.ipNetwork  = ipNetwork & IPv6.NetMask(maskLength);
+        }
+
+        public IPv6Network(IPv6 networkAddress, IPv6 networkMask)
+        {
+            this.maskLength = IPv6.GetMaskLength(networkMask);
+            this.ipNetwork  = networkAddress & IPv6.NetMask(this.maskLength);
+        }
+
+        public IPv6 Network
+        {
+            get { return ipNetwork; }
+        }
+
+        public int MaskLength
+        {
+            get { return maskLength; }
+        }
+
+        public IPv6 NetMask
+        {
+            get { return IPv6.NetMask(maskLength); }
+        }
+
+        public IPv6 LowerBound
+        {
+            get { return ipNetwork; }
+        }
+
+        public IPv6 UpperBound
+        {
+            get { return ipNetwork | ~NetMask; }
+        }
+
+        public bool IsMoreSpecificThan(IPv6Network other)
+        {
+            return maskLength > other.maskLength;
+        }
+
+        public bool IsLessSpecificThan(IPv6Network other)
+        {
+            return maskLength < other.maskLength;
+        }
+
+        public bool Contains(IPv6Network network)
+        {
+            return ( (maskLength <= network.maskLength) &&
+                     ((network.ipNetwork & this.NetMask) == this.ipNetwork) );
+        }
+
+        public bool Contains(IPv6 ipAddress)
+        {
+            return (ipAddress & this.NetMask) == this.ipNetwork;
+        }
+
+        public static bool operator ==(IPv6Network x, IPv6Network y)
+        {
+            return ( (x.maskLength == y.maskLength) &&
+                     (x.ipNetwork  == y.ipNetwork) );
+        }
+
+        public static bool operator <(IPv6Network x, IPv6Network y)
+        {
+            if (x.maskLength == y.maskLength)
+            {
+                return x.ipNetwork < y.ipNetwork;
+            }
+            return x.maskLength < y.maskLength;
+        }
+
+        public static bool operator <=(IPv6Network x, IPv6Network y)
+        {
+            if (x.maskLength == y.maskLength)
+            {
+                return x.ipNetwork <= y.ipNetwork;
+            }
+            return x.maskLength <= y.maskLength;
+        }
+
+        public static bool operator !=(IPv6Network x, IPv6Network y)
+        {
+            return !(x == y);
+        }
+
+        public static bool operator >(IPv6Network x, IPv6Network y)
+        {
+            return !(x <= y);
+        }
+
+        public static bool operator >=(IPv6Network x, IPv6Network y)
+        {
+            return !(x < y);
+        }
+
+        public override string! ToString()
+        {
+            return String.Format("{0}/{1}", ipNetwork, maskLength);
+        }
+
+        public override int GetHashCode()
+        {
+            return ipNetwork.GetHashCode() ^ (int)maskLength;
+        }
+
+        public override bool Equals(object other)
+        {
+            if (other is IPv6Network)
+            {
+                return (this == (IPv6Network)other);
+            }
+            return false;
+        }
+
+        /// <summary>
+        ///
+        /// Parse an IPv6 network string representation into an IPv6Network.
+        ///
+        /// <para> The representation should either be <ipAddress/> or
+        ///        <ipAddress/>/<masklength/>.
+        /// </para>
+        ///
+        /// <para> Example forms of IPv6 Networks are: 10.0.2.0/24,
+        ///        10.0.0.1.
+        /// </para>
+        ///
+        /// </summary>
+        ///
+        /// <exception cref="ArgumentNullException"></exception>
+        ///
+        /// <exception cref="FormatException">
+        /// Thrown when IP address component of format is invalid or too many
+        /// slashes appear in string argument, or netmask length is not a valid
+        /// integer.
+        /// </exception>
+        ///
+        /// <exception cref="ArgumentException">
+        /// Thrown when specified mask length is greater than
+        /// <c>IPv6.BitCount</c> or less than zero.
+        /// </exception>
+        ///
+        /// <exception cref="OverflowException">
+        /// Netmask length overflows valid values for integers
+        /// </exception>
+        ///
+        public static IPv6Network Parse(string ipNetwork)
+        {
+            if (ipNetwork == null)
+                throw new ArgumentNullException("ipNetwork");
+
+            string [] pieces = ipNetwork.Split('/');
+
+            if (pieces.Length > 2)
+                throw new FormatException("slash overload");
+
+            int maskLength = IPv6.BitCount;
+            if (pieces.Length == 2)
+                maskLength = Int32.Parse(pieces[1]);
+
+            return new IPv6Network(IPv6.Parse(pieces[0]), maskLength);
+        }
+
+        /// <summary>
+        /// Exception-lite IPv6 network address parser.
+        /// </summary>
+        ///
+        /// <returns><c>true</c> on success, <c>false</c> if supplied address
+        /// is not a valid IPv6 string representation.
+        /// </returns>
+        ///
+        /// <exception cref = "ArgumentNullException"></exception>
+        ///
+        public static bool Parse(string ipNetwork, out IPv6Network network)
+        {
+            try
+            {
+                network = Parse(ipNetwork);
+                return true;
+            }
+            catch (ArgumentException) {}
+            catch (FormatException) {}
+            catch (OverflowException) {}
+
+            network = Default;
+            return false;
+        }
+
+
+        public static readonly IPv6Network Default =
+                                                new IPv6Network(IPv6.Zero, 0);
+
+    } // struct IPv6Network
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/System.Net.IP.csproj b/base/Libraries/System.Net.IP/System.Net.IP.csproj
new file mode 100644
index 0000000..42b59d4
--- /dev/null
+++ b/base/Libraries/System.Net.IP/System.Net.IP.csproj
@@ -0,0 +1,46 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Services\System.Net.IP\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>System.Net.IP</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IPv4.cs" />
+    <Compile Include="IPv4HostEntry.cs" />
+    <Compile Include="IPv4Network.cs" />
+    <Compile Include="IPv6.cs" />
+    <Compile Include="IPv6HostEntry.cs" />
+    <Compile Include="IPv6Network.cs" />
+  </ItemGroup>
+
+  <!--
+# IPAddressUtils.cs
+# TestIPv4.cs
+# TestIPv4Network.cs
+# TestIPv6.cs
+# TestIPv6Network.cs
+#
+-->
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
+
+
diff --git a/base/Libraries/System.Net.IP/TestIPv4.cs b/base/Libraries/System.Net.IP/TestIPv4.cs
new file mode 100644
index 0000000..c60162d
--- /dev/null
+++ b/base/Libraries/System.Net.IP/TestIPv4.cs
@@ -0,0 +1,353 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TestIPv4.cs
+//
+
+using System;
+
+#if !SINGULARITY
+using System.Net;
+#endif // !SINGULARITY
+
+namespace System.Net.IP
+{
+    internal class TestFailedException : Exception
+    {
+        internal TestFailedException(string msg)
+            : base(String.Format("TestFailedException \"{0}\"", msg))
+        {
+        }
+    }
+
+    public class TestIPv4
+    {
+        private static void TestBasics()
+        {
+            IPv4 a = new IPv4(0x1a2b3c4d);
+            IPv4 b = IPv4.Parse("0x1a.0x2b.0x3c.0x4d");
+            byte [] ipv4Bytes = new byte [4] { 0x1a, 0x2b, 0x3c, 0x4d };
+            IPv4 c = IPv4.ParseBytes(ipv4Bytes);
+
+            if ((uint)a != 0x1a2b3c4d)
+                throw new TestFailedException("a");
+
+            if ((uint)b != 0x1a2b3c4d)
+                throw new TestFailedException("b");
+
+            if ((uint)c != 0x1a2b3c4d)
+                throw new TestFailedException("c");
+
+            if (a.Equals(b) == false)
+                throw new TestFailedException("a Equals b");
+
+            if ((a == c) == false || (a != c))
+                throw new TestFailedException("a c == !=");
+
+            for (int i = 0; i < ipv4Bytes.Length; i++)
+            {
+                if (ipv4Bytes[i] != c.GetAddressBytes()[i])
+                    throw new TestFailedException("GetAddressBytes");
+            }
+
+            byte [] ipAddrBytes = ((IPAddress)c).GetAddressBytes();
+            for (int i = 0; i < ipv4Bytes.Length; i++)
+            {
+                if (ipv4Bytes[i] != ipAddrBytes[i])
+                    throw new TestFailedException("IPAddress");
+            }
+
+            IPAddress ipa = IPAddress.Parse(c.ToString());
+            if (new IPv4(ipa) != c)
+            {
+                throw new TestFailedException("IPv4(IPAddress) Constructor");
+            }
+        }
+
+        private static void TestCompare()
+        {
+            IPv4 a = new IPv4(0x0a000001);
+            IPv4 b = new IPv4(0x0a000000);
+
+            if ((a == a) == false)
+            {
+                throw new TestFailedException("a == a");
+            }
+
+            if ((a != b) == false)
+            {
+                throw new TestFailedException("a == b");
+            }
+
+            if ((a > b) == false)
+            {
+                throw new TestFailedException("a > b");
+            }
+
+            if ((a >= b) == false)
+            {
+                throw new TestFailedException("a >= b");
+            }
+
+            if ((a >= a) == false)
+            {
+                throw new TestFailedException("a >= a");
+            }
+
+            if ((a > a) == true)
+            {
+                throw new TestFailedException("a > a");
+            }
+
+            if ((a < b) == true)
+            {
+                throw new TestFailedException("a < b");
+            }
+
+            if ((a <= b) == true)
+            {
+                throw new TestFailedException("a <= b");
+            }
+
+            if ((a <= a) != true)
+            {
+                throw new TestFailedException("a <= a");
+            }
+
+            if ((a < a) == true)
+            {
+                throw new TestFailedException("a < a");
+            }
+        }
+
+        private static void TestRoll()
+        {
+            IPv4 a = new IPv4(0x80808080);
+
+            if ((uint)(a << 1) != 0x01010100)
+            {
+                throw new TestFailedException("<< 1");
+            }
+
+            if ((uint)(a << 2) != 0x02020200)
+            {
+                throw new TestFailedException("<< 2");
+            }
+
+            if ((uint)(a << 32) != 0)
+            {
+                throw new TestFailedException("<< 32");
+            }
+
+            if ((uint)(a >> 1) != 0x40404040)
+            {
+                throw new TestFailedException(">> 1");
+            }
+
+            if ((uint)(a >> 2) != 0x20202020)
+            {
+                throw new TestFailedException(">> 2");
+            }
+
+            if ((uint)(a >> 32) != 0)
+            {
+                throw new TestFailedException(">> 32");
+            }
+        }
+
+        private static void TestBits()
+        {
+            IPv4 a = new IPv4(0x7f7f7f7f);
+            IPv4 b = new IPv4(0xc1c1c1c1);
+
+            if ((uint)(a | b) != ~0U)
+            {
+                throw new TestFailedException("OR");
+            }
+
+            if ((uint)(a & b) != 0x41414141)
+            {
+                throw new TestFailedException("AND");
+            }
+
+            if ((uint)(a ^ b) != 0xbebebebe)
+            {
+                throw new TestFailedException("XOR");
+            }
+
+            if ((uint)(~a) != 0x80808080)
+            {
+                throw new TestFailedException("NOT");
+            }
+
+            if ((uint)IPv4.NetMask(0) != 0)
+            {
+                throw new TestFailedException("NetMask(0)");
+            }
+
+            if ((uint)IPv4.NetMask(17) != 0xffff8000)
+            {
+                throw new TestFailedException("NetMask(17)");
+            }
+
+            if ((uint)IPv4.NetMask(32) != 0xffffffffu)
+            {
+                throw new TestFailedException("NetMask(32)");
+            }
+
+            try
+            {
+                IPv4 n = IPv4.NetMask(66);
+                throw new TestFailedException("Bad Netmask +");
+            }
+            catch (ArgumentException)
+            {
+            }
+            try
+            {
+                IPv4 n = IPv4.NetMask(-1);
+                throw new TestFailedException("Bad Netmask -");
+            }
+            catch (ArgumentException)
+            {
+            }
+        }
+
+        private static void TestParseOne(string ipString,
+                                         IPv4 expectedIP,
+                                         bool expectedSuccess)
+        {
+            bool success = false;
+            IPv4 testIP  = IPv4.Zero;
+
+            try
+            {
+                testIP = IPv4.Parse(ipString);
+                success = (testIP == expectedIP);
+            }
+            catch (FormatException)
+            {
+            }
+            if (success != expectedSuccess)
+            {
+                throw new TestFailedException(ipString);
+            }
+
+            IPv4 dup = IPv4.Parse(testIP.ToString());
+            if (testIP != dup)
+            {
+                throw new TestFailedException(
+                    String.Format("ToString {0}", testIP)
+                    );
+            }
+        }
+
+        private static void TestParse()
+        {
+            // Decimal Quads
+            TestParseOne("1000.0.0.1",  IPv4.Zero, false);
+            TestParseOne("0.1000.0.1",  IPv4.Zero, false);
+            TestParseOne("0.0.1000.1",   IPv4.Zero, false);
+            TestParseOne("0.0.00.1000", IPv4.Zero, false);
+            TestParseOne("0.0.trailing.junk", IPv4.Zero, false);
+            TestParseOne("100.0.0.1", new IPv4(0x64000001), true);
+            TestParseOne("0.100.0.1", new IPv4(0x00640001), true);
+            TestParseOne("0.0.100.1", new IPv4(0x00006401), true);
+            TestParseOne("0.0.0.100", new IPv4(0x00000064), true);
+            TestParseOne("1", new IPv4(0x00000001), true);
+            TestParseOne("1.1", new IPv4(0x01000001), true);
+            TestParseOne("1.1.1", new IPv4(0x01010001), true);
+            TestParseOne("1.1.1.1", new IPv4(0x01010101), true);
+
+            // Hex Quads
+            TestParseOne("0xfff.0x0.0x0.0x1", IPv4.Zero, false);
+            TestParseOne("0x0.0xg0.0x0.0x1", IPv4.Zero, false);
+            TestParseOne("0x0.0.0x1000.1", IPv4.Zero, false);
+            TestParseOne("0x0.0x0.0x0.0x1000", IPv4.Zero, false);
+            TestParseOne("0x0.0x0.0xtrailing.0xjunk", IPv4.Zero, false);
+            TestParseOne("0xaA.0xbB.0xcC.0xdD", new IPv4(0xaabbccdd), true);
+            TestParseOne("0xeE.0xfF.0x01.0x02", new IPv4(0xeeff0102), true);
+            TestParseOne("0x1", new IPv4(0x00000001), true);
+            TestParseOne("0x1.0x1", new IPv4(0x01000001), true);
+            TestParseOne("0x1.0x1.0x1", new IPv4(0x01010001), true);
+            TestParseOne("0x1.0x1.0x1.0x1", new IPv4(0x01010101), true);
+
+            // Octal Quads
+            TestParseOne("0378.00.00.00", IPv4.Zero, false);
+            TestParseOne("0477.00.00.00", IPv4.Zero, false);
+            TestParseOne("0378.00.00.00", IPv4.Zero, false);
+            TestParseOne("0477.00.00.00", IPv4.Zero, false);
+            TestParseOne("01.02.0trailing.0junk", IPv4.Zero, false);
+
+            TestParseOne("0377.0376.0375.0374", new IPv4(0xfffefdfc), true);
+            TestParseOne("01", new IPv4(0x00000001), true);
+            TestParseOne("01.01", new IPv4(0x01000001), true);
+            TestParseOne("01.01.01", new IPv4(0x01010001), true);
+            TestParseOne("01.01.01.01", new IPv4(0x01010101), true);
+        }
+
+        private static void TestMath()
+        {
+            IPv4 a = new IPv4(0x0a000001);
+
+            if ((uint)++a != 0x0a000002)
+                throw new TestFailedException("Increment");
+
+            if ((uint)--a != 0x0a000001)
+                throw new TestFailedException("Decrement 1");
+
+            if ((uint)--a != 0x0a000000)
+                throw new TestFailedException("Decrement 2");
+
+            if ((uint)--a != 0x09ffffff)
+                throw new TestFailedException("Decrement 3");
+        }
+
+        public static void TestCount()
+        {
+            for (int i = IPv4.BitCount; i >= 0; i--)
+            {
+                IPv4 addr = IPv4.NetMask(i);
+                if (IPv4.GetMaskLength(addr) != i)
+                {
+                    throw new TestFailedException(
+                        String.Format("TestCount {0}", i)
+                        );
+                }
+
+                IPv4 addrDup = IPv4.Parse(addr.ToString());
+                if (addrDup != addr)
+                {
+                    throw new TestFailedException(
+                        String.Format("TestCountDup {0}", i)
+                        );
+                }
+            }
+        }
+
+        public static int Main()
+        {
+            try
+            {
+                TestBasics();
+                TestCompare();
+                TestRoll();
+                TestBits();
+                TestParse();
+                TestMath();
+                TestCount();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("FAILED\nException {0}\nStack:\n{1}",
+                                  e.Message, e.StackTrace);
+                return 1;
+            }
+            Console.WriteLine("Passed.");
+            return 0;
+        }
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/TestIPv4Network.cs b/base/Libraries/System.Net.IP/TestIPv4Network.cs
new file mode 100644
index 0000000..8c8ca80
--- /dev/null
+++ b/base/Libraries/System.Net.IP/TestIPv4Network.cs
@@ -0,0 +1,183 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TestIPv4Network.cs
+//
+
+using System;
+
+#if !SINGULARITY
+using System.Net;
+#endif // !SINGULARITY
+
+namespace System.Net.IP
+{
+    internal class TestFailedException : Exception
+    {
+        internal TestFailedException(string msg)
+            : base(String.Format("TestFailedException \"{0}\"", msg))
+        {
+        }
+    }
+
+    public class TestIPv4Network
+    {
+        private static void TestBasics()
+        {
+            IPv4 address = IPv4.Parse("192.168.0.100");
+            IPv4 mask    = IPv4.Parse("255.255.255.254");
+            int  masklen = 31;
+
+            if (new IPv4Network(address, masklen) !=
+                new IPv4Network(address, mask))
+            {
+                throw new TestFailedException("Constructors");
+            }
+
+            if (IPv4Network.Parse("10.0.0.0/24") !=
+                new IPv4Network(new IPv4(0x0a000000), 24))
+            {
+                throw new TestFailedException("10/24");
+            }
+
+            if (IPv4Network.Parse("10.0.0.0/32") !=
+                new IPv4Network(new IPv4(0x0a000000), 32))
+            {
+                throw new TestFailedException("10/32");
+            }
+
+            if (IPv4Network.Parse("10.0.0.0/1") !=
+                new IPv4Network(new IPv4(0x0a000000), 1))
+            {
+                throw new TestFailedException("10/1");
+            }
+
+            try
+            {
+                IPv4Network.Parse("10.0.0.1//2");
+                throw new TestFailedException("double slash");
+            }
+            catch (FormatException)
+            {
+            }
+
+            try
+            {
+                IPv4Network.Parse("10.0.0.0/33");
+                throw new TestFailedException("netmask length");
+            }
+            catch (ArgumentException)
+            {
+            }
+
+            try
+            {
+                IPv4Network.Parse("10.0.0.0/xx");
+                throw new TestFailedException("netmask content");
+            }
+            catch (FormatException)
+            {
+            }
+
+            try
+            {
+                IPv4Network.Parse("10.x.0.0/10");
+                throw new TestFailedException("network content");
+            }
+            catch (FormatException)
+            {
+            }
+
+            try
+            {
+                IPv4Network.Parse("10.0.0.0/3333333333333333333333333333");
+                throw new TestFailedException("netmask overflow");
+            }
+            catch (OverflowException)
+            {
+            }
+        }
+
+        public static void TestCompare()
+        {
+            IPv4 address = IPv4.Parse("10.1.1.0");
+            IPv4Network outer = new IPv4Network(address, 24);
+            IPv4Network inner = new IPv4Network(address, 26);
+
+            if (outer.Contains(outer) == false)
+            {
+                throw new TestFailedException("outer.Contains(outer)");
+            }
+
+            if (outer.Contains(inner) == false)
+            {
+                throw new TestFailedException("outer.Contains(inner)");
+            }
+
+            if (inner.Contains(outer) == true)
+            {
+                throw new TestFailedException("inner.Contains(outer)");
+            }
+
+            if (outer.Contains(address) == false)
+            {
+                throw new TestFailedException("outer.Contains(address)");
+            }
+
+            if (inner.Contains(address) == false)
+            {
+                throw new TestFailedException("inner.Contains(address)");
+            }
+
+            if (outer.IsMoreSpecificThan(inner) == true)
+            {
+                throw new TestFailedException("outer.IsMoreSpecificThan(inner)");
+            }
+
+            if (outer.IsLessSpecificThan(inner) == false)
+            {
+                throw new TestFailedException("outer.IsLessSpecificThan(inner)");
+            }
+
+            if ((outer == outer) == false)
+            {
+                throw new TestFailedException("operator==");
+            }
+
+            if ((outer != inner) == false)
+            {
+                throw new TestFailedException("operator!=");
+            }
+
+            if (outer.Contains(outer.UpperBound) == false)
+            {
+                throw new TestFailedException("outer.Contains(outer.UpperBound)");
+            }
+
+            if (outer.Contains(outer.LowerBound) == false)
+            {
+                throw new TestFailedException("outer.Contains(outer.LowerBound)");
+            }
+        }
+
+        public static int Main()
+        {
+            try
+            {
+                TestBasics();
+                TestCompare();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("FAILED\nException {0}\nStack:\n{1}",
+                                  e.Message, e.StackTrace);
+                return 1;
+            }
+            Console.WriteLine("Passed.");
+            return 0;
+        }
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/TestIPv6.cs b/base/Libraries/System.Net.IP/TestIPv6.cs
new file mode 100644
index 0000000..2c6140b
--- /dev/null
+++ b/base/Libraries/System.Net.IP/TestIPv6.cs
@@ -0,0 +1,442 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TestIPv6.cs
+//
+
+using System;
+
+#if !SINGULARITY
+using System.Net;
+#endif // !SINGULARITY
+
+namespace System.Net.IP
+{
+    internal class TestFailedException : Exception
+    {
+        internal TestFailedException(string msg)
+            : base(String.Format("TestFailedException \"{0}\"", msg))
+        {
+        }
+    }
+
+    public class TestIPv6
+    {
+        private static void TestBasics()
+        {
+            // Create an IPv6 address from a set of uints
+            IPv6 a = new IPv6(0xf0e1d2c3, 0xb4a59687, 0x78695a4b, 0x3c2d1e0f);
+
+            // Then check it against equivalent array of Bytes
+            byte[] xBytes = { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
+                              0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f };
+            byte[] aBytes = a.GetAddressBytes();
+            if (aBytes.Length != 16)
+                throw new TestFailedException("GetAddressBytes Length");
+
+            for (int i = 0; i < aBytes.Length; i++)
+            {
+                if (aBytes[i] != xBytes[i])
+                    throw new TestFailedException("GetAddressBytes Values");
+            }
+
+            // Instantiate from array of bytes and then check
+            a = IPv6.ParseBytes(xBytes);
+            aBytes = a.GetAddressBytes();
+
+            if (aBytes.Length != 16)
+                throw new TestFailedException("GetAddressBytes Length");
+
+            for (int i = 0; i < aBytes.Length; i++)
+            {
+                if (aBytes[i] != xBytes[i])
+                    throw new TestFailedException("GetAddressBytes Values");
+            }
+
+            // Test System.Net.IPAddress Constructor
+            IPAddress ipa = new IPAddress(aBytes);
+            if (new IPv6(ipa) != a)
+            {
+                throw new TestFailedException("IPv6(IPAddress) Constructor");
+            }
+
+            // Test basic string parsing
+            a = IPv6.Parse("f0e1:d2c3:b4a5:9687:7869:5a4b:3c2d:1e0f");
+            aBytes = a.GetAddressBytes();
+
+            if (aBytes.Length != 16)
+                throw new TestFailedException("GetAddressBytes Length");
+
+            for (int i = 0; i < aBytes.Length; i++)
+            {
+                if (aBytes[i] != xBytes[i])
+                    throw new TestFailedException("GetAddressBytes Values");
+            }
+        }
+
+        private static void TestCompare()
+        {
+            IPv6 a = new IPv6(0x11111111, 0x22222222, 0x33333333, 0x44444444);
+            IPv6 b = new IPv6(0x11111111, 0x22222222, 0x33333333, 0x44444443);
+
+            if ((a == a) == false)
+            {
+                throw new TestFailedException("a == a");
+            }
+
+            if ((a != b) == false)
+            {
+                throw new TestFailedException("a == b");
+            }
+
+            if ((a > b) == false)
+            {
+                throw new TestFailedException("a > b");
+            }
+
+            if ((a >= b) == false)
+            {
+                throw new TestFailedException("a >= b");
+            }
+
+            if ((a >= a) == false)
+            {
+                throw new TestFailedException("a >= a");
+            }
+
+            if ((a > a) == true)
+            {
+                throw new TestFailedException("a > a");
+            }
+
+            if ((a < b) == true)
+            {
+                throw new TestFailedException("a < b");
+            }
+
+            if ((a <= b) == true)
+            {
+                throw new TestFailedException("a <= b");
+            }
+
+            if ((a <= a) != true)
+            {
+                throw new TestFailedException("a <= a");
+            }
+
+            if ((a < a) == true)
+            {
+                throw new TestFailedException("a < a");
+            }
+        }
+
+        private static void TestRoll()
+        {
+            IPv6 a = new IPv6(0x01234567, 0x89abcdef, 0x02461357, 0x8ace9bdf);
+
+            if ((a << 4) !=
+                new IPv6(0x12345678, 0x9abcdef0, 0x24613578, 0xace9bdf0))
+            {
+                throw new TestFailedException("a << 4");
+            }
+
+            if ((a << 36) != new IPv6(0x9abcdef0, 0x24613578, 0xace9bdf0, 0))
+            {
+                throw new TestFailedException("a << 36");
+            }
+
+            if ((a << 68) != new IPv6(0x24613578, 0xace9bdf0, 0, 0))
+            {
+                throw new TestFailedException("a << 68");
+            }
+
+            if ((a << 100) != new IPv6(0xace9bdf0, 0, 0, 0))
+            {
+                throw new TestFailedException("a << 100");
+            }
+
+            if ((a << 128) != new IPv6(0, 0, 0, 0))
+            {
+                throw new TestFailedException("a << 128");
+            }
+
+            if ((a >> 4) !=
+                new IPv6(0x00123456, 0x789abcde, 0xf0246135, 0x78ace9bd))
+            {
+                throw new TestFailedException("a >> 4");
+            }
+
+            if ((a >> 36) != new IPv6(0, 0x00123456, 0x789abcde, 0xf0246135))
+            {
+                throw new TestFailedException("a >> 36");
+            }
+
+            if ((a >> 68) != new IPv6(0, 0, 0x00123456, 0x789abcde))
+            {
+                throw new TestFailedException("a >> 68");
+            }
+
+            if ((a >> 100) != new IPv6(0, 0, 0, 0x00123456))
+            {
+                throw new TestFailedException("a >> 100");
+            }
+
+            if ((a >> 128) != new IPv6(0, 0, 0, 0))
+            {
+                throw new TestFailedException("a >> 128");
+            }
+        }
+
+        private static void TestBits()
+        {
+            IPv6 a = new IPv6(0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f);
+            IPv6 b = new IPv6(0xc1c1c1c1, 0xc1c1c1c1, 0xc1c1c1c1, 0xc1c1c1c1);
+            IPv6 goal;
+
+            goal = new IPv6(~0U, ~0U, ~0U, ~0U);
+            if ((a | b) != goal)
+            {
+                throw new TestFailedException("OR");
+            }
+
+            goal = new IPv6(0x41414141, 0x41414141, 0x41414141, 0x41414141);
+            if ((a & b) != goal)
+            {
+                throw new TestFailedException("AND");
+            }
+
+            goal = new IPv6(0xbebebebe, 0xbebebebe, 0xbebebebe, 0xbebebebe);
+            if ((a ^ b) != goal)
+            {
+                throw new TestFailedException("XOR");
+            }
+
+            goal = new IPv6(0x80808080, 0x80808080, 0x80808080, 0x80808080);
+            if (~a != goal)
+            {
+                throw new TestFailedException("NOT");
+            }
+
+            // Test netmask
+            for (int i = 0; i < 128; i++)
+            {
+                IPv6 mask = IPv6.NetMask(i);
+                goal = IPv6.AllOnes << (128 - i);
+                if (mask != goal)
+                {
+                    Console.WriteLine("{0} {1} {2}", i, mask, goal);
+                    throw new TestFailedException("NetMask");
+                }
+
+                goal = ~(IPv6.AllOnes >> i);
+                if (mask != goal)
+                {
+                    Console.WriteLine("{0} {1} {2}", i, mask, goal);
+                    throw new TestFailedException("NetMask2");
+                }
+            }
+
+            try
+            {
+                IPv6 n = IPv6.NetMask(129);
+                throw new TestFailedException("Bad Netmask +");
+            }
+            catch (ArgumentException)
+            {
+            }
+
+            try
+            {
+                IPv6 n = IPv6.NetMask(-1);
+                throw new TestFailedException("Bad Netmask -");
+            }
+            catch (ArgumentException)
+            {
+            }
+        }
+
+        private struct SrepV6Pair
+        {
+            public string srep;
+            public IPv6   v6rep;
+
+            public SrepV6Pair(string s, IPv6 a)
+            {
+                srep = s;
+                v6rep = a;
+            }
+        };
+
+        private static void TestParse()
+        {
+            //
+            // grumble, grumble, no clean struct array initializer syntax !?!
+            //
+            // Okay, these are pairs of Valid IPv6 string representations
+            // and their manually parsed IPv6 representations.
+            //
+            SrepV6Pair [] pairs = new SrepV6Pair[] {
+                new SrepV6Pair (
+                    "FfEe:DdCc:BbAa:9876:5432:1001:2345:6789",
+                    new IPv6(0xffeeddcc, 0xbbaa9876, 0x54321001, 0x23456789)
+                    ),
+                new SrepV6Pair (
+                    "ffe8:c181::192:101",
+                    new IPv6(0xffe8c181U, 0x0U, 0x0U, 0x01920101U)
+                    ),
+                new SrepV6Pair (
+                    "::",
+                    IPv6.Zero
+                    ),
+                new SrepV6Pair (
+                    "0:0:0:0:0:0:0:0",
+                    IPv6.Zero
+                    ),
+                new SrepV6Pair (
+                    "1::",
+                    new IPv6(0x00010000U, 0x0U, 0x0U, 0x0U)
+                    ),
+                new SrepV6Pair (
+                    "12::",
+                    new IPv6(0x00120000U, 0x0U, 0x0U, 0x0U)
+                    ),
+                new SrepV6Pair (
+                    "123::",
+                    new IPv6(0x01230000U, 0x0U, 0x0U, 0x0U)
+                    ),
+                new SrepV6Pair (
+                    "1234::",
+                    new IPv6(0x12340000U, 0x0U, 0x0U, 0x0U)
+                    ),
+                new SrepV6Pair (
+                    "1234:5678:9abc:def0::",
+                    new IPv6(0x12345678U, 0x9abcdef0U, 0x0U, 0x0U)
+                    ),
+                new SrepV6Pair (
+                    "::1",
+                    new IPv6(0x0U, 0x0U, 0x0U, 0x1U)
+                    ),
+                new SrepV6Pair (
+                    "::12",
+                    new IPv6(0x0U, 0x0U, 0x0U, 0x12U)
+                    ),
+                new SrepV6Pair (
+                    "::123",
+                    new IPv6(0x0U, 0x0U, 0x0U, 0x123U)
+                    ),
+                new SrepV6Pair (
+                    "::1234",
+                    new IPv6(0x0U, 0x0U, 0x0U, 0x1234U)
+                    ),
+                new SrepV6Pair (
+                    "::1234:5678:9abc:def0",
+                    new IPv6(0x0U, 0x0U, 0x12345678U, 0x9abcdef0U)
+                    ),
+            };
+
+            for (int i = 0; i < pairs.Length; i++)
+            {
+                IPv6 a = IPv6.Parse(pairs[i].srep);
+                if (a != pairs[i].v6rep)
+                {
+                    Console.WriteLine("{0} {1}", a, pairs[i].v6rep);
+                    throw new TestFailedException(
+                        String.Format("Parse {0}", i)
+                        );
+                }
+
+                IPv6 dup = IPv6.Parse(a.ToString());
+                if (dup != a)
+                {
+                    throw new TestFailedException(
+                        String.Format("ToString {0}", i)
+                        );
+                }
+            }
+
+            //
+            // Test bogus strings
+            //
+            string [] badSreps = new string [] {
+                "Frank",
+                "00000::",
+                "0:1:2:3:4:5:6:7:8",
+                "0.1.2.3.4::0.1.2.3.4.",
+                "0:1:2:3:4:5:6:7:trailing junk",
+            };
+
+            for (int i = 0; i < badSreps.Length; i++)
+            {
+                try
+                {
+                    IPv6 bad = IPv6.Parse(badSreps[i]);
+                    throw new TestFailedException(badSreps[i]);
+                }
+                catch (FormatException)
+                {
+                }
+            }
+        }
+
+        private static void TestMath()
+        {
+            IPv6 a = IPv6.Zero;
+
+            if (--a != IPv6.AllOnes)
+            {
+                throw new TestFailedException("--");
+            }
+            if (++a != IPv6.Zero)
+            {
+                throw new TestFailedException("++");
+            }
+        }
+
+        public static void TestCount()
+        {
+            for (int i = 0; i < IPv6.BitCount; i++)
+            {
+                IPv6 addr = IPv6.NetMask(i);
+                if (IPv6.GetMaskLength(addr) != i)
+                {
+                    throw new TestFailedException(
+                        String.Format("TestCount {0}", i)
+                        );
+                }
+
+                IPv6 addrDup = IPv6.Parse(addr.ToString());
+                if (addrDup != addr)
+                {
+                    throw new TestFailedException(
+                        String.Format("TestCountDup {0}", i)
+                        );
+                }
+            }
+        }
+
+        public static int Main()
+        {
+            try
+            {
+                TestBasics();
+                TestCompare();
+                TestRoll();
+                TestBits();
+                TestParse();
+                TestMath();
+                TestCount();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("FAILED\nException {0}\nStack:\n{1}",
+                                  e.Message, e.StackTrace);
+                return 1;
+            }
+            Console.WriteLine("Passed.");
+            return 0;
+        }
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net.IP/TestIPv6Network.cs b/base/Libraries/System.Net.IP/TestIPv6Network.cs
new file mode 100644
index 0000000..f5fd8a6
--- /dev/null
+++ b/base/Libraries/System.Net.IP/TestIPv6Network.cs
@@ -0,0 +1,185 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TestIPv6Network.cs
+//
+
+using System;
+
+#if !SINGULARITY
+using System.Net;
+#endif // !SINGULARITY
+
+namespace System.Net.IP
+{
+    internal class TestFailedException : Exception
+    {
+        internal TestFailedException(string msg)
+            : base(String.Format("TestFailedException \"{0}\"", msg))
+        {
+        }
+    }
+
+    public class TestIPv6Network
+    {
+        private static void TestBasics()
+        {
+            IPv6 address = IPv6.Parse("ab1e:d00d::1057:d05");
+            IPv6 mask    = IPv6.Parse("ffff:fffe::");
+            int  masklen = 31;
+
+            if (new IPv6Network(address, masklen) !=
+                new IPv6Network(address, mask))
+            {
+                throw new TestFailedException("Constructors");
+            }
+
+            if (IPv6Network.Parse("10::/24") !=
+                new IPv6Network(new IPv6(0x00100000, 0x0, 0x0, 0x0), 24))
+            {
+                Console.WriteLine(IPv6Network.Parse("10::/24"));
+                Console.WriteLine(new IPv6Network(new IPv6(0x00100000, 0x0, 0x0, 0x0), 24));
+                throw new TestFailedException("10::/24");
+            }
+
+            if (IPv6Network.Parse("10::/32") !=
+                new IPv6Network(new IPv6(0x00100000, 0x0, 0x0, 0x0), 32))
+            {
+                throw new TestFailedException("10::/32");
+            }
+
+            if (IPv6Network.Parse("10::/1") !=
+                new IPv6Network(new IPv6(0x00100000,0x0, 0x0, 0x0), 1))
+            {
+                throw new TestFailedException("10::/1");
+            }
+
+            try
+            {
+                IPv6Network.Parse("10:://12");
+                throw new TestFailedException("double slash");
+            }
+            catch (FormatException)
+            {
+            }
+
+            try
+            {
+                IPv6Network.Parse("10::/129");
+                throw new TestFailedException("netmask length");
+            }
+            catch (ArgumentException)
+            {
+            }
+
+            try
+            {
+                IPv6Network.Parse("10::/xx");
+                throw new TestFailedException("netmask content");
+            }
+            catch (FormatException)
+            {
+            }
+
+            try
+            {
+                IPv6Network.Parse("10::x/10");
+                throw new TestFailedException("network content");
+            }
+            catch (FormatException)
+            {
+            }
+
+            try
+            {
+                IPv6Network.Parse("10::/3333333333333333333333333333");
+                throw new TestFailedException("netmask overflow");
+            }
+            catch (OverflowException)
+            {
+            }
+        }
+
+        public static void TestCompare()
+        {
+            IPv6 address = IPv6.Parse("dead:beef:cafe:babe:5ca1:ab1e:b01d:face");
+            IPv6Network outer = new IPv6Network(address, 124);
+            IPv6Network inner = new IPv6Network(address, 126);
+
+            if (outer.Contains(outer) == false)
+            {
+                throw new TestFailedException("outer.Contains(outer)");
+            }
+
+            if (outer.Contains(inner) == false)
+            {
+                throw new TestFailedException("outer.Contains(inner)");
+            }
+
+            if (inner.Contains(outer) == true)
+            {
+                throw new TestFailedException("inner.Contains(outer)");
+            }
+
+            if (outer.Contains(address) == false)
+            {
+                throw new TestFailedException("outer.Contains(address)");
+            }
+
+            if (inner.Contains(address) == false)
+            {
+                throw new TestFailedException("inner.Contains(address)");
+            }
+
+            if (outer.IsMoreSpecificThan(inner) == true)
+            {
+                throw new TestFailedException("outer.IsMoreSpecificThan(inner)");
+            }
+
+            if (outer.IsLessSpecificThan(inner) == false)
+            {
+                throw new TestFailedException("outer.IsLessSpecificThan(inner)");
+            }
+
+            if ((outer == outer) == false)
+            {
+                throw new TestFailedException("operator==");
+            }
+
+            if ((outer != inner) == false)
+            {
+                throw new TestFailedException("operator!=");
+            }
+
+            if (outer.Contains(outer.UpperBound) == false)
+            {
+                throw new TestFailedException("outer.Contains(outer.UpperBound)");
+            }
+
+            if (outer.Contains(outer.LowerBound) == false)
+            {
+                throw new TestFailedException("outer.Contains(outer.LowerBound)");
+            }
+        }
+
+        public static int Main()
+        {
+            try
+            {
+                TestBasics();
+                TestCompare();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("FAILED\nException {0}\nStack:\n{1}",
+                                  e.Message, e.StackTrace);
+                return 1;
+            }
+            Console.WriteLine("Passed.");
+            return 0;
+        }
+    }
+} // namespace System.Net.IP
diff --git a/base/Libraries/System.Net/Dns.cs b/base/Libraries/System.Net/Dns.cs
new file mode 100644
index 0000000..f58efee
--- /dev/null
+++ b/base/Libraries/System.Net/Dns.cs
@@ -0,0 +1,357 @@
+ ////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Dns.cs
+//
+//  Notes:
+//  Ported from the Coriolis code base by maiken, with extensive changes to use
+//  the channel interface to our NetStack instead of native calls.
+//
+
+namespace System.Net {
+    using System.Collections;
+    using System.Text;
+    using System.Net.Sockets;
+    using System.Threading;
+    using System.Net.IP;
+
+    using NetStack.Contracts;
+    using NetStack.Channels.Public;
+    using Microsoft.SingSharp;
+    using Microsoft.Singularity;
+    using Microsoft.Singularity.Channels;
+    using Microsoft.Singularity.Directory;
+
+    public sealed class Dns {
+        // This is the slot we use to store the per-thread channel to the NetStack
+        private static LocalDataStoreSlot DnsSlot = null;
+        private static LocalDataStoreSlot IPSlot = null;
+        private static object DnsSlotLock = new object(); // Used for initialization
+        private static object IPSlotLock = new object(); // ditto
+
+        //
+        // Constructor is private to prevent instantiation
+        //
+        private Dns() {
+            // Shouldn't ever be called
+        }
+
+        // All threads share a LocalDataStoreSlot object that identifies a thread-local
+        // data "slot" that each thread can use. This object must be created in a thread-
+        // safe way the first time it becomes necessary. See Thread.AllocateDataSlot().
+        internal static LocalDataStoreSlot SafeSlotFetchOrInitialize(ref LocalDataStoreSlot slot,
+                                                                     object slotLock)
+        {
+            // This initialization sequence is meant to be thread-safe
+            if (slot == null)
+            {
+                lock (slotLock)
+                {
+                    if (slot == null)
+                    {
+                        slot = Thread.AllocateDataSlot();
+                    }
+                }
+            }
+
+            return slot;
+        }
+
+        // Must be balanced with a call to ReleaseDnsConnection()!
+        internal static DNSContract.Imp! GetDnsConnection()
+        {
+            LocalDataStoreSlot slot = SafeSlotFetchOrInitialize(ref DnsSlot, DnsSlotLock);
+
+            if (Thread.GetData(slot) == null)
+            {
+                // We haven't created a channel for this thread yet. Create one.
+                DNSContract.Imp! dnsImp;
+                DNSContract.Exp! dnsExp;
+                DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+                DNSContract.NewChannel(out dnsImp, out dnsExp);
+
+                try
+                {
+                    epNS.SendBind(Bitter.FromString2(DNSContract.ModuleName), dnsExp);
+
+                    switch receive
+                    {
+                        case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                            if (rejectedEP != null) {
+                                delete rejectedEP;
+                            }
+                            delete dnsImp;
+                            // Do nothing; we will return null below.
+                            break;
+
+                        case epNS.AckBind() :
+                            // Success; put our remaining end of the channel
+                            // into thread-local storage.
+                            dnsImp.RecvReady();
+                            TRef<DNSContract.Imp:ReadyState> dnsConnHolder = new TRef<DNSContract.Imp:ReadyState>(dnsImp);
+                            Thread.SetData(slot, dnsConnHolder);
+                            break;
+                    }
+                }
+                finally
+                {
+                    delete epNS;
+                }
+            }
+
+            // By now there should definitely be a channel in our thread-local storage.
+            TRef<DNSContract.Imp:ReadyState>! connHolder = (TRef<DNSContract.Imp:ReadyState>!)Thread.GetData(slot);
+            return connHolder.Acquire();
+        }
+
+        internal static void ReleaseDnsConnection([Claims] DNSContract.Imp:ReadyState! connection)
+        {
+            // Put the channel back into thread-local storage.
+            TRef<DNSContract.Imp:ReadyState>! dnsConnHolder = (TRef<DNSContract.Imp:ReadyState>!)Thread.GetData(DnsSlot);
+            dnsConnHolder.Release(connection);
+        }
+
+       // Must be balanced with a call to ReleaseIPConnection()!
+        internal static IPContract.Imp! GetIPConnection()
+        {
+            LocalDataStoreSlot slot = SafeSlotFetchOrInitialize(ref IPSlot, IPSlotLock);
+
+            if (Thread.GetData(slot) == null)
+            {
+                IPContract.Imp! ipImp;
+                IPContract.Exp! ipExp;
+                DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+                IPContract.NewChannel(out ipImp, out ipExp);
+
+                try
+                {
+                    epNS.SendBind(Bitter.FromString2(IPContract.ModuleName), ipExp);
+
+                    switch receive
+                    {
+                        case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                            // Do nothing; we will return null below.
+                            delete ipImp;
+                            if (rejectedEP != null) {
+                                delete rejectedEP;
+                            }
+                            break;
+
+                        case epNS.AckBind() :
+                            // Success; put our remaining end of the channel
+                            // into thread-local storage.
+                            ipImp.RecvReady();
+                            TRef<IPContract.Imp:ReadyState> ipConnHolder = new TRef<IPContract.Imp:ReadyState>(ipImp);
+                            Thread.SetData(slot, ipConnHolder);
+                            break;
+                    }
+                }
+                finally
+                {
+                    delete epNS;
+                }
+            }
+
+            TRef<IPContract.Imp:ReadyState>! connHolder = (TRef<IPContract.Imp:ReadyState>!)Thread.GetData(slot);
+            return connHolder.Acquire();
+        }
+
+        internal static void ReleaseIPConnection([Claims] IPContract.Imp:ReadyState! connection)
+        {
+            // Put the channel back into thread-local storage.
+            TRef<IPContract.Imp:ReadyState>! ipConnHolder = (TRef<IPContract.Imp:ReadyState>!)Thread.GetData(IPSlot);
+            ipConnHolder.Release(connection);
+        }
+
+        public static IPHostEntry GetHostByName(string hostName) {
+            if (hostName == null) {
+                throw new ArgumentNullException("hostName");
+            }
+
+            return InternalGetHostByName(hostName);
+        }
+
+        internal static IPHostEntry InternalGetHostByName(string hostName) {
+            return InternalResolve(hostName);
+        } // GetHostByName
+
+
+        public static IPAddress[] GetLocalHostAddresses() {
+
+            IPAddress[] retval;
+            IPContract.Imp ipConn = GetIPConnection();
+
+            try
+            {
+                char[][]! in ExHeap ifList;
+                ArrayList addresses = new ArrayList();
+
+                ipConn.SendGetInterfaces();
+                ipConn.RecvInterfaceList(out ifList);
+
+                try
+                {
+                    for (int i = 0; i < ifList.Length; ++i)
+                    {
+                        expose(ifList[i]) {
+                            ipConn.SendGetInterfaceState((!)ifList[i]);
+                            ifList[i] = null;
+
+                            switch receive
+                            {
+                              case ipConn.InterfaceNotFound() :
+                                  throw new SocketException(SocketErrors.SocketError);
+                                  break;
+
+                              case ipConn.InterfaceState(InterfaceInfo ifInfo) :
+                              {
+                                  // Copy out all of this interface's addresses
+                                  InterfaceIPInfo[] in ExHeap ipConfigs = ifInfo.ipConfigs;
+                                  if (ipConfigs != null) {
+                                      for (int j = 0; j < ipConfigs.Length; ++j)
+                                      {
+                                          addresses.Add(new IPAddress(ipConfigs[j].address));
+                                      }
+                                  }
+                                  ifInfo.Dispose();
+                              }
+                              break;
+                            }
+                        }
+                    }
+                }
+                finally
+                    {
+                    delete ifList; // This should hold only NULLs by now
+                }
+
+                return (IPAddress[])addresses.ToArray(typeof(IPAddress));
+            }
+            finally
+            {
+                ReleaseIPConnection(ipConn);
+            }
+
+        } // GetLocalHostAddresses
+
+
+        public static IPHostEntry GetHostByAddress(string address) {
+
+            if (address == null) {
+                throw new ArgumentNullException("address");
+            }
+
+            IPHostEntry ipHostEntry = InternalGetHostByAddress(IPAddress.Parse(address));
+            return ipHostEntry;
+        } // GetHostByAddress
+
+        public static IPHostEntry GetHostByAddress(IPAddress address) {
+
+            if (address == null) {
+                throw new ArgumentNullException("address");
+            }
+
+            IPHostEntry ipHostEntry = InternalGetHostByAddress(address);
+            return ipHostEntry;
+        } // GetHostByAddress
+
+        internal static IPHostEntry InternalGetHostByAddress(IPAddress! address)
+        {
+            // We only support IPv4 addresses under Singularity!
+            if ( address.AddressFamily != AddressFamily.InterNetwork ) {
+                //
+                // Protocol not supported
+                //
+                throw new SocketException(SocketErrors.WSAEPROTONOSUPPORT);
+            }
+
+            // Turn the address into a string and resolve it
+            return InternalResolve(address.ToString());
+            return null;
+
+        } // InternalGetHostByAddress
+
+        // host can be either a host's textual name, or the string of an address
+        internal static IPHostEntry! InternalResolve(string host)
+        {
+            DNSContract.Imp dnsConn = GetDnsConnection();
+
+            try
+            {
+                string[] aliases;
+                IPv4[] addrs;
+
+                if (DNSImpConnection.Resolve(dnsConn, host, out aliases, out addrs))
+                {
+                    assert aliases != null;
+                    assert addrs != null;
+                    return DNSInfoToIPHostEntry(aliases, addrs); }
+                else
+                { throw new SocketException(SocketErrors.WSAHOST_NOT_FOUND); }
+            }
+            finally
+            {
+                ReleaseDnsConnection(dnsConn);
+            }
+        } // InternalResolve
+
+        internal static IPHostEntry! DNSInfoToIPHostEntry(string[]! aliases, IPv4[]! addrs)
+        {
+            IPHostEntry retval = new IPHostEntry();
+
+            IPAddress[] addressList = new IPAddress[addrs.Length];
+            for (int i = 0; i < addrs.Length ; ++i)
+            { addressList[i] = new IPAddress(addrs[i]); }
+
+            string[] resultAliases = new string[aliases.Length - 1];
+            for (int i = 1; i < aliases.Length; ++i)
+            { resultAliases[i] = aliases[i]; }
+
+            retval.Aliases = resultAliases;
+            retval.AddressList = addressList;
+            retval.HostName = aliases[0];
+            return retval;
+        }
+
+        public static string GetHostName() {
+            IPContract.Imp ipConn = GetIPConnection();
+
+            try
+            {
+                char[]! in ExHeap hostName;
+                ipConn.SendGetHostName();
+                ipConn.RecvHostName(out hostName);
+                string strHostName = Bitter.ToString(hostName);
+                delete hostName;
+                return strHostName;
+            }
+            finally
+            {
+                ReleaseIPConnection(ipConn);
+            }
+        }
+
+
+        public static IPAddress[] ResolveToAddresses(string hostName) {
+            IPHostEntry entry  = Resolve(hostName);
+            return entry.AddressList;
+        }
+
+        //
+        // Note that in the case of multiple IP addresses, the address returned is
+        // chosen arbitrarily.
+        //
+        public static IPHostEntry! Resolve(string hostName) {
+            if (hostName == null) {
+                throw new ArgumentNullException("hostName");
+            }
+
+            return InternalResolve(hostName);
+        }
+    }
+}
diff --git a/base/Libraries/System.Net/EndPoint.cs b/base/Libraries/System.Net/EndPoint.cs
new file mode 100644
index 0000000..a6af503
--- /dev/null
+++ b/base/Libraries/System.Net/EndPoint.cs
@@ -0,0 +1,59 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   EndPoint.cs
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Net.Sockets;
+
+namespace System.Net {
+
+    // Generic abstraction to identify network addresses
+
+    /// <devdoc>
+    ///    <para>
+    ///       Identifies a network address.
+    ///    </para>
+    /// </devdoc>
+    public abstract class EndPoint {
+        /// <devdoc>
+        ///    <para>
+        ///       Returns the Address Family to which the EndPoint belongs.
+        ///    </para>
+        /// </devdoc>
+
+        public virtual AddressFamily AddressFamily {
+            get {
+                throw new NotSupportedException();
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>
+        ///       Serializes EndPoint information into a SocketAddress structure.
+        ///    </para>
+        /// </devdoc>
+        public virtual SocketAddress Serialize() {
+            throw new NotSupportedException();
+        }
+
+        /// <devdoc>
+        ///    <para>
+        ///       Creates an EndPoint instance from a SocketAddress structure.
+        ///    </para>
+        /// </devdoc>
+        public abstract EndPoint Create(SocketAddress! socketAddress);
+        //        {
+        //            throw new NotSupportedException();
+        //        }
+
+    }; // abstract class EndPoint
+
+
+} // namespace System.Net
+
diff --git a/base/Libraries/System.Net/IPAddress.cs b/base/Libraries/System.Net/IPAddress.cs
new file mode 100644
index 0000000..e7c63e2
--- /dev/null
+++ b/base/Libraries/System.Net/IPAddress.cs
@@ -0,0 +1,124 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPAddress.cs
+//
+//  Note:
+//    This file is a wrapper around Singularity's internal networking types
+//
+
+using System;
+using System.Net.IP; // Singularity networking type space
+using System.Net.Sockets;
+using Microsoft.Singularity.Io;
+using Microsoft.Contracts;
+
+//
+// Currently this wrapper is IPv4-specific!
+//
+public class IPAddress {
+    public static readonly IPAddress Any = new IPAddress(IPv4.Any);
+    public static readonly  IPAddress Loopback = new IPAddress(IPv4.Loopback);
+    public static readonly  IPAddress Broadcast = new IPAddress(IPv4.Broadcast);
+    public static readonly  IPAddress None = Broadcast;
+
+    internal IPv4 m_addr; // Our wrapped address
+
+    // newAddress is provided in network order.
+    [NotDelayed]
+    public IPAddress(long newAddress) {
+        SetFromLong(newAddress);
+    }
+
+    // address is MST byte first (index 0)
+    public IPAddress(byte[]! address) {
+        if (address.Length != 4) {
+            throw new NotSupportedException("Byte array length must be 4");
+        }
+
+        uint addr  = ((uint)address[0]) << 24;
+        addr += ((uint)address[1]) << 16;
+        addr += ((uint)address[2]) << 8;
+        addr += ((uint)address[3]);
+
+        m_addr = new IPv4(addr);
+    }
+
+    public IPAddress(IPv4 addr)
+    { m_addr = new IPv4(addr); }
+
+    public static IPAddress! Parse(string ipString)
+    { return new IPAddress(IPv4.Parse(ipString)); }
+
+    private void SetFromLong(long value)
+    {
+        if (value < 0 || value > 0x00000000FFFFFFFF) {
+            throw new ArgumentOutOfRangeException("value");
+        }
+
+        m_addr = new IPv4((uint)NetworkToHostOrder(value));
+    }
+
+    // TODO
+    [ Obsolete("IPAddress.Address is address family dependant, use " +
+               "Equals method for comparison.") ]
+    public long Address {
+        get {
+            return (uint)m_addr;
+        }
+        set {
+            SetFromLong(value);
+        }
+    }
+
+    public AddressFamily AddressFamily {
+        get {
+            return AddressFamily.InterNetwork;
+        }
+    }
+
+    public byte[] GetAddressBytes()
+    { return m_addr.GetAddressBytes(); }
+
+    public override string! ToString()
+    { return m_addr.ToString(); }
+
+    public static long HostToNetworkOrder(long host) {
+        return ByteOrder.HostToBigEndian(host);
+    }
+    public static int HostToNetworkOrder(int host) {
+        return ByteOrder.HostToBigEndian(host);
+    }
+
+    public static short HostToNetworkOrder(short host) {
+        return ByteOrder.HostToBigEndian(host);
+    }
+
+    public static long NetworkToHostOrder(long network) {
+        return ByteOrder.HostToBigEndian(network);
+    }
+
+    public static int NetworkToHostOrder(int network) {
+        return ByteOrder.HostToBigEndian(network);
+    }
+
+    public static short NetworkToHostOrder(short network) {
+        return ByteOrder.HostToBigEndian(network);
+    }
+
+    public static IPAddress operator&(IPAddress! lhs, IPAddress! rhs)
+    { return new IPAddress(lhs.m_addr & rhs.m_addr); }
+
+    public static bool IsLoopback(IPAddress! address)
+    { return address.m_addr.IsLoopback(); }
+
+    public override bool Equals(object comparand)
+    { return m_addr.Equals(comparand); }
+
+    public override int GetHashCode()
+    { return m_addr.GetHashCode(); }
+} // class IPAddress
+
diff --git a/base/Libraries/System.Net/IPEndPoint.cs b/base/Libraries/System.Net/IPEndPoint.cs
new file mode 100644
index 0000000..8090e8f
--- /dev/null
+++ b/base/Libraries/System.Net/IPEndPoint.cs
@@ -0,0 +1,197 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPEndPoint.cs
+//
+
+namespace System.Net {
+    using System.Net.Sockets;
+    using System.Globalization;
+
+    /// <devdoc>
+    ///    <para>
+    ///       Provides an IP address.
+    ///    </para>
+    /// </devdoc>
+    public class IPEndPoint : EndPoint {
+        /// <devdoc>
+        ///    <para>
+        ///       Specifies the minimum acceptable value for the <see cref='System.Net.IPEndPoint.Port'/>
+        ///       property.
+        ///    </para>
+        /// </devdoc>
+        public const int MinPort = 0x00000000;
+        /// <devdoc>
+        ///    <para>
+        ///       Specifies the maximum acceptable value for the <see cref='System.Net.IPEndPoint.Port'/>
+        ///       property.
+        ///    </para>
+        /// </devdoc>
+        public const int MaxPort = 0x0000FFFF;
+
+        private IPAddress m_Address;
+        private int m_Port;
+        private const int IPv4AddressSize = 16;
+
+        internal const int AnyPort = MinPort;
+
+        internal static IPEndPoint Any     = new IPEndPoint(IPAddress.Any, AnyPort);
+
+
+        public override AddressFamily AddressFamily {
+            get {
+                return m_Address.AddressFamily;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>Creates a new instance of the IPEndPoint class with the specified address and
+        ///       port.</para>
+        /// </devdoc>
+        public IPEndPoint(long address, int port) {
+            if (!ValidationHelper.ValidateTcpPort(port)) {
+                throw new ArgumentOutOfRangeException("port");
+            }
+            m_Port = port;
+            m_Address = new IPAddress(address);
+        }
+
+        /// <devdoc>
+        ///    <para>Creates a new instance of the IPEndPoint class with the specified address and port.</para>
+        /// </devdoc>
+        public IPEndPoint(IPAddress address, int port) {
+            if (address==null) {
+                throw new ArgumentNullException("address");
+            }
+            if (!ValidationHelper.ValidateTcpPort(port)) {
+                throw new ArgumentOutOfRangeException("port");
+            }
+            m_Port = port;
+            m_Address = address;
+        }
+
+        /// <devdoc>
+        ///    <para>
+        ///       Gets or sets the IP address.
+        ///    </para>
+        /// </devdoc>
+        public IPAddress! Address {
+            get {
+                return m_Address;
+            }
+            set {
+                m_Address = value;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>
+        ///       Gets or sets the port.
+        ///    </para>
+        /// </devdoc>
+        public int Port {
+            get {
+                return m_Port;
+            }
+            set {
+                if (!ValidationHelper.ValidateTcpPort(value)) {
+                    throw new ArgumentOutOfRangeException("value");
+                }
+                m_Port = value;
+            }
+        }
+
+        public override string! ToString() {
+            return Address.ToString() + ":" + Port.ToString();
+        }
+
+        public override SocketAddress Serialize() {
+            //
+            // create a new SocketAddress
+            //
+            SocketAddress socketAddress = new SocketAddress(m_Address.AddressFamily, IPv4AddressSize);
+
+            //
+            // populate it
+            //
+            socketAddress[2] = unchecked((byte)(this.Port>> 8));
+            socketAddress[3] = unchecked((byte)(this.Port    ));
+
+            uint address = (uint)Address.m_addr;
+            socketAddress[4] = unchecked((byte)(address    ));
+            socketAddress[5] = unchecked((byte)(address>> 8));
+            socketAddress[6] = unchecked((byte)(address>>16));
+            socketAddress[7] = unchecked((byte)(address>>24));
+
+            //
+            // return it
+            //
+            return socketAddress;
+        }
+
+        public override EndPoint Create(SocketAddress! socketAddress) {
+            //
+            // validate SocketAddress
+            //
+            if (socketAddress.Family != this.AddressFamily) {
+                throw new ArgumentException("Mismatched address family");
+            }
+
+            if (socketAddress.Size<8) {
+                throw new ArgumentException("Socket Address size too small");
+            }
+
+            // HACKHACK we don't support v6 in Singularity
+            if ( this.AddressFamily == AddressFamily.InterNetworkV6 ) {
+                throw new NotSupportedException();
+            }
+            else
+            {
+                //
+                // strip out of SocketAddress information on the EndPoint
+                //
+                int port = (int)(
+                        (socketAddress[2]<<8 & 0xFF00) |
+                        (socketAddress[3])
+                        );
+
+                long address = (long)(
+                        (socketAddress[4]     & 0x000000FF) |
+                        (socketAddress[5]<<8  & 0x0000FF00) |
+                        (socketAddress[6]<<16 & 0x00FF0000) |
+                        (socketAddress[7]<<24)
+                        ) & 0x00000000FFFFFFFF;
+
+                IPEndPoint created = new IPEndPoint(address, port);
+
+                //
+                // return it
+                //
+                return created;
+            }
+        }
+
+
+        //UEUE
+        public override bool Equals(object comparand) {
+            if (!(comparand is IPEndPoint)) {
+                return false;
+            }
+            return ((IPEndPoint)comparand).m_Address.Equals(m_Address) && ((IPEndPoint)comparand).m_Port==m_Port;
+        }
+
+        //UEUE
+        public override int GetHashCode() {
+            return m_Address.GetHashCode() ^ m_Port;
+        }
+
+
+    }; // class IPEndPoint
+
+
+} // namespace System.Net
+
+
diff --git a/base/Libraries/System.Net/IPHostEntry.cs b/base/Libraries/System.Net/IPHostEntry.cs
new file mode 100644
index 0000000..bb22636
--- /dev/null
+++ b/base/Libraries/System.Net/IPHostEntry.cs
@@ -0,0 +1,73 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: IPHostEntry.
+//
+
+namespace System.Net {
+
+// Host information
+    /// <devdoc>
+    ///    <para>Provides a container class for Internet host address information..</para>
+    /// </devdoc>
+    public class IPHostEntry {
+        string hostName;
+        string[] aliases;
+        IPAddress[] addressList;
+
+        /// <devdoc>
+        ///    <para>
+        ///       Contains the DNS
+        ///       name of the host.
+        ///    </para>
+        /// </devdoc>
+        /// <devdoc>
+        /// </devdoc>
+        public string HostName {
+            get {
+                return hostName;
+            }
+            set {
+                hostName = value;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>
+        ///       Provides an
+        ///       array of strings containing other DNS names that resolve to the IP addresses
+        ///       in <paramref name='AddressList'/>.
+        ///    </para>
+        /// </devdoc>
+        /// <devdoc>
+        /// </devdoc>
+        public string[] Aliases {
+            get {
+                return aliases;
+            }
+            set {
+                aliases = value;
+            }
+        }
+
+        /// <devdoc>
+        ///    <para>
+        ///       Provides an
+        ///       array of <paramref name='IPAddress'/> objects.
+        ///    </para>
+        /// </devdoc>
+        /// <devdoc>
+        /// </devdoc>
+        public IPAddress[] AddressList {
+            get {
+                return addressList;
+            }
+            set {
+                addressList = value;
+            }
+        }
+    } // class IPHostEntry
+} // namespace System.Net
diff --git a/base/Libraries/System.Net/Internal.cs b/base/Libraries/System.Net/Internal.cs
new file mode 100644
index 0000000..9789fc3
--- /dev/null
+++ b/base/Libraries/System.Net/Internal.cs
@@ -0,0 +1,148 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Internal.cs
+//
+//  Note:
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Net
+{
+    //
+    // support class for Validation related stuff.
+    //
+    internal class ValidationHelper {
+
+        public static string [] EmptyArray = new string[0];
+
+        internal static readonly char[]  InvalidMethodChars =
+                new char[]{
+                ' ',
+                '\r',
+                '\n',
+                '\t'
+                };
+
+        // invalid characters that cannot be found in a valid method-verb or http header
+        internal static readonly char[]  InvalidParamChars =
+                new char[]{
+                '(',
+                ')',
+                '<',
+                '>',
+                '@',
+                ',',
+                ';',
+                ':',
+                '\\',
+                '"',
+                '\'',
+                '/',
+                '[',
+                ']',
+                '?',
+                '=',
+                '{',
+                '}',
+                ' ',
+                '\t',
+                '\r',
+                '\n'};
+
+        public static string [] MakeEmptyArrayNull(string [] stringArray) {
+            if ( stringArray == null || stringArray.Length == 0 ) {
+                return null;
+            } else {
+                return stringArray;
+            }
+        }
+
+        public static string MakeStringNull(string stringValue) {
+            if ( stringValue == null || stringValue.Length == 0) {
+                return null;
+            } else {
+                return stringValue;
+            }
+        }
+
+        public static string MakeStringEmpty(string stringValue) {
+            if ( stringValue == null || stringValue.Length == 0) {
+                return String.Empty;
+            } else {
+                return stringValue;
+            }
+        }
+
+        public static int HashCode(object objectValue) {
+            if (objectValue == null) {
+                return -1;
+            } else {
+                return objectValue.GetHashCode();
+            }
+        }
+        public static string ExceptionMessage(Exception exception) {
+            if (exception==null) {
+                return string.Empty;
+            }
+            if (exception.InnerException==null) {
+                return exception.Message;
+            }
+            return exception.Message + " (" + ExceptionMessage(exception.InnerException) + ")";
+        }
+
+        public static string ToString(object objectValue) {
+            if (objectValue == null) {
+                return "(null)";
+            } else if (objectValue is string && ((string)objectValue).Length==0) {
+                return "(string.empty)";
+            } else if (objectValue is Exception) {
+                return ExceptionMessage(objectValue as Exception);
+            } else if (objectValue is IntPtr) {
+                return "0x" + String.Format("{0x}", ((IntPtr)objectValue));
+            } else {
+                return objectValue.ToString();
+            }
+        }
+        public static string HashString(object objectValue) {
+            if (objectValue == null) {
+                return "(null)";
+            } else if (objectValue is string && ((string)objectValue).Length==0) {
+                return "(string.empty)";
+            } else {
+                return objectValue.GetHashCode().ToString();
+            }
+        }
+
+        public static bool IsInvalidHttpString(string! stringValue) {
+            return stringValue.IndexOfAny(InvalidParamChars)!=-1;
+        }
+
+        public static bool IsBlankString(string stringValue) {
+            return stringValue==null || stringValue.Length==0;
+        }
+
+        public static bool ValidateUInt32(long address) {
+            // on false, API should throw new ArgumentOutOfRangeException("address");
+            return address>=0x00000000 && address<=0xFFFFFFFF;
+        }
+
+        public static bool ValidateTcpPort(int port) {
+            // on false, API should throw new ArgumentOutOfRangeException("port");
+            return port>=IPEndPoint.MinPort && port<=IPEndPoint.MaxPort;
+        }
+
+        public static bool ValidateRange(int actual, int fromAllowed, int toAllowed) {
+            // on false, API should throw new ArgumentOutOfRangeException("argument");
+            return actual>=fromAllowed && actual<=toAllowed;
+        }
+
+        public static bool ValidateRange(long actual, long fromAllowed, long toAllowed) {
+            // on false, API should throw new ArgumentOutOfRangeException("argument");
+            return actual>=fromAllowed && actual<=toAllowed;
+        }
+    }
+}
diff --git a/base/Libraries/System.Net/SocketAddress.cs b/base/Libraries/System.Net/SocketAddress.cs
new file mode 100644
index 0000000..8831b2d
--- /dev/null
+++ b/base/Libraries/System.Net/SocketAddress.cs
@@ -0,0 +1,170 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HttpException
+//
+//  Note:
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Net {
+
+    using System;
+    using System.Net.Sockets;
+    using System.Text;
+    using System.Globalization;
+
+    // a little perf app measured these times when comparing the internal
+    // buffer implemented as a managed byte[] or unmanaged memory IntPtr
+    // that's why we use byte[]
+    // byte[] total ms:19656
+    // IntPtr total ms:25671
+
+    public class SocketAddress {
+
+        internal int m_Size;
+        internal byte[]! m_Buffer;
+
+        private const int WriteableOffset = 2;
+        private const int MaxSize = 32; // IrDA requires 32 bytes
+        private bool m_changed = true;
+        private int m_hash;
+
+        public AddressFamily Family {
+            get {
+                int family;
+#if BIGENDIAN
+                family = ((int)m_Buffer[0]<<8) | m_Buffer[1];
+#else
+                family = m_Buffer[0] | ((int)m_Buffer[1]<<8);
+#endif
+                return (AddressFamily)family;
+            }
+        }
+        //
+        // Size of this SocketAddress
+        //
+        public int Size {
+            get {
+                return m_Size;
+            }
+        }
+
+        //
+        // access to unmanaged serialized data. this doesn't
+        // allow access to the first 2 bytes of unmanaged memory
+        // that are supposed to contain the address family which
+        // is readonly.
+        //
+        public byte this[int offset] {
+            get {
+                //
+                // access
+                //
+                if (offset<0 || offset>=Size) {
+                    throw new IndexOutOfRangeException();
+                }
+                return m_Buffer[offset];
+            }
+            set {
+                if (offset<0 || offset>=Size) {
+                    throw new IndexOutOfRangeException();
+                }
+                if (m_Buffer[offset] != value) {
+                    m_changed = true;
+                }
+                m_Buffer[offset] = value;
+            }
+        }
+
+        public SocketAddress(AddressFamily family) : this(family, MaxSize) {
+        }
+
+        public SocketAddress(AddressFamily family, int size) {
+            if (size<WriteableOffset) {
+                //
+                // it doesn't make sense to create a socket address with less than
+                // 2 bytes, that's where we store the address family.
+                //
+                throw new ArgumentOutOfRangeException("size");
+            }
+            m_Size = size;
+            byte[]! buf = m_Buffer = new byte[(size/IntPtr.Size+2)*IntPtr.Size];//sizeof DWORD
+
+#if BIGENDIAN
+            buf[0] = unchecked((byte)((int)family>>8));
+            buf[1] = unchecked((byte)((int)family   ));
+#else
+            buf[0] = unchecked((byte)((int)family   ));
+            buf[1] = unchecked((byte)((int)family>>8));
+#endif
+        }
+
+        //
+        // Can be called after the above method did work
+        //
+        internal int GetAddressSizeOffset()
+        {
+            return m_Buffer.Length-IntPtr.Size;
+        }
+
+        public override bool Equals(object comparand) {
+            SocketAddress castedComparand = comparand as SocketAddress;
+            if (castedComparand == null || this.Size != castedComparand.Size) {
+                return false;
+            }
+            for(int i=0; i<this.Size; i++) {
+                if(this[i]!=castedComparand[i]) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public override int GetHashCode() {
+            if (m_changed) {
+                m_changed = false;
+                m_hash = 0;
+
+                int i;
+                int size = Size & ~3;
+
+                for (i = 0; i < size; i += 4) {
+                    m_hash ^= (int)m_Buffer[i]
+                            | ((int)m_Buffer[i+1] << 8)
+                            | ((int)m_Buffer[i+2] << 16)
+                            | ((int)m_Buffer[i+3] << 24);
+                }
+                if ((Size & 3) != 0) {
+
+                    int remnant = 0;
+                    int shift = 0;
+
+                    for (; i < Size; ++i) {
+                        remnant |= ((int)m_Buffer[i]) << shift;
+                        shift += 8;
+                    }
+                    m_hash ^= remnant;
+                }
+            }
+            return m_hash;
+        }
+
+        public override string! ToString() {
+            StringBuilder bytes = new StringBuilder();
+            for(int i=WriteableOffset; i<this.Size; i++) {
+                if (i>WriteableOffset) {
+                    bytes.Append(",");
+                }
+                bytes.Append(this[i].ToString());
+            }
+            return Family.ToString() + ":" + Size.ToString() + ":{" + bytes.ToString() + "}";
+        }
+
+    } // class SocketAddress
+
+
+} // namespace System.Net
diff --git a/base/Libraries/System.Net/SocketException.cs b/base/Libraries/System.Net/SocketException.cs
new file mode 100644
index 0000000..3d11f58
--- /dev/null
+++ b/base/Libraries/System.Net/SocketException.cs
@@ -0,0 +1,98 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SocketException.cs
+//
+
+namespace System.Net.Sockets {
+    using System;
+    using NetStack.Contracts;
+
+    public class SocketException : Exception {
+        SocketErrors _socketError;
+
+        public SocketException(int socketError)
+            : this((SocketErrors)socketError)
+        {
+        }
+
+        public SocketException(SocketErrors socketError)
+            : this(socketError, String.Format("SocketError: {0}", socketError.ToString()))
+        {
+        }
+
+        internal SocketException(SocketErrors socketError, string message)
+            : base(message)
+        {
+            _socketError = socketError;
+        }
+
+        public SocketErrors ErrorCode {
+            get { return _socketError; }
+        }
+    }
+
+    public class TcpException : SocketException
+    {
+        public TcpException(TcpError error, string message)
+            : base(GetSocketErrorForTcpError(error), message)
+        {
+            _tcpError = error;
+        }
+
+        public TcpException(TcpError error)
+            : this(error, GetMessageForTcpError(error))
+        {
+        }
+
+        readonly TcpError _tcpError;
+
+        public TcpError TcpError
+        {
+            get { return _tcpError; }
+        }
+
+        public static SocketErrors GetSocketErrorForTcpError(TcpError error)
+        {
+            switch (error)
+            {
+                    // These are defined in Contracts\NetStack.Contracts\TcpConnectionContract.sg.
+                case TcpError.Unknown:              return SocketErrors.SocketError; 
+                case TcpError.AlreadyConnected:     return SocketErrors.WSAEISCONN;
+                case TcpError.Refused:              return SocketErrors.WSAECONNREFUSED;
+                case TcpError.Reset:                return SocketErrors.WSAECONNRESET;
+                case TcpError.Timeout:              return SocketErrors.WSAETIMEDOUT;
+                case TcpError.ProtocolViolation:    return SocketErrors.WSAECONNRESET;
+                case TcpError.ResourcesExhausted:   return SocketErrors.SocketError;
+                case TcpError.Closed:               return SocketErrors.WSAEDISCON;
+
+                default:
+                    return SocketErrors.SocketError;
+             }
+        }
+
+        public static string GetMessageForTcpError(TcpError error)
+        {
+            switch (error)
+            {
+                    // These are defined in Contracts\NetStack.Contracts\TcpConnectionContract.sg.
+                case TcpError.Unknown:              return "Unknown error";
+                case TcpError.AlreadyConnected:     return "The connection is already in use.";
+                case TcpError.Refused:              return "The remote host actively refused the connection.";
+                case TcpError.Reset:                return "The connection was reset by the peer.";
+                case TcpError.Timeout:              return "No response was received.";
+                case TcpError.ProtocolViolation:    return "An invalid packet was received from the peer.";
+                case TcpError.ResourcesExhausted:   return "Insufficient resources.";
+                case TcpError.Closed:               return "The TCP connection has been closed.";
+
+                default:
+                    return String.Format("Unknown TcpError code ({0}).", ((int)error).ToString());
+            }
+        }
+    }
+
+
+} // namespace System.Net
diff --git a/base/Libraries/System.Net/Sockets/AddressFamily.cs b/base/Libraries/System.Net/Sockets/AddressFamily.cs
new file mode 100644
index 0000000..a7b7ad1
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/AddressFamily.cs
@@ -0,0 +1,220 @@
+//------------------------------------------------------------------------------
+// <copyright company='Microsoft Corporation'>
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+
+    //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily"]/*' />
+    /// <devdoc>
+    ///    <para>
+    ///       Specifies the address families that an instance of the <see cref='System.Net.Sockets.Socket'/>
+    ///       class can use.
+    ///    </para>
+    /// </devdoc>
+    public enum AddressFamily {
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Unknown"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unknown             = -1,   // Unknown
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Unspecified"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unspecified         = 0,    // unspecified
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Unix"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unix                = 1,    // local to host (pipes, portals)
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.InterNetwork"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        InterNetwork        = 2,    // internetwork: UDP, TCP, etc.
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.ImpLink"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        ImpLink             = 3,    // arpanet imp addresses
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Pup"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Pup                 = 4,    // pup protocols: e.g. BSP
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Chaos"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Chaos               = 5,    // mit CHAOS protocols
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.NS"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NS                  = 6,    // XEROX NS protocols
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Ipx"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ipx                 = NS,   // IPX and SPX
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Iso"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Iso                 = 7,    // ISO protocols
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Osi"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Osi                 = Iso,  // OSI is ISO
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Ecma"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ecma                = 8,    // european computer manufacturers
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.DataKit"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        DataKit             = 9,    // datakit protocols
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Ccitt"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ccitt               = 10,   // CCITT protocols, X.25 etc
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Sna"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Sna                 = 11,   // IBM SNA
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.DecNet"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        DecNet              = 12,   // DECnet
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.DataLink"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        DataLink            = 13,   // Direct data link interface
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Lat"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Lat                 = 14,   // LAT
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.HyperChannel"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        HyperChannel        = 15,   // NSC Hyperchannel
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.AppleTalk"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        AppleTalk           = 16,   // AppleTalk
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.NetBios"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NetBios             = 17,   // NetBios-style addresses
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.VoiceView"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        VoiceView           = 18,   // VoiceView
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.FireFox"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        FireFox             = 19,   // FireFox
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Banyan"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Banyan              = 21,   // Banyan
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Atm"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Atm                 = 22,   // Native ATM Services
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.InterNetworkV6"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        InterNetworkV6      = 23,   // Internetwork Version 6
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Cluster"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Cluster             = 24,   // Microsoft Wolfpack
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Ieee12844"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ieee12844           = 25,   // IEEE 1284.4 WG AF
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Irda"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Irda                = 26,   // IrDA
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.NetworkDesigners"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NetworkDesigners    = 28,   // Network Designers OSI & gateway enabled protocols
+        //| <include file='doc\AddressFamily.uex' path='docs/doc[@for="AddressFamily.Max"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Max                 = 29,   // Max
+
+
+/*
+#define AF_UNSPEC       0               // unspecified
+
+// Although  AF_UNSPEC  is  defined for backwards compatibility, using
+// AF_UNSPEC for the "af" parameter when creating a socket is STRONGLY
+// DISCOURAGED.    The  interpretation  of  the  "protocol"  parameter
+// depends  on the actual address family chosen.  As environments grow
+// to  include  more  and  more  address families that use overlapping
+// protocol  values  there  is  more  and  more  chance of choosing an
+// undesired address family when AF_UNSPEC is used.
+
+#define AF_UNIX         1               // local to host (pipes, portals)
+#define AF_INET         2               // internetwork: UDP, TCP, etc.
+#define AF_IMPLINK      3               // arpanet imp addresses
+#define AF_PUP          4               // pup protocols: e.g. BSP
+#define AF_CHAOS        5               // mit CHAOS protocols
+#define AF_NS           6               // XEROX NS protocols
+#define AF_IPX          AF_NS           // IPX protocols: IPX, SPX, etc.
+#define AF_ISO          7               // ISO protocols
+#define AF_OSI          AF_ISO          // OSI is ISO
+#define AF_ECMA         8               // european computer manufacturers
+#define AF_DATAKIT      9               // datakit protocols
+#define AF_CCITT        10              // CCITT protocols, X.25 etc
+#define AF_SNA          11              // IBM SNA
+#define AF_DECnet       12              // DECnet
+#define AF_DLI          13              // Direct data link interface
+#define AF_LAT          14              // LAT
+#define AF_HYLINK       15              // NSC Hyperchannel
+#define AF_APPLETALK    16              // AppleTalk
+#define AF_NETBIOS      17              // NetBios-style addresses
+#define AF_VOICEVIEW    18              // VoiceView
+#define AF_FIREFOX      19              // Protocols from Firefox
+#define AF_UNKNOWN1     20              // Somebody is using this!
+#define AF_BAN          21              // Banyan
+#define AF_ATM          22              // Native ATM Services
+#define AF_INET6        23              // Internetwork Version 6
+#define AF_CLUSTER      24              // Microsoft Wolfpack
+#define AF_12844        25              // IEEE 1284.4 WG AF
+#define AF_IRDA         26              // IrDA
+#define AF_NETDES       28              // Network Designers OSI & gateway enabled protocols
+#define AF_MAX          29
+*/
+
+    }; // enum AddressFamily
+
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/InternalSocket.cs b/base/Libraries/System.Net/Sockets/InternalSocket.cs
new file mode 100644
index 0000000..eab2cac
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/InternalSocket.cs
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   InternalSocket.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+
+namespace System.Net.Sockets
+{
+    public abstract class InternalSocket
+    {
+        abstract internal InternalSocket Accept();
+        abstract internal void   Bind(EndPoint localEndPoint);
+        abstract internal void   Close();
+        abstract internal void   Connect(EndPoint remoteEndPoint);
+        abstract internal void   Dispose();
+        abstract internal void   Listen(int backlog);
+        abstract internal bool   Poll(int microSeconds, SelectMode mode);
+        abstract internal int    Receive(byte[]! buffer, int offset, int size, SocketFlags socketFlags);
+        abstract internal int    ReceiveFrom(byte[]! buffer, int offset, int size, SocketFlags socketFlags, ref EndPoint remoteEP);
+
+        abstract internal int    Send(byte[]! buffer, int offset, int size, SocketFlags socketFlags);
+        abstract internal int    SendTo(byte[]! buffer, int offset, int size, SocketFlags socketFlags, EndPoint remoteEP);
+        abstract internal void   Shutdown(SocketShutdown how);
+
+        abstract internal int           Available       { get; }
+        abstract internal EndPoint      LocalEndPoint   { get; }
+        abstract internal EndPoint      RemoteEndPoint  { get; }
+        abstract internal bool          Blocking        { get; set; }
+        abstract internal bool          Connected       { get; }
+        abstract internal AddressFamily AddressFamily   { get; }
+        abstract internal SocketType    SocketType      { get; }
+        abstract internal ProtocolType  ProtocolType    { get; }
+
+        // Singularity-specific
+        abstract internal int Send([Claims] byte[]! in ExHeap data, SocketFlags flags);
+    }
+}
diff --git a/base/Libraries/System.Net/Sockets/ProtocolFamily.cs b/base/Libraries/System.Net/Sockets/ProtocolFamily.cs
new file mode 100644
index 0000000..c30cc78
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/ProtocolFamily.cs
@@ -0,0 +1,144 @@
+//------------------------------------------------------------------------------
+// <copyright file="ProtocolFamily.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+
+    /// <devdoc>
+    ///    <para>
+    ///       Specifies the type of protocol that an instance of the <see cref='System.Net.Sockets.Socket'/>
+    ///       class can use.
+    ///    </para>
+    /// </devdoc>
+    public enum ProtocolFamily {
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unknown             = AddressFamily.Unknown,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unspecified         = AddressFamily.Unspecified,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unix                = AddressFamily.Unix,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        InterNetwork        = AddressFamily.InterNetwork,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        ImpLink             = AddressFamily.ImpLink,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Pup                 = AddressFamily.Pup,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Chaos               = AddressFamily.Chaos,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NS                  = AddressFamily.NS,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ipx                 = AddressFamily.Ipx,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Iso                 = AddressFamily.Iso,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Osi                 = AddressFamily.Osi,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ecma                = AddressFamily.Ecma,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        DataKit             = AddressFamily.DataKit,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ccitt               = AddressFamily.Ccitt,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Sna                 = AddressFamily.Sna,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        DecNet              = AddressFamily.DecNet,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        DataLink            = AddressFamily.DataLink,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Lat                 = AddressFamily.Lat,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        HyperChannel        = AddressFamily.HyperChannel,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        AppleTalk           = AddressFamily.AppleTalk,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NetBios             = AddressFamily.NetBios,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        VoiceView           = AddressFamily.VoiceView,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        FireFox             = AddressFamily.FireFox,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Banyan              = AddressFamily.Banyan,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Atm                 = AddressFamily.Atm,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        InterNetworkV6      = AddressFamily.InterNetworkV6,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Cluster             = AddressFamily.Cluster,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ieee12844           = AddressFamily.Ieee12844,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Irda                = AddressFamily.Irda,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NetworkDesigners    = AddressFamily.NetworkDesigners,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Max                 = AddressFamily.Max,
+
+    }; // enum ProtocolFamily
+
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/ProtocolType.cs b/base/Libraries/System.Net/Sockets/ProtocolType.cs
new file mode 100644
index 0000000..beb4a60
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/ProtocolType.cs
@@ -0,0 +1,148 @@
+//------------------------------------------------------------------------------
+// <copyright file="ProtocolType.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    /// <devdoc>
+    ///    <para>
+    ///       Specifies the protocols that the <see cref='System.Net.Sockets.Socket'/> class supports.
+    ///    </para>
+    /// </devdoc>
+
+    public enum ProtocolType {
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        IP             = 0,    // dummy for IP
+        
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv6HopByHopOptions = 0,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Icmp           = 1,    // control message protocol
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Igmp           = 2,    // group management protocol
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ggp            = 3,    // gateway^2 (deprecated)
+        
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv4            = 4,    
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Tcp            = 6,    // tcp
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Pup            = 12,   // pup
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Udp            = 17,   // user datagram protocol
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Idp            = 22,   // xns idp
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv6           = 41,   // IPv4
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv6RoutingHeader           = 43,   // IPv6RoutingHeader
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv6FragmentHeader           = 44,   // IPv6FragmentHeader
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPSecEncapsulatingSecurityPayload           = 50,   // IPSecEncapsulatingSecurityPayload
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPSecAuthenticationHeader           = 51,   // IPSecAuthenticationHeader
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IcmpV6           = 58,   // IcmpV6
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv6NoNextHeader           = 59,   // IPv6NoNextHeader
+        /// <devdoc>
+        /// <para>[To be supplied.]</para>
+        /// </devdoc>
+        IPv6DestinationOptions           = 60,   // IPv6DestinationOptions
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        ND             = 77,   // UNOFFICIAL net disk proto
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Raw            = 255,  // raw IP packet
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unspecified    = 0,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Ipx            = 1000,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Spx            = 1256,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        SpxII          = 1257,
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unknown        = -1,   // unknown protocol type
+
+/*
+consider adding:
+
+#define IPPROTO_RSVP                0x2e 
+#define DNPROTO_NSP                 1               // DECnet NSP transport protocol
+#define ISOPROTO_TP_CONS            25              // Transport over CONS
+#define ISOPROTO_CLTP_CONS          tba             // Connectionless Transport over CONS
+#define ISOPROTO_TP4_CLNS           29              // Transport class 4 over CLNS
+#define ISOPROTO_CLTP_CLNS          30              // Connectionless Transport over CLNS
+#define ISOPROTO_X25                32              // X.25
+#define ISOPROTO_X25PVC             tba             // Permanent Virtual Circuit
+#define ISOPROTO_X25SVC             ISOPROTO_X25    // Switched Virtual Circuit
+#define ISOPROTO_TP                 ISOPROTO_TP4_CLNS
+#define ISOPROTO_CLTP               ISOPROTO_CLTP_CLNS
+#define ISOPROTO_TP0_TCP            tba             // Transport class 0 over TCP (RFC1006)
+#define ATMPROTO_AALUSER            0x00            // User-defined AAL
+#define ATMPROTO_AAL1               0x01            // AAL 1
+#define ATMPROTO_AAL2               0x02            // AAL 2
+#define ATMPROTO_AAL34              0x03            // AAL 3/4
+#define ATMPROTO_AAL5               0x05            // AAL 5
+*/
+
+
+    } // enum ProtocolType
+
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/SelectMode.cs b/base/Libraries/System.Net/Sockets/SelectMode.cs
new file mode 100644
index 0000000..cdd67ef
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SelectMode.cs
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <copyright file="SelectMode.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    /// <devdoc>
+    ///    <para>
+    ///       Specifies the mode for polling the status of a socket.
+    ///    </para>
+    /// </devdoc>
+    public enum SelectMode {
+        /// <devdoc>
+        ///    <para>
+        ///       Poll the read status of a socket.
+        ///    </para>
+        /// </devdoc>
+        SelectRead     = 0,
+        /// <devdoc>
+        ///    <para>
+        ///       Poll the write status of a socket.
+        ///    </para>
+        /// </devdoc>
+        SelectWrite    = 1,
+        /// <devdoc>
+        ///    <para>
+        ///       Poll the error status of a socket.
+        ///    </para>
+        /// </devdoc>
+        SelectError    = 2
+    } // enum SelectMode
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/Socket.cs b/base/Libraries/System.Net/Sockets/Socket.cs
new file mode 100644
index 0000000..b949bb0
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/Socket.cs
@@ -0,0 +1,263 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Socket.cs
+//
+//  Note:
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace System.Net.Sockets
+{
+    public class Socket : IDisposable
+    {
+        InternalSocket internalSocket;
+        bool disposed = false;
+
+        // ================== Private Methods ==================
+
+        private Socket(InternalSocket internalSocket)
+        {
+            this.internalSocket = internalSocket;
+        }
+
+        // ================== Public Methods ==================
+
+        public Socket(AddressFamily addressFamily,
+                      SocketType    socketType,
+                      ProtocolType  protocolType)
+        {
+            // We only support TCP streams
+
+            if (addressFamily != AddressFamily.InterNetwork)
+            {
+                throw new SocketException(SocketErrors.WSAEAFNOSUPPORT);
+            }
+
+            if (socketType == SocketType.Stream &&
+                protocolType == ProtocolType.Tcp)
+            {
+                internalSocket = new TcpSocket();
+                return;
+            }
+
+            if (socketType == SocketType.Dgram &&
+                protocolType == ProtocolType.Udp)
+            {
+                internalSocket = new UdpSocket();
+                return;
+            }
+            throw new SocketException(SocketErrors.WSAEPROTONOSUPPORT);
+        }
+
+        public void Dispose()
+        {
+            if (!disposed)
+            {
+                internalSocket.Dispose();
+                disposed = true;
+            }
+        }
+
+        public Socket Accept()
+        {
+            InternalSocket s = internalSocket.Accept();
+            if (s != null)
+                return new Socket(s);
+            return null;
+        }
+
+        public void Bind(EndPoint localEP)
+        {
+            internalSocket.Bind(localEP);
+        }
+
+        public void Close()
+        {
+            internalSocket.Close();
+        }
+
+        public void Connect(EndPoint remoteEP)
+        {
+            internalSocket.Connect(remoteEP);
+        }
+
+        /*
+        public object GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public void GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, byte[] optionValue)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public byte[] GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, int optionLength)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+        */
+
+        public void Listen(int backlog)
+        {
+            internalSocket.Listen(backlog);
+        }
+
+        public bool Poll(int microSeconds, SelectMode mode)
+        {
+            return internalSocket.Poll(microSeconds, mode);
+        }
+
+        public int Receive(byte[] buffer, int size, SocketFlags socketFlags)
+        {
+            return Receive(buffer, 0, size, socketFlags);
+        }
+
+        public int Receive(byte[] buffer, SocketFlags socketFlags)
+        {
+            return Receive(buffer, 0, buffer!=null ? buffer.Length : 0, socketFlags);
+        }
+
+        public int Receive(byte[] buffer)
+        {
+            return Receive(buffer, 0, buffer!=null ? buffer.Length : 0, SocketFlags.None);
+        }
+
+        public int Receive(byte[] buffer, int offset, int size, SocketFlags socketFlags)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException("buffer");
+            }
+            return internalSocket.Receive(buffer, offset, size, socketFlags);
+        }
+
+        /*
+        public static void Select(IList checkRead, IList checkWrite, IList checkError, int microSeconds)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+        */
+
+        public int Send(byte[] buffer, int size, SocketFlags socketFlags)
+        {
+            return Send(buffer, 0, size, socketFlags);
+        }
+
+        public int Send(byte[] buffer, SocketFlags socketFlags)
+        {
+            return Send(buffer, 0, buffer!=null ? buffer.Length : 0, socketFlags);
+        }
+
+        public int Send(byte[] buffer)
+        {
+            return Send(buffer, 0, buffer!=null ? buffer.Length : 0, SocketFlags.None);
+        }
+
+        public int Send(byte[] buffer, int offset, int size, SocketFlags socketFlags)
+        {
+            if (buffer == null) {
+                throw new ArgumentException("buffer");
+            }
+            return internalSocket.Send(buffer, offset, size, socketFlags);
+        }
+
+        /*
+        public void SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, int optionValue)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public void SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, byte[] optionValue)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public void SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, bool optionValue)
+        {
+            SetSocketOption(optionLevel, optionName, (optionValue?1:0));
+        }
+        */
+
+        public void Shutdown(SocketShutdown how)
+        {
+            internalSocket.Shutdown(how);
+        }
+
+        // ================== Properties ==================
+
+        public static bool SupportsIPv4
+        {
+            get { return true; }
+        }
+
+        public static bool SupportsIPv6
+        {
+            get { return false; }
+        }
+
+        public int Available
+        {
+            get { return internalSocket.Available; }
+        }
+
+        public EndPoint LocalEndPoint
+        {
+            get { return internalSocket.LocalEndPoint; }
+        }
+
+        public EndPoint RemoteEndPoint
+        {
+            get { return internalSocket.RemoteEndPoint; }
+        }
+
+        public bool Blocking
+        {
+            get { return internalSocket.Blocking; }
+        }
+
+        public bool Connected
+        {
+            get { return internalSocket.Connected; }
+        }
+
+        public AddressFamily AddressFamily
+        {
+            get { return internalSocket.AddressFamily; }
+        }
+
+        public SocketType SocketType
+        {
+            get { return internalSocket.SocketType; }
+        }
+
+        public ProtocolType ProtocolType
+        {
+            get { return internalSocket.ProtocolType; }
+        }
+
+        // ================== Singularity-Specific ==================
+        public int Send([Claims] byte[]! in ExHeap buffer, SocketFlags socketFlags)
+        {
+            return internalSocket.Send(buffer, socketFlags);
+        }
+    }
+}
diff --git a/base/Libraries/System.Net/Sockets/SocketErrors.cs b/base/Libraries/System.Net/Sockets/SocketErrors.cs
new file mode 100644
index 0000000..e5e4c76
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SocketErrors.cs
@@ -0,0 +1,398 @@
+//------------------------------------------------------------------------------
+// <copyright file="SocketErrors.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    /// <devdoc>
+    ///    <para>
+    ///       Defines socket error constants.
+    ///    </para>
+    /// </devdoc>
+    public enum SocketErrors : int {
+        /// <devdoc>
+        ///    <para>
+        ///       The operation completed successfully.
+        ///    </para>
+        /// </devdoc>
+        Success                = 0,
+        /// <devdoc>
+        ///    <para>
+        ///       The socket is invalid.
+        ///    </para>
+        /// </devdoc>
+        InvalidSocket          = (-1),
+        /// <devdoc>
+        ///    <para>
+        ///       The socket has an error.
+        ///    </para>
+        /// </devdoc>
+        SocketError            = (-1),
+        /// <devdoc>
+        ///    <para>
+        ///       Overlapped operations will complete later.
+        ///    </para>
+        /// </devdoc>
+        WSA_IO_PENDING             = 997, // Winsock 2 Defines this value just to be ERROR_IO_PENDING or 997
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        ERROR_OPERATION_ABORTED    = 995,
+
+
+        /*
+         * All Windows Sockets error constants are biased by WSABASEERR from
+         * the "normal"
+         */
+        /// <devdoc>
+        ///    <para>
+        ///       The base value of all socket error constants. All other socket errors are
+        ///       offset from this value.
+        ///    </para>
+        /// </devdoc>
+        WSABASEERR             = 10000,
+
+
+        /*
+         * Windows Sockets definitions of regular Microsoft C error constants
+         */
+        /// <devdoc>
+        ///    <para>
+        ///       A blocking socket call was canceled.
+        ///    </para>
+        /// </devdoc>
+        WSAEINTR               = (WSABASEERR+4),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAEBADF               = (WSABASEERR+9),
+        /// <devdoc>
+        ///    <para>
+        ///       Permission denied.
+        ///    </para>
+        /// </devdoc>
+        WSAEACCES              = (WSABASEERR+13),
+        /// <devdoc>
+        ///    <para>
+        ///       Bad address.
+        ///    </para>
+        /// </devdoc>
+        WSAEFAULT              = (WSABASEERR+14),
+        /// <devdoc>
+        ///    <para>
+        ///       Invalid argument.
+        ///    </para>
+        /// </devdoc>
+        WSAEINVAL              = (WSABASEERR+22),
+        /// <devdoc>
+        ///    <para>
+        ///       Too many open
+        ///       files.
+        ///    </para>
+        /// </devdoc>
+        WSAEMFILE              = (WSABASEERR+24),
+
+
+        /*
+         * Windows Sockets definitions of regular Berkeley error constants
+         */
+        /// <devdoc>
+        ///    <para>
+        ///       Resource temporarily unavailable.
+        ///    </para>
+        /// </devdoc>
+        WSAEWOULDBLOCK         = (WSABASEERR+35),
+        /// <devdoc>
+        ///    <para>
+        ///       Operation now in progress.
+        ///    </para>
+        /// </devdoc>
+        WSAEINPROGRESS         = (WSABASEERR+36),
+        /// <devdoc>
+        ///    <para>
+        ///       Operation already in progress.
+        ///    </para>
+        /// </devdoc>
+        WSAEALREADY            = (WSABASEERR+37),
+        /// <devdoc>
+        ///    <para>
+        ///       Socket operation on nonsocket.
+        ///    </para>
+        /// </devdoc>
+        WSAENOTSOCK            = (WSABASEERR+38),
+        /// <devdoc>
+        ///    <para>
+        ///       Destination address required.
+        ///    </para>
+        /// </devdoc>
+        WSAEDESTADDRREQ        = (WSABASEERR+39),
+        /// <devdoc>
+        ///    <para>
+        ///       Message too long.
+        ///    </para>
+        /// </devdoc>
+        WSAEMSGSIZE            = (WSABASEERR+40),
+        /// <devdoc>
+        ///    <para>
+        ///       Protocol wrong type for socket.
+        ///    </para>
+        /// </devdoc>
+        WSAEPROTOTYPE          = (WSABASEERR+41),
+        /// <devdoc>
+        ///    <para>
+        ///       Bad protocol option.
+        ///    </para>
+        /// </devdoc>
+        WSAENOPROTOOPT         = (WSABASEERR+42),
+        /// <devdoc>
+        ///    <para>
+        ///       Protocol not supported.
+        ///    </para>
+        /// </devdoc>
+        WSAEPROTONOSUPPORT     = (WSABASEERR+43),
+        /// <devdoc>
+        ///    <para>
+        ///       Socket type not supported.
+        ///    </para>
+        /// </devdoc>
+        WSAESOCKTNOSUPPORT     = (WSABASEERR+44),
+        /// <devdoc>
+        ///    <para>
+        ///       Operation not supported.
+        ///    </para>
+        /// </devdoc>
+        WSAEOPNOTSUPP          = (WSABASEERR+45),
+        /// <devdoc>
+        ///    <para>
+        ///       Protocol family not supported.
+        ///    </para>
+        /// </devdoc>
+        WSAEPFNOSUPPORT        = (WSABASEERR+46),
+        /// <devdoc>
+        ///    <para>
+        ///       Address family not supported by protocol family.
+        ///    </para>
+        /// </devdoc>
+        WSAEAFNOSUPPORT        = (WSABASEERR+47),
+        /// <devdoc>
+        ///    Address already in use.
+        /// </devdoc>
+        WSAEADDRINUSE          = (WSABASEERR+48),
+        /// <devdoc>
+        ///    <para>
+        ///       Cannot assign requested address.
+        ///    </para>
+        /// </devdoc>
+        WSAEADDRNOTAVAIL       = (WSABASEERR+49),
+        /// <devdoc>
+        ///    <para>
+        ///       Network is down.
+        ///    </para>
+        /// </devdoc>
+        WSAENETDOWN            = (WSABASEERR+50),
+        /// <devdoc>
+        ///    <para>
+        ///       Network is unreachable.
+        ///    </para>
+        /// </devdoc>
+        WSAENETUNREACH         = (WSABASEERR+51),
+        /// <devdoc>
+        ///    <para>
+        ///       Network dropped connection on reset.
+        ///    </para>
+        /// </devdoc>
+        WSAENETRESET           = (WSABASEERR+52),
+        /// <devdoc>
+        ///    <para>
+        ///       Software caused connection to abort.
+        ///    </para>
+        /// </devdoc>
+        WSAECONNABORTED        = (WSABASEERR+53),
+        /// <devdoc>
+        ///    <para>
+        ///       Connection reset by peer.
+        ///    </para>
+        /// </devdoc>
+        WSAECONNRESET          = (WSABASEERR+54),
+        /// <devdoc>
+        ///    No buffer space available.
+        /// </devdoc>
+        WSAENOBUFS             = (WSABASEERR+55),
+        /// <devdoc>
+        ///    <para>
+        ///       Socket is already connected.
+        ///    </para>
+        /// </devdoc>
+        WSAEISCONN             = (WSABASEERR+56),
+        /// <devdoc>
+        ///    <para>
+        ///       Socket is not connected.
+        ///    </para>
+        /// </devdoc>
+        WSAENOTCONN            = (WSABASEERR+57),
+        /// <devdoc>
+        ///    <para>
+        ///       Cannot send after socket shutdown.
+        ///    </para>
+        /// </devdoc>
+        WSAESHUTDOWN           = (WSABASEERR+58),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAETOOMANYREFS        = (WSABASEERR+59),
+        /// <devdoc>
+        ///    <para>
+        ///       Connection timed out.
+        ///    </para>
+        /// </devdoc>
+        WSAETIMEDOUT           = (WSABASEERR+60),
+        /// <devdoc>
+        ///    <para>
+        ///       Connection refused.
+        ///    </para>
+        /// </devdoc>
+        WSAECONNREFUSED        = (WSABASEERR+61),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAELOOP               = (WSABASEERR+62),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAENAMETOOLONG        = (WSABASEERR+63),
+        /// <devdoc>
+        ///    <para>
+        ///       Host is down.
+        ///    </para>
+        /// </devdoc>
+        WSAEHOSTDOWN           = (WSABASEERR+64),
+        /// <devdoc>
+        ///    <para>
+        ///       No route to host.
+        ///    </para>
+        /// </devdoc>
+        WSAEHOSTUNREACH        = (WSABASEERR+65),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAENOTEMPTY           = (WSABASEERR+66),
+        /// <devdoc>
+        ///    <para>
+        ///       Too many processes.
+        ///    </para>
+        /// </devdoc>
+        WSAEPROCLIM            = (WSABASEERR+67),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAEUSERS              = (WSABASEERR+68),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAEDQUOT              = (WSABASEERR+69),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAESTALE              = (WSABASEERR+70),
+        /// <devdoc>
+        ///    <para>
+        ///       [To be supplied.]
+        ///    </para>
+        /// </devdoc>
+        WSAEREMOTE             = (WSABASEERR+71),
+        /// <devdoc>
+        ///    <para>
+        ///       Graceful shutdown in progress.
+        ///    </para>
+        /// </devdoc>
+        WSAEDISCON             = (WSABASEERR+101),
+
+
+        /*
+         * Extended Windows Sockets error constant definitions
+         */
+        /// <devdoc>
+        ///    <para>
+        ///       Network subsystem is unavailable.
+        ///    </para>
+        /// </devdoc>
+        WSASYSNOTREADY         = (WSABASEERR+91),
+        /// <devdoc>
+        ///    <para>
+        ///       Winsock.dll out of range.
+        ///    </para>
+        /// </devdoc>
+        WSAVERNOTSUPPORTED     = (WSABASEERR+92),
+        /// <devdoc>
+        ///    <para>
+        ///       Successful startup not yet performed.
+        ///    </para>
+        /// </devdoc>
+        WSANOTINITIALISED      = (WSABASEERR+93),
+
+        /*
+         * Error return codes from gethostbyname() and gethostbyaddr()
+         *              = (when using the resolver). Note that these errors are
+         * retrieved via WSAGetLastError() and must therefore follow
+         * the rules for avoiding clashes with error numbers from
+         * specific implementations or language run-time systems.
+         * For this reason the codes are based at WSABASEERR+1001.
+         * Note also that [WSA]NO_ADDRESS is defined only for
+         * compatibility purposes.
+         */
+
+        /// <devdoc>
+        ///    <para>
+        ///       Host not found (Authoritative Answer: Host not found).
+        ///    </para>
+        /// </devdoc>
+        WSAHOST_NOT_FOUND      = (WSABASEERR+1001),
+        /// <devdoc>
+        ///    <para>
+        ///       Nonauthoritative host not found (Non-Authoritative: Host not found, or SERVERFAIL).
+        ///    </para>
+        /// </devdoc>
+        WSATRY_AGAIN           = (WSABASEERR+1002),
+        /// <devdoc>
+        ///    <para>
+        ///       This is a nonrecoverable error (Non recoverable errors, FORMERR, REFUSED, NOTIMP).
+        ///    </para>
+        /// </devdoc>
+        WSANO_RECOVERY         = (WSABASEERR+1003),
+        /// <devdoc>
+        ///    <para>
+        ///       Valid name, no data record of requested type.
+        ///    </para>
+        /// </devdoc>
+        WSANO_DATA             = (WSABASEERR+1004),
+        /// <devdoc>
+        ///    <para>
+        ///       No address, look for MX record.
+        ///    </para>
+        /// </devdoc>
+        WSANO_ADDRESS          = WSANO_DATA,
+    }
+
+
+}
diff --git a/base/Libraries/System.Net/Sockets/SocketFlags.cs b/base/Libraries/System.Net/Sockets/SocketFlags.cs
new file mode 100644
index 0000000..4ca755f
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SocketFlags.cs
@@ -0,0 +1,67 @@
+//------------------------------------------------------------------------------
+// <copyright file="SocketFlags.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    /// <devdoc>
+    ///    <para>
+    ///       Provides constant values for socket messages.
+    ///    </para>
+    /// </devdoc>
+    //UEUE
+
+    [Flags]
+    public enum SocketFlags {
+
+        /// <devdoc>
+        ///    <para>
+        ///       Use no flags for this call.
+        ///    </para>
+        /// </devdoc>
+        None                = 0x0000,
+
+        /// <devdoc>
+        ///    <para>
+        ///       Process out-of-band data.
+        ///    </para>
+        /// </devdoc>
+        OutOfBand           = 0x0001,
+
+        /// <devdoc>
+        ///    <para>
+        ///       Peek at incoming message.
+        ///    </para>
+        /// </devdoc>
+        Peek                = 0x0002,
+
+        /// <devdoc>
+        ///    <para>
+        ///       Send without using routing tables.
+        ///    </para>
+        /// </devdoc>
+        DontRoute           = 0x0004,
+
+        // see: http://as400bks.rochester.ibm.com/pubs/html/as400/v4r5/ic2978/info/apis/recvms.htm
+        MaxIOVectorLength   = 0x0010,
+
+        /// <devdoc>
+        ///    <para>
+        ///       Partial send or recv for message.
+        ///    </para>
+        /// </devdoc>
+
+        Truncated           = 0x0100,
+        ControlDataTruncated = 0x0200,
+        Broadcast           = 0x0400,
+        MultiCast           = 0x0800,
+
+
+        Partial             = 0x8000,
+
+    }; // enum SocketFlags
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/SocketOptionLevel.cs b/base/Libraries/System.Net/Sockets/SocketOptionLevel.cs
new file mode 100644
index 0000000..da9303b
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SocketOptionLevel.cs
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// <copyright file="SocketOptionLevel.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    //
+    // Option flags per-socket.
+    //
+
+    /// <devdoc>
+    ///    <para>
+    ///       Defines socket option levels for the <see cref='System.Net.Sockets.Socket'/> class.
+    ///    </para>
+    /// </devdoc>
+    //UEUE
+    public enum SocketOptionLevel {
+
+        /// <devdoc>
+        ///    <para>
+        ///       Indicates socket options apply to the socket itself.
+        ///    </para>
+        /// </devdoc>
+        Socket = 0xffff,
+
+        /// <devdoc>
+        ///    <para>
+        ///       Indicates socket options apply to IP sockets.
+        ///    </para>
+        /// </devdoc>
+        IP = ProtocolType.IP,
+
+        /// <devdoc>
+        /// <para>
+        /// Indicates socket options apply to IPv6 sockets.
+        /// </para>
+        /// </devdoc>
+        IPv6 = ProtocolType.IPv6,
+
+        /// <devdoc>
+        ///    <para>
+        ///       Indicates socket options apply to Tcp sockets.
+        ///    </para>
+        /// </devdoc>
+        Tcp = ProtocolType.Tcp,
+
+        /// <devdoc>
+        /// <para>
+        /// Indicates socket options apply to Udp sockets.
+        /// </para>
+        /// </devdoc>
+        //UEUE
+        Udp = ProtocolType.Udp,
+
+    }; // enum SocketOptionLevel
+
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/SocketOptionName.cs b/base/Libraries/System.Net/Sockets/SocketOptionName.cs
new file mode 100644
index 0000000..faf8b23
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SocketOptionName.cs
@@ -0,0 +1,309 @@
+//------------------------------------------------------------------------------
+// <copyright file="SocketOptionName.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    //
+    // Option names per-socket.
+    //
+
+    /// <devdoc>
+    ///    <para>
+    ///       Defines socket option names for the <see cref='System.Net.Sockets.Socket'/> class.
+    ///    </para>
+    /// </devdoc>
+    //UEUE
+    public enum SocketOptionName {
+
+        //
+        // good for SocketOptionLevel.Socket
+        //
+
+        /// <devdoc>
+        ///    <para>Record debugging information.</para>
+        /// </devdoc>
+        Debug                   = 0x0001,           // turn on debugging info recording
+        /// <devdoc>
+        ///    <para>Socket is listening.</para>
+        /// </devdoc>
+        AcceptConnection        = 0x0002,           // socket has had listen()
+        /// <devdoc>
+        ///    <para>
+        ///       Allows the socket to be bound to an address that is already in use.
+        ///    </para>
+        /// </devdoc>
+        ReuseAddress            = 0x0004,           // allow local address reuse
+        /// <devdoc>
+        ///    <para>
+        ///       Send keep-alives.
+        ///    </para>
+        /// </devdoc>
+        KeepAlive               = 0x0008,           // keep connections alive
+        /// <devdoc>
+        ///    <para>
+        ///       Do not route, send directly to interface addresses.
+        ///    </para>
+        /// </devdoc>
+        DontRoute               = 0x0010,           // just use interface addresses
+        /// <devdoc>
+        ///    <para>
+        ///       Permit sending broadcast messages on the socket.
+        ///    </para>
+        /// </devdoc>
+        Broadcast               = 0x0020,           // permit sending of broadcast msgs
+        /// <devdoc>
+        ///    <para>
+        ///       Bypass hardware when possible.
+        ///    </para>
+        /// </devdoc>
+        UseLoopback             = 0x0040,           // bypass hardware when possible
+        /// <devdoc>
+        ///    <para>
+        ///       Linger on close if unsent data is present.
+        ///    </para>
+        /// </devdoc>
+        Linger                  = 0x0080,           // linger on close if data present
+        /// <devdoc>
+        ///    <para>
+        ///       Receives out-of-band data in the normal data stream.
+        ///    </para>
+        /// </devdoc>
+        OutOfBandInline         = 0x0100,           // leave received OOB data in line
+        /// <devdoc>
+        ///    <para>
+        ///       Close socket gracefully without lingering.
+        ///    </para>
+        /// </devdoc>
+        DontLinger              = 0xFF7F,           // ~Linger
+        /// <devdoc>
+        ///    <para>
+        ///       Enables a socket to be bound for exclusive access.
+        ///    </para>
+        /// </devdoc>
+        ExclusiveAddressUse     = 0xFFFB,           // ~ReuseAddress; disallow local address reuse
+        /// <devdoc>
+        ///    <para>
+        ///       Specifies the total per-socket buffer space reserved for sends. This is
+        ///       unrelated to the maximum message size or the size of a TCP window.
+        ///    </para>
+        /// </devdoc>
+        SendBuffer              = 0x1001,           // send buffer size
+        /// <devdoc>
+        ///    <para>
+        ///       Send low water mark.
+        ///    </para>
+        /// </devdoc>
+        ReceiveBuffer           = 0x1002,           // receive buffer size
+        /// <devdoc>
+        ///    <para>
+        ///       Specifies the total per-socket buffer space reserved for receives. This is unrelated to the maximum message size or the size of a TCP window.
+        ///    </para>
+        /// </devdoc>
+        SendLowWater            = 0x1003,           // send low-water mark
+        /// <devdoc>
+        ///    <para>
+        ///       Receive low water mark.
+        ///    </para>
+        /// </devdoc>
+        ReceiveLowWater         = 0x1004,           // receive low-water mark
+        /// <devdoc>
+        ///    <para>
+        ///       Send timeout.
+        ///    </para>
+        /// </devdoc>
+        SendTimeout             = 0x1005,           // send timeout
+        /// <devdoc>
+        ///    <para>
+        ///       Receive timeout.
+        ///    </para>
+        /// </devdoc>
+        ReceiveTimeout         = 0x1006,           // receive timeout
+        /// <devdoc>
+        ///    <para>
+        ///       Get error status and clear.
+        ///    </para>
+        /// </devdoc>
+        Error                   = 0x1007,          // get error status and clear
+        /// <devdoc>
+        ///    <para>
+        ///       Get socket type.
+        ///    </para>
+        /// </devdoc>
+        Type                    = 0x1008,           // get socket type
+        /// <devdoc>
+        ///    <para>
+        ///       Maximum queue length that can be specified by <see cref='System.Net.Sockets.Socket.Listen'/>.
+        ///    </para>
+        /// </devdoc>
+        MaxConnections          = 0x7fffffff,       // Maximum queue length specifiable by listen.
+
+
+        //
+        // the following values are taken from ws2tcpip.h,
+        // note that these are understood only by ws2_32.dll and are not backwards compatible
+        // with the values found in winsock.h which are understood by wsock32.dll.
+        //
+
+        //
+        // good for SocketOptionLevel.IP
+        //
+
+        /// <devdoc>
+        ///    <para>
+        ///       IP options.
+        ///    </para>
+        /// </devdoc>
+        IPOptions               = 1,
+        /// <devdoc>
+        ///    <para>
+        ///       Header is included with data.
+        ///    </para>
+        /// </devdoc>
+        HeaderIncluded          = 2,
+        /// <devdoc>
+        ///    <para>
+        ///       IP type of service and preced.
+        ///    </para>
+        /// </devdoc>
+        TypeOfService           = 3,
+        /// <devdoc>
+        ///    <para>
+        ///       IP time to live.
+        ///    </para>
+        /// </devdoc>
+        IpTimeToLive            = 4,
+        /// <devdoc>
+        ///    <para>
+        ///       IP multicast interface.
+        ///       - Additional comments by mbolien:
+        ///         multicast interface  You provide it with an SOCKADDR_IN, and that tells the
+        ///         system that it should receive multicast messages on that interface (if you
+        ///         have more than one interface).  Binding the socket is not sufficient, since
+        ///         if the Ethernet hardware isn't set up to grab the multicast packets, it won't
+        ///         do good to bind the socket.  Kinda like raw sockets.  Unless you
+        ///         put the Ethernet card in promiscuous mode, you'll only get stuff sent to and
+        ///         from your machine.
+        ///    </para>
+        /// </devdoc>
+        MulticastInterface      = 9,
+        /// <devdoc>
+        ///    <para>
+        ///       IP multicast time to live.
+        ///    </para>
+        /// </devdoc>
+        MulticastTimeToLive     = 10,
+        /// <devdoc>
+        ///    <para>
+        ///       IP Multicast loopback.
+        ///    </para>
+        /// </devdoc>
+        MulticastLoopback       = 11,
+        /// <devdoc>
+        ///    <para>
+        ///       Add an IP group membership.
+        ///    </para>
+        /// </devdoc>
+        AddMembership           = 12,
+        /// <devdoc>
+        ///    <para>
+        ///       Drop an IP group membership.
+        ///    </para>
+        /// </devdoc>
+        DropMembership          = 13,
+        /// <devdoc>
+        ///    <para>
+        ///       Don't fragment IP datagrams.
+        ///    </para>
+        /// </devdoc>
+        DontFragment            = 14,
+        /// <devdoc>
+        ///    <para>
+        ///       Join IP group/source.
+        ///    </para>
+        /// </devdoc>
+        AddSourceMembership     = 15,
+        /// <devdoc>
+        ///    <para>
+        ///       Leave IP group/source.
+        ///    </para>
+        /// </devdoc>
+        DropSourceMembership    = 16,
+        /// <devdoc>
+        ///    <para>
+        ///       Block IP group/source.
+        ///    </para>
+        /// </devdoc>
+        BlockSource             = 17,
+        /// <devdoc>
+        ///    <para>
+        ///       Unblock IP group/source.
+        ///    </para>
+        /// </devdoc>
+        UnblockSource           = 18,
+        /// <devdoc>
+        ///    <para>
+        ///       Receive packet information for ipv4.
+        ///    </para>
+        /// </devdoc>
+        PacketInformation       = 19,
+
+
+        //
+        //good for ipv6
+        //
+
+        HopLimit = 21,            //IPV6_HOPLIMIT
+
+        IPv6ProtectionLevel = 23,     //IPV6_PROTECTION_LEVEL
+
+        // values for ProtectionLevel that may need an enum.
+        //#define PROTECTION_LEVEL_UNRESTRICTED  10  /* For peer-to-peer apps */
+        //#define PROTECTION_LEVEL_DEFAULT       20  /* Default level         */
+        //#define PROTECTION_LEVEL_RESTRICTED    30  /* For Intranet apps     */
+
+
+
+        //
+        // good for SocketOptionLevel.Tcp
+        //
+
+        /// <devdoc>
+        ///    <para>
+        ///       Disables the Nagle algorithm for send coalescing.
+        ///    </para>
+        /// </devdoc>
+        NoDelay                 = 1,
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        BsdUrgent               = 2,
+        Expedited               = 2,
+
+
+        //
+        // good for SocketOptionLevel.Udp
+        //
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        NoChecksum              = 1,
+        /// <devdoc>
+        ///    <para>
+        ///       Udp-Lite checksum coverage.
+        ///    </para>
+        /// </devdoc>
+        ChecksumCoverage        = 20,
+
+        UpdateAcceptContext = 0x700B,
+
+        UpdateConnectContext = 0x7010,
+
+    }; // enum SocketOptionName
+
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/SocketShutdown.cs b/base/Libraries/System.Net/Sockets/SocketShutdown.cs
new file mode 100644
index 0000000..7305899
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SocketShutdown.cs
@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <copyright file="SocketShutdown.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+    using System;
+
+    /// <devdoc>
+    ///    <para>
+    ///       Defines constants used by the <see cref='System.Net.Sockets.Socket.Shutdown'/> method.
+    ///    </para>
+    /// </devdoc>
+    public enum SocketShutdown {
+        /// <devdoc>
+        ///    <para>
+        ///       Shutdown sockets for receive.
+        ///    </para>
+        /// </devdoc>
+        Receive   = 0x00,
+        /// <devdoc>
+        ///    <para>
+        ///       Shutdown socket for send.
+        ///    </para>
+        /// </devdoc>
+        Send      = 0x01,
+        /// <devdoc>
+        ///    <para>
+        ///       Shutdown socket for both send and receive.
+        ///    </para>
+        /// </devdoc>
+        Both      = 0x02,
+
+    }; // enum SocketShutdown
+
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/SocketType.cs b/base/Libraries/System.Net/Sockets/SocketType.cs
new file mode 100644
index 0000000..4115a84
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/SocketType.cs
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+// <copyright file="SocketType.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Net.Sockets {
+
+    /// <devdoc>
+    ///    <para>
+    ///       Specifies the type of socket an instance of the <see cref='System.Net.Sockets.Socket'/> class represents.
+    ///    </para>
+    /// </devdoc>
+    public enum SocketType {
+
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Stream      = 1,    // stream socket
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Dgram       = 2,    // datagram socket
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Raw         = 3,    // raw-protocol interface
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Rdm         = 4,    // reliably-delivered message
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Seqpacket   = 5,    // sequenced packet stream
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        Unknown     = -1,   // Unknown socket type
+
+    } // enum SocketType
+
+} // namespace System.Net.Sockets
diff --git a/base/Libraries/System.Net/Sockets/TcpSocket.cs b/base/Libraries/System.Net/Sockets/TcpSocket.cs
new file mode 100644
index 0000000..f315e14
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/TcpSocket.cs
@@ -0,0 +1,1009 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpSocket.cs
+//
+//  Note:
+//    This is a port of the System.Net.Sockets.Socket class to Singularity.
+//    Currently, it only supports TCP sockets.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.Contracts;
+
+namespace System.Net.Sockets
+{
+    internal class TcpSocket : InternalSocket
+    {
+        // This can be NULL if the channel has been discarded.
+        private TRef<TcpConnectionContract.Imp:ReadyState> m_Conn;
+
+        private IPEndPoint m_LocalEndPoint; // Strictly a cache; may be null
+        private IPEndPoint m_RemoteEndPoint; // Strictly a cache; may be null
+
+        // Data arrives from the netstack in discrete packets; in order to
+        // adapt this to the socket interface, we keep a buffer of data
+        // that has been read from the NetStack but not passed off to
+        // the user.
+        private TrackedBytesBuffer m_DataBuffer;
+
+        // NOTE not sure what error to specify when an operation
+        // is not allowed by the current socket state; this is the value
+        // I use. Change it if it's inappropriate
+        private const int BAD_SOCKET_STATE_ERR = (int)SocketErrors.WSAEOPNOTSUPP;
+
+        // ================== Private Methods ==================
+
+        // Returns true if the channel is in one of the three connected states
+        // (connected, ReceiveOnly, SendOnly)
+        private bool IsConnected(TcpConnectionContract.Imp! conn)
+        {
+            return (conn.InState(TcpConnectionContract.Connected.Value) ||
+                    conn.InState(TcpConnectionContract.ReceiveOnly.Value) ||
+                    conn.InState(TcpConnectionContract.SendOnly.Value));
+        }
+#if !SPL 
+        // Returns true if the channel allows writing
+        private bool CanWrite(TcpConnectionContract.Imp! conn) {
+            if (conn.InState(TcpConnectionContract.Connected.Value)) {
+                return true;  
+            }
+            else  if(conn.InState(TcpConnectionContract.SendOnly.Value)) {
+                return true; 
+            }
+            if(conn.InState(TcpConnectionContract.ReceiveOnly.Value)) {
+//                DebugStub.Break();
+                return false; 
+            }
+            if(conn.InState(TcpConnectionContract.ReadyState.Value)) {
+                DebugStub.Break();
+                return false; 
+            }
+            if(conn.InState(TcpConnectionContract.Listening.Value)) {
+                DebugStub.Break();
+                return false; 
+            }
+           return false; 
+        }
+#else
+        // Returns true if the channel allows writing
+        private bool CanWrite(TcpConnectionContract.Imp! conn)
+        {
+            return (conn.InState(TcpConnectionContract.Connected.Value) ||
+                    conn.InState(TcpConnectionContract.SendOnly.Value));
+        }
+#endif 
+        // Returns true if the channel allows reading
+        private bool CanRead(TcpConnectionContract.Imp! conn)
+        {
+            return (conn.InState(TcpConnectionContract.Connected.Value) ||
+                    conn.InState(TcpConnectionContract.ReceiveOnly.Value));
+        }
+
+        // Returns the channel or throws a BAD_SOCKET_STATE_ERR error
+        private TcpConnectionContract.Imp! GetChannelOrThrow()
+        {
+            if (m_Conn == null) {
+                throw new SocketException(BAD_SOCKET_STATE_ERR);
+            }
+            else {
+                return m_Conn.Acquire();
+            }
+        }
+
+        // Release the previously-acquired channel
+        private void ReleaseChannel([Claims]TcpConnectionContract.Imp! conn)
+        {
+            m_Conn.Release(conn);
+        }
+
+        //
+        // Returns false if we are in an inappropriate state to retrieve the
+        // local endpoint
+        //
+        private bool GetLocalEndPoint(out uint localIP, out ushort localPort)
+        {
+            localIP = 0;
+            localPort = 0;
+
+            TcpConnectionContract.Imp! conn = GetChannelOrThrow();
+
+            try
+            {
+                // We need to be connected or listening to retrieve the local
+                // endpoint
+                if ((!conn.InState(TcpConnectionContract.Listening.Value)) &&
+                    (!IsConnected(conn)))
+                {
+                    return false;
+                }
+
+                conn.SendGetLocalAddress();
+                conn.RecvIPAddress(out localIP);
+                conn.SendGetLocalPort();
+                conn.RecvPort(out localPort);
+                return true;
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        //
+        // Returns false if we are in an inappropriate state to retrieve the
+        // remote endpoint
+        //
+        private bool GetRemoteEndPoint(out uint localIP, out ushort localPort)
+        {
+            localIP = 0;
+            localPort = 0;
+
+            TcpConnectionContract.Imp! conn = GetChannelOrThrow();
+
+            try
+            {
+                // Need to be connected for the remote endpoint to be defined
+                if (!IsConnected(conn))
+                {
+                    return false;
+                }
+
+                conn.SendGetRemoteAddress();
+                conn.RecvIPAddress(out localIP);
+                conn.SendGetRemotePort();
+                conn.RecvPort(out localPort);
+                return true;
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        // Reads as much as possible without blocking, tack it onto dataBuffer.
+        // We will block for a MAXIMUM of the time specified by "microSeconds".
+        // Returns true if future read operations are permissible, false if
+        // the data stream has ended
+        private bool DrainDataNonBlock(TcpConnectionContract.Imp! conn,
+                                       TrackedBytesBuffer! dataBuffer,
+                                       int microSeconds)
+        {
+            bool keepTrying = true;
+            int timeToSleep = microSeconds;
+
+            while (keepTrying)
+            {
+                keepTrying = false; // defensive
+                conn.SendPollRead(timeToSleep);
+
+                switch receive
+                {
+                    case conn.Data(byte[]! in ExHeap readData) :
+                        // Tack this onto the data buffer. Data is consumed by AddToTail()
+                        dataBuffer.AddToTail(readData);
+
+                        // Keep trying, but don't sleep. We do this strictly to
+                        // drain off any additional data, since currently the
+                        // netStack hands data to us in packet-sized chunks,
+                        // which means it may have additional data ready if you
+                        // ask it again.
+                        keepTrying = true;
+                        timeToSleep = 0;
+                        break;
+
+                    case conn.NoData() :
+                        // done
+                        return true;
+                        break;
+
+                    case conn.NoMoreData() :
+                        return false;
+                        break;
+
+                    case conn.ConnectionClosed() :
+                        return false;
+                        break;
+                }
+            }
+
+            // Should never get here
+            return true;
+        }
+
+        // Makes a round-trip to the NetStack to pull in as much data as
+        // possible, only blocking as long as is specified by the
+        // microSeconds argument (this can be zero). Reports the new
+        // amount of data in our internal buffer.
+        private int GetAvailableBytes(int microSeconds)
+        {
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            try
+            {
+                if (CanRead(conn))
+                {
+                    // Drain as much data from the netstack as possible
+                    DrainDataNonBlock(conn, m_DataBuffer, microSeconds);
+                }
+
+                return m_DataBuffer.Count;
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        // Performs a single blocking read to the netstack, and adds data
+        // to dataBuffer.
+        // Returns true if future read operations are permissible; false
+        // if the data stream has ended.
+        private bool BlockingRead(TcpConnectionContract.Imp! conn, TrackedBytesBuffer! dataBuffer)
+        {
+            conn.SendRead();
+
+            switch receive
+            {
+                case conn.Data(byte[]! in ExHeap readData) :
+                    // Tack this onto the data buffer. Data is consumed by AddToTail.
+                    dataBuffer.AddToTail(readData);
+                    return true;
+                    break;
+
+                case conn.NoMoreData() :
+                    return false;
+                    break;
+
+                case conn.ConnectionClosed() :
+                    return false;
+                    break;
+            }
+        }
+
+        private void Initialize([Claims] TcpConnectionContract.Imp:ReadyState! conn)
+        {
+            // Stash the endpoint into our field
+            m_Conn = new TRef<TcpConnectionContract.Imp:ReadyState>(conn);
+
+            // Create an empty data buffer...
+            m_DataBuffer = new TrackedBytesBuffer();
+        }
+
+        [NotDelayed]
+        private TcpSocket([Claims] TcpConnectionContract.Imp:ReadyState! conn)
+        {
+            Initialize(conn);
+        }
+
+        // ================== Internal Methods ==================
+
+        [NotDelayed]
+        internal TcpSocket()
+        {
+            // Connect to the Tcp module
+            TcpContract.Imp! impConn;
+            TcpContract.Exp! expConn;
+            TcpContract.NewChannel(out impConn, out expConn);
+            DirectoryServiceContract.Imp! epNS = DirectoryService.NewClientEndpoint();
+
+            try
+            {
+                epNS.SendBind(Bitter.FromString2(TcpContract.ModuleName), expConn);
+
+                switch receive
+                {
+                    case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                        // failure
+                        if (rejectedEP != null) {
+                            delete rejectedEP;
+                        }
+                        throw new SocketException(SocketErrors.WSASYSNOTREADY);
+                        break;
+
+                    case epNS.AckBind() :
+                        impConn.RecvReady();
+                        // success
+                        break;
+                }
+            }
+            finally
+            {
+                delete epNS;
+            }
+
+            try
+            {
+                // Create a new Tcp connection
+                TcpConnectionContract.Exp! tcpExpConn;
+                TcpConnectionContract.Imp! tcpImpConn;
+
+                TcpConnectionContract.NewChannel(out tcpImpConn, out tcpExpConn);
+                impConn.SendCreateTcpSession(tcpExpConn);
+                impConn.RecvAck();
+
+                // Confirm that the channel is wired up
+                tcpImpConn.RecvReady();
+
+                Initialize(tcpImpConn);
+            }
+            finally
+            {
+                delete impConn;
+            }
+        }
+
+        internal override void Dispose()
+        {
+            if (m_Conn != null) {
+                TcpConnectionContract.Imp conn = m_Conn.Acquire();
+                delete conn;
+                m_Conn = null;
+            }
+        }
+
+        internal override InternalSocket Accept()
+        {
+            // We need to be in the listening state
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            try
+            {
+                if (!conn.InState(TcpConnectionContract.Listening.Value))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                TcpConnectionContract.Exp! newExpConn;
+                TcpConnectionContract.Imp! newImpConn;
+                // Make sure to create the new channel in the connected
+                // state!
+                TcpConnectionContract.NewChannel(out newImpConn, out newExpConn,
+                                                 TcpConnectionContract.PreConnected.Value);
+
+                conn.SendAccept(newExpConn);
+                conn.RecvOK(); // BLOCKS
+
+                // Receive the confirmation message that the new channel
+                // is established
+                newImpConn.RecvReady();
+
+                return new TcpSocket(newImpConn);
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        internal override void Bind(EndPoint localEP)
+        {
+            if (localEP == null)
+            {
+                throw new ArgumentNullException("localEP");
+            }
+
+            IPEndPoint ep = localEP as IPEndPoint;
+
+            if (ep == null)
+            {
+                // Illegal argument
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            // Make sure we're in the ReadyState state
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            try
+            {
+                if (!conn.InState(TcpConnectionContract.ReadyState.Value))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                conn.SendBindLocalEndPoint((uint) ep.Address.m_addr,
+                                           (ushort) ep.Port);
+                switch receive
+                {
+                    case conn.OK() :
+                        // success!
+                        break;
+                    case conn.InvalidEndPoint() :
+                        throw new SocketException(SocketErrors.WSAEADDRNOTAVAIL);
+                        break;
+                }
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        internal override void Close()
+        {
+            // NOTE we should add support for the SO_DONTLINGER and SO_LINGER
+            // socket options, and then call either Close() or Abort() on our underlying
+            // channel. We will also need to add support for sleeping-close to the
+            // NetStack to support nonzero SO_LINGER values.
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            // Need to be listening, connected or zombied to close
+            if ((!conn.InState(TcpConnectionContract.ReadyState.Value)) &&
+                (!conn.InState(TcpConnectionContract.Listening.Value)) &&
+                (!IsConnected(conn)) &&
+                (!conn.InState(TcpConnectionContract.Zombie.Value)))
+            {
+                ReleaseChannel(conn);
+                throw new SocketException(BAD_SOCKET_STATE_ERR);
+            }
+            else
+            {
+                conn.SendClose();
+                ReleaseChannel(conn);
+                Dispose(); // This discards the channel
+            }
+        }
+
+        internal override void Connect(EndPoint remoteEP)
+        {
+            if (remoteEP == null)
+            {
+                throw new ArgumentNullException("remoteEP");
+            }
+
+            IPEndPoint ep = remoteEP as IPEndPoint;
+
+            if (ep == null)
+            {
+                // Illegal argument
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            if ((!conn.InState(TcpConnectionContract.ReadyState.Value)) &&
+                (!conn.InState(TcpConnectionContract.Bound.Value)))
+            {
+                // Need to be in the ReadyState or Bound state to issue
+                // a Connect
+                throw new SocketException(BAD_SOCKET_STATE_ERR);
+            }
+
+            try
+            {
+                conn.SendConnect((uint)ep.Address.m_addr,
+                                 unchecked((ushort)ep.Port));
+
+                switch receive
+                {
+                    case conn.CouldNotConnect(TcpError error) :
+                        string message = TcpException.GetMessageForTcpError(error);
+                        throw new TcpException(error, String.Format("A TCP connection could not be established to endpoint {0}.  {1}",
+                            remoteEP.ToString(), message));
+
+                    case conn.OK() :
+                        // Success
+                        break;
+                }
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        /*
+        public object GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public void GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, byte[] optionValue)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public byte[] GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, int optionLength)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+        */
+
+        internal override void Listen(int backlog)
+        {
+            // We have to be in the Bound state to Listen
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            if (!conn.InState(TcpConnectionContract.Bound.Value))
+            {
+                throw new SocketException(BAD_SOCKET_STATE_ERR);
+            }
+
+            try
+            {
+                conn.SendListen(backlog);
+
+                switch receive
+                {
+                    case conn.CouldNotListen() :
+                        throw new SocketException(SocketErrors.SocketError);
+                        break;
+
+                    case conn.OK() :
+                        // Success
+                        break;
+                }
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        internal override bool Poll(int microSeconds, SelectMode mode)
+        {
+            switch(mode)
+            {
+                //
+                // For SelectRead, return true iff:
+                //    Listen has been called and a connection is pending, OR
+                //    Data is available for reading, OR
+                //    The connection has been closed, reset, or terminated
+                //
+                case SelectMode.SelectRead :
+                    {
+                        TcpConnectionContract.Imp conn = GetChannelOrThrow();
+                        bool isClosed, sessionsWaiting = false;
+
+                        try
+                        {                            // First check if our channel is in the Closed state
+                            isClosed = conn.InState(TcpConnectionContract.Closed.Value);
+
+                            // Now check if there are sessions available for Accept()
+                            if (conn.InState(TcpConnectionContract.Listening.Value))
+                            {
+                                conn.SendIsSessionAvailable();
+                                conn.RecvSessionIsAvailable(out sessionsWaiting);
+                            }
+                        }
+                        finally
+                        {
+                            ReleaseChannel(conn);
+                        }
+
+                        int dataAvailable = 0;
+
+                        try
+                        {
+                            dataAvailable = GetAvailableBytes(microSeconds);
+                        }
+                        catch(Exception)
+                        {
+                            // Swallow any exceptions here
+                        }
+
+                        return ((dataAvailable > 0) || isClosed || sessionsWaiting);
+                    }
+                    break;
+
+                //
+                // For SelectWrite, return true iff:
+                //    An asynchronous Connect has succeeded, OR
+                //    Data can be sent
+                //
+                case SelectMode.SelectWrite :
+                    {
+                        bool isConnected = false;
+
+                        try
+                        {
+                            isConnected = Connected;
+                        }
+                        catch (Exception)
+                        {
+                            // swallow everything
+                        }
+
+                        // We don't currently support async operations,
+                        // so just indicate true if we are connected (meaning
+                        // we can send data)
+                        return isConnected;
+                    }
+                    break;
+
+                //
+                // For SelectError, return true iff:
+                //    An asynchronous Connect has failed
+                //    OutOfBandInline is not set, and out-of-band data is available.
+                //
+                case SelectMode.SelectError :
+                    // We don't support any of the requisite operations
+                    return false;
+                    break;
+            }
+
+            // never get here
+            Debug.Assert(false);
+            return false;
+        }
+
+        internal override int Receive(byte[]!     buffer,
+                                      int         offset,
+                                      int         size,
+                                      SocketFlags socketFlags)
+        {
+            if ((socketFlags != SocketFlags.None) &&
+                (socketFlags != SocketFlags.Peek))
+            {
+                // Invalid flags for this operation
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            if (buffer==null)
+            {
+                throw new ArgumentNullException("buffer");
+            }
+
+            if (offset<0 || offset > buffer.Length)
+            {
+                throw new ArgumentOutOfRangeException("offset");
+            }
+            if (size<0 || size > buffer.Length - offset)
+            {
+                throw new ArgumentOutOfRangeException("size");
+            }
+
+            bool fPeek = ((int)socketFlags & (int)SocketFlags.Peek) != 0;
+
+            // If we can satisfy the read request from our internal buffer, just
+            // do that and we're done.
+            if (size <= m_DataBuffer.Count)
+            {
+                int copied = m_DataBuffer.CopyFromHead(buffer, offset, size, fPeek);
+                Debug.Assert(copied == size);
+                return size;
+            }
+
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            try
+            {
+                int dataCount = m_DataBuffer.Count;
+
+                if (!CanRead(conn))
+                {
+                    // The channel doesn't support reading anymore.
+
+                    if (dataCount > 0)
+                    {
+                        // There's some residual data in our buffer.
+                        m_DataBuffer.CopyFromHead(buffer, offset, dataCount, fPeek);
+                    }
+
+                    return dataCount;
+                }
+
+                // We're in the connected state, but we don't have as much
+                // data as the reader would like already available. Take
+                // this opportunity to drain off as much as possible from
+                // the Netstack below us.
+                bool canReadAgain = DrainDataNonBlock(conn, m_DataBuffer, 0);
+                dataCount = m_DataBuffer.Count;
+
+                if (!canReadAgain)
+                {
+                    // The connection went away!
+                    if (dataCount == 0)
+                    {
+                        // At the beginning of this call, the socket was
+                        // readable, but now it's not. So the data
+                        // stream has just ended. Signal this to the caller
+                        // with a zero-size completion.
+                        // If the caller tries to Receive() again, they'll
+                        // get an exception.
+                        return 0;
+                    }
+                    // else return some data below
+                }
+
+                if (dataCount > 0)
+                {
+                    // Return as much as possible, even if the data stream
+                    // has ended
+                    int countToReturn = (size > dataCount) ? dataCount : size;
+                    m_DataBuffer.CopyFromHead(buffer, offset, countToReturn, fPeek);
+                    return countToReturn;
+                }
+                else
+                {
+                    // There's no data at all, but we can still read. Block.
+                    canReadAgain = BlockingRead(conn, m_DataBuffer);
+                    dataCount = m_DataBuffer.Count;
+
+                    if (!canReadAgain)
+                    {
+                        if (dataCount == 0)
+                        // See comment above
+                        { return 0; }
+                        // else return some data below
+                    }
+
+                    // We did a blocking read and were told that future reads
+                    // are permissible. It wouldn't make sense to not have
+                    // received some data at this point.
+                    Debug.Assert(dataCount > 0);
+
+                    // Return as much as possible.
+                    int countToReturn = (size > dataCount) ? dataCount : size;
+                    m_DataBuffer.CopyFromHead(buffer, offset, countToReturn, fPeek);
+                    return countToReturn;
+                }
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        internal override int ReceiveFrom(byte[]!     buffer,
+                                          int         offset,
+                                          int         size,
+                                          SocketFlags socketFlags,
+                                          ref EndPoint remoteEP)
+        {
+            int recvBytes = Receive(buffer, offset, size, socketFlags);
+            remoteEP = RemoteEndPoint;
+            return recvBytes;
+        }
+
+        /*
+        public static void Select(IList checkRead, IList checkWrite, IList checkError, int microSeconds)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+        */
+
+        internal override int Send([Claims] byte[]! in ExHeap data,
+                                   SocketFlags socketFlags)
+        {
+            int byteCount = data.Length;
+
+            if (byteCount == 0) {
+                // This shoudn't really happen, obviously
+                delete data;
+                return 0;
+            }
+
+            if (socketFlags != SocketFlags.None)
+            {
+                // Invalid flags for this operation
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            try
+            {
+                if (!CanWrite(conn))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                conn.SendWrite(data); // Give away data
+
+                switch receive
+                {
+                    case conn.OK() :
+                        // Success
+                        return byteCount;
+                        break;
+
+                    case conn.CantSend() :
+                        // uh oh
+                        throw new SocketException(SocketErrors.WSAENOTCONN);
+                    break;
+                }
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        internal override int Send(byte[]!     buffer,
+                                   int         offset,
+                                   int         size,
+                                   SocketFlags socketFlags)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException("buffer");
+            }
+
+            if (offset < 0 || offset > buffer.Length)
+            {
+                throw new ArgumentOutOfRangeException("offset");
+            }
+
+            if (size < 0 || size > buffer.Length - offset)
+            {
+                throw new ArgumentOutOfRangeException("size");
+            }
+
+            // Copy the data into the shared heap
+            byte[]! in ExHeap dataToWrite = Bitter.FromByteArray(buffer, offset, size);
+            return Send(dataToWrite, socketFlags);
+        }
+
+        internal override int SendTo(byte[]!     buffer,
+                                     int         offset,
+                                     int         size,
+                                     SocketFlags socketFlags,
+                                     EndPoint    remoteEP)
+        {
+            return Send(buffer, offset, size, socketFlags);
+        }
+
+        /*
+        public void SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, int optionValue)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public void SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, byte[] optionValue)
+        {
+            // TODO
+            throw new NotSupportedException();
+        }
+
+        public void SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, bool optionValue)
+        {
+            SetSocketOption(optionLevel, optionName, (optionValue?1:0));
+        }
+        */
+
+        internal override void Shutdown(SocketShutdown how)
+        {
+            TcpConnectionContract.Imp conn = GetChannelOrThrow();
+
+            try
+            {
+                if ((how == SocketShutdown.Both) ||
+                    (how == SocketShutdown.Receive))
+                {
+                    if (!CanRead(conn))
+                    {
+                        // Can't shut down reading if it's not currently allowed
+                        throw new SocketException(BAD_SOCKET_STATE_ERR);
+                    }
+
+                    conn.SendDoneReceiving();
+                }
+
+                if ((how == SocketShutdown.Both) ||
+                    (how == SocketShutdown.Send))
+                {
+                    if (!CanWrite(conn))
+                    {
+                        // Can't shut down writing if it's not currently allowed
+                        throw new SocketException(BAD_SOCKET_STATE_ERR);
+                    }
+
+                    conn.SendDoneSending();
+                }
+            }
+            finally
+            {
+                ReleaseChannel(conn);
+            }
+        }
+
+        // ================== Properties ==================
+
+        //
+        // NOTE Many of these are hard-coded for now since we only support
+        // IPv4 Tcp streams.
+        //
+
+        internal override int Available {
+            get {
+                return GetAvailableBytes(0); // Don't sleep at all
+            }
+         }
+
+        internal override EndPoint LocalEndPoint {
+            get {
+                if (m_LocalEndPoint == null)
+                {
+                    uint ipAddr;
+                    ushort port;
+
+                    if (!GetLocalEndPoint(out ipAddr, out port))
+                    {
+                        return null;
+                    }
+
+                    m_LocalEndPoint = new IPEndPoint(ipAddr, port);
+                }
+
+                return m_LocalEndPoint;
+            }
+        }
+
+        internal override EndPoint RemoteEndPoint {
+            get {
+                if (m_RemoteEndPoint == null)
+                {
+                    uint ipAddr;
+                    ushort port;
+
+                    if (!GetRemoteEndPoint(out ipAddr, out port))
+                    {
+                        return null;
+                    }
+
+                    m_RemoteEndPoint = new IPEndPoint(ipAddr, port);
+                }
+
+                return m_RemoteEndPoint;
+            }
+        }
+
+        internal override bool Blocking {
+            get {
+                return true;
+            }
+            set {
+                if (value != true)
+                {
+                    // TODO: non-blocking mode!
+                    throw new NotSupportedException();
+                }
+            }
+        }
+
+        internal override bool Connected
+        {
+            get {
+                TcpConnectionContract.Imp conn = GetChannelOrThrow();
+                bool connected = IsConnected(conn);
+                ReleaseChannel(conn);
+                return connected;
+            }
+        }
+
+        internal override AddressFamily AddressFamily {
+            get {
+                return AddressFamily.InterNetwork;
+            }
+        }
+
+        internal override SocketType SocketType {
+            get {
+                return SocketType.Stream;
+            }
+        }
+
+        internal override ProtocolType ProtocolType {
+            get {
+                return ProtocolType.Tcp;
+            }
+        }
+    }
+}
diff --git a/base/Libraries/System.Net/Sockets/TrackedBytesBuffer.sg b/base/Libraries/System.Net/Sockets/TrackedBytesBuffer.sg
new file mode 100644
index 0000000..91d2771
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/TrackedBytesBuffer.sg
@@ -0,0 +1,163 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TrackedBytesBuffer.sg
+//
+//  Note:
+//    A utility class that can store vectors of bytes from the shared heap without
+//    duplicating them, then copy them out later as though they were a single
+//    uninterrupted array of bytes.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace System.Net.Sockets
+{
+    internal class TrackedBytesBuffer
+    {
+        private class BytesPlusCount : ITracked
+        {
+            int nextOffset; // Offset of the next byte to use
+            byte[]! in ExHeap bytes; // The bytes
+
+            public BytesPlusCount([Claims]byte[]! in ExHeap data)
+            {
+                bytes = data;
+                nextOffset = 0;
+                base();
+            }
+
+            #region ITracked members
+
+            void ITracked.Release() {}
+            void ITracked.Acquire() {}
+
+            public void Dispose()
+            {
+                delete bytes;
+            }
+
+            void ITracked.Expose() {}
+            void ITracked.UnExpose() {}
+
+            #endregion
+
+            public int Length
+            {
+                get {
+                    expose(this) {
+                        return bytes.Length - nextOffset;
+                    }
+                }
+            }
+
+            public bool Empty
+            {
+                get {
+                    expose(this) {
+                        return nextOffset >= bytes.Length;
+                    }
+                }
+            }
+
+            // Copy out as many bytes as possible
+            public int CopyOut(byte[]! buff, int offset, int length, bool fPeek)
+            {
+                if (Length <= 0) {
+                    return 0;
+                }
+
+                int numToCopy = Math.Min(length, Length);
+
+                expose (this) {
+                    for(int i = 0; i < numToCopy; ++i) {
+                        buff[offset + i] = bytes[nextOffset + i];
+                    }
+                }
+
+                if (!fPeek) {
+                    nextOffset += numToCopy;
+                }
+                // else it's as if the copy never happened
+
+                return numToCopy;
+            }
+        }
+
+        // Contains TContainer<BytesPlusCount>
+        private Queue m_DataQueue;
+
+        // Count of the total bytes that we (logically) contain
+        private int m_Count;
+
+        public TrackedBytesBuffer()
+        {
+            m_DataQueue = new Queue();
+            m_Count = 0;
+        }
+
+        public void AddToTail([Claims] byte[]! in ExHeap bytes)
+        {
+            m_Count += bytes.Length;
+            BytesPlusCount! holder = new BytesPlusCount(bytes);
+            m_DataQueue.Enqueue(new TContainer<BytesPlusCount>(holder));
+        }
+
+        // Copy data out into a supplied buffer. If fPeek is true, it means we
+        // would copy out the exact same bytes if called again.
+        public int CopyFromHead(byte[]! buffer, int offset, int length, bool fPeek)
+        {
+            int bytesCopied = 0;
+
+            while((m_DataQueue.Count > 0) && (bytesCopied < length)) {
+                // Don't dequeue just yet, just peek
+                TContainer<BytesPlusCount> wrapper = (TContainer<BytesPlusCount>)m_DataQueue.Peek();
+                assert wrapper != null; // Because we checked the count
+                BytesPlusCount! topChunk = wrapper.Acquire();
+
+                int copied = topChunk.CopyOut(buffer, offset + bytesCopied,
+                                              length - bytesCopied, fPeek);
+                bytesCopied += copied;
+
+                if ((!fPeek) && (topChunk.Empty)) {
+                    // We want to throw away the top chunk. To take pressure off
+                    // the finalizer, we'll explicitly free the ExHeap data vector.
+                    topChunk.Dispose();
+                    m_DataQueue.Dequeue();
+                }
+                else if ((!fPeek) && (!topChunk.Empty)) {
+                    // This should only happen because we filled up the
+                    // caller's buffer
+                    Debug.Assert(bytesCopied == length);
+                    // Put the data back into its wrapper
+                    wrapper.Release(topChunk);
+                }
+                else {
+                    // Release topChunk back
+                    wrapper.Release(topChunk);
+                }
+            }
+
+            if (!fPeek) {
+                m_Count -= bytesCopied;
+                Debug.Assert(m_Count >= 0);
+            }
+
+            return bytesCopied;
+        }
+
+        public int Count
+        {
+            get { return m_Count; }
+        }
+    }
+}
diff --git a/base/Libraries/System.Net/Sockets/UdpSocket.cs b/base/Libraries/System.Net/Sockets/UdpSocket.cs
new file mode 100644
index 0000000..3bba648
--- /dev/null
+++ b/base/Libraries/System.Net/Sockets/UdpSocket.cs
@@ -0,0 +1,553 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpSocket.cs
+//
+//  Note:
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Contracts;
+
+namespace System.Net.Sockets
+{
+    internal class UdpSocket : InternalSocket
+    {
+        private const int BAD_SOCKET_STATE_ERR = (int)SocketErrors.WSAEOPNOTSUPP;
+
+        private TRef<UdpConnectionContract.Imp:ReadyState> m_Conn;
+
+        private IPEndPoint m_LocalEndPoint;
+        private IPEndPoint m_RemoteEndPoint;
+
+        // ================ Private Methods ================
+
+        private void Initialize([Claims]UdpConnectionContract.Imp:ReadyState! conn)
+        {
+            m_Conn = new TRef<UdpConnectionContract.Imp:ReadyState>(conn);
+        }
+
+        private static void ValidateBufferOffsets(byte[] buffer,
+                                                  int    offset,
+                                                  int    size)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException("buffer");
+            }
+
+            if (offset < 0 || offset > buffer.Length)
+            {
+                throw new ArgumentOutOfRangeException("offset");
+            }
+
+            if (size < 0 || size > buffer.Length - offset)
+            {
+                throw new ArgumentOutOfRangeException("size");
+            }
+        }
+
+        // ================ Internal Methods ================
+
+        [NotDelayed]
+        internal UdpSocket()
+        {
+            // Connect to the Udp module
+            UdpContract.Imp! impConn;
+            UdpContract.Exp! expConn;
+            UdpContract.NewChannel(out impConn, out expConn);
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+            try
+            {
+                epNS.SendBind(Bitter.FromString2(UdpContract.ModuleName), expConn);
+                switch receive
+                {
+                    case epNS.NakBind(ServiceContract.Exp:Start rejectedEP, error) :
+                        // failure
+                        if (rejectedEP != null) {
+                            delete rejectedEP;
+                        }
+                        throw new SocketException(SocketErrors.WSASYSNOTREADY);
+                        break;
+
+                    case epNS.AckBind() :
+                        impConn.RecvReady();
+                        // success
+                        break;
+                    case epNS.ChannelClosed():
+                        Tracing.Log(Tracing.Debug," NS ep closed");
+                        break;
+                    case unsatisfiable:
+                        DebugService.Break();
+                        break;
+                }
+            }
+            finally
+            {
+                delete epNS;
+            }
+
+            try
+            {
+                // Create a new Udp connection
+                UdpConnectionContract.Exp! udpExpConn;
+                UdpConnectionContract.Imp! udpImpConn;
+
+                UdpConnectionContract.NewChannel(out udpImpConn, out udpExpConn);
+                impConn.SendCreateUdpSession(udpExpConn);
+                impConn.RecvAck();
+
+                // Move the new connection to the ReadyState
+                udpImpConn.RecvReady();
+                Initialize(udpImpConn);
+            }
+            finally
+            {
+                delete impConn;
+            }
+        }
+
+        internal override InternalSocket Accept()
+        {
+            throw new SocketException(SocketErrors.WSAEOPNOTSUPP);
+            return null;
+        }
+
+        internal override void Bind(EndPoint localEndPoint)
+        {
+            if (localEndPoint == null)
+            {
+                throw new ArgumentNullException("localEndPoint");
+            }
+
+            IPEndPoint ep = localEndPoint as IPEndPoint;
+
+            if (ep == null)
+            {
+                // Illegal argument
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            // Make sure we're in the ReadyState
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                if (!conn.InState(UdpConnectionContract.ReadyState.Value))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                conn.SendBindLocalEndPoint((uint) ep.Address.m_addr,
+                                           unchecked((ushort) ep.Port));
+                switch receive
+                {
+                    case conn.OK() :
+                        // Make a copy of the argument data
+                        m_LocalEndPoint = new IPEndPoint(ep.Address, ep.Port);
+                        break;
+                    case conn.InvalidEndPoint(uint addr, ushort port) :
+                        throw new SocketException(SocketErrors.WSAEADDRNOTAVAIL);
+                        break;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override void Close()
+        {
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                if (!conn.InState(UdpConnectionContract.Closed.Value))
+                {
+                    conn.SendClose();
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override void Connect(EndPoint remoteEndPoint)
+        {
+            if (remoteEndPoint == null)
+            {
+                throw new ArgumentNullException("remoteEP");
+            }
+
+            IPEndPoint ep = remoteEndPoint as IPEndPoint;
+
+            if (ep == null)
+            {
+                // Illegal argument
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            if (! conn.InState(UdpConnectionContract.ReadyState.Value) &&
+                ! conn.InState(UdpConnectionContract.LocallyBound.Value))
+            {
+                // Need to be in the start state to issue a Connect
+                throw new SocketException(BAD_SOCKET_STATE_ERR);
+            }
+
+            try
+            {
+                uint   localIP   = 0;
+                ushort localPort = 0;
+
+                if (m_LocalEndPoint != null)
+                {
+                    if (m_LocalEndPoint.Address != IPAddress.Any)
+                    { localIP = (uint)m_LocalEndPoint.Address.m_addr; }
+
+                    if (m_LocalEndPoint.Port != 0)
+                    { localPort = unchecked((ushort)m_LocalEndPoint.Port); }
+                }
+
+                if ((localIP != 0) && (localPort != 0))
+                {
+                    conn.SendConnect(localIP, localPort,
+                                     (uint)ep.Address.m_addr,
+                                     unchecked((ushort)ep.Port));
+                }
+                else
+                {
+                    conn.SendConnectWithAnyLocalEndPoint(
+                        (uint)ep.Address.m_addr,
+                        unchecked((ushort)ep.Port));
+                }
+
+                switch receive
+                {
+                    case conn.OK() :
+                        // Success
+                        m_RemoteEndPoint = ep;
+                        break;
+                    case conn.InvalidEndPoint(uint addr, ushort port) :
+                        // NOTE could probably stand to retrieve and
+                        // return a better error code here
+                        throw new SocketException(SocketErrors.SocketError);
+                        break;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override void Dispose()
+        {
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+            delete conn;
+            // Leak our TRef!
+        }
+
+        internal override void Listen(int backlog)
+        {
+            throw new SocketException(SocketErrors.WSAEOPNOTSUPP);
+        }
+
+        private bool PollSelectRead(UdpConnectionContract.Imp! conn,
+                                    int                        millis)
+        {
+            bool result = false;
+            conn.SendPollSelectRead(millis);
+            conn.RecvPollSelectResult(out result);
+            return result;
+        }
+
+        private bool PollSelectWrite(UdpConnectionContract.Imp! conn,
+                                     int                        millis)
+        {
+            bool result = false;
+            conn.SendPollSelectWrite(millis);
+            conn.RecvPollSelectResult(out result);
+            return result;
+        }
+
+        internal override bool Poll(int microSeconds, SelectMode mode)
+        {
+            int millis = 0;
+            if (microSeconds < 0)
+            {
+                millis = Int32.MaxValue;
+            }
+            else
+            {
+                millis = microSeconds / 1000;
+            }
+
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                if (conn.InState(UdpConnectionContract.Closed.Value))
+                {
+                    throw new ObjectDisposedException("socket");
+                }
+
+                switch (mode)
+                {
+                    case SelectMode.SelectRead:
+                        return PollSelectRead(conn, millis);
+                        break;
+                    case SelectMode.SelectWrite:
+                        return PollSelectWrite(conn, millis);
+                        break;
+                    case SelectMode.SelectError:
+                        return false;
+                        // We don't support any of the requisite operations
+                        break;
+                    default:
+                        throw new NotSupportedException();
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override int ReceiveFrom(byte[]!      buffer,
+                                          int          offset,
+                                          int          size,
+                                          SocketFlags  socketFlags,
+                                          ref EndPoint remoteEP)
+        {
+            ValidateBufferOffsets(buffer, offset, size);
+            if (socketFlags != SocketFlags.None)
+            {
+                // Invalid flags for this operation
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                if (conn.InState(UdpConnectionContract.Closed.Value))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                conn.SendRead();
+                switch receive
+                {
+                    case conn.Data(uint addr, ushort port, byte[]! in ExHeap rdata) :
+                    {
+                        remoteEP = new IPEndPoint(new IPAddress(addr), port);
+                        int amount = Math.Min(rdata.Length, size);
+                        Bitter.ToByteArray(rdata, 0, amount, buffer, offset);
+                        delete rdata;
+                        return amount;
+                    }
+                    break;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override int Receive(byte[]!     buffer,
+                                      int         offset,
+                                      int         size,
+                                      SocketFlags socketFlags)
+        {
+            EndPoint dummy = null;
+            return ReceiveFrom(buffer, offset, size, socketFlags, ref dummy);
+        }
+
+        internal override int Send([Claims] byte[]! in ExHeap data,
+                                   SocketFlags socketFlags)
+        {
+            int byteCount = data.Length;
+
+            if (socketFlags != SocketFlags.None)
+            {
+                // Invalid flags for this operation
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                if (!conn.InState(UdpConnectionContract.Connected.Value))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                conn.SendWrite(data); // Give away data
+
+                switch receive
+                {
+                    case conn.OK() :
+                        // Success
+                        return byteCount;
+                        break;
+
+                    case conn.DataTooLarge() :
+                        // uh oh
+                        throw new SocketException(SocketErrors.WSAEMSGSIZE);
+                    break;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override int Send(byte[]!    buffer,
+                                   int         offset,
+                                   int         size,
+                                   SocketFlags socketFlags)
+        {
+            ValidateBufferOffsets(buffer, offset, size);
+            byte[] in ExHeap dataToWrite = Bitter.FromByteArray(buffer, offset, size);
+            return Send(dataToWrite, socketFlags);
+        }
+
+        internal override int SendTo(byte[]!     buffer,
+                                     int         offset,
+                                     int         size,
+                                     SocketFlags socketFlags,
+                                     EndPoint    remoteEP)
+        {
+            ValidateBufferOffsets(buffer, offset, size);
+
+            if (socketFlags != SocketFlags.None)
+            {
+                // Invalid flags for this operation
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            IPEndPoint ep = remoteEP as IPEndPoint;
+            if (ep == null)
+            {
+                throw new SocketException(SocketErrors.WSAEINVAL);
+            }
+
+            UdpConnectionContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                if (conn.InState(UdpConnectionContract.Closed.Value))
+                {
+                    throw new SocketException(BAD_SOCKET_STATE_ERR);
+                }
+
+                // Copy the data to write into an ExHeap vector and send it
+                byte[] in ExHeap dataToWrite = Bitter.FromByteArray(buffer, offset, size);
+
+                conn.SendWriteTo((uint)ep.Address.m_addr,
+                                 unchecked((ushort)ep.Port),
+                                 dataToWrite);
+                // no longer own dataToWrite!
+
+                switch receive
+                {
+                    case conn.OK() :
+                        // Success
+                        return size;
+                        break;
+
+                    case conn.DataTooLarge() :
+                        // uh oh
+                        throw new SocketException(SocketErrors.WSAEMSGSIZE);
+                    break;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        internal override void Shutdown(SocketShutdown how)
+        {
+            throw new SocketException(SocketErrors.WSAEOPNOTSUPP);
+        }
+
+        internal override int Available { get { return 0; /* XXX */ } }
+
+        internal override EndPoint LocalEndPoint
+        {
+            get { return m_LocalEndPoint; }
+        }
+
+        internal override EndPoint RemoteEndPoint
+        {
+            get { return m_RemoteEndPoint; }
+        }
+
+        internal override bool Blocking
+        {
+            get {
+                return true;
+            }
+            set {
+                if (value != true)
+                {
+                    // TODO: non-blocking mode!
+                    throw new NotSupportedException();
+                }
+            }
+        }
+
+        internal override bool Connected
+        {
+            get {
+                UdpConnectionContract.Imp conn = m_Conn.Acquire();
+                try
+                {
+                    return conn.InState(UdpConnectionContract.Connected.Value);
+                }
+                catch
+                {
+                    return false;
+                }
+                finally
+                {
+                    m_Conn.Release(conn);
+                }
+            }
+        }
+
+        internal override AddressFamily AddressFamily
+        {
+            get { return AddressFamily.InterNetwork; }
+        }
+
+        internal override SocketType SocketType
+        {
+            get { return SocketType.Dgram; }
+        }
+
+        internal override ProtocolType ProtocolType
+        {
+            get { return ProtocolType.Udp; }
+        }
+    }
+}
diff --git a/base/Libraries/System.Net/System.Net.csproj b/base/Libraries/System.Net/System.Net.csproj
new file mode 100644
index 0000000..4372c43
--- /dev/null
+++ b/base/Libraries/System.Net/System.Net.csproj
@@ -0,0 +1,61 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\System.Net\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>System.Net</AssemblyName>
+    <OutputType>Library</OutputType>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Dns.cs" />
+    <Compile Include="EndPoint.cs" />
+    <Compile Include="Internal.cs" />
+    <Compile Include="IPAddress.cs" />
+    <Compile Include="IPEndPoint.cs" />
+    <Compile Include="IPHostEntry.cs" />
+    <Compile Include="SocketAddress.cs" />
+    <Compile Include="SocketException.cs" />
+    <Compile Include="Sockets\AddressFamily.cs" />
+    <Compile Include="Sockets\ProtocolFamily.cs" />
+    <Compile Include="Sockets\ProtocolType.cs" />
+    <Compile Include="Sockets\SelectMode.cs" />
+    <Compile Include="Sockets\InternalSocket.cs" />
+    <Compile Include="Sockets\Socket.cs" />
+    <Compile Include="Sockets\SocketErrors.cs" />
+    <Compile Include="Sockets\SocketFlags.cs" />
+    <Compile Include="Sockets\SocketOptionLevel.cs" />
+    <Compile Include="Sockets\SocketOptionName.cs" />
+    <Compile Include="Sockets\SocketShutdown.cs" />
+    <Compile Include="Sockets\SocketType.cs" />
+    <Compile Include="Sockets\TcpSocket.cs" />
+    <Compile Include="Sockets\TrackedBytesBuffer.sg" />
+    <Compile Include="Sockets\UdpSocket.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
+
+
diff --git a/base/Libraries/System.Web/Hosting/IApplicationHost.cs b/base/Libraries/System.Web/Hosting/IApplicationHost.cs
new file mode 100644
index 0000000..0bbe969
--- /dev/null
+++ b/base/Libraries/System.Web/Hosting/IApplicationHost.cs
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+// <copyright file="ApplicationManager.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Web.Hosting {
+    using System;
+    using System.Collections;
+    using System.Web;
+
+    public interface IApplicationHost {
+        String GetVirtualPath();
+        String GetPhysicalPath();
+        //IConfigMapPathFactory GetConfigMapPathFactory();
+        IntPtr GetConfigToken();
+        String GetSiteName();
+        void MessageReceived();
+        bool IsHostProcessMultiInstance();
+    }
+}
diff --git a/base/Libraries/System.Web/Hosting/IRegisteredObject.cs b/base/Libraries/System.Web/Hosting/IRegisteredObject.cs
new file mode 100644
index 0000000..415acd6
--- /dev/null
+++ b/base/Libraries/System.Web/Hosting/IRegisteredObject.cs
@@ -0,0 +1,13 @@
+//------------------------------------------------------------------------------
+// <copyright file="IRegisteredObject.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>                                                                
+//------------------------------------------------------------------------------
+
+namespace System.Web.Hosting {
+    using System;
+    
+    public interface IRegisteredObject {
+        void Stop(bool immediate);
+    }
+}
diff --git a/base/Libraries/System.Web/Hosting/SimpleApplicationHost.cs b/base/Libraries/System.Web/Hosting/SimpleApplicationHost.cs
new file mode 100644
index 0000000..54b48b4
--- /dev/null
+++ b/base/Libraries/System.Web/Hosting/SimpleApplicationHost.cs
@@ -0,0 +1,87 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SimpleApplicationHost.cs
+//
+//  Note:
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Web.Hosting {
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Web;
+    using System.Web.Util;
+    using System.IO;
+
+    public class SimpleApplicationHost : IApplicationHost {
+
+        private String _appVirtualPath;
+        private String _appPhysicalPath;
+        private String _installPath;
+        private String _clientScriptPath;
+        private String _clientScriptVirtualPath;
+
+        public SimpleApplicationHost(string virtualPath, string physicalPath) {
+            _appVirtualPath = virtualPath;
+
+            String directorySeparatorString = new String(Path.DirectorySeparatorChar, 1);
+            _appPhysicalPath = physicalPath.EndsWith(directorySeparatorString) ? physicalPath : physicalPath + directorySeparatorString;
+
+            // This has been hard-coded for Singularity
+            _installPath = "/cassini";
+            _clientScriptPath = Path.Combine(_installPath, "asp.netclientfiles");
+            _clientScriptVirtualPath = "/aspnet_client/system_web/";
+        }
+
+        protected String ClientScriptPath { get { return _clientScriptPath; } }
+        protected String ClientScriptVirtualPath { get { return _clientScriptVirtualPath; } }
+        protected IntPtr ConfigToken { get { return IntPtr.Zero; } }
+        protected String SiteName { get { return "Default Web Site"; } }
+
+        public String PhysicalPath { get { return _appPhysicalPath; } }
+        public String InstallPath { get { return _installPath; } }
+        public String VirtualPath { get { return _appVirtualPath; } }
+
+        protected void MessageReceived() {
+        }
+
+        protected bool IsHostProcessMultiInstance() {
+            return false;
+        }
+
+        public virtual Object InitializeLifetimeService() {
+            return null; // never expire lease
+        }
+
+        // IApplicationHost implementation
+        String IApplicationHost.GetVirtualPath() {
+            return VirtualPath;
+        }
+
+        String IApplicationHost.GetPhysicalPath() {
+            return PhysicalPath;
+        }
+
+        IntPtr IApplicationHost.GetConfigToken() {
+            return ConfigToken;
+        }
+
+        String IApplicationHost.GetSiteName() {
+            return SiteName;
+        }
+
+        void IApplicationHost.MessageReceived() {
+            MessageReceived();
+        }
+
+        bool IApplicationHost.IsHostProcessMultiInstance() {
+            return IsHostProcessMultiInstance();
+        }
+    }
+}
diff --git a/base/Libraries/System.Web/Hosting/SimpleWorkerRequest.cs b/base/Libraries/System.Web/Hosting/SimpleWorkerRequest.cs
new file mode 100644
index 0000000..b0041f2
--- /dev/null
+++ b/base/Libraries/System.Web/Hosting/SimpleWorkerRequest.cs
@@ -0,0 +1,358 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   SimpleWorkerRequest.cs
+//
+//  Note:
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Web.Hosting {
+    using System.Collections;
+    using System.IO;
+    using System.Threading;
+    using System.Web.Util;
+
+    public class SimpleWorkerRequest : HttpWorkerRequest {
+
+        private bool        _hasRuntimeInfo;
+        private String      _appVirtPath;       // "/foo"
+        private String      _appPhysPath;       // "c:\foo\"
+        private String      _page;
+        private String      _pathInfo;
+        private String      _queryString;
+        private TextWriter  _output;
+        private String      _installDir;
+
+        private void ExtractPagePathInfo() {
+            int i = _page.IndexOf('/');
+
+            if (i >= 0) {
+                _pathInfo = _page.Substring(i);
+                _page = _page.Substring(0, i);
+            }
+        }
+
+        private String GetPathInternal(bool includePathInfo) {
+            String s = _appVirtPath.Equals("/") ? ("/" + _page) : (_appVirtPath + "/" + _page);
+
+            if (includePathInfo && _pathInfo != null)
+                return s + _pathInfo;
+            else
+                return s;
+        }
+
+        //
+        //  HttpWorkerRequest implementation
+        //
+
+        // "/foo/page.aspx/tail"
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetUriPath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetUriPath() {
+            return GetPathInternal(true);
+        }
+
+        // "param=bar"
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetQueryString"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetQueryString() {
+            return _queryString;
+        }
+
+        // "/foo/page.aspx/tail?param=bar"
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetRawUrl"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetRawUrl() {
+            String qs = GetQueryString();
+            if (qs != null && qs.Length > 0)
+                return GetPathInternal(true) + "?" + qs;
+            else
+                return GetPathInternal(true);
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetHttpVerbName"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetHttpVerbName() {
+            return "GET";
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetHttpVersion"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetHttpVersion() {
+            return "HTTP/1.0";
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetRemoteAddress"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetRemoteAddress() {
+            return "127.0.0.1";
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetRemotePort"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override int GetRemotePort() {
+            return 0;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetLocalAddress"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetLocalAddress() {
+            return "127.0.0.1";
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetLocalPort"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override int GetLocalPort() {
+            return 80;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetUserToken"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override IntPtr GetUserToken() {
+            return IntPtr.Zero;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetFilePath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetFilePath() {
+            return GetPathInternal(false);
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetFilePathTranslated"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetFilePathTranslated() {
+            String path =  _appPhysPath + _page.Replace('/', '\\');
+            return path;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetPathInfo"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetPathInfo() {
+            return (_pathInfo != null) ? _pathInfo : String.Empty;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetAppPath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetAppPath() {
+            return _appVirtPath;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetAppPathTranslated"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetAppPathTranslated() {
+            return _appPhysPath;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.GetServerVariable"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String GetServerVariable(String name) {
+            return String.Empty;
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.MapPath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override String MapPath(String path) {
+            if (!_hasRuntimeInfo)
+                return null;
+
+            String mappedPath = null;
+            String appPath = _appPhysPath.Substring(0, _appPhysPath.Length-1); // without trailing "\"
+
+            if (path == null || path.Length == 0 || path.Equals("/")) {
+                mappedPath = appPath;
+            }
+            if (StringUtil.StringStartsWith(path, _appVirtPath)) {
+                mappedPath = appPath + path.Substring(_appVirtPath.Length).Replace('/', '\\');
+            }
+
+            return mappedPath;
+        }
+
+        /*
+       //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.MachineConfigPath"]/*' />
+       /// <devdoc>
+       ///    <para>[To be supplied.]</para>
+       /// </devdoc>
+       public override string MachineConfigPath {
+       get {
+       if (_hasRuntimeInfo) {
+       string path = HttpConfigurationSystem.MachineConfigurationFilePath;
+       InternalSecurityPermissions.PathDiscovery(path).Demand();
+       return path;
+       }
+       else
+       return null;
+       }
+       }
+        */
+
+        /*
+       //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.MachineInstallDirectory"]/*' />
+       /// <devdoc>
+       ///    <para>[To be supplied.]</para>
+       /// </devdoc>
+       public override String MachineInstallDirectory {
+       get {
+       if (_hasRuntimeInfo) {
+       InternalSecurityPermissions.PathDiscovery(_installDir).Demand();
+       return _installDir;
+       }
+       return null;
+       }
+       }
+        */
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SendStatus"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void SendStatus(int statusCode, String statusDescription) {
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SendKnownResponseHeader"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void SendKnownResponseHeader(int index, String value) {
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SendUnknownResponseHeader"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void SendUnknownResponseHeader(String name, String value) {
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SendResponseFromMemory"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void SendResponseFromMemory(byte[] data, int length) {
+            _output.Write(System.Text.Encoding.Default.GetChars(data, 0, length));
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SendResponseFromFile"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void SendResponseFromFile(String filename, long offset, long length) {
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SendResponseFromFile1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void SendResponseFromFile(IntPtr handle, long offset, long length) {
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.FlushResponse"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void FlushResponse(bool finalFlush) {
+        }
+
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.EndOfRequest"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public override void EndOfRequest() {
+        }
+
+        //
+        // Ctors
+        //
+
+        private SimpleWorkerRequest() {
+        }
+
+        /*
+         *  Ctor that gets application data from HttpRuntime, assuming
+         *  HttpRuntime has been set up (app domain specially created, etc.)
+         */
+
+        /*
+       //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SimpleWorkerRequest"]/*' />
+       /// <devdoc>
+       ///    <para>[To be supplied.]</para>
+       /// </devdoc>
+       [SecurityPermission(SecurityAction.Demand, UnmanagedCode=true)]
+       public SimpleWorkerRequest(String page, String query, TextWriter output) {
+       _queryString = query;
+       _output = output;
+       _page = page;
+
+       ExtractPagePathInfo();
+
+       _appPhysPath = Thread.GetDomain().GetData(".appPath").ToString();
+       _appVirtPath = Thread.GetDomain().GetData(".appVPath").ToString();
+       _installDir  = HttpRuntime.AspInstallDirectoryInternal;
+
+       _hasRuntimeInfo = true;
+       }
+        */
+
+        /*
+         *  Ctor that gets application data as arguments,assuming HttpRuntime
+         *  has not been set up.
+         *
+         *  This allows for limited functionality to execute handlers.
+         */
+        //| <include file='doc\SimpleWorkerRequest.uex' path='docs/doc[@for="SimpleWorkerRequest.SimpleWorkerRequest1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public SimpleWorkerRequest(String appVirtualDir, String appPhysicalDir, String page, String query, TextWriter output) {
+            _appVirtPath = appVirtualDir;
+            _appPhysPath = appPhysicalDir;
+            _queryString = query;
+            _output = output;
+            _page = page;
+
+            ExtractPagePathInfo();
+
+            if (!StringUtil.StringEndsWith(_appPhysPath, '\\'))
+                _appPhysPath += "\\";
+
+            _hasRuntimeInfo = false;
+        }
+    }
+}
diff --git a/base/Libraries/System.Web/HttpException.cs b/base/Libraries/System.Web/HttpException.cs
new file mode 100644
index 0000000..44c0681
--- /dev/null
+++ b/base/Libraries/System.Web/HttpException.cs
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   HttpException
+//
+//  Note:
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Web
+{
+    public class HttpException : System.Exception
+    {
+        // Do-nothing placeholder for now
+        public HttpException(string message) :
+            base(message)
+        {
+        }
+    }
+}
diff --git a/base/Libraries/System.Web/System.Web.csproj b/base/Libraries/System.Web/System.Web.csproj
new file mode 100644
index 0000000..96a053c
--- /dev/null
+++ b/base/Libraries/System.Web/System.Web.csproj
@@ -0,0 +1,44 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\System.Web\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>System.Web</AssemblyName>
+    <OutputType>Library</OutputType>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <Language>C#</Language>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="HttpException.cs" />
+    <Compile Include="WorkerRequest.cs" />
+    <Compile Include="HttpServerUtility.cs" />
+    <Compile Include="Hosting\IApplicationHost.cs" />
+    <Compile Include="Hosting\IRegisteredObject.cs" />
+    <Compile Include="Hosting\SimpleWorkerRequest.cs" />
+    <Compile Include="Hosting\SimpleApplicationHost.cs" />
+    <Compile Include="Util\StringUtil.cs" />
+    <Compile Include="Util\SymbolEqualComparer.cs" />
+    <Compile Include="Util\SymbolHashCodeProvider.cs" />
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <!-- <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Runtime\System.Compiler.Runtime.csproj"/> -->
+  </ItemGroup>
+  
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
+
+
diff --git a/base/Libraries/System.Web/Util/StringUtil.cs b/base/Libraries/System.Web/Util/StringUtil.cs
new file mode 100644
index 0000000..494e6a4
--- /dev/null
+++ b/base/Libraries/System.Web/Util/StringUtil.cs
@@ -0,0 +1,166 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StringUtil.cs
+//
+//  Note:
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Web.Util {
+    using System.Text;
+    using System.Globalization;
+
+    /*
+     * Various string handling utilities
+     */
+    internal class StringUtil {
+        internal static string CheckAndTrimString(string paramValue, string paramName) {
+            return CheckAndTrimString(paramValue, paramName, true);
+        }
+
+        internal static string CheckAndTrimString(string paramValue, string paramName, bool throwIfNull) {
+            return CheckAndTrimString(paramValue, paramName, throwIfNull, -1);
+        }
+
+        internal static string CheckAndTrimString(string paramValue, string paramName,
+                                                  bool throwIfNull, int lengthToCheck) {
+            if (paramValue == null) {
+                if (throwIfNull) {
+                    throw new ArgumentNullException(paramName);
+                }
+                return null;
+            }
+            string trimmedValue = paramValue.Trim();
+            if (trimmedValue.Length == 0) {
+                throw new ArgumentException("Tried to trim an empty string");
+            }
+            if (lengthToCheck > -1 && trimmedValue.Length > lengthToCheck) {
+                throw new ArgumentException("Tried to trim a string that exceeded the maximum length");
+            }
+            return trimmedValue;
+        }
+
+        internal static bool Equals(string s1, string s2) {
+            if (s1 == s2) {
+                return true;
+            }
+
+            if (IsEmpty(s1) && IsEmpty(s2)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        internal static bool EqualsIgnoreCase(string s1, string s2) {
+            if(IsEmpty(s1) && IsEmpty(s2)) {
+                return true;
+            }
+            if(IsEmpty(s1) || IsEmpty(s2)) {
+                return false;
+            }
+            if(s2.Length != s1.Length) {
+                return false;
+            }
+            return 0 == string.Compare(s1, 0, s2, 0, s2.Length, true);
+        }
+
+        internal static bool IsEmpty(string s) {
+            return s == null || s.Length == 0;
+        }
+
+        /*
+         * Determines if the string ends with the specified character.
+         * Fast, non-culture aware.
+         */
+        internal static bool StringEndsWith(string s, char c) {
+            int len = s.Length;
+            return len != 0 && s[len - 1] == c;
+        }
+
+        /*
+         * Determines if the first string ends with the second string.
+         * Fast, non-culture aware.
+         */
+        internal static bool StringEndsWith(string s1, string s2) {
+            int offset = s1.Length - s2.Length;
+            if (offset < 0) {
+                return false;
+            }
+
+            return 0 == string.Compare(s1, offset, s2, 0, s2.Length);
+        }
+
+        /*
+         * Determines if the first string ends with the second string, ignoring case.
+         * Fast, non-culture aware.
+         */
+        internal static bool StringEndsWithIgnoreCase(string s1, string s2) {
+            int offset = s1.Length - s2.Length;
+            if (offset < 0) {
+                return false;
+            }
+
+            return 0 == string.Compare(s1, offset, s2, 0, s2.Length, true);
+        }
+
+        /*
+         * Determines if the string starts with the specified character.
+         * Fast, non-culture aware.
+         */
+        internal static bool StringStartsWith(string s, char c) {
+            return s.Length != 0 && (s[0] == c);
+        }
+
+        /*
+         * Determines if the first string starts with the second string.
+         * Fast, non-culture aware.
+         */
+        internal static bool StringStartsWith(string s1, string s2) {
+            if (s2.Length > s1.Length) {
+                return false;
+            }
+
+            return 0 == string.Compare(s1, 0, s2, 0, s2.Length);
+        }
+
+        /*
+         * Determines if the first string starts with the second string, ignoring case.
+         * Fast, non-culture aware.
+         */
+        internal static bool StringStartsWithIgnoreCase(string s1, string s2) {
+            if (s2.Length > s1.Length) {
+                return false;
+            }
+
+            return 0 == string.Compare(s1, 0, s2, 0, s2.Length, true);
+        }
+
+        internal static bool StringArrayEquals(string[] a, string [] b) {
+            if ((a == null) != (b == null)) {
+                return false;
+            }
+
+            if (a == null) {
+                return true;
+            }
+
+            int n = a.Length;
+            if (n != b.Length) {
+                return false;
+            }
+
+            for (int i = 0; i < n; i++) {
+                if (a[i] != b[i]) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/base/Libraries/System.Web/Util/SymbolEqualComparer.cs b/base/Libraries/System.Web/Util/SymbolEqualComparer.cs
new file mode 100644
index 0000000..6448617
--- /dev/null
+++ b/base/Libraries/System.Web/Util/SymbolEqualComparer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <copyright file="SymbolEqualComparer.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Web.Util {
+    using System.Collections;
+    using System.Globalization;
+
+    //| <include file='doc\SymbolEqualComparer.uex' path='docs/doc[@for="SymbolEqualComparer"]/*' />
+    /// <devdoc>
+    ///  <para>
+    ///    For internal use only. This implements a comparison that only
+    ///    checks for equality, so this should only be used in un-sorted data
+    ///    structures like Hashtable and ListDictionary. This is a little faster
+    ///    than using CaseInsensitiveComparer because it does a strict
+    ///    character-by-character equality check rather than a sorted comparison.
+    ///  </para>
+    /// </devdoc>
+    internal class SymbolEqualComparer: IComparer {
+
+        //| <include file='doc\SymbolEqualComparer.uex' path='docs/doc[@for="SymbolEqualComparer.Default"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        internal static readonly IComparer Default = new SymbolEqualComparer();
+
+        internal SymbolEqualComparer() {
+        }
+
+        int IComparer.Compare(object keyLeft, object keyRight) {
+
+            string sLeft = keyLeft as string;
+            string sRight = keyRight as string;
+            if (sLeft == null) {
+                throw new ArgumentNullException("keyLeft");
+            }
+            if (sRight == null) {
+                throw new ArgumentNullException("keyRight");
+            }
+            int lLeft = sLeft.Length;
+            int lRight = sRight.Length;
+            if (lLeft != lRight) {
+                return 1;
+            }
+            for (int i = 0; i < lLeft; i++) {
+                char charLeft = sLeft[i];
+                char charRight = sRight[i];
+                if (charLeft == charRight) {
+                    continue;
+                }
+                UnicodeCategory catLeft = Char.GetUnicodeCategory(charLeft);
+                UnicodeCategory catRight = Char.GetUnicodeCategory(charRight);
+                if (catLeft == UnicodeCategory.UppercaseLetter
+                    && catRight == UnicodeCategory.LowercaseLetter) {
+                    if (Char.ToLower(charLeft) == charRight) {
+                        continue;
+                    }
+                } else if (catRight == UnicodeCategory.UppercaseLetter
+                    && catLeft == UnicodeCategory.LowercaseLetter){
+                    if (Char.ToLower(charRight) == charLeft) {
+                        continue;
+                    }
+                }
+                return 1;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Libraries/System.Web/Util/SymbolHashCodeProvider.cs b/base/Libraries/System.Web/Util/SymbolHashCodeProvider.cs
new file mode 100644
index 0000000..edfe6c8
--- /dev/null
+++ b/base/Libraries/System.Web/Util/SymbolHashCodeProvider.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <copyright file="SymbolHashCodeProvider.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Web.Util {
+    using System.Collections;
+    using System.Globalization;
+
+    //| <include file='doc\SymbolHashCodeProvider.uex' path='docs/doc[@for="SymbolHashCodeProvider"]/*' />
+    /// <devdoc>
+    ///  <para>
+    ///    For internal use only. This provides case-insensitive hash code
+    ///    for symbols and is not affected by the ambient culture.
+    ///  </para>
+    /// </devdoc>
+    internal class SymbolHashCodeProvider {
+
+        //| <include file='doc\SymbolHashCodeProvider.uex' path='docs/doc[@for="SymbolHashCodeProvider.Default"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        internal static readonly IHashCodeProvider Default = new CaseInsensitiveHashCodeProvider();
+
+        private SymbolHashCodeProvider() {
+        }
+    }
+}
+
+
diff --git a/base/Libraries/System.Web/WorkerRequest.cs b/base/Libraries/System.Web/WorkerRequest.cs
new file mode 100644
index 0000000..bc5df2e
--- /dev/null
+++ b/base/Libraries/System.Web/WorkerRequest.cs
@@ -0,0 +1,1231 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WorkerRequest.cs
+//
+//  Note:
+//    This module defines the base worker class used by ASP.NET Managed
+//    code for request processing.
+//
+//    This file was ported, from the Coriolis codebase to Singularity by Mark Aiken.
+//
+
+namespace System.Web {
+    using System.Text;
+    using System.Collections;
+    using System.Web.Hosting;
+    using System.Web.Util;
+
+    public abstract class HttpWorkerRequest {
+        private DateTime _startTime;
+
+        public HttpWorkerRequest()
+        {
+            _startTime = DateTime.UtcNow;
+        }
+
+        // ************************************************************************
+
+        //
+        // Indexed Headers. All headers that are defined by HTTP/1.1. These
+        // values are used as offsets into arrays and as token values.
+        //
+        // IMPORTANT : Notice request + response values overlap. Make sure you
+        // know which type of header array you are indexing.
+        //
+
+        //
+        // general-headers [section 4.5]
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderCacheControl"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderCacheControl          = 0;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderConnection"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderConnection            = 1;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderDate"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderDate                  = 2;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderKeepAlive"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderKeepAlive             = 3;   // not in rfc
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderPragma"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderPragma                = 4;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderTrailer"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderTrailer               = 5;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderTransferEncoding"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderTransferEncoding      = 6;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderUpgrade"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderUpgrade               = 7;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderVia"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderVia                   = 8;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderWarning"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderWarning               = 9;
+
+        //
+        // entity-headers  [section 7.1]
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAllow"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAllow                 = 10;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentLength"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentLength         = 11;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentType"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentType           = 12;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentEncoding"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentEncoding       = 13;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentLanguage"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentLanguage       = 14;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentLocation"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentLocation       = 15;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentMd5"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentMd5            = 16;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderContentRange"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderContentRange          = 17;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderExpires"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderExpires               = 18;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderLastModified"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderLastModified          = 19;
+
+        //
+        // request-headers [section 5.3]
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAccept"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAccept                = 20;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAcceptCharset"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAcceptCharset         = 21;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAcceptEncoding"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAcceptEncoding        = 22;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAcceptLanguage"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAcceptLanguage        = 23;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAuthorization"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAuthorization         = 24;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderCookie"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderCookie                = 25;   // not in rfc
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderExpect"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderExpect                = 26;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderFrom"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderFrom                  = 27;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderHost"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderHost                  = 28;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderIfMatch"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderIfMatch               = 29;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderIfModifiedSince"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderIfModifiedSince       = 30;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderIfNoneMatch"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderIfNoneMatch           = 31;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderIfRange"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderIfRange               = 32;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderIfUnmodifiedSince"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderIfUnmodifiedSince     = 33;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderMaxForwards"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderMaxForwards           = 34;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderProxyAuthorization"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderProxyAuthorization    = 35;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderReferer"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderReferer               = 36;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderRange"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderRange                 = 37;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderTe"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderTe                    = 38;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderUserAgent"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderUserAgent             = 39;
+
+        //
+        // Request headers end here
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.RequestHeaderMaximum"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int RequestHeaderMaximum        = 40;
+
+        //
+        // response-headers [section 6.2]
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAcceptRanges"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAcceptRanges          = 20;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderAge"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderAge                   = 21;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderEtag"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderEtag                  = 22;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderLocation"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderLocation              = 23;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderProxyAuthenticate"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderProxyAuthenticate     = 24;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderRetryAfter"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderRetryAfter            = 25;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderServer"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderServer                = 26;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderSetCookie"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderSetCookie             = 27;   // not in rfc
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderVary"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderVary                  = 28;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeaderWwwAuthenticate"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int HeaderWwwAuthenticate       = 29;
+
+        //
+        // Response headers end here
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ResponseHeaderMaximum"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public const int ResponseHeaderMaximum       = 30;
+
+        // ************************************************************************
+
+        //
+        // Request reasons
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ReasonResponseCacheMiss"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public const int ReasonResponseCacheMiss     = 0;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ReasonFileHandleCacheMiss"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public const int ReasonFileHandleCacheMiss   = 1;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ReasonCachePolicy"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public const int ReasonCachePolicy           = 2;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ReasonCacheSecurity"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public const int ReasonCacheSecurity         = 3;
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ReasonClientDisconnect"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public const int ReasonClientDisconnect      = 4;
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ReasonDefault"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public const int ReasonDefault               = ReasonResponseCacheMiss;
+
+
+        // ************************************************************************
+
+        //
+        // Access to request related members
+        //
+
+        // required members
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetUriPath"]/*' />
+        /// <devdoc>
+        ///    <para> Returns the physical path to the requested Uri.</para>
+        /// </devdoc>
+        public abstract String  GetUriPath();           // "/foo/page.aspx/tail"
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetQueryString"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract String  GetQueryString();       // "param=bar"
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetRawUrl"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract String  GetRawUrl();            // "/foo/page.aspx/tail?param=bar"
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetHttpVerbName"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract String  GetHttpVerbName();      // "GET"
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetHttpVersion"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract String  GetHttpVersion();       // "HTTP/1.1"
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetRemoteAddress"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract String  GetRemoteAddress();     // client's ip address
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetRemotePort"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract int     GetRemotePort();        // client's port
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetLocalAddress"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract String  GetLocalAddress();      // server's ip address
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetLocalPort"]/*' />
+        /// <devdoc>
+        ///    <para>Provides Access to the specified member of the request header.</para>
+        /// </devdoc>
+        public abstract int     GetLocalPort();         // server's port
+
+        // optional members with defaults supplied
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetQueryStringRawBytes"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the response query string as an array of bytes.</para>
+        /// </devdoc>
+        public virtual byte[] GetQueryStringRawBytes() {
+            // access to raw qs for i18n
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetRemoteName"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the client computer's name.</para>
+        /// </devdoc>
+        public virtual String GetRemoteName() {
+            // client's name
+            return GetRemoteAddress();
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetServerName"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the name of the local server.</para>
+        /// </devdoc>
+        public virtual String GetServerName() {
+            // server's name
+            return GetLocalAddress();
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetConnectionID"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the ID of the current connection.</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual long GetConnectionID() {
+            // connection id
+            return 0;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetUrlContextID"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the context ID of the current connection.</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual long GetUrlContextID() {
+            // UL APPID
+            return 0;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetAppPoolID"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the application pool ID for the current URL.</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual String GetAppPoolID() {
+            // UL Application pool id
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetRequestReason"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the reason for the request.</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual int GetRequestReason() {
+            // constants Reason... above
+            return ReasonDefault;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetUserToken"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the client's impersonation token.</para>
+        /// </devdoc>
+        public virtual IntPtr GetUserToken() {
+            // impersonation token
+            return IntPtr.Zero;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetVirtualPathToken"]/*' />
+        /// <internalonly/>
+        public virtual IntPtr GetVirtualPathToken() {
+            // impersonation token
+            return IntPtr.Zero;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.IsSecure"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns a value indicating whether the connection is secure (using SSL).</para>
+        /// </devdoc>
+        public virtual bool IsSecure() {
+            // is over ssl?
+            return false;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetProtocol"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the HTTP protocol (HTTP or HTTPS).</para>
+        /// </devdoc>
+        public virtual String GetProtocol() {
+            return IsSecure() ?  "https" : "http";
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetFilePath"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the physical path to the requested Uri.</para>
+        /// </devdoc>
+        public virtual String GetFilePath() {
+            // "/foo/page.aspx"
+            return GetUriPath();
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetFilePathTranslated"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the translated file path to the requested Uri (from virtual path to
+        ///       UNC path, ie "/foo/page.aspx" to "c:\dir\page.aspx") </para>
+        /// </devdoc>
+        public virtual String GetFilePathTranslated() {
+            // "c:\dir\page.aspx"
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetPathInfo"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns additional
+        ///       path information for a resource with a URL extension. i.e. for the URL
+        ///       /virdir/page.html/tail, the PathInfo value is /tail. </para>
+        /// </devdoc>
+        public virtual String GetPathInfo() {
+            // "/tail"
+            return "";
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetAppPath"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the virtual path to the
+        ///       currently executing server application.</para>
+        /// </devdoc>
+        public virtual String GetAppPath() {
+            // "/foo"
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetAppPathTranslated"]/*' />
+        /// <devdoc>
+        ///    <para>When overridden in a derived class, returns the UNC-translated path to
+        ///       the currently executing server application.</para>
+        /// </devdoc>
+        public virtual String GetAppPathTranslated() {
+            // "c:\dir"
+            return null;
+        }
+
+        //
+        // Virtual methods to read the incoming request
+        //
+
+        public virtual int GetPreloadedEntityBodyLength() {
+            byte[] bytes = GetPreloadedEntityBody();
+            return (bytes != null) ? bytes.Length : 0;
+        }
+
+        public virtual int GetPreloadedEntityBody(byte[] buffer, int offset) {
+            int l = 0;
+            byte[] bytes = GetPreloadedEntityBody();
+
+            if (bytes != null) {
+                l = bytes.Length;
+                Buffer.BlockCopy(bytes, 0, buffer, offset, l);
+            }
+
+            return l;
+        }
+
+        public virtual byte[] GetPreloadedEntityBody() {
+            return null;
+        }
+
+        [Microsoft.Contracts.Pure]
+        public virtual bool IsEntireEntityBodyIsPreloaded() {
+            return false;
+        }
+
+        public virtual int GetTotalEntityBodyLength() {
+            int l = 0;
+
+            String contentLength = GetKnownRequestHeader(HeaderContentLength);
+
+            if (contentLength != null) {
+                try {
+                    l = Int32.Parse(contentLength);
+                }
+                catch {
+                }
+            }
+
+            return l;
+        }
+
+        public virtual int ReadEntityBody(byte[] buffer, int size) {
+            return 0;
+        }
+
+        public virtual int ReadEntityBody(byte[] buffer, int offset, int size) {
+            byte[] temp = new byte[size];
+            int l = ReadEntityBody(temp, size);
+
+            if (l > 0) {
+                Buffer.BlockCopy(temp, 0, buffer, offset, l);
+            }
+
+            return l;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetKnownRequestHeader"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String GetKnownRequestHeader(int index) {
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetUnknownRequestHeader"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String GetUnknownRequestHeader(String name) {
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetUnknownRequestHeaders"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        [CLSCompliant(false)]
+        public virtual String[][] GetUnknownRequestHeaders() {
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetServerVariable"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String GetServerVariable(String name) {
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetBytesRead"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual long GetBytesRead() {
+            return 0;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetStartTime"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        internal virtual DateTime GetStartTime() {
+            return _startTime;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ResetStartTime"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        internal virtual void ResetStartTime() {
+            _startTime = DateTime.UtcNow;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.MapPath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String MapPath(String virtualPath) {
+            return null;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.MachineConfigPath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String MachineConfigPath {
+            get {
+                return null;
+            }
+        }
+
+#if ORCAS
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.ApplicationServerConfigPath"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String ApplicationServerConfigPath {
+            get {
+                return null;
+            }
+        }
+#endif
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.MachineInstallDirectory"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual String MachineInstallDirectory {
+            get {
+                return null;
+            }
+        }
+
+        //
+        // Abstract methods to write the response
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendStatus"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void SendStatus(int statusCode, String statusDescription);
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendKnownResponseHeader"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void SendKnownResponseHeader(int index, String value);
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendUnknownResponseHeader"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void SendUnknownResponseHeader(String name, String value);
+
+        // headers encoding controlled via HttpResponse.HeaderEncoding
+        internal virtual void SetHeaderEncoding(Encoding encoding) {
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendResponseFromMemory"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void SendResponseFromMemory(byte[] data, int length);
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendResponseFromFile"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void SendResponseFromFile(String filename, long offset, long length);
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendResponseFromFile1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void SendResponseFromFile(IntPtr handle, long offset, long length);
+
+        internal virtual void TransmitFile(String filename, long length, bool isImpersonating) {
+            TransmitFile(filename, 0, length, isImpersonating);
+        }
+
+        internal virtual void TransmitFile(String filename, long offset, long length, bool isImpersonating) {
+            // default implementation
+            SendResponseFromFile(filename, offset, length);
+        }
+
+        internal virtual void TransmitFile(IntPtr fileHandle, long offset, long length) {
+            // default implementation
+            SendResponseFromFile(fileHandle, offset, length);
+        }
+
+        // Execute Url
+
+        internal virtual bool SupportsExecuteUrl {
+            get { return false; }
+        }
+
+        internal virtual IAsyncResult BeginExecuteUrl(
+                                            String url, String method, String headers,
+                                            bool sendHeaders,
+                                            bool addUserIndo, IntPtr token, String name, String authType,
+                                            AsyncCallback cb, Object @state) {
+            throw new NotSupportedException();
+        }
+
+        internal virtual void EndExecuteUrl(IAsyncResult result) {
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.FlushResponse"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void FlushResponse(bool finalFlush);
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.EndOfRequest"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public abstract void EndOfRequest();
+
+        //
+        // Virtual helper methods
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.EndOfSendNotification"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public delegate void EndOfSendNotification(HttpWorkerRequest wr, Object extraData);
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SetEndOfSendNotification"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual void SetEndOfSendNotification(EndOfSendNotification callback, Object extraData) {
+            // firing the callback helps with buffer recycling
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.SendCalculatedContentLength"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual void SendCalculatedContentLength(int contentLength) {
+            // opportunity to add Content-Length header if not added by user
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HeadersSent"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual bool HeadersSent() {
+            return true;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.IsClientConnected"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual bool IsClientConnected() {
+            return true;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.CloseConnection"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public virtual void CloseConnection() {
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetClientCertificate"]/*' />
+        /// <devdoc>
+        ///    <para>Defines the base worker class used by ASP.NET Managed code for request
+        ///       processing.</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual byte [] GetClientCertificate() {
+            return new byte[0];
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetClientCertificateValidFrom"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual DateTime GetClientCertificateValidFrom() {
+            return DateTime.Now;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetClientCertificateValidUntil"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual DateTime GetClientCertificateValidUntil() {
+            return DateTime.Now;
+        }
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetClientCertificateBinaryIssuer"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual byte [] GetClientCertificateBinaryIssuer() {
+            return new byte[0];
+        }
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetClientCertificateEncoding"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual int GetClientCertificateEncoding() {
+            return 0;
+        }
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetClientCertificatePublicKey"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        /// <internalonly/>
+        public virtual byte[] GetClientCertificatePublicKey() {
+            return new byte[0];
+        }
+
+        // ************************************************************************
+
+        //
+        // criteria to find out if there is posted data
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.HasEntityBody"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public bool HasEntityBody() {
+            //
+            // content length != 0 -> assume has content
+            //
+
+            String contentLength = GetKnownRequestHeader(HeaderContentLength);
+            if (contentLength != null && !contentLength.Equals("0"))
+                return true;
+
+            //
+            // any content encoding -> assume has content
+            //
+
+            if (GetKnownRequestHeader(HeaderTransferEncoding) != null)
+                return true;
+
+            //
+            // preloaded -> has it
+            //
+
+            if (GetPreloadedEntityBody() != null)
+                return true;
+
+            //
+            // no posted data but everything preloaded -> no content
+            //
+
+            if (IsEntireEntityBodyIsPreloaded())
+                return false;
+
+            return false;
+        }
+
+        // ************************************************************************
+
+        //
+        // Default values for Http status description strings
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetStatusDescription"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static String GetStatusDescription(int code) {
+            if (code >= 100 && code < 600) {
+                int i = code / 100;
+                int j = code % 100;
+
+                if (j < s_HTTPStatusDescriptions[i].Length)
+                    return s_HTTPStatusDescriptions[i][j];
+            }
+
+            return "";
+        }
+
+        // Tables of status strings (first index is code/100, 2nd code%100)
+
+        private static readonly String[][] s_HTTPStatusDescriptions = new String[][]
+        {
+            null,
+
+            new String[]
+            {
+                /* 100 */"Continue",
+                /* 101 */ "Switching Protocols",
+                /* 102 */ "Processing"
+            },
+
+            new String[]
+            {
+                /* 200 */"OK",
+                /* 201 */ "Created",
+                /* 202 */ "Accepted",
+                /* 203 */ "Non-Authoritative Information",
+                /* 204 */ "No Content",
+                /* 205 */ "Reset Content",
+                /* 206 */ "Partial Content",
+                /* 207 */ "Multi-Status"
+            },
+
+            new String[]
+            {
+                /* 300 */"Multiple Choices",
+                /* 301 */ "Moved Permanently",
+                /* 302 */ "Found",
+                /* 303 */ "See Other",
+                /* 304 */ "Not Modified",
+                /* 305 */ "Use Proxy",
+                /* 306 */ "",
+                /* 307 */ "Temporary Redirect"
+            },
+
+            new String[]
+            {
+                /* 400 */"Bad Request",
+                /* 401 */ "Unauthorized",
+                /* 402 */ "Payment Required",
+                /* 403 */ "Forbidden",
+                /* 404 */ "Not Found",
+                /* 405 */ "Method Not Allowed",
+                /* 406 */ "Not Acceptable",
+                /* 407 */ "Proxy Authentication Required",
+                /* 408 */ "Request Timeout",
+                /* 409 */ "Conflict",
+                /* 410 */ "Gone",
+                /* 411 */ "Length Required",
+                /* 412 */ "Precondition Failed",
+                /* 413 */ "Request Entity Too Large",
+                /* 414 */ "Request-Uri Too Long",
+                /* 415 */ "Unsupported Media Type",
+                /* 416 */ "Requested Range Not Satisfiable",
+                /* 417 */ "Expectation Failed",
+                /* 418 */ "",
+                /* 419 */ "",
+                /* 420 */ "",
+                /* 421 */ "",
+                /* 422 */ "Unprocessable Entity",
+                /* 423 */ "Locked",
+                /* 424 */ "Failed Dependency"
+            },
+
+            new String[]
+            {
+                /* 500 */"Internal Server Error",
+                /* 501 */ "Not Implemented",
+                /* 502 */ "Bad Gateway",
+                /* 503 */ "Service Unavailable",
+                /* 504 */ "Gateway Timeout",
+                /* 505 */ "Http Version Not Supported",
+                /* 506 */ "",
+                /* 507 */ "Insufficient Storage"
+            }
+        };
+
+        // ************************************************************************
+
+        //
+        // Header index to string conversions
+        //
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetKnownRequestHeaderIndex"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static int GetKnownRequestHeaderIndex(String header) {
+            Object intObj = s_requestHeadersLookupTable[header];
+
+            if (intObj != null)
+                return(Int32)intObj;
+            else
+                return -1;
+        }
+
+        // ************************************************************************
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetKnownRequestHeaderName"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static String GetKnownRequestHeaderName(int index) {
+            return s_requestHeaderNames[index];
+        }
+
+        // ************************************************************************
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetKnownResponseHeaderIndex"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static int GetKnownResponseHeaderIndex(String header) {
+            Object intObj = s_responseHeadersLookupTable[header];
+
+            if (intObj != null)
+                return(Int32)intObj;
+            else
+                return -1;
+        }
+
+        // ************************************************************************
+
+        //| <include file='doc\WorkerRequest.uex' path='docs/doc[@for="HttpWorkerRequest.GetKnownResponseHeaderName"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static String GetKnownResponseHeaderName(int index) {
+            return s_responseHeaderNames[index];
+        }
+
+        // ************************************************************************
+
+
+        //
+        // Implementation -- lookup tables for header names
+        //
+
+        static private String[] s_requestHeaderNames  = new String[RequestHeaderMaximum];
+        static private String[] s_responseHeaderNames = new String[ResponseHeaderMaximum];
+        static private Hashtable s_requestHeadersLookupTable  = new Hashtable(SymbolHashCodeProvider.Default, SymbolEqualComparer.Default);
+        static private Hashtable s_responseHeadersLookupTable = new Hashtable(SymbolHashCodeProvider.Default, SymbolEqualComparer.Default);
+
+        // ************************************************************************
+
+        static private void DefineHeader(bool isRequest,
+                                         bool isResponse,
+                                         int index,
+                                         String name) {
+            Int32  i32 = new Int32();
+            if (isRequest) {
+                i32 = index;
+                s_requestHeaderNames[index] = name;
+                s_requestHeadersLookupTable.Add(name, i32);
+            }
+
+            if (isResponse) {
+                i32 = index;
+                s_responseHeaderNames[index] = name;
+                s_responseHeadersLookupTable.Add(name, i32);
+            }
+        }
+
+        // ************************************************************************
+
+        static HttpWorkerRequest() {
+            //
+            // common headers
+            //
+
+            DefineHeader(true,  true,  HeaderCacheControl,        "Cache-Control");
+            DefineHeader(true,  true,  HeaderConnection,          "Connection");
+            DefineHeader(true,  true,  HeaderDate,                "Date");
+            DefineHeader(true,  true,  HeaderKeepAlive,           "Keep-Alive");
+            DefineHeader(true,  true,  HeaderPragma,              "Pragma");
+            DefineHeader(true,  true,  HeaderTrailer,             "Trailer");
+            DefineHeader(true,  true,  HeaderTransferEncoding,    "Transfer-Encoding");
+            DefineHeader(true,  true,  HeaderUpgrade,             "Upgrade");
+            DefineHeader(true,  true,  HeaderVia,                 "Via");
+            DefineHeader(true,  true,  HeaderWarning,             "Warning");
+            DefineHeader(true,  true,  HeaderAllow,               "Allow");
+            DefineHeader(true,  true,  HeaderContentLength,       "Content-Length");
+            DefineHeader(true,  true,  HeaderContentType,         "Content-Type");
+            DefineHeader(true,  true,  HeaderContentEncoding,     "Content-Encoding");
+            DefineHeader(true,  true,  HeaderContentLanguage,     "Content-Language");
+            DefineHeader(true,  true,  HeaderContentLocation,     "Content-Location");
+            DefineHeader(true,  true,  HeaderContentMd5,          "Content-MD5");
+            DefineHeader(true,  true,  HeaderContentRange,        "Content-Range");
+            DefineHeader(true,  true,  HeaderExpires,             "Expires");
+            DefineHeader(true,  true,  HeaderLastModified,        "Last-Modified");
+
+            //
+            // request only headers
+            //
+
+            DefineHeader(true,  false, HeaderAccept,              "Accept");
+            DefineHeader(true,  false, HeaderAcceptCharset,       "Accept-Charset");
+            DefineHeader(true,  false, HeaderAcceptEncoding,      "Accept-Encoding");
+            DefineHeader(true,  false, HeaderAcceptLanguage,      "Accept-Language");
+            DefineHeader(true,  false, HeaderAuthorization,       "Authorization");
+            DefineHeader(true,  false, HeaderCookie,              "Cookie");
+            DefineHeader(true,  false, HeaderExpect,              "Expect");
+            DefineHeader(true,  false, HeaderFrom,                "From");
+            DefineHeader(true,  false, HeaderHost,                "Host");
+            DefineHeader(true,  false, HeaderIfMatch,             "If-Match");
+            DefineHeader(true,  false, HeaderIfModifiedSince,     "If-Modified-Since");
+            DefineHeader(true,  false, HeaderIfNoneMatch,         "If-None-Match");
+            DefineHeader(true,  false, HeaderIfRange,             "If-Range");
+            DefineHeader(true,  false, HeaderIfUnmodifiedSince,   "If-Unmodified-Since");
+            DefineHeader(true,  false, HeaderMaxForwards,         "Max-Forwards");
+            DefineHeader(true,  false, HeaderProxyAuthorization,  "Proxy-Authorization");
+            DefineHeader(true,  false, HeaderReferer,             "Referer");
+            DefineHeader(true,  false, HeaderRange,               "Range");
+            DefineHeader(true,  false, HeaderTe,                  "TE");
+            DefineHeader(true,  false, HeaderUserAgent,           "User-Agent");
+
+            //
+            // response only headers
+            //
+
+            DefineHeader(false, true,  HeaderAcceptRanges,        "Accept-Ranges");
+            DefineHeader(false, true,  HeaderAge,                 "Age");
+            DefineHeader(false, true,  HeaderEtag,                "ETag");
+            DefineHeader(false, true,  HeaderLocation,            "Location");
+            DefineHeader(false, true,  HeaderProxyAuthenticate,   "Proxy-Authenticate");
+            DefineHeader(false, true,  HeaderRetryAfter,          "Retry-After");
+            DefineHeader(false, true,  HeaderServer,              "Server");
+            DefineHeader(false, true,  HeaderSetCookie,           "Set-Cookie");
+            DefineHeader(false, true,  HeaderVary,                "Vary");
+            DefineHeader(false, true,  HeaderWwwAuthenticate,     "WWW-Authenticate");
+        }
+    }
+}
diff --git a/base/Libraries/System.Web/httpserverutility.cs b/base/Libraries/System.Web/httpserverutility.cs
new file mode 100644
index 0000000..0b5ec1f
--- /dev/null
+++ b/base/Libraries/System.Web/httpserverutility.cs
@@ -0,0 +1,690 @@
+//------------------------------------------------------------------------------
+// <copyright file="httpserverutility.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Web {
+    using System.Text;
+    using System.Threading;
+    using System.IO;
+    using System.Collections;
+    using System.Globalization;
+    using System.Web.Hosting;
+    using System.Diagnostics;
+
+    //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility"]/*' />
+    /// <devdoc>
+    /// </devdoc>
+    public sealed class HttpUtility {
+
+        //
+        // NOTE Various entire chunks of functionality are not included in
+        // this port. In fact, only URL encoding/decoding is available.
+        //
+
+        //////////////////////////////////////////////////////////////////////////
+        //
+        //  URL decoding / encoding
+        //
+        //////////////////////////////////////////////////////////////////////////
+
+        //
+        //  Public static methods
+        //
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncode"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlEncode(string str) {
+            if (str == null)
+                return null;
+            return UrlEncode(str, Encoding.UTF8);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlPathEncode"]/*' />
+        /// <devdoc>
+        ///    <para>
+        ///       URL encodes a path portion of a URL string and returns the encoded string.
+        ///    </para>
+        /// </devdoc>
+        public static string UrlPathEncode(string str) {
+            if (str == null)
+                return null;
+
+            // recurse in case there is a query string
+            int i = str.IndexOf('?');
+            if (i >= 0)
+                return UrlPathEncode(str.Substring(0, i)) + str.Substring(i);
+
+            // encode DBCS characters and spaces only
+            return UrlEncodeSpaces(UrlEncodeNonAscii(str, Encoding.UTF8));
+        }
+
+        internal static string AspCompatUrlEncode(string s) {
+            s = UrlEncode(s);
+            s = s.Replace("!", "%21");
+            s = s.Replace("*", "%2A");
+            s = s.Replace("(", "%28");
+            s = s.Replace(")", "%29");
+            s = s.Replace("-", "%2D");
+            s = s.Replace(".", "%2E");
+            s = s.Replace("_", "%5F");
+            s = s.Replace("\\", "%5C");
+            return s;
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncode1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlEncode(string str, Encoding e) {
+            if (str == null)
+                return null;
+            return Encoding.ASCII.GetString(UrlEncodeToBytes(str, e));
+        }
+
+        //  Helper to encode the non-ASCII url characters only
+        internal static String UrlEncodeNonAscii(string str, Encoding e) {
+            if (str == null || str.Length == 0)
+                return str;
+            if (e == null)
+                e = Encoding.UTF8;
+            byte[] bytes = e.GetBytes(str);
+            bytes = UrlEncodeBytesToBytesInternalNonAscii(bytes, 0, bytes.Length, false);
+            return Encoding.ASCII.GetString(bytes);
+        }
+
+        //  Helper to encode spaces only
+        internal static String UrlEncodeSpaces(string str) {
+            if (str != null && str.IndexOf(' ') >= 0)
+                str = str.Replace(" ", "%20");
+            return str;
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncode2"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlEncode(byte[] bytes) {
+            if (bytes == null)
+                return null;
+            return Encoding.ASCII.GetString(UrlEncodeToBytes(bytes));
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncode3"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlEncode(byte[] bytes, int offset, int count) {
+            if (bytes == null)
+                return null;
+            return Encoding.ASCII.GetString(UrlEncodeToBytes(bytes, offset, count));
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncodeToBytes"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlEncodeToBytes(string str) {
+            if (str == null)
+                return null;
+            return UrlEncodeToBytes(str, Encoding.UTF8);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncodeToBytes1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlEncodeToBytes(string str, Encoding e) {
+            if (str == null)
+                return null;
+            byte[] bytes = e.GetBytes(str);
+            return UrlEncodeBytesToBytesInternal(bytes, 0, bytes.Length, false);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncodeToBytes2"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlEncodeToBytes(byte[] bytes) {
+            if (bytes == null)
+                return null;
+            return UrlEncodeToBytes(bytes, 0, bytes.Length);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncodeToBytes3"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlEncodeToBytes(byte[] bytes, int offset, int count) {
+            if (bytes == null && count == 0)
+                return null;
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes");
+            }
+            if (offset < 0 || offset > bytes.Length) {
+                throw new ArgumentOutOfRangeException("offset");
+            }
+            if (count < 0 || offset+count > bytes.Length) {
+                throw new ArgumentOutOfRangeException("count");
+            }
+            return UrlEncodeBytesToBytesInternal(bytes, offset, count, true);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncodeUnicode"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlEncodeUnicode(string str) {
+            if (str == null)
+                return null;
+            return UrlEncodeUnicodeStringToStringInternal(str, false);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlEncodeUnicodeToBytes"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlEncodeUnicodeToBytes(string str) {
+            if (str == null)
+                return null;
+            return Encoding.ASCII.GetBytes(UrlEncodeUnicode(str));
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecode"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlDecode(string str) {
+            if (str == null)
+                return null;
+            return UrlDecode(str, Encoding.UTF8);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecode1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlDecode(string str, Encoding e) {
+            if (str == null)
+                return null;
+            return UrlDecodeStringFromStringInternal(str, e);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecode2"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlDecode(byte[] bytes, Encoding e) {
+            if (bytes == null)
+                return null;
+            return UrlDecode(bytes, 0, bytes.Length, e);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecode3"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static string UrlDecode(byte[] bytes, int offset, int count, Encoding e) {
+            if (bytes == null && count == 0)
+                return null;
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes");
+            }
+            if (offset < 0 || offset > bytes.Length) {
+                throw new ArgumentOutOfRangeException("offset");
+            }
+            if (count < 0 || offset+count > bytes.Length) {
+                throw new ArgumentOutOfRangeException("count");
+            }
+            return UrlDecodeStringFromBytesInternal(bytes, offset, count, e);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecodeToBytes"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlDecodeToBytes(string str) {
+            if (str == null)
+                return null;
+            return UrlDecodeToBytes(str, Encoding.UTF8);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecodeToBytes1"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlDecodeToBytes(string str, Encoding e) {
+            if (str == null)
+                return null;
+            return UrlDecodeToBytes(e.GetBytes(str));
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecodeToBytes2"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlDecodeToBytes(byte[] bytes) {
+            if (bytes == null)
+                return null;
+            return UrlDecodeToBytes(bytes, 0, (bytes != null) ? bytes.Length : 0);
+        }
+
+        //| <include file='doc\httpserverutility.uex' path='docs/doc[@for="HttpUtility.UrlDecodeToBytes3"]/*' />
+        /// <devdoc>
+        ///    <para>[To be supplied.]</para>
+        /// </devdoc>
+        public static byte[] UrlDecodeToBytes(byte[] bytes, int offset, int count) {
+            if (bytes == null && count == 0)
+                return null;
+            if (bytes == null) {
+                throw new ArgumentNullException("bytes");
+            }
+            if (offset < 0 || offset > bytes.Length) {
+                throw new ArgumentOutOfRangeException("offset");
+            }
+            if (count < 0 || offset+count > bytes.Length) {
+                throw new ArgumentOutOfRangeException("count");
+            }
+            return UrlDecodeBytesFromBytesInternal(bytes, offset, count);
+        }
+
+        //
+        //  Implementation for encoding
+        //
+
+        private static byte[] UrlEncodeBytesToBytesInternal(byte[] bytes, int offset, int count, bool alwaysCreateReturnValue) {
+            int cSpaces = 0;
+            int cUnsafe = 0;
+
+            // count them first
+            for (int i = 0; i < count; i++) {
+                char ch = (char)bytes[offset+i];
+
+                if (ch == ' ')
+                    cSpaces++;
+                else if (!IsSafe(ch))
+                    cUnsafe++;
+            }
+
+            // nothing to expand?
+            if (!alwaysCreateReturnValue && cSpaces == 0 && cUnsafe == 0)
+                return bytes;
+
+            // expand not 'safe' characters into %XX, spaces to +s
+            byte[] expandedBytes = new byte[count + cUnsafe*2];
+            int pos = 0;
+
+            for (int i = 0; i < count; i++) {
+                byte b = bytes[offset+i];
+                char ch = (char)b;
+
+                if (IsSafe(ch)) {
+                    expandedBytes[pos++] = b;
+                }
+                else if (ch == ' ') {
+                    expandedBytes[pos++] = (byte)'+';
+                }
+                else {
+                    expandedBytes[pos++] = (byte)'%';
+                    expandedBytes[pos++] = (byte)IntToHex((b >> 4) & 0xf);
+                    expandedBytes[pos++] = (byte)IntToHex(b & 0x0f);
+                }
+            }
+
+            return expandedBytes;
+        }
+
+        private static byte[] UrlEncodeBytesToBytesInternalNonAscii(byte[] bytes, int offset, int count, bool alwaysCreateReturnValue) {
+            int cNonAscii = 0;
+
+            // count them first
+            for (int i = 0; i < count; i++) {
+                if ((bytes[offset+i] & 0x80) != 0)
+                    cNonAscii++;
+            }
+
+            // nothing to expand?
+            if (!alwaysCreateReturnValue && cNonAscii == 0)
+                return bytes;
+
+            // expand not 'safe' characters into %XX, spaces to +s
+            byte[] expandedBytes = new byte[count + cNonAscii*2];
+            int pos = 0;
+
+            for (int i = 0; i < count; i++) {
+                byte b = bytes[offset+i];
+
+                if ((bytes[offset+i] & 0x80) == 0) {
+                    expandedBytes[pos++] = b;
+                }
+                else {
+                    expandedBytes[pos++] = (byte)'%';
+                    expandedBytes[pos++] = (byte)IntToHex((b >> 4) & 0xf);
+                    expandedBytes[pos++] = (byte)IntToHex(b & 0x0f);
+                }
+            }
+
+            return expandedBytes;
+        }
+
+
+        private static string UrlEncodeUnicodeStringToStringInternal(string s, bool ignoreAscii) {
+            int l = s.Length;
+            StringBuilder sb = new StringBuilder(l);
+
+            for (int i = 0; i < l; i++) {
+                char ch = s[i];
+
+                if ((ch & 0xff80) == 0) {  // 7 bit?
+                    if (ignoreAscii || IsSafe(ch)) {
+                        sb.Append(ch);
+                    }
+                    else if (ch == ' ') {
+                        sb.Append('+');
+                    }
+                    else {
+                        sb.Append('%');
+                        sb.Append(IntToHex((ch >>  4) & 0xf));
+                        sb.Append(IntToHex((ch      ) & 0xf));
+                    }
+                }
+                else { // arbitrary Unicode?
+                    sb.Append("%u");
+                    sb.Append(IntToHex((ch >> 12) & 0xf));
+                    sb.Append(IntToHex((ch >>  8) & 0xf));
+                    sb.Append(IntToHex((ch >>  4) & 0xf));
+                    sb.Append(IntToHex((ch      ) & 0xf));
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        //
+        //  Implementation for decoding
+        //
+
+        // Internal class to facilitate URL decoding -- keeps char buffer and byte buffer, allows appending of either chars or bytes
+        private class UrlDecoder {
+            private int _bufferSize;
+
+            // Accumulate characters in a special array
+            private int _numChars;
+            private char[] _charBuffer;
+
+            // Accumulate bytes for decoding into characters in a special array
+            private int _numBytes;
+            private byte[] _byteBuffer;
+
+            // Encoding to convert chars to bytes
+            private Encoding _encoding;
+
+            private void FlushBytes() {
+                if (_numBytes > 0) {
+                    _numChars += _encoding.GetChars(_byteBuffer, 0, _numBytes, _charBuffer, _numChars);
+                    _numBytes = 0;
+                }
+            }
+
+            internal UrlDecoder(int bufferSize, Encoding encoding) {
+                _bufferSize = bufferSize;
+                _encoding = encoding;
+
+                _charBuffer = new char[bufferSize];
+                // byte buffer created on demand
+            }
+
+            internal void AddChar(char ch) {
+                if (_numBytes > 0)
+                    FlushBytes();
+
+                _charBuffer[_numChars++] = ch;
+            }
+
+            internal void AddByte(byte b) {
+                // if there are no pending bytes treat 7 bit bytes as characters
+                // this optimization is temp disable as it doesn't work for some encodings
+/*
+                if (_numBytes == 0 && ((b & 0x80) == 0)) {
+                    AddChar((char)b);
+                }
+                else
+*/
+                {
+                    if (_byteBuffer == null)
+                        _byteBuffer = new byte[_bufferSize];
+
+                    _byteBuffer[_numBytes++] = b;
+                }
+            }
+
+            internal String GetString() {
+                if (_numBytes > 0)
+                    FlushBytes();
+
+                if (_numChars > 0)
+                    return new String(_charBuffer, 0, _numChars);
+                else
+                    return String.Empty;
+            }
+        }
+
+        internal static string CollapsePercentUFromStringInternal(string s, Encoding e) {
+            int count = s.Length;
+            UrlDecoder helper = new UrlDecoder(count, e);
+
+            // go through the string's chars collapsing just %uXXXX and
+            // appending each char as char
+            int loc = s.IndexOf("%u");
+            if(loc == -1) {
+                return s;
+            }
+
+            for (int pos = 0; pos < count; pos++) {
+                char ch = s[pos];
+
+                if (ch == '%' && pos < count-5) {
+                    if(s[pos+1] == 'u') {
+                        int h1 = HexToInt(s[pos+2]);
+                        int h2 = HexToInt(s[pos+3]);
+                        int h3 = HexToInt(s[pos+4]);
+                        int h4 = HexToInt(s[pos+5]);
+
+                        if (h1 >= 0 && h2 >= 0 && h3 >= 0 && h4 >= 0) { //valid 4 hex chars
+                            ch = (char)((h1 << 12) | (h2 << 8) | (h3 << 4) | h4);
+                            pos += 5;
+
+                            // add as char
+                            helper.AddChar(ch);
+                            continue;
+                        }
+                    }
+                }
+                if ((ch & 0xFF80) == 0)
+                    helper.AddByte((byte)ch); // 7 bit have to go as bytes because of Unicode
+                else
+                    helper.AddChar(ch);
+            }
+            return helper.GetString();
+        }
+
+        private static string UrlDecodeStringFromStringInternal(string s, Encoding e) {
+            int count = s.Length;
+            UrlDecoder helper = new UrlDecoder(count, e);
+
+            // go through the string's chars collapsing %XX and %uXXXX and
+            // appending each char as char, with exception of %XX constructs
+            // that are appended as bytes
+
+            for (int pos = 0; pos < count; pos++) {
+                char ch = s[pos];
+
+                if (ch == '+') {
+                    ch = ' ';
+                }
+                else if (ch == '%' && pos < count-2) {
+                    if (s[pos+1] == 'u' && pos < count-5) {
+                        int h1 = HexToInt(s[pos+2]);
+                        int h2 = HexToInt(s[pos+3]);
+                        int h3 = HexToInt(s[pos+4]);
+                        int h4 = HexToInt(s[pos+5]);
+
+                        if (h1 >= 0 && h2 >= 0 && h3 >= 0 && h4 >= 0) {   // valid 4 hex chars
+                            ch = (char)((h1 << 12) | (h2 << 8) | (h3 << 4) | h4);
+                            pos += 5;
+
+                            // only add as char
+                            helper.AddChar(ch);
+                            continue;
+                        }
+                    }
+                    else {
+                        int h1 = HexToInt(s[pos+1]);
+                        int h2 = HexToInt(s[pos+2]);
+
+                        if (h1 >= 0 && h2 >= 0) {     // valid 2 hex chars
+                            byte b = (byte)((h1 << 4) | h2);
+                            pos += 2;
+
+                            // don't add as char
+                            helper.AddByte(b);
+                            continue;
+                        }
+                    }
+                }
+
+                if ((ch & 0xFF80) == 0)
+                    helper.AddByte((byte)ch); // 7 bit have to go as bytes because of Unicode
+                else
+                    helper.AddChar(ch);
+            }
+
+            return helper.GetString();
+        }
+
+        private static string UrlDecodeStringFromBytesInternal(byte[] buf, int offset, int count, Encoding e) {
+            UrlDecoder helper = new UrlDecoder(count, e);
+
+            // go through the bytes collapsing %XX and %uXXXX and appending
+            // each byte as byte, with exception of %uXXXX constructs that
+            // are appended as chars
+
+            for (int i = 0; i < count; i++) {
+                int pos = offset + i;
+                byte b = buf[pos];
+
+                // The code assumes that + and % cannot be in multibyte sequence
+
+                if (b == '+') {
+                    b = (byte)' ';
+                }
+                else if (b == '%' && i < count-2) {
+                    if (buf[pos+1] == 'u' && i < count-5) {
+                        int h1 = HexToInt((char)buf[pos+2]);
+                        int h2 = HexToInt((char)buf[pos+3]);
+                        int h3 = HexToInt((char)buf[pos+4]);
+                        int h4 = HexToInt((char)buf[pos+5]);
+
+                        if (h1 >= 0 && h2 >= 0 && h3 >= 0 && h4 >= 0) {   // valid 4 hex chars
+                            char ch = (char)((h1 << 12) | (h2 << 8) | (h3 << 4) | h4);
+                            i += 5;
+
+                            // don't add as byte
+                            helper.AddChar(ch);
+                            continue;
+                        }
+                    }
+                    else {
+                        int h1 = HexToInt((char)buf[pos+1]);
+                        int h2 = HexToInt((char)buf[pos+2]);
+
+                        if (h1 >= 0 && h2 >= 0) {     // valid 2 hex chars
+                            b = (byte)((h1 << 4) | h2);
+                            i += 2;
+                        }
+                    }
+                }
+
+                helper.AddByte(b);
+            }
+
+            return helper.GetString();
+        }
+
+        private static byte[] UrlDecodeBytesFromBytesInternal(byte[] buf, int offset, int count) {
+            int decodedBytesCount = 0;
+            byte[] decodedBytes = new byte[count];
+
+            for (int i = 0; i < count; i++) {
+                int pos = offset + i;
+                byte b = buf[pos];
+
+                if (b == '+') {
+                    b = (byte)' ';
+                }
+                else if (b == '%' && i < count-2) {
+                    int h1 = HexToInt((char)buf[pos+1]);
+                    int h2 = HexToInt((char)buf[pos+2]);
+
+                    if (h1 >= 0 && h2 >= 0) {     // valid 2 hex chars
+                        b = (byte)((h1 << 4) | h2);
+                        i += 2;
+                    }
+                }
+
+                decodedBytes[decodedBytesCount++] = b;
+            }
+
+            if (decodedBytesCount < decodedBytes.Length) {
+                byte[] newDecodedBytes = new byte[decodedBytesCount];
+                Array.Copy(decodedBytes, newDecodedBytes, decodedBytesCount);
+                decodedBytes = newDecodedBytes;
+            }
+
+            return decodedBytes;
+        }
+
+        //
+        // Private helpers for URL encoding/decoding
+        //
+
+        private static int HexToInt(char h) {
+            return( h >= '0' && h <= '9' ) ? h - '0' :
+            ( h >= 'a' && h <= 'f' ) ? h - 'a' + 10 :
+            ( h >= 'A' && h <= 'F' ) ? h - 'A' + 10 :
+            -1;
+        }
+
+        private static char IntToHex(int n) {
+            Debug.Assert(n < 0x10);
+
+            if (n <= 9)
+                return(char)(n + (int)'0');
+            else
+                return(char)(n - 10 + (int)'a');
+        }
+
+        // Set of safe chars, from RFC 1738.4 minus '+'
+        private static bool IsSafe(char ch) {
+            if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9')
+                return true;
+
+            switch (ch) {
+                case '-':
+                case '_':
+                case '.':
+                case '!':
+                case '*':
+                case '\'':
+                case '(':
+                case ')':
+                    return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/base/Libraries/UnitTest/Assert.cs b/base/Libraries/UnitTest/Assert.cs
new file mode 100644
index 0000000..aaaca8c
--- /dev/null
+++ b/base/Libraries/UnitTest/Assert.cs
@@ -0,0 +1,1535 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Assert.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+using System.Collections;
+
+namespace Microsoft.Singularity.UnitTest
+{
+    public sealed class Assert
+    {
+        private static int passes   = 0;
+        private static int failures = 0;
+
+        /// <summary>
+        /// Accessor for the number of assertions passed.
+        /// </summary>
+        public static int Passes { get { return passes; } }
+
+        /// <summary>
+        /// Accessor for the number of assertions failed.
+        /// </summary>
+        public static int Failures { get { return failures; } }
+
+        private static void True(bool condition,
+                                 string userMessage,
+                                 string /*!*/ conditionMessage)
+        {
+            if (!condition) {
+                Interlocked.Increment(ref failures);
+                UnitTest.Throw(new FailedAssertionException(userMessage,
+                                                          conditionMessage));
+            }
+            Interlocked.Increment(ref passes);
+        }
+
+        public static void True(bool condition, string userMessage)
+        {
+            if (!condition) {
+                Interlocked.Increment(ref failures);
+                UnitTest.Throw(new FailedAssertionException(userMessage));
+            }
+            Interlocked.Increment(ref passes);
+        }
+
+        public static void False(bool condition, string message)
+        {
+            Assert.True(!condition, message);
+        }
+
+        public static void Null(object obj, string message)
+        {
+            Assert.True(obj == null, message);
+        }
+
+        public static void NonNull(object obj, string message)
+        {
+            Assert.True(obj != null, message);
+        }
+
+        public static void SameObject(object object1,
+                                      object object2,
+                                      string message)
+        {
+            Assert.True(Object.ReferenceEquals(object1, object2),
+                        message,
+                        "Expected references to the same object.");
+        }
+
+        public static void NotSameObject(object object1,
+                                         object object2,
+                                         string message)
+        {
+            Assert.True(!Object.ReferenceEquals(object1, object2),
+                        message,
+                        "Expected references to the different objects.");
+        }
+
+        public static void Equal(object object1,
+                                 object object2,
+                                 string message)
+        {
+            Assert.True(Object.Equals(object1, object2),
+                        message,
+                        "Expected objects to be equal.");
+        }
+
+        public static void NotEqual(object object1,
+                                    object object2,
+                                    string message)
+        {
+            Assert.True(!Object.Equals(object1, object2),
+                        message,
+                        "Expected objects to be different.");
+        }
+
+#region script generated region
+
+        private static void FailEqual(IComparable /*!*/ u,
+                                      IComparable /*!*/ v,
+                                      string message)
+        {
+            Assert.True(false, message,
+                        string.Format("Failed equality test: {0} == {1} is false.", u, v));
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(sbyte u, sbyte v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(byte u, byte v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(short u, short v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(ushort u, ushort v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(int u, int v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(uint u, uint v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(long u, long v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(ulong u, ulong v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(char u, char v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(float u, float v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(double u, double v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(decimal u, decimal v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(IComparable /*!*/ u, IComparable /*!*/ v, string message)
+        {
+            if (!(u.CompareTo(v) == 0)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Equal(bool u, bool v, string message)
+        {
+            if (!(u == v)) FailEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        private static void FailGreater(IComparable /*!*/ u,
+                                        IComparable /*!*/ v,
+                                        string message)
+        {
+            Assert.True(false, message,
+                        string.Format("Failed greater than test: {0} > {1} is false.", u, v));
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(sbyte u, sbyte v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(byte u, byte v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(short u, short v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(ushort u, ushort v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(int u, int v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(uint u, uint v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(long u, long v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(ulong u, ulong v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(char u, char v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(float u, float v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(double u, double v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(decimal u, decimal v, string message)
+        {
+            if (!(u > v)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Greater(IComparable /*!*/ u, IComparable /*!*/ v, string message)
+        {
+            if (!(u.CompareTo(v) > 0)) FailGreater(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        private static void FailGreaterOrEqual(IComparable /*!*/ u,
+                                               IComparable /*!*/ v,
+                                               string message)
+        {
+            Assert.True(false, message,
+                        string.Format("Failed greater than or equal to test: {0} >= {1} is false.", u, v));
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(sbyte u, sbyte v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(byte u, byte v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(short u, short v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(ushort u, ushort v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(int u, int v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(uint u, uint v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(long u, long v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(ulong u, ulong v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(char u, char v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(float u, float v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(double u, double v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(decimal u, decimal v, string message)
+        {
+            if (!(u >= v)) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is greater than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void GreaterOrEqual(IComparable /*!*/ u, IComparable /*!*/ v, string message)
+        {
+            if (u.CompareTo(v) < 0) FailGreaterOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        private static void FailLess(IComparable /*!*/ u,
+                                     IComparable /*!*/ v,
+                                     string message)
+        {
+            Assert.True(false, message,
+                        string.Format("Failed less than test: {0} < {1} is false.", u, v));
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(sbyte u, sbyte v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(byte u, byte v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(short u, short v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(ushort u, ushort v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(int u, int v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(uint u, uint v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(long u, long v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(ulong u, ulong v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(char u, char v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(float u, float v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(double u, double v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(decimal u, decimal v, string message)
+        {
+            if (!(u < v)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void Less(IComparable /*!*/ u, IComparable /*!*/ v, string message)
+        {
+            if (!(u.CompareTo(v) < 0)) FailLess(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        private static void FailLessOrEqual(IComparable /*!*/ u,
+                                            IComparable /*!*/ v,
+                                            string message)
+        {
+            Assert.True(false, message,
+                        string.Format("Failed less than or equal to test: {0} <= {1} is false.", u, v));
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(sbyte u, sbyte v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(byte u, byte v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(short u, short v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(ushort u, ushort v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(int u, int v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(uint u, uint v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(long u, long v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(ulong u, ulong v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(char u, char v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(float u, float v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(double u, double v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(decimal u, decimal v, string message)
+        {
+            if (!(u <= v)) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+        ///<summary>
+        /// Asserts the first argument is less than or equal to the
+        /// second argument.
+        /// <para>
+        /// If the assertion fails, the method adds the
+        /// values and comparison to the error message so
+        /// the user does not have to supply this
+        /// information in the <paramref name="message"/>
+        /// argument.
+        /// </para>
+        ///</summary>
+        /// <param name = "u">The first argument. </param>
+        /// <param name = "v">The second argument. </param>
+        /// <param name = "message">The message displayed
+        /// on failure. </param>
+        public static void LessOrEqual(IComparable /*!*/ u, IComparable /*!*/ v, string message)
+        {
+            if (u.CompareTo(v) > 0) FailLessOrEqual(u, v, message);
+            Interlocked.Increment(ref passes);
+        }
+
+#endregion script generated region
+    }
+}
diff --git a/base/Libraries/UnitTest/FailedAssertionException.cs b/base/Libraries/UnitTest/FailedAssertionException.cs
new file mode 100644
index 0000000..25d1a0d
--- /dev/null
+++ b/base/Libraries/UnitTest/FailedAssertionException.cs
@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FailedAssertionException.cs
+//
+//  Note:
+//
+
+namespace Microsoft.Singularity.UnitTest
+{
+    public sealed class FailedAssertionException : System.Exception
+    {
+        public FailedAssertionException(string userMessage)
+            : base(userMessage)
+        {
+        }
+
+        public FailedAssertionException(string userMessage,
+                                        string /*!*/ conditionMessage)
+            : base(string.Format("{0}\n{1}", userMessage, conditionMessage))
+        {
+        }
+    }
+}
diff --git a/base/Libraries/UnitTest/TestAppAttribute.cs b/base/Libraries/UnitTest/TestAppAttribute.cs
new file mode 100644
index 0000000..3afdf0c
--- /dev/null
+++ b/base/Libraries/UnitTest/TestAppAttribute.cs
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TestAppAttribute
+//
+//  Note:
+//
+
+using System;
+
+namespace Microsoft.Singularity.UnitTest
+{
+    /* This annotation on an assembly indicates that the assembly should be treated
+       as a stand-alone test application, and executed as part of the indicated
+       group of tests.
+    */
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class TestAppAttribute : Attribute
+    {
+        public string TestGroup;
+    }
+}
diff --git a/base/Libraries/UnitTest/UnitTest.cs b/base/Libraries/UnitTest/UnitTest.cs
new file mode 100644
index 0000000..777a28d
--- /dev/null
+++ b/base/Libraries/UnitTest/UnitTest.cs
@@ -0,0 +1,148 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UnitTest.cs
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+
+namespace Microsoft.Singularity.UnitTest
+{
+    public sealed class UnitTest
+    {
+        public enum Result
+        {
+            Passed = 0,
+            Failed = 1
+        }
+
+        public delegate void TestDelegate();
+
+        internal sealed class TestCommand
+        {
+            private string /*!*/       description;
+            private TestDelegate /*!*/ testDelegate;
+
+            internal TestCommand(string /*!*/       description,
+                                 TestDelegate /*!*/ testDelegate)
+            {
+                this.description  = description;
+                this.testDelegate = testDelegate;
+            }
+
+            internal string Description { get { return description; } }
+            internal void Execute()     { testDelegate(); }
+        }
+
+        private static ArrayList! tests    = new ArrayList();
+        private static object    classLock = new object();
+
+        private static int runThreadId;
+        private static volatile int  otherThreadExceptions  = 0;
+        private static volatile bool expectAssertionFailure = false;
+
+        public static void Add(string /*!*/       description,
+                               TestDelegate /*!*/ test)
+        {
+            tests.Add(new TestCommand(description, test));
+        }
+
+        public static void Clear()
+        {
+            tests.Clear();
+        }
+
+        public static void ExpectNextAssertionFails()
+        {
+            lock (classLock) {
+                UnitTest.expectAssertionFailure = true;
+            }
+        }
+
+        public static void ExpectNextAssertionPasses()
+        {
+            lock (classLock) {
+                UnitTest.expectAssertionFailure = false;
+            }
+        }
+
+        public static Result Run(bool stopOnFailure)
+        {
+            runThreadId = GetCurrentThreadId();
+
+            int failures = 0;
+
+            foreach (TestCommand! tc in tests) {
+                Result r = Result.Passed;
+                try {
+                    Console.Write("Running test {0}...", tc.Description);
+                    lock (classLock) {
+                        UnitTest.otherThreadExceptions = 0;
+                    }
+                    tc.Execute();
+                    lock (classLock) {
+                        if (UnitTest.otherThreadExceptions == 0) {
+                            Console.WriteLine("Passed.");
+                        }
+                        else {
+                            Console.WriteLine("Failed.");
+                            r = Result.Failed;
+                        }
+                    }
+                }
+                catch (FailedAssertionException fae) {
+                    Console.WriteLine("Failed.");
+                    Console.WriteLine(fae);
+                    r = Result.Failed;
+                }
+                catch (Exception e) {
+                    Console.WriteLine("Failed: Unexpected exception caught.");
+                    Console.WriteLine(e);
+                    r = Result.Failed;
+                }
+                if (r == Result.Failed) {
+                    failures++;
+                    if (stopOnFailure) {
+                        break;
+                    }
+                }
+            }
+            return (failures == 0) ? Result.Passed : Result.Failed;
+        }
+
+        private static int GetCurrentThreadId()
+        {
+#if SINGULARITY
+            return Thread.CurrentThread.GetThreadId();
+#else
+            return AppDomain.GetCurrentThreadId();
+#endif
+        }
+
+        internal static void Throw(FailedAssertionException /*!*/ e)
+        {
+            lock (classLock) {
+
+                if (UnitTest.expectAssertionFailure == true) {
+                    UnitTest.expectAssertionFailure = false;
+                    return;
+                }
+
+                int threadId = GetCurrentThreadId();
+                if (threadId != runThreadId) {
+                    UnitTest.otherThreadExceptions++;
+                    Console.WriteLine("Tester Failure on thread {0}: {1}",
+                                      threadId, e);
+                }
+            }
+            throw e;
+        }
+    }
+}
diff --git a/base/Libraries/UnitTest/UnitTestLib.csproj b/base/Libraries/UnitTest/UnitTestLib.csproj
new file mode 100644
index 0000000..681cd36
--- /dev/null
+++ b/base/Libraries/UnitTest/UnitTestLib.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>UnitTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Assert.cs" />
+    <Compile Include="FailedAssertionException.cs" />
+    <Compile Include="TestAppAttribute.cs" />
+    <Compile Include="UnitTest.cs" />
+    <Compile Include="WatchDogTimer.cs" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/UnitTest/WatchDogTimer.cs b/base/Libraries/UnitTest/WatchDogTimer.cs
new file mode 100644
index 0000000..0aae655
--- /dev/null
+++ b/base/Libraries/UnitTest/WatchDogTimer.cs
@@ -0,0 +1,110 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WatchDogTimer.cs
+//
+//  Note:
+//
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.UnitTest
+{
+    /// <remarks> A class to watch for timeouts.</remarks>
+    public sealed class WatchDogTimer
+    {
+        private TimeSpan        timeout;
+        private Thread          worker;
+        private volatile bool   running;
+        private AutoResetEvent! workEvent;
+
+        public WatchDogTimer(TimeSpan timeout)
+        {
+            this.timeout = timeout;
+            this.running = false;
+            this.workEvent   = new AutoResetEvent(false);
+        }
+
+        public void Start()
+        {
+            lock (this) {
+                if (!this.running) {
+                    this.running = true;
+                    this.worker = new Thread(new ThreadStart(WorkerMain));
+                    this.worker.Start();
+                }
+            }
+        }
+
+        public void Stop()
+        {
+            Thread toJoin = null;
+            lock (this) {
+                if (this.running) {
+                    this.running = false;
+                    this.workEvent.Set();
+                    toJoin = this.worker;
+                    this.worker = null;
+                }
+            }
+            if (toJoin != null) {
+                toJoin.Join();
+            }
+        }
+
+        public void Defer()
+        {
+            lock (this) {
+                Assert.True(this.running,
+                            "Watch dog timer expired or stopped.");
+                workEvent.Set();
+            }
+        }
+
+        public bool Running
+        {
+            get { return this.running; }
+        }
+
+        private void LockedWorkerExpire()
+        {
+            try {
+                Assert.True(false, "Watch-dog timed out.");
+            }
+            catch (FailedAssertionException) {
+                // Expected
+            }
+            this.running = false;
+        }
+
+        private void WorkerMain()
+        {
+            bool done = false;
+            while (!done) {
+                bool signalled = WaitOne(this.workEvent, this.timeout);
+                lock (this) {
+                    if (signalled) {
+                        done = !this.running;
+                    }
+                    else {
+                        LockedWorkerExpire();
+                        done = true;
+                    }
+                }
+            }
+        }
+
+        private static bool WaitOne(WaitHandle /*!*/ w, TimeSpan t)
+        {
+#if SINGULARITY
+            return w.WaitOne(t);
+#else
+            return w.WaitOne(t, false);
+#endif
+        }
+    }
+}
diff --git a/base/Libraries/WebApps/IHttpRequest.cs b/base/Libraries/WebApps/IHttpRequest.cs
new file mode 100644
index 0000000..f5b437f
--- /dev/null
+++ b/base/Libraries/WebApps/IHttpRequest.cs
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IHttpRequest.cs
+//  Note:   The interface implemented by Http request objects, as processed by
+//          web applications under Singularity.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.WebApps
+{
+    public interface IHttpRequest
+    {
+        // Methods to fetch information about the request
+        string! GetUriPath();
+        string GetQueryString();
+        string GetVerb();
+        string GetHeader(string! headerName);
+        byte[] GetBodyData();
+        string! GetRemoteAddress();
+
+        // Methods to push response data
+        void SendStatus(int code, string! description);
+        void SendHeader(string! name, string! value);
+        void SendBodyData(byte[]! data);
+        void SendBodyData([Claims] byte[]! in ExHeap data);
+
+        // Call this once when done processing
+        void Done();
+    }
+}
diff --git a/base/Libraries/WebApps/IWebApp.cs b/base/Libraries/WebApps/IWebApp.cs
new file mode 100644
index 0000000..9128eeb
--- /dev/null
+++ b/base/Libraries/WebApps/IWebApp.cs
@@ -0,0 +1,21 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IWebApp.cs
+//  Note:   The interface implemented by web applications under Singularity
+//
+
+//
+// This interface is the base class for web applications, whether or not
+// they are run in-process or out-of-process.
+//
+namespace Microsoft.Singularity.WebApps
+{
+    public interface IWebApp
+    {
+        void ProcessRequest(IHttpRequest! request);
+    }
+}
diff --git a/base/Libraries/WebApps/RemoteHttpRequest.sg b/base/Libraries/WebApps/RemoteHttpRequest.sg
new file mode 100644
index 0000000..5e24707
--- /dev/null
+++ b/base/Libraries/WebApps/RemoteHttpRequest.sg
@@ -0,0 +1,224 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RemoteHttpRequest.sg
+//
+//  Note:
+//    This file wraps a HttpRequestContract so it can be accessed like a
+//    regular object.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.WebApps.Contracts;
+
+namespace Microsoft.Singularity.WebApps
+{
+    public class RemoteHttpRequest : IHttpRequest
+    {
+        private TRef<HttpRequestContract.Imp:Start> m_Conn;
+
+        public RemoteHttpRequest([Claims] HttpRequestContract.Imp:Start! conn)
+        {
+            m_Conn = new TRef<HttpRequestContract.Imp:Start>(conn);
+        }
+
+        public string! GetUriPath()
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[]! in ExHeap uriChars;
+                conn.SendGetUriPath();
+                conn.RecvUriPath(out uriChars);
+                string retval = Bitter.ToString2(uriChars);
+                delete uriChars;
+                return retval;
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public string GetQueryString()
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[] in ExHeap queryChars;
+                conn.SendGetQueryString();
+                conn.RecvQueryString(out queryChars);
+
+                if (queryChars != null)
+                {
+                    string retval = Bitter.ToString(queryChars);
+                    delete queryChars;
+                    return retval;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public string GetVerb()
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[]! in ExHeap verbChars;
+                conn.SendGetVerb();
+                conn.RecvVerb(out verbChars);
+                string retval = Bitter.ToString(verbChars);
+                delete verbChars;
+                return retval;
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public string GetHeader(string! headerName)
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[] in ExHeap headerChars;
+                conn.SendGetHeader(Bitter.FromString2(headerName));
+                conn.RecvHeaderValue(out headerChars);
+
+                if (headerChars != null) {
+                    string retval = Bitter.ToString(headerChars);
+                    delete headerChars;
+                    return retval;
+                } else {
+                    return null;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public byte[] GetBodyData()
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                byte[] in ExHeap bodyBytes;
+                conn.SendGetBody();
+                conn.RecvBodyData(out bodyBytes);
+
+                if (bodyBytes != null) {
+                    byte[] retval = Bitter.ToByteArray(bodyBytes);
+                    delete bodyBytes;
+                    return retval;
+                } else {
+                    return null;
+                }
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public string! GetRemoteAddress()
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[]! in ExHeap addrChars;
+                conn.SendGetRemoteAddress();
+                conn.RecvRemoteAddress(out addrChars);
+                string! retval = Bitter.ToString2(addrChars);
+                delete addrChars;
+                return retval;
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public void SendStatus(int code, string! description)
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[]! in ExHeap descChars = Bitter.FromString2(description);
+                conn.SendSendStatus(code, descChars);
+                conn.RecvOK();
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public void SendHeader(string! name, string! value)
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                char[]! in ExHeap nameChars = Bitter.FromString2(name);
+                char[]! in ExHeap valChars = Bitter.FromString2(value);
+                conn.SendSendHeader(nameChars, valChars);
+                conn.RecvOK();
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public void SendBodyData(byte[]! data)
+        {
+            SendBodyData(Bitter.FromByteArray(data));
+        }
+
+        public void SendBodyData([Claims]byte[]! in ExHeap data)
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            try
+            {
+                conn.SendSendBodyData(data);
+                conn.RecvOK();
+            }
+            finally
+            {
+                m_Conn.Release(conn);
+            }
+        }
+
+        public void Done()
+        {
+            HttpRequestContract.Imp conn = m_Conn.Acquire();
+
+            conn.SendDone();
+            delete conn;
+        }
+    }
+}
diff --git a/base/Libraries/WebApps/WebAppsLib.csproj b/base/Libraries/WebApps/WebAppsLib.csproj
new file mode 100644
index 0000000..b56387c
--- /dev/null
+++ b/base/Libraries/WebApps/WebAppsLib.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\WebApps\WebApps.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>WebApps</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="IHttpRequest.cs" />
+    <Compile Include="IWebApp.cs" />
+    <Compile Include="RemoteHttpRequest.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\WebApps.Contracts\WebApps.Contracts.csproj" />
+<!--    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj"/> -->
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Xml/Xml.csproj b/base/Libraries/Xml/Xml.csproj
new file mode 100644
index 0000000..14d94f6
--- /dev/null
+++ b/base/Libraries/Xml/Xml.csproj
@@ -0,0 +1,36 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\xxx\xxx.csproj
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Singularity.Xml</AssemblyName>
+    <Language>C#</Language>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="XmlException.cs" />
+    <Compile Include="XmlNode.cs" />
+    <Compile Include="XmlReader.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
diff --git a/base/Libraries/Xml/XmlException.cs b/base/Libraries/Xml/XmlException.cs
new file mode 100644
index 0000000..c37005c
--- /dev/null
+++ b/base/Libraries/Xml/XmlException.cs
@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace Microsoft.Singularity.Xml
+{
+    /// <summary>
+    /// Summary description for XmlException.
+    /// </summary>
+    public class XmlException : Exception
+    {
+        public XmlException(string message) : base(message)
+        {
+        }
+    }
+}
diff --git a/base/Libraries/Xml/XmlNode.cs b/base/Libraries/Xml/XmlNode.cs
new file mode 100644
index 0000000..0bafa90
--- /dev/null
+++ b/base/Libraries/Xml/XmlNode.cs
@@ -0,0 +1,193 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Microsoft.Singularity.Xml
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+
+    /// <summary>
+    /// Summary description for XmlNode.
+    /// </summary>
+    public class XmlNode
+    {
+        private string name;
+        private int depth;
+        private string text;
+        private Hashtable attributes;
+        private ArrayList children;
+
+        public XmlNode(string name, int depth)
+        {
+            this.name = name;
+            this.depth = depth;
+            attributes = new Hashtable();
+            children = new ArrayList();
+            this.text = "";
+        }
+
+        public ArrayList GetNamedChildren(string name)
+        {
+            ArrayList result = new ArrayList();
+            foreach (XmlNode childNode in children) {
+                if (childNode.Name == name) {
+                    result.Add(childNode);
+                }
+            }
+            return result;
+        }
+
+        public XmlNode GetNestedChild(String[] childNames)
+        {
+            XmlNode node = this;
+
+            for (int i = 0; node != null && i < childNames.Length; i++) {
+                node = node.GetNestedChild(childNames[i]);
+            }
+            return node;
+        }
+
+        public XmlNode GetNestedChild(String childName)
+        {
+            foreach (XmlNode childNode in children) {
+                if (childNode.Name == childName) {
+                    return childNode;
+                }
+            }
+            return null;
+        }
+
+        public int Depth
+        {
+            get { return depth; }
+        }
+
+        public string Name
+        {
+            get { return name; }
+        }
+
+        public void AddChild(XmlNode node)
+        {
+            children.Add(node);
+            return;
+        }
+
+        public ArrayList Children
+        {
+            get { return new ArrayList(children); }
+        }
+
+        public void AddText(string text)
+        {
+            this.text += text;
+            return;
+        }
+
+        public string Text
+        {
+            get { return text; }
+        }
+
+        public string this[string attributeName]
+        {
+            get
+            {
+                if (!attributes.ContainsKey(attributeName))
+                {
+                    return null;
+                }
+                else
+                {
+                    return (string)attributes[attributeName];
+                }
+            }
+            set
+            {
+                attributes[attributeName] = value;
+            }
+        }
+
+        //
+        // Safe access to attributes:
+        //      since the kernel is going to use this object, we should
+        //      push the error-checking into the object instead of risking
+        //      the kernel forgetting to error check in some obscure method
+        //
+
+        public string GetAttribute(string attributeName, string defaultValue)
+        {
+            if (!attributes.ContainsKey(attributeName)) {
+                return defaultValue;
+            }
+            else {
+                return (string)attributes[attributeName];
+            }
+        }
+
+        public bool GetAttribute(string attributeName, bool defaultValue)
+        {
+            if (!attributes.ContainsKey(attributeName)) {
+                return defaultValue;
+            }
+            else {
+                return (string)attributes[attributeName] ==
+                    System.Boolean.TrueString;
+            }
+        }
+
+        public int GetAttribute(string attributeName, int defaultValue)
+        {
+            if (!attributes.ContainsKey(attributeName)) {
+                return defaultValue;
+            }
+            else {
+                string num = (string)attributes[attributeName];
+                if (num.StartsWith("0x") || num.StartsWith("0X")) {
+                    return System.Int32.Parse(num, NumberStyles.AllowHexSpecifier);
+                }
+                else {
+                    return System.Int32.Parse(num);
+                }
+            }
+        }
+
+        [CLSCompliant(false)]
+        public UIntPtr GetAttributeAsUIntPtr(string attributeName, UIntPtr defaultValue)
+        {
+            if (!attributes.ContainsKey(attributeName)) {
+                return defaultValue;
+            }
+            else {
+                string num = (string)attributes[attributeName];
+                if (num.StartsWith("0x") || num.StartsWith("0X")) {
+                    return System.UIntPtr.Parse(num, NumberStyles.AllowHexSpecifier);
+                }
+                else {
+                    return System.UIntPtr.Parse(num);
+                }
+            }
+        }
+
+        public bool HasAttribute(string attributeName)
+        {
+            return attributes.ContainsKey(attributeName);
+        }
+
+        public string GetAttributes()
+        {
+            string list = "";
+
+            foreach (DictionaryEntry entry in attributes) {
+                list = list + " " + entry.Key.ToString() + "=\"" + entry.Value.ToString() + "\"";
+            }
+            return list;
+        }
+    }
+}
diff --git a/base/Libraries/Xml/XmlReader.cs b/base/Libraries/Xml/XmlReader.cs
new file mode 100644
index 0000000..867989f
--- /dev/null
+++ b/base/Libraries/Xml/XmlReader.cs
@@ -0,0 +1,460 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  Note:   This is a very limited Xml Reader.
+//
+//  BUG:    The parser cannot handle attributes in single quotes
+//          Actually, that's a feature -- XML requires the quotes.
+//
+namespace Microsoft.Singularity.Xml
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Text;
+
+    /// <summary>
+    /// This is a simple XML Parser that does no validation.  All it does it parse the syntax of XML
+    /// </summary>
+    public class XmlReader
+    {
+        private States state;
+        private int lineNumber;
+
+        public XmlReader()
+        {
+            state = States.START;
+            lineNumber = 1;
+        }
+
+        private enum TokenType
+        {
+            NAME,
+            STRING_LITERAL,
+            OPERATOR,
+            NONE
+        }
+
+        private enum States
+        {
+            START,
+            NEED_ELEMENT_NAME,
+            NEED_ATTRIBUTE_NAME,
+            NEED_EQUALS_SIGN,
+            NEED_ATTRIBUTE_VALUE,
+            NEED_CLOSURE_BRACKET,
+            NEED_CLOSURE_NAME,
+            NEED_FINAL_BRACKET,
+            QUESTION_MARK_ELEMENT,
+            GET_STRINGS
+        }
+
+        public ArrayList Parse(byte[] xmlBytes)
+        {
+            MemoryStream ms = new MemoryStream(xmlBytes);
+            StreamReader sr = new StreamReader(ms);
+            return ParseHelper(sr);
+        }
+
+        public ArrayList Parse(string filePath)
+        {
+            StreamReader sr = new StreamReader(filePath);
+            return ParseHelper(sr);
+        }
+
+
+        private ArrayList ParseHelper(TextReader sr)
+        {
+            TokenType type;
+            string token = null;
+            ArrayList xmlNodes = new ArrayList();
+            XmlNode curNode = null;
+            Stack st = new Stack();
+            string curAttributeName = null;
+
+            while (ReadToken(sr, out token, out type)) {
+                switch (state) {
+                    case States.START:
+                        //Console.WriteLine("START");
+                        if (type == TokenType.OPERATOR && token.Equals("<")) {
+                            state = States.NEED_ELEMENT_NAME;
+                        }
+                        else
+                        {
+                            // All other text is interpreted as freestanding text.
+                            // It had better occur within a tag!
+                            if (st.Count == 0) {
+                                throw new XmlException("Line " + lineNumber + ": Text must be inside a tag");
+                            }
+
+                            XmlNode lastNode = (XmlNode)st.Peek();
+                            lastNode.AddText(token);
+
+                            // Next state depends on whether we're at the end of the text-within-a-tag
+                            // already or not.
+                            if ((char)sr.Peek() == '<') {
+                                // Looks like we're already at the end
+                                state = States.START;
+                            }
+                            else {
+                                state = States.GET_STRINGS;
+                            }
+                        }
+                        break;
+
+                    case States.NEED_ELEMENT_NAME:
+                        //Console.WriteLine("NEED_ELEMENT_NAME");
+                        if (type == TokenType.NAME) {
+                            state = States.NEED_ATTRIBUTE_NAME;
+                            curNode = new XmlNode(token, st.Count);
+
+                            //Console.WriteLine("Saw beginning of element: " + token);
+                        }
+                        else if (type == TokenType.OPERATOR && token.Equals("/")) {
+                            state = States.NEED_CLOSURE_NAME;
+                        }
+                        else if (type == TokenType.OPERATOR &&
+                                 (token.Equals("?") || token.Equals("!") || token.Equals('-'))) {
+                            // then go to the question mark state and ignore this element
+                            state = States.QUESTION_MARK_ELEMENT;
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Can only begin a tag with / or a name");
+                        }
+                        break;
+
+                    case States.NEED_ATTRIBUTE_NAME:
+                        //Console.WriteLine("NEED_ATTRIBUTE_NAME");
+                        if (type == TokenType.NAME) {
+                            state = States.NEED_EQUALS_SIGN;
+                            curAttributeName = token;
+                        }
+                        else if (type == TokenType.OPERATOR && token.Equals(">")) {
+                            // hold onto this node so we can check it later
+                            state = States.START;
+                            bool stackEmpty = st.Count == 0;
+
+                            if (!stackEmpty) {
+                                XmlNode parent = (XmlNode)st.Peek();
+                                parent.AddChild(curNode);
+                            }
+
+                            st.Push(curNode);
+                            xmlNodes.Add(curNode);
+
+                            curNode = null;
+                        }
+                        else if (type == TokenType.OPERATOR && token.Equals("/")) {
+                            // this node is almost complete
+                            state = States.NEED_CLOSURE_BRACKET;
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Must have either attributes, '/>', or '>' after the name of an element");
+                        }
+                        break;
+
+                    case States.NEED_EQUALS_SIGN:
+                        //Console.WriteLine("NEED_EQUALS_SIGN");
+                        if (type == TokenType.OPERATOR && token.Equals("=")) {
+                            state = States.NEED_ATTRIBUTE_VALUE;
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Need an '=' after an attribute name");
+                        }
+                        break;
+
+                    case States.NEED_ATTRIBUTE_VALUE:
+                        //Console.WriteLine("NEED_ATTRIBUTE_VALUE");
+                        if (type == TokenType.STRING_LITERAL) {
+                            state = States.NEED_ATTRIBUTE_NAME;
+                            string unescaped_attribute_value = ExpandEntityReferences(token);
+                            curNode[curAttributeName] = unescaped_attribute_value;
+                            curAttributeName = null;
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Must have an attribute value after the '=' in an XML node");
+                        }
+                        break;
+
+                    case States.NEED_CLOSURE_BRACKET:
+                        //Console.WriteLine("NEED_CLOSURE_BRACKET");
+                        if (type == TokenType.OPERATOR && token.Equals(">")) {
+                            // this node is done, and we don't have to check it
+                            state = States.START;
+                            bool stackEmpty = st.Count == 0;
+
+                            if (!stackEmpty) {
+                                XmlNode parent = (XmlNode)st.Peek();
+                                parent.AddChild(curNode);
+                            }
+
+                            xmlNodes.Add(curNode);
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Must have a '>' after a closing '/' in an XML node");
+                        }
+                        break;
+
+                    case States.NEED_CLOSURE_NAME:
+                        //Console.WriteLine("NEED_CLOSURE_NAME");
+                        if (type == TokenType.NAME) {
+                            // pop the last XmlNode and make sure that this name matches.
+                            // Otherwise we don't have balanced open and close tags
+                            state = States.NEED_FINAL_BRACKET;
+                            XmlNode xmln = (XmlNode)st.Pop();
+                            if (!token.Equals(xmln.Name)) {
+                                throw new XmlException("Line " + lineNumber + ": " + token + " does not match " + xmln.Name);
+                            }
+                            //Console.WriteLine("Saw end of element: " + token);
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Must have a name after an opening />");
+                        }
+
+                        break;
+                    case States.NEED_FINAL_BRACKET:
+                        //Console.WriteLine("NEED_FINAL_BRACKET");
+                        if (type == TokenType.OPERATOR && token.Equals(">")) {
+                            state = States.START;
+                        }
+                        else {
+                            throw new XmlException("Line " + lineNumber + ": Must have a > after a closure tag's name");
+                        }
+                        break;
+
+                    case States.QUESTION_MARK_ELEMENT:
+                        // just stay in this state until you see a '>'
+                        while ('>' != ReadCharacter(sr)) {
+                            ;
+                        }
+                        state = States.START;
+                        break;
+
+                    case States.GET_STRINGS:
+                        {
+                            // stay in this state until you see a '<'
+                            StringBuilder sb = new StringBuilder();
+                            XmlNode prevNode = (XmlNode)st.Peek();
+
+                            if (type == TokenType.OPERATOR && token.Equals("<")) {
+                                throw new XmlException("Unexpected tag beginning while in text state");
+                            }
+
+                            sb.Append(token);
+                            while ((char)sr.Peek() != '<') {
+                                sb.Append((char)sr.Read());
+                            }
+
+                            prevNode.AddText(sb.ToString());
+                            state = States.START;
+                            //Console.WriteLine("Grabbed string data");
+                        }
+                        break;
+                }
+            }
+
+            sr.Close();
+            return xmlNodes;
+        }
+
+        /// <summary>
+        /// This method expands XML entity references found in an input string.
+        /// If an invalid entity reference is encountered, this method will throw
+        /// XmlException.
+        /// </summary>
+        /// <param name="input">The string to search for entity references.</param>
+        /// <returns>The expanded string.</returns>
+        private static string ExpandEntityReferences(string input)
+        {
+            // In most cases, there are no entity references.  Check for that case now.
+            // If we do find an entity reference, then the work isn't wasted.
+            int start = input.IndexOf('&');
+            if (start == -1)
+                return input;
+
+            StringBuilder buffer = new StringBuilder();
+            buffer.Append(input, 0, start);
+            start++;
+
+            for (; ; )
+            {
+                // At this point, 'start' points to a named XML entity.
+                // locate the entity name.
+                int end = input.IndexOf(';', start);
+                if (end == -1)
+                    throw new XmlException("An invalid entity reference was found.  '&' is present, but there is no matching ';'.");
+
+                int name_length = end - start;
+                if (name_length == 0)
+                    throw new XmlException("An invalid entity reference was found.  '&;' is not a valid entity reference.");
+
+                string entity_name = input.Substring(start, name_length);
+                string value;
+
+                switch (entity_name)
+                {
+                    case "amp": value = "&"; break;
+                    case "lt": value = "<"; break;
+                    case "gt": value = ">"; break;
+                    case "quot": value = "\""; break;
+                    default:
+                        throw new XmlException(String.Format("An invalid entity reference was found.  The entity '&{0};' is not recognized.", entity_name));
+                }
+
+                buffer.Append(value);
+
+                // Are there any more entity references in this string?
+                int next = input.IndexOf('&', end + 1);
+                if (next == -1)
+                {
+                    // There are no more entity references in the string.
+                    // Append the rest of the string.
+                    buffer.Append(input, end + 1, input.Length - end - 1);
+                    return buffer.ToString();
+                }
+
+                // Yes, there are more references.  Keep looping, preserving
+                // the same meaning of 'start' as when we entered this loop.
+                buffer.Append(input, end + 1, next - (end + 1));
+                start = next + 1; // skip over next '&'
+            }
+        }
+
+        private char ReadCharacter(TextReader sr)
+        {
+            char tempChar = (char)sr.Read();
+            if (tempChar == '\n') {
+                lineNumber++;
+            }
+            return tempChar;
+        }
+
+        private bool ReadToken(TextReader sr, out string token, out TokenType type)
+        {
+            // fortunately for us, the first character tells us exactly which of the three
+            // types of token this is. [a-zA-Z] means it's a NAME, ["] means it's a STRING_LITERAL
+            // and [<>/=] means it's an operator
+            int nextVal = sr.Peek();
+
+            if (nextVal == -1) {
+                // this is the end of the file
+                token = "";
+                type = TokenType.NONE;
+                return false;
+            }
+
+            char firstChar = unchecked((char)nextVal);
+
+            // if it's in [a-zA-Z]
+            if (('a' <= firstChar && firstChar <= 'z') || ('A' <= firstChar && firstChar <= 'Z')) {
+                token = ReadName(sr);
+                type = TokenType.NAME;
+                return true;
+            }
+            else if (firstChar == '"') {
+                token = ReadString(sr);
+                type = TokenType.STRING_LITERAL;
+                return true;
+            }
+            else if (firstChar == '<' ||
+                     firstChar == '>' ||
+                     firstChar == '/' ||
+                     firstChar == '=' ||
+                     firstChar == '?' ||
+                     firstChar == '!' ||
+                     firstChar == '-') {
+                sr.Read();
+                token = firstChar.ToString();
+                type = TokenType.OPERATOR;
+                return true;
+            }
+            else if (firstChar == ' ' || firstChar == '\n' || (int)firstChar == 13 || firstChar == '\t') {
+                // throw away all whitespace
+                while (firstChar == ' ' || firstChar == '\n' || (int)firstChar == 13 || firstChar == '\t') {
+                    char tempChar = (char)sr.Read();
+                    if (tempChar == '\n') {
+                        // increment the line count
+                        lineNumber++;
+                    }
+                    firstChar = (char)sr.Peek();
+                }
+                return ReadToken(sr, out token, out type);
+            }
+            else {
+                sr.Read();
+                type = TokenType.NONE;
+                token = firstChar.ToString();
+                return true;
+                //                throw new XmlException("Line " + lineNumber + ": '" + firstChar + "' is not a valid first character for a token");
+            }
+        }
+
+        private string ReadName(TextReader sr)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            // add characters to our string until we see something that's not in [a-zA-Z0-9_-.:]
+            char read = (char)sr.Peek();
+
+            while (('a' <= read && read <= 'z') ||
+                   ('A' <= read && read <= 'Z') ||
+                   ('0' <= read && read <= '9') ||
+                   read == '-' ||
+                   read == '_' ||
+                   read == '.' ||
+                   read == ':') {
+                sb.Append((char)sr.Read());
+                read = (char)sr.Peek();
+            }
+
+            return sb.ToString();
+        }
+
+        private string ReadString(TextReader sr)
+        {
+            StringBuilder sb = new StringBuilder();
+            // we need to read this string and translate it into a string literal.
+            // this means that we have (for the moment) two magic characters: \ and "
+            // "\\" means \ and "\"" means "
+            bool translateNext = false;
+            char read = (char)sr.Peek();
+            if (read != '"') {
+                throw new XmlException("Line " + lineNumber + ": Cannot start a string literal with " + (char)read + ".  You must use a '\"'");
+            }
+            // drop the '"' on the floor
+            sr.Read();
+            read = (char)sr.Read();
+
+            while (read != '"' || translateNext) {
+                if (!translateNext ) {
+                    if (read == '\\') {
+                        translateNext = true;
+                    }
+                    else {
+                        sb.Append(read);
+                        read = (char)sr.Read();
+                    }
+                }
+                else {
+                    translateNext = false;
+                    if (read == '\\') {
+                        sb.Append("\\");
+                        read = (char)sr.Read();
+                    }
+                    else if (read == '"') {
+                        sb.Append("\"");
+                        read = (char)sr.Read();
+                    }
+                    else {
+                        throw new XmlException("Line " + lineNumber + ": Invalid escape sequence: \\" + read);
+                    }
+                }
+            }
+
+            return sb.ToString();
+        }
+    }
+}
diff --git a/base/Libraries/Xml2/Singularity.Xml2.csproj b/base/Libraries/Xml2/Singularity.Xml2.csproj
new file mode 100644
index 0000000..44ca242
--- /dev/null
+++ b/base/Libraries/Xml2/Singularity.Xml2.csproj
@@ -0,0 +1,41 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Libraries\Xml2\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>Singularity.Xml2</AssemblyName>
+    <OutputType>Library</OutputType>
+    <Language>C#</Language>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity\Xml\XmlException.cs" />
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity\Xml\XmlNode.cs" />
+    <Compile Include="$(SINGULARITY_ROOT)\Kernel\Singularity\Xml\XmlReader.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Crypto\Crypto.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+</Project>
+
+
+
+
diff --git a/base/Makefile.inc b/base/Makefile.inc
new file mode 100644
index 0000000..f97e6a4
--- /dev/null
+++ b/base/Makefile.inc
@@ -0,0 +1,343 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Makefile.inc
+#
+#   Note:
+#
+#   This top-level file is included by all Makefile's in the project and
+#   contains all configurable options.  All options are overrideable
+#   through environment variables.
+#
+#   Configuration Options
+#       ASMP_SYSCALL_BUILDER -- Specify asymmetric system call stub generator
+#       BARTOK     -- Specify a particular bartok compiler
+#       BUILDTYPE  -- Specify build type (Debug|Release)
+#       COLLECTOR_KERNEL  -- Specify garbage collector for kernel
+#                              (Concurrent|MarkSweep|Semispace)
+#       COLLECTOR_APP     -- Specify garbage collector for applications
+#                              (Concurrent|MarkSweep|Semispace)
+#       PLATFORM   -- Specify host platform (LegacyPC|ApicPC|ApicMP|EnlightenedPC)
+#       SCHEDULER  -- Specify scheduler type (Rialto|Min|Robin|Laxity)
+#       SYSCALL_BUILDER -- Specify system call stub generator
+#       OBJROOT    -- Specify directory in which to place objects (optional)
+#       PAGING     -- Specify page translation (On|Off)
+#
+#   Resulting NMAKE macros passed to Makefiles
+#       OBJRELDIR  -- relative path of full qualify object directory
+#       OBJKRNDIR  -- relative path of full qualify object directory for kernel
+#       OBJDIR     -- relative path of object directory from source directory
+#       KOBJDIR    -- relative path of kernel object directory from source directory
+#       PRIDIR     -- relative path of private object directory from source directory
+#       CSFLAGS    -- flags passed to c# compilers
+#       SGFLAGS    -- flags passed to Sing# compilers
+#
+#       BASEDIR    -- Root of Singularity source tree
+#       BOOTDIR    -- Directory containing compiled boot assemblies.
+#       KERNDIR    -- Directory containing compiled kernel assemblies.
+#       KABIDIR    -- Directory containing compiled kernel ABI libraries.
+#       DISTDIR    -- Directory containing compiled distribution files.
+#       DRIVDIR    -- Directory containing compiled driver assemblies.
+#       CONSDIR    -- Directory containing compiled contract assemblies.
+#       ILLSDIR    -- Directory containing compiled ILL assemblies.
+#       LIBSDIR    -- Directory containing compiled library assemblies.
+#       APPSDIR    -- Directory containing compiled application assemblies.
+#       SERVDIR    -- Directory containing compiled service assemblies.
+#       WINSDIR    -- Directory containing compiled Windows assemblies.
+#       OPTSDIR    -- Directory containing the system options definitions.
+#       BUILDIR    -- Directory containing the build tools.
+#
+##############################################################################
+
+.SUFFIXES : .c .exe .x86 .cs .il .ill .dll .obj .asm .cpp .h .manifest .options
+
+###############################################################################
+# Configuration option handling - sets defaults and checks values
+
+# ASMP_SYSCALL_BUILDER = "MpSyscallBuilder"
+
+DEFAULT_ASMP_SYSCALL_BUILDER = "MpSyscallBuilder"
+
+!IF !DEFINED(ASMP_SYSCALL_BUILDER)
+ASMP_SYSCALL_BUILDER = $(DEFAULT_ASMP_SYSCALL_BUILDER)
+!ENDIF
+
+# BARTOK = "bartok"
+
+DEFAULT_BARTOK = $(SINGULARITY_ROOT)\build\bartok.exe
+
+!IF !DEFINED(BARTOK)
+BARTOK = $(DEFAULT_BARTOK)
+!ENDIF
+
+# BUILDTYPE = "Debug"* | "Release"
+
+DEFAULT_BUILDTYPE=Debug
+
+!IF !DEFINED(BUILDTYPE)
+BUILDTYPE=$(DEFAULT_BUILDTYPE)
+!ENDIF
+
+!IF ("$(BUILDTYPE)" != "Debug") && \
+        ("$(BUILDTYPE)" != "Release") && \
+        ("$(BUILDTYPE)" != "Prototype")
+!ERROR BUILDTYPE must either be unset, or set to one of "Debug", "Release", or "Prototype".
+!endif
+
+# COLLECTOR_KERNEL|_APP = "AdaptiveCopying" | "Concurrent"* | "MarkSweep" | "Semispace" |
+#             "Sliding"
+DEFAULT_COLLECTOR_KERNEL=Concurrent
+DEFAULT_COLLECTOR_APP=MarkSweep
+
+!IF !DEFINED(COLLECTOR_KERNEL)
+COLLECTOR_KERNEL=$(DEFAULT_COLLECTOR_KERNEL)
+!ENDIF
+
+!IF !DEFINED(COLLECTOR_APP)
+COLLECTOR_APP=$(DEFAULT_COLLECTOR_APP)
+!ENDIF
+
+!IF ("$(COLLECTOR_KERNEL)" != "AdaptiveCopying" && \
+     "$(COLLECTOR_KERNEL)" != "Concurrent" && \
+     "$(COLLECTOR_KERNEL)" != "MarkSweep" && \
+     "$(COLLECTOR_KERNEL)" != "Semispace" && \
+     "$(COLLECTOR_KERNEL)" != "Sliding")
+!ERROR COLLECTOR_KERNEL must either be unset, or set to one of "AdaptiveCopying" or "Concurrent" or "MarkSweep" or "Semispace" or "Sliding"
+!ENDIF
+
+!IF ("$(COLLECTOR_APP)" != "AdaptiveCopying" && \
+     "$(COLLECTOR_APP)" != "Concurrent" && \
+     "$(COLLECTOR_APP)" != "MarkSweep" && \
+     "$(COLLECTOR_APP)" != "Semispace" && \
+     "$(COLLECTOR_APP)" != "Sliding")
+!ERROR COLLECTOR_APP must either be unset, or set to one of "AdaptiveCopying" or "Concurrent" or "MarkSweep" or "Semispace" or "Sliding"
+!ENDIF
+
+# PLATFORM = "LegacyPC"* | "ApicPC"
+
+DEFAULT_PLATFORM=LegacyPC
+
+!IF !DEFINED(PLATFORM)
+PLATFORM=$(DEFAULT_PLATFORM)
+!ENDIF
+
+!IF ("$(PLATFORM)" != "LegacyPC" && \
+     "$(PLATFORM)" != "ApicPC" && \
+     "$(PLATFORM)" != "ApicMP" && \
+     "$(PLATFORM)" != "EnlightenedPC")
+!ERROR PLATFORM must either be unset, or set to one of "LegacyPC" or "ApicPC" or "ApicMP" or "EnlightenedPC".
+!endif
+
+!IF "$(PLATFORM)" == "ApicMP" && !DEFINED(MAX_CPU)
+MAX_CPU=4
+!endif
+
+# SCHEDULER = "Rialto"* | "Robin" | "Laxity" | "Min"
+
+DEFAULT_SCHEDULER=Min
+
+!IF !DEFINED(SCHEDULER)
+SCHEDULER=$(DEFAULT_SCHEDULER)
+!ENDIF
+
+!IF ("$(SCHEDULER)" != "Rialto") && ("$(SCHEDULER)" != "Robin") && ("$(SCHEDULER)" != "Laxity") && ("$(SCHEDULER)" != "Min")
+!ERROR SCHEDULER must either be unset, or set to one of "Rialto", "Robin", "Laxity", or "Min".
+!endif
+
+# SYSCALL_BUILDER = SyscallBuilder
+
+DEFAULT_SYSCALL_BUILDER = SyscallBuilder
+
+!IF !DEFINED(SYSCALL_BUILDER)
+SYSCALL_BUILDER = $(DEFAULT_SYSCALL_BUILDER)
+!ENDIF
+
+DEFAULT_PAGING_FLAG=
+
+###############################################################################
+# Resulting NMAKE macros
+
+CSC = csc
+
+SGFLAGS = /disable:nullparametervalidation
+
+AFLAGS = /nologo /Zi /Cp /DSINGULARITY=1
+CFLAGS = /D_CRT_SECURE_NO_DEPRECATE /nologo /W3 /WX /Gy /Zi /O2 /Oy- /GS- /DSINGULARITY=1
+
+#
+#  HOST_LINKFLAGS is for the machine we are building on
+#  used to build the windows components
+#
+HOST_LINKFLAGS = /NOLOGO /INCREMENTAL:NO /machine:IX86
+HOST_CC = cl
+
+LINKFLAGS = /NOLOGO /INCREMENTAL:NO /machine:$(MACHINE)
+
+CPPFLAGS = $(CFLAGS)
+
+# Workaround for bug in Bartok drop @5063
+BARTOK_FLAGS=$(BARTOK_FLAGS) /IrPeepholeNull=false
+
+!IF ("$(BUILDTYPE)" == "Debug")
+BARTOK_FLAGS = $(BARTOK_FLAGS)
+CSFLAGS = /debug /d:DEBUG /d:TRACING /d:WAYPOINTS /d:MONITORING /d:CHANNEL_COUNT
+CFLAGS = $(CFLAGS) /DDEBUG
+LINKFLAGS = $(LINKFLAGS) /DEBUG /DEBUGTYPE:CV
+AFLAGS = $(AFLAGS) /DDEBUG=1
+!ELSE IF ("$(BUILDTYPE)" == "Prototype")
+BARTOK_FLAGS = $(BARTOK_FLAGS) /minopt /IrSimpleInliner=false
+CSFLAGS = /debug /d:DEBUG /d:TRACING /d:WAYPOINTS /d:MONITORING /d:CHANNEL_COUNT
+CFLAGS = $(CFLAGS) /DDEBUG
+LINKFLAGS = $(LINKFLAGS) /DEBUG /DEBUGTYPE:CV
+AFLAGS = $(AFLAGS) /DDEBUG=1
+!ELSE IF ("$(BUILDTYPE)" == "Release")
+BARTOK_FLAGS = $(BARTOK_FLAGS)
+CSFLAGS = /debug /d:CHANNEL_COUNT
+#CSFLAGS = /debug /d:WAYPOINTS
+SGFLAGS = $(SGFLAGS) # /disable:ac,dc,gcc,ic
+CFLAGS = $(CFLAGS)
+LINKFLAGS = $(LINKFLAGS) /DEBUG /DEBUGTYPE:CV
+AFLAGS = $(AFLAGS)
+!ENDIF
+
+#### THREAD_TIME_ACCOUNTING = 1
+!IF DEFINED(THREAD_TIME_ACCOUNTING)
+AFLAGS = $(AFLAGS) /DTHREAD_TIME_ACCOUNTING=1
+CFLAGS = $(CFLAGS) /DTHREAD_TIME_ACCOUNTING=1
+CSFLAGS = $(CSFLAGS) /d:THREAD_TIME_ACCOUNTING
+SGFLAGS = $(SGFLAGS)
+!ENDIF
+
+!IF DEFINED(SAMPLE_PC)
+CSFLAGS = $(CSFLAGS) /d:SAMPLE_PC
+SGFLAGS = $(SGFLAGS) /d:SAMPLE_PC
+!endif
+
+!IF ("$(PLATFORM)" == "EnlightenedPC")
+CSFLAGS = $(CSFLAGS)
+SGFLAGS = $(SGFLAGS)
+CFLAGS = $(CFLAGS)
+AFLAGS = $(AFLAGS)
+!ENDIF
+
+MACHINE=x86
+AS=ml
+LINK=link
+LIB=lib
+ARCH_DIR=.
+SING_DEF_FILE=singularity.V1.def
+
+!IF ("$(PAGING)" == "On")
+PAGING_FLAG = .Paging
+AFLAGS = $(AFLAGS) /DPAGING=1
+CFLAGS = $(CFLAGS) /DPAGING
+CSFLAGS = $(CSFLAGS) /d:PAGING
+SGFLAGS = $(SGFLAGS) /d:PAGING
+!ELSE
+PAGING_FLAG =
+!ENDIF
+
+#
+# Only cross reference binaries with source depot on internal
+# builds.  The source depot is not available outside of
+# Microsoft.
+#
+!IF ("$(SINGULARITY_INTERNAL)" == "Yes")
+SDIZEPDB = sdizepdb.exe
+SDEDIT = sd edit
+!ELSE
+SDIZEPDB = @rem sdizepdb
+SDEDIT = attrib -r
+!ENDIF
+COPYCMD = copy /y 1>nul
+
+#
+# In case a makefile does not define SGCFLAGS in terms of SGFLAGS
+# (I found that the Contracts directory does not.)
+# (Alternatively, we could change SGCFLAGS in the App makefiles to SGFLAGS)
+#
+SGCFLAGS = $(SGFLAGS)
+
+OBJKRNDIR=$(BUILDTYPE).$(MACHINE).$(PLATFORM).$(SCHEDULER).$(COLLECTOR_KERNEL)$(PAGING_FLAG)
+OBJRELRUNTIMEDIR=$(BUILDTYPE).$(MACHINE).$(COLLECTOR_APP)$(PAGING_FLAG)
+
+#OBJRELDIR=$(BUILDTYPE).$(COLLECTOR_APP)$(PAGING_FLAG)
+OBJRELDIR=$(BUILDTYPE).$(MACHINE).$(COLLECTOR_APP)$(PAGING_FLAG)
+
+OBJMACHINERELDIR=$(BUILDTYPE).$(MACHINE)$(PAGING_FLAG)
+OBJOPT=$(BUILDTYPE).$(COLLECTOR_APP)
+
+# If the user has not defined OBJDIR, then try to discover it.
+# Makefiles exist somewhere between a declarative language and
+# a Turing-complete language...  without looping, this is the
+# best we can do.  This allows us to write per-component
+# Makefiles that do not specify OBJROOT.
+!IF !DEFINED(OBJROOT)
+!IF EXIST("..\Makefile.computeDeps")
+OBJROOT=obj
+!ELSEIF EXIST("..\..\Makefile.computeDeps")
+OBJROOT=..\obj
+!ELSEIF EXIST("..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\obj
+!ELSEIF EXIST("..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\obj
+!ELSEIF EXIST("..\..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\..\obj
+!ELSEIF EXIST("..\..\..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\..\..\obj
+!ELSEIF EXIST("..\..\..\..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\..\..\..\obj
+!ELSEIF EXIST("..\..\..\..\..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\..\..\..\..\obj
+!ELSEIF EXIST("..\..\..\..\..\..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\..\..\..\..\..\obj
+!ELSEIF EXIST("..\..\..\..\..\..\..\..\..\..\Makefile.computeDeps")
+OBJROOT=..\..\..\..\..\..\..\..\..\obj
+!ELSE
+!ERROR Unable to find ...\Makefile.computeDeps - please edit the hack in Makefile.computeDeps
+!ENDIF
+!ENDIF
+
+KOBJDIR=$(OBJROOT)\$(OBJKRNDIR)
+KPRIDIR=$(OBJROOT)\$(OBJKRNDIR)\private
+
+OBJDIR=$(OBJROOT)\$(OBJRELDIR)
+
+OBJARCHDIR = $(OBJROOT)\$(OBJMACHINERELDIR)
+PRIDIR=$(OBJROOT)\$(OBJRELRUNTIMEDIR)\private
+BINDIR=$(OBJROOT)\$(OBJRELRUNTIMEDIR)
+
+HAL_DLL=Hal.$(PLATFORM).dll
+
+###############################################################################
+# Directories for publishing and retrieving compiled assemblies.
+
+BASEDIR=$(SINGULARITY_ROOT)
+BOOTDIR=$(BASEDIR)\Boot\obj\$(OBJKRNDIR)
+KERNDIR=$(BASEDIR)\Kernel\obj\$(OBJKRNDIR)
+#KABIDIR=$(BASEDIR)\Kernel\obj\$(OBJRELDIR)
+KABIDIR=$(BASEDIR)\Kernel\obj\$(OBJMACHINERELDIR)
+DISTDIR=$(BASEDIR)\Distro\obj\$(OBJKRNDIR).$(OBJRELDIR)
+DRIVDIR=$(BASEDIR)\Drivers\obj\$(OBJRELDIR)
+CONSDIR=$(BASEDIR)\Contracts\obj\$(OBJRELDIR)
+ILLSDIR=$(BASEDIR)\Interfaces\obj\$(OBJRELDIR)
+LIBSDIR=$(BASEDIR)\Libraries\obj\$(OBJRELDIR)
+APPSDIR=$(BASEDIR)\Applications\obj\$(OBJRELDIR)
+APPSBINDIR=$(BASEDIR)\Applications\obj\$(OBJRELRUNTIMEDIR)
+SERVDIR=$(BASEDIR)\Services\obj\$(OBJRELDIR)
+WINSDIR=$(BASEDIR)\Windows\obj\$(OBJRELDIR)
+BUILDIR=$(BASEDIR)\Build
+OPTSDIR=$(BASEDIR)\Options
+
+################################################################# binaries
+#
+
+ILASM=$(BUILDIR)\ilasm.exe
+ILDASM=$(BUILDIR)\ildasm.exe
+COPY=copy 1>nul /y
+
+#
+################################################################# End of File.
diff --git a/base/Options/Debug.AdaptiveCopying.x86.options b/base/Options/Debug.AdaptiveCopying.x86.options
new file mode 100644
index 0000000..3b6ffcb
--- /dev/null
+++ b/base/Options/Debug.AdaptiveCopying.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Debug.AdaptiveCopying\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/AdaptiveCopying" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Debug.x86.AdaptiveCopying\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Debug.x86.AdaptiveCopying\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Debug.Concurrent.x86.options b/base/Options/Debug.Concurrent.x86.options
new file mode 100644
index 0000000..3f79411
--- /dev/null
+++ b/base/Options/Debug.Concurrent.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Debug.Concurrent\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/ConcurrentMSGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Debug.x86.Concurrent\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Debug.x86.Concurrent\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Debug.MarkSweep.x86.options b/base/Options/Debug.MarkSweep.x86.options
new file mode 100644
index 0000000..242f76c
--- /dev/null
+++ b/base/Options/Debug.MarkSweep.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Debug.x86.MarkSweep\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/MarkSweepGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Debug.x86.MarkSweep\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Debug.x86.MarkSweep\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Debug.Semispace.x86.options b/base/Options/Debug.Semispace.x86.options
new file mode 100644
index 0000000..6c83fc5
--- /dev/null
+++ b/base/Options/Debug.Semispace.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Debug.Semispace\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/SemispaceGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Debug.x86.Semispace\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Debug.x86.Semispace\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Debug.Sliding.x86.options b/base/Options/Debug.Sliding.x86.options
new file mode 100644
index 0000000..8074981
--- /dev/null
+++ b/base/Options/Debug.Sliding.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Debug.Sliding\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/SlidingGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Debug.x86.Sliding\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Debug.x86.Sliding\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Prototype.AdaptiveCopying.x86.options b/base/Options/Prototype.AdaptiveCopying.x86.options
new file mode 100644
index 0000000..b226a7c
--- /dev/null
+++ b/base/Options/Prototype.AdaptiveCopying.x86.options
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Prototype.AdaptiveCopying\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/AdaptiveCopying" />
+    <parameter value="/minopt" />
+    <parameter value="/IrSimpleInliner=false" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Prototype.x86.AdaptiveCopying\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Prototype.x86.AdaptiveCopying\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Prototype.Concurrent.x86.options b/base/Options/Prototype.Concurrent.x86.options
new file mode 100644
index 0000000..4630a60
--- /dev/null
+++ b/base/Options/Prototype.Concurrent.x86.options
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Prototype.Concurrent\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/ConcurrentMSGC" />
+    <parameter value="/minopt" />
+    <parameter value="/IrSimpleInliner=false" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Prototype.x86.Concurrent\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Prototype.x86.Concurrent\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Prototype.MarkSweep.x86.options b/base/Options/Prototype.MarkSweep.x86.options
new file mode 100644
index 0000000..28f0ec5
--- /dev/null
+++ b/base/Options/Prototype.MarkSweep.x86.options
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Prototype.x86.MarkSweep\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/MarkSweepGC" />
+    <parameter value="/minopt" />
+    <parameter value="/IrSimpleInliner=false" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Prototype.x86.MarkSweep\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Prototype.x86.MarkSweep\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Prototype.Semispace.x86.options b/base/Options/Prototype.Semispace.x86.options
new file mode 100644
index 0000000..d6b6d9f
--- /dev/null
+++ b/base/Options/Prototype.Semispace.x86.options
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Prototype.Semispace\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/SemispaceGC" />
+    <parameter value="/minopt" />
+    <parameter value="/IrSimpleInliner=false" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Prototype.x86.Semispace\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Prototype.x86.Semispace\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Prototype.Sliding.x86.options b/base/Options/Prototype.Sliding.x86.options
new file mode 100644
index 0000000..529aa88
--- /dev/null
+++ b/base/Options/Prototype.Sliding.x86.options
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Prototype.Sliding\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/SlidingGC" />
+    <parameter value="/minopt" />
+    <parameter value="/IrSimpleInliner=false" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Prototype.x86.Sliding\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Prototype.x86.Sliding\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Release.AdaptiveCopying.x86.options b/base/Options/Release.AdaptiveCopying.x86.options
new file mode 100644
index 0000000..25e52b5
--- /dev/null
+++ b/base/Options/Release.AdaptiveCopying.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Release.AdaptiveCopying\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/AdaptiveCopying" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Release.x86.AdaptiveCopying\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Release.x86.AdaptiveCopying\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Release.Concurrent.x86.options b/base/Options/Release.Concurrent.x86.options
new file mode 100644
index 0000000..ec999fc
--- /dev/null
+++ b/base/Options/Release.Concurrent.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Release.Concurrent\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/ConcurrentMSGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Release.x86.Concurrent\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Release.x86.Concurrent\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Release.MarkSweep.x86.options b/base/Options/Release.MarkSweep.x86.options
new file mode 100644
index 0000000..3dc7ceb
--- /dev/null
+++ b/base/Options/Release.MarkSweep.x86.options
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Release.MarkSweep\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/OptLirSuppressExnEdges=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/MarkSweepGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Release.x86.MarkSweep\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Release.x86.MarkSweep\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Release.Semispace.x86.options b/base/Options/Release.Semispace.x86.options
new file mode 100644
index 0000000..654859a
--- /dev/null
+++ b/base/Options/Release.Semispace.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Release.Semispace\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/SemispaceGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Release.x86.Semispace\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Release.x86.Semispace\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Options/Release.Sliding.x86.options b/base/Options/Release.Sliding.x86.options
new file mode 100644
index 0000000..2185672
--- /dev/null
+++ b/base/Options/Release.Sliding.x86.options
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\Release.Sliding\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=false" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/SlidingGC" />
+    <parameter value="/IrPeepholeNull=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="AppRuntimeNative\Release.x86.Sliding\native.lib" />
+    <library name="singularity.V1.lib" cache="AppRuntimeNative\Release.x86.Sliding\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Paths.targets b/base/Paths.targets
new file mode 100644
index 0000000..54fd955
--- /dev/null
+++ b/base/Paths.targets
@@ -0,0 +1,16 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Paths.targets
+#
+#   Note:
+#
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Targets\Paths.targets"/>
+</Project>
diff --git a/base/ProjectTemplates/ComplexProject.csproj b/base/ProjectTemplates/ComplexProject.csproj
new file mode 100644
index 0000000..39807eb
--- /dev/null
+++ b/base/ProjectTemplates/ComplexProject.csproj
@@ -0,0 +1,211 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\YourApp\YourApp.csproj
+
+Note:   This project file demonstrates some of the more advanced options
+        and items that you can declare.  Most or all of these options can
+        be used with any project that is based on SingSharp.targets,
+        which includes the console app, kernel library, app library,
+        and service app.  Notably, interface assemblies do not use
+        SingSharp.targets, and so have a much more constrained set of options.
+        
+        This project is NOT intended to be buildable; it is only for
+        demonstration.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  Provide the relative walk-up path to $(SINGULARITY_ROOT)\Paths.targets.
+  This is annoying, but is necessary in order to get VS builds to work,
+  without requiring that you set environment variables for VS.
+  -->
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <!-- Required properties. -->
+    
+    <!-- Do not specify .exe / .dll extension -->
+    <AssemblyName>YourAssemblyNameHere</AssemblyName> 
+    <!-- Can be Exe or Library -->
+    <OutputType>Exe</OutputType> 
+    
+    <!-- Optional properties -->
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+
+    <!--
+    Required if you directly import SingSharp.targets, but since most
+    of the "environment" targets files set this for you, it is not required.
+    If you set this property in your project, it will override the per-environment
+    default.
+    -->
+    <OutputPath>...</OutputPath>
+
+    <!--
+    Specify this to prevent the default libraries from being passed to the IL compiler.
+    Note that this does NOT map directly to the /nostdlib compiler argument.
+    Instead, each "environment" targets file sets up its notion of what the standard
+    library is, and then SingSharp.targets handles adding references to them.
+    SingSharp.targets will not add references if this property is set to "true".
+    So this property means "do not use the standard library provided by the 
+    current environment", not "do not use the CLR's mscorlib.dll".
+    -->
+    <NoStdLib>true</NoStdLib>
+
+    <!--
+    Specifies define constants.  Make sure you do NOT have any spaces in this field,
+    or any repeated semi-colons (e.g. "FOO;;BAR").  Spaces will cause the build to
+    fail; repeated semi-colons will simply prevent the compiler from defining any
+    of the names that follow the repeated semi-colons.
+    -->
+    <DefineConstants>HAVE_FEATURE_FOO;DISABLE_BLAH</DefineConstants>
+
+    <!-- Specifies warning level, 1 through 4. -->
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <!-- Options for Sing# compiler -->
+    <DisableNullParameterValidation>true</DisableNullParameterValidation>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+
+    <!-- Specifies the CLI platform version for the Sing# compiler.  This becomes part of the /platform: argument. -->
+    <CompilerPlatformVersion>cli1</CompilerPlatformVersion>
+    
+    <!--
+    Specifies the path to the platform / runtime directory for the Sing# compiler. 
+    The compiler looks for Microsoft.SingSharp.Runtime.dll & friends in this dir.
+    -->
+    <CompilerPlatformDir>...</CompilerPlatformDir>
+
+    <!--
+    Specifies the compiler language to use.  Valid values are "Sing#" or "C#".
+    "Sing#" is the default, and uses sgc.exe.  "C#" uses csc.exe.
+    Note that some properties apply only to the Sing# compiler, such as CompilerPlatformVersion.
+    -->
+    <Language>C#</Language>
+    
+  </PropertyGroup>
+
+  <ItemGroup>
+    
+    <!-- Items in the "Compile" item set declare source files. -->
+    <Compile Include="Foo.sg"/>
+    <Compile Include="Bar.sg"/>
+    
+    <!--
+    ProjectReference items declare references to other projects (e.g. Crypto.csproj),
+    NOT to assemblies (Crypto.dll).  When possible, you should use ProjectReference
+    instead of Reference.  ProjectReference allows the build system to handle dependency
+    tracking for you automatically.  
+    -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj"/>
+    
+    <!--
+    In some circumstances, you may need control over how ProjectReference items are processed.
+    Since each executable goes through two compilers (source -> IL, IL -> machine code),
+    you can control which compilers the referenced assembly is passed to.  By default, the 
+    referenced assembly is passed to both compilers, but you can use metadata tags to exclude
+    the referenced assembly from either compiler.  Setting the metadata tag
+    'ExcludeFromILReferences' to 'true' prevents the referenced assembly from being passed to
+    the IL compiler (SGC/CSC).  Setting the metadata tag 'ExcludeFromNativeReferences' to 'true' 
+    prevents the referenced assembly from being passed to the machine code compiler (Bartok).
+    This is useful for using interface assemblies, and some other situations.
+    -->
+    
+    <ProjectReference Include="...\SomeNativeOnlyProject.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+    
+    <ProjectReference Include="...\SomeILOnlyProject.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+    
+    
+    <!--
+    "Reference" items declare untracked references to MSIL assemblies.
+    You can use these when you can guarantee that the referenced assembly is always
+    built before the current assembly.  Typically, this is used for assemblies that
+    are the output of aggregate projects (such as AppRuntime.proj), for assemblies
+    that are checked into the source tree, or when you handle building your own
+    dependent assemblies using custom targets.
+    
+    Avoid using these items, if possible.
+    -->
+    <Reference Include="...\Foo.dll"/>
+    
+    <!-- 
+    "BinaryResource" items declare files that are included in their entirety,
+    without being interpreted or modified.  SingSharp.targets handles converting
+    these resource files into C# source code, by invoking mkasm, and then
+    compiling the resources into intermediate assemblies, and adding those 
+    intermediate assemblies as references to the current assembly.
+    
+    The FieldName, ClassName, and Namespace metadata tags are required.
+    -->
+    <BinaryResource Include="foo.bmp">
+      <FieldName>SomeFieldName</FieldName>
+      <ClassName>SomeClassName</ClassName>
+      <Namespace>Microsoft.Singularity.YourNamespaceHere</Namespace>
+    </BinaryResource>
+
+    <!--
+    "LanguageFile" items declare combined lexer / YACC-like grammar files.
+    (Currently, Shell is the only known user of these grammars.)  SingSharp.targets
+    will run SPG over the language file, which generates an intermediate source file.
+    (The source file is emitted to the object directory, not the source directory.)
+    This source file is then added to the "Compile" item set, which causes it to be
+    compiled into the current assembly.
+    
+    The Namespace metadata tag is required.  It specifies the namespace of the
+    generated class.  Likewise, the ClassName metadata tag is required, and does
+    the obvious.
+    -->
+    <LanguageFile Include="script.lang">
+      <Namespace>Microsoft.Singularity.Applications</Namespace>
+      <ClassName>ScriptParser</ClassName>
+    </LanguageFile>
+  </ItemGroup>
+
+  <!--
+  The last part of any project should be an <Import> directive that imports the
+  right targets file for the particular environment you need.  You can import
+  whatever suits your needs (or nothing at all, if your project is self-contained),
+  but the most common imports will be one of the following:
+  
+      $(SINGULARITY_ROOT)\Targets\App.targets - For most app/process code
+      
+      $(SINGULARITY_ROOT)\Targets\KernelLibrary.targets - Kernel-mode libraries, such
+          as IoSystem.dll
+          
+      $(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets - For console apps;
+          implicitly adds a reference to the console transform library.
+          
+      $(SINGULARITY_ROOT)\Targets\ServiceCategory.targets - For service apps;
+          implicitly adds a reference to the service transform library.
+          
+      $(SINGULARITY_ROOT)\Targets\DriverCategory.targets - For process drivers;
+          implicitly adds a reference to the driver transform library.
+      
+      $(SINGULARITY_ROOT)\Targets\SingSharp.targets - Contains build logic for
+          invoking the Sing# / C# compiler, but does not have any settings for
+          a particular environment.  Most projects do not directly import this file;
+          most of the above .targets files set some properties and items for a
+          particular environment, and then import this file.
+          
+      $(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets - For assemblies that
+          contain only MSIL metadata, and no method implementations, declared in
+          .csi files.  This targets file does not use SingSharp.targets, and so
+          does not support many of the options described in this file.
+  
+  -->
+  <Import Project="$(SINGULARITY_ROOT)\Targets\SomeTargetsFile.targets"/>
+</Project>
diff --git a/base/ProjectTemplates/ConsoleApp.csproj b/base/ProjectTemplates/ConsoleApp.csproj
new file mode 100644
index 0000000..8331095
--- /dev/null
+++ b/base/ProjectTemplates/ConsoleApp.csproj
@@ -0,0 +1,41 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Applications\YourApp\YourApp.csproj
+
+Note:   This is the template for a basic console app.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  Provide the relative walk-up path to $(SINGULARITY_ROOT)\Paths.targets.
+  This is annoying, but is necessary in order to get VS builds to work,
+  without requiring that you set environment variables for VS.
+  -->
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>YourAssemblyNameHere</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Foo.sg"/>
+    <Compile Include="..."/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Declare references to the projects you need, for example: -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+    <ProjectReference Include="..."/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets"/>
+</Project>
diff --git a/base/ProjectTemplates/InterfaceAssembly.csproj b/base/ProjectTemplates/InterfaceAssembly.csproj
new file mode 100644
index 0000000..08ab13c
--- /dev/null
+++ b/base/ProjectTemplates/InterfaceAssembly.csproj
@@ -0,0 +1,39 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Interfaces\YourAssembly\YourAssembly.csproj
+
+Note:   This is the template for an interface assembly.
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>YourAssemblyNameHere</AssemblyName>
+    <OutputType>Library</OutputType>
+    <NoStdlib>true</NoStdlib>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Foo.csi" />
+    <Compile Include="..." />
+    
+    <!--
+    ProjectReference items declared in files that use InterfaceAssembly.targets can
+    specify the 'Alias' metadata tag.  This adds "=aliasvalue" to the /r: reference.
+    -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Basetypes\Basetypes.csproj">
+      <Alias>kernel.exe</Alias>
+    </ProjectReference>
+    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\InterfaceAssembly.targets" />
+</Project>
diff --git a/base/ProjectTemplates/KernelLibrary.csproj b/base/ProjectTemplates/KernelLibrary.csproj
new file mode 100644
index 0000000..210e571
--- /dev/null
+++ b/base/ProjectTemplates/KernelLibrary.csproj
@@ -0,0 +1,47 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Kernel\YourLibrary\YourLibrary.csproj
+
+Note:   This is the template for a kernel-mode assembly.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  Provide the relative walk-up path to $(SINGULARITY_ROOT)\Paths.targets.
+  This is annoying, but is necessary in order to get VS builds to work,
+  without requiring that you set environment variables for VS.
+  -->
+  <Import Project="..\..\Paths.targets"/>
+  
+  <PropertyGroup>
+    <AssemblyName>YourAssemblyNameHere</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Foo.sg"/>
+    <Compile Include="..."/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Declare references to the projects you need, for example: -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.Kernel.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.Kernel.csproj" />
+    <ProjectReference Include="..."/>
+    <!--
+    Note that references to assemblies that are built separately for kernel and app (such as many of
+    the contract libraries) should refer to the correct project.   For example, kernel assemblies should refer
+    to ...\Directory.Contracts.Kernel.csproj, NOT ...\Directory.Contracts.csproj.  If you get this wrong,
+    your build will either fail (good), or succeed but fail at ngen or runtime (bad).
+    -->
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\KernelLibrary.targets" />
+</Project>
diff --git a/base/ProjectTemplates/Library.csproj b/base/ProjectTemplates/Library.csproj
new file mode 100644
index 0000000..2e82abb
--- /dev/null
+++ b/base/ProjectTemplates/Library.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Libraries\YourLibrary\YourLibrary.csproj
+
+Note:   This is the template for a user-mode library assembly.
+        Libraries just use App.targets, with OutputType=Library.
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>YourLibrary</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Foo.sg" />
+    <Compile Include="..." />
+    <ProjectReference Include="..."/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/ProjectTemplates/ServiceApp.csproj b/base/ProjectTemplates/ServiceApp.csproj
new file mode 100644
index 0000000..65d2180
--- /dev/null
+++ b/base/ProjectTemplates/ServiceApp.csproj
@@ -0,0 +1,37 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Services\YourServiceApp\YourServiceApp.csproj
+
+Note:   This is the template for a user-mode service executable.
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <AssemblyName>YourServiceName</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="Foo.sg" />
+    <Compile Include="..." />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <!-- ... -->
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/ProjectTemplates/WindowsProject.csproj b/base/ProjectTemplates/WindowsProject.csproj
new file mode 100644
index 0000000..d8a9d43
--- /dev/null
+++ b/base/ProjectTemplates/WindowsProject.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Windows\YourApp\YourApp.csproj
+
+Note:   This is the template for a standard Windows project.  These are projects
+        that are built with the standard CLR "Common Targets", not with
+        SingSharp.targets.
+        
+        Most projects that are created using the Visual Studio project designer
+        can be converted to this template, just by adding the correct <Import>
+        directives at the start and end of the project.
+        
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>YourAssemblyNameHere</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Services/CredentialsManager/Collections.sg b/base/Services/CredentialsManager/Collections.sg
new file mode 100644
index 0000000..64d7dc8
--- /dev/null
+++ b/base/Services/CredentialsManager/Collections.sg
@@ -0,0 +1,154 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/CredentialsManager/Collections.sg
+//
+//  Note:	Type-safe collection wrappers
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    class CredentialsCollection
+    {
+        public CredentialsCollection()
+        {
+        }
+        
+        private readonly Hashtable/*<CredentialsId, Credentials!>*/! _table = new Hashtable();
+        
+        public void Add(CredentialsId! key, Credentials! value)
+        {
+            _table.Add(key, value);
+        }
+        
+        public Credentials! this[CredentialsId! key]
+        {
+            set { _table[key] = value; }
+            get {
+                object untyped_value = _table[key] as string;
+                if (untyped_value == null)
+                    throw new Exception("Key not found in table.");
+                return (Credentials)untyped_value;
+            }
+        }
+        
+        public int Count
+        {
+            get { return _table.Count; }
+        }
+        
+        public bool TryGetValue(CredentialsId! key, out Credentials value)
+        {
+            object untyped_value = _table[key];
+            if (untyped_value == null) {
+                value = null;
+                return false;
+            } else {
+                value = (Credentials)untyped_value;
+                return true;
+            }				
+        }
+        
+        public bool ContainsKey(CredentialsId! key)
+        {
+            return _table[key] != null;
+        }
+        
+        public void Remove(CredentialsId! key)
+        {
+            _table.Remove(key);
+        }
+        
+        public void Clear()
+        {
+            _table.Clear();
+        }
+        
+        public ICollection Keys
+        {
+            get { return _table.Keys; }
+        }
+        
+        public ICollection Values
+        {
+            get { return _table.Values; }
+        }
+    }
+    
+    
+    // This is roughly Dictionary<ProtocolTuple, CredentialsId>.
+    class ProtocolMappingCollection
+    {
+        readonly private Hashtable! _table = new Hashtable();
+        
+        public ProtocolMappingCollection()
+        {
+        }
+        
+        public void Add(ProtocolTuple! key, CredentialsId! value)
+        {
+            _table.Add(key, value);
+        }
+        
+        public CredentialsId this[ProtocolTuple! key]
+        {
+            set { _table[key] = value; }
+            get {
+                object untyped_value = _table[key];
+                if (untyped_value == null)
+                    throw new Exception("Key not found in table");
+                return (CredentialsId)untyped_value;
+            }
+        }
+        
+        public bool TryGetValue(ProtocolTuple! key, out CredentialsId value)
+        {
+            object untyped_value = _table[key];
+            if (untyped_value == null) {
+                value = null;
+                return false;
+            } else {
+                value = (CredentialsId)untyped_value;
+                return true;
+            }
+        }
+        
+        public int Count
+        {
+            get { return _table.Count; }
+        }
+        
+        public void Clear()
+        {
+            _table.Clear();
+        }
+        
+        public bool ContainsKey(ProtocolTuple! key)
+        {
+            return _table[key] != null;
+        }
+        
+        public void Remove(ProtocolTuple! key)
+        {
+            _table.Remove(key);
+        }
+        
+        public IEnumerator/*<DictionaryEntry>*/ GetEnumerator()
+        {
+            return _table.GetEnumerator();
+        }
+    }
+}
diff --git a/base/Services/CredentialsManager/Credentials.sg b/base/Services/CredentialsManager/Credentials.sg
new file mode 100644
index 0000000..0999ae8
--- /dev/null
+++ b/base/Services/CredentialsManager/Credentials.sg
@@ -0,0 +1,139 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Service/CredentialsManager/Credentials.sg
+//
+//  Note:	Classes for representing credentials and evidence.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+using Ex = Microsoft.Singularity.Security;
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    /**
+    <summary>
+        <para>
+            This class contains a set of credentials, including sensitive "private" info,
+            such as passwords, private keys, etc.  The Credentials Manager allows clients
+            to create these entries, enumerate them, etc., but never allows the private
+            info to flow out of the credentials manager.  The CM also allows clients to
+            create "supplicants", which are instances of security protocols that are
+            allowed to make use of the private info, but not to expose it.
+        </para>
+    </summary>
+    */
+    class Credentials
+    {
+        public Credentials(CredentialsId! id, CredentialsEvidence! evidence)
+        {
+            this.Id = id;
+            this.Evidence = evidence;
+        }
+        
+        public CredentialsId! Id;
+        public CredentialsEvidence! Evidence;
+    }
+
+    /**
+    <summary>	
+        <para>
+            This class is used as a key in Hashtable, so it implements identity comparison
+            methods, including Object.GetHashCode(), operator==, operator!=, and Object.Equals().
+        </para>
+        <para>
+            Instances of this class are immutable.
+        </para>
+    </summary>
+    */
+    class CredentialsId
+    {
+        public CredentialsId(string! name, string! tag)
+        {
+            this.CredentialsName = name;
+            this.Tag = tag;
+        }
+        
+        public CredentialsId(Ex.CredentialsId excredentials)
+        {
+            this(
+                Bitter.ToString2(excredentials.CredentialsName),
+                Bitter.ToString2(excredentials.Tag));
+        }
+        
+        public readonly string! CredentialsName;
+        public readonly string! Tag;
+        
+        override public string! ToString()
+        {
+            return String.Format("[CredentialsId: name:{0} tag:{1}]", this.CredentialsName, this.Tag);
+        }
+        
+        public Ex.CredentialsId ToExchange()
+        {
+            Ex.CredentialsId ex = new Ex.CredentialsId();
+            ex.CredentialsName = Bitter.FromString2(this.CredentialsName);
+            ex.Tag = Bitter.FromString2(this.Tag);
+            return ex;
+        }
+        
+        override public int GetHashCode()
+        {
+            return unchecked((int)(CredentialsName.GetHashCode() + 3 * Tag.GetHashCode()));
+        }
+        
+        override public bool Equals(object obj)
+        {
+            CredentialsId comparand = obj as CredentialsId;
+            if (comparand == null)
+                return false;
+            
+            return this == comparand;
+        }
+        
+        public static bool operator== (CredentialsId! a, CredentialsId! b)
+        {
+            return a.CredentialsName == b.CredentialsName && a.Tag == b.Tag;
+        }
+        
+        public static bool operator!= (CredentialsId! a, CredentialsId! b)
+        {
+            return a.CredentialsName != b.CredentialsName || a.Tag != b.Tag;
+        }
+    }
+    
+    
+    // Base class for classes that provide evidence of ownership of a key.
+    abstract class CredentialsEvidence
+    {
+    }
+    
+    class PasswordEvidence : CredentialsEvidence
+    {
+        public PasswordEvidence(string! password)
+        {
+            this.Password = password;
+        }
+        
+        public readonly string! Password;
+    }
+    
+    /*
+    class PrivateKeyEvidence : CredentialsEvidence
+    {
+        ???
+    }
+    */
+}
+
diff --git a/base/Services/CredentialsManager/CredentialsManagerService.csproj b/base/Services/CredentialsManager/CredentialsManagerService.csproj
new file mode 100644
index 0000000..35230a2
--- /dev/null
+++ b/base/Services/CredentialsManager/CredentialsManagerService.csproj
@@ -0,0 +1,43 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CredentialsManager</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="CredentialsManagerService.sg" />
+    <Compile Include="Credentials.sg" />
+    <Compile Include="ProtocolMapping.sg" />
+    <Compile Include="Collections.sg" />
+    <Compile Include="Util.sg" />
+    <Compile Include="Ntlm.sg" />
+    <Compile Include="TraceSwitches.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\CredentialsManager.Contracts\CredentialsManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\CredentialsManager\CredentialsManager.Library.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Crypto\Crypto.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Ntlm\Ntlm.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Services/CredentialsManager/CredentialsManagerService.sg b/base/Services/CredentialsManager/CredentialsManagerService.sg
new file mode 100644
index 0000000..c91b33b
--- /dev/null
+++ b/base/Services/CredentialsManager/CredentialsManagerService.sg
@@ -0,0 +1,622 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/CredentialsManager/CredentialsManagerService.sg
+//
+//  Note:	Contains the entry point and main I/O loop for the service.
+//
+//		All clients that connect using the CredentialsManagerContract are
+//		serviced on the "main" thread of the CM.  All of the requests of
+//		that contract can be satisfied synchronously (without waiting for
+//		any external I/O or blocking).
+//
+//		Supplicant channels are serviced on separate threads.  Although it
+//		would be possible to service some of them on the main thread,
+//		separate threads make the code simpler, and allow for later protocols
+//		which might require more serious work be done to service requests.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+
+using Ex = Microsoft.Singularity.Security;
+
+[assembly: Microsoft.Singularity.Security.ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: Microsoft.Singularity.Security.AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    internal class CredentialsManagerService : ITracked
+    {
+        /// <param name="args">Ignored.</param>
+        public static int Main(string[] args)
+        {
+            CredentialsManagerService service = new CredentialsManagerService();
+            try {
+                service.Run();
+                return 0;
+            } finally {
+                service.Dispose();
+            }
+        }
+                
+        readonly CredentialsCollection! _credentials = new CredentialsCollection();
+        
+        readonly ProtocolMappingCollection! _protocolMappings = new ProtocolMappingCollection();
+        
+        void Run()
+        {
+            DebugLine("Credentials Manager service is initializing...");
+            
+            _authenticationProtocols[AuthenticationProtocolNames.Ntlm] = new NtlmAuthenticationProtocol();
+
+            ServiceProviderContract.Imp! manager_provider_imp;
+            ServiceProviderContract.Exp! manager_provider;
+            ServiceProviderContract.NewChannel(out manager_provider_imp, out manager_provider);
+
+            DirectoryServiceContract.Imp! rootdir = DirectoryService.NewClientEndpoint();
+            rootdir.SendRegister(Bitter.FromString2(CredentialsManagerContract.ChannelPath), manager_provider_imp);
+            
+            switch receive {
+                case rootdir.AckRegister():
+                    break;
+                    
+                case rootdir.NakRegister(imp, error):
+                    DebugLine("Failed to register control endpoint.  Error: " + SdsUtils.ErrorCodeToString(error));
+                    delete imp;
+                    delete rootdir;
+                    delete manager_provider;
+                    throw new Exception("Failed to register control endpoint: " + SdsUtils.ErrorCodeToString(error));
+                    
+                case rootdir.NakRegisterReparse(path, rest, linkFound, imp):
+                    DebugLine("Failed to register control endpoint.  Traversal of reparse points is not supported.");
+                    delete path;
+                    delete rest;
+                    delete imp;
+                    delete rootdir;
+                    delete manager_provider;
+                    throw new Exception("Failed to register control endpoint; reparse points are not supported.");
+            }
+            
+            delete rootdir;
+            
+            ESet<CredentialsManagerContract.Exp:Ready> clients = new ESet<CredentialsManagerContract.Exp:Ready>();
+            
+            DebugLine("Credentials Manager service is ready.");
+        
+            for (;;)
+            {
+                try {
+                switch receive
+                {
+                    case manager_provider.Connect(exp):
+                    {
+                        CredentialsManagerContract.Exp:Start client = exp as CredentialsManagerContract.Exp:Start;
+                        if (client != null) {
+                            manager_provider.SendAckConnect();
+                            client.SendSuccess();
+                            clients.Add(client);
+                        } else {
+                            manager_provider.SendNackConnect(exp);
+                        }
+                        break;
+                    }
+
+                    case manager_provider.ChannelClosed():
+                        DebugLine("Provider channel has closed!");
+                        goto quit;
+
+                    case client.ChannelClosed() in clients:
+                        // DebugLine("Client has disconnected.");
+                        delete client;
+                        break;
+                            
+                    case client.AddCredentials(Ex.CredentialsId excredentials, char[]! in ExHeap expassword, bool replace) in clients:
+                    {
+                        CredentialsId id = new CredentialsId(
+                            Bitter.ToString2(excredentials.CredentialsName),
+                            Bitter.ToString2(excredentials.Tag));
+                        string! password = Bitter.ToString2(expassword);
+                        
+                        excredentials.Dispose();						
+                        delete expassword;
+                        
+                        if (TraceSwitches.ShowManagerMessages) {
+                            DebugLine("Received AddCredentials: " + id + " [evidence not shown]");
+                        }
+
+                        if (_credentials.ContainsKey(id) && !replace) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Already have credentials matching that key.");
+                            client.SendRequestFailed(CredError.MatchingEntryExists);
+                        } else {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Setting credentials.");
+                            
+                            PasswordEvidence evidence = new PasswordEvidence(password);
+                            Credentials credentials = new Credentials(id, evidence);
+                            _credentials[id] = credentials;
+                            client.SendOk();
+                        }
+                        
+                        clients.Add(client);
+                        break;
+                    }
+                    
+                    case client.DeleteCredentials(excredentials) in clients:
+                    {
+                        CredentialsId id = new CredentialsId(
+                            Bitter.ToString2(excredentials.CredentialsName),
+                            Bitter.ToString2(excredentials.Tag));
+                        excredentials.Dispose();
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received DeleteCredentials: " + id.ToString());
+                        
+                        if (_credentials.ContainsKey(id)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Removing credentials.");
+                                
+                            _credentials.Remove(id);
+                            client.SendOk();
+                        } else {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    No such credentials registered.");
+                                
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);						
+                        }
+                        clients.Add(client);						
+                        break;
+                    }
+                    
+                    case client.DeleteAllCredentials() in clients:
+                    {
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received DeleteAllCredentials");
+                            
+                        _credentials.Clear();
+                        client.SendOk();
+                        clients.Add(client);
+                        break;
+                    }
+                        
+                    case client.EnumerateCredentials() in clients:
+                    {
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received EnumerateCredentials");
+                        
+                        ICollection! keys = (!)_credentials.Keys;
+                        int count = keys.Count;
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("    Sending " + count + " entries");
+                        
+                        Ex.CredentialsId[]! in ExHeap list = new[ExHeap] Ex.CredentialsId[count];
+                        
+                        IEnumerator enumerator = keys.GetEnumerator();
+                        for (int i = 0; i < count; i++) {
+                        
+                            if (!enumerator.MoveNext()) {
+                                if (TraceSwitches.ShowManagerMessages)
+                                    DebugLine("    Enumerator lied to us!");
+                                break;
+                            }
+                            
+                            CredentialsId! id = (!)(CredentialsId)enumerator.Current;
+                            
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("        Entry: " + id.ToString());
+                        
+                            expose(list[i]) {
+                                // these will be null, but we have to keep the type checker happy
+                                delete list[i].CredentialsName;
+                                delete list[i].Tag;
+                                
+                                list[i].CredentialsName = Bitter.FromString2(id.CredentialsName);
+                                list[i].Tag = Bitter.FromString2(id.Tag);								
+                            }
+                        }
+                        
+                        client.SendCredentialsList(list);
+                        clients.Add(client);
+                        break;
+                    }
+                    
+                    case client.AddProtocolMapping(Ex.ProtocolTuple extuple, Ex.CredentialsId excredentials, bool replace) in clients:
+                    {
+                        ProtocolTuple tuple = new ProtocolTuple(extuple);
+                        CredentialsId credentials = new CredentialsId(excredentials);
+                        extuple.Dispose();
+                        excredentials.Dispose();
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received AddProtocolMapping: {0} -> {1}", tuple.ToString(), credentials.ToString());
+                            
+                        if (!replace && _protocolMappings.ContainsKey(tuple)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("A protocol mapping with the same key already exists.");
+                                
+                            client.SendRequestFailed(CredError.MatchingEntryExists);
+                            clients.Add(client);
+                            break;
+                        }
+                        
+                        if (!_credentials.ContainsKey(credentials)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("The specified credentials do not exist.");
+                                
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);
+                            clients.Add(client);
+                            break;
+                        }
+                        
+                        _protocolMappings[tuple] = credentials;
+                        client.SendOk();
+                        clients.Add(client);
+                        break;
+                    }
+                        
+                    case client.DeleteProtocolMapping(Ex.ProtocolTuple extuple) in clients:
+                        ProtocolTuple tuple = new ProtocolTuple(extuple);
+                        extuple.Dispose();
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received DeleteProtocolMapping: tuple = " + tuple.ToString());
+                        
+                        if (_protocolMappings.ContainsKey(tuple)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Protocol mapping removed.");
+                            _protocolMappings.Remove(tuple);
+                            client.SendOk();
+                        } else {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    No matching entry");
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);
+                        }
+                        clients.Add(client);
+                        break;
+                        
+                    case client.DeleteAllProtocolMappings() in clients:
+                    {
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received DeleteAllProtocolMappings");
+                        _protocolMappings.Clear();
+                        client.SendOk();
+                        clients.Add(client);
+                        break;
+                    }
+                        
+                    case client.FindMatchingProtocolMapping(Ex.ProtocolTuple extuple, bool useWildcards) in clients:
+                    {
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received FindMatchingProtocolMapping:");
+                        
+                        ProtocolTuple tuple = new ProtocolTuple(extuple);
+                        extuple.Dispose();
+                        
+                        CredentialsId match;
+                        
+                        if (FindMatchingProtocolMapping(tuple, out match, useWildcards)) {
+                            assert match != null;
+                            DebugLine("    Match found: " + match.ToString());
+                            client.SendMatchingProtocolMapping(match.ToExchange());
+                        } else {
+                            DebugLine("    No matching entry found.");
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);
+                        }
+                        
+                        clients.Add(client);
+                        break;
+                    }
+                        
+                    case client.EnumerateProtocolMappings() in clients:
+                    {
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received EnumerateProtocolMappings");
+                        
+                        int count = _protocolMappings.Count;
+                        Ex.ProtocolMapping[]! in ExHeap list = new[ExHeap] Ex.ProtocolMapping[count];
+                        
+                        IEnumerator enumerator = _protocolMappings.GetEnumerator();
+                        for (int i = 0; i < count; i++) {
+                            if (!enumerator.MoveNext()) {
+                                DebugLine("Enumerator lied!!");
+                                break;
+                            }
+                            
+                            DictionaryEntry entry = (DictionaryEntry)(!)enumerator.Current;
+                            ProtocolTuple! tuple = (ProtocolTuple)entry.Key;
+                            CredentialsId! id = (!)(CredentialsId)entry.Value;
+                            
+                            expose (list[i]) {
+                                list[i].Dispose();
+                                list[i].ProtocolTuple.ApplicationProtocol = Bitter.FromString2(tuple.ApplicationProtocol);
+                                list[i].ProtocolTuple.AuthenticationProtocol = Bitter.FromString2(tuple.AuthenticationProtocol);
+                                list[i].ProtocolTuple.ServiceAddress = Bitter.FromString2(tuple.ServiceAddress);
+                                list[i].ProtocolTuple.Realm = Bitter.FromString2(tuple.Realm);
+                                list[i].CredentialsId.CredentialsName = Bitter.FromString2(id.CredentialsName);
+                                list[i].CredentialsId.Tag = Bitter.FromString2(id.Tag);								
+                            }
+                        }
+                        
+                        client.SendProtocolMappings(list);
+                        clients.Add(client);
+                        break;
+                    }
+                        
+                    case client.CreateSupplicant(
+                        char[]! in ExHeap exauthenticationProtocol,
+                        Ex.CredentialsId excredentials,
+                        ServiceContract.Exp:Start! exp) in clients:
+                    {
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("Received CreateSupplicant");
+                        
+                        string! authenticationProtocol = Util.ToStringDelete(exauthenticationProtocol);
+                        CredentialsId! id = new CredentialsId(excredentials);
+                        excredentials.Dispose();
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("    Credentials ID: " + id);
+                        
+                        // First, find credentials.
+                        
+                        Credentials credentials;
+                        if (!_credentials.TryGetValue(id, out credentials)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Credentials not found.");
+                            delete exp;
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);
+                            clients.Add(client);
+                            break;
+                        }
+                        assert credentials != null;
+                        
+                        // For now, we support only a hard-coded set of authentication protocols.
+                        
+                        AuthenticationProtocol protocol = (AuthenticationProtocol)_authenticationProtocols[authenticationProtocol];
+                        if (protocol == null) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Authentication protocol not recognized: " + authenticationProtocol);
+                            client.SendRequestFailed(CredError.NoMatchingAuthenticationProtocol);
+                            delete exp;
+                            clients.Add(client);
+                            break;
+                        }
+                        
+                        CredError error;
+                        if (protocol.CreateSupplicant(exp, credentials, out error)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Authentication protocol accepted client");
+                            client.SendOk();
+                        } else {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Authentication protocol refused client: " + error);
+                            client.SendRequestFailed(error);
+                        }
+                        
+                        clients.Add(client);
+                        break;
+                    }
+                        
+                    case client.CreateSupplicantForProtocol(Ex.ProtocolTuple extuple, ServiceContract.Exp:Start! exp) in clients:
+                    {
+                        ProtocolTuple tuple = new ProtocolTuple(extuple);
+                        extuple.Dispose();
+                        
+                        if (TraceSwitches.ShowManagerMessages) {
+                            DebugLine("Received CreateSupplicantForProtocol");
+                            DebugLine("    Tuple = " + tuple);
+                        }
+                                                
+                        // First, find credentials.
+                        
+                        CredentialsId id;
+                        if (!FindMatchingProtocolMapping(tuple, out id, true)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    No matching credentials found.");
+                            delete exp;
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);
+                            clients.Add(client);
+                            break;
+                        }
+                        assert id != null;
+                        
+                        if (TraceSwitches.ShowManagerMessages)
+                            DebugLine("    Selected credentials: " + id);
+                        
+                        Credentials credentials;
+                        if (!_credentials.TryGetValue(id, out credentials)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Credentials not found.");
+                                
+                            delete exp;
+                            client.SendRequestFailed(CredError.NoMatchingCredentials);
+                            clients.Add(client);
+                            break;
+                        }
+                        assert credentials != null;
+                        
+                        AuthenticationProtocol protocol = (AuthenticationProtocol)_authenticationProtocols[tuple.AuthenticationProtocol];
+                        if (protocol == null) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Authentication protocol not recognized: " + tuple.AuthenticationProtocol);
+                                
+                            client.SendRequestFailed(CredError.NoMatchingAuthenticationProtocol);
+                            delete exp;
+                            clients.Add(client);
+                            break;
+                        }
+                        
+                        CredError error;
+                        if (protocol.CreateSupplicant(exp, credentials, out error)) {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Authentication protocol accepted client");
+                            client.SendAckCreateSupplicantForProtocol(id.ToExchange());
+                        } else {
+                            if (TraceSwitches.ShowManagerMessages)
+                                DebugLine("    Authentication protocol refused client: " + error);
+                            client.SendRequestFailed(error);
+                        }
+                        
+                        clients.Add(client);
+                        break;			
+                    }
+                    
+
+                        
+                } // switch receive
+                
+                } catch (Exception ex) {
+                    DebugLine("Uncaught exception in switch-receive loop!");
+                    Util.DumpException(ex);
+                    DebugLine("Will soldier on...");
+                }
+            }
+            
+        quit:
+            delete manager_provider;
+            clients.Dispose();
+            
+        }
+        
+        // This is a permutation on 4 bits, sorted in ascending order
+        // of the number of bits that are set to 1.  We use this to order
+        // our search of the protocol mappings table.  Each bit in the mask
+        // that is set to 1 indicates a field in ProtocolTuple to replace
+        // with a wildcard.
+        static readonly int[]! _WildcardMasks = {
+            0,		// 0000		// 0 bits set
+            1,		// 0001		// 1 bit set
+            2,		// 0010
+            4,		// 0100
+            8,		// 1000
+            3,		// 0011		// groups with 2 bits set
+            5,		// 0101
+            6,		// 0110
+            9,		// 1001
+            10,		// 1010
+            12,		// 1100
+            7,		// 0111		// 3 bits set
+            11,		// 1011
+            13,		// 1101
+            14,		// 1110
+            15,		// 1111		// 4 bits set
+        };
+            
+            
+
+        /** <summary>
+            This class searches the protocol mappings table for credentials that match a given
+            protocol tuple.  If the useWildcard argument is false, then a single, exact match
+            is performed.  If the useWildcard argument is true, then the method will search for
+            the most specific protocol mapping that matches the tuple provided.  If an exact
+            search does not find a tuple, then the method will replace some of the fields with
+            the wildcard marker ("*") and try again, until it has tried all combinations of
+            fields, including the "all fields wild" tuple of &lt; * * * * &gt;.  The _WildcardMasks
+            array controls the search order.		
+        </summary> */        
+        bool FindMatchingProtocolMapping(ProtocolTuple! tuple, out CredentialsId match, bool useWildcards)
+        {
+            if (useWildcards) {
+                if (TraceSwitches.ShowWildcardMatching) {
+                    DebugLine("    Query is a wildcard query");
+                    DebugLine("Generating variations of this tuple: " + tuple);
+                }
+                
+                match = null;
+            
+                //		bit 0: 
+                for (int permutation_index = 0; permutation_index < _WildcardMasks.Length; permutation_index++)
+                {
+                    int wildcard_mask = _WildcardMasks[permutation_index];
+                
+                    // If the tuple that we're using as our search key 
+                    // Each bit in 'wildcard_mask' corresponds to a field in ProtocolTuple.
+                    // Generate a search tuple (variation) with some values replaced with the wildcard marker "*".
+                    // Then query the table for the variation.
+                    
+                    ProtocolTuple variation = new ProtocolTuple(
+                        ((wildcard_mask & (1 << ProtocolTuple.ApplicationProtocolMaskBit)) != 0) ? ProtocolTuple.WildcardValue : tuple.ApplicationProtocol,
+                        ((wildcard_mask & (1 << ProtocolTuple.ServiceAddressMaskBit)) != 0) ? ProtocolTuple.WildcardValue : tuple.ServiceAddress,
+                        ((wildcard_mask & (1 << ProtocolTuple.AuthenticationProtocolMaskBit)) != 0) ? ProtocolTuple.WildcardValue : tuple.AuthenticationProtocol,
+                        ((wildcard_mask & (1 << ProtocolTuple.RealmMaskBit)) != 0) ? ProtocolTuple.WildcardValue : tuple.Realm);
+                    
+                    CredentialsId m;
+                    if (_protocolMappings.TryGetValue(variation, out m)) {
+                        assert m != null;
+                        if (TraceSwitches.ShowWildcardMatching)
+                            DebugLine("            Variation MATCHES:   mask: {0:x1} {1} -> {2}", wildcard_mask, variation.ToString(), m);
+                        if (match == null) {
+                            if (TraceSwitches.ShowWildcardMatching)
+                                DebugLine("        (using this match, showing future matches only for debugging)");
+                            match = m;
+                        }					
+                    } else {
+                        if (TraceSwitches.ShowWildcardMatching)
+                            DebugLine("            Variation: no match, mask: {0:x1} {1}", wildcard_mask, variation.ToString());
+                    }
+                }
+                
+                if (match != null) {
+                    if (TraceSwitches.ShowWildcardMatching)
+                        DebugLine("    Final match: " + match);
+                    return true;
+                } else {
+                    if (TraceSwitches.ShowWildcardMatching)
+                        DebugLine("    No matches.");
+                    return false;
+                }				
+            } else {
+                // The client wants to do a simple, exact match (no wildcards).
+                // This is easy.
+                if (TraceSwitches.ShowWildcardMatching)
+                    DebugLine("    Query is an exact-match query (no wildcards)");
+                return _protocolMappings.TryGetValue(tuple, out match);
+            }						
+        }
+        
+        void DebugLine(string! format, params object[]! args)
+        {
+            DebugLine(String.Format(format, args));
+        }
+        
+        void DebugLine(string! line)
+        {
+            DebugStub.WriteLine("CREDMGR: " + line);
+        }
+                
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+        
+        readonly Hashtable/*<string,AuthenticationProtocol>*/! _authenticationProtocols = new Hashtable();
+        
+        public void Dispose()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents an authentication protocol, but not an instance of such a protocol.
+    /// Derived classes override the CreateSupplicant method, which is used to create
+    /// instances of authentication protocols.
+    /// </summary>
+    abstract class AuthenticationProtocol
+    {
+        public abstract bool CreateSupplicant([Claims]ServiceContract.Exp! exp, Credentials! credentials, out CredError error);
+    }
+}
+
diff --git a/base/Services/CredentialsManager/Ntlm.sg b/base/Services/CredentialsManager/Ntlm.sg
new file mode 100644
index 0000000..f19ffb6
--- /dev/null
+++ b/base/Services/CredentialsManager/Ntlm.sg
@@ -0,0 +1,327 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/CredentialsManager/Ntlm.sg
+//
+//  Note:	Contains the code that allows the Credentials Manager to use NTLM.
+//			The NTLM algorithms are not implemented in this file; they're in 
+//			the Libraries/Ntlm.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+using NtlmSupplicant = System.Security.Protocols.Ntlm.NtlmSupplicant;
+
+using Ex = Microsoft.Singularity.Security;
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    class NtlmAuthenticationProtocol : AuthenticationProtocol
+    {
+        public override bool CreateSupplicant([Claims]ServiceContract.Exp! exp, Credentials! credentials, out CredError error)
+        {
+            // The only kind of evidence that NTLM supports is PasswordEvidence.
+            PasswordEvidence pwevidence = credentials.Evidence as PasswordEvidence;
+            if (pwevidence == null) {
+                delete exp;
+                error = CredError.EvidenceTypeNotSupported;
+                return false;
+            }
+            
+            // Parse the username and domain name from the credentials name.
+            
+            string! credentialsName = credentials.Id.CredentialsName;
+            string! username;
+            string! domain;
+            
+            int separator = credentialsName.IndexOf('\\');
+            if (separator != -1) {
+                // Is it "domain\user"?
+                username = credentialsName.Substring(separator + 1);
+                domain = credentialsName.Substring(0, separator);
+            } else {
+                separator = credentialsName.IndexOf('@');
+                if (separator != -1) {
+                    // Is it "user@domain.foo"?
+                    username = credentialsName.Substring(0, separator);
+                    domain = credentialsName.Substring(separator + 1);
+                } else {
+                    // No, and no.  Assume "user", and use a domain of ".", which most implementations
+                    // interpret as meaning "this machine" or "this domain".
+                    username = credentialsName;
+                    domain = ".";
+                }
+            }
+            
+            // Which contract does the client want to use?
+            
+            NtlmSupplicantContract.Exp ntlm_exp = exp as NtlmSupplicantContract.Exp;
+            GssSupplicantContract.Exp gss_exp;
+            
+            if ((ntlm_exp = exp as NtlmSupplicantContract.Exp) != null) {
+                NtlmLegacySupplicantClient.StartServiceThread(ntlm_exp, pwevidence);
+                error = CredError.NoError;
+                return true;
+            } else if ((gss_exp = exp as GssSupplicantContract.Exp) != null) {
+                NtlmGssSupplicantClient.StartServiceThread(gss_exp, username, domain, pwevidence);
+                error = CredError.NoError;
+                return true;
+            } else {
+                delete exp;
+                error = CredError.ContractNotSupported;
+                return false;
+            }
+            
+        }
+    }
+    
+    /**
+    <summary>
+        This class provides raw access to the NTLM supplicant, using NtlmSupplicantContract.
+        This is for clients that deal directly with the username, domain name, the NTLM
+        challenge, and response, all as discrete fields.
+    </summary>
+    */
+    class NtlmLegacySupplicantClient
+    {
+        public static void StartServiceThread([Claims]NtlmSupplicantContract.Exp:Start! exp, PasswordEvidence! evidence)
+        {
+            NtlmLegacySupplicantClient client = new NtlmLegacySupplicantClient(exp, evidence);
+            ThreadStart start = new ThreadStart(client.ThreadServiceRoutine);
+            Thread thread = new Thread(start);
+            thread.Start();
+        }
+        
+        private NtlmLegacySupplicantClient([Claims]NtlmSupplicantContract.Exp:Start! exp, PasswordEvidence! evidence)
+        {
+            _exp = new TRef<NtlmSupplicantContract.Exp:Start>(exp);
+            _evidence = evidence;
+        }
+        
+        TRef<NtlmSupplicantContract.Exp:Start>! _exp;
+        
+        readonly PasswordEvidence! _evidence;
+        
+        void ThreadServiceRoutine()
+        {
+            NtlmSupplicantContract.Exp! exp = _exp.Acquire();
+            
+            // DebugLine("Service thread started.");
+            
+            try {
+            
+                exp.SendSuccess();
+            
+                for (;;) {
+                
+                    switch receive {
+                        case exp.ChannelClosed():
+                            // DebugLine("Channel closed.");
+                            return;
+                        
+                        case exp.GetResponse(exchallenge, type):
+                            byte[]! challenge = Bitter.ToByteArray(exchallenge);
+                            delete exchallenge;
+                            
+                            
+                            byte[] response;
+                            switch (type) {
+                                case NtlmResponseType.LanMan:
+                                    // DebugLine("Computing LanMan response");
+                                    response = NtlmSupplicant.ComputeLmResponse(challenge, _evidence.Password);
+                                    break;
+                                    
+                                case NtlmResponseType.WindowsNt:
+                                    // DebugLine("Computing NT response");
+                                    response = NtlmSupplicant.ComputeNtResponse(challenge, _evidence.Password);
+                                    break;
+                                    
+                                default:
+                                    DebugLine("Invalid arguments -- response type not supported");
+                                    response = null;
+                                    break;									
+                            }
+                            
+                            if (response != null) {
+                                byte[]! in ExHeap exresponse = Bitter.FromByteArray(response);
+                                exp.SendResponse(exresponse);
+                            } else {
+                                exp.SendRequestFailed(CredError.InvalidArguments);
+                            }
+                            break;
+                    }
+                }
+            
+            } catch (Exception ex) {
+                DebugLine("EXCEPTION in NtlmLegacySupplicantClient service thread!");
+                Util.DumpException(ex);
+
+            } finally {
+                delete exp;
+            }
+        }
+        
+        void DebugLine(string! line)
+        {
+            DebugStub.WriteLine("CREDMGR[NtlmLegacy]: " + line);
+        }
+        
+        void DebugLine(string! format, params object[]! args)
+        {
+            DebugLine(String.Format(format, args));
+        }	
+    }
+
+    /**
+    <summary>
+        This class provides access to the NTLM supplicant using GSS.  GSS is a token-exchange model.
+        This implementation uses standard NTLMSSP tokens, and is compatible with the Windows NTLM SSP
+        implementation.
+    </summary>
+    */
+    class NtlmGssSupplicantClient
+    {
+        public static void StartServiceThread(
+            [Claims]GssSupplicantContract.Exp:Start! exp,
+            string! username,
+            string! domain,
+            PasswordEvidence! evidence)
+        {
+            NtlmGssSupplicantClient client = new NtlmGssSupplicantClient(exp, username, domain, evidence);
+            ThreadStart start = new ThreadStart(client.ThreadServiceRoutine);
+            Thread thread = new Thread(start);
+            thread.Start();
+        }
+        
+        private NtlmGssSupplicantClient(
+            [Claims]GssSupplicantContract.Exp:Start! exp,
+            string! username,
+            string! domain,
+            PasswordEvidence! evidence)
+        {
+            _exp = new TRef<GssSupplicantContract.Exp:Start>(exp);
+            _evidence = evidence;
+            _workstation = "SINGULARITY";
+            _username = username;
+            _domain = domain;
+        }
+        
+        TRef<GssSupplicantContract.Exp:Start>! _exp;
+        
+        readonly PasswordEvidence! _evidence;
+        readonly string! _username;
+        readonly string! _domain;
+        
+        readonly string! _workstation;
+        
+        void ThreadServiceRoutine()
+        {
+            GssSupplicantContract.Exp! exp = _exp.Acquire();
+            
+            // DebugLine("Service thread started.");
+            
+            try {
+
+                // In NTLM/GSS, the supplicant sends the first message (Negotiate).
+                // This message contains the domain name and hostname of the local computer,
+                // which Singularity doesn't really support right now.  So we'll use fixed values.
+                
+                byte[]! negotiate_token;
+                try {
+                    negotiate_token = NtlmSupplicant.GetNegotiate(
+                        0,
+                        "WORKGROUP",
+                        _workstation);
+                } catch(Exception ex) {
+                    DebugLine("The NTLM supplicant threw an exception while trying to build the Negotiate token.");
+                    Util.DumpException(ex);
+                    return;
+                }
+                
+                // DebugLine("Sending Negotiate token");
+                exp.SendFirstToken(Bitter.FromByteArray(negotiate_token));
+                
+                // The supplicant channel is now in the WaitingForToken state.
+            
+                switch receive
+                {
+                    case exp.ChannelClosed():
+                        // DebugLine("Channel closed.");
+                        return;
+                    
+                    case exp.AcceptToken(byte[]! in ExHeap exchallenge_token):
+                        byte[]! challenge_token = Bitter.ToByteArray(exchallenge_token);
+                        delete exchallenge_token;
+                        // DebugLine("Received Challenge token.");
+                        byte[]! response_token;
+                        try {
+                            response_token = NtlmSupplicant.GetResponse(
+                                challenge_token,
+                                _domain,
+                                _username,
+                                _workstation,
+                                _evidence.Password);
+                        } catch (Exception ex) {
+                            DebugLine("The NTLM supplicant threw an exception while processing the Challenge token.");
+                            Util.DumpException(ex);
+                            exp.SendAuthenticationFailed(GssErrorCode.InternalError);
+                            goto failed_state;
+                        }
+                        // DebugLine("Sending ContinueNeeded, with the Response token.");
+                        byte[]! in ExHeap ex_response_token = Bitter.FromByteArray(response_token);
+                        exp.SendCompleteWithToken(ex_response_token);
+                        break;
+                }
+                
+                //
+                // At this point, we are in the "succeeded" state.
+                // Which actually resembles the "failed" state, but this state will probably
+                // have some real messages later.
+                //
+                // DebugLine("Authentication is complete, at least from our point of view.");
+                
+                for (;;) {
+                    switch receive {
+                        case exp.ChannelClosed():
+                            return;
+                    }
+                }
+                
+            failed_state:
+                for (;;) {
+                    switch receive {
+                        case exp.ChannelClosed():
+                            return;
+                    }
+                }
+                
+            } catch (Exception ex) {
+                DebugLine("EXCEPTION in NtlmSupplicant service thread!");
+                Util.DumpException(ex);
+            } finally {
+                delete exp;
+            }
+        }
+        
+        void DebugLine(string! line)
+        {
+            DebugStub.WriteLine("CREDMGR[NtlmGss]: " + line);
+        }
+        
+        void DebugLine(string! format, params object[]! args)
+        {
+            DebugLine(String.Format(format, args));
+        }	
+    }
+}
diff --git a/base/Services/CredentialsManager/ProtocolMapping.sg b/base/Services/CredentialsManager/ProtocolMapping.sg
new file mode 100644
index 0000000..da2c508
--- /dev/null
+++ b/base/Services/CredentialsManager/ProtocolMapping.sg
@@ -0,0 +1,116 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+
+using Ex = Microsoft.Singularity.Security;
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    class ProtocolTuple
+    {
+        public ProtocolTuple(Ex.ProtocolTuple extuple)
+        {
+            this.ApplicationProtocol = Bitter.ToString2(extuple.ApplicationProtocol);
+            this.ServiceAddress = Bitter.ToString2(extuple.ServiceAddress);
+            this.AuthenticationProtocol = Bitter.ToString2(extuple.AuthenticationProtocol);
+            this.Realm = Bitter.ToString2(extuple.Realm);
+        }
+        
+        public ProtocolTuple(
+            string! applicationProtocol,
+            string! serviceAddress,
+            string! authenticationProtocol,
+            string! realm)
+        {
+            this.ApplicationProtocol = applicationProtocol;
+            this.ServiceAddress = serviceAddress;
+            this.AuthenticationProtocol = authenticationProtocol;
+            this.Realm = realm;
+        }
+            
+        public readonly string! ApplicationProtocol;
+        public readonly string! ServiceAddress;
+        public readonly string! AuthenticationProtocol;
+        public readonly string! Realm;
+        
+        public const string WildcardValue = "*";
+        public const int ApplicationProtocolMaskBit = 0;
+        public const int ServiceAddressMaskBit = 1;
+        public const int AuthenticationProtocolMaskBit = 2;
+        public const int RealmMaskBit = 3;
+        
+        
+        public override string! ToString()
+        {
+            return String.Format("< app-prot:{0} service:{1} auth-prot:{2} realm:{3} >",
+                this.ApplicationProtocol,
+                this.ServiceAddress,
+                this.AuthenticationProtocol,
+                this.Realm);
+        }
+        
+        override public int GetHashCode()
+        {
+            return Util.CombineHashCodes(
+                ApplicationProtocol.GetHashCode(),
+                ServiceAddress.GetHashCode(),
+                AuthenticationProtocol.GetHashCode(),
+                Realm.GetHashCode());
+        }
+        
+        override public bool Equals(object obj)
+        {
+            ProtocolTuple comparand = obj as ProtocolTuple;
+            if (comparand == null)
+                return false;
+            return this == comparand;
+        }
+        
+        public static bool operator== (ProtocolTuple! a, ProtocolTuple! b)
+        {
+            return a.ApplicationProtocol == b.ApplicationProtocol
+                && a.ServiceAddress == b.ServiceAddress
+                && a.AuthenticationProtocol == b.AuthenticationProtocol
+                && a.Realm == b.Realm;
+        }
+        
+        public static bool operator!= (ProtocolTuple! a, ProtocolTuple! b)
+        {
+            return a.ApplicationProtocol != b.ApplicationProtocol
+                || a.ServiceAddress != b.ServiceAddress
+                || a.AuthenticationProtocol != b.AuthenticationProtocol
+                || a.Realm != b.Realm;
+        }
+    }
+    
+    class ProtocolMapping
+    {
+        public ProtocolMapping(
+            ProtocolTuple! protocolTuple,
+            CredentialsId! credentialsId)
+        {
+            this.ProtocolTuple = protocolTuple;
+            this.CredentialsId = credentialsId;
+        }
+        
+        public readonly ProtocolTuple! ProtocolTuple;
+        public readonly CredentialsId! CredentialsId;
+    }
+}
diff --git a/base/Services/CredentialsManager/TraceSwitches.sg b/base/Services/CredentialsManager/TraceSwitches.sg
new file mode 100644
index 0000000..bab155a
--- /dev/null
+++ b/base/Services/CredentialsManager/TraceSwitches.sg
@@ -0,0 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/CredentialsManager/TraceSwitches.sg
+//
+//  Note:	Booleans that control trace output
+//
+
+using System;
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    class TraceSwitches
+    {
+        public static bool ShowManagerMessages = false;
+        public static bool ShowWildcardMatching = false;
+    }
+}
diff --git a/base/Services/CredentialsManager/Util.sg b/base/Services/CredentialsManager/Util.sg
new file mode 100644
index 0000000..d7a36c4
--- /dev/null
+++ b/base/Services/CredentialsManager/Util.sg
@@ -0,0 +1,66 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/CredentialsManager/Util.sg
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+
+namespace Microsoft.Singularity.Security.CredentialsManager
+{
+    internal class Util
+    {
+        // These methods combine two or more hash codes to produce a combined hash.
+        // The idea is that we multiply the values by different prime numbers
+        // (while extending to 64 bits), XOR the results, and then fold the top 32 bits
+        // into the bottom.  This is completely untested; I have no idea whether this
+        // is a great or horrible way to combine hash values.
+    
+        public static int CombineHashCodes(int hc0, int hc1)
+        {
+            long hc = ((long)hc0) ^ (((long)hc1) * 3);
+            return unchecked((int)(((hc >> 32) ^ (hc)) & 0xffffffffu));
+        }
+        
+        public static int CombineHashCodes(int hc0, int hc1, int hc2)
+        {
+            long hc = ((long)hc0) ^ (((long)hc1) * 3) ^ (((long)hc2) * 5);
+            return unchecked((int)(((hc >> 32) ^ (hc)) & 0xffffffffu));
+        }
+        
+        public static int CombineHashCodes(int hc0, int hc1, int hc2, int hc3)
+        {
+            long hc = ((long)hc0) ^ (((long)hc1) * 3) ^ (((long)hc2) * 5) ^ (((long)hc3) * 7);
+            return unchecked((int)(((hc >> 32) ^ (hc)) & 0xffffffffu));
+        }
+        
+        public static string! ToStringDelete([Claims]char[]! in ExHeap exstring)
+        {
+            string! localstring = Bitter.ToString2(exstring);
+            delete exstring;
+            return localstring;
+        }
+        
+        public static void DumpException(Exception! chain)
+        {
+            for (Exception ex = chain; ex != null; ex = ex.InnerException)
+            {
+                DebugStub.WriteLine(ex.GetType().FullName + ": " + ex.Message);
+            }
+        }
+    }
+}
+
diff --git a/base/Services/Fat/ClientManager/FatClientManager.csproj b/base/Services/Fat/ClientManager/FatClientManager.csproj
new file mode 100644
index 0000000..4c7e5f7
--- /dev/null
+++ b/base/Services/Fat/ClientManager/FatClientManager.csproj
@@ -0,0 +1,36 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>FatClientManager</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="FatClientManager.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Services\Fat\Contracts\FatContracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/Fat/ClientManager/FatClientManager.sg b/base/Services/Fat/ClientManager/FatClientManager.sg
new file mode 100644
index 0000000..a959811
--- /dev/null
+++ b/base/Services/Fat/ClientManager/FatClientManager.sg
@@ -0,0 +1,453 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fat/ClientManager/FatClientManager.sg
+//
+//  Note:
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+[assembly: Microsoft.Singularity.Security.ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: Microsoft.Singularity.Security.AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.Fat.ClientManager
+{
+    public class ClientManager
+    {
+        internal static readonly char PathSeparator = Path.DirectorySeparatorChar;
+
+        private static ArrayList! mounts = new ArrayList();
+
+        internal class Client
+        {
+            TRef<FatClientContract.Imp:Running>! tref;
+            string! diskPath;
+            string! mountPath;
+            bool    readOnly;
+            uint    cacheMB;
+
+            internal Client(
+                [Claims] FatClientContract.Imp! imp,
+                string! diskPath,
+                string! mountPath,
+                bool    readOnly,
+                uint    cacheMB
+                )
+            {
+                this.tref = new TRef<FatClientContract.Imp:Running>(imp);
+                this.diskPath  = diskPath;
+                this.mountPath = mountPath;
+                this.readOnly  = readOnly;
+                this.cacheMB   = cacheMB;
+            }
+
+            internal FatClientContract.Imp! Acquire()
+            {
+                return tref.Acquire();
+            }
+
+            internal void Release([Claims] FatClientContract.Imp! imp)
+            {
+                tref.Release(imp);
+            }
+
+            internal string! DiskPath  { get { return this.diskPath;  } }
+            internal string! MountPath { get { return this.mountPath; } }
+        }
+
+        internal static void
+        AddClient(Client newClient)
+        {
+            mounts.Add(newClient);
+        }
+
+        internal static Client GetClientByMountPath(string! path)
+            requires (path.Length > 0 &&
+                      path[path.Length - 1] != Path.DirectorySeparatorChar);
+        {
+            for (int i = 0; i < mounts.Count; i++) {
+                Client! cs = (Client!)mounts[i];
+                if (String.Compare(cs.MountPath, path, true) == 0) {
+                    return cs;
+                }
+            }
+            return null;
+        }
+
+        internal static Client GetClientByDiskPath(string! path)
+            requires (path.Length > 0 &&
+                      path[path.Length - 1] != Path.DirectorySeparatorChar);
+        {
+            for (int i = 0; i < mounts.Count; i++) {
+                Client! cs = (Client!)mounts[i];
+                if (String.Compare(cs.DiskPath, path, true) == 0) {
+                    return cs;
+                }
+            }
+            return null;
+        }
+
+        internal static void DeleteClient(Client! closedClient)
+        {
+            mounts.Remove(closedClient);
+        }
+
+        internal static bool ClientIsClosed(Client! client)
+        {
+            FatClientContract.Imp:Running! clientImp = client.Acquire();
+            bool closed = false;
+
+            switch receive {
+                case clientImp.ChannelClosed():
+                    closed = true;
+                    break;
+                case timeout:
+                    break;
+            }
+
+            client.Release(clientImp);
+            return closed;
+        }
+
+        private static void
+        DoMount(FatControlContract.Exp:Ready! controller,
+                [Claims]
+                FatMountSettings*! in ExHeap  fms)
+        {
+            string! diskPath  = ToPath(fms->DiskPath);
+            string! mountPath = ToPath(fms->MountPath);
+            bool    readOnly  = fms->ReadOnly;
+            uint    cacheMB   = fms->CacheMB;
+
+            Client client = GetClientByDiskPath(diskPath);
+            if (client != null) {
+                if (!ClientIsClosed(client)) {
+                    // Already using disk path
+                    controller.SendFail(FatContractErrorCode.DiskUnavailable);
+                    delete fms;
+                    return;
+                }
+                else {
+                    DeleteClient(client);
+                    client = null;
+                }
+            }
+
+            client = GetClientByMountPath(mountPath);
+            if (client != null) {
+                if (!ClientIsClosed(client)) {
+                    // Already using mount path
+                    controller.SendFail(FatContractErrorCode.PathUnavailable);
+                    delete fms;
+                    return;
+                }
+                else {
+                    DeleteClient(client);
+                    client = null;
+                }
+            }
+
+            FatClientContract.Imp! clientImp;
+            FatClientContract.Exp! clientExp;
+            FatClientContract.NewChannel(out clientImp, out clientExp);
+
+            string [] args = { "fatfs" };
+            Process process = new Process(args);
+            process.SetStartupEndpoint(0, clientExp);
+            process.Start();
+
+            clientImp.SendMount(fms);
+            switch receive
+            {
+                case clientImp.Success():
+                    AddClient(
+                        new Client(clientImp, diskPath, mountPath,
+                                   readOnly, cacheMB)
+                        );
+                    controller.SendSuccess();
+                    break;
+
+                case clientImp.ChannelClosed():
+                    controller.SendSuccess();
+                    delete clientImp;
+                    break;
+
+                case clientImp.Fail(reason):
+                    controller.SendFail(reason);
+                    delete clientImp;
+                    break;
+            }
+        }
+
+        private static void
+        DoUnmount(
+            FatControlContract.Exp:Ready! controller,
+            [Claims] char[]! in ExHeap    mountPath,
+            bool                          force
+            )
+        {
+            string path = ToPath(Bitter.ToString2(mountPath));
+            delete mountPath;
+
+            Client client = GetClientByMountPath(path);
+            if (client == null) {
+                controller.SendFail(FatContractErrorCode.NotMounted);
+                return;
+            }
+            else if (ClientIsClosed(client)) {
+                controller.SendSuccess();
+                return;
+            }
+
+            FatClientContract.Imp! clientImp = client.Acquire();
+            clientImp.SendUnmount(force);
+            switch receive {
+                case clientImp.Success():
+                    controller.SendSuccess();
+                    client.Release(clientImp);
+                    DeleteClient(client);
+                    break;
+                case clientImp.Fail(reason):
+                    controller.SendFail(reason);
+                    client.Release(clientImp);
+                    break;
+                case clientImp.ChannelClosed():
+                    controller.SendFail(FatContractErrorCode.InternalError);
+                    client.Release(clientImp);
+                    DeleteClient(client);
+                    break;
+            }
+        }
+
+        private static void
+        DoGetPreferredFormatSettings(
+            FatControlContract.Exp:Ready! controller,
+            [Claims] char[]! in ExHeap diskPath
+            )
+        {
+            string! cleanPath = ToPath(Bitter.ToString2(diskPath));
+            delete diskPath;
+
+            FatClientContract.Imp! clientImp;
+            FatClientContract.Exp! clientExp;
+            FatClientContract.NewChannel(out clientImp, out clientExp);
+
+            string [] args = { "fatfs" };
+            Process process = new Process(args);
+            process.SetStartupEndpoint(0, clientExp);
+            process.Start();
+
+            clientImp.SendGetPreferredFormatSettings(
+                Bitter.FromString2(cleanPath)
+                );
+            try {
+                switch receive
+                {
+                    case clientImp.PreferredFormatSettings(settings):
+                        controller.SendPreferredFormatSettings(settings);
+                        break;
+                    case clientImp.Fail(error):
+                        controller.SendFail(error);
+                        break;
+                    case clientImp.ChannelClosed():
+                        DebugStub.Break();
+                        break;
+                }
+            }
+            finally {
+                delete clientImp;
+            }
+        }
+
+        private static void
+        DoFormat(
+            FatControlContract.Exp:Ready! controller,
+            [Claims] char[]! in ExHeap diskPath,
+            [Claims] char[]! in ExHeap volumeLabel,
+            [Claims] FatFormatSettings*! in ExHeap settings
+            )
+        {
+            string! cleanPath = ToPath(Bitter.ToString2(diskPath));
+            delete diskPath;
+
+            FatClientContract.Imp! clientImp;
+            FatClientContract.Exp! clientExp;
+            FatClientContract.NewChannel(out clientImp, out clientExp);
+
+            string [] args = { "fatfs" };
+            Process process = new Process(args);
+            process.SetStartupEndpoint(0, clientExp);
+            process.Start();
+
+            clientImp.SendFormat(Bitter.FromString2(cleanPath),
+                                 volumeLabel,
+                                 settings);
+            try {
+                switch receive
+                {
+                    case clientImp.Success():
+                        controller.SendSuccess();
+                        break;
+                    case clientImp.Fail(error):
+                        controller.SendFail(error);
+                        break;
+                    case clientImp.ChannelClosed():
+                        DebugStub.Break();
+                        break;
+                }
+            }
+            finally {
+                delete clientImp;
+            }
+        }
+
+        private static void Shutdown()
+        {
+        }
+
+        private static void ServiceClients(ServiceProviderContract.Exp! spExp)
+        {
+            ESet<FatControlContract.Exp:Ready> controllers =
+                new ESet<FatControlContract.Exp:Ready>();
+
+            bool run = true;
+            while (run) {
+                switch receive {
+                    case spExp.Connect(candidate):
+                        FatControlContract.Exp controller =
+                            candidate as FatControlContract.Exp;
+                        if (controller != null) {
+                            controller.SendSuccess();
+                            controllers.Add(controller);
+                            spExp.SendAckConnect();
+                        }
+                        else {
+                            spExp.SendNackConnect(candidate);
+                        }
+                        break;
+
+                    case spExp.ChannelClosed():
+                        run = false;
+                        break;
+
+                    case controller.Mount(settings) in controllers:
+                        DoMount(controller, settings);
+                        controllers.Add(controller);
+                        break;
+
+                    case controller.Unmount(mountPath, force) in controllers:
+                        DoUnmount(controller, mountPath, force);
+                        controllers.Add(controller);
+                        break;
+
+                    case controller.GetPreferredFormatSettings(diskPath) in controllers:
+                        DoGetPreferredFormatSettings(controller, diskPath);
+                        controllers.Add(controller);
+                        break;
+
+                    case controller.Format(diskPath, volumeLabel, fms) in controllers:
+                        DoFormat(controller, diskPath, volumeLabel, fms);
+                        controllers.Add(controller);
+                        break;
+
+                    case controller.ChannelClosed() in controllers:
+                        delete controller;
+                        break;
+                }
+            }
+            Shutdown();
+            controllers.Dispose();
+        }
+
+        /// <remarks> Sanitize path string.  This method removes
+        /// trailing separators and repeat sequences of
+        /// separators.  </remarks>
+        private static string! ToPath(string! p)
+        {
+            int length = p.Length;
+
+            if (p.Length > 0 && p.Length - 1 == Path.DirectorySeparatorChar) {
+                length = p.LastIndexOf(Path.DirectorySeparatorChar);
+            }
+
+            StringBuilder sb = new StringBuilder(length);
+
+            bool multi = false;
+            for (int i = 0; i < length; i++) {
+                if (p[i] == Path.DirectorySeparatorChar) {
+                    if (multi) {
+                        continue;
+                    }
+                    else {
+                        sb.Append(p[i]);
+                        multi = true;
+                    }
+                }
+                else {
+                    sb.Append(p[i]);
+                    multi = false;
+                }
+            }
+            return sb.ToString();
+        }
+
+        public static int Main()
+        {
+            ServiceProviderContract.Imp! spImp;
+            ServiceProviderContract.Exp! spExp;
+            ServiceProviderContract.NewChannel(out spImp, out spExp);
+
+            DirectoryServiceContract.Imp! dsImp =
+                DirectoryService.NewClientEndpoint();
+
+            dsImp.SendRegister(Bitter.FromString2(
+                                   FatControlContract.ManagerControlPath
+                                   ),
+                               spImp);
+            try {
+                switch receive {
+                    case dsImp.AckRegister():
+                        DebugStub.Print(
+                            "FatClientManager registered at: {0}\n",
+                            __arglist(
+                                FatControlContract.ManagerControlPath
+                                )
+                            );
+                        delete dsImp;
+                        ServiceClients(spExp);
+                        break;
+                    case dsImp.NakRegister(rejectedImp, error):
+                        delete rejectedImp;
+                        delete dsImp;
+                        DebugStub.Print(
+                            "FatClientManager failed to register" +
+                            "(error=\"{0}\")\n", __arglist(error.ToString())
+                            );
+                        break;
+                    case dsImp.ChannelClosed():
+                        delete dsImp;
+                        DebugStub.Print(
+                            "FatClientManager lost connection to namespace\n"
+                            );
+                        break;
+                }
+            }
+            finally {
+                delete spExp;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Fat/Contracts/FatClientContract.sg b/base/Services/Fat/Contracts/FatClientContract.sg
new file mode 100644
index 0000000..6ec1640
--- /dev/null
+++ b/base/Services/Fat/Contracts/FatClientContract.sg
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatClientContract.sg
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Contracts
+{
+    public contract FatClientContract
+    {
+        in message Mount(FatMountSettings*! in ExHeap fms);
+        out message Success();
+        out message Fail(FatContractErrorCode why);
+
+        in message Unmount(bool force);
+
+        in message GetPreferredFormatSettings(
+            char []! in ExHeap diskName
+            );
+
+        out message PreferredFormatSettings(
+            FatFormatSettings*! in ExHeap fms
+            );
+
+        in message Format(
+            char []! in ExHeap diskName,
+            char []! in ExHeap volumeLabel,
+            FatFormatSettings*! in ExHeap fms
+            );
+
+        state Start : one {
+            Mount? -> MountPending;
+            GetPreferredFormatSettings? -> (Fail! or PreferredFormatSettings!) -> Start;
+            Format? -> (Fail! or Success!) -> Start;
+        }
+
+        state MountPending : one {
+            Success! -> Running;
+            Fail! -> Done;
+        }
+
+        state Running : one {
+            Unmount ? -> UnmountPending;
+        }
+
+        state UnmountPending : one {
+            Fail! -> Running;
+            Success! -> Done;
+        }
+
+        state Done : one {
+        }
+    }
+}
diff --git a/base/Services/Fat/Contracts/FatContractErrorCode.sg b/base/Services/Fat/Contracts/FatContractErrorCode.sg
new file mode 100644
index 0000000..4b4c91e
--- /dev/null
+++ b/base/Services/Fat/Contracts/FatContractErrorCode.sg
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatContractErrorCode.sg
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Contracts
+{
+    public enum FatContractErrorCode
+    {
+        NoError               = 0,
+        DiskUnavailable       = 1,
+        PathUnavailable       = 2,
+        UnableToStartProcess  = 3,
+        Busy                  = 4,
+        NotMounted            = 5,
+        InternalError         = 6,
+        NotFatPartition       = 7,
+        ReadFailed            = 8,
+        BadBPB                = 9,
+        ReadOnlyDisk          = 10,
+        InvalidStartSector    = 11,
+        InvalidFormatSettings = 12,
+        InvalidVolumeLabel    = 13,
+        Max                   = InvalidVolumeLabel
+    }
+}
diff --git a/base/Services/Fat/Contracts/FatContracts.csproj b/base/Services/Fat/Contracts/FatContracts.csproj
new file mode 100644
index 0000000..fd8543b
--- /dev/null
+++ b/base/Services/Fat/Contracts/FatContracts.csproj
@@ -0,0 +1,33 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Services.Fat.Contracts</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="FatControlContract.sg" />
+    <Compile Include="FatClientContract.sg" />
+    <Compile Include="FatContractErrorCode.sg" />
+    <Compile Include="FatFormatSettings.sg" />
+    <Compile Include="FatMountSettings.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Services/Fat/Contracts/FatControlContract.sg b/base/Services/Fat/Contracts/FatControlContract.sg
new file mode 100644
index 0000000..d1e0371
--- /dev/null
+++ b/base/Services/Fat/Contracts/FatControlContract.sg
@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatControlContract.sg
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Contracts
+{
+    /// <summary> The contract between the fatcontrol command
+    /// line program and the FAT client manager
+    /// service. </summary>
+    public contract FatControlContract : ServiceContract
+    {
+        in message Mount(FatMountSettings*! in ExHeap fms);
+        out message Success();
+        out message Fail(FatContractErrorCode why);
+
+        in message Unmount(char[]! in ExHeap mountPath, bool force);
+
+        in message GetPreferredFormatSettings(
+            char []! in ExHeap diskName
+            );
+        out message PreferredFormatSettings(FatFormatSettings*! in ExHeap fms);
+
+        in message Format(
+            char []! in ExHeap diskName,
+            char []! in ExHeap volumeName,
+            FatFormatSettings*! in ExHeap fms
+            );
+        out message InvalidFormatSettings();
+
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+        state Ready : one {
+            Mount? -> (Success! or Fail!) -> Ready;
+            Unmount? -> (Success! or Fail!) -> Ready;
+            GetPreferredFormatSettings? -> (PreferredFormatSettings! or Fail!) -> Ready;
+            Format? -> (Success! or Fail!) -> Ready;
+        }
+
+        public const string ManagerControlPath = "/dev/fat-client-manager";
+    }
+}
diff --git a/base/Services/Fat/Contracts/FatFormatSettings.sg b/base/Services/Fat/Contracts/FatFormatSettings.sg
new file mode 100644
index 0000000..ef3dc25
--- /dev/null
+++ b/base/Services/Fat/Contracts/FatFormatSettings.sg
@@ -0,0 +1,58 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatMountSettings.sg
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Contracts
+{
+    public enum FatFormatType {
+        Automatic = 0,
+        Fat12     = 12,
+        Fat16     = 16,
+        Fat32     = 32
+    }
+
+    public rep struct FatFormatSettings : ITracked
+    {
+        public const ulong NoMaxSectors = 0;
+
+        private FatFormatType type;
+        private ulong         maxSectors;
+        private ushort        bytesPerSector;
+
+        public FatFormatSettings(FatFormatType type,
+                                 ulong         maxSectors,
+                                 ushort        bytesPerSector)
+        {
+            this.type           = type;
+            this.maxSectors     = maxSectors;
+            this.bytesPerSector = bytesPerSector;
+        }
+
+        public FatFormatType FatFormatType
+        {
+            get { expose(this) { return this.type; } }
+        }
+
+        public ulong MaxSectors
+        {
+            get { expose(this) { return this.maxSectors; } }
+        }
+
+        public ushort BytesPerSector
+        {
+            get { expose(this) { return this.bytesPerSector; } }
+        }
+    }
+}
diff --git a/base/Services/Fat/Contracts/FatMountSettings.sg b/base/Services/Fat/Contracts/FatMountSettings.sg
new file mode 100644
index 0000000..73f16c2
--- /dev/null
+++ b/base/Services/Fat/Contracts/FatMountSettings.sg
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatMountSettings.sg
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Contracts
+{
+    public rep struct FatMountSettings : ITracked
+    {
+        public const uint MaxCacheMB            = 1024;
+        public const uint MaxDirectoryCacheSize = 4096;
+        public const uint MaxFileCacheSize      = 4096;
+        public const uint MaxWriteQueueSize     = 1024;
+
+        private char[]! in ExHeap diskPath;
+        private char[]! in ExHeap mountPath;
+        private bool readOnly;
+        private uint cacheMB;
+        private uint directoryCacheSize;
+        private uint fileCacheSize;
+        private uint writeQueueSize;
+
+        public FatMountSettings(string! diskPath,
+                                string! mountPath,
+                                bool    readOnly,
+                                uint    cacheMB,
+                                uint    directoryCacheSize,
+                                uint    fileCacheSize,
+                                uint    writeQueueSize)
+        {
+            this.diskPath           = Bitter.FromString2(diskPath);
+            this.mountPath          = Bitter.FromString2(mountPath);
+            this.readOnly           = readOnly;
+            this.cacheMB            = cacheMB;
+            this.directoryCacheSize = directoryCacheSize;
+            this.fileCacheSize      = fileCacheSize;
+            this.writeQueueSize     = writeQueueSize;
+        }
+
+        public string! DiskPath
+        {
+            get { expose(this) { return Bitter.ToString2(this.diskPath); } }
+        }
+
+        public string! MountPath
+        {
+            get { expose(this) { return Bitter.ToString2(this.mountPath); } }
+        }
+
+        public bool ReadOnly
+        {
+            get { expose(this) { return this.readOnly; } }
+        }
+
+        public uint CacheMB
+        {
+            get { expose(this) { return this.cacheMB; } }
+        }
+
+        public uint DirectoryCacheSize
+        {
+            get { expose(this) { return this.directoryCacheSize; } }
+        }
+
+        public uint FileCacheSize
+        {
+            get { expose(this) { return this.fileCacheSize; } }
+        }
+
+        public uint WriteQueueSize
+        {
+            get { expose(this) { return this.writeQueueSize; } }
+        }
+    }
+}
diff --git a/base/Services/Fat/Control/DefaultCommand.sg b/base/Services/Fat/Control/DefaultCommand.sg
new file mode 100644
index 0000000..b26d2b0
--- /dev/null
+++ b/base/Services/Fat/Control/DefaultCommand.sg
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DefaultCommand.sg
+//
+//  Note:
+//
+
+using System;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Services.Fat.FatControl
+{
+    [ConsoleCategory(HelpMessage = "Show help for FAT control program.",
+                     DefaultAction = true)]
+    internal class DefaultCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        internal DefaultCommand() {}
+
+        internal int AppMain()
+        {
+            Console.WriteLine("Specify a command to execute, or '-?' for a list of commands.");
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Fat/Control/FatControl.csproj b/base/Services/Fat/Control/FatControl.csproj
new file mode 100644
index 0000000..36a24ff
--- /dev/null
+++ b/base/Services/Fat/Control/FatControl.csproj
@@ -0,0 +1,36 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>FatControl</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DefaultCommand.sg" />
+    <Compile Include="FormatCommand.sg" />
+    <Compile Include="MountCommand.sg" />
+    <Compile Include="UnmountCommand.sg" />
+    <Compile Include="Utilities.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Contracts\FatContracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/Fat/Control/FormatCommand.sg b/base/Services/Fat/Control/FormatCommand.sg
new file mode 100644
index 0000000..fc88dc2
--- /dev/null
+++ b/base/Services/Fat/Control/FormatCommand.sg
@@ -0,0 +1,243 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FormatCommand.sg
+//
+//  Note:
+//
+
+using System;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+namespace Microsoft.Singularity.Services.Fat.FatControl
+{
+    [ConsoleCategory(Action = "format",
+                     DefaultAction = false,
+                     HelpMessage = "Create a FAT filesystem.")]
+    internal class FormatCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [StringParameter("l", Default = "NO NAME", Mandatory = false,
+                       HelpMessage = "Specify volume label")]
+        public string VolumeLabel;
+
+        [LongParameter("m", Default = 0, Mandatory = false,
+                       HelpMessage = "Maximum disk sectors to use")]
+        public long MaxDiskSectors;
+
+        [BoolParameter("u", Default = false, Mandatory = false,
+                       HelpMessage = "Format without prompting confirmation")]
+        public bool Unconditional;
+
+        [StringParameter("t", Default = "Automatic", Mandatory = false,
+                         HelpMessage = "Fat type (Automatic, FAT12, FAT16, or FAT32)")]
+        string FatType;
+
+        [StringParameter("diskpath", Position = 0, Mandatory = true,
+                         HelpMessage = "Filesystem to unmount.")]
+        string DiskPath;
+
+        reflective internal FormatCommand();
+
+        internal int AppMain()
+        {
+            FatFormatType fatFormatType;
+            if (!GetFormatType(this.FatType, out fatFormatType)) {
+                Console.WriteLine("Unknown format type \"{0}\"",
+                                  this.FatType);
+                return -1;
+            }
+
+            FatControlContract.Imp imp = Utilities.ConnectToManager();
+            if (imp != null) {
+                return DoFormat(imp,
+                                this.DiskPath,
+                                this.VolumeLabel,
+                                fatFormatType,
+                                (ulong)this.MaxDiskSectors
+                                );
+            }
+            return -1;
+        }
+
+        private static bool
+        GetPreferredFormatSettings(
+            FatControlContract.Imp! controller,
+            string!                 diskPath,
+            out FatFormatType       formatType,
+            out ulong               sectors,
+            out ushort              bytesPerSector
+            )
+        {
+            formatType     = FatFormatType.Automatic;
+            sectors        = 0;
+            bytesPerSector = 0;
+
+            controller.SendGetPreferredFormatSettings(
+                Bitter.FromString2(diskPath)
+                );
+
+            switch receive {
+                case controller.PreferredFormatSettings(fms):
+                    formatType     = fms->FatFormatType;
+                    sectors        = fms->MaxSectors;
+                    bytesPerSector = fms->BytesPerSector;
+                    delete fms;
+                    return true;
+
+                case controller.Fail(error):
+                    Utilities.DisplayError(error);
+                    return false;
+
+                case controller.ChannelClosed():
+                    Utilities.DisplayChannelClosedError();
+                    return false;
+            }
+        }
+
+        private static
+        int CommitFormat(
+            FatControlContract.Imp! controller,
+            string!                 diskPath,
+            string!                 volumeLabel,
+            FatFormatType           type,
+            ulong                   sectors,
+            ushort                  bytesPerSector
+            )
+        {
+            FatFormatSettings*! in ExHeap formatSettings = new [ExHeap]
+                FatFormatSettings(type, sectors, bytesPerSector);
+
+            controller.SendFormat(
+                Bitter.FromString2(diskPath),
+                Bitter.FromString2(volumeLabel),
+                formatSettings
+                );
+
+            switch receive {
+                case controller.Success():
+                    Console.WriteLine(
+                        "Formatted disk {0}\n" +
+                        "Label:    {1}\n" +
+                        "Type:     Fat{2}\n" +
+                        "Capacity: {3}",
+                        diskPath,
+                        volumeLabel,
+                        (int)type,
+                        Utilities.GetPrettySizeString(sectors * bytesPerSector)
+                        );
+                    return 0;
+                case controller.Fail(error):
+                    Utilities.DisplayError(error);
+                    return -1;
+                case controller.ChannelClosed():
+                    Utilities.DisplayChannelClosedError();
+                    return -1;
+            }
+        }
+
+        private static ulong GetMaxSectors(FatFormatType requestedType)
+        {
+            // The following values align with Fat/Fs/Format.sg,
+            // whose values derive from Page 20 of the spec for
+            // Fat16/32. Fat12 values were pulled from a hat.
+            switch (requestedType) {
+                case FatFormatType.Fat12: return 4084u * 64u;
+                case FatFormatType.Fat16: return 65536u * 64u;
+                default: /* case FatFormatType.Fat32:*/
+                    return UInt32.MaxValue;
+            }
+        }
+
+        private static
+        int DoFormat(
+            [Claims] FatControlContract.Imp! controller,
+            string!                          diskPath,
+            string!                          volumeLabel,
+            FatFormatType                    requestedType,
+            ulong                            requestedSectors
+            )
+        {
+            FatFormatType preferredType;
+            ulong         preferredSectors;
+            ushort        preferredBytesPerSector;
+
+            try {
+                if (GetPreferredFormatSettings(controller,
+                                               diskPath,
+                                               out preferredType,
+                                               out preferredSectors,
+                                               out preferredBytesPerSector))
+                {
+                    if (requestedType == FatFormatType.Automatic) {
+                        requestedType = preferredType;
+                    }
+
+                    if (requestedSectors == FatFormatSettings.NoMaxSectors) {
+                        requestedSectors = Math.Min(
+                            GetMaxSectors(requestedType), preferredSectors
+                            );
+                    }
+
+                    if (requestedSectors <= preferredSectors) {
+                        return CommitFormat(controller, diskPath, volumeLabel,
+                                            requestedType, requestedSectors,
+                                            preferredBytesPerSector);
+                    }
+                    else {
+                        Console.WriteLine(
+                            "Failed: Maximum number of sectors is {0}.",
+                            preferredSectors
+                            );
+                    }
+                }
+                return -1;
+            }
+            finally {
+                delete controller;
+            }
+
+        }
+
+        private static bool GetFormatType(string! s, out FatFormatType t)
+        {
+            t = FatFormatType.Automatic;
+
+            string! label = s.ToLower();
+            if (label.StartsWith("auto")) {
+                return true;
+            }
+            else if (label == "fat12") {
+                t = FatFormatType.Fat12;
+                return true;
+            }
+            else if (label == "fat16") {
+                t = FatFormatType.Fat16;
+                return true;
+            }
+            else if (label == "fat32") {
+                t = FatFormatType.Fat32;
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/base/Services/Fat/Control/MountCommand.sg b/base/Services/Fat/Control/MountCommand.sg
new file mode 100644
index 0000000..776eb25
--- /dev/null
+++ b/base/Services/Fat/Control/MountCommand.sg
@@ -0,0 +1,163 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MountCommand.sg
+//
+//  Note:
+//
+
+using System;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+namespace Microsoft.Singularity.Services.Fat.FatControl
+{
+    [ConsoleCategory(Action = "mount",
+                     DefaultAction = false,
+                     HelpMessage = "Mount a FAT filesystem.")]
+    internal class MountCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [LongParameter(
+            "c", Mandatory = false, Default = 32,
+            HelpMessage = "Cache size in MB")
+         ]
+        long CacheMB;
+
+        [LongParameter(
+            "d", Mandatory = false, Default = 256,
+            HelpMessage = "Maximum number of directories in directory cache.")]
+        long DirectoryCacheSize;
+
+        [LongParameter(
+            "f", Mandatory = false, Default = 64,
+            HelpMessage = "Maximum number of files in file cache.")]
+        long FileCacheSize;
+
+        [BoolParameter("r", Mandatory = false, Default = false,
+                       HelpMessage = "Mount read only.")]
+        bool ReadOnly;
+
+        [LongParameter(
+            "w", Mandatory = false, Default = 64,
+            HelpMessage = "Maximum write request queue length (0 == no queuing).")]
+        long WriteQueueSize;
+
+        [StringParameter("diskpath", Position = 0, Mandatory = true,
+                         Default = null, HelpMessage = "Path to disk.")]
+        string DiskPath;
+
+        [StringParameter("mountpath", Position = 1, Mandatory = true,
+                         Default = null,
+                         HelpMessage = "Location to mount filesystem.")]
+        string MountPath;
+
+        reflective internal MountCommand();
+
+        internal int AppMain()
+        {
+            int status = -1;
+            FatControlContract.Imp imp = Utilities.ConnectToManager();
+
+            if (imp != null) {
+                try {
+                    status = Mount(imp);
+                }
+                finally {
+                    delete imp;
+                }
+            }
+
+            return status;
+        }
+
+        private static bool GetUIntParameter(string   name,
+                                             long     rawValue,
+                                             uint     maxValue,
+                                             out uint value)
+        {
+            value = unchecked((uint)rawValue);
+            if (rawValue < 0 || rawValue > UInt32.MaxValue ||
+                value > maxValue) {
+                Console.WriteLine(
+                    "The {0} value is outsize valid range (0--{1}).",
+                    name, maxValue);
+                return false;
+            }
+            return true;
+        }
+
+        private int Mount(FatControlContract.Imp! imp)
+        {
+            int status = -1;
+
+            uint cacheMB;
+            uint directoryCacheSize;
+            uint fileCacheSize;
+            uint writeQueueSize;
+            if (!GetUIntParameter("cache size",
+                                 this.CacheMB,
+                                 FatMountSettings.MaxCacheMB,
+                                 out cacheMB) ||
+                !GetUIntParameter("directory cache size",
+                                 this.DirectoryCacheSize,
+                                 FatMountSettings.MaxDirectoryCacheSize,
+                                 out directoryCacheSize) ||
+                !GetUIntParameter("file cache size",
+                                 this.FileCacheSize,
+                                 FatMountSettings.MaxFileCacheSize,
+                                 out fileCacheSize) ||
+                !GetUIntParameter("write queue size",
+                                 this.WriteQueueSize,
+                                 FatMountSettings.MaxWriteQueueSize,
+                                  out writeQueueSize)) {
+                return -1;
+            }
+
+            FatMountSettings* in ExHeap fms =
+                new [ExHeap] FatMountSettings(
+                    this.DiskPath,
+                    this.MountPath,
+                    this.ReadOnly,
+                    cacheMB,
+                    directoryCacheSize,
+                    fileCacheSize,
+                    writeQueueSize
+                    );
+
+            imp.SendMount(fms);
+            switch receive
+            {
+                case imp.Success():
+                    status = 0;
+                    break;
+
+                case imp.Fail(error):
+                    Utilities.DisplayError(error);
+                    break;
+
+                case imp.ChannelClosed():
+                    Utilities.DisplayChannelClosedError();
+                    break;
+            }
+            return status;
+        }
+    }
+}
diff --git a/base/Services/Fat/Control/UnmountCommand.sg b/base/Services/Fat/Control/UnmountCommand.sg
new file mode 100644
index 0000000..38c0b20
--- /dev/null
+++ b/base/Services/Fat/Control/UnmountCommand.sg
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UnmountCommand.sg
+//
+//  Note:
+//
+
+using System;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+namespace Microsoft.Singularity.Services.Fat.FatControl
+{
+    [ConsoleCategory(Action = "unmount",
+                     DefaultAction = false,
+                     HelpMessage = "Unmount a FAT filesystem.")]
+    internal class UnmountCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        [BoolParameter("f", Default = false, Mandatory = false,
+                       HelpMessage = "Force unmount if filesystem is in use.")]
+        bool Force;
+
+        [StringParameter("mountpath", Position = 0, Mandatory = true,
+                         HelpMessage = "Filesystem to unmount.")]
+        string MountPath;
+
+        reflective internal UnmountCommand();
+
+        internal int AppMain()
+        {
+            int status = -1;
+
+            FatControlContract.Imp imp = Utilities.ConnectToManager();
+            if (imp != null) {
+                try {
+                    status = Unmount(imp);
+                }
+                finally {
+                    delete imp;
+                }
+            }
+            return status;
+        }
+
+        private int Unmount(FatControlContract.Imp! imp)
+        {
+            int status = -1;
+
+            imp.SendUnmount(Bitter.FromString2(this.MountPath), this.Force);
+            switch receive
+            {
+                case imp.Success():
+                    status = 0;
+                    break;
+
+                case imp.Fail(error):
+                    Utilities.DisplayError(error);
+                    break;
+
+                case imp.ChannelClosed():
+                    Utilities.DisplayChannelClosedError();
+                    break;
+            }
+            return status;
+        }
+    }
+}
diff --git a/base/Services/Fat/Control/Utilities.sg b/base/Services/Fat/Control/Utilities.sg
new file mode 100644
index 0000000..dc3b0b7
--- /dev/null
+++ b/base/Services/Fat/Control/Utilities.sg
@@ -0,0 +1,181 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fat\Control\Utilities.sg
+//
+//  Note:
+//
+
+using System;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+namespace Microsoft.Singularity.Services.Fat.FatControl
+{
+    internal class Utilities
+    {
+        internal static FatControlContract.Imp ConnectToManager()
+        {
+            DirectoryServiceContract.Imp! dsExp =
+                DirectoryService.NewClientEndpoint();
+
+            FatControlContract.Imp! fccImp;
+            FatControlContract.Exp! fccExp;
+            FatControlContract.NewChannel(out fccImp, out fccExp);
+            try {
+                dsExp.SendBind(
+                    Bitter.FromString2(
+                        FatControlContract.ManagerControlPath
+                        ),
+                    fccExp);
+
+                switch receive {
+                    case dsExp.AckBind():
+                        return ReceiveSuccess(fccImp);
+
+                    case dsExp.NakBind(exp, ErrorCode):
+                        Console.WriteLine(
+                            "Connection to {0} was rejected.",
+                            FatControlContract.ManagerControlPath
+                            );
+                        delete exp;
+                        break;
+
+                    case dsExp.ChannelClosed():
+                        Console.WriteLine(
+                            "Lost directory service connection."
+                            );
+                        break;
+                }
+                delete fccImp;
+                return null;
+            }
+            finally {
+                delete dsExp;
+            }
+        }
+
+        private static FatControlContract.Imp
+        ReceiveSuccess([Claims] FatControlContract.Imp! imp)
+        {
+            switch receive {
+                case imp.RecvSuccess():
+                    return imp;
+                case imp.ChannelClosed():
+                    Console.WriteLine(
+                        "Connection to {0} was lost.",
+                        FatControlContract.ManagerControlPath
+                        );
+                    break;
+            }
+
+            delete imp;
+            return null;
+        }
+
+        internal struct Quantity
+        {
+            internal ulong  Unit;
+            internal string Suffix;
+
+            internal Quantity(ulong u, string s)
+            {
+                Unit   = u;
+                Suffix = s;
+            }
+
+            internal static readonly Quantity []! Known = new Quantity [] {
+                new Quantity(1152921504606846976, "EiB"),
+                new Quantity(112589990684262, "PiB"),
+                new Quantity(1099511627776, "TiB"),
+                new Quantity(1073741824, "GiB"),
+                new Quantity(1048576, "MiB"),
+                new Quantity(1024, "KiB"),
+            };
+        }
+
+        internal static string GetPrettySizeString(ulong diskSize)
+        {
+            string suffix = "B";
+            ulong  divisor = 1;
+
+            Quantity [] quantities = Quantity.Known;
+
+            for (int i = 0; i < quantities.Length; i++) {
+                if (diskSize >= 1 * quantities[i].Unit) {
+                    divisor = quantities[i].Unit;
+                    suffix  = quantities[i].Suffix;
+                    break;
+                }
+            }
+            return String.Format("{0:F0} {1}",
+                                 (float)diskSize / (float)divisor, suffix);
+        }
+
+        internal static void DisplayError(FatContractErrorCode e)
+        {
+            string message = "unknown";
+            switch (e) {
+                case FatContractErrorCode.NoError:
+                    message = "no error";
+                    break;
+                case FatContractErrorCode.DiskUnavailable:
+                    message = "disk unavailable";
+                    break;
+                case FatContractErrorCode.PathUnavailable:
+                    message = "path unavailable";
+                    break;
+                case FatContractErrorCode.Busy:
+                    message = "filesystem busy";
+                    break;
+                case FatContractErrorCode.NotMounted:
+                    message = "path not mounted";
+                    break;
+                case FatContractErrorCode.InternalError:
+                    message = "internal error";
+                    break;
+                case FatContractErrorCode.NotFatPartition:
+                    message = "not a FAT partition";
+                    break;
+                case FatContractErrorCode.ReadFailed:
+                    message = "read error";
+                    break;
+                case FatContractErrorCode.BadBPB:
+                    message = "bad boot parameter block";
+                    break;
+                case FatContractErrorCode.ReadOnlyDisk:
+                    message = "read only disk";
+                    break;
+                case FatContractErrorCode.InvalidStartSector:
+                    message = "invalid start sector";
+                    break;
+                case FatContractErrorCode.InvalidFormatSettings:
+                    message = "invalid format settings";
+                    break;
+                case FatContractErrorCode.InvalidVolumeLabel:
+                    message = "invalid volume label";
+                    break;
+            }
+            Console.WriteLine("Failed: {0}.", message);
+        }
+
+        internal static void DisplayChannelClosedError()
+        {
+            Console.WriteLine(
+                "Failed: Channel to FAT client manager closed unexpectedly."
+                );
+        }
+    }
+}
diff --git a/base/Services/Fat/Fat.proj b/base/Services/Fat/Fat.proj
new file mode 100644
index 0000000..c48b983
--- /dev/null
+++ b/base/Services/Fat/Fat.proj
@@ -0,0 +1,14 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="ClientManager\FatClientManager.csproj"/>
+    <ProjectReference Include="Contracts\FatContracts.csproj"/>
+    <ProjectReference Include="Control\FatControl.csproj"/>
+    <ProjectReference Include="Fs\FatFs.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Services/Fat/Fs/AsyncCommands.sg b/base/Services/Fat/Fs/AsyncCommands.sg
new file mode 100644
index 0000000..96c7ea1
--- /dev/null
+++ b/base/Services/Fat/Fs/AsyncCommands.sg
@@ -0,0 +1,959 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   AsyncCommands.sg
+//
+//  Note:
+//
+
+// #define VERBOSE
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using System;
+using System.Diagnostics;
+
+using MSD = Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal abstract class AsyncCommand : ITracked
+    {
+        internal abstract void Execute();
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Dispose()
+        {
+            DebugStub.Print("Class is missing implementation of ITracked.Dispose()\n");
+            DebugStub.Break();
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    //
+    // DIRECTORY CONTRACT COMMANDS
+    //
+    // ------------------------------------------------------------------------
+
+    internal class BindCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                          cio;         // Endpoint listener
+        Directory                          parent;
+        DirectoryServiceContract.Exp:Ready parentExp;
+        char [] in ExHeap                  path;        // Relative path
+        ServiceContract.Exp:Start          pathExp;     // Endpoint for path
+
+        internal
+        BindCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! parentExp,
+            Directory!                                   parent,
+            [Claims] char[]! in ExHeap                   path,
+            [Claims] ServiceContract.Exp:Start!          pathExp
+            )
+        {
+            this.cio       = cio;
+            this.parent    = parent;
+            this.parentExp = parentExp;
+            this.path      = path;
+            this.pathExp   = pathExp;
+        }
+
+        private void BindDirectory(
+            [Claims]DirectoryServiceContract.Exp:Ready! dsc
+            )
+        {
+            expose (this) {
+                assert this.path != null;
+                assert this.parentExp != null;
+
+                CommandLogger.Log("BindDirectory(\"{0}\") ",
+                                  Bitter.ToString(this.path));
+
+                Directory child;
+                MSD.ErrorCode error =
+                    PathOpen.GetDirectory(this.parent, this.path, out child);
+                if (error == MSD.ErrorCode.NoError) {
+                    CommandLogger.Log(" -> OK\n");
+                    dsc.SendSuccess();
+                    this.cio.EnqueueTuple(dsc, (!)child, false);
+                    this.parentExp.SendAckBind();
+                }
+                else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    this.parentExp.SendNakBind(dsc, error);
+                }
+                this.cio.EnqueueTuple(this.parentExp, this.parent, true);
+
+                this.path      = null;
+                this.parentExp = null;
+                this.cio       = null;
+            }
+        }
+
+        private void BindFile([Claims]FileContract.Exp:Ready! fc)
+        {
+            expose (this) {
+                assert this.path      != null;
+                assert this.parentExp != null;
+
+                CommandLogger.Log("BindFile(\"{0}\") ",
+                                  Bitter.ToString(this.path));
+
+                File child;
+                MSD.ErrorCode error =
+                    PathOpen.GetFile(this.parent, this.path, out child);
+                if (error == MSD.ErrorCode.NoError) {
+                    CommandLogger.Log(" -> OK\n");
+                    fc.SendSuccess();
+                    this.cio.EnqueueTuple(fc, (!)child, false);
+                    this.parentExp.SendAckBind();
+                }
+                else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    this.parentExp.SendNakBind(fc, error);
+                }
+                this.cio.EnqueueTuple(this.parentExp, this.parent, true);
+
+                this.path      = null;
+                this.parentExp = null;
+                this.cio       = null;
+            }
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.path      != null;
+                assert this.pathExp   != null;
+                assert this.parent    != null;
+                assert this.parentExp != null;
+                assert this.cio       != null;
+
+                DirectoryServiceContract.Exp dsc =
+                    this.pathExp as DirectoryServiceContract.Exp;
+                if (dsc != null) {
+                    this.pathExp = null;
+                    BindDirectory(dsc);
+                    return;
+                }
+
+                FileContract.Exp fc = this.pathExp as FileContract.Exp;
+                if (fc != null) {
+                    this.pathExp = null;
+                    BindFile(fc);
+                    return;
+                }
+
+                assert this.parentExp != null;
+
+                CommandLogger.Log(
+                    "Bad Bind attempt (not file/directory) \"{0}\"\n",
+                    Bitter.ToString(this.path)
+                    );
+
+                this.parentExp.SendNakBind(this.pathExp,
+                                           ErrorCode.NotProvider);
+                this.pathExp = null;
+
+                this.cio.EnqueueTuple(this.parentExp, this.parent, true);
+                this.parentExp = null;
+
+                delete this.path;
+                this.path      = null;
+
+                this.cio       = null;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            CommandLogger.Log("Dispose BindCommand\n");
+            delete this.parentExp;
+            delete this.path;
+            delete this.pathExp;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class EnumerateCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        Directory                    dir;
+        DirectoryServiceContract.Exp exp;
+
+        internal
+        EnumerateCommand(
+            ChannelIo!                                       cio,
+            [Claims] DirectoryServiceContract.Exp:Enumerate! exp,
+            Directory!                                       dir
+            )
+        {
+            this.cio = cio;
+            this.dir = dir;
+            this.exp = exp;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                try {
+                    assert this.cio != null;
+                    assert this.exp != null;
+                    assert this.dir != null;
+
+                    uint cursor = 0;
+                    ErrorCode error = ErrorCode.NoError;
+                    while (true) {
+                        EnumerationRecords [] in ExHeap records =
+                            this.dir.Enumerate2(cursor, out cursor);
+
+                        if (records == null) {
+                            error = ErrorCode.InsufficientResources;
+                            break;
+                        }
+                        exp.SendEnumerationEntries(
+                            records,
+                            records.Length == Directory.EnumerationChunkSize
+                            );
+                        switch receive {
+                            case exp.EndEnumeration():
+                                cio.EnqueueTuple(this.exp, this.dir, true);
+                                this.exp = null;
+                                return;
+
+                            case exp.ReadEnumeration():
+                                break;
+                        }
+                    }
+                    exp.SendEnumerationTerminated(error);
+
+                    cio.EnqueueTuple(this.exp, this.dir, true);
+                }
+                catch (ChannelClosedException) {
+                    delete this.exp;
+                }
+                this.exp = null;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            CommandLogger.Log("Dispose EnumerateCommand\n");
+            delete this.exp;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class GetAttributesCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        DirectoryServiceContract.Exp exp;
+        Directory                    dir;
+        char[] in ExHeap             path;
+
+        internal
+        GetAttributesCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! exp,
+            Directory!                                   dir,
+            [Claims] char[]! in ExHeap                   path
+            )
+        {
+            this.cio  = cio;
+            this.dir  = dir;
+            this.exp  = exp;
+            this.path = path;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio  != null;
+                assert this.dir  != null;
+                assert this.exp  != null;
+                assert this.path != null;
+
+                CommandLogger.Log("GetAttributes(\"{0}\")",
+                                  Bitter.ToString2(this.path));
+
+                FsObject fsObject = null;
+                ErrorCode error = PathOpen.GetFsObject(this.dir,
+                                                       this.path,
+                                                       out fsObject);
+                this.path = null;
+                if (error == ErrorCode.NoError) {
+                    assert fsObject != null;
+                    NodeType nodeType;
+                    uint     sizeBytes;
+
+                    fsObject.GetAttributes(out nodeType, out sizeBytes);
+
+                    CommandLogger.Log(" -> Type {0} Size {1}\n",
+                                      nodeType, sizeBytes);
+
+                    this.exp.SendAckGetAttributes(nodeType, (long)sizeBytes);
+                    fsObject.CloseInstance();
+                }
+                else {
+                    CommandLogger.Log(" -> Failed\n");
+
+                    assert fsObject == null;
+                    this.exp.SendNakGetAttributes(error);
+                }
+                this.cio.EnqueueTuple(this.exp, this.dir, true);
+                this.exp = null;
+            }
+            return;
+        }
+
+        void ITracked.Dispose()
+        {
+            CommandLogger.Log("Dispose GetAttributesCommand\n");
+            delete exp;
+            delete path;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class CreateDirectoryCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        DirectoryServiceContract.Exp exp;
+        Directory                    dir;
+        char[] in ExHeap             path;
+
+        internal
+        CreateDirectoryCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! exp,
+            Directory!                                   dir,
+            [Claims] char[]! in ExHeap                   path)
+        {
+            this.cio  = cio;
+            this.dir  = dir;
+            this.exp  = exp;
+            this.path = path;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio  != null;
+                assert this.dir  != null;
+                assert this.exp  != null;
+                assert this.path != null;
+
+                CommandLogger.Log("CreateDirectory(\"{0}\", \"{1}\")",
+                                  this.dir.FullPathName,
+                                  Bitter.ToString(this.path));
+
+                Directory        parent    = null;
+                char[] in ExHeap childName = null;
+
+                ErrorCode error =
+                    PathOpen.GetTargetAndDirectory(this.dir,
+                                                   this.path,
+                                                   out childName,
+                                                   out parent);
+                if (error == ErrorCode.NoError) {
+                    assert parent    != null;
+                    assert childName != null;
+
+                    error = parent.CreateDirectory(childName);
+                    parent.Close();
+
+                    delete childName;
+                    childName = null;
+                    if (error == ErrorCode.NoError) {
+                        CommandLogger.Log(" -> OK\n");
+                        this.exp.SendAckCreateDirectory();
+                    }
+                    else {
+                        CommandLogger.Log(" -> Failed ({0})\n", error);
+                        this.exp.SendNakCreateDirectory(error);
+                    }
+                } else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    assert parent    == null;
+                    assert childName == null;
+                    this.exp.SendNakCreateDirectory(error);
+                }
+
+                this.cio.EnqueueTuple(this.exp, this.dir, true);
+                this.exp  = null;
+                this.path = null;
+
+                return;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            delete exp;
+            delete path;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class DeleteDirectoryCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        DirectoryServiceContract.Exp exp;
+        Directory                    dir;
+        char[] in ExHeap             path;
+
+        internal
+        DeleteDirectoryCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! exp,
+            Directory!                                   dir,
+            [Claims] char[]! in ExHeap                   path
+            )
+        {
+            this.cio  = cio;
+            this.dir  = dir;
+            this.exp  = exp;
+            this.path = path;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio  != null;
+                assert this.dir  != null;
+                assert this.exp  != null;
+                assert this.path != null;
+
+                CommandLogger.Log("DeleteDirectory(\"{0}\", \"{1}\")",
+                                  this.dir.FullPathName,
+                                  Bitter.ToString(this.path));
+
+                Directory        parent    = null;
+                char[] in ExHeap childName = null;
+
+                ErrorCode error =
+                    PathOpen.GetTargetAndDirectory(this.dir,
+                                                   this.path,
+                                                   out childName,
+                                                   out parent);
+                if (error == ErrorCode.NoError) {
+                    assert parent    != null;
+                    assert childName != null;
+
+                    error = parent.DeleteDirectory(childName);
+                    parent.Close();
+                    delete childName;
+                    childName = null;
+                    if (error == ErrorCode.NoError) {
+                        CommandLogger.Log(" -> OK\n");
+                        this.exp.SendAckDeleteDirectory();
+                    }
+                    else {
+                        CommandLogger.Log(" -> Failed ({0})\n", error);
+                        this.exp.SendNakDeleteDirectory(error);
+                    }
+                } else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    if (childName != null) {
+                        delete childName;
+                    }
+                    this.exp.SendNakDeleteDirectory(error);
+                }
+
+                this.cio.EnqueueTuple(this.exp, this.dir, true);
+                this.exp  = null;
+                this.path = null;
+
+                return;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            delete exp;
+            delete path;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class CreateFileCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        DirectoryServiceContract.Exp exp;
+        Directory                    dir;
+        char[] in ExHeap             path;
+
+        internal
+        CreateFileCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! exp,
+            Directory!                                   dir,
+            [Claims] char[]! in ExHeap                   path
+            )
+        {
+            this.cio  = cio;
+            this.dir  = dir;
+            this.exp  = exp;
+            this.path = path;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio  != null;
+                assert this.dir  != null;
+                assert this.exp  != null;
+                assert this.path != null;
+
+                CommandLogger.Log("CreateFile(\"{0}\", \"{1}\")",
+                                  this.dir.FullPathName,
+                                  Bitter.ToString(this.path));
+
+                Directory        parent    = null;
+                char[] in ExHeap childName = null;
+
+                ErrorCode error =
+                    PathOpen.GetTargetAndDirectory(this.dir,
+                                                   this.path,
+                                                   out childName,
+                                                   out parent);
+                if (error == ErrorCode.NoError) {
+                    assert parent    != null;
+                    assert childName != null;
+
+                    error = parent.CreateFile(childName);
+                    parent.Close();
+                    delete childName;
+                    childName = null;
+                    if (error == ErrorCode.NoError) {
+                        CommandLogger.Log(" -> OK\n");
+                        this.exp.SendAckCreateFile();
+                    }
+                    else {
+                        CommandLogger.Log(" -> Failed ({0})\n", error);
+                        this.exp.SendNakCreateFile(error);
+                    }
+                } else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    assert parent    == null;
+                    assert childName == null;
+                    this.exp.SendNakCreateFile(error);
+                }
+
+                this.cio.EnqueueTuple(this.exp, this.dir, true);
+                this.exp  = null;
+                this.path = null;
+
+                return;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            delete exp;
+            delete path;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class CreateAndBindFileCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        DirectoryServiceContract.Exp exp;
+        Directory                    dir;
+        char[] in ExHeap             path;
+        FileContract.Exp:Start       fileExp;
+
+        internal
+        CreateAndBindFileCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! exp,
+            Directory!                                   dir,
+            [Claims] char[]! in ExHeap                   path,
+            [Claims] FileContract.Exp:Start!             fileExp
+            )
+        {
+            this.cio     = cio;
+            this.dir     = dir;
+            this.exp     = exp;
+            this.path    = path;
+            this.fileExp = fileExp;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio     != null;
+                assert this.dir     != null;
+                assert this.exp     != null;
+                assert this.path    != null;
+                assert this.fileExp != null;
+
+                CommandLogger.Log("CreateAndBindFile(\"{0}\", \"{1}\")",
+                                  this.dir.FullPathName,
+                                  Bitter.ToString(this.path));
+
+                Directory        parent    = null;
+                char[] in ExHeap childName = null;
+
+                ErrorCode error =
+                    PathOpen.GetTargetAndDirectory(this.dir, this.path,
+                                                   out childName, out parent);
+                if (error == ErrorCode.NoError) {
+                    assert parent    != null;
+                    assert childName != null;
+
+                    File newFile;
+                    error = parent.CreateAndOpenFile(childName, out newFile);
+                    parent.Close();
+                    delete childName;
+                    childName = null;
+                    if (error == ErrorCode.NoError) {
+                        CommandLogger.Log(" -> OK\n");
+                        assert newFile != null;
+                        this.fileExp.SendSuccess();
+                        this.cio.EnqueueTuple(this.fileExp, newFile, false);
+                        this.exp.SendAckCreateAndBindFile();
+                    }
+                    else {
+                        CommandLogger.Log(" -> Failed ({0})\n", error);
+                        assert newFile == null;
+                        this.exp.SendNakCreateAndBindFile(this.fileExp,
+                                                          error);
+                    }
+                } else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    assert parent    == null;
+                    assert childName == null;
+                    this.exp.SendNakCreateAndBindFile(this.fileExp, error);
+                }
+
+                this.cio.EnqueueTuple(this.exp, this.dir, true);
+                this.exp  = null;
+                this.path = null;
+                this.fileExp = null;
+
+                return;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            delete exp;
+            delete path;
+            delete fileExp;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class DeleteFileCommand : AsyncCommand, ITracked
+    {
+        ChannelIo                    cio;
+        DirectoryServiceContract.Exp exp;
+        Directory                    dir;
+        char[] in ExHeap             path;
+
+        internal
+        DeleteFileCommand(
+            ChannelIo!                                   cio,
+            [Claims] DirectoryServiceContract.Exp:Ready! exp,
+            Directory!                                   dir,
+            [Claims] char[]! in ExHeap                   path
+            )
+        {
+            this.cio  = cio;
+            this.dir  = dir;
+            this.exp  = exp;
+            this.path = path;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio  != null;
+                assert this.dir  != null;
+                assert this.exp  != null;
+                assert this.path != null;
+
+                CommandLogger.Log("DeleteFile(\"{0}\", \"{1}\")",
+                                  this.dir.FullPathName,
+                                  Bitter.ToString(this.path));
+
+                Directory        parent    = null;
+                char[] in ExHeap childName = null;
+
+                ErrorCode error =
+                    PathOpen.GetTargetAndDirectory(this.dir, this.path,
+                                                   out childName, out parent);
+                if (error == ErrorCode.NoError) {
+                    assert parent    != null;
+                    assert childName != null;
+
+                    error = parent.DeleteFile(childName);
+                    parent.Close();
+                    delete childName;
+                    childName = null;
+                    if (error == ErrorCode.NoError) {
+                        CommandLogger.Log(" -> OK\n");
+                        this.exp.SendAckDeleteFile();
+                    }
+                    else {
+                        CommandLogger.Log(" -> Failed ({0})\n", error);
+                        this.exp.SendNakDeleteFile(error);
+                    }
+                } else {
+                    CommandLogger.Log(" -> Failed ({0})\n", error);
+                    if (childName != null) {
+                        delete childName;
+                    }
+                    this.exp.SendNakDeleteFile(error);
+                }
+
+                this.cio.EnqueueTuple(this.exp, this.dir, true);
+                this.exp  = null;
+                this.path = null;
+
+                return;
+            }
+        }
+
+        void ITracked.Dispose()
+        {
+            delete exp;
+            delete path;
+        }
+
+        void ITracked.Acquire()  {}
+        void ITracked.Release()  {}
+        void ITracked.Expose()   {}
+        void ITracked.UnExpose() {}
+    }
+
+    // ------------------------------------------------------------------------
+    //
+    // FILE CONTRACT COMMANDS
+    //
+    // ------------------------------------------------------------------------
+
+    internal class FileReadCommand : AsyncCommand, ITracked
+    {
+        ChannelIo        cio;
+        FileContract.Exp fc;
+        File             file;
+        byte[] in ExHeap buffer;
+        long             bufferOffset;
+        long             fileOffset;
+        long             maxLength;
+
+        internal FileReadCommand(ChannelIo!                 cio,
+                                 [Claims] FileContract.Exp! fc,
+                                 File!                      file,
+                                 [Claims] byte[]! in ExHeap buffer,
+                                 long                       bufferOffset,
+                                 long                       fileOffset,
+                                 long                       maxLength)
+        {
+            this.cio          = cio;
+            this.fc           = fc;
+            this.file         = file;
+            this.buffer       = buffer;
+            this.bufferOffset = bufferOffset;
+            this.fileOffset   = fileOffset;
+            this.maxLength    = maxLength;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio    != null;
+                assert this.fc     != null;
+                assert this.file   != null;
+                assert this.buffer != null;
+
+                if (bufferOffset < 0 || bufferOffset > Int32.MaxValue ||
+                    fileOffset < 0 || fileOffset > UInt32.MaxValue ||
+                    maxLength < 0 || maxLength > Int32.MaxValue) {
+                    // No enumeration for file error codes (grrr!)
+                    this.fc.SendAckRead(this.buffer, 0, -1);
+                }
+                else {
+                    int bytesRead;
+                    FileError error = this.file.Read(this.buffer,
+                                                     (int)this.bufferOffset,
+                                                     (uint)this.fileOffset,
+                                                     (int)this.maxLength,
+                                                     out bytesRead);
+
+                    if (error != FileError.NoError) {
+                        CommandLogger.Log("Read error {0}\n", error);
+                        Tracing.Log(Tracing.Error,
+                                    "FatFs read error {0}",
+                                    (UIntPtr)error);
+                    }
+
+                    this.fc.SendAckRead(this.buffer, bytesRead,
+                                        (FileError.NoError == error) ? 0 : -1);
+
+                }
+
+                this.cio.EnqueueTuple(this.fc, this.file, true);
+
+                this.fc     = null;
+                this.file   = null;
+                this.buffer = null;
+            }
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Dispose()
+        {
+            delete this.fc;
+            delete this.buffer;
+        }
+    }
+
+    // ------------------------------------------------------------------------
+
+    internal class FileWriteCommand : AsyncCommand, ITracked
+    {
+        ChannelIo        cio;
+        FileContract.Exp fc;
+        File             file;
+        byte[] in ExHeap buffer;
+        long             bufferOffset;
+        long             fileOffset;
+        long             maxLength;
+
+        internal FileWriteCommand(ChannelIo!                 cio,
+                                  [Claims] FileContract.Exp! fc,
+                                  File!                      file,
+                                  [Claims] byte[]! in ExHeap buffer,
+                                  long                       bufferOffset,
+                                  long                       fileOffset,
+                                  long                       maxLength)
+        {
+            this.cio          = cio;
+            this.fc           = fc;
+            this.file         = file;
+            this.buffer       = buffer;
+            this.bufferOffset = bufferOffset;
+            this.fileOffset   = fileOffset;
+            this.maxLength    = maxLength;
+        }
+
+        internal override void Execute()
+        {
+            expose (this) {
+                assert this.cio    != null;
+                assert this.fc     != null;
+                assert this.file   != null;
+                assert this.buffer != null;
+
+                if (bufferOffset < 0 || bufferOffset > Int32.MaxValue ||
+                    fileOffset < 0 || fileOffset > UInt32.MaxValue ||
+                    maxLength < 0 || maxLength > Int32.MaxValue) {
+                    // No enumeration for file error codes (grrr!)
+                    this.fc.SendAckWrite(this.buffer, 0, -1);
+                }
+                else {
+                    int bytesWritten;
+                    FileError error = this.file.Write(this.buffer,
+                                                      (int)this.bufferOffset,
+                                                      (uint)this.fileOffset,
+                                                      (int)this.maxLength,
+                                                      out bytesWritten);
+                    if (error != FileError.NoError) {
+                        CommandLogger.Log("Write error {0}\n", error);
+                        Tracing.Log(Tracing.Error,
+                                    "FatFs write error {0}",
+                                    (UIntPtr)error);
+                    }
+
+                    this.fc.SendAckWrite(
+                        this.buffer, bytesWritten,
+                        (FileError.NoError == error) ? 0 : -1
+                        );
+                }
+
+                cio.EnqueueTuple(this.fc, this.file, true);
+
+                this.fc     = null;
+                this.file   = null;
+                this.buffer = null;
+            }
+            return;
+        }
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+        void ITracked.Dispose()
+        {
+            delete this.fc;
+            delete this.buffer;
+        }
+    }
+
+    internal class CommandLogger
+    {
+        [ System.Diagnostics.Conditional("VERBOSE") ]
+        internal static void Log(string format, params object[] args)
+        {
+            DebugStub.Print(String.Format(format, args));
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/BPB.sg b/base/Services/Fat/Fs/BPB.sg
new file mode 100644
index 0000000..31ae5e3
--- /dev/null
+++ b/base/Services/Fat/Fs/BPB.sg
@@ -0,0 +1,642 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BPB.sg
+//
+//  Note:
+//
+//  Based on:
+//  "Microsoft Extensible Firmware Initiative FAT32 File System Specification",
+//  Version 1.03, December 6, 2000, Microsoft Corporation.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <remarks>
+    /// Boot Sector and Bios Parameter Block structure.
+    /// </remarks>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal pointerfree struct BPB
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+        internal const int Length        = 36;
+        internal const int OemNameLength = 8;
+
+        internal const byte Byte510Value = 0x55;  // These are not strictly
+        internal const byte Byte511Value = 0xaa;  // part of BPB.
+
+        ///////////////////////////////////////////////////////////////////////
+        // Boot Sector fields
+
+        internal byte   JmpBoot0;                       //  0
+        internal byte   JmpBoot1;                       //  1
+        internal byte   JmpBoot2;                       //  2
+
+        private  byte   oemName0;                       //  3
+        private  byte   oemName1;                       //  4
+        private  byte   oemName2;                       //  5
+        private  byte   oemName3;                       //  6
+        private  byte   oemName4;                       //  7
+        private  byte   oemName5;                       //  8
+        private  byte   oemName6;                       //  9
+        private  byte   oemName7;                       // 10
+
+        private  ushort bytesPerSector;                 // 11..12
+        internal byte   SectorsPerCluster;              // 13
+        private  ushort reservedSectorCount;            // 14..15
+        internal byte   NumberOfFats;                   // 16
+        private  ushort rootEntryCount;                 // 17..18
+        private  ushort totalSectors16;                 // 19..20
+        internal byte   Media;                          // 21
+        private  ushort fatSize16;                      // 22..23
+        private  ushort sectorsPerTrack;                // 24..25
+        private  ushort numberOfHeads;                  // 26..27
+        private  uint   hiddenSectors;                  // 28..31
+        private  uint   totalSectors32;                 // 32..35
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal ushort BytesPerSector
+        {
+            get { return ByteOrder.LittleEndianToHost(bytesPerSector); }
+            set { bytesPerSector = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort ReservedSectorCount
+        {
+            get { return ByteOrder.LittleEndianToHost(reservedSectorCount); }
+            set { reservedSectorCount = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort RootEntryCount
+        {
+            get { return ByteOrder.LittleEndianToHost(rootEntryCount); }
+            set { rootEntryCount = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort TotalSectors16
+        {
+            get { return ByteOrder.LittleEndianToHost(totalSectors16); }
+            set { totalSectors16 = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort FatSize16
+        {
+            get { return ByteOrder.LittleEndianToHost(fatSize16); }
+            set { fatSize16 = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort SectorsPerTrack
+        {
+            get { return ByteOrder.LittleEndianToHost(sectorsPerTrack); }
+            set { sectorsPerTrack = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort NumberOfHeads
+        {
+            get { return ByteOrder.LittleEndianToHost(numberOfHeads); }
+            set { numberOfHeads = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint HiddenSectors
+        {
+            get { return ByteOrder.LittleEndianToHost(hiddenSectors); }
+            set { hiddenSectors = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint TotalSectors32
+        {
+            get { return ByteOrder.LittleEndianToHost(totalSectors32); }
+            set { totalSectors32 = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal string! OemName
+        {
+            get {
+                byte [] oemBytes = new byte [OemNameLength] {
+                    oemName0, oemName1, oemName2, oemName3,
+                    oemName4, oemName5, oemName6, oemName7
+                };
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                return (!) ascii.GetString(oemBytes);
+            }
+            set {
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                byte []! bytes = new byte [OemNameLength];
+
+                int done = ascii.GetBytes(value, 0, value.Length, bytes, 0);
+                for (int i = done; i < OemNameLength; i++) {
+                    bytes[i] = ' ';
+                }
+                oemName0 = bytes[0]; oemName1 = bytes[1];
+                oemName2 = bytes[2]; oemName3 = bytes[3];
+                oemName4 = bytes[4]; oemName5 = bytes[5];
+                oemName6 = bytes[6]; oemName7 = bytes[7];
+            }
+        }
+
+        internal static bool ValidateOverlay()
+        {
+            if (sizeof(BPB) != BPB.Length) {
+                DebugStub.Print("Bad BPB Length ({0} != {1})\n",
+                                __arglist(sizeof(BPB), BPB.Length));
+                return false;
+            }
+
+            byte []! bytes = new byte[BPB.Length];
+            ref BPB bpb = ref bytes[0];
+
+            bpb.RootEntryCount = 0xbeef;
+            if (bytes[17] != 0xef || bytes[18] != 0xbe) {
+                DebugStub.Print("Bad BPB test for RootEntryCount (0x{0:x2}{1:x2})\n",
+                                __arglist(bytes[17], bytes[18]));
+                return false;
+            }
+
+            bpb.TotalSectors32 = 0x32333435;
+            if (bytes[32] != 0x35 || bytes[33] != 0x34 ||
+                bytes[34] != 0x33 || bytes[35] != 0x32) {
+                DebugStub.Print("Bad BPB test for TotalSectors32 (0x{0:x2}{1:x2}{2:x2}{3:x2})\n", __arglist(bytes[32], bytes[33], bytes[34], bytes[35]));
+                return false;
+            }
+            return bpb.TotalSectors32 != 0;
+        }
+    }
+
+    /// <remarks>
+    /// FAT12 and FAT16 structure that immediately follows the BPB structure
+    /// in the Boot Sector (offset 36).
+    /// </remarks>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal pointerfree struct BPB1x
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        internal const int  Length                = 26;
+        internal const byte ExpectedBootSignature = 0x29;
+        private  const int  VolumeLabelLength     = 11;
+        private  const int  FileSystemTypeLength  = 8;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Fields
+
+        internal byte DriveNumber;                      //  0
+        internal byte Reserved1;                        //  1
+        internal byte BootSignature;                    //  2
+
+        private uint volumeId;                          //  3..6
+
+        // XXX replace if/when arrays become
+        // valid in overlay.
+        private byte volumeLabel00;                     //  7
+        private byte volumeLabel01;                     //  8
+        private byte volumeLabel02;                     //  9
+        private byte volumeLabel03;                     // 10
+        private byte volumeLabel04;                     // 11
+        private byte volumeLabel05;                     // 12
+        private byte volumeLabel06;                     // 13
+        private byte volumeLabel07;                     // 14
+        private byte volumeLabel08;                     // 15
+        private byte volumeLabel09;                     // 16
+        private byte volumeLabel10;                     // 17
+
+        // XXX replace if/when arrays become
+        // valid in overlay.
+        private byte fileSystemType0;                   // 18
+        private byte fileSystemType1;                   // 19
+        private byte fileSystemType2;                   // 20
+        private byte fileSystemType3;                   // 21
+        private byte fileSystemType4;                   // 22
+        private byte fileSystemType5;                   // 23
+        private byte fileSystemType6;                   // 24
+        private byte fileSystemType7;                   // 25
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal bool ValidSignature
+        {
+            get { return BootSignature == ExpectedBootSignature; }
+        }
+
+        internal uint VolumeId
+        {
+            get { return ByteOrder.LittleEndianToHost(volumeId); }
+            set { volumeId = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal string! VolumeLabel
+        {
+            get {
+                byte [] bytes = new byte [VolumeLabelLength] {
+                    volumeLabel00, volumeLabel01, volumeLabel02,
+                    volumeLabel03, volumeLabel04, volumeLabel05,
+                    volumeLabel06, volumeLabel07, volumeLabel08,
+                    volumeLabel09, volumeLabel10
+                };
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                return (!) ascii.GetString(bytes);
+            }
+            set {
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                byte []! bytes = new byte[VolumeLabelLength];
+                int done = ascii.GetBytes(value, 0, value.Length, bytes, 0);
+                for (int i = done; i < VolumeLabelLength; i++) {
+                    bytes[i] = ' ';
+                }
+                volumeLabel00 = bytes[0]; volumeLabel01 = bytes[1];
+                volumeLabel02 = bytes[2]; volumeLabel03 = bytes[3];
+                volumeLabel04 = bytes[4]; volumeLabel05 = bytes[5];
+                volumeLabel06 = bytes[6]; volumeLabel07 = bytes[7];
+                volumeLabel08 = bytes[8]; volumeLabel09 = bytes[9];
+                volumeLabel10 = bytes[10];
+            }
+        }
+
+        internal string! FileSystemType
+        {
+            get {
+                byte [] oemBytes = new byte [FileSystemTypeLength] {
+                    fileSystemType0, fileSystemType1, fileSystemType2,
+                    fileSystemType3, fileSystemType4, fileSystemType5,
+                    fileSystemType6, fileSystemType7
+                };
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                return (!) ascii.GetString(oemBytes);
+            }
+            set {
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                byte []! bytes = new byte [FileSystemTypeLength];
+
+                int done = ascii.GetBytes(value, 0, value.Length, bytes, 0);
+                for (int i = done; i < FileSystemTypeLength; i++) {
+                    bytes[i] = ' ';
+                }
+                fileSystemType0 = bytes[0]; fileSystemType1 = bytes[1];
+                fileSystemType2 = bytes[2]; fileSystemType3 = bytes[3];
+                fileSystemType4 = bytes[4]; fileSystemType5 = bytes[5];
+                fileSystemType6 = bytes[6]; fileSystemType7 = bytes[7];
+            }
+        }
+    }
+
+    /// <remarks>
+    /// FAT32 structure that immediately follows the BPB structure
+    /// in the Boot Sector (offset 36).
+    /// </remarks>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal pointerfree struct BPB32
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        internal const int  Length                = 54;
+        internal const byte ExpectedBootSignature = 0x29;
+        private  const int  VolumeLabelLength     = 11;
+        private  const int  FileSystemTypeLength  = 8;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Fields
+
+        private  uint   fatSize32;      // 0..3   - FAT size in sectors
+        private  ushort extFlags;       // 4..5   - Mirroring flags
+        private  ushort fsVersion;      // 6..7   - 0:0 or not mountable
+        private  uint   rootCluster;    // 8..11  - First cluster of root dir
+        private  ushort fsInfoSector;   // 12..13 - Primary pointer to FsInfo
+        private  ushort bootRecordCopy; // 14..15
+
+        // XXX replace if/when arrays become
+        // valid in overlay.
+        internal byte   Reserved00;     // 16
+        internal byte   Reserved01;     // 17
+        internal byte   Reserved02;     // 18
+        internal byte   Reserved03;     // 19
+        internal byte   Reserved04;     // 20
+        internal byte   Reserved05;     // 21
+        internal byte   Reserved06;     // 22
+        internal byte   Reserved07;     // 23
+        internal byte   Reserved08;     // 24
+        internal byte   Reserved09;     // 25
+        internal byte   Reserved10;     // 26
+        internal byte   Reserved11;     // 27
+
+        // Fields equivalent to those in BPB1x
+        internal byte   DriveNumber;    // 28
+        internal byte   Reserved1;      // 29
+        internal byte   BootSignature;  // 30
+        private  uint   volumeId;       // 31..34
+
+        // XXX replace if/when arrays become
+        // valid in overlay.
+        private byte volumeLabel00;     // 35
+        private byte volumeLabel01;     // 36
+        private byte volumeLabel02;     // 37
+        private byte volumeLabel03;     // 38
+        private byte volumeLabel04;     // 39
+        private byte volumeLabel05;     // 40
+        private byte volumeLabel06;     // 41
+        private byte volumeLabel07;     // 42
+        private byte volumeLabel08;     // 43
+        private byte volumeLabel09;     // 44
+        private byte volumeLabel10;     // 45
+
+        // XXX replace if/when arrays become
+        // valid in overlay.
+        private byte fileSystemType0;   // 46
+        private byte fileSystemType1;   // 47
+        private byte fileSystemType2;   // 48
+        private byte fileSystemType3;   // 49
+        private byte fileSystemType4;   // 50
+        private byte fileSystemType5;   // 51
+        private byte fileSystemType6;   // 52
+        private byte fileSystemType7;   // 53
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal bool ValidSignature
+        {
+            get {
+                return (BootSignature == ExpectedBootSignature &&
+                        fsVersion == 0);
+            }
+        }
+
+        internal uint FatSize32
+        {
+            get { return ByteOrder.LittleEndianToHost(fatSize32); }
+            set { fatSize32 = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort ExtFlags
+        {
+            get { return ByteOrder.LittleEndianToHost(extFlags); }
+            set { extFlags = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort FsVersion
+        {
+            get { return ByteOrder.LittleEndianToHost(fsVersion); }
+            set { fsVersion = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint RootCluster
+        {
+            get { return ByteOrder.LittleEndianToHost(rootCluster); }
+            set { rootCluster = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort FsInfoSector
+        {
+            get { return ByteOrder.LittleEndianToHost(fsInfoSector); }
+            set { fsInfoSector = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal ushort BootRecordCopy
+        {
+            get { return ByteOrder.LittleEndianToHost(bootRecordCopy); }
+            set { bootRecordCopy = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint VolumeId
+        {
+            get { return ByteOrder.LittleEndianToHost(volumeId); }
+            set { volumeId = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal string! VolumeLabel
+        {
+            get {
+                byte [] bytes = new byte [VolumeLabelLength] {
+                    volumeLabel00, volumeLabel01, volumeLabel02,
+                    volumeLabel03, volumeLabel04, volumeLabel05,
+                    volumeLabel06, volumeLabel07, volumeLabel08,
+                    volumeLabel09, volumeLabel10
+                };
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                return (!) ascii.GetString(bytes);
+            }
+            set {
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                byte []! bytes = new byte[VolumeLabelLength];
+                int done = ascii.GetBytes(value, 0, value.Length, bytes, 0);
+                for (int i = done; i < VolumeLabelLength; i++) {
+                    bytes[i] = ' ';
+                }
+                volumeLabel00 = bytes[0]; volumeLabel01 = bytes[1];
+                volumeLabel02 = bytes[2]; volumeLabel03 = bytes[3];
+                volumeLabel04 = bytes[4]; volumeLabel05 = bytes[5];
+                volumeLabel06 = bytes[6]; volumeLabel07 = bytes[7];
+                volumeLabel08 = bytes[8]; volumeLabel09 = bytes[9];
+                volumeLabel10 = bytes[10];
+            }
+        }
+
+        internal string! FileSystemType
+        {
+            get {
+                byte [] oemBytes = new byte [FileSystemTypeLength] {
+                    fileSystemType0, fileSystemType1, fileSystemType2,
+                    fileSystemType3, fileSystemType4, fileSystemType5,
+                    fileSystemType6, fileSystemType7
+                };
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                return (!) ascii.GetString(oemBytes);
+            }
+            set {
+                ASCIIEncoding ascii = new ASCIIEncoding();
+                byte []! bytes = new byte [FileSystemTypeLength];
+
+                int done = ascii.GetBytes(value, 0, value.Length, bytes, 0);
+                for (int i = done; i < FileSystemTypeLength; i++) {
+                    bytes[i] = ' ';
+                }
+                fileSystemType0 = bytes[0]; fileSystemType1 = bytes[1];
+                fileSystemType2 = bytes[2]; fileSystemType3 = bytes[3];
+                fileSystemType4 = bytes[4]; fileSystemType5 = bytes[5];
+                fileSystemType6 = bytes[6]; fileSystemType7 = bytes[7];
+            }
+        }
+    }
+
+    internal class BpbException : System.Exception
+    {
+        internal BpbException(string message)
+            : base (message)
+        {
+        }
+    }
+
+    enum FatVersion : byte {
+        Fat12,
+        Fat16,
+        Fat32
+    };
+
+    internal class BpbSummary
+    {
+        internal readonly FatVersion Version;           // yes
+        internal readonly uint  BytesPerSector;         // yes
+        internal readonly uint  BytesPerCluster;        // yes
+        internal readonly uint  ClusterCount;           // yes
+        internal readonly uint  FirstFatSector;         // yes
+        internal readonly ulong FirstClusterSector;     // yes
+        internal readonly ulong FsInfoSector;           // yes
+        internal readonly uint  NumberOfFats;           // yes
+        internal readonly uint  ReservedSectors;        // yes
+        internal readonly uint  RootEntryCount;         // yes
+        internal readonly uint  RootDirectorySectors;   // yes
+        internal readonly uint  RootCluster;            // yes
+        internal readonly uint  SectorsPerFat;          // yes
+        internal readonly uint  SectorsPerCluster;      // yes
+        internal readonly uint  TotalSectors;           // yes
+
+        private static bool IsNonZeroPowerOfTwo(uint value)
+        {
+            return (value != 0) && ((value & (value - 1)) == 0);
+        }
+
+        internal BpbSummary(byte[]! in ExHeap sector0)
+        {
+            ref BPB   bpb   = ref sector0[0];
+            ref BPB1x bpb1x = ref sector0[BPB.Length];
+            ref BPB32 bpb32 = ref sector0[BPB.Length];
+
+            BytesPerSector = bpb.BytesPerSector;
+            if (!IsNonZeroPowerOfTwo(BytesPerSector) ||
+                BytesPerSector < 512 || BytesPerSector > 4096) {
+                throw new BpbException("Bad bytes per sector in BPB.");
+            }
+
+            if (sector0[510] != BPB.Byte510Value ||
+                sector0[511] != BPB.Byte511Value) {
+                throw new
+                    BpbException("Bad trailing signature in boot block.");
+            }
+
+            NumberOfFats = bpb.NumberOfFats;
+            if (NumberOfFats == 0) {
+                throw new BpbException("No FATs described in BPB.");
+            }
+
+            SectorsPerCluster = bpb.SectorsPerCluster;
+            if (!IsNonZeroPowerOfTwo(SectorsPerCluster)) {
+                throw new BpbException("Bad sectors per cluster value.");
+            }
+
+            ReservedSectors = bpb.ReservedSectorCount;
+            if (ReservedSectors == 0) {
+                throw new BpbException("Bad reserved sectors count.");
+            }
+
+            BytesPerCluster = BytesPerSector * SectorsPerCluster;
+            if (BytesPerCluster > 32768) {
+                throw new BpbException("Bad bytes per cluster value.");
+            }
+
+            if (bpb.FatSize16 != 0) {
+                // Looks like FAT12/16
+                if (bpb1x.ValidSignature == false) {
+                    throw new BpbException("Bad signature in Fat12/16 BPB.");
+                }
+                SectorsPerFat = bpb.FatSize16;
+
+                if (bpb.TotalSectors16 != 0) {
+                    TotalSectors = bpb.TotalSectors16;
+                }
+                else if (bpb.TotalSectors32 != 0) {
+                    TotalSectors = bpb.TotalSectors32;
+                }
+                else {
+                    throw new BpbException("Bad total sectors value in BPB.");
+                }
+            }
+            else {
+                // Looks like FAT32
+                if (bpb32.ValidSignature == false) {
+                    throw new BpbException("Bad signature in Fat32 BPB.");
+                }
+                if (bpb.TotalSectors16 != 0 ||
+                    bpb.FatSize16 != 0) {
+                    throw new BpbException(
+                        "Legacy fields set in BPB for Fat32."
+                        );
+                }
+                if (bpb32.FatSize32 == 0) {
+                    throw new BpbException("Bad FAT size in Fat32 BPB.");
+                }
+                SectorsPerFat = bpb32.FatSize32;
+                if (bpb.TotalSectors32 == 0) {
+                    throw new BpbException("Bad total sectors value in BPB.");
+                }
+                TotalSectors = bpb.TotalSectors32;
+            }
+
+            RootEntryCount = bpb.RootEntryCount;
+            RootDirectorySectors =
+                (RootEntryCount * 32 + BytesPerSector - 1) / BytesPerSector;
+
+            FirstClusterSector = (ulong)ReservedSectors +
+                NumberOfFats * SectorsPerFat + RootDirectorySectors;
+
+            FirstFatSector = ReservedSectors;
+
+            // Check First cluster sector < total sectors
+            if (FirstClusterSector > TotalSectors) {
+                throw new BpbException(
+                    "First cluster sector exceeds total sectors."
+                    );
+            }
+
+            ClusterCount =
+                (uint) (TotalSectors - FirstClusterSector) / SectorsPerCluster;
+
+            if (ClusterCount < 4085) {
+                Version      = FatVersion.Fat12;
+                FsInfoSector = 0;
+                RootCluster  = 0;
+            }
+            else if (ClusterCount < 65525 || bpb.FatSize16 != 0) {
+                // HACK!HACK!HACK!  The
+                // spec says the limit should be 65525, but the
+                // table on page for formatting disks up to 2GB
+                // gives a value that leads to 65527 (0xfff6)
+                // clusters.
+                if (ClusterCount > 65527) {
+                    throw new BpbException(
+                        "FAT16 partition with bad cluster count."
+                        );
+                }
+                Version      = FatVersion.Fat16;
+                FsInfoSector = 0;
+                RootCluster  = 0;
+            }
+            else if (ClusterCount < 0x0ffffff7) {
+                Version      = FatVersion.Fat32;
+                if (bpb32.FsInfoSector <= ReservedSectors) {
+                    FsInfoSector = bpb32.FsInfoSector;
+                }
+                else {
+                    FsInfoSector = 0;
+                }
+                RootCluster  = bpb32.RootCluster;
+            }
+            else {
+                throw new BpbException("Invalid cluster count.");
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/Bitmap.sg b/base/Services/Fat/Fs/Bitmap.sg
new file mode 100644
index 0000000..e1a158d
--- /dev/null
+++ b/base/Services/Fat/Fs/Bitmap.sg
@@ -0,0 +1,1343 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Bitmap.sg
+//
+//  Note:
+//
+//  The Bitmap class provides a bitmap allocator for fixed size
+//  spaces.  It's used in the FAT filesystem to maintain
+//  information on free FAT clusters and to keep track of
+//  allocated entries in directories which helps in creating and
+//  finding files.
+//
+//  For Compilation with C#/Spec# of test program:
+//      {csc,ssc} /D:DEBUG /DEBUG /D:TEST_BITMAP bitmap.sg
+//
+// TODO:
+//   - Consider optimizing set/clear bit search based on summaries.  It is
+//     presently expensive for sparse cases.
+
+using System;
+using System.Diagnostics;
+
+#if TEST_BITMAP
+using System.Collections;
+#endif
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class Bitmap
+    {
+#region tables
+        // Upper 4-bits number free on left, lower 4bits number
+        // free on right.
+        private static readonly byte [] LRContiguousTable = {
+            /* 0x00 */ 0x88, 0x70, 0x61, 0x60, 0x52, 0x50, 0x51, 0x50,
+            /* 0x08 */ 0x43, 0x40, 0x41, 0x40, 0x42, 0x40, 0x41, 0x40,
+            /* 0x10 */ 0x34, 0x30, 0x31, 0x30, 0x32, 0x30, 0x31, 0x30,
+            /* 0x18 */ 0x33, 0x30, 0x31, 0x30, 0x32, 0x30, 0x31, 0x30,
+            /* 0x20 */ 0x25, 0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20,
+            /* 0x28 */ 0x23, 0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20,
+            /* 0x30 */ 0x24, 0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20,
+            /* 0x38 */ 0x23, 0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20,
+            /* 0x40 */ 0x16, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x48 */ 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x50 */ 0x14, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x58 */ 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x60 */ 0x15, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x68 */ 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x70 */ 0x14, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x78 */ 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10,
+            /* 0x80 */ 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0x88 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0x90 */ 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0x98 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xa0 */ 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xa8 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xb0 */ 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xb8 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xc0 */ 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xc8 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xd0 */ 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xd8 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xe0 */ 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xe8 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xf0 */ 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00,
+            /* 0xf8 */ 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
+        };
+
+        // Upper for bits equals start index (0=msb,7=lsb).
+        // Lower four bits are the number free.
+        private static readonly byte [] MaxFreeTable = {
+            /* 0x00 */ 0x08, 0x07, 0x06, 0x06, 0x05, 0x05, 0x05, 0x05,
+            /* 0x08 */ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+            /* 0x10 */ 0x44, 0x43, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            /* 0x18 */ 0x53, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            /* 0x20 */ 0x35, 0x34, 0x33, 0x33, 0x62, 0x32, 0x32, 0x32,
+            /* 0x28 */ 0x53, 0x52, 0x02, 0x02, 0x62, 0x02, 0x02, 0x02,
+            /* 0x30 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x02, 0x02, 0x02,
+            /* 0x38 */ 0x53, 0x52, 0x02, 0x02, 0x62, 0x02, 0x02, 0x02,
+            /* 0x40 */ 0x26, 0x25, 0x24, 0x24, 0x23, 0x23, 0x23, 0x23,
+            /* 0x48 */ 0x53, 0x52, 0x22, 0x22, 0x62, 0x22, 0x22, 0x22,
+            /* 0x50 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x61, 0x71, 0x41,
+            /* 0x58 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x21,
+            /* 0x60 */ 0x35, 0x34, 0x33, 0x33, 0x62, 0x32, 0x32, 0x32,
+            /* 0x68 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x31,
+            /* 0x70 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x61, 0x71, 0x41,
+            /* 0x78 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x01,
+            /* 0x80 */ 0x17, 0x16, 0x15, 0x15, 0x14, 0x14, 0x14, 0x14,
+            /* 0x88 */ 0x53, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
+            /* 0x90 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x12, 0x12, 0x12,
+            /* 0x98 */ 0x53, 0x52, 0x12, 0x12, 0x62, 0x12, 0x12, 0x12,
+            /* 0xa0 */ 0x35, 0x34, 0x33, 0x33, 0x62, 0x32, 0x32, 0x32,
+            /* 0xa8 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x31,
+            /* 0xb0 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x61, 0x71, 0x41,
+            /* 0xb8 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x11,
+            /* 0xc0 */ 0x26, 0x25, 0x24, 0x24, 0x23, 0x23, 0x23, 0x23,
+            /* 0xc8 */ 0x53, 0x52, 0x22, 0x22, 0x62, 0x22, 0x22, 0x22,
+            /* 0xd0 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x61, 0x71, 0x41,
+            /* 0xd8 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x21,
+            /* 0xe0 */ 0x35, 0x34, 0x33, 0x33, 0x62, 0x32, 0x32, 0x32,
+            /* 0xe8 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x31,
+            /* 0xf0 */ 0x44, 0x43, 0x42, 0x42, 0x62, 0x61, 0x71, 0x41,
+            /* 0xf8 */ 0x53, 0x52, 0x71, 0x51, 0x62, 0x61, 0x71, 0x80
+        };
+
+        // Left Edge Contiguous Table.
+        //
+        // Assumes left most bits are set if present. Table
+        // entries represent the contiguous number free from the
+        // first free left-bit.
+        private static readonly byte [] LeftEdgeContiguousTable = {
+            /* 0x00 */ 0x08, 0x07, 0x06, 0x06, 0x05, 0x05, 0x05, 0x05,
+            /* 0x08 */ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+            /* 0x10 */ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            /* 0x18 */ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            /* 0x20 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0x28 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0x30 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0x38 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0x40 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x48 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x50 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x58 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x60 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x68 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x70 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x78 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0x80 */ 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04,
+            /* 0x88 */ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            /* 0x90 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0x98 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0xa0 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xa8 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xb0 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xb8 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xc0 */ 0x06, 0x05, 0x04, 0x04, 0x03, 0x03, 0x03, 0x03,
+            /* 0xc8 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            /* 0xd0 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xd8 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xe0 */ 0x05, 0x04, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02,
+            /* 0xe8 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            /* 0xf0 */ 0x04, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+            /* 0xf8 */ 0x03, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x00,
+        };
+
+        private static readonly byte [] BitCountTable = {
+            /* 0x00 */ 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x03,
+            /* 0x08 */ 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04,
+            /* 0x10 */ 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04,
+            /* 0x18 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x20 */ 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04,
+            /* 0x28 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x30 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x38 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0x40 */ 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04,
+            /* 0x48 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x50 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x58 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0x60 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x68 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0x70 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0x78 */ 0x04, 0x05, 0x05, 0x06, 0x05, 0x06, 0x06, 0x07,
+            /* 0x80 */ 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04,
+            /* 0x88 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x90 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0x98 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0xa0 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0xa8 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0xb0 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0xb8 */ 0x04, 0x05, 0x05, 0x06, 0x05, 0x06, 0x06, 0x07,
+            /* 0xc0 */ 0x02, 0x03, 0x03, 0x04, 0x03, 0x04, 0x04, 0x05,
+            /* 0xc8 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0xd0 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0xd8 */ 0x04, 0x05, 0x05, 0x06, 0x05, 0x06, 0x06, 0x07,
+            /* 0xe0 */ 0x03, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06,
+            /* 0xe8 */ 0x04, 0x05, 0x05, 0x06, 0x05, 0x06, 0x06, 0x07,
+            /* 0xf0 */ 0x04, 0x05, 0x05, 0x06, 0x05, 0x06, 0x06, 0x07,
+            /* 0xf8 */ 0x05, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x08,
+        };
+#endregion tables
+
+        // Constants for logarithmic summary totals
+        private const int SummaryFanOut     = 256;
+        private const int Log2SummaryFanOut = 9;
+
+        /// <summary> Maximum length of a single allocation. </summary>
+        public const int MaxAllocationLength = 64;
+
+        private const int SmallAllocationLength = 8;
+
+        // Padding at end of array to simplify end cases
+        private const int PadBytes = MaxAllocationLength / 8;
+
+        internal readonly int totalBits;
+        private int           totalFreeBits;
+        private byte[]   map;
+        private int [][] summary;    // logarithmic summary totals
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal Bitmap(int numberOfBits)
+        {
+            totalBits     = numberOfBits;
+            totalFreeBits = 0;
+
+            int mapLength = (numberOfBits + 7) / 8 + PadBytes;
+            this.map = new byte[mapLength];
+
+            int logSummaryLevels = Log2Up(mapLength) / Log2SummaryFanOut;
+            if (logSummaryLevels == 0) {
+                logSummaryLevels = 1;
+            }
+
+            this.summary = new int [logSummaryLevels][];
+            int n = mapLength;
+            for (int i = (logSummaryLevels - 1); i >= 0; i--) {
+                n = (n + SummaryFanOut - 1) / SummaryFanOut;
+                summary[i] = new int [n];
+            }
+            this.Initialize();
+        }
+
+        private void Initialize()
+        {
+            // This is a little gratuitous - we make
+            // two passes over the map when initializing.  This enables
+            // getting the logarithmic summary table information correct in
+            // a trivial manner, but is obviously sub-optimal.
+            totalFreeBits = 0;
+            for (int i = 0; i < map.Length; i++) {
+                this.map[i] = 0xff;
+            }
+
+            for (int i = 0; i < totalBits / 8; i++) {
+                ClearBits(i, 0, 8);
+            }
+
+            // Clean up trailing bits
+            if ((totalBits & 0x07) != 0) {
+                ClearBits((totalBits / 8), 0, totalBits & 0x07);
+            }
+        }
+
+        private static int LeadingFree(byte value)
+        {
+            return ((int)LRContiguousTable[value]) >> 4;
+        }
+
+        private static int TrailingFree(byte value)
+        {
+            return ((int)LRContiguousTable[value]) & 0x0f;
+        }
+
+        private static int MaxFreeStart(byte value)
+        {
+            return ((int)MaxFreeTable[value]) >> 4;
+        }
+
+        private static int MaxFree(byte value)
+        {
+            return ((int)MaxFreeTable[value]) & 0xf;
+        }
+
+        private static int BitCount(byte value)
+        {
+            return (int)BitCountTable[value];
+        }
+
+        private static int MakeMask(int startIndex, int length)
+            /*^ requires startIndex >= 0 && startIndex + length <= 8; ^*/
+            /*^ requires length >= 0 && length <= 8; ^*/
+        {
+            int a = 0xff >> startIndex;
+            int b = 0xff << (8 - length - startIndex);
+            return a & b;
+        }
+
+        private void SetBits(int byteIndex, int bitIndex, int length)
+        {
+            Debug.Assert(length >= 0 && length <= 8);
+            Debug.Assert(bitIndex >= 0 && bitIndex + length <= 8);
+            int tmp  = (int)this.map[byteIndex];
+            int mask = MakeMask(bitIndex, length);
+            tmp ^= mask;
+            Debug.Assert((tmp & mask) == mask);
+            this.map[byteIndex] = (byte) tmp;
+            SummarizeAlloc(byteIndex, length);
+        }
+
+        private void ClearBits(int byteIndex, int bitIndex, int length)
+            /*^ requires length <= SmallAllocationLength; ^*/
+        {
+            Debug.Assert(length >= 0 && length <= 8);
+            Debug.Assert(bitIndex >= 0 && bitIndex + length <= 8);
+            int tmp  = (int)this.map[byteIndex];
+            int mask = MakeMask(bitIndex, length);
+            tmp ^= mask;
+            Debug.Assert((tmp & mask) == 0);
+            this.map[byteIndex] = (byte) tmp;
+            SummarizeFree(byteIndex, length);
+        }
+
+        private void SetRegion(int byteIndex, int bitIndex, int length)
+            /*^ requires byteIndex >= 0; ^*/
+            /*^ requires bitIndex >= 0 && bitIndex <= 7; ^*/
+            /*^ requires length > SmallAllocationLength; ^*/
+        {
+            int lhs = 8 - bitIndex;
+            SetBits(byteIndex, bitIndex, lhs);
+
+            int fill8 = (length - lhs) / 8;
+            for (int i = 1; i <= fill8; i++) {
+                SetBits(byteIndex + i, 0, 8);
+            }
+
+            int rhs = length - (lhs + fill8 * 8);
+            if (rhs != 0) {
+                SetBits(byteIndex + fill8 + 1, 0, rhs);
+            }
+        }
+
+        private void ClearRegion(int byteIndex, int bitIndex, int length)
+            /*^ requires byteIndex >= 0; ^*/
+            /*^ requires bitIndex >= 0 && bitIndex <= 7; ^*/
+            /*^ requires length > SmallAllocationLength; ^*/
+        {
+            int lhs = 8 - bitIndex;
+            ClearBits(byteIndex, bitIndex, lhs);
+
+            int fill8 = (length - lhs) / 8;
+            for (int i = 1; i <= fill8; i++) {
+                ClearBits(byteIndex + i, 0, 8);
+            }
+
+            int rhs = length - (lhs + fill8 * 8);
+            if (rhs != 0) {
+                ClearBits(byteIndex + fill8 + 1, 0, rhs);
+            }
+        }
+
+        private bool IsAllocated(int bitIndex)
+        {
+            int mask  = 0x80 >> (bitIndex & 0x7);
+            int value = (int) this.map[bitIndex / 8];
+            return (value & mask) == mask;
+        }
+
+        private int GetLeadingClearBytes(int startByte, int maxLength)
+            /*^ requires startByte >= 0; ^*/
+            /*^ requires maxLength >= 0; ^*/
+            /*^ requires startByte + maxLength <= this.map.Length; ^*/
+        {
+            for (int i = 0; i < maxLength; i++) {
+                if (this.map[startByte + i] != 0) {
+                    return i;
+                }
+            }
+            return maxLength;
+        }
+
+        private bool HintAllocateSmall(int requestLength,
+                                       int hintStart,
+                                       out int allocStart,
+                                       out int allocLength)
+        {
+            Debug.Assert(this.IsAllocated(hintStart) == false);
+            Debug.Assert(requestLength <= SmallAllocationLength);
+
+            int byteIndex = hintStart / 8;
+            int bitIndex  = hintStart - byteIndex * 8;
+
+            int edgeMask = (0xff00 >> bitIndex) & 0xff;
+            int lhs      = LeftEdgeContiguousTable[ this.map[byteIndex] | edgeMask ];
+
+            if (lhs >= requestLength) {
+                // Allocation confined to single byte in bitmap
+                allocStart  = hintStart;
+                allocLength = requestLength;
+                SetBits(byteIndex, bitIndex, allocLength);
+                return true;
+            }
+
+            int rhs = LeadingFree( this.map[byteIndex + 1] );
+            if (lhs == (8 - bitIndex) && lhs + rhs >= requestLength) {
+                // Allocation spans two bytes in bitmap
+                allocStart  = hintStart;
+                allocLength = requestLength;
+                SetBits(byteIndex, 8 - lhs, lhs);
+                SetBits(byteIndex + 1, 0, requestLength - lhs);
+                return true;
+            }
+
+            return ScanAllocateSmall(byteIndex + 1, requestLength,
+                                     out allocStart, out allocLength);
+        }
+
+        private bool HintAllocateLarge(int requestLength,
+                                       int hintStart,
+                                       out int allocStart,
+                                       out int allocLength)
+        {
+            // Set bit just before hint start if not already set so
+            // ScanAllocateLarge starts from at least hintStart.
+            bool didFiddle = false;
+            int bitIndex = 0;
+            int byteIndex = 0;
+            if (hintStart > 0 && !IsAllocated(hintStart - 1)) {
+                byteIndex = (hintStart - 1) / 8;
+                bitIndex = (hintStart - 1) - byteIndex * 8;
+                SetBits(byteIndex, bitIndex, 1);
+                didFiddle = true;
+            }
+
+            try {
+                return ScanAllocateLarge(hintStart / 8, requestLength,
+                                         out allocStart, out allocLength);
+            }
+            finally {
+                if (didFiddle) {
+                    ClearBits(byteIndex, bitIndex, 1);
+                }
+            }
+        }
+
+        private bool HintAllocate(int requestLength,
+                                  int hintStart,
+                                  out int allocStart,
+                                  out int allocLength)
+        {
+            if (requestLength <= SmallAllocationLength) {
+                return HintAllocateSmall(requestLength, hintStart,
+                                         out allocStart, out allocLength);
+            }
+            else {
+                return HintAllocateLarge(requestLength, hintStart,
+                                         out allocStart, out allocLength);
+            }
+        }
+
+        private bool ScanAllocateSmall(int     startByte,
+                                       int     requestLength,
+                                       out int allocStart,
+                                       out int allocLength)
+            /*^ requires requestLength <= SmallAllocationLength; ^*/
+        {
+            if (startByte >= this.map.Length) {
+                allocStart = 0;
+                allocLength = 0;
+                return false;
+            }
+
+            int endByte = startByte + SummaryFanOut;
+            if (endByte >= map.Length) {
+                endByte = map.Length;
+            }
+
+            for (int i = startByte; i < endByte; i++) {
+                int maxFree = MaxFree(this.map[i]);
+
+                if (maxFree == 0) {
+                    continue;
+                }
+
+                int startFree = MaxFreeStart(this.map[i]);
+                if (maxFree >= requestLength) {
+                    allocStart  = i * 8 + startFree;
+                    allocLength = requestLength;
+                    SetBits(i, MaxFreeStart(this.map[i]), requestLength);
+                    return true;
+                }
+
+                int lhs = TrailingFree(this.map[i]);
+                int rhs = LeadingFree(this.map[i + 1]);
+                if (lhs + rhs >= requestLength) {
+                    Debug.Assert(lhs != requestLength);
+                    allocStart  = i * 8 + 8 - lhs;
+                    allocLength = requestLength;
+                    SetBits(i, 8 - lhs, lhs);
+                    SetBits(i + 1, 0, requestLength - lhs);
+                    return true;
+                }
+            }
+            allocStart  = 0;
+            allocLength = 0;
+
+            return false;
+        }
+
+        private bool ScanAllocateLarge(int startByte,
+                                       int requestLength,
+                                       out int allocStart,
+                                       out int allocLength)
+            /*^ requires requestLength > SmallAllocationLength; ^*/
+            /*^ requires requestLength <= MaxAllocationLength; ^*/
+        {
+            if (startByte >= this.map.Length) {
+                allocStart = 0;
+                allocLength = 0;
+                return false;
+            }
+
+            int maxRangeBytes = (requestLength + 14) / 8;
+            int endByte = startByte + SummaryFanOut;
+            if (endByte > this.map.Length - maxRangeBytes) {
+                endByte = this.map.Length - maxRangeBytes;
+            }
+
+            for (int i = startByte; i < endByte; i++) {
+                int lhs = TrailingFree(this.map[i]);
+
+                if (lhs == 0) {
+                    continue;
+                }
+
+                int clearBytes = GetLeadingClearBytes(i + 1,
+                                                      maxRangeBytes - 1);
+
+                if (lhs + clearBytes * 8 >= requestLength) {
+                    SetRegion(i, 8 - lhs, requestLength);
+                    allocStart  = i * 8 + (8 - lhs);
+                    allocLength = requestLength;
+                    return true;
+                }
+
+                int rhs = LeadingFree(this.map[i + clearBytes + 1]);
+                if (rhs + lhs + clearBytes * 8 >= requestLength) {
+                    SetRegion(i, 8 - lhs, requestLength);
+                    allocStart  = i * 8 + (8 - lhs);
+                    allocLength = requestLength;
+                    return true;
+                }
+                else {
+                    i += maxRangeBytes - 2;
+                }
+            }
+
+            allocStart  = 0;
+            allocLength = 0;
+            return false;
+        }
+
+        private bool ScanAllocate(int     startByte,
+                                  int     requestLength,
+                                  out int allocStart,
+                                  out int allocLength)
+        {
+            if (requestLength < SmallAllocationLength) {
+                return ScanAllocateSmall(startByte, requestLength,
+                                         out allocStart, out allocLength);
+            }
+            else {
+                return ScanAllocateLarge(startByte, requestLength,
+                                         out allocStart, out allocLength);
+            }
+        }
+
+        /// <summary> Allocate contiguous block of specified length near
+        /// requested start position.
+        /// <para> This method attempts to find contiguous block
+        /// of specified length near the hinted start position.
+        /// </para>
+        /// <returns> true on success, false if allocation fails. </returns>
+        /// </summary>
+        internal bool Allocate(int     requestStart,
+                               int     requestLength,
+                               out int allocStart,
+                               out int allocLength)
+            /*^ requires requestLength > 0; ^*/
+            /*^ requires requestStart < this.totalBits; ^*/
+        {
+            if (requestLength > MaxAllocationLength || totalFreeBits == 0) {
+                allocStart = 0;
+                allocLength = 0;
+                return false;
+            }
+
+            if (requestStart              <= totalBits &&
+                IsAllocated(requestStart) == false     &&
+                HintAllocate(requestLength, requestStart,
+                             out allocStart, out allocLength)) {
+                    CheckInvariants();
+                    return true;
+            }
+
+            return Allocate(requestLength, out allocStart, out allocLength);
+        }
+
+        // <summary> This is a recursive method that examines
+        // the summary information held in the logarithmically
+        // arranged summary data and explores regions that have
+        // sufficient reserve to potentially fulfill the
+        // allocation request. </summary>
+        private bool DrillDownScan(int depth,
+                                   int position,
+                                   int requestLength,
+                                   out int allocStart,
+                                   out int allocLength)
+        {
+            if (depth == summary.Length) {
+                return ScanAllocate(position, requestLength,
+                                    out allocStart, out allocLength);
+            }
+
+            int [] /*!*/ totals = /*^ (!) ^*/ summary[depth];
+            int end = Math.Min(position + SummaryFanOut, totals.Length);
+            for (int i = position; i < end; i++) {
+                // Explore lower level if this cell has a total geq the
+                // target length, or, this cell and its neighbor have
+                // combined total geq the target length.
+                if ((totals[i] >= requestLength) ||
+                    (totals.Length > i + 1 &&
+                     totals[i] + totals[i + 1] >= requestLength)) {
+                    if (DrillDownScan(depth + 1, i * SummaryFanOut,
+                                      requestLength,
+                                      out allocStart, out allocLength)) {
+                        return true;
+                    }
+                }
+            }
+            allocStart  = 0;
+            allocLength = 0;
+            return false;
+        }
+
+        /// <summary> Allocate contiguous block of specified length.
+        /// <para> This method attempts to allocate region of specified length.
+        /// </para>
+        /// <returns> true on success, false if allocation fails.</returns>
+        /// </summary>
+        internal bool Allocate(int requestLength,
+                               out int allocStart,
+                               out int allocLength)
+            /*^ requires requestLength > 0; ^*/
+            /*^ requires requestLength <= MaxAllocationLength; ^*/
+        {
+            if (requestLength > MaxAllocationLength || totalFreeBits == 0) {
+                allocStart = 0;
+                allocLength = 0;
+                return false;
+            }
+
+            CheckInvariants();
+            try {
+                return DrillDownScan(0, 0, requestLength,
+                                     out allocStart, out allocLength);
+            }
+            finally {
+                CheckInvariants();
+            }
+        }
+
+        private void FreeSmall(int start, int length)
+        {
+            Debug.Assert(length <= SmallAllocationLength);
+            int byteIndex = start / 8;
+            int bitIndex  = start - byteIndex * 8;
+            if (bitIndex + length <= 8) {
+                ClearBits(byteIndex, bitIndex, length);
+            }
+            else {
+                ClearBits(byteIndex, bitIndex, 8 - bitIndex);
+                ClearBits(byteIndex + 1, 0, length - (8 - bitIndex));
+            }
+        }
+
+        private void FreeLarge(int start, int length)
+        {
+            int byteIndex = start / 8;
+            int bitIndex  = start - byteIndex * 8;
+            ClearRegion(byteIndex, bitIndex, length);
+        }
+
+        internal void Free(int start, int length)
+        {
+            if (length <= SmallAllocationLength) {
+                FreeSmall(start, length);
+            }
+            else {
+                FreeLarge(start, length);
+            }
+        }
+
+        /// <summary> Scans bitmap for first set bit.  Scan starts
+        /// from supplied position. </summary>
+        // <returns> value >= 0 on success, -1 on failure. </returns>
+
+        /*^ [Microsoft.Contracts.Pure] ^*/
+        internal int GetFirstSetBitFrom(int startBit)
+        {
+            int byteIndex = startBit / 8;
+            int bitIndex  = startBit - byteIndex * 8;
+
+            int m =
+                MakeMask(bitIndex, 8 - bitIndex) & (int)this.map[byteIndex];
+            int skip = LeadingFree((byte)m);
+            Debug.Assert(skip >= bitIndex);
+            if (skip != 8) {
+                return startBit - bitIndex + skip;
+            }
+            for (int i = byteIndex + 1; i < map.Length; i++) {
+                skip = LeadingFree(this.map[i]);
+                if (skip != 8) {
+                    return 8 * i + skip;
+                }
+            }
+            return -1;
+        }
+
+        /// <summary> Scans bitmap for first clear bit.  Scan
+        /// starts from supplied position. </summary>
+        // <returns> value >= 0 on success, -1 on failure. </returns>
+        internal int GetFirstClearBitFrom(int startBit)
+        {
+            int byteIndex = startBit / 8;
+            int bitIndex  = startBit - byteIndex * 8;
+
+            int m = MakeMask(bitIndex, 8 - bitIndex) & ~(int)this.map[byteIndex];
+            int skip = LeadingFree((byte)m);
+            Debug.Assert(skip >= bitIndex);
+            if (skip != 8) {
+                return startBit - bitIndex + skip;
+            }
+            for (int i = byteIndex + 1; i < map.Length; i++) {
+                int tmp = ~(int)this.map[i];
+                skip = LeadingFree((byte)tmp);
+                if (skip != 8) {
+                    return 8 * i + skip;
+                }
+            }
+            return -1;
+        }
+
+        /// <summary> Scans bitmap for first set bit.  Scan
+        /// starts from supplied position. </summary>
+        // <returns> value >= 0 on success, -1 on failure. </returns>
+        internal int GetFirstBitSetBefore(int startBit)
+            requires (startBit < this.totalBits);
+        {
+            int byteIndex = startBit / 8;
+            int bitIndex  = startBit - byteIndex * 8;
+
+            int m = MakeMask(0, bitIndex) & (int)this.map[byteIndex];
+            int r = TrailingFree((byte)m);
+
+            if (r != 8) {
+                return (byteIndex * 8) + (7 - r);
+            }
+            for (int i = byteIndex - 1; i >= 0; i--) {
+                r = TrailingFree(this.map[i]);
+                if (r != 8) {
+                    return 8 * i + (7 - r);
+                }
+            }
+            return -1;
+        }
+
+        internal int Length
+        {
+            get { return totalBits; }
+        }
+
+        internal int FreeCount
+        {
+            get { return totalFreeBits; }
+        }
+
+        internal int UsedCount
+        {
+            get { return Length - FreeCount; }
+        }
+
+        private void SummarizeAlloc(int byteIndex, int numberOfBits)
+        {
+            totalFreeBits -= numberOfBits;
+
+            int n = byteIndex;
+            for (int i = summary.Length - 1; i >= 0; i--) {
+                n = n / SummaryFanOut;
+                (/*^ (!) ^*/summary[i])[n] -= numberOfBits;
+            }
+
+            CheckInvariants();
+        }
+
+        private void SummarizeFree(int byteIndex, int numberOfBits)
+        {
+            totalFreeBits += numberOfBits;
+
+            int n = byteIndex;
+            for (int i = summary.Length - 1; i >= 0; i--) {
+                n = n / SummaryFanOut;
+                (/*^ (!) ^*/summary[i])[n] += numberOfBits;
+            }
+
+            CheckInvariants();
+        }
+
+        [ Conditional("CHECK_INVARIANTS") ]
+        private static void FastBitCount(byte [] /*!*/ data, out int sum)
+        {
+            const int GroupCount = 64;
+            const int GroupRound = -64;
+
+            // sgc croaks if GroupRound is assigned
+            // using:
+            //  const int GroupRound = ~(GroupCount - 1);
+            //  const int GroupRound = ~63;
+
+            int rounded = data.Length & GroupRound;
+
+            int i = 0;
+            sum = 0;
+
+            while (i < rounded) {
+                sum += (int) BitCountTable[ data[i +  0] ];
+                sum += (int) BitCountTable[ data[i +  1] ];
+                sum += (int) BitCountTable[ data[i +  2] ];
+                sum += (int) BitCountTable[ data[i +  3] ];
+                sum += (int) BitCountTable[ data[i +  4] ];
+                sum += (int) BitCountTable[ data[i +  5] ];
+                sum += (int) BitCountTable[ data[i +  6] ];
+                sum += (int) BitCountTable[ data[i +  7] ];
+                sum += (int) BitCountTable[ data[i +  8] ];
+                sum += (int) BitCountTable[ data[i +  9] ];
+                sum += (int) BitCountTable[ data[i + 10] ];
+                sum += (int) BitCountTable[ data[i + 11] ];
+                sum += (int) BitCountTable[ data[i + 12] ];
+                sum += (int) BitCountTable[ data[i + 13] ];
+                sum += (int) BitCountTable[ data[i + 14] ];
+                sum += (int) BitCountTable[ data[i + 15] ];
+                sum += (int) BitCountTable[ data[i + 16] ];
+                sum += (int) BitCountTable[ data[i + 17] ];
+                sum += (int) BitCountTable[ data[i + 18] ];
+                sum += (int) BitCountTable[ data[i + 19] ];
+                sum += (int) BitCountTable[ data[i + 20] ];
+                sum += (int) BitCountTable[ data[i + 21] ];
+                sum += (int) BitCountTable[ data[i + 22] ];
+                sum += (int) BitCountTable[ data[i + 23] ];
+                sum += (int) BitCountTable[ data[i + 24] ];
+                sum += (int) BitCountTable[ data[i + 25] ];
+                sum += (int) BitCountTable[ data[i + 26] ];
+                sum += (int) BitCountTable[ data[i + 27] ];
+                sum += (int) BitCountTable[ data[i + 28] ];
+                sum += (int) BitCountTable[ data[i + 29] ];
+                sum += (int) BitCountTable[ data[i + 30] ];
+                sum += (int) BitCountTable[ data[i + 31] ];
+                sum += (int) BitCountTable[ data[i + 32] ];
+                sum += (int) BitCountTable[ data[i + 33] ];
+                sum += (int) BitCountTable[ data[i + 34] ];
+                sum += (int) BitCountTable[ data[i + 35] ];
+                sum += (int) BitCountTable[ data[i + 36] ];
+                sum += (int) BitCountTable[ data[i + 37] ];
+                sum += (int) BitCountTable[ data[i + 38] ];
+                sum += (int) BitCountTable[ data[i + 39] ];
+                sum += (int) BitCountTable[ data[i + 40] ];
+                sum += (int) BitCountTable[ data[i + 41] ];
+                sum += (int) BitCountTable[ data[i + 42] ];
+                sum += (int) BitCountTable[ data[i + 43] ];
+                sum += (int) BitCountTable[ data[i + 44] ];
+                sum += (int) BitCountTable[ data[i + 45] ];
+                sum += (int) BitCountTable[ data[i + 46] ];
+                sum += (int) BitCountTable[ data[i + 47] ];
+                sum += (int) BitCountTable[ data[i + 48] ];
+                sum += (int) BitCountTable[ data[i + 49] ];
+                sum += (int) BitCountTable[ data[i + 50] ];
+                sum += (int) BitCountTable[ data[i + 51] ];
+                sum += (int) BitCountTable[ data[i + 52] ];
+                sum += (int) BitCountTable[ data[i + 53] ];
+                sum += (int) BitCountTable[ data[i + 54] ];
+                sum += (int) BitCountTable[ data[i + 55] ];
+                sum += (int) BitCountTable[ data[i + 56] ];
+                sum += (int) BitCountTable[ data[i + 57] ];
+                sum += (int) BitCountTable[ data[i + 58] ];
+                sum += (int) BitCountTable[ data[i + 59] ];
+                sum += (int) BitCountTable[ data[i + 60] ];
+                sum += (int) BitCountTable[ data[i + 61] ];
+                sum += (int) BitCountTable[ data[i + 62] ];
+                sum += (int) BitCountTable[ data[i + 63] ];
+                i += GroupCount;
+            }
+            while (i != data.Length) {
+                sum += BitCount(data[i++]);
+            }
+
+#if ALTERNATE_FAST_COUNT
+            // Neither method here seems particularly efficient.  The
+            // unrolled loop still entails bounds checks on every access and
+            // the cost of calling the bit converter appears to be moderately
+            // high.
+
+            sum = 0;
+
+            int i = 0;
+            int max = data.Length & 0x3;
+
+            while (i < max) {
+                uint v = BitConverter.ToUInt32(data, i);
+                uint w = v - ((v >> 1) & 0x55555555);
+                uint x = (w & 0x33333333) + ((w >> 2) & 0x33333333);
+                uint c = ((x + (x >> 4) & 0xF0F0F0F) * 0x1010101) >> 24;
+                sum += (int) c;
+                i += 4;
+            }
+            while (i != data.Length) {
+                sum += BitCount(data[i++]);
+            }
+#endif
+        }
+
+        [ Conditional("CHECK_INVARIANTS") ]
+        private void CheckInvariants()
+        {
+            for (int i = 0; i < summary.Length; i++) {
+                int [] /*!*/ s = /*^ (!) ^*/ summary[i];
+                int totalSummary = 0;
+                for (int j = 0; j < s.Length; j++) {
+                    totalSummary += s[j];
+                    Debug.Assert(s[j] >= 0);
+                }
+                Debug.Assert(totalSummary == totalFreeBits);
+            }
+
+            int totalMap = 0;
+            FastBitCount(this.map, out totalMap);
+            Debug.Assert(totalMap == map.Length * 8 - totalFreeBits);
+        }
+
+        private static int Log2Up(int x)
+            /*^ requires x >= 0 && x <= 0x40000000; ^*/
+        {
+            // Calculate log2 of x rounded up to nearest power
+            int i = 0;
+            for (i = 0; i <= 30; i++) {
+                if ((1 << i) >= x) {
+                    return i;
+                }
+            }
+            // not reached
+            Debug.Assert(false);
+            return 0;
+        }
+
+        [ System.Diagnostics.Conditional("TEST_BITMAP") ]
+        internal void Dump()
+        {
+            const int BPS = 64;
+
+            for (int i = 0; i < Length; i += BPS) {
+                Console.Write("\n{0:x6}: " , i);
+                int todo = Math.Min(Length - i, BPS);
+                for (int j = 0; j < todo; j++) {
+                    if ((j & 15) == 8)
+                        Console.Write(" ");
+
+                    Console.Write("{0}", IsAllocated(i + j) ? 1 : 0);
+                }
+            }
+            Console.Write("\n");
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Test code
+
+#if TEST_BITMAP
+
+    internal class BitmapTest
+    {
+        internal class AllocationRecord
+        {
+            internal int Start;
+            internal int Length;
+
+            internal AllocationRecord() {}
+            internal AllocationRecord(int start, int length)
+            {
+                Start  = start;
+                Length = length; }
+        }
+
+        private static void TestSearch()
+        {
+            System.Console.WriteLine("TestSearch()");
+
+            const int BitCount = 1024;
+
+            Random rng    = new Random(0);
+            bool   failed = false;
+
+            for (int i = 0; i < 1000 && !failed; i++) {
+                Bitmap b = new Bitmap(BitCount);
+
+                int start;
+                int length;
+
+                if (i == 0) {
+                    // This forces the initial byte checks in
+                    // GetFirst{Set,Clear}BitFrom().
+                    start = 3;
+                    length = 2;
+                }
+                else if (i == 1) {
+                    // This forces code past initial byte checks in
+                    // GetFirst{Set,Clear}BitFrom().
+                    start = 13;
+                    length = Bitmap.MaxAllocationLength;
+                }
+                else {
+                    start = rng.Next(BitCount);
+                    length = 1 + rng.Next(Math.Min(BitCount - start - 1, Bitmap.MaxAllocationLength - 1));
+                }
+
+                int theStart, theLength;
+
+                b.Allocate(start, length, out theStart, out theLength);
+                Debug.Assert(start == theStart);
+                Debug.Assert(length == theLength);
+                Debug.Assert(b.GetFirstSetBitFrom(0) == theStart);
+
+                for (int j = 0; j < length; j++) {
+                    Debug.Assert(
+                        b.GetFirstSetBitFrom(theStart + j) == theStart + j);
+                }
+
+                for (int j = theStart + theLength; j < b.Length; j++) {
+                    Debug.Assert(b.GetFirstClearBitFrom(j) == j);
+                }
+            }
+        }
+
+        private static void TestSearch2()
+        {
+            Console.WriteLine("TestSearch2()");
+            const int BitCount = 1024;
+
+            Random    rng         = new Random(0);
+            ArrayList allocations = new ArrayList(BitCount / 8);
+
+            for (int r = 0; r < 1000; r++) {
+
+                Bitmap b = new Bitmap(BitCount);
+
+                int i = r % Bitmap.MaxAllocationLength;
+                while (i < BitCount) {
+                    int length = 1 + Math.Min(
+                        b.Length - i - 1,
+                        rng.Next(Bitmap.MaxAllocationLength - 1)
+                        );
+                    AllocationRecord a = new AllocationRecord();
+                    b.Allocate(i, length, out a.Start, out a.Length);
+                    Debug.Assert(a.Start == i && a.Length == length);
+                    allocations.Add(a);
+                    i += 1 + length + rng.Next(Bitmap.MaxAllocationLength - 1);
+                }
+
+                i = 0;
+                while (i < BitCount) {
+                    while (i < BitCount && b.GetFirstClearBitFrom(i) == i) {
+                        i++;
+                    }
+
+                    if (i >= BitCount) {
+                        break;
+                    }
+
+                    AllocationRecord /*!*/ a =
+                        /*^(!)^*/ (AllocationRecord)allocations[0];
+                    allocations.RemoveAt(0);
+
+                    Debug.Assert(i == a.Start);
+                    int nextClear = b.GetFirstClearBitFrom(i);
+                    Debug.Assert(nextClear == i + a.Length ||
+                                 i + a.Length >= BitCount);
+
+                    int j = i;
+                    while (j < BitCount && b.GetFirstSetBitFrom(j) == j) {
+                        j++;
+                    }
+                    Debug.Assert(j == i + a.Length);
+                    i = j;
+                }
+                Debug.Assert(allocations.Count == 0);
+            }
+        }
+
+        private static void TestFillThenEmpty(int bitmapSize,
+                                              int allocationSize)
+        {
+            System.Console.WriteLine("TestFillThenEmpty({0}, {1})",
+                                     bitmapSize, allocationSize);
+            Debug.Assert((bitmapSize % allocationSize) == 0);
+            Bitmap b = new Bitmap(bitmapSize);
+
+            Debug.Assert(b.FreeCount == bitmapSize);
+
+            // Allocate all bits in map
+            for (int i = 0; i < bitmapSize; i += allocationSize) {
+                int start;
+                int length;
+                if (! b.Allocate(allocationSize, out start, out length)) {
+                    b.Dump();
+                    Console.WriteLine("Allocation failed (i = {0}, length = {1})", i, allocationSize);
+                    Debug.Assert(false);
+                }
+
+                Debug.Assert(start == i);
+                Debug.Assert(length == allocationSize);
+                Debug.Assert(b.FreeCount == b.Length - i - allocationSize);
+            }
+
+            // Try allocation when full
+            Debug.Assert(b.FreeCount == 0);
+            int dummyStart, dummyLength;
+            Debug.Assert(! b.Allocate(1, out dummyStart, out dummyLength));
+            Debug.Assert(b.FreeCount == 0);
+
+            // Free all bits in map
+            for (int i = 0; i < bitmapSize; i += allocationSize) {
+                b.Free(i, allocationSize);
+                Debug.Assert(b.FreeCount == i + allocationSize);
+            }
+
+            Debug.Assert(b.FreeCount == b.Length);
+
+            // Allocate all bits in specific positions
+            for (int i = 0; i < bitmapSize; i += allocationSize) {
+                int start;
+                int length;
+                b.Allocate(i, allocationSize, out start, out length);
+                Debug.Assert(start == i);
+                Debug.Assert(length == allocationSize);
+                Debug.Assert(b.FreeCount == b.Length - i - allocationSize);
+            }
+
+            // Try allocation when full
+            Debug.Assert(b.FreeCount == 0);
+            Debug.Assert(! b.Allocate(1, out dummyStart, out dummyLength));
+            Debug.Assert(b.FreeCount == 0);
+
+            // Free all bits in map
+            for (int i = 0; i < bitmapSize; i += allocationSize) {
+                b.Free(i, allocationSize);
+                Debug.Assert(b.FreeCount == i + allocationSize);
+            }
+
+            Debug.Assert(b.FreeCount == b.Length);
+        }
+
+        private static void TestSkipFillThenEmpty(int bitmapSize,
+                                                  int allocationSize)
+        {
+            System.Console.WriteLine("TestSkipFillThenEmpty({0}, {1})",
+                                     bitmapSize, allocationSize);
+
+            for (int skip = 0; skip < allocationSize; skip++) {
+                int size = bitmapSize - (bitmapSize % (allocationSize + skip));
+                Bitmap b = new Bitmap(size);
+
+                int start = 0;
+                int length;
+
+                int canDo = bitmapSize / (allocationSize + skip);
+
+                for (int i = 0; i < canDo; i++) {
+                    bool success =
+                        b.Allocate(i * (allocationSize + skip) + skip,
+                                   allocationSize, out start, out length);
+                    Debug.Assert(success);
+                    Debug.Assert(length == allocationSize);
+                }
+
+                Debug.Assert(b.Allocate(allocationSize, out start, out length) == false);
+
+                for (int i = 0; i < canDo; i++) {
+                    int oldFree = b.FreeCount;
+                    b.Free(i * (allocationSize + skip) + skip, allocationSize);
+                    Debug.Assert(oldFree == b.FreeCount - allocationSize);
+                }
+            }
+        }
+
+        private static void Hammer(int bitmapSize, double allocProbability)
+        {
+            Bitmap b = new Bitmap(bitmapSize);
+            ArrayList allocations = new ArrayList();
+
+            Console.WriteLine("Hammer {0}, {1}", bitmapSize, allocProbability);
+
+            Random rng = new Random(0);
+            for (int i = 0; i < bitmapSize; i++) {
+                if (rng.NextDouble() > (1.0 - allocProbability)) {
+                    int request = Math.Min(Bitmap.MaxAllocationLength, b.FreeCount);
+                    if (request == 0)
+                        continue;
+                    AllocationRecord a = new AllocationRecord();
+
+                    int oldFree = b.FreeCount;
+                    if (b.Allocate(request, out a.Start, out a.Length) == true) {
+                        allocations.Add(a);
+                        Debug.Assert(a.Length == request);
+                        Debug.Assert(b.FreeCount + a.Length == oldFree);
+                    }
+                }
+                else {
+                    int count = allocations.Count;
+                    if (count > 0) {
+                        int index = rng.Next(count);
+                        AllocationRecord /*!*/ a =
+                            /*^(!)^*/ (AllocationRecord)allocations[index];
+                        allocations.RemoveAt(index);
+                        int oldFree = b.FreeCount;
+                        b.Free(a.Start, a.Length);
+                        Debug.Assert(oldFree == b.FreeCount - a.Length);
+                    }
+                }
+            }
+        }
+
+        private static void HammerFixedHint(int bitmapSize, double allocProbability)
+        {
+            Bitmap b = new Bitmap(bitmapSize);
+            ArrayList allocations = new ArrayList();
+
+            Console.WriteLine("HammerFixedHint {0}, {1}", bitmapSize, allocProbability);
+
+            Random rng = new Random(0);
+            for (int i = 0; i < bitmapSize; i++) {
+                if (rng.NextDouble() > (1.0 - allocProbability)) {
+                    int request = 1 + Math.Min(Bitmap.MaxAllocationLength - 1, b.FreeCount - 1);
+                    if (request == 0)
+                        continue;
+
+                    int oldFree = b.FreeCount;
+                    AllocationRecord a = new AllocationRecord();
+                    if (b.Allocate(bitmapSize / 3, request,
+                                   out a.Start, out a.Length) == true) {
+                        allocations.Add(a);
+                        Debug.Assert(a.Length == request);
+                        Debug.Assert(oldFree == b.FreeCount + a.Length);
+                    }
+                }
+                else {
+                    int count = allocations.Count;
+                    if (count > 0) {
+                        int index = rng.Next(count);
+                        int oldFree = b.FreeCount;
+                        AllocationRecord /*!*/ a =
+                            /*^(!)^*/(AllocationRecord)allocations[index];
+                        allocations.RemoveAt(index);
+                        b.Free(a.Start, a.Length);
+                        Debug.Assert(oldFree == b.FreeCount - a.Length);
+                    }
+                }
+            }
+        }
+
+        private static void HammerBadHint(int    bitmapSize,
+                                          double allocProbability)
+        {
+            Bitmap b = new Bitmap(bitmapSize);
+            ArrayList allocations = new ArrayList();
+
+            Console.WriteLine("HammerBadHint {0}, {1}",
+                              bitmapSize, allocProbability);
+
+            Random rng = new Random(0);
+            for (int i = 0; i < bitmapSize; i++) {
+                if (rng.NextDouble() > (1.0 - allocProbability)) {
+                    int length = Math.Min(Bitmap.MaxAllocationLength, b.FreeCount);
+                    if (length == 0)
+                        continue;
+                    AllocationRecord a = new AllocationRecord();
+                    int start   = rng.Next(bitmapSize);
+                    int oldFree = b.FreeCount;
+                    if (b.Allocate(start, length,
+                                   out a.Start, out a.Length) == true) {
+                        allocations.Add(a);
+                        Debug.Assert(a.Length == length);
+                        Debug.Assert(oldFree == b.FreeCount + a.Length);
+                    }
+                }
+                else {
+                    int count = allocations.Count;
+                    if (count > 0) {
+                        int index = rng.Next(count);
+                        int oldFree = b.FreeCount;
+                        AllocationRecord /*!*/ a =
+                            /*^(!)^*/(AllocationRecord)allocations[index];
+                        allocations.RemoveAt(index);
+                        b.Free(a.Start, a.Length);
+                        Debug.Assert(oldFree == b.FreeCount - a.Length);
+                    }
+                }
+            }
+        }
+
+        internal static void Main()
+        {
+#if !DEBUG
+            Console.WriteLine("Program needs to be compiles with /D:DEBUG /DEBUG flags");
+            Environment.Exit(-1);
+#endif
+
+            TestSearch();
+            TestSearch2();
+
+            TestFillThenEmpty(333, 3);
+            TestFillThenEmpty(28, 2);
+            TestFillThenEmpty(256, 8);
+            TestFillThenEmpty(13 * 17, 13);
+            TestFillThenEmpty(17 * 17, 17);
+            TestFillThenEmpty(1700, 17);
+            TestFillThenEmpty(8 * 8 * 1024 * 2, 8);
+            TestFillThenEmpty(8 * 8 * 1024 * 2, 32);
+            TestFillThenEmpty(8 * 8 * 1024 * 2, 1);
+
+            for (int i = 3; i < Bitmap.MaxAllocationLength; i++) {
+                int s = 3 * 256 * 256 + Bitmap.MaxAllocationLength;
+                if ((s % i) != 0) {
+                    s -= s % i;
+                }
+                TestFillThenEmpty(s, i);
+            }
+
+            for (int i = 1; i < Bitmap.MaxAllocationLength; i++) {
+                TestSkipFillThenEmpty(13 * 1024 + i, i);
+            }
+
+            foreach (int s in new int [] { 172, 4247, 16384}) {
+                foreach (double p in new double [] { 0.1, 0.5, 0.85, 0.99 }) {
+                    Hammer(s, p);
+                    HammerFixedHint(s, p);
+                    HammerBadHint(s, p);
+                }
+            }
+        }
+    }
+#endif // TEST_BITMAP
+}
+
diff --git a/base/Services/Fat/Fs/BlockCache.sg b/base/Services/Fat/Fs/BlockCache.sg
new file mode 100644
index 0000000..cdd2ca1
--- /dev/null
+++ b/base/Services/Fat/Fs/BlockCache.sg
@@ -0,0 +1,967 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BlockCache.sg
+//
+//  Todo: Look at giving up blocks when there is system memory pressure.
+//        This needs a channel to the shared heap or another entity to
+//        provide the necessary hints.
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+
+using System.Threading;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <remarks> States associated with BlockCacheNodes. </remarks>
+    internal enum NodeState : uint {
+        Unused        = 0, // Node is unused.  It has a buffer, but it does
+                           // not correspond to data on the disk.
+                           // Transitions := <Clean|Dirty>
+
+        Clean         = 1, // Node has data and it's clean.
+                           // Transitions := <CleanBorrowed|Unused|Dirty>
+
+        CleanBorrowed = 2, // There is clean data associated with node,
+                           // but it is temporarily in use elsewhere in
+                           // fs code.
+                           // Transitions := <Clean|Dirty>
+
+        Dirty         = 3, // Node has data and it's dirty.  If a user
+                           // requests the node's data we have to return
+                           // a copy as the data is enqueued to be written
+                           // written to disk.
+                           // Transitions := <WritePending|DirtyBorrowed>
+
+        DirtyBorrowed = 4, // There is dirty data associated with node,
+                           // but it is temporarily in use elsewhere in
+                           // fs code.
+                           // Transitions := <Dirty>
+
+        WritePending  = 5, // The disk has the data associated with the
+                           // node.  The disk will return the data when
+                           // the write is complete.  The node state will
+                           // transition to Clean when done.
+                           // Transitions := <Clean>
+
+        ReadPending   = 6, // The node is tagged with sector id, but data
+                           // from disk has yet to be transferred.
+                           // Transitions := <Clean>
+    }
+
+    internal struct BlockCacheNode
+    {
+        NodeState        nodeState;
+        ulong            sectorId;
+        int              lruTicks;
+        VContainer<byte> blockData; // VContainer has mutex for acquire/release
+                                    // but we don't use it and would prefer
+                                    // not to have it.
+        bool             acquired;  // For sanity check
+
+        internal BlockCacheNode(NodeState                  ns,
+                                ulong                      sectorId,
+                                [Claims] byte[]! in ExHeap blockData,
+                                int                        lruTicks)
+        {
+            this.nodeState = ns;
+            this.sectorId  = sectorId;
+            this.blockData = new VContainer<byte> (blockData);
+            this.lruTicks  = lruTicks;
+            this.acquired  = false;
+        }
+
+        private static NodeState[,] Transitions = {
+            // From State                  To State
+            { NodeState.Unused,           NodeState.ReadPending     },
+            { NodeState.Unused,           NodeState.Dirty           },
+            { NodeState.ReadPending,      NodeState.Clean           },
+            { NodeState.ReadPending,      NodeState.CleanBorrowed   },
+            { NodeState.Unused,           NodeState.Dirty           },
+            { NodeState.Clean,            NodeState.CleanBorrowed   },
+            { NodeState.Clean,            NodeState.Dirty           },
+            { NodeState.Clean,            NodeState.ReadPending     },
+            { NodeState.CleanBorrowed,    NodeState.Clean           },
+            { NodeState.CleanBorrowed,    NodeState.Dirty           },
+            { NodeState.Dirty,            NodeState.Dirty           },
+            { NodeState.Dirty,            NodeState.DirtyBorrowed   },
+            { NodeState.Dirty,            NodeState.WritePending    },
+            { NodeState.DirtyBorrowed,    NodeState.Dirty           },
+            { NodeState.WritePending,     NodeState.Clean           }
+        };
+
+        [ Microsoft.Contracts.Pure ]
+        static bool TransitionValid(NodeState oldState, NodeState newState)
+        {
+            for (int i = 0; i < Transitions.Length; i += Transitions.Rank) {
+                if (Transitions[i/2, 0] == oldState &&
+                    Transitions[i/2, 1] == newState) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        internal byte[]! in ExHeap Acquire()
+        {
+            byte []! in ExHeap bytes = blockData.Acquire();
+            assert (State == NodeState.Unused ||
+                    State == NodeState.Clean ||
+                    State == NodeState.Dirty);
+            this.acquired  = true;
+            return bytes;
+        }
+
+        internal void AcquiredTransition(NodeState newNodeState, int lruTicks)
+        {
+            assert TransitionValid(nodeState, newNodeState);
+            this.nodeState = newNodeState;
+            this.lruTicks  = lruTicks;
+        }
+
+        internal void AcquiredSetSectorId(ulong newSectorId)
+        {
+            assert acquired == true;
+            sectorId = newSectorId;
+        }
+
+        internal void Release([Claims] byte[]! in ExHeap bytes,
+                              NodeState                  newNodeState,
+                              int                        lruTicks)
+        {
+            assert TransitionValid(nodeState, newNodeState);
+
+            assert (newNodeState == NodeState.Unused ||
+                    newNodeState == NodeState.Clean ||
+                    newNodeState == NodeState.Dirty);
+
+            this.nodeState = newNodeState;
+            this.lruTicks  = lruTicks;
+            this.acquired  = false;
+            this.blockData.Release(bytes);
+        }
+
+        internal NodeState State
+        {
+            get { return nodeState; }
+        }
+
+        internal ulong SectorId
+        {
+            get { return sectorId; }
+        }
+
+        internal int LruTicks
+        {
+            get { return lruTicks; }
+        }
+
+        internal bool Acquired
+        {
+            get { return acquired; }
+        }
+    }
+
+    internal pointerfree struct BlockCacheConfiguration
+    {
+        ulong startSectorId;        // SectorId of first block in cache range
+        uint  bytesPerSector;
+        uint  sectorsPerBlock;
+        uint  totalBlocks;          // Number of blocks in cache range
+        uint  maxCacheKB;           // Maximum block data cached
+
+        internal BlockCacheConfiguration(ulong startSectorId,
+                                         uint  bytesPerSector,
+                                         uint  sectorsPerBlock,
+                                         uint  totalBlocks,
+                                         uint  maxCacheKB)
+            requires (bytesPerSector != 0 &&
+                      (bytesPerSector & (bytesPerSector - 1)) == 0)
+                /* otherwise ArgumentException */;
+            requires (sectorsPerBlock != 0 &&
+                      (sectorsPerBlock & (sectorsPerBlock - 1)) == 0)
+                /* otherwise ArgumentException */;
+            requires (totalBlocks != 0)
+                /* otherwise ArgumentException */;
+        {
+            this.startSectorId   = startSectorId;
+            this.bytesPerSector  = bytesPerSector;
+            this.sectorsPerBlock = sectorsPerBlock;
+            this.totalBlocks     = totalBlocks;
+            this.maxCacheKB      = maxCacheKB;
+        }
+
+       internal ulong StartSectorId     { get { return startSectorId; } }
+       internal uint  BytesPerSector    { get { return sectorsPerBlock; } }
+       internal uint  SectorsPerBlock   { get { return sectorsPerBlock; } }
+       internal uint  BytesPerBlock
+       {
+           get { return sectorsPerBlock * bytesPerSector; }
+       }
+       internal uint  TotalBlocks       { get { return totalBlocks; } }
+       internal uint  MaxCacheKB        { get { return maxCacheKB; } }
+    }
+
+    /// <summary>
+    /// The BlockCache is an n-way associative cache of a set of blocks on
+    /// a disk.  All of the blocks are assumed to have the same size.
+    /// </summary>
+    internal sealed class BlockCache : IBlockWriterUser
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Fields
+
+        private BlockCacheConfiguration config;
+
+        private uint                cacheStride;            // bucketCount
+        private uint                cacheAssociativity;     // bucketDepth
+        private BlockCacheNode [][] cache;
+        private int []              cacheTicks;             // lru clock for
+                                                            // each cache line
+        private Disk!               disk;
+        private BlockWriter!        blockWriter;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal BlockCache(BlockCacheConfiguration configuration,
+                            Disk!                       disk,
+                            BlockWriter!                blockWriter)
+
+        {
+            this.config = configuration;
+            this.disk   = disk;
+            this.blockWriter = blockWriter;
+
+            base();
+
+            SizeCache(ref config, out cacheStride, out cacheAssociativity);
+
+            ulong usedKB = ((ulong)cacheStride) * cacheAssociativity * config.BytesPerBlock / 1024;
+
+            DebugStub.Print(
+                "BlockCache suggested size = {0} K, actual size = {1} K ({2} x {3} x {4})\n",
+                            __arglist(
+                                config.MaxCacheKB,
+                                usedKB,
+                                cacheStride,
+                                cacheAssociativity,
+                                config.BytesPerBlock));
+
+            cache      = new BlockCacheNode [cacheStride][];
+            cacheTicks = new int[cacheStride];
+
+            ulong allocated = 0;
+
+            for (uint i = 0; i < cacheStride; i++) {
+                BlockCacheNode [] cacheLine = new BlockCacheNode[cacheAssociativity];
+                cache[i]      = cacheLine;
+                cacheTicks[i] = 0;
+                for (uint j = 0; j < cacheAssociativity; j++) {
+                    cacheLine[j] = new BlockCacheNode(
+                        NodeState.Unused,
+                        0 /* no sector id */,
+                        new [ExHeap] byte [config.BytesPerBlock],
+                        cacheTicks[i]);
+                    allocated += config.BytesPerBlock;
+                }
+            }
+            DebugStub.Print("Cache allocated {0}\n",
+                            __arglist(allocated));
+        }
+
+        internal ulong StartSectorId
+        {
+            get { return config.StartSectorId; }
+        }
+
+        internal uint TotalBlocks
+        {
+            get { return config.TotalBlocks; }
+        }
+
+        internal uint BytesPerBlock
+        {
+            get { return config.BytesPerBlock; }
+        }
+
+        private uint GetCacheLine(uint blockId)
+            requires blockId < TotalBlocks /* otherwise ArgumentException */;
+        {
+            return blockId % cacheStride;
+        }
+
+        private ulong BlockToSectorId(uint blockId)
+            requires blockId < TotalBlocks /* otherwise ArgumentException */;
+        {
+            return config.StartSectorId + blockId * (ulong)config.SectorsPerBlock;
+        }
+
+        private uint SectorToBlockId(ulong sectorId)
+            requires (long)sectorId >= (long)StartSectorId;
+        {
+            return ((uint)(sectorId - config.StartSectorId) / config.SectorsPerBlock);
+        }
+
+        enum CandidateResult : uint
+        {
+            FoundExact       = 1,           // Found exact block
+            FoundVictim      = 2,           // Found candidate for replacement
+            NodeBlocked      = 0x80000001,  // Found block but in use
+            CacheLineBlocked = 0x80000002   // No blocks found or available
+        }
+
+        /// <remarks> Search for identified node or a victim for
+        /// replacement if not present.
+        ///
+        /// <para>Looks for cache node matching sector id or
+        /// most suitable node to use for sector id.  If it is
+        /// not in the cache, a suitable candidate for
+        /// replacement may be returned.</para>
+        ///
+        /// <para>If the node is in the cache, but in use, then
+        /// NodeBlocked is returned.</para>
+        ///
+        /// <para>If the node is not present and there are no
+        /// available nodes in cache line for replacement, then
+        /// CacheLineBlocked is returned.</para>
+        /// </remarks>
+        private static CandidateResult
+        GetCandidateNode(BlockCacheNode[]! cacheLine,
+                         int               clockTicks,
+                         ulong             sectorId,
+                         out int           nodeIndex)
+        {
+            // requires Monitor.Entered(cacheLine) == true
+            int freeIndex   = -1;
+            int lruIndex    = -1;
+            uint lastLruAge = 0;
+
+            for (int i = 0; i < cacheLine.Length; i++) {
+                if (cacheLine[i].State == NodeState.Unused) {
+                    freeIndex = i;
+                }
+                else if (cacheLine[i].SectorId == sectorId) {
+                    if (cacheLine[i].State == NodeState.Clean ||
+                        cacheLine[i].State == NodeState.Dirty) {
+                        nodeIndex = i;
+#if RECORD_BLOCK_CACHE_STATISTICS
+                        DebugStub.AddToPerfCounter(0, 1);   // Block found
+#endif
+                        return CandidateResult.FoundExact;
+                    }
+                    else {
+                        nodeIndex = i;
+                        // Node exists in cache but is in use
+#if RECORD_BLOCK_CACHE_STATISTICS
+                        DebugStub.AddToPerfCounter(1, 1);   // Block in use, block.
+#endif
+                        return CandidateResult.NodeBlocked;
+                    }
+                }
+                else if (cacheLine[i].State == NodeState.Clean) {
+                    // Candidate for eviction from cache.  Compute age
+                    // and note if eldest clean node to date.
+                    if (lruIndex < -0) {
+                        lruIndex = i;
+                        lastLruAge = (uint) unchecked(clockTicks - cacheLine[i].LruTicks);
+                    }
+                    else {
+                        uint lruAge = (uint) unchecked(clockTicks - cacheLine[i].LruTicks);
+                        if (lruAge > lastLruAge) {
+                            lruIndex   = i;
+                            lastLruAge = lruAge;
+                        }
+                    }
+                }
+            }
+
+            if (freeIndex >= 0) {
+                nodeIndex = freeIndex;
+#if RECORD_BLOCK_CACHE_STATISTICS
+                DebugStub.AddToPerfCounter(2, 1);   // Will fetch.
+#endif
+                return CandidateResult.FoundVictim;
+            }
+            else if (lruIndex >= 0) {
+                nodeIndex = lruIndex;
+#if RECORD_BLOCK_CACHE_STATISTICS
+                DebugStub.AddToPerfCounter(3, 1);   // Will fetch.
+#endif
+                return CandidateResult.FoundVictim;
+            }
+            nodeIndex = -1;
+#if RECORD_BLOCK_CACHE_STATISTICS
+            DebugStub.AddToPerfCounter(3, 1);       // Wait to evict cache.
+#endif
+            return CandidateResult.CacheLineBlocked;
+        }
+
+        /// <remarks>
+        /// Claims an unused or clean block in the cache and tags it
+        /// with the requested block id.  It is assumed the caller wants
+        /// to write block as new without reading it first. The block
+        /// is optionally initialized with zeros and always marked as dirty.
+        /// The caller must pair this method with EndQuickBlockOperation.
+        /// Typical usage would be creating a new directory or first block
+        /// for a file.
+        /// </remarks>
+        internal byte[]! in ExHeap
+        CreateBlockAndBeginQuickOperation(uint blockId, bool zeroBuffer)
+        {
+            uint line = GetCacheLine(blockId);
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+            ulong sectorId = BlockToSectorId(blockId);
+
+            bool enqueue = false;
+
+            // Take cache line lock
+            Monitor.Enter(cacheLine);
+
+          retry:
+            int nodeIndex;
+            CandidateResult cr =
+                GetCandidateNode(cacheLine, cacheTicks[line], sectorId,
+                                 out nodeIndex);
+            if (cr == CandidateResult.NodeBlocked) {
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+            else if (cr == CandidateResult.CacheLineBlocked) {
+                // Wake up thread that flushes blocks to disk and wait
+                // for notification that block state has changed.
+                blockWriter.WakeUp();
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+
+            byte []! in ExHeap bytes = cacheLine[nodeIndex].Acquire();
+
+            if (cr == CandidateResult.FoundExact) {
+                // Block exists in cache
+                assert cacheLine[nodeIndex].SectorId == sectorId;
+
+                assert (cacheLine[nodeIndex].State == NodeState.Clean ||
+                        cacheLine[nodeIndex].State == NodeState.Dirty);
+
+                if (cacheLine[nodeIndex].State == NodeState.Clean) {
+                    cacheLine[nodeIndex].AcquiredTransition(
+                        NodeState.Dirty, cacheTicks[line]++);
+                    enqueue = true;
+                }
+
+                if (zeroBuffer) {
+                    Bitter.Zero(bytes, 0, bytes.Length);
+                }
+
+                cacheLine[nodeIndex].AcquiredTransition(
+                    NodeState.DirtyBorrowed, cacheTicks[line]++);
+
+                Monitor.Exit(cacheLine);
+            }
+            else {
+                // Block was not in cache, relabel block and mark as dirty.
+
+                assert cr == CandidateResult.FoundVictim;
+
+                assert (cacheLine[nodeIndex].State == NodeState.Clean ||
+                        cacheLine[nodeIndex].State == NodeState.Unused);
+
+                cacheLine[nodeIndex].AcquiredSetSectorId(sectorId);
+
+                cacheLine[nodeIndex].AcquiredTransition(
+                    NodeState.Dirty, cacheTicks[line]++);
+
+                if (zeroBuffer) {
+                    Bitter.Zero(bytes, 0, bytes.Length);
+                }
+
+                cacheLine[nodeIndex].AcquiredTransition(
+                    NodeState.DirtyBorrowed, cacheTicks[line]++);
+
+                enqueue = true;
+
+                Monitor.Exit(cacheLine);
+            }
+
+            if (enqueue) {
+                blockWriter.Enqueue(this, sectorId, nodeIndex);
+            }
+            return bytes;
+        }
+
+        /// <remarks>
+        /// Fetches and locks a data block in the cache.  Only
+        /// used by non-blocking internal FS operations.  This
+        /// method may block if a fetch from from the disk is
+        /// required to get the data or the data block is
+        /// already locked.
+        /// </remarks>
+        internal byte[]! in ExHeap
+        BeginQuickBlockOperation(uint blockId)
+        {
+            uint line = GetCacheLine(blockId);
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+            ulong sectorId = BlockToSectorId(blockId);
+
+            // Take cache line lock
+            Monitor.Enter(cacheLine);
+
+          retry:
+            int nodeIndex;
+            CandidateResult cr =
+                GetCandidateNode(cacheLine, cacheTicks[line], sectorId,
+                                 out nodeIndex);
+            if (cr == CandidateResult.NodeBlocked) {
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+            else if (cr == CandidateResult.CacheLineBlocked) {
+                // Wake up thread that flushes blocks to disk and wait
+                // for notification that block state has changed.
+                blockWriter.WakeUp();
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+
+            // Get buffer
+            byte []! in ExHeap bytes = cacheLine[nodeIndex].Acquire();
+
+            if (cr == CandidateResult.FoundExact) {
+                // Block exists in cache
+                assert cacheLine[nodeIndex].SectorId == sectorId;
+
+                assert (cacheLine[nodeIndex].State == NodeState.Clean ||
+                        cacheLine[nodeIndex].State == NodeState.Dirty);
+
+                if (cacheLine[nodeIndex].State == NodeState.Clean) {
+                    cacheLine[nodeIndex].AcquiredTransition(
+                        NodeState.CleanBorrowed, cacheTicks[line]++);
+                }
+                else if (cacheLine[nodeIndex].State == NodeState.Dirty) {
+                    cacheLine[nodeIndex].AcquiredTransition(
+                        NodeState.DirtyBorrowed, cacheTicks[line]++);
+                }
+
+                // Drop cache line lock
+                Monitor.Exit(cacheLine);
+
+                return bytes;
+            }
+            else {
+                assert cr == CandidateResult.FoundVictim;
+
+                assert (cacheLine[nodeIndex].State == NodeState.Clean ||
+                        cacheLine[nodeIndex].State == NodeState.Unused);
+
+                // Block needs to be fetched from disk.
+                // Change sector id on node about to be replaced
+                cacheLine[nodeIndex].AcquiredSetSectorId(sectorId);
+
+                // Mark State
+                cacheLine[nodeIndex].AcquiredTransition(
+                    NodeState.ReadPending, cacheTicks[line]++);
+
+                // Drop lock for duration of read
+                Monitor.Exit(cacheLine);
+
+                byte[] in ExHeap inData = disk.Read(sectorId, bytes);
+                assert inData != null;
+
+                Monitor.Enter(cacheLine);
+                cacheLine[nodeIndex].AcquiredTransition(
+                    NodeState.CleanBorrowed, cacheTicks[line]++);
+                Monitor.Exit(cacheLine);
+
+                return inData;
+            }
+        }
+
+        /// <remarks>
+        /// Returns block to cache and unlocks it.  Must be paired with
+        /// BeginQuickBlockOperation.
+        /// </remarks>
+        internal void
+        EndQuickBlockOperation(uint                       blockId,
+                               [Claims] byte[]! in ExHeap blockData,
+                               bool                       dirtiedBuffer)
+        {
+            uint line = GetCacheLine(blockId);
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+
+            // Lock cache line
+            Monitor.Enter(cacheLine);
+
+            // Get node
+            int nodeIndex;
+            CandidateResult cr = GetCandidateNode(cacheLine,
+                                                  cacheTicks[line],
+                                                  BlockToSectorId(blockId),
+                                                  out nodeIndex);
+
+            // BeginQuickBlockOperation should have blocked node
+            assert cr == CandidateResult.NodeBlocked;
+
+            assert nodeIndex >= 0;
+            assert cacheLine[nodeIndex].Acquired == true;
+            assert (cacheLine[nodeIndex].State == NodeState.CleanBorrowed ||
+                    cacheLine[nodeIndex].State == NodeState.DirtyBorrowed);
+
+            bool enqueueBlock = false;
+            NodeState newState;
+
+            // Return data to cache node and update state
+            if (cacheLine[nodeIndex].State == NodeState.CleanBorrowed) {
+                if (dirtiedBuffer) {
+                    enqueueBlock = true;
+                    newState = NodeState.Dirty;
+                }
+                else {
+                    newState = NodeState.Clean;
+                }
+            }
+            else {
+                assert cacheLine[nodeIndex].State == NodeState.DirtyBorrowed;
+                newState = NodeState.Dirty;
+            }
+
+            cacheLine[nodeIndex].Release(blockData, newState,
+                                         cacheTicks[line]++);
+
+            // Enqueue request *after* returning node to cache.
+            // This is a must to maintain the correct state associated with
+            // the node because writer may work synchronously or
+            // asynchronously and the enqueue operation may trigger a write
+            // which will update the state of the block both when it
+            // starts and completes.
+            if (enqueueBlock) {
+                // NB cookie is index
+                // in cache line of node.
+                blockWriter.Enqueue(this,
+                                    cacheLine[nodeIndex].SectorId,
+                                    nodeIndex);
+            }
+
+            // Wakeup anyone waiting for this block or this cache-line
+            // NB Threads may be sleeping because node has data transiently
+            // unavailable (CleanBorrowed,DirtyBorrowed,ReadPending, or
+            // WritePending), or because it's waiting for a victim to replace
+            // and this node might now be eligible.
+            Monitor.Pulse(cacheLine);
+
+            Monitor.Exit(cacheLine);
+        }
+
+        internal void Read(uint              blockId,
+                           int               blockOffset,
+                           byte[]! in ExHeap dstBuffer,
+                           int               dstOffset,
+                           int               readBytes)
+            requires blockId < TotalBlocks;
+            requires blockOffset >= 0;
+            requires dstOffset >= 0;
+            requires readBytes >= 0;
+            requires blockOffset + readBytes <= this.BytesPerBlock;
+            requires dstOffset + readBytes <= dstBuffer.Length;
+        {
+            byte[]! in ExHeap blockData = BeginQuickBlockOperation(blockId);
+
+            Bitter.Copy(dstBuffer, dstOffset, readBytes,
+                        blockData, blockOffset);
+
+            EndQuickBlockOperation(blockId, blockData, false);
+        }
+
+        internal void WriteEntireBlock(uint              blockId,
+                                       byte[]! in ExHeap srcBuffer,
+                                       int               srcOffset)
+            requires blockId < TotalBlocks;
+            requires srcOffset >= 0;
+            requires srcOffset + BytesPerBlock <= srcBuffer.Length;
+        {
+            uint line = GetCacheLine(blockId);
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+            ulong sectorId = BlockToSectorId(blockId);
+
+            // Take cache line lock
+            Monitor.Enter(cacheLine);
+
+          retry:
+            int nodeIndex;
+
+            CandidateResult cr = GetCandidateNode(cacheLine,
+                                                  cacheTicks[line],
+                                                  sectorId,
+                                                  out nodeIndex);
+            if (cr == CandidateResult.NodeBlocked) {
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+            else if (cr == CandidateResult.CacheLineBlocked) {
+                // Wake up thread that flushes blocks to disk and wait
+                // for notification that block state has changed.
+                blockWriter.WakeUp();
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+            assert (cr == CandidateResult.FoundExact ||
+                    cr == CandidateResult.FoundVictim);
+            assert ((cacheLine[nodeIndex].SectorId == sectorId &&
+                     // Node has correct sector id, so is dirty/clean/unused
+                     (cacheLine[nodeIndex].State == NodeState.Dirty ||
+                      cacheLine[nodeIndex].State == NodeState.Clean ||
+                      cacheLine[nodeIndex].State == NodeState.Unused)) ||
+                    // Node is about to be reassigned, so is clean/unused
+                    (cacheLine[nodeIndex].State == NodeState.Clean ||
+                     cacheLine[nodeIndex].State == NodeState.Unused));
+
+            byte []! in ExHeap blockData = cacheLine[nodeIndex].Acquire();
+
+            NodeState oldState = cacheLine[nodeIndex].State;
+
+            cacheLine[nodeIndex].AcquiredSetSectorId(sectorId);
+            Bitter.Copy(blockData, 0, (int)BytesPerBlock,
+                        srcBuffer, (int)srcOffset);
+            cacheLine[nodeIndex].Release(blockData, NodeState.Dirty,
+                                         cacheTicks[line]++);
+
+            if (cacheLine[nodeIndex].State != oldState)
+            {
+                // NB cookie is index
+                // in cache line of node.
+                blockWriter.Enqueue(this,
+                                    cacheLine[nodeIndex].SectorId,
+                                    nodeIndex);
+            }
+
+            // Drop cache line lock
+            Monitor.Exit(cacheLine);
+            return;
+        }
+
+        /// <remarks> Creates a zero-filled block in the cache. </remarks>
+        internal void ZeroBlock(uint blockId)
+        {
+            uint line = GetCacheLine(blockId);
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+            ulong sectorId = BlockToSectorId(blockId);
+
+            // Take cache line lock
+            Monitor.Enter(cacheLine);
+
+          retry:
+            int nodeIndex;
+            CandidateResult cr = GetCandidateNode(cacheLine,
+                                                  cacheTicks[line],
+                                                  sectorId,
+                                                  out nodeIndex);
+            if (cr == CandidateResult.NodeBlocked) {
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+            else if (cr == CandidateResult.CacheLineBlocked) {
+                // Wake up thread that flushes blocks to disk and wait
+                // for notification that block state has changed.
+                blockWriter.WakeUp();
+                Monitor.Wait(cacheLine);
+                goto retry;
+            }
+            assert (cr == CandidateResult.FoundExact ||
+                    cr == CandidateResult.FoundVictim);
+            assert ((cacheLine[nodeIndex].SectorId == sectorId &&
+                     // Node has correct sector id, so is dirty/clean/unused
+                     (cacheLine[nodeIndex].State == NodeState.Dirty ||
+                      cacheLine[nodeIndex].State == NodeState.Clean ||
+                      cacheLine[nodeIndex].State == NodeState.Unused)) ||
+                    // Node is about to be reassigned, so is clean/unused
+                    (cacheLine[nodeIndex].State == NodeState.Clean ||
+                     cacheLine[nodeIndex].State == NodeState.Unused));
+
+            byte []! in ExHeap blockData = cacheLine[nodeIndex].Acquire();
+
+            NodeState oldState = cacheLine[nodeIndex].State;
+
+            cacheLine[nodeIndex].AcquiredSetSectorId(sectorId);
+            Bitter.Zero(blockData, 0, (int)BytesPerBlock);
+            cacheLine[nodeIndex].Release(blockData, NodeState.Dirty,
+                                         cacheTicks[line]++);
+
+            if (cacheLine[nodeIndex].State != oldState)
+            {
+                // NB cookie is index
+                // in cache line of node.
+                blockWriter.Enqueue(this,
+                                    cacheLine[nodeIndex].SectorId,
+                                    nodeIndex);
+            }
+
+            // Drop cache line lock
+            Monitor.Exit(cacheLine);
+            return;
+        }
+
+        internal void Write(uint              blockId,
+                            int               blockOffset,
+                            byte[]! in ExHeap srcBuffer,
+                            int               srcOffset,
+                            int               writeBytes)
+            requires blockId < TotalBlocks;
+            requires blockOffset >= 0;
+            requires srcOffset >= 0;
+            requires writeBytes >= 0;
+            requires blockOffset + writeBytes <= this.BytesPerBlock;
+            requires srcOffset + writeBytes <= srcBuffer.Length;
+        {
+            if (writeBytes < BytesPerBlock) {
+                byte[]! in ExHeap blockData = BeginQuickBlockOperation(blockId);
+
+                Bitter.Copy(blockData, blockOffset, writeBytes,
+                            srcBuffer, srcOffset);
+
+                EndQuickBlockOperation(blockId, blockData, true);
+            }
+            else {
+                WriteEntireBlock(blockId, srcBuffer, srcOffset);
+            }
+        }
+
+        byte[]! in ExHeap
+        IBlockWriterUser.GetDataForWrite(ulong sectorId, int cookie)
+        {
+            uint line = GetCacheLine(SectorToBlockId(sectorId));
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+
+            Monitor.Enter(cacheLine);
+
+            // Cookie is index in cache line of node.
+            int nodeIndex = cookie;
+
+            // Node should not have moved
+            // and should be dirty.
+            assert nodeIndex >= 0 && nodeIndex <= cacheLine.Length;
+            assert cacheLine[nodeIndex].SectorId == sectorId;
+            assert (cacheLine[nodeIndex].State == NodeState.Dirty ||
+                    cacheLine[nodeIndex].State == NodeState.DirtyBorrowed);
+
+            while (cacheLine[nodeIndex].State == NodeState.DirtyBorrowed) {
+                Monitor.Wait(cacheLine);
+            }
+
+            byte[]! in ExHeap blockData = cacheLine[nodeIndex].Acquire();
+            cacheLine[nodeIndex].AcquiredTransition(NodeState.WritePending,
+                                                    cacheTicks[line]++);
+            Monitor.Exit(cacheLine);
+            return blockData;
+        }
+
+        void
+        IBlockWriterUser.WriteComplete(ulong                      sectorId,
+                                       [Claims] byte[]! in ExHeap blockData,
+                                       int                        cookie)
+        {
+            uint line = GetCacheLine(SectorToBlockId(sectorId));
+            BlockCacheNode[]! cacheLine = (!) cache[line];
+
+            Monitor.Enter(cacheLine);
+
+            // Cookie is index in cache line of node.
+            int nodeIndex = cookie;
+
+            // Node should not have moved
+            // and should be pending write completion.
+            assert nodeIndex >= 0 && nodeIndex <= cacheLine.Length;
+            assert cacheLine[nodeIndex].SectorId == sectorId;
+            assert cacheLine[nodeIndex].State == NodeState.WritePending;
+
+            cacheLine[nodeIndex].Release(blockData,
+                                         NodeState.Clean,
+                                         cacheTicks[line]++);
+            // Notify any waiters of clean node presence
+            Monitor.Pulse(cacheLine);
+
+            Monitor.Exit(cacheLine);
+        }
+
+        internal void ValidateAllClean()
+        {
+            assert this.cache != null;
+            bool failed = false;
+            for (int line = 0; line < this.cache.Length; line++) {
+                BlockCacheNode []! bcns = (!)cache[line];
+                for (int i = 0; i < bcns.Length; i++) {
+                    if (bcns[i].State == NodeState.Unused &&
+                        bcns[i].State == NodeState.Clean) {
+                        DebugStub.Print("Failed on node[{0}][{1}] (sectorId {2}) -> {3}\n",
+                                        __arglist(line, i,
+                                                  bcns[i].SectorId,
+                                                  bcns[i].State));
+                        failed = true;
+                    }
+                }
+            }
+            assert !failed;
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Static helper methods
+
+        private static int Log2(uint value)
+        {
+            int l = 0;
+            if ((value & 0xffff0000u) != 0) {
+                l += 16;
+                value >>= 16;
+            }
+            if ((value & 0xff00ff00u) != 0) {
+                l += 8;
+                value >>= 8;
+            }
+            if ((value & 0xf0f0f0f0) != 0) {
+                l += 4;
+                value >>= 4;
+            }
+            if ((value & 0xcccccccc) != 0) {
+                l += 2;
+                value >>= 2;
+            }
+            if ((value & 0xaaaaaaaa) != 0) {
+                l += 1;
+                value >>= 1;
+            }
+            return l;
+        }
+
+        /// <remarks>
+        /// Computes cache dimensions from cache configuration.
+        /// Output values are both powers of 2.
+        /// </remarks>
+        private static void SizeCache(ref BlockCacheConfiguration config,
+                                      out uint stride,
+                                      out uint associativity)
+        {
+            uint maxBlocks = config.MaxCacheKB * 1024 / config.BytesPerBlock;
+            if (maxBlocks > config.TotalBlocks) {
+                maxBlocks = config.TotalBlocks;
+            }
+
+            if (maxBlocks == 0) {
+                stride        = 1;
+                associativity = 1;
+            }
+            else {
+                stride = 0;
+                associativity = 64;
+                while (stride == 0) {
+                    associativity /= 2;
+                    stride = maxBlocks / associativity;
+                }
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/BlockIndex.sg b/base/Services/Fat/Fs/BlockIndex.sg
new file mode 100644
index 0000000..16b89a5
--- /dev/null
+++ b/base/Services/Fat/Fs/BlockIndex.sg
@@ -0,0 +1,532 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BlockIndex.sg
+//
+//  Note:
+//          The BlockIndex is used to provide fast block location within
+//  files and directories.  Its structure is fairly similar to the direct
+//  and indirect blocks of a traditional inode.
+//
+//  The maximum size of a FAT file is 4GB.  The code support 3 levels
+//  of indirection.  The direct block fan out is 32 and the
+//  indirect block fan out is 64.  On the third indirection we can
+//  address all of a 4GB file with 512 byte clusters:
+//
+//  Addressable region = 32 * 64^3 * 512 == 4GB
+//
+//  In practice, we should expect to see 4k cluster sizes and upwards.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class BlockIndex
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Internal class definitions
+
+        internal abstract class BaseBlock
+        {
+        }
+
+        internal sealed class DirectBlock : BaseBlock
+        {
+            internal const int Shift    = 6;
+            internal const int MaxItems = 1 << Shift;
+
+            private int []! items;
+
+            internal DirectBlock()
+            {
+                items = new int [MaxItems];
+                base();
+            }
+
+            public int this[int index]
+            {
+                get { return items[index]; }
+                set { items[index] = value; }
+            }
+        }
+
+        internal sealed class IndirectBlock : BaseBlock
+        {
+            internal const int Shift    = 7;
+            internal const int MaxItems = 1 << Shift;
+
+            private BaseBlock [] items;
+
+            internal IndirectBlock()
+            {
+                items = new BaseBlock [MaxItems];
+            }
+
+            public BaseBlock this[int index]
+            {
+                get { return items[index]; }
+                set { Debug.Assert(items[index] == null); items[index] = value; }
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        private const int MaxIndirects = 3;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Members
+
+        int           count;
+        readonly int  maxCount;
+        DirectBlock   direct;
+        IndirectBlock [] indirects;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal BlockIndex()
+        {
+            this.indirects = new IndirectBlock[MaxIndirects];
+            this.direct = new DirectBlock();
+
+            maxCount = DirectBlock.MaxItems;
+            int delta = IndirectBlock.MaxItems * DirectBlock.MaxItems;
+            for (int i = 0; i < MaxIndirects; i++) {
+                maxCount += delta;
+                delta *= IndirectBlock.MaxItems;
+            }
+        }
+
+        static private int DirectOffset(int value)
+        {
+            return value & ((1 << DirectBlock.Shift) - 1);
+        }
+
+        static private int IndirectOffset(int maxDepth, int depth, int value)
+        {
+            value >>= DirectBlock.Shift;
+            value >>= (IndirectBlock.Shift * (maxDepth - depth));
+            return value & ((1 << IndirectBlock.Shift) - 1);
+        }
+
+        /// <summary>
+        /// Accessor providing number of blocks indexed.
+        /// </summary>
+        internal int Count { get { return count; } }
+
+        /// <summary>
+        /// Lookup the block id of the nth block in the index.
+        ///
+        /// <returns> true if block exists in index,
+        /// false otherwise. </returns>
+        /// </summary>
+        internal bool Lookup(int nthBlock, out int blockId)
+        {
+            if (count <= nthBlock) {
+                blockId = Int32.MinValue;
+                return false;
+            }
+
+            // Check if block is in direct blocks
+            if (nthBlock < DirectBlock.MaxItems) {
+                blockId = direct[nthBlock];
+                return true;
+            }
+            nthBlock -= DirectBlock.MaxItems;
+
+            // Must be an indirect block.  Find which indirect block to
+            // start from.
+            int threshold  = IndirectBlock.MaxItems * DirectBlock.MaxItems;
+            int depth      = 0;
+
+            while (nthBlock >= threshold)
+            {
+                nthBlock  -= threshold;
+                threshold *= IndirectBlock.MaxItems;
+                depth++;
+            }
+
+            // Walk from root indirect block down to block containing
+            // appropriate direct block.
+            IndirectBlock! ib = (!) indirects[depth];
+            for (int i = 0; i < depth; i++) {
+                ib = (IndirectBlock!) ib[IndirectOffset(depth, i, nthBlock)];
+            }
+
+            // Get entry in direct block and pray for forgiveness.
+            DirectBlock! db =
+                (DirectBlock)(!)ib[IndirectOffset(depth, depth, nthBlock)];
+            blockId = db[DirectOffset(nthBlock)];
+
+            return true;
+        }
+
+        private bool ScanDirectBlockForId(DirectBlock! db,
+                                          int          blockLength,
+                                          int          blockId,
+                                          out int      dbIndex)
+        {
+            for (dbIndex = 0; dbIndex < blockLength; dbIndex++) {
+                if (db[dbIndex] == blockId) {
+                    return true;
+                }
+            }
+            dbIndex = -1;
+            return false;
+        }
+
+        private bool ScanIndirectBlockForId(int             depth,
+                                            IndirectBlock!  idb,
+                                            int             done,
+                                            int             stepSize,
+                                            int             blockId,
+                                            out DirectBlock db,
+                                            out int         dbIndex,
+                                            out int         absoluteIndex)
+        {
+            if (depth == 0) {
+                int i = 0;
+                while (i < IndirectBlock.MaxItems && done < this.count) {
+                    db = (!)((DirectBlock)idb[i]);
+                    if (ScanDirectBlockForId(db,
+                                             Math.Min(this.count - done,
+                                                      DirectBlock.MaxItems),
+                                             blockId, out dbIndex)) {
+                        absoluteIndex = done + dbIndex;
+                        return true;
+                    }
+                    done += stepSize;
+                    i++;
+                }
+            }
+            else {
+                int i = 0;
+                while (i < IndirectBlock.MaxItems && done < this.count) {
+                    IndirectBlock! child = (IndirectBlock!) idb[i];
+                    int childStepSize    = stepSize / IndirectBlock.MaxItems;
+                    if (ScanIndirectBlockForId(depth - 1, child,
+                                               done, childStepSize, blockId,
+                                               out db,
+                                               out dbIndex,
+                                               out absoluteIndex)) {
+                        return true;
+                    }
+                    done += stepSize;
+                    i++;
+                }
+            }
+
+            db            = null;
+            dbIndex       = 0;
+            absoluteIndex = 0;
+
+            return false;
+        }
+
+        private bool FindId(int blockId,
+                            out DirectBlock db,
+                            out int         dbIndex,
+                            out int         absoluteIndex)
+        {
+            db            = null;
+            dbIndex       = -1;
+            absoluteIndex = -1;
+
+            // NB need to watch end of index bounds
+            if (ScanDirectBlockForId(this.direct,
+                                     Math.Min(count, DirectBlock.MaxItems),
+                                     blockId, out dbIndex)) {
+                db = this.direct;
+                absoluteIndex = dbIndex;
+                return true;
+            }
+
+            if (this.count <= DirectBlock.MaxItems) {
+                return false;
+            }
+
+            int done  = DirectBlock.MaxItems;
+            int step  = DirectBlock.MaxItems;
+            int depth = 0;
+            while (done < this.count) {
+                IndirectBlock! idb = (!)((IndirectBlock)this.indirects[depth]);
+                if (ScanIndirectBlockForId(
+                        depth, idb, done, step, blockId,
+                        out db, out dbIndex, out absoluteIndex)
+                    ) {
+                    return true;
+                }
+                depth++;
+                step *= IndirectBlock.MaxItems;
+                done += step;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Replace bad block id with new block id.
+        /// </summary>
+        ///
+        /// <para> This method performs a linear search through the
+        /// known block id's and replaces the target id if found.
+        /// </para>
+        internal bool Replace(int oldBlockId, int newBlockId)
+        {
+            DirectBlock db;
+            int         dbIndex;
+            int         absIndex;
+            if (FindId(oldBlockId, out db, out dbIndex, out absIndex)) {
+                assert db != null;
+                assert dbIndex >= 0 && dbIndex < DirectBlock.MaxItems;
+                assert db[dbIndex] == oldBlockId;
+                db[dbIndex] = newBlockId;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Truncate at specified block id.  Remove blockId and all block
+        /// id's later in index.
+        /// </summary>
+        ///
+        /// <para> This method performs a linear search through
+        /// the known block id's truncates the collection at the
+        /// specified point if found.
+        /// </para>
+        internal bool TruncateAtBlockId(int lastBlockId)
+        {
+            DirectBlock db;
+            int         dbIndex;
+            int         absIndex;
+            if (FindId(lastBlockId, out db, out dbIndex, out absIndex)) {
+                assert absIndex >= 0 && absIndex < count;
+                assert db != null;
+                assert db[dbIndex] == lastBlockId;
+                this.count = absIndex;
+                return true;
+            }
+            return false;
+        }
+
+        internal bool TruncateToLength(int clusterLength)
+            requires clusterLength >= 0 && clusterLength <= this.Count;
+        {
+            this.count = clusterLength;
+            return true;
+        }
+
+        /// <summary>
+        /// Append blockId at end of index.
+        ///
+        /// The caller should check that file being added does not push
+        /// the file size over FAT's maximum supported size (4GB).
+        /// </summary>
+        internal bool Append(int blockId)
+        {
+            if (this.count == this.maxCount) {
+                return false;
+            }
+
+            int nthBlock = this.count;
+            this.count++;
+
+            // Check if we can place this in direct block
+            if (nthBlock < DirectBlock.MaxItems) {
+                if (this.direct == null) this.direct = new DirectBlock();
+                this.direct[nthBlock] = blockId;
+                return true;
+            }
+
+            // Must be placed in an indirect block.  Find which
+            // indirect block to start search from.
+            nthBlock -= DirectBlock.MaxItems;
+            int threshold = IndirectBlock.MaxItems * DirectBlock.MaxItems;
+            int depth = 0;
+            while (nthBlock >= threshold)
+            {
+                nthBlock  -= threshold;
+                threshold *= IndirectBlock.MaxItems;
+                depth++;
+            }
+
+            if (indirects[depth] == null) {
+                indirects[depth] = new IndirectBlock();
+            }
+
+            // Walk from root indirect block down to block containing
+            // appropriate direct block.
+            IndirectBlock ib = indirects[depth];
+            for (int i = 0; i < depth; i++) {
+                int offset = IndirectOffset(depth, i, nthBlock);
+                if (((!)ib)[offset] == null) {
+                    IndirectBlock tmp = new IndirectBlock();
+                    ib[offset] = tmp;
+                    ib = tmp;
+                }
+                else {
+                    ib = (IndirectBlock)ib[offset];
+                }
+            }
+
+            // Allocate direct block if it does not exist
+            int lastOffset = IndirectOffset(depth, depth, nthBlock);
+            DirectBlock db;
+            if (((!)ib)[lastOffset] == null) {
+                db = new DirectBlock();
+                ib[lastOffset] = db;
+            }
+            else {
+                db = (DirectBlock)ib[lastOffset];
+            }
+
+            // Set entry in direct block and run.
+            ((!)db)[DirectOffset(nthBlock)] = blockId;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Append series of blockId's at end of index.
+        /// </summary>
+        /// <returns> true on success, false if capacity would be exceeded.
+        /// </returns>
+        internal bool Append(int startBlockId, int length)
+            requires length >= 1;
+        {
+            if (this.count + length >= this.maxCount) {
+                return false;
+            }
+
+            int done = 0;
+            while (done != length) {
+                if (this.Append(startBlockId + done) == false) {
+                    // This shouldn't happen.
+                    goto undo;
+                }
+                done++;
+            }
+            return true;
+
+          undo:
+            this.count -= done;
+            return false;
+        }
+
+#if TEST
+        private static void TestLookup()
+        {
+            Console.WriteLine("Testing Lookup.");
+
+            const int MaxLookupItems = 4 * 1024 * 1024;
+            const int TickPeriod = 1000000;
+
+            BlockIndex bi = new BlockIndex();
+
+            for (int i = 0; i < bi.maxCount; i++) {
+                bi.Append(i);
+                int j;
+                bool r = bi.Lookup(i, out j);
+                Debug.Assert(i == j);
+                Debug.Assert(r == true);
+                Debug.Assert(bi.Lookup(i + 1, out j) == false);
+                if ((i % TickPeriod) == 0) Console.Write(".");
+            }
+
+            Debug.Assert(bi.Append(0) == false);
+
+            for (int i = 0; i < MaxLookupItems; i++) {
+                int u = bi.Count - i - 1;
+                int j;
+                bool r = bi.Lookup(u, out j);
+                Debug.Assert(r == true);
+                Debug.Assert(j == u);
+                if ((i % TickPeriod) == 0) Console.Write("o");
+            }
+
+            Debug.Assert(bi.Append(0) == false);
+
+            for (int i = 0; i < MaxLookupItems; i++) {
+                int u = (7 * i) % MaxLookupItems;
+                int j;
+                bool r = bi.Lookup(u, out j);
+                Debug.Assert(r == true);
+                Debug.Assert(j == u);
+                if ((i % TickPeriod) == 0) Console.Write("O");
+            }
+            Console.Write("\n");
+        }
+
+        static private void TestTruncate()
+        {
+            Console.WriteLine("Testing Truncate.");
+
+            const int MaxTruncateItems = 4 * 1024 * 1024;
+
+            BlockIndex bi = new BlockIndex();
+            for (int i = 0; i < MaxTruncateItems; i++) {
+                bi.Append(i);
+            }
+
+            Debug.Assert(!bi.TruncateAtBlockId(MaxTruncateItems));
+
+            int done  = 0;
+            int where = bi.Count - 1;
+            do {
+                Debug.Assert(where < bi.Count);
+                bool r = bi.TruncateAtBlockId(where);
+                Debug.Assert(r == true);
+                Debug.Assert(bi.Count == where);
+                done++;
+                where = Math.Max((bi.Count * 97 / 100) - 1, 0);
+            } while (bi.Count > 0);
+
+            Debug.Assert(!bi.TruncateAtBlockId(MaxTruncateItems));
+        }
+
+        static private void TestReplace()
+        {
+            Console.WriteLine("Testing Replace.");
+
+            const int MaxReplaceItems = 4 * 1024 * 1024;
+
+            BlockIndex bi = new BlockIndex();
+            for (int i = 0; i < MaxReplaceItems; i++) {
+                bi.Append(i);
+            }
+
+            Debug.Assert(!bi.Replace(MaxReplaceItems, MaxReplaceItems));
+
+            int done = 0;
+            int where = MaxReplaceItems - 1;
+            while (where >= 0) {
+                int newWhere = MaxReplaceItems + where;
+                bi.Replace(where, newWhere);
+
+                int checkWhere = 0;
+                bi.Lookup(where, out checkWhere);
+                Debug.Assert(checkWhere == newWhere);
+
+                where = (where * 98 / 100) - 1;
+                done++;
+            }
+
+            Debug.Assert(!bi.Replace(MaxReplaceItems, MaxReplaceItems));
+        }
+
+        static public void Main()
+        {
+            TestTruncate();
+            TestReplace();
+            TestLookup();
+        }
+#endif // TEST
+    }
+}
diff --git a/base/Services/Fat/Fs/BlockWriter.sg b/base/Services/Fat/Fs/BlockWriter.sg
new file mode 100644
index 0000000..db9b81e
--- /dev/null
+++ b/base/Services/Fat/Fs/BlockWriter.sg
@@ -0,0 +1,328 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   BlockWriter.sg
+//
+//  Note:
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    public interface IBlockWriterUser
+    {
+        /// <remarks>
+        /// This method is called immediately before the
+        /// BlockWriter attempts to write the data to disk.  The
+        /// receiver must give up the associated buffer.
+        /// </remarks>
+        byte[]! in ExHeap GetDataForWrite(ulong sectorId,
+                                          int   cookie);
+
+        /// <remarks>
+        /// This method is called by the BlockWriter when the data
+        /// has been written to the disk.
+        /// </remarks>
+        void WriteComplete(ulong                      sectorId,
+                           [Claims] byte[]! in ExHeap buffer,
+                           int                        cookie);
+    }
+
+    internal sealed class RequestQueue
+    {
+        private struct Request
+        {
+            IBlockWriterUser! user;
+            ulong             sectorId;
+            int               userCookie;
+
+            public Request(IBlockWriterUser! theUser,
+                           ulong             theSectorId,
+                           int               theUserCookie)
+            {
+                this.user       = theUser;
+                this.sectorId   = theSectorId;
+                this.userCookie = theUserCookie;
+            }
+
+            public IBlockWriterUser! User   { get { return user; } }
+            public ulong SectorId           { get { return sectorId; } }
+            public int UserCookie           { get { return userCookie; } }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Fields
+
+        Request[] requests;
+        int head;
+        int length;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Invariants
+
+        // invariant head >= 0 && head <= requests.Length;
+        // invariant length >= 0 && length <= requests.Length;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal RequestQueue(uint maxLength)
+            requires maxLength >= 0;
+        {
+            requests = new Request[maxLength];
+            head     = 0;
+            length   = 0;
+        }
+
+        internal int MaxLength
+        {
+            get { return requests.Length; }
+        }
+
+        internal int Length
+        {
+            get { return length; }
+        }
+
+        internal bool Full
+        {
+            get { return length == requests.Length; }
+        }
+
+        internal bool Empty
+        {
+            get { return length == 0; }
+        }
+
+        internal void Enqueue(IBlockWriterUser! user,
+                              ulong             theSectorId,
+                              int               userCookie)
+            requires (Full == false);
+            ensures (Length == old(Length) + 1);
+        {
+            int index = (head + length) % requests.Length;
+            requests[index] = new Request(user, theSectorId, userCookie);
+            length++;
+        }
+
+        internal void Dequeue(out IBlockWriterUser user,
+                              out ulong            sectorId,
+                              out int              userCookie)
+            requires Length != 0;
+            ensures  Length == old(Length) - 1;
+        {
+            user       = requests[head].User;
+            sectorId   = requests[head].SectorId;
+            userCookie = requests[head].UserCookie;
+            head   = (head + 1) % MaxLength;
+            length = length - 1;
+        }
+    }
+
+    /// <summary>
+    /// Block writer is responsible for writing blocks to disk.
+    /// It may operate synchronously or asynchronously.  When
+    /// synchronous, all writes occur immediately.  When
+    /// asynchronous they are performed when the request queue
+    /// over flows or when the periodic worker thread is woken
+    /// up.
+    /// </summary>
+    internal sealed class BlockWriter
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        private const int MinimumSleepSecs = 5;
+        private const int MaximumSleepSecs = 15;
+        private const int RangeSleepSecs = MaximumSleepSecs - MinimumSleepSecs;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Fields
+
+        AutoResetEvent   wakeEvent;
+        volatile bool    shutdown;
+        Disk             disk;
+        RequestQueue     requestQueue;
+        Thread           worker;
+
+        bool             writesAllowed;     // Sanity check for RO mount
+        bool             diskDirtied;       // Data written to disk
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal BlockWriter(Disk theDisk,
+                             uint maxQueueLength,   // Synchronous if zero
+                             bool areWritesAllowed)
+        {
+            this.wakeEvent     = new AutoResetEvent(false);
+            this.shutdown      = false;
+            this.disk          = theDisk;
+            this.diskDirtied   = false;
+            this.requestQueue  = new RequestQueue(maxQueueLength);
+            this.writesAllowed = areWritesAllowed;
+
+            if (requestQueue.MaxLength > 0) {
+                worker = new Thread(new ThreadStart(WorkerMain));
+                worker.Start();
+            }
+        }
+
+        internal void Shutdown()
+        {
+            lock (this) {
+                shutdown = true;
+            }
+
+            if (worker != null) {
+                wakeEvent.Set();
+                worker.Join();
+                worker = null;
+            }
+
+            if (this.diskDirtied) {
+                assert FatVolume.Fat.CleanShutdown == false;
+
+                if (FatVolume.FatVersion == FatVersion.Fat32) {
+                    Fat32 fat32 = (Fat32)FatVolume.Fat;
+                    fat32.UpdateFsInfo32();
+                }
+
+                // The following method sets the appropriate bit
+                // in the FAT(s), which will ripple down as a
+                // dirty blocks in the cache for FAT16 and FAT32
+                // (FAT12 does not record clean shutdown)
+                FatVolume.Fat.CleanShutdown = true;
+
+                // Synchronously flush the queue as the worker
+                // thread has exited.
+                int done = this.FlushQueue();
+                assert done >= 1 || FatVolume.FatVersion == FatVersion.Fat12;
+            }
+        }
+
+        private void WorkerMain()
+        {
+            Random rng = new Random();
+
+            while (shutdown == false) {
+                int secs = MinimumSleepSecs + (rng.Next() % RangeSleepSecs);
+                wakeEvent.WaitOne(TimeSpan.FromSeconds(secs));
+                Tracing.Log(Tracing.Debug, "BlockWriter worker flushing.");
+
+                if (this.diskDirtied &&
+                    FatVolume.FatVersion == FatVersion.Fat32) {
+                    // Update free space estimate.  This might be done
+                    // more conditionally, ie check whether free space has
+                    // changed.
+                    Fat32 fat32 = (Fat32)FatVolume.Fat;
+                    fat32.UpdateFsInfo32();
+                }
+
+                FlushQueue();
+            }
+        }
+
+        private int FlushQueue()
+        {
+            int done = 0;
+            for (;;) {
+                IBlockWriterUser user = null;
+                ulong            sectorId;
+                int              userCookie;
+
+                lock (this) {
+                    // We might want to be
+                    // smart and re-order write requests here or
+                    // add ordering to requests made to disk.
+                    //
+                    // We also want to look at changing
+                    // the disk driver interface to support scatter-gather
+                    // writes so we can write consecutive blocks back-to-back
+                    // and avoid unnecessary seeks.
+                    if (requestQueue.Empty)
+                        break;
+                    requestQueue.Dequeue(out user, out sectorId, out userCookie);
+                }
+                if (user != null) {
+                    WriteBlock(user, sectorId, userCookie);
+                    done++;
+                }
+            }
+            return done;
+        }
+
+        private void WriteBlock(IBlockWriterUser! user,
+                                ulong             sectorId,
+                                int               cookie)
+        {
+            assert writesAllowed == true;
+
+            if (this.diskDirtied == false) {
+                FatVolume.Fat.CleanShutdown = false;
+                this.diskDirtied = true;
+            }
+
+            //            DebugStub.Print("Writing sector {0}\n",
+            //              __arglist(sectorId));
+
+            byte[]! in ExHeap data = user.GetDataForWrite(sectorId, cookie);
+
+            byte[] in ExHeap doneData = disk.Write(sectorId, data);
+            user.WriteComplete(sectorId, (!) doneData, cookie);
+        }
+
+        internal bool Enqueue(IBlockWriterUser! user,
+                              ulong             sectorId,
+                              int               userCookie)
+        {
+            assert writesAllowed == true;
+
+            IBlockWriterUser pushUser       = null;
+            ulong            pushSectorId   = 0;
+            int              pushUserCookie = 0;
+
+            if (requestQueue.MaxLength == 0) {
+                // Queue has no capacity so we're synchronous and
+                // will need to push this write to disk
+                pushUser       = user;
+                pushSectorId   = sectorId;
+                pushUserCookie = userCookie;
+            }
+            else {
+                lock (this) {
+                    // We're async, and need to push head from queue if
+                    // queue overflows.
+                    if (requestQueue.Full) {
+                        requestQueue.Dequeue(out pushUser,
+                                             out pushSectorId,
+                                             out pushUserCookie);
+                    }
+                    requestQueue.Enqueue(user, sectorId, userCookie);
+                }
+            }
+
+            if (pushUser != null) {
+                Tracing.Log(Tracing.Audit,
+                            "Request enqueue pushed block to disk.");
+                WriteBlock(pushUser, pushSectorId, pushUserCookie);
+            }
+
+            return true;
+        }
+
+        internal void WakeUp()
+        {
+            wakeEvent.Set();
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/ChannelIo.sg b/base/Services/Fat/Fs/ChannelIo.sg
new file mode 100644
index 0000000..9ab31e2
--- /dev/null
+++ b/base/Services/Fat/Fs/ChannelIo.sg
@@ -0,0 +1,446 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ChannelIo.sg
+//
+
+using Microsoft.Singularity.Directory;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+using System;
+using System.Collections;
+using System.Threading;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    using ThreadPool = FatThreadPool;
+    using DirectoryContract = DirectoryServiceContract;
+
+    /// <summary>
+    /// The ChannelIoFeedbackContract provides a means of
+    /// interrupting the main request dispatcher thread to
+    /// either do useful work or instruct it to stop.
+    /// </summary>
+    internal contract ChannelIoFeedBackContract
+    {
+        in message  PollWaitingTuples();
+        out message AckPollWaitingTuples();
+
+        state RUNNING : one
+        {
+            PollWaitingTuples? -> AckPollWaitingTuples! -> RUNNING;
+        }
+    }
+
+    /// <summary>
+    /// Tuple for File endpoint and object instance.
+    ///
+    /// Used to store directory endpoint and object when an
+    /// asynchronous command has finished using them.
+    /// </summary>
+    internal class DirectoryTuple
+    {
+        TRef<DirectoryContract.Exp:Ready> dirExpHolder;
+        Directory directory;
+
+        internal DirectoryTuple([Claims] DirectoryContract.Exp:Ready! dirExp,
+                                Directory!                            directory)
+        {
+            this.dirExpHolder = new TRef<DirectoryContract.Exp:Ready>(dirExp);
+            this.directory    = directory;
+        }
+
+        internal DirectoryContract.Exp:Ready! AcquireDirectoryEndpoint()
+        {
+            return dirExpHolder.Acquire();
+        }
+
+        internal Directory! AcquireDirectory()
+        {
+            assert this.directory != null;
+            Directory! ret = this.directory;
+            this.directory = null;
+            return ret;
+        }
+    }
+
+    /// <summary>
+    /// Tuple for File endpoint and object instance.
+    ///
+    /// Used to store file endpoint and object when an
+    /// asynchronous command has finished using them.
+    /// </summary>
+    internal class FileTuple
+    {
+        TRef<FileContract.Exp:Ready> fileExpHolder;
+        File file;
+
+        internal FileTuple([Claims] FileContract.Exp:Ready! fileExp,
+                           File!                            file)
+        {
+            this.fileExpHolder = new TRef<FileContract.Exp:Ready>(fileExp);
+            this.file          = file;
+        }
+
+        internal FileContract.Exp:Ready! AcquireFileEndpoint()
+        {
+            return fileExpHolder.Acquire();
+        }
+
+        internal File! AcquireFile()
+        {
+            assert this.file != null;
+            File! ret = this.file;
+            this.file = null;
+            return ret;
+        }
+    }
+
+    internal sealed class ChannelIo
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+        private const int WorkerThreads = 8;
+        private const int MaxWorkItems  = 32 * WorkerThreads;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Member variables
+
+        TRef<FatClientContract.Exp:Running>         mgrExpTRef;
+        TRef<ServiceProviderContract.Exp:Start>     spExpTRef;
+        TRef<ChannelIoFeedBackContract.Exp:RUNNING> feedbackExpTRef;
+        TRef<ChannelIoFeedBackContract.Imp:RUNNING> feedbackImpTRef;
+
+        Queue fileTupleQueue = new Queue();
+        Queue dirTupleQueue  = new Queue();
+
+        ThreadPool threadPool;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        [ Microsoft.Contracts.NotDelayed ]
+        internal ChannelIo(
+            [Claims] FatClientContract.Exp:Running!     managerExp,
+            [Claims] ServiceProviderContract.Exp:Start! spExp
+            )
+        {
+            spExpTRef  = new TRef<ServiceProviderContract.Exp:Start>(spExp);
+            mgrExpTRef = new TRef<FatClientContract.Exp:Running>(managerExp);
+
+            ChannelIoFeedBackContract.Imp! feedbackImp;
+            ChannelIoFeedBackContract.Exp! feedbackExp;
+            ChannelIoFeedBackContract.NewChannel(out feedbackImp,
+                                                 out feedbackExp);
+            feedbackImpTRef =
+                new TRef<ChannelIoFeedBackContract.Imp:RUNNING(feedbackImp);
+            feedbackExpTRef =
+                new TRef<ChannelIoFeedBackContract.Exp:RUNNING(feedbackExp);
+
+            threadPool = new ThreadPool(WorkerThreads, MaxWorkItems);
+        }
+
+        internal void EnqueueTuple(
+            [Claims] FileContract.Exp:Ready! fileExp,
+            File!                            file,
+            bool                             wakeUp
+            )
+        {
+            FileTuple t = new FileTuple(fileExp, file);
+            lock (fileTupleQueue) {
+                fileTupleQueue.Enqueue(t);
+            }
+
+            if (wakeUp) {
+                ChannelIoFeedBackContract.Imp f = feedbackImpTRef.Acquire();
+                f.SendPollWaitingTuples();
+                f.RecvAckPollWaitingTuples();
+                feedbackImpTRef.Release(f);
+            }
+        }
+
+        internal void
+        EnqueueTuple(
+            [Claims] DirectoryContract.Exp:Ready! directoryExp,
+            Directory!                            directory,
+            bool                                  wakeUp
+            )
+        {
+            DirectoryTuple t = new DirectoryTuple(directoryExp, directory);
+            lock (dirTupleQueue) {
+                dirTupleQueue.Enqueue(t);
+            }
+
+            if (wakeUp) {
+                ChannelIoFeedBackContract.Imp f = feedbackImpTRef.Acquire();
+                f.SendPollWaitingTuples();
+                f.RecvAckPollWaitingTuples();
+                feedbackImpTRef.Release(f);
+            }
+        }
+
+        internal void
+        PollAvailableFileTuples(EMap<FileContract.Exp:Ready, File!>! fileMap)
+        {
+            lock (fileTupleQueue) {
+                int remain = fileTupleQueue.Count;
+                while (remain-- > 0) {
+                    FileTuple! t = (!)(FileTuple)fileTupleQueue.Dequeue();
+                    fileMap.Add(t.AcquireFileEndpoint(), t.AcquireFile());
+                }
+            }
+        }
+
+        internal void
+        PollAvailableDirectoryTuples(
+            EMap<DirectoryContract.Exp:Ready, Directory!>! directoryMap
+            )
+        {
+            lock (dirTupleQueue) {
+                int remain = dirTupleQueue.Count;
+                while (remain-- > 0) {
+                    DirectoryTuple! t =
+                        (!)(DirectoryTuple)dirTupleQueue.Dequeue();
+                    directoryMap.Add(t.AcquireDirectoryEndpoint(),
+                                     t.AcquireDirectory());
+                }
+            }
+        }
+
+        private void EnqueueCommand([Claims] AsyncCommand! command)
+        {
+            threadPool.QueueUserWorkItem(command);
+        }
+
+        internal void Run()
+        {
+            ChannelIoFeedBackContract.Exp! feedbackExp =
+                feedbackExpTRef.Acquire();
+
+            FatClientContract.Exp! managerExp = mgrExpTRef.Acquire();
+            ServiceProviderContract.Exp! spExp = spExpTRef.Acquire();
+
+            EMap<DirectoryServiceContract.Exp:Ready, Directory!> dirMap =
+                new EMap<DirectoryServiceContract.Exp:Ready, Directory!>();
+            EMap<FileContract.Exp:Ready, File!> fileMap =
+                new EMap<FileContract.Exp:Ready, File!>();
+
+            bool shutdown = false;
+            try {
+                while (shutdown == false) {
+                    switch receive {
+                        //
+                        // Process-local feedback messages
+                        //
+                        case feedbackExp.PollWaitingTuples():
+                            feedbackExp.SendAckPollWaitingTuples();
+                            PollAvailableDirectoryTuples(dirMap);
+                            PollAvailableFileTuples(fileMap);
+                            break;
+
+                        case feedbackExp.ChannelClosed():
+                            // This should never happen
+                            DebugStub.Break();
+                            shutdown = true;
+                            break;
+
+                        //
+                        // Directory contract endpoint messages
+                        //
+                        case dirExp.Bind(path, serviceExp) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new BindCommand(this, dirExp, dir,
+                                                path, serviceExp)
+                                    );
+                            break;
+
+                        case dirExp.Notify(path, pattern, announce, notifyImp) in dirMap ~> dir:
+                            delete path;
+                            delete pattern;
+                            dirExp.SendNakNotify(
+                                notifyImp,
+                                ErrorCode.ContractNotSupported
+                                );
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.BeginEnumeration() in dirMap ~> dir:
+                            EnqueueCommand(
+                                new EnumerateCommand(this, dirExp, dir)
+                                );
+                            break;
+
+                        case dirExp.GetAttributes(path) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new GetAttributesCommand(this, dirExp, dir,
+                                                         path)
+                                );
+                            break;
+
+                        case dirExp.QueryACL(path, effective) in dirMap ~> dir:
+                            delete path;
+                            dirExp.SendNakQueryACL(ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.Register(path, childImp) in dirMap ~> dir:
+                            delete path;
+                            dirExp.SendNakRegister(childImp,
+                                                   ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.Deregister(path) in dirMap ~> dir:
+                            delete path;
+                            dirExp.SendNakDeregister(ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.CreateDirectory(path) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new CreateDirectoryCommand(this, dirExp, dir,
+                                                           path)
+                                );
+                            break;
+
+                        case dirExp.DeleteDirectory(path) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new DeleteDirectoryCommand(this, dirExp, dir,
+                                                           path)
+                                );
+                            break;
+
+                        case dirExp.CreateFile(path) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new CreateFileCommand(this, dirExp, dir, path)
+                                );
+                            break;
+
+                        case dirExp.CreateAndBindFile(path, fileImp) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new CreateAndBindFileCommand(this, dirExp, dir,
+                                                             path, fileImp)
+                                );
+                            break;
+
+                        case dirExp.DeleteFile(path) in dirMap ~> dir:
+                            EnqueueCommand(
+                                new DeleteFileCommand(this, dirExp, dir, path)
+                                );
+                            break;
+
+                        case dirExp.StoreACL(path, aclThis, aclInherited) in dirMap ~> dir:
+                            delete path;
+                            delete aclThis;
+                            delete aclInherited;
+                            dirExp.SendNakStoreACL(ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.CreateLink(linkPath, linkValue) in dirMap ~> dir:
+                            delete linkPath;
+                            delete linkValue;
+                            dirExp.SendNakCreateLink(ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.DeleteLink(linkPath) in dirMap ~> dir:
+                            delete linkPath;
+                            dirExp.SendNakDeleteLink(ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.GetLinkValue(linkPath) in dirMap ~> dir:
+                            delete linkPath;
+                            dirExp.SendNakGetLinkValue(ErrorCode.NotSupported);
+                            dirMap.Add(dirExp, dir);
+                            break;
+
+                        case dirExp.ChannelClosed() in dirMap ~> dir:
+                            dir.Close();
+                            delete dirExp;
+                            break;
+
+                        //
+                        // File contract messages
+                        //
+                        case fileExp.Read(buffer, bufferOffset, fileOffset, maxLength) in fileMap ~> file:
+                            EnqueueCommand(
+                                new FileReadCommand(this, fileExp, file,
+                                                    buffer, bufferOffset,
+                                                    fileOffset, maxLength)
+                                );
+                            break;
+
+                        case fileExp.Write(buffer, bufferOffset, fileOffset, maxLength) in fileMap ~> file:
+                            EnqueueCommand(
+                                new FileWriteCommand(this, fileExp, file,
+                                                     buffer, bufferOffset,
+                                                     fileOffset, maxLength)
+                                );
+                            break;
+
+                        case fileExp.Close() in fileMap ~> file:
+                            file.Close();
+                            delete fileExp;
+                            break;
+
+                        case fileExp.ChannelClosed() in fileMap ~> file:
+                            file.Close();
+                            delete fileExp;
+                            break;
+
+                        //
+                        // ServiceProvider messages
+                        //
+                        case spExp.Connect(serviceExp):
+                            DirectoryServiceContract.Exp dsExp =
+                                serviceExp as DirectoryServiceContract.Exp;
+                            if (dsExp == null) {
+                                spExp.SendNackConnect(serviceExp);
+                            }
+                            else {
+                                spExp.SendAckConnect();
+                                dsExp.SendSuccess();
+                                dirMap.Add(dsExp,
+                                           Directory.OpenRootDirectory());
+                            }
+                            break;
+
+                        case spExp.ChannelClosed():
+                            DebugStub.Print("ServiceProvider closed.\n");
+                            DebugStub.Break();
+                            break;
+
+                        //
+                        // FatClientContract messages
+                        //
+                        case managerExp.Unmount(force):
+                            // We should check whether anyone is using
+                            // filesystem before unmounting.
+                            shutdown = true;
+                            managerExp.SendSuccess();
+                            break;
+                        case managerExp.ChannelClosed():
+                            shutdown = true;
+                            break;
+                    }
+                }
+                this.threadPool.Shutdown();
+            }
+            finally {
+                delete managerExp;
+                delete spExp;
+                delete feedbackExp;
+                dirMap.Dispose();
+                fileMap.Dispose();
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/ComponentTest.sg b/base/Services/Fat/Fs/ComponentTest.sg
new file mode 100644
index 0000000..cf427d0
--- /dev/null
+++ b/base/Services/Fat/Fs/ComponentTest.sg
@@ -0,0 +1,495 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Test.sg
+//
+//  Note:
+//
+//
+
+using DirectoryServices.Utils;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Security;
+
+using System;
+
+using MSD = Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    public class ComponentTest
+    {
+        private delegate EnumerationRecords[] in ExHeap EnumerateDelegate(uint whence, out uint nextWhence);
+
+        private static string! DirEntryToHuman(char[]! in ExHeap dn)
+        {
+            int ls = 7;
+            while (dn[ls] == ' ' && ls > 0) {
+                ls--;
+            }
+            string! s = Bitter.ToString2(dn, 0, ls + 1);
+
+            ls = 10;
+            while (dn[ls] == ' ' && ls >= 8) {
+                ls--;
+            }
+            if (ls >= 8) {
+                s += "." + Bitter.ToString2(dn, 8, ls - 8 + 1);
+            }
+            return s;
+        }
+
+        private static void TestShortName(string! longName,
+                                          int attempt,
+                                          string! shortName)
+        {
+            char[]! in ExHeap ln = Bitter.FromString2(longName);
+            char[]! in ExHeap sn = new [ExHeap] char [DirectoryEntry.ShortNameEntryLength];
+            LongDirectoryEntry.WriteShortNameEntry(ln, attempt, sn);
+
+            string got = DirEntryToHuman(sn);
+            DebugStub.Print("Longname = \"{0}\" (\"{1}\") => \"{2}\" ({3})",
+                            __arglist(longName, shortName,
+                                      got,
+                                      Bitter.ToString2(sn))
+                            );
+
+            if (got == shortName) {
+                DebugStub.Print("        [ Pass ]\n");
+            }
+            else {
+                DebugStub.Print("        [ FAIL ]\n");
+                DebugStub.Break();
+            }
+            delete ln;
+            delete sn;
+        }
+
+        private static void TestShortName(string! longName, string! shortName)
+        {
+            TestShortName(longName, 1, shortName);
+        }
+
+        private static void TestShortNames()
+        {
+            TestShortName("The cat sat on the mat", "THECAT~1");
+            TestShortName("The cat sat on the mat", "THECAT~1");
+            TestShortName("abcdefghi.xyz", "ABCDEF~1.XYZ");
+            TestShortName("test1.txt", "TEST1~1.TXT");
+            TestShortName("....test1.txt...", "TEST1~1.TXT");
+            TestShortName(" . . ..test1.txt.. . ", "TEST1~1.TXT");
+            TestShortName("The cat sat on the mat.txt", "THECAT~1.TXT");
+            TestShortName("a.b", "A~1.B");
+            TestShortName("a.b", "A~1.B");
+            TestShortName("a.b", 99, "A~99.B");
+            TestShortName("abcdefghi.1234", 700, "ABCD~700.123");
+        }
+
+        private static void TestEnumerate(EnumerateDelegate! enumerateDelegate)
+        {
+            int done = 0;
+            for (uint whence = 0; whence != Directory.FinalWhence;) {
+                uint nextWhence;
+
+                EnumerationRecords[] in ExHeap er = enumerateDelegate(whence, out nextWhence);
+                if (er != null) {
+                    for (int i = 0; i < er.Length; i++) {
+                        expose (er[i]) {
+                            DebugStub.Print(
+                                "{0}{1}\n",
+                                __arglist(
+                                    Bitter.ToString(er[i].Path),
+                                    (er[i].Type == NodeType.Directory) ? "/" : "",
+                                    er[i].Type)
+                                );
+                        }
+                    }
+                    done += er.Length;
+                    delete er;
+                }
+                whence = nextWhence;
+            }
+            DebugStub.Print("Counted {0} entries.", __arglist(done));
+        }
+
+        private static void EnumerateAndFindResults(Directory! d)
+        {
+            int done = 0;
+            for (uint whence = 0; whence != Directory.FinalWhence;) {
+                uint nextWhence;
+
+                EnumerationRecords[] in ExHeap er =
+                    d.Enumerate2(whence, out nextWhence);
+                if (er != null) {
+                    for (int i = 0; i < er.Length; i++) {
+                        expose (er[i]) {
+                            DebugStub.Print(
+                                "Validating find for {0}{1}...",
+                                __arglist(
+                                    Bitter.ToString(er[i].Path),
+                                    (er[i].Type == NodeType.Directory) ? "/" : "",
+                                    er[i].Type)
+                                );
+                            bool exists = d.FileOrDirectoryExists(er[i].Path);
+                            DebugStub.Print("{0}\n",
+                                            __arglist(exists ? "yes" : "no"));
+                        }
+                    }
+                    done += er.Length;
+                    delete er;
+                }
+                whence = nextWhence;
+            }
+            Console.WriteLine("Counted {0} entries.", done);
+        }
+
+        private static void FillInTail(char[]! in ExHeap filename,
+                                       int suffix)
+        {
+            int pos = filename.Length;
+            while (suffix != 0 && pos != 0) {
+                filename[--pos] = (char)((int)'0' + (suffix % 10));
+                suffix /= 10;
+            }
+        }
+
+        private static bool CreateRangeOfSubDirectories(Directory! d,
+                                                        string basename,
+                                                        int rangeBegin,
+                                                        int rangeLength)
+        {
+            int digitCount = (int)Math.Log10(rangeBegin + rangeLength);
+            char []! in ExHeap fullname =
+                Bitter.FromString2(basename + new string(' ', digitCount + 1));
+
+            try {
+                int rangeEnd = rangeBegin + rangeLength;
+                while (rangeBegin != rangeEnd) {
+                    FillInTail(fullname, rangeBegin);
+
+                    MSD.ErrorCode error = d.CreateDirectory(fullname);
+
+                    if (error != MSD.ErrorCode.NoError) {
+                        Console.WriteLine(
+                            "Failed to create directory {0}: {1}",
+                            Bitter.ToString2(fullname),
+                            SdsUtils.ErrorCodeToString(error));
+                        return false;
+                    }
+                    rangeBegin++;
+                }
+            }
+            finally {
+                delete fullname;
+            }
+            return true;
+        }
+
+        private static bool DeleteRangeOfSubDirectories(Directory! d,
+                                                        string basename,
+                                                        int rangeBegin,
+                                                        int rangeLength)
+        {
+            int digitCount = (int)Math.Log10(rangeBegin + rangeLength);
+            char []! in ExHeap fullname =
+                Bitter.FromString2(basename + new string(' ', digitCount + 1));
+
+            try {
+                int rangeEnd = rangeBegin + rangeLength;
+                while (rangeBegin != rangeEnd) {
+                    FillInTail(fullname, rangeBegin);
+
+                    MSD.ErrorCode error = d.DeleteDirectory(fullname);
+
+                    if (error != MSD.ErrorCode.NoError) {
+                        Console.WriteLine(
+                            "Failed to delete directory {0}: {1}",
+                            Bitter.ToString2(fullname),
+                            SdsUtils.ErrorCodeToString(error));
+                        return false;
+                    }
+                    rangeBegin++;
+                }
+            }
+            finally {
+                delete fullname;
+            }
+            return true;
+        }
+
+        private static char[]! in ExHeap GetTreeNodeName(int count, int depth)
+        {
+            return Bitter.FromString2(
+                (!)String.Format("d_{0}_{1}", depth, count)
+                );
+        }
+
+        private static void CreateTree(Directory! treeRoot,
+                                       int        fanout,
+                                       int        depth)
+        {
+            if (depth <= 0) {
+                return;
+            }
+
+            DebugStub.Print("CreateTree(fanout = {0}, depth = {1})",
+                            __arglist(fanout, depth));
+
+            for (int i = 0; i < fanout; i++) {
+                char[]! in ExHeap nodeName = GetTreeNodeName(i, depth);
+                try {
+                    MSD.ErrorCode error = treeRoot.CreateDirectory(nodeName);
+                    if (error != MSD.ErrorCode.NoError) {
+                        DebugStub.Break();
+                    }
+
+                    Directory child;
+                    error = treeRoot.OpenDirectory(nodeName, out child);
+                    if (error != MSD.ErrorCode.NoError) {
+                        DebugStub.Break();
+                    }
+
+                    CreateTree((!)child, fanout, depth - 1);
+                } finally {
+                    delete nodeName;
+                }
+            }
+        }
+
+        private static void DeleteTree(Directory! treeRoot,
+                                       int fanout,
+                                       int depth)
+        {
+            if (depth <= 0) {
+                return;
+            }
+
+            DebugStub.Print("DeleteTree(fanout = {0}, depth = {1})\n",
+                            __arglist(fanout, depth));
+
+            for (int i = 0; i < fanout; i++) {
+                char[]! in ExHeap nodeName = GetTreeNodeName(i, depth);
+                try {
+                    Directory child;
+                    MSD.ErrorCode error =
+                        treeRoot.OpenDirectory(nodeName, out child);
+                    DebugStub.Assert(error == MSD.ErrorCode.NoError);
+
+                    DeleteTree((!)child, fanout, depth - 1);
+                    error = treeRoot.DeleteDirectory(nodeName);
+                    DebugStub.Assert(error == MSD.ErrorCode.NoError);
+                    error = treeRoot.OpenDirectory(nodeName, out child);
+                    DebugStub.Assert(error == MSD.ErrorCode.NotFound);
+                }
+                finally {
+                    delete nodeName;
+                }
+            }
+        }
+
+        private static void CreateAndDestroyTree(Directory! treeRoot,
+                                                 int        fanout,
+                                                 int        depth)
+        {
+            CreateTree(treeRoot, fanout, depth);
+            DeleteTree(treeRoot, fanout, depth);
+        }
+
+        private static void CreateFile(Directory! directory,
+                                       string!    filename)
+        {
+            File file;
+
+            char[]! in ExHeap ename = Bitter.FromString2(filename);
+            MSD.ErrorCode error = directory.CreateAndOpenFile(ename, out file);
+            delete ename;
+            DebugStub.Assert(error == MSD.ErrorCode.NoError);
+            if (file == null) {
+                return;
+            }
+
+            byte[]! in ExHeap buffer = new [ExHeap] byte [32];
+            try {
+                const int sections = 1000;
+                for (int i = 0; i < sections; i++) {
+                    byte b = (byte)('a' + (i % 26));
+                    for (int j = 0; j < buffer.Length; j++) {
+                        buffer[j] = b;
+                    }
+                    buffer[buffer.Length - 2] = (byte)'\r';
+                    buffer[buffer.Length - 1] = (byte)'\n';
+                    int written;
+                    FileError fe = file.Write(buffer,
+                                              0, (uint)(i * buffer.Length),
+                                              buffer.Length, out written);
+                    DebugStub.Assert(written == buffer.Length);
+                    DebugStub.Assert(fe == FileError.NoError);
+                }
+                DebugStub.Print("Wrote {0} bytes to {1}\n",
+                                __arglist(sections * buffer.Length,
+                                          filename));
+                file.Close();
+            }
+            finally {
+                delete buffer;
+            }
+        }
+
+        private static void CreateSparseFile(Directory! directory,
+                                             string!    filename)
+        {
+            File file;
+
+            char[]! in ExHeap ename = Bitter.FromString2(filename);
+            MSD.ErrorCode error = directory.CreateAndOpenFile(ename, out file);
+            delete ename;
+            DebugStub.Assert(error == MSD.ErrorCode.NoError);
+            if (file == null) {
+                return;
+            }
+
+            byte[]! in ExHeap buffer = new [ExHeap] byte [32];
+            try {
+                const int sections = 1000;
+                for (int i = 0; i < sections; i++) {
+                    byte b = (byte)('a' + (i % 26));
+                    for (int j = 0; j < buffer.Length; j++) {
+                        buffer[j] = b;
+                    }
+                    buffer[buffer.Length - 2] = (byte)'\r';
+                    buffer[buffer.Length - 1] = (byte)'\n';
+                    int written;
+                    FileError fe = file.Write(buffer,
+                                              0, (uint)(2 * i * buffer.Length),
+                                              buffer.Length, out written);
+                    DebugStub.Assert(written == buffer.Length);
+                    DebugStub.Assert(fe == FileError.NoError);
+                }
+                DebugStub.Print("Wrote {0} bytes to {1}\n",
+                                __arglist(sections * buffer.Length,
+                                          filename));
+                file.Close();
+            }
+            finally {
+                delete buffer;
+            }
+        }
+
+        public static int MainTest(string []! args)
+        {
+            TestShortNames();
+
+            BPB.ValidateOverlay();
+
+            if (args.Length >= 2) {
+                if (FatVolume.Mount((!)args[1], false) == false) {
+                    return 0;
+                }
+
+                DateTime t0 = DateTime.Now;
+                Directory! d = Directory.OpenRootDirectory();
+                CreateFile(d, "testfile.txt");
+                CreateSparseFile(d, "testfile2.txt");
+
+                DateTime t1 = DateTime.Now;
+                Directory! dummy = Directory.OpenRootDirectory();
+                DateTime t2 = DateTime.Now;
+                assert dummy != null;
+
+                DebugStub.Print("First open took {0} ms.\n",
+                                __arglist((t1 - t0).Milliseconds));
+                DebugStub.Print("Second open took {0} ms.\n",
+                                __arglist((t2 - t1).Milliseconds));
+
+                //#if TEST_OPEN
+                Directory foo;
+                char []! in ExHeap subDirName = Bitter.FromString2("some T~1");
+                d.OpenDirectory(subDirName, out foo);
+                delete subDirName;
+
+                Directory bar;
+                char []! in ExHeap subDirName2 = Bitter.FromString2("foo");
+                d.OpenDirectory(subDirName2, out bar);
+                delete subDirName2;
+
+                // #endif // TEST_OPEN
+
+                EnumerateDelegate! ed1 = new EnumerateDelegate(d.Enumerate);
+                DateTime t3 = DateTime.Now;
+                TestEnumerate(ed1);
+                DateTime t4 = DateTime.Now;
+                TestEnumerate(ed1);
+                DateTime t5 = DateTime.Now;
+
+                EnumerateDelegate! ed2 = new EnumerateDelegate(d.Enumerate2);
+                DateTime t6 = DateTime.Now;
+                TestEnumerate(ed2);
+                DateTime t7 = DateTime.Now;
+
+                DebugStub.Print("Enum0 attempt 0 {0} ms.\n",
+                                __arglist((t4 - t3).Milliseconds));
+                DebugStub.Print("Enum0 attempt 1 {0} ms.\n",
+                                __arglist((t5 - t4).Milliseconds));
+                DebugStub.Print("Enum1 attempt 0 {0} ms.\n",
+                                __arglist((t7 - t6).Milliseconds));
+
+                EnumerateAndFindResults(d);
+
+                const int TestFileCount = 200;
+                const string TestFileBaseName = "some testing directory    ";
+
+                DebugStub.Print("Creating test directories");
+                CreateRangeOfSubDirectories(d, "Some long test dir",
+                                            1, 400);
+
+                TestEnumerate(ed1);
+                TestEnumerate(ed2);
+                EnumerateAndFindResults(d);
+
+                DeleteRangeOfSubDirectories(d, "Some long test dir",
+                                            1, 400);
+
+                TestEnumerate(ed1);
+                TestEnumerate(ed2);
+                EnumerateAndFindResults(d);
+
+                CreateRangeOfSubDirectories(
+                    d, "The cat sat on the mat is long", 1, 3000);
+
+                EnumerateAndFindResults(d);
+
+                DeleteRangeOfSubDirectories(
+                    d, "The cat sat on the mat is long", 1, 3000);
+
+                TestEnumerate(ed1);
+                TestEnumerate(ed2);
+                EnumerateAndFindResults(d);
+
+                CreateRangeOfSubDirectories(
+                    d, "foo", 1, 300);
+
+                EnumerateAndFindResults(d);
+
+                DeleteRangeOfSubDirectories(
+                    d, "foo", 1, 300);
+
+                TestEnumerate(ed1);
+                TestEnumerate(ed2);
+                EnumerateAndFindResults(d);
+
+                DebugStub.Print("Running directory tree create and delete test\n");
+                CreateAndDestroyTree(d, 12, 3);
+                FatVolume.Unmount();
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/DHashTable.sg b/base/Services/Fat/Fs/DHashTable.sg
new file mode 100644
index 0000000..f7fe09a
--- /dev/null
+++ b/base/Services/Fat/Fs/DHashTable.sg
@@ -0,0 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DHashtable.sg
+//
+//  Note:
+//         A hashtable customized for FAT directory hashing.  Table entries
+//  are composed of <nameKey, (entry offset, entry length)>.
+//
+//         Earlier versions of this file implemented a chain based
+//  Hashtable in place.  The code was updated to use open address hashing
+//  as it has lower memory overhead and faster lookup when the load is
+//  is low.
+//
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    using System;
+    using System.Diagnostics;
+
+    /// <remarks> Specialized hashtable for storing filename
+    /// hashes for directories. </remarks>
+    internal sealed class DHashtable
+    {
+        public const int MaxKeyValue = OpenHash.MaxKeyValue;
+        public const int MaxKeyBits  = OpenHash.MaxKeyBits;
+
+        OpenHash table;
+
+        internal DHashtable()
+        {
+            this.table = new OpenHash();
+        }
+
+        /// <value>Property <c>Count</c> represents the number of key-value
+        /// pairs stored in the hash table. </value>
+        internal int Count
+        {
+            get { return table.Count; }
+        }
+
+        /// <value>Property <c>Capacity</c> represents the current capacity
+        /// of the hash table. </value>
+        /// <para>The capacity of the hash table changes dynamically.</para>
+        internal int Capacity
+        {
+            get { return table.Capacity; }
+        }
+
+        private static int ComposeValue(ushort x, ushort y)
+        {
+            return (((int)x) << 16) | ((int)y);
+        }
+
+        private static void DecomposeValue(int v, out ushort x, out ushort y)
+        {
+            x = (ushort)(v >> 16);
+            y = (ushort)(v);
+        }
+
+        /// <summary>
+        /// Insert name-key, entry offset, length triplet.
+        /// </summary>
+        internal bool Insert(int    nameKey,
+                             ushort entryOffset,
+                             ushort entryLength)
+            requires nameKey <= MaxKeyValue;
+        {
+            return table.Insert(nameKey,
+                                ComposeValue(entryOffset, entryLength));
+        }
+
+        /// <summary> Remove key-value pair. </summary>
+        /// <returns> true on success, false if key-value pair
+        /// is not present. </returns>
+        internal bool Remove(int    nameKey,
+                             ushort entryOffset,
+                             ushort entryLength)
+            requires nameKey <= MaxKeyValue;
+        {
+            return table.Remove(nameKey,
+                                ComposeValue(entryOffset, entryLength));
+        }
+
+        /// <summary>
+        /// Prepare to begin a search.  This methods clears out
+        /// the state associated with any previous searches.
+        /// </summary>
+        internal void ResetSearch()
+        {
+            table.BeginSearch();
+        }
+
+        /// <summary> Performs value lookup after GetFirstValue
+        /// has retrieved first value for key.  This methods
+        /// allows callers to iterate over hash items with the
+        /// same key.  </summary>
+        /// <exception cref="InvalidOperationException"> The
+        /// hash table was modified or the key does not match
+        /// the key in the last GetFirstValue call. </exception>
+        /// <seealso cref="GetFirstValue"/>
+        internal bool Search(int        nameKey,
+                             out ushort entryOffset,
+                             out ushort entryLength)
+            requires nameKey <= MaxKeyValue;
+        {
+            int value;
+            bool success = table.Search(nameKey, out value);
+            DecomposeValue(value, out entryOffset, out entryLength);
+            return success;
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/Directory.sg b/base/Services/Fat/Fs/Directory.sg
new file mode 100644
index 0000000..770004e
--- /dev/null
+++ b/base/Services/Fat/Fs/Directory.sg
@@ -0,0 +1,2341 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Directory.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+
+using MSD = Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class Directory : FsObject
+    {
+        private  const int  MaxDirectoryEntryLimit = 0xffff;
+        internal const int  EnumerationChunkSize   = 1024;
+        internal const uint FinalWhence            = UInt32.MaxValue;
+
+        // BlockIndex cache for directory (not used by FAT12/16 root directory)
+        BlockIndex blockIndex;
+
+        // Root directory bounds for FAT12/16 root directory
+        uint       startBlockId;
+        uint       endBlockId;
+
+        // Hashtable of <hash(filename), entry index> pairs
+        DHashtable dirHash      = new DHashtable();
+
+        // Hashtable of open child directories and files
+        Hashtable  openFsObjects = new Hashtable();
+
+        // Bitmap of used entries in directory blocks
+        Bitmap     entryBitmap;
+
+        // Terminating entry index
+        uint       lastEntry     = UInt32.MaxValue;
+
+        // Short name seed
+        int        shortNameSeed = 0;
+
+        /// <summary> Generic directory constructor. </summary>
+        /// <param name="parent"> Parent directory. </param>
+        /// <param name="shortEntryOffset"> Index of directory entry
+        /// containing metadata for directory being constructed.
+        /// </param>
+        /// <param name="firstCluster"> First cluster of directory.
+        /// </param>
+        [ Microsoft.Contracts.NotDelayed ]
+        private Directory(Directory! parent,
+                          int        shortEntryOffset,
+                          int        firstCluster)
+            : base(parent, shortEntryOffset)
+        {
+            this.blockIndex   = new BlockIndex();
+            this.startBlockId = UInt32.MaxValue;
+            this.endBlockId   = UInt32.MaxValue;
+            this.entryBitmap  = new Bitmap(MaxDirectoryEntryLimit);
+
+            FatVolume.Fat.PopulateIndex(this.blockIndex, firstCluster);
+            BuildSummaries();
+        }
+
+        /// <summary> Constructor for FAT32 root directory. </summary>
+        [ Microsoft.Contracts.NotDelayed ]
+        private Directory(BlockIndex theBlockIndex)
+            : base()
+        {
+            this.blockIndex   = theBlockIndex;
+            this.startBlockId = UInt32.MaxValue;
+            this.endBlockId   = UInt32.MaxValue;
+            this.entryBitmap  = new Bitmap(MaxDirectoryEntryLimit);
+            BuildSummaries();
+        }
+
+        /// <summary> Constructor for FAT12/16 root directory. </summary>
+        [ Microsoft.Contracts.NotDelayed ]
+        private Directory(uint theStartBlockId, uint theEndBlockId)
+            : base()
+        {
+            this.blockIndex   = null;
+            this.startBlockId = theStartBlockId;
+            this.endBlockId   = theEndBlockId;
+            this.entryBitmap  = new Bitmap(CurrentDirectoryEntryLimit);
+            BuildSummaries();
+        }
+
+        internal bool IsRoot  { get { return ! base.HasParent; } }
+        internal bool IsEmpty { get { return dirHash.Count == 0; } }
+
+        private bool UseClusterCache
+        {
+            get {
+                return (FatVolume.FatVersion == FatVersion.Fat32 || !IsRoot);
+            }
+        }
+
+        internal override int FirstCluster
+        {
+            get {
+                if (UseClusterCache) {
+                    int blockId;
+                    if (blockIndex.Lookup(0, out blockId) == false) {
+                        assert false;
+                    }
+                    return blockId;
+                }
+                return 0;
+            }
+        }
+
+        private int CurrentDirectoryEntryLimit
+        {
+            get {
+                if (UseClusterCache) {
+                    return blockIndex.Count * DirectoryEntriesPerBlock;
+                }
+                return ((int)(endBlockId - startBlockId) *
+                        DirectoryEntriesPerBlock);
+            }
+        }
+
+        private bool IsFixedSize
+        {
+            get { return !UseClusterCache; }
+        }
+
+        private static bool ValidName(char[]! in ExHeap name)
+        {
+            return name.Length > 0 &&
+                    !Char.IsWhiteSpace(name[0]) &&
+                    !Char.IsWhiteSpace(name[name.Length - 1]) &&
+                    LongDirectoryEntry.ValidName(name);
+        }
+
+        public int DirectoryEntriesPerBlock
+        {
+            get {
+                assert sizeof(DirectoryEntry) == DirectoryEntry.Length;
+                assert sizeof(LongDirectoryEntry) == LongDirectoryEntry.Length;
+                assert sizeof(LongDirectoryEntry) == sizeof(DirectoryEntry);
+                BlockCache bc;
+                if (UseClusterCache) {
+                    bc = FatVolume.ClusterCache;
+                }
+                else {
+                    bc = FatVolume.NonClusterCache;
+                }
+                return (int) (bc.BytesPerBlock / DirectoryEntry.Length);
+            }
+        }
+
+        private void BuildSummaries()
+        {
+            // Long entry variables
+            uint longEntryOffset   = FinalWhence;
+            int  longEntriesComing = 0;
+            byte longEntryChecksum = 0;
+            int  runningChecksum   = 0;
+
+            // Iteration variables
+            uint entryOffset     = 0;
+            int  entriesPerBlock = DirectoryEntriesPerBlock;
+            int  blockNumber     = 0;
+
+            byte [] in ExHeap current = AcquireBlock(blockNumber);
+
+            assert current != null;
+
+            bool done = false;
+            do {
+                if (entryOffset == CurrentDirectoryEntryLimit) {
+                    break;
+                }
+                for (uint i = 0; i < entriesPerBlock; i++, entryOffset++) {
+                    int cOffset = (int)i * DirectoryEntry.Length;
+                    ref DirectoryEntry de = ref current[cOffset];
+
+                    if (i == 0 && this.IsRoot && de.IsVolumeId) {
+                        // Reserve slot for volume id so it is
+                        // not purged when all files and
+                        // directory are removed.
+                        this.lastEntry = entryOffset;
+                        int start, length;
+                        entryBitmap.Allocate((int)0, 1, out start, out length);
+                    }
+
+                    if (de.IsFinalFreeEntry) {
+                        this.lastEntry = entryOffset;
+                        done = true;
+                        break;
+                    }
+
+                    if (de.IsLongEntry) {
+                        ref LongDirectoryEntry le = ref current[cOffset];
+                        if (le.IsLastEntry) {
+                            longEntryOffset   = entryOffset;
+                            longEntryChecksum = le.Checksum;
+                            longEntriesComing = le.GetNumberOfLongEntries()-1;
+
+                            int clen = le.GetPathComponentLength();
+                            runningChecksum = le.GetDirHashCode(0, clen);
+                        }
+                        else if (longEntriesComing-- > 0 &&
+                                 le.Checksum == longEntryChecksum) {
+                            runningChecksum =
+                                le.GetDirHashCode(
+                                    runningChecksum,
+                                    LongDirectoryEntry.CharactersPerEntry
+                                    );
+                        }
+                        else {
+                            longEntryOffset = FinalWhence;
+                        }
+                    }
+                    else if (de.IsSelfPointer || de.IsParentPointer) {
+                        // "." and ".." are not exposed by the file system.
+                        // Reserve space in bitmap, but do not populate
+                        // name hash table.
+                        int start, length;
+                        entryBitmap.Allocate((int)entryOffset, 1,
+                                             out start, out length);
+
+                        assert start == entryOffset && length == 1;
+                        assert entryOffset < CurrentDirectoryEntryLimit;
+                    }
+                    else if (!de.IsFreeEntry &&
+                             (de.IsDirectory || de.IsFile)) {
+                        if (de.Checksum == longEntryChecksum &&
+                            longEntryOffset != FinalWhence) {
+
+                            int totalEntryLength =
+                                (int)entryOffset - (int)longEntryOffset + 1;
+
+                            int start, length;
+                            entryBitmap.Allocate((int)longEntryOffset,
+                                                 totalEntryLength,
+                                                 out start, out length);
+
+                            assert start  == longEntryOffset;
+                            assert length == (int)totalEntryLength;
+                            assert longEntryOffset <CurrentDirectoryEntryLimit;
+
+                            bool success;
+                            success = dirHash.Insert(runningChecksum,
+                                                     (ushort)longEntryOffset,
+                                                     (ushort)totalEntryLength);
+                            assert success;
+
+                            success = dirHash.Insert(de.GetDirHashCode(),
+                                                     (ushort)longEntryOffset,
+                                                     (ushort)totalEntryLength);
+                            assert success;
+                        }
+                        else {
+                            int start, length;
+                            entryBitmap.Allocate((int)entryOffset, 1,
+                                                 out start, out length);
+
+                            assert start == entryOffset && length == 1;
+                            assert entryOffset < CurrentDirectoryEntryLimit;
+
+                            bool success = dirHash.Insert(de.GetDirHashCode(),
+                                                          (ushort)entryOffset,
+                                                          (ushort)1);
+                            assert success;
+                        }
+
+                        longEntryOffset = FinalWhence;
+                    }
+                    else {
+                        longEntryOffset = FinalWhence;
+                    }
+                }
+                ReleaseBlock(blockNumber++, current, false);
+                current = null;
+            } while (!done && (current = AcquireBlock(blockNumber)) != null);
+
+            if (current != null) {
+                ReleaseBlock(blockNumber, current, false);
+            }
+        }
+
+        // --------------------------------------------------------------------
+        // Create file and directory methods
+
+        bool LockedProvisionDirectory(int requestedEntryCount)
+            requires requestedEntryCount <= MaxDirectoryEntryLimit;
+            requires requestedEntryCount > this.CurrentDirectoryEntryLimit;
+            requires this.IsFixedSize == false;
+            // ensures this.CurrentDirectoryEntryLimit > old(this.CurrentDirectoryEntryLimit) or returns false;
+        {
+            assert blockIndex != null;
+
+            const int RequestedClusters = 1;
+            int actualClusters;
+
+            bool success = FatVolume.Fat.GrowChain(this.blockIndex,
+                                                   RequestedClusters,
+                                                   out actualClusters);
+            assert success == (actualClusters == RequestedClusters);
+            return success;
+        }
+
+        void
+        LockedInitializeNewDirectory(int newDirectoryCluster)
+        {
+            byte[]! in ExHeap cluster =
+                FatVolume.ClusterCache.CreateBlockAndBeginQuickOperation(
+                    (uint)newDirectoryCluster, true
+                    );
+
+            int offset = 0;
+            ref DirectoryEntry selfEntry = ref cluster[offset];
+            selfEntry.InitializeAsSelfPointer((uint)newDirectoryCluster);
+            offset += DirectoryEntry.Length;
+
+            // Page 25 of spec says initialize
+            // root cluster as zero even for FAT32 (where it
+            // exists and can *not* be zero by definition).
+            ref DirectoryEntry parentEntry = ref cluster [offset];
+            if (this.IsRoot) {
+                parentEntry.InitializeAsParentPointer(0);
+            }
+            else {
+                parentEntry.InitializeAsParentPointer((uint)this.FirstCluster);
+            }
+            offset += DirectoryEntry.Length;
+
+            ref DirectoryEntry lastEntry = ref cluster[offset];
+            lastEntry.Invalidate(true);
+
+            FatVolume.ClusterCache.EndQuickBlockOperation(
+                (uint)newDirectoryCluster, cluster, true
+                );
+        }
+
+        private void
+        GenerateShortNameEntry(char[]! in ExHeap longName,
+                               char[]! in ExHeap shortNameEntry)
+            requires (shortNameEntry.Length ==
+                      DirectoryEntry.ShortNameEntryLength);
+        {
+            // This always succeeds because there are more extension
+            // digits possible than files in a directory.
+            //
+            // NB LongDirectoryEntry.WriteShortNameEntry is inefficient
+            // because it has to determine the short form of the name
+            // every time.
+
+            //
+            // Try first few tails in sequence.
+            //
+            const int SmallLimit = 11;
+            for (int i = 1; i < SmallLimit; i++) {
+                LongDirectoryEntry.WriteShortNameEntry(longName, i,
+                                                       shortNameEntry);
+                if (!LockedFileOrDirectoryExists(shortNameEntry)) {
+                    return;
+                }
+            }
+
+            //
+            // Generate tails using open addressing search
+            // - Choose space as power of two.
+            // - Choose stride to be an odd number.
+            //
+            const int LargeLimit = 524288;
+            assert (LargeLimit + SmallLimit <
+                    LongDirectoryEntry.MaxShortNameAttempts);
+
+            shortNameSeed++;
+            int h1 = (shortNameSeed * 15307) % LargeLimit;
+            int h2 = ((shortNameSeed * 2) % LargeLimit) + 1;
+
+            for (int i = 0; i < LargeLimit; i++) {
+                int j = (h1 + i * h2) % LargeLimit;
+                LongDirectoryEntry.WriteShortNameEntry(longName,
+                                                       SmallLimit + j,
+                                                       shortNameEntry);
+                if (!LockedFileOrDirectoryExists(shortNameEntry)) {
+                    return;
+                }
+            }
+        }
+
+        MSD.ErrorCode
+        LockedCreateFileOrDirectory(char[]! in ExHeap longName,
+                                    char[]! in ExHeap shortNameEntry,
+                                    int               firstCluster,
+                                    bool              isFile)
+            requires (shortNameEntry.Length ==
+                      DirectoryEntry.ShortNameEntryLength);
+        {
+            if (LockedFileOrDirectoryExists(longName)) {
+                return MSD.ErrorCode.AlreadyExists;
+            }
+
+            GenerateShortNameEntry(longName, shortNameEntry);
+
+            //
+            // Allocate contiguous run of directory entries for long
+            // and short name data.
+            //
+            int cpe        = LongDirectoryEntry.CharactersPerEntry;
+            int entryCount = (longName.Length + cpe - 1) / cpe + 1;
+            int allocStart, allocLength;
+            if (!entryBitmap.Allocate(entryCount,
+                                      out allocStart,
+                                      out allocLength)) {
+                return MSD.ErrorCode.DirectoryFull;
+            }
+            assert allocStart + allocLength <= MaxDirectoryEntryLimit;
+            assert allocLength == entryCount;
+
+            //
+            // Check if we need to grow directory and attempt to if so.
+            //
+            // Note +1 comes from trailing directory entry with the last
+            // entry marker set.
+            //
+            int totalEntriesNeeded = Math.Min(allocStart + allocLength + 1,
+                                              MaxDirectoryEntryLimit);
+            if (totalEntriesNeeded > CurrentDirectoryEntryLimit) {
+                int oldSize = CurrentDirectoryEntryLimit;
+                if ((this.IsFixedSize ||
+                     !LockedProvisionDirectory(totalEntriesNeeded))
+                    ) {
+                    entryBitmap.Free(allocStart, allocLength);
+                    return MSD.ErrorCode.DirectoryFull;
+                }
+                DebugStub.Print("Growing directory {0} -> {1} -> {2}\n",
+                                __arglist(oldSize,
+                                          totalEntriesNeeded,
+                                          CurrentDirectoryEntryLimit));
+
+            }
+
+            //
+            // Write long directory entries
+            //
+            int entry           = allocStart;
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int blockNumber     = allocStart / entriesPerBlock;
+            int offset          = 0;
+
+            byte checksum = LongDirectoryEntry.ComputeChecksum(shortNameEntry);
+
+            byte[]! in ExHeap block = (!)AcquireBlock(blockNumber);
+            for (int k = 0; k < (allocLength - 1); k++) {
+                // TODO: Check entry is
+                // empty before overwriting, or beyond last entry
+
+                offset = (entry % entriesPerBlock) * DirectoryEntry.Length;
+                ref LongDirectoryEntry le = ref block[offset];
+
+                le.SetNameComponent(allocLength - 1 - k,
+                                    allocLength - 1,
+                                    longName,
+                                    checksum);
+
+                entry++;
+                int nextBlockNumber = entry / entriesPerBlock;
+                if (nextBlockNumber != blockNumber) {
+                    ReleaseBlock(blockNumber, block, true);
+                    blockNumber = nextBlockNumber;
+                    block       = (!)AcquireBlock(blockNumber);
+                }
+            }
+
+            //
+            // Write short name
+            //
+            offset = (entry % entriesPerBlock) * DirectoryEntry.Length;
+            ref DirectoryEntry de = ref block[offset];
+            if (isFile) {
+                de.InitializeAsFile(shortNameEntry, (uint)firstCluster);
+            }
+            else {
+                de.InitializeAsDirectory(shortNameEntry, (uint)firstCluster);
+            }
+            int sneHashCode = de.GetDirHashCode();
+            entry++;
+
+            // TODO: Validate checksum
+            // matches that computed
+            byte checksum2 = de.Checksum;
+            assert checksum == checksum2;
+
+            //
+            // Optionally bump last entry
+            //
+            assert entry <= CurrentDirectoryEntryLimit;
+            if (entry > (int)this.lastEntry) {
+                if (entry != MaxDirectoryEntryLimit) {
+                    int nextBlockNumber = entry / entriesPerBlock;
+                    if (nextBlockNumber != blockNumber) {
+                        ReleaseBlock(blockNumber, block, true);
+                        blockNumber = nextBlockNumber;
+                        block       = (!)AcquireBlock(blockNumber);
+                    }
+                    offset = (entry % entriesPerBlock) * DirectoryEntry.Length;
+                    ref DirectoryEntry last = ref block[offset];
+                    last.Invalidate(true);
+                }
+                this.lastEntry = (uint)entry;
+                assert this.lastEntry <= MaxDirectoryEntryLimit;
+            }
+
+            ReleaseBlock(blockNumber, block, true);
+
+            //
+            // Populate directory name hash
+            //
+            this.dirHash.Insert(LongDirectoryEntry.GetDirHashCode(longName),
+                                (ushort)allocStart,
+                                (ushort)allocLength);
+            this.dirHash.Insert(sneHashCode,
+                                (ushort)allocStart,
+                                (ushort)allocLength);
+
+            if (!isFile) {
+                LockedInitializeNewDirectory(firstCluster);
+            }
+
+            return MSD.ErrorCode.NoError;
+        }
+
+        // --------------------------------------------------------------------
+        // Delete file and directory
+
+        private static void
+        LockedDeleteLongEntries(byte[]! in ExHeap buffer,
+                                int               entryOffset,
+                                int               entryLength,
+                                ref int           dirHashCode)
+        {
+            while (entryLength > 0) {
+                int byteOffset = entryOffset * DirectoryEntry.Length;
+
+                ref DirectoryEntry de = ref buffer[byteOffset];
+                assert de.IsLongEntry;
+
+                ref LongDirectoryEntry le = ref buffer[byteOffset];
+                if (le.IsLastEntry) {
+                    dirHashCode =
+                        le.GetDirHashCode(
+                            dirHashCode,
+                            le.GetPathComponentLength()
+                            );
+                }
+                else {
+                    dirHashCode =
+                        le.GetDirHashCode(
+                            dirHashCode,
+                            LongDirectoryEntry.CharactersPerEntry
+                            );
+                }
+
+                de.Invalidate(false);
+
+                entryOffset++;
+                entryLength--;
+            }
+        }
+
+        private static void
+        LockedDeleteShortEntry(byte[]! in ExHeap buffer,
+                               int               entryOffset,
+                               out int           dirHashCode,
+                               out uint          firstCluster)
+        {
+                int byteOffset = entryOffset * DirectoryEntry.Length;
+                ref DirectoryEntry de = ref buffer[byteOffset];
+                assert !de.IsLongEntry;
+
+                dirHashCode  = de.GetDirHashCode();
+                firstCluster = de.FirstCluster;
+
+                de.Invalidate(false);
+        }
+
+        private void LockedDeleteMatchEntries(ref FindMatch match)
+        {
+            // TODO: reduce number of
+            // acquire and release operations in this section.
+
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int absoluteOffset  = match.AbsoluteEntryOffset;
+            int entryLength     = match.AbsoluteEntryLength;
+            int entryOffset     = absoluteOffset % entriesPerBlock;
+            int shortOffset     = entryOffset + entryLength - 1;
+            int blockNumber     = absoluteOffset / entriesPerBlock;
+
+            assert (absoluteOffset >= 0 &&
+                    absoluteOffset < MaxDirectoryEntryLimit);
+            assert (entryLength > 0 &&
+                    absoluteOffset + entryLength <= MaxDirectoryEntryLimit);
+            //
+            // Free bits in directory entry bitmap
+            //
+            entryBitmap.Free(absoluteOffset, entryLength);
+
+            //
+            // Delete directory entries and get checksums so we
+            // can delete directory hash entries.
+            //
+            if (entryLength > 1) {
+                int longDirHashCode = 0;
+                if (entryOffset + entryLength - 1 < entriesPerBlock) {
+                    byte[]! in ExHeap block = (!)AcquireBlock(blockNumber);
+                    LockedDeleteLongEntries(
+                        block, entryOffset, entryLength - 1,
+                        ref longDirHashCode
+                        );
+                    ReleaseBlock(blockNumber, block, true);
+                }
+                else {
+                    byte[]! in ExHeap block = (!)AcquireBlock(blockNumber);
+                    LockedDeleteLongEntries(
+                        block, entryOffset, entriesPerBlock - entryOffset,
+                        ref longDirHashCode
+                        );
+                    ReleaseBlock(blockNumber, block, true);
+
+                    block = (!)AcquireBlock(blockNumber + 1);
+                    LockedDeleteLongEntries(
+                        block, 0,
+                        entryOffset + entryLength - 1 - entriesPerBlock,
+                        ref longDirHashCode
+                        );
+                    ReleaseBlock(blockNumber + 1, block, true);
+                }
+
+                int m = this.dirHash.Count;
+                this.dirHash.Remove(longDirHashCode,
+                                    (ushort)absoluteOffset,
+                                    (ushort)entryLength);
+                assert this.dirHash.Count == m - 1;
+            }
+
+            //
+            // Remove short entry and its dirhash value
+            //
+            int shortDirHashCode;
+            uint firstCluster;
+            if (shortOffset >= entriesPerBlock) {
+                byte []! in ExHeap seBlock =
+                    (!)AcquireBlock(blockNumber + 1);
+                LockedDeleteShortEntry(seBlock,
+                                       shortOffset - entriesPerBlock,
+                                       out shortDirHashCode,
+                                       out firstCluster);
+                ReleaseBlock(blockNumber + 1, seBlock, true);
+
+            }
+            else {
+                byte []! in ExHeap seBlock =
+                    (!)AcquireBlock(blockNumber);
+                LockedDeleteShortEntry(seBlock, shortOffset,
+                                       out shortDirHashCode,
+                                       out firstCluster);
+                ReleaseBlock(blockNumber, seBlock, true);
+            }
+            int n = (int)this.dirHash.Count;
+            this.dirHash.Remove(shortDirHashCode,
+                                (ushort)absoluteOffset,
+                                (ushort)entryLength);
+            assert this.dirHash.Count == n - 1;
+
+            //
+            // Purge associated clusters
+            //
+            FatVolume.Fat.FreeChain((int)firstCluster);
+        }
+
+        private void LockedInvalidateEntriesWithinBlock(int blockNumber,
+                                                        int entryStart,
+                                                        int entryCount)
+            requires blockNumber >= 0; // && < this.CurrentDirectoryEntryLimit;
+            requires entryStart >= 0;
+            requires entryCount >= 0;
+        //requires entryCount <= this.DirectoryEntriesPerBlock
+        //requires entryStart + entryCount <= this.DirectoryEntriesPerBlock;
+        {
+            if (entryCount > 0) {
+                byte []! in ExHeap block = (!)AcquireBlock(blockNumber);
+                try {
+                    Bitter.Zero(
+                        block,
+                        entryStart * DirectoryEntry.Length,
+                        entryCount * DirectoryEntry.Length
+                        );
+                }
+                finally {
+                    ReleaseBlock(blockNumber, block, true);
+                }
+            }
+        }
+
+        private void LockedInvalidateEndDirectoryEntries(int start, int end)
+            requires start >= 0;
+            requires end >= start;
+        // requires end <= this.CurrentDirectoryEntryLimit;
+        {
+            int entriesPerBlock = this.DirectoryEntriesPerBlock;
+
+            int curBlock = start / entriesPerBlock;
+            int endBlock = end / entriesPerBlock;
+
+            if (curBlock == endBlock) {
+                LockedInvalidateEntriesWithinBlock(
+                    curBlock,
+                    start & (entriesPerBlock - 1),
+                    end - start);
+            }
+            else {
+                LockedInvalidateEntriesWithinBlock(
+                    curBlock++,
+                    start & (entriesPerBlock - 1),
+                    entriesPerBlock - start
+                    );
+                while (curBlock < endBlock) {
+                    LockedInvalidateEntriesWithinBlock(
+                        curBlock++,
+                        0,
+                        entriesPerBlock
+                        );
+                }
+                LockedInvalidateEntriesWithinBlock(
+                    endBlock,
+                    0,
+                    end - endBlock * entriesPerBlock
+                    );
+            }
+        }
+
+        private void LockedUpdateEndOfDirectoryMarker(int oldMarker)
+        {
+            int firstFree =
+                this.entryBitmap.GetFirstBitSetBefore(oldMarker) + 1;
+
+            LockedInvalidateEndDirectoryEntries(
+                firstFree,
+                Math.Min((int)this.lastEntry + 1,
+                         this.CurrentDirectoryEntryLimit)
+                );
+
+            this.lastEntry = (uint)firstFree;
+
+            // See if directory is inside FAT and return free clusters if so.
+            if (FatVolume.FatVersion == FatVersion.Fat32 || !this.IsRoot) {
+                int entriesPerBlock = this.DirectoryEntriesPerBlock;
+                int newClusterCount = (firstFree / entriesPerBlock) + 1;
+
+                assert this.blockIndex.Count >= newClusterCount;
+
+                if (this.blockIndex.Count > newClusterCount) {
+                    FatVolume.Fat.TruncateChain(
+                        this.blockIndex,
+                        newClusterCount
+                        );
+                }
+
+                uint maxBlock = ((uint)lastEntry + (uint)DirectoryEntriesPerBlock - 1) / (uint)DirectoryEntriesPerBlock;
+                DebugStub.Assert(maxBlock == blockIndex.Count);
+            }
+        }
+
+        private void LockedDeleteMatch(ref FindMatch match)
+        {
+            // Failure beyond this point is fatal.
+            // We found a match of the right type to delete, it'd better
+            // still exist
+            LockedDeleteMatchEntries(ref match);
+
+            int entryEnd = match.AbsoluteEntryOffset +
+                            match.AbsoluteEntryLength;
+            assert this.lastEntry >= entryEnd;
+            if (entryEnd == this.lastEntry) {
+                LockedUpdateEndOfDirectoryMarker(entryEnd);
+            }
+        }
+
+        internal MSD.ErrorCode
+        DeleteFile(char []! in ExHeap filename)
+        {
+            FindMatch match = new FindMatch();
+
+            lock (this) {
+                if (!LockedFindByName(filename, ref match)) {
+                    return MSD.ErrorCode.NotFound;
+                }
+                if (!match.IsFile) {
+                    return MSD.ErrorCode.NotFile;
+                }
+                if (LockedLookupOpenFsObject(match.ShortEntryOffset) != null) {
+                    return MSD.ErrorCode.IsOpen;
+                }
+
+                // Remove from recently used cache if there
+                FatVolume.FileCache.Get(match.FirstCluster);
+
+                LockedDeleteMatch(ref match);
+            }
+            return MSD.ErrorCode.NoError;
+        }
+
+        internal MSD.ErrorCode
+        DeleteDirectory(char []! in ExHeap dirname)
+        {
+            FindMatch match = new FindMatch();
+            lock (this) {
+                if (!LockedFindByName(dirname, ref match)) {
+                    return MSD.ErrorCode.NotFound;
+                }
+                if (!match.IsDirectory) {
+                    return MSD.ErrorCode.NotDirectory;
+                }
+                if (LockedLookupOpenFsObject(match.ShortEntryOffset) != null) {
+                    return MSD.ErrorCode.IsOpen;
+                }
+
+                // Get directory (checking with recently used cache first)
+                Directory toDelete =
+                    FatVolume.DirectoryCache.Get(match.FirstCluster);
+                if (toDelete == null) {
+                    try {
+                        // This is expensive if the directory is
+                        // large and full of entries.  We are
+                        // holding the directory lock and
+                        // stopping the forward progress of
+                        // others here.  We could just scan the
+                        // directory entries directly and see if
+                        // it is empty.
+                        toDelete = new Directory(this,
+                                                 match.ShortEntryOffset,
+                                                 match.FirstCluster);
+                    }
+                    catch (Exception e) {
+                        DebugStub.Print(
+                            "Unexpected exception deleting file {0}\n",
+                            __arglist(e)
+                            );
+                        return MSD.ErrorCode.Unknown;
+                    }
+                }
+
+                if (!toDelete.IsEmpty) {
+                    return MSD.ErrorCode.DirectoryNotEmpty;
+                }
+
+                LockedDeleteMatch(ref match);
+            }
+            return MSD.ErrorCode.NoError;
+        }
+
+        // --------------------------------------------------------------------
+        // Find-by-name related methods
+
+        /// <remarks> Structure for returning find query results.  Note
+        /// the data blocks have been acquired with AcquireBlock and the
+        /// recipient of this structure should call ReplaceBlock for the
+        /// non-null values in <c>firstBlock</c> and <c>secondBlock</c>.
+        /// </remarks>
+        internal struct FindMatch
+        {
+            private int  entryOffset;
+            private int  entryLength;
+            private bool isFile;
+            private int  firstCluster;
+            private byte attributes;
+
+            internal void Initialize(int               theEntryOffset,
+                                     int               theEntryLength,
+                                     byte[]! in ExHeap lastBlock)
+            {
+                this.entryOffset = theEntryOffset;
+                this.entryLength = theEntryLength;
+
+                int deBytes = DirectoryEntry.Length;
+                int entryMask = (lastBlock.Length / deBytes) - 1;
+                int shortEntry =
+                    (theEntryOffset + theEntryLength - 1) & entryMask;
+
+                ref DirectoryEntry de = ref lastBlock[shortEntry * deBytes];
+
+                assert de.IsShortEntry;
+                assert de.IsFile || de.IsDirectory;
+
+                this.isFile       = de.IsFile;
+                this.firstCluster = (int)de.FirstCluster;
+            }
+
+            internal int AbsoluteEntryOffset { get { return entryOffset; } }
+            internal int AbsoluteEntryLength { get { return entryLength; } }
+            internal int ShortEntryOffset
+            {
+                get { return entryOffset + entryLength - 1; }
+            }
+
+            internal bool IsFile       { get { return this.isFile; } }
+            internal bool IsDirectory  { get { return !this.isFile; } }
+            internal int  FirstCluster { get { return this.firstCluster; } }
+        }
+
+        /// <summary> Finds short directory entry of the
+        /// requested file or subdirectory and acquires the
+        /// block associated with the entry. </summary>
+        /// <param name="name">File or directory name to
+        /// find.</param>
+        /// <param name="result">Assigned block and offset
+        /// details on success</param>
+        /// <returns>true on success, false on failure.</returns>
+        private bool
+        LockedFindByName(char[]! in ExHeap name,
+                         ref FindMatch     match)
+            requires name.Length > 0;
+        {
+            if (LockedFindByLongName(name, ref match)) {
+                return true;
+            }
+            return LockedFindByShortName(name, ref match);
+        }
+
+        private bool LockedFindByLongName(char[]! in ExHeap name,
+                                          ref FindMatch     match)
+        {
+            // Walk entries in directory
+            // hash table that match checksum associated with
+            // name.  If there are many hash collisions, we are
+            // hammering the block cache, but we don't expect many.
+
+            const int deLength = DirectoryEntry.Length;
+
+            int    hashCode        = LongDirectoryEntry.GetDirHashCode(name);
+            int    entriesPerBlock = DirectoryEntriesPerBlock;
+            ushort entryOffset;
+            ushort entryLength;
+
+            this.dirHash.ResetSearch();
+            while (this.dirHash.Search(hashCode,
+                                       out entryOffset, out entryLength)) {
+                assert entryOffset < lastEntry;
+                assert (entryBitmap.GetFirstSetBitFrom(entryOffset) ==
+                        entryOffset);
+
+                int    blockNumber = entryOffset / entriesPerBlock;
+                ushort relOffset    = (ushort) (entryOffset % entriesPerBlock);
+                int    byteOffset  = (int) relOffset * deLength;
+
+                byte []! in ExHeap block = (!)AcquireBlock(blockNumber);
+
+                ref DirectoryEntry de = ref block[byteOffset];
+
+                if (!de.IsLongEntry) {
+                    ReleaseBlock(blockNumber, block, false);
+                    continue;
+                }
+
+                ref LongDirectoryEntry le = ref block[byteOffset];
+                assert le.IsValid && le.IsLastEntry;
+                if (le.GetPathLength() != name.Length) {
+                    ReleaseBlock(blockNumber, block, false);
+                    continue;
+                }
+
+                int count = le.GetNumberOfLongEntries();
+                assert count == entryLength - 1;
+                if (relOffset + entryLength - 1 < entriesPerBlock) {
+                    if (LockedMatchLongFragments(name, block,
+                                                 relOffset,
+                                                 entryLength - 1,
+                                                 entryLength - 1)) {
+                        match.Initialize(entryOffset, entryLength, block);
+                        ReleaseBlock(blockNumber, block, false);
+                        return true;
+                    }
+                    ReleaseBlock(blockNumber, block, false);
+                    continue;
+                }
+
+                int excess = relOffset + entryLength - entriesPerBlock;
+                assert excess >= 1 && excess < entryLength;
+                if (!LockedMatchLongFragments(name, block, relOffset,
+                                              entriesPerBlock - relOffset,
+                                              entryLength - 1)) {
+                    ReleaseBlock(blockNumber, block, false);
+                    continue;
+                }
+                ReleaseBlock(blockNumber, block, false);
+
+                blockNumber++;
+                block = (!)AcquireBlock(blockNumber);
+
+                if (LockedMatchLongFragments(name, block, 0,
+                                             excess - 1, excess - 1)) {
+                    match.Initialize(entryOffset, entryLength, block);
+                    ReleaseBlock(blockNumber, block, false);
+                    return true;
+                }
+                ReleaseBlock(blockNumber, block, false);
+            }
+            return false;
+        }
+
+        private bool LockedMatchLongFragments(char[]! in ExHeap name,
+                                              byte[]! in ExHeap block,
+                                              int               entryOffset,
+                                              int               entryCount,
+                                              int               expectedOrdinal)
+        {
+            int deLength = (int)DirectoryEntry.Length;
+            int done = 0;
+            while (done < entryCount) {
+                ref LongDirectoryEntry le = ref block[entryOffset * deLength];
+                assert (le.IsValid && le.ComponentNumber == expectedOrdinal - done);
+                if (!le.NameComponentMatches(name)) {
+                    return false;
+                }
+                entryOffset++;
+                done++;
+            }
+            return true;
+        }
+
+        private bool LockedFindByShortName(char[]! in ExHeap name,
+                                           ref FindMatch     match)
+        {
+            if (!DirectoryEntry.ValidShortName(name) &&
+                !DirectoryEntry.ValidPackedName(name)) {
+                return false;
+            }
+
+            const int deLength  = DirectoryEntry.Length;
+
+            int checksum        = DirectoryEntry.GetDirHashCode(name);
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+
+            ushort entryOffset;
+            ushort entryLength;
+
+            this.dirHash.ResetSearch();
+            while (this.dirHash.Search(checksum,
+                                       out entryOffset, out entryLength)) {
+                assert entryOffset < lastEntry;
+                assert entryLength > 0;
+                assert (entryBitmap.GetFirstSetBitFrom(entryOffset) ==
+                        entryOffset);
+
+                int index  = (int)entryOffset + (int)entryLength - 1;
+                int blockNumber = index / entriesPerBlock;
+                byte []! in ExHeap block = (!)AcquireBlock(blockNumber);
+
+                int byteOffset = (index % entriesPerBlock) * deLength;
+
+                ref DirectoryEntry de = ref block[byteOffset];
+                assert !de.IsLongEntry;
+                int deChecksum = de.GetDirHashCode();
+                assert deChecksum == checksum;
+
+                if (de.HasName(name)) {
+                    match.Initialize(entryOffset, entryLength, block);
+                    ReleaseBlock(blockNumber, block, false);
+                    return true;
+                }
+                ReleaseBlock(blockNumber, block, false);
+            }
+
+            return false;
+        }
+
+        private bool LockedFileOrDirectoryExists(char[]! in ExHeap name)
+        {
+            FindMatch match = new FindMatch();
+            return LockedFindByName(name, ref match);
+        }
+
+        internal bool FileOrDirectoryExists(char[]! in ExHeap name)
+        {
+            // REVIEW: Is this still needed once
+            // we have channels instead of dummy code.
+            lock (this) {
+                if (!LockedFileOrDirectoryExists(name)) {
+                    return LockedFileOrDirectoryExists(name);
+                }
+                return true;
+            }
+        }
+
+        // --------------------------------------------------------------------
+        // Directory Enumeration code begins here
+
+        private int
+        LockedGetEnumerationRecords2(EnumEntry[]! in ExHeap entries,
+                                     uint                   whence,
+                                     out uint               nextWhence)
+        {
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int blockNumber     = Int32.MaxValue;
+
+            byte [] in ExHeap current = null;
+
+            int done = 0;
+            try {
+                do {
+                    // If next position does not correspond to a valid
+                    // entry stop.
+                    whence = (uint)entryBitmap.GetFirstSetBitFrom((int)whence);
+                    if (whence >= lastEntry) {
+                        if (current != null) {
+                            ReleaseBlock(blockNumber, current, false);
+                            current = null;
+                        }
+                        nextWhence = FinalWhence;
+                        return done;
+                    }
+
+                    // If required, acquire block for entry.
+                    int newBlockNumber = (int)whence / entriesPerBlock;
+                    if (newBlockNumber != blockNumber) {
+                        if (current != null) {
+                            ReleaseBlock(blockNumber, current, false);
+                            current = null;
+                        }
+                        blockNumber = newBlockNumber;
+                        current     = AcquireBlock(blockNumber);
+                    }
+                    assert current != null;
+
+                    int offset = (int)whence % entriesPerBlock;
+                    int bOff   = offset * DirectoryEntry.Length;
+
+                    ref DirectoryEntry de = ref current[bOff];
+                    if (de.IsLongEntry) {
+                        ref LongDirectoryEntry le = ref current[bOff];
+                        assert le.IsLastEntry;
+                        int length = le.GetNumberOfLongEntries() + 1;
+                        if (offset + length > entriesPerBlock) {
+                            ReleaseBlock(blockNumber, current, false);
+                            current = null;
+                            expose (entries[done]) {
+                                bool success =
+                                    ReadSplitLongEntry(blockNumber,
+                                                       offset, length,
+                                                       ref entries[done]);
+                                assert success;
+                            }
+                            blockNumber = Int32.MaxValue;
+                        }
+                        else {
+                            expose (entries[done]) {
+                                bool success =
+                                    ReadLongEntry(current, offset, length,
+                                                  ref entries[done]);
+                                assert success;
+                            }
+                        }
+                        whence += (uint)length;
+                    }
+                    else if (de.IsShortEntry) {
+                        expose (entries[done]) {
+                            bool success =
+                                ReadShortEntry(ref de, ref entries[done]);
+                            assert success;
+                        }
+                        whence += 1;
+                    }
+                    else if (whence == 0 && de.IsVolumeId) {
+                        whence += 1;
+                        continue;
+                    }
+                    else {
+                        assert false;
+                    }
+
+                    // Beware "continue"
+                    // keyword above this increment must not be
+                    // rolled into loop termination check.
+                    done = done + 1;
+
+                } while (done < EnumerationChunkSize);
+
+                if (current != null) {
+                    ReleaseBlock(blockNumber, current, false);
+                }
+                nextWhence = whence;
+                return done;
+            }
+            catch (OutOfMemoryException oom) {
+                if (current != null) {
+                    ReleaseBlock(blockNumber, current, false);
+                }
+                for (int i = 0; i < done; i++) {
+                    expose(entries[i]) {
+                        delete entries[done].Path;
+                        entries[done].Path = null;
+                        entries[done].Type = NodeType.BadNode;
+                    }
+                }
+                throw oom;
+            }
+        }
+
+        internal EnumerationRecords[] in ExHeap
+        Enumerate2(uint whence, out uint nextWhence)
+            requires whence >= 0 && whence != FinalWhence;
+        {
+            EnumEntry [] in ExHeap entries;
+            try {
+                entries = new [ExHeap] EnumEntry[EnumerationChunkSize];
+            }
+            catch (OutOfMemoryException) {
+                nextWhence = whence;
+                return null;
+            }
+
+            if (whence == 0 && this.IsRoot == false) {
+                // Skip . and .. entries in enumeration
+                whence += 2;
+            }
+
+            nextWhence = whence;
+            try {
+                int count;
+                lock (this) {
+                    count = LockedGetEnumerationRecords2(entries, whence, out nextWhence);
+                }
+
+                EnumerationRecords [] in ExHeap records =
+                    new [ExHeap] EnumerationRecords[count];
+
+                for (int i = 0; i < count; i++) {
+                    expose (records[i]) {
+                        expose (entries[i]) {
+                            delete records[i].Path;
+                            records[i].Path = (!)entries[i].Path;
+                            entries[i].Path = null;
+                            records[i].Type = entries[i].Type;
+                        }
+                    }
+                }
+                return records;
+            }
+            catch (OutOfMemoryException) {
+                return null;
+            }
+            finally {
+                delete entries;
+            }
+            return null;
+        }
+
+        internal rep struct EnumEntry : ITracked
+        {
+            public char[] in ExHeap Path;
+            public NodeType Type;
+        }
+
+        private bool
+        ReadSplitLongEntry(int           blockNumber,
+                           int           offset,
+                           int           length,
+                           ref EnumEntry result)
+        {
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+
+            byte[]! in ExHeap buffer = (!)AcquireBlock(blockNumber);
+
+            ref LongDirectoryEntry lastEntry =
+                ref buffer[offset * (int)DirectoryEntry.Length];
+
+            char []! in ExHeap name =
+                new [ExHeap] char [lastEntry.GetPathLength()];
+
+            lastEntry.GetPathComponent(name);
+            byte leChecksum = lastEntry.Checksum;
+
+            offset++;
+            length--;
+
+            try {
+                while (offset < entriesPerBlock) {
+                    ref LongDirectoryEntry le =
+                        ref buffer[offset * (int)DirectoryEntry.Length];
+                    if (le.Checksum != leChecksum ||
+                        le.ComponentNumber != length - 1) {
+                        DebugStub.Break();
+                        delete name;
+                        return false;
+                    }
+                    le.GetPathComponent(name);
+                    offset++;
+                    length--;
+                }
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+
+            blockNumber++;
+            buffer = (!)AcquireBlock(blockNumber);
+
+            try {
+                offset = 0;
+                while (length > 1) {
+                    ref LongDirectoryEntry le =
+                        ref buffer[offset * (int)DirectoryEntry.Length];
+                    if (le.Checksum != leChecksum ||
+                        le.ComponentNumber != length - 1) {
+                        DebugStub.Break();
+                        delete name;
+                        return false;
+                    }
+                    le.GetPathComponent(name);
+                    offset++;
+                    length--;
+                }
+
+                ref DirectoryEntry de =
+                    ref buffer[offset * (int)DirectoryEntry.Length];
+                byte deChecksum = de.Checksum;
+                if ((!de.IsFile && !de.IsDirectory) ||
+                    deChecksum != leChecksum) {
+                    DebugStub.Break();
+                    delete name;
+                    return false;
+                }
+
+                // Store result
+                expose (result) {
+                    delete result.Path;
+                    result.Path = name;
+                    result.Type =
+                        de.IsFile ? NodeType.File : NodeType.Directory;
+                }
+                return true;
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+        }
+
+        private bool
+        ReadLongEntry(byte[]! in ExHeap buffer,
+                      int               offset,
+                      int               length,
+                      ref EnumEntry     result)
+        {
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int finalOffset     = offset + length - 1;
+            assert finalOffset <= entriesPerBlock;
+
+            // Validate checksum of short name
+            ref LongDirectoryEntry lastEntry =
+                ref buffer[offset * DirectoryEntry.Length];
+
+            ref DirectoryEntry shortEntry =
+                ref buffer[finalOffset * DirectoryEntry.Length];
+
+            byte seSum = shortEntry.Checksum;
+            byte leSum = lastEntry.Checksum;
+
+            if (seSum != leSum) {
+                Tracing.Log(Tracing.Notice, "Bad checksum {0} != {1}",
+                            seSum, leSum);
+                DebugStub.Break();
+                return false;
+            }
+
+            // Validate entry is a file or directory
+            if (!shortEntry.IsFile && !shortEntry.IsDirectory) {
+                Tracing.Log(Tracing.Notice, "Not file or directory.");
+                return false;
+            }
+
+            char []! in ExHeap path = new [ExHeap] char [lastEntry.GetPathLength()];
+
+            // Copy path components from buffer
+            while (offset != finalOffset) {
+                ref LongDirectoryEntry lde =
+                    ref buffer [(int)offset * DirectoryEntry.Length];
+                lde.GetPathComponent(path);
+                offset++;
+            }
+
+            // Store result
+            expose (result) {
+                delete result.Path;
+                result.Path = path;
+                result.Type =
+                    shortEntry.IsFile ? NodeType.File : NodeType.Directory;
+            }
+            return true;
+        }
+
+        private bool ReadShortEntry(ref DirectoryEntry de,
+                                    ref EnumEntry      result)
+        {
+            if (!de.IsFile && !de.IsDirectory) {
+                return false;
+            }
+
+            expose (result) {
+                delete result.Path;
+                result.Path = de.GetPath();
+                result.Type = (de.IsFile) ? NodeType.File : NodeType.Directory;
+            }
+            return true;
+        }
+
+        private int
+        LockedGetEnumerationRecords(EnumEntry[]! in ExHeap entries,
+                                    uint                   whence,
+                                    out uint               nextWhence)
+        {
+            int done = 0;
+            nextWhence = whence;
+
+            byte [] in ExHeap current = null;
+
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int offset          = (int)whence % entriesPerBlock;
+            int blockNumber     = (int)whence / entriesPerBlock;
+
+            try {
+                current = AcquireBlock(blockNumber);
+                while (done != entries.Length) {
+                    int bOff = (int)offset * DirectoryEntry.Length;
+                    ref DirectoryEntry de = ref ((!)current)[bOff];
+
+                    if (de.IsFinalFreeEntry) {
+                        nextWhence = FinalWhence;
+                        ReleaseBlock(blockNumber, current, false);
+                        return done;
+                    }
+
+                    if (de.IsLongEntry) {
+                        ref LongDirectoryEntry le = ref current[bOff];
+                        if (le.IsLastEntry) {
+                            int length = le.GetNumberOfLongEntries() + 1;
+                            if (offset + length > entriesPerBlock) {
+                                ReleaseBlock(blockNumber, current, false);
+                                current = null;
+                                expose (entries[done]) {
+                                    if (ReadSplitLongEntry(
+                                            blockNumber,
+                                            offset, length,
+                                            ref entries[done])) {
+                                        done++;
+                                    }
+                                }
+                            }
+                            else {
+                                expose (entries[done]) {
+                                    if (ReadLongEntry(current,
+                                                      offset, length,
+                                                      ref entries[done])) {
+                                        done++;
+                                    }
+                                }
+                            }
+                            offset += length;
+                        } else {
+                            // Expected ordinal value to have last
+                            // entry set.
+                            DebugStub.Break();
+                        }
+                    }
+                    else if (de.IsShortEntry) {
+                        expose (entries[done]) {
+                            if (ReadShortEntry(ref de, ref entries[done])) {
+                                done++;
+                            }
+                            offset++;
+                        }
+                    }
+                    else {
+                        // Expect entry to be free here, but
+                        // don't mandate it.
+                        if (de.IsFreeEntry == false &&
+                            de.IsVolumeId  == false) {
+                            FatVolume.LogError("Skipped unexpected entry " +
+                                               "(root={0} blockNumber={1} " +
+                                               "offset={2})",
+                                               IsRoot, blockNumber, offset);
+                        }
+                        offset++;
+                    }
+
+                    if (offset >= entriesPerBlock) {
+                        if (current != null) {
+                            ReleaseBlock(blockNumber, current, false);
+                        }
+                        blockNumber++;
+                        offset  = offset % entriesPerBlock;
+                        current = AcquireBlock(blockNumber);
+                        if (current == null) {
+                            nextWhence = FinalWhence;
+                            return done;
+                        }
+                    }
+                }
+
+                nextWhence = (uint)(blockNumber * entriesPerBlock + offset);
+                ReleaseBlock(blockNumber, (!) current, false);
+                return done;
+            }
+            catch (OutOfMemoryException oom) {
+                if (current != null) {
+                    ReleaseBlock(blockNumber, current, false);
+                }
+                for (int i = 0; i < done; i++) {
+                    expose(entries[i]) {
+                        delete entries[done].Path;
+                        entries[done].Path = null;
+                        entries[done].Type = NodeType.BadNode;
+                    }
+                }
+                throw oom;
+            }
+            return 0;
+        }
+
+        internal EnumerationRecords[] in ExHeap
+        Enumerate(uint whence, out uint nextWhence)
+            requires whence >= 0 && whence != FinalWhence;
+        {
+            EnumEntry [] in ExHeap entries;
+
+            try {
+                entries = new [ExHeap] EnumEntry[EnumerationChunkSize];
+            }
+            catch (OutOfMemoryException) {
+                nextWhence = whence;
+                return null;
+            }
+
+            if (whence == 0 && this.IsRoot == false) {
+                // Skip . and .. entries in enumeration
+                whence += 2;
+            }
+
+            nextWhence = whence;
+            try {
+                int count;
+                lock (this) {
+                    count = LockedGetEnumerationRecords(entries, whence, out nextWhence);
+                }
+
+                EnumerationRecords [] in ExHeap records =
+                    new [ExHeap] EnumerationRecords[count];
+
+                for (int i = 0; i < count; i++) {
+                    expose (records[i]) {
+                        expose (entries[i]) {
+                            delete records[i].Path;
+                            records[i].Path = (!)entries[i].Path;
+                            entries[i].Path = null;
+                            records[i].Type = entries[i].Type;
+                        }
+                    }
+                }
+                return records;
+            }
+            catch (OutOfMemoryException) {
+                // TODO: Handle exception
+                DebugStub.Break();
+            }
+            finally {
+                delete entries;
+            }
+            return null;
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Block acquisition
+
+        private byte [] in ExHeap AcquireBlock(int blockNumber)
+        {
+            byte [] in ExHeap buffer;
+            if (UseClusterCache) {
+                buffer = AcquireClusterBlock(blockNumber);
+            }
+            else {
+                buffer = AcquireNonClusterBlock(blockNumber);
+            }
+            return buffer;
+        }
+
+        private void
+        ReleaseBlock(int                        blockNumber,
+                     [Claims] byte[]! in ExHeap buffer,
+                     bool                       dirty)
+        {
+            if (UseClusterCache) {
+                ReleaseClusterBlock(blockNumber, buffer, dirty);
+            }
+            else {
+                ReleaseNonClusterBlock(blockNumber, buffer, dirty);
+            }
+        }
+
+        private byte [] in ExHeap AcquireClusterBlock(int blockNumber)
+        {
+            assert blockIndex.Count > 0;
+            int cluster;
+            if (blockIndex.Lookup(blockNumber, out cluster) == false) {
+                assert false;
+            }
+            BlockCache bc = FatVolume.ClusterCache;
+            return bc.BeginQuickBlockOperation((uint)cluster);
+        }
+
+        private void ReleaseClusterBlock(
+            int                        blockNumber,
+            [Claims] byte[]! in ExHeap buffer,
+            bool                       dirty
+            )
+        {
+            int cluster;
+            if (blockIndex.Lookup(blockNumber, out cluster) == false) {
+                /* NOT REACHED */
+                assert false;
+            }
+            BlockCache bc = FatVolume.ClusterCache;
+            bc.EndQuickBlockOperation((uint)cluster, buffer, dirty);
+        }
+
+        private byte [] in ExHeap AcquireNonClusterBlock(int blockNumber)
+        {
+            if (blockNumber >= FatVolume.BpbSummary.RootDirectorySectors) {
+                return null;
+            }
+            assert startBlockId != endBlockId;
+            uint        n  = startBlockId + (uint)blockNumber;
+            BlockCache bc = FatVolume.NonClusterCache;
+            return bc.BeginQuickBlockOperation(n);
+        }
+
+        private void ReleaseNonClusterBlock(
+            int                        blockNumber,
+            [Claims] byte[]! in ExHeap buffer,
+            bool                       dirty)
+        {
+            uint       n  = startBlockId + (uint)blockNumber;
+            BlockCache bc = FatVolume.NonClusterCache;
+            bc.EndQuickBlockOperation(n, buffer, dirty);
+        }
+
+        // --------------------------------------------------------------------
+        // Meta-data manipulation functions
+
+        private void GetBlockAndByteOffsets(int     entryOffset,
+                                            out int blockOffset,
+                                            out int byteOffset)
+        {
+            int epb    = DirectoryEntriesPerBlock;
+            blockOffset = entryOffset / epb;
+            byteOffset  =
+                (entryOffset - blockOffset * epb) * DirectoryEntry.Length;
+        }
+
+        internal void UpdateLastWriteTime(int shortEntryOffset)
+            requires shortEntryOffset >= 0;
+        // requires shortEntryOffset < CurrentDirectoryEntryLimit;
+        {
+            int blockOffset, byteOffset;
+            GetBlockAndByteOffsets(shortEntryOffset,
+                                   out blockOffset, out byteOffset);
+            lock (this) {
+                byte []! in ExHeap sector = (!)AcquireBlock(blockOffset);
+                try {
+                    ref DirectoryEntry de = ref sector [byteOffset];
+                    de.UpdateWriteTime();
+                }
+                finally {
+                    ReleaseBlock(blockOffset, sector, true);
+                }
+            }
+        }
+
+        internal void UpdateLastAccessTime(int shortEntryOffset)
+            requires shortEntryOffset >= 0;
+        // requires shortEntryOffset < CurrentDirectoryEntryLimit;
+        {
+            int blockOffset, byteOffset;
+            GetBlockAndByteOffsets(shortEntryOffset,
+                                   out blockOffset, out byteOffset);
+            lock (this) {
+                byte []! in ExHeap sector = (!)AcquireBlock(blockOffset);
+                bool updated = false;
+                try {
+                    ref DirectoryEntry de = ref sector [byteOffset];
+                    updated = de.UpdateAccessTime();
+                }
+                finally {
+                    ReleaseBlock(blockOffset, sector, updated);
+                }
+            }
+        }
+
+        internal void UpdateFileSize(int  shortEntryOffset,
+                                     uint newFileBytes)
+            requires shortEntryOffset >= 0;
+        // requires shortEntryOffset < CurrentDirectoryEntryLimit;
+        {
+            int blockOffset, byteOffset;
+            GetBlockAndByteOffsets(shortEntryOffset,
+                                   out blockOffset, out byteOffset);
+            lock (this) {
+                bool updated = false;
+
+                byte []! in ExHeap sector = (!)AcquireBlock(blockOffset);
+                try {
+                    ref DirectoryEntry de = ref sector [byteOffset];
+                    updated = de.UpdateFileSize(newFileBytes);
+                    DebugStub.Assert(de.FileSize == newFileBytes);
+                }
+                finally {
+                    ReleaseBlock(blockOffset, sector, updated);
+                }
+            }
+        }
+
+        internal byte GetMutableAttributes(int shortEntryOffset)
+        {
+            int blockOffset, byteOffset;
+            GetBlockAndByteOffsets(shortEntryOffset,
+                                   out blockOffset, out byteOffset);
+            lock (this) {
+                byte []! in ExHeap sector = (!)AcquireBlock(blockOffset);
+                try {
+                    ref DirectoryEntry de = ref sector [byteOffset];
+                    return de.MutableAttributes;
+                }
+                finally {
+                    ReleaseBlock(blockOffset, sector, true);
+                }
+            }
+        }
+
+        internal void SetMutableAttributes(int shortEntryOffset,
+                                           byte newAttributes)
+            requires (newAttributes & ~DirectoryEntry.AttributeMutable) == 0;
+        {
+            int blockOffset, byteOffset;
+            GetBlockAndByteOffsets(shortEntryOffset,
+                                   out blockOffset, out byteOffset);
+            lock (this) {
+                byte []! in ExHeap sector = (!)AcquireBlock(blockOffset);
+                bool updated = false;
+                try {
+                    ref DirectoryEntry de = ref sector [byteOffset];
+                    if (de.MutableAttributes != newAttributes) {
+                        de.MutableAttributes = newAttributes;
+                        updated = true;
+                    }
+                }
+                finally {
+                    ReleaseBlock(blockOffset, sector, updated);
+                }
+            }
+        }
+
+        // --------------------------------------------------------------------
+        // Open FsObject cache methods
+
+        [ System.Diagnostics.Conditional("DEBUG") ]
+        private void AssertFsObjectIsOpen(FsObject! fsObject, bool inOpen)
+        {
+            int key = fsObject.ShortEntryOffset;
+            DebugStub.Assert(this.openFsObjects.ContainsKey(key) == inOpen);
+        }
+
+        private void LockedAddOpenFsObject(FsObject! fsObject)
+            requires fsObject.HasOneReference;
+        {
+            AssertFsObjectIsOpen(fsObject, false);
+            this.openFsObjects.Add(fsObject.ShortEntryOffset, fsObject);
+            AssertFsObjectIsOpen(fsObject, true);
+        }
+
+        FsObject LockedLookupOpenFsObject(int shortEntryOffset)
+        {
+            return (FsObject)this.openFsObjects[shortEntryOffset];
+        }
+
+        private void LockedRemoveOpenFsObject(FsObject! fsObject)
+            requires fsObject.HasNoReferences;
+        {
+            this.openFsObjects.Remove(fsObject.ShortEntryOffset);
+        }
+
+        private void LockedCacheClosedObject(FsObject! fsObject)
+        {
+            AssertFsObjectIsOpen(fsObject, false);
+
+            int firstCluster = fsObject.FirstCluster;
+            File file = fsObject as File;
+            if (file != null) {
+                FatVolume.FileCache.Add(firstCluster, file);
+                return;
+            }
+            else {
+                Directory directory = fsObject as Directory;
+                if (directory != null) {
+                    FatVolume.DirectoryCache.Add(firstCluster, directory);
+                }
+            }
+        }
+
+        internal void CloseOpenFsObject(FsObject! fsObject)
+        {
+            lock (this) {
+                fsObject.Release();
+
+                if (fsObject.HasNoReferences) {
+                    LockedRemoveOpenFsObject(fsObject);
+                    LockedCacheClosedObject(fsObject);
+                }
+            }
+        }
+
+        internal int GetOpenFsObjectCount()
+        {
+            lock (this) {
+                return this.openFsObjects.Count;
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Directory operations
+
+        /// <remarks> Close open directory. </remarks>
+        internal void Close()
+        {
+            base.CloseInstance();
+        }
+
+        private MSD.ErrorCode
+        CreateFileOrDirectory(char[]! in ExHeap longName, bool isFile)
+        {
+            if (FatVolume.IsReadOnly) {
+                return MSD.ErrorCode.AccessDenied;
+            }
+
+            if (!ValidName(longName)) {
+                return MSD.ErrorCode.BadArguments;
+            }
+
+            // Allocate buffer for shortname (which has to be computed)
+            char []! in ExHeap shortName;
+            try {
+                shortName =
+                    new [ExHeap] char [DirectoryEntry.ShortNameEntryLength];
+            }
+            catch (OutOfMemoryException) {
+                return MSD.ErrorCode.InsufficientResources;
+            }
+
+            // Allocate a cluster for storage
+            int newFsObjectCluster;
+            int newFsObjectLength;
+            if (!FatVolume.Fat.AllocateChain(this.FirstCluster, 1,
+                                             out newFsObjectCluster,
+                                             out newFsObjectLength)) {
+                delete shortName;
+                return MSD.ErrorCode.CapacityReached;
+            }
+            assert newFsObjectLength == 1;
+
+            lock (this) {
+                MSD.ErrorCode ec =
+                    LockedCreateFileOrDirectory(longName,
+                                                shortName,
+                                                newFsObjectCluster,
+                                                isFile);
+                if (ec != MSD.ErrorCode.NoError) {
+                    FatVolume.Fat.FreeChain(newFsObjectCluster);
+                }
+                delete shortName;
+                return ec;
+            }
+        }
+
+        internal MSD.ErrorCode
+        CreateDirectory(char[]! in ExHeap longName)
+        {
+            return CreateFileOrDirectory(longName, false);
+        }
+
+        internal MSD.ErrorCode
+        CreateFile(char[]! in ExHeap longName)
+        {
+            return CreateFileOrDirectory(longName, true);
+        }
+
+        internal MSD.ErrorCode
+        CreateAndOpenFile(char[]! in ExHeap longName,
+                          out File          file)
+        {
+            file = null;
+
+            lock (this) {
+                MSD.ErrorCode error = CreateFile(longName);
+                if (error == MSD.ErrorCode.NoError) {
+                    return OpenFile(longName, out file);
+                }
+                return error;
+            }
+        }
+
+        private char[]! in ExHeap LockedGetName(int shortEntryOffset)
+        {
+            ushort entryOffset;
+            ushort entryLength;
+            bool   found = false;
+
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int blockNumber     = shortEntryOffset / entriesPerBlock;
+            shortEntryOffset   %= entriesPerBlock;
+
+            byte[]! in ExHeap buffer = (!)AcquireBlock(blockNumber);
+            try {
+                int bOffset = shortEntryOffset * DirectoryEntry.Length;
+                ref DirectoryEntry de = ref buffer[bOffset];
+
+                int hash = de.GetDirHashCode();
+                this.dirHash.ResetSearch();
+                while (this.dirHash.Search(hash,
+                                           out entryOffset, out entryLength)) {
+                    if (shortEntryOffset >= entryOffset &&
+                        shortEntryOffset < (int)entryOffset + (int)entryLength) {
+                        found = true;
+                        break;
+                    }
+                }
+                Debug.Assert(found == true);
+                if (entryLength == 1) {
+                    // Short Entry name, already have directory entry
+                    // with which to extract name
+                    return de.GetPath();
+                }
+                else if ((entryOffset / entriesPerBlock) == blockNumber) {
+                    // Long directory entry within same block
+                    int lbOffset = ((entryOffset % entriesPerBlock) *
+                                    LongDirectoryEntry.Length);
+
+                    ref LongDirectoryEntry lde = ref buffer[lbOffset];
+                    int pathLength = lde.GetPathLength();
+
+                    char []! in ExHeap longName =
+                        new [ExHeap] char [pathLength];
+
+                    int component = lde.ComponentNumber;
+                    while (component-- > 0) {
+                        ref LongDirectoryEntry l = ref buffer[lbOffset];
+                        l.GetPathComponent(longName,
+                                           component * LongDirectoryEntry.CharactersPerEntry);
+                        lbOffset += LongDirectoryEntry.Length;
+                    }
+                    return longName;
+                }
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+
+            // Nightmare :-) Long entry spans two directory blocks...
+            return LockedGetNameSpanning(entryOffset, entryLength);
+        }
+
+        private char[]! in ExHeap LockedGetNameSpanning(int entryStart,
+                                                        int entryLength)
+        {
+            int component  = -1;
+            int localEntry  = entryStart % DirectoryEntriesPerBlock;
+            int blockNumber = entryStart / DirectoryEntriesPerBlock;
+
+            char[] in ExHeap longName;
+
+            byte[]! in ExHeap buffer = (!)AcquireBlock(blockNumber);
+            try {
+                ref LongDirectoryEntry lde =
+                    ref buffer[localEntry * LongDirectoryEntry.Length];
+
+                component = lde.ComponentNumber;
+                longName  = new [ExHeap] char [lde.GetPathLength()];
+
+                while (localEntry < DirectoryEntriesPerBlock) {
+                    component--;
+                    ref LongDirectoryEntry l =
+                        ref buffer[localEntry * LongDirectoryEntry.Length];
+                    l.GetPathComponent(
+                        longName,
+                        component * LongDirectoryEntry.CharactersPerEntry
+                        );
+                    localEntry++;
+                }
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+
+            if (component < 0) {
+                return longName;
+            }
+
+            localEntry = 0;
+            blockNumber++;
+            buffer = (!)AcquireBlock(blockNumber);
+            try {
+                while (localEntry < DirectoryEntriesPerBlock &&
+                       component > 0) {
+                    component--;
+                    ref LongDirectoryEntry l =
+                        ref buffer[localEntry * LongDirectoryEntry.Length];
+                    l.GetPathComponent(
+                        longName,
+                        component * LongDirectoryEntry.CharactersPerEntry
+                        );
+                    localEntry++;
+                }
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+            return longName;
+        }
+
+        internal char[]! in ExHeap GetName(int shortEntryOffset)
+        {
+            lock (this) {
+                return LockedGetName(shortEntryOffset);
+            }
+        }
+
+        internal void LockedGetShortDirectoryEntry(int shortEntryOffset,
+                                                   out DirectoryEntry de)
+        {
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int blockNumber     = shortEntryOffset / entriesPerBlock;
+            shortEntryOffset   %= entriesPerBlock;
+
+            byte[]! in ExHeap buffer = (!)AcquireBlock(blockNumber);
+            try {
+                int bOffset = shortEntryOffset * DirectoryEntry.Length;
+                ref DirectoryEntry rde = ref buffer[bOffset];
+                de = rde;
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+        }
+
+        internal void GetShortDirectoryEntry(int shortEntryOffset,
+                                             out DirectoryEntry de)
+        {
+            lock (this) {
+                LockedGetShortDirectoryEntry(shortEntryOffset, out de);
+            }
+        }
+
+        private void LockedGetAttributes(int shortEntryOffset,
+                                         out MSD.NodeType nodeType,
+                                         out uint sizeBytes)
+        {
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int blockNumber     = shortEntryOffset / entriesPerBlock;
+            shortEntryOffset   %= entriesPerBlock;
+
+            byte[]! in ExHeap buffer = (!)AcquireBlock(blockNumber);
+            try {
+                int bOffset = shortEntryOffset * DirectoryEntry.Length;
+                ref DirectoryEntry de = ref buffer[bOffset];
+
+                if (de.IsFile) {
+                    nodeType = MSD.NodeType.File;
+                }
+                else if (de.IsDirectory) {
+                    nodeType = MSD.NodeType.Directory;
+                }
+                else {
+                    nodeType  = MSD.NodeType.BadNode;
+                }
+                sizeBytes = de.FileSize;
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+        }
+
+        internal void
+        GetAttributes(int              shortEntryOffset,
+                      out MSD.NodeType nodeType,
+                      out uint         sizeBytes)
+        {
+            lock (this) {
+                LockedGetAttributes(shortEntryOffset,
+                                    out nodeType, out sizeBytes);
+            }
+        }
+
+        internal MSD.ErrorCode
+        GetAttributes(char[]! in ExHeap name,
+                      out MSD.NodeType  nodeType,
+                      out uint          sizeBytes)
+        {
+            lock (this) {
+                FindMatch match = new FindMatch();
+
+                if (!LockedFindByName(name, ref match)) {
+                    nodeType  = MSD.NodeType.BadNode;
+                    sizeBytes = 0;
+                    return MSD.ErrorCode.NotFound;
+                }
+
+                LockedGetAttributes(match.ShortEntryOffset,
+                                    out nodeType, out sizeBytes);
+            }
+            return MSD.ErrorCode.NoError;
+        }
+
+        private File LockedInstantiateFileObject(int shortEntryOffset)
+        {
+            int entriesPerBlock = DirectoryEntriesPerBlock;
+            int blockNumber     = shortEntryOffset / entriesPerBlock;
+            shortEntryOffset   %= entriesPerBlock;
+
+            byte[]! in ExHeap buffer = (!)AcquireBlock(blockNumber);
+            try {
+                int bOffset = shortEntryOffset * DirectoryEntry.Length;
+                ref DirectoryEntry de = ref buffer[bOffset];
+                return new File(this,
+                                shortEntryOffset,
+                                (int)de.FirstCluster,
+                                de.MutableAttributes,
+                                de.FileSize);
+            }
+            finally {
+                ReleaseBlock(blockNumber, buffer, false);
+            }
+        }
+
+        private File LockedOpenFile(int shortEntryOffset,
+                                    int firstCluster)
+        {
+            File file = (File)LockedLookupOpenFsObject(shortEntryOffset);
+            if (file != null) {
+                // Add reference to already opened file
+                file.AddRef();
+            }
+            else if (null != (file = FatVolume.FileCache.Get(firstCluster))) {
+                // Resurrect recently closed file in FileCache
+                file.AddRef();
+
+                // LockedAddOpenFsObject(file);
+                File! sgcWorkAround = file;
+                LockedAddOpenFsObject(sgcWorkAround);
+            } else {
+                // Open the file
+                file = LockedInstantiateFileObject(shortEntryOffset);
+                File sgcWorkAround = file;
+                LockedAddOpenFsObject((!)sgcWorkAround);
+            }
+            return file;
+        }
+
+        internal MSD.ErrorCode OpenFile(char []! in ExHeap name,
+                                        out File           file)
+        {
+            file = null;
+
+            if (!ValidName(name)) {
+                return MSD.ErrorCode.BadArguments;
+            }
+
+            lock (this) {
+                FindMatch match = new FindMatch();
+
+                if (!LockedFindByName(name, ref match)) {
+                    return MSD.ErrorCode.NotFound;
+                }
+
+                if (!match.IsFile) {
+                    return MSD.ErrorCode.NotFile;
+                }
+
+                file = LockedOpenFile(match.ShortEntryOffset,
+                                      (int)match.FirstCluster);
+
+                return MSD.ErrorCode.NoError;
+            }
+        }
+
+        private Directory LockedOpenDirectory(int shortEntryOffset,
+                                              int firstCluster)
+        {
+            Directory directory =
+                (Directory)LockedLookupOpenFsObject(shortEntryOffset);
+            if (directory != null) {
+                // Add reference to already opened file
+                directory.AddRef();
+            } else if (null !=
+                       (directory =
+                        FatVolume.DirectoryCache.Get(firstCluster))
+                       ) {
+                // Resurrect recently closed file in DirectoryCache
+                directory.AddRef();
+                Directory! sgcWorkAround = directory;
+                LockedAddOpenFsObject(sgcWorkAround);
+            } else {
+                // Open the directory
+                directory =
+                    new Directory(this, shortEntryOffset, firstCluster);
+                Directory! sgcWorkAround = directory;
+                LockedAddOpenFsObject((!) sgcWorkAround);
+            }
+            return directory;
+        }
+
+        internal MSD.ErrorCode OpenDirectory(char []! in ExHeap name,
+                                             out Directory      directory)
+        {
+            directory = null;
+
+            if (!ValidName(name)) {
+                return MSD.ErrorCode.BadArguments;
+            }
+            else if (name.Length == 2 &&
+                name[0] == '.' && name[1] == '.') {
+                return MSD.ErrorCode.AccessDenied;
+            }
+            else if (name.Length == 1 && name[0] == '.') {
+                this.AddRef();
+                directory = this;
+                return MSD.ErrorCode.NoError;
+            }
+
+            lock (this) {
+                FindMatch match = new FindMatch();
+
+                if (!LockedFindByName(name, ref match)) {
+                    return MSD.ErrorCode.NotFound;
+                }
+
+                if (!match.IsDirectory) {
+                    return MSD.ErrorCode.NotDirectory;
+                }
+
+                directory = LockedOpenDirectory(match.ShortEntryOffset,
+                                                (int)match.FirstCluster);
+
+                return MSD.ErrorCode.NoError;
+            }
+        }
+
+        internal MSD.ErrorCode OpenFsObject(char []! in ExHeap name,
+                                            out FsObject fsObject)
+        {
+            fsObject = null;
+
+            if (!ValidName(name)) {
+                return MSD.ErrorCode.BadArguments;
+            }
+            else if (name.Length == 2 &&
+                name[0] == '.' && name[1] == '.') {
+                return MSD.ErrorCode.AccessDenied;
+            }
+            else if (name.Length == 1 && name[0] == '.') {
+                this.AddRef();
+                fsObject = this;
+                return MSD.ErrorCode.NoError;
+            }
+
+            lock (this) {
+                FindMatch match = new FindMatch();
+
+                if (!LockedFindByName(name, ref match)) {
+                    return MSD.ErrorCode.NotFound;
+                }
+
+                if (match.IsDirectory) {
+                    fsObject =
+                        LockedOpenDirectory(match.ShortEntryOffset,
+                                            (int)match.FirstCluster);
+                }
+                else {
+                    assert match.IsFile;
+                    fsObject = LockedOpenFile(match.ShortEntryOffset,
+                                              (int)match.FirstCluster);
+                }
+                return MSD.ErrorCode.NoError;
+            }
+        }
+
+        internal Directory OpenDirectory()
+        {
+            this.AddRef();
+            return this;
+        }
+
+        static object rootLock = new object();
+        static Directory rootDirectory;
+
+        internal static Directory! OpenRootDirectory()
+        {
+            lock (rootLock) {
+                BpbSummary bpbSummary = FatVolume.BpbSummary;
+
+                if (rootDirectory == null) {
+                    if (FatVolume.FatVersion == FatVersion.Fat32) {
+                        BlockIndex blockIndex = new BlockIndex();
+                        FatVolume.Fat.PopulateIndex(blockIndex,
+                                                    (int)bpbSummary.RootCluster);
+                        rootDirectory = new Directory(blockIndex);
+                    }
+                    else {
+                        uint startSector =
+                            (bpbSummary.ReservedSectors +
+                             bpbSummary.NumberOfFats * bpbSummary.SectorsPerFat);
+                        uint endSector =
+                            startSector + bpbSummary.RootDirectorySectors;
+                        rootDirectory = new Directory(startSector, endSector);
+                    }
+                }
+                return rootDirectory;
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/DirectoryCache.sg b/base/Services/Fat/Fs/DirectoryCache.sg
new file mode 100644
index 0000000..235ea4d
--- /dev/null
+++ b/base/Services/Fat/Fs/DirectoryCache.sg
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryCache.sg
+//
+//  Note:
+//
+//  This cache is for recently closed directories.  Opened
+//  directories are not stored here.  This cache exists because
+//  opening a directory entails a non-trivial amount of work.
+//
+//  Directories do not have a fixed size and this cache should
+//  probably take this into account.
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal class DirectoryCache
+    {
+        FsObjectCache! cache;
+
+        internal DirectoryCache(uint capacity)
+        {
+            this.cache = new FsObjectCache(capacity);
+        }
+
+        internal void Add(int firstCluster, Directory! directory)
+        {
+            cache.Add(firstCluster, directory);
+        }
+
+        internal Directory Get(int firstCluster)
+        {
+            return (Directory)cache.Get(firstCluster);
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/DirectoryEntry.sg b/base/Services/Fat/Fs/DirectoryEntry.sg
new file mode 100644
index 0000000..07300ce
--- /dev/null
+++ b/base/Services/Fat/Fs/DirectoryEntry.sg
@@ -0,0 +1,815 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DirectoryEntry.sg
+//
+//  Note:
+//
+//  Based on page 23 of "Microsoft Extensible Firmware
+//  Initiative FAT32 File System Specification", Version 1.03,
+//  December 6, 2000, Microsoft Corporation.
+
+using System.Runtime.InteropServices;
+using System;
+
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal pointerfree struct DirectoryEntry
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        internal const uint Length = 32;
+
+        internal const byte Name00FreeEntry     = 0xe5;
+        internal const byte Name00LastFreeEntry = 0x00;
+        internal const byte Name00ReallyE5      = 0x05; // Kanji mapping
+
+        internal const byte AsciiSpace  = 0x20;
+        internal const byte AsciiPeriod = 0x2e;
+
+        internal const byte AttributeReadOnly  = 0x01;
+        internal const byte AttributeHidden    = 0x02;
+        internal const byte AttributeSystem    = 0x04;
+        internal const byte AttributeVolumeId  = 0x08;
+        internal const byte AttributeDirectory = 0x10;
+        internal const byte AttributeArchive   = 0x20;
+        internal const byte AttributeLongName  = (byte)(AttributeReadOnly |
+                                                        AttributeHidden |
+                                                        AttributeSystem |
+                                                        AttributeVolumeId);
+        internal const byte AttributeLongNameMask = (byte)(AttributeLongName |
+                                                           AttributeDirectory |
+                                                           AttributeArchive);
+
+        // Mutable attributes on a file or directory
+        internal const byte AttributeMutable   = (byte)(AttributeReadOnly |
+                                                         AttributeHidden |
+                                                         AttributeSystem);
+
+        private  const int DayShift   = 0;
+        private  const int DayWidth   = 5;
+        private  const int MonthShift = 5;
+        private  const int MonthWidth = 4;
+        private  const int YearShift  = 9;
+        private  const int YearWidth  = 7;
+        private  const int BaseYear   = 1980;
+
+        private  const int TwoSecondShift = 0;
+        private  const int TwoSecondWidth = 5;
+        private  const int MinuteShift    = 5;
+        private  const int MinuteWidth    = 6;
+        private  const int HourShift      = 11;
+        private  const int HourWidth      = 5;
+
+        internal const int ShortNameMaxLength      = 12;    // 8.3
+        internal const int ShortNameEntryLength    = 11;    // 8 + 3;
+        internal const int ShortNameMaxBaseName    = 8;
+        internal const int ShortNameMaxExtension   = 3;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Members
+
+        private  byte   name00;                         // 0..10
+        private  byte   name01;
+        private  byte   name02;
+        private  byte   name03;
+        private  byte   name04;
+        private  byte   name05;
+        private  byte   name06;
+        private  byte   name07;
+        private  byte   name08;
+        private  byte   name09;
+        private  byte   name10;
+        private  byte   attribute;                      // 11
+        private  byte   NtReserved;                     // 12
+        private  byte   CreationTimeTenths;             // 13
+        private  ushort creationTime;                   // 14..15
+        private  ushort creationDate;                   // 16..17
+        private  ushort lastAccessDate;                 // 18..19
+        private  ushort firstClusterHi;                 // 20..21
+        private  ushort lastWriteTime;                  // 22..23
+        private  ushort lastWriteDate;                  // 24..25
+        private  ushort firstClusterLo;                 // 26..27
+        private  uint   fileSize;                       // 28..31
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal bool IsFreeEntry
+        {
+            get { return name00 == Name00FreeEntry; }
+        }
+
+        internal bool IsFinalFreeEntry
+        {
+            get { return name00 == Name00LastFreeEntry; }
+        }
+
+        internal bool IsLongEntry
+        {
+            get {
+                return ((attribute == AttributeLongName) &&
+                        !IsFinalFreeEntry && !IsFreeEntry);
+            }
+        }
+
+        internal bool IsShortEntry
+        {
+            get {
+                return ((attribute != AttributeLongName) &&
+                        ((attribute & AttributeVolumeId) == 0) &&
+                        !IsFreeEntry && !IsFinalFreeEntry);
+            }
+        }
+
+        internal bool IsFile
+        {
+            get {
+                return ((attribute & (AttributeDirectory | AttributeVolumeId))
+                        == 0);
+            }
+        }
+
+        internal bool IsDirectory
+        {
+            get {
+                return ((attribute & (AttributeDirectory | AttributeVolumeId))
+                         == AttributeDirectory);
+            }
+        }
+
+        internal bool IsVolumeId
+        {
+            get {
+                return ((attribute & (AttributeDirectory | AttributeVolumeId))
+                         == AttributeVolumeId);
+            }
+        }
+
+        internal bool IsParentPointer
+        {
+            get {
+                return (IsDirectory &&
+                        this.name00 == AsciiPeriod &&
+                        this.name01 == AsciiPeriod &&
+                        this.name02 == AsciiSpace  &&
+                        this.name03 == AsciiSpace  &&
+                        this.name04 == AsciiSpace  &&
+                        this.name05 == AsciiSpace  &&
+                        this.name06 == AsciiSpace  &&
+                        this.name07 == AsciiSpace  &&
+                        this.name08 == AsciiSpace  &&
+                        this.name09 == AsciiSpace  &&
+                        this.name10 == AsciiSpace);
+            }
+        }
+
+        internal bool IsSelfPointer
+        {
+            get {
+                return (IsDirectory &&
+                        this.name00 == AsciiPeriod &&
+                        this.name01 == AsciiSpace  &&
+                        this.name02 == AsciiSpace  &&
+                        this.name03 == AsciiSpace  &&
+                        this.name04 == AsciiSpace  &&
+                        this.name05 == AsciiSpace  &&
+                        this.name06 == AsciiSpace  &&
+                        this.name07 == AsciiSpace  &&
+                        this.name08 == AsciiSpace  &&
+                        this.name09 == AsciiSpace  &&
+                        this.name10 == AsciiSpace);
+            }
+        }
+
+        ushort CreationTime
+        {
+            get { return ByteOrder.LittleEndianToHost(creationTime); }
+            set { creationTime = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        ushort CreationDate
+        {
+            get { return ByteOrder.LittleEndianToHost(creationDate); }
+            set { creationDate = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        ushort LastAccessDate
+        {
+            get { return ByteOrder.LittleEndianToHost(lastAccessDate); }
+            set { lastAccessDate = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint FirstCluster
+        {
+            get {
+                return (((uint)ByteOrder.LittleEndianToHost(firstClusterHi)) << 16) + ByteOrder.LittleEndianToHost(firstClusterLo);
+            }
+            set {
+                firstClusterHi = ByteOrder.HostToLittleEndian((ushort)(value >> 16));
+                firstClusterLo = ByteOrder.HostToLittleEndian((ushort)(value & 0xffff));
+            }
+        }
+
+        ushort LastWriteTime
+        {
+            get { return ByteOrder.LittleEndianToHost(lastWriteTime); }
+            set { lastWriteTime = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        ushort LastWriteDate
+        {
+            get { return ByteOrder.LittleEndianToHost(lastWriteDate); }
+            set { lastWriteDate = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        uint FileSize
+        {
+            internal get { return ByteOrder.LittleEndianToHost(fileSize); }
+            set { fileSize = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        ushort MakeDate(DateTime when)
+            requires when.Year >= BaseYear;
+        {
+            // We could be in 1979 because of timezone, but we're not obliged
+            // to support such legacy and we're certainly not writing files
+            // with this datestamp...
+            return (ushort) (((when.Year - BaseYear) << YearShift) |
+                             (when.Month << MonthShift) |
+                             (when.Day   << DayShift));
+        }
+
+        ushort MakeTime(DateTime when)
+        {
+            return (ushort) ((when.Hour   << HourShift)   |
+                             (when.Minute << MinuteShift) |
+                             ((when.Second / 2) << TwoSecondShift));
+        }
+
+        byte MakeTenths(DateTime when)
+        {
+            // The spec calls this value tenths.
+            // It's plainly hundredths from the definition.
+            int tenths = (when.Second % 2) * 100 + when.Millisecond / 10;
+            return (byte)tenths;
+        }
+
+        internal void Invalidate(bool toBeLastEntry)
+        {
+            this.name00 = toBeLastEntry ? Name00LastFreeEntry : Name00FreeEntry;
+            this.name01 = this.name02 = this.name03 = this.name04 = 0;
+            this.name05 = this.name06 = this.name07 = this.name08 = 0;
+            this.name09 = this.name10 = 0;
+            this.attribute          = 0;
+            this.CreationTimeTenths = 0;
+            this.creationTime       = 0;
+            this.creationDate       = 0;
+            this.lastAccessDate     = 0;
+            this.lastWriteTime      = 0;
+            this.lastWriteDate      = 0;
+            this.firstClusterLo     = 0;
+            this.firstClusterHi     = 0;
+            this.fileSize           = 0;
+        }
+
+        private void Initialize(char[]! in ExHeap shortNameEntry,
+                                byte              attributes,
+                                uint              cluster)
+            requires shortNameEntry.Length == ShortNameEntryLength;
+        {
+            this.CopyShortNameEntry(shortNameEntry);
+            this.SetInitialMetaData(attributes, cluster);
+        }
+
+        private void SetInitialMetaData(byte attributes,
+                                        uint cluster)
+        {
+            DateTime now  = DateTime.Now;
+            ushort   time = MakeTime(now);
+            ushort   date = MakeDate(now);
+
+            this.attribute          = attributes;
+            this.NtReserved         = 0;
+            this.FirstCluster       = cluster;
+            this.CreationDate       = date;
+            this.CreationTime       = time;
+            this.CreationTimeTenths = MakeTenths(now);
+            this.LastAccessDate     = date;
+            this.LastWriteTime      = time;
+            this.LastWriteDate      = date;
+            this.FileSize           = 0;
+        }
+
+        /// <remarks> Properties for mutable attribute bits
+        /// (ReadOnly, System, Hidden) </remarks>
+        internal byte MutableAttributes
+        {
+            get {
+                return (byte)(this.attribute & AttributeMutable);
+            }
+            set {
+                int tmp = (this.attribute & AttributeMutable) | value;
+                this.attribute = (byte)tmp;
+            }
+        }
+
+        internal void InitializeAsDirectory(char[]! in ExHeap validName,
+                                            uint cluster)
+        {
+            Initialize(validName, AttributeDirectory, cluster);
+        }
+
+        internal void InitializeAsFile(char[]! in ExHeap validName,
+                                       uint cluster)
+        {
+            Initialize(validName, AttributeArchive, cluster);
+        }
+
+        internal void InitializeAsVolumeId(char[]! in ExHeap validName)
+        {
+            Initialize(validName, AttributeVolumeId, 0);
+        }
+
+        internal void InitializeAsParentPointer(uint parentCluster)
+        {
+            this.name00 = this.name01 = AsciiPeriod;
+            this.name02 = this.name03 = this.name04 = AsciiSpace;
+            this.name05 = this.name06 = this.name07 = AsciiSpace;
+            this.name08 = this.name09 = this.name10 = AsciiSpace;
+
+            this.attribute    = AttributeDirectory;
+            this.NtReserved   = 0;
+            this.FirstCluster = parentCluster;
+
+            DateTime now  = DateTime.Now;
+            ushort   time = MakeTime(now);
+            ushort   date = MakeDate(now);
+
+            this.CreationDate       = date;
+            this.CreationTime       = time;
+            this.CreationTimeTenths = MakeTenths(now);
+            this.LastAccessDate     = date;
+            this.LastWriteTime      = time;
+            this.LastWriteDate      = date;
+            this.FileSize           = 0;
+        }
+
+        internal void InitializeAsSelfPointer(uint firstCluster)
+        {
+            this.name00 = AsciiPeriod;
+            this.name01 = this.name02 = this.name03 = this.name04 = AsciiSpace;
+            this.name05 = this.name06 = this.name07 = this.name08 = AsciiSpace;
+            this.name09 = this.name10 = AsciiSpace;
+
+            this.attribute    = AttributeDirectory;
+            this.NtReserved   = 0;
+            this.FirstCluster = firstCluster;
+
+            DateTime now  = DateTime.Now;
+            ushort   time = MakeTime(now);
+            ushort   date = MakeDate(now);
+
+            this.CreationDate       = date;
+            this.CreationTime       = time;
+            this.CreationTimeTenths = MakeTenths(now);
+            this.LastAccessDate     = date;
+            this.LastWriteTime      = time;
+            this.LastWriteDate      = date;
+            this.FileSize           = 0;
+        }
+
+        internal bool UpdateAccessTime()
+        {
+            ushort now = MakeDate(DateTime.Now);
+            if (this.LastAccessDate != now) {
+                this.LastAccessDate = now;
+                return true;
+            }
+            return false;
+        }
+
+        internal bool UpdateFileSize(uint newFileBytes)
+        {
+            bool updated = this.UpdateWriteTime();
+            if (this.FileSize != newFileBytes) {
+                this.FileSize = newFileBytes;
+                updated = true;
+            }
+            return updated;
+        }
+
+        internal bool UpdateWriteTime()
+        {
+            DateTime now  = DateTime.Now;
+            ushort   date = MakeDate(now);
+            ushort   time = MakeTime(now);
+            if (this.LastWriteTime != time ||
+                this.LastWriteDate != date) {
+                this.LastWriteTime  = time;
+                this.LastWriteDate  = date;
+                this.LastAccessDate = date;
+                return true;
+            }
+            return false;
+        }
+
+        internal static bool ValidShortNameCharacter(char c)
+        {
+            // Page 24 of FAT spec.
+
+            if (c > 127) {
+                return true;
+            }
+            if ((c  < 0x20) || (c == 0x22) || (c >= 0x2a && c <= 0x2c) ||
+                (c == 0x2e) || (c == 0x2f) || (c >= 0x3a && c <= 0x3f) ||
+                (c >= 0x5b && c <= 0x5d)) {
+                return false;
+            }
+            return true;
+        }
+
+        internal static bool ValidShortName(char[]! in ExHeap name)
+        {
+            if (name.Length == 0 || name.Length > ShortNameMaxLength) {
+                return false;
+            }
+            else if (name[0] == '.') {
+                // Dot in position zero reserved for Directory names ".", ".."
+                return false;
+            }
+
+            int dotLocation = -1;
+
+            for (int i = 0; i < name.Length; i++) {
+                char c = Char.ToUpper(name[i]);
+                if (ValidShortNameCharacter(c)) {
+                    continue;
+                }
+                else if (c == '.') {
+                    if (dotLocation > 0) {
+                        // Two dots are not permitted in name.
+                        return false;
+                    }
+                    dotLocation = i;
+                }
+            }
+
+            if (dotLocation > 0) {
+                if (name.Length - dotLocation > ShortNameMaxExtension + 1) {
+                    // File extension is too long.
+                    return false;
+                }
+                else if (dotLocation > ShortNameMaxBaseName) {
+                    // File base name is too long.
+                    return false;
+                }
+            }
+            else if (name.Length > ShortNameMaxBaseName) {
+                // File base name is too long without a dot.
+                return false;
+            }
+            return true;
+        }
+
+        internal static bool ValidPackedName(char[]! in ExHeap shortName)
+        {
+            if (shortName.Length != ShortNameEntryLength) {
+                return false;
+            }
+            if (shortName[ShortNameMaxBaseName] == '.' ||
+                shortName[ShortNameMaxBaseName - 1] == '.' ||
+                shortName[0] == '.') {
+                return false;
+            }
+            for (int i = 0; i < shortName.Length; i++) {
+                char c = Char.ToUpper(shortName[i]);
+                if (!ValidShortNameCharacter(c)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /// <summary> Returns the length of the provided name
+        /// excluding any trailing spaces. </summary>
+        private static int UnpaddedLength(char[]! in ExHeap shortName)
+        {
+            int l = shortName.Length;
+            while (l > 0) {
+                if (shortName[l - 1] != ' ') {
+                    return l;
+                }
+                l--;
+            }
+            return 0;
+        }
+
+        internal void CopyShortNameEntry(char[]! in ExHeap shortNameEntry)
+            requires shortNameEntry.Length == ShortNameEntryLength;
+        {
+            name00 = (byte)Char.ToUpper(shortNameEntry[0]);
+            name01 = (byte)Char.ToUpper(shortNameEntry[1]);
+            name02 = (byte)Char.ToUpper(shortNameEntry[2]);
+            name03 = (byte)Char.ToUpper(shortNameEntry[3]);
+            name04 = (byte)Char.ToUpper(shortNameEntry[4]);
+            name05 = (byte)Char.ToUpper(shortNameEntry[5]);
+            name06 = (byte)Char.ToUpper(shortNameEntry[6]);
+            name07 = (byte)Char.ToUpper(shortNameEntry[7]);
+            name08 = (byte)Char.ToUpper(shortNameEntry[8]);
+            name09 = (byte)Char.ToUpper(shortNameEntry[9]);
+            name10 = (byte)Char.ToUpper(shortNameEntry[10]);
+        }
+
+        /// <summary> Packs short name into directory entry. </summary>
+        /// <param name="validShortName"> Name to be packed.  The name may be
+        /// padded with trailing spaces. </param>
+        internal void PackShortName(char[]! in ExHeap validShortName)
+        {
+            int upLength = UnpaddedLength(validShortName);
+            int dot      = upLength;
+
+            for (int i = upLength - 1; i >= 0; i--) {
+                if (validShortName[i] == '.') {
+                    dot = i;
+                    break;
+                }
+            }
+
+            // Valid name assertions (weak)
+            assert dot != 0;
+            assert dot <= ShortNameMaxBaseName;
+            assert upLength - dot - 1 <= ShortNameMaxExtension;
+
+            // Mark all characters as space to signify empty.
+            name00 = name01 = name02 = name03 = name04 = name05 = (byte)' ';
+            name06 = name07 = name08 = name09 = name10 = (byte)' ';
+
+            switch (dot) {
+                case 8:
+                    name07 = (byte)Char.ToUpper(validShortName[7]);
+                    goto case 7;
+                case 7:
+                    name06 = (byte)Char.ToUpper(validShortName[6]);
+                    goto case 6;
+                case 6:
+                    name05 = (byte)Char.ToUpper(validShortName[5]);
+                    goto case 5;
+                case 5:
+                    name04 = (byte)Char.ToUpper(validShortName[4]);
+                    goto case 4;
+                case 4:
+                    name03 = (byte)Char.ToUpper(validShortName[3]);
+                    goto case 3;
+                case 3:
+                    name02 = (byte)Char.ToUpper(validShortName[2]);
+                    goto case 2;
+                case 2:
+                    name01 = (byte)Char.ToUpper(validShortName[1]);
+                    goto case 1;
+                case 1:
+                    name00 = (byte)Char.ToUpper(validShortName[0]);
+                    break;
+            }
+
+            switch (upLength - dot - 1) {
+                case 3:
+                    name10 = (byte)Char.ToUpper(validShortName[dot + 3]);
+                    goto case 2;
+                case 2:
+                    name09 = (byte)Char.ToUpper(validShortName[dot + 2]);
+                    goto case 1;
+                case 1:
+                    name08 = (byte)Char.ToUpper(validShortName[dot + 1]);
+                    goto case 0;
+                case 0:  break;
+                case -1: break;
+                default:
+                    DebugStub.Break();
+                    break;
+            }
+
+            int bl = GetBaseLength();
+            int tl = GetTailLength();
+            assert ((bl + tl + 1 == upLength) ||       // Dot present.
+                    (dot == upLength && dot == bl));   // No dot.
+        }
+
+        private int GetTailLength()
+        {
+            if (name10 != AsciiSpace) return 3;
+            if (name09 != AsciiSpace) return 2;
+            if (name08 != AsciiSpace) return 1;
+            return 0;
+        }
+
+        private int GetBaseLength()
+        {
+            if (name07 != AsciiSpace) return 8;
+            if (name06 != AsciiSpace) return 7;
+            if (name05 != AsciiSpace) return 6;
+            if (name04 != AsciiSpace) return 5;
+            if (name03 != AsciiSpace) return 4;
+            if (name02 != AsciiSpace) return 3;
+            if (name01 != AsciiSpace) return 2;
+            if (name00 != AsciiSpace) return 1;
+            return 0;
+        }
+
+        public int GetPathLength()
+        {
+            int head = GetBaseLength();
+            int tail = GetTailLength();
+            return (tail == 0) ? head : head + tail + 1;
+        }
+
+        private void CopyBase(int length, char []! in ExHeap s)
+            requires s.Length >= length;
+            requires length > 0;
+        {
+            switch (length) {
+                case 8: s[7] = (char)name07; goto case 7;
+                case 7: s[6] = (char)name06; goto case 6;
+                case 6: s[5] = (char)name05; goto case 5;
+                case 5: s[4] = (char)name04; goto case 4;
+                case 4: s[3] = (char)name03; goto case 3;
+                case 3: s[2] = (char)name02; goto case 2;
+                case 2: s[1] = (char)name01; break;
+                case 1: break;
+            }
+            if (name00 == Name00ReallyE5) {
+                s[0] = (char)((byte)0xe5);
+            }
+            else {
+                s[0] = (char)name00;
+            }
+        }
+
+        private void CopyTail(int offset, int length, char[]! in ExHeap s)
+            requires offset + length == s.Length;
+        {
+            switch (length) {
+                case 3: s[offset + 2] = (char)name10; goto case 2;
+                case 2: s[offset + 1] = (char)name09; goto case 1;
+                case 1: s[offset + 0] = (char)name08; break;
+                case 0: break;
+            }
+        }
+
+        internal char[]! in ExHeap GetPath()
+        {
+            int baseLength = GetBaseLength();
+            int tailLength = GetTailLength();
+
+            if (tailLength == 0) {
+                char[] in ExHeap path = new [ExHeap] char [baseLength];
+                CopyBase(baseLength, path);
+                return path;
+            }
+            else {
+                char[] in ExHeap path =
+                    new [ExHeap] char [baseLength + tailLength + 1];
+                CopyBase(baseLength, path);
+                path[baseLength] = (char)AsciiPeriod;
+                CopyTail(baseLength + 1, tailLength, path);
+                return path;
+            }
+        }
+
+        private byte ChecksumStep(byte sum, byte newValue)
+        {
+            int s = (int)sum;
+            int t = ((s & 1) << 7) + (s >> 1);
+            return (byte) ((int)t + (int)newValue);
+        }
+
+        internal byte Checksum
+        {
+            get {
+                byte sum = 0;
+                sum = ChecksumStep(sum, name00);
+                sum = ChecksumStep(sum, name01);
+                sum = ChecksumStep(sum, name02);
+                sum = ChecksumStep(sum, name03);
+                sum = ChecksumStep(sum, name04);
+                sum = ChecksumStep(sum, name05);
+                sum = ChecksumStep(sum, name06);
+                sum = ChecksumStep(sum, name07);
+                sum = ChecksumStep(sum, name08);
+                sum = ChecksumStep(sum, name09);
+                sum = ChecksumStep(sum, name10);
+                return sum;
+            }
+        }
+
+        internal int GetDirHashCode()
+        {
+            int sum = 0;
+            int length = GetBaseLength();
+            sum = length * 9601;
+
+            switch (GetBaseLength()) {
+                case 8: sum += (int)name07; goto case 7;
+                case 7: sum += (int)name06; goto case 6;
+                case 6: sum += (int)name05; goto case 5;
+                case 5: sum += (int)name04; goto case 4;
+                case 4: sum += (int)name03; goto case 3;
+                case 3: sum += (int)name02; goto case 2;
+                case 2: sum += (int)name01; goto case 1;
+                case 1:
+                    if (name00 == Name00ReallyE5) {
+                        sum += 0xe5;
+                    }
+                    else {
+                        sum += (int)name00;
+                    }
+                    break;
+                case 0: break;
+            }
+
+            length = GetTailLength();
+            sum = sum + length * 10313;
+            switch (GetTailLength()) {
+                case 3: sum += (int)name10; goto case 2;
+                case 2: sum += (int)name09; goto case 1;
+                case 1: sum += (int)name08; break;;
+                case 0: break;
+            }
+            return sum & DHashtable.MaxKeyValue;
+        }
+
+        internal static int GetDirHashCode(char []! in ExHeap shortName)
+        {
+            if (shortName.Length == ShortNameEntryLength &&
+                shortName[ShortNameMaxBaseName] != '.' &&
+                shortName[ShortNameMaxBaseName - 1] != '.') {
+                // Name looks like it is already packed - it's 11 characters
+                // long and not 8.2 nor 7.3.  There are no other valid
+                // short names that are 11 characters long.
+                DirectoryEntry de = new DirectoryEntry();
+                de.name00 = (byte)Char.ToUpper(shortName[0]);
+                de.name01 = (byte)Char.ToUpper(shortName[1]);
+                de.name02 = (byte)Char.ToUpper(shortName[2]);
+                de.name03 = (byte)Char.ToUpper(shortName[3]);
+                de.name04 = (byte)Char.ToUpper(shortName[4]);
+                de.name05 = (byte)Char.ToUpper(shortName[5]);
+                de.name06 = (byte)Char.ToUpper(shortName[6]);
+                de.name07 = (byte)Char.ToUpper(shortName[7]);
+                de.name08 = (byte)Char.ToUpper(shortName[8]);
+                de.name09 = (byte)Char.ToUpper(shortName[9]);
+                de.name10 = (byte)Char.ToUpper(shortName[10]);
+                return de.GetDirHashCode();
+            }
+            else {
+                DirectoryEntry de = new DirectoryEntry();
+                de.PackShortName(shortName);
+                return de.GetDirHashCode();
+            }
+        }
+
+        internal bool HasName(char []! in ExHeap name)
+        {
+            if (name.Length == ShortNameEntryLength &&
+                name[ShortNameMaxBaseName] != '.' &&
+                name[ShortNameMaxBaseName - 1] != '.') {
+                // Name looks like it is already packed - it's 11 characters
+                // long and not 8.2 nor 7.3.  There are no other valid
+                // short names that are 11 characters long.
+                return (this.name00 == (byte)Char.ToUpper(name[0]) &&
+                        this.name01 == (byte)Char.ToUpper(name[1]) &&
+                        this.name02 == (byte)Char.ToUpper(name[2]) &&
+                        this.name03 == (byte)Char.ToUpper(name[3]) &&
+                        this.name04 == (byte)Char.ToUpper(name[4]) &&
+                        this.name05 == (byte)Char.ToUpper(name[5]) &&
+                        this.name06 == (byte)Char.ToUpper(name[6]) &&
+                        this.name07 == (byte)Char.ToUpper(name[7]) &&
+                        this.name08 == (byte)Char.ToUpper(name[8]) &&
+                        this.name09 == (byte)Char.ToUpper(name[9]) &&
+                        this.name10 == (byte)Char.ToUpper(name[10]));
+            }
+            else {
+                DirectoryEntry de = new DirectoryEntry();
+                de.PackShortName(name);
+                return (this.name00 == de.name00 &&
+                        this.name01 == de.name01 &&
+                        this.name02 == de.name02 &&
+                        this.name03 == de.name03 &&
+                        this.name04 == de.name04 &&
+                        this.name05 == de.name05 &&
+                        this.name06 == de.name06 &&
+                        this.name07 == de.name07 &&
+                        this.name08 == de.name08 &&
+                        this.name09 == de.name09 &&
+                        this.name10 == de.name10);
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/Disk.sg b/base/Services/Fat/Fs/Disk.sg
new file mode 100644
index 0000000..6e296c2
--- /dev/null
+++ b/base/Services/Fat/Fs/Disk.sg
@@ -0,0 +1,472 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Disk.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+
+using System;
+using System.Threading;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <summary>
+    /// Class responsible for performing low-level disk I/O.
+    /// </summary>
+    internal class DiskEndpoint
+    {
+        internal TRef<DiskDeviceContract.Imp:Ready> epTRef;
+
+        internal DiskEndpoint([Claims] DiskDeviceContract.Imp:Ready! diskImp)
+        {
+            epTRef = new TRef<DiskDeviceContract.Imp:Ready>(diskImp);
+        }
+
+        internal byte[] in ExHeap Read(ulong                      sectorId,
+                                       [Claims] byte[]! in ExHeap data)
+
+        {
+            DiskDeviceContract.Imp:Ready! imp = epTRef.Acquire();
+            ulong dataLength = (ulong)data.Length;
+            imp.SendRead(data, 0, dataLength, sectorId);
+            switch receive {
+                case imp.RecvAckRead(outBuffer):
+                    epTRef.Release(imp);
+                    return outBuffer;
+                    break;
+                case imp.RecvNakRead():
+                    epTRef.Release(imp);
+                    return null;
+                    break;
+                case imp.ChannelClosed():
+                    delete imp;
+                    throw new ChannelClosedException();
+                    break;
+            }
+        }
+
+        internal byte[] in ExHeap Write(ulong                      sectorId,
+                                        [Claims] byte[]! in ExHeap data)
+        {
+            return Write(sectorId, data, 0, (uint)data.Length);
+        }
+
+        internal byte[] in ExHeap
+        Write(ulong                      sectorId,
+              [Claims] byte[]! in ExHeap data,
+              uint                       dataStart,
+              uint                       dataBytesToWrite)
+        {
+            DiskDeviceContract.Imp:Ready! imp = epTRef.Acquire();
+            imp.SendWrite(data, dataStart, (ulong)dataBytesToWrite, sectorId);
+            switch receive {
+                case imp.RecvAckWrite(outBuffer):
+                    epTRef.Release(imp);
+                    return outBuffer;
+                    break;
+                case imp.RecvNakWrite():
+                    epTRef.Release(imp);
+                    Tracing.Log(Tracing.Warning,
+                                "FatFs received disk NakWrite for sector {0}.",
+                                sectorId);
+                    return null;
+                    break;
+                case imp.ChannelClosed():
+                    delete imp;
+                    throw new ChannelClosedException();
+                    break;
+            }
+        }
+    } // end class Endpoint
+
+    /// <summary>
+    /// Class responsible for maintaining pool of disk endpoints.
+    /// </summary>
+    internal class DiskEndpointPool
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Fields
+
+        DiskEndpoint[] endpoints;
+        int available;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Invariants
+
+        // invariant available >= 0 && available <= endpoints.Length;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal DiskEndpointPool(int capacity)
+        {
+            endpoints = new DiskEndpoint[capacity];
+            available = 0;
+        }
+
+        internal int Capacity { get { return endpoints.Length; } }
+
+        /// <summary>
+        /// Takes DiskEndpoint from the Pool for use.
+        /// <para>This method takes an endpoint from the pool.
+        ///  If no endpoints are available, this method blocks.</para>
+        /// </summary>
+        internal DiskEndpoint! Get()
+        {
+            Monitor.Enter(this);
+            try
+            {
+                for (;;) {
+                    if (available > 0) {
+                        // Programmer error missed
+                        // the return statement here.  The compiler generated
+                        // no warning and obviously locked the application.
+                        return InternalGet();
+                    }
+                    Monitor.Wait(this);
+                }
+            }
+            finally {
+                Monitor.Exit(this);
+            }
+        }
+
+        /// <summary>
+        /// Places DiskEndpoint in the pool for potential use by others.
+        /// </summary>
+        internal void Add(DiskEndpoint! endpoint)
+        {
+            Monitor.Enter(this);
+            try
+            {
+                InternalAdd(endpoint);
+                Monitor.Pulse(this);
+            }
+            finally {
+                Monitor.Exit(this);
+            }
+        }
+
+        private DiskEndpoint! InternalGet()
+            // requires monitor held
+            requires available > 0;
+            ensures available == old(available) - 1;
+        {
+            return (!) endpoints[--available];
+        }
+
+        private void InternalAdd(DiskEndpoint! endpoint)
+            // requires monitor held
+            requires available < endpoints.Length;
+            ensures  available == old(available) + 1;
+        {
+            endpoints[available++] = endpoint;
+        }
+    }
+
+    internal class Disk
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        internal const int BytesPerSector = 512;
+        internal const ushort NoSystemId  = 0xffff;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Members
+
+        string!           name;
+        DiskEndpointPool! endpoints;
+        ulong             startSector;
+        ulong             totalSectors;
+        ushort            systemId;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        private Disk(string!           diskName,
+                     DiskEndpointPool! diskEndpoints,
+                     ulong             diskStartSector,
+                     ulong             diskSectorCount,
+                     ushort            diskSystemId)
+        {
+            name         = diskName;
+            endpoints    = diskEndpoints;
+            startSector  = diskStartSector;
+            totalSectors = diskSectorCount;
+            systemId     = diskSystemId;
+
+            base();
+        }
+
+        internal string! Name           { get { return name;} }
+        internal ulong   StartSector    { get { return startSector; } }
+        internal ulong   TotalSectors   { get { return totalSectors; } }
+        internal int     MaxConnections { get { return endpoints.Capacity; } }
+
+        internal DiskAttributes DiskAttributes
+        {
+            get {
+                return 0;
+            }
+        }
+
+        internal bool GetSystemId(out byte sysId)
+        {
+            if (systemId != NoSystemId) {
+                sysId = (byte)(systemId & 0xff);
+                return true;
+            }
+            sysId = 0;
+            return false;
+        }
+
+        internal byte[] in ExHeap
+        Read(ulong sectorId, ulong length)
+            requires sectorId < TotalSectors;
+        {
+            byte[]! in ExHeap data = new [ExHeap] byte[length];
+            return Read(sectorId, data);
+        }
+
+        internal byte[] in ExHeap
+        Read(ulong sectorId, [Claims] byte[]! in ExHeap data)
+            requires sectorId < TotalSectors;
+            requires (data.Length % BytesPerSector) == 0;
+        {
+            DiskEndpoint ep = endpoints.Get();
+            try {
+                return ep.Read(sectorId, data);
+            }
+            finally {
+                endpoints.Add(ep);
+            }
+        }
+
+        internal byte[] in ExHeap
+        Write(ulong sectorId, [Claims] byte[]! in ExHeap data)
+            requires sectorId < TotalSectors;
+            requires (data.Length % BytesPerSector) == 0;
+        {
+            DiskEndpoint ep = endpoints.Get();
+            try {
+                return ep.Write(sectorId, data);
+            }
+            finally {
+                endpoints.Add(ep);
+            }
+        }
+
+        internal byte[] in ExHeap
+        Write(ulong sectorId,
+              [Claims] byte[]! in ExHeap data,
+              uint dataStart,
+              uint dataBytesToWrite)
+            requires sectorId < TotalSectors;
+            requires (data.Length % BytesPerSector) == 0;
+            requires dataStart <= data.Length;
+            requires dataStart + dataBytesToWrite <= data.Length;
+        {
+            DiskEndpoint ep = endpoints.Get();
+            try {
+                return ep.Write(sectorId, data, dataStart, dataBytesToWrite);
+            }
+            finally {
+                endpoints.Add(ep);
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Static construction methods
+
+        static private bool
+        GetDiskStartSector(DiskDeviceContract.Imp:Ready! diskImp,
+                           out ulong startSector)
+        {
+            diskImp.SendGetStartSector();
+            switch receive {
+                case diskImp.RecvAckGetStartSector(sectors):
+                    startSector = sectors;
+                    return true;
+                    break;
+                case diskImp.ChannelClosed():
+                    startSector = 0;
+                    return false;
+                    break;
+            }
+        }
+
+        static private bool
+        GetDiskSectorCount(DiskDeviceContract.Imp:Ready! diskImp,
+                           out ulong sectorCount)
+        {
+            diskImp.SendGetSectorCount();
+            switch receive {
+                case diskImp.RecvAckGetSectorCount(sectors):
+                    sectorCount = sectors;
+                    return true;
+                    break;
+                case diskImp.ChannelClosed():
+                    sectorCount = 0;
+                    return false;
+                    break;
+            }
+        }
+
+        static private bool
+        GetDiskSystemId(DiskDeviceContract.Imp:Ready! diskImp,
+                        out ushort systemId)
+        {
+            diskImp.SendGetSystemId();
+            switch receive {
+                case diskImp.RecvSystemId(theSystemId):
+                    systemId = theSystemId;
+                    return true;
+                    break;
+                case diskImp.RecvNoSystemId():
+                    systemId = NoSystemId;
+                    return true;
+                    break;
+                case diskImp.ChannelClosed():
+                    systemId = 0;
+                    return false;
+                    break;
+            }
+        }
+
+        static private bool
+        GetDiskAttributes(DiskDeviceContract.Imp:Ready! diskImp,
+                          out DiskAttributes da)
+        {
+            diskImp.SendGetDiskAttributes();
+            switch receive {
+                case diskImp.RecvAckGetDiskAttributes(theAttributes):
+                    da = theAttributes;
+                    return true;
+                case diskImp.ChannelClosed():
+                    da = 0;
+                    return false;
+            }
+        }
+
+        static private DiskDeviceContract.Imp:Ready
+        ValidatedDiskEndpoint([Claims] DiskDeviceContract.Imp:Start! diskImp)
+        {
+            switch receive {
+                case diskImp.RecvSuccess():
+                    return diskImp;
+                    break;
+                case diskImp.RecvContractNotSupported():
+                    delete diskImp;
+                    return null;
+                    break;
+                case diskImp.ChannelClosed():
+                    // Log "Disk {0} closed channel unexpectedly."
+                    delete diskImp;
+                    return null;
+                    break;
+            }
+        }
+
+        static private DiskDeviceContract.Imp:Ready
+        OpenDevice(DirectoryServiceContract.Imp:Ready! nsImp,
+                   string!                             deviceName)
+        {
+            DiskDeviceContract.Exp! diskExp;
+            DiskDeviceContract.Imp! diskImp;
+            DiskDeviceContract.NewChannel(out diskImp, out diskExp);
+
+            nsImp.SendBind(Bitter.FromString2(deviceName), diskExp);
+            switch receive {
+                case nsImp.RecvAckBind():
+                    return ValidatedDiskEndpoint(diskImp);
+                    break;
+                case nsImp.RecvNakBind(badExp, errorCode):
+                    delete diskImp;
+                    delete badExp;
+                    return null;
+                    break;
+                case nsImp.ChannelClosed():
+                    delete diskImp;
+                    return null;
+                    break;
+            }
+        }
+
+        static internal Disk
+        Create(DirectoryServiceContract.Imp:Ready! nsImp,
+               string!                             deviceName,
+               int                                 channelCount)
+            requires channelCount >= 1;
+        {
+            //
+            // Create first connection to disk
+            //
+            DiskDeviceContract.Imp diskImp = OpenDevice(nsImp, deviceName);
+            if (diskImp == null) {
+                Console.WriteLine("Could not establish a connection to {0}\n",
+                                  deviceName);
+                return null;
+            }
+
+            //
+            // Retrieve cacheable disk information
+            //
+            ulong startSector;
+            if (GetDiskStartSector(diskImp, out startSector) == false) {
+                Console.WriteLine("Lost connection to {0}.\n", deviceName);
+                delete diskImp;
+                return null;
+            }
+
+            ulong totalSectors;
+            if (GetDiskSectorCount(diskImp, out totalSectors) == false) {
+                Console.WriteLine("Lost connection to {0}.\n", deviceName);
+                delete diskImp;
+                return null;
+            }
+
+            ushort systemId;
+            if (GetDiskSystemId(diskImp, out systemId) == false) {
+                Console.WriteLine("Lost connection to {0}.\n", deviceName);
+                delete diskImp;
+                return null;
+            }
+
+            DiskAttributes da;
+            if (GetDiskAttributes(diskImp, out da) == false) {
+                Console.WriteLine("Lost connection to {0}.\n", deviceName);
+                delete diskImp;
+                return null;
+            }
+
+            //
+            // Initialize endpoints for handling concurrent I/O requests
+            //
+            DiskEndpointPool pool = new DiskEndpointPool(channelCount);
+            pool.Add(new DiskEndpoint(diskImp));
+
+            for (int i = 1; i < channelCount; i++) {
+                diskImp = OpenDevice(nsImp, deviceName);
+                if (diskImp == null) {
+                    Console.WriteLine("Failed establishing connection {0} to {1}.\n", i, deviceName);
+                    return null;
+                }
+                pool.Add(new DiskEndpoint(diskImp));
+            }
+
+            //
+            // Construct and return Disk object
+            //
+            return new Disk(deviceName, pool,
+                            startSector, totalSectors, systemId);
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/Fat.sg b/base/Services/Fat/Fs/Fat.sg
new file mode 100644
index 0000000..38e9c13
--- /dev/null
+++ b/base/Services/Fat/Fs/Fat.sg
@@ -0,0 +1,79 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fat.sg
+//
+//  TODO: Block allocation for sequential cluster groups.  This
+//  would entail less buffer cache lock operations.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal abstract class Fat
+    {
+        /// <summary> Largest number of clusters that can be allocated
+        /// at a time.
+        /// </summary>
+        public const int MaxAllocationLength = Bitmap.MaxAllocationLength;
+
+        /// <summary> Allocate cluster chain. The allocation is
+        /// no guaranteed to be contiguous</summary>
+        /// <returns> true if some of the requested clusters
+        /// have been allocated, false if there were no free
+        /// clusters available.  </returns>
+        internal abstract bool AllocateChain(int hintClusterArea,
+                                             int targetLength,
+                                             out int allocStart,
+                                             out int allocLength);
+
+        /// <summary> Frees the chain starting at specified offset </summary>
+        internal abstract void FreeChain(int startCluster);
+
+        /// <summary> Grow an existing cluster chain. The allocation is
+        /// not guaranteed to be contiguous.</summary>
+        /// <returns> true if some of the requested clusters
+        /// have been allocated, false if there were no free
+        /// clusters available.  </returns>
+        internal abstract bool GrowChain(BlockIndex! index,
+                                         int         requestedExtensionLength,
+                                         out int     actualExtensionLength);
+
+        /// <summary> Truncates chain past specified new tail
+        /// cluster. </summary>
+        internal abstract void TruncateChain(BlockIndex! index,
+                                             int         lengthInClusters);
+
+        /// <summary> Populates BlockIndex with clusters from chain.
+        /// </summary>
+        internal abstract void PopulateIndex(BlockIndex! index,
+                                             int         firstCluster);
+
+        /// <summary> Property for clean shutdown bit held in FAT.
+        /// <para> This property has no physical meaning on FAT12. </para>
+        ///</summary>
+        internal abstract bool CleanShutdown    { get; set; }
+
+        /// <summary> Property for hard error bit held in FAT.
+        /// <para> This property has no physical meaning on FAT12. </para>
+        ///</summary>
+        internal abstract bool HardError        { get; set; }
+
+        /// <summary> Value representing total number of clusters. </summary>
+        internal abstract int TotalClusters     { get; }
+
+        /// <summary> Value representing end of cluster chain. </summary>
+        internal abstract int EndOfChain        { get; }
+
+        /// <summary> Value representing of bad cluster. </summary>
+        internal abstract int BadCluster        { get; }
+    }
+}
diff --git a/base/Services/Fat/Fs/Fat12.sg b/base/Services/Fat/Fs/Fat12.sg
new file mode 100644
index 0000000..c8471bf
--- /dev/null
+++ b/base/Services/Fat/Fs/Fat12.sg
@@ -0,0 +1,585 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fat12.sg
+//
+//  This code bangs hopelessly on the buffer cache.  12 bit
+//  pointers equates to pointers that span byte and sector
+//  boundaries.  These are painful to work with.  To date no
+//  effort has been made to optimize the chain allocation, grow,
+//  free, and truncate routines.
+//
+
+//#define DEBUG_FAT12 // Turn on sanity checks such as they are
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class Fat12 : Fat
+    {
+        Fat12Internal fatInternal;
+
+        internal Fat12(BlockCache! theBlockCache,
+                       BpbSummary! theBpbSummary)
+        {
+            fatInternal = new Fat12Internal(theBlockCache, theBpbSummary);
+        }
+
+        internal override bool AllocateChain(int hintClusterArea,
+                                             int targetLength,
+                                             out int allocStart,
+                                             out int allocLength)
+        {
+            return fatInternal.AllocateChain(hintClusterArea, targetLength,
+                                             out allocStart, out allocLength);
+        }
+
+        internal override void FreeChain(int startCluster)
+        {
+            fatInternal.FreeChain(startCluster);
+        }
+
+        internal override bool GrowChain(BlockIndex! index,
+                                         int         requestedExtensionLength,
+                                         out int     actualExtensionLength)
+        {
+            return fatInternal.GrowChain(index, requestedExtensionLength,
+                                         out actualExtensionLength);
+        }
+
+        internal override void TruncateChain(BlockIndex! index,
+                                             int         lengthInClusters)
+        {
+            fatInternal.TruncateChain(index, lengthInClusters);
+        }
+
+        internal override void PopulateIndex(BlockIndex! index,
+                                             int         firstCluster)
+        {
+            fatInternal.PopulateIndex(index, firstCluster);
+        }
+
+        internal override bool CleanShutdown
+        {
+            get { return fatInternal.CleanShutdown; }
+            set { fatInternal.CleanShutdown = value; }
+        }
+
+        internal override bool HardError
+        {
+            get { return fatInternal.HardError; }
+            set { fatInternal.HardError = value; }
+        }
+
+        internal override int TotalClusters
+        {
+            get { return fatInternal.TotalClusters; }
+        }
+
+        internal override int EndOfChain
+        {
+            get { return fatInternal.EndOfChain; }
+        }
+
+        internal override int BadCluster
+        {
+            get { return fatInternal.BadCluster; }
+        }
+
+        // --------------------------------------------------------------------
+        // Internal representation of FAT12 structure
+
+        private sealed class Fat12Internal
+        {
+            private const int UnallocatedMarker = 0;
+            private const int EndOfChainMarker  = 0xfff;
+            private const int EndOfChainMinimum = 0xff8;
+            private const int BadClusterMarker  = 0xff7;
+            public  const int MaxClusters       = 0xff7;
+            public  const int ReservedClusters  = 2;
+
+            private const ushort Visited = 0xffff;      // Used by DEBUG_FAT12
+
+            private BlockCache! blockCache;
+            private BpbSummary! bpbSummary;
+            private uint        preferredFat;
+            private Bitmap!     bitmap;
+            private bool        cleanShutdown;
+            private bool        hardError;
+
+            [ Microsoft.Contracts.NotDelayed ]
+            internal Fat12Internal(BlockCache! theBlockCache,
+                                   BpbSummary! theBpbSummary)
+                requires theBpbSummary.Version       == FatVersion.Fat12;
+                requires theBpbSummary.SectorsPerFat >= 1;
+                requires theBpbSummary.NumberOfFats  >= 1;
+                requires theBpbSummary.ClusterCount  >= 1;
+            {
+                this.blockCache    = theBlockCache;
+                this.bpbSummary    = theBpbSummary;
+                this.preferredFat  = 0;
+                this.bitmap        =
+                    new Bitmap((int)theBpbSummary.ClusterCount + ReservedClusters);
+                this.cleanShutdown = true;
+                this.hardError     = false;
+                base();
+                InitializeBitmap(this.preferredFat);
+            }
+
+            internal bool CleanShutdown
+            {
+                get { return this.cleanShutdown; }
+                set { this.cleanShutdown = value; }
+            }
+
+            internal bool HardError
+            {
+                get { return this.hardError; }
+                set { this.hardError = value; }
+            }
+
+            internal int TotalClusters
+            {
+                get {
+                    return (int)bpbSummary.ClusterCount + ReservedClusters;
+                }
+            }
+
+            internal int EndOfChain
+            {
+                get { return EndOfChainMarker; }
+            }
+
+            internal int BadCluster
+            {
+                get { return BadClusterMarker; }
+            }
+
+            private void InitializeBitmap(uint fat)
+            {
+                // Mark the two reserved clusters as used
+                int allocStart, allocLength;
+                bitmap.Allocate(0, ReservedClusters,
+                                out allocStart, out allocLength);
+                DebugStub.Assert(allocStart  == 0);
+                DebugStub.Assert(allocLength == ReservedClusters);
+
+                // Scan clusters to find those free.
+                for (int i = ReservedClusters; i < bitmap.Length; i++) {
+                    int next;
+                    GetNextInFat(fat, i, out next);
+                    if (next != UnallocatedMarker) {
+                        bitmap.Allocate(i, 1, out allocStart, out allocLength);
+                        DebugStub.Assert(allocStart == i);
+                        DebugStub.Assert(allocLength == 1);
+                    }
+                }
+                DumpFat("Initial FAT");
+            }
+
+            // ---------------------------------------------------------------
+            // Debugging routines
+
+            [ System.Diagnostics.Conditional("DEBUG_FAT12") ]
+            private void DumpFat(string! title)
+            {
+                DebugStub.Print("{0}\n", __arglist(title));
+                for (int i = 0; i < TotalClusters; i++) {
+                    int next;
+                    GetNextInFat(0, i, out next);
+                    if (next != 0) {
+                        DebugStub.Print("Fat[{0:x8}] = {1:x8}\n",
+                                        __arglist(i, next));
+                    }
+
+                    for (uint fat = 1; fat < bpbSummary.NumberOfFats; fat++) {
+                        int onext;
+                        GetNextInFat(fat, i, out onext);
+                        DebugStub.Assert(onext == next);
+                    }
+                }
+                FollowFat();
+            }
+
+            [ System.Diagnostics.Conditional("DEBUG_FAT12") ]
+            private void FollowFat()
+            {
+                ushort [] clusters = new ushort [TotalClusters];
+                for (int i = 0; i < TotalClusters; i++) {
+                    int next;
+                    GetNextInFat(0, i, out next);
+                    clusters[i] = (ushort)next;
+                }
+
+                for (int i = ReservedClusters; i < TotalClusters; i++) {
+                    if ((int)clusters[i] == Visited ||
+                        (int)clusters[i] == UnallocatedMarker) {
+                        continue;
+                    }
+                    VisitChain(clusters, i);
+                }
+            }
+
+            [ System.Diagnostics.Conditional("DEBUG_FAT12") ]
+            private void VisitChain(ushort []! clusters, int start)
+            {
+                while (start < EndOfChainMinimum) {
+                    if (start < ReservedClusters || start == Visited) {
+                        DebugStub.Break();
+                    }
+                    int next = clusters[start];
+                    clusters[start] = Visited;
+                    start = next;
+                }
+            }
+
+            // ----------------------------------------------------------------
+            // Chain growth and creation related methods
+
+            internal bool GrowChain(BlockIndex! index,
+                                    int         clustersToAdd,
+                                    out int     clustersAdded)
+                requires index.Count > 0;
+                requires clustersToAdd > 0;
+            {
+                if (clustersToAdd > Bitmap.MaxAllocationLength) {
+                    clustersToAdd = Bitmap.MaxAllocationLength;
+                }
+
+                lock (this) {
+                    int tail;
+                    if (index.Lookup(index.Count - 1, out tail) == false) {
+                        assert false;
+                    }
+
+                    int newTailStart;
+                    if (LockedAllocateChain(tail, clustersToAdd, index,
+                                            out newTailStart,
+                                            out clustersAdded)) {
+                        SetNext(tail, newTailStart);
+                        return true;
+                    }
+                    return false;
+                }
+            }
+
+            internal bool AllocateChain(int hintStart,
+                                        int targetLength,
+                                        out int allocStart,
+                                        out int allocLength)
+                requires hintStart < Fat12Internal.MaxClusters;
+                requires targetLength > 0;
+            {
+                if (targetLength > Bitmap.MaxAllocationLength) {
+                    targetLength = Bitmap.MaxAllocationLength;
+                }
+                lock (this) {
+                    return LockedAllocateChain(hintStart, targetLength, null,
+                                               out allocStart,
+                                               out allocLength);
+                }
+            }
+
+            private void LockedBlockIndexAppend(BlockIndex index,
+                                              int        tail,
+                                              int        length)
+            {
+                if (index != null) {
+                    index.Append(tail, length);
+                }
+            }
+
+            private bool LockedAllocateChain(int        tail,
+                                             int        clustersToAdd,
+                                             BlockIndex index,
+                                             out int    newTailStart,
+                                             out int    newTailAllocated)
+            {
+                DebugStub.Assert(clustersToAdd >= 1);
+                if (!bitmap.Allocate(tail, 1,
+                                     out newTailStart,
+                                     out newTailAllocated)) {
+                    return false;
+                }
+                LockedBlockIndexAppend(index, newTailStart, newTailAllocated);
+
+                int current = newTailStart;
+                while (newTailAllocated != clustersToAdd) {
+                    int delta, next;
+                    if (!bitmap.Allocate(current, 1, out next, out delta)) {
+                        break;
+                    }
+                    DebugStub.Assert(delta == 1);
+                    LockedBlockIndexAppend(index, next, delta);
+                    newTailAllocated++;
+                    SetNext(current, next);
+                    current = next;
+                }
+                SetNext(current, EndOfChainMarker);
+
+                return true;
+            }
+
+            // ----------------------------------------------------------------
+            // Chain truncation and deletion related methods
+
+            internal void TruncateChain(BlockIndex! index,
+                                        int clusterLength)
+                requires clusterLength >= 0 && clusterLength < index.Count;
+            {
+                if (clusterLength == index.Count) {
+                    return;
+                }
+
+                if (clusterLength == 0) {
+                    int headCluster;
+                    if (index.Lookup(0, out headCluster) == false) {
+                        assert false;
+                    }
+                    FreeChain(headCluster);
+                    index.TruncateToLength(clusterLength);
+                    return;
+                }
+
+                int newTail;
+                if (index.Lookup(clusterLength - 1, out newTail) == false) {
+                    assert false;
+                }
+
+                int zap;
+                if (index.Lookup(clusterLength, out zap) == false) {
+                    assert false;
+                }
+
+                lock (this) {
+                    SetNext(newTail, EndOfChainMarker);
+                    LockedFreeChain(zap);
+                }
+                index.TruncateToLength(clusterLength);
+            }
+
+            internal void FreeChain(int startCluster)
+                requires (startCluster >= ReservedClusters &&
+                          startCluster < MaxClusters);
+            {
+                lock (this) {
+                    LockedFreeChain(startCluster);
+                }
+            }
+
+            private void LockedFreeChain(int startCluster)
+            {
+                int nextCluster;
+                do {
+                    if (GetNext(startCluster, out nextCluster) == false) {
+                        break;
+                    }
+                    bitmap.Free(startCluster, 1);
+                    SetNext(startCluster, UnallocatedMarker);
+                    startCluster = nextCluster;
+                    DebugStub.Assert(startCluster >= ReservedClusters);
+                } while (startCluster < MaxClusters);
+            }
+
+            // ----------------------------------------------------------------
+            // Populate
+
+            internal void PopulateIndex(BlockIndex! index,
+                                        int firstCluster)
+                requires firstCluster >= Fat12Internal.ReservedClusters;
+                requires index.Count == 0;
+            {
+                int totalClusters = this.TotalClusters;
+                int cluster = firstCluster;
+                do {
+                    index.Append(cluster);
+                } while (GetNext(cluster, out cluster) != false &&
+                         cluster >= ReservedClusters &&
+                         cluster < totalClusters);
+
+#if DEBUG_FAT12
+                int lastCluster;
+                index.Lookup(index.Count - 1, out lastCluster);
+                int nextCluster;
+                GetNextInFat(0, lastCluster, out nextCluster);
+                DebugStub.Assert(nextCluster == EndOfChainMarker);
+#endif // DEBUG_FAT12
+            }
+
+            // ----------------------------------------------------------------
+            // Single link traversal and modification methods
+
+            private void GetNextInFat(uint fat, int cluster, out int next)
+            {
+                int fatOffset    = cluster + cluster / 2;
+                int sectorOffset = fatOffset / (int)bpbSummary.BytesPerSector;
+                int entryOffset  = fatOffset % (int)bpbSummary.BytesPerSector;
+                int sector       = (int)(bpbSummary.FirstFatSector +
+                                         fat * bpbSummary.SectorsPerFat +
+                                         sectorOffset);
+
+                byte b0, b1;
+                if (entryOffset == bpbSummary.BytesPerSector - 1) {
+                    byte[]! in ExHeap blockData0 =
+                        blockCache.BeginQuickBlockOperation((uint)sector);
+                    b0 = blockData0[entryOffset];
+                    blockCache.EndQuickBlockOperation((uint)sector,
+                                                      blockData0, false);
+
+                    byte[]! in ExHeap blockData1 =
+                        blockCache.BeginQuickBlockOperation((uint)sector + 1);
+                    b1 = blockData1[0];
+                    blockCache.EndQuickBlockOperation((uint)sector + 1,
+                                                      blockData1, false);
+                }
+                else {
+                    byte[]! in ExHeap blockData =
+                        blockCache.BeginQuickBlockOperation((uint)sector);
+                    b0 = blockData[entryOffset];
+                    b1 = blockData[entryOffset + 1];
+                    blockCache.EndQuickBlockOperation((uint)sector,
+                                                      blockData, false);
+                }
+
+                GetClusterValue(cluster, b0, b1, out next);
+
+                // Fix the out value so even
+                // non-MS formatted filesystems appear to show the
+                // same EOC marker.  NB First two clusters are not used
+                // and their next pointers may have special purposes.
+                if (cluster >= ReservedClusters &&
+                    next >= EndOfChainMinimum) {
+                    next = EndOfChainMarker;
+                }
+            }
+
+            private static void GetClusterValue(int cluster,
+                                                byte b0,
+                                                byte b1,
+                                                out int next)
+            {
+                int tmp = (((int)b1) << 8) + (int)b0;
+                if ((cluster & 0x1) == 0x1) {
+                    tmp >>= 4;
+                } else {
+                    tmp &= 0xfff;
+                }
+                next = tmp;
+            }
+
+            private static void SetClusterValue(int     cluster,
+                                                int     next,
+                                                ref byte b0,
+                                                ref byte b1)
+            {
+                DebugStub.Assert(cluster >= ReservedClusters &&
+                                 cluster <= EndOfChainMarker &&
+                                 next <= EndOfChainMarker);
+
+                if ((cluster & 0x1) == 0x1) {
+                    b0 = (byte)((b0 & 0xf) + ((next << 4) & 0xff));
+                    b1 = (byte)((next >> 4) & 0xff);
+                }
+                else {
+                    b0 = (byte)(next & 0xff);
+                    b1 = (byte)((b1 & 0xf0) + (next >> 8));
+                }
+            }
+
+            private void SetNextInFat(uint fat, int cluster, int next)
+            {
+                int fatOffset    = cluster + cluster / 2;
+                int sectorOffset = fatOffset / (int)bpbSummary.BytesPerSector;
+                int entryOffset  = fatOffset % (int)bpbSummary.BytesPerSector;
+                int sector       = (int)(bpbSummary.FirstFatSector +
+                                         fat * bpbSummary.SectorsPerFat +
+                                         sectorOffset);
+
+                if (entryOffset == bpbSummary.BytesPerSector - 1) {
+                    byte dummy = 0;
+
+                    byte[]! in ExHeap blockData0 =
+                        blockCache.BeginQuickBlockOperation((uint)sector);
+
+                    SetClusterValue(cluster, next,
+                                    ref blockData0[entryOffset],
+                                    ref dummy);
+
+                    blockCache.EndQuickBlockOperation((uint)sector + 0,
+                                                      blockData0, true);
+
+                    byte[]! in ExHeap blockData1 =
+                        blockCache.BeginQuickBlockOperation((uint)sector + 1);
+
+                    SetClusterValue(cluster, next,
+                                    ref dummy,
+                                    ref blockData1[0]);
+
+                    blockCache.EndQuickBlockOperation((uint)sector + 1,
+                                                      blockData1, true);
+                }
+                else {
+                    byte[]! in ExHeap blockData =
+                        blockCache.BeginQuickBlockOperation((uint)sector);
+
+                    SetClusterValue(cluster, next,
+                                    ref blockData[entryOffset],
+                                    ref blockData[entryOffset + 1]);
+
+                    blockCache.EndQuickBlockOperation((uint)sector,
+                                                      blockData, true);
+                }
+
+#if DEBUG_FAT12
+                int got;
+                GetNextInFat(fat, cluster, out got);
+                DebugStub.Assert(got == next);
+#endif // DEBUG_FAT12
+            }
+
+            private bool GetNext(int cluster, out int next)
+            {
+                DebugStub.Assert(cluster < TotalClusters);
+
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    try {
+                        GetNextInFat(preferredFat, cluster, out next);
+                        return true;
+                    }
+                    catch (Exception e) {
+                        Console.WriteLine("Caught {0}", e);
+                    }
+                    preferredFat = (preferredFat + 1) %
+                        bpbSummary.NumberOfFats;
+                }
+
+                DebugStub.Break();
+                next = 0;
+                return false;
+                // XXX: Fatal error could not read Fat entry
+            }
+
+            private void SetNext(int cluster, int next)
+            {
+                DebugStub.Assert(cluster < TotalClusters);
+                DebugStub.Assert(
+                    ((next < TotalClusters) ||
+                     (next >= BadClusterMarker && next <= EndOfChainMarker) ||
+                     (cluster < ReservedClusters))
+                    );
+
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    SetNextInFat(i, cluster, next);
+                }
+            }
+        } // class Fat12Internal
+    } // class Fat12
+}
diff --git a/base/Services/Fat/Fs/Fat16.sg b/base/Services/Fat/Fs/Fat16.sg
new file mode 100644
index 0000000..e6d527d
--- /dev/null
+++ b/base/Services/Fat/Fs/Fat16.sg
@@ -0,0 +1,674 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fat16.sg
+//
+//  NB Operations that modify the FAT table should be locked internally and
+//  should not expose any partial results.  Read operations do not require
+//  locks.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class Fat16 : Fat
+    {
+        Fat16Internal fatInternal;
+
+        internal Fat16(BlockCache! theBlockCache,
+                       BpbSummary! theBpbSummary)
+        {
+            fatInternal = new Fat16Internal(theBlockCache, theBpbSummary);
+        }
+
+        internal override bool AllocateChain(int hintClusterArea,
+                                             int targetLength,
+                                             out int allocStart,
+                                             out int allocLength)
+        {
+            return fatInternal.AllocateChain(hintClusterArea, targetLength,
+                                       out allocStart, out allocLength);
+        }
+
+        internal override void FreeChain(int startCluster)
+        {
+            fatInternal.FreeChain(startCluster);
+        }
+
+        internal override bool GrowChain(BlockIndex! index,
+                                         int         requestedExtensionLength,
+                                         out int     actualExtensionLength)
+        {
+            return fatInternal.GrowChain(index, requestedExtensionLength,
+                                         out actualExtensionLength);
+        }
+
+        internal override void TruncateChain(BlockIndex! index,
+                                             int         lengthInClusters)
+        {
+            fatInternal.TruncateChain(index, lengthInClusters);
+        }
+
+        internal override void PopulateIndex(BlockIndex! index,
+                                             int         firstCluster)
+        {
+            fatInternal.PopulateIndex(index, firstCluster);
+        }
+
+        internal override bool CleanShutdown
+        {
+            get { return fatInternal.CleanShutdown; }
+            set { fatInternal.CleanShutdown = value; }
+        }
+
+        internal override bool HardError
+        {
+            get { return fatInternal.HardError; }
+            set { fatInternal.HardError = value; }
+        }
+
+        internal override int TotalClusters
+        {
+            get { return fatInternal.TotalClusters; }
+        }
+
+        internal override int EndOfChain
+        {
+            get { return fatInternal.EndOfChain; }
+        }
+
+        internal override int BadCluster
+        {
+            get { return fatInternal.BadCluster; }
+        }
+
+        // --------------------------------------------------------------------
+        // Internal representation of FAT16 structure
+
+        private sealed class Fat16Internal
+        {
+            private  const int CleanShutdownMask = 0x8000;
+            private  const int HardErrorMask     = 0x4000;
+            internal const int UnallocatedMarker = 0x0000;
+            private  const int EndOfChainMarker  = 0xffff;
+            private  const int EndOfChainMinimum = 0xffff;
+            private  const int BadClusterMarker  = 0xfff7;
+            internal const int MaxClusters       = 0xfff7;
+            internal const int ReservedClusters  = 2;
+            private  const int EntryBytes        = 2;
+
+            private BlockCache! blockCache;
+            private BpbSummary! bpbSummary;
+            private uint        preferredFat;
+            private Bitmap!     bitmap;
+
+            [ Microsoft.Contracts.NotDelayed ]
+            internal Fat16Internal(BlockCache! theBlockCache,
+                                   BpbSummary! theBpbSummary)
+                requires theBpbSummary.Version       == FatVersion.Fat16;
+                requires theBpbSummary.SectorsPerFat >= 1;
+                requires theBpbSummary.NumberOfFats  >= 1;
+                requires theBpbSummary.ClusterCount  >= 1;
+            {
+                this.blockCache   = theBlockCache;
+                this.bpbSummary   = theBpbSummary;
+                this.preferredFat = 0;
+                this.bitmap       = new Bitmap((int)theBpbSummary.ClusterCount
+                                               + ReservedClusters);
+                base();
+                InitializeBitmap(this.preferredFat);
+            }
+
+            internal bool CleanShutdown
+            {
+                get {
+                    int next;
+                    GetNext(1, out next);
+                    return (next & CleanShutdownMask) == CleanShutdownMask;
+                }
+                set {
+                    int next, repl;
+                    GetNext(1, out next);
+                    if (value) {
+                        repl = next | CleanShutdownMask;
+                    } else {
+                        repl = next & ~CleanShutdownMask;
+                    }
+                    if (repl != next) {
+                        SetNext(1, repl);
+                    }
+                }
+            }
+
+            internal bool HardError
+            {
+                get {
+                    int next;
+                    GetNext(1, out next);
+                    return (next & HardErrorMask) == HardErrorMask;
+                }
+                set {
+                    int next, repl;
+                    GetNext(1, out next);
+                    if (value) {
+                        repl = next | HardErrorMask;
+                    } else {
+                        repl = next & ~HardErrorMask;
+                    }
+                    if (repl != next) {
+                        SetNext(1, repl);
+                    }
+                }
+            }
+
+            internal int TotalClusters
+            {
+                get {
+                    return (int)bpbSummary.ClusterCount + ReservedClusters;
+                }
+            }
+
+            internal int EndOfChain
+            {
+                get { return EndOfChainMarker; }
+            }
+
+            internal int BadCluster
+            {
+                get { return BadClusterMarker; }
+            }
+
+            private int GetSector(uint fat, int cluster)
+            {
+                int byteOffset = EntryBytes * cluster;
+                return ((int)bpbSummary.FirstFatSector +
+                        (int)(fat * bpbSummary.SectorsPerFat) +
+                        byteOffset / (int)bpbSummary.BytesPerSector);
+            }
+
+            private int GetEntriesPerSector()
+            {
+                return (int)bpbSummary.BytesPerSector / EntryBytes;
+            }
+
+            private void ValidateClusterAssignment(int    cluster,
+                                                   ushort oldValue,
+                                                   ushort newValue)
+            {
+                if (cluster < ReservedClusters) {
+                    if (cluster == 1) {
+                        const int ignoreMask = (CleanShutdownMask |
+                                                HardErrorMask);
+                        assert(((int)oldValue & ~ignoreMask) ==
+                               ((int)newValue & ~ignoreMask));
+                        return;
+                    }
+                    return;
+                }
+
+                if (oldValue >= EndOfChainMinimum &&
+                    oldValue < EndOfChainMarker) {
+                    oldValue = EndOfChainMarker;
+                }
+
+                assert (oldValue < TotalClusters ||
+                        oldValue == BadCluster ||
+                        oldValue == EndOfChainMarker);
+
+                assert (newValue < TotalClusters ||
+                        newValue == BadCluster ||
+                        newValue == EndOfChainMarker);
+            }
+
+            private void InitializeBitmap(uint fat)
+            {
+                int startSector = GetSector(fat, 0);
+                int endSector   = startSector + (int)bpbSummary.SectorsPerFat;
+                int clustersPerSector = GetEntriesPerSector();
+
+                int cluster = 0;
+                for (int sector = startSector; sector != endSector; sector++) {
+                    byte[]! in ExHeap buffer =
+                        blockCache.BeginQuickBlockOperation((uint)sector);
+                    int n = Math.Min(clustersPerSector,
+                                     TotalClusters - cluster);
+
+                    for (int i = 0; i < n; i++, cluster++) {
+                        ref short raw = ref buffer [i * EntryBytes];
+                        short v = ByteOrder.LittleEndianToHost(raw);
+                        if (v != UnallocatedMarker) {
+                            int aStart, aLength;
+                            bitmap.Allocate(cluster, 1,
+                                            out aStart, out aLength);
+                            assert aStart  == (int)cluster;
+                            assert aLength == 1;
+                        }
+                    }
+                    blockCache.EndQuickBlockOperation((uint)sector, buffer,
+                                                      false);
+                }
+
+                // First two cluster entries are reserved.  They
+                // should be set, but we check just in case since
+                // they are never valid.
+                for (int i = 0; i < ReservedClusters; i++) {
+                    if (bitmap.GetFirstSetBitFrom(i) != i) {
+                        int aStart, aLength;
+                        bitmap.Allocate(i, 1, out aStart, out aLength);
+                        assert aStart  == i;
+                        assert aLength == 1;
+                    }
+                }
+                DumpFat("Initial Fat");
+            }
+
+            private void DumpFat(string! title)
+            {
+                DebugStub.Print("{0}\n", __arglist(title));
+                for (int i = ReservedClusters; i < TotalClusters; i++) {
+                    int next;
+                    GetNextInFat(0, i, out next);
+                    if (next != 0) {
+                        DebugStub.Print("Fat[{0:x8}] = {1:x8}\n",
+                                        __arglist(i, next));
+                    }
+
+                    for (uint fat = 1; fat < bpbSummary.NumberOfFats; fat++) {
+                        int onext;
+                        GetNextInFat(fat, i, out onext);
+                        assert onext == next;
+                    }
+                }
+            }
+
+            // ----------------------------------------------------------------
+            // Chain growth and creation related methods
+
+            internal bool GrowChain(BlockIndex! index,
+                                    int         clustersToAdd,
+                                    out int     clustersAdded)
+                requires index.Count > 0;
+            requires clustersToAdd > 0;
+            {
+                if (clustersToAdd > Bitmap.MaxAllocationLength) {
+                    clustersToAdd = Bitmap.MaxAllocationLength;
+                }
+
+                lock (this) {
+                    int tail;
+                    if (index.Lookup(index.Count - 1, out tail) == false) {
+                        assert false;
+                    }
+
+                    int newTailStart;
+                    if (LockedAllocateChain(tail, clustersToAdd, index,
+                                            out newTailStart,
+                                            out clustersAdded)) {
+                        SetNext(tail, newTailStart);
+                        return true;
+                    }
+                    return false;
+                }
+            }
+
+            internal bool AllocateChain(int hintStart,
+                                        int length,
+                                        out int allocStart,
+                                        out int allocLength)
+                requires hintStart >= 0;
+            requires length > 0;
+            {
+                if (length > Bitmap.MaxAllocationLength) {
+                    length = Bitmap.MaxAllocationLength;
+                }
+
+                lock (this) {
+                    return LockedAllocateChain(hintStart, length, null,
+                                               out allocStart,
+                                               out allocLength);
+                }
+            }
+
+            private bool LockedAllocateChain(int        tail,
+                                             int        clustersToAdd,
+                                             BlockIndex index,
+                                             out int    chainHead,
+                                             out int    chainLength)
+            {
+                chainHead  = tail;
+                chainLength = 0;
+                int chainTail = tail;
+                int request = Math.Min(Bitmap.MaxAllocationLength, clustersToAdd);
+
+                while (request != 0) {
+                    int allocStart, allocLength;
+                    if (bitmap.Allocate(chainTail, request,
+                                        out allocStart, out allocLength)) {
+                        LockedWriteChain(allocStart, allocLength);
+                        if (index != null) {
+                            index.Append(allocStart, allocLength);
+                        }
+
+                        if (chainLength == 0) {
+                            // First successful allocation - record chain head
+                            chainHead = allocStart;
+                        } else {
+                            // Subsequent allocation - link into chain
+                            SetNext(chainTail, allocStart);
+                        }
+
+                        chainTail = allocStart + allocLength - 1;
+                        chainLength += allocLength;
+                        request = Math.Min(Bitmap.MaxAllocationLength,
+                                           clustersToAdd - chainLength);
+                    } else {
+                        request /= 2;
+                    }
+                }
+                return chainLength > 0;
+            }
+
+            private void LockedWriteChain(int chainStart,
+                                          int chainLength)
+            {
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    LockedWriteChainInFat(i, chainStart, chainLength);
+                }
+            }
+
+            private void LockedWriteChainInFat(uint fat,
+                                               int  chainStart,
+                                               int  chainLength)
+                requires chainStart >= ReservedClusters;
+                requires chainStart < this.TotalClusters;
+                requires (chainStart + chainLength <
+                          this.TotalClusters);
+                requires chainLength != 0;
+            {
+                int    entriesPerSector = GetEntriesPerSector();
+                ushort lastMarker       = EndOfChainMarker;
+                int    entryStart       = chainStart % entriesPerSector;
+
+                if (entryStart + chainLength > entriesPerSector) {
+                    int skip = entriesPerSector - entryStart;
+                    LockedWriteChainInFat(fat,
+                                          chainStart + skip,
+                                          chainLength - skip);
+                    chainLength = skip;
+                    assert (chainStart + skip) < MaxClusters;
+                    lastMarker   = (ushort)(chainStart + skip);
+                    DebugStub.Assert((lastMarker % entriesPerSector) == 0);
+                }
+
+                int sector = GetSector(fat, chainStart);
+
+                byte[]! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                ushort oldCluster, newCluster;
+                for (int i = 0; i < chainLength - 1; i++) {
+                    int offset = EntryBytes * (entryStart + i);
+                    ref ushort rawCluster = ref blockData[offset];
+                    oldCluster = ByteOrder.LittleEndianToHost(rawCluster);
+                    newCluster = (ushort)(chainStart + i + 1);
+                    ValidateClusterAssignment(chainStart + i,
+                                              oldCluster, newCluster);
+                    rawCluster = ByteOrder.HostToLittleEndian(newCluster);
+                }
+
+                int entryEnd = entryStart + chainLength - 1;
+                ref ushort theCluster =
+                    ref blockData[EntryBytes * (int)entryEnd];
+                oldCluster = ByteOrder.LittleEndianToHost(theCluster);
+                newCluster = lastMarker;
+                ValidateClusterAssignment(chainStart + chainLength - 1,
+                                          oldCluster, newCluster);
+                theCluster = ByteOrder.HostToLittleEndian(newCluster);
+
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  true);
+            }
+
+            // ----------------------------------------------------------------
+            // Chain truncation and deletion related methods
+
+            internal void TruncateChain(BlockIndex! index,
+                                        int clusterLength)
+                requires clusterLength >= 0 && clusterLength < index.Count;
+                ensures index.Count == clusterLength;
+            {
+                if (clusterLength == index.Count) {
+                    return;
+                }
+
+                if (clusterLength == 0) {
+                    int headCluster;
+                    if (index.Lookup(0, out headCluster) == false) {
+                        assert false;
+                    }
+                    FreeChain(headCluster);
+                    index.TruncateToLength(clusterLength);
+                    return;
+                }
+
+                int newTail;
+                if (index.Lookup(clusterLength - 1, out newTail) == false) {
+                    assert false;
+                }
+
+                int zap;
+                if (index.Lookup(clusterLength, out zap) == false) {
+                    assert false;
+                }
+
+                lock (this) {
+                    SetNext(newTail, EndOfChainMarker);
+                    LockedFreeChain(zap);
+                }
+                index.TruncateToLength(clusterLength);
+            }
+
+            internal void FreeChain(int startCluster)
+                requires (startCluster >= ReservedClusters &&
+                          startCluster < MaxClusters);
+            {
+                lock (this) {
+                    LockedFreeChain(startCluster);
+                }
+            }
+
+            private void LockedFreeChain(int startCluster)
+                requires (startCluster >= ReservedClusters &&
+                          startCluster < MaxClusters);
+            {
+                bool updateBitmap = true;
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    LockedFreeChainInFat(i, startCluster, updateBitmap);
+                    updateBitmap = false;
+                }
+            }
+
+            private void LockedFreeChainInFat(uint fat,
+                                              int  cluster,
+                                              bool updateBitmap)
+                requires cluster >= ReservedClusters && cluster < MaxClusters;
+            {
+                int sector           = GetSector(fat, cluster);
+                int entriesPerSector = GetEntriesPerSector();
+
+                byte []! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                for (;;) {
+                    int byteOffset =
+                        EntryBytes * (cluster % entriesPerSector);
+                    ref ushort rawCluster = ref blockData [byteOffset];
+                    ushort oldValue = ByteOrder.LittleEndianToHost(rawCluster);
+                    ushort newValue = (ushort)UnallocatedMarker;
+
+                    ValidateClusterAssignment(cluster, oldValue, newValue);
+                    rawCluster = ByteOrder.HostToLittleEndian(newValue);
+
+                    if (updateBitmap) {
+                        bitmap.Free(cluster, 1);
+                    }
+
+                    cluster = (ushort)oldValue;
+
+                    if (cluster >= MaxClusters) {
+                        break;
+                    }
+
+                    int nextSector = GetSector(fat, cluster);
+                    if (nextSector != sector) {
+                        blockCache.EndQuickBlockOperation((uint)sector,
+                                                          blockData,
+                                                          true);
+                        sector = nextSector;
+                        blockData =
+                            blockCache.BeginQuickBlockOperation((uint)sector);
+                    }
+                }
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  true);
+            }
+
+            // ----------------------------------------------------------------
+            // Populate
+
+            private void PopulateIndexFromFat(uint fat,
+                                              BlockIndex! index,
+                                              int firstCluster)
+                requires firstCluster >= Fat16Internal.ReservedClusters;
+                requires index.Count == 0;
+            {
+                int cluster = firstCluster;
+
+                int sector           = GetSector(fat, cluster);
+                int entriesPerSector = GetEntriesPerSector();
+
+                byte []! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                for (;;) {
+                    index.Append(cluster);
+
+                    int byteOffset = EntryBytes * (cluster % entriesPerSector);
+                    ref ushort rawCluster = ref blockData [byteOffset];
+                    // TODO: Check cluster is not bad
+                    cluster = (int)ByteOrder.HostToLittleEndian(rawCluster);
+                    if (cluster < ReservedClusters || cluster >= MaxClusters) {
+                        break;
+                    }
+
+                    int nextSector = GetSector(fat, cluster);
+                    if (nextSector != sector) {
+                        blockCache.EndQuickBlockOperation((uint)sector,
+                                                          blockData,
+                                                          false);
+                        sector = nextSector;
+                        blockData =
+                            blockCache.BeginQuickBlockOperation((uint)sector);
+                    }
+
+                }
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  false);
+            }
+
+            internal void PopulateIndex(BlockIndex! index,
+                                        int firstCluster)
+                requires firstCluster >= Fat16Internal.ReservedClusters;
+                requires index.Count == 0;
+            {
+                PopulateIndexFromFat(this.preferredFat, index, firstCluster);
+            }
+
+            // ----------------------------------------------------------------
+            // Single link traversal and modification methods
+
+            private bool GetNext(int cluster, out int next)
+            {
+                assert cluster < TotalClusters;
+
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    try {
+                        GetNextInFat(preferredFat, cluster, out next);
+                        return true;
+                    }
+                    catch (Exception e) {
+                        Console.WriteLine("Caught {0}", e);
+                    }
+                    preferredFat =
+                        (preferredFat + 1) % bpbSummary.NumberOfFats;
+                }
+
+                assert false;
+                next = 0;
+                return false;
+                // XXX: Fatal error could not read Fat entry
+            }
+
+            private void GetNextInFat(uint fat, int cluster, out int next)
+            {
+                int entriesPerSector = GetEntriesPerSector();
+                int sector       = GetSector(fat, cluster);
+
+                byte[]! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+                int offset = EntryBytes * (cluster % entriesPerSector);
+                ref ushort rawPointer = ref blockData[offset];
+                next = ByteOrder.LittleEndianToHost(rawPointer);
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  false);
+
+                // Fix the out value so even
+                // non-MS formatted filesystems appear to show the
+                // same EOC marker.  NB First two clusters are not used
+                // and their next pointers may have special purposes.
+                if (cluster >= ReservedClusters && next >= EndOfChainMinimum) {
+                    next = EndOfChainMarker;
+                }
+            }
+
+            private void SetNext(int cluster, int next)
+            {
+                assert cluster < TotalClusters;
+                assert ((next < TotalClusters) ||
+                        (next >= BadClusterMarker && next <= EndOfChainMarker) ||
+                        (cluster < ReservedClusters));
+
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    SetNextInFat(i, cluster, next);
+                }
+            }
+
+            private void SetNextInFat(uint fat, int cluster, int next)
+            {
+                int sector      = GetSector(fat, cluster);
+                int entryOffset =
+                    EntryBytes * (cluster % GetEntriesPerSector());
+
+                byte[]! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                ref ushort rawCluster = ref blockData[entryOffset];
+                ushort oldCluster = ByteOrder.LittleEndianToHost(rawCluster);
+                ushort newCluster = (ushort)next;
+                ValidateClusterAssignment(cluster, oldCluster, newCluster);
+                rawCluster = ByteOrder.HostToLittleEndian(newCluster);
+
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  true);
+            }
+        } // class Fat16Internal
+    } // class Fat16
+} // namespace Microsoft.Singularity.Services.Fat.Fs
diff --git a/base/Services/Fat/Fs/Fat32.sg b/base/Services/Fat/Fs/Fat32.sg
new file mode 100644
index 0000000..d61b847
--- /dev/null
+++ b/base/Services/Fat/Fs/Fat32.sg
@@ -0,0 +1,740 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Fat32.sg
+//
+//  NB Operations that modify the FAT table should be locked internally and
+//  should not expose any partial results.  Read operations do not require
+//  locks.
+//
+//  TODO: Mirror mode vs specific fat table mode.
+//        Catch exceptions when mirroring fat, switch to fallback, and
+//        have FatVolume update it in the BPB.
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+
+using System;
+using System.Diagnostics;
+
+//#define DEBUG_FAT32
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class Fat32 : Fat
+    {
+        Fat32Internal fatInternal;
+
+        internal Fat32(BlockCache! theBlockCache,
+                       BpbSummary! theBpbSummary)
+        {
+            fatInternal = new Fat32Internal(theBlockCache, theBpbSummary);
+        }
+
+        internal override bool AllocateChain(int hintClusterArea,
+                                             int targetLength,
+                                             out int allocStart,
+                                             out int allocLength)
+        {
+            return fatInternal.AllocateChain(hintClusterArea, targetLength,
+                                       out allocStart, out allocLength);
+        }
+
+        internal override void FreeChain(int startCluster)
+        {
+            fatInternal.FreeChain(startCluster);
+        }
+
+        internal override bool GrowChain(BlockIndex! index,
+                                         int         requestedExtensionLength,
+                                         out int     actualExtensionLength)
+        {
+            return fatInternal.GrowChain(index, requestedExtensionLength,
+                                         out actualExtensionLength);
+        }
+
+        internal override void TruncateChain(BlockIndex! index,
+                                             int         lengthInClusters)
+        {
+            fatInternal.TruncateChain(index, lengthInClusters);
+        }
+
+        internal override void PopulateIndex(BlockIndex! index,
+                                             int         firstCluster)
+        {
+            fatInternal.PopulateIndex(index, firstCluster);
+        }
+
+        internal override bool CleanShutdown
+        {
+            get { return fatInternal.CleanShutdown; }
+            set { fatInternal.CleanShutdown = value; }
+        }
+
+        internal override bool HardError
+        {
+            get { return fatInternal.HardError; }
+            set { fatInternal.HardError = value; }
+        }
+
+        internal int FirstFreeCluster
+        {
+            get { return fatInternal.FirstFreeCluster; }
+        }
+
+        internal int FreeClusters
+        {
+            get { return fatInternal.FreeClusters; }
+        }
+
+        internal override int TotalClusters
+        {
+            get { return fatInternal.TotalClusters; }
+        }
+
+        internal override int EndOfChain
+        {
+            get { return fatInternal.EndOfChain; }
+        }
+
+        internal override int BadCluster
+        {
+            get { return fatInternal.BadCluster; }
+        }
+
+        internal void UpdateFsInfo32()
+        {
+            fatInternal.UpdateFsInfo32();
+        }
+
+        // --------------------------------------------------------------------
+        // Internal representation of FAT32 structure
+
+        private sealed class Fat32Internal
+        {
+            private  const int CleanShutdownMask = 0x08000000;
+            private  const int HardErrorMask     = 0x04000000;
+            internal const int UnallocatedMarker = 0x00000000;
+            private  const int EndOfChainMarker  = 0x0fffffff;
+            private  const int EndOfChainMinimum = 0x0ffffff8;
+            private  const int BadClusterMarker  = 0x0ffffff7;
+            internal const int MaxClusters       = 0x0ffffff7;
+            private  const int ValueMask         = 0x0fffffff;
+            internal const int ReservedClusters  = 2;
+            private  const int EntryBytes        = 4;
+
+            private BlockCache! blockCache;
+            private BpbSummary! bpbSummary;
+            private uint        preferredFat;
+            private Bitmap!     bitmap;
+
+            [ Microsoft.Contracts.NotDelayed ]
+            internal Fat32Internal(BlockCache! theBlockCache,
+                                   BpbSummary! theBpbSummary)
+                requires theBpbSummary.Version       == FatVersion.Fat32;
+                requires theBpbSummary.SectorsPerFat >= 1;
+                requires theBpbSummary.NumberOfFats  >= 1;
+                requires theBpbSummary.ClusterCount  >= 1;
+            {
+                this.blockCache   = theBlockCache;
+                this.bpbSummary   = theBpbSummary;
+                this.preferredFat = 0;
+                this.bitmap       =
+                    new Bitmap((int)theBpbSummary.ClusterCount +
+                               ReservedClusters);
+                base();
+                InitializeBitmap(this.preferredFat);
+            }
+
+            internal bool CleanShutdown
+            {
+                get {
+                    int next;
+                    GetNext(1, out next);
+                    return (next & CleanShutdownMask) == CleanShutdownMask;
+                }
+                set {
+                    int next, repl;
+                    GetNext(1, out next);
+                    if (value) {
+                        repl = next | CleanShutdownMask;
+                    } else {
+                        repl = next & ~CleanShutdownMask;
+                    }
+                    if (repl != next) {
+                        SetNext(1, repl);
+                    }
+                }
+            }
+
+            internal bool HardError
+            {
+                get {
+                    int next;
+                    GetNext(1, out next);
+                    return (next & HardErrorMask) == HardErrorMask;
+                }
+                set {
+                    int next, repl;
+                    GetNext(1, out next);
+                    if (value) {
+                        repl = next | HardErrorMask;
+                    } else {
+                        repl = next & ~HardErrorMask;
+                    }
+                    if (repl != next) {
+                        SetNext(1, repl);
+                    }
+                }
+            }
+
+            internal int FirstFreeCluster
+            {
+                get { return this.bitmap.GetFirstClearBitFrom(0); }
+            }
+
+            internal int FreeClusters
+            {
+                get { return this.bitmap.FreeCount; }
+            }
+
+            internal int TotalClusters
+            {
+                get {
+                    return (int)bpbSummary.ClusterCount + ReservedClusters;
+                }
+            }
+
+            internal int EndOfChain
+            {
+                get { return EndOfChainMarker; }
+            }
+
+            internal int BadCluster
+            {
+                get { return BadClusterMarker; }
+            }
+
+            private int GetSector(uint fat, int cluster)
+            {
+                int byteOffset = EntryBytes * cluster;
+                return ((int)bpbSummary.FirstFatSector +
+                        (int)(fat * bpbSummary.SectorsPerFat) +
+                        byteOffset / (int)bpbSummary.BytesPerSector);
+            }
+
+            private int GetEntriesPerSector()
+            {
+                return (int)bpbSummary.BytesPerSector / EntryBytes;
+            }
+
+            private void ValidateClusterAssignment(int cluster,
+                                                   int oldValue,
+                                                   int newValue)
+            {
+                // Check reserved bits are untouched.
+                assert (oldValue & ~ValueMask) == (newValue & ~ValueMask);
+
+                oldValue &= ValueMask;
+                newValue &= ValueMask;
+
+                if (cluster < ReservedClusters) {
+                    if (cluster == 1) {
+                        const int ignoreMask = (CleanShutdownMask |
+                                                HardErrorMask);
+                        assert(((int)oldValue & ~ignoreMask) ==
+                               ((int)newValue & ~ignoreMask));
+                    }
+                    return;
+                }
+
+                if (oldValue >= EndOfChainMinimum &&
+                    oldValue < EndOfChainMarker) {
+                    oldValue = EndOfChainMarker;
+                }
+
+                assert (oldValue < TotalClusters ||
+                        oldValue == BadCluster ||
+                        oldValue == EndOfChainMarker);
+
+                assert (newValue < TotalClusters ||
+                        newValue == BadCluster ||
+                        newValue == EndOfChainMarker);
+            }
+
+            [Conditional("DEBUG_FAT32")]
+            private void DumpFat(string! title)
+            {
+                DebugStub.Print("{0}\n", __arglist(title));
+                for (int i = ReservedClusters; i < TotalClusters; i++) {
+                    int next;
+                    GetNextInFat(0, i, out next);
+                    if (next != 0) {
+                        DebugStub.Print("Fat[{0:x8}] = {1:x8}\n",
+                                        __arglist(i, next));
+                    }
+
+                    for (uint fat = 1; fat < bpbSummary.NumberOfFats; fat++) {
+                        int onext;
+                        GetNextInFat(fat, i, out onext);
+                        assert onext == next;
+                    }
+                }
+            }
+
+            private void InitializeBitmap(uint fat)
+            {
+                int startSector = GetSector(fat, 0);
+                int endSector   = startSector + (int)bpbSummary.SectorsPerFat;
+                int clustersPerSector = GetEntriesPerSector();
+
+                int cluster = 0;
+                for (int sector = startSector; sector != endSector; sector++) {
+                    byte[]! in ExHeap buffer =
+                        blockCache.BeginQuickBlockOperation((uint)sector);
+                    int n = Math.Min(clustersPerSector, TotalClusters - cluster);
+
+                    for (int i = 0; i < n; i++, cluster++) {
+                        ref int raw = ref buffer [i * EntryBytes];
+                        int v = ByteOrder.LittleEndianToHost(raw) & ValueMask;
+                        if (v != UnallocatedMarker) {
+                            int aStart, aLength;
+                            bitmap.Allocate(cluster, 1,
+                                            out aStart, out aLength);
+                            assert aStart  == (int)cluster;
+                            assert aLength == 1;
+                        }
+                    }
+                    blockCache.EndQuickBlockOperation((uint)sector, buffer, false);
+                }
+
+                // First two cluster entries are reserved.  They
+                // should be set, but we check just in case since
+                // they are never valid.
+                for (int i = 0; i < ReservedClusters; i++) {
+                    if (bitmap.GetFirstSetBitFrom(i) != i) {
+                        int aStart, aLength;
+                        bitmap.Allocate(i, 1, out aStart, out aLength);
+                        assert aStart  == i;
+                        assert aLength == 1;
+                    }
+                }
+
+                DumpFat("Initial Fat");
+            }
+
+            // ----------------------------------------------------------------
+            // Chain growth and creation related methods
+
+            internal bool GrowChain(BlockIndex! index,
+                                    int         clustersToAdd,
+                                    out int     clustersAdded)
+                requires index.Count > 0;
+                requires clustersToAdd > 0;
+            {
+                if (clustersToAdd > Bitmap.MaxAllocationLength) {
+                    clustersToAdd = Bitmap.MaxAllocationLength;
+                }
+
+                lock (this) {
+                    int tail;
+                    if (index.Lookup(index.Count - 1, out tail) == false) {
+                        assert false;
+                    }
+
+                    int newTailStart;
+                    if (LockedAllocateChain(tail, clustersToAdd, index,
+                                            out newTailStart, out clustersAdded)) {
+                        SetNext(tail, newTailStart);
+                        return true;
+                    }
+                    return false;
+                }
+            }
+
+            internal bool AllocateChain(int hintStart,
+                                        int length,
+                                        out int allocStart,
+                                        out int allocLength)
+                requires hintStart >= 0;
+                requires length > 0;
+            {
+                if (length > Bitmap.MaxAllocationLength) {
+                    length = Bitmap.MaxAllocationLength;
+                }
+
+                lock (this) {
+                    return LockedAllocateChain(hintStart,
+                                               length, null,
+                                               out allocStart,
+                                               out allocLength);
+                }
+            }
+
+            private bool LockedAllocateChain(int        tail,
+                                             int        clustersToAdd,
+                                             BlockIndex index,
+                                             out int    chainHead,
+                                             out int    chainLength)
+            {
+                chainHead  = tail;
+                chainLength = 0;
+                int chainTail = tail;
+                int request = Math.Min(Bitmap.MaxAllocationLength,
+                                       clustersToAdd);
+
+                while (request != 0) {
+                    int allocStart, allocLength;
+                    if (bitmap.Allocate(chainTail, request,
+                                        out allocStart, out allocLength)) {
+                        LockedWriteChain(allocStart, allocLength);
+                        if (index != null) {
+                            index.Append(allocStart, allocLength);
+                        }
+
+                        if (chainLength == 0) {
+                            // First successful allocation - record chain head
+                            chainHead = allocStart;
+                        } else {
+                            // Subsequent allocation - link into chain
+                            SetNext(chainTail, allocStart);
+                        }
+
+                        chainTail = allocStart + allocLength - 1;
+                        chainLength += allocLength;
+                        request = Math.Min(Bitmap.MaxAllocationLength,
+                                           clustersToAdd - chainLength);
+                    } else {
+                        request /= 2;
+                    }
+                }
+                return chainLength > 0;
+            }
+
+            private void LockedWriteChain(int chainStart,
+                                          int chainLength)
+            {
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    LockedWriteChainInFat(i, chainStart, chainLength);
+                }
+            }
+
+            private void LockedWriteChainInFat(uint fat,
+                                               int  chainStart,
+                                               int  chainLength)
+                requires chainStart >= ReservedClusters;
+                requires chainStart < this.TotalClusters;
+                requires chainStart + chainLength < this.TotalClusters;
+                requires chainLength != 0;
+            {
+                int entriesPerSector = GetEntriesPerSector();
+                int lastMarker       = EndOfChainMarker;
+                int entryStart       = chainStart % entriesPerSector;
+
+                if (entryStart + chainLength > entriesPerSector) {
+                    int skip = entriesPerSector - entryStart;
+                    LockedWriteChainInFat(fat,
+                                          chainStart + skip,
+                                          chainLength - skip);
+                    chainLength = skip;
+                    lastMarker  = chainStart + skip;
+                    DebugStub.Assert((lastMarker % entriesPerSector) == 0);
+                }
+
+                int sector = GetSector(fat, chainStart);
+
+                byte[]! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                int oldCluster, newCluster;
+                for (int i = 0; i < chainLength - 1; i++) {
+                    int offset = EntryBytes * (entryStart + i);
+                    ref int rawCluster = ref blockData[offset];
+                    oldCluster = ByteOrder.LittleEndianToHost(rawCluster);
+                    newCluster =
+                        (oldCluster & ~ValueMask) | (chainStart + i + 1);
+                    ValidateClusterAssignment(chainStart + i,
+                                              oldCluster, newCluster);
+                    rawCluster = ByteOrder.HostToLittleEndian(newCluster);
+                }
+
+                int entryEnd = entryStart + chainLength - 1;
+                ref int theCluster = ref blockData[EntryBytes * (int)entryEnd];
+                oldCluster = ByteOrder.LittleEndianToHost(theCluster);
+                newCluster = (oldCluster & ~ValueMask) | lastMarker;
+                ValidateClusterAssignment(chainStart + chainLength - 1,
+                                          oldCluster, newCluster);
+                theCluster = ByteOrder.HostToLittleEndian(newCluster);
+
+                blockCache.EndQuickBlockOperation((uint)sector,
+                                                  blockData, true);
+            }
+
+            // ----------------------------------------------------------------
+            // Chain truncation and deletion related methods
+
+            internal void TruncateChain(BlockIndex! index,
+                                        int clusterLength)
+                requires clusterLength >= 0 && clusterLength < index.Count;
+            {
+                DumpFat("Pre-chain truncate");
+                if (clusterLength == index.Count) {
+                    return;
+                }
+
+                int zap;
+                if (index.Lookup(clusterLength, out zap) == false) {
+                    assert false;
+                }
+                FreeChain(zap);
+                index.TruncateToLength(clusterLength);
+
+                if (clusterLength > 0) {
+                    int newTail;
+                    bool s = index.Lookup(clusterLength - 1, out newTail);
+                    assert s;
+                    lock (this) {
+                        SetNext(newTail, EndOfChainMarker);
+                    }
+                }
+                DumpFat("Post truncate");
+            }
+
+            internal void FreeChain(int startCluster)
+                requires (startCluster >= ReservedClusters
+                          && startCluster < MaxClusters);
+            {
+                lock (this) {
+                    LockedFreeChain(startCluster);
+                }
+            }
+
+            private void LockedFreeChain(int startCluster)
+                requires (startCluster >= ReservedClusters &&
+                          startCluster < MaxClusters);
+            {
+                bool updateBitmap = true;
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    LockedFreeChainInFat(i, startCluster, updateBitmap);
+                    updateBitmap = false;
+                }
+            }
+
+            private void LockedFreeChainInFat(uint fat,
+                                              int  cluster,
+                                              bool updateBitmap)
+                requires cluster >= ReservedClusters && cluster < MaxClusters;
+            {
+                int sector           = GetSector(fat, cluster);
+                int entriesPerSector = GetEntriesPerSector();
+
+                byte []! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                for (;;) {
+                    int byteOffset     =
+                        EntryBytes * (cluster % entriesPerSector);
+                    ref int rawCluster = ref blockData [byteOffset];
+                    int oldValue = ByteOrder.LittleEndianToHost(rawCluster);
+                    int newValue = oldValue & ~ValueMask;
+
+                    ValidateClusterAssignment(cluster, oldValue, newValue);
+                    rawCluster = ByteOrder.HostToLittleEndian(newValue);
+
+                    if (updateBitmap) {
+                        bitmap.Free(cluster & ValueMask, 1);
+                    }
+
+                    cluster = oldValue & ValueMask;
+
+                    if (cluster >= MaxClusters) {
+                        break;
+                    }
+
+                    int nextSector = GetSector(fat, cluster);
+                    if (nextSector != sector) {
+                        blockCache.EndQuickBlockOperation((uint)sector,
+                                                          blockData,
+                                                          true);
+                        sector = nextSector;
+                        blockData =
+                            blockCache.BeginQuickBlockOperation((uint)sector);
+                    }
+                }
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  true);
+            }
+
+            // ----------------------------------------------------------------
+            // Populate
+
+            private void PopulateIndexFromFat(uint fat,
+                                              BlockIndex! index,
+                                              int firstCluster)
+                requires index.Count == 0;
+                requires firstCluster >= ReservedClusters;
+            {
+                int cluster          = firstCluster;
+                int sector           = GetSector(fat, cluster);
+                int entriesPerSector = GetEntriesPerSector();
+
+                byte []! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                for (;;) {
+                    index.Append(cluster);
+
+                    int byteOffset = EntryBytes * (cluster % entriesPerSector);
+                    ref int rawCluster = ref blockData [byteOffset];
+                    // TODO: Check cluster is not bad
+                    cluster =
+                        ByteOrder.HostToLittleEndian(rawCluster & ValueMask);
+                    if (cluster < ReservedClusters || cluster >= MaxClusters) {
+                        break;
+                    }
+
+                    int nextSector = GetSector(fat, cluster);
+                    if (nextSector != sector) {
+                        blockCache.EndQuickBlockOperation((uint)sector,
+                                                          blockData,
+                                                          false);
+                        sector = nextSector;
+                        blockData =
+                            blockCache.BeginQuickBlockOperation((uint)sector);
+                    }
+
+                }
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  false);
+            }
+
+            internal void PopulateIndex(BlockIndex! index,
+                                        int firstCluster)
+                requires firstCluster >= Fat32Internal.ReservedClusters;
+                requires index.Count == 0;
+            {
+                PopulateIndexFromFat(this.preferredFat, index, firstCluster);
+            }
+
+            // ----------------------------------------------------------------
+            // Single link traversal and modification methods
+
+            private bool GetNext(int cluster, out int next)
+            {
+                assert cluster < TotalClusters;
+
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    try {
+                        GetNextInFat(preferredFat, cluster, out next);
+                        return true;
+                    }
+                    catch (Exception e) {
+                        Console.WriteLine("Caught {0}", e);
+                    }
+                    preferredFat =
+                        (preferredFat + 1) % bpbSummary.NumberOfFats;
+                }
+
+                assert false;
+                next = 0;
+                return false;
+                // XXX: Fatal error could not read Fat entry
+            }
+
+            private void GetNextInFat(uint fat, int cluster, out int next)
+            {
+                int sector     = GetSector(fat, cluster);
+                int byteOffset =
+                    EntryBytes * (cluster % GetEntriesPerSector());
+
+                byte[]! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                ref int rawCluster = ref blockData[byteOffset];
+                next = ByteOrder.LittleEndianToHost(rawCluster) & ValueMask;
+
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  false);
+
+                // Fix the out value so even
+                // non-MS formatted filesystems appear to show the
+                // same EOC marker.  NB First two clusters are not used
+                // and their next pointers may have special purposes.
+                if (cluster >= ReservedClusters && next >= EndOfChainMinimum) {
+                    next = EndOfChainMarker;
+                }
+            }
+
+            private void SetNext(int cluster, int next)
+            {
+                assert cluster < TotalClusters;
+                assert ((next < TotalClusters) ||
+                        (next >= BadClusterMarker &&
+                         next <= EndOfChainMarker) ||
+                        cluster < ReservedClusters);
+
+                for (uint i = 0; i < bpbSummary.NumberOfFats; i++) {
+                    SetNextInFat(i, cluster, next);
+                }
+            }
+
+            private void SetNextInFat(uint fat, int cluster, int next)
+                requires ((next & ~Fat32Internal.ValueMask) == 0 ||
+                          cluster < ReservedClusters) ;
+            {
+                int sector     = GetSector(fat, cluster);
+                int byteOffset = EntryBytes * (cluster % GetEntriesPerSector());
+
+                byte[]! in ExHeap blockData =
+                    blockCache.BeginQuickBlockOperation((uint)sector);
+
+                ref int rawCluster = ref blockData[byteOffset];
+                if (cluster >= ReservedClusters) {
+                    int oldCluster = ByteOrder.LittleEndianToHost(rawCluster);
+                    int newCluster = (oldCluster & ~ValueMask) | (next & ValueMask);
+                    ValidateClusterAssignment(cluster, oldCluster, newCluster);
+                    rawCluster = ByteOrder.HostToLittleEndian(newCluster);
+                }
+                else {
+                    // First two cluster entries do not have reserved bit
+                    // semantics since they status indicators rather than
+                    // cluster pointers.
+                    rawCluster = ByteOrder.HostToLittleEndian(next);
+                }
+
+                blockCache.EndQuickBlockOperation((uint)sector, blockData,
+                                                  true);
+            }
+
+            internal void UpdateFsInfo32()
+            {
+                uint freeClusters;
+                uint firstFreeCluster;
+
+                lock (this) {
+                    freeClusters     = (uint) this.FreeClusters;
+                    firstFreeCluster = (uint) this.FirstFreeCluster;
+                }
+
+                uint sectorId = (uint)bpbSummary.FsInfoSector;
+                BlockCache ncCache = FatVolume.NonClusterCache;
+                byte []! in ExHeap sector =
+                    ncCache.BeginQuickBlockOperation(sectorId);
+
+                ref FsInfo32 fs32 = ref sector[0];
+
+                assert fs32.ValidSignatures();
+
+                fs32.Initialize(freeClusters, firstFreeCluster);
+
+                assert fs32.ValidSignatures();
+
+                ncCache.EndQuickBlockOperation(sectorId, sector, true);
+            }
+        } // class Fat32Internal
+    } // class Fat32
+}
diff --git a/base/Services/Fat/Fs/FatFs.csproj b/base/Services/Fat/Fs/FatFs.csproj
new file mode 100644
index 0000000..02a2802
--- /dev/null
+++ b/base/Services/Fat/Fs/FatFs.csproj
@@ -0,0 +1,63 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>FatFs</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="AsyncCommands.sg" />
+    <Compile Include="Bitmap.sg" />
+    <Compile Include="BlockCache.sg" />
+    <Compile Include="BlockIndex.sg" />
+    <Compile Include="BlockWriter.sg" />
+    <Compile Include="BPB.sg" />
+    <Compile Include="ChannelIo.sg" />
+    <Compile Include="DHashtable.sg" />
+    <Compile Include="Directory.sg" />
+    <Compile Include="DirectoryCache.sg" />
+    <Compile Include="DirectoryEntry.sg" />
+    <Compile Include="Disk.sg" />
+    <Compile Include="Fat.sg" />
+    <Compile Include="Fat12.sg" />
+    <Compile Include="Fat16.sg" />
+    <Compile Include="Fat32.sg" />
+    <Compile Include="FatThreadPool.sg" />
+    <Compile Include="FatVolume.sg" />
+    <Compile Include="File.sg" />
+    <Compile Include="FileCache.sg" />
+    <Compile Include="Format.sg" />
+    <Compile Include="FsInfo32.sg" />
+    <Compile Include="FsObject.sg" />
+    <Compile Include="FsObjectCache.sg" />
+    <Compile Include="LongDirectoryEntry.sg" />
+    <Compile Include="Main.sg" />
+    <Compile Include="OpenHash.sg" />
+    <Compile Include="PathOpen.sg" />
+    <Compile Include="PathUtils.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Contracts\FatContracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Diagnostics.Contracts\Diagnostics.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Fat/Fs/FatThreadPool.sg b/base/Services/Fat/Fs/FatThreadPool.sg
new file mode 100644
index 0000000..300765e
--- /dev/null
+++ b/base/Services/Fat/Fs/FatThreadPool.sg
@@ -0,0 +1,127 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatThreadPool.sg
+//
+//  Note:
+//
+
+using System.Collections;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <remarks>This class implements a non-Singleton
+    /// threadpool and has a configurable work queue
+    /// size. </remarks>
+    internal sealed class FatThreadPool
+    {
+        object                            monitor;
+        TContainer<TQueue<AsyncCommand>>! commandContainer;
+        int                               queuedItems;
+        readonly int                      maxQueuedItems;
+        volatile int                      threadCount;
+        volatile bool                     shutdown;
+        ManualResetEvent                  shutdownEvent;
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal FatThreadPool(int maxThreads, int maxQueuedItems)
+            requires maxThreads > 0;
+            requires maxQueuedItems > 0;
+            requires maxThreads <= maxQueuedItems;
+        {
+            this.monitor          = new object();
+            this.commandContainer =
+                new TContainer<TQueue<AsyncCommand>>(
+                    new TQueue<AsyncCommand>()
+                    );
+            this.queuedItems      = 0;
+            this.maxQueuedItems   = maxQueuedItems;
+            this.threadCount      = maxThreads;
+            this.shutdown         = false;
+            this.shutdownEvent    = new ManualResetEvent(false);
+            base();
+
+            for (int i = 0; i < maxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(WorkerMain));
+                t.Start();
+            }
+        }
+
+        /// <summary> Queues call to constructor supplied
+        /// delegate with user supplied object.  This method
+        /// blocks if maximum queue size is reached.  </summary>
+        internal void QueueUserWorkItem([Claims] AsyncCommand! command)
+        {
+            Monitor.Enter(this.monitor);
+            while (this.queuedItems == this.maxQueuedItems) {
+                Monitor.Wait(this.monitor);
+            }
+            TQueue<AsyncCommand> commands = commandContainer.Acquire();
+            commands.AddHead(command);
+            commandContainer.Release(commands);
+            this.queuedItems++;
+            Monitor.Pulse(this.monitor);
+            Monitor.Exit(this.monitor);
+        }
+
+        private void WorkerMain()
+        {
+            while (true) {
+                AsyncCommand command;
+                lock (this.monitor) {
+                    while (queuedItems == 0 && !shutdown) {
+                        Monitor.Wait(this.monitor);
+                    }
+
+                    if (queuedItems == 0 && shutdown) {
+                        break;
+                    }
+
+                    TQueue<AsyncCommand> commands = commandContainer.Acquire();
+                    command = commands.ExtractTail();
+                    assert(command != null);
+                    commandContainer.Release(commands);
+
+                    if (this.queuedItems-- == this.maxQueuedItems) {
+                        Monitor.Pulse(this.monitor);
+                    }
+                }
+                command.Execute();
+                ((ITracked)command).Dispose();
+            }
+
+            lock (this.monitor) {
+                if (--this.threadCount == 0) {
+                    shutdownEvent.Set();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Shutdown thread pool instance.  Caller blocks until
+        /// the threads in the pool have finished outstanding
+        /// work items.
+        /// </summary>
+        internal void Shutdown()
+        {
+            lock (this.monitor) {
+                shutdown = true;
+                Monitor.PulseAll(this.monitor);
+            }
+
+            shutdownEvent.WaitOne();
+
+            TQueue<AsyncCommand> commands = commandContainer.Acquire();
+            DebugStub.Assert(commands.Empty);
+            commandContainer.Release(commands);
+        }
+    }
+}
+
diff --git a/base/Services/Fat/Fs/FatVolume.sg b/base/Services/Fat/Fs/FatVolume.sg
new file mode 100644
index 0000000..14e4c2e
--- /dev/null
+++ b/base/Services/Fat/Fs/FatVolume.sg
@@ -0,0 +1,260 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FatVolume.sg
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Services.Fat.Contracts;
+using Microsoft.Singularity.V1.Services;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class FatVolume
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+        const int DiskChannels = 4;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Static Members
+
+        static private string       diskName;
+        static private Fat!         theFat;
+        static private BlockCache!  theSectorCache;  // Cache of initial-sectors
+        static private BlockCache!  theClusterCache; // Cache of data clusters
+        static private BlockWriter! theBlockWriter;  // Dirty block flusher
+        static private bool            isReadOnly;
+        static private BpbSummary      theBpbSummary;
+        static private FileCache!      theFileCache;
+        static private DirectoryCache! theDirectoryCache;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Static Methods
+
+        internal static bool IsReadOnly
+        {
+            get { return isReadOnly; }
+        }
+
+        internal static Fat! Fat
+        {
+            get { return theFat; }
+        }
+
+        internal static BlockCache! NonClusterCache
+        {
+            get { return theSectorCache; }
+        }
+
+        internal static BlockCache! ClusterCache
+        {
+            get { return theClusterCache; }
+        }
+
+        internal static BpbSummary! BpbSummary
+        {
+            get { return theBpbSummary; }
+        }
+
+        internal static DirectoryCache! DirectoryCache
+        {
+            get { return theDirectoryCache; }
+        }
+
+        internal static FileCache! FileCache
+        {
+            get { return theFileCache; }
+        }
+
+        internal static FatVersion FatVersion
+        {
+            get { return theBpbSummary.Version; }
+        }
+
+        private static BpbSummary
+        CreateBpbSummary(string! diskName, [Claims]byte[]! in ExHeap sector0)
+        {
+            try {
+                return new BpbSummary(sector0);
+            }
+            catch (BpbException be) {
+                LogError("Found invalid BPB data on \"{0}\" - {1}.",
+                         diskName, be.Message);
+                return null;
+            }
+            finally {
+                delete sector0;
+            }
+        }
+
+        internal static FatContractErrorCode
+        Mount(
+            string! diskName,
+            bool    readOnly,
+            uint    cacheMB,
+            uint    directoryCacheSize,
+            uint    fileCacheSize,
+            uint    writeQueueSize)
+        {
+            DirectoryServiceContract.Imp dsImp =
+                DirectoryService.NewClientEndpoint();
+
+            try {
+                Disk disk = Disk.Create(dsImp, diskName, DiskChannels);
+                if (disk == null) {
+                    LogError("Could not find disk \"{0}\".", diskName);
+                    return FatContractErrorCode.DiskUnavailable;
+                }
+
+                byte [] in ExHeap sector0 = disk.Read(0, 512);
+                if (sector0 == null) {
+                    LogError("Failed to read sector 0 of \"{0}\".", diskName);
+                    return FatContractErrorCode.ReadFailed;
+                }
+
+                FatVolume.theBpbSummary = CreateBpbSummary(diskName, sector0);
+                if (theBpbSummary == null) {
+                    return FatContractErrorCode.BadBPB;
+                }
+
+                if (theBpbSummary.TotalSectors > disk.TotalSectors) {
+                    LogError("FAT claims more sectors than present on disk" +
+                             " ({0} > {1}).",
+                             theBpbSummary.TotalSectors, disk.TotalSectors);
+                    return FatContractErrorCode.BadBPB;
+                }
+
+
+                FatVolume.diskName = diskName;
+                if (readOnly == false) {
+                    FatVolume.isReadOnly =
+                        ((disk.DiskAttributes & DiskAttributes.ReadOnly) ==
+                         DiskAttributes.ReadOnly);
+                }
+                else {
+                    FatVolume.isReadOnly = readOnly;
+                }
+
+                //
+                // Initialize write queue
+                //
+                writeQueueSize = Math.Min(writeQueueSize,
+                                          FatMountSettings.MaxWriteQueueSize);
+                FatVolume.theBlockWriter = new BlockWriter(disk,
+                                                           writeQueueSize,
+                                                           !readOnly);
+
+                cacheMB = Math.Min(cacheMB, FatMountSettings.MaxCacheMB);
+
+                //
+                // Initialize cache for portion of disk addressed by sector
+                //
+                uint sectorCacheKB  = cacheMB * 1024 / 16;
+
+                FatVolume.theSectorCache = new BlockCache(
+                    new BlockCacheConfiguration(
+                        0, theBpbSummary.BytesPerSector, 1,
+                        (uint)theBpbSummary.FirstClusterSector,
+                        sectorCacheKB),
+                    disk, theBlockWriter);
+
+                //
+                // Initialize cache for portion of disk addressed by cluster
+                //
+                // The first two entries in
+                // FAT are used for media type and status bits.
+                //
+                // See page 18 of the Fat32 File System Spec (1.03).
+                //
+                uint clusterCacheKB = cacheMB * 1024 - sectorCacheKB;
+                uint clusterZeroOffset = 2 * theBpbSummary.SectorsPerCluster;
+
+                FatVolume.theClusterCache = new BlockCache(
+                    new BlockCacheConfiguration(
+                        theBpbSummary.FirstClusterSector - clusterZeroOffset,
+                        theBpbSummary.BytesPerSector,
+                        theBpbSummary.SectorsPerCluster,
+                        theBpbSummary.ClusterCount,
+                        clusterCacheKB),
+                    disk, theBlockWriter);
+
+                switch (theBpbSummary.Version) {
+                    case FatVersion.Fat12:
+                        DebugStub.Print("Mounting Fat12 volume\n");
+                        FatVolume.theFat = new Fat12(theSectorCache,
+                                                     theBpbSummary);
+                        break;
+                    case FatVersion.Fat16:
+                        DebugStub.Print("Mounting Fat16 volume\n");
+                        FatVolume.theFat = new Fat16(theSectorCache,
+                                                     theBpbSummary);
+                        break;
+                    case FatVersion.Fat32:
+                        DebugStub.Print("Mounting Fat32 volume\n");
+                        FatVolume.theFat = new Fat32(theSectorCache,
+                                                     theBpbSummary);
+                        break;
+                    default:
+                        /* NOTREACHED */
+                        assert false;
+                        break;
+                }
+
+                //
+                // Initialize caches for recently closed files and
+                // directories used to mitigate the cost of re-opens
+                //
+                directoryCacheSize =
+                    Math.Min(directoryCacheSize,
+                             FatMountSettings.MaxDirectoryCacheSize);
+                theDirectoryCache = new DirectoryCache(directoryCacheSize);
+
+                DebugStub.Print("Directory cache size = {0} directories\n",
+                                __arglist(directoryCacheSize));
+
+                fileCacheSize =
+                    Math.Min(fileCacheSize, FatMountSettings.MaxFileCacheSize);
+                theFileCache = new FileCache(fileCacheSize);
+                DebugStub.Print("File cache size = {0} files\n",
+                                __arglist(fileCacheSize));
+            }
+            finally {
+                delete dsImp;
+            }
+            return FatContractErrorCode.NoError;
+        }
+
+        internal static void Unmount()
+        {
+            Tracing.Log(Tracing.Debug, "Unmount of {0} beginning.",
+                        FatVolume.diskName);
+
+            FatVolume.theBlockWriter.Shutdown();
+            NonClusterCache.ValidateAllClean();
+            ClusterCache.ValidateAllClean();
+
+            Tracing.Log(Tracing.Debug, "Unmount of {0} complete.",
+                        FatVolume.diskName);
+        }
+
+        internal static void LogError(string! message)
+        {
+            Tracing.Log(Tracing.Error, message);
+            DebugStub.Print(message);
+        }
+
+        internal static void LogError(string! message, params object[] values)
+        {
+            LogError(String.Format(message, values));
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/File.sg b/base/Services/Fat/Fs/File.sg
new file mode 100644
index 0000000..ad80366
--- /dev/null
+++ b/base/Services/Fat/Fs/File.sg
@@ -0,0 +1,372 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   File.sg
+//
+//  Note:
+//
+
+using Microsoft.SingSharp;
+
+using Microsoft.Singularity.Channels;
+
+using System;
+
+using MSD = Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    enum FileError : int {
+        NoError         = 0,
+        ReadOnly        = 1,
+        BadBufferOffset = 2,
+        BadFileOffset   = 3,
+        NoSpace         = 4
+    }
+
+    class File : FsObject
+    {
+        private BlockIndex blockIndex;                  // cluster index
+        private byte       attributes;                  // cached attributes
+        private uint       bytes;                       // file size
+
+        private const long MaxFileBytes = 0xffffffff;
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal File(Directory! parent,
+                      int        shortEntryOffset,
+                      int        firstCluster,
+                      byte       attributes,
+                      uint       fileLength)
+            : base(parent, shortEntryOffset)
+        {
+            this.blockIndex = new BlockIndex();
+            this.attributes = attributes;
+            this.bytes      = fileLength;
+
+            FatVolume.Fat.PopulateIndex(this.blockIndex, firstCluster);
+        }
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal File(Directory! parent,
+                      int        shortEntryOffset,
+                      int        firstCluster,
+                      byte       attributes)
+            : this(parent, shortEntryOffset, firstCluster, attributes, 0)
+        {
+        }
+
+        /// <remarks> Close open file. </remarks>
+        internal void Close()
+        {
+            uint expectedClusters =
+                (this.bytes + BytesPerCluster - 1) / BytesPerCluster;
+            DebugStub.Assert(this.blockIndex.Count == expectedClusters);
+            base.CloseInstance();
+        }
+
+        bool IsReadOnly
+        {
+            [ Microsoft.Contracts.Pure ]
+            get {
+                return (this.attributes & DirectoryEntry.AttributeReadOnly) != 0;
+            }
+        }
+
+        private static uint BytesPerCluster
+        {
+            [ Microsoft.Contracts.Pure ]
+            get {
+                return FatVolume.BpbSummary.BytesPerCluster;
+            }
+        }
+
+        internal override int FirstCluster
+        {
+            get {
+                int blockId;
+                if (blockIndex.Lookup(0, out blockId) == false) {
+                    assert false;
+                }
+                return blockId;
+            }
+        }
+
+        internal FileError Read(byte[]! in ExHeap destBuffer,
+                                int               destOffset,
+                                uint              fileOffset,
+                                int               bytesToRead,
+                                out int           bytesRead)
+            requires bytesToRead >= 0;
+        {
+            bytesRead = 0;
+            if (bytesToRead == 0) {
+                return FileError.NoError;
+            }
+            if (destOffset < 0 || destOffset > destBuffer.Length) {
+                return FileError.BadBufferOffset;
+            }
+            if (fileOffset > this.bytes) {
+                return FileError.BadFileOffset;
+            }
+
+            bytesToRead = Math.Min((int)(this.bytes - fileOffset),
+                                   bytesToRead);
+            bytesToRead = Math.Min(destBuffer.Length - destOffset,
+                                   bytesToRead);
+            bytesRead   = bytesToRead;
+
+            lock (this) {
+                int clusterNumber = (int)(fileOffset / BytesPerCluster);
+                int clusterStart  = (int)(fileOffset % BytesPerCluster);
+                int clusterRemain =
+                    (int)Math.Min(BytesPerCluster - clusterStart, bytesToRead);
+
+                while (bytesToRead != 0) {
+                    byte[]! in ExHeap block = (!)AcquireCluster(clusterNumber);
+                    try {
+                        Bitter.Copy(destBuffer,
+                                    (int)destOffset,
+                                    clusterRemain,
+                                    block,
+                                    clusterStart);
+                    }
+                    finally {
+                        ReleaseCluster(clusterNumber, block, false);
+                    }
+                    destOffset     += clusterRemain;
+                    bytesToRead    -= clusterRemain;
+                    clusterStart    = 0;
+                    clusterRemain   =
+                        (int)Math.Min(BytesPerCluster, bytesToRead);
+                    clusterNumber++;
+                }
+                UpdateLastAccessTime();
+            }
+
+            return FileError.NoError;
+        }
+
+        private bool LockedGrowFileSpace(uint proposedFileBytes)
+        {
+            int oldChainLength = this.blockIndex.Count;
+            int newChainLength =
+                (int)((proposedFileBytes + BytesPerCluster - 1) /
+                      BytesPerCluster);
+
+            int currentLength = oldChainLength;
+            while (currentLength != newChainLength) {
+                int allocLength = Math.Min(Fat.MaxAllocationLength,
+                                           newChainLength - currentLength);
+                int extensionLength;
+                if (FatVolume.Fat.GrowChain(this.blockIndex, allocLength,
+                                            out extensionLength) == true) {
+                    assert extensionLength == allocLength;
+                    currentLength += allocLength;
+                }
+                else {
+                    FatVolume.Fat.TruncateChain(this.blockIndex,
+                                                oldChainLength);
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private void LockedZeroFileRegion(uint start, uint length)
+        {
+            int clusterNumber = (int)(start / BytesPerCluster);
+            int clusterStart = (int)(start % BytesPerCluster);
+
+            if (clusterStart != 0) {
+                int trim = Math.Min((int)BytesPerCluster - clusterStart,
+                                    (int)length);
+                byte[]! in ExHeap cluster = (!)AcquireCluster(clusterNumber);
+                Bitter.Zero(cluster, clusterStart, trim);
+                ReleaseCluster(clusterNumber, cluster, true);
+                length      -= (uint)trim;
+                clusterStart = 0;
+                clusterNumber++;
+            }
+
+            while (length >= BytesPerCluster) {
+                ZeroCluster(clusterNumber);
+                length -= BytesPerCluster;
+                clusterNumber++;
+            }
+
+            if (length != 0) {
+                byte[]! in ExHeap cluster = (!)AcquireCluster(clusterNumber);
+                Bitter.Zero(cluster, 0, (int)length);
+                ReleaseCluster(clusterNumber, cluster, true);
+            }
+        }
+
+        private void LockedCopyFileRegion(byte[]! in ExHeap srcBuffer,
+                                          int               srcOffset,
+                                          uint              fileOffset,
+                                          int               length)
+        {
+            int clusterNumber = (int)(fileOffset / BytesPerCluster);
+            int clusterStart  = (int)(fileOffset % BytesPerCluster);
+
+            if (clusterStart != 0) {
+                int toCopy = Math.Min((int)BytesPerCluster - clusterStart,
+                                      length);
+                byte[]! in ExHeap cluster = (!)AcquireCluster(clusterNumber);
+                Bitter.Copy(cluster, clusterStart, toCopy,
+                            srcBuffer, srcOffset);
+                ReleaseCluster(clusterNumber, cluster, true);
+                srcOffset    += toCopy;
+                length       -= toCopy;
+                clusterStart  = 0;
+                clusterNumber++;
+            }
+
+            while (length >= BytesPerCluster) {
+                WriteCluster(clusterNumber, srcBuffer, srcOffset);
+                srcOffset += (int)BytesPerCluster;
+                length    -= (int)BytesPerCluster;
+                clusterNumber++;
+            }
+
+            if (length != 0) {
+                byte[]! in ExHeap cluster2 = (!)AcquireCluster(clusterNumber);
+                Bitter.Copy(cluster2, 0, length, srcBuffer, srcOffset);
+                ReleaseCluster(clusterNumber, cluster2, true);
+            }
+        }
+
+        internal FileError Write(byte[]! in ExHeap srcBuffer,
+                                 int               srcOffset,
+                                 uint              fileOffset,
+                                 int               bytesToWrite,
+                                 out int           bytesWritten)
+        {
+            bytesWritten = 0;
+            if (FatVolume.IsReadOnly || this.IsReadOnly) {
+                return FileError.ReadOnly;
+            }
+
+            if (bytesToWrite == 0) {
+                return FileError.NoError;
+            }
+
+            if (srcOffset < 0 || srcOffset > srcBuffer.Length) {
+                return FileError.BadBufferOffset;
+            }
+
+            if (bytesToWrite > srcBuffer.Length ||
+                srcBuffer.Length - srcOffset < bytesToWrite) {
+                return FileError.BadBufferOffset;
+            }
+
+            long writeLimit = (long)fileOffset + bytesToWrite;
+            if (writeLimit > MaxFileBytes) {
+                return FileError.BadFileOffset;
+            }
+
+            lock (this) {
+                if (writeLimit > this.bytes) {
+                    uint oldBytes = bytes;
+
+                    if (LockedGrowFileSpace((uint)writeLimit) == false) {
+                        return FileError.NoSpace;
+                    }
+
+                    this.bytes = Math.Max(fileOffset + (uint)bytesToWrite,
+                                          this.bytes);
+
+                    if (fileOffset > oldBytes) {
+                        LockedZeroFileRegion(fileOffset,
+                                             fileOffset - oldBytes);
+                    }
+                }
+
+                LockedCopyFileRegion(srcBuffer,
+                                     srcOffset,
+                                     fileOffset,
+                                     bytesToWrite);
+
+                bytesWritten = bytesToWrite;
+                UpdateFileSize(this.bytes);
+            }
+
+            DebugStub.Assert((uint)writeLimit <= this.bytes);
+
+            DebugStub.Assert(
+                this.blockIndex.Count ==
+                (this.bytes + BytesPerCluster - 1) / BytesPerCluster
+                );
+
+            return FileError.NoError;
+        }
+
+        // --------------------------------------------------------------------
+        // Cluster access methods
+
+        [ Microsoft.Contracts.Pure ]
+        private bool ValidClusterNumber(int clusterNumber)
+        {
+            return (clusterNumber >= 0 &&
+                    clusterNumber < this.blockIndex.Count);
+        }
+
+        private byte[] in ExHeap AcquireCluster(int clusterNumber)
+            requires ValidClusterNumber(clusterNumber);
+        {
+            int blockId = -1;
+            if (blockIndex.Lookup(clusterNumber, out blockId)) {
+                BlockCache bc = FatVolume.ClusterCache;
+                byte [] in ExHeap buffer =
+                    bc.BeginQuickBlockOperation((uint)blockId);
+                return buffer;
+            }
+            assert false;
+            return null;
+        }
+
+        private void ReleaseCluster(int                        clusterNumber,
+                                    [Claims] byte[]! in ExHeap buffer,
+                                    bool                       dirty)
+            requires ValidClusterNumber(clusterNumber);
+        {
+            int blockId;
+            if (blockIndex.Lookup(clusterNumber, out blockId)) {
+                BlockCache bc = FatVolume.ClusterCache;
+                bc.EndQuickBlockOperation((uint)blockId, buffer, dirty);
+                return;
+            }
+            assert false;
+        }
+
+        private void WriteCluster(int               clusterNumber,
+                                  byte[]! in ExHeap buffer,
+                                  int               bufferOffset)
+            requires ValidClusterNumber(clusterNumber);
+            requires buffer.Length >= bufferOffset;
+            requires buffer.Length - bufferOffset >= BytesPerCluster;
+        {
+            int blockId;
+            if (blockIndex.Lookup(clusterNumber, out blockId)) {
+                BlockCache bc = FatVolume.ClusterCache;
+                bc.WriteEntireBlock((uint)blockId, buffer, bufferOffset);
+                return;
+            }
+            assert false;
+        }
+
+        private void ZeroCluster(int clusterNumber)
+        {
+            int blockId;
+            if (blockIndex.Lookup(clusterNumber, out blockId)) {
+                FatVolume.ClusterCache.ZeroBlock((uint)blockId);
+                return;
+            }
+            assert false;
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/FileCache.sg b/base/Services/Fat/Fs/FileCache.sg
new file mode 100644
index 0000000..c77fdb5
--- /dev/null
+++ b/base/Services/Fat/Fs/FileCache.sg
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FileCache.sg
+//
+//  Note:
+//
+//  This cache is for recently closed files.  Opened
+//  files are not stored here.  This cache exists because
+//  opening a file entails a non-trivial amount of work.
+//
+//  File metadata does not have a fixed size and this cache
+//  should probably take this into account.
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal class FileCache
+    {
+        FsObjectCache! cache;
+
+        internal FileCache(uint capacity)
+        {
+            this.cache = new FsObjectCache(capacity);
+        }
+
+        internal void Add(int firstCluster, File! directory)
+        {
+            cache.Add(firstCluster, directory);
+        }
+
+        internal File Get(int firstCluster)
+        {
+            return (File)cache.Get(firstCluster);
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/Format.sg b/base/Services/Fat/Fs/Format.sg
new file mode 100644
index 0000000..298ca59
--- /dev/null
+++ b/base/Services/Fat/Fs/Format.sg
@@ -0,0 +1,990 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Format.sg
+//
+//  Note:
+//
+//  This used to be a standalone program, but is now part of the
+//  FAT service.  It deliberately makes little use of the core
+//  of the FAT FS implementation.
+//
+//  This module does not update the MBR during a format operation.
+//  The VolumeManager, or another entity, should perform the update.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal sealed class Format
+    {
+        //
+        // Hard-wired defaults supported by this formatting program.
+        //
+        const uint BpbBytesPerSector         = 512;
+        const uint BpbRootEntryCount16       = 512;
+        const uint BpbNumberOfFats           = 2;
+        const byte BpbFixedMedia             = 0xf8;
+        const byte BpbRemovableMedia         = 0xf0;
+        const byte BpbDefaultSectorsPerTrack = 0x3f;
+        const byte BpbDefaultNumberOfHeads   = 0x80;
+        const byte BpbDefaultDriveNumber     = 0x80;
+
+        //
+        // FAT variant specific constants
+        //
+        const string Fat12TypeLabel            = "FAT12";
+        const string Fat16TypeLabel            = "FAT16";
+        const string Fat32TypeLabel            = "FAT32";
+
+        const uint   Fat16PointerSize          = 2;
+
+        const byte   Fat32RootDirectoryCluster = 2;
+        const uint   Fat32FsInfoSector         = 1;
+        const uint   Fat32BackupSector         = 6;
+
+        const uint   Fat16CleanShutdown        = 0x8000;
+        const uint   Fat32CleanShutdown        = 0x08000000;
+        const uint   Fat32NotErrorShutdown     = 0x04000000;
+        const uint   Fat32EOC                  = 0x0ffffff8;
+
+        // --------------------------------------------------------------------
+        // Disk size mappings to clusters per sector mapping (from page 20)
+        //
+        // The entries for FAT12 are contrived for this
+        // implementation without reference to other Microsoft
+        // O/S code.
+        //
+        // Entries for legacy floppy drives (< 1440kB) are not
+        // supported, though could be easily added.  The code
+        // does not format 1.44MB floppies as existing Microsoft
+        // operating systems but it should be usable.
+        //
+
+        internal struct DiskSizeToSectorsPerCluster
+        {
+            internal uint    MaxDiskSectors;
+            internal uint    SectorsPerCluster;
+
+            internal DiskSizeToSectorsPerCluster(uint m, uint s)
+            {
+                this.MaxDiskSectors    = m;
+                this.SectorsPerCluster = s;
+            }
+        }
+
+        private static DiskSizeToSectorsPerCluster [] diskTable12 = {
+            new DiskSizeToSectorsPerCluster(2879, 0),
+            new DiskSizeToSectorsPerCluster(1 * 4084, 1),
+            new DiskSizeToSectorsPerCluster(2 * 4084, 2),
+            new DiskSizeToSectorsPerCluster(4 * 4084, 4),
+            new DiskSizeToSectorsPerCluster(8 * 4084, 8),
+            new DiskSizeToSectorsPerCluster(16 * 4084, 16),
+            new DiskSizeToSectorsPerCluster(32 * 4084, 32),
+            new DiskSizeToSectorsPerCluster(64 * 4084, 64)
+        };
+
+        private static DiskSizeToSectorsPerCluster [] diskTable16 = {
+            new DiskSizeToSectorsPerCluster(8400, 0),
+            new DiskSizeToSectorsPerCluster(32680, 2),
+            new DiskSizeToSectorsPerCluster(262144, 4),
+            new DiskSizeToSectorsPerCluster(524288, 8),
+            new DiskSizeToSectorsPerCluster(1048576, 16),
+            new DiskSizeToSectorsPerCluster(2097152, 32),
+            new DiskSizeToSectorsPerCluster(4194304, 64)
+        };
+
+        private static DiskSizeToSectorsPerCluster [] diskTable32 = {
+            new DiskSizeToSectorsPerCluster(66600, 0),
+            new DiskSizeToSectorsPerCluster(532480, 1),
+            new DiskSizeToSectorsPerCluster(1048576, 8),
+            new DiskSizeToSectorsPerCluster(16777216, 8),
+            new DiskSizeToSectorsPerCluster(33554432, 16),
+            new DiskSizeToSectorsPerCluster(67108864, 32),
+            new DiskSizeToSectorsPerCluster(0xffffffff, 64)
+        };
+
+        private static FatVersion GetPreferredFatVersion(uint diskSectors)
+        {
+            // These values are taken from the code comments on
+            // page 20 of the FAT specification.
+            if (diskSectors <= 8400) {
+                return FatVersion.Fat12;
+            }
+            else if (diskSectors <= 1048576) {
+                return FatVersion.Fat16;
+            }
+            return FatVersion.Fat32;
+        }
+
+        // --------------------------------------------------------------------
+        // Dimensioning and provisioning routines
+
+        private static uint
+        GetSectorsPerCluster(DiskSizeToSectorsPerCluster [] diskTable,
+                             uint diskSectors)
+        {
+            foreach (DiskSizeToSectorsPerCluster entry in diskTable) {
+                if (entry.SectorsPerCluster != 0 &&
+                    diskSectors <= entry.MaxDiskSectors) {
+                    return entry.SectorsPerCluster;
+                }
+            }
+            return 0;
+        }
+
+        private static uint GetSectorsPerCluster(FatVersion fatVersion,
+                                                 uint diskSectors)
+        {
+            switch (fatVersion) {
+                case FatVersion.Fat12 :
+                    return GetSectorsPerCluster(diskTable12, diskSectors);
+                case FatVersion.Fat16 :
+                    return GetSectorsPerCluster(diskTable16, diskSectors);
+                default :
+                    assert fatVersion == FatVersion.Fat32;
+                    return GetSectorsPerCluster(diskTable32, diskSectors);
+            }
+        }
+
+        private static string! FatVersionName(FatVersion fatVersion)
+        {
+            switch (fatVersion) {
+                case FatVersion.Fat12: return Fat12TypeLabel;
+                case FatVersion.Fat16: return Fat16TypeLabel;
+                default:
+                    assert fatVersion == FatVersion.Fat32;
+                    return Fat32TypeLabel;
+            }
+        }
+
+        private static uint GetRootDirectoryEntries(FatVersion fatVersion,
+                                                    uint       diskSectors)
+        {
+            // In future the code could
+            // support FAT12 sizes less than 1.44MB by adding
+            // the appropriate number of entries here.
+            switch (fatVersion) {
+                case FatVersion.Fat32:
+                    return 0;
+                default:
+                    return BpbRootEntryCount16;
+            }
+        }
+
+        private static uint GetRootDirectorySectors(FatVersion fatVersion,
+                                                    uint diskSectors)
+        {
+            uint rootBytes =
+                GetRootDirectoryEntries(fatVersion, diskSectors) *
+                DirectoryEntry.Length;
+            return (uint)((rootBytes + (BpbBytesPerSector - 1)) /
+                          BpbBytesPerSector);
+        }
+
+        private static uint GetReservedSectorCount(FatVersion fatVersion)
+        {
+            // From page 9 of spec
+            switch (fatVersion) {
+                case FatVersion.Fat32:
+                    return 32;
+                default:
+                    return 1;
+            }
+        }
+
+        private static uint GetSectorsPerFat(FatVersion fatVersion,
+                                             uint diskSectors)
+        {
+            uint tmpVal1 = (diskSectors -
+                            (GetReservedSectorCount(fatVersion) +
+                             GetRootDirectorySectors(fatVersion, diskSectors))
+                            );
+            uint tmpVal2;
+
+            if (fatVersion == FatVersion.Fat12) {
+                // This is a better approximation than presented
+                // in the formatting section of the FAT which
+                // has scant information for FAT12.  If one
+                // figures out the `hard' maths that the spec
+                // warns against, then one ends up with:
+                tmpVal2 = (2u * BpbBytesPerSector / 3u *
+                           GetSectorsPerCluster(fatVersion, diskSectors) +
+                           BpbNumberOfFats
+                           );
+            }
+            else {
+                tmpVal2 = (BpbBytesPerSector / Fat16PointerSize *
+                           GetSectorsPerCluster(fatVersion, diskSectors) +
+                           BpbNumberOfFats
+                           );
+                if (fatVersion == FatVersion.Fat32) {
+                    tmpVal2 /= 2;
+                }
+            }
+            uint sectorsPerFat = (tmpVal1 + (tmpVal2 - 1)) / tmpVal2;
+            assert fatVersion == FatVersion.Fat32 || sectorsPerFat <= 0xffff;
+            return sectorsPerFat;
+        }
+
+        private static uint GetMaxClusters(FatVersion fatVersion,
+                                           uint       sectorsPerFat)
+        {
+            switch (fatVersion) {
+                case FatVersion.Fat12:
+                    return (sectorsPerFat * BpbBytesPerSector * 2 / 3) - 2;
+                case FatVersion.Fat16:
+                    return (sectorsPerFat * BpbBytesPerSector / 2) - 2;
+                default:
+                    assert fatVersion == FatVersion.Fat32;
+                    return (sectorsPerFat * BpbBytesPerSector / 4) - 2;
+            }
+        }
+
+        private static uint GetCountOfClusters(FatVersion fatVersion,
+                                               uint       diskSectors)
+        {
+            uint sectorsPerCluster = GetSectorsPerCluster(fatVersion,
+                                                          diskSectors);
+            uint usedSectors = GetSectorOfFirstCluster(fatVersion,
+                                                       diskSectors);
+            return (diskSectors - usedSectors) / sectorsPerCluster;
+        }
+
+        private static uint GetSectorOfFirstCluster(FatVersion fatVersion,
+                                                    uint       diskSectors)
+        {
+            return (
+                GetReservedSectorCount(fatVersion) +
+                BpbNumberOfFats * GetSectorsPerFat(fatVersion, diskSectors) +
+                GetRootDirectorySectors(fatVersion, diskSectors)
+                );
+        }
+
+        private static uint GetSectorOfFat(FatVersion fatVersion,
+                                           uint       diskSectors,
+                                           uint       fatNumber,
+                                           uint       sectorNumber)
+            requires fatNumber < BpbNumberOfFats;
+        {
+            return (
+                GetReservedSectorCount(fatVersion) +
+                fatNumber * GetSectorsPerFat(fatVersion, diskSectors) +
+                sectorNumber
+                );
+        }
+
+        private static uint GetSectorOfRootDirectory(FatVersion fatVersion,
+                                                     uint       diskSectors,
+                                                     uint       sectorNumber)
+        {
+            return (
+                GetReservedSectorCount(fatVersion) +
+                BpbNumberOfFats * GetSectorsPerFat(fatVersion, diskSectors) +
+                sectorNumber
+                );
+        }
+
+        private static uint GetTotalSectors(FatVersion fatVersion,
+                                            uint diskSectors,
+                                            uint numberOfFats)
+        {
+            uint sectorsPerFat = GetSectorsPerFat(fatVersion, diskSectors);
+            uint sectorsPerCluster = GetSectorsPerCluster(fatVersion,
+                                                          diskSectors);
+            uint totalSectors =
+                (
+                    GetReservedSectorCount(fatVersion) +
+                    numberOfFats * sectorsPerFat +
+                    GetRootDirectorySectors(fatVersion, diskSectors) +
+                    GetMaxClusters(fatVersion,
+                                   sectorsPerFat) * sectorsPerCluster
+                );
+            return (totalSectors < diskSectors) ? totalSectors : diskSectors;
+        }
+
+        private static void SignBootSector(byte []! in ExHeap bootSector)
+        {
+            bootSector[510] = BPB.Byte510Value;
+            bootSector[511] = BPB.Byte511Value;
+        }
+
+        private static void WriteToDisk(Disk! disk,
+                                        uint  sector,
+                                        [Claims] byte []! in ExHeap data)
+        {
+            byte[] in ExHeap outBuffer = disk.Write((ulong)sector, data);
+            delete outBuffer;
+        }
+
+        private static void ClearSectors(Disk! disk,
+                                         uint  startSector,
+                                         uint  sectorCount)
+        {
+            const uint RoundSectors = 64;
+
+            byte [] in ExHeap buffer =
+                new [ExHeap] byte [RoundSectors * BpbBytesPerSector];
+
+            try {
+                while (sectorCount != 0) {
+                    uint todo = Math.Min(RoundSectors, sectorCount);
+                    buffer = disk.Write((ulong)startSector, buffer, 0,
+                                        todo * BpbBytesPerSector);
+
+                    if (buffer == null) {
+                        // TODO: ERROR HANDLING HERE
+                        DebugStub.Break();
+                        break;
+                    }
+                    Bitter.Zero(buffer, 0, (int)todo * BpbBytesPerSector);
+
+                    sectorCount -= todo;
+                    startSector += todo;
+                }
+            }
+            finally {
+                delete buffer;
+            }
+        }
+
+        private static void ClearReservedArea(Disk! disk,
+                                              FatVersion fatVersion)
+        {
+            ClearSectors(disk, 1, GetReservedSectorCount(fatVersion) - 1);
+        }
+
+        private static void ClearFat(Disk!      disk,
+                                     uint       diskSectors,
+                                     FatVersion fatVersion)
+        {
+            uint fatStart   = GetSectorOfFat(fatVersion, diskSectors, 0, 0);
+            uint fatSectors = GetSectorsPerFat(fatVersion, diskSectors);
+            ClearSectors(disk, fatStart, fatSectors * BpbNumberOfFats);
+        }
+
+        private static byte JumpSize(FatVersion version)
+        {
+            if (FatVersion.Fat32 == version) {
+                return BPB32.Length + BPB.Length - 2;
+            }
+            else {
+                return BPB1x.Length + BPB.Length - 2;
+            }
+        }
+
+        private static void InitializeBpb(Disk!      disk,
+                                          uint       diskSectors,
+                                          FatVersion version,
+                                          ref BPB    bpb)
+        {
+            bpb.JmpBoot0            = 0xeb;
+            bpb.JmpBoot1            = JumpSize(version);
+            bpb.JmpBoot2            = 0x90;
+            bpb.OemName             = "MSWIN4.1";
+            bpb.BytesPerSector      = (ushort)BpbBytesPerSector;
+            bpb.SectorsPerCluster   = (byte)GetSectorsPerCluster(version,
+                                                                 diskSectors);
+            bpb.ReservedSectorCount = (ushort)GetReservedSectorCount(version);
+            bpb.NumberOfFats        = BpbNumberOfFats;
+            bpb.RootEntryCount      =
+                (ushort)GetRootDirectoryEntries(version, diskSectors);
+
+            if ((disk.DiskAttributes & DiskAttributes.Removable) != 0) {
+                bpb.Media = BpbRemovableMedia;
+            }
+            else {
+                bpb.Media = BpbFixedMedia;
+            }
+
+            uint totalSectors = GetTotalSectors(version,
+                                                diskSectors,
+                                                bpb.NumberOfFats);
+            if (version == FatVersion.Fat32 || totalSectors > 0xffff) {
+                bpb.TotalSectors16 = 0;
+                bpb.TotalSectors32 = totalSectors;
+            }
+            else {
+                bpb.TotalSectors16 = (ushort)totalSectors;
+                bpb.TotalSectors32 = 0;
+            }
+
+            if (version == FatVersion.Fat32) {
+                bpb.FatSize16 = 0;
+            }
+            else {
+                bpb.FatSize16 = (ushort)GetSectorsPerFat(version, diskSectors);
+            }
+
+            bpb.SectorsPerTrack = BpbDefaultSectorsPerTrack;
+            bpb.NumberOfHeads   = BpbDefaultNumberOfHeads;
+
+            assert disk.StartSector <= (ulong)UInt32.MaxValue;
+            bpb.HiddenSectors   = (uint)disk.StartSector;
+        }
+
+        private static void WriteFatSector0(Disk!               disk,
+                                            uint                diskSectors,
+                                            FatVersion          fatVersion,
+                                            [Claims] byte[]! in ExHeap sector)
+        {
+            for (uint i = 1; i < BpbNumberOfFats; i++) {
+                byte []! in ExHeap copy = new [ExHeap] byte [sector.Length];
+                Bitter.Copy(copy, 0, sector.Length, sector, 0);
+                WriteToDisk(
+                    disk,
+                    GetSectorOfFat(fatVersion, diskSectors, i, 0),
+                    copy
+                    );
+            }
+            WriteToDisk(
+                disk,
+                GetSectorOfFat(fatVersion, diskSectors, 0, 0),
+                sector
+                );
+        }
+
+        private static char[]! in ExHeap GetSanitizedVolumeLabel(string! label)
+        {
+            char[]! in ExHeap buffer = new [ExHeap] char [DirectoryEntry.ShortNameEntryLength];
+            for (int i = 0; i < buffer.Length; i++) {
+                buffer[i] = ' ';
+            }
+
+            int start = 0;
+            int length = label.Length;
+
+            while (length != 0 &&
+                   (buffer[start] == ' ' || buffer[start] == '.')) {
+                start++;
+                length--;
+            }
+
+            if (length > label.Length) {
+                length = label.Length;
+            }
+            for (int i = 0; i < length; i++) {
+                char c = Char.ToUpper(label[start + i]);
+                if (DirectoryEntry.ValidShortNameCharacter(c)) {
+                    buffer[i] = c;
+                }
+                else {
+                    buffer[i] = '_';
+                }
+            }
+            return buffer;
+        }
+
+        // --------------------------------------------------------------------
+        // FAT12/16 specific routines
+
+        private static void InitializeBpb1x(string!    volumeLabel,
+                                            FatVersion version,
+                                            ref BPB1x  bpb1x)
+        {
+            bpb1x.DriveNumber   = BpbDefaultDriveNumber;
+            bpb1x.BootSignature = BPB1x.ExpectedBootSignature;
+            bpb1x.VolumeId      = (uint)DateTime.Now.Ticks;
+            bpb1x.VolumeLabel   = volumeLabel;
+            if (version == FatVersion.Fat12) {
+                bpb1x.FileSystemType = Fat12TypeLabel;
+            }
+            else {
+                bpb1x.FileSystemType = Fat16TypeLabel;
+            }
+        }
+
+        private static void InitializeBootSector1216(Disk!      disk,
+                                                     uint       diskSectors,
+                                                     FatVersion fatVersion,
+                                                     string!    volumeLabel)
+        {
+            byte [] in ExHeap sector0 = new [ExHeap] byte[BpbBytesPerSector];
+            ref BPB bpb = ref sector0[0];
+            InitializeBpb(disk, diskSectors, fatVersion, ref bpb);
+
+            ref BPB1x bpb1x = ref sector0[BPB.Length];
+            InitializeBpb1x(volumeLabel, fatVersion, ref bpb1x);
+
+            SignBootSector(sector0);
+
+            WriteToDisk(disk, 0, sector0);
+        }
+
+        private static void InitializeFat12(Disk! disk,
+                                            byte []! in ExHeap sector)
+        {
+            if ((disk.DiskAttributes & DiskAttributes.Removable) != 0) {
+                sector[0] = BpbRemovableMedia;
+            }
+            else {
+                sector[0] = BpbFixedMedia;
+            }
+            sector[1] = 0xff;   // low nibble of EOC (8) and high nibble of
+                                // FAT[0].
+            sector[2] = 0xff;   // high byte of EOC
+        }
+
+        private static void InitializeFat16(Disk! disk,
+                                            byte []! in ExHeap sector)
+        {
+            const ushort fat0hi = 0xff00;
+            ref ushort fat0 = ref sector[0];
+            if ((disk.DiskAttributes & DiskAttributes.Removable) != 0) {
+                fat0 = ByteOrder.HostToLittleEndian(
+                    (ushort)(fat0hi | (ushort)BpbRemovableMedia));
+            }
+            else {
+                fat0 = ByteOrder.HostToLittleEndian(
+                    (ushort)(fat0hi | (ushort)BpbFixedMedia));
+            }
+            ref ushort fat1 = ref sector[2];
+            fat1 = 0xffff;
+        }
+
+        private static void InitializeFat1216(Disk!      disk,
+                                              uint       diskSectors,
+                                              FatVersion fatVersion)
+        {
+            ClearFat(disk, diskSectors, fatVersion);
+
+            byte []! in ExHeap sector = new [ExHeap] byte [BpbBytesPerSector];
+            if (fatVersion == FatVersion.Fat16) {
+                InitializeFat16(disk, sector);
+            }
+            else {
+                InitializeFat12(disk, sector);
+            }
+
+            WriteFatSector0(disk, diskSectors, fatVersion, sector);
+        }
+
+        private static void ClearRootDirectory1216(Disk!      disk,
+                                                   uint       diskSectors,
+                                                   FatVersion fatVersion)
+        {
+            ClearSectors(
+                disk,
+                GetSectorOfRootDirectory(fatVersion, diskSectors, 0),
+                GetRootDirectorySectors(fatVersion, diskSectors)
+                );
+        }
+
+        private static void InitializeRootDirectory1216(Disk!      disk,
+                                                        uint       diskSectors,
+                                                        FatVersion fatVersion,
+                                                        string!    volumeLabel)
+        {
+            ClearRootDirectory1216(disk, diskSectors, fatVersion);
+
+            byte []! in ExHeap sector = new [ExHeap] byte [BpbBytesPerSector];
+            char[]! in ExHeap v = GetSanitizedVolumeLabel(volumeLabel);
+            ref DirectoryEntry de = ref sector[0];
+            de.InitializeAsVolumeId(v);
+            delete v;
+
+            WriteToDisk(
+                disk,
+                GetSectorOfRootDirectory(fatVersion, diskSectors, 0),
+                sector
+                );
+        }
+
+        private static void Format1216(Disk!      disk,
+                                       uint       diskSectors,
+                                       FatVersion fatVersion,
+                                       string!    volumeLabel)
+        {
+            ClearReservedArea(disk, fatVersion);
+            InitializeBootSector1216(
+                disk,
+                diskSectors,
+                fatVersion,
+                volumeLabel
+                );
+            InitializeFat1216(disk, diskSectors, fatVersion);
+            InitializeRootDirectory1216(
+                disk,
+                diskSectors,
+                fatVersion,
+                volumeLabel
+                );
+        }
+
+        // --------------------------------------------------------------------
+        // FAT32 specific routines
+
+        private static void InitializeBpb32(Disk!     disk,
+                                            uint      diskSectors,
+                                            string!   volumeLabel,
+                                            ref BPB32 bpb32)
+        {
+            bpb32.FatSize32 = GetSectorsPerFat(FatVersion.Fat32, diskSectors);
+            bpb32.ExtFlags       = 0;
+            bpb32.FsVersion      = 0;
+            bpb32.RootCluster    = Fat32RootDirectoryCluster;
+            bpb32.FsInfoSector   = Fat32FsInfoSector;
+            bpb32.BootRecordCopy = Fat32BackupSector;
+            bpb32.DriveNumber    = BpbDefaultDriveNumber;
+            bpb32.BootSignature  = BPB32.ExpectedBootSignature;
+            bpb32.VolumeId       = (uint)DateTime.Now.Ticks;
+            bpb32.VolumeLabel    = volumeLabel;
+            bpb32.FileSystemType = Fat32TypeLabel;
+        }
+
+        private static void
+        InitializeBootSector32(Disk!              disk,
+                               uint               diskSectors,
+                               string!            volumeLabel,
+                               byte []! in ExHeap bootSector)
+        {
+            ref BPB bpb = ref bootSector[0];
+            InitializeBpb(disk, diskSectors, FatVersion.Fat32, ref bpb);
+
+            ref BPB32 bpb32 = ref bootSector[BPB.Length];
+            InitializeBpb32(disk, diskSectors, volumeLabel, ref bpb32);
+
+            SignBootSector(bootSector);
+        }
+
+        private static void
+        InitializeFsInfo32(Disk! disk, uint diskSectors)
+        {
+            // NB When writing the FsInfo32
+            // data we need to remember that the first cluster
+            // is used by the root directory and adjust free
+            // start and free count accordingly.
+            byte [] in ExHeap sector = new [ExHeap] byte [BpbBytesPerSector];
+            ref FsInfo32 fsInfo32 = ref sector[0];
+            fsInfo32.Initialize(
+                GetCountOfClusters(FatVersion.Fat32, diskSectors) - 1,
+                Fat32RootDirectoryCluster + 1
+                );
+            WriteToDisk(disk, Fat32FsInfoSector, sector);
+        }
+
+        private static void
+        InitializeBackupBootSector(Disk! disk,
+                                   byte[]! in ExHeap bootSector)
+        {
+            byte [] in ExHeap backup = new [ExHeap] byte [BpbBytesPerSector];
+            Bitter.Copy(backup, 0, backup.Length, bootSector, 0);
+            WriteToDisk(disk, Fat32BackupSector, backup);
+        }
+
+        private static void InitializeFat32(Disk! disk,
+                                            uint diskSectors)
+        {
+            ClearFat(disk, diskSectors, FatVersion.Fat32);
+
+            const uint fat0hi = 0x0fffff00;
+
+            byte []! in ExHeap sector = new [ExHeap] byte [BpbBytesPerSector];
+
+            ref uint fat0 = ref sector[0];
+            if ((disk.DiskAttributes & DiskAttributes.Removable) != 0) {
+                fat0 = ByteOrder.HostToLittleEndian(
+                    fat0hi | (uint)BpbRemovableMedia
+                    );
+            }
+            else {
+                fat0 = ByteOrder.HostToLittleEndian(
+                    fat0hi | (uint)BpbFixedMedia
+                    );
+            }
+
+            ref uint fat1 = ref sector[4];
+            fat1 = ByteOrder.HostToLittleEndian(
+                Fat32CleanShutdown | Fat32NotErrorShutdown | 0x03fffffff
+                );
+
+            ref uint rootCluster = ref sector[Fat32RootDirectoryCluster * 4];
+            rootCluster = ByteOrder.HostToLittleEndian(Fat32EOC);
+
+            WriteFatSector0(disk, diskSectors, FatVersion.Fat32, sector);
+        }
+
+        private static void InitializeRootDirectory32(Disk!   disk,
+                                                      uint    diskSectors,
+                                                      string! volumeLabel)
+        {
+            uint clusterLength =
+                BpbBytesPerSector *
+                GetSectorsPerCluster(FatVersion.Fat32, diskSectors);
+
+            byte []! in ExHeap cluster = new [ExHeap] byte [clusterLength];
+            char[]! in ExHeap v = GetSanitizedVolumeLabel(volumeLabel);
+
+            ref DirectoryEntry de = ref cluster[0];
+            de.InitializeAsVolumeId(v);
+            delete v;
+
+            WriteToDisk(
+                disk,
+                GetSectorOfFirstCluster(FatVersion.Fat32, diskSectors),
+                cluster
+                );
+        }
+
+        private static bool Format32(Disk!   disk,
+                                     uint    diskSectors,
+                                     string! volumeLabel)
+        {
+            ClearReservedArea(disk, FatVersion.Fat32);
+
+            byte [] in ExHeap sector0 = new [ExHeap] byte[BpbBytesPerSector];
+            InitializeBootSector32(disk, diskSectors, volumeLabel, sector0);
+            InitializeBackupBootSector(disk, sector0);
+            InitializeFsInfo32(disk, diskSectors);
+
+            WriteToDisk(disk, 0, sector0);
+
+            InitializeFat32(disk, diskSectors);
+            InitializeRootDirectory32(disk, diskSectors, volumeLabel);
+
+            return true;
+        }
+
+        // --------------------------------------------------------------------
+        // Entry point and helpers
+
+        private static bool ValidVolumeLabel(string! volumeLabel)
+        {
+            if (volumeLabel.Length > DirectoryEntry.ShortNameEntryLength) {
+                return false;
+            }
+            for (int i = 0; i < volumeLabel.Length; i++) {
+                if (!DirectoryEntry.ValidShortNameCharacter(volumeLabel[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private static bool ParseFatType(string! fatType,
+                                         uint    limitingSectors,
+                                         out FatVersion fatVersion,
+                                         out uint       useSectors)
+        {
+            DiskSizeToSectorsPerCluster [] diskTable = null;
+
+            if (string.Compare(fatType.ToUpper(), Fat12TypeLabel) == 0) {
+                fatVersion = FatVersion.Fat12;
+                diskTable = diskTable12;
+            }
+            else if (string.Compare(fatType.ToUpper(), Fat16TypeLabel) == 0) {
+                fatVersion = FatVersion.Fat16;
+                diskTable = diskTable16;
+            }
+            else if (string.Compare(fatType.ToUpper(), Fat32TypeLabel) == 0) {
+                fatVersion = FatVersion.Fat32;
+                diskTable = diskTable32;
+            }
+            else {
+                fatVersion = FatVersion.Fat32;
+                useSectors = 0;
+                return false;
+            }
+
+            uint max   = diskTable[diskTable.Length - 1].MaxDiskSectors;
+            useSectors = Math.Min(max, limitingSectors);
+
+            return true;
+        }
+
+        public static void
+        DebugDisplayDiskInfo(FatVersion version,
+                             uint  diskSectorsUsed,
+                             ulong diskSectorsAvailable)
+        {
+            DebugStub.Print(
+                "Formatting disk with {0}\n" +
+                "Disk Sectors       = {1} / {2}\n",
+                            __arglist(
+                                FatVersionName(version),
+                                diskSectorsUsed,
+                                diskSectorsAvailable)
+                            );
+            DebugStub.Print(
+                "Root Sectors        = {0}\n" +
+                "Reserved Sectors    = {1}\n" +
+                "Sectors Per Fat     = {2}\n" +
+                "Total Clusters      = {3}\n" +
+                "Sectors Per Cluster = {4}\n",
+                __arglist(
+                    GetRootDirectorySectors(version, diskSectorsUsed),
+                    GetReservedSectorCount(version),
+                    GetSectorsPerFat(version, diskSectorsUsed),
+                    GetCountOfClusters(version, diskSectorsUsed),
+                    GetSectorsPerCluster(version, diskSectorsUsed)
+                    )
+                );
+            DebugStub.Print(
+                "Used Sectors        = {0}\n",
+                __arglist(
+                    GetReservedSectorCount(version) +
+                    GetRootDirectorySectors(version, diskSectorsUsed) +
+                    GetSectorsPerFat(version, diskSectorsUsed) *
+                    BpbNumberOfFats +
+                    GetCountOfClusters(version, diskSectorsUsed) *
+                    GetSectorsPerCluster(version, diskSectorsUsed)
+                    )
+                );
+        }
+
+        private static void GetFormatSettings(ulong             diskSectors,
+                                              out uint          usableSectors,
+                                              out FatFormatType formatType)
+        {
+
+            ulong tmp = Math.Min(diskSectors, (ulong)UInt32.MaxValue);
+            usableSectors = (uint)tmp;
+
+            FatVersion v = GetPreferredFatVersion(usableSectors);
+            formatType = FatFormatType.Automatic;
+            switch (v) {
+                case FatVersion.Fat12:
+                    formatType = FatFormatType.Fat12;
+                    break;
+                case FatVersion.Fat16:
+                    formatType = FatFormatType.Fat16;
+                    break;
+                case FatVersion.Fat32:
+                    formatType = FatFormatType.Fat32;
+                    break;
+            }
+        }
+
+        public static FatVersion
+        GetFatVersion(FatFormatType fft, uint sectors)
+        {
+            switch (fft) {
+                case FatFormatType.Fat12:
+                    return FatVersion.Fat12;
+
+                case FatFormatType.Fat16:
+                    return FatVersion.Fat16;
+
+                case FatFormatType.Fat32:
+                    return FatVersion.Fat32;
+
+                default:
+                    return GetPreferredFatVersion(sectors);
+            }
+        }
+
+        private static Disk
+        GetDiskForFormat(FatClientContract.Exp! manager,
+                         [Claims] char[]! in ExHeap diskPath)
+        {
+            DirectoryServiceContract.Imp dsImp =
+                DirectoryService.NewClientEndpoint();
+            try {
+                Disk disk = Disk.Create(dsImp, Bitter.ToString2(diskPath), 1);
+                if (disk == null) {
+                    manager.SendFail(FatContractErrorCode.DiskUnavailable);
+                    return null;
+                }
+                else if ((disk.DiskAttributes & DiskAttributes.ReadOnly)
+                         != 0) {
+                    manager.SendFail(FatContractErrorCode.ReadOnlyDisk);
+                    return null;
+                }
+                else if (disk.StartSector > (ulong)UInt32.MaxValue) {
+                    manager.SendFail(FatContractErrorCode.InvalidStartSector);
+                    return null;
+                }
+
+                // TODO: Check partition type has been
+                // set.
+
+                return disk;
+            }
+            finally {
+                delete dsImp;
+                delete diskPath;
+            }
+        }
+
+        public static void
+        SendPreferredFormatSettings(
+            FatClientContract.Exp! managerExp,
+            [Claims] char[]! in ExHeap diskPath
+            )
+        {
+            Disk disk = GetDiskForFormat(managerExp, diskPath);
+            if (disk != null) {
+                uint          sectors;
+                FatFormatType format;
+                GetFormatSettings(disk.TotalSectors, out sectors, out format);
+                FatFormatSettings*! in ExHeap ffs = new [ExHeap]
+                    FatFormatSettings(format, sectors, BpbBytesPerSector);
+                managerExp.SendPreferredFormatSettings(ffs);
+            }
+        }
+
+        public static void DoFormat(
+            FatClientContract.Exp! managerExp,
+            [Claims] char[]! in ExHeap diskPath,
+            [Claims] char[]! in ExHeap volumeLabel,
+            [Claims] FatFormatSettings*! in ExHeap fms
+            )
+        {
+            ulong         maxSectors = fms->MaxSectors;
+            FatFormatType formatType = fms->FatFormatType;
+            delete fms;
+
+            string! label = Bitter.ToString2(volumeLabel).ToUpper();
+            delete volumeLabel;
+
+            Disk disk = GetDiskForFormat(managerExp, diskPath);
+            if (disk == null) {
+                // GetDiskForFormat sends appropriate error
+                // indication to managerExp
+                return;
+            }
+
+            if (!ValidVolumeLabel(label)) {
+                managerExp.SendFail(FatContractErrorCode.InvalidVolumeLabel);
+                return;
+            }
+
+            if (maxSectors > (ulong)UInt32.MaxValue ||
+                maxSectors > disk.TotalSectors) {
+                managerExp.SendFail(FatContractErrorCode.InvalidFormatSettings);
+                return;
+            }
+
+            uint       sectors = (uint)maxSectors;
+            FatVersion version = GetFatVersion(formatType, sectors);
+
+            uint sectorsPerCluster = GetSectorsPerCluster(version, sectors);
+            if (sectorsPerCluster == 0) {
+                managerExp.SendFail(FatContractErrorCode.InvalidFormatSettings);
+                return;
+            }
+
+            DebugDisplayDiskInfo(version, sectors, disk.TotalSectors);
+
+            if (version == FatVersion.Fat32) {
+                Format32(disk, sectors, label);
+            }
+            else {
+                Format1216(disk, sectors, version, label);
+            }
+            managerExp->SendSuccess();
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/FsInfo32.sg b/base/Services/Fat/Fs/FsInfo32.sg
new file mode 100644
index 0000000..1a737c2
--- /dev/null
+++ b/base/Services/Fat/Fs/FsInfo32.sg
@@ -0,0 +1,101 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FsInfo32.sg
+//
+//  Note:
+//
+//  Based on:
+//  "Microsoft Extensible Firmware Initiative FAT32 File System Specification",
+//  Version 1.03, December 6, 2000, Microsoft Corporation.
+//
+
+using System.Runtime.InteropServices;
+
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <remarks>
+    /// FAT32 FsInfo sector structure.  The FsInfo structure
+    /// occupies a whole sector and contains information on the
+    /// number of free blocks and the location of the first free
+    /// block.
+    /// </remarks>
+    [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 512)]
+    internal pointerfree struct FsInfo32
+    {
+        ///////////////////////////////////////////////////////////////////////
+        // Constants
+
+        internal const int  Length = 512;
+
+        internal const uint ExpectedLeadingSignature   = 0x41615252;
+        internal const uint ExpectedStructureSignature = 0x61417272;
+        internal const uint ExpectedTrailingSignature  = 0xaa550000;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Members
+
+        [FieldOffset(000)] private uint leadingSignature;      // 0
+        // Reserved1                                           // 4..483
+        [FieldOffset(484)] private uint structureSignature;    // 484..487
+        [FieldOffset(488)] private uint freeCount;             // 488..491
+        [FieldOffset(492)] private uint nextFree;              // 492..495
+        // Reserved2                                           // 496..507
+        [FieldOffset(508)] private uint trailingSignature;     // 508..511
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+
+        internal void Initialize(uint theFreeCount, uint theNextFree)
+        {
+            LeadingSignature   = ExpectedLeadingSignature;
+            StructureSignature = ExpectedStructureSignature;
+            TrailingSignature  = ExpectedTrailingSignature;
+            FreeCount          = theFreeCount;
+            NextFree           = theNextFree;
+        }
+
+        private uint LeadingSignature
+        {
+            get { return ByteOrder.LittleEndianToHost(leadingSignature); }
+            set { leadingSignature = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        private uint StructureSignature
+        {
+            get { return ByteOrder.LittleEndianToHost(structureSignature); }
+            set { structureSignature = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint FreeCount
+        {
+            get { return ByteOrder.LittleEndianToHost(freeCount); }
+            set { freeCount = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        internal uint NextFree
+        {
+            get { return ByteOrder.LittleEndianToHost(nextFree); }
+            set { nextFree = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        private uint TrailingSignature
+        {
+            get { return ByteOrder.LittleEndianToHost(trailingSignature); }
+            set { trailingSignature = ByteOrder.HostToLittleEndian(value); }
+        }
+
+        [Microsoft.Contracts.Pure]
+        internal bool ValidSignatures()
+        {
+            return (this.LeadingSignature   == ExpectedLeadingSignature     &&
+                    this.StructureSignature == ExpectedStructureSignature   &&
+                    this.TrailingSignature  == ExpectedTrailingSignature);
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/FsObject.sg b/base/Services/Fat/Fs/FsObject.sg
new file mode 100644
index 0000000..ad62099
--- /dev/null
+++ b/base/Services/Fat/Fs/FsObject.sg
@@ -0,0 +1,205 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FsObject.sg
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <remarks> Base class for file system objects.
+    /// <para> Provides reference counting functionality and support for
+    /// common directory and file operations, such as updating the
+    /// last write time. </para>
+    /// </remarks>
+    internal abstract class FsObject
+    {
+        private Directory parent;
+        private int shortEntryOffset;
+        private int refcnt;
+
+        public string cachedName     = null; // Debugging info
+        public string cachedPathName = null; // Debugging info
+
+        /// <remarks>
+        /// Create an FsObject with a reference count of 1.
+        /// </remarks>
+        [ Microsoft.Contracts.NotDelayed ]
+        internal FsObject(Directory! parent, int shortEntryOffset)
+            requires shortEntryOffset > 0;
+        {
+            this.parent           = parent;
+            this.shortEntryOffset = shortEntryOffset;
+            this.refcnt           = 1;
+        }
+
+        internal FsObject()
+        {
+            this.refcnt           = 0;
+            this.shortEntryOffset = -1;
+            this.parent           = null;
+        }
+
+        [ Microsoft.Contracts.Pure ]
+        internal bool HasParent { get { return parent != null; } }
+
+        [ Microsoft.Contracts.Pure ]
+        internal bool HasNoReferences { get { return this.refcnt == 0; } }
+
+        [ Microsoft.Contracts.Pure ]
+        internal bool HasOneReference { get { return this.refcnt == 1; } }
+
+        [ Microsoft.Contracts.Pure ]
+        internal int ShortEntryOffset
+        {
+            get { return this.shortEntryOffset; }
+        }
+
+        abstract internal int FirstCluster
+        {
+            get;
+        }
+
+        private void PopulateCachedName()
+            requires this.cachedName == null;
+            ensures  this.cachedName != null;
+        {
+            if (parent != null) {
+                char[]! in ExHeap v = parent.GetName(this.shortEntryOffset);
+                this.cachedName = Bitter.ToString2(v);
+                delete v;
+            }
+            else {
+                this.cachedName = "/";
+            }
+        }
+
+        internal string Name
+        {
+            get {
+                if (cachedName == null) {
+                    PopulateCachedName();
+                }
+                return cachedName;
+            }
+        }
+
+        internal bool GetShortDirectoryEntry(out DirectoryEntry de)
+        {
+            if (this.parent != null) {
+                this.parent.GetShortDirectoryEntry(this.shortEntryOffset,
+                                                   out de);
+            }
+            de = new DirectoryEntry();
+            return false;
+        }
+
+        private void PopulateCachedPathName()
+            requires this.cachedPathName == null;
+            ensures  this.cachedPathName != null;
+        {
+            if (parent != null) {
+                if (this.parent.FullPathName == "/") {
+                    this.cachedPathName = this.parent.FullPathName + this.Name;
+                }
+                else {
+                    this.cachedPathName = this.parent.FullPathName + "/" + this.Name;
+                }
+            }
+            else {
+                this.cachedPathName = this.Name;
+            }
+        }
+
+        internal string FullPathName
+        {
+            get {
+                if (cachedPathName == null) {
+                    PopulateCachedPathName();
+                }
+                return cachedPathName;
+            }
+        }
+
+        internal void UpdateLastWriteTime()
+        {
+            if (parent != null && !FatVolume.IsReadOnly) {
+                parent.UpdateLastWriteTime(this.shortEntryOffset);
+            }
+        }
+
+        internal void UpdateLastAccessTime()
+        {
+            if (parent != null && !FatVolume.IsReadOnly) {
+                parent.UpdateLastAccessTime(this.shortEntryOffset);
+            }
+        }
+
+        /// <remarks> Update the file size field in the
+        /// directory entry associated with a file object. This
+        /// method also updates the last access and last update
+        /// fields. </remarks>
+        internal void UpdateFileSize(uint fileBytes)
+        {
+            if (parent != null && !FatVolume.IsReadOnly) {
+                DebugStub.Assert(fileBytes != 0); // TEMPORARY
+                parent.UpdateFileSize(this.shortEntryOffset, fileBytes);
+            }
+        }
+
+        internal void SetMutableAttributes(byte newAttributes)
+            requires (newAttributes & ~DirectoryEntry.AttributeMutable) == 0;
+        {
+            if (parent != null && !FatVolume.IsReadOnly) {
+                parent.SetMutableAttributes(this.shortEntryOffset,
+                                            newAttributes);
+            }
+        }
+
+        internal byte GetMutableAttributes()
+        {
+            if (parent != null) {
+                return parent.GetMutableAttributes();
+            }
+            return 0;
+        }
+
+        internal void
+        GetAttributes(out NodeType nodeType,
+                      out uint sizeBytes)
+        {
+            if (parent == null) {
+                nodeType  = NodeType.Directory;
+                sizeBytes = 0;
+            }
+            else {
+                parent.GetAttributes(this.shortEntryOffset,
+                                     out nodeType, out sizeBytes);
+            }
+        }
+
+        /// <remarks> Increment reference count by 1 </remarks>
+        internal void AddRef()
+        {
+            this.refcnt++;
+        }
+
+        /// <remarks> Decrement reference count by 1 </remarks>
+        internal void Release()
+        {
+            this.refcnt--;
+        }
+
+        internal void CloseInstance()
+        {
+            if (parent != null) {
+                parent.CloseOpenFsObject(this);
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/FsObjectCache.sg b/base/Services/Fat/Fs/FsObjectCache.sg
new file mode 100644
index 0000000..13b8c07
--- /dev/null
+++ b/base/Services/Fat/Fs/FsObjectCache.sg
@@ -0,0 +1,350 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FsObjectCache.sg
+//
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal class FsObjectCache
+    {
+        private class FsoNode
+        {
+            private const int ColorBit   = 0x40000000;
+            private const int InvalidBit = 0x20000000;
+            private const int MaskBits   = ColorBit | InvalidBit;
+
+            internal FsoNode hashPrev; // Used in hash chain, null in free list
+            internal FsoNode hashNext; // Used in hash chain, null in free list
+            internal FsoNode lruPrev;  // Used in LRU list and free list
+            internal FsoNode lruNext;  // Used in LRU list and free list
+
+            private int      firstCluster;
+            private FsObject fsObject;
+
+            internal FsoNode()
+            {
+                this.fsObject     = null;
+                this.firstCluster = InvalidBit;
+
+                this.hashPrev = this;
+                this.hashNext = this;
+                this.lruPrev  = this;
+                this.lruNext  = this;
+            }
+
+            internal void Assign(int firstCluster, FsObject! fsObject)
+            {
+                this.firstCluster = firstCluster & ~MaskBits;
+                this.fsObject     = fsObject;
+            }
+
+            internal void Invalidate()
+            {
+                this.firstCluster |= InvalidBit;
+                this.fsObject     = null;
+            }
+
+            internal int FirstCluster
+            {
+                get { return (this.firstCluster & ~MaskBits); }
+            }
+
+            internal FsObject FsObject
+            {
+                get { return this.fsObject; }
+            }
+
+            internal bool Color
+            {
+                get { return (this.firstCluster & ColorBit) != 0; }
+                set {
+                    if (value) {
+                        this.firstCluster |= ColorBit;
+                    }
+                    else {
+                        this.firstCluster &= ~ColorBit;
+                    }
+                }
+            }
+        }
+
+        // --------------------------------------------------------------------
+
+        FsoNode! freeSentinel;
+        FsoNode! lruSentinel;
+        FsoNode [] hashSentinels;
+
+        uint  capacity;
+        uint  hashChainCount;
+
+        [ Microsoft.Contracts.NotDelayed ]
+        internal FsObjectCache(uint capacity)
+            requires capacity >= 0;
+        {
+            this.capacity = capacity;
+
+            this.freeSentinel  = new FsoNode();
+            this.lruSentinel   = new FsoNode();
+
+            uint hashChainCount  = ComputeHashChainCount(capacity);
+            this.hashChainCount = hashChainCount;
+
+            FsoNode [] hashSentinels = new FsoNode [hashChainCount];
+            for (uint i = 0; i < hashChainCount; i++) {
+                hashSentinels[i] = new FsoNode();
+            }
+            this.hashSentinels  = hashSentinels;
+
+            // Can not call this.AddFsoNodeToFreeList here
+            FsoNode! freeSentinel = new FsoNode();
+            for (uint i = 0; i < capacity; i++) {
+                FsoNode! tmp         = new FsoNode();
+                FsoNode! lruNext     = freeSentinel.lruNext;
+                tmp.lruPrev          = freeSentinel;
+                tmp.lruNext          = lruNext;
+                freeSentinel.lruNext = tmp;
+                lruNext.lruPrev      = tmp;
+            }
+            this.freeSentinel = freeSentinel;
+
+            base();
+
+            lock(this) {
+                this.LockedAssertConsistent();
+            }
+        }
+
+        private static uint ComputeHashChainCount(uint capacity)
+        {
+            const int Log2TypicalChainLength = 4;
+            uint n = 1u << Log2TypicalChainLength;
+            while (n < capacity) {
+                n <<= 1;
+            }
+            return n >> Log2TypicalChainLength;
+        }
+
+        private int GetHashChain(int firstCluster)
+        {
+            return firstCluster % (int)this.hashChainCount;
+        }
+
+        private void HashTableInsert(FsoNode! hashSentinel,
+                                     FsoNode! node)
+        {
+            // Insert at head of hash chain
+            FsoNode! hashNext     = hashSentinel.hashNext;
+            node.hashNext         = hashNext;
+            node.hashPrev         = hashSentinel;
+            hashSentinel.hashNext = node;
+            hashNext.hashPrev     = node;
+
+            // Insert at head of lru list
+            FsoNode! lruNext    = lruSentinel.lruNext;
+            node.lruNext        = lruNext;
+            node.lruPrev        = lruSentinel;
+            lruSentinel.lruNext = node;
+            lruNext.lruPrev     = node;
+        }
+
+        private void HashTableRemove(FsoNode! node)
+        {
+            FsoNode! hashNext = node.hashNext;
+            FsoNode! hashPrev = node.hashPrev;
+            hashPrev.hashNext = hashNext;
+            hashNext.hashPrev = hashPrev;
+
+            node.hashNext = null;
+            node.hashPrev = null;
+
+            FsoNode! lruNext = node.lruNext;
+            FsoNode! lruPrev = node.lruPrev;
+            lruNext.lruPrev  = lruPrev;
+            lruPrev.lruNext  = lruNext;
+            node.lruNext     = node;
+            node.lruPrev     = node;
+        }
+
+        private void AddFsoNodeToFreeList(FsoNode! node)
+        {
+            FsoNode! lruNext     = freeSentinel.lruNext;
+            node.lruNext         = lruNext;
+            node.lruPrev         = freeSentinel;
+            freeSentinel.lruNext = node;
+            lruNext.lruPrev      = node;
+        }
+
+        private FsoNode! GetFsoNodeFromFreeList()
+        {
+            FsoNode n       = freeSentinel.lruNext;
+            FsoNode lruNext = n.lruNext;
+            FsoNode lruPrev = n.lruPrev;
+            lruNext.lruPrev = lruPrev;
+            lruPrev.lruNext = lruNext;
+            return n;
+        }
+
+        private void MoveLruToFreeList()
+        {
+            // FsoNode remove is at lru list tail
+            FsoNode! lru = lruSentinel.lruPrev;
+
+            // Remove from hash chain
+            FsoNode! hashNext = lru.hashNext;
+            FsoNode! hashPrev = lru.hashPrev;
+            hashNext.hashPrev = hashPrev;
+            hashPrev.hashNext = hashNext;
+            lru.hashNext      = null;
+            lru.hashPrev      = null;
+
+            // Remove from lru list
+            FsoNode! lruNext = lru.lruNext;
+            FsoNode! lruPrev = lru.lruPrev;
+            lruPrev.lruNext  = lruNext;
+            lruNext.lruPrev  = lruPrev;
+
+            // Insert into free list
+            lru.Invalidate();
+            AddFsoNodeToFreeList(lru);
+        }
+
+        internal void Add(int firstCluster, FsObject !fsObject)
+        {
+            if (this.capacity == 0) {
+                return;
+            }
+
+            lock (this) {
+                LockedAssertConsistent();
+                LockedAssertExpectPresent(firstCluster, false);
+
+                int  chain = GetHashChain(firstCluster);
+                FsoNode! sentinel = (!)this.hashSentinels[chain];
+
+                if (FreeListIsEmpty) {
+                    MoveLruToFreeList();
+                }
+
+                FsoNode! current = GetFsoNodeFromFreeList();
+                current.Assign(firstCluster, fsObject);
+                HashTableInsert(sentinel, current);
+
+                LockedAssertConsistent();
+                LockedAssertExpectPresent(firstCluster, true);
+            }
+        }
+
+        private bool FreeListIsEmpty
+        {
+            get { return freeSentinel.lruNext == freeSentinel; }
+        }
+
+        internal FsObject Get(int firstCluster)
+        {
+            if (this.capacity == 0) {
+                return null;
+            }
+
+            FsObject found = null;
+            lock (this) {
+                LockedAssertConsistent();
+
+                int chain = GetHashChain(firstCluster);
+
+                FsoNode! sentinel = (!)this.hashSentinels[chain];
+                FsoNode! current  = sentinel.hashNext;
+                while (current != sentinel) {
+                    if (current.FirstCluster == firstCluster) {
+                        found = current.FsObject;
+                        HashTableRemove(current);
+                        AddFsoNodeToFreeList(current);
+                        LockedCheckNotFound(firstCluster);
+                        break;
+                    }
+                    current = current.hashNext;
+                }
+                LockedAssertConsistent();
+                LockedAssertExpectPresent(firstCluster, false);
+            }
+
+            return found;
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG") ]
+        private void LockedCheckNotFound(int firstCluster)
+        {
+            int chain = GetHashChain(firstCluster);
+            FsoNode! sentinel = (!)this.hashSentinels[chain];
+            FsoNode! current  = sentinel.lruNext;
+            while (current != sentinel) {
+                if (current.FirstCluster == firstCluster) {
+                    DebugStub.Break();
+                }
+                current = current.lruNext;
+            }
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG") ]
+        private void LockedAssertChainConsistent(FsoNode! sentinel)
+        {
+            FsoNode current = sentinel.hashNext;
+            while (current != sentinel) {
+                DebugStub.Assert(current.Color == false);
+                current.Color = true;
+                current = current.hashNext;
+            }
+
+            current = current.hashPrev;
+            while (current != sentinel) {
+                DebugStub.Assert(current.Color == true);
+                current.Color = false;
+                current = current.hashPrev;
+            }
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG") ]
+        private void LockedAssertListConsistent(FsoNode! sentinel)
+        {
+            FsoNode current = sentinel.lruNext;
+            while (current != sentinel) {
+                DebugStub.Assert(current.Color == false);
+                current.Color = true;
+                current = current.lruNext;
+            }
+
+            current = current.lruPrev;
+            while (current != sentinel) {
+                DebugStub.Assert(current.Color == true);
+                current.Color = false;
+                current = current.lruPrev;
+            }
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG") ]
+        private void LockedAssertConsistent()
+        {
+            for (int i = 0; i < hashChainCount; i++) {
+                LockedAssertChainConsistent((!)hashSentinels[i]);
+            }
+            LockedAssertListConsistent(freeSentinel);
+            LockedAssertListConsistent(lruSentinel);
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG") ]
+        private void LockedAssertExpectPresent(int firstCluster,
+                                               bool isPresent)
+        {
+            FsoNode! current = lruSentinel.lruNext;
+            bool found = false;
+            while (current != lruSentinel && !found) {
+                found = (firstCluster == current.FirstCluster);
+                current = current.lruNext;
+            }
+            DebugStub.Assert(found == isPresent);
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/LongDirectoryEntry.sg b/base/Services/Fat/Fs/LongDirectoryEntry.sg
new file mode 100644
index 0000000..011a302
--- /dev/null
+++ b/base/Services/Fat/Fs/LongDirectoryEntry.sg
@@ -0,0 +1,645 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   LongDirectoryEntry.sg
+//
+//  Note:
+//
+//  Based on pages 27-34 of "Microsoft Extensible Firmware
+//  Initiative FAT32 File System Specification", Version 1.03,
+//  December 6, 2000, Microsoft Corporation.
+
+using Microsoft.Singularity.Channels;
+
+using System.Runtime.InteropServices;
+using System;
+
+using Microsoft.Singularity.Io;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal pointerfree struct LongDirectoryEntry
+    {
+        internal const uint Length               = 32;
+        internal const int  CharactersPerEntry   = 13;
+        internal const int  MaxLongNameLength    = 255;
+        internal const int  MaxShortNameAttempts = 1000000;
+
+        private  const byte LastLongEntryMask = 0x40;
+        private  const byte AttributeLongName = DirectoryEntry.AttributeLongName;
+
+        // Long name terminator constants
+        private const char TerminateFirst = Char.MinValue;
+        private const char TerminateOther = Char.MaxValue;
+
+        // Short name constants
+        internal const int MaxBaseLength
+            = DirectoryEntry.ShortNameMaxBaseName;
+        internal const int MaxExtensionLength
+            = DirectoryEntry.ShortNameMaxExtension;
+
+        private  byte ordinal;                          // 0
+        private  char name00;                           // 1..2
+        private  char name01;                           // 3..4
+        private  char name02;                           // 5..6
+        private  char name03;                           // 7..8
+        private  char name04;                           // 9..10
+        internal byte Attribute;                        // 11
+        internal byte Type;                             // 12
+        private  byte checksum;                         // 13
+        private  char name05;                           // 14..15
+        private  char name06;                           // 16..17
+        private  char name07;                           // 18..19
+        private  char name08;                           // 20..21
+        private  char name09;                           // 22..23
+        private  char name10;                           // 24..25
+        private  char zero;                             // 26..27
+        private  char name11;                           // 28..29
+        private  char name12;                           // 30..31
+
+        internal bool IsLastEntry
+        {
+            get {
+                assert this.IsValid;
+                return (ordinal & LastLongEntryMask) == LastLongEntryMask;
+            }
+        }
+
+        internal bool IsValid
+        {
+            get { return ((Attribute & DirectoryEntry.AttributeLongNameMask) ==
+                          DirectoryEntry.AttributeLongName); }
+        }
+
+        internal int GetNumberOfLongEntries()
+        {
+            // This is only valid on last entry which has the ordinal bit set.
+            assert ((int)ordinal & (int)LastLongEntryMask) != 0;
+            return (int)ordinal & ~((int)LastLongEntryMask);
+        }
+
+        internal int GetPathLength()
+        {
+            // This is only valid on last entry which has the ordinal bit set.
+            assert ((int)ordinal & (int)LastLongEntryMask) != 0;
+            return (ComponentNumber - 1) * CharactersPerEntry
+                    + GetPathComponentLength();
+        }
+
+        internal int ComponentNumber
+        {
+            get { return (int)ordinal & ~((int)LastLongEntryMask); }
+        }
+
+        internal byte Checksum
+        {
+            get { return checksum; }
+        }
+
+        internal int GetPathComponentLength()
+        {
+            if (name00 == TerminateFirst) return  0;
+            if (name01 == TerminateFirst) return  1;
+            if (name02 == TerminateFirst) return  2;
+            if (name03 == TerminateFirst) return  3;
+            if (name04 == TerminateFirst) return  4;
+            if (name05 == TerminateFirst) return  5;
+            if (name06 == TerminateFirst) return  6;
+            if (name07 == TerminateFirst) return  7;
+            if (name08 == TerminateFirst) return  8;
+            if (name09 == TerminateFirst) return  9;
+            if (name10 == TerminateFirst) return 10;
+            if (name11 == TerminateFirst) return 11;
+            if (name12 == TerminateFirst) return 12;
+            return 13;
+        }
+
+        internal bool NameComponentMatches(char[]! in ExHeap name)
+        {
+            if (this.IsLastEntry) {
+                return MatchNameLast(name);
+            }
+            return MatchName(name);
+        }
+
+        private bool MatchName(char[]! in ExHeap name)
+        {
+            // Component numbers are 1-indexed.
+            int nOffset = (this.ComponentNumber - 1) * CharactersPerEntry;
+            return
+                Char.ToUpper(name00) == Char.ToUpper(name[nOffset +  0]) &&
+                Char.ToUpper(name01) == Char.ToUpper(name[nOffset +  1]) &&
+                Char.ToUpper(name02) == Char.ToUpper(name[nOffset +  2]) &&
+                Char.ToUpper(name03) == Char.ToUpper(name[nOffset +  3]) &&
+                Char.ToUpper(name04) == Char.ToUpper(name[nOffset +  4]) &&
+                Char.ToUpper(name05) == Char.ToUpper(name[nOffset +  5]) &&
+                Char.ToUpper(name06) == Char.ToUpper(name[nOffset +  6]) &&
+                Char.ToUpper(name07) == Char.ToUpper(name[nOffset +  7]) &&
+                Char.ToUpper(name08) == Char.ToUpper(name[nOffset +  8]) &&
+                Char.ToUpper(name09) == Char.ToUpper(name[nOffset +  9]) &&
+                Char.ToUpper(name10) == Char.ToUpper(name[nOffset + 10]) &&
+                Char.ToUpper(name11) == Char.ToUpper(name[nOffset + 11]) &&
+                Char.ToUpper(name12) == Char.ToUpper(name[nOffset + 12]);
+        }
+
+        private bool MatchNameLast(char[]! in ExHeap name)
+        {
+            int nOffset = (this.ComponentNumber - 1) * CharactersPerEntry;
+            int todo    = GetPathComponentLength();
+            assert name.Length == nOffset + todo;
+            switch (todo) {
+                case 13:
+                    if (Char.ToUpper(name12) !=
+                        Char.ToUpper(name[nOffset + 12])) {
+                        return false;
+                    }
+                    goto case 12;
+                case 12:
+                    if (Char.ToUpper(name11) !=
+                        Char.ToUpper(name[nOffset + 11])) {
+                        return false;
+                    }
+                    goto case 11;
+                case 11:
+                    if (Char.ToUpper(name10) !=
+                        Char.ToUpper(name[nOffset + 10])) {
+                        return false;
+                    }
+                    goto case 10;
+                case 10:
+                    if (Char.ToUpper(name09) !=
+                        Char.ToUpper(name[nOffset +  9])) {
+                        return false;
+                    }
+                    goto case 9;
+                case  9:
+                    if (Char.ToUpper(name08) !=
+                        Char.ToUpper(name[nOffset +  8])) {
+                        return false;
+                    }
+                    goto case 8;
+                case  8:
+                    if (Char.ToUpper(name07) !=
+                        Char.ToUpper(name[nOffset +  7])) {
+                        return false;
+                    }
+                    goto case 7;
+                case 7:
+                    if (Char.ToUpper(name06) !=
+                        Char.ToUpper(name[nOffset +  6])) {
+                        return false;
+                    }
+                    goto case 6;
+                case  6:
+                    if (Char.ToUpper(name05) !=
+                        Char.ToUpper(name[nOffset +  5])) {
+                        return false;
+                    }
+                    goto case 5;
+                case  5:
+                    if (Char.ToUpper(name04) !=
+                        Char.ToUpper(name[nOffset +  4])) {
+                        return false;
+                    }
+                    goto case 4;
+                case  4:
+                    if (Char.ToUpper(name03) !=
+                        Char.ToUpper(name[nOffset +  3])) {
+                        return false;
+                    }
+                    goto case 3;
+                case  3:
+                    if (Char.ToUpper(name02) !=
+                        Char.ToUpper(name[nOffset +  2])) {
+                        return false;
+                    }
+                    goto case 2;
+                case  2:
+                    if (Char.ToUpper(name01) !=
+                        Char.ToUpper(name[nOffset +  1])) {
+                        return false;
+                    }
+                    goto case 1;
+                case  1:
+                    if (Char.ToUpper(name00) !=
+                        Char.ToUpper(name[nOffset +  0])) {
+                        return false;
+                    }
+                    break;
+            }
+            return true;
+        }
+
+        /// <summary> Copies characters from LongDirectoryEntry
+        /// into character array at specified offset. </summary>
+        internal void GetPathComponent(char[]! in ExHeap longName,
+                                       int offset)
+        {
+            switch ( GetPathComponentLength() ) {
+                case 13: longName[offset + 12] = name12;  goto case 12;
+                case 12: longName[offset + 11] = name11;  goto case 11;
+                case 11: longName[offset + 10] = name10;  goto case 10;
+                case 10: longName[offset +  9] = name09;  goto case  9;
+                case 9:  longName[offset +  8] = name08;  goto case  8;
+                case 8:  longName[offset +  7] = name07;  goto case  7;
+                case 7:  longName[offset +  6] = name06;  goto case  6;
+                case 6:  longName[offset +  5] = name05;  goto case  5;
+                case 5:  longName[offset +  4] = name04;  goto case  4;
+                case 4:  longName[offset +  3] = name03;  goto case  3;
+                case 3:  longName[offset +  2] = name02;  goto case  2;
+                case 2:  longName[offset +  1] = name01;  goto case  1;
+                case 1:  longName[offset +  0] = name00;  break;
+                case 0:  break;
+            }
+        }
+
+        internal void GetPathComponent(char[]! in ExHeap longName)
+        {
+            int offset = (ComponentNumber - 1) * CharactersPerEntry;
+            GetPathComponent(longName, offset);
+        }
+
+        private void SetCharacters(char[]! in ExHeap longName,
+                                   int               offset,
+                                   int               length)
+            requires length > 0 && length <= CharactersPerEntry;
+        {
+            switch (length) {
+                case 13:  name12 = longName[offset + 12];  goto case 12;
+                case 12:  name11 = longName[offset + 11];  goto case 11;
+                case 11:  name10 = longName[offset + 10];  goto case 10;
+                case 10:  name09 = longName[offset +  9];  goto case  9;
+                case  9:  name08 = longName[offset +  8];  goto case  8;
+                case  8:  name07 = longName[offset +  7];  goto case  7;
+                case  7:  name06 = longName[offset +  6];  goto case  6;
+                case  6:  name05 = longName[offset +  5];  goto case  5;
+                case  5:  name04 = longName[offset +  4];  goto case  4;
+                case  4:  name03 = longName[offset +  3];  goto case  3;
+                case  3:  name02 = longName[offset +  2];  goto case  2;
+                case  2:  name01 = longName[offset +  1];  goto case  1;
+                case  1:  name00 = longName[offset +  0];  break;
+            }
+        }
+
+        private void PadCharacters(int length)
+            requires length > 0 && length < CharactersPerEntry;
+        {
+            char v = TerminateFirst;
+            switch (length) {
+                // case 13: unlucky for some and not allowed for padding.
+                case 12:  name01 = v;  v = TerminateOther;  goto case 11;
+                case 11:  name02 = v;  v = TerminateOther;  goto case 10;
+                case 10:  name03 = v;  v = TerminateOther;  goto case  9;
+                case  9:  name04 = v;  v = TerminateOther;  goto case  8;
+                case  8:  name05 = v;  v = TerminateOther;  goto case  7;
+                case  7:  name06 = v;  v = TerminateOther;  goto case  6;
+                case  6:  name07 = v;  v = TerminateOther;  goto case  5;
+                case  5:  name08 = v;  v = TerminateOther;  goto case  4;
+                case  4:  name09 = v;  v = TerminateOther;  goto case  3;
+                case  3:  name10 = v;  v = TerminateOther;  goto case  2;
+                case  2:  name11 = v;  v = TerminateOther;  goto case  1;
+                case  1:  name12 = v;  v = TerminateOther;  break;
+            }
+        }
+
+        internal void SetNameComponent(int               ordinal,
+                                       int               maxOrdinal,
+                                       char[]! in ExHeap longName,
+                                       byte              shortNameChecksum)
+            requires ordinal >= 1 && ordinal <= maxOrdinal;
+            requires maxOrdinal >= 1;
+        {
+            this.Attribute = DirectoryEntry.AttributeLongName;
+            this.Type      = 0;
+            this.checksum  = shortNameChecksum;
+            this.zero      = Char.MinValue;
+
+            int offset = (ordinal - 1) * CharactersPerEntry;
+            int length = longName.Length - offset;
+
+            if (ordinal == maxOrdinal) {
+                ordinal |= (int)LastLongEntryMask;
+            }
+            this.ordinal = (byte)ordinal;
+
+            if (length >= CharactersPerEntry) {
+                SetCharacters(longName, offset, CharactersPerEntry);
+            }
+            else {
+                assert length > 0;
+                SetCharacters(longName, offset, length);
+                PadCharacters(CharactersPerEntry - length);
+            }
+        }
+
+        internal static byte ComputeChecksum(char[]! in ExHeap shortName)
+            requires shortName.Length == MaxBaseLength + MaxExtensionLength;
+        {
+            byte sum = 0;
+            for (int i = 0; i < MaxBaseLength + MaxExtensionLength; i++) {
+                int tmp = ((((int)sum) & 1) << 7) + (((int)sum) >> 1);
+                tmp += (int)shortName[i];
+                sum = unchecked((byte)tmp);
+            }
+            return sum;
+        }
+
+        private static void GetLongNameBounds(char[]! in ExHeap longName,
+                                              out int           start,
+                                              out int           length)
+        {
+            // Leading spaces are ignored.
+            start = 0;
+            while (start < longName.Length) {
+                if (longName[start] != ' ') {
+                    break;
+                }
+                start++;
+            }
+
+            // Trailing spaces and periods are ignored.
+            int end = longName.Length - 1;
+            while (end >= 0) {
+                if (longName[end] != ' ' && longName[end] != '.') {
+                    break;
+                }
+                end--;
+            }
+            length = end - start + 1;
+        }
+
+        private static int GetExtensionStart(char[]! in ExHeap name,
+                                             int start,
+                                             int length)
+        {
+            int extension = length - 1;
+            while (extension >= start) {
+                if (name[extension] == '.') {
+                    return extension + 1;
+                }
+                extension--;
+            }
+            return -1;
+        }
+
+        internal static bool ValidLongNameCharacter(char c)
+        {
+            return (c == '.' || c == '+' || c == ',' || c == ';' ||
+                    c == '=' || c == '[' || c == ']' ||
+                    DirectoryEntry.ValidShortNameCharacter(c));
+        }
+
+        [ Microsoft.Contracts.Pure ]
+        internal static bool ValidName(char[]! in ExHeap longName)
+        {
+            int start, length;
+            GetLongNameBounds(longName, out start, out length);
+            if (length <= 0 || length > MaxLongNameLength) {
+                return false;
+            }
+            for (int i = 0; i < longName.Length; i++) {
+                if (!ValidLongNameCharacter(longName[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        static bool MapLongToShort(char input, out char output)
+        {
+            char c = Char.ToUpper(input);
+
+            if (DirectoryEntry.ValidShortNameCharacter(c)) {
+                output = c;
+                return false;
+            }
+            else {
+                output = '_';
+                return true;
+            }
+        }
+
+        static int GetAbsoluteOffsetOfFinalPeriod(char[]! in ExHeap longName,
+                                                  int start,
+                                                  int length)
+        {
+            int offset = start + length - 2;
+            while (offset > start) {
+                if (longName[offset] == '.') {
+                    return offset;
+                }
+                offset--;
+            }
+            return Int32.MaxValue;
+        }
+
+        static bool CopyLongToShort(char[]! in ExHeap src,
+                                    int               srcStart,
+                                    int               srcLength,
+                                    char[]! in ExHeap dst,
+                                    int               dstStart,
+                                    int               dstLength,
+                                    out int           dstUsed)
+        {
+            assert (srcStart >= 0 &&
+                      srcStart <= src.Length);
+            assert (srcLength >= 0 &&
+                      srcStart + srcLength <= src.Length);
+            assert (dstStart >= 0 &&
+                      dstStart < dst.Length);
+            assert (dstLength >= 0 &&
+                      dstStart + dstLength <= dst.Length);
+
+            bool lossy = false;
+
+            // Skip leading spaces and periods
+            while ((src[srcStart] == '.' || src[srcStart] == ' ') &&
+                   srcLength != 0) {
+                srcStart++;
+                srcLength--;
+            }
+
+            dstUsed = 0;
+
+            for (int i = 0; i < srcLength && dstUsed < dstLength; i++) {
+                if (src[srcStart + i] == ' ') {
+                    continue;                     // Skip embedded spaces
+                }
+                lossy |= MapLongToShort(src[srcStart + i],
+                                        out dst[dstStart + dstUsed]);
+                dstUsed++;
+            }
+            return lossy;
+        }
+
+        static void WriteNumericTail(char[]! in ExHeap shortName,
+                                     int               baseNameLength,
+                                     int               attempt)
+        {
+            int tailWidth = (int)Math.Log10((double)attempt) + 2; // "~NNNN"
+
+            int index = Math.Min(baseNameLength + tailWidth,
+                                 DirectoryEntry.ShortNameMaxBaseName) - 1;
+
+            while (attempt > 0) {
+                shortName[index] = (char)('0' + (attempt % 10));
+                attempt /= 10;
+                index --;
+            }
+            shortName[index] = '~';
+        }
+
+        static internal void
+        WriteShortNameEntry(char[]! in ExHeap longName,
+                            int               attempt,
+                            char[]! in ExHeap shortName)
+            requires longName.Length > 0;
+            requires shortName.Length == DirectoryEntry.ShortNameEntryLength;
+            requires attempt >= 1 && attempt < MaxShortNameAttempts;
+        {
+            assert (ValidName(longName));
+
+            for (int i = 0; i < shortName.Length; i++) {
+                shortName[i] = ' ';
+            }
+
+            int longNameStart;
+            int longNameLength;
+            GetLongNameBounds(longName,
+                              out longNameStart,
+                              out longNameLength);
+
+            int extensionStart = GetExtensionStart(longName,
+                                                   longNameStart,
+                                                   longNameLength);
+
+            int baseUsed = 0;
+            bool lossy;
+
+            if (extensionStart > longNameStart) {
+                lossy = CopyLongToShort(
+                    longName,
+                    longNameStart,
+                    extensionStart - longNameStart - 1,
+                    shortName,
+                    0,
+                    DirectoryEntry.ShortNameMaxBaseName,
+                    out baseUsed
+                    );
+
+                int extUsed;
+                lossy |= CopyLongToShort(
+                    longName,
+                    extensionStart,
+                    longNameStart + longNameLength - extensionStart,
+                    shortName,
+                    DirectoryEntry.ShortNameMaxBaseName,
+                    DirectoryEntry.ShortNameMaxExtension,
+                    out extUsed
+                    );
+            }
+            else {
+                lossy = CopyLongToShort(
+                    longName,
+                    longNameStart,
+                    longNameLength,
+                    shortName,
+                    0,
+                    DirectoryEntry.ShortNameMaxBaseName,
+                    out baseUsed
+                    );
+            }
+
+            WriteNumericTail(shortName, baseUsed, attempt);
+        }
+
+        private const int HiBitMask = 1 << (DHashtable.MaxKeyBits - 1);
+
+        private static int HOP(int v)
+        {
+            // left rotation of DHashtable.MaxKeyBits wide unsigned integer
+            return (v << 1) | ((v & HiBitMask) >> (DHashtable.MaxKeyBits - 1));
+        }
+
+        internal int GetDirHashCode(int sum, int length)
+            requires length > 0;
+            requires length <= LongDirectoryEntry.CharactersPerEntry;
+        {
+            switch (length) {
+                case 13:
+                    sum = HOP(sum) + Char.ToUpper(name12);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case 12;
+                case 12:
+                    sum = HOP(sum) + Char.ToUpper(name11);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case 11;
+                case 11:
+                    sum = HOP(sum) + Char.ToUpper(name10);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case 10;
+                case 10:
+                    sum = HOP(sum) + Char.ToUpper(name09);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  9;
+                case  9:
+                    sum = HOP(sum) + Char.ToUpper(name08);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  8;
+                case  8:
+                    sum = HOP(sum) + Char.ToUpper(name07);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  7;
+                case  7:
+                    sum = HOP(sum) + Char.ToUpper(name06);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  6;
+                case  6:
+                    sum = HOP(sum) + Char.ToUpper(name05);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  5;
+                case  5:
+                    sum = HOP(sum) + Char.ToUpper(name04);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  4;
+                case  4:
+                    sum = HOP(sum) + Char.ToUpper(name03);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  3;
+                case  3:
+                    sum = HOP(sum) + Char.ToUpper(name02);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  2;
+                case  2:
+                    sum = HOP(sum) + Char.ToUpper(name01);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  1;
+                case  1:
+                    sum = HOP(sum) + Char.ToUpper(name00);
+                    sum &= DHashtable.MaxKeyValue;
+                    goto case  0;
+                case 0:
+                    break;
+            }
+            return sum;
+        }
+
+        internal static int GetDirHashCode(char []! in ExHeap longName)
+        {
+            int start;
+            int length;
+            GetLongNameBounds(longName, out start, out length);
+
+            int sum = 0;
+            for (int i = start + length - 1; i >= start; i--) {
+                sum = HOP(sum) + Char.ToUpper(longName[i]);
+                sum &= DHashtable.MaxKeyValue;
+            }
+            return sum;
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/Main.sg b/base/Services/Fat/Fs/Main.sg
new file mode 100644
index 0000000..6b8a68e
--- /dev/null
+++ b/base/Services/Fat/Fs/Main.sg
@@ -0,0 +1,172 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Main.sg
+//
+//  Note:
+//
+//
+
+using DirectoryServices.Utils;
+
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Services;
+using Microsoft.Singularity.Services.Fat.Contracts;
+
+using System;
+
+using MSD = Microsoft.Singularity.Directory;
+
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    [Category("Service")]
+    public sealed class FsResources
+    {
+        [Endpoint]
+        internal TRef<FatClientContract.Exp:Start> managerTRef;
+
+        reflective private FsResources();
+    }
+
+    internal sealed class Fs
+    {
+        internal static int AppMain(FsResources! resources)
+        {
+            FatClientContract.Exp:Start! managerExp =
+                resources.managerTRef.Acquire();
+
+            bool shutdown = false;
+            while (!shutdown) {
+                switch receive {
+                    case managerExp.Mount(mountSettings):
+                        Mount(managerExp, mountSettings);
+                        return 0;
+                        break;
+
+                    case managerExp.GetPreferredFormatSettings(diskPath):
+                        Format.SendPreferredFormatSettings(managerExp,
+                                                           diskPath);
+                        break;
+
+                    case managerExp.Format(diskPath, label, settings):
+                        Format.DoFormat(managerExp, diskPath, label, settings);
+                        break;
+
+                    case managerExp.ChannelClosed():
+                        shutdown = true;
+                        break;
+                }
+            }
+            delete managerExp;
+
+            return 0;
+        }
+
+        private static ServiceProviderContract.Exp
+        InstallMountPath(string! path)
+        {
+            ServiceProviderContract.Imp! spImp;
+            ServiceProviderContract.Exp! spExp;
+            ServiceProviderContract.NewChannel(out spImp, out spExp);
+
+            DirectoryServiceContract.Imp dsRootImp = DirectoryService.NewClientEndpoint();
+            try {
+                dsRootImp.SendRegister(Bitter.FromString2(path), spImp);
+                switch receive {
+                    case dsRootImp.AckRegister():
+                        return spExp;
+
+                    case dsRootImp.NakRegister(rejected, errorCode):
+                        DebugStub.Print(
+                            "FatFs failed to register {0} reason {1}\n",
+                            __arglist(path,
+                                      SdsUtils.ErrorCodeToString(errorCode))
+                            );
+                        delete rejected;
+                        delete spExp;
+                        break;
+                }
+            }
+            finally {
+                delete dsRootImp;
+            }
+            return null;
+        }
+
+        private static void
+        Mount([Claims] FatClientContract.Exp! managerExp,
+              [Claims] FatMountSettings*! in ExHeap fms)
+        {
+            ServiceProviderContract.Exp spExp;
+
+            try {
+                DebugStub.Print(
+                    "FatFs mount disk path = {0} mount path = {1}",
+                    __arglist(fms->DiskPath, fms->MountPath));
+                spExp = InstallMountPath(fms->MountPath);
+                if (spExp == null) {
+                    managerExp.SendFail(FatContractErrorCode.PathUnavailable);
+                    delete managerExp;
+                    return;
+                }
+
+                // TODO: Check sanity of cache size
+                // and fail if outside valid bounds.
+
+                DebugStub.Print("Starting mount...\n");
+                FatContractErrorCode error =
+                    FatVolume.Mount(fms->DiskPath,
+                                    fms->ReadOnly,
+                                    fms->CacheMB,
+                                    fms->DirectoryCacheSize,
+                                    fms->FileCacheSize,
+                                    fms->WriteQueueSize
+                                    );
+
+                if (error != FatContractErrorCode.NoError) {
+                    managerExp.SendFail(error);
+                    delete managerExp;
+                    delete spExp;
+                    DebugStub.Print("...failed.\n");
+                    return;
+                }
+
+                DebugStub.Print("...completed.\n");
+                DebugStub.Print("SectorBytes = {0}\n",
+                                __arglist(
+                                    FatVolume.BpbSummary.BytesPerSector
+                                    )
+                                );
+                DebugStub.Print("SectorsPerCluster = {0} ({1} bytes)\n",
+                                __arglist(
+                                    FatVolume.BpbSummary.SectorsPerCluster,
+                                    FatVolume.BpbSummary.SectorsPerCluster *
+                                    FatVolume.BpbSummary.BytesPerSector
+                                    )
+                                );
+
+                managerExp.SendSuccess();
+                (new ChannelIo(managerExp, spExp)).Run();
+                FatVolume.Unmount();
+            }
+            finally {
+                delete fms;
+            }
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/OpenHash.sg b/base/Services/Fat/Fs/OpenHash.sg
new file mode 100644
index 0000000..e7ea27e
--- /dev/null
+++ b/base/Services/Fat/Fs/OpenHash.sg
@@ -0,0 +1,255 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   OpenHash.sg
+//
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    /// <remarks>
+    /// An Open Addressing Hash Table designed for use with
+    /// directory name-location hashing in FAT.  It supports a
+    /// maximum of 65536 entries which is the maximum number of
+    /// directory entries in a FAT directory.
+    ///
+    /// The table size grows as required and in the current
+    /// implementation does not shrink.
+    ///
+    /// The table reallocates in two circumstances and flushes
+    /// removed nodes when it does so.  Because open addressing
+    /// ceases to be efficient as the load increases, we
+    /// reallocate when the load reaches 50%.  We also
+    /// reallocate when the number of deleted nodes in the table
+    /// exceeds 25%.
+    ///
+    /// For FAT on Singularity we expect the maximum number
+    /// of entries to be 32728 since there is one short-name
+    /// entry and at least one long-name entry per file or
+    /// sub-directory.
+    /// </remarks>
+    internal class OpenHash
+    {
+        private struct Node {
+            internal int Key;
+            internal int Value;
+        }
+
+        public const int MaxNodes    = 65536;
+        public const int DefaultSize = 256;
+        public const int MaxKeyValue = 0x00ffffff;
+        public const int MaxKeyBits  = 24;
+
+        private const int RemovedKey = 0x40000000;
+        private const int UnusedKey  = 0;
+        private const int UsedKeyBit = 0x20000000;
+
+        Node [] /*!*/ nodes;
+        int     liveCount;
+        int     deadCount;
+
+        bool    searchValid;
+        int     searchAttempts;
+
+        internal OpenHash(int initialSize)
+            /*^ requires initialSize > 0 && initialSize < MaxNodes; ^*/
+        {
+            initialSize = RoundUpPowerOfTwo(initialSize);
+
+            this.nodes          = new Node[initialSize];
+            this.liveCount      = 0;
+            this.deadCount      = 0;
+            this.searchValid    = false;
+            this.searchAttempts = 0;
+        }
+
+        internal OpenHash() : this(DefaultSize)
+        {
+        }
+
+        private int GrowThreshold
+        {
+            get { return this.nodes.Length / 2; }
+        }
+
+        private int PackThreshold
+        {
+            get { return this.nodes.Length / 4; }
+        }
+
+        public int Capacity
+        {
+            get { return this.nodes.Length; }
+        }
+
+        public int Count
+        {
+            get { return this.liveCount; }
+        }
+
+        /*^ [ Microsoft.Contracts.Pure ] ^*/
+        internal static bool IsPowerOfTwo(int n)
+        {
+            return (n & (n - 1)) == 0 && n != 0;
+        }
+
+        internal static int RoundUpPowerOfTwo(int n)
+            /*^ requires n >= 0; ^*/
+        {
+            n--;
+            n |= (n >> 1) | (n >> 2) | (n >> 4) | (n >> 8) | (n >> 16);
+            return ++n;
+        }
+
+        private static int GetHash1(int key, int modulus)
+        {
+            return key & (modulus - 1);
+        }
+
+        private static int GetHash2(int key, int modulus)
+        {
+            key = key << 2;
+            return 1 + ((key) & (modulus - 1));  // Must return an odd number
+        }
+
+        private static int GetHash(int hash1,
+                                   int hash2,
+                                   int attempt,
+                                   int modulus)
+        {
+            return (hash1 + attempt * hash2) & (modulus - 1);
+        }
+
+        private static void CopyNodes(Node []/*!*/ oldNodes,
+                                      Node []/*!*/ newNodes)
+            /*^ requires newNodes.Length >= oldNodes.Length; ^*/
+        {
+            for (int i = 0; i < oldNodes.Length; i++) {
+                if ((oldNodes[i].Key & UsedKeyBit) == UsedKeyBit) {
+                    int h1 = GetHash1(oldNodes[i].Key, newNodes.Length);
+                    int h2 = GetHash2(oldNodes[i].Key, newNodes.Length);
+                    int j;
+                    for (j = 0; j < newNodes.Length; j++) {
+                        int index = GetHash(h1, h2, j, newNodes.Length);
+                        if (newNodes[index].Key == UnusedKey) {
+                            newNodes[index].Key   = oldNodes[i].Key;
+                            newNodes[index].Value = oldNodes[i].Value;
+                            break;
+                        }
+                    }
+                    Debug.Assert(j != newNodes.Length);
+                }
+            }
+        }
+
+        private void ReallocateNodes(int size)
+            /*^ requires IsPowerOfTwo(size); ^*/
+        {
+            Node [] newNodes = new Node[size];
+            CopyNodes(this.nodes, newNodes);
+            this.nodes     = newNodes;
+            this.deadCount = 0;
+        }
+
+        public bool Insert(int key, int value)
+            /*^ requires key >= 0 && key <= MaxKeyValue; ^*/
+        {
+            key |= UsedKeyBit;
+
+            this.searchValid = false;
+
+            if (this.liveCount > this.GrowThreshold &&
+                this.nodes.Length < MaxNodes) {
+                ReallocateNodes(2 * this.nodes.Length);
+            }
+
+            int h1 = GetHash1(key, this.nodes.Length);
+            int h2 = GetHash2(key, this.nodes.Length);
+
+            for (int i = 0; i < nodes.Length; i++) {
+                int index = GetHash(h1, h2, i, this.nodes.Length);
+                if (this.nodes[index].Key == UnusedKey) {
+                    this.nodes[index].Key   = key;
+                    this.nodes[index].Value = value;
+                    this.liveCount++;
+                    return true;
+                }
+                else if (this.nodes[index].Key == RemovedKey) {
+                    this.nodes[index].Key   = key;
+                    this.nodes[index].Value = value;
+                    this.liveCount++;
+                    this.deadCount--;
+                    Debug.Assert(deadCount >= 0);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool Remove(int key, int value)
+            /*^ requires key >= 0 && key <= MaxKeyValue; ^*/
+        {
+            key |= UsedKeyBit;
+
+            this.searchValid = false;
+
+            int h1 = GetHash1(key, this.nodes.Length);
+            int h2 = GetHash2(key, this.nodes.Length);
+            for (int i = 0; i < this.nodes.Length; i++) {
+                int index = GetHash(h1, h2, i, this.nodes.Length);
+                if (this.nodes[index].Key == key &&
+                    this.nodes[index].Value == value) {
+                    this.nodes[index].Key = RemovedKey;
+                    this.liveCount--;
+                    Debug.Assert(this.liveCount >= 0);
+                    this.deadCount++;
+                    if (this.deadCount > this.PackThreshold) {
+                        ReallocateNodes(this.nodes.Length);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public void BeginSearch()
+        {
+            this.searchValid = true;
+            this.searchAttempts = 0;
+        }
+
+        public bool Search(int key, out int value)
+            /*^ requires key >= 0 && key <= MaxKeyValue; ^*/
+        {
+            key |= UsedKeyBit;
+
+            /*^ assert this.searchValid; ^*/
+            Debug.Assert(searchValid == true);
+
+            int h1 = GetHash1(key, this.nodes.Length);
+            int h2 = GetHash2(key, this.nodes.Length);
+
+            for (int i = 0; i < this.nodes.Length; i++) {
+                int index = GetHash(h1, h2,
+                                    this.searchAttempts++, this.nodes.Length);
+                if (this.nodes[index].Key == key) {
+                    value = this.nodes[index].Value;
+                    return true;
+                }
+                else if (this.nodes[index].Key == UnusedKey) {
+                    break;
+                }
+            }
+
+            this.searchValid = false;
+            value = 0;
+
+            return false;
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/PathOpen.sg b/base/Services/Fat/Fs/PathOpen.sg
new file mode 100644
index 0000000..30d99bb
--- /dev/null
+++ b/base/Services/Fat/Fs/PathOpen.sg
@@ -0,0 +1,219 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PathOpen.sg
+//
+//  Note:
+//
+//  These methods exist because the core Directory class operations for
+//  opening, reading, deleting, files and directories only work for files
+//  and directories contained with the directory instance.  These methods
+//  provide a means to recurse down to right spot to operate at.
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    internal class PathOpen
+    {
+        internal static ErrorCode
+        GetTargetAndDirectory(Directory!                 root,
+                              [Claims] char[]! in ExHeap targetPath,
+                              out char[] in ExHeap       theTarget,
+                              out Directory              theDirectory)
+        {
+            char [] in ExHeap dirPath = null;
+            theTarget    = null;
+            theDirectory = null;
+
+            targetPath = PathUtils.CleanSeparators(targetPath);
+            try {
+                PathUtils.SplitPathBottomUp(targetPath,
+                                            out dirPath,
+                                            out theTarget);
+            }
+            catch (OutOfMemoryException) {
+                delete dirPath;
+                delete theTarget;
+                theTarget = null;
+                return ErrorCode.InsufficientResources;
+            }
+
+            if (theTarget == null) {
+                delete dirPath;
+                return ErrorCode.BadArguments;
+            }
+            else if (dirPath == null) {
+                theDirectory = root.OpenDirectory();
+                return ErrorCode.NoError;
+            }
+            else {
+                ErrorCode error = GetDirectory(root, dirPath,
+                                               out theDirectory);
+                if (error != ErrorCode.NoError) {
+                    delete theTarget;
+                    theTarget = null;
+                }
+                return error;
+            }
+        }
+
+        internal static ErrorCode
+        GetFsObject(Directory!                 root,
+                    [Claims] char[]! in ExHeap path,
+                    out FsObject               fsObject)
+        {
+            fsObject = null;
+
+            path = PathUtils.CleanSeparators(path);
+            path = PathUtils.Trim(path);
+
+            if (path.Length == 0) {
+                delete path;
+                return ErrorCode.BadArguments;
+            }
+
+            char[] in ExHeap objName = null;
+            char[] in ExHeap dirPath = null;
+            try {
+                PathUtils.SplitPathBottomUp(path, out dirPath, out objName);
+            }
+            catch (OutOfMemoryException) {
+                delete dirPath;
+                delete objName;
+                return ErrorCode.InsufficientResources;
+            }
+
+            assert !(dirPath == null && objName == null);
+            try {
+                if (objName == null) {
+                    // Trying to open root directory.
+                    assert dirPath != null;
+                    Directory d;
+                    ErrorCode error = GetDirectory(root, dirPath, out d);
+                    fsObject = d;
+                    return error;
+                }
+                else if (dirPath == null) {
+                    // Trying to open object within root directory.
+                    assert objName != null;
+                    return root.OpenFsObject(objName, out fsObject);
+                }
+                else {
+                    // Trying to open an object below root directory.
+                    Directory parent;
+                    ErrorCode error = GetDirectory(root, dirPath, out parent);
+                    assert error == ErrorCode.NoError || parent == null;
+                    if (error == ErrorCode.NoError) {
+                        assert parent != null;
+                        error = parent.OpenFsObject(objName, out fsObject);
+                        parent.Close();
+                    }
+                    return error;
+                }
+            }
+            finally {
+                delete objName;
+            }
+        }
+
+        internal static ErrorCode
+        GetDirectory(Directory!                  root,
+                     [Claims] char []! in ExHeap dirPath,
+                     out Directory               theDirectory)
+        {
+            char[] in ExHeap top       = null;
+            char[] in ExHeap remainder = null;
+
+            theDirectory = null;
+
+            remainder = PathUtils.CleanSeparators(dirPath);
+            remainder = PathUtils.Trim(remainder);
+
+            if (remainder.Length == 0) {
+                delete remainder;
+                remainder = null;
+                return ErrorCode.BadArguments;
+            }
+
+            ErrorCode error = ErrorCode.NoError;
+            int pass = 0;
+
+            theDirectory = root.OpenDirectory();
+
+            while (remainder != null) {
+                try {
+                    PathUtils.SplitPathTopDown(remainder,
+                                               out top,
+                                               out remainder);
+                }
+                catch (OutOfMemoryException) {
+                    delete top;
+                    top = null;
+                    delete remainder;
+                    remainder = null;
+                    theDirectory.Close();
+                    theDirectory = null;
+                    error = ErrorCode.InsufficientResources;
+                    break;
+                }
+
+                assert top != null;
+
+                if (pass++ == 0 && top.Length == 1 &&
+                    top[0] == PathUtils.Separator) {
+                    // No action needed.  theDirectory is already local root.
+                }
+                else {
+                    Directory next;
+                    assert top.Length >= 1 && top[0] != PathUtils.Separator;
+
+                    assert theDirectory != null;
+                    error = theDirectory.OpenDirectory(top, out next);
+                    assert (next == null) != (error == ErrorCode.NoError);
+
+                    if (error != ErrorCode.NoError) {
+                        delete remainder;
+                        remainder = null;
+                    }
+                    theDirectory.Close();
+                    theDirectory = next;
+                }
+                delete top;
+                top = null;
+            }
+            return error;
+        }
+
+        internal static ErrorCode
+        GetFile(Directory!                 root,
+                [Claims] char[]! in ExHeap path,
+                out File                   theFile)
+        {
+            theFile      = null;
+            FsObject tmp = null;
+
+            ErrorCode error = GetFsObject(root, path, out tmp);
+            if (error == ErrorCode.NoError) {
+                assert tmp != null;
+                theFile = tmp as File;
+                if (theFile == null) {
+                    ((Directory)tmp).Close();
+                    return ErrorCode.NotFile;
+                }
+            }
+            else {
+                assert tmp == null;
+            }
+            return error;
+        }
+    }
+}
diff --git a/base/Services/Fat/Fs/PathUtils.sg b/base/Services/Fat/Fs/PathUtils.sg
new file mode 100644
index 0000000..46c8c15
--- /dev/null
+++ b/base/Services/Fat/Fs/PathUtils.sg
@@ -0,0 +1,349 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   PathUtils.sg
+//
+//  Note:
+//
+//       Character vector utilities.
+//
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.SingSharp;
+
+using System;
+
+namespace Microsoft.Singularity.Services.Fat.Fs
+{
+    public class PathUtils
+    {
+        public const char Separator = '/';
+
+        /// <summary> Remove duplicate and trailing separators
+        /// from character vector representing a path. A leading
+        /// separator is preserved. </summary>
+        public static char[]! in ExHeap
+        CleanSeparators([Claims] char[]! in ExHeap path)
+        {
+            int src = 0;
+            int dst = 0;
+            while (src < path.Length) {
+                bool skip = (path[src] == Separator);
+                path[dst++] = path[src++];
+                if (skip) {
+                    while (src < path.Length && path[src] == Separator) {
+                        src++;
+                    }
+                }
+            }
+
+            if (dst > 1 && path[dst - 1] == Separator) {
+                // Chop trailing separator if not root separator
+                dst--;
+            }
+            if (dst != src) {
+                Bitter.Truncate(ref path, dst);
+            }
+            return path;
+        }
+
+        private static char[]! in ExHeap
+        DropTrailingSeparator([Claims] char[]! in ExHeap path)
+        {
+            if (path.Length > 1 && path[path.Length - 1] == Separator) {
+                Bitter.Truncate(ref path, path.Length - 1);
+            }
+            return path;
+        }
+
+        private static int
+        GetLastSeparator(char[]! in ExHeap path)
+        {
+            int i = path.Length - 1;
+            while (i >= 0 && path[i] != Separator) {
+                i--;
+            }
+            return i;
+        }
+
+        private static int
+        GetNextSeparator(char[]! in ExHeap path, int start)
+        {
+            while (start < path.Length ) {
+                if (path[start] == Separator) {
+                    return start;
+                }
+                start++;
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Splits path into top most path component and remainder.
+        ///
+        ///   path         top       remainder
+        /// ---------- ------------------------
+        /// "/a/b/c"       "/"          "a/b/c"
+        /// "a/b/c"        "a"          "b/c"
+        /// "/a"           "/"          "a"
+        /// "a"            "a"          null
+        /// "/"            "/"          null
+        /// "//"           "/"          null
+        /// "///a/b//"     "/"          "a/b"
+        /// </summary>
+        public static void
+        SplitPathTopDown([Claims] char[]! in ExHeap path,
+                         out char[] in ExHeap       top,
+                         out char[] in ExHeap       remainder)
+            requires path.Length >= 1;
+        {
+            path = CleanSeparators(path);
+            if (path[0] == Separator) {
+                if (path.Length == 1) {
+                    top       = path;
+                    remainder = null;
+                }
+                else {
+                    remainder = Bitter.SplitOff(ref path, 1);
+                    top       = path;
+                    if (remainder.Length == 0) {
+                        delete remainder;
+                        remainder = null;
+                    }
+                }
+            } else {
+                int nextSep = GetNextSeparator(path, 0);
+                if (nextSep < 0) {
+                    top       = path;
+                    remainder = null;
+                }
+                else {
+                    // nextSep must be less than path.Length as
+                    // CleanSeparators removes trailing
+                    // separators.
+                    assert ((path.Length >= 3) &&
+                            (nextSep < path.Length - 1));
+                    remainder = Bitter.SplitOff(ref path, nextSep + 1);
+                    top       = DropTrailingSeparator(path);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Split path into directory name and base name components.
+        ///
+        /// "/a/b/c" -> "/a/b"  "c"
+        /// "/a"     -> "/"     "a"
+        /// "a//"    -> null    "a"
+        /// "a"      -> null    "a"
+        /// "/"      -> "/"     null
+        /// </summary>
+        public static void
+        SplitPathBottomUp([Claims] char[]! in ExHeap path,
+                          out char[] in ExHeap dirname,
+                          out char[] in ExHeap basename)
+        {
+            path = CleanSeparators(path);
+
+            int lastSep = GetLastSeparator(path);
+            if (lastSep >= 0) {
+                basename = Bitter.SplitOff(ref path, lastSep + 1);
+                if (basename.Length == 0) {
+                    delete basename;
+                    basename = null;
+                }
+                dirname  = DropTrailingSeparator(path);
+            }
+            else {
+                dirname  = null;
+                basename = path;
+            }
+        }
+
+        private static char[]! in ExHeap
+        TrimInternal(
+            [Claims] char[]! in ExHeap vector,
+            bool                       trimStart,
+            bool                       trimEnd
+            )
+        {
+            int lower = 0;
+            int upper = vector.Length - 1;
+
+            if (trimEnd) {
+                while (upper > 0 && Char.IsWhiteSpace(vector[upper])) {
+                    upper--;
+                }
+            }
+
+            if (trimStart) {
+                while (lower <= upper && Char.IsWhiteSpace(vector[lower])) {
+                    lower++;
+                }
+            }
+
+            int newLength = upper - lower + 1;
+            if (newLength != vector.Length) {
+                Bitter.Copy(vector, 0, newLength, vector, lower);
+                Bitter.Truncate(ref vector, newLength);
+            }
+            return vector;
+        }
+
+        private static char[]! in ExHeap
+        TrimInternal(
+            [Claims] char[]! in ExHeap vector,
+            char []!                   trimChars,
+            bool                       trimStart,
+            bool                       trimEnd
+            )
+        {
+            int lower = 0;
+            int upper = vector.Length - 1;
+
+            if (trimEnd) {
+                while (upper > 0 &&
+                       Array.IndexOf(trimChars, vector[upper]) >= 0) {
+                    upper--;
+                }
+            }
+
+            if (trimStart) {
+                while (lower <= upper &&
+                       Array.IndexOf(trimChars, vector[lower]) >= 0) {
+                    lower++;
+                }
+            }
+
+            int newLength = upper - lower + 1;
+            if (newLength != vector.Length) {
+                Bitter.Copy(vector, 0, newLength, vector, lower);
+                Bitter.Truncate(ref vector, newLength);
+            }
+            return vector;
+        }
+
+        public static char[]! in ExHeap
+        Trim([Claims] char[]! in ExHeap vector)
+        {
+            return TrimInternal(vector, true, true);
+        }
+
+        public static char[]! in ExHeap
+        TrimStart([Claims] char[]! in ExHeap vector)
+        {
+            return TrimInternal(vector, true, false);
+        }
+
+        public static char[]! in ExHeap
+        TrimEnd([Claims] char[]! in ExHeap vector)
+        {
+            return TrimInternal(vector, false, true);
+        }
+
+        public static char[]! in ExHeap
+        Trim([Claims] char[]! in ExHeap vector, char[]! trimChars)
+        {
+            return TrimInternal(vector, trimChars, true, true);
+        }
+
+        public static char[]! in ExHeap
+        TrimStart([Claims] char[]! in ExHeap vector, char[]! trimChars)
+        {
+            return TrimInternal(vector, trimChars, true, false);
+        }
+
+        public static char[]! in ExHeap
+        TrimEnd([Claims] char[]! in ExHeap vector, char[]! trimChars)
+        {
+            return TrimInternal(vector, trimChars, false, true);
+        }
+
+        // --------------------------------------------------------------------
+        // Self-test routines
+
+        private static bool CompareChars(string expected,
+                                         [Claims] char[] in ExHeap received)
+        {
+            string other = null;
+            if (received != null) {
+                other = Bitter.ToString2(received);
+                delete received;
+            }
+            DebugStub.Assert(expected == other);
+            return (expected == other);
+        }
+
+        private static void TestSplitPathBottomUp()
+        {
+            string [][] tests = new string [][] {
+                new string [] { "/",            "/",    null },
+                new string [] { "/abra/cadabra", "/abra", "cadabra" },
+                new string [] { "/the///cat//sat/on//the/mat",
+                                "/the/cat/sat/on/the",
+                                "mat" },
+                new string [] { "/a",           "/",    "a" },
+                new string [] { "a//",          null,   "a" },
+                new string [] { "a",            null,   "a" },
+                new string [] { "////",         "/",    null },
+                new string [] { "////a",        "/",    "a" },
+                new string [] { "////a/b///",   "/a",    "b" },
+            };
+
+            for (int i = 0; i < tests.Length; i++) {
+                string[]! values = (!)tests[i];
+                DebugStub.Print("Testing {0}\n",
+                                __arglist((!)values[0]));
+                string! spath = (!)(values[0]);
+                char[]! in ExHeap path = Bitter.FromString2(spath);
+                char [] in ExHeap dirname;
+                char [] in ExHeap basename;
+                PathUtils.SplitPathBottomUp(path, out dirname, out basename);
+
+                DebugStub.Assert(CompareChars(values[1], dirname));
+                DebugStub.Assert(CompareChars(values[2], basename));
+            }
+        }
+
+        private static void TestSplitPathTopDown()
+        {
+            string [][] tests = new string [][] {
+                new string [] { "/abra/cadabra", "/", "abra/cadabra" },
+                new string [] { "abra/cadabra", "abra", "cadabra" },
+                new string [] { "/the///cat//sat/on//the/mat",
+                                "/", "the/cat/sat/on/the/mat" },
+                new string [] { "the///cat//sat/on//the/mat",
+                                "the", "cat/sat/on/the/mat" },
+                new string [] { "/a",           "/",    "a" },
+                new string [] { "a",            "a",    null },
+                new string [] { "/",            "/",    null },
+                new string [] { "////",         "/",    null },
+                new string [] { "////a/b///",   "/",    "a/b" },
+            };
+
+            for (int i = 0; i < tests.Length; i++) {
+                string[]! values = (!)tests[i];
+                DebugStub.Print("Testing {0}\n",
+                                __arglist((!)values[0]));
+                string! spath = (!)(values[0]);
+                char[]! in ExHeap path = Bitter.FromString2(spath);
+                char [] in ExHeap top;
+                char [] in ExHeap remainder;
+                PathUtils.SplitPathTopDown(path, out top, out remainder);
+
+                DebugStub.Assert(CompareChars(values[1], top));
+                DebugStub.Assert(CompareChars(values[2], remainder));
+            }
+        }
+
+        internal static void SelfTest()
+        {
+            TestSplitPathTopDown();
+            TestSplitPathBottomUp();
+        }
+    }
+}
diff --git a/base/Services/Iso9660/ByteArray.cs b/base/Services/Iso9660/ByteArray.cs
new file mode 100644
index 0000000..9295a2a
--- /dev/null
+++ b/base/Services/Iso9660/ByteArray.cs
@@ -0,0 +1,349 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using StringBuilder  = System.Text.StringBuilder;
+using System;
+using System.Collections;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Drivers;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+
+
+namespace Iso9660 
+{
+    
+    /// <summary>
+    /// This class contains a number of static methods for marshalling,
+    /// unmarshalling, and comparing byte arrays.
+    /// </summary>
+    public class ByteArray {
+        private const int MIN = -1;
+        private const int MAX = -2;
+            
+
+        /// <summary>
+        /// Marshalls a byte array into a buffer starting at a pointer 
+        /// into the buffer, and advances the pointer accordingly.
+        /// </summary>
+        /// <param name="b">The byte array that is being marshalled.</param>
+        /// <param name="bytes">The buffer into which the integer is 
+        /// marshalled.
+        /// </param>
+        /// <param name="offset">The position in the buffer where the Handle 
+        /// starts.After completion, offset is the next position after the 
+        /// Handle.</param>
+        public static void Marshall(byte[] b, byte[] bytes, ref int offset) {
+            if (b == Minimum) {
+                Int.Marshall(MIN, bytes, ref offset);
+            } else if (b == Maximum) {
+                Int.Marshall(MAX, bytes, ref offset);
+            } else {
+                if (b != null) {
+                    Int.Marshall(b.Length, bytes, ref offset);
+                    Array.Copy(b, 0, bytes, offset, b.Length);
+                    offset += b.Length;
+                } else {
+                    Int.Marshall(0, bytes, ref offset);
+                }
+            }
+        }
+
+        public static int Sizeof(byte[] b) {
+            if (b == Minimum || b == Maximum) {
+                return Int.Size;
+            }
+            if (b == null) {
+                return Int.Size;
+            }
+            return Int.Size + b.Length;
+        }
+
+        /// <summary>
+        /// Given a buffer and a pointer into it, unmarshalls a byte array 
+        /// from the buffer, advancing the pointer by 4 bytes.
+        /// </summary>
+        /// <param name="bytes">The buffer from which the byte array is 
+        /// unmarshalled.</param>
+        /// <param name="offset">The position in the buffer where the Handle 
+        /// starts.
+        /// After completion, offset is the next position after the Handle.
+        /// </param>
+        /// <returns>The byte array that was unmarshalled.</returns>
+        ///
+        /// Note that our marshall and unmarshall routines are not symmetric
+        /// I.e., We marshall a null string as a string of zero length. But
+        /// unmarshalling a 0 length string does not result in  a null string
+        /// but in a string with zero length.
+        /// I believe the B-Tree recovery procedures cannot deal with an
+        /// unmarshalled string that is a null.
+
+        public static byte[] Unmarshall(byte[] bytes, ref int offset) {
+            int len = Int.Unmarshall(bytes, ref offset);
+            if (len == MIN) {
+                return Minimum;
+            } else if (len == MAX) {
+                return Maximum;
+            } else {
+                if (len < 0) {
+                    Console.WriteLine("ba len is negative " + len);
+                    system.panic("bad len");
+                }
+                if (len == 0) {
+                    //Console.WriteLine("BA LEN is 0 ");
+                }
+                byte[] b = new byte[len];
+                try {
+                    Array.Copy(bytes, offset, b, 0, b.Length);
+                    offset += b.Length;
+                    return b;
+                } 
+                catch (Exception) {
+                    Console.WriteLine("len = " + len + 
+                                      " b.Length " + b.Length +
+                                      " offset: " + offset + 
+                                      " bytes.Length " + bytes.Length); 
+                    throw;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Given a buffer and a pointer into it, unmarshalls the length of a 
+        /// byte array  from the buffer, but does not advance the pointer.
+        /// </summary>
+        /// <param name="bytes">The buffer from which the byte array 
+        /// is unmarshalled.</param>
+        /// <param name="offset">The position in the buffer where the Handle 
+        /// starts. After completion, offset is the next position after 
+        /// the Handle.</param>
+        /// <returns>The byte array that was unmarshalled.</returns>
+
+        public static int UnmarshallLength(byte[] bytes, int offset) {
+            int len = Int.Unmarshall(bytes, ref offset);
+            return len < 0 ? 0 : len;
+        }
+
+        /// <summary>
+        /// This constant identifies the minimum byte array, i.e. the byte 
+        /// array that, when compared (via Comparer.Compare) with any other 
+        /// byte array, is smaller.
+        /// </summary>
+        public static readonly byte[] Minimum = new byte[0];
+
+        /// <summary>
+        /// This constant identifies the maximum byte array, i.e. the byte 
+        /// array that, when compared (via Comparer.Compare) with any other 
+        /// byte array, is larger.
+        /// </summary>
+        public static readonly byte[] Maximum = new byte[0];
+
+        public delegate int CompareTo(byte[] a, byte[] b);
+
+        static public int LexicographicCompareTo(byte[] a, byte[] b) {
+            int min = System.Math.Min(a.Length, b.Length);
+            int i = 0;
+            for (; i < min; i++) {
+                if (a[i] < b[i]) return -1;
+                if (a[i] > b[i]) return +1;
+            }
+            if (a.Length < b.Length) return -1;
+            if (a.Length > b.Length) return +1;
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns the string representation of a byte array. Returns 
+        /// "null" if the byte array is null, and "Maximum" if the byte
+        /// array is identical to Maximum.
+        /// </summary>
+        /// <param name="b"></param>
+        /// <returns></returns>
+        public static string ToString(byte[] b) {
+            if (b == Minimum) return "Minimum";
+            if (b == Maximum) return "Maximum";
+            if (b == null) return "null";
+            char[] c = new char[b.Length];
+            for (int i = 0; i < c.Length; i++) c[i] = (char)b[i];
+            return new string(c);
+        }
+
+        /// <summary>
+        /// for debugging -- return a hex version of the array that can 
+        /// be printed on the console
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        
+        public static string ToLegibleString(byte[] b) {
+            return ToLegibleString(new ByteContainer(b));
+        }
+
+        public static string ToLegibleString(ByteContainer b) {
+            byte[] temp = b.ConvertToArray();
+            StringBuilder legible = new StringBuilder();
+            for (int i = 0; i < temp.Length; i++) {
+                legible.AppendFormat("{0:x2}", temp[i]);
+            }
+            return legible.ToString();
+        }
+
+        public static string ToLegibleString(byte[] b, int off, int len) {
+            return ToLegibleString(new ByteContainer(b), off, len);
+        }
+
+        public static string ToLegibleString(ByteContainer b, int off, int len) {
+            byte[] temp = b.ConvertToArray();
+            system.Assert(len + off <= temp.Length);
+            StringBuilder legible = new StringBuilder();
+            for (int i = off; i < off + len; i++) {
+                legible.AppendFormat("{0:x2}", temp[i]);
+            }
+            return legible.ToString();
+        }
+
+        public static string ToLegibleString(byte[] b, int len) {
+            return ToLegibleString(new ByteContainer(b), len);
+        }
+
+        public static string ToLegibleString(ByteContainer b, int len) {
+            byte[] temp = b.ConvertToArray();
+            system.Assert(len < temp.Length);
+            StringBuilder legible = new StringBuilder();
+            for (int i = 0; i < len; i++) {
+                legible.AppendFormat("{0:x2}", temp[i]);
+            }
+            return legible.ToString();
+        }
+
+        public static byte[] ToByteArray(string s) {
+            byte[] b = new byte[s.Length];
+            for (int i = 0; i < s.Length; i++) {
+                b[i] = (byte)(s[i] & 0xff);
+            }
+            return b;
+        }
+
+
+        /// <summary>
+        /// general purpose string-byte array transformation
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        public static byte[] StringToByteArray(string s) {
+            if (s == null) {
+                return null;
+            }
+            byte[] b = new byte[s.Length];
+            for (int i = 0; i < s.Length; i++) {
+                b[i] = (byte)(s[i] & 0xff);
+            }
+            return b;
+        }
+
+        public static string ToString(byte[] b, int count) {
+            if (b == null) {
+                return "null";
+            }
+            int len;
+            if (count < b.Length) {
+                len = count;
+            } else {
+                len = b.Length;
+            }
+            char[] c = new char[len];
+            for (int i = 0; i < len; i++) {
+                c[i] = (char)b[i];
+            }
+            return new string(c);
+        }
+
+        public static string ToString(byte[] b, int off, int len) {
+
+            char[] c = new char[len];
+            for (int i = 0; i < len; i++) {
+                c[i] = (char)b[off+i];
+            }
+            return new string(c);
+        }
+
+        public static ulong ToUlong(byte[] b, int off) { // little-endian
+
+            ulong x = 0;
+            for (int i = 0; i < 4; i++) {
+                x <<= 8; x += b[off+i];
+            }
+            return x;
+        }
+
+        public static ushort ToUshort(byte[] b, int off) { // little-endian
+
+            ushort x = 0;
+            for (int i = 0; i < 2; i++) {
+                x <<= 8; x += b[off+i];
+            }
+            return x;
+        }
+
+        public static int  SizeofString(string s) {
+            return Int.Size + s.Length;
+        }
+
+        public static void MarshallString(string s, byte[] bytes, ref int off){
+            
+            Int.Marshall(s.Length, bytes, ref off);
+            for(int i = 0; i < s.Length; i++) {
+                bytes[off++] = (byte)(s[i] & 0xff);
+            }
+        }
+
+        public static string UnmarshallString(byte[] bytes, ref int offset){
+            int len = Int.Unmarshall(bytes, ref offset);
+            if (len <= 0 ) 
+            {
+                Tracing.Log(Tracing.Debug,"bytes had a negative len="+len);
+                return null; 
+            }
+            char[] c = new char[len];
+            for (int i = 0; i < len; i++) {
+                c[i] = (char)bytes[offset++];
+            }
+            return new string(c);
+        }
+
+
+
+        public class Comparer {
+            public readonly CompareTo RawCompareTo;
+
+            public Comparer() {
+                this.RawCompareTo = new CompareTo(LexicographicCompareTo);
+            }
+
+            public Comparer(CompareTo rawComp) {
+                this.RawCompareTo = rawComp;
+            }
+
+            public int Compare(byte[] a, byte[] b) {
+                if ((a == Minimum && b == Minimum) || 
+                    (a == Maximum && b == Maximum)) {
+                    return 0;
+                } else if (a == Minimum || b == Maximum) {
+                    return -1;
+                } else if (b == Minimum || a == Maximum) {
+                    return +1;
+                } else {
+                    return this.RawCompareTo(a, b);
+                }
+            }
+        }
+    }
+}
diff --git a/base/Services/Iso9660/ByteContainers.sg b/base/Services/Iso9660/ByteContainers.sg
new file mode 100644
index 0000000..dd47d12
--- /dev/null
+++ b/base/Services/Iso9660/ByteContainers.sg
@@ -0,0 +1,188 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   ByteContainers.sg
+//
+//  Helper class for abstracting over either byte[] or byte[] in ExHeap
+//
+using System;
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+public class ByteContainer {
+    bool inSharedHeap;
+    bool occupied;
+    int length;
+    byte[] normalBuf;
+    VContainer<byte> sharedBuf;
+    
+    public ByteContainer() {sharedBuf = null;}
+    public ByteContainer(byte[] newBuf) {
+        inSharedHeap = false;
+        occupied = true;
+        normalBuf = newBuf;
+        sharedBuf = null;
+        length = newBuf.Length;
+    }
+    
+    public ByteContainer([Claims]byte[]! in ExHeap newBuf) {
+        inSharedHeap = true;
+        occupied = true;
+        normalBuf = null;
+        length = newBuf.Length;
+        sharedBuf = new VContainer<byte>(newBuf);
+    }
+    
+    public bool InSharedHeap {get{return inSharedHeap;}}
+    public int Length {
+        get{
+            if (!occupied) {
+                DebugStub.Break();
+                throw new Exception("Tried to get length of empty ByteContainer!");
+            } else {
+                return length;
+            }
+        }
+    }
+    
+    public void CopyFrom(byte[] dest, int srcOff, int destOff, int len) {
+        if (!occupied) {
+            DebugStub.Break();
+            throw new Exception("Trying to CopyFrom empty ByteContainer!");
+        } else {
+            if (inSharedHeap) {
+                byte[]! in ExHeap src = sharedBuf.Acquire();
+                for (int i = 0; i < len; i++) {
+                    dest[destOff+i] = src[srcOff+i];
+                }
+                sharedBuf.Release(src);
+            } else {
+                for (int i = 0; i < len; i++) {
+                    dest[destOff+i] = normalBuf[srcOff+i];
+                }
+            }
+        }
+    }
+    
+    public void CopyTo(byte[] src, int srcOff, int destOff, int len) {
+        if (!occupied) {
+            DebugStub.Break();
+            throw new Exception("Trying to CopyTo empty ByteContainer!");
+        } else {
+            if (inSharedHeap) {
+                byte[]! in ExHeap dest = sharedBuf.Acquire();
+                for (int i = 0; i < len; i++) {
+                    dest[destOff+i] = src[srcOff+i];
+                }
+                sharedBuf.Release(dest);
+            } else {
+                for (int i = 0; i < len; i++) {
+                    normalBuf[destOff+i] = src[srcOff+i];
+                }
+            }
+        }
+    }
+    
+    public void Clear(long off, long amount) {
+        if (!occupied) {
+            throw new Exception("Trying to CopyFrom empty ByteContainer!");
+        } else {
+            if (inSharedHeap) {
+                byte[]! in ExHeap buf = sharedBuf.Acquire();
+                for (long i = 0; i < amount; i++) {
+                    buf[off+i] = 0;
+                }
+                sharedBuf.Release(buf);
+            } else {
+                for (long i = 0; i < amount; i++) {
+                    normalBuf[off+i] = 0;
+                }
+            }
+        }
+    }
+    
+    public byte[] GetArray() {
+        if (inSharedHeap) {
+            DebugStub.Break();
+            throw new Exception("Tried to get vector as array!");
+        } else if (!occupied) {
+            DebugStub.Break();
+            throw new Exception("Trying to get empty ByteContainer!");
+        } else {
+            occupied = false;
+            return normalBuf;
+        }
+    }
+    
+    public void PutArray(byte[] buf) {
+        if (occupied) {
+            DebugStub.Break();
+            throw new Exception("ByteContainer already occupied!");
+        } else {
+            inSharedHeap = false;
+            occupied = true;
+            normalBuf = buf;
+            length = buf.Length;
+        }
+    }
+    
+    public byte[] in ExHeap ConvertToVector() {
+        if (inSharedHeap) {
+            DebugStub.Break();
+            throw new Exception("Tried to convert a vector to a vector!");
+        } else if (!occupied) {
+            DebugStub.Break();
+            throw new Exception("Trying to get empty ByteContainer!");
+        } else {
+            return Bitter.FromByteArray(normalBuf);
+        }
+    }
+    
+    public byte[] ConvertToArray() {
+        if (!inSharedHeap) {
+            return normalBuf;
+        } else if (!occupied) {
+            DebugStub.Break();
+            throw new Exception("Trying to get empty ByteContainer!");
+        } else {
+            byte[]! in ExHeap temp = sharedBuf.Acquire();
+            byte[] ret = Bitter.ToByteArray(temp);
+            sharedBuf.Release(temp);
+            return ret;
+        }
+    }
+    
+    public byte[]! in ExHeap GetVector() {
+        if (!inSharedHeap) {
+            DebugStub.Break();
+            throw new Exception("Tried to get array as vector!");
+        } else if (!occupied) {
+            DebugStub.Break();
+            throw new Exception("Trying to get empty ByteContainer!");
+        } else {
+            occupied = false;
+            return sharedBuf.Acquire();
+        }
+    }
+    
+    public void PutVector([Claims]byte[]! in ExHeap buf) {
+        if (occupied) {
+            DebugStub.Break();
+            throw new Exception("ByteContainer already occupied!");
+        } else {
+            occupied = true;
+            inSharedHeap = true;
+            if (sharedBuf == null) {
+                length = buf.Length;
+                sharedBuf = new VContainer<byte>(buf);
+            } else {
+                length = buf.Length;
+                sharedBuf.Release(buf);
+            }
+        }
+    }
+}
diff --git a/base/Services/Iso9660/FSDirectoryInstanceWorker.sg b/base/Services/Iso9660/FSDirectoryInstanceWorker.sg
new file mode 100644
index 0000000..2dd5f24
--- /dev/null
+++ b/base/Services/Iso9660/FSDirectoryInstanceWorker.sg
@@ -0,0 +1,392 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FSDirectoryInstanceWorker.sg
+//
+//  Note:   Handles servicing directory requests for all active directories
+//
+
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity;
+
+
+using Iso9660;
+
+namespace Microsoft.Singularity.FileSystem
+{
+    public class FSDirectoryInstanceWorker
+    {
+        private static string location;
+        private static bool started = false;
+        private static bool terminating = false;
+        private static bool success = false;
+        private static bool endpointCaptured = false;
+        private static bool endpointAvailable = true;
+        private static object lockToken = new Object();
+        private static Iso9660DirectoryInfo pendingDir;
+        private static TRef<DirectoryServiceContract.Exp:Ready>
+            pendingEPT = null;
+        private static TRef<ThreadPoolControlContract.Imp:Start> signalEPT;
+        public  static FSThreadPool threadPool;
+
+        public static bool Start(string mountLocation)
+        {
+            started = false;
+            terminating = false;
+            location = mountLocation;
+            threadPool =
+                new FSThreadPool(1, new FSThreadPoolCallback(ProcessRequest));
+            Thread t = new Thread(new ThreadStart(Run));
+            t.Start();
+            lock (lockToken) {
+                while (!started) Monitor.Wait(lockToken);
+            }
+
+            return success;
+        }
+
+        public static bool TrackEndpoint(
+            [Claims] DirectoryServiceContract.Exp:Ready s,
+            Iso9660DirectoryInfo dir) {
+
+            Monitoring.Log(Monitoring.Provider.Iso9660,
+                (ushort)FileSystemEvent.StartTrackEndpoint);
+
+            lock (lockToken) {
+                while (!endpointAvailable && !terminating) {
+                    Monitor.Wait(lockToken);
+                }
+                if (terminating) {
+                    delete s;
+                    return false;
+                }
+
+                endpointAvailable = false;
+                endpointCaptured = false;
+                pendingDir = dir;
+                pendingEPT = new TRef<DirectoryServiceContract.Exp:Ready>(s);
+                ThreadPoolControlContract.Imp signalEP = signalEPT.Acquire();
+                signalEP.SendTrackEndpoint();
+                //signalEP.RecvAckTrackEndpoint();
+                while (!endpointCaptured && !terminating) {
+                    Monitor.Wait(lockToken);
+                }
+
+                endpointAvailable = true;
+                Monitor.PulseAll(lockToken);
+                if (pendingEPT != null) {
+                    signalEPT.Release(signalEP);
+                    delete pendingEPT.Acquire();
+                    return false;
+                } else {
+                    signalEP.RecvAckTrackEndpoint();
+                    signalEPT.Release(signalEP);
+                    return true;
+                }
+            }
+            Monitoring.Log(Monitoring.Provider.Iso9660,
+                (ushort)FileSystemEvent.StopTrackEndpoint);
+
+        }
+
+        public static void Terminate() {
+            lock (lockToken) {
+                ThreadPoolControlContract.Imp signalEP = signalEPT.Acquire();
+                signalEP.SendTerminate();
+                while (!terminating) {
+                    Monitor.Wait(lockToken);
+                }
+                signalEP.RecvAckTerminate();
+                started = false;
+                delete signalEP;
+            }
+        }
+
+        // worker thread that actually services requests
+        protected static void Run()
+        {
+            ServiceProviderContract.Imp! spClient;
+            ServiceProviderContract.Exp! spServer;
+            ServiceProviderContract.NewChannel(out spClient, out spServer);
+
+            DirectoryServiceContract.Imp systemNS = DirectoryService.NewClientEndpoint();
+            systemNS.SendRegister(Bitter.FromString2(location), spClient);
+
+            switch receive {
+                case systemNS.AckRegister():
+                    success = true;
+                    break;
+
+                case systemNS.NakRegister(rejected, error):
+                    delete rejected;
+                    success = false;
+                    break;
+            }
+
+            delete systemNS;
+
+            lock (lockToken) {
+                started = true;
+                Monitor.Pulse(lockToken);
+            }
+
+            if (!success) {
+                delete spServer;
+                return;
+            }
+
+            EMap<DirectoryServiceContract.Exp:Ready,
+                Iso9660DirectoryInfo> dirSet =
+                    new EMap<DirectoryServiceContract.Exp:Ready,
+                        Iso9660DirectoryInfo>();
+            ThreadPoolControlContract.Imp! imp;
+            ThreadPoolControlContract.Exp! exp;
+            ThreadPoolControlContract.NewChannel(out imp, out exp);
+            signalEPT = new TRef<ThreadPoolControlContract.Imp:Start>(imp);
+            //EMap<FileContract.Exp:Ready, Iso9660DirectoryInfo> dirSet;
+
+            lock (lockToken) {
+                endpointAvailable = true;
+                started = true;
+                Monitor.Pulse(lockToken);
+            }
+
+            for (bool run = true; run;)
+            {
+                //dirSet = dirSetT.Acquire();
+                byte[] buf;
+                switch receive
+                {
+                    case spServer.Connect(candidate) :
+                        // the directory server is trying to connect
+                        // with a DirectoryServiceContract endpoint
+                        DirectoryServiceContract.Exp dsClient = candidate as DirectoryServiceContract.Exp;
+                        if (null == dsClient){
+                            spServer.SendNackConnect(candidate);
+                            break;
+                        }
+                        spServer.SendAckConnect();
+                        dsClient.SendSuccess();
+                        dirSet.Add(dsClient, SuperBlock.Root);
+                        break;
+
+                    case exp.TrackEndpoint():
+                        lock (lockToken) {
+
+                            endpointCaptured = true;
+                            if (!terminating) {
+                                DirectoryServiceContract.Exp newEP = pendingEPT.Acquire();
+                                dirSet.Add(newEP, pendingDir);
+                                pendingEPT = null;
+                            }
+                            exp.SendAckTrackEndpoint();
+                            Monitor.PulseAll(lockToken);
+                        }
+                        break;
+
+                    case exp.Terminate():
+                        lock (lockToken) {
+                            terminating = true;
+                            threadPool.KillPool();
+                            Monitor.PulseAll(lockToken);
+                        }
+                        exp.SendAckTerminate();
+                        run = false;
+                        break;
+
+                    case ep.Bind(char[]! in ExHeap pathTemp,
+                        ServiceContract.Exp:Start! serviceServer) in dirSet~>dir :
+
+                        string path = Bitter.ToString(pathTemp);
+                        delete pathTemp;
+
+                        if (path == null) {
+                            path = "";
+                        }
+
+                        threadPool.EnqueueItem(
+                            new FSBindRequestInfo(
+                                FSRequestAction.Bind,
+                                new TRef<DirectoryServiceContract.Exp:Ready>(ep),
+                                new TRef<ServiceContract.Exp:Start>(serviceServer),
+                                dir,
+                                path));
+                        break;
+                        
+                    case ep.BeginEnumeration()
+                        in dirSet~>dir:
+
+                        threadPool.EnqueueItem(
+                            new FSDirectoryRequestInfo(
+                                FSRequestAction.BeginEnumeration,
+                                new TRef<
+                                    DirectoryServiceContract.Exp:Ready>(ep),
+                                dir,
+                                null));
+                        break;
+
+                    case ep.GetAttributes(char []! in ExHeap fileNameTemp)
+                        in dirSet~>dir:
+                        Iso9660FileSystemInfo info;
+                        string fileName = Bitter.ToString(fileNameTemp);
+                        delete fileNameTemp;
+
+                        threadPool.EnqueueItem(
+                            new FSDirectoryRequestInfo(
+                                FSRequestAction.GetAttributes,
+                                new TRef<DirectoryServiceContract.Exp:Ready>(ep),
+                                dir,
+                                fileName));
+                        break;
+
+                    case ep.ChannelClosed() in dirSet~>dir:
+                        delete ep;
+                        break;
+
+                    case unsatisfiable:
+                        //DebugStub.Print("FSFileWorker shutting down\n");
+                        run = false;
+                        break;
+                        //return;
+                }//switch
+                //dirSetT.Release(dirSet);
+            } //for
+
+            dirSet.Dispose();
+            delete exp;
+            delete spServer;
+        } //run
+
+        protected static void ProcessRequest(FSRequestInfo request) {
+            FSDirectoryRequestInfo info;
+            DirectoryServiceContract.Exp ep;
+            Iso9660FileSystemInfo child;
+
+            switch (request.action) {
+                    case FSRequestAction.Bind:
+
+                    Monitoring.Log(Monitoring.Provider.Iso9660,
+                        (ushort)FileSystemEvent.StartBind);
+                    FSBindRequestInfo bindInfo = (FSBindRequestInfo)request;
+                    ep = bindInfo.endpointT.Acquire();
+                    Iso9660FileSystemInfo fsInfo = Iso9660FileSystemInfo.InstantiatePath
+                                                   (bindInfo.path, bindInfo.startingDir);
+
+                    // This var serves to track whether we have given away the
+                    // endpoint or not.
+                    ServiceContract.Exp localServiceServer =
+                        bindInfo.bindEndpointT.Acquire();
+
+                    if (fsInfo is Iso9660FileInfo) {
+                        FileContract.Exp fileServer =
+                            localServiceServer as FileContract.Exp;
+
+                        if (fileServer != null) {
+                            Iso9660FileStream fileStream =
+                                ((Iso9660FileInfo)fsInfo).Open(
+                                    System.IO.FileMode.Open,
+                                    System.IO.FileAccess.Read);
+
+                            fileServer.SendSuccess();
+                            FSFileInstanceWorker.TrackEndpoint(
+                                fileServer, fileStream);
+                            localServiceServer = null; // Gave it away
+                        }
+                    } else if (fsInfo is Iso9660DirectoryInfo) {
+                        DirectoryServiceContract.Exp dirServer =
+                            localServiceServer as DirectoryServiceContract.Exp;
+
+                        if (dirServer != null) {
+                            dirServer.SendSuccess();
+                            //FSDirectoryInstanceWorker.TrackEndpoint(
+                            //    dirServer, (Iso9660DirectoryInfo)fsInfo);
+                            TrackEndpoint(dirServer, (Iso9660DirectoryInfo)fsInfo);
+                            localServiceServer = null; // Gave it away
+                        }
+                    }
+
+                    if (localServiceServer == null) { // Did we give it away?
+                        // If so, success
+                        ep.SendAckBind();
+                    } else {
+                        // We didn't give it away, so give it back.
+                        ep.SendNakBind(localServiceServer, ErrorCode.NotFound);
+                    }
+                    TrackEndpoint(ep, bindInfo.startingDir);
+                    Monitoring.Log(Monitoring.Provider.Iso9660,
+                        (ushort)FileSystemEvent.StopBind);
+                    break;
+                    
+                case FSRequestAction.BeginEnumeration :
+                    info = (FSDirectoryRequestInfo)request;
+                    ep = info.endpointT.Acquire();
+                    EnumerationRecords[] in ExHeap responses = null;
+
+                    // use the root
+                    ErrorCode errorOut;
+                    responses = info.dir.Enumerate(out errorOut);
+                    if (null == responses) {
+                        ep.SendEnumerationTerminated(errorOut);
+                        delete responses;
+                    } else {
+                        ep.SendEnumerationEntries(responses,false);
+                    }
+                    TrackEndpoint(ep, info.dir);
+                    break;
+
+                case FSRequestAction.GetAttributes:
+                    info = (FSDirectoryRequestInfo)request;
+                    ep = info.endpointT.Acquire();
+                    Iso9660FileSystemInfo file = Iso9660FileSystemInfo.InstantiatePath(info.name, info.dir);
+                    if (file == null) {
+                    //if (!info.dir.FindChild(info.name, true, out file)) {
+                        ep.SendNakGetAttributes(ErrorCode.Unknown);
+                    }
+                    else
+                    {
+                        long len = 0;
+                        if (file is Iso9660FileInfo)
+                        {
+#if WHAT_FOR?
+                            Iso9660FileStream fileStream =
+                            ((Iso9660FileInfo)file).Open(
+                                System.IO.FileMode.Open,
+                                System.IO.FileAccess.Read);
+                            len = fileStream.Length;
+#else
+                            len = (long)((Iso9660FileInfo)file).size;
+#endif
+                        }
+
+                        NodeType nodeType = NodeType.File;
+
+                        // Translate flags
+                        if ((file.flags & (byte)Iso9660FileFlags.Directory) != 0) {
+                            nodeType = NodeType.Directory;
+                        }
+
+                        // Unprocessed: System, Archive
+
+                        ep.SendAckGetAttributes(nodeType, len);
+                    }
+
+                    TrackEndpoint(ep, info.dir);
+                    break;
+
+                default:
+                    // Should be impossible
+                    System.Diagnostics.Debug.Assert(false);
+                    break;
+            } // switch
+        } // ProcessRequest
+    } //FSFileWorker class
+} //namespace
+
diff --git a/base/Services/Iso9660/FSFileInstanceWorker.sg b/base/Services/Iso9660/FSFileInstanceWorker.sg
new file mode 100644
index 0000000..e0c36d2
--- /dev/null
+++ b/base/Services/Iso9660/FSFileInstanceWorker.sg
@@ -0,0 +1,218 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   FSFileInstanceWorker.sg
+//
+//  Note:   Handles servicing read/write requests for all active files
+//
+
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+using Iso9660;
+
+namespace Microsoft.Singularity.FileSystem
+{
+    [CLSCompliant(false)]
+    public enum FileSystemEvent : ushort
+    {
+        StartRead = 1,
+        StopRead = 2,
+        CacheHit = 3,
+        ProcessRequest = 4,
+        StartTrackEndpoint = 5,
+        StopTrackEndpoint = 6,
+        StartBind = 7,
+        CacheMiss = 8,
+        StopBind = 9,
+    }
+    public class FSFileInstanceWorker
+    {
+        private static bool started = false;
+        private static bool terminating = false;
+        private static bool endpointCaptured = false;
+        private static bool endpointAvailable = true;
+        private static object lockToken = new Object();
+        private static Iso9660FileStream pendingFile;
+        private static TRef<FileContract.Exp:Ready>
+            pendingEPT = null;
+        private static TRef<ThreadPoolControlContract.Imp:Start> signalEPT;
+        private static FSThreadPool threadPool;
+
+        public static void Start()
+        {
+            terminating = false;
+            started = false;
+            threadPool =
+                new FSThreadPool(1, new FSThreadPoolCallback(ProcessRequest));
+            Thread t = new Thread(new ThreadStart(Run));
+            t.Start();
+            lock (lockToken) {
+                while (!started) Monitor.Wait(lockToken);
+            }
+        }
+
+        // called from FSWorker when a connect message is received
+        // also when a worker thread is finished
+        public static bool TrackEndpoint([Claims] FileContract.Exp:Ready s,
+            Iso9660FileStream file) {
+
+            lock (lockToken) {
+                while (!endpointAvailable && !terminating) {
+                    Monitor.Wait(lockToken);
+                }
+                if (terminating) {
+                    delete s;
+                    return false;
+                }
+
+                endpointAvailable = false;
+                endpointCaptured = false;
+                pendingFile = file;
+                pendingEPT = new TRef<FileContract.Exp:Ready>(s);
+                ThreadPoolControlContract.Imp signalEP = signalEPT.Acquire();
+                signalEP.SendTrackEndpoint();
+                //signalEP.RecvAckTrackEndpoint();
+                while (!endpointCaptured && !terminating) {
+                    Monitor.Wait(lockToken);
+                }
+
+                endpointAvailable = true;
+                Monitor.PulseAll(lockToken);
+                if (pendingEPT != null) {
+                    signalEPT.Release(signalEP);
+                    delete pendingEPT.Acquire();
+                    return false;
+                } else {
+                    signalEP.RecvAckTrackEndpoint();
+                    signalEPT.Release(signalEP);
+                    return true;
+                }
+            }
+        }
+
+        public static void Terminate() {
+            lock (lockToken) {
+                ThreadPoolControlContract.Imp signalEP = signalEPT.Acquire();
+                signalEP.SendTerminate();
+                while (!terminating) {
+                    Monitor.Wait(lockToken);
+                }
+                signalEP.RecvAckTerminate();
+                started = false;
+                delete signalEP;
+            }
+        }
+
+        // worker thread that actually services requests
+        protected static void Run()
+        {
+            bool success;
+            EMap<FileContract.Exp:Ready, Iso9660FileStream> fileSet =
+                new EMap<FileContract.Exp:Ready, Iso9660FileStream>();
+            ThreadPoolControlContract.Imp! imp;
+            ThreadPoolControlContract.Exp! exp;
+            ThreadPoolControlContract.NewChannel(out imp, out exp);
+            signalEPT = new TRef<ThreadPoolControlContract.Imp:Start>(imp);
+
+            lock (lockToken) {
+                endpointAvailable = true;
+                started = true;
+                Monitor.Pulse(lockToken);
+            }
+
+            for (bool run = true; run;)
+            {
+                //fileSet = fileSetT.Acquire();
+                //byte[] buf;
+                switch receive
+                {
+                    case exp.TrackEndpoint():
+                        lock (lockToken) {
+                            endpointCaptured = true;
+                            Tracing.Log(Tracing.Debug,"Track Start");
+                            if (!terminating) {
+                                FileContract.Exp newEP = pendingEPT.Acquire();
+                                pendingEPT = null;
+                                fileSet.Add(newEP, pendingFile);
+                            }
+                            Monitor.PulseAll(lockToken);
+                            exp.SendAckTrackEndpoint();
+                            Tracing.Log(Tracing.Debug,"Track end");
+                        }
+                        break;
+
+                    case exp.Terminate():
+                        lock (lockToken) {
+                            terminating = true;
+                            threadPool.KillPool();
+                            Monitor.PulseAll(lockToken);
+                        }
+                        exp.SendAckTerminate();
+                        run = false;
+                        break;
+
+                    case ep.Read(shBuf, bufOffset, fileOffset, maxLength)
+                        in fileSet~>file:
+
+                        //Stdio.RawDevice.SetDebug();
+                        Tracing.Log(Tracing.Debug,"Read start");
+                        threadPool.EnqueueItem(
+                            new FSFileRequestInfo(
+                                FSRequestAction.Read,
+                                new TRef<FileContract.Exp:Ready>(ep),
+                                new ByteContainer(shBuf),
+                                file, bufOffset, fileOffset, maxLength));
+                        break;
+
+                    case ep.Close() in fileSet~>file:
+                        file.Close();
+                        ep.SendAckClose();
+                        delete ep;
+                        break;
+
+                    case ep.ChannelClosed() in fileSet~>file:
+                        file.Close();
+                        delete ep;
+                        break;
+
+                    case unsatisfiable:
+                        //DebugStub.Print("FSFileWorker shutting down\n");
+                        run = false;
+                        break;
+                        //return;
+                }//switch
+                //fileSetT.Release(fileSet);
+            } //for
+
+            fileSet.Dispose();
+            delete exp;
+        } //run
+
+        protected static void ProcessRequest(FSRequestInfo request) {
+            FSFileRequestInfo info = (FSFileRequestInfo)request;
+            FileContract.Exp ep = info.endpointT.Acquire();
+
+            Monitoring.Log(Monitoring.Provider.Iso9660,
+                (ushort)FileSystemEvent.ProcessRequest);
+
+            if (info.action == FSRequestAction.Read) {
+                info.fileStream.Seek(info.fileOffset, System.IO.SeekOrigin.Begin);
+                long totalRead =
+                    (long)info.fileStream.Read(info.buf, (int)info.bufOffset, (int)info.maxLength);
+                ep.SendAckRead(info.buf.GetVector(), totalRead, 0);
+                Tracing.Log(Tracing.Debug,"Read end");
+                TrackEndpoint(ep, info.fileStream);
+            } else {
+                throw new Exception("Invalid FS Request Action!");
+            }
+        } // ProcessRequest
+    } //FSFileWorker class
+} //namespace
diff --git a/base/Services/Iso9660/FSRequest.sg b/base/Services/Iso9660/FSRequest.sg
new file mode 100644
index 0000000..34680a2
--- /dev/null
+++ b/base/Services/Iso9660/FSRequest.sg
@@ -0,0 +1,95 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+
+using Iso9660;
+
+namespace Microsoft.Singularity.FileSystem {
+
+    public enum FSRequestAction
+        {Read, GetAttributes,
+        BeginEnumeration, Bind}
+
+    public delegate void FSThreadPoolCallback(FSRequestInfo);
+
+    public class FSRequestInfo {
+        public FSRequestAction action;
+
+        protected FSRequestInfo(
+            FSRequestAction requestAction) {
+            action = requestAction;
+        }
+    }
+
+    public class FSFileRequestInfo : FSRequestInfo {
+        public TRef<FileContract.Exp:Ready> endpointT;
+        public ByteContainer buf;
+        public Iso9660FileStream fileStream;
+        public long bufOffset;
+        public long fileOffset;
+        public long maxLength;
+
+        public FSFileRequestInfo(
+            FSRequestAction action,
+            TRef<FileContract.Exp:Ready> newEndpointT,
+            ByteContainer newBuf,
+            Iso9660FileStream newFileStream,
+            long newBufOffset,
+            long newFileOffset,
+            long newMaxLength) : base(action) {
+
+            endpointT = newEndpointT;
+            buf = newBuf;
+            fileStream = newFileStream;
+            bufOffset = newBufOffset;
+            fileOffset = newFileOffset;
+            maxLength = newMaxLength;
+       }
+    }
+
+    public class FSDirectoryRequestInfo : FSRequestInfo {
+        public TRef<DirectoryServiceContract.Exp:Ready> endpointT;
+        public Iso9660DirectoryInfo dir;
+        public string name;
+
+        public FSDirectoryRequestInfo(
+            FSRequestAction action,
+            TRef<DirectoryServiceContract.Exp:Ready> newEndpointT,
+            Iso9660DirectoryInfo newDir,
+            string newName) : base(action) {
+
+            endpointT = newEndpointT;
+            dir = newDir;
+            name = newName;
+       }
+    }
+
+    public class FSBindRequestInfo : FSRequestInfo {
+        public TRef<DirectoryServiceContract.Exp:Ready> endpointT;
+        public TRef<ServiceContract.Exp:Start> bindEndpointT;
+        public Iso9660DirectoryInfo startingDir;
+        public string path;
+
+        public FSBindRequestInfo(
+            FSRequestAction action,
+            TRef<DirectoryServiceContract.Exp:Ready> newEndpointT,
+            TRef<ServiceContract.Exp:Start> newBindEndpointT,
+            Iso9660DirectoryInfo newStartingDir,
+            string newPath) : base(action) {
+
+            endpointT = newEndpointT;
+            bindEndpointT = newBindEndpointT;
+            startingDir = newStartingDir;
+            path = newPath;
+       }
+    }
+}
+
diff --git a/base/Services/Iso9660/FSThreadPool.sg b/base/Services/Iso9660/FSThreadPool.sg
new file mode 100644
index 0000000..8138108
--- /dev/null
+++ b/base/Services/Iso9660/FSThreadPool.sg
@@ -0,0 +1,70 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+
+using Microsoft.Contracts;
+
+namespace Microsoft.Singularity.FileSystem {
+    public class FSThreadPool {
+        private int numThreads;
+        private readonly Queue workQueue = new Queue();
+        private readonly FSThreadPoolCallback workCallback;
+        private bool keepGoing = true;
+
+        [NotDelayed]
+        public FSThreadPool(int threads, FSThreadPoolCallback callback) {
+            numThreads = threads;
+            workCallback = callback;
+            
+            while (threads > 0) {
+                Thread t = new Thread(new ThreadStart(DoWork));
+                t.Start();
+                threads--;
+            }
+        }
+        
+        public void KillPool() {
+            Monitor.Enter(workQueue);
+            keepGoing = false;
+            Monitor.PulseAll(workQueue);
+            while (numThreads > 0) {
+                Monitor.Wait(workQueue);
+            }
+            Monitor.Exit(workQueue);
+        }
+        
+        public void EnqueueItem(FSRequestInfo request) {
+            Monitor.Enter(workQueue);
+            workQueue.Enqueue(request);
+            Monitor.Pulse(workQueue);
+            Monitor.Exit(workQueue);
+        }
+        
+        private void DoWork() {
+            while (true) {
+                Monitor.Enter(workQueue);
+                while (workQueue.Count == 0 && keepGoing) {
+                    Monitor.Wait(workQueue);
+                }
+                
+                if (!keepGoing && workQueue.Count == 0) {
+                    numThreads--;
+                    Monitor.PulseAll(workQueue);
+                    Monitor.Exit(workQueue);
+                    break;
+                }
+                
+                FSRequestInfo request = (FSRequestInfo)workQueue.Dequeue();
+                
+                Monitor.Exit(workQueue);
+                
+                workCallback(request);
+            }
+        }
+    }
+}
diff --git a/base/Services/Iso9660/Int.cs b/base/Services/Iso9660/Int.cs
new file mode 100644
index 0000000..8d16844
--- /dev/null
+++ b/base/Services/Iso9660/Int.cs
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace Iso9660 {
+	/// <summary>
+	/// This class contains static methods for marshalling and unmarshalling
+	/// 32-bit integers.
+	/// </summary>
+    public class Int {
+        /// <summary>
+        /// The size (in bytes) of the marshalled representation of an integer.
+        /// </summary>
+        public const int Size = 4;
+
+        /// <summary>
+        /// Marshalls an integer into a buffer starting at a pointer into the 
+        /// buffer, and advances the pointer accordingly. 
+        /// </summary>
+        /// <param name="i">The integer that is being marshalled.</param>
+        /// <param name="bytes">The buffer into which the integer is marshalled.</param>
+        /// <param name="offset">The position in the buffer where the Handle starts.
+        /// After completion, offset is the next position after the Handle.</param>
+        public static void Marshall(int i, byte[] bytes, ref int offset) {
+            bytes[offset+0] = (byte)(i & 0xff); i >>= 8;
+            bytes[offset+1] = (byte)(i & 0xff); i >>= 8;
+            bytes[offset+2] = (byte)(i & 0xff); i >>= 8;
+            bytes[offset+3] = (byte)(i & 0xff); i >>= 8;
+            offset += 4;
+        }
+
+        /// <summary>
+        /// Given a buffer and a pointer into it, unmarshalls an integer from the 
+        /// buffer, advancing the pointer by 4 bytes.
+        /// </summary>
+        /// <param name="bytes">The buffer from which the integer is unmarshalled.</param>
+        /// <param name="offset">The position in the buffer where the Handle starts.
+        /// After completion, offset is the next position after the Handle.</param>
+        /// <returns>The integer that was unmarshalled.</returns>
+        public static int Unmarshall(byte[] bytes, ref int offset) {
+            int i = 0;
+            i = (i << 8) | bytes[offset+3];
+            i = (i << 8) | bytes[offset+2];
+            i = (i << 8) | bytes[offset+1];
+            i = (i << 8) | bytes[offset+0];
+            offset += 4;
+            return i;
+        }
+        
+        public static int Parse(string val) {
+            int num;
+            if (val.Length > 2 && val[0] == '0' && 
+                             (val[1] == 'x' || val[1] == 'X')) {
+                num = System.Int32.Parse(val.Substring(2), 
+                          System.Globalization.NumberStyles.AllowHexSpecifier);
+            } else {
+                num = System.Int32.Parse(val);
+            }
+            return num;
+        }
+    }
+}
diff --git a/base/Services/Iso9660/Iso9660.csproj b/base/Services/Iso9660/Iso9660.csproj
new file mode 100644
index 0000000..746126e
--- /dev/null
+++ b/base/Services/Iso9660/Iso9660.csproj
@@ -0,0 +1,52 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>iso9660</AssemblyName>
+    <NoWarn>2614,2637,2638,2613,2639</NoWarn>
+    <DefineConstants>SINGLEBOX</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Main.sg"/>
+    <Compile Include="Iso9660DirectoryInfo.cs"/>
+    <Compile Include="Iso9660FileInfo.cs"/>
+    <Compile Include="Iso9660FileSystemInfo.cs"/>
+    <Compile Include="Iso9660FileStream.cs"/>
+    <Compile Include="SingFSStructs.cs"/>
+    <Compile Include="Iso9660ControlWorker.sg"/>
+    <Compile Include="FSFileInstanceWorker.sg"/>
+    <Compile Include="FSDirectoryInstanceWorker.sg"/>
+    <Compile Include="ByteContainers.sg"/>
+    <Compile Include="FSRequest.sg"/>
+    <Compile Include="FSThreadPool.sg"/>
+    <Compile Include="StdIOSingularity.sg"/>
+    <Compile Include="ByteArray.cs"/>
+    <Compile Include="iso9660.cs"/>
+    <Compile Include="Int.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml\Xml.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Services/Iso9660/Iso9660ControlWorker.sg b/base/Services/Iso9660/Iso9660ControlWorker.sg
new file mode 100644
index 0000000..b1c59c8
--- /dev/null
+++ b/base/Services/Iso9660/Iso9660ControlWorker.sg
@@ -0,0 +1,413 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Iso9660ControlWorker.sg
+//
+//  Note:   Handles control messages for Iso9660
+//
+
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.FileSystem {
+
+    public enum Iso9660ControlState {Uninitialized, Initialized, Mounted}
+
+    public class Iso9660ControlWorker {
+        public static bool debug = true;
+        private static bool started = false;
+        private static bool running = true;
+        private static bool success = false;
+        private static bool checkedOut = false;
+        private static Iso9660ControlState controlState =
+            Iso9660ControlState.Uninitialized;
+
+        private static object startToken = new Object();
+        private static object lockToken = new Object();
+        private static string controlPath;
+        private static string mountPath = null;
+
+        // pivot point for the iso9660 control endpoint
+        private static
+            TRef<Iso9660ServiceControlContract.Exp:Ready> controlT;
+
+        public static bool Start(string! controlPath) {
+            Iso9660ControlWorker.controlPath = controlPath;
+            Thread t = new Thread(new ThreadStart(ControlServiceWorker));
+            t.Start();
+            lock (startToken) {
+                while (!started) Monitor.Wait(startToken);
+            }
+
+            return success;
+        }
+
+        // handles namespace connect requests
+        // makes sure only one client ever has access to the
+        // control channel endpoint
+        // client killing the endpoint returns it to this module
+        private static void ControlServiceWorker() {
+            ServiceProviderContract.Imp! providerClient;
+            ServiceProviderContract.Exp! providerServer;
+            ServiceProviderContract.NewChannel(
+                out providerClient, out providerServer);
+
+            // start the thread that actually handles control requests
+            Thread t = new Thread(new ThreadStart(ControlWorker));
+            t.Start();
+
+            // register the control channel
+            DirectoryServiceContract.Imp rootNS = DirectoryService.NewClientEndpoint();
+
+            if (debug) {
+                DebugStub.Print("FS: Sending control register for "+
+                    controlPath+"\r\n");
+            }
+
+            rootNS.SendRegister(Bitter.FromString(controlPath), providerClient);
+
+            switch receive {
+                case rootNS.AckRegister():
+                    if (debug) {
+                        DebugStub.Print("FS: Successfully registered\r\n");
+                    }
+                    success = true;
+                    break;
+                case rootNS.NakRegister(rejected, error):
+                    if (debug) {
+                        DebugStub.Print("FS: Failed register\r\n");
+                    }
+                    delete rejected;
+                    success = false;
+                    break;
+            }
+
+            delete rootNS;
+
+            lock (startToken) {
+                started = true;
+                Monitor.Pulse(startToken);
+            }
+
+            if (!success) {
+                delete providerServer;
+                return;
+            }
+
+            if (debug) {
+                DebugStub.Print("FS: Starting control service "+
+                    "worker loop\r\n");
+            }
+
+            while (running) {
+                ServiceContract.Exp:Start! epServer;
+                Iso9660ServiceControlContract.Exp controlServer;
+
+                // wait for connection message
+                providerServer.RecvConnect(out epServer);
+                controlServer = epServer as Iso9660ServiceControlContract.Exp;
+
+                // hack to get the thing to stop running
+                lock (lockToken) {
+                    if (!running) {
+                        providerServer.SendNackConnect(epServer);
+                        break;
+                    }
+                }
+
+                if (debug) {
+                    DebugStub.Print("FS: received control connect\r\n");
+                }
+
+                if (controlServer == null) {
+                    // Inappropriate channel type
+                    DebugStub.Print("Received improper channel type");
+                    providerServer.SendNackConnect(epServer);
+                }
+                else {
+                    lock (lockToken) {
+                        if (checkedOut) {
+                            if (debug) {
+                                DebugStub.Print("FS: control checked out;"+
+                                                " sending nack...\r\n");
+                            }
+                            providerServer.SendNackConnect(epServer);
+                        } else {
+                            try {
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: processing connect\r\n");
+                                }
+                                checkedOut = true;
+                                controlServer.SendSuccess();
+
+                                // hand the control channel to the worker thread
+                                controlT = new TRef
+                                    <Iso9660ServiceControlContract.Exp:Ready>
+                                    (controlServer);
+                                Monitor.Pulse(lockToken);
+                                providerServer.SendAckConnect();
+                            } catch (Exception e) {
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Caught exception: "+e+"\r\n");
+                                }
+                                throw;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // deregister the control channel
+            rootNS = DirectoryService.NewClientEndpoint();
+
+            if (debug) {
+                DebugStub.Print("FS: Sending control deregister for "+
+                    controlPath+"\r\n");
+            }
+
+            rootNS.SendDeregister(Bitter.FromString(controlPath));
+            switch receive {
+                case rootNS.AckDeregister(providerClient2):
+                    if (debug) {
+                        DebugStub.Print("FS: Successfully deregistered\r\n");
+                    }
+                    success = true;
+                    delete providerClient2;
+                    break;
+                case rootNS.NakDeregister(error):
+                    success = false;
+                    if (debug) {
+                        DebugStub.Print("FS: Failed deregister!!!\r\n");
+                    }
+                    break;
+            }
+            delete rootNS;
+            delete providerServer;
+
+            lock (lockToken) {
+                started = true;
+                Monitor.Pulse(lockToken);
+            }
+        }
+
+        private static void ControlWorker() {
+            Iso9660ServiceControlContract.Exp control = null;
+
+            while (running) {
+                lock (lockToken) {
+                    while(!checkedOut) {Monitor.Wait(lockToken);}
+                }
+                if (debug) {
+                    DebugStub.Print("FS: controlworker triggered\r\n");
+                }
+
+                // grab from the pivot point
+                control = controlT.Acquire();
+                bool inner = true;
+
+                // while the channel is still active, process
+                while (running && inner) {
+                    switch receive {
+                        case control.Initialize(char* opt(ExHeap[]) deviceTemp):
+                            string device = Bitter.ToString(deviceTemp);
+                            delete deviceTemp;
+                            if (debug) {
+                                DebugStub.Print("FS: Got initialize on "+
+                                    device+"\r\n");
+                            }
+                            if (controlState !=
+                                Iso9660ControlState.Uninitialized &&
+                                controlState !=
+                                Iso9660ControlState.Initialized) {
+
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Failed to initialize "+
+                                        device+" (already initialized)\r\n");
+                                }
+                                control.SendNackInitialize();
+                            } else if (controlState == Iso9660ControlState.Initialized) {
+                                control.SendAckInitialize();
+                            } else if (Iso9660Init(device)) {
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Successfully initialized on "+
+                                        device+"\r\n");
+                                }
+                                controlState = Iso9660ControlState.Initialized;
+                                control.SendAckInitialize();
+                            } else {
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Failed to initialize "+
+                                        device+"\r\n");
+                                }
+                                control.SendNackInitialize();
+                            }
+                            break;
+                        case control.Mount(char* opt(ExHeap[]) locationTemp):
+                            string location = Bitter.ToString(locationTemp);
+                            delete locationTemp;
+                            if (debug) {
+                                DebugStub.Print("FS: Got mount to "+
+                                    location+"\r\n");
+                            }
+                            if (controlState !=
+                                Iso9660ControlState.Initialized) {
+
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Failed mount on "+location+
+                                        " (not initialized or "+
+                                        "already mounted)\r\n");
+                                }
+                                control.SendNackMount();
+                            } else if (Mount(location)) {
+
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Successfully mounted "+location+
+                                        "\r\n");
+                                }
+                                controlState = Iso9660ControlState.Mounted;
+                                control.SendAckMount();
+                            } else {
+                                if (debug) {
+                                    DebugStub.Print(
+                                        "FS: Failed mount on "+location+
+                                        "\r\n");
+                                }
+                                control.SendNackMount();
+                            }
+                            break;
+                        case control.Unmount():
+                            if (controlState != Iso9660ControlState.Mounted) {
+                                control.SendNackUnmount();
+                            } else {
+                                Shutdown();
+                                //controlState = Iso9660ControlState.Initialized;
+
+                                lock (lockToken) {
+                                    started = false;
+                                    running = false;
+                                }
+
+                                Iso9660ServiceControlContract.Imp! providerClient;
+                                Iso9660ServiceControlContract.Exp! providerServer;
+                                Iso9660ServiceControlContract.NewChannel(
+                                    out providerClient, out providerServer);
+
+                                DirectoryServiceContract.Imp rootNS = DirectoryService.NewClientEndpoint();
+
+                                if (debug) {
+                                    DebugStub.Print("FS: Triggering control loop to stop\n");
+                                }
+
+                                rootNS.SendBind(Bitter.FromString(controlPath), providerServer);
+                                switch receive {
+                                    case rootNS.NakBind(dummy, code):
+                                        delete dummy;
+                                        break;
+                                }
+
+                                delete providerClient;
+                                delete rootNS;
+                                lock (lockToken) {
+                                    while (!started) {
+                                        Monitor.Wait(lockToken);
+                                    }
+                                }
+                                if (success) {
+                                    control.SendAckUnmount();
+                                } else {
+                                    control.SendNackUnmount();
+                                }
+                                delete control;
+                                return;
+                            }
+                            break;
+                        case control.ChannelClosed():
+                            inner = false;
+                            lock (lockToken) {
+                                checkedOut = false;
+                            }
+                            break;
+                        case unsatisfiable:
+                            // channel killed; fall out
+                            inner = false;
+                            lock (lockToken) {
+                                checkedOut = false;
+                                // XXX
+                                // delete controlT;
+                            }
+                            break;
+                    }
+                }
+
+                controlT.Release(control);
+            }
+        }
+
+        public static bool Iso9660Init(string! device) {
+
+            long unit = Iso9660.Stdio.RawDevice.LoadDisk(device);
+            if (unit < 0) {
+                Console.WriteLine("LoadDisk " + device + " failed with " + unit );
+                return false;
+            }
+            return true;
+        }
+
+        public static bool Mount(string! location) {
+
+                    byte[] superBlock;
+                    superBlock = new byte[2048];
+                    DebugStub.Write("Reading root...");
+                    Iso9660.Stdio.RawDevice.ReadBlock(superBlock,16);
+                    // 0x01 + "CD001"
+                    if (superBlock[0] != (byte)0x01 ||
+                        superBlock[1] != (byte)0x43 ||
+                        superBlock[2] != (byte)0x44 ||
+                        superBlock[3] != (byte)0x30 ||
+                        superBlock[4] != (byte)0x30 ||
+                        superBlock[5] != (byte)0x31) {
+                        return false;
+                    }
+                    if (!Iso9660.SuperBlock.Unmarshall(superBlock))
+                        return false;
+
+                    DebugStub.WriteLine("done.");
+
+                mountPath = location;
+                DebugStub.Write("Starting file instance worker...");
+                FSFileInstanceWorker.Start();
+                DebugStub.WriteLine("done.");
+            
+            DebugStub.Write("Starting directory instance worker...");
+            bool result = FSDirectoryInstanceWorker.Start(location);
+            DebugStub.WriteLine("done.");
+            return result;
+        }
+        
+        public static bool Shutdown() {
+
+                DebugStub.Write("Terminating directory instance worker...");
+                FSDirectoryInstanceWorker.Terminate();
+                DebugStub.WriteLine("done.");
+            
+            DebugStub.Write("Terminating file instance worker...");
+            FSFileInstanceWorker.Terminate();
+            DebugStub.WriteLine("done.");
+            return true;
+        }
+    }
+}
diff --git a/base/Services/Iso9660/Iso9660DirectoryInfo.cs b/base/Services/Iso9660/Iso9660DirectoryInfo.cs
new file mode 100644
index 0000000..c460cb3
--- /dev/null
+++ b/base/Services/Iso9660/Iso9660DirectoryInfo.cs
@@ -0,0 +1,156 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using Microsoft.Singularity.V1.Services;
+using System;
+using System.Collections;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Drivers;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.V1.Services;
+
+
+namespace Iso9660
+{
+	public class Iso9660DirectoryInfo : Iso9660FileSystemInfo
+	{
+        private byte   LEN      { get { return buf[pos + DirEnt.LEN];      }}
+        private byte   FLAGS    { get { return buf[pos + DirEnt.FLAGS];    }}
+
+        private int    NAME_LEN { get { return buf[pos + DirEnt.NAME_LEN]; }}
+        private int    NAME_POS { get { return     pos + DirEnt.NAME;      }}
+
+        private string NAME     { get { return ByteArray.ToString (buf, NAME_POS, NAME_LEN); }}
+
+        private bool   DOT      { get { return ((NAME_LEN == 1) && (buf[NAME_POS] == 0x00)); }}
+        private bool   DOTDOT   { get { return ((NAME_LEN == 1) && (buf[NAME_POS] == 0x01)); }}
+
+        public string myPrefix;
+
+        internal Iso9660DirectoryInfo() {}
+
+        //
+        //  0. Delegated "lookup" for Enumerate & FindChild
+        //
+
+        private delegate bool LOOKUP (Object obj);
+
+        private bool Lookup (LOOKUP lookup, Object obj) {
+
+            //
+            // The following assumes that the list of directory entries
+            // is terminated in every block by an entry with LEN 0, ie:
+            //
+            // 1. directory entries do not cross block boundaries
+            //    (with <n> entries in the 1st block, and unused bytes at
+            //     the end, entry <n+1> starts at pos 0 in the 2nd block)
+            //
+            // 2. the size is used only to calculate the number of blocks
+            //    (not the last byte of the last entry in the last block)
+            //
+            
+            ulong nblocks = 1 + (size - 1) / 2048;
+
+            for (ulong n = 0; n < nblocks; n++) {
+
+                Iso9660.Stdio.RawDevice.ReadBlock (buf, blockno + n);
+
+                for (pos = 0;; pos += LEN) {
+
+                    if (LEN == 0)
+                        break;
+
+                    if (DOT || DOTDOT)
+                        continue;
+                
+                    if (lookup (obj))
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        //
+        //  1. Enumerate (dir/ls)
+        //
+
+        private bool Enumerate (Object obj) {
+
+            bool dir = ((FLAGS & (byte)Iso9660FileFlags.Directory) != 0);
+
+            NodeType nodeType = (dir)? NodeType.Directory: NodeType.File;
+
+            ((SortedList)obj).Add (NAME.ToLower(), nodeType); // FIXME: ToLower opt?
+
+            return false; // GetNextChild
+        }
+
+        public EnumerationRecords[] in ExHeap Enumerate (out ErrorCode errorOut)
+        {
+            SortedList matches; 
+            EnumerationRecords[] in ExHeap responses = null; 
+            
+            errorOut = ErrorCode.NoError; 
+            matches  = new SortedList();
+            if (matches == null) 
+            {
+                errorOut = ErrorCode.InsufficientResources; 
+                return null;
+            }
+            Lookup (Enumerate, matches);
+
+            responses = new [ExHeap] EnumerationRecords[matches.Count]; 
+            if (responses == null) 
+            {
+                errorOut = ErrorCode.InsufficientResources; 
+                return null;
+            }
+            for (int i = 0; i < matches.Count; i++){
+                expose (responses[i]) {
+                    delete responses[i].Path; // checker doesn't know its null.
+                    responses[i].Path = Bitter.FromString2((!)((string)matches.GetKey(i))); 
+                    responses[i].Type = (NodeType) (!) matches.GetByIndex(i); 
+                }
+            }
+            return responses; 
+        }
+
+        //
+        //  2. FindChild
+        //
+
+        private bool FindChild (Object obj) {
+        
+            return ((string)obj == NAME.ToLower()); // FIXME: ToLower opt?
+        }
+        internal bool FindChild(string name, bool returnChild, 
+            out Iso9660FileSystemInfo child) {
+
+            if (!Lookup (FindChild, name)) {
+                child = null;
+                return false;
+            }
+            if ((FLAGS & (byte)Iso9660FileFlags.Directory) != 0) {
+
+                Iso9660DirectoryInfo dir = new Iso9660DirectoryInfo();
+                dir.myPrefix = myPrefix + SuperBlock.DELIMITER + name;
+                child = dir;
+            }
+            else {
+                Iso9660FileInfo file = new Iso9660FileInfo();
+                child = file;
+            }
+            child.InitializeMe (buf, pos);
+            return true;
+        }
+	}
+}
diff --git a/base/Services/Iso9660/Iso9660FileInfo.cs b/base/Services/Iso9660/Iso9660FileInfo.cs
new file mode 100644
index 0000000..e169cc9
--- /dev/null
+++ b/base/Services/Iso9660/Iso9660FileInfo.cs
@@ -0,0 +1,35 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+
+namespace Iso9660
+{
+	public class Iso9660FileInfo : Iso9660FileSystemInfo
+	{
+        internal Iso9660FileInfo() {}
+
+        public Iso9660FileStream Open(FileMode mode, FileAccess access) {
+            return new Iso9660FileStream(this, mode, access);
+        }
+
+        public Iso9660FileStream OpenRead() {
+            return Open(System.IO.FileMode.Open,
+                        System.IO.FileAccess.Read);
+        }
+
+        internal static long BlockSize(long block) {
+            return 2048;
+        }
+
+        internal long BlockFromByte(long pos) {
+            return (long)blockno + pos / 2048;
+        }
+	}
+}
diff --git a/base/Services/Iso9660/Iso9660FileStream.cs b/base/Services/Iso9660/Iso9660FileStream.cs
new file mode 100644
index 0000000..25c4a12
--- /dev/null
+++ b/base/Services/Iso9660/Iso9660FileStream.cs
@@ -0,0 +1,169 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Iso9660
+{
+    public class Iso9660FileStream {
+        private Iso9660FileInfo _info;
+        private long _pos = 0;
+
+        [NotDelayed]
+        public Iso9660FileStream(Iso9660FileInfo info, FileMode mode,
+            FileAccess access) {
+            _info = info;
+            _pos = 0;
+        }
+
+        ~Iso9660FileStream() {}
+
+        public bool CanRead {
+            get {
+                return true;
+            }
+        }
+
+        public bool CanWrite {
+            get {
+                return false;
+            }
+        }
+
+        public bool CanSeek {
+            get {
+                return true;
+            }
+        }
+
+        public long Length {
+            get {
+                long size = (long)_info.size;
+                return size;
+            }
+        }
+
+        public long Position {
+            get {
+                return _pos;
+            }
+        }
+
+        public void Close() {
+        }
+
+        public int Read(ByteContainer buffer, int offset, int count) {
+            Tracing.Log(Tracing.Debug,"Entered");
+
+            long currentLength = (long)_info.size;
+
+            // just touch the file
+            if (count == 0 || _pos >= currentLength){
+                return 0;
+            }
+
+            long bytesLeft;
+
+            if (currentLength - _pos > (long)count) {
+                bytesLeft = (long)count;
+            } else {
+                bytesLeft = currentLength - _pos;
+            }
+
+            /***
+            Console.WriteLine("ReadArgs: count = " + args.count +
+                              " offset = " + args.offset +
+                              " bytes to be read " + bytesLeft);
+            ***/
+
+            if (buffer == null) {
+                //Console.WriteLine("ReadNFS: user buffer was null!");
+                throw new ArgumentNullException("Buffer given to Read was null");
+            } else if ((long)buffer.Length < bytesLeft) {
+                    throw new ArgumentException("Not enough room in buffer");
+            }
+
+            long uBufOff = (long)offset; // offset into user's buffer;
+            long curFileOff = _pos;
+            long blockno = -1;
+
+            while(bytesLeft > 0) {
+                long curBlk = _info.BlockFromByte(curFileOff);
+                long curBlkSize = Iso9660FileInfo.BlockSize(curBlk);
+                long curBlkOff = curFileOff % curBlkSize;
+
+                /***
+                Console.WriteLine("ReadArgs: curBlockNum " + curBlk +
+                                  " curBlkSize = " + curBlkSize +
+                                  " cur offset into blk " + curBlkOff);
+                ***/
+                if (blockno < curBlk) {
+                    blockno = curBlk;
+
+                    //
+                    //  1. fetch data from media's block
+                    //
+
+                    Iso9660.Stdio.RawDevice.ReadBlock (_info.buf, (ulong)blockno);
+                }
+                long dist;
+                if (curBlkSize - curBlkOff > bytesLeft) {
+                    dist = bytesLeft;
+                } else {
+                    dist = curBlkSize - curBlkOff;
+                }
+
+                //
+                //  2. store data into user's buffer
+                //
+
+                buffer.CopyTo (_info.buf, (int)curBlkOff, (int)uBufOff, (int)dist);
+
+                uBufOff += dist;
+                curFileOff += dist;
+                bytesLeft -= dist;
+            }
+
+            _pos += uBufOff;
+            return (int)uBufOff;
+            Tracing.Log(Tracing.Debug,"Exit");
+        }
+
+        public long Seek(long offset, System.IO.SeekOrigin origin) {
+            Tracing.Log(Tracing.Debug,"Entered");
+            switch (origin)
+            {
+                case System.IO.SeekOrigin.Begin:
+                    if (offset >= 0) {
+                        _pos = offset;
+                    }
+                    break;
+                case System.IO.SeekOrigin.Current:
+                    if (_pos + offset >= 0) {
+                        _pos += offset;
+                    }
+                    break;
+                case System.IO.SeekOrigin.End:
+                    long len = this.Length;
+                    if (len + offset >= 0) {
+                        _pos = len + offset;
+                    }
+                    break;
+                default:
+                    throw new NotSupportedException("Unidentified SeekOrigin argument");
+            }
+            Tracing.Log(Tracing.Debug,"Exit");
+            return (long)_pos;
+        }
+    }
+}
diff --git a/base/Services/Iso9660/Iso9660FileSystemInfo.cs b/base/Services/Iso9660/Iso9660FileSystemInfo.cs
new file mode 100644
index 0000000..37417ea
--- /dev/null
+++ b/base/Services/Iso9660/Iso9660FileSystemInfo.cs
@@ -0,0 +1,94 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Threading;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.V1.Services;
+
+namespace Iso9660
+{
+    internal class FSObjectGlobalState {
+        internal Iso9660FileAttributes attributes;
+    }
+
+    public abstract class Iso9660FileSystemInfo
+    {
+        public ulong blockno;
+        
+        // embedded FSObjectGlobalState globalState;
+        //                  globalState.attributes:
+
+        public ulong size;
+        public byte flags;
+
+        // embedded Iso9660Ptr:
+        
+        public byte[] buf;
+        public int pos;
+
+        public Iso9660FileSystemInfo() { buf = new byte[2048];
+                                         pos = 0;
+        }
+        internal void InitializeMe (byte[] buf, int pos) {
+
+            blockno = ByteArray.ToUlong (buf,pos + DirEnt.BLOCK_NO);
+            size    = ByteArray.ToUlong (buf,pos + DirEnt.SIZE);
+            flags   =                    buf[pos + DirEnt.FLAGS];
+        }
+
+        internal static string[] ParsePath(string path) {
+            if (path == null) {return null;}
+
+            return path.Split(new char[] {SuperBlock.DELIMITER[0]});
+        }
+
+        // given a path, gives you back a filesystem object representing
+        // that path
+
+        public static Iso9660FileSystemInfo InstantiatePath(string path) {
+            return InstantiatePath(path, null);
+        }
+
+        public static Iso9660FileSystemInfo InstantiatePath(
+            string path, Iso9660DirectoryInfo startDir) {
+
+            Iso9660FileSystemInfo child;
+            Iso9660DirectoryInfo iterator = (startDir == null) ? SuperBlock.root : startDir;
+
+            if (path == "/" || path == "") {
+                return iterator;
+            }
+
+            string[] names = ParsePath(path);
+
+            if (names == null) {
+                return null;
+            }
+
+            int start = (names[0].Length == 0) ? 1 : 0;
+            for (int i = start; i < names.Length-1; i++) {
+                if (!iterator.FindChild(names[i], true, out child)) {
+                    //throw new ArgumentException("Invalid path");
+                    return null;
+                } else {
+                    iterator = (Iso9660DirectoryInfo)child;
+                }
+            }
+
+            if (!iterator.FindChild(names[names.Length-1], true, out child)) {
+                //throw new ArgumentException("Invalid path");
+                return null;
+            } else {
+                return child;
+            }
+        }
+    }
+}
diff --git a/base/Services/Iso9660/Main.sg b/base/Services/Iso9660/Main.sg
new file mode 100644
index 0000000..2ae2c5e
--- /dev/null
+++ b/base/Services/Iso9660/Main.sg
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Threading;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.FileSystem;
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Iso9660 {
+    public sealed class Iso9660Service {
+        public const string ControlLocation = "/CdCtrl";
+        public static int Main(string[] args) {
+            // register control channel
+            Iso9660ControlWorker.Start(ControlLocation);
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Iso9660/SingFSStructs.cs b/base/Services/Iso9660/SingFSStructs.cs
new file mode 100644
index 0000000..596101a
--- /dev/null
+++ b/base/Services/Iso9660/SingFSStructs.cs
@@ -0,0 +1,106 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+using Microsoft.Contracts;
+
+namespace Iso9660 {
+    public struct Iso9660Ptr {
+        public byte[] buf;
+        public int pos;
+
+        public Iso9660Ptr(byte[] newbuf, int newpos) {
+            buf = newbuf;
+            pos = newpos;
+        }
+
+        public void Reset() {
+            buf = new byte[buf.Length];
+            pos = 0;
+        }
+    }
+
+    [Flags]
+    public enum Iso9660FileFlags : uint {
+        Normal=0,
+        Directory=2,
+    }
+
+    public struct Iso9660FileAttributes {
+        public Iso9660FileFlags flags;
+        public long size;
+    }
+
+    public class Iso9660IOException : IOException {
+        public Iso9660IOException(string str) : base(str) {}
+    }
+
+    public class DirEnt {
+
+        public const int LEN      =  0; // 1 byte
+        public const int BLOCK_NO =  6; // 4-byte LE int
+        public const int SIZE     = 14; // 4-byte LE int
+        public const int FLAGS    = 25; // 1 byte
+        public const int NAME_LEN = 32; // 1 byte
+        public const int NAME     = 33; // <NAME_LEN> chars
+    }
+
+    public class SuperBlock {
+
+        public const int TYPE     =   0; // 1 byte (SB => 0x01)
+        public const int IDENT    =   1; // 5 chars ("CD001")
+
+        public const int LABEL    =  40; // 32 chars
+        public const int SET_SIZE = 122; // 2-byte LE int
+        public const int SEQ_NO   = 126; // 2-byte LE int
+        public const int BLK_SIZE = 130; // 2-byte LE int
+
+        public const int ROOT_DIR = 156; // Root's DirEnt
+
+        public const string DELIMITER = "/";
+
+        internal static Iso9660DirectoryInfo root;
+
+        public static Iso9660DirectoryInfo Root {
+            get{return root;}
+        }
+
+        static SuperBlock() {}
+
+        public static bool Unmarshall(byte[] buf) {
+
+            //
+            //  1. check media & show label
+            //
+            
+            ushort set = ByteArray.ToUshort (buf, SET_SIZE);
+            ushort seq = ByteArray.ToUshort (buf, SEQ_NO);
+            ushort blk = ByteArray.ToUshort (buf, BLK_SIZE);
+
+            if (set != 1 || seq != 1 || blk != 2048) {
+                Console.WriteLine ("unknown/unsupported media" +
+                    " (set["+set+"]/seq["+seq+"]/blk["+blk+"])");
+                return false;
+            }
+            string label = ByteArray.ToString (buf, LABEL, 32);
+            Console.WriteLine("label: \"" + label + "\"");
+
+            //
+            //  2. "unmarshall" & init root
+            //
+            
+            int pos = ROOT_DIR;
+            
+            root = new Iso9660DirectoryInfo();
+            root.InitializeMe (buf, pos);
+            root.myPrefix = "";
+            return true;
+        }
+    }
+}
diff --git a/base/Services/Iso9660/StdIOSingularity.sg b/base/Services/Iso9660/StdIOSingularity.sg
new file mode 100644
index 0000000..d544ca9
--- /dev/null
+++ b/base/Services/Iso9660/StdIOSingularity.sg
@@ -0,0 +1,163 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StdIOSingularity.sg
+//
+//  Note:   Lowest level disk interface from Iso9660 to Singularity
+//
+
+using System;
+using System.Collections;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Drivers;
+using Microsoft.Singularity.Directory;
+namespace Iso9660 {
+
+    public class Stdio {
+
+        public class RawDevice
+        {
+            public string name;
+            public static long numSectors;
+            public int sectorSize;
+            private IntPtr fd;
+            private ulong fdOff = 0;
+            private static bool doDebugBreak = false;
+
+            private static TRef <DiskDeviceContract.Imp:Start> diskTRef;
+
+            public static void  SetDebug()
+            {
+                //doDebugBreak = true;
+            }
+            // returns size of disk
+            public static long LoadDisk(string devName)
+            {
+                // get NS endpoint
+                DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+                DiskDeviceContract.Imp! clientEp;
+                DiskDeviceContract.Exp! serverEp;
+                DiskDeviceContract.NewChannel(out clientEp, out serverEp);
+
+                bool success = false;
+                ErrorCode errorOut; 
+                bool ok = SdsUtils.Bind(devName, ns, serverEp, out errorOut);
+                if (!ok) {
+                    success = false; 
+                } 
+                else {
+                    success = true; 
+                }
+
+                delete ns;
+
+                if (!success)
+                {
+                    delete clientEp;
+                    Console.WriteLine("Iso9660: no disk! reason: {0}\n",
+                                       SdsUtils.ErrorCodeToString(errorOut));
+                    return -1;
+                }
+                switch receive
+                {
+                    case clientEp.Success():
+                        break;
+                    case unsatisfiable:
+                        throw new Exception("Didn't Disk.RecvSuccess");
+                        break;
+                }
+
+                // Channel is now Connected.  get sector count.
+
+                Tracing.Log(Tracing.Debug,"LoadDisk: channel connected\n");
+                ulong nSectors;
+                ulong nStart;
+                int error;
+
+                clientEp.SendGetSectorCount();
+                clientEp.RecvAckGetSectorCount(out nSectors);
+                numSectors = (long)nSectors;
+
+                diskTRef = new TRef<DiskDeviceContract.Imp:Start> (clientEp);
+                //Console.WriteLine("LoadDisk: sectors ={0}, start={1}",numSectors,sectorStart);
+                Console.WriteLine("LoadDisk: sectors = "+numSectors);
+                return (long)numSectors * 2048;
+
+            }
+
+            public RawDevice() {
+                sectorSize = 2048;
+            }
+
+            public void Open(string name) {
+                Open(name, (long)0);
+            }
+
+            public void Open(string name, long off) {
+                fdOff = (ulong)off;
+                system.Assert(fdOff == 0);
+            }
+
+            private static int ChannelRead(ByteContainer data, ulong offset, ulong length, ulong sectorId)
+            {
+                DiskDeviceContract.Imp ep = diskTRef.Acquire();
+                bool success = false;
+
+                Tracing.Log(Tracing.Debug,"start read");
+                if (doDebugBreak) DebugStub.Break();
+                ep.SendRead(data.GetVector(),offset,length,sectorId);
+                switch receive
+                {
+                        case ep.AckRead(dataTemp):
+                            data.PutVector(dataTemp);
+                            success = true;
+                            break;
+                        case ep.NakRead():
+                            throw new Exception("Iso9660: ChannelRead failed");
+                            break;
+                        case ep.ChannelClosed():
+                            throw new Exception("Iso9660: ChannelRead channel closed");
+                            break;
+                }
+                Tracing.Log(Tracing.Debug,"end read");
+                diskTRef.Release(ep);
+                if (success)
+                    return (int) length;
+                else
+                    return -1;
+            }
+
+            public static int ReadBlock( byte[] buffer, ulong blockno)
+            {
+                byte[] in ExHeap bufferH;
+                bufferH = new [ExHeap] byte [2048];
+                ByteContainer bufferVec = new ByteContainer(bufferH);
+                Tracing.Log(Tracing.Debug," reading block at sector="+blockno);
+                int ret = ChannelRead(bufferVec,0,2048,blockno);
+                bufferH = bufferVec.GetVector();
+                for (int i = 0; i < buffer.Length; i++) {
+                    buffer[i] = bufferH[i];
+                }
+                delete bufferH;
+                return ret;
+            }
+
+            public  static int Close()
+            {
+                if (diskTRef != null)
+                {
+                    DiskDeviceContract.Imp ep = diskTRef.Acquire();
+                    delete ep;
+                    // XXX
+                    diskTRef = null;
+                }
+                return 0;
+            }
+        }
+    }
+}
diff --git a/base/Services/Iso9660/iso9660.cs b/base/Services/Iso9660/iso9660.cs
new file mode 100644
index 0000000..f7bd58c
--- /dev/null
+++ b/base/Services/Iso9660/iso9660.cs
@@ -0,0 +1,135 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using Console = System.Console;
+using Environment = System.Environment;
+using Exception = System.Exception;
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+using Int32 = System.Int32;
+using IntPtr = System.IntPtr;
+using System.Threading;
+using System.Text;
+using DateTime = System.DateTime;
+using TimeSpan = System.TimeSpan;
+using Hashtable = System.Collections.Hashtable;
+using Microsoft.Singularity;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.V1.Services;
+
+/*
+ * Some utility classes and functions.
+ */
+
+namespace Iso9660
+{
+
+    public class LongId{
+        public static System.Int64 New(int hi, int low){
+            System.Int64 x = ((System.Int64)hi) << 32;
+            return x | (0xffff & (uint)low);
+        }
+
+        public static int GetHi(long id) {
+            return (int)(0xffffffff & (id >> 32));
+        }
+
+        public static int GetLo(long id) {
+            return (int)(0xffffffff & id);
+        }
+
+        public static string ToString(long x) {
+            return String.Format("<{0:x}:{1}>", GetHi(x), GetLo(x));
+        }
+    }
+
+public class system {
+    public enum MODULE : int {SYSTEM = 0, ALLOCCLERK = 1, BTREE = 2,
+        NEWONES = 3};
+
+    public class Ticks {
+        long time;
+
+        private Ticks(long t) {
+            time = t;
+        }
+
+        public static bool operator <(Ticks x, Ticks y) {
+            return x.time < y.time;
+        }
+
+        public static bool operator >(Ticks x, Ticks y) {
+            return x.time > y.time;
+        }
+        public static bool operator <=(Ticks x, Ticks y) {
+            return x.time <= y.time;
+        }
+
+        public static bool operator >=(Ticks x, Ticks y) {
+            return x.time >= y.time;
+        }
+
+        public static Ticks Now {
+            get {
+                return new Ticks(DateTime.Now.Ticks);
+            }
+        }
+
+        public long DurationInMSecs(Ticks t) {
+            return (t.time - time + 5000)/10000;
+        }
+
+        public static Ticks Minimum {
+            get {
+                return new Ticks(DateTime.MinValue.Ticks);
+            }
+        }
+
+        public override string! ToString() {
+            DateTime d = new DateTime(this.time);
+            int milliseconds = d.Millisecond;
+            return (d.ToString () + ", " + milliseconds.ToString() + "ms");
+            // + " ticks= " + this.time);
+        }
+    }
+
+    public static void Assert(bool assertion) {
+        if (!assertion) {
+            Console.WriteLine("assertion failure, stack trace:");
+#if !SINGULARITY
+            StackTrace st = new StackTrace(true);
+            string stackIndent = "";
+            for(int i =0; i< st.FrameCount; i++ ) {
+                // Low down the call stack there are four
+                // stack frames, one for each method invocation.
+                StackFrame sf = st.GetFrame(i);
+                Console.WriteLine("\n" + stackIndent + " Method: {0}",
+                                  sf.GetMethod() );
+                Console.WriteLine(  stackIndent + " File: {0}", sf.GetFileName());
+                Console.WriteLine(  stackIndent + " Line Number: {0}",
+                                    sf.GetFileLineNumber());
+                stackIndent += "  ";
+            }
+#endif
+            DebugStub.Break();
+            throw new Exception("Assertion failed");
+        }
+    }
+
+    public static void panic(string s) {
+        Console.WriteLine("panic: {0}", s);
+        DebugStub.Break();
+        throw new Exception("panic");
+    }
+}
+}
+
diff --git a/base/Services/NetStack/Channels.Nic/NetStack.Channels.Nic.csproj b/base/Services/NetStack/Channels.Nic/NetStack.Channels.Nic.csproj
new file mode 100644
index 0000000..6486aee
--- /dev/null
+++ b/base/Services/NetStack/Channels.Nic/NetStack.Channels.Nic.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>NetStack.Channels.Nic</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="NicFactory.sg" />
+    <Compile Include="Nic.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Net.Contracts\Io.Net.Contracts.csproj" />
+    <ProjectReference Include="..\NetStackLib.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Drivers.Net\Drivers.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Services/NetStack/Channels.Nic/Nic.sg b/base/Services/NetStack/Channels.Nic/Nic.sg
new file mode 100644
index 0000000..d0f1e07
--- /dev/null
+++ b/base/Services/NetStack/Channels.Nic/Nic.sg
@@ -0,0 +1,642 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: NicManager.sg
+//
+//  Note:
+//
+//  When a network device comes up, it registers with the
+//  NicManager, who places it in the namespace under
+//  /dev/nicX and advertises its existence with the netstack
+//  runtime core.  The netstack runtime core will be responsible
+//  for notifying the NicManager when the device has gone away.
+//
+//  This is a lot of jiggery-pokery just so users can see the device names
+//  under /dev and the names are sequential.
+//
+
+// #define DEBUG_NIC
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.Directory;
+
+using NetStack.Contracts;
+using NetStack.Runtime;
+
+using Drivers.Net;
+
+namespace NetStack.Channels.Nic
+{
+    internal class Nic : IAdapter
+    {
+        // Upper bounds computed for 10Gbps with maximum sized
+        // packets to give a small number of I/O requests per
+        // second and be a power of 2.
+        private const int MaxTxPacketsInDevice = 128 * 1024;
+        private const int MaxRxPacketsInDevice = 128 * 1024;
+
+        private TRef<NicDeviceContract.Imp:READY>!     nicChannel;
+        private TRef<NicDeviceEventContract.Imp:READY> eventChannel;
+
+        string!  driverName;
+        string!  driverVersion;
+        byte []! macAddress;
+        int mtu;
+        int maxTxPacketsInDevice;
+        int maxRxPacketsInDevice;
+        int maxTxFragmentsPerPacket;
+        int maxRxFragmentsPerPacket;
+
+        private AutoResetEvent !readHandle;
+        private AutoResetEvent !writeHandle;
+
+        private Queue! rxFreePacketQueue;
+
+        private ExRef<PacketFifo>! rxToDeviceFifo;
+        private ExRef<PacketFifo>! rxFromDeviceFifo;
+
+        private ExRef<PacketFifo>! txToDeviceFifo;
+        private ExRef<PacketFifo>! txFromDeviceFifo;
+        private ExRef<PacketFifo>! txFreeFifo;
+
+        private ulong txRequests = 0;
+        private ulong txComplete = 0;
+        private ulong rxTotal    = 0;
+
+        [Microsoft.Contracts.NotDelayed]
+        public Nic([Claims] NicDeviceContract.Imp:READY! nicImp,
+                   NicDeviceProperties*! in ExHeap np)
+        {
+            this.readHandle  = new AutoResetEvent(false);
+            this.writeHandle = new AutoResetEvent(false);
+
+            this.nicChannel = new TRef<NicDeviceContract.Imp:READY>(nicImp);
+            expose (np) {
+                assume np->DriverName != null;
+                assume np->MacAddress != null;
+                this.driverName    = Bitter.ToString2(np->DriverName);
+                this.driverVersion = Bitter.ToString2(np->DriverName);
+                this.macAddress    = Bitter.ToByteArray(np->MacAddress);
+            }
+            this.mtu = np->MtuBytes;
+            this.maxTxPacketsInDevice    = np->MaxTxPacketsInDevice;
+            this.maxRxPacketsInDevice    = np->MaxRxPacketsInDevice;
+            this.maxTxFragmentsPerPacket = np->MaxTxFragmentsPerPacket;
+            this.maxRxFragmentsPerPacket = np->MaxRxFragmentsPerPacket;
+            // The following attributes are both integers yet
+            // sgc is complaining it doesn't know to use
+            // Math.Min(sbyte, sbyte) or Math.Min(byte, byte).
+            int rxFifoSize = Math.Min(np->MaxRxPacketsInDevice,
+                                      (int)Nic.MaxRxPacketsInDevice);
+
+            // Create a queue for NetPackets that we pass up to
+            // the NetStack and it passes down to us.  And
+            // create a Packet fifo that has a packet for each
+            // NetPacket.
+
+            this.rxFreePacketQueue = new Queue(rxFifoSize);
+            this.rxToDeviceFifo =
+                new ExRef<PacketFifo>(
+                    new [ExHeap] PacketFifo(rxFifoSize),
+                    false
+                    );
+
+            this.rxFromDeviceFifo =
+                new ExRef<PacketFifo>(
+                    new [ExHeap] PacketFifo(rxFifoSize),
+                    false
+                    );
+
+            // The following attributes are both integers yet
+            // sgc is complaining it doesn't know to use
+            // Math.Min(sbyte, sbyte) or Math.Min(byte, byte).
+            int txFifoSize = Math.Min(np->MaxTxPacketsInDevice,
+                                      (int)Nic.MaxTxPacketsInDevice);
+
+            this.txToDeviceFifo =
+                new ExRef<PacketFifo>(
+                    new [ExHeap] PacketFifo(txFifoSize),
+                    false
+                    );
+
+            this.txFromDeviceFifo =
+                new ExRef<PacketFifo>(
+                    new [ExHeap] PacketFifo(txFifoSize),
+                    false
+                    );
+
+            this.txFreeFifo =
+                new ExRef<PacketFifo>(
+                    new [ExHeap] PacketFifo(txFifoSize),
+                    false
+                    );
+
+            base();
+
+            TxProvision();
+            RxProvision();
+        }
+
+        int MaxRxPackets { get { return this.maxRxPacketsInDevice; } }
+
+        internal void ThreadMain()
+        {
+            StartIO();
+            EventMessagePump();
+        }
+
+        internal void EventMessagePump()
+        {
+            Tracing.Log(Tracing.Debug, "Started event pump");
+
+            NicDeviceEventContract.Imp imp = (eventChannel).Acquire();
+            eventChannel = null;
+            try {
+                assert imp.InState(NicDeviceEventContract.READY.Value);
+                imp.RecvSuccess();
+                assert imp.InState(NicDeviceEventContract.RUNNING.Value);
+                for (;;) {
+                    NicEventType eventType;
+                    imp.RecvNicDeviceEvent(out eventType);
+                    if ((eventType & NicEventType.ReceiveEvent) != 0) {
+                        Tracing.Log(Tracing.Debug, "Receive event");
+                        readHandle.Set();
+                    }
+                    if ((eventType & NicEventType.TransmitEvent) != 0) {
+                        Tracing.Log(Tracing.Debug, "Transmit event");
+                        writeHandle.Set();
+                    }
+                    if ((eventType & NicEventType.LinkEvent) != 0) {
+                        Tracing.Log(Tracing.Debug, "Link event");
+                        DebugStub.Break();
+                    }
+                    imp.SendAckNicDeviceEvent();
+                }
+            }
+            catch (ChannelClosedException) {
+                Tracing.Log(Tracing.Debug, "NIC event channel closed.");
+            }
+            finally {
+                delete imp;
+            }
+        }
+
+
+        //
+        // IAdapter interface
+        //
+        string  IAdapter.DriverName
+        {
+            get { return this.driverName; }
+        }
+
+        string  IAdapter.DriverVersion
+        {
+            get { return this.driverVersion; }
+        }
+
+        uint IAdapter.LinkSpeed { get { return 100000000; } }
+
+        EthernetAddress IAdapter.HardwareAddress
+        {
+            get { return new EthernetAddress(this.macAddress); }
+        }
+
+        WaitHandle IAdapter.GetReadHandle()  { return readHandle;  }
+        WaitHandle IAdapter.GetWriteHandle() { return writeHandle; }
+
+        [Conditional("DEBUG_NIC")]
+        internal static void DebugPrint(string format, __arglist)
+        {
+            DebugStub.Print(format, new ArgIterator(__arglist));
+        }
+
+        private void RxExchangeInternal(NicDeviceContract.Imp! imp)
+        {
+            int toCount, fromCount;
+            PacketFifo*! in ExHeap exFifo = this.rxToDeviceFifo.Acquire();
+            toCount = exFifo->Count;
+            try {
+                imp.SendGiveRxPacketsToDevice(exFifo);
+                imp.RecvTakeRxPacketsFromDevice(out exFifo);
+                fromCount = exFifo->Count;
+
+                // Transfer packets received from the device
+                // to the fromDevice fifo.
+                PacketFifo*! in ExHeap fromDevice =
+                    this.rxFromDeviceFifo.Acquire();
+
+                try {
+                    while (exFifo->Count > 0) {
+                        fromDevice->Push(exFifo->Pop());
+                    }
+                }
+                finally {
+                    this.rxFromDeviceFifo.Release(fromDevice);
+                }
+            }
+            finally {
+                this.rxToDeviceFifo.Release(exFifo);
+            }
+            DebugPrint("RxExchange out: {0} in: {1}\n",
+                       __arglist(toCount, fromCount));
+        }
+
+        private void RxExchange()
+        {
+            NicDeviceContract.Imp imp = nicChannel.Acquire();
+            try {
+                RxExchangeInternal(imp);
+            }
+            finally {
+                this.nicChannel.Release(imp);
+            }
+        }
+
+        // Get the received packets from the adapter
+        void IAdapter.GetReceivedPackets(Queue! outQueue)
+        {
+            lock (this) {
+                // REVIEW: Should be able to make a decision about
+                // whether to RxExchange or not here.
+                RxExchange();
+
+                PacketFifo*! in ExHeap toDevice = this.rxToDeviceFifo.Acquire();
+                try {
+                    PacketFifo*! in ExHeap fromDevice = this.rxFromDeviceFifo.Acquire();
+                    try {
+                        while (rxFreePacketQueue.Count > 0 &&
+                               fromDevice->Count > 0) {
+                            // Take netstack packet from free queue
+                            NetPacket! netPacket =
+                                (NetPacket!)rxFreePacketQueue.Dequeue();
+
+                            // Take packet from the device
+                            Packet*! in ExHeap packet = fromDevice->Pop();
+
+                            // If packet from device has an error
+                            // recycle it right away, and try next
+                            // packet.  Careful not to lose the
+                            // packet from the rxFreePacketQueue!
+                            FromDeviceFlags fromFlags = packet->FromDeviceFlags;
+                            if ((fromFlags & FromDeviceFlags.ReceiveError) != 0) {
+                                packet->UnsetFragmentLengths();
+                                toDevice->Push(packet);
+                                rxFreePacketQueue.Enqueue(netPacket);
+                                continue;
+                            }
+
+                            // Copy data from device's packet into netstack's packet
+                            netPacket.Reset(packet->GetLength());
+                            packet->ToByteArray((!)netPacket.GetRawData());
+                            netPacket.AdapterContext = this;
+
+                            // Enqueue netstack's packet for upward processing
+                            outQueue.Enqueue(netPacket);
+
+                            // Reset packet from device and put in the queue
+                            // of return candidates.
+                            packet->UnsetFragmentLengths();
+                            toDevice->Push(packet);
+                        }
+                    }
+                    finally {
+                        this.rxFromDeviceFifo.Release(fromDevice);
+                    }
+                }
+                finally {
+                    this.rxToDeviceFifo.Release(toDevice);
+                }
+            }
+        }
+
+        // populate the adapter's receive ring with new NetPackets
+        void IAdapter.PopulateRxRing(NetPacket! freePacket)
+        {
+            lock (this) {
+                this.rxFreePacketQueue.Enqueue(freePacket);
+
+                bool sendPacketsToDevice = false;
+                PacketFifo*! in ExHeap toDevice = this.rxToDeviceFifo.Acquire();
+                try {
+                    sendPacketsToDevice = toDevice->Count > MaxRxPacketsInDevice / 2;
+                }
+                finally {
+                    this.rxToDeviceFifo.Release(toDevice);
+                }
+
+                if (sendPacketsToDevice) {
+                    RxExchange();
+                }
+            }
+        }
+
+        private void TxExchange()
+        {
+            int toCount = 0;
+            int fromCount = 0;
+            NicDeviceContract.Imp imp = nicChannel.Acquire();
+            try {
+                PacketFifo*! in ExHeap src = this.txToDeviceFifo.Acquire();
+                toCount = src->Count;
+                try {
+                    imp->SendGiveTxPacketsToDevice(src);
+                    imp->RecvTakeTxPacketsFromDevice(out src);
+                    fromCount = src->Count;
+                    PacketFifo*! in ExHeap dst =
+                        this.txFromDeviceFifo.Acquire();
+                    try {
+                        dst->Push(src);
+                    }
+                    finally {
+                        this.txFromDeviceFifo.Release(dst);
+                    }
+                }
+                finally {
+                    this.txToDeviceFifo.Release(src);
+                }
+            }
+            finally
+            {
+                nicChannel.Release(imp);
+            }
+            DebugPrint("TxExchange out: {0} in: {1}\n",
+                       __arglist(toCount, fromCount));
+        }
+
+        uint IAdapter.GetTransmittedPackets()
+        {
+            lock (this) {
+                TxExchange();
+
+                PacketFifo*! in ExHeap src = this.txFromDeviceFifo.Acquire();
+                int srcCount = src->Count;
+                try {
+                    PacketFifo*! in ExHeap dst = this.txFreeFifo.Acquire();
+                    try {
+                        dst->Push(src);
+                    }
+                    finally {
+                        this.txFreeFifo.Release(dst);
+                    }
+                }
+                finally {
+                    this.txFromDeviceFifo.Release(src);
+                }
+
+                return (uint) srcCount;
+            }
+        }
+
+        void IAdapter.PopulateTxRing(NetPacket[]! fromUser, uint count)
+        {
+            lock (this) {
+                PacketFifo*! in ExHeap txFree = this.txFreeFifo.Acquire();
+                try {
+                    PacketFifo*! in ExHeap txToDevice = this.txToDeviceFifo.Acquire();
+                    try {
+                        for (int i = 0; i < count; i++) {
+                            Packet*! in ExHeap packet = txFree->Pop();
+                            byte []! data = (!)((!)fromUser[i]).GetRawData();
+                            packet->SetFragment(0, data, 0, data.Length);
+                            txToDevice->Push(packet);
+                        }
+                    }
+                    finally {
+                        this.txToDeviceFifo.Release(txToDevice);
+                    }
+                }
+                finally {
+                    this.txFreeFifo.Release(txFree);
+                }
+
+                TxExchange();
+
+                // TODO: Recycle fromUser packets...
+                // Making work for the GC da...da...
+            }
+        }
+
+        int IAdapter.TxSlotsFree
+        {
+            get {
+                lock (this) {
+                    PacketFifo*! in ExHeap txFree = this.txFreeFifo.Acquire();
+                    try {
+                        return txFree->Count;
+                    }
+                    finally {
+                        this.txFreeFifo.Release(txFree);
+                    }
+                }
+            }
+        }
+
+        private bool
+        ConfigureEventChannel(NicDeviceContract.Imp:IO_CONFIGURE_BEGIN! nicImp)
+        {
+            NicDeviceEventContract.Imp! imp;
+            NicDeviceEventContract.Exp! exp;
+            NicDeviceEventContract.NewChannel(out imp, out exp);
+
+            nicImp.SendRegisterForEvents(exp);
+            switch receive {
+                case nicImp.Success():
+                    eventChannel =
+                        new TRef<NicDeviceEventContract.Imp:READY>(imp);
+                    return true;
+
+                case nicImp.ChannelClosed():
+                    Tracing.Log(Tracing.Error, "NIC channel closed");
+                    delete imp;
+                    break;
+            }
+            return false;
+        }
+
+        private bool
+        ConfigureChecksumProperties(NicDeviceContract.Imp! nicImp)
+        {
+            nicImp.SendSetChecksumProperties(0);
+            switch receive {
+                case nicImp.Success():
+                    return true;
+
+                case nicImp.UnsupportedChecksumProperties():
+                    Tracing.Log(Tracing.Error, "NIC refused checksum configuration it advertised");
+                    break;
+            }
+            return false;
+        }
+
+        private bool Configure()
+        {
+            NicDeviceContract.Imp! nicImp = nicChannel.Acquire();
+            try {
+                nicImp.SendConfigureIO();
+                nicImp.RecvAckConfigureIO();
+                if (ConfigureEventChannel(nicImp) == true &&
+                    ConfigureChecksumProperties(nicImp) == true) {
+                    return true;
+                }
+            }
+            catch (ChannelClosedException) {
+                Tracing.Log(Tracing.Error, "NIC channel closed.");
+            }
+            catch (SystemException e) {
+                Console.WriteLine(e);
+                DebugStub.Break();
+            }
+            finally {
+                nicChannel.Release(nicImp);
+            }
+            DebugStub.Break();
+            return false;
+        }
+
+        private void RxProvision()
+        {
+            PacketFifo*! in ExHeap toDevice = this.rxToDeviceFifo.Acquire();
+            for (int i = 0; i < toDevice->Capacity; i++) {
+                this.rxFreePacketQueue.Enqueue( new NetPacket(this.mtu) );
+                toDevice->Push(
+                    new [ExHeap] Packet(
+                        new [ExHeap] byte [this.mtu]
+                        )
+                    );
+            }
+            this.rxToDeviceFifo.Release(toDevice);
+        }
+
+        private void TxProvision()
+        {
+            PacketFifo*! in ExHeap txFree = this.txFreeFifo.Acquire();
+            for (int i = 0; i < txFree->Capacity; i++) {
+                txFree->Push(
+                    new [ExHeap] Packet(
+                        new [ExHeap] byte [this.mtu]
+                        )
+                    );
+            }
+            this.txFreeFifo.Release(txFree);
+        }
+
+        private bool StartIO()
+        {
+            NicDeviceContract.Imp imp = nicChannel.Acquire();
+            try {
+                if (imp.InState(NicDeviceContract.IO_CONFIGURED.Value) == true) {
+                    imp.SendStartIO();
+                    imp.RecvAckStartIO();
+                    RxExchangeInternal(imp);
+                    return true;
+                }
+            }
+            catch (ChannelClosedException) {
+            }
+            finally {
+                nicChannel.Release(imp);
+            }
+            DebugStub.Break();
+            return false;
+        }
+
+        private bool StopIO()
+        {
+            NicDeviceContract.Imp imp = nicChannel.Acquire();
+            try
+            {
+                if (imp.InState(NicDeviceContract.IO_RUNNING.Value) == true)
+                {
+                    imp.SendStopIO();
+                    imp.RecvAckStopIO();
+                    return true;
+                }
+            }
+            catch (ChannelClosedException)
+            {
+            }
+            finally
+            {
+                nicChannel.Release(imp);
+            }
+            return false;
+        }
+
+        //
+        // Factory methods
+        //
+        internal static NicDeviceProperties* in ExHeap
+        GetNicProperties(NicDeviceContract.Imp:READY! imp)
+        {
+            try {
+                NicDeviceProperties*! in ExHeap np =
+                    new [ExHeap] NicDeviceProperties();
+                imp.SendGetDeviceProperties(np);
+                imp.RecvDeviceProperties(out np);
+                return np;
+            }
+            catch (OutOfMemoryException) {
+                Tracing.Log(Tracing.Debug,
+                            "Out-of-memory getting NIC properties");
+                return null;
+            }
+            catch (ChannelClosedException) {
+                Tracing.Log(Tracing.Debug,
+                            "Channel closed while getting NIC properties");
+                return null;
+            }
+        }
+
+        internal static bool
+        CreateAndRegister([Claims] NicDeviceContract.Imp:Start! imp,
+                          string! nicName)
+        {
+            Nic nic = null;
+            try {
+                imp.RecvSuccess();
+                Tracing.Log(Tracing.Debug, "Nic channel transition");
+                Tracing.Log(Tracing.Debug, imp.CurrentState());
+
+                NicDeviceProperties* in ExHeap np = GetNicProperties(imp);
+                if (np == null) {
+                    delete imp;
+                    return false;
+                }
+
+                nic = new Nic(imp, np);
+                delete np;
+                if (nic.Configure() == false) {
+                    return false;
+                }
+
+                NetStack.Runtime.Core! ns = (!)NetStack.Runtime.Core.Instance();
+                ns.RegisterAdapter(nic, nicName, nic.MaxRxPackets);
+
+                Thread thread = new Thread(
+                    new ThreadStart(nic.ThreadMain)
+                    );
+                thread.Start();
+
+                return true;
+            }
+            catch {
+                delete imp;
+                DebugStub.Break();
+                return false;
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Nic/NicFactory.sg b/base/Services/NetStack/Channels.Nic/NicFactory.sg
new file mode 100644
index 0000000..29df05e
--- /dev/null
+++ b/base/Services/NetStack/Channels.Nic/NicFactory.sg
@@ -0,0 +1,71 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: NicManager.sg1
+//
+//  Note:
+//
+//  When a network device comes up, it registers with the
+//  NicManager, who places it in the namespace under
+//  /dev/nicX and advertises its existence with the netstack
+//  runtime core.  The netstack runtime core will be responsible
+//  for notifying the NicManager when the device has gone away.
+//
+
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.V1.Services;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Io.Net;
+using Microsoft.Singularity.Directory;
+
+using NetStack.Contracts;
+
+namespace NetStack.Channels.Nic
+{
+    public class NicFactory
+    {
+        private static void ProbeNic(DirectoryServiceContract.Imp! ns,
+                                     int number)
+        {
+            string! nicName = (!)String.Format("/dev/nic{0}", number);
+
+            NicDeviceContract.Imp! imp;
+            NicDeviceContract.Exp! exp;
+            NicDeviceContract.NewChannel(out imp, out exp);
+
+            Tracing.Log(Tracing.Debug, "Looking up {0}", nicName);
+            ErrorCode errorOut;
+            bool ok = SdsUtils.Bind(nicName, ns, exp, out errorOut);
+            if (!ok) {
+                delete imp;
+                Tracing.Log(Tracing.Debug, "Error! reason {0}",
+                            SdsUtils.ErrorCodeToString(errorOut));
+            }
+            else {
+                Tracing.Log(Tracing.Debug, "Found {0}", nicName);
+                Nic.CreateAndRegister(imp, nicName);
+                Tracing.Log(Tracing.Debug, "Done with {0}", nicName);
+            }
+        }
+
+        public static void Probe()
+        {
+            DirectoryServiceContract.Imp ns = DirectoryService.NewClientEndpoint();
+            try {
+                for (int i = 0; i < 10; i++) {
+                    ProbeNic(ns, i);
+                }
+            }
+            finally {
+                delete ns;
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/DNSExpConnection.sg b/base/Services/NetStack/Channels.Private/DNSExpConnection.sg
new file mode 100644
index 0000000..78d0792
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/DNSExpConnection.sg
@@ -0,0 +1,154 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DNSExpConnection.gs
+//  Note:   Provider-side helper for the DNS Channel Contract
+//
+
+using System;
+using System.Collections;
+using System.Net.IP;
+using System.Threading;
+
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+using NetStack.Contracts;
+using NetStack.Runtime;
+
+using Dns = NetStack.Protocols.Dns;
+
+namespace NetStack.Channels.Private
+{
+    public class DNSExpConnection
+    {
+        private TRef<DNSContract.Exp:ReadyState>! chanEP;
+        private IPModule! ip;
+
+        public void Run()
+        {
+            DNSContract.Exp! ep = chanEP.Acquire();
+
+            while(true) {
+                switch receive {
+                    case ep.AddNameServer(uint address) :
+                    {
+                        ip.HostConfiguration.AddNameServer(new IPv4(address));
+                        ep.SendAck();
+                    }
+                    break;
+
+                    case ep.RemoveNameServer(uint address) :
+                    {
+                        ip.HostConfiguration.DeleteNameServer(new IPv4(address));
+                        ep.SendAck();
+                    }
+                    break;
+
+                    case ep.RotateNameServers() :
+                    {
+                        ip.HostConfiguration.RotateNameServers();
+                        ep.SendAck();
+                    }
+                    break;
+
+                    case ep.GetCurrentNameServer() :
+                    { ep.SendAddress((uint)ip.HostConfiguration.GetCurrentNameServer()); }
+                    break;
+
+                    case ep.GetNameServers() :
+                    {
+                        ArrayList serverList = new ArrayList();
+                        IEnumerable servers = ip.HostConfiguration.NameServers();
+
+                        foreach(IPv4 server in servers)
+                        { serverList.Add((uint)server); }
+
+                        uint[] in ExHeap addresses = new [ExHeap] uint[serverList.Count];
+
+                        // ArrayList.CopyTo in this context ends up attempting
+                        // an unimplemented array-copying operation, so do the
+                        // copy by hand...
+                        for (int i = 0; i < serverList.Count; i++)
+                        { addresses[i] = (uint)(!)serverList[i]; }
+
+                        ep.SendAddressList(addresses);
+                    }
+                    break;
+
+                    case ep.Resolve(char[] in ExHeap repName) :
+                    {
+                        IPv4HostEntry hostEntry;
+                        BasicDnsClient client = new BasicDnsClient();
+                        string name = Bitter.ToString(repName);
+                        BasicDnsClient.StatusCode result = client.Resolve(name,
+                                                                          out hostEntry);
+                        delete repName; // Don't forget this!
+
+                        if (result != BasicDnsClient.StatusCode.Success) {
+                            ep.SendNotFound();
+                        }
+                        else {
+                            assert hostEntry != null;
+
+                            // Convert the alias strings
+                            char[][] in ExHeap aliases = new[ExHeap] char[hostEntry.Aliases.Length][];
+                            for (int i = 0; i < hostEntry.Aliases.Length; ++i) {
+                                expose (aliases[i]) {
+                                    delete aliases[i]; // checker doesn't know its null.
+                                    aliases[i] = Bitter.FromString(hostEntry.Aliases[i]); 
+                                }
+                            }
+
+                            // Convert the IP addresses
+                            IPv4[] addrs = hostEntry.AddressList;
+                            uint[] in ExHeap addrsAsUint = new[ExHeap] uint[addrs.Length];
+
+                            for (int i = 0; i < addrs.Length; ++i)
+                            { addrsAsUint[i] = (uint)addrs[i]; }
+
+                            ep.SendDNSResults(addrsAsUint, aliases);
+                        }
+                    }
+                    break;
+
+                    case ep.IsValidName(char[] in ExHeap name) :
+                    {
+                        bool isValid;
+                        if (name != null) {
+                            isValid = Dns.Format.IsSafeDnsName(Bitter.ToString2(name));
+                            delete name;
+                        }
+                        else {
+                            isValid = false;
+                        }
+                        ep.SendIsValid(isValid);
+                    }
+                    break;
+
+                    case unsatisfiable :
+                        delete ep;
+                        return; // Shut down our thread
+                    break;
+                }
+            }
+        }
+
+        public DNSExpConnection([Claims]DNSContract.Exp:ReadyState! ep)
+        {
+            chanEP = new TRef<DNSContract.Exp:ReadyState>(ep);
+            ip = (IPModule!)Core.Instance().GetProtocolByName("IP");
+            base();
+        }
+
+        public void Start()
+        {
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/DNSExpManager.sg b/base/Services/NetStack/Channels.Private/DNSExpManager.sg
new file mode 100644
index 0000000..fd1036b
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/DNSExpManager.sg
@@ -0,0 +1,99 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DNSExpManager.gs
+//  Note:   Provider-side helper for the IP Channel Contract
+//
+
+using System.Threading;
+using System.Net.IP;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+using System;
+
+namespace NetStack.Channels.Private
+{
+    public class DNSExpManager
+    {
+        public void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels. When we become a
+            // process, this will be present automatically,
+            // somehow.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(DNSContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the DNS module.\n");
+                        delete rejectedEP;
+                        delete nsExp;
+                        return;
+                        break;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            while(true) {
+                switch receive {
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people to give us DNSContract.Exp instances
+                            DNSContract.Exp newDnsEp = newEp as DNSContract.Exp;
+
+                            if (newDnsEp == null) {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newDnsEp.SendReady();
+
+                                // Spin up a new servicing thread
+                                DNSExpConnection newConn = new DNSExpConnection(newDnsEp);
+                                newConn.Start();
+                            }
+                        }
+                        break;
+
+                    case nsExp.ChannelClosed():
+                        // Exit this thread
+                        delete nsExp;
+                        return;
+                }
+            }
+        }
+
+        public void Start()
+        {
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+        }
+    }
+}
+
diff --git a/base/Services/NetStack/Channels.Private/IPExpManager.sg b/base/Services/NetStack/Channels.Private/IPExpManager.sg
new file mode 100644
index 0000000..7597fac
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/IPExpManager.sg
@@ -0,0 +1,313 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   IPExpManager.gs
+//  Note:   Provider-side helper for the IP Channel Contract
+//
+
+using NetStack.Common;
+using System;
+using System.Threading;
+using System.Net.IP;
+using Drivers.Net;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+
+namespace NetStack.Channels.Private
+{
+    public class IPExpManager
+    {
+        private IPModule! ip;
+
+        public void Run()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels. When we become a
+            // process, this will be present automatically,
+            // somehow.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(IPContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        DebugStub.Print("Registered the IP module as {0}\n",
+                                        __arglist(IPContract.ModuleName));
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the IP module.\n");
+                        delete rejectedEP;
+                        delete nsExp;
+                        return;
+                        break;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            // Here is the set of client channels we service
+            ESet<IPContract.Exp:ReadyState> epSet = new ESet<IPContract.Exp:ReadyState>();
+
+            while(true) {
+                switch receive {
+                    //
+                    // Don't forget that we're selecting IPContract endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.GetDomainName() in epSet :
+                    {
+                        ep.SendDomainName(Bitter.FromString2(ip.HostConfiguration.GetDomainName()));
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.SetDomainName(char[]! in ExHeap name) in epSet :
+                    {
+                        bool success = ip.HostConfiguration.SetDomainName(Bitter.ToString2(name));
+                        delete name;
+
+                        if (success)
+                        { ep.SendOK(); }
+                        else
+                        { ep.SendErr(); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.GetHostName() in epSet :
+                    {
+                        ep.SendHostName(Bitter.FromString2(ip.HostConfiguration.GetHostName()));
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.SetHostName(char[]! in ExHeap name) in epSet :
+                    {
+                        bool success = ip.HostConfiguration.SetHostName(Bitter.ToString2(name));
+                        delete name;
+
+                        if(success)
+                        { ep.SendOK(); }
+                        else
+                        { ep.SendErr(); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.StartDhcp(char[]! in ExHeap ifName) in epSet :
+                    {
+                        IAdapter intf = FindAdapter(Bitter.ToString(ifName));
+                        delete ifName;
+
+                        if (intf == null) {
+                            ep.SendInterfaceNotFound();
+                        }
+                        else {
+                            ip.HostConfiguration.StartDhcp(intf);
+                            ep.SendOK();
+                        }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.StopDhcp(char[]! in ExHeap ifName) in epSet :
+                    {
+                        IAdapter intf = FindAdapter(Bitter.ToString(ifName));
+                        delete ifName;
+
+                        if (intf == null) {
+                            ep.SendInterfaceNotFound();
+                        }
+                        else {
+                            ip.HostConfiguration.StopDhcp(intf);
+                            ep.SendOK();
+                        }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.IsRunningDhcp(char[]! in ExHeap ifName) in epSet :
+                    {
+                        IAdapter intf = FindAdapter(Bitter.ToString(ifName));
+                        delete ifName;
+
+                        if (intf == null)
+                        { ep.SendInterfaceNotFound(); }
+                        else
+                        { ep.SendRunning(ip.HostConfiguration.IsRunningDhcp(intf)); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.SetInterfaceState(char[]! in ExHeap ifName, uint addr, uint mask, uint gway) in epSet :
+                    {
+                        IAdapter intf = FindAdapter(Bitter.ToString(ifName));
+                        delete ifName;
+
+                        if (intf == null) {
+                            ep.SendInterfaceNotFound();
+                        }
+                        else {
+                            HostConfiguration h = ip.HostConfiguration;
+
+                            // Remove existing interface binding, if any
+                            h.Bindings.Flush(intf);
+
+                            InterfaceIPConfiguration ipconf =
+                                new InterfaceIPConfiguration(new IPv4(addr),
+                                                             new IPv4(mask),
+                                                             new IPv4(gway));
+
+                            if (h.Bindings.Add(intf, ipconf) == false)
+                            { ep.SendErr(); }
+                            else
+                            { ep.SendOK(); }
+                        }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.GetInterfaces() in epSet :
+                    {
+                        // Count the number of interfaces
+                        ICollection adapters = Core.Instance().GetAdapterInfoCollection();
+                        char[][] in ExHeap names = new[ExHeap] char[adapters.Count][];
+                        int i = 0;
+
+                        foreach(AdapterInfo! ai in adapters) {
+                            expose (names[i]) {
+                                delete names[i]; // checker does not know its null
+                                names[i] = Bitter.FromString(ai.DeviceName);
+                            }
+                            i++;
+                        }
+
+                        ep.SendInterfaceList(names);
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.GetInterfaceState(char[]! in ExHeap ifName) in epSet :
+                    {
+                        IAdapter intf = FindAdapter(Bitter.ToString(ifName));
+                        delete ifName;
+
+                        if (intf == null) {
+                            ep.SendInterfaceNotFound();
+                        }
+                        else {
+                            HostConfiguration h = ip.HostConfiguration;
+                            InterfaceInfo retval = new InterfaceInfo();
+
+                            // Copy the global interface info
+                            retval.driverName = Bitter.FromString(intf.DriverName);
+                            retval.driverVersion = Bitter.FromString(intf.DriverVersion);
+                            retval.hardwareAddress.Set(intf.HardwareAddress.GetAddressBytes());
+                            retval.linkSpeed = intf.LinkSpeed;
+
+                            // Copy all the IP config info
+                            ArrayList configs = h.Bindings.GetAdapterIPConfigurations(intf);
+                            InterfaceIPInfo[] in ExHeap ipConfigs = new[ExHeap] InterfaceIPInfo[configs.Count];
+                            int i = 0;
+
+                            foreach(InterfaceIPConfiguration! ipc in configs) {
+                                ipConfigs[i].address = (uint)ipc.Address;
+                                ipConfigs[i].netmask = (uint)ipc.NetMask;
+                                ipConfigs[i].gateway = (uint)ipc.Gateway;
+                                i++;
+                            }
+
+                            retval.ipConfigs = ipConfigs;
+                            ep.SendInterfaceState(retval);
+                        }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.IsLocalAddress(uint addr) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        bool isLocal = h.Bindings.IsLocalAddress(new IPv4(addr));
+                        ep.SendIsLocal(isLocal);
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.ChannelClosed() in epSet :
+                        delete ep;
+                        break;
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                    {
+                        // We expect people to give us TCPContract.Exp instances
+                        IPContract.Exp newIpEp = newEp as IPContract.Exp;
+
+                        if (newIpEp == null) {
+                            // Invalid contract type. Fail.
+                            nsExp.SendNackConnect(newEp);
+                        }
+                        else {
+                            // Signal ready and start servicing this contract
+                            nsExp.SendAckConnect();
+                            newIpEp.SendReady();
+                            epSet.Add(newIpEp);
+                        }
+                    }
+                    break;
+
+                    case nsExp.ChannelClosed():
+                        // Exit this thread
+                        epSet.Dispose();
+                        delete nsExp;
+                        return;
+                }
+            }
+        }
+
+        private IAdapter FindAdapter(string deviceName)
+        {
+            return Core.Instance().GetAdapterByDeviceName(deviceName);
+        }
+
+        public IPExpManager()
+        {
+            ip = (IPModule!)Core.Instance().GetProtocolByName("IP");
+            base();
+        }
+
+        public void Start()
+        {
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/NetStack.Channels.Private.csproj b/base/Services/NetStack/Channels.Private/NetStack.Channels.Private.csproj
new file mode 100644
index 0000000..8a4e6d4
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/NetStack.Channels.Private.csproj
@@ -0,0 +1,41 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Netstack.Channels.Private</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DNSExpManager.sg" />
+    <Compile Include="DNSExpConnection.sg" />
+    <Compile Include="IPExpManager.sg" />
+    <Compile Include="RoutingExpManager.sg" />
+    <Compile Include="TCPExpManager.sg" />
+    <Compile Include="TCPExpConnection.sg" />
+    <Compile Include="UDPExpManager.sg" />
+    <Compile Include="UDPExpConnection.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Drivers.Net\Drivers.Net.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="..\NetStackLib.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/NetStack/Channels.Private/RoutingExpManager.sg b/base/Services/NetStack/Channels.Private/RoutingExpManager.sg
new file mode 100644
index 0000000..dd56851
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/RoutingExpManager.sg
@@ -0,0 +1,269 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   RoutingExpManager.gs
+//  Note:   Provider-side helper for the Routing Channel Contract
+//
+
+using System.Threading;
+using Drivers.Net;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+using System.Net.IP;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+namespace NetStack.Channels.Private
+{
+    public class RoutingExpManager
+    {
+        private IPModule! ip;
+
+        public void Run()
+        {
+            ServiceProviderContract.Exp nsExp = Register();
+
+            if (nsExp == null) {
+                DebugStub.Print("Failed to register the routing module!");
+                return;
+            }
+
+            // Here is the set of client channels we service
+            ESet<RoutingContract.Exp:ReadyState> epSet = new ESet<RoutingContract.Exp:ReadyState>();
+
+            while(true) {
+                switch receive {
+                    //
+                    // Don't forget that we're selecting RoutingContract endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.GetRoutingTable() in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        NetStack.Contracts.RouteEntry[] in ExHeap retval =
+                            new[ExHeap] NetStack.Contracts.RouteEntry[h.RoutingTable.Count];
+                        int i = 0;
+
+                        foreach (NetStack.Runtime.RouteEntry! r in h.RoutingTable) {
+                            retval[i] = ConvertRouteEntry(r);
+                            i++;
+                        }
+
+                        ep.SendRoutingTable(retval);
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.AddRoute(Network dest, uint gateway, uint ifaddr) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        IPv4Network destination =
+                            new IPv4Network(new IPv4(dest.network),
+                                            new IPv4(dest.netmask));
+
+                        if (h.RoutingTable.AddRoute(
+                                new NetStack.Runtime.RouteEntry(destination,
+                                                                new IPv4(gateway),
+                                                                new IPv4(ifaddr))))
+                        {
+                            ep.SendOK();
+                        }
+                        else {
+                            ep.SendErr();
+                        }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.FindHostRoute(uint dest) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        NetStack.Runtime.RouteEntry re =
+                            h.RoutingTable.Lookup(new IPv4(dest));
+
+                        if (re != null)
+                        { ep.SendRoute(ConvertRouteEntry(re)); }
+                        else
+                        { ep.SendNoRouteFound(); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.FindNetRoute(Network dest) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        IPv4Network nwrk = ChannelUtils.ChannelNetworkToNetwork(dest);
+                        NetStack.Runtime.RouteEntry re =
+                            h.RoutingTable.Lookup(nwrk);
+
+                        if (re != null)
+                        { ep.SendRoute(ConvertRouteEntry(re)); }
+                        else
+                        { ep.SendNoRouteFound(); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.FindSpecificHostRoute(uint dest) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        NetStack.Runtime.RouteEntry re =
+                            h.RoutingTable.LookupSpecific(new IPv4(dest));
+
+                        if (re != null)
+                        { ep.SendRoute(ConvertRouteEntry(re)); }
+                        else
+                        { ep.SendNoRouteFound(); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.FindSpecificNetRoute(Network dest) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        IPv4Network nwrk = ChannelUtils.ChannelNetworkToNetwork(dest);
+                        NetStack.Runtime.RouteEntry re =
+                            h.RoutingTable.LookupSpecific(nwrk);
+
+                        if (re != null)
+                        { ep.SendRoute(ConvertRouteEntry(re)); }
+                        else
+                        { ep.SendNoRouteFound(); }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case ep.DeleteRoute(Network dest) in epSet :
+                    {
+                        HostConfiguration h = ip.HostConfiguration;
+                        IPv4Network destNet = ChannelUtils.ChannelNetworkToNetwork(dest);
+                        NetStack.Runtime.RouteEntry re =
+                            h.RoutingTable.LookupSpecific(destNet);
+
+                        if (re == null) {
+                            ep.SendNoRouteFound();
+                        }
+                        else {
+                            h.RoutingTable.DeleteRoute(re);
+                            ep.SendOK();
+                        }
+
+                        epSet.Add(ep);
+                    }
+                    break;
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                    {
+                        // We expect people top give us RoutingContract.Exp instances
+                        //RoutingContract.Exp:Start newTcpEp = newEp as RoutingContract.Exp;
+                        RoutingContract.Exp newTcpEp = newEp as RoutingContract.Exp;
+
+                        if (newTcpEp == null) {
+                            // Invalid contract type. Fail.
+                            nsExp.SendNackConnect(newEp);
+                        }
+                        else {
+                            // Signal ready and start servicing this contract
+                            nsExp.SendAckConnect();
+                            newTcpEp.SendReady();
+                            epSet.Add(newTcpEp);
+                        }
+                    }
+                    break;
+
+                    case ep.ChannelClosed() in epSet :
+                        delete ep;
+                        break;
+
+                    case nsExp.ChannelClosed():
+                        // Exit this thread
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                        break;
+                }
+            }
+        }
+
+        private ServiceProviderContract.Exp Register()
+        {
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels. When we become a
+            // process, this will be present automatically,
+            // somehow.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(RoutingContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        return nsExp;
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        delete rejectedEP;
+                        delete nsExp;
+                        return null;
+                        break;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+        }
+
+        private NetStack.Contracts.RouteEntry ConvertRouteEntry(NetStack.Runtime.RouteEntry! r)
+        {
+            // Copy the contents of each RouteEntry into the
+            // channel structure
+            NetStack.Contracts.RouteEntry retval = new NetStack.Contracts.RouteEntry();
+
+            retval.network = new NetStack.Contracts.Network();
+            retval.network.network = (uint)r.Network.Network;
+            retval.network.netmask = (uint)r.Network.NetMask;
+
+            retval.gateway = (uint)r.Gateway;
+            retval.ifaddr = (uint)r.InterfaceAddress;
+            retval.metric = r.Metric;
+            retval.tag = r.Tag;
+
+            return retval;
+        }
+
+        public RoutingExpManager()
+        {
+            ip = (IPModule!)Core.Instance().GetProtocolByName("IP");
+        }
+
+        public void Start()
+        {
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/TCPExpConnection.sg b/base/Services/NetStack/Channels.Private/TCPExpConnection.sg
new file mode 100644
index 0000000..46520a2
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/TCPExpConnection.sg
@@ -0,0 +1,281 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpConnectionExpThread.sg
+//  Note:   Provider-side helper for the IP Channel Contract
+//
+
+using System.Threading;
+using System.Net.IP;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+using System;
+
+namespace NetStack.Channels.Private
+{
+    public class TcpConnectionExpThread
+    {
+        private TRef<TcpConnectionContract.Exp:ReadyState>! chanEP;
+        private TcpSession! session;
+
+        public void Run()
+        {
+            try {
+                RunInternal();
+            }
+            finally {
+                // This breaks the
+                // NetStack's abstraction - we should be calling
+                // a new Core method to recycle the session
+                TcpSessionPool.Recycle(session);
+            }
+        }
+
+        private void RunInternal()
+        {
+            TcpConnectionContract.Exp! ep = chanEP.Acquire();
+
+            while(true) {
+                switch receive {
+                    //
+                    // ======================= Start state =======================
+                    //
+                    case ep.Connect(uint dstIP, ushort dstPort) :
+                    {
+                        TcpError error;
+                        bool success = session.Connect(new IPv4(dstIP), dstPort, out error);
+
+                        if (success)
+                        { ep.SendOK(); }
+                        else
+                        { ep.SendCouldNotConnect(error); }
+                    }
+                    break;
+
+                    case ep.BindLocalEndPoint(uint localIP, ushort localPort) :
+                    {
+                        bool success = session.BindLocalEndPoint(new IPv4(localIP), localPort);
+
+                        if (success)
+                        { ep.SendOK(); }
+                        else
+                        { ep.SendInvalidEndPoint(); }
+                    }
+                    break;
+
+                    //
+                    // ======================= Bound state =======================
+                    //
+
+                    case ep.Listen(int backlog) :
+                    {
+                        bool success = session.Listen(backlog);
+
+                        if (success)
+                        { ep.SendOK(); }
+                        else
+                        { ep.SendCouldNotListen(); }
+                    }
+                    break;
+
+                    //
+                    // ======================= Listening state =======================
+                    //
+
+                    case ep.IsSessionAvailable() :
+                    { ep.SendSessionIsAvailable(session.GetNumWaitingListenSessions() > 0); }
+                    break;
+
+                    case ep.Accept(TcpConnectionContract.Exp:PreConnected! newEP) :
+                    {
+                        TcpSession newSession = (TcpSession)session.Accept();
+
+                        if (newSession != null) {
+                            // Transition the newEP to the Connected state
+                            newEP.SendReady();
+                            // Wrap it up in a new thread
+                            TcpConnectionExpThread newConnection = new TcpConnectionExpThread(newEP, newSession);
+                            newConnection.Start();
+                            ep.SendOK();
+                        }
+                        else {
+                            // This is not expected; Accept() is supposed
+                            // to block until there is a new, established
+                            // connection.
+                            delete newEP;
+                            throw new Exception("Unexpected null return value from TcpSession.Accept");
+                        }
+                    }
+                    break;
+
+                    //
+                    // ======================= Connected state =======================
+                    //
+
+                    case ep.Read() :
+                    {
+                        byte[] in ExHeap data = session.ReadData();
+
+                        if (data == null) {
+                            if (ep.InState(TcpConnectionContract.ReadResult.Value)) {
+                                if (session.ValidForWrite) {
+                                    ep.SendNoMoreData(); // -> SendOnly
+                                }
+                                else {
+                                    ep.SendConnectionClosed(); // -> Zombie
+                                }
+                            }
+                            else {
+                                // Must be in the ROReadResult state. Here, there is
+                                // no ConnectionClosed message.
+                                ep.SendNoMoreData(); // -> Zombie
+                            }
+                        }
+                        else {
+                            // Note the unfortunate data copy.
+                            ep.SendData(data);
+                        }
+                    }
+                    break;
+
+                    case ep.PollRead(int timeout) :
+                    {
+                        byte[] in ExHeap data = session.PollData(timeout);
+
+                        if (data == null) {
+                            if (ep.InState(TcpConnectionContract.PollReadResult.Value)) {
+                                if (session.ValidForRead) {
+                                    ep.SendNoData(); // Just no data for now. -> Connected
+                                }
+                                else if (session.ValidForWrite) {
+                                    ep.SendNoMoreData(); // Can't read anymore, but can write -> SendOnly
+                                }
+                                else {
+                                    ep.SendConnectionClosed(); // Can't read or write -> Zombie
+                                }
+                            }
+                            else {
+                                // Must be in the ROPollReadResult state. Here, there is
+                                // no ConnectionClised message.
+                                if (session.ValidForRead) {
+                                    ep.SendNoData(); // -> ReceiveOnly
+                                }
+                                else {
+                                    ep.SendNoMoreData(); // -> Zombie
+                                }
+                            }
+                        }
+                        else {
+                            ep.SendData(data);
+                        }
+                    }
+                    break;
+
+                    case ep.Write(byte[]! in ExHeap data) :
+                    {
+                        if (!session.ValidForWrite) {
+                            delete data;
+                            ep.SendCantSend(); // -> Zombie
+                        }
+                        else {
+                            int bytesToWrite = data.Length;
+                            int written = session.WriteData(data);
+
+                            if (written == -1) {
+                                // A -1 return value indicates the connection has been closed
+                                // underneath us while we were trying to write.
+                                ep.SendCantSend();
+                            }
+                            else if (written != bytesToWrite) {
+                                // This is unexpected; the current implementation always
+                                // blocks and writes as much data as is provided.
+                                throw new Exception("Unexpected partial write in TcpSession.WriteData");
+                            }
+                            else {
+                                ep.SendOK();
+                            }
+                        }
+                    }
+                    break;
+
+                    case ep.IsDataAvailable() :
+                    { ep.SendDataIsAvailable(session.IsDataAvailable()); }
+                    break;
+
+                    case ep.DoneSending() :
+                    { session.DoneSending(); }
+                    break;
+
+                    case ep.DoneReceiving() :
+                    { session.DoneReceiving(); }
+                    break;
+
+                    case ep.Abort() :
+                    { session.Abort(); }
+                    break;
+
+                    //
+                    // ======================= Messages from multiple states =======================
+                    //
+
+                    case ep.GetLocalAddress() :
+                    { ep.SendIPAddress((uint)session.LocalAddress); }
+                    break;
+
+                    case ep.GetLocalPort() :
+                    { ep.SendPort(session.LocalPort); }
+                    break;
+
+                    case ep.GetRemoteAddress() :
+                    { ep.SendIPAddress((uint)session.RemoteAddress); }
+                    break;
+
+                    case ep.GetRemotePort() :
+                    { ep.SendPort(session.RemotePort); }
+                    break;
+
+                    case ep.Close() :
+                    { session.Close(); }
+                    break;
+
+                    case unsatisfiable :
+                        session.Dispose();
+                        delete ep;
+                        // Exit this thread
+                        return;
+                        break;
+                }
+            }
+        }
+
+        
+        public TcpConnectionExpThread([Claims]TcpConnectionContract.Exp:ReadyState! ep)
+        {
+            chanEP = new TRef<TcpConnectionContract.Exp:ReadyState>(ep);
+            session = (!)((TcpSession)Core.Instance().CreateSession("TCP"));
+        }
+
+        private TcpConnectionExpThread([Claims]TcpConnectionContract.Exp:Connected! ep, TcpSession! newSession)
+        {
+            chanEP = new TRef<TcpConnectionContract.Exp:ReadyState>(ep);
+            session = (!)newSession;
+        }
+
+        public void Start()
+        {
+#if THREAD_POOL
+            Core.Instance().ThreadPool.QueueUserWorkItem(new ThreadStart(Run));
+#else
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+#endif
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/TCPExpManager.sg b/base/Services/NetStack/Channels.Private/TCPExpManager.sg
new file mode 100644
index 0000000..026d4a2
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/TCPExpManager.sg
@@ -0,0 +1,128 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TcpExpManager.sg
+//  Note:   Provider-side helper for the IP Channel Contract
+//
+
+using System.Threading;
+using System.Net.IP;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+using System;
+
+namespace NetStack.Channels.Private
+{
+    public class TcpExpManager
+    {
+        public void Run()
+        {
+            // Here is the set of client channels we service
+            ESet<TcpContract.Exp:ReadyState> epSet = new ESet<TcpContract.Exp:ReadyState>();
+
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels. When we become a
+            // process, this will be present automatically,
+            // somehow.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(TcpContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the Tcp module.\n");
+                        delete rejectedEP;
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            while(true) {
+                switch receive {
+                    //
+                    // Don't forget that we're selecting TcpContract endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.CreateTcpSession(TcpConnectionContract.Exp:Start! newEP) in epSet :
+                        {
+                            // Transition the endpoint to the ReadyState
+                            newEP.SendReady();
+                            // Create a dedicated thread to service this connection
+                            TcpConnectionExpThread tcpThread = new TcpConnectionExpThread(newEP);
+                            tcpThread.Start();
+                            ep.SendAck();
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people top give us TcpContract.Exp instances
+                            //TcpContract.Exp:Start newTcpEp = newEp as TcpContract.Exp;
+                            TcpContract.Exp newTcpEp = newEp as TcpContract.Exp;
+
+                            if (newTcpEp == null) {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else {
+                                // Signal ready and start servicing this contract
+                                nsExp.SendAckConnect();
+                                newTcpEp.SendReady();
+                                epSet.Add(newTcpEp);
+                            }
+                        }
+                        break;
+
+                    case ep.ChannelClosed() in epSet:
+                        delete ep;
+                        break;
+
+                    case nsExp.ChannelClosed():
+                        // Exit this thread
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                        break;
+                }
+            }
+        }
+
+        public void Start()
+        {
+#if THREAD_POOL
+            Core.Instance().ThreadPool.QueueUserWorkItem(new ThreadStart(Run));
+#else
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+#endif
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/UDPExpConnection.sg b/base/Services/NetStack/Channels.Private/UDPExpConnection.sg
new file mode 100644
index 0000000..b3d3e1c
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/UDPExpConnection.sg
@@ -0,0 +1,222 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpExpConnection.sg
+//
+//  Note:   Provider-side helper for the Udp Channel Contract
+//
+
+// #define DEBUG_UDPEXPCONNECTION
+
+using System.Threading;
+using System.Net.IP;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+using System;
+
+namespace NetStack.Channels.Private
+{
+    public class UdpConnectionExpThread
+    {
+        private TRef<UdpConnectionContract.Exp:Start>! chanEP;
+        private UdpSession! session;
+
+        [ System.Diagnostics.Conditional("DEBUG_UDPEXPCONNECTION") ]
+        static void DebugPrint(string format, params object [] args)
+        {
+            DebugStub.Print(
+                "UdpConnectionExpThread [{0}]: {1}",
+                __arglist(
+                    Thread.CurrentThread.GetThreadId(),
+                    string.Format(format, args)
+                    )
+                );
+        }
+
+        public void Run()
+        {
+            UdpConnectionContract.Exp! ep = chanEP.Acquire();
+
+            while(true) {
+                switch receive {
+                    case ep.BindLocalEndPoint(uint srcIP, ushort srcPort) :
+                    {
+                        DebugPrint("BindLocalEndPoint ({0:x8}/{1} ->)\n",
+                                   srcIP, srcPort);
+                        IPv4 srcAddr = new IPv4(srcIP);
+                        if (srcAddr != IPv4.Any &&
+                            session.IsLocalAddress(srcAddr) == false) {
+                            ep.SendInvalidEndPoint(srcIP, srcPort);
+                        }
+                        else {
+                            session.BindLocalEndPoint(srcAddr, srcPort);
+                            ep.SendOK();
+                        }
+                    }
+                    break;
+
+                    case ep.ConnectWithAnyLocalEndPoint(uint   dstIP,
+                                                        ushort dstPort) :
+                    {
+                        DebugPrint(
+                            "ConnectWithAnyLocalEndPoint (-> {0:x8}/{1})\n",
+                            dstIP, dstPort
+                            );
+
+                        session.BindRemoteEndPoint(new IPv4(dstIP), dstPort);
+                        ep.SendOK();
+                    }
+                    break;
+
+                    case ep.Connect(uint srcIP, ushort srcPort,
+                                    uint dstIP, ushort dstPort) :
+                    {
+                        DebugPrint(
+                            "BindLocalEndPoint ({0:x8}/{1} -> {2:x8}/{3})\n",
+                            srcIP, srcPort, dstIP, dstPort
+                            );
+
+                        session.BindEndPoints(new IPv4(srcIP), srcPort,
+                                              new IPv4(dstIP), dstPort);
+                        ep.SendOK();
+                    }
+                    break;
+
+                    case ep.PollSelectRead(int millis) :
+                    {
+                        if (ep.InState(UdpConnectionContract.Start.Value)) {
+                            ep.SendPollSelectResult(false);
+                        }
+                        else {
+                            bool result = session.PollSelectRead(millis);
+                            ep.SendPollSelectResult(result);
+                        }
+                    }
+                    break;
+
+                    case ep.PollSelectWrite(int millis) :
+                    {
+                        bool result = session.PollSelectWrite(millis);
+                        ep.SendPollSelectResult(result);
+                    }
+                    break;
+
+                    case ep.Read() :
+                    {
+                        byte[] in ExHeap data = session.ReadData();
+
+                        // Currently, there is no way of
+                        // detecting that the connection has
+                        // been closed underneath us. We should
+                        // fix that.
+                        if (data == null) {
+                            ep.SendNoData();
+                        }
+                        else {
+                            ep.SendData(0, 0, data);
+                        }
+                    }
+                    break;
+
+                    case ep.PollRead(int timeoutMillis) :
+                    {
+                        byte[] in ExHeap data = session.PollData(timeoutMillis);
+                        // Currently, there is no way of
+                        // detecting that the connection has
+                        // been closed underneath us. We should
+                        // fix that.
+                        if (data == null) {
+                            ep.SendNoData();
+                        }
+                        else {
+                            ep.SendData(0, 0, data);
+                        }
+                    }
+                    break;
+
+                    case ep.Write(byte[]! in ExHeap data) :
+                    {
+                        DebugPrint("Write {0} bytes.\n", data.Length);
+                        if (session.WriteData(data) == data.Length) {
+                            ep.SendOK();
+                        }
+                        else {
+                            ep.SendDataTooLarge();
+                        }
+                        delete data;
+                    }
+                    break;
+
+                    case ep.WriteTo(uint dstIP, dstPort, byte[]! in ExHeap data) :
+                    {
+                        DebugPrint("WriteTo {0} bytes -> {1:x8}/{2}.\n",
+                                   data.Length, dstIP, dstPort);
+                        int written = session.WriteDataTo(new IPv4(dstIP),
+                                                          dstPort, data);
+                        if (written == data.Length) {
+                            ep.SendOK();
+                        }
+                        else {
+                            ep.SendDataTooLarge();
+                        }
+                        delete data;
+                    }
+                    break;
+
+                    case ep.Close() :
+                        session.Close();
+                        break;
+
+                    case ep.GetLocalAddress() :
+                        ep.SendIPAddress((uint)session.LocalAddress);
+                        break;
+
+                    case ep.GetLocalPort() :
+                        ep.SendPort(session.LocalPort);
+                        break;
+
+                    case ep.GetRemoteAddress() :
+                        ep.SendIPAddress((uint)session.RemoteAddress);
+                        break;
+
+                    case ep.GetRemotePort() :
+                        ep.SendPort(session.RemotePort);
+                        break;
+
+                    case unsatisfiable :
+                        // Exit this thread
+                        session.Dispose();
+                        delete ep;
+                        return;
+                        break;
+                }
+            }
+        }
+
+        public UdpConnectionExpThread([Claims]UdpConnectionContract.Exp:Start! ep)
+        {
+            chanEP = new TRef<UdpConnectionContract.Exp:Start>(ep);
+            session = (UdpSession!)Core.Instance().CreateSession("UDP");
+        }
+
+        private UdpConnectionExpThread([Claims]UdpConnectionContract.Exp:Connected! ep,
+                                       UdpSession! newSession)
+        {
+            chanEP = new TRef<UdpConnectionContract.Exp:Start>(ep);
+            this.session = newSession;
+        }
+
+        public void Start()
+        {
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Channels.Private/UDPExpManager.sg b/base/Services/NetStack/Channels.Private/UDPExpManager.sg
new file mode 100644
index 0000000..d97ac69
--- /dev/null
+++ b/base/Services/NetStack/Channels.Private/UDPExpManager.sg
@@ -0,0 +1,128 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpExpManager.sg
+//
+//  Note:   Provider-side helper for the IP Channel Contract
+//
+
+using System.Threading;
+using System.Net.IP;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Runtime;
+using System.Collections;
+using System;
+
+namespace NetStack.Channels.Private
+{
+    public class UdpExpManager
+    {
+        public void Run()
+        {
+            // Here is the set of client channels we service
+            ESet<UdpContract.Exp:ReadyState> epSet = new ESet<UdpContract.Exp:ReadyState>();
+
+            // Here is the channel we use to communicate with
+            // the NameServer
+            ServiceProviderContract.Imp! nsImp;
+            ServiceProviderContract.Exp! nsExp;
+            ServiceProviderContract.NewChannel(out nsImp, out nsExp);
+
+            // Here is our NameServer connection over which we
+            // receive new client channels. When we become a
+            // process, this will be present automatically,
+            // somehow.
+            DirectoryServiceContract.Imp epNS = DirectoryService.NewClientEndpoint();
+
+            try {
+                epNS.SendRegister(Bitter.FromString2(UdpContract.ModuleName), nsImp);
+
+                switch receive {
+                    case epNS.AckRegister() :
+                        // All is well.
+                        break;
+
+                    case epNS.NakRegister(ServiceProviderContract.Imp:Start rejectedEP, error) :
+                        // All is very much not well; abort.
+                        DebugStub.Print("Failed to register the Udp module.\n");
+                        delete rejectedEP;
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                        break;
+                }
+            }
+            finally {
+                delete epNS;
+            }
+
+            while(true) {
+                switch receive {
+                    //
+                    // Don't forget that we're selecting UdpContract endpoints
+                    // from the epSet endpoint-set. In each case that we
+                    // receive a message from one of those endpoints, we
+                    // need to remember to put the endpoint back into epSet
+                    // if we want to keep listening to it.
+                    //
+                    case ep.CreateUdpSession(UdpConnectionContract.Exp:Start! newEP) in epSet :
+                        {
+                            // Move the endpoint to the ReadyState
+                            newEP.SendReady();
+                            // Create a dedicated thread to service this connection
+                            UdpConnectionExpThread udpThread = new UdpConnectionExpThread(newEP);
+                            udpThread.Start();
+                            ep.SendAck();
+                            epSet.Add(ep);
+                        }
+                        break;
+
+                    case nsExp.Connect(ServiceContract.Exp:Start! newEp) :
+                        {
+                            // We expect people top give us
+                            // UdpContract.Exp instances
+                            // UdpContract.Exp:Start newUdpEp = newEp
+                            // as UdpContract.Exp;
+                            UdpContract.Exp newUdpEp = newEp as UdpContract.Exp;
+
+                            if (newUdpEp == null) {
+                                // Invalid contract type. Fail.
+                                nsExp.SendNackConnect(newEp);
+                            }
+                            else {
+                                // Signal ready and start
+                                // servicing this contract
+                                nsExp.SendAckConnect();
+                                newUdpEp.SendReady();
+                                epSet.Add(newUdpEp);
+                            }
+                        }
+                        break;
+
+                    case ep.ChannelClosed() in epSet :
+                        delete ep;
+                        break;
+
+                    case nsExp.ChannelClosed():
+                        // Exit this thread
+                        delete nsExp;
+                        epSet.Dispose();
+                        return;
+                }
+            }
+        }
+
+        public void Start()
+        {
+            Thread newThread = new Thread(new ThreadStart(Run));
+            newThread.Start();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Common/IAdapter.cs b/base/Services/NetStack/Common/IAdapter.cs
new file mode 100644
index 0000000..1514289
--- /dev/null
+++ b/base/Services/NetStack/Common/IAdapter.cs
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System;
+using System.Threading;
+using System.Collections;
+
+using Drivers.Net;
+
+namespace NetStack.Common
+{
+    // An Adapter interface, should exist in any environment
+    // can be implemented by a driver, simulator or whatever.
+    public interface IAdapter
+    {
+        string          DriverName      { get; }
+        string          DriverVersion   { get; }
+        EthernetAddress HardwareAddress { get; }
+        uint            LinkSpeed       { get; }
+
+        WaitHandle GetReadHandle();
+        WaitHandle GetWriteHandle();
+
+        // get the received packets from the adapter
+        void GetReceivedPackets(Queue! outQueue);
+
+        // called when received packet has been process and can
+        // be returned to the device.
+        void PopulateRxRing(NetPacket! packet);
+
+        // get the number of transmitted packets just completed transmission
+        uint GetTransmittedPackets();
+
+        // populate the adapter's transmit ring with new NetPackets
+        void PopulateTxRing(NetPacket[]! txPackets, uint txPacketCount);
+
+        // get the free space at the txRing
+        int TxSlotsFree { get; }
+    }
+} // namespace Drivers.Net
diff --git a/base/Services/NetStack/Common/IBuffer.cs b/base/Services/NetStack/Common/IBuffer.cs
new file mode 100644
index 0000000..ccc7d66
--- /dev/null
+++ b/base/Services/NetStack/Common/IBuffer.cs
@@ -0,0 +1,36 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System.Collections;
+using System.Diagnostics;
+using System;
+
+using Drivers.Net;
+
+namespace NetStack.Common
+{
+    public interface IBuffer
+    {
+        int Available { get; }
+
+        bool Read8(out byte x);
+        bool ReadNet16(out ushort x);
+        bool ReadNet32(out uint x);
+        bool ReadNet64(out ulong x);
+        bool ReadBytes(byte []! buf, int index, int count);
+        bool ReadEthernetAddress(out EthernetAddress addr);
+        bool ReadZeroTerminatedString(out string s);
+
+        byte PeekAvailable(int offset);
+    }
+} // namespace Drivers.Net
diff --git a/base/Services/NetStack/Common/NetPacket.cs b/base/Services/NetStack/Common/NetPacket.cs
new file mode 100644
index 0000000..e89ccd9
--- /dev/null
+++ b/base/Services/NetStack/Common/NetPacket.cs
@@ -0,0 +1,164 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System.Collections;
+using System.Diagnostics;
+using System;
+using System.Compiler;
+
+using Drivers.Net;
+
+namespace NetStack.Common
+{
+    public class NetPacket : SimpleBuffer
+    {
+        public const int DefaultSize = 1514;
+
+        private static uint lastId;
+
+        private uint id;
+
+        // an overlapped context
+        protected object overlapContext;
+
+        // a target/source adapter context
+        protected object adapterContext;
+
+        protected object mux;
+
+        // the following are only used for Qos extension
+        protected int refCount;
+        protected object sessionContext;
+
+        // some ctors
+        public NetPacket(byte[]! buffer, int index, int count)
+            : base(buffer, index, count)
+        {
+            id = lastId++;
+        }
+
+        public NetPacket(byte[]! buffer) : base(buffer)
+        {
+            id = lastId++;
+        }
+
+        public NetPacket(int capacity) : base(capacity)
+        {
+            id = lastId++;
+        }
+
+        public NetPacket() : base(DefaultSize)
+        {
+            id = lastId++;
+        }
+
+        public uint Id { get { return id; } }
+
+        public object SessionContext
+        {
+            get { return sessionContext;  }
+            set { sessionContext = value; }
+        }
+
+        // get/set the context (IPHeader, cryptically enough!)
+        public object OverlapContext
+        {
+            get { return overlapContext; }
+            set { overlapContext=value; }
+        }
+
+        // get/set the context
+        public object AdapterContext
+        {
+            get { return adapterContext; }
+            set { adapterContext = value; }
+        }
+
+        // get/set the Multiplexer
+        public object Mux
+        {
+            get { return mux; }
+            set { mux = value; }
+        }
+
+        /// <summary>
+        /// should only copy the data from position to count
+        /// </summary>
+        public byte[] ToUser()
+        {
+            // Much to do here
+            byte[] toUser = new byte[Available];
+            Array.Copy(this.data, this.position, toUser, 0, Available);
+            return toUser;
+        }
+
+        public bool IsOneChunk
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Clips the remaining bytes (after the current position)
+        /// </summary>
+        /// <param name="remaining"></param>
+        public void Clip(int remaining)
+        {
+            this.count = this.position + remaining + 1;
+        }
+
+        /// <summary>
+        /// Clips the bytes outside the window
+        /// remaining counts the bytes after the headIndex
+        /// </summary>
+        public void Clip(int headIndex,int remaining)
+        {
+            Debug.Assert(this.count > headIndex + remaining);
+            this.position = headIndex;
+            this.count    = this.position + remaining + 1;
+        }
+
+        // reset the packet to the original clipping
+        public void Reset()
+        {
+            this.position       = 0;
+            this.sessionContext = null;
+            this.overlapContext = null;
+            this.mux = null;
+            this.adapterContext = null;
+        }
+
+        public void Reset(int newLength)
+        {
+            Reset();
+            this.count = newLength;
+        }
+
+        public byte [] GetRawData()
+        {
+            return this.data;
+        }
+
+        public bool IsFree()
+        {
+            return (System.Threading.Interlocked.Equals(refCount, 0));
+        }
+        public int AddRef()
+        {
+            return (System.Threading.Interlocked.Increment(ref refCount));
+        }
+        public int ReleaseRef()
+        {
+            return (System.Threading.Interlocked.Decrement(ref refCount));
+        }
+    } // class NetPacket
+} // namespace Drivers.Net
diff --git a/base/Services/NetStack/Common/SimpleBuffer.cs b/base/Services/NetStack/Common/SimpleBuffer.cs
new file mode 100644
index 0000000..fd3cb83
--- /dev/null
+++ b/base/Services/NetStack/Common/SimpleBuffer.cs
@@ -0,0 +1,177 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+using System;
+
+using Drivers.Net;
+
+namespace NetStack.Common
+{
+    // A simple implementation of IBuffer over a single array
+    public class SimpleBuffer : IBuffer
+    {
+        // State
+        protected byte [] data;
+        protected int position;
+        protected int count;
+
+        // IBuffer methods
+        public int Available
+        {
+            get { return count - position; }
+        }
+
+        public int Length
+        {
+            get { return count; }
+        }
+
+        public bool Read8(out byte x)
+        {
+            if (position + 1 > count)
+            {
+                x = 0;
+                return false;
+            }
+            x = data[position++];
+            return true;
+        }
+
+        public bool ReadNet16(out ushort x)
+        {
+            if (position + 2 > count)
+            {
+                x = 0;
+                return false;
+            }
+            x = NetworkBitConverter.ToUInt16(data, position);
+            position += 2;
+            return true;
+        }
+
+        public bool ReadNet32(out uint x)
+        {
+            if (position+4 > count)
+            {
+                x = 0;
+                return false;
+            }
+            x = NetworkBitConverter.ToUInt32(data, position);
+            position += 4;
+            return true;
+        }
+
+        public bool ReadNet64(out ulong x)
+        {
+            if (position + 8 > count)
+            {
+                x = 0;
+                return false;
+            }
+            x = NetworkBitConverter.ToUInt64(data, position);
+            position += 8;
+            return true;
+        }
+
+        public bool ReadBytes(byte []! buf, int at, int n)
+        {
+            if (position + n > count)
+                return false;
+
+            for(int i = 0; i < n; i++)
+                buf[at+i] = data[position++];
+            return true;
+        }
+
+        public bool ReadEthernetAddress(out EthernetAddress address)
+        {
+            try
+            {
+                address = EthernetAddress.ParseBytes(data, position);
+                position += EthernetAddress.Length;
+            }
+            catch (ArgumentException)
+            {
+                address = EthernetAddress.Zero;
+                return false;
+            }
+            return true;
+        }
+
+        public bool ReadZeroTerminatedString(out string s)
+        {
+            int  start = position;
+            byte b;
+
+            while (Read8(out b) != false)
+            {
+                if (b == 0)
+                {
+                    int  length = position - start;
+                    ASCIIEncoding ascii = new ASCIIEncoding();
+                    s = ascii.GetString(data, start, length);
+                    return true;
+                }
+            }
+
+            s = null;
+            position = start;
+            return false;
+        }
+
+        public byte PeekAvailable(int offset)
+        {
+            int x = position + offset;
+            if (x > count)
+                throw new IndexOutOfRangeException();
+            return this.data[x];
+        }
+
+        public int Position
+        {
+            get
+            {
+                return position;
+            }
+        }
+
+        public SimpleBuffer(int length)
+        {
+            this.count    = length;
+            this.position = 0;
+            this.data     = new byte[length];
+        }
+
+        public SimpleBuffer(byte []! buffer)
+            : this(buffer, 0, buffer.Length)
+        {
+        }
+
+        // count is the number of bytes in the buffer (not necessarily equal
+        // to buf.Length), count=the number of bytes from index (include) to the end
+        public SimpleBuffer(byte []! buffer, int start, int length)
+        {
+            this.position = start;
+            this.count    = start + length;
+            this.data     = buffer;
+
+            //this.position = 0;
+            //this.count    = length;
+            //this.data     = new byte[length];
+            //Array.Copy(buffer, start, this.data, 0, this.count);
+        }
+    } // SimpleBuffer
+} // namespace Drivers.Net
diff --git a/base/Services/NetStack/NetStack.sg b/base/Services/NetStack/NetStack.sg
new file mode 100644
index 0000000..81d3765
--- /dev/null
+++ b/base/Services/NetStack/NetStack.sg
@@ -0,0 +1,155 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NetStack.sg
+//
+//  Note:
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.Io;
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace NetStack
+{
+    using NetStack.Channels.Private;
+    using NetStack.Channels.Nic;
+
+    /// <summary>
+    /// The NetStack Application class is a single instance service running
+    /// on a host.  When it runs it attempts to register as /dev/netstack;
+    /// success indicates no other instances and it then initializes
+    /// the various NetStack subsystems.
+    /// </summary>
+    class NetStackApplication
+    {
+        private static string nsName = "/dev/netstack";
+
+        private static TRef<ServiceProviderContract.Exp:Start> nsChannel;
+
+        private static void ServiceProviderPump()
+        {
+            ServiceProviderContract.Exp exp = nsChannel.Acquire();
+            try
+            {
+                for (;;)
+                {
+                    switch receive {
+                    case exp.RecvConnect(serviceExp):
+                        exp.SendNackConnect(serviceExp);
+                        break;
+
+                    case exp.ChannelClosed():
+                        goto end;
+                    }
+                }
+                end: ;
+            }
+            finally
+            {
+                delete exp;
+            }
+        }
+
+        private static bool RegisterServiceProvider()
+        {
+            DirectoryServiceContract.Imp ns =
+                DirectoryService.NewClientEndpoint();
+
+            ServiceProviderContract.Imp! imp;
+            ServiceProviderContract.Exp! exp;
+            ServiceProviderContract.NewChannel(out imp, out exp);
+
+            try
+            {
+                ns.SendRegister(Bitter.FromString2(nsName), imp);
+                switch receive
+                {
+                    case ns.AckRegister():
+                        nsChannel =
+                            new TRef<ServiceProviderContract.Exp:Start>(exp);
+                        Thread t =
+                            new Thread(new ThreadStart(ServiceProviderPump));
+                        t.Start();
+                        return true;
+                        break;
+                    case ns.NakRegister(rejected, error):
+                        delete rejected;
+                        delete exp;
+                        break;
+                    case ns.ChannelClosed():
+                        delete exp;
+                        break;
+                    case unsatisfiable:
+                        DebugStub.Break();
+                        delete exp;
+                        break;
+                }
+                return false;
+            }
+            finally
+            {
+                delete ns;
+            }
+        }
+
+        public static void Start()
+        {
+            NetStack.Runtime.StaticConfiguration.Initialize();
+            NetStack.Runtime.StaticConfiguration.Start();
+
+            IPExpManager ipManager = new IPExpManager();
+            ipManager.Start();
+
+            DNSExpManager dnsManager = new DNSExpManager();
+            dnsManager.Start();
+
+            RoutingExpManager routingManager = new RoutingExpManager();
+            routingManager.Start();
+
+            TcpExpManager tcpManager = new TcpExpManager();
+            tcpManager.Start();
+
+            UdpExpManager udpManager = new UdpExpManager();
+            udpManager.Start();
+
+            NicFactory.Probe();
+        }
+
+        public static void Stop()
+        {
+            NetStack.Runtime.StaticConfiguration.Stop();
+        }
+
+        public static int Main(String [] args)
+        {
+            if (RegisterServiceProvider() == false)
+            {
+                Console.WriteLine("Could not start NetStack as it is already registered in namespace.");
+                return -1;
+            }
+
+#if false // Change this to true to enable GC accounting in the network stack.n
+            AppRuntime.EnableGCAccounting = true;
+            DebugStub.WriteLine("NetStack: Enabled GC Accounting");
+#endif
+
+            Start();
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/NetStack/NetStackLib.csproj b/base/Services/NetStack/NetStackLib.csproj
new file mode 100644
index 0000000..4e02ce8
--- /dev/null
+++ b/base/Services/NetStack/NetStackLib.csproj
@@ -0,0 +1,82 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>NetStackLib</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+
+    <!-- PROTOCOL_SOURCES -->
+    <Compile Include="Protocol\ARPFmt.cs" />
+    <Compile Include="Protocol\DhcpFmt.cs" />
+    <Compile Include="Protocol\DhcpOptions.cs" />
+    <Compile Include="Protocol\DnsFmt.cs" />
+    <Compile Include="Protocol\EtherFmt.cs" />
+    <Compile Include="Protocol\ICMPFmt.cs" />
+    <Compile Include="Protocol\IPFmt.cs" />
+    <Compile Include="Protocol\TCPFmt.cs" />
+    <Compile Include="Protocol\UDPFmt.cs" />
+
+
+    <!-- RUNTIME_SOURCES -->
+    <Compile Include="Runtime\AdapterInfo.cs" />
+    <Compile Include="Runtime\ARPModule.cs" />
+    <Compile Include="Runtime\Core.cs" />
+    <Compile Include="Runtime\DeMux.cs" />
+    <Compile Include="Runtime\DhcpClientFSM.cs" />
+    <Compile Include="Runtime\DhcpClient.cs" />
+    <Compile Include="Runtime\Dispatcher.cs" />
+    <Compile Include="Runtime\DnsClient.cs" />
+    <Compile Include="Runtime\HostConfiguration.cs" />
+    <Compile Include="Runtime\ICMPModule.cs" />
+    <Compile Include="Runtime\ICMPSession.cs" />
+    <Compile Include="Runtime\INetModule.cs" />
+    <Compile Include="Runtime\IPModule.cs" />
+    <Compile Include="Runtime\IProtocol.cs" />
+    <Compile Include="Runtime\Mux.cs" />
+    <Compile Include="Runtime\NetStatus.cs" />
+    <Compile Include="Runtime\PacketTypes.cs" />
+    <Compile Include="Runtime\ProtocolParams.cs" />
+    <Compile Include="Runtime\RoutingTable.cs" />
+    <Compile Include="Runtime\Session.cs" />
+    <Compile Include="Runtime\StaticConfiguration.cs" />
+    <Compile Include="Runtime\TCPFsm.cs" />
+    <Compile Include="Runtime\TCPModule.cs" />
+    <Compile Include="Runtime\TCPSession.cs" />
+    <Compile Include="Runtime\TCPSessionPool.cs" />
+    <Compile Include="Runtime\TimeOut.cs" />
+    <Compile Include="Runtime\Timers.cs" />
+    <Compile Include="Runtime\UDPModule.cs" />
+    <Compile Include="Runtime\UDPSession.cs" />
+
+
+    <!-- COMMON_SOURCES -->
+    <Compile Include="Common\IAdapter.cs" />
+    <Compile Include="Common\IBuffer.cs" />
+    <Compile Include="Common\NetPacket.cs" />
+    <Compile Include="Common\SimpleBuffer.cs" />
+
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Drivers.Net\Drivers.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />    
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/NetStack/NetStackService.csproj b/base/Services/NetStack/NetStackService.csproj
new file mode 100644
index 0000000..2c8a51c
--- /dev/null
+++ b/base/Services/NetStack/NetStackService.csproj
@@ -0,0 +1,38 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>NetStack</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="NetStack.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Io.Net.Contracts\Io.Net.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Drivers.Net\Drivers.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="NetStackLib.csproj" />
+    <ProjectReference Include="Channels.Nic\NetStack.Channels.Nic.csproj" />
+    <ProjectReference Include="Channels.Private\NetStack.Channels.Private.csproj" />
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Services/NetStack/Protocol/ARPFmt.cs b/base/Services/NetStack/Protocol/ARPFmt.cs
new file mode 100644
index 0000000..b899ecc
--- /dev/null
+++ b/base/Services/NetStack/Protocol/ARPFmt.cs
@@ -0,0 +1,234 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Protocols
+{
+    /**
+     * declarations of an ARP message, RFC 826
+     */
+    public class ArpFormat
+    {
+        // arp operations:
+        public enum Type
+        {
+            ARP_REQUEST  = 1,
+            ARP_REPLY    = 2
+        }
+
+        // ARP message size (for ethernet and IP only)
+        public const int Size = 28;
+
+        // methods:
+        public static int Write(byte []!        pkt,
+                                int             offset,
+                                EthernetAddress srchw,
+                                IPv4            srcip,
+                                Type            operation,
+                                EthernetAddress targethw,
+                                IPv4            targetip)
+        {
+            int o = offset;
+
+            pkt[o++] = 0x00; pkt[o++] = 0x01;  // hardware type = 0x0001
+            pkt[o++] = 0x08; pkt[o++] = 0x00;  // protocol type = 0x0800
+            pkt[o++] = 0x06; // hardware addr len (bytes)
+            pkt[o++] = 0x04; // protocol address len (bytes)
+            pkt[o++] = (byte) (((ushort)operation) >> 8);
+            pkt[o++] = (byte) (((ushort)operation) & 0xff);
+
+            srchw.CopyOut(pkt, o);
+            o += EthernetAddress.Length;
+
+            srcip.CopyOut(pkt, o);
+            o += IPv4.Length;
+
+            targethw.CopyOut(pkt, o);
+            o += EthernetAddress.Length;
+
+            targetip.CopyOut(pkt, o);
+            o += IPv4.Length;
+
+            return o;
+        }
+
+        // Parse "pkt" from "start" bytes in,
+        // and return the sender and target Ethernet addresses, and the
+        // sender and target IP addresses, along with the "opcode".
+        // These may be null if the packet wasn't an ARP for 6-byte Ethernet addresses.
+        // Returns the byte offset of the next layer's header.
+        public static bool Read(IBuffer!            buf,
+                                out Type            opcode,
+                                out EthernetAddress senderhw,
+                                out IPv4            senderip,
+                                out EthernetAddress targethw,
+                                out IPv4            targetip)
+        {
+            opcode   = Type.ARP_REQUEST;
+            senderhw = targethw = EthernetAddress.Zero;
+            senderip = targetip = IPv4.Zero;
+
+            // check hardware type == 0x0001 (Ethernet)
+            ushort hwtype;
+            if (buf.ReadNet16(out hwtype) == false || hwtype != 0x1)
+            {
+                return false;
+            }
+
+            // check protocol type == 0x0800 (IP)
+            ushort proto;
+            if (buf.ReadNet16(out proto) == false || proto != 0x0800)
+            {
+                return false;
+            }
+
+            // check hardware address len is 6 bytes
+
+            byte hwlen;
+            if (buf.Read8(out hwlen) == false || hwlen != 6)
+            {
+                return false;
+            }
+
+            // check IP address len is 4 bytes
+            byte prlen;
+            if (buf.Read8(out prlen) == false || prlen != 4)
+            {
+                return false;
+            }
+
+            // Read stuff
+            // operation code
+            ushort temp;
+            if (buf.ReadNet16(out temp) == false)
+            {
+                return false;
+            }
+            opcode = (Type)temp;
+
+            if (buf.ReadEthernetAddress(out senderhw) == false)
+            {
+                return false;
+            }
+
+            uint addr;
+            if (buf.ReadNet32(out addr) == false)
+            {
+                return false;
+            }
+            senderip = new IPv4(addr);
+
+            // target HW & IP
+            if (buf.ReadEthernetAddress(out targethw) == false)
+            {
+                return false;
+            }
+
+            if (buf.ReadNet32(out addr) == false)
+            {
+                return false;
+            }
+            targetip = new IPv4(addr);
+            return true;
+        }
+
+        // creates an arp reply using the received packet
+        // the packet must be an arp request
+        // the responder should pass its own IP and MAC address
+        // we assume that we have the same hw type
+        // (return offset_arp size)
+        public static int CreateArpReply(ref byte[]!     pkt,
+                                         IPv4            selfIP,
+                                         EthernetAddress selfMACAddr)
+        {
+            int offset = 14;           // arp message starts here.
+            int o      = offset;
+
+            // check we have enough packet
+            if (pkt.Length - offset < Size)
+                return offset;
+
+            // check hardware type == 0x0001 (Ethernet)
+            if (pkt[o++] != 0x00 || pkt[o++] != 0x01)
+                return offset;
+
+            // check protocol type == 0x0800 (IP)
+            if (pkt[o++] != 0x08 || pkt[o++] != 0x00)
+                return offset; // error
+
+            // check addresses len
+            if (pkt[o++] != 0x06)
+                return offset;
+
+            if (pkt[o++] != 0x04)
+                return offset;
+
+            // operation code
+            Type opcode = (Type)(((int)pkt[o++] << 8) | (int)pkt[o++]);
+
+            // we need a request message.
+            if (opcode != Type.ARP_REQUEST)
+                return offset;
+
+            // sender HW & IP
+            EthernetAddress senderhw = EthernetAddress.ParseBytes(pkt, o);
+            o += EthernetAddress.Length;
+
+            IPv4 senderIP = IPv4.ParseBytes(pkt, o);
+            o += IPv4.Length;
+
+            // target HW & IP
+            // EthernetAddress targethw = EthernetAddress.ParseBytes(pkt, o);
+            o += EthernetAddress.Length;
+
+            // IPv4 targetIP = IPv4.ParseBytes(pkt, o);
+            o += IPv4.Length;
+
+            // all is well, do our stuff...
+            // 1. set local hw address to arp's source ether address + fix dest addresses
+            // 2. set arp type = ARP_REPLY
+            // 3. set the destination's ethernet address to self
+            //    and target is the source of the request.
+
+            o = offset+6;  // opcode entry
+            pkt[o++] = (byte)(((ushort)Type.ARP_REPLY) >> 8);
+            pkt[o++] = (byte)Type.ARP_REPLY;
+
+            // set hw and IP address
+            selfMACAddr.CopyOut(pkt, o);
+            o += EthernetAddress.Length;
+
+            selfIP.CopyOut(pkt, o);
+            o += IPv4.Length;
+
+            // setup dest address to the requesting host address
+            senderhw.CopyOut(pkt, o);
+            o += EthernetAddress.Length;
+
+            senderIP.CopyOut(pkt, o);
+            o += IPv4.Length;
+
+            // set ethernet level addresses
+            Array.Copy(pkt, 6, pkt, 0, 6);  // src  -> dest
+            selfMACAddr.CopyOut(pkt, 6);    // self -> src
+
+            return offset + Size;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Protocol/DhcpFmt.cs b/base/Services/NetStack/Protocol/DhcpFmt.cs
new file mode 100644
index 0000000..0003ab9
--- /dev/null
+++ b/base/Services/NetStack/Protocol/DhcpFmt.cs
@@ -0,0 +1,394 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DhcpFmt.cs
+//
+//  Note: The key DHCP RFC is 2131.
+//
+
+using NetStack.Common;
+using System;
+using System.Collections;
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Protocols
+{
+    public class InvalidDhcpFormatException : SystemException
+    {
+        public InvalidDhcpFormatException(String message)
+            : base(message)
+        {
+        }
+
+        public InvalidDhcpFormatException(String message,
+                                          Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        public InvalidDhcpFormatException(String format, params object [] args)
+            : base (String.Format(format, args))
+        {
+        }
+    }
+
+    sealed public class DhcpFormat
+    {
+#region FormatFields
+        internal byte op;          // Message Type
+        internal byte htype;       // Hardware Type
+        internal byte hlen;        // Hardware Length
+        internal byte hops;        // Relay hops
+        internal uint xid;         // Transaction ID (host order)
+        internal ushort secs;      // Seconds since transaction start (host order)
+        internal ushort flags;     // Flags (host order)
+        internal uint ciaddr;      // Client IP if known (host order)
+        internal uint yiaddr;      // Your IP address (host order)
+        internal uint siaddr;      // Next Server address (host order)
+        internal uint giaddr;      // Relay agent IP address (host order)
+        internal byte []  chaddr;  // Client h/w address (16-bytes)
+        internal byte []! sname;   // Optional server name (64-bytes null term)
+        internal byte []  file;    // Boot file name (128-bytes null terminated)
+        internal uint cookie;      // Mandatory DHCP option
+        internal byte []  options; // Variable size
+#endregion // FormatFields
+
+        internal int     optionsUsedLength;
+
+        // Constants
+        public const int MinLength             = 240; // Min DHCP packet
+        public const int HardwareAddressLength = 16;  // chaddr fixed length
+        public const int ServerNameLength      = 64;  // sname fixed length
+        public const int BootFileLength        = 128; // file length
+        public const int MaxOptionsLength      = 512; // Really H/W dependent
+        private const byte EndMarker           = 255;
+        private const int EndMarkerLength      = 1;
+
+        internal const uint DhcpCookie         = 0x63825363; // DHCP Cookie
+
+        public const int ClientPort = 68;
+        public const int ServerPort = 67;
+
+        public enum BootType : byte
+        {
+            NotSpecified = 0,
+            Request  = 1,       // Client to Server Message
+            Reply    = 2        // Server to Client Message
+        }
+
+        public enum MessageType : byte
+        {
+            Discover = 1,
+            Offer    = 2,
+            Request  = 3,
+            Decline  = 4,
+            Ack      = 5,
+            Nak      = 6,
+            Release  = 7,
+            Inform   = 8
+        }
+
+        // http://www.iana.org/assignments/arp-parameters
+        public enum HType : byte
+        {
+            Ethernet             = 1,
+            ExperimentalEthernet = 2,
+            AX25                 = 3,
+            ProNET               = 4,
+            Chaos                = 5,
+            Serial               = 20,
+            IEEE1394_1995        = 24,
+            ARPSec               = 30,
+            IPSecTunnel          = 31,
+            Infiniband           = 32
+        }
+
+        public DhcpFormat(BootType bootType)
+        {
+            op      = (byte)bootType;
+            chaddr  = new byte[HardwareAddressLength];
+            sname   = new byte[ServerNameLength];
+            file    = new byte[BootFileLength];
+            cookie  = DhcpCookie;
+            options = new byte[MaxOptionsLength];
+            flags   = 0x8000;   // Request broadcast responses
+            optionsUsedLength = 0;
+
+            base();
+        }
+
+        public DhcpFormat(MessageType messageType)
+            : this(GetBootType(messageType))
+        {
+            AddOption(DhcpMessageType.Create((byte)messageType));
+        }
+
+        public int Size
+        {
+            get { return MinLength + optionsUsedLength + EndMarkerLength; }
+        }
+
+        public BootType BootMessageType
+        {
+            get { return (BootType)op; }
+        }
+
+        public IPv4 ClientIPAddress
+        {
+            get { return new IPv4(ciaddr); }
+            set { ciaddr = (uint)value; }
+        }
+
+        public IPv4 YourIPAddress
+        {
+            get { return new IPv4(yiaddr); }
+            set { yiaddr = (uint)value; }
+        }
+
+        public IPv4 NextServerIPAddress
+        {
+            get { return new IPv4(siaddr); }
+            set { siaddr = (uint)value; }
+        }
+
+        public IPv4 RelayAgentIPAddress
+        {
+            get { return new IPv4(giaddr); }
+            set { giaddr = (uint)value; }
+        }
+
+        public byte Hops
+        {
+            get { return hops; }
+            set { hops = value; }
+        }
+
+        public uint TransactionID
+        {
+            get { return xid;  }
+            set { xid = value; }
+        }
+
+        public ushort TransactionSeconds
+        {
+            get { return secs; }
+            set { secs = value; }
+        }
+
+        public ushort Flags
+        {
+            get { return flags; }
+            set { flags = value; }
+        }
+
+        public string! ServerName
+        {
+            get { return BytesToString(sname); }
+            set { StringToBytes(value, sname); }
+        }
+
+        public string! BootFile
+        {
+            get { return BytesToString(file); }
+            set { StringToBytes(value, file); }
+        }
+
+        public void SetHardwareAddress (EthernetAddress ea)
+        {
+            hlen   = 6;
+            htype  = (byte)HType.Ethernet;
+            chaddr = new byte[HardwareAddressLength];
+            ea.CopyOut(chaddr, 0);
+        }
+
+        public EthernetAddress GetHardwareAddress()
+        {
+            if (htype != (byte)HType.Ethernet)
+            {
+                // XXX Throw some nasty exception
+            }
+            return EthernetAddress.ParseBytes(chaddr, 0);
+        }
+
+        public SortedList! GetOptions()
+        {
+            return DhcpOptionParser.Parse(options, 0, this.optionsUsedLength);
+        }
+
+        public void AddOption(IDhcpOption! option)
+        {
+            int newLength = option.PayloadLength + 2 + optionsUsedLength;
+            if (newLength > this.options.Length)
+            {
+                newLength = (newLength + 64) & ~3;
+                byte [] newOptions = new byte [newLength];
+                this.options.CopyTo(newOptions, 0);
+                this.options = newOptions;
+            }
+            option.Pack(this.options, ref optionsUsedLength);
+        }
+
+        private static String! BytesToString(byte []! bytes)
+        {
+            // Poorman's StringBuilder
+            char[] chars = new char[bytes.Length];
+            int i;
+            for (i = 0; i < bytes.Length; i++)
+            {
+                if (bytes[i] == 0)
+                    break;
+                chars[i] = (char)bytes[i];
+            }
+            return new String(chars, 0, i);
+        }
+
+        private static void StringToBytes(string! from, byte []! to)
+        {
+            int end = Math.Min(from.Length, to.Length);
+            for (int i = 0; i < end; i++)
+            {
+                to[i] = (byte)from[i];
+            }
+            // Zero-terminate
+            if (end != to.Length)
+            {
+                to[end] = 0;
+            }
+        }
+
+        public static DhcpFormat! Parse(IBuffer! buffer)
+        {
+            DhcpFormat p = new DhcpFormat(BootType.NotSpecified);
+            p.optionsUsedLength = 0;
+
+            if (buffer.Available < DhcpFormat.MinLength)
+            {
+                throw new InvalidDhcpFormatException("Format less than minimum size");
+            }
+
+            buffer.Read8(out p.op);
+            if (p.op != (byte)BootType.Request &&
+                p.op != (byte)BootType.Reply)
+            {
+                throw new InvalidDhcpFormatException("Bad Type (op = {0})", p.op);
+            }
+
+            buffer.Read8(out p.htype);
+            // No check
+
+            buffer.Read8(out p.hlen);
+            if (p.hlen > HardwareAddressLength)
+            {
+                throw new InvalidDhcpFormatException("Bad address length (hlen {0})",
+                                            p.hlen);
+            }
+
+            buffer.Read8(out p.hops);
+            // No check
+
+            buffer.ReadNet32(out p.xid);
+            buffer.ReadNet16(out p.secs);
+            buffer.ReadNet16(out p.flags);
+            buffer.ReadNet32(out p.ciaddr);
+            buffer.ReadNet32(out p.yiaddr);
+            buffer.ReadNet32(out p.siaddr);
+            buffer.ReadNet32(out p.giaddr);
+
+            buffer.ReadBytes(p.chaddr, 0, HardwareAddressLength);
+            buffer.ReadBytes(p.sname, 0, ServerNameLength);
+            buffer.ReadBytes(p.file, 0, BootFileLength);
+
+            buffer.ReadNet32(out p.cookie);
+            if (p.cookie != DhcpCookie)
+            {
+                throw new InvalidDhcpFormatException("Bad cookie (0x{0x:x8})",
+                                                     p.cookie);
+            }
+
+            if (buffer.Available > p.options.Length)
+            {
+                p.options = new byte [buffer.Available];
+            }
+            p.optionsUsedLength = buffer.Available;
+            buffer.ReadBytes(p.options, 0, buffer.Available);
+
+            return p;
+        }
+
+        private static void Write(byte[]! buffer, ref int offset, byte value)
+        {
+            buffer[offset++] = value;
+        }
+
+        private static void Write(byte[]! buffer, ref int offset, ushort value)
+        {
+            buffer[offset++] = (byte)(value >> 8);
+            buffer[offset++] = (byte)(value);
+        }
+
+        private static void Write(byte[]! buffer, ref int offset, uint value)
+        {
+            buffer[offset++] = (byte)(value >> 24);
+            buffer[offset++] = (byte)(value >> 16);
+            buffer[offset++] = (byte)(value >> 8);
+            buffer[offset++] = (byte)(value);
+        }
+
+        private static void Write(byte[]!  buffer,
+                                  ref int  offset,
+                                  byte[]!  values,
+                                  int      valuesLength)
+        {
+            for (int i = 0; i < valuesLength; i++)
+            {
+                buffer[offset++] = values[i];
+            }
+        }
+
+        public int Write(byte[]! buffer, int offset)
+        {
+            Write(buffer, ref offset, this.op);
+            Write(buffer, ref offset, this.htype);
+            Write(buffer, ref offset, this.hlen);
+            Write(buffer, ref offset, this.hops);
+            Write(buffer, ref offset, this.xid);
+            Write(buffer, ref offset, this.secs);
+            Write(buffer, ref offset, this.flags);
+            Write(buffer, ref offset, this.ciaddr);
+            Write(buffer, ref offset, this.yiaddr);
+            Write(buffer, ref offset, this.siaddr);
+            Write(buffer, ref offset, this.giaddr);
+            Write(buffer, ref offset, this.chaddr, this.chaddr.Length);
+            Write(buffer, ref offset, this.sname, this.sname.Length);
+            Write(buffer, ref offset, this.file, this.file.Length);
+            Write(buffer, ref offset, this.cookie);
+
+            Write(buffer, ref offset, this.options, this.optionsUsedLength);
+            Write(buffer, ref offset, EndMarker);
+            return offset;
+        }
+
+        public static bool IsRequestMessage(MessageType m)
+        {
+            return (m == MessageType.Discover || m == MessageType.Request  ||
+                    m == MessageType.Decline  || m == MessageType.Release  ||
+                    m == MessageType.Inform);
+        }
+
+        public static bool IsResponseMessage(MessageType m)
+        {
+            return (m == MessageType.Offer || m == MessageType.Ack ||
+                    m == MessageType.Nak);
+        }
+
+        public static BootType GetBootType(MessageType m)
+        {
+            return IsRequestMessage(m) ? BootType.Request : BootType.Reply;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Protocol/DhcpOptions.cs b/base/Services/NetStack/Protocol/DhcpOptions.cs
new file mode 100644
index 0000000..db2ca0c
--- /dev/null
+++ b/base/Services/NetStack/Protocol/DhcpOptions.cs
@@ -0,0 +1,1467 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DhcpOptions.cs
+//
+//  Note: Partial RFC1533 implementation.
+//
+
+using NetStack.Common;
+using System;
+using System.Collections;
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Protocols
+{
+    public interface IDhcpOption
+    {
+        byte OptionCode { get; }
+        int  PayloadLength { get; }
+        int  Pack(byte[]! dstBuffer, ref int offset);
+    }
+
+    public class InvalidDhcpOptionLength : SystemException
+    {
+        public InvalidDhcpOptionLength()
+            : base()
+        {
+        }
+
+        public InvalidDhcpOptionLength(String message)
+            : base(message)
+        {
+        }
+
+        public InvalidDhcpOptionLength(String message,
+                                       Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        public InvalidDhcpOptionLength(String format, params object [] args)
+            : base (String.Format(format, args))
+        {
+        }
+    }
+
+    public class DhcpIPv4Option : IDhcpOption
+    {
+        private byte option;
+        private IPv4 address;
+
+        private const int payloadLength = 4;
+
+        public DhcpIPv4Option(byte option, IPv4 address)
+        {
+            this.option  = option;
+            this.address = address;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return payloadLength; }
+        }
+
+        public IPv4 Value
+        {
+            get { return address; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)payloadLength;
+            byte[] b = address.GetAddressBytes();
+            dstBuffer[offset++] = b[0];
+            dstBuffer[offset++] = b[1];
+            dstBuffer[offset++] = b[2];
+            dstBuffer[offset++] = b[3];
+            return payloadLength + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option,
+                                         byte length,
+                                         byte[]! srcBuffer,
+                                         int  offset)
+        {
+            if (length != payloadLength)
+            {
+                throw new InvalidDhcpOptionLength();
+            }
+            return new DhcpIPv4Option(option,
+                                      IPv4.ParseBytes(srcBuffer, offset));
+        }
+    }
+
+    public class DhcpMultiIPv4Option : IDhcpOption
+    {
+        private byte option;
+        private IPv4 []! addresses;
+
+        public DhcpMultiIPv4Option(byte option, IPv4 []! addresses)
+        {
+            this.option    = option;
+            this.addresses = addresses;
+            base();
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return addresses.Length * 4; }
+        }
+
+        public IPv4[]! Values
+        {
+            get { return addresses; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)(addresses.Length * 4);
+            foreach (IPv4 address in addresses)
+            {
+                address.CopyOut(dstBuffer, offset);
+                offset += IPv4.Length;
+            }
+            return addresses.Length * 4 + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            if ((length & 3) != 0)
+            {
+                throw new InvalidDhcpOptionLength();
+            }
+            IPv4 [] addresses = new IPv4 [length / 4];
+            for (int i = 0; i < addresses.Length; i++)
+            {
+                addresses[i]  = IPv4.ParseBytes(srcBuffer, offset);
+                offset       += IPv4.Length;
+            }
+            return new DhcpMultiIPv4Option(option, addresses);
+        }
+    }
+
+    public class DhcpByteOption : IDhcpOption
+    {
+        private byte value;
+        private byte option;
+
+        private const int payloadLength = 1;
+
+        public DhcpByteOption(byte option, byte value)
+        {
+            this.option = option;
+            this.value  = value;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return payloadLength; }
+        }
+
+        public byte Value
+        {
+            get { return value; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)payloadLength;
+            dstBuffer[offset++] = value;
+            return payloadLength + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            byte value  = srcBuffer[offset];
+            return new DhcpByteOption(option, value);
+        }
+    }
+
+    public class DhcpMultiByteOption : IDhcpOption
+    {
+        private byte option;
+        private byte [] values;
+
+        public DhcpMultiByteOption(byte option, byte [] values)
+        {
+            this.option = option;
+            this.values = values;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return values.Length; }
+        }
+
+        public byte[] Values
+        {
+            get { return values; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)values.Length;
+            foreach (byte value in this.values)
+            {
+                dstBuffer[offset++] = value;
+            }
+            return values.Length + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            byte [] values = new byte [length];
+            for (int i = 0; i < values.Length; i++)
+            {
+                values[i] = srcBuffer[offset++];
+            }
+            return new DhcpMultiByteOption(option, values);
+        }
+    }
+
+    public class DhcpStringOption : IDhcpOption
+    {
+        private byte option;
+        private char [] chars;
+
+        public DhcpStringOption(byte option, char [] chars)
+        {
+            this.option = option;
+            this.chars = chars;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return chars.Length; }
+        }
+
+        public string! Value
+        {
+            get { return new string(chars); }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)chars.Length;
+            foreach (char c in this.chars)
+            {
+                dstBuffer[offset++] = (byte)c;
+            }
+            // NB We do not zero-terminate string as options
+            // have a length field.  However, see some
+            // zero-terminated strings in the wild (???)
+            return chars.Length + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            int end;
+
+            for (end = offset; end < offset + length; end++)
+                if (srcBuffer[end] < 32)
+                    break;
+
+            char [] chars = new char [end - offset];
+            for (int i = 0; i < chars.Length; i++)
+            {
+                chars[i] = (char)srcBuffer[offset + i];
+            }
+            return new DhcpStringOption(option, chars);
+        }
+    }
+
+    public class DhcpWordOption : IDhcpOption
+    {
+        private byte option;
+        private ushort value;
+
+        private const int payloadLength = 2;
+
+        public DhcpWordOption(byte option, ushort value)
+        {
+            this.option = option;
+            this.value  = value;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return payloadLength; }
+        }
+
+        public ushort Value
+        {
+            get { return value; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)payloadLength;
+            dstBuffer[offset++] = (byte)(value >> 8);
+            dstBuffer[offset++] = (byte)value;
+            return payloadLength + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            if (length != payloadLength)
+            {
+                throw new InvalidDhcpOptionLength();
+            }
+            int value = ((int)srcBuffer[offset++]) << 8;
+            value    |= (int)srcBuffer[offset];
+            return new DhcpWordOption(option, (ushort)value);
+        }
+    }
+
+    public class DhcpMultiWordOption : IDhcpOption
+    {
+        private ushort[] values;
+        private byte option;
+
+        public DhcpMultiWordOption(byte option, ushort[] values)
+        {
+            this.option = option;
+            this.values = values;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return 2 * values.Length; }
+        }
+
+        public ushort[] Values
+        {
+            get { return values; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)(2 * values.Length);
+
+            foreach (ushort value in values)
+            {
+                dstBuffer[offset++] = (byte)(value >> 8);
+                dstBuffer[offset++] = (byte)value;
+            }
+            return 2 * values.Length + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            if ((length & 1) != 0)
+            {
+                throw new InvalidDhcpOptionLength();
+            }
+
+            ushort [] values = new ushort [length / 2];
+            for (int i = 0; i < values.Length; i++)
+            {
+                int tmp = ((int)srcBuffer[offset++]) << 8;
+                tmp    += (int)srcBuffer[offset++];
+                values[i] = (ushort)tmp;
+            }
+            return new DhcpMultiWordOption(option, values);
+        }
+    }
+
+    public class DhcpDWordOption : IDhcpOption
+    {
+        private byte option;
+        private uint value;
+
+        private const int payloadLength = 4;
+
+        public DhcpDWordOption(byte option, uint value)
+        {
+            this.option = option;
+            this.value  = value;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return payloadLength; }
+        }
+
+        public uint Value
+        {
+            get { return value; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)payloadLength;
+            dstBuffer[offset++] = (byte)(value >> 24);
+            dstBuffer[offset++] = (byte)(value >> 16);
+            dstBuffer[offset++] = (byte)(value >> 8);
+            dstBuffer[offset++] = (byte)value;
+            return payloadLength + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            if (length != 4)
+            {
+                throw new InvalidDhcpOptionLength();
+            }
+            int value = ((int)srcBuffer[offset++]) << 24;
+            value    |= ((int)srcBuffer[offset++]) << 16;
+            value    |= ((int)srcBuffer[offset++]) << 8;
+            value    |= ((int)srcBuffer[offset]);
+            return new DhcpDWordOption(option, (uint)value);
+        }
+    }
+
+    public class DhcpMultiDWordOption : IDhcpOption
+    {
+        private uint[] values;
+        private byte option;
+
+        public DhcpMultiDWordOption(byte option, uint[] values)
+        {
+            this.option = option;
+            this.values = values;
+        }
+
+        public byte OptionCode
+        {
+            get { return option; }
+        }
+
+        public int PayloadLength
+        {
+            get { return 4 * values.Length; }
+        }
+
+        public uint[] Values
+        {
+            get { return values; }
+        }
+
+        public int Pack(byte[]! dstBuffer, ref int offset)
+        {
+            dstBuffer[offset++] = option;
+            dstBuffer[offset++] = (byte)(4 * values.Length);
+
+            foreach (uint value in values)
+            {
+                dstBuffer[offset++] = (byte)(value >> 24);
+                dstBuffer[offset++] = (byte)(value >> 16);
+                dstBuffer[offset++] = (byte)(value >> 8);
+                dstBuffer[offset++] = (byte)value;
+            }
+            return 4 * values.Length + 2;
+        }
+
+        public static IDhcpOption! Parse(byte option, byte length,
+                                         byte[]! srcBuffer, int offset)
+        {
+            if ((length & 3) != 0)
+            {
+                throw new InvalidDhcpOptionLength();
+            }
+
+            uint [] values = new uint [length / 4];
+            for (int i = 0; i < values.Length; i++)
+            {
+                values[i]  = ((uint)srcBuffer[offset++]) << 24;
+                values[i] |= ((uint)srcBuffer[offset++]) << 16;
+                values[i] |= ((uint)srcBuffer[offset++]) << 8;
+                values[i] |= ((uint)srcBuffer[offset++]);
+            }
+            return new DhcpMultiDWordOption(option, values);
+        }
+    }
+
+    public delegate IDhcpOption! ParseDhcpOption(byte type,
+                                                 byte length,
+                                                 byte[]! srcBuffer,
+                                                 int offset);
+
+    public class DhcpOptionParser
+    {
+        static SortedList parsers;
+
+        internal class Parser
+        {
+            public string OptionName;
+            public ParseDhcpOption Parse;
+
+            public Parser(string optionName, ParseDhcpOption parseMethod)
+            {
+                this.OptionName = optionName;
+                this.Parse = parseMethod;
+            }
+        };
+
+        public static string GetOptionName(byte optionCode)
+        {
+            Parser parser = (Parser) parsers[optionCode];
+            if (parser != null)
+            {
+                return parser.OptionName;
+            }
+            return "Unknown";
+        }
+
+        public static SortedList! Parse(byte[]! data, int offset, int length)
+        {
+            const byte PadByte = 0;
+            const byte EndByte = 255;
+            SortedList dhcpOptions = new SortedList();
+
+            while (offset != length)
+            {
+                // skip padding
+                while (data[offset] == PadByte)
+                {
+                    offset++;
+                    if (offset == length)
+                    {
+                        goto finished_options;
+                    }
+                }
+
+                if (data[offset] == EndByte)
+                {
+                    break;
+                }
+
+                byte @opt   = data[offset++];
+                byte optlen = data[offset++];
+
+                if (optlen == 0)
+                {
+                    // Unknown, ignore
+                    continue;
+                }
+
+                if (optlen + offset > length)
+                {
+                    break;
+                }
+
+                // Remove any outstanding option with the same option number
+                // before adding option to list of those already parsed to
+                // prevent SortedList::Add from throwing ArgumentException
+                dhcpOptions.Remove(opt);
+                try
+                {
+                    Parser parser = (Parser) parsers[@opt];
+                    if (parser != null)
+                    {
+                        dhcpOptions.Add(
+                            opt, parser.Parse(@opt, optlen, data, offset)
+                            );
+                    }
+                    else
+                    {
+                        // For unknowns fall back to multi-byte parser
+                        dhcpOptions.Add(
+                            @opt, DhcpMultiByteOption.Parse(@opt, optlen,
+                                                            data, offset)
+                            );
+                    }
+                }
+                catch (InvalidDhcpOptionLength)
+                {
+                }
+                offset += optlen;
+            }
+          finished_options:
+            return dhcpOptions;
+        }
+
+        public static SortedList! Parse(IBuffer! buffer)
+        {
+            // This is an unnecessary copy
+            byte [] data = new byte [buffer.Available];
+            buffer.ReadBytes(data, 0, data.Length);
+            return Parse(data, 0, data.Length);
+        }
+
+        static DhcpOptionParser()
+        {
+            parsers     = new SortedList();
+#region GeneratedTable
+            parsers.Add(DhcpSubnetMask.OptionCode,
+                        new Parser("SubnetMask",
+                                   new ParseDhcpOption(DhcpIPv4Option.Parse)));
+            parsers.Add(DhcpTimeOffset.OptionCode,
+                        new Parser("TimeOffset",
+                                   new ParseDhcpOption(DhcpDWordOption.Parse)));
+            parsers.Add(DhcpRouter.OptionCode,
+                        new Parser("Router",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpTimeServer.OptionCode,
+                        new Parser("TimeServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpNameServer.OptionCode,
+                        new Parser("NameServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpDomainNameServer.OptionCode,
+                        new Parser("DomainNameServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpLogServer.OptionCode,
+                        new Parser("LogServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpCookieServer.OptionCode,
+                        new Parser("CookieServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpLprServer.OptionCode,
+                        new Parser("LprServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpImpressServer.OptionCode,
+                        new Parser("ImpressServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpResourceLocationServer.OptionCode,
+                        new Parser("ResourceLocationServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpHostName.OptionCode,
+                        new Parser("HostName",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpBootFileSize.OptionCode,
+                        new Parser("BootFileSize",
+                                   new ParseDhcpOption(DhcpWordOption.Parse)));
+            parsers.Add(DhcpMeritDumpFile.OptionCode,
+                        new Parser("MeritDumpFile",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpDomainName.OptionCode,
+                        new Parser("DomainName",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpSwapServer.OptionCode,
+                        new Parser("SwapServer",
+                                   new ParseDhcpOption(DhcpIPv4Option.Parse)));
+            parsers.Add(DhcpRootPath.OptionCode,
+                        new Parser("RootPath",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpExtensionsPath.OptionCode,
+                        new Parser("ExtensionsPath",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpIPForwarding.OptionCode,
+                        new Parser("IPForwarding",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpForwardRemoteSourceRoute.OptionCode,
+                        new Parser("ForwardRemoteSourceRoute",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpPolicyFilter.OptionCode,
+                        new Parser("PolicyFilter",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpMaximumDatagramReassembly.OptionCode,
+                        new Parser("MaximumDatagramReassembly",
+                                   new ParseDhcpOption(DhcpWordOption.Parse)));
+            parsers.Add(DhcpDefaultTtl.OptionCode,
+                        new Parser("DefaultTtl",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpPathMtuAgingTimeout.OptionCode,
+                        new Parser("PathMtuAgingTimeout",
+                                   new ParseDhcpOption(DhcpDWordOption.Parse)));
+            parsers.Add(DhcpPathMtuPlateauTable.OptionCode,
+                        new Parser("PathMtuPlateauTable",
+                                   new ParseDhcpOption(DhcpMultiWordOption.Parse)));
+            parsers.Add(DhcpInterfaceMtu.OptionCode,
+                        new Parser("InterfaceMtu",
+                                   new ParseDhcpOption(DhcpWordOption.Parse)));
+            parsers.Add(DhcpAllSubnetsLocal.OptionCode,
+                        new Parser("AllSubnetsLocal",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpBroadcastAddress.OptionCode,
+                        new Parser("BroadcastAddress",
+                                   new ParseDhcpOption(DhcpIPv4Option.Parse)));
+            parsers.Add(DhcpMaskDiscovery.OptionCode,
+                        new Parser("MaskDiscovery",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpMaskSupplier.OptionCode,
+                        new Parser("MaskSupplier",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpRouterDiscovery.OptionCode,
+                        new Parser("RouterDiscovery",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpRouterSolicitationAddress.OptionCode,
+                        new Parser("RouterSolicitationAddress",
+                                   new ParseDhcpOption(DhcpIPv4Option.Parse)));
+            parsers.Add(DhcpStaticRoutes.OptionCode,
+                        new Parser("StaticRoutes",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpTrailerEncapsulate.OptionCode,
+                        new Parser("TrailerEncapsulate",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpArpCacheTimeout.OptionCode,
+                        new Parser("ArpCacheTimeout",
+                                   new ParseDhcpOption(DhcpDWordOption.Parse)));
+            parsers.Add(DhcpEthernetEncapsulation.OptionCode,
+                        new Parser("EthernetEncapsulation",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpTcpDefaultTtl.OptionCode,
+                        new Parser("TcpDefaultTtl",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpTcpKeepalive.OptionCode,
+                        new Parser("TcpKeepalive",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpTcpKeepaliveGarbage.OptionCode,
+                        new Parser("TcpKeepaliveGarbage",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpNisDomain.OptionCode,
+                        new Parser("NisDomain",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpNisServers.OptionCode,
+                        new Parser("NisServers",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpNtpServers.OptionCode,
+                        new Parser("NtpServers",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpVendorSpecific.OptionCode,
+                        new Parser("VendorSpecific",
+                                   new ParseDhcpOption(DhcpMultiByteOption.Parse)));
+            parsers.Add(DhcpNetBiosNameServer.OptionCode,
+                        new Parser("NetBiosNameServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpNetBiosDistributionServer.OptionCode,
+                        new Parser("NetBiosDistributionServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpNetBiosType.OptionCode,
+                        new Parser("NetBiosType",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpNetBiosScope.OptionCode,
+                        new Parser("NetBiosScope",
+                                   new ParseDhcpOption(DhcpMultiDWordOption.Parse)));
+            parsers.Add(DhcpXWindowsFontServer.OptionCode,
+                        new Parser("XWindowsFontServer",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpXWindowsDisplayManager.OptionCode,
+                        new Parser("XWindowsDisplayManager",
+                                   new ParseDhcpOption(DhcpMultiIPv4Option.Parse)));
+            parsers.Add(DhcpRequestedIPAddress.OptionCode,
+                        new Parser("RequestedIPAddress",
+                                   new ParseDhcpOption(DhcpIPv4Option.Parse)));
+            parsers.Add(DhcpIPAddressLeaseTime.OptionCode,
+                        new Parser("IPAddressLeaseTime",
+                                   new ParseDhcpOption(DhcpDWordOption.Parse)));
+            parsers.Add(DhcpOverloadIndicator.OptionCode,
+                        new Parser("OverloadIndicator",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpMessageType.OptionCode,
+                        new Parser("MessageType",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+            parsers.Add(DhcpServerID.OptionCode,
+                        new Parser("ServerID",
+                                   new ParseDhcpOption(DhcpIPv4Option.Parse)));
+            parsers.Add(DhcpParameterRequest.OptionCode,
+                        new Parser("ParameterRequest",
+                                   new ParseDhcpOption(DhcpMultiByteOption.Parse)));
+            parsers.Add(DhcpMessage.OptionCode,
+                        new Parser("Message",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpMaximumMessageSize.OptionCode,
+                        new Parser("MaximumMessageSize",
+                                   new ParseDhcpOption(DhcpWordOption.Parse)));
+            parsers.Add(DhcpRenewalTime.OptionCode,
+                        new Parser("RenewalTime",
+                                   new ParseDhcpOption(DhcpDWordOption.Parse)));
+            parsers.Add(DhcpRebindingTime.OptionCode,
+                        new Parser("RebindingTime",
+                                   new ParseDhcpOption(DhcpDWordOption.Parse)));
+            parsers.Add(DhcpClassID.OptionCode,
+                        new Parser("ClassID",
+                                   new ParseDhcpOption(DhcpStringOption.Parse)));
+            parsers.Add(DhcpClientID.OptionCode,
+                        new Parser("ClientID",
+                                   new ParseDhcpOption(DhcpMultiByteOption.Parse)));
+            parsers.Add(DhcpAutoConfigure.OptionCode,
+                        new Parser("AutoConfigure",
+                                   new ParseDhcpOption(DhcpByteOption.Parse)));
+#endregion // GeneratedTable
+        }
+
+        private DhcpOptionParser()
+        {
+        }
+    }
+
+    //
+    // FOR THE FOLLOWING REGION EDIT THE CODE GENERATOR
+    // NOT THE GENERATED CODE...
+    //
+#region GeneratedClasses
+
+    public class DhcpSubnetMask
+    {
+        public const byte OptionCode = 1;
+
+        public static IDhcpOption! Create(IPv4 address)
+        {
+            return new DhcpIPv4Option(OptionCode, address);
+        }
+     }
+
+    public class DhcpTimeOffset
+    {
+        public const byte OptionCode = 2;
+
+        public static IDhcpOption! Create(uint value)
+        {
+            return new DhcpDWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpRouter
+    {
+        public const byte OptionCode = 3;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpTimeServer
+    {
+        public const byte OptionCode = 4;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpNameServer
+    {
+        public const byte OptionCode = 5;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpDomainNameServer
+    {
+        public const byte OptionCode = 6;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpLogServer
+    {
+        public const byte OptionCode = 7;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpCookieServer
+    {
+        public const byte OptionCode = 8;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpLprServer
+    {
+        public const byte OptionCode = 9;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpImpressServer
+    {
+        public const byte OptionCode = 10;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpResourceLocationServer
+    {
+        public const byte OptionCode = 11;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpHostName
+    {
+        public const byte OptionCode = 12;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpBootFileSize
+    {
+        public const byte OptionCode = 13;
+
+        public static IDhcpOption! Create(ushort value)
+        {
+            return new DhcpWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpMeritDumpFile
+    {
+        public const byte OptionCode = 14;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpDomainName
+    {
+        public const byte OptionCode = 15;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpSwapServer
+    {
+        public const byte OptionCode = 16;
+
+        public static IDhcpOption! Create(IPv4 address)
+        {
+            return new DhcpIPv4Option(OptionCode, address);
+        }
+     }
+
+    public class DhcpRootPath
+    {
+        public const byte OptionCode = 17;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpExtensionsPath
+    {
+        public const byte OptionCode = 18;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpIPForwarding
+    {
+        public const byte OptionCode = 19;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpForwardRemoteSourceRoute
+    {
+        public const byte OptionCode = 20;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpPolicyFilter
+    {
+        public const byte OptionCode = 21;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpMaximumDatagramReassembly
+    {
+        public const byte OptionCode = 22;
+
+        public static IDhcpOption! Create(ushort value)
+        {
+            return new DhcpWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpDefaultTtl
+    {
+        public const byte OptionCode = 23;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpPathMtuAgingTimeout
+    {
+        public const byte OptionCode = 24;
+
+        public static IDhcpOption! Create(uint value)
+        {
+            return new DhcpDWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpPathMtuPlateauTable
+    {
+        public const byte OptionCode = 25;
+
+        public static IDhcpOption! Create(ushort [] values)
+        {
+            return new DhcpMultiWordOption(OptionCode, values);
+        }
+     }
+
+    public class DhcpInterfaceMtu
+    {
+        public const byte OptionCode = 26;
+
+        public static IDhcpOption! Create(ushort value)
+        {
+            return new DhcpWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpAllSubnetsLocal
+    {
+        public const byte OptionCode = 27;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpBroadcastAddress
+    {
+        public const byte OptionCode = 28;
+
+        public static IDhcpOption! Create(IPv4 address)
+        {
+            return new DhcpIPv4Option(OptionCode, address);
+        }
+     }
+
+    public class DhcpMaskDiscovery
+    {
+        public const byte OptionCode = 29;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpMaskSupplier
+    {
+        public const byte OptionCode = 30;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpRouterDiscovery
+    {
+        public const byte OptionCode = 31;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpRouterSolicitationAddress
+    {
+        public const byte OptionCode = 32;
+
+        public static IDhcpOption! Create(IPv4 address)
+        {
+            return new DhcpIPv4Option(OptionCode, address);
+        }
+     }
+
+    public class DhcpStaticRoutes
+    {
+        public const byte OptionCode = 33;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpTrailerEncapsulate
+    {
+        public const byte OptionCode = 34;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpArpCacheTimeout
+    {
+        public const byte OptionCode = 35;
+
+        public static IDhcpOption! Create(uint value)
+        {
+            return new DhcpDWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpEthernetEncapsulation
+    {
+        public const byte OptionCode = 36;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpTcpDefaultTtl
+    {
+        public const byte OptionCode = 37;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpTcpKeepalive
+    {
+        public const byte OptionCode = 38;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpTcpKeepaliveGarbage
+    {
+        public const byte OptionCode = 39;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpNisDomain
+    {
+        public const byte OptionCode = 40;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpNisServers
+    {
+        public const byte OptionCode = 41;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpNtpServers
+    {
+        public const byte OptionCode = 42;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpVendorSpecific
+    {
+        public const byte OptionCode = 43;
+
+        public static IDhcpOption! Create(byte [] values)
+        {
+            return new DhcpMultiByteOption(OptionCode, values);
+        }
+     }
+
+    public class DhcpNetBiosNameServer
+    {
+        public const byte OptionCode = 44;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpNetBiosDistributionServer
+    {
+        public const byte OptionCode = 45;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpNetBiosType
+    {
+        public const byte OptionCode = 46;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpNetBiosScope
+    {
+        public const byte OptionCode = 47;
+
+        public static IDhcpOption! Create(uint [] values)
+        {
+            return new DhcpMultiDWordOption(OptionCode, values);
+        }
+     }
+
+    public class DhcpXWindowsFontServer
+    {
+        public const byte OptionCode = 48;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpXWindowsDisplayManager
+    {
+        public const byte OptionCode = 49;
+
+        public static IDhcpOption! Create(IPv4[]! addresses)
+        {
+            return new DhcpMultiIPv4Option(OptionCode, addresses);
+        }
+     }
+
+    public class DhcpRequestedIPAddress
+    {
+        public const byte OptionCode = 50;
+
+        public static IDhcpOption! Create(IPv4 address)
+        {
+            return new DhcpIPv4Option(OptionCode, address);
+        }
+     }
+
+    public class DhcpIPAddressLeaseTime
+    {
+        public const byte OptionCode = 51;
+
+        public static IDhcpOption! Create(uint value)
+        {
+            return new DhcpDWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpOverloadIndicator
+    {
+        public const byte OptionCode = 52;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpMessageType
+    {
+        public const byte OptionCode = 53;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpServerID
+    {
+        public const byte OptionCode = 54;
+
+        public static IDhcpOption! Create(IPv4 address)
+        {
+            return new DhcpIPv4Option(OptionCode, address);
+        }
+     }
+
+    public class DhcpParameterRequest
+    {
+        public const byte OptionCode = 55;
+
+        public static IDhcpOption! Create(byte [] values)
+        {
+            return new DhcpMultiByteOption(OptionCode, values);
+        }
+     }
+
+    public class DhcpMessage
+    {
+        public const byte OptionCode = 56;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpMaximumMessageSize
+    {
+        public const byte OptionCode = 57;
+
+        public static IDhcpOption! Create(ushort value)
+        {
+            return new DhcpWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpRenewalTime
+    {
+        public const byte OptionCode = 58;
+
+        public static IDhcpOption! Create(uint value)
+        {
+            return new DhcpDWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpRebindingTime
+    {
+        public const byte OptionCode = 59;
+
+        public static IDhcpOption! Create(uint value)
+        {
+            return new DhcpDWordOption(OptionCode, value);
+        }
+     }
+
+    public class DhcpClassID
+    {
+        public const byte OptionCode = 60;
+
+        public static IDhcpOption! Create(char [] chars)
+        {
+            return new DhcpStringOption(OptionCode, chars);
+        }
+     }
+
+    public class DhcpClientID
+    {
+        public const byte OptionCode = 61;
+
+        public static IDhcpOption! Create(byte [] values)
+        {
+            return new DhcpMultiByteOption(OptionCode, values);
+        }
+     }
+
+    public class DhcpAutoConfigure
+    {
+        public const byte OptionCode = 116;
+
+        public static IDhcpOption! Create(byte value)
+        {
+            return new DhcpByteOption(OptionCode, value);
+        }
+     }
+#endregion // GeneratedClasses
+}
diff --git a/base/Services/NetStack/Protocol/DhcpOptions.txt b/base/Services/NetStack/Protocol/DhcpOptions.txt
new file mode 100644
index 0000000..3adc147
--- /dev/null
+++ b/base/Services/NetStack/Protocol/DhcpOptions.txt
@@ -0,0 +1,126 @@
+###############################################################################
+#
+# Microsoft Research Singularity Project.
+#
+# Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+
+# This document contains a list of known DHCP options and is
+# used to generate appropriate classes in the C# DHCP
+# implementation.
+#
+# Sources for codes and interpretations is taken from:
+#      RFC 2132 DHCP Options and BOOTP Vendor Extensions
+#      S.Alexander and R.Droms, March 1997.
+#          http://www.ietf.org/rfc/rfc2132.txt?number=2132
+#
+#      IANA BOOTP and DHCP Parameters
+#          http://www.iana.org/assignments/bootp-dhcp-parameters
+#
+#
+# The format of the entries in this file is:
+#
+#       Column 1 Option Code
+#       Column 2 Option Name
+#       Column 3 Data type
+#
+# Valid data types are:   Byte       MultiByte
+#                         Word       MultiWord
+#                         DWord      MultiDWord
+#                         IPv4       MultiIPv4
+#                         String
+#
+
+# -----------------------------------------------------------------------------
+# Basic Options
+# -----------------------------------------------------------------------------
+1   SubnetMask                          IPv4
+2   TimeOffset                          DWord
+3   Router                              MultiIPv4
+4   TimeServer                          MultiIPv4
+5   NameServer                          MultiIPv4
+6   DomainNameServer                    MultiIPv4
+7   LogServer                           MultiIPv4
+8   CookieServer                        MultiIPv4
+9   LprServer                           MultiIPv4
+10  ImpressServer                       MultiIPv4
+11  ResourceLocationServer              MultiIPv4
+12  HostName                            String
+13  BootFileSize                        Word
+14  MeritDumpFile                       String
+15  DomainName                          String
+16  SwapServer                          IPv4
+17  RootPath                            String
+18  ExtensionsPath                      String
+
+# -----------------------------------------------------------------------------
+# IP Layer Parameters per Host
+# -----------------------------------------------------------------------------
+19  IPForwarding                        Byte
+20  ForwardRemoteSourceRoute            Byte
+21  PolicyFilter                        MultiIPv4
+22  MaximumDatagramReassembly           Word
+23  DefaultTtl                          Byte
+24  PathMtuAgingTimeout                 DWord
+25  PathMtuPlateauTable                 MultiWord
+
+# -----------------------------------------------------------------------------
+# IP Layer Parameters per Interface
+# -----------------------------------------------------------------------------
+26  InterfaceMtu                        Word
+27  AllSubnetsLocal                     Byte
+28  BroadcastAddress                    IPv4
+29  MaskDiscovery                       Byte
+30  MaskSupplier                        Byte
+31  RouterDiscovery                     Byte
+32  RouterSolicitationAddress           IPv4
+33  StaticRoutes                        MultiIPv4
+
+# -----------------------------------------------------------------------------
+# Link Layer Parameters per Interface
+# -----------------------------------------------------------------------------
+34  TrailerEncapsulate                  Byte
+35  ArpCacheTimeout                     DWord
+36  EthernetEncapsulation               Byte
+
+# -----------------------------------------------------------------------------
+# TCP Parameters
+# -----------------------------------------------------------------------------
+37 TcpDefaultTtl                        Byte
+38 TcpKeepalive                         Byte
+39 TcpKeepaliveGarbage                  Byte
+
+# -----------------------------------------------------------------------------
+# Application and Service Parameters
+# -----------------------------------------------------------------------------
+40 NisDomain                            String
+41 NisServers                           MultiIPv4
+42 NtpServers                           MultiIPv4
+43 VendorSpecific                       MultiByte
+44 NetBiosNameServer                    MultiIPv4
+45 NetBiosDistributionServer            MultiIPv4
+46 NetBiosType                          Byte
+47 NetBiosScope                         MultiDWord
+48 XWindowsFontServer                   MultiIPv4
+49 XWindowsDisplayManager               MultiIPv4
+
+# -----------------------------------------------------------------------------
+# DHCP Extensions
+# -----------------------------------------------------------------------------
+50 RequestedIPAddress                   IPv4
+51 IPAddressLeaseTime                   DWord
+52 OverloadIndicator                    Byte
+53 MessageType                          Byte
+54 ServerID                             IPv4
+55 ParameterRequest                     MultiByte
+56 Message                              String
+57 MaximumMessageSize                   Word
+58 RenewalTime                          DWord
+59 RebindingTime                        DWord
+60 ClassID                              String
+61 ClientID                             MultiByte
+
+116 AutoConfigure                       Byte
+
+###############################################################################
diff --git a/base/Services/NetStack/Protocol/DnsFmt.cs b/base/Services/NetStack/Protocol/DnsFmt.cs
new file mode 100644
index 0000000..06722c4
--- /dev/null
+++ b/base/Services/NetStack/Protocol/DnsFmt.cs
@@ -0,0 +1,916 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DnsFmt.cs
+//
+//  Note:
+//
+//      Constants taken from http://www.iana.org/assignments/dns-parameters
+//
+//  Caveat Emptor:
+//
+//      This implementation only supports message compression for messages
+//      received and not for outbound messages. (RFC1035 section 4.1.4)
+//
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+
+using Microsoft.Contracts;
+
+namespace NetStack.Protocols.Dns
+{
+    public enum Class : ushort
+    {
+        // 0 Reserved             // [IANA]
+        Internet = 1,             // [RFC1035]
+        // 2 Unassigned           // [IANA]
+        Chaos    = 3,             // [RFC1035]
+        Hesiod   = 4,             // [RFC1035]
+        // 5-253 Unassigned       // [IANA]
+        None     = 254,           // [RFC2136]
+        Any      = 255            // [RFC1035]
+        // 256-65534 Unassigned   // [IANA]
+        // 65535 Reserved         // [IANA]
+    }
+
+    public enum Type : ushort
+    {
+        A       = 1,    // a host address                          [RFC1035]
+        NS      = 2,    // an authoritative name server            [RFC1035]
+        MD      = 3,    // a mail destination (Obsolete - use MX)  [RFC1035]
+        MF      = 4,    // a mail forwarder (Obsolete - use MX)    [RFC1035]
+        CNAME   = 5,    // the canonical name for an alias         [RFC1035]
+        SOA     = 6,    // marks the start of a zone of authority  [RFC1035]
+        MB      = 7,    // a mailbox domain name (EXPERIMENTAL)    [RFC1035]
+        MG      = 8,    // a mail group member (EXPERIMENTAL)      [RFC1035]
+        MR      = 9,    // a mail rename domain name (EXPERIMENTAL)[RFC1035]
+        NULL    = 10,    // a null RR (EXPERIMENTAL)               [RFC1035]
+        WKS     = 11,    // a well known service description       [RFC1035]
+        PTR     = 12,    // a domain name pointer                  [RFC1035]
+        HINFO   = 13,    // host information                       [RFC1035]
+        MINFO   = 14,    // mailbox or mail list information       [RFC1035]
+        MX      = 15,    // mail exchange                          [RFC1035]
+        TXT     = 16,    // text strings                           [RFC1035]
+        RP      = 17,    // for Responsible Person                 [RFC1183]
+        AFSDB   = 18,    // for AFS Data Base location             [RFC1183]
+        X25     = 19,    // for X.25 PSDN address                  [RFC1183]
+        ISDN    = 20,    // for ISDN address                       [RFC1183]
+        RT      = 21,    // for Route Through                      [RFC1183]
+        NSAP    = 22,    // for NSAP address, NSAP style A record  [RFC1706]
+        NSAPPTR = 23,
+        SIG     = 24,    // for security signature                 [RFC2931]
+        KEY     = 25,    // for security key                       [RFC2535]
+        PX      = 26,    // X.400 mail mapping information         [RFC2163]
+        GPOS    = 27,    // Geographical Position                  [RFC1712]
+        AAAA    = 28,    // IP6 Address                            [Thomson]
+        LOC     = 29,    // Location Information                   [Vixie]
+        NXT     = 30,    // Next Domain - OBSOLETE        [RFC2535, RFC3755]
+        EID     = 31,    // Endpoint Identifier                    [Patton]
+        NIMLOC  = 32,    // Nimrod Locator                         [Patton]
+        SRV     = 33,    // Server Selection                       [RFC2782]
+        ATMA    = 34,    // ATM Address                            [Dobrowski]
+        NAPTR   = 35,    // Naming Authority Pointer      [RFC2168, RFC2915]
+        KX      = 36,    // Key Exchanger                          [RFC2230]
+        CERT    = 37,    // CERT                                   [RFC2538]
+        A6      = 38,    // A6                                     [RFC2874]
+        DNAME   = 39,    // DNAME                                  [RFC2672]
+        SINK    = 40,    // SINK                                   [Eastlake]
+        OPT     = 41,    // OPT                                    [RFC2671]
+        APL     = 42,    // APL                                    [RFC3123]
+        DS      = 43,    // Delegation Signer                      [RFC3658]
+        SSHFP   = 44,    // SSH Key Fingerprint  [RFC-ietf-secsh-dns-05.txt]
+        RRSIG   = 46,    // RRSIG                                  [RFC3755]
+        NSEC    = 47,    // NSEC                                   [RFC3755]
+        DNSKEY  = 48,    // DNSKEY                                 [RFC3755]
+        UINFO   = 100,   //                                  [IANA-Reserved]
+        UID     = 101,   //                                  [IANA-Reserved]
+        GID     = 102,   //                                  [IANA-Reserved]
+        UNSPEC  = 103,   //                                  [IANA-Reserved]
+        TKEY    = 249,   // Transaction Key                        [RFC2930]
+        TSIG    = 250,   // Transaction Signature                  [RFC2845]
+        IXFR    = 251,   // incremental transfer                   [RFC1995]
+        AXFR    = 252,   // transfer of an entire zone             [RFC1035]
+        MAILB   = 253,   // mailbox-related RRs (MB, MG or MR)     [RFC1035]
+        MAILA   = 254,   // mail agent RRs (Obsolete - see MX)     [RFC1035]
+        ALL     = 255,   // A request for all records              [RFC1035]
+    }
+
+    public enum OpCode : byte
+    {
+        Query  = 0,      //                                        [RFC1035]
+        // IQUERY  = 1   //  OpCode Retired                        [RFC3425]
+        Status = 2,      //                                        [RFC1035]
+        // 3             // reserved                               [IANA]
+        Notify = 4,      //                                        [RFC1996]
+        Update = 5,      //                                        [RFC2136]
+        // 6-15 available for assignment
+    }
+
+    public enum RCode : ushort
+    {
+        NoError          = 0,   // No Error                           [RFC1035]
+        FormErr          = 1,   // Format Error                       [RFC1035]
+        ServFail         = 2,   // Server Failure                     [RFC1035]
+        NXDomain         = 3,   // Non-Existent Domain                [RFC1035]
+        NotImp           = 4,   // Not Implemented                    [RFC1035]
+        Refused          = 5,   // Query Refused                      [RFC1035]
+        YXDomain         = 6,   // Name Exists when it should not     [RFC2136]
+        YXRRSet          = 7,   // RR Set Exists when it should not   [RFC2136]
+        NXRRSet          = 8,   // RR Set that should exist does not  [RFC2136]
+        NotAuth          = 9,   // Server Not Authoritative for zone  [RFC2136]
+        NotZone          = 10,  // Name not contained in zone         [RFC2136]
+        Max4BitCode      = NotZone,
+        //               11-15,    Available for assignment
+        BADVERS          = 16,  // Bad OPT Version                    [RFC2671]
+        BADSIG           = 16,  // TSIG Signature Failure             [RFC2845]
+        BADKEY           = 17,  // Key not recognized                 [RFC2845]
+        BADTIME          = 18,  // Signature out of time window       [RFC2845]
+        BADMODE          = 19,  // Bad TKEY Mode                      [RFC2930]
+        BADNAME          = 20,  // Duplicate key name                 [RFC2930]
+        BADALG           = 21,  // Algorithm not supported            [RFC2930]
+        // 22-3840              available for assignment
+        //  0x0016-0x0F00
+        // 3841-4095            Private Use
+        //  0x0F01-0x0FFF
+        // 4096-65535           available for assignment
+        //  0x1000-0xFFFF
+    }
+
+    public enum Flags : ushort
+    {
+        NONE = 0,
+        QR   = 0x8000, // Response (1) vs Query (0)
+        AA   = 0x0400, // Authoritative (1) vs Non-authoritative (0)
+        TC   = 0x0200, // Truncated
+        RD   = 0x0100, // Recursion Desired
+        RA   = 0x0080, // Recursion Available
+        MBZ  = 0x0040, // Must-Be-Zero
+        AD   = 0x0020, // Authenticated data (DNSSEC)
+        CD   = 0x0010, // Checking Disabled  (DNSSEC)
+        ALL  = 0x87f0, // All bit-field bits
+    }
+
+    /// <summary>
+    /// Convert between textual and binary DNS names.
+    /// </summary>
+    ///
+    /// <remarks>
+    /// <para>
+    /// RFC1035 describes how names should be packed in DNS
+    /// queries and responses.  The method is described as:
+    /// </para>
+    /// <para>
+    /// Domain names in messages are expressed in terms of a
+    /// sequence of labels.  Each label is represented as a one
+    /// octet length field followed by that number of octets.
+    /// Since every domain name ends with the null label of the
+    /// root, a domain name is terminated by a length byte of
+    /// zero.  The high order two bits of every length octet
+    /// must be zero, and the remaining six bits of the length
+    /// field limit the label to 63 octets or less.
+    /// </para>
+    /// </remarks>
+    public class LabelEncoding
+    {
+        private static ASCIIEncoding ascii = new ASCIIEncoding();
+
+        private LabelEncoding() {}
+
+        static public byte[] GetBytes(string! s)
+        {
+            byte[] result = new byte[GetByteCount(s)];
+            PutBytes(s, result, 0);
+            return result;
+        }
+
+        public static int PutBytes(string! input,
+                                   byte[]! bytes,
+                                   int     byteIndex)
+        {
+            if (input.Length == 0)
+            {
+                bytes[byteIndex] = 0;
+                return 1;
+            }
+
+            ascii.GetBytes(input, 0, input.Length, bytes, byteIndex + 1);
+            int outIndex = byteIndex;
+            int finalIndex = byteIndex + input.Length + 1;
+            bytes[finalIndex] = 0;
+
+            for (int i = byteIndex + 1; i <= finalIndex; i++)
+            {
+                if (bytes[i] == (byte)'.' || bytes[i] == 0)
+                {
+                    int blockLength = i - outIndex - 1;
+                    if (blockLength > Format.MaxLabelLength)
+                        throw new ArgumentException();
+                    bytes[outIndex] = (byte)(i - outIndex - 1);
+                    outIndex = i++;
+                }
+            }
+            return finalIndex + 1 - byteIndex;
+        }
+
+        static public int GetByteCount(string! s)
+        {
+            return (s.Length > 0) ? (2 + s.Length) : 1;
+        }
+
+        /// <summary>
+        /// Convert name from sequence of bytes to string.
+        /// </summary>
+        ///
+        /// <returns>
+        /// Returns number of bytes consumed, or 0 if input is invalid.
+        ///</returns>
+        public static int GetString(byte[]!     bytes,
+                                    int         byteIndex,
+                                    out string  output)
+        {
+            int startIndex = byteIndex;
+
+            if (bytes[byteIndex] == 0)
+                goto fail;
+
+            // Validation and copy to mutable buffer pass
+            while (bytes[byteIndex] != 0)
+            {
+                if (byteIndex - startIndex - 1 > Format.MaxNameLength)
+                    goto fail;
+
+                int offset = (int) bytes[byteIndex];
+                if ((offset & 0xc0) != 0)
+                    goto fail;
+
+                int newByteIndex = byteIndex + offset + 1;
+                if (newByteIndex > bytes.Length)
+                    goto fail;
+                byteIndex = newByteIndex;
+            }
+
+            // Copy data into a local buffer.  At first glance,
+            // you might realize the unpacking could be done in
+            // place.  However, because of RFC1035 name
+            // compression some other block may point to the raw
+            // data in the packet and expect it to be in packed
+            // format.
+            byte [] workBytes = new byte [byteIndex + 1 - startIndex];
+            Array.Copy(bytes, startIndex, workBytes, 0, workBytes.Length);
+
+            // Modify length bytes to '.' chars
+            int workIndex = 0;
+            while (workBytes[workIndex] != 0)
+            {
+                byte offset = workBytes[workIndex];
+                workBytes[workIndex] = (byte)'.';
+                workIndex += (int)offset + 1;
+            }
+            Debug.Assert(workIndex + 1 == workBytes.Length);
+            output = ascii.GetString(workBytes, 1, workIndex - 1);
+
+            return workBytes.Length;
+
+          fail:
+            output = "";
+            return 0;
+        }
+    }
+
+    public class InvalidDnsFormatException : SystemException
+    {
+        public InvalidDnsFormatException(String message)
+            : base(message)
+        {
+        }
+
+        public InvalidDnsFormatException(String message,
+                                         Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        public InvalidDnsFormatException(String format, params object [] args)
+            : base (String.Format(format, args))
+        {
+        }
+    }
+
+    public class Query
+    {
+        public readonly string Name;
+        public readonly Type   Type;
+        public readonly Class  Class;
+
+        public Query(string queryName, Type queryType, Class queryClass)
+        {
+            if (queryName == null)
+                throw new ArgumentNullException("queryName");
+
+            this.Name  = queryName;
+            this.Type  = queryType;
+            this.Class = queryClass;
+        }
+
+        public int Size
+        {
+            // Packed name size plus 2 bytes Type, 2 bytes Class
+            get { return LabelEncoding.GetByteCount(Name) + 4; }
+        }
+
+        public int Write(byte[]! buffer, ref int offset)
+        {
+            offset += LabelEncoding.PutBytes(Name, buffer, offset);
+            offset += NetworkBitConverter.PutBytes((ushort)Type,
+                                                   buffer, offset);
+            offset += NetworkBitConverter.PutBytes((ushort)Class,
+                                                   buffer, offset);
+            return offset;
+        }
+
+        public static Query! Parse(byte []! buffer, ref int offset)
+        {
+            string name;
+
+            int used = LabelEncoding.GetString(buffer, offset, out name);
+            if (used == 0)
+                throw new InvalidDnsFormatException("name");
+            offset += used;
+
+            ushort qType = NetworkBitConverter.ToUInt16(buffer, offset);
+            offset += 2;
+
+            ushort qClass = NetworkBitConverter.ToUInt16(buffer, offset);
+            offset += 2;
+
+            return new Query(name, (Type) qType, (Class) qClass);
+        }
+
+        public static bool operator == (Query lhs, Query rhs)
+        {
+            if (lhs == null && rhs == null) return true;
+            if (lhs == null) return false;
+            if (rhs == null) return false;
+            return (lhs.Name  == rhs.Name &&
+                    lhs.Type  == rhs.Type &&
+                    lhs.Class == rhs.Class);
+        }
+
+        public static bool operator != (Query lhs, Query rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public override bool Equals(Object other)
+        {
+            Query query = other as Query;
+            return ((Object.ReferenceEquals(query, null) == false) &&
+                    (this == query));
+        }
+
+        public override int GetHashCode()
+        {
+            return this.Name.GetHashCode() ^ ((int)Type << 16) ^ (int)Class;
+        }
+    }
+
+    public class ResourceRecord
+    {
+        public readonly string   Name;
+        public readonly Type     Type;
+        public readonly Class    Class;
+        public readonly uint     TtlSeconds;
+        public readonly byte[]   RData;
+
+        public ResourceRecord(string name,
+                              Type   recordType,
+                              Class  recordClass,
+                              uint   ttlSeconds,
+                              byte[] rdata)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            this.Name       = name;
+            this.Type       = recordType;
+            this.Class      = recordClass;
+            this.TtlSeconds = ttlSeconds;
+            this.RData      = rdata;
+        }
+
+        public int Size
+        {
+            get {
+                int baseLength = LabelEncoding.GetByteCount(Name) + 10;
+                if (RData == null)
+                    return baseLength;
+                return baseLength + RData.Length;
+            }
+        }
+
+        public int Write(byte []! buffer, ref int offset)
+        {
+            offset += LabelEncoding.PutBytes(Name, buffer, offset);
+            offset += NetworkBitConverter.PutBytes((ushort) Type,
+                                                   buffer, offset);
+            offset += NetworkBitConverter.PutBytes((ushort) Class,
+                                                    buffer, offset);
+            offset += NetworkBitConverter.PutBytes(TtlSeconds, buffer, offset);
+
+            if (RData == null)
+            {
+                offset += NetworkBitConverter.PutBytes((ushort)0,
+                                                        buffer, offset);
+            }
+            else
+            {
+                offset += NetworkBitConverter.PutBytes((ushort)RData.Length,
+                                                        buffer, offset);
+                RData.CopyTo(buffer, offset);
+                offset += RData.Length;
+            }
+            return offset;
+        }
+
+        public static ResourceRecord Parse(byte []! buffer, ref int offset)
+        {
+            string name;
+            if ((buffer[offset] & 0xc0) == 0xc0)
+            {
+                // Detected compression.  Name is at offset in
+                // lower 14 bits of next 2 bytes.
+                int start = NetworkBitConverter.ToInt16(buffer, offset);
+                if (LabelEncoding.GetString(buffer, start & 0x3fff,
+                                            out name) == 0)
+                    throw new InvalidDnsFormatException("name");
+                offset += 2;
+            }
+            else
+            {
+                int used = LabelEncoding.GetString(buffer, offset, out name);
+                if (used == 0)
+                    throw new InvalidDnsFormatException("name");
+                offset += used;
+            }
+
+            ushort rType = NetworkBitConverter.ToUInt16(buffer, offset);
+            offset += 2;
+
+            ushort rClass = NetworkBitConverter.ToUInt16(buffer, offset);
+            offset += 2;
+
+            uint ttlSeconds = NetworkBitConverter.ToUInt32(buffer, offset);
+            offset += 4;
+
+            ushort rdataLength = NetworkBitConverter.ToUInt16(buffer, offset);
+            offset += 2;
+
+            byte [] rdata = new byte[rdataLength];
+            Array.Copy(buffer, offset, rdata, 0, rdataLength);
+            offset += rdataLength;
+
+            return new ResourceRecord(name, (Type) rType, (Class) rClass,
+                                      ttlSeconds, rdata);
+        }
+
+        public static bool operator == (ResourceRecord lhs, ResourceRecord rhs)
+        {
+            if (lhs == null && rhs == null) return true;
+            if (lhs == null) return false;
+            if (rhs == null) return false;
+
+            if (lhs.Name != rhs.Name || lhs.Type != rhs.Type ||
+                lhs.Class != rhs.Class || lhs.TtlSeconds != rhs.TtlSeconds)
+                return false;
+            if (lhs.RData == null)
+                return rhs.RData == null;
+            if (rhs.RData == null)
+                return false;
+            if (lhs.RData.Length != rhs.RData.Length)
+                return false;
+            for (int i = 0; i < lhs.RData.Length; i++)
+                if (lhs.RData[i] != rhs.RData[i])
+                    return false;
+            return true;
+        }
+
+        public static bool operator != (ResourceRecord lhs, ResourceRecord rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public override bool Equals(Object other)
+        {
+            ResourceRecord rr = other as ResourceRecord;
+            return ((Object.ReferenceEquals(rr, null) == false) &&
+                    (rr == this));
+        }
+
+        public override int GetHashCode()
+        {
+            int hashCode = this.Name.GetHashCode();
+            hashCode ^= (int)Type << 16;
+            hashCode ^= (int)Class;
+            if (RData != null)
+            {
+                hashCode ^= RData.Length;
+                for (int i = 0; i < RData.Length; i ++)
+                {
+                    hashCode = hashCode ^ (hashCode << 1);
+                    hashCode += (int)RData[i];
+                }
+            }
+            return hashCode;
+        }
+    }
+
+    public class Format
+    {
+        public const ushort ServerPort = 53;
+
+        public const int MaxLabelLength      = 63;
+        public const int MinLabelLength      =  1;
+        public const int MaxNameLength       = 255;
+        public const int MaxUdpMessageLength = 512;
+
+        private const int OpCodeRoll = 11;
+        private const int OpCodeMask = 0x0f;
+        private const int RCodeMask  = 0x0f;
+
+        private ushort     id;
+        private Flags      flags;
+        private OpCode     opCode;
+        private RCode      rCode;
+        private ArrayList! queries;
+        private ArrayList! answerRRs;
+        private ArrayList! authorityRRs;
+        private ArrayList! additionalRRs;
+
+        private static ushort nextId = 0;
+
+        public Format(ushort id, Flags flags, OpCode opCode, RCode rCode)
+        {
+            this.id            = id;
+            this.queries       = new ArrayList();
+            this.answerRRs     = new ArrayList();
+            this.authorityRRs  = new ArrayList();
+            this.additionalRRs = new ArrayList();
+            this.SetFlags(flags);
+            this.SetOpCode(opCode);
+            this.SetRCode(rCode);
+        }
+
+        public Format()
+            : this (++nextId, Flags.NONE, OpCode.Query, RCode.NoError)
+        {
+        }
+
+        public Flags GetFlags()
+        {
+            return flags;
+        }
+
+        [Delayed]
+        public void SetFlags(Flags newFlags)
+        {
+            if ((newFlags & Flags.ALL) != newFlags)
+                throw new ArgumentException("Invalid flags present");
+            flags = newFlags;
+        }
+
+        public OpCode GetOpCode()
+        {
+            return opCode;
+        }
+
+        [Delayed]
+        public void SetOpCode(OpCode newOpCode)
+        {
+            switch (newOpCode)
+            {
+                case OpCode.Query:  break;
+                case OpCode.Status: break;
+                case OpCode.Notify: break;
+                case OpCode.Update: break;
+                default:
+                    throw new ArgumentException("Invalid OpCode");
+            }
+            opCode = newOpCode;
+        }
+
+        public RCode GetRCode()
+        {
+            return rCode;
+        }
+
+        [Delayed]
+        public void SetRCode(RCode newRCode)
+        {
+            if (newRCode > RCode.Max4BitCode)
+                throw new ArgumentException("Invalid RCode");
+            rCode = newRCode;
+        }
+
+        public ArrayList! Queries
+        {
+            get { return queries; }
+        }
+
+        public ArrayList! AnswerRRs
+        {
+            get { return answerRRs; }
+        }
+
+        public ArrayList! AuthorityRRs
+        {
+            get { return authorityRRs; }
+        }
+
+        public ArrayList! AdditionalRRs
+        {
+            get { return additionalRRs; }
+        }
+
+        public int Size
+        {
+            get
+            {
+                int total = 12; // Fixed component
+                foreach (Query! q in queries)
+                    total += q.Size;
+                foreach (ResourceRecord! r in answerRRs)
+                    total += r.Size;
+                foreach (ResourceRecord! r in authorityRRs)
+                    total += r.Size;
+                foreach (ResourceRecord! r in additionalRRs)
+                    total += r.Size;
+                return total;
+            }
+        }
+
+        private void Write(byte[]! buffer, ushort value, ref int offset)
+        {
+            buffer[offset++] = (byte)((int)value >> 8);
+            buffer[offset++] = (byte)((int)value & 0xff);
+        }
+
+        public int Write(byte[]! buffer, ref int offset)
+        {
+            Debug.Assert((((int)opCode << OpCodeRoll) & (int)Flags.ALL) == 0);
+            Debug.Assert((((int)rCode) & (int)Flags.ALL) == 0);
+
+            Write(buffer, id, ref offset);
+
+            int word2 = ((int)opCode << OpCodeRoll) | (int)flags | (int)rCode;
+            Write(buffer, (ushort) word2, ref offset);
+
+            Write(buffer, (ushort) queries.Count, ref offset);
+            Write(buffer, (ushort) answerRRs.Count, ref offset);
+            Write(buffer, (ushort) authorityRRs.Count, ref offset);
+            Write(buffer, (ushort) additionalRRs.Count, ref offset);
+
+            foreach (Query! q in queries)
+                q.Write(buffer, ref offset);
+            foreach (ResourceRecord! r in answerRRs)
+                r.Write(buffer, ref offset);
+            foreach (ResourceRecord! r in authorityRRs)
+                r.Write(buffer, ref offset);
+            foreach (ResourceRecord! r in additionalRRs)
+                r.Write(buffer, ref offset);
+
+            return offset;
+        }
+
+        public static Format Parse(byte []! buffer, ref int offset)
+        {
+            //
+            // First extract enough information to instantiate a Dns.Format
+            //
+            ushort id = NetworkBitConverter.ToUInt16(buffer, offset);
+            offset += 2;
+
+            ushort flagsAndCodes = NetworkBitConverter.ToUInt16(buffer,
+                                                                offset);
+            offset += 2;
+
+            Flags flags = (Flags)((int)flagsAndCodes & (int)Flags.ALL);
+
+            OpCode opCode =
+                (OpCode)(((int)flagsAndCodes >> OpCodeRoll) & OpCodeMask);
+
+            RCode rCode = (RCode)((int)flagsAndCodes & RCodeMask);
+
+            //
+            // Instantiate Dns.Format
+            //
+            Format format = new Format(id, flags, opCode, rCode);
+
+            //
+            // Extract query and record counts and then instantiate
+            // Query and ResourceRecord objects
+            //
+
+            ushort totalQueries = NetworkBitConverter.ToUInt16(buffer,
+                                                               offset);
+            offset += 2;
+
+            ushort totalAnswerRRs = NetworkBitConverter.ToUInt16(buffer,
+                                                                 offset);
+            offset += 2;
+
+            ushort totalAuthorityRRs = NetworkBitConverter.ToUInt16(buffer,
+                                                                    offset);
+            offset += 2;
+
+            ushort totalAdditionalRRs =  NetworkBitConverter.ToUInt16(buffer,
+                                                                      offset);
+            offset += 2;
+
+            for (ushort i = 0; i < totalQueries; i++)
+            {
+                Query query = Query.Parse(buffer, ref offset);
+                format.queries.Add(query);
+            }
+
+            // XXX Parsing stops here when a query fails.
+            //
+            // When a query fails, servers sometimes
+            // indicate resource records are present, but the
+            // data that we'd expect to be a resource record
+            // does not match the format defined in
+            // RFC1035. Details may exist in another RFC (???).
+            if (rCode != RCode.NoError)
+                return format;
+
+            for (ushort i = 0; i < totalAnswerRRs; i++)
+            {
+                ResourceRecord rr = ResourceRecord.Parse(buffer, ref offset);
+                format.answerRRs.Add(rr);
+            }
+
+            for (ushort i = 0; i < totalAuthorityRRs; i++)
+            {
+                ResourceRecord rr = ResourceRecord.Parse(buffer, ref offset);
+                format.authorityRRs.Add(rr);
+            }
+
+            for (ushort i = 0; i < totalAdditionalRRs; i++)
+            {
+                ResourceRecord rr = ResourceRecord.Parse(buffer, ref offset);
+                format.additionalRRs.Add(rr);
+            }
+
+            return format;
+        }
+
+        private static bool ListsEqual(ArrayList lhs, ArrayList rhs)
+        {
+            if (lhs == null && rhs == null) 
+                return true;
+
+            if (lhs == null)
+                return false;
+
+            if (rhs == null)
+                return false;
+
+            if (lhs.Count != rhs.Count)
+                return false;
+
+            for (int i = 0; i < lhs.Count; i++)
+                if (Object.Equals(lhs[i],rhs[i]) == false)
+                    return false;
+
+            return true;
+        }
+
+        public static bool operator == (Format lhs, Format rhs)
+        {
+            if (lhs == null && rhs == null) return true;
+            if (lhs == null) return false;
+            if (rhs == null) return false;
+            if (lhs.id     != rhs.id     || lhs.flags  != rhs.flags  ||
+                lhs.opCode != rhs.opCode || lhs.rCode  != rhs.rCode)
+                return false;
+
+            return (ListsEqual(lhs.queries, rhs.queries)             &&
+                    ListsEqual(lhs.answerRRs, rhs.answerRRs)         &&
+                    ListsEqual(lhs.additionalRRs, rhs.additionalRRs) &&
+                    ListsEqual(lhs.authorityRRs, rhs.authorityRRs));
+        }
+
+        public static bool operator != (Format lhs, Format rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public override bool Equals(Object other)
+        {
+            Format format = other as Format;
+            return ((Object.ReferenceEquals(format, null) == false)
+                    && (format == this));
+        }
+
+        private static int GetListHashCode(ArrayList list, int nullHash)
+        {
+            if (list == null)
+                return nullHash;
+
+            int hashCode = ~nullHash;
+            foreach (object! o in list)
+            {
+                hashCode = hashCode ^ o.GetHashCode();
+                hashCode = hashCode ^ (hashCode << 1);
+            }
+            return hashCode;
+        }
+
+        public override int GetHashCode()
+        {
+            int hashCode = (int)id << 16;
+            hashCode += ((int)opCode << OpCodeRoll) | (int)flags | (int)rCode;
+            hashCode ^= GetListHashCode(queries, 0x01233210);
+            hashCode ^= GetListHashCode(answerRRs, 0x17017017);
+            hashCode ^= GetListHashCode(authorityRRs, 0x22223333);
+            hashCode ^= GetListHashCode(additionalRRs, 0x41414141);
+            return hashCode;
+        }
+
+        private static bool IsSafeLabel(string! name, int begin, int end)
+        {
+            Debug.Assert(end > begin);
+
+            if (end - begin > Format.MaxLabelLength ||
+                end - begin < Format.MinLabelLength)
+                return false;
+
+            // The description in RFC 1035 section 2.1 prefers
+            // first char to be [A-z], however this would rule out
+            // entries in the IN-ADDR.ARPA domain used to lookup
+            // hostnames from IP addresses.
+            if (Char.IsLetterOrDigit(name[begin]) == false)
+                return false;
+
+            // Last char [A-z0-9]
+            int last = end - 1;
+            if (Char.IsLetterOrDigit(name[last]) == false)
+                return false;
+
+            for (int i = begin + 1; i < last; i++)
+            {
+                // Middle Chars [A-z0-9-]
+                if (Char.IsLetterOrDigit(name[i]) == false &&
+                    name[i] != '-')
+                    return false;
+            }
+            return true;
+        }
+
+        public static bool IsSafeDnsName(string! name)
+        {
+            //
+            // Grammar from RFC1035:
+            //
+            //   <domain> ::= <subdomain> | " "
+            //
+            //   <subdomain> ::= <label> | <subdomain> "." <label>
+            //
+            //   <label> ::= <letter> [ [ <ldh-str> ] <let-dig> ]
+            //
+            //   <ldh-str> ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
+            //
+            //   <let-dig-hyp> ::= <let-dig> | "-"
+            //
+            //   <let-dig> ::= <letter> | <digit>
+            //
+            if (name.Length > Format.MaxNameLength)
+                return false;
+
+            int labelStart = 0;
+            do
+            {
+                int labelEnd = name.IndexOf('.', labelStart);
+                if (labelEnd < 0)
+                {
+                    return IsSafeLabel(name, labelStart, name.Length);
+                }
+                if (IsSafeLabel(name, labelStart, labelEnd) == false)
+                {
+                    return false;
+                }
+                labelStart = labelEnd + 1;
+            } while (labelStart < name.Length);
+
+            return false;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Protocol/EtherFmt.cs b/base/Services/NetStack/Protocol/EtherFmt.cs
new file mode 100644
index 0000000..a0ea528
--- /dev/null
+++ b/base/Services/NetStack/Protocol/EtherFmt.cs
@@ -0,0 +1,126 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+
+#if !SINGULARITY
+using System.Net;
+using System.Net.Sockets;   // for AddressFamily
+using System.Text.RegularExpressions;
+using System.Runtime.InteropServices;
+#endif
+
+namespace NetStack.Protocols
+{
+    // An ethernet frame format
+    public class EthernetFormat
+    {
+        // Ethernet protocol types:
+        public const ushort PROTOCOL_IP    = 0x0800;
+        public const ushort PROTOCOL_ARP   = 0x0806;
+        public const ushort PROTOCOL_RARP  = 0x8035;
+        public const ushort PROTOCOL_IP6   = 0x86dd;
+        public const ushort PROTOCOL_PAUSE = 0x8808;  // must be sent to 01-80-C2-00-00-01
+        public const ushort PROTOCOL_MAP   = 0x4934;  // unassigned according to http://map-ne.com/Ethernet/type.html
+        public const ushort PROTOCOL_NLB   = 0x886f;  // Network Load Balancer - type allocated to Microsoft
+        public const ushort PROTOCOL_LOOP  = 0x0060;   // Ethernet Loopback packet
+
+        public const int MaxFrameSize = 1514;  // YW: wo CRC (which is 4 bytes)
+        public const int MinFrameSize = 60;
+        public const int Size = 14;
+
+        public class FrameHeader
+        {
+            EthernetAddress origin;
+            EthernetAddress target;
+            ushort          protocol;
+
+            public FrameHeader(EthernetAddress origin,
+                               EthernetAddress target,
+                               ushort          protocol)
+            {
+                this.origin   = origin;
+                this.target   = target;
+                this.protocol = protocol;
+            }
+
+            public FrameHeader()
+            {
+            }
+        }
+
+        // parse "pkt" from "start" bytes in, and return the
+        // "src" and "dst" Ethernet addresses, and the protocol
+        // "type" Returns the byte offset of the next layer's
+        // header.
+        public static int Read(byte []!            pkt,
+                               int                 start,
+                               out EthernetAddress src,
+                               out EthernetAddress dst,
+                               out ushort          type)
+        {
+            dst = EthernetAddress.ParseBytes(pkt, start);
+            src = EthernetAddress.ParseBytes(pkt, start+6);
+            type = (ushort) ((pkt[start+12] << 8) | (pkt[start+13]));
+            return start + 14;
+        }
+
+        public static bool Read(IBuffer!            buf,
+                                out EthernetAddress src,
+                                out EthernetAddress dst,
+                                out ushort          type)
+        {
+            bool b;
+            b  = buf.ReadEthernetAddress(out dst);
+            b &= buf.ReadEthernetAddress(out src);
+            b &= buf.ReadNet16(out type);
+            return b;
+        }
+
+        // Write an Ethernet header to "pkt", starting at position "start".
+        public static int Write(byte[]! pkt,
+                                int             start,
+                                EthernetAddress src,
+                                EthernetAddress dst,
+                                ushort          type)
+        {
+            dst.CopyOut(pkt, start);
+            src.CopyOut(pkt, start + EthernetAddress.Length);
+
+            pkt[start + 12] = (byte) (type >> 8);
+            pkt[start + 13] = (byte) (type & 0xff);
+
+            return start + 14;
+        }
+
+        public static bool IsEthernetProtocol(ushort id)
+        {
+            switch (id) {
+                case PROTOCOL_IP:     return true;
+                case PROTOCOL_ARP:    return true;
+                case PROTOCOL_RARP:   return true;
+                case PROTOCOL_IP6:    return true;
+                case PROTOCOL_PAUSE:  return true;
+                case PROTOCOL_MAP:    return true;
+                case PROTOCOL_NLB:    return true;
+                case PROTOCOL_LOOP:   return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Protocol/GenDhcpOptions.py b/base/Services/NetStack/Protocol/GenDhcpOptions.py
new file mode 100644
index 0000000..f6b54ec
--- /dev/null
+++ b/base/Services/NetStack/Protocol/GenDhcpOptions.py
@@ -0,0 +1,112 @@
+#!/usr/local/bin/python
+"""A program to generate C# code for DHCP option parsing.
+
+Usage: GenDhcpOptions.py <SourceFile> <DhcpOptionsTxt>
+
+"""
+
+# Copyright (c) Microsoft Corporation.  All rights reserved.
+
+import sys
+import re
+
+# DhcpOptions.txt to C-Sharp types mappings
+csTypes = {
+      "Byte"           : ("byte", "value"),
+      "MultiByte"      : ("byte []", "values"),
+      "Word"           : ("ushort", "value"),
+      "MultiWord"      : ("ushort []", "values"),
+      "DWord"          : ("uint", "value"),
+      "MultiDWord"     : ("uint []", "values"),
+      "IPv4"           : ("IPv4", "address"),
+      "MultiIPv4"      : ("IPv4 []", "addresses"),
+      "String"         : ("char []", "chars")
+}
+
+def GetDhcpOptionValues(lines):
+   optionPattern = re.compile("^([0-9]+)\s+(\w+)\s+(\w+)")
+   options = []
+   for line in lines:
+      match = optionPattern.match(line)
+      if match != None:
+         options.append(match.groups())
+   return options
+
+def WriteDhcpFragment(optionValue, optionName, typeName):
+
+   (csArgType, csArgName) = csTypes[typeName]
+
+   print """
+    public class Dhcp%s
+    {
+        public const byte OptionCode = %s;
+
+        public static IDhcpOption Create(%s %s)
+        {
+            return new Dhcp%sOption(OptionCode, %s);
+        }
+     }""" % (optionName, optionValue, csArgType,
+                csArgName, typeName, csArgName)
+
+def OutputGeneratedCode(options):
+   for o in options:
+      WriteDhcpFragment(o[0], o[1], o[2])
+
+def OutputGeneratedTable(options):
+   for o in options:
+      print "            parsers.Add(Dhcp%s.OptionCode," % o[1]
+      print "                        new Parser(\"%s\"," % o[1]
+      print "                                   new ParseDhcpOption(Dhcp%sOption.Parse)));" % o[2]
+
+def OutputSourceAndGeneratedCode(sourceLines, options):
+   begin_table_region = re.compile("^#region\s+GeneratedTable.*")
+   end_table_region = re.compile("^#endregion\s+//\s+GeneratedTable.*")
+   in_table_region = False
+
+   sourceIter = iter(sourceLines)
+   while True:
+      try: line = sourceIter.next()
+      except StopIteration: break
+
+      if in_table_region == False:
+         print line,
+      if begin_table_region.match(line):
+         in_table_region = True
+         OutputGeneratedTable(options)
+      if end_table_region.match(line):
+         print line,
+         break;
+
+   begin_class_region = re.compile("^#region\s+GeneratedClasses.*")
+   end_class_region = re.compile("^#endregion\s+//\s+GeneratedClasses.*")
+   in_class_region = False
+
+   while True:
+      try: line = sourceIter.next()
+      except StopIteration: break
+      if in_class_region == False:
+         print line,
+      if begin_class_region.match(line):
+         in_class_region = True
+         OutputGeneratedCode(options)
+      if end_class_region.match(line):
+         in_class_region = False
+         print line,
+
+def main():
+   if len(sys.argv) != 3:
+      print "Usage: GenDhcpOptions <csfile> <optionstxtfile>"
+      return 2
+
+   sourceFile  = open(sys.argv[1], 'r')
+   optionsFile = open(sys.argv[2], 'r')
+
+   sourceLines = sourceFile.readlines()
+   optionLines = optionsFile.readlines()
+
+   dhcpOptions = GetDhcpOptionValues(optionLines)
+   OutputSourceAndGeneratedCode(sourceLines, dhcpOptions)
+   return 0
+
+if __name__ == "__main__":
+   sys.exit(main())
diff --git a/base/Services/NetStack/Protocol/ICMPFmt.cs b/base/Services/NetStack/Protocol/ICMPFmt.cs
new file mode 100644
index 0000000..b553e3d
--- /dev/null
+++ b/base/Services/NetStack/Protocol/ICMPFmt.cs
@@ -0,0 +1,234 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Protocols
+{
+    /**
+     * declaration of the ICMP header (RFC 792)
+     */
+    public class IcmpFormat
+    {
+        // size of common ICMP header
+        public const int Size = 8;
+
+        // ICMP Types
+        public enum IcmpType
+        {
+            ECHO_REPLY=0,
+            DESTINATION_UNREACHABLE=3,
+            SOURCE_QUENCH=4,
+            REDIRECT_MESSAGE=5,
+            ECHO_REQUEST=8,
+            TIME_EXCEEDED=11,
+            PARAMETER_PROBLEM=12,
+            TIMESTAMP_REQUEST=13,
+            TIMESTAMP_REPLY=14,
+            INFO_REQUEST=15,
+            INFO_REPLY=16,
+            ADD_MASK_REQUEST=17,
+            ADD_MASK_REPLY=18
+        }
+
+        // Destination Unreachable Codes
+        public enum Type3Code
+        {
+            NET_UNREACHABLE=0,
+            HOST_UNREACHABLE=1,
+            PROT_UNREACHABLE=2
+            /* and some more, let's add as needed */
+        }
+
+        // the common ICMP header
+        public struct IcmpHeader
+        {
+            public byte    type;
+            public byte    code;
+            public ushort  chksum;
+            public ushort  id;
+            public ushort  seq;
+        }
+
+        // write common ICMP header
+        // (ignores the checksum field, notice that the checksum is
+        //  calculated for the whole packet!)
+        public static int WriteIcmpHeader(byte[]! pkt,int offset,ref IcmpHeader hdr)
+        {
+            int o    = offset;
+            pkt[o++] = hdr.type;
+            pkt[o++] = hdr.code;
+            pkt[o++] = 0;
+            pkt[o++] = 0;
+            pkt[o++] = (byte)(hdr.id>>8);
+            pkt[o++] = (byte)hdr.id;
+            pkt[o++] = (byte)(hdr.seq>>8);
+            pkt[o++] = (byte)hdr.seq;
+
+            return o;
+        }
+
+        // construct an ICMP header from a packet
+        public static bool ReadIcmpHeader(IBuffer! buf, out IcmpHeader hdr)
+        {
+            bool b;
+            b  = buf.Read8(out hdr.type);
+            b &= buf.Read8(out hdr.code);
+            b &= buf.ReadNet16(out hdr.chksum);
+            b &= buf.ReadNet16(out hdr.id);
+            b &= buf.ReadNet16(out hdr.seq);
+            return b;
+        }
+
+        // Timestamp or Timestamp Reply Message
+        public struct TimeStamps
+        {
+            public IcmpHeader header;
+            public uint origTimeStamp;
+            public uint rcvTimeStamp;
+            public uint txTimeStamp;
+        }
+
+        // various ICMP messages
+
+        // IcmpEchoRequest
+        public struct IcmpEchoRequest
+        {
+            public IcmpHeader  header;
+            public byte[]  data;
+
+            // get the size of the message (depends on the received data)
+            public int GetSize()
+            {
+                return (IcmpFormat.Size+data.Length);
+            }
+
+            // ctor
+            public IcmpEchoRequest(ref IcmpHeader hdr,byte[]! msgData)
+            {
+                header=hdr;
+
+                // set the data
+                data = new byte[msgData.Length];
+                Array.Copy(msgData,0,data,0,msgData.Length);
+            }
+
+            public IcmpEchoRequest(ushort id,ushort seq,byte[]! msgData)
+            {
+                header.type   = (byte)IcmpFormat.IcmpType.ECHO_REQUEST;
+                header.code   = 0;
+                header.chksum = 0;
+                header.seq    = seq;
+                header.id     = id;
+                // set the data
+                data          = new byte[msgData.Length];
+                Array.Copy(msgData,0,data,0,msgData.Length);
+            }
+
+            // write an ICMP echo request
+            public static int WriteIcmpEchoRequest(byte[]! pkt,int offset,ref IcmpEchoRequest request)
+            {
+                int o = offset;
+                // write the common header
+                o = WriteIcmpHeader(pkt,offset,ref request.header);
+
+                // dump the data (endian doesn't matter, since it is a user data)
+                Array.Copy(request.data,0,pkt,o,request.data.Length);
+
+                // calc the checksum
+                ushort chk        = IPFormat.Checksum(pkt, offset,
+                                                      request.GetSize());
+                pkt[offset+2]     = (byte) (((ushort)chk) >> 8);
+                pkt[offset+3]     = (byte) (((ushort)chk) & 0xff);
+                request.header.chksum = chk;
+
+                return o;
+            }
+
+            // write an ICMP echo reply for an ICMP Echo request
+            public static int WriteIcmpEchoReply(byte[]! pkt,int offset,ref IcmpEchoRequest request)
+            {
+                int o = offset;
+
+                // change the request header code to 0
+                request.header.type = (byte)IcmpFormat.IcmpType.ECHO_REPLY;
+                // write the common header
+                o = WriteIcmpHeader(pkt,offset,ref request.header);
+                // fix it again
+                request.header.type = (byte)IcmpFormat.IcmpType.ECHO_REQUEST;
+
+                // dump the data (endian doesn't matter, since it is a user data)
+                Array.Copy(request.data,0,pkt,o,request.data.Length);
+
+                // calc the checksum
+                ushort chk = IPFormat.Checksum(pkt,offset,request.GetSize());
+                pkt[offset + 2] = (byte) (((ushort)chk) >> 8);
+                pkt[offset + 3] = (byte) (((ushort)chk) & 0xff);
+                request.header.chksum = chk;
+
+                return o;
+            }
+        }
+
+        // a fast method that uses that modified the ECHO request
+        // packet to an ECHO reply.
+        // return true if success
+        public static void CreateFastEchoReply(byte[]! pkt,int icmpPacketSize)
+        {
+            // 1. switch the source IP and destination IP
+            // 2. change ICMP code to IcmpFormat.IcmpType.ECHO_REPLY
+            // 3. should use ARP table to find out the mac address of the target
+            //    (if it is on the local network)
+            //    CURRENTLY: just switch MAC addresses as well.
+            // 4. recompute ICMP and IP checksums
+
+            int    ipStart   = EthernetFormat.Size;
+            int    icmpStart = ipStart + IPFormat.Size;
+            pkt[icmpStart]   = (byte)IcmpFormat.IcmpType.ECHO_REPLY;
+            // zero checksum
+            pkt[icmpStart + 2] = 0;
+            pkt[icmpStart + 3] = 0;
+            ushort chk       = IPFormat.Checksum(pkt, icmpStart, icmpPacketSize);
+            pkt[icmpStart + 2] = (byte)(chk>>8);
+            pkt[icmpStart + 3] = (byte)chk;
+
+            // switch IPs
+            byte[] tmp = new byte[6];
+            Array.Copy(pkt, ipStart + 16, tmp, 0, 4); // dest->tmp
+            Array.Copy(pkt, ipStart + 12, pkt, ipStart + 16, 4); // src->dest
+            Array.Copy(tmp, 0, pkt, ipStart + 12, 4); // tmp->src
+
+            // zero the checksum
+            pkt[ipStart + 10] = 0;
+            pkt[ipStart + 11] = 0;
+
+            // calculate checksum
+            chk = IPFormat.Checksum(pkt, ipStart, IPFormat.Size);
+            pkt[ipStart + 10] = (byte) (((ushort)chk) >> 8);
+            pkt[ipStart + 11] = (byte) (((ushort)chk) & 0xff);
+
+            // TBC: currently just switch mac addresses
+            Array.Copy(pkt, 6, tmp, 0, 6);  // src  -> temp
+            Array.Copy(pkt, 0, pkt, 6, 6);  // dest -> src
+            Array.Copy(tmp, 0, pkt, 0, 6);  // tmp  -> dest
+        }
+    }
+}
diff --git a/base/Services/NetStack/Protocol/IPFmt.cs b/base/Services/NetStack/Protocol/IPFmt.cs
new file mode 100644
index 0000000..7781e16
--- /dev/null
+++ b/base/Services/NetStack/Protocol/IPFmt.cs
@@ -0,0 +1,335 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+
+#if !SINGULARITY
+using System.Net;
+// using System.Net.Sockets;   // for AddressFamily
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Protocols
+{
+    public class IPFormat
+    {
+        // size of minimum IP header (wo options)
+        public const int Size = 20;
+
+        // all header fields are given in host endianness
+        public class IPHeader
+        {
+            public byte   verLen; // 0:3 Version, 4:7 Header length in DWORDs.
+            public byte   tos;
+            public ushort totalLength;
+            public ushort id;
+            public ushort offset;
+            public byte   ttl;
+            public byte   protocol;
+            public ushort checksum;
+            internal IPv4  srcAddr;
+            internal IPv4  destAddr;
+
+            // some wrappers
+            public IPv4 Source
+            {
+                get { return srcAddr; }
+                set { srcAddr = value; }
+            }
+
+            public IPv4 Destination
+            {
+                get { return destAddr; }
+                set { destAddr = value; }
+            }
+
+            public Protocol Protocol
+            {
+                get { return (Protocol) protocol; }
+                set { protocol = (byte) value; }
+            }
+
+            // set default values
+            public void SetDefaults(Protocol type)
+            {
+                verLen      = 0x45;    // version=4, header_len=5
+                tos         = 0;
+                totalLength = 0;
+                id          = 0;
+                offset      = 0;
+                ttl         = DefaultTTL;
+                protocol    = (byte)type;
+                checksum    = 0;
+                srcAddr     = IPv4.Zero;
+                destAddr    = IPv4.Zero;
+            }
+        }
+
+        // construct an IP header from a packet
+        // if something is wrong, return the same start value
+        public static bool ReadIPHeader(IBuffer! buf, out IPHeader! iphdr)
+        {
+            // initialize an IPHeader struct
+            iphdr = new IPHeader();
+
+            bool b;
+            uint addr;
+
+            b  = buf.Read8(out iphdr.verLen);
+            b &= buf.Read8(out iphdr.tos);
+            b &= buf.ReadNet16(out iphdr.totalLength);
+            b &= buf.ReadNet16(out iphdr.id);
+            b &= buf.ReadNet16(out iphdr.offset);
+            b &= buf.Read8(out iphdr.ttl);
+            b &= buf.Read8(out iphdr.protocol);
+            b &= buf.ReadNet16(out iphdr.checksum);
+            b &= buf.ReadNet32(out addr);
+            iphdr.srcAddr = new IPv4(addr);
+            b &= buf.ReadNet32(out addr);
+            iphdr.destAddr = new IPv4(addr);
+            return b;
+        }
+
+        // TTL default value
+        public const byte DefaultTTL = 128;
+
+        //  IP protocols identifiers
+        public enum Protocol : byte
+        {
+            ICMP  = 1,
+            IGMP  = 2,
+            TCP   = 6,
+            IGRP  = 9,
+            UDP   = 17,
+            GRE   = 47,
+            ESP   = 50,
+            AH    = 51,
+            SKIP  = 57,
+            EIGRP = 88,
+            OSPF  = 89,
+            L2TP  = 115
+        }
+
+        // some getters...
+        public static ushort GetVersion(IPHeader! hdr)
+        {
+            return (ushort)(hdr.verLen & 0xF0);
+        }
+
+        // minimum value is 20, if it is 60 bytes, then
+        // Options field is valid.
+        public static uint GetHeaderLength(IPHeader! hdr)
+        {
+            return ((uint)(hdr.verLen & 0xF));
+        }
+
+        public static bool IsMoreFragSet(IPHeader! hdr)
+        {
+            ushort flags = (ushort)(((ushort)hdr.offset) >> 13);
+            return ((flags & 0x01)==0x01);
+        }
+
+        public static bool IsDontFragSet(IPHeader! hdr)
+        {
+            ushort flags = (ushort)(((ushort)hdr.offset) >> 13);
+            return ((flags & 0x02)==0x02);
+        }
+
+        public static void SetDontFragBit(IPHeader! hdr)
+        {
+            hdr.offset=(ushort)(hdr.offset|0x4000);
+        }
+
+        public static ushort GetFragOffset(IPHeader! hdr)
+        {
+            return (ushort)(hdr.offset & 0x1FFF);
+        }
+
+        // calculate's one's complement
+        public static ushort SumShortValues(byte[]! buffer,
+                                            int offset,
+                                            int length)
+        {
+            //generate an IP checksum based on a given data buffer
+            uint chksum = 0;
+
+            int end = offset + (length & ~1);
+            int i   = offset;
+            while (i != end)
+            {
+                chksum += (uint)((((ushort)buffer[i++]) << 8) +
+                                   (ushort)buffer[i++]);
+            }
+
+            if (i != offset + length)
+            {
+                // padding at the end!
+                chksum += (uint)(((ushort)buffer[i]) << 8);
+            }
+
+            // Double-wrap chksum
+            chksum = (chksum & 0xFFFF) + (chksum >> 16);
+            chksum = (chksum & 0xFFFF) + (chksum >> 16);
+            return (ushort)chksum;
+        }
+
+        public static ushort SumShortValues(ushort currentChecksum,
+                                            ushort valueToAdd)
+        {
+            uint chksum = currentChecksum;
+            chksum += valueToAdd;
+
+            // Double-wrap chksum
+            chksum = (chksum & 0xFFFF) + (chksum >> 16);
+            chksum = (chksum & 0xFFFF) + (chksum >> 16);
+            return (ushort)chksum;
+        }
+
+        public static bool IsCheckSumOK(IPHeader! hdr)
+        {
+            ushort sum = (ushort) ((((int)hdr.verLen) << 8) + ((int)hdr.tos));
+            sum = SumShortValues(sum, hdr.totalLength);
+            sum = SumShortValues(sum, hdr.id);
+            sum = SumShortValues(sum, hdr.offset);
+            sum = SumShortValues(sum, (ushort) ((((int)hdr.ttl) << 8) + ((int)hdr.protocol)));
+            sum = SumShortValues(sum, (ushort) (((uint)hdr.srcAddr) >> 16));
+            sum = SumShortValues(sum, (ushort) (((uint)hdr.srcAddr) & 0xFFFFU));
+            sum = SumShortValues(sum, (ushort) (((uint)hdr.destAddr) >> 16));
+            sum = SumShortValues(sum, (ushort) (((uint)hdr.destAddr) & 0xFFFFU));
+            sum = (ushort)~sum;
+
+            if (sum != hdr.checksum)
+            {
+                Console.WriteLine("Bad IP Checksum {0:x4} != {1:x4}",
+                                  hdr.checksum, sum);
+            }
+
+            return (sum == hdr.checksum);
+        }
+
+        // calculate the ip header checksum
+        public static ushort Checksum(byte[]! buffer,
+                                      int    ipHeaderOffset,
+                                      int    ipHeaderLength)
+        {
+            return (ushort)~SumShortValues(buffer,
+                                           ipHeaderOffset,
+                                           ipHeaderLength);
+        }
+
+        // calc the sum of the 16bits pseudo header fields
+        // (to be later used for transport level checksum calculation)
+        // offset points to the start of the IP header
+        // also return the protocolLength=header+data
+        public static ushort SumPseudoHeader(byte[]!    pkt,
+                                             int        offset,
+                                             ref ushort protocolLength)
+        {
+            // source IP + destination IP
+            uint sum = SumShortValues(pkt, offset + 12, 8);
+
+            // add the protocol field (with zero MSB)
+            sum += pkt[offset + 9];
+
+            // add udp length = ip_total_length-ip_header_len
+            ushort ipTotalLen = (ushort)(((ushort)(pkt[offset + 2] << 8)) |
+                                         ((ushort)pkt[offset + 3]));
+            //            ushort ipSize = (ushort)((pkt[offset] & 0x0f) * 4);
+            protocolLength = (ushort)(ipTotalLen - IPFormat.Size);
+            sum += protocolLength;
+
+            // Double-wrap the sum
+            sum = (sum & 0xFFFF) + (sum >> 16);
+            sum = (sum & 0xFFFF) + (sum >> 16);
+            return (ushort)sum;
+        }
+
+        public static ushort SumPseudoHeader(IPHeader! ipHeader)
+        {
+            uint sum = 0;
+            uint origin = (uint)ipHeader.srcAddr;
+            uint target = (uint)ipHeader.destAddr;
+
+            sum  = (origin & 0xffff) + ((origin >> 16) & 0xffff);
+            sum += (target & 0xffff) + ((target >> 16) & 0xffff);
+            sum += ipHeader.protocol;
+            sum += (ipHeader.totalLength - (ipHeader.verLen & 0xfu) * 4u);
+
+            // Double-wrap the sum
+            sum = (sum & 0xFFFF) + (sum >> 16);
+            sum = (sum & 0xFFFF) + (sum >> 16);
+            return (ushort)sum;
+        }
+
+        // writes an IP header to a packet
+        // return the next place to write to, fixes the checksum field
+        public static int WriteIPHeader(byte[]! pkt, int offset, IPHeader! hdr)
+        {
+            // check we have enough packet space
+            if (pkt.Length - offset < Size)
+                return offset;
+
+            int o = offset;
+
+            pkt[o++] = hdr.verLen;
+            pkt[o++] = hdr.tos;
+            pkt[o++] = (byte) (((ushort)hdr.totalLength) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.totalLength) & 0xff);
+            pkt[o++] = (byte) (((ushort)hdr.id) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.id) & 0xff);
+            pkt[o++] = (byte) (((ushort)hdr.offset) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.offset) & 0xff);
+            pkt[o++] = hdr.ttl;
+            pkt[o++] = hdr.protocol;
+            pkt[o++] = 0;
+            pkt[o++] = 0;
+
+            // set the ip addresses
+            hdr.srcAddr.CopyOut(pkt, o);
+            o += IPv4.Length;
+
+            hdr.destAddr.CopyOut(pkt, o);
+            o += IPv4.Length;
+
+            // calculate checksum
+            ushort chk = Checksum(pkt, offset, Size);
+            pkt[offset + 10] = (byte) (((ushort)chk) >> 8);
+            pkt[offset + 11] = (byte) (((ushort)chk) & 0xff);
+
+            // save the header checksum
+            hdr.checksum = (ushort)chk;
+
+            return o;
+        }
+
+        /// <summary>
+        /// Update checksum when a 16-bit value that composed the original
+        /// checksum changes.  Useful for recomputing checksum when
+        /// TTL changes when acting as a router.
+        /// </summary>
+        public static ushort UpdateChecksum(ushort checksum,
+                                            ushort oldValue,
+                                            ushort newValue)
+        {
+            // From RFC1624
+            ushort newChecksum = (ushort)~checksum;
+            newChecksum += (ushort)~oldValue;
+            newChecksum += newValue;
+            return (ushort)~newChecksum;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Protocol/Protocol.csproj.user b/base/Services/NetStack/Protocol/Protocol.csproj.user
new file mode 100644
index 0000000..0e89b7e
--- /dev/null
+++ b/base/Services/NetStack/Protocol/Protocol.csproj.user
@@ -0,0 +1,48 @@
+<VisualStudioProject>
+    <CSHARP LastOpenVersion = "7.10.3077" >
+        <Build>
+            <Settings ReferencePath = "" >
+                <Config
+                    Name = "Debug"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+                <Config
+                    Name = "Release"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+            </Settings>
+        </Build>
+        <OtherProjectSettings
+            CopyProjectDestinationFolder = ""
+            CopyProjectUncPath = ""
+            CopyProjectOption = "0"
+            ProjectView = "ProjectFiles"
+            ProjectTrust = "0"
+        />
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/base/Services/NetStack/Protocol/Protocol.csproj.vspscc b/base/Services/NetStack/Protocol/Protocol.csproj.vspscc
new file mode 100644
index 0000000..b5cd7f4
--- /dev/null
+++ b/base/Services/NetStack/Protocol/Protocol.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = "relative:Protocol"
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
diff --git a/base/Services/NetStack/Protocol/TCPFmt.cs b/base/Services/NetStack/Protocol/TCPFmt.cs
new file mode 100644
index 0000000..221c3e2
--- /dev/null
+++ b/base/Services/NetStack/Protocol/TCPFmt.cs
@@ -0,0 +1,447 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+
+#if !SINGULARITY
+using System.Net;
+using System.Net.Sockets;
+#endif
+
+namespace NetStack.Protocols
+{
+    /**
+     * A TCP formatter class
+     */
+
+    public class TcpFormat
+    {
+        // size of minimum TCP header (wo options)
+        public const int Size = 20;
+
+        // default IP MSS
+        public const int IP_DEFAULT_MTU=576; // wo negotiation
+        public const int IP_MTU=1500;
+
+        // available TCP MSS
+        public const int TCP_MSS=IP_MTU-IPFormat.Size-Size;
+
+        // all header fields are given in host endianness
+        public struct TcpHeader
+        {
+            public ushort sourcePort;
+            public ushort destPort;
+            public uint  seq;
+            public uint  ackSeq;
+            public byte  off_res1;       // number of 32-bit words, min=5
+            public byte  res2_flags;
+            public ushort window;
+            public ushort checksum;
+            public ushort urgPtr;
+        }
+
+        // TCP states
+        public enum TCPState
+        {
+            TCP_ESTABLISHED = 1,
+            TCP_SYN_SENT,
+            TCP_SYN_RECV,
+            TCP_FIN_WAIT1,
+            TCP_FIN_WAIT2,
+            TCP_TIME_WAIT,
+            TCP_CLOSE,
+            TCP_CLOSE_WAIT,
+            TCP_LAST_ACK,
+            TCP_LISTEN,
+            TCP_CLOSING,
+            TCP_MAX_STATES /* Leave at the end! */
+        };
+
+        // construct a TCP header from a packet
+        // if something is wrong, return the same start value
+        public static bool ReadTcpHeader(IBuffer! buf, out TcpHeader tcphdr)
+        {
+            // initialize an TcpHeader struct
+            tcphdr = new TcpHeader();
+
+            bool b;
+            b  = buf.ReadNet16(out tcphdr.sourcePort);
+            b &= buf.ReadNet16(out tcphdr.destPort);
+            b &= buf.ReadNet32(out tcphdr.seq);
+            b &= buf.ReadNet32(out tcphdr.ackSeq);
+            b &= buf.Read8(out tcphdr.off_res1);
+            b &= buf.Read8(out tcphdr.res2_flags);
+            b &= buf.ReadNet16(out tcphdr.window);
+            b &= buf.ReadNet16(out tcphdr.checksum);
+            b &= buf.ReadNet16(out tcphdr.urgPtr);
+            return b;
+        }
+
+        //  TCP well known server ports
+        public enum ReservedPort
+        {
+            ECHO        = 7,
+            CHARGEN     = 19,
+            FTP_DATA    = 20,
+            FTP_CONTROL = 21,
+            SSH         = 22,
+            TELNET      = 23,
+            SMTP        = 25,
+            DOMAIN      = 53,
+            FINGER      = 79,
+            HTTP        = 80,
+            POP3        = 110,
+            SUNRPC      = 111,
+            NNTP        = 119,
+            NETBIOS_SSN = 139,
+            IMAP        = 111,
+            BGP         = 179,
+            LDAP        = 389,
+            HTTPS       = 443,
+            MSDS        = 445,
+            SOCKS       = 1080
+        }
+
+        // some getters...
+        public static byte GetOffset(ref TcpHeader hdr)
+        {
+            // return the header len (32 bit counter)
+            return ((byte)((hdr.off_res1>>4) & 0x0F));   // 4 bits
+        }
+
+        public static byte GetReserve1(ref TcpHeader hdr)
+        {
+            return ((byte)(hdr.off_res1&0x0F));  // 4 bits
+        }
+
+        public static byte GetReserve2(ref TcpHeader hdr)
+        {
+            return ((byte)((hdr.res2_flags>>6) & 0x03)); // 2 bits
+        }
+
+        // The flags: "UAPRSF"
+
+        // urgent pointer valid
+        public static bool IsUrg(ref TcpHeader hdr)
+        {
+            return (((hdr.res2_flags>>5) & 0x01)==1); // 1 bits
+        }
+
+        // ack filed is valid
+        public static bool IsAck(ref TcpHeader hdr)
+        {
+            return (((hdr.res2_flags>>4) & 0x01)==1); // 1 bits
+        }
+
+        // set ack
+        public static void SetACK(ref TcpHeader hdr)
+        {
+            hdr.res2_flags=(byte)(hdr.res2_flags|16);
+
+        }
+
+        // push data
+        public static bool IsPush(ref TcpHeader hdr)
+        {
+            return (((hdr.res2_flags>>3) & 0x01)==1); // 1 bits
+        }
+
+        // reset connection
+        public static bool IsReset(ref TcpHeader hdr)
+        {
+            return (((hdr.res2_flags>>2) & 0x01)==1); // 1 bits
+        }
+
+        // set reset bit
+        public static void SetReset(ref TcpHeader hdr)
+        {
+            hdr.res2_flags=(byte)(hdr.res2_flags|0x4);
+        }
+
+        // synchronize sequence numbers
+        public static bool IsSync(ref TcpHeader hdr)
+        {
+            return (((hdr.res2_flags>>1) & 0x01)==1); // 1 bits
+        }
+
+        // set syn
+        public static void SetSYN(ref TcpHeader hdr)
+        {
+            hdr.res2_flags=(byte)(hdr.res2_flags|2);
+        }
+
+        // set fin
+        public static void SetFIN(ref TcpHeader hdr)
+        {
+            hdr.res2_flags=(byte)(hdr.res2_flags|1);
+        }
+
+        // no more data ; finish connection
+        public static bool IsFIN(ref TcpHeader hdr)
+        {
+            return ((hdr.res2_flags & 0x01)==1); // 1 bits
+        }
+
+        // writes a TCP header to a packet
+        // return the next place to write to
+        // the checksum must be later calculated and cover the
+        // pseudoheader and entire TCP segment
+        public static int WriteTcpHeader(byte[]! pkt, int offset, ref TcpHeader hdr)
+        {
+            // check we have enough packet space
+            if (pkt.Length - offset < Size)
+                return offset;
+
+            int o = offset;
+
+            pkt[o++] = (byte)(((ushort)hdr.sourcePort) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.sourcePort) & 0xff);
+
+            pkt[o++] = (byte)(((ushort)hdr.destPort) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.destPort) & 0xff);
+
+            pkt[o++] = (byte)(((uint)hdr.seq) >> 24);
+            pkt[o++] = (byte)(((uint)hdr.seq) >> 16);
+            pkt[o++] = (byte)(((uint)hdr.seq) >> 8);
+            pkt[o++] = (byte) (((uint)hdr.seq) & 0xff);
+
+            pkt[o++] = (byte)(((uint)hdr.ackSeq) >> 24);
+            pkt[o++] = (byte)(((uint)hdr.ackSeq) >> 16);
+            pkt[o++] = (byte)(((uint)hdr.ackSeq) >> 8);
+            pkt[o++] = (byte) (((uint)hdr.ackSeq) & 0xff);
+
+            pkt[o++] = hdr.off_res1;
+            pkt[o++] = hdr.res2_flags;
+
+            pkt[o++] = (byte)(((ushort)hdr.window) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.window) & 0xff);
+
+            // checksum
+            pkt[o++] = 0;
+            pkt[o++] = 0;
+
+            pkt[o++] = (byte)(((ushort)hdr.urgPtr) >> 8);
+            pkt[o++] = (byte) (((ushort)hdr.urgPtr) & 0xff);
+
+            return o;
+        }
+
+        // set the checksum field
+        // offset points to the beginning of the IP header (!!!)
+        // Should be called after the TCP header + data have been written
+        public static void SetTcpChecksum(byte[]!       packet,
+                                          int           ipOffset,
+                                          ref TcpHeader tcpHeader)
+        {
+            // sum IP pseudo
+            ushort ipPayloadLength = 0;
+            ushort headerSum =
+                IPFormat.SumPseudoHeader(packet, ipOffset,
+                                         ref ipPayloadLength);
+
+            int ipHeaderSize = (packet[ipOffset] & 0xf) * 4;
+            int tcpOffset    = ipOffset + ipHeaderSize;
+
+            Debug.Assert(packet[tcpOffset + 16] == 0);
+            Debug.Assert(packet[tcpOffset + 17] == 0);
+
+            // now add it to the TCP header + data
+            ushort payloadSum = IPFormat.SumShortValues(packet, tcpOffset,
+                                                        ipPayloadLength);
+
+            tcpHeader.checksum = (ushort)
+                ~(IPFormat.SumShortValues(headerSum, payloadSum));
+
+            packet[tcpOffset + 16] = (byte) (tcpHeader.checksum >> 8);
+            packet[tcpOffset + 17] = (byte) (tcpHeader.checksum & 0xff);
+        }
+
+        public static ushort SumHeader(TcpHeader tcpHeader)
+        {
+            int checksum = tcpHeader.sourcePort;
+            checksum += tcpHeader.destPort;
+            checksum += (int) (tcpHeader.seq >> 16);
+            checksum += (int) (tcpHeader.seq & 0xffff);
+            checksum += (int) (tcpHeader.ackSeq >> 16);
+            checksum += (int) (tcpHeader.ackSeq & 0xffff);
+            checksum += (((int)tcpHeader.off_res1) << 8) | (int)tcpHeader.res2_flags;
+            checksum += (int) tcpHeader.window;
+            checksum += (int) tcpHeader.urgPtr;
+
+            // Double-wrap checksum
+            checksum = (checksum & 0xFFFF) + (checksum >> 16);
+            checksum = (checksum & 0xFFFF) + (checksum >> 16);
+            return (ushort)checksum;
+        }
+
+        public static bool IsChecksumValid(IPFormat.IPHeader! ipHeader,
+                                           TcpHeader          tcpHeader,
+                                           NetPacket!         payload)
+        {
+            // Compute partial checksums of headers
+            ushort checksum = IPFormat.SumPseudoHeader(ipHeader);
+            checksum = IPFormat.SumShortValues(checksum,
+                                               SumHeader(tcpHeader));
+
+            // Checksum payload
+            int length = payload.Available;
+            int end = length & ~1;
+            int i = 0;
+            while (i != end)
+            {
+                int x = ((((int) payload.PeekAvailable(i++)) << 8) +
+                         (int) payload.PeekAvailable(i++));
+                checksum = IPFormat.SumShortValues(checksum, (ushort) x);
+            }
+
+            if (i != length)
+            {
+                int x = (((int) payload.PeekAvailable(i++)) << 8);
+                checksum = IPFormat.SumShortValues(checksum, (ushort) x);
+            }
+
+            checksum = (ushort) ~checksum;
+            if (tcpHeader.checksum != checksum)
+            {
+                Console.WriteLine("Bad TCP checksum {0:x4} != {1:x4}",
+                                  tcpHeader.checksum, checksum);
+            }
+            return tcpHeader.checksum == checksum;
+        }
+
+        // a helper method to write the TCP segment (without data)
+        public static void WriteTcpSegment(byte[]! pktData,
+                                           ushort localPort,
+                                           ushort destPort,
+                                           uint   ackSeq,
+                                           uint   seq,
+                                           ushort wnd,
+                                           IPv4   sIP,
+                                           IPv4   dIP,
+                                           ushort dataLen,
+                                           bool   isAck,
+                                           bool   isSyn,
+                                           bool   isRst,
+                                           bool   isFin,
+                                           bool   withOptions)
+        {
+            // now create the IP,TCP headers!
+            int start=EthernetFormat.Size;
+
+            // prepare it...
+            TcpFormat.TcpHeader tcpHeader = new TcpFormat.TcpHeader();
+            tcpHeader.sourcePort       = localPort;
+            tcpHeader.destPort         = destPort;
+            if (withOptions)
+            {
+                tcpHeader.off_res1 = 0x60;
+            }
+            else
+            {
+                tcpHeader.off_res1 = 0x50;
+            }
+
+            tcpHeader.ackSeq = ackSeq;
+            tcpHeader.seq    = seq;
+            tcpHeader.window = wnd;
+
+            if (isFin)
+            {
+                TcpFormat.SetFIN(ref tcpHeader);
+            }
+            if (isSyn)
+            {
+                TcpFormat.SetSYN(ref tcpHeader);
+            }
+            if (isAck)
+            {
+                TcpFormat.SetACK(ref tcpHeader);
+            }
+            if (isRst)
+            {
+                TcpFormat.SetReset(ref tcpHeader);
+            }
+
+            IPFormat.IPHeader ipHeader = new IPFormat.IPHeader();
+            ipHeader.SetDefaults(IPFormat.Protocol.TCP);
+            ipHeader.totalLength = (ushort)(IPFormat.Size + TcpFormat.Size+dataLen);
+            ipHeader.srcAddr = sIP;
+            ipHeader.destAddr = dIP;
+            IPFormat.SetDontFragBit(ipHeader);
+
+            // write the ip header + ip checksum
+            start = IPFormat.WriteIPHeader(pktData, start, ipHeader);
+
+            // write TCP header, no checksum
+            start = TcpFormat.WriteTcpHeader(pktData, start, ref tcpHeader);
+
+            // calc the checksum...
+            TcpFormat.SetTcpChecksum(pktData, EthernetFormat.Size, ref tcpHeader);
+        }
+
+#if SINGULARITY
+        private static long snBase = 133413;
+
+        public static int GenerateSequenceNumber(IPv4 localHost,
+                                                 IPv4 remoteHost,
+                                                 ushort    localPort,
+                                                 ushort    remotePort)
+        {
+            // No MD5 for now so perform a weak hash
+            long isn = DateTime.UtcNow.Ticks;
+
+            snBase = snBase + 2287 * snBase;
+            isn += snBase;
+
+            int i = 0;
+            foreach (byte b in localHost.GetAddressBytes()) {
+                isn ^= ((long)b) << i;
+                i += 8;
+            }
+
+            foreach (byte b in localHost.GetAddressBytes()) {
+                isn ^= ((long)b) << i;
+                i += 8;
+            }
+
+            isn += (localPort << 16) | remotePort;
+            return (int)((isn >> 32) ^ isn);
+        }
+#else
+        public static int GenerateSequenceNumber(IPAddress localHost,IPAddress remoteHost,
+                                                 ushort localPort,ushort remotePort)
+        {
+            // generate safer initial sequence numbers (RFC 1948)
+            // ISN = M + F(localhost, localport, remotehost, remoteport).
+
+            byte[] data=new byte[12];
+            Array.Copy(localHost.GetAddressBytes(),0,data,0,4);
+            Array.Copy(remoteHost.GetAddressBytes(),0,data,4,4);
+            data[8]=(byte)(localPort>>8);
+            data[9]=(byte)localPort;
+            data[10]=(byte)(remotePort>>8);
+            data[11]=(byte)remotePort;
+
+            System.Security.Cryptography.MD5 md5 = new System.Security.Cryptography.MD5CryptoServiceProvider();
+            byte[] result = md5.ComputeHash(data);
+            string hashString = Convert.ToBase64String(result);
+            return (int)(Convert.ToInt64(hashString,10)+(uint)DateTime.UtcNow.Ticks);
+        }
+#endif
+    }
+}
diff --git a/base/Services/NetStack/Protocol/TestDnsFmt.cs b/base/Services/NetStack/Protocol/TestDnsFmt.cs
new file mode 100644
index 0000000..df137d6
--- /dev/null
+++ b/base/Services/NetStack/Protocol/TestDnsFmt.cs
@@ -0,0 +1,219 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: TestDhcpClient.cs
+//
+//  Note:
+//       This is a minimal test of Dns packet assembly and
+//       parsing.  It only tests good input to date.
+//
+
+using System;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Protocols;
+using Dns = NetStack.Protocols.Dns;
+
+namespace NetStack.Protocols.TestDnsClient
+{
+    public class Test
+    {
+        private static readonly byte [][] rawPackets = new byte [][] {
+            // A small selection of good DNS frame dumps
+            new byte [] {
+                0x00,0x01,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x01,0x33,0x01,0x30,0x03,0x32,0x34,0x34,0x03,0x32,0x30,0x39,
+                0x07,0x69,0x6e,0x2d,0x61,0x64,0x64,0x72,0x04,0x61,0x72,0x70,
+                0x61,0x00,0x00,0x0c,0x00,0x01,
+            },
+            new byte [] {
+                0x00,0x01,0x81,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,
+                0x01,0x33,0x01,0x30,0x03,0x32,0x34,0x34,0x03,0x32,0x30,0x39,
+                0x07,0x69,0x6e,0x2d,0x61,0x64,0x64,0x72,0x04,0x61,0x72,0x70,
+                0x61,0x00,0x00,0x0c,0x00,0x01,0xc0,0x0c,0x00,0x0c,0x00,0x01,
+                0x00,0x00,0x09,0x2a,0x00,0x16,0x09,0x72,0x65,0x73,0x6f,0x6c,
+                0x76,0x65,0x72,0x31,0x06,0x6c,0x65,0x76,0x65,0x6c,0x33,0x03,
+                0x6e,0x65,0x74,0x00,
+            },
+            new byte [] {
+                0x00,0x02,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x03,0x63,
+                0x6f,0x6d,0x00,0x00,0x0f,0x00,0x01,
+            },
+            new byte [] {
+                0x00,0x02,0x81,0x80,0x00,0x01,0x00,0x03,0x00,0x00,0x00,0x00,
+                0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x03,0x63,
+                0x6f,0x6d,0x00,0x00,0x0f,0x00,0x01,0xc0,0x0c,0x00,0x0f,0x00,
+                0x01,0x00,0x00,0x00,0xf0,0x00,0x0a,0x00,0x0a,0x05,0x6d,0x61,
+                0x69,0x6c,0x61,0xc0,0x0c,0xc0,0x0c,0x00,0x0f,0x00,0x01,0x00,
+                0x00,0x00,0xf0,0x00,0x0a,0x00,0x0a,0x05,0x6d,0x61,0x69,0x6c,
+                0x62,0xc0,0x0c,0xc0,0x0c,0x00,0x0f,0x00,0x01,0x00,0x00,0x00,
+                0xf0,0x00,0x0a,0x00,0x0a,0x05,0x6d,0x61,0x69,0x6c,0x63,0xc0,
+                0x0c,
+            },
+            new byte [] {
+                0x00,0x03,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x03,0x77,0x77,0x77,0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,
+                0x66,0x74,0x03,0x63,0x6f,0x6d,0x00,0x00,0x01,0x00,0x01,
+            },
+            new byte [] {
+                0x00,0x03,0x81,0x80,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,
+                0x03,0x77,0x77,0x77,0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,
+                0x66,0x74,0x03,0x63,0x6f,0x6d,0x00,0x00,0x01,0x00,0x01,0xc0,
+                0x0c,0x00,0x05,0x00,0x01,0x00,0x00,0x0b,0xa3,0x00,0x1d,0x03,
+                0x77,0x77,0x77,0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,
+                0x74,0x03,0x63,0x6f,0x6d,0x05,0x6e,0x73,0x61,0x74,0x63,0x03,
+                0x6e,0x65,0x74,0x00,0xc0,0x2f,0x00,0x01,0x00,0x01,0x00,0x00,
+                0x01,0x19,0x00,0x04,0xcf,0x2e,0x9c,0x9c,
+            },
+            new byte [] {
+                0x00,0x04,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x03,0x77,0x77,0x77,0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,
+                0x66,0x74,0x03,0x63,0x6f,0x6d,0x05,0x6e,0x73,0x61,0x74,0x63,
+                0x03,0x6e,0x65,0x74,0x00,0x00,0x01,0x00,0x01,
+            },
+            new byte [] {
+                0x00,0x04,0x81,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,
+                0x03,0x77,0x77,0x77,0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,
+                0x66,0x74,0x03,0x63,0x6f,0x6d,0x05,0x6e,0x73,0x61,0x74,0x63,
+                0x03,0x6e,0x65,0x74,0x00,0x00,0x01,0x00,0x01,0xc0,0x0c,0x00,
+                0x01,0x00,0x01,0x00,0x00,0x01,0x09,0x00,0x04,0xcf,0x2e,0x9c,
+                0x9c,
+            },
+            new byte [] {
+                0x00,0x05,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x03,0x77,0x77,0x77,0x07,0x68,0x6f,0x74,0x6d,0x61,0x69,0x6c,
+                0x03,0x63,0x6f,0x6d,0x00,0x00,0x01,0x00,0x01,
+            },
+            new byte [] {
+                0x00,0x05,0x81,0x80,0x00,0x01,0x00,0x04,0x00,0x00,0x00,0x00,
+                0x03,0x77,0x77,0x77,0x07,0x68,0x6f,0x74,0x6d,0x61,0x69,0x6c,
+                0x03,0x63,0x6f,0x6d,0x00,0x00,0x01,0x00,0x01,0xc0,0x0c,0x00,
+                0x05,0x00,0x01,0x00,0x00,0x08,0x2a,0x00,0x1b,0x03,0x77,0x77,
+                0x77,0x07,0x68,0x6f,0x74,0x6d,0x61,0x69,0x6c,0x03,0x63,0x6f,
+                0x6d,0x05,0x6e,0x73,0x61,0x74,0x63,0x03,0x6e,0x65,0x74,0x00,
+                0xc0,0x2d,0x00,0x01,0x00,0x01,0x00,0x00,0x08,0x2a,0x00,0x04,
+                0xcf,0x44,0xab,0xe9,0xc0,0x2d,0x00,0x01,0x00,0x01,0x00,0x00,
+                0x08,0x2a,0x00,0x04,0xcf,0x44,0xac,0xef,0xc0,0x2d,0x00,0x01,
+                0x00,0x01,0x00,0x00,0x08,0x2a,0x00,0x04,0xcf,0x44,0xad,0xf5,
+            },
+            new byte [] {
+                0x00,0x02,0x85,0x83,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,
+                0x08,0x6f,0x68,0x6f,0x64,0x73,0x6f,0x6e,0x32,0x00,0x00,0x01,
+                0x00,0x01,0x00,0x00,0x06,0x00,0x01,0x00,0x00,0x0e,0x10,0x00,
+                0x3d,0x0a,0x63,0x6f,0x72,0x70,0x2d,0x64,0x63,0x2d,0x30,0x36,
+                0x04,0x63,0x6f,0x72,0x70,0x09,0x6d,0x69,0x63,0x72,0x6f,0x73,
+                0x6f,0x66,0x74,0x03,0x63,0x6f,0x6d,0x00,0x07,0x6d,0x61,0x72,
+                0x69,0x6f,0x72,0x6f,0xc0,0x35,0x00,0x00,0x07,0xaa,0x00,0x00,
+                0x0e,0x10,0x00,0x00,0x02,0x58,0x00,0x01,0x51,0x80,0x00,0x00,
+                0x0e,0x10,
+            },
+            new byte [] {
+                0x00,0x03,0x81,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,
+                0x03,0x32,0x31,0x31,0x03,0x32,0x35,0x34,0x02,0x35,0x35,0x03,
+                0x31,0x35,0x37,0x07,0x49,0x4e,0x2d,0x41,0x44,0x44,0x52,0x04,
+                0x41,0x52,0x50,0x41,0x00,0x00,0x0c,0x00,0x01,0xc0,0x0c,0x00,
+                0x0c,0x00,0x01,0x00,0x00,0x02,0x50,0x00,0x27,0x0a,0x72,0x65,
+                0x64,0x2d,0x64,0x6e,0x73,0x2d,0x30,0x31,0x07,0x72,0x65,0x64,
+                0x6d,0x6f,0x6e,0x64,0x04,0x63,0x6f,0x72,0x70,0x09,0x6d,0x69,
+                0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x03,0x63,0x6f,0x6d,0x00,
+            },
+        };
+
+        public static void Dump(byte [] data)
+        {
+            for (int i = 0; i < data.Length; i += 16)
+            {
+                Console.Write("{0:x4}  ", i);
+                int rowEnd = Math.Min(16, data.Length - i) + i;
+
+                // Hex dump
+                for (int j = i; j != rowEnd; j++)
+                    Console.Write("{0:x2} ", data[j]);
+                for (int j = rowEnd; (j % 16) != 0; j++)
+                    Console.Write("   ");
+                Console.Write(" ");
+
+                // ASCII dump
+                for (int j = i; j < rowEnd; j++)
+                {
+                    if (data[j] > 31 && data[j] < 128)
+                        Console.Write("{0}", (char)data[j]);
+                    else
+                        Console.Write(".");
+                }
+                Console.Write("\n");
+            }
+        }
+
+        public static void TestByteParsing()
+        {
+            int packetCount = rawPackets.Length / rawPackets.Rank;
+            for (int i = 0; i < packetCount; i++)
+            {
+                Console.WriteLine("-- Packet {0} ---", i);
+                Dump(rawPackets[i]);
+                int offset = 0;
+                Dns.Format format = Dns.Format.Parse(rawPackets[i],
+                                                     ref offset);
+                Debug.Assert(offset == rawPackets[i].Length ||
+                             format.GetRCode() != Dns.RCode.NoError);
+                Debug.Assert(format == format);
+                // format.Size may not equal offset here, because
+                // packet may have RFC1035 compression enabled.
+                // Debug.Assert(offset == format.Size)
+                offset = 0;
+                byte [] rendered = new byte [format.Size];
+                format.Write(rendered, ref offset);
+
+                offset = 0;
+                Dns.Format restored = Dns.Format.Parse(rendered, ref offset);
+                Debug.Assert(format.GetHashCode() == restored.GetHashCode());
+            }
+        }
+
+        public static void TestLabelEncoding()
+        {
+            string [] passes = new string [] {
+                "a", "foo", "moo-ba.lah-lah-lah.com",
+                "icicle.infernal.fiery.hell.net",
+                "1.2.222.221.in-addr.arpa",
+                // 63 characters between separators
+                // 3 separators
+                // 4 * 63 + 3 = 255 characters
+                "abcdefghij0123456789abcdefghij0123456789" +
+                "abcdefghij0123456789abc" + "." +
+                "abcdefghij0123456789abcdefghij0123456789" +
+                "abcdefghij0123456789abc" + "." +
+                "abcdefghij0123456789abcdefghij0123456789" +
+                "abcdefghij0123456789abc" + "." +
+                "abcdefghij0123456789abcdefghij0123456789" +
+                "abcdefghij0123456789abc"
+            };
+
+            foreach (string original in passes)
+            {
+                byte [] encoded = Dns.LabelEncoding.GetBytes(original);
+                string decoded;
+                int used = Dns.LabelEncoding.GetString(encoded, 0,
+                                                       out decoded);
+                int expected = Dns.LabelEncoding.GetByteCount(original);
+                Debug.Assert(used == expected);
+                Console.WriteLine("\"{0}\" \"{1}\" {2}",
+                                  original, decoded,
+                                  (original != decoded) ? "*" : " ");
+            }
+        }
+
+        public static void Main()
+        {
+            TestLabelEncoding();
+            TestByteParsing();
+        }
+    }
+} // NetStack.Runtime.TestDnsClient
diff --git a/base/Services/NetStack/Protocol/UDPFmt.cs b/base/Services/NetStack/Protocol/UDPFmt.cs
new file mode 100644
index 0000000..f5d7cfd
--- /dev/null
+++ b/base/Services/NetStack/Protocol/UDPFmt.cs
@@ -0,0 +1,307 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity;
+
+#if !SINGULARITY
+using System.Net;
+using System.Net.Sockets;
+#endif
+
+namespace NetStack.Protocols
+{
+    /**
+     * A UDP formatter class
+     */
+    public class UdpFormat
+    {
+        // size of UDP header
+        public const int Size = 8;
+
+        // a UDP header
+        // (all header fields are given in host endianness)
+        public struct UdpHeader
+        {
+            public ushort srcPort;
+            public ushort dstPort;
+            public ushort length;  // data+header
+            public ushort checksum;
+        }
+
+        // construct a UDP header from a packet
+        // if something is wrong, return the same start value
+        public static int ReadUdpHeader(byte[]!       packet,
+                                        int           udpOffset,
+                                        out UdpHeader udpHeader)
+        {
+            // initialize an UdpHeader struct
+            udpHeader = new UdpHeader();
+            udpHeader.srcPort =
+                (ushort)((int)(packet[udpOffset + 0] << 8) |
+                         (int)(packet[udpOffset + 1]));
+            udpHeader.dstPort =
+                (ushort)((int)(packet[udpOffset + 2] << 8) |
+                         (int)(packet[udpOffset + 3]));
+            udpHeader.length =
+                (ushort)((int)(packet[udpOffset + 4] << 8) |
+                         (int)(packet[udpOffset + 5]));
+            udpHeader.checksum =
+                (ushort)((int)(packet[udpOffset + 6] << 8) |
+                         (int)(packet[udpOffset + 7]));;
+            return udpOffset + Size;
+        }
+
+        public static bool ReadUdpHeader(IBuffer!       buf,
+                                         out UdpHeader  udpHeader)
+        {
+            udpHeader = new UdpHeader();
+            if (buf.ReadNet16(out udpHeader.srcPort) &&
+                buf.ReadNet16(out udpHeader.dstPort) &&
+                buf.ReadNet16(out udpHeader.length)  &&
+                buf.ReadNet16(out udpHeader.checksum))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        // writes a UDP header to a packet
+        // return the next place to write to
+        // the checksum must be later calculated
+        // (over all the octets of the pseudo header, UDP header and data)
+        public static int WriteUdpHeader(byte[]!        buffer,
+                                         int            offset,
+                                         ref UdpHeader  header)
+        {
+            // check we have enough packet space
+            if (buffer.Length - offset < Size)
+                return offset;
+
+            int o = offset;
+
+            buffer[o++] = (byte)(((ushort)header.srcPort) >> 8);
+            buffer[o++] = (byte)(((ushort)header.srcPort) & 0xff);
+
+            buffer[o++] = (byte)(((ushort)header.dstPort) >> 8);
+            buffer[o++] = (byte)(((ushort)header.dstPort) & 0xff);
+
+            buffer[o++] = (byte)(((ushort)header.length) >> 8);
+            buffer[o++] = (byte)(((ushort)header.length) & 0xff);
+
+            // checksum
+            buffer[o++] = 0;
+            buffer[o++] = 0;
+
+            return o;
+        }
+
+        // set the checksum field, totalSize covers all the fields for
+        // which the checksum is calculated
+        // offset is points to the beginning of the IP header (!!!)
+        // Should be called after the UDP header + data have been written
+        public static void SetUdpChecksum(byte[]!       packet,
+                                          int           ipOffset,
+                                          ref UdpHeader udpHeader)
+        {
+            // sum IP pseudo
+            ushort ipPayloadSize = 0;
+            ushort headerSum = IPFormat.SumPseudoHeader(packet, ipOffset,
+                                                        ref ipPayloadSize);
+            Debug.Assert(((ushort)udpHeader.length) == ipPayloadSize);
+
+            // now add it to the udp header + data
+            int ipHeaderSize = (packet[ipOffset] & 0xf) * 4;
+            int udpOffset     = ipOffset + ipHeaderSize;
+
+            Debug.Assert(packet[udpOffset + 6] == 0);
+            Debug.Assert(packet[udpOffset + 7] == 0);
+
+            ushort payloadSum = IPFormat.SumShortValues(packet, udpOffset,
+                                                        ipPayloadSize);
+
+            udpHeader.checksum = (ushort) ~(
+                IPFormat.SumShortValues(headerSum, payloadSum)
+                );
+
+            packet[udpOffset + 6] = (byte) (udpHeader.checksum >> 8);
+            packet[udpOffset + 7] = (byte) (udpHeader.checksum & 0xff);
+        }
+
+        /// <summary>
+        /// Compute checksum of UDP header.
+        /// </summary>
+        public static ushort SumHeader(UdpHeader udpHeader)
+        {
+            // Do not include existing checksum.
+            int x = udpHeader.srcPort + udpHeader.dstPort + udpHeader.length;
+            return (ushort) ((x >> 16) + x);
+        }
+
+        public static bool IsChecksumValid(IPFormat.IPHeader! ipHeader,
+                                           UdpHeader          udpHeader,
+                                           NetPacket!         payload)
+        {
+            // Compute partial checksums of headers
+            ushort checksum  = IPFormat.SumPseudoHeader(ipHeader);
+            checksum = IPFormat.SumShortValues(checksum,
+                                               UdpFormat.SumHeader(udpHeader));
+
+            // Checksum payload
+            int length = payload.Available;
+            int end = length & ~1;
+            int i = 0;
+            while (i != end)
+            {
+                int x = ((((int) payload.PeekAvailable(i++)) << 8) +
+                         (int) payload.PeekAvailable(i++));
+
+                checksum = IPFormat.SumShortValues(checksum, (ushort) x);
+            }
+
+            if (i != length)
+            {
+                int x = (((int) payload.PeekAvailable(i++)) << 8);
+                checksum = IPFormat.SumShortValues(checksum, (ushort) x);
+            }
+
+            checksum = (ushort)~checksum;
+            if (udpHeader.checksum != checksum)
+            {
+                Console.WriteLine("Bad UDP checksum {0:x4} != {1:x4}",
+                                  udpHeader.checksum, checksum);
+            }
+            return udpHeader.checksum == checksum;
+        }
+
+        /// <summary>
+        /// Write IP and UDP headers and payload data into a
+        /// byte array.
+        /// </summary>
+        /// <param name="pkt">Array of bytes representing
+        /// packet to be sent.</param>
+        /// <param name="offset">Offset of IP Header within
+        /// packet.</param>
+        /// <param name="ipHeader">IP header to be written
+        /// to packet.</param>
+        /// <param name="udpHeader">UDP header to be written
+        /// to packet.</param>
+        /// <param name="payload">Payload of UDP Packet.</param>
+        /// <param name="payloadOffset">The offset of start
+        /// of the payload data within the payload
+        /// array.</param>
+
+        /// <param name="payloadLength">The size of the payload data.</param>
+        public static void WriteUdpPacket(byte[]! pkt,
+                                          int offset,
+                                          IPFormat.IPHeader! ipHeader,
+                                          ref UdpHeader udpHeader,
+                                          byte[] payload,
+                                          int payloadOffset,
+                                          int payloadLength)
+        {
+            int udpStart = IPFormat.WriteIPHeader(pkt, offset, ipHeader);
+            int udpEnd   = WriteUdpHeader(pkt, udpStart, ref udpHeader);
+
+            if (pkt != payload || udpEnd != payloadOffset)
+            {
+                Array.Copy(payload, payloadOffset,
+                           pkt, udpEnd, payloadLength);
+            }
+            SetUdpChecksum(pkt, offset, ref udpHeader);
+        }
+
+        public static void WriteUdpPacket(byte[]! pkt,
+                                          int offset,
+                                          IPFormat.IPHeader! ipHeader,
+                                          ref UdpHeader udpHeader,
+                                          byte[]! in ExHeap payload,
+                                          int payloadOffset,
+                                          int payloadLength)
+        {
+            int udpStart = IPFormat.WriteIPHeader(pkt, offset, ipHeader);
+            int udpEnd   = WriteUdpHeader(pkt, udpStart, ref udpHeader);
+
+            Bitter.ToByteArray(payload, payloadOffset, payloadLength,
+                               pkt, udpEnd);
+            SetUdpChecksum(pkt, offset, ref udpHeader);
+        }
+
+        public static void WriteUdpPacket(byte[]!   packet,
+                                          int       ipOffset,
+                                          IPv4      srcAddress,
+                                          ushort    srcPort,
+                                          IPv4      dstAddress,
+                                          ushort    dstPort,
+                                          byte[]    payload,
+                                          int       payloadOffset,
+                                          int       payloadLength)
+        {
+            IPFormat.IPHeader ipHeader = new IPFormat.IPHeader();
+
+            ipHeader.SetDefaults(IPFormat.Protocol.UDP);
+
+            ipHeader.Source      = srcAddress;
+            ipHeader.Destination = dstAddress;
+            ipHeader.totalLength = (ushort)(IPFormat.Size +
+                                            UdpFormat.Size +
+                                            payloadLength);
+
+            UdpFormat.UdpHeader udpHeader = new UdpFormat.UdpHeader();
+            udpHeader.srcPort = srcPort;
+            udpHeader.dstPort = dstPort;
+            udpHeader.length  = (ushort)(UdpFormat.Size + payloadLength);
+
+            WriteUdpPacket(packet, ipOffset, ipHeader, ref udpHeader,
+                           payload, payloadOffset, payloadLength);
+        }
+
+        public static void WriteUdpPacket(byte[]!   packet,
+                                          int       ipOffset,
+                                          IPv4      srcAddress,
+                                          ushort    srcPort,
+                                          IPv4      dstAddress,
+                                          ushort    dstPort,
+                                          byte[]! in ExHeap payload,
+                                          int       payloadOffset,
+                                          int       payloadLength)
+        {
+            IPFormat.IPHeader ipHeader = new IPFormat.IPHeader();
+
+            ipHeader.SetDefaults(IPFormat.Protocol.UDP);
+
+            ipHeader.Source      = srcAddress;
+            ipHeader.Destination = dstAddress;
+            ipHeader.totalLength = (ushort)(IPFormat.Size +
+                                            UdpFormat.Size +
+                                            payloadLength);
+
+            UdpFormat.UdpHeader udpHeader = new UdpFormat.UdpHeader();
+            udpHeader.srcPort = srcPort;
+            udpHeader.dstPort = dstPort;
+            udpHeader.length  = (ushort)(UdpFormat.Size + payloadLength);
+
+            WriteUdpPacket(packet, ipOffset, ipHeader, ref udpHeader,
+                           payload, payloadOffset, payloadLength);
+        }
+    }
+}
+
+
diff --git a/base/Services/NetStack/README b/base/Services/NetStack/README
new file mode 100644
index 0000000..301a9cb
--- /dev/null
+++ b/base/Services/NetStack/README
@@ -0,0 +1,71 @@
+      NetStack
+      A managed code IP host implementation
+
+This directory contains the code for NetStack.  NetStack was
+developed by Yaron Weinsberg during an internship at Microsoft
+Research during the summer of 2004.
+
+The code base has since had a fair amount of hacking.  The
+changes include:
+
+- localizing code that can not work in Singularity (ie anything
+  using reflection)
+
+- replacement of types (System.Net.IPAddress -> IPv4/IPv6 classes).
+
+- clean-up dependencies between types, factoring out base types, etc.
+
+- addition of UDP and DHCP client code.
+
+- Bug fixes and applying naming and coding conventions.
+
+The code is still fairly rough, but it's a tough task to write
+an IP stack in short period of time.  There is very little test
+code here and this is an area that needs to be worked on if
+NetStack is going to be used in the longer term.
+
+NetStack support builds in Singularity and outside of Singularity.
+
+Building and running outside of Singularity
+===========================================
+
+Warning: The following information is not up-to-date with the
+current build system.
+
+The top-level nmake file 'Makefile' is set up to make builds
+outside of the Singularity environment.  Simply typing nmake
+will build the appropriate assemblies.  Unit tests can be run
+by typing 'nmake check'.
+
+To send and receive packets in userland the PacketTap NDIS
+module is needed.  It is available from:
+
+       \\cam-01-srv\dfsroot\groups\sysperf\topology\rawether\
+
+At the time of writing the raw ethernet driver is not connected
+to the build.  The relevant file that needs to be plumbed into the
+build is NetDrivers\RawEtherPacketTap.cs.
+
+Building and running within Singularity
+=======================================
+
+The NetStack directory must be located under the top-level
+Singularity source directory.  It's plumbed into the Singularity
+build by the top-level makefile.  Builds from within the
+directory can be performed with:
+
+  nmake /F Makefile.Singularity
+
+NetStack Directory Organization
+===============================
+
+Base - Base types IPv4, IPv6, EthernetAddress, NetPacket, ByteOrder.
+
+Compat - classes that NetStack uses that are not in Singularity's Kernel BCL.
+
+NetDrivers - Driver interface code.
+
+Protocol - Protocol packet formats and utilities.
+
+Runtime - Most of the code - protocol implementations, mux/demux code, etc.
+
diff --git a/base/Services/NetStack/Runtime/ARPModule.cs b/base/Services/NetStack/Runtime/ARPModule.cs
new file mode 100644
index 0000000..0bb348b
--- /dev/null
+++ b/base/Services/NetStack/Runtime/ARPModule.cs
@@ -0,0 +1,622 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+// #define DEBUG_ARP
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+using System.Collections;
+using System.Text;
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Protocols;
+
+using Microsoft.Singularity;
+
+namespace NetStack.Runtime
+{
+    /// <summary>
+    /// Callback for Arp Requests.
+    ///
+    /// This delegate is invoked when the ArpModule gets a
+    /// response to a request.
+    ///
+    /// <param name="answer">Ethernet address corresponding to
+    /// requested IP address if a response is received,
+    /// EthernetAddress.Zero if request timed out.</param>
+    /// </summary>
+    public delegate void ArpRequestCallback(IPv4            ipAddress,
+                                            EthernetAddress macAddress,
+                                            object          cookie);
+
+    ///<summary>
+    ///This module implements the ARP protocol.
+    ///</summary>
+    public class ArpModule : IProtocol
+    {
+        private class PendingRequest
+        {
+            public IPv4               address;
+            public ArpRequestCallback callback;
+            public object             cookie;
+            public DateTime           expiry;
+
+            public PendingRequest(IPv4               address,
+                                  ArpRequestCallback callback,
+                                  object             cookie,
+                                  DateTime           expiry)
+            {
+                this.address  = address;
+                this.callback = callback;
+                this.cookie   = cookie;
+                this.expiry   = expiry;
+            }
+        }
+
+        /// <summary>
+        /// Class used to hold expiration time of Request timeouts.
+        /// </summary>
+        private class TimeoutArgument : Dispatcher.CallbackArgs
+        {
+            public DateTime now;
+
+            public TimeoutArgument(DateTime when)
+            {
+                now = when;
+            }
+        }
+
+        // ARP variables
+        private ArpTable arpTable = null;
+        private IPModule ipModule = null;
+        private ArrayList pendingRequests; // <expiry, PendingRequest>
+
+        // Pending request polling period
+        private static readonly TimeSpan PollPeriod = TimeSpan.FromSeconds(1);
+
+        // INetModule interfaces
+        // ------------------------
+        string INetModule.ModuleName  { get { return "ARP"; } }
+        ushort INetModule.ModuleVersion { get { return 0x01; } }  // 0.1
+
+        [Conditional("DEBUG_ARP")]
+        internal static void DebugPrint(string           format,
+                                        params object [] arguments)
+        {
+            DebugStub.Print("ARPModule: {0}",
+                            __arglist(
+                                string.Format(format, arguments))
+                            );
+        }
+
+        // called by the runtime when
+        // the protocol should be started
+        public bool StartModule()
+        {
+            DebugPrint("Starting ARP.\n");
+
+            // we have the request...
+            // Notice: can be ARP_REQUEST or ARP_RESPONSE
+            ipModule = Core.Instance().GetProtocolByName("IP") as IPModule;
+            if (ipModule == null)
+            {
+                return false;
+            }
+
+            // ask for an aging[msec] timer
+            DateTime then = DateTime.UtcNow + ArpTable.AgePeriod;
+            Core.Instance().TheDispatcher.AddCallback(
+                new Dispatcher.Callback(OnAgingTimer), null, (ulong)then.Ticks
+                );
+            return true;
+        }
+
+        // make the arp table entries older...
+        // currently arg is null
+        public NetStatus OnAgingTimer(Dispatcher.CallbackArgs arg)
+        {
+            arpTable.AgeTable();
+
+            DateTime then = DateTime.UtcNow + ArpTable.AgePeriod;
+            Core.Instance().TheDispatcher.AddCallback(
+                new Dispatcher.Callback(OnAgingTimer), null, (ulong)then.Ticks
+                );
+
+            return NetStatus.Code.RT_OK;
+        }
+
+        public bool StopModule()
+        {
+            return true;
+        }
+
+        public bool DestroyModule()
+        {
+            arpTable = null;
+            return true;
+        }
+
+        // IProtocol interfaces
+        // ------------------------
+        public bool Initialize(ProtocolParams parameters)
+        {
+            Debug.Assert(parameters == null || parameters["name"]=="ARP");
+
+            int size = ProtocolParams.LookupInt32(parameters, "cacheSize",
+                                                  128);
+            int age  = ProtocolParams.LookupInt32(parameters, "max-age",
+                                                  ArpTable.MaxAge);
+            arpTable = new ArpTable(size, age, this);
+            pendingRequests = new ArrayList();
+
+            Core core = Core.Instance();
+            core.RegisterProtocol(this);
+            if (! core.packetTypes.RegisterTypeHandler(PacketTypes.ARP, this))
+            {
+                core.DeregisterProtocol(this);
+                return false;
+            }
+            return true;
+        }
+
+        public ushort GetProtocolID()
+        {
+            return (EthernetFormat.PROTOCOL_ARP);
+        }
+
+        public Session CreateSession()
+        {
+            return null;
+        }
+
+        /**
+         * ARP logic: see RFC 826 http://www.faqs.org/rfcs/rfc826.html
+         */
+        public NetStatus OnProtocolReceive(NetPacket! pkt)
+        {
+            NetStatus res = NetStatus.Code.PROTOCOL_OK;
+            Debug.Assert(pkt!=null);
+
+            ArpFormat.Type opcode;
+            EthernetAddress senderMAC, targetMAC;
+            IPv4 senderIP, targetIP;
+
+            bool ok = ArpFormat.Read(pkt, out opcode,
+                                     out senderMAC, out senderIP,
+                                     out targetMAC, out targetIP);
+            DebugPrint("ARP RESPONSE\n");
+
+            // check for problems
+            if (ok == false)
+            {
+                DebugPrint("ARP READ ERROR\n");
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            bool merged  = false;
+            bool updated = false;
+            ArpEntry target = arpTable.Lookup(senderIP);
+            if (target != null && target.Dynamic == true)
+            {
+                DebugPrint("ARP UPDATE\n");
+                // we have it already - just update the details...
+                target.MacAddress = senderMAC;
+                target.EntryAge   = arpTable.Age;
+                merged            = true;
+                updated           = true;
+            }
+
+            bool forSelf = ipModule.HostConfiguration.IsLocalAddress(targetIP);
+            if (forSelf == false)
+            {
+                return NetStatus.Code.PROTOCOL_OK;
+            }
+
+            if (merged == false)
+            {
+                DebugPrint("ARP ADDITION\n");
+                arpTable.AddEntry(new ArpEntry(senderIP, senderMAC, true));
+                merged = true;
+                UpdatePendingRequests(senderIP, senderMAC);
+            }
+
+            // now figure out the opcode
+            if (opcode == ArpFormat.Type.ARP_REQUEST)
+            {
+                DebugPrint("Handling request ({0},{1}) ---> ({2},{3})\n",
+                           senderIP, senderMAC, targetIP, targetMAC
+                           );
+
+                // send reply...
+                // we reuse the received packet for sending a fast response
+                // so we should NOT return it to the Demux's free list!!!
+                // (we replace it with a new one instead)
+                // we use the adapter from which the request arrived
+                // (available in the context)
+                Multiplexer mux = Core.Instance().GetMuxForAdapter((IAdapter!)pkt.AdapterContext);
+                if (mux == null) {
+                    // some internal bug, for now just panic
+                    Core.Panic("At ArpModule.PacketReceive: " +
+                               "context isn't Multiplexer!\n");
+                    assert(false);
+                }
+
+                int dataLength = EthernetFormat.Size + ArpFormat.Size;
+                if (dataLength < pkt.Length)
+                    dataLength = pkt.Length;
+
+                byte[]! data   = new byte[dataLength];
+                Array.Copy(pkt.GetRawData(), 0, data, 0, pkt.Length);
+
+                ArpFormat.CreateArpReply(ref data, targetIP,
+                                         mux.Adapter.HardwareAddress);
+                mux.SendDirect(new NetPacket(data));
+            }
+            else
+            {
+                // otherwise we are done
+                DebugPrint(
+                    "Handling reply ({2},{3}) <--- ({0},{1})\n",
+                    senderIP, senderMAC, targetIP, targetMAC
+                    );
+            }
+
+            if (merged && !updated)
+            {
+                DebugPrint(arpTable.ToString());
+            }
+
+            return res;
+        }
+
+        // sends an arp request only.
+        // the given packet is already prepared.
+        public NetStatus OnProtocolSend(NetPacket! pkt)
+        {
+            DebugPrint("ARPModule.OnProtocolSend\n");
+            ((Multiplexer!)pkt.Mux).SendDirect(pkt);
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public void ArpRequest(IPv4               sourceIP,
+                               IPv4               targetIP,
+                               Multiplexer!       targetMux,
+                               ArpRequestCallback callback,
+                               object             cookie,
+                               TimeSpan           timeout)
+        {
+            /*
+            XXXX Check pending request does not already exist!
+            */
+            EthernetAddress localMac  = targetMux.Adapter.HardwareAddress;
+
+            AddPendingRequest(targetIP, callback, cookie, timeout);
+
+            // initiate an arp request...
+            DebugPrint("Initiating request " +
+                       "({0},{1}) --> ({2},{3})\n",
+                       sourceIP, localMac, targetIP, EthernetAddress.Zero);
+
+            byte[] data = new byte[ArpFormat.Size + EthernetFormat.Size];
+            int pos     = EthernetFormat.Write(data, 0, localMac,
+                                               EthernetAddress.Broadcast,
+                                               EthernetFormat.PROTOCOL_ARP);
+
+            ArpFormat.Write(data, pos, localMac, sourceIP,
+                            ArpFormat.Type.ARP_REQUEST, EthernetAddress.Zero,
+                            targetIP);
+
+            NetPacket pkt = new NetPacket(data);
+            pkt.Mux = targetMux;
+            OnProtocolSend(pkt);
+        }
+
+        public bool Lookup(IPv4 targetIP, out EthernetAddress macAddress)
+        {
+            return arpTable.Lookup(targetIP, out macAddress);
+        }
+
+        public NetStatus SetProtocolSpecific(ushort opcode,byte[]! data)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public NetStatus GetProtocolSpecific(ushort opcode,out byte[] data)
+        {
+            data = null;
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        private void AddPendingRequest(IPv4               address,
+                                       ArpRequestCallback callback,
+                                       object             cookie,
+                                       TimeSpan           timeout)
+        {
+            DateTime expiry = DateTime.UtcNow + timeout;
+            pendingRequests.Add(
+                new PendingRequest(address, callback, cookie, expiry)
+                );
+
+            if (pendingRequests.Count == 1)
+            {
+                DateTime nextPoll = DateTime.UtcNow + PollPeriod;
+                Core.Instance().TheDispatcher.AddCallback(
+                    new Dispatcher.Callback(OnRequestTimeout),
+                    new TimeoutArgument(nextPoll),
+                    (ulong)nextPoll.Ticks
+                    );
+            }
+        }
+
+        private void UpdatePendingRequests(IPv4            ipAddress,
+                                           EthernetAddress macAddress)
+        {
+            int i = 0;
+            while (i != pendingRequests.Count)
+            {
+                PendingRequest request = (PendingRequest!) pendingRequests[i];
+                if (request.address == ipAddress)
+                {
+                    request.callback(ipAddress, macAddress, request.cookie);
+                    pendingRequests.RemoveAt(i);
+                    continue;
+                }
+                i++;
+            }
+        }
+
+        private NetStatus OnRequestTimeout(Dispatcher.CallbackArgs args)
+        {
+            DateTime now = ((TimeoutArgument!) args).now;
+
+            int i = 0;
+            while (i != pendingRequests.Count)
+            {
+                PendingRequest request = (PendingRequest!) pendingRequests[i];
+                if (request.expiry < now)
+                {
+                    DebugPrint("Expiring request");
+
+                    request.callback(request.address,
+                                     EthernetAddress.Zero,
+                                     request.cookie);
+                    pendingRequests.RemoveAt(i);
+                    continue;
+                }
+                i++;
+            }
+
+            if (pendingRequests.Count > 0)
+            {
+                DateTime nextPoll = now + PollPeriod;
+                Core.Instance().TheDispatcher.AddCallback(
+                    new Dispatcher.Callback(OnRequestTimeout),
+                    new TimeoutArgument(nextPoll),
+                    (ulong)nextPoll.Ticks
+                    );
+            }
+            return NetStatus.Code.RT_OK;
+        }
+
+        // ctor
+        public ArpModule()
+        {
+        }
+    }
+
+    // an arp entry (we only deal with IPv4)
+    public class ArpEntry
+    {
+        private IPv4            ipAddress;
+        private EthernetAddress mac;
+        private int             entryAge;
+        private bool            dynamic;
+
+        public int EntryAge
+        {
+            get { return entryAge; }
+            set { entryAge = value; }
+        }
+
+        public EthernetAddress MacAddress
+        {
+            get { return mac; }
+            set { mac = value; }
+        }
+
+        public IPv4 IPAddress
+        {
+            get { return ipAddress; }
+        }
+
+        public bool Dynamic
+        {
+            get { return dynamic; }
+        }
+
+        // create a new entry
+        public ArpEntry(IPv4 ipAddress, EthernetAddress mac, bool dynamic)
+        {
+            this.ipAddress = ipAddress;
+            this.mac       = mac;
+            this.dynamic   = dynamic;
+            this.entryAge  = ArpTable.MaxAge;
+        }
+
+        public override string! ToString()
+        {
+            return String.Format("{0} {1} {2} {3}",
+                                 ipAddress, mac, entryAge,
+                                 dynamic ? "dynamic" : "static");
+        }
+    }
+
+    // define the arp table
+    internal class ArpTable
+    {
+        Hashtable! arpEntries;   // <Key = IPv4 address, Value = ArpEntry>
+
+        // max table size
+        protected readonly int maxEntries;
+
+        // default entry age
+        protected int defaultAge;
+
+        // get the default age
+        public int Age { get { return defaultAge; } }
+
+        // the default age
+        public const int MaxAge = 50;
+
+        // aging timeout [msec]
+        public static readonly TimeSpan AgePeriod = TimeSpan.FromMinutes(5);
+
+        // our parent
+        protected ArpModule arp;
+
+        // ctor
+        public ArpTable(int size, int age, ArpModule arp)
+        {
+            ArpModule.DebugPrint("creating ArpTable size={0}, age={1}\n",
+                                 size, age);
+
+            arpEntries = new Hashtable(size);
+            maxEntries = size;
+            defaultAge = age;
+            this.arp   = arp;
+            base();
+        }
+
+        // add a new entry
+        // return false if there is no more room
+        public bool AddEntry(ArpEntry! e)
+        {
+            // if no more room, make one
+            if (arpEntries.Count >= maxEntries)
+            {
+                PurgeLRUEntry();
+            }
+            e.EntryAge = this.defaultAge;
+            arpEntries.Add(e.IPAddress, e);
+            ArpModule.DebugPrint("Added entry {0}\n", e);
+            return true;
+        }
+
+        private void RemoveEntry(ArpEntry! e)
+        {
+            arpEntries.Remove(e.IPAddress);
+            ArpModule.DebugPrint("Removed entry for {0}\n", e);
+        }
+
+        public void RemoveEntry(IPv4 targetIP)
+        {
+            arpEntries.Remove(targetIP);
+            ArpModule.DebugPrint("Removed entry for {0}\n", targetIP);
+        }
+
+        // makes a room for a new entry, get rid of
+        // the least recently used entry (LRU)
+        public void PurgeLRUEntry()
+        {
+            if (arpEntries.Count == 0)
+                return;
+
+            // can use a LRU list to avoid O(n)
+            // but this is a kind of a small table...
+            IDictionaryEnumerator dicEnum = arpEntries.GetEnumerator();
+            dicEnum.MoveNext();  // get the first entry
+
+            ArpEntry lruElement = (ArpEntry!)dicEnum.Value;
+
+            while (dicEnum.MoveNext())
+            {
+                ArpEntry current = (ArpEntry)dicEnum.Value;
+                if (current.EntryAge < lruElement.EntryAge)
+                {
+                    lruElement = current;
+                }
+            }
+            RemoveEntry(lruElement);
+        }
+
+        // age the dynamic table entries, if age drops to 0 purge entry
+        internal bool AgeTable()
+        {
+            int startCount = arpEntries.Count;
+
+            // Can't hold iterator and add or remove items so use
+            // list to hold items to be deleted.
+            ArrayList purgeItems = new ArrayList();
+
+            foreach (ArpEntry! e in arpEntries.Values)
+            {
+                if (e.Dynamic == true && --e.EntryAge == 0)
+                {
+                    purgeItems.Add(e);
+                }
+            }
+
+            foreach (ArpEntry! e in purgeItems)
+            {
+                RemoveEntry(e);
+            }
+
+            return startCount < arpEntries.Count;
+        }
+
+        public ArpEntry Lookup(IPv4 destination)
+        {
+            return arpEntries[destination] as ArpEntry;
+        }
+
+        // an upper layer interface to get the mac
+        // to a target IP. The upper protocol must
+        // provide the Mux for the target IP.
+        // if we have it then we return true + macAddress
+        // and refresh the age to create a LRU list
+        public bool Lookup(IPv4 targetIP, out EthernetAddress macAddress)
+        {
+            ArpEntry e = arpEntries[targetIP] as ArpEntry;
+            if (e != null)
+            {
+                e.EntryAge = Age;
+                macAddress = e.MacAddress;
+                return true;
+            }
+            macAddress = EthernetAddress.Zero;
+            return false;
+        }
+
+        public override string! ToString()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.Append("Internet Address      Physical Address    Type             \n");
+            stringBuilder.Append("-----------------------------------------------------------\n");
+
+            string [] types = { "static", "dynamic" };
+            foreach (ArpEntry! e in arpEntries.Values)
+            {
+                stringBuilder.Append(e.IPAddress + "       " + e.MacAddress +
+                                     "   " + types[ e.Dynamic ? 1 : 0] +
+                                     " [Age=" + e.EntryAge + "]\n");
+            }
+            return stringBuilder.ToString();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/AdapterInfo.cs b/base/Services/NetStack/Runtime/AdapterInfo.cs
new file mode 100644
index 0000000..b72ad7f
--- /dev/null
+++ b/base/Services/NetStack/Runtime/AdapterInfo.cs
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: AdapterInfo.cs
+//
+
+using NetStack.Common;
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    public class AdapterInfo
+    {
+        //
+        // Fixed fields
+        //
+        private IAdapter adapter;
+        private string   deviceName;
+
+        //
+        // Mutable fields
+        //
+        private string  description;
+
+        public AdapterInfo(IAdapter adapter,
+                           string   deviceName,
+                           string   description)
+        {
+            this.adapter     = adapter;
+            this.deviceName  = deviceName;
+            this.description = description;
+        }
+
+        public AdapterInfo(IAdapter adapter,
+                           string   deviceName)
+        {
+            this.adapter     = adapter;
+            this.deviceName  = deviceName;
+            this.description = "";
+        }
+
+        public IAdapter Adapter
+        {
+            get { return adapter; }
+        }
+
+        public EthernetAddress Address
+        {
+            get { return adapter.HardwareAddress; }
+        }
+
+        public string DeviceName
+        {
+            get { return this.deviceName; }
+        }
+
+        public string DriverName
+        {
+            get { return adapter.DriverName; }
+        }
+
+        public string DriverVersion
+        {
+            get { return adapter.DriverVersion; }
+        }
+
+        public string Description
+        {
+            get { return description; }
+            set { description = value; }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/Core.cs b/base/Services/NetStack/Runtime/Core.cs
new file mode 100644
index 0000000..d774a37
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Core.cs
@@ -0,0 +1,777 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+// #define DEBUG_CORE
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+using NetStack.Protocols;
+
+using Microsoft.Singularity;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This is the heart of the networking stack.
+     * - A single thread inside the core handles
+     * packet reception, Qos demultiplexing and
+     * later on multiplexing on a specific protocol queue.
+     * - The thread also handles user send & receive in order
+     * to avoid reentrancy deadlocks etc.
+     * - The Runtime uses an asynchronous IO in order to
+     * avoid locking and denial of service.
+     * - The Core's thread, never invokes user's callbacks
+     * directly, the user can poll for a message or get
+     * his thread to sleep, waiting for a new message event.
+     */
+    public class Core : INetModule
+    {
+        private bool activated = false;
+
+#if THREAD_POOL
+        private const int workerThreads = 16;
+        private const int maxWorkItems = workerThreads * 128;
+        private NetStackThreadPool! threadPool;
+#endif
+
+        // the single core object
+        protected static Core! instance = new Core();
+
+        // disable default lazy creation (beforefieldinit)
+        static Core() {}
+
+        private Core()
+        {
+            worker               = null;
+            stopped              = false;
+            protocols            = new SortedList();
+            packetTypes          = new PacketTypes();
+            adapters             = new ArrayList();
+            adapterNextId        = 0;
+            theDispatcher        = new Dispatcher();
+            muxTable             = new ArrayList();
+            sessions             = new SessionsTable();
+            outboundPacketsEvent = new AutoResetEvent(false);
+            inboundPacketsEvent  = new AutoResetEvent(false);
+#if THREAD_POOL
+            threadPool           =
+                new NetStackThreadPool(workerThreads, maxWorkItems);
+#endif
+
+            base();
+            // NB The demux is initialized when the first adapter is
+            // registered as it depends on the Core Instance being
+            // valid and it's not within this constructor.
+            // theDemux = null;
+        }
+
+        // get the single core instance
+        public static Core! Instance()
+        {
+            return instance;
+        }
+
+#if THREAD_POOL
+        public NetStackThreadPool! ThreadPool {
+            get { return threadPool; }
+        }
+#endif
+
+        [ System.Diagnostics.Conditional("DEBUG_CORE") ]
+        private static void DebugPrint(string format, params object[] args)
+        {
+            DebugStub.Print("Core: {0}",
+                            __arglist(String.Format(format, args))
+                            );
+        }
+
+        // create a session of a specific protocol
+        public Session CreateSession(string protocolName)
+        {
+            IProtocol p = GetProtocolByName(protocolName);
+            if (p == null) {
+                return null;
+            }
+            return (p.CreateSession());
+        }
+
+        // register a new session in the runtime
+        // notice that multiple user threads can register new
+        // sessions (multiple writers).
+        // In the Meanwhile the internal thread can scan the
+        // sessions in order to HandleOutgoingSessions
+        internal void RegisterSession(IProtocol! p, Session s)
+        {
+            lock (sessions.SyncRoot)
+            {
+                if (!sessions.Contains(p)) {
+                    ArrayList l = new ArrayList();
+                    l.Add(s);
+                    sessions[p] = l;
+                }
+                else {
+                    ArrayList l = (ArrayList!)sessions[p];
+                    lock (l.SyncRoot) {
+                        if (!l.Contains(s)) {
+                            l.Add(s);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Deregister a session
+        internal void DeregisterSession(IProtocol! p, Session s)
+        {
+            lock (sessions.SyncRoot) {
+                if (!sessions.Contains(p))
+                    Core.Panic("Error: Can't deregister a session for an unknown protocol!");
+                else {
+                    ArrayList l = (ArrayList!)sessions[p];
+                    lock (l.SyncRoot) {
+                        l.Remove(s);
+                    }
+                }
+            }
+        }
+
+        private static int FindFreePort(ArrayList sessions)
+        {
+            const int PortMin = 1024;
+            const int PortMax = 65535;
+
+            if (sessions == null || sessions.Count == 0)
+                return PortMin;
+
+            int lastPort = PortMin;
+            foreach (Session! s in sessions) {
+                if (s.LocalPort - 1 > lastPort)
+                    return s.LocalPort - 1;
+                if (lastPort > PortMin)
+                    lastPort = s.LocalPort;
+            }
+            lastPort++;
+            if (lastPort > PortMax)
+                return -1;
+            return lastPort;
+        }
+
+        internal bool ChangeSessionLocalPort(Session! s, int newPort)
+        {
+            ArrayList tcpSessions = Core.Instance().GetSessions(s.Protocol);
+
+            // If no sessions registered yet, just do it...
+            if (tcpSessions == null) {
+                if (newPort == 0) {
+                    newPort = FindFreePort(tcpSessions);
+                }
+
+                s.SetLocalPort((ushort) newPort);
+                return true;
+            }
+
+            // Take care to acquire the global sessions lock before the
+            // more specific lock for the TCP sessions list
+            lock (sessions.SyncRoot) {
+                lock (tcpSessions.SyncRoot) {
+                    if (newPort == 0) {
+                        // Find FreePort
+                        newPort = FindFreePort(tcpSessions);
+                    }
+
+                    if (newPort < 0)
+                        return false;
+
+                    // Deregister session
+                    Core.Instance().DeregisterSession(s.Protocol, s);
+
+                    // Reregister session
+                    s.SetLocalPort((ushort) newPort);
+                    Core.Instance().RegisterSession(s.Protocol, s);
+                    return true;
+                }
+            }
+        }
+
+        internal ArrayList GetSessions(IProtocol! protocol)
+        {
+            return (ArrayList)sessions[protocol];
+        }
+
+        public int GetSessionCount(IProtocol! protocol)
+        {
+            ArrayList tmp = (ArrayList)sessions[protocol];
+            if (tmp != null) return tmp.Count;
+            return 0;
+        }
+
+        private bool HandleSessionsOutboundQueue(Session! s)
+        {
+            DebugPrint("HandleSession {0} paused = {1} queued {2}\n",
+                       s.Uid, s.OutQueuePaused, s.outQueue.Count);
+
+            // Session may be paused if waiting on reception
+            // event, e.g. ARP response triggered by first
+            // outbound packet.
+            if (s.OutQueuePaused == true) {
+                return false;
+            }
+
+            NetPacket packet = s.GetPacket(s.outQueue, false, 0);
+            if (packet == null) {
+                return false;
+            }
+
+            if (packet.Mux == null)
+                packet.Mux = s.BoundMux;
+            s.Protocol.OnProtocolSend(packet);
+
+            // NOTE Special case; if this is a TCP session
+            // and we just transmitted the very last packet it will
+            // ever send, help out with the shutdown process by
+            // signalling this session closed.
+            TcpSession tcpS = s as TcpSession;
+
+            if ((tcpS != null) &&
+                (tcpS.stateContext == TCPFSM.CLOSED) &&
+                (tcpS.outQueue.Count == 0))
+            {
+                // That was the very last TCP frame for this session
+                tcpS.closedEvent.Set();
+            }
+
+            return true;
+        }
+
+        private bool IsAnyMuxBackLogged()
+        {
+            foreach (Multiplexer! m in this.muxTable) {
+                if (m.IsBackLogged) {
+                    DebugPrint("BackLogged\n");
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private int GetMaxOutgoingPackets()
+        {
+            int n = ((Multiplexer!)this.muxTable[0]).FreeBufferSpace;
+            for (int i = 1; i < this.muxTable.Count; i++) {
+                n = Math.Min(n,
+                             ((Multiplexer!)this.muxTable[i]).FreeBufferSpace);
+            }
+            return n;
+        }
+
+        static Random picker = new Random();
+
+        // handle outgoing queues...
+        // we handle outgoing queues of user sessions in two cases:
+        // 1. periodically using a timer
+        // 2. after handling received packets
+        internal NetStatus HandleOutgoingQueues(Dispatcher.CallbackArgs unused)
+        {
+            lock (sessions.SyncRoot)
+            {
+                DebugPrint("++++ OUTGOING QUEUE PASS ++++\n");
+                int todo = GetMaxOutgoingPackets();
+
+                DebugPrint("Driving Sessions (mux avail = {0})\n",
+                           GetMaxOutgoingPackets());
+
+                DebugPrint("Mux max packets = {0}\n", todo);
+                bool morePackets = true;
+                while (todo > 0 && morePackets) {
+                    morePackets = false;
+
+                    // TODO: Shuffle order
+                    // sessions are visited for some concept of
+                    // fairness.  This probably requires
+                    // redesigning The protocol session storage
+                    // because it's currently a hashtable and
+                    // this does not give a particularly
+                    // effective means to shuffle / rotate
+                    // entries.
+
+                    foreach (IProtocol! p in sessions.Keys) {
+                        ArrayList! x = (ArrayList!)sessions[p];
+                        int limit  = x.Count;
+                        int offset = picker.Next(x.Count);
+                        for (int i = 0; i < limit; i++) {
+                            Session! s = (Session!)x[(i + offset) % limit];
+                            if (HandleSessionsOutboundQueue(s)) {
+                                if (--todo == 0)
+                                    goto DoneDrivingQueues;
+                                morePackets |= true;
+                            }
+                        }
+                    }
+
+                    // To be really drive the outbound queue
+                    // todo = GetMaxOutgoingPackets();
+                }
+
+              DoneDrivingQueues:
+                DebugPrint("Driving Mux (mux avail = {0})\n",
+                           GetMaxOutgoingPackets());
+
+                for (int i = this.muxTable.Count - 1; i >= 0; i--) {
+                    Multiplexer! m = (Multiplexer!)this.muxTable[i];
+                    m.PushSendBuffer();
+                }
+
+                DebugPrint("Done Driving Mux (mux avail = {0})\n",
+                           GetMaxOutgoingPackets());
+
+                DebugPrint("---- OUTGOING QUEUE PASS ----\n");
+
+                if (morePackets) {
+                    // Make sure we wake up again
+                    SignalOutboundPackets();
+                }
+            }
+
+            return NetStatus.Code.RT_OK;
+        }
+
+        // INetModule interface
+        // ---------------------
+        // get the module's name
+        public string ModuleName  { get { return "Core"; } }
+
+        // get the modules version
+        public ushort ModuleVersion { get { return 0x01; } }  // 0.1
+
+        public bool Initialize(ProtocolParams args)
+        {
+            return true;
+        }
+
+        // start module activity, module specific.
+        // it is called by the runtime
+        public bool StartModule()
+        {
+            if (stopped) {
+                worker.Start();
+                stopped = false;
+            }
+            return true;
+        }
+
+        // stop module activity, module specific.
+        // it is called by the runtime
+        public bool StopModule()
+        {
+            if (!stopped) {
+                // Signal stop to dispatcher since worker thread
+                // is running dispatcher.
+                theDispatcher.Stop();
+                worker.Join();
+                stopped = true;
+            }
+            return true;
+        }
+
+        // destroy module, free unmanaged resources if any.
+        // it is called by the runtime
+        public bool DestroyModule()
+        {
+            StopModule();
+            return true;
+        }
+
+        // ------------------------------------------------------
+        // Core's data
+        // ------------------------------------------------------
+
+        // Sorted List of adapters <adapter, adapterDetails>
+        private ArrayList! adapters;
+
+        // Id number of next adapter added
+        private int adapterNextId;
+
+        // the protocol list
+        private SortedList! protocols;
+
+        // the packet types list
+        public PacketTypes packetTypes;
+
+        // out internal thread
+        protected Thread worker;
+
+        // should the thread stop?
+        protected bool stopped;
+
+        // the dispatcher instance, implements the event driven logic
+        protected Dispatcher! theDispatcher;
+        internal Dispatcher! TheDispatcher { get { return theDispatcher; } }
+
+        // the demux object, intercepts packets as they come and
+        // classifies them into flows
+        protected DeMultiplexer theDemux;
+        internal DeMultiplexer! TheDemux { get { return theDemux; } }
+
+        private ArrayList muxTable;
+
+        // the runtime active sessions
+        protected SessionsTable sessions;
+        internal SessionsTable Sessions { get { return sessions; } }
+
+        // This event is used to signal that there are outbound packets
+        private AutoResetEvent outboundPacketsEvent;
+        private AutoResetEvent inboundPacketsEvent;
+
+        // ------------------------------------------------------
+        // Core specific methods
+        // ------------------------------------------------------
+
+        internal class AdapterArgs : Dispatcher.CallbackArgs
+        {
+            internal IAdapter adapter;
+            internal string   deviceName;
+            internal int      fwQueueSize;
+
+            internal AdapterArgs(IAdapter theAdapter,
+                                 string   theDeviceName,
+                                 int      theQueueSize)
+            {
+                adapter     = theAdapter;
+                deviceName  = theDeviceName;
+                fwQueueSize = theQueueSize;
+            }
+        }
+
+        private NetStatus RegisterAdapterInternal(Dispatcher.CallbackArgs args)
+        {
+            AdapterArgs aa = (AdapterArgs!)args;
+
+            if (theDemux == null) {
+                theDemux = new DeMultiplexer();
+            }
+
+            Core.Log("Registering {0}", aa.deviceName);
+            adapters.Add(new AdapterInfo(aa.adapter, aa.deviceName));
+
+            Multiplexer mux = new Multiplexer(new Queue(aa.fwQueueSize),
+                                              aa.adapter);
+            muxTable.Add(mux);
+
+            theDispatcher.AddCallback(
+                new Dispatcher.Callback(mux.OnAdapterSendComplete),
+                null, aa.adapter.GetWriteHandle()
+                );
+
+            theDispatcher.AddCallback(
+                new Dispatcher.Callback(theDemux.OnAdapterReceive),
+                new DemuxAdapterArgs(aa.adapter), aa.adapter.GetReadHandle()
+                );
+
+            Core.Log("Registered adapter: {0}", aa.deviceName);
+
+            return NetStatus.Code.RT_OK;
+        }
+
+        private NetStatus
+        DeregisterAdapterInternal(Dispatcher.CallbackArgs args)
+        {
+            AdapterArgs aa = (AdapterArgs!)args;
+            IAdapter    ad = aa.adapter;
+
+            // XXX IP specific hack - should be replaced by a
+            // message to each module or some such.
+            IPModule ip = (IPModule)protocols["IP"];
+            if (ip != null) {
+                ip.HostConfiguration.Bindings.Flush(ad);
+            }
+
+            theDispatcher.RemoveCallback(ad.GetReadHandle());
+            theDispatcher.RemoveCallback(ad.GetWriteHandle());
+
+            foreach (AdapterInfo! ai in adapters) {
+                if (ai.Adapter == ad) {
+                    adapters.Remove(ad);
+                    break;
+                }
+            }
+
+            foreach (Multiplexer! m in muxTable) {
+                if (m.Adapter == ad) {
+                    muxTable.Remove(m);
+                }
+            }
+
+            Core.Log("Deregistered adapter: {0}", aa.deviceName);
+
+            return NetStatus.Code.RT_OK;
+        }
+
+        public void RegisterAdapter(IAdapter ad,
+                                    string   nsName,
+                                    int      fwQueueSize)
+        {
+            theDispatcher.AddCallback(
+                new Dispatcher.Callback(this.RegisterAdapterInternal),
+                new AdapterArgs(ad, nsName, fwQueueSize)
+                );
+        }
+
+        public void DeregisterAdapter(IAdapter ad)
+        {
+            theDispatcher.AddCallback(
+                new Dispatcher.Callback(this.DeregisterAdapterInternal),
+                new AdapterArgs(ad, null, 0)
+                );
+        }
+
+        public IAdapter GetAdapterByDeviceName(string deviceName)
+        {
+            foreach (AdapterInfo! ai in adapters) {
+                if (ai.DeviceName == deviceName) {
+                    return ai.Adapter;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get collection of AdapterInfo instances associated
+        /// with adapters.
+        /// </summary>
+        public ICollection! GetAdapterInfoCollection()
+        {
+            return adapters;
+        }
+
+        // return the mux for the given adapter
+        internal Multiplexer GetMuxForAdapter(IAdapter ad)
+        {
+            foreach (Multiplexer! m in muxTable) {
+                if (m.Adapter == ad) {
+                    return m;
+                }
+            }
+            return null;
+        }
+
+        public bool RegisterProtocol(IProtocol! protocol)
+        {
+            try {
+                protocols[protocol.ModuleName] = protocol;
+                return true;
+            }
+            catch (ArgumentException)
+            {
+                return false;
+            }
+        }
+
+        public bool DeregisterProtocol(IProtocol! protocol)
+        {
+            IProtocol found = protocols[protocol.ModuleName] as IProtocol;
+            if (found == protocol) {
+                protocols.Remove(protocol.ModuleName);
+                return true;
+            }
+            return false;
+        }
+
+        // get a protocol reference identified by name
+        public IProtocol GetProtocolByName(string protocolName)
+        {
+            if (protocolName == null)
+                return null;
+            return protocols[protocolName] as IProtocol;
+        }
+
+        /**
+         * Dispatch an incoming packets
+         * this method actually drives the
+         * packet through the stack's modules.
+         */
+        private NetStatus DispatchPacket(NetPacket! pkt)
+        {
+            // look at the ethernet headers...
+            EthernetAddress src, dst;
+            ushort prot = 0;
+
+            if (EthernetFormat.Read(pkt, out src, out dst, out prot)) {
+                IProtocol protocol = packetTypes.GetHandler(prot);
+                if (protocol != null) {
+                    NetStatus res = protocol.OnProtocolReceive(pkt);
+                    if (res == NetStatus.Code.PROTOCOL_PROCESSING) {
+                        return NetStatus.Code.RT_OK;
+                    }
+                    if (res == NetStatus.Code.PROTOCOL_PANIC) {
+                        Panic(String.Format("Protocol {0} panicked!!!",
+                                            protocol.ModuleName));
+
+                        // if the protocol has finished with the packet, return it!
+                    }
+                }
+            }
+
+            // no handler, return the packet
+            theDemux.TakeFreePacket(pkt);
+            return NetStatus.Code.RT_DROP_NO_HANDLER;
+        }
+
+        // get the protocol interface from an ID
+        // (ignore packet level protocols)
+        internal IProtocol GetProtocolFromID(byte prot)
+        {
+            IProtocol p = null;
+
+            // checkout the protocol list for this one
+            foreach (string retProtName in protocols.Keys) {
+                p = (IProtocol!)protocols[retProtName];
+                ushort pID = p.GetProtocolID();
+                if (EthernetFormat.IsEthernetProtocol(pID))
+                    continue;
+                if (prot == (byte)pID)
+                    break;
+            }
+            return p;
+        }
+
+        public static void Panic(string reason)
+        {
+            Core.Log("NetStack Panic: {0}", reason);
+            DebugStub.Break();
+#if !SINGULARITY
+            Environment.Exit(1);
+#endif
+        }
+
+        public static void Panic(string format, params object[] args)
+        {
+            Core.Panic(String.Format(format, args));
+        }
+
+        public static void Log(string message)
+        {
+            DebugStub.Print("NetStack: {0}\n", __arglist(message));
+        }
+
+        public static void Log(string format, params object[] args)
+        {
+            Core.Log(String.Format(format, args));
+        }
+
+        public static void LogData(byte []! Data)
+        {
+            LogData(Data, 0, Data.Length);
+        }
+
+        public static void LogData(byte []! data, int offset, int length)
+        {
+            length = Math.Min(length, data.Length);
+
+            for (int i = offset; i < length; i += 16) {
+                DebugStub.Print("{0:x4}  ", __arglist(i));
+                int n = Math.Min(16, length - i) + i;
+                for (int j = i; j < n; j++)
+                    DebugStub.Print("{0:x2} ", __arglist(data[j]));
+                for (int j = n; j != i + 16; j++)
+                    DebugStub.Print("   ");
+                DebugStub.Print("  ");
+                for (int j = i; j < n; j++) {
+                    char c = '.';
+                    if (data[j] > 31 && data[j] < 128)
+                        c = (char)data[j];
+                    DebugStub.Print("{0}", __arglist(c));
+                }
+                DebugStub.Print("\n");
+            }
+        }
+
+        // the core's activation routine, beware...
+        // (this is a go/no-go method)
+        public void Activate()
+        {
+            Core.Log("NetStack Core Runtime Active...");
+
+            // since all the protocols are initialized
+            // start them up (start module)
+            foreach (string protName in protocols.Keys) {
+                IProtocol protocol = (IProtocol!)protocols[protName];
+                if (protocol.StartModule() == false) {
+                    Core.Panic("Module {0} failed to start, exit.",
+                               protocol.ModuleName);
+                }
+            }
+
+            // register a callback to handle outgoing queues
+            theDispatcher.AddCallback(
+                new Dispatcher.Callback(this.HandleOutgoingQueues),
+                null, outboundPacketsEvent
+                );
+
+            // register a callback to handle incoming queue
+            theDispatcher.AddCallback(
+                new Dispatcher.Callback(this.HandleIncomingQueue),
+                null, inboundPacketsEvent
+                );
+
+            // create the worker
+            // now, pass control to the dispatcher...
+            worker = new Thread(new ThreadStart(theDispatcher.Execute));
+            worker.Start();
+            activated = true;
+        }
+
+        public void ProvisionDemux(int freePacketCount, int packetSize)
+        {
+            if (activated == true)
+                Core.Panic("Cannot provision demux after Core.Activate()");
+            theDemux = new DeMultiplexer();
+        }
+
+        private NetStatus HandleIncomingQueue(Dispatcher.CallbackArgs unused)
+        {
+            const int PacketsToHandleBeforeYield = 25;
+
+            int n = PacketsToHandleBeforeYield;
+            while (n-- > 0 && theDemux.PacketsReady) {
+                NetPacket p = theDemux.GetReceivedPacket();
+                if (p == null) {
+                    break;
+                }
+                DispatchPacket(p);
+            }
+            if (theDemux.PacketsReady) {
+                SignalInboundPackets();
+            }
+            return NetStatus.Code.RT_OK;
+        }
+
+        // Call this to indicate that outbound packets are waiting
+        public void SignalOutboundPackets()
+        {
+            outboundPacketsEvent.Set();
+        }
+
+        // Call this to indicate that outbound packets are waiting
+        public void SignalInboundPackets()
+        {
+            inboundPacketsEvent.Set();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/DeMux.cs b/base/Services/NetStack/Runtime/DeMux.cs
new file mode 100644
index 0000000..7eacb93
--- /dev/null
+++ b/base/Services/NetStack/Runtime/DeMux.cs
@@ -0,0 +1,91 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using NetStack.Common;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+using NetStack.Protocols;
+
+namespace NetStack.Runtime
+{
+    // Helper class to help feed packets from adapter into DeMultiplexer
+    public class DemuxAdapterArgs : Dispatcher.CallbackArgs
+    {
+        private IAdapter! adapter;
+
+        public DemuxAdapterArgs(IAdapter! adapter)
+        {
+            this.adapter = adapter;
+            base();
+        }
+        public IAdapter! Adapter { get { return adapter; } }
+    }
+
+    // This class provides the basic demultiplexing of packets as
+    // they come in from a network device.  This component of the
+    // system is critical for several reasons.  First, it is the place
+    // where backpressure is applied; this should be the only place
+    // in the system where packets are thrown away because of overload
+    // Second, it is the place where "flows" in the system are separated
+    // and where their resource controls are applied; subsequent
+    // processing can be done entirely with the resources (including
+    // potentially CPU resources) belonging to the "flow".
+    public class DeMultiplexer
+    {
+        // Private data
+        private Queue! rxQueue;
+        private Queue! tmpQueue;
+
+        [NotDelayed]
+        public DeMultiplexer()
+        {
+            this.rxQueue  = new Queue();
+            this.tmpQueue = new Queue();
+            base();
+        }
+
+        // Add a new packet to the free list
+        public void TakeFreePacket(NetPacket! pkt)
+        {
+            IAdapter! adapter = (IAdapter!)pkt.AdapterContext;
+            pkt.Reset();
+            adapter.PopulateRxRing(pkt);
+        }
+
+        public bool PacketsReady { get { return rxQueue.Count > 0; } }
+
+        public NetPacket! GetReceivedPacket()
+        {
+            NetPacket! pkt = (NetPacket!)this.rxQueue.Dequeue();
+            DebugStub.Assert(pkt.AdapterContext != null);
+            return pkt;
+        }
+
+        public NetStatus OnAdapterReceive(Dispatcher.CallbackArgs ca)
+        {
+            DemuxAdapterArgs daa      = (DemuxAdapterArgs!)ca;
+            IAdapter         adapter  = daa.Adapter;
+
+            adapter.GetReceivedPackets(this.tmpQueue);
+            while (tmpQueue.Count > 0) {
+                NetPacket! np     = (NetPacket!)this.tmpQueue.Dequeue();
+                np.AdapterContext = adapter;
+                rxQueue.Enqueue(np);
+            }
+            Core.Instance().SignalInboundPackets();
+            return NetStatus.Code.RT_OK;
+        }
+    } // DeMultiplexer
+} // NetStack
+// End
diff --git a/base/Services/NetStack/Runtime/DhcpClient.cs b/base/Services/NetStack/Runtime/DhcpClient.cs
new file mode 100644
index 0000000..63921c9
--- /dev/null
+++ b/base/Services/NetStack/Runtime/DhcpClient.cs
@@ -0,0 +1,501 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Netstack / Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DhcpClientSession.cs
+//
+//  Note:   DHCP Client Session.
+//
+
+//#define DEBUG_DHCP_CLIENT
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+
+#if SINGULARITY
+using Microsoft.Singularity;
+#else
+using System.Net;
+#endif
+
+namespace NetStack.Runtime
+{
+    using Protocols;
+
+    /// <summary>
+    /// A DhcpClient acts as a DHCP Client on a particular interface.
+    ///
+    /// The implementation is based on RFC2131.
+    /// </summary>
+    public class DhcpClient
+    {
+        private IAdapter        adapter;
+        private UdpSession      udpSession;
+        private Thread          workerThread;
+        private bool            workerDone;
+        private DhcpClientState @state;
+        private SortedList      activeDhcpOptions;
+
+        private DateTime    renewalTimeout;
+        private DateTime    rebindTimeout;
+        private DateTime    stateTimeout;
+        private DateTime    transactionStart;
+        private uint        transactionID;
+
+        public static byte [] StandardRequestParameters = new byte [] {
+                DhcpSubnetMask.OptionCode,
+                DhcpRouter.OptionCode,
+                DhcpHostName.OptionCode,
+                DhcpTimeOffset.OptionCode,
+                DhcpDomainNameServer.OptionCode,
+                DhcpDomainName.OptionCode,
+                DhcpInterfaceMtu.OptionCode,
+                DhcpRouterDiscovery.OptionCode,
+                DhcpStaticRoutes.OptionCode,
+                DhcpRenewalTime.OptionCode,
+                DhcpRebindingTime.OptionCode,
+                DhcpIPAddressLeaseTime.OptionCode,
+                DhcpVendorSpecific.OptionCode
+            };
+
+        private const int PollMillis = 1000;
+
+        [ Conditional("DEBUG_DHCP_CLIENT") ]
+        internal static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log("DhcpClient: ");
+            Core.Log(format, args);
+        }
+
+        public DhcpClient(IAdapter adapter)
+        {
+            this.adapter = adapter;
+            transactionID = (uint)(new Random()).Next();
+        }
+
+        ~DhcpClient()
+        {
+            if (workerThread != null)
+            {
+                Stop();
+            }
+        }
+
+        public IAdapter Adapter
+        {
+            get { return adapter; }
+        }
+
+        public EthernetAddress MacAddress
+        {
+            get { return adapter.HardwareAddress; }
+        }
+
+        public DateTime TransactionStart
+        {
+            get { return transactionStart; }
+        }
+
+        public ushort TransactionSeconds
+        {
+            get {
+                TimeSpan delta = DateTime.Now - transactionStart;
+                return (ushort)delta.Seconds;
+            }
+        }
+
+        public uint TransactionID
+        {
+            get { return transactionID; }
+        }
+
+        public bool Start()
+        {
+            lock (this)
+            {
+                if (udpSession != null)
+                {
+                    return false;
+                }
+
+                Core core = Core.Instance();
+                UdpModule udpModule =
+                    core.GetProtocolByName("UDP") as UdpModule;
+                if (udpModule == null)
+                {
+                    DebugPrint("DhcpClient.Start() failed -- " +
+                               "UdpModule not found.\n");
+                    return false;
+                }
+
+                udpSession = udpModule.CreateBoundSession(
+                                 IPv4.Any, DhcpFormat.ClientPort,
+                                 IPv4.Any, DhcpFormat.ServerPort
+                                 );
+                udpSession.BoundMux = core.GetMuxForAdapter(adapter);
+                ResetAdapterIPInfo();
+
+                workerDone = false;
+                workerThread = new Thread(new ThreadStart(WorkerMain));
+#if !SINGULARITY
+                workerThread.Name = String.Format("DhcpClient/{0}",
+                                                  adapter.HardwareAddress);
+#endif
+                workerThread.Start();
+                return true;
+            }
+        }
+
+        public void Stop()
+        {
+            lock (this)
+            {
+                workerDone = true;
+                workerThread.Join();
+
+                udpSession.Close();
+                udpSession = null;
+                workerThread = null;
+
+                CancelTimeouts();
+                @state = null;
+            }
+            DebugPrint("DhcpClient.Stop()\n");
+        }
+
+        private bool SetTimeout(ref DateTime timeout, DateTime when)
+        {
+            timeout = when;
+            return timeout >= DateTime.Now;
+        }
+
+        internal void SetRenewalTimeout(DateTime when)
+        {
+            if (SetTimeout(ref renewalTimeout, when) == false)
+                DebugPrint("Set renewal timeout in the past!\n");
+        }
+
+        internal void CancelRenewalTimeout()
+        {
+            renewalTimeout = DateTime.MaxValue;
+        }
+
+        internal void SetRebindTimeout(DateTime when)
+        {
+            if (SetTimeout(ref rebindTimeout, when) == false)
+                DebugPrint("Set rebind timeout in the past!\n");
+        }
+
+        internal void CancelRebindTimeout()
+        {
+            rebindTimeout = DateTime.MaxValue;
+        }
+
+        internal void SetStateTimeout(DateTime when)
+        {
+            if (SetTimeout(ref stateTimeout, when) == false)
+                DebugPrint("Set state timeout in the past!\n");
+        }
+
+        internal void CancelStateTimeout()
+        {
+            stateTimeout = DateTime.MaxValue;
+        }
+
+        internal void CancelTimeouts()
+        {
+            CancelRenewalTimeout();
+            CancelRebindTimeout();
+            CancelStateTimeout();
+        }
+
+        internal void ChangeState(DhcpClientState newState)
+        {
+            assert newState != null;
+            @state = newState;
+            newState.EnterEvent();
+            DebugPrint("ChangeState -> {0}\n", newState.Name);
+        }
+
+        internal bool InstallDhcpOptions(SortedList! dhcpOptions)
+        {
+            if (activeDhcpOptions != null)
+                UninstallDhcpOptions();
+
+            IPModule ip = (IPModule) Core.Instance().GetProtocolByName("IP");
+            if (ip == null)
+            {
+                DebugPrint("Failed to get IP Module\n");
+                return false;
+            }
+
+            //
+            // Add interface address binding
+            //
+            DhcpIPv4Option address =
+                dhcpOptions[DhcpRequestedIPAddress.OptionCode]
+                as DhcpIPv4Option;
+
+            DhcpIPv4Option netmask =
+                dhcpOptions[DhcpSubnetMask.OptionCode] as DhcpIPv4Option;
+
+            DhcpMultiIPv4Option routers =
+                dhcpOptions[DhcpRouter.OptionCode] as DhcpMultiIPv4Option;
+
+            if (address == null || netmask == null || routers == null ||
+                routers.Values.Length == 0)
+            {
+                return false;
+            }
+
+            ip.HostConfiguration.Bindings.Add(
+                adapter, new InterfaceIPConfiguration(address.Value,
+                                                      netmask.Value,
+                                                      routers.Values[0])
+                );
+
+            //
+            // Register Domain name
+            //
+            DhcpStringOption domain =
+                dhcpOptions[DhcpDomainName.OptionCode] as DhcpStringOption;
+
+            //            string domainName = ip.HostConfiguration.GetDomainName();
+            // never used
+            if (domain != null)
+            {
+                ip.HostConfiguration.SetDomainName(domain.Value);
+            }
+
+            //
+            // Add DNS servers
+            //
+            DhcpMultiIPv4Option dnsServers =
+                dhcpOptions[DhcpDomainNameServer.OptionCode]
+                as DhcpMultiIPv4Option;
+            if (dnsServers != null)
+            {
+                foreach (IPv4 server in dnsServers.Values)
+                {
+                    ip.HostConfiguration.AddNameServer(server);
+                }
+            }
+
+            //
+            // Install static routes
+            //
+            DhcpMultiIPv4Option staticRoutes =
+                dhcpOptions[DhcpStaticRoutes.OptionCode]
+                as DhcpMultiIPv4Option;
+            if (staticRoutes != null)
+            {
+                int routeCount = staticRoutes.Values.Length & ~1; // pairs
+                for (int i = 0; i < routeCount; i += 2)
+                {
+                    IPv4 destination = staticRoutes.Values[i];
+                    IPv4 gateway     = staticRoutes.Values[i + 1];
+                    IPv4 ifAddress   = address.Value;
+                    ip.HostConfiguration.RoutingTable.AddRoute(
+                        new RouteEntry(destination, gateway, ifAddress,
+                                       RouteEntry.DefaultRouteMetric, 0)
+                        );
+                }
+            }
+
+            activeDhcpOptions = dhcpOptions;
+            return true;
+        }
+
+        internal void UninstallDhcpOptions()
+        {
+            // Back-out options
+            IPModule ip = (IPModule!) Core.Instance().GetProtocolByName("IP");
+
+            DhcpIPv4Option address = (DhcpIPv4Option!)
+                activeDhcpOptions[DhcpRequestedIPAddress.OptionCode];
+
+            IPv4 ifAddress = address.Value;
+
+            //
+            // Remove routes associated with interface address
+            //
+            ip.HostConfiguration.RoutingTable.DeleteInterfaceRoutes(ifAddress);
+
+            //
+            // Remove name server
+            //
+            DhcpMultiIPv4Option dnsServers =
+                activeDhcpOptions[DhcpDomainNameServer.OptionCode]
+                as DhcpMultiIPv4Option;
+            if (dnsServers != null)
+            {
+                foreach (IPv4 server in dnsServers.Values)
+                {
+                    ip.HostConfiguration.AddNameServer(server);
+                }
+            }
+
+            //
+            // Leave domain name in place
+            //
+
+            // If we wanted to remove it...
+            DhcpStringOption domain =
+                activeDhcpOptions[DhcpDomainName.OptionCode]
+                as DhcpStringOption;
+
+            string domainName = ip.HostConfiguration.GetDomainName();
+            if (domain != null && domainName == domain.Value)
+            {
+                ip.HostConfiguration.SetDomainName("");
+            }
+
+            //
+            // Remove interface address bindings
+            //
+            ip.HostConfiguration.Bindings.Flush(adapter, ifAddress);
+
+            activeDhcpOptions = null;
+        }
+
+        internal void StartNewTransaction()
+        {
+            transactionID++;
+            transactionStart = DateTime.Now;
+        }
+
+        private void WorkerMain()
+        {
+            DebugPrint("Worker starting\n");
+
+            Random r = new Random();
+            transactionID = (uint)r.Next();
+
+            DateTime startTime = DateTime.Now;
+
+            // Enter "Init" state of FSM
+            ChangeState(new DhcpClientStateInitialize(this));
+
+            while (workerDone == false)
+            {
+                // Check for timeouts
+                DateTime now = DateTime.Now;
+                if (now >= renewalTimeout)
+                {
+                    CancelRenewalTimeout();
+                    @state.RenewalTimeoutEvent();
+                }
+                if (now >= rebindTimeout)
+                {
+                    CancelRebindTimeout();
+                    @state.RebindTimeoutEvent();
+                }
+                if (now >= stateTimeout)
+                {
+                    CancelStateTimeout();
+                    @state.StateTimeoutEvent();
+                }
+
+                // Poll for data
+                try
+                {
+                    byte [] data = udpSession.PollCopyData(PollMillis);
+                    if (data != null)
+                    {
+                        SimpleBuffer sb = new SimpleBuffer(data);
+                        DhcpFormat dhcp = DhcpFormat.Parse(sb);
+
+                        // Check transaction id is ours
+                        if (dhcp.TransactionID != transactionID)
+                        {
+                            continue;
+                        }
+
+                        // Check client address is ours
+                        if (dhcp.GetHardwareAddress() != MacAddress)
+                        {
+                            continue;
+                        }
+
+                        @state.ReceiveEvent(dhcp);
+                    }
+                }
+                catch (InvalidDhcpFormatException idfe)
+                {
+                    DebugPrint(idfe.Message);
+                }
+
+                // XXX Temporary until process can run in background
+                // from shell.  ie we'd like to run and renew lease
+                // but shell blocks on running process and cleans up
+                // after it for the time being.
+                if (activeDhcpOptions != null)
+                {
+                    DebugPrint("Got options -- done\n");
+                    break;
+                }
+
+                if (DateTime.Now - startTime > TimeSpan.FromSeconds(5))
+                {
+                    DebugPrint("Timed out\n");
+                    break;
+                }
+            }
+        }
+
+        internal void ResetAdapterIPInfo()
+        {
+        }
+
+        internal bool Send(EthernetAddress dstAddr, DhcpFormat! dhcp)
+        {
+            int packetSize = dhcp.Size + UdpFormat.Size +
+                IPFormat.Size + EthernetFormat.Size;
+
+            byte [] packet = new byte [packetSize];
+
+            // Write out DHCP packet
+            int dhcpSize = dhcp.Size;
+            int dhcpOffset = packet.Length - dhcpSize;
+            dhcp.Write(packet, dhcpOffset);
+
+            // Create UDP Header
+            UdpFormat.UdpHeader udpHeader = new UdpFormat.UdpHeader();
+            udpHeader.srcPort = DhcpFormat.ClientPort;
+            udpHeader.dstPort = DhcpFormat.ServerPort;
+            udpHeader.length  = (ushort)(UdpFormat.Size + dhcpSize);
+
+            // Create IP Header
+            IPFormat.IPHeader ipHeader = new NetStack.Protocols.IPFormat.IPHeader();
+            ipHeader.SetDefaults(IPFormat.Protocol.UDP);
+            IPFormat.SetDontFragBit(ipHeader);
+
+            ipHeader.Source      = IPv4.Any;
+            ipHeader.Destination = IPv4.Broadcast;
+            ipHeader.totalLength = (ushort)(IPFormat.Size + UdpFormat.Size + dhcpSize);
+
+            // Write out IP and Header
+            int udpOffset = packet.Length - dhcp.Size - UdpFormat.Size;
+            int ipOffset = udpOffset - IPFormat.Size;
+            UdpFormat.WriteUdpPacket(packet, ipOffset,
+                                     ipHeader, ref udpHeader,
+                                     packet, dhcpOffset, dhcpSize);
+
+            // Add Ethernet Header
+            EthernetFormat.Write(packet, 0, adapter.HardwareAddress,
+                                 dstAddr, EthernetFormat.PROTOCOL_IP);
+
+            NetPacket np = new NetPacket(packet);
+            return udpSession.WritePacket(np);
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/DhcpClientFSM.cs b/base/Services/NetStack/Runtime/DhcpClientFSM.cs
new file mode 100644
index 0000000..047eaf3
--- /dev/null
+++ b/base/Services/NetStack/Runtime/DhcpClientFSM.cs
@@ -0,0 +1,443 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Netstack / Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DhcpClientFSM.cs
+//
+//  Description:   DHCP Client Finite State machine.
+//
+//  Note: This file does not yet implement the RENEWING or
+//        REBINDING states.
+
+using System;
+using System.Diagnostics;
+using System.Collections;
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    using Protocols;
+
+    class DhcpClientState
+    {
+        protected DhcpClient client;
+        protected string     stateName;
+
+        internal DhcpClientState(DhcpClient client, string stateName)
+        {
+            this.client    = client;
+            this.stateName = stateName;
+        }
+
+        internal string Name
+        {
+            get { return stateName; }
+        }
+
+        /// <summary>
+        /// State should perform processing as DhcpClient recognizes it
+        /// as the currently active event.
+        /// </summary>
+        internal virtual void EnterEvent()
+        {
+            Core.Log("Entering State {0}\n", stateName);
+        }
+
+        /// <summary>
+        /// State should process that has arrived.
+        /// </summary>
+        internal virtual void ReceiveEvent(DhcpFormat! df)
+        {
+            DhcpClient.DebugPrint("FSM Ignored DHCP packet: {0}\n", stateName);
+        }
+
+        /// <summary>
+        /// Renewal timer expiry event.
+        /// </summary>
+        internal virtual void RenewalTimeoutEvent()
+        {
+            DhcpClient.DebugPrint("FSM Renewal Timeout: {0}\n", stateName);
+        }
+
+        /// <summary>
+        /// Rebind timer expiry event.
+        /// </summary>
+        internal virtual void RebindTimeoutEvent()
+        {
+            DhcpClient.DebugPrint("FSM Rebind Timeout: {0}\n", stateName);
+        }
+
+        /// <summary>
+        /// General purpose timer expiry event.
+        /// </summary>
+        internal virtual void StateTimeoutEvent()
+        {
+            DhcpClient.DebugPrint("FSM State Specific Timeout: {0}\n",
+                                  stateName);
+        }
+    };
+
+    internal class DhcpClientStateInitialize : DhcpClientState
+    {
+        internal DhcpClientStateInitialize(DhcpClient client)
+            : base(client, "Initialize")
+        {
+        }
+
+        internal override void EnterEvent()
+        {
+            client.StartNewTransaction();
+
+            DhcpFormat dhcp =
+                new DhcpFormat(DhcpFormat.MessageType.Discover);
+
+            dhcp.TransactionID = client.TransactionID;
+            dhcp.SetHardwareAddress(client.MacAddress);
+
+#if ADVERTISE_CLIENT_ID
+            // Add Client Identifier for self
+            //
+            // This is disabled because the Windows
+            // DHCP server allocates us a different address with the
+            // client id present if we networked booted.  Thus having the
+            // identifier breaks static DHCP entries which we use
+            // for test machines.
+            EthernetAddress macAddress = client.MacAddress;
+            dhcp.AddOption(DhcpClientID.Create(macAddress.GetAddressBytes()));
+#endif
+
+            // Add parameters we'd like to know about
+            dhcp.AddOption(DhcpParameterRequest.Create(
+                               DhcpClient.StandardRequestParameters
+                               )
+                           );
+            // dhcp.AddOption(DhcpAutoConfigure.Create(0));
+            client.Send(EthernetAddress.Broadcast, dhcp);
+            client.ChangeState(new DhcpClientStateSelecting(client));
+        }
+    }
+
+    internal class DhcpClientStateSelecting : DhcpClientState
+    {
+        private readonly TimeSpan StateTimeout = TimeSpan.FromSeconds(5);
+
+        internal DhcpClientStateSelecting(DhcpClient client)
+            : base(client, "Selecting")
+        {
+        }
+
+        internal override void EnterEvent()
+        {
+            client.SetStateTimeout(DateTime.Now + StateTimeout);
+        }
+
+        internal override void StateTimeoutEvent()
+        {
+            // Received no valid offers
+            client.ChangeState(new DhcpClientStateInitialize(client));
+        }
+
+        internal override void ReceiveEvent(DhcpFormat! dhcp)
+        {
+            // Check if message is in response to our request
+            if (dhcp.BootMessageType != DhcpFormat.BootType.Reply   ||
+                dhcp.TransactionID != client.TransactionID          ||
+                dhcp.GetHardwareAddress() != client.MacAddress)
+            {
+                return;
+            }
+
+            IPv4 serverAddress = dhcp.NextServerIPAddress;
+
+            // Check if offered address is valid (ie not zero
+            // and below class E)
+            IPv4 offeredAddress = dhcp.YourIPAddress;
+            if (offeredAddress == IPv4.Any || offeredAddress.IsMulticast())
+            {
+                return;
+            }
+
+            // Check if message is an offer
+            SortedList offeredOptions = dhcp.GetOptions();
+            DhcpByteOption messageType
+                = offeredOptions[DhcpMessageType.OptionCode] as DhcpByteOption;
+            if (messageType == null ||
+                messageType.Value != (byte)DhcpFormat.MessageType.Offer)
+            {
+                return;
+            }
+
+            // Must have parameters
+            byte [] parameters = new byte [] {
+                DhcpSubnetMask.OptionCode,
+                DhcpRouter.OptionCode,
+                DhcpDomainNameServer.OptionCode
+            };
+            foreach (byte p in parameters)
+            {
+                IDhcpOption ido = offeredOptions[p] as IDhcpOption;
+                if (ido == null)
+                {
+                    return;
+                }
+            }
+
+            client.CancelStateTimeout();
+            client.ChangeState(new DhcpClientStateRequesting(client,
+                                                             serverAddress,
+                                                             offeredAddress,
+                                                             offeredOptions));
+        }
+    }
+
+    internal class DhcpClientStateRequesting : DhcpClientState
+    {
+        IPv4       serverAddress;
+        IPv4       offeredAddress;
+        SortedList offeredOptions;
+
+        private readonly TimeSpan StateTimeout = TimeSpan.FromSeconds(5);
+
+        internal DhcpClientStateRequesting(DhcpClient client,
+                                           IPv4       serverAddress,
+                                           IPv4       offeredAddress,
+                                           SortedList offeredOptions)
+            : base(client, "Requesting")
+        {
+            this.serverAddress  = serverAddress;
+            this.offeredAddress = offeredAddress;
+            this.offeredOptions = offeredOptions;
+        }
+
+        internal override void EnterEvent()
+        {
+            client.SetStateTimeout(DateTime.Now + StateTimeout);
+
+            DhcpFormat dhcp =
+                new DhcpFormat(DhcpFormat.MessageType.Request);
+
+            dhcp.TransactionID      = client.TransactionID;
+            dhcp.TransactionSeconds = client.TransactionSeconds;
+            dhcp.SetHardwareAddress(client.MacAddress);
+#if ADVERTISE_CLIENT_ID
+            dhcp.AddOption(
+                DhcpClientID.Create(client.MacAddress.GetAddressBytes())
+                );
+#endif
+            dhcp.AddOption(
+                DhcpRequestedIPAddress.Create(offeredAddress)
+                );
+
+            // Add parameters we'd like to know about
+            dhcp.AddOption(DhcpParameterRequest.Create(
+                               DhcpClient.StandardRequestParameters
+                               )
+                           );
+
+            client.Send(EthernetAddress.Broadcast, dhcp);
+        }
+
+        private static void TakeOption(SortedList! offeredOptions,
+                                       byte        optionCode,
+                                       DhcpFormat! dhcpFormat)
+        {
+            IDhcpOption option = offeredOptions[optionCode] as IDhcpOption;
+            if (option != null)
+            {
+                dhcpFormat.AddOption(option);
+            }
+        }
+
+        internal override void StateTimeoutEvent()
+        {
+            client.ChangeState(new DhcpClientStateInitialize(client));
+        }
+
+        internal override void ReceiveEvent(DhcpFormat! dhcp)
+        {
+            // Check if message is in response to our request
+            if (dhcp.BootMessageType != DhcpFormat.BootType.Reply   ||
+                dhcp.TransactionID != client.TransactionID          ||
+                dhcp.GetHardwareAddress() != client.MacAddress)
+            {
+                return;
+            }
+
+            IPv4 serverAddress = dhcp.NextServerIPAddress;
+
+            // Check if offered address is valid (ie not zero
+            // and below class E)
+            IPv4 offeredAddress = dhcp.YourIPAddress;
+            if (offeredAddress == IPv4.Any || offeredAddress.IsMulticast())
+            {
+                return;
+            }
+
+            // Check if message is an ack
+            SortedList offeredOptions = dhcp.GetOptions();
+            DhcpByteOption messageType
+                = offeredOptions[DhcpMessageType.OptionCode] as DhcpByteOption;
+            if (messageType == null)
+            {
+                return;
+            }
+
+            switch (messageType.Value)
+            {
+                case (byte) DhcpFormat.MessageType.Ack:
+                    break;
+                case (byte) DhcpFormat.MessageType.Nak:
+                    client.ChangeState(new DhcpClientStateInitialize(client));
+                    return;
+                default:
+                    return;
+            }
+
+            // Must have parameters
+            byte [] parameters = new byte [] {
+                DhcpSubnetMask.OptionCode,
+                DhcpRouter.OptionCode,
+                DhcpDomainNameServer.OptionCode
+            };
+
+            foreach (byte p in parameters)
+            {
+                IDhcpOption ido = offeredOptions[p] as IDhcpOption;
+                if (ido == null)
+                {
+                    return;
+                }
+            }
+
+            client.CancelStateTimeout();
+            client.ChangeState(new DhcpClientStateBound(client,
+                                                        serverAddress,
+                                                        offeredAddress,
+                                                        offeredOptions));
+        }
+    }
+
+    internal class DhcpClientStateBound : DhcpClientState
+    {
+        private IPv4       serverAddress;
+        private IPv4       hostAddress;
+        private SortedList hostOptions;
+
+        internal DhcpClientStateBound(DhcpClient client,
+                                      IPv4       serverAddress,
+                                      IPv4       hostAddress,
+                                      SortedList hostOptions)
+            : base(client, "Bound")
+        {
+            this.serverAddress = serverAddress;
+            this.hostAddress   = hostAddress;
+            this.hostOptions   = hostOptions;
+        }
+
+        internal override void EnterEvent()
+        {
+            // Yay! We got DHCP configuration information
+            DateTime now = DateTime.Now;
+
+            // Set up renewal timer
+            DhcpDWordOption renewalOption =
+                hostOptions[DhcpRenewalTime.OptionCode] as DhcpDWordOption;
+
+            uint renewalSeconds = 3600;
+            if (renewalOption != null)
+            {
+                renewalSeconds = renewalOption.Value;
+            }
+            client.SetRenewalTimeout(now + TimeSpan.FromSeconds(renewalSeconds));
+
+            // Set up rebinding timer
+            DhcpDWordOption rebindOption =
+                hostOptions[DhcpRebindingTime.OptionCode] as DhcpDWordOption;
+            uint rebindSeconds = renewalSeconds + 60;
+            if (rebindOption != null)
+            {
+                rebindSeconds = Math.Max(rebindOption.Value,
+                                         renewalSeconds + 1);
+            }
+            client.SetRebindTimeout(now + TimeSpan.FromSeconds(rebindSeconds));
+
+            // Add host address as a dhcp option and then get client
+            // to install settings.
+            hostOptions[DhcpRequestedIPAddress.OptionCode] =
+                DhcpRequestedIPAddress.Create(hostAddress);
+
+            if (client.InstallDhcpOptions(hostOptions) == false)
+            {
+                client.ChangeState(new DhcpClientStateInitialize(client));
+            }
+            Console.WriteLine("\nDHCP client acquired lease of {0} for {1} " +
+                              "seconds.", hostAddress, rebindSeconds);
+        }
+
+        internal override void ReceiveEvent(DhcpFormat! dhcp)
+        {
+            // ignore
+        }
+
+        internal override void RenewalTimeoutEvent()
+        {
+#if NOTYET
+            client.ChangeState(new DhcpClientStateRenewing(client,
+                                                           hostOptions));
+#endif
+        }
+    }
+
+    internal class DhcpClientStateRenewing : DhcpClientState
+    {
+        SortedList hostOptions;
+
+        internal DhcpClientStateRenewing(DhcpClient client,
+                                         SortedList hostOptions)
+            : base(client, "Renewing")
+        {
+            this.hostOptions = hostOptions;
+        }
+
+        internal override void EnterEvent()
+        {
+        }
+
+        internal override void ReceiveEvent(DhcpFormat! dhcp)
+        {
+            // ignore
+        }
+
+        internal override void RebindTimeoutEvent()
+        {
+            // NB We use Debug.Assert here rather than Debug.Fail
+            // as Singularity doesn't support the latter.
+            Debug.Assert(false, "Rebind timeout in renewal state");
+        }
+    }
+
+    internal class DhcpClientStateRebinding : DhcpClientState
+    {
+        internal DhcpClientStateRebinding(DhcpClient client)
+            : base(client, "Rebinding")
+        {
+        }
+
+        internal override void EnterEvent()
+        {
+
+        }
+
+        internal override void ReceiveEvent(DhcpFormat! dhcp)
+        {
+        }
+
+        internal override void RebindTimeoutEvent()
+        {
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/Dispatcher.cs b/base/Services/NetStack/Runtime/Dispatcher.cs
new file mode 100644
index 0000000..7642a28
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Dispatcher.cs
@@ -0,0 +1,339 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+using System.Threading;
+using RJBlack;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+
+namespace NetStack.Runtime
+{
+    // This provides the basic dispatching of three types of events
+    // 1. Internal events.  These are when one piece of code requests
+    // that another piece of code is called as soon as it is done, but
+    // it cannot be called immediately because of a re-entrancy issue.
+    // 2. External events.  These events occur when some component
+    // external to the stack (such as a client or a device driver)
+    // indicate that some action is pending.
+    // 3. Timers.  These events occur as a result of an external
+    // activity, but once triggered are handled as internal events
+    //
+    // Internal events have priority over external events.  The
+    // rationale for this may be found in the design documents.
+
+    // XXX This code needs refactoring into platform specific
+    // and generic components.
+    public class Dispatcher
+    {
+        // Public interfaces by which we interact with components
+        public delegate NetStatus Callback(CallbackArgs ca);
+        public interface CallbackArgs  {}
+
+        private uint swapCount = 0;
+        private bool stopped = false;
+
+        // Linked list of internal events
+        private class Internal
+        {
+            public Callback fun;
+            public CallbackArgs arg;
+            public Internal next;
+        }
+        private Internal iHead, iTail;
+
+        // This event is used to wake up the main dispatcher
+        // thread, typically because we have changed the
+        // list of events or timeouts to be serviced.
+        // It lives in the first slot of eHandles.
+        private AutoResetEvent dispatcherStrobe;
+
+        // Timers have arguments too
+        private Timer.TimerWheel! timers;
+        private class Timer : RJBlack.Timer
+        {
+            public Callback fun;
+            public CallbackArgs arg;
+            public Timer(Callback fun, CallbackArgs arg, ulong time) : base(time)
+            {
+                this.fun = fun;
+                this.arg = arg;
+            }
+        }
+
+        // External events. eHandles[0] is special and
+        // holds our internal strobe (dispatcherStrobe).
+        private Callback [] eFuns;
+        private CallbackArgs [] eArgs;
+        private WaitHandle []! eHandles;
+
+        // Public Methods
+        public void AddCallback(Callback fun, CallbackArgs arg)
+        {
+            Internal i = new Internal();
+            i.fun = fun;
+            i.arg = arg;
+            if (iHead == null)
+                iHead = i;
+            else
+                iTail.next = i;
+            iTail = i;
+
+            // Make sure to wake up and notice this
+            dispatcherStrobe.Set();
+        }
+
+        internal RJBlack.Timer! AddCallback(Callback fun, CallbackArgs args, ulong time)
+        {
+            Timer t = new Timer(fun, args, time);
+
+            lock (timers)
+            { timers.Add(t); }
+
+            // Make sure to wake up and notice this
+            dispatcherStrobe.Set();
+            return t;
+        }
+
+        public void AddCallback(Callback fun, CallbackArgs arg, WaitHandle wh)
+        {
+            int n = eHandles.Length;
+            WaitHandle [] newHandles = new WaitHandle[n + 1];
+            Callback [] newFuns = new Callback[n + 1];
+            CallbackArgs [] newArgs = new CallbackArgs[n + 1];
+
+            if (n > 0)
+            {
+                // Lock to defend against the main loop shuffling the array
+                // while we are copying it
+                lock (eHandles.SyncRoot)
+                {
+                    eHandles.CopyTo(newHandles, 0);
+                    eFuns.CopyTo(newFuns, 0);
+                    eArgs.CopyTo(newArgs, 0);
+                }
+            }
+
+            // Add the new callback to the end...
+            newHandles[n] = wh;
+            newFuns[n] = fun;
+            newArgs[n] = arg;
+
+            // Swap in the new arrays
+            eHandles = newHandles;
+            eFuns = newFuns;
+            eArgs = newArgs;
+
+            // Make sure to wake up and notice this
+            dispatcherStrobe.Set();
+        }
+
+        // CALLER MUST HOLD A LOCK that ensures that
+        // the eHandles, eFuns and eArgs array won't
+        // change during this function call!
+        private void RemoveWaitHandleCallback(int index)
+        {
+            int newLength = eHandles.Length - 1;
+
+            if (newLength == 0)
+            {
+                eHandles = new WaitHandle[0];
+                eFuns    = null;
+                eArgs    = null;
+                return;
+            }
+
+            int lhLength = index;
+            int rhLength = newLength - index;
+
+            // Allocate the replacement arrays
+            WaitHandle []   newHandles = new WaitHandle[newLength];
+            Callback []     newFuns    = new Callback[newLength];
+            CallbackArgs [] newArgs    = new CallbackArgs[newLength];
+
+            // Copy before the removed item...
+            if (lhLength > 0)
+            {
+                Array.Copy(eHandles, 0, newHandles, 0, lhLength);
+                Array.Copy(eFuns, 0, newFuns, 0, lhLength);
+                Array.Copy(eArgs, 0, newArgs, 0, lhLength);
+            }
+
+            // Copy after the removed item...
+            if (rhLength > 0)
+            {
+                Array.Copy(eHandles, index + 1, newHandles, index, rhLength);
+                Array.Copy(eFuns, index + 1, newFuns, index, rhLength);
+                Array.Copy(eArgs, index + 1, newArgs, index, rhLength);
+            }
+
+            // Swap in the replacement array
+            eHandles = newHandles;
+            eFuns    = newFuns;
+            eArgs    = newArgs;
+
+            // Make sure to wake up and notice this
+            dispatcherStrobe.Set();
+        }
+
+        public void RemoveCallback(WaitHandle wh)
+        {
+            lock (eHandles.SyncRoot)
+            {
+                for (int i = 0; i < eHandles.Length; i++)
+                {
+                    if (((!)eHandles[i]).Equals(wh))
+                    {
+                        RemoveWaitHandleCallback(i);
+                        return;
+                    }
+                }
+            }
+        }
+
+        public bool RemoveTimeoutCallback(RJBlack.Timer! fun)
+        {
+            lock (timers)
+            {
+                return timers.Remove(fun);
+            }
+        }
+
+
+        public void Stop()
+        {
+            stopped = true;
+
+            // Make sure to wake up and notice this
+            dispatcherStrobe.Set();
+        }
+
+        // Execute forever
+        public void Execute()
+        {
+            while (stopped == false)
+            {
+                // Internal events first
+                if (iHead != null)
+                {
+                    Internal i = iHead;
+                    iHead = i.next;
+                    i.fun(i.arg);
+                    continue;
+                }
+
+                // One read of NOW
+                ulong now = (ulong)DateTime.UtcNow.Ticks;
+
+                // Deal with timers
+                TimeSpan waitTime = TimeSpan.MaxValue;
+
+                lock (timers)
+                {
+                    Timer t = (Timer)timers.Advance(now);
+
+                    if (t != null)
+                    {
+                        // This timer has expired; service
+                        // it immediately and start over
+                        t.fun(t.arg);
+                        continue;
+                    }
+
+                    t = (Timer)timers.GetSoonest();
+
+                    if (t != null)
+                    {
+                        ulong soonest = t.time;
+                        waitTime = new TimeSpan((long)(soonest - now));
+                    }
+                }
+
+                // Grab a copy of the external-event pointers so
+                // we're not affected by changes to them on other
+                // threads
+                Callback[] funs = eFuns;
+                CallbackArgs[] args = eArgs;
+                WaitHandle[] handles = eHandles;
+
+                // Shuffle the array values so the same tasks aren't
+                // always preferred to others (WaitAny() will unblock
+                // against the lowest-index WaitHandle in the array)
+                lock (handles.SyncRoot)
+                {
+                    int n = handles.Length;
+
+                    for(int i = 0; i < n - 1; ++i)
+                    {
+                        // Swap the current element of the list with
+                        // an entry that follow it. Instead of an
+                        // expensive real random-number generator,
+                        // generate a pseudo-random number by multiplying
+                        // a largish prime with an increasing count
+                        uint swapWith = (uint)(i + ((unchecked(53533511 * swapCount++)) % (n - i)));
+
+                        if (swapWith != i) {
+                            Callback swapFun = funs[swapWith];
+                            CallbackArgs swapArgs = args[swapWith];
+                            WaitHandle swapHandle = handles[swapWith];
+
+                            funs[swapWith] = funs[i];
+                            args[swapWith] = args[i];
+                            handles[swapWith] = handles[i];
+
+                            funs[i] = swapFun;
+                            args[i] = swapArgs;
+                            handles[i] = swapHandle;
+                        }
+                    }
+                }
+
+                int rc = WaitHandle.WaitAny(handles, waitTime);
+
+                if (rc == WaitHandle.WaitTimeout)
+                    continue;
+
+                if (rc < 0 || rc >= handles.Length)
+                    throw new ApplicationException("Invalid WaitAny");
+
+                Callback cb = funs[rc];
+                if (cb != null)
+                {
+                    NetStatus res = cb(args[rc]);
+
+                    if (!NetStatus.SUCCEEDED(res))
+                        Core.Panic("Error handling internal event.");
+                }
+            }
+            Core.Log("NetStack dispatcher exiting...\n");
+        }
+
+        // Constructor
+        public Dispatcher()
+        {
+            this.timers = new RJBlack.Timer.TimerWheel(10000, 16, (ulong)DateTime.UtcNow.Ticks);
+
+            CallbackArgs[]! eArgs = this.eArgs = new CallbackArgs[1];
+
+            Callback[]! eFuns = this.eFuns = new Callback[1];
+
+            AutoResetEvent! dispatcherStrobe = this.dispatcherStrobe = new AutoResetEvent(false);
+            WaitHandle[]! eHandles = this.eHandles = new WaitHandle[1];
+
+            base();
+
+            // The first eHandles element is always our private strobe
+            eHandles[0] = dispatcherStrobe;
+            eArgs[0] = null;
+            eFuns[0] = null;
+        }
+
+    } // Dispatcher
+
+} // NetStack
+// End
diff --git a/base/Services/NetStack/Runtime/DnsClient.cs b/base/Services/NetStack/Runtime/DnsClient.cs
new file mode 100644
index 0000000..edf6aff
--- /dev/null
+++ b/base/Services/NetStack/Runtime/DnsClient.cs
@@ -0,0 +1,329 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DnsClient.cs
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+
+using System.Net.IP;
+using Drivers.Net;
+
+using NetStack.Protocols;
+
+using Dns = NetStack.Protocols.Dns;
+
+using Microsoft.Singularity.Io;
+
+
+namespace NetStack.Runtime
+{
+    /// <summary>
+    /// Dns Client for UDP lookups.
+    /// </summary>
+    public class BasicDnsClient
+    {
+        private IPv4      dnsServer;
+        private TimeSpan  timeout;
+        private Dns.Flags flags;
+
+        public const int DefaultTimeoutMillis = 500;
+
+        public enum StatusCode : int
+        {
+            Success         = 0,
+                NoNameServer    = 1,
+                TransportError  = 2,
+                RequestFailed   = 3,
+                Timeout         = 4,
+                OverSizeMessage = 5
+                }
+
+        public BasicDnsClient()
+            : this(IPv4.Any)
+        {
+        }
+
+        public BasicDnsClient(IPv4 dnsServer)
+        {
+            this.dnsServer  = dnsServer;
+            this.timeout    = TimeSpan.FromMilliseconds(DefaultTimeoutMillis);
+            this.flags      = Dns.Flags.RD;
+        }
+
+        public IPv4 DnsServer
+        {
+            get {
+                if (dnsServer != IPv4.Any)
+                    return dnsServer;
+                IPModule ip = (IPModule!) Core.Instance().GetProtocolByName("IP");
+                return ip.HostConfiguration.GetCurrentNameServer();
+            }
+        }
+
+        public TimeSpan Timeout
+        {
+            get { return timeout; }
+            set { timeout = value; }
+        }
+
+        public Dns.Flags Flags
+        {
+            get { return flags; }
+            set { flags = value; }
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_DNS_CLIENT") ]
+        private void DebugPrint(string format, params object [] arguments)
+        {
+            Core.Log("DnsClient: ");
+            Core.Log(format, arguments);
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_DNS_CLIENT") ]
+        private static void Dump(byte []! data, int offset)
+        {
+            for (int i = offset; i < data.Length; i += 16)
+            {
+                Core.Log("{0:x4}  ", i);
+                int n = Math.Min(16, data.Length - i) + i;
+                for (int j = i; j < n; j++)
+                    Core.Log("{0:x2} ", data[j]);
+                for (int j = n; j != i + 16; j++)
+                    Core.Log("   ");
+                Core.Log("  ");
+                for (int j = i; j < n; j++)
+                {
+                    char c = '.';
+                    if (data[j] > 31 && data[j] < 128)
+                        c = (char)data[j];
+                    Core.Log("{0}", c);
+                }
+                Core.Log("\n");
+            }
+        }
+
+        /// <summary>
+        /// Gets the DNS information for the specified DNS host name.
+        /// </summary>
+        public StatusCode GetHostByName(string            name,
+                                        out IPv4HostEntry hostEntry)
+        {
+            hostEntry = null;
+
+            IPv4 dnsServer = DnsServer;
+            if (dnsServer == IPv4.Zero)
+                return StatusCode.NoNameServer;
+
+            Dns.Query q = new Dns.Query(name, Dns.Type.A, Dns.Class.Internet);
+            Dns.Format answer;
+
+            StatusCode askResponse = Ask(dnsServer, q, out answer);
+            if (askResponse != StatusCode.Success)
+                return askResponse;
+            assert answer != null;
+
+            if (answer.GetRCode() != Dns.RCode.NoError)
+            {
+                DebugPrint("Dns query failed: RCode = {0}\n", answer.GetRCode());
+                return StatusCode.RequestFailed;
+            }
+
+            hostEntry = new IPv4HostEntry( new string [] { name }, new IPv4[] {} );
+            ArrayList addressList = new ArrayList();
+
+            foreach (Dns.ResourceRecord! rr in answer.AnswerRRs)
+            {
+                if (rr.Type != Dns.Type.A || rr.Class != Dns.Class.Internet)
+                    continue;
+
+                byte [] rdata = rr.RData;
+                if (rdata == null)
+                    continue;
+
+                if ((rdata.Length % IPv4.Length) != 0)
+                    continue;
+
+                int offset = 0;
+                while (offset != rdata.Length)
+                {
+                    addressList.Add(IPv4.ParseBytes(rdata, offset));
+                    offset += 4;
+                }
+            }
+
+            IPv4[] al = hostEntry.AddressList = new IPv4 [addressList.Count];
+            for (int i = 0; i < addressList.Count; i++)
+                al[i] = (IPv4) (!) addressList[i];
+
+            return StatusCode.Success;
+        }
+
+        /// <summary>
+        /// Gets DNS host information for an IP address.
+        /// </summary>
+        public StatusCode GetHostByAddress(IPv4              address,
+                                           out IPv4HostEntry hostEntry)
+        {
+            hostEntry = null;
+
+            IPv4 dnsServer = DnsServer;
+            if (dnsServer == IPv4.Zero)
+                return StatusCode.NoNameServer;
+
+            // Formulate request a.b.c.d -> d.b.c.a
+            IPv4 reversed = new IPv4(ByteOrder.Swap((uint)address));
+            string name = String.Format("{0}.IN-ADDR.ARPA", reversed);
+
+            DebugPrint("Looking up {0}\n", name);
+
+            Dns.Query q = new Dns.Query(name, Dns.Type.PTR, Dns.Class.Internet);
+            Dns.Format answer;
+
+            StatusCode askResponse = Ask(dnsServer, q, out answer);
+            if (askResponse != StatusCode.Success)
+                return askResponse;
+            assert answer != null;
+
+            if (answer.GetRCode() != Dns.RCode.NoError)
+            {
+                DebugPrint("Dns query failed: RCode = {0}\n", answer.GetRCode());
+                return StatusCode.RequestFailed;
+            }
+
+            hostEntry = new IPv4HostEntry(new string[]{}, new IPv4 [] { address });
+
+            ArrayList aliases = new ArrayList();
+            foreach (Dns.ResourceRecord! rr in answer.AnswerRRs)
+            {
+                DebugPrint("Answer: Type = {0} Class = {1} TTL = {2}\n",
+                           rr.Type, rr.Class, rr.TtlSeconds);
+                if ((rr.Type != Dns.Type.PTR && rr.Type != Dns.Type.CNAME) ||
+                    rr.Class != Dns.Class.Internet)
+                    continue;
+
+                byte [] rdata = rr.RData;
+                if (rdata == null)
+                    continue;
+
+                int offset = 0;
+                while (offset != rdata.Length)
+                {
+                    string alias;
+                    offset += Dns.LabelEncoding.GetString(rdata, offset,
+                                                          out alias);
+                    aliases.Add(alias);
+                }
+            }
+            hostEntry.Aliases = (string []!) aliases.ToArray(typeof(string));
+
+            return StatusCode.Success;
+        }
+
+        /// <summary>
+        /// Resolves a DNS host name or IP address to an IPv4HostEntry instance.
+        /// </summary>
+        public StatusCode Resolve(string            hostName,
+                                  out IPv4HostEntry hostEntry)
+        {
+            IPv4 hostAddress;
+
+            if (IPv4.Parse(hostName, out hostAddress) == true)
+            {
+                StatusCode status = GetHostByAddress(hostAddress, out hostEntry);
+
+                if (status != StatusCode.Success)
+                {
+                    // As a convenience to the caller, instead of failing
+                    // outright, at least give back the parsed version of
+                    // the net address.
+                    hostEntry = new IPv4HostEntry(new string [] { hostName },
+                                                  new IPv4 [] { hostAddress });
+
+                    return StatusCode.Success;
+                }
+            }
+
+            return GetHostByName(hostName, out hostEntry);
+        }
+
+        private StatusCode Ask(IPv4           dnsServer,
+                               Dns.Query []!  queries,
+                               out Dns.Format answer)
+        {
+            answer = null;
+
+            Dns.Format outFrame = new Dns.Format();
+            outFrame.SetFlags(flags);
+            outFrame.Queries.AddRange(queries);
+
+            byte[] outData = new byte [outFrame.Size];
+            if (outData.Length > Dns.Format.MaxUdpMessageLength)
+            {
+                return StatusCode.OverSizeMessage;
+            }
+
+            int offset = 0;
+            outFrame.Write(outData, ref offset);
+
+            byte[] rcvData;
+            StatusCode askResponse = AskDnsServer(dnsServer, outData, out rcvData);
+            if (askResponse != StatusCode.Success)
+            {
+                return askResponse;
+            }
+            assert rcvData != null;
+
+            try
+            {
+                offset = 0;
+                Dump(rcvData, offset);
+                answer = Dns.Format.Parse(rcvData, ref offset);
+            }
+            catch (Exception e)
+            {
+                DebugPrint("Parser threw {0}", e);
+                return StatusCode.TransportError;
+            }
+
+            return StatusCode.Success;
+        }
+
+        public StatusCode Ask(IPv4           dnsServer,
+                              Dns.Query      query,
+                              out Dns.Format answer)
+        {
+            return Ask(dnsServer, new Dns.Query [] { query }, out answer);
+        }
+
+        private StatusCode AskDnsServer(IPv4       dnsServer,
+                                        byte[]!    outData,
+                                        out byte[] rcvData)
+        {
+            Core      core      = Core.Instance();
+            UdpModule udpModule = core.GetProtocolByName("UDP") as UdpModule;
+            if (udpModule == null)
+            {
+                rcvData = null;
+                return StatusCode.TransportError;
+            }
+
+            UdpSession udpSession =
+                udpModule.CreateBoundSession(IPv4.Any, 0,
+                                             dnsServer, Dns.Format.ServerPort);
+            udpSession.WriteData(outData);
+            rcvData = udpSession.PollCopyData((int) (timeout.Ticks /
+                                                     TimeSpan.TicksPerMillisecond));
+            if (rcvData == null)
+                return StatusCode.Timeout;
+
+            return StatusCode.Success;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/HostConfiguration.cs b/base/Services/NetStack/Runtime/HostConfiguration.cs
new file mode 100644
index 0000000..0670bf1
--- /dev/null
+++ b/base/Services/NetStack/Runtime/HostConfiguration.cs
@@ -0,0 +1,469 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Collections;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+using NetStack.Protocols;
+
+#if !SINGULARITY
+using System.Reflection;
+using System.Net;
+#endif
+
+using Microsoft.Contracts;
+
+namespace NetStack.Runtime
+{
+    // define the InterfaceList
+    public class InterfaceList : ArrayList {}
+
+    /**
+     * The local host IP configuration
+     */
+    public class HostConfiguration
+    {
+        private string                 hostname;
+        private string                 domainname;
+        private bool                   isRouter;
+        private RoutingTable!          routingTable;
+        private IList!                 nameServers;
+        private IPAdapterBindingTable! bindings;
+        private ArrayList!             dhcpClients;
+
+        [NotDelayed]
+        public HostConfiguration()
+        {
+            isRouter     = false;
+
+            RoutingTable rt = new RoutingTable();
+            routingTable = rt;
+            bindings     = new IPAdapterBindingTable(rt);
+            nameServers  = ArrayList.Synchronized(new ArrayList());
+
+            dhcpClients = new ArrayList();
+
+            base();
+
+            SetHostName("singularity");
+            SetDomainName("microsoft.com");
+
+            routingTable.AddRoute(
+                new RouteEntry(IPv4Network.Loopback,
+                               IPv4.Loopback,
+                               IPv4.Loopback,
+                               RouteEntry.InterfaceMetric,
+                               RouteEntry.InterfaceRouteTag)
+                );
+
+        }
+
+        public string! GetHostName()
+        {
+            return hostname;
+        }
+
+        public bool SetHostName(string! name)
+        {
+            int dot = name.IndexOf('.');
+            if (dot >= 0)
+            {
+                string hostpart = name.Substring(0, dot);
+                string domainpart = name.Substring(dot + 1);
+                if ((ValidDnsName(hostpart, false) == false) ||
+                    (ValidDnsName(domainpart, true) == false))
+                    return false;
+                hostname   = hostpart;
+                domainname = domainpart;
+                return true;
+            }
+
+            if (ValidDnsName(name, false) == false)
+                return false;
+            hostname = name;
+            return true;
+        }
+
+        public string! GetDomainName()
+        {
+            return domainname;
+        }
+
+        public bool SetDomainName(string! name)
+        {
+            if (ValidDnsName(name, true) == false)
+            {
+                return false;
+            }
+            domainname = name;
+            return true;
+        }
+
+        private static bool ValidDnsName(string! name, bool dotsAllowed)
+        {
+            if (name.Length <= 2)
+                return false;
+
+            // Dashes are okay as long as not first or last character
+            int last = name.Length - 1;
+            if (name[0] == '-' || name[last] == '-')
+                return false;
+
+            for (int i = 0; i <= last; i++)
+            {
+                // Letters, digits, and dashes are okay
+                if (Char.IsLetterOrDigit(name[i]) == true || name[i] == '-')
+                    continue;
+                // Dots are okay in domain-names
+                if (name[i] == '.' && dotsAllowed == true)
+                    continue;
+                return false;
+            }
+            return true;
+        }
+
+        public bool IsRouter
+        {
+            get { return isRouter; }
+        }
+
+        public RoutingTable! RoutingTable
+        {
+            get { return routingTable; }
+        }
+
+        public IPAdapterBindingTable! Bindings
+        {
+            get { return bindings; }
+        }
+
+        public void AddNameServer(IPv4 address)
+        {
+            nameServers.Add(address);
+        }
+
+        public bool DeleteNameServer(IPv4 address)
+        {
+            lock (nameServers.SyncRoot)
+            {
+                int index = this.nameServers.IndexOf(address);
+                if (index < 0)
+                    return false;
+                nameServers.RemoveAt(index);
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Get enumerable interface of IPv4 collection
+        /// containing name servers.
+        /// </summary>
+        public IEnumerable! NameServers()
+        {
+            return nameServers;
+        }
+
+        /// <summary>
+        /// Get the current name server.
+        /// </summary>
+        public IPv4 GetCurrentNameServer()
+        {
+            lock (nameServers.SyncRoot)
+            {
+                if (nameServers.Count > 0)
+                {
+                    return (IPv4) (!) nameServers[0];
+                }
+                return IPv4.Zero;
+            }
+        }
+
+        /// <summary>
+        /// Rotate name servers.
+        /// </summary>
+        public void RotateNameServers()
+        {
+            lock (nameServers.SyncRoot)
+            {
+                if (nameServers.Count < 2)
+                    return;
+                IPv4 retiree = (IPv4) (!) nameServers[0];
+                nameServers.RemoveAt(0);
+                nameServers.Add(retiree);
+            }
+        }
+
+        public bool IsLocalAddress(IPv4 ipAddress)
+        {
+            return bindings.IsLocalAddress(ipAddress);
+        }
+
+        public bool StartDhcp(IAdapter adapter)
+        {
+            lock (dhcpClients)
+            {
+                foreach (DhcpClient! client in dhcpClients)
+                {
+                    if (client.Adapter == adapter)
+                        return false;
+                }
+                DhcpClient dc = new DhcpClient(adapter);
+                dc.Start();
+                dhcpClients.Add(dc);
+            }
+            return true;
+        }
+
+        public bool StopDhcp(IAdapter adapter)
+        {
+            lock (dhcpClients)
+            {
+                for (int i = 0; i < dhcpClients.Count; i++)
+                {
+                    DhcpClient client = (DhcpClient!) dhcpClients[i];
+                    if (client.Adapter == adapter)
+                    {
+                        client.Stop();
+                        dhcpClients.RemoveAt(i);
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        public bool IsRunningDhcp(IAdapter adapter)
+        {
+            lock (dhcpClients)
+            {
+                foreach (DhcpClient! client in dhcpClients)
+                {
+                    if (client.Adapter == adapter)
+                        return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    // an interface ip address
+    public class InterfaceIPConfiguration
+    {
+        IPv4 address;
+        IPv4 netmask;
+        IPv4 gateway;
+        int  ttl;
+
+        public InterfaceIPConfiguration(IPv4 address,
+                                        IPv4 netmask,
+                                        IPv4 gateway,
+                                        int  ttl)
+        {
+            this.address = address;
+            this.netmask = netmask;
+            this.gateway = gateway;
+            this.ttl     = ttl;
+        }
+
+        public InterfaceIPConfiguration(IPv4 address,
+                                        IPv4 netmask,
+                                        IPv4 gateway)
+            : this(address, netmask, gateway, IPFormat.DefaultTTL)
+        {
+        }
+
+        public IPv4 Address
+        {
+            get { return address; }
+        }
+
+        public IPv4 NetMask
+        {
+            get { return netmask; }
+        }
+
+        public IPv4 Gateway
+        {
+            get { return gateway; }
+        }
+
+        public int TTL
+        {
+            get { return ttl; }
+            set { ttl = value; }
+        }
+    }
+
+    // this is the local ip table entry
+    // binds an IP to a specific adapter
+    public class IPBinding
+    {
+        private IAdapter! adapter;
+        private InterfaceIPConfiguration! ipConfig;
+
+        public IPBinding(IAdapter! ad, InterfaceIPConfiguration! ipc)
+        {
+            adapter  = ad;
+            ipConfig = ipc;
+            base();
+        }
+
+        public IAdapter! Adapter
+        {
+            get { return adapter; }
+        }
+
+        public InterfaceIPConfiguration! IPConfiguration
+        {
+            get { return ipConfig; }
+        }
+    }
+
+    public class IPAdapterBindingTable
+    {
+        Hashtable    ipBindings;   // <IPv4,IPBinding>
+        RoutingTable routingTable;
+
+        public IPAdapterBindingTable(RoutingTable routingTable)
+        {
+            this.ipBindings   = new Hashtable();
+            this.routingTable = routingTable;
+        }
+
+        private void AddInterfaceRoutes(InterfaceIPConfiguration! ipConfig)
+        {
+            //
+            // Add subnet route
+            //
+            IPv4Network subnet = new IPv4Network(ipConfig.Address,
+                                                 ipConfig.NetMask);
+            routingTable.AddRoute(
+                new RouteEntry(subnet,
+                               ipConfig.Address,
+                               ipConfig.Address,
+                               RouteEntry.DirectlyConnectedMetric,
+                               RouteEntry.InterfaceRouteTag)
+                );
+
+            //
+            // Add route to gateway
+            //
+            routingTable.AddRoute(
+                new RouteEntry(ipConfig.Gateway,
+                               ipConfig.Address,
+                               ipConfig.Address,
+                               RouteEntry.DirectlyConnectedMetric,
+                               RouteEntry.InterfaceRouteTag)
+                );
+
+            //
+            // Add default route if none exists
+            //
+            if (routingTable.Lookup(IPv4Network.Default) == null)
+            {
+                routingTable.AddRoute(
+                    new RouteEntry(IPv4Network.Default,
+                                   ipConfig.Gateway,
+                                   ipConfig.Address,
+                                   RouteEntry.DefaultRouteMetric,
+                                   RouteEntry.InterfaceRouteTag)
+                    );
+            }
+        }
+
+        private void DeleteInterfaceRoutes(InterfaceIPConfiguration! ipConfig)
+        {
+            routingTable.DeleteInterfaceRoutes(ipConfig.Address);
+        }
+
+        public bool Add(IAdapter! adapter, InterfaceIPConfiguration! ipConfig)
+        {
+            if (ipBindings[ipConfig.Address] != null)
+            {
+                return false;
+            }
+            ipBindings[ipConfig.Address] = new IPBinding(adapter, ipConfig);
+            AddInterfaceRoutes(ipConfig);
+            return true;
+        }
+
+        /// <summary>
+        /// Delete all IP address bindings associated with adapter.
+        /// </summary>
+        public void Flush(IAdapter adapter)
+        {
+            Stack flushItems = new Stack();
+            foreach (IPBinding! ipb in ipBindings.Values)
+            {
+                if (ipb.Adapter == adapter)
+                {
+                    flushItems.Push(ipb.IPConfiguration);
+                }
+            }
+
+            while (flushItems.Count != 0)
+            {
+                Flush((InterfaceIPConfiguration!) flushItems.Pop());
+            }
+        }
+
+        /// <summary>
+        /// Delete specific IP address binding from adapter.
+        /// </summary>
+        internal void Flush(IAdapter adapter, IPv4 address)
+        {
+            IPBinding ipb = (IPBinding) ipBindings[address];
+            if (ipb != null && ipb.Adapter == adapter)
+            {
+                Flush(ipb.IPConfiguration);
+            }
+        }
+
+        private void Flush(InterfaceIPConfiguration! ipConfig)
+        {
+            DeleteInterfaceRoutes(ipConfig);
+            ipBindings.Remove(ipConfig.Address);
+        }
+
+        public IAdapter GetAdapter(IPv4 address)
+        {
+            IPBinding ipb = (IPBinding) ipBindings[address];
+            if (ipb == null)
+            {
+                return null;
+            }
+            return ipb.Adapter;
+        }
+
+        // is the given ip defined?
+        public bool IsLocalAddress(IPv4 ipAddress)
+        {
+            return ipBindings[ipAddress] != null;
+        }
+
+        public ArrayList! GetAdapterIPConfigurations(IAdapter adapter)
+        {
+            ArrayList results = new ArrayList();
+            foreach (IPBinding! ipb in ipBindings.Values)
+            {
+                if (ipb.Adapter == adapter)
+                    results.Add(ipb.IPConfiguration);
+            }
+            return results;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/ICMPModule.cs b/base/Services/NetStack/Runtime/ICMPModule.cs
new file mode 100644
index 0000000..65a84bc
--- /dev/null
+++ b/base/Services/NetStack/Runtime/ICMPModule.cs
@@ -0,0 +1,183 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Net.IP;
+
+using Drivers.Net;
+using NetStack.Protocols;
+
+using Microsoft.Singularity;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This module implements the ICMP protocol
+     */
+    public class IcmpModule : IProtocol
+    {
+        // the ip handler
+        protected IProtocol ip;
+
+        // INetModule interfaces
+        // ------------------------
+        string INetModule.ModuleName  {get {return "ICMP";} }
+
+        ushort INetModule.ModuleVersion {get {return 0x01;}}  // 0.1
+
+        [ Conditional("DEBUG_ICMP") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log(format, args);
+        }
+
+        public bool StartModule()
+        {
+            DebugPrint("Starting ICMP module...");
+
+            ip = Core.Instance().GetProtocolByName("IP");
+            Debug.Assert(ip!=null);
+            return true;
+        }
+
+        public bool StopModule()
+        {
+            return true;
+        }
+
+        public bool DestroyModule()
+        {
+            return true;
+        }
+
+        // IProtocol interfaces
+        // ------------------------
+        public bool Initialize(ProtocolParams parameters)
+        {
+            Debug.Assert(parameters == null || parameters["name"]=="ICMP");
+
+            Core.Instance().RegisterProtocol(this);
+            // no need to register at the packet level!
+            return true;
+        }
+
+        public ushort GetProtocolID()
+        {
+            return ((ushort)IPFormat.Protocol.ICMP);
+        }
+
+        // create a protocol session and register it
+        // internally
+        public Session CreateSession()
+        {
+            Session icmp = new IcmpSession(this);
+            Core.Instance().RegisterSession(this,icmp);
+            // register internally
+            //            sessions += new Session.OnPacketReceive(icmp.OnReceive);
+            return icmp;
+        }
+
+        // the session event dispatching instance
+        //        public event Session.OnPacketReceive sessions;
+
+        // handle incoming IP packets
+        public NetStatus OnProtocolReceive(NetPacket! pkt)
+        {
+            // handle ICMP messages
+            // ---------------------
+            // start analyzing the request
+            Multiplexer! mux = (!)Core.Instance().GetMuxForAdapter((IAdapter!)pkt.AdapterContext);
+
+            // IP should have passed us a context which
+            // is the IPHeader... lets see...
+            IPFormat.IPHeader! ipHeader = (IPFormat.IPHeader!)pkt.OverlapContext;
+
+            // read the icmp header
+            IcmpFormat.IcmpHeader icmpHeader;
+            if (!IcmpFormat.ReadIcmpHeader(pkt, out icmpHeader))
+            {
+                return NetStatus.Code.PROTOCOL_OK;
+            }
+
+            // handle various types
+            switch(icmpHeader.type) {
+                case (byte)IcmpFormat.IcmpType.ECHO_REQUEST:
+                    if (icmpHeader.code == 0) {
+                        DebugPrint("IcmpModule: Handling ECHO_REQUEST From: {0}", ipHeader.Source);
+
+                        // send reply
+                        int length = pkt.Length;
+                        byte [] pktData = new byte [length];
+                        Array.Copy(pkt.GetRawData(), 0, pktData, 0, length);
+
+                        IcmpFormat.CreateFastEchoReply(
+                            pktData,
+                            ipHeader.totalLength-IPFormat.Size
+                            );
+                        NetPacket reply = new NetPacket(pktData);
+                        mux.SendDirect(reply);
+                        return NetStatus.Code.PROTOCOL_OK;
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            DebugPrint("IcmpModule: Dispatching packet to Sessions");
+
+            // our sessions wants the IP header as well, IP
+            // already shrinked the packet for us so no need
+            // to shrink the packet
+            pkt.Clip(EthernetFormat.Size,ipHeader.totalLength - 1);
+
+            // fire the event to any interested sessions
+            // (we could also use Core.Instance().Sessions to
+            // choose a specific session...)
+
+            //            if (sessions != null)
+            //{
+            //sessions(this, pkt, icmpHeader);
+            //}
+
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        // this method send a ready made ICMP packet (IP level only),
+        // it uses the IP layer.
+        public NetStatus OnProtocolSend(NetPacket! pkt)
+        {
+            ip.OnProtocolSend(pkt);
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public NetStatus SetProtocolSpecific(ushort opcode,byte[]! data)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+
+        public NetStatus GetProtocolSpecific(ushort opcode,out byte[] data)
+        {
+            data = null;
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        // ctor
+        public IcmpModule()
+        {
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/ICMPSession.cs b/base/Services/NetStack/Runtime/ICMPSession.cs
new file mode 100644
index 0000000..9e42267
--- /dev/null
+++ b/base/Services/NetStack/Runtime/ICMPSession.cs
@@ -0,0 +1,237 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using NetStack.Common;
+using System;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    using Protocols;
+
+    // an ICMP session
+    public class IcmpSession : Session
+    {
+        // the session's transmit q size
+        public const int TxQSize = 100;
+
+        // the session's receive q size
+        public const int RcvQSize = 100;
+
+        public IcmpSession(IProtocol! protocol)
+            : base(protocol, TxQSize, RcvQSize)
+        {
+        }
+
+        // override the OnReceive
+        override internal NetStatus OnReceive(object     sender,
+                                              NetPacket! pkt,
+                                              object     ctx)
+        {
+            NetStatus res = base.OnReceive(sender, pkt, ctx);
+            // if the packet can be delivered to the user
+            if (res != NetStatus.Code.PROTOCOL_PROCESSING)
+            {
+                // get the packet and put it on the incoming queue
+                // if there is no room, drop it. this method is called
+                // by the runtime when a packet destination is this session.
+                this.PutPacket(inQueue, pkt, false);
+            }
+            return res;
+        }
+
+        // the user should create an IP+ICMP buffer
+        override public int WriteData(byte[]! data)
+        {
+            if (!IsSessionValidForUserWrite())
+            {
+                return -1;
+            }
+
+            byte[] pktData = new byte[EthernetFormat.Size+IPFormat.Size+data.Length];
+            Array.Copy(data,0,pktData,EthernetFormat.Size,data.Length);
+            NetPacket pkt=new NetPacket(pktData);
+            PutPacket(outQueue,pkt,true);
+            return data.Length;
+        }
+
+        override public bool Close()
+        {
+            Core.Instance().DeregisterSession(Protocol, this);
+            return true;
+        }
+    }
+
+#if Qos
+    // an Qos ICMP session
+    public class QosIcmpSession : Session
+    {
+        // the session's transmit q size
+        public const int TxQSize=100;
+
+        // the session's receive q size
+        public const int RcvQSize=100;
+
+        public QosIcmpSession(IProtocol protocol)
+            : base(protocol, TxQSize, RcvQSize)
+        {
+        }
+
+        // override the OnReceive (no state machine here, so don't call base)
+        override internal NetStatus OnReceive(object sender,NetPacket pkt,object ctx)
+        {
+#if DEBUG
+            Console.Out.WriteLine("QosIcmpSession:OnReceived, flow capacity={0}",capacity);
+#endif
+            if (!this.PutPacket(inQueue,inQueueMonitor,pkt,false))
+            {
+                pkt.ReleaseRef();
+                // increment the session capacity
+                capacity++;
+                return NetStatus.Code.PROTOCOL_OK;
+            }
+            // the packet is in the Q so, return it only after the user consumed it!
+            return NetStatus.Code.PROTOCOL_PROCESSING;
+        }
+
+        override public byte[] ReadData()
+        {
+            NetPacket pkt = GetPacketFromQ(inQueue,inQueueMonitor,true,Timeout.Infinite,true);
+            byte[] toUser=null;
+            if (pkt!=null)
+                toUser = pkt.ToUser();
+
+            // now the packet can be returned!
+            pkt.ReleaseRef();
+            Core.Instance().TheDemux.TakeFreePacket(pkt);
+            // increment the session capacity
+            capacity++;
+#if DEBUG
+            Console.Out.WriteLine("QosIcmpSession::ReadData, session capacity={0}",capacity);
+#endif
+            return toUser;
+        }
+
+        override public byte[] PollCopyData(int timeout)
+        {
+            NetPacket pkt = GetPacketFromQ(inQueue,inQueueMonitor,true,timeout,true);
+            byte[] toUser=null;
+            if (pkt!=null)
+            {
+                toUser = pkt.ToUser();
+                // now the packet can be returned!
+                pkt.ReleaseRef();
+                Core.Instance().TheDemux.TakeFreePacket(pkt);
+                // increment the session capacity
+                capacity++;
+            }
+            return toUser;
+        }
+
+        // the user should create an IP+ICMP buffer
+        override public int WriteData(byte[] data)
+        {
+            if (!IsSessionValidForUserWrite())
+            {
+                return -1;
+            }
+
+            byte[] pktData = new byte[EthernetFormat.Size+IPFormat.Size+data.Length];
+            Array.Copy(data,0,pktData,EthernetFormat.Size,data.Length);
+            NetPacket pkt=new NetPacket(pktData);
+            PutPacket(outQueue,outQueueMonitor,pkt,true);
+            return data.Length;
+        }
+
+        override public bool Close()
+        {
+            Core.Instance().DeregisterSession(prot,this);
+            return true;
+        }
+    }
+
+#region PrivateIcmpSession
+    // -------------------------------------------------------
+    // The internal ICMP Session (owned by the stack)
+    // -------------------------------------------------------
+    public class PrivateIcmpSession : QosIcmpSession
+    {
+
+        public PrivateIcmpSession(IProtocol p) : base(p)
+        {
+        }
+
+        // override the OnReceive
+        override internal NetStatus OnReceive(object sender,NetPacket pkt,object ctx)
+        {
+#if DEBUG
+            Console.Out.WriteLine("PrivateIcmpSession:OnReceived, flow capacity={0}",capacity);
+#endif
+            Debug.Assert(ctx!=null);
+            NetStatus res = NetStatus.Code.PROTOCOL_OK;
+            IcmpFormat.IcmpHeader icmpHeader = (IcmpFormat.IcmpHeader)ctx;
+            IPFormat.IPHeader ipHeader = pkt.OverlapContext as IPFormat.IPHeader;
+            Multiplexer mux = pkt.AdapterContext as Multiplexer;  // source mux
+            Debug.Assert(ipHeader!=null && mux!=null);
+            bool handled=false;
+
+            // handle various types
+            switch(icmpHeader.type)
+            {
+                case (byte)IcmpFormat.IcmpType.ECHO_REQUEST:
+                    if (icmpHeader.code==0)
+                    {
+#if DEBUG_IP
+                        Console.WriteLine("PrivateIcmpSession: Handling ECHO_REQUEST From: {0}", ipHeader.srcAddrIP);
+#endif
+                        // send reply
+                        // clone it since some session may use it (it is readonly!)
+                        int length = pkt.Length();
+                        byte [] pktData = new byte [length];
+                        Array.Copy(pkt.GetRawData(), 0, pktData, 0, length);
+
+                        IcmpFormat.CreateFastEchoReply(
+                            pktData,
+                            ipHeader.totalLength-IPFormat.Size
+                            );
+                        NetPacket reply = new NetPacket(pktData);
+                        reply.SessionContext=this;
+                        mux.Send(reply);
+                        handled=true;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            // return the original packet (no use for it anymore)
+            pkt.ReleaseRef();
+            // only increment the session capacity
+            // if this is not ours..
+            // this way we apply back pressure and only
+            // increase the capacity once sending is done!
+            if (!handled)
+                capacity++;
+#if DEBUG
+            Console.Out.WriteLine("PrivateIcmpSession:OnReceived FINISHED, flow capacity={0}",capacity);
+#endif
+            return res;
+        }
+    }
+#endregion
+#endif
+}
+
diff --git a/base/Services/NetStack/Runtime/INetModule.cs b/base/Services/NetStack/Runtime/INetModule.cs
new file mode 100644
index 0000000..207b5fe
--- /dev/null
+++ b/base/Services/NetStack/Runtime/INetModule.cs
@@ -0,0 +1,56 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System;
+
+namespace NetStack
+{
+    namespace Runtime
+    {
+        /**
+         * All the networking stack modules must implement
+         * this interface. The runtime uses this interface
+         * to manage the different modules.
+         */
+        public interface INetModule
+        {
+            // get the module's name
+            string ModuleName  { get; }
+
+            // get the modules version
+            ushort ModuleVersion { get; }
+
+            // an initializer for new protocols.
+            // the protocol receives the parameters
+            // from the configuration file (string based)
+            // NOTICE: should not rely on a specific initialization
+            // order, wait to StartModule invocation for inter-module
+            // operations!
+            bool Initialize(ProtocolParams parameters);
+
+
+            // start module activity, module specific.
+            // it is called by the runtime after ALL protocols
+            // are initialized and the host configuration is valid!
+            bool StartModule();
+
+            // stop module activity, module specific.
+            // it is called by the runtime
+            bool StopModule();
+
+            // destroy module, free unmanaged resources if any.
+            // it is called by the runtime
+            bool DestroyModule();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/IPModule.cs b/base/Services/NetStack/Runtime/IPModule.cs
new file mode 100644
index 0000000..069f10c
--- /dev/null
+++ b/base/Services/NetStack/Runtime/IPModule.cs
@@ -0,0 +1,383 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+// #define DEBUG_IP
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+using NetStack.Protocols;
+
+using Microsoft.Singularity;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This module implements the IP protocol
+     * NOTICE: FOR NOW WE DO NOT HANDLE FRAGMENTATION!!!!!!!!!!!!!!
+     */
+    public class IPModule : IProtocol
+    {
+        // the version
+        protected int version;
+
+        // the icmp protocol handle (for sending control messages)
+        protected IProtocol icmp;
+        protected ArpModule arp;
+
+        // IP specific stack configuration data
+        HostConfiguration hostConfig;
+
+        private const string moduleName = "IP";
+
+        [ Conditional("DEBUG_IP") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            DebugStub.Print("IPModule: {0}",
+                            __arglist(string.Format(format, args))
+                            );
+        }
+
+        // INetModule interfaces
+        // ------------------------
+
+        string INetModule.ModuleName    { get { return moduleName; } }
+
+        ushort INetModule.ModuleVersion { get { return 0x01; } }  // 0.1
+
+        // called by the runtime when
+        // the protocol should be started
+        public bool StartModule()
+        {
+            // get a ref to the icmp protocol
+            icmp = Core.Instance().GetProtocolByName("ICMP");
+            if (icmp == null)
+            {
+                return false;
+            }
+
+            // get a ref to the arp protocol
+            arp = Core.Instance().GetProtocolByName("ARP") as ArpModule;
+            if (arp == null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public bool StopModule()
+        {
+            return true;
+        }
+
+        public bool DestroyModule()
+        {
+            return true;
+        }
+
+        // IProtocol interfaces
+        // ------------------------
+        public bool Initialize(ProtocolParams parameters)
+        {
+            Debug.Assert(parameters == null ||
+                         parameters["name"] == moduleName);
+
+            hostConfig = new HostConfiguration();
+            version = ProtocolParams.LookupInt32(parameters, "version", 4);
+
+            bool fragment = ProtocolParams.LookupBoolean(parameters,
+                                                         "fragment",
+                                                         false);
+            // save the routing protocol name, if exists
+            if (version != 4 || fragment == true)
+            {
+                DebugPrint("Support only exists for V4 w/o fragments.\n");
+                return false;
+            }
+
+            Core core = Core.Instance();
+
+            core.RegisterProtocol(this);
+            if (! core.packetTypes.RegisterTypeHandler(PacketTypes.IP, this))
+            {
+                core.DeregisterProtocol(this);
+                return false;
+            }
+            return true;
+        }
+
+        public ushort GetProtocolID()
+        {
+            return EthernetFormat.PROTOCOL_IP;
+        }
+
+        public Session CreateSession()
+        {
+            return null;
+        }
+
+        // handle incoming IP packets
+        public NetStatus OnProtocolReceive(NetPacket! pkt)
+        {
+            IPFormat.IPHeader! ipHeader;
+            if (IPFormat.ReadIPHeader(pkt, out ipHeader) == false)
+            {
+                DebugPrint("bad header\n");
+                return NetStatus.Code.PROTOCOL_OK;
+            }
+            pkt.OverlapContext = ipHeader;
+
+            Debug.Assert(IPFormat.IsMoreFragSet(ipHeader) == false);
+
+            // check packet checksum
+            if (IPFormat.IsCheckSumOK(ipHeader) == false) {
+                DebugPrint("checksum error, dropping!\n");
+                return NetStatus.Code.PROTOCOL_DROP_CHKSUM;
+            }
+
+            // check if the packet is for us...
+            // TBC: for now we ignore broadcasts
+            // (directed + limited bcast addresses)
+            Core core = Core.Instance();
+
+            // if its not ours but we are a gateway, we should route it.
+            if (hostConfig.IsLocalAddress(ipHeader.Destination) == false &&
+                ipHeader.Destination != IPv4.Broadcast)
+            {
+                if (hostConfig.IsRouter)
+                {
+                    // Not supported for the time being.
+                }
+                // DebugPrint("Dropping wrong destination\n");
+                return NetStatus.Code.RT_DROP_WRONG_DEST;
+            }
+
+            // we should handle it..
+
+            IProtocol prot = core.GetProtocolFromID(ipHeader.protocol);
+            if (prot == null) {
+                DebugPrint("Packet drop no handler for protocol id = {0}\n",
+                           (ushort)ipHeader.protocol);
+                return NetStatus.Code.RT_DROP_NO_HANDLER;
+            }
+            else {
+                DebugPrint("Got packet of type {0}\n", ipHeader.protocol);
+            }
+
+            // clip the packet for the next protocol header + data
+            pkt.Clip(ipHeader.totalLength - IPFormat.Size - 1);
+
+            return prot.OnProtocolReceive(pkt);
+        }
+
+        // this method sends an IP packet. It uses the IP header
+        // target address to find route and sets the packet's Mux.
+        // it also sets the target and source mac addresses
+        public NetStatus OnProtocolSend(NetPacket! packet)
+        {
+            Multiplexer mux = (Multiplexer)packet.Mux;
+            if (mux != null) {
+                byte[]! data = (byte[]!) packet.GetRawData();
+                // Source has already resolved outbound mux.  Check
+                // briefly that they've put values in for ethernet headers
+                // (yes, only ethernet is supported here folks)
+                int dstOkay = ((int)data[0] | (int)data[1] | (int)data[2] |
+                               (int)data[3] | (int)data[4] | (int)data[5]);
+                int srcOkay = ((int)data[6] | (int)data[7] | (int)data[8] |
+                               (int)data[9] | (int)data[10]| (int)data[11]);
+                if (dstOkay != 0 && srcOkay != 0) {
+                    mux.SendBuffered(packet);
+                    DebugPrint("Packet sent (had mux)\n");
+                    return NetStatus.Code.PROTOCOL_OK;
+                }
+                // Invalid destination or source address.  Ignore request
+                // to send via specific mux.
+            }
+
+            // since we may retransmit this packet, we should
+            // reset the buffer to the IP boundaries!
+            packet.Clip(EthernetFormat.Size,
+                        packet.Length - EthernetFormat.Size - 1);
+
+            IPFormat.IPHeader! ipHeader;
+            if (IPFormat.ReadIPHeader(packet, out ipHeader) == false) {
+                DebugPrint("Packet dropped error)\n");
+                DebugStub.Break();
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+            Debug.Assert(ipHeader.Destination != IPv4.Zero);
+
+            RouteEntry e = HostConfiguration.RoutingTable.Lookup(ipHeader.Destination);
+            if (e == null) {
+                DebugPrint("Packet dropped no route)\n");
+                return NetStatus.Code.RT_DROP_NO_ROUTE;
+            }
+
+            //            DebugPrint("{0} -> {1}\n", ipHeader.Destination, e);
+            //            DebugPrint("Packet source {0}\n", ipHeader.Source);
+
+            IPv4 ifaddr  = e.InterfaceAddress;
+            IPv4 nexthop;
+            if (e.Gateway == e.InterfaceAddress) {
+                nexthop = ipHeader.Destination;
+            }
+            else {
+                nexthop = e.Gateway;
+            }
+
+            //            DebugPrint("Selected destination {0}\n", nexthop);
+
+            IAdapter adapter      = hostConfig.Bindings.GetAdapter(ifaddr);
+            assert adapter != null;
+            Multiplexer targetMux = Core.Instance().GetMuxForAdapter(adapter);
+            assert targetMux != null;
+
+            packet.Mux = targetMux;
+
+            EthernetAddress localMac = adapter.HardwareAddress;
+            EthernetAddress remoteMac;
+
+            IAdapter targetAdapter = hostConfig.Bindings.GetAdapter(nexthop);
+            if (targetAdapter != null) {
+                remoteMac = targetAdapter.HardwareAddress;
+            }
+            else {
+                if (arp.Lookup(nexthop, out remoteMac) == false) {
+                    DebugPrint("No ARP Entry for: {0}\n", nexthop);
+                    arp.ArpRequest(ipHeader.Source, nexthop, targetMux,
+                                   new ArpRequestCallback(ArpResponse),
+                                   packet, TimeSpan.FromSeconds(3));
+                    BlockAssociatedSession(packet);
+                    return NetStatus.Code.RT_RETRY_PENDING_ARP;
+                }
+            }
+
+            return SendResolved(packet, targetMux, localMac, remoteMac);
+        }
+
+        private NetStatus SendResolved(NetPacket!       packet,
+                                       Multiplexer!     targetMux,
+                                       EthernetAddress  localMac,
+                                       EthernetAddress  remoteMac)
+        {
+            // set the ethernet data
+            // TBC: make the ARPModule setup the packet
+            {
+                Session session = packet.SessionContext as Session;
+                if (session != null)
+                {
+                    DebugPrint("Sending packet for {0}/{1} ({2}-->{3})\n",
+                               session.RemoteAddress, session.RemotePort,
+                               localMac, remoteMac);
+                }
+                else
+                {
+                    DebugPrint("Sending packet to {0}\n", remoteMac);
+                }
+            }
+            Debug.Assert(packet.IsOneChunk);
+            EthernetFormat.Write((byte[]!)packet.GetRawData(), 0,
+                                 localMac, remoteMac,
+                                 EthernetFormat.PROTOCOL_IP);
+            targetMux.SendBuffered(packet);
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        private void ArpResponse(IPv4            address,
+                                 EthernetAddress answer,
+                                 object          cookie)
+        {
+            NetPacket! packet    = (NetPacket!)cookie;
+            DebugPrint("Got ARP response for {0} -> {1}", address, answer);
+
+            UnblockAssociatedSession(packet);
+            if (answer != EthernetAddress.Zero) {
+                Multiplexer mux = (Multiplexer!)packet.Mux;
+                SendResolved(packet, mux, mux.Adapter.HardwareAddress, answer);
+                Core.Instance().SignalOutboundPackets();
+            }
+            else {
+                DebugPrint("ARP timed out for {0}", address);
+            }
+        }
+
+        private void BlockAssociatedSession(NetPacket! packet)
+        {
+            Session! session = (!)(packet.SessionContext as Session);
+            session.OutQueuePaused = true;
+            DebugPrint("Blocking Session {0}\n", session.Uid);
+        }
+
+        private void UnblockAssociatedSession(NetPacket! packet)
+        {
+            Session! session = (!)(packet.SessionContext as Session);
+            session.OutQueuePaused = false;
+            DebugPrint("Unblocking session {0}\n", session.Uid);
+            Core.Instance().SignalOutboundPackets();    // Kickstart
+        }
+
+        public NetStatus SetProtocolSpecific(ushort opcode, byte[]! data)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public NetStatus GetProtocolSpecific(ushort opcode, out byte[] data)
+        {
+            data = null;
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        /*
+        protected NetStatus ForwardPacket(IPFormat.IPHeader! rcvIPHeader,
+                                          NetPacket!         packet,
+                                          Multiplexer        targetMux)
+        {
+            Debug.Assert(packet != null && packet.IsOneChunk);
+            // TBC: this is just a preliminary imp, should
+            // consider MTUs etc.
+            byte[] data = packet.ToContiguous();
+            int start   = EthernetFormat.Size;
+
+            // decrease the ttl, if it reaches 0 discard and send
+            // ICMP message using on the source mux, otherwise forward!
+            if (--rcvIPHeader.ttl == 0) {
+                // drop it! and use icmp protocol to return error
+                // TBC: icmp.OnProtocolSend(..)  // will use packetArg.Mux  = source mux
+                return NetStatus.Code.RT_DROP_TTL_EXPIRED;
+            }
+            // at last, forward it already!
+            // modify the header + calc new checksum
+            IPFormat.WriteIPHeader(data, start, rcvIPHeader);
+            DebugPrint("Forwarding IP packet.\n");
+
+            return OnProtocolSend(packet);
+        }
+        */
+
+        public HostConfiguration! HostConfiguration
+        {
+            get { return hostConfig; }
+        }
+
+        // ctor
+        public IPModule()
+        {
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/IProtocol.cs b/base/Services/NetStack/Runtime/IProtocol.cs
new file mode 100644
index 0000000..3aab9b3
--- /dev/null
+++ b/base/Services/NetStack/Runtime/IProtocol.cs
@@ -0,0 +1,72 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Collections.Specialized;
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This interface represents a networking protocol.
+     * It should be implemented by protocol implementations.
+     * Notice: Dynamic loadable protocols should implement a
+     * default constructor.
+     */
+    public interface IProtocol : INetModule
+    {
+        /**
+         * A protocol's handler for PDU reception,
+         * @param pkt - the arrived packet argument, the internal packet is
+         * stripped from all lower layer headers.
+         *
+         * @return NetStatus - the status of this invocation
+         *
+         * NOTICE: this protocol must set the internal: NetPacket.ActivePos for
+         * next level protocol.
+         */
+        NetStatus OnProtocolReceive(NetPacket! pkt);
+
+        // A specific Protocol's send routine
+        // @param pkt - a packet to send
+        // @return NetStatus - the status of this invocation
+        NetStatus OnProtocolSend(NetPacket! pkt);
+
+        // create a protocol specific session
+        Session CreateSession();
+
+        // set protocol specific data
+        // @return NetStatus - the status of this invocation
+        NetStatus SetProtocolSpecific(ushort opcode, byte[]! data);
+
+        // get protocol specific data
+        // @return NetStatus - the status of this invocation
+        NetStatus GetProtocolSpecific(ushort opcode, out byte[] data);
+
+        // get the protocol ID (Protocols.IPFormat.Protocol or EthernetFormat.Proto)
+        ushort GetProtocolID();
+    }
+
+    public interface IFlowAware
+    {
+        // find this protocol's session for a given packet
+        Session[]! GetSessions(NetPacket! packet);
+    }
+}
diff --git a/base/Services/NetStack/Runtime/Mux.cs b/base/Services/NetStack/Runtime/Mux.cs
new file mode 100644
index 0000000..44221c3
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Mux.cs
@@ -0,0 +1,141 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+//#define DEBUG_MUX
+
+using NetStack.Common;
+using System;
+using System.Collections;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+
+using Microsoft.Singularity;
+
+namespace NetStack.Runtime
+{
+    // This class provides the basic multiplexing of packets as
+    // they go out to a network device.  This component of the
+    // system is critical for several reasons.  First, it must
+    // handle two modes of operation (where the NIC is faster
+    // than the computer, and where the computer is faster
+    // than the NIC).  Second, it is the place in the
+    // system where we do bandwidth resource sharing, possibly
+    // including non-best-effort behaviour (such as weighted
+    // share or CBR).
+    public class Multiplexer
+    {
+        // We should of course have multiple queues and schedule
+        // them cleverly.
+        private Queue q;
+        private IAdapter! ad;
+        public  IAdapter! Adapter { get {return ad;} }
+        private NetPacket [] txBuffer;
+        private int maxSlotsFree;
+        private int maxBackLog;
+
+        private int directs;    // Packets sent with SendDirect that
+        // may be shoved into the queue at any time - we should
+        // ditch SendDirect ASAP and add sessions for ARP and ICMP.
+
+        public Multiplexer(Queue q, IAdapter! ad)
+        {
+            this.q = q;
+            this.ad = ad;
+            int capacity = ad.TxSlotsFree;
+            this.txBuffer     = new NetPacket [capacity];
+            this.maxSlotsFree = ad.TxSlotsFree;
+            this.maxBackLog   = ad.TxSlotsFree;
+
+            base();
+
+            DebugPrint("TxBuffer capacity: {0}\n", capacity);
+            DebugStub.Assert(capacity > 0);
+        }
+
+        [ System.Diagnostics.Conditional("DEBUG_MUX") ]
+        private static void DebugPrint(string format, params object[] args)
+        {
+            DebugStub.Print("Mux: {0}",
+                            __arglist(String.Format(format, args))
+                            );
+        }
+
+        public bool IsBackLogged
+        {
+            get { return this.q.Count >= this.maxBackLog; }
+        }
+
+        public int FreeBufferSpace
+        {
+            get { return Math.Max(this.maxBackLog - this.q.Count, 0); }
+        }
+
+        public void SendBuffered(NetPacket! packet)
+        {
+            // This is the preferred way of sending packets as it
+            // allows us to gather up larger groups of packets to
+            // send.
+
+            DebugStub.Assert(packet.Length <= 1514);
+
+            q.Enqueue(packet);
+
+            DebugPrint("SendBuffered free = {0} queued = {1}\n",
+                       ad.TxSlotsFree, q.Count);
+
+            DebugStub.Assert(q.Count <= this.maxBackLog + directs);
+        }
+
+        public void PushSendBuffer()
+        {
+            int txCount = Math.Min(ad.TxSlotsFree, q.Count);
+
+            DebugPrint("PushSendBuffer free = {0} queued = {1}\n",
+                       ad.TxSlotsFree, q.Count);
+
+            if (txCount > 0) {
+                for (int i = 0; i < txCount; i++) {
+                    txBuffer[i] = (NetPacket)q.Dequeue();
+                }
+                for (int i = txCount; i < txBuffer.Length; i++) {
+                    // Paranoia (if it's wrong lower down, it might send
+                    // a duplicate).
+                    txBuffer[i] = null;
+                }
+                ad.PopulateTxRing(txBuffer, (uint)txCount);
+
+                // If stack has placed packets directly in buffer for
+                // send decrement counter, we only count directs to check
+                // the queue does not grow unbounded.
+                directs -= Math.Max(0, directs - txCount);
+            }
+        }
+
+        // Simpler function for sending a single packet
+        public void SendDirect(NetPacket! packet)
+        {
+            // This method should be deprecated
+            // Everything should have an associated session and be
+            // sent from the outgoing queues handler.
+            directs ++;
+            SendBuffered(packet);
+            DebugPrint("SendDirect\n");
+            PushSendBuffer();
+        }
+
+        public NetStatus OnAdapterSendComplete(Dispatcher.CallbackArgs unused)
+        {
+            ad.GetTransmittedPackets();
+            DebugPrint("OnAdapterSendComplete free = {0} queued = {1}\n",
+                       ad.TxSlotsFree, q.Count);
+            Core.Instance().SignalOutboundPackets();
+            return NetStatus.Code.RT_OK;
+        }
+    } // Multiplexer
+} // NetStack.Runtime
+// End
diff --git a/base/Services/NetStack/Runtime/NetStackThreadPool.sg b/base/Services/NetStack/Runtime/NetStackThreadPool.sg
new file mode 100644
index 0000000..917b84a
--- /dev/null
+++ b/base/Services/NetStack/Runtime/NetStackThreadPool.sg
@@ -0,0 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   NetStackThreadPool.sg
+//
+//  Note: adapted from CassiniThreadPool.sg
+//
+
+#if THREAD_POOL
+
+using System.Collections;
+using System.Threading;
+
+namespace NetStack.Runtime
+{
+    /// <remarks>This class implements a non-Singleton
+    /// threadpool and has a configurable work queue
+    /// size. </remarks>
+    public sealed class NetStackThreadPool
+    {
+        object                            monitor;
+        Queue                             commands; // Queue of ThreadStart
+        int                               queuedItems;
+        readonly int                      maxQueuedItems;
+        volatile int                      threadCount;
+        volatile bool                     shutdown;
+        ManualResetEvent                  shutdownEvent;
+
+        [Microsoft.Contracts.NotDelayed]
+        public NetStackThreadPool(int maxThreads, int maxQueuedItems)
+            requires maxThreads > 0;
+            requires maxQueuedItems > 0;
+            requires maxThreads <= maxQueuedItems;
+        {
+            this.monitor          = new object();
+            this.commands         = new Queue();
+            this.queuedItems      = 0;
+            this.maxQueuedItems   = maxQueuedItems;
+            this.threadCount      = maxThreads;
+            this.shutdown         = false;
+            this.shutdownEvent    = new ManualResetEvent(false);
+
+            for (int i = 0; i < maxThreads; i++) {
+                Thread t = new Thread(new ThreadStart(WorkerMain));
+                t.Start();
+            }
+        }
+
+        /// <summary> Queues call to constructor supplied
+        /// delegate with user supplied object.  This method
+        /// blocks if maximum queue size is reached.  </summary>
+        public void QueueUserWorkItem(ThreadStart! command)
+        {
+            Monitor.Enter(this.monitor);
+            while (this.queuedItems == this.maxQueuedItems) {
+                Monitor.Wait(this.monitor);
+            }
+            commands.Enqueue(command);
+            this.queuedItems++;
+            Monitor.Pulse(this.monitor);
+            Monitor.Exit(this.monitor);
+        }
+
+        private void WorkerMain()
+        {
+            while (true) {
+                ThreadStart command;
+                lock (this.monitor) {
+                    while (queuedItems == 0 && !shutdown) {
+                        Monitor.Wait(this.monitor);
+                    }
+
+                    if (queuedItems == 0 && shutdown) {
+                        break;
+                    }
+
+                    command = (ThreadStart) (commands.Dequeue());
+                    assert(command != null);
+
+                    if (this.queuedItems-- == this.maxQueuedItems) {
+                        Monitor.Pulse(this.monitor);
+                    }
+                }
+                command();
+            }
+
+            lock (this.monitor) {
+                if (--this.threadCount == 0) {
+                    shutdownEvent.Set();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Shutdown thread pool instance.  Caller blocks until
+        /// the threads in the pool have finished outstanding
+        /// work items.
+        /// </summary>
+        internal void Shutdown()
+        {
+            lock (this.monitor) {
+                shutdown = true;
+                Monitor.PulseAll(this.monitor);
+            }
+
+            shutdownEvent.WaitOne();
+
+            Microsoft.Singularity.DebugStub.Assert(commands.Count == 0);
+        }
+    }
+}
+
+#endif // THREAD_POOL
diff --git a/base/Services/NetStack/Runtime/NetStatus.cs b/base/Services/NetStack/Runtime/NetStatus.cs
new file mode 100644
index 0000000..576e8b7
--- /dev/null
+++ b/base/Services/NetStack/Runtime/NetStatus.cs
@@ -0,0 +1,84 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+namespace NetStack
+{
+    namespace Runtime 
+    {               
+        public struct NetStatus 
+        {
+            // the error code
+            public Code errorCode;           
+
+            // ctor
+            public NetStatus(Code c)
+            {
+                errorCode=c;
+            }
+
+            // create an implicit cast operator
+            public static implicit operator NetStatus(Code c) 
+            {
+                return new NetStatus(c);
+            }
+
+            // create an implicit cast operator
+            public static implicit operator Code(NetStatus s) 
+            {
+                return s.errorCode;
+            }
+
+            // networking stack error codes
+            public enum Code : byte
+            {
+                // nice codes...
+                RT_OK                =  0x00,   // runtime is happy
+                RT_DROP_NO_HANDLER   =  0x01,   // packet dropped, type handler doesn't exist
+                PROTOCOL_OK          =  0x02,   // protocol is finished, packet can be recycled
+                PROTOCOL_PROCESSING  =  0x03,   // more work to be done (prob by other protocols)
+                PROTOCOL_DROP_CHKSUM =  0x04,   // protocol drops a packet - checksum
+                RT_DROP_WRONG_DEST   =  0x05,   // destination is wrong + we are not gateway
+                RT_DROP_NO_ROUTE     =  0x06,   // no route to the destination, drop it
+                RT_DROP_TTL_EXPIRED  =  0x07,   // ttl has been expired, drop the packet
+                PROTOCOL_DROP_NO_BUF =  0x08,   // no buffer available to accept the packet                
+                PROTOCOL_DROP_ERROR  =  0x09,   // general drop error
+                RT_RETRY_PENDING_ARP =  0x10,   // retry sending due to pending ARP resolution
+
+                // error codes...
+                RT_ERROR             =  0x80,  // runtime general error                
+                PROTOCOL_PANIC       =  0xFF   // panic - shutdown!
+            }
+
+            public static string[] 
+                ErrorMap = new string[] {
+                                            "RuntimeError",
+                                            "UndefinderProtocol"
+                                        };
+
+            public static bool SUCCEEDED(NetStatus.Code code)
+            {
+                return ((((byte)code)&0x80)==0);
+            }
+
+            public static bool FAILED(NetStatus.Code code)
+            {
+                return (!SUCCEEDED(code));
+            }
+
+            public static string ErrorToString(NetStatus.Code errorCode)
+            {                
+                return ErrorMap[((byte)errorCode)&0x7F];
+            }          
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/PacketTypes.cs b/base/Services/NetStack/Runtime/PacketTypes.cs
new file mode 100644
index 0000000..b4625d5
--- /dev/null
+++ b/base/Services/NetStack/Runtime/PacketTypes.cs
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System;
+using System.Collections;
+
+namespace NetStack.Runtime
+{
+    /**
+     * Each protocol (upon initialization) should
+     * register itself as a specific packet type handler.
+     * The packet type must be one of: ProtocolCode
+     * types (a TCP has nothing to do with this list...)
+     * Notice: the ALL code is used for receiving all
+     * incoming traffic.
+     */
+    public class PacketTypes
+    {
+        public const ushort IP    = 0x0800;
+        public const ushort ARP   = 0x0806;
+        public const ushort RARP  = 0x8035;
+        public const ushort PAUSE = 0x8808;
+        public const ushort MAP   = 0x4934;
+        public const ushort NLB   = 0x886F;             // Microsoft
+        public const ushort LOOP  = 0x0060;             // Loopback
+        public const ushort ALL   = 0xFFFF;             // All packets!
+
+        private const int MaxTypes   = 16;
+        private ushort [] key        = new ushort [MaxTypes];
+        private IProtocol [] handler = new IProtocol[MaxTypes];
+        private int registered = 0;
+
+        // registers a new type's handler
+        // return true if succeeded.
+        public bool RegisterTypeHandler(ushort type, IProtocol protocol)
+        {
+            if (registered == MaxTypes)
+            {
+                Core.Log("Out of type handler space.");
+                return false;
+            }
+
+            if (GetHandler(type) != null)
+            {
+                Core.Log("Handler already registered.");
+                return false;
+            }
+
+            key[registered] = type;
+            handler[registered] = protocol;
+            registered++;
+            return true;
+        }
+
+        public IProtocol GetHandler(ushort type)
+        {
+            for (int i = 0; i < registered; i++)
+            {
+                if (key[i] == type)
+                {
+                    return handler[i];
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/ProtocolParams.cs b/base/Services/NetStack/Runtime/ProtocolParams.cs
new file mode 100644
index 0000000..4dc964f
--- /dev/null
+++ b/base/Services/NetStack/Runtime/ProtocolParams.cs
@@ -0,0 +1,211 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using System;
+using System.Collections.Specialized;
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    /// <summary>
+    /// This class encapsulated the modules parameters
+    /// as given in the configuration file.
+    /// The interpretation of each parameter is module specific.
+    /// </summary>
+    public class ProtocolParams : StringDictionary
+    {
+        /// <summary>
+        /// Read a named integer parameter from a <c>ProtocolParams</c>
+        /// instance.
+        /// </summary>
+        /// <returns><paramref name="defaultValue"/> if <paramref name="parameters"/> 
+        /// is <c>null</c> or <paramref name="parameterName"/> 
+        /// cannot be found.  Otherwise it
+        /// returns the named parameter as an integer.</returns>
+        public static int LookupInt32(ProtocolParams parameters,
+                                      string         parameterName,
+                                      int            defaultValue)
+        {
+            if (parameters == null)
+            {
+                return defaultValue;
+            }
+            else if (parameterName == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            string sValue = parameters[parameterName];
+            if (sValue == null)
+            {
+                return defaultValue;
+            }
+
+            try
+            {
+                return Int32.Parse(sValue);
+            }
+            catch
+            {
+                Core.Log("Failed on parameter \"{0}\" value \"{1}\"\n",
+                         parameterName, sValue);
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Read a named unsigned integer parameter from a
+        /// <c>ProtocolParams</c> instance.
+        /// </summary>
+        /// <returns><paramref name="defaultValue"/> if <paramref name="parameters"/>
+        /// is <c>null</c> or <paramref name="parameterName"/> cannot be found.
+        /// Otherwise it returns the named parameter as an unsigned
+        /// integer.</returns>
+        public static uint LookupUInt32(ProtocolParams parameters,
+                                        string         parameterName,
+                                        uint           defaultValue)
+        {
+            if (parameters == null)
+            {
+                return defaultValue;
+            }
+            else if (parameterName == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            string sValue = parameters[parameterName];
+            if (sValue == null)
+            {
+                return defaultValue;
+            }
+
+            try
+            {
+                return UInt32.Parse(sValue);
+            }
+            catch
+            {
+                Core.Log("Failed on parameter \"{0}\" value \"{1}\"\n",
+                         parameterName, sValue);
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Read a named IPv4 parameter from a <c>ProtocolParams</c>
+        /// instance.
+        /// </summary>
+        /// <returns><paramref name="defaultValue"/> if <paramref name="parameters"/> 
+        /// is <c>null</c> or <paramref name="parameterName"/> cannot be found. 
+        /// Otherwise it returns the named parameter as an IPv4 address.</returns>
+        public static IPv4 LookupIPv4(ProtocolParams parameters,
+                                      string       parameterName,
+                                      IPv4         defaultValue)
+        {
+            if (parameters == null)
+            {
+                return defaultValue;
+            }
+            else if (parameterName == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            string sValue = parameters[parameterName];
+            if (sValue == null)
+            {
+                return defaultValue;
+            }
+
+            try
+            {
+                return IPv4.Parse(sValue);
+            }
+            catch (FormatException)
+            {
+                Core.Log("Failed on parameter \"{0}\" value \"{1}\"\n",
+                         parameterName, sValue);
+            }
+            return defaultValue;
+        }
+
+        /// <summary>
+        /// Read a named string parameter from a <c>ProtocolParams</c>
+        /// instance.
+        /// </summary>
+        /// <returns><paramref name="defaultValue"/> if <paramref name="parameters"/> 
+        /// is <c>null</c> or <paramref name="parameterName"/> cannot be found.
+        /// Otherwise it returns the named parameter as a string.</returns>
+        public static string LookupString(ProtocolParams parameters,
+                                          string         parameterName,
+                                          string         defaultValue)
+        {
+            if (parameters == null)
+            {
+                return defaultValue;
+            }
+            else if (parameterName == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            string sValue = parameters[parameterName];
+            if (sValue == null)
+            {
+                return defaultValue;
+            }
+            return sValue;
+        }
+
+        /// <summary>
+        /// Read a named boolean parameter from a <c>ProtocolParams</c>
+        /// instance.
+        /// </summary>
+        /// <returns><paramref name="defaultValue"/> if <paramref name="parameters"/>
+        /// is <c>null</c> or <paramref name="parameterName"/> cannot be found.
+        /// Otherwise it returns the named parameter as a boolean.</returns>
+        public static bool LookupBoolean(ProtocolParams parameters,
+                                         string         parameterName,
+                                         bool           defaultValue)
+        {
+            if (parameters == null)
+            {
+                return defaultValue;
+            }
+            else if (parameterName == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            string sValue = parameters[parameterName];
+            if (sValue == null)
+            {
+                return defaultValue;
+            }
+
+            try
+            {
+                return Boolean.Parse(sValue);
+            }
+            catch (FormatException)
+            {
+                Core.Log("Failed on parameter \"{0}\" value \"{1}\"\n",
+                         parameterName, sValue);
+                return defaultValue;
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/RoutingTable.cs b/base/Services/NetStack/Runtime/RoutingTable.cs
new file mode 100644
index 0000000..072f915
--- /dev/null
+++ b/base/Services/NetStack/Runtime/RoutingTable.cs
@@ -0,0 +1,283 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    public class RouteEntry : IComparable
+    {
+        public const uint InterfaceRouteTag = 0x80000000;
+
+        public const uint InterfaceMetric         = 0;
+        public const uint DirectlyConnectedMetric = 1;
+        public const uint DefaultRouteMetric      = 20;
+
+        private IPv4Network network;
+        private IPv4        gateway;
+        private IPv4        ifaddr;
+        private uint        metric;
+        private uint        tag;
+
+        public RouteEntry(IPv4Network network,
+                          IPv4        gateway,
+                          IPv4        ifaddr,
+                          uint        metric,
+                          uint        tag)
+        {
+            this.network = network;
+            this.gateway = gateway;
+            this.ifaddr  = ifaddr;
+            this.metric  = metric;
+            this.tag     = tag;
+        }
+
+        public RouteEntry(IPv4Network network,
+                          IPv4        gateway,
+                          IPv4        ifaddr)
+            : this (network, gateway, ifaddr, DefaultRouteMetric, 0)
+        {
+        }
+
+        public RouteEntry(IPv4 host,
+                          IPv4 gateway,
+                          IPv4 ifaddr,
+                          uint metric,
+                          uint tag)
+        {
+            this.network = new IPv4Network(host, IPv4.BitCount);
+            this.gateway = gateway;
+            this.ifaddr  = ifaddr;
+            this.metric  = metric;
+            this.tag     = tag;
+        }
+
+        public RouteEntry(IPv4 host,
+                          IPv4 gateway,
+                          IPv4 ifaddr)
+            : this (host, gateway, ifaddr, DefaultRouteMetric, 0)
+        {
+        }
+
+        public IPv4Network Network   { get { return network; } }
+        public IPv4 Gateway          { get { return gateway; } }
+        public IPv4 InterfaceAddress { get { return ifaddr; } }
+        public uint Metric           { get { return metric; } }
+        public uint Tag              { get { return tag; } }
+
+        public override string! ToString()
+        {
+            if (network.MaskLength == IPv4.BitCount)
+            {
+                return String.Format("Host    {0,-17} Gateway {1,-14} " +
+                                     "Interface {2,-14} Metric {3,-3} " +
+                                     "Tag {4:x8}",
+                                     network.LowerBound, gateway,
+                                     ifaddr, metric, tag);
+            }
+            else
+            {
+                return String.Format("Network {0,-17} Gateway {1,-14} " +
+                                     "Interface {2,-14} Metric {3,-3} " +
+                                     "Tag {4:x8}",
+                                     network, gateway, ifaddr, metric, tag);
+            }
+        }
+
+        public int CompareTo(object o)
+        {
+            RouteEntry other = o as RouteEntry;
+            if (other == null)
+                throw new ArgumentException();
+
+            //
+            // Metric - Cheapest route wins
+            //
+            if (this.metric < other.metric)
+            {
+                return -1;
+            }
+            else if (this.metric > other.metric)
+            {
+                return +1;
+            }
+
+            //
+            // Specificity - Most specific wins
+            //
+            if (network.IsLessSpecificThan(other.network))
+            {
+                return +1;
+            }
+            else if (network.IsMoreSpecificThan(other.network))
+            {
+                return -1;
+            }
+
+            //
+            // Numeric value of network - lowest value wins
+            //
+            IPv4 ourAddress   = network.LowerBound;
+            IPv4 otherAddress = other.network.LowerBound;
+
+            if (ourAddress < otherAddress)
+            {
+                return -1;
+            }
+            if (ourAddress == otherAddress)
+            {
+                return 0;
+            }
+            return +1;
+        }
+    } // RouteEntry
+
+    /// <summary>
+    /// A placeholder implementation of a routing table.
+    /// RoutingTables are great areas for optimization and
+    /// there's a ton of ways to perform fast lookups.  The
+    /// current implementation uses a linear search to find the
+    /// best route and should be replaced if there are going to
+    /// be have more than a handful of routes.
+    ///
+    /// Also note the current implementation allows routes to be
+    /// added without being fully resolvable.  Finding the interface
+    /// for a route may take multiple lookups.
+    ///
+    /// </summary>
+    public class RoutingTable
+    {
+        private SortedList! routes;      // synchronized
+
+        public RoutingTable()
+        {
+            routes = SortedList.Synchronized(new SortedList());
+            base();
+        }
+
+        public int Count
+        {
+            get { return routes.Count; }
+        }
+
+        public bool AddRoute(RouteEntry! e)
+        {
+            try
+            {
+                routes.Add(e, e);
+                return true;
+            }
+            catch (ArgumentException)
+            {
+                return false;
+            }
+        }
+
+        public bool DeleteRoute(RouteEntry e)
+        {
+            lock (routes.SyncRoot)
+            {
+                int oldCount = routes.Count;
+                routes.Remove(e);
+                return oldCount > routes.Count;
+            }
+        }
+
+        /// <summary>
+        /// Get route for destination address.
+        /// </summary>
+        public RouteEntry Lookup(IPv4 destination)
+        {
+            foreach (RouteEntry! e in routes.Values)
+            {
+                if (e.Network.Contains(destination))
+                {
+                    return e;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get route for destination network.
+        /// </summary>
+        public RouteEntry Lookup(IPv4Network destination)
+        {
+            foreach (RouteEntry! e in routes.Values)
+            {
+                if (e.Network.Contains(destination))
+                {
+                    return e;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get Enumerator for <c>RouteEntry</c> instances in Routing table.
+        /// </summary>
+        public IEnumerator GetEnumerator()
+        {
+            return routes.Values.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Get route for specific destination.
+        /// </summary>
+        /// <returns>Specific route if it is present,
+        /// <c>null</c> otherwise.  </returns>
+        public RouteEntry LookupSpecific(IPv4 destination)
+        {
+            return LookupSpecific(new IPv4Network(destination, IPv4.BitCount));
+        }
+
+        /// <summary>
+        /// Get route for specific destination network.
+        /// </summary>
+        /// <returns>Specific route if it is present,
+        /// <c>null</c> otherwise.  </returns>
+        public RouteEntry LookupSpecific(IPv4Network destination)
+        {
+            foreach (RouteEntry! e in routes.Values)
+            {
+                if (e.Network == destination)
+                {
+                    return e;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Delete all routes that have specified interface address.
+        /// </summary>
+        public void DeleteInterfaceRoutes(IPv4 interfaceAddress)
+        {
+            ArrayList deadRoutes = new ArrayList();
+
+            lock (routes)
+            {
+                foreach (RouteEntry! e in routes.Values)
+                {
+                    if (e.InterfaceAddress == interfaceAddress)
+                    {
+                        deadRoutes.Add(e);
+                    }
+                }
+            }
+
+            foreach (RouteEntry e in deadRoutes)
+            {
+                deadRoutes.Remove(e);
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/Runtime.csproj.user b/base/Services/NetStack/Runtime/Runtime.csproj.user
new file mode 100644
index 0000000..0e89b7e
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Runtime.csproj.user
@@ -0,0 +1,48 @@
+<VisualStudioProject>
+    <CSHARP LastOpenVersion = "7.10.3077" >
+        <Build>
+            <Settings ReferencePath = "" >
+                <Config
+                    Name = "Debug"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+                <Config
+                    Name = "Release"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+            </Settings>
+        </Build>
+        <OtherProjectSettings
+            CopyProjectDestinationFolder = ""
+            CopyProjectUncPath = ""
+            CopyProjectOption = "0"
+            ProjectView = "ProjectFiles"
+            ProjectTrust = "0"
+        />
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/base/Services/NetStack/Runtime/Runtime.csproj.vspscc b/base/Services/NetStack/Runtime/Runtime.csproj.vspscc
new file mode 100644
index 0000000..a0b5fba
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Runtime.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = "relative:Runtime"
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
diff --git a/base/Services/NetStack/Runtime/Session.cs b/base/Services/NetStack/Runtime/Session.cs
new file mode 100644
index 0000000..4a68339
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Session.cs
@@ -0,0 +1,571 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Collections;
+
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This is the base class for all sessions.
+     * The session represent an instance of a specific
+     * protocol and is usually embedded in a higher level
+     * library abstraction.
+     */
+    public class Session : IDisposable
+    {
+        private static uint uids = 0;
+        private uint   uid = uids++;
+
+        public uint Uid { get { return uid; } }
+
+        // the session identifiers
+        private IPv4      localAddress;
+        private ushort    localPort;
+        private IPv4      remoteAddress;
+        private ushort    remotePort;
+
+        private bool      disposed;
+
+        private  IProtocol! protocol;    // the session's protocol
+
+        private Multiplexer mux;
+
+        // the session's queues
+        internal ArrayList! outQueue;
+        private int outQueueCapacity;
+
+        internal ArrayList! inQueue;
+        private int inQueueCapacity;
+
+        private bool outQueuePaused;    // used to pause outbound queue while
+                                        // awaiting ARP response.
+
+        // get some info
+        public IPv4   RemoteAddress { get { return remoteAddress; } }
+        public ushort RemotePort    { get { return remotePort; } }
+
+        public IPv4   LocalAddress  { get { return localAddress; } }
+        public ushort LocalPort     { get { return localPort; } }
+
+        public IProtocol! Protocol  { get { return protocol; } }
+
+        public Session(IProtocol! protocol, int outQueueSize, int inQueueSize)
+        {
+            this.protocol         = protocol;
+            this.outQueue         = new ArrayList(outQueueSize);
+            this.inQueue          = new ArrayList(inQueueSize);
+            this.outQueueCapacity = outQueueSize;
+            this.inQueueCapacity  = inQueueSize;
+            this.outQueuePaused   = false;
+            this.disposed         = false;
+            base();
+        }
+
+        ~Session()
+        {
+            if (!disposed)
+                Dispose();
+        }
+
+        public void Dispose()
+        {
+            if (!disposed)
+            {
+                Core.Instance().DeregisterSession(protocol, this);
+                DrainQueue(inQueue);
+                DrainQueue(outQueue);
+            }
+            disposed = true;
+        }
+
+        public void ReInitialize(IProtocol! protocol)
+        {
+            Core.Instance().DeregisterSession(protocol, this);
+
+            this.protocol       = protocol;
+            this.outQueuePaused = false;
+            this.disposed       = false;
+            this.localAddress   = IPv4.Zero;
+            this.remoteAddress  = IPv4.Zero;
+            this.localPort      = 0;
+            this.remotePort     = 0;
+            this.disposed       = false;
+            DrainQueue(this.outQueue);
+            DrainQueue(this.inQueue);
+        }
+
+        internal void DrainQueue(ArrayList! queue)
+        {
+            lock (queue.SyncRoot) {
+                if (queue == this.inQueue) {
+                    while (queue.Count > 0) {
+                        NetPacket! p = (NetPacket!)queue[0];
+                        queue.Remove(0);
+                        Core.Instance().TheDemux.TakeFreePacket(p);
+                    }
+                }
+                else {
+                    queue.Clear();
+                }
+            }
+        }
+
+        public bool OutQueuePaused
+        {
+            get { return outQueuePaused; }
+            set { outQueuePaused = value; }
+        }
+
+        [ Conditional("DEBUG_SESSION") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log("Session: ");
+            Core.Log(format, args);
+        }
+
+        // Multiplexer, if set packets are sent via multiplexer
+        public Multiplexer BoundMux
+        {
+            get { return mux; }
+            set { mux = value; }
+        }
+
+        internal void SetRemoteEndPoint(IPv4 remoteAddress, ushort remotePort)
+        {
+            this.remoteAddress = remoteAddress;
+            this.remotePort    = remotePort;
+        }
+
+        public bool IsLocalAddress(IPv4 address)
+        {
+            IPModule ipModule = Core.Instance().GetProtocolByName("IP")
+                as IPModule;
+            if (ipModule == null)
+            {
+                return false;
+            }
+            return ipModule.HostConfiguration.IsLocalAddress(address);
+        }
+
+        internal bool SetLocalEndPoint(IPv4 address, ushort port)
+        {
+            if (address != IPv4.Zero && !IsLocalAddress(address))
+            {
+                // Invalid address
+                return false;
+            }
+
+            if (address == IPv4.Zero &&
+                remoteAddress != IPv4.Zero)
+            {
+                IPModule ipModule = (IPModule!)Core.Instance().GetProtocolByName("IP");
+                RouteEntry e = ipModule.HostConfiguration.RoutingTable.Lookup(remoteAddress);
+
+                if (e != null)
+                {
+                    address = e.InterfaceAddress;
+                    DebugPrint("local address now {0}\n", address);
+                }
+                else
+                {
+                    DebugPrint("No route for {0}\n", remoteAddress);
+                }
+            }
+
+            localAddress = address;
+            if (this.LocalPort != port) {
+                Core.Instance().ChangeSessionLocalPort(this, port);
+                DebugPrint("Local port {0} {1}\n", port, localPort);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// This method should only be called by Core.ChangeSessionLocalPort
+        /// which co-ordinates port allocations.
+        /// </summary>
+        internal void SetLocalPort(ushort newPort)
+        {
+            this.localPort = newPort;
+        }
+        // Is this session valid for users to read from?
+        // This can become false for TCP sessions when the
+        // remote entity closes their half of the duplex
+        // connection
+        internal virtual bool IsSessionValidForUserRead()
+        {
+            return true;
+        }
+
+        // Is this session valid for users to write to?
+        // This can become false for TCP sessions when
+        // the user has closed the local side of the duplex
+        // connection
+        internal virtual bool IsSessionValidForUserWrite()
+        {
+            return true;
+        }
+
+        // get a packet from a queue
+        // the session may be shared in user land (so we need the sync)
+        // since the core also use this version we pass a bool to differentiate between
+        // stack calls/user calls
+        // we let the user read packets if exist event though the session
+        // is closing (for instance a web server sends the data and disconnect)
+        protected NetPacket DequeuePacket(ArrayList! queue,
+                                          int        timeoutMillis)
+        {
+            Debug.Assert(queue == inQueue || outQueuePaused == false);
+
+            NetPacket packet  = null;
+            TimeSpan  timeout;
+
+            // Negative millis means forever.
+            if (timeoutMillis < 0)
+            {
+                timeout = TimeSpan.Infinite;
+            }
+            else
+            {
+                timeout = TimeSpan.FromMilliseconds(timeoutMillis);
+            }
+
+            lock (queue.SyncRoot)
+            {
+                if ((timeoutMillis == 0) && queue.Count == 0)
+                {
+                    // Don't sleep
+                    return null;
+                }
+
+                while (queue.Count == 0)
+                {
+                    if (Monitor.Wait(queue.SyncRoot, timeout) == false)
+                    {
+                        return null;
+                    }
+                }
+
+                packet = (NetPacket)queue[0];
+                queue.RemoveAt(0);
+                Monitor.PulseAll(queue.SyncRoot);
+                Debug.Assert(packet != null);
+                return packet;
+            }
+        }
+
+        private int GetQueueCapacity(ArrayList! queue)
+        {
+            // Work around for lack of abstract in queues (grrr!)
+            DebugStub.Assert(queue == this.outQueue || queue == this.inQueue);
+            if (queue == this.outQueue) {
+                return this.outQueueCapacity;
+            }
+            else {
+                return this.inQueueCapacity;
+            }
+        }
+
+        // put a packet in a Queue and notify waiters
+        // return false if the packet was thrown
+        protected bool EnqueuePacket(ArrayList! queue,
+                                     NetPacket! packet,
+                                     bool       toBlock)
+        {
+            lock (queue.SyncRoot)
+            {
+                if (queue.Count >= queue.Capacity && !toBlock) {
+                    return false;
+                }
+
+                int queueCapacity = GetQueueCapacity(queue);
+                while (queue.Count >= queueCapacity)
+                    /* Potential fix to stop accepting users packets until
+                       destination is ARPed */
+                       /*|| (queue == this.outQueue && this.outQueuePaused) */
+                {
+                    // Note In TcpSessions the queue length may
+                    // be greater than queueCapacity because of
+                    // retransmits.  Retransmits are inserted at
+                    // the head of the sessions outbound queue
+                    // and we don't want any more packets
+                    // enqueued until we've drained below the
+                    // desired water level.
+                    Monitor.Wait(queue.SyncRoot);
+                }
+
+                // Enqueue packet then set packet session
+                // context.  The context can be used to block
+                // the sessions outqueue while waiting for
+                // events such as ARP
+                // (IPModule.BlockAssociatedSession does this
+                // for instance)
+                queue.Add(packet);
+                packet.SessionContext = this;
+
+                Monitor.PulseAll(queue.SyncRoot);
+            }
+
+            if (queue == this.outQueue) {
+                // Signal to the core that outbound queues need
+                // servicing...
+                Core.Instance().SignalOutboundPackets();
+            }
+
+            return true;
+        }
+
+        // Determine whether the queue is empty without sleeping
+        internal bool QueueIsEmpty(ArrayList! queue)
+        {
+            lock (queue.SyncRoot)
+            {
+                return queue.Count == 0;
+            }
+        }
+
+        protected bool PollQueueNotEmpty(ArrayList! queue, int timeoutMillis)
+        {
+            if (timeoutMillis < 0)
+            {
+                return false;
+            }
+
+            DateTime startTime = DateTime.Now;
+            TimeSpan timeout   = TimeSpan.FromMilliseconds(timeoutMillis);
+            TimeSpan remain    = timeout;
+            bool     result    = false;
+
+            if (Monitor.TryEnter(queue.SyncRoot, remain) == false)
+            {
+                return false;
+            }
+
+            remain = startTime + timeout - DateTime.Now;
+
+            while (remain >= TimeSpan.Zero && result == false)
+            {
+                Monitor.PulseAll(queue.SyncRoot);
+
+                if (Monitor.Wait(queue.SyncRoot, remain) == false)
+                {
+                    // Timed-out waiting for lock
+                    return false;
+                }
+
+                result = (queue.Count > 0);
+                remain = startTime + timeout - DateTime.Now;
+            }
+
+            Monitor.PulseAll(queue.SyncRoot);
+            Monitor.Exit(queue.SyncRoot);
+            return result;
+        }
+
+        protected bool PollQueueNotFull(ArrayList! queue, int timeoutMillis)
+        {
+            if (timeoutMillis < 0)
+            {
+                return false;
+            }
+
+            DateTime startTime = DateTime.Now;
+            TimeSpan timeout   = TimeSpan.FromMilliseconds(timeoutMillis);
+            TimeSpan remain    = timeout;
+            bool     result    = false;
+
+            if (Monitor.TryEnter(queue.SyncRoot, remain) == false)
+            {
+                return false;
+            }
+
+            remain = startTime + timeout - DateTime.Now;
+
+            while (remain >= TimeSpan.Zero && result == false)
+            {
+                Monitor.PulseAll(queue.SyncRoot);
+                if (Monitor.Wait(queue.SyncRoot, remain) == false)
+                {
+                    // Timed-out waiting for lock
+                    return false;
+                }
+                result = (queue.Count < queue.Capacity);
+                remain = startTime + timeout - DateTime.Now;
+            }
+
+            Monitor.PulseAll(queue.SyncRoot);
+            Monitor.Exit(queue.SyncRoot);
+            return result;
+        }
+
+        // this method is called by the Core to handle outgoing queues, should
+        // be override by concrete sessions if necessary
+        virtual internal NetPacket GetPacket(ArrayList! queue,
+                                             bool       toBlock,
+                                             int        timeoutMillis)
+        {
+            return DequeuePacket(queue, timeoutMillis);
+        }
+
+        virtual internal bool PutPacket(ArrayList! queue,
+                                        NetPacket! packet,
+                                        bool       toBlock)
+        {
+            return (EnqueuePacket(queue, packet, toBlock));
+        }
+
+        virtual internal NetStatus OnReceive(object sender, NetPacket! pkt, object ctx)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        //--------------------------------------------
+        // User interface
+        //--------------------------------------------
+
+        virtual public byte[] PollCopyData(int timeoutMillis)
+        {
+            // If we're out of packets and there will never be anymore,
+            // don't try to sleep for any!
+            if (QueueIsEmpty(inQueue) && !IsSessionValidForUserRead()) {
+                return null;
+            }
+            // else return the enqueued packets
+
+            NetPacket netPacket = DequeuePacket(inQueue, timeoutMillis);
+
+            if (netPacket != null) {
+                DebugStub.Assert(netPacket.AdapterContext != null);
+                byte [] userData = netPacket.ToUser();
+                Core.Instance().TheDemux.TakeFreePacket(netPacket);
+                return userData;
+            }
+            return null;
+        }
+
+        public byte[] in ExHeap PollData(int timeoutMillis)
+        {
+            // Duplicate of PollData, but copies to shared heap buffer.
+            if (!IsSessionValidForUserRead()) {
+                return null;
+            }
+            // else return the enqueued packets
+
+            NetPacket netPacket = DequeuePacket(inQueue, timeoutMillis);
+
+            if (netPacket != null) {
+                byte []! in ExHeap userData =
+                    Bitter.FromByteArray((!)netPacket.GetRawData(),
+                                         netPacket.Position,
+                                         netPacket.Available);
+                Core.Instance().TheDemux.TakeFreePacket(netPacket);
+                return userData;
+            }
+            return null;
+        }
+
+        public byte[] in ExHeap ReadData()
+        {
+            return PollData(Timeout.Infinite);
+        }
+
+        // read data, if no data is ready - blocks
+        virtual public byte[] ReadCopyData()
+        {
+            return PollCopyData(Timeout.Infinite);
+        }
+
+        // write a data to a session,
+        // if the queue has no room - blocks
+        // return the number of written data
+        // TBC: enforce data size limits
+        // should be implemented by specific sessions
+        // to create protocol specific packets
+        virtual public int WriteData(byte[]! data)
+        {
+            if (!IsSessionValidForUserWrite())
+            {
+                return -1;
+            }
+
+            byte[] pktData = new byte[data.Length];
+            Array.Copy(data, pktData, data.Length);
+            NetPacket pkt = new NetPacket(pktData);
+
+            if (false == EnqueuePacket(outQueue, pkt, true))
+                return -1;
+
+            return data.Length;
+        }
+
+        // Perform a graceful shutdown (nonblocking)
+        virtual public bool Close()
+        {
+            return false;
+        }
+
+        // Perform an immediate, hard shutdown
+        virtual public bool Abort()
+        {
+            // By default, assume there is no distinction
+            // between shutdown types
+            return Close();
+        }
+
+        public class LocalPortComparer : IComparer
+        {
+            public int Compare (Object left, Object right)
+            {
+                Session lhs = left as Session;
+                Session rhs = right as Session;
+                if (lhs == null)
+                {
+                    return (rhs == null) ? 0 : -1;
+                }
+                if (rhs == null)
+                {
+                    return +1;
+                }
+                if (lhs.LocalPort < rhs.LocalPort)
+                {
+                    return -1;
+                }
+                if (lhs.LocalPort > rhs.LocalPort)
+                {
+                    return +1;
+                }
+                return 0;
+            }
+        }
+    }
+
+    // single sessions table.
+    // hashed by the protocol interface
+    public class SessionsTable : Hashtable
+    {
+    }
+}
diff --git a/base/Services/NetStack/Runtime/StaticConfiguration.cs b/base/Services/NetStack/Runtime/StaticConfiguration.cs
new file mode 100644
index 0000000..106f597
--- /dev/null
+++ b/base/Services/NetStack/Runtime/StaticConfiguration.cs
@@ -0,0 +1,78 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Netstack / Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   StaticConfiguration.cs
+//
+
+using System.Collections;
+
+#if SINGULARITY
+using Drivers.Net;
+using Microsoft.Singularity.Io;
+#endif
+
+namespace NetStack.Runtime
+{
+    /// <summary> A class that Initializes, Starts, and Stops the default
+    /// set of IP modules.
+    /// </summary>
+    public class StaticConfiguration
+    {
+        static ArrayList modules;
+        static bool running = false;
+        static bool initialized = false;
+
+        public static void Initialize()
+        {
+            Core.Log("StaticConfiguration.Initialize() {0}", initialized);
+            modules = new ArrayList();
+            modules.Add(Core.Instance());
+            modules.Add(new IPModule());
+            modules.Add(new ArpModule());
+            modules.Add(new IcmpModule());
+            modules.Add(new TcpModule());
+            modules.Add(new UdpModule());
+
+            foreach (INetModule! module in modules)
+            {
+                bool success = module.Initialize(null);
+                Core.Log("Initializing {0}...{1}",
+                         module.ModuleName, success ? "okay" : "fail");
+            }
+            initialized = true;
+        }
+
+        public static void Start()
+        {
+            if (running)
+            {
+                return;
+            }
+            running = true;
+
+            Core.Instance().Activate();
+            Core.Instance().StartModule();
+        }
+
+        public static void Stop()
+        {
+            if (!running)
+            {
+                return;
+            }
+            running = false;
+
+            modules.Reverse();
+            foreach (INetModule! module in modules)
+            {
+                Core.Log("Stopping {0}...", module.ModuleName);
+                bool success = module.StopModule();
+                Core.Log("{0}\n", success ? "okay" : "fail");
+            }
+            Core.Log("Stopped all.\n");
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TCPFsm.cs b/base/Services/NetStack/Runtime/TCPFsm.cs
new file mode 100644
index 0000000..1f99101
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TCPFsm.cs
@@ -0,0 +1,1497 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+// #define DEBUG_TCP
+
+using NetStack.Common;
+using Microsoft.Contracts;
+using System;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+using NetStack.Contracts;
+using TcpError = NetStack.Contracts.TcpError;
+
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    using Protocols;
+
+    internal class TcpState
+    {
+        // ctor
+        internal TcpState()
+        {
+        }
+
+        // make a state transition
+        protected void ChangeState(TcpSession! owner, TcpState newState)
+        {
+            owner.ChangeState((!)newState);
+        }
+
+        // enter the new state
+        virtual internal void OnStateEnter(TcpSession! owner)
+        {
+        }
+
+        // a new packet(=event) received, should handle it
+        // according to the current state.
+        virtual internal NetStatus OnPacketReceive(TcpSession! owner,
+                                                   NetPacket! pkt,
+                                                   object     ctx)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        // leave the state to the new one
+        virtual internal void OnStateLeave(TcpSession! owner, TcpState newState)
+        {
+        }
+
+        // handle timeout events
+        // args is a session argument which is session specific
+        virtual internal NetStatus OnTimeout(Dispatcher.CallbackArgs args)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        // get the state name (debug)
+        virtual internal string GetStateName()
+        {
+            return "UNDEFINED";
+        }
+
+        [ Conditional("DEBUG_TCP") ]
+        internal static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log("TCP: ");
+            Core.Log(format, args);
+        }
+    }
+
+    /**
+     * This the TCP Finite State Machine Implementation
+     * NOTICE: This is just a quick implementation...
+     * should handle FIN,RST, window management, slow start, double acks...
+     */
+    internal class TCPFSM
+    {
+
+        // Definition of the TCP states
+        internal static TcpState! CLOSED { get {return TCPStateClosed.Instance();}}
+
+        internal static TcpState! LISTEN { get {return TCPStateListen.Instance();}}
+        internal static TcpState! SYN_RECVD { get {return TCPStateSynRcv.Instance();}}
+        internal static TcpState! SYN_SENT  { get {return TCPStateSynSent.Instance();}}
+        internal static TcpState! ESTABLISHED  { get {return TCPStateEstab.Instance();}}
+        internal static TcpState! CLOSE_WAIT  { get {return TCPCloseWait.Instance();}}
+        internal static TcpState! LAST_ACK  { get {return TCPLastAck.Instance();}}
+
+        internal static TcpState! FIN_WAIT1 { get {return TCPFINWait1.Instance();}}
+        internal static TcpState! FIN_WAIT2 { get {return TCPFINWait2.Instance();}}
+        internal static TcpState! CLOSING { get {return TCPClosing.Instance();}}
+
+        //----------------------------------------------------------------------------
+
+        // Compare two TCP sequence numbers: -1 means A < B, 0 means A == B and
+        // 1 means A > B
+        [Pure]
+        internal static int TCPSeqCmp(uint seqA, uint seqB)
+        {
+            // Exploit integer underflow to compare correctly even in the case
+            // of sequence number wraparound. This assumes the two numbers
+            // are always in the same half of the numberspace.
+            uint diff = unchecked(seqA - seqB);
+            int signedDiff = unchecked((int)diff);
+
+            if (signedDiff < 0) {
+                return -1; // A < B
+            } else if (signedDiff > 0) {
+                return 1; // A > B
+            } else {
+                return 0; // A == B
+            }
+        }
+
+        [Pure]
+        internal static bool TCPSeqLEQ(uint seqA, uint seqB)
+        {
+            int cmp = TCPSeqCmp(seqA, seqB);
+            return (cmp == 0) || (cmp == -1);
+        }
+
+        [Pure]
+        internal static bool TCPSeqLess(uint seqA, uint seqB)
+        {
+            int cmp = TCPSeqCmp(seqA, seqB);
+            return (cmp == -1);
+        }
+
+        [Pure]
+        internal static bool TCPSeqGEQ(uint seqA, uint seqB)
+        {
+            int cmp = TCPSeqCmp(seqA, seqB);
+            return (cmp == 0) || (cmp == 1);
+        }
+
+        [Pure]
+        internal static bool TCPSeqGreater(uint seqA, uint seqB)
+        {
+            int cmp = TCPSeqCmp(seqA, seqB);
+            return (cmp == 1);
+        }
+
+        //----------------------------------------------------------------------------
+        internal sealed class TCPStateClosed : TcpState
+        {
+            static TCPStateClosed! instance = new TCPStateClosed();
+            static TCPStateClosed() {}
+
+            internal static TCPStateClosed! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "CLOSED";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+                DebugPrint("TCP::{0}, OnStateEnter\n",GetStateName());
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+                assert newState != null;
+                DebugPrint("State Transit: {0}->{1}\n", GetStateName(),
+                           newState.GetStateName());
+                if (newState==LISTEN)
+                {
+                    // passive open
+                    DebugPrint("---> waiting for connections...\n");
+                }
+                else if (newState==SYN_SENT)
+                {
+                    // active open
+                    DebugPrint("---> sending SYN...\n");
+                    if (!TCPFSM.SendSYN(owner,TcpFormat.TCP_MSS))
+                    {
+                        // This should never happen; our outbound
+                        // packet queue should never be empty
+                        // while we're setting up a session
+                        Debug.Assert(false);
+                    }
+                }
+                else
+                {
+                    Core.Panic("TCP state machine error!!!");
+                }
+
+            }
+
+            override internal NetStatus OnTimeout(Dispatcher.CallbackArgs args)
+            {
+
+                return NetStatus.Code.PROTOCOL_OK;
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                ///assert ctx != null;
+                //TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                //TcpSession s = (TcpSession)owner; // not used
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        }
+
+
+        //----------------------------------------------------------------------------
+        // a passive connection listen state
+        internal sealed class TCPStateListen : TcpState
+        {
+            static TCPStateListen! instance = new TCPStateListen();
+            static TCPStateListen() {}
+
+            internal static TCPStateListen! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "LISTEN";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+                DebugPrint("TCP::{0}, OnStateEnter\n",GetStateName());
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+
+                if (TcpFormat.IsReset(ref tcpHeader))
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;  // we ignore it
+
+                if (TcpFormat.IsAck(ref tcpHeader))
+                {
+                    SendReset(s, false);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // we received a syn!
+                    // 1. create a new TCP session and initialize it
+                    // (only if we have room...TBC: should use listen param for bound)
+                    // 2. send syn-ack in the context of the new session
+
+                    TcpSession client =
+                        (TcpSession!)s.Protocol.CreateSession();
+                    client.passiveSession     = s;  // this is our "owner"
+                    client.SetLocalEndPoint(s.LocalAddress, s.LocalPort);
+                    client.sessionTCB.RCV.NXT = tcpHeader.seq+1;
+                    client.sessionTCB.RCV.IRS = tcpHeader.seq;
+                    client.sessionTCB.SND.ISS = (uint)DateTime.UtcNow.Ticks;
+                    client.sessionTCB.SND.NXT = client.sessionTCB.SND.ISS+1;
+                    client.sessionTCB.SND.NextSeq = client.sessionTCB.SND.NXT;
+                    client.sessionTCB.SND.UNA = client.sessionTCB.SND.ISS;
+                    client.sessionTCB.SND.WND = tcpHeader.window;
+                    client.sessionTCB.RCV.WND = TcpFormat.TCP_MSS;
+
+                    // we have access to the IP header from the packet overlapped
+                    // context (TCPModule put it there)
+                    IPFormat.IPHeader ipHeader = pkt.OverlapContext as IPFormat.IPHeader;
+                    assert ipHeader != null;
+
+                    client.SetRemoteEndPoint(ipHeader.Source,
+                                             tcpHeader.sourcePort);
+
+                    // Save ourselves work if we should reject the session right away
+                    if (s.AcceptQueueIsFull())
+                    {
+                        TcpSegment reset = CreateResetSegment(client, true);
+                        s.Protocol.OnProtocolSend(reset);
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                    }
+
+                    // send syn-ack
+                    if (!SendSYNAck(client))
+                    {
+                        // This should never happen; our outbound packet
+                        // queues should never be full while we're setting
+                        // up a session.
+                        Debug.Assert(false);
+                    }
+
+                    // the new session starts at syn-rcv
+                    client.stateContext=null;
+                    client.oldState=null;
+                    client.ChangeState(SYN_RECVD);
+
+                    // Start the timer ticking on establishing the new session
+                    client.StartConnectTimer();
+
+                    // we are left at the SAME state!!!
+                    return NetStatus.Code.PROTOCOL_OK;
+                }
+                else
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        }
+        //----------------------------------------------------------------------------
+        internal sealed class TCPStateSynRcv : TcpState
+        {
+            static TCPStateSynRcv! instance = new TCPStateSynRcv();
+            static TCPStateSynRcv() {}
+
+            internal static TCPStateSynRcv! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "SYNRECVD";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+                DebugPrint("TCP::{0}, OnStateEnter\n", GetStateName());
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                // all TCP states get the tcpHeader context
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;
+
+                bool accept=IsSegmentAcceptable(s,ref tcpHeader,segmentSize);
+
+                if (!accept)
+                {
+                    if (!TcpFormat.IsReset(ref tcpHeader))
+                    {
+                        // send an ACK; don't care about whether this
+                        // works or not since we're discarding the packet
+                        // anyhow.
+                        TCPFSM.SendAck(owner);
+                    }
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // we accept the segment
+                Debug.Assert(tcpHeader.seq==s.sessionTCB.RCV.NXT);
+
+                // if we get a reset
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    if (s.oldState==LISTEN)
+                    {
+                        // if we came from the listen state (passive open)
+                        // the reset will return us to the Listen state
+                        s.FlushRetransmissions();
+                        ChangeState(s,LISTEN);
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                    }
+                    else
+                    {
+                        // we came from SYN_SENT (active open)
+                        // the connection was refused, close it!
+                        HandleTerminateSession(s,null, TcpError.Refused);
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                    }
+                }
+
+
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // reset
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (TcpFormat.IsAck(ref tcpHeader))
+                {
+                    if (TCPSeqLEQ(s.sessionTCB.SND.UNA, tcpHeader.ackSeq) &&
+                        TCPSeqGEQ(s.sessionTCB.SND.NXT, tcpHeader.ackSeq))
+                    {
+                        // enter established state
+
+                        // we get an Ack for our syn-ack
+                        // remove the SYN-ACK from the retransmit Q
+                        TCPFSM.HandleTCPAck(s,ref tcpHeader);
+                        AttemptToEnterESTABLISHED(s, ref tcpHeader);
+                        return NetStatus.Code.PROTOCOL_OK;
+                    }
+                    else
+                    {
+                        // reset
+                        HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.Reset);
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                    }
+                }
+
+                if (TcpFormat.IsFIN(ref tcpHeader))
+                {
+                    DebugPrint("TCP::TCPStateSynRcv: Received FIN!!!\n");
+
+                    // RCV.NXT should reflect the data that we processed out of
+                    // this packet, but not the FIN. Advance over the FIN.
+                    s.sessionTCB.RCV.NXT += 1;
+
+                    // ack the FIN. Don't worry if this doesn't actually work;
+                    // the remote side will think the ACK got lost and retransmit,
+                    // which we will hopefully be able to successfully ACK later.
+                    SendAck(s);
+                    ChangeState(s,CLOSE_WAIT);
+                }
+
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        }
+        //----------------------------------------------------------------------------
+        internal sealed class TCPStateSynSent : TcpState
+        {
+            static TCPStateSynSent! instance = new TCPStateSynSent();
+            static TCPStateSynSent() {}
+
+            internal static TCPStateSynSent! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "SYNSENT";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+                DebugPrint("TCP::{0}, OnStateEnter\n",GetStateName());
+            }
+
+            // we sent a syn we wait for syn-ack
+            override internal NetStatus OnPacketReceive(TcpSession! owner,NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                // all TCP states get the tcpHeader context
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                bool ackAcceptable=false;
+
+                if (TcpFormat.IsAck(ref tcpHeader))
+                {
+                    if (TCPSeqLEQ(tcpHeader.ackSeq, s.sessionTCB.SND.ISS) ||
+                        TCPSeqGreater(tcpHeader.ackSeq, s.sessionTCB.SND.NXT))
+                    {
+                        if (TcpFormat.IsReset(ref tcpHeader))
+                            return NetStatus.Code.PROTOCOL_DROP_ERROR;
+
+                        SendReset(s, false);
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                    }
+
+                    if (TCPSeqLEQ(s.sessionTCB.SND.UNA, tcpHeader.ackSeq) &&
+                        TCPSeqLEQ(tcpHeader.ackSeq, s.sessionTCB.SND.NXT))
+                    {
+                        ackAcceptable=true;
+                    }
+                }
+
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    if (ackAcceptable)
+                    {
+                        // connection was reset, drop the segment
+                        // and close the connection.
+                        HandleTerminateSession(s,null, TcpError.Reset);
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                    }
+                    else
+                        return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+
+                // check syn
+                // ack is is ok or there is no ack and no RST
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    if (ackAcceptable)
+                    {
+                        DebugPrint("TCP::SYNSENT, Received SYN-ACK\n");
+
+                        // grab the ack parameters and
+                        // complete the session's data
+                        s.sessionTCB.RCV.NXT = tcpHeader.seq+1;
+                        s.sessionTCB.RCV.IRS = tcpHeader.seq;
+                        s.sessionTCB.SND.UNA = tcpHeader.ackSeq;
+                        s.sessionTCB.SND.WND = tcpHeader.window;
+                        s.sessionTCB.RCV.WND = TcpFormat.TCP_MSS;
+
+                        // great! now remove the SYN from
+                        // the retransmit Q (so we don't
+                        // retransmit it again)
+                        TCPFSM.HandleTCPAck(s,ref tcpHeader);
+
+                        if (s.sessionTCB.SND.UNA>s.sessionTCB.SND.ISS)
+                        {
+                            // our syn has been acked.
+                            TCPFSM.SendAck(owner);
+
+                            // change the state to established!
+                            AttemptToEnterESTABLISHED(owner, ref tcpHeader);
+                            return NetStatus.Code.PROTOCOL_OK;
+                        }
+                    }
+                    else
+                    {
+                        // received a new SYN (overlap connection)
+                        // (see SYN_RECVD for more details)
+
+                        // Create a new object to track the new session
+                        TcpSession client = (TcpSession!)s.Protocol.CreateSession();
+                        client.passiveSession     = s; // this is our "owner"
+                        client.SetLocalEndPoint(s.LocalAddress,
+                                                s.LocalPort);
+                        client.sessionTCB.RCV.NXT = tcpHeader.seq+1;
+                        client.sessionTCB.RCV.IRS = tcpHeader.seq;
+                        client.sessionTCB.SND.ISS = (uint)DateTime.UtcNow.Ticks;
+                        client.sessionTCB.SND.NXT = client.sessionTCB.SND.ISS+1;
+                        client.sessionTCB.SND.NextSeq = client.sessionTCB.SND.NXT;
+                        client.sessionTCB.SND.UNA = client.sessionTCB.SND.ISS;
+                        client.sessionTCB.SND.WND = tcpHeader.window;
+                        client.sessionTCB.RCV.WND = TcpFormat.TCP_MSS;
+
+                        // we have access to the IP header from the packet overlapped
+                        // context (TCPModule put it there)
+                        IPFormat.IPHeader ipHeader = pkt.OverlapContext as IPFormat.IPHeader;
+                        assert ipHeader!=null;
+                        client.SetRemoteEndPoint(ipHeader.Source,
+                                                 tcpHeader.sourcePort);
+
+                        // Save ourselves work if we should reject the session right away
+                        if (s.AcceptQueueIsFull())
+                        {
+                            TcpSegment reset = CreateResetSegment(client, true);
+                            s.Protocol.OnProtocolSend(reset);
+                            return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                        }
+
+                        // send syn-ack
+                        if (!SendSYNAck(client))
+                        {
+                            // This should never happen; our outbound packet
+                            // queues should never be empty when we're setting
+                            // up a session
+                            Debug.Assert(false);
+                        }
+
+                        // the new session starts at syn-rcv
+                        client.stateContext=null;
+                        client.oldState=null;
+                        client.ChangeState(SYN_RECVD);
+
+                        // start the establishment countdown
+                        client.StartConnectTimer();
+
+                        return NetStatus.Code.PROTOCOL_OK;
+                    }
+                }
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        } /* TCPStateSynSent */
+
+        //----------------------------------------------------------------------------
+        // This is the working mode state
+        internal sealed class TCPStateEstab : TcpState
+        {
+            static TCPStateEstab! instance = new TCPStateEstab();
+            static TCPStateEstab() {}
+
+            internal static TCPStateEstab! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "ESTABLISHED";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+#if DEBUG_TCP
+                Core.Log("TCP::{0}, OnStateEnter\n",GetStateName());
+#endif
+                // Wake up anyone waiting for the connection to complete
+                ((TcpSession)owner).setupCompleteEvent.Set();
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+#if DEBUG_TCP
+                assert newState != null;
+                Core.Log("State Transit: {0}->{1}\n", GetStateName(),
+                         newState.GetStateName());
+#endif
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;  // TCPModule already shrinked it for us
+                NetStatus res=NetStatus.Code.PROTOCOL_DROP_ERROR;
+
+                bool accept=IsSegmentAcceptable(s,ref tcpHeader,segmentSize);
+
+                if (!accept)
+                {
+                    if (!TcpFormat.IsReset(ref tcpHeader))
+                    {
+                        // send an ACK and return
+                        TCPFSM.SendAck(owner);
+                    }
+                    return res;
+                }
+
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    // for simplicity, just close the connection.
+                    HandleTerminateSession(s,null, TcpError.Reset);
+                    return res;
+                }
+
+                // check syn
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // send a reset
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.Reset);
+                    return res;
+                }
+
+                res = HandleTCPData(ref tcpHeader, pkt, s);
+
+                // our peer wants to end the relationship...
+                if (TcpFormat.IsFIN(ref tcpHeader))
+                {
+#if DEBUG_TCP
+                    Core.Log("TCP::ESTABLISHED: Received FIN!!!\n");
+#endif
+                    // RCV.NXT should reflect any data in this packet, but not the FIN.
+                    // Advance over the FIN.
+                    s.sessionTCB.RCV.NXT += 1;
+
+                    // ack the FIN
+                    SendAck(s);
+                    ChangeState(s,CLOSE_WAIT);
+                }
+
+                return res;
+            }
+        }
+        //----------------------------------------------------------------------------
+        // CLOSE_WAIT is entered when we receive (and ACK) a FIN from the
+        // remote side. There is no further data to receive, but we can
+        // continue sending if we like.
+        internal sealed class TCPCloseWait : TcpState
+        {
+            static TCPCloseWait! instance = new TCPCloseWait();
+            static TCPCloseWait() {}
+
+            internal static TCPCloseWait! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "CLOSE_WAIT";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+#if DEBUG_TCP
+                Core.Log("TCP::{0}, OnStateEnter\n",GetStateName());
+#endif
+                // Signal that there is nothing more to read on this
+                // connection
+                owner.ValidForRead = false;
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+#if DEBUG_TCP
+                assert newState != null;
+                Core.Log("State Transit: {0}->{1}\n", GetStateName(),
+                         newState.GetStateName());
+#endif
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;
+
+                if (!IsSegmentAcceptable(s,ref tcpHeader,segmentSize))
+                {
+                    if (!TcpFormat.IsReset(ref tcpHeader))
+                    {
+                        // send an ACK and return
+                        TCPFSM.SendAck(owner);
+                    }
+
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (TcpFormat.IsReset(ref tcpHeader) ||
+                    TcpFormat.IsSync(ref tcpHeader) ||
+                    (!TcpFormat.IsAck(ref tcpHeader)))
+                {
+                    // Abort
+                    HandleTerminateSession(s,null, TcpError.Reset);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                TCPFSM.HandleTCPAck(s,ref tcpHeader);
+                return NetStatus.Code.PROTOCOL_OK;
+            }
+        }
+        //----------------------------------------------------------------------------
+        // LAST_ACK is entered when we close our side of the duplex
+        // connection and the remote site had sent us its FIN
+        // previously. We send out our own FIN and just hang around
+        // to make sure it was received properly before shutting down.
+        //
+        // CALLER SHOULD ARRANGE TO TRANSMIT THE FIN PACKET BEFORE
+        // ENTERING THIS STATE!
+        internal sealed class TCPLastAck : TcpState
+        {
+            static TCPLastAck! instance = new TCPLastAck();
+            static TCPLastAck() {}
+
+            internal static TCPLastAck! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "LAST_ACK";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+#if DEBUG_TCP
+                Core.Log("TCP::{0}, OnStateEnter\n",GetStateName());
+#endif
+
+                // Flag that writing is now disallowed on this session
+                ((TcpSession)owner).ValidForWrite = false;
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+#if DEBUG_TCP
+                assert newState != null;
+                Core.Log("State Transit: {0}->{1}\n",GetStateName(),
+                         newState.GetStateName());
+#endif
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner,NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;  // TCPModule already shrinked it for us
+
+                // RST is illegal at this point
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    // for simplicity, just close the connection.
+                    HandleTerminateSession(s,null, TcpError.Reset);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // SYNC causes us to issue a RST and abort
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // send a reset
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.Reset);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (!IsSegmentAcceptable(s,ref tcpHeader,segmentSize))
+                {
+                    // Just drop it
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // Do ACK housekeeping
+                if (TCPSeqLess(s.sessionTCB.SND.UNA, tcpHeader.ackSeq) &&
+                    TCPSeqLEQ(tcpHeader.ackSeq, s.sessionTCB.SND.NXT))
+                {
+                    // This appears to be ACKing something we sent.
+                    s.sessionTCB.SND.UNA = tcpHeader.ackSeq;
+
+                    // remove the packet(s) from the retransmit queue
+                    TCPFSM.HandleTCPAck(s,ref tcpHeader);
+                }
+
+                // Note the weirdness here; because we prepacketize
+                // data, we don't want to compare to SND.NXT
+                if (TCPSeqGEQ(s.sessionTCB.SND.UNA, s.sessionTCB.SND.NextSeq))
+                {
+                    // The remote site has acknowledged everything
+                    // we sent. We're done.
+                    HandleTerminateSession(s, null, TcpError.Reset);
+                }
+
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        }
+        //----------------------------------------------------------------------------
+        // FIN_WAIT1 is entered when we close our side of the duplex
+        // connection. We don't send any more data, but we continue to
+        // receive data from the remote side.
+        //
+        // CALLER SHOULD ARRANGE TO SEND THE FIN PACKET BEFORE ENTERING
+        // THIS STATE!
+        internal sealed class TCPFINWait1 : TcpState
+        {
+            static TCPFINWait1! instance = new TCPFINWait1();
+            static TCPFINWait1() {}
+
+            internal static TCPFINWait1! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "FIN_WAIT1";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+#if DEBUG_TCP
+                Core.Log("TCP::{0}, OnStateEnter\n",GetStateName());
+#endif
+
+                // Flag that writing is now disallowed on this session
+                ((TcpSession)owner).ValidForWrite = false;
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+#if DEBUG_TCP
+                assert newState != null;
+                Core.Log("State Transit: {0}->{1}\n",GetStateName(),
+                         newState.GetStateName());
+#endif
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;  // TCPModule already shrinked it for us
+
+                // RST is illegal at this point
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    // for simplicity, just close the connection.
+                    HandleTerminateSession(s,null, TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // SYNC causes us to issue a RST and abort
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // send a reset
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (!IsSegmentAcceptable(s,ref tcpHeader,segmentSize))
+                {
+                    if (!TcpFormat.IsReset(ref tcpHeader))
+                    {
+                        // send an ACK and return
+                        TCPFSM.SendAck(owner);
+                    }
+
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // Chew on the payload...
+                NetStatus retval = HandleTCPData(ref tcpHeader, pkt, s);
+
+                if (TCPSeqLEQ(tcpHeader.seq, s.sessionTCB.RCV.NXT) &&
+                    (TcpFormat.IsFIN(ref tcpHeader)))
+                {
+                    // This is the remote side's FIN, and we have
+                    // received all data preceding it, too!
+                    // advance RCV.NXT over the FIN sequence
+                    s.sessionTCB.RCV.NXT += 1;
+
+                    // note the weirdness here; because we
+                    // prepacketize data, we don't want to test
+                    // against SND.NXT
+                    if (TCPSeqLess(s.sessionTCB.SND.UNA, s.sessionTCB.SND.NextSeq))
+                    {
+                        // ...but the remote side hasn't received
+                        // everything we have said, yet.
+
+                        // ack the FIN
+                        SendAck(s);
+                        ChangeState(s, CLOSING);
+                    }
+                    else
+                    {
+                        // The remote side has heard everything we
+                        // have to say. We're done.
+                        // ACK the FIN and shut down
+                        TcpSegment ackSeg = CreateAckSegment(s);
+                        HandleTerminateSession(s, ackSeg, TcpError.Closed);
+                    }
+                }
+                else
+                {
+                    // Note the weirdness here; because we
+                    // prepacketize data, we do not want to test
+                    // against SND.NXT, but rather SND.NextSeq.
+                    if (TCPSeqGEQ(s.sessionTCB.SND.UNA, s.sessionTCB.SND.NextSeq))
+                    {
+                        // The remote side has ACKed everything we have
+                        // said, but they haven't FINed themselves.
+                        ChangeState(s, FIN_WAIT2);
+                    }
+                }
+
+                return retval;
+            }
+        }
+        //----------------------------------------------------------------------------
+        // FIN_WAIT2 is entered when the other side has received our FIN, but has
+        // more data to send. We wait for them to signal FIN as well.
+        internal sealed class TCPFINWait2 : TcpState
+        {
+            static TCPFINWait2! instance = new TCPFINWait2();
+            static TCPFINWait2() {}
+
+            internal static TCPFINWait2! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "FIN_WAIT2";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+#if DEBUG_TCP
+                Core.Log("TCP::{0}, OnStateEnter\n",GetStateName());
+#endif
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+#if DEBUG_TCP
+                assert newState != null;
+                Core.Log("State Transit: {0}->{1}\n",GetStateName(),
+                         newState.GetStateName());
+#endif
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt,object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;  // TCPModule already shrinked it for us
+
+                // RST is illegal at this point
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    // for simplicity, just close the connection.
+                    HandleTerminateSession(s,null, TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // SYNC causes us to issue a RST and abort
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // send a reset
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (!IsSegmentAcceptable(s,ref tcpHeader,segmentSize))
+                {
+                    if (!TcpFormat.IsReset(ref tcpHeader))
+                    {
+                        // send an ACK and return
+                        TCPFSM.SendAck(owner);
+                    }
+
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // Chew on the payload...
+                NetStatus retval = HandleTCPData(ref tcpHeader, pkt, s);
+
+                // Only check for FIN if we have previously received
+                // all data.
+                if (TCPSeqLEQ(tcpHeader.seq, s.sessionTCB.RCV.NXT) &&
+                    (TcpFormat.IsFIN(ref tcpHeader)))
+                {
+#if DEBUG_TCP
+                    Core.Log("FIN_WAIT2: Received FIN!!!\n");
+#endif
+                    // RCV.NXT should reflect the data in this packet, but not the
+                    // FIN. Advance over the FIN...
+                    s.sessionTCB.RCV.NXT += 1;
+
+                    // ack the FIN and shut down
+                    TcpSegment ackSeg = CreateAckSegment(s);
+                    HandleTerminateSession(s, ackSeg, TcpError.Closed);
+                }
+
+                return retval;
+            }
+        }
+        //----------------------------------------------------------------------------
+        // CLOSING is entered when both sides have sent a FIN, but we're not sure
+        // the other side has received all our data yet. We hang around processing
+        // ACKs until we're sure the other side has heard everything we have to say.
+        internal sealed class TCPClosing : TcpState
+        {
+            static TCPClosing! instance = new TCPClosing();
+            static TCPClosing() {}
+
+            internal static TCPClosing! Instance()
+            {
+                return instance;
+            }
+
+            // get the state name (debug)
+            override internal string GetStateName()
+            {
+                return "CLOSING";
+            }
+
+            override internal void OnStateEnter(TcpSession! owner)
+            {
+#if DEBUG_TCP
+                Core.Log("TCP::{0}, OnStateEnter\n",GetStateName());
+#endif
+                // Signal that there's nothing more to read on this session
+                owner.ValidForRead = false;
+            }
+
+            // leave the state
+            override internal void OnStateLeave(TcpSession! owner, TcpState newState)
+            {
+#if DEBUG_TCP
+                assert newState != null;
+                Core.Log("State Transit: {0}->{1}\n",GetStateName(),
+                         newState.GetStateName());
+#endif
+            }
+
+            override internal NetStatus OnPacketReceive(TcpSession! owner, NetPacket! pkt, object ctx)
+            {
+                assert ctx != null;
+                TcpFormat.TcpHeader tcpHeader = (TcpFormat.TcpHeader)ctx;
+                TcpSession s = (TcpSession)owner;
+                uint segmentSize = (uint)pkt.Available;  // TCPModule already shrinked it for us
+
+                // RST is illegal at this point
+                if (TcpFormat.IsReset(ref tcpHeader))
+                {
+                    // for simplicity, just close the connection.
+                    HandleTerminateSession(s,null, TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // SYNC causes us to issue a RST and abort
+                if (TcpFormat.IsSync(ref tcpHeader))
+                {
+                    // send a reset
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.ProtocolViolation);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                if (!IsSegmentAcceptable(s,ref tcpHeader,segmentSize))
+                {
+                    // Just drop it
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+
+                // Do ACK housekeeping
+                if (TCPSeqLess(s.sessionTCB.SND.UNA, tcpHeader.ackSeq) &&
+                    TCPSeqLEQ(tcpHeader.ackSeq, s.sessionTCB.SND.NXT))
+                {
+                    // This appears to be ACKing something we sent.
+                    s.sessionTCB.SND.UNA = tcpHeader.ackSeq;
+
+                    // remove the packet(s) from the retransmit queue
+                    TCPFSM.HandleTCPAck(s,ref tcpHeader);
+                }
+
+                // Note the weirdness here; because we
+                // prepacketize data, we don't want to compare against
+                // SND.NXT
+                if (TCPSeqGEQ(s.sessionTCB.SND.UNA, s.sessionTCB.SND.NextSeq))
+                {
+                    // The remote side has now heard everything we said.
+                    HandleTerminateSession(s, null, TcpError.Closed);
+                }
+
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        }
+        //----------------------------------------------------------------------------
+        // Create an ACK for data we have received to date
+        internal static TcpSegment! CreateAckSegment(TcpSession! s)
+        {
+            byte[] ackBuffer = new byte[EthernetFormat.Size+IPFormat.Size+TcpFormat.Size];
+
+            TcpFormat.WriteTcpSegment(
+                ackBuffer,s.LocalPort,s.RemotePort,s.sessionTCB.RCV.NXT,
+                s.sessionTCB.SND.NextSeq,TcpFormat.TCP_MSS,s.LocalAddress,
+                s.RemoteAddress,0,true,false,false,false,false);
+
+            return new TcpSegment(ackBuffer,s,s.sessionTCB.SND.NextSeq,true);
+        }
+
+        // sends an ack
+        internal static bool SendAck(TcpSession! owner)
+        {
+            TcpSession s = (TcpSession)owner;
+            TcpSegment ackSeg = CreateAckSegment(s);
+
+            // put it on this session outgoing queue
+            return s.PutPacket(s.outQueue,ackSeg,false);
+        }
+
+        // Sends a FIN
+        internal static bool SendFin(TcpSession! s, bool canBlock)
+        {
+            byte[] finBuffer = new byte[EthernetFormat.Size+IPFormat.Size+TcpFormat.Size];
+
+            TcpFormat.WriteTcpSegment(
+                finBuffer,s.LocalPort,s.RemotePort,s.sessionTCB.RCV.NXT,
+                s.sessionTCB.SND.NextSeq,TcpFormat.TCP_MSS,s.LocalAddress,s.RemoteAddress,0,
+                true,false,false,true,false);
+
+            // ok, we have a ready segment.
+            TcpSegment syn = new TcpSegment(finBuffer,s,s.sessionTCB.SND.NextSeq,true);
+
+            bool retVal = s.PutPacket(s.outQueue,syn, canBlock);
+
+            // Only advance the segment counter if we successfully queued the
+            // outbound packet
+            if (retVal)
+            {
+                s.sessionTCB.SND.NextSeq++;
+            }
+
+            return retVal;
+        }
+
+        // sends a syn ack packet
+        internal static bool SendSYNAck(TcpSession! owner)
+        {
+            TcpSession s =  (TcpSession)owner;
+            byte[] synackBuffer = new byte[EthernetFormat.Size+IPFormat.Size+TcpFormat.Size];
+
+            TcpFormat.WriteTcpSegment(synackBuffer,s.LocalPort,s.RemotePort,s.sessionTCB.RCV.NXT,
+                                      s.sessionTCB.SND.ISS,(ushort)s.sessionTCB.SND.WND,s.LocalAddress,
+                                      s.RemoteAddress,0,true,true,false,false,false);
+
+            // ok, we have a ready segment.
+            // (SYN is regular segment)
+            TcpSegment syn = new TcpSegment(synackBuffer, s, s.sessionTCB.SND.ISS, true);
+
+            // put it on this session outgoing queue
+            return s.PutPacket(s.outQueue,syn,false);
+        }
+
+        // sends a syn packet, with MSS options
+        internal static bool SendSYN(TcpSession! owner,ushort MSS)
+        {
+            TcpSession s =  (TcpSession)owner;
+            byte[] synBuffer = new byte[EthernetFormat.Size+IPFormat.Size+TcpFormat.Size+4];
+
+            // setup the session
+            s.sessionTCB.SND.ISS=(uint)DateTime.UtcNow.Ticks;
+            s.sessionTCB.SND.UNA=s.sessionTCB.SND.ISS;
+            s.sessionTCB.SND.NXT=s.sessionTCB.SND.ISS+1; // next packet sequence
+            s.sessionTCB.SND.NextSeq = s.sessionTCB.SND.NXT;
+            s.sessionTCB.SND.WND=TcpFormat.TCP_MSS;
+
+            // we must first write the data...
+            byte[] options=new byte[] {2,4, ((byte)(MSS>>8)),(byte)MSS};
+            Array.Copy(options,0,synBuffer,EthernetFormat.Size+IPFormat.Size+TcpFormat.Size,4);
+
+            // now create the segment+checksum
+            TcpFormat.WriteTcpSegment(
+                synBuffer,s.LocalPort,s.RemotePort,0,
+                s.sessionTCB.SND.ISS,MSS,s.LocalAddress,s.RemoteAddress,4,
+                false,true,false,false,true);
+
+            // ok, we have a ready segment.
+            // (SYN is regular segment)
+            TcpSegment syn = new TcpSegment(synBuffer,s,s.sessionTCB.SND.ISS,false);
+
+            // put it on this session outgoing queue
+            return s.PutPacket(s.outQueue,syn,false);
+        }
+
+        // send a TCP reset
+        internal static bool SendReset(TcpSession! owner, bool isAck)
+        {
+            // we won't retransmit it (it is like an Ack)
+            TcpSegment syn = CreateResetSegment(owner, true);
+
+            // put it on this session outgoing queue
+            return owner.PutPacket(owner.outQueue,syn,false);
+        }
+
+        // send a TCP reset
+        internal static TcpSegment! CreateResetSegment(TcpSession! owner, bool isAck)
+        {
+            TcpSession s =  (TcpSession)owner;
+            byte[] rstBuffer = new byte[EthernetFormat.Size+IPFormat.Size+TcpFormat.Size];
+
+            // note use SND.NXT as the sequence number here instead of nextSeq,
+            // otherwise the sequence number may be far ahead (if there's lots of queued
+            // data) and the receiving host may ignore it as outside its window.
+            TcpFormat.WriteTcpSegment(
+                rstBuffer,s.LocalPort,s.RemotePort,s.sessionTCB.RCV.NXT,
+                s.sessionTCB.SND.NXT,TcpFormat.TCP_MSS,s.LocalAddress,
+                s.RemoteAddress,0,isAck,false,true,false,false);
+
+            // we won't retransmit it
+            TcpSegment syn = new TcpSegment(rstBuffer,s,s.sessionTCB.SND.NXT,true);
+            return syn;
+        }
+
+        // Handle received TCP data
+        // Returns the appropriate NetStatus.Code
+        internal static NetStatus HandleTCPData(ref TcpFormat.TcpHeader tcpHeader,
+                                                NetPacket! pkt, TcpSession! s)
+        {
+            uint segmentSize = (uint)pkt.Available;  // TCPModule already shrinked it for us
+
+            // TBC: We assume the segment start with
+            // the RCV.NXT !!! (otherwise we can buffer them)
+            if (TCPSeqGreater(tcpHeader.seq, s.sessionTCB.RCV.NXT))
+            {
+                // we missed one or few, send ack again
+                TCPFSM.SendAck(s);
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            if (!TcpFormat.IsAck(ref tcpHeader))
+            {
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            // First, deal with the window advertised in this packet.
+            s.sessionTCB.SND.WND = tcpHeader.window;
+            s.HandleWindowUpdate();
+
+            // ack is set and it is relevant (ack something we sent)
+            if (TCPSeqLess(s.sessionTCB.SND.UNA, tcpHeader.ackSeq) &&
+                TCPSeqLEQ(tcpHeader.ackSeq, s.sessionTCB.SND.NXT))
+            {
+                s.sessionTCB.SND.UNA = tcpHeader.ackSeq;
+
+                // remove the packet(s) from the retransmit queue
+                TCPFSM.HandleTCPAck(s,ref tcpHeader);
+            }
+            else if (s.sessionTCB.SND.UNA>tcpHeader.ackSeq)
+            {
+                // a duplicate ack
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+            else if (TCPSeqGreater(tcpHeader.ackSeq, s.sessionTCB.SND.NXT))
+            {
+                // ack for future data..
+                TCPFSM.SendAck(s);
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            // check URG bit
+            if (TcpFormat.IsUrg(ref tcpHeader))
+            {
+                // TBC
+            }
+
+            if (TcpFormat.IsPush(ref tcpHeader))
+            {
+#if DEBUG_TCP
+                Core.Log("TCP: Received PUSH data, Len={0} !!!!!!!\n",segmentSize);
+#endif
+            }
+
+            // at last, process the segment data!!!
+            // at the end send an ACK (TBC: change to accumulate acks)
+            if (segmentSize>0)
+            {
+                // put the data in the session's inQ
+                if (s.PutPacket(s.inQueue,pkt,false))
+                {
+                    s.sessionTCB.RCV.NXT+=segmentSize; // we expect the next segment seq
+                    s.sessionTCB.RCV.WND=TcpFormat.TCP_MSS; // TBC: change according to buffer
+#if DEBUG_TCP
+                    Core.Log("TCP:: PUSH data, Len={0} is on Queue\n",segmentSize);
+#endif
+                    // send our ack if we ack data
+                    SendAck(s);
+                    // don't release the packet
+                    return NetStatus.Code.PROTOCOL_PROCESSING;
+                }
+                else
+                {
+                    // packet was dropped...
+                    // send our ack if we ack data
+                    SendAck(s);
+                    return NetStatus.Code.PROTOCOL_DROP_ERROR;
+                }
+            }
+            else
+            {
+                // Payload was empty...
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+        }
+
+        // handle a TCP received ack
+        // the ack is already checked for validity (by the actual state)
+        internal static void HandleTCPAck(TcpSession! owner, ref TcpFormat.TcpHeader tcpHdr)
+        {
+            owner.ACKThrough(tcpHdr.ackSeq);
+        }
+
+        // check if we can accept the segment
+        internal static bool IsSegmentAcceptable(TcpSession! s, ref TcpFormat.TcpHeader tcpHeader,uint segmentSize)
+        {
+            bool accept=false;
+            // first check sequence number
+            if ((segmentSize==0)&&(s.sessionTCB.RCV.WND==0))
+            {
+                accept = (tcpHeader.seq==s.sessionTCB.RCV.NXT);
+            }
+            else if ((segmentSize==0)&&(s.sessionTCB.RCV.WND>0))
+            {
+                accept=(TCPSeqGEQ(tcpHeader.seq, s.sessionTCB.RCV.NXT) &&
+                        TCPSeqLess(tcpHeader.seq, s.sessionTCB.RCV.NXT+s.sessionTCB.RCV.WND));
+            }
+            else if ((segmentSize>0)&&(s.sessionTCB.RCV.WND>0))
+            {
+                accept=(TCPSeqGEQ(tcpHeader.seq, s.sessionTCB.RCV.NXT) &&
+                        TCPSeqLess(tcpHeader.seq, s.sessionTCB.RCV.NXT+s.sessionTCB.RCV.WND));
+
+                accept = accept || (TCPSeqLEQ(s.sessionTCB.RCV.NXT, tcpHeader.seq+segmentSize-1) &&
+                                    TCPSeqLess(tcpHeader.seq +segmentSize - 1,
+                                               s.sessionTCB.RCV.NXT + s.sessionTCB.RCV.WND));
+            }
+            return accept;
+        }
+
+        private static void AttemptToEnterESTABLISHED(TcpSession! s,
+                                                      ref TcpFormat.TcpHeader tcpHeader)
+        {
+            TcpSession passiveOwner = s.passiveSession;
+
+            if (passiveOwner != null)
+            {
+                bool success = passiveOwner.AddAcceptedSession(s);
+
+                if (!success)
+                {
+                    // Oops; while this connection was being established
+                    // we ran out of room in the accept queue. Abort
+                    // the connection!
+                    HandleTerminateSession(s,CreateResetSegment(s, false), TcpError.ResourcesExhausted);
+                    return;
+                }
+            }
+
+            s.ChangeState(ESTABLISHED);
+        }
+
+        // this method terminated the given session
+        // if nextSegment is not null than it is sent before final
+        // removal.
+        internal static void HandleTerminateSession(TcpSession! s, TcpSegment nextSegment, TcpError connectError)
+        {
+            s.StopPersistTimer();
+
+            // 1. first clear the retransmit queue
+            // 2. make the session not valid for users!
+            // 3. release any user waiting for read/write on the session
+            // 4. clear the out/in queues
+            // 5. remove the session from TCP if it is no longer needed
+            //    (when it considered to be closed)
+            s.FlushRetransmissions();
+
+            // some user may wait on the q to write/read data
+            // we will release them by trigger the monitors.
+            // they will fail since Valid is false and they are users.
+            // only TCP can still use this session.
+            lock (s.outQueue.SyncRoot)
+            {
+                // from now on, every user thread will
+                // fail to read/write data
+                s.ValidForRead = false;
+                s.ValidForWrite = false;
+
+                s.DrainQueue(s.outQueue);
+                if (nextSegment != null)
+                    s.outQueue.Add(nextSegment);
+
+                // Don't forget these!
+                Monitor.PulseAll(s.outQueue.SyncRoot);
+                Core.Instance().SignalOutboundPackets();
+            }
+
+            lock (s.inQueue.SyncRoot)
+            {
+                // Pulse anyone waiting to read data so they can notice
+                // they are unlikely to succeed, but don't clear the
+                // queue; if there is data on it, we may want to drain
+                // it, still.
+                Monitor.PulseAll(s.inQueue.SyncRoot);
+            }
+
+            if (nextSegment == null)
+            {
+                IProtocol tcpProtocol = s.Protocol;
+                Core.Instance().DeregisterSession(tcpProtocol, s);
+            }
+
+            // change the state to close
+            s.ChangeState(TCPFSM.CLOSED);
+
+            // Signal anyone who was waiting for this session to begin or end
+            s.connectError = connectError;
+            s.setupCompleteEvent.Set();
+
+            // NOTE  If we are transmitting a last-gasp packet,
+            // don't signal the session as closed just yet; wait for the packet
+            // to actually get transmitted.
+            if (nextSegment == null)
+            {
+                s.closedEvent.Set();
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TCPModule.cs b/base/Services/NetStack/Runtime/TCPModule.cs
new file mode 100644
index 0000000..ed92b9b
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TCPModule.cs
@@ -0,0 +1,218 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+#if !SINGULARITY
+using System.Net;
+using System.Text;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Protocols;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This module implements the TCP protocol
+     * Notice: It is a simplified implementation (the very basic)
+     */
+    public class TcpModule : IProtocol
+    {
+        // the ip handler
+        protected IProtocol ip;
+
+        // the TCP retransmit timeout
+        protected int retransTimeout;
+
+        // INetModule interfaces
+        // ------------------------
+        string INetModule.ModuleName    { get { return "TCP"; } }
+        ushort INetModule.ModuleVersion { get { return 0x01; } }  // 0.1
+
+        public bool StartModule()
+        {
+#if DEBUG_TCP
+            Core.Log("Starting TCP module...\n");
+#endif
+            ip = Core.Instance().GetProtocolByName("IP");
+            Debug.Assert(ip != null);
+            return true;
+        }
+
+        public bool StopModule()
+        {
+            return true;
+        }
+
+        public bool DestroyModule()
+        {
+            return true;
+        }
+
+        // IProtocol interfaces
+        // ------------------------
+        public bool Initialize(ProtocolParams parameters)
+        {
+            Debug.Assert(parameters == null || parameters["name"]=="TCP");
+            Core.Instance().RegisterProtocol(this);
+            TcpSessionPool.SetTcpModule(this);
+            return true;
+        }
+
+        [ Conditional("DEBUG_TCP") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log(format, args);
+        }
+
+        public ushort GetProtocolID()
+        {
+            return ((ushort)IPFormat.Protocol.TCP);
+        }
+
+        Session IProtocol.CreateSession()
+        {
+            TcpSession tcp = (TcpSession) TcpSessionPool.Get();
+            Core.Instance().RegisterSession(this,tcp);
+            return tcp;
+        }
+
+        public TcpSession! ReInitializeSession(TcpSession! tcp)
+        {
+            tcp.ReInitialize(this);
+            Core.Instance().RegisterSession(this, tcp);
+            return tcp;
+        }
+
+        // handle incoming TCP packets
+        public NetStatus OnProtocolReceive(NetPacket! packet)
+        {
+            DebugPrint("TcpModule.OnPacketReceive\n");
+
+            // IP should have passed us a context which
+            // is the IPHeader... lets see...
+            IPFormat.IPHeader! ipHeader = (IPFormat.IPHeader!) packet.OverlapContext;
+
+            // read the TCP header
+            TcpFormat.TcpHeader tcpHeader;
+            if (!TcpFormat.ReadTcpHeader(packet, out tcpHeader))
+            {
+                DebugPrint("Bad TCP Header");
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            // check validity
+            if (tcpHeader.checksum != 0 &&
+                TcpFormat.IsChecksumValid(ipHeader,tcpHeader, packet) == false)
+            {
+                DebugPrint("TCP checksum failed. No cigar and no packet!");
+                return NetStatus.Code.PROTOCOL_DROP_CHKSUM;
+            }
+
+            // where is our data?
+            // skip over options (that we currently ignore)
+            int tcpHeaderSize = 4 * TcpFormat.GetOffset(ref tcpHeader);
+            int startIndex = EthernetFormat.Size + IPFormat.Size + tcpHeaderSize;
+            int segmentSize = ipHeader.totalLength - IPFormat.Size - tcpHeaderSize;
+            packet.Clip(startIndex,segmentSize - 1);
+
+            // find the relevant session...
+            Session s = FindSession(ipHeader, ref tcpHeader);
+            if (s != null) {
+                DebugPrint("TCP Session found.\n");
+                // deliver the packet the the session
+                // we pass the tcpHeader as a context
+                // and the ipHeader as a packet.OverlapContext
+                // since we will not use it anymore (and TCP may need it)
+                packet.OverlapContext = ipHeader;
+                return s.OnReceive(this,packet,tcpHeader);
+            }
+
+            return NetStatus.Code.PROTOCOL_DROP_ERROR;
+        }
+
+        // find the relevant session for this connection
+        protected Session FindSession(IPFormat.IPHeader! ipHeader,
+                                      ref TcpFormat.TcpHeader tcpHeader)
+        {
+            // get the session table
+            ArrayList sessions = Core.Instance().GetSessions(this);
+            if (sessions == null)
+            {
+                return null;
+            }
+
+            TcpSession passiveSession = null;  // this is the passive session
+            // we first look for full match, saving the passive session
+            // if exist. if no full match, we return the passiveSession
+
+            lock (sessions.SyncRoot)
+            {
+                // this is a TcpSession
+                foreach(TcpSession! s in sessions)
+                {
+                    bool b1 = (s.LocalAddress  == ipHeader.Destination);
+                    bool b2 = (s.RemoteAddress == ipHeader.Source);
+                    bool b3 = (s.LocalPort  == tcpHeader.destPort);
+                    bool b4 = (s.RemotePort == tcpHeader.sourcePort);
+
+                    bool fullMatch = b1 & b2 & b3 & b4;
+                    // if we have full match, we return
+                    // otherwise, save the passive session
+                    if (fullMatch)
+                    {
+                        return s;
+                    }
+                    bool b5 = (s.RemoteAddress == IPv4.Broadcast &&
+                               s.RemotePort == 0);
+                    bool passiveMatch = b1 & b3 & b5;
+                    if (passiveMatch)
+                    {
+                        passiveSession = s;
+                    }
+                }
+            }
+            // if we can't find exact match...
+            return passiveSession;
+        }
+        // this method send a ready made TCP packet,
+        // it uses the IP layer.
+        public NetStatus OnProtocolSend(NetPacket! pkt)
+        {
+            // if the ARP hasn't resolved the address yet, the
+            // runtime will try this again (on the next handle
+            // of outgoing sessions' queues)
+            return ip.OnProtocolSend(pkt);
+        }
+
+        public NetStatus SetProtocolSpecific(ushort opcode, byte[]! data)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public NetStatus GetProtocolSpecific(ushort opcode,out byte[] data)
+        {
+            data=null;
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public TcpModule()
+        {
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TCPSession.cs b/base/Services/NetStack/Runtime/TCPSession.cs
new file mode 100644
index 0000000..9defb90
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TCPSession.cs
@@ -0,0 +1,1116 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+// #define DEBUG_TCP
+
+using NetStack.Common;
+using System;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+
+#if !SINGULARITY
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Protocols;
+using NetStack.Contracts;
+using Microsoft.Contracts;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Runtime;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace NetStack.Runtime
+{
+    /**
+     * This the TCP session object
+     */
+    public class TcpSession : Session
+    {
+        // the session's transmit q size (num of packets)
+        public const int TxQSize=100;
+
+        // the session's receive q size (num of packets)
+        public const int RcvQSize=100;
+
+        // the maximum number of retries to send before giving up
+        private const int MaxRetries = 5;
+
+        // the number of seconds to wait for an active connect to succeed
+        private const int ConnectTimeout = 15;
+
+        // the number of seconds to wait for a passive connect to succeed
+        private const int PassiveConnectTimeout = 5;
+
+        // the number of seconds between probes of a remote host that has
+        // closed its receive window
+        private const int PersistTimeout = 2;
+
+        // the number of seconds to wait for a graceful shutdown to complete
+        private const int PoliteShutdownTimeout = 10;
+
+        // TCP retransmission state
+        private RJBlack.Timer retransTimer;
+        private const uint InitialRetransInterval = 3000; // 3s in ms, Per RFC 2988
+
+        // 200ms, more aggressive than RFC "SHOULD" of 1s
+        private const uint MinimumRetransInterval = 200;
+
+        // Per-session retransmission state
+        private uint retransInterval = InitialRetransInterval, srtt = InitialRetransInterval, rttvar = 0; // All in ms
+
+        internal TcpState stateContext;  // our FSM state
+        internal TcpState oldState;      // our previous state
+        internal TcpError connectError; // the result of the Connect request
+
+        // accepted session list (TcpSessions)
+        private ArrayList acceptedSessions;
+        private int maxAcceptedSessions;
+
+        // a monitor for the accepted session list
+        private object acceptSessionMonitor;
+
+        // the passive session (owner) of this session
+        // (applied to passive sessions)
+        internal TcpSession passiveSession;
+
+        // the retransmit queue
+        private const int RetransmitQSize = 100;
+        private ArrayList retransmitQ;
+
+        // Setup / teardown timers
+        RJBlack.Timer setupTimer;
+        RJBlack.Timer shutdownTimer;
+
+        // Information on the "persist" state (for when the remote host
+        // has closed its receive window)
+        RJBlack.Timer persistTimer;
+
+        // An event that gets set when initial establishment either
+        // succeeds or times out
+        internal System.Threading.ManualResetEvent setupCompleteEvent;
+
+        // An event that gets set when we're done shutting down this session
+        internal System.Threading.ManualResetEvent closedEvent;
+
+        // is this session is valid for USERS to read/write data
+        protected bool isValidForRead, isValidForWrite;
+
+        // Whether or not BindLocalEndPoint() has been called
+        bool haveBound = false;
+
+        public bool ValidForRead { get { return isValidForRead;} set {isValidForRead=value;}}
+        public bool ValidForWrite { get { return isValidForWrite;} set {isValidForWrite=value;}}
+
+        // TCB
+        public struct TCB
+        {
+            public SNDValues SND;
+            public RCVValues RCV;
+
+            // send parameters
+            public struct SNDValues
+            {
+                public uint UNA;     // send unacknowledges
+                public uint NXT;     // send seqnum that will be transmitted
+                public uint WND;     // send window
+                public uint UP;      // send urgent pointer
+                public uint WL1;     // segment seq number used for last window update
+                public uint WL2;     // segment ack number used for last window update
+                public uint ISS;     // initial send sequence number
+                public uint NextSeq; // next sequence number to use when packetizing
+                                     // (not the same as NXT)
+            }
+
+            // receive parameters
+            public struct RCVValues
+            {
+                public uint NXT;     // receive next
+                public uint WND;     // receive window
+                public uint UP;      // receive urgent pointer
+                public uint IRS;     // initial receive sequence number
+            }
+        }
+
+        // the session's TCB
+        internal TCB sessionTCB;
+
+        [NotDelayed]
+        public TcpSession(IProtocol! p)
+            : base(p,TxQSize,RcvQSize)
+        {
+            sessionTCB           = new TCB();
+            sessionTCB.SND.WND   = TcpFormat.TCP_MSS;
+            sessionTCB.RCV.WND   = TcpFormat.TCP_MSS;
+            retransmitQ          = new ArrayList(RetransmitQSize);
+            acceptedSessions     = new ArrayList();
+            maxAcceptedSessions  = 0;                   // Changed by Listen()
+            acceptSessionMonitor = new object();
+
+            setupCompleteEvent = new System.Threading.ManualResetEvent(false);
+            closedEvent        = new System.Threading.ManualResetEvent(false);
+            passiveSession     = null;
+
+            // at first the session is valid (user can interact with it)
+            isValidForRead  = true;
+            isValidForWrite = true;
+
+            // create and initialize the init state
+            this.oldState = null;
+            ChangeState(TCPFSM.CLOSED);
+        }
+
+        public new void ReInitialize(IProtocol! p)
+        {
+            base.ReInitialize(p);
+            sessionTCB          = new TCB();
+            sessionTCB.SND.WND  = TcpFormat.TCP_MSS;
+            sessionTCB.RCV.WND  = TcpFormat.TCP_MSS;
+            maxAcceptedSessions = 0;
+            passiveSession      = null;
+            isValidForRead      = true;
+            isValidForWrite     = true;
+
+            DrainQueue(outQueue);
+            DrainQueue(inQueue);
+            retransmitQ.Clear();
+            acceptedSessions.Clear();
+            setupCompleteEvent.Reset();
+            closedEvent.Reset();
+
+            // create and initialize the init state
+            this.oldState = null;
+            if (!IsClosed) {
+                ChangeState(TCPFSM.CLOSED);
+            }
+
+            DestroyTimer(ref setupTimer);
+            DestroyTimer(ref shutdownTimer);
+            DestroyTimer(ref persistTimer);
+
+            retransInterval = InitialRetransInterval;
+        }
+
+        public bool IsClosed
+        {
+            get { return this.stateContext == TCPFSM.CLOSED; }
+        }
+
+        private void DestroyTimer(ref RJBlack.Timer t)
+        {
+            if (t != null) {
+                Core.Instance().TheDispatcher.RemoveTimeoutCallback(t);
+            }
+            t = null;
+        }
+
+        [ Conditional("DEBUG_TCP") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log("TCP: ");
+            Core.Log(format, args);
+        }
+
+        internal void StartConnectTimer()
+        {
+            ulong timeout;
+
+            if (passiveSession != null)
+            {
+                timeout = PassiveConnectTimeout;
+            }
+            else
+            {
+                timeout = ConnectTimeout;
+            }
+
+            Dispatcher.Callback fun = new Dispatcher.Callback(OnConnectTimeout);
+            ulong expiryTime = (ulong)DateTime.UtcNow.Ticks + (timeout * DateTime.TicksPerSecond);
+            setupTimer = Core.Instance().TheDispatcher.AddCallback(fun, null, expiryTime);
+        }
+
+        internal NetStatus OnConnectTimeout(Dispatcher.CallbackArgs args)
+        {
+            // We failed to become established in time. Bail out.
+            Terminate(null, TcpError.Timeout);
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        // change the state of this session
+        internal void ChangeState(TcpState! newState)
+        {
+            if (stateContext != null)
+            {
+                oldState = stateContext;
+                stateContext.OnStateLeave(this, newState);
+            }
+
+            // If we've become Established, stop the connect timer if there
+            // is one ticking
+            if (newState == TCPFSM.ESTABLISHED)
+            {
+                DestroyTimer(ref setupTimer);
+            }
+
+            if (newState == TCPFSM.CLOSED)
+            {
+                // Stop retransmitting
+                DestroyTimer(ref retransTimer);
+            }
+
+            stateContext = newState;
+            newState.OnStateEnter(this);
+        }
+
+        // the message is dispatched to the sessions. the sender
+        // is the protocol and the context is session specific
+        // (i.e., TCP can pass the TCP header to avoid
+        // processing it again at the session instance)
+        public delegate NetStatus OnPacketReceive(object     sender,
+                                                  NetPacket! packet,
+                                                  object     context);
+
+        // this is the state's delegate for handling the
+        // protocol triggered event
+        // the object parameter will be set to IProtocol interface
+        internal override NetStatus OnReceive(object     sender,
+                                              NetPacket! pkt,
+                                              object     ctx)
+        {
+            DebugPrint("Packet received.");
+            if (stateContext != null) {
+                // process it in the current state's context
+                DebugPrint("Packet received: State->{0}",
+                           stateContext.GetStateName());
+                return (stateContext.OnPacketReceive(this, pkt, ctx));
+            }
+            return NetStatus.Code.PROTOCOL_DROP_ERROR;
+        }
+
+        private void StartPersistTimer()
+        {
+            Dispatcher.Callback fun = new Dispatcher.Callback(OnPersistTimeout);
+            ulong expiryTime = (ulong)DateTime.UtcNow.Ticks + (PersistTimeout * DateTime.TicksPerSecond);
+            persistTimer = Core.Instance().TheDispatcher.AddCallback(fun, null, expiryTime);
+        }
+
+        internal void StopPersistTimer()
+        {
+            DestroyTimer(ref persistTimer);
+        }
+
+        internal bool InPersistState()
+        {
+            return persistTimer != null;
+        }
+
+        internal uint FreeRemoteWindowBytes()
+        {
+            // The portion of the remote window that is available is the most recently
+            // advertised window size minus any outstanding unacknowledged data
+            return sessionTCB.SND.WND - (sessionTCB.SND.NXT - sessionTCB.SND.UNA);
+        }
+
+        // Called when SND.WND is updated
+        internal void HandleWindowUpdate()
+        {
+            uint newWindow = sessionTCB.SND.WND;
+
+            if (InPersistState() && (newWindow > 0)) {
+                // The remote receive window just reopened
+                StopPersistTimer();
+            }
+
+            // The window update may have made it newly possible to transmit
+            // queued data.
+            if ((FreeRemoteWindowBytes() > 0) &&
+                (outQueue.Count > 0)) {
+                Core.Instance().SignalOutboundPackets();
+            }
+        }
+
+        private NetStatus OnPersistTimeout(Dispatcher.CallbackArgs timeoutArg)
+        {
+            //
+            // NOTE This is a hack. A proper TCP stack is supposed to
+            // transmit a packet consisting of just one byte when probing the
+            // remote host to see if it has reopened its receive window.
+            // However, we prepacketize data, so we don't have that option.
+            // Instead, we probe using full packets.
+            //
+            TcpSegment seg = null;
+
+            if (retransmitQ.Count > 0) {
+                // Use the oldest unacknowledged packet to probe
+                seg = (TcpSegment)retransmitQ[0];
+
+            } else {
+                // Nothing in the retransmit queue; probe using the next
+                // normal packet. This will transition the packet to the
+                // retransmission queue.
+                seg = GetNextPacket(true /*ignore window*/ );
+            }
+
+            if (seg != null) {
+                seg.Mux = BoundMux;
+                NetStatus err = Protocol.OnProtocolSend(seg);
+                assert err == NetStatus.Code.PROTOCOL_OK;
+            }
+
+            if (stateContext != TCPFSM.CLOSED) {
+                // rearm
+                StartPersistTimer();
+            }
+
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        private TcpSegment GetNextPacket()
+        {
+            return GetNextPacket(false);
+        }
+
+        private TcpSegment GetNextPacket(bool ignoreReceiverWindow)
+        {
+            if (outQueue.Count == 0) {
+                return null;
+            }
+
+            lock (outQueue.SyncRoot) {
+                // recheck after lock
+                if (outQueue.Count == 0) {
+                    return null;
+                }
+
+                if (((TcpSegment!)outQueue[0]).retries > 0) {
+                    // Special case: the head packet is a retransmission. No special work.
+                    return (TcpSegment)base.GetPacket(outQueue, false, 0); // non blocking
+
+                } else {
+                    // The head packet is *not* a retransmission. Make sure we
+                    // have room to to move it to the retransmission queue.
+                    if (retransmitQ.Count < retransmitQ.Capacity)
+                    {
+                        TcpSegment nextSegment = (TcpSegment)outQueue[0];
+                        assert nextSegment != null;
+                        uint segSize = nextSegment.GetSegmentLength();
+
+                        if ((!ignoreReceiverWindow) && (segSize > FreeRemoteWindowBytes())) {
+                            return null; // Don't overrun the receiver
+                        }
+
+                        // Call the base class to dequeue the packet in an orderly way
+                        TcpSegment! seg = (TcpSegment!)base.GetPacket(outQueue, false, 0); // non blocking
+                        assert seg == nextSegment;
+
+                        if (!seg.isAck) {
+                            // save it for RTT adjustments
+                            seg.sendTime = (ulong)DateTime.UtcNow.Ticks;
+                            retransmitQ.Add(seg);
+
+                            // Make sure the retransmitQ stays sorted
+                            if (retransmitQ.Count > 1) {
+                                TcpSegment! previousTail = (TcpSegment!)retransmitQ[retransmitQ.Count - 2];
+                                assert TCPFSM.TCPSeqGreater(seg.seq, previousTail.seq);
+                            }
+
+                            // Kick off the retransmit timer if we are first
+                            if (retransTimer == null) {
+                                RestartRetransTimer();
+                            }
+
+                        } else if (segSize == 0) {
+                            segSize = 1; // ACKs take up one segment number
+                        }
+
+                        // Advance the NXT counter since we're about to put this
+                        // segment on the wire
+                        sessionTCB.SND.NXT = seg.seq + segSize;
+                        return seg;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        // NB: call *after* removing or adding items to the retransmitQ
+        internal void RestartRetransTimer()
+        {
+            DestroyTimer(ref retransTimer);
+
+            if (retransmitQ.Count > 0) {
+                ulong nowTime = (ulong)DateTime.UtcNow.Ticks;
+                // TODO: We should use a dynamically-calculated timeout interval
+                ulong t = nowTime + (ulong)TimeSpan.FromMilliseconds(retransInterval).Ticks;
+
+                retransTimer = Core.Instance().TheDispatcher.AddCallback(
+                    new Dispatcher.Callback(OnRetransmitTimeout), null, t);
+            } // else all data has been acknowledged
+        }
+
+        internal void FlushRetransmissions()
+        {
+            DestroyTimer(ref retransTimer);
+            retransmitQ.Clear();
+        }
+
+        private void UpdateRTT(uint measurement)
+        {
+            const uint MaxCredibleMeasurement = 10000; // 10s in ms
+            uint newInterval;
+
+            if (measurement > MaxCredibleMeasurement) {
+                // Garbage
+                return;
+            }
+
+            if (retransInterval == InitialRetransInterval) {
+                // We have never set the session RTT.
+                srtt = measurement;
+                rttvar = srtt / 2;
+                newInterval = measurement * 2;
+            } else {
+                // Second or subsequent measurement. Per RFC 2988
+                uint abs_srtt_meas = srtt > measurement ? srtt - measurement : measurement - srtt;
+                rttvar = ((rttvar * 3) / 4) + (abs_srtt_meas / 4);
+                srtt = ((7 * srtt) / 8) + (measurement / 8);
+                newInterval = srtt + (4 * rttvar);
+            }
+
+            this.retransInterval = newInterval < MinimumRetransInterval ? MinimumRetransInterval : newInterval;
+        }
+
+        // Process a remote acknowledgement of data up to the given sequence number
+        internal void ACKThrough(uint seqNum)
+        {
+            ulong nowTicks = (ulong)DateTime.UtcNow.Ticks;
+            int removed = 0;
+
+            // Pop packets off the retransmitQ through the acked seqnum
+            while (retransmitQ.Count > 0) {
+                TcpSegment! headSeg = (TcpSegment!)retransmitQ[0];
+
+                if (retransmitQ.Count > 1) {
+                    TcpSegment! nextSeg = (TcpSegment!)retransmitQ[1];
+                    // Make sure the queue is in order
+                    assert TCPFSM.TCPSeqLess(headSeg.seq, nextSeg.seq);
+                }
+
+                // If the head segment is fully acknowledged, pop it
+                if (TCPFSM.TCPSeqLEQ(headSeg.seq + headSeg.GetSegmentLength(), seqNum)) {
+                    retransmitQ.RemoveAt(0);
+                    removed++;
+
+                    // Use this ACK for RTT calculations.
+                    // Ignore ACKs for retransmitted data.
+                    if (headSeg.retries == 0) {
+                        UpdateRTT(headSeg.GetRTT(nowTicks));
+                    }
+                } else {
+                    // Out of packets to pop
+                    break;
+                }
+            }
+
+            if (removed > 0) {
+                RestartRetransTimer();
+            }
+            // else this ACK didn't acknowledge any new data
+
+            // INVARIANT: the head of the retransmit queue must contain
+            // the first unacked seqnum.
+            if (retransmitQ.Count > 0) {
+                TcpSegment! headSeg = (TcpSegment!)retransmitQ[0];
+
+                bool hasFirstUnacked =
+                    TCPFSM.TCPSeqLEQ(headSeg.seq, sessionTCB.SND.UNA) &&
+                    TCPFSM.TCPSeqGEQ(headSeg.seq + headSeg.GetSegmentLength(), sessionTCB.SND.UNA);
+
+                assert hasFirstUnacked;
+            }
+
+            // We may have paused transmission so as to not overrun the receiver.
+            // Poke the netstack core to be sure we get serviced if we have data
+            // to send.
+            if ((FreeRemoteWindowBytes() > 0) &&
+                (outQueue.Count > 0)) {
+                Core.Instance().SignalOutboundPackets();
+            }
+        }
+
+        // we need to override GetPacket. We transmit the packet
+        // and put it in the retransmit queue until we get an ack.
+        // (we only do it for data segments including SYN which counts for one)
+        // if a timer expired before ack, we retransmit it until we give up.
+        override internal NetPacket GetPacket(ArrayList! q, bool toBlock, int timeout)
+        {
+            // We only concern ourselves with the remote host's receive window in states
+            // where we are transmitting
+            bool shouldRespectRemoteWindow =
+                (stateContext != TCPFSM.CLOSED) &&
+                (stateContext != TCPFSM.LISTEN) &&
+                (stateContext != TCPFSM.SYN_SENT) &&
+                (stateContext != TCPFSM.SYN_RECVD);
+
+            // There needs to be at least one packet-worth of space in the send-window for us
+            // to be sure we won't overrun the remote host.
+            if (shouldRespectRemoteWindow && (sessionTCB.SND.WND == 0)) {
+                // Make sure the persist timer is ticking
+
+                if (!InPersistState()) {
+                    StartPersistTimer();
+                } // else already in the persist state
+
+            } else {
+                StopPersistTimer();
+                return GetNextPacket();
+            }
+
+            return null;
+        }
+
+        private void PriorityEnqueuePacket(ArrayList! queue, NetPacket! packet)
+        {
+            lock (queue.SyncRoot) {
+                // This may increase the capacity of the queue.  We probably want
+                // watermark limit for user additions to the queue and not worry about
+                // internal additions to the queue.
+                queue.Insert(0, packet);
+            }
+
+            // Poke the core to service our queue
+            Core.Instance().SignalOutboundPackets();
+        }
+
+        // Handler for TCP timeouts
+        internal NetStatus OnRetransmitTimeout(Dispatcher.CallbackArgs timeoutArg)
+        {
+            if (!InPersistState()) {
+                // Retransmit the oldest unacknowledged packet
+                assert retransmitQ.Count > 0;
+                TcpSegment! oldest = (TcpSegment!)retransmitQ[0];
+                ++oldest.retries;
+
+                if (oldest.retries >= MaxRetries) {
+                    // Give up
+                    Abort(TcpError.Timeout);
+                    return NetStatus.Code.PROTOCOL_OK;
+                }
+
+                // INVARIANT: the head of the retransmit queue must contain
+                // the first unacked seqnum
+                if (retransmitQ.Count > 0) {
+                    // TODO make this an assert
+                    TcpSegment! headSeg = (TcpSegment!)retransmitQ[0];
+
+                    bool hasFirstUnacked =
+                        TCPFSM.TCPSeqLEQ(headSeg.seq, sessionTCB.SND.UNA) &&
+                        TCPFSM.TCPSeqGreater(headSeg.seq + headSeg.GetSegmentLength(), sessionTCB.SND.UNA);
+
+                    assert hasFirstUnacked;
+                }
+
+                PriorityEnqueuePacket(outQueue, oldest);
+            } else {
+                // we're in the persist state and retransmissions are suspended.
+            }
+
+            // Back off!
+            retransInterval = retransInterval * 2;
+
+            RestartRetransTimer();
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        internal override bool IsSessionValidForUserRead()
+        {
+            return isValidForRead;
+        }
+
+        internal override bool IsSessionValidForUserWrite()
+        {
+            return isValidForWrite;
+        }
+
+        // data can be still available on a non-valid session
+        public bool IsDataAvailable()
+        {
+            return (inQueue.Count>0);
+        }
+
+        // Callback type for packetizing data
+        private delegate void CopyDataDelegate(byte[]! intoArray, int sourceOffset,
+                                               int destOffset, int length);
+
+        // Helper delegate for dealing with GC data
+        private class GCDataCopier
+        {
+            private byte[] gcData;
+
+            public GCDataCopier(byte[] gcData)
+            {
+                this.gcData = gcData;
+            }
+
+            public void CopyData(byte[]! intoArray, int sourceOffset,
+                                 int destOffset, int length)
+            {
+                if (sourceOffset + length > gcData.Length) {
+                    throw new Exception("Overrun of GC data helper");
+                }
+
+                Array.Copy(gcData, sourceOffset, intoArray,
+                           destOffset, length);
+            }
+        }
+
+        // Helper class for dealing with ExHeap data
+        private class ExHeapDataCopier
+        {
+            VContainer<byte> exHeapData;
+
+            public ExHeapDataCopier([Claims] byte[]! in ExHeap exHeapData)
+            {
+                this.exHeapData = new VContainer<byte>(exHeapData);
+            }
+
+            public void CopyData(byte[]! intoArray, int sourceOffset,
+                                 int destOffset, int length)
+            {
+                if (this.exHeapData == null) {
+                    throw new Exception("ExHeapDataCopier used after Destroy()");
+                }
+
+                byte[]! in ExHeap exHeapData = this.exHeapData.Acquire();
+
+                try {
+                    if (sourceOffset + length > exHeapData.Length) {
+                        throw new Exception("Overrun of ExHeap data helper");
+                    }
+
+                    Bitter.ToByteArray(exHeapData, sourceOffset, length,
+                                       intoArray, destOffset);
+                }
+                finally {
+                    this.exHeapData.Release(exHeapData);
+                }
+            }
+
+            public void Destroy()
+            {
+                // Explicitly discard our ExHeap object
+                byte[]! in ExHeap data = this.exHeapData.Acquire();
+                delete data;
+                this.exHeapData = null;
+            }
+        }
+
+        public int WriteData([Claims] byte[]! in ExHeap data)
+        {
+            int dataLength = data.Length;
+            ExHeapDataCopier helper = new ExHeapDataCopier(data);
+            int retval = InternalWrite(new CopyDataDelegate(helper.CopyData), dataLength);
+
+            // Make sure the ExHeap block gets thrown away immediately to
+            // reduce pressure on the finalizer thread
+            helper.Destroy();
+
+            return retval;
+        }
+
+        override public int WriteData(byte[]! data)
+        {
+            GCDataCopier helper = new GCDataCopier(data);
+            return InternalWrite(new CopyDataDelegate(helper.CopyData), data.Length);
+        }
+
+        // here we create the segments from the data
+        // The user is blocked until we have more room.
+        // we return -1 if we can't write (session is not established)
+        // TBC: according to the spec, when TCP is about to send it, if there is not
+        // enough space at the peer receive buffer it can split it
+        // to several smaller segments.
+        private int InternalWrite(CopyDataDelegate! dataCopier, int dataSize)
+        {
+            if (!ValidForWrite)
+            {
+                return -1;
+            }
+
+            // This is the number of full packets to send
+            uint mssCount = (uint)(dataSize / TcpFormat.TCP_MSS);
+
+            // This is the size of the last (non-full) packet.
+            uint mssResidue = (uint)(dataSize % TcpFormat.TCP_MSS);
+
+            int readIndex = 0;
+            uint segSequence = sessionTCB.SND.NextSeq;
+
+            const int baseFrameSize = EthernetFormat.Size + IPFormat.Size + TcpFormat.Size;
+
+            while (mssCount!=0)
+            {
+                // create a TCP segment without options
+
+                // handle the data first
+                byte[] pktData = new byte[baseFrameSize + TcpFormat.TCP_MSS];
+                dataCopier(pktData, readIndex, baseFrameSize, TcpFormat.TCP_MSS);
+
+                TcpFormat.WriteTcpSegment(pktData,this.LocalPort,
+                                          this.RemotePort, sessionTCB.RCV.NXT,
+                                          segSequence, TcpFormat.TCP_MSS,
+                                          this.LocalAddress,
+                                          this.RemoteAddress,
+                                          TcpFormat.TCP_MSS,
+                                          true,false,false,false,false);
+
+                TcpSegment seg = new TcpSegment(pktData, this,
+                                                segSequence, false);
+                // the next segment sequence
+                segSequence += TcpFormat.TCP_MSS;
+                readIndex += TcpFormat.TCP_MSS;
+                base.PutPacket(outQueue, seg, true);
+                mssCount--;
+            }
+
+            if (mssResidue!=0)
+            {
+                byte[] pktData = new byte[baseFrameSize + mssResidue];
+                dataCopier(pktData, readIndex, baseFrameSize, (int)mssResidue);
+
+                TcpFormat.WriteTcpSegment(pktData,
+                                          this.LocalPort,
+                                          this.RemotePort,
+                                          sessionTCB.RCV.NXT,
+                                          segSequence, TcpFormat.TCP_MSS,
+                                          this.LocalAddress,
+                                          this.RemoteAddress,
+                                          (ushort)mssResidue,
+                                          true,false,false,false,false);
+
+                TcpSegment seg = new TcpSegment(pktData, this,
+                                                segSequence, false);
+                segSequence += mssResidue;
+                base.PutPacket(outQueue,seg,true);
+            }
+
+            sessionTCB.SND.NextSeq = segSequence;
+            // since we always send it all...
+            return dataSize;
+        }
+
+        public bool BindLocalEndPoint(IPv4 address, ushort port)
+        {
+            haveBound = true;
+            SetRemoteEndPoint(IPv4.Broadcast, 0);
+            return SetLocalEndPoint(address, port);
+        }
+
+        // the method is used to make a session active (i.e., active open)
+        // TBC: manage local ports automatically
+        // we currently more restrictive regarding user
+        // interaction (can't change passive to active etc)
+        public bool Connect(IPv4 dstIP, ushort dstPort, out TcpError error)
+        {
+
+            DebugPrint("Connect: {0:x8}/{1}", dstIP, dstPort);
+
+            if (stateContext!=TCPFSM.CLOSED) {
+                DebugPrint("Connect: Failed FSM Closed", dstIP, dstPort);
+                error = TcpError.AlreadyConnected;
+                return false;
+            }
+
+            // init the session's parameters
+            SetRemoteEndPoint(dstIP, dstPort);
+
+            // Set the local endpoint to "don't care" if the user
+            // hasn't called BindLocalEndPoint() previously
+            if (!haveBound)
+            {
+                SetLocalEndPoint(IPv4.Any, 0);
+            }
+
+            sessionTCB.RCV = new TcpSession.TCB.RCVValues();
+            sessionTCB.SND = new TcpSession.TCB.SNDValues();
+
+            DrainQueue(outQueue);
+            DrainQueue(inQueue);
+            retransmitQ.Clear();
+
+            // change this session state to SYNSENT.
+            // a SYN message will be sent to the destination
+            ChangeState(TCPFSM.SYN_SENT);
+            // provide a default error
+            this.connectError = TcpError.Unknown;
+
+
+            // block the user until the session is ready
+            setupCompleteEvent.WaitOne();
+
+            DebugPrint("Connect: SetupCompleteEvent signalled");
+
+            if (stateContext != TCPFSM.ESTABLISHED)
+            {
+                // The connect failed.
+                error = this.connectError;
+                DebugPrint("Connect: failed {0}", error);
+                return false;
+            }
+            else
+            {
+                // The connection is up and running properly.
+                error = TcpError.Unknown;
+                DebugPrint("Connect: success");
+                return true;
+            }
+        }
+
+        private NetStatus OnShutdownTimedout(Dispatcher.CallbackArgs args)
+        {
+            // No more Mr. Nice Guy
+            Abort(TcpError.Timeout);
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        // close the session
+        override public bool Close()
+        {
+            // Signal that we're done sending; this will start the polite
+            // shutdown process.
+            DoneSending();
+
+            // Start a timer to make sure we don't wait for the shutdown
+            // forever. TODO: we should use a value passed in by the
+            // caller for the timeout rather than hard-coding it.
+            Dispatcher.Callback fun = new Dispatcher.Callback(OnShutdownTimedout);
+            ulong expiryTime = (ulong)DateTime.UtcNow.Ticks +
+                (PoliteShutdownTimeout * DateTime.TicksPerSecond);
+            shutdownTimer = Core.Instance().TheDispatcher.AddCallback(fun, null, expiryTime);
+
+            // Wait while we complete the shutdown, drain the outbound
+            // queue, etc.
+            closedEvent.WaitOne();
+
+            // Quash the timer in case it's still ticking
+            if (Core.Instance().TheDispatcher.RemoveTimeoutCallback(shutdownTimer)) {
+                Tracing.Log(Tracing.Debug, "Tcp quash timer successful.");
+            }
+            else {
+                Tracing.Log(Tracing.Debug, "Tcp quash timer already expired.");
+            }
+            shutdownTimer = null;
+
+            // After a Close() completes, pending data isn't available anymore!
+            DrainQueue(inQueue);
+
+            return true;
+        }
+
+        // hard-shutdown
+        override public bool Abort()
+        {
+            return Abort(TcpError.Unknown);
+        }
+
+        public bool Abort(TcpError error)
+        {
+            // Abort our connection with a RST segment
+            Terminate(TCPFSM.CreateResetSegment(this, true), error);
+            return true;
+        }
+
+        private void Terminate(TcpSegment finalPacket, TcpError error)
+        {
+            StopPersistTimer();
+
+            if (stateContext == TCPFSM.CLOSED)
+            {
+                // Signal anyone waiting, for good measure.
+                setupCompleteEvent.Set();
+            }
+            else
+            {
+                // This will set the setup-complete event as a side effect
+                TCPFSM.HandleTerminateSession(this, finalPacket, error);
+            }
+        }
+
+        // passively open a session
+        public bool Listen(int backlog)
+        {
+            if (stateContext != TCPFSM.CLOSED)
+                return false;
+
+            // User must have previously bound
+            if (!haveBound)
+            {
+                return false;
+            }
+
+            maxAcceptedSessions = backlog;
+            ChangeState(TCPFSM.LISTEN);
+            return true;
+        }
+
+        // start accepting new clients
+        // will block until a new client connection is established
+        public TcpSession Accept()
+        {
+            if (stateContext != TCPFSM.LISTEN)
+                return null;
+
+            TcpSession tcpSession=null;
+
+            // block the user until a session is available
+            lock (acceptSessionMonitor)
+            {
+                while (acceptedSessions.Count==0)
+                    Monitor.Wait(acceptSessionMonitor);
+                tcpSession = (TcpSession)acceptedSessions[0];
+                acceptedSessions.RemoveAt(0);
+            }
+
+            return tcpSession;
+        }
+
+        // Returns false if our queue is full
+        internal bool AddAcceptedSession(TcpSession newSession)
+        {
+            lock (acceptSessionMonitor)
+            {
+                if (AcceptQueueIsFull())
+                {
+                    return false;
+                }
+                else
+                {
+                    acceptedSessions.Add(newSession);
+                    Monitor.PulseAll(acceptSessionMonitor);
+                    return true;
+                }
+            }
+        }
+
+        // Indicate whether there are queued sessions waiting to be Accept()ed
+        public int GetNumWaitingListenSessions()
+        {
+            lock (acceptSessionMonitor)
+            {
+                return acceptedSessions.Count;
+            }
+        }
+
+        // Determine whether the accept queue is full or not
+        internal bool AcceptQueueIsFull()
+        {
+            return GetNumWaitingListenSessions() >= maxAcceptedSessions;
+        }
+
+        // Indicate that we're done sending
+        public void DoneSending()
+        {
+            if (!isValidForWrite)
+            {
+                // Nothing to do
+                return;
+            }
+
+            isValidForWrite = false;
+
+            if (stateContext == TCPFSM.ESTABLISHED)
+            {
+                // Transition to FIN_WAIT1 since we are the first
+                // side to close
+                TCPFSM.SendFin(this, true); // can block
+                ChangeState(TCPFSM.FIN_WAIT1);
+            }
+            else if (stateContext == TCPFSM.CLOSE_WAIT)
+            {
+                // The other side closed first; transition to
+                // LAST_ACK instead
+                TCPFSM.SendFin(this, true); // blocks
+                ChangeState(TCPFSM.LAST_ACK);
+            }
+            else
+            {
+                // We're in some transitory setup or teardown
+                // state; just abort the connection.
+                Abort(TcpError.Closed);
+            }
+        }
+
+        // Indicate that we're done receiving
+        public void DoneReceiving()
+        {
+            ValidForRead = false;
+        }
+    }
+
+    // a TCP segment
+    public class TcpSegment : NetPacket
+    {
+        // segment identifier
+        internal uint seq;          // the segment sequence number
+        internal uint retries;      // number of retransmit retries
+        internal bool isAck;        // is it an ack segment (no retrans for ack!)
+        internal ulong sendTime;    // used to dynamically adjust the RTT
+
+        // create a TcpSegment, add room for lower level protocols
+        public TcpSegment(byte[]! buffer) : base(buffer)
+        {
+            seq=0;
+            retries=0;
+            isAck=false;
+            sendTime=0;
+        }
+
+        // the isAck indicate that this is an ack segment
+        // (we never ack an ack segments without data)
+        [NotDelayed]
+        public TcpSegment(byte[]! buffer, TcpSession! owner, uint seqNum, bool isAck) : base(buffer)
+        {
+            seq=seqNum;
+            retries=0;
+            this.isAck=isAck;
+            sendTime=0;
+            this.SessionContext = owner;
+        }
+
+        public TcpSession owner
+        {
+            // owner was a field in TcpSegment, but it mirrors field
+            // in NetPacket and one we now use for unblocking after
+            // the ARP response comes back.
+            get { return this.SessionContext as TcpSession; }
+            set { this.SessionContext = value; }
+        }
+
+        // return the TCP data segment size
+        public uint GetSegmentLength()
+        {
+            return ((uint)(base.Length - EthernetFormat.Size - IPFormat.Size - TcpFormat.Size));
+        }
+
+        public uint GetRTT(ulong receiveTime)
+        {
+            ulong deltaTime = (receiveTime>sendTime ? receiveTime-sendTime : 0 );
+            return (uint)(TimeSpan.FromTicks((long)deltaTime)).Milliseconds;
+        }
+    }
+}
+
diff --git a/base/Services/NetStack/Runtime/TcpSessionPool.cs b/base/Services/NetStack/Runtime/TcpSessionPool.cs
new file mode 100644
index 0000000..1d444a6
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TcpSessionPool.cs
@@ -0,0 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+
+namespace NetStack.Runtime
+{
+    public class TcpSessionPool
+    {
+        static TcpModule tcpModule;
+        static ArrayList tcpSessions = new ArrayList();
+
+        static long allocations;
+        static long getCalls;
+        static long recycleCalls;
+
+        public static void SetTcpModule(TcpModule m)
+        {
+            tcpModule = m;
+        }
+
+        public static TcpSession! Get()
+        {
+            lock (tcpSessions) {
+                getCalls++;
+                foreach (TcpSession! ts in tcpSessions) {
+                    if (ts.IsClosed) {
+                        Core.Instance().DeregisterSession(ts.Protocol, ts);
+                        tcpSessions.Remove(ts);
+                        return tcpModule.ReInitializeSession(ts);
+                    }
+                }
+                allocations++;
+            }
+
+            return new TcpSession(tcpModule);
+        }
+
+        public static void Recycle(TcpSession! ts)
+        {
+            lock (tcpSessions) {
+                recycleCalls++;
+                tcpSessions.Add(ts);
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TestDhcpClient.cs b/base/Services/NetStack/Runtime/TestDhcpClient.cs
new file mode 100644
index 0000000..c66728b
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TestDhcpClient.cs
@@ -0,0 +1,426 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: TestDhcpClient.cs
+//
+
+using NetStack.Common;
+using System;
+using System.Threading;
+using System.Collections;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Protocols;
+using NetStack.NetDrivers;
+
+namespace NetStack.Runtime.TestDhcpClient
+{
+    public class FakeDhcpServer : IDebugAdapterClient
+    {
+#region Constants
+        public enum ServerState : byte
+        {
+            Running  = 1,
+            Failed   = 2,
+            Finished = 3
+        };
+
+        private const int NonDhcpHeaderSize =
+            EthernetFormat.Size + IPFormat.Size + UdpFormat.Size;
+
+        private readonly EthernetAddress ServerMac =
+            EthernetAddress.Parse("00:50:f2:fe:dc:0d");
+
+        private readonly IPv4 ServerAddress = IPv4.Parse("10.0.0.99");
+        private readonly IPv4 HostAddress   = IPv4.Parse("10.0.0.100");
+        private readonly IPv4 NetMask       = IPv4.NetMask(19);
+        private readonly IPv4 [] Routers    = {
+            IPv4.Parse("10.0.0.1")
+        };
+        private readonly IPv4 [] DnsServers = {
+            IPv4.Parse("10.0.0.10"),
+            IPv4.Parse("10.0.1.10")
+            };
+        private const uint RenewalTime   = 20;
+        private const uint RebindingTime = 40;
+
+        private readonly String DomainName = "microsoft.com";
+
+        //
+        // <Expect,Action> pairings.
+        //
+        // NB If action is not a DHCP Response, no response should be sent.
+        //
+        private DhcpFormat.MessageType [,] expectActions =
+        {
+            // Expect Discover and do nothing with it.
+            { DhcpFormat.MessageType.Discover,
+              DhcpFormat.MessageType.Discover },
+
+            // Expect Discover and make an offer
+            { DhcpFormat.MessageType.Discover,
+              DhcpFormat.MessageType.Offer },
+
+            // Expect request then cruelly reject it
+            { DhcpFormat.MessageType.Request,
+              DhcpFormat.MessageType.Nak },
+
+            // Expect Discover and make another offer
+            { DhcpFormat.MessageType.Discover,
+              DhcpFormat.MessageType.Offer },
+
+            // Expect request and fickly accept
+            { DhcpFormat.MessageType.Request,
+              DhcpFormat.MessageType.Ack },
+
+            // Live happily ever after
+        };
+#endregion Constants
+
+#region InstanceState
+        private DebugAdapter adapter;
+        private ServerState state;
+        private IPv4 assignedAddress = IPv4.Zero;
+        private int expectIndex = 0;
+#endregion InstanceState
+
+        public ServerState State
+        {
+            get { return state; }
+        }
+
+        private void SetState(ServerState newState)
+        {
+            state = newState;
+        }
+
+        public void RegisterAdapter(DebugAdapter adapter)
+        {
+            this.adapter = adapter;
+        }
+
+        /// <summary>
+        /// Check Ethernet, IP, and UDP headers match those expected.
+        /// </summary>
+        private bool ValidHeaders(NetPacket packet)
+        {
+            if (packet.Length < NonDhcpHeaderSize)
+            {
+                Console.WriteLine("Packet too short");
+                return false;
+            }
+
+            //
+            // Check EthernetHeader
+            //
+            EthernetAddress originMac;
+            EthernetAddress targetMac;
+            EthernetFormat.Protocol protocol;
+
+            EthernetFormat.Read(packet,
+                                out originMac, out targetMac, out protocol);
+            if (originMac != adapter.HardwareAddress)
+            {
+                Console.WriteLine("Bad origin mac: {0}", originMac);
+                return false;
+            }
+            else if (targetMac != EthernetAddress.Broadcast &&
+                     targetMac != ServerMac)
+            {
+                Console.WriteLine("Bad target mac: {0}", targetMac);
+                return false;
+            }
+            else if (protocol != EthernetFormat.Protocol.IP)
+            {
+                Console.WriteLine("Bad encapsulated protocol: {0}", protocol);
+                return false;
+            }
+
+            //
+            // Check IP Header
+            //
+            IPFormat.IPHeader ipHeader;
+            if (IPFormat.ReadIPHeader(packet, out ipHeader) == false)
+            {
+                Console.WriteLine("Failed to read IP Header");
+                return false;
+            }
+            else if (ipHeader.Protocol != IPFormat.Protocol.UDP)
+            {
+                Console.WriteLine("Bad encapsulated IP protocol: {0}",
+                                  ipHeader.Protocol);
+                return false;
+            }
+            else if (ipHeader.Source != IPv4.Zero &&
+                     ipHeader.Source != assignedAddress)
+            {
+                Console.WriteLine("Bad IP source address: {0}",
+                                  ipHeader.Source);
+                return false;
+            }
+            else if (ipHeader.Destination != IPv4.AllOnes &&
+                     ipHeader.Destination != ServerAddress)
+            {
+                Console.WriteLine("Bad IP destination address: {0}",
+                                  ipHeader.Destination);
+                return false;
+            }
+
+            Console.WriteLine("{0} {1}",
+                              ipHeader.Source, ipHeader.Destination);
+
+            //
+            // Check UDP Header
+            //
+            UdpFormat.UdpHeader udpHeader;
+            if (UdpFormat.ReadUdpHeader(packet, out udpHeader) == false)
+            {
+                Console.WriteLine("Failed to read UDP Header");
+                return false;
+            }
+            else if (udpHeader.srcPort != 68)
+            {
+                Console.WriteLine("Bad UDP source port: {0}",
+                                  udpHeader.srcPort);
+                return false;
+            }
+            else if (udpHeader.dstPort != 67)
+            {
+                Console.WriteLine("Bad UDP destination port: {0}",
+                                  udpHeader.dstPort);
+                return false;
+            }
+
+            return true;
+        }
+
+        public void Receive(NetPacket packet)
+        {
+            packet.Reset();
+
+            Console.WriteLine("Received {0} bytes", packet.Length);
+            if (ValidHeaders(packet) == false)
+            {
+                SetState(ServerState.Failed);
+                return;
+            }
+
+            try
+            {
+                DhcpFormat dhcp = DhcpFormat.Parse(packet);
+                SortedList options = dhcp.GetOptions();
+
+                DhcpByteOption message = options[DhcpMessageType.OptionCode]
+                    as DhcpByteOption;
+                if (message == null)
+                {
+                    Console.WriteLine("MessageType option not found");
+                    SetState(ServerState.Failed);
+                    return;
+                }
+
+                DhcpFormat.MessageType messageType =
+                    (DhcpFormat.MessageType) message.Value;
+
+                if (DhcpFormat.IsRequestMessage(messageType) == false)
+                {
+                    Console.WriteLine("Inappropriate message type: {0}",
+                                      message.Value);
+                    SetState(ServerState.Failed);
+                    return;
+                }
+
+                DhcpFormat.MessageType expected = expectActions[expectIndex,0];
+                DhcpFormat.MessageType action = expectActions[expectIndex,1];
+                expectIndex++;
+
+                if (messageType != expected)
+                {
+                    Console.WriteLine("Unexpected message type: {0} != {1}",
+                                      messageType, expected);
+                    SetState(ServerState.Failed);
+                    return;
+                }
+
+                if (DhcpFormat.IsResponseMessage(action))
+                {
+                    Respond(dhcp, action);
+                }
+
+                if (expectIndex == expectActions.Length / expectActions.Rank)
+                {
+                    SetState(ServerState.Finished);
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Bad Dhcp packet: {0}", e);
+                SetState(ServerState.Failed);
+            }
+        }
+
+        private void FillOptions(DhcpFormat request, DhcpFormat response)
+        {
+            SortedList requestOptions = request.GetOptions();
+
+            response.AddOption(DhcpServerID.Create(ServerAddress));
+            response.AddOption(DhcpRenewalTime.Create(RenewalTime));
+            response.AddOption(DhcpRebindingTime.Create(RebindingTime));
+
+            foreach (IDhcpOption option in requestOptions.Values)
+            {
+                byte optionCode = option.OptionCode;
+                Console.WriteLine("({0}) {1}",
+                                  optionCode,
+                                  DhcpOptionParser.GetOptionName(optionCode));
+            }
+
+            DhcpMultiByteOption parameters =
+                requestOptions[DhcpParameterRequest.OptionCode]
+                as DhcpMultiByteOption;
+
+            if (parameters == null)
+                return;
+
+            foreach (byte parameter in parameters.Values)
+            {
+                switch (parameter)
+                {
+                    case DhcpSubnetMask.OptionCode:
+                        response.AddOption(DhcpSubnetMask.Create(NetMask));
+                        break;
+                    case DhcpDomainName.OptionCode:
+                        response.AddOption(
+                            DhcpDomainName.Create(DomainName.ToCharArray())
+                            );
+                        break;
+                    case DhcpRouter.OptionCode:
+                        response.AddOption(DhcpRouter.Create(Routers));
+                        break;
+                    case DhcpDomainNameServer.OptionCode:
+                        response.AddOption(
+                            DhcpDomainNameServer.Create(DnsServers)
+                            );
+                        break;
+                }
+            }
+        }
+
+        private void Respond(DhcpFormat request, DhcpFormat.MessageType m)
+        {
+            DhcpFormat response    = new DhcpFormat(m);
+
+            response.TransactionID = request.TransactionID;
+
+            EthernetAddress hwAddress = request.GetHardwareAddress();
+            response.SetHardwareAddress(hwAddress);
+
+            switch (m)
+            {
+                case DhcpFormat.MessageType.Offer:
+                    response.NextServerIPAddress = ServerAddress;
+                    response.AddOption(
+                        DhcpIPAddressLeaseTime.Create(RebindingTime)
+                        );
+                    goto case DhcpFormat.MessageType.Ack;
+                case DhcpFormat.MessageType.Ack:
+                    response.YourIPAddress = HostAddress;
+                    assignedAddress = HostAddress;
+                    FillOptions(request, response);
+                    break;
+                case DhcpFormat.MessageType.Nak:
+                    // Nothing to do
+                    break;
+                default:
+                    return;
+            }
+            SendResponsePacket(response);
+        }
+
+        private void SendResponsePacket(DhcpFormat dhcp)
+        {
+            int packetSize = dhcp.Size + UdpFormat.Size +
+                IPFormat.Size + EthernetFormat.Size;
+
+            byte [] packet = new byte [packetSize];
+
+            // Write out DHCP packet
+            int dhcpSize = dhcp.Size;
+            int dhcpOffset = packet.Length - dhcpSize;
+            dhcp.Write(packet, dhcpOffset);
+
+            // Create UDP Header
+            UdpFormat.UdpHeader udpHeader = new UdpFormat.UdpHeader();
+            udpHeader.srcPort = DhcpFormat.ServerPort;
+            udpHeader.dstPort = DhcpFormat.ClientPort;
+            udpHeader.length  = (ushort)(UdpFormat.Size + dhcpSize);
+
+            // Create IP Header
+            IPFormat.IPHeader ipHeader = new NetStack.Protocols.IPFormat.IPHeader();
+            ipHeader.SetDefaults(IPFormat.Protocol.UDP);
+            IPFormat.SetDontFragBit(ipHeader);
+
+            ipHeader.Source      = ServerAddress;
+            ipHeader.Destination = IPv4.Broadcast;
+            ipHeader.totalLength = (ushort)(IPFormat.Size + UdpFormat.Size + dhcpSize);
+
+            // Write out IP and Header
+            int udpOffset = packet.Length - dhcp.Size - UdpFormat.Size;
+            int ipOffset = udpOffset - IPFormat.Size;
+            UdpFormat.WriteUdpPacket(packet, ipOffset,
+                                     ref ipHeader, ref udpHeader,
+                                     packet, dhcpOffset, dhcpSize);
+
+            // Add Ethernet Header
+            EthernetFormat.Write(packet, 0, ServerMac,
+                                 EthernetAddress.Broadcast,
+                                 EthernetFormat.Protocol.IP);
+
+            NetPacket np = new NetPacket(packet);
+            if (adapter.ReceivePacket(np) == false)
+            {
+                Console.WriteLine("Failed to send packet");
+                SetState(ServerState.Failed);
+            }
+        }
+    }
+
+    public class Test
+    {
+        static int Main()
+        {
+            StaticConfiguration.Initialize();
+            StaticConfiguration.Start();
+
+            FakeDhcpServer fakeDhcpServer = new FakeDhcpServer();
+            DebugAdapter adapter = new DebugAdapter(fakeDhcpServer);
+            Console.WriteLine("Created Debug Adapter {0}",
+                              adapter.HardwareAddress);
+            Core.Instance().RegisterAdapter(adapter, 64);
+
+            DhcpClient dc = new DhcpClient(adapter);
+            dc.Start();
+
+            while (fakeDhcpServer.State == FakeDhcpServer.ServerState.Running)
+            {
+                Thread.Sleep(TimeSpan.FromSeconds(1));
+            }
+            dc.Stop();
+
+            Console.WriteLine("Removing Adapter.");
+            Core.Instance().DeregisterAdapter(adapter);
+
+            StaticConfiguration.Stop();
+
+            if (fakeDhcpServer.State == FakeDhcpServer.ServerState.Failed)
+            {
+                return 1;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TestTCP.cs b/base/Services/NetStack/Runtime/TestTCP.cs
new file mode 100644
index 0000000..3911845
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TestTCP.cs
@@ -0,0 +1,175 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: TestTCP.cs
+//
+
+using System;
+using System.Threading;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+
+namespace NetStack.Runtime.TestPing
+{
+    public class Receiver
+    {
+        private TcpSession listener;
+
+        private int maxReceivePackets;
+        private int receivedPackets;
+        private Thread worker;
+
+        public Receiver(IPv4   localAddress,
+                        ushort localPort,
+                        int    maxReceivePackets)
+        {
+            Core      c = Core.Instance();
+            TcpModule m = c.GetProtocolByName("TCP") as TcpModule;
+
+            this.maxReceivePackets = maxReceivePackets;
+            this.receivedPackets   = 0;
+
+            this.listener = (TcpSession) m.CreateSession();
+            if (this.listener.Listen(localAddress, localPort) == false)
+            {
+                Console.WriteLine("TcpSession.Listen() failed.");
+            }
+
+            this.worker = new Thread(new ThreadStart(WorkLoop));
+            this.worker.Start();
+        }
+
+        public ThreadState ThreadState { get { return worker.ThreadState; } }
+
+        private void WorkLoop()
+        {
+            TcpSession client = listener.Accept();
+            Console.WriteLine("Accepted Session {0}", client);
+            while (receivedPackets++ != maxReceivePackets)
+            {
+                byte[] recvData = client.ReadData();
+                System.Diagnostics.Debug.Assert(recvData.Length == 4);
+                //
+                // Get Sequence number from payload and assert it is
+                // the expected one.
+                //
+                int v = BitConverter.ToInt32(recvData, 0);
+                v = ByteOrder.BigEndianToHost(v);
+                System.Diagnostics.Debug.Assert(v == receivedPackets);
+
+                Console.WriteLine("Receive {0}", receivedPackets);
+            }
+        }
+    }
+
+    public class Sender
+    {
+        private TcpSession session;
+
+        private int maxSendPackets;
+        private int sentPackets;
+        private Thread worker;
+
+        public Sender(IPv4   localAddress,
+                      ushort localPort,
+                      IPv4   remoteAddress,
+                      ushort remotePort,
+                      int    maxSendPackets)
+        {
+            Core c = Core.Instance();
+            TcpModule m  = c.GetProtocolByName("TCP") as TcpModule;
+
+            this.session = (TcpSession) m.CreateSession();
+            this.session.Connect(localAddress, localPort,
+                                 remoteAddress, remotePort);
+
+            this.maxSendPackets = maxSendPackets;
+            this.sentPackets    = 0;
+
+            this.worker = new Thread(new ThreadStart(WorkLoop));
+            this.worker.Start();
+        }
+
+        public ThreadState ThreadState { get { return worker.ThreadState; } }
+
+        private void WorkLoop()
+        {
+            while (sentPackets++ != maxSendPackets)
+            {
+                int n = ByteOrder.HostToBigEndian(sentPackets);
+                int r = session.WriteData(BitConverter.GetBytes(n));
+                Console.WriteLine("Send {0}", sentPackets);
+            }
+        }
+    }
+
+    public class Test
+    {
+        static void Main()
+        {
+            StaticConfiguration.Initialize();
+            StaticConfiguration.Start();
+
+            LoopbackAdapter loopback = new LoopbackAdapter();
+            Console.WriteLine("Created Loopback Adapter {0}",
+                              loopback.HardwareAddress);
+            Core.Instance().RegisterAdapter(loopback, 64);
+
+            IPModule ip = Core.Instance().GetProtocolByName("IP") as
+                IPModule;
+
+            Console.WriteLine("Binding address to adapter");
+
+            IPv4 ifAddress = IPv4.Parse("192.168.0.100");
+            IPv4 ifNetmask = IPv4.Parse("255.255.255.0");
+            IPv4 gwAddress = IPv4.Parse("192.168.0.1");
+
+            ip.HostConfiguration.Bindings.Add(
+                loopback,
+                new InterfaceIPConfiguration(ifAddress, ifNetmask, gwAddress)
+                );
+
+            const int nInstances = 8;
+            const int maxPackets = 10000;
+            ushort    basePort   = 10000;
+
+            Receiver[] receivers = new Receiver[nInstances];
+            Sender[]   senders   = new Sender[nInstances];
+
+            for (int i = 0; i < nInstances; i++)
+            {
+                ushort rPort = (ushort)(basePort + 2 * i);
+                ushort sPort = (ushort)(basePort + 2 * i + 1);
+                receivers[i] = new Receiver(ifAddress, rPort, maxPackets);
+                senders[i] = new Sender(ifAddress, sPort, ifAddress, rPort,
+                                        maxPackets);
+            }
+
+            bool done = false;
+            while (done == false)
+            {
+                Thread.CurrentThread.Join(TimeSpan.FromSeconds(1));
+                done = true;
+                for (int i = 0; i < nInstances; i++)
+                {
+                    if (receivers[i].ThreadState != ThreadState.Stopped ||
+                        senders[i].ThreadState   != ThreadState.Stopped)
+                    {
+                        done = false;
+                        break;
+                    }
+                }
+            }
+
+            Console.WriteLine("Removing Adapter.");
+            Core.Instance().DeregisterAdapter(loopback);
+
+            StaticConfiguration.Stop();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TestUDP.cs b/base/Services/NetStack/Runtime/TestUDP.cs
new file mode 100644
index 0000000..4cf93ec
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TestUDP.cs
@@ -0,0 +1,170 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity / Netstack
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: TestUDP.cs
+//
+
+using System;
+using System.Threading;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.NetDrivers;
+
+namespace NetStack.Runtime.TestPing
+{
+    public class Receiver
+    {
+        private UdpSession session;
+        private int maxReceivePackets;
+        private int receivedPackets;
+        private Thread worker;
+
+        public Receiver(IPv4   ipAddress,
+                        ushort localPort,
+                        ushort remotePort,
+                        int    maxReceivePackets)
+        {
+            Core c = Core.Instance();
+            UdpModule m  = c.GetProtocolByName("UDP") as UdpModule;
+            this.session = m.CreateBoundSession(ipAddress, localPort,
+                                                ipAddress, remotePort);
+
+            this.session.Blocking  = true;
+            this.maxReceivePackets = maxReceivePackets;
+            this.receivedPackets   = 0;
+
+            this.worker = new Thread(new ThreadStart(WorkLoop));
+            this.worker.Start();
+        }
+
+        public ThreadState ThreadState { get { return worker.ThreadState; } }
+
+        private void WorkLoop()
+        {
+            while (receivedPackets++ != maxReceivePackets)
+            {
+                byte[] recvData = session.ReadData();
+                System.Diagnostics.Debug.Assert(recvData.Length == 4);
+                //
+                // Get Sequence number from payload and assert it is
+                // the expected one.
+                //
+                int v = BitConverter.ToInt32(recvData, 0);
+                v = ByteOrder.BigEndianToHost(v);
+                System.Diagnostics.Debug.Assert(v == receivedPackets);
+
+                if ((receivedPackets % 100) == 0)
+                    Console.WriteLine("Received {0}", receivedPackets);
+            }
+        }
+    }
+
+    public class Sender
+    {
+        private UdpSession session;
+
+        private int maxSendPackets;
+        private int sentPackets;
+        private Thread worker;
+
+        public Sender(IPv4   ipAddress,
+                      ushort localPort,
+                      ushort remotePort,
+                      int    maxSendPackets)
+        {
+            Core c = Core.Instance();
+            UdpModule m  = c.GetProtocolByName("UDP") as UdpModule;
+            this.session = m.CreateBoundSession(ipAddress, localPort,
+                                                ipAddress, remotePort);
+            this.session.Blocking = true;
+
+            this.maxSendPackets = maxSendPackets;
+            this.sentPackets    = 0;
+
+            this.worker = new Thread(new ThreadStart(WorkLoop));
+            this.worker.Start();
+        }
+
+        public ThreadState ThreadState { get { return worker.ThreadState; } }
+
+        private void WorkLoop()
+        {
+            while (sentPackets++ != maxSendPackets)
+            {
+                int n = ByteOrder.HostToBigEndian(sentPackets);
+                int r = session.WriteData(BitConverter.GetBytes(n));
+                //                Console.WriteLine("Send {0}", sentPackets);
+            }
+        }
+    }
+
+    public class Test
+    {
+        static void Main()
+        {
+            StaticConfiguration.Initialize();
+            StaticConfiguration.Start();
+
+            LoopbackAdapter loopback = new LoopbackAdapter();
+            Console.WriteLine("Created Loopback Adapter {0}",
+                              loopback.HardwareAddress);
+            Core.Instance().RegisterAdapter(loopback, 64);
+
+            IPModule ip = Core.Instance().GetProtocolByName("IP") as
+                IPModule;
+
+            Console.WriteLine("Binding address to adapter");
+
+            IPv4 ifAddress = IPv4.Parse("192.168.0.100");
+            IPv4 ifNetmask = IPv4.Parse("255.255.255.0");
+            IPv4 gwAddress = IPv4.Parse("192.168.0.1");
+
+            ip.HostConfiguration.Bindings.Add(
+                loopback,
+                new InterfaceIPConfiguration(ifAddress, ifNetmask, gwAddress)
+                );
+
+
+            const int nInstances = 8;
+            const int maxPackets = 10000;
+            ushort    basePort   = 10000;
+
+            Receiver[] receivers = new Receiver[nInstances];
+            Sender[]   senders   = new Sender[nInstances];
+
+            for (int i = 0; i < nInstances; i++)
+            {
+                ushort rPort = (ushort)(basePort + 2 * i);
+                ushort sPort = (ushort)(basePort + 2 * i + 1);
+                receivers[i] =
+                    new Receiver(ifAddress, rPort, sPort, maxPackets);
+                senders[i] = new Sender(ifAddress, sPort, rPort, maxPackets);
+            }
+
+            bool done = false;
+            while (done == false)
+            {
+                Thread.CurrentThread.Join(TimeSpan.FromSeconds(1));
+                done = true;
+                for (int i = 0; i < nInstances; i++)
+                {
+                    if (receivers[i].ThreadState != ThreadState.Stopped ||
+                        senders[i].ThreadState   != ThreadState.Stopped)
+                    {
+                        done = false;
+                        break;
+                    }
+                }
+            }
+
+            Console.WriteLine("Removing Adapter.");
+            Core.Instance().DeregisterAdapter(loopback);
+
+            StaticConfiguration.Stop();
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/TimeOut.cs b/base/Services/NetStack/Runtime/TimeOut.cs
new file mode 100644
index 0000000..4fdbe2f
--- /dev/null
+++ b/base/Services/NetStack/Runtime/TimeOut.cs
@@ -0,0 +1,60 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+namespace NetStack
+{
+    namespace Runtime 
+    {               
+        // A timeout context declaration.
+        // A module creates a context for a timeout event
+        // and pass it to the runtime upon request.
+        public class TimeOutContext 
+        {
+            // the timeout value
+            protected uint timeValue;
+
+            // the timeout handler
+            protected TimeOutHandler handler;
+
+            // module specific context
+            protected object context;
+
+            // the handler declaration
+            public delegate NetStatus TimeOutHandler();
+
+            // ctor
+            public TimeOutContext(uint time,TimeOutHandler tHandler,object ctx)
+            {
+                timeValue=time;
+                handler=tHandler;
+                context=ctx;
+            }
+
+            // properties
+            public TimeOutHandler Handler
+            {
+                get {return handler;} set {handler=value;}
+            }
+
+            public uint TimeOutValue
+            {
+                get {return timeValue;} set {timeValue=value;}
+            }
+
+            public object Context
+            {
+                get {return context;} set {context=value;}
+            }
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/Timers.cs b/base/Services/NetStack/Runtime/Timers.cs
new file mode 100644
index 0000000..ed4577a
--- /dev/null
+++ b/base/Services/NetStack/Runtime/Timers.cs
@@ -0,0 +1,191 @@
+// ==++==
+//
+//   Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ==--==
+
+using System;
+
+namespace RJBlack
+{
+    public class Timer : IComparable
+    {
+        // Fundamental field is the time
+        private ulong _time;
+        public ulong time
+        {
+            get { return _time; }
+            set // Only if not in a wheel
+            {
+#if SINGULARITY
+                if (this.wheel != null)
+                    throw new System.Exception("Field Access");
+#else
+                if (this.wheel != null)
+                    throw new FieldAccessException();
+#endif // SINGULARITY
+                _time = value;
+            }
+        }
+        // Methods
+        public Timer(ulong time)
+        {
+            this._time = time;
+        }
+        public int CompareTo(object obj)
+        {
+            Timer a = this;
+            Timer b = obj as Timer;
+            if (b == null) return 1;
+            return a.time.CompareTo(b.time);
+        }
+
+        // Stuff for usage of a TimerWheel
+        // followed by the TimerWheel itself
+        private TimerWheel wheel;
+        private Timer next;
+        private Timer prev;
+
+        public class TimerWheel
+        {
+            // The state we need to implement the wheel
+            private readonly ulong resolution;
+            private readonly uint clicks;
+            private readonly Timer[] wheel;
+            private uint numtimers = 0;
+            private ulong now;
+
+            public int Count
+            {
+                get { return (int)numtimers; }
+            }
+
+            public ulong Now
+            {
+                get { return now; }
+            }
+
+            public void Add(Timer! t)
+            {
+                if ((t.time < this.now) || (t.wheel != null))
+                    throw new ArgumentException();
+
+                uint click = (uint)((t.time / resolution) % clicks);
+
+                Timer prev = null;
+                Timer here = wheel[click];
+                while (here != null && here.time < t.time)
+                {
+                    prev = here;
+                    here = here.next;
+                }
+
+                t.next = here;
+                t.prev = prev;
+                if (prev != null) prev.next = t; else wheel[click] = t;
+                if (here != null) here.prev = t;
+
+                t.wheel = this;
+                numtimers++;
+            }
+
+            public bool Remove(Timer! t)
+            {
+                if (t.wheel != this)
+                    return false;
+
+                uint click = (uint)((t.time / resolution) % clicks);
+
+                if (wheel[click] == t)
+                {
+                    wheel[click] = t.next;
+                    if (t.next!=null)
+                        t.next.prev = null;
+                }
+                else
+                {
+
+                    t.prev.next = t.next;
+                    if (t.next!=null)
+                        t.next.prev = t.prev;
+                }
+
+                t.next = t.prev = null;
+                t.wheel = null;
+                numtimers--;
+                return true;
+            }
+
+            public Timer GetSoonest()
+            {
+                if (numtimers == 0) {
+                    return null;
+                }
+
+                uint click = (uint)((now / resolution) % clicks);
+                // If we find anything less than bound then it IS the lowest
+                ulong bound = now - now%resolution + resolution*clicks;
+                Timer lowest = null;
+                uint i = click;
+
+                do
+                {
+                    Timer wi = wheel[i];
+
+                    if (wi != null) {
+                        if (wi.time < bound) {
+                            return wi;
+                        }
+                        else if (lowest == null) {
+                            lowest = wi;
+                        }
+                        else if (lowest.time > wi.time) {
+                            lowest = wi;
+                        }
+                    }
+
+                    i = (i+1) % clicks;
+
+                } while(i != click);
+
+                return lowest;
+            }
+
+            public Timer Advance()
+            {
+                Timer t = GetSoonest();
+                if (t != null)
+                {
+                    Remove(t);
+                    now = t.time;
+                }
+                return t;
+            }
+            /// <summary>
+            /// Either advance to time, or return the first event before then
+            /// </summary>
+            public Timer Advance(ulong time)
+            {
+                Timer t = GetSoonest();
+                if ((t == null) || (time < t.time))
+                {
+                    now = time;
+                    return null;
+                }
+
+                Remove(t);
+                now = t.time;
+                return t;
+            }
+
+            public TimerWheel(ulong resolution, uint clicks, ulong now)
+            {
+                this.wheel = new Timer[clicks];
+                this.resolution = resolution;
+                this.clicks = clicks;
+                this.now = now;
+            }
+        } // TimerWheel
+    } // Timer
+}
+// End
diff --git a/base/Services/NetStack/Runtime/UDPModule.cs b/base/Services/NetStack/Runtime/UDPModule.cs
new file mode 100644
index 0000000..035231c
--- /dev/null
+++ b/base/Services/NetStack/Runtime/UDPModule.cs
@@ -0,0 +1,181 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Netstack / Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpModule.cs
+//
+//  Note:
+//
+
+// #define DEBUG_UDP
+
+using NetStack.Common;
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+#if SINGULARITY
+using Microsoft.Singularity;
+#else
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Protocols;
+
+namespace NetStack.Runtime
+{
+    public class UdpModule : IProtocol
+    {
+        protected IProtocol ip;
+
+        public UdpModule()
+        {
+        }
+
+        // INetModule interfaces
+        // ---------------------
+        string INetModule.ModuleName        { get { return "UDP"; } }
+        ushort INetModule.ModuleVersion     { get { return 0x01; } }    // 0.1
+
+        private bool started = false;
+        public bool StartModule()
+        {
+            Debug.Assert(started == false);
+            started = true;
+            ip = Core.Instance().GetProtocolByName("IP");
+            return ip != null;
+        }
+
+        public bool StopModule()
+        {
+            return true;
+        }
+
+        public bool DestroyModule()
+        {
+            return true;
+        }
+
+        public bool Initialize(ProtocolParams parameters)
+        {
+            Core.Instance().RegisterProtocol(this);
+            return true;
+        }
+
+        public ushort GetProtocolID()
+        {
+            return (ushort)IPFormat.Protocol.UDP;
+        }
+
+        public Session CreateSession()
+        {
+            UdpSession s = new UdpSession(this);
+            Core.Instance().RegisterSession(this, s);
+            return s;
+        }
+
+        public UdpSession CreateUnboundSession()
+        {
+            UdpSession s = new UdpSession(this);
+            Core.Instance().RegisterSession(this, s);
+            return s;
+        }
+
+        public UdpSession! CreateBoundSession(IPv4   localAddress,
+                                              ushort localPort,
+                                              IPv4   remoteAddress,
+                                              ushort remotePort)
+        {
+            UdpSession s = new UdpSession(this);
+            Core.Instance().RegisterSession(this, s);
+            s.BindEndPoints(localAddress, localPort,
+                            remoteAddress, remotePort);
+            return s;
+        }
+
+        [ Conditional("DEBUG_UDP") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log(format, args);
+        }
+
+        public NetStatus OnProtocolReceive(NetPacket! packet)
+        {
+            DebugPrint("Received UDP packet!\n");
+
+            UdpFormat.UdpHeader udpHeader = new UdpFormat.UdpHeader();
+            if (UdpFormat.ReadUdpHeader(packet, out udpHeader) == false)
+            {
+                DebugPrint("UDP session received unreadable packet.\n");
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            IPFormat.IPHeader! ipHeader = (IPFormat.IPHeader!) packet.OverlapContext;
+            if (udpHeader.checksum != 0 &&
+                UdpFormat.IsChecksumValid(ipHeader,udpHeader, packet) == false)
+            {
+                DebugPrint("UDP checksum failed.  NO cigar and NO packet!");
+                return NetStatus.Code.PROTOCOL_DROP_CHKSUM;
+            }
+
+            packet.OverlapContext = ipHeader;
+
+            ArrayList udpSessions = Core.Instance().GetSessions(this);
+            if (udpSessions == null) {
+                DebugPrint("No UDP Sessions\n");
+                return NetStatus.Code.PROTOCOL_DROP_ERROR;
+            }
+
+            DebugPrint("Packet : Source {0}:{1} Destination {2}:{3}\n",
+                       ipHeader.Source, udpHeader.srcPort,
+                       ipHeader.Destination, udpHeader.dstPort);
+
+            lock (udpSessions.SyncRoot) {
+                foreach (UdpSession! u in udpSessions) {
+                    DebugPrint("Session : Source {0}:{1} Destination {2}:{3}\n",
+                               u.RemoteAddress, u.RemotePort,
+                               u.LocalAddress, u.LocalPort);
+
+                    // Match conditions
+                    //
+                    // Bound remote port is zero (not-specified)
+                    // or matches exactly Bound remote IP is Any
+                    // (not-specified) or matches exactly
+                    if ((u.RemoteAddress == IPv4.Any ||
+                         u.RemoteAddress == ipHeader.Source)     &&
+                        (u.RemotePort == 0           ||
+                         u.RemotePort == udpHeader.srcPort)      &&
+                        (u.LocalAddress == IPv4.Any  ||
+                         u.LocalAddress == ipHeader.Destination) &&
+                        (u.LocalPort == udpHeader.dstPort))
+                    {
+                        DebugPrint("Delivered to UDP session\n");
+                        return u.OnReceive(this, packet, udpHeader);
+                    }
+                }
+            }
+
+            return NetStatus.Code.PROTOCOL_DROP_ERROR;
+        }
+
+        public NetStatus OnProtocolSend(NetPacket! pkt)
+        {
+            return ip.OnProtocolSend(pkt);
+        }
+
+        public NetStatus SetProtocolSpecific(ushort opcode, byte[]! data)
+        {
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public NetStatus GetProtocolSpecific(ushort opcode, out byte[] data)
+        {
+            data = null;
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/UDPSession.cs b/base/Services/NetStack/Runtime/UDPSession.cs
new file mode 100644
index 0000000..831e266
--- /dev/null
+++ b/base/Services/NetStack/Runtime/UDPSession.cs
@@ -0,0 +1,266 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Netstack / Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpModule.cs
+//
+//  Note:   This is a port of the existing code TCP Session code to a UDP
+//          Session.
+//
+
+// #define DEBUG_UDP
+
+using NetStack.Common;
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+#if SINGULARITY
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+#else
+using System.Net;
+#endif
+
+using System.Net.IP;
+using Drivers.Net;
+
+namespace NetStack.Runtime
+{
+    using Protocols;
+
+    public class UdpSession : Session
+    {
+        // the session's transmit q size (num of packets)
+        public const int TxQueueSize = 100;
+
+        // the session's receive queue size (num of packets)
+        public const int RxQueueSize = 100;
+
+        protected bool blocking = true;   // Blocking / Non-Blocking
+        private   bool closed   = false;
+
+        public UdpSession(IProtocol! p) : base (p, TxQueueSize, RxQueueSize)
+        {
+        }
+
+        ~UdpSession()
+        {
+        }
+
+        [ Conditional("DEBUG_UDP") ]
+        private static void DebugPrint(string format, params object [] args)
+        {
+            Core.Log(format, args);
+        }
+
+        public bool BindLocalEndPoint(IPv4 address, ushort port)
+        {
+            return SetLocalEndPoint(address, port);
+        }
+
+        public void BindRemoteEndPoint(IPv4 address, ushort port)
+        {
+            SetRemoteEndPoint(address, port);
+        }
+
+        public void BindEndPoints(IPv4   newLocalAddress,
+                                  ushort newLocalPort,
+                                  IPv4   remoteAddress,
+                                  ushort remotePort)
+        {
+            BindRemoteEndPoint(remoteAddress, remotePort);
+            if (BindLocalEndPoint(newLocalAddress, newLocalPort) == true)
+            {
+                String msg = String.Format("Successful bind to {0} (bound to {1})\n",
+                           newLocalPort, LocalPort);
+                Tracing.Log(Tracing.Debug,msg);
+            }
+            else
+            {
+                String msg = String.Format("Failed to bind to {0} (bound to {1})\n",
+                           newLocalPort, LocalPort);
+                Tracing.Log(Tracing.Debug,msg);
+            }
+        }
+
+        override internal NetStatus OnReceive(object     sender,
+                                              NetPacket! packet,
+                                              object     context)
+        {
+            if (this.PutPacket(this.inQueue, packet, false) == true)
+            {
+                // Packet is queued for user.  Needs to be held onto.
+                return NetStatus.Code.PROTOCOL_PROCESSING;
+            }
+            return NetStatus.Code.PROTOCOL_OK;
+        }
+
+        public bool Blocking
+        {
+            get { return blocking; }
+            set { blocking = value; }
+        }
+
+        override public byte[] ReadCopyData()
+        {
+            if (!IsSessionValidForUserRead()) {
+                DebugPrint("ReadData on closed UDP session");
+                return null;
+            }
+
+            NetPacket netPacket = DequeuePacket(inQueue,
+                                                blocking ? -1 /* forever */: 0 /* don't sleep */);
+            if (netPacket != null) {
+                byte [] userData = netPacket.ToUser();
+                Core.Instance().TheDemux.TakeFreePacket(netPacket);
+                return userData;
+            }
+
+            return null;
+        }
+
+        override public int WriteData(byte[]! data)
+        {
+            if (this.RemoteAddress == IPv4.Any || this.RemotePort == 0)
+            {
+                Core.Log("Attempting to send UDP data to an invalid endpoint: "
+                    + "{0}/{1}\n", this.RemoteAddress, this.RemotePort);
+                String msg = String.Format("Attempting to send UDP data to an invalid endpoint: {0}/{1}\n", this.RemoteAddress, this.RemotePort);
+                Tracing.Log(Tracing.Debug,msg);
+
+                // Log sending to incomplete endpoint
+                return 0;
+            }
+            return WriteDataTo(this.RemoteAddress, this.RemotePort, data);
+        }
+
+        public int WriteDataTo(IPv4    remoteAddress,
+                               ushort  remotePort,
+                               byte[]! data)
+        {
+            if (!IsSessionValidForUserWrite())
+            {
+                DebugPrint("WriteDataTo on closed UDP session");
+                return -1;
+            }
+
+            int headerSize = EthernetFormat.Size + IPFormat.Size + UdpFormat.Size;
+            byte[] packet = new byte [headerSize + data.Length];
+            int ipStart = EthernetFormat.Size;
+
+            if (this.LocalAddress == IPv4.Any)
+                this.SetLocalEndPoint(this.LocalAddress, this.LocalPort);
+
+            UdpFormat.WriteUdpPacket(packet, ipStart,
+                                     this.LocalAddress, this.LocalPort,
+                                     remoteAddress, remotePort,
+                                     data, 0, data.Length);
+
+            NetPacket netPacket = new NetPacket(packet);
+            if (base.PutPacket(outQueue, netPacket, blocking) == false)
+            {
+                Core.Log("Failed to enqueue packet for {0}/{1}",
+                    remoteAddress, remotePort);
+                String msg = String.Format ("Failed to enqueue packet for {0}/{1}",
+                    remoteAddress, remotePort);
+                Tracing.Log(Tracing.Debug,msg);
+                return 0;
+            }
+
+            return data.Length;
+        }
+
+        public int WriteDataTo(IPv4    remoteAddress,
+                               ushort  remotePort,
+                               byte[]! in ExHeap data)
+        {
+            if (!IsSessionValidForUserWrite()) {
+                DebugPrint("WriteDataTo on closed UDP session");
+                return -1;
+            }
+
+            int headerSize = EthernetFormat.Size + IPFormat.Size + UdpFormat.Size;
+            int dataLength = Math.Min(1514 - headerSize, data.Length);
+            byte[] packet = new byte [headerSize + dataLength];
+            int ipStart = EthernetFormat.Size;
+
+            if (this.LocalAddress == IPv4.Any) {
+                this.SetLocalEndPoint(this.LocalAddress, this.LocalPort);
+            }
+
+            UdpFormat.WriteUdpPacket(packet, ipStart,
+                                     this.LocalAddress, this.LocalPort,
+                                     remoteAddress, remotePort,
+                                     data, 0, dataLength);
+
+            NetPacket netPacket = new NetPacket(packet);
+            if (base.PutPacket(outQueue, netPacket, blocking) == false) {
+                Core.Log("Failed to enqueue packet for {0}/{1}",
+                    remoteAddress, remotePort);
+                String msg = String.Format ("Failed to enqueue packet for {0}/{1}",
+                    remoteAddress, remotePort);
+                Tracing.Log(Tracing.Debug,msg);
+                return 0;
+            }
+
+            return dataLength;
+        }
+
+        public int WriteData(byte[]! in ExHeap buffer)
+        {
+            if (this.RemoteAddress == IPv4.Any || this.RemotePort == 0) {
+                Core.Log("Attempting to send UDP data to an invalid endpoint: "
+                    + "{0}/{1}\n", this.RemoteAddress, this.RemotePort);
+                String msg = String.Format("Attempting to send UDP data to an invalid endpoint: {0}/{1}\n", this.RemoteAddress, this.RemotePort);
+                Tracing.Log(Tracing.Debug,msg);
+
+                // Log sending to incomplete endpoint
+                return 0;
+            }
+            return WriteDataTo(this.RemoteAddress, this.RemotePort, buffer);
+        }
+
+        public bool WritePacket(NetPacket! netPacket)
+        {
+            if (!IsSessionValidForUserWrite()) {
+                DebugStub.Break();
+                return false;
+            }
+            return base.PutPacket(outQueue, netPacket, blocking);
+        }
+
+        public override bool Close()
+        {
+            if (closed == false)
+            {
+                DebugPrint("Closing Session");
+                this.Dispose();
+                closed = true;
+            }
+            return closed;
+        }
+
+        public bool PollSelectRead(int timeoutMillis)
+        {
+            return PollQueueNotEmpty(this.inQueue, timeoutMillis);
+        }
+
+        public bool PollSelectWrite(int timeoutMillis)
+        {
+            return PollQueueNotFull(this.outQueue, timeoutMillis);
+        }
+
+        internal override bool IsSessionValidForUserRead()
+        {
+            return !closed;
+        }
+
+        internal override bool IsSessionValidForUserWrite()
+        {
+            return !closed;
+        }
+    }
+}
diff --git a/base/Services/NetStack/Runtime/XmlConfiguration.cs b/base/Services/NetStack/Runtime/XmlConfiguration.cs
new file mode 100644
index 0000000..3d1aab6
--- /dev/null
+++ b/base/Services/NetStack/Runtime/XmlConfiguration.cs
@@ -0,0 +1,292 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Microsoft Research, Cambridge
+ * author: Yaron Weinsberg, Richard Black
+ */
+
+using NetStack.Common;
+using System;
+using System.Net;
+using System.Text;
+using System.Reflection;
+
+using System.Net.IP;
+using Drivers.Net;
+using NetStack.Configuration;
+using NetStack.Protocols;
+using NetStack.NetDrivers;
+
+namespace NetStack.Runtime
+{
+    /// <summary>
+    /// Parses XML configuration file and instantiates runtime components.
+    /// </summary>
+    public class XmlConfiguration
+    {
+        string configFile;
+
+        // the driver's path (for dynamic loading)
+        protected string driversPath;
+
+        // the protocols' path (for dynamic loading)
+        // where the actual module reside
+        protected string protocolsPath;
+
+        public XmlConfiguration(string configFile)
+        {
+            this.configFile = configFile;
+            if (System.IO.File.Exists(configFile) == false)
+            {
+                Core.Panic("Can't locate configuration file, Exit!");
+            }
+        }
+
+        public XmlConfiguration()
+        {
+            // check if the file exists...
+            // 1. check for <appName>.xml
+            // 2. then for config.xml locally
+            string appFullPath = AppDomain.CurrentDomain.BaseDirectory +
+                AppDomain.CurrentDomain.FriendlyName;
+            string configFile1 = AppDomain.CurrentDomain.BaseDirectory + @"config.xml";
+            string configFile2 = appFullPath.Substring(0,appFullPath.Length-4) + @".xml";
+            if (System.IO.File.Exists(configFile1))
+            {
+                configFile = configFile1;
+            }
+            else if (System.IO.File.Exists(configFile2))
+            {
+                configFile = configFile2;
+            }
+            else
+            {
+                Core.Panic("Can't locate configuration file, Exit!");
+            }
+        }
+
+        // loads an adapter's driver and add the relevant data structures
+        // for managing it.
+        protected bool LoadAdapter(ProtocolParams args, string driversPath)
+        {
+            // the user can ignore an adapter
+            // so ignore it...
+            string ignore = args["ignore"];
+            if (ignore != null && ignore == "true")
+                return true;
+
+            string name =
+                ProtocolParams.LookupString(args, "name", "unknown");
+            string typeName =
+                ProtocolParams.LookupString(args, "type", "unknown");
+            string id =
+                ProtocolParams.LookupString(args, "id", "unknown");
+
+            int mtu     = ProtocolParams.LookupInt32(args, "mtu",
+                                                     EthernetFormat.MaxFrameSize);
+            int txRing  = ProtocolParams.LookupInt32(args, "txRing", 64);
+            int rxRing  = ProtocolParams.LookupInt32(args, "rxRing", 64);
+            int fwQueue = ProtocolParams.LookupInt32(args, "fwQueue", 64);
+
+            IAdapterFactory factory = null;
+            IAdapter        adapter = null;
+            try {
+                string factoryTypeName = typeName + "Factory";
+                Assembly assembly = Assembly.LoadFrom(driversPath);
+                Type[] types      = assembly.GetTypes();
+                foreach (Type t in types)
+                {
+                    if (t.IsClass && t.Name.Equals(typeName))
+                    {
+                        factory = (IAdapterFactory)Activator.CreateInstance(t, null);
+                        break;
+                    }
+                    if (factory == null)
+                        throw new Exception("Can't find Adapter's Factory.");
+
+                    adapter = factory.CreateAdapter(name, id, txRing, rxRing);
+                    Core.Instance().RegisterAdapter(adapter, fwQueue);
+                }
+            }
+            catch (Exception e)
+            {
+                adapter = null;
+                Console.Out.WriteLine(e.Message);
+                Environment.Exit(1);
+            }
+
+            IPModule ipModule = Core.Instance().GetProtocolByName("IP") as IPModule;
+            HostConfiguration hostConfig = ipModule.HostConfiguration;
+            for (int i = 0; ; i++)
+            {
+                string ipTag      = String.Format("ip{0}", i);
+                string maskTag    = String.Format("mask{0}", i);
+                string gatewayTag = String.Format("gateway{0}", i);
+
+                // XXX No point-to-point support here.
+                IPv4 address = ProtocolParams.LookupIPv4(args, ipTag,
+                                                         IPv4.AllOnes);
+                IPv4 netmask = ProtocolParams.LookupIPv4(args, maskTag,
+                                                         IPv4.AllOnes);
+                IPv4 gateway = ProtocolParams.LookupIPv4(args, gatewayTag,
+                                                         IPv4.Zero);
+                if (address == IPv4.AllOnes || netmask == IPv4.AllOnes)
+                {
+                    break;
+                }
+                hostConfig.Bindings.Add(adapter,
+                    new InterfaceIPConfiguration(address, netmask, gateway, 128)
+                    );
+            }
+
+#if DEBUG
+            System.Console.Out.WriteLine("[Interface {0}]", args["name"]);
+            System.Console.Out.WriteLine("-----------------------------");
+#endif
+            return true;
+        }
+
+
+        // This method dynamically loads a protocol and
+        // initializes it.
+        protected bool LoadProtocolModule(ProtocolParams args)
+        {
+            // the user can mark a protocol ignore field so
+            // we just ignore it...
+            string ignore = args["ignore"];
+            if (ignore != null && ignore == "true")
+                return true;
+#if DEBUG
+            System.Console.Out.WriteLine("[Protocol {0}]", args["name"]);
+            foreach (string s in args.Keys)
+                System.Console.Out.WriteLine("{0}={1}",s,args[s]);
+            System.Console.Out.WriteLine("-----------------------------");
+#endif
+            // dynamic load the protocol
+            // by default it is in the Runtime assembly
+            string protocolType = args["type"];
+
+            try
+            {
+                IProtocol protocol = (IProtocol)Activator.CreateInstance(Type.GetType(protocolType));
+
+                if (protocol == null)
+                    throw new Exception("Can't find Protocol's Class.");
+
+                // initialize the protocol
+                protocol.Initialize(args);
+            }
+            catch (Exception e)
+            {
+                Console.Out.WriteLine(String.Format("Can't load protocol class: {0}",protocolType));
+                Console.Out.WriteLine(e.Message);
+                return false;
+            }
+            return true;
+        }
+
+        // parse the configuration file return the root or
+        // null if error.
+        protected ConfigElement ParseConfiguration(bool toPrint)
+        {
+            ConfigElement root = null;
+            root = ConfigFileParser.parseFile(configFile);
+            if (root!=null && toPrint)
+            {
+                System.Text.StringBuilder tree = new System.Text.StringBuilder();
+                ConfigFileParser.printConfigurationTree(root,tree,0);
+                System.Console.WriteLine(tree);
+            }
+            return root;
+        }
+
+        //handle host config
+        protected void HandleConfiguration()
+        {
+            Core core = Core.Instance();
+
+            // the path of the driver assembly
+            ConfigElement config = ParseConfiguration(false);
+
+            // we start with the configuration tag...
+            // we assume that the XML is valid!
+
+            // if we have children, and we have...
+            if (config.ChildElements.Count > 0)
+            {
+                foreach(ConfigElement element in config.ChildElements)
+                {
+                    switch (element.TagName)
+                    {
+                        case "creator":
+                            break;
+                        case "date":
+                            break;
+                        case "hostname":
+                            break;
+                        case "forwarding":
+                            break;
+                        case "OutQHandlerTimeout":
+                            core.SetOutQueueHandlerInterval(Convert.ToInt32(element.Text,10));
+                            break;
+                        case "protocol-path":
+                            protocolsPath = element.Text;
+                            break;
+                        case "drivers-path":
+                            driversPath = element.Text;
+                            break;
+                        case "backlog-size":
+                            int freeListSize = Convert.ToInt32(element.Text,10);
+                            core.ProvisionDemux(
+                                freeListSize,
+                                EthernetFormat.MaxFrameSize
+                                );
+                            break;
+                        case "protocols":
+                            // handle the protocols
+                            // use a generic scheme and apply
+                            // it to the adapters in the future ;-)
+
+                            // the args include the name and type!
+                            ProtocolParams args = new ProtocolParams();;
+                            foreach(ConfigElement prot in element.ChildElements)
+                            {
+                                args.Clear();
+                                foreach (string attr in prot.Attributes.Keys)
+                                    args.Add(attr,prot.Attribute(attr));
+                                foreach (ConfigElement protInfo in prot.ChildElements)
+                                    args.Add(protInfo.TagName,protInfo.Text);
+                                // done with one...
+                                if (!LoadProtocolModule(args))
+                                    Core.Panic("Error while loading Protocol");
+                            }
+                            break;
+                        case "adapters":
+                            // handle the adapters
+                            ProtocolParams adArgs = new ProtocolParams();;
+                            foreach(ConfigElement ad in element.ChildElements)
+                            {
+                                adArgs.Clear();
+                                foreach (string attr in ad.Attributes.Keys)
+                                    adArgs.Add(attr,ad.Attribute(attr));
+                                foreach (ConfigElement adInfo in ad.ChildElements)
+                                    adArgs.Add(adInfo.TagName,adInfo.Text);
+                                // done with one...
+                                if (!LoadAdapter(adArgs,driversPath))
+                                    Core.Panic("Error while loading an Adapter");
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+
+        public string ConfigurationFilename { get { return configFile; } }
+    }
+} // NetStack.Runtime
diff --git a/base/Services/ServiceManager/Acceptor.sg b/base/Services/ServiceManager/Acceptor.sg
new file mode 100644
index 0000000..6394de7
--- /dev/null
+++ b/base/Services/ServiceManager/Acceptor.sg
@@ -0,0 +1,238 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\Acceptor.sg
+//
+//  Note:   Service Manager Front-End
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    /// <summary>
+    /// Acceptor is a Service Manager front end.  It receives a client's
+    /// connection request, accepts and then binds it to a worker thread
+    /// called ServiceController.
+    /// </summary>
+    internal class Acceptor
+    {
+        private Thread  serviceThread;
+        private string  servicePath;
+        private IList   controllers;
+        private Object  controllersLock;
+
+        private TRef<ThreadTerminationContract.Imp:Start>   leaderTRef;
+        private TRef<ThreadTerminationContract.Exp:Start>   terminalTRef;
+        private TRef<ServiceProviderContract.Exp:Start>     providerTRef;
+
+        internal Acceptor(string! path)
+        {
+            this.servicePath = path;
+            this.controllers = new ArrayList();
+            this.controllersLock = new Object();
+        }
+
+        ~Acceptor()
+        {
+            // Unless Stop is invoked in advance.
+            if (serviceThread != null) {
+                Stop();
+            }
+            delete providerTRef.Acquire();
+        }
+
+        internal void Start()
+        {
+            if (servicePath == null || servicePath == String.Empty) {
+                throw new Exception("Service is not specified.");
+            }
+
+            RegisterToNameService();
+
+            // Initialize the inter-thread channel
+            ThreadTerminationContract.Imp! leader;
+            ThreadTerminationContract.Exp! terminal;
+            ThreadTerminationContract.NewChannel(out leader, out terminal);
+            leaderTRef = new TRef<ThreadTerminationContract.Imp:Start>(leader);
+            terminalTRef = new TRef<ThreadTerminationContract.Exp:Start>(terminal);
+            if (serviceThread == null) {
+                serviceThread = new Thread(new ThreadStart(Run));
+                serviceThread.Start();
+                DebugStub.Print("Acceptor: {0}\n",
+                                __arglist(serviceThread.ToString()));
+            }
+        }
+
+        internal void Stop()
+        {
+            ThreadTerminationContract.Imp:Start! leader;
+            leader = leaderTRef.Acquire();
+            leader.SendStop();
+            delete leader;
+            serviceThread.Join();
+            serviceThread = null;
+        }
+
+        /// <summary>
+        /// Service main loop.  Deals with client connection requests.
+        /// </summary>
+        private void Run()
+        {
+            ServiceProviderContract.Exp:Start!      provider;
+            ThreadTerminationContract.Exp:Start!    terminal;
+
+            provider = providerTRef.Acquire();
+            terminal = terminalTRef.Acquire();
+
+            for (;;) {
+                ServiceManagementContract.Exp:Start user;
+
+                switch receive {
+                    case provider.RecvConnect(serverEp):
+                        if (serverEp == null) {
+                            continue;
+                        }
+                        user = serverEp as ServiceManagementContract.Exp:Start;
+                        if (user == null) {
+                            provider.SendNackConnect(serverEp);
+                            continue;
+                        }
+                        else {
+                            Thread th = new Thread(new ThreadStart(NewController(user).Run));
+                            th.Start();
+                            provider.SendAckConnect();
+                        }
+                        DebugStub.Print("Acceptor: Client connected.\n");
+
+                        break;
+                    case provider.ChannelClosed():
+                        Clear();
+                        goto exit;
+                        break;
+                    case terminal.Stop():
+                        Clear();
+                        goto exit;
+                        break;
+                    case terminal.ChannelClosed():
+                        Clear();
+                        goto exit;
+                        break;
+                }
+            }
+exit:
+            delete terminal;
+            DeregisterFromNameService();
+            delete provider;
+        }
+
+        /// <summary>
+        /// Register ServiceControlContract to the name service.
+        /// </summary>
+        protected void RegisterToNameService()
+        {
+            bool success;
+            DirectoryServiceContract.Imp rootNS;
+            ServiceProviderContract.Imp! providerClient;
+            ServiceProviderContract.Exp! providerServer;
+
+            ServiceProviderContract.NewChannel(out providerClient,
+                                               out providerServer);
+
+            // SMS is a client of NS.
+            rootNS = DirectoryService.NewClientEndpoint();
+            rootNS.SendRegister(Bitter.FromString2(servicePath),
+                                providerClient);
+            switch receive {
+                case rootNS.RecvAckRegister():
+                    success = true;
+                    break;
+                case rootNS.RecvNakRegister(rejected, error):
+                    delete rejected;
+                    success = false;
+                    break;
+                case rootNS.ChannelClosed():
+                    success = false;
+                    break;
+            }
+            delete rootNS;
+
+            if (success == false) {
+                delete providerServer;
+                DebugStub.Break();
+                throw new Exception("Name registration failed.");
+            }
+
+            providerTRef = new TRef<ServiceProviderContract.Exp:Start>(providerServer);
+            DebugStub.WriteLine("SMS: NS Registered.");
+        }
+
+        protected void DeregisterFromNameService()
+        {
+            DirectoryServiceContract.Imp rootNS;
+
+            rootNS = DirectoryService.NewClientEndpoint();
+            rootNS.SendDeregister(Bitter.FromString2(servicePath));
+            switch receive {
+                case rootNS.AckDeregister(providerClient):
+                    delete providerClient;
+                    break;
+                case rootNS.NakDeregister(error):
+                    DebugStub.Print("SMS: Deregister failed.\n");
+                    break;
+                case rootNS.ChannelClosed():
+                    break;
+            }
+            delete rootNS;
+        }
+
+        /// <summary>
+        /// Create a new ServiceController object.
+        /// </summary>
+        private ServiceController! NewController([Claims]ServiceManagementContract.Exp:Start! ep)
+        {
+            ServiceController worker;
+           
+            worker = new ServiceController(this, ep);
+            lock (controllersLock) {
+                controllers.Add(worker);
+            }
+            return worker;
+        }
+
+        /// <summary>
+        /// Removes the worker from the list when Reception is terminated.
+        /// </summary>
+        internal void ReleaseController(ServiceController worker)
+        {
+            lock (controllersLock) {
+                controllers.Remove(worker);
+            }
+        }
+ 
+        private void Clear()
+        {
+            lock (controllersLock) {
+                // Stops all the workers
+                foreach (ServiceController worker in controllers) {
+                    if (worker == null) {
+                        continue;
+                    }
+                    worker.Stop();
+                }
+                controllers.Clear();
+                controllers = null;
+            }
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/AccessControlException.cs b/base/Services/ServiceManager/AccessControlException.cs
new file mode 100644
index 0000000..74a4806
--- /dev/null
+++ b/base/Services/ServiceManager/AccessControlException.cs
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\AccessControlException.cs
+//
+//  Note:   Exception for service access control
+//
+using System;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    public class AccessControlException : Exception
+    {
+    }
+}
diff --git a/base/Services/ServiceManager/DefaultService.sg b/base/Services/ServiceManager/DefaultService.sg
new file mode 100644
index 0000000..7e4299e
--- /dev/null
+++ b/base/Services/ServiceManager/DefaultService.sg
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\DefaultService.sg
+//
+//  Note:   
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    internal class DefaultService : Service
+    {
+        // protected readonly string! name;
+        // protected Process process;
+        // protected TRef<ManagedServiceContract.Imp:Ready> endpoint;
+
+        internal DefaultService(string! serviceName,
+                                string! binaryName,
+                                [Claims]DirectoryServiceContract.Imp:Ready! ds)
+        {
+            base(serviceName, binaryName, ServiceType.Default, ds);
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/DefaultServiceCreator.sg b/base/Services/ServiceManager/DefaultServiceCreator.sg
new file mode 100644
index 0000000..0598b7e
--- /dev/null
+++ b/base/Services/ServiceManager/DefaultServiceCreator.sg
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\DefaultServiceCreator.sg
+//
+//  Note:   
+//
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    internal class DefaultServiceCreator : IServiceProduceable
+    {
+        public Service NewService(string! serviceName, string! binaryName)
+        {
+            return new DefaultService(serviceName, binaryName,
+                                      DirectoryService.NewClientEndpoint());
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/IServiceProduceable.sg b/base/Services/ServiceManager/IServiceProduceable.sg
new file mode 100644
index 0000000..ac6f12d
--- /dev/null
+++ b/base/Services/ServiceManager/IServiceProduceable.sg
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\IServiceProduceable.sg
+//
+//  Note:   
+//
+using System;
+using Microsoft.Singularity;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    interface IServiceProduceable
+    {
+        Service NewService(string! serviceName, string! binaryName);
+    }
+}
diff --git a/base/Services/ServiceManager/JournalService.sg b/base/Services/ServiceManager/JournalService.sg
new file mode 100644
index 0000000..a761c0a
--- /dev/null
+++ b/base/Services/ServiceManager/JournalService.sg
@@ -0,0 +1,519 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\JournalService.sg
+//
+//  Note:   
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    // JournalService is a service launcher.  This object instantiates two
+    // service processes: the target service and the logging service for it.
+    //
+    // JournalService sets up three endpoints for the logging service and two
+    // channels for the target service. (* 'Contract' is omitted.)
+    // For the logging service,
+    //      ManagedService          Because it is a service.
+    //      DirectoryService.Imp    To connect to a root directory service
+    //      DirectoryService.Exp    To intercept the connection from the target
+    // For the target,
+    //      ManagedService          Because it is a service.
+    //      DirectoryService.Imp    To intercept the connection to the root DS
+    //
+    internal class JournalService : Service
+    {
+        // Every resilient service process is associated with a dedicated
+        // journal service process whose program name must be "<service name>
+        // + Proxy".  e.g. CounterProxy
+        protected const string      JSSuffix = "Proxy";
+        protected ResilientService  target;
+        protected Thread            proxyThread;
+        protected Object!           recoveryLock;
+
+        protected TRef<ServiceControlContract.Imp:Ready>    controlRef;
+        protected TRef<ManagedProxyContract.Exp:Ready>      recoveryRef;
+        protected TRef<DirectoryServiceContract.Exp:Start>  directoryRef;
+        protected TRef<ServiceProxyContract.Exp:Start>      serviceProxyRef;
+        protected TRef<ThreadTerminationContract.Imp:Start> signalSenderRef;
+        protected TRef<ThreadTerminationContract.Exp:Start> signalReceiverRef;
+
+        // name:    The name of the target service (e.g. Counter)
+        // ds:      The channel to the root directory service.
+        internal JournalService(string! serviceName,
+                                string! binaryName,
+                                [Claims]DirectoryServiceContract.Imp:Ready! ds)
+        {
+            base(serviceName, binaryName, ServiceType.Resilient, ds);
+            recoveryLock = new Object();
+        }
+
+        /// <summary>
+        /// Starts Journal Service process and the target service process.
+        /// </summary>
+        internal override ServiceError StartServiceProcess()
+        {
+            bool            msSuccess = false;
+            bool            dsSuccess = false;
+            ServiceError    report;
+
+            ManagedServiceContract.Imp      msImp;
+            ManagedProxyContract.Exp        mpExp;
+            DirectoryServiceContract.Imp    myDSImp;
+            ServiceProxyContract.Imp        proxyImp;
+            ServiceControlContract.Imp!     targetControl;
+            ServiceControlContract.Exp!     controlTarget;
+
+            //
+            // Setup Proxy Process
+            //
+            DebugStub.Print("JS: Create process '{0}'\n",
+                            __arglist(serviceName + JSSuffix));
+            process = new Process(new String[1]{serviceName + JSSuffix},
+                                  null, 5);
+            SetupEndpoints(process, out msImp, out mpExp,
+                           out myDSImp, out proxyImp);
+
+            if (msImp == null || myDSImp == null ||
+                mpExp == null || proxyImp == null) {
+                delete msImp;
+                delete mpExp;
+                delete myDSImp;
+                delete proxyImp;
+                return ServiceError.TryAgain;
+            }
+
+            //
+            // Start proxy
+            //
+            process.Start();
+
+            //
+            // Make sure the proxy has been started
+            //
+            while (!(msSuccess && dsSuccess)) {
+                switch receive {
+                    case msImp.Success():
+                        DebugStub.Print("ms received\n");
+                        msSuccess = true;
+                        break;
+                    case myDSImp.Success():
+                        DebugStub.Print("sub received\n");
+                        dsSuccess = true;
+                        break;
+                    case unsatisfiable:
+                        goto exit;
+                        break;
+                }
+            }
+
+exit:
+            if (!msSuccess || !dsSuccess) {
+                DebugStub.Print("JournalService: Service process " +
+                                "channel is closed.\n");
+                delete msImp;
+                delete mpExp;
+                delete myDSImp;
+                delete proxyImp;
+                return ServiceError.ChannelClosed;
+            }
+
+            DebugStub.Print("JS: Check\n");
+            managementEndpoint = new TRef<ManagedServiceContract.Imp:Ready>(msImp);
+
+            mpExp.SendSuccess();
+            recoveryRef = new TRef<ManagedProxyContract.Exp:Ready>(mpExp);
+
+            //
+            // Create the target service process with the myDS DS
+            //
+            target = new ResilientService(serviceName, binaryName,
+                                          myDSImp, proxyImp, this);
+            report = target.StartServiceProcess();
+            if (report != ServiceError.None) {
+                return report;
+            }
+
+            //
+            // Start the counterpart
+            //
+            ServiceControlContract.NewChannel(out targetControl,
+                                              out controlTarget);
+            target.Start(controlTarget);
+            switch receive {
+                case targetControl.Success():
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+            controlRef = new TRef<ServiceControlContract.Imp:Ready>(targetControl);
+
+            DebugStub.Print("JournalService: StartServiceProcess EXIT\n");
+            return report;
+        } 
+
+        private void SetupEndpoints(Process p,
+                                    out ManagedServiceContract.Imp ms,
+                                    out ManagedProxyContract.Exp mp,
+                                    out DirectoryServiceContract.Imp d,
+                                    out ServiceProxyContract.Imp sp)
+        {
+            ManagedServiceContract.Imp!     msImp;
+            ManagedServiceContract.Exp!     msExp;
+            ManagedProxyContract.Imp!       mpImp;
+            ManagedProxyContract.Exp!       mpExp;
+            DirectoryServiceContract.Imp!   dsClient;
+            DirectoryServiceContract.Imp!   myDSImp;
+            DirectoryServiceContract.Exp!   myDSExp;
+            ServiceProxyContract.Imp!       proxyImp;
+            ServiceProxyContract.Exp!       proxyExp;
+
+            ms = null;
+            mp = null;
+            d = null;
+            sp = null;
+
+            //TODO: Slot number management. Currently they are hard-coded.
+            //
+            // Service Manager endpoint to be given to the proxy
+            //
+            ManagedServiceContract.NewChannel(out msImp, out msExp);
+            if (!process.SetStartupEndpoint(0, (Endpoint * in ExHeap)msExp)) {
+                DebugStub.Print("JournalService: Endpoint cannot be set. " +
+                                "(ManagedService)\n");
+                delete msImp;
+                return;
+            }
+
+            //
+            // Root Directory Service endpoint
+            //
+            dsClient = DirectoryService.NewClientEndpoint();
+            if (!process.SetStartupEndpoint(1, (Endpoint * in ExHeap)dsClient))
+            {
+                DebugStub.Print("JournalService: Endpoint cannot be set. " +
+                                "(DirectoryService)\n");
+                delete msImp;
+                return;
+            }
+
+            //
+            // Substitute Directory Service endpoint
+            // 
+            DirectoryServiceContract.NewChannel(out myDSImp,
+                                                out myDSExp);
+            if (!process.SetStartupEndpoint(2, (Endpoint * in ExHeap)myDSExp))
+            {
+                DebugStub.Print("JournalService: Endpoint cannot be set. " +
+                                "(Substitute)\n");
+                delete msImp;
+                delete myDSImp;
+                return;
+            }
+
+            //
+            // DS Transfer endpoint
+            //
+            ManagedProxyContract.NewChannel(out mpImp, out mpExp);
+            if (!process.SetStartupEndpoint(3, (Endpoint * in ExHeap)mpImp))
+            {
+                DebugStub.Print("JournalService: Endpoint cannot be set. " +
+                                "(ManagedProxy)\n");
+                delete msImp;
+                delete myDSImp;
+                delete mpExp;
+                return;
+            }
+
+            //
+            // Checkpointing and persistent memory space
+            //
+            ServiceProxyContract.NewChannel(out proxyImp, out proxyExp);
+            if (!process.SetStartupEndpoint(4, (Endpoint * in ExHeap)proxyExp))
+            {
+                DebugStub.Print("JournalService: Endpoint cannot be set. " +
+                                "(ServiceProxy)\n");
+                delete msImp;
+                delete myDSImp;
+                delete mpExp;
+                delete proxyImp;
+                return;
+            }
+
+            ms = msImp;
+            mp = mpExp;
+            d = myDSImp;
+            sp = proxyImp;
+        }
+
+        /// <summary>
+        /// Starts the service of a service process.  This is done by sending
+        /// a <i>StartService</i> message.
+        /// </summary>
+        // HI: Current implementation starts both the logging service and the
+        // target service, because we assume that the logging service is
+        // a part of the target service.  This may conflicts the normal
+        // (not resilient) service behavior.
+        internal override ServiceError StartService()
+        {
+            ServiceError                        report;
+            ManagedServiceContract.Imp:Ready    management;
+            ThreadTerminationContract.Imp!      imp;
+            ThreadTerminationContract.Exp!      exp;
+
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+            signalSenderRef = new TRef<ThreadTerminationContract.Imp:Start>(imp);
+            signalReceiverRef = new TRef<ThreadTerminationContract.Exp:Start>(exp);
+
+            proxyThread = new Thread(new ThreadStart(HandleProxy));
+            proxyThread.Start();
+
+            DebugStub.Print("JS: Start proxy\n");
+            //
+            // Start JournalProducer service
+            //
+            management = managementEndpoint.Acquire();
+            management.SendStartService();
+            switch receive {
+                case management.AckStartService():
+                    break;
+                case management.RecvNakStartService():
+                    DebugStub.Print("JS: Can't start service\n");
+                    report = ServiceError.Unknown;
+                    goto exit;
+                    break;
+                case management.RecvChannelClosed():
+                    report = ServiceError.ChannelClosed;
+                    goto exit;
+                    break;
+            }
+
+            DebugStub.Print("JS: Start server\n");
+            //
+            // Start the target service
+            //
+            report = target.StartService();
+            if (report != ServiceError.None) {
+                management.SendStopService();
+                switch receive {
+                    case management.RecvAckStopService():
+                        break;
+                    case management.RecvBusy():
+                        report = ServiceError.TryAgain;
+                        break;
+                    case management.ChannelClosed():
+                        report = ServiceError.ChannelClosed;
+                        break;
+                }
+            }
+exit:
+            managementEndpoint.Release(management);
+
+            //DebugStub.Print("JournalService: StartService EXIT\n");
+            return report;
+        }
+
+        internal override ServiceError StopService()
+        {
+            ServiceError                            report;
+            ManagedServiceContract.Imp:Ready        management;
+            ThreadTerminationContract.Imp:Start!    signalToProxyThread;
+
+            DebugStub.Print("JS: Enter StopService\n");
+            //
+            // Stop the target service first.
+            //
+            report = target.StopService();
+            if (report != ServiceError.None) {
+                return report;
+            }
+
+            //
+            // Stop the logging service
+            //
+            signalToProxyThread = signalSenderRef.Acquire();
+            signalToProxyThread.SendStop();
+            switch receive {
+                case signalToProxyThread.AckStop():
+                    break;
+                case signalToProxyThread.ChannelClosed():
+                    break;
+            }
+            signalSenderRef.Release(signalToProxyThread);
+
+            management = managementEndpoint.Acquire();
+            management.SendStopService();
+            switch receive {
+                case management.RecvAckStopService():
+                    report = ServiceError.None;
+                    break;
+                case management.RecvBusy():
+                    report = ServiceError.TryAgain;
+                    break;
+                case management.ChannelClosed():
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+            managementEndpoint.Release(management);
+            DebugStub.Print("JS: Exit StopService\n");
+            return report;
+        }
+
+        internal override ServiceError StopServiceProcess()
+        {
+            ServiceError report;
+            //DebugStub.Print("JS: Enter StopServiceProcess\n");
+
+            report = target.StopServiceProcess();
+            if (report != ServiceError.None) {
+                return report;
+            }
+
+            //DebugStub.Print("JS: Exit StopServiceProcess\n");
+            return base.StopServiceProcess();
+        }
+
+        internal override ServiceError RestartService()
+        {
+            return RestartServiceProcess();
+        }
+
+        internal override ServiceError RestartServiceProcess()
+        {
+            ServiceError    error = ServiceError.Unknown;
+            ServiceControlContract.Imp:Ready! control;
+
+            if (!Monitor.TryEnter(recoveryLock)) {
+                return ServiceError.TryAgain;
+            }
+
+            control = controlRef.Acquire();
+            control.SendRestartService();
+            switch receive {
+                case control.AckRestartService():
+                    error = ServiceError.None;
+                    break;
+                case control.NakRestartService(err):
+                    error = err;
+                    break;
+                case control.ChannelClosed():
+                    error = ServiceError.ChannelClosed;
+                    break;
+            }
+            controlRef.Release(control);
+            DebugStub.Print("JS: Exit RestartServiceProcess\n");
+            Monitor.Exit(recoveryLock);
+            return error;
+        }
+
+        internal void RestartHelper()
+        {
+            RestartServiceProcess();
+        }
+
+        private void HandleProxy()
+        {
+            ManagedProxyContract.Exp:Ready!         proxy;
+            ThreadTerminationContract.Exp:Start!    signal;
+
+            proxy = recoveryRef.Acquire();
+            signal = signalReceiverRef.Acquire();
+            for (;;) {
+                switch receive {
+                    case proxy.RequestRecovery():
+                    {
+                        try {
+                            Monitor.Enter(this);
+                            if (directoryRef == null) {
+                                new Thread(new ThreadStart(RestartHelper)).Start();
+                                Monitor.Wait(this);
+                            }
+
+                            if (directoryRef != null) {
+                                proxy.SendAckRecovery(directoryRef.Acquire(),
+                                                      serviceProxyRef.Acquire());
+                                directoryRef = null;
+                            }
+                            else {
+                                DebugStub.Break();
+                            }
+                        }
+                        finally {
+                            Monitor.Exit(this);
+                        }
+                        break;
+                    }
+                    case proxy.RequestDSRecovery():
+                    {
+                        DebugStub.Print("JS: Enter RequestRecovery\n");
+                        try {
+                            Monitor.Enter(this);
+                            if (directoryRef == null) {
+                                new Thread(new ThreadStart(RestartHelper)).Start();
+                                Monitor.Wait(this);
+                            }
+
+                            if (directoryRef != null) {
+                                proxy.SendAckDSRecovery(
+                                        directoryRef.Acquire());
+                                directoryRef = null;
+                            }
+                            else {
+                                DebugStub.Break();
+                            }
+                        }
+                        finally {
+                            Monitor.Exit(this);
+                        }
+                        DebugStub.Print("JS: Exit RequestRecovery\n");
+                        break;
+                    }
+                    case signal.Stop():
+                    {
+                        signal.SendAckStop();
+                        // Even if the proxy process waits for an ACK on the
+                        // 'proxy' channel, it is terminated by Service Manager
+                        // through the ManagedServiceContract channel.
+                        goto exit;
+                        break;
+                    }
+                    case signal.ChannelClosed():
+                    {
+                        goto exit;
+                        break;
+                    }
+                } // SWR
+            } // END OF LOOP
+exit:
+            signalReceiverRef.Release(signal);
+            recoveryRef.Release(proxy);
+        }
+
+        internal void TransferDirectoryService([Claims]DirectoryServiceContract.Exp:Start! ds,
+                                               [Claims]ServiceProxyContract.Exp:Start! sp)
+        {
+            //DebugStub.Print("JS: Enter TransferDS\n");
+            try {
+                Monitor.Enter(this);
+                directoryRef = new TRef<DirectoryServiceContract.Exp:Start>(ds);
+                serviceProxyRef = new TRef<ServiceProxyContract.Exp:Start>(sp);
+                Monitor.Pulse(this);
+            }
+            finally {
+                Monitor.Exit(this);
+            }
+            //DebugStub.Print("JS: Exit TransferDS\n");
+        }
+    } // class JournalService
+}
diff --git a/base/Services/ServiceManager/ResilientService.sg b/base/Services/ServiceManager/ResilientService.sg
new file mode 100644
index 0000000..545930d
--- /dev/null
+++ b/base/Services/ServiceManager/ResilientService.sg
@@ -0,0 +1,203 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\ResilientService.sg
+//
+//  Note:   
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    internal class ResilientService : Service
+    {
+        protected JournalService                        journalService;
+        protected Object!                               recoveryLock;
+        protected TRef<ServiceProxyContract.Imp:Start>  proxyRef;
+
+        internal ResilientService(string! serviceName,
+                                  string! binaryName,
+                                  [Claims]DirectoryServiceContract.Imp:Ready! ds,
+                                  [Claims]ServiceProxyContract.Imp:Start! sp,
+                                  JournalService journal)
+        {
+            base(serviceName, binaryName, ServiceType.Resilient, ds);
+            this.journalService = journal;
+            this.recoveryLock = new Object();
+            this.proxyRef = new TRef<ServiceProxyContract.Imp:Start>(sp);
+        }
+
+        internal override ServiceError StartServiceProcess()
+        {
+            ServiceError                    report;
+            ManagedServiceContract.Imp!     msImp;
+            ManagedServiceContract.Exp!     msExp;
+
+            DebugStub.Print("RS: Create process '{0}'\n",
+                            __arglist(binaryName));
+
+            process = new Process(new String[1]{binaryName}, null, 3);
+
+            // Create a channel to the service
+            ManagedServiceContract.NewChannel(out msImp, out msExp);
+            if (!process.SetStartupEndpoint(0, (Endpoint * in ExHeap)msExp)) {
+                DebugStub.Print("Endpoint cannot be set. (ManagedService)\n");
+                delete msImp;
+                return ServiceError.TryAgain;
+            }
+
+            if (!process.SetStartupEndpoint(1, (Endpoint * in ExHeap)directory.Acquire())) {
+                DebugStub.Print("Endpoint cannot be set. " +
+                                "(DirectoryService)\n");
+                delete msImp;
+                return ServiceError.TryAgain;
+            }
+
+            if (!process.SetStartupEndpoint(2, (Endpoint * in ExHeap)proxyRef.Acquire())) {
+                DebugStub.Print("Endpoint cannot be set. (ServiceProxy)\n");
+                delete msImp;
+                return ServiceError.TryAgain;
+            }
+
+            DebugStub.Print("RS: start process\n");
+            process.Start();
+
+            // Make sure the process has been started
+            switch receive {
+                case msImp.RecvSuccess():
+                    managementEndpoint = new TRef<ManagedServiceContract.Imp:Ready>(msImp);
+                    report = ServiceError.None;
+                    break;
+                case msImp.ChannelClosed():
+                    DebugStub.Print("Service process's channel is closed.\n");
+                    delete msImp;
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+            return report;
+        }
+
+        internal override ServiceError RestartServiceProcess()
+        {
+            ServiceError report = ServiceError.Unknown;
+            ManagedServiceContract.Imp!     msImp;
+            ManagedServiceContract.Exp!     msExp;
+            DirectoryServiceContract.Imp!   substituteImp;
+            DirectoryServiceContract.Exp!   substituteExp;
+            ServiceProxyContract.Imp!       proxyImp;
+            ServiceProxyContract.Exp!       proxyExp;
+
+            DebugStub.Print("ResilientService: ENTER RestartServiceProcess\n");
+            if (!Monitor.TryEnter(recoveryLock)) {
+                return ServiceError.TryAgain;
+            }
+
+            DebugStub.Print("RS: Stopping the process ...\n");
+            process.Stop();
+
+
+            DirectoryServiceContract.NewChannel(out substituteImp,
+                                                out substituteExp);
+            ServiceProxyContract.NewChannel(out proxyImp, out proxyExp);
+            // Set substituteExp to JournalProducer and check the connection
+            journalService.TransferDirectoryService(substituteExp, proxyExp);
+
+            switch receive {
+                case substituteImp.RecvSuccess():
+                    report = ServiceError.None;
+                    break;
+                case substituteImp.ChannelClosed():
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+
+            if (report != ServiceError.None) {
+                delete substituteImp;
+                delete proxyImp;
+                goto exit;
+            }
+            DebugStub.Print("sub received\n");
+
+            DebugStub.Print("RS: creating a new process ... ");
+            process = new Process(new String[1]{binaryName}, null, 3);
+            DebugStub.Print("done.\n");
+
+            //
+            // Create a channel to the service
+            //
+            ManagedServiceContract.NewChannel(out msImp, out msExp);
+            if (!process.SetStartupEndpoint(0, (Endpoint * in ExHeap)msExp)) {
+                DebugStub.Print("Endpoint cannot be set. (ManagedService)\n");
+                delete msImp;
+                delete substituteImp;
+                delete proxyImp;
+                report = ServiceError.TryAgain;
+                goto exit;
+            }
+
+            if (!process.SetStartupEndpoint(1, (Endpoint * in ExHeap)substituteImp)) {
+                DebugStub.Print("Endpoint cannot be set. " +
+                                "(DirectoryService)\n");
+                delete msImp;
+                delete proxyImp;
+                report = ServiceError.TryAgain;
+                goto exit;
+            }
+
+            if (!process.SetStartupEndpoint(2, (Endpoint * in ExHeap)proxyImp)) {
+                DebugStub.Print("Endpoint cannot be set. " +
+                                "(ServiceProxy)\n");
+                delete msImp;
+                report = ServiceError.TryAgain;
+                goto exit;
+            }
+
+            DebugStub.Print("RS: Restarting service process ... ");
+            process.Start();
+            DebugStub.Print("done.\n");
+
+            // Make sure the process has been started
+            switch receive {
+                case msImp.RecvSuccess():
+                    // Replace the existing endpoint
+                    managementEndpoint = new TRef<ManagedServiceContract.Imp:Ready>(msImp);
+                    report = ServiceError.None;
+                    break;
+                case msImp.ChannelClosed():
+                    DebugStub.Print("Service process's channel is closed.\n");
+                    delete msImp;
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+
+exit:
+            Monitor.Exit(recoveryLock);
+            DebugStub.Print("RS: Exit RestartServiceProcess\n");
+            return report;
+        }
+
+        internal override ServiceError RestartService()
+        {
+            ServiceError report;
+
+            //this.StopService();
+            // Currently, we don't know what condition the service
+            // process is, so just kill the process and restart it.
+            report = RestartServiceProcess();
+            if (report == ServiceError.None) {
+                report = StartService();
+            }
+
+            return report;
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/ResilientServiceCreator.sg b/base/Services/ServiceManager/ResilientServiceCreator.sg
new file mode 100644
index 0000000..786260a
--- /dev/null
+++ b/base/Services/ServiceManager/ResilientServiceCreator.sg
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\ServiceCreator.sg
+//
+//  Note:   
+//
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    internal class ResilientServiceCreator : IServiceProduceable
+    {
+        public Service NewService(string! serviceName, string! binaryName)
+        {
+            return new JournalService(serviceName, binaryName,
+                                      DirectoryService.NewClientEndpoint());
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/Service.sg b/base/Services/ServiceManager/Service.sg
new file mode 100644
index 0000000..d7cbb2b
--- /dev/null
+++ b/base/Services/ServiceManager/Service.sg
@@ -0,0 +1,490 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\Service.sg
+//
+//  Note:   Service counterpart
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.V1.Processes;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    /// <summary>
+    /// Service process counterpart.
+    /// </summary>
+    internal abstract class Service
+    {
+        protected readonly string!      serviceName;
+        protected readonly string!      binaryName;
+        protected readonly ServiceType  serviceType;
+        protected int                   id;
+        protected Process               process;
+        private Thread                  thread;
+
+        /// <summary>
+        /// Management channel to the service
+        /// </summary>
+        protected TRef<ManagedServiceContract.Imp:Ready>    managementEndpoint;
+
+        /// <summary>
+        /// User-Service Communication Relay Point
+        /// </summary>
+        private TRef<ServiceControlContract.Exp:Ready>      controlProxy;
+
+        protected TRef<DirectoryServiceContract.Imp:Ready>  directory;
+        private TRef<ThreadTerminationContract.Imp:Start>   senderRef;
+        private TRef<ThreadTerminationContract.Exp:Start>   receiverRef;
+
+        private TRef<ServiceProxyContract.Exp:Start>        dummyRef;
+ 
+        internal Service(string! serviceName,
+                         string! binaryName,
+                         ServiceType serviceType,
+                         [Claims]DirectoryServiceContract.Imp:Ready! ds)
+        {
+            this.serviceName = serviceName;
+            this.binaryName = binaryName;
+            this.serviceType = serviceType;
+
+            ThreadTerminationContract.Imp! imp;
+            ThreadTerminationContract.Exp! exp;
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+            senderRef = new TRef<ThreadTerminationContract.Imp:Start>(imp);
+            receiverRef = new TRef<ThreadTerminationContract.Exp:Start>(exp);
+            directory = new TRef<DirectoryServiceContract.Imp:Ready>(ds);
+        }
+
+        ~Service()
+        {
+            delete directory.Acquire();
+            delete senderRef.Acquire();
+            delete receiverRef.Acquire();
+        }
+
+        /// <summary>
+        /// Starts this service counter part. Doesn't start any service process.
+        /// </summary>
+        internal void Start([Claims]ServiceControlContract.Exp:Start! ep)
+        {
+            ep.SendSuccess();
+            controlProxy = new TRef<ServiceControlContract.Exp:Ready>(ep);
+            thread = new Thread(new ThreadStart(Run));
+            thread.Start();
+        }
+
+        /// <summary>
+        /// Terminates the service counter part.
+        /// </summary>
+        internal void Stop(out ServiceControlContract.Exp:Ready! ep)
+        {
+            ThreadTerminationContract.Imp:Start!    leader;
+            
+            // Terminates Run()
+            leader = senderRef.Acquire();
+            try {
+                leader.SendStop();
+                leader.RecvAckStop();
+                thread.Join();
+            }
+            catch (Exception) {
+                DebugStub.Print("Service: already stopped.\n");
+            }
+
+            // Give EP back
+            ep = controlProxy.Acquire();
+            controlProxy = null;
+
+            // Reuse for the next connection
+            senderRef.Release(leader);
+        }
+
+        /// <summary>
+        /// Brings up the service that this object represents.  Throws
+        /// ProcessCreateException.
+        /// </summary>
+        internal virtual ServiceError StartServiceProcess()
+        {
+            ServiceError                    report;
+            ManagedServiceContract.Imp!     msClient;
+            ManagedServiceContract.Exp!     msServer;
+            DirectoryServiceContract.Imp!   dsClient;
+
+            DebugStub.Print("Service: Create process '{0}'\n",
+                            __arglist(binaryName));
+
+            process = new Process(new String[1]{binaryName}, null, 3);
+
+            // Create a channel to the service
+            ManagedServiceContract.NewChannel(out msClient, out msServer);
+            if (!process.SetStartupEndpoint(0, (Endpoint * in ExHeap)msServer)) {
+                DebugStub.Print("Endpoint cannot be set. (ManagedService)\n");
+                delete msClient;
+                return ServiceError.TryAgain;
+            }
+            dsClient = directory.Acquire();
+            if (!process.SetStartupEndpoint(1, (Endpoint * in ExHeap)dsClient)) {
+                DebugStub.Print("Endpoint cannot be set. " +
+                                "(DirectoryService)\n");
+                delete msClient;
+                return ServiceError.TryAgain;
+            }
+
+            //
+            // ServiceProxyContract Dummy
+            //NOTE: this is necessary even though the default service never
+            //      be able to use.
+            ServiceProxyContract.Imp!   imp;
+            ServiceProxyContract.Exp!   exp;
+            ServiceProxyContract.NewChannel(out imp, out exp);
+            process.SetStartupEndpoint(2, (Endpoint * in ExHeap)imp);
+            dummyRef = new TRef<ServiceProxyContract.Exp:Start>(exp);
+
+            process.Start();
+
+            // Make sure the process has been started
+            switch receive {
+                case msClient.RecvSuccess():
+                    managementEndpoint = new TRef<ManagedServiceContract.Imp:Ready>(msClient);
+                    report = ServiceError.None;
+                    DebugStub.Print("-- Process ID: {0}\n",
+                                    __arglist(process.Id));
+                    break;
+                case msClient.ChannelClosed():
+                    DebugStub.Print("Service process's channel is closed.\n");
+                    delete msClient;
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+            //DebugStub.Print("Service.sg: StartServiceProcess EXIT\n");
+            return report;
+        }
+
+        /// <summary>
+        /// Shuts down the service process.
+        /// </summary>
+        internal virtual ServiceError StopServiceProcess()
+        {
+            ServiceError                        report = ServiceError.Unknown;
+            ManagedServiceContract.Imp:Ready    ep;
+
+            //DebugStub.Print("Service: ENTER StopServiceProcess\n");
+
+            StopPoll();
+
+            if (managementEndpoint == null) {
+                return ServiceError.NotFound;
+            }
+
+            ep = managementEndpoint.Acquire();
+            if (process.State != ProcessState.Stopped) {
+                try {
+                    ep.SendStop();
+                    switch receive {
+                        case ep.AckStop():
+                            report = ServiceError.None;
+                            break;
+                        case ep.ChannelClosed():
+                            report = ServiceError.None;
+                            break;
+                    }
+                }
+                catch (Exception) {
+                    DebugStub.Print("already stopped\n");
+                }
+            }
+
+            process.Stop();
+            delete ep;
+            managementEndpoint = null;
+            report = ServiceError.None;
+
+            //DebugStub.Print("Service: EXIT StopServiceProcess\n");
+            return report;
+        }
+
+        internal virtual ServiceError RestartServiceProcess()
+        {
+            ServiceError    report;
+
+            report = StopServiceProcess();
+            if (report == ServiceError.None) {
+                report = StartServiceProcess();
+            }
+            return report;
+        }
+
+        internal virtual ServiceError StartService()
+        {
+            ServiceError                        report;
+            ManagedServiceContract.Imp:Ready!   client;
+
+            //DebugStub.Print("Service: StartService ENTER\n");
+
+            client = managementEndpoint.Acquire();
+            client.SendStartService();
+            switch receive {
+                case client.AckStartService():
+                    report = ServiceError.None;
+                    break;
+                case client.NakStartService():
+                    report = ServiceError.TryAgain;
+                    break;
+                case client.ChannelClosed():
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+            managementEndpoint.Release(client);
+
+            //DebugStub.Print("Service: StartService EXIT\n");
+
+            return report;
+        }
+
+        internal virtual ServiceError StopService()
+        {
+            ServiceError                        report;
+            ManagedServiceContract.Imp:Ready!   client;
+
+            DebugStub.Print("Service: StopService ENTER\n");
+
+            client = managementEndpoint.Acquire();
+            client.SendStopService();
+            switch receive {
+                case client.AckStopService():
+                    report = ServiceError.None;
+                    break;
+                case client.Busy():
+                    report = ServiceError.TryAgain;
+                    break;
+                case client.ChannelClosed():
+                    DebugStub.Print("Service: client channel closed\n");
+                    report = ServiceError.ChannelClosed;
+                    break;
+            }
+
+            managementEndpoint.Release(client);
+
+            DebugStub.Print("Service: StopService EXIT\n");
+
+            return report;
+        }
+
+        internal virtual ServiceError RestartService()
+        {
+            ServiceError    report;
+
+            report = StopService();
+            if (report == ServiceError.None) {
+                report = StartService();
+            }
+            return report;
+        }
+
+        internal virtual void StartPoll(long interval) {}
+
+        internal virtual void StopPoll() {}
+
+        internal bool IsBound()
+        {
+            if (controlProxy != null) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        internal bool IsReachable()
+        {
+            bool                                result = false;
+            ServiceError                        report;
+            ManagedServiceContract.Imp:Ready!   ep;
+
+            ep = managementEndpoint.Acquire();
+            ep.SendKnock();
+            switch receive {
+                case ep.RecvAlive():
+                    result = true;
+                    break;
+                case ep.ChannelClosed():
+                    result = false;
+                    break;
+            }
+            managementEndpoint.Release(ep);
+            return result;
+        }
+
+        protected virtual void BeforeLoop() {}
+        protected virtual void AfterLoop() {}
+
+        protected void Run()
+        {
+            ServiceError                            report;
+            ServiceControlContract.Exp:Ready!       ep;
+            ThreadTerminationContract.Exp:Start!    signal;
+
+            BeforeLoop();
+
+            ep = controlProxy.Acquire();
+            signal = receiverRef.Acquire();
+            for (;;) {
+                switch receive {
+                    case ep.StartService():
+                    {
+                        DebugStub.Print("Service: Start service\n");
+                        try {
+                            report = StartServiceProcess();
+                            if (report != ServiceError.None) {
+                                ep.SendNakStartService(report);
+                                break;
+                            }
+
+                            report = StartService();
+                            if (report != ServiceError.None) {
+                                ep.SendNakStartService(report);
+                                break;
+                            }
+
+                            id = process.Id;
+                            ServiceManager.Register(this);
+                            ep.SendAckStartService();
+                            DebugStub.Print("Service: started\n");
+                        }
+                        catch (ProcessCreateException) {
+                            DebugStub.Print("Service: " +
+                                            "Process creation failed\n");
+                            ep.SendNakStartService(ServiceError.NotFound);
+                        }
+                        catch (ProcessStateException) {
+                            ep.SendNakStartService(ServiceError.TryAgain);
+                        }
+                        break;
+                    }
+                    case ep.StopService():
+                    {
+                        report = StopService();
+                        if (report != ServiceError.None) {
+                            ep.SendNakStopService(report);
+                            break;
+                        }
+                        report = StopServiceProcess();
+                        if (report != ServiceError.None) {
+                            ep.SendNakStopService(report);
+                            break;
+                        }
+                        ServiceManager.Deregister(this);
+                        ep.SendAckStopService();
+                        break;
+                    }
+                    case ep.RestartService():
+                    {
+                        DebugStub.Print("Service: Restarting '{0}'...\n",
+                                        __arglist(serviceName));
+                        report = RestartService();
+                        if (report != ServiceError.None) {
+                            ep.SendNakRestartService(report);
+                            break;
+                        }
+                        DebugStub.Print("Service: '{0}' restarted\n",
+                                        __arglist(serviceName));
+                        ep.SendAckRestartService();
+                        break;
+                    }
+                    case ep.StartPoll(interval):
+                    {
+                        StartPoll(interval);
+                        ep.SendAckStartPoll();
+                        break;
+                    }
+                    case ep.StopPoll():
+                    {
+                        StopPoll();
+                        ep.SendAckStopPoll();
+                        break;
+                    }
+                    case ep.ChannelClosed():
+                    {
+                        controlProxy = null;
+                        goto exit;
+                        break;
+                    }
+                    case signal.Stop():
+                    {
+                        signal.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    case signal.ChannelClosed():
+                    {
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            if (controlProxy != null) {
+                controlProxy.Release(ep);
+            }
+            else {
+                delete ep;
+            }
+
+            DebugStub.Print("service counterpart quit.\n");
+            receiverRef.Release(signal);
+
+            AfterLoop();
+        }
+
+        internal virtual string! Name
+        {
+            get { return serviceName; }
+            private set {}
+        }
+
+        internal virtual string! Binary
+        {
+            get { return binaryName; }
+            private set{}
+        }
+
+        internal virtual ServiceType Type
+        {
+            get { return serviceType; }
+            private set{}
+        }
+
+        internal virtual int Id
+        {
+            get { return id; }
+            private set{}
+        }
+
+        internal virtual TRef<ManagedServiceContract.Imp:Ready>! Endpoint
+        {
+            get { return managementEndpoint; }
+            private set{}
+        }
+
+        public override bool Equals(object o)
+        {
+            Service s = o as Service;
+            if (s == null) {
+                return false;
+            }
+            return (this.process.Id == s.process.Id &&
+                    this.managementEndpoint == s.managementEndpoint);
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/ServiceController.sg b/base/Services/ServiceManager/ServiceController.sg
new file mode 100644
index 0000000..6e7560e
--- /dev/null
+++ b/base/Services/ServiceManager/ServiceController.sg
@@ -0,0 +1,216 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\ServiceController.sg
+//
+//  Note:   Client counterpart
+//
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    // ServiceController is created per client and provides generic services,
+    // such as starting a service and enumerating current running services.
+    // ServiceController is created by ServiceManager when ServiceManager
+    // accepts a client connection.
+    internal class ServiceController
+    {
+        protected Acceptor acceptor;
+
+        protected TRef<ServiceManagementContract.Exp:Ready> endpoint;
+        protected TRef<ThreadTerminationContract.Imp:Start> sender;
+        protected TRef<ThreadTerminationContract.Exp:Start> signal;
+
+        internal ServiceController(Acceptor acceptor,
+                                   [Claims]ServiceManagementContract.Exp:Start! ep)
+        {
+            this.acceptor = acceptor;
+            ep.SendSuccess();
+            this.endpoint = new TRef<ServiceManagementContract.Exp:Ready>(ep);
+
+            ThreadTerminationContract.Imp! imp;
+            ThreadTerminationContract.Exp! exp;
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+            this.sender = new TRef<ThreadTerminationContract.Imp:Start>(imp);
+            this.signal = new TRef<ThreadTerminationContract.Exp:Start>(exp);
+        }
+
+        internal void Stop()
+        {
+            ThreadTerminationContract.Imp! imp;
+            imp = sender.Acquire();
+            imp.SendStop();
+            delete imp;
+        }
+
+        /// <summary>
+        /// Service main loop.
+        /// </summary>
+        internal void Run()
+        {
+            ServiceManagementContract.Exp:Ready! ep;
+            ThreadTerminationContract.Exp:Start! sig;
+           
+            ep = endpoint.Acquire();
+            sig = signal.Acquire();
+            for (;;) {
+                switch receive {
+                    case ep.Bind(info, control):
+                    {
+                        try {
+                            string name = info->Name;
+                            string binary = info->Binary;
+                            Service service;
+
+                            DebugStub.Print("Binding '{0}({1})' ... ",
+                                            __arglist(name, binary));
+
+                            // Create a new process
+                            service = ServiceManager.NewService(name,
+                                                                binary,
+                                                                info->Type);
+                            if (service != null) {
+                                // Bind the given control to the service
+                                // counterpart.  This doesn't start the
+                                // service itself.
+                                service.Start(control);
+                                ep.SendAckBind();
+                                DebugStub.Print(" done.\n");
+                            }
+                            else {
+                                ep.SendNotFound(control);
+                            }
+                        }
+                        catch (ProcessCreateException) {
+                            ep.SendNotFound(control);
+                        }
+                        catch (AccessControlException) {
+                            ep.SendPermissionDenied(control);
+                        }
+                        delete info;
+                        break;
+                    }
+                    case ep.GetControl(id, control):
+                    {
+                        Service service = ServiceManager.GetService(id);
+                        if (service != null) {
+                            if (!service.IsBound()) {
+                                service.Start(control);
+                                ep.SendAckGetControl();
+                            }
+                            else {
+                                ep.SendTryAgain(control);
+                            }
+                        }
+                        else {
+                            ep.SendNotFound(control);
+                        }
+                        break;
+                    }
+                    case ep.Unbind(id):
+                    {
+                        try {
+                            Service service = ServiceManager.GetService(id);
+                            if (service != null) {
+                                if (service.IsBound()) {
+                                    ServiceControlContract.Exp:Ready! control;
+                                    service.Stop(out control);
+                                    // HI: It doesn't check the ownership of
+                                    // the control.
+                                    ep.SendAckUnbind(control);
+                                }
+                                else {
+                                    ep.SendControlNotFound();
+                                }
+                            }
+                            else {
+                                ep.SendServiceNotFound();
+                            }
+                        }
+                        catch (AccessControlException) {
+                            ep.SendControlPermissionDenied();
+                        }
+                        break;
+                    }
+                    case ep.BeginEnumeration():
+                    {
+                        IDictionaryEnumerator controls;
+                       
+                        controls = ServiceManager.GetEnumerator();
+                        if (controls == null) {
+                            ep.SendEnumerationTerminated();
+                        }
+                        else {
+                            Service entry = null;
+                            bool next = false;
+                            do {
+                                if (controls.MoveNext() == false) {
+                                    ep.SendEnumerationTerminated();
+                                    break;
+                                }
+                                entry = (Service)controls.Value;
+                                if (entry == null) {
+                                    ep.SendEnumerationTerminated();
+                                    break;
+                                }
+
+                                ServiceInfo* in ExHeap info;
+                               
+                                info = new[ExHeap] ServiceInfo(entry.Id,
+                                                               entry.Name,
+                                                               entry.Binary,
+                                                               entry.Type);
+                                ep.SendCurrent(info);
+
+                                switch receive {
+                                    case ep.RecvMoveNext():
+                                        next = true;
+                                        break;
+                                    case ep.RecvEndEnumeration():
+                                        next = false;
+                                        break;
+                                    case ep.ChannelClosed():
+                                        next = false;
+                                        break;
+                                }
+                            } while (next);
+                        }
+                        break;
+                    }
+                    case ep.ChannelClosed():
+                    {
+                        DebugStub.Print("Controller: Client Channel closed\n");
+                        goto exit;
+                        break;
+                    }
+                    case sig.Stop():
+                    {
+                        sig.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    case sig.ChannelClosed():
+                    {
+                        DebugStub.Print("Controller: Signal ch closed\n");
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            delete ep;
+            delete sig;
+            acceptor.ReleaseController(this);
+            //DebugStub.Print("Exit Service Controller\n");
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/ServiceManager.csproj b/base/Services/ServiceManager/ServiceManager.csproj
new file mode 100644
index 0000000..98f750d
--- /dev/null
+++ b/base/Services/ServiceManager/ServiceManager.csproj
@@ -0,0 +1,48 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>sms</AssemblyName>
+    <AssumeFieldsNonNull>true</AssumeFieldsNonNull>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Acceptor.sg" />
+    <Compile Include="AccessControlException.cs" />
+    <Compile Include="DefaultService.sg" />
+    <Compile Include="DefaultServiceCreator.sg" />
+    <Compile Include="IServiceProduceable.sg" />
+    <Compile Include="JournalService.sg" />
+    <Compile Include="ResilientServiceCreator.sg" />
+    <Compile Include="Service.sg" />
+    <Compile Include="ServiceController.sg" />
+    <Compile Include="ServiceManager.sg" />
+    <Compile Include="ThreadTerminationContract.sg" />
+    <Compile Include="ResilientService.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Manifest\Manifest.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml2\Singularity.Xml2.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/ServiceManager/ServiceManager.sg b/base/Services/ServiceManager/ServiceManager.sg
new file mode 100644
index 0000000..114110b
--- /dev/null
+++ b/base/Services/ServiceManager/ServiceManager.sg
@@ -0,0 +1,336 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\ServiceManager.sg
+//
+//  Note:   Service Manager main program
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Threading;
+using Microsoft.Contracts;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Xml;
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    /// <summary>
+    /// The following class caches the directory service endpoint passed in
+    /// at startup in slot 0.  SetDirectoryServiceContract is called by
+    /// Main() to initialize the cache. This is used repeatedly to read the
+    /// manifests of the service to be started.
+    /// </summary>
+    internal class Dir
+    {
+        private static TRef<DirectoryServiceContract.Imp:Ready> m_epNS = null;
+
+        internal static void SetDirectoryServiceContract([Claims] DirectoryServiceContract.Imp:Ready! imp)
+        {
+                assert m_epNS == null;
+                m_epNS = new TRef<DirectoryServiceContract.Imp:Ready>(imp);
+
+        }
+
+       internal static DirectoryServiceContract.Imp:Ready! GetDirectoryServiceContract()
+        {
+            if (m_epNS == null) {
+                DebugStub.Break();
+            }
+            return m_epNS.Acquire();
+        }
+
+
+        internal static void ReleaseDirectoryServiceContract([Claims] DirectoryServiceContract.Imp:Ready! imp)
+        {
+                m_epNS.Release(imp);
+        }
+    }
+
+    internal sealed class ServiceManager
+    {
+        private static IDictionary  serviceList;
+        private static Object       serviceListLock;
+
+        internal static void Initialize()
+        {
+            if (serviceList == null) {
+                serviceList = new ListDictionary();
+                serviceListLock = new Object();
+            }
+        }
+
+        /// <summary>
+        /// Creates a new service counter part.  Creates a process, but doen't
+        /// start it.
+        /// </summary>
+        internal static Service NewService(string! serviceName,
+                                           string! binaryName,
+                                           ServiceType creatorType)
+        {
+            DirectoryServiceContract.Imp ds;
+            Service service;
+            IServiceProduceable creator;
+
+            // look at the manifest and see if the entity to be started is
+            // indeed a service.
+            ds = Dir.GetDirectoryServiceContract();
+            Manifest manifest = Binder.LoadManifest(ds, binaryName);
+            Dir.ReleaseDirectoryServiceContract(ds);
+            if (manifest == null) {
+                DebugStub.WriteLine("No manifest present for {0}",
+                                    __arglist(binaryName));
+                return null;
+            }
+
+            XmlNode category = manifest.GetCategoryNodeByName("Service");
+            if (category == null) {
+                DebugStub.WriteLine("Service Category node not present " +
+                                    "in manifest for {0}", __arglist(binaryName));
+                return null;
+            }
+
+            switch (creatorType) {
+                case ServiceType.Default:
+                    DebugStub.Print("Create Default service\n");
+                    creator = new DefaultServiceCreator();
+                    break;
+                case ServiceType.Resilient:
+                    DebugStub.Print("Create Resilient service\n");
+                    creator = new ResilientServiceCreator();
+                    break;
+                default:
+                    DebugStub.Break();
+                    return null;
+                    break;
+            }
+
+            return creator.NewService(serviceName, binaryName);
+        }
+
+        /// <summary>
+        /// Terminates the specified service process. The corresponding
+        /// Service object is deleted.
+        /// </summary>
+        internal static void ReleaseService(Service s)
+        {
+            if (s != null) {
+                s.StopServiceProcess();
+            }
+        }
+
+        /// <summary>
+        /// Terminates all the services. Deletes all the Service objects.
+        /// </summary>
+        internal static void Clear()
+        {
+            if (serviceListLock != null) {
+                lock (serviceListLock) {
+                    foreach (DictionaryEntry entry in serviceList) {
+                        Service service = (Service)entry.Value;
+                        if (service != null) {
+                            ServiceControlContract.Exp:Ready! dummy;
+                            service.Stop(out dummy);
+                            delete dummy;
+                        }
+                    }
+                    serviceList.Clear();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a Service object if exists, otherwise null.
+        /// </summary>
+        internal static Service GetService(int id)
+        {
+            if (serviceListLock != null) {
+                lock (serviceListLock) {
+                    return (Service)serviceList[id];
+                }
+            }
+            return null;
+        }
+
+        internal static IDictionaryEnumerator GetEnumerator()
+        {
+            if (serviceList != null) {
+                return serviceList.GetEnumerator();
+            }
+            else {
+                return null;
+            }
+        }
+
+        internal static bool Register(Service! s)
+        {
+            bool result;
+            if (serviceListLock != null) {
+                lock (serviceListLock) {
+                    try {
+                        serviceList.Add(s.Id, s);
+                        result = true;
+                    }
+                    catch (ArgumentNullException) {
+                        result = false;
+                    }
+                    catch (ArgumentException e) {
+                        DebugStub.WriteLine("ServiceManager.sg: "
+                                            + e.ToString() + " " + s.Id);
+                        result = false;
+                    }
+                }
+                DebugStub.Print("SMS: Register {0}\n", __arglist(s.Id));
+            }
+            else {
+                DebugStub.Print("ServiceManager.sg: lock is uninitialized.\n");
+                result = false;
+            }
+            return result;
+        }
+
+        internal static void Deregister(int id)
+        {
+            if (serviceListLock != null) {
+                lock (serviceListLock) {
+                    DebugStub.Print("SMS: Deregister {0}\n", __arglist(id));
+                    serviceList.Remove(id);
+                }
+            }
+            else {
+                DebugStub.Print("ServiceManager.sg: lock is uninitialized.\n");
+            }
+        }
+
+        internal static void Deregister(Service! s)
+        {
+            Deregister(s.Id);
+        }
+
+        /// <summary>
+        /// <b>Deprecated.</b> Creates and start a new <u>unmanaged</u> SIP.
+        /// </summary>
+        //TODO: Deprecated. Merge this to StartService.
+        internal static void StartServiceSimple(string! name)
+        {
+            Process process = null;
+            string[] arg = { name };
+
+            try {
+                process = new Process(arg, null, 0);
+            }
+            catch (ProcessCreateException) {
+                DebugStub.Print("SMS: Process creation failed\n");
+                throw;
+            }
+
+            process.Start();
+        }
+
+        /// <summary>
+        /// Start the initial servers that are specified in the manifest file.
+        /// </summary>
+        internal static void StartInitialServices(string[]! list)
+        {
+            try {
+                for (int i = 1; i < list.Length - 1; i += 3) {
+                    string serviceName = list[i];
+                    string binaryName = list[i + 1];
+                    string mode = list[i + 2];
+                    ServiceType type = ServiceType.Default; //TODO:
+
+                    if (serviceName == null || binaryName == null ||
+                        mode == null) {
+                        DebugStub.Print("SMS init: service is null\n");
+                        continue;
+                    }
+
+                    DebugStub.Print("SMS: Start " + serviceName + "(" +
+                                    mode + ")\n");
+                    Tracing.Log(Tracing.Audit, "SMS: Initializing "
+                                + serviceName);
+
+                    if (mode == "managed") {
+                        Service service = NewService(serviceName,
+                                                     binaryName,
+                                                     type);
+                        if (service == null) {
+                            DebugStub.Print("SMS: failed.\n");
+                            DebugStub.Break();
+                        }
+                        else {
+                            service.StartServiceProcess();
+                        }
+                    }
+                    else if (mode == "unmanaged") {
+                        //TODO: This is going to be merged above.
+                        StartServiceSimple(binaryName);
+                    }
+                    else {
+                        DebugStub.Print("Unknown mode: " + serviceName + "(" +
+                                        mode + ") is not launched.\n");
+                    }
+                }
+            }
+            catch (ProcessCreateException) {
+                DebugStub.Print("SMS: Service initialization failed.");
+            }
+        }
+
+        public static int Main(string[]! args)
+        {
+            int res = 1;
+
+            Endpoint * in ExHeap            initialEp;
+            DirectoryServiceContract.Imp    ep;
+
+            initialEp = Process.GetStartupEndpoint(0);
+            if (initialEp == null) {
+                DebugStub.WriteLine("Unable to get directory service contract!");
+                DebugStub.Break();
+                return -1;
+            }
+
+            ep = initialEp as DirectoryServiceContract.Imp;
+            if (ep == null) {
+                DebugStub.WriteLine("Startup endpoint is not a directory service contract!");
+                DebugStub.Break();
+                delete initialEp;
+                return -1;
+            }
+
+            Dir.SetDirectoryServiceContract(ep);
+
+            try {
+                ServiceManager.Initialize();
+
+                if (args.Length > 1) {
+                    ServiceManager.StartInitialServices(args);
+                }
+
+                Acceptor acceptor = new Acceptor(ServiceManagementContract.ModuleName);
+                acceptor.Start();
+
+                res = 0;
+            }
+            catch (Exception e) {
+                DebugStub.Print("SMS: Exception caught at the top level\n");
+                Console.WriteLine(e);
+            }
+
+            return res;
+        }
+    }
+}
diff --git a/base/Services/ServiceManager/ThreadTerminationContract.sg b/base/Services/ServiceManager/ThreadTerminationContract.sg
new file mode 100644
index 0000000..a30ee47
--- /dev/null
+++ b/base/Services/ServiceManager/ThreadTerminationContract.sg
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\ServiceManager\ThreadTerminationContract.sg
+//
+//  Note:   
+//
+using Singularity.Channels;
+
+
+namespace Microsoft.Singularity.Services.ServiceManager
+{
+    contract ThreadTerminationContract
+    {
+        in message Stop();
+        out message AckStop();
+        
+        state Start : one {
+            Stop? -> AckStop!;
+        }
+    }
+}
diff --git a/base/Services/Services.proj b/base/Services/Services.proj
new file mode 100644
index 0000000..4dd0abb
--- /dev/null
+++ b/base/Services/Services.proj
@@ -0,0 +1,17 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />
+
+  <ItemGroup>
+    <ProjectReference Include="CredentialsManager\CredentialsManagerService.csproj" />
+    <ProjectReference Include="Fat\Fat.proj" />
+    <ProjectReference Include="Iso9660\Iso9660.csproj" />
+    <ProjectReference Include="NetStack\NetStackService.csproj" />
+    <ProjectReference Include="ServiceManager\ServiceManager.csproj" />
+    <ProjectReference Include="Smb\Smb.proj" />
+    <ProjectReference Include="Tests\Tests.csproj" />
+    <ProjectReference Include="Transforms\ServiceTransform.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+
+</Project>
diff --git a/base/Services/Smb/Client/DirectoryClient.sg b/base/Services/Smb/Client/DirectoryClient.sg
new file mode 100644
index 0000000..d165fc5
--- /dev/null
+++ b/base/Services/Smb/Client/DirectoryClient.sg
@@ -0,0 +1,1371 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/Client/DirectoryClient.sg
+//
+//  Note:
+//
+//      This file contains the implementation of DirectoryServiceContract.
+//      The DirectoryClient class holds DirectoryServiceContract.Exp, on which
+//      it receives directory service requests, and SmbTransactor.Imp, which
+//      it uses to execute SMB transactions.
+//
+//      Each instance of DirectoryServiceContract runs in its own thread.
+//      Access to the single TCP connection to the SMB server is multiplexed
+//      by the TransportMux class, which is accessed using the SmbTransactor
+//      channel.
+//
+//      The general pattern is that the DirectoryClient thread loops in a
+//      switch-receive loop, and when it receives a directory request, it
+//      translates the request into SMB requests.  It formats those requests,
+//      submits them to the SMB transport mux, then waits for the response,
+//      and translates the SMB protocol response into DirectoryServiceContract
+//      response messages.
+//
+//      The top-level loop listens for DirectoryServiceContract messages,
+//      and listens for ChannelClosed on the SmbTransactor channel.  If
+//      either channel closes, the thread terminates.  While the thread
+//      is waiting for responses on its SmbTransactor channel, it also
+//      listens for ChannelClosed on the DirectoryServiceContract channel.
+//      This prevents the thread from blocking for a long time, if either
+//      channel closes.
+//
+//      In addition to providing general directory-related requests, the
+//      directory service contract allows its importers to bind to other
+//      directories, and to bind to files.  When DirectoryClient receives
+//      a request to bind to another directory or file, it will create
+//      another transactor, and another thread, to process those requests.
+//
+//  TODO:
+//
+//      *   We don't actually verify that a path exists before allowing
+//          a bind to a subdirectory to succeed.  Easy to do, just not
+//          done yet.
+//
+//      *   Exception handling is poor.
+//
+//      *   Because SMB_TRANSACTION2 is not properly supported, some
+//          transactions that return a large amount of data don't
+//          actually work correctly, such as enumerating directory
+//          contents.
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Smb.PublicChannels;
+using Smb.PrivateChannels;
+using Smb.Protocol;
+using Smb.Shared;
+
+namespace Smb.Client
+{
+    class DirectoryClient : ITrackedThreadContext, ITracked
+    {
+        public static void StartServiceThread(
+            [Claims]SmbTransactor.Imp:Ready! transactor,
+            [Claims]DirectoryServiceContract.Exp:Start! dir,
+            string! path)
+        {
+            DirectoryClient dir_client = new DirectoryClient(transactor, dir, path);
+            TrackedThreadStarter.StartTrackedThreadContext(dir_client);
+        }
+
+        private DirectoryClient(
+            [Claims]SmbTransactor.Imp:Ready! transactor,
+            [Claims]DirectoryServiceContract.Exp:Start! dir,
+            string! path)
+        {
+            _dir = dir;
+            _transactor = transactor;
+            _path = path;
+            _debugprefix = "DIR[" + path + "]: ";
+            _smbpath = path.Replace(SingularityPathSeparatorString, NtPathSeparatorString);
+        }
+
+        readonly DirectoryServiceContract.Exp! _dir;
+        readonly SmbTransactor.Imp! _transactor;
+
+        readonly string! _path;
+        readonly string! _smbpath;
+        readonly string! _debugprefix;
+
+        void ITrackedThreadContext.ThreadRoutine()
+        {
+            expose (this)
+            {
+            try
+            {
+                if (TraceSwitches.ShowDirectoryMessages) {
+                    DebugLine("Sending Success");
+                }
+                _dir.SendSuccess();
+
+                for (;;)
+                {
+                    switch receive
+                    {
+                        case _dir.CreateDirectory(char[]! in ExHeap exdirName):
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received CreateDirectory: name: " + Bitter.ToString2(exdirName));
+                            }
+
+                            CreateDirectory(_dir, _transactor, Util.ToStringDelete(exdirName));
+                            break;
+
+                        case _dir.DeleteDirectory(char[]! in ExHeap exdirName):
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received DeleteDirectory: name: " + Bitter.ToString2(exdirName));
+                            }
+
+                            DeleteDirectory(_dir, _transactor, Util.ToStringDelete(exdirName));
+                            break;
+
+                        case _dir.DeleteFile(char[]! in ExHeap exfileName):
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received DeleteFile: name: " + Bitter.ToString2(exfileName));
+                            }
+
+                            DeleteFile(_dir, _transactor, Util.ToStringDelete(exfileName));
+                            break;
+
+                        case _dir.Bind(char[]! in ExHeap expath, ServiceContract.Exp:Start! exp):
+                        {
+                            string! path = Util.ToStringDelete(expath);
+                            string! absolutePath = ToAbsolutePath(path);
+
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received Bind: path: " + path);
+                            }
+
+                            DirectoryServiceContract.Exp new_dir;
+                            FileContract.Exp new_file;
+
+                            if ((new_dir = exp as DirectoryServiceContract.Exp) != null) {
+                                // The client wants to bind to a directory.  If binding to the root directory,
+                                // then we create a new directory service thread immediately, and ack the request.
+                                // (The root directory always exists.)  If it's not the root directory, then we
+                                // need to verify that the path identifies a valid directory.  (But for now, we
+                                // elide that check.)
+
+                                if (absolutePath != "/") {
+                                    // -XXX- check directory?
+                                    try {
+                                        bool dir_exists = CheckDirectoryExists(absolutePath);
+                                        if (!dir_exists) {
+                                            DebugLine("Path '{0}' does not exist.  Rejecting bind request.", path);
+                                            _dir.SendNakBind(new_dir, ErrorCode.NotFound);
+                                            return;
+                                        }
+
+                                        // DebugLine("Path exists.");
+
+                                    } catch (Exception ex) {
+                                        DebugLine("FAILED to check if directory exists!");
+                                        Util.ShowExceptionDebug(ex, "failed to check if directory exists");
+                                        _dir.SendNakBind(new_dir, ErrorCode.Unknown);
+                                    }
+                                }
+
+                                //
+                                // Create a new _transactor for the child directory.
+                                //
+
+                                ErrorCode errorCode;
+                                SmbTransactor.Imp new_transactor = AddTransactor(out errorCode);
+
+                                if (new_transactor == null) {
+                                    DebugLine("Failed to bind directory client; could not create _transactor.");
+                                    _dir.SendNakBind(exp, errorCode);
+                                    break;
+                                }
+
+                                DirectoryClient.StartServiceThread(new_transactor, new_dir, absolutePath);
+                                DebugLine("Successfully bound new directory client.");
+                                _dir.SendAckBind();
+
+                            } else if ((new_file = exp as FileContract.Exp) != null) {
+
+                                ErrorCode errorCode;
+                                SmbTransactor.Imp new_transactor = AddTransactor(out errorCode);
+
+                                if (new_transactor == null) {
+                                    DebugLine("Failed to bind file client; could not create _transactor.");
+                                    _dir.SendNakBind(exp, errorCode);
+                                    break;
+                                }
+
+                                ushort fileId;
+                                if (CreateFile(_transactor, absolutePath, SmbCreateDisposition.Open, out fileId, out errorCode)) {
+                                    FileExp.CreateServiceThread(new_file, absolutePath, fileId, new_transactor);
+                                    DebugLine("Bind: Successful, sending Ack");
+                                    _dir.SendAckBind();
+                                 } else {
+                                    DebugLine("Bind: Failed to open file, error code = ", errorCode);
+                                    _dir.SendNakBind(exp, errorCode);
+                                    delete new_transactor;
+                                 }
+
+                            } else {
+                                DebugLine("Received bind request for an unknown contract!  Rejecting.");
+                                _dir.SendNakBind(exp, ErrorCode.BadArguments);
+                            }
+                            break;
+                        }
+
+                        case _dir.BeginEnumeration():
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received BeginEnumeration");
+                            }
+
+                            EnumerateDirectory(_transactor, _dir);
+                            break;
+
+                        case _dir.CreateFile(char[]! in ExHeap expath):
+                        {
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received CreateFile: path: " + Bitter.ToString2(expath));
+                            }
+
+                            string! path = Util.ToStringDelete(expath);
+                            string! absolutePath = ToAbsolutePath(path);
+
+                            // This is a request to create a file, and then to immediately close the file handle.
+                            ErrorCode errorCode;
+                            ushort fileId;
+                            if (CreateFile(_transactor, absolutePath, SmbCreateDisposition.Create, out fileId, out errorCode)) {
+                                DebugLine("File created, now closing.");
+                                CloseFileId(_transactor, fileId);
+                                DebugLine("File closed.");
+                                _dir.SendAckCreateFile();
+                            } else {
+                                _dir.SendNakCreateFile(errorCode);
+                            }
+                            break;
+                        }
+
+                        case _dir.CreateAndBindFile(char[]! in ExHeap exfileName, FileContract.Exp:Start! exp):
+                        {
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received CreateAndBindFile: path: " + Bitter.ToString2(exfileName));
+                            }
+                            string! path = Util.ToStringDelete(exfileName);
+                            DebugLine("CreateAndFindFile: filename: " + path);
+
+                            string! absolutePath = ToAbsolutePath(path);
+
+                            ushort fileId;
+                            ErrorCode errorCode;
+                            SmbTransactor.Imp new_transactor = AddTransactor(out errorCode);
+                            if (new_transactor == null) {
+                                _dir.SendNakCreateAndBindFile(exp, ErrorCode.Unknown);
+                                break;
+                            }
+
+                            if (CreateFile(_transactor, absolutePath, SmbCreateDisposition.Create, out fileId, out errorCode)) {
+                                FileExp.CreateServiceThread(exp, absolutePath, fileId, new_transactor);
+                                DebugLine("CreateAndBindFile: Successful, sending Ack");
+                                _dir.SendAckCreateAndBindFile();
+                            } else {
+                                delete new_transactor;
+                                DebugLine("CreateAndBindFile: Sending Nak, error code = " + errorCode);
+                                _dir.SendNakCreateAndBindFile(exp, ErrorCode.NotSupported);
+                            }
+                            break;
+                         }
+
+                        case _dir.GetAttributes(char[]! in ExHeap expath):
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received GetAttributes: " + Bitter.ToString2(expath));
+                            }
+
+                            string path = Util.ToStringDelete(expath);
+                            GetAttributes(_transactor, _dir, path);
+                            break;
+
+#region Requests that are not yet implemented
+
+                        case _dir.CreateLink(char[]! in ExHeap exlinkPath, char[]! in ExHeap exlinkValue):
+                        {
+                            string linkpath = Util.ToStringDelete(exlinkPath);
+                            string linkvalue = Util.ToStringDelete(exlinkValue);
+                            DebugLine("CreateLink: linkpath=" + linkpath + " linkvalue=" + linkvalue);
+                            DebugLine("CreateLink: Not implemented, refusing request");
+                            _dir.SendNakCreateLink(ErrorCode.NotSupported);
+                            break;
+                        }
+
+                        case _dir.DeleteLink(char[]! in ExHeap exlinkPath):
+                        {
+                            string linkpath = Util.ToStringDelete(exlinkPath);
+                            _dir.SendNakDeleteLink(ErrorCode.NotSupported);
+                            DebugLine("DeleteLink: linkpath=" + linkpath);
+                            DebugLine("DeleteLink: Not implemented, refusing request");
+                            break;
+                        }
+
+                        case _dir.GetLinkValue(char[]! in ExHeap exlinkpath):
+                        {
+                            string linkpath = Util.ToStringDelete(exlinkpath);
+                            DebugLine("GetLinkValue: linkpath=" + linkpath);
+                            _dir.SendNakGetLinkValue(ErrorCode.NotSupported);
+                            DebugLine("GetLinkLink: Not implemented, refusing request");
+                            break;
+                        }
+
+#endregion
+
+#region Requests that cannot be supported
+
+                        //
+                        // Channel registration doesn't really make sense for SMB.
+                        // The Singularity root directory service implements this.
+                        // There's nothing in SMB to map this to, aside from duplicating
+                        // the work of the Singularity root directory service.
+                        //
+
+                        case _dir.Register(char[]! in ExHeap expath, ServiceProviderContract.Imp:Start! imp):
+                        {
+                            string path = Util.ToStringDelete(expath);
+                            DebugLine("Register: path=" + path);
+                            _dir.SendNakRegister(imp, ErrorCode.NotSupported);
+                            break;
+                        }
+
+                        case _dir.Deregister(char[]! in ExHeap path):
+                            DebugLine("Deregister: path=" + Util.ToStringDelete(path));
+                            _dir.SendNakDeregister(ErrorCode.NotSupported);
+                            break;
+
+                        case _dir.Notify(
+                            char[]! in ExHeap path,
+                            char[]! in ExHeap pattern,
+                            bool sendExisting,
+                            NotifyContract.Imp:Start! imp):
+                            delete path;
+                            delete pattern;
+                            _dir.SendNakNotify(imp, ErrorCode.NotSupported);
+                            break;
+
+                        //
+                        // Singularity ACLs are completely different from NT ACLs.  They are not even
+                        // remotely similar, so there is no point in implementing StoreACL and QueryACL.
+                        //
+
+                        case _dir.QueryACL(char[]! in ExHeap path, bool effective):
+                            delete path;
+                            _dir.SendNakQueryACL(ErrorCode.NotSupported);
+                            break;
+
+                        case _dir.StoreACL(char[]! in ExHeap path, char[] in ExHeap acl1,
+                                                                        char[] in ExHeap acl2):
+                            delete path;
+                            delete acl1;
+                            delete acl2;
+                            _dir.SendNakStoreACL(ErrorCode.NotSupported);
+                            break;
+#endregion
+
+                        case _dir.ChannelClosed():
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Client channel has closed");
+                            }
+                            goto quit;
+                    }
+                }
+
+            quit:
+                if (TraceSwitches.ShowDirectoryMessages)
+                    DebugLine("Disconnecting...");
+
+            } catch(Exception ex) {
+                DebugLine("DIRECTORY SERVICE ROUTINE THREW EXCEPTION!");
+                Util.ShowExceptionDebug(ex);
+            } finally {
+                // delete _dir;
+                // delete _transactor;
+            }
+            }
+        }
+
+        public void Dispose()
+        {
+            delete _dir;
+            delete _transactor;
+        }
+
+        SmbTransactor.Imp AddTransactor(out ErrorCode errorCode)
+        {
+            expose (this)
+            {
+                _transactor.SendAddTransactor();
+
+                switch receive {
+                    case _transactor.AckAddTransactor(new_transactor):
+                        errorCode = ErrorCode.NoError;
+                        return new_transactor;
+
+                    case _transactor.NakAddTransactor():
+                        DebugLine("Mux refused to add a new transactor.");
+                        errorCode = ErrorCode.Unknown;
+                        return null;
+
+                    case _transactor.ChannelClosed():
+                        DebugLine("Failed to create transactor for child directory -- transactor closed channel!");
+                        errorCode = ErrorCode.Unknown;
+                        return null;
+                }
+            }
+        }
+
+        string! ToAbsolutePath(string! path)
+        {
+            if (path.StartsWith("/")) {
+                return path;
+            } else {
+                if (_smbpath.EndsWith("/"))
+                    return _smbpath + path;
+                else
+                    return _smbpath + "/" + path;
+            }
+        }
+
+        bool CreateFile(
+            SmbTransactor.Imp! transactor,
+            string! smbpath,
+            SmbCreateDisposition disposition,
+            out ushort fileId,
+            out ErrorCode errorCode)
+        {
+            return CreateFile(
+                transactor,
+                smbpath,
+                AccessMask.MaximumAllowed,
+                0,
+                SmbFileAttributes.Normal,
+                SmbFileShareAccess.Read | SmbFileShareAccess.Write,
+                disposition,
+                SmbFileCreateOptions.None,
+                out fileId,
+                out errorCode);
+        }
+
+        bool CreateFile(
+            SmbTransactor.Imp! transactor,
+            string! smbpath,
+            AccessMask DesiredAccess,
+            long AllocationSize,
+            SmbFileAttributes FileAttributes,
+            SmbFileShareAccess ShareAccess,
+            SmbCreateDisposition CreateDisposition,
+            SmbFileCreateOptions CreateOptions,
+            out ushort fileId,
+            out ErrorCode errorCode)
+        {
+            if (smbpath.IndexOf('/') != -1)
+                smbpath = smbpath.Replace('/', '\\');
+
+            ByteWriter data = new ByteWriter();
+            data.WriteStringUnicode(smbpath, false);
+
+            int requestLength = sizeof(SmbNtCreateAndXRequest) + data.Length;
+
+            byte[]! in ExHeap requestEncoded = new[ExHeap] byte[requestLength];
+            ref SmbNtCreateAndXRequest request = ref requestEncoded[0];
+
+            request.Header.Prepare(SmbCommand.NtCreateAndX, 24);
+
+            request.AndXCommand = 0xff; // no andx request
+            request.AndXReserved = 0;
+            request.AndXOffset = 0;
+            request.Reserved = 0;
+            request.NameLength = (ushort)data.Length;
+            request.Flags = 0x10; // 0x10 = request extended errors
+            request.RootDirectoryFid = 0;
+            request.DesiredAccess = (uint)DesiredAccess;
+            request.AllocationSize = (ulong)AllocationSize;
+            request.ExtFileAttributes = (uint)FileAttributes;
+            request.ShareAccess = (uint)ShareAccess;
+            request.CreateDisposition = (uint)CreateDisposition;
+            request.CreateOptions = (uint)CreateOptions | 0x40; // 0x40 == must be a file
+            request.ImpersonationLevel = (uint)SmbImpersonationLevel.Impersonation;
+            request.SecurityFlags = 3; // 1 = dynamic security tracking, 2 = only enable aspects avail to server
+            request.ByteCount = (ushort)data.Length;
+
+            data.CopyTo(requestEncoded, sizeof(SmbNtCreateAndXRequest));
+
+            transactor.SendRequest(requestEncoded);
+
+            switch receive {
+                case transactor.Response(responseEncoded):
+                    try {
+                        ref SmbHeader responseHeader = ref responseEncoded[0];
+                        if (responseHeader.IsError) {
+                            DebugLine("Server returned error code for CreateAndX request: " + responseHeader.GetErrorText());
+                            errorCode = GetDsErrorFromSmb(ref responseHeader);
+                            fileId = 0;
+                            return false;
+                        }
+
+                        ref SmbNtCreateAndXResponse response = ref responseEncoded[0];
+                        if (TraceSwitches.ShowIncrediblyNoisyDetail) {
+                            DebugLine("NtCreateFile response:");
+                            DebugLine("    Fid:                  " + response.Fid);
+                            DebugLine("    CreateAction:         " + response.CreateAction);
+                            DebugLine("    CreationTime:         " + response.CreationTime);
+                            DebugLine("    LastAccessTime:       " + response.LastAccessTime);
+                            DebugLine("    LastWriteTime:        " + response.LastWriteTime);
+                            DebugLine("    ChangeTime:           " + response.ChangeTime);
+                            DebugLine("    ExtFileAttributes:    {0:x8}", response.ExtFileAttributes);
+                            DebugLine("    AllocationSize:       " + response.AllocationSize);
+                            DebugLine("    EndOfFile:            " + response.EndOfFile);
+                            DebugLine("    FileType:             " + response.FileType);
+                            DebugLine("    DeviceState:          " + response.DeviceState);
+                            DebugLine("    Directory:            " + response.Directory);
+                            DebugLine("    ByteCount:            " + response.ByteCount);
+                        }
+
+                        fileId = response.Fid;
+                        errorCode = ErrorCode.NoError;
+                    } finally {
+                        delete responseEncoded;
+                    }
+                    return true;
+
+                case transactor.RequestFailed(transactionError):
+                    fileId = 0;
+                    errorCode = ErrorCode.Unknown;
+                    return false;
+
+                case transactor.ChannelClosed():
+                    fileId = 0;
+                    errorCode = ErrorCode.Unknown;
+                    return false;
+            }
+        }
+
+        bool CheckDirectoryExists(string! absolutePath)
+        {
+        /*
+            ByteWriter! data = new ByteWriter();
+            data.WriteStringUnicode(absolutePath, true);
+
+            int messageLength = sizeof(SmbCheckDirectoryRequest) + data.Length;
+            byte[] in ExHeap request_encoded = new[ExHeap] byte[messageLength];
+            ref SmbCheckDirectoryRequest request = ref request_encoded[0];
+
+            request.TransactionHeader.Header.Prepare(SmbCommand.CheckDirectory, 0);
+            request.TransactionHeader.TotalParameterCount = 0;
+            request.TransactionHeader.TotalDataCount = (ushort)data.Length;
+            request.TransactionHeader.MaxParameterCount = 50;
+
+            request.TransactionHeader.BufferFormat = 4;
+            data.CopyTo(request_encoded, sizeof(SmbCheckDirectoryRequest));
+
+            transactor.SendRequest(request_encoded, messageLength);
+
+            byte[]! in ExHeap response_encoded = WaitResponse(dir, transactor);
+
+            delete response_encoded;
+            */
+            DebugLine("CheckDirectoryExists - not yet implemented, returning true");
+            return true;
+        }
+
+        /*
+        This method implements directory enumeration.  It uses the SMB request
+        TRANS2_FIND_FIRST2 to search a directory.
+        */
+        void EnumerateDirectory(SmbTransactor.Imp! transactor, DirectoryServiceContract.Exp:Enumerate! dir)
+        {
+            byte[]! in ExHeap request = EncodeFindFirst2Request(_path);
+            transactor.SendRequest(request);
+
+            ushort searchId = 0;
+            uint resumeKey = 0;
+            bool first = true;
+
+            bool moreRecords;
+
+            for (;;)
+            {
+                // At this point, we are waiting for a response from either a FIND FIRST or a
+                // FIND NEXT request.  Since most of the processing is the same, we combine it here.
+
+                byte[]! in ExHeap response = WaitResponse(dir, transactor, first ? "FIND FIRST" : "FIND CLOSE");
+                try {
+
+                    ref SmbHeader header = ref response[0];
+
+                    if (header.IsError) {
+                        NtStatus status = header.GetNtStatus();
+
+                        if (status == NtStatus.NoSuchFile) {
+                            DebugLine("Received STATUS_NO_SUCH_FILE from server.");
+                            dir.SendEnumerationTerminated(ErrorCode.NoError);
+                        } else {
+                            DebugLine("FIND_FIRST2 request failed.  Received error from server.");
+                            dir.SendEnumerationTerminated(GetDsErrorFromSmb(ref header));
+                        }
+                        return;
+                    }
+
+                    // DebugLine("Received successful response to FIND FIRST request.");
+
+                    // Next, scan through the response, enumerate all entries, and convert to
+                    // EnumerationRecords[], and dir.SendEnumerationRecords.  Then wait for
+                    // the next message from dir, then decide what to do next.
+
+                    ushort responseSearchId;
+                    EnumerationRecords[] in ExHeap records = ExtractDirectoryEntries(response, out moreRecords, out responseSearchId);
+                    if (records == null) {
+                        // DebugLine("No enumeration records returned.");
+                        dir.SendEnumerationTerminated(ErrorCode.NoError);
+                        return;
+                    }
+
+                    if (first)
+                        searchId = responseSearchId;
+
+                    // DebugLine("Sending enumeration records to client, count = " + records.Length.ToString());
+                    dir.SendEnumerationEntries(records, moreRecords);
+                    // Now 'dir' is in the EnumerateAck state.
+                    // Valid in messages are: ReadEnumeration, EndEnumeration.
+                } finally {
+                    delete response;
+                }
+
+                switch receive {
+                    case dir.ChannelClosed():
+                        if (TraceSwitches.ShowDirectoryMessages) {
+                            DebugLine("Directory client has closed channel.");
+                        }
+                        if (moreRecords) {
+                            FindClose(transactor, searchId);
+                        }
+                        return;
+
+                    case transactor.ChannelClosed():
+                        DebugLine("SMB transactor has closed channel.");
+                        throw new Exception("SMB transactor has closed channel.");
+
+                    case dir.ReadEnumeration():
+                        if (moreRecords) {
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received ReadEnumeration.");
+                            }
+                        } else {
+                            if (TraceSwitches.ShowDirectoryMessages) {
+                                DebugLine("Received ReadEnumeration, but we already told the client there aren't any more!");
+                                DebugLine("Silly client.  Sending EnumerationEntries with more = false again.");
+                            }
+                            for (;;) {
+                                dir.SendEnumerationEntries(new[ExHeap] EnumerationRecords[0], false);
+                                switch receive {
+                                case dir.EndEnumeration():
+                                    if (TraceSwitches.ShowDirectoryMessages) {
+                                        DebugLine("Received EndEnumeration");
+                                    }
+                                    return;
+
+
+                                case dir.ChannelClosed():
+                                    if (TraceSwitches.ShowDirectoryMessages) {
+                                        DebugLine("Directory channel has closed");
+                                    }
+                                    return;
+
+                                case dir.ReadEnumeration():
+                                    if (TraceSwitches.ShowDirectoryMessages) {
+                                        DebugLine("Received ReadEnumeration");
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+
+                    case dir.EndEnumeration():
+                        if (TraceSwitches.ShowDirectoryMessages) {
+                            DebugLine("Received EndEnumeration.");
+                        }
+                        if (moreRecords) {
+                            DebugLine("Local client ended directory enumeration before the end of the records.  Sending FIND CLOSE.");
+                            FindClose(transactor, searchId);
+                        }
+                        return;
+                }
+
+
+                // At this point, we know that the server still has more enumeration records for us.
+                // So we need to loop, sending FIND NEXT requests to the server, and supplying the
+                // search handle that we received from the FIND FIRST response.
+
+
+                // DebugLine("Sending FIND NEXT request, search id = " + searchId);
+                byte[]! in ExHeap find_next_request = EncodeFindNextRequest(searchId, resumeKey);
+                transactor.SendRequest(find_next_request);
+            }
+        }
+
+        void FindClose(SmbTransactor.Imp! transactor, ushort searchId)
+        {
+            DebugLine("FindClose: not yet implemented");
+            /*
+            byte[]! in ExHeap request = EncodeFindCloseRequest(searchId);
+            transactor.SendRequest(request);
+            byte[]! in ExHeap response = WaitResponse(transactor, "FIND CLOSE");
+            delete response;
+            */
+        }
+
+        EnumerationRecords[] in ExHeap ExtractDirectoryEntries(byte[]! in ExHeap smbresponse, out bool moreRecords, out ushort searchId)
+        {
+            ref SmbTransaction2Response response = ref smbresponse[0];
+
+            int parameterOffset = response.Transaction.ParameterOffset;
+            int parameterCount = response.Transaction.TotalParameterCount;
+            assert parameterCount >= 0;
+            assert parameterOffset >= 0;
+
+            if (parameterCount == 0) {
+                DebugLine("No directory entries.");
+                moreRecords = false;
+                searchId = 0;
+                return null;
+            }
+
+            if (parameterOffset + SmbHeader.FramingHeaderLength + parameterCount > smbresponse.Length) {
+                DebugLine("Message is invalid.  The combination of ParameterCount and ParameterOffset cannot lie within the SMB message.");
+                moreRecords = false;
+                searchId = 0;
+                return null;
+            }
+
+            ref SmbFindFirstResponseParametersParameters parameters = ref smbresponse[parameterOffset + SmbHeader.FramingHeaderLength];
+            if (TraceSwitches.ShowIncrediblyNoisyDetail) {
+                DebugLine("FindFirst / FindNext Response Parameters:");
+                DebugLine("    SearchId:            " + parameters.SearchId);
+                DebugLine("    SearchCount:         " + parameters.SearchCount);
+                DebugLine("    EndOfSearch:         " + parameters.EndOfSearch);
+                DebugLine("    EaErrorOffset:       " + parameters.EaErrorOffset);
+                DebugLine("    LastNameOffset:      " + parameters.LastNameOffset);
+            }
+
+            int offset = response.Transaction.DataOffset + SmbHeader.FramingHeaderLength;
+            int limit = offset + response.Transaction.TotalDataCount;
+
+            if (limit > smbresponse.Length) {
+                DebugLine("Message (Find First / Next Response) is invalid.  The combination of DataOffset and DataCount exceeds the length of the message.");
+                moreRecords = false;
+                searchId = 0;
+                return null;
+            }
+
+            ArrayList list = new ArrayList();
+
+            if (TraceSwitches.ShowIncrediblyNoisyDetail) {
+                DebugLine("Enumeration entries (hopefully): offset 0x{0:x} limit 0x{1:x}", offset, limit);
+                Util.DumpBuffer(smbresponse, offset, limit - offset);
+            }
+
+            while (offset < limit) {
+                if (offset + sizeof(SmbFindFileDirectoryInfo) > limit) {
+                    DebugLine("Invalid data near the end of the directory enumeration data.");
+                    DebugLine("Too few bytes to be a real SmbFindFileDirectoryInfo.");
+                    break;
+                }
+
+                ref SmbFindFileDirectoryInfo entry = ref smbresponse[offset];
+
+                if (TraceSwitches.ShowIncrediblyNoisyDetail) {
+                    DebugLine("    Directory Entry:");
+                    DebugLine("        NextEntryOffset:     " + entry.NextEntryOffset);
+                    DebugLine("        FileIndex:           " + entry.FileIndex);
+                    DebugLine("        CreationTime:        " + entry.CreationTime);
+                    DebugLine("        LastAccessTime:      " + entry.LastAccessTime);
+                    DebugLine("        LastWriteTime:       " + entry.LastWriteTime);
+                    DebugLine("        ChangeTime:          " + entry.ChangeTime);
+                    DebugLine("        EndOfFile:           " + entry.EndOfFile);
+                    DebugLine("        AllocationSize:      " + entry.AllocationSize);
+                    DebugLine("        ExtFileAttributes:   {0:x8}", entry.ExtFileAttributes);
+                    DebugLine("        FileNameLength:      " + entry.FileNameLength);
+                }
+
+                byte[]! raw_name = new byte[entry.FileNameLength];
+                int nameOffset = offset + SmbFindFileDirectoryInfo.SizeOf;
+                Bitter.ToByteArray(smbresponse, nameOffset, (int)entry.FileNameLength, raw_name, 0);
+                string! name = System.Text.Encoding.Unicode.GetString(raw_name);
+
+                if (TraceSwitches.ShowIncrediblyNoisyDetail) {
+                    DebugLine("        Name raw bytes:      ");
+                    Util.DumpBuffer(raw_name);
+                    DebugLine("        Name:                " + name);
+                }
+
+                bool is_dir = (entry.ExtFileAttributes & 0x10) != 0;
+
+                DirEntry dentry = new DirEntry(name, is_dir ? NodeType.Directory : NodeType.File);
+                list.Add(dentry);
+
+                // DebugStub.Break();
+
+                if (entry.NextEntryOffset == 0)
+                    break;
+
+                if (entry.NextEntryOffset < SmbFindFileDirectoryInfo.SizeOf + entry.FileNameLength) {
+                    DebugLine("WARNING: Directory enumeration entry contains illegal NextEntryOffset; the value is too small.  No more enumeration entries will be parsed.");
+                    DebugLine("This is occurring due to a known bug/limitation -- we don't properly support TRANSACTION2 bodies that span multiple SMB messages.");
+                    DebugStub.Break();
+                    break;
+                }
+
+                offset += (int)entry.NextEntryOffset;
+            }
+
+            int recordCount = list.Count;
+            EnumerationRecords[] in ExHeap records = new[ExHeap] EnumerationRecords[recordCount];
+            for (int i = 0; i < recordCount; i++) {
+                DirEntry! direntry = (!)(DirEntry)list[i];
+
+                expose(records[i])
+                {
+                    char[]! in ExHeap previousPath = records[i].Path;
+                    if (previousPath != null)
+                        delete previousPath;
+
+                    records[i].Path = Bitter.FromString2(direntry.Name);
+                    records[i].Type = direntry.Type;
+                }
+            }
+
+            moreRecords = (parameters.EndOfSearch == 0);
+            searchId = parameters.SearchId;
+
+            return records;
+        }
+
+        class DirEntry
+        {
+            public string! Name;
+            public NodeType Type;
+
+            public DirEntry(string! name, NodeType type)
+            {
+                this.Name = name;
+                this.Type = type;
+            }
+        }
+
+        const char SingularityPathSeparator = '/';
+        const char NtPathSeparator = '\\';
+        const string SingularityPathSeparatorString = "/";
+        const string NtPathSeparatorString = "\\";
+
+        static byte[]! in ExHeap EncodeFindFirst2Request(string! path)
+        {
+            string! pattern = path.Replace(SingularityPathSeparator, NtPathSeparator);
+            if (!pattern.StartsWith(NtPathSeparatorString))
+                pattern = NtPathSeparatorString + pattern;
+
+            if (pattern.EndsWith(NtPathSeparatorString))
+                pattern += "*";
+            else
+                pattern += "\\*";
+
+            // 'data' contains the following:
+            //      STRING Name[];                   must be empty
+            //      byte Pad[];                      pad to alignment
+            //      byte Parameters[];               not sure
+            //      byte Pad1[];                     pad to alignment
+            //
+
+            ByteWriter parameters = new ByteWriter();
+            // USHORT SearchAttributes;
+            parameters.WriteUInt16Le((ushort)(
+                SmbSearchAttributes.Hidden
+                | SmbSearchAttributes.System
+                | SmbSearchAttributes.Directory));
+            // SearchCount
+            parameters.WriteUInt16Le((ushort)1000); // max number of entries to return
+            // USHORT Flags
+            parameters.WriteUInt16Le((ushort)(
+                SmbSearchFlags.CloseIfLastResponse
+                | SmbSearchFlags.ReturnResumeKeysForEachEntry));
+            // USHORT InformationLevel
+            parameters.WriteUInt16Le((ushort)SmbSearchInformationLevel.FileFullDirectoryInfo);
+            // ULONG SearchStorageType
+            parameters.WriteUInt32Le((uint)0);
+            // parameters.WriteZero(1); // alignment padding
+            parameters.WriteStringUnicode(pattern, true);
+
+            //ByteWriter data = new ByteWriter();
+            // data.Write(parameters);
+
+            int trantailOffset = sizeof(SmbHeader) + sizeof(SmbTransaction2RequestHeader);
+
+            ByteWriter trantail = new ByteWriter();
+            trantail.WriteUInt16Le(0); // ByteCount
+            trantail.WriteZero(2); // STRING[] name; always empty
+            int parametersOffset = trantailOffset + trantail.Position;
+            trantail.Write(parameters);
+
+            int requestLength = trantailOffset + trantail.Length;
+            byte[] in ExHeap request_encoded = new[ExHeap] byte[requestLength];
+
+            ref SmbHeader header = ref request_encoded[0];
+            header.Prepare(SmbCommand.Transaction2, 15);
+
+            ref SmbTransaction2RequestHeader transaction = ref request_encoded[sizeof(SmbHeader)];
+            transaction.TotalDataCount = 0; // total size of extended attr list
+            transaction.SetupCount = 1;
+            transaction.TotalParameterCount = (ushort)parameters.Length;
+            transaction.MaxParameterCount = 10;
+            transaction.MaxDataCount = 0x4000;
+            transaction.MaxSetupCount = 0;
+            transaction.Reserved = 0;
+            transaction.Flags = 0;
+            transaction.Timeout = 0;
+            transaction.Reserved2 = 0;
+            transaction.ParameterCount = (ushort)parameters.Length;
+            transaction.ParameterOffset = (ushort)(parametersOffset - 4); // -4 compensates for SMB framing header
+            transaction.DataCount = 0;
+            transaction.DataOffset = 0;
+            transaction.SetupCount = 1;
+            transaction.Setup0 = (ushort)SmbTransaction2Code.FindFirst;
+
+            request_encoded[parametersOffset] = (byte)(parameters.Length & 0xff);
+            request_encoded[parametersOffset] = (byte)(parameters.Length >> 8);
+            trantail.CopyTo(request_encoded, trantailOffset);
+
+            return request_encoded;
+        }
+
+        static byte[]! in ExHeap EncodeFindNextRequest(ushort searchId, uint resumeKey)
+        {
+            // 'data' contains the following:
+            //      STRING Name[];                   must be empty
+            //      byte Pad[];                      pad to alignment
+            //      byte Parameters[];               not sure
+            //      byte Pad1[];                     pad to alignment
+            //
+
+            ByteWriter parameters = new ByteWriter();
+            // USHORT Sid; // search ID
+            parameters.WriteUInt16Le(searchId);
+            // SearchCount
+            parameters.WriteUInt16Le((ushort)1000); // max number of entries to return
+            // USHORT InformationLevel
+            parameters.WriteUInt16Le((ushort)SmbSearchInformationLevel.FileFullDirectoryInfo);
+            parameters.WriteUInt32Le(resumeKey);
+            // USHORT Flags
+            parameters.WriteUInt16Le((ushort)(
+                SmbSearchFlags.CloseIfLastResponse
+                | SmbSearchFlags.ReturnResumeKeysForEachEntry));
+            // STRING FileName;
+            parameters.WriteStringUnicode("", true);
+
+            //ByteWriter data = new ByteWriter();
+            // data.Write(parameters);
+
+            int trantailOffset = sizeof(SmbHeader) + sizeof(SmbTransaction2RequestHeader);
+
+            ByteWriter trantail = new ByteWriter();
+            trantail.WriteUInt16Le(0); // ByteCount
+            trantail.WriteZero(2); // STRING[] name; always empty
+            int parametersOffset = trantailOffset + trantail.Position;
+            trantail.Write(parameters);
+
+            int requestLength = trantailOffset + trantail.Length;
+            byte[] in ExHeap request_encoded = new[ExHeap] byte[requestLength];
+
+            ref SmbHeader header = ref request_encoded[0];
+            header.Prepare(SmbCommand.Transaction2, 15);
+
+            ref SmbTransaction2RequestHeader transaction = ref request_encoded[sizeof(SmbHeader)];
+            transaction.TotalDataCount = 0; // total size of extended attr list
+            transaction.SetupCount = 1;
+            transaction.TotalParameterCount = (ushort)parameters.Length;
+            transaction.MaxParameterCount = 10;
+            transaction.MaxDataCount = 0x4000;
+            transaction.MaxSetupCount = 0;
+            transaction.Reserved = 0;
+            transaction.Flags = 0;
+            transaction.Timeout = 0;
+            transaction.Reserved2 = 0;
+            transaction.ParameterCount = (ushort)parameters.Length;
+            transaction.ParameterOffset = (ushort)(parametersOffset - 4); // -4 compensates for SMB framing header
+            transaction.DataCount = 0;
+            transaction.DataOffset = 0;
+            transaction.SetupCount = 1;
+            transaction.Setup0 = (ushort)SmbTransaction2Code.FindNext;
+
+            request_encoded[parametersOffset] = (byte)(parameters.Length & 0xff);
+            request_encoded[parametersOffset] = (byte)(parameters.Length >> 8);
+            trantail.CopyTo(request_encoded, trantailOffset);
+
+            return request_encoded;
+        }
+
+        byte[]! in ExHeap WaitResponse(DirectoryServiceContract.Exp! dir, SmbTransactor.Imp! transactor, string! annotation)
+        {
+            switch receive {
+                case dir.ChannelClosed():
+                    throw new Exception("The directory service client has closed its channel.");
+
+                case transactor.Response(byte[]! in ExHeap response_encoded):
+                    return response_encoded;
+
+                case transactor.ChannelClosed():
+                    throw new Exception("An internal error has occurred.  The SMB multiplexer closed the SmbTransactor channel before replying.");
+
+                case transactor.RequestFailed(SmbTransactionError error):
+                    throw new Exception("The SMB transaction failed.  Error code: " + error.ToString());
+            }
+        }
+
+        byte[]! in ExHeap WaitResponse(SmbTransactor.Imp! transactor, string! annotation)
+        {
+            switch receive {
+                case transactor.Response(byte[]! in ExHeap response_encoded):
+                    return response_encoded;
+
+                case transactor.ChannelClosed():
+                    throw new Exception("An internal error has occurred.  The SMB multiplexer closed the SmbTransactor channel before replying.");
+
+                case transactor.RequestFailed(error):
+                    throw new Exception("The SMB transaction failed.  Error code: " + error.ToString());
+            }
+        }
+
+        void CreateDirectory(DirectoryServiceContract.Exp! dir, SmbTransactor.Imp! transactor, string! singpath)
+        {
+            if (ContainsSpecialChars(singpath)) {
+                dir.SendNakCreateDirectory(ErrorCode.BadArguments);
+                return;
+            }
+
+            string! smbpath = ToAbsoluteSmbPath(singpath);
+
+            ByteWriter parameters = new ByteWriter();
+            parameters.WriteUInt32Le(0); // reserved
+            parameters.WriteStringUnicode(smbpath, true);
+
+            int parameterOffset = Util.Align4(sizeof(SmbCreateDirectoryRequest));
+            int requestLength = parameterOffset + parameters.Length;
+            byte[] in ExHeap requestEncoded = new[ExHeap] byte[requestLength];
+
+            ref SmbCreateDirectoryRequest request = ref requestEncoded[0];
+            request.Header.Prepare(SmbCommand.Transaction2, 15);
+            request.Transaction.MaxSetupCount = 0;
+            request.Transaction.SetupCount = 1;
+            request.Transaction.TotalParameterCount = (ushort)parameters.Length;
+            request.Transaction.ParameterCount = (ushort)parameters.Length;
+            request.Transaction.ParameterOffset = (ushort)(parameterOffset - SmbHeader.FramingHeaderLength);
+            request.Transaction.MaxParameterCount = (ushort)100;
+            request.Transaction.Setup0 = (ushort)SmbTransaction2Code.CreateDirectory;
+
+            parameters.CopyTo(requestEncoded, sizeof(SmbCreateDirectoryRequest));
+
+            transactor.SendRequest(requestEncoded);
+
+            switch receive {
+                case transactor.Response(responseEncoded):
+                    ref SmbHeader response = ref responseEncoded[0];
+                    if (response.IsError) {
+                        DebugLine("FAILED to create directory: " + response.GetErrorText());
+                        ErrorCode errorCode = GetDsErrorFromSmb(ref response);
+                        dir.SendNakCreateDirectory(errorCode);
+                    } else {
+                        DebugLine("Successfully created directory: " + singpath);
+                        dir.SendAckCreateDirectory();
+                    }
+                    delete responseEncoded;
+                    break;
+
+                case transactor.RequestFailed(error):
+                    dir.SendNakCreateDirectory(ErrorCode.Unknown);
+                    break;
+
+                case transactor.ChannelClosed():
+                    dir.SendNakCreateDirectory(ErrorCode.Unknown);
+                    break;
+            }
+        }
+
+        string! ToAbsoluteSmbPath(string! path)
+        {
+            string! path_as_smb = path.Replace(SingularityPathSeparator, NtPathSeparator);
+
+            if (path_as_smb.StartsWith(NtPathSeparatorString))
+            {
+                // The path is already in absolute form.
+                return path_as_smb;
+            }
+            else
+            {
+                // The path is a relative path.  Qualify it using the path of the current directory.
+                if (_smbpath.EndsWith(NtPathSeparatorString))
+                    return _smbpath + path_as_smb;
+                else
+                    return _smbpath + NtPathSeparatorString + path_as_smb;
+            }
+        }
+
+        static bool ContainsSpecialChars(string! path)
+        {
+            return path.IndexOfAny(_specialChars) != -1;
+        }
+
+        static readonly char[]! _specialChars = { '<', '>', '*', '?', '"' };
+
+        void DeleteFile(DirectoryServiceContract.Exp! dir, SmbTransactor.Imp! transactor, string! singpath)
+        {
+            // The SMB protocol actually allows for wildcards in the DELETE FILE request.
+            // However, I don't want to support this until DirectoryServiceContract explicitly
+            // provides for wildcards.
+            if (ContainsSpecialChars(singpath)) {
+                dir.SendNakDeleteFile(ErrorCode.BadArguments);
+                return;
+            }
+
+            string! smbpath = ToAbsoluteSmbPath(singpath);
+
+            ByteWriter data = new ByteWriter();
+            data.WriteStringUnicode(smbpath, true);
+
+            int requestLength = sizeof(SmbDeleteFileRequest) + data.Length;
+            byte[]! in ExHeap requestEncoded = new[ExHeap] byte[requestLength];
+
+            ref SmbDeleteFileRequest request = ref requestEncoded[0];
+            request.Header.Prepare(SmbCommand.DeleteFile, SmbDeleteFileRequest.ParameterCount);
+            request.SearchAttributes = 0;
+            request.ByteCount = (ushort)data.Length;
+            request.BufferFormat = 4;
+
+            data.CopyTo(requestEncoded, sizeof(SmbDeleteFileRequest));
+
+            transactor.SendRequest(requestEncoded);
+
+            switch receive {
+                case transactor.Response(byte[]! in ExHeap responseEncoded):
+                    ref SmbHeader response = ref responseEncoded[0];
+                    if (response.IsError) {
+                        // DebugLine("Server failed DELETE FILE request: " + response.GetErrorText());
+                        ErrorCode errorCode = GetDsErrorFromSmb(ref response);
+                        dir.SendNakDeleteFile(errorCode);
+                    } else {
+                        // DebugLine("File successfully deleted.");
+                        dir.SendAckDeleteFile();
+                    }
+                    delete responseEncoded;
+                    break;
+
+                case transactor.RequestFailed(SmbTransactionError error):
+                    dir.SendNakDeleteFile(ErrorCode.Unknown);
+                    break;
+
+                case transactor.ChannelClosed():
+                    DebugLine("Transactor closed while waiting for response.");
+                    dir.SendNakDeleteFile(ErrorCode.Unknown);
+                    break;
+            }
+        }
+
+        void DeleteDirectory(DirectoryServiceContract.Exp! dir, SmbTransactor.Imp! transactor, string! singpath)
+        {
+            if (ContainsSpecialChars(singpath)) {
+                dir.SendNakDeleteDirectory(ErrorCode.BadArguments);
+                return;
+            }
+
+            string! smbpath = ToAbsoluteSmbPath(singpath);
+
+            ByteWriter data = new ByteWriter();
+            data.WriteStringUnicode(smbpath, true);
+
+            int requestLength = sizeof(SmbDeleteDirectoryRequest) + data.Length;
+            byte[]! in ExHeap requestEncoded = new[ExHeap] byte[requestLength];
+
+            ref SmbDeleteFileRequest request = ref requestEncoded[0];
+            request.Header.Prepare(SmbCommand.DeleteDirectory, SmbDeleteDirectoryRequest.ParameterCount);
+            request.ByteCount = (ushort)data.Length;
+            request.BufferFormat = 4;
+
+            data.CopyTo(requestEncoded, sizeof(SmbDeleteDirectoryRequest));
+            transactor.SendRequest(requestEncoded);
+
+            switch receive {
+                case transactor.Response(byte[]! in ExHeap responseEncoded):
+                    ref SmbHeader response = ref responseEncoded[0];
+                    if (response.IsError) {
+                        DebugLine("Server failed DELETE FILE request: " + response.GetErrorText());
+                        ErrorCode errorCode = GetDsErrorFromSmb(ref response);
+                        dir.SendNakDeleteFile(errorCode);
+                    } else {
+                        DebugLine("File successfully deleted.");
+                        dir.SendAckDeleteFile();
+                    }
+                    delete responseEncoded;
+                    break;
+
+                case transactor.RequestFailed(SmbTransactionError error):
+                    dir.SendNakDeleteFile(ErrorCode.Unknown);
+                    break;
+
+                case transactor.ChannelClosed():
+                    DebugLine("Transactor closed while waiting for response.");
+                    dir.SendNakDeleteFile(ErrorCode.Unknown);
+                    break;
+            }
+        }
+
+        void CloseFileId(SmbTransactor.Imp! transactor, ushort fileId)
+        {
+            int requestLength = sizeof(SmbCloseFileRequest);
+            byte[]! in ExHeap request_encoded = new[ExHeap] byte[requestLength];
+            ref SmbCloseFileRequest request = ref request_encoded[0];
+            request.Header.Prepare(SmbCommand.CloseFile, 3);
+            request.Fid = fileId;
+            request.ByteCount = 0;
+
+            transactor.SendRequest(request_encoded);
+
+            switch receive {
+                case transactor.Response(responseEncoded):
+                    delete responseEncoded;
+                    break;
+
+                case transactor.RequestFailed(error):
+                    DebugLine("The CLOSE FILE request has failed.  The server returned an error code: " + error);
+                    break;
+
+                case transactor.ChannelClosed():
+                    DebugLine("Failed to execute CLOSE FILE request.  The transactor channel has closed.");
+                    break;
+            }
+        }
+
+
+        static ErrorCode GetDsErrorFromSmb(ref SmbHeader header)
+        {
+            if (!header.IsError)
+                return ErrorCode.NoError;
+
+            // -XXX- This is a placeholder for some more sophisticated mapping
+            // -XXX- from SMB error codes to Singularity error codes.
+
+            NtStatus status = header.GetNtStatus();
+            switch (status) {
+                case NtStatus.ObjectNameNotFound: return ErrorCode.NotFound;
+                case NtStatus.ObjectPathNotFound: return ErrorCode.NotFound;
+
+                default:
+                    return ErrorCode.Unknown;
+            }
+
+        }
+
+        void GetAttributes(SmbTransactor.Imp! transactor, DirectoryServiceContract.Exp! dir, string! path)
+        {
+            string! smbpath = ToAbsoluteSmbPath(path);
+
+            ushort informationLevel = 0x102;
+
+            ByteWriter parameters = new ByteWriter();
+            parameters.WriteUInt16Le(informationLevel);
+            parameters.WriteUInt32Le(0); // reserved
+            parameters.WriteStringUnicode(smbpath, true);
+
+            int requestLength = Util.Align4(sizeof(SmbTransaction2Request) + sizeof(ushort));
+            int parameterOffset = requestLength;
+            requestLength += parameters.Length;
+
+            byte[] in ExHeap requestEncoded = new[ExHeap] byte[requestLength];
+            ref SmbTransaction2Request request = ref requestEncoded[0];
+
+            request.Header.Prepare(SmbCommand.Transaction2, 15);
+            request.Transaction.TotalParameterCount = (ushort)parameters.Length;
+            request.Transaction.ParameterCount = (ushort)parameters.Length;
+            request.Transaction.ParameterOffset = (ushort)(parameterOffset - SmbHeader.FramingHeaderLength);
+            request.Transaction.MaxParameterCount = 1000;
+            request.Transaction.MaxDataCount = 1000;
+            request.Transaction.SetupCount = 1;
+            request.Transaction.Setup0 = (ushort)SmbTransaction2Code.QueryPathInformation;
+            ref ushort ByteCount = ref requestEncoded[sizeof(SmbTransaction2Request)];
+            ByteCount = 0;
+
+            parameters.CopyTo(requestEncoded, parameterOffset);
+
+            transactor.SendRequest(requestEncoded);
+
+            switch receive {
+                case transactor.Response(responseEncoded):
+                    try {
+                        ref SmbHeader header = ref responseEncoded[0];
+                        if (header.IsError) {
+                            DebugLine("GetAttributes: received error response: " + header.GetErrorText());
+                            dir.SendNakGetAttributes(GetDsErrorFromSmb(ref header));
+                            return;
+                        }
+
+                        if (responseEncoded.Length < sizeof(SmbTransaction2Response)) {
+                            DebugLine("GetAttributes: Response is too small to be a valid response!");
+                            dir.SendNakGetAttributes(ErrorCode.Unknown);
+                            return;
+                        }
+
+                        ref SmbTransaction2Response response = ref responseEncoded[0];
+                        if (response.Transaction.DataOffset < sizeof(SmbTransaction2Response)
+                            || (response.Transaction.DataOffset + response.Transaction.TotalDataCount + SmbHeader.FramingHeaderLength > responseEncoded.Length)
+                            || (response.Transaction.TotalDataCount < sizeof(SmbQueryFileStandardInfo))) {
+                            DebugLine("Response has invalid fields (DataOffset and/or DataCount)");
+                            dir.SendNakGetAttributes(ErrorCode.Unknown);
+                            return;
+                        }
+
+                        ref SmbQueryFileStandardInfo info = ref responseEncoded[SmbHeader.FramingHeaderLength + response.Transaction.DataOffset];
+
+                        if (TraceSwitches.ShowIncrediblyNoisyDetail) {
+                            DebugLine("GetAttributes response:");
+                            DebugLine("    AllocationSize:         " + info.AllocationSize);
+                            DebugLine("    EndOfFile:              " + info.EndOfFile);
+                            DebugLine("    NumberOfLinks:          " + info.NumberOfLinks);
+                            DebugLine("    DeletePending:          " + (info.DeletePending != 0));
+                            DebugLine("    Directory:              " + (info.Directory != 0));
+                        }
+
+                        NodeType nodeType = (info.Directory != 0) ? NodeType.Directory : NodeType.File;
+
+                        dir.SendAckGetAttributes(nodeType, info.EndOfFile);
+                    } finally {
+                        delete responseEncoded;
+                    }
+                    return;
+            }
+        }
+
+        void DebugLine(string msg)
+        {
+            SmbDebug.WriteLine(_debugprefix + msg);
+        }
+
+        void DebugLine(string format, params object[] args)
+        {
+            SmbDebug.WriteLine(_debugprefix + String.Format(format, args));
+        }
+
+
+        void ITracked.Expose() {}
+        void ITracked.UnExpose() {}
+        void ITracked.Acquire() {}
+        void ITracked.Release() {}
+    }
+}
diff --git a/base/Services/Smb/Client/FileExp.sg b/base/Services/Smb/Client/FileExp.sg
new file mode 100644
index 0000000..be85fec
--- /dev/null
+++ b/base/Services/Smb/Client/FileExp.sg
@@ -0,0 +1,500 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/FileExp.sg
+//
+//  Note:
+//
+//		This file contains the implementation of FileContract.  This contract
+//		allows clients to access the contents of files on remote SMB servers.
+//		The FileExp class holds a reference to FileContract.Exp, on which it
+//		receives file requests (read, write, etc.), and also a reference to
+//		SmbTransactor.Imp, which it uses to execute SMB transactions.
+//
+//		Each instance of FileExp runs in its own thread.  Access to the
+//		single TCP connection to the SMB server is multiplexed by the
+//		TransportMux class, which is accessed using the SmbTransactor channel.
+//
+//		The general pattern is that the FileExp thread loops in a switch-receive
+//		loop, and when it receives a file request, it translates the request into
+//		SMB requests.  It formats those requests, submits them to the transport
+//		mux, then waits for the response, and translates the response into
+//		FileContract response messages.
+//
+//		The top-level loop listens for FileContract messages, and listens for
+//		ChannelClosed on the FileContract.  If either channel closes, the
+//		thread terminates.  While the thread is waiting for responses on its
+//		SmbTransactor channel, it also listens for ChannelClosed on its
+//		FileContract channel.  This prevents the thread from blocking for a 
+//		long time, if either channel closes.
+//
+//
+//	TODO:
+//
+//		*	Exception handling is poor.
+//
+
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Smb.PublicChannels;
+using Smb.PrivateChannels;
+using Smb.Protocol;
+using Smb.Shared;
+
+namespace Smb.Client
+{
+    /*
+    This class implements (exports) FileContract.  A thread is devoted to servicing incoming requests.
+    The "upper" edge of this thread is FileContract.Exp.  The "lower" edge of this thread is SmbTransactor.Imp,
+    which is the internal communications pipe to the SMB request multiplexer.
+    
+    The service thread will terminate when several conditions occur:
+        * The FileContract.Exp channel closes.
+        * The SmbTransactor.Imp channel closes.
+        * Any internal exception reaches the main switch-receive loop.
+    */
+	class FileExp
+	{
+	    public static void CreateServiceThread([Claims]FileContract.Exp:Start! file_exp, string! path, ushort fileId, [Claims]SmbTransactor.Imp:Ready! transactor)
+	    {
+	        FileExp exp = new FileExp(file_exp, path, fileId, transactor);
+			Thread thread = new Thread(new ThreadStart(exp.ThreadServiceRoutine));
+			thread.Start();
+	    }
+	    
+		private FileExp([Claims]FileContract.Exp:Start! file_exp, string! path, ushort fileId, [Claims]SmbTransactor.Imp:Ready! transactor)
+		{
+			_path = path;
+			_file_exp = new TRef<FileContract.Exp:Start>(file_exp);
+			_fileId = fileId;
+			_debugprefix = String.Format("File[{0:x4}:{1}] ", fileId, path);
+			_transactor = new TRef<SmbTransactor.Imp:Ready>(transactor);
+		}
+		
+		// These two channels are passed to the service thread.
+		// The service thread never transfers ownership of the channels, so after the
+		// service thread starts, these TRefs are never used again.
+		readonly TRef<FileContract.Exp:Start>! _file_exp;
+		readonly TRef<SmbTransactor.Imp:Ready>! _transactor;
+
+        // The absolute path (within the namespace of the SMB client).  Currently this is only used for
+        // diagnostic messages.		
+		readonly string! _path;
+		
+		// The 16-bit SMB file handle.  This value is assigned by the SMB server, and is returned in the
+		// response to the CreateAndX response.
+		readonly ushort _fileId;
+		
+		readonly string! _debugprefix;
+						
+		private void ThreadServiceRoutine()
+		{
+			FileContract.Exp:Start! file = _file_exp.Acquire();
+			SmbTransactor.Imp! transactor = _transactor.Acquire();
+			
+			file.SendSuccess();
+			
+			DebugLine("Service thread running");
+			
+			try
+			{
+				for (;;)
+				{
+					switch receive
+					{
+						case file.Read(byte []! in ExHeap buf, long bufOffset, long fileOffset, long maxLength):
+							int error;
+							long bytesRead = Read(file, transactor, buf, bufOffset, fileOffset, maxLength, out error);
+							#if NOISY
+							if (bytesRead >= 0)
+								DebugLine("Sending AckRead: bytesRead {0}", bytesRead);
+							else
+								DebugLine("Sending Ackread: bytesRead {0} error {1}", bytesRead, error);
+							#endif
+							file.SendAckRead(buf, bytesRead, error);
+							break;
+	                        
+						case file.Write(byte []! in ExHeap buf, long bufOffset, long fileOffset, long maxLength):
+						    int error;
+						    long bytesWritten = Write(file, transactor, buf, bufOffset, fileOffset, maxLength, out error);
+						    if (bytesWritten >= 0)
+						        DebugLine("Sending AckWrite: bytesWritten {0}", bytesWritten);
+						    else
+						        DebugLine("Sending AckWrite: bytesWritten {0} error {1}", bytesWritten, error);
+						    file.SendAckWrite(buf, bytesWritten, error);
+							break;
+							
+						case file.Close():
+							DebugLine("File client has closed gracefully (Close)");
+							file.SendAckClose();
+							CloseFid(transactor);
+							return;
+						
+						case file.ChannelClosed():
+							DebugLine("File client has closed abruptly (ChannelClose)");
+							CloseFid(transactor);
+							return;
+							
+						case transactor.ChannelClosed():
+						    DebugLine("The transactor channel has closed.  The FileContract service channel will now close.");
+						    return;
+					}
+				}
+
+            } catch(Exception ex) {
+                DebugLine("An exception has reached the service loop of FileContract service thread.");
+                DebugLine("The service thread will now terminate.");
+                Util.ShowExceptionDebug(ex, "FileContract service thread failed");
+			} finally {
+				delete file;
+				delete transactor;
+			}
+		}
+		
+		/*
+		This method reads a block of data from the remote file server.  The file must already be open;
+		the 16-bit file ID is taken from the _fileId field of the class instance of this method.
+		If the data block cannot fit into a single SMB request, then this method will issue more than
+		one data transfer request.  Therefore, there is no guarantee of any sort of "atomic" data transfer.
+		
+		This method is synchronous; it will not return until the data has been read, or until an error
+		occurs on the SMB client channel (transactor).
+		*/
+		long Read(
+		    FileContract.Exp! file,
+			SmbTransactor.Imp! transactor, 
+			byte []! in ExHeap buf,
+			long bufOffset,
+			long fileOffset,
+			long maxLength,
+			out int error)
+		{
+			if (TraceSwitches.ShowFileActivity)
+				DebugLine("Read: file offset 0x{0:x} max length 0x{1:x}", fileOffset, maxLength);
+			
+			if (bufOffset < 0 || fileOffset < 0 || maxLength < 0) {
+				DebugLine("Invalid parameters.  One or more values are negative.");
+				error = (int)ErrorCode.BadArguments;
+				return -1;
+			}
+			
+			if (bufOffset + maxLength > buf.Length) {
+				maxLength = buf.Length - bufOffset;
+			}
+			
+			// Arbitrary.
+			int transferMaxLength = 1024;
+			
+			long bytesRead = 0;			
+			
+			for (;;) {
+				assert bytesRead <= maxLength;
+				long bytesRemaining = maxLength - bytesRead;
+				if (bytesRemaining == 0) {
+					error = 0;
+					return bytesRead;
+				}
+				
+				if (bytesRemaining > transferMaxLength)
+					bytesRemaining = transferMaxLength;
+				
+				int bytesRequested = (int)bytesRemaining;
+					
+				int requestLength = sizeof(SmbReadAndXRequest);
+				byte[] in ExHeap requestEncoded = new[ExHeap] byte[sizeof(SmbReadAndXRequest)];
+				ref SmbReadAndXRequest request = ref requestEncoded[0];
+				
+				long transferFileOffset = fileOffset + bytesRead;
+				
+				request.Header.Prepare(SmbCommand.ReadAndX, 12);
+				request.AndXCommand = 0xff;
+				request.AndXReserved = 0;
+				request.AndXOffset = 0;
+				request.Fid = _fileId;
+				request.FileOffsetLow = (uint)(transferFileOffset & 0xffffffffu);
+				request.MaxCount = (ushort)bytesRequested;
+				request.MinCount = 0;
+				request.MaxCountHigh = 0;
+				request.Remaining = 0;
+				request.FileOffsetHigh = (uint)(transferFileOffset >> 32);				
+				request.ByteCount = 0;
+				
+				transactor.SendRequest(requestEncoded);
+				
+				// DebugLine("Reading at file offset 0x{0:x}", transferFileOffset);
+				
+				switch receive
+				{
+					case transactor.Response(responseEncoded):
+					
+						ref SmbHeader header = ref responseEncoded[0];
+						if (header.IsError) {
+							DebugLine("ReadAndX failed: " + header.GetErrorText());
+							delete responseEncoded;
+							goto return_error;
+						} else {
+							if (responseEncoded.Length < sizeof(SmbReadAndXResponse)) {
+								DebugLine("Response is too small to be a valid SmbReadAndXResponse.");
+								delete responseEncoded;
+								goto return_error;
+							}
+							ref SmbReadAndXResponse response = ref responseEncoded[0];
+							
+							int dataOffset = SmbHeader.FramingHeaderLength + response.DataOffset;
+							uint dataLength = response.DataLength | (((uint)response.DataLengthHigh) << 16);
+
+							if (dataLength > bytesRequested) {
+								DebugLine("Server returned more bytes than we asked for!!  Truncating.");
+								dataLength = (uint)requestLength;
+							}
+							
+							if (dataLength != 0) {
+								if (dataOffset < sizeof(SmbReadAndXResponse)
+									|| (dataOffset + dataLength) > responseEncoded.Length) {
+									DebugLine("Response is invalid.  DataOffset and DataLength are bogus.");
+									delete responseEncoded;
+									goto return_error;
+								}
+							//	DebugLine("Transferred 0x{0:x} bytes to buffer offset 0x{1:x}.", dataLength, bufOffset);
+								Bitter.Copy(buf, (int)(bufOffset + bytesRead), (int)dataLength, responseEncoded, (int)dataOffset);
+								bytesRead += dataLength;
+								delete responseEncoded;
+							} else {
+								DebugLine("Server indicates that zero bytes were transferred in this exchange.");
+								DebugLine("Returning {0} bytes read.", bytesRead);
+								delete responseEncoded;
+								error = 0;
+								return bytesRead;
+							}
+						}						
+						break;
+						
+					case transactor.RequestFailed(tranError):
+						DebugLine("ReadAndX failed: " + tranError.ToString());
+						goto return_error;
+						
+					case transactor.ChannelClosed():
+						DebugLine("Transactor channel was closed.");
+						goto return_error;
+						
+					case file.ChannelClosed():
+					    DebugLine("The FileContract.Exp channel has closed during a ReadAndX transfer.");
+					    DebugLine("The FileContract service thread will now close its transactor channel and terminate.");
+					    error = -1;
+					    return -1;
+				}
+			}
+			
+		return_error:
+			if (bytesRead > 0) {
+				// Some bytes were transferred.
+				error = 0;
+				return bytesRead;
+			} else {
+				// No bytes were transferred, and there was an error.
+				DebugLine("No bytes transferred.  Returning -1 for bytes transferred.");
+				error = -1;
+				return -1;
+			}
+		}
+		
+		/*
+		This method writes a block of data to the remote file server.  The file must already be
+		open; the 16-bit file ID is taken from the _fileId field of the class instance of this method.
+		If the data block cannot fit into a single SMB request, then this method will issue more than
+		one data transfer request.  Therefore, there is no guarantee of any sort of "atomic" data writes.
+		
+		This method is synchronous; it will not return until the data has been written, or until an error
+		occurs on the SMB client channel (transactor).
+		*/
+		long Write(
+		    FileContract.Exp! file,
+			SmbTransactor.Imp! transactor, 
+			byte []! in ExHeap buf,
+			long bufOffset,
+			long fileOffset,
+			long maxLength,
+			out int error)
+		{
+			DebugLine("Write: file offset 0x{0:x} max length 0x{1:x}", fileOffset, maxLength);
+			
+			if (bufOffset < 0 || fileOffset < 0 || maxLength < 0) {
+				DebugLine("Invalid parameters.  One or more values are negative.");
+				error = (int)ErrorCode.BadArguments;
+				return -1;
+			}
+			
+			if (bufOffset + maxLength > buf.Length) {
+				maxLength = buf.Length - bufOffset;
+			}
+			
+			// Arbitrary.
+			int transferMaxLength = 1024;
+			
+			long bytesWritten = 0;			
+			
+			for (;;) {
+				assert bytesWritten <= maxLength;
+				long bytesRemaining = maxLength - bytesWritten;
+				if (bytesRemaining == 0) {
+					error = 0;
+					return bytesWritten;
+				}
+				
+				if (bytesRemaining > transferMaxLength)
+					bytesRemaining = transferMaxLength;
+				
+				// bytesRequested is the number of bytes that we will attempt to transfer in this
+				// single request.
+				int bytesRequested = (int)bytesRemaining;
+
+				int requestLength = sizeof(SmbWriteAndXRequest);
+				requestLength = Util.Align4(requestLength);
+				int payloadOffset = requestLength;
+				requestLength += bytesRequested;
+				requestLength = Util.Align4(requestLength);
+				
+				byte[] in ExHeap requestEncoded = new[ExHeap] byte[requestLength];
+				ref SmbWriteAndXRequest request = ref requestEncoded[0];
+				
+				long transferFileOffset = fileOffset + bytesWritten;
+
+				request.Header.Prepare(SmbCommand.WriteAndX, SmbWriteAndXRequest.ParameterCount);
+				request.AndXCommand = 0xff;
+				request.AndXReserved = 0;
+				request.AndXOffset = 0;
+				request.Fid = _fileId;
+				request.FileOffsetLow = (uint)(transferFileOffset & 0xffffffffu);
+				request.Reserved = 0;
+				request.WriteMode = 0;
+				request.Remaining = 0xffff;
+				request.DataLengthHigh = (ushort)(bytesRequested >> 16);
+				request.DataLengthLow = (ushort)(bytesRequested & 0xffff);
+				request.DataOffset = (ushort)(payloadOffset - SmbHeader.FramingHeaderLength);
+				request.FileOffsetHigh = (uint)(transferFileOffset >> 32);
+				request.ByteCount = 0;
+
+                // Transfer the data from the buffer supplied by FileContract importer to our request buffer.
+                // In the future, if we're smarter, we may be able to eliminate this copy by passing this
+                // buffer directly to TcpConnectionContract.  That would require modifying TcpConnectionContract
+                // so that it returned the (unmodified) buffer.
+                Bitter.Copy(requestEncoded, payloadOffset, bytesRequested, buf, (int)(bufOffset + bytesWritten));
+				
+				transactor.SendRequest(requestEncoded);
+				
+				DebugLine("Writing at file offset 0x{0:x}", transferFileOffset);
+				DebugLine("Waiting for response to WriteAndX");
+				
+				switch receive
+				{
+					case transactor.Response(responseEncoded):
+					
+						ref SmbHeader header = ref responseEncoded[0];
+						if (header.IsError) {
+							DebugLine("WriteAndX failed: " + header.GetErrorText());
+							delete responseEncoded;
+							goto return_error;
+						} else {
+							if (responseEncoded.Length < sizeof(SmbWriteAndXResponse)) {
+								DebugLine("Response is too small to be a valid SmbWriteAndXResponse.");
+								delete responseEncoded;
+								goto return_error;
+							}
+							ref SmbWriteAndXResponse response = ref responseEncoded[0];
+							
+							if (response.Count == 0) {
+							    // No bytes were transferred.  Assume the remote file server will not accept
+							    // any more bytes on this file handle.
+							    DebugLine("Response indicates that zero bytes were transferred.  Terminating the transfer.");
+							    delete responseEncoded;
+							    error = 0;
+							    return bytesWritten;
+							}
+							
+							bytesWritten += response.Count;
+							DebugLine("Wrote {0} bytes, for a total of {1} bytes", response.Count, bytesWritten);
+							delete responseEncoded;
+							// Loop for another transfer.
+						}						
+						break;
+						
+					case transactor.RequestFailed(tranError):
+						DebugLine("WriteAndX failed: " + tranError.ToString());
+						goto return_error;
+
+					case transactor.ChannelClosed():
+						DebugLine("Transactor channel was closed.");
+						goto return_error;
+
+					case file.ChannelClosed():
+					    DebugLine("The FileContract.Exp channel has closed during a WriteAndX transfer.");
+					    DebugLine("The FileContract service thread will now close its transactor channel and terminate.");
+					    error = -1;
+					    return -1;
+				}
+
+			return_error:
+				if (bytesWritten > 0) {
+					// Some bytes were transferred.
+					error = 0;
+					return bytesWritten;
+				} else {
+					// No bytes were transferred, and there was an error.
+					DebugLine("No bytes transferred.  Returning -1 for bytes transferred.");
+					error = -1;
+					return -1;
+				}
+			}
+		}
+		
+		void CloseFid(SmbTransactor.Imp! transactor)
+		{
+			int requestLength = sizeof(SmbCloseFileRequest);
+			byte[]! in ExHeap request_encoded = new[ExHeap] byte[requestLength];
+			ref SmbCloseFileRequest request = ref request_encoded[0];
+			request.Header.Prepare(SmbCommand.CloseFile, 3);
+			request.Fid = _fileId;
+			request.ByteCount = 0;
+
+			transactor.SendRequest(request_encoded);
+			
+			DebugLine("Waiting for response to CLOSE FILE");
+			switch receive {
+			    case transactor.Response(responseEncoded):
+			        delete responseEncoded;
+			        DebugLine("Received response to CLOSE FILE");
+			        break;
+			        
+			    case transactor.RequestFailed(error):
+			        DebugLine("The CLOSE FILE request has failed.  The server returned an error code: " + error);
+			        break;
+			        
+			    case transactor.ChannelClosed():
+			        DebugLine("Failed to execute CLOSE FILE request.  The transactor channel has closed.");
+			        break;
+			        
+			    // Don't wait for file.ChannelClosed here, because it has probably already closed.
+			    // Even if it had not, we want to finish the transaction, not (potentially, in
+			    // some future implementation) interrupt the transaction by closing the transactor
+			    // channel.
+			}
+		}
+		
+		void DebugLine(string msg)
+		{
+			SmbDebug.WriteLine(_debugprefix + msg);
+		}
+		
+		void DebugLine(string format, params object[] args)
+		{
+			DebugLine(String.Format(format, args));
+		}
+	}
+}
diff --git a/base/Services/Smb/Client/Main.sg b/base/Services/Smb/Client/Main.sg
new file mode 100644
index 0000000..0511c73
--- /dev/null
+++ b/base/Services/Smb/Client/Main.sg
@@ -0,0 +1,397 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/Client/Main.sg
+//
+//  Note:   SMB Network Filesystem Client
+//
+//		This file contains the process entry point for the SMB client driver.
+//		The SMB client is implemented as two different executables:
+//		SmbClientManager and SmbClient.  SmbClientManager is a singleton service;
+//		it is started when the system boots, and there is only ever one instance
+//		of the service.  That service creates instances of the SmbClient process,
+//		each of which is responsible for processing one SMB mapping / mount.
+//
+//		This file (assembly) contains the implementation of SmbClient.  At startup,
+//		the process acquires these two startup endpoints:
+//
+//			Index 0: SmbClientControllerContract.Exp
+//
+//			Index 1: SmbMuxNotify.Imp
+//
+//		Both of these endpoints must be present (and be the correct type) in order
+//		for the process to start correctly.
+//
+//		SmbClientManager service uses the SmbClientControllerContract channel to
+//		control the SmbClient process.  The SmbClient process uses the SmbMuxNotify
+//		channel to notify the SmbClientManager process of changes in its state
+//		(e.g. connected, disconnected, etc.).
+//
+//		All command-line arguments are ignored.  (Actually, the ConsoleTransform
+//		will inspect them, and will get grouchy if any are present.)
+//
+//		The current implementation uses a single thread, implemented in TransportMux,
+//		to service all incoming requests.  For now, some of the code is still in Main.sg,
+//		and some is in TransportMux.  This will be changed later; the two will be merged.
+//
+
+
+using System;
+using System.Threading;
+using System.Collections;
+using System.Diagnostics;
+using System.Net.IP;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Security;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+using Smb.PrivateChannels;
+using Smb.PublicChannels;
+using Smb.Shared;
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+// These two declarations allow the process to register endpoints with the Directory Service.
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Smb.Client
+{
+    [ConsoleCategory(HelpMessage="Start the SMB client", DefaultAction=true)]
+    internal class SmbCommandParameters
+    { 
+		[Endpoint]
+		public TRef<SmbClientControllerContract.Exp:Created> Controller;
+		
+		[Endpoint]
+		public TRef<SmbMuxNotifier.Imp:Ready> Notifier;		
+		
+		
+        reflective internal SmbCommandParameters();
+        
+        internal int AppMain()
+        {
+			return Program.Main(this);
+        }
+    }
+
+	public static class Program
+	{
+		/** <summary>The UNC path to the remote resource, e.g. \\server\share.</summary> */
+		static string! _UncPath;
+		
+		/**
+		<summary>
+			The path of the local mount point, which allows Singularity processes
+			to communicate with the SMB service.  The SMB client exports the DirectoryServiceContract
+			contract at this path.
+		</summary>
+		*/
+		static string! _MountPath;
+		
+		/**
+		<summary>
+			The username to use when authenticating with the remote SMB server.
+		</summary>
+		*/
+		static string! _CredentialsName;
+		static string! _CredentialsTag;
+		
+		/** <summary>
+			The name of the remote server, parsed from the UNC path.
+			For now, this value can only be an IPv4 address.
+			</summary>
+		*/
+		static string! _ServerName;
+		
+		/** <summary>
+			The resource name part of the UNC; e.g., for a UNC of \\server\share,
+			it's the "share" part.
+			</summary>
+		*/
+		static string! _ResourceName;
+		
+		internal static string! UncPath { get { return (!)_UncPath; } }		
+		internal static string! MountPath { get { return (!)_MountPath; } }
+		internal static string! CredentialsName { get { return (!)_CredentialsName; } }
+		internal static string! CredentialsTag { get { return (!)_CredentialsTag; } }
+		
+		internal static int Main(SmbCommandParameters! args)
+		{
+			try {
+				ServiceProviderContract.Exp! namespace_provider;
+								
+#if true
+				Endpoint* in ExHeap controller_ep = Process.GetStartupEndpoint(0);
+				if (controller_ep == null) {
+					DebugLine("Endpoint 0 is not assigned.");
+					DebugLine("Expected SmbClientControllerContract.Exp at startup endpoint 0.");
+					DebugStub.Break();
+					return -1;
+				}
+				
+				SmbClientControllerContract.Exp controller = controller_ep as SmbClientControllerContract.Exp;
+				if (controller == null) {
+					DebugLine("Endpoint 0 is wrong channel type.");
+					DebugLine("Expected SmbClientControllerContract.Exp at startup endpoint 0.");
+					DebugStub.Break();
+					delete controller_ep;
+					return -1;
+				}
+#else
+				// -XXX- This TRef isn't being set up.
+				if (args.Controller == null) {
+					DebugLine("SMB process controller channel was null!  Can't do anything!");
+					return -1;
+				}
+				SmbClientControllerContract.Exp! controller = args.Controller.Acquire();
+#endif
+
+				Endpoint* in ExHeap ep = Process.GetStartupEndpoint(1);
+				if (ep == null) {
+					DebugLine("Endpoint 1 is not assigned.");
+					DebugLine("Expected SmbMuxNotifier.Imp at startup endpoint 1.");
+					DebugStub.Break();
+					delete controller_ep;
+					return -1;
+				}
+				
+				SmbMuxNotifier.Imp notifier = ep as SmbMuxNotifier.Imp;
+				if (notifier == null) {
+					DebugLine("Endpoint 1 is wrong channel type.");
+					DebugLine("Expected SmbMuxNotifier.Imp at startup endpoint 1.");
+					DebugStub.Break();
+					delete controller_ep;
+					delete ep;
+					return -1;					
+				}
+
+				// We now have a control channel established to the process that started this one.
+				// That process should be SmbClientManager.  We don't really care, as long as that
+				// process uses SmbClientControllerContract to communicate with us.  Next, we wait
+				// for SmbClientControllerContract to send a Configure message, which contains the
+				// configuration information for this SMB client process.
+								
+				DebugLine("Waiting for Configure request on control channel.");
+				switch receive {
+					case controller.Configure(config):
+						DebugLine("Received configuration:");
+						_UncPath = Bitter.ToString2(config.UncPath);
+						_MountPath = Bitter.ToString2(config.MountPath);
+						_CredentialsName = Bitter.ToString2(config.CredentialsName);
+						_CredentialsTag = Bitter.ToString2(config.Tag);
+						config.Dispose();
+												
+						controller.SendOk();
+						break;
+
+					case controller.ChannelClosed():
+						throw new Exception("Controller channel closed!");
+				}
+				
+				ParseUncPath(_UncPath, out _ServerName, out _ResourceName);
+				
+				DebugLine("SMB client is starting.  Parameters from controller service:");
+				DebugLine("    UNC path:            " + _UncPath);
+				DebugLine("    Mount path:          " + _MountPath);
+				DebugLine("    Username:            " + _CredentialsName);
+
+				try {
+					//
+					// Next, register the directory service that represents the mount path.
+					// This is what filesystem clients use to access the remote namespace on the SMB server.
+					//
+
+					namespace_provider = DirectoryUtil.RegisterService(_MountPath);
+				} catch (Exception ex) {
+					DebugLine("Failed to register namespace (mount path).");
+					DebugLine("    Mount path: " + _MountPath);
+					Util.ShowExceptionDebug(ex);
+					return -1;
+				}
+					
+				//
+				// Next, we start the thread that multiplexes access to the TCP connection to the server.
+				//
+				
+				TransportMux.Run(
+					namespace_provider,
+					controller,
+					notifier,
+					_ServerName,
+					_ResourceName);
+					
+					
+			// quit:
+				// -XXX- We should obviously do something a bit more graceful here.
+				return 0;
+			
+			} catch (Exception ex) {
+				ShowException(ex);
+				return -1;
+			}			
+		}
+	    
+		static SmbClientConfig GetConfig()
+		{
+			SmbClientConfig config = new SmbClientConfig();
+			config.UncPath = Bitter.FromString2(_UncPath);
+			config.MountPath = Bitter.FromString2(_MountPath);
+			config.CredentialsName = Bitter.FromString2(_CredentialsName);
+			config.Tag = Bitter.FromString2(_CredentialsTag);
+			return config;
+		}
+	    
+		static void DebugLine(string msg)
+		{
+			DebugStub.WriteLine("SMB: MAIN: " + msg);
+		}
+	    
+		static void DebugLine(string format, params object[] args)
+		{
+			DebugLine(String.Format(format, args));
+		}
+
+		public static void ShowException(Exception! chain)
+		{
+			Exception current = chain;
+			while (current != null)
+			{
+				DebugLine("{0}: {1}", current.GetType().FullName, current.Message);
+				current = current.InnerException;
+			}
+		}
+
+		static void ParseUncPath(string! unc, out string! server, out string! resource)
+		{
+			if (!unc.StartsWith("\\\\"))
+				throw new Exception(String.Format("The UNC path '{0}' is invalid.  All UNC paths must begin with '\\\\'.", unc));
+			
+			int separator = unc.IndexOf('\\', 2);
+			assert (separator < 0) || (separator >= 2);
+			if (separator < 0 || separator == 2)
+				throw new Exception(String.Format("The UNC path '{0}' is invalid.  The server name is missing.", unc));
+			
+			if (separator + 1 == unc.Length)
+				throw new Exception(String.Format("The UNC path '{0}' is invalid.  The resource name is missing.", unc));
+			
+			server = unc.Substring(2, separator - 2);
+			resource = unc.Substring(separator + 1);
+		}
+	}
+	
+	public class ClientStatusSnapshot
+	{
+		public ClientStatusSnapshot()
+		{
+		}
+		
+		public ClientStatusSnapshot(SmbClientStatus status)
+		{
+			this.ConnectionStatus = status.ConnectionStatus;
+			this.ReasonDisconnected = status.ReasonDisconnected;
+			this.ServerOperatingSystem = Bitter.ToString(status.ServerOperatingSystem);
+			this.ServerDomainName = Bitter.ToString(status.ServerDomainName);
+			this.ServerMachineName = Bitter.ToString(status.ServerMachineName);
+			this.ActiveCredentialsName = Bitter.ToString(status.ActiveCredentialsName);
+		}
+	
+        public SmbClientConnectionStatus ConnectionStatus;
+        public SmbReasonDisconnected ReasonDisconnected;
+        public string ServerOperatingSystem;
+        public string ServerDomainName;
+        public string ServerMachineName;
+        public string ActiveCredentialsName;
+        
+        public SmbClientStatus ToExchange()
+        {
+			SmbClientStatus ex = new SmbClientStatus();
+			ex.ConnectionStatus = this.ConnectionStatus;
+			ex.ReasonDisconnected = this.ReasonDisconnected;
+			ex.ServerOperatingSystem = Bitter.FromString(ServerOperatingSystem);
+			ex.ServerDomainName = Bitter.FromString(this.ServerDomainName);
+			ex.ServerMachineName = Bitter.FromString(this.ServerMachineName);
+			ex.ActiveCredentialsName = Bitter.FromString(this.ActiveCredentialsName);
+			return ex;
+        }
+	}
+	
+
+    class TrackedThreadStarter
+    {
+		public static Thread StartTrackedThreadContext([Claims]ITrackedThreadContext! context)
+		{
+			TrackedThreadStarter starter = new TrackedThreadStarter(context);
+			ThreadStart threadStart = new ThreadStart(starter.ThreadMain);
+			Thread thread = new Thread(threadStart);
+			thread.Start();
+			return thread;
+		}
+	    
+		private TrackedThreadStarter([Claims]ITrackedThreadContext! context)
+		{
+			_context = new TContainer<ITrackedThreadContext>(context);
+		}
+		
+		private void ThreadMain()
+		{
+			assert _context != null;
+			ITrackedThreadContext! context = _context.Acquire();
+			
+			try {
+				context.ThreadRoutine();
+			} finally {
+				context.Dispose();
+			}
+		}
+		
+		private TContainer<ITrackedThreadContext> _context;
+    }
+	interface ITrackedThreadContext : ITracked
+	{
+		void ThreadRoutine();
+	}
+	
+	internal class RepStructCopier
+	{
+		public static char[]! in ExHeap Copy(char[]! in ExHeap array)
+		{
+			char[]! in ExHeap copy = new[ExHeap] char[array.Length];
+			for (int i = 0; i < array.Length; i++)
+				copy[i] = array[i];
+			return copy;
+		}
+		
+		public static char[] in ExHeap Copy2(char[] in ExHeap array)
+		{
+			if (array == null)
+				return null;
+				
+			char[]! in ExHeap copy = new[ExHeap] char[array.Length];
+			for (int i = 0; i < array.Length; i++)
+				copy[i] = array[i];
+			return copy;
+		}
+		
+		public static SmbClientStatus Copy(SmbClientStatus status)
+		{
+			SmbClientStatus copy = new SmbClientStatus();
+			copy.ConnectionStatus		= status.ConnectionStatus;
+			copy.ReasonDisconnected		= status.ReasonDisconnected;
+			copy.ServerMachineName		= Copy2(status.ServerMachineName);
+			copy.ServerDomainName		= Copy2(status.ServerDomainName);
+			copy.ServerOperatingSystem	= Copy2(status.ServerOperatingSystem);
+			return copy;			
+		}
+	}
+}
diff --git a/base/Services/Smb/Client/MuxClient.sg b/base/Services/Smb/Client/MuxClient.sg
new file mode 100644
index 0000000..abd0b6b
--- /dev/null
+++ b/base/Services/Smb/Client/MuxClient.sg
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+using System;
+using System.Collections;
+using System.Threading;
+using System.Text;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Smb.PrivateChannels;
+
+namespace Smb.Client
+{
+}
diff --git a/base/Services/Smb/Client/MuxTuple.sg b/base/Services/Smb/Client/MuxTuple.sg
new file mode 100644
index 0000000..a845f72
--- /dev/null
+++ b/base/Services/Smb/Client/MuxTuple.sg
@@ -0,0 +1,119 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+using System;
+using Microsoft.Singularity;
+using Smb.PrivateChannels;
+using Smb.Protocol;
+
+namespace Smb.Client
+{
+	struct MuxTuple
+	{
+		public int TreeId;
+		public int ProcessId;
+		public int UserId;
+		public int MuxId;
+		
+		// private readonly int _hashcode;
+		
+		public override int GetHashCode()
+		{
+			long h = this.TreeId ^ (((long)this.ProcessId) * 3) ^ (((long)this.UserId) * 5) ^ (((long)this.MuxId) * 7);
+			int hashcode = unchecked((int)(h ^ (h >> 20)));
+			// DebugStub.WriteLine(String.Format("MuxTuple: {0} -> hash code {1:x8}", this.ToString(), _hashcode));
+			return hashcode;
+		}
+		
+		public static bool operator== (MuxTuple a, MuxTuple b)
+		{
+			return a.TreeId == b.TreeId
+				&& a.ProcessId == b.ProcessId
+				&& a.UserId == b.UserId
+				&& a.MuxId == b.MuxId;				
+		}
+		
+		public static bool operator!= (MuxTuple a, MuxTuple b)
+		{
+			return !(a.TreeId == b.TreeId
+				&& a.ProcessId == b.ProcessId
+				&& a.UserId == b.UserId
+				&& a.MuxId == b.MuxId);
+		}
+		
+		public override bool Equals(object ob)
+		{
+			if (ob == null)
+				return false;
+			
+			if (!(ob is MuxTuple))
+				return false;
+				
+			MuxTuple t = (MuxTuple)ob;
+			return this == t;
+		}
+		
+		public MuxTuple(SmbMuxTuple tuple)
+			: this(tuple.TreeId, tuple.ProcessId, tuple.UserId, tuple.MuxId)
+		{
+		}
+		
+		public MuxTuple(int treeId, int processId, int userId, int muxId)
+		{
+			this.TreeId = treeId;
+			this.ProcessId = processId;
+			this.UserId = userId;
+			this.MuxId = muxId;
+		}
+		
+		public static implicit operator SmbMuxTuple(MuxTuple t)
+		{
+			return t.ToExchange();
+		}
+		
+		public static implicit operator MuxTuple(SmbMuxTuple t)
+		{
+			return new MuxTuple(t);
+		}
+		
+		public static MuxTuple FromSmb(ref SmbHeader header)
+		{
+			return new MuxTuple(header.TreeId, header.ProcessId, header.UserId, header.MuxId);
+		}
+			
+		public SmbMuxTuple ToExchange()
+		{
+			SmbMuxTuple ex;
+			ex.TreeId = this.TreeId;
+			ex.ProcessId = this.ProcessId;
+			ex.UserId = this.UserId;
+			ex.MuxId = this.MuxId;
+			return ex;
+		}
+		
+		public override string! ToString()
+		{
+			return String.Format(
+				// "[Mux: TID:{0:x4} PID:{1:x4} UID:{2:x4}, MID:{3:x4}]",
+				"[t{0:x4} p{1:x4} u{2:x4} m{3:x4}]",
+				TreeId,
+				ProcessId,
+				UserId,
+				MuxId);
+		}
+
+		public static MuxTuple FromSmbHeader(SmbHeader header)		
+		{
+			return new MuxTuple(header.TreeId, header.ProcessId, header.UserId, header.MuxId);
+		}
+
+	}
+}
diff --git a/base/Services/Smb/Client/SmbClient.csproj b/base/Services/Smb/Client/SmbClient.csproj
new file mode 100644
index 0000000..c6a451f
--- /dev/null
+++ b/base/Services/Smb/Client/SmbClient.csproj
@@ -0,0 +1,69 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SmbClient</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="DirectoryClient.sg" />
+    <Compile Include="FileExp.sg" />
+    <Compile Include="Main.sg" />
+    <Compile Include="MuxClient.sg" />
+    <Compile Include="MuxTuple.sg" />
+    <Compile Include="SmbProtocolViolationException.sg" />
+    <Compile Include="TraceSwitches.sg" />
+    <Compile Include="Transactor.sg" />
+    <Compile Include="TransactorContract.sg" />
+    <Compile Include="TransportMux.sg" />
+    <Compile Include="TypesafeCollectionWrappers.sg" />
+    <Compile Include="..\Protocol\SmbCommand.sg" />
+    <Compile Include="..\Protocol\SmbError.sg" />
+    <Compile Include="..\Protocol\SmbFlag.sg" />
+    <Compile Include="..\Protocol\SmbFilesystemRequests.sg" />
+    <Compile Include="..\Protocol\SmbHeader.sg" />
+    <Compile Include="..\Protocol\SmbMessages.sg" />
+    <Compile Include="..\Protocol\SmbProtocol.sg" />
+    <Compile Include="..\Protocol\SmbTransaction2.sg" />
+    <Compile Include="..\Shared\Util.sg" />
+    <Compile Include="..\Shared\DirectoryUtils.sg" />
+    <Compile Include="..\Shared\NetUtil.sg" />
+    <Compile Include="..\Shared\ByteReader.sg" />
+    <Compile Include="..\Shared\ByteWriter.sg" />
+    <Compile Include="..\Shared\ArraySpan.sg" />
+    <Compile Include="..\Shared\BufferPool.sg" />
+    <Compile Include="..\Shared\ByteOrder.sg" />
+    <Compile Include="..\Shared\SmbDebug.sg" />
+    <Compile Include="..\Shared\NtAccessMask.sg" />
+    <Compile Include="..\Shared\NtStatus.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="..\PublicContracts\SmbClient.PublicContracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\CredentialsManager.Contracts\CredentialsManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\CredentialsManager\CredentialsManager.Library.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/Smb/Client/SmbProtocolViolationException.sg b/base/Services/Smb/Client/SmbProtocolViolationException.sg
new file mode 100644
index 0000000..954c6e9
--- /dev/null
+++ b/base/Services/Smb/Client/SmbProtocolViolationException.sg
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace Smb.Client
+{
+	class SmbProtocolViolationException : Exception
+	{
+		SmbProtocolViolationException()
+			: base("An SMB protocol violation has occurred.")
+		{}
+		
+		SmbProtocolViolationException(string! msg)
+			: base(msg)
+		{}
+		
+		SmbProtocolViolationException(string! msg, Exception! inner)
+			: base(msg, inner)
+		{}
+		
+	}
+}
diff --git a/base/Services/Smb/Client/TraceSwitches.sg b/base/Services/Smb/Client/TraceSwitches.sg
new file mode 100644
index 0000000..6b0d7b7
--- /dev/null
+++ b/base/Services/Smb/Client/TraceSwitches.sg
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+using System;
+
+namespace Smb.Client
+{
+	/**
+	<summary>
+		This class contains control flags, that can turn certain debug print messages on/off.
+		For now, there's no run-time facility provided for controlling this; modify and rebuild.
+	</summary>
+	*/
+	/* static */ internal class TraceSwitches
+	{
+		public static bool ShowSmbMessageOneLineSummaries = false;
+		public static bool ShowSmbMessageDetails = false;
+		
+		// If enabled, will print a one-line message for each message
+		// sent or received on DirectoryServiceContract endpoints.
+		public static bool ShowDirectoryMessages = false;
+		
+		public static bool ShowIncrediblyNoisyDetail = false;
+		
+		// If enabled, will print a one-line message for each message
+		// sent or received on control channels; mostly in Main.sg.
+		public static bool ShowControlMessages = false;
+		
+
+		public static bool ShowNegotiation = true;
+		public static bool ShowNegotiationVerbose = false;
+
+        public static bool ShowAuthenticationMessages = false;
+        
+        public static bool ShowMuxStatusChanges = false;
+		
+		
+		// Show creation / deletion of transactors, and all state changes
+		// in transactors.
+		public static bool ShowTransactorMessages = false;
+		
+		// Show info about discovering message boundaries of incoming SMB messages,
+		// and of reassembling fragments.
+		public static bool ShowSmbReassembly = false;
+		
+		public static bool ShowTransactionFragmentationReassembly = false;
+		public static bool ShowTransactionFragmentationReassemblyVerbose = false;
+		
+		public static bool ShowFileActivity = false;
+		
+		// Information about messages sent on the notifier channel to the SmbClientManager.
+		public static bool ShowNotifierMessages = false;
+	}
+}
diff --git a/base/Services/Smb/Client/Transactor.sg b/base/Services/Smb/Client/Transactor.sg
new file mode 100644
index 0000000..4f2e522
--- /dev/null
+++ b/base/Services/Smb/Client/Transactor.sg
@@ -0,0 +1,296 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/Client/Transactor.sg
+//
+//  Note:
+//
+//		A "transactor" is anything that can issue requests (transactions)
+//		against the transport mux.  These requests are issued using the
+//		SmbTransactor contract (in Services/Smb/PrivateContracts).  The
+//		TransportMux thread holds the export side of the contract, and
+//		various other threads (DirectoryClient and FileExp service threads)
+//		hold the import sides.
+//
+//		The Transactor class contains state information for each SmbTransactor
+//		channel, for the TransportMux class.  The transport mux runs on a
+//		single thread; only that thread creates and uses instances of the
+//		Transactor class.  So there is no need to synchronize access to these
+//		instances.
+//
+//	TODO:
+//
+//		*	Implement fragmentation for TRANSACTION2 requests.  Reassembly
+//			for inbound fragments is implemented, but not for outbound requests.
+//
+
+/*
+	REQUESTS vs TRANSACTIONS
+	------------------------
+	
+	At its most basic, SMB provides a way to identify message boundaries (framing),
+	and a common header for all messages exchanged.  Most of those messages are
+	request/response messages, where a single message sent from the client to the
+	server causes the server to response with exactly one message.  We will refer
+	to these as "SMB requests", although that's a really horribly vague term.
+	
+	There are some SMB protocols that do not conform to this usage pattern.
+	Notably, SMB supports "transactions", which are identified by the SMB commands
+	SMB_TRANSACTION and SMB_TRANSACTION2.  We will only deal with SMB_TRANSACTION2.
+	These transactions add several fields to the basic request/response header,
+	and they also allow the payload of the transaction to span more than one SMB
+	message.
+	
+	First, the client sends an SMB message to the server, identifying the SMB
+	transaction.  There are two possibilities to consider: First, the client's
+	transaction message may be small enough to fit into a single SMB message;
+	this is the easy case.  Otherwise, the client must fragment its transaction
+	request.  In either case, the client sends its first SMB message, with
+	the Command field of the SMB header set to SMB_TRANSACTION2.
+	
+	Then the client waits for a response from the server.  If the client needed
+	to fragment its transaction request, then it does NOT yet send any further
+	fragments.  The server then decides whether or not it likes the request.
+	If the primary request indicates that the client needs to send more fragments,
+	then the server will respond with the "Interim Server Response".  This is
+	just a "go ahead" message (which means one more useless round-trip).
+	The client then sends all of its fragments.
+
+	The server then sends its transaction responses.  If the response does not
+	need to be fragmented, then there will only be a single response message.	
+	
+*/
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using System.Text;
+using System.Security.Protocols.Ntlm;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using NetStack.Contracts;
+using Smb.Protocol;
+using Smb.PublicChannels;
+using Smb.PrivateChannels;
+using Smb.Shared;
+
+namespace Smb.Client
+{
+	/// <summary>
+	/// This class represents the mux's view of a transactor.  Only the mux thread creates or manipulates
+	/// instances of this class.  And because only a single thread ever touches these instances, locking
+	/// is not required.
+	/// </summary>
+	internal class Transactor
+	{	
+		public Transactor(MuxTuple tuple)
+		{
+			this.Tuple = tuple;
+			this.State = TransactorState.Ready;
+			this.DebugPrefix = "Tran" + tuple.ToString() + ": ";
+			
+			TrackedData data = new TrackedData();
+			this._datacon = new TContainer<TrackedData>(data);
+		}
+		
+		public class TrackedData : ITracked
+		{
+			// This buffer can be null.
+			// This buffer is used to reassemble fragments of a TRANSACTION2 request.		
+			public byte[] in ExHeap TransactionResponseBuffer;
+			public int TransactionResponseFragmentByteIndex;
+			
+			
+			public int TransactionRequestFragmentByteIndex;
+
+			public byte[] in ExHeap ResponseReassemblyBuffer;
+			public int Transaction_ReceivedParameterBytes;
+			public int Transaction_ReceivedDataBytes;
+			public int Transaction_ReceivedFragmentCount;
+			public int Transaction_DataOffset;
+			public int Transaction_ParameterOffset;
+
+			// In the "Ready" state, this field is null.
+			// In all other states, this field is non-null.
+			public SmbTransactor.Exp Exp;
+			
+			// Contains a reference to the byte[] in ExHeap buffer that contains a message that
+			// needs to be transmitted to the remote SMB peer.  A transactor client (a holder of
+			// SmbTransactor.Imp) submits these buffers by sending the Request message.			
+			public byte[] in ExHeap RequestBuffer;
+
+			// The length of the data in _buffer.  Right now, this is always equal to the length
+			// of the buffer itself, because the current TcpConnectionContract does not allow
+			// for sends that are shorter than the length of the buffer.
+			public int RequestLength;
+			
+			public byte[] in ExHeap ExtractResponseReassemblyBuffer()
+			{
+				expose(this)
+				{
+					byte[] in ExHeap buffer = this.ResponseReassemblyBuffer;
+					this.ResponseReassemblyBuffer = null;
+					return buffer;				
+				}
+			}
+			
+			
+			public SmbTransactor.Exp! AcquireEndpoint()
+			{
+				expose (this) {
+					SmbTransactor.Exp exp = this.Exp;
+					this.Exp = null;
+					assert exp != null;
+					return exp;
+				}
+			}
+			
+			#if false
+			void ITracked.Acquire() {}
+			void ITracked.Release() {}
+			void ITracked.Expose() {}
+			void ITracked.UnExpose() {}
+			#else
+			public void Acquire() {}
+			public void Release() {}
+			public void Expose() {}
+			public void UnExpose() {}
+			#endif
+			
+			public void Dispose()
+			{
+				delete TransactionResponseBuffer;
+				delete RequestBuffer;
+				delete Exp;
+				// SelfReference.Dispose();
+				// delete SelfReference;
+				delete ResponseReassemblyBuffer;
+			}
+			
+		}
+		
+		readonly TContainer<TrackedData>! _datacon;
+		
+		public TrackedData! AcquireData()
+		{
+			return _datacon.Acquire();
+		}
+		
+		public void ReleaseData([Claims]TrackedData! data)
+		{
+			_datacon.Release(data);
+		}
+		
+		public SmbTransactor.Exp! AcquireEndpoint()
+		{
+			TrackedData! tracked = AcquireData();
+			SmbTransactor.Exp exp = tracked.AcquireEndpoint();
+			ReleaseData(tracked);
+			assert exp != null;
+			return exp;
+		}
+		
+		public byte[] in ExHeap ExtractResponseReassemblyBuffer()
+		{
+			TrackedData! tracked = AcquireData();
+			byte[] in ExHeap buffer;
+			expose(tracked)
+			{
+				buffer = tracked.ResponseReassemblyBuffer;
+				tracked.ResponseReassemblyBuffer = null;
+				ReleaseData(tracked);
+			}
+			return buffer;
+		}
+		
+		public readonly string! DebugPrefix;
+		public readonly MuxTuple Tuple;
+		
+		public TransactorState State;
+
+		public bool InQueue;
+		
+		public SmbFlag1 _smbFlag1;
+		public SmbFlag2 _smbFlag2;
+
+		public SmbCommand Command;
+
+		public void Dispose()
+		{
+			TrackedData data = AcquireData();
+			data.Dispose();
+		}
+		
+		override public string! ToString()
+		{
+			string! stateText = StateToString(this.State);
+			return String.Format("[Transactor tuple {0} state {1}]", this.Tuple.ToString(), stateText);
+		}
+		
+		public static string! StateToString(TransactorState tstate)
+		{
+			switch (tstate)
+			{
+				case TransactorState.Ready: return "Ready";
+				case TransactorState.WaitingSendRequest: return "WaitingSendRequest";
+				case TransactorState.WaitingSendPrimaryTransactionRequest: return "WaitingSendPrimaryTransactionRequest";
+				case TransactorState.WaitingSendSecondaryTransactionRequest: return "WaitingSendSecondaryTransactionRequest";
+				case TransactorState.WaitingReceiveResponse: return "WaitingReceiveResponse";
+				case TransactorState.WaitingReceivePrimaryTransactionResponse: return "WaitingReceivePrimaryTransactionResponse";
+				case TransactorState.WaitingReceiveSecondaryTransactionResponse: return "WaitingReceiveSecondaryTransactionResponse";
+				default: return "???" + ((int)tstate).ToString();
+			}
+		}
+	}
+
+	enum TransactorState
+	{
+		// In this state, the ExpRef has been acquired (so don't try to acquire it again), and the exp is in the
+		// endpoint map that is owned by the multiplexer thread.  Two things can happen to this transactor:
+		//
+		//		* The transactor can close its channel.  In this case, the multiplexer thread removes the
+		//			transactor state from the _transactors hash table.
+		//
+		//		* The transactor can start a new request.  The multiplexer thread releases the ExpRef, and
+		//			sets Transactor.State to Queued.
+		Ready,
+		
+		// In this state, the multiplexer has received a request from the transactor client (the imp side).
+		// The multiplexer has not yet transmitted the packet to the remote peer.
+		//
+		// _waitingResponseExp contains a valid pointer.
+		// _buffer contains a valid pointer.
+		//
+		// Events:
+		//
+		//		* If the TCP connection closes or fails, then the multiplexer thread will:
+		//				acquire _waitingResponseExp, send its a NakRequest, and then delete it.
+		//				acquire _buffer and delete it.
+		//				remove the Transactor from the _transactors hash table.
+		//
+		//		* When the multiplexer transmits the message, it removes the 
+		WaitingSendRequest,
+		
+		// In this state, the multiplexer has transmitted the request to the remote peer, and is now waiting
+		// for a response.
+		//
+		//		* If the TCP connection closes or fails, then the multiplexer thread will acquire the
+		//			waiting response endpoint, will send a NakRequest, will close the channel, and then
+		//			will remove the tuple entry from the table.
+		//
+		WaitingReceiveResponse,		
+
+		
+		WaitingSendPrimaryTransactionRequest,
+		WaitingReceiveInterimTransactionResponse,
+		WaitingSendSecondaryTransactionRequest,
+		WaitingReceivePrimaryTransactionResponse,
+		WaitingReceiveSecondaryTransactionResponse,		
+	}
+}
diff --git a/base/Services/Smb/Client/TransactorContract.sg b/base/Services/Smb/Client/TransactorContract.sg
new file mode 100644
index 0000000..1a9e7ae
--- /dev/null
+++ b/base/Services/Smb/Client/TransactorContract.sg
@@ -0,0 +1,105 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using NetStack.Contracts;
+using Smb.PublicChannels;
+
+namespace Smb.PrivateChannels
+{
+	public enum SmbTransactionError
+	{
+		None = 0,
+		InvalidParameters,
+		Timeout,
+		ConnectionFailed,
+		AuthenticationFailed,
+		ConnectionReset,
+		InternalError,
+	}
+	
+	public rep struct SmbMuxTuple
+	{
+		public int TreeId;
+		public int ProcessId;
+		public int UserId;
+		public int MuxId;
+	}
+
+	public contract SmbTransactor
+	{
+		in message Request(byte[]! in ExHeap request);
+		out message Response(byte[]! in ExHeap response);
+
+		in message Transaction2(byte[]! in ExHeap transaction);
+		out message Transaction2Response(byte[]! in ExHeap segment);
+
+		out message RequestFailed(SmbTransactionError error);
+
+		// A transactor can create *another* transactor.		
+		in message AddTransactor();
+		out message AckAddTransactor(SmbTransactor.Imp:Ready! imp);
+		out message NakAddTransactor();
+		
+		
+		state Ready : one
+		{
+			Request? -> WaitingRequestResponse;
+			Transaction2? -> WaitingTransaction2Response;
+			AddTransactor? -> (AckAddTransactor! or NakAddTransactor!) -> Ready;
+		}			
+		
+		state WaitingRequestResponse : one
+		{
+			RequestFailed! -> Ready;
+			Response! -> Ready;
+		}
+		
+		state WaitingTransaction2Response : one
+		{
+			RequestFailed! -> Ready;
+			Transaction2Response! -> Ready;
+		}
+	}
+	
+	[Flags]
+	public enum TransactorFlag
+	{
+		None = 0,
+		// If set, then this request is part of negotiating the channel (authentication, options, etc.)
+		// If not set, then 
+		Early = 1,
+	}
+	
+	public enum SmbMuxState
+	{
+		Invalid = 0,
+		Disconnected,
+		Connecting,
+		Connected,
+	}
+	
+/*	
+	public enum FileShareAccess
+	{
+		None = 0,
+		Read = 1,
+		Write = 2,
+		Delete = 4,
+	}
+	
+	public enum FileCreateDisposition
+	{
+		Supersede = 0,
+		Open = 1,
+		Create = 2,
+		OpenIf = 3,
+		Overwrite = 4,
+		OverwriteIf = 5,
+	}
+*/
+}
diff --git a/base/Services/Smb/Client/TransportMux.sg b/base/Services/Smb/Client/TransportMux.sg
new file mode 100644
index 0000000..35913a0
--- /dev/null
+++ b/base/Services/Smb/Client/TransportMux.sg
@@ -0,0 +1,2462 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/Client/TransportMux.sg
+//
+//  Note:
+//
+//		This file contains the implementation of the SMB Client Transport 
+//		Multiplexer.  The mux runs on a single thread, and its purpose is to
+//		manage access to the TCP/IP connection to the SMB server.
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using System.Runtime.InteropServices;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Security;
+using NetStack.Contracts;
+using Smb.Protocol;
+using Smb.PublicChannels;
+using Smb.PrivateChannels;
+using Smb.Shared;
+
+namespace Smb.Client
+{
+	class TransportMux : ITracked
+	{
+		/// <summary>
+		/// This method creates a new TransportMux instance.
+		/// </summary>
+		public static void Run(
+			[Claims]ServiceProviderContract.Exp! namespace_provider,
+			[Claims]SmbClientControllerContract.Exp! controller,
+			[Claims]SmbMuxNotifier.Imp! notifier,
+			string! serverName,
+			string! resourceName)
+		{
+			TransportMux mux = new TransportMux(
+				namespace_provider,
+				controller,
+				notifier,
+				serverName,
+				resourceName);
+
+			try {
+				mux.ThreadMain();
+			} finally {
+				mux.Dispose();
+			}
+		}
+
+		TransportMux(
+			[Claims]ServiceProviderContract.Exp! namespace_provider,
+			[Claims]SmbClientControllerContract.Exp! controller,
+			[Claims]SmbMuxNotifier.Imp! notifier,
+			string! serverName,
+			string! resourceName)
+		{
+			_ServerHostName = serverName;
+			_ServerResourceName = resourceName;
+			
+			_notifier = notifier;
+			_notifier_can_send = true;
+			
+			_namespace_provider = namespace_provider;
+
+			_controller = controller;
+
+			_recvBuffer = new byte[400];
+			_recvDataLength = 0;
+		}
+		
+		readonly SmbMuxNotifier.Imp! _notifier;
+		
+		static bool _dump_received_messages;
+		static bool _dump_sent_messages;
+	
+        // These come from the command-line when the service was started.
+        readonly string! _ServerHostName;
+        readonly string! _ServerResourceName;
+        
+        // Once we have connected, negotiated, and connected to the tree, this tuple contains
+        // the values we should use.  MuxId will always be zero.
+        MuxTuple _treeTuple;
+		
+		// I don't like this flag.
+		// If set, it means a protocol violation occurred, and so we need to tear down the connection.
+		// I want a cleaner way to do this.
+		bool _connection_failed;
+
+		// key: MuxTuple
+		// value: Transactor
+		readonly Hashtable/*<MuxTuple, Transactor!>*/! _transactors = new Hashtable();
+
+		/// <summary>
+		/// This endpoint map contains transactor endpoints that are in the "Ready" state.
+		/// We listen for the Request message in this state, meaning a transactor client
+		/// (which is anything that can issue SMB transactions, such as a DirectoryServiceContract
+		/// worker thread or a FileContract worker thread) wants to start a request.
+		/// </summary>
+		EMap<SmbTransactor.Exp:Ready, Transactor!>! _readyTransactors =
+			new EMap<SmbTransactor.Exp:Ready, Transactor!>();
+
+		/// <summary>
+		/// The TCP connection to the SMB server.  In the Disconnected state, this field is null.
+		/// In all other states (except possibly during state transitions), this field is non-null.
+		/// </summary>		
+		TcpConnectionContract.Imp _connection;
+		
+		// This endpoint is connected to SmbClientManager.  This thread receives control
+		// requests on the endpoint.
+		readonly SmbClientControllerContract.Exp! _controller;
+		
+		// This endpoint represents our registration of the SMB namespace with the global
+		// Singularity directory service.  This is how we receive filesystem requests.
+		readonly ServiceProviderContract.Exp! _namespace_provider;
+
+		// The set of clients that have opened our published service control channel.
+		// This allows clients to send control requests to the SMB client.
+		ESet<SmbClientControlContract.Exp:Ready>! _control_clients = new ESet<SmbClientControlContract.Exp:Ready>();
+
+		// The last known status (snapshot) of the connection.
+		ClientStatusSnapshot _mux_status;
+		
+		// Sequence number, identifies version of _mux_state
+		long _mux_status_version;
+		
+		// Sequence number, identifies the last version of _mux_state we have sent to main thread
+		long _notifier_mux_status_version;
+
+		// If true, then _notifier is in a state that allows us to send a message.
+		bool _notifier_can_send;
+
+		// If true, SmbClientManager has requested that this process stop.
+		bool _service_stopping;		
+		
+		int _MaxSmbRequestLength = 1024;
+		
+		// The credentials that we actually selected and used during authentication.
+		// This is set during SessionSetupAndConnectBasic.
+		string _SelectedCredentialsName;
+		
+		
+		// This value is returned from the server to the client in response to the NEGOTIATE message.
+		string _ReceivedServerDomainNameFromNegotiate;
+		string _ReceivedServerMachineName;
+
+		// These values are received from the server in response to the SESSION SETUP message.
+		string _ReceivedServerOperatingSystem;
+		string _ReceivedServerPrimaryDomainName;
+		
+		
+		// This could just as well be called the DisconnectedStateLoop.
+		void ThreadMain()
+		{
+			expose(this)
+			{
+				_service_stopping = false;
+			
+				// bool want_connect = false;
+				bool want_connect = true;
+				
+				try
+				{
+					SetMuxStatusDisconnected(SmbReasonDisconnected.Idle);
+					
+					for (;;)
+					{
+						if (want_connect) {
+							want_connect = false;
+							goto start_connect;
+						}
+						
+						//
+						// At this point, we are in the Disconnected state.
+						// New transactors can be created.
+						//
+						
+					disconnected_state:
+						Disconnect();
+						_connection_failed = false;				
+						
+						for (;;)
+						{
+							if (_service_stopping) {
+								DebugLine("TransportMux - main thread exiting");
+								return;
+							}
+						
+						
+							switch receive
+							{
+								case _notifier.Ack():
+									AckNotifier();
+									break;
+									
+								case _controller.ChannelClosed():
+									DebugLine("Controller channel has closed!!");
+									goto thread_quit;
+
+								case _controller.Bind(ServiceContract.Exp:Start! exp):
+									ControllerBind(exp);
+									break;
+
+								case _controller.Stop():
+									DebugLine("Received Stop request on controller channel");
+									_service_stopping = true;
+									Disconnect();
+									return;
+
+								case _namespace_provider.Connect(ServiceContract.Exp:Start! exp):
+									// A client wants to connect to the mount point namespace provider.
+									// We're not connected to the server right now.  If the namespace client
+									// is a valid client (a supported contract), then we'll try to connect
+									// to the SMB server in response to this request.  If not, we don't
+									// accept the client, and we don't attempt to connect to the SMB server.
+									
+									if (NamespaceConnect(_namespace_provider, exp)) {
+									    DebugLine("Namespace client is now connected.");
+    									goto start_connect;
+									} else {
+									    DebugLine("Namespace client could not be connected.");
+									}
+									break;
+									
+							}
+						}
+
+						//
+						// At this point, we want to connect to the remote peer.
+						// Ask the Connector helper class to start connecting for us.
+						//
+
+					start_connect:
+
+						if (ConnectAndNegotiate()) {
+							goto connected_state;
+						} else {
+							goto disconnected_state;
+						}
+
+						
+
+					connected_state:
+						ConnectedReceiveLoop();
+					}
+					
+					
+				thread_quit:
+						Disconnect();
+							
+				} catch (Exception ex) {
+					DebugLine("Exception reached top of thread frame in multiplexer thread!");
+					Util.ShowExceptionDebug(ex, "TransportMultiplexer failed");
+				}
+			}
+		}		
+		
+		void ControllerBind([Claims]ServiceContract.Exp:Start! exp)
+		{
+			expose (this)
+			{
+				SmbClientControlContract.Exp typed_exp = exp as SmbClientControlContract.Exp;
+				if (typed_exp != null) {
+					if (TraceSwitches.ShowControlMessages) {
+						DebugLine("CONTROL: A control client has connected");
+					}
+					typed_exp.SendSuccess();
+					_control_clients.Add(typed_exp);
+					_controller.SendOk();
+				} else {
+					if (TraceSwitches.ShowControlMessages) {
+						DebugLine("CONTROL: A control client connected, but offered an unsupported contract type.");
+					}
+					_controller.SendRequestFailed(SmbErrorCode.InternalError, null);
+					delete exp;
+				}
+			}
+		}
+		
+		bool NamespaceConnect(ServiceProviderContract.Exp! provider, [Claims]ServiceContract.Exp:Start! exp)
+		{
+			DirectoryServiceContract.Exp dir_exp = exp as DirectoryServiceContract.Exp;
+			if (dir_exp != null) {
+			
+				if (TraceSwitches.ShowDirectoryMessages ) {
+					DebugLine("CONTROL: A namespace client has connected");
+				}
+				
+				SmbTransactor.Imp transactor = CreateTransactor();
+				if (transactor == null) {
+					DebugLine("Failed to bind namespace client because we failed to create a transactor.");
+					provider.SendNackConnect(exp);
+					return false;
+				}
+				
+				DirectoryClient.StartServiceThread(transactor, dir_exp, "/");
+				provider.SendAckConnect();
+				return true;
+			} else {
+				DebugLine("CONTROL: A namespace client connected, but offered an unsupported contract.");
+				provider.SendNackConnect(exp);
+				return false;
+			}
+		}
+
+		void Disconnect()
+		{
+			expose (this)
+			{
+				DebugLine("--- ENTERING DISCONNECTED STATE ---");
+				
+				// Reject all transactors.
+				foreach (Transactor! tran in _transactors.Values)
+				{
+					tran.Dispose();
+				}
+				_transactors.Clear();
+
+				_readyTransactors.Dispose();
+				_readyTransactors = new EMap<SmbTransactor.Exp:Ready, Transactor!>();
+				
+				if (_connection != null) {
+					delete _connection;
+					_connection = null;
+				}
+				
+				_SelectedCredentialsName = null;
+				_ReceivedServerOperatingSystem = null;
+				_ReceivedServerDomainNameFromNegotiate = null;
+				_ReceivedServerPrimaryDomainName = null;
+				_ReceivedServerMachineName = null;
+				
+			}
+		}
+
+		void ConnectedReceiveLoop()
+		{
+			expose(this)
+			{
+				DebugLine("--- ENTERING CONNECTED STATE ---");
+				
+				assert _connection != null;
+				
+				// The TCP channel is now connected.  However, we still have a lot of work to do before we can
+				// communicate with the server.  We need to send a SETUP message, and we need to authenticate.
+				// We do this on another thread.
+				
+				_connectionCanSend = true;
+				
+				for (;;)
+				{
+					assert _connection != null;
+					
+					if (_connectionCanSend) {
+						SendQueuedTransactions();
+					}
+					
+					if (_connection_failed) {
+						DebugLine("_connect_failed is set -- going to disconnect state.");
+						goto disconnect;
+					}
+
+					switch receive
+					{
+						case _namespace_provider.Connect(ServiceContract.Exp:Start! exp):
+							// A client wants to connect to the mount point namespace provider.
+							// We're in the connected state, so this is easy.
+							NamespaceConnect(_namespace_provider, exp);
+							break;
+									
+						case _notifier.Ack():
+							AckNotifier();
+							break;
+							
+						case _controller.Bind(ServiceContract.Exp:Start! exp):
+							ControllerBind(exp);
+							break;
+							
+						case _controller.Stop():
+							DebugLine("Received Stop request on controller channel");
+							_service_stopping = true;
+							Disconnect();
+							return;
+							break;
+
+						case transactor.Request(byte[]! in ExHeap request) in _readyTransactors ~> tran:
+							StartRequest(transactor, tran, request);
+							break;
+							
+						case transactor.ChannelClosed() in _readyTransactors ~> tran:
+							// A transactor has disconnected.
+							delete transactor;
+							DeleteTransactorState(tran);
+							break;
+							
+						case transactor.AddTransactor() in _readyTransactors ~> tran:
+							SmbTransactor.Imp new_transactor = CreateTransactor();
+							if (new_transactor != null) {
+								transactor.SendAckAddTransactor(new_transactor);
+							} else {
+								transactor.SendNakAddTransactor();
+							}
+							_readyTransactors.Add(transactor, tran);
+							break;						
+
+						case _connection.NoData():
+							// This is not an error.  It just means that the read poll did not return any data.
+							// Because this is part of a polling cycle, we don't bother printing any debug spew.
+							assert !_connectionCanSend;
+							_connectionCanSend = true;
+							// DebugLine("connection.NoData: no data available from TCP");
+							break;
+							
+						case _connection.NoMoreData():
+							assert !_connectionCanSend;
+							_connectionCanSend = true;
+							DebugLine("connection.NoMoreData: peer has closed our receive path");
+							SetMuxStatusDisconnected(SmbReasonDisconnected.TransportFailure);
+							goto disconnect;
+
+						case _connection.CantSend():
+							assert !_connectionCanSend;
+							_connectionCanSend = true;
+							DebugLine("connection.CantSend: peer has closed our transmit path");
+							SetMuxStatusDisconnected(SmbReasonDisconnected.TransportFailure);
+							goto disconnect;
+							
+						case _connection.Data(byte[]! in ExHeap data):
+							assert !_connectionCanSend;
+							_connectionCanSend = true;
+							// DebugLine("connection.Data: length = " + data.Length);
+							ProcessReceivedData(data, data.Length);
+							break;
+							
+						case _connection.DataIsAvailable(bool available):
+							assert !_connectionCanSend;
+							_connectionCanSend = true;
+							// DebugLine("connection.DataIsAvailable(" + available + ")");
+							break;
+							
+						case _connection.OK():
+							// from write result
+							// DebugLine("connection.OK()");
+							_connectionCanSend = true;
+							break;
+					}
+				}
+				
+				
+			disconnect:
+				assert _connection != null;
+				delete _connection;
+				_connection = null;
+			}
+		}
+
+		void SetMuxStatus(ClientStatusSnapshot! status)
+		{
+		    if (TraceSwitches.ShowMuxStatusChanges)
+			    DebugLine("SetMuxState: conn state = " + SmbDebug.EnumToString(status.ConnectionStatus));
+			
+			_mux_status = status;
+			++_mux_status_version;
+
+			SendToNotifier();
+		}
+		
+		void SetMuxStatus(SmbClientConnectionStatus connectionStatus)
+		{
+			ClientStatusSnapshot status = new ClientStatusSnapshot();
+			status.ConnectionStatus = connectionStatus;
+			status.ReasonDisconnected = SmbReasonDisconnected.Invalid;
+			status.ServerMachineName = null;
+			status.ServerDomainName = null;
+			status.ServerOperatingSystem = null;
+			SetMuxStatus(status);
+		}
+		
+		void SetMuxStatusConnected()
+		{
+			ClientStatusSnapshot status = new ClientStatusSnapshot();
+			status.ConnectionStatus = SmbClientConnectionStatus.Connected;
+			status.ReasonDisconnected = SmbReasonDisconnected.Invalid;
+			status.ServerMachineName = _ReceivedServerMachineName;
+			status.ServerDomainName = _ReceivedServerPrimaryDomainName;
+			status.ServerOperatingSystem = _ReceivedServerOperatingSystem;
+			status.ActiveCredentialsName = _SelectedCredentialsName;
+			SetMuxStatus(status);
+		}
+		
+		void SetMuxStatusDisconnected(SmbReasonDisconnected reason)
+		{
+			ClientStatusSnapshot status = new ClientStatusSnapshot();
+			status.ConnectionStatus = SmbClientConnectionStatus.Disconnected;
+			status.ReasonDisconnected = reason;
+			status.ServerMachineName = null;
+			status.ServerDomainName = null;
+			status.ServerOperatingSystem = null;
+			status.ActiveCredentialsName = null;
+			SetMuxStatus(status);
+		}
+		
+		void SetMuxStatusDisconnected(SmbReasonDisconnected reason, Exception! ex)
+		{
+			ClientStatusSnapshot status = new ClientStatusSnapshot();
+			status.ConnectionStatus = SmbClientConnectionStatus.Disconnected;
+			status.ReasonDisconnected = reason;
+			status.ServerMachineName = null;
+			status.ServerDomainName = null;
+			status.ServerOperatingSystem = null;
+			SetMuxStatus(status);
+			
+			// -XXX- Currently, we don't do anything with the exception.
+			// -XXX- Would be good to log it, report it, etc.
+			DebugLine("Mux status -> Disconnected");
+			Util.ShowExceptionDebug(ex);
+		}
+		
+		
+
+		// This method checks to see if we can (and should) send any notification messages
+		// to the notifier channel.  The "main" thread holds the exp end of the notifier
+		// channel, and this thread (the mux) sends notifications to the main thread.
+		void SendToNotifier()
+		{
+			expose (this) {
+				if (!_notifier_can_send) {
+					// The _notifier endpoint is busy.
+					if (TraceSwitches.ShowNotifierMessages)
+					    DebugLine("SendToNotifier - notifier is busy, can't send right now");
+					return;
+				}
+				
+				if (_notifier_mux_status_version < _mux_status_version) {
+                    assert _mux_status != null;
+					if (TraceSwitches.ShowNotifierMessages)
+					    DebugLine("Sending StatusChanged to notifier");
+					
+					_notifier.SendStatusChanged(_mux_status.ToExchange());
+					_notifier_can_send = false;
+					_notifier_mux_status_version = _mux_status_version;
+					return;
+				}
+			}
+		}
+		
+		void AckNotifier()
+		{
+		    if (TraceSwitches.ShowNotifierMessages) {
+		        DebugLine("Received Ack from notifier channel");
+		    }
+		    
+			assert !_notifier_can_send;
+			_notifier_can_send = true;
+			SendToNotifier();
+		}
+		
+		
+		byte[]! _recvBuffer = new byte[0x800];
+		int _recvDataLength = 0;
+
+		const int SmbFramingHeaderLength = 4; // length is in bytes
+
+		void ProcessReceivedData(
+			[Claims]byte[]! in ExHeap buffer,
+			int bufferLength)
+			requires bufferLength >= 0;
+			requires bufferLength <= buffer.Length;
+		{
+		
+			// Check to see whether the fragment buffer contains any data.
+			// If it does, then we have already received part of an SMB message, but not all of it.
+			// Assemble the full message before continuing.
+			//
+			// If _recvBuffer contains any data (_recvDataLength > 0), then that existing
+			// partial message has its start aligned with _recvBuffer.  So we never have to
+			// deal with finding the start of a message.
+			
+			if (_recvDataLength != 0) {
+				int concatLength = bufferLength + _recvDataLength;
+				
+				if (TraceSwitches.ShowSmbReassembly) {
+					DebugLine("concatenating fragment: previous fragment length = 0x{0:x} recv'd data length = 0x{1:x} total length = 0x{2:x}",
+						_recvDataLength, bufferLength, concatLength);
+				}
+				
+				byte[]! in ExHeap concatBuffer = new[ExHeap] byte[concatLength];
+				Bitter.FromByteArray(concatBuffer, 0, _recvDataLength, _recvBuffer, 0);
+				Bitter.Copy(concatBuffer, _recvDataLength, bufferLength, buffer, 0);
+				delete buffer;
+				buffer = concatBuffer;
+				bufferLength = concatLength;
+				_recvDataLength = 0;
+			}
+			
+			// scan from 0 to bufferLength within buffer
+			int parseOffset = 0;
+			for (;;) {
+				assert parseOffset <= bufferLength;
+				int remaining = bufferLength - parseOffset;
+				
+				if (remaining == 0) {
+					if (TraceSwitches.ShowSmbReassembly)
+						DebugLine("no more data in receive buffer");
+					_receiveBufferPool.Recycle(buffer);
+					return;
+				}
+				
+				bool too_short;
+				int nextMessageOffset;
+				
+				int smbLength;
+				if (SmbFramingHeaderLength < 4) {
+					if (TraceSwitches.ShowSmbReassembly)
+						DebugLine("too little data to parse -- storing in fragment buffer");
+					too_short = true;
+					smbLength = -1;
+					nextMessageOffset = -1;
+				} else {
+					smbLength = (buffer[parseOffset + 1] << 16)
+						+ (buffer[parseOffset + 2] << 8)
+						+ (buffer[parseOffset + 3]);
+					
+					nextMessageOffset = parseOffset + SmbFramingHeaderLength + smbLength;
+					if (nextMessageOffset > bufferLength) {
+						// not enough data for a complete message
+						too_short = true;
+					} else {
+						too_short = false;
+					}
+				}
+				
+				if (too_short) {
+					if (remaining > _recvBuffer.Length) {
+						_recvBuffer = new byte[remaining + 0x100];
+					}
+					
+					if (TraceSwitches.ShowSmbReassembly)
+						DebugLine("too little data to parse -- storing 0x{0:x} bytes in fragment buffer", remaining);
+						
+					Bitter.ToByteArray(buffer, parseOffset, remaining, _recvBuffer, 0);
+					_recvDataLength = remaining;
+					_receiveBufferPool.Recycle(buffer);
+					return;
+				}
+				
+				try {
+					ProcessReceivedMessage(buffer, parseOffset, smbLength + SmbFramingHeaderLength);
+				} catch (Exception ex) {
+					Util.ShowExceptionDebug(ex, "Error occurred while parsing received SMB message.");
+				}
+
+				assert nextMessageOffset <= buffer.Length;
+				assert nextMessageOffset > parseOffset;
+				
+				if (nextMessageOffset == bufferLength) {
+					// DebugLine("SMB message ended on TCP message boundary (this is the easy case)");
+					_receiveBufferPool.Recycle(buffer);
+					return;
+				}
+				
+				parseOffset = nextMessageOffset;
+			}
+		}
+		
+		void Transactor_EnterReceiveState(
+			/*[Claims]*/ Transactor! tran,
+			TransactorState tstate)
+			requires tstate == TransactorState.WaitingReceiveResponse
+				|| tstate == TransactorState.WaitingReceivePrimaryTransactionResponse
+				|| tstate == TransactorState.WaitingReceiveSecondaryTransactionResponse;
+		{
+			tran.State = tstate;
+		}
+		
+		/**
+		<summary>
+			<para>
+				This method processes a single SMB message that has been received from the SMB server.
+				The caller of this method (ProcessReceivedData) has already located the SMB message
+				within a (potentially) larger buffer, and has verified the 'SMB' 0xFF signature.
+			</para>
+			<para>
+				The purpose of this method is to match up a received SMB message to our internal state
+				for that request (a Transactor), and to advance the state of that transactor.  Depending
+				on the kind of request, the request will either be completed immediately (within the
+				scope of this method call), or will require further processing.
+			</para>
+		</summary>
+		<param name="buffer">
+			The buffer containing this SMB message, and potentially other SMB messages.
+			This method does not claim ownership of the buffer, so we must copy any data
+			out of the buffer.  Zero-copy is desirable, but is for future study.
+		</param>
+		<param name="offset">
+			The index of the first byte of the SMB message within 'buffer'.  The message begins with the
+			SMB "framing" header (4 bytes).
+		</param>
+		<param name="length">
+			The length of the SMB message within the buffer.  This value is NOT the same as the decoded
+			length value stored in the first four bytes (the framing header).
+		</param>		
+		*/
+				
+		void ProcessReceivedMessage(byte[]! in ExHeap buffer, int offset, int length)
+		{
+			if (TraceSwitches.ShowSmbMessageDetails) {
+				DebugLine("------------------ RECEIVED SMB MESSAGE --------------------------");
+				SmbDebug.DumpMessage(buffer, offset, length);
+			}
+			
+			if (length < SmbProtocol.SmbHeaderSize) {
+				DebugLine("WARNING! Protocol violation: Received an SMB header indicates a message that is too small to be meaningful, length = ", length);
+				DebugLine("The message will be ignored, and the connection will otherwise not be affected.");
+				return;
+			}
+			
+			ref SmbHeader header = ref buffer[offset];
+			
+            if (!(header.Signature0 == 0xff
+                && header.Signature1 == (byte)'S'
+                && header.Signature2 == (byte)'M'
+                && header.Signature3 == (byte)'B'))
+            {
+                DebugLine("ERROR! Protocol violation: Received an SMB message with an invalid SMB signature.");
+                DebugLine("This usually means the client and server have gotten out of sync on message boundaries.");
+                DebugLine("The connection will be terminated.");
+                _connection_failed = true;
+                return;
+            }
+            
+			if (TraceSwitches.ShowSmbMessageOneLineSummaries) {
+				string! cmdname = SmbDebug.GetSmbMessageSummary(buffer, offset);
+				if (header.IsError) {
+					DebugLine("Received <-- " + cmdname + "  ERROR: " + header.GetErrorText());
+				} else {
+					DebugLine("Received <-- " + cmdname);
+				}
+			}
+
+			//
+			// Find the transactor that sent this request by its mux tuple.
+			// In most circumstances, the mux tuple of a response will match exactly the mux tuple of the request.
+			// However, for some requests, only part of the tuple will match.  This is really annoying.
+			//
+
+			Transactor tran = FindMatchingTransactor(ref header);
+			if (tran == null) {
+				// FindMatchingTransactor has already complained enough.
+				return;
+			}
+			
+			Transactor_ProcessReceivedMessage(tran, buffer, offset, length);
+			
+		}
+		
+		void Transactor_ProcessReceivedMessage(
+			[Claims]Transactor! tran,
+			byte[]! in ExHeap buffer, int offset, int length)
+		{			
+			Transactor.TrackedData tracked = tran.AcquireData();
+			try {
+			
+				ref SmbHeader header = ref buffer[offset];
+				
+				switch (tran.State)
+				{
+					case TransactorState.Ready:
+						DebugLine(tran, "Received SMB message, but this transactor is idle!");
+						DebugLine(tran, "Ignoring message.");
+						break;
+						
+					case TransactorState.WaitingSendRequest:
+					case TransactorState.WaitingSendPrimaryTransactionRequest:
+					case TransactorState.WaitingSendSecondaryTransactionRequest:
+						DebugLine(tran, "Received SMB message, but this transactor is not expecting a message yet!");
+						DebugLine(tran, "The transactor is in a 'send' state, not a receive state.");
+						DebugLine(tran, "I'll probably regret this later, but the message will be ignored.");
+						break;
+						
+					case TransactorState.WaitingReceiveResponse:
+					{
+						// We have received the response for a "simple" SMB request/response exchange.
+						// Next, route the received message to the holder of the import endpoint of the
+						// transactor, and mark our transactor state as "ready".
+						// DebugLine("Received SMB message matching simple SMB request.");
+						SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+						Transactor_SendResponse_Copy(tran, exp, buffer, offset, length);
+						Transactor_EnterReadyState(exp, tran);
+						break;
+					}
+						
+					case TransactorState.WaitingReceiveInterimTransactionResponse:
+					{
+						// This transactor is performing a SMB_TRANSACTION2 request. The primary transaction 
+						// request has been sent, and now we have received the interim server response.  If this 
+						// response is an error, then the transaction fails immediately.  If this response is a 
+						// "go ahead" code, then we have permission from the server to send the rest of the 
+						// transaction's request fragments (the "secondary transaction requests").
+						
+						if (TraceSwitches.ShowTransactionFragmentationReassembly)
+							DebugLine(tran, "Received interim server response");
+							
+						if (header.IsError) {
+							if (TraceSwitches.ShowTransactionFragmentationReassembly)
+								DebugLine(tran, "    Server indicates ERROR -- transaction fails immediately.");
+								
+							SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+							Transactor_SendResponse_Copy(tran, exp, buffer, offset, length);
+							Transactor_EnterReadyState(exp, tran);
+						} else {
+							if (TraceSwitches.ShowTransactionFragmentationReassembly)
+								DebugLine(tran, "    Server says go ahead with request fragments");
+								
+							Transactor_EnqueueForSend(tran, TransactorState.WaitingSendSecondaryTransactionRequest);
+						}
+						break;
+					}
+						
+					case TransactorState.WaitingReceivePrimaryTransactionResponse:
+					{
+						// We've received the primary response to a SMB_TRANSACTION2 exchange.
+						// This response may have further responses (fragments), or may be the only response.
+						if (TraceSwitches.ShowTransactionFragmentationReassembly)
+							DebugLine(tran, "Received Primary Transaction Response");
+
+						if (header.IsError) {
+							if (TraceSwitches.ShowTransactionFragmentationReassembly)
+								DebugLine(tran, "    Response indicates ERROR");
+							// DebugStub.Break();
+							
+							//
+							// We're receiving SMB TRANSACTION2 responses from XP that don't match anything rational,
+							// when the transaction fails.  So for now, we treat any primary transaction response
+							// that has an error code in the SMB header as the only fragment that we will receive.
+							//
+							SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+							Transactor_SendResponse_Copy(tran, exp, buffer, offset, length);
+							Transactor_EnterReadyState(exp, tran);
+							break;							
+						}
+						
+						if (length < sizeof(SmbTransaction2Response)) {
+							// This message is too small to be a valid transaction response.
+							// It may be an error response from an older SMB server.
+							if (TraceSwitches.ShowTransactionFragmentationReassembly) {
+								DebugLine(tran, "    Response is too short to be a valid TRANSACTION2 response!");
+								DebugLine(tran, "    Completing request immediately.");
+							}
+							SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+							Transactor_SendResponse_Copy(tran, exp, buffer, offset, length);
+							Transactor_EnterReadyState(exp, tran);
+						} else {
+							ref SmbTransaction2Response response = ref buffer[offset];
+							
+							int totalParameterCount = ByteOrder.LeToHost(response.Transaction.TotalParameterCount);
+							int totalDataCount = ByteOrder.LeToHost(response.Transaction.TotalDataCount);
+							int parameterOffset = ByteOrder.LeToHost(response.Transaction.ParameterOffset);
+							int dataOffset = ByteOrder.LeToHost(response.Transaction.DataOffset);
+							int parameterCount = ByteOrder.LeToHost(response.Transaction.ParameterCount);
+							int dataCount = ByteOrder.LeToHost(response.Transaction.DataCount);
+							
+							if (totalParameterCount > parameterCount || totalDataCount > dataCount) {
+								if (TraceSwitches.ShowTransactionFragmentationReassembly) {
+									DebugLine(tran, "    Response indicates server will fragment transaction response.");
+									DebugLine(tran, "        Parameters: {0}/{1}    Data: {2}/{3}",
+										parameterCount, totalParameterCount, dataCount, totalDataCount);
+								}
+									
+								// Compute the length of a buffer that will contain the entire, assembled
+								// response message.
+								// int assembledResponseLength = Util.Align4(sizeof(SmbTransaction2Response)) + totalParameterCount + totalDataCount;
+								int hypotheticalParameterEnd = SmbHeader.FramingHeaderLength + parameterOffset + totalParameterCount;
+								int hypotheticalDataEnd = SmbHeader.FramingHeaderLength + dataOffset + totalDataCount;
+								int hypotheticalMessageLength = Util.Align4(Math.Max(hypotheticalParameterEnd, hypotheticalDataEnd));
+								int assembledResponseLength = hypotheticalMessageLength;
+								
+								if (TraceSwitches.ShowTransactionFragmentationReassembly)
+									DebugLine(tran, "      Reassembly buffer length: " + assembledResponseLength);
+								
+								if (assembledResponseLength < length) {
+									// Uhhhhh, this doesn't make any sense!
+									DebugLine(tran, "*** Internal error!  Reassembly buffer is shorter than the first packet buffer?!");
+									DebugStub.Break();
+									SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+									Transactor_SendRequestFailed(tran, exp, SmbTransactionError.InternalError);
+									Transactor_EnterReadyState(exp, tran);
+									break;
+								}
+								
+								// Allocate the buffer used to reassemble the entire transaction response.
+								
+								byte[]! in ExHeap reassemblyBuffer = new[ExHeap] byte[assembledResponseLength];
+								Bitter.Copy(reassemblyBuffer, 0, length, buffer, offset);
+								
+								#if INCREDIBLY_NOISY
+								if (TraceSwitches.ShowTransactionFragmentationReassemblyVerbose) {
+									DebugLine(tran, "Contents of primary transaction response:");
+									Util.DumpBuffer(buffer, offset, length);
+									DebugLine(tran, "Contents of parameter fragment portion:");
+									Util.DumpBuffer(buffer, offset + SmbHeader.FramingHeaderLength + parameterOffset, parameterCount);
+									DebugLine(tran, "Contents of data fragment portion:");
+									Util.DumpBuffer(buffer, offset + SmbHeader.FramingHeaderLength + dataOffset, dataCount);
+								}
+								#endif
+
+								// Set up the transactor state for reassembly.
+								expose(tracked) {
+									delete tracked.ResponseReassemblyBuffer;
+									tracked.ResponseReassemblyBuffer = reassemblyBuffer;
+								}
+								
+								tracked.Transaction_ReceivedParameterBytes = parameterCount;
+								tracked.Transaction_ReceivedDataBytes = dataCount;
+								tracked.Transaction_ReceivedFragmentCount = 1;								
+								tracked.Transaction_DataOffset = SmbHeader.FramingHeaderLength + dataOffset;
+								tracked.Transaction_ParameterOffset = SmbHeader.FramingHeaderLength + parameterOffset;
+
+								if (TraceSwitches.ShowTransactionFragmentationReassembly)
+									DebugLine(tran, "    Waiting for more fragments");
+									
+								Transactor_EnterReceiveState(tran, TransactorState.WaitingReceiveSecondaryTransactionResponse);
+								// DebugStub.Break();
+								
+							} else {
+								if (TraceSwitches.ShowTransactionFragmentationReassembly) {
+									DebugLine(tran, "    Response indicates no fragmentation necessary");
+									DebugLine(tran, "    Completing request immediately.");
+								}
+								
+								SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+								Transactor_SendResponse_Copy(tran, exp, buffer, offset, length);
+								Transactor_EnterReadyState(exp, tran);
+							}
+						}
+						break;
+					}
+						
+					case TransactorState.WaitingReceiveSecondaryTransactionResponse:
+					{
+						if (TraceSwitches.ShowTransactionFragmentationReassembly)
+							DebugLine(tran, "Received Secondary Transaction Response");
+							
+						// Is this the last one?  Are we done yet?
+						
+						ref SmbTransaction2Response response = ref buffer[offset];			
+						int totalParameterCount = ByteOrder.LeToHost(response.Transaction.TotalParameterCount);
+						int totalDataCount = ByteOrder.LeToHost(response.Transaction.TotalDataCount);
+						int parameterCount = ByteOrder.LeToHost(response.Transaction.ParameterCount);
+						int dataCount = ByteOrder.LeToHost(response.Transaction.DataCount);
+						int parameterDisplacement = ByteOrder.LeToHost(response.Transaction.ParameterDisplacement);
+						int dataDisplacement = ByteOrder.LeToHost(response.Transaction.DataDisplacement);
+						int parameterOffset = ByteOrder.LeToHost(response.Transaction.ParameterOffset);
+						int dataOffset = ByteOrder.LeToHost(response.Transaction.DataOffset);
+						
+						if (TraceSwitches.ShowTransactionFragmentationReassembly)
+							DebugLine(tran, "Reassembling fragment #" + tracked.Transaction_ReceivedFragmentCount);
+						// DebugStub.Break();
+						
+						tracked.Transaction_ReceivedFragmentCount++;
+						
+						expose (tracked)
+						{
+							assert tracked.ResponseReassemblyBuffer != null;
+							
+							// -XXX- Need to validate the offsets/lengths/etc.
+							// -XXX- Bitter.Copy will validate them, but will throw exceptions.
+							
+							// DebugStub.Break();
+							
+							if (parameterCount != 0) {
+								if (TraceSwitches.ShowTransactionFragmentationReassembly)
+									DebugLine(tran, "        Reassembled {0}/{1} parameter bytes at offset {2}", parameterCount, totalParameterCount, parameterDisplacement);
+								
+								Bitter.Copy(
+									tracked.ResponseReassemblyBuffer,
+									tracked.Transaction_ParameterOffset + parameterDisplacement,
+									parameterCount,
+									buffer,
+									offset + SmbHeader.FramingHeaderLength + parameterOffset);
+
+								if (TraceSwitches.ShowTransactionFragmentationReassemblyVerbose) {
+									DebugLine(tran, "Contents of parameter fragment portion:");
+									Util.DumpBuffer(buffer, offset + SmbHeader.FramingHeaderLength + parameterOffset, parameterCount);
+								}
+									
+								tracked.Transaction_ReceivedParameterBytes += parameterCount;
+							}
+							
+							if (dataCount != 0) {
+								if (TraceSwitches.ShowTransactionFragmentationReassembly)
+									DebugLine(tran, "        Reassembled {0}/{1} data bytes at offset {2}", dataCount, totalDataCount, dataDisplacement);
+
+								Bitter.Copy(
+									tracked.ResponseReassemblyBuffer,
+									tracked.Transaction_DataOffset + dataDisplacement,
+									dataCount,
+									buffer,
+									offset + SmbHeader.FramingHeaderLength + dataOffset);
+
+								if (TraceSwitches.ShowTransactionFragmentationReassemblyVerbose) {
+									DebugLine(tran, "Contents of data fragment portion:");
+									Util.DumpBuffer(buffer, offset + SmbHeader.FramingHeaderLength + dataOffset, dataCount);
+								}
+									
+								tracked.Transaction_ReceivedDataBytes += dataCount;
+							}
+						}
+						
+						bool last = false;
+						
+						if (parameterCount == 0 && dataCount == 0) {
+							// Ummmm, the server is crazy.
+							DebugLine(tran, "*** Received transaction fragment with both ParameterCount == 0 and DataCount == 0!");
+							DebugLine(tran, "*** I think this is a protocol violation.  Completing the transaction.");
+							last = true;
+						}
+						
+						if (tracked.Transaction_ReceivedParameterBytes >= totalParameterCount
+							&& tracked.Transaction_ReceivedDataBytes >= totalDataCount)
+						{
+							if (TraceSwitches.ShowTransactionFragmentationReassembly) {
+								DebugLine(tran, "We have apparently received all of the transaction response fragments.");
+							}
+							if (TraceSwitches.ShowTransactionFragmentationReassemblyVerbose) {
+								DebugLine(tran, "Reassembled transaction response:");
+								expose (tracked) { Util.DumpBuffer(tracked.ResponseReassemblyBuffer); }
+							}
+							// DebugStub.Break();
+							last = true;
+						}
+						
+						if (last) {
+							if (TraceSwitches.ShowTransactionFragmentationReassembly)
+								DebugLine(tran, "    Last fragment!");
+								
+							byte[] in ExHeap! reassembledResponseBuffer = (!)tracked.ExtractResponseReassemblyBuffer();
+							SmbTransactor.Exp! exp = (!)tracked.AcquireEndpoint();
+							Transactor_SendResponse_ClaimsBuffer(tran, exp, reassembledResponseBuffer);
+							Transactor_EnterReadyState(exp, tran);
+						} else {
+							Transactor_EnterReceiveState(tran, TransactorState.WaitingReceiveSecondaryTransactionResponse);
+						}
+						break;
+					}
+						
+					default:
+						DebugLine(tran, "INTERNAL ERROR -- TRANSACTOR IS IN UNRECOGNIZED STATE!");
+						DebugStub.Break();
+						break;					
+				}
+			} finally {
+				tran.ReleaseData(tracked);
+			}
+		}
+		
+		void Transactor_SendResponse_ClaimsBuffer(Transactor! tran, SmbTransactor.Exp! exp, [Claims]byte[]! in ExHeap response)
+		{
+			exp.SendResponse(response);			
+		}
+		
+		void Transactor_SendRequestFailed(Transactor! tran, SmbTransactor.Exp! exp, SmbTransactionError error)
+		{
+			DebugLine(tran, "Sending RequestFailed: " + error.ToString());
+			exp.SendRequestFailed(error);
+		}
+		
+		void Transactor_SendResponse_Copy(Transactor! tran, SmbTransactor.Exp! exp, byte[]! in ExHeap buffer, int offset, int length)
+		{
+			byte[]! in ExHeap response = new[ExHeap] byte[length];
+			Bitter.Copy(response, 0, length, buffer, offset);
+			Transactor_SendResponse_ClaimsBuffer(tran, exp, response);
+		}
+		
+		void DumpTransactorTable()
+		{
+			DebugLine("Contents of _transactors:");
+			foreach (DictionaryEntry entry in _transactors)
+			{
+				MuxTuple tuple = (MuxTuple)entry.Key;
+				Transactor! tran = (!)(Transactor)entry.Value;
+				
+				if (tuple != tran.Tuple) {
+					DebugLine("!!! Transactor key mismatch!  Key={0} tran.Tuple={1}", tuple.ToString(), tran.Tuple.ToString());
+					DebugStub.Break();
+				}
+				
+				DebugLine("    " + tran.ToString());
+			}
+		}
+		
+		Transactor FindMatchingTransactor(ref SmbHeader header)
+		{
+			MuxTuple tuple = MuxTuple.FromSmbHeader(header);
+			object boxed_tuple = (object)tuple;
+			
+			Transactor tran = (Transactor)_transactors[boxed_tuple];
+			if (tran != null) {
+				return tran;
+			}
+
+#if DEBUG				
+			DebugLine("!!! Received SMB message, but the mux tuple does not match any active transactor! tuple=" + MuxTuple.FromSmb(ref header).ToString());
+			DumpTransactorTable();
+			DebugStub.Break();
+			
+			// for dbg only
+			
+			DebugLine("tuple hash code: 0x{0:x8}", tuple.GetHashCode());
+			
+			DebugLine("Key search:");
+			foreach (object! key in _transactors.Keys)
+			{
+				bool is_equal_1 = key.Equals(boxed_tuple);
+				bool is_equal_2 = boxed_tuple.Equals(key);
+				assert is_equal_1 == is_equal_2;				
+				DebugLine("    key: hash code 0x{0:x8} tuple {1} equal? {2} {3}", key.GetHashCode(), key.ToString(),
+					Util.YesNoString(is_equal_1),
+					Util.YesNoString(is_equal_2));
+			}
+#endif
+
+			return null;
+		}
+		
+		
+		const int SmbMessageMinimumLength = 0x1a;
+			// 0: 4-byte signature: 0xff 'S' 'M' 'B'
+			// 4: 1-byte command, 3-byte status
+			// 8: 1-byte status, 1-byte flags, 2-byte FLAGS2
+			// c: 8-byte "EXTRA"
+			// 12: tid
+			// 14: pid
+			// 16: uid
+			// 18: mid
+			// 1a: -- end --
+		
+		const int NativeSmbPort = 445;
+		
+		// if true, then we can send a message on the TCP connection channel.
+		// if false, then we can only wait for a response.
+		bool _connectionCanSend;
+		
+		const int ReceiveBufferSize = 0x400;
+		
+		// contains _TRef<byte[] in ExHeap>, each of which contains a buffer
+		// all of the slots within [0,_freeReceiveBufferCount) are non-null, and contain a valid
+		// (acquirable) byte[] buffer.
+		//
+		// the slots from _freeReceiveBuffers[_freeReceiveBufferCount] to _freeReceiveBuffers[length - 1]
+		// are either null, or have been acquired.
+		readonly BufferPool! _receiveBufferPool = new BufferPool(0x40, 0x400);
+		
+		// Because TcpConnectionContract is half-duplex, we have to poll.
+		const int PollTimeoutMs = 100;
+		
+		void SendQueuedTransactions()
+			// requires _connection != null;
+		{
+			
+			// if we cannot send on the connection, then this method can't do anything.
+			expose(this) {
+				if (_connection == null)
+					return;
+			}
+			
+			if (!_connectionCanSend)
+				return;
+
+			while (_connectionCanSend && _queuedTransactors.Count != 0)
+			{
+				Transactor! tran = (!)(Transactor)_queuedTransactors.Dequeue();
+				assert tran.InQueue;
+				tran.InQueue = false;
+				Transactor_SendData(tran);
+			}
+
+			if (_connectionCanSend) {
+				//
+				// Issue a read (receive).  Because the TcpConnectionContract is half-duplex, we have to use polling
+				// with timeouts to multiplex send/receive path.  Yick.
+				//
+				bool wait = true;
+				
+				// if (_queuedTransactors.Count != 0)
+				//	wait = false;
+				
+				expose (this) {
+					if (wait) {
+						// blocking read
+						// DebugLine("issuing blocking read (SendPollRead)");
+						_connection.SendPollRead(PollTimeoutMs);
+					} else {
+						// non-blocking read
+						// DebugLine("issuing nonblocking read (SendRead)");
+						_connection.SendRead();
+					}
+				}
+				_connectionCanSend = false;
+			}
+		}
+		
+		void Transactor_SendData(Transactor! tran)
+			requires _connectionCanSend;
+		{
+			Transactor.TrackedData tracked = tran.AcquireData();
+			
+			switch (tran.State)
+			{
+				case TransactorState.WaitingSendRequest:
+				{
+					// It's a "simple" request.  Just send the request body.
+					// Ownership of the buffer moves from the transactor client, to the mux, to TCP/IP.
+					byte[]! in ExHeap request;
+					expose (tracked) {
+						assert tracked.RequestBuffer != null;
+						request = tracked.RequestBuffer;
+						tracked.RequestBuffer = null;
+					}
+
+					if (TraceSwitches.ShowSmbMessageDetails) {
+						DebugLine(tran, "sending request to TCP/IP, length = " + request.Length);
+						SmbDebug.DumpMessage(request, 0, request.Length);
+					}
+					if (TraceSwitches.ShowSmbMessageOneLineSummaries) {
+						DebugLine(tran, "Sending --> " + SmbDebug.GetSmbMessageSummary(request, 0));
+					}
+
+					SendData(request);
+					Transactor_EnterReceiveState(tran, TransactorState.WaitingReceiveResponse);
+					break;
+				}
+
+				case TransactorState.WaitingSendPrimaryTransactionRequest:
+				{	
+					// It's a "transaction" style request.  Next, we need to determine whether the
+					// entire transaction request can fit inside a single SMB message.  If so, the
+					// next step is to wait for the transaction response.  If not, then the next
+					// step is to wait for the "interim server response".
+					
+					expose (tracked) {
+						assert tracked.RequestBuffer != null;
+						if (tracked.RequestBuffer.Length <= _MaxSmbRequestLength) {
+							// The transaction request is small enough to fit in a single SMB request.
+							byte[]! in ExHeap request = tracked.RequestBuffer;
+							tracked.RequestBuffer = null;
+							
+							SendData(request);
+							Transactor_EnterReceiveState(tran, TransactorState.WaitingReceivePrimaryTransactionResponse);
+							
+						} else {
+							// Need to segment the request.
+							// int primaryRequestLength = _MaxSmbRequestLength;
+							DebugLine("Transaction segmentation not yet implemented");
+							DebugStub.Break();
+							
+							
+						}
+					}
+					break;
+				}
+				
+				case TransactorState.WaitingSendSecondaryTransactionRequest:
+					DebugLine("Transaction segmentation not yet implemented");
+					DebugStub.Break();
+					break;
+			}
+			
+			tran.ReleaseData(tracked);
+		}
+		
+		void SendData([Claims]byte[]! in ExHeap buffer)
+		{
+			expose(this)
+			{
+				assert _connectionCanSend;
+				assert _connection != null;
+				
+				_connection.SendWrite(buffer);
+				// Since we have sent a message on the TCP/IP channel, we cannot send any more
+				// messages until we receive a message.
+				_connectionCanSend = false;
+			}
+		}
+
+		// Contains Transactor.
+		// All instances in this list are in the state "Active", and are waiting to be transmitted.
+		readonly Queue/*<Transactor!>*/! _queuedTransactors = new Queue();
+		
+		void Transactor_EnqueueForSend(
+			Transactor! tran,
+			TransactorState tstate)
+			requires tstate == TransactorState.WaitingSendRequest
+				|| tstate == TransactorState.WaitingSendPrimaryTransactionRequest
+				|| tstate == TransactorState.WaitingSendSecondaryTransactionRequest;
+			requires !tran.InQueue;
+		{
+			if (!(tstate == TransactorState.WaitingSendRequest
+				|| tstate == TransactorState.WaitingSendPrimaryTransactionRequest
+				|| tstate == TransactorState.WaitingSendSecondaryTransactionRequest)) {
+				DebugLine(tran, "ILLEGAL STATE FOR ENQUEUING A TRANSACTOR FOR SEND!");
+				DebugStub.Break();
+				throw new Exception("Illegal state for enqueuing a transactor for send!");
+			}
+
+			assert !tran.InQueue;			
+			tran.InQueue = true;
+			
+			tran.State = tstate;
+			_queuedTransactors.Enqueue(tran);
+		}
+
+		// Examines the request to start a transaction, validates some parameters and information about the request.
+		// Moves a request from the idle to the queued state.
+		void StartRequest(
+			[Claims]SmbTransactor.Exp:WaitingRequestResponse! tran_exp,
+			[Claims]Transactor! tran,
+			[Claims]byte[]! in ExHeap request)
+			requires tran.State == TransactorState.Ready;
+		{
+			int length = request.Length;
+			
+			if (length < sizeof(SmbHeader)) { // SmbProtocol.SmbHeaderSize) {
+				DebugLine("SMB message is too small to be valid.");
+				goto validation_failed;
+			}
+			
+			ref SmbHeader header = ref request[0];
+			
+			int smbLength = length - 4;
+			header.FrameLength0 = 0;
+			header.FrameLength1 = (byte)((smbLength >> 16) & 0xff);
+			header.FrameLength2 = (byte)((smbLength >> 8) & 0xff);
+			header.FrameLength3 = (byte)(smbLength & 0xff);
+			
+			//
+			// Fill in the mux tuple.
+			// The transactor client doesn't need to do this.
+			//			
+			header.TreeId = (ushort)tran.Tuple.TreeId;
+			header.ProcessId = (ushort)tran.Tuple.ProcessId;
+			header.UserId = (ushort)tran.Tuple.UserId;
+			header.MuxId = (ushort)tran.Tuple.MuxId;
+			
+			header.Signature0 = 0xff;
+			header.Signature1 = (byte)'S';
+			header.Signature2 = (byte)'M';
+			header.Signature3 = (byte)'B';
+			
+			header.Flags1 = (byte)tran._smbFlag1;
+			header.Flags2 = (ushort)tran._smbFlag2;
+			
+			// DebugLine(tran, "idle -> queued, request length = " + length.ToString());
+			
+			tran.Command = (SmbCommand)header.Command;
+			
+			Transactor.TrackedData tracked = tran.AcquireData();
+
+			TransactorState nextstate;
+			
+			if (tran.Command == SmbCommand.Transaction2) {
+				// SMB defines the SMB_TRANSACTION2 command, which has a more complex message pattern
+				// than the simple request/response pattern that most commands use.  SMB allows for
+				// fragmentation of SMB_TRANSACTION2 requests and responses.
+
+				// DebugLine("Starting SMB_TRANSACTION2 request");
+				tracked.TransactionRequestFragmentByteIndex = -1;
+				nextstate = TransactorState.WaitingSendPrimaryTransactionRequest;
+			} else {
+				tracked.TransactionRequestFragmentByteIndex = -1;
+				nextstate = TransactorState.WaitingSendRequest;
+			}
+
+			expose (tracked) {
+				// Transfer ownership of the SmbTransactor.Exp endpoint to the Transactor instance.
+				delete tracked.Exp;
+				tracked.Exp = tran_exp;
+				
+				// Transfer ownership of the request buffer from the caller to the Transactor instance.
+				delete tracked.RequestBuffer;
+				tracked.RequestBuffer = request;
+				tracked.RequestLength = length;
+			}
+			
+			tran.ReleaseData(tracked);
+
+			// Queue this transactor for access to the send path of the socket.			
+			Transactor_EnqueueForSend(tran, nextstate);
+			return;
+			
+		validation_failed:
+			DebugLine(tran, "Rejecting request -- parameter validation failed");
+			DebugStub.Break();
+			tran_exp.SendRequestFailed(SmbTransactionError.InvalidParameters);
+			delete request;
+
+			Transactor_EnterReadyState(tran_exp, tran);
+			return;
+		}
+		
+		void Transactor_EnterReadyState([Claims]SmbTransactor.Exp! exp, Transactor! tran)
+		{
+			expose(this)
+			{
+				// assert tran.Exp == null;
+				tran.State = TransactorState.Ready;
+				_readyTransactors.Add(exp, tran);
+			}
+		}
+		
+		void DeleteTransactorState(Transactor! tran)
+		{
+			// DebugLine(tran, "deleting transactor");
+			object boxed_tuple = (object)tran.Tuple;
+			_transactors.Remove(boxed_tuple);
+			
+			// -XXX- Need to scan the send queue!
+			
+			tran.Dispose();
+			// DebugLine(tran, "deleted transactor");
+		}
+		
+		int _nextMuxId;
+		
+		int AllocateMuxId()
+		{
+			int firstMuxId = _nextMuxId;
+
+			for (;;) {
+				int muxId = _nextMuxId;
+				_nextMuxId++;
+				if (_nextMuxId > 0xff)
+					_nextMuxId = 1;
+				
+				MuxTuple tuple = this._treeTuple;
+				tuple.MuxId = muxId;
+				
+				object boxed_tuple = tuple;
+				if (_transactors[boxed_tuple] == null) {
+					// DebugLine("Allocated mux ID: " + muxId);
+					return muxId;
+				}
+			
+				if (_nextMuxId == firstMuxId) {
+					DebugLine("No mux IDs are available.");
+					return -1;
+				}
+			}
+		}
+
+		// This method runs on the mux thread, and it handles the SmbTransportMux.AddTransactor message.
+		// This message is sent by other threads to this thread, in order to request that the mux create
+		// a new transactor.  A transactor is anything that can send requests to the mux, and then wait
+		// for responses (a transaction).
+		// 
+		// This method checks the hashtable of transactors to see if there are any tuple collisions
+		
+		SmbTransactor.Imp CreateTransactor()
+		{
+			SmbTransactor.Imp! transactor_imp;
+			SmbTransactor.Exp! transactor_exp;
+			SmbTransactor.NewChannel(out transactor_imp, out transactor_exp);
+			if (CreateTransactor(transactor_exp)) {
+				return transactor_imp;
+			} else {
+				delete transactor_imp;
+				return null;
+			}			
+		}
+		
+		bool CreateTransactor([Claims]SmbTransactor.Exp! transactor_exp)
+		{
+			expose (this)
+			{
+				int muxId = AllocateMuxId();
+				if (muxId == -1) {
+					DebugLine("Failed to create transactor -- no mux IDs are available.");
+					delete transactor_exp;
+					return false;
+				}
+			
+				MuxTuple tuple = _treeTuple;
+				tuple.MuxId = muxId;
+
+				object boxed_tuple = (object)tuple;			
+				if (_transactors[boxed_tuple] != null) {
+					DebugLine("Internal error - mux tuple is in use, even though we called AllocateMuxId!");
+					delete transactor_exp;
+					return false;
+				}
+				
+				Transactor tran = new Transactor(tuple);
+				
+				tran._smbFlag1 = (SmbFlag1)0;
+				
+				tran._smbFlag2 = SmbFlag2.KnowsLongNames
+					| SmbFlag2.AllPathsAreLongNames
+					| SmbFlag2.UsingNtStatus
+					| SmbFlag2.UnicodeStrings;
+					
+				_transactors[boxed_tuple] = tran;
+				
+				Transactor_EnterReadyState(transactor_exp, tran);
+				
+				if (TraceSwitches.ShowTransactorMessages)
+					DebugLine(tran, "Transactor created");
+				
+				return true;				
+			}
+		}
+
+		void DebugLine(string! msg)
+		{
+			SmbDebug.WriteLine("MUX: " + msg);
+		}
+		
+		void DebugLine(string! format, params object[] args)
+		{
+			DebugLine(String.Format(format, args));
+		}
+		
+		void DebugLine(Transactor! tran, string msg)
+		{
+			SmbDebug.WriteLine(tran.DebugPrefix + msg);
+		}
+		
+		void DebugLine(Transactor! tran, string format, params object[] args)
+		{
+			DebugLine(tran, String.Format(format, args));
+		}
+	
+		const string OSName = "MSR Singularity";
+		const string LanManName = "smbclient";
+		
+		
+		
+		SmbFlag1 _flags1;
+		SmbFlag2 _flags2;
+		
+		int _treeId;
+		int _processId;
+		int _muxId;
+		int _userId;
+
+		TcpConnectionContract.Imp:ReadyState! CreateTcpConnection()
+		{
+			//
+			// We invoke this synchronously, so we trust the TCP/IP stack not to delay us for an inordinate time.
+			//
+			
+			TcpConnectionContract.Imp:ReadyState! connection = NetUtil.CreateTcpConnection();
+			
+			return connection;
+		}
+
+		/*
+		This method handles connecting to an SMB server and negotiating for access to the file service.
+		It handles name resolution, connecting the transport layer (TCP/IP), authentication, and connecting
+		to the SMB file service.  Once this method returns (successfully), the SMB connection is ready
+		for general use by transactor clients.
+		
+		This method (any any methods it calls) do need to pay attention to certain messages from the
+		SmbClientManager process.  Currently, there are several important call paths (such as WaitResponse)
+		which do NOT receive any messages from the control client.  This needs to be fixed.
+		*/
+		bool ConnectAndNegotiate()
+		{
+			expose(this)
+			{
+				DebugLine("--- CONNECTING TO SERVER ---");
+				
+				SetMuxStatus(SmbClientConnectionStatus.TransportConnecting);
+				
+				if (_connection != null) {
+					delete _connection;
+					_connection = null;
+				}
+				
+				//
+				// -XXX- I *really* want a better solution than this.  I don't want to block this thread
+				// -XXX- while waiting for TCP/IP to connect.
+				//
+				
+				try {
+					TcpConnectionContract.Imp:Connected! connection = NetUtil.ConnectAny(_ServerHostName, NativeSmbPort);
+					delete _connection;
+					_connection = connection;
+					_connectionCanSend = true;
+				} catch(Exception ex) {
+					DebugLine("Failed to connect to server.");
+					Util.ShowExceptionDebug(ex);
+					SetMuxStatusDisconnected(SmbReasonDisconnected.TransportConnectFailed);
+					return false;
+				}				
+				
+				
+				_flags1 = 
+					  SmbFlag1.CaseInsensitive
+					| SmbFlag1.CanonicalizedPaths;
+					
+				_flags2 =
+					  SmbFlag2.KnowsLongNames
+					| SmbFlag2.KnowsExtendedAttributes
+					| SmbFlag2.AllPathsAreLongNames
+					// | SmbFlag2.AwareOfExtendedSecurity
+					| SmbFlag2.UsingNtStatus
+					| SmbFlag2.UnicodeStrings;
+
+				_treeId = 1;
+				_processId = 0xffef;
+				_userId = 0;
+				_muxId = 0;
+				
+				SetMuxStatus(SmbClientConnectionStatus.Negotiating);
+
+				try {				
+					Negotiate();
+				} catch(Exception ex) {
+					SetMuxStatusDisconnected(SmbReasonDisconnected.NegotiationFailed, ex);
+					Disconnect();
+					return false;
+				}
+				
+				SetMuxStatus(SmbClientConnectionStatus.Authenticating);
+
+				try {
+					SessionSetupAndConnectBasic();
+				} catch(Exception ex) {
+					SetMuxStatusDisconnected(SmbReasonDisconnected.AuthenticationFailed, ex);
+					Disconnect();
+					return false;
+				}
+				
+				try {
+					TreeConnect();
+				} catch(Exception ex) {
+					SetMuxStatusDisconnected(SmbReasonDisconnected.ResourceConnectFailed, ex);
+					Disconnect();
+					return false;
+				}
+
+				DebugLine("Negotiation completed successfully");
+				
+				SetMuxStatusConnected();
+				
+				SmbMuxTuple tree;
+				tree.ProcessId = _processId;
+				tree.UserId = _userId;
+				tree.MuxId = _muxId;
+				tree.TreeId = _treeId;
+				_treeTuple = tree;
+				
+				return true;
+			}
+		}
+		
+		void TreeConnect()
+		{
+			ByteWriter data = new ByteWriter();
+			string! unc = Program.UncPath;
+			// yes, SMB mixes ASCII and UNICODE!  yes, it drives me crazy!
+			// "password", really just alignment padding
+			data.WriteZero(1); 
+			WriteSmbStringUnicode(data, unc, true);
+			// "?????" means "any type of service"
+			WriteSmbStringAscii(data, "?????", true);
+			
+			
+			int messageLength = sizeof(SmbTreeConnectAndX) + data.Length;
+			byte[]! in ExHeap request_encoded = new[ExHeap] byte[messageLength];
+			try {
+				ref SmbTreeConnectAndX request = ref request_encoded[0];
+				request = new SmbTreeConnectAndX();
+				PrepareHeader(ref request.Header, SmbCommand.TreeConnectAndX, 4);
+				request.AndXCommand = 0xff; // no AndX
+				request.AndXOffset = 0;
+				request.AndXReserved = 0;
+				request.ByteCount = (ushort)data.Length;
+				request.PasswordLength = 1;
+
+				data.CopyTo(request_encoded, sizeof(SmbTreeConnectAndX));
+			} catch {
+				delete request_encoded;
+				throw;
+			}
+			
+			if (TraceSwitches.ShowNegotiation)
+			    DebugLine("Sending TreeConnectAndX");
+			
+			byte[]! in ExHeap response_encoded = ExecuteSynchronousCommand(request_encoded);			
+			try {
+			
+				ref SmbHeader response = ref response_encoded[0];
+				if (response.IsError) {
+				    DebugLine("Received TREE CONNECT response - FAILURE");
+				    DebugLine("Error: " + response.GetErrorText());
+					throw new Exception("Tree connect FAILED: " + response.GetErrorText());
+				}
+				
+				if (TraceSwitches.ShowNegotiation)
+				    DebugLine("Received TREE CONNECT response - successful");
+				
+				// I don't like this.  We receive a different mux tuple from the server in response
+				// to TreeConnectAndX (the tree ID is different; it has been assigned by the server).
+				// So for now, we just change our tree ID.  This means that the SMB client is restricted
+				// to servicing a single tree connection.  I want this to change in the future, so that
+				// a single SMB client connection can carry requests for multiple different tree connections.
+				// This may be a dream, maybe even a bad one, but I want readers to be aware of this issue.
+				this._treeId = response.TreeId;
+			
+			} finally {
+				delete response_encoded;
+			}
+		}
+		
+		void PrepareHeader(ref SmbHeader header, SmbCommand command, int parameterCount)
+			requires parameterCount >= 0;
+			requires parameterCount < 256;
+		{
+			header.SetSignature();
+			header.Command = (byte)command;
+			header.ParameterCount = (byte)parameterCount;
+			header.TreeId = (ushort)_treeId;
+			header.UserId = (ushort)_userId;
+			header.ProcessId = (ushort)_processId;
+			header.MuxId = (ushort)_muxId;
+			header.Flags1 = (byte)_flags1;
+			header.Flags2 = (ushort)_flags2;
+		}
+
+		// This method waits to receive one SMB message from the server.
+		// This is for use ONLY during initial negotiation.
+		byte[]! in ExHeap WaitResponse()
+			// requires _connection != null;
+		{
+			expose(this)
+			{
+				assert _connection != null;
+				for (;;) {
+				
+					if (_connectionCanSend) {
+						// Yes, we "poll" with a time-out.
+						// I don't like this, but it's our only option until we have full duplex channels,
+						// or a 2-channel TCP implementation.
+						_connection.SendPollRead(100);
+						_connectionCanSend = false;
+					}
+				
+					switch receive
+					{
+						case _connection.Data(byte[]! in ExHeap data):
+							assert !_connectionCanSend;
+							_connectionCanSend = true;
+							// DebugLine("Received data on socket: length = " + data.Length);
+							byte[] in ExHeap response = ProcessReceivedData(data);
+							if (response != null)
+								return response;
+							break;
+							
+						case _connection.ChannelClosed():
+							throw new Exception("The TCP channel closed before receiving a message.");
+
+						case _connection.ConnectionClosed():
+							throw new Exception("The TCP connection closed before receiving a message.");
+							
+						case _connection.NoData():
+							// We get one of these for EVERY polled read.
+							// Which is quite noisy.
+							// DebugLine("no data from socket");
+							_connectionCanSend = true;
+							break;
+							
+						case _notifier.Ack():
+							AckNotifier();
+							break;
+							
+						// -XXX- Should add more handlers here, to pay attention to control messages.
+					}
+				}
+			}
+		}
+
+		byte[] in ExHeap ProcessReceivedData([Claims]byte[]! in ExHeap buffer)
+		{
+			// Check to see whether the fragment buffer contains any data.
+			// If it does, then we have already received part of an SMB message, but not all of it.
+			// Assemble the full message before continuing.
+			
+			if (_recvDataLength != 0)
+			{
+				// Already have some data.
+				// Concatenate the existing data and the newly-received data, and attempt to parse.
+				// This is inefficient.
+				
+				int concatLength = buffer.Length + _recvDataLength;
+				
+				DebugLine("concatenating fragment: previous fragment length = 0x{0:x} recv'd data length = 0x{1:x} total length = 0x{2:x}",
+					_recvDataLength, buffer.Length, concatLength);				
+					
+				byte[]! in ExHeap concatBuffer = new[ExHeap] byte[concatLength];
+				// Bitter.Copy(concatBuffer, 0, _recvDataLength, _recvBuffer, 0);
+				Bitter.FromByteArray(concatBuffer, 0, _recvDataLength, _recvBuffer, 0);
+				Bitter.Copy(concatBuffer, _recvDataLength, buffer.Length, buffer, 0);
+				
+				_recvDataLength = 0;				
+				delete buffer;
+				buffer = concatBuffer;
+			}
+			
+			//
+			// Have we received enough data to parse a complete message?
+			//
+			
+			if (buffer.Length >= sizeof(SmbHeader)) {
+				ref SmbHeader header = ref buffer[0];
+				int messageLength = header.TotalMessageLength;
+				
+				int remaining = buffer.Length - messageLength;
+				
+				if (remaining > 0) {
+					
+					DebugLine("Buffer received from TCP contains SMB message (plus " + remaining + " bytes)");
+					
+					byte[]! in ExHeap response = new[ExHeap] byte[messageLength];
+					Bitter.Copy(response, 0, messageLength, buffer, 0);
+					
+					// Store the remaining data in the fragment buffer.
+					AppendReceiveBuffer(buffer, messageLength, remaining);
+					delete buffer;
+
+					ValidateSmbMessage(response);					
+					return response;
+					
+				} else if (remaining == 0) {
+					// Exact fit.
+					// This will probably be common.
+					// DebugLine("Buffer received from TCP contains exactly one SMB message (easy case).");
+					ValidateSmbMessage(buffer);
+					return buffer;
+				} else {
+					// Not enough data for a complete message.
+					// Store it in the fragment buffer.
+					DebugLine("Buffer received from TCP does not contain the entire SMB message (need " + (-remaining) + " bytes).");
+					AppendReceiveBuffer(buffer, 0, buffer.Length);
+					delete buffer;
+					return null;
+				}
+			} else {
+				// Not enough data for a complete message.
+				// Store it in the fragment buffer.
+				DebugLine("Buffer received from TCP does not contain the entire SMB message (header is incomplete).");
+				AppendReceiveBuffer(buffer, 0, buffer.Length);
+				delete buffer;
+				return null;
+			}
+		}
+
+		/*
+		This method copies data from a buffer to the end of the "fragment buffer" in the response context.
+		*/	
+		void AppendReceiveBuffer(
+			byte[]! in ExHeap appendData,
+			int appendOffset,
+			int length)
+			requires length >= 0;
+			requires appendOffset >= 0;
+			requires appendOffset <= appendData.Length;
+		{
+			if (length == 0)
+				return;
+				
+			int finalLength = _recvDataLength + length;
+			if (finalLength > _recvBuffer.Length)
+			{
+				int newLength = finalLength * 3 / 2 + 0x20;
+				DebugLine("Growing receive buffer from " + _recvBuffer.Length + " to " + newLength + " bytes");
+				byte[] newRecvBuffer = new byte[newLength];
+				Buffer.BlockCopy(_recvBuffer, 0, newRecvBuffer, 0, _recvDataLength);
+				// delete _recvBuffer;
+				_recvBuffer = newRecvBuffer;
+			}
+			
+			assert _recvDataLength <= _recvBuffer.Length;
+			assert finalLength <= _recvBuffer.Length;
+			
+			Bitter.ToByteArray(appendData, appendOffset, length, _recvBuffer, _recvDataLength);
+			_recvDataLength = finalLength;
+		}
+		
+		void ValidateSmbMessage(byte[]! in ExHeap buffer)
+		{
+			if (buffer.Length < sizeof(SmbHeader))
+				throw new Exception("The message is too short to be a valid SMB message.");
+				
+			ref SmbHeader header = ref buffer[0];
+			int messageLength = header.TotalMessageLength;
+			
+			if (!header.IsSignatureValid()) {
+                DebugLine("ERROR! Protocol violation: Received an SMB message with an invalid SMB signature.");
+                DebugLine("This usually means the client and server have gotten out of sync on message boundaries.");
+                DebugLine("The connection will be terminated.");
+				throw new Exception("The message does not have a valid SMB signature.");
+			}
+				
+			if (buffer.Length < messageLength)
+				throw new Exception("The message is too short to contain the message whose length is specified in the message header.");			
+		}
+		
+		#if false
+		void NegotiateUsingExtendedSecurity()
+		{
+			//
+			// Build the NTLM challenge and send it encapsulated within a SessionSetupAndTreeConnect request.
+			//
+			byte[]! hello = _supplicant.GetNegotiate();
+			DebugLine("Sending NTLM 'hello' blob:");
+			Util.DumpBuffer(hello);
+			SendSessionSetupAndConnect(transactor, hello);
+
+			//
+			// Next, we wait for the response to the SessionSetupAndTreeConnect.
+			// It should contain the NTLM challenge.
+			//						
+			DebugLine("Waiting for NTLM challenge...");
+			byte[]! security_challenge;
+			WaitSessionSetupResponse(transactor, out security_challenge);
+			DebugLine("Received NTLM challenge:");
+			Util.DumpBuffer(security_challenge);
+			
+			DebugStub.Break();
+			
+			//
+			// Have the security context generate the response and send it in another SessionSetupAndX request.
+			//
+			byte[]! security_response = _supplicant.GetResponse(security_challenge);
+			DebugLine("Sending this NTLM response:");
+			Util.DumpBuffer(security_response);
+			SendSessionSetupAndConnect(transactor, security_response);
+			
+			//
+			// Now wait for the final response.
+			//
+			byte[]! security_message_ignored;
+			WaitSessionSetupResponse(transactor, out security_message_ignored);
+			DebugLine("Final security response received.");
+		}
+		#endif
+		
+		
+		/*
+		
+		This method sends the SMB NEGOTIATE message to the server, and waits for the response.
+		If the message cannot be sent, or the response received indicates an error, then this
+		method will throw an exception.
+		
+		*/
+		void Negotiate()
+		{
+			string![] dialects = { SmbDialect.NTLM012 };
+
+			ByteWriter! data = new ByteWriter();
+			foreach (string dialect in dialects)
+			{
+				data.Write(2);
+				byte[]! dialectbytes = Encoding.ASCII.GetBytes(dialect);
+				data.Write(dialectbytes);
+				data.Write(0);
+			}
+			
+			SmbNegotiateRequest request = new SmbNegotiateRequest();
+			PrepareHeader(ref request.Header, SmbCommand.Negotiate, 0);
+			request.ByteCount = (ushort)data.Length;
+			
+			byte[]! in ExHeap encoded_request = new[ExHeap] byte[sizeof(SmbNegotiateRequest) + data.Length];
+			ref SmbNegotiateRequest ref_request = ref encoded_request[0];
+			ref_request = request;
+			
+			data.CopyTo(encoded_request, sizeof(SmbNegotiateRequest));
+
+			DebugLine("Sending NEGOTIATE request");
+			
+			byte[]! in ExHeap response_encoded = ExecuteSynchronousCommand(encoded_request);
+			
+			try {
+				
+				
+				ref SmbHeader header = ref response_encoded[0];
+				if (header.IsError) {
+				    DebugLine("Received NEGOTIATE RESPONSE - server indicates FAILURE");
+				    DebugLine("Error: " + header.GetErrorText());
+					throw new Exception("SMB server rejected NEGOTIATE: " + header.GetErrorText());
+				}
+				
+				if (TraceSwitches.ShowNegotiation) {
+				    DebugLine("Received NEGOTIATE RESPONSE - successful");
+				}
+
+				if (header.ParameterCount != 17) {
+					DebugLine("NEGOTIATE response contains the wrong number of parameter words!  Cannot use!");
+					throw new Exception("NEGOTIATE response contains the wrong number of parameter words");
+				}
+				
+				ref SmbNegotiateResponse17 response = ref response_encoded[0];
+				//DebugLine("EncryptionKeyLength = " + response.EncryptionKeyLength.ToString());
+				
+				byte[]! response_data = new byte[response.ByteCount];
+				Bitter.ToByteArray(response_encoded, sizeof(SmbNegotiateResponse17), response.ByteCount, response_data, 0);
+				ByteReader! response_data_reader = new ByteReader(response_data);
+				
+				byte[]! key = response_data_reader.ReadBytes(response.EncryptionKeyLength);
+				this._serverLmChallenge = key;
+				
+				string! serverDomainName = ReadStringUnicode(response_data_reader);
+				string! serverHostName = ReadStringUnicode(response_data_reader);				
+				
+				// DebugLine("Server Domain Name = " + serverDomainName);
+				// DebugLine("Server Host Name = " + serverHostName);
+
+				_ReceivedServerDomainNameFromNegotiate = serverDomainName;
+				_ReceivedServerMachineName = serverHostName;
+			
+			} finally {
+				delete response_encoded;
+			}
+		}
+		
+        static string! ReadStringUnicode(ByteReader! reader)
+        {
+            StringBuilder buffer = new StringBuilder();
+
+            for (; ; )
+            {
+                byte low = reader.ReadByte();
+                byte high = reader.ReadByte();
+                if (low == 0 && high == 0)
+                    return buffer.ToString();
+
+                char c = (char)(low + (((ushort)high) << 8));
+                buffer.Append(c);
+            }
+        }
+
+		
+
+		// This field contains the LanMan (LM) challenge, received from the server.
+		// We use this value to compute the challenge response, which is what the client
+		// uses to prove knowledge of the user's password without revealing the password
+		// in the clear.		
+		byte[] _serverLmChallenge;
+    
+    #if false
+		void SendSessionSetupAndConnect(SmbTransactor.Imp! transactor, byte[]! security_blob)
+			requires security_blob.Length <= ushort.MaxValue;
+		{
+			// build header
+			// don't bother with setting tuple in header, mux will set that for us
+			SmbSessionSetupAndXRequest13 request = new SmbSessionSetupAndXRequest13();
+			request.Header.Command = (byte)SmbCommand.SessionSetupAndX;
+			request.Header.Flags1 = (byte)_flags1;
+			request.Header.Flags2 = (ushort)_flags2;
+			
+			// build parameters block
+			request.Header.ParameterCount = 13;
+			request.AndXCommand = 0xff;
+			request.AndXPadding = 0;
+			request.AndXOffset = 0;
+			request.MaxBufferSize = 2048;
+			request.MaxMpxCount = 10;
+			request.VcNumber = 1;
+			request.SessionKey = 0;
+			request.CaseInsensitivePasswordLength = (ushort)lm_response.Length;
+			request.CaseSensitivePasswordLength = (ushort)nt_response.Length;
+			request.Reserved = 0;
+
+			SmbCapability capabilities =
+				SmbCapability.Unicode
+				| SmbCapability.LargeFiles
+				| SmbCapability.NtSmbs
+				| SmbCapability.NtFind
+				| SmbCapability.NtStatus
+				| SmbCapability.Level2Oplocks;
+            request.Capabilities = (uint)capabilities;
+			
+			// build message data
+			ByteWriter data = new ByteWriter();
+			data.Write(security_blob);
+            WriteSmbUnicodeString(data, SmbClientParameters.Username, true);
+            WriteSmbUnicodeString(data, SmbClientParameters.DomainName, true);
+			WriteSmbUnicodeString(data, OSName);
+			WriteSmbUnicodeString(data, LanManName);
+			int data_length = data.Length;
+			
+			request.ByteCount = (ushort)data.Length;
+			
+			int total_length = sizeof(SmbSessionSetupAndXRequest13)
+				+ data_length; // security_blob.Length;
+
+			byte[]! in ExHeap msg = new[ExHeap] byte[total_length];
+
+			try {
+				ref SmbSessionSetupAndXRequest13 request_ref = ref msg[0];
+				// store values into the ex buffer			
+				request_ref = request;
+
+				data.CopyTo(msg, sizeof(SmbSessionSetupAndXRequest13));
+				
+				DebugLine("Sending SessionSetupAndX message:");
+			} catch {
+				delete msg;
+				throw;
+			}
+			
+			transactor.SendRequest(msg, msg.Length);
+		}
+		#endif
+		
+		byte[]! GetResponse(NtlmSupplicantContract.Imp! ntlm_supplicant, NtlmResponseType type, byte[]! challenge)
+		{
+			byte[]! in ExHeap exchallenge = Bitter.FromByteArray(challenge);
+			ntlm_supplicant.SendGetResponse(exchallenge, type);
+			
+			switch receive {
+				case ntlm_supplicant.Response(exresponse):
+					byte[]! response = Bitter.ToByteArray(exresponse);
+					delete exresponse;
+					return response;
+					
+				case ntlm_supplicant.RequestFailed(error):
+					throw new CredentialsManagerException("NTLM supplicant failed to return response.", error);
+			}
+		}
+
+		// This method contacts the Credentials Manager service.
+		// Therefore, it CAN block indefinitely, depending on behavior outside of this process.
+		// Should review this.		
+		void GetChallengeResponses(
+			out string! username,
+			out string! domain,
+			out byte[]! nt_response,
+			out byte[]! lm_response)
+		{
+			// We have already received the NTLM challenge (a simple 8-byte nonce) from the SMB
+			// server in the response to the NEGOTIATE message.
+			
+			byte[] challenge = _serverLmChallenge;
+			if (challenge == null)
+				throw new Exception("The server LM challenge is null.  Failed to sample challenge from negotiation response.");
+				
+			NtlmSupplicantContract.Imp! ntlm_supplicant;
+			NtlmSupplicantContract.Exp! ntlm_supplicant_exp;
+			NtlmSupplicantContract.NewChannel(out ntlm_supplicant, out ntlm_supplicant_exp);
+			
+			string! credentialsName;
+			string! tag;
+			
+			try {
+				try {
+				
+					string creds = Program.CredentialsName;
+					if (creds == null || creds.Length == 0) {
+						// The user did not provide any explicit credentials to use for this SMB client.
+						// All the Credentials Manager to select the credentials to use.
+						
+						if (TraceSwitches.ShowAuthenticationMessages) {
+						    DebugLine("No explicitly-selected credentials provided.  Using Credentials Manager to select credentials...");				
+						    DebugLine("Creating NTLM supplicant...");
+						}
+						
+						//
+						// -XXX- NOTE! We received two values from the server in the response to the NEGOTIATE message.
+						// -XXX- We should be careful with those values; since they came from the network, they could
+						// -XXX- contain any garbage, potentially evil.  We pass these to the CM service.  So either
+						// -XXX- the SMB client process and/or the CM service should perform some extreme skepticism
+						// -XXX- on these values.
+						//
+						
+						CredentialsManager.CreateSupplicantForProtocol(
+							"smb",
+							(!)_ReceivedServerMachineName,					// _ServerHostName,
+							AuthenticationProtocolNames.Ntlm,
+							(!)_ReceivedServerDomainNameFromNegotiate,
+							ntlm_supplicant_exp,
+							out credentialsName,
+							out tag);
+							
+						if (TraceSwitches.ShowAuthenticationMessages)
+						    DebugLine("Created NTLM supplicant, selected credentials: " + credentialsName);
+				
+					} else {
+						// The user provided explicit credentials for this SMB client.
+						// Use the Credentials Manager to create a supplicant, but don't use it
+						// to select the credentials to use.
+						
+						if (TraceSwitches.ShowAuthenticationMessages)
+						    DebugLine("Explicit credentials: " + Program.CredentialsName);
+						    
+						credentialsName = Program.CredentialsName;
+						tag = Program.CredentialsTag;
+						
+						CredentialsManager.CreateSupplicant(
+							AuthenticationProtocolNames.Ntlm,
+							credentialsName,
+							tag,
+							ntlm_supplicant_exp);
+							
+					    if (TraceSwitches.ShowAuthenticationMessages)
+					        DebugLine("Supplicant successfully created.");
+					}
+					
+					ntlm_supplicant.RecvSuccess();
+					
+					_SelectedCredentialsName = credentialsName;
+						
+				} catch (Exception ex) {
+					throw new Exception("Negotiation failed, because an authentication supplicant could not be created.", ex);
+				}
+				
+				int separator = credentialsName.IndexOf('\\');
+				if (separator != -1) {
+					username = credentialsName.Substring(separator + 1);
+					domain = credentialsName.Substring(0, separator);
+				} else {
+					username = credentialsName;
+					domain = ".";
+				}
+
+				lm_response = GetResponse(ntlm_supplicant, NtlmResponseType.LanMan, challenge);
+				nt_response = GetResponse(ntlm_supplicant, NtlmResponseType.WindowsNt, challenge);
+				
+			} finally {
+				delete ntlm_supplicant;
+			}
+		}
+		
+		void SessionSetupAndConnectBasic()
+		{
+			// DebugLine("Using basic NTLM negotiation (not NTLMSSP)");
+			
+			byte[]! lm_response;
+			byte[]! nt_response;
+			string! username;
+			string! domain;
+			GetChallengeResponses(
+				out username,
+				out domain,
+				out nt_response,
+				out lm_response);
+			
+			// build header
+			// don't bother with setting tuple in header, mux will set that for us
+			SmbSessionSetupAndXRequest13 request = new SmbSessionSetupAndXRequest13();
+			PrepareHeader(ref request.Header, SmbCommand.SessionSetupAndX, 13);
+			
+			// build parameters block
+			request.AndXCommand = 0xff;
+			request.AndXPadding = 0;
+			request.AndXOffset = 0;
+			request.MaxBufferSize = 2048;
+			request.MaxMpxCount = 10;
+			request.VcNumber = 1;
+			request.SessionKey = 0;
+			request.CaseInsensitivePasswordLength = (ushort)lm_response.Length;
+			request.CaseSensitivePasswordLength = (ushort)nt_response.Length;
+			request.Reserved = 0;
+
+			SmbCapability capabilities =
+				SmbCapability.Unicode
+				| SmbCapability.LargeFiles
+				| SmbCapability.NtSmbs
+				| SmbCapability.NtFind
+				| SmbCapability.NtStatus
+				| SmbCapability.Level2Oplocks;
+            request.Capabilities = (uint)capabilities;
+			
+			// build message data
+			ByteWriter data = new ByteWriter();
+			// data.Write(security_blob);
+			data.Write(lm_response);
+			data.Write(nt_response);
+			data.Write((byte)0);			// alignment padding
+            WriteSmbStringUnicode(data, username, true);
+            WriteSmbStringUnicode(data, domain, true);
+			WriteSmbStringUnicode(data, OSName, true);
+			WriteSmbStringUnicode(data, LanManName, true);
+			int data_length = data.Length;
+			
+			//DebugLine("data block:");
+			//Util.DumpBuffer(data.ToArray());
+			
+			request.ByteCount = (ushort)data.Length;
+			
+			int total_length = sizeof(SmbSessionSetupAndXRequest13)
+				+ data_length; // security_blob.Length;
+				
+			request.Header.TotalMessageLength = total_length;
+
+			byte[]! in ExHeap request_encoded = new[ExHeap] byte[total_length];
+
+			try {
+				ref SmbSessionSetupAndXRequest13 request_ref = ref request_encoded[0];
+				// store values into the ex buffer			
+				request_ref = request;
+
+				data.CopyTo(request_encoded, sizeof(SmbSessionSetupAndXRequest13));				
+			} catch {
+				delete request_encoded;
+				throw;
+			}
+
+			if (TraceSwitches.ShowNegotiationVerbose)
+			    DebugLine("Sending SESSION SETUP");
+			
+			byte[]! in ExHeap response_encoded = ExecuteSynchronousCommand(request_encoded);
+			try {
+			
+				ref SmbHeader responseHeader = ref response_encoded[0];
+				if (responseHeader.IsError) {
+					// The usual reason is that authentication failed (bogus credentials).
+					// DebugStub.Break();
+					DebugLine("Received SESSION SETUP response message, and server indicates FAILURE.");
+					DebugLine("Error: " + responseHeader.GetErrorText());
+					throw new Exception("The SessionSetupAndTreeConnect message failed.  The server rejected the request with an error: " + responseHeader.GetErrorText());
+				}
+				
+				if (TraceSwitches.ShowNegotiation)
+				    DebugLine("Received SESSION SETUP response (successful)");
+				
+				// ref SmbSessionSetupResponse response = ref response_encoded[0];
+				ExByteReader reader = new ExByteReader(0, response_encoded.Length);
+				reader.Skip(sizeof(SmbSessionSetupAndXResponse) + 1); // +1 for alignment
+				string! nativeOs = reader.ReadStringUnicode(response_encoded);
+				string! nativeLanMan = reader.ReadStringUnicode(response_encoded);
+				string! primaryDomain = reader.ReadStringUnicode(response_encoded);
+			
+				_ReceivedServerOperatingSystem = nativeOs;
+				_ReceivedServerPrimaryDomainName = primaryDomain;
+
+				// The response contains a DIFFERENT user ID (in the mux tuple) than the request.
+				// This is how we learn the user ID, so that we can send it in future requests.
+				_userId = responseHeader.UserId;
+
+				if (TraceSwitches.ShowNegotiationVerbose) {
+					DebugLine("    Native OS:         " + nativeOs);
+					DebugLine("    Native Lan Man:    " + nativeLanMan);
+					DebugLine("    Primary Domain:    " + primaryDomain);
+					DebugLine("    UserID = 0x{0:x4}", responseHeader.UserId);
+				}
+				
+			} finally {
+				delete response_encoded;
+			}
+		}
+		
+        static void WriteSmbStringUnicode(ByteWriter! writer, string! text, bool terminate)
+		{
+			// writer.Write((byte)SmbEncodingFormat.String);
+			// writer.Write((byte)0);
+			
+			for (int i = 0; i < text.Length; i++) {
+				char c = text[i];
+				writer.Write((byte)(c & 0xff));
+				writer.Write((byte)(c >> 8));
+			}
+
+            if (terminate)
+            {
+                writer.Write((byte)0);
+                writer.Write((byte)0);
+            }
+		}
+
+        static void WriteSmbStringAscii(ByteWriter! writer, string! text, bool terminate)
+        {
+            // writer.Write((byte)SmbEncodingFormat.String);
+
+            for (int i = 0; i < text.Length; i++)
+            {
+                char c = text[i];
+                writer.Write((byte)(c & 0xff));
+            }
+
+            if (terminate)
+            {
+                writer.Write((byte)0);
+            }
+        }
+        
+        byte[]! in ExHeap ExecuteSynchronousCommand([Claims]byte[]! in ExHeap request)
+        {
+			SendSmbMessage(request);
+        
+			return WaitResponse();
+        }
+        
+        void SendSmbMessage([Claims]byte[]! in ExHeap request)
+			// requires _connection != null;
+        {
+			if (request.Length < sizeof(SmbHeader))
+				throw new Exception("Message is too short to be a valid SMB message.");
+				
+			ref SmbHeader header = ref request[0];
+			header.SetSignature();
+			header.TotalMessageLength = request.Length;
+			
+			SendDataSynchronous(request);
+        }
+        
+        void SendDataSynchronous([Claims]byte[]! in ExHeap data)
+			// requires _connection != null;
+        {
+			expose(this)
+			{
+				assert _connection != null;
+				_connection.SendWrite(data);
+				switch receive
+				{
+					case _connection.OK():
+						break;
+						
+					case _connection.ChannelClosed():
+						throw new Exception("TCP channel closed");
+					
+					case _connection.ConnectionClosed():
+						throw new Exception("TCP connection closed");
+				}
+			}
+        }
+        
+		enum SmbEncodingFormat
+		{
+			DataBlock = 1,
+			Dialect = 2,				// null terminated string, always 8-bit encoding, never unicode
+			Pathname = 3,				// null terminated string
+			String = 4,					// null terminated string
+		}
+
+		void ITracked.Release() {}
+		void ITracked.Acquire() {}
+		void ITracked.Expose() {}
+		void ITracked.UnExpose() {}
+		
+		public void Dispose()
+		{
+			_readyTransactors.Dispose();
+			delete _namespace_provider;
+			delete _connection;
+			delete _notifier;
+			_control_clients.Dispose();
+			delete _controller;
+		}    
+    }
+    
+}
diff --git a/base/Services/Smb/Client/TypesafeCollectionWrappers.sg b/base/Services/Smb/Client/TypesafeCollectionWrappers.sg
new file mode 100644
index 0000000..50fdf6f
--- /dev/null
+++ b/base/Services/Smb/Client/TypesafeCollectionWrappers.sg
@@ -0,0 +1,94 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+/*
+
+This file contains typesafe collection wrappers.  These are wrappers around the CLR 1.x (non-generic) collection
+classes.  When the backend MSIL compiler supports templates, these collections will go away.
+
+*/
+
+using System;
+using System.Collections;
+
+namespace Smb.Client
+{
+
+	class DictionaryBase
+	{
+		protected readonly Hashtable! _table = new Hashtable();
+		
+		public void Clear()
+		{
+			_table.Clear();
+		}
+		
+		public ICollection Values
+		{
+			get { return _table.Values; }
+		}
+		
+		public ICollection Keys
+		{
+			get { return _table.Keys; }
+		}
+	}
+	
+	class ListBase : IEnumerable
+	{
+		protected readonly ArrayList! _list = new ArrayList();
+		
+		public int Count
+		{
+			get { return _list.Count; }
+		}
+		
+		public IEnumerator GetEnumerator()
+		{
+			return _list.GetEnumerator();
+		}
+		
+		public void RemoveAt(int index)
+		{
+			_list.RemoveAt(index);
+		}
+		
+		/*
+		public T this[int index]
+		{
+			get { return (T)_list[index]; }
+			set { _list[index] = value; }
+		}
+		*/
+	}
+	
+	#if false
+	class List_DirectoryClient : ListBase
+	{
+		public DirectoryClient this[int index]
+		{
+			get { return (DirectoryClient)_list[index]; }
+			set { _list[index] = value; }
+		}
+		
+		public void Add(DirectoryClient value)
+		{
+			_list.Add(value);
+		}
+		
+		public void Remove(DirectoryClient value)
+		{
+			_list.Remove(value);
+		}
+		
+	}
+	#endif
+}
diff --git a/base/Services/Smb/ClientService/ClientProcess.sg b/base/Services/Smb/ClientService/ClientProcess.sg
new file mode 100644
index 0000000..ba71af4
--- /dev/null
+++ b/base/Services/Smb/ClientService/ClientProcess.sg
@@ -0,0 +1,72 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Smb.PublicChannels;
+
+namespace Smb.ClientManager
+{
+    enum ClientState
+    {
+		// We have started the process.  The manager endpoint that requested that the
+		// client be started is held at the ClientProcess.StartingManagerEndpoint tref.
+		Starting,
+					
+		Running,
+		
+		Stopping,
+    }
+    
+    // This class represents an instance of the SMB client process (smbclient.exe)
+    // that is managed by this process.  All instances of smbclient.exe are started
+    // by this process (smbclientmgr.exe).
+    class ClientProcess
+    {
+		public ClientProcess(
+			string! mountPath,
+			SmbClientConfig config,
+			Process! process)
+		{
+			this.Process = process;
+			this.MountPath = mountPath;
+			this.UncPath = Bitter.ToString2(config.UncPath);
+			this.CredentialsName = Bitter.ToString2(config.CredentialsName);
+			this.Tag = Bitter.ToString2(config.Tag);
+			
+			DebugPrefix = "SMBMGR[" + mountPath + "]: ";
+		}
+		
+		public readonly string! DebugPrefix;
+
+		public readonly Process! Process;
+		
+		// config fields
+		public string! MountPath;
+		public string! UncPath;
+		public string! CredentialsName;
+		public string! Tag;
+
+		// status fields
+		public SmbClientConnectionStatus ConnectionStatus;
+		public SmbReasonDisconnected ReasonDisconnected;
+		public string ServerOperatingSystem;
+		public string ServerDomainName;
+		public string ServerMachineName;
+		public string ActiveCredentialsName;
+		
+		// This field is assigned (was null) when we receive NakConfigure or AckConfigure.
+		public TRef<SmbClientControllerContract.Imp:Running> Controller;
+		
+		public ClientState State;
+		
+		// This field is non-null and holds a valid reference while this process is in the Starting state.
+		// In all other states, this field is null.
+		public TRef<SmbClientManagerContract.Exp:CreatingClient> StartingManagerEndpoint;
+    }
+}
diff --git a/base/Services/Smb/ClientService/SmbClientManager.sg b/base/Services/Smb/ClientService/SmbClientManager.sg
new file mode 100644
index 0000000..0123fef
--- /dev/null
+++ b/base/Services/Smb/ClientService/SmbClientManager.sg
@@ -0,0 +1,595 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/ClientManager/SmbClientManager.sg
+//
+//  Note:
+//
+//		This file contains most of the implementation of the SMB Client Manager Service.
+//		This service is a system-wide singleton process, started during system boot by
+//		the Service Manager Service (SMS).  (In the future, it may make sense for one
+//		instance of this service to exist per session.  However, that's for future study.)
+//
+//		This service registers a single control channel, at /dev/smb-client-manager.
+//		Clients, such as the command-line tool net.exe (Services/Smb/Control) open 
+//		this channel and use it to send control requests and queries to this service.
+//		These requests allow the user to mount remote SMB filesystems at local namespaces
+//		(creates a mapping), unmount them, enumerate them, and query their status.
+//
+//		This service is entirely single-threaded.  Some requests received from the control
+//		channel are processed immediately (synchronously); the results are sent back to
+//		the originator of the request without performing any blocking I/O or waiting for
+//		any long period of time.  A few other requests are asynchronous; when the service
+//		receives such a control request, it allocates memory in the local (non-exchange)
+//		heap to track the status of the request, and future channel messages advance the
+//		state of the request.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Io;
+using Microsoft.SingSharp;
+using Smb.PublicChannels;
+using Smb.PrivateChannels;
+
+[assembly: Microsoft.Singularity.Security.ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: Microsoft.Singularity.Security.AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Smb.ClientManager
+{
+    class Manager
+    {
+		public static int Main(string[] args)
+		{
+			//
+			// Register the control endpoint for this service.
+			//
+			
+			ServiceProviderContract.Imp! provider_imp;
+			ServiceProviderContract.Exp! controlprovider;
+			ServiceProviderContract.NewChannel(out provider_imp, out controlprovider);
+
+			DirectoryServiceContract.Imp! rootds = DirectoryService.NewClientEndpoint();
+			rootds.SendRegister(Bitter.FromString2(SmbClientManagerContract.ManagerControlPath), provider_imp);
+			
+			switch receive
+			{
+				case rootds.AckRegister():
+					delete rootds;
+					break;
+					
+				case rootds.NakRegister(ServiceProviderContract.Imp:Start imp, ErrorCode error):
+					DebugLine("The service failed to register its control channel.");
+					DebugLine("    Control channel path: " + SmbClientManagerContract.ManagerControlPath);
+					DebugLine("    Error code: " + error.ToString());
+					DebugLine("Service will now terminate.");
+					delete rootds;
+					delete imp;
+					delete controlprovider;
+					return -1;
+			}
+			
+			ESet<SmbClientManagerContract.Exp:Ready>! managers = new ESet<SmbClientManagerContract.Exp:Ready>();
+			
+			EMap<SmbClientControllerContract.Imp:Configuring, ClientProcess!>! clientsConfiguring =
+				new EMap<SmbClientControllerContract.Imp:Configuring, ClientProcess!>();
+				
+			EMap<SmbMuxNotifier.Exp:Ready, ClientProcess!>! notifiers =
+				new EMap<SmbMuxNotifier.Exp:Ready, ClientProcess!>();
+			
+			DebugLine("SMB service is ready, listening on control channel: " + SmbClientManagerContract.ManagerControlPath);
+			
+			for (;;)
+			{
+				switch receive
+				{
+					case controlprovider.Connect(ServiceContract.Exp:Start! exp):
+						SmbClientManagerContract.Exp manager = exp as SmbClientManagerContract.Exp;
+						if (manager != null) {
+							manager.SendSuccess();
+							managers.Add(manager);
+							controlprovider.SendAckConnect();
+						} else {
+							controlprovider.SendNackConnect(exp);
+						}
+						break;
+						
+					case manager.CreateClient(SmbClientConfig exconfig) in managers:
+						// This is a request to create a new SMB client process and start it.
+						string! mountPath = Bitter.ToString2(exconfig.MountPath);
+						if (TraceSwitches.ShowManagerMessages) {
+						    DebugLine("CreateClient: mountpath = '{0}'", mountPath);
+						    DebugLine("    UncPath: " + Bitter.ToString2(exconfig.UncPath));
+						}
+						
+						// DebugStub.Break();
+						
+						// Check to see if we already have a client using the same mount point.
+						// It's much better to detect this now, rather than to spin up a client
+						// process and have it discover the error.
+						ClientProcess client = FindClientByMountPath(mountPath);
+						if (client != null) {
+							exconfig.Dispose();
+							manager.SendRequestFailed(SmbErrorCode.MountPathAlreadyExists, null);
+							managers.Add(manager);
+							break;
+						}
+						
+						SmbClientControllerContract.Imp! controller;
+						SmbClientControllerContract.Exp! controller_exp;
+						SmbClientControllerContract.NewChannel(out controller, out controller_exp);
+						
+						SmbMuxNotifier.Imp! notifier_imp;
+						SmbMuxNotifier.Exp! notifier_exp;
+						SmbMuxNotifier.NewChannel(out notifier_imp, out notifier_exp);
+
+						Process process;
+						try {							
+							string[] process_args = { "smbclient" };
+							process = new Process(process_args);
+						} catch (Exception ex) {
+							DebugLine("FAILED to create smbclient process: " + ex.Message);
+							delete controller;
+							delete controller_exp;
+							delete notifier_imp;
+							delete notifier_exp;
+							manager.SendRequestFailed(SmbErrorCode.InternalError, Bitter.FromString2("Failed to create process: " + ex.Message));
+							managers.Add(manager);
+							break;
+						}
+						
+						process.SetStartupEndpoint(0, controller_exp);
+						process.SetStartupEndpoint(1, notifier_imp);
+						
+						if (TraceSwitches.ShowProcessActivity)
+						    DebugLine("Starting client process...");
+						    
+						process.Start();
+						
+						if (TraceSwitches.ShowProcessActivity)
+						    DebugLine("Process started.  Sending startup parameters...");
+						
+						client = new ClientProcess(mountPath, exconfig, process);
+						client.State = ClientState.Starting;
+						client.StartingManagerEndpoint = new TRef<SmbClientManagerContract.Exp:CreatingClient>(manager);
+						
+						client.UncPath = Bitter.ToString2(exconfig.UncPath);
+						client.CredentialsName = Bitter.ToString2(exconfig.CredentialsName);
+						client.Tag = Bitter.ToString2(exconfig.Tag);
+						
+						client.ConnectionStatus = SmbClientConnectionStatus.Disconnected;
+						client.ReasonDisconnected = SmbReasonDisconnected.Idle;
+						client.ServerOperatingSystem = null;
+						client.ServerDomainName = null;
+						client.ServerMachineName = null;
+
+						controller.SendConfigure(exconfig);
+						
+						// Further progress will be made when we receive AckConnect or NakConnect from the
+						// client process (or a ChannelClosed).
+						
+						notifiers.Add(notifier_exp, client);
+
+						clientsConfiguring.Add(controller, client);
+						_clients[mountPath] = client;
+						break;
+						
+					case manager.QueryClientConfig(char[]! in ExHeap exclientId) in managers:
+					{
+						string! clientId = Bitter.ToString2(exclientId);
+						delete exclientId;
+						if (TraceSwitches.ShowManagerMessages)
+						    DebugLine("Received QueryClientConfig - id = " + clientId);
+						
+						ClientProcess client = FindClientByMountPath(clientId);
+						if (client != null) {
+							SmbClientConfig config = new SmbClientConfig();							
+							config.MountPath = Bitter.FromString2(client.MountPath);
+							config.UncPath = Bitter.FromString2(client.UncPath);
+							config.CredentialsName = Bitter.FromString2(client.CredentialsName);
+							config.Tag = Bitter.FromString2(client.Tag);							
+							
+							if (TraceSwitches.ShowManagerMessages)
+							    DebugLine("    Sending config report.");
+							    
+							manager.SendClientConfigReport(config);						
+						} else {
+							if (TraceSwitches.ShowManagerMessages)
+							    DebugLine("    No such client.");
+							    
+							manager.SendRequestFailed(SmbErrorCode.MountPathNotFound, null);
+						}
+						
+						managers.Add(manager);
+						break;
+					}
+					
+					case manager.QueryClientStatus(char[]! in ExHeap exclientId) in managers:
+					{
+						string! clientId = Bitter.ToString2(exclientId);
+						delete exclientId;
+						
+						if (TraceSwitches.ShowManagerMessages)
+						    DebugLine("Received QueryClientStatus - id = " + clientId);
+						
+						ClientProcess client = FindClientByMountPath(clientId);
+						if (client != null) {
+							SmbClientStatus status = new SmbClientStatus();
+							
+							status.ConnectionStatus = client.ConnectionStatus;
+							status.ReasonDisconnected = client.ReasonDisconnected;
+							status.ServerOperatingSystem = Bitter.FromString(client.ServerOperatingSystem);
+							status.ServerDomainName = Bitter.FromString(client.ServerDomainName);
+							status.ServerMachineName = Bitter.FromString(client.ServerMachineName);
+							status.ActiveCredentialsName = Bitter.FromString(client.ActiveCredentialsName);
+							
+							if (TraceSwitches.ShowManagerMessages)
+							    DebugLine("    Sending status report.");
+							    
+							manager.SendClientStatusReport(status);
+						} else {
+							if (TraceSwitches.ShowManagerMessages)
+							    DebugLine("    No such client.");
+							
+							manager.SendRequestFailed(SmbErrorCode.MountPathNotFound, null);
+						}
+						managers.Add(manager);
+						break;
+					}
+						
+					case controller.Ok() in clientsConfiguring ~> client:
+						if (TraceSwitches.ShowManagerMessages)
+						    DebugLine(client, "Received AckConfigure from client process");
+						    
+						assert client.StartingManagerEndpoint != null;
+						
+						SmbClientManagerContract.Exp! manager = client.StartingManagerEndpoint.Acquire();
+						
+						client.StartingManagerEndpoint = null;
+						client.State = ClientState.Running;
+						client.Controller = new TRef<SmbClientControllerContract.Imp:Running>(controller);
+						
+						if (TraceSwitches.ShowManagerMessages)
+						    DebugLine("Sending Ok (for CreateClient) to manager.");
+						    
+						manager.SendOk();
+						managers.Add(manager);
+						break;
+						
+					case controller.RequestFailed(error, errortext) in clientsConfiguring ~> client:
+						// One of the client processes that we started has indicated that it
+						// did not start successfully.  Tear down the client process and send an
+						// error message to the manager that requested that the process to be created.
+						
+						if (TraceSwitches.ShowManagerMessages || true)
+						    DebugLine(client, "Received NakConfigure from client process: {0} {1}",
+    							error.ToString(),
+	    						Bitter.ToString(errortext));
+							
+						delete controller;
+						
+						assert client.StartingManagerEndpoint != null;
+						SmbClientManagerContract.Exp! manager = client.StartingManagerEndpoint.Acquire();
+						client.StartingManagerEndpoint = null;
+						client.State = ClientState.Running;
+						
+						client.Process.Stop();
+						client.Process.Join();
+						client.Process.Dispose(false);
+						
+						manager.SendRequestFailed(error, errortext);
+						managers.Add(manager);
+						break;
+						
+					case controller.ChannelClosed() in clientsConfiguring ~> client:
+						// A client process terminated before responding to the NakConnect message.
+						// Treat this like NakConnect without an error code.
+						if (TraceSwitches.ShowManagerMessages || true)
+						    DebugLine(client, "Client process has closed its controller channel.");
+							
+						assert client.StartingManagerEndpoint != null;
+						SmbClientManagerContract.Exp! manager = client.StartingManagerEndpoint.Acquire();
+						client.StartingManagerEndpoint = null;
+						client.State = ClientState.Running;
+						
+						client.Process.Stop();
+						client.Process.Join();
+						client.Process.Dispose(false);
+						
+						manager.SendRequestFailed(SmbErrorCode.InternalError,
+							Bitter.FromString2("The SMB client process failed to initialize."));
+						managers.Add(manager);						
+						delete controller;
+						break;
+
+					case manager.StopClient(char[]! in ExHeap exmountPath) in managers:
+						string! mountPath = Util.ToStringDelete(exmountPath);
+						
+						if (TraceSwitches.ShowManagerMessages)
+						    DebugLine("StopClient - mount path = " + mountPath);
+						
+						ClientProcess client = FindClientByMountPath(mountPath);
+						if (client != null)
+						{
+							switch (client.State)
+							{
+							case ClientState.Starting:
+								// This is extremely rude, of course.
+								DebugLine("    Client is Starting - will simply terminate the process.");
+								break;
+								
+							case ClientState.Running:
+                                assert client.Controller != null;
+								SmbClientControllerContract.Imp! controller = client.Controller.Acquire();
+								
+								controller.SendStop();
+								
+								// -XXX- This is synchronous for now!
+								DebugLine("Waiting to SMB client to respond to Stop request");
+								switch receive {
+									case controller.Ok():
+										break;
+										
+									case controller.ChannelClosed():
+										break;
+								}
+								
+								client.Controller.Release(controller);
+								break;
+								
+							default:
+								DebugLine("ILLEGAL STATE FOR CLIENT PROCESS!");
+								break;								
+							}
+
+							TerminateClient(client, true);
+						
+							manager.SendOk();
+						} else {
+							if (TraceSwitches.ShowManagerMessages)
+							    DebugLine("Cannot delete client -- there is no client with mount path = '{0}'", mountPath);
+							    
+							manager.SendRequestFailed(SmbErrorCode.MountPathNotFound, null);
+						}
+						
+						managers.Add(manager);
+						break;
+						
+					case controlprovider.ChannelClosed():
+						DebugLine("Control provider channel has closed.");
+						goto terminate;
+						
+					case manager.EnumClients() in managers:
+					{
+						int count = _clients.Values.Count;
+						char[][]! in ExHeap mountPaths = new[ExHeap] char[][count];
+						int i = 0;
+						foreach (ClientProcess! client in _clients.Values)
+						{
+							if (i >= count)
+								break;
+							char[]! in ExHeap exmount = Bitter.FromString2(client.MountPath);
+							expose (mountPaths[i]) {
+								delete mountPaths[i];
+								mountPaths[i] = exmount;
+							}
+							i++;
+						}
+						manager.SendClientList(mountPaths);
+						managers.Add(manager);
+						break;					
+					}
+						
+					case manager.BindClient(char[]! in ExHeap exmountPath, ServiceContract.Exp:Start! exp) in managers:
+					{
+						string! mountPath = Util.ToStringDelete(exmountPath);
+						if (TraceSwitches.ShowManagerMessages)
+						    DebugLine("BindClient - mount path = " + mountPath);
+						
+						ClientProcess client = FindClientByMountPath(mountPath);
+						if (client != null)
+						{
+							switch (client.State)
+							{
+								case ClientState.Running:
+                                    assert client.Controller != null;
+									SmbClientControllerContract.Imp! controller = client.Controller.Acquire();
+									try {
+										controller.SendBind(exp);
+									
+										// -XXX- Yes, I know this prevents SmbClientManager from receiving
+										// -XXX- any other messages.  Need to deal with that.
+										switch receive {
+											case controller.Ok():
+												if (TraceSwitches.ShowManagerMessages)
+												    DebugLine("Bind successful");
+												manager.SendOk();
+												break;
+												
+											case controller.RequestFailed(error, optionalErrorText):
+												if (TraceSwitches.ShowManagerMessages)
+												    DebugLine("SmbClient process rejected bind request");
+												manager.SendRequestFailed(error, optionalErrorText);
+												break;
+												
+											case controller.ChannelClosed():
+												if (TraceSwitches.ShowManagerMessages)
+												    DebugLine("SmbClient channel closed!");
+												manager.SendRequestFailed(SmbErrorCode.InternalError, null);
+												break;
+										}
+									
+									} finally {
+										client.Controller.Release(controller);
+									}
+									break;
+								
+								default:
+									if (TraceSwitches.ShowManagerMessages)
+									    DebugLine("Client is not in a state that allows binding");
+									manager.SendRequestFailed(SmbErrorCode.InvalidState, null);
+									delete exp;
+									break;
+							}
+						}
+						else
+						{
+							delete exp;
+							manager.SendRequestFailed(SmbErrorCode.MountPathNotFound, null);
+						}
+						
+						managers.Add(manager);												
+						break;
+					}
+
+					case notifier.StatusChanged(SmbClientStatus status) in notifiers ~> client:
+						notifier.SendAck();
+						
+						if (TraceSwitches.ShowStatusChanges)
+						    DebugLine(client, "Received StatusChanged from client");						
+						    
+						client.ConnectionStatus = status.ConnectionStatus;
+						client.ReasonDisconnected = status.ReasonDisconnected;
+						client.ServerOperatingSystem = Bitter.ToString(status.ServerOperatingSystem);
+						client.ServerMachineName = Bitter.ToString(status.ServerMachineName);
+						client.ServerDomainName = Bitter.ToString(status.ServerDomainName);
+						client.ActiveCredentialsName = Bitter.ToString(status.ActiveCredentialsName);
+						status.Dispose();
+						
+						notifiers.Add(notifier, client);
+						break;
+					
+				} // switch receive
+			}
+			
+		terminate:
+			managers.Dispose();
+			delete controlprovider;
+			notifiers.Dispose();
+			
+			clientsConfiguring.Dispose();
+			
+			foreach (ClientProcess! client in _clients.Values)
+			{
+				TerminateClient(client, false);
+			}
+			_clients.Clear();
+			
+			return 0;
+		}
+		
+		/// <summary>
+		/// <para>
+		/// Contains the set of all ClientProcess instances that are managed by this service.
+		/// Aside from brief thread-local references to ClientProcess instances, this table 
+		/// contains the only reference to those instances.
+		/// </para>
+		///
+		/// <para>
+		/// Each key is a string, and is the value of the MountPath field of the client
+		/// process; the keys are case sensitive.  Each value is the corresponding 
+		/// ClientProcess instance.
+		/// </para>
+        /// </summary>
+		static readonly Hashtable/*<String!,ClientProcess!>*/! _clients = new Hashtable();
+		
+		static ClientProcess FindClientByMountPath(string! mountPath)
+		{
+			ClientProcess client = (ClientProcess)_clients[mountPath];
+			return client;
+		}
+
+		static void TerminateClient(ClientProcess! client, bool remove)
+		{
+			DebugLine("Terminating child process, pid=" + client.Process.Id);
+			
+			client.Process.Stop();
+			client.Process.Join();
+			client.Process.Dispose(false);
+
+			switch (client.State)
+			{
+				case ClientState.Starting:
+					assert client.Controller == null;
+					break;
+					
+				case ClientState.Running:
+				case ClientState.Stopping:
+                    assert client.Controller != null;
+					SmbClientControllerContract.Imp! controller = client.Controller.Acquire();
+					delete controller;
+					break;
+					
+				default:
+					DebugLine("INVALID STATE for client process!  state=" + client.State.ToString());
+					break;					
+			}
+
+			// This is conditional, because we don't want to modify the _clients collection
+			// while we're enumerating it.
+			if (remove)			
+				_clients.Remove(client.MountPath);
+		}
+		
+		static void DebugLine(string! line)
+		{
+			DebugStub.WriteLine("SMBMGR: " + line);
+		}
+		
+		static void DebugLine(string! format, params object[]! args)
+		{
+			DebugLine(String.Format(format, args));
+		}
+		
+		static void DebugLine(ClientProcess! client, string! line)
+		{
+			DebugStub.WriteLine(client.DebugPrefix + line);
+		}
+		
+		static void DebugLine(ClientProcess! client, string! format, params object[]! args)
+		{
+			DebugLine(client, String.Format(format, args));
+		}
+    }
+    
+    // This class mirrors the exchange type SmbClientConfig.
+    // It is for use within the process heap, rather than the exchange heap.
+    #if false
+    class ClientConfig
+    {
+		public string! MountPath;
+		public string! UncPath;
+		public string! UserName;
+		public string! Password;
+    }
+    #endif
+
+
+	class Util
+	{	
+		public static void DumpException(Exception chain)
+		{
+			for (Exception ex = chain; ex != null; ex = ex.InnerException)
+			{
+				DebugStub.WriteLine(String.Format("{0}: {1}", ex.GetType().FullName, ex.Message));
+			}
+		}
+		
+		public static string! ToStringDelete([Claims]char[]! in ExHeap exstring)
+		{
+			string! localstring = Bitter.ToString2(exstring);
+			delete exstring;
+			return localstring;
+		}
+	}    
+    
+}
+
diff --git a/base/Services/Smb/ClientService/SmbClientService.csproj b/base/Services/Smb/ClientService/SmbClientService.csproj
new file mode 100644
index 0000000..7ce4560
--- /dev/null
+++ b/base/Services/Smb/ClientService/SmbClientService.csproj
@@ -0,0 +1,41 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>SmbClientManager</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SmbClientManager.sg" />
+    <Compile Include="ClientProcess.sg" />
+    <Compile Include="TraceSwitches.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\FileSystem.Contracts\FileSystem.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Security.Contracts\Security.Contracts.csproj" />
+    <ProjectReference Include="..\PublicContracts\SmbClient.PublicContracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\NetStack.Contracts\NetStack.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\NetStack.Channels.Public\NetStack.Channels.Public.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net\System.Net.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.Net.IP\System.Net.IP.csproj" />    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj"/>
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/Smb/ClientService/TraceSwitches.sg b/base/Services/Smb/ClientService/TraceSwitches.sg
new file mode 100644
index 0000000..6ca4d91
--- /dev/null
+++ b/base/Services/Smb/ClientService/TraceSwitches.sg
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services/Smb/ClientManager/TraceSwitches.sg
+//
+//  Note:
+//
+
+using System;
+
+namespace Smb.ClientManager
+{
+    internal /* static */ sealed class TraceSwitches
+    {
+        private TraceSwitches() {}
+        
+        public static bool ShowManagerMessages = false;
+        
+        public static bool ShowProcessActivity = false;
+        
+        public static bool ShowStatusChanges = false;
+    }
+}
diff --git a/base/Services/Smb/Control/Smb.Control.csproj b/base/Services/Smb/Control/Smb.Control.csproj
new file mode 100644
index 0000000..95ba887
--- /dev/null
+++ b/base/Services/Smb/Control/Smb.Control.csproj
@@ -0,0 +1,30 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>net</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="SmbControl.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PublicContracts\SmbClient.PublicContracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />    
+  </ItemGroup>  
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/Smb/Control/SmbControl.sg b/base/Services/Smb/Control/SmbControl.sg
new file mode 100644
index 0000000..6ec9983
--- /dev/null
+++ b/base/Services/Smb/Control/SmbControl.sg
@@ -0,0 +1,596 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+/*
+
+This program is a tool for managing instances of the SMB client service.
+The tool allows users to list running instances of the SMB client process,
+to display their configuration and status, and to create new SMB client
+processes.
+
+This program provides some of the functionality of the Windows "net" command,
+such as "net use" command, etc.
+
+*/
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Net.IP;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Applications;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Configuration;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Smb.PublicChannels;
+
+
+[assembly: Transform(typeof(ApplicationResourceTransform))]
+
+namespace Microsoft.Singularity.Applications.Network
+{
+#if !false
+    [ConsoleCategory(HelpMessage="Show help for SMB control client", DefaultAction=true)]
+    internal class DefaultCommand {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+        reflective internal DefaultCommand();
+
+        internal int AppMain()
+        {
+			Console.WriteLine("Specify a command to execute, or '-?' for a list of commands.");
+			return 0;
+        }
+    }
+#endif
+    
+    [ConsoleCategory(Action="list", HelpMessage="List active SMB client processes" )]
+    internal class ListClientsParameters
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+        
+        //[BoolParameter("v", Mandatory=false, HelpMessage="List details about each client")]
+        public bool Verbose = true;
+
+        reflective internal ListClientsParameters();
+
+        internal int AppMain()
+        {
+			try {
+				SmbClientManagerContract.Imp! manager = SmbControl.ConnectSmbClientManagerRequired();
+				try {
+				
+					manager.SendEnumClients();
+					
+					switch receive {
+						case manager.ClientList(char[][]! in ExHeap mountPaths):
+						
+							for (int i = 0; i < mountPaths.Length; i++) {
+								expose (mountPaths[i]) {
+									char[] in ExHeap exmountPath = mountPaths[i];
+									if (exmountPath == null)
+										continue;
+										
+									string! mountPath = Bitter.ToString2(exmountPath);
+									SmbControl.ShowClientInfo(manager, mountPath);
+								}
+							}
+							
+							delete mountPaths;
+							return 0;						
+							
+						case manager.RequestFailed(errorCode, optionalErrorText):
+							SmbControl.ShowRequestFailed(errorCode, optionalErrorText);
+							delete optionalErrorText;
+							return -1;
+					}				
+				} finally {
+					delete manager;
+				}
+				
+			} catch (Exception ex) {
+				SmbControl.ShowException(ex);
+				return 1;
+			}
+		}
+    }
+    
+    [ConsoleCategory(Action="info", HelpMessage="Shows the status of an SMB client, given its mount path.")]
+    internal class ShowInfoCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+        
+        reflective internal ShowInfoCommand();
+        
+        [StringParameter("mountpath", Mandatory=true, Position=0, HelpMessage="The mount path of the SMB filesystem to query, e.g. /foo.")]
+        internal string MountPath;
+
+        internal int AppMain()
+        {
+			try {
+				SmbControl.ShowClientInfo((!)MountPath);
+				return 0;
+			} catch (Exception ex) {
+				SmbControl.ShowException(ex);
+				return 1;
+			}
+				
+		}
+    }
+
+    [ConsoleCategory(Action="unmount", HelpMessage="Disconnect an SMB client process from the Singularity namespace.")]
+    internal class UnmountCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+		[StringParameter("mountpath", Mandatory=true, Position=0, HelpMessage="The mount path of SMB client, e.g. /files")]
+		public string MountPath;
+
+        reflective internal UnmountCommand();
+
+        internal int AppMain()
+		{
+			try {
+				string! mountPath = (!)this.MountPath;
+				
+				SmbClientManagerContract.Imp manager = SmbControl.ConnectSmbClientManager();
+				if (manager == null)
+					return -1;
+					
+				try {
+					manager.SendStopClient(Bitter.FromString2(mountPath));
+					
+					switch receive {
+						case manager.Ok():
+							break;
+							
+						case manager.RequestFailed(SmbErrorCode error, char[] in ExHeap errortext):
+							delete errortext;
+							break;
+					}
+				
+				} finally {
+					delete manager;
+				}
+				
+				return 0;
+			} catch (Exception ex) {
+				SmbControl.ShowException(ex);
+				return 1;
+			}
+		}		
+    }
+
+#if false // disabled for now
+    [ConsoleCategory(Action="reset", HelpMessage="Resets an SMB client, causing it to disconnect and reconnect.")]
+    internal class ResetCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+		[StringParameter("clientid", HelpMessage="The local mount path, or control endpoint, of the SMB filesystem to reset.", Mandatory=true, Position=0)]
+		public string ClientId;
+		
+		reflective internal ResetCommand();
+		
+		int AppMain()
+		{
+			try {
+				SmbClientControlContract.Imp! control = SmbControl.BindSmbControlClient(ClientId);
+				try {
+					control.SendReconnect();
+					switch receive {
+						case control.AckReconnect():
+							Console.WriteLine("Successfully sent reset/reconnect request to SMB client.");
+							return 0;
+							
+						case control.ChannelClosed():
+							Console.WriteLine("SMB client reset channel before responding.");
+							return -1;
+					}
+				} finally {
+					delete control;
+				}
+			} catch(Exception ex) {
+				SmbControl.ShowException(ex);
+				return -1;
+			}
+		}
+    }
+#endif
+    
+    [ConsoleCategory(Action="mount", HelpMessage="Create a mapping to an SMB file share.")]
+    internal class MountCommand
+    {
+        [InputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdin;
+
+        [OutputEndpoint("data")]
+        public readonly TRef<UnicodePipeContract.Imp:READY> Stdout;
+
+		[StringParameter("mountpath", Mandatory=true, Position=0, HelpMessage="The local path at which to mount the remote namespace, e.g. /foo")]
+		public string MountPath;
+
+		[StringParameter("unc", Mandatory=true, Position=1, HelpMessage=@"The UNC path of the share, e.g. \\server\share")]
+		public string UncPath;
+		
+		[StringParameter("user", Mandatory=false, HelpMessage="The [domain\\]username to use when authenticating.")]
+		public string CredentialsName;
+		
+		[StringParameter("tag", Mandatory=false, HelpMessage="If 'user' is specified, this parameter allows you to pass a credentials tag.")]
+		public string Tag;
+		
+        reflective internal MountCommand();
+
+        internal int AppMain()
+        {
+			try {
+				string! unc = (!)this.UncPath;
+				string! mountpath = (!)this.MountPath;
+
+				if (mountpath.Length == 0 || mountpath[0] != '/')
+					throw new Exception("The mount path is invalid.  It must be an absolute path.");
+
+				SmbClientManagerContract.Imp manager = SmbControl.ConnectSmbClientManager();
+				if (manager == null)
+					return -1;
+
+				try {
+					SmbClientConfig config = new SmbClientConfig();
+					config.UncPath = Bitter.FromString2(unc);
+					config.MountPath = Bitter.FromString2(mountpath);
+					config.CredentialsName = Bitter.FromString2(this.CredentialsName != null ? this.CredentialsName : "");
+					config.Tag = Bitter.FromString2(this.Tag != null ? this.Tag : "");
+									
+					manager.SendCreateClient(config);
+					
+					switch receive {
+						case manager.Ok():
+							Console.WriteLine("Filesystem mapping has been created.");
+							Console.WriteLine("");
+							Console.WriteLine("Be advised!  Creating the mapping (mount point) does NOT mean");
+							Console.WriteLine("that the local SMB redirector (client) has been able to connect");
+							Console.WriteLine("to the remote file server.  The mapping represents the goal state;");
+							Console.WriteLine("you can see the current state by using the 'net @list' command.");
+							break;
+							
+						case manager.RequestFailed(SmbErrorCode error, char[] in ExHeap errortext):
+							Console.WriteLine("The request failed.");
+							Console.WriteLine("Error: {0} {1}", error, Bitter.ToString(errortext));
+							delete errortext;
+							return -1;
+							
+						case manager.ChannelClosed():
+							Console.WriteLine("SMB client closed channel before responding!");
+							return -1;
+					}
+				} finally {
+					delete manager;
+				}
+				
+			} catch (Exception ex) {
+				SmbControl.ShowException(ex);
+			}		
+			
+			return 0;
+		}
+    }
+    
+    class SmbControl
+    {
+		static void ParseUncPath(string! unc, out string! server, out string! resource)
+		{
+			if (!unc.StartsWith("\\\\"))
+				throw new Exception(String.Format("The UNC path '{0}' is invalid.  All UNC paths must begin with '\\\\'.", unc));
+			
+			int separator = unc.IndexOf('\\', 2);
+			assert (separator < 0) || (separator >= 2);
+			if (separator < 0 || separator == 2)
+				throw new Exception(String.Format("The UNC path '{0}' is invalid.  The server name is missing.", unc));
+			
+			if (separator + 1 == unc.Length)
+				throw new Exception(String.Format("The UNC path '{0}' is invalid.  The resource name is missing.", unc));
+			
+			server = unc.Substring(2, separator - 2);
+			resource = unc.Substring(separator + 1);
+		}
+		
+		
+		public static SmbClientManagerContract.Imp! ConnectSmbClientManagerRequired()
+		{
+			SmbClientManagerContract.Imp manager = ConnectSmbClientManager();
+			if (manager == null)
+				throw new Exception("Failed to connect to SMB client manager service.");
+			return manager;
+		}
+		
+		// This method connects to the SMB Client Manager service.
+		// If it cannot connect to the service, it prints an error message on the text console
+		// and returns null.
+		public static SmbClientManagerContract.Imp ConnectSmbClientManager()
+		{
+			DirectoryServiceContract.Imp! rootds = DirectoryService.NewClientEndpoint();
+		
+			try {
+				SmbClientManagerContract.Imp! manager;
+				SmbClientManagerContract.Exp! manager_exp;
+				SmbClientManagerContract.NewChannel (out manager, out manager_exp);
+				
+				rootds.SendBind(Bitter.FromString2(SmbClientManagerContract.ManagerControlPath), manager_exp);
+				
+				switch receive {
+					case rootds.AckBind():
+						manager.RecvSuccess();
+						return manager;
+					
+					case rootds.NakBind(exp, ErrorCode code):
+						Console.WriteLine("Failed to connect to SMB client manager service.");
+						Console.WriteLine("The service may not be running.");
+						delete exp;
+						delete manager;
+						return null;
+				}
+			} finally {
+				delete rootds;
+			}				
+		}
+		
+		
+		static void DebugLine(string msg)
+		{
+			DebugStub.WriteLine("SMBCONTROL: " + msg);
+		}
+		
+		static void DebugLine(string format, params object[] args)
+		{
+			DebugLine(String.Format(format, args));
+		}
+		
+		static void Bind(string! path, [Claims]ServiceContract.Exp! exp)
+		{
+			DirectoryServiceContract.Imp! rootdir = DirectoryService.NewClientEndpoint();
+			try {
+				ErrorCode errorCode;
+				if (SdsUtils.Bind(path, rootdir, exp, out errorCode)) {
+					return;
+				} else {
+					delete rootdir;
+					throw new Exception(String.Format("Failed to bind to path '{0}'.  ErrorCode = {1}.", path, SdsUtils.ErrorCodeToString(errorCode)));
+				}
+			} finally {
+				delete rootdir;
+			}
+		}
+
+		static DirectoryServiceContract.Imp! BindDirectory(string! path)
+		{
+			DirectoryServiceContract.Exp! dir_exp;
+			DirectoryServiceContract.Imp! dir_imp;
+			DirectoryServiceContract.NewChannel(out dir_imp, out dir_exp);
+			
+			DirectoryServiceContract.Imp! rootdir = DirectoryService.NewClientEndpoint();
+			
+			ErrorCode errorCode;
+			if (SdsUtils.Bind(path, rootdir, dir_exp, out errorCode)) {
+				delete rootdir;
+				dir_imp.RecvSuccess();
+				return dir_imp;
+			} else {
+				delete rootdir;
+				delete dir_imp;
+				throw new Exception(String.Format("Failed to bind to directory '{0}'.  ErrorCode = {1}.", path, SdsUtils.ErrorCodeToString(errorCode)));
+			}
+		}
+		
+		static EnumerationRecords[]! in ExHeap EnumerateDirectory(string! path)
+		{
+			DirectoryServiceContract.Imp! dir = BindDirectory(path);
+			
+			try {
+				ErrorCode error;
+				EnumerationRecords[] in ExHeap records = SdsUtils.EnumerateDirectory(dir, out error);
+				if (records != null)
+					return records;
+				throw new Exception(String.Format("Failed to enumerate contents of path '{0}': {1}", SdsUtils.ErrorCodeToString(error)));
+			} finally {
+				delete dir;
+			}
+		}
+		
+		static internal SmbClientControlContract.Imp! BindSmbControlClient(string! mountPath)
+		{
+			SmbClientManagerContract.Imp! manager = ConnectSmbClientManagerRequired();
+			try {
+				return BindSmbControlClient(manager, mountPath);
+			} finally {
+				delete manager;
+			}
+		}
+		
+		static internal SmbClientControlContract.Imp! BindSmbControlClient(SmbClientManagerContract.Imp! manager, string! mountPath)
+		{
+			SmbClientControlContract.Imp! control_imp;
+			SmbClientControlContract.Exp! control_exp;
+			SmbClientControlContract.NewChannel(out control_imp, out control_exp);
+		
+			manager.SendBindClient(Bitter.FromString2(mountPath), control_exp);
+			
+			switch receive {
+				case manager.Ok():
+					control_imp.RecvSuccess();
+					return control_imp;
+					
+				case manager.RequestFailed(errorcode, optionalErrorText):
+					string local_errorText = Bitter.ToString(optionalErrorText);
+					delete optionalErrorText;
+					throw new Exception(String.Format("Failed to bind to SMB control endpoint for mount path '{0}': {1} {2}", mountPath, errorcode.ToString(), local_errorText));
+			}
+		}
+		
+		
+		internal static void ShowClientInfo(string! mountPath)
+		{
+			SmbClientManagerContract.Imp! manager = ConnectSmbClientManagerRequired();
+			try {
+				ShowClientInfo(manager, mountPath);
+			} finally {
+				delete manager;
+			}
+		}
+		
+		internal static void ShowClientInfo(SmbClientManagerContract.Imp! manager, string! clientId)
+		{		
+			Console.WriteLine("SMB client:");
+			
+			try {
+				try {
+					
+					manager.SendQueryClientConfig(Bitter.FromString2(clientId));
+					
+					const string format = "    {0,-20} : {1}";
+							
+					switch receive
+					{
+						case manager.ClientConfigReport(SmbClientConfig config):
+							Console.WriteLine(format, "UNC path", Bitter.ToString2(config.UncPath));
+							Console.WriteLine(format, "Mount path", Bitter.ToString2(config.MountPath));						
+							Console.WriteLine(format, "User name", Bitter.ToString2(config.CredentialsName));
+							config.Dispose();
+							break;
+							
+						case manager.RequestFailed(code, text):
+							Console.WriteLine("Failed to query client configuration.");
+							SmbControl.ShowRequestFailed(code, text);
+							delete text;
+							break;
+							
+						case manager.ChannelClosed():
+							Console.WriteLine("SMB service closed channel without responding to control query.");
+							break;
+					}
+
+					manager.SendQueryClientStatus(Bitter.FromString2(clientId));
+					
+					switch receive {
+						case manager.ClientStatusReport(SmbClientStatus status):
+						
+							string! connectionStatusText = ToString(status.ConnectionStatus);
+							if (status.ConnectionStatus == SmbClientConnectionStatus.Disconnected) {
+								connectionStatusText = connectionStatusText + " (reason: " + ToString(status.ReasonDisconnected) + ")";
+							}
+						
+							Console.WriteLine(format, "Connection status", connectionStatusText);
+							if (status.ServerMachineName != null)		Console.WriteLine(format, "Server machine name", Bitter.ToString(status.ServerMachineName));
+							if (status.ServerDomainName != null)		Console.WriteLine(format, "Server domain name", Bitter.ToString(status.ServerDomainName));
+							if (status.ServerOperatingSystem != null)	Console.WriteLine(format, "Server OS", Bitter.ToString(status.ServerOperatingSystem));
+							if (status.ActiveCredentialsName != null)	Console.WriteLine(format, "Active Credentials", Bitter.ToString2(status.ActiveCredentialsName));
+							
+							status.Dispose();
+							break;
+							
+						case manager.RequestFailed(code, text):
+							Console.WriteLine("Failed to query client status.");
+							SmbControl.ShowRequestFailed(code, text);
+							delete text;
+							break;
+							
+						case manager.ChannelClosed():
+							Console.WriteLine("Error - Control channel was closed.");
+							break;
+					}
+					
+				} finally {
+				}
+				
+			} catch (Exception ex) {
+				// Console.WriteLine("Failed to bind to control endpoint '{0}'.", ex);
+				ShowException(ex);
+			}
+			
+			Console.WriteLine("");
+		}
+
+		static string! ToStringOrNull(char[] in ExHeap str)
+		{
+		    if (str != null)
+		        return Bitter.ToString2(str);
+		    else
+		        return "(null)";
+		}
+		
+		static string! ToString(SmbClientConnectionStatus status)
+		{
+			switch (status)
+			{
+				case SmbClientConnectionStatus.Disconnected: return "Disconnected";
+				case SmbClientConnectionStatus.Negotiating: return "Negotiating";				
+				case SmbClientConnectionStatus.TransportConnecting: return "Connecting";
+				case SmbClientConnectionStatus.Authenticating: return "Authenticating";
+				case SmbClientConnectionStatus.Connected: return "Connected";
+				default: return "Unknown (" + ((int)status).ToString() + ")";
+			}
+		}		
+		
+		static string! ToString(SmbReasonDisconnected reason)
+		{
+			switch (reason)
+			{
+				case SmbReasonDisconnected.Idle:					return "Idle";
+				case SmbReasonDisconnected.TransportConnectFailed:	return "Failed to connect transport";
+				case SmbReasonDisconnected.NegotiationFailed:		return "Negotiation failed";
+				case SmbReasonDisconnected.ResourceConnectFailed:	return "Resource connect rejected";
+				case SmbReasonDisconnected.AuthenticationFailed:	return "Authentication failed";
+				case SmbReasonDisconnected.AuthorizationFailed:		return "Authorization failed";
+				case SmbReasonDisconnected.NoResponse:				return "No response from server";
+				case SmbReasonDisconnected.ProtocolViolation:		return "Protocol violation";
+				case SmbReasonDisconnected.TransportFailure:		return "Transport failure";
+				default: return "Unknown (" + ((int)reason).ToString() + ")";
+			}
+		}		
+		
+		internal static void ShowException(Exception! chain)
+		{
+			Exception current = chain;
+			while (current != null)
+			{
+				Console.WriteLine("{0}: {1}", current.GetType().FullName, current.Message);
+				current = current.InnerException;
+			}
+		}
+		
+		internal static void ShowRequestFailed(SmbErrorCode code, char[] in ExHeap optionalErrorText)
+		{
+			if (optionalErrorText != null)
+				Console.WriteLine("Error: SmbErrorCode.{0} : {1}", code, Bitter.ToString2(optionalErrorText));
+			else
+				Console.WriteLine("Error: SmbErrorCode.{0}", code);
+		}
+    }
+}
diff --git a/base/Services/Smb/Docs/SmbClient.doc b/base/Services/Smb/Docs/SmbClient.doc
new file mode 100644
index 0000000..f34b677
Binary files /dev/null and b/base/Services/Smb/Docs/SmbClient.doc differ
diff --git a/base/Services/Smb/Protocol/SmbCommand.sg b/base/Services/Smb/Protocol/SmbCommand.sg
new file mode 100644
index 0000000..43df2ff
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbCommand.sg
@@ -0,0 +1,101 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Smb.Protocol
+{
+    public enum SmbCommand
+    {
+        CreateDirectory = 0,
+        DeleteDirectory = 1,
+        OpenFile = 2,
+        CreateFile = 3,
+        CloseFile = 4,
+        FlushFile = 5,
+        DeleteFile = 6,
+        RenameFile = 7,
+        GetFileAttributes = 8,
+        SetFileAttributes = 9,
+        Read = 0xa,
+        Write = 0xb,
+        LockByteRange = 0xc,
+        UnlockByteRange = 0xd,
+        CreateTempFile = 0xe,
+        MakeNewFile = 0xf,
+        CheckDirectory = 0x10,
+        ProcessExit = 0x11,
+        Seek = 0x12,
+
+        LockAndRead = 0x13,
+        WriteAndUnlock = 0x14,
+        ReadRaw = 0x1A,
+        ReadMpx = 0x1B,
+        ReadMpxSecondary = 0x1C,// server to redir only
+        WriteRaw = 0x1D,
+        WriteMpx = 0x1E,
+        WriteMpxSecondary = 0x1F,
+        WriteComplete = 0x20,// server to redir only
+        QueryInformationSrv = 0x21,
+        SetInformation2 = 0x22,
+        QueryInformation2 = 0x23,
+        LockingAndx = 0x24,
+        Transaction = 0x25,
+        TransactionSecondary = 0x26,
+        Ioctl = 0x27,
+        IoctlSecondary = 0x28,
+        Copy = 0x29,
+        Move = 0x2A,
+        Echo = 0x2B,
+        WriteAndClose = 0x2C,
+        OpenAndx = 0x2D,
+        ReadAndX = 0x2E,
+        WriteAndX = 0x2F,
+
+        CloseAndTreeDisc = 0x31,
+        Transaction2 = 0x32,
+        Transaction2_SECONDARY = 0x33,
+        FindClose2 = 0x34,
+        FindNotifyClose = 0x35,
+
+
+        TreeConnect = 0x70,
+        TreeDisconnect = 0x71,
+        Negotiate = 0x72,
+        SessionSetupAndX = 0x73,
+        LogoffAndX = 0x74,
+        TreeConnectAndX = 0x75,
+
+
+        GetDiskAttributes = 0x80,
+        SearchDirectory = 0x81,
+        Find = 0x82,
+        FindUnique = 0x83,
+        FindClose = 0x84,
+
+        NtTransact = 0xa0,
+        NtTransactSecondary = 0xa1,
+        NtCreateAndX = 0xa2,
+        NtCancel = 0xa4,
+        NtRename = 0xa5,
+
+
+        OpenPrintSpoolFile = 0xc0,
+        WriteToPrintSpoolFile = 0xc1,
+        ClosePrintSpoolFile = 0xc2,
+        ReturnPrintQueue = 0xc3,
+        SendSingleBlockMessage = 0xd0,
+        SendBroadcastMessage = 0xd1,
+        ForwardUserName = 0xd2,
+        CancelForward = 0xd3,
+        GetMachineName = 0xd4,
+        SendStartMultiBlock = 0xd5,
+        SendEndMultiBlock = 0xd6,
+        SendTextMultiBlock = 0xd7,
+    }
+
+}
diff --git a/base/Services/Smb/Protocol/SmbError.sg b/base/Services/Smb/Protocol/SmbError.sg
new file mode 100644
index 0000000..d3c12b4
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbError.sg
@@ -0,0 +1,194 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Utils;
+
+namespace Smb.Protocol
+{
+    public enum SmbErrorClass : byte
+    {
+        Success         = 0,
+        OperatingSystem = 1,
+        FileServer      = 2,
+        HardwareError   = 3,
+        Unrecognized    = 0xff
+
+    }
+
+    public enum SmbSuccessMessage : byte
+    {
+        Success   = 0,
+        Buffered  = 0x54,
+        Logged    = 0x55,
+        Displayed = 0x56,
+
+    }
+
+    public enum SmbOsError : byte
+    {
+        BadFunction                  = 1,
+        FileNotFound                 = 2,
+        PathNotFound                 = 3,
+        TooManyFilesOpen             = 4,
+        AccessDenied                 = 5,
+        InvalidFileHandle            = 6,
+        MemoryControlBlocksDestroyed = 7,
+        InsufficientMemory           = 8,
+        InvalidMemoryBlockAddress    = 9,
+        InvalidEnvironment           = 10,
+        InvalidFormat                = 11,
+        InvalidOpenMode              = 12,
+        InvalidData                  = 13,
+        Reserved14                   = 14,
+        InvalidDriveSpecified        = 15,
+        CannotDeleteCurrentDirectory = 16,
+        CannotRenameAcrossVolumes    = 17,
+        NoMatchingFiles              = 18,
+        SharedAccessDenied           = 32,
+        LockRequestDenied            = 33,
+        FileExists                   = 80,
+
+    }
+
+    public enum SmbFileServerError : byte
+    {
+        GeneralFailure        = 1,
+        BadPassword           = 2,
+        BadType               = 3,
+        AccessDenied          = 4,
+        InvalidTreeId         = 5,
+        InvalidNetworkName    = 6,
+        InvalidDevice         = 7,
+        PrintQueueFull        = 49,
+        PrintQueueTooBig      = 50,
+        PrintQueueEof         = 51,
+        InvalidPrintFileId    = 52,
+        ServerIsPaused        = 81,
+        NotReceivingMessages  = 82,
+        NoRoomToBufferMessage = 83,
+        TooManyUserNames      = 87,
+
+    }
+
+    public enum SmbHardwareError : byte
+    {
+        WriteAccessDenied         = 19,
+        UnknownUnit               = 20,
+        DriveNotReady             = 21,
+        InvalidDiskCommand        = 22,
+        DataErrorCrc              = 23,
+        BadRequestStructureLength = 24,
+        SeekError                 = 25,
+        UnknownMediaType          = 26,
+        SectorNotFound            = 27,
+        PrinterOutOfPaper         = 28,
+        WriteFault                = 29,
+        ReadFault                 = 30,
+        GeneralFailure            = 31,
+        SharedAccessDenied        = 32,
+
+    }
+
+    public enum SmbNtErrorClass : uint
+    {
+        SmbFacilityCode = 0x00980000,
+        SmbErrorBase = 0xc0000000 | SmbFacilityCode,
+
+        Srv = SmbErrorBase + 0,
+        Dos = SmbErrorBase + 0x1000,
+        FileServer = SmbErrorBase + 0x2000,
+        Hardware = SmbErrorBase + 0x3000,
+        Win32 = SmbErrorBase + 0xe000,
+        OS2 = SmbErrorBase + 0xf000,
+
+        /// <summary>
+        /// I made this up.
+        /// </summary>
+        Unrecognized = SmbErrorBase + 0xc000,
+    }
+
+    /// <summary>
+    /// SMB status codes, packed similar to NT status codes.
+    /// In fact, they're compatible.
+    /// Use SmbProtocol.IsSuccess(SmbError), etc.
+    /// 
+    /// 
+    /// </summary>
+    public enum SmbError : uint
+    {
+        Success = 0,
+
+        NoMatchingErrorCode             = SmbNtErrorClass.Unrecognized | 0xfff,
+
+        BadFunction                     = SmbNtErrorClass.Dos | 1,
+        FileNotFound                    = SmbNtErrorClass.Dos | 2,
+        PathNotFound                    = SmbNtErrorClass.Dos | 3,
+        TooManyFilesOpen                = SmbNtErrorClass.Dos | 4,
+        DosAccessDenied                 = SmbNtErrorClass.Dos | 5,
+        InvalidFileHandle               = SmbNtErrorClass.Dos | 6,
+        MemoryControlBlocksDestroyed    = SmbNtErrorClass.Dos | 7,
+        InsufficientMemory              = SmbNtErrorClass.Dos | 8,
+        InvalidMemoryBlockAddress       = SmbNtErrorClass.Dos | 9,
+        InvalidEnvironment              = SmbNtErrorClass.Dos | 10,
+        InvalidFormat                   = SmbNtErrorClass.Dos | 11,
+        InvalidOpenMode                 = SmbNtErrorClass.Dos | 12,
+        InvalidData                     = SmbNtErrorClass.Dos | 13,
+        Reserved14                      = SmbNtErrorClass.Dos | 14,
+        InvalidDriveSpecified           = SmbNtErrorClass.Dos | 15,
+        CannotDeleteCurrentDirectory    = SmbNtErrorClass.Dos | 16,
+        CannotRenameAcrossVolumes       = SmbNtErrorClass.Dos | 17,
+        NoMatchingFiles                 = SmbNtErrorClass.Dos | 18,
+        DosSharedAccessDenied           = SmbNtErrorClass.Dos | 32,
+        LockRequestDenied               = SmbNtErrorClass.Dos | 33,
+        FileExists                      = SmbNtErrorClass.Dos | 80,
+
+
+
+
+        WriteAccessDenied               = SmbNtErrorClass.Hardware | 19,
+        UnknownUnit                     = SmbNtErrorClass.Hardware | 20,
+        DriveNotReady                   = SmbNtErrorClass.Hardware | 21,
+        InvalidDiskCommand              = SmbNtErrorClass.Hardware | 22,
+        DataErrorCrc                    = SmbNtErrorClass.Hardware | 23,
+        BadRequestStructureLength       = SmbNtErrorClass.Hardware | 24,
+        SeekError                       = SmbNtErrorClass.Hardware | 25,
+        UnknownMediaType                = SmbNtErrorClass.Hardware | 26,
+        SectorNotFound                  = SmbNtErrorClass.Hardware | 27,
+        PrinterOutOfPaper               = SmbNtErrorClass.Hardware | 28,
+        WriteFault                      = SmbNtErrorClass.Hardware | 29,
+        ReadFault                       = SmbNtErrorClass.Hardware | 30,
+        GeneralFailure                  = SmbNtErrorClass.Hardware | 31,
+        HardwareSharedAccessDenied      = SmbNtErrorClass.Hardware | 32,
+
+
+
+
+        FileServerGeneralFailure        = SmbNtErrorClass.FileServer | 1,
+        BadPassword                     = SmbNtErrorClass.FileServer | 2,
+        BadType                         = SmbNtErrorClass.FileServer | 3,
+        FileServerAccessDenied          = SmbNtErrorClass.FileServer | 4,
+        InvalidTreeId                   = SmbNtErrorClass.FileServer | 5,
+        InvalidNetworkName              = SmbNtErrorClass.FileServer | 6,
+        InvalidDevice                   = SmbNtErrorClass.FileServer | 7,
+        PrintQueueFull                  = SmbNtErrorClass.FileServer | 49,
+        PrintQueueTooBig                = SmbNtErrorClass.FileServer | 50,
+        PrintQueueEof                   = SmbNtErrorClass.FileServer | 51,
+        InvalidPrintFileId              = SmbNtErrorClass.FileServer | 52,
+        ServerIsPaused                  = SmbNtErrorClass.FileServer | 81,
+        NotReceivingMessages            = SmbNtErrorClass.FileServer | 82,
+        NoRoomToBufferMessage           = SmbNtErrorClass.FileServer | 83,
+        TooManyUserNames                = SmbNtErrorClass.FileServer | 87,
+
+
+
+
+
+    }
+
+}
+
diff --git a/base/Services/Smb/Protocol/SmbFilesystemRequests.sg b/base/Services/Smb/Protocol/SmbFilesystemRequests.sg
new file mode 100644
index 0000000..ec064a1
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbFilesystemRequests.sg
@@ -0,0 +1,375 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Runtime.InteropServices;
+using SmbClient;
+
+namespace Smb.Protocol
+{
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbCloseFileRequest
+	{
+		public SmbHeader Header;
+		public ushort Fid;
+		public uint LastWriteTime;
+		public ushort ByteCount; // = 0
+	}
+
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbNtCreateAndXRequest
+    {
+		public SmbHeader Header;
+		/*[FieldOffset(37)]*/ public byte AndXCommand;
+		/*[FieldOffset(38)]*/ public byte AndXReserved;
+		/*[FieldOffset(39)]*/ public ushort AndXOffset;
+		/*[FieldOffset(41)]*/ public byte Reserved;
+		/*[FieldOffset(42)]*/ public ushort NameLength;
+		/*[FieldOffset(44)]*/ public uint Flags;
+		/*[FieldOffset(48)]*/ public uint RootDirectoryFid;
+		/*[FieldOffset(52)]*/ public uint DesiredAccess;
+		/*[FieldOffset(56)]*/ public ulong AllocationSize;
+		/*[FieldOffset(64)]*/ public uint ExtFileAttributes;
+		/*[FieldOffset(68)]*/ public uint ShareAccess;
+		/*[FieldOffset(72)]*/ public uint CreateDisposition;
+		/*[FieldOffset(76)]*/ public uint CreateOptions;
+		/*[FieldOffset(80)]*/ public uint ImpersonationLevel;
+		/*[FieldOffset(84)]*/ public byte SecurityFlags;
+		/*[FieldOffset(85)]*/ public ushort ByteCount;
+		/*[FieldOffset(86)]*/ public byte Padding;
+		// STRING Name[];
+    }
+    
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbNtCreateAndXResponse
+	{
+		public SmbHeader Header;
+		
+		public byte AndXCommand;			// always 0xff
+		public byte AndXReserved;			// always 0
+		public ushort AndXOffset;			// always 0
+		public byte OplockLevel;
+		public ushort Fid;
+		public uint CreateAction;
+		public FILETIME CreationTime;
+		public FILETIME LastAccessTime;
+		public FILETIME LastWriteTime;
+		public FILETIME ChangeTime;
+		public uint ExtFileAttributes;
+		public long AllocationSize;
+		public long EndOfFile;
+		public ushort FileType;
+		public ushort DeviceState;
+		public bool Directory;
+		public ushort ByteCount; // zero
+	}
+	
+	/* This request supports wildcards. */
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbDeleteFileRequest
+	{
+		public SmbHeader Header;
+		public ushort SearchAttributes;
+		public ushort ByteCount;				// length of filename in bytes
+		public byte BufferFormat;				// 4
+		public byte AlignmentPadding;			// for Unicode
+		// STRING FileName;		
+		
+		public const int ParameterCount = 1;
+	}
+	
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbDeleteDirectoryRequest
+	{
+		public SmbHeader Header;
+		public ushort ByteCount;				// length of filename in bytes
+		public byte BufferFormat;				// 4
+		public byte AlignmentPadding;			// for Unicode
+		// STRING DirectoryName;		
+		public const int ParameterCount = 0;
+	}
+	
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbCreateDirectoryRequest
+	{
+		public SmbHeader Header;
+		public SmbTransaction2RequestHeader Transaction;
+		
+		// Header.ParameterCount = 15
+		public uint Reserved;
+		// STRING name[];
+		// byte Data[]; // Ea list, optional
+	}
+	
+	
+	
+	[Flags]
+	public enum SmbFileShareAccess
+	{
+		None = 0,
+		Read = 1,
+		Write = 2,
+		Delete = 4,
+	}
+	
+	public enum SmbCreateDisposition
+	{
+		Supersede = 0,
+		Open = 1,
+		Create = 2,
+		OpenIf = 3,
+		Overwrite = 4,
+		OverwriteIf = 5,
+	}
+	
+    public enum SmbFileCreateActionTaken
+    {
+    }
+
+	public enum SmbFileCreateOptions : uint
+	{
+		None = 0,
+	}
+	
+	[Flags]
+	public enum SmbNtCreateFileFlags : uint
+	{
+		RequestOpLock = 2,
+		RequestBatchOpLock = 4,
+		DirectoryOnly = 8,
+	}
+	
+	public enum SmbImpersonationLevel : uint
+	{
+		Anonymous = 0,
+		Identification = 1,
+		Impersonation = 2,
+		Delegation = 3,
+	}
+	
+	public enum SmbCreateFileSecurityFlags : uint
+	{
+		ContextTracking = 0x40000,
+		EffectiveOnly = 0x80000,
+	}
+
+    [Flags]
+    enum SmbFileAttributes : uint
+    {
+        ReadOnly = 1,
+        Hidden = 2,
+        System = 4,
+        Obsolete_VolumeId = 8,
+        Directory = 0x10,
+        Archive = 0x20,
+        Compressed = 0x800,
+        Temporary = 0x100,
+        Normal = 0x80,
+        
+        WriteThrough = 0x80000000u,
+        NoBuffering =  0x20000000u,
+        RandomAccess = 0x10000000u,
+        SequentialScan = 0x08000000u,
+        DeleteOnClose = 0x04000000,
+        BackupSemantics = 0x02000000u,
+    }
+
+    [Flags]
+    enum SmbFindFirstFlag
+    {
+        CloseSearchAfterThisRequest = 1,
+        CloseSearchIfNoMore = 2,
+        ReturnResumeKeysForAllEntries = 4,
+        ResumeFromPrevious = 8,
+        FindWithBackupIntent = 0x10,
+    }
+
+    enum SmbFindFirstInformationLevel
+    {
+        Standard = 1,
+        QueryEaSize = 2,
+        QueryEasFromList = 3,
+        FileDirectoryInfo = 0x101,
+        FileFullDirectoryInfo = 0x102,
+        FileNamesInfo = 0x103,
+        FileBothDirectoryInfo = 0x104,
+        FileUnix = 0x202,
+    }
+
+	/*
+    pointerfree struct SmbFileInfoStandard
+    {
+		public SmbDate CreationDate;
+		public SmbTime CreationTime;
+		public SmbDate LastAccessDate;
+		public SmbTime LastAccessTime;
+		public SmbDate LastWriteDate;
+		public SmbTime LastWriteTime;
+		public uint DataSize;
+		public uint AllocationSize;
+		public ushort Attributes; // use SmbFileAttributes
+		public byte FileNameLength;
+		// STRING FileName;		
+    }
+    
+    pointerfree struct SmbDate
+    {
+    }
+    
+    pointerfree struct SmbTime
+    {
+    }
+    
+    */
+    
+    [StructLayout(LayoutKind.Sequential)]
+    pointerfree struct FILETIME
+    {
+		public Int64 Ticks;
+		
+		override public string! ToString()
+		{
+			DateTime t = new DateTime(this.Ticks);
+			// WARNING: DateTime.ToString() is defective.
+			// return (!)t.ToString();
+			return (!)t.ToString("D");
+		}
+		
+		public static implicit operator DateTime(FILETIME t)
+		{
+			return new DateTime(t.Ticks);
+		}
+    }
+    
+    [StructLayout(LayoutKind.Sequential, Size=68)]
+    pointerfree struct SmbFindFileDirectoryInfo
+    {
+		public uint NextEntryOffset;
+		public uint FileIndex;
+		public FILETIME CreationTime;
+		public FILETIME LastAccessTime;
+		public FILETIME LastWriteTime;
+		public FILETIME ChangeTime;
+		public Int64 EndOfFile;
+		public Int64 AllocationSize;
+		public uint ExtFileAttributes;
+		public uint FileNameLength;
+		public uint EaSize;
+		// STRING FileName;
+		
+		public const int SizeOf = 68;
+    }
+    
+    
+    /*
+    This structure describes the SMB ReadAndX request, which reads a block of data from
+    an open file handle.  There are two variants of this structure; the older variant uses
+    32-bit file offsets, and so is not appropriate for modern filesystems.  The newer
+    variant, which this structure describes, is distinguished from the older variant by the
+    ParameterCount field (of SmbHeader); the newer variant uses a value of 12.
+    */
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbReadAndXRequest
+    {
+		public SmbHeader Header;
+		public byte AndXCommand;
+		public byte AndXReserved;
+		public ushort AndXOffset;
+		public ushort Fid;
+		public uint FileOffsetLow;
+		public ushort MaxCount;
+		public ushort MinCount;
+		public uint MaxCountHigh;
+		public ushort Remaining;
+		public uint FileOffsetHigh;
+		public ushort ByteCount;
+		
+		public const int ParameterCount = 12;		
+    }
+    
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbReadAndXResponse
+    {
+		public SmbHeader Header;
+		public byte AndXCommand;
+		public byte AndXReserved;
+		public ushort AndXOffset;
+		public ushort Remaining;			// obsolete, always -1
+		public ushort DataCompactionMode;
+		public ushort Reserved;
+		public ushort DataLength;
+		public ushort DataOffset;
+		public ushort DataLengthHigh;
+		public ushort Reserved0;
+		public ushort Reserved1;
+		public ushort Reserved2;
+		public ushort Reserved3;
+		public ushort ByteCount;
+		// byte padding[];
+		// byte data[DataLength];
+    }
+    
+    /*
+    This structure describes the SMB WriteAndX request, which writes a block of bytes
+    to an open file handle.  The request has two variants, which are distinguished by
+    the parameter count.  The older variant uses 32-bit file offsets, and is not
+    suitable for modern file sizes; this variant is identified by parameter count = 12.
+    The newer variant, which this structure describes, uses 64-bit file offsets, and
+    is the variant described by this structure.
+    */
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbWriteAndXRequest
+    {
+		public SmbHeader Header;
+		public byte AndXCommand;                // always 0xff
+		public byte AndXReserved;               // zero
+		public ushort AndXOffset;               // zero
+		public ushort Fid;                      // open file id
+		public uint FileOffsetLow;              // bits 0-31 of offset within file
+		public uint Reserved;                   // zero
+		public ushort WriteMode;                // bit 0 = "write through"
+		public ushort Remaining;                // no idea
+		public ushort DataLengthHigh;           // bits 16-31 of length of file data in this message
+		public ushort DataLengthLow;            // bits 0-15 of length of file data in this message
+		public ushort DataOffset;               // offset within SMB message (from beginning of SMB message) of data
+		public uint FileOffsetHigh;             // bits 32-63 of offset within file
+		public ushort ByteCount;                // bytes to transfer; ignored if CAP_LARGE_WRITEX enabled
+		// pad to 4-byte
+		// byte[] data
+		
+		public const int ParameterCount = 14;
+    }
+
+    /*
+    Describes the response to the WriteAndX SMB request.
+    */
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbWriteAndXResponse
+    {
+		public SmbHeader Header;
+		public byte AndXCommand;            // always 0xff, ignore
+		public byte AndXReserved;           // ignore
+		public ushort AndXOffset;           // ignore
+		public ushort Count;                // number of bytes transferred
+		public ushort Remaining;            // obsolete; ignore
+		public uint Reserved;               // ignore
+		public ushort ByteCount;            // number of bytes in data block, always zero
+    }
+    
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbQueryFileInformationRequest
+    {
+		public SmbHeader Header;
+		public SmbTransaction2RequestHeader Transaction;
+		public ushort StupidPaddingSmbMakesMeCrazy;
+		public ushort ByteCount;
+		public ushort InformationLevel;
+		public uint Reserved;
+		public byte Padding;		
+		// path
+    }
+    
+}
+
diff --git a/base/Services/Smb/Protocol/SmbFlag.sg b/base/Services/Smb/Protocol/SmbFlag.sg
new file mode 100644
index 0000000..2292607
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbFlag.sg
@@ -0,0 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace Smb.Protocol
+{
+    [Flags]
+	public enum SmbFlag1 : byte
+	{
+        [Obsolete]LockAndReadOk = (1 << 0),
+        SendNoAck = (1 << 1),
+        Reserved = (1 << 2),
+        CaseInsensitive = (1 << 3),
+        CanonicalizedPaths = (1 << 4),
+        [Obsolete]SupportsOpLocks = (1 << 5),
+        [Obsolete]SupportsOpLockNotify = (1 << 6),
+        IsResponse = (1 << 7),
+	
+	
+	}
+	
+	
+
+    // low byte [0..7] is FLAGS
+    // middle 2 bytes [8..23] is FLAGS2
+    [Flags]
+	public enum SmbFlag2 : ushort
+	{
+        None = 0,
+        
+        // These are what is usually called FLAGS2.
+        // They're packed into the same enumerated type.
+        KnowsLongNames = (1 << 0),
+        KnowsExtendedAttributes = (1 << 1),
+        SupportsSecuritySignature = (1 << 2),
+        // bit 3 is reserved
+        // bit 4 is reserved
+        SecuritySignatureRequired = (1 << 5),
+        AllPathsAreLongNames = (1 << 6),
+        // bit 7 is reserved
+        // bit 8 is reserved
+        // bit 9 is reserved
+        ReparsePath = (1 << 10),
+        AwareOfExtendedSecurity = (1 << 11),
+        DfsNamespace = (1 << 12),
+        PagingIo = (1 << 13),
+        UsingNtStatus = (1 << 14),
+        UnicodeStrings = (1 << 15),
+	}
+}
diff --git a/base/Services/Smb/Protocol/SmbHeader.sg b/base/Services/Smb/Protocol/SmbHeader.sg
new file mode 100644
index 0000000..010e680
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbHeader.sg
@@ -0,0 +1,143 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using Smb.Shared;
+
+
+namespace Smb.Protocol
+{
+	[StructLayout(LayoutKind.Explicit, Pack=1, Size=37)]
+	pointerfree struct SmbHeader
+	{
+		[FieldOffset(0)] public byte FrameLength0;
+		[FieldOffset(1)] public byte FrameLength1;
+		[FieldOffset(2)] public byte FrameLength2;
+		[FieldOffset(3)] public byte FrameLength3;
+		[FieldOffset(4)] public byte Signature0;
+		[FieldOffset(5)] public byte Signature1;
+		[FieldOffset(6)] public byte Signature2;
+		[FieldOffset(7)] public byte Signature3;
+		[FieldOffset(8)] public byte Command;
+		[FieldOffset(9)] public byte ErrorClass;
+		[FieldOffset(10)] public byte Error1;
+		[FieldOffset(11)] public byte Error2;
+		[FieldOffset(12)] public byte Error3;
+		[FieldOffset(13)] public byte Flags1;
+		[FieldOffset(14)] public ushort Flags2;
+		[FieldOffset(16)] public ushort PidHigh;
+		[FieldOffset(18)] public uint Extra0;
+		[FieldOffset(22)] public uint Extra1;
+		[FieldOffset(26)] public ushort ExtraReserved;
+		[FieldOffset(28)] public ushort TreeId;
+		[FieldOffset(30)] public ushort ProcessId;
+		[FieldOffset(32)] public ushort UserId;
+		[FieldOffset(34)] public ushort MuxId;		
+		[FieldOffset(36)] public byte ParameterCount;
+		
+		// I can't believe it, but the length of this structure is 37!  THIRTY SEVEN!
+		// Not only is it not aligned to any sane boundary, like 4 or 8 bytes, but it's
+		// a freakin PRIME NUMBER!
+		public const int SizeOf = 37;
+		
+		public void SetSignature()
+		{
+			Signature0 = SmbSignature0;
+			Signature1 = SmbSignature1;
+			Signature2 = SmbSignature2;
+			Signature3 = SmbSignature3;	
+		}
+		
+		public bool IsSignatureValid()
+		{
+			return Signature0 == SmbSignature0
+				&& Signature1 == SmbSignature1
+				&& Signature2 == SmbSignature2
+				&& Signature3 == SmbSignature3;				
+		}
+		
+		
+		public const byte SmbSignature0 = 0xff;
+		public const byte SmbSignature1 = (byte)'S';
+		public const byte SmbSignature2 = (byte)'M';
+		public const byte SmbSignature3 = (byte)'B';
+		
+		public bool IsError
+		{
+			get {
+				return Error1 != 0 || Error2 != 0 || Error3 != 0;
+			}
+		}
+		
+		public NtStatus GetNtStatus()
+		{
+			if ((((SmbFlag2)Flags2) & SmbFlag2.UsingNtStatus) != 0) {
+				uint code = ((uint)ErrorClass)
+					| (((uint)Error1) << 8)
+					| (((uint)Error2) << 16)
+					| (((uint)Error3) << 24);
+				return (NtStatus)unchecked((int)code);
+			} else {
+				return NtStatus.CodeNotMapped;
+			}
+		}
+		
+		public string! GetErrorText()
+		{
+			return SmbProtocol.GetErrorText(this.ErrorClass, this.Error1 | ((ushort)Error2 << 8));
+		}
+		
+		public int SmbMessageLength
+		{
+			get ensures result >= 0;
+			{
+				return (((int)this.FrameLength1) << 16)
+					| (((int)this.FrameLength2) << 8)
+					| ((int)this.FrameLength3);
+			}
+			
+			set requires value >= 0;
+			{
+				this.FrameLength0 = 0;
+				this.FrameLength1 = (byte)((value >> 16) & 0xff);
+				this.FrameLength2 = (byte)((value >> 8) & 0xff);
+				this.FrameLength3 = (byte)(value & 0xff);
+			}
+		}
+		
+
+		public bool IsRequest
+		{
+			get { return (this.Flags1 & (byte)SmbFlag1.IsResponse) == 0; }
+		}
+		
+		public bool IsResponse
+		{
+			get { return (this.Flags1 & (byte)SmbFlag1.IsResponse) != 0; }
+		}
+		
+		public int TotalMessageLength
+		{
+			get { return this.SmbMessageLength + 4; }
+			
+			set
+				requires value >= 4;
+				{ this.SmbMessageLength = value - 4; }
+		}
+		
+		public void Prepare(SmbCommand command, int parameterCount)
+			requires parameterCount >= 0;
+			requires parameterCount < 256;
+		{
+			this.SetSignature();
+			this.Command = (byte)command;
+			this.ParameterCount = (byte)parameterCount;
+		}
+		
+		public const int FramingHeaderLength = 4;
+	}
+}
diff --git a/base/Services/Smb/Protocol/SmbMessages.sg b/base/Services/Smb/Protocol/SmbMessages.sg
new file mode 100644
index 0000000..c5b6fb0
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbMessages.sg
@@ -0,0 +1,349 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Utils;
+
+namespace Smb.Protocol
+{
+	#region SMB Requests
+	// This region contains structures that define many of the SMB requests that we use,
+	// and the responses that we will receive from servers.  Each request begins with
+	// an instance of SmbHeader.
+	
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbNegotiateRequest
+    {
+		public SmbHeader Header;
+		public ushort ByteCount;
+		// repeated sets of dialect strings follow
+    }
+    
+    public static class SmbDialect
+    {
+        public const string PcNetworkProgram = "PC NETWORK PROGRAM 1.0";
+        public const string Lanman1 = "LANMAN1.0";
+        public const string WindowsForWorkgroups = "Windows for Workgroups 3.1a";
+        public const string LM1_2x002 = "LM1.2X002";
+        public const string NTLM012 = "NT LM 0.12";
+    }
+
+    [Flags]
+    public enum SmbNegotiateSecurityMode : byte
+    {
+        SupportsUserShareLevel = (1 << 0),
+        SupportsChallengeResponseAuthentication = (1 << 1),
+        SecuritySignaturesEnabled = (1 << 2),
+        SignaturesRequired = (1 << 3),
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbNegotiateResponse17
+    {
+		public SmbHeader Header;
+		public ushort DialectIndex;
+		public byte SecurityMode;
+		public ushort MaxMpxCount;
+		public ushort MaxNumberVcs;
+		public uint MaxBufferSize;
+		public uint MaxRawSize;
+		public uint SessionKey;
+		public uint Capabilities;
+		public uint SystemTimeLow;
+		public uint SystemTimeHigh;
+		public ushort ServerTimeZone;
+		public byte EncryptionKeyLength;
+		
+		// this field is not included in the parameter count
+		public ushort ByteCount;
+		
+		// If the negotiate response is NOT using extended security, then the
+		// following variable-length fields come next:
+		//
+		// char OemDomainName[]
+    }
+    
+    
+  /*  
+typedef struct _REQ_SESSION_SETUP_ANDX {
+    UCHAR WordCount;                    // Count of parameter words = 10
+    UCHAR AndXCommand;                  // Secondary (X) command; 0xFF = none
+    UCHAR AndXReserved;                 // Reserved (must be 0)
+    _USHORT( AndXOffset );              // Offset to next command WordCount
+    _USHORT( MaxBufferSize );           // Consumer's maximum buffer size
+    _USHORT( MaxMpxCount );             // Actual maximum multiplexed pending requests
+    _USHORT( VcNumber );                // 0 = first (only), nonzero=additional VC number
+    _ULONG( SessionKey );               // Session key (valid iff VcNumber != 0)
+    _USHORT( PasswordLength );          // Account password size
+    _ULONG( Reserved );
+    _USHORT( ByteCount );               // Count of data bytes; min = 0
+    UCHAR Buffer[1];                    // Buffer containing:
+    //UCHAR AccountPassword[];          //  Account Password
+    //UCHAR AccountName[];              //  Account Name
+    //UCHAR PrimaryDomain[];            //  Client's primary domain
+    //UCHAR NativeOS[];                 //  Client's native operating system
+    //UCHAR NativeLanMan[];             //  Client's native LAN Manager type
+} REQ_SESSION_SETUP_ANDX;
+typedef REQ_SESSION_SETUP_ANDX SMB_UNALIGNED *PREQ_SESSION_SETUP_ANDX;
+
+
+This is the "old school" SessionSetupAndX.  Length of parameter block is 11.
+*/
+    [StructLayout(LayoutKind.Explicit, Size=22, Pack=1)]
+    pointerfree struct SessionSetupAndX_Old
+    {
+		// Parameter block, including the AndX data
+		[FieldOffset(0)] public byte AndXCommand;
+		[FieldOffset(1)] public byte AndXPadding;
+		[FieldOffset(2)] public ushort AndXOffset;
+		[FieldOffset(4)] public ushort MaxBufferSize;
+		[FieldOffset(6)] public ushort MaxMpxCount;
+		[FieldOffset(8)] public ushort VcNumber;
+		[FieldOffset(10)] public ushort SessionKey0;
+		[FieldOffset(12)] public ushort SessionKey1;
+		[FieldOffset(14)] public ushort PasswordLength;
+		[FieldOffset(16)] public ushort Reserved0;
+		[FieldOffset(18)] public ushort Reserved1;
+		[FieldOffset(20)] public ushort ByteCount;
+		// variable-length data follows
+		
+		public const int SizeOf = 22;
+		// public const int ParameterCount = 10;
+    }
+    
+  /*  
+Client Request
+==============================	Description
+=====================================
+UCHAR WordCount;	Count of parameter words = 12
+UCHAR AndXCommand;	Secondary (X) command;  0xFF = none
+UCHAR AndXReserved;	Reserved (must be 0)
+USHORT AndXOffset;	Offset to next command WordCount
+USHORT MaxBufferSize;	Client's maximum buffer size
+USHORT MaxMpxCount;	Actual maximum multiplexed pending requests
+USHORT VcNumber;	0 = first (only), nonzero=additional VC number
+ULONG SessionKey;	Session key (valid iff VcNumber != 0)
+USHORT SecurityBlobLength;	Length of opaque security blob
+ULONG Reserved;	must be 0
+ULONG Capabilities;	Client capabilities
+USHORT ByteCount;	Count of data bytes;    min = 0
+UCHAR SecurityBlob[]	The opaque security blob
+STRING NativeOS[];	Client's native operating system, Unicode
+STRING NativeLanMan[];	Client's native LAN Manager type, Unicode
+
+
+NetMon interprets this as the payload being NTLMSSP
+
+
+*/
+
+	[StructLayout(LayoutKind.Explicit, Size=22, Pack=1)]
+	pointerfree struct SessionSetupAndX_12
+	{
+		// Parameter block, including the AndX data
+		[FieldOffset(0)] public byte AndXCommand;
+		[FieldOffset(1)] public byte AndXPadding;
+		[FieldOffset(2)] public ushort AndXOffset;
+		
+		[FieldOffset(4)] public ushort MaxBufferSize;
+		[FieldOffset(6)] public ushort MaxMpxCount;
+		
+		[FieldOffset(8)] public ushort VcNumber;
+		[FieldOffset(10)] public ushort SessionKey0;
+		
+		[FieldOffset(12)] public ushort SessionKey1;
+		[FieldOffset(14)] public ushort SecurityBlobLength;
+		
+		[FieldOffset(16)] public ushort Reserved0;
+		[FieldOffset(18)] public ushort Reserved1;
+		
+		[FieldOffset(20)] public uint Capabilities;
+
+		[FieldOffset(24)] public ushort ByteCount;
+		
+		// variable-length data follows
+		// byte[] SecurityBlob;
+		// char[] NativeOS;					// in Unicode
+		// char[] NativeLanMan;				// in Unicode
+		
+		
+		public const int SizeOf = 26;
+		public const int ParameterCount = 12;
+	}
+
+
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbSessionSetupAndXResponse
+	{
+		public SmbHeader Header;
+		public byte AndXCommand;
+		public byte AndXReserved;
+		public ushort AndXOffset;
+		public ushort Action;
+		public ushort ByteCount;
+		// string NativeOS
+		// string NativeLanMan
+		// string PrimaryDomain		
+	}
+
+	/*
+	
+	This structure is used with the "NT LM 0.12" dialect.
+	It indicates that the client wants to setup a session, and does not want to use "extended security".
+	Extended security uses SPNEGO, which is a general security token exchange mechanism, described in
+	RFC 2478.  This SESSION SETUP message can either use cleartext passwords (bad!), or can use NTLM
+	challenge/response messages.  The LM hash response is stored in the CaseInsensitivePassword field,
+	and the NT hash response (marginally more secure) is stored in the CaseSensitivePassword field.
+	
+	*/
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbSessionSetupAndXRequest13
+	{
+		public SmbHeader Header;
+	
+		// Parameter block, including the AndX data
+		public byte AndXCommand;
+		public byte AndXPadding;
+		public ushort AndXOffset;
+		public ushort MaxBufferSize;
+		public ushort MaxMpxCount;
+		public ushort VcNumber;
+		public uint SessionKey;
+		public ushort CaseInsensitivePasswordLength;
+		public ushort CaseSensitivePasswordLength;
+		public uint Reserved;
+		public uint Capabilities;
+		public ushort ByteCount;
+		
+		// byte zero padding; // this is here to pad Unicode to 2-byte boundary if necessary
+		// STRING AccountName;
+		// STRING PrimaryDomain;
+		// STRING NativeOS;
+		// STRING NativeLanMan;
+
+		
+		// variable-length data follows
+		// byte[] SecurityBlob;
+		// char[] NativeOS;					// in Unicode
+		// char[] NativeLanMan;				// in Unicode
+		
+		public const int ParameterCount = 13;
+	}
+
+
+
+    
+    
+/*
+typedef struct _REQ_NT_SESSION_SETUP_ANDX {
+    UCHAR WordCount;                    // Count of parameter words = 13
+    UCHAR AndXCommand;                  // Secondary (X) command; 0xFF = none
+    UCHAR AndXReserved;                 // Reserved (must be 0)
+    _USHORT( AndXOffset );              // Offset to next command WordCount
+    _USHORT( MaxBufferSize );           // Consumer's maximum buffer size
+    _USHORT( MaxMpxCount );             // Actual maximum multiplexed pending requests
+    _USHORT( VcNumber );                // 0 = first (only), nonzero=additional VC number
+    _ULONG( SessionKey );               // Session key (valid iff VcNumber != 0)
+    _USHORT( CaseInsensitivePasswordLength );      // Account password size, ANSI
+    _USHORT( CaseSensitivePasswordLength );        // Account password size, Unicode
+    _ULONG( Reserved);
+    _ULONG( Capabilities );             // Client capabilities
+    _USHORT( ByteCount );               // Count of data bytes; min = 0
+    UCHAR Buffer[1];                    // Buffer containing:
+    //UCHAR CaseInsensitivePassword[];  //  Account Password, ANSI
+    //UCHAR CaseSensitivePassword[];    //  Account Password, Unicode
+    //UCHAR AccountName[];              //  Account Name
+    //UCHAR PrimaryDomain[];            //  Client's primary domain
+    //UCHAR NativeOS[];                 //  Client's native operating system
+    //UCHAR NativeLanMan[];             //  Client's native LAN Manager type
+} REQ_NT_SESSION_SETUP_ANDX;
+typedef REQ_NT_SESSION_SETUP_ANDX SMB_UNALIGNED *PREQ_NT_SESSION_SETUP_ANDX;
+*/    
+#if false
+	[StructLayout(LayoutKind.Explicit, Size=26, Pack=1)]
+	pointerfree struct SessionSetupAndX_Nt
+	{
+		// Parameter block, including the AndX data
+		[FieldOffset(0)] public byte AndXCommand;
+		[FieldOffset(1)] public byte AndXPadding;
+		[FieldOffset(2)] public ushort AndXOffset;
+		[FieldOffset(4)] public ushort MaxBufferSize;
+		[FieldOffset(6)] public ushort MaxMpxCount;
+		[FieldOffset(8)] public ushort VcNumber;
+		[FieldOffset(10)] public ushort SessionKey0;
+		[FieldOffset(12)] public ushort SessionKey1;
+		[FieldOffset(14)] public ushort CaseInsensitivePasswordLength;
+		[FieldOffset(16)] public ushort CaseSensensitivePasswordLength;
+		[FieldOffset(18)] public ushort Reserved0;
+		[FieldOffset(20)] public ushort Reserved1;
+		[FieldOffset(22)] public ushort Capabilities0;
+		[FieldOffset(24)] public ushort Capabilities1;
+		[FieldOffset(26)] public ushort ByteCount;
+		// variable-length data follows
+		
+		public const int SizeOf = 26;
+		public const int ParameterCount = 13;
+	}
+#endif
+
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbTreeConnectAndX
+    {
+		public SmbHeader Header;
+		public byte AndXCommand;
+		public byte AndXReserved;
+		public ushort AndXOffset;
+		public ushort Flags;
+		public ushort PasswordLength;
+		public ushort ByteCount;
+		// byte Password[];
+		// string Path;
+		// string Service;
+    }
+
+	[StructLayout(LayoutKind.Sequential)]
+    pointerfree struct AndXParameterBlock
+    {
+		public byte NextCommand;
+		public byte Padding0;
+		public ushort NextCommandOffset;
+		
+		public AndXParameterBlock(SmbCommand command, ushort offset)
+		{
+			NextCommand = (byte)command;
+			NextCommandOffset = offset;
+			Padding0 = 0;
+		}
+    }
+    
+	[Flags]
+	enum SmbCapability
+	{
+		RawMode = 0x0001,
+		MpxMode = 0x0002,
+		Unicode = 0x0004,
+		LargeFiles = 0x0008,
+		NtSmbs = 0x0010,
+		RpcRemoteApis = 0x0020,
+		NtStatus = 0x0040,
+		Level2Oplocks = 0x0080,
+		LockAndRead = 0x0100,
+		NtFind = 0x0200,
+		Dfs = 0x1000,							// This server is DFS aware
+		InfolevelPassthru = 0x2000,				// NT information level requests can pass through
+		LargeReadx = 0x4000,					// Server supports oversized READ&X on files
+		LargeWritex = 0x8000,
+	}
+	
+	
+	#endregion
+}
diff --git a/base/Services/Smb/Protocol/SmbProtocol.sg b/base/Services/Smb/Protocol/SmbProtocol.sg
new file mode 100644
index 0000000..9fc634c
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbProtocol.sg
@@ -0,0 +1,100 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+/*
+
+
+Virtual Circuit
+    TID
+    PID
+    FID
+
+*/
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using Microsoft.Singularity.Channels;
+using Smb.Shared;
+
+namespace Smb.Protocol
+{
+    public /*static*/ sealed class SmbProtocol
+    {
+		private SmbProtocol() {}
+		
+        public static readonly byte[] SmbSignature = { 0xff, (byte)'S', (byte)'M', (byte)'B' };
+        public const int NativeFileServicePort = 445;
+        public const int NbtVirtualCircuitPort = 139;
+        
+        		
+		public const int SmbHeaderSize = 37; // 0x1d; // sizeof(SmbHeader);
+		
+        /// <summary>
+        /// Facility code for use in NTSTATUS values.
+        /// </summary>
+        public const uint SmbErrorFacilityCode = 0x00980000;
+
+        public static bool IsSuccess(SmbError error)
+        {
+            return ((uint)error & 0x80000000) == 0;
+        }
+
+        public static bool IsError(SmbError error)
+        {
+            return ((uint)error & 0x80000000) != 0;
+        }
+
+        public static SmbError ToSmbError(byte errorClass, ushort code)
+        {
+            switch ((SmbErrorClass)errorClass)
+            {
+                case SmbErrorClass.Success:
+                    return SmbError.Success;
+
+                case SmbErrorClass.FileServer:
+                    return (SmbError)((uint)SmbNtErrorClass.FileServer | code);
+                    
+                case SmbErrorClass.OperatingSystem:
+                    return (SmbError)((uint)SmbNtErrorClass.Dos | code);
+
+                case SmbErrorClass.HardwareError:
+                    return (SmbError)((uint)SmbNtErrorClass.Hardware | code);
+
+                default:
+                    return (SmbError)((uint)SmbNtErrorClass.Unrecognized | code);
+            }
+        }
+
+        public static string! GetErrorText(byte errorClass, int code)
+        {
+			return GetErrorText((SmbErrorClass)errorClass, code);
+        }
+        
+        public static string! GetErrorText(SmbErrorClass errorClass, int code)
+        {
+            switch (errorClass)
+            {
+                case SmbErrorClass.Success:
+                    return "Success." + ((SmbSuccessMessage)code).ToString();
+
+                case SmbErrorClass.OperatingSystem:
+                    return "OperatingSystem." + ((SmbOsError)code).ToString();
+
+                case SmbErrorClass.FileServer:
+                    return "FileServer." + ((SmbFileServerError)code).ToString();
+
+                case SmbErrorClass.Unrecognized:
+                    return "Unrecognized:" + code;
+
+                case SmbErrorClass.HardwareError:
+                    return "Hardware." + ((SmbHardwareError)code).ToString();
+
+                default:
+                    return "UNKNOWN CLASS " + errorClass + " CODE " + code;
+            }
+        }
+    }
+}
diff --git a/base/Services/Smb/Protocol/SmbTransaction2.sg b/base/Services/Smb/Protocol/SmbTransaction2.sg
new file mode 100644
index 0000000..21c48ac
--- /dev/null
+++ b/base/Services/Smb/Protocol/SmbTransaction2.sg
@@ -0,0 +1,226 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+using Utils;
+
+namespace Smb.Protocol
+{
+    // Codes for the Setup[0] field of SMB_TRANS2
+    enum SmbTransaction2Code
+    {
+		Open = 0,
+		FindFirst = 1,
+		FindNext = 2,
+		QueryFsInformation = 3,
+		Reserved = 4, // SetFsInformation = 4,
+		QueryPathInformation = 5,
+		SetPathInformation = 6,
+		QueryFileInformation = 7,
+		SetFileInformation = 8,
+		FsControl = 9,
+		IoControl = 0xa,
+		FindNotifyFirst = 0xb,
+		FindNotifyNext = 0xc,
+		CreateDirectory = 0xd,
+		SessionSetup = 0xe,
+		GetDfsReferral = 0x10,
+		ReportDfsInconsistency = 0x11,
+    }
+    
+    // This structure describes the SMB_COM_TRANSACTION2 message header.
+    // This is described in [1] page 32.
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbTransaction2Request
+    {
+		public SmbHeader Header;
+		public SmbTransaction2RequestHeader Transaction;
+	}
+	
+    // This structure describes the SMB_COM_TRANSACTION2 message header.
+    // This is described in [1] page 32.
+    // Note that the alignment of this structure is "sane", unlike that of SmbHeader.
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbTransaction2RequestHeader
+    {
+		// public const SmbCommand Command = SmbCommand.Transaction2;
+		// public SmbHeader Header;
+		
+		// public const byte ParameterCount = 14 + SetupCount;
+		// The ParameterCount field in SmbHeader needs to be set to 14 + SetupCount.
+		public const int HeaderParameterCount = 14;
+		
+		public ushort TotalParameterCount;				// Total parameter bytes being sent
+		public ushort TotalDataCount;					// Total data bytes being sent
+		public ushort MaxParameterCount;				// Max parameter bytes to return
+		public ushort MaxDataCount;						// Max data bytes to return
+		public byte MaxSetupCount;						// Max setup words to return
+		public byte Reserved;							// zero
+		public ushort Flags;							// bit 0 - Disconnect TID
+		public uint Timeout;							//
+		public ushort Reserved2;						// zero
+		public ushort ParameterCount;					// Parameter bytes sent this buffer
+		public ushort ParameterOffset;					// Offset (from header start) to Parameters
+		public ushort DataCount;						// Data bytes sent this buffer
+		public ushort DataOffset;						// Offset (from header start) to data
+		public byte SetupCount;							// Count of setup words
+		public byte Reserved3;							// zero
+		public ushort Setup0;							// setup word 0, which is usually the transaction code
+		// public ushort[] Setup[SetupCount];			// Setup words (# = SetupWordCount)
+		// public ushort ByteCount;
+		// STRING Name[];								// must be null
+		// byte Pad[];									// Pad to SHORT or LONG
+		// byte Parameters[ParameterCount];				// parameter bytes
+		// byte Pad1[];									// Pad to SHORT or LONG
+		// byte Data[DataCount];						// Data bytes (# = DataCount)
+    }
+
+
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbTransaction2ResponseHeader
+	{
+		public ushort TotalParameterCount;
+		public ushort TotalDataCount;
+		public ushort Reserved;
+		public ushort ParameterCount;
+		public ushort ParameterOffset;
+		public ushort ParameterDisplacement;
+		public ushort DataCount;
+		public ushort DataOffset;
+		public ushort DataDisplacement;
+		public ushort Fid;
+		public ushort ByteCount;
+		
+		// byte Pad[];
+		// byte Parameters[ParameterCount];
+		// byte Pad[];
+		// byte Data[];
+	}
+	
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbTransaction2Response
+	{
+		public SmbHeader Header;
+		public SmbTransaction2ResponseHeader Transaction;
+	}
+
+
+	/*
+	[StructLayout(LayoutKind.Sequential, Pack=1)]
+	pointerfree struct SmbCheckDirectoryRequest
+	{
+		public SmbComTransaction2RequestHeader TransactionHeader;
+		// WordCount = 0
+		// ByteCount = ?
+		// BufferFormat = 4
+		// STRING DirectoryPath
+	}
+	*/
+
+    // This structure describes the TRANS2_FIND_FIRST request.
+    // This request searches a directory, using a given wildcard pattern.
+	// page 99 - describes TRANS2_FIND_FIRST2
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbFindFirst2Request
+    {
+		public SmbHeader Header;
+		public SmbTransaction2RequestHeader Transaction;
+		// WordCount = 15
+		// SetupCount = 1
+		// Setup[0] = TRANS2_FIND_FIRST2 = Transaction2Code.FindFirst
+		
+    }
+    
+    [StructLayout(LayoutKind.Sequential)]
+    pointerfree struct SmbFindFirstParametersHeader
+    {
+		public ushort SearchAttributes;
+		public ushort SearchCount;
+		public ushort Flags;
+			// bit 0 - close search after this request
+			// bit 1 - close search if end of search reached
+			// bit 2 - return resume keys for each entry found
+			// bit 3 - continue search from previous ending place
+			// bit 4 - find with backup intent
+		public ushort InformationLevel; // FindFirstInformationLevel
+		public uint SearchStorageType;
+		// STRING FileName;
+		// byte Data[TotalDataCount];
+		// Data contains EA list if InformationLevel = QUERY_EAS_FROM_LIST
+    }
+    
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    pointerfree struct SmbFindFirstResponseParametersParameters
+    {
+		public ushort SearchId;
+		public ushort SearchCount;
+		public ushort EndOfSearch;
+		public ushort EaErrorOffset;
+		public ushort LastNameOffset;
+		// public byte[TotalDataCount];
+    }
+    
+    [Flags]
+    enum SmbSearchAttributes : ushort
+    {
+		ReadOnly = 1,
+		Hidden = 2,
+		System = 4,
+		Deprecated_VolumeId = 8,
+		Directory = 0x10,
+		Archive = 0x20,
+    }
+    
+    [Flags]
+    enum SmbSearchFlags : ushort
+    {
+		CloseAfterRequest = 1,
+		CloseIfLastResponse = 2,
+		ReturnResumeKeysForEachEntry = 4,
+		ResumeFromPrevious = 8,
+		BackupIntent = 0x10,
+    }
+    
+    enum SmbSearchInformationLevel
+    {
+		Standard = 1,
+		QueryEaSize = 2,
+		QueryEasFromList = 3,
+		FileDirectoryInfo = 0x101,
+		FileFullDirectoryInfo = 0x102,
+		FileNamesInfo = 0x103,
+		FileBothDirectoryInfo = 0x104,
+		FileUnix = 0x202,
+    }
+
+    [StructLayout(LayoutKind.Sequential)]    
+    pointerfree struct SmbQueryFileBasicInfo
+    {
+        public FILETIME CreationTime;
+        public FILETIME LastAccessTime;
+        public FILETIME LastWriteTime;
+        public FILETIME ChangeTime;
+        public uint Attributes;
+        public uint Padding;
+    }
+    
+    [StructLayout(LayoutKind.Sequential)]    
+    pointerfree struct SmbQueryFileStandardInfo
+    {
+        public long AllocationSize;
+        public long EndOfFile;
+        public uint NumberOfLinks;
+        public byte DeletePending;
+        public byte Directory;
+    }
+        
+}
diff --git a/base/Services/Smb/PublicContracts/SmbClient.PublicContracts.csproj b/base/Services/Smb/PublicContracts/SmbClient.PublicContracts.csproj
new file mode 100644
index 0000000..50c3f6c
--- /dev/null
+++ b/base/Services/Smb/PublicContracts/SmbClient.PublicContracts.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>SmbClient.PublicContracts</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SmbClientControl.sg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\App.targets" />
+
+</Project>
diff --git a/base/Services/Smb/PublicContracts/SmbClientControl.sg b/base/Services/Smb/PublicContracts/SmbClientControl.sg
new file mode 100644
index 0000000..c417768
--- /dev/null
+++ b/base/Services/Smb/PublicContracts/SmbClientControl.sg
@@ -0,0 +1,261 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+/*
+
+This file contains contracts and structure definitions for use with the SMB client.
+The most important contract is SmbClientControlContract, which allows processes,
+such as the SMB status / control tool, to query and display the state of an SMB
+client process, and to send control requests to the client process.
+
+*/
+
+using System;
+using Microsoft.Singularity.Channels;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Directory;
+
+namespace Smb.PublicChannels
+{
+	/*
+		This contract allows control / management tools to communicate with the
+		SMB Client Manager service.  The service is a singleton, which manages
+		(creates, configures, stops) the SMB client processes (instances of
+		SmbClient.exe).  The importer of this contract is usually net.exe.
+	*/
+	public contract SmbClientManagerContract : ServiceContract
+	{
+        out message Success();
+        
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+		in message CreateClient(SmbClientConfig config);
+		
+		in message StopClient(char[]! in ExHeap clientId);
+		
+		in message BindClient(char[]! in ExHeap clientId, ServiceContract.Exp:Start! exp);
+		
+		in message EnumClients();
+		out message ClientList(char[][]! in ExHeap clientIdList);
+		
+		out message Ok();
+		out message RequestFailed(SmbErrorCode error, char[] in ExHeap errortext);
+		
+		in message QueryClientStatus(char[]! in ExHeap clientId);
+		out message ClientStatusReport(SmbClientStatus status);
+
+		in message QueryClientConfig(char[]! in ExHeap clientId);
+		out message ClientConfigReport(SmbClientConfig status);
+
+		state Ready : one
+		{
+			CreateClient? -> CreatingClient;
+			StopClient? -> (Ok! or RequestFailed!) -> Ready;
+			EnumClients? -> (ClientList! or RequestFailed!) -> Ready;
+			BindClient? -> (Ok! or RequestFailed!) -> Ready;
+			QueryClientStatus? -> (ClientStatusReport! or RequestFailed!) -> Ready;
+			QueryClientConfig? -> (ClientConfigReport! or RequestFailed!) -> Ready;
+		}
+		
+		state CreatingClient : one {
+			Ok! -> Ready;
+			RequestFailed! -> Ready;
+		}
+		
+		public const string ManagerControlPath = "/dev/smb-client-manager";
+	}
+	
+	public enum SmbErrorCode
+	{
+		Success = 0,
+		MountPathAlreadyExists,			// a client with the same mount path already exists
+		ClientExists,			
+		AuthorizationDenied,
+		MountPathNotFound,
+		InternalError,
+		InvalidState,
+		
+	}
+
+	// Each instance of the SMB client process (smbclient.exe) registers an instance of this
+	// endpoint, usually as /dev/smb.xxx, where xxx is some arbitrary unique identifier.
+	// This contract allows control / management tools, such as smb.exe, to query and display
+	// information about running SMB clients, to send control requests to them (e.g. reconnect),
+	// and to terminate (unmount) them.
+	//
+	// Note: This contract will be eliminated, and its equivalent control functions will be moved
+	// to SmbClientManagerContract.
+	public contract SmbClientControlContract : ServiceContract
+	{
+	#if false
+		// This method polls the status of the client.  The status can change
+		// over time.
+		in message GetStatus();
+		out message StatusReport(SmbClientStatus status);
+		
+		// This method polls the configuration of the client.  The configuration
+		// does not (currently) change over time.
+		in message GetConfig();
+		out message ConfigReport(SmbClientConfig config);
+	#endif
+		
+		// This method requests that the client disconnect from the remote
+		// server (if it is connected), terminate all channel service threads,
+		// and terminate the process.
+		in message Terminate();
+		out message AckTerminate();
+		
+		// This method disconnects the client from the remote server.
+		// The client does not terminate.  If the client receives any
+		// requests (from local processes), then the client will attempt
+		// to reconnect to the server.
+		in message Disconnect();
+		out message AckDisconnect();
+
+		// This method disconnects the client and attempts to reconnect.		
+		in message Reconnect();
+		out message AckReconnect();
+		
+        out message Success();
+        
+        override state Start: one {
+            Success! -> Ready;
+        }
+
+		state Ready : one
+		{
+		#if false
+			GetStatus? -> StatusReport! -> Ready;
+			GetConfig? -> ConfigReport! -> Ready;
+		#endif
+			Terminate? -> AckTerminate! -> Terminating;
+			Disconnect? -> AckDisconnect! -> Ready;
+			Reconnect? -> AckReconnect! -> Ready;
+		}
+		
+		state Terminating : one
+		{
+		}
+	}
+
+	public enum SmbClientConnectionStatus
+	{
+		Invalid = 0,
+		Disconnected,				// no activity, so we are not connected
+		TransportConnecting,		// we're trying to establish connectivity at the transport level (TCP/IP or NBT)
+		Negotiating,				// transport is connected, now doing SMB negotiation, SESSION SETUP, etc.
+		Authenticating,				//
+		Connected,					// connected and ready to use
+	}
+	
+	public enum SmbReasonDisconnected
+	{
+		Invalid = 0,
+		Idle,						// no one has asked to connect to the server yet
+		TransportConnectFailed,		// failed to connect
+		NegotiationFailed,			// SMB-level negotiation failed
+		ResourceConnectFailed,		// SMB server rejected TreeConnect
+		AuthenticationFailed,		// failed to prove identity
+		AuthorizationFailed,		// authenticated, but user is not authorized to use resource
+		NoResponse,					// no response to transport-level messages; assuming server is dead or unreachable
+		ProtocolViolation,			// received invalid SMB messages
+		TransportFailure,			// transport failure of some kind, after successful connection
+	}
+
+	// This structure describes the configuration of the SMB client.	
+	// It represents the "goal state" of the client.
+	// The client will attempt to connect and service SMB requests, using
+	// this configuration information.  If any errors occur (TCP-level
+	// connection failures, authentication failures, etc.), then the
+	// client will periodically retry the connection.
+	public rep struct SmbClientConfig : ITracked
+	{
+		public char[]! in ExHeap UncPath;			// UNC of resource, such as \\foo\bar
+		public char[]! in ExHeap MountPath;			// local mount path, e.g. /share, implements DirectoryServiceContract
+		public char[]! in ExHeap ControlPath;		// local path of SmbClientControlContract, e.g. /dev/smb.xxx
+		public char[]! in ExHeap CredentialsName;	// auth principal name, e.g. domain\user, user@domain.com, OPTIONAL
+		public char[]! in ExHeap Tag;				// credentials tag, only set if CredentialsName != null
+	}
+	
+	// This structure describes the current status of the SMB client.
+	// The status is always sampled as a single snapshot in time, rather
+	// than having multiple round-trips to query individual fields.
+	public rep struct SmbClientStatus : ITracked
+	{
+		public SmbClientConnectionStatus ConnectionStatus;
+		public SmbReasonDisconnected ReasonDisconnected;
+		
+		// If the client successfully connects to the SMB server, then these values
+		// contain information that was received during SMB negotiation.  These values
+		// are useful for status displays.
+		public char[] in ExHeap ServerMachineName;
+		public char[] in ExHeap ServerDomainName;
+		public char[] in ExHeap ServerOperatingSystem;
+		public char[] in ExHeap ActiveCredentialsName;
+	}
+	
+	/*
+	This contract is used for communication between the SMB Client Manager service
+	(SmbClientManager) and instances SMB Client Process (SmbClient).  The SMB Client Manager
+	service is the only process that creates any instances of the SmbClient executable;
+	it uses this contract to control the SmbClient processes.  This allows detailed,
+	typed configuration information to be conveyed to the SmbClient (rather than relying
+	on command-line parameters), and also control messages (stop, etc.).
+
+	The SmbClient process uses Process.GetStartupEndpoint (at index 0) to bind to its instance
+	of SmbClientControllerContract.Exp.
+	
+	The importer of this contract is always SmbClientManager.
+	The exporter of this contract is always SmbClient.
+	*/
+	public contract SmbClientControllerContract
+	{
+		in message Configure(SmbClientConfig config);
+
+		in message Bind(ServiceContract.Exp:Start! exp);
+		
+		out message Ok();
+		out message RequestFailed(SmbErrorCode error, char[] in ExHeap optionalErrorText);
+		
+		state Created : one
+		{
+			Configure? -> Configuring;
+		}
+		
+		state Configuring : one
+		{
+			Ok! -> Running;
+			RequestFailed! -> Created;
+		}
+		
+		in message Stop();
+		
+		state Running : one
+		{
+			Bind? -> (Ok! or RequestFailed!) -> Running;
+			Stop? -> Ok! -> Stopped;
+		}
+		
+		state Stopped : one
+		{
+		}
+	}
+
+
+	public contract SmbMuxNotifier
+	{
+		in message StatusChanged(SmbClientStatus muxstate);
+		
+		out message Ack();
+		
+		state Ready : one
+		{
+			StatusChanged? -> Ack! -> Ready;
+		}
+	}
+
+}
diff --git a/base/Services/Smb/Shared/ArraySpan.sg b/base/Services/Smb/Shared/ArraySpan.sg
new file mode 100644
index 0000000..0059f8b
--- /dev/null
+++ b/base/Services/Smb/Shared/ArraySpan.sg
@@ -0,0 +1,156 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace Smb.Shared
+{
+#if ENABLE_GENERICS
+    public struct ArraySpan<T>
+    {
+        readonly T[]! _array;
+        readonly int _offset;
+        readonly int _length;
+
+        public ArraySpan(T[]! array, int offset, int length)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            if (offset < 0)
+                throw new ArgumentException("Offset cannot be negative");
+            if (length < 0)
+                throw new ArgumentException("Length cannot be negative");
+            if (offset + length > array.Length)
+                throw new ArgumentException("Offset and length identify an array span that exceeds the length of the input array.");
+
+            _array = array;
+            _offset = offset;
+            _length = length;
+        }
+
+        public ArraySpan(T[]! array)
+            : this(array, 0, array.Length)
+        {
+        }
+
+
+        public static implicit operator ArraySpan<T>(T[]! array)
+        {
+            return new ArraySpan<T>(array, 0, array.Length);
+        }
+
+
+        public T this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= _length)
+                    throw new ArgumentOutOfRangeException("index");
+                return _array[_offset + index];
+            }
+
+            set
+            {
+                if (index < 0 || index >= _length)
+                    throw new ArgumentOutOfRangeException("index");
+                _array[_offset + index] = value;
+            }
+        }
+
+        public int Length
+        {
+            get { return _length; }
+        }
+
+        public int Offset
+        {
+            get { return _offset; }
+        }
+
+        public T[]! ContainingArray
+        {
+            get { return _array; }
+        }
+
+        public override string! ToString()
+        {
+            return "[ArraySpan<" + typeof(T).Name + "> offset " + _offset + " length " + _length + "]";
+        }
+    }
+#else
+    public struct ArraySpan_byte
+    {
+        readonly byte[]! _array;
+        readonly int _offset;
+        readonly int _length;
+
+        public ArraySpan_byte(byte[]! array, int offset, int length)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            if (offset < 0)
+                throw new ArgumentException("Offset cannot be negative");
+            if (length < 0)
+                throw new ArgumentException("Length cannot be negative");
+            if (offset + length > array.Length)
+                throw new ArgumentException("Offset and length identify an array span that exceeds the length of the input array.");
+
+            _array = array;
+            _offset = offset;
+            _length = length;
+        }
+
+        public ArraySpan_byte(byte[]! array)
+            : this(array, 0, array.Length)
+        {
+        }
+
+
+        public static implicit operator ArraySpan_byte(byte[]! array)
+        {
+            return new ArraySpan_byte(array, 0, array.Length);
+        }
+
+
+        public byte this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= _length)
+                    throw new ArgumentOutOfRangeException("index");
+                return _array[_offset + index];
+            }
+
+            set
+            {
+                if (index < 0 || index >= _length)
+                    throw new ArgumentOutOfRangeException("index");
+                _array[_offset + index] = value;
+            }
+        }
+
+        public int Length
+        {
+            get { return _length; }
+        }
+
+        public int Offset
+        {
+            get { return _offset; }
+        }
+
+        public byte[]! ContainingArray
+        {
+            get { return _array; }
+        }
+
+        public override string! ToString()
+        {
+            return "[ArraySpan<byte> offset " + _offset + " length " + _length + "]";
+        }
+    }
+#endif
+
+}
diff --git a/base/Services/Smb/Shared/BufferPool.sg b/base/Services/Smb/Shared/BufferPool.sg
new file mode 100644
index 0000000..ab39d94
--- /dev/null
+++ b/base/Services/Smb/Shared/BufferPool.sg
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Smb.Shared
+{
+	class BufferPool : IDisposable
+	{
+		public BufferPool(int maxcount, int size)
+		{
+			_maxcount = maxcount;
+			_buffersize = size;
+		}
+		
+		readonly int _maxcount;
+		readonly int _buffersize;
+		readonly VContainer<byte>[]! _pool = new VContainer<byte>[0x10];
+		
+		int _readycount = 0;
+		
+		public void Recycle([Claims]byte[]! in ExHeap buffer)
+		{
+			if (_readycount < _pool.Length) {
+				VContainer<byte> container = _pool[_readycount];
+				if (container != null) {
+					container.Release(buffer);				
+				} else {
+					_pool[_readycount] = new VContainer<byte>(buffer);
+				}
+				_readycount++;				
+			} else {
+				delete buffer;
+			}
+		}
+		
+		public byte[]! in ExHeap Allocate()
+		{
+			if (_readycount> 0) {
+				byte[] in ExHeap buf = ((!)_pool[--_readycount]).Acquire();
+				return buf;
+			} else {
+				byte[]! in ExHeap buf = new[ExHeap] byte[_buffersize];
+				return buf;			
+			}
+		}
+		
+		public void Dispose()
+		{
+			for (int i = 0; i < _readycount; i++) {
+				byte[] in ExHeap! buf = ((!)_pool[i]).Acquire();
+				delete buf;
+			}
+			_readycount = 0;
+		}
+	}
+}
diff --git a/base/Services/Smb/Shared/ByteOrder.sg b/base/Services/Smb/Shared/ByteOrder.sg
new file mode 100644
index 0000000..c51650d
--- /dev/null
+++ b/base/Services/Smb/Shared/ByteOrder.sg
@@ -0,0 +1,136 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define LITTLE_ENDIAN
+
+using System;
+
+namespace Smb.Shared
+{
+	/// <summary>
+	/// <para>
+	/// This class provides static methods for swapping byte order.
+	/// You might think this was overkill for such a simple purpose -- why not just have two methods?
+	/// The reason for providing so many methods is to allow developers to document what they are doing
+	/// by choosing an appropriate method.  "x = HostToBe(y)" clearly shows that y is in big-endian,
+	/// and is being converted to host order.
+	/// </para>
+	///
+	/// <para>
+	/// I have avoided the traditional terminology of "host order" vs "network order", and instead have
+	/// used "host order", "big endian" (Be), and "little endian" (Le).  This is because not all network
+	/// protocols use big-endian order.  The TCP/IP family does, but many others do not, especially those
+	/// involving Microsoft products, such as SMB.
+	/// </para>
+	/// </summary>
+	/*static*/ sealed class ByteOrder
+	{
+		private ByteOrder() {}
+		
+		public static ushort Swap(ushort value)
+		{
+			return unchecked((ushort)((value >> 8) | (value << 8)));
+		}
+		
+		public static short Swap(short value)
+		{
+			ushort uvalue = unchecked((ushort)value);
+			return unchecked((short)((uvalue >> 8) | (uvalue << 8)));
+		}
+		
+		public static uint Swap(uint value)
+		{
+			return ((value & 0xff000000u) >> 24)
+			| ((value & 0x00ff0000u) >> 8)
+			| ((value & 0x0000ff00u) << 8)
+			| ((value & 0x000000ffu) << 24);
+		}
+		
+		public static int Swap(int value)
+		{
+			return unchecked((int)Swap((uint)value));
+		}
+		
+		public static ulong Swap(ulong value)
+		{
+			value = (value >> 32) | (value << 32);
+			value = ((value >> 16) & 0x0000ffff0000ffffUL) | ((value << 16) & 0xffff0000ffff0000UL);
+			value = ((value >>  8) & 0x00ff00ff00ff00ffUL) | ((value << 8 ) & 0xff00ff00ff00ff00UL);
+			return value;
+		}
+		
+		public static long Swap(long value)
+		{
+			ulong uvalue = unchecked((ulong)value);
+			uvalue = (uvalue >> 32) | (uvalue << 32);
+			uvalue = ((uvalue >> 16) & 0x0000ffff0000ffffUL) | ((uvalue << 16) & 0xffff0000ffff0000UL);
+			uvalue = ((uvalue >> 8 ) & 0x00ff00ff00ff00ffUL) | ((uvalue << 8 ) & 0xff00ff00ff00ff00UL);
+			return unchecked((long)uvalue);
+		}
+
+#if LITTLE_ENDIAN		
+
+		// Host order is little-endian, so these are swaps.
+		public static ushort HostToBe(ushort value) { return Swap(value); }
+		public static ushort BeToHost(ushort value) { return Swap(value); }
+		public static short HostToBe(short value) { return Swap(value); }
+		public static short BeToHost(short value) { return Swap(value); }
+		public static uint HostToBe(uint value) { return Swap(value); }
+		public static uint BeToHost(uint value) { return Swap(value); }
+		public static int HostToBe(int value) { return Swap(value); }
+		public static int BeToHost(int value) { return Swap(value); }
+		public static ulong HostToBe(ulong value) { return Swap(value); }
+		public static ulong BeToHost(ulong value) { return Swap(value); }
+		public static long HostToBe(long value) { return Swap(value); }
+		public static long BeToHost(long value) { return Swap(value); }
+		
+		// Host order is little-endian, so these are no-ops.
+		public static ushort HostToLe(ushort value) { return value; }		
+		public static ushort LeToHost(ushort value) { return value; }		
+		public static short HostToLe(short value) { return value; }
+		public static short LeToHost(short value) { return value; }
+		public static uint HostToLe(uint value) { return value; }
+		public static uint LeToHost(uint value) { return value; }
+		public static int HostToLe(int value) { return value; }
+		public static int LeToHost(int value) { return value; }
+		public static long HostToLe(long value) { return value; }
+		public static long LeToHost(long value) { return value; }
+		public static ulong HostToLe(ulong value) { return value; }
+		public static ulong LeToHost(ulong value) { return value; }
+		
+#else
+
+		// If host order is big-endian, then these are no-ops.
+		public static ushort HostToBe(ushort value) { return value; }		
+		public static ushort BeToHost(ushort value) { return value; }		
+		public static short HostToBe(short value) { return value; }
+		public static short BeToHost(short value) { return value; }
+		public static uint HostToBe(uint value) { return value; }
+		public static uint BeToHost(uint value) { return value; }
+		public static int HostToBe(int value) { return value; }
+		public static int BeToHost(int value) { return value; }
+		public static long HostToBe(long value) { return value; }
+		public static long BeToHost(long value) { return value; }
+		public static ulong HostToBe(ulong value) { return value; }
+		public static ulong BeToHost(ulong value) { return value; }
+		
+		// Host order is big-endian, so these are swaps.
+		public static ushort HostToLe(ushort value) { return Swap(value); }
+		public static ushort LeToHost(ushort value) { return Swap(value); }
+		public static short HostToLe(short value) { return Swap(value); }
+		public static short LeToHost(short value) { return Swap(value); }
+		public static uint HostToLe(uint value) { return Swap(value); }
+		public static uint LeToHost(uint value) { return Swap(value); }
+		public static int HostToLe(int value) { return Swap(value); }
+		public static int LeToHost(int value) { return Swap(value); }
+		public static ulong HostToLe(ulong value) { return Swap(value); }
+		public static ulong LeToHost(ulong value) { return Swap(value); }
+		public static long HostToLe(long value) { return Swap(value); }
+		public static long LeToHost(long value) { return Swap(value); }
+		
+#endif
+		
+	}
+}
diff --git a/base/Services/Smb/Shared/ByteReader.sg b/base/Services/Smb/Shared/ByteReader.sg
new file mode 100644
index 0000000..d56a2c8
--- /dev/null
+++ b/base/Services/Smb/Shared/ByteReader.sg
@@ -0,0 +1,330 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+namespace Smb.Shared
+{
+    public class ExByteReader
+    {
+        private int _start;
+        private int _length;
+        private int _pos;
+
+        public ExByteReader(int start, int length)
+        {
+            _start = start;
+            _length = length;
+            _pos = 0;
+        }
+
+#if false
+        public ByteReader(ArraySpan<byte> span)
+            : this(span.ContainingArray, span.Offset, span.Length)
+        {
+        }
+#endif
+
+        public int Position
+        {
+            get { return _pos; }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Position cannot be negative");
+                if (value > _length)
+                    throw new ArgumentException("Position cannot exceed length of data");
+                _pos = value;
+            }
+        }
+
+        public int Length
+        {
+            get { return _length; }
+        }
+
+        public byte ReadByte(byte[]! in ExHeap buffer)
+        {
+            if (_pos < _length)
+                return buffer[_start + _pos++];
+            else
+                throw new Exception("The buffer has ended.  Cannot read more data.");
+        }
+
+        public byte[]! ReadBytes(byte[]! in ExHeap buffer, int count)
+        {
+            if (count < 0)
+                throw new ArgumentException("Count cannot be negative.");
+            if (_pos + count > _length)
+                throw new InvalidOperationException("Attempt to read beyond end of buffer.");
+            if (count == 0)
+                return new byte[0];
+
+            byte[] result = new byte[count];
+            Bitter.ToByteArray(buffer, _pos, count, result, 0);
+            _pos += count;
+            return result;
+        }
+
+        public ulong ReadUInt64Le(byte[]! in ExHeap buffer)
+        {
+            byte b0 = ReadByte(buffer);
+            byte b1 = ReadByte(buffer);
+            byte b2 = ReadByte(buffer);
+            byte b3 = ReadByte(buffer);
+            byte b4 = ReadByte(buffer);
+            byte b5 = ReadByte(buffer);
+            byte b6 = ReadByte(buffer);
+            byte b7 = ReadByte(buffer);
+            return (ulong)b0
+                | (ulong)b1 << 8
+                | (ulong)b2 << 0x10
+                | (ulong)b3 << 0x18
+                | (ulong)b4 << 0x20
+                | (ulong)b5 << 0x28
+                | (ulong)b6 << 0x30
+                | (ulong)b7 << 0x38;
+        }
+
+        public long ReadInt64Le(byte[]! in ExHeap buffer)
+        {
+            byte b0 = ReadByte(buffer);
+            byte b1 = ReadByte(buffer);
+            byte b2 = ReadByte(buffer);
+            byte b3 = ReadByte(buffer);
+            byte b4 = ReadByte(buffer);
+            byte b5 = ReadByte(buffer);
+            byte b6 = ReadByte(buffer);
+            byte b7 = ReadByte(buffer);
+            return (long)b0
+                | (long)b1 << 8
+                | (long)b2 << 0x10
+                | (long)b3 << 0x18
+                | (long)b4 << 0x20
+                | (long)b5 << 0x28
+                | (long)b6 << 0x30
+                | (long)b7 << 0x38;
+        }
+
+        // Reads a zero-terminated string.
+        public string! ReadStringUnicode(byte[]! in ExHeap buffer)
+        {
+			StringBuilder str = new StringBuilder();
+			for (;;)
+			{
+				// Not too happy with this.
+				if (_pos + 2 > _length)
+					return str.ToString();
+					
+				char c = (char)ReadUInt16Le(buffer);
+				if (c == 0)
+					return str.ToString();
+				str.Append(c);
+			}
+        }
+
+        public uint ReadUInt32Le(byte[]! in ExHeap buffer)
+        {
+            byte b0 = ReadByte(buffer);
+            byte b1 = ReadByte(buffer);
+            byte b2 = ReadByte(buffer);
+            byte b3 = ReadByte(buffer);
+            return (UInt32)(b0 | (b1 << 8) | (b2 << 0x10) | (b3 << 0x18));
+        }
+
+        public int ReadInt32Le(byte[]! in ExHeap buffer)
+        {
+            return (int)ReadUInt32Le(buffer);
+        }
+
+        public ushort ReadUInt16Le(byte[]! in ExHeap buffer)
+        {
+            byte b0 = ReadByte(buffer);
+            byte b1 = ReadByte(buffer);
+            return (UInt16)(b0 | (b1 << 8));
+        }
+
+        public void Skip(int count)
+        {
+            if (_pos + count > _length)
+                throw new Exception("Cannot seek to requested position.");
+            _pos += count;
+        }
+
+        public Guid ReadGuid(byte[]! in ExHeap buffer)
+        {
+            byte[]! data = ReadBytes(buffer, 16);
+            return new Guid(data);
+        }
+    }
+    
+    public class ByteReader
+    {
+        private byte[]! _buffer;
+        private int _start;
+        private int _length;
+        private int _pos;
+
+        public ByteReader(byte[]! buffer, int start, int length)
+        {
+            _buffer = buffer;
+            _start = start;
+            _length = length;
+            _pos = 0;
+        }
+        
+        public ByteReader(byte[]! buffer)
+        {
+			this(buffer, 0, buffer.Length);
+        }
+
+#if false
+        public ByteReader(ArraySpan<byte> span)
+            : this(span.ContainingArray, span.Offset, span.Length)
+        {
+        }
+#endif
+
+        public int Position
+        {
+            get { return _pos; }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Position cannot be negative");
+                if (value > _length)
+                    throw new ArgumentException("Position cannot exceed length of data");
+                _pos = value;
+            }
+        }
+
+        public int Length
+        {
+            get { return _length; }
+        }
+
+        public byte ReadByte()
+        {
+            if (_pos < _length)
+                return _buffer[_start + _pos++];
+            else
+                throw new Exception("The buffer has ended.  Cannot read more data.");
+        }
+
+        public byte[]! ReadBytes(int count)
+        {
+            if (count < 0)
+                throw new ArgumentException("Count cannot be negative.");
+            if (_pos + count > _length)
+                throw new InvalidOperationException("Attempt to read beyond end of buffer.");
+            if (count == 0)
+                return new byte[0];
+
+            byte[] result = new byte[count];
+            Buffer.BlockCopy(_buffer, _pos, result, 0, count);
+            _pos += count;
+            return result;
+        }
+
+        public ulong ReadUInt64Le()
+        {
+            byte b0 = ReadByte();
+            byte b1 = ReadByte();
+            byte b2 = ReadByte();
+            byte b3 = ReadByte();
+            byte b4 = ReadByte();
+            byte b5 = ReadByte();
+            byte b6 = ReadByte();
+            byte b7 = ReadByte();
+            return (ulong)b0
+                | (ulong)b1 << 8
+                | (ulong)b2 << 0x10
+                | (ulong)b3 << 0x18
+                | (ulong)b4 << 0x20
+                | (ulong)b5 << 0x28
+                | (ulong)b6 << 0x30
+                | (ulong)b7 << 0x38;
+        }
+
+        public long ReadInt64Le()
+        {
+            byte b0 = ReadByte();
+            byte b1 = ReadByte();
+            byte b2 = ReadByte();
+            byte b3 = ReadByte();
+            byte b4 = ReadByte();
+            byte b5 = ReadByte();
+            byte b6 = ReadByte();
+            byte b7 = ReadByte();
+            return (long)b0
+                | (long)b1 << 8
+                | (long)b2 << 0x10
+                | (long)b3 << 0x18
+                | (long)b4 << 0x20
+                | (long)b5 << 0x28
+                | (long)b6 << 0x30
+                | (long)b7 << 0x38;
+        }
+
+        public uint ReadUInt32Le()
+        {
+            byte b0 = ReadByte();
+            byte b1 = ReadByte();
+            byte b2 = ReadByte();
+            byte b3 = ReadByte();
+            return (UInt32)(b0 | (b1 << 8) | (b2 << 0x10) | (b3 << 0x18));
+        }
+
+        public int ReadInt32Le()
+        {
+            return (int)ReadUInt32Le();
+        }
+
+        public ushort ReadUInt16Le()
+        {
+            byte b0 = ReadByte();
+            byte b1 = ReadByte();
+            return (UInt16)(b0 | (b1 << 8));
+        }
+
+        public void Skip(int count)
+        {
+            if (_pos + count > _length)
+                throw new Exception("Cannot seek to requested position.");
+            _pos += count;
+        }
+        
+        // Reads a zero-terminated string.
+        public string! ReadStringUnicode()
+        {
+			StringBuilder str = new StringBuilder();
+			for (;;)
+			{
+				// Not too happy with this.
+				if (_pos + 2 > _length)
+					return str.ToString();
+					
+				char c = (char)ReadUInt16Le();
+				if (c == 0)
+					return str.ToString();
+				str.Append(c);
+			}
+        }
+
+        public Guid ReadGuid()
+        {
+            byte[]! data = ReadBytes(16);
+            return new Guid(data);
+        }
+    }
+
+}
diff --git a/base/Services/Smb/Shared/ByteWriter.sg b/base/Services/Smb/Shared/ByteWriter.sg
new file mode 100644
index 0000000..4615aec
--- /dev/null
+++ b/base/Services/Smb/Shared/ByteWriter.sg
@@ -0,0 +1,249 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Singularity;
+using Microsoft.SingSharp;
+using Microsoft.Singularity.Channels;
+
+namespace Smb.Shared
+{
+    public class ByteWriter
+    {
+        byte[]! _buffer;
+        int _length;
+        int _pos;
+        
+        // requires _pos >= 0;
+        // requires _pos <= _length;
+        // requires _length <= _buffer.Length;
+
+        public ByteWriter()
+        {
+            _buffer = new byte[0x100];
+            _length = 0;
+            _pos = 0;
+        }
+
+        public int Position
+        {
+            get { return _pos; }
+            set { _pos = value; }
+        }
+
+        public int Length
+        {
+            get
+				// ensures _length >= 0;
+			{ return _length; }
+				
+            set
+				requires value >= 0;
+            {
+                if (value < 0)
+                    throw new Exception("Length cannot be negative");
+                InsureCapacity(value);
+                _length = value;
+            }
+        }
+
+        public void InsureCapacity(int capacity)
+			requires capacity >= 0;
+        {
+            if (capacity < 0)
+                throw new Exception("Capacity cannot be negative");
+
+            if (capacity <= _buffer.Length)
+                return;
+
+            int newsize = capacity * 3 / 2 + 0x20;
+            byte[] newbuffer = new byte[newsize];
+            if (_length > 0)
+                Buffer.BlockCopy(_buffer, 0, newbuffer, 0, _length);
+            _buffer = newbuffer;
+        }
+
+        public void Write(byte b)
+        {
+            if (_pos < _length)
+            {
+                _buffer[_pos++] = b;
+                return;
+            }
+
+            if (_length == _buffer.Length)
+                InsureCapacity(_length + 1);
+            _buffer[_length] = b;
+            _length++;
+            _pos = _length;
+        }
+
+        public void WriteZero(int count)
+        {
+            if (count == 0)
+                return;
+            if (count < 0)
+                throw new Exception("Count cannot be negative.");
+
+            InsureCapacity(_pos + count);
+            for (int i = 0; i < count; i++)
+                _buffer[_pos + i] = 0;
+            _pos += count;
+            if (_pos > _length)
+                _length = _pos;
+        }
+
+#if ENABLE_GENERICS
+        public void Write(ArraySpan<byte> span)
+        {
+            Write(span.ContainingArray, span.Offset, span.Length);
+        }
+#else
+        public void Write(ArraySpan_byte span)
+        {
+            Write(span.ContainingArray, span.Offset, span.Length);
+        }		
+#endif
+
+        public void Write(byte[]! data, int offset, int length)
+        {
+            if (length == 0)
+                return;
+            if (length < 0)
+                throw new Exception("Length cannot be negative.");
+            if (offset < 0)
+                throw new Exception("Index cannot be negative.");
+            if (offset + length > data.Length)
+                throw new Exception("Length and offset exceed the length of the input buffer.");
+
+            InsureCapacity(_pos + length);
+            Buffer.BlockCopy(data, offset, _buffer, _pos, length);
+            _pos += length;
+            if (_pos > _length)
+                _length = _pos;
+        }
+        
+        public void Write(ByteWriter! data)
+        {
+			Write(data._buffer, 0, data._length);
+        }
+
+        public void Write(byte[]! data)
+        {
+            Write(data, 0, data.Length);
+        }
+
+        public void WriteUInt64Le(ulong value)
+        {
+            Write((byte)(value & 0xff));
+            Write((byte)((value >> 0x08) & 0xff));
+            Write((byte)((value >> 0x10) & 0xff));
+            Write((byte)((value >> 0x18) & 0xff));
+            Write((byte)((value >> 0x20) & 0xff));
+            Write((byte)((value >> 0x28) & 0xff));
+            Write((byte)((value >> 0x30) & 0xff));
+            Write((byte)((value >> 0x38) & 0xff));
+        }
+
+        public void WriteUInt32Le(uint value)
+        {
+            Write((byte)(value & 0xff));
+            Write((byte)((value >> 8) & 0xff));
+            Write((byte)((value >> 16) & 0xff));
+            Write((byte)((value >> 24) & 0xff));
+        }
+
+        public void WriteUInt16Le(ushort value)
+        {
+            Write((byte)(value & 0xff));
+            Write((byte)((value >> 8) & 0xff));
+        }
+
+
+
+        /*
+        typedef struct _STRING32 {
+            USHORT   Length;
+            USHORT   MaximumLength;
+            ULONG  Buffer;
+        } STRING32;
+        typedef STRING32 *PSTRING32;
+        */
+
+        // This writes a STRING32 header into the buffer at the specified position
+        // offset - the offset of the string data (somewhere else)
+        // length - the total length
+        public void WriteCountedHeader(int offset, int length)
+        {
+            WriteUInt16Le((ushort)length); // Length
+            WriteUInt16Le((ushort)length); // MaximumLength
+            WriteUInt16Le((ushort)offset);
+            WriteUInt16Le(0);
+        }
+
+
+        public byte[]! ToArray()
+        {
+            byte[]! result = new byte[_length];
+            Buffer.BlockCopy(_buffer, 0, result, 0, _length);
+            return result;
+        }
+
+        public byte[]! in ExHeap ToArrayEx()
+        {
+            return Bitter.FromByteArray(_buffer, 0, _length);
+        }
+        
+        public void CopyTo(byte[]! in ExHeap dest, int dest_offset, int src_offset, int length)
+			requires dest_offset >= 0;
+			requires length >= 0;
+			requires dest_offset + length <= dest.Length;
+			requires src_offset >= 0;
+			requires src_offset + length <= Length;
+        {
+			Bitter.FromByteArray(dest, dest_offset, length, _buffer, 0);
+        }
+
+		public void CopyTo(byte[]! in ExHeap dest, int dest_offset)
+			requires dest_offset >= 0;
+			// requires dest_offset + _length <= dest.Length;
+		{
+			Bitter.FromByteArray(dest, dest_offset, _length, _buffer, 0);
+		}        
+
+        public void WriteStringUnicode(string! text, bool terminate)
+		{
+			for (int i = 0; i < text.Length; i++) {
+				char c = text[i];
+				Write((byte)(c & 0xff));
+				Write((byte)(c >> 8));
+			}
+
+            if (terminate)
+            {
+                Write((byte)0);
+                Write((byte)0);
+            }
+		}
+
+        public void WriteStringAscii(string! text, bool terminate)
+        {
+            for (int i = 0; i < text.Length; i++)
+            {
+                char c = text[i];
+                Write((byte)(c & 0xff));
+            }
+
+            if (terminate)
+            {
+                Write((byte)0);
+            }
+        }
+        
+	}
+
+}
diff --git a/base/Services/Smb/Shared/DirectoryUtils.sg b/base/Services/Smb/Shared/DirectoryUtils.sg
new file mode 100644
index 0000000..897db44
--- /dev/null
+++ b/base/Services/Smb/Shared/DirectoryUtils.sg
@@ -0,0 +1,137 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+
+namespace Smb.Shared
+{
+	class DirectoryUtil
+	{
+		public static void BindService(string! path, [Claims]ServiceContract.Exp! service_exp)
+		{
+            DirectoryServiceContract.Imp! rootds = DirectoryService.NewClientEndpoint();
+			
+			char[]! in ExHeap expath = Bitter.FromString2(path);
+			
+			rootds.SendBind(expath, service_exp);
+			switch receive
+			{
+				case rootds.AckBind():
+					// SmbDebug.WriteLine("Successfully bound to service: " + path);
+					delete rootds;
+					break;
+					
+				case rootds.NakBind(ServiceContract.Exp:Start exp, ErrorCode code):
+					if (exp != null)
+						delete exp;
+					delete rootds;
+					throw new Exception(String.Format("The request to bind to the service '{0}' failed.  "
+						+ "The directory service refused the bind request: {1}.",
+						path, SdsUtils.ErrorCodeToString(code)));
+						
+				case rootds.NakBindReparse(char[]! in ExHeap expath_out, char[] in ExHeap rest, bool linkFound, ServiceContract.Exp:Start! exp):
+					delete expath_out;
+					if (rest != null)
+						delete rest;
+					delete exp;
+					delete rootds;
+					throw new Exception(String.Format("The request to bind to the service '{0}' failed.  "
+						+ "The directory service returned a reparse request, which is not currently supported.", path));
+					
+				case rootds.ChannelClosed():
+					delete rootds;
+					throw new Exception(String.Format("The request to bind to the service '{0}' failed.  The directory service closed the channel.", path));
+					
+				case unsatisfiable:
+					delete rootds;
+					throw new Exception(String.Format("The request to bind to the service '{0}' failed.  The select is unsatisfiable.", path));
+			}
+			
+			#if false
+			SmbDebug.WriteLine("Waiting for service to indicate that it is ready...");
+			switch receive
+			{
+				case service_imp.Ready():
+					SmbDebug.WriteLine("Service indicates it is ready.");
+					break;
+					
+				case service_imp.ChannelClosed():
+					throw new Exception(String.Format("The request to bind to service '{0}' failed.  The service closed the channel without indicating that it was ready.", path));
+					
+				case unsatisfiable:
+					throw new Exception(String.Format("The request to bind to service '{0}' failed.  The service closed the channel without indicating that it was ready.", path));
+			}
+			#endif
+		}
+		
+		public static ServiceProviderContract.Exp! RegisterService(string! path)
+		{
+			ServiceProviderContract.Imp! service_provider_imp;
+			ServiceProviderContract.Exp! service_provider_exp;
+			ServiceProviderContract.NewChannel(out service_provider_imp, out service_provider_exp);
+			try {
+				RegisterService(path, service_provider_imp);
+				return service_provider_exp;
+			} catch (Exception ex) {
+				delete service_provider_exp;
+				throw ex;
+			}			
+		}
+		
+		public static void RegisterService(string! path, [Claims]ServiceProviderContract.Imp! service_provider_imp)
+		{
+            DirectoryServiceContract.Imp! rootds = DirectoryService.NewClientEndpoint();
+            try
+            {
+				// DebugLine("Registering service '{0}'...", path);
+				rootds.SendRegister(Bitter.FromString2(path), service_provider_imp);
+				switch receive
+				{
+					case rootds.AckRegister():
+						// DebugLine("Successfully registered service '{0}'.", path);
+						break;
+						
+					case rootds.NakRegister(ServiceProviderContract.Imp:Start imp, ErrorCode error):
+						if (imp != null)
+							delete imp;
+						DebugLine("FAILED to register service '{0}': {1}", path, SdsUtils.ErrorCodeToString(error));
+						throw new Exception(String.Format("The service '{0}' could not be registered: {1}", path, SdsUtils.ErrorCodeToString(error)));
+						
+					case rootds.NakRegisterReparse(char[]! in ExHeap expath, char[]! in ExHeap rest, bool linkFound, ServiceProviderContract.Imp:Start! imp):
+						delete expath;
+						delete rest;
+						delete imp;
+						throw new Exception(String.Format("The service '{0}' could not be registered.  Reparse points are not yet supported.", path));						
+					
+					case rootds.ChannelClosed():
+						throw new Exception(String.Format("The service '{0}' could not be registered.  The directory service closed its channel without responding.", path));
+						
+					case unsatisfiable:
+						throw new Exception(String.Format("The service '{0}' could not be registered.  Unsatisfiable select.", path));
+				}
+            }
+            finally
+            {
+				delete rootds;
+            }
+		}
+		
+		static void DebugLine(string msg)
+		{
+			DebugStub.WriteLine("DirectoryUtils: " + msg);
+		}
+		
+		static void DebugLine(string format, params object[] args)
+		{
+			DebugStub.WriteLine("DirectoryUtils: " + String.Format(format, args));
+		}
+	}
+
+}
diff --git a/base/Services/Smb/Shared/NetUtil.sg b/base/Services/Smb/Shared/NetUtil.sg
new file mode 100644
index 0000000..af3a657
--- /dev/null
+++ b/base/Services/Smb/Shared/NetUtil.sg
@@ -0,0 +1,175 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#pragma warning disable 0618
+
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Net.IP;
+using System.Net.Sockets;
+using System.Collections;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using NetStack.Contracts;
+using NetStack.Channels.Public;
+
+namespace Smb.Shared
+{
+	class NetUtil
+	{
+		public static TcpContract.Imp:ReadyState! BindTcp()
+		{
+			TcpContract.Imp! tcp_imp;
+			TcpContract.Exp! tcp_exp;
+			TcpContract.NewChannel(out tcp_imp, out tcp_exp);
+			try {
+				DirectoryUtil.BindService(TcpContract.ModuleName, tcp_exp);
+				tcp_imp.RecvReady();
+				return tcp_imp;
+			} catch (Exception ex) {
+				delete tcp_imp;
+				throw ex;
+			}
+		}
+		
+        public static TcpConnectionContract.Imp:ReadyState! CreateTcpConnection()
+        {
+            TcpContract.Imp! tcp = BindTcp();
+            
+            TcpConnectionContract.Imp! connection_imp;
+            TcpConnectionContract.Exp! connection_exp;
+            TcpConnectionContract.NewChannel(out connection_imp, out connection_exp);
+
+            tcp.SendCreateTcpSession(connection_exp);
+            
+            switch receive
+            {
+				case tcp.Ack():
+					delete tcp;
+					connection_imp.RecvReady();
+					// DebugStub.WriteLine("Successfully created TCP connection.");
+					return connection_imp;
+				
+				case tcp.ChannelClosed():
+					delete tcp;
+					throw new Exception("A TCP connection could not be created.  The TCP module closed its channel.");
+					
+				case unsatisfiable:
+					delete tcp;
+					throw new Exception("A TCP connection could not be created.  Unsatisfiable select.");
+            }
+        }
+        
+        public static TcpConnectionContract.Imp:Connected! ConnectAny(string! hostname, int port)
+        {
+			try {
+				IPv4 ip_address;
+				
+				if (IPv4.Parse(hostname, out ip_address)) {
+					// A single address.
+					return Connect((uint)ip_address, port);
+				}
+				IPHostEntry hostentry = Dns.GetHostByName(hostname);
+				
+				if (hostentry == null)
+					throw new Exception("DNS resolution failed.");
+
+				IPAddress[] addresses = hostentry.AddressList;
+				if (addresses == null)
+					throw new Exception("Host entry did not return addresses.");
+				
+				if (addresses.Length == 0)
+					throw new Exception("This hostname does not have any addresses.");
+					
+				if (addresses.Length == 1) {
+					return Connect((uint)((!)addresses[0]).Address, port);
+				}
+				
+				foreach (IPAddress addr in addresses) {	
+					IPAddress address = (!)addr;
+					
+					TcpConnectionContract.Imp:ReadyState! conn = CreateTcpConnection();
+					conn.SendConnect((uint)address.Address, (ushort)port);
+					
+					switch receive {
+						case conn.OK():
+							return conn;
+						
+						case unsatisfiable:
+							delete conn;
+							throw new Exception("Unsatisfiable read");
+							
+						case conn.CouldNotConnect(error):
+							delete conn;
+							continue;
+					}
+				}
+				
+				throw new Exception(String.Format("All attempts to connect to the host failed.  {0} addresses were attempted.", addresses.Length));
+	        
+			} catch(Exception ex) {
+				throw new Exception(String.Format("Failed to connect to hostname '{0}'.", hostname), ex);
+			}
+        }
+        
+        public static TcpConnectionContract.Imp:Connected! Connect(uint ipv4_address, int port)
+        {
+			TcpConnectionContract.Imp:ReadyState! conn = CreateTcpConnection();
+			
+			// The TCP/IP stack currently does not properly handle dynamic client endpoints.
+			// It will will reuse a local TCP port before it ought to.  So if you are attempting
+			// to connect to the same remote address:port as a previous connection, you'll wind 
+			// up with the exact same TCP tuple.  The remote endpoint will either reset the
+			// connection, or will simply not respond.  So, for now, we just pick a random local
+			// port, in the dynamic range.  The right thing to do is to fix the Singularity
+			// TCP/IP service; this is just a temporary work-around.
+			
+			// conn.SendBindLocalEndPoint(0, 0);
+			
+			Random rand = new Random();
+			int localPort = rand.Next(30000) + 1024;
+			conn.SendBindLocalEndPoint(0, (ushort)localPort);
+			
+			
+			switch receive {
+				case conn.OK():
+					// DebugStub.WriteLine("Socket bound");
+					break;
+					
+				case conn.InvalidEndPoint():
+					DebugStub.WriteLine("bind: InvalidEndPoint");
+					throw new Exception("The TCP/IP driver refused the bind request.");
+					
+				case conn.ChannelClosed():
+					throw new Exception("TCP/IP driver closed channel during bind!");
+			}
+			
+			conn.SendConnect(ipv4_address, (ushort)port);
+			
+			IPv4 addr = new IPv4(ipv4_address);
+			
+			switch receive {
+				case conn.OK():
+					return conn;
+				
+				case unsatisfiable:
+					delete conn;
+					throw new Exception(String.Format("Could not connect to TCP destination '{0}'.  Unsatisfiable read.", addr.ToString()));
+					
+				case conn.CouldNotConnect(error):
+					delete conn;
+					throw new Exception(String.Format("Could not connect to TCP destination '{0}:{1}': {2}", addr.ToString(), port.ToString(), TcpException.GetMessageForTcpError(error)));
+			}
+        }
+        
+        
+	}
+}
+
+
diff --git a/base/Services/Smb/Shared/NtAccessMask.sg b/base/Services/Smb/Shared/NtAccessMask.sg
new file mode 100644
index 0000000..7adaf2a
--- /dev/null
+++ b/base/Services/Smb/Shared/NtAccessMask.sg
@@ -0,0 +1,70 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Smb.Shared
+{
+	enum AccessMask : uint
+	{
+		GenericRead = 0x80000000u,
+		GenericWrite = 0x40000000u,
+		GenericExecute = 0x20000000u,
+		MaximumAllowed = 0x02000000u,
+				
+		Delete = 0x00010000,
+		ReadControl = 0x00020000,
+		WriteDac = 0x00040000,
+		WriteOwner = 0x00080000,
+		Synchronize = 0x00100000,
+
+		StandardRightsRequired = 0x000F0000u,
+		StandardRightsRead = ReadControl,
+		StandardRightsWrite = ReadControl,
+		StandardRightsExecute = ReadControl,
+		StandardRightsAll = 0x001F0000u,
+		SpecificRightsAll = 0x0000FFFFu,
+
+
+		#region File Access Rights		
+		
+		FileReadData =  0x0001 ,// file & pipe
+		FileListDirectory =  0x0001 ,// directory
+		FileWriteData =  0x0002 ,// file & pipe
+		FileAddFile =  0x0002 ,// directory
+		FileAppendData =  0x0004 ,// file
+		FileAddSubdirectory =  0x0004 ,// directory
+		FileCreatePipeInstance =  0x0004 ,// named pipe
+		FileReadEa =  0x0008 ,// file & directory
+		FileWriteEa =  0x0010 ,// file & directory
+		FileExecute =  0x0020 ,// file
+		FileTraverse =  0x0020 ,// directory
+		FileDeleteChild =  0x0040 ,// directory
+		FileReadAttributes =  0x0080 ,// all
+		FileWriteAttributes =  0x0100 ,// all
+		FileAllAccess = StandardRightsRequired | Synchronize | 0x1FF,
+		FileGenericRead = StandardRightsRead     |
+			FileReadData           |
+			FileReadAttributes     |
+			FileReadEa             |
+			Synchronize,
+
+		FileGenericWrite = StandardRightsWrite    |
+			FileWriteData          |
+			FileWriteAttributes    |
+			FileWriteEa            |
+			FileAppendData         |
+			Synchronize,
+
+		FileGenericExecute = StandardRightsExecute  |
+			FileReadAttributes     |
+			FileExecute             |
+			Synchronize,
+			
+		#endregion
+	}
+}
+
diff --git a/base/Services/Smb/Shared/NtStatus.sg b/base/Services/Smb/Shared/NtStatus.sg
new file mode 100644
index 0000000..606a8d0
--- /dev/null
+++ b/base/Services/Smb/Shared/NtStatus.sg
@@ -0,0 +1,29 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   
+//
+//  Note:
+//
+
+using System;
+
+namespace Smb.Shared
+{
+	public enum NtStatus : uint
+	{
+		Success = 0,
+		
+		NoSuchFile = 0xc000000fu,
+		
+		ObjectNameNotFound = 0xc0000034u,
+		ObjectPathNotFound = 0xc000003au,
+		
+		
+		// Not a real error code
+		CodeNotMapped = 0xc0ff0000u,
+	}
+}
diff --git a/base/Services/Smb/Shared/SmbDebug.sg b/base/Services/Smb/Shared/SmbDebug.sg
new file mode 100644
index 0000000..0acae5a
--- /dev/null
+++ b/base/Services/Smb/Shared/SmbDebug.sg
@@ -0,0 +1,189 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Smb.Protocol;
+using Smb.PublicChannels;
+
+namespace Smb.Shared
+{
+	sealed class SmbDebug
+	{
+		private SmbDebug() {}
+		
+		public static void WriteLine(string format, params object[] args)
+		{
+			WriteLine(String.Format(format, args));
+		}
+		
+		public static void WriteLine(string line)
+		{
+			DebugStub.WriteLine("SMB: " + line);
+		}
+
+		public static string! GetCommandName(SmbCommand command)
+		{
+			switch (command)
+			{
+			case SmbCommand.Negotiate: return "Negotiate";
+			case SmbCommand.CloseFile: return "CloseFile";
+			case SmbCommand.SessionSetupAndX: return "SessionSetupAndX";
+			case SmbCommand.TreeConnect: return "TreeConnect";
+			case SmbCommand.TreeConnectAndX: return "TreeConnectAndX";
+			case SmbCommand.NtCreateAndX: return "CreateAndX";
+			case SmbCommand.Transaction2: return "Transaction2";
+			case SmbCommand.DeleteFile: return "DeleteFile";
+			case SmbCommand.CreateDirectory: return "CreateDirectory";
+			case SmbCommand.DeleteDirectory: return "DeleteDirectory";
+			case SmbCommand.CheckDirectory: return "CheckDirectory";			
+			case SmbCommand.ReadAndX: return "ReadAndX";
+			case SmbCommand.WriteAndX: return "WriteAndX";
+			
+			default:
+				return String.Format("0x{0:x}", (int)command);
+			}
+		}
+		
+		public static string! GetSmbMessageSummary(byte[]! in ExHeap smb, int offset)
+		{
+			StringBuilder summary = new StringBuilder(80);
+			
+			ref SmbHeader header = ref smb[offset];
+			
+			
+			summary.Append(GetCommandName((SmbCommand)header.Command));
+			
+			if ((SmbCommand)header.Command == SmbCommand.Transaction2) {
+				if (header.IsRequest) {
+					ref SmbTransaction2Request request = ref smb[offset];
+					SmbTransaction2Code code = (SmbTransaction2Code)request.Transaction.Setup0;
+					switch (code) {
+						case SmbTransaction2Code.FindFirst: return "Transaction2.FindFirst";
+						case SmbTransaction2Code.FindNext: return "Transaction2.FindNext";
+						default:
+							return String.Format("Transaction2.0x{0:x}", (uint)code);
+					}
+				}
+			}
+			
+			summary.Append(" ");
+			
+			if (header.IsResponse && header.IsError) {
+				summary.Append(" ERROR: " + header.GetErrorText());
+			}
+				
+			return summary.ToString();		
+		}
+
+        public static void DumpMessage(byte[]! in ExHeap buffer, int offset, int length)
+        {
+			SmbDebug.WriteLine("--------------- SMB MESSAGE ----------------");        
+			Util.DumpBuffer(buffer, 0, length);
+			if (length < SmbHeader.SizeOf) {
+				SmbDebug.WriteLine("    Message is too short to be a valid SMB message!");
+				return;
+			}
+			
+			ref SmbHeader header = ref buffer[offset];
+			SmbFlag1 flags1 = (SmbFlag1)header.Flags1;
+			SmbFlag2 flags2 = (SmbFlag2)header.Flags2;
+			bool is_response = (flags1 & SmbFlag1.IsResponse) != 0;
+
+			int smbLength = ((int)header.FrameLength1 << 16) | ((int)header.FrameLength2 << 8) | ((int)header.FrameLength3);
+			
+			SmbDebug.WriteLine("    Total Length:  " + length);
+			SmbDebug.WriteLine("    SMB Length:    " + smbLength);			
+			SmbDebug.WriteLine("    Direction:     " + (is_response ? "Response":"Request"));
+			SmbDebug.WriteLine("    Command:       0x{0:x} {1}", header.Command, SmbDebug.GetCommandName((SmbCommand)header.Command));
+			SmbDebug.WriteLine("    Flags2:        " + GetFlags2Text(flags2));
+			SmbDebug.WriteLine("    Flags1:        " + GetFlags1Text(flags1));
+			SmbDebug.WriteLine("    Mux tuple:     Tid {0:x4} Pid {1:x4} Uid {2:x4} Mid {3:x4}",
+				header.TreeId,
+				header.ProcessId,
+				header.UserId,
+				header.MuxId);
+			// SmbDebug.WriteLine("    Parameters:    {0}", header.ParameterCount);
+			
+			SmbDebug.WriteLine("    Error:         {0:x2} {1:x2} {2:x2} {3:x2}",
+				header.ErrorClass,
+				header.Error1,
+				header.Error2,
+				header.Error3);
+			SmbDebug.WriteLine("");
+        }
+
+
+		public static string! GetFlags1Text(SmbFlag1 value)
+		{
+			string! text = String.Format("(0x{0:x4}) ", value);
+			
+			#pragma warning disable 0612 // [Obsolete] reference
+			if ((value & SmbFlag1.LockAndReadOk) != 0)				text += " LockAndReadOk";
+			if ((value & SmbFlag1.SendNoAck) != 0)					text += " SendNoAck";
+			if ((value & SmbFlag1.CaseInsensitive) != 0)			text += " CaseInsensitive";
+			if ((value & SmbFlag1.CanonicalizedPaths) != 0)			text += " CanonicalizedPaths";
+			if ((value & SmbFlag1.SupportsOpLocks) != 0)			text += " SupportsOpLocks";
+			if ((value & SmbFlag1.SupportsOpLockNotify) != 0)		text += " SupportsOpLockNotify";
+			if ((value & SmbFlag1.IsResponse) != 0)					text += " IsResponse";
+			
+			return text;
+		}
+
+		public static string! GetFlags2Text(SmbFlag2 value)
+		{
+			string! text = String.Format("(0x{0:x4}) ", value);
+			
+			if ((value & SmbFlag2.KnowsLongNames) != 0)				text += " KnowsLongNames";
+			if ((value & SmbFlag2.KnowsExtendedAttributes) != 0)	text += " KnowsExtendedAttributes";
+			if ((value & SmbFlag2.SupportsSecuritySignature) != 0)	text += " SupportsSecuritySignature";
+			if ((value & SmbFlag2.SecuritySignatureRequired) != 0)	text += " SecuritySignatureRequired";
+			if ((value & SmbFlag2.AllPathsAreLongNames) != 0)		text += " AllPathsAreLongNames";
+			if ((value & SmbFlag2.ReparsePath) != 0)				text += " ReparsePath";
+			if ((value & SmbFlag2.AwareOfExtendedSecurity) != 0)	text += " AwareOfExtendedSecurity";
+			if ((value & SmbFlag2.DfsNamespace) != 0)				text += " DfsNamespace";
+			if ((value & SmbFlag2.PagingIo) != 0)					text += " PagingIo";
+			if ((value & SmbFlag2.UsingNtStatus) != 0)				text += " UsingNtStatus";
+			if ((value & SmbFlag2.UnicodeStrings) != 0)				text += " UnicodeStrings";
+			
+			return text;
+		}
+
+		public static string! EnumToString(SmbClientConnectionStatus status)
+		{
+			switch (status)
+			{
+				case SmbClientConnectionStatus.Disconnected: return "Disconnected";
+				case SmbClientConnectionStatus.Negotiating: return "Negotiating";				
+				case SmbClientConnectionStatus.TransportConnecting: return "Connecting";
+				case SmbClientConnectionStatus.Authenticating: return "Authenticating";
+				case SmbClientConnectionStatus.Connected: return "Connected";
+				default: return "Unknown (" + ((int)status).ToString() + ")";
+			}
+		}		
+		
+		public static string! EnumToString(SmbReasonDisconnected reason)
+		{
+			switch (reason)
+			{
+				case SmbReasonDisconnected.Idle:					return "Idle";
+				case SmbReasonDisconnected.TransportConnectFailed:	return "Failed to connect transport";
+				case SmbReasonDisconnected.NegotiationFailed:		return "Negotiation failed";
+				case SmbReasonDisconnected.ResourceConnectFailed:	return "Resource connect rejected";
+				case SmbReasonDisconnected.AuthenticationFailed:	return "Authentication failed";
+				case SmbReasonDisconnected.AuthorizationFailed:		return "Authorization failed";
+				case SmbReasonDisconnected.NoResponse:				return "No response from server";
+				case SmbReasonDisconnected.ProtocolViolation:		return "Protocol violation";
+				case SmbReasonDisconnected.TransportFailure:		return "Transport failure";
+				default: return "Unknown (" + ((int)reason).ToString() + ")";
+			}
+		}		
+		
+
+	}
+}
diff --git a/base/Services/Smb/Shared/Util.sg b/base/Services/Smb/Shared/Util.sg
new file mode 100644
index 0000000..e4a7934
--- /dev/null
+++ b/base/Services/Smb/Shared/Util.sg
@@ -0,0 +1,426 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+
+#if ENABLE_GENERICS
+using System.Collections.Generic;
+#endif
+
+namespace Smb.Shared
+{
+	/*static*/ sealed class Util
+	{
+		private Util() {}
+
+		public static void ShowExceptionDebug(Exception! ex, string! msg)
+		{
+			DebugStub.WriteLine(msg);
+			ShowExceptionDebug(ex);
+		}
+		
+		public static void ShowExceptionDebug(Exception! ex)
+		{
+			for (Exception current = ex; current != null; current = current.InnerException) {
+				Type! exType = current.GetType();
+				DebugStub.WriteLine(String.Format("{0}: {1}", exType.FullName, ex.Message));
+			}
+		}
+
+		public static string! ToStringDelete([Claims]char[]! in ExHeap exstring)
+		{
+			string! str = Bitter.ToString2(exstring);
+			delete exstring;
+			return str;
+		}
+
+	#if ENABLE_GENERICS
+		public static T[]! GetSubArray<T>(T[]! arr, int index, int length)
+		{
+			T[] result = new T[length];
+			Array.Copy(arr, index, result, 0, length);
+			return result;
+		}
+	#else
+		public static byte[]! GetSubArray(byte[]! arr, int index, int length)
+			requires index >= 0;
+			requires index + length <= arr.Length;
+			ensures result.Length == length;
+		{
+			byte[] result = new byte[length];
+			Array.Copy(arr, index, result, 0, length);
+			return result;
+		}
+	
+	#endif
+
+		public const string HexDigits = "0123456789abcdef";
+
+		public static byte[]! HexStringToByteArray(string! str)
+		{
+			if ((str.Length % 2) != 0)
+				throw new Exception("Input string cannot be odd in length.");
+
+			byte[]! result = new byte[str.Length / 2];
+			for (int i = 0; i < result.Length; i++)
+			{
+				byte high = CharToHex(str[i * 2]);
+				byte low = CharToHex(str[i * 2 + 1]);
+				result[i] = (byte)((high << 4) | low);
+			}
+
+			return result;
+		}
+
+		/*
+		 * Stupid C#!
+		 */
+	#if ENABLE_GENERICS && false
+		static int CompareArraySpans<T>(T[] array1, int offset1, T[] array2, int offset2, int length)
+		{
+			for (int i = 0; i < length; i++)
+			{
+				T element1 = array1[i];
+				T element2 = array2[i];
+				if (element1 < element2)
+					return -1;
+				if (element1 > element2)
+					return 1;
+			}
+
+			return 0;
+		}
+	#endif
+		public static int CompareArraySpans(byte[]! array1, int offset1, byte[]! array2, int offset2, int length)
+		{
+			for (int i = 0; i < length; i++)
+			{
+				byte element1 = array1[i];
+				byte element2 = array2[i];
+				if (element1 < element2)
+					return -1;
+				if (element1 > element2)
+					return 1;
+			}
+
+			return 0;
+		}
+
+		public static void DumpBuffer(byte[]! buffer)
+		{
+			DumpBuffer(buffer, 0, buffer.Length);
+		}
+
+	#if ENABLE_GENERICS
+		public static void DumpBuffer(ArraySpan<byte> span)
+		{
+			DumpBuffer(span.ContainingArray, span.Offset, span.Length);
+		}
+	#else
+		public static void DumpBuffer(ArraySpan_byte span)
+		{
+			DumpBuffer(span.ContainingArray, span.Offset, span.Length);
+		}
+	#endif
+
+		public static void DumpBuffer(byte[]! buffer, int index, int length)
+		{
+			StringBuilder line = new StringBuilder();
+
+			for (int i = 0; i < length; i += 0x10)
+			{
+				line.Length = 0;
+				line.AppendFormat("{0:x04}: ", i);
+
+				for (int j = 0; j < 0x10; j++)
+				{
+
+					if (i + j < length)
+					{
+						line.Append(" ");
+						byte b = buffer[index + i + j];
+						line.Append((Char)HexDigits[b >> 4]);
+						line.Append((Char)HexDigits[b & 0xf]);
+					}
+					else
+					{
+						line.Append("   ");
+					}
+				}
+
+				line.Append(" : ");
+				for (int j = 0; j < 0x10; j++)
+				{
+
+					if (i + j < length)
+					{
+						byte b = buffer[index + i + j];
+						if (b >= 32 && b <= 127)
+						{
+							line.Append((Char)b);
+						}
+						else
+						{
+							line.Append(".");
+						}
+					}
+					else
+					{
+						break;
+					}
+				}
+
+				DebugStub.WriteLine(line.ToString());
+			}
+		}
+
+		public static void DumpBuffer(byte[]! in ExHeap buffer)
+		{
+			DumpBuffer(buffer, 0, buffer.Length);
+		}
+
+		public static void DumpBuffer(byte[]! in ExHeap buffer, int index, int length)
+		{
+			StringBuilder line = new StringBuilder();
+
+			for (int i = 0; i < length; i += 0x10)
+			{
+				line.Length = 0;
+				line.AppendFormat("{0:x04}: ", i);
+
+				for (int j = 0; j < 0x10; j++)
+				{
+
+					if (i + j < length)
+					{
+						line.Append(" ");
+						byte b = buffer[index + i + j];
+						line.Append((Char)HexDigits[b >> 4]);
+						line.Append((Char)HexDigits[b & 0xf]);
+					}
+					else
+					{
+						line.Append("   ");
+					}
+				}
+
+				line.Append(" : ");
+				for (int j = 0; j < 0x10; j++)
+				{
+
+					if (i + j < length)
+					{
+						byte b = buffer[index + i + j];
+						if (b >= 32 && b <= 127)
+						{
+							line.Append((Char)b);
+						}
+						else
+						{
+							line.Append(".");
+						}
+					}
+					else
+					{
+						break;
+					}
+				}
+
+				DebugStub.WriteLine(line.ToString());
+			}
+		}
+
+	#if ENABLE_GENERICS
+		public static void CheckArraySpan<T>(T[] arr, int offset, int length)
+		{
+			if (arr == null)
+				throw new Exception("Array cannot be null.");
+			if (offset < 0)
+				throw new Exception("Array offset cannot be negative.");
+			if (length < 0)
+				throw new Exception("Array span length cannot be negative.");
+			if (offset + length > arr.Length)
+				throw new Exception("Array span exceeds size of array");
+		}
+	#endif
+
+
+		static void DumpHashtable(Hashtable! table)
+		{
+			try {
+				DebugStub.WriteLine("Hashtable:");
+
+				DebugStub.WriteLine("Keys:");
+				foreach (Object key in table.Keys)
+				{
+					if (key == null)
+						DebugStub.WriteLine("    null");
+					else {
+						Type keyType = key.GetType();
+						string keyTypeName = keyType.FullName;
+						string keyText = key.ToString();
+						DebugStub.WriteLine(String.Format("    ({0}) {1}", keyTypeName, keyText));
+					}
+				}
+
+				try {
+					DebugStub.WriteLine("Keys: (from array)");
+					object[]! keys = new object[table.Keys.Count];
+					table.Keys.CopyTo(keys, 0);
+					foreach (Object key2 in keys) {
+						if (key2 == null)
+							DebugStub.WriteLine("    null");
+						else {
+							Type keyType2 = key2.GetType();
+							string keyTypeName2 = keyType2.FullName;
+							string keyText2 = key2.ToString();
+							DebugStub.WriteLine(String.Format("    ({0}) {1}", keyTypeName2, keyText2));
+						}
+					}
+				} catch (Exception ex) {
+					DebugStub.WriteLine("Fault occurred while reading keys from array.");
+					Util.ShowExceptionDebug(ex);
+				}
+
+				DebugStub.WriteLine("Values:");
+				foreach (Object value in table.Values)
+				{
+					if (value == null)
+						DebugStub.WriteLine("    null");
+					else {
+						Type valueType = value.GetType();
+						string valueTypeName = valueType.FullName;
+						string valueText = value.ToString();
+						DebugStub.WriteLine(String.Format("    ({0}) {1}", valueTypeName, valueText));
+					}
+				}
+			} catch (Exception ex) {
+				Util.ShowExceptionDebug(ex);
+			}
+		}
+	
+	
+        public static string! ByteArrayToString(byte[]! buffer, int index, int length)
+        {
+            StringBuilder sb = new StringBuilder(length * 2);
+            for (int i = 0; i < length; i++)
+            {
+                byte b = buffer[index + i];
+                sb.Append(HexDigits[b >> 4]);
+                sb.Append(HexDigits[b & 0xf]);
+            }
+            return sb.ToString();
+        }
+
+        public static string! ByteArrayToStringHex(byte[]! buffer)
+        {
+            return ByteArrayToString(buffer, 0, buffer.Length);
+        }
+
+        public static string! ByteArrayToStringBitsBe(byte[]! buffer)
+        {
+            return ByteArrayToStringBitsBe(buffer, 0, buffer.Length);
+        }
+
+        public static string! ByteArrayToStringBitsBe(byte[]! buffer, int index, int length)
+        {
+            StringBuilder sb = new StringBuilder(length * 2);
+            sb.Append("be ");
+            for (int i = 0; i < length; i++)
+            {
+                if (i > 0)
+                    sb.Append('.');
+
+                byte b = buffer[index + i];
+
+                for (int bit = 7; bit >= 0; bit--)
+                {
+                    byte value = (byte)(b & (1 << bit));
+                    sb.Append(value != 0 ? '1' : '0');
+                }
+            }
+            return sb.ToString();
+        }
+
+        public static string! ByteArrayToStringBitsLe(byte[]! buffer)
+        {
+            return ByteArrayToStringBitsLe(buffer, 0, buffer.Length);
+        }
+
+        public static string! ByteArrayToStringBitsLe(byte[]! buffer, int index, int length)
+        {
+            StringBuilder sb = new StringBuilder(length * 2);
+            sb.Append("le ");
+            for (int i = 0; i < length; i++)
+            {
+                if (i > 0)
+                    sb.Append('.');
+
+                byte b = buffer[index + i];
+
+                for (int bit = 0; bit < 8; bit++)
+                {
+                    byte value = (byte)(b & (1 << bit));
+                    sb.Append(value != 0 ? '1' : '0');
+                }
+            }
+            return sb.ToString();
+        }
+
+        static byte CharToHex(char c)
+        {
+            if (c >= '0' && c <= '9')
+                return (byte)(c - '0');
+            if (c >= 'a' && c <= 'f')
+                return (byte)(c - 'a' + 10);
+            if (c >= 'A' && c <= 'F')
+                return (byte)(c - 'A' + 10);
+            throw new ArgumentException("Invalid hex char");
+        }
+
+	
+		public static int Align4(int value)
+		{
+			return (value + 3) & ~3;
+		}
+		
+		public static int Align2(int value)
+		{
+			return (value + 1) & ~1;
+		}
+		
+		public static string! YesNoString(bool value)
+		{
+			return value ? "Yes" : "No";
+		}
+	}
+    
+	class NotImplementedException : Exception
+	{
+		public NotImplementedException()
+			: base("Not Implemented")
+		{}
+	}
+	
+	class UnsatisfiableReceiveException : Exception
+	{
+		public UnsatisfiableReceiveException()
+			: base("A 'switch receive' statement could not be satisfied.")
+		{}
+		
+		public UnsatisfiableReceiveException(string! msg)
+			: base(msg)
+		{}
+		
+	}
+
+}
diff --git a/base/Services/Smb/Smb.proj b/base/Services/Smb/Smb.proj
new file mode 100644
index 0000000..4bfaa42
--- /dev/null
+++ b/base/Services/Smb/Smb.proj
@@ -0,0 +1,14 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="Client\SmbClient.csproj"/>
+    <ProjectReference Include="ClientService\SmbClientService.csproj"/>
+    <ProjectReference Include="Control\Smb.Control.csproj"/>
+    <ProjectReference Include="PublicContracts\SmbClient.PublicContracts.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+</Project>
diff --git a/base/Services/Smb/Smb.sln b/base/Services/Smb/Smb.sln
new file mode 100644
index 0000000..2c76ffb
--- /dev/null
+++ b/base/Services/Smb/Smb.sln
@@ -0,0 +1,149 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmbClient.PrivateChannels", "PrivateContracts\SmbClient.PrivateChannels.csproj", "{83A5F7CD-2620-4250-B157-E15B0EAC2D45}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmbClient.PublicContracts", "PublicContracts\SmbClient.PublicContracts.csproj", "{320A73D0-FE2A-4454-864D-97BB997D388E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Smb", "Smb", "{C9E9C530-4606-4590-902A-21FC5C301EF9}"
+	ProjectSection(SolutionItems) = preProject
+		Makefile = Makefile
+	EndProjectSection
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.Control", "Control\SmbControl.sgproj", "{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.PrivateContracts", "PrivateContracts\PrivateContracts.sgproj", "{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.PublicContracts", "PublicContracts\PublicContracts.sgproj", "{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.ClientService", "ClientService\ClientService.sgproj", "{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.Client", "Client\Smb.Client.sgproj", "{725C5906-B421-4D78-AA81-1E3DD02DA131}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.Shared", "Shared\Smb.Shared.sgproj", "{9D2153CC-266D-484D-9777-13C9081EB7EB}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Smb.Protocol", "Protocol\Smb.Protocol.sgproj", "{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Release|.NET.ActiveCfg = Release|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{83A5F7CD-2620-4250-B157-E15B0EAC2D45}.Release|Win32.ActiveCfg = Release|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{320A73D0-FE2A-4454-864D-97BB997D388E}.Release|Win32.ActiveCfg = Release|Any CPU
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Debug|.NET.ActiveCfg = Debug|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Debug|.NET.Build.0 = Debug|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Debug|Win32.ActiveCfg = Debug|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Release|.NET.ActiveCfg = Release|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Release|.NET.Build.0 = Release|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Release|Any CPU.ActiveCfg = Release|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{ADB98D05-A8C3-419C-AA3F-A23E2A1B66A1}.Release|Win32.ActiveCfg = Release|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Debug|.NET.ActiveCfg = Debug|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Debug|.NET.Build.0 = Debug|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Debug|Win32.ActiveCfg = Debug|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Release|.NET.ActiveCfg = Release|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Release|.NET.Build.0 = Release|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Release|Any CPU.ActiveCfg = Release|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{B80B3E7B-C834-42B3-8708-7A4F5D5725FB}.Release|Win32.ActiveCfg = Release|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Debug|.NET.ActiveCfg = Debug|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Debug|.NET.Build.0 = Debug|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Debug|Win32.ActiveCfg = Debug|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Release|.NET.ActiveCfg = Release|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Release|.NET.Build.0 = Release|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Release|Any CPU.ActiveCfg = Release|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{3951F9E6-A796-4950-9CF1-9F2A9FEF90D9}.Release|Win32.ActiveCfg = Release|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Debug|.NET.ActiveCfg = Debug|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Debug|.NET.Build.0 = Debug|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Debug|Win32.ActiveCfg = Debug|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Release|.NET.ActiveCfg = Release|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Release|.NET.Build.0 = Release|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Release|Any CPU.ActiveCfg = Release|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{3FEA42BA-EB84-4AEF-9C47-247B74A5CF9E}.Release|Win32.ActiveCfg = Release|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Debug|.NET.ActiveCfg = Debug|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Debug|.NET.Build.0 = Debug|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Debug|Win32.ActiveCfg = Debug|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Release|.NET.ActiveCfg = Release|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Release|.NET.Build.0 = Release|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Release|Any CPU.ActiveCfg = Release|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{725C5906-B421-4D78-AA81-1E3DD02DA131}.Release|Win32.ActiveCfg = Release|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Debug|.NET.ActiveCfg = Debug|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Debug|.NET.Build.0 = Debug|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Debug|Win32.ActiveCfg = Debug|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Release|.NET.ActiveCfg = Release|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Release|.NET.Build.0 = Release|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Release|Any CPU.ActiveCfg = Release|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{9D2153CC-266D-484D-9777-13C9081EB7EB}.Release|Win32.ActiveCfg = Release|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Debug|.NET.ActiveCfg = Debug|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Debug|.NET.Build.0 = Debug|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Debug|Win32.ActiveCfg = Debug|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Release|.NET.ActiveCfg = Release|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Release|.NET.Build.0 = Release|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Release|Any CPU.ActiveCfg = Release|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Release|Mixed Platforms.ActiveCfg = Release|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Release|Mixed Platforms.Build.0 = Release|.NET
+		{C13F889C-ECE4-4658-8269-A8BEBFC0EF30}.Release|Win32.ActiveCfg = Release|.NET
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/base/Services/Tests/Benchmark/Benchmark.csproj b/base/Services/Tests/Benchmark/Benchmark.csproj
new file mode 100644
index 0000000..47fd991
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Benchmark.csproj
@@ -0,0 +1,20 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="*/*.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+</Project>
diff --git a/base/Services/Tests/Benchmark/Benchmark.sg b/base/Services/Tests/Benchmark/Benchmark.sg
new file mode 100644
index 0000000..eed33e9
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Benchmark.sg
@@ -0,0 +1,82 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Benchmark\Benchmark.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<ServiceProxyContract.Imp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    public class Benchmark
+    {
+        private Thread manageThread;
+        private IRunnable! manageExec;
+
+        public Benchmark([Claims]ManagedServiceContract.Exp:Start! mep,
+                         [Claims]DirectoryServiceContract.Imp:Ready! dep)
+        {
+            IRunnable serviceExec = new BenchmarkExec(dep);
+            manageExec = new ManagementExec(mep, serviceExec);
+        }
+
+        public void Start()
+        {
+            DebugStub.Print("-- Benchmark service start\n");
+            manageThread = new Thread(new ThreadStart(manageExec.Run));
+            manageThread.Start();
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    mep;
+            DirectoryServiceContract.Imp:Ready  dep;
+
+            mep = ((!)config.serviceRef).Acquire();
+            dep = ((!)config.directoryRef).Acquire();
+            if (mep == null || dep == null) {
+                delete mep;
+                delete dep;
+                return -1;
+            }
+
+            Benchmark b = new Benchmark(mep, dep);
+            b.Start();
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/Benchmark/Hoisted/BenchmarkExec.sg b/base/Services/Tests/Benchmark/Hoisted/BenchmarkExec.sg
new file mode 100644
index 0000000..ba58066
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Hoisted/BenchmarkExec.sg
@@ -0,0 +1,231 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Benchmark\Hoisted\BenchmarkExec.sg
+//
+//  Note:
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    public class BenchmarkExec : IRunnable
+    {
+        private TRef<ThreadTerminationContract.Exp:Start> signalReceiver;
+        private TRef<DirectoryServiceContract.Imp:Ready>! directoryService;
+
+        public BenchmarkExec([Claims]DirectoryServiceContract.Imp:Ready! ds)
+        {
+            directoryService = new TRef<DirectoryServiceContract.Imp:Ready>(ds);
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            signalReceiver = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        public virtual void Run()
+        {
+            ServiceProviderContract.Exp!        provider;
+            ThreadTerminationContract.Exp!      signal;
+            ESet<BenchmarkContract.Exp:Ready>   eset;
+
+            DebugStub.Print("BenchExecHoisted: Service start\n");
+
+            if (!RegisterName(BenchmarkContract.ModuleName, out provider)) {
+                delete provider;
+                return;
+            }
+
+            eset = new ESet<BenchmarkContract.Exp:Ready>();
+            assert signalReceiver != null;
+            signal = signalReceiver.Acquire();
+            for (;;) {
+                switch receive {
+                    case provider.Connect(serviceEp):
+                    {
+                        //DebugStub.Print("BenchExec: Accepting a client" +
+                        //                " connection request ... ");
+                        BenchmarkContract.Exp:Start bench = serviceEp
+                                as BenchmarkContract.Exp:Start;
+                        if (bench != null) {
+                            //DebugStub.Print("accepted.\n");
+                            provider.SendAckConnect();
+                            bench.SendSuccess();
+                            eset.Add(bench);
+                        }
+                        else {
+                            //DebugStub.Print("denied.\n");
+                            provider.SendNackConnect(serviceEp);
+                        }
+                        break;
+                    }
+                    case provider.ChannelClosed():
+                    {
+                        DebugStub.Print("BenchExec: " +
+                                        "ChannelClosed @ provider\n");
+                        goto exit;
+                        break;
+                    }
+                    case signal.Stop():
+                    {
+                        BenchmarkContract.Exp!:Ready tmp;
+                        signal.SendAckStop();
+                        for (int i = 0; i < eset.Count; i++) {
+                            eset.RecvHead(out tmp);
+                            delete tmp;
+                        }
+                        break;
+                    }
+                    case signal.ChannelClosed():
+                    {
+                        DebugStub.Print("BenchExec: ChannelClosed @ signal\n");
+                        goto exit;
+                        break;
+                    }
+                    case ep.GetCycleCount() in eset:
+                    {
+                        ep.SendCycleCount(Processor.GetCycleCount());
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Null() in eset:
+                    {
+                        ep.SendAckNull();
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.One(arg) in eset:
+                    {
+                        ep.SendAckOne(arg);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Two(arg1, arg2) in eset:
+                    {
+                        ep.SendAckTwo(arg1, arg2);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Three(arg1, arg2, arg3) in eset:
+                    {
+                        ep.SendAckThree(arg1, arg2, arg3);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Four(arg1, arg2, arg3, arg4) in eset:
+                    {
+                        ep.SendAckFour(arg1, arg2, arg3, arg4);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Five(arg1, arg2, arg3, arg4, arg5) in eset:
+                    {
+                        ep.SendAckFive(arg1, arg2, arg3, arg4, arg5);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Six(arg1, arg2, arg3, arg4, arg5, arg6) in eset:
+                    {
+                        ep.SendAckSix(arg1, arg2, arg3, arg4, arg5, arg6);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Seven(arg1, arg2, arg3, arg4, arg5, arg6, arg7) in eset:
+                    {
+                        ep.SendAckSeven(arg1, arg2, arg3, arg4, arg5, arg6,
+                                        arg7);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Eight(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) in eset:
+                    {
+                        ep.SendAckEight(arg1, arg2, arg3, arg4, arg5, arg6,
+                                        arg7, arg8);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.Nine(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) in eset:
+                    {
+                        ep.SendAckNine(arg1, arg2, arg3, arg4, arg5, arg6,
+                                       arg7, arg8, arg9);
+                        eset.Add(ep);
+                        break;
+                    }
+                    case ep.EndOfBenchmark() in eset:
+                    {
+                        ep.SendAckEnd();
+                        delete ep;
+                        break;
+                    }
+                    case ep.ChannelClosed() in eset:
+                    {
+                        DebugStub.Print("BenchExec: ChannelClosed @ client\n");
+                        delete ep;
+                        break;
+                    }
+                }
+            }
+exit:
+            eset.Dispose();
+            signalReceiver.Release(signal);
+            DeregisterName(BenchmarkContract.ModuleName, provider);
+            return;
+        }
+
+        internal bool RegisterName(string! name,
+                                   out ServiceProviderContract.Exp! ep)
+        {
+            bool success = false;
+            ServiceProviderContract.Imp!        imp;
+            ServiceProviderContract.Exp!        exp;
+            DirectoryServiceContract.Imp:Ready! ds;
+
+            DebugStub.Print("BenchExec: Register '{0}' ...", __arglist(name));
+            ServiceProviderContract.NewChannel(out imp, out exp);
+            ds = directoryService.Acquire();
+            ds.SendRegister(Bitter.FromString2(name), imp);
+            switch receive {
+                case ds.AckRegister():
+                    success = true;
+                    DebugStub.Print(" done.\n");
+                    break;
+                case ds.NakRegister(rejected, error):
+                    delete rejected;
+                    success = false;
+                    DebugStub.Print(" fail.\n");
+                    break;
+                case ds.ChannelClosed():
+                    DebugStub.Print(" ChannelClosed @ name service\n");
+                    break;
+            }
+            ep = exp;
+            directoryService.Release(ds);
+            return success;
+        }
+
+        internal void DeregisterName(string! name,
+                                     [Claims]ServiceProviderContract.Exp! ep)
+        {
+            DirectoryServiceContract.Imp:Ready! ds;
+            ds = DirectoryService.NewClientEndpoint();
+            ds.SendDeregister(Bitter.FromString2(name));
+            switch receive {
+                case ds.AckDeregister(imp):
+                    delete imp;
+                    delete ep;
+                    break;
+            }
+            delete ds;
+        }
+    }
+}
diff --git a/base/Services/Tests/Benchmark/Hoisted/Hoisted.csproj b/base/Services/Tests/Benchmark/Hoisted/Hoisted.csproj
new file mode 100644
index 0000000..ffe261f
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Hoisted/Hoisted.csproj
@@ -0,0 +1,33 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>RBenchHoistedService</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="BenchmarkExec.sg"/>
+    <Compile Include="..\Benchmark.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Benchmark/Worker/BenchmarkExec.sg b/base/Services/Tests/Benchmark/Worker/BenchmarkExec.sg
new file mode 100644
index 0000000..726d3dd
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Worker/BenchmarkExec.sg
@@ -0,0 +1,190 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Benchmark\Worker\BenchmarkExec.sg
+//
+//  Note:
+//
+using System;
+using System.Collections;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    public class BenchmarkExec : IRunnable
+    {
+        private ArrayList!  serviceSignalList;
+        private Object!     mutex;
+        private TRef<ThreadTerminationContract.Exp:Start>   signalReceiver;
+        private TRef<DirectoryServiceContract.Imp:Ready>!   directoryService;
+
+        public BenchmarkExec([Claims]DirectoryServiceContract.Imp:Ready! ds)
+        {
+            serviceSignalList = new ArrayList();
+            mutex = new Object();
+            directoryService = new TRef<DirectoryServiceContract.Imp:Ready>(ds);
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            signalReceiver = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        public virtual void Run()
+        {
+            ServiceProviderContract.Exp!        provider;
+            ThreadTerminationContract.Exp!      signal;
+
+            DebugStub.Print("BenchExec: Service start\n");
+
+            if (!RegisterName(BenchmarkContract.ModuleName, out provider)) {
+                delete provider;
+                return;
+            }
+            assert signalReceiver != null;
+            signal = signalReceiver.Acquire();
+            for (;;) {
+                switch receive {
+                    case provider.Connect(serviceEp):
+                    {
+                        //DebugStub.Print("BenchExec: Accepting a client" +
+                        //                " connection request ... ");
+                        BenchmarkContract.Exp:Start bench = serviceEp
+                                as BenchmarkContract.Exp:Start;
+                        if (bench != null) {
+                            //DebugStub.Print("accepted.\n");
+                            provider.SendAckConnect();
+                            CreateWorker(bench).Start();
+                        }
+                        else {
+                            //DebugStub.Print("Denied.\n");
+                            provider.SendNackConnect(serviceEp);
+                        }
+                        break;
+                    }
+                    case provider.ChannelClosed():
+                    {
+                        TerminateWorkers();
+                        goto exit;
+                        break;
+                    }
+                    case signal.Stop():
+                    {
+                        TerminateWorkers();
+                        signal.SendAckStop();
+                        goto exit;
+                        break;
+                    }
+                    case signal.ChannelClosed():
+                    {
+                        TerminateWorkers();
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            signalReceiver.Release(signal);
+            DeregisterName(BenchmarkContract.ModuleName, provider);
+            return;
+        }
+
+        private Thread! CreateWorker([Claims]BenchmarkContract.Exp:Start! ep)
+        {
+            BenchmarkWorker service;
+            ThreadTerminationContract.Imp! imp;
+            ThreadTerminationContract.Exp! exp;
+            ThreadTerminationContract.NewChannel(out imp, out exp);
+
+            ep.SendSuccess();
+            service = new BenchmarkWorker(ep);
+            service.Signal(exp);
+            lock (mutex) {
+                serviceSignalList.Add(new TRef<ThreadTerminationContract.Imp:Start>(imp));
+            }
+            return new Thread(new ThreadStart(service.Run));
+        }
+
+        private void TerminateWorkers()
+        {
+            TRef<ThreadTerminationContract.Imp:Start>   signalRef;
+            ThreadTerminationContract.Imp:Start         signal;
+            lock (mutex) {
+                foreach (Object obj in serviceSignalList)
+                {
+                    if (obj != null) {
+                        signalRef = obj
+                                as TRef<ThreadTerminationContract.Imp:Start>;
+                        if (signalRef != null) {
+                            signal = signalRef.Acquire();
+                            signal.SendStop();
+                            switch receive {
+                                case signal.AckStop():
+                                    break;
+                                case signal.ChannelClosed():
+                                    break;
+                            }
+                            signalRef.Release(signal);
+                        }
+                    }
+                }
+                serviceSignalList.Clear();
+            }
+        }
+
+        internal bool RegisterName(string! name,
+                                   out ServiceProviderContract.Exp! ep)
+        {
+            bool success = false;
+            ServiceProviderContract.Imp!        imp;
+            ServiceProviderContract.Exp!        exp;
+            DirectoryServiceContract.Imp:Ready! ds;
+
+            ServiceProviderContract.NewChannel(out imp, out exp);
+            ds = directoryService.Acquire();
+            ds.SendRegister(Bitter.FromString2(name), imp);
+            switch receive {
+                case ds.AckRegister():
+                    success = true;
+                    DebugStub.Print("BenchExec: '{0}' registered",
+                                    __arglist(name));
+                    break;
+                case ds.NakRegister(rejected, error):
+                    delete rejected;
+                    success = false;
+                    DebugStub.Print("BenchExec: registration failed.\n");
+                    break;
+                case ds.ChannelClosed():
+                    DebugStub.Print(" ChannelClosed @ name service\n");
+                    break;
+            }
+            ep = exp;
+            directoryService.Release(ds);
+            return success;
+        }
+
+        internal void DeregisterName(string! name,
+                                     [Claims]ServiceProviderContract.Exp! ep)
+        {
+            DirectoryServiceContract.Imp:Ready! ds;
+            ds = directoryService.Acquire();
+            ds.SendDeregister(Bitter.FromString2(name));
+            switch receive {
+                case ds.AckDeregister(imp):
+                    delete imp;
+                    delete ep;
+                    break;
+            }
+            directoryService.Release(ds);
+        }
+    }
+}
diff --git a/base/Services/Tests/Benchmark/Worker/BenchmarkWorker.sg b/base/Services/Tests/Benchmark/Worker/BenchmarkWorker.sg
new file mode 100644
index 0000000..fafd163
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Worker/BenchmarkWorker.sg
@@ -0,0 +1,113 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Benchmark\Worker\BenchmarkWorker.sg
+//
+//  Note:
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    internal class BenchmarkWorker : IRunnable
+    {
+        private TRef<BenchmarkContract.Exp:Ready>! tref;
+        private TRef<ThreadTerminationContract.Exp:Start> signal;
+
+        internal BenchmarkWorker([Claims] BenchmarkContract.Exp:Ready! ep)
+        {
+            tref = new TRef<BenchmarkContract.Exp:Ready>(ep);
+        }
+
+        public void Signal([Claims] ThreadTerminationContract.Exp:Start! sig)
+        {
+            signal = new TRef<ThreadTerminationContract.Exp:Start>(sig);
+        }
+
+        public void Run()
+        {
+            BenchmarkContract.Exp:Ready!            ep;
+            ThreadTerminationContract.Exp:Start!    sig;
+
+            ep = tref.Acquire();
+            assert signal != null;
+            sig = signal.Acquire();
+
+            for (;;) {
+                switch receive {
+                    case ep.GetCycleCount():
+                        ep.SendCycleCount(Processor.GetCycleCount());
+                        break;
+                    case ep.Null():
+                        ep.SendAckNull();
+                        break;
+                    case ep.One(arg):
+                        ep.SendAckOne(arg);
+                        break;
+                    case ep.Two(arg1, arg2):
+                        ep.SendAckTwo(arg1, arg2);
+                        break;
+                    case ep.Three(arg1, arg2, arg3):
+                        ep.SendAckThree(arg1, arg2, arg3);
+                        break;
+                    case ep.Four(arg1, arg2, arg3, arg4):
+                        ep.SendAckFour(arg1, arg2, arg3, arg4);
+                        break;
+                    case ep.Five(arg1, arg2, arg3, arg4, arg5):
+                        ep.SendAckFive(arg1, arg2, arg3, arg4, arg5);
+                        break;
+                    case ep.Six(arg1, arg2, arg3, arg4, arg5, arg6):
+                        ep.SendAckSix(arg1, arg2, arg3, arg4, arg5, arg6);
+                        break;
+                    case ep.Seven(arg1, arg2, arg3, arg4, arg5, arg6, arg7):
+                        ep.SendAckSeven(arg1, arg2, arg3, arg4, arg5, arg6,
+                                        arg7);
+                        break;
+                    case ep.Eight(arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+                                  arg8):
+                        ep.SendAckEight(arg1, arg2, arg3, arg4, arg5, arg6,
+                                        arg7, arg8);
+                        break;
+                    case ep.Nine(arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+                                 arg8, arg9):
+                        ep.SendAckNine(arg1, arg2, arg3, arg4, arg5, arg6,
+                                       arg7, arg8, arg9);
+                        break;
+                        /*
+                    case ep.ReadWrite():
+                        break;
+                    case ep.WriteRead():
+                        break;
+                        */
+                    case ep.EndOfBenchmark():
+                        ep.SendAckEnd();
+                        goto exit;
+                        break;
+                    case ep.ChannelClosed():
+                        goto exit;
+                        break;
+                    case sig.Stop():
+                        sig.SendAckStop();
+                        goto exit;
+                        break;
+                    case sig.ChannelClosed():
+                        goto exit;
+                        break;
+                }
+            }
+exit:
+            delete ep;
+            delete sig;
+            DebugStub.Print("BenchExec: Quit main loop\n");
+        }
+    } // class
+}
diff --git a/base/Services/Tests/Benchmark/Worker/Worker.csproj b/base/Services/Tests/Benchmark/Worker/Worker.csproj
new file mode 100644
index 0000000..9551eba
--- /dev/null
+++ b/base/Services/Tests/Benchmark/Worker/Worker.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>RBenchWorkerService</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="BenchmarkExec.sg"/>
+    <Compile Include="BenchmarkWorker.sg"/>
+    <Compile Include="..\Benchmark.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/BenchmarkProxy/BenchmarkJournalProducer.sg b/base/Services/Tests/BenchmarkProxy/BenchmarkJournalProducer.sg
new file mode 100644
index 0000000..430cb5a
--- /dev/null
+++ b/base/Services/Tests/BenchmarkProxy/BenchmarkJournalProducer.sg
@@ -0,0 +1,109 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\BenchmarkProxy\BenchmarkJournalProducer.sg
+//
+//  Note:   
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceContractRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryContractRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Exp:Start> substituteDSRef;
+
+        [Endpoint]
+        public readonly TRef<ManagedProxyContract.Imp:Start> proxyContractRef;
+
+        reflective private Parameters();
+    }
+
+    internal class BenchmarkJournalProducer : JournalProducer
+    {
+        internal BenchmarkJournalProducer()
+        {
+            base();
+        }
+
+        protected override bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            // ep must be a type of CounterContract.Exp
+            BenchmarkContract.Exp:Start cep = ep
+                    as BenchmarkContract.Exp:Start;
+            return (cep != null);
+        }
+
+        protected override void Substitute([Claims]ServiceContract.Exp:Start! ep,
+                                           out ServiceContract.Exp! newEp)
+        {
+            Journalet!                  journalet;
+            ServiceContract.Exp:Start!  serverEp;
+
+            journalet = new BenchmarkJournalet(this, ep);
+            journalet.CreateServerEndpoint(out serverEp);
+            journalet.Start();
+            RegisterJournalet(journalet);
+            newEp = serverEp;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    ep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            DirectoryServiceContract.Exp:Start  fep;
+            ManagedProxyContract.Imp:Start      mep;
+
+            ep = config.serviceContractRef.Acquire();
+            dep = config.directoryContractRef.Acquire();
+            fep = config.substituteDSRef.Acquire();
+            mep = config.proxyContractRef.Acquire();
+
+            if (ep == null || dep == null || fep == null || mep == null) {
+                delete ep;
+                delete dep;
+                delete fep;
+                delete mep;
+                return -1;
+            }
+
+            DebugStub.Print("Start BenchmarkJournalProcuder\n");
+
+            JournalProducer jp = new BenchmarkJournalProducer();
+            try {
+                jp.Start(ep, dep, fep, mep);
+            }
+            catch (Exception e) {
+                DebugStub.WriteLine(e.ToString());
+                DebugStub.WriteLine(e.StackTrace);
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/BenchmarkProxy/BenchmarkJournalet.sg b/base/Services/Tests/BenchmarkProxy/BenchmarkJournalet.sg
new file mode 100644
index 0000000..30d570d
--- /dev/null
+++ b/base/Services/Tests/BenchmarkProxy/BenchmarkJournalet.sg
@@ -0,0 +1,877 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\BenchmarkProxy\BenchmarkJournalet.sg
+//
+//  Note:   
+//
+#define VERSION_2
+using System;
+using System.Threading;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    internal enum MessageType : uint
+    {
+        Unknown,
+        GetCycleCount,
+        CycleCount,
+        Null,
+        One,
+        Two,
+        Three,
+        Four,
+        Five,
+        Six,
+        Seven,
+        Eight,
+        Nine,
+        EndOfBenchmark,
+        AckNull,
+        AckOne,
+        AckTwo,
+        AckThree,
+        AckFour,
+        AckFive,
+        AckSix,
+        AckSeven,
+        AckEight,
+        AckNine,
+        AckEnd,
+    }
+
+#if VERSION_2
+    internal class BenchmarkJournalet : Journalet2
+#else
+    internal class BenchmarkJournalet : Journalet
+#endif
+    {
+        private Log!                                incoming;
+        private Log!                                outgoing;
+        private Object!                             initMonitor;
+        private Object!                             benchmarkMonitor;
+        private TRef<BenchmarkContract.Imp:Start>   initImp;
+        private TRef<BenchmarkContract.Imp:Ready>   benchmarkImp;
+        private TRef<BenchmarkContract.Exp:Ready>   benchmarkExp;
+#if VERSION_2
+        private TRef<BenchmarkContract.Exp:Start>!  initExp;
+
+        internal BenchmarkJournalet([Claims]ServiceContract.Exp:Start! ep)
+            : base()
+        {
+            BenchmarkContract.Exp:Start exp;
+            exp = ep as BenchmarkContract.Exp:Start;
+            if (exp == null) {
+                throw new ArgumentException();
+            }
+
+            incoming = new Log();
+            outgoing = new Log();
+            initMonitor = new Object();
+            benchmarkMonitor = new Object();
+            initExp = new TRef<BenchmarkContract.Exp:Start>(exp);
+        }
+#else
+        internal BenchmarkJournalet(JournalProducer! producer,
+                                    [Claims]ServiceContract.Exp:Start! ep)
+        {
+            base(producer, ep);
+            incoming = new Log();
+            outgoing = new Log();
+            initMonitor = new Object();
+            benchmarkMonitor = new Object();
+        }
+#endif
+
+#if VERSION_2
+        public override void CreateEndpoint(out ServiceContract.Exp! ep)
+#else
+        public override void CreateServerEndpoint(out ServiceContract.Exp:Start! ep)
+#endif
+        {
+            BenchmarkContract.Imp!  imp;
+            BenchmarkContract.Exp!  exp;
+            BenchmarkContract.NewChannel(out imp, out exp);
+
+            //DebugStub.Print("BJ: Enter CreateServerEndpoint\n");
+            try {
+                Monitor.Enter(initMonitor);
+                initImp = new TRef<BenchmarkContract.Imp:Start>(imp);
+                Monitor.Pulse(initMonitor);
+            }
+            finally {
+                Monitor.Exit(initMonitor);
+            }
+            ep = exp;
+            //DebugStub.Print("BJ: Exit CreateServerEndpoint\n");
+        }
+
+#if VERSION_2
+        public override void Flush() {}
+#endif
+
+#if VERSION_2
+        public override void Run()
+#else
+        protected override void ProxyThread()
+#endif
+        {
+            bool    success = false;
+            ulong   time1, time2;
+
+            if (!Initialize()) {
+                goto exit;
+            }
+            for (;;) {
+                if (!HandleMessages()) {
+                    goto exit;
+                }
+
+                time1 = Processor.GetCycleCount();
+                success = Recover();
+                time2 = Processor.GetCycleCount();
+                DebugStub.Print("BJ: ==== Recovery Result ====\n");
+                DebugStub.Print("outgoing incoming start end\n");
+                DebugStub.Print("{0},{1},{2},{3}\n",
+                                __arglist(incoming.Count, outgoing.Count,
+                                          time1, time2));
+                if (!success) {
+                    goto exit;
+                }
+            }
+exit:
+#if !VERSION_2
+            producer.DeregisterJournalet(this);
+#endif
+            return;
+        }
+
+        protected override bool Initialize()
+        {
+            bool success = false;
+            BenchmarkContract.Exp:Start clientEp;
+            BenchmarkContract.Imp:Start serverEp;
+
+#if VERSION_2
+            clientEp = initExp.Acquire();
+#else
+            ServiceContract.Exp:Start!  ep = clientRef.Acquire();
+            clientEp = ep as BenchmarkContract.Exp:Start;
+            if (clientEp == null) {
+                clientRef.Release(ep);
+                return false;
+            }
+#endif
+            assert initImp != null;
+            serverEp = initImp.Acquire();
+            switch receive {
+                case serverEp.Success():
+                    clientEp.SendSuccess();
+                    success = true;
+                    break;
+                case serverEp.ChannelClosed():
+                    success = false;
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+            initImp = null;
+
+            if (success) {
+                benchmarkExp = new TRef<BenchmarkContract.Exp:Ready>(clientEp);
+                benchmarkImp = new TRef<BenchmarkContract.Imp:Ready>(serverEp);
+                return true;
+            }
+            else {
+                delete clientEp;
+                delete serverEp;
+                return false;
+            }
+        }
+
+        protected override bool HandleMessages()
+        {
+            bool        success = true;
+            ArrayList   al;
+            BenchmarkContract.Exp:Ready! clientEp;
+            BenchmarkContract.Imp:Ready! serverEp;
+
+            assert benchmarkExp != null;
+            assert benchmarkImp != null;
+            clientEp = benchmarkExp.Acquire();
+            serverEp = benchmarkImp.Acquire();
+
+            for (;;) {
+                switch receive {
+                    case clientEp.GetCycleCount():
+                    {
+                        serverEp.SendGetCycleCount();
+                        incoming.Record((uint)MessageType.GetCycleCount, null);
+                        break;
+                    }
+                    case clientEp.Null():
+                    {
+                        serverEp.SendNull();
+                        incoming.Record((uint)MessageType.Null, null);
+                        break;
+                    }
+                    case clientEp.One(arg):
+                    {
+                        serverEp.SendOne(arg);
+                        al = new ArrayList(1);
+                        al.Add(arg);
+                        incoming.Record((uint)MessageType.One, al);
+                        break;
+                    }
+                    case clientEp.Two(arg1, arg2):
+                    {
+                        serverEp.SendTwo(arg1, arg2);
+                        al = new ArrayList(2);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        incoming.Record((uint)MessageType.Two, al);
+                        break;
+                    }
+                    case clientEp.Three(arg1, arg2, arg3):
+                    {
+                        serverEp.SendThree(arg1, arg2, arg3);
+                        al = new ArrayList(3);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        incoming.Record((uint)MessageType.Three, al);
+                        break;
+                    }
+                    case clientEp.Four(arg1, arg2, arg3, arg4):
+                    {
+                        serverEp.SendFour(arg1, arg2, arg3, arg4);
+                        al = new ArrayList(4);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        incoming.Record((uint)MessageType.Four, al);
+                        break;
+                    }
+                    case clientEp.Five(arg1, arg2, arg3, arg4, arg5):
+                    {
+                        serverEp.SendFive(arg1, arg2, arg3, arg4, arg5);
+                        al = new ArrayList(5);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        incoming.Record((uint)MessageType.Five, al);
+                        break;
+                    }
+                    case clientEp.Six(arg1, arg2, arg3, arg4, arg5, arg6):
+                    {
+                        serverEp.SendSix(arg1, arg2, arg3, arg4, arg5, arg6);
+                        al = new ArrayList(6);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        incoming.Record((uint)MessageType.Six, al);
+                        break;
+                    }
+                    case clientEp.Seven(arg1, arg2, arg3, arg4, arg5, arg6,
+                                        arg7):
+                    {
+                        serverEp.SendSeven(arg1, arg2, arg3, arg4, arg5, arg6,
+                                           arg7);
+                        al = new ArrayList(7);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        al.Add(arg7);
+                        incoming.Record((uint)MessageType.Seven, al);
+                        break;
+                    }
+                    case clientEp.Eight(arg1, arg2, arg3, arg4, arg5, arg6,
+                                        arg7, arg8):
+                    {
+                        serverEp.SendEight(arg1, arg2, arg3, arg4, arg5, arg6,
+                                           arg7, arg8);
+                        al = new ArrayList(8);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        al.Add(arg7);
+                        al.Add(arg8);
+                        incoming.Record((uint)MessageType.Eight, al);
+                        break;
+                    }
+                    case clientEp.Nine(arg1, arg2, arg3, arg4, arg5, arg6,
+                                       arg7, arg8, arg9):
+                    {
+                        serverEp.SendNine(arg1, arg2, arg3, arg4, arg5, arg6,
+                                          arg7, arg8, arg9);
+                        al = new ArrayList(9);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        al.Add(arg7);
+                        al.Add(arg8);
+                        al.Add(arg9);
+                        incoming.Record((uint)MessageType.Nine, al);
+                        break;
+                    }
+                    case clientEp.EndOfBenchmark():
+                    {
+                        serverEp.SendEndOfBenchmark();
+                        incoming.Record((uint)MessageType.EndOfBenchmark,
+                                        null);
+                        break;
+                    }
+                    case clientEp.ChannelClosed():
+                    {
+                        success = false;
+                        goto exit;
+                        break;
+                    }
+
+                    case serverEp.CycleCount(cycle):
+                    {
+                        clientEp.SendCycleCount(cycle);
+                        al = new ArrayList(1);
+                        al.Add(cycle);
+                        outgoing.Record((uint)MessageType.CycleCount, al);
+                        break;
+                    }
+                    case serverEp.AckNull():
+                    {
+                        clientEp.SendAckNull();
+                        outgoing.Record((uint)MessageType.AckNull, null);
+                        break;
+                    }
+                    case serverEp.AckOne(arg):
+                    {
+                        clientEp.SendAckOne(arg);
+                        al = new ArrayList(1);
+                        al.Add(arg);
+                        outgoing.Record((uint)MessageType.AckOne, al);
+                        break;
+                    }
+                    case serverEp.AckTwo(arg1, arg2):
+                    {
+                        clientEp.SendAckTwo(arg1, arg2);
+                        al = new ArrayList(2);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        outgoing.Record((uint)MessageType.AckTwo, al);
+                        break;
+                    }
+                    case serverEp.AckThree(arg1, arg2, arg3):
+                    {
+                        clientEp.SendAckThree(arg1, arg2, arg3);
+                        al = new ArrayList(3);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        outgoing.Record((uint)MessageType.AckThree, al);
+                        break;
+                    }
+                    case serverEp.AckFour(arg1, arg2, arg3, arg4):
+                    {
+                        clientEp.SendAckFour(arg1, arg2, arg3, arg4);
+                        al = new ArrayList(4);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        outgoing.Record((uint)MessageType.AckFour, al);
+                        break;
+                    }
+                    case serverEp.AckFive(arg1, arg2, arg3, arg4, arg5):
+                    {
+                        clientEp.SendAckFive(arg1, arg2, arg3, arg4, arg5);
+                        al = new ArrayList(5);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        outgoing.Record((uint)MessageType.AckFive, al);
+                        break;
+                    }
+                    case serverEp.AckSix(arg1, arg2, arg3, arg4, arg5, arg6):
+                    {
+                        clientEp.SendAckSix(arg1, arg2, arg3, arg4, arg5,
+                                            arg6);
+                        al = new ArrayList(6);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        outgoing.Record((uint)MessageType.AckSix, al);
+                        break;
+                    }
+                    case serverEp.AckSeven(arg1, arg2, arg3, arg4, arg5, arg6,
+                                           arg7):
+                    {
+                        clientEp.SendAckSeven(arg1, arg2, arg3, arg4, arg5,
+                                              arg6, arg7);
+                        al = new ArrayList(7);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        al.Add(arg7);
+                        outgoing.Record((uint)MessageType.AckSeven, al);
+                        break;
+                    }
+                    case serverEp.AckEight(arg1, arg2, arg3, arg4, arg5, arg6,
+                                           arg7, arg8):
+                    {
+                        clientEp.SendAckEight(arg1, arg2, arg3, arg4, arg5,
+                                              arg6, arg7, arg8);
+                        al = new ArrayList(8);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        al.Add(arg7);
+                        al.Add(arg8);
+                        outgoing.Record((uint)MessageType.AckEight, al);
+                        break;
+                    }
+                    case serverEp.AckNine(arg1, arg2, arg3, arg4, arg5, arg6,
+                                          arg7, arg8, arg9):
+                    {
+                        clientEp.SendAckNine(arg1, arg2, arg3, arg4, arg5,
+                                             arg6, arg7, arg8, arg9);
+                        al = new ArrayList(9);
+                        al.Add(arg1);
+                        al.Add(arg2);
+                        al.Add(arg3);
+                        al.Add(arg4);
+                        al.Add(arg5);
+                        al.Add(arg6);
+                        al.Add(arg7);
+                        al.Add(arg8);
+                        al.Add(arg9);
+                        outgoing.Record((uint)MessageType.AckNine, al);
+                        break;
+                    }
+                    case serverEp.AckEnd():
+                    {
+                        clientEp.SendAckEnd();
+                        outgoing.Record((uint)MessageType.AckEnd, null);
+                        break;
+                    }
+                    case serverEp.ChannelClosed():
+                    {
+                        // Recovery
+                        success = true;
+                        goto exit;
+                        break;
+                    }
+                    case unsatisfiable:
+                    {
+                        DebugStub.Break();
+                        break;
+                    }
+                }
+            }
+exit:
+            benchmarkExp.Release(clientEp);
+            if (success) {
+                //2006-9-13 hi:
+                //benchmarkImp.Release(serverEp);
+                //hi: an alternative way to solve 2006-9-13
+                delete serverEp;
+                try {
+                    Monitor.Enter(benchmarkMonitor);
+                    benchmarkImp = null;
+                    Monitor.Pulse(benchmarkMonitor);
+                }
+                finally {
+                    Monitor.Exit(benchmarkMonitor);
+                }
+            }
+            else {
+                delete serverEp;
+                //benchmarkImp = null;
+            }
+            return success;
+        }
+
+        protected override bool Recover()
+        {
+            bool success = false;
+            int[] arg = new int[9];
+            uint msg;
+            MessageType op;
+            IList args;
+            Object tmp;
+            BenchmarkContract.Imp:Start serverEp;
+
+            try {
+                Monitor.Enter(initMonitor);
+                if (initImp == null) {
+                    Monitor.Wait(initMonitor);
+                }
+            }
+            finally {
+                Monitor.Exit(initMonitor);
+            }
+
+            assert initImp != null;
+            serverEp = initImp.Acquire();
+
+            switch receive {
+                case serverEp.Success():
+                    break;
+                case serverEp.ChannelClosed():
+                    delete serverEp;
+                    throw new Exception("Channel was closed" +
+                                        " during recovery.\n");
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+            initImp = null;
+
+            while (incoming.Playback(out msg, out args)) {
+                op = (MessageType)msg;
+                switch (op) {
+                    case MessageType.GetCycleCount:
+                    {
+                        serverEp.SendGetCycleCount();
+                        break;
+                    }
+                    case MessageType.Null:
+                    {
+                        serverEp.SendNull();
+                        break;
+                    }
+                    case MessageType.One:
+                    {
+                        if (args != null) {
+                            tmp = args[0];
+                            if (tmp != null) {
+                                arg[0] = (int)tmp;
+                            }
+                            serverEp.SendOne(arg[0]);
+                        }
+                        break;
+                    }
+                    case MessageType.Two:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 2; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendTwo(arg[0], arg[1]);
+                        }
+                        break;
+                    }
+                    case MessageType.Three:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 3; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendThree(arg[0], arg[1], arg[2]);
+                        }
+                        break;
+                    }
+                    case MessageType.Four:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 4; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendFour(arg[0], arg[1], arg[2], arg[3]);
+                        }
+                        break;
+                    }
+                    case MessageType.Five:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 5; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendFive(arg[0], arg[1], arg[2], arg[3],
+                                              arg[4]);
+                        }
+                        break;
+                    }
+                    case MessageType.Six:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 6; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendSix(arg[0], arg[1], arg[2], arg[3],
+                                             arg[4], arg[5]);
+                        }
+                        break;
+                    }
+                    case MessageType.Seven:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 7; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendSeven(arg[0], arg[1], arg[2], arg[3],
+                                               arg[4], arg[5], arg[6]);
+                        }
+                        break;
+                    }
+                    case MessageType.Eight:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 8; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendEight(arg[0], arg[1], arg[2], arg[3],
+                                               arg[4], arg[5], arg[6], arg[7]);
+                        }
+                        break;
+                    }
+                    case MessageType.Nine:
+                    {
+                        if (args != null) {
+                            for (int i = 0; i < 9; i++) {
+                                tmp = args[i];
+                                if (tmp != null) {
+                                    arg[i] = (int)tmp;
+                                }
+                            }
+                            serverEp.SendNine(arg[0], arg[1], arg[2], arg[3],
+                                              arg[4], arg[5], arg[6], arg[7],
+                                              arg[8]);
+                        }
+                        break;
+                    }
+                    case MessageType.EndOfBenchmark:
+                    {
+                        serverEp.SendEndOfBenchmark();
+                        break;
+                    }
+                }
+
+                bool result = true;
+                result = outgoing.Playback(out msg, out args);
+                op = (MessageType)msg;
+
+                if (!result) {
+                    /*
+                    DebugStub.Print("Playback: End of log.\n");
+                    DebugStub.Print("Playback: {0} incoming messages\n",
+                                    __arglist(incoming.Count));
+                    DebugStub.Print("Playback: {0} outgoing messages\n",
+                                    __arglist(outgoing.Count));
+                                    */
+                    success = true;
+                    break;
+                }
+
+                switch receive {
+                    case serverEp.CycleCount(cycle):
+                    {
+                        if (op != MessageType.CycleCount) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckNull():
+                    {
+                        if (op != MessageType.Null) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckOne(arg1):
+                    {
+                        if (op != MessageType.AckOne) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckTwo(arg1, arg2):
+                    {
+                        if (op != MessageType.AckTwo) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckThree(arg1, arg2, arg3):
+                    {
+                        if (op != MessageType.AckThree) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckFour(arg1, arg2, arg3, arg4):
+                    {
+                        if (op != MessageType.AckFour) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckFive(arg1, arg2, arg3, arg4, arg5):
+                    {
+                        if (op != MessageType.AckFive) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckSix(arg1, arg2, arg3, arg4, arg5, arg6):
+                    {
+                        if (op != MessageType.AckSix) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckSeven(arg1, arg2, arg3, arg4, arg5, arg6,
+                                           arg7):
+                    {
+                        if (op != MessageType.AckSeven) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckEight(arg1, arg2, arg3, arg4, arg5, arg6,
+                                           arg7, arg8):
+                    {
+                        if (op != MessageType.AckEight) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckNine(arg1, arg2, arg3, arg4, arg5, arg6,
+                                          arg7, arg8, arg9):
+                    {
+                        if (op != MessageType.AckNine) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.AckEnd():
+                    {
+                        if (op != MessageType.AckEnd) {
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    }
+                    case serverEp.ChannelClosed():
+                        throw new Exception("Server-side channel closed" +
+                                            " during recovery\n");
+                        break;
+                    case unsatisfiable:
+                        DebugStub.Break();
+                        break;
+                }
+            } // loop
+
+            //2006-9-13 hi: This may cause an access violation with the
+            //              fully hoisted style server.
+            //delete benchmarkImp.Acquire();
+            //DebugStub.Print("BJ: (2)\n");
+            //benchmarkImp.Release(serverEp);
+
+            //hi: an alternative way to above.
+            try {
+                Monitor.Enter(benchmarkMonitor);
+                if (benchmarkImp != null) {
+                    Monitor.Wait(benchmarkMonitor);
+                }
+                benchmarkImp = new TRef<BenchmarkContract.Imp:Ready>(serverEp);
+            }
+            finally {
+                Monitor.Exit(benchmarkMonitor);
+            }
+
+            return success;
+        }
+    }
+}
diff --git a/base/Services/Tests/BenchmarkProxy/BenchmarkJournaletFactory.sg b/base/Services/Tests/BenchmarkProxy/BenchmarkJournaletFactory.sg
new file mode 100644
index 0000000..ac6a9f5
--- /dev/null
+++ b/base/Services/Tests/BenchmarkProxy/BenchmarkJournaletFactory.sg
@@ -0,0 +1,104 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\BenchmarkProxy\BenchmarkJournaletFactory.sg
+//
+//  Note:   Resilient Service Ver.2
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.Benchmark
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Exp:Start> myDSRef;
+
+        [Endpoint]
+        public readonly TRef<ManagedProxyContract.Imp:Start> recoveryRef;
+
+        [Endpoint]
+        public readonly TRef<ServiceProxyContract.Exp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    internal class BenchmarkJournaletFactory : JournaletFactory
+    {
+        public bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            BenchmarkContract.Exp:Start cep = ep
+                as BenchmarkContract.Exp:Start;
+            return (cep != null);
+        }
+
+        public Journalet2! CreateJournalet([Claims]ServiceContract.Exp:Start! ep,
+                                          out ServiceContract.Exp! newEp)
+        {
+            Journalet2!             journalet;
+            ServiceContract.Exp!    serverEp;
+
+            journalet = new BenchmarkJournalet(ep);
+            journalet.CreateEndpoint(out serverEp);
+            newEp = serverEp;
+            return journalet;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    ep;
+            ManagedProxyContract.Imp:Start      mep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            DirectoryServiceContract.Exp:Start  fep;
+            ServiceProxyContract.Exp:Start      xep;
+            ServiceProxy                        proxy;
+            Thread                              thread;
+
+            if (config.directoryRef == null ||
+                config.serviceRef == null ||
+                config.myDSRef == null || 
+                config.recoveryRef == null ||
+                config.proxyRef == null) 
+            {
+                return -1;
+            }
+            dep = config.directoryRef.Acquire();
+            ep = config.serviceRef.Acquire();
+            fep = config.myDSRef.Acquire();
+            mep = config.recoveryRef.Acquire();
+            xep = config.proxyRef.Acquire();
+
+            proxy = new ServiceProxy(new BenchmarkJournaletFactory(),
+                                     ep, mep, dep, fep, xep);
+            thread = new Thread(new ThreadStart(proxy.Run));
+            thread.Start();
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/BenchmarkProxy/RBenchProxy.csproj b/base/Services/Tests/BenchmarkProxy/RBenchProxy.csproj
new file mode 100644
index 0000000..fea97f8
--- /dev/null
+++ b/base/Services/Tests/BenchmarkProxy/RBenchProxy.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>RBenchProxy</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="BenchmarkJournaletFactory.sg"/>
+    <Compile Include="BenchmarkJournalet.sg"/>
+   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Resiliency\Resiliency.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Counter/Counter.sg b/base/Services/Tests/Counter/Counter.sg
new file mode 100644
index 0000000..7497780
--- /dev/null
+++ b/base/Services/Tests/Counter/Counter.sg
@@ -0,0 +1,41 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Counter\CounterWorker.sg
+//
+//  Note:
+//
+using System;
+
+namespace Microsoft.Singularity.Services.Counter
+{
+    internal sealed class Counter
+    {
+        private int count;
+
+        internal Counter()
+        {
+            count = 0;
+        }
+
+        internal void Increment()
+        {
+            lock (this) {
+                if (count < Int32.MaxValue) {
+                    ++count;
+                }
+                else {
+                    count = 0;
+                }
+            }
+        }
+
+        internal int Count
+        {
+            get { return count; }
+        }
+    }
+}
diff --git a/base/Services/Tests/Counter/CounterService.csproj b/base/Services/Tests/Counter/CounterService.csproj
new file mode 100644
index 0000000..03e7276
--- /dev/null
+++ b/base/Services/Tests/Counter/CounterService.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CounterService</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Counter.sg"/>
+    <Compile Include="CounterService.sg"/>
+    <Compile Include="CounterWorker.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Counter/CounterService.sg b/base/Services/Tests/Counter/CounterService.sg
new file mode 100644
index 0000000..28a0faa
--- /dev/null
+++ b/base/Services/Tests/Counter/CounterService.sg
@@ -0,0 +1,98 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Counter\Counter.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.Counter
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<ServiceProxyContract.Imp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    internal sealed class CounterService : WorkerServiceExec
+    {
+        private Counter!    counter;
+
+        internal CounterService([Claims]DirectoryServiceContract.Imp:Ready! dep)
+            : base(dep, CounterContract.ModuleName)
+        {
+            counter = new Counter();
+        }
+
+        protected override bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            CounterContract.Exp:Start newEp = ep as CounterContract.Exp:Start;
+            return (newEp != null);
+        }
+
+        protected override IRunnable NewWorker([Claims]ServiceContract.Exp:Start! ep)
+        {
+            CounterContract.Exp:Start   newEp;
+           
+            newEp = ep as CounterContract.Exp:Start;
+            if (newEp == null) {
+                delete ep;
+                return null;
+            }
+
+            return new CounterWorker(newEp, counter);
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    ep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            IRunnable                           counter;
+            IRunnable                           manageExec;
+            Thread                              thread;
+
+            if (config.serviceRef == null || config.directoryRef == null) {
+                // Wrong contract type!
+                return -1;
+            }
+            ep = config.serviceRef.Acquire();
+            dep = config.directoryRef.Acquire();
+
+            counter = new CounterService(dep);
+            manageExec = new ManagementExec(ep, counter);
+            thread = new Thread(new ThreadStart(manageExec.Run));
+            thread.Start();
+            thread.Join();
+            DebugStub.Print("Counter: Quit\n");
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/Counter/CounterWorker.sg b/base/Services/Tests/Counter/CounterWorker.sg
new file mode 100644
index 0000000..4287457
--- /dev/null
+++ b/base/Services/Tests/Counter/CounterWorker.sg
@@ -0,0 +1,118 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Counter\CounterWorker.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services.Counter
+{
+    internal sealed class CounterWorker : IRunnable
+    {
+        private Counter!    counter;
+        private TRef<CounterContract.Exp:Start>!            counterRef;
+        private TRef<ThreadTerminationContract.Exp:Start>   signalRef;
+
+        internal CounterWorker([Claims]CounterContract.Exp:Start! ep,
+                               Counter! counter)
+        {
+            counterRef = new TRef<CounterContract.Exp:Start>(ep);
+            this.counter = counter;
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            signalRef = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        public void Run()
+        {
+            CounterContract.Exp:Start!              ep;
+            ThreadTerminationContract.Exp:Start!    sig;
+            bool next = false;
+
+            assert signalRef != null;
+
+            ep = counterRef.Acquire();
+            sig = signalRef.Acquire();
+            ep.SendSuccess();
+            for (;;) {
+                switch receive {
+                    case ep.Increment():
+                        ep.SendAckIncrement(counter.Count);
+                        counter.Increment();
+                        break;
+                    case ep.BeginCount():
+                        do {
+                            if (counter.Count < Int32.MaxValue) {
+                                // HI: fault injection
+                                int now = DateTime.UtcNow.Second;
+                                if (now == 0 || now == 20 || now == 40) {
+                                    DebugStub.Print("%-) Fault Injection "
+                                                    + now);
+                                    Thread.Sleep(1000);
+                                    goto exit;
+                                }
+                                // HI: fault injection end
+
+                                DebugStub.Print("Counter: Send "
+                                                + counter.Count + "\n");
+                                ep.SendCurrent(counter.Count);
+                            }
+                            else {
+                                DebugStub.Print("Counter exceeds max\n");
+                                ep.SendTerminated();
+                                break;
+                            }
+
+                            switch receive {
+                                case ep.RecvNext():
+                                    next = true;
+                                    counter.Increment();
+                                    break;
+                                case ep.RecvEnd():
+                                    next = false;
+                                    break;
+                                case ep.ChannelClosed():
+                                    DebugStub.Print("Counter: " +
+                                                    "Channel is closed.\n");
+                                    goto exit;
+                                    break;
+                                case sig.Stop():
+                                    sig.SendAckStop();
+                                    goto exit;
+                                    break;
+                            }
+                        } while (next);
+                        break;
+                    case ep.ChannelClosed():
+                        goto exit;
+                        break;
+                    case sig.Stop():
+                        sig.SendAckStop();
+                        goto exit;
+                        break;
+                    case sig.ChannelClosed():
+                        goto exit;
+                }
+            }
+exit:
+            delete ep;
+            signalRef.Release(sig);
+            return;
+        }
+    } // class
+}
diff --git a/base/Services/Tests/CounterProxy/CounterJournalProducer.sg b/base/Services/Tests/CounterProxy/CounterJournalProducer.sg
new file mode 100644
index 0000000..91d7733
--- /dev/null
+++ b/base/Services/Tests/CounterProxy/CounterJournalProducer.sg
@@ -0,0 +1,101 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\CounterProxy\CounterJournalProducer.sg
+//
+//  Note:   
+//
+using System;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.CounterProxy
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Exp:Start> myDSRef;
+
+        [Endpoint]
+        public readonly TRef<ManagedProxyContract.Imp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    internal class CounterJournalProducer : JournalProducer
+    {
+        internal CounterJournalProducer() : base() {}
+
+        protected override bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            // ep must be a type of CounterContract.Exp
+            CounterContract.Exp:Start cep = ep as CounterContract.Exp:Start;
+            return (cep != null);
+        }
+
+        protected override void Substitute([Claims]ServiceContract.Exp:Start! ep, out ServiceContract.Exp! newEp)
+        {
+            Journalet!                  journalet;
+            ServiceContract.Exp:Start!  serverEp;
+
+            journalet = new CounterJournalet(this, ep);
+            journalet.CreateServerEndpoint(out serverEp);
+            journalet.Start();
+            RegisterJournalet(journalet);
+            newEp = serverEp;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    ep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            DirectoryServiceContract.Exp:Start  fep;
+            ManagedProxyContract.Imp:Start      mep;
+
+            dep = config.directoryRef.Acquire();
+            ep = config.serviceRef.Acquire();
+            fep = config.myDSRef.Acquire();
+            mep = config.proxyRef.Acquire();
+            if (ep == null || dep == null || fep == null || mep == null) {
+                delete ep;
+                delete dep;
+                delete fep;
+                delete mep;
+                return -1;
+            }
+
+            JournalProducer! jp = new CounterJournalProducer();
+            try {
+                jp.Start(ep, dep, fep, mep);
+            }
+            catch (Exception e) {
+                DebugStub.WriteLine(e.ToString());
+                DebugStub.WriteLine(e.StackTrace);
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/CounterProxy/CounterJournalet.sg b/base/Services/Tests/CounterProxy/CounterJournalet.sg
new file mode 100644
index 0000000..593ff04
--- /dev/null
+++ b/base/Services/Tests/CounterProxy/CounterJournalet.sg
@@ -0,0 +1,411 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\CounterProxy\CounterJournalet.sg
+//
+//  Note:   
+//
+#define VERSION_2
+using System;
+using System.Threading;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+
+namespace Microsoft.Singularity.Services.CounterProxy
+{
+    internal enum MessageType : uint
+    {
+        Unknown,
+        Success,
+        Increment,
+        BeginCount,
+        Next,
+        End,
+        AckIncrement,
+        NakIncrement,
+        Current,
+        Terminated,
+    }
+#if VERSION_2
+    internal sealed class CounterJournalet : Journalet2
+#else
+    internal sealed class CounterJournalet : Journalet
+#endif
+    {
+        private Log!                                incoming;
+        private Log!                                outgoing;
+        private TRef<CounterContract.Imp:Ready>     counterServerRef;
+        private TRef<CounterContract.Exp:Ready>     counterClientRef;
+        private TRef<CounterContract.Imp:Start>     initServerRef;
+#if VERSION_2
+        private TRef<CounterContract.Exp:Start>!    initClientRef;
+#endif
+
+#if VERSION_2
+        internal CounterJournalet([Claims]ServiceContract.Exp:Start! ep)
+            : base()
+        {
+            CounterContract.Exp:Start counterEp;
+            counterEp = ep as CounterContract.Exp:Start;
+            if (counterEp == null) {
+                throw new ArgumentException();
+            }
+
+            this.incoming = new Log();
+            this.outgoing = new Log();
+            this.initClientRef = new TRef<CounterContract.Exp:Start>(counterEp);
+        }
+#else
+        internal CounterJournalet(JournalProducer! producer,
+                                  [Claims]ServiceContract.Exp:Start! ep)
+        {
+            base(producer, ep);
+            this.incoming = new Log();
+            this.outgoing = new Log();
+            this.state = ProxyState.Waiting;
+        }
+#endif
+
+#if VERSION_2
+        public override void CreateEndpoint(out ServiceContract.Exp! ep)
+#else
+        public override void CreateServerEndpoint(out ServiceContract.Exp:Start! ep)
+#endif
+        {
+            CounterContract.Imp!    imp;
+            CounterContract.Exp!    exp;
+
+            //DebugStub.Print("CJ: ENTER CreateServerEndpoint\n");
+            CounterContract.NewChannel(out imp, out exp);
+            initServerRef = new TRef<CounterContract.Imp:Start>(imp);
+            ep = exp;
+            //DebugStub.Print("CJ: EXIT CreateServerEndpoint\n");
+        }
+
+#if VERSION_2
+        public override void Flush()
+        {
+            incoming.Flush();
+            outgoing.Flush();
+        }
+#endif
+
+        protected override bool Initialize()
+        {
+            bool                        success = false;
+            CounterContract.Exp:Start   clientEp;
+            CounterContract.Imp:Start!  serverEp;
+            
+#if VERSION_2
+            clientEp = initClientRef.Acquire();
+#else
+            ServiceContract.Exp:Start!  ep;
+            ep = clientRef.Acquire();
+            clientEp = ep as CounterContract.Exp:Start;
+            if (clientEp == null) {
+                clientRef.Release(ep);
+                return false;
+            }
+#endif
+            assume initServerRef != null;
+            serverEp = initServerRef.Acquire();
+            switch receive {
+                case serverEp.Success():
+                    clientEp.SendSuccess();
+                    success = true;
+                    break;
+                case serverEp.ChannelClosed():
+                    success = false;
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+
+            if (success) {
+                counterClientRef = new TRef<CounterContract.Exp:Ready>(clientEp);
+                counterServerRef = new TRef<CounterContract.Imp:Ready>(serverEp);
+                return true;
+            }
+            else {
+                delete clientEp;
+                delete serverEp;
+                return false;
+            }
+        }
+
+        protected override bool HandleMessages()
+        {
+            bool                        recovery = false;
+            CounterContract.Exp:Ready!  clientEp;
+            CounterContract.Imp:Ready!  serverEp;
+
+            assume counterClientRef != null;
+            assume counterServerRef != null;
+            clientEp = counterClientRef.Acquire();
+            serverEp = counterServerRef.Acquire();
+
+            for (;;) {
+                switch receive {
+                    case clientEp.Increment():
+                        State = ProxyState.Running;
+#if VERSION_2
+                        Sync();
+#endif
+                        serverEp.SendIncrement();
+                        incoming.Record((uint)MessageType.Increment, null);
+                        break;
+                    case clientEp.BeginCount():
+                        State = ProxyState.Running;
+                        DebugStub.Print("CJ: BeginCount\n");
+#if VERSION_2
+                        Sync();
+#endif
+                        serverEp.SendBeginCount();
+                        incoming.Record((uint)MessageType.BeginCount, null);
+                        break;
+                    case clientEp.Next():
+                        State = ProxyState.Running;
+                        DebugStub.Print("CJ: Next\n");
+#if VERSION_2
+                        Sync();
+#endif
+                        serverEp.SendNext();
+                        incoming.Record((uint)MessageType.Next, null);
+                        break;
+                    case clientEp.End():
+                        State = ProxyState.Running;
+                        serverEp.SendEnd();
+#if VERSION_2
+                        Sync();
+#endif
+                        incoming.Record((uint)MessageType.End, null);
+                        break;
+                    case clientEp.ChannelClosed():
+                        State = ProxyState.Running;
+                        // Lost client. Journalet also goes away.
+                        DebugStub.Print("CJ: Client disconnected.\n");
+                        recovery = false;
+                        goto exit;
+                        break;
+
+                    case serverEp.AckIncrement(number):
+#if VERSION_2
+                        Sync();
+#endif
+                        State = ProxyState.Running;
+                        clientEp.SendAckIncrement(number);
+                        ArrayList al = new ArrayList(1);
+                        al.Add(number);
+                        outgoing.Record((uint)MessageType.AckIncrement, al);
+                        break;
+                    case serverEp.Current(number):
+#if VERSION_2
+                        Sync();
+#endif
+                        State = ProxyState.Running;
+                        DebugStub.Print("CJ: Current\n");
+                        clientEp.SendCurrent(number);
+                        ArrayList al = new ArrayList(1);
+                        al.Add(number);
+                        outgoing.Record((uint)MessageType.Current, al);
+                        break;
+                    case serverEp.Terminated():
+#if VERSION_2
+                        Sync();
+#endif
+                        State = ProxyState.Running;
+                        clientEp.SendTerminated();
+                        outgoing.Record((uint)MessageType.Terminated, null);
+                        break;
+                    case serverEp.ChannelClosed():
+                        State = ProxyState.Running;
+                        DebugStub.Print("CJ: Server disconnected.\n");
+                        recovery = true;
+                        goto exit;
+                        break;
+                }
+                State = ProxyState.Waiting;
+            }
+exit:
+            if (recovery) {
+                counterClientRef.Release(clientEp);
+                counterServerRef.Release(serverEp);
+            }
+            else {
+                delete clientEp;
+                delete serverEp;
+            }
+
+            return recovery;
+        }
+
+        protected override bool Recover()
+        {
+            bool            success = false;
+            uint            msg;
+            IList           args;
+            Object          tmp;
+            MessageType     op;
+            CounterContract.Imp:Start serverEp;
+
+            DebugStub.Print("-- Incoming Log Length: {0}\n",
+                            __arglist(incoming.Count));
+            DebugStub.Print("-- Outgoing Log Length: {0}\n",
+                            __arglist(outgoing.Count));
+
+            //
+            // Channel initialization
+            //
+            assume initServerRef != null;
+            DebugStub.Print("CJ: Getting an endpoint...");
+            serverEp = initServerRef.Acquire();
+            switch receive {
+                case serverEp.Success():
+                    break;
+                case serverEp.ChannelClosed():
+                    delete serverEp;
+                    throw new ChannelClosedException();
+                    break;
+            }
+            DebugStub.Print("done.\n");
+
+            //
+            // Channel State Recovery Main Loop
+            //
+            while (incoming.Playback(out msg, out args)) {
+                //
+                // Playback the incoming message
+                //
+                op = (MessageType)msg;
+                switch (op) {
+                    case MessageType.Increment:
+                        serverEp.SendIncrement();
+                        break;
+                    case MessageType.BeginCount:
+                        serverEp.SendBeginCount();
+                        break;
+                    case MessageType.Next:
+                        serverEp.SendNext();
+                        break;
+                    case MessageType.End:
+                        serverEp.SendEnd();
+                        break;
+                }
+
+                //
+                // Playback the outgoing message
+                //
+                bool res = true;
+                res = outgoing.Playback(out msg, out args);
+                op = (MessageType)msg;
+
+                if (!res) {
+                    DebugStub.Print("Playback: End of log. Break.\n");
+                    success = true;
+                    break;
+                }
+                switch receive {
+                    case serverEp.AckIncrement(number):
+                        if (op != MessageType.AckIncrement || args == null) {
+                            // make a decision
+                            // 1. ignore
+                            // 2. notify
+                            success = false;
+                        }
+                        else {
+                            tmp = args[0];
+                            if (tmp == null) {
+                                // make a decision
+                                // 1. ignore
+                                // 2. notify
+                                success = false;
+                            }
+                            else {
+                                int lognum = (int)tmp;
+                                if (number != lognum) {
+                                    // make a decision
+                                    // 1. ignore
+                                    // 2. notify
+                                    success = false;
+                                }
+                                else {
+                                    success = true;
+                                }
+                            }
+                        }
+                        break;
+                    case serverEp.NakIncrement():
+                        if (op != MessageType.NakIncrement) {
+                            // make a decision
+                            // 1. ignore
+                            // 2. notify
+                            success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    case serverEp.Current(number):
+                        if (op != MessageType.Current ||
+                            args == null) {
+                            // make a decision
+                            // 1. ignore
+                            // 2. notify
+                            success = false;
+                        }
+                        else {
+                            tmp = args[0];
+                            if (tmp == null) {
+                                // make a decision
+                                // 1. ignore
+                                // 2. notify
+                                success = false;
+                            }
+                            else {
+                                int lognum = (int)tmp;
+                                if (number != lognum) {
+                                    // make a decision
+                                    // 1. ignore
+                                    // 2. notify
+                                    success = false;
+                                }
+                                else {
+                                    success = true;
+                                }
+                            }
+                        }
+                        break;
+                    case serverEp.Terminated():
+                        if (op != MessageType.Terminated) {
+                            // make a decision
+                            // 1. ignore
+                            // 2. notify
+                                success = false;
+                        }
+                        else {
+                            success = true;
+                        }
+                        break;
+                    case serverEp.ChannelClosed():
+                        delete serverEp;
+                        throw new ChannelClosedException();
+                        break;
+                }
+            } // end of loop
+
+            assume counterServerRef != null;
+            delete counterServerRef.Acquire();
+            counterServerRef.Release(serverEp);
+            return success;
+        }
+    }
+}
+
diff --git a/base/Services/Tests/CounterProxy/CounterJournaletFactory.sg b/base/Services/Tests/CounterProxy/CounterJournaletFactory.sg
new file mode 100644
index 0000000..2cf5958
--- /dev/null
+++ b/base/Services/Tests/CounterProxy/CounterJournaletFactory.sg
@@ -0,0 +1,105 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\CounterProxy\CounterJournaletFactory.sg
+//
+//  Note:   Resilient Service Ver.2
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.CounterProxy
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Exp:Start> myDSRef;
+
+        [Endpoint]
+        public readonly TRef<ManagedProxyContract.Imp:Start> recoveryRef;
+
+        [Endpoint]
+        public readonly TRef<ServiceProxyContract.Exp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    internal class CounterJournaletFactory : JournaletFactory
+    {
+        public bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            // ep must be a type of CounterContract.Exp
+            CounterContract.Exp:Start cep = ep as CounterContract.Exp:Start;
+            return (cep != null);
+        }
+
+        public Journalet2! CreateJournalet([Claims]ServiceContract.Exp:Start! ep,
+                                          out ServiceContract.Exp! newEp)
+        {
+            Journalet2!             journalet;
+            ServiceContract.Exp!    serverEp;
+
+            journalet = new CounterJournalet(ep);
+            journalet.CreateEndpoint(out serverEp);
+            newEp = serverEp;
+            return journalet;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    ep;
+            ManagedProxyContract.Imp:Start      mep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            DirectoryServiceContract.Exp:Start  fep;
+            ServiceProxyContract.Exp:Start      xep;
+            ServiceProxy                        proxy;
+            Thread                              thread;
+
+            dep = ((!)config.directoryRef).Acquire();
+            ep = ((!)config.serviceRef).Acquire();
+            fep = ((!)config.myDSRef).Acquire();
+            mep = ((!)config.recoveryRef).Acquire();
+            xep = ((!)config.proxyRef).Acquire();
+            if (ep == null || dep == null || fep == null || mep == null ||
+                xep == null) {
+                delete ep;
+                delete dep;
+                delete fep;
+                delete mep;
+                delete xep;
+                return -1;
+            }
+
+            proxy = new ServiceProxy(new CounterJournaletFactory(),
+                                     ep, mep, dep, fep, xep);
+            thread = new Thread(new ThreadStart(proxy.Run));
+            thread.Start();
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/CounterProxy/CounterProxy.csproj b/base/Services/Tests/CounterProxy/CounterProxy.csproj
new file mode 100644
index 0000000..bb9381a
--- /dev/null
+++ b/base/Services/Tests/CounterProxy/CounterProxy.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CounterProxy</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="CounterJournaletFactory.sg"/>
+    <Compile Include="CounterJournalet.sg"/>
+   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Resiliency\Resiliency.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Dummy/Dummy.sg b/base/Services/Tests/Dummy/Dummy.sg
new file mode 100644
index 0000000..2e035d1
--- /dev/null
+++ b/base/Services/Tests/Dummy/Dummy.sg
@@ -0,0 +1,89 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Dummy\Dummy.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+
+namespace Microsoft.Singularity.Services
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceContractRef;
+        reflective private Parameters();
+    }
+
+    internal sealed class Dummy : IRunnable
+    {
+        private TRef<ThreadTerminationContract.Exp:Start> signalRef;
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            signalRef = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        public void Run()
+        {
+            ThreadTerminationContract.Exp:Start signal;
+
+            DebugStub.Print("-- Start Dummy Service\n");
+
+            assert signalRef != null;
+            signal = signalRef.Acquire();
+            for (;;) {
+                switch receive {
+                    case signal.Stop():
+                        goto exit;
+                        break;
+                    case signal.ChannelClosed():
+                        goto exit;
+                        break;
+                }
+                Thread.Sleep(1000);
+                DebugStub.Print("Dummy\n");
+            }
+exit:
+            signalRef.Release(signal);
+
+            DebugStub.Print("-- End Dummy Service\n");
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            IRunnable   dummy;
+            IRunnable   manageExec;
+            Thread      thread;
+            ManagedServiceContract.Exp          mep;
+
+            mep = ((!)config.serviceContractRef).Acquire(); 
+            if (mep == null) {
+                delete mep;
+                return -1;
+            }
+         
+            dummy = new Dummy();
+            manageExec = new ManagementExec(mep, dummy);
+            thread = new Thread(new ThreadStart(manageExec.Run));
+            thread.Start();
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/Dummy/dummy.csproj b/base/Services/Tests/Dummy/dummy.csproj
new file mode 100644
index 0000000..4665243
--- /dev/null
+++ b/base/Services/Tests/Dummy/dummy.csproj
@@ -0,0 +1,32 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CounterService</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Dummy.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Replace/GameTable.sg b/base/Services/Tests/Replace/GameTable.sg
new file mode 100644
index 0000000..ed9140b
--- /dev/null
+++ b/base/Services/Tests/Replace/GameTable.sg
@@ -0,0 +1,305 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Replace\GameTable.sg
+//
+//  Note:
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Text;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.Replace
+{
+    internal sealed class GameTable
+    {
+        //private const String[]  Names = new String[4] {"Microsoft", "Google", "Yahoo", "Apple"};
+        private readonly String[]! Names;
+        private const String    ProtectionString = "PROTECTED";
+
+        private const int       NumberOfNames = 4;
+        private const int       ProtectionPeriod = 500;
+        private const int       TableSize = 100;
+        private String[]!       table;
+        private ASCIIEncoding!  encoding;
+        private Random!         random;
+
+        private TRef<ServiceProxyContract.Imp:Ready>!   proxyRef;
+
+        internal GameTable([Claims]ServiceProxyContract.Imp:Start! ep)
+        {
+            DebugStub.Print("Waiting for Success message\n");
+            switch receive {
+                case ep.Success():
+                    break;
+                case unsatisfiable:
+                    new ArgumentException();
+                    break;
+            }
+            DebugStub.Print("done\n");
+            Names = new String[4] {"Microsoft", "Google", "Yahoo", "Apple"};
+            this.table = new String[TableSize];
+            this.proxyRef = new TRef<ServiceProxyContract.Imp:Ready>(ep);
+            this.encoding = new ASCIIEncoding();
+            Thread.Sleep(1);
+            this.random = new Random();
+        }
+
+        internal void Initialize()
+        {
+            ServiceProxyContract.Imp:Ready! ep;
+
+            ep = proxyRef.Acquire();
+            DebugStub.Print("Downloading\n");
+            ep.SendDownload();
+            switch receive {
+                case ep.AckDownload(buffer):
+                {
+                    Deserialize(buffer, table);
+                    delete buffer;
+                    break;
+                }
+                case ep.NakDownload():
+                {
+                    int j = 0;
+                    for (int i = 0; i < TableSize; i++) {
+                        table[i] = Names[j++];
+                        if (j >= NumberOfNames) {
+                            j = 0;
+                        }
+                    }
+                    break;
+                }
+                case unsatisfiable:
+                {
+                    DebugStub.Break();
+                    break;
+                }
+            }
+            proxyRef.Release(ep);
+
+            DebugStub.Print("-- Initial Score\n");
+            Print();
+            DebugStub.Break();
+        }
+
+        internal void Commit()
+        {
+            ServiceProxyContract.Imp:Ready! ep;
+            byte[]! in ExHeap               buffer;
+
+            DebugStub.Print("-- Commit\n");
+            Print();
+
+            Serialize(table, out buffer);
+
+            ep = proxyRef.Acquire();
+            ep.SendUpload(buffer);
+            switch receive {
+                case ep.AckUpload():
+                    break;
+                case unsatisfiable:
+                    DebugStub.Break();
+                    break;
+            }
+            proxyRef.Release(ep);
+        }
+
+        internal int Lookup(string! query)
+        {
+            int start;
+            int current;
+
+            start = random.Next(TableSize);
+
+            assert 0 <= start && start < TableSize;
+
+            if (table[start] == query) {
+                return start;
+            }
+
+            current = start + 1;
+            if (current >= TableSize) {
+                current = 0;
+            }
+
+            while (current != start) {
+                assert 0 <= current && current < TableSize;
+                if (table[current] == query) {
+                    break;
+                }
+                ++current;
+                if (current >= TableSize) {
+                    current = -1;
+                }
+            }
+
+            if (current == start) {
+                current = -1;
+            }
+
+            return current;
+        }
+
+        internal void Replace(string! query, int position)
+        {
+            //DebugStub.Print("-- Replace {0}\n", __arglist(position));
+            if (position < 0 || TableSize <= position) {
+                return;
+            }
+
+            lock (this) {
+                if (!((!)table[position]).EndsWith(ProtectionString)) {
+                    table[position] = query;
+                }
+                else {
+                    DebugStub.Print("Protected!!\n");
+                }
+            }
+        }
+
+        internal void Lock(int position)
+        {
+            String! tmp;
+
+            if (position < 0 || TableSize <= position) {
+                return;
+            }
+
+            tmp = (!)table[position];
+            lock (this) {
+                table[position] += ProtectionString;
+            }
+            Thread.Sleep(ProtectionPeriod);
+            lock (this) {
+                table[position] = tmp;
+            }
+        }
+
+        internal int Score(string! query)
+        {
+            int count = 0;
+            lock (this) {
+                foreach (String! str in table) {
+                    if (str.StartsWith(query)) {
+                        ++count;
+                    }
+                }
+            }
+            return count;
+        }
+
+        internal void Print()
+        {
+            foreach (String! player in Names) {
+                DebugStub.Print("{0} : {1}\n",
+                                __arglist(player, Score(player)));
+            }
+        }
+
+        private void Serialize(string[]! src, out byte[]! in ExHeap dest)
+        {
+            byte[][]!           conversion = new byte[TableSize][];
+            byte[]              buffer;
+            byte[] in ExHeap    exBuffer;
+            int                 size = 0;
+            int                 offset = 0;
+
+            //
+            // Enumerate table elements
+            //
+            lock (this) {
+                for (int i = 0; i < TableSize; i++) {
+                    conversion[i] = encoding.GetBytes((!)src[i]);
+                    if (conversion[i] != null) {
+                        size += ((!)conversion[i]).Length + sizeof(int) * 2;
+                    }
+                    else {
+                        throw new NullReferenceException();
+                    }
+                }
+            }
+            assert 0 <= size && size < Int32.MaxValue;
+
+            //
+            // Create a base buffer
+            //
+            buffer = new byte[size];
+            offset = 0;
+            for (int i = 0; i < TableSize; i++) {
+                // length
+                Buffer.BlockCopy(BitConverter.GetBytes(((!)conversion[i]).Length),
+                                 0, buffer, offset, sizeof(int));
+                offset += sizeof(int);
+
+                // index
+                Buffer.BlockCopy(BitConverter.GetBytes(i), 0,
+                                 buffer, offset, sizeof(int));
+                offset += sizeof(int);
+
+                // contents
+                Buffer.BlockCopy(conversion[i], 0, buffer, offset,
+                                 ((!)conversion[i]).Length);
+                offset += ((!)conversion[i]).Length;
+            }
+
+            // 
+            // Copy to ExHeap
+            //
+            exBuffer = Bitter.FromByteArray(buffer);
+            dest = exBuffer;
+        }
+
+        private void Deserialize(byte[]! in ExHeap src, string[]! dest)
+        {
+            byte[]! copyBuffer = Bitter.ToByteArray(src);
+            byte[]  storeBuffer;
+            int     length = src.Length;
+            int     count;
+            int     id;
+            int     offset = 0;
+
+            lock (this) {
+                while (offset + 8 < length) {
+                    // length
+                    count = BitConverter.ToInt32(copyBuffer, offset);
+
+                    offset += sizeof(int);
+                    if (offset >= length) {
+                        break;
+                    }
+
+                    // index
+                    id = BitConverter.ToInt32(copyBuffer, offset);
+
+                    offset += sizeof(int);
+                    if (offset >= length) {
+                        break;
+                    }
+
+                    // contents
+                    storeBuffer = new byte[count];
+                    Buffer.BlockCopy(copyBuffer, offset, storeBuffer, 0, count);
+                    offset += count;
+                    if (id < TableSize) {
+                        dest[id] = encoding.GetString(storeBuffer);
+                    }
+                    else {
+                        DebugStub.Break();
+                        // throw new Exception();
+                    }
+                }
+            }
+        }
+    } // class
+}
diff --git a/base/Services/Tests/Replace/ReplaceGame.csproj b/base/Services/Tests/Replace/ReplaceGame.csproj
new file mode 100644
index 0000000..d218c0d
--- /dev/null
+++ b/base/Services/Tests/Replace/ReplaceGame.csproj
@@ -0,0 +1,34 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ReplaceGameService</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="GameTable.sg"/>
+    <Compile Include="ReplaceServer.sg"/>
+    <Compile Include="ReplaceWorker.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Counter.Contracts\Counter.Contracts.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Replace/ReplaceServer.sg b/base/Services/Tests/Replace/ReplaceServer.sg
new file mode 100644
index 0000000..955984c
--- /dev/null
+++ b/base/Services/Tests/Replace/ReplaceServer.sg
@@ -0,0 +1,139 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Replace\ReplaceServer.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.Replace
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<ServiceProxyContract.Imp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    internal sealed class ReplaceServer : WorkerServiceExec
+    {
+        private GameTable  table;
+        private TRef<ServiceProxyContract.Imp:Start>!   proxyRef;
+
+        internal ReplaceServer([Claims]DirectoryServiceContract.Imp:Ready! dep,
+                               [Claims]ServiceProxyContract.Imp:Start! sep)
+            : base(dep, GamePlayerContract.ModuleName)
+        {
+            proxyRef = new TRef<ServiceProxyContract.Imp:Start>(sep);
+        }
+
+        public override void Run()
+        {
+            ServiceProviderContract.Exp!            provider;
+            ThreadTerminationContract.Exp:Start!    signal;
+
+            if (signalRef == null) {
+                throw new Exception("Signal is empty.");
+            }
+
+            DebugStub.Print("-- Replace Game Server Start!\n");
+            if (!RegisterName(out provider)) {
+                delete provider;
+                return;
+            }
+            DebugStub.Print("-- name registered\n");
+
+            table = new GameTable(proxyRef.Acquire());
+            table.Initialize();
+
+            signal = signalRef.Acquire();
+            while (Listen(provider, signal));
+            signalRef.Release(signal);
+
+            DeregisterName(provider);
+
+            DebugStub.Print("-- Final Score --\n");
+            table.Print();
+        }
+
+        protected override bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            GamePlayerContract.Exp:Start newEp = ep as GamePlayerContract.Exp:Start;
+            return (newEp != null);
+        }
+
+        protected override IRunnable NewWorker([Claims]ServiceContract.Exp:Start! ep)
+        {
+            GamePlayerContract.Exp:Start    newEp;
+           
+            newEp = ep as GamePlayerContract.Exp:Start;
+            if (newEp == null) {
+                delete ep;
+                return null;
+            }
+
+            if (table == null) {
+                delete newEp;
+                return null;
+            }
+
+            return new ReplaceWorker(newEp, table);
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    mep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            ServiceProxyContract.Imp:Start      sep;
+            IRunnable                           service;
+            IRunnable                           manageExec;
+            Thread                              thread;
+            GameTable                           table;
+
+            if (config.serviceRef == null ||
+                config.directoryRef == null ||
+                config.proxyRef == null) 
+            {
+                return -1;
+            }
+            mep = config.serviceRef.Acquire();
+            dep = config.directoryRef.Acquire();
+            sep = config.proxyRef.Acquire();
+
+            DebugStub.Print("-- server process enter\n");
+            service = new ReplaceServer(dep, sep);
+            manageExec = new ManagementExec(mep, service);
+            thread = new Thread(new ThreadStart(manageExec.Run));
+            thread.Start();
+            thread.Join();
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/Replace/ReplaceWorker.sg b/base/Services/Tests/Replace/ReplaceWorker.sg
new file mode 100644
index 0000000..28b0f22
--- /dev/null
+++ b/base/Services/Tests/Replace/ReplaceWorker.sg
@@ -0,0 +1,92 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File: Service\Test\Replace\ReplaceWorker.sg
+//
+//  Note:
+//
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+namespace Microsoft.Singularity.Services.Replace
+{
+    internal sealed class ReplaceWorker : IRunnable
+    {
+        private TRef<ThreadTerminationContract.Exp:Start>   signalRef;
+        private TRef<GamePlayerContract.Exp:Start>!         gameRef;
+        private GameTable!                                  table;
+
+        internal ReplaceWorker([Claims]GamePlayerContract.Exp:Start! ep,
+                               GameTable! table)
+        {
+            this.gameRef = new TRef<GamePlayerContract.Exp:Start>(ep);
+            this.table = table;
+        }
+
+        public void Signal([Claims]ThreadTerminationContract.Exp:Start! ep)
+        {
+            signalRef = new TRef<ThreadTerminationContract.Exp:Start>(ep);
+        }
+
+        public void Run()
+        {
+            GamePlayerContract.Exp:Start!           ep;
+            ThreadTerminationContract.Exp:Start!    signal;
+
+            ep = gameRef.Acquire();
+            ep.SendSuccess();
+            assert signalRef != null;
+            signal = signalRef.Acquire();
+
+            for (;;) {
+                switch receive {
+                    case ep.Search(query):
+                        int current = table.Lookup(Bitter.ToString2(query));
+                        ep.SendAckSearch(current);
+                        delete query;
+                        break;
+                    case ep.Overwrite(replacement, position):
+                        table.Replace(Bitter.ToString2(replacement), position);
+                        ep.SendAckOverwrite();
+                        //Checkpoint();
+                        table.Commit();
+                        delete replacement;
+                        break;
+                    case ep.Protect(position):
+                        table.Lock(position);
+                        ep.SendAckProtect();
+                        break;
+                    case ep.Score(query):
+                        int score = table.Score(Bitter.ToString2(query));
+                        ep.SendAckScore(score);
+                        delete query;
+                        break;
+                    case ep.ChannelClosed():
+                        goto exit;
+                        break;
+                    case signal.Stop():
+                        signal.SendAckStop();
+                        goto exit;
+                        break;
+                    case signal.ChannelClosed():
+                        goto exit;
+                        break;
+                }
+            } // End of loop
+exit:
+            gameRef.Release(ep);
+            assert signalRef != null;
+            signalRef.Release(signal);
+        }
+    }
+}
diff --git a/base/Services/Tests/ReplaceProxy/ReplaceJournalet.sg b/base/Services/Tests/ReplaceProxy/ReplaceJournalet.sg
new file mode 100644
index 0000000..29186a0
--- /dev/null
+++ b/base/Services/Tests/ReplaceProxy/ReplaceJournalet.sg
@@ -0,0 +1,360 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\ReplaceProxy\ReplaceJournalet.sg
+//
+//  Note:   
+//
+using System;
+using System.Threading;
+using System.Collections;
+using Microsoft.SingSharp;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.ServiceManager;
+
+namespace Microsoft.Singularity.Services.ReplaceProxy
+{
+    internal enum MessageType : uint
+    {
+        Unknown,
+        Search,
+        Overwrite,
+        Protect,
+        Score,
+        AckSearch,
+        AckOverwrite,
+        AckProtect,
+        AckScore,
+    }
+
+    internal sealed class ReplaceJournalet : Journalet2
+    {
+        private Log!    incoming;
+        private Log!    outgoing;
+        private TRef<GamePlayerContract.Imp:Start>  initImpRef;
+        private TRef<GamePlayerContract.Exp:Start>! initExpRef;
+        private TRef<GamePlayerContract.Imp:Ready>  gameImpRef;
+        private TRef<GamePlayerContract.Exp:Ready>  gameExpRef;
+
+        internal ReplaceJournalet([Claims]ServiceContract.Exp:Start! ep)
+            : base()    // Initializes the thread to run the journalet
+        {
+            GamePlayerContract.Exp:Start    newEp;
+
+            newEp = ep as GamePlayerContract.Exp:Start;
+            if (newEp == null) {
+                throw new ArgumentException();
+            }
+            this.incoming = new Log();
+            this.outgoing = new Log();
+            this.initExpRef = new TRef<GamePlayerContract.Exp:Start>(newEp);
+        }
+
+        public override void CreateEndpoint(out ServiceContract.Exp! ep)
+        {
+            GamePlayerContract.Imp! imp;
+            GamePlayerContract.Exp! exp;
+
+            GamePlayerContract.NewChannel(out imp, out exp);
+            initImpRef = new TRef<GamePlayerContract.Imp:Start>(imp);
+            ep = exp;
+        }
+
+        public override void Flush()
+        {
+            incoming.Flush();
+            outgoing.Flush();
+        }
+
+        protected override bool Initialize()
+        {
+            bool                            success = false;
+            GamePlayerContract.Imp:Start!   imp;
+            GamePlayerContract.Exp:Start!   exp;
+
+            assert initImpRef != null;
+            imp = initImpRef.Acquire();
+            exp = initExpRef.Acquire();
+
+            switch receive {
+                case imp.Success():
+                    exp.SendSuccess();
+                    success = true;
+                    break;
+                case unsatisfiable:
+                    success = false;
+                    break;
+            }
+
+            if (success) {
+                gameImpRef = new TRef<GamePlayerContract.Imp:Ready>(imp);
+                gameExpRef = new TRef<GamePlayerContract.Exp:Ready>(exp);
+            }
+            else {
+                delete imp;
+                delete exp;
+            }
+            return success;
+        }
+
+        protected override bool HandleMessages()
+        {
+            bool                            recovery = false;
+            GamePlayerContract.Imp:Ready!   imp;
+            GamePlayerContract.Exp:Ready!   exp;
+
+            assert gameImpRef != null;
+            assert gameExpRef != null;
+            imp = gameImpRef.Acquire();
+            exp = gameExpRef.Acquire();
+
+            for (;;) {
+                switch receive {
+                    case exp.Search(array):
+                    {
+                        Sync();
+
+                        String obj = Bitter.ToString2(array);
+                        IList args = new ArrayList(1);
+                        args.Add(obj);
+                        incoming.Record((uint)MessageType.Search, args);
+                        imp.SendSearch(array);
+                        DebugStub.Print("Search {0}\n",
+                                        __arglist(incoming.Count));
+                        break;
+                    }
+                    case exp.Overwrite(array, number):
+                    {
+                        Sync();
+
+                        String obj = Bitter.ToString2(array);
+                        IList args = new ArrayList(2);
+                        args.Add(obj);
+                        args.Add(number);
+                        incoming.Record((uint)MessageType.Overwrite, args);
+                        imp.SendOverwrite(array, number);
+                        DebugStub.Print("Overwrite {0}\n",
+                                        __arglist(incoming.Count));
+                        break;
+                    }
+                    case exp.Protect(number):
+                    {
+                        Sync();
+
+                        IList args = new ArrayList(1);
+                        args.Add(number);
+                        incoming.Record((uint)MessageType.Protect, args);
+                        imp.SendProtect(number);
+                        DebugStub.Print("Protect {0}\n",
+                                        __arglist(incoming.Count));
+                        break;
+                    }
+                    case exp.Score(array):
+                    {
+                        Sync();
+
+                        String obj = Bitter.ToString2(array);
+                        IList args = new ArrayList(1);
+                        args.Add(obj);
+                        incoming.Record((uint)MessageType.Score, args);
+                        imp.SendScore(array);
+                        DebugStub.Print("Score {0}\n",
+                                        __arglist(incoming.Count));
+                        break;
+                    }
+                    case imp.AckSearch(number):
+                        IList args = new ArrayList(1);
+                        args.Add(number);
+                        outgoing.Record((uint)MessageType.AckSearch, args);
+                        exp.SendAckSearch(number);
+                        break;
+                    case imp.AckOverwrite():
+                        exp.SendAckOverwrite();
+                        // snapshot
+                        Checkpoint();
+                        Flush();
+                        break;
+                    case imp.AckProtect():
+                        exp.SendAckProtect();
+                        // truncate
+                        Flush();
+                        break;
+                    case imp.AckScore(number):
+                        exp.SendAckScore(number);
+                        // truncate
+                        Flush();
+                        break;
+                    case exp.ChannelClosed():
+                    {
+                        goto exit;
+                        break;
+                    }
+                    case imp.ChannelClosed():
+                    {
+                        recovery = true;
+                        goto exit;
+                        break;
+                    }
+                }
+            }
+exit:
+            if (recovery) {
+                gameImpRef.Release(imp);
+                gameExpRef.Release(exp);
+            }
+            else {
+                delete imp;
+                delete exp;
+            }
+            return recovery;
+        }
+
+        protected override bool Recover()
+        {
+            GamePlayerContract.Imp!         imp;
+            IEnumerator                     enumerator;
+            uint                            msg;
+            IList                           args;
+
+            DebugStub.Print("ReplaceJ: Enter Recover\n");
+            assert initImpRef != null;
+            imp = initImpRef.Acquire();
+            switch receive {
+                case imp.Success():
+                    break;
+                case imp.ChannelClosed():
+                    throw new ChannelClosedException();
+                    break;
+                case unsatisfiable:
+                    throw new ArgumentException();
+                    break;
+            }
+
+            DebugStub.Print("ReplaceJ: Length: {0}\n",
+                            __arglist(incoming.Count));
+            enumerator = incoming.GetEnumerator();
+            if (!enumerator.MoveNext()) {
+                //delete gameImpRef.Acquire();
+                //gameImpRef.Release(imp);
+                gameImpRef = new TRef<GamePlayerContract.Imp:Ready>(imp);
+                DebugStub.Print("ReplaceJ: log is empty. Return\n");
+                return true;
+            }
+            try {
+                while (incoming.Playback(out msg, out args)) {
+                    DebugStub.Print("ReplaceJ: sending msg: {0}\n",
+                                    __arglist((int)msg));
+                    if (args != null) {
+                        DebugStub.Print("ReplaceJ: num args: {0}\n",
+                                        __arglist(args.Count));
+                    }
+                    switch ((MessageType)msg) {
+                        case MessageType.Search:
+                        {
+                            if (args == null) {
+                                throw new NullReferenceException();
+                            }
+                            Object obj = args[0];
+                            if (obj == null) {
+                                throw new NullReferenceException();
+                            }
+                            String str = obj as String;
+                            if (str == null) {
+                                throw new NullReferenceException();
+                            }
+                            DebugStub.Print("Replay Search '{0}'\n",
+                                            __arglist(str));
+                            imp.SendSearch(Bitter.FromString2(str));
+                            break;
+                        }
+                        case MessageType.Overwrite:
+                        {
+                            if (args == null) {
+                                throw new NullReferenceException();
+                            }
+                            Object obj = args[0];
+                            if (obj == null) {
+                                throw new NullReferenceException();
+                            }
+                            String str = obj as String;
+                            if (str == null) {
+                                throw new NullReferenceException();
+                            }
+                            obj = args[1];
+                            if (obj == null) {
+                                throw new NullReferenceException();
+                            }
+                            DebugStub.Print("Replay Overwrite '{0}' @ {1}\n",
+                                            __arglist(str, (int)obj));
+                            imp.SendOverwrite(Bitter.FromString2(str),
+                                              (int)obj);
+                            break;
+                        }
+                        case MessageType.Protect:
+                        {
+                            if (args == null) {
+                                throw new NullReferenceException();
+                            }
+                            Object obj = args[0];
+                            if (obj == null) {
+                                throw new NullReferenceException();
+                            }
+                            DebugStub.Print("Replay Protect {0}\n",
+                                            __arglist((int)obj));
+                            imp.SendProtect((int)obj);
+                            break;
+                        }
+                        case MessageType.Score:
+                        {
+                            if (args == null) {
+                                throw new NullReferenceException();
+                            }
+                            Object obj = args[0];
+                            if (obj == null) {
+                                throw new NullReferenceException();
+                            }
+                            String str = obj as String;
+                            if (str == null) {
+                                throw new NullReferenceException();
+                            }
+                            imp.SendScore(Bitter.FromString2(str));
+                            break;
+                        }
+                    }
+
+                    if (!outgoing.Playback(out msg, out args)) {
+                        DebugStub.Print("End of log, break\n");
+                        break;
+                    }
+                    switch receive {
+                        case imp.AckSearch(position):
+                            break;
+                        case imp.AckOverwrite():
+                            break;
+                        case imp.AckProtect():
+                            break;
+                        case imp.AckScore(score):
+                            break;
+                        case imp.ChannelClosed():
+                            throw new ChannelClosedException();
+                            break;
+                    }
+                } // End Of Loop
+            }
+            catch (InvalidOperationException) {}
+            finally {
+                //delete gameImpRef.Acquire();
+                //gameImpRef.Release(imp);
+                gameImpRef = new TRef<GamePlayerContract.Imp:Ready>(imp);
+            }
+            DebugStub.Print("ReplaceJ: End of recovery\n");
+            return true;
+        }
+    } // class
+}
diff --git a/base/Services/Tests/ReplaceProxy/ReplaceJournaletFactory.sg b/base/Services/Tests/ReplaceProxy/ReplaceJournaletFactory.sg
new file mode 100644
index 0000000..41d2948
--- /dev/null
+++ b/base/Services/Tests/ReplaceProxy/ReplaceJournaletFactory.sg
@@ -0,0 +1,103 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Services\Tests\ReplaceProxy\ReplaceJournaletFactory.sg
+//
+//  Note:
+using System;
+using System.Threading;
+using Microsoft.SingSharp;
+using Microsoft.SingSharp.Reflection;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Resiliency;
+using Microsoft.Singularity.Security;
+using Microsoft.Singularity.ServiceManager;
+using Microsoft.Singularity.Services;
+
+[assembly: Transform(typeof(ServiceResourceTransform))]
+[assembly: ApplicationPublisherAttribute("singularity.microsoft.com")]
+[assembly: AssertPrivilegeAttribute("$register-privilege.localhost")]
+
+namespace Microsoft.Singularity.Services.ReplaceProxy
+{
+    [Category("Service")]
+    internal sealed class Parameters
+    {
+        [Endpoint]
+        public readonly TRef<ManagedServiceContract.Exp:Start> serviceRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Imp:Ready> directoryRef;
+
+        [Endpoint]
+        public readonly TRef<DirectoryServiceContract.Exp:Start> myDSRef;
+
+        [Endpoint]
+        public readonly TRef<ManagedProxyContract.Imp:Start> recoveryRef;
+
+        [Endpoint]
+        public readonly TRef<ServiceProxyContract.Exp:Start> proxyRef;
+
+        reflective private Parameters();
+    }
+
+    internal class ReplaceJournaletFactory : JournaletFactory
+    {
+        public bool Accept(ServiceContract.Exp:Start! ep)
+        {
+            GamePlayerContract.Exp:Start cep = ep
+                as GamePlayerContract.Exp:Start;
+            return (cep != null);
+        }
+
+        public Journalet2! CreateJournalet([Claims]ServiceContract.Exp:Start! ep,
+                                          out ServiceContract.Exp! newEp)
+        {
+            Journalet2!             journalet;
+            ServiceContract.Exp!    serverEp;
+
+            journalet = new ReplaceJournalet(ep);
+            journalet.CreateEndpoint(out serverEp);
+            newEp = serverEp;
+            return journalet;
+        }
+
+        internal static int AppMain(Parameters! config)
+        {
+            ManagedServiceContract.Exp:Start    ep;
+            ManagedProxyContract.Imp:Start      mep;
+            DirectoryServiceContract.Imp:Ready  dep;
+            DirectoryServiceContract.Exp:Start  fep;
+            ServiceProxyContract.Exp:Start      xep;
+            ServiceProxy                        proxy;
+            Thread                              thread;
+
+            if (config.directoryRef == null ||
+                config.serviceRef == null || 
+                config.myDSRef == null ||
+                config.recoveryRef == null ||
+                config.proxyRef == null) 
+            {
+                return -1;
+            }
+            dep = config.directoryRef.Acquire();
+            ep = config.serviceRef.Acquire();
+            fep = config.myDSRef.Acquire();
+            mep = config.recoveryRef.Acquire();
+            xep = config.proxyRef.Acquire();
+
+            proxy = new ServiceProxy(new ReplaceJournaletFactory(),
+                                     ep, mep, dep, fep, xep);
+            thread = new Thread(new ThreadStart(proxy.Run));
+            thread.Start();
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Services/Tests/ReplaceProxy/ReplaceProxy.csproj b/base/Services/Tests/ReplaceProxy/ReplaceProxy.csproj
new file mode 100644
index 0000000..f1c7caf
--- /dev/null
+++ b/base/Services/Tests/ReplaceProxy/ReplaceProxy.csproj
@@ -0,0 +1,40 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>ReplaceProxy</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ReplaceJournaletFactory.sg"/>
+    <Compile Include="ReplaceJournalet.sg"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\DirectoryService.Utils\DirectoryService.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\FileSystem.Utils\FileSystem.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Resiliency\Resiliency.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Security\Security.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Services\Services.Utils.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Xml\Xml.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\System.IO\System.IO.csproj" />
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\ServiceManager.Contracts\ServiceManager.Contracts.csproj" />
+    <!-- <ProjectReference Include="$(SINGULARITY_ROOT)\Contracts\Replace.Contracts\Replace.Contracts.csproj" /> -->
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ServiceCategory.targets" />
+
+</Project>
diff --git a/base/Services/Tests/Tests.csproj b/base/Services/Tests/Tests.csproj
new file mode 100644
index 0000000..cdb70b7
--- /dev/null
+++ b/base/Services/Tests/Tests.csproj
@@ -0,0 +1,20 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\..\Paths.targets"/>
+
+  <ItemGroup>
+    <ProjectReference Include="*/*.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+</Project>
diff --git a/base/Services/transforms/ServiceTransform.csproj b/base/Services/transforms/ServiceTransform.csproj
new file mode 100644
index 0000000..e11bf8c
--- /dev/null
+++ b/base/Services/transforms/ServiceTransform.csproj
@@ -0,0 +1,25 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>ServiceTransform</AssemblyName>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="ServiceTransform.sg" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\ConsoleCategory.targets" />
+
+</Project>
diff --git a/base/Services/transforms/ServiceTransform.sg b/base/Services/transforms/ServiceTransform.sg
new file mode 100644
index 0000000..94144d9
--- /dev/null
+++ b/base/Services/transforms/ServiceTransform.sg
@@ -0,0 +1,125 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   WebAppTransform.sg
+//
+//  Creates startup boilerplate code from Resource descriptions for processes started by cassini.
+//
+
+using Microsoft.SingSharp;
+using Microsoft.Contracts;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Extending;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity.Configuration;
+using Microsoft.Singularity.V1.Services;
+using System;
+
+namespace Microsoft.Singularity.Services{
+
+    transform ServiceResourceTransform
+        where $EndpointType : unmanaged struct, Endpoint, ITracked
+	{ 	
+        [Category("Service")]
+        class $Arguments  {
+
+			[Endpoint(*)]
+            TRef<$EndpointType,$State> $$endpoints;
+            
+            [StringParameter(_, _, _)]
+            string $$strings;
+
+            [StringArrayParameter(_, _, _)]
+            string[] $$stringArrays;
+
+            [LongParameter(_, _, _)]
+            long $$longs;
+
+            [BoolParameter(_, _, _)]
+            bool $$bools;
+            
+			implement private $Arguments() {
+				DebugStub.WriteLine("ServiceTransform applied");
+
+				int index;
+				ParameterCode code; 
+
+                index = 0; 
+				forall ( ; $s in $$strings ; ) {
+                    string stringArg;
+				    code = Process.GetStartupStringArg(index, out stringArg);
+                    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup string array {0}. code={1}", index, code));
+                    }
+                    this.$s = stringArg;
+				    //DebugStub.WriteLine("got string {0}=({1})",__arglist(index, $s)); 
+				    ++index;  
+				}
+
+                index = 0; 
+				forall ( ; $sa in $$stringArrays ; ) {
+                    string[] stringArrayArg;
+				    code = Process.GetStartupStringArrayArg(index, out stringArrayArg );
+				    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup string {0}. code={1}", index, code));
+				    } 
+                    this.$sa = stringArrayArg;
+				    //DebugStub.WriteLine("got string {0}=({1})",__arglist(index, $s)); 
+				    ++index;  
+				}
+                
+                index = 0; 
+				forall ( ; $l in $$longs ; ) {
+                    long longArg;
+				    code = ProcessService.GetStartupLongArg(index, out longArg);
+				    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup integer {0}. code={1}", index, code));
+				    }
+                    this.$l = longArg;
+				    //DebugStub.WriteLine("got long {0}=({1})",__arglist(index, $l)); 
+				    ++index; 
+                }
+                
+                index = 0; 
+				forall ( ; $b in $$bools ; ) {
+				    bool b;
+				    code = ProcessService.GetStartupBoolArg(index, out b);
+				    if (code != ParameterCode.Success) {
+                        throw new ArgumentException(String.Format("error acquiring startup bool {0}. code={1}", index, code));
+				    }
+				    this.$b = b;
+				    //DebugStub.WriteLine("got bool {0}=({1})",__arglist(index, b)); 
+				    ++index; 
+				}
+                index = 0; 
+				forall ( ; $e in $$endpoints; ){
+                    $e.$EndpointType* in ExHeap opt($e.$State) ep = Process.GetStartupEndpoint(index)
+                        as $e.$EndpointType* in ExHeap opt($e.$State);
+                    if (ep == null) {
+                        throw new ArgumentException(String.Format("missing startup endpoint {0}", index));
+                    }
+			        $e = new TRef<$e.$EndpointType, $e.$State> (ep);
+			        DebugStub.WriteLine("getting endpoint at {0}",__arglist(index));
+					++index;
+				}
+			}
+
+            generate public static int Main() {
+                $Arguments args = new $Arguments();
+
+                return $Application.AppMain(args);
+            }
+
+        }
+
+        class $Application {
+
+            internal static int AppMain($Arguments! args);
+
+		}
+	}
+}
diff --git a/base/Singularity.V1.ABI.Txt b/base/Singularity.V1.ABI.Txt
new file mode 100644
index 0000000..f7b9abf
--- /dev/null
+++ b/base/Singularity.V1.ABI.Txt
@@ -0,0 +1,164 @@
+Process & Execution Context: [31]
+============================
+Processes_ProcessHandle::g_Create(wchar_t *,int *,int,struct Processes_ProcessHandle *)
+Processes_ProcessHandle::g_Create(wchar_t *,int *,int,struct Services_SharedHeapService_Allocation *,struct Processes_ProcessHandle *)
+Processes_ProcessHandle::g_Create(wchar_t *,int *,int,wchar_t *,int,struct Services_SharedHeapService_Allocation *,struct Processes_ProcessHandle *)
+Processes_ProcessHandle::g_Dispose(struct Processes_ProcessHandle)
+Processes_ProcessHandle::g_GetExitCode(struct Processes_ProcessHandle)
+Processes_ProcessHandle::g_GetPrincipal(int,struct Class_System_String *)
+Processes_ProcessHandle::g_GetPrincipal(struct Processes_ProcessHandle,struct Class_System_String *)
+Processes_ProcessHandle::g_GetProcessId(struct Processes_ProcessHandle)
+Processes_ProcessHandle::g_Join(struct Processes_ProcessHandle,bool *)
+Processes_ProcessHandle::g_Join(struct Processes_ProcessHandle,struct Struct_System_DateTime,bool *)
+Processes_ProcessHandle::g_Join(struct Processes_ProcessHandle,struct Struct_System_TimeSpan,bool *)
+Processes_ProcessHandle::g_Resume(struct Processes_ProcessHandle,bool)
+Processes_ProcessHandle::g_Start(struct Processes_ProcessHandle)
+Processes_ProcessHandle::g_Stop(struct Processes_ProcessHandle,int)
+Processes_ProcessHandle::g_Suspend(struct Processes_ProcessHandle,bool)
+Processes_ProcessHandle::g_SuspendBarrier(void)
+Services_ProcessService::g_GetContextSwitchCount(void)
+Services_ProcessService::g_GetCurrentProcessId(void)
+Services_ProcessService::g_GetCycleCount(void)
+Services_ProcessService::g_GetCyclesPerSecond(void)
+Services_ProcessService::g_GetStartupArg(int,wchar_t *,int)
+Services_ProcessService::g_GetStartupArgCount(void)
+Services_ProcessService::g_GetStartupEndpointCount(void)
+Services_ProcessService::g_GetTracingHeaders(struct Services_LogEntry * *,struct Services_LogEntry * *,struct Services_LogEntry * * *,unsigned char * *,unsigned char * *,unsigned char * * *)
+Services_ProcessService::g_GetUpTime(void)
+Services_ProcessService::g_GetUtcTime(void)
+Services_ProcessService::g_Stop(int)
+Services_ProcessService::g_Waypoint(int)
+Services_ProcessService::g_Waypoint0(void)
+Services_ProcessService::g_WaypointDone(void)
+Services_ProcessService::g_WaypointDump(void)
+
+Hardware I/O: [13]
+=============
+Services_DeviceService::g_GetDynamicIoDmaRange(unsigned int,unsigned char *,unsigned char *)
+Services_DeviceService::g_GetDynamicIoIrqRange(unsigned int,unsigned char *,unsigned char *)
+Services_DeviceService::g_GetDynamicIoMemoryRange(unsigned int,unsigned char * *,unsigned int *,bool *,bool *)
+Services_DeviceService::g_GetDynamicIoPortRange(unsigned int,unsigned short *,unsigned short *,bool *,bool *)
+Services_DeviceService::g_GetDynamicIoRangeCount(void)
+Services_DeviceService::g_GetFixedIoDmaRange(unsigned int,unsigned char *,unsigned char *)
+Services_DeviceService::g_GetFixedIoIrqRange(unsigned int,unsigned char *,unsigned char *)
+Services_DeviceService::g_GetFixedIoMemoryRange(unsigned int,unsigned char * *,unsigned int *,bool *,bool *)
+Services_DeviceService::g_GetFixedIoPortRange(unsigned int,unsigned short *,unsigned short *,bool *,bool *)
+Services_DeviceService::g_GetFixedIoRangeCount(void)
+Services_DeviceService::g_GetIrqCount(unsigned char)
+Services_DeviceService::g_GetPciConfig(unsigned short *,unsigned short *,unsigned short *)
+Services_DeviceService::g_GetPnpSignature(wchar_t *,unsigned int)
+
+Channels [6]
+========
+Services_EndpointCore::g_Connect(struct Services_SharedHeapService_Allocation *,struct Services_SharedHeapService_Allocation *)
+Services_EndpointCore::g_Free(struct Services_SharedHeapService_Allocation *)
+Services_EndpointCore::g_TransferBlockOwnership(struct Services_SharedHeapService_Allocation *,struct Services_EndpointCore *)
+Services_EndpointCore::g_TransferContentOwnership(struct Services_EndpointCore *,struct Services_EndpointCore *)
+Services_EndpointCore::m_FixEndpoint(struct Services_EndpointCore *)
+Services_EndpointCore::m_GetHashPrivate(struct Services_EndpointCore *)
+
+Page Table & Shared Heap: [34]
+=========================
+Services_PageTableService::g_Allocate(struct uintPtr *,struct uintPtr *,struct uintPtr *)
+Services_PageTableService::g_Allocate(unsigned int,unsigned int,unsigned int)
+Services_PageTableService::g_AllocateBelow(struct uintPtr *,struct uintPtr *,struct uintPtr *)
+Services_PageTableService::g_AllocateBelow(unsigned int,unsigned int,unsigned int)
+Services_PageTableService::g_AllocateExtend(struct uintPtr *,struct uintPtr *)
+Services_PageTableService::g_AllocateExtend(unsigned int,unsigned int)
+Services_PageTableService::g_Free(struct uintPtr *,struct uintPtr *)
+Services_PageTableService::g_Free(unsigned int,unsigned int)
+Services_PageTableService::g_GetPageCount(void)
+Services_PageTableService::g_GetPageTable(void)
+Services_PageTableService::g_GetProcessTag(void)
+Services_PageTableService::g_Query(struct uintPtr *,struct uintPtr * *,struct uintPtr * *)
+Services_PageTableService::g_Query(unsigned int,unsigned int *,unsigned int *)
+Services_SharedHeapService::g_Free(struct Services_SharedHeapService_Allocation *)
+Services_SharedHeapService::g_GetData(struct Services_SharedHeapService_Allocation *)
+Services_SharedHeapService::g_GetSize(struct Services_SharedHeapService_Allocation *)
+Services_SharedHeapService::g_GetType(struct Services_SharedHeapService_Allocation *)
+Services_SharedHeapService::g_SetOwnerProcessId(struct Services_SharedHeapService_Allocation *,int)
+Services_SharedHeapService::g_SetType(struct Services_SharedHeapService_Allocation *,struct uintPtr *)
+Services_SharedHeapService_Allocation * Services_EndpointCore::g_Allocate(unsigned int,struct Types_SystemType)
+Services_SharedHeapService_Allocation * Services_ProcessService::g_GetNamespaceEndpoint(void)
+Services_SharedHeapService_Allocation * Services_ProcessService::g_GetNamespaceWriteEndpoint(void)
+Services_SharedHeapService_Allocation * Services_ProcessService::g_GetStartupEndpoint(int)
+Services_SharedHeapService_Allocation * Services_SharedHeapService::g_Allocate(struct uintPtr *,struct uintPtr *,unsigned int)
+Services_SharedHeapService_Allocation * Services_SharedHeapService::g_Share(struct Services_SharedHeapService_Allocation *,struct uintPtr *,struct uintPtr *)
+Services_SharedHeapService_Allocation * Services_SharedHeapService::g_Split(struct Services_SharedHeapService_Allocation *,struct uintPtr *)
+Types_SystemAssembly::g_Register(int,int,int,int,struct Class_System_String *)
+Types_SystemType::g_IsNull(struct Types_SystemType)
+Types_SystemType::g_IsSubtype(struct Services_SharedHeapService_Allocation *,struct Types_SystemType)
+Types_SystemType::g_IsSubtype(struct Struct_Microsoft_Singularity_Memory_SharedHeap_Allocation *,struct Types_SystemType)
+Types_SystemType::g_IsSubtype(struct Types_SystemType,struct Types_SystemType)
+Types_SystemType::g_IsSubType(struct uintPtr *,struct uintPtr *)
+Types_SystemType::g_Register(__int64,__int64,struct Types_SystemType)
+Types_SystemType::g_RootSystemType(void)
+
+Stacks: [19]
+=======
+Services_StackService::g_GetUnlinkStackRange(unsigned __int64 *,unsigned __int64 *)
+Services_StackService::g_LinkStack0(void)
+Services_StackService::g_LinkStack12(void)
+Services_StackService::g_LinkStack16(void)
+Services_StackService::g_LinkStack20(void)
+Services_StackService::g_LinkStack24(void)
+Services_StackService::g_LinkStack28(void)
+Services_StackService::g_LinkStack32(void)
+Services_StackService::g_LinkStack36(void)
+Services_StackService::g_LinkStack4(void)
+Services_StackService::g_LinkStack40(void)
+Services_StackService::g_LinkStack44(void)
+Services_StackService::g_LinkStack48(void)
+Services_StackService::g_LinkStack52(void)
+Services_StackService::g_LinkStack56(void)
+Services_StackService::g_LinkStack60(void)
+Services_StackService::g_LinkStack64(void)
+Services_StackService::g_LinkStack8(void)
+Services_StackService::g_WalkStack(void)
+
+Threading & Synchronization: [43]
+============================
+Threads_AutoResetEventHandle::g_Create(bool,struct Threads_AutoResetEventHandle *)
+Threads_AutoResetEventHandle::g_Dispose(struct Threads_AutoResetEventHandle)
+Threads_AutoResetEventHandle::g_Reset(struct Threads_AutoResetEventHandle)
+Threads_AutoResetEventHandle::g_Set(struct Threads_AutoResetEventHandle)
+Threads_AutoResetEventHandle::g_SetNoGC(struct Threads_AutoResetEventHandle)
+Threads_ContainerHandle::g_Create(struct Threads_ContainerHandle *)
+Threads_ContainerHandle::g_Dispose(struct Threads_ContainerHandle)
+Threads_InterruptHandle::g_Ack(struct Threads_InterruptHandle)
+Threads_InterruptHandle::g_Create(unsigned char,struct Threads_InterruptHandle *)
+Threads_InterruptHandle::g_Dispose(struct Threads_InterruptHandle)
+Threads_InterruptHandle::g_Pulse(struct Threads_InterruptHandle)
+Threads_InterruptHandle::g_Wait(struct Threads_InterruptHandle)
+Threads_ManualResetEventHandle::g_Create(bool,struct Threads_ManualResetEventHandle *)
+Threads_ManualResetEventHandle::g_Dispose(struct Threads_ManualResetEventHandle)
+Threads_ManualResetEventHandle::g_Reset(struct Threads_ManualResetEventHandle)
+Threads_ManualResetEventHandle::g_Set(struct Threads_ManualResetEventHandle)
+Threads_MutexHandle::g_Create(bool,struct Threads_MutexHandle *)
+Threads_MutexHandle::g_Dispose(struct Threads_MutexHandle)
+Threads_MutexHandle::g_Release(struct Threads_MutexHandle)
+Threads_SyncHandle::g_WaitAny(struct Threads_SyncHandle *,int)
+Threads_SyncHandle::g_WaitAny(struct Threads_SyncHandle *,int,struct Struct_System_DateTime)
+Threads_SyncHandle::g_WaitAny(struct Threads_SyncHandle *,int,struct Struct_System_TimeSpan)
+Threads_SyncHandle::g_WaitOne(struct Threads_SyncHandle)
+Threads_SyncHandle::g_WaitOne(struct Threads_SyncHandle,struct Struct_System_DateTime)
+Threads_SyncHandle::g_WaitOne(struct Threads_SyncHandle,struct Struct_System_TimeSpan)
+Threads_SyncHandle::g_WaitOneNoGC(struct Threads_SyncHandle)
+Threads_ThreadHandle Threads_ThreadHandle::g_CurrentThread(void)
+Threads_ThreadHandle::g_Create(int,struct Threads_ContainerHandle,struct Threads_ThreadHandle *,void * *)
+Threads_ThreadHandle::g_Dispose(struct Threads_ThreadHandle)
+Threads_ThreadHandle::g_GetExecutionTime(struct Threads_ThreadHandle)
+Threads_ThreadHandle::g_GetPrincipal(struct Class_System_String *)
+Threads_ThreadHandle::g_GetPrincipal(struct Threads_ThreadHandle,struct Class_System_String *)
+Threads_ThreadHandle::g_GetThreadLocalValue(void)
+Threads_ThreadHandle::g_GetThreadState(struct Threads_ThreadHandle)
+Threads_ThreadHandle::g_Join(struct Threads_ThreadHandle)
+Threads_ThreadHandle::g_Join(struct Threads_ThreadHandle,struct Struct_System_DateTime)
+Threads_ThreadHandle::g_Join(struct Threads_ThreadHandle,struct Struct_System_TimeSpan)
+Threads_ThreadHandle::g_SetThreadLocalValue(struct uintPtr *)
+Threads_ThreadHandle::g_Sleep(struct Struct_System_DateTime)
+Threads_ThreadHandle::g_Sleep(struct Struct_System_TimeSpan)
+Threads_ThreadHandle::g_SpinWait(int)
+Threads_ThreadHandle::g_Start(struct Threads_ThreadHandle)
+Threads_ThreadHandle::g_Yield(void)
+
diff --git a/base/SingularityVS.sln b/base/SingularityVS.sln
new file mode 100644
index 0000000..024c360
--- /dev/null
+++ b/base/SingularityVS.sln
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kernel.System.Threading", "Kernel\System\Threading\Kernel.System.Threading.csproj", "{935799DC-052C-4C55-B8DA-9BF3CBF92F6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kernel.System.GCs", "Kernel\System\GCs\Kernel.System.GCs.csproj", "{37CE9734-90C1-45FC-AB73-C7297C9F11F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kernel.Singularity", "Kernel\Singularity\Kernel.Singularity.csproj", "{60519714-BB97-41D6-99A7-B54E8A2DB256}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kernel.Singularity.Loader", "Kernel\Singularity\Loader\Kernel.Singularity.Loader.csproj", "{938DEBC9-6C94-473D-9C5A-93CE4B95A149}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Drivers", "Drivers\Drivers.sgproj", "{456B154B-E19C-499C-9200-0166873D2209}"
+EndProject
+Project("{2D5F3EBF-B93A-4468-B236-4C125BB2FD8A}") = "Contracts", "Contracts\Contracts.sgproj", "{9C6EC9FE-2F65-4DEE-A31D-58E928641CA2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{935799DC-052C-4C55-B8DA-9BF3CBF92F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{935799DC-052C-4C55-B8DA-9BF3CBF92F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{935799DC-052C-4C55-B8DA-9BF3CBF92F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{935799DC-052C-4C55-B8DA-9BF3CBF92F6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37CE9734-90C1-45FC-AB73-C7297C9F11F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37CE9734-90C1-45FC-AB73-C7297C9F11F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37CE9734-90C1-45FC-AB73-C7297C9F11F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37CE9734-90C1-45FC-AB73-C7297C9F11F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60519714-BB97-41D6-99A7-B54E8A2DB256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60519714-BB97-41D6-99A7-B54E8A2DB256}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60519714-BB97-41D6-99A7-B54E8A2DB256}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60519714-BB97-41D6-99A7-B54E8A2DB256}.Release|Any CPU.Build.0 = Release|Any CPU
+		{938DEBC9-6C94-473D-9C5A-93CE4B95A149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{938DEBC9-6C94-473D-9C5A-93CE4B95A149}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{938DEBC9-6C94-473D-9C5A-93CE4B95A149}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{938DEBC9-6C94-473D-9C5A-93CE4B95A149}.Release|Any CPU.Build.0 = Release|Any CPU
+		{456B154B-E19C-499C-9200-0166873D2209}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{456B154B-E19C-499C-9200-0166873D2209}.Release|Any CPU.ActiveCfg = Release|.NET
+		{9C6EC9FE-2F65-4DEE-A31D-58E928641CA2}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{9C6EC9FE-2F65-4DEE-A31D-58E928641CA2}.Release|Any CPU.ActiveCfg = Release|.NET
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/base/Targets/App.targets b/base/Targets/App.targets
new file mode 100644
index 0000000..af294f9
--- /dev/null
+++ b/base/Targets/App.targets
@@ -0,0 +1,193 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+The App.targets file is for assemblies that are "user" / process assemblies,
+i.e. they are not part of the kernel.  This is roughly equivalent to Makefile.app.
+
+Projects that import App.targets inherit the following behaviors:
+
+  * If the project has not set a value for the OutputPath property, then this targets
+    file will provide one.  If the project is an executable, then OutputPath is set
+    to $(APPSDIR); if the project is a library (DLL), then OutputPath is set to $(LIBSDIR).
+    This provides the right behavior for most user-mode projects.
+    
+  * CompilerPlatformVersion is always set to "cli1".
+  
+  * CompilerPlatformDir is always set to $(APPRUNTIMEDIR).
+
+  * Stdlib is always set to $(APPRUNTIMEDIR)\Corlib.dll.
+
+  * If the NoStandardLibraries property is not set to 'true', and if the language is Sing#,
+    then the following references will be added:
+    
+        Corlib.Contracts.dll
+        System.Compiler.Runtime.dll
+        Microsoft.SingSharp.Runtime.dll
+        Corlibsg.dll
+        Directory.Contracts.dll
+        Io.Contracts.dll
+
+
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Condition="'$(SingularityPathsIncluded)'==''" Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputPath Condition="'$(OutputPath)'=='' and '$(OutputType)'=='Exe'">$(APPSDIR)</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' and '$(OutputType)'=='Library'">$(LIBSDIR)</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ExtraCompilerFlags>$(ExtraCompilerFlags) /d:SINGULARITY /d:SINGULARITY_PROCESS</ExtraCompilerFlags>
+    <CompilerPlatformVersion>cli1</CompilerPlatformVersion>
+    <CompilerPlatformDir>$(APPRUNTIMEDIR)</CompilerPlatformDir>
+    <Stdlib>$(APPRUNTIMEDIR)\Corlib.dll</Stdlib>
+    <Language Condition="'$(Language)'==''">Sing#</Language>
+  </PropertyGroup>
+
+ 
+  <PropertyGroup>
+    <DefaultNibOptionsFile>$(SINGULARITY_ROOT)\Options\$(Configuration).$(COLLECTOR_APP).$(Machine).options</DefaultNibOptionsFile>
+    <NibOptionsFile Condition="'$(NibOptionsFile)'==''">$(DefaultNibOptionsFile)</NibOptionsFile>
+
+    <!-- Build _NibArgs.  $(NIBOPTS) is intended to allow people to bring in options from command shell environment. -->
+    <_NibArgs>/machine:$(MACHINE) /par $(NIBOPTS)</_NibArgs>
+    <_NibArgs>$(_NibArgs) /cache:$(SINGULARITY_OBJROOT)</_NibArgs>
+    <_NibArgs>$(_NibArgs) /native:$(APPS_NATIVE_IMAGE_DIR) </_NibArgs>
+    <_NibArgs>$(_NibArgs) /temp:$(DISTRO_TEMP_DIR)</_NibArgs>
+    <_NibArgs>$(_NibArgs) /libcache:$(DISTRO_LIB_DIR)</_NibArgs>
+    <_NibArgs>$(_NibArgs) /options:$(NibOptionsFile)</_NibArgs>
+  </PropertyGroup>
+  
+  
+  
+  <ItemGroup Condition="'$(NoStdLib)'!='true'">
+
+    <!--
+    Use a single reference to the app runtime project.
+    This builds Corlib.dll, System.Compiler.Runtime.dll, Microsoft.SingSharp.Runtime.dll, and Corlibsg.dll.
+    -->
+    <DependentProject Include="$(SINGULARITY_ROOT)\Applications\Runtime\AppRuntime.proj"/>
+
+    <!-- The C# compiler does not support /stdlib:Corlib.dll, so we pass Corlib.dll as a reference. -->
+    <__il_refs Include="$(APPRUNTIMEDIR)\Corlib.dll" Condition="'$(Languge)'=='C#'"/>
+    <__native_refs Include="$(APPRUNTIMEDIR)\Corlib.dll"/>
+    
+    <!--
+    The Sing# compiler will implicitly pick up Microsoft.SingSharp.Runtime.dll,
+    so there is no need to pass it as an IL reference, but we still need to add it to the native refs. 
+    If the language is C#, then we don't add this assembly at all.
+    -->
+    <__native_refs Include="$(APPRUNTIMEDIR)\Microsoft.SingSharp.Runtime.dll" Condition="'$(Language)'=='Sing#'"/>
+
+    <__il_refs Include="$(APPRUNTIMEDIR)\Corlib.Contracts.dll" Condition="'$(Language)'=='Sing#'"/>
+    <__native_refs Include="$(APPRUNTIMEDIR)\ILHelpers.dll"/>
+
+    <!--
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Runtime\ILHelpers.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+    -->
+    
+  </ItemGroup>
+  
+
+  <ItemGroup Condition="'$(NoStandardLibraries)'!='true'">
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\System.Compiler.Runtime\System.Compiler.Runtime.App.csproj"/>
+    
+    
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj">
+      <!--
+      <ExcludeFromManifestReferences>false</ExcludeFromManifestReferences>
+      -->
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\Singularity.V1\Singularity.V1.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+    
+
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Applications\Runtime\Corlibsg.csproj"/>
+    <!--
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Corlib.Contracts.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+    -->
+
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Contracts\Io.Contracts\Io.Contracts.csproj"/>
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Contracts\Directory.Contracts\Directory.Contracts.csproj"/>
+  </ItemGroup>
+
+
+  <Choose>
+    <When Condition="'$(OutputType)'=='Exe' and '$(NoManifest)'!='true'">
+      <PropertyGroup>
+        <BuildDependsOn>$(BuildDependsOn);BuildManifest</BuildDependsOn>
+        <ManifestPath>$(OutputPath)\$(AssemblyName).manifest</ManifestPath>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <FilesToClean Include="$(ManifestPath)"/>
+        <FilesToClean Include="$(NativeImagePath)"/>
+        <FilesToClean Include="$(NativeSymbolPath)"/>
+        <FilesToClean Include="$(NativeObjPath)"/>
+        <FilesToClean Include="$(NativeSuperObjPath)"/>
+        <FilesToClean Include="$(BartokLogPath)"/>
+        <FilesToClean Include="$(LinkLogPath)"/>
+      </ItemGroup>
+    </When>
+  </Choose>
+
+  <!-- This target creates the .manifest file for the executable. -->
+  <Target Name="BuildManifest"
+          DependsOnTargets="BuildAssembly;BuildNativeReferences"
+          Inputs="$(OutputAssemblyPath);$(MSBuildProjectFullPath)"
+          Outputs="$(ManifestPath)"
+          Condition="'$(OutputType)'=='Exe'">
+    <Message Text="Building manifest - $(AssemblyName).manifest"/>
+    <Message Text="  __native_refs:  %(__native_refs.fullpath)"/>
+    <Message Text="  Reference:      %(Reference.fullpath)"/>
+    <Exec Command="$(BUILDDIR)\mkmani /out:$(OutputPath)\$(AssemblyName).manifest /app:$(AssemblyName) /x86:$(OutputPath)\$(AssemblyName).x86 /cache:$(SINGULARITY_OBJROOT) $(OutputAssemblyPath)  @(__native_refs->'/r:&quot;%(fullpath)&quot;',' ') @(Reference->'/r:&quot;%(fullpath)&quot;',' ')$(APP_CODEGEN) $(APP_LINKER)"/>
+  </Target>
+
+  <PropertyGroup>
+    <BuildDependsOn Condition="'$(EnableEarlyNib)'=='true' and '$(OutputType)'=='Exe'">$(BuildDependsOn);nib</BuildDependsOn>
+  </PropertyGroup>
+
+  <!--
+  This target allows you to build an executable, and then immediately run it through NIB,
+  to generate a native executable image.  This is useful during development, in order to
+  recompile an app without re-buiding an entire Distro project.
+  
+  This target does not use Inputs/Outputs for incremental builds; instead, NIB is always
+  invoked.  This is done for several reasons.  First, NIB may decide to replace libraries
+  with other libraries (e.g. replacing metadata-only interface assemblies with
+  implementation assemblies); the MSBuild environment therefore cannot know which files
+  are part of the input set.  Second, NIB already examines file times, and will only
+  invoke the native code compiler if necessary.
+  
+  We still declare the Outputs, though, to be the native image, just in case anyone wants
+  to build and access the native image.
+  -->
+  <Target Name="nib"
+          Condition="'$(OutputType)'=='Exe'"
+          Outputs="$(APPS_NATIVE_IMAGE_DIR)\$(AssemblyName).x86"
+          DependsOnTargets="BuildManifest;BuildAppRuntimeNative">
+    <MakeDir Directories="$(DISTRO_TEMP_DIR);$(APPS_NATIVE_IMAGE_DIR)"/>
+    <Message Text="Building Native Image - $(NativeImagePath)"/>
+    <Exec Command="$(NIB) $(_NibArgs) $(ManifestPath)"/>
+  </Target>
+
+
+  <Target Name="BuildAppRuntimeNative">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Applications\Runtime\Corlib.Native.proj"/>
+  </Target>
+  
+  
+  <Import Project="SingSharp.targets"/>
+
+</Project>
diff --git a/base/Targets/AppRuntime.targets b/base/Targets/AppRuntime.targets
new file mode 100644
index 0000000..8c07f99
--- /dev/null
+++ b/base/Targets/AppRuntime.targets
@@ -0,0 +1,56 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+AppRuntime.targets
+
+This file contains definitions for assemblies that are part of the application
+runtime environment.  This is used by only a handful of assemblies:
+
+    Corlib.dll
+    System.Compiler.Runtime.dll
+    Microsoft.SingSharp.Runtime.dll
+    Corlibsg.dll
+    
+Projects that import AppRuntime.targets inherit the following behaviors:
+
+  * The OutputPath is always set to $(APPRUNTIMEDIR).
+    
+  * CompilerPlatformVersion is always set to "cli1".
+  
+  * CompilerPlatformDir is always set to $(APPRUNTIMEDIR).
+
+  * Stdlib is always set to $(APPRUNTIMEDIR)\Corlib.dll.
+
+The NoStandardLibraries property is ignored.
+
+This file imports SingSharp.targets, and so projects that import this file should
+not also import SingSharp.targets.
+
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <!-- sgc/csc will stop processing additional names if it sees a ;; in the /d: list, e.g. /d:foo;;bar, bar is ignored -->
+    <OutputPath>$(APPRUNTIMEDIR)</OutputPath>
+    <DefineConstants Condition="'$(DefineConstants)'!=''">$(DefineConstants);</DefineConstants>
+    <DefineConstants>$(DefineConstants)SINGULARITY_PROCESS</DefineConstants>
+    <CompilerPlatformVersion>cli1</CompilerPlatformVersion>
+    <CompilerPlatformDir>$(APPRUNTIMEDIR)</CompilerPlatformDir>
+    <Stdlib>$(APPRUNTIMEDIR)\Corlib.dll</Stdlib>
+    <Language Condition="'$(Language)'==''">Sing#</Language>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(NoStdLib)'!='true'">
+    <!-- This brings in Corlib.dll for the native image generation phase. -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\App.Corlib.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+    <!-- Yes, this is necessary. -->
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\App.Corlib.csproj"/>
+  </ItemGroup>
+
+  <Import Project="SingSharp.targets"/>
+
+</Project>
diff --git a/base/Targets/Bartok.targets b/base/Targets/Bartok.targets
new file mode 100644
index 0000000..5f68585
--- /dev/null
+++ b/base/Targets/Bartok.targets
@@ -0,0 +1,521 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+This targets file allows projects to invoke the Bartok compiler.
+Projects can define the following item sets:
+
+    * ProjectReference - Projects that should be built, and whose output becomes
+        a referenced assembly (input to Bartok).  This should be the path to
+        an MSBuild project (.proj, .csproj, etc.).
+
+    * Reference - An input assembly, e.g. .exe or .dll.
+
+
+Projects can define the following properties:
+
+    * NativeImageName - The basename to generate, e.g. "kernel".
+
+    * OutputPath - The directory in which to generate outputs.
+
+    * BartokFlags - Flags that will be passed directly to the compiler.
+
+    * Collector - The name of the collector (e.g. AdaptiveCopying, Concurrent, etc.) to use.
+          If this property is omitted, then no collector is selected (unless one is
+          specified using the BartokFlags property).
+
+    * BartokCompiler - Specify to override the compiler binary to use.
+
+
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+
+
+
+  <!-- Provide some defaults. -->
+  <PropertyGroup>
+    <!-- hack! -->
+    <BartokCompiler Condition="'$(BartokCompiler)'==''">cd $(BUILDDIR) &amp;&amp; bartok.exe</BartokCompiler>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <NativeImagePath>$(OutputPath)\$(NativeImageName).obj</NativeImagePath>
+  </PropertyGroup>
+
+
+
+  <!-- Build the command-line parameters for bartok. -->
+
+  <PropertyGroup>
+    <_BartokCmd>/out: $(NativeImagePath)</_BartokCmd>
+  </PropertyGroup>
+
+
+  <Choose>
+    <When Condition="'$(Collector)'=='AdaptiveCopying'">
+      <PropertyGroup>
+        <_BartokCmd>$(_BartokCmd) /AdaptiveCopying</_BartokCmd>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(Collector)'=='Concurrent'">
+      <PropertyGroup>
+        <_BartokCmd>$(_BartokCmd) /ConcurrentMSGC</_BartokCmd>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(Collector)'=='MarkSweep'">
+      <PropertyGroup>
+        <_BartokCmd>$(_BartokCmd) /MarkSweepGC</_BartokCmd>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(Collector)'=='Semispace'">
+      <PropertyGroup>
+        <_BartokCmd>$(_BartokCmd) /SemispaceGC</_BartokCmd>
+      </PropertyGroup>
+
+    </When>
+
+    <When Condition="'$(Collector)'=='Sliding'">
+      <PropertyGroup>
+        <_BartokCmd>$(_BartokCmd) /SlidingGC</_BartokCmd>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+
+  <PropertyGroup>
+    <_BartokCmd>$(_BartokCmd) /outdir: $(OutputPath) $(BartokFlags) /IrImproveTypes=false</_BartokCmd>
+    <_BartokCmd Condition="'$(Verbosity)'!=''">$(_BartokCmd) /verbosity:$(Verbosity)</_BartokCmd>
+  </PropertyGroup>
+
+
+  <PropertyGroup> <!-- Condition="'$(EnableOutputLog)'=='true'"> -->
+    <OutputLogPath>$(OutputPath)\$(NativeImageName).log</OutputLogPath>
+    <_BartokCmd>$(_BartokCmd) &gt;$(OutputLogPath)</_BartokCmd>
+  </PropertyGroup>
+
+
+
+  <Target Name="BuildDependentProjects">
+    <MSBuild Projects="@(ProjectReference)" Targets="Build">
+      <Output ItemName="__built_projects" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+
+    <!-- <Message Text="__built_projects: %(__built_projects.Identity)" /> -->
+    <CreateItem Include="@(__built_projects)">
+      <Output TaskParameter="Include" ItemName="Reference"/>
+    </CreateItem>
+  </Target>
+
+
+  <Target Name="BuildNativeImage"
+          DependsOnTargets="BuildDependentProjects"
+          Inputs="@(Reference)"
+          Outputs="$(NativeImagePath)"
+          >
+
+    <Error Condition="'$(NativeImageName)'==''" Text="The 'NativeImageName' property is required."/>
+    <Error Condition="'$(OutputPath)'==''" Text="The 'OutputPath' property is required."/>
+
+    <Message Text="Building native image:"/>
+    <Message Text="    NativeImagePath:        $(NativeImagePath)"/>
+    <Message Text="    OutputPath:             $(OutputPath)"/>
+    <Message Text="    IL Reference:           %(Reference.Identity)"/>
+
+    <Exec Command="$(BartokCompiler) $(_BartokCmd) @(Reference,' ') >$(OutputLogPath)"/>
+
+  </Target>
+
+
+  <!--
+Usage:
+    bartok [options] files
+
+Bartok main options (case insensitive):
+    /entry: <method1>;<method2>;...    specify entry points
+    /reference: <file1>;<file2>;...    reference metadata from assembly files
+    /r: <file1>;<file2>;...            short form of /reference:
+    /bartoklink: <file1>;<file2>;...   reference precompiled object files
+    /override: <file1>;<file2>;...     files overriding /r: metadata
+    /lib: <dir1>;<dir2>;...            additional dirs to search for references
+    /out: <file>                       output file name
+    /outdir: <dir>                     dir for output .exe, asm, obj, etc.
+                                        (defaults to .\\debug)
+    /skip: <type1>;<type2>;...         specify type initializers to disable
+                                        if building static ordering
+    /substitute:<oldname1>=<newname1>, rename TypeRefs before performing lookup
+     <oldname2>=<newname2>,...
+    /disable:<phasename>               disable a phase
+    /dynamicload:<typename>            make type available for dynamic loading
+    /features:<???>                    << TODO >>
+    /noisymethod:<methname>            enable noisy output for meth
+    /debugmethod:<methname>            enable debug+noisy output for meth
+    /verbosity:<noiselevel>            set output level {Silence,PerPhase,
+                                        PerClass,PerMethod,PerBlock,
+                                        PerInstruction} (defaults to PerPhase)
+    /marksweepgc                       compile for mark-sweep collector
+    /semispacegc                       compile for semispace collector
+    /slidinggc                         compile for sliding collector
+    /adaptivecopyinggc                 compile for semispace-sliding hybrid
+                                        collector
+    /referencecountinggc               compile for reference counting collector
+    /deferredreferencecountinggc       compile for deferred reference counting collector
+    /concurrentmsgc                    compile for concurrent mark-sweep
+                                        collector
+    /nullgc                            compile for no collector
+    /minopt                            disable most optimizations
+    /nohiropt                          disable all HIR optimizations
+    /singularity                       set default Singularity options
+    /verbosehelp                       help message including stage control
+                                        options by category
+    /verbosehelpalpha                  help message including stage control
+                                        options in alphabetical order
+    /help or /?                        help message
+  -->
+
+
+    <!--
+
+    Valid options:
+
+/ABCD
+/ABCDAddExtraEdges
+/AcyclicRefTypesDump
+/AggressiveFieldLayout
+/Allocator
+/AllThreadMixins
+/ArrayAddressChecks
+/ArrayBoundsChecks
+/ArrayStoreChecks
+/ArraySupportOptimizePass
+/AsmCodeSectionLines
+/AsmDataSectionLines
+/AtomicAlwaysEnlistForUpdate
+/AtomicBitmap
+/AtomicExternalBitmap
+/AtomicFixStaticsAtCompileTime
+/AtomicRemoveReadAfterUpdateAtEnlistment
+rUpdateAtGC
+/AtomicRemoveReadDuplicatesAtGC
+/AtomicSupport
+/AtomicSupportUpdateEnlistOpt
+/AtomicSupportUpdateEnlistOptFlow
+/AtomicTrackTransactionLocals
+/BackEndCommentOpts
+/BackEndComments
+/BackEndGenConditionalMoves
+/BackEndPostPrint
+/BartokLinkPhase
+/BeforeVarargLowering
+/BuildC2Mods
+/BumpAllocatorClear
+/callSiteSetTable
+/CfgPrefix
+/CheckNoHeapAllocation
+/CheckPropertySetMethods
+/CheckSsa
+/CompileOnly
+/ConvertArrayInitialization
+/ConvertMagicArrayOperations
+/ConvertMethodPostPrint
+/ConvertUseJumpTablesForSwitch
+/CopyScan
+/CountThreadSafeFields
+/CustomAllocatorTypes
+/DebugInline
+/DebugIrTreeShake
+/DebugIrTreeShakeVerbose
+/DebugMetaDataParsing
+/DebugSharedHeap
+/DebugVarArrayLength
+/DefaultCodeAlignment
+/DevirtualizeCall
+/DisableIrExposeAllocationCall
+/DisablePInvoke
+/DisableX64LirOpts
+/DumpCfg
+/DumpContainers
+/DumpInheritance
+/DumpInheritanceFile
+/DumpMethodSizes
+/DumpOverrideStats
+/DynamicCountBoundsChecks
+/DynamicCountLoads
+/DynamicCountNullChecks
+/DynamicCountStores
+/DynamicCountVirtualCalls
+/EnableIceCap
+/EnableIrExposeAllocationCall
+/ExcludeMscorlibResourceInfo
+/ExtendedABCD
+/ExtendedThreadEscapeAnalysis
+/ExtendParamsABCD
+/FailAfterInliner
+/FieldsAnalysisDumpReadOnly
+/FullSymName
+/GCAccurate
+/GCCheckInformation
+/GCCheckInformationTrace
+/GCGenTransitionCode
+/GCInlineAllocations
+/GCInlineWriteBarrier
+/GCLargeObjectSize
+/GCTables
+/GCTrackUnchangedCalleeSaves
+/GCType
+/GCWriteBarrierTracksStaticFields
+/GenAsmHeader
+/GenCoffLineNumber
+/GenCppHeader
+/GenFPStackChecksAfterCalls
+/GenObjFile
+/IdentifyAsMethods
+/IgnoreThreadMembership
+/IncludeStaticFields
+/IndexType
+/InsertWriteBarrier
+/InstrumentAllCalls
+/InstrumentCalls
+/InstrumentVirtualCalls
+/IrArrayBaseLength
+/IrArrayLoadStoreOpt
+/IrAttributeInliner
+/IrCleanup
+/IrCleanupStructOperations
+/IrCleanupTypecheckResult
+/IrCloneLoopHeader
+/IrCompareOpt
+/IrConvertArrayBounds
+/IrConvertArrayOpt
+/IrConvertComplexArrayAccess
+/IrConvertExpandedArrayAccess
+/IrConvertInferface
+/IrConvertOpt
+/IrConvertSimpleArrayAccess
+/IrConvertSizeofPrimitive
+/IrConvertTryAll
+/IrDeadAssignmentSimple1
+/IrDeadAssignmentSimple2
+/IrDeadAssignmentSimpleFormals
+/IrDeleteCheckCasts
+/IrExposeAllocationCall
+/IrFindConcrete
+/IrImproveTypes
+/IrInitStaticField
+/IrInitTypeInliner
+/IrInlineConstructor
+/IrInlinerDoIncreaseSize
+/IrJumpElim
+/IrKeepManager
+/IrLoadStoreOpt
+/IrLoadStoreOptThreaded
+/IrLSOThreadedStores
+/IrMultiConvertOpt
+/IrMultiPropSimple
+/IrOverrideValueTypeEquals
+/IrPeepholeNull
+/IrRemoveDoubleCmp
+/IrReverseCopyProp
+/IrScanCallEffects
+/IrShortCircuitBBlocks
+/IrSimpleInliner
+/IrSimpleInlinerWarnings
+/IrSSABoundChecks
+/IrSSAStoreChecks
+/IrStructVectorOperations
+/IrSuppressExnEdges
+/IrTreeShake
+/IrTreeShakeCreatePointedToStructs
+/IrTreeShakeLate
+/IrTypeTestElim
+/IrTypeTestElimPunt
+/LayoutLoopHeaderLast
+/LazyTypeInits
+/LimitedReflection
+/LinkedStacks
+/LinkedStacksDumpEntryPointBounds
+/LinkedStacksRequireExternalBound
+/LinkedStacksTrace
+/LinkedStackThreshold
+/LirContinueOnException
+/LirPrintTypes
+/LogIrDeadCode
+/LogIrInliner
+/LogResourceInfo
+/LogSsaDeadCode
+/LowerLargeValuesPostPrint
+/LowerToTargetPostPrint
+/MaxInlineDepth
+/MaxInlineeBB
+/MaxInlineeInstr
+/MyFuncCount
+/NameThreadSafeFields
+/NullChecks
+/NullRuntime
+/OmitFramePointer
+/OptimisticLocking
+/OptimizeLocals
+/OptimizeWriteBarrier
+/OptLirCompactify
+/OptLirCompactifyPostPrint
+/OptLirConvertAddToLEA
+/OptLirCopyPropAcrossCalls
+/OptLirGlobalConstantProp
+/OptLirGlobalConstantPropPostPrint
+/OptLirGlobalCopyProp
+/OptLirGlobalCopyPropPostPrint
+/OptLirImproveBranches
+/OptLirImproveBranchesPostPrint
+/OptLirImproveCC
+/OptLirImproveCCPostPrint
+/OptLirImproveJumps
+/OptLirImproveJumpsPostPrint
+/OptLirInlineStructZero
+/OptLirInlineStructZeroLimit
+/OptLirLocalConstantProp
+/OptLirLocalConstantPropPostPrint
+/OptLirLocalCopyProp
+/OptLirLocalCopyPropPostPrint
+/OptLirPeephole
+/OptLirPeepholePostPrint
+/OptLirReverseCopyProp
+/OptLirReverseCopyPropPostPrint
+/OptLirReverseCSE
+/OptLirReverseCSEPostPrint
+/OptLirSuppressExnEdges
+/OptLirSuppressJumps
+/OptLirSuppressJumpsPostPrint
+/OptRuntimeData
+/PhaseFunctionNumberPrintLimit
+/PhaseFunctionTimePrintLimit
+/PhaseTimings
+/PhaseTotalTimePrintLimit
+/PhoenixArgs
+/PhoenixMirOpts
+/PostDomHoist
+/PreAllocStackForParam
+/PreWriteBarrier
+/PrintContainers
+/PrintVariableTypes
+/ProfileLirFunctions
+/PtrAnalysis
+/PtrAnalysisEarly
+/PtrAnalysisLate
+/PTType
+/RCCollectorExceptionAccurate
+/RCCollectorGenerateProfile
+/RCCollectorOptAlwaysPLCFreeIncrements
+/RCCollectorOptCoalescingUpdates
+/RCCollectorOptImmortals
+/RCCollectorOptInlineRCUpdates
+/RCCollectorOptNonNullRCUpdates
+/RCCollectorOptORoots
+/RCCollectorOptRCSubsumedByActual
+/RCCollectorOptRCSubsumedByCurrentThread
+/RCCollectorOptRCSubsumedByROFields
+/RCCollectorOptRCSubsumedByTSFields
+/RCCollectorOptRCSubsumedI
+/RCCollectorOptRuntimeAcyclicRefTypeUpdates
+/RCCollectorOptStaticAcyclicRefTypeUpdates
+/RCCollectorOptThreadLocalAnalysis
+/RCCollectorRCUpdateReplacement
+/RCCollectorShowStatistics
+/RCCollectorVerifyLeakedCycles
+/RCCollectorVerifyRefCounts
+/RedoIrInliner
+/RefAnyValueChecks
+/RegAllocCloseSpillLoads
+/RegAllocCoalesce
+/RegAllocCoalesceDebug
+/RegAllocColorSpillSlots
+/RegAllocDebug
+/RegAllocGenGCTransitionCode
+/RegAllocMethodNoise
+/RegAllocPostPrint
+/RegAllocSpill
+/RegAllocX86CalleeSavedOnly
+/RuntimeMods
+/ShareExceptionRecordsAcrossFunctions
+/SimpleThreadEscapeDump
+/SingSharpTemplateRemover
+/sparseCallTableSpacing
+/sparseSegmentSize
+/SsaArraySimple
+/SsaDeadCode
+/SsaLoopInv
+/SsaNullCheck
+/SsaNullCheckGlobal
+/SsaNullCheckGlobalThreaded
+/SsaOpts
+/SsaStrengthReduce
+/Ssb
+/StackOverflowChecks
+/StrictEcma
+/StructInheritance
+/SurrogateBoxing
+/SymbolicDebug
+/SymbolicIR
+/Target64Bit
+/TargetArch
+/ThrowOnInternalError
+/TimeStampMessages
+/TodoWarnings
+/ToLirDebug
+/ToLirDebugFields
+/ToLirDebugMethods
+/ToLirUnresolvedOK
+/TryAllCheckMask
+/TryAllDecomposeOpt
+/TryAllDecomposeOptFlow
+/TryAllDisableAfterFiltering
+/TryAllDisableAllLogging
+/TryAllDisableBeforeFiltering
+/TryAllDisableBeforeWritingLog
+/TryAllDisableHousekeeping
+/TryAllDisableOnMethodEntry
+/TryAllEnableProfiling
+/TryAllPerCallSiteProfiling
+/TryAllSupport
+/TryAllSupportDebug
+/TryAllSupportEnlistmentLogChunkSize
+/TryAllSupportEnlistmentLogEnsurableSize
+/TryAllSupportHashingForReadEnlistments
+/TryAllSupportLoadStoreOpt
+/TryAllSupportOptimizePass
+/TryAllSupportSsaNullCheck
+/TryAllSupportSsaNullCheckGlobal
+/TryAllSupportUpdateLogChunkSize
+/TryAllSupportUpdateLogEnsurableSize
+/TypeCheckerAbortOnFailure
+/TypeCheckerPrintLimit
+/TypedReference
+/TypeInitElim
+/TypeInitRemoveEmptyCctors
+/UnboxChecks
+/UndoIrDeadCode
+/UndoIrInliner
+/UndoSsaDeadCode
+/UnmanagedStrings
+/UnnameTracedPtrs
+/UnsoundLoopRead
+/UseSegmentRegister
+/UseSharedExceptionUnwind
+/UseVTableBits
+/ValidMasm
+/VectorUseCheckingEnumerator
+/VerboseWarnings
+/Warnings
+/WarnOnPInvokeUsage
+/Wb
+/WholeProgram
+
+    -->
+
+</Project>
+
+
diff --git a/base/Targets/ConsoleCategory.targets b/base/Targets/ConsoleCategory.targets
new file mode 100644
index 0000000..1a22f89
--- /dev/null
+++ b/base/Targets/ConsoleCategory.targets
@@ -0,0 +1,19 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Projects that are "console" apps should import this targets file.
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Transforms\AppTransforms.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="App.targets"/>
+  
+</Project>
diff --git a/base/Targets/Dirs.targets b/base/Targets/Dirs.targets
new file mode 100644
index 0000000..98d4a38
--- /dev/null
+++ b/base/Targets/Dirs.targets
@@ -0,0 +1,51 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Targets\Dirs.targets
+#
+#   Note:
+#
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="Build"
+          Outputs="@(__merged_project_outputs)"
+          DependsOnTargets="BeforeBuild;BuildDependentProjects;AfterBuild;$(BuildDependsOn)">
+  </Target>
+
+
+  <Target Name="BuildDependentProjects">
+    <MSBuild Projects="@(DependentProject);@(ProjectReference)" Condition="'$(BuildInParallel)'!='true'" StopOnFirstFailure="$(StopOnFirstFailure)">
+      <Output ItemName="__merged_project_outputs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+    <MSBuild Projects="@(DependentProject);@(ProjectReference)" Condition="'$(BuildInParallel)'=='true'" StopOnFirstFailure="$(StopOnFirstFailure)" BuildInParallel="true">
+      <Output ItemName="__merged_project_outputs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+  </Target>
+
+  <Target Name="Clean" DependsOnTargets="$(CleanDependsOn)">
+    <MSBuild Projects="@(DependentProject);@(ProjectReference)" Targets="Clean"/>
+  </Target>
+
+  <Target Name="BeforeBuild"/>
+  <Target Name="AfterBuild"/>
+
+  <Target Name="ShowCommands">
+    <MSBuild Projects="@(ProjectReference);@(DependentProject)" Targets="ShowCommands"/>
+  </Target>
+
+  <Target Name="GetContentItemsOfDependentProjects">
+    <MSBuild Projects="@(ProjectReference)" Targets="GetContentItems" StopOnFirstFailure="$(StopOnFirstFailure)">
+      <Output ItemName="__content_items" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+  </Target>
+  
+  <Target Name="GetContentItems" Outputs="@(__content_items)" DependsOnTargets="GetContentItemsOfDependentProjects">    
+  </Target>
+
+</Project>
diff --git a/base/Targets/Distro.targets b/base/Targets/Distro.targets
new file mode 100644
index 0000000..bc0b916
--- /dev/null
+++ b/base/Targets/Distro.targets
@@ -0,0 +1,335 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Targets\Distro.targets
+
+Note:
+
+This file handles building "Distro" projects.  Distro projects are a collection
+of applications, which are built and packaged into a complete, bootable OS image.
+The OS image can be served to PXE clients by using bootd.exe, can be burned to
+a CD-ROM (or Virtual PC can boot using the CD-ROM image), or can be copied to
+a bootable FAT partition.
+
+Distro projects are currently stored in the $(SINGULARITY_ROOT)\Distro directory.
+
+Distro projects can set the following properties:
+
+  * DistroName - Specifies a name for the distribution, which allows the build
+    outputs to be isolated from other distributions.  It is important that
+    distro projects have distinct names.  This property is required.
+
+
+Distro projects can declare the following items:
+
+  * Application - Specifies a reference to an application project that should be
+    included in this distribution.  This must refer to a project that imports
+    App.targets, either directly or indirectly.
+
+
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <DistroName Condition="'$(DistroName)'==''">$(MSBuildProjectName)</DistroName>
+
+    <PATH>$(SINGULARITY_PATH);$(SYSTEMROOT)\system32</PATH>
+
+    <DISTRO_OBJNAME>$(Configuration).$(Platform).$(COLLECTOR_APP).$(SCHEDULER).$(COLLECTOR_KERNEL)$(PAGING_FLAG)</DISTRO_OBJNAME>
+    <DISTRO_ROOT>$(SINGULARITY_OBJROOT)\Distros\$(DistroName).$(DISTRO_OBJNAME)</DISTRO_ROOT>
+    <DISTRO_ISO>$(DISTRO_ROOT).iso</DISTRO_ISO>
+    <DISTRO_ISO_LOG>$(DISTRO_ISO).log</DISTRO_ISO_LOG>
+    <DISTRO_ENV>$(SINGULARITY_ROOT)\buildcfg.cmd</DISTRO_ENV>
+
+    <DISTDIR>$(DISTRO_ROOT)</DISTDIR>
+
+    <DISTRO_SINGULARITY_DIR>$(DISTDIR)\Singularity</DISTRO_SINGULARITY_DIR>
+    <DISTRO_FILES_DIR>$(DISTDIR)\Singularity\Files</DISTRO_FILES_DIR>
+    <DISTRO_BINARIES_DIR>$(DISTDIR)\Singularity\Binaries</DISTRO_BINARIES_DIR>
+    <DISTRO_SCRIPT_DIR>$(DISTDIR)\Singularity\Scripts</DISTRO_SCRIPT_DIR>
+
+    <KERNEL_DUMP>kernel.dmp</KERNEL_DUMP>
+    <KERNEL_PDB>kernel.x86.pdb</KERNEL_PDB>
+    <SINGLDR_FILE>Singldr</SINGLDR_FILE>
+    <INIFILE_NAME>Singularity\Singboot.ini</INIFILE_NAME>
+
+    <NIB_FLAGS>/bartok:$(BARTOK) /machine:$(MACHINE)</NIB_FLAGS>
+    <NibFileList>$(DISTDIR)\NibFileList.txt</NibFileList>
+
+    <!-- #[TODO]:  this ought to depend on $(PLATFORM) but doesn't right now. -->
+    <SYSDATA_NAME Condition="'$(SYSDATA_NAME)'==''">$(SINGULARITY_ROOT)\Distro\LegacyPCDistro.xml</SYSDATA_NAME>
+
+    <METADATA_NAME>metadata.xml</METADATA_NAME>
+    <FILE_LIST>$(DISTDIR)\files.txt</FILE_LIST>
+
+  </PropertyGroup>
+
+  <Target Name="Build"
+          DependsOnTargets="
+          BuildDistro;
+          BuildIso;
+          BuildEnv;
+          "/>
+
+  <Target Name="BuildDistro"
+          DependsOnTargets="
+          CheckProject;
+          ShowDebugInfo;
+          CreateDirs;
+          BuildBootSectors;
+          BuildBaseProjects;
+          ConvertKernelManifest;
+          BuildAppsNative;
+          CreateFileList;
+          RunDistroBuilder;
+          ">
+
+  </Target>
+
+  <Target Name="ShowDebugInfo">
+    <Message Text="Distro name:           $(DistroName)"/>
+    <Message Text="DISTRO_BINARIES_DIR:   $(DISTRO_BINARIES_DIR)"/>
+    <Message Text="DISTRO_FILES_DIR:      $(DISTRO_FILES_DIR)"/>
+    <Message Text="DISTRO_SCRIPT_DIR:     $(DISTRO_SCRIPT_DIR)"/>
+  </Target>
+
+  <Target Name="CreateDirs">
+    <MakeDir Directories="
+             $(DISTDIR);
+             $(DISTRO_BINARIES_DIR);
+             $(DISTRO_FILES_DIR);
+             $(DISTRO_SCRIPT_DIR);
+             $(DISTRO_TEMP_DIR);
+             $(APPS_NATIVE_IMAGE_DIR);
+             "/>
+  </Target>
+
+  <Target Name="CheckProject">
+    <Error Condition="'$(DistroName)'==''" Text="The 'DistroName' property has not been set, and is required." />
+    <Warning Condition="'$(DistroSkipKernel)'=='true'" Text="You have chosen to skip compiling the kernel (by specifying DistroSkipKernel=true)."/>
+    <Warning Condition="'$(DistroSkipApps)'=='true'" Text="You have chosen to skip compiling all apps (by specifying DistroSkipApps=true)."/>
+  </Target>
+
+  <ItemGroup>
+    <BaseProject Condition="'$(DistroSkipKernel)'!='true'" Include="$(SINGULARITY_ROOT)\Kernel\Kernel.proj"/>
+    <BaseProject Condition="'$(DistroSkipApps)'!='true'" Include="$(SINGULARITY_ROOT)\Applications\Runtime\Corlib.Native.proj"/>
+  </ItemGroup>
+
+  <Target Name="BuildBaseProjects">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Interfaces\Interfaces.proj"/>
+    <MSBuild Projects="@(BaseProject)" Condition="'$(BuildInParallel)'!='true'"/>
+    <MSBuild Projects="@(BaseProject)" Condition="'$(BuildInParallel)'=='true'" BuildInParallel="true"/>
+  </Target>
+
+  <Target Name="BuildBootSectors" Condition="'$(DistroSkipKernel)'!='true'">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Boot\BootSectors\BootSectors.proj"/>
+  </Target>
+
+  <Target Name="BuildIso"
+          Condition="'$(SINGULARITY_BUILD_ISO)'!='false'"
+          DependsOnTargets="BuildDistro">
+    <Message Text="Building CD-ROM ISO image"/>
+    <MakeDir Condition="'$(DISTRO_ISO_DIR)'!=''" Directories="$(DISTRO_ISO_DIR)"/>
+    <Exec Command="$(BUILDDIR)\cdimage -j1 -lSingularity -b$(BOOTDIR)\Etfs_BS.bin $(DISTDIR) $(DISTRO_ISO) 1&gt;$(DISTRO_ISO_LOG) 2&gt;&amp;1">
+       <Output TaskParameter="ExitCode" PropertyName="BuildIsoExitCode"/>
+    </Exec>
+    <Message Text="CD-ROM image: $(DISTRO_ISO)" Condition="'$(BuildIsoExitCode)'=='0'"/>
+    <Error Text="cdimage failed. Check $(DISTRO_ISO_LOG)" Condition="'$(BuildIsoExitCode)'!='0'"/>
+    <Exec Command="type $(DISTRO_ISO_LOG)" Condition="'$(BuildIsoExitCode)'!='0'"/>
+    <Delete Files="$(DISTRO_ISO_LOG)" Condition="'$(BuildIsoExitCode)'=='0'"/>
+  </Target>
+
+  <Target Name="BuildEnv"
+          Outputs="$(DISTRO_ENV)">
+     <WriteLinesToFile File="$(DISTRO_ENV)"
+                       Overwrite="true"
+                       Lines="
+@rem Generated by $(Username) on $(ComputerName)
+@rem at $(_time) on $(_date)
+
+set _BOOTD_TFTP_DIR=$(DISTRO_ROOT)
+set _BOOT_CD=$(DISTRO_ISO)
+set _NT_DEBUGGER_EXTENSION_PATH=$(SINGULARITY_ROOT)\build
+set _NT_SOURCE_PATH=srv*%3b$(SINGULARITY_ROOT)%3b$(SINGULARITY_ROOT)\Applications%3b$(SINGULARITY_ROOT)\Boot%3b$(SINGULARITY_ROOT)\drivers%3b$(SINGULARITY_ROOT)\interfaces%3b$(SINGULARITY_ROOT)\kernel%3b$(SINGULARITY_ROOT)\Libraries%3b$(SINGULARITY_ROOT)\Services
+set _NT_SYMBOL_PATH=$(DISTRO_TEMP_DIR)%3b$(KERNEL_NATIVE_DIR)%3b
+"
+    />
+    <!--
+ It would be good to tell the user a relative path
+     here so they could cut-and-paste name in single pass.  The RelativeDir
+     transform doesn't deal with directories up the tree though., ie output
+     could just be along the lines of ..\base.obj\SomeDistroName.cmd
+    -->
+    <Message Text="-------------------------------------------------------------------------------
+Debugger and bootd environment file:
+$(DISTRO_ENV)
+-------------------------------------------------------------------------------
+" Importance="High"/>
+  </Target>
+
+  <ItemGroup>
+    <ScriptFiles Include="Scripts\*"/>
+    <DataFiles Include="Files\*"/>
+    <BootSectors Include="$(BOOTDIR)\*.bin"/>
+    <Binaries Include="$(KERNEL_NATIVE_DIR)\$(KERNEL_DUMP)"/>
+    <Binaries Include="$(KERNEL_NATIVE_DIR)\testpe.x86"/>
+    <Binaries Include="$(KERNEL_NATIVE_DIR)\testpe.manifest"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(PAGING)'=='On'">
+    <Binaries Include="$(KERNEL_NATIVE_DIR)\syscalls.dll"/>
+  </ItemGroup>
+
+  <Target Name="CopyFiles"
+          DependsOnTargets="BuildAppsNative;BuildBaseProjects;CopyContentFiles">
+    <Copy SourceFiles="@(ScriptFiles)" DestinationFolder="$(DISTRO_SCRIPT_DIR)" SkipUnchangedFiles="true"/>
+    <Copy SourceFiles="@(DataFiles)" DestinationFolder="$(DISTRO_FILES_DIR)" SkipUnchangedFiles="true"/>
+    <Copy SourceFiles="@(Binaries)" DestinationFolder="$(DISTRO_BINARIES_DIR)" SkipUnchangedFiles="true"/>
+    <Copy SourceFiles="$(BOOTDIR)\$(SINGLDR_FILE)" DestinationFolder="$(DISTDIR)" SkipUnchangedFiles="true"/>
+    <Copy SourceFiles="@(BootSectors)" DestinationFolder="$(DISTDIR)" SkipUnchangedFiles="true"/>
+  </Target>
+
+  <!-- This always runs; there is no incremental build support here. -->
+  <Target Name="CreateFileList"
+          Outputs="$(FILE_LIST)"
+          DependsOnTargets="CopyFiles">
+
+    <!-- Create a list of files in the distribution. -->
+    <Message Text="Building Distro file list in $(DISTDIR)"/>
+
+    <!--
+    @rem NB Put kernel pdb alongside other pdbs. This makes kernel debug
+    @rem    symbol location robust with respect to entire tree moves (as
+    @rem    might happen with a build on a farm).
+    -->
+    <!-- <Copy SourceFiles="$(KERNDIR)\$(KERNEL_PDB)" DestinationFolder="$(DISTRO_TEMP_DIR)" SkipUnchangedFiles="true"/> -->
+
+    <Message Text="Creating file list - $(FILE_LIST)"/>
+    <Exec Command="dir /b /s /a-d $(DISTDIR) &gt; $(FILE_LIST)"/>
+  </Target>
+
+
+<!-- Create the system manifest and metadata file. -->
+  <Target Name="RunDistroBuilder"
+          DependsOnTargets="CreateDirs;CreateFileList">
+    <Message Text="Creating Distribution"/>
+    <Exec Command="$(BUILDDIR)\distrobuilder /out:$(DISTDIR)\Singularity\$(METADATA_NAME) /policy:$(SYSDATA_NAME) /dir:$(DISTDIR) /ini:$(DISTDIR)\$(INIFILE_NAME) /desc:$(FILE_LIST)"/>
+  </Target>
+
+  <!-- Convert all MSIL files into native images. -->
+  <Target Name="BuildAppsNative">
+
+    <Message Condition="'$(DistroSkipApps)'!='true'" Importance="high" Text="Building native images"/>
+
+    <!-- Remove duplicates from the Application set. -->
+    <RemoveDuplicates Inputs="@(Application)">
+      <Output ItemName="Application_no_dups" TaskParameter="Filtered"/>
+    </RemoveDuplicates>
+
+    <!--
+    Build all Application projects.  If the invoking MSBuild instance supports parallel builds,
+    then build the applications in parallel.  We need to duplicate the MSBuild task, because MSBuild 2.0
+    will reject the task if the BuildInParallel attribute is present, even if it is empty or "false".
+    -->
+    <MSBuild Projects="@(Application_no_dups)"
+             Condition="'$(DistroSkipApps)'!='true' and '$(BuildInParallel)'!='true'">
+      <Output ItemName="__app_build_outputs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+    <MSBuild Projects="@(Application_no_dups)"
+             Condition="'$(DistroSkipApps)'!='true' and '$(BuildInParallel)'=='true'"
+             BuildInParallel="true">
+      <Output ItemName="__app_build_outputs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+
+    <!--
+    If DistroSkipApps=true, then we still need to determine the names of the output assemblies.
+    We do this by "building" the app projects, but only building the GetOutputAssemblyPath target.
+    -->
+    <MSBuild Projects="@(Application_no_dups)"
+             Targets="GetOutputAssemblyPath"
+             Condition="'$(DistroSkipApps)'=='true'">
+      <Output ItemName="__app_build_outputs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+
+    <!-- Filter the build outputs from the Application item set, so that we only pick up executables. -->
+    <CreateItem Include="%(__app_build_outputs.identity)">
+      <Output ItemName="__app_exes" TaskParameter="Include" Condition="'%(__app_build_outputs.extension)' == '.exe'"/>
+    </CreateItem>
+    <Message Text="__app_exes: %(__app_exes.identity)"/>
+
+    <Warning Text="Found library in Application set: %(__app_build_outputs.identity)"
+             Condition="'%(__app_build_outputs.extension)'!='.exe' and '%(__app_build_outputs.extension)'!=''"/>
+
+    <!-- Create items that represent the app manifests. -->
+    <CreateItem Include="%(__app_exes.rootdir)%(__app_exes.directory)%(__app_exes.filename).manifest">
+      <Output ItemName="__app_manifests" TaskParameter="Include"/>
+    </CreateItem>
+
+    <Message Text="__app_manifests: %(__app_manifests.identity)"/>
+
+    <WriteLinesToFile File="$(NibFileList)"
+                      Overwrite="true"
+                      Lines="@(__app_manifests)"
+                      Condition="'$(DistroSkipApps)'!='true'"/>
+    <Exec Condition="'$(DistroSkipApps)'!='true'"
+      Command="PATH $(SINGULARITY_PATH) &amp; $(NIB) $(NIB_FLAGS) /cache:$(DISTRO_CACHE_DIR) /libcache:$(DISTRO_LIB_DIR) /native:$(APPS_NATIVE_IMAGE_DIR) /options:$(SINGULARITY_ROOT)\Options\$(Configuration).$(COLLECTOR_APP).$(Machine).options /temp:$(DISTRO_TEMP_DIR) $(NIBOPTS) /apps:$(NibFileList)"/>
+
+    <Copy SourceFiles="$(APPS_NATIVE_IMAGE_DIR)\%(__app_exes.filename).x86;$(APPS_NATIVE_IMAGE_DIR)\%(__app_exes.filename).manifest"
+          DestinationFolder="$(DISTRO_BINARIES_DIR)" SkipUnchangedFiles="true"/>
+  </Target>
+
+
+  <Target Name="ConvertKernelManifest"
+          Inputs="$(KERNEL_NATIVE_DIR)\kernel.manifest"
+          Outputs="$(DISTRO_BINARIES_DIR)\kernel.manifest"
+          DependsOnTargets="BuildBaseProjects">
+    <Exec Command="$(NIB) $(NIB_FLAGS) /cache:$(BUILD_ROOT) /libcache:$(BUILD_ROOT) /native:$(DISTRO_BINARIES_DIR) /temp:$(BUILD_ROOT) /manifest $(KERNEL_NATIVE_DIR)\kernel.manifest"/>
+  </Target>
+
+  <!--
+  This target copies content files from projects to the distro output.
+  If an app project is included in the 'Application' item set of a distro project,
+  and that app project declares one or more 'Content' items, then those items will
+  be copied to the distribution output tree.  This allows apps to declare dependencies
+  on files, and have those files built as part of the distribution, similar to binplace.
+  -->
+  <Target Name="CopyContentFiles" Condition="'$(EnableContentFiles)'!='false'">
+    <MSBuild Projects="@(Application)" Targets="GetContentItems">
+      <Output ItemName="AppContent" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+
+    <!-- <Message Text="AppContent: %(AppContent.identity) DistroPath=%(AppContent.DistroPath)"/> -->
+
+    <!-- Create directories for the content files, if any -->
+    <MakeDir Directories="$(DISTRO_SINGULARITY_DIR)\%(AppContent.DistroPath)"/>
+
+    <Copy SourceFiles="%(AppContent.identity)" DestinationFolder="$(DISTRO_FILES_DIR)\%(AppContent.DistroPath)" SkipUnchangedFiles="true"/>
+
+  </Target>
+
+  <ItemGroup>
+    <CleanDirs Include="$(BOOTDIR)"/>
+    <CleanDirs Include="$(DRIVDIR)"/>
+    <CleanDirs Include="$(LIBSDIR)"/>
+    <CleanDirs Include="$(APPSDIR)"/>
+    <CleanDirs Include="$(KERNEL_IL_DIR)"/>
+    <CleanDirs Include="$(KERNEL_NATIVE_DIR)"/>
+    <CleanDirs Include="$(ILLSDIR)"/>
+    <CleanDirs Include="$(APPRUNTIMEDIR)"/>
+    <CleanDirs Include="$(APPRUNTIMENATIVEDIR)"/>
+    <CleanDirs Include="$(DISTRO_LIB_DIR)"/>
+    <CleanDirs Include="$(DISTRO_TEMP_DIR)"/>
+    <CleanDirs Include="$(APPS_NATIVE_IMAGE_DIR)"/>
+    <CleanDirs Include="$(DISTRO_ROOT)"/>
+  </ItemGroup>
+
+  <Target Name="Clean">
+     <RemoveDir Directories="@(CleanDirs)" />
+  </Target>
+</Project>
diff --git a/base/Targets/DriverCategory.targets b/base/Targets/DriverCategory.targets
new file mode 100644
index 0000000..1dfd72f
--- /dev/null
+++ b/base/Targets/DriverCategory.targets
@@ -0,0 +1,25 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Projects that are "driver" apps should import this targets file.
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Drivers\Transforms\DriverTransform.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Condition="'$(SingularityPathsIncluded)'==''" Project="Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputPath Condition="'$(OutputPath)'==''">$(DRIVDIR)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="App.targets"/>
+  
+</Project>
diff --git a/base/Targets/ILAssembly.targets b/base/Targets/ILAssembly.targets
new file mode 100644
index 0000000..7c6f094
--- /dev/null
+++ b/base/Targets/ILAssembly.targets
@@ -0,0 +1,112 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Targets\ILAssembly.targets
+
+Projects that import this file can set the following properties:
+
+  AssemblyName                Name of assembly, excluding file extension
+  OutputType                  'Exe' or 'Library'
+  NoStrongName                'true' to turn off assembly strong name signing
+  OutputPath                  Specifies output path for the assembly. Default is $(ILLSDIR).
+
+Projects can declare the following items:
+
+  Compile                     Source file (.cs or .sg, etc.)
+
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Supply defaults. -->
+  <PropertyGroup>
+    <NoStrongName Condition="'$(NoStrongName)'==''">false</NoStrongName>
+    <OutputPath Condition="'$(OutputPath)'==''">$(ILLSDIR)</OutputPath>
+  </PropertyGroup>
+
+
+  <!-- Build the command line for the ilasm compiler. -->
+  <PropertyGroup>
+    <CompilerFlags>/nologo /debug /quiet</CompilerFlags>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(OutputType)'=='Exe'">
+      <PropertyGroup>
+        <AssemblyExt Condition="'$(AssemblyExt)'==''">.exe</AssemblyExt>
+        <CompilerFlags>$(CompilerFlags) /exe</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(OutputType)'=='Library'">
+      <PropertyGroup>
+        <AssemblyExt Condition="'$(AssemblyExt)'==''">.dll</AssemblyExt>
+        <CompilerFlags>$(CompilerFlags) /dll</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Error Include="The value '$(OutputType)' is not valid for the 'OutputType' property."/>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  
+
+  <PropertyGroup>
+    <AssemblyFileName>$(AssemblyName)$(AssemblyExt)</AssemblyFileName>
+    <OutputAssemblyPath>$(OutputPath)\$(AssemblyFileName)</OutputAssemblyPath>
+    <CompilerFlags>$(CompilerFlags) /output=$(OutputAssemblyPath)</CompilerFlags>
+    <CompilerFlags Condition="'$(NoStrongName)'!='true'">$(CompilerFlags) /key=$(OutputPath)\public.snk</CompilerFlags>
+  </PropertyGroup>
+  
+
+  <!-- TARGETS -->
+  
+  <Target Name="CreateStrongName" Condition="'$(NoStrongName)'!='true'">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Build\BuildKey.proj"/>
+  </Target>
+
+  
+  <Target Name="CheckErrors">
+    <Error Condition="'@(Error)'!=''" Text="%(Error.Identity)"/>
+    <Error Condition="'$(AssemblyName)'==''" Text="The 'AssemblyName' property is required."/>
+    <Error Condition="'$(OutputPath)'==''" Text="The 'OutputPath' property is required."/>
+    <Error Condition="'$(OutputType)'==''" Text="The 'OutputType' property is required."/>
+  </Target>
+
+  <Target Name="ShowDebugInfo" DependsOnTargets="CheckErrors">
+    <Message Text="Projects: @(ProjectReference,' ')"/>
+    <Message Text="Dependent project: %(ProjectReference.Identity)"/>
+    <Message Text="_aliased_refs: %(_aliased_refs.Identity)"/>
+    <Message Text="Reference: %(Reference.Identity) alias %(Reference.Alias)"/>
+  </Target>
+  
+  <Target Name="BuildAssembly"
+          Inputs="@(Compile);$(MSBuildProjectFullPath)"
+          Outputs="$(OutputAssemblyPath)"
+          DependsOnTargets="CheckErrors;CreateStrongName">
+
+    <Message Text="Compiling IL assembly - $(AssemblyName)$(AssemblyExt)"/>
+    <MakeDir Directories="$(OutputPath)"/>
+    <Exec Command="$(ILASM) $(CompilerFlags) @(Compile,' ')"/>
+  </Target>
+
+  <Target Name="Build"
+          Outputs="$(OutputAssemblyPath)"
+          DependsOnTargets="BuildAssembly">
+  </Target>
+  
+  <Target Name="Rebuild" DependsOnTargets="BuildAssembly">
+  </Target>
+  
+  <Target Name="ShowCommands">
+    <Message Text="$(ILASM) $(CompilerFlags) @(Compile,' ')"/>
+  </Target>
+
+  <Target Name="GetContentItems" Outputs="@(Content)" />
+
+</Project>
+
diff --git a/base/Targets/InterfaceAssembly.targets b/base/Targets/InterfaceAssembly.targets
new file mode 100644
index 0000000..5954a19
--- /dev/null
+++ b/base/Targets/InterfaceAssembly.targets
@@ -0,0 +1,204 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Targets\InterfaceAssembly.targets
+
+This file contains the build logic for interface assemblies.  Interface assemblies
+contain MSIL metadata, but do not contain method bodies.  Interface assemblies allow
+cyclic dependencies (e.g. kernel.exe also IoSystem.dll both refer to each other),
+and also allow one assembly to be replaced with another at runtime (or at ngen).
+
+Projects that import this file can set the following properties:
+
+  AssemblyName                Name of assembly, excluding file extension
+  OutputType                  'Exe' or 'Library'
+  AllowUnsafeBlocks           'true' to allow unverifiable code
+  NoStrongName                'true' to turn off assembly strong name signing
+  InterfaceAssemblyIsKey      'true' to pass /key to csic.exe
+  CSIC                        Overrides the default compiler tool, $(BUILDDIR)\csic.exe
+  OutputPath                  Specifies output path for the assembly. Default is $(ILLSDIR).
+  NoStdLib                    'true' to pass /nostdlib to csic.exe
+
+Projects can declare the following items:
+
+  Compile                     Source file (.cs or .sg, etc.)
+  ProjectReference            A reference to another interface project.  The project can
+                              also declare the optional 'Alias' metadata tag.  This will
+                              add the "=<aliasvalue>" suffix to the /r: reference arg.
+
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Supply defaults. -->
+  <PropertyGroup>
+    <NoStdlib Condition="'$(NoStdlib)'==''">false</NoStdlib>
+    <AllowUnsafeBlocks Condition="'$(AllowUnsafeBlocks)'==''">false</AllowUnsafeBlocks>
+    <NoStrongName Condition="'$(NoStrongName)'==''">false</NoStrongName>
+    <InterfaceAssemblyIsKey Condition="'$(InterfaceAssemblyIsKey)'==''">false</InterfaceAssemblyIsKey>
+    <OutputPath Condition="'$(OutputPath)'==''">$(ILLSDIR)</OutputPath>
+    <CSIC Condition="'$(CSIC)'==''">$(BUILDDIR)\csic.exe</CSIC>
+  </PropertyGroup>
+
+
+  <!-- Build the command line for the csic compiler. -->
+  <PropertyGroup>
+    <CompilerFlags></CompilerFlags>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(OutputType)'=='Exe'">
+      <PropertyGroup>
+        <AssemblyExt>.exe</AssemblyExt>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(OutputType)'=='Library'">
+      <PropertyGroup>
+        <AssemblyExt>.ill</AssemblyExt>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Error Include="The value '$(OutputType)' is not valid for the 'OutputType' property."/>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  
+
+  <PropertyGroup>
+    <AssemblyFileName>$(AssemblyName)$(AssemblyExt)</AssemblyFileName>
+    <OutputAssemblyPath>$(OutputPath)\$(AssemblyFileName)</OutputAssemblyPath>
+  </PropertyGroup>
+  
+
+  <Choose>
+    <When Condition="'$(NoStdlib)'=='false'"/>
+    
+    <When Condition="'$(NoStdlib)'=='true'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /nostdlib</CompilerFlags>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <ItemGroup>
+        <Error Include="The value '$(NoStdlib)' is not a valid choice for the 'NoStdlib' property."/>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
+  <Choose>
+    <When Condition="'$(AllowUnsafeBlocks)'=='true'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /unsafe</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(AllowUnsafeBlocks)'=='false'">
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>The value '$(AllowUnsafeBlocks)' is not a valid choice for the 'AllowUnsafeBlocks' property.</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+
+
+  <Choose>
+    <When Condition="'$(NoStrongName)'=='false'">
+
+      <ItemGroup>
+        <DependentProject Include="$(SINGULARITY_ROOT)\Build\BuildKey.proj"/>
+        <Dependency Include="$(StrongNameKeyFile)"/>
+      </ItemGroup>
+      
+    </When>
+  </Choose>
+
+  <Choose>
+    <When Condition="'$(InterfaceAssemblyIsKey)'=='true'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /key</CompilerFlags>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+  <!-- TARGETS -->
+  
+  <Target Name="CheckErrors">
+    <Error Condition="'@(Error)'!=''" Text="%(Error.Identity)"/>
+    <Error Condition="'$(AssemblyName)'==''" Text="The 'AssemblyName' property is required."/>
+    <Error Condition="'$(OutputPath)'==''" Text="The 'OutputPath' property is required."/>
+    <Error Condition="'$(OutputType)'==''" Text="The 'OutputType' property is required."/>
+  </Target>
+
+  <Target Name="ShowDebugInfo" DependsOnTargets="CheckErrors">
+    <Message Text="Projects: @(ProjectReference,' ')"/>
+    <Message Text="Dependent project: %(ProjectReference.Identity)"/>
+    <Message Text="_aliased_refs: %(_aliased_refs.Identity)"/>
+    <Message Text="Reference: %(Reference.Identity) alias %(Reference.Alias)"/>
+  </Target>
+  
+  <Target Name="BuildDependentProjects" DependsOnTargets="CheckErrors">
+    <MSBuild Projects="@(ProjectReference);@(DependentProject)" Targets="Build">
+      <Output TaskParameter="TargetOutputs" ItemName="__built_items" />
+    </MSBuild>
+
+    <!-- i hate this. -->
+    <CreateItem Include="@(ProjectReference->'$(OutputPath)\%(filename).ill')" AdditionalMetadata="Alias=%(ProjectReference.Alias)">
+      <Output TaskParameter="Include" ItemName="Reference"/>
+    </CreateItem>
+
+    <!-- now create "_aliased_refs" set -->
+    <CreateItem Include="@(Reference)">
+      <Output TaskParameter="Include" Condition="'%(Reference.Alias)'==''" ItemName="_aliased_refs" />
+    </CreateItem>
+
+    <CreateItem Include="%(Reference.Identity)=%(Reference.Alias)">
+      <Output TaskParameter="Include" Condition="'%(Reference.Alias)'!=''" ItemName="_aliased_refs" />
+    </CreateItem>
+    
+  </Target>
+  
+  <Target Name="BuildStrongName" DependsOnTargets="CheckErrors"
+          Inputs="$(BUILDDIR)\BuildKey.snk"
+          Outputs="$(OutputPath)\public.snk"
+          Condition="'$(NoStrongName)'!='true'"
+          >
+    <MakeDir Directories="$(OutputPath)"/>
+    <Exec Command="$(BUILDDIR)\sn -q -p $(BUILDDIR)\BuildKey.snk $(OutputPath)\public.snk"/>
+  </Target>
+  
+  
+  <Target Name="BuildAssembly"
+          Inputs="@(Compile);@(Reference);@(Dependency);$(MSBuildProjectFullPath)"
+          Outputs="$(OutputAssemblyPath)"
+          DependsOnTargets="CheckErrors;BuildStrongName;BuildDependentProjects">    
+
+    <MakeDir Directories="$(OutputPath)"/>
+    <Exec Command="$(CSIC) -out:$(OutputAssemblyPath) -outdir:$(OutputPath) $(CompilerFlags) @(_aliased_refs->'/r:%(Identity)',' ') -t:library @(Compile,' ') || (
+      echo Deleting corrupted output - $(OutputAssemblyPath) &amp; del $(OutputAssemblyPath) /q &amp; exit 1)"/>
+  </Target>
+
+  <Target Name="Build"
+          Outputs="$(OutputAssemblyPath)"
+          DependsOnTargets="BuildAssembly">
+  </Target>
+  
+  <Target Name="Clean" DependsOnTargets="$(CleanDependsOn)">
+    <Delete Files="$(OutputAssemblyPath)"/>
+    <Delete Files="$(OutputPath)\$(AssemblyName).pdb"/>
+    <Delete Files="$(OutputPath)\$(AssemblyName).il"/>
+  </Target>
+
+  <Target Name="ShowCommands">
+    <MSBuild Projects="@(ProjectReference);@(DependentProject)" Targets="ShowCommands"/>
+    <Message Text="$(CSIC) -out:$(OutputAssemblyPath) -outdir:$(OutputPath) $(CompilerFlags) @(_aliased_refs->'/r:%(Identity)',' ') -t:library @(Compile,' ')"/>
+  </Target>
+
+</Project>
+
diff --git a/base/Targets/KernelContractsLibrary.targets b/base/Targets/KernelContractsLibrary.targets
new file mode 100644
index 0000000..1a8c7eb
--- /dev/null
+++ b/base/Targets/KernelContractsLibrary.targets
@@ -0,0 +1,16 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+This .targets file is for assemblies that are "user" / process assemblies,
+i.e. they are not part of the kernel.
+
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Condition="'$(SingularityPathsIncluded)'==''" Project="$(SINGULARITY_ROOT)\Paths.targets"/>
+
+  <Import Project="KernelLibrary.targets"/>
+
+</Project>
diff --git a/base/Targets/KernelLibrary.targets b/base/Targets/KernelLibrary.targets
new file mode 100644
index 0000000..61e41fc
--- /dev/null
+++ b/base/Targets/KernelLibrary.targets
@@ -0,0 +1,83 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+This .targets file is used by the assemblies under $(SINGULARITY_ROOT)\Contracts.
+The contracts are built, linked against the kernel runtime, instead of the app
+runtime.
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+
+  <Import Condition="'$(SingularityPathsIncluded)'==''" Project="$(SINGULARITY_ROOT)\Paths.targets"/>
+
+  <PropertyGroup>
+    <OutputPath Condition="'$(OutputPath)'==''">$(KERNEL_IL_DIR)</OutputPath>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <ExtraCompilerFlags>$(ExtraCompilerFlags) /d:SINGULARITY /d:SINGULARITY_KERNEL /d:ENDPOINT_STRUCT /d:_NEW_CLASSLOADER /d:NODEFAULTLIB</ExtraCompilerFlags>
+    
+    <NoConfig Condition="'$(NoConfig)'==''">true</NoConfig>
+    <NoStdlib Condition="'$(NoStdlib)'==''">false</NoStdlib>
+    <NoStdLib Condition="'$(Language)'=='C#'">true</NoStdLib>
+    <Stdlib>$(KERNEL_IL_DIR)\kernel.exe</Stdlib>
+    <CompilerPlatformVersion>cli1</CompilerPlatformVersion>
+    <CompilerPlatformDir>$(KERNEL_IL_DIR)</CompilerPlatformDir>
+    <DisableNullParameterValidation Condition="'$(DisableNullParameterValidation)'==''">true</DisableNullParameterValidation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- These are passed to Bartok, but not to SGC/CSC. -->
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Kernel\Kernel.Corlib.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+
+    <ProjectReference Condition="'$(Language)'=='C#'" Include="$(SINGULARITY_ROOT)\Kernel\Kernel.Corlib.csproj"/>
+  </ItemGroup>
+
+
+  <ItemGroup Condition="'$(NoStandardLibraries)'!='true'">
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\System.Compiler.Runtime\System.Compiler.Runtime.Kernel.csproj"/>
+
+    <!--
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Kernel\Corlibsg.csproj"/>
+    -->
+
+    <!-- SGC implicitly adds a reference to the Sing# runtime. -->
+    <DependentProject Include="$(SINGULARITY_ROOT)\Kernel\SingSharp.Runtime\Microsoft.SingSharp.Runtime.Kernel.csproj"/>
+
+    <!--
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Kernel\ILHelpers.csproj">
+      <ExcludeFromILReferences>true</ExcludeFromILReferences>
+    </ProjectReference>
+    -->
+
+    <!-- These are passed to SGC/CSC, but not to Bartok. -->
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Interfaces\Singularity.V1\Singularity.V1.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+    
+    <ProjectReference Condition="'$(Language)'=='Sing#'" Include="$(SINGULARITY_ROOT)\Kernel\SpecSharp.Contracts\Kernel.Contracts.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+
+    <!--
+        <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Contracts\Directory.Contracts\Directory.Contracts.csproj"/>
+        <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Contracts\Io.Contracts\Io.Contracts.csproj"/>
+        -->
+
+
+    <!--
+        <ProjectReference Include="$(APPSDIR)\Directory.Contracts.dll"/>
+        <ProjectReference Include="$(APPSDIR)\Io.Contracts.dll"/>
+        -->
+
+  </ItemGroup>
+
+  
+  <Import Project="SingSharp.targets"/>
+  
+</Project>
diff --git a/base/Targets/LibraryGroup.targets b/base/Targets/LibraryGroup.targets
new file mode 100644
index 0000000..ceeb54b
--- /dev/null
+++ b/base/Targets/LibraryGroup.targets
@@ -0,0 +1,36 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+You can use this file to create "library group" projects.  Library groups are
+collections of libraries that are usually used together, or are done so often
+enough that grouping them makes sense.  This does not prevent projects from
+referring directly to specific assemblies; it only simplifies adding references
+to groups of libraries.
+
+To create a "library group" project, define ProjectReference items, then import
+this LibraryGroup.targets file.  To add a reference to a library group, just
+add a ProjectReference to the library group project, as though it were just a
+single library.
+
+It is suggested that library group projects use the .proj extension, since it
+is never useful to edit them using the Visual Studio IDE as projects.
+
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+
+  <Target Name="BuildLibraries">
+    <MSBuild Projects="@(ProjectReference)">
+      <Output TaskParameter="TargetOutputs" ItemName="__built_projects"/>
+    </MSBuild>
+  </Target>
+
+  <Target Name="Build"
+          Outputs="@(__built_projects)"
+          DependsOnTargets="BuildLibraries"
+          >
+  </Target>
+
+</Project>
diff --git a/base/Targets/Paths.targets b/base/Targets/Paths.targets
new file mode 100644
index 0000000..7bbbb94
--- /dev/null
+++ b/base/Targets/Paths.targets
@@ -0,0 +1,385 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Makefile.inc
+#
+#   Note:
+#
+#   This top-level file is included by all Makefile's in the project and
+#   contains all configurable options.  All options are overrideable
+#   through environment variables.
+#
+#   Configuration Options
+#       BARTOK     - Specify a particular bartok compiler
+#       Configuration  - Specify build type (Debug|Release)
+#       COLLECTOR_KERNEL  - Specify garbage collector for kernel
+#                              (Concurrent|MarkSweep|Semispace)
+#       COLLECTOR_APP     - Specify garbage collector for applications
+#                              (Concurrent|MarkSweep|Semispace)
+#       Platform   - Specify host platform (LegacyPC|ApicPC|ApicMP)
+#       SCHEDULER  - Specify scheduler type (Affinity|Rialto|Min|Robin|Laxity)
+#       OBJROOT    - Specify directory in which to place objects (optional)
+#       PAGING     - Specify page translation (On|Off)
+#
+#   Resulting NMAKE macros passed to Makefiles
+#       OBJRELDIR  - relative path of full qualify object directory
+#       OBJKRNDIR  - relative path of full qualify object directory for kernel
+#       OBJDIR     - relative path of object directory from source directory
+#       CSFLAGS    - flags passed to c# compilers
+#       SGFLAGS    - flags passed to Sing# compilers
+#
+#       BASEDIR    - Root of Singularity source tree
+#       BOOTDIR    - Directory containing compiled boot assemblies.
+#       KERNDIR    - Directory containing compiled kernel assemblies.
+#       KABIDIR    - Directory containing compiled kernel ABI libraries.
+#       DISTDIR    - Directory containing compiled distribution files.
+#       DRIVDIR    - Directory containing compiled driver assemblies.
+#       ILLSDIR    - Directory containing compiled ILL assemblies.
+#       LIBSDIR    - Directory containing compiled library assemblies.
+#       APPSDIR    - Directory containing compiled application assemblies.
+#       SERVDIR    - Directory containing compiled service assemblies.
+#       WINSDIR    - Directory containing compiled Windows assemblies.
+#       OPTSDIR    - Directory containing the system options definitions.
+#       BUILDDIR   - Directory containing the build tools.
+#       WINBINDIR  - Directory containing checked in binaries for Windows.
+#       WINMIDORIDIR - Directory containing checked in Midori binaries for Windows.
+#
+##############################################################################
+
+This file is roughly equivalent to Makefile.inc.  It sets up lots of properties that allow apps to
+find frequently-used paths.
+
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- SINGULARITY_ROOT is required. -->
+
+  <!--
+  If you want to build Singularity projects from within VS IDE, you MUST run "setenv /vs".
+  If a build fails at this line, due to a missing Ide.targets, then either you have not
+  run "setenv /vs", or you have the relative path to Paths.targets incorrect in your project.
+  -->
+  <Import Condition="'$(BuildingInsideVisualStudio)'=='true'" Project="Ide.targets"/>
+
+  <Import Condition="'$(SINGULARITY_ROOT)'==''" Project="The_SINGULARITY_ROOT_property_is_not_defined!"/>
+
+  <PropertyGroup Condition="'$(SINGULARITY_ROOT)'==''">
+    <ERROR Condition="'$(BuildingInsideVisualStudio)'!='true'">The SINGULARITY_ROOT property is not set.  Make sure you have run setenv.cmd.</ERROR>
+    <ERROR Condition="'$(BuildingInsideVisualStudio)'=='true'">To build from within VS, please run 'setenv /vs'.  This creates the Ide.targets file, which the build system needs when building within VS.</ERROR>
+  </PropertyGroup>
+
+
+
+  <PropertyGroup>
+
+    <SINGULARITY_PATH>$(SystemRoot)\System32;$(SystemRoot);$(SINGULARITY_ROOT)\build;$(SINGULARITY_ROOT)</SINGULARITY_PATH>
+
+
+    <!--
+    If you build with MSBuild 2.0, you get serial builds.
+    If you build with MSBuild 3.5 (part of Orcas cycle), you can enable parallel builds
+    by passing "/m:NN /tv:3.5" to MSBuild.
+    -->
+    <BuildInParallel Condition="'$(MSBuildToolsVersion)'==''">false</BuildInParallel>
+    <BuildInParallel Condition="'$(BuildInParallel)'=='' and '$(MSBuildToolsVersion)' == '3.5'">true</BuildInParallel>
+    <BuildInParallel Condition="'$(BuildInParallel)'==''">false</BuildInParallel>
+
+    <!-- Absolute paths into source tree -->
+    <BASEDIR>$(SINGULARITY_ROOT)</BASEDIR>
+    <BUILDDIR>$(BASEDIR)\Build</BUILDDIR>
+    <OPTSDIR>$(BASEDIR)\Options</OPTSDIR>
+    <WINBINDIR>$(BASEDIR)\Windows\Bin</WINBINDIR>
+    <WINMIDORIDIR>$(BASEDIR)\Windows\Midori</WINMIDORIDIR>
+  </PropertyGroup>
+
+
+
+  <PropertyGroup>
+    <DEFAULT_ASMP_SYSCALL_BUILDER>MpSyscallBuilder</DEFAULT_ASMP_SYSCALL_BUILDER>
+    <ASMP_SYSCALL_BUILDER Condition="'$(ASMP_SYSCALL_BUILDER)'==''">$(DEFAULT_ASMP_SYSCALL_BUILDER)</ASMP_SYSCALL_BUILDER>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <AFLAGS>$(AFLAGS) /nologo /Zi /Cp /DSINGULARITY=1</AFLAGS>
+    <CFLAGS>$(CFLAGS) /nologo /W3 /WX /Gy /Zi /O2 /Oy- /GS- /DSINGULARITY=1</CFLAGS>
+    <CPPFLAGS>$(CFLAGS)</CPPFLAGS>
+  </PropertyGroup>
+
+
+<!--  COLLECTOR_KERNEL|_APP = "AdaptiveCopying" | "Concurrent"* | "MarkSweep" | "Semispace" | "Sliding" -->
+  <PropertyGroup>
+    <DEFAULT_COLLECTOR_KERNEL>Concurrent</DEFAULT_COLLECTOR_KERNEL>
+    <DEFAULT_COLLECTOR_APP>MarkSweep</DEFAULT_COLLECTOR_APP>
+    <COLLECTOR_KERNEL Condition="'$(COLLECTOR_KERNEL)'==''">$(DEFAULT_COLLECTOR_KERNEL)</COLLECTOR_KERNEL>
+    <COLLECTOR_APP Condition="'$(COLLECTOR_APP)'==''">$(DEFAULT_COLLECTOR_APP)</COLLECTOR_APP>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(COLLECTOR_KERNEL)'=='AdaptiveCopying'"></When>
+    <When Condition="'$(COLLECTOR_KERNEL)'=='Concurrent'"></When>
+    <When Condition="'$(COLLECTOR_KERNEL)'=='MarkSweep'"></When>
+    <When Condition="'$(COLLECTOR_KERNEL)'=='Semispace'"></When>
+    <When Condition="'$(COLLECTOR_KERNEL)'=='Sliding'"></When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>COLLECTOR_KERNEL must either be unset, or set to one of "AdaptiveCopying" or "Concurrent" or "MarkSweep" or "Semispace" or "Sliding"</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+
+  <Choose>
+    <When Condition="'$(COLLECTOR_APP)'=='AdaptiveCopying'"></When>
+    <When Condition="'$(COLLECTOR_APP)'=='Concurrent'"></When>
+    <When Condition="'$(COLLECTOR_APP)'=='MarkSweep'"></When>
+    <When Condition="'$(COLLECTOR_APP)'=='Semispace'"></When>
+    <When Condition="'$(COLLECTOR_APP)'=='Sliding'"></When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>COLLECTOR_APP must either be unset, or set to one of "AdaptiveCopying" or "Concurrent" or "MarkSweep" or "Semispace" or "Sliding"</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+
+  <!-- Visual Studio looks for conditions on property groups, and parses them,
+       in order to build the list of configurations and platforms.  These empty
+       declarations allow VS to pick up the correct strings for Configuration
+       and Platform.
+  -->
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'"/>
+  <PropertyGroup Condition="'$(Configuration)'=='Prototype'"/>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'"/>
+  <PropertyGroup Condition="'$(Platform)'=='ApicPC'"/>
+  <PropertyGroup Condition="'$(Platform)'=='ApicMP'"/>
+
+  <PropertyGroup>
+    <Platform Condition="'$(Platform)'==''">ApicPC</Platform>
+    <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(Platform)'=='ApicPC'">
+      <PropertyGroup>
+        <MAX_CPU>1</MAX_CPU>
+        <MACHINE>x86</MACHINE>
+        <SINGULARITY_MP>false</SINGULARITY_MP>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(Platform)'=='ApicMP'">
+      <PropertyGroup>
+        <MAX_CPU Condition="'$(MAX_CPU)'==''">4</MAX_CPU>
+        <MACHINE>x86</MACHINE>
+        <SINGULARITY_MP>true</SINGULARITY_MP>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(Platform)'=='LegacyPC'">
+      <PropertyGroup>
+        <MAX_CPU>1</MAX_CPU>
+        <MACHINE>x86</MACHINE>
+        <SINGULARITY_MP>false</SINGULARITY_MP>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>Platform must either be unset, or set to one of "LegacyPC" or "ApicPC" or "ApicMP". '$(Platform)' is invalid.</ERROR>
+        </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <Choose>
+    <When Condition="'$(Machine)'=='x86'">
+      <PropertyGroup>
+        <DEFAULT_CC>$(BUILDDIR)\cl.exe</DEFAULT_CC>
+        <DEFAULT_AS>$(BUILDDIR)\ml.exe</DEFAULT_AS>
+        <DEFAULT_BARTOK>$(BUILDDIR)\bartok.exe</DEFAULT_BARTOK>
+        <BARTOK_DIR>$(BUILDDIR)</BARTOK_DIR>
+        <TARGET_PROCESSOR_BYTEORDER>LITTLE_ENDIAN</TARGET_PROCESSOR_BYTEORDER>
+        <SING_DEF_FILE>Singularity.V1.def</SING_DEF_FILE>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+  <PropertyGroup>
+    <!-- # Workaround for bug in Bartok drop @5063 -->
+    <BARTOK_FLAGS>$(BARTOK_FLAGS) /IrPeepholeNull=false</BARTOK_FLAGS>
+
+  </PropertyGroup>
+
+<!-- Handle SCHEDULER -->
+
+<!-- SCHEDULER = "Affinity" | "Rialto"* | "Robin" | "Laxity" | "Min" -->
+
+  <PropertyGroup>
+    <DEFAULT_SCHEDULER>Min</DEFAULT_SCHEDULER>
+    <SCHEDULER Condition="'$(SCHEDULER)'==''">$(DEFAULT_SCHEDULER)</SCHEDULER>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(SCHEDULER)'=='Affinity'">
+      <PropertyGroup>
+        <CSFLAGS>$(CSFLAGS) /D:AFFINITY_SCHEDULER</CSFLAGS>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(SCHEDULER)'=='Rialto'"></When>
+    <When Condition="'$(SCHEDULER)'=='Robin'"></When>
+    <When Condition="'$(SCHEDULER)'=='Laxity'"></When>
+    <When Condition="'$(SCHEDULER)'=='Min'"></When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>SCHEDULER must either be unset, or set to one of "Affinity", "Rialto", "Robin", "Laxity", or "Min".</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+
+  <PropertyGroup>
+    <DEFAULT_PAGING_FLAG></DEFAULT_PAGING_FLAG>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <LINKFLAGS>$(LINKFLAGS) /NOLOGO /INCREMENTAL:NO /machine:$(Machine) /debug /debugtype:cv</LINKFLAGS>
+  </PropertyGroup>
+
+
+
+
+
+  <!-- #### THREAD_TIME_ACCOUNTING = 1 -->
+  <PropertyGroup Condition="'$(THREAD_TIME_ACCOUNTING)'!=''">
+    <AFLAGS>$(AFLAGS) /DTHREAD_TIME_ACCOUNTING=1</AFLAGS>
+    <CFLAGS>$(CFLAGS) /DTHREAD_TIME_ACCOUNTING=1</CFLAGS>
+    <CPPFLAGS>$(CPPFLAGS) /DTHREAD_TIME_ACCOUNTING=1</CPPFLAGS>
+    <CSFLAGS>$(CSFLAGS) /d:THREAD_TIME_ACCOUNTING</CSFLAGS>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(SAMPLE_PC)'!=''">
+    <CSFLAGS>$(CSFLAGS) /d:SAMPLE_PC</CSFLAGS>
+    <SGFLAGS>$(SGFLAGS) /d:SAMPLE_PC</SGFLAGS>
+  </PropertyGroup>
+
+
+  <Choose>
+    <When Condition="'$(PAGING)'=='On'">
+      <PropertyGroup>
+        <PAGING_FLAG>.Paging</PAGING_FLAG>
+        <AFLAGS>$(AFLAGS) /DPAGING=1</AFLAGS>
+        <CFLAGS>$(CFLAGS) /DPAGING</CFLAGS>
+        <CPPFLAGS>$(CPPFLAGS) /DPAGING</CPPFLAGS>
+        <CSFLAGS>$(CSFLAGS) /d:PAGING</CSFLAGS>
+        <SGFLAGS>$(SGFLAGS) /d:PAGING</SGFLAGS>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <PAGING_FLAG></PAGING_FLAG>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+
+
+<!--
+  ###############################################################################
+  # Directories for publishing and retrieving compiled assemblies.
+-->
+  <PropertyGroup Condition="'$(SINGULARITY_ROOT)'!=''">
+    <!-- SINGULARITY_OUTPUT is intended to be imported from the user's environment. -->
+    <SINGULARITY_OBJROOT Condition="'$(SINGULARITY_OBJROOT)'==''">$(SINGULARITY_ROOT).obj</SINGULARITY_OBJROOT>
+    <OBJROOT>$(SINGULARITY_OBJROOT)</OBJROOT>
+
+
+    <!-- Object dir name pieces -->
+    <OBJKRNDIR>$(Configuration).$(MACHINE).$(PLATFORM).$(SCHEDULER).$(COLLECTOR_KERNEL)$(PAGING_FLAG)</OBJKRNDIR>
+    <OBJRELRUNTIMEDIR>$(Configuration).$(MACHINE).$(COLLECTOR_APP)$(PAGING_FLAG)</OBJRELRUNTIMEDIR>
+    <OBJRELDIR>$(Configuration).$(MACHINE).$(COLLECTOR_APP)$(PAGING_FLAG)</OBJRELDIR>
+    <OBJMACHINERELDIR>$(Configuration).$(MACHINE)$(PAGING_FLAG)</OBJMACHINERELDIR>
+    <OBJOPT>$(Configuration).$(COLLECTOR_APP)</OBJOPT>
+
+
+    <!--
+    Absolute paths into object tree.
+    Note that some of these paths have different sensitivities to different build properties.
+    -->
+    <BOOTDIR>$(SINGULARITY_OBJROOT)\Boot\$(Configuration).$(Machine)</BOOTDIR>
+    <DRIVDIR>$(SINGULARITY_OBJROOT)\Drivers\$(OBJRELDIR)</DRIVDIR>
+    <LIBSDIR>$(SINGULARITY_OBJROOT)\Libraries\$(OBJRELDIR)</LIBSDIR>
+    <APPSDIR>$(SINGULARITY_OBJROOT)\Apps\$(OBJRELDIR)</APPSDIR>
+    <KERNEL_IL_DIR>$(SINGULARITY_OBJROOT)\Kernel\$(OBJKRNDIR).msil</KERNEL_IL_DIR>
+    <KERNEL_NATIVE_DIR>$(SINGULARITY_OBJROOT)\Kernel\$(OBJKRNDIR).native</KERNEL_NATIVE_DIR>
+
+    <!--
+    All interface assemblies are platform-neutral and configuration-neutral.  So their object
+    directory does not vary over any build variables; there is only one interface output
+    directory.
+    -->
+    <ILLSDIR>$(SINGULARITY_OBJROOT)\Interfaces</ILLSDIR>
+
+    <APPRUNTIMEDIR>$(SINGULARITY_OBJROOT)\AppRuntime\$(OBJRELDIR)</APPRUNTIMEDIR>
+    <APPRUNTIMEDIR>$(SINGULARITY_OBJROOT)\AppRuntime\$(OBJRELDIR)</APPRUNTIMEDIR>
+    <APPRUNTIMENATIVEDIR>$(SINGULARITY_OBJROOT)\AppRuntimeNative\$(OBJRELDIR)</APPRUNTIMENATIVEDIR>
+
+    <WINSDIR Condition="false">$(SINGULARITY_OBJROOT)\Windows\obj\$(OBJRELDIR)</WINSDIR>
+    <WINSDIR>$(BASEDIR)\Windows\obj\$(OBJRELDIR)</WINSDIR>
+
+    <!-- OUTPUT_ROOT is the root of all of the files that are built by the Singularity projects. -->
+    <OUTPUT_ROOT>$(SINGULARITY_OUTPUT)\$(Configuration).$(MACHINE).$(Platform)</OUTPUT_ROOT>
+
+    <!-- Paths for distribution outputs -->
+    <DISTRO_LIB_DIR>$(SINGULARITY_OBJROOT)\nib.libcache\$(OBJRELRUNTIMEDIR)</DISTRO_LIB_DIR>
+    <DISTRO_TEMP_DIR>$(SINGULARITY_OBJROOT)\AppNativeObj\$(OBJRELRUNTIMEDIR)</DISTRO_TEMP_DIR>
+    <APPS_NATIVE_IMAGE_DIR>$(SINGULARITY_OBJROOT)\AppNativeImage\$(OBJRELRUNTIMEDIR)</APPS_NATIVE_IMAGE_DIR>
+    <DISTRO_CACHE_DIR>$(SINGULARITY_OBJROOT)</DISTRO_CACHE_DIR>
+
+    <!-- Paths for kernel / ABI -->
+    <KernelAbiLibPath>$(APPRUNTIMEDIR)\Singularity.V1.lib</KernelAbiLibPath>
+
+
+  </PropertyGroup>
+
+
+  <!-- Set properties for the build tools.  You can override any of these. -->
+  <PropertyGroup>
+    <CSC Condition="'$(CSC)'==''">$(BUILDDIR)\csc.exe</CSC>
+    <SGC Condition="'$(SGC)'==''">$(BUILDDIR)\sgc.exe</SGC>
+    <CC Condition="'$(CC)'==''">$(DEFAULT_CC)</CC>
+    <AS Condition="'$(AS)'==''">$(DEFAULT_AS)</AS>
+    <ILASM Condition="'$(ILASM)'==''">$(BUILDDIR)\ilasm.exe</ILASM>
+    <ILDASM Condition="'$(ILDASM)'==''">$(BUILDDIR)\ildasm.exe</ILDASM>
+    <LIB>$(BUILDDIR)\lib.exe</LIB>
+    <LINK Condition="'$(LINK)'==''">$(BUILDDIR)\link.exe</LINK>
+    <NIB Condition="'$(NIB)'==''">$(BUILDDIR)\nib.exe</NIB>
+    <BARTOK Condition="'$(BARTOK)'==''">$(DEFAULT_BARTOK)</BARTOK>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- <PATH>$(SystemRoot)\system32;$(SystemRoot);$(BUILDDIR)</PATH> -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Precompiled assembly locations -->
+    <PRECOMPILED_NVIDIA_DIR>$(BUILDDIR)\NVidia</PRECOMPILED_NVIDIA_DIR>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- This makes sure that Singularity.targets doesn't import this .targets file if it already has been included. -->
+    <SingularityPathsIncluded>true</SingularityPathsIncluded>
+  </PropertyGroup>
+
+  <Target Name="CheckProject">
+    <Exec Command="chkproj $(MSBuildProjectFullPath)"/>
+  </Target>
+
+</Project>
+
diff --git a/base/Targets/ServiceCategory.targets b/base/Targets/ServiceCategory.targets
new file mode 100644
index 0000000..2b57e64
--- /dev/null
+++ b/base/Targets/ServiceCategory.targets
@@ -0,0 +1,19 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Service executables should import this file.
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Services\Transforms\ServiceTransform.csproj">
+      <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="App.targets"/>
+  
+</Project>
diff --git a/base/Targets/SingSharp.targets b/base/Targets/SingSharp.targets
new file mode 100644
index 0000000..27975e7
--- /dev/null
+++ b/base/Targets/SingSharp.targets
@@ -0,0 +1,633 @@
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+
+<!--
+
+This targets file allows MSBuild projects to invoke the Sing# compiler.
+It can also be configured to run the C# compiler, with nearly the same 
+arguments.  This targets file also handles building dependent projects,
+as well.
+
+Most projects should not directly import this file.  Instead, they should
+import a .targets file that sets up the correct environment for the project.
+For example, App.targets is appropriate for most apps and app-mode libraries,
+while KernelLibrary.targets is appropriate for assemblies that are linked
+into the kernel.
+
+Projects that use this .targets files can define any of the following properties.
+Where possible, this file uses the same properties that the VS2005 C# project
+designer uses.  (For example, AssemblyName, AllowUnsafeBlocks, etc.)  Not all
+of the VS2005 properties are supported, and this .targets file also makes use
+of properties that are not supported (or meaningful) for VS2005.
+
+  * OutputType - "Exe" or "Library".  REQUIRED.  "WinExe" is not supported.
+  
+  * AssemblyName - The name of the assembly, without an extension, e.g. "ipconfig".
+    REQUIRED.
+    
+  * AssumeFieldsNonNull - Specifies whether the compiler should assume that all fields
+    are non-null.  The default value is "true".
+    
+  * NoStdLib - If set to "true", specifies that the current assembly does not reference
+    the standard library.  See also the Stdlib property.
+    
+  * Stdlib - Specifies the path of the standard library.  For processes, this is usually
+    $(APPRUNTIMEDIR)\Corlib.dll.  For kernel libraries, this is usually $(KERNDIR)\Kernel.exe.
+    Note that projects should usually not set this property directly; instead, they should
+    import the App.targets or KernelLibrary.targets files.
+    
+  * CompilerPlatformVersion - The CLI version to use.  This is usually "cli1".
+  
+  * CompilerPlatformDir - The directory that contains the standard platform libraries,
+    such as Microsoft.SingSharp.Runtime.dll.
+    
+  * DefineConstants - The list of #define constants to define.  This list should be
+    separated by semi-colons (';'), should not contain any spaces, and should not contain
+    any repeated semi-colons (';;').
+    
+  * ProjectGuid - Uniquely identifies this project.  OPTIONAL
+  
+  * ShadowAssemblyPath - Causes the /shadow:<filename> parameter to be added.
+  
+  * NoNullCheck - If set to 'true', disables all null checking.
+
+  * Precompiled - If set to 'true', the Compile item list is ignored, and instead
+    of running the compiler a precompiled assembly is copied from the PrecompiledPath
+    location. This is useful for shipping certain IP-sensitive components as MSIL only.
+
+  * PrecompiledPath - If Precompiled is 'true', the path where the precompiled assembly
+    can be found. The name should be the same as the name of the assembly that would
+    be built if Precompiled were not true. Defaults to the project file's directory.
+
+Projects that use this .targets file can define the following items:
+
+  * Compile - The names of source files (usually .cs or .sg) to compile.
+  
+  * ProjectReference - The path of an MSBuild project.  This .targets file
+      will automatically build the referenced project, and will then add
+      a reference to the output of that project to the input of the current
+      project.
+      
+  * Reference - The path of an MSIL file, which the current assembly will
+      reference.  This allows you to declare a reference, but the reference
+      will NOT be tracked by the inter-project dependency checker.  In other
+      words, it's up to you to make sure that the referenced assembly exists,
+      and is up to date, when you use "Reference" items.
+  
+  * DependentProject - The path of an MSBuild project.  This .targets file
+      will automatically build the referenced project, but will not add a
+      reference to its output.  This is useful for projects where you have
+      more knowledge about dependencies than MSBuild does, or you are doing
+      something fancy.
+
+
+Targets
+=======
+
+Projects that use this .targets file can define the following targets.
+All targets should be defined AFTER importing this file.
+
+  * AfterBuild - Invoked as the last dependency of the "Build" target.
+  * BeforeBuild - Invoked as the first dependency of the "Build" target.
+
+
+-->
+
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Provide default values for properties. -->
+  <!-- Build the CompilerFlags property. -->
+  <!-- Validate compiler parameters and build the CompilerFlags property. -->
+  <PropertyGroup>
+    <CompilerFlags>/nologo</CompilerFlags>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <UseResponseFile Condition="'$(UseResponseFile)'==''">false</UseResponseFile>
+    <Language Condition="'$(Language)'==''">Sing#</Language>
+
+    <WarningLevel Condition="'$(WarningLevel)'==''">2</WarningLevel>
+    <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)'==''">true</TreatWarningsAsErrors>
+    <AllowUnsafeBlocks Condition="'$(AllowUnsafeBlocks)'==''">false</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow Condition="'$(CheckForOverflowUnderflow)'==''">false</CheckForOverflowUnderflow>
+    <NoStdlib Condition="'$(NoStdlib)'==''">false</NoStdlib>
+    <DisableNullParameterValidation Condition="'$(DisableNullParameterValidation)'==''">true</DisableNullParameterValidation>
+
+    <!-- Until we go through everything and make it clean again. -->
+    <AssumeFieldsNonNull Condition="'$(AssumeFieldsNonNull)'==''">false</AssumeFieldsNonNull>
+
+    <OutputPath Condition="'$(OutputPath)'=='' and '$(OBJDIR)'!=''">$(OBJDIR)</OutputPath>
+
+    <CompilerPlatformVersion Condition="'$(CompilerPlatformVersion)'==''">cli1</CompilerPlatformVersion>
+    <EnableDocumentationFile Condition="'$(EnableDocumentationFile)'==''">true</EnableDocumentationFile>
+    <MKASM Condition="'$(MKASM)'==''">$(BUILDDIR)\mkasm.exe</MKASM>
+    <ShowFullPaths Condition="'$(ShowFullPaths)'=='' and '$(BuildingInsideVisualStudio)'=='true'">true</ShowFullPaths>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <PrecompiledPath Condition="'$(Precompiled)'=='true' and '$(PrecompiledPath)'==''">$(MSBuildProjectDirectory)</PrecompiledPath>
+    <AssemblyExt Condition="'$(AssemblyExt)'=='' and '$(OutputType)'=='Exe'">.exe</AssemblyExt>
+    <AssemblyExt Condition="'$(AssemblyExt)'=='' and '$(OutputType)'=='Library'">.dll</AssemblyExt>
+    <AssemblyFileName>$(AssemblyName)$(AssemblyExt)</AssemblyFileName>
+    <OutputAssemblyPath>$(OutputPath)\$(AssemblyFileName)</OutputAssemblyPath>
+    <OutputAssemblySymbolPath>$(OutputPath)\$(AssemblyName).pdb</OutputAssemblySymbolPath>
+    <PrecompiledAssemblyPath Condition="'$(Precompiled)'=='true'">$(PrecompiledPath)\$(AssemblyFileName)</PrecompiledAssemblyPath>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <CompilerFlags>$(CompilerFlags) /out:$(OutputAssemblyPath) /debug /noconfig</CompilerFlags>
+    <CompilerFlags Condition="'$(OutputType)'=='Library'">$(CompilerFlags) /t:library</CompilerFlags>
+    <CompilerFlags Condition="'$(OutputType)'=='Exe'">$(CompilerFlags) /t:exe</CompilerFlags>
+    <CompilerFlags Condition="'$(DefineConstants)'!=''">$(CompilerFlags) /d:$(DefineConstants)</CompilerFlags>
+    <CompilerFlags Condition="'$(WarningLevel)'!=''">$(CompilerFlags) /warn:$(WarningLevel)</CompilerFlags>
+    <CompilerFlags Condition="'$(TreatWarningsAsErrors)'=='true'">$(CompilerFlags) /warnaserror+</CompilerFlags>
+    <CompilerFlags Condition="'$(NoWarn)'!=''">$(CompilerFlags) /nowarn:$(NoWarn)</CompilerFlags>
+    <CompilerFlags Condition="'$(CheckForOverflowUnderflow)'=='true'">$(CompilerFlags) /checked</CompilerFlags>
+    <CompilerFlags Condition="'$(AllowUnsafeBlocks)'=='true'">$(CompilerFlags) /unsafe</CompilerFlags>
+  </PropertyGroup>
+
+
+  
+  <!-- Handle Configuration, which can be "Debug", "Release", or "Prototype". -->
+  <Choose>
+    <When Condition="'$(Configuration)'=='Debug'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /d:DEBUG;TRACING;WAYPOINTS;MONITORING;CHANNEL_COUNT</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)'=='Release'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /d:CHANNEL_COUNT</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)'=='Prototype'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /d:DEBUG;TRACING;WAYPOINTS;MONITORING;CHANNEL_COUNT</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>'Configuration' must either be unset, or set to one of "Debug", "Release", or "Prototype"; "$(Configuration)" is not valid.</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+
+  <Choose>
+    <When Condition="'$(Language)'=='Sing#'">
+      <PropertyGroup>
+        <CompilerTool>$(SGC)</CompilerTool>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Language)'=='C#'">
+      <PropertyGroup>
+        <CompilerTool>$(CSC)</CompilerTool>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+
+  <Choose>
+    <When Condition="'$(Machine)'=='x86'">
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /d:X86;LITTLE_ENDIAN;PTR_SIZE_32</CompilerFlags>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <ERROR>The value '$(Machine)' is not a recognized value for the 'Machine' property.</ERROR>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <Choose>
+    <When Condition="'$(Language)'=='Sing#'">
+      <!-- Build CompilerFlags values that are relevant only to Sing#. -->
+      <PropertyGroup>
+        <CompilerFlags Condition="'$(AssumeFieldsNonNull)'=='true'">$(CompilerFlags) /assumefieldsnonnull</CompilerFlags>
+        <CompilerFlags>$(CompilerFlags) /platform:$(CompilerPlatformVersion),$(CompilerPlatformDir)</CompilerFlags>
+        <CompilerFlags Condition="'$(ShadowAssemblyPath)'!=''">$(CompilerFlags) /shadow:$(ShadowAssemblyPath)</CompilerFlags>
+        <CompilerFlags Condition="'$(DisableNullParameterValidation)'=='true'">$(CompilerFlags) /disable:nullparametervalidation</CompilerFlags>
+        <CompilerFlags Condition="'$(NoNullCheck)'=='true'">$(CompilerFlags) /d:NONULLCHECK</CompilerFlags>
+      </PropertyGroup>
+
+      <!-- Handle stdlib. -->
+      <PropertyGroup>
+        <CompilerFlags Condition="'$(NoStdLib)'=='true'">$(CompilerFlags) /nostdlib</CompilerFlags>
+        <CompilerFlags Condition="'$(Stdlib)'!=''">$(CompilerFlags) /stdlib:$(Stdlib)</CompilerFlags>
+      </PropertyGroup>
+
+
+    </When>
+
+    <When Condition="'$(Language)'=='C#'">
+      <!-- Build CompilerFlags values that are relevant only to C# -->
+      <!-- Handle stdlib. We always pass /nostdlib to the C# compiler. -->
+      <PropertyGroup>
+        <CompilerFlags>$(CompilerFlags) /nostdlib</CompilerFlags>
+        <CompilerFlags Condition="'$(NoStdlib)'!='true'">$(CompilerFlags) /r:$(Stdlib)</CompilerFlags>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+
+  <PropertyGroup>
+    <CompilerFlags>$(CompilerFlags) /d:SINGULARITY</CompilerFlags>
+    <CompilerFlags Condition="'$(SINGULARITY_MP)'=='true'">$(CompilerFlags) /d:SINGULARITY_MP</CompilerFlags>
+    <CompilerFlags Condition="'EnableWaypoints'!='false'">$(CompilerFlags) /d:WAYPOINTS</CompilerFlags>
+    <CompilerFlags Condition="'EnableMonitoring'!='false'">$(CompilerFlags) /d:MONITORING</CompilerFlags>
+    <CompilerFlags>$(CompilerFlags) /D:MAX_CPU$(MAX_CPU)</CompilerFlags>
+    <CompilerFlags Condition="'$(ShowFullPaths)'=='true'">$(CompilerFlags) /fullpaths</CompilerFlags>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(EnableDocumentationFile)'=='true'">
+      <PropertyGroup>
+        <_DocumentationFile>$(OutputPath)\$(AssemblyName).xml</_DocumentationFile>
+        <CompilerFlags>$(CompilerFlags) /doc:$(_DocumentationFile)</CompilerFlags>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToClean Include="$(_DocumentationFile)"/>
+      </ItemGroup>
+    </When>
+  </Choose>
+
+
+  <PropertyGroup>
+    <ResponseFileName>$(OutputPath)\$(AssemblyName).rsp</ResponseFileName>
+  </PropertyGroup>
+
+  
+  <PropertyGroup>
+    <CompilerFlags Condition="'$(Paging)'=='On'">$(CompilerFlags) /d:PAGING</CompilerFlags>
+    
+    <CompilerFlags>$(CompilerFlags) $(ExtraCompilerFlags)</CompilerFlags>
+  </PropertyGroup>
+
+
+
+  <PropertyGroup Condition="'$(DebugSgc)'=='true'">
+    <CompilerTool>start /wait cordbg.exe $(CompilerTool)</CompilerTool>
+  </PropertyGroup>
+  
+  <!-- ###################################### TARGETS ############################ -->
+
+  <Target Name="ShowDebugInfo" DependsOnTargets="CheckProperties;BuildILReferences;BuildDependentProjects">
+    <Message Text="Assembly - $(AssemblyFileName)"/>
+    <Message Text="    Output path:                 $(OutputAssemblyPath)"/>
+    <Message Text="    Reference:                   %(Reference.Identity)"/>
+    <Message Text="    __il_refs:                   %(__il_refs.identity)"/>
+    <Message Text="    Stdlib:                      $(Stdlib)" Condition="'$(NoStdlib)'!='true'"/>
+    <Message Text="    NoStdlib:                    $(NoStdlib)" Condition="'$(NoStdlib)'=='true'"/>
+    <Message Text="    CompilerPlatform:            $(CompilerPlatformVersion),$(CompilerPlatformDir)"/>
+    <Message Text="    Defines:                     $(DefineConstants)"/>
+    <Message Text="    Warnings:                    level $(WarningLevel) as_error=$(TreatWarningsAsErrors)"/>
+    <Message Text="__il_projects: %(__il_projects.identity)"/>
+    <Message Text="__il_refs: %(__il_refs.identity)"/>
+    <Message Text="__built_projects: %(__built_projects.Identity) exc_il='%(__built_projects.ExcludeFromILReferences)' exc_native='%(__built_projects.ExcludeFromNativeReferences)'"/>
+    <Message Text="__native_projects: %(__native_projects.identity)"/>
+    <Message Text="__native_refs: %(__native_refs.identity)"/>
+  </Target>
+
+  <Target Name="Build"
+          DependsOnTargets="$(BuildDependsOn);
+          BeforeBuild;
+          CheckProperties;
+          BuildAssembly;
+          BuildContractMap;
+          AfterBuild;
+          "          
+          Outputs="$(OutputAssemblyPath)"
+          >
+  </Target>
+
+  <Target Name="BeforeBuild"/>
+  <Target Name="AfterBuild"/>
+
+  <!--
+  This target allows other projects to determine the full path of the output assembly of this project,
+  without actually building the project.
+  -->
+  <Target Name="GetOutputAssemblyPath" Outputs="$(OutputAssemblyPath)"/>
+  
+  
+  <Target Name="CheckProperties">
+    <Error Condition="'$(AssemblyName)'==''" Text="The 'AssemblyName' property is required."/>
+    <Error Condition="'$(ERROR)'!=''" Text="$(ERROR)"/>
+    <Error Condition="'$(OutputType)'==''" Text="The 'OutputType' property must be set, to either 'Exe' or 'Library'."/>
+    <Error Condition="'$(OutputType)'!='Exe' and '$(OutputType)'!='Library'" Text="The 'OutputType' property is invalid; '$(OutputType)' is not a supported output type."/>
+    <Error Condition="'$(OutputPath)'==''" Text="The 'OutputPath' property is required, but is not set."/>
+    <Error Condition="'$(NoStdlib)'!='false' and '$(NoStdLib)'!='true'" Text="The 'NoStdLib' property is set to an invalid value; '$(NoStdLib)' is not valid."/>
+    <Error Condition="'$(NoStdLib)'=='false' and '$(Stdlib)'==''" Text="When the 'NoStdLib' property is set to 'true', the 'Stdlib' property is required, but it is not set."/>
+    <Error Condition="'$(AllowUnsafeBlocks)'!='true' and '$(AllowUnsafeBlocks)'!='false'" Text="The value '$(AllowUnsafeBlocks)' is not a valid choice for the 'AllowUnsafeBlocks' property."/>
+    <Error Condition="'$(CheckForOverflowUnderflow)'!='true' and '$(CheckForOverflowUnderflow)'!='false'" Text="The value '$(CheckForOverflowUnderflow)' is not a valid choice for the 'CheckForOverflowUnderflow' property."/>
+    <Error Condition="'$(Language)'=='Sing#' and '$(CompilerPlatformDir)'==''" Text="When using the Sing# language, the 'CompilerPlatformDir' is required, but is not set."/>
+    <Error Condition="'$(Language)'!='C#' and '$(Language)'!='Sing#'" Text="'The value '$(Language)' is not a supported value for the 'Language' property.  Only 'C#' and 'Sing#' are supported."/>
+  </Target>
+
+  <Target Name="BuildAssembly"
+          DependsOnTargets="
+            CheckProperties;
+            BuildDependentProjects;
+            BuildILReferences;
+            BuildBinaryResources;
+            BuildLanguageFiles;
+            CreateStrongName;
+            "
+          Inputs="@(Compile);@(Reference);@(__il_refs);$(MSBuildProjectFullPath)"
+          Outputs="$(OutputAssemblyPath);$(OutputAssemblySymbolPath);$(_DocumentationFile)"
+          >
+
+    <Message Text="Compiling - $(AssemblyName)$(AssemblyExt)"/>
+
+    <MakeDir Directories="$(OutputPath)"/>
+
+    <!-- This is to catch programs that modify binaries after they are built. -->
+    <Exec Condition="'$(ReadOnlyHack)'=='true'" Command="attrib -r $(OutputAssemblyPath)"/>
+
+    <Delete Files="$(OutputAssemblyPath);$(OutputAssemblySymbolPath)"/>
+
+    <Message Condition="'$(UseResponseFile)'=='true'" Text="Writing response file - $(ResponseFileName)"/>
+    <WriteLinesToFile Condition="'$(UseResponseFile)'=='true'"
+                      File="$(ResponseFileName)"
+                      Overwrite="true"
+                      Lines="
+                      @(ReferencePath->'/lib:%(Identity)');
+                      @(Reference->'/r:%(Identity)');
+                      @(__il_refs->'/r:%(identity)');
+                      @(Compile);
+                      "/>
+    <Exec Condition="'$(UseResponseFile)'=='true' and '$(Precompiled)'!='true'"
+          Command="$(CompilerTool) $(CompilerFlags) /debug @$(ResponseFileName)"/>
+
+    <Message Condition="'$(UseResponseFile)'!='true'" Text="Not using response file" Importance="low"/>
+    <Exec Condition="'$(UseResponseFile)'!='true' and '$(Precompiled)'!='true'"
+          Command="$(CompilerTool) $(CompilerFlags) /debug @(ReferencePath->'/lib:%(Identity)', ' ') @(Reference->'/r:%(Identity)',' ') @(__il_refs->'/r:%(identity)',' ') @(Compile,' ')"/>
+
+    <Message Condition="'$(Precompiled)'=='true'" Text="Copying precompiled binary to output tree - $(AssemblyName)$(AssemblyExt)"/>
+    <Copy Condition="'$(Precompiled)'=='true'"
+          SourceFiles="$(PrecompiledAssemblyPath);@(PrecompiledItem)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
+
+    <!-- This is to catch programs that modify binaries after they are built. -->
+    <Exec Condition="'$(ReadOnlyHack)'=='true'" Command="attrib +r $(OutputAssemblyPath)"/>
+  </Target>
+
+  <!--
+  This target builds all of the projects that the current project references.
+  This target also generates the assembly references for thos projects.
+  
+  There are two separate phases of compilation, for executable projects.
+  The first is compiling source code to IL.
+  The second is compiling native code from a set of IL assemblies.
+  
+  Some referenced assemblies are only part of the first phase, some are part
+  of the second phase, and some are part of both.  The makefiles distinguished
+  them by using the APP_DLLS, APP_ILLS, and SYS_DLLs.  This requires that each
+  project that references a DLL put the referenced DLL in the correct list.
+  
+  This .targets file handles this differently.  All referenced assemblies are
+  pulled in using "ProjectReference" items.  Each project can declare which
+  phases of compilation it should be involved in, using properties that it
+  sets before importing this .targets file.
+  
+  If an assembly sets the ExcludeFromNativeReferences property to 'true',
+  then that assembly will not be passed as a reference to Bartok.
+  
+  If an assembly sets the ExcludeFromILReferences property to 'true',
+  then that assembly will not be passed as a reference to CSC/SGC.
+  
+  This information is passed between projects as metadata on the output items
+  of the "Build" task.  This task looks for those items, and builds references
+  for the different phases appropriately.  The "Reference" item set is used for
+  IL references.  The "NativeReference" item set is used for native code
+  references (those passed to Bartok).
+  
+  -->
+
+  <Target Name="BuildILReferences" DependsOnTargets="CheckProperties">
+    <CreateItem Include="@(ProjectReference)">
+      <Output ItemName="__il_projects" TaskParameter="Include" Condition="'%(ProjectReference.ExcludeFromILReferences)'!='true'"/>
+    </CreateItem>
+
+    <MSBuild Projects="@(__il_projects)" Targets="Build" Condition="'$(BuildInParallel)'!='true'" StopOnFirstFailure="$(StopOnFirstFailure)">
+      <Output ItemName="__il_refs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+    <MSBuild Projects="@(__il_projects)" Targets="Build" Condition="'$(BuildInParallel)'=='true'" StopOnFirstFailure="$(StopOnFirstFailure)" BuildInParallel="true">
+      <Output ItemName="__il_refs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+  </Target>
+  
+
+  <Target Name="BuildNativeReferences" DependsOnTargets="CheckProperties">
+    <CreateItem Include="@(ProjectReference)">
+      <Output ItemName="__native_projects" TaskParameter="Include" Condition="'%(ProjectReference.ExcludeFromNativeReferences)'!='true'"/>
+    </CreateItem>
+
+    <MSBuild Projects="@(__native_projects)" Targets="Build" StopOnFirstFailure="$(StopOnFirstFailure)">
+      <Output ItemName="__native_refs" TaskParameter="TargetOutputs"/>
+    </MSBuild>
+  </Target>
+
+
+  <Target Name="BuildDependentProjects">
+    <!--
+    The DependentProject item set contains projects that the current assembly depends on,
+    but not in a way that is visible to this file.  The project usually knows the output
+    paths of the project.
+    -->
+    <MSBuild Projects="@(DependentProject)" StopOnFirstFailure="$(StopOnFirstFailure)"/>
+  </Target>
+
+
+  <PropertyGroup>
+    <BinaryResourceAssemblyPath>$(OutputPath)\$(AssemblyName).Resources.dll</BinaryResourceAssemblyPath>
+  </PropertyGroup>
+
+  <!--
+  This target processes BinaryResource items, if any.  It creates temporary source files 
+  (in the OutputPath dir), using mkasm.exe.  The generated source files are then compiled 
+  into a satellite assembly, named $(AssemblyName).Resources.dll, and that satellite 
+  assembly is added as a reference to the project assembly.
+  
+  We *could* just add these generated source files directly to the Compile item set, which 
+  would cause these files to be compiled directly into the current project's assembly.  
+  This works; however, the Sing# compiler is significantly slower when processing these 
+  files.  So instead, we create a resource assembly, using the C# compiler, and add that 
+  assembly as a reference to the current project.
+  
+  This is a batched target.  This entire target runs once for each group of BinaryResource
+  items that have the same combination of values for the metadata tags Namespace, ClassName,
+  FieldName, and Args.  This means that, if you declare more than one BinaryResource item
+  that has the same namespace and class name, then they will be compiled into the same file.
+
+  The following metadata fields are REQUIRED for all BinaryResource items:
+  
+    Namespace - Specifies the namespace of the class generated.
+    ClassName - Specifies the name of the class generated.
+    FieldName - Specifies the name of the field generated, whose contents are the binary resource.
+    
+  The following metadata fields are OPTIONAL:
+  
+    OutputAsArray - If set to 'true', then mkasm will generate a byte[][] field, rather than byte[].
+    Args - Passed directly to mkasm, without interpretation.
+
+  Example:
+  
+  <ItemGroup>
+    <BinaryResource Include="Resources\*.wav">
+      <ClassName>WavAudio</ClassName>
+      <Namespace>Microsoft.Singularity.Applications</Namespace>
+      <FieldName>AudioData></FieldName>
+      <OutputAsArray>true</OutputAsArray>
+    </BinaryResource>
+  </ItemGroup>
+  
+
+  -->
+  <Target Name="ConvertBinaryResourcesToSourceFiles"
+          Inputs="@(BinaryResource);$(MSBuildProjectFullPath)"
+          Outputs="$(OutputPath)\$(AssemblyName).Resource.%(BinaryResource.Namespace).%(BinaryResource.ClassName).%(BinaryResource.FieldName).cs"
+          >
+    <MakeDir Directories="$(OutputPath)"/>
+    
+    
+    <!--
+    Ok, this is ugly, but I can't see a prettier way to do this.  We want to allow projects
+    that declare BinaryResource items to be able to specify whether the binary resources are
+    encoded as byte[] or as byte[][].  This is controlled by the /l option of mkasm.  One
+    approach that works, is to allow projects to declare a metadata tag 'Args' which is simply
+    passed directly to mkasm.  We do pass this metadata tag now, but it has a distinctly
+    un-XML-ish flavor.  We want to allow projects to control this behavior with a metadata tag,
+    such as <OutputAsArray>true</OutputAsArray>.  But there is no easy way to map that metadata
+    tag to different values, within the invocation of a single <Exec> task.  So we use two
+    <Exec> tasks, which are nearly identical except that one has "/l" in its command line, and
+    both have conditions that prevent them both from running.
+    
+    This works, but it means that if we need to add any other metadata tags that map to command
+    line options for mkasm, we will have an exponential number of tasks, with the condition on
+    each task being some combination of build parameters.  That's nasty.
+    -->    
+    
+    <Exec
+      Condition="'%(BinaryResource.OutputAsArray)'=='true'"
+      Command="$(MKASM) /b /m /l /o:$(OutputPath)\$(AssemblyName).Resource.%(BinaryResource.Namespace).%(BinaryResource.ClassName).%(BinaryResource.FieldName).cs /n:%(BinaryResource.Namespace) /c:%(BinaryResource.ClassName) /f:%(BinaryResource.FieldName) %(BinaryResource.Args) @(BinaryResource,' ')"/>
+    
+    <Exec
+      Condition="'%(BinaryResource.OutputAsArray)'!='true'"
+      Command="$(MKASM) /b /m /o:$(OutputPath)\$(AssemblyName).Resource.%(BinaryResource.Namespace).%(BinaryResource.ClassName).%(BinaryResource.FieldName).cs /n:%(BinaryResource.Namespace) /c:%(BinaryResource.ClassName) /f:%(BinaryResource.FieldName) %(BinaryResource.Args) @(BinaryResource,' ')"/>
+
+    <CreateItem Include="$(OutputPath)\$(AssemblyName).Resource.%(BinaryResource.Namespace).%(BinaryResource.ClassName).%(BinaryResource.FieldName).cs">
+      <Output TaskParameter="Include" ItemName="__binary_resource_sources"/>
+    </CreateItem>
+  </Target>
+
+  <!--
+  This target compiles all of the (C#) source files that were the products of 'mkasm',
+  from the ConvertBinaryResourcesToSourceFiles target.
+  -->
+  <Target Name="BuildBinaryResources"
+          Inputs="@(__binary_resource_sources)"
+          Outputs="$(BinaryResourceAssemblyPath)"
+          DependsOnTargets="ConvertBinaryResourcesToSourceFiles"
+          Condition="'@(BinaryResource)'!=''"
+          >
+
+    <Message Text="Compiling binary resource sources"/>
+    <Message Text="Inputs:"/>
+    <Message Text="    %(__binary_resource_sources.identity)"/>
+    <Message Text="BinaryResourceAssemblyPath - $(BinaryResourceAssemblyPath)"/>
+    <Exec Command="$(BUILDDIR)\csc.exe /t:library /out:$(BinaryResourceAssemblyPath) /nologo /nostdlib /r:$(APPRUNTIMEDIR)\Corlib.dll @(__binary_resource_sources,' ')"/>
+
+    <!-- Create Reference items, so that the IL compiler will bring in the IL assemblies we just created. -->
+    <CreateItem Include="$(BinaryResourceAssemblyPath)">
+      <Output ItemName="Reference" TaskParameter="Include"/>
+    </CreateItem>
+
+    <!-- And create __native_refs items for the native code generation step later. -->
+    <CreateItem Include="$(BinaryResourceAssemblyPath)">
+      <Output ItemName="__native_refs" TaskParameter="Include"/>
+    </CreateItem>
+    
+  </Target>
+
+
+
+  <Target Name="BuildContractMap"
+          DependsOnTargets="BuildAssembly"
+          Inputs="$(OutputAssemblyPath)"
+          Outputs="$(OutputPath)\$(AssemblyName).tmf"
+          Condition="'$(GenerateContractMap)'=='true'">
+    <Message Text="Building contract trace file"/>
+    <Exec Command="$(ILDASM) $(OutputAssemblyPath) /text &gt;$(OutputPath)\$(AssemblyName).ila"/>
+    <Exec Command="$(BUILDDIR)\mkcontagmap.exe &lt; $(OutputPath)\$(AssemblyName).ila &gt; $(OutputPath)\$(AssemblyName).tmf"/>
+  </Target>
+
+
+  <!--
+  This target allows projects to include language files (.lang), which are processed by the SPG tool.
+  Each .lang input file creates a single output file (source code), and that output file is added
+  to the list of source files to compile into the assembly.  To use this, add 'LanguageFile' items
+  to your project.  You must provide Namespace and ClassName metadata for each LanguageFile item.
+  For example:
+  
+      <ItemGroup>
+        <LanguageFile Include="script.lang">
+          <ClassName>ScriptParser</ClassName>
+          <Namespace>Microsoft.Singularity.Applications</Namespace>
+        </LanguageFile>
+      </ItemGroup>
+      
+  -->
+  <Target Name="BuildLanguageFiles"
+          Inputs="@(LanguageFile)"
+          Outputs="$(OutputPath)\%(LanguageFile.filename)_language.sg"
+          
+          >
+    <Error Condition="'%(LanguageFile.Identity)'!='' and '%(LanguageFile.Namespace)'==''" Text="All LanguageFile items require that the Namespace metadata be provided."/>
+    <Error Condition="'%(LanguageFile.Identity)'!='' and '%(LanguageFile.ClassName)'==''" Text="All LanguageFile items require that the ClassName metadata be provided."/>
+
+    <Message Text="Building languages"/>
+    <Exec Command="$(BUILDDIR)\spg %(LanguageFile.Identity) %(LanguageFile.Namespace) %(LanguageFile.ClassName) $(OutputPath)\%(LanguageFile.filename)_language.sg"/>
+
+    <!-- Generate 'Compile' items so that the BuildAssembly target will include the output of this target. -->
+    <CreateItem Include="$(OutputPath)\%(LanguageFile.filename)_language.sg">
+      <Output TaskParameter="Include" ItemName="Compile"/>
+    </CreateItem>
+  </Target>
+
+  <Target Name="CreateStrongName" Condition="'$(NoStrongName)'!='true'">
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Build\BuildKey.proj" StopOnFirstFailure="$(StopOnFirstFailure)"/>
+  </Target>
+
+  <Target Name="GetDocumentationFilePath" Outputs="$(_DocumentationFile)">    
+  </Target>
+
+  <ItemGroup>
+    <FilesToClean Include="$(OutputAssemblyPath)"/>
+    <FilesToClean Include="$(OutputAssemblySymbolPath)"/>
+    
+  </ItemGroup>
+
+  <Target Name="Clean" DependsOnTargets="$(CleanDependsOn)">
+    <Delete Files="@(FilesToClean)"/>
+    <Delete Files="@(__binary_resource_sources)"/>
+    <Delete Files="$(BinaryResourceAssemblyPath)"/>
+    <Delete Files="$(OutputPath)\$(AssemblyName).Resource.%(BinaryResource.Namespace).%(BinaryResource.ClassName).%(BinaryResource.FieldName).cs"/>
+  </Target>
+
+  <PropertyGroup>
+    <!-- This is a hint to VS to not create the xxx.vshost.exe -->
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+
+  <Target Name="ShowCommands">
+    <MSBuild Projects="@(ProjectReference);@(DependentProject)" Targets="ShowCommands"/>
+    <Message Text="$(CompilerTool) $(CompilerFlags) /debug @(ReferencePath->'/lib:%(Identity)', ' ') @(Reference->'/r:%(Identity)',' ') @(Compile,' ')"/>
+  </Target>
+  
+  <Target Name="GetContentItems" Outputs="@(Content->'%(fullpath)')"/>
+
+</Project>
diff --git a/base/Targets/TestCategory.targets b/base/Targets/TestCategory.targets
new file mode 100644
index 0000000..4cf73c4
--- /dev/null
+++ b/base/Targets/TestCategory.targets
@@ -0,0 +1,20 @@
+<!--
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Projects that are "console" apps should import this targets file.
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Libraries\UnitTest\UnitTestLib.csproj"/>
+    <ProjectReference Include="$(SINGULARITY_ROOT)\Applications\Transforms\AppTransforms.csproj">
+        <ExcludeFromNativeReferences>true</ExcludeFromNativeReferences>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="App.targets"/>
+
+</Project>
diff --git a/base/Targets/Windows.targets b/base/Targets/Windows.targets
new file mode 100644
index 0000000..a604cb3
--- /dev/null
+++ b/base/Targets/Windows.targets
@@ -0,0 +1,39 @@
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--
+    These two paths MUST end in "\".
+    Also, we add $(Configuration).$(Platform) to BaseIntermediateOutputPath, even though CommonTargets will
+    add them itself, because CommonTargets also generates some intermediate files *without* decorating them.
+    -->
+    <OutputPath Condition="'$(OutputPath)'==''">$(SINGULARITY_OBJROOT)\Windows\$(Configuration).$(Platform)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(SINGULARITY_OBJROOT)\Windows.obj\$(Configuration).$(Platform)\</BaseIntermediateOutputPath>
+
+    
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+
+  <ItemGroup>
+    <InstallFile Include="@(IntermediateAssembly)"/>
+    
+  </ItemGroup>
+
+  <Target Name="CheckOut">
+    <Exec Command="sd edit @(IntermediateAssembly->'$(SINGULARITY_ROOT)\build\%(filename)%(extension)') @(IntermediateAssembly->'$(SINGULARITY_ROOT)\build\%(filename).pdb')"/>
+  </Target>
+
+  <Target Name="InstallCopyOnly">
+    <Copy SourceFiles="@(IntermediateAssembly);@(IntermediateAssembly->'%(rootdir)%(directory)%(filename).pdb')"
+          DestinationFolder="$(SINGULARITY_ROOT)\build"
+          SkipUnchangedFiles="true"
+          />
+  </Target>
+
+  <Target Name="Install" DependsOnTargets="Build;CheckOut;InstallCopyOnly">
+  </Target>
+
+</Project>
diff --git a/base/Windows/AppReader/AppNode.cs b/base/Windows/AppReader/AppNode.cs
new file mode 100644
index 0000000..d79e752
--- /dev/null
+++ b/base/Windows/AppReader/AppNode.cs
@@ -0,0 +1,121 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace AppReader
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.IO;
+
+	public class AppNode
+	{
+		ArrayList children;
+		string nodeName;
+		AppNode parent;
+		int count;
+		// whether or not we've already added our childrens' weights to ours
+		bool normalized;
+
+		public AppNode(string nodeName, AppNode parent)
+		{
+			this.nodeName = nodeName;
+			this.parent = parent;
+			if (parent != null)
+				parent.AddChild(this);
+			count = 0;
+			this.children = new ArrayList();
+			normalized = false;
+		}
+
+		public string Name
+		{
+			get { return nodeName; }
+		}
+
+		public int NumChildren
+		{
+			get { return children.Count; }
+		}
+
+		public AppNode Parent
+		{
+			get { return parent; }
+		}
+	
+		public void Dump(string indent)
+		{
+			Console.WriteLine(indent + nodeName + ": " + count);
+			for(int i = 0; i < children.Count; i++)
+			{
+				((AppNode)children[i]).Dump(indent + "\t");
+			}
+		}
+	
+		public AppNode Copy(AppNode inParent)
+		{
+			AppNode outnode = new AppNode(this.nodeName, inParent);
+			outnode.count = this.count;
+			outnode.normalized = this.normalized;
+			for(int i = 0; i < this.children.Count; i++)
+			{
+				// this looks like a throwaway, but in the constructor it will attach to us
+				((AppNode)this.children[i]).Copy(outnode);
+			}
+			return outnode;
+		}
+
+		public void AddChild(AppNode child)
+		{
+			children.Add(child);
+			return;
+		}
+
+		public void Increment(int amount)
+		{
+			this.count += amount;
+			return;
+		}
+
+		public AppNode this[int index]
+		{
+			get
+			{
+				return (AppNode)children[index];
+			}
+			set
+			{
+				children[index] = value;
+				return;
+			}
+		}
+
+		public int Weight()
+		{
+			if (normalized) return this.count;
+			normalized = true;
+			for(int i = 0; i < this.children.Count; i++)
+			{
+				this.count += ((AppNode)this.children[i]).Weight();
+			}
+			return this.count;
+		}
+	
+		public void Flatten(ArrayList ar)
+		{
+			// put all our children in it before we go in (post-order)
+			for(int i = 0; i < this.children.Count; i++)
+			{
+				((AppNode)this.children[i]).Flatten(ar);
+			}
+			ar.Add(this);
+			return;
+		}
+
+	}
+}
diff --git a/base/Windows/AppReader/AppReader.csproj b/base/Windows/AppReader/AppReader.csproj
new file mode 100644
index 0000000..7adc49e
--- /dev/null
+++ b/base/Windows/AppReader/AppReader.csproj
@@ -0,0 +1,35 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>AppReader</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ReaderMain.cs"/>
+    <Compile Include="AppTree.cs"/>
+    <Compile Include="AppNode.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+    <ProjectReference Include="ManifestParsers.csproj"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/AppReader/AppTree.cs b/base/Windows/AppReader/AppTree.cs
new file mode 100644
index 0000000..3d77ac8
--- /dev/null
+++ b/base/Windows/AppReader/AppTree.cs
@@ -0,0 +1,149 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace AppReader
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.IO;
+
+	public class AppTree
+	{
+		AppNode top;
+		public AppTree(AppNode top)
+		{
+			this.top = top;
+		}
+
+		public AppTree(AppTree other)
+		{
+			// we just walk the other tree and get a new copy
+			this.top = other.top.Copy(null);
+		}
+
+		public void IncrementNode(string treePath)
+		{
+			IncrementNode(treePath, 1);
+			return;
+		}
+
+		public void IncrementWithHashtable(Hashtable whash)
+		{
+			// a hashtable of paths in the tree and the weights of their endpoints
+			// we just walk through the things we found and increment them in the tree
+			// if they exist in the wxvals hashtable
+			IEnumerator ienum = whash.GetEnumerator();
+			while(ienum.MoveNext())
+			{
+				string key = (string)((DictionaryEntry)ienum.Current).Key;
+				int val = (int)((DictionaryEntry)ienum.Current).Value;
+				this.IncrementNode(key, val);
+			}
+			return;
+		}
+
+		public void Dump()
+		{
+			if (top != null)
+			{
+				Console.WriteLine("\nAppTree");
+				top.Dump("");
+			}
+			return;
+		}
+
+		// this method converts a tree to a representation over which we can do clustering.
+		// We add the sum of the weights of the children to the weight of their parent
+		// so that we preserve the tree structure in the data, and then we do a post-order
+		// traversal of the tree to get our ArrayList of weights.  It is thus critical that
+		// all trees have the same structure and order, but our code guarantees this property.
+		public ArrayList Flatten()
+		{
+			ArrayList ar = new ArrayList();
+			AppTree treeToFlatten = new AppTree(this);
+			treeToFlatten.top.Weight();
+			treeToFlatten.top.Flatten(ar);
+			return ar;
+		}
+
+		public void IncrementNode(string treePath, int count)
+		{
+			// HACK: 10 is a magic number.  I just don't think 
+			// my resource trees will ever be 10 deep
+			string[] pathstr = treePath.Split(new char[] {' '}, 10);
+			AppNode curNode = top;
+			for(int i = 0; i < pathstr.Length; i++)
+			{
+				if (pathstr[i].Equals("")) continue;
+				// find the child that has the right name
+				bool found = false;
+				for(int j = 0; j < curNode.NumChildren; j++)
+				{
+					if (curNode[j].Name == pathstr[i])
+					{
+						curNode = curNode[j];
+						found = true;
+						break;
+					}
+				}
+				Debug.Assert(found);
+			}
+			curNode.Increment(count);
+			return;
+		}
+
+		public static AppTree CreateAppTree(string filename)
+		{
+			// parse the app tree structure here
+			StreamReader ios = new StreamReader(filename);
+			string curLine;
+			// this is the first node we create
+			AppNode top = null;
+			AppNode lastNode = null;
+			int lastTabCount = 0;
+			while((curLine = ios.ReadLine()) != null)
+			{
+				int tabcount = curLine.LastIndexOf("\t");
+				tabcount++;
+				//Console.WriteLine("Got tabcount {0}", tabcount);
+				Debug.Assert(tabcount >= 0);
+
+				string name = curLine.Substring(tabcount);
+				AppNode parent = lastNode == null ? null : lastNode.Parent;
+				if (tabcount < lastTabCount)
+				{
+					// then walk up the tree to the new parent
+					int diff = lastTabCount - tabcount;
+					while(diff-- > 0)
+					{
+						parent = parent.Parent;
+						Debug.Assert(parent != null);
+					}
+				}
+				else if (tabcount > lastTabCount)
+				{
+					parent = lastNode;
+					Debug.Assert(tabcount == lastTabCount + 1);
+				}
+				// this automatically joins this node to its parent in the tree
+				AppNode tempNode = new AppNode(name, parent);
+				if (top == null)
+				{
+					Debug.Assert(tabcount == 0);
+					top = tempNode;
+				}
+				lastNode = tempNode;
+				lastTabCount = tabcount;
+			}	
+			AppTree outtree = new AppTree(top);
+			return outtree;
+		}
+	}
+
+}
diff --git a/base/Windows/AppReader/CMIParser.cs b/base/Windows/AppReader/CMIParser.cs
new file mode 100644
index 0000000..705459d
--- /dev/null
+++ b/base/Windows/AppReader/CMIParser.cs
@@ -0,0 +1,166 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class CMIParser : XmlManifestParser
+	{
+		Hashtable parentDirectoriesAlreadySeen;
+		string curRegKey;
+		public CMIParser() : base()
+		{
+			curRegKey = "";
+			parentDirectoriesAlreadySeen = new Hashtable();
+		}
+
+		public override string Classify(string appName, string file, XmlTextReader xmld, Hashtable wxElementTranslator)
+		{
+			string tagname = xmld.Name;
+			if (tagname.Equals("file"))
+			{
+				string filename = xmld.GetAttribute("name");
+				if (filename == null)
+				{
+					// for those in Microsoft who don't seem to know that XML is case-sensitive
+					filename = xmld.GetAttribute("Name");
+					if (filename == null)
+					{
+						filename = xmld.GetAttribute("sourceName");
+					}
+				}
+				
+				
+				if (filename != null)
+				{
+					// now register the fact that we provide this file
+					string dpath = xmld.GetAttribute("destinationPath");
+					if (dpath != null)
+					{
+						if (dpath.IndexOf("$(runtime.windows)") >= 0)
+						{
+							dpath = dpath.Replace("$(runtime.windows)", "\\windows");
+						}
+						else if (dpath.IndexOf("$(runtime.drivers)") >= 0)
+						{
+							dpath = dpath.Replace("$(runtime.drivers)", "\\windows\\system32\\drivers");
+						}
+						else if (dpath.IndexOf("$(runtime.system32)") >= 0)
+						{
+							dpath = dpath.Replace("$(runtime.system32)", "\\windows\\system32");
+						}
+
+						// make sure that it has no trailing \ and that it starts with a \
+						dpath = dpath.TrimEnd(new char[] {'\\'});
+						dpath = dpath.TrimStart(new char[] {'\\'});
+						dpath = '\\' + dpath;
+					}
+					ManifestParser.addProvidesFile(dpath == null ? "" : dpath, filename, appName);
+				
+					if (dpath != null && !dpath.Equals("\\"))
+					{
+						string[] pathElts = dpath.Split(new char[] {'\\'}, 50);
+						string curPath = "";
+						for(int i = 0; i < pathElts.Length; i++)
+						{
+							if (pathElts[i].Equals(""))
+							{
+								continue;
+							}
+							string fullPath = curPath;
+							if (i != 0)
+							{
+								fullPath += "\\";
+							}
+							fullPath += pathElts[i];
+
+							if (parentDirectoriesAlreadySeen.ContainsKey(fullPath))
+							{
+								curPath = fullPath;
+								continue;
+							}
+							ManifestParser.addProvidesFile(curPath, pathElts[i], appName);
+							curPath = fullPath;
+							parentDirectoriesAlreadySeen[fullPath] = 1;
+						}
+					}
+
+					// and parse it to see if it's an interesting file
+					string[] components = filename.Split(new char[] {'.'}, 10);
+					string suffix = components[components.Length - 1];
+
+					if (isImageSuffix(suffix))
+					{
+						return "Data File Display UI";
+					}
+					else if (isFontSuffix(suffix))
+					{
+						return "Data File Display Fonts";
+					}
+					else
+					{
+						return "Data File";
+					}
+				}
+				return "";
+			}
+			else if (tagname.Equals("fileDependency"))
+			{
+				// then register this file dependency
+				string filename = xmld.GetAttribute("name");
+				if (filename != null)
+				{
+					// now register the fact that we require this file
+					string dpath = xmld.GetAttribute("destinationPath");
+					if (dpath != null)
+					{
+						if (dpath.Equals("$(runtime.windows)"))
+						{
+							dpath = "\\windows\\system32";
+						}
+						// make sure that it has no trailing \ and that it starts with a \
+						dpath = dpath.TrimEnd(new char[] {'\\'});
+						dpath = dpath.TrimStart(new char[] {'\\'});
+						dpath = '\\' + dpath;
+					}
+					ManifestParser.addRequiresFile(dpath == null ? "" : dpath, filename, appName);
+					return (string)wxElementTranslator[tagname];
+				}
+				return "";
+			}
+			else if (tagname.Equals("IPermission"))
+			{
+				// ADD: parse the permissions into types
+				return "Access Authentication";
+			}
+			else if (tagname.Equals("registryKey"))
+			{
+				// capture this as the current key
+				curRegKey = xmld.GetAttribute("keyName");
+				return (string)wxElementTranslator[tagname];
+			}
+			else if (tagname.Equals("registryValue"))	
+			{
+				string tempname = xmld.GetAttribute("name");
+				string tempval = xmld.GetAttribute("value");
+				return this.parseRegistry(curRegKey + "\\" + tempname, tempval, appName);
+			}
+			else
+			{
+				// for now, just look up this element in our translator
+				// (this may end up returning null)
+				return (string)wxElementTranslator[tagname];
+			}
+		}
+	}
+}
diff --git a/base/Windows/AppReader/INFParser.cs b/base/Windows/AppReader/INFParser.cs
new file mode 100644
index 0000000..5abad2f
--- /dev/null
+++ b/base/Windows/AppReader/INFParser.cs
@@ -0,0 +1,204 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class INFParser : ManifestParser
+	{
+		public override Hashtable Parse(string appName, string file, Hashtable elementTranslator)
+		{
+			Hashtable outTable = new Hashtable();
+			StreamReader ios = new StreamReader(file);
+
+			#region Parse INF File
+			ArrayList sections = new ArrayList();
+			INFSection curSection = null;
+			INFVersionSection versionSection = null;
+			INFStringSection strSection = null;
+			string curLine = ios.ReadLine();
+			while(curLine != null)
+			{
+				
+				// get rid of the whitespace on both sides
+				curLine = curLine.Trim();
+
+				if (curLine.Equals("")) 
+				{
+					curLine = ios.ReadLine();
+					continue;
+				}
+				// we don't like lines that start with control characters
+				if (curLine[0] < 32)
+				{
+					curLine = ios.ReadLine();
+					continue;
+				}
+
+				if (curLine.StartsWith("#pragma"))
+				{
+					// I can't believe this is in an INF file!
+					curLine = ios.ReadLine();
+					continue;
+				}
+
+				if (curLine.StartsWith("----"))
+				{
+					curLine = ios.ReadLine();
+					continue;
+				}
+
+					//Console.WriteLine(curLine);
+				if (INFSection.IsComment(curLine)) 
+				{	
+					//Console.WriteLine("***Ignoring comment");
+					curLine = ios.ReadLine();
+					continue;
+				}
+				if (INFSection.IsSection(curLine))
+				{
+					//Console.WriteLine("***Found Section");
+					if (curSection != null)
+					{
+						sections.Add(curSection);
+					}
+					if (INFSection.IsStringSection(curLine))
+					{
+						//Console.WriteLine("***It's a Strings section");
+
+						curSection = new INFStringSection(curLine);
+						strSection = (INFStringSection)curSection;
+					}
+					else
+					{
+						if (INFSection.IsVersionSection(curLine))
+						{
+							//Console.WriteLine("***It's a version section");
+
+							curSection = new INFVersionSection(curLine);
+							versionSection = (INFVersionSection)curSection;
+						}
+						else
+						{
+							curSection = new INFSection(curLine);
+						}
+					}
+					
+				}
+				else
+				{
+					// I can only assume that the real INF parser just ignores
+					// everything that's not in a section, given what I've seen
+					// at the top of INF files so far
+					if (curSection != null)
+					{
+						//Console.WriteLine("***Adding Line to Section "  + curSection.Name);
+
+						curSection.AddLine(curLine);
+					}
+				}
+				curLine = ios.ReadLine();
+			}
+			if (curSection != null)
+			{
+				sections.Add(curSection);
+			}
+			#endregion
+
+			#region Replace Strings
+			//Debug.Assert(versionSection != null);
+			// make sure we have a string table somewhere
+			if (strSection != null)
+			{
+
+				// now grab the INFStringSection and pass it to each INFSection 
+				// so they can update their strings to be correct
+				for(int i = 0; i < sections.Count; i++)
+				{
+					((INFSection)sections[i]).UpdateStrings(strSection);
+				}
+			}
+			#endregion
+
+			#region Record Registry Changes
+
+			// now that we've replaced the strings, we can safely 
+			// discover all the Registry section lines
+			for(int i = 0; i < sections.Count; i++)
+			{
+				((INFSection)sections[i]).DiscoverRegistryLines();
+			}
+
+			// walk the sections again and accumulate all the AddReg and DelReg sections
+			Hashtable addRegSections = new Hashtable();
+			Hashtable delRegSections = new Hashtable();
+			for (int i = 0; i < sections.Count; i++)
+			{
+				((INFSection)sections[i]).GetAddRegSections(addRegSections);
+				((INFSection)sections[i]).GetDelRegSections(delRegSections);
+			}
+
+			for(int i = 0; i < sections.Count; i++)
+			{
+				string secName = ((INFSection)sections[i]).Name;
+				if (addRegSections.ContainsKey(secName) ||
+					delRegSections.ContainsKey(secName))
+				{
+					// now walk its lines and enter the registry values
+					ArrayList lines = ((INFSection)sections[i]).Lines;
+					for(int j = 0; j < lines.Count; j++)
+					{
+						string line = (string)lines[j];
+						if (line.Equals("")) continue;
+						string versionGUID = null;
+						if (versionSection != null)
+						{
+							versionGUID = versionSection.Guid;
+						}
+						string regKey = INFSection.GetRegKey(line, versionGUID);
+						if (regKey != null)
+						{
+							//Console.WriteLine("Got RegKey " + regKey);
+							string regValue = INFSection.GetRegValue(line);
+							// remove all but the innermost double-quote strings from this value
+							int removeCount = 0;
+							for(int k = 0; k < regValue.Length; k++)
+							{
+								if (regValue[k] == '"')
+								{
+									removeCount++;
+								}
+							}
+							if (removeCount > 0)
+							{
+								regValue = regValue.TrimStart(new char[] {'"'});
+								regValue = regValue.TrimEnd(new char[] {'"'});
+								regValue = "\"" + regValue + "\"";
+							}
+							
+							//Console.WriteLine("Got RegValue " + regValue);
+
+							ManifestParser.addEntry(regKey, regValue, appName);
+						}
+					}
+				}
+			}
+
+
+			#endregion
+
+			return outTable;
+		}
+
+	}
+}
diff --git a/base/Windows/AppReader/INFSection.cs b/base/Windows/AppReader/INFSection.cs
new file mode 100644
index 0000000..84e159a
--- /dev/null
+++ b/base/Windows/AppReader/INFSection.cs
@@ -0,0 +1,321 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class INFSection
+	{
+		string version;
+
+		public string Version
+		{
+			get
+			{
+				return version;
+			}
+		}
+
+		string name;
+		
+		public string Name
+		{
+			get
+			{
+				return name;
+			}
+		}
+
+
+		ArrayList lines;
+
+		public ArrayList Lines
+		{
+			get
+			{
+				// return a copy so it can be modified
+				return new ArrayList(lines);
+			}
+		}
+
+		ArrayList addRegSectionNames;
+		ArrayList delRegSectionNames;
+		public INFSection(string line)
+		{
+			string temp;
+			version = null;
+
+			// you can't just throw away all the characters to the right of the	
+			// first ';', 'cause apparently this is a valid character in section identifiers
+			// Instead, we will find the '[' ']' and make sure there're only comment
+			// strings after it
+			int leftBracket = -1;
+			int rightBracket = -1;
+			for(int i = 0; i < line.Length; i++)
+			{
+				if (line[i] == '[') leftBracket = i;
+				if (line[i] == ']') 
+				{
+                    if (leftBracket < 0)
+                    {
+                        throw new Exception("Could not find a left bracket");
+                    }
+					rightBracket = i;
+					break;
+				}
+			}
+			temp = line.Substring(leftBracket, rightBracket-leftBracket+1);
+			//Console.WriteLine("Got section title " + temp);
+			temp = temp.Trim();
+            if (!temp.StartsWith("[") ||
+                !temp.EndsWith("]"))
+            {
+                throw new Exception("The line is not properly bracketed");
+            }
+			temp = temp.TrimEnd(new char[] {']'});
+			temp = temp.TrimStart(new char[] {'['});
+			this.name = temp;
+			lines = new ArrayList();
+			addRegSectionNames = new ArrayList();
+			delRegSectionNames = new ArrayList();
+		}
+
+		public void GetAddRegSections(Hashtable h)
+		{
+			for(int i = 0; i < addRegSectionNames.Count; i++)
+			{
+				h[(string)addRegSectionNames[i]] = null;
+			}
+			return;
+		}
+		public void GetDelRegSections(Hashtable h)
+		{
+			for(int i = 0; i < delRegSectionNames.Count; i++)
+			{
+				h[(string)delRegSectionNames[i]] = null;
+			}
+			return;
+		}
+		
+		public void DiscoverRegistryLines()
+		{
+			for(int i = 0; i < lines.Count; i++)
+			{
+				string line = (string)lines[i];
+				if (line.ToLower().StartsWith("addreg"))
+				{
+					parseRegLine(line, addRegSectionNames);
+				}
+				else if (line.ToLower().StartsWith("delreg"))
+				{
+					parseRegLine(line, delRegSectionNames);
+				}
+			}
+
+		}
+
+		public virtual void AddLine(string line)
+		{
+
+
+			// throw away any comments
+			string[] parsedLine = line.Split(new char[] {';'}, 20);
+
+			// if this is the Version section, record the ClassID
+			if (this is INFVersionSection)
+			{
+                if (line.ToLower().StartsWith("classguid"))
+                {
+					string[] components = parsedLine[0].Split(new char[] {'='}, 2);
+					components[1] = components[1].Trim();
+					((INFVersionSection)this).Guid = components[1];
+				}
+			}
+
+			lines.Add(parsedLine[0]);
+			return;
+		}
+
+		protected void parseRegLine(string line, ArrayList regSectionNames)
+		{
+			// split on '=' and then on ',' and walk through and add the entries
+			string[] twoHalves = line.Split(new char[] {'='}, 2);
+            if (twoHalves.Length != 2)
+            {
+                throw new Exception(line + " is not a valid registry line");
+            }
+			// 40 is a magic number.  I have no idea how many there may be, 
+			// but I can't imagine there being more than 40 on a single line
+			string[] regSections = twoHalves[1].Split(new char[] {','}, 40);
+			for(int i = 0; i < regSections.Length; i++)
+			{
+				string rSec = regSections[i];
+				rSec = rSec.Trim();
+				regSectionNames.Add(rSec);
+			}
+			return;
+		}
+
+		public void UpdateStrings(INFStringSection strSec)
+		{
+			// walk through each line and replace its '%'-quoted strings
+			for(int i = 0; i < lines.Count; i++)
+			{
+				string curLine = (string)lines[i];
+				string replacementLine = curLine;
+				bool insideReplacement = false;
+				string curReplace = "";
+				int percentCount = 0;
+				for(int j = 0; j < curLine.Length; j++)
+				{
+					if (insideReplacement)
+					{
+						curReplace += curLine[j];
+					}
+
+					if (curLine[j] == '%')
+					{
+						percentCount++;
+						// if we have seen an odd number of '%' and the next character is not a '%'
+						if (percentCount % 2 == 1 &&
+							!(j < curLine.Length - 1 && curLine[j + 1] == '%'))
+						{
+							if (insideReplacement)
+							{
+								// try to replace the string
+								if (strSec.hasString(curReplace))
+								{
+									replacementLine = replacementLine.Replace(curReplace, strSec[curReplace]);
+								}
+								curReplace = "";
+								percentCount = 0;
+
+							}
+							insideReplacement = !insideReplacement;
+							if (insideReplacement)
+							{
+								curReplace += curLine[j];
+							}
+						}
+					}
+					else
+					{
+						percentCount = 0;
+					}
+				}
+				lines[i] = replacementLine;
+			}
+		}
+
+		public static bool IsStringSection(string line)
+		{
+			return line.ToLower().StartsWith("[strings]");
+		}
+
+		public static bool IsVersionSection(string line)
+		{
+			return line.ToLower().StartsWith("[version]");
+		}
+
+		public static bool IsSection(string line)
+		{
+			return line.ToLower().StartsWith("[");
+		}
+
+		public static bool IsComment(string line)
+		{
+			return line.ToLower().StartsWith(";");
+		}
+
+		// according to ChkINF: # HKR = HKLM,System\CurrentControlSet\Control\Class\{SetupClassGUID}
+
+		public static string GetRegKey(string line, string guid)
+		{
+			if (!line.StartsWith("HK"))
+			{
+				return null;
+			}
+			// if we're not referenced from one of the magic sections, this is easy
+			string[] valStr = line.Split(new char[] {','}, 5);
+			// the first three entries are the components of the key
+			string root = valStr[0];
+			root = root.Trim();
+            string subkey = "";
+            string name = "";
+            if (valStr.Length > 1)
+            {
+                subkey = valStr[1];
+                subkey = subkey.Trim();
+                name = "";
+            }
+
+			if (root.Equals("HKR"))
+			{
+				if (guid == null)
+				{
+					guid = "EVIL_INF";
+					//throw new Exception("We have an HKR string, but no version section!");
+				}
+				root = "HKLM";
+				subkey = "System\\CurrentControlSet\\Control\\Class\\" + guid + "\\" + subkey;
+				if (valStr.Length > 2)
+				{
+					name = valStr[2];
+				}
+
+			}
+			else
+			{
+				// trim any outside quotation marks
+				subkey = subkey.TrimEnd(new char[] {'"'});
+				subkey = subkey.TrimStart(new char[] {'"'});
+                if (valStr.Length > 2)
+                {
+                    name = valStr[2];
+                    name = name.Trim();
+                    name = name.TrimEnd(new char[] {'"'});
+                    name = name.TrimStart(new char[] {'"'});
+                }
+			}
+			// we ignore registry types for now, although this could in theory bite us,
+			// since we could get a false negative
+            string toReturn = root;
+            if (!subkey.Equals(""))
+            {
+                toReturn += "\\" + subkey;
+            }
+            if (!name.Equals(""))
+            {
+                toReturn += "\\" + name;
+            }
+			return toReturn;
+
+		}
+
+		public static string GetRegValue(string line)
+		{
+			// this is pretty much always easy, although it can be complicated
+			// to tell what type of value this is
+			string[] valStr = line.Split(new char[] {','}, 5);
+            if (valStr.Length < 5)
+            {
+                return "";
+            }
+			// the last entry is the value
+			string val = valStr[4];
+			val = val.Trim();
+			return valStr[4];
+
+		}
+	}
+}
diff --git a/base/Windows/AppReader/INFStringSection.cs b/base/Windows/AppReader/INFStringSection.cs
new file mode 100644
index 0000000..8984fe1
--- /dev/null
+++ b/base/Windows/AppReader/INFStringSection.cs
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class INFStringSection : INFSection
+	{
+		Hashtable stringTable;
+		public INFStringSection(string line) : base(line)
+		{
+			stringTable = new Hashtable();
+		}
+	
+		public bool hasString(string str)
+		{
+			return stringTable.ContainsKey(str);
+		}
+
+		public override void AddLine(string line)
+		{
+			// parse out the two parts of this line
+			// (poor man's evil character removal: this also disallows nonASCII Unicode)
+			if (line[0] > 256) return;
+			string[] stringAndValue = line.Split(new char[] {'='}, 2);
+			// trim final space
+            if (stringAndValue.Length != 2)
+            {
+                // then this is not a valid INF line.  We'll just ignore it.
+                // This behaviour seems to be more consistent with standard INF parsing, unfortunately
+                return;
+            }
+			stringAndValue[0] = stringAndValue[0].Trim();
+			stringAndValue[1] = stringAndValue[1].Trim();
+			
+			// throw out the outermost pair of double quotation marks
+			bool startingQuote = stringAndValue[1].StartsWith("\"");
+			bool endingQuote = stringAndValue[1].EndsWith("\"");
+			if (startingQuote == endingQuote)
+			{
+				stringAndValue[1] = stringAndValue[1].TrimStart(new char[] {'"'});
+				stringAndValue[1] = stringAndValue[1].TrimEnd(new char[] {'"'});
+			}
+
+			//Console.WriteLine("Adding %" + stringAndValue[0] + "% = " + stringAndValue[1]);
+			this["%" + stringAndValue[0] + "%"] = stringAndValue[1];
+			return;
+		}
+
+		public string this[string name]
+		{
+			get
+			{
+				return (string)stringTable[name];
+			}
+			set
+			{
+				// EVIL: you shouldn't have two variable definitions that differ
+				// like this.
+				//Debug.Assert(!stringTable.ContainsKey(name));
+				stringTable[name] = value;
+				return;
+			}
+		}
+
+	}
+}
diff --git a/base/Windows/AppReader/INFVersionSection.cs b/base/Windows/AppReader/INFVersionSection.cs
new file mode 100644
index 0000000..d31af6f
--- /dev/null
+++ b/base/Windows/AppReader/INFVersionSection.cs
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class INFVersionSection : INFSection 
+	{	
+		string guid;
+		public string Guid
+		{
+			get
+			{
+				return guid;
+			}
+			set
+			{
+				guid = value;
+			}
+		}
+
+		public INFVersionSection(string line) : base(line)
+		{
+			guid = null;
+		}
+	}
+}
diff --git a/base/Windows/AppReader/ManifestParser.cs b/base/Windows/AppReader/ManifestParser.cs
new file mode 100644
index 0000000..26ea0cb
--- /dev/null
+++ b/base/Windows/AppReader/ManifestParser.cs
@@ -0,0 +1,248 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public abstract class ManifestParser
+	{
+		public ManifestParser()
+		{
+			// do nothing for now
+		}
+
+		public static Hashtable registryConflictTable = new Hashtable();
+		public static Hashtable provideFileTable = new Hashtable();
+		public static Hashtable requiresFileTable = new Hashtable();
+        public static Hashtable appFileTable = new Hashtable();
+        public static Hashtable appRegistryTable = new Hashtable();
+        public static Hashtable nameTable = new Hashtable();
+		public static Hashtable fileTypeTable = new Hashtable();
+		public static Hashtable customActionsTable = new Hashtable();
+		public static void addEntry(string path, string val, string appName)
+		{
+			if (!registryConflictTable.ContainsKey(path))
+			{
+				registryConflictTable[path] = new ArrayList();
+			}
+			Pair tempP = new Pair(val, appName);
+			((ArrayList)(registryConflictTable[path])).Add(tempP);
+
+            // also compute all the prefixes and put them in the appRegistryTable
+            if (!appRegistryTable.ContainsKey(appName))
+            {
+                appRegistryTable[appName] = new Hashtable();
+            }
+            string prefix = "";
+            string[] pathElts = path.Split(new char[] {'\\'}, 40);
+            for(int i = 0; i < pathElts.Length; i++)
+            {
+                prefix += "\\" + pathElts[i];
+                if (!((Hashtable)appRegistryTable[appName]).ContainsKey(prefix))
+                {
+                    ((Hashtable)appRegistryTable[appName])[prefix] = 1;
+                }
+                else
+                {
+                    ((Hashtable)appRegistryTable[appName])[prefix] = (int)((Hashtable)appRegistryTable[appName])[prefix] + 1;
+                }
+            }
+		}
+
+		public static void addCustomAction(string appName)
+		{
+			if (!customActionsTable.ContainsKey(appName))
+			{
+				customActionsTable[appName] = 0;
+			}
+			customActionsTable[appName] = (int)customActionsTable[appName] + 1;
+		}
+
+		public static void addProvidesFile(string path, string filename, string appName)
+		{
+
+			string file = path + "\\" + filename;
+			if (path.Equals("\\"))
+			{
+				file = "\\" + filename;
+			}
+			// grab off the suffix and put it in the file extension table
+			string[] fileComponents = filename.Split(new char[] {'.'}, 50);
+			string extension = fileComponents[fileComponents.Length - 1].ToLower();
+			if (fileComponents.Length > 1)
+			{
+				// then we probably have a real file extension (there's at least on '.')
+				if (!fileTypeTable.ContainsKey(appName))
+				{
+					// this hash maps file types to the count for this manifest
+					fileTypeTable[appName] = new Hashtable();
+				}
+
+				if (!((Hashtable)fileTypeTable[appName]).ContainsKey(extension))
+				{
+					((Hashtable)fileTypeTable[appName])[extension] = 0;
+				}
+
+				((Hashtable)fileTypeTable[appName])[extension] = (int)((Hashtable)fileTypeTable[appName])[extension] + 1;
+			}
+
+			if (!provideFileTable.ContainsKey(file))
+			{
+				provideFileTable[file] = new ArrayList();
+			}
+			((ArrayList)provideFileTable[file]).Add(appName);
+            
+            
+            if (!appFileTable.ContainsKey(appName))
+            {
+                appFileTable[appName] = new Hashtable();
+            }
+
+            if (!((Hashtable)appFileTable[appName]).ContainsKey(file))
+            {
+                ((Hashtable)appFileTable[appName])[file] = 1;
+            }
+            else
+            {
+                ((Hashtable)appFileTable[appName])[file] =  (int)((Hashtable)appFileTable[appName])[file] + 1;
+            }
+			return;
+		}
+
+		public static void addRequiresFile(string path, string filename, string appName)
+		{
+			string file = path + "\\" + filename;
+			
+			if (!requiresFileTable.ContainsKey(file))
+			{
+				// I don't care if I end up adding it twice: I'll sort it out in the end
+				requiresFileTable[file] = new ArrayList();
+			}
+			((ArrayList)requiresFileTable[file]).Add(appName);
+			return;
+		}
+
+        public static void setName(string appPathName, string appTrueName)
+        {
+            nameTable[appPathName] = appTrueName;
+            return;
+        }
+
+		public abstract Hashtable Parse(string appName, string file, Hashtable elementTranslator);
+
+		protected bool isCodeSuffix(string suffix)
+		{
+			return suffix.Equals("exe") ||
+				suffix.Equals("dll") ||
+				suffix.Equals("com") ||
+				suffix.Equals("bin") ||
+				suffix.Equals("ocx") ||
+				suffix.Equals("sys");
+		}
+
+		protected bool isImageSuffix(string suffix)
+		{
+			return suffix.Equals("avi") || 
+				suffix.Equals("bmp") || 
+				suffix.Equals("gif") || 
+				suffix.Equals("tif") || 
+				suffix.Equals("xbm") || 
+				suffix.Equals("jpg") ||
+				suffix.Equals("ico");
+		}
+
+		protected bool isFontSuffix(string suffix)
+		{
+			return suffix.Equals("ttf") || 
+				suffix.Equals("fon");
+		}
+
+		protected string getCodeType(string suffix)
+		{
+			if (suffix.Equals("exe") ||
+				suffix.Equals("com"))
+			{
+				return "Code NonLinked";
+			}
+			else if (suffix.Equals("ocx") ||
+				suffix.Equals("sys"))
+			{
+				return "Code Linked Dynamic";
+			}
+				// despite the name, if it's a DLL, we can't tell
+			else if (suffix.Equals("dll"))
+			{
+				return "Code";
+			}
+			return "Code";
+		}
+
+
+		// grab the Hashtable that will give us the paths for Manifest elements
+		public static Hashtable GetManifestHashtable(string filename)
+		{
+			StreamReader ios = new StreamReader(filename);
+			Hashtable outTable = new Hashtable();
+			string curLine;
+			while((curLine = ios.ReadLine()) != null)
+			{
+				// take the first word, and leave the rest
+				int firstSpaceIndex = curLine.IndexOf(' ');
+				string first = curLine.Substring(0, firstSpaceIndex);
+				//"Got first = ***{0}***", first);
+				string rest = curLine.Substring(firstSpaceIndex + 1);
+				//"Got rest = ***{0}***", rest);
+				outTable[first] = rest;
+			}
+			return outTable;
+		}
+
+		protected string parseRegistry(string fullpath, string val, string file)
+		{
+			// just add this Registry entry to the Hashtable
+			ManifestParser.addEntry(fullpath, val, file);
+
+			// split off the first two elements from the path
+			string[] components = fullpath.Split(new char[] {'\\'}, 10);
+			string rootname = components[0];
+			string toplevelname = components[1];
+			if (rootname.Equals("HKCR"))
+			{
+				if (toplevelname.Equals("CLSID") ||
+					toplevelname.Equals("Interface"))
+				{
+					return "Code NonLinked";
+				}
+			}
+			else if (rootname.Equals("HKCU"))
+			{
+				if (toplevelname.Equals("Printers"))
+				{
+					return "Code NonLinked";
+				}
+			}
+			else if (rootname.Equals("HKLM"))
+			{
+				if (toplevelname.Equals("HARDWARE"))
+				{
+					return "Hardware";
+				}
+				else if (toplevelname.Equals("SYSTEM"))
+				{
+					return "Data Config Settings Permanent";
+				}
+			}
+			return "Data Config Settings";
+		}
+	}
+}
diff --git a/base/Windows/AppReader/Pair.cs b/base/Windows/AppReader/Pair.cs
new file mode 100644
index 0000000..ce4fe8d
--- /dev/null
+++ b/base/Windows/AppReader/Pair.cs
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+
+	public class Pair
+	{
+		object first;
+		object second;
+		public object First
+		{
+			get { return first; }
+		}
+
+		public object Second
+		{
+			get { return second; }
+		}
+
+		public Pair(object first, object second)
+		{
+			this.first = first;
+			this.second = second;
+		}
+	}
+}
diff --git a/base/Windows/AppReader/README.txt b/base/Windows/AppReader/README.txt
new file mode 100644
index 0000000..bfe4a74
--- /dev/null
+++ b/base/Windows/AppReader/README.txt
@@ -0,0 +1,38 @@
+Running the Tool:
+
+
+This tool takes as input a directory of WiX (v2), CMI, or INF files
+and produces a file that lists all the conflicts between their
+registry entries.  The file it gives back contains a list of conflicts
+and the summed total conflicts between each pair of WiX files.  It
+expects the files to have the extension .wxs, .man, or .inf. The tool
+can be called as
+
+./AppReader.exe file | -d directory
+
+Note that it does not do a recursive walk of the directory tree
+(trivial to add, but I just haven't done it); all the files must be at
+the top level of the directory at which you point it.
+
+
+Output Format:
+
+
+The conflict lines look like:
+
+C: <registry key name>: <number of conflicting wxs files>
+   <app number> writes <reg value>
+   .
+   .
+   .
+
+
+The app numbers are to save space: there is a name table at the end of
+the file that gives the mapping from number to app.  Note that if
+there is a conflict on a key/value pair, every app that writes to that
+key is listed, even if most of them do not conflict.
+
+After the conflict listings, there is a list with three columns.  The
+columns, in order, are <App 1 Number>, <App 2 Number>, and <Number of
+conflicts>.  
+
diff --git a/base/Windows/AppReader/ReaderMain.cs b/base/Windows/AppReader/ReaderMain.cs
new file mode 100644
index 0000000..230b9b3
--- /dev/null
+++ b/base/Windows/AppReader/ReaderMain.cs
@@ -0,0 +1,710 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using ManifestReader;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+namespace AppReader
+{
+	class ReaderMain
+	{
+		static void Usage()
+		{
+			Console.WriteLine("AppReader.exe <manifestfile | (-d | -s) manifestdirectory | -r appdirectory>");
+			return;
+		}
+
+        static double computeSpread(int[] directoryCounts)
+        {
+            double count = 0;
+            for(int i = 0; i < directoryCounts.Length; i++)
+            {
+                int curLevelCount = directoryCounts[i];
+                count += Math.Pow(100, -i)*(curLevelCount - 1);
+            }
+            return count;
+        }
+
+
+		static int getAppNumber(string name, Hashtable appNameTable, ref int nameCount)
+		{
+			if (!appNameTable.ContainsKey(name))
+			{
+				appNameTable[name] = nameCount++;
+			}
+			return (int)appNameTable[name];
+		}
+
+		static void parseFile(string appName, string file)
+		{
+			ManifestParser mp;
+			// get the suffix
+			string[] components = file.Split(new char[] {'.'}, 50);
+			string suffix = components[components.Length - 1];
+			if (suffix.Equals("wxs"))
+			{
+				mp = new WiXParser();
+			}
+			else if (suffix.ToLower().Equals("man") ||
+				suffix.ToLower().Equals("manifest"))
+			{
+				mp = new CMIParser();
+			}
+			else if (suffix.Equals("inf"))
+			{
+				mp = new INFParser();
+			}
+			else if (suffix.Equals("inft"))
+			{
+				mp = new RegINFParser();
+			}
+			else
+			{
+				//Console.WriteLine("Unknown manifest suffix " + suffix);
+				return;
+			}
+
+			// otherwise, try to parse it
+            try
+            {
+                mp.Parse(appName, file, new Hashtable());
+            }
+            catch (System.Xml.XmlException)
+            {
+                Console.WriteLine("Could not parse " + file);
+            }
+//            catch(System.Exception e)
+//            {
+//                Console.WriteLine("Failed to parse " + file + " : " + e.Message);
+//            }
+			return;
+		}
+
+		static Hashtable parseFile(string appName, string file, Hashtable wxsvals, Hashtable cmivals)
+		{
+			Hashtable whash = new Hashtable();;
+			ManifestParser mp;
+			Hashtable inHash;
+			// get the suffix
+			string[] components = file.Split(new char[] {'.'}, 50);
+			string suffix = components[components.Length - 1];
+			if (suffix.Equals("wxs"))
+			{
+				inHash = wxsvals;
+				mp = new WiXParser();
+			}
+			else if (suffix.ToLower().Equals("man") ||
+				suffix.ToLower().Equals("manifest"))
+			{
+				inHash = cmivals;
+				mp = new CMIParser();
+			}
+			else if (suffix.Equals("inf"))
+			{
+				inHash = null;
+				mp = new INFParser();
+			}
+			else if (suffix.Equals("inft"))
+			{
+				inHash = null;
+				mp = new RegINFParser();
+			}
+			else
+			{
+				Console.WriteLine("Unknown manifest suffix " + suffix);
+				return whash;
+			}
+
+			// otherwise, try to parse it
+			try
+			{
+				whash = mp.Parse(appName, file, inHash);
+			}
+			catch (System.Xml.XmlException)
+			{
+				Console.WriteLine("Could not parse " + file);
+			}
+			return whash;
+		}
+
+		static bool sameApp(string first, string second)
+		{
+			// we'll compute a heuristic measure of similarity by checking 
+			// the number of elements they have in common in 
+			// their strings.  Any difference of 2 or less and 
+			// we will say that they are the same	
+			string[] firstArray = first.Split(new char[] {'.', '_'}, 40);
+			string[] secondArray = second.Split(new char[] {'.', '_'}, 40);
+			Hashtable firstHash = new Hashtable();
+			for(int i = 0; i < firstArray.Length; i++)
+			{
+				if (!firstHash.ContainsKey(firstArray[i]))
+				{
+					firstHash[firstArray[i]] = 0;
+				}
+				firstHash[firstArray[i]] = (int)firstHash[firstArray[i]] + 1;
+			}
+
+			for(int i = 0; i < secondArray.Length; i++)
+			{
+				if (firstHash.ContainsKey(secondArray[i]))
+				{
+					firstHash[secondArray[i]] = (int)firstHash[secondArray[i]] - 1;
+				}
+			}
+
+			ICollection vcol = firstHash.Values;
+			IEnumerator ienum = vcol.GetEnumerator();
+			int sum = 0;
+			while(ienum.MoveNext())
+			{
+				sum += (int)ienum.Current;
+			}
+			return System.Math.Abs(sum) <= 2;
+		}
+
+		[STAThread]
+		static void Main(string[] args)
+		{
+			if (args.Length < 1)
+			{
+				Usage();
+				return;
+			}
+			#region Setup Variables
+			// grab a new app tree
+			//AppTree tempat = AppTree.CreateAppTree(args[0]);
+
+			//ArrayList tempar = tempat.Flatten();
+			// ... that we can spit out for clustering
+			//for(int j = 0; j < tempar.Count; j++)
+			//{
+			//	Console.Write(((AppNode)tempar[j]).Name + "\t");
+			//}
+			//Console.WriteLine();
+	
+			// get the mapping from WiX elements to app tree paths
+			//Hashtable wxvals = WiXParser.GetManifestHashtable(args[1]);
+
+			// get the mapping from CMI elements to app tree paths
+			//Hashtable cmivals = CMIParser.GetManifestHashtable(args[2]);
+
+			#endregion
+
+            bool doConflictsAndDependencies = true;
+            if (args[0].Equals("-s"))
+            {
+                doConflictsAndDependencies = false;
+            }
+
+			#region Parse Directory
+            if (args[0].Equals("-r"))
+            {
+                // the next argument must be a directory that 
+                // we can parse to get a list of directories that map to apps
+                if (args.Length != 2)
+                {
+                    Usage(); 
+                    return;
+                }
+                string dir = args[1];
+                DirectoryInfo di = new DirectoryInfo(dir);
+                if (!di.Exists)
+                {
+                    Console.WriteLine("Directory " + dir + " does not exist");
+                    return;
+                }
+                DirectoryInfo[] dis = di.GetDirectories();
+                for(int i = 0; i < dis.Length; i++)
+                {
+                    DirectoryInfo tempDi = dis[i];
+			
+					// if this directory itself contains directories, 
+					// step into them to get each app
+					DirectoryInfo[] subDirs = tempDi.GetDirectories();
+					if (subDirs.Length > 0)
+					{
+						for(int j = 0; j < subDirs.Length; j++)
+						{
+							DirectoryInfo subDir = subDirs[j];
+							string appName = tempDi.Name + " " + subDir.Name;
+							FileInfo[] fis = subDir.GetFiles();
+							for(int k = 0; k < fis.Length; k++)
+							{
+								parseFile(appName, subDir.FullName + "\\" + fis[k].Name);  
+							}
+
+						}
+					}
+					else
+					{
+						string appName = tempDi.Name;
+						FileInfo[] fis = tempDi.GetFiles();
+						for(int j = 0; j < fis.Length; j++)
+						{
+							parseFile(appName, tempDi.FullName + "\\" + fis[j].Name);  
+						}
+					}
+                }
+            }
+			else if (args[0].Equals("-d") || args[0].Equals("-s"))
+			{
+				// the next argument must be a directory that 
+				// contains a set of .wxs files for us to parse
+				if (args.Length != 2)
+				{
+					Usage(); 
+					return;
+				}
+                Console.WriteLine("About to parse " + args[1]);
+                int count = 0;
+				string dir = args[1];
+				DirectoryInfo di = new DirectoryInfo(dir);
+				if (!di.Exists)
+				{
+					Console.WriteLine("Directory " + dir + " does not exist");
+					return;
+				}
+				FileInfo[] fis = di.GetFiles();
+				
+//				Console.WriteLine("Got here with size " + fis.Length);
+
+				// for each manifest file
+				for(int i = 0; i < fis.Length; i++)
+				{
+                    Console.WriteLine(++count);
+					// grab a new app tree
+					//AppTree at = AppTree.CreateAppTree(args[0]);
+
+					//Hashtable whash = parseFile(fis[i].DirectoryName + "\\" + fis[i].Name, wxvals, cmivals);
+					parseFile(fis[i].DirectoryName + "\\" + fis[i].Name, fis[i].DirectoryName + "\\" + fis[i].Name);
+					// then set up the app tree
+					//at.IncrementWithHashtable(whash);
+
+					// and flatten it to a point in R^n
+					//ArrayList ar = at.Flatten();
+
+					//Console.Write(fis[i].Name + "\t");
+
+					// ... that we can spit out for clustering
+					//for(int j = 0; j < ar.Count; j++)
+					//{
+					//	Console.Write(((AppNode)ar[j]).Weight() + "\t");
+					//}
+					//Console.WriteLine();
+				}
+			}
+				#endregion
+				#region Parse Single File
+			else
+			{
+				if (args.Length != 1)
+				{
+					Usage(); 
+					return;
+				}
+				// grab a new app tree
+				//AppTree at = AppTree.CreateAppTree(args[0]);
+
+                Console.WriteLine("about to parse file");
+				//Hashtable whash = parseFile(args[3], wxvals, cmivals);
+				parseFile(args[0], args[0]);
+				//at.IncrementWithHashtable(whash);
+				//at.Dump();
+			}
+			#endregion
+    
+
+            #region Enumerate Registry Dependencies
+            Console.WriteLine("---Registry Conflicts---");
+            // this Hashtable will contain all the names found in the conflict table
+            // and the other apps with which they conflict on registry key/value pairs.
+            Hashtable appConflicts = new Hashtable();
+
+            // this table will be used to reduce the size of the generated file
+            Hashtable appNameTable = new Hashtable();
+            int nameCount = 0;
+            if (doConflictsAndDependencies)
+            {
+
+                // now walk the Hashtable and dump any conflicts
+                Hashtable conflictTable = ManifestParser.registryConflictTable;
+                IDictionaryEnumerator iDictEnum = conflictTable.GetEnumerator();
+                while(iDictEnum.MoveNext())
+                {
+                    if (((ArrayList)iDictEnum.Value).Count > 1)
+                    {
+                        // then we might have a conflict
+                        ArrayList confs = ((ArrayList)iDictEnum.Value);
+                        string val = (string)((Pair)confs[1]).First;
+                        string appname = (string)((Pair)confs[1]).Second;
+                        bool founddifference = false;
+                        bool foundtwoapps = false;
+                        for(int i = 0; i < confs.Count; i++)
+                        {
+                            Pair outp = (Pair)confs[i];
+                            string newval = (string)((Pair)confs[i]).First;
+                            string newappname = (string)((Pair)confs[i]).Second;
+                            if ((val == null && newval == null) || 
+                                (val != null && newval != null && val.ToLower().Equals(newval.ToLower()))) 
+                            {
+                                continue;
+                            }
+
+                            // heuristic (may give some false negatives, but then we're just underestimating a bit)
+
+                            // if one of these starts with a '[' in the first two characters,
+                            // then it's probably just a substitution that we didn't notice.
+                            // In that case, claim that it is not a conflict
+                            if ((val != null && val.Length > 1 && val[0] == '[') ||
+                                (val != null && val.Length > 2 && val[1] == '[') ||
+                                (newval != null && newval.Length > 1 && newval[0] == '[') ||
+                                (newval != null && newval.Length > 2 && newval[1] == '['))
+                            {
+                                continue;
+                            }
+                            founddifference = true;
+                            if (newappname.Equals(appname)) continue;
+                            foundtwoapps = true;
+                        }
+
+                        if (!founddifference || !foundtwoapps) continue;
+
+                        Console.WriteLine("C: " + ((string)iDictEnum.Key) + " : " + ((ArrayList)iDictEnum.Value).Count);
+
+                        Hashtable confHash = new Hashtable();
+                        for(int i = 0; i < confs.Count; i++)
+                        {
+                            Pair outp = (Pair)confs[i];
+                            string confAppName = (string)outp.Second;
+                            if (!appConflicts.ContainsKey(confAppName))
+                            {
+                                appConflicts[confAppName] = new Hashtable();
+                            }
+                            // write the conflicting app into the hash with its value
+                            confHash[confAppName] = (string)outp.First;
+                            Console.WriteLine("\t " + 
+                                getAppNumber((string)outp.Second, appNameTable, ref nameCount)
+                                + " writes " + (string)outp.First);
+                        }
+
+                        IDictionaryEnumerator iconf1 = confHash.GetEnumerator();
+                        while(iconf1.MoveNext())
+                        {
+                            string confAppName = (string)iconf1.Key;
+                            string confVal1 = (string)iconf1.Value;
+                            Hashtable htable = (Hashtable)appConflicts[confAppName];
+                            IDictionaryEnumerator iconf2 = confHash.GetEnumerator();
+                            while(iconf2.MoveNext())
+                            {
+                                string curAppName = (string)iconf2.Key;
+                                string confVal2 = (string)iconf2.Value;
+
+                                // don't add this conflict if they are the same app
+                                if (curAppName.Equals(confAppName)) continue;
+		
+                                // don't add this conflict if they have the same value on this key
+                                if (confVal2 == null && confVal1 == null)
+                                {
+                                    continue;
+                                }
+                                else if (confVal2 != null && confVal1 != null && confVal2.ToLower().Equals(confVal1.ToLower())) 
+                                {
+                                    continue;
+                                }
+
+                                if (!htable.ContainsKey(curAppName))
+                                {
+                                    htable[curAppName] = 0;
+                                }
+                                htable[curAppName] = (int)htable[curAppName] + 1;
+                            }
+                        }
+
+                    }
+                }
+
+                IDictionaryEnumerator iDE = appConflicts.GetEnumerator();
+                while(iDE.MoveNext())
+                {
+                    string firstName = (string)iDE.Key;
+                    Hashtable confvals = (Hashtable)iDE.Value;
+                    IDictionaryEnumerator iDEInner = confvals.GetEnumerator();
+                    while(iDEInner.MoveNext())
+                    {
+                        string secondName = (string)iDEInner.Key;
+                        int strength = (int)iDEInner.Value;
+
+                        Console.WriteLine(getAppNumber(firstName, appNameTable, ref nameCount)
+                            + "\t" + getAppNumber(secondName, appNameTable, ref nameCount)
+                            + "\t" + strength);
+                    }
+                }
+
+                #endregion
+
+                #region Enumerate File Dependencies
+
+                Console.WriteLine("---File Dependencies---");
+                // now let's display all the file dependencies.
+                // We'll walk through the ManifestParser.provideFileTable 
+                // and ManifestParser.requireFileTable
+                IDictionaryEnumerator ireq = ManifestParser.requiresFileTable.GetEnumerator();
+                while(ireq.MoveNext())
+                {
+                    string requiredFile = (string)ireq.Key;
+                    ArrayList reqArray = (ArrayList)ireq.Value;
+                    for(int i = 0; i < reqArray.Count; i++)
+                    {
+                        string requiringAppName = (string)reqArray[i];
+                        if (!ManifestParser.provideFileTable.ContainsKey(requiredFile))
+                        {
+                            // do nothing about it for now
+                            //throw new Exception("File " + requiredFile + " is required but not provided!");
+                        }
+                        else
+                        {
+                            // otherwise, we'll walk through all the apps that provide
+                            // this file and print a dependency between them
+                            ArrayList provArray = (ArrayList)ManifestParser.provideFileTable[requiredFile];
+                            for(int j = 0; j < provArray.Count; j++)
+                            {
+                                string providingAppName = (string)provArray[j];
+                                Console.WriteLine(getAppNumber(requiringAppName, appNameTable, ref nameCount) + "\t" + 
+                                    getAppNumber(providingAppName, appNameTable, ref nameCount));
+                            }
+                        }
+                    }
+                }	
+                #endregion
+            }
+
+
+            #region Evaluate File Spread
+            
+            Console.WriteLine("\n---File Spread---\n");
+
+            // we use the appFileTable for each app to compute this
+            IDictionaryEnumerator appFileEnum = ManifestParser.appFileTable.GetEnumerator();
+            while(appFileEnum.MoveNext())
+            {
+                string appName = (string)appFileEnum.Key;
+                Hashtable appFiles = (Hashtable)appFileEnum.Value;
+                // walk through the list and figure out how many unique prefixes there are of each length
+                IDictionaryEnumerator lengthEnum = appFiles.GetEnumerator();
+                int max = 0;
+                while(lengthEnum.MoveNext())
+                {
+                    string path = (string)lengthEnum.Key;
+                    string[] pathElts = path.Split(new char[] {'\\'}, 40);
+                    // since the paths all start with \ and 
+                    // we don't want to count the empty first pathElt
+                    int length = pathElts.Length - 1; 
+                    if (length > max)
+                    {
+                        max = length;
+                    }
+                }
+
+                int[] lengths = new int[max];
+
+                for(int i = 0; i < lengths.Length; i++)
+                {
+                    lengths[i] = 0;
+                }
+
+                lengthEnum.Reset();
+
+                while(lengthEnum.MoveNext())
+                {
+                    string path = (string)lengthEnum.Key;
+                    string[] pathElts = path.Split(new char[] {'\\'}, 40);
+                    // since the paths all start with \ and 
+                    // we don't want to count the empty first pathElt
+                    int length = pathElts.Length - 1; 
+                    // this -1 is because the lengths array is 0-based
+                    lengths[length - 1]++;
+                }
+
+				for(int i = 0; i < lengths.Length; i++)
+				{
+					if (lengths[i] == 0)
+					{
+						lengths[i] = 1;
+					}
+				}
+
+                double spread = computeSpread(lengths);
+                // look up the real name
+                if (ManifestParser.nameTable.ContainsKey(appName))
+                {
+                    appName = (string)ManifestParser.nameTable[appName];
+                }
+
+                string strSpread = "";
+                for(int i = 0; i < lengths.Length; i++)
+                {
+                    if (i != 0)
+                    {
+                        strSpread += " ";
+                    }
+                    strSpread += lengths[i];
+                }
+                Console.WriteLine(appName + " : " + spread + " : " + strSpread);
+            }
+            
+            #endregion
+
+            #region Evaluate Registry Spread
+            
+            Console.WriteLine("\n---Registry Spread---\n");
+
+            // we use the appFileTable for each app to compute this
+            IDictionaryEnumerator appRegistryEnum = ManifestParser.appRegistryTable.GetEnumerator();
+            while(appRegistryEnum.MoveNext())
+            {
+                string appName = (string)appRegistryEnum.Key;
+                Hashtable appRegs = (Hashtable)appRegistryEnum.Value;
+                // walk through the list and figure out how many unique prefixes there are of each length
+                IDictionaryEnumerator lengthEnum = appRegs.GetEnumerator();
+                int max = 0;
+                while(lengthEnum.MoveNext())
+                {
+                    string path = (string)lengthEnum.Key;
+                    string[] pathElts = path.Split(new char[] {'\\'}, 40);
+                    // since the paths all start with \ and 
+                    // we don't want to count the empty first pathElt
+                    int length = pathElts.Length - 1; 
+                    if (length > max)
+                    {
+                        max = length;
+                    }
+                }
+
+                int[] lengths = new int[max];
+
+                for(int i = 0; i < lengths.Length; i++)
+                {
+                    lengths[i] = 0;
+                }
+
+                lengthEnum.Reset();
+
+                while(lengthEnum.MoveNext())
+                {
+                    string path = (string)lengthEnum.Key;
+                    string[] pathElts = path.Split(new char[] {'\\'}, 40);
+                    // since the paths all start with \ and 
+                    // we don't want to count the empty first pathElt
+                    int length = pathElts.Length - 1; 
+                    // this -1 is because the lengths array is 0-based
+                    lengths[length - 1]++;
+                }
+				for(int i = 0; i < lengths.Length; i++)
+				{
+					if (lengths[i] == 0)
+					{
+						lengths[i] = 1;
+					}
+				}
+
+                double spread = computeSpread(lengths);
+                // look up the real name
+                if (ManifestParser.nameTable.ContainsKey(appName))
+                {
+                    appName = (string)ManifestParser.nameTable[appName];
+                }
+
+                string strSpread = "";
+                for(int i = 0; i < lengths.Length; i++)
+                {
+                    if (i != 0)
+                    {
+                        strSpread += " ";
+                    }
+                    strSpread += lengths[i];
+                }
+                Console.WriteLine(appName + " : " + spread + " : " + strSpread);
+
+            }
+            
+            #endregion
+
+	
+			#region Print Custom Actions
+
+			Console.WriteLine("---Custom Actions---");
+
+			// walk through the ManifestParser.customActionsTable
+			IDictionaryEnumerator customEnum = ManifestParser.customActionsTable.GetEnumerator();
+			while(customEnum.MoveNext())
+			{
+				string appName = (string)customEnum.Key;
+				int customCount = (int)customEnum.Value;
+				Console.WriteLine(appName + " : " + customCount);
+			}
+
+			#endregion
+
+			#region Print File Extensions and Counts
+
+			Console.WriteLine("---File Extensions---");
+
+			// walk through the ManifestParser.fileTypeTable
+			IDictionaryEnumerator fileEnum = ManifestParser.fileTypeTable.GetEnumerator();
+			while(fileEnum.MoveNext())
+			{
+				int uniqueFileTypes = 0;
+				string appName = (string)fileEnum.Key;
+				Hashtable exts = (Hashtable)fileEnum.Value;
+				IDictionaryEnumerator extEnum = exts.GetEnumerator();
+				while(extEnum.MoveNext())
+				{
+					uniqueFileTypes++;
+					string extension = (string)extEnum.Key;
+					int extCount = (int)extEnum.Value;
+					Console.WriteLine(appName + " : " + extension + " : " + extCount);
+				}
+				Console.WriteLine(appName + " : " + uniqueFileTypes);
+			}
+
+			#endregion
+
+
+            #region Print Name Table
+			Console.WriteLine("\n---Name Table---\n");
+
+			// now write out the name table
+			IDictionaryEnumerator iDENT = appNameTable.GetEnumerator();
+			while(iDENT.MoveNext())
+			{
+                string appName = "";
+                // look up the real name
+                if (ManifestParser.nameTable.ContainsKey((string)iDENT.Key))
+                {
+                    appName = (string)ManifestParser.nameTable[(string)iDENT.Key];
+                }
+
+                if (appName.Equals(""))
+                {
+                    Console.WriteLine((string)iDENT.Key + " " + (int)iDENT.Value);
+                }
+                else
+                {
+                    Console.WriteLine((string)iDENT.Key + " " + appName + " " + (int)iDENT.Value);
+                }
+			}
+			#endregion
+            return;
+	}
+
+
+	}
+}
diff --git a/base/Windows/AppReader/RegINFParser.cs b/base/Windows/AppReader/RegINFParser.cs
new file mode 100644
index 0000000..c88a396
--- /dev/null
+++ b/base/Windows/AppReader/RegINFParser.cs
@@ -0,0 +1,36 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class RegINFParser : ManifestParser
+	{
+						
+		public override Hashtable Parse(string appName, string file, Hashtable elementTranslator)
+		{
+			Hashtable outTable = new Hashtable();
+			StreamReader ios = new StreamReader(file);
+			string curLine = ios.ReadLine();
+			while(curLine != null)
+			{
+				// each line is just a simple registry line with no strings or substitution
+				string regKey = INFSection.GetRegKey(curLine, "");
+				string regVal = INFSection.GetRegValue(curLine);
+				ManifestParser.addEntry(regKey, regVal, appName);
+				curLine = ios.ReadLine();
+			}
+			return outTable;
+		}
+	}
+}
diff --git a/base/Windows/AppReader/WiXParser.cs b/base/Windows/AppReader/WiXParser.cs
new file mode 100644
index 0000000..9fa5a43
--- /dev/null
+++ b/base/Windows/AppReader/WiXParser.cs
@@ -0,0 +1,141 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public class WiXParser : XmlManifestParser
+	{
+        string productName = "";
+		string currentDir = "";
+		public override string Classify(string appName, string file, XmlTextReader xmld, Hashtable wxElementTranslator)
+		{
+			if (xmld.NodeType == XmlNodeType.EndElement)
+			{
+				if (xmld.Name.Equals("Directory"))
+				{
+					// chop off the most recent addition to the directory string
+					// and register this "file" with the providesFile table
+					// We know that there must be some slash here
+					int lastSlash = currentDir.LastIndexOf("\\");
+					string providedDir = currentDir.Substring(lastSlash + 1);
+					currentDir = currentDir.Substring(0, lastSlash);
+
+					addProvidesFile(currentDir, providedDir, appName);
+				}
+				return "";
+			}
+			else
+			{
+				if (xmld.Name.Equals("CustomAction"))
+				{
+					// add this filename to the custom action count
+					addCustomAction(appName);
+					return "";
+				}
+				if (xmld.Name.Equals("Product"))
+				{
+					// get the product name
+					productName = xmld.GetAttribute("Name");
+					setName(file, productName);
+					return "";
+				}
+				else if (xmld.Name.Equals("Directory"))
+				{
+					string dirName = xmld.GetAttribute("LongName");
+					if (dirName == null)
+					{
+						dirName = xmld.GetAttribute("Name");   
+					}
+
+					if (dirName.Equals("."))
+					{
+						dirName = xmld.GetAttribute("LongSource");
+						if (dirName == null)
+						{
+							dirName = xmld.GetAttribute("SourceName");
+						}
+					}
+					if (!xmld.IsEmptyElement)
+					{
+						// if this element has any children
+						// add this string to the directory name
+						currentDir += "\\" + dirName;
+					}
+					else
+					{
+						if (dirName != null)
+						{
+							// otherwise, register it and move on
+							addProvidesFile(currentDir, dirName, appName);
+						}
+					}
+					return "";
+				}
+				else if (xmld.Name.Equals("File"))
+				{
+					string filename = xmld.GetAttribute("LongName");
+					if (filename == null)
+					{
+						filename = xmld.GetAttribute("Name");
+					}
+        
+					// add this to the providesFileTable
+					addProvidesFile(currentDir, filename, appName);
+
+					//Console.Error.WriteLine(filename);
+					string[] components = filename.Split(new char[] {'.'}, 10);
+					string suffix = components[components.Length - 1];
+					if (isCodeSuffix(suffix))
+					{
+						return getCodeType(suffix);
+					}
+					else if (isImageSuffix(suffix))
+					{
+						return "Data File Display UI";
+					}
+					else if (isFontSuffix(suffix))
+					{
+						return "Data File Display Fonts";
+					}
+					else
+					{
+						return "Data File";
+					}
+				}
+				else if (xmld.Name.Equals("Registry"))
+				{
+					// parse the registry prefix
+					string rootname = xmld.GetAttribute("Root");
+					string path = xmld.GetAttribute("Key");
+	
+					string fullpath = rootname + "\\" + path;
+
+					string val = xmld.GetAttribute("Value");
+
+					string valname = xmld.GetAttribute("Name");
+
+					return parseRegistry(fullpath + "\\" + valname, val, appName);
+
+				}
+				else
+				{
+					// look up this element in our translator
+					// (this may end up returning null)
+					return (string)wxElementTranslator[xmld.Name];
+				}
+			}
+		}
+
+	}
+}
diff --git a/base/Windows/AppReader/XmlManifestParser.cs b/base/Windows/AppReader/XmlManifestParser.cs
new file mode 100644
index 0000000..c13412e
--- /dev/null
+++ b/base/Windows/AppReader/XmlManifestParser.cs
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace ManifestReader
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Xml;
+    using System.Diagnostics;
+
+	public abstract class XmlManifestParser : ManifestParser
+	{
+
+		public override Hashtable Parse(string appName, string wxsFile, Hashtable wxElementTranslator)
+		{
+			Hashtable outTable = new Hashtable();
+            StreamReader ios;
+            try
+            {
+                ios = new StreamReader(wxsFile);
+            }
+            catch (System.IO.FileNotFoundException)
+            {
+                return outTable;
+            }
+			XmlTextReader xmld = new XmlTextReader(ios);
+
+			while(xmld.Read())
+			{
+				string name = xmld.LocalName;
+				XmlNodeType xnt = xmld.NodeType;
+				//Console.WriteLine("Read a line with " + name);
+				if (xnt == XmlNodeType.Element)
+				{
+					//Console.WriteLine("Reading name " + name + " from XML");
+					string path = Classify(appName, wxsFile, xmld, wxElementTranslator);
+					//					if (path != null)
+					//						"some more ***" + path + "***");
+					if (path != null)
+					{
+						if (outTable.ContainsKey(path))
+						{
+							outTable[path] = (int)outTable[path] + 1;
+						}
+						else
+						{
+							outTable[path] = 1;
+						}
+					}
+				}
+			}
+			return outTable;
+		}
+
+		public abstract string Classify(string appName, string filename, XmlTextReader xmld, Hashtable wxElementTranslator);
+
+	}
+}
diff --git a/base/Windows/DistroBuilder/DistroBuilder.cs b/base/Windows/DistroBuilder/DistroBuilder.cs
new file mode 100644
index 0000000..2cf7ec7
--- /dev/null
+++ b/base/Windows/DistroBuilder/DistroBuilder.cs
@@ -0,0 +1,659 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DistroBuilder.cs
+//
+//  Note:   Main entry point for DistroBuilder tool, used to collect
+//          application metadata into a manifest.
+//
+using System;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Security.Cryptography;
+
+public class DistroBuilder
+{
+    //
+    // Fields in the distro build class
+    //
+
+    XmlNode systemPolicy; // the external xml policy
+
+    // manifest and well-defined nodes
+    XmlDocument systemManifest;
+    XmlNode manifestRoot;
+    XmlNode drivers;
+
+    // internal node that we build and add to the manifest
+    XmlNode fileList;
+
+    // all files in the distro (full names, plus the separate directory prefix)
+    string distroDirectoryName;
+    SortedList applicationFiles;
+    SortedList manifestFiles;
+    SortedList otherFiles;
+
+    // key filenames
+    string outFilePath; // system manifest path+name
+    string outFileName; // just the name of the manifest
+    string iniFileName; // ini file
+
+    // const name of the kernel file
+    const string kernelFileName = "kernel.dmp";
+
+    // set up an object that can build the distribution
+    public DistroBuilder(string policyFile, string outputFile, string iniFile,
+                         string distroDirectoryName,
+                         string distroDescriptionFileName)
+    {
+        // copy output file names.
+        outFilePath = outputFile;
+        iniFileName = iniFile;
+
+        // load the system policy.
+        XmlDocument policyDoc = new XmlDocument();
+        policyDoc.Load(policyFile);
+        systemPolicy = GetChild(policyDoc, "distribution");
+
+        // set up Xml pieces.
+        systemManifest = new XmlDocument();
+        manifestRoot = AddElement(systemManifest, "system");
+
+        fileList = AddElement(null, "files");
+        drivers = AddElement(null, "drivers");
+
+        // now set up the lists of files in the distro:
+        applicationFiles = new SortedList();
+        manifestFiles = new SortedList();
+        otherFiles = new SortedList();
+
+        FileInfo allFiles = new FileInfo(distroDescriptionFileName);
+        StreamReader stream = allFiles.OpenText();
+        string s = stream.ReadLine();
+        while (s != null) {
+            if (s.EndsWith(".x86")) {
+                applicationFiles.Add(s, s);
+            }
+            else if (s.EndsWith(".manifest")) {
+                manifestFiles.Add(s, s);
+            }
+            else {
+                otherFiles.Add(s, s);
+            }
+            s = stream.ReadLine();
+        }
+        stream.Close();
+
+        // add the output file to the list
+        string [] a = outFilePath.Split('\\');
+        outFileName = a[a.Length-1];
+
+        FileInfo outFile = new FileInfo(outFilePath);
+        outFilePath = outFile.FullName;
+        if (!otherFiles.Contains(outFilePath)) {
+            otherFiles.Add(outFilePath, outFilePath);
+        }
+
+        // now get the fully path for the distro directory name
+        FileInfo directoryInfo = new FileInfo(distroDirectoryName);
+        this.distroDirectoryName = directoryInfo.FullName;
+    }
+
+    //////////////////////////////////////////////// Methods to help with XML.
+    //
+    private XmlNode AddElement(XmlNode parent, string name)
+    {
+        XmlNode element = systemManifest.CreateNode(XmlNodeType.Element, name, "");
+        if (parent != null) {
+            parent.AppendChild(element);
+        }
+        return element;
+    }
+
+    private void AddAttribute(XmlNode node, string name, string value)
+    {
+        XmlAttribute attr = systemManifest.CreateAttribute(name);
+        attr.Value = value;
+        node.Attributes.Append(attr);
+    }
+
+    private XmlNode AddImported(XmlNode parent, XmlNode root, bool deep)
+    {
+        XmlNode element = systemManifest.ImportNode(root, true);
+        if (parent != null) {
+            parent.AppendChild(element);
+        }
+        return element;
+    }
+
+    // Return an array with every child of the parent whose name matches
+    // <name>
+    private static XmlNode[] GetChildren(XmlNode parent, string name)
+    {
+        ArrayList result = new ArrayList();
+
+        foreach (XmlNode child in parent.ChildNodes) {
+            if (child.Name == name) {
+                result.Add(child);
+            }
+        }
+
+        if (result.Count == 0) {
+            return new XmlNode[0];
+        }
+
+        XmlNode[] children = new XmlNode [result.Count];
+        for (int i = 0; i < result.Count; i++) {
+            children[i] = (XmlNode)result[i];
+        }
+        return children;
+    }
+
+    // Get the first child named `name'
+    private static XmlNode GetChild(XmlNode parent, string name)
+    {
+        return parent[name];
+    }
+
+    // Get end node along a path of first matches
+    private static XmlNode GetDescendant(XmlNode root, string [] path)
+    {
+        XmlNode parent = root;
+
+        foreach (string pathelement in path) {
+            parent = GetChild(parent, pathelement);
+            if (parent == null) {
+                return null;
+            }
+        }
+        return parent;
+    }
+
+    // Get the named attribute if it exists.
+    private static string GetAttribute(XmlNode node, string attrib)
+    {
+        XmlAttribute xa = node.Attributes[attrib];
+        return xa != null ? xa.Value : null;
+    }
+
+    private static string GetAttribute(XmlNode node, string attrib, string value)
+    {
+        XmlAttribute xa = node.Attributes[attrib];
+        return xa != null ? xa.Value : value;
+    }
+
+    private static int GetAttribute(XmlNode node, string attrib, int value)
+    {
+        XmlAttribute xa = node.Attributes[attrib];
+        return xa != null ? Int32.Parse(xa.Value) : value;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    // return true if the node's name is in names.
+    private bool TestNodeIs(XmlNode node, string [] names)
+    {
+        foreach (string name in names) {
+            if (node.Name == name) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    // [TODO] this attribute create code should be in a function!
+    // add a DriverCategory node into the <drivers>
+    private void AddDriverNode(string name, string path,
+                               string signature, string iclass,
+                               ArrayList values)
+    {
+        // create the new node
+        XmlNode driver = AddElement(null, "driver");
+
+        // set its name, signature, and path
+        AddAttribute(driver, "name", name);
+        AddAttribute(driver, "signature", signature);
+        AddAttribute(driver, "path", path);
+        if (iclass != "") {
+            AddAttribute(driver, "class", iclass);
+        }
+
+        // add any enumerates via copy.
+        foreach (XmlNode node in values) {
+            driver.AppendChild(node.CloneNode(true));
+        }
+
+        // and insert this node into the registry:
+        drivers.AppendChild(driver);
+    }
+
+    // given a driverCategory that potentially has many device signatures, split
+    // it by device and create an entry in the drivers for each device
+    private void CreateRegistryEntriesFromCategory(XmlNode category,
+                                                   string name,
+                                                   string path)
+    {
+        ArrayList values = new ArrayList();
+
+        // first parse the entries in the driver category to fill out the
+        // Endpoint, FixedHardware, and DynamicHardware sets
+        string iclass = GetAttribute(category, "class", "");
+
+        // now populate these with children based on a few basic matching rules
+        foreach (XmlNode node in category.ChildNodes) {
+            if (node.Name == "enumerates" ||
+                node.Name == "endpoints" ||
+                node.Name == "fixedHardware" ||
+                node.Name == "dynamicHardware" ||
+                node.Name == "configs") {
+                values.Add(AddImported(null, node, true));
+            }
+            else if (node.Name != "device") {
+                //
+            }
+        }
+
+        // get every device signature in this driver category
+        XmlNode[] signatureTags = GetChildren(category, "device");
+
+        // there's a chance (for example, with the Hal) that there are no
+        // signatures.  In this case, we process the category once, with a null
+        // signature
+        if (signatureTags.Length == 0) {
+            AddDriverNode(name, path, "", iclass, values);
+        }
+        else {
+            foreach (XmlNode signature in signatureTags) {
+                string value = GetAttribute(signature, "signature", "");
+                AddDriverNode(name, path, value, iclass, values);
+            }
+        }
+    }
+
+    // This is the main method for creating a driver registry.
+    public void CreateDriverRegistry()
+    {
+        foreach (DictionaryEntry de in manifestFiles) {
+            string filename = (string) de.Key;
+            if (filename.EndsWith(".manifest")) {
+                // get the manifest as an Xml document
+                XmlDocument manifestDoc = new XmlDocument();
+                manifestDoc.Load(filename);
+
+                XmlNode application = GetChild(manifestDoc, "application");
+
+                // Read the name and path from the manifest
+                string name = GetAttribute(application, "name");
+
+                // Console.WriteLine("{0}:", filename);
+                foreach (XmlNode process in GetChildren(application, "process")) {
+                    string path = GetAttribute(process, "path", "");
+
+                    foreach (XmlNode categories in GetChildren(process, "categories")) {
+                        foreach (XmlNode category in GetChildren(categories, "category")) {
+                            if (GetAttribute(category, "name") != "driver") {
+                                continue;
+                            }
+
+                            string iclass = GetAttribute(category, "class", "");
+
+                            // now process all DriverCategories
+                            CreateRegistryEntriesFromCategory(category, name, path);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private bool NamesMatch(string target, string prefix, bool isPrefix)
+    {
+        int len = isPrefix ? prefix.Length :
+            (target.Length > prefix.Length ? target.Length : prefix.Length);
+
+        return (String.Compare(target, 0, prefix, 0, len, true) == 0);
+    }
+
+
+    // Remove unwanted drivers from the rot using the policy.
+    private void RemoveNodes(XmlNode root, XmlNode policy)
+    {
+        foreach (XmlNode rule in policy.ChildNodes) {
+            string attrName = "";
+            string attrVal = "";
+            bool isPrefix = false;
+
+            if (rule.Name == "driver") {
+                attrName = "name";
+            }
+            else if (rule.Name == "device") {
+                attrName = "signature";
+                isPrefix = true;
+            }
+            else {
+                continue;
+            }
+            ArrayList removals = new ArrayList();
+            attrVal = GetAttribute(rule, attrName);
+            foreach (XmlNode candidate in root.ChildNodes) {
+                string target = GetAttribute(candidate, attrName);
+
+                if (NamesMatch(target, attrVal, isPrefix)) {
+                    removals.Add(candidate);
+                }
+            }
+            foreach (XmlNode oldnode in removals) {
+                root.RemoveChild(oldnode);
+            }
+        }
+    }
+
+    // in addition, we use the imperative mechanism to create the "follows"
+    // ordering, which lets us specify a more total order on the initialization
+    // of drivers
+    private void ApplyOrdering(XmlNode root, XmlNode policy)
+    {
+        foreach (XmlNode rule in policy.ChildNodes) {
+            string signature = GetAttribute(rule, "signature");
+            string name = GetAttribute(rule, "name");
+            foreach (XmlNode candidate in root.ChildNodes) {
+                string candidatesignature = GetAttribute(candidate, "signature");
+                if (candidatesignature.StartsWith(signature)) {
+                    XmlNode tag = AddElement(candidate, rule.Name);
+                    AddAttribute(tag, "name", name);
+                }
+            }
+        }
+    }
+
+    // and this is the master method for applying the imperative policy
+    private void ApplyPolicyToRegistry()
+    {
+        // get its driversConfig:
+        XmlNode policy = GetChild(systemPolicy, "driverRegistryConfig");
+
+        // go through each imperative command
+        foreach (XmlNode child in policy.ChildNodes) {
+            if (child.Name == "remove") {
+                RemoveNodes(drivers, child);
+            }
+            else if (child.Name == "ordering") {
+                ApplyOrdering(drivers, child);
+            }
+        }
+    }
+
+    // This prints the distribution manifest when all is done
+    public void PrintManifestFile()
+    {
+        XmlTextWriter w = new XmlTextWriter(outFilePath,
+                                            System.Text.Encoding.UTF8);
+        w.Formatting = Formatting.Indented;
+        systemManifest.Save(w);
+        w.Close();
+    }
+
+    // [TODO] there ought to be some policy that decides what should
+    //                  to in the distribution, but for now we just take as
+    //                  input a list of files that have been built, and assume
+    //                  it is the output of this alluded-to step
+
+    // Every file in the distro must be added to a list, both so that the file
+    // can be added to SingBoot.ini, and so that it can have a filename
+    // associated with it in the namespace
+    private void AddFileNode(string pathName, int index, bool visible,
+                             int manifestIndex)
+    {
+        XmlNode node = AddElement(null, "file");
+
+        // get values for all the attributes of this file:
+        bool isExecutable = pathName.EndsWith(".x86");
+        bool isManifest = pathName.EndsWith(".manifest");
+
+        string [] nameSet = pathName.Split('\\');
+        string shortName = nameSet[nameSet.Length - 1].ToLower();
+        string distroName = pathName.Remove(0, distroDirectoryName.Length);
+        distroName = distroName.Replace('\\', '/');
+
+        // add the attributes:
+        AddAttribute(node, "distroName", distroName);
+        AddAttribute(node, "name", shortName);
+        AddAttribute(node, "id", index.ToString());
+
+        if (isExecutable) {
+            AddAttribute(node, "executable", "true");
+            if (manifestIndex > 2) {
+                AddAttribute(node, "manifestId", manifestIndex.ToString());
+            }
+        }
+        else if (isManifest) {
+            AddAttribute(node, "manifest", "true");
+        }
+
+        // add the file to the master file list
+        fileList.AppendChild(node);
+    }
+
+    // This calls the above method to populate the fileList with all files that
+    // are to be included in the distribution
+    private void BuildFileList()
+    {
+        int position = 2;
+
+        // first of all, let's set the kernel.dmp and output manifest file
+        // entries
+        string kernelPath = null;
+        foreach (DictionaryEntry de in otherFiles) {
+            string filename = (string) de.Key;
+            if (filename.EndsWith("\\" + kernelFileName)) {
+                kernelPath = filename;
+                break;
+            }
+        }
+        AddFileNode(kernelPath, 0, false, -1);
+        AddFileNode(outFilePath, 1, false, -1);
+
+        // now let's build the file list:
+        // get the policy on what goes in the bootscript
+        XmlNode policy = GetDescendant(systemPolicy, new string[] {"bootScript",
+                                                                   "folders"});
+        foreach (XmlNode rule in policy.ChildNodes) {
+            if (rule.Name != "folder") {
+                continue;
+            }
+            string folder = GetAttribute(rule, "name");
+            foreach (DictionaryEntry de in applicationFiles) {
+                string applicationName = (string) de.Key;
+                int substitutePosition = applicationName.LastIndexOf (".x86");
+                string manifestName = applicationName.Substring(0,substitutePosition)
+                                                             + ".manifest";
+                string shortAppName =
+                    applicationName.Replace(distroDirectoryName, "");
+                if (shortAppName.StartsWith("\\" + folder)) {
+                    if (manifestFiles.ContainsKey(manifestName)) {
+                        AddFileNode(applicationName, position, true,
+                                    ++position);
+                        AddFileNode(manifestName, position, true, -1);
+                    }
+                    else {
+                        AddFileNode(applicationName, position, true, -1);
+                    }
+                    position++;
+                }
+            }
+            foreach (DictionaryEntry de in otherFiles) {
+                string fileName = (string) de.Key;
+                string shortFileName = fileName.Replace(distroDirectoryName,
+                                                        "");
+                if (shortFileName.StartsWith("\\" + folder) &&
+                    !shortFileName.EndsWith(kernelFileName)) {
+                    AddFileNode(fileName, position++, true, -1);
+                }
+            }
+            // NB - we don't copy a manifest unless we've associated it with an
+            // app
+        }
+    }
+
+    // Given only a list of drivers, a list of files, and some policy, we need
+    // to create a system manifest.  This is how we do it for now.
+    public void InstallPolicies()
+    {
+        // build the file list that goes into the manifest
+        BuildFileList();
+
+        // set up the initConfig tag and append the file list to it
+        XmlNode initConfig = GetChild(systemPolicy, "initConfig");
+        XmlNode newInitConfig = systemManifest.ImportNode(initConfig, true);
+        newInitConfig.AppendChild(fileList);
+
+        // get the namingConventions
+        XmlNode namingConventions = GetChild(systemPolicy, "namingConventions");
+        XmlNode newNaming = systemManifest.ImportNode(namingConventions, true);
+
+        // get process grouping data
+        XmlNode processConfig = GetChild(systemPolicy, "processConfig");
+        XmlNode newProcessConfig = null;
+        if (processConfig != null) {
+            newProcessConfig = systemManifest.ImportNode(processConfig, true);
+        }
+
+        // get service configurations
+        XmlNode serviceConfig = GetChild(systemPolicy, "serviceConfig");
+        XmlNode newServiceConfig = systemManifest.ImportNode(serviceConfig,
+                                                             true);
+
+        // apply the imperative policy to the Driver Registry (this prunes it)
+        ApplyPolicyToRegistry();
+
+        // add everything to the manifest
+        manifestRoot.AppendChild(drivers);
+        manifestRoot.AppendChild(newNaming);
+        manifestRoot.AppendChild(newServiceConfig);
+        if (newProcessConfig != null) {
+            manifestRoot.AppendChild(newProcessConfig);
+        }
+        manifestRoot.AppendChild(newInitConfig);
+    }
+
+    // When everything is set, we still need the Singboot.ini
+    // file.  This is how we make it:
+    public void MakeIniFile(string distrodir)
+    {
+        StreamWriter stream = new StreamWriter(iniFileName, false);
+
+        string ruler = "########################################";
+        stream.WriteLine(ruler);
+        stream.WriteLine("# SingBoot.ini");
+        stream.WriteLine("# Build Date: {0}", System.DateTime.Now.ToString());
+        stream.WriteLine(ruler);
+
+        MD5 md5 = MD5.Create();
+
+        foreach (XmlNode file in fileList) {
+            string installedFileName = GetAttribute(file, "distroName");
+            string originalFileName =
+                distrodir + installedFileName.Replace("/", "\\");
+
+            FileInfo fileInfo = new FileInfo(originalFileName);
+            using (FileStream fs = fileInfo.OpenRead()) {
+                byte [] hash = md5.ComputeHash(fs);
+                stream.Write("Hash-MD5=");
+                foreach (byte b in hash) {
+                    stream.Write("{0:x2}", b);
+                }
+            }
+
+            stream.WriteLine(" Size={0} Path={1}",
+                             fileInfo.Length, installedFileName);
+        }
+        // NB Trailing ruler helps identify the end of file
+        stream.WriteLine(ruler);
+        stream.Close();
+    }
+
+    // Print the correct command line args for the program
+    static void PrintUsage()
+    {
+        Console.WriteLine(
+            "Usage:\n" +
+            "    distrobuilder [options]\n" +
+            "Options:\n" +
+            "    /dir:<path>         - Set distribution root directory\n" +
+            "    /out:<file>         - Set name of output system manifest.\n" +
+            "    /policy:<file>      - Set input system policy file.\n" +
+            "    /desc:<desc>        - Distribution description.\n" +
+            "    /ini:<ini>          - Set output boot.ini file.\n" +
+            "Summary:\n" +
+            "    Builds a system manifest for a collection of application manifests and\n" +
+            "    a file list..\n" +
+            "");
+    }
+
+    // main entry point:
+    static void Main(string[] args)
+    {
+        string outfile = null;
+        string policyfile = null;
+        string distrodir = null;
+        string distrodesc = null;
+        string inifile = null;
+
+        // parse the cmdline
+        foreach (string arg in args) {
+            if (arg.StartsWith("/dir:")) {
+                distrodir = arg.Remove(0,5);
+            }
+            else if (arg.StartsWith("/out:")) {
+                outfile = arg.Remove(0,5);
+            }
+            else if (arg.StartsWith("/policy:")) {
+                policyfile = arg.Remove(0,8);
+            }
+            else if (arg.StartsWith("/desc:")) {
+                distrodesc = arg.Remove(0,6);
+            }
+            else if (arg.StartsWith("/ini:")) {
+                inifile = arg.Remove(0,5);
+            }
+        }
+
+        if (policyfile == null || outfile == null || distrodesc == null ||
+            distrodir == null  || inifile == null) {
+            Console.WriteLine("Error - Invalid Command Line");
+            PrintUsage();
+            return;
+        }
+
+        // check all input files
+        if (!File.Exists(policyfile)) {
+            Console.WriteLine("Error:  file '{0}' not found\n", policyfile);
+            return;
+        }
+        if (!File.Exists(distrodesc)) {
+            Console.WriteLine("Error:  file '{0}' not found\n", distrodesc);
+            return;
+        }
+        if (!Directory.Exists(distrodir)) {
+            Console.WriteLine("Error:  directory '{0}' not found\n", distrodir);
+            return;
+        }
+
+        DistroBuilder p = new DistroBuilder(
+            policyfile, outfile, inifile, distrodir, distrodesc);
+
+        // first aggregate all drivers into a <DriverRegistry>
+        p.CreateDriverRegistry();
+        // now apply policy to the system config
+        p.InstallPolicies();
+        // then output the manifest
+        p.PrintManifestFile();
+        // lastly make the ini file
+        p.MakeIniFile(distrodir);
+    }
+}
diff --git a/base/Windows/DistroBuilder/DistroBuilder.csproj b/base/Windows/DistroBuilder/DistroBuilder.csproj
new file mode 100644
index 0000000..4b8ec62
--- /dev/null
+++ b/base/Windows/DistroBuilder/DistroBuilder.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Note:   
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>DistroBuilder</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DistroBuilder.cs"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/DistroBuilder/Makefile b/base/Windows/DistroBuilder/Makefile
new file mode 100644
index 0000000..b849518
--- /dev/null
+++ b/base/Windows/DistroBuilder/Makefile
@@ -0,0 +1,46 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\DistroBuilder\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 
+
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\DistroBuilder.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\DistroBuilder.exe
+    $(SDEDIT) ..\..\build\DistroBuilder.*
+    $(COPY) $(OBJDIR)\DistroBuilder.exe ..\..\build
+    $(COPY) $(OBJDIR)\DistroBuilder.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\DistroBuilder.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = /reference:System.Xml.dll /reference:System.dll
+
+SOURCE_FILES = DistroBuilder.cs
+
+##############################################################################
+
+$(OBJDIR)\DistroBuilder.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\DistroBuilder.exe $**
diff --git a/base/Windows/ETS/README.txt b/base/Windows/ETS/README.txt
new file mode 100644
index 0000000..b39e0a7
--- /dev/null
+++ b/base/Windows/ETS/README.txt
@@ -0,0 +1,186 @@
+Event Tracing for Singularity (ETS)
+-----------------------------------
+
+* What 
+
+Lightweight event tracing for performance monitoring and debugging.
+
+
+* How
+
+Just like ETW (Event Tracing for Windows):
+http://msdn.microsoft.com/library/default.asp?url=/library/en-us/perfmon/base/event_tracing.asp
+
+Events are posted from all over the codebase by using calls of the
+form:
+
+Monitoring.Log(PROVIDER, TYPE, ARGs...)
+
+This logs an event to a circular buffer in kernel memory.  Currently
+this is 4MB, split into 3MB for regular events and 1MB for text
+strings.  Size is controlled by MONITORING_BUFFER_SIZE etc in
+Kernel/Native/Monitoring.cpp
+
+PROVIDER is a member of the Monitoring.Providers enum which allows
+several bits of code to post events without needing to negotiate
+unique event IDs.  Each provider defines their own event TYPEs (as
+ushorts), which are typically from an enum near the top of each
+provider's code, eg ThreadEvent in Thread.cs.
+
+A full listing of all providers together with their events is given in
+TMF format as "singularity.tmf" in this directory.  A thinned out set
+of events (mainly ignoring WaitHandle synchronisation) is documented
+in "singularity-lite.tmf".
+
+These files are used by the parser "mag_ets.exe" (in build/ directory)
+to decode the binary packed event format.
+
+Use Applications/Network/MonNet to export the current contexts of the
+kernel's log buffer out over the network to your workstation (eg
+10.99.99.1) for analysis and visualisation.
+
+
+* Sample usage
+
+Build, ie do an "msb" from:
+1. A distro such as Distro\BVT.proj.
+2. Applications\Network
+3. Applications\Network\MonNet
+3b. <anything else you need>
+4. Distro
+
+Run:
+1. Boot singularity
+1b. run your experiment
+2. netstack &
+3. ipconfig /dev/nic0 10.99.99.2 255.255.255.0 10.99.99.1
+4. run netcat (or equivalent) on your workstation:
+     nc -l -p 5000 >justboot.ets  # ie listen for TCP connection on port 5000
+5. monnet 10.99.99.1 5000
+
+Analyse:
+1. To dump as CSV an .ets file:
+    mag_ets --tracerpt -t Windows\ETS\singularity.tmf -e justboot.ets -o justboot.csv
+
+Sample run:
+Parsing TMF ...
+    ... Windows\ETS\singularity.tmf
+...done
+Parsing Contract Message Tag mapfiles ...
+...done
+........................................................
+Stats:
+Processed 0 buffers, 56231 events
+Dropped 0 events, 64 unknown events
+Unknown event types (guid, version, type):
+('20', 0, 11) 64
+
+
+2. To parse .ets file for visualisation or request extraction:
+    mag_ets -t Windows\ETS\singularity-lite.tmf -c Contracts\obj\Debug.MarkSweep\__All.Contracts.tmf -e justboot.ets -o justboot.vis
+
+Sample run:
+Parsing TMF ...
+    ... ..\..\Windows\ETS\singularity-lite.tmf
+...done
+Parsing Contract Message Tag mapfiles ...
+    ... ..\..\Contracts\obj\Debug.MarkSweep\__All.Contracts.tmf
+...done
+Writing visualisation output to justboot.vis
+.........................................Found Shell event: 'netstack &' at time
+: 1079855362440
+.........Found Shell event: 'ipconfig /dev/nic0 10.99.99.2 255.255.255.0 10.99.9
+9.1' at time: 1106483455418
+......
+Stats:
+Processed 0 buffers, 56231 events
+Dropped 0 events, 13209 unknown events
+Unknown event types (guid, version, type):
+('12', 0, 2) 289
+('10', 0, 10) 3953
+('11', 0, 2) 5579
+('20', 0, 11) 64
+('13', 0, 2) 9
+('11', 0, 1) 31
+('9', 0, 2) 89
+('9', 0, 1) 3195
+Found Shell event: 'monnet 10.99.99.1 5000' at time: 1121610922437
+Found 0 requests
+
+
+3. to visualise .vis file:
+    magpyvis justboot.vis
+   See below for mini-guide to magpyvis.
+
+
+If you have events related to private contracts, you will need to
+manually generate a .tmf file to describe it.  If you built the
+contract into a DLL, this can be done by going:
+  nmake FOO.tmf
+in the same directory as FOO.dll.  Then pass an extra "-c FOO.tmf"
+option to mag_ets when generating the .vis file.
+
+
+If you want to modify the parser or visualiser, you will need to have
+a working Python installation.  You can then download the latest
+version of the Magpie toolkit from:
+  http://teamemea/sites/cambridge/projects/magpie/
+
+
+* Contract names and message tag names
+
+The contract names are queried from the runtime type system by MonNet
+just before it dumps the .ets file over the network.  It does this in
+a really gorey manner by getting the typeof() all the contracts it
+knows about.  This clearly should be fixed, but needs support from the
+typesystem.
+
+The message names are got by running ILDASM over the contract DLLs
+just after they are built and using an awk script to generate .tmf
+from the Tags enum each contract has.  This needs a GAWK.EXE in your
+build/ directory, but at this time I am not checking one in.  There is
+a gawk.cmd placeholder reminding you of this which will be used
+instead of gawk.exe.
+
+
+* Mini-guide to magpievis
+
+On x-axis is time, on y-axis are various resources like threads, CPUs,
+IRQs, channels, waithandles.  Vertical lines are labelled events which
+happened at some time, and are bound to the resources they used. Fat
+blue lines join contract send and receive events together.
+
+Left-click near an event pops up a tooltip giving the event's
+timestamp, and all its attributes together with their binding mode
+(NONE, BASIC, START, STOP).  Left-click also sets the "current
+timestamp" to the location clicked.  Subsequent clicks will print to
+stdout the time delta between the previous and current clicks.
+
+The statusbar at the bottom shows: current timestamp, closest event
+summary, timerange visible (both in ms and timestamps).  All
+real-world time units rely on a valid SysInfo/CpuSpeed event in the
+.vis file header, and it is printed to stdout on startup so check it
+looks sane.
+
+Right-click on a timeline highlights it by drawing it in fat grey;
+click again to un-highlight.
+
+Left-click on PIDs or TIDs in the yellow legend area pops up a tooltip
+describing the containing PID and associated image name (assuming SysInfo
+events are available).
+
+Mouse-wheel-roll-up zooms the timescale in (event get wider appart),
+mouse-wheel-roll-down zooms the timescale out (events get closer
+together)
+
+The "Goto..." button pops up a modal dialog allowing you to search
+forwards from the "current timestamp" for the next named event, or the
+next event bound to a tid timeline.  It also allows you to jump to any
+absolute timestamp (eg cut-n-pasted from a logfile).  It beeps and
+prints a warning if a search fails; on success it scrolls the window
+to put the found event or timestamp just visible at the left-hand-side
+of the window.
+
+
+Austin Donnelly
+21 Apr 2006
diff --git a/base/Windows/ETS/singularity-lite.tmf b/base/Windows/ETS/singularity-lite.tmf
new file mode 100644
index 0000000..a044e43
--- /dev/null
+++ b/base/Windows/ETS/singularity-lite.tmf
@@ -0,0 +1,218 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//******************************************
+// Singularity Events
+//******************************************
+
+1 SysInfo
+#version 0
+#type CpuSpeed 1
+{
+    Hz, ItemLongLong
+}
+#type ContractName 2
+{
+    Tag, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+#type ProcessInfo 3
+{
+    Id, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+#type ThreadInfo 4
+{
+    Id, ItemULong
+    Pid, ItemULong
+}
+
+
+3 Cassini
+#version 0
+#type URI 1
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    URI, ItemString
+}
+
+5 Shell
+#version 0
+#type Command 1
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Text, ItemString
+}
+
+
+8 Endpoint
+#version 0
+#type Dispose           1
+{
+    ChannelId, ItemLong
+}
+#type Select            2
+{
+}
+#type RetrieveHook      6
+#type DeliverHook       7
+{
+    MessageTag, ItemLong
+    ChannelId, ItemLong
+    ContractTag, ItemULong
+}
+#type Notify           10
+{
+    ChannelId, ItemLong
+}
+
+
+
+14 EndpointCore
+#version 0
+
+#type Connect           4
+{
+    ChannelId, ItemLong    
+}
+#type TransferToProcess 5
+{
+    ChannelId, ItemLong    
+    DestPID, ItemULong
+}
+
+
+19 Process
+#version 0
+#type CreateKernelProcess 1
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+#type CreateUserProcess 2
+{
+    PID, ItemLong
+    ParentPID, ItemLong
+}
+#type ImageLoad 3
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+
+
+20 Thread
+#version 0
+#type SwitchTo  3
+#type CreateIdle    12
+#type Create        13
+{
+    DestTID, ItemULong
+}
+
+#type CreateInitial 10
+{
+}
+
+#type WaitAny      30    // block thread on a certain timeout
+#type WaitFail     31    // wait failed on a certain timeout
+{
+    Timeout, ItemLongLong
+    DestTID, ItemULong
+}
+
+
+21 DiskIo
+#version 0
+#type StartRead  0
+#type StartWrite 1
+#type EndRead    2
+#type EndWrite   3
+{
+    Sector, ItemULong
+    Length, ItemULong
+    DiskId, ItemULong
+    BufferAddr, ItemULong
+}
+
+#type NewDiskName 4
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+
+#type NewDiskId 5
+{
+    DiskId, ItemULong
+}
+
+23 Directory
+#version 0
+#type DoBind 1        
+#type DoGetAttributes  2 
+#type DoCreateDirectory  3
+#type DoCreateFile  4
+#type DoDeleteDirectory  5
+#type DoDeleteLink  6
+#type DoGetLinkValue  7
+#type DoCreateLink  8
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+
+25 GC
+#version 0
+#type StartStopTheWorld  1
+#type EndStopTheWorld  2
+#type StartCollection  3
+#type EndCollection  4
+{
+}
+
+30 Processor
+#version 0
+#type Exception 0
+{
+    Vector, ItemULong
+}
+
+#type Resume 1
+{
+    DestTID, ItemULong
+}
+
+#type Interrupt 2
+{
+    Irq, ItemULong
+}
diff --git a/base/Windows/ETS/singularity.tmf b/base/Windows/ETS/singularity.tmf
new file mode 100644
index 0000000..850f9a9
--- /dev/null
+++ b/base/Windows/ETS/singularity.tmf
@@ -0,0 +1,277 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//******************************************
+// Singularity Events
+//******************************************
+
+1 SysInfo
+#version 0
+#type CpuSpeed 1
+{
+    Hz, ItemLongLong
+}
+#type ContractName 2
+{
+    Tag, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+#type ProcessInfo 3
+{
+    Id, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+#type ThreadInfo 4
+{
+    Id, ItemULong
+    Pid, ItemULong
+}
+
+3 Cassini
+#version 0
+#type URI 1
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    URI, ItemString
+}
+
+5 Shell
+#version 0
+#type Command 1
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Text, ItemString
+}
+
+
+8 Endpoint
+#version 0
+#type Dispose           1
+{
+    ChannelId, ItemLong
+}
+#type Select            2
+{
+}
+#type RetrieveHook      6
+#type DeliverHook       7
+{
+    MessageTag, ItemLong
+    ChannelId, ItemLong
+    ContractTag, ItemULong
+}
+#type Notify           10
+{
+    ChannelId, ItemLong
+}
+
+
+9 ChannelService
+#version 0
+#type TransferBlockOwnership 1
+{
+    ChannelId, ItemLong
+    DestPID, ItemULong
+}
+#type TransferContentOwnership 2
+{
+    FromPID,       ItemULong
+    DestPID,       ItemULong
+    ChannelIdFrom, ItemLong
+    ChannelIdTo,   ItemLong
+    ChannelIdPeer, ItemLong
+}
+
+
+10 WaitHandle
+#version 0
+#type WaitDone 10
+{
+    HandleID, ItemLong
+    TID, ItemULong
+}
+
+
+11 AutoResetEvent
+#version 0
+
+#type Acquire 1
+#type Enqueue 2
+{
+    HandleID, ItemLong
+    TID, ItemULong
+}
+
+
+12 Mutex
+#version 0
+
+#type AcquireAgain 1
+#type Acquire 2
+#type Enqueue 3
+{
+{
+    HandleID, ItemLong
+    DestTID, ItemULong
+}
+
+
+13 ManuelResetEvent
+#version 0
+
+#type Acquire 1
+#type Enqueue 2
+{
+    HandleID, ItemLong
+    DestTID, ItemULong
+}
+
+
+14 EndpointCore
+#version 0
+
+#type Connect           4
+{
+    ChannelId, ItemLong    
+}
+#type TransferToProcess 5
+{
+    ChannelId, ItemLong    
+    DestPID, ItemULong
+}
+
+
+19 Process
+#version 0
+#type CreateKernelProcess 1
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+#type CreateUserProcess 2
+{
+    PID, ItemLong
+    ParentPID, ItemLong
+}
+#type ImageLoad 3
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+
+
+20 Thread
+#version 0
+#type SwitchTo  3
+#type CreateIdle    12
+#type Create        13
+{
+    DestTID, ItemULong
+}
+
+#type CreateInitial 10
+{
+}
+
+#type WaitAny      30    // block thread on a certain timeout
+#type WaitFail     31    // wait failed on a certain timeout
+{
+    Timeout, ItemLongLong
+    DestTID, ItemULong
+}
+
+
+21 DiskIo
+#version 0
+#type StartRead  0
+#type StartWrite 1
+#type EndRead    2
+#type EndWrite   3
+{
+    Sector, ItemULong
+    Length, ItemULong
+    DiskId, ItemULong
+    BufferAddr, ItemULong
+}
+
+#type NewDiskName 4
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+
+#type NewDiskId 5
+{
+    DiskId, ItemULong
+}
+
+23 Directory
+#version 0
+#type DoBind 1        
+#type DoGetAttributes  2 
+#type DoCreateDirectory  3
+#type DoCreateFile  4
+#type DoDeleteDirectory  5
+#type DoDeleteLink  6
+#type DoGetLinkValue  7
+#type DoCreateLink  8
+{
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Dummy, ItemULong
+    Name, ItemString
+}
+
+25 GC
+#version 0
+#type StartStopTheWorld  1
+#type EndStopTheWorld  2
+#type StartCollection  3
+#type EndCollection  4
+{
+}
+
+30 Processor
+#version 0
+#type Exception 0
+{
+    Vector, ItemULong
+}
+
+#type Resume 1
+{
+    DestTID, ItemULong
+}
+
+#type Interrupt 2
+{
+    Irq, ItemULong
+}
diff --git a/base/Windows/GrabSector/Makefile b/base/Windows/GrabSector/Makefile
new file mode 100644
index 0000000..c6863c4
--- /dev/null
+++ b/base/Windows/GrabSector/Makefile
@@ -0,0 +1,58 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\GrabSector\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\grabsector.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\grabsector.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+install: $(OBJDIR) $(OBJDIR)\grabsector.exe
+    $(SDEDIT) ..\..\build\grabsector.*
+    $(COPY) $(OBJDIR)\grabsector.exe ..\..\build
+    $(COPY) $(OBJDIR)\grabsector.pdb ..\..\build
+
+##############################################################################
+
+CFLAGS=$(CFLAGS) /I..\inc \
+    /Fd$(OBJDIR)\grabsector.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+     user32.lib     \
+     kernel32.lib   \
+     advapi32.lib   \
+     libcmt.lib     \
+
+##############################################################################
+
+
+{.}.cpp{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##########################################################################
+
+$(OBJDIR)\grabsector.obj: grabsector.cpp
+
+OBJS = \
+    $(OBJDIR)\grabsector.obj \
+
+$(OBJDIR)\grabsector.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
diff --git a/base/Windows/GrabSector/grabsector.cpp b/base/Windows/GrabSector/grabsector.cpp
new file mode 100644
index 0000000..cd02385
--- /dev/null
+++ b/base/Windows/GrabSector/grabsector.cpp
@@ -0,0 +1,386 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// utility to read/write bootsectors
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#define UNICODE
+#define _UNICODE
+#define _WIN32_WINNT 0x500
+
+#include <winlean.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+// do a raw read from pwzDisk to pbBuffer of dwBytes bytes, starting at dwOffset
+int ReadRaw(PCWSTR pwzDisk, PBYTE pbBuffer, DWORD dwOffset, DWORD dwBytes)
+{
+    DWORD cbRead;
+    LARGE_INTEGER liPos;
+    HANDLE hDisk = CreateFile(pwzDisk,                  // drive to open
+                              GENERIC_READ,             // no access to the drive
+                              FILE_SHARE_READ |         // share mode
+                              FILE_SHARE_WRITE,
+                              NULL,                     // default security attributes
+                              OPEN_EXISTING,            // disposition
+                              FILE_FLAG_NO_BUFFERING,   // attributes
+                              NULL);                    // do not copy file attributes
+
+    if (hDisk == INVALID_HANDLE_VALUE) // cannot open the drive
+    {
+        printf("CreateFile failed: %d\n", GetLastError());
+        return 1;
+    }
+
+    liPos.QuadPart = dwOffset;
+    SetFilePointerEx(hDisk, liPos, NULL, FILE_BEGIN);
+
+    if (!ReadFile(hDisk, pbBuffer, dwBytes, &cbRead, NULL)) {
+        printf("ReadFile failed: %d\n", GetLastError());
+        return 1;
+    }
+    CloseHandle(hDisk);
+    return 0;
+}
+
+// print a buffer
+void DisplayBuffer(PBYTE pbBuffer, DWORD dwOffset, DWORD dwBytes)
+{
+    static const int MaxLineWidth = 16;
+
+    for (DWORD i = 0; i < dwBytes; i += MaxLineWidth){
+        printf("%08x: ", dwOffset + i);
+
+        DWORD dwLineWidth = dwBytes - i;
+        if (dwLineWidth > MaxLineWidth) {
+            dwLineWidth = MaxLineWidth;
+        }
+
+        DWORD j;
+        for (j = 0; j < dwLineWidth; j++) {
+            printf("%02x ", pbBuffer[dwOffset + i + j]);
+        }
+        for (; j < MaxLineWidth + 1; j++) {
+            printf("   ");
+        }
+        for (j = 0; j < dwLineWidth; j++) {
+            BYTE c = pbBuffer[dwOffset + i + j];
+            if (c < 31 || c > 126) {
+                c = '.';
+            }
+            printf("%c", c);
+        }
+        printf("\n");
+    }
+}
+
+// Write a file - this forces create, and is thus inappropriate for direct disk access
+int WriteRawCreate(PCWSTR pwzFile, PBYTE pbBuffer, DWORD dwOffset, DWORD dwBytes)
+{
+    DWORD cbRead;
+
+    HANDLE hFile = CreateFile(pwzFile,                  // drive to open
+                              GENERIC_WRITE | GENERIC_READ,
+                              NULL,
+                              NULL,                     // default security attributes
+                              CREATE_ALWAYS,            // disposition
+                              FILE_FLAG_NO_BUFFERING,   // attributes
+                              NULL);                    // do not copy file attributes
+
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        printf("CreateFile failed: %d\n", GetLastError());
+        return 1;
+    }
+
+    if (!WriteFile(hFile, pbBuffer, dwBytes, &cbRead, NULL)) {
+        printf("WriteFile failed: %d\n", GetLastError());
+        return 1;
+    }
+    return 0;
+}
+
+// exact same as above, except with OPEN_EXISTING, so that it is appropriate
+// for writing a bootsector direct to a disk
+int WriteRaw(PCWSTR pwzFile, PBYTE pbBuffer, DWORD dwOffset, DWORD dwBytes)
+{
+    DWORD cbRead;
+
+    HANDLE hFile = CreateFile(pwzFile,                  // drive to open
+                              GENERIC_WRITE | GENERIC_READ,
+                              NULL,
+                              NULL,                     // default security attributes
+                              OPEN_EXISTING,            // disposition
+                              FILE_FLAG_NO_BUFFERING,   // attributes
+                              NULL);                    // do not copy file attributes
+
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        printf("CreateFile failed: %d\n", GetLastError());
+        return 1;
+    }
+
+    if (!WriteFile(hFile, pbBuffer, dwBytes, &cbRead, NULL)) {
+        printf("WriteFile failed: %d\n", GetLastError());
+        return 1;
+    }
+    return 0;
+}
+
+static inline bool IsPowerOfTwo(DWORD dwValue)
+{
+    return ((dwValue - 1) & dwValue) == 0;
+}
+
+static inline WORD GetLE16(PBYTE pbBuffer, DWORD dwOffset)
+{
+    return (WORD)pbBuffer[dwOffset] + (((WORD)pbBuffer[dwOffset + 1]) << 8);
+}
+
+static inline DWORD GetLE32(PBYTE pbBuffer, DWORD dwOffset)
+{
+    return ((DWORD)pbBuffer[dwOffset] +
+            (((DWORD)pbBuffer[dwOffset + 1]) << 8) +
+            (((DWORD)pbBuffer[dwOffset + 2]) << 16) +
+            (((DWORD)pbBuffer[dwOffset + 3]) << 24));
+}
+
+static int GetFatVersion(PBYTE pbBuffer, DWORD dwBytes)
+{
+    if (!IsPowerOfTwo(dwBytes) || dwBytes < 512 ||
+        GetLE16(pbBuffer, 510) != 0xaa55) {
+        return 0;
+    }
+
+    // These strings mean *nothing* with regard to actual FAT
+    // type - they are just valid signatures.
+    if (strncmp((const char*)(pbBuffer + 52), "FAT      ", 8) &&
+        strncmp((const char*)(pbBuffer + 52), "FAT12    ", 8) &&
+        strncmp((const char*)(pbBuffer + 52), "FAT16    ", 8) &&
+        strncmp((const char*)(pbBuffer + 82), "FAT32    ", 8)) {
+        return 0;
+    }
+
+    // Calculate number of clusters to determine FAT type per
+    // page 14 of FAT spec.
+    DWORD dwBytesPerSector      = GetLE16(pbBuffer, 11);
+    DWORD dwSectorsPerCluster   = (DWORD)pbBuffer[13];
+    DWORD dwReservedSectorCount = GetLE16(pbBuffer, 14);
+    DWORD dwNumberOfFats        = (DWORD)pbBuffer[16];
+    DWORD dwRootEntryCount      = GetLE16(pbBuffer, 17);
+
+    DWORD dwRootDirSectors =
+        ((dwRootEntryCount * 32) + (dwBytesPerSector - 1)) / dwBytesPerSector;
+
+    DWORD dwFatSize      = 0;
+    DWORD dwTotalSectors = 0;
+
+    DWORD dwFatSize16 = GetLE16(pbBuffer, 22);
+    if (dwFatSize16 == 0) {
+        dwFatSize = GetLE32(pbBuffer, 36);
+    }
+    else {
+        dwFatSize = dwFatSize16;
+    }
+
+    DWORD dwTotalSectors16 = GetLE16(pbBuffer, 19);
+    if (dwTotalSectors16 == 0) {
+        dwTotalSectors = GetLE32(pbBuffer, 32);
+    }
+    else {
+        dwTotalSectors = dwTotalSectors16;
+    }
+
+    DWORD dwDataSectors = (dwTotalSectors -
+                           (dwReservedSectorCount +
+                            dwNumberOfFats * dwFatSize +
+                            dwRootDirSectors)
+                          );
+
+    DWORD dwCountOfClusters = dwDataSectors / dwSectorsPerCluster;
+
+    if (dwCountOfClusters < 4085) {
+        return 12;
+    }
+    else if (dwCountOfClusters < 65525) {
+        return 16;
+    }
+    else {
+        return 32;
+    }
+}
+
+// this copies the BPB from the oldbuffer to the newbuffer
+// so we don't trash the BPB when we write the new buffer
+BOOL MergeSectors(PBYTE pbOldBuffer,
+                  PBYTE pbBuffer,
+                  DWORD dwBytes,
+                  BOOL fCheckFatSanity)
+{
+    if (fCheckFatSanity) {
+        DWORD dwOldFat = GetFatVersion(pbOldBuffer, dwBytes);
+        DWORD dwNewFat = GetFatVersion(pbBuffer, dwBytes);
+        if (dwOldFat != dwNewFat) {
+            fprintf(stderr,
+                    "New boot sectors FAT version FAT differs (%d != %d).\n",
+                    dwNewFat, dwOldFat);
+            // We'll call it a pint then, shall we :-)
+            return FALSE;
+        }
+    }
+
+    // copy the BPB and BS from the old sector into the new
+    int preservebytes = pbBuffer[1] + 2;
+
+    for (int i = 3; i < preservebytes; i++) {
+        pbBuffer[i] = pbOldBuffer[i];
+    }
+    return TRUE;
+}
+
+int __cdecl wmain(int argc, WCHAR **argv)
+{
+    BOOL  fNeedHelp       = FALSE;
+    BOOL  fRead           = FALSE;
+    BOOL  fWrite          = FALSE;
+    BOOL  fDisplay        = FALSE;
+    BOOL  fNtldr          = FALSE;
+    BOOL  fCheckFat       = FALSE;
+    PBYTE pbBuffer;
+    PBYTE pbOldBuffer;
+    WCHAR wzPartition[64] = L"";
+    WCHAR wzFile[64] = L"";
+    WCHAR wzFile2[64] = L"";
+
+    if (argc==1){
+        fNeedHelp = TRUE;
+    }
+    else{
+        // first check the first param
+        if (argv[1][0] == '-' || argv[1][0] == '/'){
+            switch(argv[1][1]){
+                case 'd':
+                case 'D':
+                    fDisplay = TRUE;
+                    break;
+                case 'n':
+                case 'N':
+                    fNtldr = TRUE;
+                    break;
+                case 'r':
+                case 'R':
+                    fRead = TRUE;
+                    break;
+                case 'w':
+                case 'W':
+                    fWrite    = TRUE;
+                    fCheckFat = TRUE;
+                    break;
+                case 'x':
+                case 'X':
+                    fWrite    = TRUE;
+                    fCheckFat = FALSE;
+                    break;
+                default:
+                    fNeedHelp = TRUE;
+                    break;
+            }
+        }
+        else{
+            fNeedHelp = TRUE;
+        }
+    }
+
+    // verify parameter counts
+    if ((fDisplay && argc !=3) || (fRead && argc !=4) || (fWrite && argc !=4) || (fNtldr && argc !=5)){
+        fNeedHelp = TRUE;
+    }
+
+    if (fNeedHelp) {
+        printf(
+               "Usage:\n"
+               "    grabsector [options] {drive letter:} {file1} {file2}\n"
+               "Options:\n"
+               "    /d     --  Display bootsector from drive.\n"
+               "    /n     --  Create NTLDR-compatible bootsector file2 from drive and file1.\n"
+               "    /r     --  Read drive's bootsector, write to file1.\n"
+               "    /w     --  Write drive's bootsector from file1 to drive.\n"
+               "    /x     --  Write drive's bootsector from file1 to drive (no sanity check).\n"
+               "    /?     --  Display this help screen.\n"
+               "Advanced:\n"
+               "    To access the MBR directly, use PHYSICALDRIVE0 as the drive name.\n"
+               "Examples:\n"
+               "    grabsector /d c:\n"
+               "    grabsector /r c: bootsec.old \n"
+               "    grabsector /w c: bootsec.new \n"
+               "    grabsector /n c: bootsec.new bootsec.NT \n"
+               "    grabsector /d PHYSICALDRIVE0 \n"
+              );
+        return 1;
+    }
+    else{
+        pbBuffer = (PBYTE)VirtualAlloc(NULL, 512, MEM_COMMIT, PAGE_READWRITE);
+        if (pbBuffer == NULL) {
+            printf("VirtualAlloc failed: %d\n", GetLastError());
+            return 1;
+        }
+
+        wsprintf(wzPartition, L"\\\\.\\%ls", argv[2]);
+        if (fRead || fWrite || fNtldr)
+            wsprintf(wzFile, L"%ls", argv[3]);
+    }
+
+    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
+    printf("Disk: %ls\n", wzPartition);
+    printf("File: %ls\n", wzFile);
+    if (fDisplay) {
+        if(ReadRaw(wzPartition, pbBuffer, 0, 512)==0) {
+            DisplayBuffer(pbBuffer, 0, 512);
+        }
+    }
+    if (fRead){
+        if (ReadRaw(wzPartition, pbBuffer, 0, 512)==0)
+            WriteRawCreate(wzFile, pbBuffer, 0, 512);
+    }
+    if (fWrite){
+        // set up a buffer for the old bootsector
+        pbOldBuffer = (PBYTE)VirtualAlloc(NULL, 512, MEM_COMMIT, PAGE_READWRITE);
+        if (pbOldBuffer == NULL) {
+            printf("VirtualAlloc failed: %d\n", GetLastError());
+            return 1;
+        }
+        // get the old bootsector
+        if(ReadRaw(wzPartition, pbOldBuffer, 0, 512)!=0)
+            return -1;
+        // open the file
+        if (ReadRaw(wzFile, pbBuffer, 0, 512)!=0)
+            return -1;
+        // merge the file with the bootsector
+        if (MergeSectors(pbOldBuffer, pbBuffer, 512, fCheckFat)) {
+            WriteRaw(wzPartition, pbBuffer, 0, 512);
+        }
+    }
+    if (fNtldr){
+        // get the second filename
+        wsprintf(wzFile2, L"%ls", argv[4]);
+        // set up a buffer for the old bootsector
+        pbOldBuffer = (PBYTE)VirtualAlloc(NULL, 512, MEM_COMMIT, PAGE_READWRITE);
+        if (pbOldBuffer == NULL) {
+            printf("VirtualAlloc failed: %d\n", GetLastError());
+            return 1;
+        }
+        // get the old bootsector
+        if(ReadRaw(wzPartition, pbOldBuffer, 0, 512)!=0)
+            return -1;
+        // open the input file
+        if (ReadRaw(wzFile, pbBuffer, 0, 512)!=0)
+            return -1;
+        // merge the file with the bootsector
+        if (MergeSectors(pbOldBuffer, pbBuffer, 512, fCheckFat)) {
+            WriteRawCreate(wzFile2, pbBuffer, 0, 512);
+        }
+    }
+    return 0;
+}
diff --git a/base/Windows/Inc/BaseTsd.h b/base/Windows/Inc/BaseTsd.h
new file mode 100644
index 0000000..5ba365b
--- /dev/null
+++ b/base/Windows/Inc/BaseTsd.h
@@ -0,0 +1,331 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    basetsd.h
+
+Abstract:
+
+    Type definitions for the basic sized types.
+
+
+Revision History:
+
+--*/
+
+#ifndef _BASETSD_H_
+#define _BASETSD_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef signed char         INT8, *PINT8;
+typedef signed short        INT16, *PINT16;
+typedef signed int          INT32, *PINT32;
+typedef signed __int64      INT64, *PINT64;
+typedef unsigned char       UINT8, *PUINT8;
+typedef unsigned short      UINT16, *PUINT16;
+typedef unsigned int        UINT32, *PUINT32;
+typedef unsigned __int64    UINT64, *PUINT64;
+
+//
+// The following types are guaranteed to be signed and 32 bits wide.
+//
+
+typedef signed int LONG32, *PLONG32;
+
+//
+// The following types are guaranteed to be unsigned and 32 bits wide.
+//
+
+typedef unsigned int ULONG32, *PULONG32;
+typedef unsigned int DWORD32, *PDWORD32;
+
+#if !defined(_W64)
+#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#define _W64 __w64
+#else
+#define _W64
+#endif
+#endif
+
+//
+// The INT_PTR is guaranteed to be the same size as a pointer.  Its
+// size with change with pointer size (32/64).  It should be used
+// anywhere that a pointer is cast to an integer type. UINT_PTR is
+// the unsigned variation.
+//
+// __int3264 is intrinsic to 64b MIDL but not to old MIDL or to C compiler.
+//
+#if ( 501 < __midl )
+
+    typedef [public] __int3264 INT_PTR, *PINT_PTR;
+    typedef [public] unsigned __int3264 UINT_PTR, *PUINT_PTR;
+
+    typedef [public] __int3264 LONG_PTR, *PLONG_PTR;
+    typedef [public] unsigned __int3264 ULONG_PTR, *PULONG_PTR;
+
+#else  // midl64
+// old midl and C++ compiler
+
+#if defined(_WIN64)
+    typedef __int64 INT_PTR, *PINT_PTR;
+    typedef unsigned __int64 UINT_PTR, *PUINT_PTR;
+
+    typedef __int64 LONG_PTR, *PLONG_PTR;
+    typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
+
+    #define __int3264   __int64
+
+#else
+    typedef _W64 int INT_PTR, *PINT_PTR;
+    typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
+
+    typedef _W64 long LONG_PTR, *PLONG_PTR;
+    typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR;
+
+    #define __int3264   __int32
+
+#endif
+#endif // midl64
+
+//
+// HALF_PTR is half the size of a pointer it intended for use with
+// within structures which contain a pointer and two small fields.
+// UHALF_PTR is the unsigned variation.
+//
+
+#ifdef _WIN64
+
+#define ADDRESS_TAG_BIT 0x40000000000UI64
+
+typedef __int64 SHANDLE_PTR;
+typedef unsigned __int64 HANDLE_PTR;
+typedef unsigned int UHALF_PTR, *PUHALF_PTR;
+typedef int HALF_PTR, *PHALF_PTR;
+
+#if !defined(__midl)
+__inline
+unsigned long
+HandleToULong(
+    const void *h
+    )
+{
+    return((unsigned long) (ULONG_PTR) h );
+}
+
+__inline
+long
+HandleToLong(
+    const void *h
+    )
+{
+    return((long) (LONG_PTR) h );
+}
+
+__inline
+void *
+ULongToHandle(
+    const unsigned long h
+    )
+{
+    return((void *) (UINT_PTR) h );
+}
+
+
+__inline
+void *
+LongToHandle(
+    const long h
+    )
+{
+    return((void *) (INT_PTR) h );
+}
+
+
+__inline
+unsigned long
+PtrToUlong(
+    const void  *p
+    )
+{
+    return((unsigned long) (ULONG_PTR) p );
+}
+
+__inline
+unsigned int
+PtrToUint(
+    const void  *p
+    )
+{
+    return((unsigned int) (UINT_PTR) p );
+}
+
+__inline
+unsigned short
+PtrToUshort(
+    const void  *p
+    )
+{
+    return((unsigned short) (unsigned long) (ULONG_PTR) p );
+}
+
+__inline
+long
+PtrToLong(
+    const void  *p
+    )
+{
+    return((long) (LONG_PTR) p );
+}
+
+__inline
+int
+PtrToInt(
+    const void  *p
+    )
+{
+    return((int) (INT_PTR) p );
+}
+
+__inline
+short
+PtrToShort(
+    const void  *p
+    )
+{
+    return((short) (long) (LONG_PTR) p );
+}
+
+__inline
+void *
+IntToPtr(
+    const int i
+    )
+// Caution: IntToPtr() sign-extends the int value.
+{
+    return( (void *)(INT_PTR)i );
+}
+
+__inline
+void *
+UIntToPtr(
+    const unsigned int ui
+    )
+// Caution: UIntToPtr() zero-extends the unsigned int value.
+{
+    return( (void *)(UINT_PTR)ui );
+}
+
+__inline
+void *
+LongToPtr(
+    const long l
+    )
+// Caution: LongToPtr() sign-extends the long value.
+{
+    return( (void *)(LONG_PTR)l );
+}
+
+__inline
+void *
+ULongToPtr(
+    const unsigned long ul
+    )
+// Caution: ULongToPtr() zero-extends the unsigned long value.
+{
+    return( (void *)(ULONG_PTR)ul );
+}
+
+#endif // !_midl
+
+#else  // !_WIN64
+
+#define ADDRESS_TAG_BIT 0x80000000UL
+
+typedef unsigned short UHALF_PTR, *PUHALF_PTR;
+typedef short HALF_PTR, *PHALF_PTR;
+typedef _W64 long SHANDLE_PTR;
+typedef _W64 unsigned long HANDLE_PTR;
+
+#define HandleToULong( h ) ((ULONG)(ULONG_PTR)(h) )
+#define HandleToLong( h )  ((LONG)(LONG_PTR) (h) )
+#define ULongToHandle( ul ) ((HANDLE)(ULONG_PTR) (ul) )
+#define LongToHandle( h )   ((HANDLE)(LONG_PTR) (h) )
+#define PtrToUlong( p ) ((ULONG)(ULONG_PTR) (p) )
+#define PtrToLong( p )  ((LONG)(LONG_PTR) (p) )
+#define PtrToUint( p ) ((UINT)(UINT_PTR) (p) )
+#define PtrToInt( p )  ((INT)(INT_PTR) (p) )
+#define PtrToUshort( p ) ((unsigned short)(ULONG_PTR)(p) )
+#define PtrToShort( p )  ((short)(LONG_PTR)(p) )
+#define IntToPtr( i )    ((VOID *)(INT_PTR)((int)i))
+#define UIntToPtr( ui )  ((VOID *)(UINT_PTR)((unsigned int)ui))
+#define LongToPtr( l )   ((VOID *)(LONG_PTR)((long)l))
+#define ULongToPtr( ul ) ((VOID *)(ULONG_PTR)((unsigned long)ul))
+
+#endif // !_WIN64
+
+#define HandleToUlong(h)  HandleToULong(h)
+#define UlongToHandle(ul) ULongToHandle(ul)
+#define UlongToPtr(ul) ULongToPtr(ul)
+#define UintToPtr(ui)  UIntToPtr(ui)
+
+#define MAXUINT_PTR  (~((UINT_PTR)0))
+#define MAXINT_PTR   ((INT_PTR)(MAXUINT_PTR >> 1))
+#define MININT_PTR   (~MAXINT_PTR)
+
+#define MAXULONG_PTR (~((ULONG_PTR)0))
+#define MAXLONG_PTR  ((LONG_PTR)(MAXULONG_PTR >> 1))
+#define MINLONG_PTR  (~MAXLONG_PTR)
+
+#define MAXUHALF_PTR ((UHALF_PTR)~0)
+#define MAXHALF_PTR  ((HALF_PTR)(MAXUHALF_PTR >> 1))
+#define MINHALF_PTR  (~MAXHALF_PTR)
+
+//
+// SIZE_T used for counts or ranges which need to span the range of
+// of a pointer.  SSIZE_T is the signed variation.
+//
+
+typedef ULONG_PTR SIZE_T, *PSIZE_T;
+typedef LONG_PTR SSIZE_T, *PSSIZE_T;
+
+//
+// Add Windows flavor DWORD_PTR types
+//
+
+typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
+
+//
+// The following types are guaranteed to be signed and 64 bits wide.
+//
+
+typedef __int64 LONG64, *PLONG64;
+
+
+//
+// The following types are guaranteed to be unsigned and 64 bits wide.
+//
+
+typedef unsigned __int64 ULONG64, *PULONG64;
+typedef unsigned __int64 DWORD64, *PDWORD64;
+
+//
+// Thread affinity.
+//
+
+typedef ULONG_PTR KAFFINITY;
+typedef KAFFINITY *PKAFFINITY;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _BASETSD_H_
diff --git a/base/Windows/Inc/Dump.h b/base/Windows/Inc/Dump.h
new file mode 100644
index 0000000..5ad2af7
--- /dev/null
+++ b/base/Windows/Inc/Dump.h
@@ -0,0 +1,388 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Dump.h
+//
+//  Note:   Constants and types for kernel dump files.
+//
+
+#pragma warning(push)
+#pragma warning(disable : 4200) // don't warn about zero-sized array in struct/union
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define USERMODE_CRASHDUMP_SIGNATURE    'RESU'
+#define USERMODE_CRASHDUMP_VALID_DUMP32 'PMUD'
+#define USERMODE_CRASHDUMP_VALID_DUMP64 '46UD'
+
+typedef struct _USERMODE_CRASHDUMP_HEADER64 {
+    ULONG       Signature;
+    ULONG       ValidDump;
+    ULONG       MajorVersion;
+    ULONG       MinorVersion;
+    ULONG       MachineImageType;
+    ULONG       ThreadCount;
+    ULONG       ModuleCount;
+    ULONG       MemoryRegionCount;
+    ULONGLONG   ThreadOffset;
+    ULONGLONG   ModuleOffset;
+    ULONGLONG   DataOffset;
+    ULONGLONG   MemoryRegionOffset;
+    ULONGLONG   DebugEventOffset;
+    ULONGLONG   ThreadStateOffset;
+    ULONGLONG   VersionInfoOffset;
+    ULONGLONG   Spare1;
+} USERMODE_CRASHDUMP_HEADER64, *PUSERMODE_CRASHDUMP_HEADER64;
+
+typedef struct _CRASH_MODULE64 {
+    ULONGLONG   BaseOfImage;
+    ULONG       SizeOfImage;
+    ULONG       ImageNameLength;
+    CHAR        ImageName[0];
+} CRASH_MODULE64, *PCRASH_MODULE64;
+
+typedef struct _CRASH_THREAD64 {
+    ULONG       ThreadId;
+    ULONG       SuspendCount;
+    ULONG       PriorityClass;
+    ULONG       Priority;
+    ULONGLONG   Teb;
+    ULONGLONG   Spare0;
+    ULONGLONG   Spare1;
+    ULONGLONG   Spare2;
+    ULONGLONG   Spare3;
+    ULONGLONG   Spare4;
+    ULONGLONG   Spare5;
+    ULONGLONG   Spare6;
+} CRASH_THREAD64, *PCRASH_THREAD64;
+
+typedef struct _CRASHDUMP_VERSION_INFO {
+    int     IgnoreGuardPages;       // Whether we should ignore GuardPages or not
+    ULONG   PointerSize;            // 32, 64 bit pointers
+} CRASHDUMP_VERSION_INFO, *PCRASHDUMP_VERSION_INFO;
+
+//
+// usermode crash dump data types
+//
+#define DMP_EXCEPTION                 1 // obsolete
+#define DMP_MEMORY_BASIC_INFORMATION  2
+#define DMP_THREAD_CONTEXT            3
+#define DMP_MODULE                    4
+#define DMP_MEMORY_DATA               5
+#define DMP_DEBUG_EVENT               6
+#define DMP_THREAD_STATE              7
+#define DMP_DUMP_FILE_HANDLE          8
+
+//
+// Define the information required to process memory dumps.
+//
+
+
+typedef enum _DUMP_TYPES {
+    DUMP_TYPE_INVALID           = -1,
+    DUMP_TYPE_UNKNOWN           = 0,
+    DUMP_TYPE_FULL              = 1,
+    DUMP_TYPE_SUMMARY           = 2,
+    DUMP_TYPE_HEADER            = 3,
+    DUMP_TYPE_TRIAGE            = 4,
+} DUMP_TYPE;
+
+
+//
+// Signature and Valid fields.
+//
+
+#define DUMP_SIGNATURE32   ('EGAP')
+#define DUMP_VALID_DUMP32  ('PMUD')
+
+#define DUMP_SIGNATURE64   ('EGAP')
+#define DUMP_VALID_DUMP64  ('46UD')
+
+#define DUMP_SUMMARY_SIGNATURE  ('PMDS')
+#define DUMP_SUMMARY_VALID      ('PMUD')
+
+#define DUMP_SUMMARY_VALID_KERNEL_VA                     (1)
+#define DUMP_SUMMARY_VALID_CURRENT_USER_VA               (2)
+
+//
+//
+// NOTE: The definition of PHYISCAL_MEMORY_RUN and PHYSICAL_MEMORY_DESCRIPTOR
+// MUST be the same as in mm.h. The kernel portion of crashdump will
+// verify that these structs are the same.
+//
+
+typedef struct _PHYSICAL_MEMORY_RUN64 {
+    ULONG64 BasePage;
+    ULONG64 PageCount;
+} PHYSICAL_MEMORY_RUN64, *PPHYSICAL_MEMORY_RUN64;
+
+typedef struct _PHYSICAL_MEMORY_DESCRIPTOR64 {
+    ULONG NumberOfRuns;
+    ULONG64 NumberOfPages;
+    PHYSICAL_MEMORY_RUN64 Run[1];
+} PHYSICAL_MEMORY_DESCRIPTOR64, *PPHYSICAL_MEMORY_DESCRIPTOR64;
+
+
+typedef struct _UNLOADED_DRIVERS64 {
+    UNICODE_STRING64 Name;
+    ULONG64 StartAddress;
+    ULONG64 EndAddress;
+    LARGE_INTEGER CurrentTime;
+} UNLOADED_DRIVERS64, *PUNLOADED_DRIVERS64;
+
+#define MAX_UNLOADED_NAME_LENGTH 24
+
+typedef struct _DUMP_UNLOADED_DRIVERS64
+{
+    UNICODE_STRING64 Name;
+    WCHAR DriverName[MAX_UNLOADED_NAME_LENGTH / sizeof (WCHAR)];
+    ULONG64 StartAddress;
+    ULONG64 EndAddress;
+} DUMP_UNLOADED_DRIVERS64, *PDUMP_UNLOADED_DRIVERS64;
+
+typedef struct _DUMP_MM_STORAGE64
+{
+    ULONG Version;
+    ULONG Size;
+    ULONG MmSpecialPoolTag;
+    ULONG MiTriageActionTaken;
+
+    ULONG MmVerifyDriverLevel;
+    ULONG KernelVerifier;
+    ULONG64 MmMaximumNonPagedPool;
+    ULONG64 MmAllocatedNonPagedPool;
+
+    ULONG64 PagedPoolMaximum;
+    ULONG64 PagedPoolAllocated;
+
+    ULONG64 CommittedPages;
+    ULONG64 CommittedPagesPeak;
+    ULONG64 CommitLimitMaximum;
+} DUMP_MM_STORAGE64, *PDUMP_MM_STORAGE64;
+
+
+//
+// Define the dump header structure. You cannot change these
+// defines without breaking the debuggers, so don't.
+//
+
+#define DMP_PHYSICAL_MEMORY_BLOCK_SIZE_32   (700)
+#define DMP_CONTEXT_RECORD_SIZE_32          (1200)
+#define DMP_RESERVED_0_SIZE_32              (1768)
+#define DMP_RESERVED_2_SIZE_32              (16)
+#define DMP_RESERVED_3_SIZE_32              (56)
+
+#define DMP_PHYSICAL_MEMORY_BLOCK_SIZE_64   (700)
+#define DMP_CONTEXT_RECORD_SIZE_64          (3000)
+#define DMP_RESERVED_0_SIZE_64              (4016)
+
+#define DMP_HEADER_COMMENT_SIZE             (128)
+
+// Unset WriterStatus value from the header fill.
+#define DUMP_WRITER_STATUS_UNINITIALIZED    DUMP_SIGNATURE32
+
+// WriterStatus codes for the dbgeng.dll dump writers.
+enum
+{
+    DUMP_DBGENG_SUCCESS,
+    DUMP_DBGENG_NO_MODULE_LIST,
+    DUMP_DBGENG_CORRUPT_MODULE_LIST,
+};
+
+typedef struct _DUMP_HEADER64 {
+    ULONG Signature;
+    ULONG ValidDump;
+    ULONG MajorVersion;
+    ULONG MinorVersion;
+    ULONG64 DirectoryTableBase;
+    ULONG64 PfnDataBase;
+    ULONG64 PsLoadedModuleList;
+    ULONG64 PsActiveProcessHead;
+    ULONG MachineImageType;
+    ULONG NumberProcessors;
+    ULONG BugCheckCode;
+    ULONG64 BugCheckParameter1;
+    ULONG64 BugCheckParameter2;
+    ULONG64 BugCheckParameter3;
+    ULONG64 BugCheckParameter4;
+    CHAR VersionUser[32];
+    ULONG64 KdDebuggerDataBlock;
+
+    union {
+        PHYSICAL_MEMORY_DESCRIPTOR64 PhysicalMemoryBlock;
+        UCHAR PhysicalMemoryBlockBuffer [ DMP_PHYSICAL_MEMORY_BLOCK_SIZE_64 ];
+    };
+    UCHAR ContextRecord [ DMP_CONTEXT_RECORD_SIZE_64 ];
+    EXCEPTION_RECORD64 Exception;
+    ULONG DumpType;
+    LARGE_INTEGER RequiredDumpSpace;
+    LARGE_INTEGER SystemTime;
+    CHAR Comment [ DMP_HEADER_COMMENT_SIZE ];   // May not be present.
+    LARGE_INTEGER SystemUpTime;
+    ULONG MiniDumpFields;
+    ULONG SecondaryDataState;
+    ULONG ProductType;
+    ULONG SuiteMask;
+    ULONG WriterStatus;
+    UCHAR Unused1;
+    UCHAR KdSecondaryVersion;       // Present only for W2K3 SP1 and better
+    UCHAR Unused[2];
+    UCHAR _reserved0[ DMP_RESERVED_0_SIZE_64 ];
+} DUMP_HEADER64, *PDUMP_HEADER64;
+
+typedef struct _FULL_DUMP64 {
+    CHAR Memory[1];             // Variable length to the end of the dump file.
+} FULL_DUMP64, *PFULL_DUMP64;
+
+//
+// ISSUE - 2000/02/17 - math: NT64 Summary dump.
+//
+// This is broken. The 64 bit summary dump should have a ULONG64 for
+// the BitmapSize to match the size of the PFN_NUMBER.
+//
+
+typedef struct _SUMMARY_DUMP64 {
+    ULONG Signature;
+    ULONG ValidDump;
+    ULONG DumpOptions;  // Summary Dump Options
+    ULONG HeaderSize;   // Offset to the start of actual memory dump
+    ULONG BitmapSize;   // Total bitmap size (i.e., maximum #bits)
+    ULONG Pages;        // Total bits set in bitmap (i.e., total pages in sdump)
+
+    //
+    // ISSUE - 2000/02/17 - math: Win64
+    //
+    // With a 64-bit PFN, we should not have a 32-bit bitmap.
+    //
+
+    //
+    // These next three fields essentially form an on-disk RTL_BITMAP structure.
+    // The RESERVED field is stupidness introduced by the way the data is
+    // serialized to disk.
+    //
+
+    struct {
+        ULONG SizeOfBitMap;
+        ULONG64 _reserved0;
+        ULONG Buffer[];
+    } Bitmap;
+
+} SUMMARY_DUMP64, * PSUMMARY_DUMP64;
+
+
+typedef struct _TRIAGE_DUMP64 {
+    ULONG ServicePackBuild;             // What service pack of NT was this ?
+    ULONG SizeOfDump;                   // Size in bytes of the dump
+    ULONG ValidOffset;                  // Offset valid ULONG
+    ULONG ContextOffset;                // Offset of CONTEXT record
+    ULONG ExceptionOffset;              // Offset of EXCEPTION record
+    ULONG MmOffset;                     // Offset of Mm information
+    ULONG UnloadedDriversOffset;        // Offset of Unloaded Drivers
+    ULONG PrcbOffset;                   // Offset of KPRCB
+    ULONG ProcessOffset;                // Offset of EPROCESS
+    ULONG ThreadOffset;                 // Offset of ETHREAD
+    ULONG CallStackOffset;              // Offset of CallStack Pages
+    ULONG SizeOfCallStack;              // Size in bytes of CallStack
+    ULONG DriverListOffset;             // Offset of Driver List
+    ULONG DriverCount;                  // Number of Drivers in list
+    ULONG StringPoolOffset;             // Offset to the string pool
+    ULONG StringPoolSize;               // Size of the string pool
+    ULONG BrokenDriverOffset;           // Offset into the driver of the driver that crashed
+    ULONG TriageOptions;                // Triage options in effect at crashtime
+    ULONG64 TopOfStack;                 // The top (highest address) of the callstack
+
+    //
+    // Architecture Specific fields.
+    //
+
+    union {
+
+        //
+        // For IA64 we need to store the BStore as well.
+        //
+
+        struct {
+            ULONG BStoreOffset;         // Offset of BStore region.
+            ULONG SizeOfBStore;         // The size of the BStore region.
+            ULONG64 LimitOfBStore;      // The limit (highest memory address)
+        } Ia64;                         //  of the BStore region.
+
+    } ArchitectureSpecific;
+
+    ULONG64 DataPageAddress;
+    ULONG   DataPageOffset;
+    ULONG   DataPageSize;
+
+    ULONG   DebuggerDataOffset;
+    ULONG   DebuggerDataSize;
+
+    ULONG   DataBlocksOffset;
+    ULONG   DataBlocksCount;
+
+} TRIAGE_DUMP64, * PTRIAGE_DUMP64;
+
+
+typedef struct _MEMORY_DUMP64 {
+    DUMP_HEADER64 Header;
+
+    union {
+        FULL_DUMP64 Full;               // DumpType == DUMP_TYPE_FULL
+        SUMMARY_DUMP64 Summary;         // DumpType == DUMP_TYPE_SUMMARY
+        TRIAGE_DUMP64 Triage;           // DumpType == DUMP_TYPE_TRIAGE
+    };
+
+} MEMORY_DUMP64, *PMEMORY_DUMP64;
+
+
+typedef struct _TRIAGE_DATA_BLOCK {
+    ULONG64 Address;
+    ULONG Offset;
+    ULONG Size;
+} TRIAGE_DATA_BLOCK, *PTRIAGE_DATA_BLOCK;
+
+//
+// In the triage dump ValidFields field what portions of the triage-dump have
+// been turned on.
+//
+
+#define TRIAGE_DUMP_CONTEXT          (0x0001)
+#define TRIAGE_DUMP_EXCEPTION        (0x0002)
+#define TRIAGE_DUMP_PRCB             (0x0004)
+#define TRIAGE_DUMP_PROCESS          (0x0008)
+#define TRIAGE_DUMP_THREAD           (0x0010)
+#define TRIAGE_DUMP_STACK            (0x0020)
+#define TRIAGE_DUMP_DRIVER_LIST      (0x0040)
+#define TRIAGE_DUMP_BROKEN_DRIVER    (0x0080)
+#define TRIAGE_DUMP_BASIC_INFO       (0x00FF)
+#define TRIAGE_DUMP_MMINFO           (0x0100)
+#define TRIAGE_DUMP_DATAPAGE         (0x0200)
+#define TRIAGE_DUMP_DEBUGGER_DATA    (0x0400)
+#define TRIAGE_DUMP_DATA_BLOCKS      (0x0800)
+
+#define TRIAGE_OPTION_OVERFLOWED     (0x0100)
+
+#define TRIAGE_DUMP_VALID       ( 'DGRT' )
+#define TRIAGE_DUMP_SIZE32      ( 0x1000 * 16 )
+#define TRIAGE_DUMP_SIZE64      ( 0x2000 * 16 )
+
+//
+// The DUMP_STRING is guaranteed to be both NULL terminated and length prefixed
+// (prefix does not include the NULL).
+//
+
+typedef struct _DUMP_STRING {
+    ULONG Length;                   // Length IN BYTES of the string.
+    WCHAR Buffer [0];               // Buffer.
+} DUMP_STRING, * PDUMP_STRING;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#pragma warning(pop)
diff --git a/base/Windows/Inc/Guiddef.h b/base/Windows/Inc/Guiddef.h
new file mode 100644
index 0000000..71276cd
--- /dev/null
+++ b/base/Windows/Inc/Guiddef.h
@@ -0,0 +1,205 @@
+//+---------------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       guiddef.h
+//
+//  Contents:   GUID definition
+//
+//----------------------------------------------------------------------------
+
+#ifndef GUID_DEFINED
+#define GUID_DEFINED
+#if defined(__midl)
+typedef struct {
+    unsigned long  Data1;
+    unsigned short Data2;
+    unsigned short Data3;
+    byte           Data4[ 8 ];
+} GUID;
+#else
+typedef struct _GUID {
+    unsigned long  Data1;
+    unsigned short Data2;
+    unsigned short Data3;
+    unsigned char  Data4[ 8 ];
+} GUID;
+#endif
+#endif
+
+#ifndef FAR
+#ifdef _WIN32
+#define FAR
+#else
+#define FAR _far
+#endif
+#endif
+
+#ifndef DECLSPEC_SELECTANY
+#if (_MSC_VER >= 1100)
+#define DECLSPEC_SELECTANY  __declspec(selectany)
+#else
+#define DECLSPEC_SELECTANY
+#endif
+#endif
+
+#ifndef EXTERN_C
+#ifdef __cplusplus
+#define EXTERN_C    extern "C"
+#else
+#define EXTERN_C    extern
+#endif
+#endif
+
+#ifdef DEFINE_GUID
+#undef DEFINE_GUID
+#endif
+
+#ifdef INITGUID
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        EXTERN_C const GUID DECLSPEC_SELECTANY name \
+                = { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+#else
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+    EXTERN_C const GUID FAR name
+#endif // INITGUID
+
+#define DEFINE_OLEGUID(name, l, w1, w2) DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
+
+#ifndef _GUIDDEF_H_
+#define _GUIDDEF_H_
+
+#ifndef __LPGUID_DEFINED__
+#define __LPGUID_DEFINED__
+typedef GUID *LPGUID;
+#endif
+
+#ifndef __LPCGUID_DEFINED__
+#define __LPCGUID_DEFINED__
+typedef const GUID *LPCGUID;
+#endif
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef GUID IID;
+typedef IID *LPIID;
+#define IID_NULL            GUID_NULL
+#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
+typedef GUID CLSID;
+typedef CLSID *LPCLSID;
+#define CLSID_NULL          GUID_NULL
+#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
+typedef GUID FMTID;
+typedef FMTID *LPFMTID;
+#define FMTID_NULL          GUID_NULL
+#define IsEqualFMTID(rfmtid1, rfmtid2) IsEqualGUID(rfmtid1, rfmtid2)
+
+#ifdef __midl_proxy
+#define __MIDL_CONST
+#else
+#define __MIDL_CONST const
+#endif
+
+#ifndef _REFGUID_DEFINED
+#define _REFGUID_DEFINED
+#ifdef __cplusplus
+#define REFGUID const GUID &
+#else
+#define REFGUID const GUID * __MIDL_CONST
+#endif
+#endif
+
+#ifndef _REFIID_DEFINED
+#define _REFIID_DEFINED
+#ifdef __cplusplus
+#define REFIID const IID &
+#else
+#define REFIID const IID * __MIDL_CONST
+#endif
+#endif
+
+#ifndef _REFCLSID_DEFINED
+#define _REFCLSID_DEFINED
+#ifdef __cplusplus
+#define REFCLSID const IID &
+#else
+#define REFCLSID const IID * __MIDL_CONST
+#endif
+#endif
+
+#ifndef _REFFMTID_DEFINED
+#define _REFFMTID_DEFINED
+#ifdef __cplusplus
+#define REFFMTID const IID &
+#else
+#define REFFMTID const IID * __MIDL_CONST
+#endif
+#endif
+
+#endif // !__IID_DEFINED__
+
+#if !defined (__midl)
+#if !defined (_SYS_GUID_OPERATORS_)
+#define _SYS_GUID_OPERATORS_
+#include <string.h>
+
+// Faster (but makes code fatter) inline version...use sparingly
+#ifdef __cplusplus
+__inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
+{
+   return (
+      ((unsigned long *) &rguid1)[0] == ((unsigned long *) &rguid2)[0] &&
+      ((unsigned long *) &rguid1)[1] == ((unsigned long *) &rguid2)[1] &&
+      ((unsigned long *) &rguid1)[2] == ((unsigned long *) &rguid2)[2] &&
+      ((unsigned long *) &rguid1)[3] == ((unsigned long *) &rguid2)[3]);
+}
+
+__inline int IsEqualGUID(REFGUID rguid1, REFGUID rguid2)
+{
+    return !memcmp(&rguid1, &rguid2, sizeof(GUID));
+}
+
+#else   // ! __cplusplus
+
+#define InlineIsEqualGUID(rguid1, rguid2)  \
+        (((unsigned long *) rguid1)[0] == ((unsigned long *) rguid2)[0] &&   \
+        ((unsigned long *) rguid1)[1] == ((unsigned long *) rguid2)[1] &&    \
+        ((unsigned long *) rguid1)[2] == ((unsigned long *) rguid2)[2] &&    \
+        ((unsigned long *) rguid1)[3] == ((unsigned long *) rguid2)[3])
+
+#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
+
+#endif  // __cplusplus
+
+#ifdef __INLINE_ISEQUAL_GUID
+#undef IsEqualGUID
+#define IsEqualGUID(rguid1, rguid2) InlineIsEqualGUID(rguid1, rguid2)
+#endif
+
+// Same type, different name
+
+#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
+#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
+
+
+#if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_
+#define _SYS_GUID_OPERATOR_EQ_
+// A couple of C++ helpers
+
+#ifdef __cplusplus
+__inline int operator==(REFGUID guidOne, REFGUID guidOther)
+{
+    return IsEqualGUID(guidOne,guidOther);
+}
+
+__inline int operator!=(REFGUID guidOne, REFGUID guidOther)
+{
+    return !(guidOne == guidOther);
+}
+#endif
+#endif  // _SYS_GUID_OPERATOR_EQ_
+#endif  // _SYS_GUID_OPERATORS_
+#endif  // __midl
+#endif  // _GUIDDEF_H_
diff --git a/base/Windows/Inc/IPExport.h b/base/Windows/Inc/IPExport.h
new file mode 100644
index 0000000..9850bd3
--- /dev/null
+++ b/base/Windows/Inc/IPExport.h
@@ -0,0 +1,291 @@
+/********************************************************************/
+/**                     Microsoft LAN Manager                      **/
+/**     Copyright (c) Microsoft Corporation. All rights reserved.  **/
+/********************************************************************/
+/* :ts=4 */
+
+//** IPEXPORT.H - IP public definitions.
+//
+//  This file contains public definitions exported to transport layer and
+//  application software.
+//
+
+#ifndef IP_EXPORT_INCLUDED
+#define IP_EXPORT_INCLUDED  1
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+//
+// IP type definitions.
+//
+typedef ULONG IPAddr;       // An IP address.
+typedef ULONG IPMask;       // An IP subnet mask.
+typedef ULONG IP_STATUS;    // Status code returned from IP APIs.
+
+#ifndef s6_addr
+//
+// Duplicate these definitions here so that this file can be included by
+// kernel-mode components which cannot include ws2tcpip.h, as well as
+// by user-mode components which do.
+//
+
+typedef struct in6_addr {
+    union {
+        UCHAR       Byte[16];
+        USHORT      Word[8];
+    } u;
+} IN6_ADDR;
+
+#define in_addr6 in6_addr
+
+//
+// Defines to match RFC 2553.
+//
+#define _S6_un      u
+#define _S6_u8      Byte
+#define s6_addr     _S6_un._S6_u8
+
+//
+// Defines for our implementation.
+//
+#define s6_bytes    u.Byte
+#define s6_words    u.Word
+
+#endif
+
+typedef struct in6_addr IPv6Addr;
+
+#ifndef s_addr
+
+struct in_addr {
+        union {
+                struct { UCHAR s_b1,s_b2,s_b3,s_b4; } S_un_b;
+                struct { USHORT s_w1,s_w2; } S_un_w;
+                ULONG S_addr;
+        } S_un;
+};
+#define s_addr  S_un.S_addr /* can be used for most tcp & ip code */
+
+#endif
+
+/*INC*/
+
+//
+// The ip_option_information structure describes the options to be
+// included in the header of an IP packet. The TTL, TOS, and Flags
+// values are carried in specific fields in the header. The OptionsData
+// bytes are carried in the options area following the standard IP header.
+// With the exception of source route options, this data must be in the
+// format to be transmitted on the wire as specified in RFC 791. A source
+// route option should contain the full route - first hop thru final
+// destination - in the route data. The first hop will be pulled out of the
+// data and the option will be reformatted accordingly. Otherwise, the route
+// option should be formatted as specified in RFC 791.
+//
+
+typedef struct ip_option_information {
+    UCHAR   Ttl;                // Time To Live
+    UCHAR   Tos;                // Type Of Service
+    UCHAR   Flags;              // IP header flags
+    UCHAR   OptionsSize;        // Size in bytes of options data
+    PUCHAR  OptionsData;        // Pointer to options data
+} IP_OPTION_INFORMATION, *PIP_OPTION_INFORMATION;
+
+#if defined(_WIN64)
+
+typedef struct ip_option_information32 {
+    UCHAR   Ttl;
+    UCHAR   Tos;
+    UCHAR   Flags;
+    UCHAR   OptionsSize;
+    UCHAR * POINTER_32 OptionsData;
+} IP_OPTION_INFORMATION32, *PIP_OPTION_INFORMATION32;
+
+#endif // _WIN64
+
+//
+// The icmp_echo_reply structure describes the data returned in response
+// to an echo request.
+//
+
+typedef struct icmp_echo_reply {
+    IPAddr  Address;            // Replying address
+    ULONG   Status;             // Reply IP_STATUS
+    ULONG   RoundTripTime;      // RTT in milliseconds
+    USHORT  DataSize;           // Reply data size in bytes
+    USHORT  Reserved;           // Reserved for system use
+    PVOID   Data;               // Pointer to the reply data
+    struct ip_option_information Options; // Reply options
+} ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY;
+
+#if defined(_WIN64)
+
+typedef struct icmp_echo_reply32 {
+    IPAddr  Address;
+    ULONG   Status;
+    ULONG   RoundTripTime;
+    USHORT  DataSize;
+    USHORT  Reserved;
+    VOID * POINTER_32 Data;
+    struct ip_option_information32 Options;
+} ICMP_ECHO_REPLY32, *PICMP_ECHO_REPLY32;
+
+#endif // _WIN64
+
+typedef struct arp_send_reply {
+    IPAddr  DestAddress;
+    IPAddr  SrcAddress;
+} ARP_SEND_REPLY, *PARP_SEND_REPLY;
+
+typedef struct tcp_reserve_port_range {
+    USHORT  UpperRange;
+    USHORT  LowerRange;
+} TCP_RESERVE_PORT_RANGE, *PTCP_RESERVE_PORT_RANGE;
+
+#define MAX_ADAPTER_NAME 128
+
+typedef struct _IP_ADAPTER_INDEX_MAP {
+    ULONG   Index;
+    WCHAR   Name[MAX_ADAPTER_NAME];
+} IP_ADAPTER_INDEX_MAP, *PIP_ADAPTER_INDEX_MAP;
+
+typedef struct _IP_INTERFACE_INFO {
+    LONG    NumAdapters;
+    IP_ADAPTER_INDEX_MAP Adapter[1];
+} IP_INTERFACE_INFO,*PIP_INTERFACE_INFO;
+
+typedef struct _IP_UNIDIRECTIONAL_ADAPTER_ADDRESS {
+    ULONG   NumAdapters;
+    IPAddr  Address[1];
+} IP_UNIDIRECTIONAL_ADAPTER_ADDRESS, *PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS;
+
+typedef struct _IP_ADAPTER_ORDER_MAP {
+    ULONG   NumAdapters;
+    ULONG   AdapterOrder[1];
+} IP_ADAPTER_ORDER_MAP, *PIP_ADAPTER_ORDER_MAP;
+
+typedef struct _IP_MCAST_COUNTER_INFO {
+    ULONG64 InMcastOctets;
+    ULONG64 OutMcastOctets;
+    ULONG64 InMcastPkts;
+    ULONG64 OutMcastPkts;
+} IP_MCAST_COUNTER_INFO, *PIP_MCAST_COUNTER_INFO;
+
+//
+// IP_STATUS codes returned from IP APIs
+//
+
+#define IP_STATUS_BASE              11000
+
+#define IP_SUCCESS                  0
+#define IP_BUF_TOO_SMALL            (IP_STATUS_BASE + 1)
+#define IP_DEST_NET_UNREACHABLE     (IP_STATUS_BASE + 2)
+#define IP_DEST_HOST_UNREACHABLE    (IP_STATUS_BASE + 3)
+#define IP_DEST_PROT_UNREACHABLE    (IP_STATUS_BASE + 4)
+#define IP_DEST_PORT_UNREACHABLE    (IP_STATUS_BASE + 5)
+#define IP_NO_RESOURCES             (IP_STATUS_BASE + 6)
+#define IP_BAD_OPTION               (IP_STATUS_BASE + 7)
+#define IP_HW_ERROR                 (IP_STATUS_BASE + 8)
+#define IP_PACKET_TOO_BIG           (IP_STATUS_BASE + 9)
+#define IP_REQ_TIMED_OUT            (IP_STATUS_BASE + 10)
+#define IP_BAD_REQ                  (IP_STATUS_BASE + 11)
+#define IP_BAD_ROUTE                (IP_STATUS_BASE + 12)
+#define IP_TTL_EXPIRED_TRANSIT      (IP_STATUS_BASE + 13)
+#define IP_TTL_EXPIRED_REASSEM      (IP_STATUS_BASE + 14)
+#define IP_PARAM_PROBLEM            (IP_STATUS_BASE + 15)
+#define IP_SOURCE_QUENCH            (IP_STATUS_BASE + 16)
+#define IP_OPTION_TOO_BIG           (IP_STATUS_BASE + 17)
+#define IP_BAD_DESTINATION          (IP_STATUS_BASE + 18)
+
+//
+// Variants of the above using IPv6 terminology, where different
+//
+
+#define IP_DEST_NO_ROUTE            (IP_STATUS_BASE + 2)
+#define IP_DEST_ADDR_UNREACHABLE    (IP_STATUS_BASE + 3)
+#define IP_DEST_PROHIBITED          (IP_STATUS_BASE + 4)
+#define IP_DEST_PORT_UNREACHABLE    (IP_STATUS_BASE + 5)
+#define IP_HOP_LIMIT_EXCEEDED       (IP_STATUS_BASE + 13)
+#define IP_REASSEMBLY_TIME_EXCEEDED (IP_STATUS_BASE + 14)
+#define IP_PARAMETER_PROBLEM        (IP_STATUS_BASE + 15)
+
+//
+// IPv6-only status codes
+//
+
+#define IP_DEST_UNREACHABLE         (IP_STATUS_BASE + 40)
+#define IP_TIME_EXCEEDED            (IP_STATUS_BASE + 41)
+#define IP_BAD_HEADER               (IP_STATUS_BASE + 42)
+#define IP_UNRECOGNIZED_NEXT_HEADER (IP_STATUS_BASE + 43)
+#define IP_ICMP_ERROR               (IP_STATUS_BASE + 44)
+#define IP_DEST_SCOPE_MISMATCH      (IP_STATUS_BASE + 45)
+
+//
+// The next group are status codes passed up on status indications to
+// transport layer protocols.
+//
+#define IP_ADDR_DELETED             (IP_STATUS_BASE + 19)
+#define IP_SPEC_MTU_CHANGE          (IP_STATUS_BASE + 20)
+#define IP_MTU_CHANGE               (IP_STATUS_BASE + 21)
+#define IP_UNLOAD                   (IP_STATUS_BASE + 22)
+#define IP_ADDR_ADDED               (IP_STATUS_BASE + 23)
+#define IP_MEDIA_CONNECT            (IP_STATUS_BASE + 24)
+#define IP_MEDIA_DISCONNECT         (IP_STATUS_BASE + 25)
+#define IP_BIND_ADAPTER             (IP_STATUS_BASE + 26)
+#define IP_UNBIND_ADAPTER           (IP_STATUS_BASE + 27)
+#define IP_DEVICE_DOES_NOT_EXIST    (IP_STATUS_BASE + 28)
+#define IP_DUPLICATE_ADDRESS        (IP_STATUS_BASE + 29)
+#define IP_INTERFACE_METRIC_CHANGE  (IP_STATUS_BASE + 30)
+#define IP_RECONFIG_SECFLTR         (IP_STATUS_BASE + 31)
+#define IP_NEGOTIATING_IPSEC        (IP_STATUS_BASE + 32)
+#define IP_INTERFACE_WOL_CAPABILITY_CHANGE  (IP_STATUS_BASE + 33)
+#define IP_DUPLICATE_IPADD          (IP_STATUS_BASE + 34)
+
+#define IP_GENERAL_FAILURE          (IP_STATUS_BASE + 50)
+#define MAX_IP_STATUS               IP_GENERAL_FAILURE
+#define IP_PENDING                  (IP_STATUS_BASE + 255)
+
+
+//
+// Values used in the IP header Flags field.
+//
+#define IP_FLAG_DF      0x2         // Don't fragment this packet.
+
+//
+// Supported IP Option Types.
+//
+// These types define the options which may be used in the OptionsData field
+// of the ip_option_information structure.  See RFC 791 for a complete
+// description of each.
+//
+#define IP_OPT_EOL      0          // End of list option
+#define IP_OPT_NOP      1          // No operation
+#define IP_OPT_SECURITY 0x82       // Security option
+#define IP_OPT_LSRR     0x83       // Loose source route
+#define IP_OPT_SSRR     0x89       // Strict source route
+#define IP_OPT_RR       0x7        // Record route
+#define IP_OPT_TS       0x44       // Timestamp
+#define IP_OPT_SID      0x88       // Stream ID (obsolete)
+#define IP_OPT_ROUTER_ALERT 0x94  // Router Alert Option
+
+#define MAX_OPT_SIZE    40         // Maximum length of IP options in bytes
+
+#ifdef CHICAGO
+
+// Ioctls code exposed by Memphis tcpip stack.
+// For NT these ioctls are define in ntddip.h  (private\inc)
+
+#define IOCTL_IP_RTCHANGE_NOTIFY_REQUEST   101
+#define IOCTL_IP_ADDCHANGE_NOTIFY_REQUEST  102
+#define IOCTL_ARP_SEND_REQUEST             103
+#define IOCTL_IP_INTERFACE_INFO            104
+#define IOCTL_IP_GET_BEST_INTERFACE        105
+#define IOCTL_IP_UNIDIRECTIONAL_ADAPTER_ADDRESS        106
+
+#endif
+
+
+#endif // IP_EXPORT_INCLUDED
+
diff --git a/base/Windows/Inc/IPHlpApi.h b/base/Windows/Inc/IPHlpApi.h
new file mode 100644
index 0000000..cbd10fb
--- /dev/null
+++ b/base/Windows/Inc/IPHlpApi.h
@@ -0,0 +1,588 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    iphlpapi.h
+
+Abstract:
+    Header file for functions to interact with the IP Stack for MIB-II and
+    related functionality
+
+--*/
+
+#ifndef __IPHLPAPI_H__
+#define __IPHLPAPI_H__
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// IPRTRMIB.H has the definitions of the strcutures used to set and get     //
+// information                                                              //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#include <iprtrmib.h>
+#include <ipexport.h>
+#include <iptypes.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// The GetXXXTable APIs take a buffer and a size of buffer.  If the buffer  //
+// is not large enough, the APIs return ERROR_INSUFFICIENT_BUFFER  and      //
+// *pdwSize is the required buffer size                                     //
+// The bOrder is a BOOLEAN, which if TRUE sorts the table according to      //
+// MIB-II (RFC XXXX)                                                        //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Retrieves the number of interfaces in the system. These include LAN and  //
+// WAN interfaces                                                           //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+
+DWORD
+WINAPI
+GetNumberOfInterfaces(
+    OUT PDWORD  pdwNumIf
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the MIB-II ifEntry                                                  //
+// The dwIndex field of the MIB_IFROW should be set to the index of the     //
+// interface being queried                                                  //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetIfEntry(
+    IN OUT PMIB_IFROW   pIfRow
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the MIB-II IfTable                                                  //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetIfTable(
+    OUT    PMIB_IFTABLE pIfTable,
+    IN OUT PULONG       pdwSize,
+    IN     BOOL         bOrder
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the Interface to IP Address mapping                                 //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetIpAddrTable(
+    OUT    PMIB_IPADDRTABLE pIpAddrTable,
+    IN OUT PULONG           pdwSize,
+    IN     BOOL             bOrder
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the current IP Address to Physical Address (ARP) mapping            //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetIpNetTable(
+    OUT    PMIB_IPNETTABLE pIpNetTable,
+    IN OUT PULONG          pdwSize,
+    IN     BOOL            bOrder
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the IP Routing Table  (RFX XXXX)                                    //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetIpForwardTable(
+    OUT    PMIB_IPFORWARDTABLE pIpForwardTable,
+    IN OUT PULONG              pdwSize,
+    IN     BOOL                bOrder
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets TCP Connection/UDP Listener Table                                   //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetTcpTable(
+    OUT    PMIB_TCPTABLE pTcpTable,
+    IN OUT PDWORD        pdwSize,
+    IN     BOOL          bOrder
+    );
+
+DWORD
+WINAPI
+GetUdpTable(
+    OUT    PMIB_UDPTABLE pUdpTable,
+    IN OUT PDWORD        pdwSize,
+    IN     BOOL          bOrder
+    );
+
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets IP/ICMP/TCP/UDP Statistics                                          //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetIpStatistics(
+    OUT  PMIB_IPSTATS   pStats
+    );
+
+DWORD
+WINAPI
+GetIpStatisticsEx(
+    OUT  PMIB_IPSTATS   pStats,
+    IN   DWORD          dwFamily
+    );
+
+DWORD
+WINAPI
+GetIcmpStatistics(
+    OUT PMIB_ICMP   pStats
+    );
+
+DWORD
+WINAPI
+GetIcmpStatisticsEx(
+    OUT PMIB_ICMP_EX    pStats,
+    IN  DWORD           dwFamily
+    );
+
+DWORD
+WINAPI
+GetTcpStatistics(
+    OUT PMIB_TCPSTATS   pStats
+    );
+
+DWORD
+WINAPI
+GetTcpStatisticsEx(
+    OUT PMIB_TCPSTATS   pStats,
+    IN  DWORD           dwFamily
+    );
+
+DWORD
+WINAPI
+GetUdpStatistics(
+    OUT PMIB_UDPSTATS   pStats
+    );
+
+DWORD
+WINAPI
+GetUdpStatisticsEx(
+    OUT PMIB_UDPSTATS   pStats,
+    IN  DWORD           dwFamily
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to set the ifAdminStatus on an interface.  The only fields of the   //
+// MIB_IFROW that are relevant are the dwIndex (index of the interface      //
+// whose status needs to be set) and the dwAdminStatus which can be either  //
+// MIB_IF_ADMIN_STATUS_UP or MIB_IF_ADMIN_STATUS_DOWN                       //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+SetIfEntry(
+    IN PMIB_IFROW pIfRow
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to create, modify or delete a route.  In all cases the              //
+// dwForwardIfIndex, dwForwardDest, dwForwardMask, dwForwardNextHop and     //
+// dwForwardPolicy MUST BE SPECIFIED. Currently dwForwardPolicy is unused   //
+// and MUST BE 0.                                                           //
+// For a set, the complete MIB_IPFORWARDROW structure must be specified     //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+CreateIpForwardEntry(
+    IN PMIB_IPFORWARDROW pRoute
+    );
+
+DWORD
+WINAPI
+SetIpForwardEntry(
+    IN PMIB_IPFORWARDROW pRoute
+    );
+
+DWORD
+WINAPI
+DeleteIpForwardEntry(
+    IN PMIB_IPFORWARDROW pRoute
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to set the ipForwarding to ON or OFF (currently only ON->OFF is     //
+// allowed) and to set the defaultTTL.  If only one of the fields needs to  //
+// be modified and the other needs to be the same as before the other field //
+// needs to be set to MIB_USE_CURRENT_TTL or MIB_USE_CURRENT_FORWARDING as  //
+// the case may be                                                          //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+
+DWORD
+WINAPI
+SetIpStatistics(
+    IN PMIB_IPSTATS pIpStats
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to set the defaultTTL.                                              //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+SetIpTTL(
+    UINT nTTL
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to create, modify or delete an ARP entry.  In all cases the dwIndex //
+// dwAddr field MUST BE SPECIFIED.                                          //
+// For a set, the complete MIB_IPNETROW structure must be specified         //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+CreateIpNetEntry(
+    IN PMIB_IPNETROW    pArpEntry
+    );
+
+DWORD
+WINAPI
+SetIpNetEntry(
+    IN PMIB_IPNETROW    pArpEntry
+    );
+
+DWORD
+WINAPI
+DeleteIpNetEntry(
+    IN PMIB_IPNETROW    pArpEntry
+    );
+
+DWORD
+WINAPI
+FlushIpNetTable(
+    IN DWORD   dwIfIndex
+    );
+
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to create or delete a Proxy ARP entry. The dwIndex is the index of  //
+// the interface on which to PARP for the dwAddress.  If the interface is   //
+// of a type that doesnt support ARP, e.g. PPP, then the call will fail     //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+CreateProxyArpEntry(
+    IN  DWORD   dwAddress,
+    IN  DWORD   dwMask,
+    IN  DWORD   dwIfIndex
+    );
+
+DWORD
+WINAPI
+DeleteProxyArpEntry(
+    IN  DWORD   dwAddress,
+    IN  DWORD   dwMask,
+    IN  DWORD   dwIfIndex
+    );
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Used to set the state of a TCP Connection. The only state that it can be //
+// set to is MIB_TCP_STATE_DELETE_TCB.  The complete MIB_TCPROW structure   //
+// MUST BE SPECIFIED                                                        //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+SetTcpEntry(
+    IN PMIB_TCPROW pTcpRow
+    );
+
+
+DWORD
+WINAPI
+GetInterfaceInfo(
+    IN PIP_INTERFACE_INFO pIfTable,
+    OUT PULONG            dwOutBufLen
+    );
+
+DWORD
+WINAPI
+GetUniDirectionalAdapterInfo(OUT PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIPIfInfo,
+                 OUT PULONG dwOutBufLen
+                 );
+
+#ifndef NhpAllocateAndGetInterfaceInfoFromStack_DEFINED
+#define NhpAllocateAndGetInterfaceInfoFromStack_DEFINED
+
+DWORD
+WINAPI
+NhpAllocateAndGetInterfaceInfoFromStack(
+    OUT IP_INTERFACE_NAME_INFO **ppTable,
+    OUT PDWORD                 pdwCount,
+    IN BOOL                    bOrder,
+    IN HANDLE                  hHeap,
+    IN DWORD                   dwFlags
+    );
+
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the "best" outgoing interface for the specified destination address //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetBestInterface(
+    IN  IPAddr  dwDestAddr,
+    OUT PDWORD  pdwBestIfIndex
+    );
+
+#pragma warning(push)
+#pragma warning(disable:4115)
+DWORD
+WINAPI
+GetBestInterfaceEx(
+    IN  struct sockaddr *pDestAddr,
+    OUT PDWORD           pdwBestIfIndex
+    );
+#pragma warning(pop)
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Gets the best (longest matching prefix) route for the given destination  //
+// If the source address is also specified (i.e. is not 0x00000000), and    //
+// there are multiple "best" routes to the given destination, the returned  //
+// route will be one that goes out over the interface which has an address  //
+// that matches the source address                                          //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+DWORD
+WINAPI
+GetBestRoute(
+    IN  DWORD               dwDestAddr,
+    IN  DWORD               dwSourceAddr, OPTIONAL
+    OUT PMIB_IPFORWARDROW   pBestRoute
+    );
+
+DWORD
+WINAPI
+NotifyAddrChange(
+    OUT PHANDLE      Handle,
+    IN  LPOVERLAPPED overlapped
+    );
+
+
+DWORD
+WINAPI
+NotifyRouteChange(
+    OUT PHANDLE      Handle,
+    IN  LPOVERLAPPED overlapped
+    );
+
+BOOL
+WINAPI
+CancelIPChangeNotify(
+    IN  LPOVERLAPPED notifyOverlapped
+    );
+
+DWORD
+WINAPI
+GetAdapterIndex(
+    IN LPWSTR  AdapterName,
+    OUT PULONG IfIndex
+    );
+
+DWORD
+WINAPI
+AddIPAddress(
+    IPAddr  Address,
+    IPMask  IpMask,
+    DWORD   IfIndex,
+    PULONG  NTEContext,
+    PULONG  NTEInstance
+    );
+
+DWORD
+WINAPI
+DeleteIPAddress(
+    ULONG NTEContext
+    );
+
+DWORD
+WINAPI
+GetNetworkParams(
+    PFIXED_INFO pFixedInfo, PULONG pOutBufLen
+    );
+
+DWORD
+WINAPI
+GetAdaptersInfo(
+    PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen
+    );
+
+PIP_ADAPTER_ORDER_MAP 
+WINAPI
+GetAdapterOrderMap(
+    VOID
+    );
+
+#ifdef _WINSOCK2API_
+
+//
+// The following functions require Winsock2.
+//
+
+DWORD
+WINAPI
+GetAdaptersAddresses(
+    IN     ULONG                 Family,
+    IN     DWORD                 Flags,
+    IN     PVOID                 Reserved,
+    OUT    PIP_ADAPTER_ADDRESSES pAdapterAddresses, 
+    IN OUT PULONG                pOutBufLen
+    );
+
+#endif
+
+DWORD
+WINAPI
+GetPerAdapterInfo(
+    ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen
+    );
+
+DWORD
+WINAPI
+IpReleaseAddress(
+    PIP_ADAPTER_INDEX_MAP  AdapterInfo
+    );
+
+
+DWORD
+WINAPI
+IpRenewAddress(
+    PIP_ADAPTER_INDEX_MAP  AdapterInfo
+    );
+
+DWORD
+WINAPI
+SendARP(
+    IPAddr DestIP,
+    IPAddr SrcIP,
+    PULONG pMacAddr,
+    PULONG  PhyAddrLen
+    );
+
+BOOL
+WINAPI
+GetRTTAndHopCount(
+    IPAddr DestIpAddress,
+    PULONG HopCount,
+    ULONG  MaxHops,
+    PULONG RTT
+    );
+
+DWORD
+WINAPI
+GetFriendlyIfIndex(
+    DWORD IfIndex
+    );
+
+DWORD
+WINAPI
+EnableRouter(
+    HANDLE* pHandle,
+    OVERLAPPED* pOverlapped
+    );
+
+DWORD
+WINAPI
+UnenableRouter(
+    OVERLAPPED* pOverlapped,
+    LPDWORD lpdwEnableCount OPTIONAL
+    );
+DWORD
+WINAPI
+DisableMediaSense(
+    HANDLE *pHandle,
+    OVERLAPPED *pOverLapped
+    );
+
+DWORD
+WINAPI
+RestoreMediaSense(
+    OVERLAPPED* pOverlapped,
+    LPDWORD lpdwEnableCount OPTIONAL
+    );
+
+DWORD
+WINAPI
+GetIpErrorString(
+    IN IP_STATUS ErrorCode,
+    OUT PWCHAR Buffer,
+    IN OUT PDWORD Size
+    );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //__IPHLPAPI_H__
diff --git a/base/Windows/Inc/IPTypes.h b/base/Windows/Inc/IPTypes.h
new file mode 100644
index 0000000..e2344d7
--- /dev/null
+++ b/base/Windows/Inc/IPTypes.h
@@ -0,0 +1,327 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    iptypes.h
+
+--*/
+
+#ifndef IP_TYPES_INCLUDED
+#define IP_TYPES_INCLUDED
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#pragma warning(push)
+#pragma warning(disable:4201)
+
+#include <time.h>
+
+// Definitions and structures used by getnetworkparams and getadaptersinfo apis
+
+#define MAX_ADAPTER_DESCRIPTION_LENGTH  128 // arb.
+#define MAX_ADAPTER_NAME_LENGTH         256 // arb.
+#define MAX_ADAPTER_ADDRESS_LENGTH      8   // arb.
+#define DEFAULT_MINIMUM_ENTITIES        32  // arb.
+#define MAX_HOSTNAME_LEN                128 // arb.
+#define MAX_DOMAIN_NAME_LEN             128 // arb.
+#define MAX_SCOPE_ID_LEN                256 // arb.
+
+//
+// types
+//
+
+// Node Type
+
+#define BROADCAST_NODETYPE              1
+#define PEER_TO_PEER_NODETYPE           2
+#define MIXED_NODETYPE                  4
+#define HYBRID_NODETYPE                 8
+
+//
+// IP_ADDRESS_STRING - store an IP address as a dotted decimal string
+//
+
+typedef struct {
+    char String[4 * 4];
+} IP_ADDRESS_STRING, *PIP_ADDRESS_STRING, IP_MASK_STRING, *PIP_MASK_STRING;
+
+//
+// IP_ADDR_STRING - store an IP address with its corresponding subnet mask,
+// both as dotted decimal strings
+//
+
+typedef struct _IP_ADDR_STRING {
+    struct _IP_ADDR_STRING* Next;
+    IP_ADDRESS_STRING IpAddress;
+    IP_MASK_STRING IpMask;
+    DWORD Context;
+} IP_ADDR_STRING, *PIP_ADDR_STRING;
+
+//
+// ADAPTER_INFO - per-adapter information. All IP addresses are stored as
+// strings
+//
+
+typedef struct _IP_ADAPTER_INFO {
+    struct _IP_ADAPTER_INFO* Next;
+    DWORD ComboIndex;
+    char AdapterName[MAX_ADAPTER_NAME_LENGTH + 4];
+    char Description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
+    UINT AddressLength;
+    BYTE Address[MAX_ADAPTER_ADDRESS_LENGTH];
+    DWORD Index;
+    UINT Type;
+    UINT DhcpEnabled;
+    PIP_ADDR_STRING CurrentIpAddress;
+    IP_ADDR_STRING IpAddressList;
+    IP_ADDR_STRING GatewayList;
+    IP_ADDR_STRING DhcpServer;
+    BOOL HaveWins;
+    IP_ADDR_STRING PrimaryWinsServer;
+    IP_ADDR_STRING SecondaryWinsServer;
+    time_t LeaseObtained;
+    time_t LeaseExpires;
+} IP_ADAPTER_INFO, *PIP_ADAPTER_INFO;
+
+#ifdef _WINSOCK2API_
+
+//
+// The following types require Winsock2.
+//
+
+typedef enum {
+    IpPrefixOriginOther = 0,
+    IpPrefixOriginManual,
+    IpPrefixOriginWellKnown,
+    IpPrefixOriginDhcp,
+    IpPrefixOriginRouterAdvertisement,
+} IP_PREFIX_ORIGIN;
+
+typedef enum {
+    IpSuffixOriginOther = 0,
+    IpSuffixOriginManual,
+    IpSuffixOriginWellKnown,
+    IpSuffixOriginDhcp,
+    IpSuffixOriginLinkLayerAddress,
+    IpSuffixOriginRandom,
+} IP_SUFFIX_ORIGIN;
+
+typedef enum {
+    IpDadStateInvalid    = 0,
+    IpDadStateTentative,
+    IpDadStateDuplicate,
+    IpDadStateDeprecated,
+    IpDadStatePreferred,
+} IP_DAD_STATE;
+
+typedef struct _IP_ADAPTER_UNICAST_ADDRESS {
+    union {
+        ULONGLONG Alignment;
+        struct { 
+            ULONG Length;
+            DWORD Flags;
+        };
+    };
+    struct _IP_ADAPTER_UNICAST_ADDRESS *Next;
+    SOCKET_ADDRESS Address;
+
+    IP_PREFIX_ORIGIN PrefixOrigin;
+    IP_SUFFIX_ORIGIN SuffixOrigin;
+    IP_DAD_STATE DadState;
+
+    ULONG ValidLifetime;
+    ULONG PreferredLifetime;
+    ULONG LeaseLifetime;
+} IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS;
+
+typedef struct _IP_ADAPTER_ANYCAST_ADDRESS {
+    union {
+        ULONGLONG Alignment;
+        struct { 
+            ULONG Length;
+            DWORD Flags;
+        };
+    };
+    struct _IP_ADAPTER_ANYCAST_ADDRESS *Next;
+    SOCKET_ADDRESS Address;
+} IP_ADAPTER_ANYCAST_ADDRESS, *PIP_ADAPTER_ANYCAST_ADDRESS;
+
+typedef struct _IP_ADAPTER_MULTICAST_ADDRESS {
+    union {
+        ULONGLONG Alignment;
+        struct {
+            ULONG Length;
+            DWORD Flags;
+        };
+    };
+    struct _IP_ADAPTER_MULTICAST_ADDRESS *Next;
+    SOCKET_ADDRESS Address;
+} IP_ADAPTER_MULTICAST_ADDRESS, *PIP_ADAPTER_MULTICAST_ADDRESS;
+
+//
+// Per-address Flags
+//
+#define IP_ADAPTER_ADDRESS_DNS_ELIGIBLE 0x01
+#define IP_ADAPTER_ADDRESS_TRANSIENT    0x02
+
+typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS {
+    union {
+        ULONGLONG Alignment;
+        struct {
+            ULONG Length;
+            DWORD Reserved;
+        };
+    };
+    struct _IP_ADAPTER_DNS_SERVER_ADDRESS *Next;
+    SOCKET_ADDRESS Address;
+} IP_ADAPTER_DNS_SERVER_ADDRESS, *PIP_ADAPTER_DNS_SERVER_ADDRESS;
+
+typedef struct _IP_ADAPTER_PREFIX {
+    union {
+        ULONGLONG Alignment;
+        struct {
+            ULONG Length;
+            DWORD Flags;
+        };
+    };
+    struct _IP_ADAPTER_PREFIX *Next;
+    SOCKET_ADDRESS Address;
+    ULONG PrefixLength;
+} IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX;
+
+//
+// Per-adapter Flags
+//
+#define IP_ADAPTER_DDNS_ENABLED               0x01
+#define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX    0x02
+#define IP_ADAPTER_DHCP_ENABLED               0x04
+#define IP_ADAPTER_RECEIVE_ONLY               0x08
+#define IP_ADAPTER_NO_MULTICAST               0x10
+#define IP_ADAPTER_IPV6_OTHER_STATEFUL_CONFIG 0x20
+
+//
+// OperStatus values from RFC 2863
+//
+typedef enum {
+    IfOperStatusUp = 1,
+    IfOperStatusDown,
+    IfOperStatusTesting,
+    IfOperStatusUnknown,
+    IfOperStatusDormant,
+    IfOperStatusNotPresent,
+    IfOperStatusLowerLayerDown
+} IF_OPER_STATUS;
+
+//
+// Scope levels from RFC 2373 used with ZoneIndices array.
+//
+typedef enum {
+    ScopeLevelInterface    = 1,
+    ScopeLevelLink         = 2,
+    ScopeLevelSubnet       = 3,
+    ScopeLevelAdmin        = 4,
+    ScopeLevelSite         = 5,
+    ScopeLevelOrganization = 8,
+    ScopeLevelGlobal       = 14
+} SCOPE_LEVEL;
+
+typedef struct _IP_ADAPTER_ADDRESSES {
+    union {
+        ULONGLONG Alignment;
+        struct {
+            ULONG Length;
+            DWORD IfIndex;
+        };
+    };
+    struct _IP_ADAPTER_ADDRESSES *Next;
+    PCHAR AdapterName;
+    PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress;
+    PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress;
+    PIP_ADAPTER_MULTICAST_ADDRESS FirstMulticastAddress;
+    PIP_ADAPTER_DNS_SERVER_ADDRESS FirstDnsServerAddress;
+    PWCHAR DnsSuffix;
+    PWCHAR Description;
+    PWCHAR FriendlyName;
+    BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH];
+    DWORD PhysicalAddressLength;
+    DWORD Flags;
+    DWORD Mtu;
+    DWORD IfType;
+    IF_OPER_STATUS OperStatus;
+    DWORD Ipv6IfIndex;
+    DWORD ZoneIndices[16];
+    PIP_ADAPTER_PREFIX FirstPrefix;
+} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES;
+
+//
+// Flags used as argument to GetAdaptersAddresses().
+// "SKIP" flags are added when the default is to include the information.
+// "INCLUDE" flags are added when the default is to skip the information.
+//
+#define GAA_FLAG_SKIP_UNICAST       0x0001
+#define GAA_FLAG_SKIP_ANYCAST       0x0002
+#define GAA_FLAG_SKIP_MULTICAST     0x0004
+#define GAA_FLAG_SKIP_DNS_SERVER    0x0008
+#define GAA_FLAG_INCLUDE_PREFIX     0x0010
+#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x0020
+
+#endif /* _WINSOCK2API_ */
+
+//
+// IP_PER_ADAPTER_INFO - per-adapter IP information such as DNS server list.
+//
+
+typedef struct _IP_PER_ADAPTER_INFO {
+    UINT AutoconfigEnabled;
+    UINT AutoconfigActive;
+    PIP_ADDR_STRING CurrentDnsServer;
+    IP_ADDR_STRING DnsServerList;
+} IP_PER_ADAPTER_INFO, *PIP_PER_ADAPTER_INFO;
+
+//
+// FIXED_INFO - the set of IP-related information which does not depend on DHCP
+//
+
+typedef struct {
+    char HostName[MAX_HOSTNAME_LEN + 4] ;
+    char DomainName[MAX_DOMAIN_NAME_LEN + 4];
+    PIP_ADDR_STRING CurrentDnsServer;
+    IP_ADDR_STRING DnsServerList;
+    UINT NodeType;
+    char ScopeId[MAX_SCOPE_ID_LEN + 4];
+    UINT EnableRouting;
+    UINT EnableProxy;
+    UINT EnableDns;
+} FIXED_INFO, *PFIXED_INFO;
+
+#ifndef IP_INTERFACE_NAME_INFO_DEFINED
+#define IP_INTERFACE_NAME_INFO_DEFINED
+
+typedef struct ip_interface_name_info {
+    ULONG           Index;      // Interface Index
+    ULONG           MediaType;  // Interface Types - see ipifcons.h
+    UCHAR           ConnectionType;
+    UCHAR           AccessType;
+    GUID            DeviceGuid; // Device GUID is the guid of the device
+                                // that IP exposes
+    GUID            InterfaceGuid; // Interface GUID, if not GUID_NULL is the
+                                // GUID for the interface mapped to the device.
+} IP_INTERFACE_NAME_INFO, *PIP_INTERFACE_NAME_INFO;
+
+#endif
+
+#pragma warning(pop)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/base/Windows/Inc/Ipifcons.h b/base/Windows/Inc/Ipifcons.h
new file mode 100644
index 0000000..380930a
--- /dev/null
+++ b/base/Windows/Inc/Ipifcons.h
@@ -0,0 +1,276 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    ipifcons.h
+
+Abstract:
+    Constants needed for the Interface Object
+
+--*/
+
+#ifndef __IPIFCONS_H__
+#define __IPIFCONS_H__
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Media types                                                              //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#define MIN_IF_TYPE                     1
+
+#define IF_TYPE_OTHER                   1   // None of the below
+#define IF_TYPE_REGULAR_1822            2
+#define IF_TYPE_HDH_1822                3
+#define IF_TYPE_DDN_X25                 4
+#define IF_TYPE_RFC877_X25              5
+#define IF_TYPE_ETHERNET_CSMACD         6
+#define IF_TYPE_IS088023_CSMACD         7
+#define IF_TYPE_ISO88024_TOKENBUS       8
+#define IF_TYPE_ISO88025_TOKENRING      9
+#define IF_TYPE_ISO88026_MAN            10
+#define IF_TYPE_STARLAN                 11
+#define IF_TYPE_PROTEON_10MBIT          12
+#define IF_TYPE_PROTEON_80MBIT          13
+#define IF_TYPE_HYPERCHANNEL            14
+#define IF_TYPE_FDDI                    15
+#define IF_TYPE_LAP_B                   16
+#define IF_TYPE_SDLC                    17
+#define IF_TYPE_DS1                     18  // DS1-MIB
+#define IF_TYPE_E1                      19  // Obsolete; see DS1-MIB
+#define IF_TYPE_BASIC_ISDN              20
+#define IF_TYPE_PRIMARY_ISDN            21
+#define IF_TYPE_PROP_POINT2POINT_SERIAL 22  // proprietary serial
+#define IF_TYPE_PPP                     23
+#define IF_TYPE_SOFTWARE_LOOPBACK       24
+#define IF_TYPE_EON                     25  // CLNP over IP
+#define IF_TYPE_ETHERNET_3MBIT          26
+#define IF_TYPE_NSIP                    27  // XNS over IP
+#define IF_TYPE_SLIP                    28  // Generic Slip
+#define IF_TYPE_ULTRA                   29  // ULTRA Technologies
+#define IF_TYPE_DS3                     30  // DS3-MIB
+#define IF_TYPE_SIP                     31  // SMDS, coffee
+#define IF_TYPE_FRAMERELAY              32  // DTE only
+#define IF_TYPE_RS232                   33
+#define IF_TYPE_PARA                    34  // Parallel port
+#define IF_TYPE_ARCNET                  35
+#define IF_TYPE_ARCNET_PLUS             36
+#define IF_TYPE_ATM                     37  // ATM cells
+#define IF_TYPE_MIO_X25                 38
+#define IF_TYPE_SONET                   39  // SONET or SDH
+#define IF_TYPE_X25_PLE                 40
+#define IF_TYPE_ISO88022_LLC            41
+#define IF_TYPE_LOCALTALK               42
+#define IF_TYPE_SMDS_DXI                43
+#define IF_TYPE_FRAMERELAY_SERVICE      44  // FRNETSERV-MIB
+#define IF_TYPE_V35                     45
+#define IF_TYPE_HSSI                    46
+#define IF_TYPE_HIPPI                   47
+#define IF_TYPE_MODEM                   48  // Generic Modem
+#define IF_TYPE_AAL5                    49  // AAL5 over ATM
+#define IF_TYPE_SONET_PATH              50
+#define IF_TYPE_SONET_VT                51
+#define IF_TYPE_SMDS_ICIP               52  // SMDS InterCarrier Interface
+#define IF_TYPE_PROP_VIRTUAL            53  // Proprietary virtual/internal
+#define IF_TYPE_PROP_MULTIPLEXOR        54  // Proprietary multiplexing
+#define IF_TYPE_IEEE80212               55  // 100BaseVG
+#define IF_TYPE_FIBRECHANNEL            56
+#define IF_TYPE_HIPPIINTERFACE          57
+#define IF_TYPE_FRAMERELAY_INTERCONNECT 58  // Obsolete, use 32 or 44
+#define IF_TYPE_AFLANE_8023             59  // ATM Emulated LAN for 802.3
+#define IF_TYPE_AFLANE_8025             60  // ATM Emulated LAN for 802.5
+#define IF_TYPE_CCTEMUL                 61  // ATM Emulated circuit
+#define IF_TYPE_FASTETHER               62  // Fast Ethernet (100BaseT)
+#define IF_TYPE_ISDN                    63  // ISDN and X.25
+#define IF_TYPE_V11                     64  // CCITT V.11/X.21
+#define IF_TYPE_V36                     65  // CCITT V.36
+#define IF_TYPE_G703_64K                66  // CCITT G703 at 64Kbps
+#define IF_TYPE_G703_2MB                67  // Obsolete; see DS1-MIB
+#define IF_TYPE_QLLC                    68  // SNA QLLC
+#define IF_TYPE_FASTETHER_FX            69  // Fast Ethernet (100BaseFX)
+#define IF_TYPE_CHANNEL                 70
+#define IF_TYPE_IEEE80211               71  // Radio spread spectrum
+#define IF_TYPE_IBM370PARCHAN           72  // IBM System 360/370 OEMI Channel
+#define IF_TYPE_ESCON                   73  // IBM Enterprise Systems Connection
+#define IF_TYPE_DLSW                    74  // Data Link Switching
+#define IF_TYPE_ISDN_S                  75  // ISDN S/T interface
+#define IF_TYPE_ISDN_U                  76  // ISDN U interface
+#define IF_TYPE_LAP_D                   77  // Link Access Protocol D
+#define IF_TYPE_IPSWITCH                78  // IP Switching Objects
+#define IF_TYPE_RSRB                    79  // Remote Source Route Bridging
+#define IF_TYPE_ATM_LOGICAL             80  // ATM Logical Port
+#define IF_TYPE_DS0                     81  // Digital Signal Level 0
+#define IF_TYPE_DS0_BUNDLE              82  // Group of ds0s on the same ds1
+#define IF_TYPE_BSC                     83  // Bisynchronous Protocol
+#define IF_TYPE_ASYNC                   84  // Asynchronous Protocol
+#define IF_TYPE_CNR                     85  // Combat Net Radio
+#define IF_TYPE_ISO88025R_DTR           86  // ISO 802.5r DTR
+#define IF_TYPE_EPLRS                   87  // Ext Pos Loc Report Sys
+#define IF_TYPE_ARAP                    88  // Appletalk Remote Access Protocol
+#define IF_TYPE_PROP_CNLS               89  // Proprietary Connectionless Proto
+#define IF_TYPE_HOSTPAD                 90  // CCITT-ITU X.29 PAD Protocol
+#define IF_TYPE_TERMPAD                 91  // CCITT-ITU X.3 PAD Facility
+#define IF_TYPE_FRAMERELAY_MPI          92  // Multiproto Interconnect over FR
+#define IF_TYPE_X213                    93  // CCITT-ITU X213
+#define IF_TYPE_ADSL                    94  // Asymmetric Digital Subscrbr Loop
+#define IF_TYPE_RADSL                   95  // Rate-Adapt Digital Subscrbr Loop
+#define IF_TYPE_SDSL                    96  // Symmetric Digital Subscriber Loop
+#define IF_TYPE_VDSL                    97  // Very H-Speed Digital Subscrb Loop
+#define IF_TYPE_ISO88025_CRFPRINT       98  // ISO 802.5 CRFP
+#define IF_TYPE_MYRINET                 99  // Myricom Myrinet
+#define IF_TYPE_VOICE_EM                100 // Voice recEive and transMit
+#define IF_TYPE_VOICE_FXO               101 // Voice Foreign Exchange Office
+#define IF_TYPE_VOICE_FXS               102 // Voice Foreign Exchange Station
+#define IF_TYPE_VOICE_ENCAP             103 // Voice encapsulation
+#define IF_TYPE_VOICE_OVERIP            104 // Voice over IP encapsulation
+#define IF_TYPE_ATM_DXI                 105 // ATM DXI
+#define IF_TYPE_ATM_FUNI                106 // ATM FUNI
+#define IF_TYPE_ATM_IMA                 107 // ATM IMA
+#define IF_TYPE_PPPMULTILINKBUNDLE      108 // PPP Multilink Bundle
+#define IF_TYPE_IPOVER_CDLC             109 // IBM ipOverCdlc
+#define IF_TYPE_IPOVER_CLAW             110 // IBM Common Link Access to Workstn
+#define IF_TYPE_STACKTOSTACK            111 // IBM stackToStack
+#define IF_TYPE_VIRTUALIPADDRESS        112 // IBM VIPA
+#define IF_TYPE_MPC                     113 // IBM multi-proto channel support
+#define IF_TYPE_IPOVER_ATM              114 // IBM ipOverAtm
+#define IF_TYPE_ISO88025_FIBER          115 // ISO 802.5j Fiber Token Ring
+#define IF_TYPE_TDLC                    116 // IBM twinaxial data link control
+#define IF_TYPE_GIGABITETHERNET         117
+#define IF_TYPE_HDLC                    118
+#define IF_TYPE_LAP_F                   119
+#define IF_TYPE_V37                     120
+#define IF_TYPE_X25_MLP                 121 // Multi-Link Protocol
+#define IF_TYPE_X25_HUNTGROUP           122 // X.25 Hunt Group
+#define IF_TYPE_TRANSPHDLC              123
+#define IF_TYPE_INTERLEAVE              124 // Interleave channel
+#define IF_TYPE_FAST                    125 // Fast channel
+#define IF_TYPE_IP                      126 // IP (for APPN HPR in IP networks)
+#define IF_TYPE_DOCSCABLE_MACLAYER      127 // CATV Mac Layer
+#define IF_TYPE_DOCSCABLE_DOWNSTREAM    128 // CATV Downstream interface
+#define IF_TYPE_DOCSCABLE_UPSTREAM      129 // CATV Upstream interface
+#define IF_TYPE_A12MPPSWITCH            130 // Avalon Parallel Processor
+#define IF_TYPE_TUNNEL                  131 // Encapsulation interface
+#define IF_TYPE_COFFEE                  132 // Coffee pot
+#define IF_TYPE_CES                     133 // Circuit Emulation Service
+#define IF_TYPE_ATM_SUBINTERFACE        134 // ATM Sub Interface
+#define IF_TYPE_L2_VLAN                 135 // Layer 2 Virtual LAN using 802.1Q
+#define IF_TYPE_L3_IPVLAN               136 // Layer 3 Virtual LAN using IP
+#define IF_TYPE_L3_IPXVLAN              137 // Layer 3 Virtual LAN using IPX
+#define IF_TYPE_DIGITALPOWERLINE        138 // IP over Power Lines
+#define IF_TYPE_MEDIAMAILOVERIP         139 // Multimedia Mail over IP
+#define IF_TYPE_DTM                     140 // Dynamic syncronous Transfer Mode
+#define IF_TYPE_DCN                     141 // Data Communications Network
+#define IF_TYPE_IPFORWARD               142 // IP Forwarding Interface
+#define IF_TYPE_MSDSL                   143 // Multi-rate Symmetric DSL
+#define IF_TYPE_IEEE1394                144 // IEEE1394 High Perf Serial Bus
+#define IF_TYPE_RECEIVE_ONLY            145 // TV adapter type
+
+#define MAX_IF_TYPE                     145
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Access types                                                             //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#define IF_ACCESS_LOOPBACK              1
+#define IF_ACCESS_BROADCAST             2
+#define IF_ACCESS_POINTTOPOINT          3
+#define IF_ACCESS_POINTTOMULTIPOINT     4
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Interface Capabilities (bit flags)                                       //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#define IF_CHECK_NONE                   0x00
+#define IF_CHECK_MCAST                  0x01
+#define IF_CHECK_SEND                   0x02
+
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Connection Types                                                         //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#define IF_CONNECTION_DEDICATED         1
+#define IF_CONNECTION_PASSIVE           2
+#define IF_CONNECTION_DEMAND            3
+
+
+#define IF_ADMIN_STATUS_UP              1
+#define IF_ADMIN_STATUS_DOWN            2
+#define IF_ADMIN_STATUS_TESTING         3
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// The following are the the operational states for WAN and LAN interfaces. //
+// The order of the states seems weird, but is done for a purpose. All      //
+// states >= CONNECTED can transmit data right away. States >= DISCONNECTED //
+// can tx data but some set up might be needed. States < DISCONNECTED can   //
+// not transmit data.                                                       //
+// A card is marked UNREACHABLE if DIM calls InterfaceUnreachable for       //
+// reasons other than failure to connect.                                   //
+//                                                                          //
+// NON_OPERATIONAL -- Valid for LAN Interfaces. Means the card is not       //
+//                      working or not plugged in or has no address.        //
+// UNREACHABLE     -- Valid for WAN Interfaces. Means the remote site is    //
+//                      not reachable at this time.                         //
+// DISCONNECTED    -- Valid for WAN Interfaces. Means the remote site is    //
+//                      not connected at this time.                         //
+// CONNECTING      -- Valid for WAN Interfaces. Means a connection attempt  //
+//                      has been initiated to the remote site.              //
+// CONNECTED       -- Valid for WAN Interfaces. Means the remote site is    //
+//                      connected.                                          //
+// OPERATIONAL     -- Valid for LAN Interfaces. Means the card is plugged   //
+//                      in and working.                                     //
+//                                                                          //
+// It is the users duty to convert these values to MIB-II values if they    //
+// are to be used by a subagent                                             //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#define IF_OPER_STATUS_NON_OPERATIONAL  0
+#define IF_OPER_STATUS_UNREACHABLE      1
+#define IF_OPER_STATUS_DISCONNECTED     2
+#define IF_OPER_STATUS_CONNECTING       3
+#define IF_OPER_STATUS_CONNECTED        4
+#define IF_OPER_STATUS_OPERATIONAL      5
+
+#define MIB_IF_TYPE_OTHER               1
+#define MIB_IF_TYPE_ETHERNET            6
+#define MIB_IF_TYPE_TOKENRING           9
+#define MIB_IF_TYPE_FDDI                15
+#define MIB_IF_TYPE_PPP                 23
+#define MIB_IF_TYPE_LOOPBACK            24
+#define MIB_IF_TYPE_SLIP                28
+
+#define MIB_IF_ADMIN_STATUS_UP          1
+#define MIB_IF_ADMIN_STATUS_DOWN        2
+#define MIB_IF_ADMIN_STATUS_TESTING     3
+
+#define MIB_IF_OPER_STATUS_NON_OPERATIONAL      0
+#define MIB_IF_OPER_STATUS_UNREACHABLE          1
+#define MIB_IF_OPER_STATUS_DISCONNECTED         2
+#define MIB_IF_OPER_STATUS_CONNECTING           3
+#define MIB_IF_OPER_STATUS_CONNECTED            4
+#define MIB_IF_OPER_STATUS_OPERATIONAL          5
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //__ROUTING_IPIFCONS_H__
diff --git a/base/Windows/Inc/Iprtrmib.h b/base/Windows/Inc/Iprtrmib.h
new file mode 100644
index 0000000..7f3f439
--- /dev/null
+++ b/base/Windows/Inc/Iprtrmib.h
@@ -0,0 +1,802 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    iprtrmib.h
+
+Abstract:
+    This file contains:
+        o Definitions of the MIB_XX structures passed to and from the IP Router Manager
+            to query and set MIB variables handled by the IP Router Manager
+        o The #defines for the MIB variables IDs  handled by the IP Router Manager
+            and made accessible by the MprAdminMIBXXX APIs
+        o The Routing PID of the IP Router Manager (as mentioned in ipinfoid.h)
+
+--*/
+
+#ifndef __ROUTING_IPRTRMIB_H__
+#define __ROUTING_IPRTRMIB_H__
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4201)
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Included to get the value of MAX_INTERFACE_NAME_LEN                      //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#include <mprapi.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// Included to get the necessary constants                                  //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+#include <ipifcons.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// This is the Id for IP Router Manager.  The Router Manager handles        //
+// MIB-II, Forwarding MIB and some enterprise specific information.         //
+// Calls made with any other ID are passed on to the corresponding protocol //
+// For example, an MprAdminMIBXXX call with a protocol ID of PID_IP and    //
+// a routing Id of 0xD will be sent to the IP Router Manager and then       //
+// forwarded to OSPF                                                        //
+// This lives in the same number space as the protocol Ids of RIP, OSPF     //
+// etc, so any change made to it should be done keeping this in mind        //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+
+#define IPRTRMGR_PID 10000
+
+#ifndef ANY_SIZE
+
+#define ANY_SIZE 1
+
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// The following #defines are the Ids of the MIB variables made accessible  //
+// to the user via MprAdminMIBXXX Apis.  It will be noticed that these are  //
+// not the same as RFC 1213, since the MprAdminMIBXXX APIs work on rows and //
+// groups instead of scalar variables                                       //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+
+#define IF_NUMBER           0
+#define IF_TABLE            (IF_NUMBER          + 1)
+#define IF_ROW              (IF_TABLE           + 1)
+#define IP_STATS            (IF_ROW             + 1)
+#define IP_ADDRTABLE        (IP_STATS           + 1)
+#define IP_ADDRROW          (IP_ADDRTABLE       + 1)
+#define IP_FORWARDNUMBER    (IP_ADDRROW         + 1)
+#define IP_FORWARDTABLE     (IP_FORWARDNUMBER   + 1)
+#define IP_FORWARDROW       (IP_FORWARDTABLE    + 1)
+#define IP_NETTABLE         (IP_FORWARDROW      + 1)
+#define IP_NETROW           (IP_NETTABLE        + 1)
+#define ICMP_STATS          (IP_NETROW          + 1)
+#define TCP_STATS           (ICMP_STATS         + 1)
+#define TCP_TABLE           (TCP_STATS          + 1)
+#define TCP_ROW             (TCP_TABLE          + 1)
+#define UDP_STATS           (TCP_ROW            + 1)
+#define UDP_TABLE           (UDP_STATS          + 1)
+#define UDP_ROW             (UDP_TABLE          + 1)
+#define MCAST_MFE           (UDP_ROW            + 1)
+#define MCAST_MFE_STATS     (MCAST_MFE          + 1)
+#define BEST_IF             (MCAST_MFE_STATS    + 1)
+#define BEST_ROUTE          (BEST_IF            + 1)
+#define PROXY_ARP           (BEST_ROUTE         + 1)
+#define MCAST_IF_ENTRY      (PROXY_ARP          + 1)
+#define MCAST_GLOBAL        (MCAST_IF_ENTRY     + 1)
+#define IF_STATUS           (MCAST_GLOBAL       + 1)
+#define MCAST_BOUNDARY      (IF_STATUS          + 1)
+#define MCAST_SCOPE         (MCAST_BOUNDARY     + 1)
+#define DEST_MATCHING       (MCAST_SCOPE        + 1)
+#define DEST_LONGER         (DEST_MATCHING      + 1)
+#define DEST_SHORTER        (DEST_LONGER        + 1)
+#define ROUTE_MATCHING      (DEST_SHORTER       + 1)
+#define ROUTE_LONGER        (ROUTE_MATCHING     + 1)
+#define ROUTE_SHORTER       (ROUTE_LONGER       + 1)
+#define ROUTE_STATE         (ROUTE_SHORTER      + 1)
+#define MCAST_MFE_STATS_EX  (ROUTE_STATE        + 1)
+#define IP6_STATS           (MCAST_MFE_STATS_EX + 1)
+#define UDP6_STATS          (IP6_STATS          + 1)
+#define TCP6_STATS          (UDP6_STATS         + 1)
+
+#define NUMBER_OF_EXPORTED_VARIABLES    (TCP6_STATS + 1)
+
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// MIB_OPAQUE_QUERY is the structure filled in by the user to identify a    //
+// MIB variable                                                             //
+//                                                                          //
+//  dwVarId     ID of MIB Variable (One of the Ids #defined above)          //
+//  dwVarIndex  Variable sized array containing the indices needed to       //
+//              identify a variable. NOTE: Unlike SNMP we dont require that //
+//              a scalar variable be indexed by 0                           //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+typedef struct _MIB_OPAQUE_QUERY
+{
+    DWORD  dwVarId;
+    DWORD  rgdwVarIndex[ANY_SIZE];
+}MIB_OPAQUE_QUERY, *PMIB_OPAQUE_QUERY;
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// The following are the structures which are filled in and returned to the //
+// user when a query is made, OR  are filled in BY THE USER when a set is   //
+// done                                                                     //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+typedef struct _MIB_IFNUMBER
+{
+    DWORD    dwValue;
+} MIB_IFNUMBER, *PMIB_IFNUMBER;
+
+
+#define MAXLEN_IFDESCR 256
+#define MAXLEN_PHYSADDR 8
+
+typedef struct _MIB_IFROW
+{
+    WCHAR   wszName[MAX_INTERFACE_NAME_LEN];
+    DWORD    dwIndex;
+    DWORD    dwType;
+    DWORD    dwMtu;
+    DWORD    dwSpeed;
+    DWORD    dwPhysAddrLen;
+    BYTE    bPhysAddr[MAXLEN_PHYSADDR];
+    DWORD    dwAdminStatus;
+    DWORD    dwOperStatus;
+    DWORD    dwLastChange;
+    DWORD    dwInOctets;
+    DWORD    dwInUcastPkts;
+    DWORD    dwInNUcastPkts;
+    DWORD    dwInDiscards;
+    DWORD    dwInErrors;
+    DWORD    dwInUnknownProtos;
+    DWORD    dwOutOctets;
+    DWORD    dwOutUcastPkts;
+    DWORD    dwOutNUcastPkts;
+    DWORD    dwOutDiscards;
+    DWORD    dwOutErrors;
+    DWORD    dwOutQLen;
+    DWORD    dwDescrLen;
+    BYTE    bDescr[MAXLEN_IFDESCR];
+} MIB_IFROW,*PMIB_IFROW;
+
+typedef struct _MIB_IFTABLE
+{
+    DWORD     dwNumEntries;
+    MIB_IFROW table[ANY_SIZE];
+} MIB_IFTABLE, *PMIB_IFTABLE;
+
+#define SIZEOF_IFTABLE(X) (FIELD_OFFSET(MIB_IFTABLE,table[0]) + ((X) * sizeof(MIB_IFROW)) + ALIGN_SIZE)
+
+typedef struct _MIBICMPSTATS
+{
+    DWORD        dwMsgs;
+    DWORD        dwErrors;
+    DWORD        dwDestUnreachs;
+    DWORD        dwTimeExcds;
+    DWORD        dwParmProbs;
+    DWORD        dwSrcQuenchs;
+    DWORD        dwRedirects;
+    DWORD        dwEchos;
+    DWORD        dwEchoReps;
+    DWORD        dwTimestamps;
+    DWORD        dwTimestampReps;
+    DWORD        dwAddrMasks;
+    DWORD        dwAddrMaskReps;
+} MIBICMPSTATS, *PMIBICMPSTATS;
+
+typedef    struct _MIBICMPINFO
+{
+    MIBICMPSTATS    icmpInStats;
+    MIBICMPSTATS    icmpOutStats;
+} MIBICMPINFO;
+
+typedef struct _MIB_ICMP
+{
+    MIBICMPINFO stats;
+} MIB_ICMP,*PMIB_ICMP;
+
+//
+// ICMPv6 Type Values from RFC 2292.
+//
+typedef enum {
+    ICMP6_DST_UNREACH          =   1,
+    ICMP6_PACKET_TOO_BIG       =   2,
+    ICMP6_TIME_EXCEEDED        =   3,
+    ICMP6_PARAM_PROB           =   4,
+    ICMP6_ECHO_REQUEST         = 128,
+    ICMP6_ECHO_REPLY           = 129,
+    ICMP6_MEMBERSHIP_QUERY     = 130,
+    ICMP6_MEMBERSHIP_REPORT    = 131,
+    ICMP6_MEMBERSHIP_REDUCTION = 132,
+    ND_ROUTER_SOLICIT          = 133,
+    ND_ROUTER_ADVERT           = 134,
+    ND_NEIGHBOR_SOLICIT        = 135,
+    ND_NEIGHBOR_ADVERT         = 136,
+    ND_REDIRECT                = 137,
+} ICMP6_TYPE, *PICMP6_TYPE;
+
+//
+// There are no RFC-specified defines for ICMPv4 message types, so we try to
+// use the ICMP6 values from RFC 2292 modified to be prefixed with ICMP4.
+//
+typedef enum {
+    ICMP4_ECHO_REPLY        =  0, // Echo Reply
+    ICMP4_DST_UNREACH       =  3, // Destination Unreachable
+    ICMP4_SOURCE_QUENCH     =  4, // Source Quench
+    ICMP4_REDIRECT          =  5, // Redirect
+    ICMP4_ECHO_REQUEST      =  8, // Echo Request
+    ICMP4_ROUTER_ADVERT     =  9, // Router Advertisement
+    ICMP4_ROUTER_SOLICIT    = 10, // Router Solicitation
+    ICMP4_TIME_EXCEEDED     = 11, // Time Exceeded
+    ICMP4_PARAM_PROB        = 12, // Parameter Problem
+    ICMP4_TIMESTAMP_REQUEST = 13, // Timestamp Request
+    ICMP4_TIMESTAMP_REPLY   = 14, // Timestamp Reply
+    ICMP4_MASK_REQUEST      = 17, // Address Mask Request
+    ICMP4_MASK_REPLY        = 18, // Address Mask Reply
+} ICMP4_TYPE, *PICMP4_TYPE;
+
+typedef struct _MIBICMPSTATS_EX
+{
+    DWORD       dwMsgs;
+    DWORD       dwErrors;
+    DWORD       rgdwTypeCount[256];
+} MIBICMPSTATS_EX, *PMIBICMPSTATS_EX;
+
+typedef struct _MIB_ICMP_EX
+{
+    MIBICMPSTATS_EX icmpInStats;
+    MIBICMPSTATS_EX icmpOutStats;
+} MIB_ICMP_EX,*PMIB_ICMP_EX;
+
+typedef struct _MIB_UDPSTATS
+{
+    DWORD       dwInDatagrams;
+    DWORD       dwNoPorts;
+    DWORD       dwInErrors;
+    DWORD       dwOutDatagrams;
+    DWORD       dwNumAddrs;
+} MIB_UDPSTATS,*PMIB_UDPSTATS;
+
+typedef struct _MIB_UDPROW
+{
+    DWORD       dwLocalAddr;
+    DWORD       dwLocalPort;
+} MIB_UDPROW, *PMIB_UDPROW;
+
+typedef struct _MIB_UDPTABLE
+{
+    DWORD       dwNumEntries;
+    MIB_UDPROW  table[ANY_SIZE];
+} MIB_UDPTABLE, *PMIB_UDPTABLE;
+
+#define SIZEOF_UDPTABLE(X) (FIELD_OFFSET(MIB_UDPTABLE, table[0]) + ((X) * sizeof(MIB_UDPROW)) + ALIGN_SIZE)
+
+typedef struct _MIB_TCPSTATS
+{
+    DWORD       dwRtoAlgorithm;
+    DWORD       dwRtoMin;
+    DWORD       dwRtoMax;
+    DWORD       dwMaxConn;
+    DWORD       dwActiveOpens;
+    DWORD       dwPassiveOpens;
+    DWORD       dwAttemptFails;
+    DWORD       dwEstabResets;
+    DWORD       dwCurrEstab;
+    DWORD       dwInSegs;
+    DWORD       dwOutSegs;
+    DWORD       dwRetransSegs;
+    DWORD       dwInErrs;
+    DWORD       dwOutRsts;
+    DWORD       dwNumConns;
+} MIB_TCPSTATS, *PMIB_TCPSTATS;
+
+#define MIB_TCP_RTO_OTHER       1
+#define MIB_TCP_RTO_CONSTANT    2
+#define MIB_TCP_RTO_RSRE        3
+#define MIB_TCP_RTO_VANJ        4
+
+#define MIB_TCP_MAXCONN_DYNAMIC (DWORD)-1
+
+typedef struct _MIB_TCPROW
+{
+    DWORD       dwState;
+    DWORD       dwLocalAddr;
+    DWORD       dwLocalPort;
+    DWORD       dwRemoteAddr;
+    DWORD       dwRemotePort;
+} MIB_TCPROW, *PMIB_TCPROW;
+
+#define MIB_TCP_STATE_CLOSED            1
+#define MIB_TCP_STATE_LISTEN            2
+#define MIB_TCP_STATE_SYN_SENT          3
+#define MIB_TCP_STATE_SYN_RCVD          4
+#define MIB_TCP_STATE_ESTAB             5
+#define MIB_TCP_STATE_FIN_WAIT1         6
+#define MIB_TCP_STATE_FIN_WAIT2         7
+#define MIB_TCP_STATE_CLOSE_WAIT        8
+#define MIB_TCP_STATE_CLOSING           9
+#define MIB_TCP_STATE_LAST_ACK         10
+#define MIB_TCP_STATE_TIME_WAIT        11
+#define MIB_TCP_STATE_DELETE_TCB       12
+
+typedef struct _MIB_TCPTABLE
+{
+    DWORD      dwNumEntries;
+    MIB_TCPROW table[ANY_SIZE];
+} MIB_TCPTABLE, *PMIB_TCPTABLE;
+
+#define SIZEOF_TCPTABLE(X) (FIELD_OFFSET(MIB_TCPTABLE,table[0]) + ((X) * sizeof(MIB_TCPROW)) + ALIGN_SIZE)
+
+#define MIB_USE_CURRENT_TTL         ((DWORD)-1)
+#define MIB_USE_CURRENT_FORWARDING  ((DWORD)-1)
+
+typedef struct _MIB_IPSTATS
+{
+    DWORD        dwForwarding;
+    DWORD        dwDefaultTTL;
+    DWORD        dwInReceives;
+    DWORD        dwInHdrErrors;
+    DWORD        dwInAddrErrors;
+    DWORD        dwForwDatagrams;
+    DWORD        dwInUnknownProtos;
+    DWORD        dwInDiscards;
+    DWORD        dwInDelivers;
+    DWORD        dwOutRequests;
+    DWORD        dwRoutingDiscards;
+    DWORD        dwOutDiscards;
+    DWORD        dwOutNoRoutes;
+    DWORD        dwReasmTimeout;
+    DWORD        dwReasmReqds;
+    DWORD        dwReasmOks;
+    DWORD        dwReasmFails;
+    DWORD        dwFragOks;
+    DWORD        dwFragFails;
+    DWORD        dwFragCreates;
+    DWORD        dwNumIf;
+    DWORD        dwNumAddr;
+    DWORD        dwNumRoutes;
+} MIB_IPSTATS, *PMIB_IPSTATS;
+
+#define    MIB_IP_FORWARDING               1
+#define    MIB_IP_NOT_FORWARDING           2
+
+
+// Note: These addr types have dependency on ipdef.h
+
+#define MIB_IPADDR_PRIMARY      0x0001   // Primary ipaddr
+#define MIB_IPADDR_DYNAMIC      0x0004   // Dynamic ipaddr
+#define MIB_IPADDR_DISCONNECTED 0x0008   // Address is on disconnected interface
+#define MIB_IPADDR_DELETED      0x0040   // Address being deleted
+#define MIB_IPADDR_TRANSIENT    0x0080   // Transient address
+
+
+typedef struct _MIB_IPADDRROW
+{
+    DWORD        dwAddr;
+    DWORD        dwIndex;
+    DWORD        dwMask;
+    DWORD        dwBCastAddr;
+    DWORD        dwReasmSize;
+    unsigned short    unused1;
+    unsigned short    wType;
+} MIB_IPADDRROW, *PMIB_IPADDRROW;
+
+typedef struct _MIB_IPADDRTABLE
+{
+    DWORD         dwNumEntries;
+    MIB_IPADDRROW table[ANY_SIZE];
+} MIB_IPADDRTABLE, *PMIB_IPADDRTABLE;
+
+
+#define SIZEOF_IPADDRTABLE(X) (FIELD_OFFSET(MIB_IPADDRTABLE,table[0]) + ((X) * sizeof(MIB_IPADDRROW)) + ALIGN_SIZE)
+
+
+typedef struct _MIB_IPFORWARDNUMBER
+{
+    DWORD      dwValue;
+}MIB_IPFORWARDNUMBER,*PMIB_IPFORWARDNUMBER;
+
+typedef struct _MIB_IPFORWARDROW
+{
+    DWORD        dwForwardDest;
+    DWORD        dwForwardMask;
+    DWORD        dwForwardPolicy;
+    DWORD        dwForwardNextHop;
+    DWORD        dwForwardIfIndex;
+    DWORD        dwForwardType;
+    DWORD        dwForwardProto;
+    DWORD        dwForwardAge;
+    DWORD       dwForwardNextHopAS;
+    DWORD        dwForwardMetric1;
+    DWORD        dwForwardMetric2;
+    DWORD        dwForwardMetric3;
+    DWORD        dwForwardMetric4;
+    DWORD        dwForwardMetric5;
+}MIB_IPFORWARDROW, *PMIB_IPFORWARDROW;
+
+#define    MIB_IPROUTE_TYPE_OTHER        1
+#define    MIB_IPROUTE_TYPE_INVALID    2
+#define    MIB_IPROUTE_TYPE_DIRECT        3
+#define    MIB_IPROUTE_TYPE_INDIRECT    4
+
+#define    MIB_IPROUTE_METRIC_UNUSED    (DWORD)-1
+
+//
+// THESE MUST MATCH the ids in routprot.h
+//
+
+#define MIB_IPPROTO_OTHER                1
+#define MIB_IPPROTO_LOCAL                2
+#define MIB_IPPROTO_NETMGMT                3
+#define MIB_IPPROTO_ICMP                4
+#define MIB_IPPROTO_EGP                    5
+#define MIB_IPPROTO_GGP                    6
+#define MIB_IPPROTO_HELLO                7
+#define MIB_IPPROTO_RIP                    8
+#define MIB_IPPROTO_IS_IS                9
+#define MIB_IPPROTO_ES_IS                10
+#define MIB_IPPROTO_CISCO                11
+#define MIB_IPPROTO_BBN                    12
+#define MIB_IPPROTO_OSPF                13
+#define MIB_IPPROTO_BGP                    14
+
+#define MIB_IPPROTO_NT_AUTOSTATIC       10002
+#define MIB_IPPROTO_NT_STATIC           10006
+#define MIB_IPPROTO_NT_STATIC_NON_DOD   10007
+
+typedef struct _MIB_IPFORWARDTABLE
+{
+    DWORD               dwNumEntries;
+    MIB_IPFORWARDROW    table[ANY_SIZE];
+}MIB_IPFORWARDTABLE, *PMIB_IPFORWARDTABLE;
+
+
+
+
+#define SIZEOF_IPFORWARDTABLE(X) (FIELD_OFFSET(MIB_IPFORWARDTABLE,table[0]) + ((X) * sizeof(MIB_IPFORWARDROW)) + ALIGN_SIZE)
+
+
+typedef struct _MIB_IPNETROW
+{
+    DWORD        dwIndex;
+    DWORD        dwPhysAddrLen;
+    BYTE        bPhysAddr[MAXLEN_PHYSADDR];
+    DWORD        dwAddr;
+    DWORD        dwType;
+} MIB_IPNETROW, *PMIB_IPNETROW;
+
+#define    MIB_IPNET_TYPE_OTHER        1
+#define    MIB_IPNET_TYPE_INVALID        2
+#define    MIB_IPNET_TYPE_DYNAMIC        3
+#define    MIB_IPNET_TYPE_STATIC        4
+
+typedef struct _MIB_IPNETTABLE
+{
+    DWORD             dwNumEntries;
+    MIB_IPNETROW      table[ANY_SIZE];
+} MIB_IPNETTABLE, *PMIB_IPNETTABLE;
+
+#define SIZEOF_IPNETTABLE(X) (FIELD_OFFSET(MIB_IPNETTABLE, table[0]) + ((X) * sizeof(MIB_IPNETROW)) + ALIGN_SIZE)
+
+typedef struct _MIB_IPMCAST_OIF
+{
+    DWORD   dwOutIfIndex;
+    DWORD   dwNextHopAddr;
+    DWORD   dwReserved;
+    DWORD   dwReserved1;
+}MIB_IPMCAST_OIF, *PMIB_IPMCAST_OIF;
+
+typedef struct _MIB_IPMCAST_MFE
+{
+    DWORD   dwGroup;
+    DWORD   dwSource;
+    DWORD   dwSrcMask;
+    DWORD   dwUpStrmNgbr;
+    DWORD   dwInIfIndex;
+    DWORD   dwInIfProtocol;
+    DWORD   dwRouteProtocol;
+    DWORD   dwRouteNetwork;
+    DWORD   dwRouteMask;
+    ULONG   ulUpTime;
+    ULONG   ulExpiryTime;
+    ULONG   ulTimeOut;
+    ULONG   ulNumOutIf;
+    DWORD   fFlags;
+    DWORD   dwReserved;
+    MIB_IPMCAST_OIF rgmioOutInfo[ANY_SIZE];
+}MIB_IPMCAST_MFE, *PMIB_IPMCAST_MFE;
+
+typedef struct _MIB_MFE_TABLE
+{
+    DWORD           dwNumEntries;
+    MIB_IPMCAST_MFE table[ANY_SIZE];
+}MIB_MFE_TABLE, *PMIB_MFE_TABLE;
+
+
+#define SIZEOF_BASIC_MIB_MFE          \
+    (ULONG)(FIELD_OFFSET(MIB_IPMCAST_MFE, rgmioOutInfo[0]))
+
+#define SIZEOF_MIB_MFE(X)             \
+    (SIZEOF_BASIC_MIB_MFE + ((X) * sizeof(MIB_IPMCAST_OIF)))
+
+
+typedef struct _MIB_IPMCAST_OIF_STATS
+{
+    DWORD   dwOutIfIndex;
+    DWORD   dwNextHopAddr;
+    DWORD   dwDialContext;
+    ULONG   ulTtlTooLow;
+    ULONG   ulFragNeeded;
+    ULONG   ulOutPackets;
+    ULONG   ulOutDiscards;
+}MIB_IPMCAST_OIF_STATS, *PMIB_IPMCAST_OIF_STATS;
+
+typedef struct _MIB_IPMCAST_MFE_STATS
+{
+    DWORD   dwGroup;
+    DWORD   dwSource;
+    DWORD   dwSrcMask;
+    DWORD   dwUpStrmNgbr;
+    DWORD   dwInIfIndex;
+    DWORD   dwInIfProtocol;
+    DWORD   dwRouteProtocol;
+    DWORD   dwRouteNetwork;
+    DWORD   dwRouteMask;
+    ULONG   ulUpTime;
+    ULONG   ulExpiryTime;
+    ULONG   ulNumOutIf;
+    ULONG   ulInPkts;
+    ULONG   ulInOctets;
+    ULONG   ulPktsDifferentIf;
+    ULONG   ulQueueOverflow;
+
+    MIB_IPMCAST_OIF_STATS   rgmiosOutStats[ANY_SIZE];
+}MIB_IPMCAST_MFE_STATS, *PMIB_IPMCAST_MFE_STATS;
+
+typedef struct _MIB_MFE_STATS_TABLE
+{
+    DWORD       dwNumEntries;
+    MIB_IPMCAST_MFE_STATS   table[ANY_SIZE];
+}MIB_MFE_STATS_TABLE, *PMIB_MFE_STATS_TABLE;
+
+#define SIZEOF_BASIC_MIB_MFE_STATS    \
+    (ULONG)(FIELD_OFFSET(MIB_IPMCAST_MFE_STATS, rgmiosOutStats[0]))
+
+#define SIZEOF_MIB_MFE_STATS(X)       \
+    (SIZEOF_BASIC_MIB_MFE_STATS + ((X) * sizeof(MIB_IPMCAST_OIF_STATS)))
+
+
+typedef struct _MIB_IPMCAST_MFE_STATS_EX
+{
+    DWORD   dwGroup;
+    DWORD   dwSource;
+    DWORD   dwSrcMask;
+    DWORD   dwUpStrmNgbr;
+    DWORD   dwInIfIndex;
+    DWORD   dwInIfProtocol;
+    DWORD   dwRouteProtocol;
+    DWORD   dwRouteNetwork;
+    DWORD   dwRouteMask;
+    ULONG   ulUpTime;
+    ULONG   ulExpiryTime;
+    ULONG   ulNumOutIf;
+    ULONG   ulInPkts;
+    ULONG   ulInOctets;
+    ULONG   ulPktsDifferentIf;
+    ULONG   ulQueueOverflow;
+    ULONG   ulUninitMfe;
+    ULONG   ulNegativeMfe;
+    ULONG   ulInDiscards;
+    ULONG   ulInHdrErrors;
+    ULONG   ulTotalOutPackets;
+
+    MIB_IPMCAST_OIF_STATS   rgmiosOutStats[ANY_SIZE];
+}MIB_IPMCAST_MFE_STATS_EX, *PMIB_IPMCAST_MFE_STATS_EX;
+
+typedef struct _MIB_MFE_STATS_TABLE_EX
+{
+    DWORD       dwNumEntries;
+    MIB_IPMCAST_MFE_STATS_EX   table[ANY_SIZE];
+}MIB_MFE_STATS_TABLE_EX, *PMIB_MFE_STATS_TABLE_EX;
+
+#define SIZEOF_BASIC_MIB_MFE_STATS_EX    \
+    (ULONG)(FIELD_OFFSET(MIB_IPMCAST_MFE_STATS_EX, rgmiosOutStats[0]))
+
+#define SIZEOF_MIB_MFE_STATS_EX(X)       \
+    (SIZEOF_BASIC_MIB_MFE_STATS_EX + ((X) * sizeof(MIB_IPMCAST_OIF_STATS)))
+
+
+typedef struct _MIB_IPMCAST_GLOBAL {
+    DWORD   dwEnable;
+}MIB_IPMCAST_GLOBAL, *PMIB_IPMCAST_GLOBAL;
+
+typedef struct _MIB_IPMCAST_IF_ENTRY
+{
+    DWORD   dwIfIndex;
+    DWORD   dwTtl;
+    DWORD   dwProtocol;
+    DWORD   dwRateLimit;
+    ULONG   ulInMcastOctets;
+    ULONG   ulOutMcastOctets;
+}MIB_IPMCAST_IF_ENTRY, *PMIB_IPMCAST_IF_ENTRY;
+
+typedef struct _MIB_IPMCAST_IF_TABLE
+{
+    DWORD       dwNumEntries;
+    MIB_IPMCAST_IF_ENTRY   table[ANY_SIZE];
+}MIB_IPMCAST_IF_TABLE, *PMIB_IPMCAST_IF_TABLE;
+
+#define SIZEOF_MCAST_IF_TABLE(X) (FIELD_OFFSET(MIB_IPMCAST_IF_TABLE,table[0]) + ((X) * sizeof(MIB_IPMCAST_IF_ENTRY)) + ALIGN_SIZE)
+
+typedef struct _MIB_IPMCAST_BOUNDARY
+{
+    DWORD   dwIfIndex;
+    DWORD   dwGroupAddress;
+    DWORD   dwGroupMask;
+    DWORD   dwStatus;
+}MIB_IPMCAST_BOUNDARY, *PMIB_IPMCAST_BOUNDARY;
+
+typedef struct _MIB_IPMCAST_BOUNDARY_TABLE
+{
+    DWORD       dwNumEntries;
+    MIB_IPMCAST_BOUNDARY   table[ANY_SIZE];
+}MIB_IPMCAST_BOUNDARY_TABLE, *PMIB_IPMCAST_BOUNDARY_TABLE;
+
+#define SIZEOF_BOUNDARY_TABLE(X) (FIELD_OFFSET(MIB_IPMCAST_BOUNDARY_TABLE,table[0]) + ((X) * sizeof(MIB_IPMCAST_BOUNDARY)) + ALIGN_SIZE)
+
+typedef struct {
+    DWORD    dwGroupAddress;
+    DWORD    dwGroupMask;
+} MIB_BOUNDARYROW, *PMIB_BOUNDARYROW;
+
+// Structure matching what goes in the registry in a block of type
+// IP_MCAST_LIMIT_INFO.  This contains the fields of
+// MIB_IPMCAST_IF_ENTRY which are configurable.
+
+typedef struct {
+    DWORD    dwTtl;
+    DWORD    dwRateLimit;
+} MIB_MCAST_LIMIT_ROW, *PMIB_MCAST_LIMIT_ROW;
+
+#define MAX_SCOPE_NAME_LEN 255
+
+//
+// Scope names are unicode.  SNMP and MZAP use UTF-8 encoding.
+//
+
+#define SN_UNICODE
+typedef WCHAR   SN_CHAR;
+typedef SN_CHAR SCOPE_NAME_BUFFER[MAX_SCOPE_NAME_LEN+1], *SCOPE_NAME;
+
+typedef struct _MIB_IPMCAST_SCOPE
+{
+    DWORD             dwGroupAddress;
+    DWORD             dwGroupMask;
+    SCOPE_NAME_BUFFER snNameBuffer;
+    DWORD             dwStatus;
+}MIB_IPMCAST_SCOPE, *PMIB_IPMCAST_SCOPE;
+
+typedef struct _MIB_IPDESTROW
+{
+#ifdef __cplusplus
+    MIB_IPFORWARDROW  ForwardRow;
+#else
+    MIB_IPFORWARDROW;
+#endif
+
+    DWORD             dwForwardPreference;
+    DWORD             dwForwardViewSet;
+}MIB_IPDESTROW, *PMIB_IPDESTROW;
+
+typedef struct _MIB_IPDESTTABLE
+{
+    DWORD             dwNumEntries;
+    MIB_IPDESTROW     table[ANY_SIZE];
+}MIB_IPDESTTABLE, *PMIB_IPDESTTABLE;
+
+typedef struct _MIB_BEST_IF
+{
+    DWORD       dwDestAddr;
+    DWORD       dwIfIndex;
+}MIB_BEST_IF, *PMIB_BEST_IF;
+
+typedef struct _MIB_PROXYARP
+{
+    DWORD       dwAddress;
+    DWORD       dwMask;
+    DWORD       dwIfIndex;
+}MIB_PROXYARP, *PMIB_PROXYARP;
+
+typedef struct _MIB_IFSTATUS
+{
+    DWORD       dwIfIndex;
+    DWORD       dwAdminStatus;
+    DWORD       dwOperationalStatus;
+    BOOL        bMHbeatActive;
+    BOOL        bMHbeatAlive;
+}MIB_IFSTATUS, *PMIB_IFSTATUS;
+
+typedef struct _MIB_ROUTESTATE
+{
+    BOOL        bRoutesSetToStack;
+
+}MIB_ROUTESTATE, *PMIB_ROUTESTATE;
+
+//////////////////////////////////////////////////////////////////////////////
+//                                                                          //
+// All the info passed to (SET/CREATE) and from (GET/GETNEXT/GETFIRST)      //
+// IP Router Manager is encapsulated in the following "discriminated"       //
+// union.  To pass, say MIB_IFROW, use the following code                   //
+//                                                                          //
+//  PMIB_OPAQUE_INFO    pInfo;                                              //
+//  PMIB_IFROW          pIfRow;                                             //
+//  DWORD rgdwBuff[(MAX_MIB_OFFSET + sizeof(MIB_IFROW))/sizeof(DWORD) + 1]; //
+//                                                                          //
+//  pInfo   = (PMIB_OPAQUE_INFO)rgdwBuffer;                                 //
+//  pIfRow  = (MIB_IFROW *)(pInfo->rgbyData);                               //
+//                                                                          //
+//  This can also be accomplished by using the following macro              //
+//                                                                          //
+//  DEFINE_MIB_BUFFER(pInfo,MIB_IFROW, pIfRow);                             //
+//                                                                          //
+//////////////////////////////////////////////////////////////////////////////
+
+
+typedef struct _MIB_OPAQUE_INFO
+{
+    DWORD  dwId;
+
+    union
+    {
+        ULONGLONG   ullAlign;
+        BYTE        rgbyData[1];
+    };
+
+}MIB_OPAQUE_INFO, *PMIB_OPAQUE_INFO;
+
+#define MAX_MIB_OFFSET      8
+
+#define MIB_INFO_SIZE(S)                \
+    (MAX_MIB_OFFSET + sizeof(S))
+
+#define MIB_INFO_SIZE_IN_DWORDS(S)      \
+    ((MIB_INFO_SIZE(S))/sizeof(DWORD) + 1)
+
+#define DEFINE_MIB_BUFFER(X,Y,Z)                                        \
+    DWORD        __rgdwBuff[MIB_INFO_SIZE_IN_DWORDS(Y)]; \
+    PMIB_OPAQUE_INFO    X = (PMIB_OPAQUE_INFO)__rgdwBuff;               \
+    Y *                 Z = (Y *)(X->rgbyData)
+
+
+#define CAST_MIB_INFO(X,Y,Z)    Z = (Y)(X->rgbyData)
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4201)
+#endif
+
+#endif //__ROUTING_IPRTRMIB_H__
diff --git a/base/Windows/Inc/LMCons.h b/base/Windows/Inc/LMCons.h
new file mode 100644
index 0000000..6f7e1fb
--- /dev/null
+++ b/base/Windows/Inc/LMCons.h
@@ -0,0 +1,259 @@
+/*++ BUILD Version: 0003    // Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+
+    LMCONS.H (was NETCONS.H in LM 2.x)
+
+Abstract:
+
+    This file contains constants used throughout the LAN Manager
+    API header files.  It should be included in any source file
+    that is going to include other LAN Manager API header files or
+    call a LAN Manager API.
+
+    NOTE:  Lengths of strings are given as the maximum lengths of the
+    string in characters (not bytes).  This does not include space for the
+    terminating 0-characters.  When allocating space for such an item,
+    use the form:
+
+        TCHAR username[UNLEN+1];
+
+    Definitions of the form LN20_* define those values in effect for
+    LanMan 2.0.
+
+
+
+--*/
+
+/*NOINC*/
+#ifndef NETCONS_INCLUDED
+
+#define NETCONS_INCLUDED
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+/*INC*/
+
+#ifndef PASCAL
+#define PASCAL                          // pascal on OS/2
+#endif
+
+#ifndef FAR
+#define FAR                             // far on OS/2
+#endif
+
+//
+// String Lengths for various LanMan names
+//
+
+#define CNLEN       15                  // Computer name length
+#define LM20_CNLEN  15                  // LM 2.0 Computer name length
+#define DNLEN       CNLEN               // Maximum domain name length
+#define LM20_DNLEN  LM20_CNLEN          // LM 2.0 Maximum domain name length
+
+#if (CNLEN != DNLEN)
+#error CNLEN and DNLEN are not equal
+#endif
+
+#define UNCLEN      (CNLEN+2)           // UNC computer name length
+#define LM20_UNCLEN (LM20_CNLEN+2)      // LM 2.0 UNC computer name length
+
+#define NNLEN       80                  // Net name length (share name)
+#define LM20_NNLEN  12                  // LM 2.0 Net name length
+
+#define RMLEN       (UNCLEN+1+NNLEN)    // Max remote name length
+#define LM20_RMLEN  (LM20_UNCLEN+1+LM20_NNLEN) // LM 2.0 Max remote name length
+
+#define SNLEN       80                  // Service name length
+#define LM20_SNLEN  15                  // LM 2.0 Service name length
+#define STXTLEN     256                 // Service text length
+#define LM20_STXTLEN 63                 // LM 2.0 Service text length
+
+#define PATHLEN     256                 // Max. path (not including drive name)
+#define LM20_PATHLEN 256                // LM 2.0 Max. path
+
+#define DEVLEN      80                  // Device name length
+#define LM20_DEVLEN 8                   // LM 2.0 Device name length
+
+#define EVLEN       16                  // Event name length
+
+//
+// User, Group and Password lengths
+//
+
+#define UNLEN       256                 // Maximum user name length
+#define LM20_UNLEN  20                  // LM 2.0 Maximum user name length
+
+#define GNLEN       UNLEN               // Group name
+#define LM20_GNLEN  LM20_UNLEN          // LM 2.0 Group name
+
+#define PWLEN       256                 // Maximum password length
+#define LM20_PWLEN  14                  // LM 2.0 Maximum password length
+
+#define SHPWLEN     8                   // Share password length (bytes)
+
+
+#define CLTYPE_LEN  12                  // Length of client type string
+
+
+#define MAXCOMMENTSZ 256                // Multipurpose comment length
+#define LM20_MAXCOMMENTSZ 48            // LM 2.0 Multipurpose comment length
+
+#define QNLEN       NNLEN               // Queue name maximum length
+#define LM20_QNLEN  LM20_NNLEN          // LM 2.0 Queue name maximum length
+#if (QNLEN != NNLEN)
+# error QNLEN and NNLEN are not equal
+#endif
+
+//
+// The ALERTSZ and MAXDEVENTRIES defines have not yet been NT'ized.
+// Whoever ports these components should change these values appropriately.
+//
+
+#define ALERTSZ     128                 // size of alert string in server
+#define MAXDEVENTRIES (sizeof (int)*8)  // Max number of device entries
+
+                                        //
+                                        // We use int bitmap to represent
+                                        //
+
+#define NETBIOS_NAME_LEN  16            // NetBIOS net name (bytes)
+
+//
+// Value to be used with APIs which have a "preferred maximum length"
+// parameter.  This value indicates that the API should just allocate
+// "as much as it takes."
+//
+
+#define MAX_PREFERRED_LENGTH    ((DWORD) -1)
+
+//
+//        Constants used with encryption
+//
+
+#define CRYPT_KEY_LEN           7
+#define CRYPT_TXT_LEN           8
+#define ENCRYPTED_PWLEN         16
+#define SESSION_PWLEN           24
+#define SESSION_CRYPT_KLEN      21
+
+//
+//  Value to be used with SetInfo calls to allow setting of all
+//  settable parameters (parmnum zero option)
+//
+#ifndef PARMNUM_ALL
+#define PARMNUM_ALL             0
+#endif
+
+#define PARM_ERROR_UNKNOWN      ( (DWORD) (-1) )
+#define PARM_ERROR_NONE         0
+#define PARMNUM_BASE_INFOLEVEL  1000
+
+//
+// Only the UNICODE version of the LM APIs are available on NT.
+// Non-UNICODE version on other platforms
+//
+#if defined( _WIN32_WINNT ) || defined( WINNT ) || defined( __midl ) \
+    || defined( FORCE_UNICODE )
+#define LMSTR   LPWSTR
+#define LMCSTR  LPCWSTR
+#else
+#define LMSTR   LPSTR
+#define LMCSTR  LPCSTR
+#endif
+
+//
+//        Message File Names
+//
+
+#define MESSAGE_FILENAME        TEXT("NETMSG")
+#define OS2MSG_FILENAME         TEXT("BASE")
+#define HELP_MSG_FILENAME       TEXT("NETH")
+
+/**INTERNAL_ONLY**/
+
+// The backup message file named here is a duplicate of net.msg. It
+// is not shipped with the product, but is used at buildtime to
+// msgbind certain messages to netapi.dll and some of the services.
+// This allows for OEMs to modify the message text in net.msg and
+// have those changes show up.        Only in case there is an error in
+// retrieving the messages from net.msg do we then get the bound
+// messages out of bak.msg (really out of the message segment).
+
+#define BACKUP_MSG_FILENAME     TEXT("BAK.MSG")
+
+/**END_INTERNAL**/
+
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+//
+// Keywords used in Function Prototypes
+//
+
+#define NET_API_STATUS          DWORD
+#define API_RET_TYPE            NET_API_STATUS      // Old value: do not use
+#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#define NET_API_FUNCTION    __stdcall
+#else
+#define NET_API_FUNCTION
+#endif
+
+// Define pseudo-keywords.
+#ifndef IN
+#define IN
+#endif
+
+#ifndef OPTIONAL
+#define OPTIONAL
+#endif
+
+#ifndef OUT
+#define OUT
+#endif
+/*INC*/
+
+
+
+//
+// The platform ID indicates the levels to use for platform-specific
+// information.
+//
+
+#define PLATFORM_ID_DOS 300
+#define PLATFORM_ID_OS2 400
+#define PLATFORM_ID_NT  500
+#define PLATFORM_ID_OSF 600
+#define PLATFORM_ID_VMS 700
+
+//
+//      There message numbers assigned to different LANMAN components
+//      are as defined below.
+//
+//      lmerr.h:        2100 - 2999     NERR_BASE
+//      alertmsg.h:     3000 - 3049     ALERT_BASE
+//      lmsvc.h:        3050 - 3099     SERVICE_BASE
+//      lmerrlog.h:     3100 - 3299     ERRLOG_BASE
+//      msgtext.h:      3300 - 3499     MTXT_BASE
+//      apperr.h:       3500 - 3999     APPERR_BASE
+//      apperrfs.h:     4000 - 4299     APPERRFS_BASE
+//      apperr2.h:      4300 - 5299     APPERR2_BASE
+//      ncberr.h:       5300 - 5499     NRCERR_BASE
+//      alertmsg.h:     5500 - 5599     ALERT2_BASE
+//      lmsvc.h:        5600 - 5699     SERVICE2_BASE
+//      lmerrlog.h      5700 - 5899     ERRLOG2_BASE
+//
+
+#define MIN_LANMAN_MESSAGE_ID  NERR_BASE
+#define MAX_LANMAN_MESSAGE_ID  5899
+
+/*NOINC*/
+#endif // NETCONS_INCLUDED
+/*INC*/
diff --git a/base/Windows/Inc/Mprapi.h b/base/Windows/Inc/Mprapi.h
new file mode 100644
index 0000000..f1f9018
--- /dev/null
+++ b/base/Windows/Inc/Mprapi.h
@@ -0,0 +1,1802 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    mpradmin.h
+
+Abstract:
+
+    This file contains the structures, defines and function prototypes for the
+    following APIs:
+
+        MprAdminIsServiceRunning
+        MprAdminServerConnect
+        MprAdminServerDisconnect
+        MprAdminBufferFree
+        MprAdminPortEnum
+        MprAdminConnectionEnum
+        MprAdminPortGetInfo
+        MprAdminConnectionGetInfo
+        MprAdminPortClearStats
+        MprAdminPortReset
+        MprAdminConnectionClearStats
+        MprAdminPortDisconnect
+        MprAdminGetErrorString
+
+        MprAdminAcceptNewConnection
+        MprAdminAcceptNewLink
+        MprAdminConnectionHangupNotification
+        MprAdminLinkHangupNotification
+        MprAdminGetIpAddressForUser
+        MprAdminReleaseIpAddress
+        MprAdminInitializeDll
+        MprAdminTerminateDll
+        MprAdminAcceptNewConnection2
+        MprAdminConnectionHangupNotification2
+
+        MprAdminUserGetInfo
+        MprAdminUserSetInfo
+        MprAdminSendUserMessage
+        MprAdminGetPDCServer
+
+        MprAdminRegisterConnectionNotification
+        MprAdminDeregisterConnectionNotification
+
+        MprAdminIsServiceRunning
+        MprAdminServerConnect
+        MprAdminServerDisconnect
+        MprAdminBufferFree
+        MprAdminServerGetInfo
+        MprAdminGetErrorString
+        MprAdminTransportCreate
+        MprAdminTransportSetInfo
+        MprAdminTransportGetInfo
+        MprAdminInterfaceCreate
+        MprAdminInterfaceDelete
+        MprAdminInterfaceGetInfo
+        MprAdminInterfaceTransportAdd
+        MprAdminInterfaceTransportGetInfo
+        MprAdminInterfaceTransportSetInfo
+        MprAdminInterfaceTransportRemove
+        MprAdminInterfaceGetHandle
+        MprAdminInterfaceSetCredentials
+        MprAdminInterfaceGetCredentials
+        MprAdminInterfaceEnum
+        MprAdminInterfaceConnect
+        MprAdminInterfaceDisconnect
+        MprAdminInterfaceUpdateRoutes
+        MprAdminInterfaceQueryUpdateResult
+        MprAdminInterfaceUpdatePhonebookInfo
+
+        MprAdminMIBServerConnect
+        MprAdminMIBServerDisconnect
+        MprAdminMIBBufferFree
+        MprAdminMIBEntryCreate
+        MprAdminMIBEntryDelete
+        MprAdminMIBEntryGet
+        MprAdminMIBEntrySet
+        MprAdminMIBEntryGetFirst
+        MprAdminMIBEntryGetNext
+        MprAdminMIBSetTrapInfo
+        MprAdminMIBGetTrapInfo
+
+    All MIB APIs operate with the conceptual MIB row.
+
+        MprConfigServerConnect
+        MprConfigServerDisconnect
+        MprConfigBufferFree
+        MprConfigServerGetInfo
+        MprConfigServerBackup
+        MprConfigServerRestore
+        MprConfigTransportCreate
+        MprConfigTransportDelete
+        MprConfigTransportGetHandle
+        MprConfigTransportSetInfo
+        MprConfigTransportGetInfo
+        MprConfigTransportEnum
+        MprConfigInterfaceCreate
+        MprConfigInterfaceDelete
+        MprConfigInterfaceGetHandle
+        MprConfigInterfaceGetInfo
+        MprConfigInterfaceEnum
+        MprConfigInterfaceTransportAdd
+        MprConfigInterfaceTransportRemove
+        MprConfigInterfaceTransportGetHandle
+        MprConfigInterfaceTransportGetInfo
+        MprConfigInterfaceTransportSetInfo
+        MprConfigInterfaceTransportEnum
+
+        MprSetupIpInIpInterfaceFriendlyNameEnum
+        MprSetupIpInIpInterfaceFriendlyNameFree
+        MprSetupIpInIpInterfaceFriendlyNameCreate
+        MprSetupIpInIpInterfaceFriendlyNameDelete
+
+--*/
+
+
+#ifndef __ROUTING_MPRADMIN_H__
+#define __ROUTING_MPRADMIN_H__
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <lmcons.h>
+#include <ras.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#if(WINVER >= 0x0403)
+
+//
+// Name of the Routing and RemoteAccess Service
+//
+
+#define RRAS_SERVICE_NAME       TEXT("RemoteAccess")
+
+//
+// Protocol IDs
+//
+
+#define PID_IPX                 0x0000002B
+#define PID_IP                  0x00000021
+#define PID_NBF                 0x0000003F
+#define PID_ATALK               0x00000029
+
+#define MAX_INTERFACE_NAME_LEN  256
+#define MAX_TRANSPORT_NAME_LEN  40
+#define MAX_MEDIA_NAME          16
+#define MAX_PORT_NAME           16
+#define MAX_DEVICE_NAME         128
+#define MAX_PHONE_NUMBER_LEN    128
+#define MAX_DEVICETYPE_NAME     16
+
+//
+// MPR Interface structures and definitions.
+//
+
+//
+// MPR Interface types
+//
+
+typedef enum _ROUTER_INTERFACE_TYPE
+{
+    ROUTER_IF_TYPE_CLIENT,
+    ROUTER_IF_TYPE_HOME_ROUTER,
+    ROUTER_IF_TYPE_FULL_ROUTER,
+    ROUTER_IF_TYPE_DEDICATED,
+    ROUTER_IF_TYPE_INTERNAL,
+    ROUTER_IF_TYPE_LOOPBACK,
+    ROUTER_IF_TYPE_TUNNEL1,
+    ROUTER_IF_TYPE_DIALOUT
+
+}
+ROUTER_INTERFACE_TYPE;
+
+typedef enum _ROUTER_CONNECTION_STATE
+{
+    ROUTER_IF_STATE_UNREACHABLE,
+    ROUTER_IF_STATE_DISCONNECTED,
+    ROUTER_IF_STATE_CONNECTING,
+    ROUTER_IF_STATE_CONNECTED
+}
+ROUTER_CONNECTION_STATE;
+
+#define MPR_INTERFACE_OUT_OF_RESOURCES              0x00000001
+#define MPR_INTERFACE_ADMIN_DISABLED                0x00000002
+#define MPR_INTERFACE_CONNECTION_FAILURE            0x00000004
+#define MPR_INTERFACE_SERVICE_PAUSED                0x00000008
+#define MPR_INTERFACE_DIALOUT_HOURS_RESTRICTION     0x00000010
+#define MPR_INTERFACE_NO_MEDIA_SENSE                0x00000020
+#define MPR_INTERFACE_NO_DEVICE                     0x00000040
+
+typedef struct _MPR_INTERFACE_0
+{
+    IN OUT  WCHAR                   wszInterfaceName[MAX_INTERFACE_NAME_LEN+1];
+    OUT     HANDLE                  hInterface;
+    IN OUT  BOOL                    fEnabled;
+    IN OUT  ROUTER_INTERFACE_TYPE   dwIfType;
+    OUT     ROUTER_CONNECTION_STATE dwConnectionState;
+    OUT     DWORD                   fUnReachabilityReasons;
+    OUT     DWORD                   dwLastError;
+
+}
+MPR_INTERFACE_0, *PMPR_INTERFACE_0;
+
+typedef struct _MPR_IPINIP_INTERFACE_0
+{
+    WCHAR   wszFriendlyName[MAX_INTERFACE_NAME_LEN+1];
+
+    GUID    Guid;
+
+}MPR_IPINIP_INTERFACE_0, *PMPR_IPINIP_INTERFACE_0;
+
+#if(WINVER >= 0x0500)
+
+typedef struct _MPR_INTERFACE_1
+{
+    IN OUT  WCHAR                   wszInterfaceName[MAX_INTERFACE_NAME_LEN+1];
+    OUT     HANDLE                  hInterface;
+    IN OUT  BOOL                    fEnabled;
+    IN OUT  ROUTER_INTERFACE_TYPE   dwIfType;
+    OUT     ROUTER_CONNECTION_STATE dwConnectionState;
+    OUT     DWORD                   fUnReachabilityReasons;
+    OUT     DWORD                   dwLastError;
+    OUT     LPWSTR                  lpwsDialoutHoursRestriction;
+
+}
+MPR_INTERFACE_1, *PMPR_INTERFACE_1;
+
+//
+// MPR_INTERFACE_2 definitions
+//
+
+#define MPR_MaxDeviceType     RAS_MaxDeviceType
+#define MPR_MaxPhoneNumber    RAS_MaxPhoneNumber
+#define MPR_MaxIpAddress      RAS_MaxIpAddress
+#define MPR_MaxIpxAddress     RAS_MaxIpxAddress
+
+#define MPR_MaxEntryName      RAS_MaxEntryName
+#define MPR_MaxDeviceName     RAS_MaxDeviceName
+#define MPR_MaxCallbackNumber RAS_MaxCallbackNumber
+
+#define MPR_MaxAreaCode       RAS_MaxAreaCode
+#define MPR_MaxPadType        RAS_MaxPadType
+#define MPR_MaxX25Address     RAS_MaxX25Address
+#define MPR_MaxFacilities     RAS_MaxFacilities
+#define MPR_MaxUserData       RAS_MaxUserData
+
+//
+// MPR_INTERFACE_2 'dwfOptions' bit flags.
+//
+
+#define MPRIO_SpecificIpAddr            RASEO_SpecificIpAddr
+#define MPRIO_SpecificNameServers       RASEO_SpecificNameServers
+#define MPRIO_IpHeaderCompression       RASEO_IpHeaderCompression
+#define MPRIO_RemoteDefaultGateway      RASEO_RemoteDefaultGateway
+#define MPRIO_DisableLcpExtensions      RASEO_DisableLcpExtensions
+#define MPRIO_SwCompression             RASEO_SwCompression
+#define MPRIO_RequireEncryptedPw        RASEO_RequireEncryptedPw
+#define MPRIO_RequireMsEncryptedPw      RASEO_RequireMsEncryptedPw
+#define MPRIO_RequireDataEncryption     RASEO_RequireDataEncryption
+#define MPRIO_NetworkLogon              RASEO_NetworkLogon
+#define MPRIO_PromoteAlternates         RASEO_PromoteAlternates
+#define MPRIO_SecureLocalFiles          RASEO_SecureLocalFiles
+#define MPRIO_RequireEAP                RASEO_RequireEAP
+#define MPRIO_RequirePAP                RASEO_RequirePAP
+#define MPRIO_RequireSPAP               RASEO_RequireSPAP
+#define MPRIO_SharedPhoneNumbers        RASEO_SharedPhoneNumbers
+#define MPRIO_RequireCHAP               RASEO_RequireCHAP
+#define MPRIO_RequireMsCHAP             RASEO_RequireMsCHAP
+#define MPRIO_RequireMsCHAP2            RASEO_RequireMsCHAP2
+
+#if (WINVER >= 0x501)
+#define MPRIO_IpSecPreSharedKey         0x80000000
+#endif
+
+//
+// MPR_INTERFACE_2 'dwProtocols' bit flags.
+//
+
+#define MPRNP_Ipx                       RASNP_Ipx
+#define MPRNP_Ip                        RASNP_Ip
+
+//
+// MPR_INTERFACE_2 'szDeviceType' default strings.
+//
+
+#define MPRDT_Modem                     RASDT_Modem
+#define MPRDT_Isdn                      RASDT_Isdn
+#define MPRDT_X25                       RASDT_X25
+#define MPRDT_Vpn                       RASDT_Vpn
+#define MPRDT_Pad                       RASDT_Pad
+#define MPRDT_Generic                   RASDT_Generic
+#define MPRDT_Serial                    RASDT_Serial                    
+#define MPRDT_FrameRelay                RASDT_FrameRelay
+#define MPRDT_Atm                       RASDT_Atm
+#define MPRDT_Sonet                     RASDT_Sonet
+#define MPRDT_SW56                      RASDT_SW56
+#define MPRDT_Irda                      RASDT_Irda
+#define MPRDT_Parallel                  RASDT_Parallel
+
+//
+// MPR_INTERFACE_2 'dwType' settings
+//
+
+#define MPRET_Phone    RASET_Phone
+#define MPRET_Vpn      RASET_Vpn
+#define MPRET_Direct   RASET_Direct
+
+//
+// MPR_INTERFACE_2 'dwDialMode' values.
+//
+
+#define MPRDM_DialFirst                0
+#define MPRDM_DialAll                  RASEDM_DialAll
+#define MPRDM_DialAsNeeded             RASEDM_DialAsNeeded
+
+//
+// MPR_INTERFACE_2 'dwIdleDisconnectSeconds' constants.
+//
+
+#define MPRIDS_Disabled                 RASIDS_Disabled
+#define MPRIDS_UseGlobalValue           RASIDS_UseGlobalValue
+
+//
+// MPR_INTERFACE_2 encryption types.
+//
+
+#define MPR_ET_None         ET_None         
+#define MPR_ET_Require      ET_Require      
+#define MPR_ET_RequireMax   ET_RequireMax   
+#define MPR_ET_Optional     ET_Optional     
+
+//
+// MPR_INTERFACE_2 Vpn strategies
+//
+
+#define MPR_VS_Default      VS_Default      
+#define MPR_VS_PptpOnly     VS_PptpOnly 
+#define MPR_VS_PptpFirst    VS_PptpFirst    
+#define MPR_VS_L2tpOnly     VS_L2tpOnly     
+#define MPR_VS_L2tpFirst    VS_L2tpFirst    
+
+//
+// Used to create/get/set a demand dial interface plus its
+// ras configuration.
+//
+
+typedef struct _MPR_INTERFACE_2
+{
+    IN OUT  WCHAR                   wszInterfaceName[MAX_INTERFACE_NAME_LEN+1];
+    OUT     HANDLE                  hInterface;
+    IN OUT  BOOL                    fEnabled;
+    IN OUT  ROUTER_INTERFACE_TYPE   dwIfType;
+    OUT     ROUTER_CONNECTION_STATE dwConnectionState;
+    OUT     DWORD                   fUnReachabilityReasons;
+    OUT     DWORD                   dwLastError;
+
+    //
+    // Demand dial-specific properties
+    //
+
+    DWORD       dwfOptions;
+
+    //
+    // Location/phone number
+    //
+
+    WCHAR       szLocalPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    PWCHAR      szAlternates;
+
+    //
+    // PPP/Ip
+    //
+
+    DWORD       ipaddr;
+    DWORD       ipaddrDns;
+    DWORD       ipaddrDnsAlt;
+    DWORD       ipaddrWins;
+    DWORD       ipaddrWinsAlt;
+
+    //
+    // NetProtocols
+    //
+
+    DWORD       dwfNetProtocols;
+
+    //
+    // Device
+    //
+
+    WCHAR       szDeviceType[ MPR_MaxDeviceType + 1 ];
+    WCHAR       szDeviceName[ MPR_MaxDeviceName + 1 ];
+
+    //
+    // X.25
+    //
+
+    WCHAR       szX25PadType[ MPR_MaxPadType + 1 ];
+    WCHAR       szX25Address[ MPR_MaxX25Address + 1 ];
+    WCHAR       szX25Facilities[ MPR_MaxFacilities + 1 ];
+    WCHAR       szX25UserData[ MPR_MaxUserData + 1 ];
+    DWORD       dwChannels;
+
+    //
+    // Multilink
+    //
+
+    DWORD       dwSubEntries;
+    DWORD       dwDialMode;
+    DWORD       dwDialExtraPercent;
+    DWORD       dwDialExtraSampleSeconds;
+    DWORD       dwHangUpExtraPercent;
+    DWORD       dwHangUpExtraSampleSeconds;
+
+    //
+    // Idle timeout
+    //
+
+    DWORD       dwIdleDisconnectSeconds;
+
+    //
+    // Entry Type
+    //
+
+    DWORD       dwType;
+
+    //
+    // EncryptionType
+    //
+
+    DWORD       dwEncryptionType;
+
+    //
+    // EAP information
+    //
+
+    DWORD       dwCustomAuthKey;
+    DWORD       dwCustomAuthDataSize;
+    LPBYTE      lpbCustomAuthData;
+
+    //
+    // Guid of the connection
+    //
+
+    GUID        guidId;
+
+    //
+    // Vpn Strategy
+    //
+
+    DWORD       dwVpnStrategy;
+
+} MPR_INTERFACE_2, *PMPR_INTERFACE_2;
+
+//
+// Used to set/get per-link information for multilinked demand
+// dial interfaces.
+//
+
+typedef struct _MPR_DEVICE_0
+{
+    //
+    // Device
+    //
+
+    WCHAR       szDeviceType[ MPR_MaxDeviceType + 1 ];
+    WCHAR       szDeviceName[ MPR_MaxDeviceName + 1 ];
+
+}
+MPR_DEVICE_0, *PMPR_DEVICE_0;
+
+typedef struct _MPR_DEVICE_1
+{
+    //
+    // Device
+    //
+
+    WCHAR       szDeviceType[ MPR_MaxDeviceType + 1 ];
+    WCHAR       szDeviceName[ MPR_MaxDeviceName + 1 ];
+
+    //
+    // Phone numbers
+    //
+
+    WCHAR       szLocalPhoneNumber[ MPR_MaxPhoneNumber + 1 ];
+    PWCHAR      szAlternates;
+
+}
+MPR_DEVICE_1, *PMPR_DEVICE_1;
+
+//
+// Used to get/set extended credentials information such as
+// eap credentials info.
+//
+
+typedef struct _MPR_CREDENTIALSEX_0
+{
+    DWORD  dwSize;
+    LPBYTE lpbCredentialsInfo;
+}
+MPR_CREDENTIALSEX_0, *PMPR_CREDENTIALSEX_0;
+
+typedef struct _MPR_CREDENTIALSEX_1
+{
+    DWORD  dwSize;
+    LPBYTE lpbCredentialsInfo;
+}
+MPR_CREDENTIALSEX_1, *PMPR_CREDENTIALSEX_1;
+
+#endif /* WINVER >= 0x0500 */
+
+typedef struct _MPR_TRANSPORT_0
+{
+    OUT     DWORD                   dwTransportId;
+    OUT     HANDLE                  hTransport;
+    OUT     WCHAR                   wszTransportName[MAX_TRANSPORT_NAME_LEN+1];
+
+}
+MPR_TRANSPORT_0, *PMPR_TRANSPORT_0;
+
+typedef struct _MPR_IFTRANSPORT_0
+{
+    OUT     DWORD                  dwTransportId;
+    OUT     HANDLE                 hIfTransport;
+    OUT     WCHAR                  wszIfTransportName[MAX_TRANSPORT_NAME_LEN+1];
+
+}
+MPR_IFTRANSPORT_0, *PMPR_IFTRANSPORT_0;
+
+typedef struct _MPR_SERVER_0
+{
+    OUT BOOL                    fLanOnlyMode;
+    OUT DWORD                   dwUpTime;           // In seconds
+    OUT DWORD                   dwTotalPorts;
+    OUT DWORD                   dwPortsInUse;
+
+}
+MPR_SERVER_0, *PMPR_SERVER_0;
+
+//
+// Port condition codes
+//
+
+typedef enum _RAS_PORT_CONDITION
+{
+    RAS_PORT_NON_OPERATIONAL,
+    RAS_PORT_DISCONNECTED,  
+    RAS_PORT_CALLING_BACK,
+    RAS_PORT_LISTENING,
+    RAS_PORT_AUTHENTICATING,
+    RAS_PORT_AUTHENTICATED, 
+    RAS_PORT_INITIALIZING
+
+}
+RAS_PORT_CONDITION;
+
+//
+// Hardware condition codes
+//
+
+typedef enum _RAS_HARDWARE_CONDITION
+{
+    RAS_HARDWARE_OPERATIONAL,
+    RAS_HARDWARE_FAILURE
+
+}
+RAS_HARDWARE_CONDITION;
+
+typedef struct _RAS_PORT_0
+{
+    OUT HANDLE                  hPort;
+    OUT HANDLE                  hConnection;
+    OUT RAS_PORT_CONDITION      dwPortCondition;
+    OUT DWORD                   dwTotalNumberOfCalls;
+    OUT DWORD                   dwConnectDuration;      // In seconds
+    OUT WCHAR                   wszPortName[ MAX_PORT_NAME + 1 ];
+    OUT WCHAR                   wszMediaName[ MAX_MEDIA_NAME + 1 ];
+    OUT WCHAR                   wszDeviceName[ MAX_DEVICE_NAME + 1 ];
+    OUT WCHAR                   wszDeviceType[ MAX_DEVICETYPE_NAME + 1 ];
+
+}
+RAS_PORT_0, *PRAS_PORT_0;
+
+typedef struct _RAS_PORT_1
+{
+    OUT HANDLE                  hPort;
+    OUT HANDLE                  hConnection;
+    OUT RAS_HARDWARE_CONDITION  dwHardwareCondition;
+    OUT DWORD                   dwLineSpeed;            // in bits/second
+    OUT DWORD                   dwBytesXmited;
+    OUT DWORD                   dwBytesRcved;
+    OUT DWORD                   dwFramesXmited;
+    OUT DWORD                   dwFramesRcved;
+    OUT DWORD                   dwCrcErr;
+    OUT DWORD                   dwTimeoutErr;
+    OUT DWORD                   dwAlignmentErr;
+    OUT DWORD                   dwHardwareOverrunErr;
+    OUT DWORD                   dwFramingErr;
+    OUT DWORD                   dwBufferOverrunErr;
+    OUT DWORD                   dwCompressionRatioIn;
+    OUT DWORD                   dwCompressionRatioOut;
+}
+RAS_PORT_1, *PRAS_PORT_1;
+
+//
+// Maximum length of address string, e.g. "255.255.255.255" for IP.
+//
+
+#define IPADDRESSLEN  15
+#define IPXADDRESSLEN 22
+#define ATADDRESSLEN  32
+
+typedef struct _PPP_NBFCP_INFO
+{
+    OUT DWORD           dwError;
+    OUT WCHAR           wszWksta[ NETBIOS_NAME_LEN + 1 ];
+}
+PPP_NBFCP_INFO;
+
+typedef struct _PPP_IPCP_INFO
+{
+    OUT DWORD           dwError;
+    OUT WCHAR           wszAddress[ IPADDRESSLEN + 1 ];
+    OUT WCHAR           wszRemoteAddress[ IPADDRESSLEN + 1 ];
+}
+PPP_IPCP_INFO;
+
+//
+// PPP_IPCP_INFO2 dwOptions values.
+//
+
+#define PPP_IPCP_VJ             0x00000001
+
+typedef struct _PPP_IPCP_INFO2
+{
+    OUT DWORD           dwError;
+    OUT WCHAR           wszAddress[ IPADDRESSLEN + 1 ];
+    OUT WCHAR           wszRemoteAddress[ IPADDRESSLEN + 1 ];
+    OUT DWORD           dwOptions;
+    OUT DWORD           dwRemoteOptions;
+}
+PPP_IPCP_INFO2;
+
+typedef struct _PPP_IPXCP_INFO
+{
+    OUT DWORD           dwError;
+    OUT WCHAR           wszAddress[ IPXADDRESSLEN + 1 ];
+}
+PPP_IPXCP_INFO;
+
+typedef struct _PPP_ATCP_INFO
+{
+    OUT DWORD           dwError;
+    OUT WCHAR           wszAddress[ ATADDRESSLEN + 1 ];
+}
+PPP_ATCP_INFO;
+
+typedef struct _PPP_INFO
+{
+    OUT PPP_NBFCP_INFO  nbf;
+    OUT PPP_IPCP_INFO   ip;
+    OUT PPP_IPXCP_INFO  ipx;
+    OUT PPP_ATCP_INFO   at;
+
+} PPP_INFO;
+
+#if(WINVER >= 0x0500)
+
+//
+// PPP_CCP dwCompressionAlgorithm values.
+//
+
+#define RASCCPCA_MPPC         0x00000006
+#define RASCCPCA_STAC         0x00000005
+
+//
+// PPP_CCP dwOptions values.
+//
+
+#define PPP_CCP_COMPRESSION         0x00000001
+#define PPP_CCP_ENCRYPTION40BITOLD  0x00000010
+#define PPP_CCP_ENCRYPTION40BIT     0x00000020
+#define PPP_CCP_ENCRYPTION128BIT    0x00000040
+#define PPP_CCP_ENCRYPTION56BIT     0x00000080
+#define PPP_CCP_HISTORYLESS         0x01000000
+
+typedef struct _PPP_CCP_INFO
+{
+    OUT DWORD           dwError;
+    OUT DWORD           dwCompressionAlgorithm;
+    OUT DWORD           dwOptions;
+    OUT DWORD           dwRemoteCompressionAlgorithm;
+    OUT DWORD           dwRemoteOptions;
+}
+PPP_CCP_INFO;
+
+//
+// PPP_LCP dwAuthenticatonProtocol values.
+//
+
+#define PPP_LCP_PAP          0xC023
+#define PPP_LCP_SPAP         0xC027
+#define PPP_LCP_CHAP         0xC223
+#define PPP_LCP_EAP          0xC227
+
+//
+// PPP_LCP dwAuthenticatonData values.
+//
+
+#define PPP_LCP_CHAP_MD5     0x05
+#define PPP_LCP_CHAP_MS      0x80
+#define PPP_LCP_CHAP_MSV2    0x81
+
+//
+// PPP_LCP dwOption values
+//
+
+#define PPP_LCP_MULTILINK_FRAMING   0x00000001
+#define PPP_LCP_PFC                 0x00000002
+#define PPP_LCP_ACFC                0x00000004
+#define PPP_LCP_SSHF                0x00000008
+#define PPP_LCP_DES_56              0x00000010
+#define PPP_LCP_3_DES               0x00000020
+
+typedef struct _PPP_LCP_INFO
+{
+    OUT DWORD dwError;
+    OUT DWORD dwAuthenticationProtocol;
+    OUT DWORD dwAuthenticationData;
+    OUT DWORD dwRemoteAuthenticationProtocol;
+    OUT DWORD dwRemoteAuthenticationData;
+    OUT DWORD dwTerminateReason;
+    OUT DWORD dwRemoteTerminateReason;
+    OUT DWORD dwOptions;
+    OUT DWORD dwRemoteOptions;
+    OUT DWORD dwEapTypeId;
+    OUT DWORD dwRemoteEapTypeId;
+}
+PPP_LCP_INFO;
+
+typedef struct _PPP_INFO_2
+{
+    OUT PPP_NBFCP_INFO  nbf;
+    OUT PPP_IPCP_INFO2  ip;
+    OUT PPP_IPXCP_INFO  ipx;
+    OUT PPP_ATCP_INFO   at;
+    OUT PPP_CCP_INFO    ccp;
+    OUT PPP_LCP_INFO    lcp;
+}
+PPP_INFO_2;
+
+#endif /* WINVER >= 0x0500 */
+
+//
+// Possible bits set in Connection Flags field
+//
+
+#define RAS_FLAGS_PPP_CONNECTION        0x00000001
+#define RAS_FLAGS_MESSENGER_PRESENT     0x00000002
+
+#if(WINVER < 0x0501)
+#define RAS_FLAGS_RAS_CONNECTION        0x00000004
+#endif
+
+typedef struct _RAS_CONNECTION_0
+{
+    OUT HANDLE                  hConnection;
+    OUT HANDLE                  hInterface;
+    OUT DWORD                   dwConnectDuration;      // In seconds
+    OUT ROUTER_INTERFACE_TYPE   dwInterfaceType;
+    OUT DWORD                   dwConnectionFlags;
+    OUT WCHAR                   wszInterfaceName[ MAX_INTERFACE_NAME_LEN + 1 ];
+    OUT WCHAR                   wszUserName[ UNLEN + 1 ];
+    OUT WCHAR                   wszLogonDomain[ DNLEN + 1 ];
+    OUT WCHAR                   wszRemoteComputer[ NETBIOS_NAME_LEN + 1 ];
+
+}
+RAS_CONNECTION_0, *PRAS_CONNECTION_0;
+
+typedef struct _RAS_CONNECTION_1
+{
+    OUT HANDLE                  hConnection;
+    OUT HANDLE                  hInterface;
+    OUT PPP_INFO                PppInfo;
+    OUT DWORD                   dwBytesXmited;
+    OUT DWORD                   dwBytesRcved;
+    OUT DWORD                   dwFramesXmited;
+    OUT DWORD                   dwFramesRcved;
+    OUT DWORD                   dwCrcErr;
+    OUT DWORD                   dwTimeoutErr;
+    OUT DWORD                   dwAlignmentErr;
+    OUT DWORD                   dwHardwareOverrunErr;
+    OUT DWORD                   dwFramingErr;
+    OUT DWORD                   dwBufferOverrunErr;
+    OUT DWORD                   dwCompressionRatioIn;
+    OUT DWORD                   dwCompressionRatioOut;
+}
+RAS_CONNECTION_1, *PRAS_CONNECTION_1;
+
+#if(WINVER >= 0x0500)
+
+typedef struct _RAS_CONNECTION_2
+{
+    OUT HANDLE                  hConnection;
+    OUT WCHAR                   wszUserName[ UNLEN + 1 ];
+    OUT ROUTER_INTERFACE_TYPE   dwInterfaceType;
+    OUT GUID                    guid;
+    OUT PPP_INFO_2              PppInfo2;
+}
+RAS_CONNECTION_2, *PRAS_CONNECTION_2;
+
+#endif /* WINVER >= 0x0500 */
+
+//
+// Structures used by the MPRADMIN USER APIs. Use level 0 to get/set this
+// structure.
+//
+//
+// Bits indicating user's Remote Access privileges and mask to isolate
+// call back privilege.
+//
+// Note: Bit 0 MUST represent NoCallback due to a quirk of the "userparms"
+//       storage method.  When a new LAN Manager user is created, bit 0 of the
+//       userparms field is set to 1 and all other bits are 0.  These bits are
+//       arranged so this "no Dial-In info" state maps to the "default Dial-In
+//       privilege" state.
+
+#define RASPRIV_NoCallback        0x01
+#define RASPRIV_AdminSetCallback  0x02
+#define RASPRIV_CallerSetCallback 0x04
+#define RASPRIV_DialinPrivilege   0x08
+
+// 
+// The following are flags for the bfPrivilege2 member of RAS_USER_1
+// structure
+//
+#define RASPRIV2_DialinPolicy      0x1  
+
+#define RASPRIV_CallbackType (RASPRIV_AdminSetCallback \
+                              | RASPRIV_CallerSetCallback \
+                              | RASPRIV_NoCallback)
+
+typedef struct _RAS_USER_0
+{
+    OUT BYTE                    bfPrivilege;
+    OUT WCHAR                   wszPhoneNumber[ MAX_PHONE_NUMBER_LEN + 1];
+}
+RAS_USER_0, *PRAS_USER_0;
+
+typedef struct _RAS_USER_1
+{
+    OUT BYTE                    bfPrivilege;
+    OUT WCHAR                   wszPhoneNumber[ MAX_PHONE_NUMBER_LEN + 1];
+    OUT BYTE                    bfPrivilege2;
+} 
+RAS_USER_1, *PRAS_USER_1;
+
+//
+// Used as RPC binding handle to server
+//
+
+typedef HANDLE RAS_SERVER_HANDLE;
+typedef HANDLE MPR_SERVER_HANDLE;
+typedef HANDLE MIB_SERVER_HANDLE;
+
+//
+//  RAS ADMIN APIs
+//
+
+DWORD APIENTRY
+MprAdminConnectionEnum(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE *                lplpbBuffer,
+    IN      DWORD                   dwPrefMaxLen,
+    OUT     LPDWORD                 lpdwEntriesRead,
+    OUT     LPDWORD                 lpdwTotalEntries,
+    IN      LPDWORD                 lpdwResumeHandle    OPTIONAL
+);
+
+DWORD APIENTRY
+MprAdminPortEnum(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      DWORD                   dwLevel,
+    IN      HANDLE                  hConnection,
+    OUT     LPBYTE *                lplpbBuffer,
+    IN      DWORD                   dwPrefMaxLen,
+    OUT     LPDWORD                 lpdwEntriesRead,
+    OUT     LPDWORD                 lpdwTotalEntries,
+    IN      LPDWORD                 lpdwResumeHandle    OPTIONAL
+);
+
+DWORD APIENTRY
+MprAdminConnectionGetInfo(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      DWORD                   dwLevel,
+    IN      HANDLE                  hConnection,
+    OUT     LPBYTE *                lplpbBuffer
+);
+
+DWORD APIENTRY
+MprAdminPortGetInfo(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      DWORD                   dwLevel,
+    IN      HANDLE                  hPort,
+    OUT     LPBYTE *                lplpbBuffer
+);
+
+DWORD APIENTRY
+MprAdminConnectionClearStats(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      HANDLE                  hConnection
+);
+
+DWORD APIENTRY
+MprAdminPortClearStats(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      HANDLE                  hPort
+);
+
+DWORD APIENTRY
+MprAdminPortReset(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      HANDLE                  hPort
+);
+
+DWORD APIENTRY
+MprAdminPortDisconnect(
+    IN      RAS_SERVER_HANDLE       hRasServer,
+    IN      HANDLE                  hPort
+);
+
+BOOL APIENTRY
+MprAdminAcceptNewConnection(
+    IN      RAS_CONNECTION_0 *      pRasConnection0,
+    IN      RAS_CONNECTION_1 *      pRasConnection1
+    );
+
+#if(WINVER >= 0x0500)
+
+BOOL APIENTRY
+MprAdminAcceptNewConnection2(
+    IN      RAS_CONNECTION_0 *      pRasConnection0,
+    IN      RAS_CONNECTION_1 *      pRasConnection1,
+    IN      RAS_CONNECTION_2 *      pRasConnection2
+    );
+
+#endif /* WINVER >= 0x0500 */
+
+BOOL APIENTRY
+MprAdminAcceptNewLink (
+    IN      RAS_PORT_0 *            pRasPort0,
+    IN      RAS_PORT_1 *            pRasPort1
+    );
+
+VOID APIENTRY
+MprAdminConnectionHangupNotification(
+    IN      RAS_CONNECTION_0 *      pRasConnection0,
+    IN      RAS_CONNECTION_1 *      pRasConnection1
+    );
+
+#if(WINVER >= 0x0500)
+
+VOID APIENTRY
+MprAdminConnectionHangupNotification2(
+    IN      RAS_CONNECTION_0 *      pRasConnection0,
+    IN      RAS_CONNECTION_1 *      pRasConnection1,
+    IN      RAS_CONNECTION_2 *      pRasConnection2
+    );
+
+#endif /* WINVER >= 0x0500 */
+
+#if (WINVER >= 0x501)
+
+DWORD APIENTRY
+MprAdminConnectionRemoveQuarantine(
+    IN      HANDLE          hRasServer,    
+    IN      HANDLE          hRasConnection,
+    IN      BOOL            fIsIpAddress
+    );
+
+#endif
+
+VOID APIENTRY
+MprAdminLinkHangupNotification (
+    IN      RAS_PORT_0 *            pRasPort0,
+    IN      RAS_PORT_1 *            pRasPort1
+    );
+
+DWORD APIENTRY
+MprAdminGetIpAddressForUser (
+    IN      WCHAR *                 lpwszUserName,
+    IN      WCHAR *                 lpwszPortName,
+    IN OUT  DWORD *                 lpdwIpAddress,
+    OUT     BOOL *                  bNotifyRelease
+    );
+
+VOID APIENTRY
+MprAdminReleaseIpAddress (
+    IN      WCHAR *                 lpszUserName,
+    IN      WCHAR *                 lpszPortName,
+    IN      DWORD *                 lpdwIpAddress
+    );
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminInitializeDll(
+    VOID
+);
+
+DWORD APIENTRY
+MprAdminTerminateDll(
+    VOID
+);
+
+#endif
+
+//
+// MprAdminUser APIs
+//
+
+DWORD APIENTRY
+MprAdminUserGetInfo(
+    IN      const WCHAR *           lpszServer,
+    IN      const WCHAR *           lpszUser,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE                  lpbBuffer
+);
+
+
+DWORD APIENTRY
+MprAdminUserSetInfo(
+    IN      const WCHAR *           lpszServer,
+    IN      const WCHAR *           lpszUser,
+    IN      DWORD                   dwLevel,
+    IN      const LPBYTE            lpbBuffer
+);
+
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminSendUserMessage(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hConnection,
+    IN      LPWSTR                  lpwszMessage
+);
+
+#endif /* WINVER >= 0x0500 */
+
+DWORD APIENTRY
+MprAdminGetPDCServer(
+    IN      const WCHAR *           lpszDomain,
+    IN      const WCHAR *           lpszServer,
+    OUT     LPWSTR                  lpszPDCServer
+);
+
+//
+// Router APIs
+//
+
+BOOL APIENTRY
+MprAdminIsServiceRunning(
+    IN  LPWSTR  lpwsServerName
+);
+
+DWORD APIENTRY
+MprAdminServerConnect(
+    IN      LPWSTR                  lpwsServerName      OPTIONAL,
+    OUT     MPR_SERVER_HANDLE *     phMprServer
+);
+
+VOID APIENTRY
+MprAdminServerDisconnect(
+    IN      MPR_SERVER_HANDLE       hMprServer
+);
+
+#if (WINVER >= 0x501)
+DWORD APIENTRY
+MprAdminServerGetCredentials(
+        IN  MPR_SERVER_HANDLE       hMprServer,
+        IN  DWORD                   dwLevel,
+        IN  LPBYTE *                lplpbBuffer
+);
+
+DWORD APIENTRY
+MprAdminServerSetCredentials(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lpbBuffer
+);
+
+
+#endif
+
+DWORD APIENTRY
+MprAdminBufferFree(
+    IN      LPVOID                  pBuffer
+);
+
+DWORD APIENTRY
+MprAdminGetErrorString(
+    IN      DWORD                   dwError,
+    OUT     LPWSTR *                lpwsErrorString
+);
+
+DWORD APIENTRY
+MprAdminServerGetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE *                lplpbBuffer
+);
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminTransportCreate(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwTransportId,
+    IN      LPWSTR                  lpwsTransportName           OPTIONAL,
+    IN      LPBYTE                  pGlobalInfo,
+    IN      DWORD                   dwGlobalInfoSize,
+    IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL,
+    IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL,
+    IN      LPWSTR                  lpwsDLLPath
+);
+
+#endif /* WINVER >= 0x0500 */
+
+DWORD APIENTRY
+MprAdminTransportSetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwTransportId,
+    IN      LPBYTE                  pGlobalInfo                 OPTIONAL,
+    IN      DWORD                   dwGlobalInfoSize,
+    IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL,
+    IN      DWORD                   dwClientInterfaceInfoSize
+);
+
+DWORD APIENTRY
+MprAdminTransportGetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwTransportId,
+    OUT     LPBYTE *                ppGlobalInfo                OPTIONAL,
+    OUT     LPDWORD                 lpdwGlobalInfoSize          OPTIONAL,
+    OUT     LPBYTE *                ppClientInterfaceInfo       OPTIONAL,
+    OUT     LPDWORD                 lpdwClientInterfaceInfoSize OPTIONAL
+);
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminDeviceEnum(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE*                 lplpbBuffer,
+    OUT     LPDWORD                 lpdwTotalEntries);
+
+#endif /* WINVER >= 0x0500 */
+
+DWORD APIENTRY
+MprAdminInterfaceGetHandle(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      LPWSTR                  lpwsInterfaceName,
+    OUT     HANDLE *                phInterface,
+    IN      BOOL                    fIncludeClientInterfaces
+);
+
+DWORD APIENTRY
+MprAdminInterfaceCreate(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lpbBuffer,
+    OUT     HANDLE *                phInterface
+);
+
+DWORD APIENTRY
+MprAdminInterfaceGetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE *                lplpbBuffer
+);
+
+DWORD APIENTRY
+MprAdminInterfaceSetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lpbBuffer
+);
+
+DWORD APIENTRY
+MprAdminInterfaceDelete(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface
+);
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminInterfaceDeviceGetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwIndex,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE*                 lplpBuffer
+);
+
+DWORD APIENTRY
+MprAdminInterfaceDeviceSetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwIndex,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lplpBuffer
+);
+
+#endif /* WINVER >= 0x0500 */
+
+DWORD APIENTRY
+MprAdminInterfaceTransportRemove(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwTransportId
+);
+
+DWORD APIENTRY
+MprAdminInterfaceTransportAdd(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwTransportId,
+    IN      LPBYTE                  pInterfaceInfo,
+    IN      DWORD                   dwInterfaceInfoSize
+);
+
+DWORD APIENTRY
+MprAdminInterfaceTransportGetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwTransportId,
+    OUT     LPBYTE *                ppInterfaceInfo,
+    OUT     LPDWORD                 lpdwpInterfaceInfoSize  OPTIONAL
+);
+
+DWORD APIENTRY
+MprAdminInterfaceTransportSetInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwTransportId,
+    IN      LPBYTE                  pInterfaceInfo,
+    IN      DWORD                   dwInterfaceInfoSize
+);
+
+DWORD APIENTRY
+MprAdminInterfaceEnum(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE *                lplpbBuffer,
+    IN      DWORD                   dwPrefMaxLen,
+    OUT     LPDWORD                 lpdwEntriesRead,
+    OUT     LPDWORD                 lpdwTotalEntries,
+    IN      LPDWORD                 lpdwResumeHandle        OPTIONAL
+);
+
+DWORD APIENTRY
+MprSetupIpInIpInterfaceFriendlyNameEnum(
+    IN  PWCHAR  pwszMachineName,
+    OUT LPBYTE* lplpBuffer,
+    OUT LPDWORD lpdwEntriesRead
+    );
+
+DWORD APIENTRY
+MprSetupIpInIpInterfaceFriendlyNameFree(
+    IN  LPVOID  lpBuffer
+    );
+
+DWORD APIENTRY
+MprSetupIpInIpInterfaceFriendlyNameCreate(
+    PWCHAR                  pwszMachineName,
+    PMPR_IPINIP_INTERFACE_0 pNameInformation
+    );
+
+DWORD APIENTRY
+MprSetupIpInIpInterfaceFriendlyNameDelete(
+    IN  PWCHAR  pwszMachineName,
+    IN  GUID    *pGuid
+    );
+
+DWORD APIENTRY
+MprAdminInterfaceSetCredentials(
+    IN      LPWSTR                  lpwsServer              OPTIONAL,
+    IN      LPWSTR                  lpwsInterfaceName,
+    IN      LPWSTR                  lpwsUserName            OPTIONAL,
+    IN      LPWSTR                  lpwsDomainName          OPTIONAL,
+    IN      LPWSTR                  lpwsPassword            OPTIONAL
+);
+
+DWORD APIENTRY
+MprAdminInterfaceGetCredentials(
+    IN      LPWSTR                  lpwsServer              OPTIONAL,
+    IN      LPWSTR                  lpwsInterfaceName,
+    OUT     LPWSTR                  lpwsUserName            OPTIONAL,
+    OUT     LPWSTR                  lpwsPassword            OPTIONAL,
+    OUT     LPWSTR                  lpwsDomainName          OPTIONAL
+);
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminInterfaceSetCredentialsEx(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lpbBuffer
+);
+
+DWORD APIENTRY
+MprAdminInterfaceGetCredentialsEx(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE *                lplpbBuffer
+);
+
+#endif /* WINVER >= 0x0500 */
+
+DWORD APIENTRY
+MprAdminInterfaceConnect(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      HANDLE                  hEvent,
+    IN      BOOL                    fSynchronous
+);
+
+DWORD APIENTRY
+MprAdminInterfaceDisconnect(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface
+);
+
+DWORD APIENTRY
+MprAdminInterfaceUpdateRoutes(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwProtocolId,
+    IN      HANDLE                  hEvent
+);
+
+DWORD APIENTRY
+MprAdminInterfaceQueryUpdateResult(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface,
+    IN      DWORD                   dwProtocolId,
+    OUT     LPDWORD                 lpdwUpdateResult
+);
+
+DWORD APIENTRY
+MprAdminInterfaceUpdatePhonebookInfo(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hInterface
+);
+
+#if(WINVER >= 0x0500)
+
+DWORD APIENTRY
+MprAdminRegisterConnectionNotification(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hEventNotification
+);
+
+DWORD APIENTRY
+MprAdminDeregisterConnectionNotification(
+    IN      MPR_SERVER_HANDLE       hMprServer,
+    IN      HANDLE                  hEventNotification
+);
+
+#endif /* WINVER >= 0x0500 */
+
+//
+// MIB APIs
+//
+
+DWORD APIENTRY
+MprAdminMIBServerConnect(
+    IN      LPWSTR                  lpwsServerName      OPTIONAL,
+    OUT     MIB_SERVER_HANDLE *     phMibServer
+);
+
+VOID APIENTRY
+MprAdminMIBServerDisconnect(
+    IN      MIB_SERVER_HANDLE       hMibServer
+);
+
+DWORD APIENTRY
+MprAdminMIBEntryCreate(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwPid,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpEntry,
+    IN      DWORD                   dwEntrySize
+);
+
+DWORD APIENTRY
+MprAdminMIBEntryDelete(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpEntry,
+    IN      DWORD                   dwEntrySize
+);
+
+DWORD APIENTRY
+MprAdminMIBEntrySet(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpEntry,
+    IN      DWORD                   dwEntrySize
+);
+
+DWORD APIENTRY
+MprAdminMIBEntryGet(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpInEntry,
+    IN      DWORD                   dwInEntrySize,
+    OUT     LPVOID*                 lplpOutEntry,
+    OUT     LPDWORD                 lpOutEntrySize
+);
+
+DWORD APIENTRY
+MprAdminMIBEntryGetFirst(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpInEntry,
+    IN      DWORD                   dwInEntrySize,
+    OUT     LPVOID*                 lplpOutEntry,
+    OUT     LPDWORD                 lpOutEntrySize
+);
+
+DWORD APIENTRY
+MprAdminMIBEntryGetNext(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpInEntry,
+    IN      DWORD                   dwInEntrySize,
+    OUT     LPVOID*                 lplpOutEntry,
+    OUT     LPDWORD                 lpOutEntrySize
+);
+
+DWORD APIENTRY
+MprAdminMIBGetTrapInfo(
+    IN      MIB_SERVER_HANDLE       hMibServer,
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      LPVOID                  lpInData,
+    IN      DWORD                   dwInDataSize,
+    OUT     LPVOID*                 lplpOutData,
+    IN OUT  LPDWORD                 lpOutDataSize
+);
+
+DWORD APIENTRY
+MprAdminMIBSetTrapInfo(
+    IN      DWORD                   dwProtocolId,
+    IN      DWORD                   dwRoutingPid,
+    IN      HANDLE                  hEvent,
+    IN      LPVOID                  lpInData,
+    IN      DWORD                   dwInDataSize,
+    OUT     LPVOID*                 lplpOutData,
+    IN OUT  LPDWORD                 lpOutDataSize
+);
+
+DWORD APIENTRY
+MprAdminMIBBufferFree(
+    IN      LPVOID                  pBuffer
+);
+
+//
+// Configuration APIs
+//
+
+DWORD APIENTRY
+MprConfigServerInstall(
+    IN      DWORD                   dwLevel,
+    IN      PVOID                   pBuffer
+);
+
+DWORD APIENTRY
+MprConfigServerConnect(
+    IN      LPWSTR                  lpwsServerName,
+    OUT     HANDLE*                 phMprConfig
+);
+
+VOID APIENTRY
+MprConfigServerDisconnect(
+    IN      HANDLE                  hMprConfig
+);
+
+DWORD APIENTRY
+MprConfigServerRefresh(
+    IN      HANDLE                  hMprConfig
+    );
+
+DWORD APIENTRY
+MprConfigBufferFree(
+    IN      LPVOID                  pBuffer
+);
+
+DWORD APIENTRY
+MprConfigServerGetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      DWORD                   dwLevel,
+    OUT     LPBYTE *                lplpbBuffer
+);
+
+DWORD APIENTRY
+MprConfigServerBackup(
+    IN      HANDLE                  hMprConfig,
+    IN      LPWSTR                  lpwsPath
+);
+
+DWORD APIENTRY
+MprConfigServerRestore(
+    IN      HANDLE                  hMprConfig,
+    IN      LPWSTR                  lpwsPath
+);
+
+DWORD APIENTRY
+MprConfigTransportCreate(
+    IN      HANDLE                  hMprConfig,
+    IN      DWORD                   dwTransportId,
+    IN      LPWSTR                  lpwsTransportName           OPTIONAL,
+    IN      LPBYTE                  pGlobalInfo,
+    IN      DWORD                   dwGlobalInfoSize,
+    IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL,
+    IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL,
+    IN      LPWSTR                  lpwsDLLPath,
+    OUT     HANDLE*                 phRouterTransport
+);
+
+DWORD APIENTRY
+MprConfigTransportDelete(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterTransport
+);
+
+DWORD APIENTRY
+MprConfigTransportGetHandle(
+    IN      HANDLE                  hMprConfig,
+    IN      DWORD                   dwTransportId,
+    OUT     HANDLE*                 phRouterTransport
+);
+
+DWORD APIENTRY
+MprConfigTransportSetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterTransport,
+    IN      LPBYTE                  pGlobalInfo                 OPTIONAL,
+    IN      DWORD                   dwGlobalInfoSize            OPTIONAL,
+    IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL,
+    IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL,
+    IN      LPWSTR                  lpwsDLLPath                 OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigTransportGetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterTransport,
+    IN  OUT LPBYTE*                 ppGlobalInfo                OPTIONAL,
+    OUT     LPDWORD                 lpdwGlobalInfoSize          OPTIONAL,
+    IN  OUT LPBYTE*                 ppClientInterfaceInfo       OPTIONAL,
+    OUT     LPDWORD                 lpdwClientInterfaceInfoSize OPTIONAL,
+    IN  OUT LPWSTR*                 lplpwsDLLPath               OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigTransportEnum(
+    IN      HANDLE                  hMprConfig,
+    IN      DWORD                   dwLevel,
+    IN  OUT LPBYTE*                 lplpBuffer,
+    IN      DWORD                   dwPrefMaxLen,
+    OUT     LPDWORD                 lpdwEntriesRead,
+    OUT     LPDWORD                 lpdwTotalEntries,
+    IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigInterfaceCreate(
+    IN      HANDLE                  hMprConfig,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lpbBuffer,
+    OUT     HANDLE*                 phRouterInterface
+);
+
+DWORD APIENTRY
+MprConfigInterfaceDelete(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface
+);
+
+DWORD APIENTRY
+MprConfigInterfaceGetHandle(
+    IN      HANDLE                  hMprConfig,
+    IN      LPWSTR                  lpwsInterfaceName,
+    OUT     HANDLE*                 phRouterInterface
+);
+
+DWORD APIENTRY
+MprConfigInterfaceGetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      DWORD                   dwLevel,
+    IN  OUT LPBYTE*                 lplpBuffer,
+    OUT     LPDWORD                 lpdwBufferSize
+);
+
+DWORD APIENTRY
+MprConfigInterfaceSetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      DWORD                   dwLevel,
+    IN      LPBYTE                  lpbBuffer
+);
+
+DWORD APIENTRY
+MprConfigInterfaceEnum(
+    IN      HANDLE                  hMprConfig,
+    IN      DWORD                   dwLevel,
+    IN  OUT LPBYTE*                 lplpBuffer,
+    IN      DWORD                   dwPrefMaxLen,
+    OUT     LPDWORD                 lpdwEntriesRead,
+    OUT     LPDWORD                 lpdwTotalEntries,
+    IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigInterfaceTransportAdd(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      DWORD                   dwTransportId,
+    IN      LPWSTR                  lpwsTransportName           OPTIONAL,
+    IN      LPBYTE                  pInterfaceInfo,
+    IN      DWORD                   dwInterfaceInfoSize,
+    OUT     HANDLE*                 phRouterIfTransport
+);
+
+DWORD APIENTRY
+MprConfigInterfaceTransportRemove(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      HANDLE                  hRouterIfTransport
+);
+
+DWORD APIENTRY
+MprConfigInterfaceTransportGetHandle(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      DWORD                   dwTransportId,
+    OUT     HANDLE*                 phRouterIfTransport
+);
+
+DWORD APIENTRY
+MprConfigInterfaceTransportGetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      HANDLE                  hRouterIfTransport,
+    IN  OUT LPBYTE*                 ppInterfaceInfo             OPTIONAL,
+    OUT     LPDWORD                 lpdwInterfaceInfoSize       OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigInterfaceTransportSetInfo(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      HANDLE                  hRouterIfTransport,
+    IN      LPBYTE                  pInterfaceInfo              OPTIONAL,
+    IN      DWORD                   dwInterfaceInfoSize         OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigInterfaceTransportEnum(
+    IN      HANDLE                  hMprConfig,
+    IN      HANDLE                  hRouterInterface,
+    IN      DWORD                   dwLevel,
+    IN  OUT LPBYTE*                 lplpBuffer,     // MPR_IFTRANSPORT_0
+    IN      DWORD                   dwPrefMaxLen,
+    OUT     LPDWORD                 lpdwEntriesRead,
+    OUT     LPDWORD                 lpdwTotalEntries,
+    IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL
+);
+
+DWORD APIENTRY
+MprConfigGetFriendlyName(
+    IN      HANDLE                  hMprConfig,
+    IN      PWCHAR                  pszGuidName,
+    OUT     PWCHAR                  pszBuffer,
+    IN      DWORD                   dwBufferSize);
+
+DWORD APIENTRY
+MprConfigGetGuidName(
+    IN      HANDLE                  hMprConfig,
+    IN      PWCHAR                  pszFriendlyName,
+    OUT     PWCHAR                  pszBuffer,
+    IN      DWORD                   dwBufferSize);
+
+//
+// Information block APIs
+//
+
+DWORD APIENTRY
+MprInfoCreate(
+    IN      DWORD                   dwVersion,
+    OUT     LPVOID*                 lplpNewHeader
+);
+
+DWORD APIENTRY
+MprInfoDelete(
+    IN      LPVOID                  lpHeader
+);
+
+DWORD APIENTRY
+MprInfoRemoveAll(
+    IN      LPVOID                  lpHeader,
+    OUT     LPVOID*                 lplpNewHeader
+);
+
+DWORD APIENTRY
+MprInfoDuplicate(
+    IN      LPVOID                  lpHeader,
+    OUT     LPVOID*                 lplpNewHeader
+);
+
+DWORD APIENTRY
+MprInfoBlockAdd(
+    IN      LPVOID                  lpHeader,
+    IN      DWORD                   dwInfoType,
+    IN      DWORD                   dwItemSize,
+    IN      DWORD                   dwItemCount,
+    IN      LPBYTE                  lpItemData,
+    OUT     LPVOID*                 lplpNewHeader
+);
+
+DWORD APIENTRY
+MprInfoBlockRemove(
+    IN      LPVOID                  lpHeader,
+    IN      DWORD                   dwInfoType,
+    OUT     LPVOID*                 lplpNewHeader
+);
+
+DWORD APIENTRY
+MprInfoBlockSet(
+    IN      LPVOID                  lpHeader,
+    IN      DWORD                   dwInfoType,
+    IN      DWORD                   dwItemSize,
+    IN      DWORD                   dwItemCount,
+    IN      LPBYTE                  lpItemData,
+    OUT     LPVOID*                 lplpNewHeader
+);
+
+DWORD APIENTRY
+MprInfoBlockFind(
+    IN      LPVOID                  lpHeader,
+    IN      DWORD                   dwInfoType,
+    OUT     LPDWORD                 lpdwItemSize,       // OPTIONAL
+    OUT     LPDWORD                 lpdwItemCount,      // OPTIONAL
+    OUT     LPBYTE*                 lplpItemData        // OPTIONAL
+);
+
+DWORD APIENTRY
+MprInfoBlockQuerySize(
+    IN      LPVOID                  lpHeader
+);
+
+//
+// BOOL APIENTRY
+// MprInfoBlockExists(
+//     IN      LPVOID                  lpHeader,
+//     IN      DWORD                   dwInfoType
+// );
+//
+
+#define MprInfoBlockExists(h,t) \
+    (MprInfoBlockFind((h),(t),NULL,NULL,NULL) == NO_ERROR)
+
+#ifdef __cplusplus
+}
+#endif
+
+//#endif /* WINVER >= 0x0403 */
+
+#endif // __ROUTING_MPRADMIN_H__
+
diff --git a/base/Windows/Inc/PopPack.h b/base/Windows/Inc/PopPack.h
new file mode 100644
index 0000000..a540e86
--- /dev/null
+++ b/base/Windows/Inc/PopPack.h
@@ -0,0 +1,36 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    poppack.h
+
+Abstract:
+
+    This file turns packing of structures off.  (That is, it enables
+    automatic alignment of structure fields.)  An include file is needed
+    because various compilers do this in different ways.
+
+    poppack.h is the complement to pshpack?.h.  An inclusion of poppack.h
+    MUST ALWAYS be preceded by an inclusion of one of pshpack?.h, in one-to-one
+    correspondence.
+
+    For Microsoft compatible compilers, this file uses the pop option
+    to the pack pragma so that it can restore the previous saved by the
+    pshpack?.h include file.
+
+--*/
+
+#if ! (defined(lint) || defined(RC_INVOKED))
+#if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED)
+#pragma warning(disable:4103)
+#if !(defined( MIDL_PASS )) || defined( __midl )
+#pragma pack(pop)
+#else
+#pragma pack()
+#endif
+#else
+#pragma pack()
+#endif
+#endif // ! (defined(lint) || defined(RC_INVOKED))
diff --git a/base/Windows/Inc/Psapi.h b/base/Windows/Inc/Psapi.h
new file mode 100644
index 0000000..c801bbc
--- /dev/null
+++ b/base/Windows/Inc/Psapi.h
@@ -0,0 +1,336 @@
+/*++ BUILD Version: 0001    // Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    psapi.h
+
+Abstract:
+
+    Include file for APIs provided by PSAPI.DLL
+
+
+    Richard Shupak   [richards]  06-Jan-1994
+
+Revision History:
+
+--*/
+
+#ifndef _PSAPI_H_
+#define _PSAPI_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL
+WINAPI
+EnumProcesses(
+    DWORD * lpidProcess,
+    DWORD   cb,
+    DWORD * cbNeeded
+    );
+
+BOOL
+WINAPI
+EnumProcessModules(
+    HANDLE hProcess,
+    HMODULE *lphModule,
+    DWORD cb,
+    LPDWORD lpcbNeeded
+    );
+
+DWORD
+WINAPI
+GetModuleBaseNameA(
+    HANDLE hProcess,
+    HMODULE hModule,
+    LPSTR lpBaseName,
+    DWORD nSize
+    );
+
+DWORD
+WINAPI
+GetModuleBaseNameW(
+    HANDLE hProcess,
+    HMODULE hModule,
+    LPWSTR lpBaseName,
+    DWORD nSize
+    );
+
+#ifdef UNICODE
+#define GetModuleBaseName  GetModuleBaseNameW
+#else
+#define GetModuleBaseName  GetModuleBaseNameA
+#endif // !UNICODE
+
+
+DWORD
+WINAPI
+GetModuleFileNameExA(
+    HANDLE hProcess,
+    HMODULE hModule,
+    LPSTR lpFilename,
+    DWORD nSize
+    );
+
+DWORD
+WINAPI
+GetModuleFileNameExW(
+    HANDLE hProcess,
+    HMODULE hModule,
+    LPWSTR lpFilename,
+    DWORD nSize
+    );
+
+#ifdef UNICODE
+#define GetModuleFileNameEx  GetModuleFileNameExW
+#else
+#define GetModuleFileNameEx  GetModuleFileNameExA
+#endif // !UNICODE
+
+
+typedef struct _MODULEINFO {
+    LPVOID lpBaseOfDll;
+    DWORD SizeOfImage;
+    LPVOID EntryPoint;
+} MODULEINFO, *LPMODULEINFO;
+
+
+BOOL
+WINAPI
+GetModuleInformation(
+    HANDLE hProcess,
+    HMODULE hModule,
+    LPMODULEINFO lpmodinfo,
+    DWORD cb
+    );
+
+
+BOOL
+WINAPI
+EmptyWorkingSet(
+    HANDLE hProcess
+    );
+
+
+BOOL
+WINAPI
+QueryWorkingSet(
+    HANDLE hProcess,
+    PVOID pv,
+    DWORD cb
+    );
+
+BOOL
+WINAPI
+InitializeProcessForWsWatch(
+    HANDLE hProcess
+    );
+
+
+typedef struct _PSAPI_WS_WATCH_INFORMATION {
+    LPVOID FaultingPc;
+    LPVOID FaultingVa;
+} PSAPI_WS_WATCH_INFORMATION, *PPSAPI_WS_WATCH_INFORMATION;
+
+BOOL
+WINAPI
+GetWsChanges(
+    HANDLE hProcess,
+    PPSAPI_WS_WATCH_INFORMATION lpWatchInfo,
+    DWORD cb
+    );
+
+DWORD
+WINAPI
+GetMappedFileNameW(
+    HANDLE hProcess,
+    LPVOID lpv,
+    LPWSTR lpFilename,
+    DWORD nSize
+    );
+
+DWORD
+WINAPI
+GetMappedFileNameA(
+    HANDLE hProcess,
+    LPVOID lpv,
+    LPSTR lpFilename,
+    DWORD nSize
+    );
+
+#ifdef UNICODE
+#define GetMappedFileName  GetMappedFileNameW
+#else
+#define GetMappedFileName  GetMappedFileNameA
+#endif // !UNICODE
+
+BOOL
+WINAPI
+EnumDeviceDrivers(
+    LPVOID *lpImageBase,
+    DWORD cb,
+    LPDWORD lpcbNeeded
+    );
+
+
+DWORD
+WINAPI
+GetDeviceDriverBaseNameA(
+    LPVOID ImageBase,
+    LPSTR lpBaseName,
+    DWORD nSize
+    );
+
+DWORD
+WINAPI
+GetDeviceDriverBaseNameW(
+    LPVOID ImageBase,
+    LPWSTR lpBaseName,
+    DWORD nSize
+    );
+
+#ifdef UNICODE
+#define GetDeviceDriverBaseName  GetDeviceDriverBaseNameW
+#else
+#define GetDeviceDriverBaseName  GetDeviceDriverBaseNameA
+#endif // !UNICODE
+
+
+DWORD
+WINAPI
+GetDeviceDriverFileNameA(
+    LPVOID ImageBase,
+    LPSTR lpFilename,
+    DWORD nSize
+    );
+
+DWORD
+WINAPI
+GetDeviceDriverFileNameW(
+    LPVOID ImageBase,
+    LPWSTR lpFilename,
+    DWORD nSize
+    );
+
+#ifdef UNICODE
+#define GetDeviceDriverFileName  GetDeviceDriverFileNameW
+#else
+#define GetDeviceDriverFileName  GetDeviceDriverFileNameA
+#endif // !UNICODE
+
+// Structure for GetProcessMemoryInfo()
+
+typedef struct _PROCESS_MEMORY_COUNTERS {
+    DWORD cb;
+    DWORD PageFaultCount;
+    SIZE_T PeakWorkingSetSize;
+    SIZE_T WorkingSetSize;
+    SIZE_T QuotaPeakPagedPoolUsage;
+    SIZE_T QuotaPagedPoolUsage;
+    SIZE_T QuotaPeakNonPagedPoolUsage;
+    SIZE_T QuotaNonPagedPoolUsage;
+    SIZE_T PagefileUsage;
+    SIZE_T PeakPagefileUsage;
+} PROCESS_MEMORY_COUNTERS;
+typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;
+
+BOOL
+WINAPI
+GetProcessMemoryInfo(
+    HANDLE Process,
+    PPROCESS_MEMORY_COUNTERS ppsmemCounters,
+    DWORD cb
+    );
+
+typedef struct _PERFORMANCE_INFORMATION {
+    DWORD cb;
+    SIZE_T CommitTotal;
+    SIZE_T CommitLimit;
+    SIZE_T CommitPeak;
+    SIZE_T PhysicalTotal;
+    SIZE_T PhysicalAvailable;
+    SIZE_T SystemCache;
+    SIZE_T KernelTotal;
+    SIZE_T KernelPaged;
+    SIZE_T KernelNonpaged;
+    SIZE_T PageSize;
+    DWORD HandleCount;
+    DWORD ProcessCount;
+    DWORD ThreadCount;
+} PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION, PERFORMACE_INFORMATION, *PPERFORMACE_INFORMATION;
+
+BOOL
+WINAPI
+GetPerformanceInfo (
+    PPERFORMACE_INFORMATION pPerformanceInformation,
+    DWORD cb
+    );
+
+typedef struct _ENUM_PAGE_FILE_INFORMATION {
+    DWORD cb;
+    DWORD Reserved;
+    SIZE_T TotalSize;
+    SIZE_T TotalInUse;
+    SIZE_T PeakUsage;
+} ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION;
+
+typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW) (LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCWSTR lpFilename);
+
+typedef BOOL (*PENUM_PAGE_FILE_CALLBACKA) (LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCSTR lpFilename);
+
+BOOL
+WINAPI
+EnumPageFilesW (
+    PENUM_PAGE_FILE_CALLBACKW pCallBackRoutine,
+    LPVOID pContext
+    );
+
+BOOL
+WINAPI
+EnumPageFilesA (
+    PENUM_PAGE_FILE_CALLBACKA pCallBackRoutine,
+    LPVOID pContext
+    );
+
+#ifdef UNICODE
+#define PENUM_PAGE_FILE_CALLBACK PENUM_PAGE_FILE_CALLBACKW
+#define EnumPageFiles EnumPageFilesW
+#else
+#define PENUM_PAGE_FILE_CALLBACK PENUM_PAGE_FILE_CALLBACKA
+#define EnumPageFiles EnumPageFilesA
+#endif // !UNICODE
+
+DWORD
+WINAPI
+GetProcessImageFileNameA(
+    HANDLE hProcess,
+    LPSTR lpImageFileName,
+    DWORD nSize
+    );
+
+DWORD
+WINAPI
+GetProcessImageFileNameW(
+    HANDLE hProcess,
+    LPWSTR lpImageFileName,
+    DWORD nSize
+    );
+
+#ifdef UNICODE
+#define GetProcessImageFileName  GetProcessImageFileNameW
+#else
+#define GetProcessImageFileName  GetProcessImageFileNameA
+#endif // !UNICODE
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/base/Windows/Inc/PshPack1.h b/base/Windows/Inc/PshPack1.h
new file mode 100644
index 0000000..e2dae83
--- /dev/null
+++ b/base/Windows/Inc/PshPack1.h
@@ -0,0 +1,33 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    pshpack1.h
+
+Abstract:
+
+    This file turns 1 byte packing of structures on.  (That is, it disables
+    automatic alignment of structure fields.)  An include file is needed
+    because various compilers do this in different ways.  For Microsoft
+    compatible compilers, this files uses the push option to the pack pragma
+    so that the poppack.h include file can restore the previous packing
+    reliably.
+
+    The file poppack.h is the complement to this file.
+
+--*/
+
+#if ! (defined(lint) || defined(RC_INVOKED))
+#if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED)
+#pragma warning(disable:4103)
+#if !(defined( MIDL_PASS )) || defined( __midl )
+#pragma pack(push,1)
+#else
+#pragma pack(1)
+#endif
+#else
+#pragma pack(1)
+#endif
+#endif // ! (defined(lint) || defined(RC_INVOKED))
diff --git a/base/Windows/Inc/PshPack2.h b/base/Windows/Inc/PshPack2.h
new file mode 100644
index 0000000..6c03d3e
--- /dev/null
+++ b/base/Windows/Inc/PshPack2.h
@@ -0,0 +1,33 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    pshpack2.h
+
+Abstract:
+
+    This file turns 2 byte packing of structures on.  (That is, it disables
+    automatic alignment of structure fields.)  An include file is needed
+    because various compilers do this in different ways.  For Microsoft
+    compatible compilers, this files uses the push option to the pack pragma
+    so that the poppack.h include file can restore the previous packing
+    reliably.
+
+    The file poppack.h is the complement to this file.
+
+--*/
+
+#if ! (defined(lint) || defined(RC_INVOKED))
+#if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED)
+#pragma warning(disable:4103)
+#if !(defined( MIDL_PASS )) || defined( __midl )
+#pragma pack(push,2)
+#else
+#pragma pack(2)
+#endif
+#else
+#pragma pack(2)
+#endif
+#endif // ! (defined(lint) || defined(RC_INVOKED))
diff --git a/base/Windows/Inc/PshPack4.h b/base/Windows/Inc/PshPack4.h
new file mode 100644
index 0000000..f3c535a
--- /dev/null
+++ b/base/Windows/Inc/PshPack4.h
@@ -0,0 +1,33 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    pshpack4.h
+
+Abstract:
+
+    This file turns 4 byte packing of structures on.  (That is, it disables
+    automatic alignment of structure fields.)  An include file is needed
+    because various compilers do this in different ways.  For Microsoft
+    compatible compilers, this files uses the push option to the pack pragma
+    so that the poppack.h include file can restore the previous packing
+    reliably.
+
+    The file poppack.h is the complement to this file.
+
+--*/
+
+#if ! (defined(lint) || defined(RC_INVOKED))
+#if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED)
+#pragma warning(disable:4103)
+#if !(defined( MIDL_PASS )) || defined( __midl )
+#pragma pack(push,4)
+#else
+#pragma pack(4)
+#endif
+#else
+#pragma pack(4)
+#endif
+#endif // ! (defined(lint) || defined(RC_INVOKED))
diff --git a/base/Windows/Inc/PshPack8.h b/base/Windows/Inc/PshPack8.h
new file mode 100644
index 0000000..af3eb32
--- /dev/null
+++ b/base/Windows/Inc/PshPack8.h
@@ -0,0 +1,33 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    pshpack8.h
+
+Abstract:
+
+    This file turns 8 byte packing of structures on.  (That is, it disables
+    automatic alignment of structure fields.)  An include file is needed
+    because various compilers do this in different ways.  For Microsoft
+    compatible compilers, this files uses the push option to the pack pragma
+    so that the poppack.h include file can restore the previous packing
+    reliably.
+
+    The file poppack.h is the complement to this file.
+
+--*/
+
+#if ! (defined(lint) || defined(RC_INVOKED))
+#if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED)
+#pragma warning(disable:4103)
+#if !(defined( MIDL_PASS )) || defined( __midl )
+#pragma pack(push,8)
+#else
+#pragma pack(8)
+#endif
+#else
+#pragma pack(8)
+#endif
+#endif // ! (defined(lint) || defined(RC_INVOKED))
diff --git a/base/Windows/Inc/Qos.h b/base/Windows/Inc/Qos.h
new file mode 100644
index 0000000..05e982e
--- /dev/null
+++ b/base/Windows/Inc/Qos.h
@@ -0,0 +1,203 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    qos.h - QoS definitions for NDIS components.
+
+Abstract:
+
+    This module defines the Quality of Service structures and types used
+    by Winsock applications.
+
+Revision History:
+
+--*/
+
+#ifndef __QOS_H_
+#define __QOS_H_
+
+
+/*
+ *  Definitions for valued-based Service Type for each direction of data flow.
+ */
+
+typedef ULONG   SERVICETYPE;
+
+#define SERVICETYPE_NOTRAFFIC               0x00000000  /* No data in this 
+                                                         * direction */
+#define SERVICETYPE_BESTEFFORT              0x00000001  /* Best Effort */
+#define SERVICETYPE_CONTROLLEDLOAD          0x00000002  /* Controlled Load */
+#define SERVICETYPE_GUARANTEED              0x00000003  /* Guaranteed */
+
+#define SERVICETYPE_NETWORK_UNAVAILABLE     0x00000004  /* Used to notify 
+                                                         * change to user */
+#define SERVICETYPE_GENERAL_INFORMATION     0x00000005  /* corresponds to 
+                                                         * "General Parameters"
+                                                         * defined by IntServ */
+#define SERVICETYPE_NOCHANGE                0x00000006  /* used to indicate
+                                                         * that the flow spec
+                                                         * contains no change
+                                                         * from any previous
+                                                         * one */
+#define SERVICETYPE_NONCONFORMING           0x00000009  /* Non-Conforming Traffic */
+#define SERVICETYPE_NETWORK_CONTROL         0x0000000A  /* Network Control traffic */
+#define SERVICETYPE_QUALITATIVE             0x0000000D  /* Qualitative applications */ 
+
+
+
+/*********  The usage of these is currently not supported.  ***************/
+#define SERVICE_BESTEFFORT                  0x80010000
+#define SERVICE_CONTROLLEDLOAD              0x80020000
+#define SERVICE_GUARANTEED                  0x80040000
+#define SERVICE_QUALITATIVE                 0x80200000
+/* **************************** ***** ************************************ */
+
+
+
+/*
+ * Flags to control the usage of RSVP on this flow.
+ */
+
+/*
+ * to turn off traffic control, 'OR' ( | ) this flag with the 
+ * ServiceType field in the FLOWSPEC
+ */
+#define SERVICE_NO_TRAFFIC_CONTROL   0x81000000
+
+
+/*
+ * this flag can be used to prevent any rsvp signaling messages from being 
+ * sent. Local traffic control will be invoked, but no RSVP Path messages 
+ * will be sent.This flag can also be used in conjunction with a receiving 
+ * flowspec to suppress the automatic generation of a Reserve message.  
+ * The application would receive notification that a Path  message had arrived 
+ * and would then need to alter the QOS by issuing WSAIoctl( SIO_SET_QOS ), 
+ * to unset this flag and thereby causing Reserve messages to go out.
+ */
+
+#define SERVICE_NO_QOS_SIGNALING   0x40000000
+
+
+
+
+/*
+ *  Flow Specifications for each direction of data flow.
+ */
+typedef struct _flowspec
+{
+    ULONG       TokenRate;              /* In Bytes/sec */
+    ULONG       TokenBucketSize;        /* In Bytes */
+    ULONG       PeakBandwidth;          /* In Bytes/sec */
+    ULONG       Latency;                /* In microseconds */
+    ULONG       DelayVariation;         /* In microseconds */
+    SERVICETYPE ServiceType;
+    ULONG       MaxSduSize;             /* In Bytes */
+    ULONG       MinimumPolicedSize;     /* In Bytes */
+
+} FLOWSPEC, *PFLOWSPEC, * LPFLOWSPEC;
+
+/*
+ * this value can be used in the FLOWSPEC structure to instruct the Rsvp Service 
+ * provider to derive the appropriate default value for the parameter.  Note 
+ * that not all values in the FLOWSPEC structure can be defaults. In the
+ * ReceivingFlowspec, all parameters can be defaulted except the ServiceType.  
+ * In the SendingFlowspec, the MaxSduSize and MinimumPolicedSize can be
+ * defaulted. Other defaults may be possible. Refer to the appropriate
+ * documentation.
+ */
+#define QOS_NOT_SPECIFIED     0xFFFFFFFF
+
+/*
+ * define a value that can be used for the PeakBandwidth, which will map into 
+ * positive infinity when the FLOWSPEC is converted into IntServ floating point 
+ * format.  We can't use (-1) because that value was previously defined to mean
+ * "select the default".
+ */
+#define   POSITIVE_INFINITY_RATE     0xFFFFFFFE
+
+
+
+/*
+ * the provider specific structure can have a number of objects in it.
+ * Each next structure in the
+ * ProviderSpecific will be the QOS_OBJECT_HDR struct that prefaces the actual
+ * data with a type and length for that object.  This QOS_OBJECT struct can 
+ * repeat several times if there are several objects.  This list of objects
+ * terminates either when the buffer length has been reached ( WSABUF ) or
+ * an object of type QOS_END_OF_LIST is encountered.
+ */
+typedef struct  {
+
+    ULONG   ObjectType;
+    ULONG   ObjectLength;  /* the length of object buffer INCLUDING 
+                            * this header */
+
+} QOS_OBJECT_HDR, *LPQOS_OBJECT_HDR;
+
+
+/*
+ * general QOS objects start at this offset from the base and have a range 
+ * of 1000
+ */
+#define   QOS_GENERAL_ID_BASE                      2000
+
+#define   QOS_OBJECT_END_OF_LIST                   (0x00000001 + QOS_GENERAL_ID_BASE) 
+          /* QOS_End_of_list structure passed */
+#define   QOS_OBJECT_SD_MODE                       (0x00000002 + QOS_GENERAL_ID_BASE) 
+          /* QOS_ShapeDiscard structure passed */
+#define   QOS_OBJECT_SHAPING_RATE	           (0x00000003 + QOS_GENERAL_ID_BASE)
+          /* QOS_ShapingRate structure */
+#define   QOS_OBJECT_DESTADDR                      (0x00000004 + QOS_GENERAL_ID_BASE)
+          /* QOS_DestAddr structure (defined in qossp.h) */
+
+
+/*
+ * This structure is used to define the behaviour that the traffic
+ * control packet shaper will apply to the flow.
+ *
+ * TC_NONCONF_BORROW - the flow will receive resources remaining 
+ *  after all higher priority flows have been serviced. If a 
+ *  TokenRate is specified, packets may be non-conforming and
+ *  will be demoted to less than best-effort priority.
+ *  
+ * TC_NONCONF_SHAPE - TokenRate must be specified. Non-conforming
+ *  packets will be retianed in the packet shaper until they become
+ *  conforming.
+ *
+ * TC_NONCONF_DISCARD - TokenRate must be specified. Non-conforming
+ *  packets will be discarded.
+ *
+ */
+
+typedef struct _QOS_SD_MODE {
+
+    QOS_OBJECT_HDR   ObjectHdr;
+    ULONG            ShapeDiscardMode;
+
+} QOS_SD_MODE, *LPQOS_SD_MODE;
+
+#define TC_NONCONF_BORROW      0
+#define TC_NONCONF_SHAPE       1
+#define TC_NONCONF_DISCARD     2
+#define TC_NONCONF_BORROW_PLUS 3 // Not supported currently
+
+
+/*
+ * This structure allows an app to specify a prorated "average token rate" using by
+ * the traffic shaper under SHAPE modehaper queue. It is expressed in bytes per sec.
+ *
+ * ShapingRate (bytes per sec.)
+ *
+ */
+
+typedef struct _QOS_SHAPING_RATE {
+
+    QOS_OBJECT_HDR   ObjectHdr;
+    ULONG            ShapingRate;
+
+} QOS_SHAPING_RATE, *LPQOS_SHAPING_RATE;
+
+
+#endif  /* __QOS_H_ */
diff --git a/base/Windows/Inc/Ras.h b/base/Windows/Inc/Ras.h
new file mode 100644
index 0000000..1e59000
--- /dev/null
+++ b/base/Windows/Inc/Ras.h
@@ -0,0 +1,1870 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    ras.h
+
+Abstract:
+
+    Remote Access external API
+
+    WINVER values in this file:
+        WINVER < 0x400 = Windows NT 3.5, Windows NT 3.51
+        WINVER = 0x400 = Windows 95, Windows98, Windows NT4 (default)
+        WINVER > 0x400 = Windows NT4 enhancements
+        WINVER = 0x500 = Windows 2000
+
+--*/
+
+#ifndef _RAS_H_
+#define _RAS_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef UNLEN
+#include <lmcons.h>
+#endif
+
+#include <pshpack4.h>
+
+#define RAS_MaxDeviceType     16
+#define RAS_MaxPhoneNumber    128
+#define RAS_MaxIpAddress      15
+#define RAS_MaxIpxAddress     21
+
+#if (WINVER >= 0x400)
+#define RAS_MaxEntryName      256
+#define RAS_MaxDeviceName     128
+#define RAS_MaxCallbackNumber RAS_MaxPhoneNumber
+#else
+#define RAS_MaxEntryName      20
+#define RAS_MaxDeviceName     32
+#define RAS_MaxCallbackNumber 48
+#endif
+
+#define RAS_MaxAreaCode       10
+#define RAS_MaxPadType        32
+#define RAS_MaxX25Address     200
+#define RAS_MaxFacilities     200
+#define RAS_MaxUserData       200
+#define RAS_MaxReplyMessage   1024
+#define RAS_MaxDnsSuffix      256
+
+DECLARE_HANDLE( HRASCONN );
+#define LPHRASCONN HRASCONN*
+
+#if (WINVER >= 0x501)
+#define RASCF_AllUsers      0x00000001
+#define RASCF_GlobalCreds   0x00000002
+#endif
+
+/* Identifies an active RAS connection.  (See RasEnumConnections)
+*/
+#define RASCONNW struct tagRASCONNW
+RASCONNW
+{
+    DWORD    dwSize;
+    HRASCONN hrasconn;
+    WCHAR    szEntryName[ RAS_MaxEntryName + 1 ];
+
+#if (WINVER >= 0x400)
+    WCHAR    szDeviceType[ RAS_MaxDeviceType + 1 ];
+    WCHAR    szDeviceName[ RAS_MaxDeviceName + 1 ];
+#endif
+#if (WINVER >= 0x401)
+    WCHAR    szPhonebook [ MAX_PATH ];
+    DWORD    dwSubEntry;
+#endif
+#if (WINVER >= 0x500)
+    GUID    guidEntry;
+#endif
+#if (WINVER >= 0x501)
+    DWORD   dwFlags;
+    LUID    luid;
+#endif
+};
+
+#define RASCONNA struct tagRASCONNA
+RASCONNA
+{
+    DWORD    dwSize;
+    HRASCONN hrasconn;
+    CHAR     szEntryName[ RAS_MaxEntryName + 1 ];
+
+#if (WINVER >= 0x400)
+    CHAR     szDeviceType[ RAS_MaxDeviceType + 1 ];
+    CHAR     szDeviceName[ RAS_MaxDeviceName + 1 ];
+#endif
+#if (WINVER >= 0x401)
+    CHAR     szPhonebook [ MAX_PATH ];
+    DWORD    dwSubEntry;
+#endif
+#if (WINVER >= 0x500)
+    GUID     guidEntry;
+#endif
+#if (WINVER >= 0x501)
+    DWORD   dwFlags;
+    LUID    luid;
+#endif
+};
+
+#ifdef UNICODE
+#define RASCONN RASCONNW
+#else
+#define RASCONN RASCONNA
+#endif
+
+#define LPRASCONNW RASCONNW*
+#define LPRASCONNA RASCONNA*
+#define LPRASCONN  RASCONN*
+
+
+/* Enumerates intermediate states to a connection.  (See RasDial)
+*/
+#define RASCS_PAUSED 0x1000
+#define RASCS_DONE   0x2000
+
+#define RASCONNSTATE enum tagRASCONNSTATE
+RASCONNSTATE
+{
+    RASCS_OpenPort = 0,
+    RASCS_PortOpened,
+    RASCS_ConnectDevice,
+    RASCS_DeviceConnected,
+    RASCS_AllDevicesConnected,
+    RASCS_Authenticate,
+    RASCS_AuthNotify,
+    RASCS_AuthRetry,
+    RASCS_AuthCallback,
+    RASCS_AuthChangePassword,
+    RASCS_AuthProject,
+    RASCS_AuthLinkSpeed,
+    RASCS_AuthAck,
+    RASCS_ReAuthenticate,
+    RASCS_Authenticated,
+    RASCS_PrepareForCallback,
+    RASCS_WaitForModemReset,
+    RASCS_WaitForCallback,
+    RASCS_Projected,
+
+#if (WINVER >= 0x400)
+    RASCS_StartAuthentication,
+    RASCS_CallbackComplete,
+    RASCS_LogonNetwork,
+#endif
+    RASCS_SubEntryConnected,
+    RASCS_SubEntryDisconnected,
+
+    RASCS_Interactive = RASCS_PAUSED,
+    RASCS_RetryAuthentication,
+    RASCS_CallbackSetByCaller,
+    RASCS_PasswordExpired,
+#if (WINVER >= 0x500)
+    RASCS_InvokeEapUI,
+#endif
+
+    RASCS_Connected = RASCS_DONE,
+    RASCS_Disconnected
+};
+
+#define LPRASCONNSTATE RASCONNSTATE*
+
+
+/* Describes the status of a RAS connection.  (See RasConnectionStatus)
+*/
+#define RASCONNSTATUSW struct tagRASCONNSTATUSW
+RASCONNSTATUSW
+{
+    DWORD        dwSize;
+    RASCONNSTATE rasconnstate;
+    DWORD        dwError;
+    WCHAR        szDeviceType[ RAS_MaxDeviceType + 1 ];
+    WCHAR        szDeviceName[ RAS_MaxDeviceName + 1 ];
+#if (WINVER >= 0x401)
+    WCHAR        szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+#endif
+};
+
+#define RASCONNSTATUSA struct tagRASCONNSTATUSA
+RASCONNSTATUSA
+{
+    DWORD        dwSize;
+    RASCONNSTATE rasconnstate;
+    DWORD        dwError;
+    CHAR         szDeviceType[ RAS_MaxDeviceType + 1 ];
+    CHAR         szDeviceName[ RAS_MaxDeviceName + 1 ];
+#if (WINVER >= 0x401)
+    CHAR         szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+#endif
+};
+
+#ifdef UNICODE
+#define RASCONNSTATUS RASCONNSTATUSW
+#else
+#define RASCONNSTATUS RASCONNSTATUSA
+#endif
+
+#define LPRASCONNSTATUSW RASCONNSTATUSW*
+#define LPRASCONNSTATUSA RASCONNSTATUSA*
+#define LPRASCONNSTATUS  RASCONNSTATUS*
+
+/* Describes connection establishment parameters.  (See RasDial)
+*/
+#define RASDIALPARAMSW struct tagRASDIALPARAMSW
+RASDIALPARAMSW
+{
+    DWORD dwSize;
+    WCHAR szEntryName[ RAS_MaxEntryName + 1 ];
+    WCHAR szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    WCHAR szCallbackNumber[ RAS_MaxCallbackNumber + 1 ];
+    WCHAR szUserName[ UNLEN + 1 ];
+    WCHAR szPassword[ PWLEN + 1 ];
+    WCHAR szDomain[ DNLEN + 1 ];
+#if (WINVER >= 0x401)
+    DWORD dwSubEntry;
+    ULONG_PTR dwCallbackId;
+#endif
+};
+
+#define RASDIALPARAMSA struct tagRASDIALPARAMSA
+RASDIALPARAMSA
+{
+    DWORD dwSize;
+    CHAR  szEntryName[ RAS_MaxEntryName + 1 ];
+    CHAR  szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    CHAR  szCallbackNumber[ RAS_MaxCallbackNumber + 1 ];
+    CHAR  szUserName[ UNLEN + 1 ];
+    CHAR  szPassword[ PWLEN + 1 ];
+    CHAR  szDomain[ DNLEN + 1 ];
+#if (WINVER >= 0x401)
+    DWORD dwSubEntry;
+    ULONG_PTR dwCallbackId;
+#endif
+};
+
+#ifdef UNICODE
+#define RASDIALPARAMS RASDIALPARAMSW
+#else
+#define RASDIALPARAMS RASDIALPARAMSA
+#endif
+
+#define LPRASDIALPARAMSW RASDIALPARAMSW*
+#define LPRASDIALPARAMSA RASDIALPARAMSA*
+#define LPRASDIALPARAMS  RASDIALPARAMS*
+
+#if (WINVER >= 0x500)
+
+#define RASEAPINFO struct tagRASEAPINFO
+RASEAPINFO
+{
+    DWORD dwSizeofEapInfo;
+    BYTE  *pbEapInfo;
+};
+
+#endif
+
+/* Describes extended connection establishment options.  (See RasDial)
+*/
+#define RASDIALEXTENSIONS struct tagRASDIALEXTENSIONS
+RASDIALEXTENSIONS
+{
+    DWORD     dwSize;
+    DWORD     dwfOptions;
+    HWND      hwndParent;
+    ULONG_PTR reserved;
+#if (WINVER >= 0x500)
+    ULONG_PTR reserved1;
+    RASEAPINFO RasEapInfo;
+#endif
+};
+
+#define LPRASDIALEXTENSIONS RASDIALEXTENSIONS*
+
+/* 'dwfOptions' bit flags.
+*/
+#define RDEOPT_UsePrefixSuffix           0x00000001
+#define RDEOPT_PausedStates              0x00000002
+#define RDEOPT_IgnoreModemSpeaker        0x00000004
+#define RDEOPT_SetModemSpeaker           0x00000008
+#define RDEOPT_IgnoreSoftwareCompression 0x00000010
+#define RDEOPT_SetSoftwareCompression    0x00000020
+#define RDEOPT_DisableConnectedUI        0x00000040
+#define RDEOPT_DisableReconnectUI        0x00000080
+#define RDEOPT_DisableReconnect          0x00000100
+#define RDEOPT_NoUser                    0x00000200
+#define RDEOPT_PauseOnScript             0x00000400
+#define RDEOPT_Router                    0x00000800
+
+#if (WINVER >= 0x500)
+#define RDEOPT_CustomDial                0x00001000
+#endif
+
+#if (WINVER >= 0x501)
+#define RDEOPT_UseCustomScripting        0x00002000
+#endif
+
+
+//
+// This flag when set in the RASENTRYNAME structure
+// indicates that the phonebook to which this entry
+// belongs is a system phonebook.
+//
+#define REN_User                         0x00000000
+#define REN_AllUsers                     0x00000001
+
+
+/* Describes an enumerated RAS phone book entry name.  (See RasEntryEnum)
+*/
+#define RASENTRYNAMEW struct tagRASENTRYNAMEW
+RASENTRYNAMEW
+{
+    DWORD dwSize;
+    WCHAR szEntryName[ RAS_MaxEntryName + 1 ];
+
+#if (WINVER >= 0x500)
+    //
+    // If this flag is REN_AllUsers then its a
+    // system phonebook.
+    //
+    DWORD dwFlags;
+    WCHAR szPhonebookPath[MAX_PATH + 1];
+#endif
+};
+
+#define RASENTRYNAMEA struct tagRASENTRYNAMEA
+RASENTRYNAMEA
+{
+    DWORD dwSize;
+    CHAR  szEntryName[ RAS_MaxEntryName + 1 ];
+
+#if (WINVER >= 0x500)
+    DWORD dwFlags;
+    CHAR  szPhonebookPath[MAX_PATH + 1];
+#endif
+
+};
+
+#ifdef UNICODE
+#define RASENTRYNAME RASENTRYNAMEW
+#else
+#define RASENTRYNAME RASENTRYNAMEA
+#endif
+
+#define LPRASENTRYNAMEW RASENTRYNAMEW*
+#define LPRASENTRYNAMEA RASENTRYNAMEA*
+#define LPRASENTRYNAME  RASENTRYNAME*
+
+
+/* Protocol code to projection data structure mapping.
+*/
+#define RASPROJECTION enum tagRASPROJECTION
+RASPROJECTION
+{
+    RASP_Amb = 0x10000,
+    RASP_PppNbf = 0x803F,
+    RASP_PppIpx = 0x802B,
+    RASP_PppIp = 0x8021,
+#if (WINVER >= 0x500)
+    RASP_PppCcp = 0x80FD,
+#endif
+    RASP_PppLcp = 0xC021,
+    RASP_Slip = 0x20000
+};
+
+#define LPRASPROJECTION RASPROJECTION*
+
+
+/* Describes the result of a RAS AMB (Authentication Message Block)
+** projection.  This protocol is used with NT 3.1 and OS/2 1.3 downlevel
+** RAS servers.
+*/
+#define RASAMBW struct tagRASAMBW
+RASAMBW
+{
+    DWORD dwSize;
+    DWORD dwError;
+    WCHAR szNetBiosError[ NETBIOS_NAME_LEN + 1 ];
+    BYTE  bLana;
+};
+
+#define RASAMBA struct tagRASAMBA
+RASAMBA
+{
+    DWORD dwSize;
+    DWORD dwError;
+    CHAR  szNetBiosError[ NETBIOS_NAME_LEN + 1 ];
+    BYTE  bLana;
+};
+
+#ifdef UNICODE
+#define RASAMB RASAMBW
+#else
+#define RASAMB RASAMBA
+#endif
+
+#define LPRASAMBW RASAMBW*
+#define LPRASAMBA RASAMBA*
+#define LPRASAMB  RASAMB*
+
+
+/* Describes the result of a PPP NBF (NetBEUI) projection.
+*/
+#define RASPPPNBFW struct tagRASPPPNBFW
+RASPPPNBFW
+{
+    DWORD dwSize;
+    DWORD dwError;
+    DWORD dwNetBiosError;
+    WCHAR szNetBiosError[ NETBIOS_NAME_LEN + 1 ];
+    WCHAR szWorkstationName[ NETBIOS_NAME_LEN + 1 ];
+    BYTE  bLana;
+};
+
+#define RASPPPNBFA struct tagRASPPPNBFA
+RASPPPNBFA
+{
+    DWORD dwSize;
+    DWORD dwError;
+    DWORD dwNetBiosError;
+    CHAR  szNetBiosError[ NETBIOS_NAME_LEN + 1 ];
+    CHAR  szWorkstationName[ NETBIOS_NAME_LEN + 1 ];
+    BYTE  bLana;
+};
+
+#ifdef UNICODE
+#define RASPPPNBF RASPPPNBFW
+#else
+#define RASPPPNBF RASPPPNBFA
+#endif
+
+#define LPRASPPPNBFW RASPPPNBFW*
+#define LPRASPPPNBFA RASPPPNBFA*
+#define LPRASPPPNBF  RASPPPNBF*
+
+
+/* Describes the results of a PPP IPX (Internetwork Packet Exchange)
+** projection.
+*/
+#define RASPPPIPXW struct tagRASIPXW
+RASPPPIPXW
+{
+    DWORD dwSize;
+    DWORD dwError;
+    WCHAR szIpxAddress[ RAS_MaxIpxAddress + 1 ];
+};
+
+
+#define RASPPPIPXA struct tagRASPPPIPXA
+RASPPPIPXA
+{
+    DWORD dwSize;
+    DWORD dwError;
+    CHAR  szIpxAddress[ RAS_MaxIpxAddress + 1 ];
+};
+
+#ifdef UNICODE
+#define RASPPPIPX RASPPPIPXW
+#else
+#define RASPPPIPX RASPPPIPXA
+#endif
+
+#define LPRASPPPIPXW RASPPPIPXW*
+#define LPRASPPPIPXA RASPPPIPXA*
+#define LPRASPPPIPX  RASPPPIPX*
+
+
+/* Describes the results of a PPP IP (Internet) projection.
+*/
+
+#if (WINVER >= 0x500)
+
+/* RASPPPIP 'dwOptions' and 'dwServerOptions' flags.
+*/
+#define RASIPO_VJ       0x00000001
+
+#endif
+
+#define RASPPPIPW struct tagRASPPPIPW
+RASPPPIPW
+{
+    DWORD dwSize;
+    DWORD dwError;
+    WCHAR szIpAddress[ RAS_MaxIpAddress + 1 ];
+
+#ifndef WINNT35COMPATIBLE
+
+    /* This field was added between Windows NT 3.51 beta and Windows NT 3.51
+    ** final, and between Windows 95 M8 beta and Windows 95 final.  If you do
+    ** not require the server address and wish to retrieve PPP IP information
+    ** from Windows NT 3.5 or early Windows NT 3.51 betas, or on early Windows
+    ** 95 betas, define WINNT35COMPATIBLE.
+    **
+    ** The server IP address is not provided by all PPP implementations,
+    ** though Windows NT server's do provide it.
+    */
+    WCHAR szServerIpAddress[ RAS_MaxIpAddress + 1 ];
+
+#endif
+#if (WINVER >= 0x500)
+    DWORD dwOptions;
+    DWORD dwServerOptions;
+#endif
+};
+
+#define RASPPPIPA struct tagRASPPPIPA
+RASPPPIPA
+{
+    DWORD dwSize;
+    DWORD dwError;
+    CHAR  szIpAddress[ RAS_MaxIpAddress + 1 ];
+
+#ifndef WINNT35COMPATIBLE
+
+    /* See RASPPPIPW comment.
+    */
+    CHAR  szServerIpAddress[ RAS_MaxIpAddress + 1 ];
+
+#endif
+#if (WINVER >= 0x500)
+    DWORD dwOptions;
+    DWORD dwServerOptions;
+#endif
+};
+
+#ifdef UNICODE
+#define RASPPPIP RASPPPIPW
+#else
+#define RASPPPIP RASPPPIPA
+#endif
+
+#define LPRASPPPIPW RASPPPIPW*
+#define LPRASPPPIPA RASPPPIPA*
+#define LPRASPPPIP  RASPPPIP*
+
+
+/* Describes the results of a PPP LCP/multi-link negotiation.
+*/
+
+#if (WINVER >= 0x500)
+
+/* RASPPPLCP 'dwAuthenticatonProtocol' values.
+*/
+#define RASLCPAP_PAP          0xC023
+#define RASLCPAP_SPAP         0xC027
+#define RASLCPAP_CHAP         0xC223
+#define RASLCPAP_EAP          0xC227
+
+/* RASPPPLCP 'dwAuthenticatonData' values.
+*/
+#define RASLCPAD_CHAP_MD5     0x05
+#define RASLCPAD_CHAP_MS      0x80
+#define RASLCPAD_CHAP_MSV2    0x81
+
+/* RASPPPLCP 'dwOptions' and 'dwServerOptions' flags.
+*/
+#define RASLCPO_PFC           0x00000001
+#define RASLCPO_ACFC          0x00000002
+#define RASLCPO_SSHF          0x00000004
+#define RASLCPO_DES_56        0x00000008
+#define RASLCPO_3_DES         0x00000010
+
+#endif
+
+
+#define RASPPPLCPW struct tagRASPPPLCPW
+RASPPPLCPW
+{
+    DWORD dwSize;
+    BOOL  fBundled;
+
+#if (WINVER >= 0x500)
+    DWORD dwError;
+    DWORD dwAuthenticationProtocol;
+    DWORD dwAuthenticationData;
+    DWORD dwEapTypeId;
+    DWORD dwServerAuthenticationProtocol;
+    DWORD dwServerAuthenticationData;
+    DWORD dwServerEapTypeId;
+    BOOL  fMultilink;
+    DWORD dwTerminateReason;
+    DWORD dwServerTerminateReason;
+    WCHAR szReplyMessage[RAS_MaxReplyMessage];
+    DWORD dwOptions;
+    DWORD dwServerOptions;
+#endif
+
+};
+
+#define RASPPPLCPA struct tagRASPPPLCPA
+RASPPPLCPA
+{
+    DWORD dwSize;
+    BOOL  fBundled;
+
+#if (WINVER >= 0x500)
+    DWORD dwError;
+    DWORD dwAuthenticationProtocol;
+    DWORD dwAuthenticationData;
+    DWORD dwEapTypeId;
+    DWORD dwServerAuthenticationProtocol;
+    DWORD dwServerAuthenticationData;
+    DWORD dwServerEapTypeId;
+    BOOL  fMultilink;
+    DWORD dwTerminateReason;
+    DWORD dwServerTerminateReason;
+    CHAR  szReplyMessage[RAS_MaxReplyMessage];
+    DWORD dwOptions;
+    DWORD dwServerOptions;
+#endif
+
+};
+
+
+#ifdef UNICODE
+#define RASPPPLCP RASPPPLCPW
+#else
+#define RASPPPLCP RASPPPLCPA
+#endif
+
+#define LPRASPPPLCPW RASPPPLCPW*
+#define LPRASPPPLCPA RASPPPLCPA*
+#define LPRASPPPLCP  RASPPPLCP*
+
+
+/* Describes the results of a SLIP (Serial Line IP) projection.
+*/
+#define RASSLIPW struct tagRASSLIPW
+RASSLIPW
+{
+    DWORD dwSize;
+    DWORD dwError;
+    WCHAR szIpAddress[ RAS_MaxIpAddress + 1 ];
+};
+
+
+#define RASSLIPA struct tagRASSLIPA
+RASSLIPA
+{
+    DWORD dwSize;
+    DWORD dwError;
+    CHAR  szIpAddress[ RAS_MaxIpAddress + 1 ];
+};
+
+#ifdef UNICODE
+#define RASSLIP RASSLIPW
+#else
+#define RASSLIP RASSLIPA
+#endif
+
+#define LPRASSLIPW RASSLIPW*
+#define LPRASSLIPA RASSLIPA*
+#define LPRASSLIP  RASSLIP*
+
+#if (WINVER >= 0x500)
+
+/* Describes the results of a PPP CCP (Compression Control Protocol)
+projection.
+*/
+
+/* RASPPPCCP 'dwCompressionAlgorithm' values.
+*/
+#define RASCCPCA_MPPC         0x00000006
+#define RASCCPCA_STAC         0x00000005
+
+/* RASPPPCCP 'dwOptions' values.
+*/
+#define RASCCPO_Compression       0x00000001
+#define RASCCPO_HistoryLess       0x00000002
+#define RASCCPO_Encryption56bit   0x00000010
+#define RASCCPO_Encryption40bit   0x00000020
+#define RASCCPO_Encryption128bit  0x00000040
+
+#define RASPPPCCP struct tagRASPPPCCP
+RASPPPCCP
+{
+    DWORD dwSize;
+    DWORD dwError;
+    DWORD dwCompressionAlgorithm;
+    DWORD dwOptions;
+    DWORD dwServerCompressionAlgorithm;
+    DWORD dwServerOptions;
+};
+
+#define LPRASPPPCCP  RASPPPCCP*
+
+#endif
+
+/* If using RasDial message notifications, get the notification message code
+** by passing this string to the RegisterWindowMessageA() API.
+** WM_RASDIALEVENT is used only if a unique message cannot be registered.
+*/
+#define RASDIALEVENT    "RasDialEvent"
+#define WM_RASDIALEVENT 0xCCCD
+
+/* Prototypes for caller's RasDial callback handler.  Arguments are the
+** message ID (currently always WM_RASDIALEVENT), the current RASCONNSTATE and
+** the error that has occurred (or 0 if none).  Extended arguments are the
+** handle of the RAS connection and an extended error code.
+**
+** For RASDIALFUNC2, subsequent callback notifications for all
+** subentries can be cancelled by returning FALSE.
+*/
+typedef VOID (WINAPI *RASDIALFUNC)( UINT, RASCONNSTATE, DWORD );
+typedef VOID (WINAPI *RASDIALFUNC1)( HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD );
+typedef DWORD (WINAPI *RASDIALFUNC2)( ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD );
+
+
+/* Information describing a RAS-capable device.
+*/
+#define RASDEVINFOW struct tagRASDEVINFOW
+RASDEVINFOW
+{
+    DWORD    dwSize;
+    WCHAR    szDeviceType[ RAS_MaxDeviceType + 1 ];
+    WCHAR    szDeviceName[ RAS_MaxDeviceName + 1 ];
+};
+
+#define RASDEVINFOA struct tagRASDEVINFOA
+RASDEVINFOA
+{
+    DWORD    dwSize;
+    CHAR     szDeviceType[ RAS_MaxDeviceType + 1 ];
+    CHAR     szDeviceName[ RAS_MaxDeviceName + 1 ];
+};
+
+#ifdef UNICODE
+#define RASDEVINFO RASDEVINFOW
+#else
+#define RASDEVINFO RASDEVINFOA
+#endif
+
+#define LPRASDEVINFOW RASDEVINFOW*
+#define LPRASDEVINFOA RASDEVINFOA*
+#define LPRASDEVINFO  RASDEVINFO*
+
+/* RAS country information (currently retrieved from TAPI).
+*/
+#define RASCTRYINFO struct RASCTRYINFO
+RASCTRYINFO
+{
+    DWORD   dwSize;
+    DWORD   dwCountryID;
+    DWORD   dwNextCountryID;
+    DWORD   dwCountryCode;
+    DWORD   dwCountryNameOffset;
+};
+
+/* There is currently no difference between
+** RASCTRYINFOA and RASCTRYINFOW.  This may
+** change in the future.
+*/
+#define RASCTRYINFOW   RASCTRYINFO
+#define RASCTRYINFOA   RASCTRYINFO
+
+#define LPRASCTRYINFOW RASCTRYINFOW*
+#define LPRASCTRYINFOA RASCTRYINFOW*
+#define LPRASCTRYINFO  RASCTRYINFO*
+
+/* A RAS IP address.
+*/
+#define RASIPADDR struct RASIPADDR
+RASIPADDR
+{
+    BYTE a;
+    BYTE b;
+    BYTE c;
+    BYTE d;
+};
+
+#if (WINVER >= 0x500)
+
+#define ET_None         0  // No encryption
+#define ET_Require      1  // Require Encryption
+#define ET_RequireMax   2  // Require max encryption
+#define ET_Optional     3  // Do encryption if possible. None Ok.
+
+#endif
+
+#define VS_Default      0   // default (PPTP for now)
+#define VS_PptpOnly     1   // Only PPTP is attempted.
+#define VS_PptpFirst    2   // PPTP is tried first.
+#define VS_L2tpOnly     3   // Only L2TP is attempted.
+#define VS_L2tpFirst    4   // L2TP is tried first.
+
+/* A RAS phone book entry.
+*/
+#define RASENTRYA struct tagRASENTRYA
+RASENTRYA
+{
+    DWORD       dwSize;
+    DWORD       dwfOptions;
+    //
+    // Location/phone number.
+    //
+    DWORD       dwCountryID;
+    DWORD       dwCountryCode;
+    CHAR        szAreaCode[ RAS_MaxAreaCode + 1 ];
+    CHAR        szLocalPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    DWORD       dwAlternateOffset;
+    //
+    // PPP/Ip
+    //
+    RASIPADDR   ipaddr;
+    RASIPADDR   ipaddrDns;
+    RASIPADDR   ipaddrDnsAlt;
+    RASIPADDR   ipaddrWins;
+    RASIPADDR   ipaddrWinsAlt;
+    //
+    // Framing
+    //
+    DWORD       dwFrameSize;
+    DWORD       dwfNetProtocols;
+    DWORD       dwFramingProtocol;
+    //
+    // Scripting
+    //
+    CHAR        szScript[ MAX_PATH ];
+    //
+    // AutoDial
+    //
+    CHAR        szAutodialDll[ MAX_PATH ];
+    CHAR        szAutodialFunc[ MAX_PATH ];
+    //
+    // Device
+    //
+    CHAR        szDeviceType[ RAS_MaxDeviceType + 1 ];
+    CHAR        szDeviceName[ RAS_MaxDeviceName + 1 ];
+    //
+    // X.25
+    //
+    CHAR        szX25PadType[ RAS_MaxPadType + 1 ];
+    CHAR        szX25Address[ RAS_MaxX25Address + 1 ];
+    CHAR        szX25Facilities[ RAS_MaxFacilities + 1 ];
+    CHAR        szX25UserData[ RAS_MaxUserData + 1 ];
+    DWORD       dwChannels;
+    //
+    // Reserved
+    //
+    DWORD       dwReserved1;
+    DWORD       dwReserved2;
+#if (WINVER >= 0x401)
+    //
+    // Multilink
+    //
+    DWORD       dwSubEntries;
+    DWORD       dwDialMode;
+    DWORD       dwDialExtraPercent;
+    DWORD       dwDialExtraSampleSeconds;
+    DWORD       dwHangUpExtraPercent;
+    DWORD       dwHangUpExtraSampleSeconds;
+    //
+    // Idle timeout
+    //
+    DWORD       dwIdleDisconnectSeconds;
+#endif
+
+#if (WINVER >= 0x500)
+
+    //
+    // Entry Type
+    //
+    DWORD       dwType;
+
+    //
+    // Encryption type
+    //
+    DWORD       dwEncryptionType;
+
+    //
+    // CustomAuthKey to be used for EAP
+    //
+    DWORD       dwCustomAuthKey;
+
+    //
+    // Guid of the connection
+    //
+    GUID        guidId;
+
+    //
+    // Custom Dial Dll
+    //
+    CHAR        szCustomDialDll[MAX_PATH];
+
+    //
+    // DwVpnStrategy
+    //
+    DWORD       dwVpnStrategy;
+#endif
+
+#if (WINVER >= 0x501)
+    //
+    // More RASEO_* options
+    //
+    DWORD       dwfOptions2;
+
+    //
+    // For future use
+    //
+    DWORD       dwfOptions3;
+
+    CHAR        szDnsSuffix[RAS_MaxDnsSuffix];
+
+    DWORD       dwTcpWindowSize;
+
+    CHAR        szPrerequisitePbk[MAX_PATH];
+
+    CHAR        szPrerequisiteEntry[RAS_MaxEntryName + 1];
+
+    DWORD       dwRedialCount;
+
+    DWORD       dwRedialPause;
+#endif
+
+};
+
+#define RASENTRYW struct tagRASENTRYW
+RASENTRYW
+{
+    DWORD       dwSize;
+    DWORD       dwfOptions;
+    //
+    // Location/phone number
+    //
+    DWORD       dwCountryID;
+    DWORD       dwCountryCode;
+    WCHAR       szAreaCode[ RAS_MaxAreaCode + 1 ];
+    WCHAR       szLocalPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    DWORD       dwAlternateOffset;
+    //
+    // PPP/Ip
+    //
+    RASIPADDR   ipaddr;
+    RASIPADDR   ipaddrDns;
+    RASIPADDR   ipaddrDnsAlt;
+    RASIPADDR   ipaddrWins;
+    RASIPADDR   ipaddrWinsAlt;
+    //
+    // Framing
+    //
+    DWORD       dwFrameSize;
+    DWORD       dwfNetProtocols;
+    DWORD       dwFramingProtocol;
+    //
+    // Scripting
+    //
+    WCHAR       szScript[ MAX_PATH ];
+    //
+    // AutoDial
+    //
+    WCHAR       szAutodialDll[ MAX_PATH ];
+    WCHAR       szAutodialFunc[ MAX_PATH ];
+    //
+    // Device
+    //
+    WCHAR       szDeviceType[ RAS_MaxDeviceType + 1 ];
+    WCHAR       szDeviceName[ RAS_MaxDeviceName + 1 ];
+    //
+    // X.25
+    //
+    WCHAR       szX25PadType[ RAS_MaxPadType + 1 ];
+    WCHAR       szX25Address[ RAS_MaxX25Address + 1 ];
+    WCHAR       szX25Facilities[ RAS_MaxFacilities + 1 ];
+    WCHAR       szX25UserData[ RAS_MaxUserData + 1 ];
+    DWORD       dwChannels;
+    //
+    // Reserved
+    //
+    DWORD       dwReserved1;
+    DWORD       dwReserved2;
+#if (WINVER >= 0x401)
+    //
+    // Multilink
+    //
+    DWORD       dwSubEntries;
+    DWORD       dwDialMode;
+    DWORD       dwDialExtraPercent;
+    DWORD       dwDialExtraSampleSeconds;
+    DWORD       dwHangUpExtraPercent;
+    DWORD       dwHangUpExtraSampleSeconds;
+    //
+    // Idle timeout
+    //
+    DWORD       dwIdleDisconnectSeconds;
+#endif
+
+#if (WINVER >= 0x500)
+    //
+    // Entry Type
+    //
+    DWORD       dwType;
+
+    //
+    // EncryptionType
+    //
+    DWORD       dwEncryptionType;
+
+    //
+    // CustomAuthKey to be used for EAP
+    //
+    DWORD       dwCustomAuthKey;
+
+    //
+    // Guid of the connection
+    //
+    GUID        guidId;
+
+    //
+    // Custom Dial Dll
+    //
+    WCHAR       szCustomDialDll[MAX_PATH];
+
+    //
+    // Vpn Strategy
+    //
+    DWORD       dwVpnStrategy;
+#endif
+
+#if (WINVER >= 0x501)
+    //
+    // More RASEO_* options
+    //
+    DWORD       dwfOptions2;
+
+    //
+    // For future use
+    //
+    DWORD       dwfOptions3;
+
+    WCHAR       szDnsSuffix[RAS_MaxDnsSuffix];
+
+    DWORD       dwTcpWindowSize;
+
+    WCHAR       szPrerequisitePbk[MAX_PATH];
+
+    WCHAR       szPrerequisiteEntry[RAS_MaxEntryName + 1];
+
+    DWORD       dwRedialCount;
+
+    DWORD       dwRedialPause;
+#endif
+};
+
+#ifdef UNICODE
+#define RASENTRY RASENTRYW
+#else
+#define RASENTRY RASENTRYA
+#endif
+
+#define LPRASENTRYW RASENTRYW*
+#define LPRASENTRYA RASENTRYA*
+#define LPRASENTRY  RASENTRY*
+
+/* RASENTRY 'dwfOptions' bit flags.
+*/
+#define RASEO_UseCountryAndAreaCodes    0x00000001
+#define RASEO_SpecificIpAddr            0x00000002
+#define RASEO_SpecificNameServers       0x00000004
+#define RASEO_IpHeaderCompression       0x00000008
+#define RASEO_RemoteDefaultGateway      0x00000010
+#define RASEO_DisableLcpExtensions      0x00000020
+#define RASEO_TerminalBeforeDial        0x00000040
+#define RASEO_TerminalAfterDial         0x00000080
+#define RASEO_ModemLights               0x00000100
+#define RASEO_SwCompression             0x00000200
+#define RASEO_RequireEncryptedPw        0x00000400
+#define RASEO_RequireMsEncryptedPw      0x00000800
+#define RASEO_RequireDataEncryption     0x00001000
+#define RASEO_NetworkLogon              0x00002000
+#define RASEO_UseLogonCredentials       0x00004000
+#define RASEO_PromoteAlternates         0x00008000
+
+#if (WINVER >= 0x401)
+#define RASEO_SecureLocalFiles          0x00010000
+#endif
+
+#if (WINVER >= 0x500)
+#define RASEO_RequireEAP                0x00020000
+#define RASEO_RequirePAP                0x00040000
+#define RASEO_RequireSPAP               0x00080000
+#define RASEO_Custom                    0x00100000
+
+#define RASEO_PreviewPhoneNumber        0x00200000
+#define RASEO_SharedPhoneNumbers        0x00800000
+#define RASEO_PreviewUserPw             0x01000000
+#define RASEO_PreviewDomain             0x02000000
+#define RASEO_ShowDialingProgress       0x04000000
+#define RASEO_RequireCHAP               0x08000000
+#define RASEO_RequireMsCHAP             0x10000000
+#define RASEO_RequireMsCHAP2            0x20000000
+#define RASEO_RequireW95MSCHAP          0x40000000
+#define RASEO_CustomScript              0x80000000
+#endif
+
+#if (WINVER >= 0x501)
+//
+// RASENTRY dwfOptions2 bit flags
+//
+#define RASEO2_SecureFileAndPrint       0x00000001
+#define RASEO2_SecureClientForMSNet     0x00000002
+#define RASEO2_DontNegotiateMultilink   0x00000004
+#define RASEO2_DontUseRasCredentials    0x00000008
+#define RASEO2_UsePreSharedKey          0x00000010
+#define RASEO2_Internet                 0x00000020
+#define RASEO2_DisableNbtOverIP         0x00000040
+#define RASEO2_UseGlobalDeviceSettings  0x00000080
+#define RASEO2_ReconnectIfDropped       0x00000100
+#define RASEO2_SharePhoneNumbers        0x00000200
+#endif
+
+/* RASENTRY 'dwProtocols' bit flags.
+*/
+#define RASNP_NetBEUI                   0x00000001
+#define RASNP_Ipx                       0x00000002
+#define RASNP_Ip                        0x00000004
+
+/* RASENTRY 'dwFramingProtocols' bit flags.
+*/
+#define RASFP_Ppp                       0x00000001
+#define RASFP_Slip                      0x00000002
+#define RASFP_Ras                       0x00000004
+
+/* RASENTRY 'szDeviceType' default strings.
+*/
+#define RASDT_Modem                     TEXT("modem")
+#define RASDT_Isdn                      TEXT("isdn")
+#define RASDT_X25                       TEXT("x25")
+#define RASDT_Vpn                       TEXT("vpn")
+#define RASDT_Pad                       TEXT("pad")
+#define RASDT_Generic                   TEXT("GENERIC")
+#define RASDT_Serial                    TEXT("SERIAL")
+#define RASDT_FrameRelay                TEXT("FRAMERELAY")
+#define RASDT_Atm                       TEXT("ATM")
+#define RASDT_Sonet                     TEXT("SONET")
+#define RASDT_SW56                      TEXT("SW56")
+#define RASDT_Irda                      TEXT("IRDA")
+#define RASDT_Parallel                  TEXT("PARALLEL")
+#if (WINVER >= 0x501)
+#define RASDT_PPPoE                     TEXT("PPPoE")
+#endif
+
+
+// The entry type used to determine which UI properties
+// are to be presented to user.  This generally corresponds
+// to a Connections "add" wizard selection.
+//
+#define RASET_Phone     1  // Phone lines: modem, ISDN, X.25, etc
+#define RASET_Vpn       2  // Virtual private network
+#define RASET_Direct    3  // Direct connect: serial, parallel
+#define RASET_Internet  4  // BaseCamp internet
+#if (WINVER >= 0x501)
+#define RASET_Broadband 5  // Broadband
+#endif
+
+/* Old AutoDial DLL function prototype.
+**
+** This prototype is documented for backward-compatibility
+** purposes only.  It is superceded by the RASADFUNCA
+** and RASADFUNCW definitions below.  DO NOT USE THIS
+** PROTOTYPE IN NEW CODE.  SUPPORT FOR IT MAY BE REMOVED
+** IN FUTURE VERSIONS OF RAS.
+*/
+typedef BOOL (WINAPI *ORASADFUNC)( HWND, LPSTR, DWORD, LPDWORD );
+
+#if (WINVER >= 0x400)
+
+/* Flags for RasConnectionNotification().
+*/
+#define RASCN_Connection        0x00000001
+#define RASCN_Disconnection     0x00000002
+#define RASCN_BandwidthAdded    0x00000004
+#define RASCN_BandwidthRemoved  0x00000008
+
+#endif
+
+#if (WINVER >= 0x401)
+/* RASENTRY 'dwDialMode' values.
+*/
+#define RASEDM_DialAll                  1
+#define RASEDM_DialAsNeeded             2
+
+/* RASENTRY 'dwIdleDisconnectSeconds' constants.
+*/
+#define RASIDS_Disabled                 0xffffffff
+#define RASIDS_UseGlobalValue           0
+
+/* AutoDial DLL function parameter block.
+*/
+#define RASADPARAMS struct tagRASADPARAMS
+RASADPARAMS
+{
+    DWORD       dwSize;
+    HWND        hwndOwner;
+    DWORD       dwFlags;
+    LONG        xDlg;
+    LONG        yDlg;
+};
+
+#define LPRASADPARAMS RASADPARAMS*
+
+/* AutoDial DLL function parameter block 'dwFlags.'
+*/
+#define RASADFLG_PositionDlg            0x00000001
+
+/* Prototype AutoDial DLL function.
+*/
+typedef BOOL (WINAPI *RASADFUNCA)( LPSTR, LPSTR, LPRASADPARAMS, LPDWORD );
+typedef BOOL (WINAPI *RASADFUNCW)( LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD );
+
+#ifdef UNICODE
+#define RASADFUNC RASADFUNCW
+#else
+#define RASADFUNC RASADFUNCA
+#endif
+
+/* A RAS phone book multilinked sub-entry.
+*/
+#define RASSUBENTRYA struct tagRASSUBENTRYA
+RASSUBENTRYA
+{
+    DWORD       dwSize;
+    DWORD       dwfFlags;
+    //
+    // Device
+    //
+    CHAR        szDeviceType[ RAS_MaxDeviceType + 1 ];
+    CHAR        szDeviceName[ RAS_MaxDeviceName + 1 ];
+    //
+    // Phone numbers
+    //
+    CHAR        szLocalPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    DWORD       dwAlternateOffset;
+};
+
+#define RASSUBENTRYW struct tagRASSUBENTRYW
+RASSUBENTRYW
+{
+    DWORD       dwSize;
+    DWORD       dwfFlags;
+    //
+    // Device
+    //
+    WCHAR       szDeviceType[ RAS_MaxDeviceType + 1 ];
+    WCHAR       szDeviceName[ RAS_MaxDeviceName + 1 ];
+    //
+    // Phone numbers
+    //
+    WCHAR       szLocalPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
+    DWORD       dwAlternateOffset;
+};
+
+#ifdef UNICODE
+#define RASSUBENTRY RASSUBENTRYW
+#else
+#define RASSUBENTRY RASSUBENTRYA
+#endif
+
+#define LPRASSUBENTRYW RASSUBENTRYW*
+#define LPRASSUBENTRYA RASSUBENTRYA*
+#define LPRASSUBENTRY  RASSUBENTRY*
+
+/* Ras{Get,Set}Credentials structure.  These calls
+** supercede Ras{Get,Set}EntryDialParams.
+*/
+#define RASCREDENTIALSA struct tagRASCREDENTIALSA
+RASCREDENTIALSA
+{
+    DWORD dwSize;
+    DWORD dwMask;
+    CHAR szUserName[ UNLEN + 1 ];
+    CHAR szPassword[ PWLEN + 1 ];
+    CHAR szDomain[ DNLEN + 1 ];
+};
+
+#define RASCREDENTIALSW struct tagRASCREDENTIALSW
+RASCREDENTIALSW
+{
+    DWORD dwSize;
+    DWORD dwMask;
+    WCHAR szUserName[ UNLEN + 1 ];
+    WCHAR szPassword[ PWLEN + 1 ];
+    WCHAR szDomain[ DNLEN + 1 ];
+};
+
+#ifdef UNICODE
+#define RASCREDENTIALS RASCREDENTIALSW
+#else
+#define RASCREDENTIALS RASCREDENTIALSA
+#endif
+
+#define LPRASCREDENTIALSW RASCREDENTIALSW*
+#define LPRASCREDENTIALSA RASCREDENTIALSA*
+#define LPRASCREDENTIALS  RASCREDENTIALS*
+
+/* RASCREDENTIALS 'dwMask' values.
+*/
+#define RASCM_UserName          0x00000001
+#define RASCM_Password          0x00000002
+#define RASCM_Domain            0x00000004
+#if (WINVER >= 501)
+#define RASCM_DefaultCreds       0x00000008
+#define RASCM_PreSharedKey       0x00000010
+#define RASCM_ServerPreSharedKey 0x00000020
+#define RASCM_DDMPreSharedKey    0x00000040
+#endif
+
+/* AutoDial address properties.
+*/
+#define RASAUTODIALENTRYA struct tagRASAUTODIALENTRYA
+RASAUTODIALENTRYA
+{
+    DWORD dwSize;
+    DWORD dwFlags;
+    DWORD dwDialingLocation;
+    CHAR szEntry[ RAS_MaxEntryName + 1];
+};
+
+#define RASAUTODIALENTRYW struct tagRASAUTODIALENTRYW
+RASAUTODIALENTRYW
+{
+    DWORD dwSize;
+    DWORD dwFlags;
+    DWORD dwDialingLocation;
+    WCHAR szEntry[ RAS_MaxEntryName + 1];
+};
+
+#ifdef UNICODE
+#define RASAUTODIALENTRY RASAUTODIALENTRYW
+#else
+#define RASAUTODIALENTRY RASAUTODIALENTRYA
+#endif
+
+#define LPRASAUTODIALENTRYW RASAUTODIALENTRYW*
+#define LPRASAUTODIALENTRYA RASAUTODIALENTRYA*
+#define LPRASAUTODIALENTRY  RASAUTODIALENTRY*
+
+/* AutoDial control parameter values for
+** Ras{Get,Set}AutodialParam.
+*/
+#define RASADP_DisableConnectionQuery           0
+#define RASADP_LoginSessionDisable              1
+#define RASADP_SavedAddressesLimit              2
+#define RASADP_FailedConnectionTimeout          3
+#define RASADP_ConnectionQueryTimeout           4
+
+#endif // (WINVER >= 0x401)
+
+#if (WINVER >= 0x500)
+
+/* RasGetEapUserIdentity bit flags.
+** These have the same values as the RAS_EAP_FLAG_ flags in raseapif.h
+*/
+#define RASEAPF_NonInteractive          0x00000002
+#define RASEAPF_Logon                   0x00000004
+#define RASEAPF_Preview                 0x00000008
+
+/* RasGetEapUserIdentity structure.
+*/
+#define RASEAPUSERIDENTITYA struct tagRASEAPUSERIDENTITYA
+RASEAPUSERIDENTITYA
+{
+    CHAR        szUserName[ UNLEN + 1 ];
+    DWORD       dwSizeofEapInfo;
+    BYTE        pbEapInfo[ 1 ];
+};
+
+#define RASEAPUSERIDENTITYW struct tagRASEAPUSERIDENTITYW
+RASEAPUSERIDENTITYW
+{
+    WCHAR       szUserName[ UNLEN + 1 ];
+    DWORD       dwSizeofEapInfo;
+    BYTE        pbEapInfo[ 1 ];
+};
+
+#ifdef UNICODE
+#define RASEAPUSERIDENTITY RASEAPUSERIDENTITYW
+#else
+#define RASEAPUSERIDENTITY RASEAPUSERIDENTITYA
+#endif
+
+#define LPRASEAPUSERIDENTITYW RASEAPUSERIDENTITYW*
+#define LPRASEAPUSERIDENTITYA RASEAPUSERIDENTITYA*
+
+typedef DWORD (WINAPI *PFNRASGETBUFFER) (
+                            PBYTE *ppBuffer,
+                            PDWORD pdwSize
+                            );
+
+typedef DWORD (WINAPI *PFNRASFREEBUFFER) (
+                            PBYTE pBufer);
+
+typedef DWORD (WINAPI *PFNRASSENDBUFFER) (
+                            HANDLE hPort,
+                            PBYTE  pBuffer,
+                            DWORD  dwSize
+                            );
+
+typedef DWORD (WINAPI *PFNRASRECEIVEBUFFER) (
+                            HANDLE hPort,
+                            PBYTE pBuffer,
+                            PDWORD pdwSize,
+                            DWORD  dwTimeOut,
+                            HANDLE hEvent
+                            );
+
+typedef DWORD (WINAPI *PFNRASRETRIEVEBUFFER) (
+                            HANDLE hPort,
+                            PBYTE pBuffer,
+                            PDWORD pdwSize
+                            );
+
+typedef  DWORD (WINAPI *RasCustomScriptExecuteFn) (
+                            HANDLE hPort,
+                            LPCWSTR lpszPhonebook,
+                            LPCWSTR lpszEntryName,
+                            PFNRASGETBUFFER pfnRasGetBuffer,
+                            PFNRASFREEBUFFER pfnRasFreeBuffer,
+                            PFNRASSENDBUFFER pfnRasSendBuffer,
+                            PFNRASRECEIVEBUFFER pfnRasReceiveBuffer,
+                            PFNRASRETRIEVEBUFFER pfnRasRetrieveBuffer,
+                            HWND hWnd,
+                            RASDIALPARAMS *pRasDialParams,
+                            PVOID pvReserved
+                            );
+                            
+                            
+                            
+                            
+
+#endif // (WINVER >= 0x500)
+
+#if (WINVER >= 0x0501)
+
+#define RASCOMMSETTINGS struct tagRASCOMMSETTINGS
+RASCOMMSETTINGS
+{
+    DWORD     dwSize;
+    BYTE      bParity;
+    BYTE      bStop;
+    BYTE      bByteSize;
+    BYTE      bAlign;
+};
+
+typedef DWORD (WINAPI *PFNRASSETCOMMSETTINGS) (
+                            HANDLE hPort,
+                            RASCOMMSETTINGS *pRasCommSettings,
+                            PVOID  pvReserved
+                            );
+
+#define RASCUSTOMSCRIPTEXTENSIONS struct tagRASCUSTOMSCRIPTEXTENSIONS
+RASCUSTOMSCRIPTEXTENSIONS
+{
+    DWORD                    dwSize;                  
+    PFNRASSETCOMMSETTINGS    pfnRasSetCommSettings;
+};
+
+#endif
+
+
+/* External RAS API function prototypes.
+*/
+DWORD APIENTRY RasDialA( LPRASDIALEXTENSIONS, LPCSTR, LPRASDIALPARAMSA, DWORD,
+                   LPVOID, LPHRASCONN );
+
+DWORD APIENTRY RasDialW( LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD,
+                   LPVOID, LPHRASCONN );
+
+DWORD APIENTRY RasEnumConnectionsA( LPRASCONNA, LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasEnumConnectionsW( LPRASCONNW, LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasEnumEntriesA( LPCSTR, LPCSTR, LPRASENTRYNAMEA, LPDWORD,
+                   LPDWORD );
+
+DWORD APIENTRY RasEnumEntriesW( LPCWSTR, LPCWSTR, LPRASENTRYNAMEW, LPDWORD,
+                   LPDWORD );
+
+DWORD APIENTRY RasGetConnectStatusA( HRASCONN, LPRASCONNSTATUSA );
+
+DWORD APIENTRY RasGetConnectStatusW( HRASCONN, LPRASCONNSTATUSW );
+
+DWORD APIENTRY RasGetErrorStringA( UINT, LPSTR, DWORD );
+
+DWORD APIENTRY RasGetErrorStringW( UINT, LPWSTR, DWORD );
+
+DWORD APIENTRY RasHangUpA( HRASCONN );
+
+DWORD APIENTRY RasHangUpW( HRASCONN );
+
+DWORD APIENTRY RasGetProjectionInfoA( HRASCONN, RASPROJECTION, LPVOID,
+                   LPDWORD );
+
+DWORD APIENTRY RasGetProjectionInfoW( HRASCONN, RASPROJECTION, LPVOID,
+                   LPDWORD );
+
+DWORD APIENTRY RasCreatePhonebookEntryA( HWND, LPCSTR );
+
+DWORD APIENTRY RasCreatePhonebookEntryW( HWND, LPCWSTR );
+
+DWORD APIENTRY RasEditPhonebookEntryA( HWND, LPCSTR, LPCSTR );
+
+DWORD APIENTRY RasEditPhonebookEntryW( HWND, LPCWSTR, LPCWSTR );
+
+DWORD APIENTRY RasSetEntryDialParamsA( LPCSTR, LPRASDIALPARAMSA, BOOL );
+
+DWORD APIENTRY RasSetEntryDialParamsW( LPCWSTR, LPRASDIALPARAMSW, BOOL );
+
+DWORD APIENTRY RasGetEntryDialParamsA( LPCSTR, LPRASDIALPARAMSA, LPBOOL );
+
+DWORD APIENTRY RasGetEntryDialParamsW( LPCWSTR, LPRASDIALPARAMSW, LPBOOL );
+
+DWORD APIENTRY RasEnumDevicesA( LPRASDEVINFOA, LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasEnumDevicesW( LPRASDEVINFOW, LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasGetCountryInfoA( LPRASCTRYINFOA, LPDWORD );
+
+DWORD APIENTRY RasGetCountryInfoW( LPRASCTRYINFOW, LPDWORD );
+
+DWORD APIENTRY RasGetEntryPropertiesA( LPCSTR, LPCSTR, LPRASENTRYA, LPDWORD, LPBYTE, LPDWORD );
+
+DWORD APIENTRY RasGetEntryPropertiesW( LPCWSTR, LPCWSTR, LPRASENTRYW, LPDWORD, LPBYTE, LPDWORD );
+
+DWORD APIENTRY RasSetEntryPropertiesA( LPCSTR, LPCSTR, LPRASENTRYA, DWORD, LPBYTE, DWORD );
+
+DWORD APIENTRY RasSetEntryPropertiesW( LPCWSTR, LPCWSTR, LPRASENTRYW, DWORD, LPBYTE, DWORD );
+
+DWORD APIENTRY RasRenameEntryA( LPCSTR, LPCSTR, LPCSTR );
+
+DWORD APIENTRY RasRenameEntryW( LPCWSTR, LPCWSTR, LPCWSTR );
+
+DWORD APIENTRY RasDeleteEntryA( LPCSTR, LPCSTR );
+
+DWORD APIENTRY RasDeleteEntryW( LPCWSTR, LPCWSTR );
+
+DWORD APIENTRY RasValidateEntryNameA( LPCSTR, LPCSTR );
+
+DWORD APIENTRY RasValidateEntryNameW( LPCWSTR, LPCWSTR );
+
+DWORD APIENTRY RasConnectionNotificationA( HRASCONN, HANDLE, DWORD );
+
+DWORD APIENTRY RasConnectionNotificationW( HRASCONN, HANDLE, DWORD );
+
+#if (WINVER >= 0x401)
+DWORD APIENTRY RasGetSubEntryHandleA( HRASCONN, DWORD, LPHRASCONN );
+
+DWORD APIENTRY RasGetSubEntryHandleW( HRASCONN, DWORD, LPHRASCONN );
+
+DWORD APIENTRY RasGetCredentialsA( LPCSTR, LPCSTR, LPRASCREDENTIALSA);
+
+DWORD APIENTRY RasGetCredentialsW( LPCWSTR, LPCWSTR, LPRASCREDENTIALSW );
+
+DWORD APIENTRY RasSetCredentialsA( LPCSTR, LPCSTR, LPRASCREDENTIALSA, BOOL );
+
+DWORD APIENTRY RasSetCredentialsW( LPCWSTR, LPCWSTR, LPRASCREDENTIALSW, BOOL );
+
+DWORD APIENTRY RasGetSubEntryPropertiesA( LPCSTR, LPCSTR, DWORD,
+                    LPRASSUBENTRYA, LPDWORD, LPBYTE, LPDWORD );
+
+DWORD APIENTRY RasGetSubEntryPropertiesW( LPCWSTR, LPCWSTR, DWORD,
+                    LPRASSUBENTRYW, LPDWORD, LPBYTE, LPDWORD );
+
+DWORD APIENTRY RasSetSubEntryPropertiesA( LPCSTR, LPCSTR, DWORD,
+                    LPRASSUBENTRYA, DWORD, LPBYTE, DWORD );
+
+DWORD APIENTRY RasSetSubEntryPropertiesW( LPCWSTR, LPCWSTR, DWORD,
+                    LPRASSUBENTRYW, DWORD, LPBYTE, DWORD );
+
+DWORD APIENTRY RasGetAutodialAddressA( LPCSTR, LPDWORD, LPRASAUTODIALENTRYA,
+                    LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasGetAutodialAddressW( LPCWSTR, LPDWORD, LPRASAUTODIALENTRYW,
+                    LPDWORD, LPDWORD);
+
+DWORD APIENTRY RasSetAutodialAddressA( LPCSTR, DWORD, LPRASAUTODIALENTRYA,
+                    DWORD, DWORD );
+
+DWORD APIENTRY RasSetAutodialAddressW( LPCWSTR, DWORD, LPRASAUTODIALENTRYW,
+                    DWORD, DWORD );
+
+DWORD APIENTRY RasEnumAutodialAddressesA( LPSTR *, LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasEnumAutodialAddressesW( LPWSTR *, LPDWORD, LPDWORD );
+
+DWORD APIENTRY RasGetAutodialEnableA( DWORD, LPBOOL );
+
+DWORD APIENTRY RasGetAutodialEnableW( DWORD, LPBOOL );
+
+DWORD APIENTRY RasSetAutodialEnableA( DWORD, BOOL );
+
+DWORD APIENTRY RasSetAutodialEnableW( DWORD, BOOL );
+
+DWORD APIENTRY RasGetAutodialParamA( DWORD, LPVOID, LPDWORD );
+
+DWORD APIENTRY RasGetAutodialParamW( DWORD, LPVOID, LPDWORD );
+
+DWORD APIENTRY RasSetAutodialParamA( DWORD, LPVOID, DWORD );
+
+DWORD APIENTRY RasSetAutodialParamW( DWORD, LPVOID, DWORD );
+#endif
+
+#if (WINVER >= 0x500)
+
+typedef struct _RAS_STATS
+{
+    DWORD   dwSize;
+    DWORD   dwBytesXmited;
+    DWORD   dwBytesRcved;
+    DWORD   dwFramesXmited;
+    DWORD   dwFramesRcved;
+    DWORD   dwCrcErr;
+    DWORD   dwTimeoutErr;
+    DWORD   dwAlignmentErr;
+    DWORD   dwHardwareOverrunErr;
+    DWORD   dwFramingErr;
+    DWORD   dwBufferOverrunErr;
+    DWORD   dwCompressionRatioIn;
+    DWORD   dwCompressionRatioOut;
+    DWORD   dwBps;
+    DWORD   dwConnectDuration;
+
+} RAS_STATS, *PRAS_STATS;
+
+
+typedef DWORD (WINAPI *RasCustomHangUpFn) (
+                            HRASCONN hRasConn
+                            );
+
+typedef DWORD (WINAPI *RasCustomDialFn) (
+        HINSTANCE           hInstDll,
+        LPRASDIALEXTENSIONS lpRasDialExtensions,
+        LPCWSTR              lpszPhonebook,
+        LPRASDIALPARAMS     lpRasDialParams,
+        DWORD               dwNotifierType,
+        LPVOID              lpvNotifier,
+        LPHRASCONN          lphRasConn,
+        DWORD               dwFlags
+        );
+
+typedef DWORD (WINAPI *RasCustomDeleteEntryNotifyFn) (
+        LPCWSTR             lpszPhonebook,
+        LPCWSTR             lpszEntry,
+        DWORD               dwFlags);
+
+
+#define RCD_SingleUser  0
+#define RCD_AllUsers    0x00000001
+#define RCD_Eap         0x00000002
+#define RCD_Logon       0x00000004
+
+DWORD APIENTRY RasInvokeEapUI( HRASCONN, DWORD, LPRASDIALEXTENSIONS, HWND);
+
+DWORD APIENTRY RasGetLinkStatistics(HRASCONN hRasConn,
+                                    DWORD dwSubEntry,
+                                    RAS_STATS *lpStatistics);
+
+DWORD APIENTRY RasGetConnectionStatistics(HRASCONN hRasConn,
+                                          RAS_STATS *lpStatistics);
+
+DWORD APIENTRY RasClearLinkStatistics(HRASCONN hRasConn,
+                                      DWORD dwSubEntry);
+
+
+DWORD APIENTRY RasClearConnectionStatistics(HRASCONN hRasConn);
+
+DWORD APIENTRY RasGetEapUserDataA(
+                   HANDLE hToken,
+                   LPCSTR pszPhonebook,
+                   LPCSTR pszEntry,
+                   BYTE   *pbEapData,
+                   DWORD  *pdwSizeofEapData);
+
+
+DWORD APIENTRY RasGetEapUserDataW(
+                   HANDLE  hToken,
+                   LPCWSTR pszPhonebook,
+                   LPCWSTR pszEntry,
+                   BYTE    *pbEapData,
+                   DWORD   *pdwSizeofEapData);
+
+DWORD APIENTRY RasSetEapUserDataA(
+                   HANDLE hToken,
+                   LPCSTR pszPhonebook,
+                   LPCSTR pszEntry,
+                   BYTE   *pbEapData,
+                   DWORD  dwSizeofEapData);
+
+DWORD APIENTRY RasSetEapUserDataW(
+                   HANDLE  hToken,
+                   LPCWSTR pszPhonebook,
+                   LPCWSTR pszEntry,
+                   BYTE    *pbEapData,
+                   DWORD   dwSizeofEapData);
+
+DWORD APIENTRY RasGetCustomAuthDataA(
+                   LPCSTR pszPhonebook,
+                   LPCSTR pszEntry,
+                   BYTE   *pbCustomAuthData,
+                   DWORD  *pdwSizeofCustomAuthData);
+
+
+DWORD APIENTRY RasGetCustomAuthDataW(
+                   LPCWSTR pszPhonebook,
+                   LPCWSTR pszEntry,
+                   BYTE    *pbCustomAuthData,
+                   DWORD   *pdwSizeofCustomAuthData);
+
+DWORD APIENTRY RasSetCustomAuthDataA(
+                   LPCSTR pszPhonebook,
+                   LPCSTR pszEntry,
+                   BYTE   *pbCustomAuthData,
+                   DWORD  dwSizeofCustomAuthData
+                   );
+
+DWORD APIENTRY RasSetCustomAuthDataW(
+                   LPCWSTR pszPhonebook,
+                   LPCWSTR pszEntry,
+                   BYTE    *pbCustomAuthData,
+                   DWORD   dwSizeofCustomAuthData
+                   );
+DWORD APIENTRY RasGetEapUserIdentityW(
+                   LPCWSTR                  pszPhonebook,
+                   LPCWSTR                  pszEntry,
+                   DWORD                    dwFlags,
+                   HWND                     hwnd,
+                   LPRASEAPUSERIDENTITYW*   ppRasEapUserIdentity
+);
+DWORD APIENTRY RasGetEapUserIdentityA(
+                   LPCSTR                   pszPhonebook,
+                   LPCSTR                   pszEntry,
+                   DWORD                    dwFlags,
+                   HWND                     hwnd,
+                   LPRASEAPUSERIDENTITYA*   ppRasEapUserIdentity
+);
+VOID APIENTRY RasFreeEapUserIdentityW(
+                   LPRASEAPUSERIDENTITYW    pRasEapUserIdentity
+);
+VOID APIENTRY RasFreeEapUserIdentityA(
+                   LPRASEAPUSERIDENTITYA    pRasEapUserIdentity
+);
+#endif
+
+#if (WINVER >= 0x501)
+
+DWORD APIENTRY  RasDeleteSubEntryA(
+                LPCSTR pszPhonebook,
+                LPCSTR pszEntry,
+                DWORD  dwSubentryId);
+
+DWORD APIENTRY  RasDeleteSubEntryW(
+                LPCWSTR pszPhonebook,
+                LPCWSTR pszEntry,
+                DWORD   dwSubEntryId);
+#endif
+
+#ifdef UNICODE
+#define RasDial                 RasDialW
+#define RasEnumConnections      RasEnumConnectionsW
+#define RasEnumEntries          RasEnumEntriesW
+#define RasGetConnectStatus     RasGetConnectStatusW
+#define RasGetErrorString       RasGetErrorStringW
+#define RasHangUp               RasHangUpW
+#define RasGetProjectionInfo    RasGetProjectionInfoW
+#define RasCreatePhonebookEntry RasCreatePhonebookEntryW
+#define RasEditPhonebookEntry   RasEditPhonebookEntryW
+#define RasSetEntryDialParams   RasSetEntryDialParamsW
+#define RasGetEntryDialParams   RasGetEntryDialParamsW
+#define RasEnumDevices          RasEnumDevicesW
+#define RasGetCountryInfo       RasGetCountryInfoW
+#define RasGetEntryProperties   RasGetEntryPropertiesW
+#define RasSetEntryProperties   RasSetEntryPropertiesW
+#define RasRenameEntry          RasRenameEntryW
+#define RasDeleteEntry          RasDeleteEntryW
+#define RasValidateEntryName    RasValidateEntryNameW
+#if (WINVER >= 0x401)
+#define RasGetSubEntryHandle        RasGetSubEntryHandleW
+#define RasConnectionNotification   RasConnectionNotificationW
+#define RasGetSubEntryProperties    RasGetSubEntryPropertiesW
+#define RasSetSubEntryProperties    RasSetSubEntryPropertiesW
+#define RasGetCredentials           RasGetCredentialsW
+#define RasSetCredentials           RasSetCredentialsW
+#define RasGetAutodialAddress       RasGetAutodialAddressW
+#define RasSetAutodialAddress       RasSetAutodialAddressW
+#define RasEnumAutodialAddresses    RasEnumAutodialAddressesW
+#define RasGetAutodialEnable        RasGetAutodialEnableW
+#define RasSetAutodialEnable        RasSetAutodialEnableW
+#define RasGetAutodialParam         RasGetAutodialParamW
+#define RasSetAutodialParam         RasSetAutodialParamW
+#endif
+#if (WINVER >= 0x500)
+#define RasGetEapUserData           RasGetEapUserDataW
+#define RasSetEapUserData           RasSetEapUserDataW
+#define RasGetCustomAuthData        RasGetCustomAuthDataW
+#define RasSetCustomAuthData        RasSetCustomAuthDataW
+#define RasGetEapUserIdentity       RasGetEapUserIdentityW
+#define RasFreeEapUserIdentity      RasFreeEapUserIdentityW
+#endif
+#if(WINVER >= 0x501)
+#define RasDeleteSubEntry           RasDeleteSubEntryW
+#endif
+#else
+#define RasDial                 RasDialA
+#define RasEnumConnections      RasEnumConnectionsA
+#define RasEnumEntries          RasEnumEntriesA
+#define RasGetConnectStatus     RasGetConnectStatusA
+#define RasGetErrorString       RasGetErrorStringA
+#define RasHangUp               RasHangUpA
+#define RasGetProjectionInfo    RasGetProjectionInfoA
+#define RasCreatePhonebookEntry RasCreatePhonebookEntryA
+#define RasEditPhonebookEntry   RasEditPhonebookEntryA
+#define RasSetEntryDialParams   RasSetEntryDialParamsA
+#define RasGetEntryDialParams   RasGetEntryDialParamsA
+#define RasEnumDevices          RasEnumDevicesA
+#define RasGetCountryInfo       RasGetCountryInfoA
+#define RasGetEntryProperties   RasGetEntryPropertiesA
+#define RasSetEntryProperties   RasSetEntryPropertiesA
+#define RasRenameEntry          RasRenameEntryA
+#define RasDeleteEntry          RasDeleteEntryA
+#define RasValidateEntryName    RasValidateEntryNameA
+#if (WINVER >= 0x401)
+#define RasGetSubEntryHandle        RasGetSubEntryHandleA
+#define RasConnectionNotification   RasConnectionNotificationA
+#define RasGetSubEntryProperties    RasGetSubEntryPropertiesA
+#define RasSetSubEntryProperties    RasSetSubEntryPropertiesA
+#define RasGetCredentials           RasGetCredentialsA
+#define RasSetCredentials           RasSetCredentialsA
+#define RasGetAutodialAddress       RasGetAutodialAddressA
+#define RasSetAutodialAddress       RasSetAutodialAddressA
+#define RasEnumAutodialAddresses    RasEnumAutodialAddressesA
+#define RasGetAutodialEnable        RasGetAutodialEnableA
+#define RasSetAutodialEnable        RasSetAutodialEnableA
+#define RasGetAutodialParam         RasGetAutodialParamA
+#define RasSetAutodialParam         RasSetAutodialParamA
+#endif
+#if (WINVER >= 0x500)
+#define RasGetEapUserData           RasGetEapUserDataA
+#define RasSetEapUserData           RasSetEapUserDataA
+#define RasGetCustomAuthData        RasGetCustomAuthDataA
+#define RasSetCustomAuthData        RasSetCustomAuthDataA
+#define RasGetEapUserIdentity       RasGetEapUserIdentityA
+#define RasFreeEapUserIdentity      RasFreeEapUserIdentityA
+#endif
+#if (WINVER >= 0x501)
+#define RasDeleteSubEntry           RasDeleteSubEntryA
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <poppack.h>
+
+#endif // _RAS_H_
diff --git a/base/Windows/Inc/Reason.h b/base/Windows/Inc/Reason.h
new file mode 100644
index 0000000..2b18bd7
--- /dev/null
+++ b/base/Windows/Inc/Reason.h
@@ -0,0 +1,113 @@
+//+-------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//  File:        reason.h
+//
+//  Contents:    Shutdown reason code values.
+//
+//  History:     8-00        Created         Hughleat
+//
+//--------------------------------------------------------------------
+#if !defined SENTINEL_Reason
+# define SENTINEL_Reason
+
+// Reason flags
+
+// Flags used by the various UIs.
+#define SHTDN_REASON_FLAG_COMMENT_REQUIRED          0x01000000
+#define SHTDN_REASON_FLAG_DIRTY_PROBLEM_ID_REQUIRED 0x02000000
+#define SHTDN_REASON_FLAG_CLEAN_UI                  0x04000000
+#define SHTDN_REASON_FLAG_DIRTY_UI                  0x08000000
+
+// Flags that end up in the event log code.
+#define SHTDN_REASON_FLAG_USER_DEFINED          0x40000000
+#define SHTDN_REASON_FLAG_PLANNED               0x80000000
+
+// Microsoft major reasons.
+#define SHTDN_REASON_MAJOR_OTHER                0x00000000
+#define SHTDN_REASON_MAJOR_NONE                 0x00000000
+#define SHTDN_REASON_MAJOR_HARDWARE             0x00010000
+#define SHTDN_REASON_MAJOR_OPERATINGSYSTEM      0x00020000
+#define SHTDN_REASON_MAJOR_SOFTWARE             0x00030000
+#define SHTDN_REASON_MAJOR_APPLICATION          0x00040000
+#define SHTDN_REASON_MAJOR_SYSTEM               0x00050000
+#define SHTDN_REASON_MAJOR_POWER                0x00060000
+#define SHTDN_REASON_MAJOR_LEGACY_API           0x00070000
+
+// Microsoft minor reasons.
+#define SHTDN_REASON_MINOR_OTHER                0x00000000
+#define SHTDN_REASON_MINOR_NONE                 0x000000ff
+#define SHTDN_REASON_MINOR_MAINTENANCE          0x00000001
+#define SHTDN_REASON_MINOR_INSTALLATION         0x00000002
+#define SHTDN_REASON_MINOR_UPGRADE              0x00000003
+#define SHTDN_REASON_MINOR_RECONFIG             0x00000004
+#define SHTDN_REASON_MINOR_HUNG                 0x00000005
+#define SHTDN_REASON_MINOR_UNSTABLE             0x00000006
+#define SHTDN_REASON_MINOR_DISK                 0x00000007
+#define SHTDN_REASON_MINOR_PROCESSOR            0x00000008
+#define SHTDN_REASON_MINOR_NETWORKCARD          0x00000009
+#define SHTDN_REASON_MINOR_POWER_SUPPLY         0x0000000a
+#define SHTDN_REASON_MINOR_CORDUNPLUGGED        0x0000000b
+#define SHTDN_REASON_MINOR_ENVIRONMENT          0x0000000c
+#define SHTDN_REASON_MINOR_HARDWARE_DRIVER      0x0000000d
+#define SHTDN_REASON_MINOR_OTHERDRIVER          0x0000000e
+#define SHTDN_REASON_MINOR_BLUESCREEN           0x0000000F
+#define SHTDN_REASON_MINOR_SERVICEPACK          0x00000010
+#define SHTDN_REASON_MINOR_HOTFIX               0x00000011
+#define SHTDN_REASON_MINOR_SECURITYFIX          0x00000012
+#define SHTDN_REASON_MINOR_SECURITY             0x00000013
+#define SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY 0x00000014
+#define SHTDN_REASON_MINOR_WMI                  0x00000015 
+#define SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL 0x00000016
+#define SHTDN_REASON_MINOR_HOTFIX_UNINSTALL     0x00000017
+#define SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL 0x00000018
+#define SHTDN_REASON_MINOR_MMC                  0x00000019
+#define SHTDN_REASON_MINOR_TERMSRV              0x00000020
+
+#define SHTDN_REASON_UNKNOWN                    SHTDN_REASON_MINOR_NONE
+#define SHTDN_REASON_LEGACY_API                 (SHTDN_REASON_MAJOR_LEGACY_API | SHTDN_REASON_FLAG_PLANNED)
+
+// This mask cuts out UI flags.
+#define SHTDN_REASON_VALID_BIT_MASK             0xc0ffffff
+
+// Convenience flags.
+#define PCLEANUI                (SHTDN_REASON_FLAG_PLANNED | SHTDN_REASON_FLAG_CLEAN_UI)
+#define UCLEANUI                (SHTDN_REASON_FLAG_CLEAN_UI)
+#define PDIRTYUI                (SHTDN_REASON_FLAG_PLANNED | SHTDN_REASON_FLAG_DIRTY_UI)
+#define UDIRTYUI                (SHTDN_REASON_FLAG_DIRTY_UI)
+
+/*
+ * Maximum character lengths for reason name, description, problem id, and
+ * comment respectively.
+ */
+#define MAX_REASON_NAME_LEN  64
+#define MAX_REASON_DESC_LEN  256
+#define MAX_REASON_BUGID_LEN 32
+#define MAX_REASON_COMMENT_LEN  512
+#define SHUTDOWN_TYPE_LEN 32
+
+/*
+ *  S.E.T. policy value
+ *
+ */
+#define POLICY_SHOWREASONUI_NEVER               0
+#define POLICY_SHOWREASONUI_ALWAYS              1
+#define POLICY_SHOWREASONUI_WORKSTATIONONLY     2
+#define POLICY_SHOWREASONUI_SERVERONLY          3
+
+
+/*
+ * Snapshot policy values
+ */
+#define SNAPSHOT_POLICY_NEVER            0
+#define SNAPSHOT_POLICY_ALWAYS           1
+#define SNAPSHOT_POLICY_UNPLANNED        2
+
+/*
+ * Maximue user defined reasons
+ */
+#define MAX_NUM_REASONS 256
+
+#endif // !defined SENTINEL_Reason
diff --git a/base/Windows/Inc/Sddl.h b/base/Windows/Inc/Sddl.h
new file mode 100644
index 0000000..0c4cfba
--- /dev/null
+++ b/base/Windows/Inc/Sddl.h
@@ -0,0 +1,275 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    sddl.w
+
+Abstract:
+
+    This module defines the support and conversions routines necessary for SDDL.
+
+Revision History:
+
+--*/
+
+#ifndef __SDDL_H__
+#define __SDDL_H__
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//
+// SDDL Version information
+//
+#define SDDL_REVISION_1     1
+#define SDDL_REVISION       SDDL_REVISION_1
+
+//
+// SDDL Component tags
+//
+#define SDDL_OWNER                          TEXT("O")       // Owner tag
+#define SDDL_GROUP                          TEXT("G")       // Group tag
+#define SDDL_DACL                           TEXT("D")       // DACL tag
+#define SDDL_SACL                           TEXT("S")       // SACL tag
+
+//
+// SDDL Security descriptor controls
+//
+#define SDDL_PROTECTED                      TEXT("P")       // DACL or SACL Protected
+#define SDDL_AUTO_INHERIT_REQ               TEXT("AR")      // Auto inherit request
+#define SDDL_AUTO_INHERITED                 TEXT("AI")      // DACL/SACL are auto inherited
+
+//
+// SDDL Ace types
+//
+#define SDDL_ACCESS_ALLOWED                 TEXT("A")   // Access allowed
+#define SDDL_ACCESS_DENIED                  TEXT("D")   // Access denied
+#define SDDL_OBJECT_ACCESS_ALLOWED          TEXT("OA")  // Object access allowed
+#define SDDL_OBJECT_ACCESS_DENIED           TEXT("OD")  // Object access denied
+#define SDDL_AUDIT                          TEXT("AU")  // Audit
+#define SDDL_ALARM                          TEXT("AL")  // Alarm
+#define SDDL_OBJECT_AUDIT                   TEXT("OU")  // Object audit
+#define SDDL_OBJECT_ALARM                   TEXT("OL")  // Object alarm
+
+//
+// SDDL Ace flags
+//
+#define SDDL_CONTAINER_INHERIT              TEXT("CI")  // Container inherit
+#define SDDL_OBJECT_INHERIT                 TEXT("OI")  // Object inherit
+#define SDDL_NO_PROPAGATE                   TEXT("NP")  // Inherit no propagate
+#define SDDL_INHERIT_ONLY                   TEXT("IO")  // Inherit only
+#define SDDL_INHERITED                      TEXT("ID")  // Inherited
+#define SDDL_AUDIT_SUCCESS                  TEXT("SA")  // Audit success
+#define SDDL_AUDIT_FAILURE                  TEXT("FA")  // Audit failure
+
+
+//
+// SDDL Rights
+//
+#define SDDL_READ_PROPERTY                  TEXT("RP")
+#define SDDL_WRITE_PROPERTY                 TEXT("WP")
+#define SDDL_CREATE_CHILD                   TEXT("CC")
+#define SDDL_DELETE_CHILD                   TEXT("DC")
+#define SDDL_LIST_CHILDREN                  TEXT("LC")
+#define SDDL_SELF_WRITE                     TEXT("SW")
+#define SDDL_LIST_OBJECT                    TEXT("LO")
+#define SDDL_DELETE_TREE                    TEXT("DT")
+#define SDDL_CONTROL_ACCESS                 TEXT("CR")
+#define SDDL_READ_CONTROL                   TEXT("RC")
+#define SDDL_WRITE_DAC                      TEXT("WD")
+#define SDDL_WRITE_OWNER                    TEXT("WO")
+#define SDDL_STANDARD_DELETE                TEXT("SD")
+#define SDDL_GENERIC_ALL                    TEXT("GA")
+#define SDDL_GENERIC_READ                   TEXT("GR")
+#define SDDL_GENERIC_WRITE                  TEXT("GW")
+#define SDDL_GENERIC_EXECUTE                TEXT("GX")
+#define SDDL_FILE_ALL                       TEXT("FA")
+#define SDDL_FILE_READ                      TEXT("FR")
+#define SDDL_FILE_WRITE                     TEXT("FW")
+#define SDDL_FILE_EXECUTE                   TEXT("FX")
+#define SDDL_KEY_ALL                        TEXT("KA")
+#define SDDL_KEY_READ                       TEXT("KR")
+#define SDDL_KEY_WRITE                      TEXT("KW")
+#define SDDL_KEY_EXECUTE                    TEXT("KX")
+
+//
+// SDDL User alias max size
+//      - currently, upto two supported eg. "DA"
+//      - modify this if more WCHARs need to be there in future e.g. "DAX"
+//
+
+#define SDDL_ALIAS_SIZE                     2
+
+//
+// SDDL User aliases
+//
+#define SDDL_DOMAIN_ADMINISTRATORS          TEXT("DA")      // Domain admins
+#define SDDL_DOMAIN_GUESTS                  TEXT("DG")      // Domain guests
+#define SDDL_DOMAIN_USERS                   TEXT("DU")      // Domain users
+#define SDDL_ENTERPRISE_DOMAIN_CONTROLLERS  TEXT("ED")      // Enterprise domain controllers
+#define SDDL_DOMAIN_DOMAIN_CONTROLLERS      TEXT("DD")      // Domain domain controllers
+#define SDDL_DOMAIN_COMPUTERS               TEXT("DC")      // Domain computers
+#define SDDL_BUILTIN_ADMINISTRATORS         TEXT("BA")      // Builtin (local ) administrators
+#define SDDL_BUILTIN_GUESTS                 TEXT("BG")      // Builtin (local ) guests
+#define SDDL_BUILTIN_USERS                  TEXT("BU")      // Builtin (local ) users
+#define SDDL_LOCAL_ADMIN                    TEXT("LA")      // Local administrator account
+#define SDDL_LOCAL_GUEST                    TEXT("LG")      // Local group account
+#define SDDL_ACCOUNT_OPERATORS              TEXT("AO")      // Account operators
+#define SDDL_BACKUP_OPERATORS               TEXT("BO")      // Backup operators
+#define SDDL_PRINTER_OPERATORS              TEXT("PO")      // Printer operators
+#define SDDL_SERVER_OPERATORS               TEXT("SO")      // Server operators
+#define SDDL_AUTHENTICATED_USERS            TEXT("AU")      // Authenticated users
+#define SDDL_PERSONAL_SELF                  TEXT("PS")      // Personal self
+#define SDDL_CREATOR_OWNER                  TEXT("CO")      // Creator owner
+#define SDDL_CREATOR_GROUP                  TEXT("CG")      // Creator group
+#define SDDL_LOCAL_SYSTEM                   TEXT("SY")      // Local system
+#define SDDL_POWER_USERS                    TEXT("PU")      // Power users
+#define SDDL_EVERYONE                       TEXT("WD")      // Everyone ( World )
+#define SDDL_REPLICATOR                     TEXT("RE")      // Replicator
+#define SDDL_INTERACTIVE                    TEXT("IU")      // Interactive logon user
+#define SDDL_NETWORK                        TEXT("NU")      // Nework logon user
+#define SDDL_SERVICE                        TEXT("SU")      // Service logon user
+#define SDDL_RESTRICTED_CODE                TEXT("RC")      // Restricted code
+#define SDDL_ANONYMOUS                      TEXT("AN")      // Anonymous Logon
+#define SDDL_SCHEMA_ADMINISTRATORS          TEXT("SA")      // Schema Administrators
+#define SDDL_CERT_SERV_ADMINISTRATORS       TEXT("CA")      // Certificate Server Administrators
+#define SDDL_RAS_SERVERS                    TEXT("RS")      // RAS servers group
+#define SDDL_ENTERPRISE_ADMINS              TEXT("EA")      // Enterprise administrators
+#define SDDL_GROUP_POLICY_ADMINS            TEXT("PA")      // Group Policy administrators
+#define SDDL_ALIAS_PREW2KCOMPACC            TEXT("RU")      // alias to allow previous windows 2000
+#define SDDL_LOCAL_SERVICE                  TEXT("LS")      // Local service account (for services)
+#define SDDL_NETWORK_SERVICE                TEXT("NS")      // Network service account (for services)
+#define SDDL_REMOTE_DESKTOP                 TEXT("RD")      // Remote desktop users (for terminal server)
+#define SDDL_NETWORK_CONFIGURATION_OPS      TEXT("NO")      // Network configuration operators ( to manage configuration of networking features)
+#define SDDL_PERFMON_USERS                  TEXT("MU")      // Performance Monitor Users
+#define SDDL_PERFLOG_USERS                  TEXT("LU")      // Performance Log Users
+
+
+
+//
+// SDDL Seperators - character version
+//
+#define SDDL_SEPERATORC                     TEXT(';')
+#define SDDL_DELIMINATORC                   TEXT(':')
+#define SDDL_ACE_BEGINC                     TEXT('(')
+#define SDDL_ACE_ENDC                       TEXT(')')
+
+//
+// SDDL Seperators - string version
+//
+#define SDDL_SEPERATOR                     TEXT(";")
+#define SDDL_DELIMINATOR                   TEXT(":")
+#define SDDL_ACE_BEGIN                     TEXT("(")
+#define SDDL_ACE_END                       TEXT(")")
+
+#if !defined(_NTDDK_)
+
+#if(_WIN32_WINNT >= 0x0500)
+
+WINADVAPI
+BOOL
+WINAPI
+ConvertSidToStringSidA(
+    IN  PSID     Sid,
+    OUT LPSTR  *StringSid
+    );
+WINADVAPI
+BOOL
+WINAPI
+ConvertSidToStringSidW(
+    IN  PSID     Sid,
+    OUT LPWSTR  *StringSid
+    );
+#ifdef UNICODE
+#define ConvertSidToStringSid  ConvertSidToStringSidW
+#else
+#define ConvertSidToStringSid  ConvertSidToStringSidA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+ConvertStringSidToSidA(
+    IN LPCSTR   StringSid,
+    OUT PSID   *Sid
+    );
+WINADVAPI
+BOOL
+WINAPI
+ConvertStringSidToSidW(
+    IN LPCWSTR   StringSid,
+    OUT PSID   *Sid
+    );
+#ifdef UNICODE
+#define ConvertStringSidToSid  ConvertStringSidToSidW
+#else
+#define ConvertStringSidToSid  ConvertStringSidToSidA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+ConvertStringSecurityDescriptorToSecurityDescriptorA(
+    IN  LPCSTR StringSecurityDescriptor,
+    IN  DWORD StringSDRevision,
+    OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
+    OUT PULONG  SecurityDescriptorSize OPTIONAL
+    );
+WINADVAPI
+BOOL
+WINAPI
+ConvertStringSecurityDescriptorToSecurityDescriptorW(
+    IN  LPCWSTR StringSecurityDescriptor,
+    IN  DWORD StringSDRevision,
+    OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
+    OUT PULONG  SecurityDescriptorSize OPTIONAL
+    );
+#ifdef UNICODE
+#define ConvertStringSecurityDescriptorToSecurityDescriptor  ConvertStringSecurityDescriptorToSecurityDescriptorW
+#else
+#define ConvertStringSecurityDescriptorToSecurityDescriptor  ConvertStringSecurityDescriptorToSecurityDescriptorA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+ConvertSecurityDescriptorToStringSecurityDescriptorA(
+    IN  PSECURITY_DESCRIPTOR  SecurityDescriptor,
+    IN  DWORD RequestedStringSDRevision,
+    IN  SECURITY_INFORMATION SecurityInformation,
+    OUT LPSTR  *StringSecurityDescriptor OPTIONAL,
+    OUT PULONG StringSecurityDescriptorLen OPTIONAL
+    );
+WINADVAPI
+BOOL
+WINAPI
+ConvertSecurityDescriptorToStringSecurityDescriptorW(
+    IN  PSECURITY_DESCRIPTOR  SecurityDescriptor,
+    IN  DWORD RequestedStringSDRevision,
+    IN  SECURITY_INFORMATION SecurityInformation,
+    OUT LPWSTR  *StringSecurityDescriptor OPTIONAL,
+    OUT PULONG StringSecurityDescriptorLen OPTIONAL
+    );
+#ifdef UNICODE
+#define ConvertSecurityDescriptorToStringSecurityDescriptor  ConvertSecurityDescriptorToStringSecurityDescriptorW
+#else
+#define ConvertSecurityDescriptorToStringSecurityDescriptor  ConvertSecurityDescriptorToStringSecurityDescriptorA
+#endif // !UNICODE
+
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+#endif /* !defined(_NTDDK_) */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // endif __SDDL_H__
+
+
diff --git a/base/Windows/Inc/StrAlign.h b/base/Windows/Inc/StrAlign.h
new file mode 100644
index 0000000..75db602
--- /dev/null
+++ b/base/Windows/Inc/StrAlign.h
@@ -0,0 +1,543 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    stralign.h
+
+Abstract:
+
+    This module contains macros and prototypes to expose the unaligned wide
+    character interfaces.
+
+    Public interfaces created or declared here include:
+
+    ua_CharUpper()
+    ua_CharUpperW()
+    ua_lstrcmp()
+    ua_lstrcmpW()
+    ua_lstrcmpi()
+    ua_lstrcmpiW()
+    ua_lstrlen()
+    ua_lstrlenW()
+    ua_tcscpy()
+    ua_wcschr()
+    ua_wcscpy()
+    ua_wcslen()
+    ua_wcsrchr()
+
+    STRUC_ALIGNED_STACK_COPY()
+    TSTR_ALIGNED()
+    TSTR_ALIGNED_STACK_COPY()
+    WSTR_ALIGNED()
+    WSTR_ALIGNED_STACK_COPY()
+
+
+
+Revision History:
+
+--*/
+
+#if !defined(__STRALIGN_H_) && !defined(MIDL_PASS)
+#define __STRALIGN_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_X86_)
+
+//
+// Alignment of unicode strings is not necessary on X86.
+//
+
+#define WSTR_ALIGNED(s) TRUE
+
+#define ua_CharUpperW CharUpperW
+#define ua_lstrcmpiW  lstrcmpiW
+#define ua_lstrcmpW   lstrcmpW
+#define ua_lstrlenW   lstrlenW
+#define ua_wcschr     wcschr
+#define ua_wcscpy     wcscpy
+#define ua_wcslen     wcslen
+#define ua_wcsrchr    wcsrchr
+
+#else
+
+//
+// The C runtime libraries expect aligned string pointers.  Following are the
+// prototypes for our own, slower worker functions that accept unaligned
+// UNICODE strings.
+//
+
+//
+// Macro to determine whether a pointer to a unicode character is naturally
+// aligned.
+//
+
+#define WSTR_ALIGNED(s) (((DWORD_PTR)(s) & (sizeof(WCHAR)-1)) == 0)
+
+//
+// Platform-specific prototypes for worker functions exported from kernel32.
+// Do not call these directly, they do not exist on all platforms.  Instead
+// use the equivalent ua_xxx() routines.
+//
+
+LPUWSTR
+WINAPI
+uaw_CharUpperW(
+    IN OUT LPUWSTR String
+    );
+
+int
+APIENTRY
+uaw_lstrcmpW(
+    IN PCUWSTR String1,
+    IN PCUWSTR String2
+    );
+
+int
+APIENTRY
+uaw_lstrcmpiW(
+    IN PCUWSTR String1,
+    IN PCUWSTR String2
+    );
+
+int
+WINAPI
+uaw_lstrlenW(
+    IN LPCUWSTR String
+    );
+
+PUWSTR
+__cdecl
+uaw_wcschr(
+    IN PCUWSTR String,
+    IN WCHAR   Character
+    );
+
+PUWSTR
+_cdecl
+uaw_wcscpy(
+    IN PUWSTR Destination,
+    IN PCUWSTR Source
+    );
+
+size_t
+__cdecl
+uaw_wcslen(
+    IN PCUWSTR String
+    );
+
+PUWSTR
+__cdecl
+uaw_wcsrchr(
+    IN PCUWSTR String,
+    IN WCHAR   Character
+    );
+
+//
+// Following are the inline wrappers that determine the optimal worker function
+// to call based on the alignment of the UNICODE string arguments.  Their
+// behavior is otherwise identical to the corresponding standard run-time
+// routiunes.
+//
+
+#if defined(CharUpper)
+__inline
+LPUWSTR
+static
+ua_CharUpperW(
+    LPUWSTR String
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return CharUpperW( (PWSTR)String );
+    } else {
+        return uaw_CharUpperW( String );
+    }
+}
+#endif
+
+#if defined(lstrcmp)
+__inline
+int
+static
+ua_lstrcmpW(
+    IN LPCUWSTR String1,
+    IN LPCUWSTR String2
+    )
+{
+    if (WSTR_ALIGNED(String1) && WSTR_ALIGNED(String2)) {
+        return lstrcmpW( (LPCWSTR)String1, (LPCWSTR)String2);
+    } else {
+        return uaw_lstrcmpW( String1, String2 );
+    }
+}
+#endif
+
+#if defined(lstrcmpi)
+__inline
+int
+static
+ua_lstrcmpiW(
+    IN LPCUWSTR String1,
+    IN LPCUWSTR String2
+    )
+{
+    if (WSTR_ALIGNED(String1) && WSTR_ALIGNED(String2)) {
+        return lstrcmpiW( (LPCWSTR)String1, (LPCWSTR)String2 );
+    } else {
+        return uaw_lstrcmpiW( String1, String2 );
+    }
+}
+#endif
+
+#if defined(lstrlen)
+__inline
+int
+static
+ua_lstrlenW(
+    IN LPCUWSTR String
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return lstrlenW( (PCWSTR)String );
+    } else {
+        return uaw_lstrlenW( String );
+    }
+}
+#endif
+
+#if defined(_WSTRING_DEFINED)
+
+//
+// Certain run-time string functions are overloaded in C++, to avoid
+// inadvertent stripping of the const attribute.
+//
+// The functions of interest here include: wcschr and wcsrchr.
+//
+// There are three flavors of these functions:
+//
+// Flavor  Returns    Parameter
+//
+// 1       PWSTR      PCWSTR
+// 2       PCWSTR     PCWSTR
+// 3       PWSTR      PWSTR
+//
+// string.h declares flavor 1 whether for C or C++.  This is the non-ANSI,
+// backward compatible mode.
+//
+// wchar.h declares flavor 1 if C, or flavors 2 and 3 if C++.  This is the
+// ANSI method.
+//
+// Our corresponding functions need to match what was declared.  The way
+// we can tell is by looking at _WConst_return... if it is defined then
+// we want to match the prototypes in wchar.h, otherwise we'll match
+// the prototypes in string.h.
+//
+
+#if defined(_WConst_return) 
+typedef _WConst_return WCHAR UNALIGNED *PUWSTR_C;
+#else
+typedef WCHAR UNALIGNED *PUWSTR_C;
+#endif
+
+//
+// Here is flavor 1 or 2
+//
+
+__inline
+PUWSTR_C
+static
+ua_wcschr(
+    IN PCUWSTR String,
+    IN WCHAR   Character
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return wcschr((PCWSTR)String, Character);
+    } else {
+        return (PUWSTR_C)uaw_wcschr(String, Character);
+    }
+}
+
+__inline
+PUWSTR_C
+static
+ua_wcsrchr(
+    IN PCUWSTR String,
+    IN WCHAR   Character
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return wcsrchr((PCWSTR)String, Character);
+    } else {
+        return (PUWSTR_C)uaw_wcsrchr(String, Character);
+    }
+}
+
+#if defined(__cplusplus) && defined(_WConst_Return)
+
+//
+// Here is flavor 3
+//
+
+__inline
+PUWSTR
+static
+ua_wcschr(
+    IN PUWSTR String,
+    IN WCHAR  Character
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return wcschr(String, Character);
+    } else {
+        return uaw_wcschr((PCUWSTR)String, Character);
+    }
+}
+
+__inline
+PUWSTR
+static
+ua_wcsrchr(
+    IN PUWSTR String,
+    IN WCHAR  Character
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return wcsrchr(String, Character);
+    } else {
+        return uaw_wcsrchr((PCUWSTR)String, Character);
+    }
+}
+
+#endif  // __cplusplus && _WConst_Return
+
+__inline
+PUWSTR
+static
+ua_wcscpy(
+    IN PUWSTR  Destination,
+    IN PCUWSTR Source
+    )
+{
+    if (WSTR_ALIGNED(Source) && WSTR_ALIGNED(Destination)) {
+        return wcscpy( (PWSTR)Destination, (PCWSTR)Source );
+    } else {
+        return uaw_wcscpy( Destination, Source );
+    }
+}
+
+__inline
+size_t
+static
+ua_wcslen(
+    IN PCUWSTR String
+    )
+{
+    if (WSTR_ALIGNED(String)) {
+        return wcslen( (PCWSTR)String );
+    } else {
+        return uaw_wcslen( String );
+    }
+}
+
+#endif  // _WSTRING_DEFINED
+
+#endif  // _X86_
+
+//++
+//
+// VOID
+// WSTR_ALIGNED_STACK_COPY (
+//    OUT PCWSTR *TargetString,
+//    IN  PCUWSTR SourceString OPTIONAL
+//    )
+//
+// VOID
+// TSTR_ALIGNED_STACK_COPY (
+//    OUT PCTSTR *TargetString,
+//    IN  PCUTSTR SourceString OPTIONAL
+//    )
+//
+// Routine Description:
+//
+//    These macros set TargetString to an aligned pointer to the string
+//    represented by SourceString.  If necessary, an aligned copy of
+//    SourceString is copied onto the stack.
+//
+// Arguments:
+//
+//    TargetString - Supplies a pointer to a pointer to the resultant
+//                   string.  This may be the same as SourceString if
+//                   that argument is aligned.
+//
+//    SourceString - Supplies a pointer to the possibly unaligned UNICODE
+//                   string.
+//
+// Return Value:
+//
+//    None.
+//
+// Note:
+//
+//    These macros may allocate memory on the stack via the CRT function
+//    _alloca().  This memory is "freed" when the calling function exits.
+//    As a result, do not use these macros inside of a loop that may execute
+//    a large number of times - instead, use a wrapper function, or use
+//    an explicit buffer like this:
+//
+//    TCHAR AlignedStringBuffer[ MAX_FOOSTR_CHARS ];
+//    PTSTR AlignedString;
+//
+//    while (a < b) {
+//        ...
+//        if (TSTR_ALIGNED(s) {
+//            AlignedString = s;
+//        } else {
+//            AlignedString = (PTSTR)ua_tcscpy(AlignedStringBuffer,s);
+//        }
+//        SomeSystemFunction(AlignedString);
+//        ...
+//    }
+//        
+//        
+//--
+
+//
+// __UA_WSTRSIZE returns the number of bytes required to store the
+// supplied null-terminated UNICODE string.
+//        
+// __UA_LOCALCOPY accepts a pointer to unaligned data and a size.  It
+// allocates an aligned buffer on the stack and copies the data into
+// it, returning a pointer to the buffer.
+//
+
+#if !defined(__UA_WCSLEN)
+#define __UA_WCSLEN ua_wcslen
+#endif
+
+#define __UA_WSTRSIZE(s)    ((__UA_WCSLEN(s)+1)*sizeof(WCHAR))
+#define __UA_STACKCOPY(p,s) memcpy(_alloca(s),p,s)
+
+//
+// Note that NULL is aligned.
+//
+
+#if defined(_X86_)
+
+#define WSTR_ALIGNED_STACK_COPY(d,s) (*(d) = (PCWSTR)(s))
+
+#else
+
+//
+// Use of an inline function here is not possible, as the results of
+// the _alloca() will not be preserved upon return from the function.
+//
+
+#define WSTR_ALIGNED_STACK_COPY(d,s)                                \
+    {                                                               \
+        PCUWSTR __ua_src;                                           \
+        ULONG   __ua_size;                                          \
+        PWSTR  __ua_dst;                                            \
+                                                                    \
+        __ua_src = (s);                                             \
+        if (WSTR_ALIGNED(__ua_src)) {                               \
+            __ua_dst = (PWSTR)__ua_src;                             \
+        } else {                                                    \
+            __ua_size = __UA_WSTRSIZE(__ua_src);                    \
+            __ua_dst = (PWSTR)_alloca(__ua_size);                   \
+            memcpy(__ua_dst,__ua_src,__ua_size);                    \
+        }                                                           \
+        *(d) = (PCWSTR)__ua_dst;                                    \
+    }
+
+#endif
+
+#define ASTR_ALIGNED_STACK_COPY(d,s) (*(d) = (PCSTR)(s))
+
+//++
+//
+// <type> CONST *
+// STRUC_ALIGNED_STACK_COPY (
+//     IN <type name>,
+//     IN PVOID Struc OPTIONAL
+//     )
+// 
+// Routine Description:
+//
+//    This macro returns an aligned pointer to Struc, creating a local
+//    copy on the stack if necessary.
+//
+//    This should be used only for relatively small structures, and efforts
+//    should be made to align the structure properly in the first place.  Use
+//    this macro only as a last resort.
+//
+// Arguments:
+//
+//    <type> - The type specifier of Struc
+//
+//    Struc - Supplies a pointer to the structure in question.
+//
+// Return Value:
+//
+//    Returns a const pointer to Struc if it is properly aligned, or a pointer 
+//    to a stack-allocated copy of Struc if it is not.
+//
+//--
+
+#if !defined(_X86_)
+
+#define __UA_STRUC_ALIGNED(t,s) \
+    (((DWORD_PTR)(s) & (TYPE_ALIGNMENT(t)-1)) == 0)
+
+#define STRUC_ALIGNED_STACK_COPY(t,s) \
+    __UA_STRUC_ALIGNED(t,s) ?   \
+        ((t const *)(s)) :      \
+        ((t const *)__UA_STACKCOPY((s),sizeof(t)))
+
+#else
+
+#define STRUC_ALIGNED_STACK_COPY(t,s) ((CONST t *)(s))
+
+#endif
+
+#if defined(UNICODE)
+
+#define TSTR_ALIGNED_STACK_COPY(d,s)    WSTR_ALIGNED_STACK_COPY(d,s)
+#define TSTR_ALIGNED(x)                 WSTR_ALIGNED(x)
+#define ua_CharUpper                    ua_CharUpperW
+#define ua_lstrcmp                      ua_lstrcmpW
+#define ua_lstrcmpi                     ua_lstrcmpiW
+#define ua_lstrlen                      ua_lstrlenW
+#define ua_tcscpy                       ua_wcscpy
+
+#else
+
+#define TSTR_ALIGNED_STACK_COPY(d,s)    ASTR_ALIGNED_STACK_COPY(d,s)
+#define TSTR_ALIGNED(x)                 TRUE
+#define ua_CharUpper                    CharUpperA
+#define ua_lstrcmp                      lstrcmpA
+#define ua_lstrcmpi                     lstrcmpiA
+#define ua_lstrlen                      lstrlenA
+#define ua_tcscpy                       strcpy
+
+#endif  // UNICODE
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif  // __STRALIGN_H_
+
+    
+
+                                         
+
+
+
+                                                      
diff --git a/base/Windows/Inc/WinBase.h b/base/Windows/Inc/WinBase.h
new file mode 100644
index 0000000..82ff087
--- /dev/null
+++ b/base/Windows/Inc/WinBase.h
@@ -0,0 +1,10690 @@
+/************************************************************************
+*                                                                       *
+*   winbase.h -- This module defines the 32-Bit Windows Base APIs       *
+*                                                                       *
+*   Copyright (c) Microsoft Corp. All rights reserved.                  *
+*                                                                       *
+************************************************************************/
+#ifndef _WINBASE_
+#define _WINBASE_
+
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifdef _MAC
+#include <macwin32.h>
+#endif //_MAC
+
+//
+// Define API decoration for direct importing of DLL references.
+//
+
+#if !defined(_ADVAPI32_)
+#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
+
+#if !defined(_KERNEL32_)
+#define WINBASEAPI DECLSPEC_IMPORT
+#else
+#define WINBASEAPI
+#endif
+
+#if !defined(_ZAWPROXY_)
+#define ZAWPROXYAPI DECLSPEC_IMPORT
+#else
+#define ZAWPROXYAPI
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Compatibility macros
+ */
+
+#define DefineHandleTable(w)            ((w),TRUE)
+#define LimitEmsPages(dw)
+#define SetSwapAreaSize(w)              (w)
+#define LockSegment(w)                  GlobalFix((HANDLE)(w))
+#define UnlockSegment(w)                GlobalUnfix((HANDLE)(w))
+#define GetCurrentTime()                GetTickCount()
+
+#define Yield()
+
+#define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
+#define INVALID_FILE_SIZE ((DWORD)0xFFFFFFFF)
+#define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+
+#define FILE_BEGIN           0
+#define FILE_CURRENT         1
+#define FILE_END             2
+
+#define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFF)
+
+#define WAIT_FAILED ((DWORD)0xFFFFFFFF)
+#define WAIT_OBJECT_0       ((STATUS_WAIT_0 ) + 0 )
+
+#define WAIT_ABANDONED         ((STATUS_ABANDONED_WAIT_0 ) + 0 )
+#define WAIT_ABANDONED_0       ((STATUS_ABANDONED_WAIT_0 ) + 0 )
+
+#define WAIT_IO_COMPLETION                  STATUS_USER_APC
+#define STILL_ACTIVE                        STATUS_PENDING
+#define EXCEPTION_ACCESS_VIOLATION          STATUS_ACCESS_VIOLATION
+#define EXCEPTION_DATATYPE_MISALIGNMENT     STATUS_DATATYPE_MISALIGNMENT
+#define EXCEPTION_BREAKPOINT                STATUS_BREAKPOINT
+#define EXCEPTION_SINGLE_STEP               STATUS_SINGLE_STEP
+#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED     STATUS_ARRAY_BOUNDS_EXCEEDED
+#define EXCEPTION_FLT_DENORMAL_OPERAND      STATUS_FLOAT_DENORMAL_OPERAND
+#define EXCEPTION_FLT_DIVIDE_BY_ZERO        STATUS_FLOAT_DIVIDE_BY_ZERO
+#define EXCEPTION_FLT_INEXACT_RESULT        STATUS_FLOAT_INEXACT_RESULT
+#define EXCEPTION_FLT_INVALID_OPERATION     STATUS_FLOAT_INVALID_OPERATION
+#define EXCEPTION_FLT_OVERFLOW              STATUS_FLOAT_OVERFLOW
+#define EXCEPTION_FLT_STACK_CHECK           STATUS_FLOAT_STACK_CHECK
+#define EXCEPTION_FLT_UNDERFLOW             STATUS_FLOAT_UNDERFLOW
+#define EXCEPTION_INT_DIVIDE_BY_ZERO        STATUS_INTEGER_DIVIDE_BY_ZERO
+#define EXCEPTION_INT_OVERFLOW              STATUS_INTEGER_OVERFLOW
+#define EXCEPTION_PRIV_INSTRUCTION          STATUS_PRIVILEGED_INSTRUCTION
+#define EXCEPTION_IN_PAGE_ERROR             STATUS_IN_PAGE_ERROR
+#define EXCEPTION_ILLEGAL_INSTRUCTION       STATUS_ILLEGAL_INSTRUCTION
+#define EXCEPTION_NONCONTINUABLE_EXCEPTION  STATUS_NONCONTINUABLE_EXCEPTION
+#define EXCEPTION_STACK_OVERFLOW            STATUS_STACK_OVERFLOW
+#define EXCEPTION_INVALID_DISPOSITION       STATUS_INVALID_DISPOSITION
+#define EXCEPTION_GUARD_PAGE                STATUS_GUARD_PAGE_VIOLATION
+#define EXCEPTION_INVALID_HANDLE            STATUS_INVALID_HANDLE
+#define CONTROL_C_EXIT                      STATUS_CONTROL_C_EXIT
+#define MoveMemory RtlMoveMemory
+#define CopyMemory RtlCopyMemory
+#define FillMemory RtlFillMemory
+#define ZeroMemory RtlZeroMemory
+#define SecureZeroMemory RtlSecureZeroMemory
+
+//
+// File creation flags must start at the high end since they
+// are combined with the attributes
+//
+
+#define FILE_FLAG_WRITE_THROUGH         0x80000000
+#define FILE_FLAG_OVERLAPPED            0x40000000
+#define FILE_FLAG_NO_BUFFERING          0x20000000
+#define FILE_FLAG_RANDOM_ACCESS         0x10000000
+#define FILE_FLAG_SEQUENTIAL_SCAN       0x08000000
+#define FILE_FLAG_DELETE_ON_CLOSE       0x04000000
+#define FILE_FLAG_BACKUP_SEMANTICS      0x02000000
+#define FILE_FLAG_POSIX_SEMANTICS       0x01000000
+#define FILE_FLAG_OPEN_REPARSE_POINT    0x00200000
+#define FILE_FLAG_OPEN_NO_RECALL        0x00100000
+#define FILE_FLAG_FIRST_PIPE_INSTANCE   0x00080000
+
+#define CREATE_NEW          1
+#define CREATE_ALWAYS       2
+#define OPEN_EXISTING       3
+#define OPEN_ALWAYS         4
+#define TRUNCATE_EXISTING   5
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Define possible return codes from the CopyFileEx callback routine
+//
+
+#define PROGRESS_CONTINUE   0
+#define PROGRESS_CANCEL     1
+#define PROGRESS_STOP       2
+#define PROGRESS_QUIET      3
+
+//
+// Define CopyFileEx callback routine state change values
+//
+
+#define CALLBACK_CHUNK_FINISHED         0x00000000
+#define CALLBACK_STREAM_SWITCH          0x00000001
+
+//
+// Define CopyFileEx option flags
+//
+
+#define COPY_FILE_FAIL_IF_EXISTS              0x00000001
+#define COPY_FILE_RESTARTABLE                 0x00000002
+#define COPY_FILE_OPEN_SOURCE_FOR_WRITE       0x00000004
+#define COPY_FILE_ALLOW_DECRYPTED_DESTINATION 0x00000008
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0500)
+//
+// Define ReplaceFile option flags
+//
+
+#define REPLACEFILE_WRITE_THROUGH       0x00000001
+#define REPLACEFILE_IGNORE_MERGE_ERRORS 0x00000002
+
+#endif // #if (_WIN32_WINNT >= 0x0500)
+
+//
+// Define the NamedPipe definitions
+//
+
+
+//
+// Define the dwOpenMode values for CreateNamedPipe
+//
+
+#define PIPE_ACCESS_INBOUND         0x00000001
+#define PIPE_ACCESS_OUTBOUND        0x00000002
+#define PIPE_ACCESS_DUPLEX          0x00000003
+
+//
+// Define the Named Pipe End flags for GetNamedPipeInfo
+//
+
+#define PIPE_CLIENT_END             0x00000000
+#define PIPE_SERVER_END             0x00000001
+
+//
+// Define the dwPipeMode values for CreateNamedPipe
+//
+
+#define PIPE_WAIT                   0x00000000
+#define PIPE_NOWAIT                 0x00000001
+#define PIPE_READMODE_BYTE          0x00000000
+#define PIPE_READMODE_MESSAGE       0x00000002
+#define PIPE_TYPE_BYTE              0x00000000
+#define PIPE_TYPE_MESSAGE           0x00000004
+
+//
+// Define the well known values for CreateNamedPipe nMaxInstances
+//
+
+#define PIPE_UNLIMITED_INSTANCES    255
+
+//
+// Define the Security Quality of Service bits to be passed
+// into CreateFile
+//
+
+#define SECURITY_ANONYMOUS          ( SecurityAnonymous      << 16 )
+#define SECURITY_IDENTIFICATION     ( SecurityIdentification << 16 )
+#define SECURITY_IMPERSONATION      ( SecurityImpersonation  << 16 )
+#define SECURITY_DELEGATION         ( SecurityDelegation     << 16 )
+
+#define SECURITY_CONTEXT_TRACKING  0x00040000
+#define SECURITY_EFFECTIVE_ONLY    0x00080000
+
+#define SECURITY_SQOS_PRESENT      0x00100000
+#define SECURITY_VALID_SQOS_FLAGS  0x001F0000
+
+//
+//  File structures
+//
+
+typedef struct _OVERLAPPED {
+    ULONG_PTR Internal;
+    ULONG_PTR InternalHigh;
+    union {
+        struct {
+            DWORD Offset;
+            DWORD OffsetHigh;
+        };
+
+        PVOID Pointer;
+    };
+
+    HANDLE  hEvent;
+} OVERLAPPED, *LPOVERLAPPED;
+
+typedef struct _SECURITY_ATTRIBUTES {
+    DWORD nLength;
+    LPVOID lpSecurityDescriptor;
+    BOOL bInheritHandle;
+} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
+
+typedef struct _PROCESS_INFORMATION {
+    HANDLE hProcess;
+    HANDLE hThread;
+    DWORD dwProcessId;
+    DWORD dwThreadId;
+} PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION;
+
+//
+//  File System time stamps are represented with the following structure:
+//
+
+
+#ifndef _FILETIME_
+#define _FILETIME_
+typedef struct _FILETIME {
+    DWORD dwLowDateTime;
+    DWORD dwHighDateTime;
+} FILETIME, *PFILETIME, *LPFILETIME;
+#endif
+
+//
+// System time is represented with the following structure:
+//
+
+
+typedef struct _SYSTEMTIME {
+    WORD wYear;
+    WORD wMonth;
+    WORD wDayOfWeek;
+    WORD wDay;
+    WORD wHour;
+    WORD wMinute;
+    WORD wSecond;
+    WORD wMilliseconds;
+} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
+
+
+typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)(
+    LPVOID lpThreadParameter
+    );
+typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
+
+#if(_WIN32_WINNT >= 0x0400)
+typedef VOID (WINAPI *PFIBER_START_ROUTINE)(
+    LPVOID lpFiberParameter
+    );
+typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+typedef RTL_CRITICAL_SECTION CRITICAL_SECTION;
+typedef PRTL_CRITICAL_SECTION PCRITICAL_SECTION;
+typedef PRTL_CRITICAL_SECTION LPCRITICAL_SECTION;
+
+typedef RTL_CRITICAL_SECTION_DEBUG CRITICAL_SECTION_DEBUG;
+typedef PRTL_CRITICAL_SECTION_DEBUG PCRITICAL_SECTION_DEBUG;
+typedef PRTL_CRITICAL_SECTION_DEBUG LPCRITICAL_SECTION_DEBUG;
+
+#if defined(_X86_)
+typedef PLDT_ENTRY LPLDT_ENTRY;
+#else
+typedef LPVOID LPLDT_ENTRY;
+#endif
+
+#define MUTEX_MODIFY_STATE MUTANT_QUERY_STATE
+#define MUTEX_ALL_ACCESS MUTANT_ALL_ACCESS
+
+//
+// Serial provider type.
+//
+
+#define SP_SERIALCOMM    ((DWORD)0x00000001)
+
+//
+// Provider SubTypes
+//
+
+#define PST_UNSPECIFIED      ((DWORD)0x00000000)
+#define PST_RS232            ((DWORD)0x00000001)
+#define PST_PARALLELPORT     ((DWORD)0x00000002)
+#define PST_RS422            ((DWORD)0x00000003)
+#define PST_RS423            ((DWORD)0x00000004)
+#define PST_RS449            ((DWORD)0x00000005)
+#define PST_MODEM            ((DWORD)0x00000006)
+#define PST_FAX              ((DWORD)0x00000021)
+#define PST_SCANNER          ((DWORD)0x00000022)
+#define PST_NETWORK_BRIDGE   ((DWORD)0x00000100)
+#define PST_LAT              ((DWORD)0x00000101)
+#define PST_TCPIP_TELNET     ((DWORD)0x00000102)
+#define PST_X25              ((DWORD)0x00000103)
+
+
+//
+// Provider capabilities flags.
+//
+
+#define PCF_DTRDSR        ((DWORD)0x0001)
+#define PCF_RTSCTS        ((DWORD)0x0002)
+#define PCF_RLSD          ((DWORD)0x0004)
+#define PCF_PARITY_CHECK  ((DWORD)0x0008)
+#define PCF_XONXOFF       ((DWORD)0x0010)
+#define PCF_SETXCHAR      ((DWORD)0x0020)
+#define PCF_TOTALTIMEOUTS ((DWORD)0x0040)
+#define PCF_INTTIMEOUTS   ((DWORD)0x0080)
+#define PCF_SPECIALCHARS  ((DWORD)0x0100)
+#define PCF_16BITMODE     ((DWORD)0x0200)
+
+//
+// Comm provider settable parameters.
+//
+
+#define SP_PARITY         ((DWORD)0x0001)
+#define SP_BAUD           ((DWORD)0x0002)
+#define SP_DATABITS       ((DWORD)0x0004)
+#define SP_STOPBITS       ((DWORD)0x0008)
+#define SP_HANDSHAKING    ((DWORD)0x0010)
+#define SP_PARITY_CHECK   ((DWORD)0x0020)
+#define SP_RLSD           ((DWORD)0x0040)
+
+//
+// Settable baud rates in the provider.
+//
+
+#define BAUD_075          ((DWORD)0x00000001)
+#define BAUD_110          ((DWORD)0x00000002)
+#define BAUD_134_5        ((DWORD)0x00000004)
+#define BAUD_150          ((DWORD)0x00000008)
+#define BAUD_300          ((DWORD)0x00000010)
+#define BAUD_600          ((DWORD)0x00000020)
+#define BAUD_1200         ((DWORD)0x00000040)
+#define BAUD_1800         ((DWORD)0x00000080)
+#define BAUD_2400         ((DWORD)0x00000100)
+#define BAUD_4800         ((DWORD)0x00000200)
+#define BAUD_7200         ((DWORD)0x00000400)
+#define BAUD_9600         ((DWORD)0x00000800)
+#define BAUD_14400        ((DWORD)0x00001000)
+#define BAUD_19200        ((DWORD)0x00002000)
+#define BAUD_38400        ((DWORD)0x00004000)
+#define BAUD_56K          ((DWORD)0x00008000)
+#define BAUD_128K         ((DWORD)0x00010000)
+#define BAUD_115200       ((DWORD)0x00020000)
+#define BAUD_57600        ((DWORD)0x00040000)
+#define BAUD_USER         ((DWORD)0x10000000)
+
+//
+// Settable Data Bits
+//
+
+#define DATABITS_5        ((WORD)0x0001)
+#define DATABITS_6        ((WORD)0x0002)
+#define DATABITS_7        ((WORD)0x0004)
+#define DATABITS_8        ((WORD)0x0008)
+#define DATABITS_16       ((WORD)0x0010)
+#define DATABITS_16X      ((WORD)0x0020)
+
+//
+// Settable Stop and Parity bits.
+//
+
+#define STOPBITS_10       ((WORD)0x0001)
+#define STOPBITS_15       ((WORD)0x0002)
+#define STOPBITS_20       ((WORD)0x0004)
+#define PARITY_NONE       ((WORD)0x0100)
+#define PARITY_ODD        ((WORD)0x0200)
+#define PARITY_EVEN       ((WORD)0x0400)
+#define PARITY_MARK       ((WORD)0x0800)
+#define PARITY_SPACE      ((WORD)0x1000)
+
+typedef struct _COMMPROP {
+    WORD wPacketLength;
+    WORD wPacketVersion;
+    DWORD dwServiceMask;
+    DWORD dwReserved1;
+    DWORD dwMaxTxQueue;
+    DWORD dwMaxRxQueue;
+    DWORD dwMaxBaud;
+    DWORD dwProvSubType;
+    DWORD dwProvCapabilities;
+    DWORD dwSettableParams;
+    DWORD dwSettableBaud;
+    WORD wSettableData;
+    WORD wSettableStopParity;
+    DWORD dwCurrentTxQueue;
+    DWORD dwCurrentRxQueue;
+    DWORD dwProvSpec1;
+    DWORD dwProvSpec2;
+    WCHAR wcProvChar[1];
+} COMMPROP,*LPCOMMPROP;
+
+//
+// Set dwProvSpec1 to COMMPROP_INITIALIZED to indicate that wPacketLength
+// is valid before a call to GetCommProperties().
+//
+#define COMMPROP_INITIALIZED ((DWORD)0xE73CF52E)
+
+typedef struct _COMSTAT {
+    DWORD fCtsHold : 1;
+    DWORD fDsrHold : 1;
+    DWORD fRlsdHold : 1;
+    DWORD fXoffHold : 1;
+    DWORD fXoffSent : 1;
+    DWORD fEof : 1;
+    DWORD fTxim : 1;
+    DWORD fReserved : 25;
+    DWORD cbInQue;
+    DWORD cbOutQue;
+} COMSTAT, *LPCOMSTAT;
+
+//
+// DTR Control Flow Values.
+//
+#define DTR_CONTROL_DISABLE    0x00
+#define DTR_CONTROL_ENABLE     0x01
+#define DTR_CONTROL_HANDSHAKE  0x02
+
+//
+// RTS Control Flow Values
+//
+#define RTS_CONTROL_DISABLE    0x00
+#define RTS_CONTROL_ENABLE     0x01
+#define RTS_CONTROL_HANDSHAKE  0x02
+#define RTS_CONTROL_TOGGLE     0x03
+
+typedef struct _DCB {
+    DWORD DCBlength;      /* sizeof(DCB)                     */
+    DWORD BaudRate;       /* Baudrate at which running       */
+    DWORD fBinary: 1;     /* Binary Mode (skip EOF check)    */
+    DWORD fParity: 1;     /* Enable parity checking          */
+    DWORD fOutxCtsFlow:1; /* CTS handshaking on output       */
+    DWORD fOutxDsrFlow:1; /* DSR handshaking on output       */
+    DWORD fDtrControl:2;  /* DTR Flow control                */
+    DWORD fDsrSensitivity:1; /* DSR Sensitivity              */
+    DWORD fTXContinueOnXoff: 1; /* Continue TX when Xoff sent */
+    DWORD fOutX: 1;       /* Enable output X-ON/X-OFF        */
+    DWORD fInX: 1;        /* Enable input X-ON/X-OFF         */
+    DWORD fErrorChar: 1;  /* Enable Err Replacement          */
+    DWORD fNull: 1;       /* Enable Null stripping           */
+    DWORD fRtsControl:2;  /* Rts Flow control                */
+    DWORD fAbortOnError:1; /* Abort all reads and writes on Error */
+    DWORD fDummy2:17;     /* Reserved                        */
+    WORD wReserved;       /* Not currently used              */
+    WORD XonLim;          /* Transmit X-ON threshold         */
+    WORD XoffLim;         /* Transmit X-OFF threshold        */
+    BYTE ByteSize;        /* Number of bits/byte, 4-8        */
+    BYTE Parity;          /* 0-4=None,Odd,Even,Mark,Space    */
+    BYTE StopBits;        /* 0,1,2 = 1, 1.5, 2               */
+    char XonChar;         /* Tx and Rx X-ON character        */
+    char XoffChar;        /* Tx and Rx X-OFF character       */
+    char ErrorChar;       /* Error replacement char          */
+    char EofChar;         /* End of Input character          */
+    char EvtChar;         /* Received Event character        */
+    WORD wReserved1;      /* Fill for now.                   */
+} DCB, *LPDCB;
+
+typedef struct _COMMTIMEOUTS {
+    DWORD ReadIntervalTimeout;          /* Maximum time between read chars. */
+    DWORD ReadTotalTimeoutMultiplier;   /* Multiplier of characters.        */
+    DWORD ReadTotalTimeoutConstant;     /* Constant in milliseconds.        */
+    DWORD WriteTotalTimeoutMultiplier;  /* Multiplier of characters.        */
+    DWORD WriteTotalTimeoutConstant;    /* Constant in milliseconds.        */
+} COMMTIMEOUTS,*LPCOMMTIMEOUTS;
+
+typedef struct _COMMCONFIG {
+    DWORD dwSize;               /* Size of the entire struct */
+    WORD wVersion;              /* version of the structure */
+    WORD wReserved;             /* alignment */
+    DCB dcb;                    /* device control block */
+    DWORD dwProviderSubType;    /* ordinal value for identifying
+                                   provider-defined data structure format*/
+    DWORD dwProviderOffset;     /* Specifies the offset of provider specific
+                                   data field in bytes from the start */
+    DWORD dwProviderSize;       /* size of the provider-specific data field */
+    WCHAR wcProviderData[1];    /* provider-specific data */
+} COMMCONFIG,*LPCOMMCONFIG;
+
+typedef struct _SYSTEM_INFO {
+    union {
+        DWORD dwOemId;          // Obsolete field...do not use
+        struct {
+            WORD wProcessorArchitecture;
+            WORD wReserved;
+        };
+    };
+    DWORD dwPageSize;
+    LPVOID lpMinimumApplicationAddress;
+    LPVOID lpMaximumApplicationAddress;
+    DWORD_PTR dwActiveProcessorMask;
+    DWORD dwNumberOfProcessors;
+    DWORD dwProcessorType;
+    DWORD dwAllocationGranularity;
+    WORD wProcessorLevel;
+    WORD wProcessorRevision;
+} SYSTEM_INFO, *LPSYSTEM_INFO;
+
+//
+//
+
+
+#define FreeModule(hLibModule) FreeLibrary((hLibModule))
+#define MakeProcInstance(lpProc,hInstance) (lpProc)
+#define FreeProcInstance(lpProc) (lpProc)
+
+/* Global Memory Flags */
+#define GMEM_FIXED          0x0000
+#define GMEM_MOVEABLE       0x0002
+#define GMEM_NOCOMPACT      0x0010
+#define GMEM_NODISCARD      0x0020
+#define GMEM_ZEROINIT       0x0040
+#define GMEM_MODIFY         0x0080
+#define GMEM_DISCARDABLE    0x0100
+#define GMEM_NOT_BANKED     0x1000
+#define GMEM_SHARE          0x2000
+#define GMEM_DDESHARE       0x2000
+#define GMEM_NOTIFY         0x4000
+#define GMEM_LOWER          GMEM_NOT_BANKED
+#define GMEM_VALID_FLAGS    0x7F72
+#define GMEM_INVALID_HANDLE 0x8000
+
+#define GHND                (GMEM_MOVEABLE | GMEM_ZEROINIT)
+#define GPTR                (GMEM_FIXED | GMEM_ZEROINIT)
+
+#define GlobalLRUNewest( h )    ((HANDLE)(h))
+#define GlobalLRUOldest( h )    ((HANDLE)(h))
+#define GlobalDiscard( h )      GlobalReAlloc( (h), 0, GMEM_MOVEABLE )
+
+/* Flags returned by GlobalFlags (in addition to GMEM_DISCARDABLE) */
+#define GMEM_DISCARDED      0x4000
+#define GMEM_LOCKCOUNT      0x00FF
+
+typedef struct _MEMORYSTATUS {
+    DWORD dwLength;
+    DWORD dwMemoryLoad;
+    SIZE_T dwTotalPhys;
+    SIZE_T dwAvailPhys;
+    SIZE_T dwTotalPageFile;
+    SIZE_T dwAvailPageFile;
+    SIZE_T dwTotalVirtual;
+    SIZE_T dwAvailVirtual;
+} MEMORYSTATUS, *LPMEMORYSTATUS;
+
+/* Local Memory Flags */
+#define LMEM_FIXED          0x0000
+#define LMEM_MOVEABLE       0x0002
+#define LMEM_NOCOMPACT      0x0010
+#define LMEM_NODISCARD      0x0020
+#define LMEM_ZEROINIT       0x0040
+#define LMEM_MODIFY         0x0080
+#define LMEM_DISCARDABLE    0x0F00
+#define LMEM_VALID_FLAGS    0x0F72
+#define LMEM_INVALID_HANDLE 0x8000
+
+#define LHND                (LMEM_MOVEABLE | LMEM_ZEROINIT)
+#define LPTR                (LMEM_FIXED | LMEM_ZEROINIT)
+
+#define NONZEROLHND         (LMEM_MOVEABLE)
+#define NONZEROLPTR         (LMEM_FIXED)
+
+#define LocalDiscard( h )   LocalReAlloc( (h), 0, LMEM_MOVEABLE )
+
+/* Flags returned by LocalFlags (in addition to LMEM_DISCARDABLE) */
+#define LMEM_DISCARDED      0x4000
+#define LMEM_LOCKCOUNT      0x00FF
+
+//
+// dwCreationFlag values
+//
+
+#define DEBUG_PROCESS                     0x00000001
+#define DEBUG_ONLY_THIS_PROCESS           0x00000002
+
+#define CREATE_SUSPENDED                  0x00000004
+
+#define DETACHED_PROCESS                  0x00000008
+
+#define CREATE_NEW_CONSOLE                0x00000010
+
+#define NORMAL_PRIORITY_CLASS             0x00000020
+#define IDLE_PRIORITY_CLASS               0x00000040
+#define HIGH_PRIORITY_CLASS               0x00000080
+#define REALTIME_PRIORITY_CLASS           0x00000100
+
+#define CREATE_NEW_PROCESS_GROUP          0x00000200
+#define CREATE_UNICODE_ENVIRONMENT        0x00000400
+
+#define CREATE_SEPARATE_WOW_VDM           0x00000800
+#define CREATE_SHARED_WOW_VDM             0x00001000
+#define CREATE_FORCEDOS                   0x00002000
+
+#define BELOW_NORMAL_PRIORITY_CLASS       0x00004000
+#define ABOVE_NORMAL_PRIORITY_CLASS       0x00008000
+#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000
+
+#define CREATE_BREAKAWAY_FROM_JOB         0x01000000
+#define CREATE_PRESERVE_CODE_AUTHZ_LEVEL  0x02000000
+
+#define CREATE_DEFAULT_ERROR_MODE         0x04000000
+#define CREATE_NO_WINDOW                  0x08000000
+
+#define PROFILE_USER                      0x10000000
+#define PROFILE_KERNEL                    0x20000000
+#define PROFILE_SERVER                    0x40000000
+
+#define CREATE_IGNORE_SYSTEM_DEFAULT      0x80000000
+
+#define THREAD_PRIORITY_LOWEST          THREAD_BASE_PRIORITY_MIN
+#define THREAD_PRIORITY_BELOW_NORMAL    (THREAD_PRIORITY_LOWEST+1)
+#define THREAD_PRIORITY_NORMAL          0
+#define THREAD_PRIORITY_HIGHEST         THREAD_BASE_PRIORITY_MAX
+#define THREAD_PRIORITY_ABOVE_NORMAL    (THREAD_PRIORITY_HIGHEST-1)
+#define THREAD_PRIORITY_ERROR_RETURN    (MAXLONG)
+
+#define THREAD_PRIORITY_TIME_CRITICAL   THREAD_BASE_PRIORITY_LOWRT
+#define THREAD_PRIORITY_IDLE            THREAD_BASE_PRIORITY_IDLE
+
+//
+// Debug APIs
+//
+#define EXCEPTION_DEBUG_EVENT       1
+#define CREATE_THREAD_DEBUG_EVENT   2
+#define CREATE_PROCESS_DEBUG_EVENT  3
+#define EXIT_THREAD_DEBUG_EVENT     4
+#define EXIT_PROCESS_DEBUG_EVENT    5
+#define LOAD_DLL_DEBUG_EVENT        6
+#define UNLOAD_DLL_DEBUG_EVENT      7
+#define OUTPUT_DEBUG_STRING_EVENT   8
+#define RIP_EVENT                   9
+
+typedef struct _EXCEPTION_DEBUG_INFO {
+    EXCEPTION_RECORD ExceptionRecord;
+    DWORD dwFirstChance;
+} EXCEPTION_DEBUG_INFO, *LPEXCEPTION_DEBUG_INFO;
+
+typedef struct _CREATE_THREAD_DEBUG_INFO {
+    HANDLE hThread;
+    LPVOID lpThreadLocalBase;
+    LPTHREAD_START_ROUTINE lpStartAddress;
+} CREATE_THREAD_DEBUG_INFO, *LPCREATE_THREAD_DEBUG_INFO;
+
+typedef struct _CREATE_PROCESS_DEBUG_INFO {
+    HANDLE hFile;
+    HANDLE hProcess;
+    HANDLE hThread;
+    LPVOID lpBaseOfImage;
+    DWORD dwDebugInfoFileOffset;
+    DWORD nDebugInfoSize;
+    LPVOID lpThreadLocalBase;
+    LPTHREAD_START_ROUTINE lpStartAddress;
+    LPVOID lpImageName;
+    WORD fUnicode;
+} CREATE_PROCESS_DEBUG_INFO, *LPCREATE_PROCESS_DEBUG_INFO;
+
+typedef struct _EXIT_THREAD_DEBUG_INFO {
+    DWORD dwExitCode;
+} EXIT_THREAD_DEBUG_INFO, *LPEXIT_THREAD_DEBUG_INFO;
+
+typedef struct _EXIT_PROCESS_DEBUG_INFO {
+    DWORD dwExitCode;
+} EXIT_PROCESS_DEBUG_INFO, *LPEXIT_PROCESS_DEBUG_INFO;
+
+typedef struct _LOAD_DLL_DEBUG_INFO {
+    HANDLE hFile;
+    LPVOID lpBaseOfDll;
+    DWORD dwDebugInfoFileOffset;
+    DWORD nDebugInfoSize;
+    LPVOID lpImageName;
+    WORD fUnicode;
+} LOAD_DLL_DEBUG_INFO, *LPLOAD_DLL_DEBUG_INFO;
+
+typedef struct _UNLOAD_DLL_DEBUG_INFO {
+    LPVOID lpBaseOfDll;
+} UNLOAD_DLL_DEBUG_INFO, *LPUNLOAD_DLL_DEBUG_INFO;
+
+typedef struct _OUTPUT_DEBUG_STRING_INFO {
+    LPSTR lpDebugStringData;
+    WORD fUnicode;
+    WORD nDebugStringLength;
+} OUTPUT_DEBUG_STRING_INFO, *LPOUTPUT_DEBUG_STRING_INFO;
+
+typedef struct _RIP_INFO {
+    DWORD dwError;
+    DWORD dwType;
+} RIP_INFO, *LPRIP_INFO;
+
+
+typedef struct _DEBUG_EVENT {
+    DWORD dwDebugEventCode;
+    DWORD dwProcessId;
+    DWORD dwThreadId;
+    union {
+        EXCEPTION_DEBUG_INFO Exception;
+        CREATE_THREAD_DEBUG_INFO CreateThread;
+        CREATE_PROCESS_DEBUG_INFO CreateProcessInfo;
+        EXIT_THREAD_DEBUG_INFO ExitThread;
+        EXIT_PROCESS_DEBUG_INFO ExitProcess;
+        LOAD_DLL_DEBUG_INFO LoadDll;
+        UNLOAD_DLL_DEBUG_INFO UnloadDll;
+        OUTPUT_DEBUG_STRING_INFO DebugString;
+        RIP_INFO RipInfo;
+    } u;
+} DEBUG_EVENT, *LPDEBUG_EVENT;
+
+#if !defined(MIDL_PASS)
+typedef PCONTEXT LPCONTEXT;
+typedef PEXCEPTION_RECORD LPEXCEPTION_RECORD;
+typedef PEXCEPTION_POINTERS LPEXCEPTION_POINTERS;
+#endif
+
+#define DRIVE_UNKNOWN     0
+#define DRIVE_NO_ROOT_DIR 1
+#define DRIVE_REMOVABLE   2
+#define DRIVE_FIXED       3
+#define DRIVE_REMOTE      4
+#define DRIVE_CDROM       5
+#define DRIVE_RAMDISK     6
+
+
+#ifndef _MAC
+#define GetFreeSpace(w)                 (0x100000L)
+#else
+WINBASEAPI DWORD WINAPI GetFreeSpace(UINT);
+#endif
+
+
+#define FILE_TYPE_UNKNOWN   0x0000
+#define FILE_TYPE_DISK      0x0001
+#define FILE_TYPE_CHAR      0x0002
+#define FILE_TYPE_PIPE      0x0003
+#define FILE_TYPE_REMOTE    0x8000
+
+
+#define STD_INPUT_HANDLE    ((DWORD)-10)
+#define STD_OUTPUT_HANDLE   ((DWORD)-11)
+#define STD_ERROR_HANDLE    ((DWORD)-12)
+
+#define NOPARITY            0
+#define ODDPARITY           1
+#define EVENPARITY          2
+#define MARKPARITY          3
+#define SPACEPARITY         4
+
+#define ONESTOPBIT          0
+#define ONE5STOPBITS        1
+#define TWOSTOPBITS         2
+
+#define IGNORE              0       // Ignore signal
+#define INFINITE            0xFFFFFFFF  // Infinite timeout
+
+//
+// Baud rates at which the communication device operates
+//
+
+#define CBR_110             110
+#define CBR_300             300
+#define CBR_600             600
+#define CBR_1200            1200
+#define CBR_2400            2400
+#define CBR_4800            4800
+#define CBR_9600            9600
+#define CBR_14400           14400
+#define CBR_19200           19200
+#define CBR_38400           38400
+#define CBR_56000           56000
+#define CBR_57600           57600
+#define CBR_115200          115200
+#define CBR_128000          128000
+#define CBR_256000          256000
+
+//
+// Error Flags
+//
+
+#define CE_RXOVER           0x0001  // Receive Queue overflow
+#define CE_OVERRUN          0x0002  // Receive Overrun Error
+#define CE_RXPARITY         0x0004  // Receive Parity Error
+#define CE_FRAME            0x0008  // Receive Framing error
+#define CE_BREAK            0x0010  // Break Detected
+#define CE_TXFULL           0x0100  // TX Queue is full
+#define CE_PTO              0x0200  // LPTx Timeout
+#define CE_IOE              0x0400  // LPTx I/O Error
+#define CE_DNS              0x0800  // LPTx Device not selected
+#define CE_OOP              0x1000  // LPTx Out-Of-Paper
+#define CE_MODE             0x8000  // Requested mode unsupported
+
+#define IE_BADID            (-1)    // Invalid or unsupported id
+#define IE_OPEN             (-2)    // Device Already Open
+#define IE_NOPEN            (-3)    // Device Not Open
+#define IE_MEMORY           (-4)    // Unable to allocate queues
+#define IE_DEFAULT          (-5)    // Error in default parameters
+#define IE_HARDWARE         (-10)   // Hardware Not Present
+#define IE_BYTESIZE         (-11)   // Illegal Byte Size
+#define IE_BAUDRATE         (-12)   // Unsupported BaudRate
+
+//
+// Events
+//
+
+#define EV_RXCHAR           0x0001  // Any Character received
+#define EV_RXFLAG           0x0002  // Received certain character
+#define EV_TXEMPTY          0x0004  // Transmitt Queue Empty
+#define EV_CTS              0x0008  // CTS changed state
+#define EV_DSR              0x0010  // DSR changed state
+#define EV_RLSD             0x0020  // RLSD changed state
+#define EV_BREAK            0x0040  // BREAK received
+#define EV_ERR              0x0080  // Line status error occurred
+#define EV_RING             0x0100  // Ring signal detected
+#define EV_PERR             0x0200  // Printer error occured
+#define EV_RX80FULL         0x0400  // Receive buffer is 80 percent full
+#define EV_EVENT1           0x0800  // Provider specific event 1
+#define EV_EVENT2           0x1000  // Provider specific event 2
+
+//
+// Escape Functions
+//
+
+#define SETXOFF             1       // Simulate XOFF received
+#define SETXON              2       // Simulate XON received
+#define SETRTS              3       // Set RTS high
+#define CLRRTS              4       // Set RTS low
+#define SETDTR              5       // Set DTR high
+#define CLRDTR              6       // Set DTR low
+#define RESETDEV            7       // Reset device if possible
+#define SETBREAK            8       // Set the device break line.
+#define CLRBREAK            9       // Clear the device break line.
+
+//
+// PURGE function flags.
+//
+#define PURGE_TXABORT       0x0001  // Kill the pending/current writes to the comm port.
+#define PURGE_RXABORT       0x0002  // Kill the pending/current reads to the comm port.
+#define PURGE_TXCLEAR       0x0004  // Kill the transmit queue if there.
+#define PURGE_RXCLEAR       0x0008  // Kill the typeahead buffer if there.
+
+#define LPTx                0x80    // Set if ID is for LPT device
+
+//
+// Modem Status Flags
+//
+#define MS_CTS_ON           ((DWORD)0x0010)
+#define MS_DSR_ON           ((DWORD)0x0020)
+#define MS_RING_ON          ((DWORD)0x0040)
+#define MS_RLSD_ON          ((DWORD)0x0080)
+
+//
+// WaitSoundState() Constants
+//
+
+#define S_QUEUEEMPTY        0
+#define S_THRESHOLD         1
+#define S_ALLTHRESHOLD      2
+
+//
+// Accent Modes
+//
+
+#define S_NORMAL      0
+#define S_LEGATO      1
+#define S_STACCATO    2
+
+//
+// SetSoundNoise() Sources
+//
+
+#define S_PERIOD512   0     // Freq = N/512 high pitch, less coarse hiss
+#define S_PERIOD1024  1     // Freq = N/1024
+#define S_PERIOD2048  2     // Freq = N/2048 low pitch, more coarse hiss
+#define S_PERIODVOICE 3     // Source is frequency from voice channel (3)
+#define S_WHITE512    4     // Freq = N/512 high pitch, less coarse hiss
+#define S_WHITE1024   5     // Freq = N/1024
+#define S_WHITE2048   6     // Freq = N/2048 low pitch, more coarse hiss
+#define S_WHITEVOICE  7     // Source is frequency from voice channel (3)
+
+#define S_SERDVNA     (-1)  // Device not available
+#define S_SEROFM      (-2)  // Out of memory
+#define S_SERMACT     (-3)  // Music active
+#define S_SERQFUL     (-4)  // Queue full
+#define S_SERBDNT     (-5)  // Invalid note
+#define S_SERDLN      (-6)  // Invalid note length
+#define S_SERDCC      (-7)  // Invalid note count
+#define S_SERDTP      (-8)  // Invalid tempo
+#define S_SERDVL      (-9)  // Invalid volume
+#define S_SERDMD      (-10) // Invalid mode
+#define S_SERDSH      (-11) // Invalid shape
+#define S_SERDPT      (-12) // Invalid pitch
+#define S_SERDFQ      (-13) // Invalid frequency
+#define S_SERDDR      (-14) // Invalid duration
+#define S_SERDSR      (-15) // Invalid source
+#define S_SERDST      (-16) // Invalid state
+
+#define NMPWAIT_WAIT_FOREVER            0xffffffff
+#define NMPWAIT_NOWAIT                  0x00000001
+#define NMPWAIT_USE_DEFAULT_WAIT        0x00000000
+
+#define FS_CASE_IS_PRESERVED            FILE_CASE_PRESERVED_NAMES
+#define FS_CASE_SENSITIVE               FILE_CASE_SENSITIVE_SEARCH
+#define FS_UNICODE_STORED_ON_DISK       FILE_UNICODE_ON_DISK
+#define FS_PERSISTENT_ACLS              FILE_PERSISTENT_ACLS
+#define FS_VOL_IS_COMPRESSED            FILE_VOLUME_IS_COMPRESSED
+#define FS_FILE_COMPRESSION             FILE_FILE_COMPRESSION
+#define FS_FILE_ENCRYPTION              FILE_SUPPORTS_ENCRYPTION
+
+
+
+
+
+
+#define FILE_MAP_COPY       SECTION_QUERY
+#define FILE_MAP_WRITE      SECTION_MAP_WRITE
+#define FILE_MAP_READ       SECTION_MAP_READ
+#define FILE_MAP_ALL_ACCESS SECTION_ALL_ACCESS
+
+#define OF_READ             0x00000000
+#define OF_WRITE            0x00000001
+#define OF_READWRITE        0x00000002
+#define OF_SHARE_COMPAT     0x00000000
+#define OF_SHARE_EXCLUSIVE  0x00000010
+#define OF_SHARE_DENY_WRITE 0x00000020
+#define OF_SHARE_DENY_READ  0x00000030
+#define OF_SHARE_DENY_NONE  0x00000040
+#define OF_PARSE            0x00000100
+#define OF_DELETE           0x00000200
+#define OF_VERIFY           0x00000400
+#define OF_CANCEL           0x00000800
+#define OF_CREATE           0x00001000
+#define OF_PROMPT           0x00002000
+#define OF_EXIST            0x00004000
+#define OF_REOPEN           0x00008000
+
+#define OFS_MAXPATHNAME 128
+typedef struct _OFSTRUCT {
+    BYTE cBytes;
+    BYTE fFixedDisk;
+    WORD nErrCode;
+    WORD Reserved1;
+    WORD Reserved2;
+    CHAR szPathName[OFS_MAXPATHNAME];
+} OFSTRUCT, *LPOFSTRUCT, *POFSTRUCT;
+
+
+#ifndef NOWINBASEINTERLOCK
+
+#ifndef _NTOS_
+
+#if defined(_M_IA64) && !defined(RC_INVOKED)
+
+#define InterlockedIncrement _InterlockedIncrement
+#define InterlockedDecrement _InterlockedDecrement
+#define InterlockedExchange _InterlockedExchange
+#define InterlockedExchangeAdd _InterlockedExchangeAdd
+#define InterlockedCompareExchange _InterlockedCompareExchange
+#define InterlockedExchangePointer _InterlockedExchangePointer
+#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer
+
+#define InterlockedIncrement64 _InterlockedIncrement64
+#define InterlockedDecrement64 _InterlockedDecrement64
+#define InterlockedExchange64 _InterlockedExchange64
+#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64
+#define InterlockedCompareExchange64 _InterlockedCompareExchange64
+
+
+LONGLONG
+__cdecl
+InterlockedIncrement64(
+    IN OUT LONGLONG volatile *Addend
+    );
+
+LONGLONG
+__cdecl
+InterlockedDecrement64(
+    IN OUT LONGLONG volatile *Addend
+    );
+
+LONGLONG
+__cdecl
+InterlockedExchange64(
+    IN OUT LONGLONG volatile *Target,
+    IN LONGLONG Value
+    );
+
+LONGLONG
+__cdecl
+InterlockedExchangeAdd64(
+    IN OUT LONGLONG volatile *Addend,
+    IN LONGLONG Value
+    );
+
+LONGLONG
+__cdecl
+InterlockedCompareExchange64 (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG ExChange,
+    IN LONGLONG Comperand
+    );
+
+LONG
+__cdecl
+InterlockedIncrement(
+    IN OUT LONG volatile *lpAddend
+    );
+
+LONG
+__cdecl
+InterlockedDecrement(
+    IN OUT LONG volatile *lpAddend
+    );
+
+LONG
+__cdecl
+InterlockedExchange(
+    IN OUT LONG volatile *Target,
+    IN LONG Value
+    );
+
+LONG
+__cdecl
+InterlockedExchangeAdd(
+    IN OUT LONG volatile *Addend,
+    IN LONG Value
+    );
+
+LONG
+__cdecl
+InterlockedCompareExchange (
+    IN OUT LONG volatile *Destination,
+    IN LONG ExChange,
+    IN LONG Comperand
+    );
+
+PVOID
+__cdecl
+InterlockedExchangePointer(
+    IN OUT PVOID volatile *Target,
+    IN PVOID Value
+    );
+
+PVOID
+__cdecl
+InterlockedCompareExchangePointer (
+    IN OUT PVOID volatile *Destination,
+    IN PVOID ExChange,
+    IN PVOID Comperand
+    );
+
+#if !defined(MIDL_PASS)
+
+#if !defined (InterlockedAnd64)
+
+#define InterlockedAnd64 InterlockedAnd64_Inline
+
+LONGLONG
+FORCEINLINE
+InterlockedAnd64_Inline (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange64(Destination,
+                                          Old & Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+#endif
+
+#if !defined (InterlockedOr64)
+
+#define InterlockedOr64 InterlockedOr64_Inline
+
+LONGLONG
+FORCEINLINE
+InterlockedOr64_Inline (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange64(Destination,
+                                          Old | Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+#endif
+
+#if !defined (InterlockedXor64)
+
+#define InterlockedXor64 InterlockedXor64_Inline
+
+LONGLONG
+FORCEINLINE
+InterlockedXor64_Inline (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange64(Destination,
+                                          Old ^ Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+#endif
+
+#endif
+
+#pragma intrinsic(_InterlockedIncrement)
+#pragma intrinsic(_InterlockedDecrement)
+#pragma intrinsic(_InterlockedExchange)
+#pragma intrinsic(_InterlockedExchangeAdd)
+#pragma intrinsic(_InterlockedCompareExchange)
+#pragma intrinsic(_InterlockedExchangePointer)
+#pragma intrinsic(_InterlockedCompareExchangePointer)
+#pragma intrinsic(_InterlockedIncrement64)
+#pragma intrinsic(_InterlockedDecrement64)
+#pragma intrinsic(_InterlockedExchange64)
+#pragma intrinsic(_InterlockedCompareExchange64)
+#pragma intrinsic(_InterlockedExchangeAdd64)
+
+
+#elif defined(_M_AMD64) && !defined(RC_INVOKED)
+
+#define InterlockedIncrement _InterlockedIncrement
+#define InterlockedDecrement _InterlockedDecrement
+#define InterlockedExchange _InterlockedExchange
+#define InterlockedExchangeAdd _InterlockedExchangeAdd
+#define InterlockedCompareExchange _InterlockedCompareExchange
+#define InterlockedExchangePointer _InterlockedExchangePointer
+#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer
+#define InterlockedAnd64 _InterlockedAnd64
+#define InterlockedOr64 _InterlockedOr64
+#define InterlockedXor64 _InterlockedXor64
+#define InterlockedIncrement64 _InterlockedIncrement64
+#define InterlockedDecrement64 _InterlockedDecrement64
+#define InterlockedExchange64 _InterlockedExchange64
+#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64
+#define InterlockedCompareExchange64 _InterlockedCompareExchange64
+
+
+LONG
+InterlockedIncrement(
+    IN OUT LONG volatile *Addend
+    );
+
+LONG
+InterlockedDecrement(
+    IN OUT LONG volatile *Addend
+    );
+
+LONG
+InterlockedExchange(
+    IN OUT LONG volatile *Target,
+    IN LONG Value
+    );
+
+LONG
+InterlockedExchangeAdd(
+    IN OUT LONG volatile *Addend,
+    IN LONG Value
+    );
+
+LONG
+InterlockedCompareExchange (
+    IN OUT LONG volatile *Destination,
+    IN LONG ExChange,
+    IN LONG Comperand
+    );
+
+PVOID
+InterlockedCompareExchangePointer (
+    IN OUT PVOID volatile *Destination,
+    IN PVOID Exchange,
+    IN PVOID Comperand
+    );
+
+PVOID
+InterlockedExchangePointer(
+    IN OUT PVOID volatile *Target,
+    IN PVOID Value
+    );
+
+LONG64
+InterlockedAnd64 (
+    IN OUT LONG64 volatile *Destination,
+    IN LONG64 Value
+    );
+
+LONG64
+InterlockedOr64 (
+    IN OUT LONG64 volatile *Destination,
+    IN LONG64 Value
+    );
+
+LONG64
+InterlockedXor64 (
+    IN OUT LONG64 volatile *Destination,
+    IN LONG64 Value
+    );
+
+LONG64
+InterlockedIncrement64(
+    IN OUT LONG64 volatile *Addend
+    );
+
+LONG64
+InterlockedDecrement64(
+    IN OUT LONG64 volatile *Addend
+    );
+
+LONG64
+InterlockedExchange64(
+    IN OUT LONG64 volatile *Target,
+    IN LONG64 Value
+    );
+
+LONG64
+InterlockedExchangeAdd64(
+    IN OUT LONG64 volatile *Addend,
+    IN LONG64 Value
+    );
+
+LONG64
+InterlockedCompareExchange64 (
+    IN OUT LONG64 volatile *Destination,
+    IN LONG64 ExChange,
+    IN LONG64 Comperand
+    );
+
+
+#pragma intrinsic(_InterlockedIncrement)
+#pragma intrinsic(_InterlockedDecrement)
+#pragma intrinsic(_InterlockedExchange)
+#pragma intrinsic(_InterlockedExchangeAdd)
+#pragma intrinsic(_InterlockedCompareExchange)
+#pragma intrinsic(_InterlockedExchangePointer)
+#pragma intrinsic(_InterlockedCompareExchangePointer)
+
+#else           // X86 interlocked definitions
+
+WINBASEAPI
+LONG
+WINAPI
+InterlockedIncrement(
+    IN OUT LONG volatile *lpAddend
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+InterlockedDecrement(
+    IN OUT LONG volatile *lpAddend
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+InterlockedExchange(
+    IN OUT LONG volatile *Target,
+    IN LONG Value
+    );
+
+#define InterlockedExchangePointer(Target, Value) \
+    (PVOID)InterlockedExchange((PLONG)(Target), (LONG)(Value))
+
+WINBASEAPI
+LONG
+WINAPI
+InterlockedExchangeAdd(
+    IN OUT LONG volatile *Addend,
+    IN LONG Value
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+InterlockedCompareExchange (
+    IN OUT LONG volatile *Destination,
+    IN LONG Exchange,
+    IN LONG Comperand
+    );
+
+
+WINBASEAPI
+LONGLONG
+WINAPI
+InterlockedCompareExchange64 (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Exchange,
+    IN LONGLONG Comperand
+    );
+
+#if !defined(MIDL_PASS)
+
+LONGLONG
+FORCEINLINE
+InterlockedAnd64 (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange64(Destination,
+                                          Old & Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+LONGLONG
+FORCEINLINE
+InterlockedOr64 (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange64(Destination,
+                                          Old | Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+LONGLONG
+FORCEINLINE
+InterlockedXor64 (
+    IN OUT LONGLONG volatile *Destination,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange64(Destination,
+                                          Old ^ Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+LONGLONG
+FORCEINLINE
+InterlockedIncrement64(
+    IN OUT LONGLONG volatile *Addend
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Addend;
+    } while (InterlockedCompareExchange64(Addend,
+                                          Old + 1,
+                                          Old) != Old);
+
+    return Old + 1;
+}
+
+LONGLONG
+FORCEINLINE
+InterlockedDecrement64(
+    IN OUT LONGLONG volatile *Addend
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Addend;
+    } while (InterlockedCompareExchange64(Addend,
+                                          Old - 1,
+                                          Old) != Old);
+
+    return Old - 1;
+}
+
+LONGLONG
+FORCEINLINE
+InterlockedExchange64(
+    IN OUT LONGLONG volatile *Target,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Target;
+    } while (InterlockedCompareExchange64(Target,
+                                          Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+LONGLONG
+FORCEINLINE
+InterlockedExchangeAdd64(
+    IN OUT LONGLONG volatile *Addend,
+    IN LONGLONG Value
+    )
+{
+    LONGLONG Old;
+
+    do {
+        Old = *Addend;
+    } while (InterlockedCompareExchange64(Addend,
+                                          Old + Value,
+                                          Old) != Old);
+
+    return Old;
+}
+
+#endif
+
+//
+// Use a function for C++ so X86 will generate the same errors as RISC.
+//
+
+#ifdef __cplusplus
+
+FORCEINLINE
+PVOID
+__cdecl
+__InlineInterlockedCompareExchangePointer (
+    IN OUT PVOID volatile *Destination,
+    IN PVOID ExChange,
+    IN PVOID Comperand
+    )
+{
+    return((PVOID)(LONG_PTR)InterlockedCompareExchange((LONG volatile *)Destination, (LONG)(LONG_PTR)ExChange, (LONG)(LONG_PTR)Comperand));
+}
+
+#define InterlockedCompareExchangePointer __InlineInterlockedCompareExchangePointer
+
+#else
+
+#define InterlockedCompareExchangePointer(Destination, ExChange, Comperand) \
+    (PVOID)(LONG_PTR)InterlockedCompareExchange((LONG volatile *)(Destination), (LONG)(LONG_PTR)(ExChange), (LONG)(LONG_PTR)(Comperand))
+
+#endif /* __cplusplus */
+
+#endif /* X86 | IA64 */
+
+#if defined(_SLIST_HEADER_) && !defined(_NTOSP_)
+
+WINBASEAPI
+VOID
+WINAPI
+InitializeSListHead (
+    IN PSLIST_HEADER ListHead
+    );
+
+WINBASEAPI
+PSLIST_ENTRY
+WINAPI
+InterlockedPopEntrySList (
+    IN PSLIST_HEADER ListHead
+    );
+
+WINBASEAPI
+PSLIST_ENTRY
+WINAPI
+InterlockedPushEntrySList (
+    IN PSLIST_HEADER ListHead,
+    IN PSLIST_ENTRY ListEntry
+    );
+
+WINBASEAPI
+PSLIST_ENTRY
+WINAPI
+InterlockedFlushSList (
+    IN PSLIST_HEADER ListHead
+    );
+
+WINBASEAPI
+USHORT
+WINAPI
+QueryDepthSList (
+    IN PSLIST_HEADER ListHead
+    );
+
+#endif /* _SLIST_HEADER_ */
+
+#endif /* _NTOS_ */
+
+#endif /* NOWINBASEINTERLOCK */
+
+WINBASEAPI
+BOOL
+WINAPI
+FreeResource(
+        IN HGLOBAL hResData
+        );
+
+WINBASEAPI
+LPVOID
+WINAPI
+LockResource(
+        IN HGLOBAL hResData
+        );
+
+#define UnlockResource(hResData) ((hResData), 0)
+#define MAXINTATOM 0xC000
+#define MAKEINTATOM(i)  (LPTSTR)((ULONG_PTR)((WORD)(i)))
+#define INVALID_ATOM ((ATOM)0)
+
+#ifndef _MAC
+int
+WINAPI
+#else
+int
+CALLBACK
+#endif
+WinMain(
+    IN HINSTANCE hInstance,
+    IN HINSTANCE hPrevInstance,
+    IN LPSTR lpCmdLine,
+    IN int nShowCmd
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FreeLibrary(
+    IN OUT HMODULE hLibModule
+    );
+
+
+WINBASEAPI
+DECLSPEC_NORETURN
+VOID
+WINAPI
+FreeLibraryAndExitThread(
+    IN HMODULE hLibModule,
+    IN DWORD dwExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DisableThreadLibraryCalls(
+    IN HMODULE hLibModule
+    );
+
+WINBASEAPI
+FARPROC
+WINAPI
+GetProcAddress(
+    IN HMODULE hModule,
+    IN LPCSTR lpProcName
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetVersion( VOID );
+
+WINBASEAPI
+HGLOBAL
+WINAPI
+GlobalAlloc(
+    IN UINT uFlags,
+    IN SIZE_T dwBytes
+    );
+
+WINBASEAPI
+HGLOBAL
+WINAPI
+GlobalReAlloc(
+    IN HGLOBAL hMem,
+    IN SIZE_T dwBytes,
+    IN UINT uFlags
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+GlobalSize(
+    IN HGLOBAL hMem
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+GlobalFlags(
+    IN HGLOBAL hMem
+    );
+
+
+WINBASEAPI
+LPVOID
+WINAPI
+GlobalLock(
+    IN HGLOBAL hMem
+    );
+
+//!!!MWH My version  win31 = DWORD WINAPI GlobalHandle(UINT)
+WINBASEAPI
+HGLOBAL
+WINAPI
+GlobalHandle(
+    IN LPCVOID pMem
+    );
+
+
+WINBASEAPI
+BOOL
+WINAPI
+GlobalUnlock(
+    IN HGLOBAL hMem
+    );
+
+
+WINBASEAPI
+HGLOBAL
+WINAPI
+GlobalFree(
+    IN HGLOBAL hMem
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+GlobalCompact(
+    IN DWORD dwMinFree
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GlobalFix(
+    IN HGLOBAL hMem
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GlobalUnfix(
+    IN HGLOBAL hMem
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+GlobalWire(
+    IN HGLOBAL hMem
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GlobalUnWire(
+    IN HGLOBAL hMem
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GlobalMemoryStatus(
+    IN OUT LPMEMORYSTATUS lpBuffer
+    );
+
+typedef struct _MEMORYSTATUSEX {
+    DWORD dwLength;
+    DWORD dwMemoryLoad;
+    DWORDLONG ullTotalPhys;
+    DWORDLONG ullAvailPhys;
+    DWORDLONG ullTotalPageFile;
+    DWORDLONG ullAvailPageFile;
+    DWORDLONG ullTotalVirtual;
+    DWORDLONG ullAvailVirtual;
+    DWORDLONG ullAvailExtendedVirtual;
+} MEMORYSTATUSEX, *LPMEMORYSTATUSEX;
+
+WINBASEAPI
+BOOL
+WINAPI
+GlobalMemoryStatusEx(
+    IN OUT LPMEMORYSTATUSEX lpBuffer
+    );
+
+WINBASEAPI
+HLOCAL
+WINAPI
+LocalAlloc(
+    IN UINT uFlags,
+    IN SIZE_T uBytes
+    );
+
+WINBASEAPI
+HLOCAL
+WINAPI
+LocalReAlloc(
+    IN HLOCAL hMem,
+    IN SIZE_T uBytes,
+    IN UINT uFlags
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+LocalLock(
+    IN HLOCAL hMem
+    );
+
+WINBASEAPI
+HLOCAL
+WINAPI
+LocalHandle(
+    IN LPCVOID pMem
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+LocalUnlock(
+    IN HLOCAL hMem
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+LocalSize(
+    IN HLOCAL hMem
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+LocalFlags(
+    IN HLOCAL hMem
+    );
+
+WINBASEAPI
+HLOCAL
+WINAPI
+LocalFree(
+    IN HLOCAL hMem
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+LocalShrink(
+    IN HLOCAL hMem,
+    IN UINT cbNewSize
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+LocalCompact(
+    IN UINT uMinFree
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FlushInstructionCache(
+    IN HANDLE hProcess,
+    IN LPCVOID lpBaseAddress,
+    IN SIZE_T dwSize
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+VirtualAlloc(
+    IN LPVOID lpAddress,
+    IN SIZE_T dwSize,
+    IN DWORD flAllocationType,
+    IN DWORD flProtect
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+VirtualFree(
+    IN LPVOID lpAddress,
+    IN SIZE_T dwSize,
+    IN DWORD dwFreeType
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+VirtualProtect(
+    IN  LPVOID lpAddress,
+    IN  SIZE_T dwSize,
+    IN  DWORD flNewProtect,
+    OUT PDWORD lpflOldProtect
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+VirtualQuery(
+    IN LPCVOID lpAddress,
+    OUT PMEMORY_BASIC_INFORMATION lpBuffer,
+    IN SIZE_T dwLength
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+VirtualAllocEx(
+    IN HANDLE hProcess,
+    IN LPVOID lpAddress,
+    IN SIZE_T dwSize,
+    IN DWORD flAllocationType,
+    IN DWORD flProtect
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+GetWriteWatch(
+    IN DWORD  dwFlags,
+    IN PVOID  lpBaseAddress,
+    IN SIZE_T dwRegionSize,
+    IN OUT PVOID *lpAddresses,
+    IN OUT PULONG_PTR lpdwCount,
+    OUT PULONG lpdwGranularity
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+ResetWriteWatch(
+    IN LPVOID lpBaseAddress,
+    IN SIZE_T dwRegionSize
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+GetLargePageMinimum(
+    VOID
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+VirtualFreeEx(
+    IN HANDLE hProcess,
+    IN LPVOID lpAddress,
+    IN SIZE_T dwSize,
+    IN DWORD dwFreeType
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+VirtualProtectEx(
+    IN  HANDLE hProcess,
+    IN  LPVOID lpAddress,
+    IN  SIZE_T dwSize,
+    IN  DWORD flNewProtect,
+    OUT PDWORD lpflOldProtect
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+VirtualQueryEx(
+    IN HANDLE hProcess,
+    IN LPCVOID lpAddress,
+    OUT PMEMORY_BASIC_INFORMATION lpBuffer,
+    IN SIZE_T dwLength
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+HeapCreate(
+    IN DWORD flOptions,
+    IN SIZE_T dwInitialSize,
+    IN SIZE_T dwMaximumSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapDestroy(
+    IN OUT HANDLE hHeap
+    );
+
+
+WINBASEAPI
+LPVOID
+WINAPI
+HeapAlloc(
+    IN HANDLE hHeap,
+    IN DWORD dwFlags,
+    IN SIZE_T dwBytes
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+HeapReAlloc(
+    IN HANDLE hHeap,
+    IN DWORD dwFlags,
+    IN LPVOID lpMem,
+    IN SIZE_T dwBytes
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapFree(
+    IN HANDLE hHeap,
+    IN DWORD dwFlags,
+    IN LPVOID lpMem
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+HeapSize(
+    IN HANDLE hHeap,
+    IN DWORD dwFlags,
+    IN LPCVOID lpMem
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapValidate(
+    IN HANDLE hHeap,
+    IN DWORD dwFlags,
+    IN LPCVOID lpMem
+    );
+
+WINBASEAPI
+SIZE_T
+WINAPI
+HeapCompact(
+    IN HANDLE hHeap,
+    IN DWORD dwFlags
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+GetProcessHeap( VOID );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetProcessHeaps(
+    IN DWORD NumberOfHeaps,
+    OUT PHANDLE ProcessHeaps
+    );
+
+typedef struct _PROCESS_HEAP_ENTRY {
+    PVOID lpData;
+    DWORD cbData;
+    BYTE cbOverhead;
+    BYTE iRegionIndex;
+    WORD wFlags;
+    union {
+        struct {
+            HANDLE hMem;
+            DWORD dwReserved[ 3 ];
+        } Block;
+        struct {
+            DWORD dwCommittedSize;
+            DWORD dwUnCommittedSize;
+            LPVOID lpFirstBlock;
+            LPVOID lpLastBlock;
+        } Region;
+    };
+} PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY, *PPROCESS_HEAP_ENTRY;
+
+#define PROCESS_HEAP_REGION             0x0001
+#define PROCESS_HEAP_UNCOMMITTED_RANGE  0x0002
+#define PROCESS_HEAP_ENTRY_BUSY         0x0004
+#define PROCESS_HEAP_ENTRY_MOVEABLE     0x0010
+#define PROCESS_HEAP_ENTRY_DDESHARE     0x0020
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapLock(
+    IN HANDLE hHeap
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapUnlock(
+    IN HANDLE hHeap
+    );
+
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapWalk(
+    IN HANDLE hHeap,
+    IN OUT LPPROCESS_HEAP_ENTRY lpEntry
+    );
+
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapSetInformation (
+    IN HANDLE HeapHandle, 
+    IN HEAP_INFORMATION_CLASS HeapInformationClass,
+    IN PVOID HeapInformation OPTIONAL,
+    IN SIZE_T HeapInformationLength OPTIONAL
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+HeapQueryInformation (
+    IN HANDLE HeapHandle, 
+    IN HEAP_INFORMATION_CLASS HeapInformationClass,
+    OUT PVOID HeapInformation OPTIONAL,
+    IN SIZE_T HeapInformationLength OPTIONAL,
+    OUT PSIZE_T ReturnLength OPTIONAL
+    );
+
+// GetBinaryType return values.
+
+#define SCS_32BIT_BINARY    0
+#define SCS_DOS_BINARY      1
+#define SCS_WOW_BINARY      2
+#define SCS_PIF_BINARY      3
+#define SCS_POSIX_BINARY    4
+#define SCS_OS216_BINARY    5
+#define SCS_64BIT_BINARY    6
+
+#if defined(_WIN64)
+# define SCS_THIS_PLATFORM_BINARY SCS_64BIT_BINARY
+#else
+# define SCS_THIS_PLATFORM_BINARY SCS_32BIT_BINARY
+#endif
+
+WINBASEAPI
+BOOL
+WINAPI
+GetBinaryTypeA(
+    IN LPCSTR lpApplicationName,
+    OUT LPDWORD lpBinaryType
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetBinaryTypeW(
+    IN LPCWSTR lpApplicationName,
+    OUT LPDWORD lpBinaryType
+    );
+#ifdef UNICODE
+#define GetBinaryType  GetBinaryTypeW
+#else
+#define GetBinaryType  GetBinaryTypeA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetShortPathNameA(
+    IN LPCSTR lpszLongPath,
+    OUT LPSTR  lpszShortPath,
+    IN DWORD    cchBuffer
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetShortPathNameW(
+    IN LPCWSTR lpszLongPath,
+    OUT LPWSTR  lpszShortPath,
+    IN DWORD    cchBuffer
+    );
+#ifdef UNICODE
+#define GetShortPathName  GetShortPathNameW
+#else
+#define GetShortPathName  GetShortPathNameA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetLongPathNameA(
+    IN LPCSTR lpszShortPath,
+    OUT LPSTR  lpszLongPath,
+    IN DWORD    cchBuffer
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetLongPathNameW(
+    IN LPCWSTR lpszShortPath,
+    OUT LPWSTR  lpszLongPath,
+    IN DWORD    cchBuffer
+    );
+#ifdef UNICODE
+#define GetLongPathName  GetLongPathNameW
+#else
+#define GetLongPathName  GetLongPathNameA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessAffinityMask(
+    IN HANDLE hProcess,
+    OUT PDWORD_PTR lpProcessAffinityMask,
+    OUT PDWORD_PTR lpSystemAffinityMask
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetProcessAffinityMask(
+    IN HANDLE hProcess,
+    IN DWORD_PTR dwProcessAffinityMask
+    );
+
+#if _WIN32_WINNT >= 0x0501
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessHandleCount(
+    IN HANDLE hProcess,
+    OUT PDWORD pdwHandleCount
+    );
+
+#endif // (_WIN32_WINNT >= 0x0501)
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessTimes(
+    IN HANDLE hProcess,
+    OUT LPFILETIME lpCreationTime,
+    OUT LPFILETIME lpExitTime,
+    OUT LPFILETIME lpKernelTime,
+    OUT LPFILETIME lpUserTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessIoCounters(
+    IN HANDLE hProcess,
+    OUT PIO_COUNTERS lpIoCounters
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessWorkingSetSize(
+    IN HANDLE hProcess,
+    OUT PSIZE_T lpMinimumWorkingSetSize,
+    OUT PSIZE_T lpMaximumWorkingSetSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessWorkingSetSizeEx(
+    IN HANDLE hProcess,
+    OUT PSIZE_T lpMinimumWorkingSetSize,
+    OUT PSIZE_T lpMaximumWorkingSetSize,
+    OUT PDWORD Flags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetProcessWorkingSetSize(
+    IN HANDLE hProcess,
+    IN SIZE_T dwMinimumWorkingSetSize,
+    IN SIZE_T dwMaximumWorkingSetSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetProcessWorkingSetSizeEx(
+    IN HANDLE hProcess,
+    IN SIZE_T dwMinimumWorkingSetSize,
+    IN SIZE_T dwMaximumWorkingSetSize,
+    IN DWORD Flags
+    );
+
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenProcess(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN DWORD dwProcessId
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+GetCurrentProcess(
+    VOID
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetCurrentProcessId(
+    VOID
+    );
+
+WINBASEAPI
+DECLSPEC_NORETURN
+VOID
+WINAPI
+ExitProcess(
+    IN UINT uExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TerminateProcess(
+    IN HANDLE hProcess,
+    IN UINT uExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetExitCodeProcess(
+    IN HANDLE hProcess,
+    OUT LPDWORD lpExitCode
+    );
+
+
+WINBASEAPI
+VOID
+WINAPI
+FatalExit(
+    IN int ExitCode
+    );
+
+WINBASEAPI
+LPSTR
+WINAPI
+GetEnvironmentStrings(
+    VOID
+    );
+
+WINBASEAPI
+LPWSTR
+WINAPI
+GetEnvironmentStringsW(
+    VOID
+    );
+
+#ifdef UNICODE
+#define GetEnvironmentStrings  GetEnvironmentStringsW
+#else
+#define GetEnvironmentStringsA  GetEnvironmentStrings
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetEnvironmentStringsA(
+    IN LPSTR NewEnvironment
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetEnvironmentStringsW(
+    IN LPWSTR NewEnvironment
+    );
+#ifdef UNICODE
+#define SetEnvironmentStrings  SetEnvironmentStringsW
+#else
+#define SetEnvironmentStrings  SetEnvironmentStringsA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FreeEnvironmentStringsA(
+    IN LPSTR
+    );
+WINBASEAPI
+BOOL
+WINAPI
+FreeEnvironmentStringsW(
+    IN LPWSTR
+    );
+#ifdef UNICODE
+#define FreeEnvironmentStrings  FreeEnvironmentStringsW
+#else
+#define FreeEnvironmentStrings  FreeEnvironmentStringsA
+#endif // !UNICODE
+
+WINBASEAPI
+VOID
+WINAPI
+RaiseException(
+    IN DWORD dwExceptionCode,
+    IN DWORD dwExceptionFlags,
+    IN DWORD nNumberOfArguments,
+    IN CONST ULONG_PTR *lpArguments
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+UnhandledExceptionFilter(
+    IN struct _EXCEPTION_POINTERS *ExceptionInfo
+    );
+
+typedef LONG (WINAPI *PTOP_LEVEL_EXCEPTION_FILTER)(
+    struct _EXCEPTION_POINTERS *ExceptionInfo
+    );
+typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
+
+WINBASEAPI
+LPTOP_LEVEL_EXCEPTION_FILTER
+WINAPI
+SetUnhandledExceptionFilter(
+    IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter
+    );
+
+#if(_WIN32_WINNT >= 0x0400)
+
+//
+// Fiber creation flags
+//
+
+#define FIBER_FLAG_FLOAT_SWITCH 0x1     // context switch floating point
+
+WINBASEAPI
+LPVOID
+WINAPI
+CreateFiber(
+    IN SIZE_T dwStackSize,
+    IN LPFIBER_START_ROUTINE lpStartAddress,
+    IN LPVOID lpParameter
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+CreateFiberEx(
+    SIZE_T dwStackCommitSize,
+    SIZE_T dwStackReserveSize,
+    DWORD dwFlags,
+    LPFIBER_START_ROUTINE lpStartAddress,
+    LPVOID lpParameter
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+DeleteFiber(
+    IN LPVOID lpFiber
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+ConvertThreadToFiber(
+    IN LPVOID lpParameter
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+ConvertThreadToFiberEx(
+    IN LPVOID lpParameter,
+    IN DWORD dwFlags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ConvertFiberToThread(
+    VOID
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+SwitchToFiber(
+    IN LPVOID lpFiber
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SwitchToThread(
+    VOID
+    );
+
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateThread(
+    IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    IN SIZE_T dwStackSize,
+    IN LPTHREAD_START_ROUTINE lpStartAddress,
+    IN LPVOID lpParameter,
+    IN DWORD dwCreationFlags,
+    OUT LPDWORD lpThreadId
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateRemoteThread(
+    IN HANDLE hProcess,
+    IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    IN SIZE_T dwStackSize,
+    IN LPTHREAD_START_ROUTINE lpStartAddress,
+    IN LPVOID lpParameter,
+    IN DWORD dwCreationFlags,
+    OUT LPDWORD lpThreadId
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+GetCurrentThread(
+    VOID
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetCurrentThreadId(
+    VOID
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetProcessIdOfThread(
+    HANDLE Thread
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetThreadId(
+    HANDLE Thread
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetProcessId(
+    HANDLE Process
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetCurrentProcessorNumber(
+    VOID
+    );
+
+WINBASEAPI
+DWORD_PTR
+WINAPI
+SetThreadAffinityMask(
+    IN HANDLE hThread,
+    IN DWORD_PTR dwThreadAffinityMask
+    );
+
+#if(_WIN32_WINNT >= 0x0400)
+WINBASEAPI
+DWORD
+WINAPI
+SetThreadIdealProcessor(
+    IN HANDLE hThread,
+    IN DWORD dwIdealProcessor
+    );
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+BOOL
+WINAPI
+SetProcessPriorityBoost(
+    IN HANDLE hProcess,
+    IN BOOL bDisablePriorityBoost
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessPriorityBoost(
+    IN HANDLE hProcess,
+    OUT PBOOL pDisablePriorityBoost
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+RequestWakeupLatency(
+    IN LATENCY_TIME latency
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsSystemResumeAutomatic(
+    VOID
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenThread(
+    DWORD dwDesiredAccess,
+    BOOL bInheritHandle,
+    DWORD dwThreadId
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetThreadPriority(
+    IN HANDLE hThread,
+    IN int nPriority
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetThreadPriorityBoost(
+    IN HANDLE hThread,
+    IN BOOL bDisablePriorityBoost
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetThreadPriorityBoost(
+    IN HANDLE hThread,
+    OUT PBOOL pDisablePriorityBoost
+    );
+
+WINBASEAPI
+int
+WINAPI
+GetThreadPriority(
+    IN HANDLE hThread
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetThreadTimes(
+    IN HANDLE hThread,
+    OUT LPFILETIME lpCreationTime,
+    OUT LPFILETIME lpExitTime,
+    OUT LPFILETIME lpKernelTime,
+    OUT LPFILETIME lpUserTime
+    );
+
+#if _WIN32_WINNT >= 0x0501
+
+WINBASEAPI
+BOOL
+WINAPI
+GetThreadIOPendingFlag(
+    IN HANDLE hThread,
+    OUT PBOOL lpIOIsPending
+    );
+
+#endif // (_WIN32_WINNT >= 0x0501)
+
+WINBASEAPI
+DECLSPEC_NORETURN
+VOID
+WINAPI
+ExitThread(
+    IN DWORD dwExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TerminateThread(
+    IN OUT HANDLE hThread,
+    IN DWORD dwExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetExitCodeThread(
+    IN HANDLE hThread,
+    OUT LPDWORD lpExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetThreadSelectorEntry(
+    IN HANDLE hThread,
+    IN DWORD dwSelector,
+    OUT LPLDT_ENTRY lpSelectorEntry
+    );
+
+WINBASEAPI
+EXECUTION_STATE
+WINAPI
+SetThreadExecutionState(
+    IN EXECUTION_STATE esFlags
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetLastError(
+    VOID
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+SetLastError(
+    IN DWORD dwErrCode
+    );
+
+#if !defined(RC_INVOKED) // RC warns because "WINBASE_DECLARE_RESTORE_LAST_ERROR" is a bit long.
+//#if _WIN32_WINNT >= 0x0501 || defined(WINBASE_DECLARE_RESTORE_LAST_ERROR)
+#if defined(WINBASE_DECLARE_RESTORE_LAST_ERROR)
+
+WINBASEAPI
+VOID
+WINAPI
+RestoreLastError(
+    IN DWORD dwErrCode
+    );
+
+typedef VOID (WINAPI* PRESTORE_LAST_ERROR)(DWORD);
+#define RESTORE_LAST_ERROR_NAME_A      "RestoreLastError"
+#define RESTORE_LAST_ERROR_NAME_W     L"RestoreLastError"
+#define RESTORE_LAST_ERROR_NAME   TEXT("RestoreLastError")
+
+#endif
+#endif
+
+#define HasOverlappedIoCompleted(lpOverlapped) ((lpOverlapped)->Internal != STATUS_PENDING)
+
+WINBASEAPI
+BOOL
+WINAPI
+GetOverlappedResult(
+    IN HANDLE hFile,
+    IN LPOVERLAPPED lpOverlapped,
+    OUT LPDWORD lpNumberOfBytesTransferred,
+    IN BOOL bWait
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateIoCompletionPort(
+    IN HANDLE FileHandle,
+    IN HANDLE ExistingCompletionPort,
+    IN ULONG_PTR CompletionKey,
+    IN DWORD NumberOfConcurrentThreads
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetQueuedCompletionStatus(
+    IN  HANDLE CompletionPort,
+    OUT LPDWORD lpNumberOfBytesTransferred,
+    OUT PULONG_PTR lpCompletionKey,
+    OUT LPOVERLAPPED *lpOverlapped,
+    IN  DWORD dwMilliseconds
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+PostQueuedCompletionStatus(
+    IN HANDLE CompletionPort,
+    IN DWORD dwNumberOfBytesTransferred,
+    IN ULONG_PTR dwCompletionKey,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+#define SEM_FAILCRITICALERRORS      0x0001
+#define SEM_NOGPFAULTERRORBOX       0x0002
+#define SEM_NOALIGNMENTFAULTEXCEPT  0x0004
+#define SEM_NOOPENFILEERRORBOX      0x8000
+
+WINBASEAPI
+UINT
+WINAPI
+SetErrorMode(
+    IN UINT uMode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadProcessMemory(
+    IN HANDLE hProcess,
+    IN LPCVOID lpBaseAddress,
+    OUT LPVOID lpBuffer,
+    IN SIZE_T nSize,
+    OUT SIZE_T * lpNumberOfBytesRead
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteProcessMemory(
+    IN HANDLE hProcess,
+    IN LPVOID lpBaseAddress,
+    IN LPCVOID lpBuffer,
+    IN SIZE_T nSize,
+    OUT SIZE_T * lpNumberOfBytesWritten
+    );
+
+#if !defined(MIDL_PASS)
+WINBASEAPI
+BOOL
+WINAPI
+GetThreadContext(
+    IN HANDLE hThread,
+    IN OUT LPCONTEXT lpContext
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetThreadContext(
+    IN HANDLE hThread,
+    IN CONST CONTEXT *lpContext
+    );
+#endif
+
+WINBASEAPI
+DWORD
+WINAPI
+SuspendThread(
+    IN HANDLE hThread
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+ResumeThread(
+    IN HANDLE hThread
+    );
+
+
+#if(_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+
+typedef
+VOID
+(APIENTRY *PAPCFUNC)(
+    ULONG_PTR dwParam
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+QueueUserAPC(
+    IN PAPCFUNC pfnAPC,
+    IN HANDLE hThread,
+    IN ULONG_PTR dwData
+    );
+
+#endif /* _WIN32_WINNT >= 0x0400 || _WIN32_WINDOWS > 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+WINBASEAPI
+BOOL
+WINAPI
+IsDebuggerPresent(
+    VOID
+    );
+#endif
+
+#if _WIN32_WINNT >= 0x0501
+
+WINBASEAPI
+BOOL
+WINAPI
+CheckRemoteDebuggerPresent(
+    IN HANDLE hProcess,
+    OUT PBOOL pbDebuggerPresent
+    );
+
+#endif // (_WIN32_WINNT >= 0x0501)
+
+WINBASEAPI
+VOID
+WINAPI
+DebugBreak(
+    VOID
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WaitForDebugEvent(
+    IN LPDEBUG_EVENT lpDebugEvent,
+    IN DWORD dwMilliseconds
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ContinueDebugEvent(
+    IN DWORD dwProcessId,
+    IN DWORD dwThreadId,
+    IN DWORD dwContinueStatus
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DebugActiveProcess(
+    IN DWORD dwProcessId
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DebugActiveProcessStop(
+    IN DWORD dwProcessId
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DebugSetProcessKillOnExit(
+    IN BOOL KillOnExit
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DebugBreakProcess (
+    IN HANDLE Process
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+InitializeCriticalSection(
+    OUT LPCRITICAL_SECTION lpCriticalSection
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+EnterCriticalSection(
+    IN OUT LPCRITICAL_SECTION lpCriticalSection
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+LeaveCriticalSection(
+    IN OUT LPCRITICAL_SECTION lpCriticalSection
+    );
+
+#if (_WIN32_WINNT >= 0x0403)
+WINBASEAPI
+BOOL
+WINAPI
+InitializeCriticalSectionAndSpinCount(
+    IN OUT LPCRITICAL_SECTION lpCriticalSection,
+    IN DWORD dwSpinCount
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+SetCriticalSectionSpinCount(
+    IN OUT LPCRITICAL_SECTION lpCriticalSection,
+    IN DWORD dwSpinCount
+    );
+#endif
+
+#if(_WIN32_WINNT >= 0x0400)
+WINBASEAPI
+BOOL
+WINAPI
+TryEnterCriticalSection(
+    IN OUT LPCRITICAL_SECTION lpCriticalSection
+    );
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+VOID
+WINAPI
+DeleteCriticalSection(
+    IN OUT LPCRITICAL_SECTION lpCriticalSection
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetEvent(
+    IN HANDLE hEvent
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ResetEvent(
+    IN HANDLE hEvent
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+PulseEvent(
+    IN HANDLE hEvent
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ReleaseSemaphore(
+    IN HANDLE hSemaphore,
+    IN LONG lReleaseCount,
+    OUT LPLONG lpPreviousCount
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ReleaseMutex(
+    IN HANDLE hMutex
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+WaitForSingleObject(
+    IN HANDLE hHandle,
+    IN DWORD dwMilliseconds
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+WaitForMultipleObjects(
+    IN DWORD nCount,
+    IN CONST HANDLE *lpHandles,
+    IN BOOL bWaitAll,
+    IN DWORD dwMilliseconds
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+Sleep(
+    IN DWORD dwMilliseconds
+    );
+
+WINBASEAPI
+HGLOBAL
+WINAPI
+LoadResource(
+    IN HMODULE hModule,
+    IN HRSRC hResInfo
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+SizeofResource(
+    IN HMODULE hModule,
+    IN HRSRC hResInfo
+    );
+
+
+WINBASEAPI
+ATOM
+WINAPI
+GlobalDeleteAtom(
+    IN ATOM nAtom
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+InitAtomTable(
+    IN DWORD nSize
+    );
+
+WINBASEAPI
+ATOM
+WINAPI
+DeleteAtom(
+    IN ATOM nAtom
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+SetHandleCount(
+    IN UINT uNumber
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetLogicalDrives(
+    VOID
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+LockFile(
+    IN HANDLE hFile,
+    IN DWORD dwFileOffsetLow,
+    IN DWORD dwFileOffsetHigh,
+    IN DWORD nNumberOfBytesToLockLow,
+    IN DWORD nNumberOfBytesToLockHigh
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+UnlockFile(
+    IN HANDLE hFile,
+    IN DWORD dwFileOffsetLow,
+    IN DWORD dwFileOffsetHigh,
+    IN DWORD nNumberOfBytesToUnlockLow,
+    IN DWORD nNumberOfBytesToUnlockHigh
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+LockFileEx(
+    IN HANDLE hFile,
+    IN DWORD dwFlags,
+    IN DWORD dwReserved,
+    IN DWORD nNumberOfBytesToLockLow,
+    IN DWORD nNumberOfBytesToLockHigh,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+#define LOCKFILE_FAIL_IMMEDIATELY   0x00000001
+#define LOCKFILE_EXCLUSIVE_LOCK     0x00000002
+
+WINBASEAPI
+BOOL
+WINAPI
+UnlockFileEx(
+    IN HANDLE hFile,
+    IN DWORD dwReserved,
+    IN DWORD nNumberOfBytesToUnlockLow,
+    IN DWORD nNumberOfBytesToUnlockHigh,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+typedef struct _BY_HANDLE_FILE_INFORMATION {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD dwVolumeSerialNumber;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+    DWORD nNumberOfLinks;
+    DWORD nFileIndexHigh;
+    DWORD nFileIndexLow;
+} BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION;
+
+WINBASEAPI
+BOOL
+WINAPI
+GetFileInformationByHandle(
+    IN HANDLE hFile,
+    OUT LPBY_HANDLE_FILE_INFORMATION lpFileInformation
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetFileType(
+    IN HANDLE hFile
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetFileSize(
+    IN HANDLE hFile,
+    OUT LPDWORD lpFileSizeHigh
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetFileSizeEx(
+    HANDLE hFile,
+    PLARGE_INTEGER lpFileSize
+    );
+
+
+WINBASEAPI
+HANDLE
+WINAPI
+GetStdHandle(
+    IN DWORD nStdHandle
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetStdHandle(
+    IN DWORD nStdHandle,
+    IN HANDLE hHandle
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteFile(
+    IN HANDLE hFile,
+    IN LPCVOID lpBuffer,
+    IN DWORD nNumberOfBytesToWrite,
+    OUT LPDWORD lpNumberOfBytesWritten,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadFile(
+    IN HANDLE hFile,
+    OUT LPVOID lpBuffer,
+    IN DWORD nNumberOfBytesToRead,
+    OUT LPDWORD lpNumberOfBytesRead,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FlushFileBuffers(
+    IN HANDLE hFile
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DeviceIoControl(
+    IN HANDLE hDevice,
+    IN DWORD dwIoControlCode,
+    IN LPVOID lpInBuffer,
+    IN DWORD nInBufferSize,
+    OUT LPVOID lpOutBuffer,
+    IN DWORD nOutBufferSize,
+    OUT LPDWORD lpBytesReturned,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+RequestDeviceWakeup(
+    IN HANDLE hDevice
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+CancelDeviceWakeupRequest(
+    IN HANDLE hDevice
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetDevicePowerState(
+    IN HANDLE hDevice,
+    OUT BOOL *pfOn
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetMessageWaitingIndicator(
+    IN HANDLE hMsgIndicator,
+    IN ULONG ulMsgCount
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetEndOfFile(
+    IN HANDLE hFile
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+SetFilePointer(
+    IN HANDLE hFile,
+    IN LONG lDistanceToMove,
+    IN PLONG lpDistanceToMoveHigh,
+    IN DWORD dwMoveMethod
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetFilePointerEx(
+    HANDLE hFile,
+    LARGE_INTEGER liDistanceToMove,
+    PLARGE_INTEGER lpNewFilePointer,
+    DWORD dwMoveMethod
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FindClose(
+    IN OUT HANDLE hFindFile
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetFileTime(
+    IN HANDLE hFile,
+    OUT LPFILETIME lpCreationTime,
+    OUT LPFILETIME lpLastAccessTime,
+    OUT LPFILETIME lpLastWriteTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetFileTime(
+    IN HANDLE hFile,
+    IN CONST FILETIME *lpCreationTime,
+    IN CONST FILETIME *lpLastAccessTime,
+    IN CONST FILETIME *lpLastWriteTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetFileValidData(
+    IN HANDLE hFile,
+    IN LONGLONG ValidDataLength
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetFileShortNameA(
+    IN HANDLE hFile,
+    IN LPCSTR lpShortName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetFileShortNameW(
+    IN HANDLE hFile,
+    IN LPCWSTR lpShortName
+    );
+#ifdef UNICODE
+#define SetFileShortName  SetFileShortNameW
+#else
+#define SetFileShortName  SetFileShortNameA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CloseHandle(
+    IN OUT HANDLE hObject
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DuplicateHandle(
+    IN HANDLE hSourceProcessHandle,
+    IN HANDLE hSourceHandle,
+    IN HANDLE hTargetProcessHandle,
+    OUT LPHANDLE lpTargetHandle,
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN DWORD dwOptions
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetHandleInformation(
+    IN HANDLE hObject,
+    OUT LPDWORD lpdwFlags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetHandleInformation(
+    IN HANDLE hObject,
+    IN DWORD dwMask,
+    IN DWORD dwFlags
+    );
+
+#define HANDLE_FLAG_INHERIT             0x00000001
+#define HANDLE_FLAG_PROTECT_FROM_CLOSE  0x00000002
+
+#define HINSTANCE_ERROR 32
+
+WINBASEAPI
+DWORD
+WINAPI
+LoadModule(
+    IN LPCSTR lpModuleName,
+    IN LPVOID lpParameterBlock
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+WinExec(
+    IN LPCSTR lpCmdLine,
+    IN UINT uCmdShow
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ClearCommBreak(
+    IN HANDLE hFile
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ClearCommError(
+    IN HANDLE hFile,
+    OUT LPDWORD lpErrors,
+    OUT LPCOMSTAT lpStat
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetupComm(
+    IN HANDLE hFile,
+    IN DWORD dwInQueue,
+    IN DWORD dwOutQueue
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+EscapeCommFunction(
+    IN HANDLE hFile,
+    IN DWORD dwFunc
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCommConfig(
+    IN HANDLE hCommDev,
+    OUT LPCOMMCONFIG lpCC,
+    IN OUT LPDWORD lpdwSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCommMask(
+    IN HANDLE hFile,
+    OUT LPDWORD lpEvtMask
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCommProperties(
+    IN HANDLE hFile,
+    OUT LPCOMMPROP lpCommProp
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCommModemStatus(
+    IN HANDLE hFile,
+    OUT LPDWORD lpModemStat
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCommState(
+    IN HANDLE hFile,
+    OUT LPDCB lpDCB
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCommTimeouts(
+    IN HANDLE hFile,
+    OUT LPCOMMTIMEOUTS lpCommTimeouts
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+PurgeComm(
+    IN HANDLE hFile,
+    IN DWORD dwFlags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCommBreak(
+    IN HANDLE hFile
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCommConfig(
+    IN HANDLE hCommDev,
+    IN LPCOMMCONFIG lpCC,
+    IN DWORD dwSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCommMask(
+    IN HANDLE hFile,
+    IN DWORD dwEvtMask
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCommState(
+    IN HANDLE hFile,
+    IN LPDCB lpDCB
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCommTimeouts(
+    IN HANDLE hFile,
+    IN LPCOMMTIMEOUTS lpCommTimeouts
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TransmitCommChar(
+    IN HANDLE hFile,
+    IN char cChar
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WaitCommEvent(
+    IN HANDLE hFile,
+    OUT LPDWORD lpEvtMask,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+
+WINBASEAPI
+DWORD
+WINAPI
+SetTapePosition(
+    IN HANDLE hDevice,
+    IN DWORD dwPositionMethod,
+    IN DWORD dwPartition,
+    IN DWORD dwOffsetLow,
+    IN DWORD dwOffsetHigh,
+    IN BOOL bImmediate
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTapePosition(
+    IN HANDLE hDevice,
+    IN DWORD dwPositionType,
+    OUT LPDWORD lpdwPartition,
+    OUT LPDWORD lpdwOffsetLow,
+    OUT LPDWORD lpdwOffsetHigh
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+PrepareTape(
+    IN HANDLE hDevice,
+    IN DWORD dwOperation,
+    IN BOOL bImmediate
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+EraseTape(
+    IN HANDLE hDevice,
+    IN DWORD dwEraseType,
+    IN BOOL bImmediate
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+CreateTapePartition(
+    IN HANDLE hDevice,
+    IN DWORD dwPartitionMethod,
+    IN DWORD dwCount,
+    IN DWORD dwSize
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+WriteTapemark(
+    IN HANDLE hDevice,
+    IN DWORD dwTapemarkType,
+    IN DWORD dwTapemarkCount,
+    IN BOOL bImmediate
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTapeStatus(
+    IN HANDLE hDevice
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTapeParameters(
+    IN HANDLE hDevice,
+    IN DWORD dwOperation,
+    OUT LPDWORD lpdwSize,
+    OUT LPVOID lpTapeInformation
+    );
+
+#define GET_TAPE_MEDIA_INFORMATION 0
+#define GET_TAPE_DRIVE_INFORMATION 1
+
+WINBASEAPI
+DWORD
+WINAPI
+SetTapeParameters(
+    IN HANDLE hDevice,
+    IN DWORD dwOperation,
+    IN LPVOID lpTapeInformation
+    );
+
+#define SET_TAPE_MEDIA_INFORMATION 0
+#define SET_TAPE_DRIVE_INFORMATION 1
+
+WINBASEAPI
+BOOL
+WINAPI
+Beep(
+    IN DWORD dwFreq,
+    IN DWORD dwDuration
+    );
+
+WINBASEAPI
+int
+WINAPI
+MulDiv(
+    IN int nNumber,
+    IN int nNumerator,
+    IN int nDenominator
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GetSystemTime(
+    OUT LPSYSTEMTIME lpSystemTime
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GetSystemTimeAsFileTime(
+    OUT LPFILETIME lpSystemTimeAsFileTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetSystemTime(
+    IN CONST SYSTEMTIME *lpSystemTime
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GetLocalTime(
+    OUT LPSYSTEMTIME lpSystemTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetLocalTime(
+    IN CONST SYSTEMTIME *lpSystemTime
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+GetSystemInfo(
+    OUT LPSYSTEM_INFO lpSystemInfo
+    );
+
+#if _WIN32_WINNT >= 0x0501
+
+WINBASEAPI
+BOOL
+WINAPI
+GetSystemRegistryQuota(
+    OUT PDWORD pdwQuotaAllowed,
+    OUT PDWORD pdwQuotaUsed
+    );
+
+BOOL
+WINAPI
+GetSystemTimes(
+    LPFILETIME lpIdleTime,
+    LPFILETIME lpKernelTime,
+    LPFILETIME lpUserTime
+    );
+
+#endif // (_WIN32_WINNT >= 0x0501)
+
+#if _WIN32_WINNT >= 0x0501
+WINBASEAPI
+VOID
+WINAPI
+GetNativeSystemInfo(
+    OUT LPSYSTEM_INFO lpSystemInfo
+    );
+#endif
+
+WINBASEAPI
+BOOL
+WINAPI
+IsProcessorFeaturePresent(
+    IN DWORD ProcessorFeature
+    );
+
+typedef struct _TIME_ZONE_INFORMATION {
+    LONG Bias;
+    WCHAR StandardName[ 32 ];
+    SYSTEMTIME StandardDate;
+    LONG StandardBias;
+    WCHAR DaylightName[ 32 ];
+    SYSTEMTIME DaylightDate;
+    LONG DaylightBias;
+} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION;
+
+WINBASEAPI
+BOOL
+WINAPI
+SystemTimeToTzSpecificLocalTime(
+    IN LPTIME_ZONE_INFORMATION lpTimeZoneInformation,
+    IN LPSYSTEMTIME lpUniversalTime,
+    OUT LPSYSTEMTIME lpLocalTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TzSpecificLocalTimeToSystemTime(
+    IN LPTIME_ZONE_INFORMATION lpTimeZoneInformation,
+    IN LPSYSTEMTIME lpLocalTime,
+    OUT LPSYSTEMTIME lpUniversalTime
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTimeZoneInformation(
+    OUT LPTIME_ZONE_INFORMATION lpTimeZoneInformation
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetTimeZoneInformation(
+    IN CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation
+    );
+
+
+//
+// Routines to convert back and forth between system time and file time
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+SystemTimeToFileTime(
+    IN CONST SYSTEMTIME *lpSystemTime,
+    OUT LPFILETIME lpFileTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FileTimeToLocalFileTime(
+    IN CONST FILETIME *lpFileTime,
+    OUT LPFILETIME lpLocalFileTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+LocalFileTimeToFileTime(
+    IN CONST FILETIME *lpLocalFileTime,
+    OUT LPFILETIME lpFileTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FileTimeToSystemTime(
+    IN CONST FILETIME *lpFileTime,
+    OUT LPSYSTEMTIME lpSystemTime
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+CompareFileTime(
+    IN CONST FILETIME *lpFileTime1,
+    IN CONST FILETIME *lpFileTime2
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FileTimeToDosDateTime(
+    IN CONST FILETIME *lpFileTime,
+    OUT LPWORD lpFatDate,
+    OUT LPWORD lpFatTime
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DosDateTimeToFileTime(
+    IN WORD wFatDate,
+    IN WORD wFatTime,
+    OUT LPFILETIME lpFileTime
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTickCount(
+    VOID
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetSystemTimeAdjustment(
+    IN DWORD dwTimeAdjustment,
+    IN BOOL  bTimeAdjustmentDisabled
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetSystemTimeAdjustment(
+    OUT PDWORD lpTimeAdjustment,
+    OUT PDWORD lpTimeIncrement,
+    OUT PBOOL  lpTimeAdjustmentDisabled
+    );
+
+#if !defined(MIDL_PASS)
+WINBASEAPI
+DWORD
+WINAPI
+FormatMessageA(
+    IN DWORD dwFlags,
+    IN LPCVOID lpSource,
+    IN DWORD dwMessageId,
+    IN DWORD dwLanguageId,
+    OUT LPSTR lpBuffer,
+    IN DWORD nSize,
+    IN va_list *Arguments
+    );
+WINBASEAPI
+DWORD
+WINAPI
+FormatMessageW(
+    IN DWORD dwFlags,
+    IN LPCVOID lpSource,
+    IN DWORD dwMessageId,
+    IN DWORD dwLanguageId,
+    OUT LPWSTR lpBuffer,
+    IN DWORD nSize,
+    IN va_list *Arguments
+    );
+#ifdef UNICODE
+#define FormatMessage  FormatMessageW
+#else
+#define FormatMessage  FormatMessageA
+#endif // !UNICODE
+#endif
+
+#define FORMAT_MESSAGE_ALLOCATE_BUFFER 0x00000100
+#define FORMAT_MESSAGE_IGNORE_INSERTS  0x00000200
+#define FORMAT_MESSAGE_FROM_STRING     0x00000400
+#define FORMAT_MESSAGE_FROM_HMODULE    0x00000800
+#define FORMAT_MESSAGE_FROM_SYSTEM     0x00001000
+#define FORMAT_MESSAGE_ARGUMENT_ARRAY  0x00002000
+#define FORMAT_MESSAGE_MAX_WIDTH_MASK  0x000000FF
+
+
+WINBASEAPI
+BOOL
+WINAPI
+CreatePipe(
+    OUT PHANDLE hReadPipe,
+    OUT PHANDLE hWritePipe,
+    IN LPSECURITY_ATTRIBUTES lpPipeAttributes,
+    IN DWORD nSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ConnectNamedPipe(
+    IN HANDLE hNamedPipe,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DisconnectNamedPipe(
+    IN HANDLE hNamedPipe
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetNamedPipeHandleState(
+    IN HANDLE hNamedPipe,
+    IN LPDWORD lpMode,
+    IN LPDWORD lpMaxCollectionCount,
+    IN LPDWORD lpCollectDataTimeout
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNamedPipeInfo(
+    IN HANDLE hNamedPipe,
+    IN LPDWORD lpFlags,
+    OUT LPDWORD lpOutBufferSize,
+    OUT LPDWORD lpInBufferSize,
+    OUT LPDWORD lpMaxInstances
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+PeekNamedPipe(
+    IN HANDLE hNamedPipe,
+    OUT LPVOID lpBuffer,
+    IN DWORD nBufferSize,
+    OUT LPDWORD lpBytesRead,
+    OUT LPDWORD lpTotalBytesAvail,
+    OUT LPDWORD lpBytesLeftThisMessage
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TransactNamedPipe(
+    IN HANDLE hNamedPipe,
+    IN LPVOID lpInBuffer,
+    IN DWORD nInBufferSize,
+    OUT LPVOID lpOutBuffer,
+    IN DWORD nOutBufferSize,
+    OUT LPDWORD lpBytesRead,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateMailslotA(
+    IN LPCSTR lpName,
+    IN DWORD nMaxMessageSize,
+    IN DWORD lReadTimeout,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateMailslotW(
+    IN LPCWSTR lpName,
+    IN DWORD nMaxMessageSize,
+    IN DWORD lReadTimeout,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+#ifdef UNICODE
+#define CreateMailslot  CreateMailslotW
+#else
+#define CreateMailslot  CreateMailslotA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetMailslotInfo(
+    IN HANDLE hMailslot,
+    IN LPDWORD lpMaxMessageSize,
+    IN LPDWORD lpNextSize,
+    IN LPDWORD lpMessageCount,
+    IN LPDWORD lpReadTimeout
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetMailslotInfo(
+    IN HANDLE hMailslot,
+    IN DWORD lReadTimeout
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+MapViewOfFile(
+    IN HANDLE hFileMappingObject,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwFileOffsetHigh,
+    IN DWORD dwFileOffsetLow,
+    IN SIZE_T dwNumberOfBytesToMap
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FlushViewOfFile(
+    IN LPCVOID lpBaseAddress,
+    IN SIZE_T dwNumberOfBytesToFlush
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+UnmapViewOfFile(
+    IN LPCVOID lpBaseAddress
+    );
+
+//
+// File Encryption API
+//
+
+WINADVAPI
+BOOL
+WINAPI
+EncryptFileA(
+    IN LPCSTR lpFileName
+    );
+WINADVAPI
+BOOL
+WINAPI
+EncryptFileW(
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define EncryptFile  EncryptFileW
+#else
+#define EncryptFile  EncryptFileA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+DecryptFileA(
+    IN LPCSTR lpFileName,
+    IN DWORD    dwReserved
+    );
+WINADVAPI
+BOOL
+WINAPI
+DecryptFileW(
+    IN LPCWSTR lpFileName,
+    IN DWORD    dwReserved
+    );
+#ifdef UNICODE
+#define DecryptFile  DecryptFileW
+#else
+#define DecryptFile  DecryptFileA
+#endif // !UNICODE
+
+//
+//  Encryption Status Value
+//
+
+#define FILE_ENCRYPTABLE                0
+#define FILE_IS_ENCRYPTED               1
+#define FILE_SYSTEM_ATTR                2
+#define FILE_ROOT_DIR                   3
+#define FILE_SYSTEM_DIR                 4
+#define FILE_UNKNOWN                    5
+#define FILE_SYSTEM_NOT_SUPPORT         6
+#define FILE_USER_DISALLOWED            7
+#define FILE_READ_ONLY                  8
+#define FILE_DIR_DISALLOWED             9
+
+WINADVAPI
+BOOL
+WINAPI
+FileEncryptionStatusA(
+    LPCSTR lpFileName,
+    LPDWORD  lpStatus
+    );
+WINADVAPI
+BOOL
+WINAPI
+FileEncryptionStatusW(
+    LPCWSTR lpFileName,
+    LPDWORD  lpStatus
+    );
+#ifdef UNICODE
+#define FileEncryptionStatus  FileEncryptionStatusW
+#else
+#define FileEncryptionStatus  FileEncryptionStatusA
+#endif // !UNICODE
+
+//
+// Currently defined recovery flags
+//
+
+#define EFS_USE_RECOVERY_KEYS  (0x1)
+
+typedef
+DWORD
+(WINAPI *PFE_EXPORT_FUNC)(
+    PBYTE pbData,
+    PVOID pvCallbackContext,
+    ULONG ulLength
+    );
+
+typedef
+DWORD
+(WINAPI *PFE_IMPORT_FUNC)(
+    PBYTE pbData,
+    PVOID pvCallbackContext,
+    PULONG ulLength
+    );
+
+
+//
+//  OpenRaw flag values
+//
+
+#define CREATE_FOR_IMPORT  (1)
+#define CREATE_FOR_DIR     (2)
+#define OVERWRITE_HIDDEN   (4)
+
+
+WINADVAPI
+DWORD
+WINAPI
+OpenEncryptedFileRawA(
+    IN LPCSTR        lpFileName,
+    IN ULONG           ulFlags,
+    IN PVOID *         pvContext
+    );
+WINADVAPI
+DWORD
+WINAPI
+OpenEncryptedFileRawW(
+    IN LPCWSTR        lpFileName,
+    IN ULONG           ulFlags,
+    IN PVOID *         pvContext
+    );
+#ifdef UNICODE
+#define OpenEncryptedFileRaw  OpenEncryptedFileRawW
+#else
+#define OpenEncryptedFileRaw  OpenEncryptedFileRawA
+#endif // !UNICODE
+
+WINADVAPI
+DWORD
+WINAPI
+ReadEncryptedFileRaw(
+    IN PFE_EXPORT_FUNC pfExportCallback,
+    IN PVOID           pvCallbackContext,
+    IN PVOID           pvContext
+    );
+
+WINADVAPI
+DWORD
+WINAPI
+WriteEncryptedFileRaw(
+    IN PFE_IMPORT_FUNC pfImportCallback,
+    IN PVOID           pvCallbackContext,
+    IN PVOID           pvContext
+    );
+
+WINADVAPI
+VOID
+WINAPI
+CloseEncryptedFileRaw(
+    IN PVOID           pvContext
+    );
+
+//
+// _l Compat Functions
+//
+
+WINBASEAPI
+int
+WINAPI
+lstrcmpA(
+    IN LPCSTR lpString1,
+    IN LPCSTR lpString2
+    );
+WINBASEAPI
+int
+WINAPI
+lstrcmpW(
+    IN LPCWSTR lpString1,
+    IN LPCWSTR lpString2
+    );
+#ifdef UNICODE
+#define lstrcmp  lstrcmpW
+#else
+#define lstrcmp  lstrcmpA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+lstrcmpiA(
+    IN LPCSTR lpString1,
+    IN LPCSTR lpString2
+    );
+WINBASEAPI
+int
+WINAPI
+lstrcmpiW(
+    IN LPCWSTR lpString1,
+    IN LPCWSTR lpString2
+    );
+#ifdef UNICODE
+#define lstrcmpi  lstrcmpiW
+#else
+#define lstrcmpi  lstrcmpiA
+#endif // !UNICODE
+
+WINBASEAPI
+LPSTR
+WINAPI
+lstrcpynA(
+    OUT LPSTR lpString1,
+    IN LPCSTR lpString2,
+    IN int iMaxLength
+    );
+WINBASEAPI
+LPWSTR
+WINAPI
+lstrcpynW(
+    OUT LPWSTR lpString1,
+    IN LPCWSTR lpString2,
+    IN int iMaxLength
+    );
+#ifdef UNICODE
+#define lstrcpyn  lstrcpynW
+#else
+#define lstrcpyn  lstrcpynA
+#endif // !UNICODE
+
+WINBASEAPI
+LPSTR
+WINAPI
+lstrcpyA(
+    OUT LPSTR lpString1,
+    IN LPCSTR lpString2
+    );
+WINBASEAPI
+LPWSTR
+WINAPI
+lstrcpyW(
+    OUT LPWSTR lpString1,
+    IN LPCWSTR lpString2
+    );
+#ifdef UNICODE
+#define lstrcpy  lstrcpyW
+#else
+#define lstrcpy  lstrcpyA
+#endif // !UNICODE
+
+WINBASEAPI
+LPSTR
+WINAPI
+lstrcatA(
+    IN OUT LPSTR lpString1,
+    IN LPCSTR lpString2
+    );
+WINBASEAPI
+LPWSTR
+WINAPI
+lstrcatW(
+    IN OUT LPWSTR lpString1,
+    IN LPCWSTR lpString2
+    );
+#ifdef UNICODE
+#define lstrcat  lstrcatW
+#else
+#define lstrcat  lstrcatA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+lstrlenA(
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+int
+WINAPI
+lstrlenW(
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define lstrlen  lstrlenW
+#else
+#define lstrlen  lstrlenA
+#endif // !UNICODE
+
+WINBASEAPI
+HFILE
+WINAPI
+OpenFile(
+    IN LPCSTR lpFileName,
+    OUT LPOFSTRUCT lpReOpenBuff,
+    IN UINT uStyle
+    );
+
+WINBASEAPI
+HFILE
+WINAPI
+_lopen(
+    IN LPCSTR lpPathName,
+    IN int iReadWrite
+    );
+
+WINBASEAPI
+HFILE
+WINAPI
+_lcreat(
+    IN LPCSTR lpPathName,
+    IN int  iAttribute
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+_lread(
+    IN HFILE hFile,
+    OUT LPVOID lpBuffer,
+    IN UINT uBytes
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+_lwrite(
+    IN HFILE hFile,
+    IN LPCSTR lpBuffer,
+    IN UINT uBytes
+    );
+
+WINBASEAPI
+long
+WINAPI
+_hread(
+    IN HFILE hFile,
+    OUT LPVOID lpBuffer,
+    IN long lBytes
+    );
+
+WINBASEAPI
+long
+WINAPI
+_hwrite(
+    IN HFILE hFile,
+    IN LPCSTR lpBuffer,
+    IN long lBytes
+    );
+
+WINBASEAPI
+HFILE
+WINAPI
+_lclose(
+    IN OUT HFILE hFile
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+_llseek(
+    IN HFILE hFile,
+    IN LONG lOffset,
+    IN int iOrigin
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+IsTextUnicode(
+    IN CONST VOID* lpBuffer,
+    IN int cb,
+    IN OUT LPINT lpi
+    );
+
+typedef
+VOID
+(WINAPI *PFLS_CALLBACK_FUNCTION) (
+    IN PVOID lpFlsData
+    );
+
+#define FLS_OUT_OF_INDEXES ((DWORD)0xFFFFFFFF)
+
+WINBASEAPI
+DWORD
+WINAPI
+FlsAlloc(
+    IN PFLS_CALLBACK_FUNCTION lpCallback OPTIONAL
+    );
+
+WINBASEAPI
+PVOID
+WINAPI
+FlsGetValue(
+    IN DWORD dwFlsIndex
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FlsSetValue(
+    IN DWORD dwFlsIndex,
+    IN PVOID lpFlsData
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FlsFree(
+    IN DWORD dwFlsIndex
+    );
+
+#define TLS_OUT_OF_INDEXES ((DWORD)0xFFFFFFFF)
+
+WINBASEAPI
+DWORD
+WINAPI
+TlsAlloc(
+    VOID
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+TlsGetValue(
+    IN DWORD dwTlsIndex
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TlsSetValue(
+    IN DWORD dwTlsIndex,
+    IN LPVOID lpTlsValue
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TlsFree(
+    IN DWORD dwTlsIndex
+    );
+
+typedef
+VOID
+(WINAPI *LPOVERLAPPED_COMPLETION_ROUTINE)(
+    DWORD dwErrorCode,
+    DWORD dwNumberOfBytesTransfered,
+    LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+SleepEx(
+    IN DWORD dwMilliseconds,
+    IN BOOL bAlertable
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+WaitForSingleObjectEx(
+    IN HANDLE hHandle,
+    IN DWORD dwMilliseconds,
+    IN BOOL bAlertable
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+WaitForMultipleObjectsEx(
+    IN DWORD nCount,
+    IN CONST HANDLE *lpHandles,
+    IN BOOL bWaitAll,
+    IN DWORD dwMilliseconds,
+    IN BOOL bAlertable
+    );
+
+#if(_WIN32_WINNT >= 0x0400)
+WINBASEAPI
+DWORD
+WINAPI
+SignalObjectAndWait(
+    IN HANDLE hObjectToSignal,
+    IN HANDLE hObjectToWaitOn,
+    IN DWORD dwMilliseconds,
+    IN BOOL bAlertable
+    );
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadFileEx(
+    IN HANDLE hFile,
+    OUT LPVOID lpBuffer,
+    IN DWORD nNumberOfBytesToRead,
+    IN LPOVERLAPPED lpOverlapped,
+    IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteFileEx(
+    IN HANDLE hFile,
+    IN LPCVOID lpBuffer,
+    IN DWORD nNumberOfBytesToWrite,
+    IN LPOVERLAPPED lpOverlapped,
+    IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+BackupRead(
+    IN HANDLE hFile,
+    OUT LPBYTE lpBuffer,
+    IN DWORD nNumberOfBytesToRead,
+    OUT LPDWORD lpNumberOfBytesRead,
+    IN BOOL bAbort,
+    IN BOOL bProcessSecurity,
+    OUT LPVOID *lpContext
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+BackupSeek(
+    IN HANDLE hFile,
+    IN DWORD  dwLowBytesToSeek,
+    IN DWORD  dwHighBytesToSeek,
+    OUT LPDWORD lpdwLowByteSeeked,
+    OUT LPDWORD lpdwHighByteSeeked,
+    IN LPVOID *lpContext
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+BackupWrite(
+    IN HANDLE hFile,
+    IN LPBYTE lpBuffer,
+    IN DWORD nNumberOfBytesToWrite,
+    OUT LPDWORD lpNumberOfBytesWritten,
+    IN BOOL bAbort,
+    IN BOOL bProcessSecurity,
+    OUT LPVOID *lpContext
+    );
+
+//
+//  Stream id structure
+//
+typedef struct _WIN32_STREAM_ID {
+        DWORD          dwStreamId ;
+        DWORD          dwStreamAttributes ;
+        LARGE_INTEGER  Size ;
+        DWORD          dwStreamNameSize ;
+        WCHAR          cStreamName[ ANYSIZE_ARRAY ] ;
+} WIN32_STREAM_ID, *LPWIN32_STREAM_ID ;
+
+//
+//  Stream Ids
+//
+
+#define BACKUP_INVALID          0x00000000
+#define BACKUP_DATA             0x00000001
+#define BACKUP_EA_DATA          0x00000002
+#define BACKUP_SECURITY_DATA    0x00000003
+#define BACKUP_ALTERNATE_DATA   0x00000004
+#define BACKUP_LINK             0x00000005
+#define BACKUP_PROPERTY_DATA    0x00000006
+#define BACKUP_OBJECT_ID        0x00000007
+#define BACKUP_REPARSE_DATA     0x00000008
+#define BACKUP_SPARSE_BLOCK     0x00000009
+
+
+//
+//  Stream Attributes
+//
+
+#define STREAM_NORMAL_ATTRIBUTE         0x00000000
+#define STREAM_MODIFIED_WHEN_READ       0x00000001
+#define STREAM_CONTAINS_SECURITY        0x00000002
+#define STREAM_CONTAINS_PROPERTIES      0x00000004
+#define STREAM_SPARSE_ATTRIBUTE         0x00000008
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadFileScatter(
+    IN HANDLE hFile,
+    IN FILE_SEGMENT_ELEMENT aSegmentArray[],
+    IN DWORD nNumberOfBytesToRead,
+    IN LPDWORD lpReserved,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteFileGather(
+    IN HANDLE hFile,
+    OUT FILE_SEGMENT_ELEMENT aSegmentArray[],
+    IN DWORD nNumberOfBytesToWrite,
+    IN LPDWORD lpReserved,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+//
+// Dual Mode API below this line. Dual Mode Structures also included.
+//
+
+#define STARTF_USESHOWWINDOW    0x00000001
+#define STARTF_USESIZE          0x00000002
+#define STARTF_USEPOSITION      0x00000004
+#define STARTF_USECOUNTCHARS    0x00000008
+#define STARTF_USEFILLATTRIBUTE 0x00000010
+#define STARTF_RUNFULLSCREEN    0x00000020  // ignored for non-x86 platforms
+#define STARTF_FORCEONFEEDBACK  0x00000040
+#define STARTF_FORCEOFFFEEDBACK 0x00000080
+#define STARTF_USESTDHANDLES    0x00000100
+
+#if(WINVER >= 0x0400)
+
+#define STARTF_USEHOTKEY        0x00000200
+#endif /* WINVER >= 0x0400 */
+
+typedef struct _STARTUPINFOA {
+    DWORD   cb;
+    LPSTR   lpReserved;
+    LPSTR   lpDesktop;
+    LPSTR   lpTitle;
+    DWORD   dwX;
+    DWORD   dwY;
+    DWORD   dwXSize;
+    DWORD   dwYSize;
+    DWORD   dwXCountChars;
+    DWORD   dwYCountChars;
+    DWORD   dwFillAttribute;
+    DWORD   dwFlags;
+    WORD    wShowWindow;
+    WORD    cbReserved2;
+    LPBYTE  lpReserved2;
+    HANDLE  hStdInput;
+    HANDLE  hStdOutput;
+    HANDLE  hStdError;
+} STARTUPINFOA, *LPSTARTUPINFOA;
+typedef struct _STARTUPINFOW {
+    DWORD   cb;
+    LPWSTR  lpReserved;
+    LPWSTR  lpDesktop;
+    LPWSTR  lpTitle;
+    DWORD   dwX;
+    DWORD   dwY;
+    DWORD   dwXSize;
+    DWORD   dwYSize;
+    DWORD   dwXCountChars;
+    DWORD   dwYCountChars;
+    DWORD   dwFillAttribute;
+    DWORD   dwFlags;
+    WORD    wShowWindow;
+    WORD    cbReserved2;
+    LPBYTE  lpReserved2;
+    HANDLE  hStdInput;
+    HANDLE  hStdOutput;
+    HANDLE  hStdError;
+} STARTUPINFOW, *LPSTARTUPINFOW;
+#ifdef UNICODE
+typedef STARTUPINFOW STARTUPINFO;
+typedef LPSTARTUPINFOW LPSTARTUPINFO;
+#else
+typedef STARTUPINFOA STARTUPINFO;
+typedef LPSTARTUPINFOA LPSTARTUPINFO;
+#endif // UNICODE
+
+#define SHUTDOWN_NORETRY                0x00000001
+
+typedef struct _WIN32_FIND_DATAA {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+    DWORD dwReserved0;
+    DWORD dwReserved1;
+    CHAR   cFileName[ MAX_PATH ];
+    CHAR   cAlternateFileName[ 14 ];
+#ifdef _MAC
+    DWORD dwFileType;
+    DWORD dwCreatorType;
+    WORD  wFinderFlags;
+#endif
+} WIN32_FIND_DATAA, *PWIN32_FIND_DATAA, *LPWIN32_FIND_DATAA;
+typedef struct _WIN32_FIND_DATAW {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+    DWORD dwReserved0;
+    DWORD dwReserved1;
+    WCHAR  cFileName[ MAX_PATH ];
+    WCHAR  cAlternateFileName[ 14 ];
+#ifdef _MAC
+    DWORD dwFileType;
+    DWORD dwCreatorType;
+    WORD  wFinderFlags;
+#endif
+} WIN32_FIND_DATAW, *PWIN32_FIND_DATAW, *LPWIN32_FIND_DATAW;
+#ifdef UNICODE
+typedef WIN32_FIND_DATAW WIN32_FIND_DATA;
+typedef PWIN32_FIND_DATAW PWIN32_FIND_DATA;
+typedef LPWIN32_FIND_DATAW LPWIN32_FIND_DATA;
+#else
+typedef WIN32_FIND_DATAA WIN32_FIND_DATA;
+typedef PWIN32_FIND_DATAA PWIN32_FIND_DATA;
+typedef LPWIN32_FIND_DATAA LPWIN32_FIND_DATA;
+#endif // UNICODE
+
+typedef struct _WIN32_FILE_ATTRIBUTE_DATA {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+} WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA;
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateMutexA(
+    IN LPSECURITY_ATTRIBUTES lpMutexAttributes,
+    IN BOOL bInitialOwner,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateMutexW(
+    IN LPSECURITY_ATTRIBUTES lpMutexAttributes,
+    IN BOOL bInitialOwner,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define CreateMutex  CreateMutexW
+#else
+#define CreateMutex  CreateMutexA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenMutexA(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+OpenMutexW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define OpenMutex  OpenMutexW
+#else
+#define OpenMutex  OpenMutexA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateEventA(
+    IN LPSECURITY_ATTRIBUTES lpEventAttributes,
+    IN BOOL bManualReset,
+    IN BOOL bInitialState,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateEventW(
+    IN LPSECURITY_ATTRIBUTES lpEventAttributes,
+    IN BOOL bManualReset,
+    IN BOOL bInitialState,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define CreateEvent  CreateEventW
+#else
+#define CreateEvent  CreateEventA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenEventA(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+OpenEventW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define OpenEvent  OpenEventW
+#else
+#define OpenEvent  OpenEventA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateSemaphoreA(
+    IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes,
+    IN LONG lInitialCount,
+    IN LONG lMaximumCount,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateSemaphoreW(
+    IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes,
+    IN LONG lInitialCount,
+    IN LONG lMaximumCount,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define CreateSemaphore  CreateSemaphoreW
+#else
+#define CreateSemaphore  CreateSemaphoreA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenSemaphoreA(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+OpenSemaphoreW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define OpenSemaphore  OpenSemaphoreW
+#else
+#define OpenSemaphore  OpenSemaphoreA
+#endif // !UNICODE
+
+#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+typedef
+VOID
+(APIENTRY *PTIMERAPCROUTINE)(
+    LPVOID lpArgToCompletionRoutine,
+    DWORD dwTimerLowValue,
+    DWORD dwTimerHighValue
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateWaitableTimerA(
+    IN LPSECURITY_ATTRIBUTES lpTimerAttributes,
+    IN BOOL bManualReset,
+    IN LPCSTR lpTimerName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateWaitableTimerW(
+    IN LPSECURITY_ATTRIBUTES lpTimerAttributes,
+    IN BOOL bManualReset,
+    IN LPCWSTR lpTimerName
+    );
+#ifdef UNICODE
+#define CreateWaitableTimer  CreateWaitableTimerW
+#else
+#define CreateWaitableTimer  CreateWaitableTimerA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenWaitableTimerA(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCSTR lpTimerName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+OpenWaitableTimerW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpTimerName
+    );
+#ifdef UNICODE
+#define OpenWaitableTimer  OpenWaitableTimerW
+#else
+#define OpenWaitableTimer  OpenWaitableTimerA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetWaitableTimer(
+    IN HANDLE hTimer,
+    IN const LARGE_INTEGER *lpDueTime,
+    IN LONG lPeriod,
+    IN PTIMERAPCROUTINE pfnCompletionRoutine,
+    IN LPVOID lpArgToCompletionRoutine,
+    IN BOOL fResume
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+CancelWaitableTimer(
+    IN HANDLE hTimer
+    );
+#endif /* (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) */
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateFileMappingA(
+    IN HANDLE hFile,
+    IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
+    IN DWORD flProtect,
+    IN DWORD dwMaximumSizeHigh,
+    IN DWORD dwMaximumSizeLow,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateFileMappingW(
+    IN HANDLE hFile,
+    IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
+    IN DWORD flProtect,
+    IN DWORD dwMaximumSizeHigh,
+    IN DWORD dwMaximumSizeLow,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define CreateFileMapping  CreateFileMappingW
+#else
+#define CreateFileMapping  CreateFileMappingA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenFileMappingA(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+OpenFileMappingW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define OpenFileMapping  OpenFileMappingW
+#else
+#define OpenFileMapping  OpenFileMappingA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetLogicalDriveStringsA(
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetLogicalDriveStringsW(
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer
+    );
+#ifdef UNICODE
+#define GetLogicalDriveStrings  GetLogicalDriveStringsW
+#else
+#define GetLogicalDriveStrings  GetLogicalDriveStringsA
+#endif // !UNICODE
+
+#if _WIN32_WINNT >= 0x0501
+
+typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE {
+    LowMemoryResourceNotification,
+    HighMemoryResourceNotification
+} MEMORY_RESOURCE_NOTIFICATION_TYPE;
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateMemoryResourceNotification(
+    IN MEMORY_RESOURCE_NOTIFICATION_TYPE NotificationType
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+QueryMemoryResourceNotification(
+    IN  HANDLE ResourceNotificationHandle,
+    OUT PBOOL  ResourceState
+    );
+
+#endif // _WIN32_WINNT >= 0x0501
+
+
+WINBASEAPI
+HMODULE
+WINAPI
+LoadLibraryA(
+    IN LPCSTR lpLibFileName
+    );
+WINBASEAPI
+HMODULE
+WINAPI
+LoadLibraryW(
+    IN LPCWSTR lpLibFileName
+    );
+#ifdef UNICODE
+#define LoadLibrary  LoadLibraryW
+#else
+#define LoadLibrary  LoadLibraryA
+#endif // !UNICODE
+
+WINBASEAPI
+HMODULE
+WINAPI
+LoadLibraryExA(
+    IN LPCSTR lpLibFileName,
+    IN HANDLE hFile,
+    IN DWORD dwFlags
+    );
+WINBASEAPI
+HMODULE
+WINAPI
+LoadLibraryExW(
+    IN LPCWSTR lpLibFileName,
+    IN HANDLE hFile,
+    IN DWORD dwFlags
+    );
+#ifdef UNICODE
+#define LoadLibraryEx  LoadLibraryExW
+#else
+#define LoadLibraryEx  LoadLibraryExA
+#endif // !UNICODE
+
+
+#define DONT_RESOLVE_DLL_REFERENCES   0x00000001
+#define LOAD_LIBRARY_AS_DATAFILE      0x00000002
+#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008
+#define LOAD_IGNORE_CODE_AUTHZ_LEVEL  0x00000010
+
+
+WINBASEAPI
+DWORD
+WINAPI
+GetModuleFileNameA(
+    IN HMODULE hModule,
+    OUT LPSTR lpFilename,
+    IN DWORD nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetModuleFileNameW(
+    IN HMODULE hModule,
+    OUT LPWSTR lpFilename,
+    IN DWORD nSize
+    );
+#ifdef UNICODE
+#define GetModuleFileName  GetModuleFileNameW
+#else
+#define GetModuleFileName  GetModuleFileNameA
+#endif // !UNICODE
+
+WINBASEAPI
+HMODULE
+WINAPI
+GetModuleHandleA(
+    IN LPCSTR lpModuleName
+    );
+WINBASEAPI
+HMODULE
+WINAPI
+GetModuleHandleW(
+    IN LPCWSTR lpModuleName
+    );
+#ifdef UNICODE
+#define GetModuleHandle  GetModuleHandleW
+#else
+#define GetModuleHandle  GetModuleHandleA
+#endif // !UNICODE
+
+#if !defined(RC_INVOKED)
+#if _WIN32_WINNT > 0x0500 || defined(WINBASE_DECLARE_GET_MODULE_HANDLE_EX) || ISOLATION_AWARE_ENABLED
+
+#define GET_MODULE_HANDLE_EX_FLAG_PIN                 (0x00000001)
+#define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT  (0x00000002)
+#define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS        (0x00000004)
+
+typedef
+BOOL
+(WINAPI*
+PGET_MODULE_HANDLE_EXA)(
+    IN DWORD        dwFlags,
+    IN LPCSTR     lpModuleName,
+    OUT HMODULE*    phModule
+    );
+typedef
+BOOL
+(WINAPI*
+PGET_MODULE_HANDLE_EXW)(
+    IN DWORD        dwFlags,
+    IN LPCWSTR     lpModuleName,
+    OUT HMODULE*    phModule
+    );
+#ifdef UNICODE
+#define PGET_MODULE_HANDLE_EX  PGET_MODULE_HANDLE_EXW
+#else
+#define PGET_MODULE_HANDLE_EX  PGET_MODULE_HANDLE_EXA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetModuleHandleExA(
+    IN DWORD        dwFlags,
+    IN LPCSTR     lpModuleName,
+    OUT HMODULE*    phModule
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetModuleHandleExW(
+    IN DWORD        dwFlags,
+    IN LPCWSTR     lpModuleName,
+    OUT HMODULE*    phModule
+    );
+#ifdef UNICODE
+#define GetModuleHandleEx  GetModuleHandleExW
+#else
+#define GetModuleHandleEx  GetModuleHandleExA
+#endif // !UNICODE
+
+#endif
+#endif
+
+WINBASEAPI
+BOOL
+WINAPI
+CreateProcessA(
+    IN LPCSTR lpApplicationName,
+    IN LPSTR lpCommandLine,
+    IN LPSECURITY_ATTRIBUTES lpProcessAttributes,
+    IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    IN BOOL bInheritHandles,
+    IN DWORD dwCreationFlags,
+    IN LPVOID lpEnvironment,
+    IN LPCSTR lpCurrentDirectory,
+    IN LPSTARTUPINFOA lpStartupInfo,
+    OUT LPPROCESS_INFORMATION lpProcessInformation
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CreateProcessW(
+    IN LPCWSTR lpApplicationName,
+    IN LPWSTR lpCommandLine,
+    IN LPSECURITY_ATTRIBUTES lpProcessAttributes,
+    IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    IN BOOL bInheritHandles,
+    IN DWORD dwCreationFlags,
+    IN LPVOID lpEnvironment,
+    IN LPCWSTR lpCurrentDirectory,
+    IN LPSTARTUPINFOW lpStartupInfo,
+    OUT LPPROCESS_INFORMATION lpProcessInformation
+    );
+#ifdef UNICODE
+#define CreateProcess  CreateProcessW
+#else
+#define CreateProcess  CreateProcessA
+#endif // !UNICODE
+
+
+
+WINBASEAPI
+BOOL
+WINAPI
+SetProcessShutdownParameters(
+    IN DWORD dwLevel,
+    IN DWORD dwFlags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetProcessShutdownParameters(
+    OUT LPDWORD lpdwLevel,
+    OUT LPDWORD lpdwFlags
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetProcessVersion(
+    IN DWORD ProcessId
+    );
+
+WINBASEAPI
+VOID
+WINAPI
+FatalAppExitA(
+    IN UINT uAction,
+    IN LPCSTR lpMessageText
+    );
+WINBASEAPI
+VOID
+WINAPI
+FatalAppExitW(
+    IN UINT uAction,
+    IN LPCWSTR lpMessageText
+    );
+#ifdef UNICODE
+#define FatalAppExit  FatalAppExitW
+#else
+#define FatalAppExit  FatalAppExitA
+#endif // !UNICODE
+
+WINBASEAPI
+VOID
+WINAPI
+GetStartupInfoA(
+    OUT LPSTARTUPINFOA lpStartupInfo
+    );
+WINBASEAPI
+VOID
+WINAPI
+GetStartupInfoW(
+    OUT LPSTARTUPINFOW lpStartupInfo
+    );
+#ifdef UNICODE
+#define GetStartupInfo  GetStartupInfoW
+#else
+#define GetStartupInfo  GetStartupInfoA
+#endif // !UNICODE
+
+WINBASEAPI
+LPSTR
+WINAPI
+GetCommandLineA(
+    VOID
+    );
+WINBASEAPI
+LPWSTR
+WINAPI
+GetCommandLineW(
+    VOID
+    );
+#ifdef UNICODE
+#define GetCommandLine  GetCommandLineW
+#else
+#define GetCommandLine  GetCommandLineA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetEnvironmentVariableA(
+    IN LPCSTR lpName,
+    OUT LPSTR lpBuffer,
+    IN DWORD nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetEnvironmentVariableW(
+    IN LPCWSTR lpName,
+    OUT LPWSTR lpBuffer,
+    IN DWORD nSize
+    );
+#ifdef UNICODE
+#define GetEnvironmentVariable  GetEnvironmentVariableW
+#else
+#define GetEnvironmentVariable  GetEnvironmentVariableA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetEnvironmentVariableA(
+    IN LPCSTR lpName,
+    IN LPCSTR lpValue
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetEnvironmentVariableW(
+    IN LPCWSTR lpName,
+    IN LPCWSTR lpValue
+    );
+#ifdef UNICODE
+#define SetEnvironmentVariable  SetEnvironmentVariableW
+#else
+#define SetEnvironmentVariable  SetEnvironmentVariableA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+ExpandEnvironmentStringsA(
+    IN LPCSTR lpSrc,
+    OUT LPSTR lpDst,
+    IN DWORD nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+ExpandEnvironmentStringsW(
+    IN LPCWSTR lpSrc,
+    OUT LPWSTR lpDst,
+    IN DWORD nSize
+    );
+#ifdef UNICODE
+#define ExpandEnvironmentStrings  ExpandEnvironmentStringsW
+#else
+#define ExpandEnvironmentStrings  ExpandEnvironmentStringsA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetFirmwareEnvironmentVariableA(
+    IN LPCSTR lpName,
+    IN LPCSTR lpGuid,
+    OUT PVOID   pBuffer,
+    IN DWORD    nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetFirmwareEnvironmentVariableW(
+    IN LPCWSTR lpName,
+    IN LPCWSTR lpGuid,
+    OUT PVOID   pBuffer,
+    IN DWORD    nSize
+    );
+#ifdef UNICODE
+#define GetFirmwareEnvironmentVariable  GetFirmwareEnvironmentVariableW
+#else
+#define GetFirmwareEnvironmentVariable  GetFirmwareEnvironmentVariableA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetFirmwareEnvironmentVariableA(
+    IN LPCSTR lpName,
+    IN LPCSTR lpGuid,
+    IN PVOID    pValue,
+    IN DWORD    nSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetFirmwareEnvironmentVariableW(
+    IN LPCWSTR lpName,
+    IN LPCWSTR lpGuid,
+    IN PVOID    pValue,
+    IN DWORD    nSize
+    );
+#ifdef UNICODE
+#define SetFirmwareEnvironmentVariable  SetFirmwareEnvironmentVariableW
+#else
+#define SetFirmwareEnvironmentVariable  SetFirmwareEnvironmentVariableA
+#endif // !UNICODE
+
+
+WINBASEAPI
+VOID
+WINAPI
+OutputDebugStringA(
+    IN LPCSTR lpOutputString
+    );
+WINBASEAPI
+VOID
+WINAPI
+OutputDebugStringW(
+    IN LPCWSTR lpOutputString
+    );
+#ifdef UNICODE
+#define OutputDebugString  OutputDebugStringW
+#else
+#define OutputDebugString  OutputDebugStringA
+#endif // !UNICODE
+
+WINBASEAPI
+HRSRC
+WINAPI
+FindResourceA(
+    IN HMODULE hModule,
+    IN LPCSTR lpName,
+    IN LPCSTR lpType
+    );
+WINBASEAPI
+HRSRC
+WINAPI
+FindResourceW(
+    IN HMODULE hModule,
+    IN LPCWSTR lpName,
+    IN LPCWSTR lpType
+    );
+#ifdef UNICODE
+#define FindResource  FindResourceW
+#else
+#define FindResource  FindResourceA
+#endif // !UNICODE
+
+WINBASEAPI
+HRSRC
+WINAPI
+FindResourceExA(
+    IN HMODULE hModule,
+    IN LPCSTR lpType,
+    IN LPCSTR lpName,
+    IN WORD    wLanguage
+    );
+WINBASEAPI
+HRSRC
+WINAPI
+FindResourceExW(
+    IN HMODULE hModule,
+    IN LPCWSTR lpType,
+    IN LPCWSTR lpName,
+    IN WORD    wLanguage
+    );
+#ifdef UNICODE
+#define FindResourceEx  FindResourceExW
+#else
+#define FindResourceEx  FindResourceExA
+#endif // !UNICODE
+
+#ifdef STRICT
+typedef BOOL (CALLBACK* ENUMRESTYPEPROCA)(HMODULE hModule, LPSTR lpType,
+        LONG_PTR lParam);
+typedef BOOL (CALLBACK* ENUMRESTYPEPROCW)(HMODULE hModule, LPWSTR lpType,
+        LONG_PTR lParam);
+#ifdef UNICODE
+#define ENUMRESTYPEPROC  ENUMRESTYPEPROCW
+#else
+#define ENUMRESTYPEPROC  ENUMRESTYPEPROCA
+#endif // !UNICODE
+typedef BOOL (CALLBACK* ENUMRESNAMEPROCA)(HMODULE hModule, LPCSTR lpType,
+        LPSTR lpName, LONG_PTR lParam);
+typedef BOOL (CALLBACK* ENUMRESNAMEPROCW)(HMODULE hModule, LPCWSTR lpType,
+        LPWSTR lpName, LONG_PTR lParam);
+#ifdef UNICODE
+#define ENUMRESNAMEPROC  ENUMRESNAMEPROCW
+#else
+#define ENUMRESNAMEPROC  ENUMRESNAMEPROCA
+#endif // !UNICODE
+typedef BOOL (CALLBACK* ENUMRESLANGPROCA)(HMODULE hModule, LPCSTR lpType,
+        LPCSTR lpName, WORD  wLanguage, LONG_PTR lParam);
+typedef BOOL (CALLBACK* ENUMRESLANGPROCW)(HMODULE hModule, LPCWSTR lpType,
+        LPCWSTR lpName, WORD  wLanguage, LONG_PTR lParam);
+#ifdef UNICODE
+#define ENUMRESLANGPROC  ENUMRESLANGPROCW
+#else
+#define ENUMRESLANGPROC  ENUMRESLANGPROCA
+#endif // !UNICODE
+#else
+typedef FARPROC ENUMRESTYPEPROCA;
+typedef FARPROC ENUMRESTYPEPROCW;
+#ifdef UNICODE
+typedef ENUMRESTYPEPROCW ENUMRESTYPEPROC;
+#else
+typedef ENUMRESTYPEPROCA ENUMRESTYPEPROC;
+#endif // UNICODE
+typedef FARPROC ENUMRESNAMEPROCA;
+typedef FARPROC ENUMRESNAMEPROCW;
+#ifdef UNICODE
+typedef ENUMRESNAMEPROCW ENUMRESNAMEPROC;
+#else
+typedef ENUMRESNAMEPROCA ENUMRESNAMEPROC;
+#endif // UNICODE
+typedef FARPROC ENUMRESLANGPROCA;
+typedef FARPROC ENUMRESLANGPROCW;
+#ifdef UNICODE
+typedef ENUMRESLANGPROCW ENUMRESLANGPROC;
+#else
+typedef ENUMRESLANGPROCA ENUMRESLANGPROC;
+#endif // UNICODE
+#endif
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumResourceTypesA(
+    IN HMODULE hModule,
+    IN ENUMRESTYPEPROCA lpEnumFunc,
+    IN LONG_PTR lParam
+    );
+WINBASEAPI
+BOOL
+WINAPI
+EnumResourceTypesW(
+    IN HMODULE hModule,
+    IN ENUMRESTYPEPROCW lpEnumFunc,
+    IN LONG_PTR lParam
+    );
+#ifdef UNICODE
+#define EnumResourceTypes  EnumResourceTypesW
+#else
+#define EnumResourceTypes  EnumResourceTypesA
+#endif // !UNICODE
+
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumResourceNamesA(
+    IN HMODULE hModule,
+    IN LPCSTR lpType,
+    IN ENUMRESNAMEPROCA lpEnumFunc,
+    IN LONG_PTR lParam
+    );
+WINBASEAPI
+BOOL
+WINAPI
+EnumResourceNamesW(
+    IN HMODULE hModule,
+    IN LPCWSTR lpType,
+    IN ENUMRESNAMEPROCW lpEnumFunc,
+    IN LONG_PTR lParam
+    );
+#ifdef UNICODE
+#define EnumResourceNames  EnumResourceNamesW
+#else
+#define EnumResourceNames  EnumResourceNamesA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumResourceLanguagesA(
+    IN HMODULE hModule,
+    IN LPCSTR lpType,
+    IN LPCSTR lpName,
+    IN ENUMRESLANGPROCA lpEnumFunc,
+    IN LONG_PTR lParam
+    );
+WINBASEAPI
+BOOL
+WINAPI
+EnumResourceLanguagesW(
+    IN HMODULE hModule,
+    IN LPCWSTR lpType,
+    IN LPCWSTR lpName,
+    IN ENUMRESLANGPROCW lpEnumFunc,
+    IN LONG_PTR lParam
+    );
+#ifdef UNICODE
+#define EnumResourceLanguages  EnumResourceLanguagesW
+#else
+#define EnumResourceLanguages  EnumResourceLanguagesA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+BeginUpdateResourceA(
+    IN LPCSTR pFileName,
+    IN BOOL bDeleteExistingResources
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+BeginUpdateResourceW(
+    IN LPCWSTR pFileName,
+    IN BOOL bDeleteExistingResources
+    );
+#ifdef UNICODE
+#define BeginUpdateResource  BeginUpdateResourceW
+#else
+#define BeginUpdateResource  BeginUpdateResourceA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+UpdateResourceA(
+    IN HANDLE      hUpdate,
+    IN LPCSTR     lpType,
+    IN LPCSTR     lpName,
+    IN WORD        wLanguage,
+    IN LPVOID      lpData,
+    IN DWORD       cbData
+    );
+WINBASEAPI
+BOOL
+WINAPI
+UpdateResourceW(
+    IN HANDLE      hUpdate,
+    IN LPCWSTR     lpType,
+    IN LPCWSTR     lpName,
+    IN WORD        wLanguage,
+    IN LPVOID      lpData,
+    IN DWORD       cbData
+    );
+#ifdef UNICODE
+#define UpdateResource  UpdateResourceW
+#else
+#define UpdateResource  UpdateResourceA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EndUpdateResourceA(
+    IN HANDLE      hUpdate,
+    IN BOOL        fDiscard
+    );
+WINBASEAPI
+BOOL
+WINAPI
+EndUpdateResourceW(
+    IN HANDLE      hUpdate,
+    IN BOOL        fDiscard
+    );
+#ifdef UNICODE
+#define EndUpdateResource  EndUpdateResourceW
+#else
+#define EndUpdateResource  EndUpdateResourceA
+#endif // !UNICODE
+
+WINBASEAPI
+ATOM
+WINAPI
+GlobalAddAtomA(
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+ATOM
+WINAPI
+GlobalAddAtomW(
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define GlobalAddAtom  GlobalAddAtomW
+#else
+#define GlobalAddAtom  GlobalAddAtomA
+#endif // !UNICODE
+
+WINBASEAPI
+ATOM
+WINAPI
+GlobalFindAtomA(
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+ATOM
+WINAPI
+GlobalFindAtomW(
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define GlobalFindAtom  GlobalFindAtomW
+#else
+#define GlobalFindAtom  GlobalFindAtomA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GlobalGetAtomNameA(
+    IN ATOM nAtom,
+    OUT LPSTR lpBuffer,
+    IN int nSize
+    );
+WINBASEAPI
+UINT
+WINAPI
+GlobalGetAtomNameW(
+    IN ATOM nAtom,
+    OUT LPWSTR lpBuffer,
+    IN int nSize
+    );
+#ifdef UNICODE
+#define GlobalGetAtomName  GlobalGetAtomNameW
+#else
+#define GlobalGetAtomName  GlobalGetAtomNameA
+#endif // !UNICODE
+
+WINBASEAPI
+ATOM
+WINAPI
+AddAtomA(
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+ATOM
+WINAPI
+AddAtomW(
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define AddAtom  AddAtomW
+#else
+#define AddAtom  AddAtomA
+#endif // !UNICODE
+
+WINBASEAPI
+ATOM
+WINAPI
+FindAtomA(
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+ATOM
+WINAPI
+FindAtomW(
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define FindAtom  FindAtomW
+#else
+#define FindAtom  FindAtomA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetAtomNameA(
+    IN ATOM nAtom,
+    OUT LPSTR lpBuffer,
+    IN int nSize
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetAtomNameW(
+    IN ATOM nAtom,
+    OUT LPWSTR lpBuffer,
+    IN int nSize
+    );
+#ifdef UNICODE
+#define GetAtomName  GetAtomNameW
+#else
+#define GetAtomName  GetAtomNameA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetProfileIntA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpKeyName,
+    IN INT nDefault
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetProfileIntW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpKeyName,
+    IN INT nDefault
+    );
+#ifdef UNICODE
+#define GetProfileInt  GetProfileIntW
+#else
+#define GetProfileInt  GetProfileIntA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetProfileStringA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpKeyName,
+    IN LPCSTR lpDefault,
+    OUT LPSTR lpReturnedString,
+    IN DWORD nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetProfileStringW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpKeyName,
+    IN LPCWSTR lpDefault,
+    OUT LPWSTR lpReturnedString,
+    IN DWORD nSize
+    );
+#ifdef UNICODE
+#define GetProfileString  GetProfileStringW
+#else
+#define GetProfileString  GetProfileStringA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteProfileStringA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpKeyName,
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WriteProfileStringW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpKeyName,
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define WriteProfileString  WriteProfileStringW
+#else
+#define WriteProfileString  WriteProfileStringA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetProfileSectionA(
+    IN LPCSTR lpAppName,
+    OUT LPSTR lpReturnedString,
+    IN DWORD nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetProfileSectionW(
+    IN LPCWSTR lpAppName,
+    OUT LPWSTR lpReturnedString,
+    IN DWORD nSize
+    );
+#ifdef UNICODE
+#define GetProfileSection  GetProfileSectionW
+#else
+#define GetProfileSection  GetProfileSectionA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteProfileSectionA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpString
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WriteProfileSectionW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpString
+    );
+#ifdef UNICODE
+#define WriteProfileSection  WriteProfileSectionW
+#else
+#define WriteProfileSection  WriteProfileSectionA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetPrivateProfileIntA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpKeyName,
+    IN INT nDefault,
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetPrivateProfileIntW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpKeyName,
+    IN INT nDefault,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define GetPrivateProfileInt  GetPrivateProfileIntW
+#else
+#define GetPrivateProfileInt  GetPrivateProfileIntA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetPrivateProfileStringA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpKeyName,
+    IN LPCSTR lpDefault,
+    OUT LPSTR lpReturnedString,
+    IN DWORD nSize,
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetPrivateProfileStringW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpKeyName,
+    IN LPCWSTR lpDefault,
+    OUT LPWSTR lpReturnedString,
+    IN DWORD nSize,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define GetPrivateProfileString  GetPrivateProfileStringW
+#else
+#define GetPrivateProfileString  GetPrivateProfileStringA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WritePrivateProfileStringA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpKeyName,
+    IN LPCSTR lpString,
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WritePrivateProfileStringW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpKeyName,
+    IN LPCWSTR lpString,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define WritePrivateProfileString  WritePrivateProfileStringW
+#else
+#define WritePrivateProfileString  WritePrivateProfileStringA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetPrivateProfileSectionA(
+    IN LPCSTR lpAppName,
+    OUT LPSTR lpReturnedString,
+    IN DWORD nSize,
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetPrivateProfileSectionW(
+    IN LPCWSTR lpAppName,
+    OUT LPWSTR lpReturnedString,
+    IN DWORD nSize,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define GetPrivateProfileSection  GetPrivateProfileSectionW
+#else
+#define GetPrivateProfileSection  GetPrivateProfileSectionA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WritePrivateProfileSectionA(
+    IN LPCSTR lpAppName,
+    IN LPCSTR lpString,
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WritePrivateProfileSectionW(
+    IN LPCWSTR lpAppName,
+    IN LPCWSTR lpString,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define WritePrivateProfileSection  WritePrivateProfileSectionW
+#else
+#define WritePrivateProfileSection  WritePrivateProfileSectionA
+#endif // !UNICODE
+
+
+WINBASEAPI
+DWORD
+WINAPI
+GetPrivateProfileSectionNamesA(
+    OUT LPSTR lpszReturnBuffer,
+    IN DWORD nSize,
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetPrivateProfileSectionNamesW(
+    OUT LPWSTR lpszReturnBuffer,
+    IN DWORD nSize,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define GetPrivateProfileSectionNames  GetPrivateProfileSectionNamesW
+#else
+#define GetPrivateProfileSectionNames  GetPrivateProfileSectionNamesA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetPrivateProfileStructA(
+    IN LPCSTR lpszSection,
+    IN LPCSTR lpszKey,
+    OUT LPVOID   lpStruct,
+    IN UINT     uSizeStruct,
+    IN LPCSTR szFile
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetPrivateProfileStructW(
+    IN LPCWSTR lpszSection,
+    IN LPCWSTR lpszKey,
+    OUT LPVOID   lpStruct,
+    IN UINT     uSizeStruct,
+    IN LPCWSTR szFile
+    );
+#ifdef UNICODE
+#define GetPrivateProfileStruct  GetPrivateProfileStructW
+#else
+#define GetPrivateProfileStruct  GetPrivateProfileStructA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WritePrivateProfileStructA(
+    IN LPCSTR lpszSection,
+    IN LPCSTR lpszKey,
+    IN LPVOID   lpStruct,
+    IN UINT     uSizeStruct,
+    IN LPCSTR szFile
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WritePrivateProfileStructW(
+    IN LPCWSTR lpszSection,
+    IN LPCWSTR lpszKey,
+    IN LPVOID   lpStruct,
+    IN UINT     uSizeStruct,
+    IN LPCWSTR szFile
+    );
+#ifdef UNICODE
+#define WritePrivateProfileStruct  WritePrivateProfileStructW
+#else
+#define WritePrivateProfileStruct  WritePrivateProfileStructA
+#endif // !UNICODE
+
+
+WINBASEAPI
+UINT
+WINAPI
+GetDriveTypeA(
+    IN LPCSTR lpRootPathName
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetDriveTypeW(
+    IN LPCWSTR lpRootPathName
+    );
+#ifdef UNICODE
+#define GetDriveType  GetDriveTypeW
+#else
+#define GetDriveType  GetDriveTypeA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetSystemDirectoryA(
+    OUT LPSTR lpBuffer,
+    IN UINT uSize
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetSystemDirectoryW(
+    OUT LPWSTR lpBuffer,
+    IN UINT uSize
+    );
+#ifdef UNICODE
+#define GetSystemDirectory  GetSystemDirectoryW
+#else
+#define GetSystemDirectory  GetSystemDirectoryA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTempPathA(
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetTempPathW(
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer
+    );
+#ifdef UNICODE
+#define GetTempPath  GetTempPathW
+#else
+#define GetTempPath  GetTempPathA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetTempFileNameA(
+    IN LPCSTR lpPathName,
+    IN LPCSTR lpPrefixString,
+    IN UINT uUnique,
+    OUT LPSTR lpTempFileName
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetTempFileNameW(
+    IN LPCWSTR lpPathName,
+    IN LPCWSTR lpPrefixString,
+    IN UINT uUnique,
+    OUT LPWSTR lpTempFileName
+    );
+#ifdef UNICODE
+#define GetTempFileName  GetTempFileNameW
+#else
+#define GetTempFileName  GetTempFileNameA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetWindowsDirectoryA(
+    OUT LPSTR lpBuffer,
+    IN UINT uSize
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetWindowsDirectoryW(
+    OUT LPWSTR lpBuffer,
+    IN UINT uSize
+    );
+#ifdef UNICODE
+#define GetWindowsDirectory  GetWindowsDirectoryW
+#else
+#define GetWindowsDirectory  GetWindowsDirectoryA
+#endif // !UNICODE
+
+WINBASEAPI
+UINT
+WINAPI
+GetSystemWindowsDirectoryA(
+    OUT LPSTR lpBuffer,
+    IN UINT uSize
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetSystemWindowsDirectoryW(
+    OUT LPWSTR lpBuffer,
+    IN UINT uSize
+    );
+#ifdef UNICODE
+#define GetSystemWindowsDirectory  GetSystemWindowsDirectoryW
+#else
+#define GetSystemWindowsDirectory  GetSystemWindowsDirectoryA
+#endif // !UNICODE
+
+#if !defined(RC_INVOKED) // RC warns because "WINBASE_DECLARE_GET_SYSTEM_WOW64_DIRECTORY" is a bit long.
+#if _WIN32_WINNT >= 0x0501 || defined(WINBASE_DECLARE_GET_SYSTEM_WOW64_DIRECTORY)
+
+WINBASEAPI
+UINT
+WINAPI
+GetSystemWow64DirectoryA(
+    OUT LPSTR lpBuffer,
+    IN UINT uSize
+    );
+WINBASEAPI
+UINT
+WINAPI
+GetSystemWow64DirectoryW(
+    OUT LPWSTR lpBuffer,
+    IN UINT uSize
+    );
+#ifdef UNICODE
+#define GetSystemWow64Directory  GetSystemWow64DirectoryW
+#else
+#define GetSystemWow64Directory  GetSystemWow64DirectoryA
+#endif // !UNICODE
+
+//
+// for GetProcAddress
+//
+typedef UINT (WINAPI* PGET_SYSTEM_WOW64_DIRECTORY_A)(OUT  LPSTR lpBuffer, UINT uSize);
+typedef UINT (WINAPI* PGET_SYSTEM_WOW64_DIRECTORY_W)(OUT LPWSTR lpBuffer, UINT uSize);
+
+//
+// GetProcAddress only accepts GET_SYSTEM_WOW64_DIRECTORY_NAME_A_A,
+// GET_SYSTEM_WOW64_DIRECTORY_NAME_W_A, GET_SYSTEM_WOW64_DIRECTORY_NAME_T_A.
+// The others are if you want to use the strings in some other way.
+//
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_A_A      "GetSystemWow64DirectoryA"
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_A_W     L"GetSystemWow64DirectoryA"
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_A_T TEXT("GetSystemWow64DirectoryA")
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_W_A      "GetSystemWow64DirectoryW"
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_W_W     L"GetSystemWow64DirectoryW"
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_W_T TEXT("GetSystemWow64DirectoryW")
+
+#ifdef UNICODE
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_A GET_SYSTEM_WOW64_DIRECTORY_NAME_W_A
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_W GET_SYSTEM_WOW64_DIRECTORY_NAME_W_W
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_T GET_SYSTEM_WOW64_DIRECTORY_NAME_W_T
+#else
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_A GET_SYSTEM_WOW64_DIRECTORY_NAME_A_A
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_W GET_SYSTEM_WOW64_DIRECTORY_NAME_A_W
+#define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_T GET_SYSTEM_WOW64_DIRECTORY_NAME_A_T
+#endif
+
+#endif // _WIN32_WINNT >= 0x0501
+#endif
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCurrentDirectoryA(
+    IN LPCSTR lpPathName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetCurrentDirectoryW(
+    IN LPCWSTR lpPathName
+    );
+#ifdef UNICODE
+#define SetCurrentDirectory  SetCurrentDirectoryW
+#else
+#define SetCurrentDirectory  SetCurrentDirectoryA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetCurrentDirectoryA(
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetCurrentDirectoryW(
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer
+    );
+#ifdef UNICODE
+#define GetCurrentDirectory  GetCurrentDirectoryW
+#else
+#define GetCurrentDirectory  GetCurrentDirectoryA
+#endif // !UNICODE
+
+#if _WIN32_WINNT >= 0x0502
+
+WINBASEAPI
+BOOL
+WINAPI
+SetDllDirectoryA(
+    IN LPCSTR lpPathName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetDllDirectoryW(
+    IN LPCWSTR lpPathName
+    );
+#ifdef UNICODE
+#define SetDllDirectory  SetDllDirectoryW
+#else
+#define SetDllDirectory  SetDllDirectoryA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetDllDirectoryA(
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetDllDirectoryW(
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer
+    );
+#ifdef UNICODE
+#define GetDllDirectory  GetDllDirectoryW
+#else
+#define GetDllDirectory  GetDllDirectoryA
+#endif // !UNICODE
+
+#endif // _WIN32_WINNT >= 0x0502
+
+WINBASEAPI
+BOOL
+WINAPI
+GetDiskFreeSpaceA(
+    IN LPCSTR lpRootPathName,
+    OUT LPDWORD lpSectorsPerCluster,
+    OUT LPDWORD lpBytesPerSector,
+    OUT LPDWORD lpNumberOfFreeClusters,
+    OUT LPDWORD lpTotalNumberOfClusters
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetDiskFreeSpaceW(
+    IN LPCWSTR lpRootPathName,
+    OUT LPDWORD lpSectorsPerCluster,
+    OUT LPDWORD lpBytesPerSector,
+    OUT LPDWORD lpNumberOfFreeClusters,
+    OUT LPDWORD lpTotalNumberOfClusters
+    );
+#ifdef UNICODE
+#define GetDiskFreeSpace  GetDiskFreeSpaceW
+#else
+#define GetDiskFreeSpace  GetDiskFreeSpaceA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetDiskFreeSpaceExA(
+    IN LPCSTR lpDirectoryName,
+    OUT PULARGE_INTEGER lpFreeBytesAvailableToCaller,
+    OUT PULARGE_INTEGER lpTotalNumberOfBytes,
+    OUT PULARGE_INTEGER lpTotalNumberOfFreeBytes
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetDiskFreeSpaceExW(
+    IN LPCWSTR lpDirectoryName,
+    OUT PULARGE_INTEGER lpFreeBytesAvailableToCaller,
+    OUT PULARGE_INTEGER lpTotalNumberOfBytes,
+    OUT PULARGE_INTEGER lpTotalNumberOfFreeBytes
+    );
+#ifdef UNICODE
+#define GetDiskFreeSpaceEx  GetDiskFreeSpaceExW
+#else
+#define GetDiskFreeSpaceEx  GetDiskFreeSpaceExA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CreateDirectoryA(
+    IN LPCSTR lpPathName,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CreateDirectoryW(
+    IN LPCWSTR lpPathName,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+#ifdef UNICODE
+#define CreateDirectory  CreateDirectoryW
+#else
+#define CreateDirectory  CreateDirectoryA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CreateDirectoryExA(
+    IN LPCSTR lpTemplateDirectory,
+    IN LPCSTR lpNewDirectory,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CreateDirectoryExW(
+    IN LPCWSTR lpTemplateDirectory,
+    IN LPCWSTR lpNewDirectory,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+#ifdef UNICODE
+#define CreateDirectoryEx  CreateDirectoryExW
+#else
+#define CreateDirectoryEx  CreateDirectoryExA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+RemoveDirectoryA(
+    IN LPCSTR lpPathName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+RemoveDirectoryW(
+    IN LPCWSTR lpPathName
+    );
+#ifdef UNICODE
+#define RemoveDirectory  RemoveDirectoryW
+#else
+#define RemoveDirectory  RemoveDirectoryA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetFullPathNameA(
+    IN LPCSTR lpFileName,
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer,
+    OUT LPSTR *lpFilePart
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetFullPathNameW(
+    IN LPCWSTR lpFileName,
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer,
+    OUT LPWSTR *lpFilePart
+    );
+#ifdef UNICODE
+#define GetFullPathName  GetFullPathNameW
+#else
+#define GetFullPathName  GetFullPathNameA
+#endif // !UNICODE
+
+
+#define DDD_RAW_TARGET_PATH         0x00000001
+#define DDD_REMOVE_DEFINITION       0x00000002
+#define DDD_EXACT_MATCH_ON_REMOVE   0x00000004
+#define DDD_NO_BROADCAST_SYSTEM     0x00000008
+#define DDD_LUID_BROADCAST_DRIVE    0x00000010
+
+WINBASEAPI
+BOOL
+WINAPI
+DefineDosDeviceA(
+    IN DWORD dwFlags,
+    IN LPCSTR lpDeviceName,
+    IN LPCSTR lpTargetPath
+    );
+WINBASEAPI
+BOOL
+WINAPI
+DefineDosDeviceW(
+    IN DWORD dwFlags,
+    IN LPCWSTR lpDeviceName,
+    IN LPCWSTR lpTargetPath
+    );
+#ifdef UNICODE
+#define DefineDosDevice  DefineDosDeviceW
+#else
+#define DefineDosDevice  DefineDosDeviceA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+QueryDosDeviceA(
+    IN LPCSTR lpDeviceName,
+    OUT LPSTR lpTargetPath,
+    IN DWORD ucchMax
+    );
+WINBASEAPI
+DWORD
+WINAPI
+QueryDosDeviceW(
+    IN LPCWSTR lpDeviceName,
+    OUT LPWSTR lpTargetPath,
+    IN DWORD ucchMax
+    );
+#ifdef UNICODE
+#define QueryDosDevice  QueryDosDeviceW
+#else
+#define QueryDosDevice  QueryDosDeviceA
+#endif // !UNICODE
+
+#define EXPAND_LOCAL_DRIVES
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateFileA(
+    IN LPCSTR lpFileName,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwShareMode,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    IN DWORD dwCreationDisposition,
+    IN DWORD dwFlagsAndAttributes,
+    IN HANDLE hTemplateFile
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateFileW(
+    IN LPCWSTR lpFileName,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwShareMode,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    IN DWORD dwCreationDisposition,
+    IN DWORD dwFlagsAndAttributes,
+    IN HANDLE hTemplateFile
+    );
+#ifdef UNICODE
+#define CreateFile  CreateFileW
+#else
+#define CreateFile  CreateFileA
+#endif // !UNICODE
+
+#if _WIN32_WINNT >= 0x0502
+
+WINBASEAPI
+HANDLE
+WINAPI
+ReOpenFile(
+    HANDLE  hOriginalFile,
+    DWORD   dwDesiredAccess,
+    DWORD   dwShareMode,
+    DWORD   dwFlagsAndAttributes
+    );
+    
+#endif // _WIN32_WINNT >= 0x0502
+
+WINBASEAPI
+BOOL
+WINAPI
+SetFileAttributesA(
+    IN LPCSTR lpFileName,
+    IN DWORD dwFileAttributes
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetFileAttributesW(
+    IN LPCWSTR lpFileName,
+    IN DWORD dwFileAttributes
+    );
+#ifdef UNICODE
+#define SetFileAttributes  SetFileAttributesW
+#else
+#define SetFileAttributes  SetFileAttributesA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetFileAttributesA(
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetFileAttributesW(
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define GetFileAttributes  GetFileAttributesW
+#else
+#define GetFileAttributes  GetFileAttributesA
+#endif // !UNICODE
+
+typedef enum _GET_FILEEX_INFO_LEVELS {
+    GetFileExInfoStandard,
+    GetFileExMaxInfoLevel
+} GET_FILEEX_INFO_LEVELS;
+
+WINBASEAPI
+BOOL
+WINAPI
+GetFileAttributesExA(
+    IN LPCSTR lpFileName,
+    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
+    OUT LPVOID lpFileInformation
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetFileAttributesExW(
+    IN LPCWSTR lpFileName,
+    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
+    OUT LPVOID lpFileInformation
+    );
+#ifdef UNICODE
+#define GetFileAttributesEx  GetFileAttributesExW
+#else
+#define GetFileAttributesEx  GetFileAttributesExA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+GetCompressedFileSizeA(
+    IN LPCSTR lpFileName,
+    OUT LPDWORD lpFileSizeHigh
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetCompressedFileSizeW(
+    IN LPCWSTR lpFileName,
+    OUT LPDWORD lpFileSizeHigh
+    );
+#ifdef UNICODE
+#define GetCompressedFileSize  GetCompressedFileSizeW
+#else
+#define GetCompressedFileSize  GetCompressedFileSizeA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+DeleteFileA(
+    IN LPCSTR lpFileName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+DeleteFileW(
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define DeleteFile  DeleteFileW
+#else
+#define DeleteFile  DeleteFileA
+#endif // !UNICODE
+
+#if _WIN32_WINNT >= 0x0501
+
+WINBASEAPI
+BOOL
+WINAPI
+CheckNameLegalDOS8Dot3A(
+    IN LPCSTR lpName,
+    OUT LPSTR lpOemName OPTIONAL,
+    IN DWORD OemNameSize OPTIONAL,
+    OUT PBOOL pbNameContainsSpaces OPTIONAL,
+    OUT PBOOL pbNameLegal
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CheckNameLegalDOS8Dot3W(
+    IN LPCWSTR lpName,
+    OUT LPSTR lpOemName OPTIONAL,
+    IN DWORD OemNameSize OPTIONAL,
+    OUT PBOOL pbNameContainsSpaces OPTIONAL,
+    OUT PBOOL pbNameLegal
+    );
+#ifdef UNICODE
+#define CheckNameLegalDOS8Dot3  CheckNameLegalDOS8Dot3W
+#else
+#define CheckNameLegalDOS8Dot3  CheckNameLegalDOS8Dot3A
+#endif // !UNICODE
+
+#endif // (_WIN32_WINNT >= 0x0501)
+
+#if(_WIN32_WINNT >= 0x0400)
+typedef enum _FINDEX_INFO_LEVELS {
+    FindExInfoStandard,
+    FindExInfoMaxInfoLevel
+} FINDEX_INFO_LEVELS;
+
+typedef enum _FINDEX_SEARCH_OPS {
+    FindExSearchNameMatch,
+    FindExSearchLimitToDirectories,
+    FindExSearchLimitToDevices,
+    FindExSearchMaxSearchOp
+} FINDEX_SEARCH_OPS;
+
+#define FIND_FIRST_EX_CASE_SENSITIVE   0x00000001
+
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstFileExA(
+    IN LPCSTR lpFileName,
+    IN FINDEX_INFO_LEVELS fInfoLevelId,
+    OUT LPVOID lpFindFileData,
+    IN FINDEX_SEARCH_OPS fSearchOp,
+    IN LPVOID lpSearchFilter,
+    IN DWORD dwAdditionalFlags
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstFileExW(
+    IN LPCWSTR lpFileName,
+    IN FINDEX_INFO_LEVELS fInfoLevelId,
+    OUT LPVOID lpFindFileData,
+    IN FINDEX_SEARCH_OPS fSearchOp,
+    IN LPVOID lpSearchFilter,
+    IN DWORD dwAdditionalFlags
+    );
+#ifdef UNICODE
+#define FindFirstFileEx  FindFirstFileExW
+#else
+#define FindFirstFileEx  FindFirstFileExA
+#endif // !UNICODE
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstFileA(
+    IN LPCSTR lpFileName,
+    OUT LPWIN32_FIND_DATAA lpFindFileData
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstFileW(
+    IN LPCWSTR lpFileName,
+    OUT LPWIN32_FIND_DATAW lpFindFileData
+    );
+#ifdef UNICODE
+#define FindFirstFile  FindFirstFileW
+#else
+#define FindFirstFile  FindFirstFileA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindNextFileA(
+    IN HANDLE hFindFile,
+    OUT LPWIN32_FIND_DATAA lpFindFileData
+    );
+WINBASEAPI
+BOOL
+WINAPI
+FindNextFileW(
+    IN HANDLE hFindFile,
+    OUT LPWIN32_FIND_DATAW lpFindFileData
+    );
+#ifdef UNICODE
+#define FindNextFile  FindNextFileW
+#else
+#define FindNextFile  FindNextFileA
+#endif // !UNICODE
+
+
+WINBASEAPI
+DWORD
+WINAPI
+SearchPathA(
+    IN LPCSTR lpPath,
+    IN LPCSTR lpFileName,
+    IN LPCSTR lpExtension,
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer,
+    OUT LPSTR *lpFilePart
+    );
+WINBASEAPI
+DWORD
+WINAPI
+SearchPathW(
+    IN LPCWSTR lpPath,
+    IN LPCWSTR lpFileName,
+    IN LPCWSTR lpExtension,
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer,
+    OUT LPWSTR *lpFilePart
+    );
+#ifdef UNICODE
+#define SearchPath  SearchPathW
+#else
+#define SearchPath  SearchPathA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CopyFileA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName,
+    IN BOOL bFailIfExists
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CopyFileW(
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName,
+    IN BOOL bFailIfExists
+    );
+#ifdef UNICODE
+#define CopyFile  CopyFileW
+#else
+#define CopyFile  CopyFileA
+#endif // !UNICODE
+
+#if(_WIN32_WINNT >= 0x0400)
+typedef
+DWORD
+(WINAPI *LPPROGRESS_ROUTINE)(
+    LARGE_INTEGER TotalFileSize,
+    LARGE_INTEGER TotalBytesTransferred,
+    LARGE_INTEGER StreamSize,
+    LARGE_INTEGER StreamBytesTransferred,
+    DWORD dwStreamNumber,
+    DWORD dwCallbackReason,
+    HANDLE hSourceFile,
+    HANDLE hDestinationFile,
+    LPVOID lpData OPTIONAL
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+CopyFileExA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName,
+    IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL,
+    IN LPVOID lpData OPTIONAL,
+    IN LPBOOL pbCancel OPTIONAL,
+    IN DWORD dwCopyFlags
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CopyFileExW(
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName,
+    IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL,
+    IN LPVOID lpData OPTIONAL,
+    IN LPBOOL pbCancel OPTIONAL,
+    IN DWORD dwCopyFlags
+    );
+#ifdef UNICODE
+#define CopyFileEx  CopyFileExW
+#else
+#define CopyFileEx  CopyFileExA
+#endif // !UNICODE
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+BOOL
+WINAPI
+MoveFileA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+MoveFileW(
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName
+    );
+#ifdef UNICODE
+#define MoveFile  MoveFileW
+#else
+#define MoveFile  MoveFileA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+MoveFileExA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName,
+    IN DWORD dwFlags
+    );
+WINBASEAPI
+BOOL
+WINAPI
+MoveFileExW(
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName,
+    IN DWORD dwFlags
+    );
+#ifdef UNICODE
+#define MoveFileEx  MoveFileExW
+#else
+#define MoveFileEx  MoveFileExA
+#endif // !UNICODE
+
+#if (_WIN32_WINNT >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+MoveFileWithProgressA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName,
+    IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL,
+    IN LPVOID lpData OPTIONAL,
+    IN DWORD dwFlags
+    );
+WINBASEAPI
+BOOL
+WINAPI
+MoveFileWithProgressW(
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName,
+    IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL,
+    IN LPVOID lpData OPTIONAL,
+    IN DWORD dwFlags
+    );
+#ifdef UNICODE
+#define MoveFileWithProgress  MoveFileWithProgressW
+#else
+#define MoveFileWithProgress  MoveFileWithProgressA
+#endif // !UNICODE
+#endif // (_WIN32_WINNT >= 0x0500)
+
+#define MOVEFILE_REPLACE_EXISTING       0x00000001
+#define MOVEFILE_COPY_ALLOWED           0x00000002
+#define MOVEFILE_DELAY_UNTIL_REBOOT     0x00000004
+#define MOVEFILE_WRITE_THROUGH          0x00000008
+#if (_WIN32_WINNT >= 0x0500)
+#define MOVEFILE_CREATE_HARDLINK        0x00000010
+#define MOVEFILE_FAIL_IF_NOT_TRACKABLE  0x00000020
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+
+#if (_WIN32_WINNT >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+ReplaceFileA(
+    LPCSTR  lpReplacedFileName,
+    LPCSTR  lpReplacementFileName,
+    LPCSTR  lpBackupFileName,
+    DWORD   dwReplaceFlags,
+    LPVOID  lpExclude,
+    LPVOID  lpReserved
+    );
+WINBASEAPI
+BOOL
+WINAPI
+ReplaceFileW(
+    LPCWSTR lpReplacedFileName,
+    LPCWSTR lpReplacementFileName,
+    LPCWSTR lpBackupFileName,
+    DWORD   dwReplaceFlags,
+    LPVOID  lpExclude,
+    LPVOID  lpReserved
+    );
+#ifdef UNICODE
+#define ReplaceFile  ReplaceFileW
+#else
+#define ReplaceFile  ReplaceFileA
+#endif // !UNICODE
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+#if (_WIN32_WINNT >= 0x0500)
+//
+// API call to create hard links.
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+CreateHardLinkA(
+    IN LPCSTR lpFileName,
+    IN LPCSTR lpExistingFileName,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CreateHardLinkW(
+    IN LPCWSTR lpFileName,
+    IN LPCWSTR lpExistingFileName,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+#ifdef UNICODE
+#define CreateHardLink  CreateHardLinkW
+#else
+#define CreateHardLink  CreateHardLinkA
+#endif // !UNICODE
+
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+#if (_WIN32_WINNT >= 0x0501)
+
+//
+// API call to enumerate for streams within a file
+//
+
+typedef enum _STREAM_INFO_LEVELS {
+    
+    FindStreamInfoStandard,
+    FindStreamInfoMaxInfoLevel
+
+} STREAM_INFO_LEVELS;
+
+typedef struct _WIN32_FIND_STREAM_DATA {
+    
+    LARGE_INTEGER StreamSize;
+    WCHAR cStreamName[ MAX_PATH + 36 ]; 
+
+} WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; 
+
+
+HANDLE
+WINAPI
+FindFirstStreamW(
+    LPCWSTR lpFileName,
+    STREAM_INFO_LEVELS InfoLevel,
+    LPVOID lpFindStreamData,
+    DWORD dwFlags
+    );
+
+BOOL
+APIENTRY
+FindNextStreamW(
+    HANDLE hFindStream,
+    LPVOID lpFindStreamData
+    );
+
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateNamedPipeA(
+    IN LPCSTR lpName,
+    IN DWORD dwOpenMode,
+    IN DWORD dwPipeMode,
+    IN DWORD nMaxInstances,
+    IN DWORD nOutBufferSize,
+    IN DWORD nInBufferSize,
+    IN DWORD nDefaultTimeOut,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateNamedPipeW(
+    IN LPCWSTR lpName,
+    IN DWORD dwOpenMode,
+    IN DWORD dwPipeMode,
+    IN DWORD nMaxInstances,
+    IN DWORD nOutBufferSize,
+    IN DWORD nInBufferSize,
+    IN DWORD nDefaultTimeOut,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+#ifdef UNICODE
+#define CreateNamedPipe  CreateNamedPipeW
+#else
+#define CreateNamedPipe  CreateNamedPipeA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNamedPipeHandleStateA(
+    IN HANDLE hNamedPipe,
+    OUT LPDWORD lpState,
+    OUT LPDWORD lpCurInstances,
+    OUT LPDWORD lpMaxCollectionCount,
+    OUT LPDWORD lpCollectDataTimeout,
+    OUT LPSTR lpUserName,
+    IN DWORD nMaxUserNameSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetNamedPipeHandleStateW(
+    IN HANDLE hNamedPipe,
+    OUT LPDWORD lpState,
+    OUT LPDWORD lpCurInstances,
+    OUT LPDWORD lpMaxCollectionCount,
+    OUT LPDWORD lpCollectDataTimeout,
+    OUT LPWSTR lpUserName,
+    IN DWORD nMaxUserNameSize
+    );
+#ifdef UNICODE
+#define GetNamedPipeHandleState  GetNamedPipeHandleStateW
+#else
+#define GetNamedPipeHandleState  GetNamedPipeHandleStateA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CallNamedPipeA(
+    IN LPCSTR lpNamedPipeName,
+    IN LPVOID lpInBuffer,
+    IN DWORD nInBufferSize,
+    OUT LPVOID lpOutBuffer,
+    IN DWORD nOutBufferSize,
+    OUT LPDWORD lpBytesRead,
+    IN DWORD nTimeOut
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CallNamedPipeW(
+    IN LPCWSTR lpNamedPipeName,
+    IN LPVOID lpInBuffer,
+    IN DWORD nInBufferSize,
+    OUT LPVOID lpOutBuffer,
+    IN DWORD nOutBufferSize,
+    OUT LPDWORD lpBytesRead,
+    IN DWORD nTimeOut
+    );
+#ifdef UNICODE
+#define CallNamedPipe  CallNamedPipeW
+#else
+#define CallNamedPipe  CallNamedPipeA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WaitNamedPipeA(
+    IN LPCSTR lpNamedPipeName,
+    IN DWORD nTimeOut
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WaitNamedPipeW(
+    IN LPCWSTR lpNamedPipeName,
+    IN DWORD nTimeOut
+    );
+#ifdef UNICODE
+#define WaitNamedPipe  WaitNamedPipeW
+#else
+#define WaitNamedPipe  WaitNamedPipeA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetVolumeLabelA(
+    IN LPCSTR lpRootPathName,
+    IN LPCSTR lpVolumeName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetVolumeLabelW(
+    IN LPCWSTR lpRootPathName,
+    IN LPCWSTR lpVolumeName
+    );
+#ifdef UNICODE
+#define SetVolumeLabel  SetVolumeLabelW
+#else
+#define SetVolumeLabel  SetVolumeLabelA
+#endif // !UNICODE
+
+WINBASEAPI
+VOID
+WINAPI
+SetFileApisToOEM( VOID );
+
+WINBASEAPI
+VOID
+WINAPI
+SetFileApisToANSI( VOID );
+
+WINBASEAPI
+BOOL
+WINAPI
+AreFileApisANSI( VOID );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumeInformationA(
+    IN LPCSTR lpRootPathName,
+    OUT LPSTR lpVolumeNameBuffer,
+    IN DWORD nVolumeNameSize,
+    OUT LPDWORD lpVolumeSerialNumber,
+    OUT LPDWORD lpMaximumComponentLength,
+    OUT LPDWORD lpFileSystemFlags,
+    OUT LPSTR lpFileSystemNameBuffer,
+    IN DWORD nFileSystemNameSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumeInformationW(
+    IN LPCWSTR lpRootPathName,
+    OUT LPWSTR lpVolumeNameBuffer,
+    IN DWORD nVolumeNameSize,
+    OUT LPDWORD lpVolumeSerialNumber,
+    OUT LPDWORD lpMaximumComponentLength,
+    OUT LPDWORD lpFileSystemFlags,
+    OUT LPWSTR lpFileSystemNameBuffer,
+    IN DWORD nFileSystemNameSize
+    );
+#ifdef UNICODE
+#define GetVolumeInformation  GetVolumeInformationW
+#else
+#define GetVolumeInformation  GetVolumeInformationA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CancelIo(
+    IN HANDLE hFile
+    );
+
+//
+// Event logging APIs
+//
+
+WINADVAPI
+BOOL
+WINAPI
+ClearEventLogA (
+    IN HANDLE hEventLog,
+    IN LPCSTR lpBackupFileName
+    );
+WINADVAPI
+BOOL
+WINAPI
+ClearEventLogW (
+    IN HANDLE hEventLog,
+    IN LPCWSTR lpBackupFileName
+    );
+#ifdef UNICODE
+#define ClearEventLog  ClearEventLogW
+#else
+#define ClearEventLog  ClearEventLogA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+BackupEventLogA (
+    IN HANDLE hEventLog,
+    IN LPCSTR lpBackupFileName
+    );
+WINADVAPI
+BOOL
+WINAPI
+BackupEventLogW (
+    IN HANDLE hEventLog,
+    IN LPCWSTR lpBackupFileName
+    );
+#ifdef UNICODE
+#define BackupEventLog  BackupEventLogW
+#else
+#define BackupEventLog  BackupEventLogA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CloseEventLog (
+    IN OUT HANDLE hEventLog
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+DeregisterEventSource (
+    IN OUT HANDLE hEventLog
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+NotifyChangeEventLog(
+    IN HANDLE  hEventLog,
+    IN HANDLE  hEvent
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+GetNumberOfEventLogRecords (
+    IN HANDLE hEventLog,
+    OUT PDWORD NumberOfRecords
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+GetOldestEventLogRecord (
+    IN HANDLE hEventLog,
+    OUT PDWORD OldestRecord
+    );
+
+WINADVAPI
+HANDLE
+WINAPI
+OpenEventLogA (
+    IN LPCSTR lpUNCServerName,
+    IN LPCSTR lpSourceName
+    );
+WINADVAPI
+HANDLE
+WINAPI
+OpenEventLogW (
+    IN LPCWSTR lpUNCServerName,
+    IN LPCWSTR lpSourceName
+    );
+#ifdef UNICODE
+#define OpenEventLog  OpenEventLogW
+#else
+#define OpenEventLog  OpenEventLogA
+#endif // !UNICODE
+
+WINADVAPI
+HANDLE
+WINAPI
+RegisterEventSourceA (
+    IN LPCSTR lpUNCServerName,
+    IN LPCSTR lpSourceName
+    );
+WINADVAPI
+HANDLE
+WINAPI
+RegisterEventSourceW (
+    IN LPCWSTR lpUNCServerName,
+    IN LPCWSTR lpSourceName
+    );
+#ifdef UNICODE
+#define RegisterEventSource  RegisterEventSourceW
+#else
+#define RegisterEventSource  RegisterEventSourceA
+#endif // !UNICODE
+
+WINADVAPI
+HANDLE
+WINAPI
+OpenBackupEventLogA (
+    IN LPCSTR lpUNCServerName,
+    IN LPCSTR lpFileName
+    );
+WINADVAPI
+HANDLE
+WINAPI
+OpenBackupEventLogW (
+    IN LPCWSTR lpUNCServerName,
+    IN LPCWSTR lpFileName
+    );
+#ifdef UNICODE
+#define OpenBackupEventLog  OpenBackupEventLogW
+#else
+#define OpenBackupEventLog  OpenBackupEventLogA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+ReadEventLogA (
+     IN HANDLE     hEventLog,
+     IN DWORD      dwReadFlags,
+     IN DWORD      dwRecordOffset,
+     OUT LPVOID     lpBuffer,
+     IN DWORD      nNumberOfBytesToRead,
+     OUT DWORD      *pnBytesRead,
+     OUT DWORD      *pnMinNumberOfBytesNeeded
+    );
+WINADVAPI
+BOOL
+WINAPI
+ReadEventLogW (
+     IN HANDLE     hEventLog,
+     IN DWORD      dwReadFlags,
+     IN DWORD      dwRecordOffset,
+     OUT LPVOID     lpBuffer,
+     IN DWORD      nNumberOfBytesToRead,
+     OUT DWORD      *pnBytesRead,
+     OUT DWORD      *pnMinNumberOfBytesNeeded
+    );
+#ifdef UNICODE
+#define ReadEventLog  ReadEventLogW
+#else
+#define ReadEventLog  ReadEventLogA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+ReportEventA (
+     IN HANDLE     hEventLog,
+     IN WORD       wType,
+     IN WORD       wCategory,
+     IN DWORD      dwEventID,
+     IN PSID       lpUserSid,
+     IN WORD       wNumStrings,
+     IN DWORD      dwDataSize,
+     IN LPCSTR   *lpStrings,
+     IN LPVOID     lpRawData
+    );
+WINADVAPI
+BOOL
+WINAPI
+ReportEventW (
+     IN HANDLE     hEventLog,
+     IN WORD       wType,
+     IN WORD       wCategory,
+     IN DWORD      dwEventID,
+     IN PSID       lpUserSid,
+     IN WORD       wNumStrings,
+     IN DWORD      dwDataSize,
+     IN LPCWSTR   *lpStrings,
+     IN LPVOID     lpRawData
+    );
+#ifdef UNICODE
+#define ReportEvent  ReportEventW
+#else
+#define ReportEvent  ReportEventA
+#endif // !UNICODE
+
+
+#define EVENTLOG_FULL_INFO      0
+
+typedef struct _EVENTLOG_FULL_INFORMATION
+{
+    DWORD    dwFull;
+}
+EVENTLOG_FULL_INFORMATION, *LPEVENTLOG_FULL_INFORMATION;
+
+WINADVAPI
+BOOL
+WINAPI
+GetEventLogInformation (
+     IN  HANDLE     hEventLog,
+     IN  DWORD      dwInfoLevel,
+     OUT LPVOID     lpBuffer,
+     IN  DWORD      cbBufSize,
+     OUT LPDWORD    pcbBytesNeeded
+    );
+
+//
+//
+// Security APIs
+//
+
+
+WINADVAPI
+BOOL
+WINAPI
+DuplicateToken(
+    IN HANDLE ExistingTokenHandle,
+    IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel,
+    OUT PHANDLE DuplicateTokenHandle
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+GetKernelObjectSecurity (
+    IN HANDLE Handle,
+    IN SECURITY_INFORMATION RequestedInformation,
+    OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN DWORD nLength,
+    OUT LPDWORD lpnLengthNeeded
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+ImpersonateNamedPipeClient(
+    IN HANDLE hNamedPipe
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+ImpersonateSelf(
+    IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+RevertToSelf (
+    VOID
+    );
+
+WINADVAPI
+BOOL
+APIENTRY
+SetThreadToken (
+    IN PHANDLE Thread,
+    IN HANDLE Token
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+AccessCheck (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    IN PGENERIC_MAPPING GenericMapping,
+    OUT PPRIVILEGE_SET PrivilegeSet,
+    IN LPDWORD PrivilegeSetLength,
+    OUT LPDWORD GrantedAccess,
+    OUT LPBOOL AccessStatus
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByType (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    OUT POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    OUT PGENERIC_MAPPING GenericMapping,
+    OUT PPRIVILEGE_SET PrivilegeSet,
+    OUT LPDWORD PrivilegeSetLength,
+    OUT LPDWORD GrantedAccess,
+    OUT LPBOOL AccessStatus
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeResultList (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    OUT POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    OUT PGENERIC_MAPPING GenericMapping,
+    OUT PPRIVILEGE_SET PrivilegeSet,
+    OUT LPDWORD PrivilegeSetLength,
+    OUT LPDWORD GrantedAccessList,
+    OUT LPDWORD AccessStatusList
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+
+WINADVAPI
+BOOL
+WINAPI
+OpenProcessToken (
+    IN HANDLE ProcessHandle,
+    IN DWORD DesiredAccess,
+    OUT PHANDLE TokenHandle
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+OpenThreadToken (
+    IN HANDLE ThreadHandle,
+    IN DWORD DesiredAccess,
+    IN BOOL OpenAsSelf,
+    OUT PHANDLE TokenHandle
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetTokenInformation (
+    IN HANDLE TokenHandle,
+    IN TOKEN_INFORMATION_CLASS TokenInformationClass,
+    OUT LPVOID TokenInformation,
+    IN DWORD TokenInformationLength,
+    OUT PDWORD ReturnLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+SetTokenInformation (
+    IN HANDLE TokenHandle,
+    IN TOKEN_INFORMATION_CLASS TokenInformationClass,
+    IN LPVOID TokenInformation,
+    IN DWORD TokenInformationLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AdjustTokenPrivileges (
+    IN HANDLE TokenHandle,
+    IN BOOL DisableAllPrivileges,
+    IN PTOKEN_PRIVILEGES NewState,
+    IN DWORD BufferLength,
+    OUT PTOKEN_PRIVILEGES PreviousState,
+    OUT PDWORD ReturnLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AdjustTokenGroups (
+    IN HANDLE TokenHandle,
+    IN BOOL ResetToDefault,
+    IN PTOKEN_GROUPS NewState,
+    IN DWORD BufferLength,
+    OUT PTOKEN_GROUPS PreviousState,
+    OUT PDWORD ReturnLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+PrivilegeCheck (
+    IN HANDLE ClientToken,
+    IN PPRIVILEGE_SET RequiredPrivileges,
+    OUT LPBOOL pfResult
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckAndAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPSTR ObjectTypeName,
+    IN LPSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN DWORD DesiredAccess,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPBOOL AccessStatus,
+    OUT LPBOOL pfGenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckAndAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPWSTR ObjectTypeName,
+    IN LPWSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN DWORD DesiredAccess,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPBOOL AccessStatus,
+    OUT LPBOOL pfGenerateOnClose
+    );
+#ifdef UNICODE
+#define AccessCheckAndAuditAlarm  AccessCheckAndAuditAlarmW
+#else
+#define AccessCheckAndAuditAlarm  AccessCheckAndAuditAlarmA
+#endif // !UNICODE
+
+#if(_WIN32_WINNT >= 0x0500)
+
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeAndAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPCSTR ObjectTypeName,
+    IN LPCSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN DWORD DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN DWORD Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPBOOL AccessStatus,
+    OUT LPBOOL pfGenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeAndAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPCWSTR ObjectTypeName,
+    IN LPCWSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN DWORD DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN DWORD Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPBOOL AccessStatus,
+    OUT LPBOOL pfGenerateOnClose
+    );
+#ifdef UNICODE
+#define AccessCheckByTypeAndAuditAlarm  AccessCheckByTypeAndAuditAlarmW
+#else
+#define AccessCheckByTypeAndAuditAlarm  AccessCheckByTypeAndAuditAlarmA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeResultListAndAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPCSTR ObjectTypeName,
+    IN LPCSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN DWORD DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN DWORD Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPDWORD AccessStatusList,
+    OUT LPBOOL pfGenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeResultListAndAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPCWSTR ObjectTypeName,
+    IN LPCWSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN DWORD DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN DWORD Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPDWORD AccessStatusList,
+    OUT LPBOOL pfGenerateOnClose
+    );
+#ifdef UNICODE
+#define AccessCheckByTypeResultListAndAuditAlarm  AccessCheckByTypeResultListAndAuditAlarmW
+#else
+#define AccessCheckByTypeResultListAndAuditAlarm  AccessCheckByTypeResultListAndAuditAlarmA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeResultListAndAuditAlarmByHandleA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN HANDLE ClientToken,
+    IN LPCSTR ObjectTypeName,
+    IN LPCSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN DWORD DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN DWORD Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPDWORD AccessStatusList,
+    OUT LPBOOL pfGenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+AccessCheckByTypeResultListAndAuditAlarmByHandleW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN HANDLE ClientToken,
+    IN LPCWSTR ObjectTypeName,
+    IN LPCWSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN DWORD DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN DWORD Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN DWORD ObjectTypeListLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOL ObjectCreation,
+    OUT LPDWORD GrantedAccess,
+    OUT LPDWORD AccessStatusList,
+    OUT LPBOOL pfGenerateOnClose
+    );
+#ifdef UNICODE
+#define AccessCheckByTypeResultListAndAuditAlarmByHandle  AccessCheckByTypeResultListAndAuditAlarmByHandleW
+#else
+#define AccessCheckByTypeResultListAndAuditAlarmByHandle  AccessCheckByTypeResultListAndAuditAlarmByHandleA
+#endif // !UNICODE
+
+#endif //(_WIN32_WINNT >= 0x0500)
+
+
+WINADVAPI
+BOOL
+WINAPI
+ObjectOpenAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPSTR ObjectTypeName,
+    IN LPSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    IN DWORD GrantedAccess,
+    IN PPRIVILEGE_SET Privileges,
+    IN BOOL ObjectCreation,
+    IN BOOL AccessGranted,
+    OUT LPBOOL GenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+ObjectOpenAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN LPWSTR ObjectTypeName,
+    IN LPWSTR ObjectName,
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    IN DWORD GrantedAccess,
+    IN PPRIVILEGE_SET Privileges,
+    IN BOOL ObjectCreation,
+    IN BOOL AccessGranted,
+    OUT LPBOOL GenerateOnClose
+    );
+#ifdef UNICODE
+#define ObjectOpenAuditAlarm  ObjectOpenAuditAlarmW
+#else
+#define ObjectOpenAuditAlarm  ObjectOpenAuditAlarmA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+ObjectPrivilegeAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    IN PPRIVILEGE_SET Privileges,
+    IN BOOL AccessGranted
+    );
+WINADVAPI
+BOOL
+WINAPI
+ObjectPrivilegeAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN HANDLE ClientToken,
+    IN DWORD DesiredAccess,
+    IN PPRIVILEGE_SET Privileges,
+    IN BOOL AccessGranted
+    );
+#ifdef UNICODE
+#define ObjectPrivilegeAuditAlarm  ObjectPrivilegeAuditAlarmW
+#else
+#define ObjectPrivilegeAuditAlarm  ObjectPrivilegeAuditAlarmA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+ObjectCloseAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN BOOL GenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+ObjectCloseAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN BOOL GenerateOnClose
+    );
+#ifdef UNICODE
+#define ObjectCloseAuditAlarm  ObjectCloseAuditAlarmW
+#else
+#define ObjectCloseAuditAlarm  ObjectCloseAuditAlarmA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+ObjectDeleteAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN BOOL GenerateOnClose
+    );
+WINADVAPI
+BOOL
+WINAPI
+ObjectDeleteAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPVOID HandleId,
+    IN BOOL GenerateOnClose
+    );
+#ifdef UNICODE
+#define ObjectDeleteAuditAlarm  ObjectDeleteAuditAlarmW
+#else
+#define ObjectDeleteAuditAlarm  ObjectDeleteAuditAlarmA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+PrivilegedServiceAuditAlarmA (
+    IN LPCSTR SubsystemName,
+    IN LPCSTR ServiceName,
+    IN HANDLE ClientToken,
+    IN PPRIVILEGE_SET Privileges,
+    IN BOOL AccessGranted
+    );
+WINADVAPI
+BOOL
+WINAPI
+PrivilegedServiceAuditAlarmW (
+    IN LPCWSTR SubsystemName,
+    IN LPCWSTR ServiceName,
+    IN HANDLE ClientToken,
+    IN PPRIVILEGE_SET Privileges,
+    IN BOOL AccessGranted
+    );
+#ifdef UNICODE
+#define PrivilegedServiceAuditAlarm  PrivilegedServiceAuditAlarmW
+#else
+#define PrivilegedServiceAuditAlarm  PrivilegedServiceAuditAlarmA
+#endif // !UNICODE
+
+
+
+#if(_WIN32_WINNT >= 0x0501)
+
+
+WINADVAPI
+BOOL
+WINAPI
+IsWellKnownSid (
+    IN  PSID pSid,
+    IN  WELL_KNOWN_SID_TYPE WellKnownSidType
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CreateWellKnownSid(
+    IN WELL_KNOWN_SID_TYPE WellKnownSidType,
+    IN PSID DomainSid  OPTIONAL,
+    OUT PSID pSid,
+    IN OUT DWORD *cbSid
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+EqualDomainSid(
+    IN PSID pSid1,
+    IN PSID pSid2,
+    OUT BOOL *pfEqual
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+GetWindowsAccountDomainSid(
+    IN PSID pSid,
+    OUT PSID ppDomainSid OPTIONAL,
+    IN OUT DWORD *cbSid
+    );
+
+#endif //(_WIN32_WINNT >= 0x0501)
+
+WINADVAPI
+BOOL
+WINAPI
+IsValidSid (
+    IN PSID pSid
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+EqualSid (
+    IN PSID pSid1,
+    IN PSID pSid2
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+EqualPrefixSid (
+    PSID pSid1,
+    PSID pSid2
+    );
+
+
+WINADVAPI
+DWORD
+WINAPI
+GetSidLengthRequired (
+    IN UCHAR nSubAuthorityCount
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AllocateAndInitializeSid (
+    IN PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
+    IN BYTE nSubAuthorityCount,
+    IN DWORD nSubAuthority0,
+    IN DWORD nSubAuthority1,
+    IN DWORD nSubAuthority2,
+    IN DWORD nSubAuthority3,
+    IN DWORD nSubAuthority4,
+    IN DWORD nSubAuthority5,
+    IN DWORD nSubAuthority6,
+    IN DWORD nSubAuthority7,
+    OUT PSID *pSid
+    );
+
+WINADVAPI
+PVOID
+WINAPI
+FreeSid(
+    IN PSID pSid
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+InitializeSid (
+    OUT PSID Sid,
+    IN PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
+    IN BYTE nSubAuthorityCount
+    );
+
+
+WINADVAPI
+PSID_IDENTIFIER_AUTHORITY
+WINAPI
+GetSidIdentifierAuthority (
+    IN PSID pSid
+    );
+
+
+WINADVAPI
+PDWORD
+WINAPI
+GetSidSubAuthority (
+    IN PSID pSid,
+    IN DWORD nSubAuthority
+    );
+
+
+WINADVAPI
+PUCHAR
+WINAPI
+GetSidSubAuthorityCount (
+    IN PSID pSid
+    );
+
+
+WINADVAPI
+DWORD
+WINAPI
+GetLengthSid (
+    IN PSID pSid
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+CopySid (
+    IN DWORD nDestinationSidLength,
+    OUT PSID pDestinationSid,
+    IN PSID pSourceSid
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AreAllAccessesGranted (
+    IN DWORD GrantedAccess,
+    IN DWORD DesiredAccess
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AreAnyAccessesGranted (
+    IN DWORD GrantedAccess,
+    IN DWORD DesiredAccess
+    );
+
+
+WINADVAPI
+VOID
+WINAPI
+MapGenericMask (
+    OUT PDWORD AccessMask,
+    IN PGENERIC_MAPPING GenericMapping
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+IsValidAcl (
+    IN PACL pAcl
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+InitializeAcl (
+    OUT PACL pAcl,
+    IN DWORD nAclLength,
+    IN DWORD dwAclRevision
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetAclInformation (
+    IN PACL pAcl,
+    OUT LPVOID pAclInformation,
+    IN DWORD nAclInformationLength,
+    IN ACL_INFORMATION_CLASS dwAclInformationClass
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+SetAclInformation (
+    IN PACL pAcl,
+    IN LPVOID pAclInformation,
+    IN DWORD nAclInformationLength,
+    IN ACL_INFORMATION_CLASS dwAclInformationClass
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AddAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD dwStartingAceIndex,
+    IN LPVOID pAceList,
+    IN DWORD nAceListLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+DeleteAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceIndex
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetAce (
+    IN PACL pAcl,
+    IN DWORD dwAceIndex,
+    OUT LPVOID *pAce
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+AddAccessAllowedAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AccessMask,
+    IN PSID pSid
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+AddAccessAllowedAceEx (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AceFlags,
+    IN DWORD AccessMask,
+    IN PSID pSid
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+
+WINADVAPI
+BOOL
+WINAPI
+AddAccessDeniedAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AccessMask,
+    IN PSID pSid
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+AddAccessDeniedAceEx (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AceFlags,
+    IN DWORD AccessMask,
+    IN PSID pSid
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+WINADVAPI
+BOOL
+WINAPI
+AddAuditAccessAce(
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD dwAccessMask,
+    IN PSID pSid,
+    IN BOOL bAuditSuccess,
+    IN BOOL bAuditFailure
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+AddAuditAccessAceEx(
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AceFlags,
+    IN DWORD dwAccessMask,
+    IN PSID pSid,
+    IN BOOL bAuditSuccess,
+    IN BOOL bAuditFailure
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+AddAccessAllowedObjectAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AceFlags,
+    IN DWORD AccessMask,
+    IN GUID *ObjectTypeGuid,
+    IN GUID *InheritedObjectTypeGuid,
+    IN PSID pSid
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+AddAccessDeniedObjectAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AceFlags,
+    IN DWORD AccessMask,
+    IN GUID *ObjectTypeGuid,
+    IN GUID *InheritedObjectTypeGuid,
+    IN PSID pSid
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+AddAuditAccessObjectAce (
+    IN OUT PACL pAcl,
+    IN DWORD dwAceRevision,
+    IN DWORD AceFlags,
+    IN DWORD AccessMask,
+    IN GUID *ObjectTypeGuid,
+    IN GUID *InheritedObjectTypeGuid,
+    IN PSID pSid,
+    IN BOOL bAuditSuccess,
+    IN BOOL bAuditFailure
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+WINADVAPI
+BOOL
+WINAPI
+FindFirstFreeAce (
+    IN PACL pAcl,
+    OUT LPVOID *pAce
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+InitializeSecurityDescriptor (
+    OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN DWORD dwRevision
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+IsValidSecurityDescriptor (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor
+    );
+
+
+WINADVAPI
+DWORD
+WINAPI
+GetSecurityDescriptorLength (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetSecurityDescriptorControl (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    OUT PSECURITY_DESCRIPTOR_CONTROL pControl,
+    OUT LPDWORD lpdwRevision
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+SetSecurityDescriptorControl (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest,
+    IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+WINADVAPI
+BOOL
+WINAPI
+SetSecurityDescriptorDacl (
+    IN OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN BOOL bDaclPresent,
+    IN PACL pDacl,
+    IN BOOL bDaclDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetSecurityDescriptorDacl (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    OUT LPBOOL lpbDaclPresent,
+    OUT PACL *pDacl,
+    OUT LPBOOL lpbDaclDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+SetSecurityDescriptorSacl (
+    IN OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN BOOL bSaclPresent,
+    IN PACL pSacl,
+    IN BOOL bSaclDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetSecurityDescriptorSacl (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    OUT LPBOOL lpbSaclPresent,
+    OUT PACL *pSacl,
+    OUT LPBOOL lpbSaclDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+SetSecurityDescriptorOwner (
+    IN OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN PSID pOwner,
+    IN BOOL bOwnerDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetSecurityDescriptorOwner (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    OUT PSID *pOwner,
+    OUT LPBOOL lpbOwnerDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+SetSecurityDescriptorGroup (
+    IN OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN PSID pGroup,
+    IN BOOL bGroupDefaulted
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetSecurityDescriptorGroup (
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    OUT PSID *pGroup,
+    OUT LPBOOL lpbGroupDefaulted
+    );
+
+
+WINADVAPI
+DWORD
+WINAPI
+SetSecurityDescriptorRMControl(
+    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PUCHAR RMControl OPTIONAL
+    );
+
+WINADVAPI
+DWORD
+WINAPI
+GetSecurityDescriptorRMControl(
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    OUT PUCHAR RMControl
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CreatePrivateObjectSecurity (
+    IN PSECURITY_DESCRIPTOR ParentDescriptor,
+    IN PSECURITY_DESCRIPTOR CreatorDescriptor,
+    OUT PSECURITY_DESCRIPTOR * NewDescriptor,
+    IN BOOL IsDirectoryObject,
+    IN HANDLE Token,
+    IN PGENERIC_MAPPING GenericMapping
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+ConvertToAutoInheritPrivateObjectSecurity(
+    IN PSECURITY_DESCRIPTOR ParentDescriptor,
+    IN PSECURITY_DESCRIPTOR CurrentSecurityDescriptor,
+    OUT PSECURITY_DESCRIPTOR *NewSecurityDescriptor,
+    IN GUID *ObjectType,
+    IN BOOLEAN IsDirectoryObject,
+    IN PGENERIC_MAPPING GenericMapping
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CreatePrivateObjectSecurityEx (
+    IN PSECURITY_DESCRIPTOR ParentDescriptor,
+    IN PSECURITY_DESCRIPTOR CreatorDescriptor,
+    OUT PSECURITY_DESCRIPTOR * NewDescriptor,
+    IN GUID *ObjectType OPTIONAL,
+    IN BOOL IsContainerObject,
+    IN ULONG AutoInheritFlags,
+    IN HANDLE Token,
+    IN PGENERIC_MAPPING GenericMapping
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CreatePrivateObjectSecurityWithMultipleInheritance (
+    IN PSECURITY_DESCRIPTOR ParentDescriptor,
+    IN PSECURITY_DESCRIPTOR CreatorDescriptor,
+    OUT PSECURITY_DESCRIPTOR * NewDescriptor,
+    IN GUID **ObjectTypes OPTIONAL,
+    IN ULONG GuidCount,
+    IN BOOL IsContainerObject,
+    IN ULONG AutoInheritFlags,
+    IN HANDLE Token,
+    IN PGENERIC_MAPPING GenericMapping
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+WINADVAPI
+BOOL
+WINAPI
+SetPrivateObjectSecurity (
+    IN SECURITY_INFORMATION SecurityInformation,
+    IN PSECURITY_DESCRIPTOR ModificationDescriptor,
+    OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN HANDLE Token
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINADVAPI
+BOOL
+WINAPI
+SetPrivateObjectSecurityEx (
+    IN SECURITY_INFORMATION SecurityInformation,
+    IN PSECURITY_DESCRIPTOR ModificationDescriptor,
+    OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
+    IN ULONG AutoInheritFlags,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN HANDLE Token OPTIONAL
+    );
+#endif /* _WIN32_WINNT >=  0x0500 */
+
+WINADVAPI
+BOOL
+WINAPI
+GetPrivateObjectSecurity (
+    IN PSECURITY_DESCRIPTOR ObjectDescriptor,
+    IN SECURITY_INFORMATION SecurityInformation,
+    OUT PSECURITY_DESCRIPTOR ResultantDescriptor,
+    IN DWORD DescriptorLength,
+    OUT PDWORD ReturnLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+DestroyPrivateObjectSecurity (
+    IN OUT PSECURITY_DESCRIPTOR * ObjectDescriptor
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+MakeSelfRelativeSD (
+    IN PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
+    OUT PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
+    OUT LPDWORD lpdwBufferLength
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+MakeAbsoluteSD (
+    IN PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
+    OUT PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
+    OUT LPDWORD lpdwAbsoluteSecurityDescriptorSize,
+    OUT PACL pDacl,
+    OUT LPDWORD lpdwDaclSize,
+    OUT PACL pSacl,
+    OUT LPDWORD lpdwSaclSize,
+    OUT PSID pOwner,
+    OUT LPDWORD lpdwOwnerSize,
+    OUT PSID pPrimaryGroup,
+    OUT LPDWORD lpdwPrimaryGroupSize
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+MakeAbsoluteSD2 (
+    IN PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
+    OUT LPDWORD lpdwBufferSize
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+SetFileSecurityA (
+    IN LPCSTR lpFileName,
+    IN SECURITY_INFORMATION SecurityInformation,
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor
+    );
+WINADVAPI
+BOOL
+WINAPI
+SetFileSecurityW (
+    IN LPCWSTR lpFileName,
+    IN SECURITY_INFORMATION SecurityInformation,
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor
+    );
+#ifdef UNICODE
+#define SetFileSecurity  SetFileSecurityW
+#else
+#define SetFileSecurity  SetFileSecurityA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetFileSecurityA (
+    IN LPCSTR lpFileName,
+    IN SECURITY_INFORMATION RequestedInformation,
+    OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN DWORD nLength,
+    OUT LPDWORD lpnLengthNeeded
+    );
+WINADVAPI
+BOOL
+WINAPI
+GetFileSecurityW (
+    IN LPCWSTR lpFileName,
+    IN SECURITY_INFORMATION RequestedInformation,
+    OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN DWORD nLength,
+    OUT LPDWORD lpnLengthNeeded
+    );
+#ifdef UNICODE
+#define GetFileSecurity  GetFileSecurityW
+#else
+#define GetFileSecurity  GetFileSecurityA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+SetKernelObjectSecurity (
+    IN HANDLE Handle,
+    IN SECURITY_INFORMATION SecurityInformation,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstChangeNotificationA(
+    IN LPCSTR lpPathName,
+    IN BOOL bWatchSubtree,
+    IN DWORD dwNotifyFilter
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstChangeNotificationW(
+    IN LPCWSTR lpPathName,
+    IN BOOL bWatchSubtree,
+    IN DWORD dwNotifyFilter
+    );
+#ifdef UNICODE
+#define FindFirstChangeNotification  FindFirstChangeNotificationW
+#else
+#define FindFirstChangeNotification  FindFirstChangeNotificationA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindNextChangeNotification(
+    IN HANDLE hChangeHandle
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FindCloseChangeNotification(
+    IN HANDLE hChangeHandle
+    );
+
+#if(_WIN32_WINNT >= 0x0400)
+WINBASEAPI
+BOOL
+WINAPI
+ReadDirectoryChangesW(
+    IN HANDLE hDirectory,
+    IN OUT LPVOID lpBuffer,
+    IN DWORD nBufferLength,
+    IN BOOL bWatchSubtree,
+    IN DWORD dwNotifyFilter,
+    OUT LPDWORD lpBytesReturned,
+    IN LPOVERLAPPED lpOverlapped,
+    IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+WINBASEAPI
+BOOL
+WINAPI
+VirtualLock(
+    IN LPVOID lpAddress,
+    IN SIZE_T dwSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+VirtualUnlock(
+    IN LPVOID lpAddress,
+    IN SIZE_T dwSize
+    );
+
+WINBASEAPI
+LPVOID
+WINAPI
+MapViewOfFileEx(
+    IN HANDLE hFileMappingObject,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwFileOffsetHigh,
+    IN DWORD dwFileOffsetLow,
+    IN SIZE_T dwNumberOfBytesToMap,
+    IN LPVOID lpBaseAddress
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetPriorityClass(
+    IN HANDLE hProcess,
+    IN DWORD dwPriorityClass
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetPriorityClass(
+    IN HANDLE hProcess
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsBadReadPtr(
+    IN CONST VOID *lp,
+    IN UINT_PTR ucb
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsBadWritePtr(
+    IN LPVOID lp,
+    IN UINT_PTR ucb
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsBadHugeReadPtr(
+    IN CONST VOID *lp,
+    IN UINT_PTR ucb
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsBadHugeWritePtr(
+    IN LPVOID lp,
+    IN UINT_PTR ucb
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsBadCodePtr(
+    IN FARPROC lpfn
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsBadStringPtrA(
+    IN LPCSTR lpsz,
+    IN UINT_PTR ucchMax
+    );
+WINBASEAPI
+BOOL
+WINAPI
+IsBadStringPtrW(
+    IN LPCWSTR lpsz,
+    IN UINT_PTR ucchMax
+    );
+#ifdef UNICODE
+#define IsBadStringPtr  IsBadStringPtrW
+#else
+#define IsBadStringPtr  IsBadStringPtrA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+LookupAccountSidA(
+    IN LPCSTR lpSystemName,
+    IN PSID Sid,
+    OUT LPSTR Name,
+    IN OUT LPDWORD cbName,
+    OUT LPSTR ReferencedDomainName,
+    IN OUT LPDWORD cbReferencedDomainName,
+    OUT PSID_NAME_USE peUse
+    );
+WINADVAPI
+BOOL
+WINAPI
+LookupAccountSidW(
+    IN LPCWSTR lpSystemName,
+    IN PSID Sid,
+    OUT LPWSTR Name,
+    IN OUT LPDWORD cbName,
+    OUT LPWSTR ReferencedDomainName,
+    IN OUT LPDWORD cbReferencedDomainName,
+    OUT PSID_NAME_USE peUse
+    );
+#ifdef UNICODE
+#define LookupAccountSid  LookupAccountSidW
+#else
+#define LookupAccountSid  LookupAccountSidA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+LookupAccountNameA(
+    IN LPCSTR lpSystemName,
+    IN LPCSTR lpAccountName,
+    OUT PSID Sid,
+    IN OUT LPDWORD cbSid,
+    OUT LPSTR ReferencedDomainName,
+    IN OUT LPDWORD cbReferencedDomainName,
+    OUT PSID_NAME_USE peUse
+    );
+WINADVAPI
+BOOL
+WINAPI
+LookupAccountNameW(
+    IN LPCWSTR lpSystemName,
+    IN LPCWSTR lpAccountName,
+    OUT PSID Sid,
+    IN OUT LPDWORD cbSid,
+    OUT LPWSTR ReferencedDomainName,
+    IN OUT LPDWORD cbReferencedDomainName,
+    OUT PSID_NAME_USE peUse
+    );
+#ifdef UNICODE
+#define LookupAccountName  LookupAccountNameW
+#else
+#define LookupAccountName  LookupAccountNameA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+LookupPrivilegeValueA(
+    IN LPCSTR lpSystemName,
+    IN LPCSTR lpName,
+    OUT PLUID   lpLuid
+    );
+WINADVAPI
+BOOL
+WINAPI
+LookupPrivilegeValueW(
+    IN LPCWSTR lpSystemName,
+    IN LPCWSTR lpName,
+    OUT PLUID   lpLuid
+    );
+#ifdef UNICODE
+#define LookupPrivilegeValue  LookupPrivilegeValueW
+#else
+#define LookupPrivilegeValue  LookupPrivilegeValueA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+LookupPrivilegeNameA(
+    IN LPCSTR lpSystemName,
+    IN PLUID   lpLuid,
+    OUT LPSTR lpName,
+    IN OUT LPDWORD cbName
+    );
+WINADVAPI
+BOOL
+WINAPI
+LookupPrivilegeNameW(
+    IN LPCWSTR lpSystemName,
+    IN PLUID   lpLuid,
+    OUT LPWSTR lpName,
+    IN OUT LPDWORD cbName
+    );
+#ifdef UNICODE
+#define LookupPrivilegeName  LookupPrivilegeNameW
+#else
+#define LookupPrivilegeName  LookupPrivilegeNameA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+LookupPrivilegeDisplayNameA(
+    IN LPCSTR lpSystemName,
+    IN LPCSTR lpName,
+    OUT LPSTR lpDisplayName,
+    IN OUT LPDWORD cbDisplayName,
+    OUT LPDWORD lpLanguageId
+    );
+WINADVAPI
+BOOL
+WINAPI
+LookupPrivilegeDisplayNameW(
+    IN LPCWSTR lpSystemName,
+    IN LPCWSTR lpName,
+    OUT LPWSTR lpDisplayName,
+    IN OUT LPDWORD cbDisplayName,
+    OUT LPDWORD lpLanguageId
+    );
+#ifdef UNICODE
+#define LookupPrivilegeDisplayName  LookupPrivilegeDisplayNameW
+#else
+#define LookupPrivilegeDisplayName  LookupPrivilegeDisplayNameA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+AllocateLocallyUniqueId(
+    OUT PLUID Luid
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+BuildCommDCBA(
+    IN LPCSTR lpDef,
+    OUT LPDCB lpDCB
+    );
+WINBASEAPI
+BOOL
+WINAPI
+BuildCommDCBW(
+    IN LPCWSTR lpDef,
+    OUT LPDCB lpDCB
+    );
+#ifdef UNICODE
+#define BuildCommDCB  BuildCommDCBW
+#else
+#define BuildCommDCB  BuildCommDCBA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+BuildCommDCBAndTimeoutsA(
+    IN LPCSTR lpDef,
+    OUT LPDCB lpDCB,
+    IN LPCOMMTIMEOUTS lpCommTimeouts
+    );
+WINBASEAPI
+BOOL
+WINAPI
+BuildCommDCBAndTimeoutsW(
+    IN LPCWSTR lpDef,
+    OUT LPDCB lpDCB,
+    IN LPCOMMTIMEOUTS lpCommTimeouts
+    );
+#ifdef UNICODE
+#define BuildCommDCBAndTimeouts  BuildCommDCBAndTimeoutsW
+#else
+#define BuildCommDCBAndTimeouts  BuildCommDCBAndTimeoutsA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+CommConfigDialogA(
+    IN LPCSTR lpszName,
+    IN HWND hWnd,
+    IN OUT LPCOMMCONFIG lpCC
+    );
+WINBASEAPI
+BOOL
+WINAPI
+CommConfigDialogW(
+    IN LPCWSTR lpszName,
+    IN HWND hWnd,
+    IN OUT LPCOMMCONFIG lpCC
+    );
+#ifdef UNICODE
+#define CommConfigDialog  CommConfigDialogW
+#else
+#define CommConfigDialog  CommConfigDialogA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetDefaultCommConfigA(
+    IN LPCSTR lpszName,
+    OUT LPCOMMCONFIG lpCC,
+    IN OUT LPDWORD lpdwSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetDefaultCommConfigW(
+    IN LPCWSTR lpszName,
+    OUT LPCOMMCONFIG lpCC,
+    IN OUT LPDWORD lpdwSize
+    );
+#ifdef UNICODE
+#define GetDefaultCommConfig  GetDefaultCommConfigW
+#else
+#define GetDefaultCommConfig  GetDefaultCommConfigA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetDefaultCommConfigA(
+    IN LPCSTR lpszName,
+    IN LPCOMMCONFIG lpCC,
+    IN DWORD dwSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetDefaultCommConfigW(
+    IN LPCWSTR lpszName,
+    IN LPCOMMCONFIG lpCC,
+    IN DWORD dwSize
+    );
+#ifdef UNICODE
+#define SetDefaultCommConfig  SetDefaultCommConfigW
+#else
+#define SetDefaultCommConfig  SetDefaultCommConfigA
+#endif // !UNICODE
+
+#ifndef _MAC
+#define MAX_COMPUTERNAME_LENGTH 15
+#else
+#define MAX_COMPUTERNAME_LENGTH 31
+#endif
+
+WINBASEAPI
+BOOL
+WINAPI
+GetComputerNameA (
+    OUT LPSTR lpBuffer,
+    IN OUT LPDWORD nSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetComputerNameW (
+    OUT LPWSTR lpBuffer,
+    IN OUT LPDWORD nSize
+    );
+#ifdef UNICODE
+#define GetComputerName  GetComputerNameW
+#else
+#define GetComputerName  GetComputerNameA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetComputerNameA (
+    IN LPCSTR lpComputerName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetComputerNameW (
+    IN LPCWSTR lpComputerName
+    );
+#ifdef UNICODE
+#define SetComputerName  SetComputerNameW
+#else
+#define SetComputerName  SetComputerNameA
+#endif // !UNICODE
+
+
+#if (_WIN32_WINNT >= 0x0500)
+
+typedef enum _COMPUTER_NAME_FORMAT {
+    ComputerNameNetBIOS,
+    ComputerNameDnsHostname,
+    ComputerNameDnsDomain,
+    ComputerNameDnsFullyQualified,
+    ComputerNamePhysicalNetBIOS,
+    ComputerNamePhysicalDnsHostname,
+    ComputerNamePhysicalDnsDomain,
+    ComputerNamePhysicalDnsFullyQualified,
+    ComputerNameMax
+} COMPUTER_NAME_FORMAT ;
+
+WINBASEAPI
+BOOL
+WINAPI
+GetComputerNameExA (
+    IN COMPUTER_NAME_FORMAT NameType,
+    OUT LPSTR lpBuffer,
+    IN OUT LPDWORD nSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetComputerNameExW (
+    IN COMPUTER_NAME_FORMAT NameType,
+    OUT LPWSTR lpBuffer,
+    IN OUT LPDWORD nSize
+    );
+#ifdef UNICODE
+#define GetComputerNameEx  GetComputerNameExW
+#else
+#define GetComputerNameEx  GetComputerNameExA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetComputerNameExA (
+    IN COMPUTER_NAME_FORMAT NameType,
+    IN LPCSTR lpBuffer
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetComputerNameExW (
+    IN COMPUTER_NAME_FORMAT NameType,
+    IN LPCWSTR lpBuffer
+    );
+#ifdef UNICODE
+#define SetComputerNameEx  SetComputerNameExW
+#else
+#define SetComputerNameEx  SetComputerNameExA
+#endif // !UNICODE
+    
+WINBASEAPI
+DWORD
+WINAPI
+AddLocalAlternateComputerNameA (
+    IN LPCSTR lpDnsFQHostname,
+    IN ULONG    ulFlags
+    );
+WINBASEAPI
+DWORD
+WINAPI
+AddLocalAlternateComputerNameW (
+    IN LPCWSTR lpDnsFQHostname,
+    IN ULONG    ulFlags
+    );
+#ifdef UNICODE
+#define AddLocalAlternateComputerName  AddLocalAlternateComputerNameW
+#else
+#define AddLocalAlternateComputerName  AddLocalAlternateComputerNameA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+RemoveLocalAlternateComputerNameA (
+    IN LPCSTR lpAltDnsFQHostname,
+    IN ULONG    ulFlags
+    );
+WINBASEAPI
+DWORD
+WINAPI
+RemoveLocalAlternateComputerNameW (
+    IN LPCWSTR lpAltDnsFQHostname,
+    IN ULONG    ulFlags
+    );
+#ifdef UNICODE
+#define RemoveLocalAlternateComputerName  RemoveLocalAlternateComputerNameW
+#else
+#define RemoveLocalAlternateComputerName  RemoveLocalAlternateComputerNameA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+WINAPI
+SetLocalPrimaryComputerNameA (
+    IN LPCSTR  lpAltDnsFQHostname,
+    IN ULONG     ulFlags
+    );
+WINBASEAPI
+DWORD
+WINAPI
+SetLocalPrimaryComputerNameW (
+    IN LPCWSTR  lpAltDnsFQHostname,
+    IN ULONG     ulFlags
+    );
+#ifdef UNICODE
+#define SetLocalPrimaryComputerName  SetLocalPrimaryComputerNameW
+#else
+#define SetLocalPrimaryComputerName  SetLocalPrimaryComputerNameA
+#endif // !UNICODE
+
+typedef enum _COMPUTER_NAME_TYPE {
+    PrimaryComputerName,
+    AlternateComputerNames,
+    AllComputerNames,
+    ComputerNameTypeMax
+} COMPUTER_NAME_TYPE ;
+
+WINBASEAPI
+DWORD
+WINAPI
+EnumerateLocalComputerNamesA (
+    IN COMPUTER_NAME_TYPE        NameType,
+    IN ULONG                     ulFlags,
+    IN OUT LPSTR               lpDnsFQHostname,
+    IN OUT LPDWORD               nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+EnumerateLocalComputerNamesW (
+    IN COMPUTER_NAME_TYPE        NameType,
+    IN ULONG                     ulFlags,
+    IN OUT LPWSTR               lpDnsFQHostname,
+    IN OUT LPDWORD               nSize
+    );
+#ifdef UNICODE
+#define EnumerateLocalComputerNames  EnumerateLocalComputerNamesW
+#else
+#define EnumerateLocalComputerNames  EnumerateLocalComputerNamesA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+DnsHostnameToComputerNameA (
+    IN LPCSTR Hostname,
+    OUT LPSTR ComputerName,
+    IN OUT LPDWORD nSize
+    );
+WINBASEAPI
+BOOL
+WINAPI
+DnsHostnameToComputerNameW (
+    IN LPCWSTR Hostname,
+    OUT LPWSTR ComputerName,
+    IN OUT LPDWORD nSize
+    );
+#ifdef UNICODE
+#define DnsHostnameToComputerName  DnsHostnameToComputerNameW
+#else
+#define DnsHostnameToComputerName  DnsHostnameToComputerNameA
+#endif // !UNICODE
+
+#endif // _WIN32_WINNT
+
+WINADVAPI
+BOOL
+WINAPI
+GetUserNameA (
+    OUT LPSTR lpBuffer,
+    IN OUT LPDWORD nSize
+    );
+WINADVAPI
+BOOL
+WINAPI
+GetUserNameW (
+    OUT LPWSTR lpBuffer,
+    IN OUT LPDWORD nSize
+    );
+#ifdef UNICODE
+#define GetUserName  GetUserNameW
+#else
+#define GetUserName  GetUserNameA
+#endif // !UNICODE
+
+//
+// Logon Support APIs
+//
+
+#define LOGON32_LOGON_INTERACTIVE       2
+#define LOGON32_LOGON_NETWORK           3
+#define LOGON32_LOGON_BATCH             4
+#define LOGON32_LOGON_SERVICE           5
+#define LOGON32_LOGON_UNLOCK            7
+#if(_WIN32_WINNT >= 0x0500)
+#define LOGON32_LOGON_NETWORK_CLEARTEXT 8
+#define LOGON32_LOGON_NEW_CREDENTIALS   9
+#endif // (_WIN32_WINNT >= 0x0500)
+
+#define LOGON32_PROVIDER_DEFAULT    0
+#define LOGON32_PROVIDER_WINNT35    1
+#if(_WIN32_WINNT >= 0x0400)
+#define LOGON32_PROVIDER_WINNT40    2
+#endif /* _WIN32_WINNT >= 0x0400 */
+#if(_WIN32_WINNT >= 0x0500)
+#define LOGON32_PROVIDER_WINNT50    3
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+
+WINADVAPI
+BOOL
+WINAPI
+LogonUserA (
+    IN LPCSTR lpszUsername,
+    IN LPCSTR lpszDomain,
+    IN LPCSTR lpszPassword,
+    IN DWORD dwLogonType,
+    IN DWORD dwLogonProvider,
+    OUT PHANDLE phToken
+    );
+WINADVAPI
+BOOL
+WINAPI
+LogonUserW (
+    IN LPCWSTR lpszUsername,
+    IN LPCWSTR lpszDomain,
+    IN LPCWSTR lpszPassword,
+    IN DWORD dwLogonType,
+    IN DWORD dwLogonProvider,
+    OUT PHANDLE phToken
+    );
+#ifdef UNICODE
+#define LogonUser  LogonUserW
+#else
+#define LogonUser  LogonUserA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+LogonUserExA (
+    IN LPCSTR lpszUsername,
+    IN LPCSTR lpszDomain,
+    IN LPCSTR lpszPassword,
+    IN DWORD dwLogonType,
+    IN DWORD dwLogonProvider,
+    OUT PHANDLE phToken           OPTIONAL,
+    OUT PSID  *ppLogonSid       OPTIONAL,
+    OUT PVOID *ppProfileBuffer  OPTIONAL,
+    OUT LPDWORD pdwProfileLength  OPTIONAL,
+    OUT PQUOTA_LIMITS pQuotaLimits OPTIONAL
+    );
+WINADVAPI
+BOOL
+WINAPI
+LogonUserExW (
+    IN LPCWSTR lpszUsername,
+    IN LPCWSTR lpszDomain,
+    IN LPCWSTR lpszPassword,
+    IN DWORD dwLogonType,
+    IN DWORD dwLogonProvider,
+    OUT PHANDLE phToken           OPTIONAL,
+    OUT PSID  *ppLogonSid       OPTIONAL,
+    OUT PVOID *ppProfileBuffer  OPTIONAL,
+    OUT LPDWORD pdwProfileLength  OPTIONAL,
+    OUT PQUOTA_LIMITS pQuotaLimits OPTIONAL
+    );
+#ifdef UNICODE
+#define LogonUserEx  LogonUserExW
+#else
+#define LogonUserEx  LogonUserExA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+ImpersonateLoggedOnUser(
+    IN HANDLE  hToken
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CreateProcessAsUserA (
+    IN HANDLE hToken,
+    IN LPCSTR lpApplicationName,
+    IN LPSTR lpCommandLine,
+    IN LPSECURITY_ATTRIBUTES lpProcessAttributes,
+    IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    IN BOOL bInheritHandles,
+    IN DWORD dwCreationFlags,
+    IN LPVOID lpEnvironment,
+    IN LPCSTR lpCurrentDirectory,
+    IN LPSTARTUPINFOA lpStartupInfo,
+    OUT LPPROCESS_INFORMATION lpProcessInformation
+    );
+WINADVAPI
+BOOL
+WINAPI
+CreateProcessAsUserW (
+    IN HANDLE hToken,
+    IN LPCWSTR lpApplicationName,
+    IN LPWSTR lpCommandLine,
+    IN LPSECURITY_ATTRIBUTES lpProcessAttributes,
+    IN LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    IN BOOL bInheritHandles,
+    IN DWORD dwCreationFlags,
+    IN LPVOID lpEnvironment,
+    IN LPCWSTR lpCurrentDirectory,
+    IN LPSTARTUPINFOW lpStartupInfo,
+    OUT LPPROCESS_INFORMATION lpProcessInformation
+    );
+#ifdef UNICODE
+#define CreateProcessAsUser  CreateProcessAsUserW
+#else
+#define CreateProcessAsUser  CreateProcessAsUserA
+#endif // !UNICODE
+
+
+#if(_WIN32_WINNT >= 0x0500)
+
+//
+// LogonFlags
+//
+#define LOGON_WITH_PROFILE              0x00000001
+#define LOGON_NETCREDENTIALS_ONLY       0x00000002
+#define LOGON_ZERO_PASSWORD_BUFFER      0x80000000
+
+WINADVAPI
+BOOL
+WINAPI
+CreateProcessWithLogonW(
+      LPCWSTR lpUsername,
+      LPCWSTR lpDomain,
+      LPCWSTR lpPassword,
+      DWORD   dwLogonFlags,
+      LPCWSTR lpApplicationName,
+      LPWSTR lpCommandLine,
+      DWORD dwCreationFlags,
+      LPVOID lpEnvironment,
+      LPCWSTR lpCurrentDirectory,
+      LPSTARTUPINFOW lpStartupInfo,
+      LPPROCESS_INFORMATION lpProcessInformation
+      );
+
+WINADVAPI
+BOOL
+WINAPI
+CreateProcessWithTokenW(
+      HANDLE hToken,
+      DWORD   dwLogonFlags,
+      LPCWSTR lpApplicationName,
+      LPWSTR lpCommandLine,
+      DWORD dwCreationFlags,
+      LPVOID lpEnvironment,
+      LPCWSTR lpCurrentDirectory,
+      LPSTARTUPINFOW lpStartupInfo,
+      LPPROCESS_INFORMATION lpProcessInformation
+      );
+
+#endif // (_WIN32_WINNT >= 0x0500)
+
+WINADVAPI
+BOOL
+APIENTRY
+ImpersonateAnonymousToken(
+    IN HANDLE ThreadHandle
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+DuplicateTokenEx(
+    IN HANDLE hExistingToken,
+    IN DWORD dwDesiredAccess,
+    IN LPSECURITY_ATTRIBUTES lpTokenAttributes,
+    IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel,
+    IN TOKEN_TYPE TokenType,
+    OUT PHANDLE phNewToken);
+
+WINADVAPI
+BOOL
+APIENTRY
+CreateRestrictedToken(
+    IN HANDLE ExistingTokenHandle,
+    IN DWORD Flags,
+    IN DWORD DisableSidCount,
+    IN PSID_AND_ATTRIBUTES SidsToDisable OPTIONAL,
+    IN DWORD DeletePrivilegeCount,
+    IN PLUID_AND_ATTRIBUTES PrivilegesToDelete OPTIONAL,
+    IN DWORD RestrictedSidCount,
+    IN PSID_AND_ATTRIBUTES SidsToRestrict OPTIONAL,
+    OUT PHANDLE NewTokenHandle
+    );
+
+
+WINADVAPI
+BOOL
+WINAPI
+IsTokenRestricted(
+    IN HANDLE TokenHandle
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+IsTokenUntrusted(
+    IN HANDLE TokenHandle
+    );
+
+
+BOOL
+APIENTRY
+CheckTokenMembership(
+    IN HANDLE TokenHandle OPTIONAL,
+    IN PSID SidToCheck,
+    OUT PBOOL IsMember
+    );
+
+//
+// Thread pool API's
+//
+
+#if (_WIN32_WINNT >= 0x0500)
+
+typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK ;
+
+WINBASEAPI
+BOOL
+WINAPI
+RegisterWaitForSingleObject(
+    PHANDLE phNewWaitObject,
+    HANDLE hObject,
+    WAITORTIMERCALLBACK Callback,
+    PVOID Context,
+    ULONG dwMilliseconds,
+    ULONG dwFlags
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+RegisterWaitForSingleObjectEx(
+    HANDLE hObject,
+    WAITORTIMERCALLBACK Callback,
+    PVOID Context,
+    ULONG dwMilliseconds,
+    ULONG dwFlags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+UnregisterWait(
+    HANDLE WaitHandle
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+UnregisterWaitEx(
+    HANDLE WaitHandle,
+    HANDLE CompletionEvent
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+QueueUserWorkItem(
+    LPTHREAD_START_ROUTINE Function,
+    PVOID Context,
+    ULONG Flags
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+BindIoCompletionCallback (
+    HANDLE FileHandle,
+    LPOVERLAPPED_COMPLETION_ROUTINE Function,
+    ULONG Flags
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateTimerQueue(
+    VOID
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+CreateTimerQueueTimer(
+    PHANDLE phNewTimer,
+    HANDLE TimerQueue,
+    WAITORTIMERCALLBACK Callback,
+    PVOID Parameter,
+    DWORD DueTime,
+    DWORD Period,
+    ULONG Flags
+    ) ;
+
+WINBASEAPI
+BOOL
+WINAPI
+ChangeTimerQueueTimer(
+    HANDLE TimerQueue,
+    HANDLE Timer,
+    ULONG DueTime,
+    ULONG Period
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DeleteTimerQueueTimer(
+    HANDLE TimerQueue,
+    HANDLE Timer,
+    HANDLE CompletionEvent
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DeleteTimerQueueEx(
+    HANDLE TimerQueue,
+    HANDLE CompletionEvent
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+SetTimerQueueTimer(
+    HANDLE TimerQueue,
+    WAITORTIMERCALLBACK Callback,
+    PVOID Parameter,
+    DWORD DueTime,
+    DWORD Period,
+    BOOL PreferIo
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+CancelTimerQueueTimer(
+    HANDLE TimerQueue,
+    HANDLE Timer
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+DeleteTimerQueue(
+    HANDLE TimerQueue
+    );
+
+#endif // _WIN32_WINNT
+
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Plug-and-Play API's
+//
+
+#define HW_PROFILE_GUIDLEN         39      // 36-characters plus NULL terminator
+#define MAX_PROFILE_LEN            80
+
+#define DOCKINFO_UNDOCKED          (0x1)
+#define DOCKINFO_DOCKED            (0x2)
+#define DOCKINFO_USER_SUPPLIED     (0x4)
+#define DOCKINFO_USER_UNDOCKED     (DOCKINFO_USER_SUPPLIED | DOCKINFO_UNDOCKED)
+#define DOCKINFO_USER_DOCKED       (DOCKINFO_USER_SUPPLIED | DOCKINFO_DOCKED)
+
+typedef struct tagHW_PROFILE_INFOA {
+    DWORD  dwDockInfo;
+    CHAR   szHwProfileGuid[HW_PROFILE_GUIDLEN];
+    CHAR   szHwProfileName[MAX_PROFILE_LEN];
+} HW_PROFILE_INFOA, *LPHW_PROFILE_INFOA;
+typedef struct tagHW_PROFILE_INFOW {
+    DWORD  dwDockInfo;
+    WCHAR  szHwProfileGuid[HW_PROFILE_GUIDLEN];
+    WCHAR  szHwProfileName[MAX_PROFILE_LEN];
+} HW_PROFILE_INFOW, *LPHW_PROFILE_INFOW;
+#ifdef UNICODE
+typedef HW_PROFILE_INFOW HW_PROFILE_INFO;
+typedef LPHW_PROFILE_INFOW LPHW_PROFILE_INFO;
+#else
+typedef HW_PROFILE_INFOA HW_PROFILE_INFO;
+typedef LPHW_PROFILE_INFOA LPHW_PROFILE_INFO;
+#endif // UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+GetCurrentHwProfileA (
+    OUT LPHW_PROFILE_INFOA  lpHwProfileInfo
+    );
+WINADVAPI
+BOOL
+WINAPI
+GetCurrentHwProfileW (
+    OUT LPHW_PROFILE_INFOW  lpHwProfileInfo
+    );
+#ifdef UNICODE
+#define GetCurrentHwProfile  GetCurrentHwProfileW
+#else
+#define GetCurrentHwProfile  GetCurrentHwProfileA
+#endif // !UNICODE
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+//
+// Performance counter API's
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+QueryPerformanceCounter(
+    OUT LARGE_INTEGER *lpPerformanceCount
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+QueryPerformanceFrequency(
+    OUT LARGE_INTEGER *lpFrequency
+    );
+
+
+
+WINBASEAPI
+BOOL
+WINAPI
+GetVersionExA(
+    IN OUT LPOSVERSIONINFOA lpVersionInformation
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetVersionExW(
+    IN OUT LPOSVERSIONINFOW lpVersionInformation
+    );
+#ifdef UNICODE
+#define GetVersionEx  GetVersionExW
+#else
+#define GetVersionEx  GetVersionExA
+#endif // !UNICODE
+
+
+
+WINBASEAPI
+BOOL
+WINAPI
+VerifyVersionInfoA(
+    IN LPOSVERSIONINFOEXA lpVersionInformation,
+    IN DWORD dwTypeMask,
+    IN DWORDLONG dwlConditionMask
+    );
+WINBASEAPI
+BOOL
+WINAPI
+VerifyVersionInfoW(
+    IN LPOSVERSIONINFOEXW lpVersionInformation,
+    IN DWORD dwTypeMask,
+    IN DWORDLONG dwlConditionMask
+    );
+#ifdef UNICODE
+#define VerifyVersionInfo  VerifyVersionInfoW
+#else
+#define VerifyVersionInfo  VerifyVersionInfoA
+#endif // !UNICODE
+
+// DOS and OS/2 Compatible Error Code definitions returned by the Win32 Base
+// API functions.
+//
+
+#include <winerror.h>
+
+/* Abnormal termination codes */
+
+#define TC_NORMAL       0
+#define TC_HARDERR      1
+#define TC_GP_TRAP      2
+#define TC_SIGNAL       3
+
+#if(WINVER >= 0x0400)
+//
+// Power Management APIs
+//
+
+#define AC_LINE_OFFLINE                 0x00
+#define AC_LINE_ONLINE                  0x01
+#define AC_LINE_BACKUP_POWER            0x02
+#define AC_LINE_UNKNOWN                 0xFF
+
+#define BATTERY_FLAG_HIGH               0x01
+#define BATTERY_FLAG_LOW                0x02
+#define BATTERY_FLAG_CRITICAL           0x04
+#define BATTERY_FLAG_CHARGING           0x08
+#define BATTERY_FLAG_NO_BATTERY         0x80
+#define BATTERY_FLAG_UNKNOWN            0xFF
+
+#define BATTERY_PERCENTAGE_UNKNOWN      0xFF
+
+#define BATTERY_LIFE_UNKNOWN        0xFFFFFFFF
+
+typedef struct _SYSTEM_POWER_STATUS {
+    BYTE ACLineStatus;
+    BYTE BatteryFlag;
+    BYTE BatteryLifePercent;
+    BYTE Reserved1;
+    DWORD BatteryLifeTime;
+    DWORD BatteryFullLifeTime;
+}   SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;
+
+BOOL
+WINAPI
+GetSystemPowerStatus(
+    OUT LPSYSTEM_POWER_STATUS lpSystemPowerStatus
+    );
+
+BOOL
+WINAPI
+SetSystemPowerState(
+    IN BOOL fSuspend,
+    IN BOOL fForce
+    );
+
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0500)
+//
+// Very Large Memory API Subset
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+AllocateUserPhysicalPages(
+    IN HANDLE hProcess,
+    IN OUT PULONG_PTR NumberOfPages,
+    OUT PULONG_PTR PageArray
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FreeUserPhysicalPages(
+    IN HANDLE hProcess,
+    IN OUT PULONG_PTR NumberOfPages,
+    IN PULONG_PTR PageArray
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+MapUserPhysicalPages(
+    IN PVOID VirtualAddress,
+    IN ULONG_PTR NumberOfPages,
+    IN PULONG_PTR PageArray OPTIONAL
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+MapUserPhysicalPagesScatter(
+    IN PVOID *VirtualAddresses,
+    IN ULONG_PTR NumberOfPages,
+    IN PULONG_PTR PageArray OPTIONAL
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateJobObjectA(
+    IN LPSECURITY_ATTRIBUTES lpJobAttributes,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateJobObjectW(
+    IN LPSECURITY_ATTRIBUTES lpJobAttributes,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define CreateJobObject  CreateJobObjectW
+#else
+#define CreateJobObject  CreateJobObjectA
+#endif // !UNICODE
+
+WINBASEAPI
+HANDLE
+WINAPI
+OpenJobObjectA(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCSTR lpName
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+OpenJobObjectW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpName
+    );
+#ifdef UNICODE
+#define OpenJobObject  OpenJobObjectW
+#else
+#define OpenJobObject  OpenJobObjectA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+AssignProcessToJobObject(
+    IN HANDLE hJob,
+    IN HANDLE hProcess
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+TerminateJobObject(
+    IN HANDLE hJob,
+    IN UINT uExitCode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+QueryInformationJobObject(
+    IN HANDLE hJob,
+    IN JOBOBJECTINFOCLASS JobObjectInformationClass,
+    OUT LPVOID lpJobObjectInformation,
+    IN DWORD cbJobObjectInformationLength,
+    OUT LPDWORD lpReturnLength
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetInformationJobObject(
+    IN HANDLE hJob,
+    IN JOBOBJECTINFOCLASS JobObjectInformationClass,
+    IN LPVOID lpJobObjectInformation,
+    IN DWORD cbJobObjectInformationLength
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+IsProcessInJob (
+    IN HANDLE ProcessHandle,
+    IN HANDLE JobHandle,
+    OUT PBOOL Result
+    );
+
+
+WINBASEAPI
+BOOL
+WINAPI
+CreateJobSet (
+    IN ULONG NumJob,
+    IN PJOB_SET_ARRAY UserJobSet,
+    IN ULONG Flags);
+
+
+WINBASEAPI
+PVOID
+WINAPI
+AddVectoredExceptionHandler(
+    IN ULONG FirstHandler,
+    IN PVECTORED_EXCEPTION_HANDLER VectoredHandler
+    );
+
+WINBASEAPI
+ULONG
+WINAPI
+RemoveVectoredExceptionHandler(
+    IN PVOID VectoredHandlerHandle
+    );
+
+//
+// New Volume Mount Point API.
+//
+
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstVolumeA(
+    LPSTR lpszVolumeName,
+    DWORD cchBufferLength
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstVolumeW(
+    LPWSTR lpszVolumeName,
+    DWORD cchBufferLength
+    );
+#ifdef UNICODE
+#define FindFirstVolume FindFirstVolumeW
+#else
+#define FindFirstVolume FindFirstVolumeA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindNextVolumeA(
+    HANDLE hFindVolume,
+    LPSTR lpszVolumeName,
+    DWORD cchBufferLength
+    );
+WINBASEAPI
+BOOL
+WINAPI
+FindNextVolumeW(
+    HANDLE hFindVolume,
+    LPWSTR lpszVolumeName,
+    DWORD cchBufferLength
+    );
+#ifdef UNICODE
+#define FindNextVolume FindNextVolumeW
+#else
+#define FindNextVolume FindNextVolumeA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindVolumeClose(
+    HANDLE hFindVolume
+    );
+
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstVolumeMountPointA(
+    LPCSTR lpszRootPathName,
+    LPSTR lpszVolumeMountPoint,
+    DWORD cchBufferLength
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+FindFirstVolumeMountPointW(
+    LPCWSTR lpszRootPathName,
+    LPWSTR lpszVolumeMountPoint,
+    DWORD cchBufferLength
+    );
+#ifdef UNICODE
+#define FindFirstVolumeMountPoint FindFirstVolumeMountPointW
+#else
+#define FindFirstVolumeMountPoint FindFirstVolumeMountPointA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindNextVolumeMountPointA(
+    HANDLE hFindVolumeMountPoint,
+    LPSTR lpszVolumeMountPoint,
+    DWORD cchBufferLength
+    );
+WINBASEAPI
+BOOL
+WINAPI
+FindNextVolumeMountPointW(
+    HANDLE hFindVolumeMountPoint,
+    LPWSTR lpszVolumeMountPoint,
+    DWORD cchBufferLength
+    );
+#ifdef UNICODE
+#define FindNextVolumeMountPoint FindNextVolumeMountPointW
+#else
+#define FindNextVolumeMountPoint FindNextVolumeMountPointA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindVolumeMountPointClose(
+    HANDLE hFindVolumeMountPoint
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetVolumeMountPointA(
+    LPCSTR lpszVolumeMountPoint,
+    LPCSTR lpszVolumeName
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetVolumeMountPointW(
+    LPCWSTR lpszVolumeMountPoint,
+    LPCWSTR lpszVolumeName
+    );
+#ifdef UNICODE
+#define SetVolumeMountPoint  SetVolumeMountPointW
+#else
+#define SetVolumeMountPoint  SetVolumeMountPointA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+DeleteVolumeMountPointA(
+    LPCSTR lpszVolumeMountPoint
+    );
+WINBASEAPI
+BOOL
+WINAPI
+DeleteVolumeMountPointW(
+    LPCWSTR lpszVolumeMountPoint
+    );
+#ifdef UNICODE
+#define DeleteVolumeMountPoint  DeleteVolumeMountPointW
+#else
+#define DeleteVolumeMountPoint  DeleteVolumeMountPointA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumeNameForVolumeMountPointA(
+    LPCSTR lpszVolumeMountPoint,
+    LPSTR lpszVolumeName,
+    DWORD cchBufferLength
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumeNameForVolumeMountPointW(
+    LPCWSTR lpszVolumeMountPoint,
+    LPWSTR lpszVolumeName,
+    DWORD cchBufferLength
+    );
+#ifdef UNICODE
+#define GetVolumeNameForVolumeMountPoint  GetVolumeNameForVolumeMountPointW
+#else
+#define GetVolumeNameForVolumeMountPoint  GetVolumeNameForVolumeMountPointA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumePathNameA(
+    LPCSTR lpszFileName,
+    LPSTR lpszVolumePathName,
+    DWORD cchBufferLength
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumePathNameW(
+    LPCWSTR lpszFileName,
+    LPWSTR lpszVolumePathName,
+    DWORD cchBufferLength
+    );
+#ifdef UNICODE
+#define GetVolumePathName  GetVolumePathNameW
+#else
+#define GetVolumePathName  GetVolumePathNameA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumePathNamesForVolumeNameA(
+    LPCSTR lpszVolumeName,
+    LPSTR lpszVolumePathNames,
+    DWORD cchBufferLength,
+    PDWORD lpcchReturnLength
+    );
+WINBASEAPI
+BOOL
+WINAPI
+GetVolumePathNamesForVolumeNameW(
+    LPCWSTR lpszVolumeName,
+    LPWSTR lpszVolumePathNames,
+    DWORD cchBufferLength,
+    PDWORD lpcchReturnLength
+    );
+#ifdef UNICODE
+#define GetVolumePathNamesForVolumeName  GetVolumePathNamesForVolumeNameW
+#else
+#define GetVolumePathNamesForVolumeName  GetVolumePathNamesForVolumeNameA
+#endif // !UNICODE
+
+#endif
+
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_FUSION >= 0x0100) || ISOLATION_AWARE_ENABLED
+
+#define ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID    (0x00000001)
+#define ACTCTX_FLAG_LANGID_VALID                    (0x00000002)
+#define ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID        (0x00000004)
+#define ACTCTX_FLAG_RESOURCE_NAME_VALID             (0x00000008)
+#define ACTCTX_FLAG_SET_PROCESS_DEFAULT             (0x00000010)
+#define ACTCTX_FLAG_APPLICATION_NAME_VALID          (0x00000020)
+#define ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF           (0x00000040)
+#define ACTCTX_FLAG_HMODULE_VALID                   (0x00000080)
+
+typedef struct tagACTCTXA {
+    ULONG       cbSize;
+    DWORD       dwFlags;
+    LPCSTR      lpSource;
+    USHORT      wProcessorArchitecture;
+    LANGID      wLangId;
+    LPCSTR      lpAssemblyDirectory;
+    LPCSTR      lpResourceName;
+    LPCSTR      lpApplicationName;
+    HMODULE     hModule;
+} ACTCTXA, *PACTCTXA;
+typedef struct tagACTCTXW {
+    ULONG       cbSize;
+    DWORD       dwFlags;
+    LPCWSTR     lpSource;
+    USHORT      wProcessorArchitecture;
+    LANGID      wLangId;
+    LPCWSTR     lpAssemblyDirectory;
+    LPCWSTR     lpResourceName;
+    LPCWSTR     lpApplicationName;
+    HMODULE     hModule;
+} ACTCTXW, *PACTCTXW;
+#ifdef UNICODE
+typedef ACTCTXW ACTCTX;
+typedef PACTCTXW PACTCTX;
+#else
+typedef ACTCTXA ACTCTX;
+typedef PACTCTXA PACTCTX;
+#endif // UNICODE
+
+typedef const ACTCTXA *PCACTCTXA;
+typedef const ACTCTXW *PCACTCTXW;
+#ifdef UNICODE
+typedef ACTCTXW ACTCTX;
+typedef PCACTCTXW PCACTCTX;
+#else
+typedef ACTCTXA ACTCTX;
+typedef PCACTCTXA PCACTCTX;
+#endif // UNICODE
+
+#endif
+
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_FUSION >= 0x0100)
+
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateActCtxA(
+    PCACTCTXA pActCtx
+    );
+WINBASEAPI
+HANDLE
+WINAPI
+CreateActCtxW(
+    PCACTCTXW pActCtx
+    );
+#ifdef UNICODE
+#define CreateActCtx  CreateActCtxW
+#else
+#define CreateActCtx  CreateActCtxA
+#endif // !UNICODE
+
+WINBASEAPI
+VOID
+WINAPI
+AddRefActCtx(
+    HANDLE hActCtx
+    );
+
+
+WINBASEAPI
+VOID
+WINAPI
+ReleaseActCtx(
+    HANDLE hActCtx
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ZombifyActCtx(
+    HANDLE hActCtx
+    );
+
+
+WINBASEAPI
+BOOL
+WINAPI
+ActivateActCtx(
+    HANDLE hActCtx,
+    ULONG_PTR *lpCookie
+    );
+
+
+#define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION (0x00000001)
+
+WINBASEAPI
+BOOL
+WINAPI
+DeactivateActCtx(
+    DWORD dwFlags,
+    ULONG_PTR ulCookie
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCurrentActCtx(
+    HANDLE *lphActCtx);
+
+#endif
+
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_FUSION >= 0x0100) || ISOLATION_AWARE_ENABLED
+
+typedef struct tagACTCTX_SECTION_KEYED_DATA_2600 {
+    ULONG cbSize;
+    ULONG ulDataFormatVersion;
+    PVOID lpData;
+    ULONG ulLength;
+    PVOID lpSectionGlobalData;
+    ULONG ulSectionGlobalDataLength;
+    PVOID lpSectionBase;
+    ULONG ulSectionTotalLength;
+    HANDLE hActCtx;
+    ULONG ulAssemblyRosterIndex;
+} ACTCTX_SECTION_KEYED_DATA_2600, *PACTCTX_SECTION_KEYED_DATA_2600;
+typedef const ACTCTX_SECTION_KEYED_DATA_2600 * PCACTCTX_SECTION_KEYED_DATA_2600;
+
+typedef struct tagACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA {
+    PVOID lpInformation;
+    PVOID lpSectionBase;
+    ULONG ulSectionLength;
+    PVOID lpSectionGlobalDataBase;
+    ULONG ulSectionGlobalDataLength;
+} ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA, *PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA;
+typedef const ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA *PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA;
+
+typedef struct tagACTCTX_SECTION_KEYED_DATA {
+    ULONG cbSize;
+    ULONG ulDataFormatVersion;
+    PVOID lpData;
+    ULONG ulLength;
+    PVOID lpSectionGlobalData;
+    ULONG ulSectionGlobalDataLength;
+    PVOID lpSectionBase;
+    ULONG ulSectionTotalLength;
+    HANDLE hActCtx;
+    ULONG ulAssemblyRosterIndex;
+// 2600 stops here
+    ULONG ulFlags;
+    ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA AssemblyMetadata;
+} ACTCTX_SECTION_KEYED_DATA, *PACTCTX_SECTION_KEYED_DATA;
+typedef const ACTCTX_SECTION_KEYED_DATA * PCACTCTX_SECTION_KEYED_DATA;
+
+#define FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX (0x00000001)
+#define FIND_ACTCTX_SECTION_KEY_RETURN_FLAGS   (0x00000002)
+#define FIND_ACTCTX_SECTION_KEY_RETURN_ASSEMBLY_METADATA (0x00000004)
+
+#endif
+
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_FUSION >= 0x0100)
+
+
+WINBASEAPI
+BOOL
+WINAPI
+FindActCtxSectionStringA(
+    DWORD dwFlags,
+    const GUID *lpExtensionGuid,
+    ULONG ulSectionId,
+    LPCSTR lpStringToFind,
+    PACTCTX_SECTION_KEYED_DATA ReturnedData
+    );
+WINBASEAPI
+BOOL
+WINAPI
+FindActCtxSectionStringW(
+    DWORD dwFlags,
+    const GUID *lpExtensionGuid,
+    ULONG ulSectionId,
+    LPCWSTR lpStringToFind,
+    PACTCTX_SECTION_KEYED_DATA ReturnedData
+    );
+#ifdef UNICODE
+#define FindActCtxSectionString  FindActCtxSectionStringW
+#else
+#define FindActCtxSectionString  FindActCtxSectionStringA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FindActCtxSectionGuid(
+    DWORD dwFlags,
+    const GUID *lpExtensionGuid,
+    ULONG ulSectionId,
+    const GUID *lpGuidToFind,
+    PACTCTX_SECTION_KEYED_DATA ReturnedData
+    );
+
+#endif
+
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_FUSION >= 0x0100) || ISOLATION_AWARE_ENABLED
+
+#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
+#if !defined(ACTIVATION_CONTEXT_BASIC_INFORMATION_DEFINED)
+
+typedef struct _ACTIVATION_CONTEXT_BASIC_INFORMATION {
+    HANDLE  hActCtx;
+    DWORD   dwFlags;
+} ACTIVATION_CONTEXT_BASIC_INFORMATION, *PACTIVATION_CONTEXT_BASIC_INFORMATION;
+
+typedef const struct _ACTIVATION_CONTEXT_BASIC_INFORMATION *PCACTIVATION_CONTEXT_BASIC_INFORMATION;
+
+#define ACTIVATION_CONTEXT_BASIC_INFORMATION_DEFINED 1
+
+#endif // !defined(ACTIVATION_CONTEXT_BASIC_INFORMATION_DEFINED)
+#endif
+
+#define QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX (0x00000004)
+#define QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE (0x00000008)
+#define QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS (0x00000010)
+#define QUERY_ACTCTX_FLAG_NO_ADDREF         (0x80000000)
+
+#endif
+
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_FUSION >= 0x0100)
+
+
+//
+// switch (ulInfoClass)
+//
+//  case ActivationContextBasicInformation:
+//    pvSubInstance == NULL
+//    pvBuffer is of type PACTIVATION_CONTEXT_BASIC_INFORMATION
+//
+//  case ActivationContextDetailedInformation:
+//    pvSubInstance == NULL
+//    pvBuffer is of type PACTIVATION_CONTEXT_DETAILED_INFORMATION
+//
+//  case AssemblyDetailedInformationInActivationContext:
+//    pvSubInstance is of type PULONG
+//      *pvSubInstance < ACTIVATION_CONTEXT_DETAILED_INFORMATION::ulAssemblyCount
+//    pvBuffer is of type PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION
+//
+//  case FileInformationInAssemblyOfAssemblyInActivationContext:
+//    pvSubInstance is of type PACTIVATION_CONTEXT_QUERY_INDEX
+//      pvSubInstance->ulAssemblyIndex < ACTIVATION_CONTEXT_DETAILED_INFORMATION::ulAssemblyCount
+//      pvSubInstance->ulFileIndexInAssembly < ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION::ulFileCount
+//    pvBuffer is of type PASSEMBLY_FILE_DETAILED_INFORMATION
+//
+// String are placed after the structs.
+//
+WINBASEAPI
+BOOL
+WINAPI
+QueryActCtxW(
+    IN DWORD dwFlags,
+    IN HANDLE hActCtx,
+    IN PVOID pvSubInstance,
+    IN ULONG ulInfoClass,
+    OUT PVOID pvBuffer,
+    IN SIZE_T cbBuffer OPTIONAL,
+    OUT SIZE_T *pcbWrittenOrRequired OPTIONAL
+    );
+
+typedef BOOL (WINAPI * PQUERYACTCTXW_FUNC)(
+    IN DWORD dwFlags,
+    IN HANDLE hActCtx,
+    IN PVOID pvSubInstance,
+    IN ULONG ulInfoClass,
+    OUT PVOID pvBuffer,
+    IN SIZE_T cbBuffer OPTIONAL,
+    OUT SIZE_T *pcbWrittenOrRequired OPTIONAL
+    );
+
+#endif // (_WIN32_WINNT > 0x0500) || (_WIN32_FUSION >= 0x0100)
+
+
+WINBASEAPI
+BOOL
+WINAPI
+ProcessIdToSessionId(
+    IN  DWORD dwProcessId,
+    OUT DWORD *pSessionId
+    );
+
+#if _WIN32_WINNT >= 0x0501
+
+WINBASEAPI
+DWORD
+WINAPI
+WTSGetActiveConsoleSessionId();
+
+WINBASEAPI
+BOOL
+WINAPI
+IsWow64Process(
+    HANDLE hProcess,
+    PBOOL Wow64Process
+    );
+
+#endif // (_WIN32_WINNT >= 0x0501)
+
+WINBASEAPI
+BOOL
+WINAPI
+GetLogicalProcessorInformation(
+    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer,
+    PDWORD ReturnedLength
+    );
+
+//
+// NUMA Information routines.
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNumaHighestNodeNumber(
+    PULONG HighestNodeNumber
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNumaProcessorNode(
+    UCHAR Processor,
+    PUCHAR NodeNumber
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNumaNodeProcessorMask(
+    UCHAR Node,
+    PULONGLONG ProcessorMask
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNumaAvailableMemoryNode(
+    UCHAR Node,
+    PULONGLONG AvailableBytes
+    );
+
+
+
+#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
+#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
+#include "winbase.inl"
+#endif /* ISOLATION_AWARE_ENABLED */
+#endif /* RC */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif // _WINBASE_
+
diff --git a/base/Windows/Inc/WinCon.h b/base/Windows/Inc/WinCon.h
new file mode 100644
index 0000000..52ffdf1
--- /dev/null
+++ b/base/Windows/Inc/WinCon.h
@@ -0,0 +1,953 @@
+/*++ BUILD Version: 0002    // Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    wincon.h
+
+Abstract:
+
+    This module contains the public data structures, data types,
+    and procedures exported by the NT console subsystem.
+
+Created:
+
+    26-Oct-1990
+
+Revision History:
+
+--*/
+
+#ifndef _WINCON_
+#define _WINCON_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _COORD {
+    SHORT X;
+    SHORT Y;
+} COORD, *PCOORD;
+
+typedef struct _SMALL_RECT {
+    SHORT Left;
+    SHORT Top;
+    SHORT Right;
+    SHORT Bottom;
+} SMALL_RECT, *PSMALL_RECT;
+
+typedef struct _KEY_EVENT_RECORD {
+    BOOL bKeyDown;
+    WORD wRepeatCount;
+    WORD wVirtualKeyCode;
+    WORD wVirtualScanCode;
+    union {
+        WCHAR UnicodeChar;
+        CHAR   AsciiChar;
+    } uChar;
+    DWORD dwControlKeyState;
+} KEY_EVENT_RECORD, *PKEY_EVENT_RECORD;
+
+//
+// ControlKeyState flags
+//
+
+#define RIGHT_ALT_PRESSED     0x0001 // the right alt key is pressed.
+#define LEFT_ALT_PRESSED      0x0002 // the left alt key is pressed.
+#define RIGHT_CTRL_PRESSED    0x0004 // the right ctrl key is pressed.
+#define LEFT_CTRL_PRESSED     0x0008 // the left ctrl key is pressed.
+#define SHIFT_PRESSED         0x0010 // the shift key is pressed.
+#define NUMLOCK_ON            0x0020 // the numlock light is on.
+#define SCROLLLOCK_ON         0x0040 // the scrolllock light is on.
+#define CAPSLOCK_ON           0x0080 // the capslock light is on.
+#define ENHANCED_KEY          0x0100 // the key is enhanced.
+#define NLS_DBCSCHAR          0x00010000 // DBCS for JPN: SBCS/DBCS mode.
+#define NLS_ALPHANUMERIC      0x00000000 // DBCS for JPN: Alphanumeric mode.
+#define NLS_KATAKANA          0x00020000 // DBCS for JPN: Katakana mode.
+#define NLS_HIRAGANA          0x00040000 // DBCS for JPN: Hiragana mode.
+#define NLS_ROMAN             0x00400000 // DBCS for JPN: Roman/Noroman mode.
+#define NLS_IME_CONVERSION    0x00800000 // DBCS for JPN: IME conversion.
+#define NLS_IME_DISABLE       0x20000000 // DBCS for JPN: IME enable/disable.
+
+typedef struct _MOUSE_EVENT_RECORD {
+    COORD dwMousePosition;
+    DWORD dwButtonState;
+    DWORD dwControlKeyState;
+    DWORD dwEventFlags;
+} MOUSE_EVENT_RECORD, *PMOUSE_EVENT_RECORD;
+
+//
+// ButtonState flags
+//
+
+#define FROM_LEFT_1ST_BUTTON_PRESSED    0x0001
+#define RIGHTMOST_BUTTON_PRESSED        0x0002
+#define FROM_LEFT_2ND_BUTTON_PRESSED    0x0004
+#define FROM_LEFT_3RD_BUTTON_PRESSED    0x0008
+#define FROM_LEFT_4TH_BUTTON_PRESSED    0x0010
+
+//
+// EventFlags
+//
+
+#define MOUSE_MOVED   0x0001
+#define DOUBLE_CLICK  0x0002
+#define MOUSE_WHEELED 0x0004
+
+typedef struct _WINDOW_BUFFER_SIZE_RECORD {
+    COORD dwSize;
+} WINDOW_BUFFER_SIZE_RECORD, *PWINDOW_BUFFER_SIZE_RECORD;
+
+typedef struct _MENU_EVENT_RECORD {
+    UINT dwCommandId;
+} MENU_EVENT_RECORD, *PMENU_EVENT_RECORD;
+
+typedef struct _FOCUS_EVENT_RECORD {
+    BOOL bSetFocus;
+} FOCUS_EVENT_RECORD, *PFOCUS_EVENT_RECORD;
+
+typedef struct _INPUT_RECORD {
+    WORD EventType;
+    union {
+        KEY_EVENT_RECORD KeyEvent;
+        MOUSE_EVENT_RECORD MouseEvent;
+        WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent;
+        MENU_EVENT_RECORD MenuEvent;
+        FOCUS_EVENT_RECORD FocusEvent;
+    } Event;
+} INPUT_RECORD, *PINPUT_RECORD;
+
+//
+//  EventType flags:
+//
+
+#define KEY_EVENT         0x0001 // Event contains key event record
+#define MOUSE_EVENT       0x0002 // Event contains mouse event record
+#define WINDOW_BUFFER_SIZE_EVENT 0x0004 // Event contains window change event record
+#define MENU_EVENT 0x0008 // Event contains menu event record
+#define FOCUS_EVENT 0x0010 // event contains focus change
+
+typedef struct _CHAR_INFO {
+    union {
+        WCHAR UnicodeChar;
+        CHAR   AsciiChar;
+    } Char;
+    WORD Attributes;
+} CHAR_INFO, *PCHAR_INFO;
+
+//
+// Attributes flags:
+//
+
+#define FOREGROUND_BLUE      0x0001 // text color contains blue.
+#define FOREGROUND_GREEN     0x0002 // text color contains green.
+#define FOREGROUND_RED       0x0004 // text color contains red.
+#define FOREGROUND_INTENSITY 0x0008 // text color is intensified.
+#define BACKGROUND_BLUE      0x0010 // background color contains blue.
+#define BACKGROUND_GREEN     0x0020 // background color contains green.
+#define BACKGROUND_RED       0x0040 // background color contains red.
+#define BACKGROUND_INTENSITY 0x0080 // background color is intensified.
+#define COMMON_LVB_LEADING_BYTE    0x0100 // Leading Byte of DBCS
+#define COMMON_LVB_TRAILING_BYTE   0x0200 // Trailing Byte of DBCS
+#define COMMON_LVB_GRID_HORIZONTAL 0x0400 // DBCS: Grid attribute: top horizontal.
+#define COMMON_LVB_GRID_LVERTICAL  0x0800 // DBCS: Grid attribute: left vertical.
+#define COMMON_LVB_GRID_RVERTICAL  0x1000 // DBCS: Grid attribute: right vertical.
+#define COMMON_LVB_REVERSE_VIDEO   0x4000 // DBCS: Reverse fore/back ground attribute.
+#define COMMON_LVB_UNDERSCORE      0x8000 // DBCS: Underscore.
+
+#define COMMON_LVB_SBCSDBCS        0x0300 // SBCS or DBCS flag.
+
+
+typedef struct _CONSOLE_SCREEN_BUFFER_INFO {
+    COORD dwSize;
+    COORD dwCursorPosition;
+    WORD  wAttributes;
+    SMALL_RECT srWindow;
+    COORD dwMaximumWindowSize;
+} CONSOLE_SCREEN_BUFFER_INFO, *PCONSOLE_SCREEN_BUFFER_INFO;
+
+typedef struct _CONSOLE_CURSOR_INFO {
+    DWORD  dwSize;
+    BOOL   bVisible;
+} CONSOLE_CURSOR_INFO, *PCONSOLE_CURSOR_INFO;
+
+typedef struct _CONSOLE_FONT_INFO {
+    DWORD  nFont;
+    COORD  dwFontSize;
+} CONSOLE_FONT_INFO, *PCONSOLE_FONT_INFO;
+
+#if(_WIN32_WINNT >= 0x0500)
+typedef struct _CONSOLE_SELECTION_INFO {
+    DWORD dwFlags;
+    COORD dwSelectionAnchor;
+    SMALL_RECT srSelection;
+} CONSOLE_SELECTION_INFO, *PCONSOLE_SELECTION_INFO;
+
+//
+// Selection flags
+//
+
+#define CONSOLE_NO_SELECTION            0x0000
+#define CONSOLE_SELECTION_IN_PROGRESS   0x0001   // selection has begun
+#define CONSOLE_SELECTION_NOT_EMPTY     0x0002   // non-null select rectangle
+#define CONSOLE_MOUSE_SELECTION         0x0004   // selecting with mouse
+#define CONSOLE_MOUSE_DOWN              0x0008   // mouse is down
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+//
+// typedef for ctrl-c handler routines
+//
+
+typedef
+BOOL
+(WINAPI *PHANDLER_ROUTINE)(
+    DWORD CtrlType
+    );
+
+#define CTRL_C_EVENT        0
+#define CTRL_BREAK_EVENT    1
+#define CTRL_CLOSE_EVENT    2
+// 3 is reserved!
+// 4 is reserved!
+#define CTRL_LOGOFF_EVENT   5
+#define CTRL_SHUTDOWN_EVENT 6
+
+//
+//  Input Mode flags:
+//
+
+#define ENABLE_PROCESSED_INPUT 0x0001
+#define ENABLE_LINE_INPUT      0x0002
+#define ENABLE_ECHO_INPUT      0x0004
+#define ENABLE_WINDOW_INPUT    0x0008
+#define ENABLE_MOUSE_INPUT     0x0010
+
+//
+// Output Mode flags:
+//
+
+#define ENABLE_PROCESSED_OUTPUT    0x0001
+#define ENABLE_WRAP_AT_EOL_OUTPUT  0x0002
+
+//
+// direct API definitions.
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+PeekConsoleInputA(
+    IN HANDLE hConsoleInput,
+    OUT PINPUT_RECORD lpBuffer,
+    IN DWORD nLength,
+    OUT LPDWORD lpNumberOfEventsRead
+    );
+WINBASEAPI
+BOOL
+WINAPI
+PeekConsoleInputW(
+    IN HANDLE hConsoleInput,
+    OUT PINPUT_RECORD lpBuffer,
+    IN DWORD nLength,
+    OUT LPDWORD lpNumberOfEventsRead
+    );
+#ifdef UNICODE
+#define PeekConsoleInput  PeekConsoleInputW
+#else
+#define PeekConsoleInput  PeekConsoleInputA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleInputA(
+    IN HANDLE hConsoleInput,
+    OUT PINPUT_RECORD lpBuffer,
+    IN DWORD nLength,
+    OUT LPDWORD lpNumberOfEventsRead
+    );
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleInputW(
+    IN HANDLE hConsoleInput,
+    OUT PINPUT_RECORD lpBuffer,
+    IN DWORD nLength,
+    OUT LPDWORD lpNumberOfEventsRead
+    );
+#ifdef UNICODE
+#define ReadConsoleInput  ReadConsoleInputW
+#else
+#define ReadConsoleInput  ReadConsoleInputA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleInputA(
+    IN HANDLE hConsoleInput,
+    IN CONST INPUT_RECORD *lpBuffer,
+    IN DWORD nLength,
+    OUT LPDWORD lpNumberOfEventsWritten
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleInputW(
+    IN HANDLE hConsoleInput,
+    IN CONST INPUT_RECORD *lpBuffer,
+    IN DWORD nLength,
+    OUT LPDWORD lpNumberOfEventsWritten
+    );
+#ifdef UNICODE
+#define WriteConsoleInput  WriteConsoleInputW
+#else
+#define WriteConsoleInput  WriteConsoleInputA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleOutputA(
+    IN HANDLE hConsoleOutput,
+    OUT PCHAR_INFO lpBuffer,
+    IN COORD dwBufferSize,
+    IN COORD dwBufferCoord,
+    IN OUT PSMALL_RECT lpReadRegion
+    );
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleOutputW(
+    IN HANDLE hConsoleOutput,
+    OUT PCHAR_INFO lpBuffer,
+    IN COORD dwBufferSize,
+    IN COORD dwBufferCoord,
+    IN OUT PSMALL_RECT lpReadRegion
+    );
+#ifdef UNICODE
+#define ReadConsoleOutput  ReadConsoleOutputW
+#else
+#define ReadConsoleOutput  ReadConsoleOutputA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleOutputA(
+    IN HANDLE hConsoleOutput,
+    IN CONST CHAR_INFO *lpBuffer,
+    IN COORD dwBufferSize,
+    IN COORD dwBufferCoord,
+    IN OUT PSMALL_RECT lpWriteRegion
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleOutputW(
+    IN HANDLE hConsoleOutput,
+    IN CONST CHAR_INFO *lpBuffer,
+    IN COORD dwBufferSize,
+    IN COORD dwBufferCoord,
+    IN OUT PSMALL_RECT lpWriteRegion
+    );
+#ifdef UNICODE
+#define WriteConsoleOutput  WriteConsoleOutputW
+#else
+#define WriteConsoleOutput  WriteConsoleOutputA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleOutputCharacterA(
+    IN HANDLE hConsoleOutput,
+    OUT LPSTR lpCharacter,
+    IN  DWORD nLength,
+    IN COORD dwReadCoord,
+    OUT LPDWORD lpNumberOfCharsRead
+    );
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleOutputCharacterW(
+    IN HANDLE hConsoleOutput,
+    OUT LPWSTR lpCharacter,
+    IN  DWORD nLength,
+    IN COORD dwReadCoord,
+    OUT LPDWORD lpNumberOfCharsRead
+    );
+#ifdef UNICODE
+#define ReadConsoleOutputCharacter  ReadConsoleOutputCharacterW
+#else
+#define ReadConsoleOutputCharacter  ReadConsoleOutputCharacterA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleOutputAttribute(
+    IN HANDLE hConsoleOutput,
+    OUT LPWORD lpAttribute,
+    IN DWORD nLength,
+    IN COORD dwReadCoord,
+    OUT LPDWORD lpNumberOfAttrsRead
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleOutputCharacterA(
+    IN HANDLE hConsoleOutput,
+    IN LPCSTR lpCharacter,
+    IN DWORD nLength,
+    IN COORD dwWriteCoord,
+    OUT LPDWORD lpNumberOfCharsWritten
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleOutputCharacterW(
+    IN HANDLE hConsoleOutput,
+    IN LPCWSTR lpCharacter,
+    IN DWORD nLength,
+    IN COORD dwWriteCoord,
+    OUT LPDWORD lpNumberOfCharsWritten
+    );
+#ifdef UNICODE
+#define WriteConsoleOutputCharacter  WriteConsoleOutputCharacterW
+#else
+#define WriteConsoleOutputCharacter  WriteConsoleOutputCharacterA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleOutputAttribute(
+    IN HANDLE hConsoleOutput,
+    IN CONST WORD *lpAttribute,
+    IN DWORD nLength,
+    IN COORD dwWriteCoord,
+    OUT LPDWORD lpNumberOfAttrsWritten
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FillConsoleOutputCharacterA(
+    IN HANDLE hConsoleOutput,
+    IN CHAR  cCharacter,
+    IN DWORD  nLength,
+    IN COORD  dwWriteCoord,
+    OUT LPDWORD lpNumberOfCharsWritten
+    );
+WINBASEAPI
+BOOL
+WINAPI
+FillConsoleOutputCharacterW(
+    IN HANDLE hConsoleOutput,
+    IN WCHAR  cCharacter,
+    IN DWORD  nLength,
+    IN COORD  dwWriteCoord,
+    OUT LPDWORD lpNumberOfCharsWritten
+    );
+#ifdef UNICODE
+#define FillConsoleOutputCharacter  FillConsoleOutputCharacterW
+#else
+#define FillConsoleOutputCharacter  FillConsoleOutputCharacterA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+FillConsoleOutputAttribute(
+    IN HANDLE hConsoleOutput,
+    IN WORD   wAttribute,
+    IN DWORD  nLength,
+    IN COORD  dwWriteCoord,
+    OUT LPDWORD lpNumberOfAttrsWritten
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetConsoleMode(
+    IN HANDLE hConsoleHandle,
+    OUT LPDWORD lpMode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNumberOfConsoleInputEvents(
+    IN HANDLE hConsoleInput,
+    OUT LPDWORD lpNumberOfEvents
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetConsoleScreenBufferInfo(
+    IN HANDLE hConsoleOutput,
+    OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo
+    );
+
+WINBASEAPI
+COORD
+WINAPI
+GetLargestConsoleWindowSize(
+    IN HANDLE hConsoleOutput
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetConsoleCursorInfo(
+    IN HANDLE hConsoleOutput,
+    OUT PCONSOLE_CURSOR_INFO lpConsoleCursorInfo
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCurrentConsoleFont(
+    IN HANDLE hConsoleOutput,
+    IN BOOL bMaximumWindow,
+    OUT PCONSOLE_FONT_INFO lpConsoleCurrentFont
+    );
+
+WINBASEAPI
+COORD
+WINAPI
+GetConsoleFontSize(
+    IN HANDLE hConsoleOutput,
+    IN DWORD nFont
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GetConsoleSelectionInfo(
+    OUT PCONSOLE_SELECTION_INFO lpConsoleSelectionInfo
+    );
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNumberOfConsoleMouseButtons(
+    OUT LPDWORD lpNumberOfMouseButtons
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleMode(
+    IN HANDLE hConsoleHandle,
+    IN DWORD dwMode
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleActiveScreenBuffer(
+    IN HANDLE hConsoleOutput
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+FlushConsoleInputBuffer(
+    IN HANDLE hConsoleInput
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleScreenBufferSize(
+    IN HANDLE hConsoleOutput,
+    IN COORD dwSize
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleCursorPosition(
+    IN HANDLE hConsoleOutput,
+    IN COORD dwCursorPosition
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleCursorInfo(
+    IN HANDLE hConsoleOutput,
+    IN CONST CONSOLE_CURSOR_INFO *lpConsoleCursorInfo
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ScrollConsoleScreenBufferA(
+    IN HANDLE hConsoleOutput,
+    IN CONST SMALL_RECT *lpScrollRectangle,
+    IN CONST SMALL_RECT *lpClipRectangle,
+    IN COORD dwDestinationOrigin,
+    IN CONST CHAR_INFO *lpFill
+    );
+WINBASEAPI
+BOOL
+WINAPI
+ScrollConsoleScreenBufferW(
+    IN HANDLE hConsoleOutput,
+    IN CONST SMALL_RECT *lpScrollRectangle,
+    IN CONST SMALL_RECT *lpClipRectangle,
+    IN COORD dwDestinationOrigin,
+    IN CONST CHAR_INFO *lpFill
+    );
+#ifdef UNICODE
+#define ScrollConsoleScreenBuffer  ScrollConsoleScreenBufferW
+#else
+#define ScrollConsoleScreenBuffer  ScrollConsoleScreenBufferA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleWindowInfo(
+    IN HANDLE hConsoleOutput,
+    IN BOOL bAbsolute,
+    IN CONST SMALL_RECT *lpConsoleWindow
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleTextAttribute(
+    IN HANDLE hConsoleOutput,
+    IN WORD wAttributes
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleCtrlHandler(
+    IN PHANDLER_ROUTINE HandlerRoutine,
+    IN BOOL Add
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+GenerateConsoleCtrlEvent(
+    IN DWORD dwCtrlEvent,
+    IN DWORD dwProcessGroupId
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+AllocConsole( VOID );
+
+WINBASEAPI
+BOOL
+WINAPI
+FreeConsole( VOID );
+
+#if(_WIN32_WINNT >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+AttachConsole(
+    IN DWORD dwProcessId
+    );
+
+#define ATTACH_PARENT_PROCESS ((DWORD)-1)
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+WINBASEAPI
+DWORD
+WINAPI
+GetConsoleTitleA(
+    OUT LPSTR lpConsoleTitle,
+    IN DWORD nSize
+    );
+WINBASEAPI
+DWORD
+WINAPI
+GetConsoleTitleW(
+    OUT LPWSTR lpConsoleTitle,
+    IN DWORD nSize
+    );
+#ifdef UNICODE
+#define GetConsoleTitle  GetConsoleTitleW
+#else
+#define GetConsoleTitle  GetConsoleTitleA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleTitleA(
+    IN LPCSTR lpConsoleTitle
+    );
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleTitleW(
+    IN LPCWSTR lpConsoleTitle
+    );
+#ifdef UNICODE
+#define SetConsoleTitle  SetConsoleTitleW
+#else
+#define SetConsoleTitle  SetConsoleTitleA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleA(
+    IN HANDLE hConsoleInput,
+    OUT LPVOID lpBuffer,
+    IN DWORD nNumberOfCharsToRead,
+    OUT LPDWORD lpNumberOfCharsRead,
+    IN LPVOID lpReserved
+    );
+WINBASEAPI
+BOOL
+WINAPI
+ReadConsoleW(
+    IN HANDLE hConsoleInput,
+    OUT LPVOID lpBuffer,
+    IN DWORD nNumberOfCharsToRead,
+    OUT LPDWORD lpNumberOfCharsRead,
+    IN LPVOID lpReserved
+    );
+#ifdef UNICODE
+#define ReadConsole  ReadConsoleW
+#else
+#define ReadConsole  ReadConsoleA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleA(
+    IN HANDLE hConsoleOutput,
+    IN CONST VOID *lpBuffer,
+    IN DWORD nNumberOfCharsToWrite,
+    OUT LPDWORD lpNumberOfCharsWritten,
+    IN LPVOID lpReserved
+    );
+WINBASEAPI
+BOOL
+WINAPI
+WriteConsoleW(
+    IN HANDLE hConsoleOutput,
+    IN CONST VOID *lpBuffer,
+    IN DWORD nNumberOfCharsToWrite,
+    OUT LPDWORD lpNumberOfCharsWritten,
+    IN LPVOID lpReserved
+    );
+#ifdef UNICODE
+#define WriteConsole  WriteConsoleW
+#else
+#define WriteConsole  WriteConsoleA
+#endif // !UNICODE
+
+#define CONSOLE_TEXTMODE_BUFFER  1
+
+WINBASEAPI
+HANDLE
+WINAPI
+CreateConsoleScreenBuffer(
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwShareMode,
+    IN CONST SECURITY_ATTRIBUTES *lpSecurityAttributes,
+    IN DWORD dwFlags,
+    IN LPVOID lpScreenBufferData
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+GetConsoleCP( VOID );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleCP(
+    IN UINT wCodePageID
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+GetConsoleOutputCP( VOID );
+
+WINBASEAPI
+BOOL
+WINAPI
+SetConsoleOutputCP(
+    IN UINT wCodePageID
+    );
+
+#if(_WIN32_WINNT >= 0x0500)
+
+#define CONSOLE_FULLSCREEN 1            // fullscreen console
+#define CONSOLE_FULLSCREEN_HARDWARE 2   // console owns the hardware
+
+WINBASEAPI
+BOOL
+APIENTRY
+GetConsoleDisplayMode(
+    OUT LPDWORD lpModeFlags
+    );
+
+WINBASEAPI
+HWND
+APIENTRY
+GetConsoleWindow(
+    VOID
+    );
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0501)
+
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleProcessList(
+    OUT LPDWORD lpdwProcessList,
+    IN DWORD dwProcessCount);
+
+//
+// Aliasing apis.
+//
+
+WINBASEAPI
+BOOL
+APIENTRY
+AddConsoleAliasA(
+    IN LPSTR Source,
+    IN LPSTR Target,
+    IN LPSTR ExeName);
+WINBASEAPI
+BOOL
+APIENTRY
+AddConsoleAliasW(
+    IN LPWSTR Source,
+    IN LPWSTR Target,
+    IN LPWSTR ExeName);
+#ifdef UNICODE
+#define AddConsoleAlias  AddConsoleAliasW
+#else
+#define AddConsoleAlias  AddConsoleAliasA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasA(
+    IN LPSTR Source,
+    OUT LPSTR TargetBuffer,
+    IN DWORD TargetBufferLength,
+    IN LPSTR ExeName);
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasW(
+    IN LPWSTR Source,
+    OUT LPWSTR TargetBuffer,
+    IN DWORD TargetBufferLength,
+    IN LPWSTR ExeName);
+#ifdef UNICODE
+#define GetConsoleAlias  GetConsoleAliasW
+#else
+#define GetConsoleAlias  GetConsoleAliasA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasesLengthA(
+    IN LPSTR ExeName);
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasesLengthW(
+    IN LPWSTR ExeName);
+#ifdef UNICODE
+#define GetConsoleAliasesLength  GetConsoleAliasesLengthW
+#else
+#define GetConsoleAliasesLength  GetConsoleAliasesLengthA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasExesLengthA(
+    VOID);
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasExesLengthW(
+    VOID);
+#ifdef UNICODE
+#define GetConsoleAliasExesLength  GetConsoleAliasExesLengthW
+#else
+#define GetConsoleAliasExesLength  GetConsoleAliasExesLengthA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasesA(
+    OUT LPSTR AliasBuffer,
+    IN DWORD AliasBufferLength,
+    IN LPSTR ExeName);
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasesW(
+    OUT LPWSTR AliasBuffer,
+    IN DWORD AliasBufferLength,
+    IN LPWSTR ExeName);
+#ifdef UNICODE
+#define GetConsoleAliases  GetConsoleAliasesW
+#else
+#define GetConsoleAliases  GetConsoleAliasesA
+#endif // !UNICODE
+
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasExesA(
+    OUT LPSTR ExeNameBuffer,
+    IN DWORD ExeNameBufferLength);
+WINBASEAPI
+DWORD
+APIENTRY
+GetConsoleAliasExesW(
+    OUT LPWSTR ExeNameBuffer,
+    IN DWORD ExeNameBufferLength);
+#ifdef UNICODE
+#define GetConsoleAliasExes  GetConsoleAliasExesW
+#else
+#define GetConsoleAliasExes  GetConsoleAliasExesA
+#endif // !UNICODE
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _WINCON_
+
diff --git a/base/Windows/Inc/WinCrypt.h b/base/Windows/Inc/WinCrypt.h
new file mode 100644
index 0000000..971d954
--- /dev/null
+++ b/base/Windows/Inc/WinCrypt.h
@@ -0,0 +1,16033 @@
+//+---------------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       wincrypt.h
+//
+//  Contents:   Cryptographic API Prototypes and Definitions
+//
+//----------------------------------------------------------------------------
+
+#ifndef __WINCRYPT_H__
+#define __WINCRYPT_H__
+
+#if defined (_MSC_VER)
+
+#if ( _MSC_VER >= 800 )
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4201)    /* Nameless struct/union */
+#endif
+
+#if (_MSC_VER > 1020)
+#pragma once
+#endif
+
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _HRESULT_DEFINED
+#define _HRESULT_DEFINED
+typedef LONG HRESULT;
+
+#endif // !_HRESULT_DEFINED
+
+#ifndef WINADVAPI
+#define WINADVAPI
+#endif
+
+#ifndef WINAPI
+#define WINAPI __stdcall
+#endif
+
+#ifndef CALLBACK
+#define CALLBACK __stdcall
+#endif
+
+#ifndef DECLSPEC_IMPORT
+#define DECLSPEC_IMPORT
+#endif
+
+#ifndef CONST
+#define CONST const
+#endif
+
+#ifndef IN
+#define IN
+#endif
+
+#ifndef OUT
+#define OUT
+#endif
+
+#ifndef OPTIONAL
+#define OPTIONAL
+#endif
+
+#if !defined(_CRYPT32_)
+#define WINCRYPT32API DECLSPEC_IMPORT
+#else
+#define WINCRYPT32API
+#endif
+
+#if !defined(_CRYPT32STRING_)
+# define WINCRYPT32STRINGAPI WINCRYPT32API
+#else
+# define WINCRYPT32STRINGAPI
+#endif
+
+//
+// Algorithm IDs and Flags
+//
+
+// ALG_ID crackers
+#define GET_ALG_CLASS(x)                (x & (7 << 13))
+#define GET_ALG_TYPE(x)                 (x & (15 << 9))
+#define GET_ALG_SID(x)                  (x & (511))
+
+// Algorithm classes
+#define ALG_CLASS_ANY                   (0)
+#define ALG_CLASS_SIGNATURE             (1 << 13)
+#define ALG_CLASS_MSG_ENCRYPT           (2 << 13)
+#define ALG_CLASS_DATA_ENCRYPT          (3 << 13)
+#define ALG_CLASS_HASH                  (4 << 13)
+#define ALG_CLASS_KEY_EXCHANGE          (5 << 13)
+#define ALG_CLASS_ALL                   (7 << 13)
+
+// Algorithm types
+#define ALG_TYPE_ANY                    (0)
+#define ALG_TYPE_DSS                    (1 << 9)
+#define ALG_TYPE_RSA                    (2 << 9)
+#define ALG_TYPE_BLOCK                  (3 << 9)
+#define ALG_TYPE_STREAM                 (4 << 9)
+#define ALG_TYPE_DH                     (5 << 9)
+#define ALG_TYPE_SECURECHANNEL          (6 << 9)
+
+// Generic sub-ids
+#define ALG_SID_ANY                     (0)
+
+// Some RSA sub-ids
+#define ALG_SID_RSA_ANY                 0
+#define ALG_SID_RSA_PKCS                1
+#define ALG_SID_RSA_MSATWORK            2
+#define ALG_SID_RSA_ENTRUST             3
+#define ALG_SID_RSA_PGP                 4
+
+// Some DSS sub-ids
+//
+#define ALG_SID_DSS_ANY                 0
+#define ALG_SID_DSS_PKCS                1
+#define ALG_SID_DSS_DMS                 2
+
+// Block cipher sub ids
+// DES sub_ids
+#define ALG_SID_DES                     1
+#define ALG_SID_3DES                    3
+#define ALG_SID_DESX                    4
+#define ALG_SID_IDEA                    5
+#define ALG_SID_CAST                    6
+#define ALG_SID_SAFERSK64               7
+#define ALG_SID_SAFERSK128              8
+#define ALG_SID_3DES_112                9
+#define ALG_SID_CYLINK_MEK              12
+#define ALG_SID_RC5                     13
+#define ALG_SID_AES_128                 14
+#define ALG_SID_AES_192                 15
+#define ALG_SID_AES_256                 16
+#define ALG_SID_AES                     17
+
+// Fortezza sub-ids
+#define ALG_SID_SKIPJACK                10
+#define ALG_SID_TEK                     11
+
+// KP_MODE
+#define CRYPT_MODE_CBCI                 6       // ANSI CBC Interleaved
+#define CRYPT_MODE_CFBP                 7       // ANSI CFB Pipelined
+#define CRYPT_MODE_OFBP                 8       // ANSI OFB Pipelined
+#define CRYPT_MODE_CBCOFM               9       // ANSI CBC + OF Masking
+#define CRYPT_MODE_CBCOFMI              10      // ANSI CBC + OFM Interleaved
+
+// RC2 sub-ids
+#define ALG_SID_RC2                     2
+
+// Stream cipher sub-ids
+#define ALG_SID_RC4                     1
+#define ALG_SID_SEAL                    2
+
+// Diffie-Hellman sub-ids
+#define ALG_SID_DH_SANDF                1
+#define ALG_SID_DH_EPHEM                2
+#define ALG_SID_AGREED_KEY_ANY          3
+#define ALG_SID_KEA                     4
+
+// Hash sub ids
+#define ALG_SID_MD2                     1
+#define ALG_SID_MD4                     2
+#define ALG_SID_MD5                     3
+#define ALG_SID_SHA                     4
+#define ALG_SID_SHA1                    4
+#define ALG_SID_MAC                     5
+#define ALG_SID_RIPEMD                  6
+#define ALG_SID_RIPEMD160               7
+#define ALG_SID_SSL3SHAMD5              8
+#define ALG_SID_HMAC                    9
+#define ALG_SID_TLS1PRF                 10
+#define ALG_SID_HASH_REPLACE_OWF        11
+#define ALG_SID_SHA_256                 12
+#define ALG_SID_SHA_384                 13
+#define ALG_SID_SHA_512                 14
+
+// secure channel sub ids
+#define ALG_SID_SSL3_MASTER             1
+#define ALG_SID_SCHANNEL_MASTER_HASH    2
+#define ALG_SID_SCHANNEL_MAC_KEY        3
+#define ALG_SID_PCT1_MASTER             4
+#define ALG_SID_SSL2_MASTER             5
+#define ALG_SID_TLS1_MASTER             6
+#define ALG_SID_SCHANNEL_ENC_KEY        7
+
+// Our silly example sub-id
+#define ALG_SID_EXAMPLE                 80
+
+#ifndef ALGIDDEF
+#define ALGIDDEF
+typedef unsigned int ALG_ID;
+#endif
+
+// algorithm identifier definitions
+#define CALG_MD2                (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD2)
+#define CALG_MD4                (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD4)
+#define CALG_MD5                (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD5)
+#define CALG_SHA                (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA)
+#define CALG_SHA1               (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA1)
+#define CALG_MAC                (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAC)
+#define CALG_RSA_SIGN           (ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY)
+#define CALG_DSS_SIGN           (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY)
+#define CALG_NO_SIGN            (ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY)
+#define CALG_RSA_KEYX           (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_RSA|ALG_SID_RSA_ANY)
+#define CALG_DES                (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DES)
+#define CALG_3DES_112           (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_3DES_112)
+#define CALG_3DES               (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_3DES)
+#define CALG_DESX               (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DESX)
+#define CALG_RC2                (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_RC2)
+#define CALG_RC4                (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_STREAM|ALG_SID_RC4)
+#define CALG_SEAL               (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_STREAM|ALG_SID_SEAL)
+#define CALG_DH_SF              (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_DH|ALG_SID_DH_SANDF)
+#define CALG_DH_EPHEM           (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_DH|ALG_SID_DH_EPHEM)
+#define CALG_AGREEDKEY_ANY      (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_DH|ALG_SID_AGREED_KEY_ANY)
+#define CALG_KEA_KEYX           (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_DH|ALG_SID_KEA)
+#define CALG_HUGHES_MD5         (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_ANY|ALG_SID_MD5)
+#define CALG_SKIPJACK           (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_SKIPJACK)
+#define CALG_TEK                (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_TEK)
+#define CALG_CYLINK_MEK         (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_CYLINK_MEK)
+#define CALG_SSL3_SHAMD5        (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SSL3SHAMD5)
+#define CALG_SSL3_MASTER        (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_SSL3_MASTER)
+#define CALG_SCHANNEL_MASTER_HASH   (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_SCHANNEL_MASTER_HASH)
+#define CALG_SCHANNEL_MAC_KEY   (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_SCHANNEL_MAC_KEY)
+#define CALG_SCHANNEL_ENC_KEY   (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_SCHANNEL_ENC_KEY)
+#define CALG_PCT1_MASTER        (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_PCT1_MASTER)
+#define CALG_SSL2_MASTER        (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_SSL2_MASTER)
+#define CALG_TLS1_MASTER        (ALG_CLASS_MSG_ENCRYPT|ALG_TYPE_SECURECHANNEL|ALG_SID_TLS1_MASTER)
+#define CALG_RC5                (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_RC5)
+#define CALG_HMAC               (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HMAC)
+#define CALG_TLS1PRF            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF)
+#define CALG_HASH_REPLACE_OWF   (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HASH_REPLACE_OWF)
+#define CALG_AES_128            (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_128)
+#define CALG_AES_192            (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_192)
+#define CALG_AES_256            (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_256)
+#define CALG_AES                (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES)
+#define CALG_SHA_256            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256)
+#define CALG_SHA_384            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384)
+#define CALG_SHA_512            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512)
+
+typedef ULONG_PTR HCRYPTPROV;
+typedef ULONG_PTR HCRYPTKEY;
+typedef ULONG_PTR HCRYPTHASH;
+
+// dwFlags definitions for CryptAcquireContext
+#define CRYPT_VERIFYCONTEXT     0xF0000000
+#define CRYPT_NEWKEYSET         0x00000008
+#define CRYPT_DELETEKEYSET      0x00000010
+#define CRYPT_MACHINE_KEYSET    0x00000020
+#define CRYPT_SILENT            0x00000040
+
+// dwFlag definitions for CryptGenKey
+#define CRYPT_EXPORTABLE        0x00000001
+#define CRYPT_USER_PROTECTED    0x00000002
+#define CRYPT_CREATE_SALT       0x00000004
+#define CRYPT_UPDATE_KEY        0x00000008
+#define CRYPT_NO_SALT           0x00000010
+#define CRYPT_PREGEN            0x00000040
+#define CRYPT_RECIPIENT         0x00000010
+#define CRYPT_INITIATOR         0x00000040
+#define CRYPT_ONLINE            0x00000080
+#define CRYPT_SF                0x00000100
+#define CRYPT_CREATE_IV         0x00000200
+#define CRYPT_KEK               0x00000400
+#define CRYPT_DATA_KEY          0x00000800
+#define CRYPT_VOLATILE          0x00001000
+#define CRYPT_SGCKEY            0x00002000
+#define CRYPT_ARCHIVABLE        0x00004000
+
+#define RSA1024BIT_KEY          0x04000000
+
+// dwFlags definitions for CryptDeriveKey
+#define CRYPT_SERVER            0x00000400
+
+#define KEY_LENGTH_MASK         0xFFFF0000
+
+// dwFlag definitions for CryptExportKey
+#define CRYPT_Y_ONLY            0x00000001
+#define CRYPT_SSL2_FALLBACK     0x00000002
+#define CRYPT_DESTROYKEY        0x00000004
+#define CRYPT_OAEP              0x00000040  // used with RSA encryptions/decryptions
+                                            // CryptExportKey, CryptImportKey,
+                                            // CryptEncrypt and CryptDecrypt
+
+#define CRYPT_BLOB_VER3         0x00000080  // export version 3 of a blob type
+#define CRYPT_IPSEC_HMAC_KEY    0x00000100  // CryptImportKey only
+
+// dwFlags definitions for CryptDecrypt
+//  See also CRYPT_OAEP, above.
+//  Note, the following flag is not supported for CryptEncrypt
+#define CRYPT_DECRYPT_RSA_NO_PADDING_CHECK      0x00000020
+
+// dwFlags definitions for CryptCreateHash
+#define CRYPT_SECRETDIGEST      0x00000001
+
+// dwFlags definitions for CryptHashData
+#define CRYPT_OWF_REPL_LM_HASH  0x00000001  // this is only for the OWF replacement CSP
+
+// dwFlags definitions for CryptHashSessionKey
+#define CRYPT_LITTLE_ENDIAN     0x00000001
+
+// dwFlags definitions for CryptSignHash and CryptVerifySignature
+#define CRYPT_NOHASHOID         0x00000001
+#define CRYPT_TYPE2_FORMAT      0x00000002
+#define CRYPT_X931_FORMAT       0x00000004
+
+// dwFlag definitions for CryptSetProviderEx and CryptGetDefaultProvider
+#define CRYPT_MACHINE_DEFAULT   0x00000001
+#define CRYPT_USER_DEFAULT      0x00000002
+#define CRYPT_DELETE_DEFAULT    0x00000004
+
+// exported key blob definitions
+#define SIMPLEBLOB              0x1
+#define PUBLICKEYBLOB           0x6
+#define PRIVATEKEYBLOB          0x7
+#define PLAINTEXTKEYBLOB        0x8
+#define OPAQUEKEYBLOB           0x9
+#define PUBLICKEYBLOBEX         0xA
+#define SYMMETRICWRAPKEYBLOB    0xB
+
+#define AT_KEYEXCHANGE          1
+#define AT_SIGNATURE            2
+
+#define CRYPT_USERDATA          1
+
+// dwParam
+#define KP_IV                   1       // Initialization vector
+#define KP_SALT                 2       // Salt value
+#define KP_PADDING              3       // Padding values
+#define KP_MODE                 4       // Mode of the cipher
+#define KP_MODE_BITS            5       // Number of bits to feedback
+#define KP_PERMISSIONS          6       // Key permissions DWORD
+#define KP_ALGID                7       // Key algorithm
+#define KP_BLOCKLEN             8       // Block size of the cipher
+#define KP_KEYLEN               9       // Length of key in bits
+#define KP_SALT_EX              10      // Length of salt in bytes
+#define KP_P                    11      // DSS/Diffie-Hellman P value
+#define KP_G                    12      // DSS/Diffie-Hellman G value
+#define KP_Q                    13      // DSS Q value
+#define KP_X                    14      // Diffie-Hellman X value
+#define KP_Y                    15      // Y value
+#define KP_RA                   16      // Fortezza RA value
+#define KP_RB                   17      // Fortezza RB value
+#define KP_INFO                 18      // for putting information into an RSA envelope
+#define KP_EFFECTIVE_KEYLEN     19      // setting and getting RC2 effective key length
+#define KP_SCHANNEL_ALG         20      // for setting the Secure Channel algorithms
+#define KP_CLIENT_RANDOM        21      // for setting the Secure Channel client random data
+#define KP_SERVER_RANDOM        22      // for setting the Secure Channel server random data
+#define KP_RP                   23
+#define KP_PRECOMP_MD5          24
+#define KP_PRECOMP_SHA          25
+#define KP_CERTIFICATE          26      // for setting Secure Channel certificate data (PCT1)
+#define KP_CLEAR_KEY            27      // for setting Secure Channel clear key data (PCT1)
+#define KP_PUB_EX_LEN           28
+#define KP_PUB_EX_VAL           29
+#define KP_KEYVAL               30
+#define KP_ADMIN_PIN            31
+#define KP_KEYEXCHANGE_PIN      32
+#define KP_SIGNATURE_PIN        33
+#define KP_PREHASH              34
+#define KP_ROUNDS               35
+#define KP_OAEP_PARAMS          36      // for setting OAEP params on RSA keys
+#define KP_CMS_KEY_INFO         37
+#define KP_CMS_DH_KEY_INFO      38
+#define KP_PUB_PARAMS           39      // for setting public parameters
+#define KP_VERIFY_PARAMS        40      // for verifying DSA and DH parameters
+#define KP_HIGHEST_VERSION      41      // for TLS protocol version setting
+#define KP_GET_USE_COUNT        42      // for use with PP_CRYPT_COUNT_KEY_USE contexts
+
+// KP_PADDING
+#define PKCS5_PADDING           1       // PKCS 5 (sec 6.2) padding method
+#define RANDOM_PADDING          2
+#define ZERO_PADDING            3
+
+// KP_MODE
+#define CRYPT_MODE_CBC          1       // Cipher block chaining
+#define CRYPT_MODE_ECB          2       // Electronic code book
+#define CRYPT_MODE_OFB          3       // Output feedback mode
+#define CRYPT_MODE_CFB          4       // Cipher feedback mode
+#define CRYPT_MODE_CTS          5       // Ciphertext stealing mode
+
+// KP_PERMISSIONS
+#define CRYPT_ENCRYPT           0x0001  // Allow encryption
+#define CRYPT_DECRYPT           0x0002  // Allow decryption
+#define CRYPT_EXPORT            0x0004  // Allow key to be exported
+#define CRYPT_READ              0x0008  // Allow parameters to be read
+#define CRYPT_WRITE             0x0010  // Allow parameters to be set
+#define CRYPT_MAC               0x0020  // Allow MACs to be used with key
+#define CRYPT_EXPORT_KEY        0x0040  // Allow key to be used for exporting keys
+#define CRYPT_IMPORT_KEY        0x0080  // Allow key to be used for importing keys
+#define CRYPT_ARCHIVE           0x0100  // Allow key to be exported at creation only
+
+#define HP_ALGID                0x0001  // Hash algorithm
+#define HP_HASHVAL              0x0002  // Hash value
+#define HP_HASHSIZE             0x0004  // Hash value size
+#define HP_HMAC_INFO            0x0005  // information for creating an HMAC
+#define HP_TLS1PRF_LABEL        0x0006  // label for TLS1 PRF
+#define HP_TLS1PRF_SEED         0x0007  // seed for TLS1 PRF
+
+#define CRYPT_FAILED            FALSE
+#define CRYPT_SUCCEED           TRUE
+
+#define RCRYPT_SUCCEEDED(rt)     ((rt) == CRYPT_SUCCEED)
+#define RCRYPT_FAILED(rt)        ((rt) == CRYPT_FAILED)
+
+//
+// CryptGetProvParam
+//
+#define PP_ENUMALGS             1
+#define PP_ENUMCONTAINERS       2
+#define PP_IMPTYPE              3
+#define PP_NAME                 4
+#define PP_VERSION              5
+#define PP_CONTAINER            6
+#define PP_CHANGE_PASSWORD      7
+#define PP_KEYSET_SEC_DESCR     8       // get/set security descriptor of keyset
+#define PP_CERTCHAIN            9       // for retrieving certificates from tokens
+#define PP_KEY_TYPE_SUBTYPE     10
+#define PP_PROVTYPE             16
+#define PP_KEYSTORAGE           17
+#define PP_APPLI_CERT           18
+#define PP_SYM_KEYSIZE          19
+#define PP_SESSION_KEYSIZE      20
+#define PP_UI_PROMPT            21
+#define PP_ENUMALGS_EX          22
+#define PP_ENUMMANDROOTS        25
+#define PP_ENUMELECTROOTS       26
+#define PP_KEYSET_TYPE          27
+#define PP_ADMIN_PIN            31
+#define PP_KEYEXCHANGE_PIN      32
+#define PP_SIGNATURE_PIN        33
+#define PP_SIG_KEYSIZE_INC      34
+#define PP_KEYX_KEYSIZE_INC     35
+#define PP_UNIQUE_CONTAINER     36
+#define PP_SGC_INFO             37
+#define PP_USE_HARDWARE_RNG     38
+#define PP_KEYSPEC              39
+#define PP_ENUMEX_SIGNING_PROT  40
+#define PP_CRYPT_COUNT_KEY_USE  41
+
+#define CRYPT_FIRST             1
+#define CRYPT_NEXT              2
+#define CRYPT_SGC_ENUM          4
+
+#define CRYPT_IMPL_HARDWARE     1
+#define CRYPT_IMPL_SOFTWARE     2
+#define CRYPT_IMPL_MIXED        3
+#define CRYPT_IMPL_UNKNOWN      4
+#define CRYPT_IMPL_REMOVABLE    8
+
+// key storage flags
+#define CRYPT_SEC_DESCR         0x00000001
+#define CRYPT_PSTORE            0x00000002
+#define CRYPT_UI_PROMPT         0x00000004
+
+// protocol flags
+#define CRYPT_FLAG_PCT1         0x0001
+#define CRYPT_FLAG_SSL2         0x0002
+#define CRYPT_FLAG_SSL3         0x0004
+#define CRYPT_FLAG_TLS1         0x0008
+#define CRYPT_FLAG_IPSEC        0x0010
+#define CRYPT_FLAG_SIGNING      0x0020
+
+// SGC flags
+#define CRYPT_SGC               0x0001
+#define CRYPT_FASTSGC           0x0002
+
+//
+// CryptSetProvParam
+//
+#define PP_CLIENT_HWND          1
+#define PP_CONTEXT_INFO         11
+#define PP_KEYEXCHANGE_KEYSIZE  12
+#define PP_SIGNATURE_KEYSIZE    13
+#define PP_KEYEXCHANGE_ALG      14
+#define PP_SIGNATURE_ALG        15
+#define PP_DELETEKEY            24
+
+#define PROV_RSA_FULL           1
+#define PROV_RSA_SIG            2
+#define PROV_DSS                3
+#define PROV_FORTEZZA           4
+#define PROV_MS_EXCHANGE        5
+#define PROV_SSL                6
+#define PROV_RSA_SCHANNEL       12
+#define PROV_DSS_DH             13
+#define PROV_EC_ECDSA_SIG       14
+#define PROV_EC_ECNRA_SIG       15
+#define PROV_EC_ECDSA_FULL      16
+#define PROV_EC_ECNRA_FULL      17
+#define PROV_DH_SCHANNEL        18
+#define PROV_SPYRUS_LYNKS       20
+#define PROV_RNG                21
+#define PROV_INTEL_SEC          22
+#define PROV_REPLACE_OWF        23
+#define PROV_RSA_AES            24
+
+
+//
+// Provider friendly names
+//
+#define MS_DEF_PROV_A           "Microsoft Base Cryptographic Provider v1.0"
+#define MS_DEF_PROV_W           L"Microsoft Base Cryptographic Provider v1.0"
+#ifdef UNICODE
+#define MS_DEF_PROV             MS_DEF_PROV_W
+#else
+#define MS_DEF_PROV             MS_DEF_PROV_A
+#endif
+
+#define MS_ENHANCED_PROV_A      "Microsoft Enhanced Cryptographic Provider v1.0"
+#define MS_ENHANCED_PROV_W      L"Microsoft Enhanced Cryptographic Provider v1.0"
+#ifdef UNICODE
+#define MS_ENHANCED_PROV        MS_ENHANCED_PROV_W
+#else
+#define MS_ENHANCED_PROV        MS_ENHANCED_PROV_A
+#endif
+
+#define MS_STRONG_PROV_A        "Microsoft Strong Cryptographic Provider"
+#define MS_STRONG_PROV_W        L"Microsoft Strong Cryptographic Provider"
+#ifdef UNICODE
+#define MS_STRONG_PROV          MS_STRONG_PROV_W
+#else
+#define MS_STRONG_PROV          MS_STRONG_PROV_A
+#endif
+
+#define MS_DEF_RSA_SIG_PROV_A   "Microsoft RSA Signature Cryptographic Provider"
+#define MS_DEF_RSA_SIG_PROV_W   L"Microsoft RSA Signature Cryptographic Provider"
+#ifdef UNICODE
+#define MS_DEF_RSA_SIG_PROV     MS_DEF_RSA_SIG_PROV_W
+#else
+#define MS_DEF_RSA_SIG_PROV     MS_DEF_RSA_SIG_PROV_A
+#endif
+
+#define MS_DEF_RSA_SCHANNEL_PROV_A  "Microsoft RSA SChannel Cryptographic Provider"
+#define MS_DEF_RSA_SCHANNEL_PROV_W  L"Microsoft RSA SChannel Cryptographic Provider"
+#ifdef UNICODE
+#define MS_DEF_RSA_SCHANNEL_PROV    MS_DEF_RSA_SCHANNEL_PROV_W
+#else
+#define MS_DEF_RSA_SCHANNEL_PROV    MS_DEF_RSA_SCHANNEL_PROV_A
+#endif
+
+#define MS_DEF_DSS_PROV_A       "Microsoft Base DSS Cryptographic Provider"
+#define MS_DEF_DSS_PROV_W       L"Microsoft Base DSS Cryptographic Provider"
+#ifdef UNICODE
+#define MS_DEF_DSS_PROV         MS_DEF_DSS_PROV_W
+#else
+#define MS_DEF_DSS_PROV         MS_DEF_DSS_PROV_A
+#endif
+
+#define MS_DEF_DSS_DH_PROV_A    "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider"
+#define MS_DEF_DSS_DH_PROV_W    L"Microsoft Base DSS and Diffie-Hellman Cryptographic Provider"
+#ifdef UNICODE
+#define MS_DEF_DSS_DH_PROV      MS_DEF_DSS_DH_PROV_W
+#else
+#define MS_DEF_DSS_DH_PROV      MS_DEF_DSS_DH_PROV_A
+#endif
+
+#define MS_ENH_DSS_DH_PROV_A    "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider"
+#define MS_ENH_DSS_DH_PROV_W    L"Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider"
+#ifdef UNICODE
+#define MS_ENH_DSS_DH_PROV      MS_ENH_DSS_DH_PROV_W
+#else
+#define MS_ENH_DSS_DH_PROV      MS_ENH_DSS_DH_PROV_A
+#endif
+
+#define MS_DEF_DH_SCHANNEL_PROV_A  "Microsoft DH SChannel Cryptographic Provider"
+#define MS_DEF_DH_SCHANNEL_PROV_W  L"Microsoft DH SChannel Cryptographic Provider"
+#ifdef UNICODE
+#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_W
+#else
+#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_A
+#endif
+
+#define MS_SCARD_PROV_A         "Microsoft Base Smart Card Crypto Provider"
+#define MS_SCARD_PROV_W         L"Microsoft Base Smart Card Crypto Provider"
+#ifdef UNICODE
+#define MS_SCARD_PROV           MS_SCARD_PROV_W
+#else
+#define MS_SCARD_PROV           MS_SCARD_PROV_A
+#endif
+
+#define MS_ENH_RSA_AES_PROV_A   "Microsoft Enhanced RSA and AES Cryptographic Provider"
+#define MS_ENH_RSA_AES_PROV_W   L"Microsoft Enhanced RSA and AES Cryptographic Provider"
+#ifdef UNICODE
+#define MS_ENH_RSA_AES_PROV     MS_ENH_RSA_AES_PROV_W
+#else
+#define MS_ENH_RSA_AES_PROV     MS_ENH_RSA_AES_PROV_A
+#endif
+
+#define MAXUIDLEN               64
+
+// Exponentiation Offload Reg Location
+#define EXPO_OFFLOAD_REG_VALUE "ExpoOffload"
+#define EXPO_OFFLOAD_FUNC_NAME "OffloadModExpo"
+
+//
+// Registry key in which the following private key-related
+// values are created.
+//
+#define szKEY_CRYPTOAPI_PRIVATE_KEY_OPTIONS \
+    "Software\\Policies\\Microsoft\\Cryptography" 
+
+//
+// Registry value for controlling Data Protection API (DPAPI) UI settings.
+//
+#define szFORCE_KEY_PROTECTION             "ForceKeyProtection"
+
+#define dwFORCE_KEY_PROTECTION_DISABLED     0x0
+#define dwFORCE_KEY_PROTECTION_USER_SELECT  0x1
+#define dwFORCE_KEY_PROTECTION_HIGH         0x2
+ 
+//
+// Registry values for enabling and controlling the caching (and timeout)
+// of private keys.  This feature is useful only for UI-protected private
+// keys.
+//
+// Note that in Windows 2000 and later, private keys, once read from storage,
+// are cached in the associated HCRYPTPROV structure for subsequent use.
+//
+// In .NET Server and XP SP1, new key caching behavior is available.  Keys
+// that have been read from storage and cached may now be considered "stale"
+// if a period of time has elapsed since the key was last used.  This forces
+// the key to be re-read from storage (which will make the DPAPI UI appear 
+// again).
+//
+// To enable the new behavior, create the registry DWORD value 
+// szKEY_CACHE_ENABLED and set it to 1.  The registry DWORD value
+// szKEY_CACHE_SECONDS must also be created and set to the number of seconds
+// that a cached private key may still be considered usable.  
+//
+#define szKEY_CACHE_ENABLED     "CachePrivateKeys"
+#define szKEY_CACHE_SECONDS     "PrivateKeyLifetimeSeconds"
+
+#define CUR_BLOB_VERSION        2
+
+// structure for use with CryptSetKeyParam for CMS keys
+// DO NOT USE THIS STRUCTURE!!!!!
+typedef struct _CMS_KEY_INFO {
+    DWORD       dwVersion;                      // sizeof(CMS_KEY_INFO)
+    ALG_ID  Algid;                              // algorithmm id for the key to be converted
+    BYTE    *pbOID;                             // pointer to OID to hash in with Z
+    DWORD   cbOID;                              // length of OID to hash in with Z
+} CMS_KEY_INFO, *PCMS_KEY_INFO;
+
+// structure for use with CryptSetHashParam with CALG_HMAC
+typedef struct _HMAC_Info {
+    ALG_ID  HashAlgid;
+    BYTE    *pbInnerString;
+    DWORD   cbInnerString;
+    BYTE    *pbOuterString;
+    DWORD   cbOuterString;
+} HMAC_INFO, *PHMAC_INFO;
+
+// structure for use with CryptSetKeyParam with KP_SCHANNEL_ALG
+typedef struct _SCHANNEL_ALG {
+    DWORD   dwUse;
+    ALG_ID  Algid;
+    DWORD   cBits;
+    DWORD   dwFlags;
+    DWORD   dwReserved;
+} SCHANNEL_ALG, *PSCHANNEL_ALG;
+
+// uses of algortihms for SCHANNEL_ALG structure
+#define     SCHANNEL_MAC_KEY    0x00000000
+#define     SCHANNEL_ENC_KEY    0x00000001
+
+// uses of dwFlags SCHANNEL_ALG structure
+#define     INTERNATIONAL_USAGE 0x00000001
+
+typedef struct _PROV_ENUMALGS {
+    ALG_ID    aiAlgid;
+    DWORD     dwBitLen;
+    DWORD     dwNameLen;
+    CHAR      szName[20];
+} PROV_ENUMALGS;
+
+typedef struct _PROV_ENUMALGS_EX {
+    ALG_ID    aiAlgid;
+    DWORD     dwDefaultLen;
+    DWORD     dwMinLen;
+    DWORD     dwMaxLen;
+    DWORD     dwProtocols;
+    DWORD     dwNameLen;
+    CHAR      szName[20];
+    DWORD     dwLongNameLen;
+    CHAR      szLongName[40];
+} PROV_ENUMALGS_EX;
+
+typedef struct _PUBLICKEYSTRUC {
+        BYTE    bType;
+        BYTE    bVersion;
+        WORD    reserved;
+        ALG_ID  aiKeyAlg;
+} BLOBHEADER, PUBLICKEYSTRUC;
+
+typedef struct _RSAPUBKEY {
+        DWORD   magic;                  // Has to be RSA1
+        DWORD   bitlen;                 // # of bits in modulus
+        DWORD   pubexp;                 // public exponent
+                                        // Modulus data follows
+} RSAPUBKEY;
+
+typedef struct _PUBKEY {
+        DWORD   magic;
+        DWORD   bitlen;                 // # of bits in modulus
+} DHPUBKEY, DSSPUBKEY, KEAPUBKEY, TEKPUBKEY;
+
+typedef struct _DSSSEED {
+        DWORD   counter;
+        BYTE    seed[20];
+} DSSSEED;
+
+typedef struct _PUBKEYVER3 {
+        DWORD   magic;
+        DWORD   bitlenP;                // # of bits in prime modulus
+        DWORD   bitlenQ;                // # of bits in prime q, 0 if not available
+        DWORD   bitlenJ;                // # of bits in (p-1)/q, 0 if not available
+        DSSSEED DSSSeed;
+} DHPUBKEY_VER3, DSSPUBKEY_VER3;
+
+typedef struct _PRIVKEYVER3 {
+        DWORD   magic;
+        DWORD   bitlenP;                // # of bits in prime modulus
+        DWORD   bitlenQ;                // # of bits in prime q, 0 if not available
+        DWORD   bitlenJ;                // # of bits in (p-1)/q, 0 if not available
+        DWORD   bitlenX;                // # of bits in X
+        DSSSEED DSSSeed;
+} DHPRIVKEY_VER3, DSSPRIVKEY_VER3;
+
+typedef struct _KEY_TYPE_SUBTYPE {
+        DWORD   dwKeySpec;
+        GUID    Type;
+        GUID    Subtype;
+} KEY_TYPE_SUBTYPE, *PKEY_TYPE_SUBTYPE;
+
+typedef struct _CERT_FORTEZZA_DATA_PROP {
+    unsigned char   SerialNumber[8];
+    int             CertIndex;
+    unsigned char   CertLabel[36];
+} CERT_FORTEZZA_DATA_PROP;
+
+
+//+-------------------------------------------------------------------------
+//  CRYPTOAPI BLOB definitions
+//--------------------------------------------------------------------------
+typedef struct _CRYPTOAPI_BLOB {
+    DWORD   cbData;
+    BYTE    *pbData;
+} CRYPT_INTEGER_BLOB, *PCRYPT_INTEGER_BLOB,
+CRYPT_UINT_BLOB, *PCRYPT_UINT_BLOB,
+CRYPT_OBJID_BLOB, *PCRYPT_OBJID_BLOB,
+CERT_NAME_BLOB, *PCERT_NAME_BLOB,
+CERT_RDN_VALUE_BLOB, *PCERT_RDN_VALUE_BLOB,
+CERT_BLOB, *PCERT_BLOB,
+CRL_BLOB, *PCRL_BLOB,
+DATA_BLOB, *PDATA_BLOB,
+CRYPT_DATA_BLOB, *PCRYPT_DATA_BLOB,
+CRYPT_HASH_BLOB, *PCRYPT_HASH_BLOB,
+CRYPT_DIGEST_BLOB, *PCRYPT_DIGEST_BLOB,
+CRYPT_DER_BLOB, *PCRYPT_DER_BLOB,
+CRYPT_ATTR_BLOB, *PCRYPT_ATTR_BLOB;
+
+// structure for use with CryptSetKeyParam for CMS keys
+typedef struct _CMS_DH_KEY_INFO {
+    DWORD               dwVersion;                      // sizeof(CMS_DH_KEY_INFO)
+    ALG_ID          Algid;                              // algorithmm id for the key to be converted
+    LPSTR           pszContentEncObjId; // pointer to OID to hash in with Z
+    CRYPT_DATA_BLOB PubInfo;            // OPTIONAL - public information
+    void            *pReserved;         // reserved - should be NULL
+} CMS_DH_KEY_INFO, *PCMS_DH_KEY_INFO;
+
+
+WINADVAPI
+BOOL
+WINAPI
+CryptAcquireContextA(
+    HCRYPTPROV *phProv,
+    LPCSTR szContainer,
+    LPCSTR szProvider,
+    DWORD dwProvType,
+    DWORD dwFlags
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptAcquireContextW(
+    HCRYPTPROV *phProv,
+    LPCWSTR szContainer,
+    LPCWSTR szProvider,
+    DWORD dwProvType,
+    DWORD dwFlags
+    );
+#ifdef UNICODE
+#define CryptAcquireContext  CryptAcquireContextW
+#else
+#define CryptAcquireContext  CryptAcquireContextA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptReleaseContext(
+    HCRYPTPROV hProv,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGenKey(
+    HCRYPTPROV hProv,
+    ALG_ID Algid,
+    DWORD dwFlags,
+    HCRYPTKEY *phKey
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptDeriveKey(
+    HCRYPTPROV hProv,
+    ALG_ID Algid,
+    HCRYPTHASH hBaseData,
+    DWORD dwFlags,
+    HCRYPTKEY *phKey
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptDestroyKey(
+    HCRYPTKEY hKey
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptSetKeyParam(
+    HCRYPTKEY hKey,
+    DWORD dwParam,
+    CONST BYTE *pbData,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGetKeyParam(
+    HCRYPTKEY hKey,
+    DWORD dwParam,
+    BYTE *pbData,
+    DWORD *pdwDataLen,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptSetHashParam(
+    HCRYPTHASH hHash,
+    DWORD dwParam,
+    CONST BYTE *pbData,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGetHashParam(
+    HCRYPTHASH hHash,
+    DWORD dwParam,
+    BYTE *pbData,
+    DWORD *pdwDataLen,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptSetProvParam(
+    HCRYPTPROV hProv,
+    DWORD dwParam,
+    CONST BYTE *pbData,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGetProvParam(
+    HCRYPTPROV hProv,
+    DWORD dwParam,
+    BYTE *pbData,
+    DWORD *pdwDataLen,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGenRandom(
+    HCRYPTPROV hProv,
+    DWORD dwLen,
+    BYTE *pbBuffer
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGetUserKey(
+    HCRYPTPROV hProv,
+    DWORD dwKeySpec,
+    HCRYPTKEY *phUserKey
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptExportKey(
+    HCRYPTKEY hKey,
+    HCRYPTKEY hExpKey,
+    DWORD dwBlobType,
+    DWORD dwFlags,
+    BYTE *pbData,
+    DWORD *pdwDataLen
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptImportKey(
+    HCRYPTPROV hProv,
+    CONST BYTE *pbData,
+    DWORD dwDataLen,
+    HCRYPTKEY hPubKey,
+    DWORD dwFlags,
+    HCRYPTKEY *phKey
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptEncrypt(
+    HCRYPTKEY hKey,
+    HCRYPTHASH hHash,
+    BOOL Final,
+    DWORD dwFlags,
+    BYTE *pbData,
+    DWORD *pdwDataLen,
+    DWORD dwBufLen
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptDecrypt(
+    HCRYPTKEY hKey,
+    HCRYPTHASH hHash,
+    BOOL Final,
+    DWORD dwFlags,
+    BYTE *pbData,
+    DWORD *pdwDataLen
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptCreateHash(
+    HCRYPTPROV hProv,
+    ALG_ID Algid,
+    HCRYPTKEY hKey,
+    DWORD dwFlags,
+    HCRYPTHASH *phHash
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptHashData(
+    HCRYPTHASH hHash,
+    CONST BYTE *pbData,
+    DWORD dwDataLen,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptHashSessionKey(
+    HCRYPTHASH hHash,
+    HCRYPTKEY hKey,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptDestroyHash(
+    HCRYPTHASH hHash
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptSignHashA(
+    HCRYPTHASH hHash,
+    DWORD dwKeySpec,
+    LPCSTR szDescription,
+    DWORD dwFlags,
+    BYTE *pbSignature,
+    DWORD *pdwSigLen
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptSignHashW(
+    HCRYPTHASH hHash,
+    DWORD dwKeySpec,
+    LPCWSTR szDescription,
+    DWORD dwFlags,
+    BYTE *pbSignature,
+    DWORD *pdwSigLen
+    );
+#ifdef UNICODE
+#define CryptSignHash  CryptSignHashW
+#else
+#define CryptSignHash  CryptSignHashA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptVerifySignatureA(
+    HCRYPTHASH hHash,
+    CONST BYTE *pbSignature,
+    DWORD dwSigLen,
+    HCRYPTKEY hPubKey,
+    LPCSTR szDescription,
+    DWORD dwFlags
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptVerifySignatureW(
+    HCRYPTHASH hHash,
+    CONST BYTE *pbSignature,
+    DWORD dwSigLen,
+    HCRYPTKEY hPubKey,
+    LPCWSTR szDescription,
+    DWORD dwFlags
+    );
+#ifdef UNICODE
+#define CryptVerifySignature  CryptVerifySignatureW
+#else
+#define CryptVerifySignature  CryptVerifySignatureA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptSetProviderA(
+    LPCSTR pszProvName,
+    DWORD dwProvType
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptSetProviderW(
+    LPCWSTR pszProvName,
+    DWORD dwProvType
+    );
+#ifdef UNICODE
+#define CryptSetProvider  CryptSetProviderW
+#else
+#define CryptSetProvider  CryptSetProviderA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptSetProviderExA(
+    LPCSTR pszProvName,
+    DWORD dwProvType,
+    DWORD *pdwReserved,
+    DWORD dwFlags
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptSetProviderExW(
+    LPCWSTR pszProvName,
+    DWORD dwProvType,
+    DWORD *pdwReserved,
+    DWORD dwFlags
+    );
+#ifdef UNICODE
+#define CryptSetProviderEx  CryptSetProviderExW
+#else
+#define CryptSetProviderEx  CryptSetProviderExA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptGetDefaultProviderA(
+    DWORD dwProvType,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    LPSTR pszProvName,
+    DWORD *pcbProvName
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptGetDefaultProviderW(
+    DWORD dwProvType,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    LPWSTR pszProvName,
+    DWORD *pcbProvName
+    );
+#ifdef UNICODE
+#define CryptGetDefaultProvider  CryptGetDefaultProviderW
+#else
+#define CryptGetDefaultProvider  CryptGetDefaultProviderA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptEnumProviderTypesA(
+    DWORD dwIndex,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    DWORD *pdwProvType,
+    LPSTR szTypeName,
+    DWORD *pcbTypeName
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptEnumProviderTypesW(
+    DWORD dwIndex,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    DWORD *pdwProvType,
+    LPWSTR szTypeName,
+    DWORD *pcbTypeName
+    );
+#ifdef UNICODE
+#define CryptEnumProviderTypes  CryptEnumProviderTypesW
+#else
+#define CryptEnumProviderTypes  CryptEnumProviderTypesA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptEnumProvidersA(
+    DWORD dwIndex,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    DWORD *pdwProvType,
+    LPSTR szProvName,
+    DWORD *pcbProvName
+    );
+WINADVAPI
+BOOL
+WINAPI
+CryptEnumProvidersW(
+    DWORD dwIndex,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    DWORD *pdwProvType,
+    LPWSTR szProvName,
+    DWORD *pcbProvName
+    );
+#ifdef UNICODE
+#define CryptEnumProviders  CryptEnumProvidersW
+#else
+#define CryptEnumProviders  CryptEnumProvidersA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CryptContextAddRef(
+    HCRYPTPROV hProv,
+    DWORD *pdwReserved,
+    DWORD dwFlags
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptDuplicateKey(
+    HCRYPTKEY hKey,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    HCRYPTKEY *phKey
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+CryptDuplicateHash(
+    HCRYPTHASH hHash,
+    DWORD *pdwReserved,
+    DWORD dwFlags,
+    HCRYPTHASH *phHash
+    );
+
+//
+// This function is provided in Microsoft Windows 2000 as a means of 
+// installing the 128-bit encryption provider. This function is unavailable 
+// in Microsoft Windows XP, because Windows XP ships with the 128-bit 
+// encryption provider.
+//
+BOOL 
+__cdecl 
+GetEncSChannel(
+    BYTE **pData, 
+    DWORD *dwDecSize
+    );
+
+//+-------------------------------------------------------------------------
+//  In a CRYPT_BIT_BLOB the last byte may contain 0-7 unused bits. Therefore, the
+//  overall bit length is cbData * 8 - cUnusedBits.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_BIT_BLOB {
+    DWORD   cbData;
+    BYTE    *pbData;
+    DWORD   cUnusedBits;
+} CRYPT_BIT_BLOB, *PCRYPT_BIT_BLOB;
+
+//+-------------------------------------------------------------------------
+//  Type used for any algorithm
+//
+//  Where the Parameters CRYPT_OBJID_BLOB is in its encoded representation. For most
+//  algorithm types, the Parameters CRYPT_OBJID_BLOB is NULL (Parameters.cbData = 0).
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_ALGORITHM_IDENTIFIER {
+    LPSTR               pszObjId;
+    CRYPT_OBJID_BLOB    Parameters;
+} CRYPT_ALGORITHM_IDENTIFIER, *PCRYPT_ALGORITHM_IDENTIFIER;
+
+// Following are the definitions of various algorithm object identifiers
+// RSA
+#define szOID_RSA               "1.2.840.113549"
+#define szOID_PKCS              "1.2.840.113549.1"
+#define szOID_RSA_HASH          "1.2.840.113549.2"
+#define szOID_RSA_ENCRYPT       "1.2.840.113549.3"
+
+#define szOID_PKCS_1            "1.2.840.113549.1.1"
+#define szOID_PKCS_2            "1.2.840.113549.1.2"
+#define szOID_PKCS_3            "1.2.840.113549.1.3"
+#define szOID_PKCS_4            "1.2.840.113549.1.4"
+#define szOID_PKCS_5            "1.2.840.113549.1.5"
+#define szOID_PKCS_6            "1.2.840.113549.1.6"
+#define szOID_PKCS_7            "1.2.840.113549.1.7"
+#define szOID_PKCS_8            "1.2.840.113549.1.8"
+#define szOID_PKCS_9            "1.2.840.113549.1.9"
+#define szOID_PKCS_10           "1.2.840.113549.1.10"
+#define szOID_PKCS_12           "1.2.840.113549.1.12"
+
+#define szOID_RSA_RSA           "1.2.840.113549.1.1.1"
+#define szOID_RSA_MD2RSA        "1.2.840.113549.1.1.2"
+#define szOID_RSA_MD4RSA        "1.2.840.113549.1.1.3"
+#define szOID_RSA_MD5RSA        "1.2.840.113549.1.1.4"
+#define szOID_RSA_SHA1RSA       "1.2.840.113549.1.1.5"
+#define szOID_RSA_SETOAEP_RSA   "1.2.840.113549.1.1.6"
+
+#define szOID_RSA_DH            "1.2.840.113549.1.3.1"
+
+#define szOID_RSA_data          "1.2.840.113549.1.7.1"
+#define szOID_RSA_signedData    "1.2.840.113549.1.7.2"
+#define szOID_RSA_envelopedData "1.2.840.113549.1.7.3"
+#define szOID_RSA_signEnvData   "1.2.840.113549.1.7.4"
+#define szOID_RSA_digestedData  "1.2.840.113549.1.7.5"
+#define szOID_RSA_hashedData    "1.2.840.113549.1.7.5"
+#define szOID_RSA_encryptedData "1.2.840.113549.1.7.6"
+
+#define szOID_RSA_emailAddr     "1.2.840.113549.1.9.1"
+#define szOID_RSA_unstructName  "1.2.840.113549.1.9.2"
+#define szOID_RSA_contentType   "1.2.840.113549.1.9.3"
+#define szOID_RSA_messageDigest "1.2.840.113549.1.9.4"
+#define szOID_RSA_signingTime   "1.2.840.113549.1.9.5"
+#define szOID_RSA_counterSign   "1.2.840.113549.1.9.6"
+#define szOID_RSA_challengePwd  "1.2.840.113549.1.9.7"
+#define szOID_RSA_unstructAddr  "1.2.840.113549.1.9.8"
+#define szOID_RSA_extCertAttrs  "1.2.840.113549.1.9.9"
+#define szOID_RSA_certExtensions "1.2.840.113549.1.9.14"
+#define szOID_RSA_SMIMECapabilities "1.2.840.113549.1.9.15"
+#define szOID_RSA_preferSignedData "1.2.840.113549.1.9.15.1"
+
+#define szOID_RSA_SMIMEalg              "1.2.840.113549.1.9.16.3"
+#define szOID_RSA_SMIMEalgESDH          "1.2.840.113549.1.9.16.3.5"
+#define szOID_RSA_SMIMEalgCMS3DESwrap   "1.2.840.113549.1.9.16.3.6"
+#define szOID_RSA_SMIMEalgCMSRC2wrap    "1.2.840.113549.1.9.16.3.7"
+
+#define szOID_RSA_MD2           "1.2.840.113549.2.2"
+#define szOID_RSA_MD4           "1.2.840.113549.2.4"
+#define szOID_RSA_MD5           "1.2.840.113549.2.5"
+
+#define szOID_RSA_RC2CBC        "1.2.840.113549.3.2"
+#define szOID_RSA_RC4           "1.2.840.113549.3.4"
+#define szOID_RSA_DES_EDE3_CBC  "1.2.840.113549.3.7"
+#define szOID_RSA_RC5_CBCPad    "1.2.840.113549.3.9"
+
+
+#define szOID_ANSI_X942         "1.2.840.10046"
+#define szOID_ANSI_X942_DH      "1.2.840.10046.2.1"
+
+#define szOID_X957              "1.2.840.10040"
+#define szOID_X957_DSA          "1.2.840.10040.4.1"
+#define szOID_X957_SHA1DSA      "1.2.840.10040.4.3"
+
+// ITU-T UsefulDefinitions
+#define szOID_DS                "2.5"
+#define szOID_DSALG             "2.5.8"
+#define szOID_DSALG_CRPT        "2.5.8.1"
+#define szOID_DSALG_HASH        "2.5.8.2"
+#define szOID_DSALG_SIGN        "2.5.8.3"
+#define szOID_DSALG_RSA         "2.5.8.1.1"
+// NIST OSE Implementors' Workshop (OIW)
+// http://nemo.ncsl.nist.gov/oiw/agreements/stable/OSI/12s_9506.w51
+// http://nemo.ncsl.nist.gov/oiw/agreements/working/OSI/12w_9503.w51
+#define szOID_OIW               "1.3.14"
+// NIST OSE Implementors' Workshop (OIW) Security SIG algorithm identifiers
+#define szOID_OIWSEC            "1.3.14.3.2"
+#define szOID_OIWSEC_md4RSA     "1.3.14.3.2.2"
+#define szOID_OIWSEC_md5RSA     "1.3.14.3.2.3"
+#define szOID_OIWSEC_md4RSA2    "1.3.14.3.2.4"
+#define szOID_OIWSEC_desECB     "1.3.14.3.2.6"
+#define szOID_OIWSEC_desCBC     "1.3.14.3.2.7"
+#define szOID_OIWSEC_desOFB     "1.3.14.3.2.8"
+#define szOID_OIWSEC_desCFB     "1.3.14.3.2.9"
+#define szOID_OIWSEC_desMAC     "1.3.14.3.2.10"
+#define szOID_OIWSEC_rsaSign    "1.3.14.3.2.11"
+#define szOID_OIWSEC_dsa        "1.3.14.3.2.12"
+#define szOID_OIWSEC_shaDSA     "1.3.14.3.2.13"
+#define szOID_OIWSEC_mdc2RSA    "1.3.14.3.2.14"
+#define szOID_OIWSEC_shaRSA     "1.3.14.3.2.15"
+#define szOID_OIWSEC_dhCommMod  "1.3.14.3.2.16"
+#define szOID_OIWSEC_desEDE     "1.3.14.3.2.17"
+#define szOID_OIWSEC_sha        "1.3.14.3.2.18"
+#define szOID_OIWSEC_mdc2       "1.3.14.3.2.19"
+#define szOID_OIWSEC_dsaComm    "1.3.14.3.2.20"
+#define szOID_OIWSEC_dsaCommSHA "1.3.14.3.2.21"
+#define szOID_OIWSEC_rsaXchg    "1.3.14.3.2.22"
+#define szOID_OIWSEC_keyHashSeal "1.3.14.3.2.23"
+#define szOID_OIWSEC_md2RSASign "1.3.14.3.2.24"
+#define szOID_OIWSEC_md5RSASign "1.3.14.3.2.25"
+#define szOID_OIWSEC_sha1       "1.3.14.3.2.26"
+#define szOID_OIWSEC_dsaSHA1    "1.3.14.3.2.27"
+#define szOID_OIWSEC_dsaCommSHA1 "1.3.14.3.2.28"
+#define szOID_OIWSEC_sha1RSASign "1.3.14.3.2.29"
+// NIST OSE Implementors' Workshop (OIW) Directory SIG algorithm identifiers
+#define szOID_OIWDIR            "1.3.14.7.2"
+#define szOID_OIWDIR_CRPT       "1.3.14.7.2.1"
+#define szOID_OIWDIR_HASH       "1.3.14.7.2.2"
+#define szOID_OIWDIR_SIGN       "1.3.14.7.2.3"
+#define szOID_OIWDIR_md2        "1.3.14.7.2.2.1"
+#define szOID_OIWDIR_md2RSA     "1.3.14.7.2.3.1"
+
+
+// INFOSEC Algorithms
+// joint-iso-ccitt(2) country(16) us(840) organization(1) us-government(101) dod(2) id-infosec(1)
+#define szOID_INFOSEC                       "2.16.840.1.101.2.1"
+#define szOID_INFOSEC_sdnsSignature         "2.16.840.1.101.2.1.1.1"
+#define szOID_INFOSEC_mosaicSignature       "2.16.840.1.101.2.1.1.2"
+#define szOID_INFOSEC_sdnsConfidentiality   "2.16.840.1.101.2.1.1.3"
+#define szOID_INFOSEC_mosaicConfidentiality "2.16.840.1.101.2.1.1.4"
+#define szOID_INFOSEC_sdnsIntegrity         "2.16.840.1.101.2.1.1.5"
+#define szOID_INFOSEC_mosaicIntegrity       "2.16.840.1.101.2.1.1.6"
+#define szOID_INFOSEC_sdnsTokenProtection   "2.16.840.1.101.2.1.1.7"
+#define szOID_INFOSEC_mosaicTokenProtection "2.16.840.1.101.2.1.1.8"
+#define szOID_INFOSEC_sdnsKeyManagement     "2.16.840.1.101.2.1.1.9"
+#define szOID_INFOSEC_mosaicKeyManagement   "2.16.840.1.101.2.1.1.10"
+#define szOID_INFOSEC_sdnsKMandSig          "2.16.840.1.101.2.1.1.11"
+#define szOID_INFOSEC_mosaicKMandSig        "2.16.840.1.101.2.1.1.12"
+#define szOID_INFOSEC_SuiteASignature       "2.16.840.1.101.2.1.1.13"
+#define szOID_INFOSEC_SuiteAConfidentiality "2.16.840.1.101.2.1.1.14"
+#define szOID_INFOSEC_SuiteAIntegrity       "2.16.840.1.101.2.1.1.15"
+#define szOID_INFOSEC_SuiteATokenProtection "2.16.840.1.101.2.1.1.16"
+#define szOID_INFOSEC_SuiteAKeyManagement   "2.16.840.1.101.2.1.1.17"
+#define szOID_INFOSEC_SuiteAKMandSig        "2.16.840.1.101.2.1.1.18"
+#define szOID_INFOSEC_mosaicUpdatedSig      "2.16.840.1.101.2.1.1.19"
+#define szOID_INFOSEC_mosaicKMandUpdSig     "2.16.840.1.101.2.1.1.20"
+#define szOID_INFOSEC_mosaicUpdatedInteg    "2.16.840.1.101.2.1.1.21"
+
+typedef struct _CRYPT_OBJID_TABLE {
+    DWORD   dwAlgId;
+    LPCSTR  pszObjId;
+} CRYPT_OBJID_TABLE, *PCRYPT_OBJID_TABLE;
+
+
+//+-------------------------------------------------------------------------
+//  PKCS #1 HashInfo (DigestInfo)
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_HASH_INFO {
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    CRYPT_HASH_BLOB             Hash;
+} CRYPT_HASH_INFO, *PCRYPT_HASH_INFO;
+
+//+-------------------------------------------------------------------------
+//  Type used for an extension to an encoded content
+//
+//  Where the Value's CRYPT_OBJID_BLOB is in its encoded representation.
+//--------------------------------------------------------------------------
+typedef struct _CERT_EXTENSION {
+    LPSTR               pszObjId;
+    BOOL                fCritical;
+    CRYPT_OBJID_BLOB    Value;
+} CERT_EXTENSION, *PCERT_EXTENSION;
+
+//+-------------------------------------------------------------------------
+//  AttributeTypeValue
+//
+//  Where the Value's CRYPT_OBJID_BLOB is in its encoded representation.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_ATTRIBUTE_TYPE_VALUE {
+    LPSTR               pszObjId;
+    CRYPT_OBJID_BLOB    Value;
+} CRYPT_ATTRIBUTE_TYPE_VALUE, *PCRYPT_ATTRIBUTE_TYPE_VALUE;
+
+//+-------------------------------------------------------------------------
+//  Attributes
+//
+//  Where the Value's PATTR_BLOBs are in their encoded representation.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_ATTRIBUTE {
+    LPSTR               pszObjId;
+    DWORD               cValue;
+    PCRYPT_ATTR_BLOB    rgValue;
+} CRYPT_ATTRIBUTE, *PCRYPT_ATTRIBUTE;
+
+typedef struct _CRYPT_ATTRIBUTES {
+    IN DWORD                cAttr;
+    IN PCRYPT_ATTRIBUTE     rgAttr;
+} CRYPT_ATTRIBUTES, *PCRYPT_ATTRIBUTES;
+
+//+-------------------------------------------------------------------------
+//  Attributes making up a Relative Distinguished Name (CERT_RDN)
+//
+//  The interpretation of the Value depends on the dwValueType.
+//  See below for a list of the types.
+//--------------------------------------------------------------------------
+typedef struct _CERT_RDN_ATTR {
+    LPSTR                   pszObjId;
+    DWORD                   dwValueType;
+    CERT_RDN_VALUE_BLOB     Value;
+} CERT_RDN_ATTR, *PCERT_RDN_ATTR;
+
+//+-------------------------------------------------------------------------
+//  CERT_RDN attribute Object Identifiers
+//--------------------------------------------------------------------------
+// Labeling attribute types:
+#define szOID_COMMON_NAME                   "2.5.4.3"  // case-ignore string
+#define szOID_SUR_NAME                      "2.5.4.4"  // case-ignore string
+#define szOID_DEVICE_SERIAL_NUMBER          "2.5.4.5"  // printable string
+
+// Geographic attribute types:
+#define szOID_COUNTRY_NAME                  "2.5.4.6"  // printable 2char string
+#define szOID_LOCALITY_NAME                 "2.5.4.7"  // case-ignore string
+#define szOID_STATE_OR_PROVINCE_NAME        "2.5.4.8"  // case-ignore string
+#define szOID_STREET_ADDRESS                "2.5.4.9"  // case-ignore string
+
+// Organizational attribute types:
+#define szOID_ORGANIZATION_NAME             "2.5.4.10" // case-ignore string
+#define szOID_ORGANIZATIONAL_UNIT_NAME      "2.5.4.11" // case-ignore string
+#define szOID_TITLE                         "2.5.4.12" // case-ignore string
+
+// Explanatory attribute types:
+#define szOID_DESCRIPTION                   "2.5.4.13" // case-ignore string
+#define szOID_SEARCH_GUIDE                  "2.5.4.14"
+#define szOID_BUSINESS_CATEGORY             "2.5.4.15" // case-ignore string
+
+// Postal addressing attribute types:
+#define szOID_POSTAL_ADDRESS                "2.5.4.16"
+#define szOID_POSTAL_CODE                   "2.5.4.17" // case-ignore string
+#define szOID_POST_OFFICE_BOX               "2.5.4.18" // case-ignore string
+#define szOID_PHYSICAL_DELIVERY_OFFICE_NAME "2.5.4.19" // case-ignore string
+
+// Telecommunications addressing attribute types:
+#define szOID_TELEPHONE_NUMBER              "2.5.4.20" // telephone number
+#define szOID_TELEX_NUMBER                  "2.5.4.21"
+#define szOID_TELETEXT_TERMINAL_IDENTIFIER  "2.5.4.22"
+#define szOID_FACSIMILE_TELEPHONE_NUMBER    "2.5.4.23"
+#define szOID_X21_ADDRESS                   "2.5.4.24" // numeric string
+#define szOID_INTERNATIONAL_ISDN_NUMBER     "2.5.4.25" // numeric string
+#define szOID_REGISTERED_ADDRESS            "2.5.4.26"
+#define szOID_DESTINATION_INDICATOR         "2.5.4.27" // printable string
+
+// Preference attribute types:
+#define szOID_PREFERRED_DELIVERY_METHOD     "2.5.4.28"
+
+// OSI application attribute types:
+#define szOID_PRESENTATION_ADDRESS          "2.5.4.29"
+#define szOID_SUPPORTED_APPLICATION_CONTEXT "2.5.4.30"
+
+// Relational application attribute types:
+#define szOID_MEMBER                        "2.5.4.31"
+#define szOID_OWNER                         "2.5.4.32"
+#define szOID_ROLE_OCCUPANT                 "2.5.4.33"
+#define szOID_SEE_ALSO                      "2.5.4.34"
+
+// Security attribute types:
+#define szOID_USER_PASSWORD                 "2.5.4.35"
+#define szOID_USER_CERTIFICATE              "2.5.4.36"
+#define szOID_CA_CERTIFICATE                "2.5.4.37"
+#define szOID_AUTHORITY_REVOCATION_LIST     "2.5.4.38"
+#define szOID_CERTIFICATE_REVOCATION_LIST   "2.5.4.39"
+#define szOID_CROSS_CERTIFICATE_PAIR        "2.5.4.40"
+
+// Undocumented attribute types???
+//#define szOID_???                         "2.5.4.41"
+#define szOID_GIVEN_NAME                    "2.5.4.42" // case-ignore string
+#define szOID_INITIALS                      "2.5.4.43" // case-ignore string
+
+// The DN Qualifier attribute type specifies disambiguating information to add
+// to the relative distinguished name of an entry. It is intended to be used
+// for entries held in multiple DSAs which would otherwise have the same name,
+// and that its value be the same in a given DSA for all entries to which
+// the information has been added.
+#define szOID_DN_QUALIFIER                  "2.5.4.46"
+
+// Pilot user attribute types:
+#define szOID_DOMAIN_COMPONENT  "0.9.2342.19200300.100.1.25" // IA5, UTF8 string
+
+// used for PKCS 12 attributes
+#define szOID_PKCS_12_FRIENDLY_NAME_ATTR     "1.2.840.113549.1.9.20"
+#define szOID_PKCS_12_LOCAL_KEY_ID           "1.2.840.113549.1.9.21"
+#define szOID_PKCS_12_KEY_PROVIDER_NAME_ATTR "1.3.6.1.4.1.311.17.1"
+#define szOID_LOCAL_MACHINE_KEYSET                       "1.3.6.1.4.1.311.17.2"
+
+//+-------------------------------------------------------------------------
+//  Microsoft CERT_RDN attribute Object Identifiers
+//--------------------------------------------------------------------------
+// Special RDN containing the KEY_ID. Its value type is CERT_RDN_OCTET_STRING.
+#define szOID_KEYID_RDN                     "1.3.6.1.4.1.311.10.7.1"
+
+//+-------------------------------------------------------------------------
+//  CERT_RDN Attribute Value Types
+//
+//  For RDN_ENCODED_BLOB, the Value's CERT_RDN_VALUE_BLOB is in its encoded
+//  representation. Otherwise, its an array of bytes.
+//
+//  For all CERT_RDN types, Value.cbData is always the number of bytes, not
+//  necessarily the number of elements in the string. For instance,
+//  RDN_UNIVERSAL_STRING is an array of ints (cbData == intCnt * 4) and
+//  RDN_BMP_STRING is an array of unsigned shorts (cbData == ushortCnt * 2).
+//
+//  A RDN_UTF8_STRING is an array of UNICODE characters (cbData == charCnt *2).
+//  These UNICODE characters are encoded as UTF8 8 bit characters.
+//
+//  For CertDecodeName, two 0 bytes are always appended to the end of the
+//  string (ensures a CHAR or WCHAR string is null terminated).
+//  These added 0 bytes are't included in the BLOB.cbData.
+//--------------------------------------------------------------------------
+#define CERT_RDN_ANY_TYPE                0
+#define CERT_RDN_ENCODED_BLOB            1
+#define CERT_RDN_OCTET_STRING            2
+#define CERT_RDN_NUMERIC_STRING          3
+#define CERT_RDN_PRINTABLE_STRING        4
+#define CERT_RDN_TELETEX_STRING          5
+#define CERT_RDN_T61_STRING              5
+#define CERT_RDN_VIDEOTEX_STRING         6
+#define CERT_RDN_IA5_STRING              7
+#define CERT_RDN_GRAPHIC_STRING          8
+#define CERT_RDN_VISIBLE_STRING          9
+#define CERT_RDN_ISO646_STRING           9
+#define CERT_RDN_GENERAL_STRING          10
+#define CERT_RDN_UNIVERSAL_STRING        11
+#define CERT_RDN_INT4_STRING             11
+#define CERT_RDN_BMP_STRING              12
+#define CERT_RDN_UNICODE_STRING          12
+#define CERT_RDN_UTF8_STRING             13
+
+#define CERT_RDN_TYPE_MASK                  0x000000FF
+#define CERT_RDN_FLAGS_MASK                 0xFF000000
+
+//+-------------------------------------------------------------------------
+//  Flags that can be or'ed with the above Value Type when encoding/decoding
+//--------------------------------------------------------------------------
+// For encoding: when set, CERT_RDN_T61_STRING is selected instead of
+// CERT_RDN_UNICODE_STRING if all the unicode characters are <= 0xFF
+#define CERT_RDN_ENABLE_T61_UNICODE_FLAG    0x80000000
+
+// For encoding: when set, CERT_RDN_UTF8_STRING is selected instead of
+// CERT_RDN_UNICODE_STRING.
+#define CERT_RDN_ENABLE_UTF8_UNICODE_FLAG   0x20000000
+
+// For encoding: when set, the characters aren't checked to see if they
+// are valid for the Value Type.
+#define CERT_RDN_DISABLE_CHECK_TYPE_FLAG    0x40000000
+
+// For decoding: by default, CERT_RDN_T61_STRING values are initially decoded
+// as UTF8. If the UTF8 decoding fails, then, decoded as 8 bit characters.
+// Setting this flag skips the initial attempt to decode as UTF8.
+#define CERT_RDN_DISABLE_IE4_UTF8_FLAG      0x01000000
+
+
+// Macro to check that the dwValueType is a character string and not an
+// encoded blob or octet string
+#define IS_CERT_RDN_CHAR_STRING(X)      \
+                (((X) & CERT_RDN_TYPE_MASK) >= CERT_RDN_NUMERIC_STRING)
+
+
+//+-------------------------------------------------------------------------
+//  A CERT_RDN consists of an array of the above attributes
+//--------------------------------------------------------------------------
+typedef struct _CERT_RDN {
+    DWORD           cRDNAttr;
+    PCERT_RDN_ATTR  rgRDNAttr;
+} CERT_RDN, *PCERT_RDN;
+
+//+-------------------------------------------------------------------------
+//  Information stored in a subject's or issuer's name. The information
+//  is represented as an array of the above RDNs.
+//--------------------------------------------------------------------------
+typedef struct _CERT_NAME_INFO {
+    DWORD       cRDN;
+    PCERT_RDN   rgRDN;
+} CERT_NAME_INFO, *PCERT_NAME_INFO;
+
+//+-------------------------------------------------------------------------
+//  Name attribute value without the Object Identifier
+//
+//  The interpretation of the Value depends on the dwValueType.
+//  See above for a list of the types.
+//--------------------------------------------------------------------------
+typedef struct _CERT_NAME_VALUE {
+    DWORD               dwValueType;
+    CERT_RDN_VALUE_BLOB Value;
+} CERT_NAME_VALUE, *PCERT_NAME_VALUE;
+
+//+-------------------------------------------------------------------------
+//  Public Key Info
+//
+//  The PublicKey is the encoded representation of the information as it is
+//  stored in the bit string
+//--------------------------------------------------------------------------
+typedef struct _CERT_PUBLIC_KEY_INFO {
+    CRYPT_ALGORITHM_IDENTIFIER    Algorithm;
+    CRYPT_BIT_BLOB                PublicKey;
+} CERT_PUBLIC_KEY_INFO, *PCERT_PUBLIC_KEY_INFO;
+
+#define CERT_RSA_PUBLIC_KEY_OBJID            szOID_RSA_RSA
+#define CERT_DEFAULT_OID_PUBLIC_KEY_SIGN     szOID_RSA_RSA
+#define CERT_DEFAULT_OID_PUBLIC_KEY_XCHG     szOID_RSA_RSA
+
+
+//+-------------------------------------------------------------------------
+//  structure that contains all the information in a PKCS#8 PrivateKeyInfo
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_PRIVATE_KEY_INFO{
+    DWORD                       Version;
+    CRYPT_ALGORITHM_IDENTIFIER  Algorithm;
+    CRYPT_DER_BLOB              PrivateKey;
+    PCRYPT_ATTRIBUTES           pAttributes;
+}  CRYPT_PRIVATE_KEY_INFO, *PCRYPT_PRIVATE_KEY_INFO;
+
+//+-------------------------------------------------------------------------
+//  structure that contains all the information in a PKCS#8
+//  EncryptedPrivateKeyInfo
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_ENCRYPTED_PRIVATE_KEY_INFO{
+    CRYPT_ALGORITHM_IDENTIFIER  EncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedPrivateKey;
+} CRYPT_ENCRYPTED_PRIVATE_KEY_INFO, *PCRYPT_ENCRYPTED_PRIVATE_KEY_INFO;
+
+//+-------------------------------------------------------------------------
+// this callback is given when an EncryptedProvateKeyInfo structure is
+// encountered during ImportPKCS8.  the caller is then expected to decrypt
+// the private key and hand back the decrypted contents.
+//
+// the parameters are:
+// Algorithm - the algorithm used to encrypt the PrivateKeyInfo
+// EncryptedPrivateKey - the encrypted private key blob
+// pClearTextKey - a buffer to receive the clear text
+// cbClearTextKey - the number of bytes of the pClearTextKey buffer
+//                  note the if this is zero then this should be
+//                  filled in with the size required to decrypt the
+//                  key into, and pClearTextKey should be ignored
+// pVoidDecryptFunc - this is the pVoid that was passed into the call
+//                    and is preserved and passed back as context
+//+-------------------------------------------------------------------------
+typedef BOOL (CALLBACK *PCRYPT_DECRYPT_PRIVATE_KEY_FUNC)(
+                                                        CRYPT_ALGORITHM_IDENTIFIER  Algorithm,
+                                                        CRYPT_DATA_BLOB             EncryptedPrivateKey,
+                                                        BYTE                        *pbClearTextKey,
+                                                        DWORD                       *pcbClearTextKey,
+                                                        LPVOID                      pVoidDecryptFunc);
+
+//+-------------------------------------------------------------------------
+// this callback is given when creating a PKCS8 EncryptedPrivateKeyInfo.
+// The caller is then expected to encrypt the private key and hand back
+// the encrypted contents.
+//
+// the parameters are:
+// Algorithm - the algorithm used to encrypt the PrivateKeyInfo
+// pClearTextPrivateKey - the cleartext private key to be encrypted
+// pbEncryptedKey - the output encrypted private key blob
+// cbEncryptedKey - the number of bytes of the pbEncryptedKey buffer
+//                  note the if this is zero then this should be
+//                  filled in with the size required to encrypt the
+//                  key into, and pbEncryptedKey should be ignored
+// pVoidEncryptFunc - this is the pVoid that was passed into the call
+//                    and is preserved and passed back as context
+//+-------------------------------------------------------------------------
+typedef BOOL (CALLBACK *PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC)(
+                                                        CRYPT_ALGORITHM_IDENTIFIER* pAlgorithm,
+                                                        CRYPT_DATA_BLOB*            pClearTextPrivateKey,
+                                                        BYTE                        *pbEncryptedKey,
+                                                        DWORD                       *pcbEncryptedKey,
+                                                        LPVOID                      pVoidEncryptFunc);
+
+//+-------------------------------------------------------------------------
+// this callback is given from the context of a ImportPKCS8 calls.  the caller
+// is then expected to hand back an HCRYPTPROV to receive the key being imported
+//
+// the parameters are:
+// pPrivateKeyInfo - pointer to a CRYPT_PRIVATE_KEY_INFO structure which
+//                   describes the key being imported
+// EncryptedPrivateKey - the encrypted private key blob
+// phCryptProv - a pointer to a HCRRYPTPROV to be filled in
+// pVoidResolveFunc - this is the pVoidResolveFunc passed in by the caller in the
+//                    CRYPT_PRIVATE_KEY_BLOB_AND_PARAMS struct
+//+-------------------------------------------------------------------------
+typedef BOOL (CALLBACK *PCRYPT_RESOLVE_HCRYPTPROV_FUNC)(
+                                                       CRYPT_PRIVATE_KEY_INFO      *pPrivateKeyInfo,
+                                                       HCRYPTPROV                  *phCryptProv,
+                                                       LPVOID                      pVoidResolveFunc);
+
+//+-------------------------------------------------------------------------
+// this struct contains a PKCS8 private key and two pointers to callback
+// functions, with a corresponding pVoids.  the first callback is used to give
+// the caller the opportunity to specify where the key is imported to.  the callback
+// passes the caller the algoroithm OID and key size to use in making the decision.
+// the other callback is used to decrypt the private key if the PKCS8 contains an
+// EncryptedPrivateKeyInfo.  both pVoids are preserved and passed back to the caller
+// in the respective callback
+//+-------------------------------------------------------------------------
+typedef struct _CRYPT_PKCS8_IMPORT_PARAMS{
+    CRYPT_DIGEST_BLOB               PrivateKey;             // PKCS8 blob
+    PCRYPT_RESOLVE_HCRYPTPROV_FUNC  pResolvehCryptProvFunc; // optional
+    LPVOID                          pVoidResolveFunc;       // optional
+    PCRYPT_DECRYPT_PRIVATE_KEY_FUNC pDecryptPrivateKeyFunc;
+    LPVOID                          pVoidDecryptFunc;
+} CRYPT_PKCS8_IMPORT_PARAMS, *PCRYPT_PKCS8_IMPORT_PARAMS, CRYPT_PRIVATE_KEY_BLOB_AND_PARAMS, *PCRYPT_PRIVATE_KEY_BLOB_AND_PARAMS;
+
+
+//+-------------------------------------------------------------------------
+// this struct contains information identifying a private key and a pointer
+// to a callback function, with a corresponding pVoid. The callback is used
+// to encrypt the private key. If the pEncryptPrivateKeyFunc is NULL, the
+// key will not be encrypted and an EncryptedPrivateKeyInfo will not be generated.
+// The pVoid is preserved and passed back to the caller in the respective callback
+//+-------------------------------------------------------------------------
+typedef struct _CRYPT_PKCS8_EXPORT_PARAMS{
+    HCRYPTPROV                      hCryptProv;
+    DWORD                           dwKeySpec;
+    LPSTR                           pszPrivateKeyObjId;
+
+    PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC pEncryptPrivateKeyFunc;
+    LPVOID                          pVoidEncryptFunc;
+} CRYPT_PKCS8_EXPORT_PARAMS, *PCRYPT_PKCS8_EXPORT_PARAMS;
+
+//+-------------------------------------------------------------------------
+//  Information stored in a certificate
+//
+//  The Issuer, Subject, Algorithm, PublicKey and Extension BLOBs are the
+//  encoded representation of the information.
+//--------------------------------------------------------------------------
+typedef struct _CERT_INFO {
+    DWORD                       dwVersion;
+    CRYPT_INTEGER_BLOB          SerialNumber;
+    CRYPT_ALGORITHM_IDENTIFIER  SignatureAlgorithm;
+    CERT_NAME_BLOB              Issuer;
+    FILETIME                    NotBefore;
+    FILETIME                    NotAfter;
+    CERT_NAME_BLOB              Subject;
+    CERT_PUBLIC_KEY_INFO        SubjectPublicKeyInfo;
+    CRYPT_BIT_BLOB              IssuerUniqueId;
+    CRYPT_BIT_BLOB              SubjectUniqueId;
+    DWORD                       cExtension;
+    PCERT_EXTENSION             rgExtension;
+} CERT_INFO, *PCERT_INFO;
+
+//+-------------------------------------------------------------------------
+//  Certificate versions
+//--------------------------------------------------------------------------
+#define CERT_V1     0
+#define CERT_V2     1
+#define CERT_V3     2
+
+//+-------------------------------------------------------------------------
+//  Certificate Information Flags
+//--------------------------------------------------------------------------
+#define CERT_INFO_VERSION_FLAG                      1
+#define CERT_INFO_SERIAL_NUMBER_FLAG                2
+#define CERT_INFO_SIGNATURE_ALGORITHM_FLAG          3
+#define CERT_INFO_ISSUER_FLAG                       4
+#define CERT_INFO_NOT_BEFORE_FLAG                   5
+#define CERT_INFO_NOT_AFTER_FLAG                    6
+#define CERT_INFO_SUBJECT_FLAG                      7
+#define CERT_INFO_SUBJECT_PUBLIC_KEY_INFO_FLAG      8
+#define CERT_INFO_ISSUER_UNIQUE_ID_FLAG             9
+#define CERT_INFO_SUBJECT_UNIQUE_ID_FLAG            10
+#define CERT_INFO_EXTENSION_FLAG                    11
+
+//+-------------------------------------------------------------------------
+//  An entry in a CRL
+//
+//  The Extension BLOBs are the encoded representation of the information.
+//--------------------------------------------------------------------------
+typedef struct _CRL_ENTRY {
+    CRYPT_INTEGER_BLOB  SerialNumber;
+    FILETIME            RevocationDate;
+    DWORD               cExtension;
+    PCERT_EXTENSION     rgExtension;
+} CRL_ENTRY, *PCRL_ENTRY;
+
+//+-------------------------------------------------------------------------
+//  Information stored in a CRL
+//
+//  The Issuer, Algorithm and Extension BLOBs are the encoded
+//  representation of the information.
+//--------------------------------------------------------------------------
+typedef struct _CRL_INFO {
+    DWORD                       dwVersion;
+    CRYPT_ALGORITHM_IDENTIFIER  SignatureAlgorithm;
+    CERT_NAME_BLOB              Issuer;
+    FILETIME                    ThisUpdate;
+    FILETIME                    NextUpdate;
+    DWORD                       cCRLEntry;
+    PCRL_ENTRY                  rgCRLEntry;
+    DWORD                       cExtension;
+    PCERT_EXTENSION             rgExtension;
+} CRL_INFO, *PCRL_INFO;
+
+//+-------------------------------------------------------------------------
+//  CRL versions
+//--------------------------------------------------------------------------
+#define CRL_V1     0
+#define CRL_V2     1
+
+
+//+-------------------------------------------------------------------------
+//  Information stored in a certificate request
+//
+//  The Subject, Algorithm, PublicKey and Attribute BLOBs are the encoded
+//  representation of the information.
+//--------------------------------------------------------------------------
+typedef struct _CERT_REQUEST_INFO {
+    DWORD                   dwVersion;
+    CERT_NAME_BLOB          Subject;
+    CERT_PUBLIC_KEY_INFO    SubjectPublicKeyInfo;
+    DWORD                   cAttribute;
+    PCRYPT_ATTRIBUTE        rgAttribute;
+} CERT_REQUEST_INFO, *PCERT_REQUEST_INFO;
+
+//+-------------------------------------------------------------------------
+//  Certificate Request versions
+//--------------------------------------------------------------------------
+#define CERT_REQUEST_V1     0
+
+//+-------------------------------------------------------------------------
+//  Information stored in Netscape's Keygen request
+//--------------------------------------------------------------------------
+typedef struct _CERT_KEYGEN_REQUEST_INFO {
+    DWORD                   dwVersion;
+    CERT_PUBLIC_KEY_INFO    SubjectPublicKeyInfo;
+    LPWSTR                  pwszChallengeString;        // encoded as IA5
+} CERT_KEYGEN_REQUEST_INFO, *PCERT_KEYGEN_REQUEST_INFO;
+
+#define CERT_KEYGEN_REQUEST_V1     0
+
+
+//+-------------------------------------------------------------------------
+//  Certificate, CRL, Certificate Request or Keygen Request Signed Content
+//
+//  The "to be signed" encoded content plus its signature. The ToBeSigned
+//  is the encoded CERT_INFO, CRL_INFO, CERT_REQUEST_INFO or
+//  CERT_KEYGEN_REQUEST_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_SIGNED_CONTENT_INFO {
+    CRYPT_DER_BLOB              ToBeSigned;
+    CRYPT_ALGORITHM_IDENTIFIER  SignatureAlgorithm;
+    CRYPT_BIT_BLOB              Signature;
+} CERT_SIGNED_CONTENT_INFO, *PCERT_SIGNED_CONTENT_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  Certificate Trust List (CTL)
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CTL Usage. Also used for EnhancedKeyUsage extension.
+//--------------------------------------------------------------------------
+typedef struct _CTL_USAGE {
+    DWORD               cUsageIdentifier;
+    LPSTR               *rgpszUsageIdentifier;      // array of pszObjId
+} CTL_USAGE, *PCTL_USAGE,
+CERT_ENHKEY_USAGE, *PCERT_ENHKEY_USAGE;
+
+
+//+-------------------------------------------------------------------------
+//  An entry in a CTL
+//--------------------------------------------------------------------------
+typedef struct _CTL_ENTRY {
+    CRYPT_DATA_BLOB     SubjectIdentifier;          // For example, its hash
+    DWORD               cAttribute;
+    PCRYPT_ATTRIBUTE    rgAttribute;                // OPTIONAL
+} CTL_ENTRY, *PCTL_ENTRY;
+
+//+-------------------------------------------------------------------------
+//  Information stored in a CTL
+//--------------------------------------------------------------------------
+typedef struct _CTL_INFO {
+    DWORD                       dwVersion;
+    CTL_USAGE                   SubjectUsage;
+    CRYPT_DATA_BLOB             ListIdentifier;     // OPTIONAL
+    CRYPT_INTEGER_BLOB          SequenceNumber;     // OPTIONAL
+    FILETIME                    ThisUpdate;
+    FILETIME                    NextUpdate;         // OPTIONAL
+    CRYPT_ALGORITHM_IDENTIFIER  SubjectAlgorithm;
+    DWORD                       cCTLEntry;
+    PCTL_ENTRY                  rgCTLEntry;         // OPTIONAL
+    DWORD                       cExtension;
+    PCERT_EXTENSION             rgExtension;        // OPTIONAL
+} CTL_INFO, *PCTL_INFO;
+
+//+-------------------------------------------------------------------------
+//  CTL versions
+//--------------------------------------------------------------------------
+#define CTL_V1     0
+
+
+//+-------------------------------------------------------------------------
+//  TimeStamp Request
+//
+//  The pszTimeStamp is the OID for the Time type requested
+//  The pszContentType is the Content Type OID for the content, usually DATA
+//  The Content is a un-decoded blob
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_TIME_STAMP_REQUEST_INFO {
+    LPSTR                   pszTimeStampAlgorithm;   // pszObjId
+    LPSTR                   pszContentType;          // pszObjId
+    CRYPT_OBJID_BLOB        Content;
+    DWORD                   cAttribute;
+    PCRYPT_ATTRIBUTE        rgAttribute;
+} CRYPT_TIME_STAMP_REQUEST_INFO, *PCRYPT_TIME_STAMP_REQUEST_INFO;
+
+//+-------------------------------------------------------------------------
+//  Name Value Attribute
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_ENROLLMENT_NAME_VALUE_PAIR {
+    LPWSTR      pwszName;
+    LPWSTR      pwszValue;
+} CRYPT_ENROLLMENT_NAME_VALUE_PAIR, * PCRYPT_ENROLLMENT_NAME_VALUE_PAIR;
+
+//+-------------------------------------------------------------------------
+//  CSP Provider
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_CSP_PROVIDER {
+    DWORD           dwKeySpec;
+    LPWSTR          pwszProviderName;
+    CRYPT_BIT_BLOB  Signature;
+} CRYPT_CSP_PROVIDER, * PCRYPT_CSP_PROVIDER;
+
+//+-------------------------------------------------------------------------
+//  Certificate and Message encoding types
+//
+//  The encoding type is a DWORD containing both the certificate and message
+//  encoding types. The certificate encoding type is stored in the LOWORD.
+//  The message encoding type is stored in the HIWORD. Some functions or
+//  structure fields require only one of the encoding types. The following
+//  naming convention is used to indicate which encoding type(s) are
+//  required:
+//      dwEncodingType              (both encoding types are required)
+//      dwMsgAndCertEncodingType    (both encoding types are required)
+//      dwMsgEncodingType           (only msg encoding type is required)
+//      dwCertEncodingType          (only cert encoding type is required)
+//
+//  Its always acceptable to specify both.
+//--------------------------------------------------------------------------
+#define CERT_ENCODING_TYPE_MASK     0x0000FFFF
+#define CMSG_ENCODING_TYPE_MASK     0xFFFF0000
+#define GET_CERT_ENCODING_TYPE(X)   (X & CERT_ENCODING_TYPE_MASK)
+#define GET_CMSG_ENCODING_TYPE(X)   (X & CMSG_ENCODING_TYPE_MASK)
+
+#define CRYPT_ASN_ENCODING          0x00000001
+#define CRYPT_NDR_ENCODING          0x00000002
+#define X509_ASN_ENCODING           0x00000001
+#define X509_NDR_ENCODING           0x00000002
+#define PKCS_7_ASN_ENCODING         0x00010000
+#define PKCS_7_NDR_ENCODING         0x00020000
+
+
+//+-------------------------------------------------------------------------
+//  format the specified data structure according to the certificate
+//  encoding type.
+//
+//  The default behavior of CryptFormatObject is to return single line
+//  display of the encoded data, that is, each subfield will be concatenated with
+//  a ", " on one line.  If user prefers to display the data in multiple line,
+//  set the flag CRYPT_FORMAT_STR_MULTI_LINE, that is, each subfield will be displayed
+//  on a seperate line.
+//
+//  If there is no formatting routine installed or registered
+//  for the lpszStructType, the hex dump of the encoded BLOB will be returned.
+//  User can set the flag CRYPT_FORMAT_STR_NO_HEX to disable the hex dump.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptFormatObject(
+    IN DWORD dwCertEncodingType,
+    IN DWORD dwFormatType,
+    IN DWORD dwFormatStrType,
+    IN void  *pFormatStruct,
+    IN LPCSTR lpszStructType,
+    IN const BYTE *pbEncoded,
+    IN DWORD cbEncoded,
+    OUT void *pbFormat,
+    IN OUT DWORD *pcbFormat
+    );
+//-------------------------------------------------------------------------
+// constants for dwFormatStrType of function CryptFormatObject
+//-------------------------------------------------------------------------
+#define         CRYPT_FORMAT_STR_MULTI_LINE         0x0001
+#define         CRYPT_FORMAT_STR_NO_HEX             0x0010
+
+//-------------------------------------------------------------------------
+// constants for dwFormatType of function CryptFormatObject
+// when format X509_NAME or X509_UNICODE_NAME
+//-------------------------------------------------------------------------
+// Just get the simple string
+#define         CRYPT_FORMAT_SIMPLE                 0x0001
+
+//Put an attribute name infront of the attribute
+//such as "O=Microsoft,DN=xiaohs"
+#define         CRYPT_FORMAT_X509                   0x0002
+
+//Put an OID infront of the simple string, such as
+//"2.5.4.22=Microsoft,2.5.4.3=xiaohs"
+#define         CRYPT_FORMAT_OID                    0x0004
+
+//Put a ";" between each RDN.  The default is ","
+#define         CRYPT_FORMAT_RDN_SEMICOLON          0x0100
+
+//Put a "\n" between each RDN.
+#define         CRYPT_FORMAT_RDN_CRLF               0x0200
+
+
+//Unquote the DN value, which is quoated by default va the following
+//rules: if the DN contains leading or trailing
+//white space or one of the following characters: ",", "+", "=",
+//""", "\n",  "<", ">", "#" or ";". The quoting character is ".
+//If the DN Value contains a " it is double quoted ("").
+#define         CRYPT_FORMAT_RDN_UNQUOTE            0x0400
+
+//reverse the order of the RDNs before converting to the string
+#define         CRYPT_FORMAT_RDN_REVERSE            0x0800
+
+
+//-------------------------------------------------------------------------
+//  contants dwFormatType of function CryptFormatObject when format a DN.:
+//
+//  The following three values are defined in the section above:
+//  CRYPT_FORMAT_SIMPLE:    Just a simple string
+//                          such as  "Microsoft+xiaohs+NT"
+//  CRYPT_FORMAT_X509       Put an attribute name infront of the attribute
+//                          such as "O=Microsoft+xiaohs+NT"
+//
+//  CRYPT_FORMAT_OID        Put an OID infront of the simple string,
+//                          such as "2.5.4.22=Microsoft+xiaohs+NT"
+//
+//  Additional values are defined as following:
+//----------------------------------------------------------------------------
+//Put a "," between each value.  Default is "+"
+#define         CRYPT_FORMAT_COMMA                  0x1000
+
+//Put a ";" between each value
+#define         CRYPT_FORMAT_SEMICOLON              CRYPT_FORMAT_RDN_SEMICOLON
+
+//Put a "\n" between each value
+#define         CRYPT_FORMAT_CRLF                   CRYPT_FORMAT_RDN_CRLF
+
+//+-------------------------------------------------------------------------
+//  Encode / decode the specified data structure according to the certificate
+//  encoding type.
+//
+//  See below for a list of the predefined data structures.
+//--------------------------------------------------------------------------
+
+typedef LPVOID (WINAPI *PFN_CRYPT_ALLOC)(
+    IN size_t cbSize
+    );
+
+typedef VOID (WINAPI *PFN_CRYPT_FREE)(
+    IN LPVOID pv
+    );
+
+
+typedef struct _CRYPT_ENCODE_PARA {
+    DWORD                   cbSize;
+    PFN_CRYPT_ALLOC         pfnAlloc;           // OPTIONAL
+    PFN_CRYPT_FREE          pfnFree;            // OPTIONAL
+} CRYPT_ENCODE_PARA, *PCRYPT_ENCODE_PARA;
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptEncodeObjectEx(
+    IN DWORD dwCertEncodingType,
+    IN LPCSTR lpszStructType,
+    IN const void *pvStructInfo,
+    IN DWORD dwFlags,
+    IN OPTIONAL PCRYPT_ENCODE_PARA pEncodePara,
+    OUT void *pvEncoded,
+    IN OUT DWORD *pcbEncoded
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptEncodeObject(
+    IN DWORD        dwCertEncodingType,
+    IN LPCSTR       lpszStructType,
+    IN const void   *pvStructInfo,
+    OUT BYTE        *pbEncoded,
+    IN OUT DWORD    *pcbEncoded
+    );
+
+// By default the signature bytes are reversed. The following flag can
+// be set to inhibit the byte reversal.
+//
+// This flag is applicable to
+//      X509_CERT_TO_BE_SIGNED
+#define CRYPT_ENCODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG    0x8
+
+
+//  When the following flag is set the called encode function allocates
+//  memory for the encoded bytes. A pointer to the allocated bytes
+//  is returned in pvEncoded. If pEncodePara or pEncodePara->pfnAlloc is
+//  NULL, then, LocalAlloc is called for the allocation and LocalFree must
+//  be called to do the free. Otherwise, pEncodePara->pfnAlloc is called
+//  for the allocation.
+//
+//  *pcbEncoded is ignored on input and updated with the length of the
+//  allocated, encoded bytes.
+//
+//  If pfnAlloc is set, then, pfnFree should also be set.
+#define CRYPT_ENCODE_ALLOC_FLAG             0x8000
+
+
+//  The following flag is applicable when encoding X509_UNICODE_NAME.
+//  When set, CERT_RDN_T61_STRING is selected instead of
+//  CERT_RDN_UNICODE_STRING if all the unicode characters are <= 0xFF
+#define CRYPT_UNICODE_NAME_ENCODE_ENABLE_T61_UNICODE_FLAG   \
+            CERT_RDN_ENABLE_T61_UNICODE_FLAG
+
+//  The following flag is applicable when encoding X509_UNICODE_NAME.
+//  When set, CERT_RDN_UTF8_STRING is selected instead of
+//  CERT_RDN_UNICODE_STRING.
+#define CRYPT_UNICODE_NAME_ENCODE_ENABLE_UTF8_UNICODE_FLAG   \
+            CERT_RDN_ENABLE_UTF8_UNICODE_FLAG
+
+//  The following flag is applicable when encoding X509_UNICODE_NAME,
+//  X509_UNICODE_NAME_VALUE or X509_UNICODE_ANY_STRING.
+//  When set, the characters aren't checked to see if they
+//  are valid for the specified Value Type.
+#define CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG   \
+            CERT_RDN_DISABLE_CHECK_TYPE_FLAG
+
+//  The following flag is applicable when encoding the PKCS_SORTED_CTL. This
+//  flag should be set if the identifier for the TrustedSubjects is a hash,
+//  such as, MD5 or SHA1.
+#define CRYPT_SORTED_CTL_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG     0x10000
+
+
+typedef struct _CRYPT_DECODE_PARA {
+    DWORD                   cbSize;
+    PFN_CRYPT_ALLOC         pfnAlloc;           // OPTIONAL
+    PFN_CRYPT_FREE          pfnFree;            // OPTIONAL
+} CRYPT_DECODE_PARA, *PCRYPT_DECODE_PARA;
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptDecodeObjectEx(
+    IN DWORD dwCertEncodingType,
+    IN LPCSTR lpszStructType,
+    IN const BYTE *pbEncoded,
+    IN DWORD cbEncoded,
+    IN DWORD dwFlags,
+    IN OPTIONAL PCRYPT_DECODE_PARA pDecodePara,
+    OUT OPTIONAL void *pvStructInfo,
+    IN OUT DWORD *pcbStructInfo
+    );
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptDecodeObject(
+    IN DWORD        dwCertEncodingType,
+    IN LPCSTR       lpszStructType,
+    IN const BYTE   *pbEncoded,
+    IN DWORD        cbEncoded,
+    IN DWORD        dwFlags,
+    OUT void        *pvStructInfo,
+    IN OUT DWORD    *pcbStructInfo
+    );
+
+// When the following flag is set the nocopy optimization is enabled.
+// This optimization where appropriate, updates the pvStructInfo fields
+// to point to content residing within pbEncoded instead of making a copy
+// of and appending to pvStructInfo.
+//
+// Note, when set, pbEncoded can't be freed until pvStructInfo is freed.
+#define CRYPT_DECODE_NOCOPY_FLAG            0x1
+
+// For CryptDecodeObject(), by default the pbEncoded is the "to be signed"
+// plus its signature. Set the following flag, if pbEncoded points to only
+// the "to be signed".
+//
+// This flag is applicable to
+//      X509_CERT_TO_BE_SIGNED
+//      X509_CERT_CRL_TO_BE_SIGNED
+//      X509_CERT_REQUEST_TO_BE_SIGNED
+//      X509_KEYGEN_REQUEST_TO_BE_SIGNED
+#define CRYPT_DECODE_TO_BE_SIGNED_FLAG      0x2
+
+// When the following flag is set, the OID strings are allocated in
+// crypt32.dll and shared instead of being copied into the returned
+// data structure. This flag may be set if crypt32.dll isn't unloaded
+// before the caller is unloaded.
+#define CRYPT_DECODE_SHARE_OID_STRING_FLAG  0x4
+
+// By default the signature bytes are reversed. The following flag can
+// be set to inhibit the byte reversal.
+//
+// This flag is applicable to
+//      X509_CERT_TO_BE_SIGNED
+#define CRYPT_DECODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG    0x8
+
+
+// When the following flag is set the called decode function allocates
+// memory for the decoded structure. A pointer to the allocated structure
+// is returned in pvStructInfo. If pDecodePara or pDecodePara->pfnAlloc is
+// NULL, then, LocalAlloc is called for the allocation and LocalFree must
+// be called to do the free. Otherwise, pDecodePara->pfnAlloc is called
+// for the allocation.
+//
+// *pcbStructInfo is ignored on input and updated with the length of the
+// allocated, decoded structure.
+//
+// This flag may also be set in the CryptDecodeObject API. Since
+// CryptDecodeObject doesn't take a pDecodePara, LocalAlloc is always
+// called for the allocation which must be freed by calling LocalFree.
+#define CRYPT_DECODE_ALLOC_FLAG             0x8000
+
+// The following flag is applicable when decoding X509_UNICODE_NAME,
+// X509_UNICODE_NAME_VALUE or X509_UNICODE_ANY_STRING.
+// By default, CERT_RDN_T61_STRING values are initially decoded
+// as UTF8. If the UTF8 decoding fails, then, decoded as 8 bit characters.
+// Setting this flag skips the initial attempt to decode as UTF8.
+#define CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG     \
+            CERT_RDN_DISABLE_IE4_UTF8_FLAG
+
+
+//+-------------------------------------------------------------------------
+//  Predefined X509 certificate data structures that can be encoded / decoded.
+//--------------------------------------------------------------------------
+#define CRYPT_ENCODE_DECODE_NONE            0
+#define X509_CERT                           ((LPCSTR) 1)
+#define X509_CERT_TO_BE_SIGNED              ((LPCSTR) 2)
+#define X509_CERT_CRL_TO_BE_SIGNED          ((LPCSTR) 3)
+#define X509_CERT_REQUEST_TO_BE_SIGNED      ((LPCSTR) 4)
+#define X509_EXTENSIONS                     ((LPCSTR) 5)
+#define X509_NAME_VALUE                     ((LPCSTR) 6)
+#define X509_NAME                           ((LPCSTR) 7)
+#define X509_PUBLIC_KEY_INFO                ((LPCSTR) 8)
+
+//+-------------------------------------------------------------------------
+//  Predefined X509 certificate extension data structures that can be
+//  encoded / decoded.
+//--------------------------------------------------------------------------
+#define X509_AUTHORITY_KEY_ID               ((LPCSTR) 9)
+#define X509_KEY_ATTRIBUTES                 ((LPCSTR) 10)
+#define X509_KEY_USAGE_RESTRICTION          ((LPCSTR) 11)
+#define X509_ALTERNATE_NAME                 ((LPCSTR) 12)
+#define X509_BASIC_CONSTRAINTS              ((LPCSTR) 13)
+#define X509_KEY_USAGE                      ((LPCSTR) 14)
+#define X509_BASIC_CONSTRAINTS2             ((LPCSTR) 15)
+#define X509_CERT_POLICIES                  ((LPCSTR) 16)
+
+//+-------------------------------------------------------------------------
+//  Additional predefined data structures that can be encoded / decoded.
+//--------------------------------------------------------------------------
+#define PKCS_UTC_TIME                       ((LPCSTR) 17)
+#define PKCS_TIME_REQUEST                   ((LPCSTR) 18)
+#define RSA_CSP_PUBLICKEYBLOB               ((LPCSTR) 19)
+#define X509_UNICODE_NAME                   ((LPCSTR) 20)
+
+#define X509_KEYGEN_REQUEST_TO_BE_SIGNED    ((LPCSTR) 21)
+#define PKCS_ATTRIBUTE                      ((LPCSTR) 22)
+#define PKCS_CONTENT_INFO_SEQUENCE_OF_ANY   ((LPCSTR) 23)
+
+//+-------------------------------------------------------------------------
+//  Predefined primitive data structures that can be encoded / decoded.
+//--------------------------------------------------------------------------
+#define X509_UNICODE_NAME_VALUE             ((LPCSTR) 24)
+#define X509_ANY_STRING                     X509_NAME_VALUE
+#define X509_UNICODE_ANY_STRING             X509_UNICODE_NAME_VALUE
+#define X509_OCTET_STRING                   ((LPCSTR) 25)
+#define X509_BITS                           ((LPCSTR) 26)
+#define X509_INTEGER                        ((LPCSTR) 27)
+#define X509_MULTI_BYTE_INTEGER             ((LPCSTR) 28)
+#define X509_ENUMERATED                     ((LPCSTR) 29)
+#define X509_CHOICE_OF_TIME                 ((LPCSTR) 30)
+
+//+-------------------------------------------------------------------------
+//  More predefined X509 certificate extension data structures that can be
+//  encoded / decoded.
+//--------------------------------------------------------------------------
+#define X509_AUTHORITY_KEY_ID2              ((LPCSTR) 31)
+#define X509_AUTHORITY_INFO_ACCESS          ((LPCSTR) 32)
+#define X509_CRL_REASON_CODE                X509_ENUMERATED
+#define PKCS_CONTENT_INFO                   ((LPCSTR) 33)
+#define X509_SEQUENCE_OF_ANY                ((LPCSTR) 34)
+#define X509_CRL_DIST_POINTS                ((LPCSTR) 35)
+#define X509_ENHANCED_KEY_USAGE             ((LPCSTR) 36)
+#define PKCS_CTL                            ((LPCSTR) 37)
+
+#define X509_MULTI_BYTE_UINT                ((LPCSTR) 38)
+#define X509_DSS_PUBLICKEY                  X509_MULTI_BYTE_UINT
+#define X509_DSS_PARAMETERS                 ((LPCSTR) 39)
+#define X509_DSS_SIGNATURE                  ((LPCSTR) 40)
+#define PKCS_RC2_CBC_PARAMETERS             ((LPCSTR) 41)
+#define PKCS_SMIME_CAPABILITIES             ((LPCSTR) 42)
+
+//+-------------------------------------------------------------------------
+//  data structures for private keys
+//--------------------------------------------------------------------------
+#define PKCS_RSA_PRIVATE_KEY                ((LPCSTR) 43)
+#define PKCS_PRIVATE_KEY_INFO               ((LPCSTR) 44)
+#define PKCS_ENCRYPTED_PRIVATE_KEY_INFO     ((LPCSTR) 45)
+
+//+-------------------------------------------------------------------------
+//  certificate policy qualifier
+//--------------------------------------------------------------------------
+#define X509_PKIX_POLICY_QUALIFIER_USERNOTICE ((LPCSTR) 46)
+
+//+-------------------------------------------------------------------------
+//  Diffie-Hellman Key Exchange
+//--------------------------------------------------------------------------
+#define X509_DH_PUBLICKEY                   X509_MULTI_BYTE_UINT
+#define X509_DH_PARAMETERS                  ((LPCSTR) 47)
+#define PKCS_ATTRIBUTES                     ((LPCSTR) 48)
+#define PKCS_SORTED_CTL                     ((LPCSTR) 49)
+
+//+-------------------------------------------------------------------------
+//  X942 Diffie-Hellman
+//--------------------------------------------------------------------------
+#define X942_DH_PARAMETERS                  ((LPCSTR) 50)
+
+//+-------------------------------------------------------------------------
+//  The following is the same as X509_BITS, except before encoding,
+//  the bit length is decremented to exclude trailing zero bits.
+//--------------------------------------------------------------------------
+#define X509_BITS_WITHOUT_TRAILING_ZEROES   ((LPCSTR) 51)
+
+//+-------------------------------------------------------------------------
+//  X942 Diffie-Hellman Other Info
+//--------------------------------------------------------------------------
+#define X942_OTHER_INFO                     ((LPCSTR) 52)
+
+#define X509_CERT_PAIR                      ((LPCSTR) 53)
+#define X509_ISSUING_DIST_POINT             ((LPCSTR) 54)
+#define X509_NAME_CONSTRAINTS               ((LPCSTR) 55)
+#define X509_POLICY_MAPPINGS                ((LPCSTR) 56)
+#define X509_POLICY_CONSTRAINTS             ((LPCSTR) 57)
+#define X509_CROSS_CERT_DIST_POINTS         ((LPCSTR) 58)
+
+//+-------------------------------------------------------------------------
+//  Certificate Management Messages over CMS (CMC) Data Structures
+//--------------------------------------------------------------------------
+#define CMC_DATA                            ((LPCSTR) 59)
+#define CMC_RESPONSE                        ((LPCSTR) 60)
+#define CMC_STATUS                          ((LPCSTR) 61)
+#define CMC_ADD_EXTENSIONS                  ((LPCSTR) 62)
+#define CMC_ADD_ATTRIBUTES                  ((LPCSTR) 63)
+
+//+-------------------------------------------------------------------------
+//  Certificate Template
+//--------------------------------------------------------------------------
+#define X509_CERTIFICATE_TEMPLATE           ((LPCSTR) 64)
+
+//+-------------------------------------------------------------------------
+//  Predefined PKCS #7 data structures that can be encoded / decoded.
+//--------------------------------------------------------------------------
+#define PKCS7_SIGNER_INFO                   ((LPCSTR) 500)
+
+//+-------------------------------------------------------------------------
+//  Predefined PKCS #7 data structures that can be encoded / decoded.
+//--------------------------------------------------------------------------
+#define CMS_SIGNER_INFO                     ((LPCSTR) 501)
+
+//+-------------------------------------------------------------------------
+//  Predefined Software Publishing Credential (SPC)  data structures that
+//  can be encoded / decoded.
+//
+//  Predefined values: 2000 .. 2999
+//
+//  See spc.h for value and data structure definitions.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Extension Object Identifiers
+//--------------------------------------------------------------------------
+#define szOID_AUTHORITY_KEY_IDENTIFIER  "2.5.29.1"
+#define szOID_KEY_ATTRIBUTES            "2.5.29.2"
+#define szOID_CERT_POLICIES_95          "2.5.29.3"
+#define szOID_KEY_USAGE_RESTRICTION     "2.5.29.4"
+#define szOID_SUBJECT_ALT_NAME          "2.5.29.7"
+#define szOID_ISSUER_ALT_NAME           "2.5.29.8"
+#define szOID_BASIC_CONSTRAINTS         "2.5.29.10"
+#define szOID_KEY_USAGE                 "2.5.29.15"
+#define szOID_PRIVATEKEY_USAGE_PERIOD   "2.5.29.16"
+#define szOID_BASIC_CONSTRAINTS2        "2.5.29.19"
+
+#define szOID_CERT_POLICIES             "2.5.29.32"
+#define szOID_ANY_CERT_POLICY           "2.5.29.32.0"
+
+#define szOID_AUTHORITY_KEY_IDENTIFIER2 "2.5.29.35"
+#define szOID_SUBJECT_KEY_IDENTIFIER    "2.5.29.14"
+#define szOID_SUBJECT_ALT_NAME2         "2.5.29.17"
+#define szOID_ISSUER_ALT_NAME2          "2.5.29.18"
+#define szOID_CRL_REASON_CODE           "2.5.29.21"
+#define szOID_REASON_CODE_HOLD          "2.5.29.23"
+#define szOID_CRL_DIST_POINTS           "2.5.29.31"
+#define szOID_ENHANCED_KEY_USAGE        "2.5.29.37"
+
+// szOID_CRL_NUMBER -- Base CRLs only.  Monotonically increasing sequence
+// number for each CRL issued by a CA.
+#define szOID_CRL_NUMBER                "2.5.29.20"
+// szOID_DELTA_CRL_INDICATOR -- Delta CRLs only.  Marked critical.
+// Contains the minimum base CRL Number that can be used with a delta CRL.
+#define szOID_DELTA_CRL_INDICATOR       "2.5.29.27"
+#define szOID_ISSUING_DIST_POINT        "2.5.29.28"
+// szOID_FRESHEST_CRL -- Base CRLs only.  Formatted identically to a CDP
+// extension that holds URLs to fetch the delta CRL.
+#define szOID_FRESHEST_CRL              "2.5.29.46"
+#define szOID_NAME_CONSTRAINTS          "2.5.29.30"
+
+// Note on 1/1/2000 szOID_POLICY_MAPPINGS was changed from "2.5.29.5"
+#define szOID_POLICY_MAPPINGS           "2.5.29.33"
+#define szOID_LEGACY_POLICY_MAPPINGS    "2.5.29.5"
+#define szOID_POLICY_CONSTRAINTS        "2.5.29.36"
+
+
+// Microsoft PKCS10 Attributes
+#define szOID_RENEWAL_CERTIFICATE           "1.3.6.1.4.1.311.13.1"
+#define szOID_ENROLLMENT_NAME_VALUE_PAIR    "1.3.6.1.4.1.311.13.2.1"
+#define szOID_ENROLLMENT_CSP_PROVIDER       "1.3.6.1.4.1.311.13.2.2"
+#define szOID_OS_VERSION                    "1.3.6.1.4.1.311.13.2.3"
+
+//
+// Extension contain certificate type
+#define szOID_ENROLLMENT_AGENT              "1.3.6.1.4.1.311.20.2.1"
+
+// Internet Public Key Infrastructure (PKIX)
+#define szOID_PKIX                      "1.3.6.1.5.5.7"
+#define szOID_PKIX_PE                   "1.3.6.1.5.5.7.1"
+#define szOID_AUTHORITY_INFO_ACCESS     "1.3.6.1.5.5.7.1.1"
+
+// Microsoft extensions or attributes
+#define szOID_CERT_EXTENSIONS           "1.3.6.1.4.1.311.2.1.14"
+#define szOID_NEXT_UPDATE_LOCATION      "1.3.6.1.4.1.311.10.2"
+#define szOID_REMOVE_CERTIFICATE            "1.3.6.1.4.1.311.10.8.1"
+#define szOID_CROSS_CERT_DIST_POINTS    "1.3.6.1.4.1.311.10.9.1"
+
+//  Microsoft PKCS #7 ContentType Object Identifiers
+#define szOID_CTL                       "1.3.6.1.4.1.311.10.1"
+
+//  Microsoft Sorted CTL Extension Object Identifier
+#define szOID_SORTED_CTL                "1.3.6.1.4.1.311.10.1.1"
+
+// serialized serial numbers for PRS
+#ifndef szOID_SERIALIZED
+#define szOID_SERIALIZED                "1.3.6.1.4.1.311.10.3.3.1"
+#endif
+
+// UPN principal name in SubjectAltName
+#ifndef szOID_NT_PRINCIPAL_NAME
+#define szOID_NT_PRINCIPAL_NAME         "1.3.6.1.4.1.311.20.2.3"
+#endif
+
+// Windows product update unauthenticated attribute
+#ifndef szOID_PRODUCT_UPDATE
+#define szOID_PRODUCT_UPDATE            "1.3.6.1.4.1.311.31.1"
+#endif
+
+// CryptUI
+#define szOID_ANY_APPLICATION_POLICY    "1.3.6.1.4.1.311.10.12.1"
+
+//+-------------------------------------------------------------------------
+//  Object Identifiers for use with Auto Enrollment
+//--------------------------------------------------------------------------
+#define szOID_AUTO_ENROLL_CTL_USAGE     "1.3.6.1.4.1.311.20.1"
+
+// Extension contain certificate type
+#define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2"
+
+
+#define szOID_CERT_MANIFOLD             "1.3.6.1.4.1.311.20.3"
+
+//+-------------------------------------------------------------------------
+//  Object Identifiers for use with the MS Certificate Server
+//--------------------------------------------------------------------------
+#ifndef szOID_CERTSRV_CA_VERSION
+#define szOID_CERTSRV_CA_VERSION        "1.3.6.1.4.1.311.21.1"
+#endif
+
+
+// szOID_CERTSRV_PREVIOUS_CERT_HASH -- Contains the sha1 hash of the previous
+// version of the CA certificate.
+#define szOID_CERTSRV_PREVIOUS_CERT_HASH    "1.3.6.1.4.1.311.21.2"
+
+// szOID_CRL_VIRTUAL_BASE -- Delta CRLs only.  Contains the base CRL Number
+// of the corresponding base CRL.
+#define szOID_CRL_VIRTUAL_BASE          "1.3.6.1.4.1.311.21.3"
+
+// szOID_CRL_NEXT_PUBLISH -- Contains the time when the next CRL is expected
+// to be published.  This may be sooner than the CRL's NextUpdate field.
+#define szOID_CRL_NEXT_PUBLISH          "1.3.6.1.4.1.311.21.4"
+
+// Enhanced Key Usage for CA encryption certificate
+#define szOID_KP_CA_EXCHANGE            "1.3.6.1.4.1.311.21.5"
+
+// Enhanced Key Usage for key recovery agent certificate
+#define szOID_KP_KEY_RECOVERY_AGENT     "1.3.6.1.4.1.311.21.6"
+
+// Certificate template extension (v2)
+#define szOID_CERTIFICATE_TEMPLATE      "1.3.6.1.4.1.311.21.7"
+
+// The root oid for all enterprise specific oids
+#define szOID_ENTERPRISE_OID_ROOT       "1.3.6.1.4.1.311.21.8"
+
+// Dummy signing Subject RDN
+#define szOID_RDN_DUMMY_SIGNER          "1.3.6.1.4.1.311.21.9"
+
+// Application Policies extension -- same encoding as szOID_CERT_POLICIES
+#define szOID_APPLICATION_CERT_POLICIES     "1.3.6.1.4.1.311.21.10"
+
+// Application Policy Mappings -- same encoding as szOID_POLICY_MAPPINGS
+#define szOID_APPLICATION_POLICY_MAPPINGS   "1.3.6.1.4.1.311.21.11"
+
+// Application Policy Constraints -- same encoding as szOID_POLICY_CONSTRAINTS
+#define szOID_APPLICATION_POLICY_CONSTRAINTS    "1.3.6.1.4.1.311.21.12"
+
+#define szOID_ARCHIVED_KEY_ATTR                "1.3.6.1.4.1.311.21.13"
+#define szOID_CRL_SELF_CDP                     "1.3.6.1.4.1.311.21.14"
+
+
+// Requires all certificates below the root to have a non-empty intersecting
+// issuance certificate policy usage.
+#define szOID_REQUIRE_CERT_CHAIN_POLICY        "1.3.6.1.4.1.311.21.15"
+#define szOID_ARCHIVED_KEY_CERT_HASH           "1.3.6.1.4.1.311.21.16"
+#define szOID_ISSUED_CERT_HASH                 "1.3.6.1.4.1.311.21.17"
+
+// Enhanced key usage for DS email replication
+#define szOID_DS_EMAIL_REPLICATION             "1.3.6.1.4.1.311.21.19"
+
+#define szOID_REQUEST_CLIENT_INFO              "1.3.6.1.4.1.311.21.20"
+#define szOID_ENCRYPTED_KEY_HASH               "1.3.6.1.4.1.311.21.21"
+#define szOID_CERTSRV_CROSSCA_VERSION          "1.3.6.1.4.1.311.21.22"
+
+//+-------------------------------------------------------------------------
+//  Object Identifiers for use with the MS Directory Service
+//--------------------------------------------------------------------------
+#define szOID_NTDS_REPLICATION      "1.3.6.1.4.1.311.25.1"
+
+
+//+-------------------------------------------------------------------------
+//  Extension Object Identifiers (currently not implemented)
+//--------------------------------------------------------------------------
+#define szOID_SUBJECT_DIR_ATTRS         "2.5.29.9"
+
+//+-------------------------------------------------------------------------
+//  Enhanced Key Usage (Purpose) Object Identifiers
+//--------------------------------------------------------------------------
+#define szOID_PKIX_KP                   "1.3.6.1.5.5.7.3"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE, KEY_ENCIPHERMENT
+// or KEY_AGREEMENT
+#define szOID_PKIX_KP_SERVER_AUTH       "1.3.6.1.5.5.7.3.1"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE
+#define szOID_PKIX_KP_CLIENT_AUTH       "1.3.6.1.5.5.7.3.2"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE
+#define szOID_PKIX_KP_CODE_SIGNING      "1.3.6.1.5.5.7.3.3"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE, NON_REPUDIATION and/or
+// (KEY_ENCIPHERMENT or KEY_AGREEMENT)
+#define szOID_PKIX_KP_EMAIL_PROTECTION  "1.3.6.1.5.5.7.3.4"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE and/or
+// (KEY_ENCIPHERMENT or KEY_AGREEMENT)
+#define szOID_PKIX_KP_IPSEC_END_SYSTEM  "1.3.6.1.5.5.7.3.5"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE and/or
+// (KEY_ENCIPHERMENT or KEY_AGREEMENT)
+#define szOID_PKIX_KP_IPSEC_TUNNEL      "1.3.6.1.5.5.7.3.6"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE and/or
+// (KEY_ENCIPHERMENT or KEY_AGREEMENT)
+#define szOID_PKIX_KP_IPSEC_USER        "1.3.6.1.5.5.7.3.7"
+
+// Consistent key usage bits: DIGITAL_SIGNATURE or NON_REPUDIATION
+#define szOID_PKIX_KP_TIMESTAMP_SIGNING "1.3.6.1.5.5.7.3.8"
+
+
+// IKE (Internet Key Exchange) Intermediate KP for an IPsec end entity.
+// Defined in draft-ietf-ipsec-pki-req-04.txt, December 14, 1999.
+#define szOID_IPSEC_KP_IKE_INTERMEDIATE "1.3.6.1.5.5.8.2.2"
+
+//+-------------------------------------------------------------------------
+//  Microsoft Enhanced Key Usage (Purpose) Object Identifiers
+//+-------------------------------------------------------------------------
+
+//  Signer of CTLs
+#define szOID_KP_CTL_USAGE_SIGNING      "1.3.6.1.4.1.311.10.3.1"
+
+//  Signer of TimeStamps
+#define szOID_KP_TIME_STAMP_SIGNING     "1.3.6.1.4.1.311.10.3.2"
+
+#ifndef szOID_SERVER_GATED_CRYPTO
+#define szOID_SERVER_GATED_CRYPTO       "1.3.6.1.4.1.311.10.3.3"
+#endif
+
+#ifndef szOID_SGC_NETSCAPE
+#define szOID_SGC_NETSCAPE              "2.16.840.1.113730.4.1"
+#endif
+
+#define szOID_KP_EFS                    "1.3.6.1.4.1.311.10.3.4"
+#define szOID_EFS_RECOVERY              "1.3.6.1.4.1.311.10.3.4.1"
+
+// Can use Windows Hardware Compatible (WHQL)
+#define szOID_WHQL_CRYPTO               "1.3.6.1.4.1.311.10.3.5"
+
+// Signed by the NT5 build lab
+#define szOID_NT5_CRYPTO                "1.3.6.1.4.1.311.10.3.6"
+
+// Signed by and OEM of WHQL
+#define szOID_OEM_WHQL_CRYPTO           "1.3.6.1.4.1.311.10.3.7"
+
+// Signed by the Embedded NT
+#define szOID_EMBEDDED_NT_CRYPTO        "1.3.6.1.4.1.311.10.3.8"
+
+// Signer of a CTL containing trusted roots
+#define szOID_ROOT_LIST_SIGNER      "1.3.6.1.4.1.311.10.3.9"
+
+// Can sign cross-cert and subordinate CA requests with qualified
+// subordination (name constraints, policy mapping, etc.)
+#define szOID_KP_QUALIFIED_SUBORDINATION    "1.3.6.1.4.1.311.10.3.10"
+
+// Can be used to encrypt/recover escrowed keys
+#define szOID_KP_KEY_RECOVERY               "1.3.6.1.4.1.311.10.3.11"
+
+// Signer of documents
+#define szOID_KP_DOCUMENT_SIGNING           "1.3.6.1.4.1.311.10.3.12"
+
+// The default WinVerifyTrust Authenticode policy is to treat all time stamped
+// signatures as being valid forever. This OID limits the valid lifetime of the
+// signature to the lifetime of the certificate. This allows timestamped
+// signatures to expire. Normally this OID will be used in conjunction with
+// szOID_PKIX_KP_CODE_SIGNING to indicate new time stamp semantics should be
+// used. Support for this OID was added in WXP.
+#define szOID_KP_LIFETIME_SIGNING           "1.3.6.1.4.1.311.10.3.13"
+
+#define szOID_KP_MOBILE_DEVICE_SOFTWARE     "1.3.6.1.4.1.311.10.3.14"
+
+#ifndef szOID_DRM
+#define szOID_DRM                       "1.3.6.1.4.1.311.10.5.1"
+#endif
+
+
+// Microsoft DRM EKU
+#ifndef szOID_DRM_INDIVIDUALIZATION
+#define szOID_DRM_INDIVIDUALIZATION "1.3.6.1.4.1.311.10.5.2"
+#endif
+
+
+#ifndef szOID_LICENSES
+#define szOID_LICENSES                  "1.3.6.1.4.1.311.10.6.1"
+#endif
+
+#ifndef szOID_LICENSE_SERVER
+#define szOID_LICENSE_SERVER            "1.3.6.1.4.1.311.10.6.2"
+#endif
+
+#ifndef szOID_KP_SMARTCARD_LOGON
+#define szOID_KP_SMARTCARD_LOGON        "1.3.6.1.4.1.311.20.2.2"
+#endif
+
+//+-------------------------------------------------------------------------
+//  Microsoft Attribute Object Identifiers
+//+-------------------------------------------------------------------------
+#define szOID_YESNO_TRUST_ATTR          "1.3.6.1.4.1.311.10.4.1"
+
+//+-------------------------------------------------------------------------
+//  Qualifiers that may be part of the szOID_CERT_POLICIES and
+//  szOID_CERT_POLICIES95 extensions
+//+-------------------------------------------------------------------------
+#define szOID_PKIX_POLICY_QUALIFIER_CPS               "1.3.6.1.5.5.7.2.1"
+#define szOID_PKIX_POLICY_QUALIFIER_USERNOTICE        "1.3.6.1.5.5.7.2.2"
+
+// OID for old qualifer
+#define szOID_CERT_POLICIES_95_QUALIFIER1             "2.16.840.1.113733.1.7.1.1"
+
+//+-------------------------------------------------------------------------
+//  X509_CERT
+//
+//  The "to be signed" encoded content plus its signature. The ToBeSigned
+//  content is the CryptEncodeObject() output for one of the following:
+//  X509_CERT_TO_BE_SIGNED, X509_CERT_CRL_TO_BE_SIGNED or
+//  X509_CERT_REQUEST_TO_BE_SIGNED.
+//
+//  pvStructInfo points to CERT_SIGNED_CONTENT_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_CERT_TO_BE_SIGNED
+//
+//  pvStructInfo points to CERT_INFO.
+//
+//  For CryptDecodeObject(), the pbEncoded is the "to be signed" plus its
+//  signature (output of a X509_CERT CryptEncodeObject()).
+//
+//  For CryptEncodeObject(), the pbEncoded is just the "to be signed".
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_CERT_CRL_TO_BE_SIGNED
+//
+//  pvStructInfo points to CRL_INFO.
+//
+//  For CryptDecodeObject(), the pbEncoded is the "to be signed" plus its
+//  signature (output of a X509_CERT CryptEncodeObject()).
+//
+//  For CryptEncodeObject(), the pbEncoded is just the "to be signed".
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_CERT_REQUEST_TO_BE_SIGNED
+//
+//  pvStructInfo points to CERT_REQUEST_INFO.
+//
+//  For CryptDecodeObject(), the pbEncoded is the "to be signed" plus its
+//  signature (output of a X509_CERT CryptEncodeObject()).
+//
+//  For CryptEncodeObject(), the pbEncoded is just the "to be signed".
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_EXTENSIONS
+//  szOID_CERT_EXTENSIONS
+//
+//  pvStructInfo points to following CERT_EXTENSIONS.
+//--------------------------------------------------------------------------
+typedef struct _CERT_EXTENSIONS {
+    DWORD           cExtension;
+    PCERT_EXTENSION rgExtension;
+} CERT_EXTENSIONS, *PCERT_EXTENSIONS;
+
+//+-------------------------------------------------------------------------
+//  X509_NAME_VALUE
+//  X509_ANY_STRING
+//
+//  pvStructInfo points to CERT_NAME_VALUE.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_UNICODE_NAME_VALUE
+//  X509_UNICODE_ANY_STRING
+//
+//  pvStructInfo points to CERT_NAME_VALUE.
+//
+//  The name values are unicode strings.
+//
+//  For CryptEncodeObject:
+//    Value.pbData points to the unicode string.
+//    If Value.cbData = 0, then, the unicode string is NULL terminated.
+//    Otherwise, Value.cbData is the unicode string byte count. The byte count
+//    is twice the character count.
+//
+//    If the unicode string contains an invalid character for the specified
+//    dwValueType, then, *pcbEncoded is updated with the unicode character
+//    index of the first invalid character. LastError is set to:
+//    CRYPT_E_INVALID_NUMERIC_STRING, CRYPT_E_INVALID_PRINTABLE_STRING or
+//    CRYPT_E_INVALID_IA5_STRING.
+//
+//    To disable the above check, either set CERT_RDN_DISABLE_CHECK_TYPE_FLAG
+//    in dwValueType or set CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG
+//    in dwFlags passed to CryptEncodeObjectEx.
+//
+//    The unicode string is converted before being encoded according to
+//    the specified dwValueType. If dwValueType is set to 0, LastError
+//    is set to E_INVALIDARG.
+//
+//    If the dwValueType isn't one of the character strings (its a
+//    CERT_RDN_ENCODED_BLOB or CERT_RDN_OCTET_STRING), then, CryptEncodeObject
+//    will return FALSE with LastError set to CRYPT_E_NOT_CHAR_STRING.
+//
+//  For CryptDecodeObject:
+//    Value.pbData points to a NULL terminated unicode string. Value.cbData
+//    contains the byte count of the unicode string excluding the NULL
+//    terminator. dwValueType contains the type used in the encoded object.
+//    Its not forced to CERT_RDN_UNICODE_STRING. The encoded value is
+//    converted to the unicode string according to the dwValueType.
+//
+//    If the encoded object isn't one of the character string types, then,
+//    CryptDecodeObject will return FALSE with LastError set to
+//    CRYPT_E_NOT_CHAR_STRING. For a non character string, decode using
+//    X509_NAME_VALUE or X509_ANY_STRING.
+//
+//    By default, CERT_RDN_T61_STRING values are initially decoded
+//    as UTF8. If the UTF8 decoding fails, then, decoded as 8 bit characters.
+//    Set CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG in dwFlags
+//    passed to either CryptDecodeObject or CryptDecodeObjectEx to
+//    skip the initial attempt to decode as UTF8.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_NAME
+//
+//  pvStructInfo points to CERT_NAME_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_UNICODE_NAME
+//
+//  pvStructInfo points to CERT_NAME_INFO.
+//
+//  The RDN attribute values are unicode strings except for the dwValueTypes of
+//  CERT_RDN_ENCODED_BLOB or CERT_RDN_OCTET_STRING. These dwValueTypes are
+//  the same as for a X509_NAME. Their values aren't converted to/from unicode.
+//
+//  For CryptEncodeObject:
+//    Value.pbData points to the unicode string.
+//    If Value.cbData = 0, then, the unicode string is NULL terminated.
+//    Otherwise, Value.cbData is the unicode string byte count. The byte count
+//    is twice the character count.
+//
+//    If dwValueType = 0 (CERT_RDN_ANY_TYPE), the pszObjId is used to find
+//    an acceptable dwValueType. If the unicode string contains an
+//    invalid character for the found or specified dwValueType, then,
+//    *pcbEncoded is updated with the error location of the invalid character.
+//    See below for details. LastError is set to:
+//    CRYPT_E_INVALID_NUMERIC_STRING, CRYPT_E_INVALID_PRINTABLE_STRING or
+//    CRYPT_E_INVALID_IA5_STRING.
+//
+//    To disable the above check, either set CERT_RDN_DISABLE_CHECK_TYPE_FLAG
+//    in dwValueType or set CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG
+//    in dwFlags passed to CryptEncodeObjectEx.
+//
+//    Set CERT_RDN_UNICODE_STRING in dwValueType or set
+//    CRYPT_UNICODE_NAME_ENCODE_ENABLE_T61_UNICODE_FLAG in dwFlags passed
+//    to CryptEncodeObjectEx to select CERT_RDN_T61_STRING instead of
+//    CERT_RDN_UNICODE_STRING if all the unicode characters are <= 0xFF.
+//
+//    Set CERT_RDN_ENABLE_UTF8_UNICODE_STRING in dwValueType or set
+//    CRYPT_UNICODE_NAME_ENCODE_ENABLE_UTF8_UNICODE_FLAG in dwFlags passed
+//    to CryptEncodeObjectEx to select CERT_RDN_UTF8_STRING instead of
+//    CERT_RDN_UNICODE_STRING.
+//
+//    The unicode string is converted before being encoded according to
+//    the specified or ObjId matching dwValueType.
+//
+//  For CryptDecodeObject:
+//    Value.pbData points to a NULL terminated unicode string. Value.cbData
+//    contains the byte count of the unicode string excluding the NULL
+//    terminator. dwValueType contains the type used in the encoded object.
+//    Its not forced to CERT_RDN_UNICODE_STRING. The encoded value is
+//    converted to the unicode string according to the dwValueType.
+//
+//    If the dwValueType of the encoded value isn't a character string
+//    type, then, it isn't converted to UNICODE. Use the
+//    IS_CERT_RDN_CHAR_STRING() macro on the dwValueType to check
+//    that Value.pbData points to a converted unicode string.
+//
+//    By default, CERT_RDN_T61_STRING values are initially decoded
+//    as UTF8. If the UTF8 decoding fails, then, decoded as 8 bit characters.
+//    Set CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG in dwFlags
+//    passed to either CryptDecodeObject or CryptDecodeObjectEx to
+//    skip the initial attempt to decode as UTF8.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Unicode Name Value Error Location Definitions
+//
+//  Error location is returned in *pcbEncoded by
+//  CryptEncodeObject(X509_UNICODE_NAME)
+//
+//  Error location consists of:
+//    RDN_INDEX     - 10 bits << 22
+//    ATTR_INDEX    - 6 bits << 16
+//    VALUE_INDEX   - 16 bits (unicode character index)
+//--------------------------------------------------------------------------
+#define CERT_UNICODE_RDN_ERR_INDEX_MASK     0x3FF
+#define CERT_UNICODE_RDN_ERR_INDEX_SHIFT    22
+#define CERT_UNICODE_ATTR_ERR_INDEX_MASK    0x003F
+#define CERT_UNICODE_ATTR_ERR_INDEX_SHIFT   16
+#define CERT_UNICODE_VALUE_ERR_INDEX_MASK   0x0000FFFF
+#define CERT_UNICODE_VALUE_ERR_INDEX_SHIFT  0
+
+#define GET_CERT_UNICODE_RDN_ERR_INDEX(X)   \
+    ((X >> CERT_UNICODE_RDN_ERR_INDEX_SHIFT) & CERT_UNICODE_RDN_ERR_INDEX_MASK)
+#define GET_CERT_UNICODE_ATTR_ERR_INDEX(X)  \
+    ((X >> CERT_UNICODE_ATTR_ERR_INDEX_SHIFT) & CERT_UNICODE_ATTR_ERR_INDEX_MASK)
+#define GET_CERT_UNICODE_VALUE_ERR_INDEX(X) \
+    (X & CERT_UNICODE_VALUE_ERR_INDEX_MASK)
+
+//+-------------------------------------------------------------------------
+//  X509_PUBLIC_KEY_INFO
+//
+//  pvStructInfo points to CERT_PUBLIC_KEY_INFO.
+//--------------------------------------------------------------------------
+
+
+//+-------------------------------------------------------------------------
+//  X509_AUTHORITY_KEY_ID
+//  szOID_AUTHORITY_KEY_IDENTIFIER
+//
+//  pvStructInfo points to following CERT_AUTHORITY_KEY_ID_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_AUTHORITY_KEY_ID_INFO {
+    CRYPT_DATA_BLOB     KeyId;
+    CERT_NAME_BLOB      CertIssuer;
+    CRYPT_INTEGER_BLOB  CertSerialNumber;
+} CERT_AUTHORITY_KEY_ID_INFO, *PCERT_AUTHORITY_KEY_ID_INFO;
+
+//+-------------------------------------------------------------------------
+//  X509_KEY_ATTRIBUTES
+//  szOID_KEY_ATTRIBUTES
+//
+//  pvStructInfo points to following CERT_KEY_ATTRIBUTES_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_PRIVATE_KEY_VALIDITY {
+    FILETIME            NotBefore;
+    FILETIME            NotAfter;
+} CERT_PRIVATE_KEY_VALIDITY, *PCERT_PRIVATE_KEY_VALIDITY;
+
+typedef struct _CERT_KEY_ATTRIBUTES_INFO {
+    CRYPT_DATA_BLOB             KeyId;
+    CRYPT_BIT_BLOB              IntendedKeyUsage;
+    PCERT_PRIVATE_KEY_VALIDITY  pPrivateKeyUsagePeriod;     // OPTIONAL
+} CERT_KEY_ATTRIBUTES_INFO, *PCERT_KEY_ATTRIBUTES_INFO;
+
+// Byte[0]
+#define CERT_DIGITAL_SIGNATURE_KEY_USAGE     0x80
+#define CERT_NON_REPUDIATION_KEY_USAGE       0x40
+#define CERT_KEY_ENCIPHERMENT_KEY_USAGE      0x20
+#define CERT_DATA_ENCIPHERMENT_KEY_USAGE     0x10
+#define CERT_KEY_AGREEMENT_KEY_USAGE         0x08
+#define CERT_KEY_CERT_SIGN_KEY_USAGE         0x04
+#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE      0x02
+#define CERT_CRL_SIGN_KEY_USAGE              0x02
+#define CERT_ENCIPHER_ONLY_KEY_USAGE         0x01
+// Byte[1]
+#define CERT_DECIPHER_ONLY_KEY_USAGE         0x80
+
+//+-------------------------------------------------------------------------
+//  X509_KEY_USAGE_RESTRICTION
+//  szOID_KEY_USAGE_RESTRICTION
+//
+//  pvStructInfo points to following CERT_KEY_USAGE_RESTRICTION_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_POLICY_ID {
+    DWORD                   cCertPolicyElementId;
+    LPSTR                   *rgpszCertPolicyElementId;  // pszObjId
+} CERT_POLICY_ID, *PCERT_POLICY_ID;
+
+typedef struct _CERT_KEY_USAGE_RESTRICTION_INFO {
+    DWORD                   cCertPolicyId;
+    PCERT_POLICY_ID         rgCertPolicyId;
+    CRYPT_BIT_BLOB          RestrictedKeyUsage;
+} CERT_KEY_USAGE_RESTRICTION_INFO, *PCERT_KEY_USAGE_RESTRICTION_INFO;
+
+// See CERT_KEY_ATTRIBUTES_INFO for definition of the RestrictedKeyUsage bits
+
+//+-------------------------------------------------------------------------
+//  X509_ALTERNATE_NAME
+//  szOID_SUBJECT_ALT_NAME
+//  szOID_ISSUER_ALT_NAME
+//  szOID_SUBJECT_ALT_NAME2
+//  szOID_ISSUER_ALT_NAME2
+//
+//  pvStructInfo points to following CERT_ALT_NAME_INFO.
+//--------------------------------------------------------------------------
+
+typedef struct _CERT_OTHER_NAME {
+    LPSTR               pszObjId;
+    CRYPT_OBJID_BLOB    Value;
+} CERT_OTHER_NAME, *PCERT_OTHER_NAME;
+
+typedef struct _CERT_ALT_NAME_ENTRY {
+    DWORD   dwAltNameChoice;
+    union {
+        PCERT_OTHER_NAME            pOtherName;         // 1
+        LPWSTR                      pwszRfc822Name;     // 2  (encoded IA5)
+        LPWSTR                      pwszDNSName;        // 3  (encoded IA5)
+        // Not implemented          x400Address;        // 4
+        CERT_NAME_BLOB              DirectoryName;      // 5
+        // Not implemented          pEdiPartyName;      // 6
+        LPWSTR                      pwszURL;            // 7  (encoded IA5)
+        CRYPT_DATA_BLOB             IPAddress;          // 8  (Octet String)
+        LPSTR                       pszRegisteredID;    // 9  (Object Identifer)
+    };
+} CERT_ALT_NAME_ENTRY, *PCERT_ALT_NAME_ENTRY;
+
+#define CERT_ALT_NAME_OTHER_NAME         1
+#define CERT_ALT_NAME_RFC822_NAME        2
+#define CERT_ALT_NAME_DNS_NAME           3
+#define CERT_ALT_NAME_X400_ADDRESS       4
+#define CERT_ALT_NAME_DIRECTORY_NAME     5
+#define CERT_ALT_NAME_EDI_PARTY_NAME     6
+#define CERT_ALT_NAME_URL                7
+#define CERT_ALT_NAME_IP_ADDRESS         8
+#define CERT_ALT_NAME_REGISTERED_ID      9
+
+
+typedef struct _CERT_ALT_NAME_INFO {
+    DWORD                   cAltEntry;
+    PCERT_ALT_NAME_ENTRY    rgAltEntry;
+} CERT_ALT_NAME_INFO, *PCERT_ALT_NAME_INFO;
+
+//+-------------------------------------------------------------------------
+//  Alternate name IA5 Error Location Definitions for
+//  CRYPT_E_INVALID_IA5_STRING.
+//
+//  Error location is returned in *pcbEncoded by
+//  CryptEncodeObject(X509_ALTERNATE_NAME)
+//
+//  Error location consists of:
+//    ENTRY_INDEX   - 8 bits << 16
+//    VALUE_INDEX   - 16 bits (unicode character index)
+//--------------------------------------------------------------------------
+#define CERT_ALT_NAME_ENTRY_ERR_INDEX_MASK  0xFF
+#define CERT_ALT_NAME_ENTRY_ERR_INDEX_SHIFT 16
+#define CERT_ALT_NAME_VALUE_ERR_INDEX_MASK  0x0000FFFF
+#define CERT_ALT_NAME_VALUE_ERR_INDEX_SHIFT 0
+
+#define GET_CERT_ALT_NAME_ENTRY_ERR_INDEX(X)   \
+    ((X >> CERT_ALT_NAME_ENTRY_ERR_INDEX_SHIFT) & \
+    CERT_ALT_NAME_ENTRY_ERR_INDEX_MASK)
+#define GET_CERT_ALT_NAME_VALUE_ERR_INDEX(X) \
+    (X & CERT_ALT_NAME_VALUE_ERR_INDEX_MASK)
+
+
+//+-------------------------------------------------------------------------
+//  X509_BASIC_CONSTRAINTS
+//  szOID_BASIC_CONSTRAINTS
+//
+//  pvStructInfo points to following CERT_BASIC_CONSTRAINTS_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_BASIC_CONSTRAINTS_INFO {
+    CRYPT_BIT_BLOB          SubjectType;
+    BOOL                    fPathLenConstraint;
+    DWORD                   dwPathLenConstraint;
+    DWORD                   cSubtreesConstraint;
+    CERT_NAME_BLOB          *rgSubtreesConstraint;
+} CERT_BASIC_CONSTRAINTS_INFO, *PCERT_BASIC_CONSTRAINTS_INFO;
+
+#define CERT_CA_SUBJECT_FLAG         0x80
+#define CERT_END_ENTITY_SUBJECT_FLAG 0x40
+
+//+-------------------------------------------------------------------------
+//  X509_BASIC_CONSTRAINTS2
+//  szOID_BASIC_CONSTRAINTS2
+//
+//  pvStructInfo points to following CERT_BASIC_CONSTRAINTS2_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_BASIC_CONSTRAINTS2_INFO {
+    BOOL                    fCA;
+    BOOL                    fPathLenConstraint;
+    DWORD                   dwPathLenConstraint;
+} CERT_BASIC_CONSTRAINTS2_INFO, *PCERT_BASIC_CONSTRAINTS2_INFO;
+
+//+-------------------------------------------------------------------------
+//  X509_KEY_USAGE
+//  szOID_KEY_USAGE
+//
+//  pvStructInfo points to a CRYPT_BIT_BLOB. Has same bit definitions as
+//  CERT_KEY_ATTRIBUTES_INFO's IntendedKeyUsage.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_CERT_POLICIES
+//  szOID_CERT_POLICIES
+//  szOID_CERT_POLICIES_95   NOTE--Only allowed for decoding!!!
+//
+//  pvStructInfo points to following CERT_POLICIES_INFO.
+//
+//  NOTE: when decoding using szOID_CERT_POLICIES_95 the pszPolicyIdentifier
+//        may contain an empty string
+//--------------------------------------------------------------------------
+typedef struct _CERT_POLICY_QUALIFIER_INFO {
+    LPSTR                       pszPolicyQualifierId;   // pszObjId
+    CRYPT_OBJID_BLOB            Qualifier;              // optional
+} CERT_POLICY_QUALIFIER_INFO, *PCERT_POLICY_QUALIFIER_INFO;
+
+typedef struct _CERT_POLICY_INFO {
+    LPSTR                       pszPolicyIdentifier;    // pszObjId
+    DWORD                       cPolicyQualifier;       // optional
+    CERT_POLICY_QUALIFIER_INFO  *rgPolicyQualifier;
+} CERT_POLICY_INFO, *PCERT_POLICY_INFO;
+
+typedef struct _CERT_POLICIES_INFO {
+    DWORD                       cPolicyInfo;
+    CERT_POLICY_INFO            *rgPolicyInfo;
+} CERT_POLICIES_INFO, *PCERT_POLICIES_INFO;
+
+//+-------------------------------------------------------------------------
+//  X509_PKIX_POLICY_QUALIFIER_USERNOTICE
+//  szOID_PKIX_POLICY_QUALIFIER_USERNOTICE
+//
+//  pvStructInfo points to following CERT_POLICY_QUALIFIER_USER_NOTICE.
+//
+//--------------------------------------------------------------------------
+typedef struct _CERT_POLICY_QUALIFIER_NOTICE_REFERENCE {
+    LPSTR   pszOrganization;
+    DWORD   cNoticeNumbers;
+    int     *rgNoticeNumbers;
+} CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, *PCERT_POLICY_QUALIFIER_NOTICE_REFERENCE;
+
+typedef struct _CERT_POLICY_QUALIFIER_USER_NOTICE {
+    CERT_POLICY_QUALIFIER_NOTICE_REFERENCE  *pNoticeReference;  // optional
+    LPWSTR                                  pszDisplayText;     // optional
+} CERT_POLICY_QUALIFIER_USER_NOTICE, *PCERT_POLICY_QUALIFIER_USER_NOTICE;
+
+//+-------------------------------------------------------------------------
+//  szOID_CERT_POLICIES_95_QUALIFIER1 - Decode Only!!!!
+//
+//  pvStructInfo points to following CERT_POLICY95_QUALIFIER1.
+//
+//--------------------------------------------------------------------------
+typedef struct _CPS_URLS {
+    LPWSTR                      pszURL;
+    CRYPT_ALGORITHM_IDENTIFIER  *pAlgorithm; // optional
+    CRYPT_DATA_BLOB             *pDigest;    // optional
+} CPS_URLS, *PCPS_URLS;
+
+typedef struct _CERT_POLICY95_QUALIFIER1 {
+    LPWSTR      pszPracticesReference;      // optional
+    LPSTR       pszNoticeIdentifier;        // optional
+    LPSTR       pszNSINoticeIdentifier;     // optional
+    DWORD       cCPSURLs;
+    CPS_URLS    *rgCPSURLs;                 // optional
+} CERT_POLICY95_QUALIFIER1, *PCERT_POLICY95_QUALIFIER1;
+
+
+//+-------------------------------------------------------------------------
+//  X509_POLICY_MAPPINGS
+//  szOID_POLICY_MAPPINGS
+//  szOID_LEGACY_POLICY_MAPPINGS
+//
+//  pvStructInfo points to following CERT_POLICY_MAPPINGS_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_POLICY_MAPPING {
+    LPSTR                       pszIssuerDomainPolicy;      // pszObjId
+    LPSTR                       pszSubjectDomainPolicy;     // pszObjId
+} CERT_POLICY_MAPPING, *PCERT_POLICY_MAPPING;
+
+typedef struct _CERT_POLICY_MAPPINGS_INFO {
+    DWORD                       cPolicyMapping;
+    PCERT_POLICY_MAPPING        rgPolicyMapping;
+} CERT_POLICY_MAPPINGS_INFO, *PCERT_POLICY_MAPPINGS_INFO;
+
+//+-------------------------------------------------------------------------
+//  X509_POLICY_CONSTRAINTS
+//  szOID_POLICY_CONSTRAINTS
+//
+//  pvStructInfo points to following CERT_POLICY_CONSTRAINTS_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CERT_POLICY_CONSTRAINTS_INFO {
+    BOOL                        fRequireExplicitPolicy;
+    DWORD                       dwRequireExplicitPolicySkipCerts;
+
+    BOOL                        fInhibitPolicyMapping;
+    DWORD                       dwInhibitPolicyMappingSkipCerts;
+} CERT_POLICY_CONSTRAINTS_INFO, *PCERT_POLICY_CONSTRAINTS_INFO;
+
+//+-------------------------------------------------------------------------
+//  RSA_CSP_PUBLICKEYBLOB
+//
+//  pvStructInfo points to a PUBLICKEYSTRUC immediately followed by a
+//  RSAPUBKEY and the modulus bytes.
+//
+//  CryptExportKey outputs the above StructInfo for a dwBlobType of
+//  PUBLICKEYBLOB. CryptImportKey expects the above StructInfo when
+//  importing a public key.
+//
+//  For dwCertEncodingType = X509_ASN_ENCODING, the RSA_CSP_PUBLICKEYBLOB is
+//  encoded as a PKCS #1 RSAPublicKey consisting of a SEQUENCE of a
+//  modulus INTEGER and a publicExponent INTEGER. The modulus is encoded
+//  as being a unsigned integer. When decoded, if the modulus was encoded
+//  as unsigned integer with a leading 0 byte, the 0 byte is removed before
+//  converting to the CSP modulus bytes.
+//
+//  For decode, the aiKeyAlg field of PUBLICKEYSTRUC is always set to
+//  CALG_RSA_KEYX.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_KEYGEN_REQUEST_TO_BE_SIGNED
+//
+//  pvStructInfo points to CERT_KEYGEN_REQUEST_INFO.
+//
+//  For CryptDecodeObject(), the pbEncoded is the "to be signed" plus its
+//  signature (output of a X509_CERT CryptEncodeObject()).
+//
+//  For CryptEncodeObject(), the pbEncoded is just the "to be signed".
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  PKCS_ATTRIBUTE data structure
+//
+//  pvStructInfo points to a CRYPT_ATTRIBUTE.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  PKCS_ATTRIBUTES data structure
+//
+//  pvStructInfo points to a CRYPT_ATTRIBUTES.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  PKCS_CONTENT_INFO_SEQUENCE_OF_ANY data structure
+//
+//  pvStructInfo points to following CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY.
+//
+//  For X509_ASN_ENCODING: encoded as a PKCS#7 ContentInfo structure wrapping
+//  a sequence of ANY. The value of the contentType field is pszObjId,
+//  while the content field is the following structure:
+//      SequenceOfAny ::= SEQUENCE OF ANY
+//
+//  The CRYPT_DER_BLOBs point to the already encoded ANY content.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY {
+    LPSTR               pszObjId;
+    DWORD               cValue;
+    PCRYPT_DER_BLOB     rgValue;
+} CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY, *PCRYPT_CONTENT_INFO_SEQUENCE_OF_ANY;
+
+//+-------------------------------------------------------------------------
+//  PKCS_CONTENT_INFO data structure
+//
+//  pvStructInfo points to following CRYPT_CONTENT_INFO.
+//
+//  For X509_ASN_ENCODING: encoded as a PKCS#7 ContentInfo structure.
+//  The CRYPT_DER_BLOB points to the already encoded ANY content.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_CONTENT_INFO {
+    LPSTR               pszObjId;
+    CRYPT_DER_BLOB      Content;
+} CRYPT_CONTENT_INFO, *PCRYPT_CONTENT_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  X509_OCTET_STRING data structure
+//
+//  pvStructInfo points to a CRYPT_DATA_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_BITS data structure
+//
+//  pvStructInfo points to a CRYPT_BIT_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_BITS_WITHOUT_TRAILING_ZEROES data structure
+//
+//  pvStructInfo points to a CRYPT_BIT_BLOB.
+//
+//  The same as X509_BITS, except before encoding, the bit length is
+//  decremented to exclude trailing zero bits.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_INTEGER data structure
+//
+//  pvStructInfo points to an int.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_MULTI_BYTE_INTEGER data structure
+//
+//  pvStructInfo points to a CRYPT_INTEGER_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_ENUMERATED data structure
+//
+//  pvStructInfo points to an int containing the enumerated value
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_CHOICE_OF_TIME data structure
+//
+//  pvStructInfo points to a FILETIME.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_SEQUENCE_OF_ANY data structure
+//
+//  pvStructInfo points to following CRYPT_SEQUENCE_OF_ANY.
+//
+//  The CRYPT_DER_BLOBs point to the already encoded ANY content.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_SEQUENCE_OF_ANY {
+    DWORD               cValue;
+    PCRYPT_DER_BLOB     rgValue;
+} CRYPT_SEQUENCE_OF_ANY, *PCRYPT_SEQUENCE_OF_ANY;
+
+
+//+-------------------------------------------------------------------------
+//  X509_AUTHORITY_KEY_ID2
+//  szOID_AUTHORITY_KEY_IDENTIFIER2
+//
+//  pvStructInfo points to following CERT_AUTHORITY_KEY_ID2_INFO.
+//
+//  For CRYPT_E_INVALID_IA5_STRING, the error location is returned in
+//  *pcbEncoded by CryptEncodeObject(X509_AUTHORITY_KEY_ID2)
+//
+//  See X509_ALTERNATE_NAME for error location defines.
+//--------------------------------------------------------------------------
+typedef struct _CERT_AUTHORITY_KEY_ID2_INFO {
+    CRYPT_DATA_BLOB     KeyId;
+    CERT_ALT_NAME_INFO  AuthorityCertIssuer;    // Optional, set cAltEntry
+                                                // to 0 to omit.
+    CRYPT_INTEGER_BLOB  AuthorityCertSerialNumber;
+} CERT_AUTHORITY_KEY_ID2_INFO, *PCERT_AUTHORITY_KEY_ID2_INFO;
+
+//+-------------------------------------------------------------------------
+//  szOID_SUBJECT_KEY_IDENTIFIER
+//
+//  pvStructInfo points to a CRYPT_DATA_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_AUTHORITY_INFO_ACCESS
+//  szOID_AUTHORITY_INFO_ACCESS
+//
+//  pvStructInfo points to following CERT_AUTHORITY_INFO_ACCESS.
+//
+//  For CRYPT_E_INVALID_IA5_STRING, the error location is returned in
+//  *pcbEncoded by CryptEncodeObject(X509_AUTHORITY_INFO_ACCESS)
+//
+//  Error location consists of:
+//    ENTRY_INDEX   - 8 bits << 16
+//    VALUE_INDEX   - 16 bits (unicode character index)
+//
+//  See X509_ALTERNATE_NAME for ENTRY_INDEX and VALUE_INDEX error location
+//  defines.
+//--------------------------------------------------------------------------
+
+typedef struct _CERT_ACCESS_DESCRIPTION {
+    LPSTR               pszAccessMethod;        // pszObjId
+    CERT_ALT_NAME_ENTRY AccessLocation;
+} CERT_ACCESS_DESCRIPTION, *PCERT_ACCESS_DESCRIPTION;
+
+
+typedef struct _CERT_AUTHORITY_INFO_ACCESS {
+    DWORD                       cAccDescr;
+    PCERT_ACCESS_DESCRIPTION    rgAccDescr;
+} CERT_AUTHORITY_INFO_ACCESS, *PCERT_AUTHORITY_INFO_ACCESS;
+
+
+//+-------------------------------------------------------------------------
+//  PKIX Access Description: Access Method Object Identifiers
+//--------------------------------------------------------------------------
+#define szOID_PKIX_ACC_DESCR            "1.3.6.1.5.5.7.48"
+#define szOID_PKIX_OCSP                 "1.3.6.1.5.5.7.48.1"
+#define szOID_PKIX_CA_ISSUERS           "1.3.6.1.5.5.7.48.2"
+
+
+//+-------------------------------------------------------------------------
+//  X509_CRL_REASON_CODE
+//  szOID_CRL_REASON_CODE
+//
+//  pvStructInfo points to an int which can be set to one of the following
+//  enumerated values:
+//--------------------------------------------------------------------------
+#define CRL_REASON_UNSPECIFIED              0
+#define CRL_REASON_KEY_COMPROMISE           1
+#define CRL_REASON_CA_COMPROMISE            2
+#define CRL_REASON_AFFILIATION_CHANGED      3
+#define CRL_REASON_SUPERSEDED               4
+#define CRL_REASON_CESSATION_OF_OPERATION   5
+#define CRL_REASON_CERTIFICATE_HOLD         6
+#define CRL_REASON_REMOVE_FROM_CRL          8
+
+
+//+-------------------------------------------------------------------------
+//  X509_CRL_DIST_POINTS
+//  szOID_CRL_DIST_POINTS
+//
+//  pvStructInfo points to following CRL_DIST_POINTS_INFO.
+//
+//  For CRYPT_E_INVALID_IA5_STRING, the error location is returned in
+//  *pcbEncoded by CryptEncodeObject(X509_CRL_DIST_POINTS)
+//
+//  Error location consists of:
+//    CRL_ISSUER_BIT    - 1 bit  << 31 (0 for FullName, 1 for CRLIssuer)
+//    POINT_INDEX       - 7 bits << 24
+//    ENTRY_INDEX       - 8 bits << 16
+//    VALUE_INDEX       - 16 bits (unicode character index)
+//
+//  See X509_ALTERNATE_NAME for ENTRY_INDEX and VALUE_INDEX error location
+//  defines.
+//--------------------------------------------------------------------------
+typedef struct _CRL_DIST_POINT_NAME {
+    DWORD   dwDistPointNameChoice;
+    union {
+        CERT_ALT_NAME_INFO      FullName;       // 1
+        // Not implemented      IssuerRDN;      // 2
+    };
+} CRL_DIST_POINT_NAME, *PCRL_DIST_POINT_NAME;
+
+#define CRL_DIST_POINT_NO_NAME          0
+#define CRL_DIST_POINT_FULL_NAME        1
+#define CRL_DIST_POINT_ISSUER_RDN_NAME  2
+
+typedef struct _CRL_DIST_POINT {
+    CRL_DIST_POINT_NAME     DistPointName;      // OPTIONAL
+    CRYPT_BIT_BLOB          ReasonFlags;        // OPTIONAL
+    CERT_ALT_NAME_INFO      CRLIssuer;          // OPTIONAL
+} CRL_DIST_POINT, *PCRL_DIST_POINT;
+
+#define CRL_REASON_UNUSED_FLAG                  0x80
+#define CRL_REASON_KEY_COMPROMISE_FLAG          0x40
+#define CRL_REASON_CA_COMPROMISE_FLAG           0x20
+#define CRL_REASON_AFFILIATION_CHANGED_FLAG     0x10
+#define CRL_REASON_SUPERSEDED_FLAG              0x08
+#define CRL_REASON_CESSATION_OF_OPERATION_FLAG  0x04
+#define CRL_REASON_CERTIFICATE_HOLD_FLAG        0x02
+
+typedef struct _CRL_DIST_POINTS_INFO {
+    DWORD                   cDistPoint;
+    PCRL_DIST_POINT         rgDistPoint;
+} CRL_DIST_POINTS_INFO, *PCRL_DIST_POINTS_INFO;
+
+#define CRL_DIST_POINT_ERR_INDEX_MASK          0x7F
+#define CRL_DIST_POINT_ERR_INDEX_SHIFT         24
+#define GET_CRL_DIST_POINT_ERR_INDEX(X)   \
+    ((X >> CRL_DIST_POINT_ERR_INDEX_SHIFT) & CRL_DIST_POINT_ERR_INDEX_MASK)
+
+#define CRL_DIST_POINT_ERR_CRL_ISSUER_BIT      0x80000000L
+#define IS_CRL_DIST_POINT_ERR_CRL_ISSUER(X)   \
+    (0 != (X & CRL_DIST_POINT_ERR_CRL_ISSUER_BIT))
+
+//+-------------------------------------------------------------------------
+//  X509_CROSS_CERT_DIST_POINTS
+//  szOID_CROSS_CERT_DIST_POINTS
+//
+//  pvStructInfo points to following CROSS_CERT_DIST_POINTS_INFO.
+//
+//  For CRYPT_E_INVALID_IA5_STRING, the error location is returned in
+//  *pcbEncoded by CryptEncodeObject(X509_CRL_DIST_POINTS)
+//
+//  Error location consists of:
+//    POINT_INDEX       - 8 bits << 24
+//    ENTRY_INDEX       - 8 bits << 16
+//    VALUE_INDEX       - 16 bits (unicode character index)
+//
+//  See X509_ALTERNATE_NAME for ENTRY_INDEX and VALUE_INDEX error location
+//  defines.
+//--------------------------------------------------------------------------
+typedef struct _CROSS_CERT_DIST_POINTS_INFO {
+    // Seconds between syncs. 0 implies use client default.
+    DWORD                   dwSyncDeltaTime;
+
+    DWORD                   cDistPoint;
+    PCERT_ALT_NAME_INFO     rgDistPoint;
+} CROSS_CERT_DIST_POINTS_INFO, *PCROSS_CERT_DIST_POINTS_INFO;
+
+#define CROSS_CERT_DIST_POINT_ERR_INDEX_MASK   0xFF
+#define CROSS_CERT_DIST_POINT_ERR_INDEX_SHIFT  24
+#define GET_CROSS_CERT_DIST_POINT_ERR_INDEX(X)   \
+    ((X >> CROSS_CERT_DIST_POINT_ERR_INDEX_SHIFT) & \
+                CROSS_CERT_DIST_POINT_ERR_INDEX_MASK)
+
+
+
+//+-------------------------------------------------------------------------
+//  X509_ENHANCED_KEY_USAGE
+//  szOID_ENHANCED_KEY_USAGE
+//
+//  pvStructInfo points to a CERT_ENHKEY_USAGE, CTL_USAGE.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_CERT_PAIR
+//
+//  pvStructInfo points to the following CERT_PAIR.
+//--------------------------------------------------------------------------
+typedef struct _CERT_PAIR {
+   CERT_BLOB    Forward;        // OPTIONAL, if Forward.cbData == 0, omitted
+   CERT_BLOB    Reverse;        // OPTIONAL, if Reverse.cbData == 0, omitted
+} CERT_PAIR, *PCERT_PAIR;
+
+//+-------------------------------------------------------------------------
+//  szOID_CRL_NUMBER
+//
+//  pvStructInfo points to an int.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_DELTA_CRL_INDICATOR
+//
+//  pvStructInfo points to an int.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_ISSUING_DIST_POINT
+//  X509_ISSUING_DIST_POINT
+//
+//  pvStructInfo points to the following CRL_ISSUING_DIST_POINT.
+//
+//  For CRYPT_E_INVALID_IA5_STRING, the error location is returned in
+//  *pcbEncoded by CryptEncodeObject(X509_ISSUING_DIST_POINT)
+//
+//  Error location consists of:
+//    ENTRY_INDEX       - 8 bits << 16
+//    VALUE_INDEX       - 16 bits (unicode character index)
+//
+//  See X509_ALTERNATE_NAME for ENTRY_INDEX and VALUE_INDEX error location
+//  defines.
+//--------------------------------------------------------------------------
+typedef struct _CRL_ISSUING_DIST_POINT {
+    CRL_DIST_POINT_NAME     DistPointName;              // OPTIONAL
+    BOOL                    fOnlyContainsUserCerts;
+    BOOL                    fOnlyContainsCACerts;
+    CRYPT_BIT_BLOB          OnlySomeReasonFlags;        // OPTIONAL
+    BOOL                    fIndirectCRL;
+} CRL_ISSUING_DIST_POINT, *PCRL_ISSUING_DIST_POINT;
+
+//+-------------------------------------------------------------------------
+//  szOID_FRESHEST_CRL
+//
+//  pvStructInfo points to CRL_DIST_POINTS_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NAME_CONSTRAINTS
+//  X509_NAME_CONSTRAINTS
+//
+//  pvStructInfo points to the following CERT_NAME_CONSTRAINTS_INFO
+//
+//  For CRYPT_E_INVALID_IA5_STRING, the error location is returned in
+//  *pcbEncoded by CryptEncodeObject(X509_NAME_CONSTRAINTS)
+//
+//  Error location consists of:
+//    EXCLUDED_SUBTREE_BIT  - 1 bit  << 31 (0 for permitted, 1 for excluded)
+//    ENTRY_INDEX           - 8 bits << 16
+//    VALUE_INDEX           - 16 bits (unicode character index)
+//
+//  See X509_ALTERNATE_NAME for ENTRY_INDEX and VALUE_INDEX error location
+//  defines.
+//--------------------------------------------------------------------------
+typedef struct _CERT_GENERAL_SUBTREE {
+    CERT_ALT_NAME_ENTRY     Base;
+    DWORD                   dwMinimum;
+    BOOL                    fMaximum;
+    DWORD                   dwMaximum;
+} CERT_GENERAL_SUBTREE, *PCERT_GENERAL_SUBTREE;
+
+typedef struct _CERT_NAME_CONSTRAINTS_INFO {
+    DWORD                   cPermittedSubtree;
+    PCERT_GENERAL_SUBTREE   rgPermittedSubtree;
+    DWORD                   cExcludedSubtree;
+    PCERT_GENERAL_SUBTREE   rgExcludedSubtree;
+} CERT_NAME_CONSTRAINTS_INFO, *PCERT_NAME_CONSTRAINTS_INFO;
+
+#define CERT_EXCLUDED_SUBTREE_BIT       0x80000000L
+#define IS_CERT_EXCLUDED_SUBTREE(X)     \
+    (0 != (X & CERT_EXCLUDED_SUBTREE_BIT))
+
+//+-------------------------------------------------------------------------
+//  szOID_NEXT_UPDATE_LOCATION
+//
+//  pvStructInfo points to a CERT_ALT_NAME_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_REMOVE_CERTIFICATE
+//
+//  pvStructInfo points to an int which can be set to one of the following
+//   0 - Add certificate
+//   1 - Remove certificate
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  PKCS_CTL
+//  szOID_CTL
+//
+//  pvStructInfo points to a CTL_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  PKCS_SORTED_CTL
+//
+//  pvStructInfo points to a CTL_INFO.
+//
+//  Same as for PKCS_CTL, except, the CTL entries are sorted. The following
+//  extension containing the sort information is inserted as the first
+//  extension in the encoded CTL.
+//
+//  Only supported for Encoding. CRYPT_ENCODE_ALLOC_FLAG flag must be
+//  set.
+//--------------------------------------------------------------------------
+
+
+//+-------------------------------------------------------------------------
+// Sorted CTL TrustedSubjects extension
+//
+//  Array of little endian DWORDs:
+//   [0] - Flags
+//   [1] - Count of HashBucket entry offsets
+//   [2] - Maximum HashBucket entry collision count
+//   [3 ..] (Count + 1) HashBucket entry offsets
+//
+//  When this extension is present in the CTL,
+//  the ASN.1 encoded sequence of TrustedSubjects are HashBucket ordered.
+//
+//  The entry offsets point to the start of the first encoded TrustedSubject
+//  sequence for the HashBucket. The encoded TrustedSubjects for a HashBucket
+//  continue until the encoded offset of the next HashBucket. A HashBucket has
+//  no entries if HashBucket[N] == HashBucket[N + 1].
+//
+//  The HashBucket offsets are from the start of the ASN.1 encoded CTL_INFO.
+//--------------------------------------------------------------------------
+#define SORTED_CTL_EXT_FLAGS_OFFSET         (0*4)
+#define SORTED_CTL_EXT_COUNT_OFFSET         (1*4)
+#define SORTED_CTL_EXT_MAX_COLLISION_OFFSET (2*4)
+#define SORTED_CTL_EXT_HASH_BUCKET_OFFSET   (3*4)
+
+// If the SubjectIdentifiers are a MD5 or SHA1 hash, the following flag is
+// set. When set, the first 4 bytes of the SubjectIdentifier are used as
+// the dwhash. Otherwise, the SubjectIdentifier bytes are hashed into dwHash.
+// In either case the HashBucket index = dwHash % cHashBucket.
+#define SORTED_CTL_EXT_HASHED_SUBJECT_IDENTIFIER_FLAG       0x1
+
+//+-------------------------------------------------------------------------
+//  X509_MULTI_BYTE_UINT
+//
+//  pvStructInfo points to a CRYPT_UINT_BLOB. Before encoding, inserts a
+//  leading 0x00. After decoding, removes a leading 0x00.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_DSS_PUBLICKEY
+//
+//  pvStructInfo points to a CRYPT_UINT_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_DSS_PARAMETERS
+//
+//  pvStructInfo points to following CERT_DSS_PARAMETERS data structure.
+//--------------------------------------------------------------------------
+typedef struct _CERT_DSS_PARAMETERS {
+    CRYPT_UINT_BLOB     p;
+    CRYPT_UINT_BLOB     q;
+    CRYPT_UINT_BLOB     g;
+} CERT_DSS_PARAMETERS, *PCERT_DSS_PARAMETERS;
+
+//+-------------------------------------------------------------------------
+//  X509_DSS_SIGNATURE
+//
+//  pvStructInfo is a BYTE rgbSignature[CERT_DSS_SIGNATURE_LEN]. The
+//  bytes are ordered as output by the DSS CSP's CryptSignHash().
+//--------------------------------------------------------------------------
+#define CERT_DSS_R_LEN          20
+#define CERT_DSS_S_LEN          20
+#define CERT_DSS_SIGNATURE_LEN  (CERT_DSS_R_LEN + CERT_DSS_S_LEN)
+
+// Sequence of 2 unsigned integers (the extra +1 is for a potential leading
+// 0x00 to make the integer unsigned)
+#define CERT_MAX_ASN_ENCODED_DSS_SIGNATURE_LEN  (2 + 2*(2 + 20 +1))
+
+//+-------------------------------------------------------------------------
+//  X509_DH_PUBLICKEY
+//
+//  pvStructInfo points to a CRYPT_UINT_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  X509_DH_PARAMETERS
+//
+//  pvStructInfo points to following CERT_DH_PARAMETERS data structure.
+//--------------------------------------------------------------------------
+typedef struct _CERT_DH_PARAMETERS {
+    CRYPT_UINT_BLOB     p;
+    CRYPT_UINT_BLOB     g;
+} CERT_DH_PARAMETERS, *PCERT_DH_PARAMETERS;
+
+//+-------------------------------------------------------------------------
+//  X942_DH_PARAMETERS
+//
+//  pvStructInfo points to following CERT_X942_DH_PARAMETERS data structure.
+//
+//  If q.cbData == 0, then, the following fields are zero'ed.
+//--------------------------------------------------------------------------
+typedef struct _CERT_X942_DH_VALIDATION_PARAMS {
+    CRYPT_BIT_BLOB      seed;
+    DWORD               pgenCounter;
+} CERT_X942_DH_VALIDATION_PARAMS, *PCERT_X942_DH_VALIDATION_PARAMS;
+
+typedef struct _CERT_X942_DH_PARAMETERS {
+    CRYPT_UINT_BLOB     p;          // odd prime, p = jq + 1
+    CRYPT_UINT_BLOB     g;          // generator, g
+    CRYPT_UINT_BLOB     q;          // factor of p - 1, OPTIONAL
+    CRYPT_UINT_BLOB     j;          // subgroup factor, OPTIONAL
+    PCERT_X942_DH_VALIDATION_PARAMS pValidationParams;  // OPTIONAL
+} CERT_X942_DH_PARAMETERS, *PCERT_X942_DH_PARAMETERS;
+
+//+-------------------------------------------------------------------------
+//  X942_OTHER_INFO
+//
+//  pvStructInfo points to following CRYPT_X942_OTHER_INFO data structure.
+//
+//  rgbCounter and rgbKeyLength are in Little Endian order.
+//--------------------------------------------------------------------------
+#define CRYPT_X942_COUNTER_BYTE_LENGTH      4
+#define CRYPT_X942_KEY_LENGTH_BYTE_LENGTH   4
+#define CRYPT_X942_PUB_INFO_BYTE_LENGTH     (512/8)
+typedef struct _CRYPT_X942_OTHER_INFO {
+    LPSTR               pszContentEncryptionObjId;
+    BYTE                rgbCounter[CRYPT_X942_COUNTER_BYTE_LENGTH];
+    BYTE                rgbKeyLength[CRYPT_X942_KEY_LENGTH_BYTE_LENGTH];
+    CRYPT_DATA_BLOB     PubInfo;    // OPTIONAL
+} CRYPT_X942_OTHER_INFO, *PCRYPT_X942_OTHER_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  PKCS_RC2_CBC_PARAMETERS
+//  szOID_RSA_RC2CBC
+//
+//  pvStructInfo points to following CRYPT_RC2_CBC_PARAMETERS data structure.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_RC2_CBC_PARAMETERS {
+    DWORD               dwVersion;
+    BOOL                fIV;            // set if has following IV
+    BYTE                rgbIV[8];
+} CRYPT_RC2_CBC_PARAMETERS, *PCRYPT_RC2_CBC_PARAMETERS;
+
+#define CRYPT_RC2_40BIT_VERSION     160
+#define CRYPT_RC2_56BIT_VERSION     52
+#define CRYPT_RC2_64BIT_VERSION     120
+#define CRYPT_RC2_128BIT_VERSION    58
+
+
+//+-------------------------------------------------------------------------
+//  PKCS_SMIME_CAPABILITIES
+//  szOID_RSA_SMIMECapabilities
+//
+//  pvStructInfo points to following CRYPT_SMIME_CAPABILITIES data structure.
+//
+//  Note, for CryptEncodeObject(X509_ASN_ENCODING), Parameters.cbData == 0
+//  causes the encoded parameters to be omitted and not encoded as a NULL
+//  (05 00) as is done when encoding a CRYPT_ALGORITHM_IDENTIFIER. This
+//  is per the SMIME specification for encoding capabilities.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_SMIME_CAPABILITY {
+    LPSTR               pszObjId;
+    CRYPT_OBJID_BLOB    Parameters;
+} CRYPT_SMIME_CAPABILITY, *PCRYPT_SMIME_CAPABILITY;
+
+typedef struct _CRYPT_SMIME_CAPABILITIES {
+    DWORD                   cCapability;
+    PCRYPT_SMIME_CAPABILITY rgCapability;
+} CRYPT_SMIME_CAPABILITIES, *PCRYPT_SMIME_CAPABILITIES;
+
+
+//+-------------------------------------------------------------------------
+//  PKCS7_SIGNER_INFO
+//
+//  pvStructInfo points to CMSG_SIGNER_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMS_SIGNER_INFO
+//
+//  pvStructInfo points to CMSG_CMS_SIGNER_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Verisign Certificate Extension Object Identifiers
+//--------------------------------------------------------------------------
+
+// Octet String containing Boolean
+#define szOID_VERISIGN_PRIVATE_6_9       "2.16.840.1.113733.1.6.9"
+
+// Octet String containing IA5 string: lower case 32 char hex string
+#define szOID_VERISIGN_ONSITE_JURISDICTION_HASH "2.16.840.1.113733.1.6.11"
+
+// Octet String containing Bit string
+#define szOID_VERISIGN_BITSTRING_6_13    "2.16.840.1.113733.1.6.13"
+
+// EKU
+#define szOID_VERISIGN_ISS_STRONG_CRYPTO "2.16.840.1.113733.1.8.1"
+
+
+//+-------------------------------------------------------------------------
+//  Netscape Certificate Extension Object Identifiers
+//--------------------------------------------------------------------------
+#define szOID_NETSCAPE                  "2.16.840.1.113730"
+#define szOID_NETSCAPE_CERT_EXTENSION   "2.16.840.1.113730.1"
+#define szOID_NETSCAPE_CERT_TYPE        "2.16.840.1.113730.1.1"
+#define szOID_NETSCAPE_BASE_URL         "2.16.840.1.113730.1.2"
+#define szOID_NETSCAPE_REVOCATION_URL   "2.16.840.1.113730.1.3"
+#define szOID_NETSCAPE_CA_REVOCATION_URL "2.16.840.1.113730.1.4"
+#define szOID_NETSCAPE_CERT_RENEWAL_URL "2.16.840.1.113730.1.7"
+#define szOID_NETSCAPE_CA_POLICY_URL    "2.16.840.1.113730.1.8"
+#define szOID_NETSCAPE_SSL_SERVER_NAME  "2.16.840.1.113730.1.12"
+#define szOID_NETSCAPE_COMMENT          "2.16.840.1.113730.1.13"
+
+//+-------------------------------------------------------------------------
+//  Netscape Certificate Data Type Object Identifiers
+//--------------------------------------------------------------------------
+#define szOID_NETSCAPE_DATA_TYPE        "2.16.840.1.113730.2"
+#define szOID_NETSCAPE_CERT_SEQUENCE    "2.16.840.1.113730.2.5"
+
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_CERT_TYPE extension
+//
+//  Its value is a bit string. CryptDecodeObject/CryptEncodeObject using
+//  X509_BITS or X509_BITS_WITHOUT_TRAILING_ZEROES.
+//
+//  The following bits are defined:
+//--------------------------------------------------------------------------
+#define NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE  0x80
+#define NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE  0x40
+#define NETSCAPE_SMIME_CERT_TYPE            0x20
+#define NETSCAPE_SIGN_CERT_TYPE             0x10
+#define NETSCAPE_SSL_CA_CERT_TYPE           0x04
+#define NETSCAPE_SMIME_CA_CERT_TYPE         0x02
+#define NETSCAPE_SIGN_CA_CERT_TYPE          0x01
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_BASE_URL extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  When present this string is added to the beginning of all relative URLs
+//  in the certificate.  This extension can be considered an optimization
+//  to reduce the size of the URL extensions.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_REVOCATION_URL extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  It is a relative or absolute URL that can be used to check the
+//  revocation status of a certificate. The revocation check will be
+//  performed as an HTTP GET method using a url that is the concatenation of
+//  revocation-url and certificate-serial-number.
+//  Where the certificate-serial-number is encoded as a string of
+//  ascii hexadecimal digits. For example, if the netscape-base-url is
+//  https://www.certs-r-us.com/, the netscape-revocation-url is
+//  cgi-bin/check-rev.cgi?, and the certificate serial number is 173420,
+//  the resulting URL would be:
+//  https://www.certs-r-us.com/cgi-bin/check-rev.cgi?02a56c
+//
+//  The server should return a document with a Content-Type of
+//  application/x-netscape-revocation.  The document should contain
+//  a single ascii digit, '1' if the certificate is not curently valid,
+//  and '0' if it is curently valid.
+//
+//  Note: for all of the URLs that include the certificate serial number,
+//  the serial number will be encoded as a string which consists of an even
+//  number of hexadecimal digits.  If the number of significant digits is odd,
+//  the string will have a single leading zero to ensure an even number of
+//  digits is generated.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_CA_REVOCATION_URL extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  It is a relative or absolute URL that can be used to check the
+//  revocation status of any certificates that are signed by the CA that
+//  this certificate belongs to. This extension is only valid in CA
+//  certificates.  The use of this extension is the same as the above
+//  szOID_NETSCAPE_REVOCATION_URL extension.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_CERT_RENEWAL_URL extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  It is a relative or absolute URL that points to a certificate renewal
+//  form. The renewal form will be accessed with an HTTP GET method using a
+//  url that is the concatenation of renewal-url and
+//  certificate-serial-number. Where the certificate-serial-number is
+//  encoded as a string of ascii hexadecimal digits. For example, if the
+//  netscape-base-url is https://www.certs-r-us.com/, the
+//  netscape-cert-renewal-url is cgi-bin/check-renew.cgi?, and the
+//  certificate serial number is 173420, the resulting URL would be:
+//  https://www.certs-r-us.com/cgi-bin/check-renew.cgi?02a56c
+//  The document returned should be an HTML form that will allow the user
+//  to request a renewal of their certificate.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_CA_POLICY_URL extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  It is a relative or absolute URL that points to a web page that
+//  describes the policies under which the certificate was issued.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_SSL_SERVER_NAME extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  It is a "shell expression" that can be used to match the hostname of the
+//  SSL server that is using this certificate.  It is recommended that if
+//  the server's hostname does not match this pattern the user be notified
+//  and given the option to terminate the SSL connection.  If this extension
+//  is not present then the CommonName in the certificate subject's
+//  distinguished name is used for the same purpose.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_COMMENT extension
+//
+//  Its value is an IA5_STRING. CryptDecodeObject/CryptEncodeObject using
+//  X509_ANY_STRING or X509_UNICODE_ANY_STRING, where,
+//  dwValueType = CERT_RDN_IA5_STRING.
+//
+//  It is a comment that may be displayed to the user when the certificate
+//  is viewed.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  szOID_NETSCAPE_CERT_SEQUENCE
+//
+//  Its value is a PKCS#7 ContentInfo structure wrapping a sequence of
+//  certificates. The value of the contentType field is
+//  szOID_NETSCAPE_CERT_SEQUENCE, while the content field is the following
+//  structure:
+//      CertificateSequence ::= SEQUENCE OF Certificate.
+//
+//  CryptDecodeObject/CryptEncodeObject using
+//  PKCS_CONTENT_INFO_SEQUENCE_OF_ANY, where,
+//  pszObjId = szOID_NETSCAPE_CERT_SEQUENCE and the CRYPT_DER_BLOBs point
+//  to encoded X509 certificates.
+//--------------------------------------------------------------------------
+
+//+=========================================================================
+//  Certificate Management Messages over CMS (CMC) Data Structures
+//==========================================================================
+
+// Content Type (request)
+#define szOID_CT_PKI_DATA               "1.3.6.1.5.5.7.12.2"
+
+// Content Type (response)
+#define szOID_CT_PKI_RESPONSE           "1.3.6.1.5.5.7.12.3"
+
+// Signature value that only contains the hash octets. The parameters for
+// this algorithm must be present and must be encoded as NULL. 
+#define szOID_PKIX_NO_SIGNATURE         "1.3.6.1.5.5.7.6.2"
+
+#define szOID_CMC                       "1.3.6.1.5.5.7.7"
+#define szOID_CMC_STATUS_INFO           "1.3.6.1.5.5.7.7.1"
+#define szOID_CMC_IDENTIFICATION        "1.3.6.1.5.5.7.7.2"
+#define szOID_CMC_IDENTITY_PROOF        "1.3.6.1.5.5.7.7.3"
+#define szOID_CMC_DATA_RETURN           "1.3.6.1.5.5.7.7.4"
+
+// Transaction Id (integer)
+#define szOID_CMC_TRANSACTION_ID        "1.3.6.1.5.5.7.7.5"
+
+// Sender Nonce (octet string)
+#define szOID_CMC_SENDER_NONCE          "1.3.6.1.5.5.7.7.6"
+
+// Recipient Nonce (octet string)
+#define szOID_CMC_RECIPIENT_NONCE       "1.3.6.1.5.5.7.7.7"
+
+#define szOID_CMC_ADD_EXTENSIONS        "1.3.6.1.5.5.7.7.8"
+#define szOID_CMC_ENCRYPTED_POP         "1.3.6.1.5.5.7.7.9"
+#define szOID_CMC_DECRYPTED_POP         "1.3.6.1.5.5.7.7.10"
+#define szOID_CMC_LRA_POP_WITNESS       "1.3.6.1.5.5.7.7.11"
+
+// Issuer Name + Serial
+#define szOID_CMC_GET_CERT              "1.3.6.1.5.5.7.7.15"
+
+// Issuer Name [+ CRL Name] + Time [+ Reasons]
+#define szOID_CMC_GET_CRL               "1.3.6.1.5.5.7.7.16"
+
+// Issuer Name + Serial [+ Reason] [+ Effective Time] [+ Secret] [+ Comment]
+#define szOID_CMC_REVOKE_REQUEST        "1.3.6.1.5.5.7.7.17"
+
+// (octet string) URL-style parameter list (IA5?)
+#define szOID_CMC_REG_INFO              "1.3.6.1.5.5.7.7.18"
+
+#define szOID_CMC_RESPONSE_INFO         "1.3.6.1.5.5.7.7.19"
+
+// (octet string)
+#define szOID_CMC_QUERY_PENDING         "1.3.6.1.5.5.7.7.21"
+#define szOID_CMC_ID_POP_LINK_RANDOM    "1.3.6.1.5.5.7.7.22"
+#define szOID_CMC_ID_POP_LINK_WITNESS   "1.3.6.1.5.5.7.7.23"
+
+// optional Name + Integer
+#define szOID_CMC_ID_CONFIRM_CERT_ACCEPTANCE "1.3.6.1.5.5.7.7.24"
+
+#define szOID_CMC_ADD_ATTRIBUTES        "1.3.6.1.4.1.311.10.10.1"
+
+//+-------------------------------------------------------------------------
+//  CMC_DATA
+//  CMC_RESPONSE
+//
+//  Certificate Management Messages over CMS (CMC) PKIData and Response
+//  messages.
+//
+//  For CMC_DATA, pvStructInfo points to a CMC_DATA_INFO.
+//  CMC_DATA_INFO contains optional arrays of tagged attributes, requests,
+//  content info and/or arbitrary other messages.
+//
+//  For CMC_RESPONSE, pvStructInfo points to a CMC_RESPONSE_INFO.
+//  CMC_RESPONSE_INFO is the same as CMC_DATA_INFO without the tagged
+//  requests.
+//--------------------------------------------------------------------------
+typedef struct _CMC_TAGGED_ATTRIBUTE {
+    DWORD               dwBodyPartID;
+    CRYPT_ATTRIBUTE     Attribute;
+} CMC_TAGGED_ATTRIBUTE, *PCMC_TAGGED_ATTRIBUTE;
+
+typedef struct _CMC_TAGGED_CERT_REQUEST {
+    DWORD               dwBodyPartID;
+    CRYPT_DER_BLOB      SignedCertRequest;
+} CMC_TAGGED_CERT_REQUEST, *PCMC_TAGGED_CERT_REQUEST;
+
+typedef struct _CMC_TAGGED_REQUEST {
+    DWORD               dwTaggedRequestChoice;
+    union {
+        // CMC_TAGGED_CERT_REQUEST_CHOICE
+        PCMC_TAGGED_CERT_REQUEST   pTaggedCertRequest;
+    };
+} CMC_TAGGED_REQUEST, *PCMC_TAGGED_REQUEST;
+
+#define CMC_TAGGED_CERT_REQUEST_CHOICE      1
+
+typedef struct _CMC_TAGGED_CONTENT_INFO {
+    DWORD               dwBodyPartID;
+    CRYPT_DER_BLOB      EncodedContentInfo;
+} CMC_TAGGED_CONTENT_INFO, *PCMC_TAGGED_CONTENT_INFO;
+
+typedef struct _CMC_TAGGED_OTHER_MSG {
+    DWORD               dwBodyPartID;
+    LPSTR               pszObjId;
+    CRYPT_OBJID_BLOB    Value;
+} CMC_TAGGED_OTHER_MSG, *PCMC_TAGGED_OTHER_MSG;
+
+
+// All the tagged arrays are optional
+typedef struct _CMC_DATA_INFO {
+    DWORD                       cTaggedAttribute;
+    PCMC_TAGGED_ATTRIBUTE       rgTaggedAttribute;
+    DWORD                       cTaggedRequest;
+    PCMC_TAGGED_REQUEST         rgTaggedRequest;
+    DWORD                       cTaggedContentInfo;
+    PCMC_TAGGED_CONTENT_INFO    rgTaggedContentInfo;
+    DWORD                       cTaggedOtherMsg;
+    PCMC_TAGGED_OTHER_MSG       rgTaggedOtherMsg;
+} CMC_DATA_INFO, *PCMC_DATA_INFO;
+
+
+// All the tagged arrays are optional
+typedef struct _CMC_RESPONSE_INFO {
+    DWORD                       cTaggedAttribute;
+    PCMC_TAGGED_ATTRIBUTE       rgTaggedAttribute;
+    DWORD                       cTaggedContentInfo;
+    PCMC_TAGGED_CONTENT_INFO    rgTaggedContentInfo;
+    DWORD                       cTaggedOtherMsg;
+    PCMC_TAGGED_OTHER_MSG       rgTaggedOtherMsg;
+} CMC_RESPONSE_INFO, *PCMC_RESPONSE_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  CMC_STATUS
+//
+//  Certificate Management Messages over CMS (CMC) Status.
+//
+//  pvStructInfo points to a CMC_STATUS_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CMC_PEND_INFO {
+    CRYPT_DATA_BLOB             PendToken;
+    FILETIME                    PendTime;
+} CMC_PEND_INFO, *PCMC_PEND_INFO;
+
+typedef struct _CMC_STATUS_INFO {
+    DWORD                       dwStatus;
+    DWORD                       cBodyList;
+    DWORD                       *rgdwBodyList;
+    LPWSTR                      pwszStatusString;   // OPTIONAL
+    DWORD                       dwOtherInfoChoice;
+    union  {
+        // CMC_OTHER_INFO_NO_CHOICE
+        //  none
+        // CMC_OTHER_INFO_FAIL_CHOICE
+        DWORD                       dwFailInfo;
+        // CMC_OTHER_INFO_PEND_CHOICE
+        PCMC_PEND_INFO              pPendInfo;
+    };
+} CMC_STATUS_INFO, *PCMC_STATUS_INFO;
+
+#define CMC_OTHER_INFO_NO_CHOICE        0
+#define CMC_OTHER_INFO_FAIL_CHOICE      1
+#define CMC_OTHER_INFO_PEND_CHOICE      2
+
+//
+// dwStatus values
+//
+
+// Request was granted
+#define CMC_STATUS_SUCCESS          0
+
+// Request failed, more information elsewhere in the message
+#define CMC_STATUS_FAILED           2
+
+// The request body part has not yet been processed. Requester is responsible
+// to poll back. May only be returned for certificate request operations.
+#define CMC_STATUS_PENDING          3
+
+// The requested operation is not supported
+#define CMC_STATUS_NO_SUPPORT       4
+
+// Confirmation using the idConfirmCertAcceptance control is required
+// before use of certificate
+#define CMC_STATUS_CONFIRM_REQUIRED 5
+
+
+//
+// dwFailInfo values
+//
+
+// Unrecognized or unsupported algorithm
+#define CMC_FAIL_BAD_ALG            0
+
+// Integrity check failed
+#define CMC_FAIL_BAD_MESSAGE_CHECK  1
+
+// Transaction not permitted or supported
+#define CMC_FAIL_BAD_REQUEST        2
+
+// Message time field was not sufficiently close to the system time
+#define CMC_FAIL_BAD_TIME           3
+
+// No certificate could be identified matching the provided criteria
+#define CMC_FAIL_BAD_CERT_ID        4
+
+// A requested X.509 extension is not supported by the recipient CA.
+#define CMC_FAIL_UNSUPORTED_EXT     5
+
+// Private key material must be supplied
+#define CMC_FAIL_MUST_ARCHIVE_KEYS  6
+
+// Identification Attribute failed to verify
+#define CMC_FAIL_BAD_IDENTITY       7
+
+// Server requires a POP proof before issuing certificate
+#define CMC_FAIL_POP_REQUIRED       8
+
+// POP processing failed
+#define CMC_FAIL_POP_FAILED         9
+
+// Server policy does not allow key re-use
+#define CMC_FAIL_NO_KEY_REUSE       10
+
+#define CMC_FAIL_INTERNAL_CA_ERROR  11
+
+#define CMC_FAIL_TRY_LATER          12
+
+
+//+-------------------------------------------------------------------------
+//  CMC_ADD_EXTENSIONS
+//
+//  Certificate Management Messages over CMS (CMC) Add Extensions control
+//  attribute.
+//
+//  pvStructInfo points to a CMC_ADD_EXTENSIONS_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CMC_ADD_EXTENSIONS_INFO {
+    DWORD                       dwCmcDataReference;
+    DWORD                       cCertReference;
+    DWORD                       *rgdwCertReference;
+    DWORD                       cExtension;
+    PCERT_EXTENSION             rgExtension;
+} CMC_ADD_EXTENSIONS_INFO, *PCMC_ADD_EXTENSIONS_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  CMC_ADD_ATTRIBUTES
+//
+//  Certificate Management Messages over CMS (CMC) Add Attributes control
+//  attribute.
+//
+//  pvStructInfo points to a CMC_ADD_ATTRIBUTES_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CMC_ADD_ATTRIBUTES_INFO {
+    DWORD                       dwCmcDataReference;
+    DWORD                       cCertReference;
+    DWORD                       *rgdwCertReference;
+    DWORD                       cAttribute;
+    PCRYPT_ATTRIBUTE            rgAttribute;
+} CMC_ADD_ATTRIBUTES_INFO, *PCMC_ADD_ATTRIBUTES_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  X509_CERTIFICATE_TEMPLATE
+//  szOID_CERTIFICATE_TEMPLATE
+//
+//  pvStructInfo points to following CERT_TEMPLATE_EXT data structure.
+//
+//--------------------------------------------------------------------------
+typedef struct _CERT_TEMPLATE_EXT {
+    LPSTR               pszObjId;
+    DWORD               dwMajorVersion;
+    BOOL                fMinorVersion;      // TRUE for a minor version
+    DWORD               dwMinorVersion;
+} CERT_TEMPLATE_EXT, *PCERT_TEMPLATE_EXT;
+
+
+//+=========================================================================
+//  Object IDentifier (OID) Installable Functions:  Data Structures and APIs
+//==========================================================================
+
+typedef void *HCRYPTOIDFUNCSET;
+typedef void *HCRYPTOIDFUNCADDR;
+
+// Predefined OID Function Names
+#define CRYPT_OID_ENCODE_OBJECT_FUNC        "CryptDllEncodeObject"
+#define CRYPT_OID_DECODE_OBJECT_FUNC        "CryptDllDecodeObject"
+#define CRYPT_OID_ENCODE_OBJECT_EX_FUNC     "CryptDllEncodeObjectEx"
+#define CRYPT_OID_DECODE_OBJECT_EX_FUNC     "CryptDllDecodeObjectEx"
+#define CRYPT_OID_CREATE_COM_OBJECT_FUNC    "CryptDllCreateCOMObject"
+#define CRYPT_OID_VERIFY_REVOCATION_FUNC    "CertDllVerifyRevocation"
+#define CRYPT_OID_VERIFY_CTL_USAGE_FUNC     "CertDllVerifyCTLUsage"
+#define CRYPT_OID_FORMAT_OBJECT_FUNC        "CryptDllFormatObject"
+#define CRYPT_OID_FIND_OID_INFO_FUNC        "CryptDllFindOIDInfo"
+#define CRYPT_OID_FIND_LOCALIZED_NAME_FUNC  "CryptDllFindLocalizedName"
+
+
+// CryptDllEncodeObject has same function signature as CryptEncodeObject.
+
+// CryptDllDecodeObject has same function signature as CryptDecodeObject.
+
+// CryptDllEncodeObjectEx has same function signature as CryptEncodeObjectEx.
+// The Ex version MUST support the CRYPT_ENCODE_ALLOC_FLAG option.
+//
+// If an Ex function isn't installed or registered, then, attempts to find
+// a non-EX version. If the ALLOC flag is set, then, CryptEncodeObjectEx,
+// does the allocation and calls the non-EX version twice.
+
+// CryptDllDecodeObjectEx has same function signature as CryptDecodeObjectEx.
+// The Ex version MUST support the CRYPT_DECODE_ALLOC_FLAG option.
+//
+// If an Ex function isn't installed or registered, then, attempts to find
+// a non-EX version. If the ALLOC flag is set, then, CryptDecodeObjectEx,
+// does the allocation and calls the non-EX version twice.
+
+// CryptDllCreateCOMObject has the following signature:
+//      BOOL WINAPI CryptDllCreateCOMObject(
+//          IN DWORD dwEncodingType,
+//          IN LPCSTR pszOID,
+//          IN PCRYPT_DATA_BLOB pEncodedContent,
+//          IN DWORD dwFlags,
+//          IN REFIID riid,
+//          OUT void **ppvObj);
+
+// CertDllVerifyRevocation has the same signature as CertVerifyRevocation
+//  (See CertVerifyRevocation for details on when called)
+
+// CertDllVerifyCTLUsage has the same signature as CertVerifyCTLUsage
+
+// CryptDllFindOIDInfo currently is only used to store values used by
+// CryptFindOIDInfo. See CryptFindOIDInfo() for more details.
+
+// CryptDllFindLocalizedName is only used to store localized string
+// values used by CryptFindLocalizedName. See CryptFindLocalizedName() for
+// more details.
+
+//  Example of a complete OID Function Registry Name:
+//    HKEY_LOCAL_MACHINE\Software\Microsoft\Cryptography\OID
+//      Encoding Type 1\CryptDllEncodeObject\1.2.3
+//
+//  The key's L"Dll" value contains the name of the Dll.
+//  The key's L"FuncName" value overrides the default function name
+#define CRYPT_OID_REGPATH "Software\\Microsoft\\Cryptography\\OID"
+#define CRYPT_OID_REG_ENCODING_TYPE_PREFIX  "EncodingType "
+#define CRYPT_OID_REG_DLL_VALUE_NAME        L"Dll"
+#define CRYPT_OID_REG_FUNC_NAME_VALUE_NAME  L"FuncName"
+#define CRYPT_OID_REG_FUNC_NAME_VALUE_NAME_A "FuncName"
+
+// CRYPT_INSTALL_OID_FUNC_BEFORE_FLAG can be set in the key's L"CryptFlags"
+// value to register the functions before the installed functions.
+//
+// CryptSetOIDFunctionValue must be called to set this value. L"CryptFlags"
+// must be set using a dwValueType of REG_DWORD.
+#define CRYPT_OID_REG_FLAGS_VALUE_NAME      L"CryptFlags"
+
+// OID used for Default OID functions
+#define CRYPT_DEFAULT_OID                   "DEFAULT"
+
+typedef struct _CRYPT_OID_FUNC_ENTRY {
+    LPCSTR  pszOID;
+    void    *pvFuncAddr;
+} CRYPT_OID_FUNC_ENTRY, *PCRYPT_OID_FUNC_ENTRY;
+
+
+#define CRYPT_INSTALL_OID_FUNC_BEFORE_FLAG  1
+
+
+//+-------------------------------------------------------------------------
+//  Install a set of callable OID function addresses.
+//
+//  By default the functions are installed at end of the list.
+//  Set CRYPT_INSTALL_OID_FUNC_BEFORE_FLAG to install at beginning of list.
+//
+//  hModule should be updated with the hModule passed to DllMain to prevent
+//  the Dll containing the function addresses from being unloaded by
+//  CryptGetOIDFuncAddress/CryptFreeOIDFunctionAddress. This would be the
+//  case when the Dll has also regsvr32'ed OID functions via
+//  CryptRegisterOIDFunction.
+//
+//  DEFAULT functions are installed by setting rgFuncEntry[].pszOID =
+//  CRYPT_DEFAULT_OID.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptInstallOIDFunctionAddress(
+    IN HMODULE hModule,         // hModule passed to DllMain
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN DWORD cFuncEntry,
+    IN const CRYPT_OID_FUNC_ENTRY rgFuncEntry[],
+    IN DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Initialize and return handle to the OID function set identified by its
+//  function name.
+//
+//  If the set already exists, a handle to the existing set is returned.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCRYPTOIDFUNCSET
+WINAPI
+CryptInitOIDFunctionSet(
+    IN LPCSTR pszFuncName,
+    IN DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Search the list of installed functions for an encoding type and OID match.
+//  If not found, search the registry.
+//
+//  For success, returns TRUE with *ppvFuncAddr updated with the function's
+//  address and *phFuncAddr updated with the function address's handle.
+//  The function's handle is AddRef'ed. CryptFreeOIDFunctionAddress needs to
+//  be called to release it.
+//
+//  For a registry match, the Dll containing the function is loaded.
+//
+//  By default, both the registered and installed function lists are searched.
+//  Set CRYPT_GET_INSTALLED_OID_FUNC_FLAG to only search the installed list
+//  of functions. This flag would be set by a registered function to get
+//  the address of a pre-installed function it was replacing. For example,
+//  the registered function might handle a new special case and call the
+//  pre-installed function to handle the remaining cases.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetOIDFunctionAddress(
+    IN HCRYPTOIDFUNCSET hFuncSet,
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszOID,
+    IN DWORD dwFlags,
+    OUT void **ppvFuncAddr,
+    OUT HCRYPTOIDFUNCADDR *phFuncAddr
+    );
+
+#define CRYPT_GET_INSTALLED_OID_FUNC_FLAG       0x1
+
+
+//+-------------------------------------------------------------------------
+//  Get the list of registered default Dll entries for the specified
+//  function set and encoding type.
+//
+//  The returned list consists of none, one or more null terminated Dll file
+//  names. The list is terminated with an empty (L"\0") Dll file name.
+//  For example: L"first.dll" L"\0" L"second.dll" L"\0" L"\0"
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetDefaultOIDDllList(
+    IN HCRYPTOIDFUNCSET hFuncSet,
+    IN DWORD dwEncodingType,
+    OUT LPWSTR pwszDllList,
+    IN OUT DWORD *pcchDllList
+    );
+
+//+-------------------------------------------------------------------------
+//  Either: get the first or next installed DEFAULT function OR
+//  load the Dll containing the DEFAULT function.
+//
+//  If pwszDll is NULL, search the list of installed DEFAULT functions.
+//  *phFuncAddr must be set to NULL to get the first installed function.
+//  Successive installed functions are returned by setting *phFuncAddr
+//  to the hFuncAddr returned by the previous call.
+//
+//  If pwszDll is NULL, the input *phFuncAddr
+//  is always CryptFreeOIDFunctionAddress'ed by this function, even for
+//  an error.
+//
+//  If pwszDll isn't NULL, then, attempts to load the Dll and the DEFAULT
+//  function. *phFuncAddr is ignored upon entry and isn't
+//  CryptFreeOIDFunctionAddress'ed.
+//
+//  For success, returns TRUE with *ppvFuncAddr updated with the function's
+//  address and *phFuncAddr updated with the function address's handle.
+//  The function's handle is AddRef'ed. CryptFreeOIDFunctionAddress needs to
+//  be called to release it or CryptGetDefaultOIDFunctionAddress can also
+//  be called for a NULL pwszDll.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetDefaultOIDFunctionAddress(
+    IN HCRYPTOIDFUNCSET hFuncSet,
+    IN DWORD dwEncodingType,
+    IN OPTIONAL LPCWSTR pwszDll,
+    IN DWORD dwFlags,
+    OUT void **ppvFuncAddr,
+    IN OUT HCRYPTOIDFUNCADDR *phFuncAddr
+    );
+
+//+-------------------------------------------------------------------------
+//  Releases the handle AddRef'ed and returned by CryptGetOIDFunctionAddress
+//  or CryptGetDefaultOIDFunctionAddress.
+//
+//  If a Dll was loaded for the function its unloaded. However, before doing
+//  the unload, the DllCanUnloadNow function exported by the loaded Dll is
+//  called. It should return S_FALSE to inhibit the unload or S_TRUE to enable
+//  the unload. If the Dll doesn't export DllCanUnloadNow, the Dll is unloaded.
+//
+//  DllCanUnloadNow has the following signature:
+//      STDAPI  DllCanUnloadNow(void);
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptFreeOIDFunctionAddress(
+    IN HCRYPTOIDFUNCADDR hFuncAddr,
+    IN DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Register the Dll containing the function to be called for the specified
+//  encoding type, function name and OID.
+//
+//  pwszDll may contain environment-variable strings
+//  which are ExpandEnvironmentStrings()'ed before loading the Dll.
+//
+//  In addition to registering the DLL, you may override the
+//  name of the function to be called. For example,
+//      pszFuncName = "CryptDllEncodeObject",
+//      pszOverrideFuncName = "MyEncodeXyz".
+//  This allows a Dll to export multiple OID functions for the same
+//  function name without needing to interpose its own OID dispatcher function.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptRegisterOIDFunction(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN LPCSTR pszOID,
+    IN OPTIONAL LPCWSTR pwszDll,
+    IN OPTIONAL LPCSTR pszOverrideFuncName
+    );
+
+//+-------------------------------------------------------------------------
+//  Unregister the Dll containing the function to be called for the specified
+//  encoding type, function name and OID.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUnregisterOIDFunction(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN LPCSTR pszOID
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Register the Dll containing the default function to be called for the
+//  specified encoding type and function name.
+//
+//  Unlike CryptRegisterOIDFunction, you can't override the function name
+//  needing to be exported by the Dll.
+//
+//  The Dll is inserted before the entry specified by dwIndex.
+//    dwIndex == 0, inserts at the beginning.
+//    dwIndex == CRYPT_REGISTER_LAST_INDEX, appends at the end.
+//
+//  pwszDll may contain environment-variable strings
+//  which are ExpandEnvironmentStrings()'ed before loading the Dll.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptRegisterDefaultOIDFunction(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN DWORD dwIndex,
+    IN LPCWSTR pwszDll
+    );
+
+#define CRYPT_REGISTER_FIRST_INDEX   0
+#define CRYPT_REGISTER_LAST_INDEX    0xFFFFFFFF
+
+//+-------------------------------------------------------------------------
+//  Unregister the Dll containing the default function to be called for
+//  the specified encoding type and function name.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUnregisterDefaultOIDFunction(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN LPCWSTR pwszDll
+    );
+
+//+-------------------------------------------------------------------------
+//  Set the value for the specified encoding type, function name, OID and
+//  value name.
+//
+//  See RegSetValueEx for the possible value types.
+//
+//  String types are UNICODE.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSetOIDFunctionValue(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN LPCSTR pszOID,
+    IN LPCWSTR pwszValueName,
+    IN DWORD dwValueType,
+    IN const BYTE *pbValueData,
+    IN DWORD cbValueData
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the value for the specified encoding type, function name, OID and
+//  value name.
+//
+//  See RegEnumValue for the possible value types.
+//
+//  String types are UNICODE.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetOIDFunctionValue(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN LPCSTR pszOID,
+    IN LPCWSTR pwszValueName,
+    OUT DWORD *pdwValueType,
+    OUT BYTE *pbValueData,
+    IN OUT DWORD *pcbValueData
+    );
+
+typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_FUNC)(
+    IN DWORD dwEncodingType,
+    IN LPCSTR pszFuncName,
+    IN LPCSTR pszOID,
+    IN DWORD cValue,
+    IN const DWORD rgdwValueType[],
+    IN LPCWSTR const rgpwszValueName[],
+    IN const BYTE * const rgpbValueData[],
+    IN const DWORD rgcbValueData[],
+    IN void *pvArg
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the OID functions identified by their encoding type,
+//  function name and OID.
+//
+//  pfnEnumOIDFunc is called for each registry key matching the input
+//  parameters. Setting dwEncodingType to CRYPT_MATCH_ANY_ENCODING_TYPE matches
+//  any. Setting pszFuncName or pszOID to NULL matches any.
+//
+//  Set pszOID == CRYPT_DEFAULT_OID to restrict the enumeration to only the
+//  DEFAULT functions
+//
+//  String types are UNICODE.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptEnumOIDFunction(
+    IN DWORD dwEncodingType,
+    IN OPTIONAL LPCSTR pszFuncName,
+    IN OPTIONAL LPCSTR pszOID,
+    IN DWORD dwFlags,
+    IN void *pvArg,
+    IN PFN_CRYPT_ENUM_OID_FUNC pfnEnumOIDFunc
+    );
+
+#define CRYPT_MATCH_ANY_ENCODING_TYPE   0xFFFFFFFF
+
+
+//+=========================================================================
+//  Object IDentifier (OID) Information:  Data Structures and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  OID Information
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_OID_INFO {
+    DWORD           cbSize;
+    LPCSTR          pszOID;
+    LPCWSTR         pwszName;
+    DWORD           dwGroupId;
+    union {
+        DWORD       dwValue;
+        ALG_ID      Algid;
+        DWORD       dwLength;
+    };
+    CRYPT_DATA_BLOB ExtraInfo;
+} CRYPT_OID_INFO, *PCRYPT_OID_INFO;
+typedef const CRYPT_OID_INFO CCRYPT_OID_INFO, *PCCRYPT_OID_INFO;
+
+//+-------------------------------------------------------------------------
+//  OID Group IDs
+//--------------------------------------------------------------------------
+#define CRYPT_HASH_ALG_OID_GROUP_ID             1
+#define CRYPT_ENCRYPT_ALG_OID_GROUP_ID          2
+#define CRYPT_PUBKEY_ALG_OID_GROUP_ID           3
+#define CRYPT_SIGN_ALG_OID_GROUP_ID             4
+#define CRYPT_RDN_ATTR_OID_GROUP_ID             5
+#define CRYPT_EXT_OR_ATTR_OID_GROUP_ID          6
+#define CRYPT_ENHKEY_USAGE_OID_GROUP_ID         7
+#define CRYPT_POLICY_OID_GROUP_ID               8
+#define CRYPT_TEMPLATE_OID_GROUP_ID             9
+#define CRYPT_LAST_OID_GROUP_ID                 9
+
+#define CRYPT_FIRST_ALG_OID_GROUP_ID            CRYPT_HASH_ALG_OID_GROUP_ID
+#define CRYPT_LAST_ALG_OID_GROUP_ID             CRYPT_SIGN_ALG_OID_GROUP_ID
+
+
+// The CRYPT_*_ALG_OID_GROUP_ID's have an Algid. The CRYPT_RDN_ATTR_OID_GROUP_ID
+// has a dwLength. The CRYPT_EXT_OR_ATTR_OID_GROUP_ID,
+// CRYPT_ENHKEY_USAGE_OID_GROUP_ID, CRYPT_POLICY_OID_GROUP_ID or
+// CRYPT_TEMPLATE_OID_GROUP_ID don't have a dwValue.
+//
+
+// CRYPT_PUBKEY_ALG_OID_GROUP_ID has the following optional ExtraInfo:
+//  DWORD[0] - Flags. CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG can be set to
+//             inhibit the reformatting of the signature before
+//             CryptVerifySignature is called or after CryptSignHash
+//             is called. CRYPT_OID_USE_PUBKEY_PARA_FOR_PKCS7_FLAG can
+//             be set to include the public key algorithm's parameters
+//             in the PKCS7's digestEncryptionAlgorithm's parameters.
+//             CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG can be set to omit
+//             NULL parameters when encoding.
+
+#define CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG     0x1
+#define CRYPT_OID_USE_PUBKEY_PARA_FOR_PKCS7_FLAG    0x2
+#define CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG       0x4
+
+// CRYPT_SIGN_ALG_OID_GROUP_ID has the following optional ExtraInfo:
+//  DWORD[0] - Public Key Algid.
+//  DWORD[1] - Flags. Same as above for CRYPT_PUBKEY_ALG_OID_GROUP_ID.
+//  DWORD[2] - Optional CryptAcquireContext(CRYPT_VERIFYCONTEXT)'s dwProvType.
+//             If omitted or 0, uses Public Key Algid to select
+//             appropriate dwProvType for signature verification.
+
+// CRYPT_RDN_ATTR_OID_GROUP_ID has the following optional ExtraInfo:
+//  Array of DWORDs:
+//   [0 ..] - Null terminated list of acceptable RDN attribute
+//            value types. An empty list implies CERT_RDN_PRINTABLE_STRING,
+//            CERT_RDN_UNICODE_STRING, 0.
+
+//+-------------------------------------------------------------------------
+//  Find OID information. Returns NULL if unable to find any information
+//  for the specified key and group. Note, returns a pointer to a constant
+//  data structure. The returned pointer MUST NOT be freed.
+//
+//  dwKeyType's:
+//    CRYPT_OID_INFO_OID_KEY, pvKey points to a szOID
+//    CRYPT_OID_INFO_NAME_KEY, pvKey points to a wszName
+//    CRYPT_OID_INFO_ALGID_KEY, pvKey points to an ALG_ID
+//    CRYPT_OID_INFO_SIGN_KEY, pvKey points to an array of two ALG_ID's:
+//      ALG_ID[0] - Hash Algid
+//      ALG_ID[1] - PubKey Algid
+//
+//  Setting dwGroupId to 0, searches all groups according to the dwKeyType.
+//  Otherwise, only the dwGroupId is searched.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCRYPT_OID_INFO
+WINAPI
+CryptFindOIDInfo(
+    IN DWORD dwKeyType,
+    IN void *pvKey,
+    IN DWORD dwGroupId
+    );
+
+#define CRYPT_OID_INFO_OID_KEY           1
+#define CRYPT_OID_INFO_NAME_KEY          2
+#define CRYPT_OID_INFO_ALGID_KEY         3
+#define CRYPT_OID_INFO_SIGN_KEY          4
+
+//+-------------------------------------------------------------------------
+//  Register OID information. The OID information specified in the
+//  CCRYPT_OID_INFO structure is persisted to the registry.
+//
+//  crypt32.dll contains information for the commonly known OIDs. This function
+//  allows applications to augment crypt32.dll's OID information. During
+//  CryptFindOIDInfo's first call, the registered OID information is installed.
+//
+//  By default the registered OID information is installed after crypt32.dll's
+//  OID entries. Set CRYPT_INSTALL_OID_INFO_BEFORE_FLAG to install before.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptRegisterOIDInfo(
+    IN PCCRYPT_OID_INFO pInfo,
+    IN DWORD dwFlags
+    );
+
+#define CRYPT_INSTALL_OID_INFO_BEFORE_FLAG  1
+
+//+-------------------------------------------------------------------------
+//  Unregister OID information. Only the pszOID and dwGroupId fields are
+//  used to identify the OID information to be unregistered.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUnregisterOIDInfo(
+    IN PCCRYPT_OID_INFO pInfo
+    );
+
+// If the callback returns FALSE, stops the enumeration.
+typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_INFO)(
+    IN PCCRYPT_OID_INFO pInfo,
+    IN void *pvArg
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the OID information.
+//
+//  pfnEnumOIDInfo is called for each OID information entry.
+//
+//  Setting dwGroupId to 0 matches all groups. Otherwise, only enumerates
+//  entries in the specified group.
+//
+//  dwFlags currently isn't used and must be set to 0.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptEnumOIDInfo(
+    IN DWORD dwGroupId,
+    IN DWORD dwFlags,
+    IN void *pvArg,
+    IN PFN_CRYPT_ENUM_OID_INFO pfnEnumOIDInfo
+    );
+
+//+-------------------------------------------------------------------------
+//  Find the localized name for the specified name. For example, find the
+//  localized name for the "Root" system store name. A case insensitive
+//  string comparison is done.
+//
+//  Returns NULL if unable to find the the specified name.
+//
+//  Localized names for the predefined system stores ("Root", "My") and
+//  predefined physical stores (".Default", ".LocalMachine") are pre-installed
+//  as resource strings in crypt32.dll. CryptSetOIDFunctionValue can be called
+//  as follows to register additional localized strings:
+//      dwEncodingType = CRYPT_LOCALIZED_NAME_ENCODING_TYPE
+//      pszFuncName = CRYPT_OID_FIND_LOCALIZED_NAME_FUNC
+//      pszOID = CRYPT_LOCALIZED_NAME_OID
+//      pwszValueName = Name to be localized, for example, L"ApplicationStore"
+//      dwValueType = REG_SZ
+//      pbValueData = pointer to the UNICODE localized string
+//      cbValueData = (wcslen(UNICODE localized string) + 1) * sizeof(WCHAR)
+//
+//  To unregister, set pbValueData to NULL and cbValueData to 0.
+//
+//  The registered names are searched before the pre-installed names.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+LPCWSTR
+WINAPI
+CryptFindLocalizedName(
+    IN LPCWSTR pwszCryptName
+    );
+
+#define CRYPT_LOCALIZED_NAME_ENCODING_TYPE  0
+#define CRYPT_LOCALIZED_NAME_OID            "LocalizedNames"
+
+//+=========================================================================
+//  Low Level Cryptographic Message Data Structures and APIs
+//==========================================================================
+
+typedef void *HCRYPTMSG;
+
+#define szOID_PKCS_7_DATA               "1.2.840.113549.1.7.1"
+#define szOID_PKCS_7_SIGNED             "1.2.840.113549.1.7.2"
+#define szOID_PKCS_7_ENVELOPED          "1.2.840.113549.1.7.3"
+#define szOID_PKCS_7_SIGNEDANDENVELOPED "1.2.840.113549.1.7.4"
+#define szOID_PKCS_7_DIGESTED           "1.2.840.113549.1.7.5"
+#define szOID_PKCS_7_ENCRYPTED          "1.2.840.113549.1.7.6"
+
+#define szOID_PKCS_9_CONTENT_TYPE       "1.2.840.113549.1.9.3"
+#define szOID_PKCS_9_MESSAGE_DIGEST     "1.2.840.113549.1.9.4"
+
+//+-------------------------------------------------------------------------
+//  Message types
+//--------------------------------------------------------------------------
+#define CMSG_DATA                    1
+#define CMSG_SIGNED                  2
+#define CMSG_ENVELOPED               3
+#define CMSG_SIGNED_AND_ENVELOPED    4
+#define CMSG_HASHED                  5
+#define CMSG_ENCRYPTED               6
+
+//+-------------------------------------------------------------------------
+//  Message Type Bit Flags
+//--------------------------------------------------------------------------
+#define CMSG_ALL_FLAGS                   (~0UL)
+#define CMSG_DATA_FLAG                   (1 << CMSG_DATA)
+#define CMSG_SIGNED_FLAG                 (1 << CMSG_SIGNED)
+#define CMSG_ENVELOPED_FLAG              (1 << CMSG_ENVELOPED)
+#define CMSG_SIGNED_AND_ENVELOPED_FLAG   (1 << CMSG_SIGNED_AND_ENVELOPED)
+#define CMSG_HASHED_FLAG                 (1 << CMSG_HASHED)
+#define CMSG_ENCRYPTED_FLAG              (1 << CMSG_ENCRYPTED)
+
+
+//+-------------------------------------------------------------------------
+//  Certificate Issuer and SerialNumber
+//--------------------------------------------------------------------------
+typedef struct _CERT_ISSUER_SERIAL_NUMBER {
+    CERT_NAME_BLOB      Issuer;
+    CRYPT_INTEGER_BLOB  SerialNumber;
+} CERT_ISSUER_SERIAL_NUMBER, *PCERT_ISSUER_SERIAL_NUMBER;
+
+//+-------------------------------------------------------------------------
+//  Certificate Identifier
+//--------------------------------------------------------------------------
+typedef struct _CERT_ID {
+    DWORD   dwIdChoice;
+    union {
+        // CERT_ID_ISSUER_SERIAL_NUMBER
+        CERT_ISSUER_SERIAL_NUMBER   IssuerSerialNumber;
+        // CERT_ID_KEY_IDENTIFIER
+        CRYPT_HASH_BLOB             KeyId;
+        // CERT_ID_SHA1_HASH
+        CRYPT_HASH_BLOB             HashId;
+    };
+} CERT_ID, *PCERT_ID;
+
+#define CERT_ID_ISSUER_SERIAL_NUMBER    1
+#define CERT_ID_KEY_IDENTIFIER          2
+#define CERT_ID_SHA1_HASH               3
+
+
+//+-------------------------------------------------------------------------
+//  The message encode information (pvMsgEncodeInfo) is message type dependent
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_DATA: pvMsgEncodeInfo = NULL
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNED
+//
+//  The pCertInfo in the CMSG_SIGNER_ENCODE_INFO provides the Issuer, SerialNumber
+//  and PublicKeyInfo.Algorithm. The PublicKeyInfo.Algorithm implicitly
+//  specifies the HashEncryptionAlgorithm to be used.
+//
+//  If the SignerId is present with a nonzero dwIdChoice its used instead
+//  of the Issuer and SerialNumber in pCertInfo.
+//
+//  CMS supports the KEY_IDENTIFIER and ISSUER_SERIAL_NUMBER CERT_IDs. PKCS #7
+//  version 1.5 only supports the ISSUER_SERIAL_NUMBER CERT_ID choice.
+//
+//  If HashEncryptionAlgorithm is present and not NULL its used instead of
+//  the PublicKeyInfo.Algorithm.
+//
+//  Note, for RSA, the hash encryption algorithm is normally the same as
+//  the public key algorithm. For DSA, the hash encryption algorithm is
+//  normally a DSS signature algorithm.
+//
+//  pvHashEncryptionAuxInfo currently isn't used and must be set to NULL if
+//  present in the data structure.
+//
+//  The hCryptProv and dwKeySpec specify the private key to use. If dwKeySpec
+//  == 0, then, defaults to AT_SIGNATURE.
+//
+//  If the HashEncryptionAlgorithm is set to szOID_PKIX_NO_SIGNATURE, then,
+//  the signature value only contains the hash octets. hCryptProv must still
+//  be specified. However, since a private key isn't used the hCryptProv can be
+//  acquired using CRYPT_VERIFYCONTEXT.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags
+//  passed to CryptMsgOpenToEncode(), the signer hCryptProv's are released.
+//
+//  pvHashAuxInfo currently isn't used and must be set to NULL.
+//
+//  CMS signed messages allow the inclusion of Attribute Certs.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_SIGNER_ENCODE_INFO {
+    DWORD                       cbSize;
+    PCERT_INFO                  pCertInfo;
+    HCRYPTPROV                  hCryptProv;
+    DWORD                       dwKeySpec;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    void                        *pvHashAuxInfo;
+    DWORD                       cAuthAttr;
+    PCRYPT_ATTRIBUTE            rgAuthAttr;
+    DWORD                       cUnauthAttr;
+    PCRYPT_ATTRIBUTE            rgUnauthAttr;
+
+#ifdef CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS
+    CERT_ID                     SignerId;
+    CRYPT_ALGORITHM_IDENTIFIER  HashEncryptionAlgorithm;
+    void                        *pvHashEncryptionAuxInfo;
+#endif
+} CMSG_SIGNER_ENCODE_INFO, *PCMSG_SIGNER_ENCODE_INFO;
+
+typedef struct _CMSG_SIGNED_ENCODE_INFO {
+    DWORD                       cbSize;
+    DWORD                       cSigners;
+    PCMSG_SIGNER_ENCODE_INFO    rgSigners;
+    DWORD                       cCertEncoded;
+    PCERT_BLOB                  rgCertEncoded;
+    DWORD                       cCrlEncoded;
+    PCRL_BLOB                   rgCrlEncoded;
+
+#ifdef CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS
+    DWORD                       cAttrCertEncoded;
+    PCERT_BLOB                  rgAttrCertEncoded;
+#endif
+} CMSG_SIGNED_ENCODE_INFO, *PCMSG_SIGNED_ENCODE_INFO;
+
+//+-------------------------------------------------------------------------
+//  CMSG_ENVELOPED
+//
+//  The PCERT_INFO for the rgRecipients provides the Issuer, SerialNumber
+//  and PublicKeyInfo. The PublicKeyInfo.Algorithm implicitly
+//  specifies the KeyEncryptionAlgorithm to be used.
+//
+//  The PublicKeyInfo.PublicKey in PCERT_INFO is used to encrypt the content
+//  encryption key for the recipient.
+//
+//  hCryptProv is used to do the content encryption, recipient key encryption
+//  and export. The hCryptProv's private keys aren't used. If hCryptProv
+//  is NULL, a default hCryptProv is chosen according to the
+//  ContentEncryptionAlgorithm and the first recipient KeyEncryptionAlgorithm.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags
+//  passed to CryptMsgOpenToEncode(), the envelope's hCryptProv is released.
+//
+//  Note: CAPI currently doesn't support more than one KeyEncryptionAlgorithm
+//  per provider. This will need to be fixed.
+//
+//  Currently, pvEncryptionAuxInfo is only defined for RC2 or RC4 encryption
+//  algorithms. Otherwise, its not used and must be set to NULL.
+//  See CMSG_RC2_AUX_INFO for the RC2 encryption algorithms.
+//  See CMSG_RC4_AUX_INFO for the RC4 encryption algorithms.
+//
+//  To enable SP3 compatible encryption, pvEncryptionAuxInfo should point to
+//  a CMSG_SP3_COMPATIBLE_AUX_INFO data structure.
+//
+//  To enable the CMS envelope enhancements, rgpRecipients must be set to
+//  NULL, and rgCmsRecipients updated to point to an array of
+//  CMSG_RECIPIENT_ENCODE_INFO's.
+//
+//  Also, CMS envelope enhancements support the inclusion of a bag of
+//  Certs, CRLs, Attribute Certs and/or Unprotected Attributes.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_RECIPIENT_ENCODE_INFO CMSG_RECIPIENT_ENCODE_INFO,
+    *PCMSG_RECIPIENT_ENCODE_INFO;
+
+typedef struct _CMSG_ENVELOPED_ENCODE_INFO {
+    DWORD                       cbSize;
+    HCRYPTPROV                  hCryptProv;
+    CRYPT_ALGORITHM_IDENTIFIER  ContentEncryptionAlgorithm;
+    void                        *pvEncryptionAuxInfo;
+    DWORD                       cRecipients;
+
+    // The following array may only be used for transport recipients identified
+    // by their IssuereAndSerialNumber. If rgpRecipients != NULL, then,
+    // the rgCmsRecipients must be NULL.
+    PCERT_INFO                  *rgpRecipients;
+
+#ifdef CMSG_ENVELOPED_ENCODE_INFO_HAS_CMS_FIELDS
+    // If rgCmsRecipients != NULL, then, the above rgpRecipients must be
+    // NULL.
+    PCMSG_RECIPIENT_ENCODE_INFO rgCmsRecipients;
+    DWORD                       cCertEncoded;
+    PCERT_BLOB                  rgCertEncoded;
+    DWORD                       cCrlEncoded;
+    PCRL_BLOB                   rgCrlEncoded;
+    DWORD                       cAttrCertEncoded;
+    PCERT_BLOB                  rgAttrCertEncoded;
+    DWORD                       cUnprotectedAttr;
+    PCRYPT_ATTRIBUTE            rgUnprotectedAttr;
+#endif
+} CMSG_ENVELOPED_ENCODE_INFO, *PCMSG_ENVELOPED_ENCODE_INFO;
+
+
+
+//+-------------------------------------------------------------------------
+//  Key Transport Recipient Encode Info
+//
+//  hCryptProv is used to do the recipient key encryption
+//  and export. The hCryptProv's private keys aren't used.
+//
+//  If hCryptProv is NULL, then, the hCryptProv specified in
+//  CMSG_ENVELOPED_ENCODE_INFO is used.
+//
+//  Note, even if CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags
+//  passed to CryptMsgOpenToEncode(), this hCryptProv isn't released.
+//
+//  CMS supports the KEY_IDENTIFIER and ISSUER_SERIAL_NUMBER CERT_IDs. PKCS #7
+//  version 1.5 only supports the ISSUER_SERIAL_NUMBER CERT_ID choice.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO {
+    DWORD                       cbSize;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    void                        *pvKeyEncryptionAuxInfo;
+    HCRYPTPROV                  hCryptProv;
+    CRYPT_BIT_BLOB              RecipientPublicKey;
+    CERT_ID                     RecipientId;
+} CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  Key Agreement Recipient Encode Info
+//
+//  If hCryptProv is NULL, then, the hCryptProv specified in
+//  CMSG_ENVELOPED_ENCODE_INFO is used.
+//
+//  For the CMSG_KEY_AGREE_STATIC_KEY_CHOICE, both the hCryptProv and
+//  dwKeySpec must be specified to select the sender's private key.
+//
+//  Note, even if CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags
+//  passed to CryptMsgOpenToEncode(), this hCryptProv isn't released.
+//
+//  CMS supports the KEY_IDENTIFIER and ISSUER_SERIAL_NUMBER CERT_IDs.
+//
+//  There is 1 key choice, ephemeral originator. The originator's ephemeral
+//  key is generated using the public key algorithm parameters shared
+//  amongst all the recipients.
+//
+//  There are 2 key choices: ephemeral originator or static sender. The
+//  originator's ephemeral key is generated using the public key algorithm
+//  parameters shared amongst all the recipients. For the static sender its
+//  private key is used. The hCryptProv and dwKeySpec specify the private key.
+//  The pSenderId identifies the certificate containing the sender's public key.
+//
+//  Currently, pvKeyEncryptionAuxInfo isn't used and must be set to NULL.
+//
+//  If KeyEncryptionAlgorithm.Parameters.cbData == 0, then, its Parameters
+//  are updated with the encoded KeyWrapAlgorithm.
+//
+//  Currently, pvKeyWrapAuxInfo is only defined for algorithms with
+//  RC2. Otherwise, its not used and must be set to NULL.
+//  When set for RC2 algorithms, points to a CMSG_RC2_AUX_INFO containing
+//  the RC2 effective key length.
+//
+//  Note, key agreement recipients are not supported in PKCS #7 version 1.5.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO {
+    DWORD                       cbSize;
+    CRYPT_BIT_BLOB              RecipientPublicKey;
+    CERT_ID                     RecipientId;
+
+    // Following fields are optional and only applicable to KEY_IDENTIFIER
+    // CERT_IDs.
+    FILETIME                    Date;
+    PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr;
+} CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO,
+    *PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO;
+
+typedef struct _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO {
+    DWORD                       cbSize;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    void                        *pvKeyEncryptionAuxInfo;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyWrapAlgorithm;
+    void                        *pvKeyWrapAuxInfo;
+
+    // The following hCryptProv and dwKeySpec must be specified for the
+    // CMSG_KEY_AGREE_STATIC_KEY_CHOICE.
+    //
+    // For CMSG_KEY_AGREE_EPHEMERAL_KEY_CHOICE, dwKeySpec isn't applicable
+    // and hCryptProv is optional.
+    HCRYPTPROV                  hCryptProv;
+    DWORD                       dwKeySpec;
+
+    DWORD                       dwKeyChoice;
+    union {
+        // CMSG_KEY_AGREE_EPHEMERAL_KEY_CHOICE
+        //
+        // The ephemeral public key algorithm and parameters.
+        PCRYPT_ALGORITHM_IDENTIFIER pEphemeralAlgorithm;
+
+        // CMSG_KEY_AGREE_STATIC_KEY_CHOICE
+        //
+        // The CertId of the sender's certificate
+        PCERT_ID                    pSenderId;
+    };
+    CRYPT_DATA_BLOB             UserKeyingMaterial;     // OPTIONAL
+
+    DWORD                                       cRecipientEncryptedKeys;
+    PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO   *rgpRecipientEncryptedKeys;
+} CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO;
+
+#define CMSG_KEY_AGREE_EPHEMERAL_KEY_CHOICE         1
+#define CMSG_KEY_AGREE_STATIC_KEY_CHOICE            2
+
+//+-------------------------------------------------------------------------
+//  Mail List Recipient Encode Info
+//
+//  There is 1 choice for the KeyEncryptionKey: an already created CSP key
+//  handle. For the key handle choice, hCryptProv must be nonzero. This key
+//  handle isn't destroyed.
+//
+//  Note, even if CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags
+//  passed to CryptMsgOpenToEncode(), this hCryptProv isn't released.
+//
+//  Currently, pvKeyEncryptionAuxInfo is only defined for RC2 key wrap
+//  algorithms. Otherwise, its not used and must be set to NULL.
+//  When set for RC2 algorithms, points to a CMSG_RC2_AUX_INFO containing
+//  the RC2 effective key length.
+//
+//  Note, mail list recipients are not supported in PKCS #7 version 1.5.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO {
+    DWORD                       cbSize;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    void                        *pvKeyEncryptionAuxInfo;
+    HCRYPTPROV                  hCryptProv;
+    DWORD                       dwKeyChoice;
+    union {
+        // CMSG_MAIL_LIST_HANDLE_KEY_CHOICE
+        HCRYPTKEY                   hKeyEncryptionKey;
+        // Reserve space for a potential pointer choice
+        void                        *pvKeyEncryptionKey;
+    };
+    CRYPT_DATA_BLOB             KeyId;
+
+    // Following fields are optional.
+    FILETIME                    Date;
+    PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr;
+} CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO, *PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO;
+
+#define CMSG_MAIL_LIST_HANDLE_KEY_CHOICE    1
+
+//+-------------------------------------------------------------------------
+//  Recipient Encode Info
+//
+//  Note, only key transport recipients are supported in PKCS #7 version 1.5.
+//--------------------------------------------------------------------------
+struct _CMSG_RECIPIENT_ENCODE_INFO {
+    DWORD   dwRecipientChoice;
+    union {
+        // CMSG_KEY_TRANS_RECIPIENT
+        PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO   pKeyTrans;
+        // CMSG_KEY_AGREE_RECIPIENT
+        PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO   pKeyAgree;
+        // CMSG_MAIL_LIST_RECIPIENT
+        PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO   pMailList;
+    };
+};
+
+
+#define CMSG_KEY_TRANS_RECIPIENT         1
+#define CMSG_KEY_AGREE_RECIPIENT         2
+#define CMSG_MAIL_LIST_RECIPIENT         3
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_RC2_AUX_INFO
+//
+//  AuxInfo for RC2 encryption algorithms. The pvEncryptionAuxInfo field
+//  in CMSG_ENCRYPTED_ENCODE_INFO should be updated to point to this
+//  structure. If not specified, defaults to 40 bit.
+//
+//  Note, this AuxInfo is only used when, the ContentEncryptionAlgorithm's
+//  Parameter.cbData is zero. Otherwise, the Parameters is decoded to
+//  get the bit length.
+//
+//  If CMSG_SP3_COMPATIBLE_ENCRYPT_FLAG is set in dwBitLen, then, SP3
+//  compatible encryption is done and the bit length is ignored.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_RC2_AUX_INFO {
+    DWORD                       cbSize;
+    DWORD                       dwBitLen;
+} CMSG_RC2_AUX_INFO, *PCMSG_RC2_AUX_INFO;
+
+//+-------------------------------------------------------------------------
+//  CMSG_SP3_COMPATIBLE_AUX_INFO
+//
+//  AuxInfo for enabling SP3 compatible encryption.
+//
+//  The CMSG_SP3_COMPATIBLE_ENCRYPT_FLAG is set in dwFlags to enable SP3
+//  compatible encryption. When set, uses zero salt instead of no salt,
+//  the encryption algorithm parameters are NULL instead of containing the
+//  encoded RC2 parameters or encoded IV octet string and the encrypted
+//  symmetric key is encoded little endian instead of big endian.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_SP3_COMPATIBLE_AUX_INFO {
+    DWORD                       cbSize;
+    DWORD                       dwFlags;
+} CMSG_SP3_COMPATIBLE_AUX_INFO, *PCMSG_SP3_COMPATIBLE_AUX_INFO;
+
+#define CMSG_SP3_COMPATIBLE_ENCRYPT_FLAG    0x80000000
+
+//+-------------------------------------------------------------------------
+//  CMSG_RC4_AUX_INFO
+//
+//  AuxInfo for RC4 encryption algorithms. The pvEncryptionAuxInfo field
+//  in CMSG_ENCRYPTED_ENCODE_INFO should be updated to point to this
+//  structure. If not specified, uses the CSP's default bit length with no
+//  salt. Note, the base CSP has a 40 bit default and the enhanced CSP has
+//  a 128 bit default.
+//
+//  If CMSG_RC4_NO_SALT_FLAG is set in dwBitLen, then, no salt is generated.
+//  Otherwise, (128 - dwBitLen)/8 bytes of salt are generated and encoded
+//  as an OCTET STRING in the algorithm parameters field.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_RC4_AUX_INFO {
+    DWORD                       cbSize;
+    DWORD                       dwBitLen;
+} CMSG_RC4_AUX_INFO, *PCMSG_RC4_AUX_INFO;
+
+#define CMSG_RC4_NO_SALT_FLAG               0x40000000
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNED_AND_ENVELOPED
+//
+//  For PKCS #7, a signed and enveloped message doesn't have the
+//  signer's authenticated or unauthenticated attributes. Otherwise, a
+//  combination of the CMSG_SIGNED_ENCODE_INFO and CMSG_ENVELOPED_ENCODE_INFO.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO {
+    DWORD                       cbSize;
+    CMSG_SIGNED_ENCODE_INFO     SignedInfo;
+    CMSG_ENVELOPED_ENCODE_INFO  EnvelopedInfo;
+} CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO, *PCMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO;
+
+//+-------------------------------------------------------------------------
+//  CMSG_HASHED
+//
+//  hCryptProv is used to do the hash. Doesn't need to use a private key.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags
+//  passed to CryptMsgOpenToEncode(), the hCryptProv is released.
+//
+//  If fDetachedHash is set, then, the encoded message doesn't contain
+//  any content (its treated as NULL Data)
+//
+//  pvHashAuxInfo currently isn't used and must be set to NULL.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_HASHED_ENCODE_INFO {
+    DWORD                       cbSize;
+    HCRYPTPROV                  hCryptProv;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    void                        *pvHashAuxInfo;
+} CMSG_HASHED_ENCODE_INFO, *PCMSG_HASHED_ENCODE_INFO;
+
+//+-------------------------------------------------------------------------
+//  CMSG_ENCRYPTED
+//
+//  The key used to encrypt the message is identified outside of the message
+//  content (for example, password).
+//
+//  The content input to CryptMsgUpdate has already been encrypted.
+//
+//  pvEncryptionAuxInfo currently isn't used and must be set to NULL.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_ENCRYPTED_ENCODE_INFO {
+    DWORD                       cbSize;
+    CRYPT_ALGORITHM_IDENTIFIER  ContentEncryptionAlgorithm;
+    void                        *pvEncryptionAuxInfo;
+} CMSG_ENCRYPTED_ENCODE_INFO, *PCMSG_ENCRYPTED_ENCODE_INFO;
+
+//+-------------------------------------------------------------------------
+//  This parameter allows messages to be of variable length with streamed
+//  output.
+//
+//  By default, messages are of a definite length and
+//  CryptMsgGetParam(CMSG_CONTENT_PARAM) is
+//  called to get the cryptographically processed content. Until closed,
+//  the handle keeps a copy of the processed content.
+//
+//  With streamed output, the processed content can be freed as its streamed.
+//
+//  If the length of the content to be updated is known at the time of the
+//  open, then, ContentLength should be set to that length. Otherwise, it
+//  should be set to CMSG_INDEFINITE_LENGTH.
+//--------------------------------------------------------------------------
+typedef BOOL (WINAPI *PFN_CMSG_STREAM_OUTPUT)(
+    IN const void *pvArg,
+    IN BYTE *pbData,
+    IN DWORD cbData,
+    IN BOOL fFinal
+    );
+
+#define CMSG_INDEFINITE_LENGTH       (0xFFFFFFFF)
+
+typedef struct _CMSG_STREAM_INFO {
+    DWORD                   cbContent;
+    PFN_CMSG_STREAM_OUTPUT  pfnStreamOutput;
+    void                    *pvArg;
+} CMSG_STREAM_INFO, *PCMSG_STREAM_INFO;
+
+//+-------------------------------------------------------------------------
+//  Open dwFlags
+//--------------------------------------------------------------------------
+#define CMSG_BARE_CONTENT_FLAG              0x00000001
+#define CMSG_LENGTH_ONLY_FLAG               0x00000002
+#define CMSG_DETACHED_FLAG                  0x00000004
+#define CMSG_AUTHENTICATED_ATTRIBUTES_FLAG  0x00000008
+#define CMSG_CONTENTS_OCTETS_FLAG           0x00000010
+#define CMSG_MAX_LENGTH_FLAG                0x00000020
+
+// When set, nonData type inner content is encapsulated within an
+// OCTET STRING. Applicable to both Signed and Enveloped messages.
+#define CMSG_CMS_ENCAPSULATED_CONTENT_FLAG  0x00000040
+
+// If set, then, the hCryptProv passed to CryptMsgOpenToEncode or
+// CryptMsgOpenToDecode is released on the final CryptMsgClose.
+// Not released if CryptMsgOpenToEncode or CryptMsgOpenToDecode fails.
+//
+// Note, the envelope recipient hCryptProv's aren't released.
+#define CMSG_CRYPT_RELEASE_CONTEXT_FLAG     0x00008000
+
+//+-------------------------------------------------------------------------
+//  Open a cryptographic message for encoding
+//
+//  If CMSG_BARE_CONTENT_FLAG is specified for a streamed message,
+//  the streamed output will not have an outer ContentInfo wrapper. This
+//  makes it suitable to be streamed into an enclosing message.
+//
+//  The pStreamInfo parameter needs to be set to stream the encoded message
+//  output.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCRYPTMSG
+WINAPI
+CryptMsgOpenToEncode(
+    IN DWORD dwMsgEncodingType,
+    IN DWORD dwFlags,
+    IN DWORD dwMsgType,
+    IN void const *pvMsgEncodeInfo,
+    IN OPTIONAL LPSTR pszInnerContentObjID,
+    IN OPTIONAL PCMSG_STREAM_INFO pStreamInfo
+    );
+
+//+-------------------------------------------------------------------------
+//  Calculate the length of an encoded cryptographic message.
+//
+//  Calculates the length of the encoded message given the
+//  message type, encoding parameters and total length of
+//  the data to be updated. Note, this might not be the exact length. However,
+//  it will always be greater than or equal to the actual length.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CryptMsgCalculateEncodedLength(
+    IN DWORD dwMsgEncodingType,
+    IN DWORD dwFlags,
+    IN DWORD dwMsgType,
+    IN void const *pvMsgEncodeInfo,
+    IN OPTIONAL LPSTR pszInnerContentObjID,
+    IN DWORD cbData
+    );
+
+//+-------------------------------------------------------------------------
+//  Open a cryptographic message for decoding
+//
+//  hCryptProv specifies the crypto provider to use for hashing and/or
+//  decrypting the message. If hCryptProv is NULL, a default crypt provider
+//  is used.
+//
+//  Currently pRecipientInfo isn't used and should be set to NULL.
+//
+//  The pStreamInfo parameter needs to be set to stream the decoded content
+//  output.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCRYPTMSG
+WINAPI
+CryptMsgOpenToDecode(
+    IN DWORD dwMsgEncodingType,
+    IN DWORD dwFlags,
+    IN DWORD dwMsgType,
+    IN HCRYPTPROV hCryptProv,
+    IN OPTIONAL PCERT_INFO pRecipientInfo,
+    IN OPTIONAL PCMSG_STREAM_INFO pStreamInfo
+    );
+
+//+-------------------------------------------------------------------------
+//  Duplicate a cryptographic message handle
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCRYPTMSG
+WINAPI
+CryptMsgDuplicate(
+    IN HCRYPTMSG hCryptMsg
+    );
+
+//+-------------------------------------------------------------------------
+//  Close a cryptographic message handle
+//
+//  LastError is preserved unless FALSE is returned.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgClose(
+    IN HCRYPTMSG hCryptMsg
+    );
+
+//+-------------------------------------------------------------------------
+//  Update the content of a cryptographic message. Depending on how the
+//  message was opened, the content is either encoded or decoded.
+//
+//  This function is repetitively called to append to the message content.
+//  fFinal is set to identify the last update. On fFinal, the encode/decode
+//  is completed. The encoded/decoded content and the decoded parameters
+//  are valid until the open and all duplicated handles are closed.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgUpdate(
+    IN HCRYPTMSG hCryptMsg,
+    IN const BYTE *pbData,
+    IN DWORD cbData,
+    IN BOOL fFinal
+    );
+
+//+-------------------------------------------------------------------------
+//  Get a parameter after encoding/decoding a cryptographic message. Called
+//  after the final CryptMsgUpdate. Only the CMSG_CONTENT_PARAM and
+//  CMSG_COMPUTED_HASH_PARAM are valid for an encoded message.
+//
+//  For an encoded HASHED message, the CMSG_COMPUTED_HASH_PARAM can be got
+//  before any CryptMsgUpdates to get its length.
+//
+//  The pvData type definition depends on the dwParamType value.
+//
+//  Elements pointed to by fields in the pvData structure follow the
+//  structure. Therefore, *pcbData may exceed the size of the structure.
+//
+//  Upon input, if *pcbData == 0, then, *pcbData is updated with the length
+//  of the data and the pvData parameter is ignored.
+//
+//  Upon return, *pcbData is updated with the length of the data.
+//
+//  The OBJID BLOBs returned in the pvData structures point to
+//  their still encoded representation. The appropriate functions
+//  must be called to decode the information.
+//
+//  See below for a list of the parameters to get.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgGetParam(
+    IN HCRYPTMSG hCryptMsg,
+    IN DWORD dwParamType,
+    IN DWORD dwIndex,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+//+-------------------------------------------------------------------------
+//  Get parameter types and their corresponding data structure definitions.
+//--------------------------------------------------------------------------
+#define CMSG_TYPE_PARAM                              1
+#define CMSG_CONTENT_PARAM                           2
+#define CMSG_BARE_CONTENT_PARAM                      3
+#define CMSG_INNER_CONTENT_TYPE_PARAM                4
+#define CMSG_SIGNER_COUNT_PARAM                      5
+#define CMSG_SIGNER_INFO_PARAM                       6
+#define CMSG_SIGNER_CERT_INFO_PARAM                  7
+#define CMSG_SIGNER_HASH_ALGORITHM_PARAM             8
+#define CMSG_SIGNER_AUTH_ATTR_PARAM                  9
+#define CMSG_SIGNER_UNAUTH_ATTR_PARAM                10
+#define CMSG_CERT_COUNT_PARAM                        11
+#define CMSG_CERT_PARAM                              12
+#define CMSG_CRL_COUNT_PARAM                         13
+#define CMSG_CRL_PARAM                               14
+#define CMSG_ENVELOPE_ALGORITHM_PARAM                15
+#define CMSG_RECIPIENT_COUNT_PARAM                   17
+#define CMSG_RECIPIENT_INDEX_PARAM                   18
+#define CMSG_RECIPIENT_INFO_PARAM                    19
+#define CMSG_HASH_ALGORITHM_PARAM                    20
+#define CMSG_HASH_DATA_PARAM                         21
+#define CMSG_COMPUTED_HASH_PARAM                     22
+#define CMSG_ENCRYPT_PARAM                           26
+#define CMSG_ENCRYPTED_DIGEST                        27
+#define CMSG_ENCODED_SIGNER                          28
+#define CMSG_ENCODED_MESSAGE                         29
+#define CMSG_VERSION_PARAM                           30
+#define CMSG_ATTR_CERT_COUNT_PARAM                   31
+#define CMSG_ATTR_CERT_PARAM                         32
+#define CMSG_CMS_RECIPIENT_COUNT_PARAM               33
+#define CMSG_CMS_RECIPIENT_INDEX_PARAM               34
+#define CMSG_CMS_RECIPIENT_ENCRYPTED_KEY_INDEX_PARAM 35
+#define CMSG_CMS_RECIPIENT_INFO_PARAM                36
+#define CMSG_UNPROTECTED_ATTR_PARAM                  37
+#define CMSG_SIGNER_CERT_ID_PARAM                    38
+#define CMSG_CMS_SIGNER_INFO_PARAM                   39
+
+//+-------------------------------------------------------------------------
+//  CMSG_TYPE_PARAM
+//
+//  The type of the decoded message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CONTENT_PARAM
+//
+//  The encoded content of a cryptographic message. Depending on how the
+//  message was opened, the content is either the whole PKCS#7
+//  message (opened to encode) or the inner content (opened to decode).
+//  In the decode case, the decrypted content is returned, if enveloped.
+//  If not enveloped, and if the inner content is of type DATA, the returned
+//  data is the contents octets of the inner content.
+//
+//  pvData points to the buffer receiving the content bytes
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_BARE_CONTENT_PARAM
+//
+//  The encoded content of an encoded cryptographic message, without the
+//  outer layer of ContentInfo. That is, only the encoding of the
+//  ContentInfo.content field is returned.
+//
+//  pvData points to the buffer receiving the content bytes
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_INNER_CONTENT_TYPE_PARAM
+//
+//  The type of the inner content of a decoded cryptographic message,
+//  in the form of a NULL-terminated object identifier string
+//  (eg. "1.2.840.113549.1.7.1").
+//
+//  pvData points to the buffer receiving the object identifier string
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_COUNT_PARAM
+//
+//  Count of signers in a SIGNED or SIGNED_AND_ENVELOPED message
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_CERT_INFO_PARAM
+//
+//  To get all the signers, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. SignerCount - 1.
+//
+//  pvData points to a CERT_INFO struct.
+//
+//  Only the following fields have been updated in the CERT_INFO struct:
+//  Issuer and SerialNumber.
+//
+//  Note, if the KEYID choice was selected for a CMS SignerId, then, the
+//  SerialNumber is 0 and the Issuer is encoded containing a single RDN with a
+//  single Attribute whose OID is szOID_KEYID_RDN, value type is
+//  CERT_RDN_OCTET_STRING and value is the KEYID. When the
+//  CertGetSubjectCertificateFromStore and
+//  CertFindCertificateInStore(CERT_FIND_SUBJECT_CERT) APIs see this
+//  special KEYID Issuer and SerialNumber, they do a KEYID match.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_INFO_PARAM
+//
+//  To get all the signers, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. SignerCount - 1.
+//
+//  pvData points to a CMSG_SIGNER_INFO struct.
+//
+//  Note, if the KEYID choice was selected for a CMS SignerId, then, the
+//  SerialNumber is 0 and the Issuer is encoded containing a single RDN with a
+//  single Attribute whose OID is szOID_KEYID_RDN, value type is
+//  CERT_RDN_OCTET_STRING and value is the KEYID. When the
+//  CertGetSubjectCertificateFromStore and
+//  CertFindCertificateInStore(CERT_FIND_SUBJECT_CERT) APIs see this
+//  special KEYID Issuer and SerialNumber, they do a KEYID match.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_SIGNER_INFO {
+    DWORD                       dwVersion;
+    CERT_NAME_BLOB              Issuer;
+    CRYPT_INTEGER_BLOB          SerialNumber;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    CRYPT_ALGORITHM_IDENTIFIER  HashEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedHash;
+    CRYPT_ATTRIBUTES            AuthAttrs;
+    CRYPT_ATTRIBUTES            UnauthAttrs;
+} CMSG_SIGNER_INFO, *PCMSG_SIGNER_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_CERT_ID_PARAM
+//
+//  To get all the signers, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. SignerCount - 1.
+//
+//  pvData points to a CERT_ID struct.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CMS_SIGNER_INFO_PARAM
+//
+//  Same as CMSG_SIGNER_INFO_PARAM, except, contains SignerId instead of
+//  Issuer and SerialNumber.
+//
+//  To get all the signers, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. SignerCount - 1.
+//
+//  pvData points to a CMSG_CMS_SIGNER_INFO struct.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CMS_SIGNER_INFO {
+    DWORD                       dwVersion;
+    CERT_ID                     SignerId;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    CRYPT_ALGORITHM_IDENTIFIER  HashEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedHash;
+    CRYPT_ATTRIBUTES            AuthAttrs;
+    CRYPT_ATTRIBUTES            UnauthAttrs;
+} CMSG_CMS_SIGNER_INFO, *PCMSG_CMS_SIGNER_INFO;
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_HASH_ALGORITHM_PARAM
+//
+//  This parameter specifies the HashAlgorithm that was used for the signer.
+//
+//  Set dwIndex to iterate through all the signers.
+//
+//  pvData points to an CRYPT_ALGORITHM_IDENTIFIER struct.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_AUTH_ATTR_PARAM
+//
+//  The authenticated attributes for the signer.
+//
+//  Set dwIndex to iterate through all the signers.
+//
+//  pvData points to a CMSG_ATTR struct.
+//--------------------------------------------------------------------------
+typedef CRYPT_ATTRIBUTES CMSG_ATTR;
+typedef CRYPT_ATTRIBUTES *PCMSG_ATTR;
+
+//+-------------------------------------------------------------------------
+//  CMSG_SIGNER_UNAUTH_ATTR_PARAM
+//
+//  The unauthenticated attributes for the signer.
+//
+//  Set dwIndex to iterate through all the signers.
+//
+//  pvData points to a CMSG_ATTR struct.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CERT_COUNT_PARAM
+//
+//  Count of certificates in a SIGNED or SIGNED_AND_ENVELOPED message.
+//
+//  CMS, also supports certificates in an ENVELOPED message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CERT_PARAM
+//
+//  To get all the certificates, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. CertCount - 1.
+//
+//  pvData points to an array of the certificate's encoded bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CRL_COUNT_PARAM
+//
+//  Count of CRLs in a SIGNED or SIGNED_AND_ENVELOPED message.
+//
+//  CMS, also supports CRLs in an ENVELOPED message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CRL_PARAM
+//
+//  To get all the CRLs, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. CrlCount - 1.
+//
+//  pvData points to an array of the CRL's encoded bytes.
+//--------------------------------------------------------------------------
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_ENVELOPE_ALGORITHM_PARAM
+//
+//  The ContentEncryptionAlgorithm that was used in
+//  an ENVELOPED or SIGNED_AND_ENVELOPED message.
+//
+//  For streaming you must be able to successfully get this parameter before
+//  doing a CryptMsgControl decrypt.
+//
+//  pvData points to an CRYPT_ALGORITHM_IDENTIFIER struct.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_RECIPIENT_COUNT_PARAM
+//
+//  Count of recipients in an ENVELOPED or SIGNED_AND_ENVELOPED message.
+//
+//  Count of key transport recepients.
+//
+//  The CMSG_CMS_RECIPIENT_COUNT_PARAM has the total count of
+//  recipients (it also includes key agree and mail list recipients).
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_RECIPIENT_INDEX_PARAM
+//
+//  Index of the recipient used to decrypt an ENVELOPED or SIGNED_AND_ENVELOPED
+//  message.
+//
+//  Index of a key transport recipient. If a non key transport
+//  recipient was used to decrypt, fails with LastError set to
+//  CRYPT_E_INVALID_INDEX.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_RECIPIENT_INFO_PARAM
+//
+//  To get all the recipients, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. RecipientCount - 1.
+//
+//  Only returns the key transport recepients.
+//
+//  The CMSG_CMS_RECIPIENT_INFO_PARAM returns all recipients.
+//
+//  pvData points to a CERT_INFO struct.
+//
+//  Only the following fields have been updated in the CERT_INFO struct:
+//  Issuer, SerialNumber and PublicKeyAlgorithm. The PublicKeyAlgorithm
+//  specifies the KeyEncryptionAlgorithm that was used.
+//
+//  Note, if the KEYID choice was selected for a key transport recipient, then,
+//  the SerialNumber is 0 and the Issuer is encoded containing a single RDN
+//  with a single Attribute whose OID is szOID_KEYID_RDN, value type is
+//  CERT_RDN_OCTET_STRING and value is the KEYID. When the
+//  CertGetSubjectCertificateFromStore and
+//  CertFindCertificateInStore(CERT_FIND_SUBJECT_CERT) APIs see this
+//  special KEYID Issuer and SerialNumber, they do a KEYID match.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_HASH_ALGORITHM_PARAM
+//
+//  The HashAlgorithm in a HASHED message.
+//
+//  pvData points to an CRYPT_ALGORITHM_IDENTIFIER struct.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_HASH_DATA_PARAM
+//
+//  The hash in a HASHED message.
+//
+//  pvData points to an array of bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_COMPUTED_HASH_PARAM
+//
+//  The computed hash for a HASHED message.
+//  This may be called for either an encoded or decoded message.
+//
+//  Also, the computed hash for one of the signer's in a SIGNED message.
+//  It may be called for either an encoded or decoded message after the
+//  final update.  Set dwIndex to iterate through all the signers.
+//
+//  pvData points to an array of bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_ENCRYPT_PARAM
+//
+//  The ContentEncryptionAlgorithm that was used in an ENCRYPTED message.
+//
+//  pvData points to an CRYPT_ALGORITHM_IDENTIFIER struct.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_ENCODED_MESSAGE
+//
+//  The full encoded message. This is useful in the case of a decoded
+//  message which has been modified (eg. a signed-data or
+//  signed-and-enveloped-data message which has been countersigned).
+//
+//  pvData points to an array of the message's encoded bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_VERSION_PARAM
+//
+//  The version of the decoded message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+#define CMSG_SIGNED_DATA_V1                     1
+#define CMSG_SIGNED_DATA_V3                     3
+#define CMSG_SIGNED_DATA_PKCS_1_5_VERSION       CMSG_SIGNED_DATA_V1
+#define CMSG_SIGNED_DATA_CMS_VERSION            CMSG_SIGNED_DATA_V3
+
+#define CMSG_SIGNER_INFO_V1                     1
+#define CMSG_SIGNER_INFO_V3                     3
+#define CMSG_SIGNER_INFO_PKCS_1_5_VERSION       CMSG_SIGNER_INFO_V1
+#define CMSG_SIGNER_INFO_CMS_VERSION            CMSG_SIGNER_INFO_V3
+
+#define CMSG_HASHED_DATA_V0                     0
+#define CMSG_HASHED_DATA_V2                     2
+#define CMSG_HASHED_DATA_PKCS_1_5_VERSION       CMSG_HASHED_DATA_V0
+#define CMSG_HASHED_DATA_CMS_VERSION            CMSG_HASHED_DATA_V2
+
+#define CMSG_ENVELOPED_DATA_V0                  0
+#define CMSG_ENVELOPED_DATA_V2                  2
+#define CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION    CMSG_ENVELOPED_DATA_V0
+#define CMSG_ENVELOPED_DATA_CMS_VERSION         CMSG_ENVELOPED_DATA_V2
+
+//+-------------------------------------------------------------------------
+//  CMSG_ATTR_CERT_COUNT_PARAM
+//
+//  Count of attribute certificates in a SIGNED or ENVELOPED message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_ATTR_CERT_PARAM
+//
+//  To get all the attribute certificates, repetitively call CryptMsgGetParam,
+//  with dwIndex set to 0 .. AttrCertCount - 1.
+//
+//  pvData points to an array of the attribute certificate's encoded bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CMS_RECIPIENT_COUNT_PARAM
+//
+//  Count of all CMS recipients in an ENVELOPED message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CMS_RECIPIENT_INDEX_PARAM
+//
+//  Index of the CMS recipient used to decrypt an ENVELOPED message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CMS_RECIPIENT_ENCRYPTED_KEY_INDEX_PARAM
+//
+//  For a CMS key agreement recipient, the index of the encrypted key
+//  used to decrypt an ENVELOPED message.
+//
+//  pvData points to a DWORD
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CMS_RECIPIENT_INFO_PARAM
+//
+//  To get all the CMS recipients, repetitively call CryptMsgGetParam, with
+//  dwIndex set to 0 .. CmsRecipientCount - 1.
+//
+//  pvData points to a CMSG_CMS_RECIPIENT_INFO struct.
+//--------------------------------------------------------------------------
+
+typedef struct _CMSG_KEY_TRANS_RECIPIENT_INFO {
+    DWORD                       dwVersion;
+
+    // Currently, only ISSUER_SERIAL_NUMBER or KEYID choices
+    CERT_ID                     RecipientId;
+
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedKey;
+} CMSG_KEY_TRANS_RECIPIENT_INFO, *PCMSG_KEY_TRANS_RECIPIENT_INFO;
+
+typedef struct _CMSG_RECIPIENT_ENCRYPTED_KEY_INFO {
+    // Currently, only ISSUER_SERIAL_NUMBER or KEYID choices
+    CERT_ID                     RecipientId;
+
+    CRYPT_DATA_BLOB             EncryptedKey;
+
+    // The following optional fields are only applicable to KEYID choice
+    FILETIME                    Date;
+    PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr;
+} CMSG_RECIPIENT_ENCRYPTED_KEY_INFO, *PCMSG_RECIPIENT_ENCRYPTED_KEY_INFO;
+
+typedef struct _CMSG_KEY_AGREE_RECIPIENT_INFO {
+    DWORD                       dwVersion;
+    DWORD                       dwOriginatorChoice;
+    union {
+        // CMSG_KEY_AGREE_ORIGINATOR_CERT
+        CERT_ID                     OriginatorCertId;
+        // CMSG_KEY_AGREE_ORIGINATOR_PUBLIC_KEY
+        CERT_PUBLIC_KEY_INFO        OriginatorPublicKeyInfo;
+    };
+    CRYPT_DATA_BLOB             UserKeyingMaterial;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+
+    DWORD                                cRecipientEncryptedKeys;
+    PCMSG_RECIPIENT_ENCRYPTED_KEY_INFO   *rgpRecipientEncryptedKeys;
+} CMSG_KEY_AGREE_RECIPIENT_INFO, *PCMSG_KEY_AGREE_RECIPIENT_INFO;
+
+#define CMSG_KEY_AGREE_ORIGINATOR_CERT         1
+#define CMSG_KEY_AGREE_ORIGINATOR_PUBLIC_KEY   2
+
+
+typedef struct _CMSG_MAIL_LIST_RECIPIENT_INFO {
+    DWORD                       dwVersion;
+    CRYPT_DATA_BLOB             KeyId;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedKey;
+
+    // The following fields are optional
+    FILETIME                    Date;
+    PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr;
+} CMSG_MAIL_LIST_RECIPIENT_INFO, *PCMSG_MAIL_LIST_RECIPIENT_INFO;
+
+typedef struct _CMSG_CMS_RECIPIENT_INFO {
+    DWORD   dwRecipientChoice;
+    union {
+        // CMSG_KEY_TRANS_RECIPIENT
+        PCMSG_KEY_TRANS_RECIPIENT_INFO   pKeyTrans;
+        // CMSG_KEY_AGREE_RECIPIENT
+        PCMSG_KEY_AGREE_RECIPIENT_INFO   pKeyAgree;
+        // CMSG_MAIL_LIST_RECIPIENT
+        PCMSG_MAIL_LIST_RECIPIENT_INFO   pMailList;
+    };
+} CMSG_CMS_RECIPIENT_INFO, *PCMSG_CMS_RECIPIENT_INFO;
+
+
+// dwVersion numbers for the KeyTrans, KeyAgree and MailList recipients
+#define CMSG_ENVELOPED_RECIPIENT_V0             0
+#define CMSG_ENVELOPED_RECIPIENT_V2             2
+#define CMSG_ENVELOPED_RECIPIENT_V3             3
+#define CMSG_ENVELOPED_RECIPIENT_V4             4
+#define CMSG_KEY_TRANS_PKCS_1_5_VERSION         CMSG_ENVELOPED_RECIPIENT_V0
+#define CMSG_KEY_TRANS_CMS_VERSION              CMSG_ENVELOPED_RECIPIENT_V2
+#define CMSG_KEY_AGREE_VERSION                  CMSG_ENVELOPED_RECIPIENT_V3
+#define CMSG_MAIL_LIST_VERSION                  CMSG_ENVELOPED_RECIPIENT_V4
+
+//+-------------------------------------------------------------------------
+//  CMSG_UNPROTECTED_ATTR_PARAM
+//
+//  The unprotected attributes in the envelped message.
+//
+//  pvData points to a CMSG_ATTR struct.
+//--------------------------------------------------------------------------
+
+
+//+-------------------------------------------------------------------------
+//  Perform a special "control" function after the final CryptMsgUpdate of a
+//  encoded/decoded cryptographic message.
+//
+//  The dwCtrlType parameter specifies the type of operation to be performed.
+//
+//  The pvCtrlPara definition depends on the dwCtrlType value.
+//
+//  See below for a list of the control operations and their pvCtrlPara
+//  type definition.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgControl(
+    IN HCRYPTMSG hCryptMsg,
+    IN DWORD dwFlags,
+    IN DWORD dwCtrlType,
+    IN void const *pvCtrlPara
+    );
+
+//+-------------------------------------------------------------------------
+//  Message control types
+//--------------------------------------------------------------------------
+#define CMSG_CTRL_VERIFY_SIGNATURE       1
+#define CMSG_CTRL_DECRYPT                2
+#define CMSG_CTRL_VERIFY_HASH            5
+#define CMSG_CTRL_ADD_SIGNER             6
+#define CMSG_CTRL_DEL_SIGNER             7
+#define CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR 8
+#define CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR 9
+#define CMSG_CTRL_ADD_CERT               10
+#define CMSG_CTRL_DEL_CERT               11
+#define CMSG_CTRL_ADD_CRL                12
+#define CMSG_CTRL_DEL_CRL                13
+#define CMSG_CTRL_ADD_ATTR_CERT          14
+#define CMSG_CTRL_DEL_ATTR_CERT          15
+#define CMSG_CTRL_KEY_TRANS_DECRYPT      16
+#define CMSG_CTRL_KEY_AGREE_DECRYPT      17
+#define CMSG_CTRL_MAIL_LIST_DECRYPT      18
+#define CMSG_CTRL_VERIFY_SIGNATURE_EX    19
+#define CMSG_CTRL_ADD_CMS_SIGNER_INFO    20
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_VERIFY_SIGNATURE
+//
+//  Verify the signature of a SIGNED or SIGNED_AND_ENVELOPED
+//  message after it has been decoded.
+//
+//  For a SIGNED_AND_ENVELOPED message, called after
+//  CryptMsgControl(CMSG_CTRL_DECRYPT), if CryptMsgOpenToDecode was called
+//  with a NULL pRecipientInfo.
+//
+//  pvCtrlPara points to a CERT_INFO struct.
+//
+//  The CERT_INFO contains the Issuer and SerialNumber identifying
+//  the Signer of the message. The CERT_INFO also contains the
+//  PublicKeyInfo
+//  used to verify the signature. The cryptographic provider specified
+//  in CryptMsgOpenToDecode is used.
+//
+//  Note, if the message contains CMS signers identified by KEYID, then,
+//  the CERT_INFO's Issuer and SerialNumber is ignored and only the public
+//  key is used to find a signer whose signature verifies.
+//
+//  The following CMSG_CTRL_VERIFY_SIGNATURE_EX should be used instead.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_VERIFY_SIGNATURE_EX
+//
+//  Verify the signature of a SIGNED message after it has been decoded.
+//
+//  pvCtrlPara points to the following CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA.
+//
+//  If hCryptProv is NULL, uses the cryptographic provider specified in
+//  CryptMsgOpenToDecode. If CryptMsgOpenToDecode's hCryptProv is also NULL,
+//  gets default provider according to the signer's public key OID.
+//
+//  dwSignerIndex is the index of the signer to use to verify the signature.
+//
+//  The signer can be a pointer to a CERT_PUBLIC_KEY_INFO, certificate
+//  context or a chain context.
+//
+//  If the signer's HashEncryptionAlgorithm is szOID_PKIX_NO_SIGNATURE, then,
+//  the signature is expected to contain the hash octets. Only dwSignerType
+//  of CMSG_VERIFY_SIGNER_NULL may be specified to verify this no signature
+//  case.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA {
+    DWORD               cbSize;
+    HCRYPTPROV          hCryptProv;
+    DWORD               dwSignerIndex;
+    DWORD               dwSignerType;
+    void                *pvSigner;
+} CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA, *PCMSG_CTRL_VERIFY_SIGNATURE_EX_PARA;
+
+// Signer Types
+#define CMSG_VERIFY_SIGNER_PUBKEY                   1
+    // pvSigner :: PCERT_PUBLIC_KEY_INFO
+#define CMSG_VERIFY_SIGNER_CERT                     2
+    // pvSigner :: PCCERT_CONTEXT
+#define CMSG_VERIFY_SIGNER_CHAIN                    3
+    // pvSigner :: PCCERT_CHAIN_CONTEXT
+#define CMSG_VERIFY_SIGNER_NULL                     4
+    // pvSigner :: NULL
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_DECRYPT
+//
+//  Decrypt an ENVELOPED or SIGNED_AND_ENVELOPED message after it has been
+//  decoded.
+//
+//  This decrypt is only applicable to key transport recipients.
+//
+//  hCryptProv and dwKeySpec specify the private key to use. For dwKeySpec ==
+//  0, defaults to AT_KEYEXCHANGE.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags passed
+//  to CryptMsgControl, then, the hCryptProv is released on the final
+//  CryptMsgClose. Not released if CryptMsgControl fails.
+//
+//  dwRecipientIndex is the index of the recipient in the message associated
+//  with the hCryptProv's private key.
+//
+//  The dwRecipientIndex is the index of a key transport recipient.
+//
+//  Note, the message can only be decrypted once.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CTRL_DECRYPT_PARA {
+    DWORD       cbSize;
+    HCRYPTPROV  hCryptProv;
+    DWORD       dwKeySpec;
+    DWORD       dwRecipientIndex;
+} CMSG_CTRL_DECRYPT_PARA, *PCMSG_CTRL_DECRYPT_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_KEY_TRANS_DECRYPT
+//
+//  Decrypt an ENVELOPED message after it has been decoded for a key
+//  transport recipient.
+//
+//  hCryptProv and dwKeySpec specify the private key to use. For dwKeySpec ==
+//  0, defaults to AT_KEYEXCHANGE.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags passed
+//  to CryptMsgControl, then, the hCryptProv is released on the final
+//  CryptMsgClose. Not released if CryptMsgControl fails.
+//
+//  pKeyTrans points to the CMSG_KEY_TRANS_RECIPIENT_INFO obtained via
+//  CryptMsgGetParam(CMSG_CMS_RECIPIENT_INFO_PARAM)
+//
+//  dwRecipientIndex is the index of the recipient in the message associated
+//  with the hCryptProv's private key.
+//
+//  Note, the message can only be decrypted once.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CTRL_KEY_TRANS_DECRYPT_PARA {
+    DWORD                           cbSize;
+    HCRYPTPROV                      hCryptProv;
+    DWORD                           dwKeySpec;
+    PCMSG_KEY_TRANS_RECIPIENT_INFO  pKeyTrans;
+    DWORD                           dwRecipientIndex;
+} CMSG_CTRL_KEY_TRANS_DECRYPT_PARA, *PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA;
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_KEY_AGREE_DECRYPT
+//
+//  Decrypt an ENVELOPED message after it has been decoded for a key
+//  agreement recipient.
+//
+//  hCryptProv and dwKeySpec specify the private key to use. For dwKeySpec ==
+//  0, defaults to AT_KEYEXCHANGE.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags passed
+//  to CryptMsgControl, then, the hCryptProv is released on the final
+//  CryptMsgClose. Not released if CryptMsgControl fails.
+//
+//  pKeyAgree points to the CMSG_KEY_AGREE_RECIPIENT_INFO obtained via
+//  CryptMsgGetParam(CMSG_CMS_RECIPIENT_INFO_PARAM) for dwRecipientIndex.
+//
+//  dwRecipientIndex, dwRecipientEncryptedKeyIndex are the indices of the
+//  recipient's encrypted key in the message associated with the hCryptProv's
+//  private key.
+//
+//  OriginatorPublicKey is the originator's public key obtained from either
+//  the originator's certificate or the CMSG_KEY_AGREE_RECIPIENT_INFO obtained
+//  via the CMSG_CMS_RECIPIENT_INFO_PARAM.
+//
+//  Note, the message can only be decrypted once.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CTRL_KEY_AGREE_DECRYPT_PARA {
+    DWORD                           cbSize;
+    HCRYPTPROV                      hCryptProv;
+    DWORD                           dwKeySpec;
+    PCMSG_KEY_AGREE_RECIPIENT_INFO  pKeyAgree;
+    DWORD                           dwRecipientIndex;
+    DWORD                           dwRecipientEncryptedKeyIndex;
+    CRYPT_BIT_BLOB                  OriginatorPublicKey;
+} CMSG_CTRL_KEY_AGREE_DECRYPT_PARA, *PCMSG_CTRL_KEY_AGREE_DECRYPT_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_MAIL_LIST_DECRYPT
+//
+//  Decrypt an ENVELOPED message after it has been decoded for a mail
+//  list recipient.
+//
+//  pMailList points to the CMSG_MAIL_LIST_RECIPIENT_INFO obtained via
+//  CryptMsgGetParam(CMSG_CMS_RECIPIENT_INFO_PARAM) for dwRecipientIndex.
+//
+//  There is 1 choice for the KeyEncryptionKey: an already created CSP key
+//  handle. For the key handle choice, hCryptProv must be nonzero. This key
+//  handle isn't destroyed.
+//
+//  If CMSG_CRYPT_RELEASE_CONTEXT_FLAG is set in the dwFlags passed
+//  to CryptMsgControl, then, the hCryptProv is released on the final
+//  CryptMsgClose. Not released if CryptMsgControl fails.
+//
+//  For RC2 wrap, the effective key length is obtained from the
+//  KeyEncryptionAlgorithm parameters and set on the hKeyEncryptionKey before
+//  decrypting.
+//
+//  Note, the message can only be decrypted once.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CTRL_MAIL_LIST_DECRYPT_PARA {
+    DWORD                           cbSize;
+    HCRYPTPROV                      hCryptProv;
+    PCMSG_MAIL_LIST_RECIPIENT_INFO  pMailList;
+    DWORD                           dwRecipientIndex;
+    DWORD                           dwKeyChoice;
+    union {
+        // CMSG_MAIL_LIST_HANDLE_KEY_CHOICE
+        HCRYPTKEY                       hKeyEncryptionKey;
+        // Reserve space for a potential pointer choice
+        void                            *pvKeyEncryptionKey;
+    };
+} CMSG_CTRL_MAIL_LIST_DECRYPT_PARA, *PCMSG_CTRL_MAIL_LIST_DECRYPT_PARA;
+
+
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_VERIFY_HASH
+//
+//  Verify the hash of a HASHED message after it has been decoded.
+//
+//  Only the hCryptMsg parameter is used, to specify the message whose
+//  hash is being verified.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_ADD_SIGNER
+//
+//  Add a signer to a signed-data message.
+//
+//  pvCtrlPara points to a CMSG_SIGNER_ENCODE_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_ADD_CMS_SIGNER_INFO
+//
+//  Add a signer to a signed-data message.
+//
+//  Differs from the above, CMSG_CTRL_ADD_SIGNER, wherein, the signer info
+//  already contains the signature.
+//
+//  pvCtrlPara points to a CMSG_CMS_SIGNER_INFO.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_DEL_SIGNER
+//
+//  Remove a signer from a signed-data or signed-and-enveloped-data message.
+//
+//  pvCtrlPara points to a DWORD containing the 0-based index of the
+//  signer to be removed.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR
+//
+//  Add an unauthenticated attribute to the SignerInfo of a signed-data or
+//  signed-and-enveloped-data message.
+//
+//  The unauthenticated attribute is input in the form of an encoded blob.
+//--------------------------------------------------------------------------
+
+typedef struct _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA {
+    DWORD               cbSize;
+    DWORD               dwSignerIndex;
+    CRYPT_DATA_BLOB     blob;
+} CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA;
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR
+//
+//  Delete an unauthenticated attribute from the SignerInfo of a signed-data
+//  or signed-and-enveloped-data message.
+//
+//  The unauthenticated attribute to be removed is specified by
+//  a 0-based index.
+//--------------------------------------------------------------------------
+
+typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA {
+    DWORD               cbSize;
+    DWORD               dwSignerIndex;
+    DWORD               dwUnauthAttrIndex;
+} CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA;
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_ADD_CERT
+//
+//  Add a certificate to a signed-data or signed-and-enveloped-data message.
+//
+//  pvCtrlPara points to a CRYPT_DATA_BLOB containing the certificate's
+//  encoded bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_DEL_CERT
+//
+//  Delete a certificate from a signed-data or signed-and-enveloped-data
+//  message.
+//
+//  pvCtrlPara points to a DWORD containing the 0-based index of the
+//  certificate to be removed.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_ADD_CRL
+//
+//  Add a CRL to a signed-data or signed-and-enveloped-data message.
+//
+//  pvCtrlPara points to a CRYPT_DATA_BLOB containing the CRL's
+//  encoded bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_DEL_CRL
+//
+//  Delete a CRL from a signed-data or signed-and-enveloped-data message.
+//
+//  pvCtrlPara points to a DWORD containing the 0-based index of the CRL
+//  to be removed.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_ADD_ATTR_CERT
+//
+//  Add an attribute certificate to a signed-data message.
+//
+//  pvCtrlPara points to a CRYPT_DATA_BLOB containing the attribute
+//  certificate's encoded bytes.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CMSG_CTRL_DEL_ATTR_CERT
+//
+//  Delete an attribute certificate from a signed-data message.
+//
+//  pvCtrlPara points to a DWORD containing the 0-based index of the
+//  attribute certificate to be removed.
+//--------------------------------------------------------------------------
+
+
+//+-------------------------------------------------------------------------
+//  Verify a countersignature, at the SignerInfo level.
+//  ie. verify that pbSignerInfoCountersignature contains the encrypted
+//  hash of the encryptedDigest field of pbSignerInfo.
+//
+//  hCryptProv is used to hash the encryptedDigest field of pbSignerInfo.
+//  The only fields referenced from pciCountersigner are SerialNumber, Issuer,
+//  and SubjectPublicKeyInfo.
+//--------------------------------------------------------------------------
+BOOL
+WINAPI
+CryptMsgVerifyCountersignatureEncoded(
+    IN HCRYPTPROV   hCryptProv,
+    IN DWORD        dwEncodingType,
+    IN PBYTE        pbSignerInfo,
+    IN DWORD        cbSignerInfo,
+    IN PBYTE        pbSignerInfoCountersignature,
+    IN DWORD        cbSignerInfoCountersignature,
+    IN PCERT_INFO   pciCountersigner
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Verify a countersignature, at the SignerInfo level.
+//  ie. verify that pbSignerInfoCountersignature contains the encrypted
+//  hash of the encryptedDigest field of pbSignerInfo.
+//
+//  hCryptProv is used to hash the encryptedDigest field of pbSignerInfo.
+//
+//  The signer can be a CERT_PUBLIC_KEY_INFO, certificate context or a
+//  chain context.
+//--------------------------------------------------------------------------
+BOOL
+WINAPI
+CryptMsgVerifyCountersignatureEncodedEx(
+    IN HCRYPTPROV   hCryptProv,
+    IN DWORD        dwEncodingType,
+    IN PBYTE        pbSignerInfo,
+    IN DWORD        cbSignerInfo,
+    IN PBYTE        pbSignerInfoCountersignature,
+    IN DWORD        cbSignerInfoCountersignature,
+    IN DWORD        dwSignerType,
+    IN void         *pvSigner,
+    IN DWORD        dwFlags,
+    IN OPTIONAL void *pvReserved
+    );
+
+
+// See CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA for dwSignerType definitions
+
+
+//+-------------------------------------------------------------------------
+//  Countersign an already-existing signature in a message
+//
+//  dwIndex is a zero-based index of the SignerInfo to be countersigned.
+//--------------------------------------------------------------------------
+BOOL
+WINAPI
+CryptMsgCountersign(
+    IN OUT HCRYPTMSG            hCryptMsg,
+    IN DWORD                    dwIndex,
+    IN DWORD                    cCountersigners,
+    IN PCMSG_SIGNER_ENCODE_INFO rgCountersigners
+    );
+
+//+-------------------------------------------------------------------------
+//  Countersign an already-existing signature (encoded SignerInfo).
+//  Output an encoded SignerInfo blob, suitable for use as a countersignature
+//  attribute in the unauthenticated attributes of a signed-data or
+//  signed-and-enveloped-data message.
+//--------------------------------------------------------------------------
+BOOL
+WINAPI
+CryptMsgCountersignEncoded(
+    IN DWORD                    dwEncodingType,
+    IN PBYTE                    pbSignerInfo,
+    IN DWORD                    cbSignerInfo,
+    IN DWORD                    cCountersigners,
+    IN PCMSG_SIGNER_ENCODE_INFO rgCountersigners,
+    OUT PBYTE                   pbCountersignature,
+    IN OUT PDWORD               pcbCountersignature
+    );
+
+
+
+
+//+-------------------------------------------------------------------------
+//  CryptMsg OID installable functions
+//--------------------------------------------------------------------------
+
+typedef void * (WINAPI *PFN_CMSG_ALLOC) (
+    IN size_t cb
+    );
+
+typedef void (WINAPI *PFN_CMSG_FREE)(
+    IN void *pv
+    );
+
+// Note, the following 3 installable functions are obsolete and have been
+// replaced with GenContentEncryptKey, ExportKeyTrans, ExportKeyAgree,
+// ExportMailList, ImportKeyTrans, ImportKeyAgree and ImportMailList
+// installable functions.
+
+// If *phCryptProv is NULL upon entry, then, if supported, the installable
+// function should acquire a default provider and return. Note, its up
+// to the installable function to release at process detach.
+//
+// If paiEncrypt->Parameters.cbData is 0, then, the callback may optionally
+// return default encoded parameters in *ppbEncryptParameters and
+// *pcbEncryptParameters. pfnAlloc must be called for the allocation.
+#define CMSG_OID_GEN_ENCRYPT_KEY_FUNC   "CryptMsgDllGenEncryptKey"
+typedef BOOL (WINAPI *PFN_CMSG_GEN_ENCRYPT_KEY) (
+    IN OUT HCRYPTPROV               *phCryptProv,
+    IN PCRYPT_ALGORITHM_IDENTIFIER  paiEncrypt,
+    IN PVOID                        pvEncryptAuxInfo,
+    IN PCERT_PUBLIC_KEY_INFO        pPublicKeyInfo,
+    IN PFN_CMSG_ALLOC               pfnAlloc,
+    OUT HCRYPTKEY                   *phEncryptKey,
+    OUT PBYTE                       *ppbEncryptParameters,
+    OUT PDWORD                      pcbEncryptParameters
+    );
+
+#define CMSG_OID_EXPORT_ENCRYPT_KEY_FUNC   "CryptMsgDllExportEncryptKey"
+typedef BOOL (WINAPI *PFN_CMSG_EXPORT_ENCRYPT_KEY) (
+    IN HCRYPTPROV                   hCryptProv,
+    IN HCRYPTKEY                    hEncryptKey,
+    IN PCERT_PUBLIC_KEY_INFO        pPublicKeyInfo,
+    OUT PBYTE                       pbData,
+    IN OUT PDWORD                   pcbData
+    );
+
+#define CMSG_OID_IMPORT_ENCRYPT_KEY_FUNC   "CryptMsgDllImportEncryptKey"
+typedef BOOL (WINAPI *PFN_CMSG_IMPORT_ENCRYPT_KEY) (
+    IN HCRYPTPROV                   hCryptProv,
+    IN DWORD                        dwKeySpec,
+    IN PCRYPT_ALGORITHM_IDENTIFIER  paiEncrypt,
+    IN PCRYPT_ALGORITHM_IDENTIFIER  paiPubKey,
+    IN PBYTE                        pbEncodedKey,
+    IN DWORD                        cbEncodedKey,
+    OUT HCRYPTKEY                   *phEncryptKey
+    );
+
+
+// To get the default installable function for GenContentEncryptKey,
+// ExportKeyTrans, ExportKeyAgree, ExportMailList, ImportKeyTrans,
+// ImportKeyAgree or ImportMailList call CryptGetOIDFunctionAddress()
+// with the pszOID argument set to the following constant. dwEncodingType
+// should be set to CRYPT_ASN_ENCODING or X509_ASN_ENCODING.
+#define CMSG_DEFAULT_INSTALLABLE_FUNC_OID   ((LPCSTR) 1)
+
+//+-------------------------------------------------------------------------
+//  Content Encrypt Info
+//
+//  The following data structure contains the information shared between
+//  the GenContentEncryptKey and the ExportKeyTrans, ExportKeyAgree and
+//  ExportMailList installable functions.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_CONTENT_ENCRYPT_INFO {
+    DWORD                       cbSize;
+    HCRYPTPROV                  hCryptProv;
+    CRYPT_ALGORITHM_IDENTIFIER  ContentEncryptionAlgorithm;
+    void                        *pvEncryptionAuxInfo;
+    DWORD                       cRecipients;
+    PCMSG_RECIPIENT_ENCODE_INFO rgCmsRecipients;
+    PFN_CMSG_ALLOC              pfnAlloc;
+    PFN_CMSG_FREE               pfnFree;
+    DWORD                       dwEncryptFlags;
+    HCRYPTKEY                   hContentEncryptKey;
+    DWORD                       dwFlags;
+} CMSG_CONTENT_ENCRYPT_INFO, *PCMSG_CONTENT_ENCRYPT_INFO;
+
+#define CMSG_CONTENT_ENCRYPT_PAD_ENCODED_LEN_FLAG   0x00000001
+
+#define CMSG_CONTENT_ENCRYPT_FREE_PARA_FLAG         0x00000001
+#define CMSG_CONTENT_ENCRYPT_RELEASE_CONTEXT_FLAG   0x00008000
+
+//+-------------------------------------------------------------------------
+// Upon input, ContentEncryptInfo has been initialized from the
+// EnvelopedEncodeInfo.
+//
+// Note, if rgpRecipients instead of rgCmsRecipients are set in the
+// EnvelopedEncodeInfo, then, the rgpRecipients have been converted
+// to rgCmsRecipients in the ContentEncryptInfo.
+//
+// The following fields may be changed in ContentEncryptInfo:
+//      hContentEncryptKey
+//      hCryptProv
+//      ContentEncryptionAlgorithm.Parameters
+//      dwFlags
+//
+// All other fields in the ContentEncryptInfo are READONLY.
+//
+// If CMSG_CONTENT_ENCRYPT_PAD_ENCODED_LEN_FLAG is set upon entry
+// in dwEncryptFlags, then, any potentially variable length encoded
+// output should be padded with zeroes to always obtain the
+// same maximum encoded length. This is necessary for
+// CryptMsgCalculateEncodedLength() or CryptMsgOpenToEncode() with
+// definite length streaming.
+//
+// The hContentEncryptKey must be updated.
+//
+// If hCryptProv is NULL upon input, then, it must be updated.
+// If a HCRYPTPROV is acquired that must be released, then, the
+// CMSG_CONTENT_ENCRYPT_RELEASE_CONTEXT_FLAG must be set in dwFlags.
+//
+// If ContentEncryptionAlgorithm.Parameters is updated, then, the
+// CMSG_CONTENT_ENCRYPT_FREE_PARA_FLAG must be set in dwFlags. pfnAlloc and
+// pfnFree must be used for doing the allocation.
+//
+// ContentEncryptionAlgorithm.pszObjId is used to get the OIDFunctionAddress.
+//--------------------------------------------------------------------------
+#define CMSG_OID_GEN_CONTENT_ENCRYPT_KEY_FUNC  "CryptMsgDllGenContentEncryptKey"
+typedef BOOL (WINAPI *PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY) (
+    IN OUT PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved
+    );
+
+//+-------------------------------------------------------------------------
+//  Key Transport Encrypt Info
+//
+//  The following data structure contains the information updated by the
+//  ExportKeyTrans installable function.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_KEY_TRANS_ENCRYPT_INFO {
+    DWORD                       cbSize;
+    DWORD                       dwRecipientIndex;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedKey;
+    DWORD                       dwFlags;
+} CMSG_KEY_TRANS_ENCRYPT_INFO, *PCMSG_KEY_TRANS_ENCRYPT_INFO;
+
+#define CMSG_KEY_TRANS_ENCRYPT_FREE_PARA_FLAG       0x00000001
+
+
+//+-------------------------------------------------------------------------
+// Upon input, KeyTransEncryptInfo has been initialized from the
+// KeyTransEncodeInfo.
+//
+// The following fields may be changed in KeyTransEncryptInfo:
+//      EncryptedKey
+//      KeyEncryptionAlgorithm.Parameters
+//      dwFlags
+//
+// All other fields in the KeyTransEncryptInfo are READONLY.
+//
+// The EncryptedKey must be updated. The pfnAlloc and pfnFree specified in
+// ContentEncryptInfo must be used for doing the allocation.
+//
+// If the KeyEncryptionAlgorithm.Parameters is updated, then, the
+// CMSG_KEY_TRANS_ENCRYPT_FREE_PARA_FLAG must be set in dwFlags.
+// The pfnAlloc and pfnFree specified in ContentEncryptInfo must be used
+// for doing the allocation.
+//
+// KeyEncryptionAlgorithm.pszObjId is used to get the OIDFunctionAddress.
+//--------------------------------------------------------------------------
+#define CMSG_OID_EXPORT_KEY_TRANS_FUNC  "CryptMsgDllExportKeyTrans"
+typedef BOOL (WINAPI *PFN_CMSG_EXPORT_KEY_TRANS) (
+    IN PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo,
+    IN PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO pKeyTransEncodeInfo,
+    IN OUT PCMSG_KEY_TRANS_ENCRYPT_INFO pKeyTransEncryptInfo,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved
+    );
+
+//+-------------------------------------------------------------------------
+//  Key Agree Key Encrypt Info
+//
+//  The following data structure contains the information updated by the
+//  ExportKeyAgree installable function for each encrypted key agree
+//  recipient.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_KEY_AGREE_KEY_ENCRYPT_INFO {
+    DWORD                       cbSize;
+    CRYPT_DATA_BLOB             EncryptedKey;
+} CMSG_KEY_AGREE_KEY_ENCRYPT_INFO, *PCMSG_KEY_AGREE_KEY_ENCRYPT_INFO;
+
+//+-------------------------------------------------------------------------
+//  Key Agree Encrypt Info
+//
+//  The following data structure contains the information applicable to
+//  all recipients. Its updated by the ExportKeyAgree installable function.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_KEY_AGREE_ENCRYPT_INFO {
+    DWORD                       cbSize;
+    DWORD                       dwRecipientIndex;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             UserKeyingMaterial;
+    DWORD                       dwOriginatorChoice;
+    union {
+        // CMSG_KEY_AGREE_ORIGINATOR_CERT
+        CERT_ID                     OriginatorCertId;
+        // CMSG_KEY_AGREE_ORIGINATOR_PUBLIC_KEY
+        CERT_PUBLIC_KEY_INFO        OriginatorPublicKeyInfo;
+    };
+    DWORD                       cKeyAgreeKeyEncryptInfo;
+    PCMSG_KEY_AGREE_KEY_ENCRYPT_INFO *rgpKeyAgreeKeyEncryptInfo;
+    DWORD                       dwFlags;
+} CMSG_KEY_AGREE_ENCRYPT_INFO, *PCMSG_KEY_AGREE_ENCRYPT_INFO;
+
+#define CMSG_KEY_AGREE_ENCRYPT_FREE_PARA_FLAG           0x00000001
+#define CMSG_KEY_AGREE_ENCRYPT_FREE_MATERIAL_FLAG       0x00000002
+#define CMSG_KEY_AGREE_ENCRYPT_FREE_PUBKEY_ALG_FLAG     0x00000004
+#define CMSG_KEY_AGREE_ENCRYPT_FREE_PUBKEY_PARA_FLAG    0x00000008
+#define CMSG_KEY_AGREE_ENCRYPT_FREE_PUBKEY_BITS_FLAG    0x00000010
+
+
+//+-------------------------------------------------------------------------
+// Upon input, KeyAgreeEncryptInfo has been initialized from the
+// KeyAgreeEncodeInfo.
+//
+// The following fields may be changed in KeyAgreeEncryptInfo:
+//      KeyEncryptionAlgorithm.Parameters
+//      UserKeyingMaterial
+//      dwOriginatorChoice
+//      OriginatorCertId
+//      OriginatorPublicKeyInfo
+//      dwFlags
+//
+// All other fields in the KeyAgreeEncryptInfo are READONLY.
+//
+// If the KeyEncryptionAlgorithm.Parameters is updated, then, the
+// CMSG_KEY_AGREE_ENCRYPT_FREE_PARA_FLAG must be set in dwFlags.
+// The pfnAlloc and pfnFree specified in ContentEncryptInfo must be used
+// for doing the allocation.
+//
+// If the UserKeyingMaterial is updated, then, the
+// CMSG_KEY_AGREE_ENCRYPT_FREE_MATERIAL_FLAG must be set in dwFlags.
+// pfnAlloc and pfnFree must be used for doing the allocation.
+//
+// The dwOriginatorChoice must be updated to either
+// CMSG_KEY_AGREE_ORIGINATOR_CERT or CMSG_KEY_AGREE_ORIGINATOR_PUBLIC_KEY.
+//
+// If the OriginatorPublicKeyInfo is updated, then, the appropriate
+// CMSG_KEY_AGREE_ENCRYPT_FREE_PUBKEY_*_FLAG must be set in dwFlags and
+// pfnAlloc and pfnFree must be used for doing the allocation.
+//
+// If CMSG_CONTENT_ENCRYPT_PAD_ENCODED_LEN_FLAG is set upon entry
+// in pContentEncryptInfo->dwEncryptFlags, then, the OriginatorPublicKeyInfo's
+// Ephemeral PublicKey should be padded with zeroes to always obtain the
+// same maximum encoded length. Note, the length of the generated ephemeral Y
+// public key can vary depending on the number of leading zero bits.
+//
+// Upon input, the array of *rgpKeyAgreeKeyEncryptInfo has been initialized.
+// The EncryptedKey must be updated for each recipient key.
+// The pfnAlloc and pfnFree specified in
+// ContentEncryptInfo must be used for doing the allocation.
+//
+// KeyEncryptionAlgorithm.pszObjId is used to get the OIDFunctionAddress.
+//--------------------------------------------------------------------------
+#define CMSG_OID_EXPORT_KEY_AGREE_FUNC  "CryptMsgDllExportKeyAgree"
+typedef BOOL (WINAPI *PFN_CMSG_EXPORT_KEY_AGREE) (
+    IN PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo,
+    IN PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO pKeyAgreeEncodeInfo,
+    IN OUT PCMSG_KEY_AGREE_ENCRYPT_INFO pKeyAgreeEncryptInfo,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved
+    );
+
+//+-------------------------------------------------------------------------
+//  Mail List Encrypt Info
+//
+//  The following data structure contains the information updated by the
+//  ExportMailList installable function.
+//--------------------------------------------------------------------------
+typedef struct _CMSG_MAIL_LIST_ENCRYPT_INFO {
+    DWORD                       cbSize;
+    DWORD                       dwRecipientIndex;
+    CRYPT_ALGORITHM_IDENTIFIER  KeyEncryptionAlgorithm;
+    CRYPT_DATA_BLOB             EncryptedKey;
+    DWORD                       dwFlags;
+} CMSG_MAIL_LIST_ENCRYPT_INFO, *PCMSG_MAIL_LIST_ENCRYPT_INFO;
+
+#define CMSG_MAIL_LIST_ENCRYPT_FREE_PARA_FLAG       0x00000001
+
+
+//+-------------------------------------------------------------------------
+// Upon input, MailListEncryptInfo has been initialized from the
+// MailListEncodeInfo.
+//
+// The following fields may be changed in MailListEncryptInfo:
+//      EncryptedKey
+//      KeyEncryptionAlgorithm.Parameters
+//      dwFlags
+//
+// All other fields in the MailListEncryptInfo are READONLY.
+//
+// The EncryptedKey must be updated. The pfnAlloc and pfnFree specified in
+// ContentEncryptInfo must be used for doing the allocation.
+//
+// If the KeyEncryptionAlgorithm.Parameters is updated, then, the
+// CMSG_MAIL_LIST_ENCRYPT_FREE_PARA_FLAG must be set in dwFlags.
+// The pfnAlloc and pfnFree specified in ContentEncryptInfo must be used
+// for doing the allocation.
+//
+// KeyEncryptionAlgorithm.pszObjId is used to get the OIDFunctionAddress.
+//--------------------------------------------------------------------------
+#define CMSG_OID_EXPORT_MAIL_LIST_FUNC  "CryptMsgDllExportMailList"
+typedef BOOL (WINAPI *PFN_CMSG_EXPORT_MAIL_LIST) (
+    IN PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo,
+    IN PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO pMailListEncodeInfo,
+    IN OUT PCMSG_MAIL_LIST_ENCRYPT_INFO pMailListEncryptInfo,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved
+    );
+
+
+//+-------------------------------------------------------------------------
+// OID Installable functions for importing an encoded and encrypted content
+// encryption key.
+//
+// There's a different installable function for each CMS Recipient choice:
+//  ImportKeyTrans
+//  ImportKeyAgree
+//  ImportMailList
+//
+// Iterates through the following OIDs to get the OID installable function:
+//   KeyEncryptionOID!ContentEncryptionOID
+//   KeyEncryptionOID
+//   ContentEncryptionOID
+//
+// If the OID installable function doesn't support the specified
+// KeyEncryption and ContentEncryption OIDs, then, return FALSE with
+// LastError set to E_NOTIMPL.
+//--------------------------------------------------------------------------
+#define CMSG_OID_IMPORT_KEY_TRANS_FUNC   "CryptMsgDllImportKeyTrans"
+typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_TRANS) (
+    IN PCRYPT_ALGORITHM_IDENTIFIER pContentEncryptionAlgorithm,
+    IN PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA pKeyTransDecryptPara,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    OUT HCRYPTKEY *phContentEncryptKey
+    );
+
+#define CMSG_OID_IMPORT_KEY_AGREE_FUNC   "CryptMsgDllImportKeyAgree"
+typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_AGREE) (
+    IN PCRYPT_ALGORITHM_IDENTIFIER pContentEncryptionAlgorithm,
+    IN PCMSG_CTRL_KEY_AGREE_DECRYPT_PARA pKeyAgreeDecryptPara,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    OUT HCRYPTKEY *phContentEncryptKey
+    );
+
+#define CMSG_OID_IMPORT_MAIL_LIST_FUNC   "CryptMsgDllImportMailList"
+typedef BOOL (WINAPI *PFN_CMSG_IMPORT_MAIL_LIST) (
+    IN PCRYPT_ALGORITHM_IDENTIFIER pContentEncryptionAlgorithm,
+    IN PCMSG_CTRL_MAIL_LIST_DECRYPT_PARA pMailListDecryptPara,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    OUT HCRYPTKEY *phContentEncryptKey
+    );
+
+
+
+//+=========================================================================
+//  Certificate Store Data Structures and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//              In its most basic implementation, a cert store is simply a
+//              collection of certificates and/or CRLs. This is the case when
+//              a cert store is opened with all of its certificates and CRLs
+//              coming from a PKCS #7 encoded cryptographic message.
+//
+//              Nonetheless, all cert stores have the following properties:
+//               - A public key may have more than one certificate in the store.
+//                 For example, a private/public key used for signing may have a
+//                 certificate issued for VISA and another issued for
+//                 Mastercard. Also, when a certificate is renewed there might
+//                 be more than one certificate with the same subject and
+//                 issuer.
+//               - However, each certificate in the store is uniquely
+//                 identified by its Issuer and SerialNumber.
+//               - There's an issuer of subject certificate relationship. A
+//                 certificate's issuer is found by doing a match of
+//                 pSubjectCert->Issuer with pIssuerCert->Subject.
+//                 The relationship is verified by using
+//                 the issuer's public key to verify the subject certificate's
+//                 signature. Note, there might be X.509 v3 extensions
+//                 to assist in finding the issuer certificate.
+//               - Since issuer certificates might be renewed, a subject
+//                 certificate might have more than one issuer certificate.
+//               - There's an issuer of CRL relationship. An
+//                 issuer's CRL is found by doing a match of
+//                 pIssuerCert->Subject with pCrl->Issuer.
+//                 The relationship is verified by using
+//                 the issuer's public key to verify the CRL's
+//                 signature. Note, there might be X.509 v3 extensions
+//                 to assist in finding the CRL.
+//               - Since some issuers might support the X.509 v3 delta CRL
+//                 extensions, an issuer might have more than one CRL.
+//               - The store shouldn't have any redundant certificates or
+//                 CRLs. There shouldn't be two certificates with the same
+//                 Issuer and SerialNumber. There shouldn't be two CRLs with
+//                 the same Issuer, ThisUpdate and NextUpdate.
+//               - The store has NO policy or trust information. No
+//                 certificates are tagged as being "root". Its up to
+//                 the application to maintain a list of CertIds (Issuer +
+//                 SerialNumber) for certificates it trusts.
+//               - The store might contain bad certificates and/or CRLs.
+//                 The issuer's signature of a subject certificate or CRL may
+//                 not verify. Certificates or CRLs may not satisfy their
+//                 time validity requirements. Certificates may be
+//                 revoked.
+//
+//              In addition to the certificates and CRLs, properties can be
+//              stored. There are two predefined property IDs for a user
+//              certificate: CERT_KEY_PROV_HANDLE_PROP_ID and
+//              CERT_KEY_PROV_INFO_PROP_ID. The CERT_KEY_PROV_HANDLE_PROP_ID
+//              is a HCRYPTPROV handle to the private key assoicated
+//              with the certificate. The CERT_KEY_PROV_INFO_PROP_ID contains
+//              information to be used to call
+//              CryptAcquireContext and CryptSetProvParam to get a handle
+//              to the private key associated with the certificate.
+//
+//              There exists two more predefined property IDs for certificates
+//              and CRLs, CERT_SHA1_HASH_PROP_ID and CERT_MD5_HASH_PROP_ID.
+//              If these properties don't already exist, then, a hash of the
+//              content is computed. (CERT_HASH_PROP_ID maps to the default
+//              hash algorithm, currently, CERT_SHA1_HASH_PROP_ID).
+//
+//              There are additional APIs for creating certificate and CRL
+//      contexts not in a store (CertCreateCertificateContext and
+//      CertCreateCRLContext).
+//
+//--------------------------------------------------------------------------
+
+
+typedef void *HCERTSTORE;
+
+//+-------------------------------------------------------------------------
+//  Certificate context.
+//
+//  A certificate context contains both the encoded and decoded representation
+//  of a certificate. A certificate context returned by a cert store function
+//  must be freed by calling the CertFreeCertificateContext function. The
+//  CertDuplicateCertificateContext function can be called to make a duplicate
+//  copy (which also must be freed by calling CertFreeCertificateContext).
+//--------------------------------------------------------------------------
+typedef struct _CERT_CONTEXT {
+    DWORD                   dwCertEncodingType;
+    BYTE                    *pbCertEncoded;
+    DWORD                   cbCertEncoded;
+    PCERT_INFO              pCertInfo;
+    HCERTSTORE              hCertStore;
+} CERT_CONTEXT, *PCERT_CONTEXT;
+typedef const CERT_CONTEXT *PCCERT_CONTEXT;
+
+//+-------------------------------------------------------------------------
+//  CRL context.
+//
+//  A CRL context contains both the encoded and decoded representation
+//  of a CRL. A CRL context returned by a cert store function
+//  must be freed by calling the CertFreeCRLContext function. The
+//  CertDuplicateCRLContext function can be called to make a duplicate
+//  copy (which also must be freed by calling CertFreeCRLContext).
+//--------------------------------------------------------------------------
+typedef struct _CRL_CONTEXT {
+    DWORD                   dwCertEncodingType;
+    BYTE                    *pbCrlEncoded;
+    DWORD                   cbCrlEncoded;
+    PCRL_INFO               pCrlInfo;
+    HCERTSTORE              hCertStore;
+} CRL_CONTEXT, *PCRL_CONTEXT;
+typedef const CRL_CONTEXT *PCCRL_CONTEXT;
+
+//+-------------------------------------------------------------------------
+//  Certificate Trust List (CTL) context.
+//
+//  A CTL context contains both the encoded and decoded representation
+//  of a CTL. Also contains an opened HCRYPTMSG handle to the decoded
+//  cryptographic signed message containing the CTL_INFO as its inner content.
+//  pbCtlContent is the encoded inner content of the signed message.
+//
+//  The CryptMsg APIs can be used to extract additional signer information.
+//--------------------------------------------------------------------------
+typedef struct _CTL_CONTEXT {
+    DWORD                   dwMsgAndCertEncodingType;
+    BYTE                    *pbCtlEncoded;
+    DWORD                   cbCtlEncoded;
+    PCTL_INFO               pCtlInfo;
+    HCERTSTORE              hCertStore;
+    HCRYPTMSG               hCryptMsg;
+    BYTE                    *pbCtlContent;
+    DWORD                   cbCtlContent;
+} CTL_CONTEXT, *PCTL_CONTEXT;
+typedef const CTL_CONTEXT *PCCTL_CONTEXT;
+
+//+-------------------------------------------------------------------------
+//  Certificate, CRL and CTL property IDs
+//
+//  See CertSetCertificateContextProperty or CertGetCertificateContextProperty
+//  for usage information.
+//--------------------------------------------------------------------------
+#define CERT_KEY_PROV_HANDLE_PROP_ID        1
+#define CERT_KEY_PROV_INFO_PROP_ID          2
+#define CERT_SHA1_HASH_PROP_ID              3
+#define CERT_MD5_HASH_PROP_ID               4
+#define CERT_HASH_PROP_ID                   CERT_SHA1_HASH_PROP_ID
+#define CERT_KEY_CONTEXT_PROP_ID            5
+#define CERT_KEY_SPEC_PROP_ID               6
+#define CERT_IE30_RESERVED_PROP_ID          7
+#define CERT_PUBKEY_HASH_RESERVED_PROP_ID   8
+#define CERT_ENHKEY_USAGE_PROP_ID           9
+#define CERT_CTL_USAGE_PROP_ID              CERT_ENHKEY_USAGE_PROP_ID
+#define CERT_NEXT_UPDATE_LOCATION_PROP_ID   10
+#define CERT_FRIENDLY_NAME_PROP_ID          11
+#define CERT_PVK_FILE_PROP_ID               12
+#define CERT_DESCRIPTION_PROP_ID            13
+#define CERT_ACCESS_STATE_PROP_ID           14
+#define CERT_SIGNATURE_HASH_PROP_ID         15
+#define CERT_SMART_CARD_DATA_PROP_ID        16
+#define CERT_EFS_PROP_ID                    17
+#define CERT_FORTEZZA_DATA_PROP_ID          18
+#define CERT_ARCHIVED_PROP_ID               19
+#define CERT_KEY_IDENTIFIER_PROP_ID         20
+#define CERT_AUTO_ENROLL_PROP_ID            21
+#define CERT_PUBKEY_ALG_PARA_PROP_ID        22
+#define CERT_CROSS_CERT_DIST_POINTS_PROP_ID 23
+#define CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID     24
+#define CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID    25
+#define CERT_ENROLLMENT_PROP_ID             26
+#define CERT_DATE_STAMP_PROP_ID             27
+#define CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID  28
+#define CERT_SUBJECT_NAME_MD5_HASH_PROP_ID  29
+#define CERT_EXTENDED_ERROR_INFO_PROP_ID    30
+
+// Note, 32 - 35 are reserved for the CERT, CRL, CTL and KeyId file element IDs.
+//       36 - 63 are reserved for future element IDs.
+
+#define CERT_RENEWAL_PROP_ID                64
+#define CERT_ARCHIVED_KEY_HASH_PROP_ID      65
+#define CERT_AUTO_ENROLL_RETRY_PROP_ID      66
+#define CERT_AIA_URL_RETRIEVED_PROP_ID      67
+#define CERT_FIRST_RESERVED_PROP_ID         68
+
+#define CERT_LAST_RESERVED_PROP_ID          0x00007FFF
+#define CERT_FIRST_USER_PROP_ID             0x00008000
+#define CERT_LAST_USER_PROP_ID              0x0000FFFF
+
+
+#define IS_CERT_HASH_PROP_ID(X)     (CERT_SHA1_HASH_PROP_ID == (X) || \
+                                        CERT_MD5_HASH_PROP_ID == (X) || \
+                                        CERT_SIGNATURE_HASH_PROP_ID == (X))
+
+#define IS_PUBKEY_HASH_PROP_ID(X)     (CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID == (X) || \
+                                        CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID == (X))
+
+#define IS_CHAIN_HASH_PROP_ID(X)     (CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID == (X) || \
+                                        CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID == (X) || \
+                                        CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID == (X) || \
+                                        CERT_SUBJECT_NAME_MD5_HASH_PROP_ID == (X))
+
+
+//+-------------------------------------------------------------------------
+//  Property OIDs
+//--------------------------------------------------------------------------
+// The OID component following the prefix contains the PROP_ID (decimal)
+#define szOID_CERT_PROP_ID_PREFIX           "1.3.6.1.4.1.311.10.11."
+
+#define szOID_CERT_KEY_IDENTIFIER_PROP_ID   "1.3.6.1.4.1.311.10.11.20"
+#define szOID_CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID \
+                                            "1.3.6.1.4.1.311.10.11.28"
+#define szOID_CERT_SUBJECT_NAME_MD5_HASH_PROP_ID \
+                                            "1.3.6.1.4.1.311.10.11.29"
+
+//+-------------------------------------------------------------------------
+//  Access State flags returned by CERT_ACCESS_STATE_PROP_ID. Note,
+//  CERT_ACCESS_PROP_ID is read only.
+//--------------------------------------------------------------------------
+
+// Set if context property writes are persisted. For instance, not set for
+// memory store contexts. Set for registry based stores opened as read or write.
+// Not set for registry based stores opened as read only.
+#define CERT_ACCESS_STATE_WRITE_PERSIST_FLAG    0x1
+
+// Set if context resides in a SYSTEM or SYSTEM_REGISTRY store.
+#define CERT_ACCESS_STATE_SYSTEM_STORE_FLAG     0x2
+
+// Set if context resides in a LocalMachine SYSTEM or SYSTEM_REGISTRY store.
+#define CERT_ACCESS_STATE_LM_SYSTEM_STORE_FLAG  0x4
+
+//+-------------------------------------------------------------------------
+//  Cryptographic Key Provider Information
+//
+//  CRYPT_KEY_PROV_INFO defines the CERT_KEY_PROV_INFO_PROP_ID's pvData.
+//
+//  The CRYPT_KEY_PROV_INFO fields are passed to CryptAcquireContext
+//  to get a HCRYPTPROV handle. The optional CRYPT_KEY_PROV_PARAM fields are
+//  passed to CryptSetProvParam to further initialize the provider.
+//
+//  The dwKeySpec field identifies the private key to use from the container
+//  For example, AT_KEYEXCHANGE or AT_SIGNATURE.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_KEY_PROV_PARAM {
+    DWORD           dwParam;
+    BYTE            *pbData;
+    DWORD           cbData;
+    DWORD           dwFlags;
+} CRYPT_KEY_PROV_PARAM, *PCRYPT_KEY_PROV_PARAM;
+
+typedef struct _CRYPT_KEY_PROV_INFO {
+    LPWSTR                  pwszContainerName;
+    LPWSTR                  pwszProvName;
+    DWORD                   dwProvType;
+    DWORD                   dwFlags;
+    DWORD                   cProvParam;
+    PCRYPT_KEY_PROV_PARAM   rgProvParam;
+    DWORD                   dwKeySpec;
+} CRYPT_KEY_PROV_INFO, *PCRYPT_KEY_PROV_INFO;
+
+//+-------------------------------------------------------------------------
+//  The following flag should be set in the above dwFlags to enable
+//  a CertSetCertificateContextProperty(CERT_KEY_CONTEXT_PROP_ID) after a
+//  CryptAcquireContext is done in the Sign or Decrypt Message functions.
+//
+//  The following define must not collide with any of the
+//  CryptAcquireContext dwFlag defines.
+//--------------------------------------------------------------------------
+#define CERT_SET_KEY_PROV_HANDLE_PROP_ID    0x00000001
+#define CERT_SET_KEY_CONTEXT_PROP_ID        0x00000001
+
+//+-------------------------------------------------------------------------
+//  Certificate Key Context
+//
+//  CERT_KEY_CONTEXT defines the CERT_KEY_CONTEXT_PROP_ID's pvData.
+//--------------------------------------------------------------------------
+typedef struct _CERT_KEY_CONTEXT {
+    DWORD           cbSize;           // sizeof(CERT_KEY_CONTEXT)
+    HCRYPTPROV      hCryptProv;
+    DWORD           dwKeySpec;
+} CERT_KEY_CONTEXT, *PCERT_KEY_CONTEXT;
+
+
+//+-------------------------------------------------------------------------
+//  Certificate Store Provider Types
+//--------------------------------------------------------------------------
+#define CERT_STORE_PROV_MSG                 ((LPCSTR) 1)
+#define CERT_STORE_PROV_MEMORY              ((LPCSTR) 2)
+#define CERT_STORE_PROV_FILE                ((LPCSTR) 3)
+#define CERT_STORE_PROV_REG                 ((LPCSTR) 4)
+
+#define CERT_STORE_PROV_PKCS7               ((LPCSTR) 5)
+#define CERT_STORE_PROV_SERIALIZED          ((LPCSTR) 6)
+#define CERT_STORE_PROV_FILENAME_A          ((LPCSTR) 7)
+#define CERT_STORE_PROV_FILENAME_W          ((LPCSTR) 8)
+#define CERT_STORE_PROV_FILENAME            CERT_STORE_PROV_FILENAME_W
+#define CERT_STORE_PROV_SYSTEM_A            ((LPCSTR) 9)
+#define CERT_STORE_PROV_SYSTEM_W            ((LPCSTR) 10)
+#define CERT_STORE_PROV_SYSTEM              CERT_STORE_PROV_SYSTEM_W
+
+#define CERT_STORE_PROV_COLLECTION          ((LPCSTR) 11)
+#define CERT_STORE_PROV_SYSTEM_REGISTRY_A   ((LPCSTR) 12)
+#define CERT_STORE_PROV_SYSTEM_REGISTRY_W   ((LPCSTR) 13)
+#define CERT_STORE_PROV_SYSTEM_REGISTRY     CERT_STORE_PROV_SYSTEM_REGISTRY_W
+#define CERT_STORE_PROV_PHYSICAL_W          ((LPCSTR) 14)
+#define CERT_STORE_PROV_PHYSICAL            CERT_STORE_PROV_PHYSICAL_W
+#define CERT_STORE_PROV_SMART_CARD_W        ((LPCSTR) 15)
+#define CERT_STORE_PROV_SMART_CARD          CERT_STORE_PROV_SMART_CARD_W
+#define CERT_STORE_PROV_LDAP_W              ((LPCSTR) 16)
+#define CERT_STORE_PROV_LDAP                CERT_STORE_PROV_LDAP_W
+
+#define sz_CERT_STORE_PROV_MEMORY           "Memory"
+#define sz_CERT_STORE_PROV_FILENAME_W       "File"
+#define sz_CERT_STORE_PROV_FILENAME         sz_CERT_STORE_PROV_FILENAME_W
+#define sz_CERT_STORE_PROV_SYSTEM_W         "System"
+#define sz_CERT_STORE_PROV_SYSTEM           sz_CERT_STORE_PROV_SYSTEM_W
+#define sz_CERT_STORE_PROV_PKCS7            "PKCS7"
+#define sz_CERT_STORE_PROV_SERIALIZED       "Serialized"
+
+#define sz_CERT_STORE_PROV_COLLECTION       "Collection"
+#define sz_CERT_STORE_PROV_SYSTEM_REGISTRY_W "SystemRegistry"
+#define sz_CERT_STORE_PROV_SYSTEM_REGISTRY  sz_CERT_STORE_PROV_SYSTEM_REGISTRY_W
+#define sz_CERT_STORE_PROV_PHYSICAL_W       "Physical"
+#define sz_CERT_STORE_PROV_PHYSICAL         sz_CERT_STORE_PROV_PHYSICAL_W
+#define sz_CERT_STORE_PROV_SMART_CARD_W     "SmartCard"
+#define sz_CERT_STORE_PROV_SMART_CARD       sz_CERT_STORE_PROV_SMART_CARD_W
+#define sz_CERT_STORE_PROV_LDAP_W           "Ldap"
+#define sz_CERT_STORE_PROV_LDAP             sz_CERT_STORE_PROV_LDAP_W
+
+//+-------------------------------------------------------------------------
+//  Certificate Store verify/results flags
+//--------------------------------------------------------------------------
+#define CERT_STORE_SIGNATURE_FLAG           0x00000001
+#define CERT_STORE_TIME_VALIDITY_FLAG       0x00000002
+#define CERT_STORE_REVOCATION_FLAG          0x00000004
+#define CERT_STORE_NO_CRL_FLAG              0x00010000
+#define CERT_STORE_NO_ISSUER_FLAG           0x00020000
+
+#define CERT_STORE_BASE_CRL_FLAG            0x00000100
+#define CERT_STORE_DELTA_CRL_FLAG           0x00000200
+
+
+//+-------------------------------------------------------------------------
+//  Certificate Store open/property flags
+//--------------------------------------------------------------------------
+#define CERT_STORE_NO_CRYPT_RELEASE_FLAG                0x00000001
+#define CERT_STORE_SET_LOCALIZED_NAME_FLAG              0x00000002
+#define CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG     0x00000004
+#define CERT_STORE_DELETE_FLAG                          0x00000010
+#define CERT_STORE_UNSAFE_PHYSICAL_FLAG                 0x00000020
+#define CERT_STORE_SHARE_STORE_FLAG                     0x00000040
+#define CERT_STORE_SHARE_CONTEXT_FLAG                   0x00000080
+#define CERT_STORE_MANIFOLD_FLAG                        0x00000100
+#define CERT_STORE_ENUM_ARCHIVED_FLAG                   0x00000200
+#define CERT_STORE_UPDATE_KEYID_FLAG                    0x00000400
+#define CERT_STORE_BACKUP_RESTORE_FLAG                  0x00000800
+#define CERT_STORE_READONLY_FLAG                        0x00008000
+#define CERT_STORE_OPEN_EXISTING_FLAG                   0x00004000
+#define CERT_STORE_CREATE_NEW_FLAG                      0x00002000
+#define CERT_STORE_MAXIMUM_ALLOWED_FLAG                 0x00001000
+
+//+-------------------------------------------------------------------------
+//  Certificate Store Provider flags are in the HiWord (0xFFFF0000)
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Certificate System Store Flag Values
+//--------------------------------------------------------------------------
+// Includes flags and location
+#define CERT_SYSTEM_STORE_MASK                  0xFFFF0000
+
+// Set if pvPara points to a CERT_SYSTEM_STORE_RELOCATE_PARA structure
+#define CERT_SYSTEM_STORE_RELOCATE_FLAG         0x80000000
+
+typedef struct _CERT_SYSTEM_STORE_RELOCATE_PARA {
+    union {
+        HKEY                hKeyBase;
+        void                *pvBase;
+    };
+    union {
+        void                *pvSystemStore;
+        LPCSTR              pszSystemStore;
+        LPCWSTR             pwszSystemStore;
+    };
+} CERT_SYSTEM_STORE_RELOCATE_PARA, *PCERT_SYSTEM_STORE_RELOCATE_PARA;
+
+// By default, when the CurrentUser "Root" store is opened, any SystemRegistry
+// roots not also on the protected root list are deleted from the cache before
+// CertOpenStore() returns. Set the following flag to return all the roots
+// in the SystemRegistry without checking the protected root list.
+#define CERT_SYSTEM_STORE_UNPROTECTED_FLAG      0x40000000
+
+// Location of the system store:
+#define CERT_SYSTEM_STORE_LOCATION_MASK         0x00FF0000
+#define CERT_SYSTEM_STORE_LOCATION_SHIFT        16
+
+
+//  Registry: HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
+#define CERT_SYSTEM_STORE_CURRENT_USER_ID       1
+#define CERT_SYSTEM_STORE_LOCAL_MACHINE_ID      2
+//  Registry: HKEY_LOCAL_MACHINE\Software\Microsoft\Cryptography\Services
+#define CERT_SYSTEM_STORE_CURRENT_SERVICE_ID    4
+#define CERT_SYSTEM_STORE_SERVICES_ID           5
+//  Registry: HKEY_USERS
+#define CERT_SYSTEM_STORE_USERS_ID              6
+
+//  Registry: HKEY_CURRENT_USER\Software\Policies\Microsoft\SystemCertificates
+#define CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID    7
+//  Registry: HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\SystemCertificates
+#define CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID   8
+
+//  Registry: HKEY_LOCAL_MACHINE\Software\Microsoft\EnterpriseCertificates
+#define CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID     9
+
+#define CERT_SYSTEM_STORE_CURRENT_USER          \
+    (CERT_SYSTEM_STORE_CURRENT_USER_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT)
+#define CERT_SYSTEM_STORE_LOCAL_MACHINE         \
+    (CERT_SYSTEM_STORE_LOCAL_MACHINE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT)
+#define CERT_SYSTEM_STORE_CURRENT_SERVICE       \
+    (CERT_SYSTEM_STORE_CURRENT_SERVICE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT)
+#define CERT_SYSTEM_STORE_SERVICES              \
+    (CERT_SYSTEM_STORE_SERVICES_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT)
+#define CERT_SYSTEM_STORE_USERS                 \
+    (CERT_SYSTEM_STORE_USERS_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT)
+
+#define CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY   \
+    (CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID << \
+        CERT_SYSTEM_STORE_LOCATION_SHIFT)
+#define CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY  \
+    (CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID << \
+        CERT_SYSTEM_STORE_LOCATION_SHIFT)
+
+#define CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE  \
+    (CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID << \
+        CERT_SYSTEM_STORE_LOCATION_SHIFT)
+
+
+//+-------------------------------------------------------------------------
+//  Group Policy Store Defines
+//--------------------------------------------------------------------------
+// Registry path to the Group Policy system stores
+#define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \
+    L"Software\\Policies\\Microsoft\\SystemCertificates"
+
+
+//+-------------------------------------------------------------------------
+//  EFS Defines
+//--------------------------------------------------------------------------
+// Registry path to the EFS EFSBlob SubKey - Value type is REG_BINARY
+#define CERT_EFSBLOB_REGPATH    \
+    CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH L"\\EFS"
+#define CERT_EFSBLOB_VALUE_NAME L"EFSBlob"
+
+//+-------------------------------------------------------------------------
+//  Protected Root Defines
+//--------------------------------------------------------------------------
+// Registry path to the Protected Roots Flags SubKey
+#define CERT_PROT_ROOT_FLAGS_REGPATH    \
+    CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH L"\\Root\\ProtectedRoots"
+#define CERT_PROT_ROOT_FLAGS_VALUE_NAME L"Flags"
+
+// Set the following flag to inhibit the opening of the CurrentUser's
+// .Default physical store when opening the CurrentUser's "Root" system store.
+// The .Default physical store open's the CurrentUser SystemRegistry "Root"
+// store.
+#define CERT_PROT_ROOT_DISABLE_CURRENT_USER_FLAG    0x1
+
+// Set the following flag to inhibit the adding of roots from the
+// CurrentUser SystemRegistry "Root" store to the protected root list
+// when the "Root" store is initially protected.
+#define CERT_PROT_ROOT_INHIBIT_ADD_AT_INIT_FLAG     0x2
+
+// Set the following flag to inhibit the purging of protected roots from the
+// CurrentUser SystemRegistry "Root" store that are
+// also in the LocalMachine SystemRegistry "Root" store. Note, when not
+// disabled, the purging is done silently without UI.
+#define CERT_PROT_ROOT_INHIBIT_PURGE_LM_FLAG        0x4
+
+// Set the following flag to inhibit the opening of the LocalMachine's
+// .AuthRoot physical store when opening the LocalMachine's "Root" system store.
+// The .AuthRoot physical store open's the LocalMachine SystemRegistry
+// "AuthRoot" store. The "AuthRoot" store contains the pre-installed
+// SSL ServerAuth and the ActiveX Authenticode "root" certificates.
+#define CERT_PROT_ROOT_DISABLE_LM_AUTH_FLAG         0x8
+
+// The semantics for the following legacy definition has been changed to be
+// the same as for the CERT_PROT_ROOT_DISABLE_LM_AUTH_FLAG.
+#define CERT_PROT_ROOT_ONLY_LM_GPT_FLAG             0x8
+
+// Set the following flag to disable the requiring of the issuing CA
+// certificate being in the "NTAuth" system registry store found in the
+// CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE store location.
+//
+// When set, CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_NT_AUTH)
+// will check that the chain has a valid name constraint for all name
+// spaces, including UPN if the issuing CA isn't in the "NTAuth" store.
+#define CERT_PROT_ROOT_DISABLE_NT_AUTH_REQUIRED_FLAG 0x10
+
+// Set the following flag to disable checking for not defined name
+// constraints.
+//
+// When set, CertGetCertificateChain won't check for or set the following
+// dwErrorStatus: CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT.
+#define CERT_PROT_ROOT_DISABLE_NOT_DEFINED_NAME_CONSTRAINT_FLAG 0x20
+
+
+//+-------------------------------------------------------------------------
+//  Trusted Publisher Definitions
+//--------------------------------------------------------------------------
+// Registry path to the trusted publisher "Safer" group policy subkey
+#define CERT_TRUST_PUB_SAFER_GROUP_POLICY_REGPATH    \
+    CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH L"\\TrustedPublisher\\Safer"
+
+
+// Registry path to the Local Machine system stores
+#define CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH \
+    L"Software\\Microsoft\\SystemCertificates"
+
+// Registry path to the trusted publisher "Safer" local machine subkey
+#define CERT_TRUST_PUB_SAFER_LOCAL_MACHINE_REGPATH    \
+    CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH L"\\TrustedPublisher\\Safer"
+
+
+// "Safer" subkey value names. All values are DWORDs.
+#define CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME    L"AuthenticodeFlags"
+
+
+// AuthenticodeFlags definitions
+
+// Definition of who is allowed to trust publishers
+//
+// Setting allowed trust to MACHINE_ADMIN or ENTERPRISE_ADMIN disables UI,
+// only trusts publishers in the "TrustedPublisher" system store and
+// inhibits the opening of the CurrentUser's .Default physical store when
+// opening the CurrentUsers's "TrustedPublisher" system store.
+//
+// The .Default physical store open's the CurrentUser SystemRegistry
+// "TrustedPublisher" store.
+//
+// Setting allowed trust to ENTERPRISE_ADMIN only opens the
+// LocalMachine's .GroupPolicy and .Enterprise physical stores when opening
+// the CurrentUser's "TrustedPublisher" system store or when opening the
+// LocalMachine's "TrustedPublisher" system store.
+
+#define CERT_TRUST_PUB_ALLOW_TRUST_MASK                 0x00000003
+#define CERT_TRUST_PUB_ALLOW_END_USER_TRUST             0x00000000
+#define CERT_TRUST_PUB_ALLOW_MACHINE_ADMIN_TRUST        0x00000001
+#define CERT_TRUST_PUB_ALLOW_ENTERPRISE_ADMIN_TRUST     0x00000002
+
+// Set the following flag to enable revocation checking of the publisher
+// chain.
+#define CERT_TRUST_PUB_CHECK_PUBLISHER_REV_FLAG         0x00000100
+
+// Set the following flag to enable revocation checking of the time stamp
+// chain.
+#define CERT_TRUST_PUB_CHECK_TIMESTAMP_REV_FLAG         0x00000200
+
+
+//+-------------------------------------------------------------------------
+//  OCM Subcomponents Definitions
+//--------------------------------------------------------------------------
+
+// Registry path to the OCM Subcomponents local machine subkey
+#define CERT_OCM_SUBCOMPONENTS_LOCAL_MACHINE_REGPATH        \
+    L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\OC Manager\\Subcomponents"
+
+// REG_DWORD, 1 is installed, 0 is NOT installed
+#define CERT_OCM_SUBCOMPONENTS_ROOT_AUTO_UPDATE_VALUE_NAME  L"RootAutoUpdate"
+    
+
+//+-------------------------------------------------------------------------
+//  AuthRoot Auto Update Definitions
+//--------------------------------------------------------------------------
+
+// Registry path to the AuthRoot "Auto Update" local machine subkey
+#define CERT_AUTH_ROOT_AUTO_UPDATE_LOCAL_MACHINE_REGPATH    \
+    CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH L"\\AuthRoot\\AutoUpdate"
+
+
+// AuthRoot Auto Update subkey value names.
+
+// REG_SZ, URL to the directory containing the AuthRoots, CTL and Seq files
+#define CERT_AUTH_ROOT_AUTO_UPDATE_ROOT_DIR_URL_VALUE_NAME      L"RootDirUrl"
+
+// REG_DWORD, seconds between syncs. 0 implies use default.
+#define CERT_AUTH_ROOT_AUTO_UPDATE_SYNC_DELTA_TIME_VALUE_NAME   L"SyncDeltaTime"
+
+// REG_DWORD, misc flags
+#define CERT_AUTH_ROOT_AUTO_UPDATE_FLAGS_VALUE_NAME             L"Flags"
+
+#define CERT_AUTH_ROOT_AUTO_UPDATE_DISABLE_UNTRUSTED_ROOT_LOGGING_FLAG  0x1
+#define CERT_AUTH_ROOT_AUTO_UPDATE_DISABLE_PARTIAL_CHAIN_LOGGING_FLAG   0x2
+
+
+// AuthRoot Auto Update filenames
+
+// CTL containing the list of certs in the AuthRoot store
+#define CERT_AUTH_ROOT_CTL_FILENAME                             L"authroot.stl"
+#define CERT_AUTH_ROOT_CTL_FILENAME_A                           "authroot.stl"
+
+// Cab containing the above CTL
+#define CERT_AUTH_ROOT_CAB_FILENAME                             L"authrootstl.cab"
+
+// SequenceNumber (Formatted as big endian ascii hex)
+#define CERT_AUTH_ROOT_SEQ_FILENAME                             L"authrootseq.txt"
+
+// Root certs extension
+#define CERT_AUTH_ROOT_CERT_EXT                                 L".crt"
+
+
+
+//+-------------------------------------------------------------------------
+//  Certificate Registry Store Flag Values (CERT_STORE_REG)
+//--------------------------------------------------------------------------
+
+// Set this flag if the HKEY passed in pvPara points to a remote computer
+// registry key.
+#define CERT_REGISTRY_STORE_REMOTE_FLAG         0x10000
+
+// Set this flag if the contexts are to be persisted as a single serialized
+// store in the registry. Mainly used for stores downloaded from the GPT.
+// Such as the CurrentUserGroupPolicy or LocalMachineGroupPolicy stores.
+#define CERT_REGISTRY_STORE_SERIALIZED_FLAG     0x20000
+
+// The following flags are for internal use. When set, the
+// pvPara parameter passed to CertOpenStore is a pointer to the following
+// data structure and not the HKEY. The above CERT_REGISTRY_STORE_REMOTE_FLAG
+// is also set if hKeyBase was obtained via RegConnectRegistry().
+#define CERT_REGISTRY_STORE_CLIENT_GPT_FLAG     0x80000000
+#define CERT_REGISTRY_STORE_LM_GPT_FLAG         0x01000000
+
+typedef struct _CERT_REGISTRY_STORE_CLIENT_GPT_PARA {
+    HKEY                hKeyBase;
+    LPWSTR              pwszRegPath;
+} CERT_REGISTRY_STORE_CLIENT_GPT_PARA, *PCERT_REGISTRY_STORE_CLIENT_GPT_PARA;
+
+// The following flag is for internal use. When set, the contexts are
+// persisted into roaming files instead of the registry. Such as, the
+// CurrentUser "My" store. When this flag is set, the following data structure
+// is passed to CertOpenStore instead of HKEY.
+#define CERT_REGISTRY_STORE_ROAMING_FLAG        0x40000
+
+// hKey may be NULL or non-NULL. When non-NULL, existing contexts are
+// moved from the registry to roaming files.
+typedef struct _CERT_REGISTRY_STORE_ROAMING_PARA {
+    HKEY                hKey;
+    LPWSTR              pwszStoreDirectory;
+} CERT_REGISTRY_STORE_ROAMING_PARA, *PCERT_REGISTRY_STORE_ROAMING_PARA;
+
+// The following flag is for internal use. When set, the "My" DWORD value
+// at HKLM\Software\Microsoft\Cryptography\IEDirtyFlags is set to 0x1
+// whenever a certificate is added to the registry store.
+//
+// Legacy definition, no longer supported after 01-May-02 (.Net Server)
+#define CERT_REGISTRY_STORE_MY_IE_DIRTY_FLAG    0x80000
+
+// Registry path to the subkey containing the "My" DWORD value to be set
+//
+// Legacy definition, no longer supported after 01-May-02 (.Net Server)
+#define CERT_IE_DIRTY_FLAGS_REGPATH \
+    L"Software\\Microsoft\\Cryptography\\IEDirtyFlags"
+
+//+-------------------------------------------------------------------------
+//  Certificate File Store Flag Values for the providers:
+//      CERT_STORE_PROV_FILE
+//      CERT_STORE_PROV_FILENAME
+//      CERT_STORE_PROV_FILENAME_A
+//      CERT_STORE_PROV_FILENAME_W
+//      sz_CERT_STORE_PROV_FILENAME_W
+//--------------------------------------------------------------------------
+
+// Set this flag if any store changes are to be committed to the file.
+// The changes are committed at CertCloseStore or by calling
+// CertControlStore(CERT_STORE_CTRL_COMMIT).
+//
+// The open fails with E_INVALIDARG if both CERT_FILE_STORE_COMMIT_ENABLE_FLAG
+// and CERT_STORE_READONLY_FLAG are set in dwFlags.
+//
+// For the FILENAME providers:  if the file contains an X509 encoded
+// certificate, the open fails with ERROR_ACCESS_DENIED.
+//
+// For the FILENAME providers: if CERT_STORE_CREATE_NEW_FLAG is set, the
+// CreateFile uses CREATE_NEW. If CERT_STORE_OPEN_EXISTING is set, uses
+// OPEN_EXISTING. Otherwise, defaults to OPEN_ALWAYS.
+//
+// For the FILENAME providers:  the file is committed as either a PKCS7 or
+// serialized store depending on the type read at open. However, if the
+// file is empty then, if the filename has either a ".p7c" or ".spc"
+// extension its committed as a PKCS7. Otherwise, its committed as a
+// serialized store.
+//
+// For CERT_STORE_PROV_FILE, the file handle is duplicated. Its always
+// committed as a serialized store.
+//
+#define CERT_FILE_STORE_COMMIT_ENABLE_FLAG      0x10000
+
+
+//+-------------------------------------------------------------------------
+//  Certificate LDAP Store Flag Values for the providers:
+//      CERT_STORE_PROV_LDAP
+//      CERT_STORE_PROV_LDAP_W
+//      sz_CERT_STORE_PROV_LDAP_W
+//      sz_CERT_STORE_PROV_LDAP
+//--------------------------------------------------------------------------
+
+// Set this flag to digitally sign all of the ldap traffic to and from a
+// Windows 2000 LDAP server using the Kerberos authentication protocol.
+// This feature provides integrity required by some applications. 
+//
+#define CERT_LDAP_STORE_SIGN_FLAG               0x10000
+
+// Performs an A-Record only DNS lookup on the supplied host string.
+// This prevents bogus DNS queries from being generated when resolving host
+// names. Use this flag whenever passing a hostname as opposed to a
+// domain name for the hostname parameter. 
+//
+// See LDAP_OPT_AREC_EXCLUSIVE defined in winldap.h for more details.
+#define CERT_LDAP_STORE_AREC_EXCLUSIVE_FLAG     0x20000
+
+// Set this flag if the LDAP session handle has already been opened. When
+// set, pvPara points to the following CERT_LDAP_STORE_OPENED_PARA structure.
+#define CERT_LDAP_STORE_OPENED_FLAG             0x40000
+
+typedef struct _CERT_LDAP_STORE_OPENED_PARA {
+    void        *pvLdapSessionHandle;   // The (LDAP *) handle returned by
+                                        // ldap_init
+    LPCWSTR     pwszLdapUrl;
+} CERT_LDAP_STORE_OPENED_PARA, *PCERT_LDAP_STORE_OPENED_PARA;
+
+
+// Set this flag if the above CERT_LDAP_STORE_OPENED_FLAG is set and
+// you want an ldap_unbind() of the above pvLdapSessionHandle when the
+// store is closed. Note, if CertOpenStore() fails, then, ldap_unbind()
+// isn't called.
+#define CERT_LDAP_STORE_UNBIND_FLAG             0x80000
+
+//+-------------------------------------------------------------------------
+//  Open the cert store using the specified store provider.
+//
+//  If CERT_STORE_DELETE_FLAG is set, then, the store is deleted. NULL is
+//  returned for both success and failure. However, GetLastError() returns 0
+//  for success and nonzero for failure.
+//
+//  If CERT_STORE_SET_LOCALIZED_NAME_FLAG is set, then, if supported, the
+//  provider sets the store's CERT_STORE_LOCALIZED_NAME_PROP_ID property.
+//  The store's localized name can be retrieved by calling
+//  CertSetStoreProperty(dwPropID = CERT_STORE_LOCALIZED_NAME_PROP_ID).
+//  This flag is supported by the following providers (and their sz_
+//  equivalent):
+//      CERT_STORE_PROV_FILENAME_A
+//      CERT_STORE_PROV_FILENAME_W
+//      CERT_STORE_PROV_SYSTEM_A
+//      CERT_STORE_PROV_SYSTEM_W
+//      CERT_STORE_PROV_SYSTEM_REGISTRY_A
+//      CERT_STORE_PROV_SYSTEM_REGISTRY_W
+//      CERT_STORE_PROV_PHYSICAL_W
+//
+//  If CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG is set, then, the
+//  closing of the store's provider is deferred until all certificate,
+//  CRL and CTL contexts obtained from the store are freed. Also,
+//  if a non NULL HCRYPTPROV was passed, then, it will continue to be used.
+//  By default, the store's provider is closed on the final CertCloseStore.
+//  If this flag isn't set, then, any property changes made to previously
+//  duplicated contexts after the final CertCloseStore will not be persisted.
+//  By setting this flag, property changes made
+//  after the CertCloseStore will be persisted. Note, setting this flag
+//  causes extra overhead in doing context duplicates and frees.
+//  If CertCloseStore is called with CERT_CLOSE_STORE_FORCE_FLAG, then,
+//  the CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG flag is ignored.
+//
+//  CERT_STORE_MANIFOLD_FLAG can be set to check for certificates having the
+//  manifold extension and archive the "older" certificates with the same
+//  manifold extension value. A certificate is archived by setting the
+//  CERT_ARCHIVED_PROP_ID.
+//
+//  By default, contexts having the CERT_ARCHIVED_PROP_ID, are skipped
+//  during enumeration. CERT_STORE_ENUM_ARCHIVED_FLAG can be set to include
+//  archived contexts when enumerating. Note, contexts having the
+//  CERT_ARCHIVED_PROP_ID are still found for explicit finds, such as,
+//  finding a context with a specific hash or finding a certificate having
+//  a specific issuer and serial number.
+//
+//  CERT_STORE_UPDATE_KEYID_FLAG can be set to also update the Key Identifier's
+//  CERT_KEY_PROV_INFO_PROP_ID property whenever a certificate's
+//  CERT_KEY_IDENTIFIER_PROP_ID or CERT_KEY_PROV_INFO_PROP_ID property is set
+//  and the other property already exists. If the Key Identifier's
+//  CERT_KEY_PROV_INFO_PROP_ID already exists, it isn't updated. Any
+//  errors encountered are silently ignored.
+//
+//  By default, this flag is implicitly set for the "My\.Default" CurrentUser
+//  and LocalMachine physical stores.
+//
+//  CERT_STORE_READONLY_FLAG can be set to open the store as read only.
+//  Otherwise, the store is opened as read/write.
+//
+//  CERT_STORE_OPEN_EXISTING_FLAG can be set to only open an existing
+//  store. CERT_STORE_CREATE_NEW_FLAG can be set to create a new store and
+//  fail if the store already exists. Otherwise, the default is to open
+//  an existing store or create a new store if it doesn't already exist.
+//
+//  hCryptProv specifies the crypto provider to use to create the hash
+//  properties or verify the signature of a subject certificate or CRL.
+//  The store doesn't need to use a private
+//  key. If the CERT_STORE_NO_CRYPT_RELEASE_FLAG isn't set, hCryptProv is
+//  CryptReleaseContext'ed on the final CertCloseStore.
+//
+//  Note, if the open fails, hCryptProv is released if it would have been
+//  released when the store was closed.
+//
+//  If hCryptProv is zero, then, the default provider and container for the
+//  PROV_RSA_FULL provider type is CryptAcquireContext'ed with
+//  CRYPT_VERIFYCONTEXT access. The CryptAcquireContext is deferred until
+//  the first create hash or verify signature. In addition, once acquired,
+//  the default provider isn't released until process exit when crypt32.dll
+//  is unloaded. The acquired default provider is shared across all stores
+//  and threads.
+//
+//  After initializing the store's data structures and optionally acquiring a
+//  default crypt provider, CertOpenStore calls CryptGetOIDFunctionAddress to
+//  get the address of the CRYPT_OID_OPEN_STORE_PROV_FUNC specified by
+//  lpszStoreProvider. Since a store can contain certificates with different
+//  encoding types, CryptGetOIDFunctionAddress is called with dwEncodingType
+//  set to 0 and not the dwEncodingType passed to CertOpenStore.
+//  PFN_CERT_DLL_OPEN_STORE_FUNC specifies the signature of the provider's
+//  open function. This provider open function is called to load the
+//  store's certificates and CRLs. Optionally, the provider may return an
+//  array of functions called before a certificate or CRL is added or deleted
+//  or has a property that is set.
+//
+//  Use of the dwEncodingType parameter is provider dependent. The type
+//  definition for pvPara also depends on the provider.
+//
+//  Store providers are installed or registered via
+//  CryptInstallOIDFunctionAddress or CryptRegisterOIDFunction, where,
+//  dwEncodingType is 0 and pszFuncName is CRYPT_OID_OPEN_STORE_PROV_FUNC.
+//
+//  Here's a list of the predefined provider types (implemented in crypt32.dll):
+//
+//  CERT_STORE_PROV_MSG:
+//      Gets the certificates and CRLs from the specified cryptographic message.
+//      dwEncodingType contains the message and certificate encoding types.
+//      The message's handle is passed in pvPara. Given,
+//          HCRYPTMSG hCryptMsg; pvPara = (const void *) hCryptMsg;
+//
+//  CERT_STORE_PROV_MEMORY
+//  sz_CERT_STORE_PROV_MEMORY:
+//      Opens a store without any initial certificates or CRLs. pvPara
+//      isn't used.
+//
+//  CERT_STORE_PROV_FILE:
+//      Reads the certificates and CRLs from the specified file. The file's
+//      handle is passed in pvPara. Given,
+//          HANDLE hFile; pvPara = (const void *) hFile;
+//
+//      For a successful open, the file pointer is advanced past
+//      the certificates and CRLs and their properties read from the file.
+//      Note, only expects a serialized store and not a file containing
+//      either a PKCS #7 signed message or a single encoded certificate.
+//
+//      The hFile isn't closed.
+//
+//  CERT_STORE_PROV_REG:
+//      Reads the certificates and CRLs from the registry. The registry's
+//      key handle is passed in pvPara. Given,
+//          HKEY hKey; pvPara = (const void *) hKey;
+//
+//      The input hKey isn't closed by the provider. Before returning, the
+//      provider opens it own copy of the hKey.
+//
+//      If CERT_STORE_READONLY_FLAG is set, then, the registry subkeys are
+//      RegOpenKey'ed with KEY_READ_ACCESS. Otherwise, the registry subkeys
+//      are RegCreateKey'ed with KEY_ALL_ACCESS.
+//
+//      This provider returns the array of functions for reading, writing,
+//      deleting and property setting certificates and CRLs.
+//      Any changes to the opened store are immediately pushed through to
+//      the registry. However, if CERT_STORE_READONLY_FLAG is set, then,
+//      writing, deleting or property setting results in a
+//      SetLastError(E_ACCESSDENIED).
+//
+//      Note, all the certificates and CRLs are read from the registry
+//      when the store is opened. The opened store serves as a write through
+//      cache.
+//
+//      If CERT_REGISTRY_STORE_SERIALIZED_FLAG is set, then, the
+//      contexts are persisted as a single serialized store subkey in the
+//      registry.
+//
+//  CERT_STORE_PROV_PKCS7:
+//  sz_CERT_STORE_PROV_PKCS7:
+//      Gets the certificates and CRLs from the encoded PKCS #7 signed message.
+//      dwEncodingType specifies the message and certificate encoding types.
+//      The pointer to the encoded message's blob is passed in pvPara. Given,
+//          CRYPT_DATA_BLOB EncodedMsg; pvPara = (const void *) &EncodedMsg;
+//
+//      Note, also supports the IE3.0 special version of a
+//      PKCS #7 signed message referred to as a "SPC" formatted message.
+//
+//  CERT_STORE_PROV_SERIALIZED:
+//  sz_CERT_STORE_PROV_SERIALIZED:
+//      Gets the certificates and CRLs from memory containing a serialized
+//      store.  The pointer to the serialized memory blob is passed in pvPara.
+//      Given,
+//          CRYPT_DATA_BLOB Serialized; pvPara = (const void *) &Serialized;
+//
+//  CERT_STORE_PROV_FILENAME_A:
+//  CERT_STORE_PROV_FILENAME_W:
+//  CERT_STORE_PROV_FILENAME:
+//  sz_CERT_STORE_PROV_FILENAME_W:
+//  sz_CERT_STORE_PROV_FILENAME:
+//      Opens the file and first attempts to read as a serialized store. Then,
+//      as a PKCS #7 signed message. Finally, as a single encoded certificate.
+//      The filename is passed in pvPara. The filename is UNICODE for the
+//      "_W" provider and ASCII for the "_A" provider. For "_W": given,
+//          LPCWSTR pwszFilename; pvPara = (const void *) pwszFilename;
+//      For "_A": given,
+//          LPCSTR pszFilename; pvPara = (const void *) pszFilename;
+//
+//      Note, the default (without "_A" or "_W") is unicode.
+//
+//      Note, also supports the reading of the IE3.0 special version of a
+//      PKCS #7 signed message file referred to as a "SPC" formatted file.
+//
+//  CERT_STORE_PROV_SYSTEM_A:
+//  CERT_STORE_PROV_SYSTEM_W:
+//  CERT_STORE_PROV_SYSTEM:
+//  sz_CERT_STORE_PROV_SYSTEM_W:
+//  sz_CERT_STORE_PROV_SYSTEM:
+//      Opens the specified logical "System" store. The upper word of the
+//      dwFlags parameter is used to specify the location of the system store.
+//
+//      A "System" store is a collection consisting of one or more "Physical"
+//      stores. A "Physical" store is registered via the
+//      CertRegisterPhysicalStore API. Each of the registered physical stores
+//      is CertStoreOpen'ed and added to the collection via
+//      CertAddStoreToCollection.
+//
+//      The CERT_SYSTEM_STORE_CURRENT_USER, CERT_SYSTEM_STORE_LOCAL_MACHINE,
+//      CERT_SYSTEM_STORE_CURRENT_SERVICE, CERT_SYSTEM_STORE_SERVICES,
+//      CERT_SYSTEM_STORE_USERS, CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY,
+//      CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY and
+//      CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRSE
+//      system stores by default have a "SystemRegistry" store that is
+//      opened and added to the collection.
+//
+//      The system store name is passed in pvPara. The name is UNICODE for the
+//      "_W" provider and ASCII for the "_A" provider. For "_W": given,
+//          LPCWSTR pwszSystemName; pvPara = (const void *) pwszSystemName;
+//      For "_A": given,
+//          LPCSTR pszSystemName; pvPara = (const void *) pszSystemName;
+//
+//      Note, the default (without "_A" or "_W") is UNICODE.
+//
+//      The system store name can't contain any backslashes.
+//
+//      If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvPara
+//      points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure instead
+//      of pointing to a null terminated UNICODE or ASCII string.
+//      Sibling physical stores are also opened as relocated using
+//      pvPara's hKeyBase.
+//
+//      The CERT_SYSTEM_STORE_SERVICES or CERT_SYSTEM_STORE_USERS system
+//      store name must be prefixed with the ServiceName or UserName.
+//      For example, "ServiceName\Trust".
+//
+//      Stores on remote computers can be accessed for the
+//      CERT_SYSTEM_STORE_LOCAL_MACHINE, CERT_SYSTEM_STORE_SERVICES,
+//      CERT_SYSTEM_STORE_USERS, CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY
+//      or CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE
+//      locations by prepending the computer name. For example, a remote
+//      local machine store is accessed via "\\ComputerName\Trust" or
+//      "ComputerName\Trust". A remote service store is accessed via
+//      "\\ComputerName\ServiceName\Trust". The leading "\\" backslashes are
+//      optional in the ComputerName.
+//
+//      If CERT_STORE_READONLY_FLAG is set, then, the registry is
+//      RegOpenKey'ed with KEY_READ_ACCESS. Otherwise, the registry is
+//      RegCreateKey'ed with KEY_ALL_ACCESS.
+//
+//      The "root" store is treated differently from the other system
+//      stores. Before a certificate is added to or deleted from the "root"
+//      store, a pop up message box is displayed. The certificate's subject,
+//      issuer, serial number, time validity, sha1 and md5 thumbprints are
+//      displayed. The user is given the option to do the add or delete.
+//      If they don't allow the operation, LastError is set to E_ACCESSDENIED.
+//
+//  CERT_STORE_PROV_SYSTEM_REGISTRY_A
+//  CERT_STORE_PROV_SYSTEM_REGISTRY_W
+//  CERT_STORE_PROV_SYSTEM_REGISTRY
+//  sz_CERT_STORE_PROV_SYSTEM_REGISTRY_W
+//  sz_CERT_STORE_PROV_SYSTEM_REGISTRY
+//      Opens the "System" store's default "Physical" store residing in the
+//      registry. The upper word of the dwFlags
+//      parameter is used to specify the location of the system store.
+//
+//      After opening the registry key associated with the system name,
+//      the CERT_STORE_PROV_REG provider is called to complete the open.
+//
+//      The system store name is passed in pvPara. The name is UNICODE for the
+//      "_W" provider and ASCII for the "_A" provider. For "_W": given,
+//          LPCWSTR pwszSystemName; pvPara = (const void *) pwszSystemName;
+//      For "_A": given,
+//          LPCSTR pszSystemName; pvPara = (const void *) pszSystemName;
+//
+//      Note, the default (without "_A" or "_W") is UNICODE.
+//
+//      If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvPara
+//      points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure instead
+//      of pointing to a null terminated UNICODE or ASCII string.
+//
+//      See above for details on prepending a ServiceName and/or ComputerName
+//      to the store name.
+//
+//      If CERT_STORE_READONLY_FLAG is set, then, the registry is
+//      RegOpenKey'ed with KEY_READ_ACCESS. Otherwise, the registry is
+//      RegCreateKey'ed with KEY_ALL_ACCESS.
+//
+//      The "root" store is treated differently from the other system
+//      stores. Before a certificate is added to or deleted from the "root"
+//      store, a pop up message box is displayed. The certificate's subject,
+//      issuer, serial number, time validity, sha1 and md5 thumbprints are
+//      displayed. The user is given the option to do the add or delete.
+//      If they don't allow the operation, LastError is set to E_ACCESSDENIED.
+//
+//  CERT_STORE_PROV_PHYSICAL_W
+//  CERT_STORE_PROV_PHYSICAL
+//  sz_CERT_STORE_PROV_PHYSICAL_W
+//  sz_CERT_STORE_PROV_PHYSICAL
+//      Opens the specified "Physical" store in the "System" store.
+//
+//      Both the system store and physical names are passed in pvPara. The
+//      names are separated with an intervening "\". For example,
+//      "Root\.Default". The string is UNICODE.
+//
+//      The system and physical store names can't contain any backslashes.
+//
+//      If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvPara
+//      points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure instead
+//      of pointing to a null terminated UNICODE string.
+//      The specified physical store is opened as relocated using pvPara's
+//      hKeyBase.
+//
+//      For CERT_SYSTEM_STORE_SERVICES or CERT_SYSTEM_STORE_USERS,
+//      the system and physical store names
+//      must be prefixed with the ServiceName or UserName. For example,
+//      "ServiceName\Root\.Default".
+//
+//      Physical stores on remote computers can be accessed for the
+//      CERT_SYSTEM_STORE_LOCAL_MACHINE, CERT_SYSTEM_STORE_SERVICES,
+//      CERT_SYSTEM_STORE_USERS, CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY
+//      or CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE
+//      locations by prepending the computer name. For example, a remote
+//      local machine store is accessed via "\\ComputerName\Root\.Default"
+//      or "ComputerName\Root\.Default". A remote service store is
+//      accessed via "\\ComputerName\ServiceName\Root\.Default". The
+//      leading "\\" backslashes are optional in the ComputerName.
+//
+//  CERT_STORE_PROV_COLLECTION
+//  sz_CERT_STORE_PROV_COLLECTION
+//      Opens a store that is a collection of other stores. Stores are
+//      added or removed to/from the collection via the CertAddStoreToCollection
+//      and CertRemoveStoreFromCollection APIs.
+//
+//  CERT_STORE_PROV_SMART_CARD_W
+//  CERT_STORE_PROV_SMART_CARD
+//  sz_CERT_STORE_PROV_SMART_CARD_W
+//  sz_CERT_STORE_PROV_SMART_CARD
+//      Opens a store instantiated over a particular smart card storage.  pvPara
+//      identifies where on the card the store is located and is of the
+//      following format:
+//
+//                Card Name\Provider Name\Provider Type[\Container Name]
+//
+//      Container Name is optional and if NOT specified the Card Name is used
+//      as the Container Name.  Future versions of the provider will support
+//      instantiating the store over the entire card in which case just
+//      Card Name ( or id ) will be sufficient.
+//
+//  Here's a list of the predefined provider types (implemented in
+//  cryptnet.dll):
+//
+//  CERT_STORE_PROV_LDAP_W
+//  CERT_STORE_PROV_LDAP
+//  sz_CERT_STORE_PROV_LDAP_W
+//  sz_CERT_STORE_PROV_LDAP
+//      Opens a store over the results of the query specified by and LDAP
+//      URL which is passed in via pvPara.  In order to do writes to the
+//      store the URL must specify a BASE query, no filter and a single
+//      attribute.
+//
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCERTSTORE
+WINAPI
+CertOpenStore(
+    IN LPCSTR lpszStoreProvider,
+    IN DWORD dwEncodingType,
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwFlags,
+    IN const void *pvPara
+    );
+
+
+//+-------------------------------------------------------------------------
+//  OID Installable Certificate Store Provider Data Structures
+//--------------------------------------------------------------------------
+
+// Handle returned by the store provider when opened.
+typedef void *HCERTSTOREPROV;
+
+// Store Provider OID function's pszFuncName.
+#define CRYPT_OID_OPEN_STORE_PROV_FUNC   "CertDllOpenStoreProv"
+
+// Note, the Store Provider OID function's dwEncodingType is always 0.
+
+// The following information is returned by the provider when opened. Its
+// zeroed with cbSize set before the provider is called. If the provider
+// doesn't need to be called again after the open it doesn't need to
+// make any updates to the CERT_STORE_PROV_INFO.
+typedef struct _CERT_STORE_PROV_INFO {
+    DWORD               cbSize;
+    DWORD               cStoreProvFunc;
+    void                **rgpvStoreProvFunc;
+    HCERTSTOREPROV      hStoreProv;
+    DWORD               dwStoreProvFlags;
+    HCRYPTOIDFUNCADDR   hStoreProvFuncAddr2;
+} CERT_STORE_PROV_INFO, *PCERT_STORE_PROV_INFO;
+
+// Definition of the store provider's open function.
+//
+// *pStoreProvInfo has been zeroed before the call.
+//
+// Note, pStoreProvInfo->cStoreProvFunc should be set last.  Once set,
+// all subsequent store calls, such as CertAddSerializedElementToStore will
+// call the appropriate provider callback function.
+typedef BOOL (WINAPI *PFN_CERT_DLL_OPEN_STORE_PROV_FUNC)(
+    IN LPCSTR lpszStoreProvider,
+    IN DWORD dwEncodingType,
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwFlags,
+    IN const void *pvPara,
+    IN HCERTSTORE hCertStore,
+    IN OUT PCERT_STORE_PROV_INFO pStoreProvInfo
+    );
+
+// The open callback sets the following flag, if it maintains its
+// contexts externally and not in the cached store.
+#define CERT_STORE_PROV_EXTERNAL_FLAG           0x1
+
+// The open callback sets the following flag for a successful delete.
+// When set, the close callback isn't called.
+#define CERT_STORE_PROV_DELETED_FLAG            0x2
+
+// The open callback sets the following flag if it doesn't persist store
+// changes.
+#define CERT_STORE_PROV_NO_PERSIST_FLAG         0x4
+
+// The open callback sets the following flag if the contexts are persisted
+// to a system store.
+#define CERT_STORE_PROV_SYSTEM_STORE_FLAG       0x8
+
+// The open callback sets the following flag if the contexts are persisted
+// to a LocalMachine system store.
+#define CERT_STORE_PROV_LM_SYSTEM_STORE_FLAG    0x10
+
+// Indices into the store provider's array of callback functions.
+//
+// The provider can implement any subset of the following functions. It
+// sets pStoreProvInfo->cStoreProvFunc to the last index + 1 and any
+// preceding not implemented functions to NULL.
+#define CERT_STORE_PROV_CLOSE_FUNC              0
+#define CERT_STORE_PROV_READ_CERT_FUNC          1
+#define CERT_STORE_PROV_WRITE_CERT_FUNC         2
+#define CERT_STORE_PROV_DELETE_CERT_FUNC        3
+#define CERT_STORE_PROV_SET_CERT_PROPERTY_FUNC  4
+#define CERT_STORE_PROV_READ_CRL_FUNC           5
+#define CERT_STORE_PROV_WRITE_CRL_FUNC          6
+#define CERT_STORE_PROV_DELETE_CRL_FUNC         7
+#define CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC   8
+#define CERT_STORE_PROV_READ_CTL_FUNC           9
+#define CERT_STORE_PROV_WRITE_CTL_FUNC          10
+#define CERT_STORE_PROV_DELETE_CTL_FUNC         11
+#define CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC   12
+#define CERT_STORE_PROV_CONTROL_FUNC            13
+#define CERT_STORE_PROV_FIND_CERT_FUNC          14
+#define CERT_STORE_PROV_FREE_FIND_CERT_FUNC     15
+#define CERT_STORE_PROV_GET_CERT_PROPERTY_FUNC  16
+#define CERT_STORE_PROV_FIND_CRL_FUNC           17
+#define CERT_STORE_PROV_FREE_FIND_CRL_FUNC      18
+#define CERT_STORE_PROV_GET_CRL_PROPERTY_FUNC   19
+#define CERT_STORE_PROV_FIND_CTL_FUNC           20
+#define CERT_STORE_PROV_FREE_FIND_CTL_FUNC      21
+#define CERT_STORE_PROV_GET_CTL_PROPERTY_FUNC   22
+
+
+// Called by CertCloseStore when the store's reference count is
+// decremented to 0.
+typedef void (WINAPI *PFN_CERT_STORE_PROV_CLOSE)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN DWORD dwFlags
+    );
+
+// Currently not called directly by the store APIs. However, may be exported
+// to support other providers based on it.
+//
+// Reads the provider's copy of the certificate context. If it exists,
+// creates a new certificate context.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_READ_CERT)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_CONTEXT pStoreCertContext,
+    IN DWORD dwFlags,
+    OUT PCCERT_CONTEXT *ppProvCertContext
+    );
+
+#define CERT_STORE_PROV_WRITE_ADD_FLAG      0x1
+
+// Called by CertAddEncodedCertificateToStore,
+// CertAddCertificateContextToStore or CertAddSerializedElementToStore before
+// adding to the store. The CERT_STORE_PROV_WRITE_ADD_FLAG is set. In
+// addition to the encoded certificate, the added pCertContext might also
+// have properties.
+//
+// Returns TRUE if its OK to update the the store.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_WRITE_CERT)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwFlags
+    );
+
+// Called by CertDeleteCertificateFromStore before deleting from the
+// store.
+//
+// Returns TRUE if its OK to delete from the store.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_DELETE_CERT)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwFlags
+    );
+
+// Called by CertSetCertificateContextProperty before setting the
+// certificate's property. Also called by CertGetCertificateContextProperty,
+// when getting a hash property that needs to be created and then persisted
+// via the set.
+//
+// Upon input, the property hasn't been set for the pCertContext parameter.
+//
+// Returns TRUE if its OK to set the property.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_SET_CERT_PROPERTY)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+// Currently not called directly by the store APIs. However, may be exported
+// to support other providers based on it.
+//
+// Reads the provider's copy of the CRL context. If it exists,
+// creates a new CRL context.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_READ_CRL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCRL_CONTEXT pStoreCrlContext,
+    IN DWORD dwFlags,
+    OUT PCCRL_CONTEXT *ppProvCrlContext
+    );
+
+// Called by CertAddEncodedCRLToStore,
+// CertAddCRLContextToStore or CertAddSerializedElementToStore before
+// adding to the store. The CERT_STORE_PROV_WRITE_ADD_FLAG is set. In
+// addition to the encoded CRL, the added pCertContext might also
+// have properties.
+//
+// Returns TRUE if its OK to update the the store.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_WRITE_CRL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwFlags
+    );
+
+// Called by CertDeleteCRLFromStore before deleting from the store.
+//
+// Returns TRUE if its OK to delete from the store.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_DELETE_CRL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwFlags
+    );
+
+// Called by CertSetCRLContextProperty before setting the
+// CRL's property. Also called by CertGetCRLContextProperty,
+// when getting a hash property that needs to be created and then persisted
+// via the set.
+//
+// Upon input, the property hasn't been set for the pCrlContext parameter.
+//
+// Returns TRUE if its OK to set the property.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_SET_CRL_PROPERTY)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+// Currently not called directly by the store APIs. However, may be exported
+// to support other providers based on it.
+//
+// Reads the provider's copy of the CTL context. If it exists,
+// creates a new CTL context.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_READ_CTL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCTL_CONTEXT pStoreCtlContext,
+    IN DWORD dwFlags,
+    OUT PCCTL_CONTEXT *ppProvCtlContext
+    );
+
+// Called by CertAddEncodedCTLToStore,
+// CertAddCTLContextToStore or CertAddSerializedElementToStore before
+// adding to the store. The CERT_STORE_PROV_WRITE_ADD_FLAG is set. In
+// addition to the encoded CTL, the added pCertContext might also
+// have properties.
+//
+// Returns TRUE if its OK to update the the store.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_WRITE_CTL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwFlags
+    );
+
+// Called by CertDeleteCTLFromStore before deleting from the store.
+//
+// Returns TRUE if its OK to delete from the store.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_DELETE_CTL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwFlags
+                                                     );
+
+// Called by CertSetCTLContextProperty before setting the
+// CTL's property. Also called by CertGetCTLContextProperty,
+// when getting a hash property that needs to be created and then persisted
+// via the set.
+//
+// Upon input, the property hasn't been set for the pCtlContext parameter.
+//
+// Returns TRUE if its OK to set the property.
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_SET_CTL_PROPERTY)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_CONTROL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN DWORD dwFlags,
+    IN DWORD dwCtrlType,
+    IN void const *pvCtrlPara
+    );
+
+typedef struct _CERT_STORE_PROV_FIND_INFO {
+    DWORD               cbSize;
+    DWORD               dwMsgAndCertEncodingType;
+    DWORD               dwFindFlags;
+    DWORD               dwFindType;
+    const void          *pvFindPara;
+} CERT_STORE_PROV_FIND_INFO, *PCERT_STORE_PROV_FIND_INFO;
+typedef const CERT_STORE_PROV_FIND_INFO CCERT_STORE_PROV_FIND_INFO,
+*PCCERT_STORE_PROV_FIND_INFO;
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_FIND_CERT)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_STORE_PROV_FIND_INFO pFindInfo,
+    IN PCCERT_CONTEXT pPrevCertContext,
+    IN DWORD dwFlags,
+    IN OUT void **ppvStoreProvFindInfo,
+    OUT PCCERT_CONTEXT *ppProvCertContext
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_FREE_FIND_CERT)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_CONTEXT pCertContext,
+    IN void *pvStoreProvFindInfo,
+    IN DWORD dwFlags
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_GET_CERT_PROPERTY)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_FIND_CRL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_STORE_PROV_FIND_INFO pFindInfo,
+    IN PCCRL_CONTEXT pPrevCrlContext,
+    IN DWORD dwFlags,
+    IN OUT void **ppvStoreProvFindInfo,
+    OUT PCCRL_CONTEXT *ppProvCrlContext
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_FREE_FIND_CRL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN void *pvStoreProvFindInfo,
+    IN DWORD dwFlags
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_GET_CRL_PROPERTY)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_FIND_CTL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCERT_STORE_PROV_FIND_INFO pFindInfo,
+    IN PCCTL_CONTEXT pPrevCtlContext,
+    IN DWORD dwFlags,
+    IN OUT void **ppvStoreProvFindInfo,
+    OUT PCCTL_CONTEXT *ppProvCtlContext
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_FREE_FIND_CTL)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN void *pvStoreProvFindInfo,
+    IN DWORD dwFlags
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_GET_CTL_PROPERTY)(
+    IN HCERTSTOREPROV hStoreProv,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Duplicate a cert store handle
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCERTSTORE
+WINAPI
+CertDuplicateStore(
+    IN HCERTSTORE hCertStore
+    );
+
+#define CERT_STORE_SAVE_AS_STORE        1
+#define CERT_STORE_SAVE_AS_PKCS7        2
+
+#define CERT_STORE_SAVE_TO_FILE         1
+#define CERT_STORE_SAVE_TO_MEMORY       2
+#define CERT_STORE_SAVE_TO_FILENAME_A   3
+#define CERT_STORE_SAVE_TO_FILENAME_W   4
+#define CERT_STORE_SAVE_TO_FILENAME     CERT_STORE_SAVE_TO_FILENAME_W
+
+//+-------------------------------------------------------------------------
+//  Save the cert store. Extended version with lots of options.
+//
+//  According to the dwSaveAs parameter, the store can be saved as a
+//  serialized store (CERT_STORE_SAVE_AS_STORE) containing properties in
+//  addition to encoded certificates, CRLs and CTLs or the store can be saved
+//  as a PKCS #7 signed message (CERT_STORE_SAVE_AS_PKCS7) which doesn't
+//  include the properties or CTLs.
+//
+//  Note, the CERT_KEY_CONTEXT_PROP_ID property (and its
+//  CERT_KEY_PROV_HANDLE_PROP_ID or CERT_KEY_SPEC_PROP_ID) isn't saved into
+//  a serialized store.
+//
+//  For CERT_STORE_SAVE_AS_PKCS7, the dwEncodingType specifies the message
+//  encoding type. The dwEncodingType parameter isn't used for
+//  CERT_STORE_SAVE_AS_STORE.
+//
+//  The dwFlags parameter currently isn't used and should be set to 0.
+//
+//  The dwSaveTo and pvSaveToPara parameters specify where to save the
+//  store as follows:
+//    CERT_STORE_SAVE_TO_FILE:
+//      Saves to the specified file. The file's handle is passed in
+//      pvSaveToPara. Given,
+//          HANDLE hFile; pvSaveToPara = (void *) hFile;
+//
+//      For a successful save, the file pointer is positioned after the
+//      last write.
+//
+//    CERT_STORE_SAVE_TO_MEMORY:
+//      Saves to the specified memory blob. The pointer to
+//      the memory blob is passed in pvSaveToPara. Given,
+//          CRYPT_DATA_BLOB SaveBlob; pvSaveToPara = (void *) &SaveBlob;
+//      Upon entry, the SaveBlob's pbData and cbData need to be initialized.
+//      Upon return, cbData is updated with the actual length.
+//      For a length only calculation, pbData should be set to NULL. If
+//      pbData is non-NULL and cbData isn't large enough, FALSE is returned
+//      with a last error of ERRROR_MORE_DATA.
+//
+//    CERT_STORE_SAVE_TO_FILENAME_A:
+//    CERT_STORE_SAVE_TO_FILENAME_W:
+//    CERT_STORE_SAVE_TO_FILENAME:
+//      Opens the file and saves to it. The filename is passed in pvSaveToPara.
+//      The filename is UNICODE for the "_W" option and ASCII for the "_A"
+//      option. For "_W": given,
+//          LPCWSTR pwszFilename; pvSaveToPara = (void *) pwszFilename;
+//      For "_A": given,
+//          LPCSTR pszFilename; pvSaveToPara = (void *) pszFilename;
+//
+//      Note, the default (without "_A" or "_W") is UNICODE.
+//
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSaveStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwEncodingType,
+    IN DWORD dwSaveAs,
+    IN DWORD dwSaveTo,
+    IN OUT void *pvSaveToPara,
+    IN DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Certificate Store close flags
+//--------------------------------------------------------------------------
+#define CERT_CLOSE_STORE_FORCE_FLAG         0x00000001
+#define CERT_CLOSE_STORE_CHECK_FLAG         0x00000002
+
+//+-------------------------------------------------------------------------
+//  Close a cert store handle.
+//
+//  There needs to be a corresponding close for each open and duplicate.
+//
+//  Even on the final close, the cert store isn't freed until all of its
+//  certificate and CRL contexts have also been freed.
+//
+//  On the final close, the hCryptProv passed to CertStoreOpen is
+//  CryptReleaseContext'ed.
+//
+//  To force the closure of the store with all of its memory freed, set the
+//  CERT_STORE_CLOSE_FORCE_FLAG. This flag should be set when the caller does
+//  its own reference counting and wants everything to vanish.
+//
+//  To check if all the store's certificates and CRLs have been freed and that
+//  this is the last CertCloseStore, set the CERT_CLOSE_STORE_CHECK_FLAG. If
+//  set and certs, CRLs or stores still need to be freed/closed, FALSE is
+//  returned with LastError set to CRYPT_E_PENDING_CLOSE. Note, for FALSE,
+//  the store is still closed. This is a diagnostic flag.
+//
+//  LastError is preserved unless CERT_CLOSE_STORE_CHECK_FLAG is set and FALSE
+//  is returned.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertCloseStore(
+    IN HCERTSTORE hCertStore,
+    DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the subject certificate context uniquely identified by its Issuer and
+//  SerialNumber from the store.
+//
+//  If the certificate isn't found, NULL is returned. Otherwise, a pointer to
+//  a read only CERT_CONTEXT is returned. CERT_CONTEXT must be freed by calling
+//  CertFreeCertificateContext. CertDuplicateCertificateContext can be called to make a
+//  duplicate.
+//
+//  The returned certificate might not be valid. Normally, it would be
+//  verified when getting its issuer certificate (CertGetIssuerCertificateFromStore).
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertGetSubjectCertificateFromStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwCertEncodingType,
+    IN PCERT_INFO pCertId           // Only the Issuer and SerialNumber
+    // fields are used
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the certificate contexts in the store.
+//
+//  If a certificate isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CERT_CONTEXT is returned. CERT_CONTEXT
+//  must be freed by calling CertFreeCertificateContext or is freed when passed as the
+//  pPrevCertContext on a subsequent call. CertDuplicateCertificateContext
+//  can be called to make a duplicate.
+//
+//  pPrevCertContext MUST BE NULL to enumerate the first
+//  certificate in the store. Successive certificates are enumerated by setting
+//  pPrevCertContext to the CERT_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCertContext is always CertFreeCertificateContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertEnumCertificatesInStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCERT_CONTEXT pPrevCertContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Find the first or next certificate context in the store.
+//
+//  The certificate is found according to the dwFindType and its pvFindPara.
+//  See below for a list of the find types and its parameters.
+//
+//  Currently dwFindFlags is only used for CERT_FIND_SUBJECT_ATTR,
+//  CERT_FIND_ISSUER_ATTR or CERT_FIND_CTL_USAGE. Otherwise, must be set to 0.
+//
+//  Usage of dwCertEncodingType depends on the dwFindType.
+//
+//  If the first or next certificate isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CERT_CONTEXT is returned. CERT_CONTEXT
+//  must be freed by calling CertFreeCertificateContext or is freed when passed as the
+//  pPrevCertContext on a subsequent call. CertDuplicateCertificateContext
+//  can be called to make a duplicate.
+//
+//  pPrevCertContext MUST BE NULL on the first
+//  call to find the certificate. To find the next certificate, the
+//  pPrevCertContext is set to the CERT_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCertContext is always CertFreeCertificateContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertFindCertificateInStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwCertEncodingType,
+    IN DWORD dwFindFlags,
+    IN DWORD dwFindType,
+    IN const void *pvFindPara,
+    IN PCCERT_CONTEXT pPrevCertContext
+    );
+
+
+//+-------------------------------------------------------------------------
+// Certificate comparison functions
+//--------------------------------------------------------------------------
+#define CERT_COMPARE_MASK           0xFFFF
+#define CERT_COMPARE_SHIFT          16
+#define CERT_COMPARE_ANY            0
+#define CERT_COMPARE_SHA1_HASH      1
+#define CERT_COMPARE_NAME           2
+#define CERT_COMPARE_ATTR           3
+#define CERT_COMPARE_MD5_HASH       4
+#define CERT_COMPARE_PROPERTY       5
+#define CERT_COMPARE_PUBLIC_KEY     6
+#define CERT_COMPARE_HASH           CERT_COMPARE_SHA1_HASH
+#define CERT_COMPARE_NAME_STR_A     7
+#define CERT_COMPARE_NAME_STR_W     8
+#define CERT_COMPARE_KEY_SPEC       9
+#define CERT_COMPARE_ENHKEY_USAGE   10
+#define CERT_COMPARE_CTL_USAGE      CERT_COMPARE_ENHKEY_USAGE
+#define CERT_COMPARE_SUBJECT_CERT   11
+#define CERT_COMPARE_ISSUER_OF      12
+#define CERT_COMPARE_EXISTING       13
+#define CERT_COMPARE_SIGNATURE_HASH 14
+#define CERT_COMPARE_KEY_IDENTIFIER 15
+#define CERT_COMPARE_CERT_ID        16
+#define CERT_COMPARE_CROSS_CERT_DIST_POINTS 17
+
+#define CERT_COMPARE_PUBKEY_MD5_HASH 18
+
+//+-------------------------------------------------------------------------
+//  dwFindType
+//
+//  The dwFindType definition consists of two components:
+//   - comparison function
+//   - certificate information flag
+//--------------------------------------------------------------------------
+#define CERT_FIND_ANY           (CERT_COMPARE_ANY << CERT_COMPARE_SHIFT)
+#define CERT_FIND_SHA1_HASH     (CERT_COMPARE_SHA1_HASH << CERT_COMPARE_SHIFT)
+#define CERT_FIND_MD5_HASH      (CERT_COMPARE_MD5_HASH << CERT_COMPARE_SHIFT)
+#define CERT_FIND_SIGNATURE_HASH (CERT_COMPARE_SIGNATURE_HASH << CERT_COMPARE_SHIFT)
+#define CERT_FIND_KEY_IDENTIFIER (CERT_COMPARE_KEY_IDENTIFIER << CERT_COMPARE_SHIFT)
+#define CERT_FIND_HASH          CERT_FIND_SHA1_HASH
+#define CERT_FIND_PROPERTY      (CERT_COMPARE_PROPERTY << CERT_COMPARE_SHIFT)
+#define CERT_FIND_PUBLIC_KEY    (CERT_COMPARE_PUBLIC_KEY << CERT_COMPARE_SHIFT)
+#define CERT_FIND_SUBJECT_NAME  (CERT_COMPARE_NAME << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_SUBJECT_FLAG)
+#define CERT_FIND_SUBJECT_ATTR  (CERT_COMPARE_ATTR << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_SUBJECT_FLAG)
+#define CERT_FIND_ISSUER_NAME   (CERT_COMPARE_NAME << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_ISSUER_FLAG)
+#define CERT_FIND_ISSUER_ATTR   (CERT_COMPARE_ATTR << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_ISSUER_FLAG)
+#define CERT_FIND_SUBJECT_STR_A (CERT_COMPARE_NAME_STR_A << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_SUBJECT_FLAG)
+#define CERT_FIND_SUBJECT_STR_W (CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_SUBJECT_FLAG)
+#define CERT_FIND_SUBJECT_STR   CERT_FIND_SUBJECT_STR_W
+#define CERT_FIND_ISSUER_STR_A  (CERT_COMPARE_NAME_STR_A << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_ISSUER_FLAG)
+#define CERT_FIND_ISSUER_STR_W  (CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT | \
+                                 CERT_INFO_ISSUER_FLAG)
+#define CERT_FIND_ISSUER_STR    CERT_FIND_ISSUER_STR_W
+#define CERT_FIND_KEY_SPEC      (CERT_COMPARE_KEY_SPEC << CERT_COMPARE_SHIFT)
+#define CERT_FIND_ENHKEY_USAGE  (CERT_COMPARE_ENHKEY_USAGE << CERT_COMPARE_SHIFT)
+#define CERT_FIND_CTL_USAGE     CERT_FIND_ENHKEY_USAGE
+
+#define CERT_FIND_SUBJECT_CERT  (CERT_COMPARE_SUBJECT_CERT << CERT_COMPARE_SHIFT)
+#define CERT_FIND_ISSUER_OF     (CERT_COMPARE_ISSUER_OF << CERT_COMPARE_SHIFT)
+#define CERT_FIND_EXISTING      (CERT_COMPARE_EXISTING << CERT_COMPARE_SHIFT)
+#define CERT_FIND_CERT_ID       (CERT_COMPARE_CERT_ID << CERT_COMPARE_SHIFT)
+#define CERT_FIND_CROSS_CERT_DIST_POINTS \
+                    (CERT_COMPARE_CROSS_CERT_DIST_POINTS << CERT_COMPARE_SHIFT)
+
+
+#define CERT_FIND_PUBKEY_MD5_HASH \
+                    (CERT_COMPARE_PUBKEY_MD5_HASH << CERT_COMPARE_SHIFT)
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_ANY
+//
+//  Find any certificate.
+//
+//  pvFindPara isn't used.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_HASH
+//
+//  Find a certificate with the specified hash.
+//
+//  pvFindPara points to a CRYPT_HASH_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_KEY_IDENTIFIER
+//
+//  Find a certificate with the specified KeyIdentifier. Gets the
+//  CERT_KEY_IDENTIFIER_PROP_ID property and compares with the input
+//  CRYPT_HASH_BLOB.
+//
+//  pvFindPara points to a CRYPT_HASH_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_PROPERTY
+//
+//  Find a certificate having the specified property.
+//
+//  pvFindPara points to a DWORD containing the PROP_ID
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_PUBLIC_KEY
+//
+//  Find a certificate matching the specified public key.
+//
+//  pvFindPara points to a CERT_PUBLIC_KEY_INFO containing the public key
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_SUBJECT_NAME
+//  CERT_FIND_ISSUER_NAME
+//
+//  Find a certificate with the specified subject/issuer name. Does an exact
+//  match of the entire name.
+//
+//  Restricts search to certificates matching the dwCertEncodingType.
+//
+//  pvFindPara points to a CERT_NAME_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_SUBJECT_ATTR
+//  CERT_FIND_ISSUER_ATTR
+//
+//  Find a certificate with the specified subject/issuer attributes.
+//
+//  Compares the attributes in the subject/issuer name with the
+//  Relative Distinguished Name's (CERT_RDN) array of attributes specified in
+//  pvFindPara. The comparison iterates through the CERT_RDN attributes and looks
+//  for an attribute match in any of the subject/issuer's RDNs.
+//
+//  The CERT_RDN_ATTR fields can have the following special values:
+//    pszObjId == NULL              - ignore the attribute object identifier
+//    dwValueType == RDN_ANY_TYPE   - ignore the value type
+//    Value.pbData == NULL          - match any value
+//
+//  CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG should be set in dwFindFlags to do
+//  a case insensitive match. Otherwise, defaults to an exact, case sensitive
+//  match.
+//
+//  CERT_UNICODE_IS_RDN_ATTRS_FLAG should be set in dwFindFlags if the RDN was
+//  initialized with unicode strings as for
+//  CryptEncodeObject(X509_UNICODE_NAME).
+//
+//  Restricts search to certificates matching the dwCertEncodingType.
+//
+//  pvFindPara points to a CERT_RDN (defined in wincert.h).
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_SUBJECT_STR_A
+//  CERT_FIND_SUBJECT_STR_W | CERT_FIND_SUBJECT_STR
+//  CERT_FIND_ISSUER_STR_A
+//  CERT_FIND_ISSUER_STR_W  | CERT_FIND_ISSUER_STR
+//
+//  Find a certificate containing the specified subject/issuer name string.
+//
+//  First, the certificate's subject/issuer is converted to a name string
+//  via CertNameToStrA/CertNameToStrW(CERT_SIMPLE_NAME_STR). Then, a
+//  case insensitive substring within string match is performed.
+//
+//  Restricts search to certificates matching the dwCertEncodingType.
+//
+//  For *_STR_A, pvFindPara points to a null terminated character string.
+//  For *_STR_W, pvFindPara points to a null terminated wide character string.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_KEY_SPEC
+//
+//  Find a certificate having a CERT_KEY_SPEC_PROP_ID property matching
+//  the specified KeySpec.
+//
+//  pvFindPara points to a DWORD containing the KeySpec.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_ENHKEY_USAGE
+//
+//  Find a certificate having the szOID_ENHANCED_KEY_USAGE extension or
+//  the CERT_ENHKEY_USAGE_PROP_ID and matching the specified pszUsageIdentifers.
+//
+//  pvFindPara points to a CERT_ENHKEY_USAGE data structure. If pvFindPara
+//  is NULL or CERT_ENHKEY_USAGE's cUsageIdentifier is 0, then, matches any
+//  certificate having enhanced key usage.
+//
+//  If the CERT_FIND_VALID_ENHKEY_USAGE_FLAG is set, then, only does a match
+//  for certificates that are valid for the specified usages. By default,
+//  the ceriticate must be valid for all usages. CERT_FIND_OR_ENHKEY_USAGE_FLAG
+//  can be set, if the certificate only needs to be valid for one of the
+//  specified usages. Note, CertGetValidUsages() is called to get the
+//  certificate's list of valid usages. Only the CERT_FIND_OR_ENHKEY_USAGE_FLAG
+//  is applicable when this flag is set.
+//
+//  The CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG can be set in dwFindFlags to
+//  also match a certificate without either the extension or property.
+//
+//  If CERT_FIND_NO_ENHKEY_USAGE_FLAG is set in dwFindFlags, finds
+//  certificates without the key usage extension or property. Setting this
+//  flag takes precedence over pvFindPara being NULL.
+//
+//  If the CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG is set, then, only does a match
+//  using the extension. If pvFindPara is NULL or cUsageIdentifier is set to
+//  0, finds certificates having the extension. If
+//  CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG is set, also matches a certificate
+//  without the extension. If CERT_FIND_NO_ENHKEY_USAGE_FLAG is set, finds
+//  certificates without the extension.
+//
+//  If the CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG is set, then, only does a match
+//  using the property. If pvFindPara is NULL or cUsageIdentifier is set to
+//  0, finds certificates having the property. If
+//  CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG is set, also matches a certificate
+//  without the property. If CERT_FIND_NO_ENHKEY_USAGE_FLAG is set, finds
+//  certificates without the property.
+//
+//  If CERT_FIND_OR_ENHKEY_USAGE_FLAG is set, does an "OR" match of any of
+//  the specified pszUsageIdentifiers. If not set, then, does an "AND" match
+//  of all of the specified pszUsageIdentifiers.
+//--------------------------------------------------------------------------
+
+#define CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG  0x1
+#define CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG  0x2
+#define CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG 0x4
+#define CERT_FIND_NO_ENHKEY_USAGE_FLAG        0x8
+#define CERT_FIND_OR_ENHKEY_USAGE_FLAG        0x10
+#define CERT_FIND_VALID_ENHKEY_USAGE_FLAG     0x20
+
+#define CERT_FIND_OPTIONAL_CTL_USAGE_FLAG   CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG
+
+#define CERT_FIND_EXT_ONLY_CTL_USAGE_FLAG \
+        CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG
+
+#define CERT_FIND_PROP_ONLY_CTL_USAGE_FLAG \
+        CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG
+
+#define CERT_FIND_NO_CTL_USAGE_FLAG         CERT_FIND_NO_ENHKEY_USAGE_FLAG
+#define CERT_FIND_OR_CTL_USAGE_FLAG         CERT_FIND_OR_ENHKEY_USAGE_FLAG
+#define CERT_FIND_VALID_CTL_USAGE_FLAG      CERT_FIND_VALID_ENHKEY_USAGE_FLAG
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_CERT_ID
+//
+//  Find a certificate with the specified CERT_ID.
+//
+//  pvFindPara points to a CERT_ID.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_FIND_CROSS_CERT_DIST_POINTS
+//
+//  Find a certificate having either a cross certificate distribution
+//  point extension or property.
+//
+//  pvFindPara isn't used.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Get the certificate context from the store for the first or next issuer
+//  of the specified subject certificate. Perform the enabled
+//  verification checks on the subject. (Note, the checks are on the subject
+//  using the returned issuer certificate.)
+//
+//  If the first or next issuer certificate isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CERT_CONTEXT is returned. CERT_CONTEXT
+//  must be freed by calling CertFreeCertificateContext or is freed when passed as the
+//  pPrevIssuerContext on a subsequent call. CertDuplicateCertificateContext
+//  can be called to make a duplicate.
+//
+//  For a self signed subject certificate, NULL is returned with LastError set
+//  to CERT_STORE_SELF_SIGNED. The enabled verification checks are still done.
+//
+//  The pSubjectContext may have been obtained from this store, another store
+//  or created by the caller application. When created by the caller, the
+//  CertCreateCertificateContext function must have been called.
+//
+//  An issuer may have multiple certificates. This may occur when the validity
+//  period is about to change. pPrevIssuerContext MUST BE NULL on the first
+//  call to get the issuer. To get the next certificate for the issuer, the
+//  pPrevIssuerContext is set to the CERT_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevIssuerContext is always CertFreeCertificateContext'ed by
+//  this function, even for an error.
+//
+//  The following flags can be set in *pdwFlags to enable verification checks
+//  on the subject certificate context:
+//      CERT_STORE_SIGNATURE_FLAG     - use the public key in the returned
+//                                      issuer certificate to verify the
+//                                      signature on the subject certificate.
+//                                      Note, if pSubjectContext->hCertStore ==
+//                                      hCertStore, the store provider might
+//                                      be able to eliminate a redo of
+//                                      the signature verify.
+//      CERT_STORE_TIME_VALIDITY_FLAG - get the current time and verify that
+//                                      its within the subject certificate's
+//                                      validity period
+//      CERT_STORE_REVOCATION_FLAG    - check if the subject certificate is on
+//                                      the issuer's revocation list
+//
+//  If an enabled verification check fails, then, its flag is set upon return.
+//  If CERT_STORE_REVOCATION_FLAG was enabled and the issuer doesn't have a
+//  CRL in the store, then, CERT_STORE_NO_CRL_FLAG is set in addition to
+//  the CERT_STORE_REVOCATION_FLAG.
+//
+//  If CERT_STORE_SIGNATURE_FLAG or CERT_STORE_REVOCATION_FLAG is set, then,
+//  CERT_STORE_NO_ISSUER_FLAG is set if it doesn't have an issuer certificate
+//  in the store.
+//
+//  For a verification check failure, a pointer to the issuer's CERT_CONTEXT
+//  is still returned and SetLastError isn't updated.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertGetIssuerCertificateFromStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCERT_CONTEXT pSubjectContext,
+    IN OPTIONAL PCCERT_CONTEXT pPrevIssuerContext,
+    IN OUT DWORD *pdwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Perform the enabled verification checks on the subject certificate
+//  using the issuer. Same checks and flags definitions as for the above
+//  CertGetIssuerCertificateFromStore.
+//
+//  If you are only checking CERT_STORE_TIME_VALIDITY_FLAG, then, the
+//  issuer can be NULL.
+//
+//  For a verification check failure, SUCCESS is still returned.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertVerifySubjectCertificateContext(
+    IN PCCERT_CONTEXT pSubject,
+    IN OPTIONAL PCCERT_CONTEXT pIssuer,
+    IN OUT DWORD *pdwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Duplicate a certificate context
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertDuplicateCertificateContext(
+    IN PCCERT_CONTEXT pCertContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Create a certificate context from the encoded certificate. The created
+//  context isn't put in a store.
+//
+//  Makes a copy of the encoded certificate in the created context.
+//
+//  If unable to decode and create the certificate context, NULL is returned.
+//  Otherwise, a pointer to a read only CERT_CONTEXT is returned.
+//  CERT_CONTEXT must be freed by calling CertFreeCertificateContext.
+//  CertDuplicateCertificateContext can be called to make a duplicate.
+//
+//  CertSetCertificateContextProperty and CertGetCertificateContextProperty can be called
+//  to store properties for the certificate.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertCreateCertificateContext(
+    IN DWORD dwCertEncodingType,
+    IN const BYTE *pbCertEncoded,
+    IN DWORD cbCertEncoded
+    );
+
+//+-------------------------------------------------------------------------
+//  Free a certificate context
+//
+//  There needs to be a corresponding free for each context obtained by a
+//  get, find, duplicate or create.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertFreeCertificateContext(
+    IN PCCERT_CONTEXT pCertContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Set the property for the specified certificate context.
+//
+//  The type definition for pvData depends on the dwPropId value. There are
+//  five predefined types:
+//      CERT_KEY_PROV_HANDLE_PROP_ID - a HCRYPTPROV for the certificate's
+//      private key is passed in pvData. Updates the hCryptProv field
+//      of the CERT_KEY_CONTEXT_PROP_ID. If the CERT_KEY_CONTEXT_PROP_ID
+//      doesn't exist, its created with all the other fields zeroed out. If
+//      CERT_STORE_NO_CRYPT_RELEASE_FLAG isn't set, HCRYPTPROV is implicitly
+//      released when either the property is set to NULL or on the final
+//      free of the CertContext.
+//
+//      CERT_KEY_PROV_INFO_PROP_ID - a PCRYPT_KEY_PROV_INFO for the certificate's
+//      private key is passed in pvData.
+//
+//      CERT_SHA1_HASH_PROP_ID       -
+//      CERT_MD5_HASH_PROP_ID        -
+//      CERT_SIGNATURE_HASH_PROP_ID  - normally, a hash property is implicitly
+//      set by doing a CertGetCertificateContextProperty. pvData points to a
+//      CRYPT_HASH_BLOB.
+//
+//      CERT_KEY_CONTEXT_PROP_ID - a PCERT_KEY_CONTEXT for the certificate's
+//      private key is passed in pvData. The CERT_KEY_CONTEXT contains both the
+//      hCryptProv and dwKeySpec for the private key.
+//      See the CERT_KEY_PROV_HANDLE_PROP_ID for more information about
+//      the hCryptProv field and dwFlags settings. Note, more fields may
+//      be added for this property. The cbSize field value will be adjusted
+//      accordingly.
+//
+//      CERT_KEY_SPEC_PROP_ID - the dwKeySpec for the private key. pvData
+//      points to a DWORD containing the KeySpec
+//
+//      CERT_ENHKEY_USAGE_PROP_ID - enhanced key usage definition for the
+//      certificate. pvData points to a CRYPT_DATA_BLOB containing an
+//      ASN.1 encoded CERT_ENHKEY_USAGE (encoded via
+//      CryptEncodeObject(X509_ENHANCED_KEY_USAGE).
+//
+//      CERT_NEXT_UPDATE_LOCATION_PROP_ID - location of the next update.
+//      Currently only applicable to CTLs. pvData points to a CRYPT_DATA_BLOB
+//      containing an ASN.1 encoded CERT_ALT_NAME_INFO (encoded via
+//      CryptEncodeObject(X509_ALTERNATE_NAME)).
+//
+//      CERT_FRIENDLY_NAME_PROP_ID - friendly name for the cert, CRL or CTL.
+//      pvData points to a CRYPT_DATA_BLOB. pbData is a pointer to a NULL
+//      terminated unicode, wide character string.
+//      cbData = (wcslen((LPWSTR) pbData) + 1) * sizeof(WCHAR).
+//
+//      CERT_DESCRIPTION_PROP_ID - description for the cert, CRL or CTL.
+//      pvData points to a CRYPT_DATA_BLOB. pbData is a pointer to a NULL
+//      terminated unicode, wide character string.
+//      cbData = (wcslen((LPWSTR) pbData) + 1) * sizeof(WCHAR).
+//
+//      CERT_ARCHIVED_PROP_ID - when this property is set, the certificate
+//      is skipped during enumeration. Note, certificates having this property
+//      are still found for explicit finds, such as, finding a certificate
+//      with a specific hash or finding a certificate having a specific issuer
+//      and serial number. pvData points to a CRYPT_DATA_BLOB. This blob
+//      can be NULL (pbData = NULL, cbData = 0).
+//
+//      CERT_PUBKEY_ALG_PARA_PROP_ID - for public keys supporting
+//      algorithm parameter inheritance. pvData points to a CRYPT_OBJID_BLOB
+//      containing the ASN.1 encoded PublicKey Algorithm Parameters. For
+//      DSS this would be the parameters encoded via
+//      CryptEncodeObject(X509_DSS_PARAMETERS). This property may be set
+//      by CryptVerifyCertificateSignatureEx().
+//
+//      CERT_CROSS_CERT_DIST_POINTS_PROP_ID - location of the cross certs.
+//      Currently only applicable to certs. pvData points to a CRYPT_DATA_BLOB
+//      containing an ASN.1 encoded CROSS_CERT_DIST_POINTS_INFO (encoded via
+//      CryptEncodeObject(X509_CROSS_CERT_DIST_POINTS)).
+//
+//      CERT_ENROLLMENT_PROP_ID - enrollment information of the pending request.
+//      It contains RequestID, CADNSName, CAName, and FriendlyName.
+//      The data format is defined as, the first 4 bytes - pending request ID,
+//      next 4 bytes - CADNSName size in characters including null-terminator
+//      followed by CADNSName string with null-terminator,
+//      next 4 bytes - CAName size in characters including null-terminator
+//      followed by CAName string with null-terminator,
+//      next 4 bytes - FriendlyName size in characters including null-terminator
+//      followed by FriendlyName string with null-terminator.
+//
+//      CERT_DATE_STAMP_PROP_ID - contains the time when added to the store
+//      by an admin tool. pvData points to a CRYPT_DATA_BLOB containing
+//      the FILETIME.
+//
+//      CERT_RENEWAL_PROP_ID - contains the hash of renewed certificate
+//
+//  For all the other PROP_IDs: an encoded PCRYPT_DATA_BLOB is passed in pvData.
+//
+//  If the property already exists, then, the old value is deleted and silently
+//  replaced. Setting, pvData to NULL, deletes the property.
+//
+//  CERT_SET_PROPERTY_IGNORE_PERSIST_ERROR_FLAG can be set to ignore any
+//  provider write errors and always update the cached context's property.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSetCertificateContextProperty(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+// Set this flag to ignore any store provider write errors and always update
+// the cached context's property
+#define CERT_SET_PROPERTY_IGNORE_PERSIST_ERROR_FLAG     0x80000000
+
+// Set this flag to inhibit the persisting of this property
+#define CERT_SET_PROPERTY_INHIBIT_PERSIST_FLAG          0x40000000
+
+//+-------------------------------------------------------------------------
+//  Get the property for the specified certificate context.
+//
+//  For CERT_KEY_PROV_HANDLE_PROP_ID, pvData points to a HCRYPTPROV.
+//
+//  For CERT_KEY_PROV_INFO_PROP_ID, pvData points to a CRYPT_KEY_PROV_INFO structure.
+//  Elements pointed to by fields in the pvData structure follow the
+//  structure. Therefore, *pcbData may exceed the size of the structure.
+//
+//  For CERT_KEY_CONTEXT_PROP_ID, pvData points to a CERT_KEY_CONTEXT structure.
+//
+//  For CERT_KEY_SPEC_PROP_ID, pvData points to a DWORD containing the KeySpec.
+//  If the CERT_KEY_CONTEXT_PROP_ID exists, the KeySpec is obtained from there.
+//  Otherwise, if the CERT_KEY_PROV_INFO_PROP_ID exists, its the source
+//  of the KeySpec.
+//
+//  For CERT_SHA1_HASH_PROP_ID or CERT_MD5_HASH_PROP_ID, if the hash
+//  doesn't already exist, then, its computed via CryptHashCertificate()
+//  and then set. pvData points to the computed hash. Normally, the length
+//  is 20 bytes for SHA and 16 for MD5.
+//
+//  For CERT_SIGNATURE_HASH_PROP_ID, if the hash
+//  doesn't already exist, then, its computed via CryptHashToBeSigned()
+//  and then set. pvData points to the computed hash. Normally, the length
+//  is 20 bytes for SHA and 16 for MD5.
+//
+//  For CERT_ACCESS_STATE_PROP_ID, pvData points to a DWORD containing the
+//  access state flags. The appropriate CERT_ACCESS_STATE_*_FLAG's are set
+//  in the returned DWORD. See the CERT_ACCESS_STATE_*_FLAG definitions
+//  above. Note, this property is read only. It can't be set.
+//
+//  For CERT_KEY_IDENTIFIER_PROP_ID, if property doesn't already exist,
+//  first searches for the szOID_SUBJECT_KEY_IDENTIFIER extension. Next,
+//  does SHA1 hash of the certficate's SubjectPublicKeyInfo. pvData
+//  points to the key identifier bytes. Normally, the length is 20 bytes.
+//
+//  For CERT_PUBKEY_ALG_PARA_PROP_ID, pvPara points to the ASN.1 encoded
+//  PublicKey Algorithm Parameters. This property will only be set
+//  for public keys supporting algorithm parameter inheritance and when the
+//  parameters have been omitted from the encoded and signed certificate.
+//
+//  For CERT_DATE_STAMP_PROP_ID, pvPara points to a FILETIME updated by
+//  an admin tool to indicate when the certificate was added to the store.
+//
+//  For all other PROP_IDs, pvData points to an encoded array of bytes.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetCertificateContextProperty(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwPropId,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the properties for the specified certificate context.
+//
+//  To get the first property, set dwPropId to 0. The ID of the first
+//  property is returned. To get the next property, set dwPropId to the
+//  ID returned by the last call. To enumerate all the properties continue
+//  until 0 is returned.
+//
+//  CertGetCertificateContextProperty is called to get the property's data.
+//
+//  Note, since, the CERT_KEY_PROV_HANDLE_PROP_ID and CERT_KEY_SPEC_PROP_ID
+//  properties are stored as fields in the CERT_KEY_CONTEXT_PROP_ID
+//  property, they aren't enumerated individually.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertEnumCertificateContextProperties(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwPropId
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Creates a CTL entry whose attributes are the certificate context's
+//  properties.
+//
+//  The SubjectIdentifier in the CTL entry is the SHA1 hash of the certificate.
+//
+//  The certificate properties are added as attributes. The property attribute 
+//  OID is the decimal PROP_ID preceded by szOID_CERT_PROP_ID_PREFIX. Each
+//  property value is copied as a single attribute value.
+//
+//  Any additional attributes to be included in the CTL entry can be passed
+//  in via the cOptAttr and rgOptAttr parameters.
+//
+//  CTL_ENTRY_FROM_PROP_CHAIN_FLAG can be set in dwFlags, to force the
+//  inclusion of the chain building hash properties as attributes.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertCreateCTLEntryFromCertificateContextProperties(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD cOptAttr,
+    IN OPTIONAL PCRYPT_ATTRIBUTE rgOptAttr,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    OUT OPTIONAL PCTL_ENTRY pCtlEntry,
+    IN OUT DWORD *pcbCtlEntry
+    );
+
+// Set this flag to get and include the chain building hash properties
+// as attributes in the CTL entry
+#define CTL_ENTRY_FROM_PROP_CHAIN_FLAG                  0x1
+
+
+//+-------------------------------------------------------------------------
+//  Sets properties on the certificate context using the attributes in
+//  the CTL entry.
+//
+//  The property attribute OID is the decimal PROP_ID preceded by
+//  szOID_CERT_PROP_ID_PREFIX. Only attributes containing such an OID are
+//  copied.
+//
+//  CERT_SET_PROPERTY_IGNORE_PERSIST_ERROR_FLAG may be set in dwFlags.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSetCertificateContextPropertiesFromCTLEntry(
+    IN PCCERT_CONTEXT pCertContext,
+    IN PCTL_ENTRY pCtlEntry,
+    IN DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the first or next CRL context from the store for the specified
+//  issuer certificate. Perform the enabled verification checks on the CRL.
+//
+//  If the first or next CRL isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CRL_CONTEXT is returned. CRL_CONTEXT
+//  must be freed by calling CertFreeCRLContext. However, the free must be
+//  pPrevCrlContext on a subsequent call. CertDuplicateCRLContext
+//  can be called to make a duplicate.
+//
+//  The pIssuerContext may have been obtained from this store, another store
+//  or created by the caller application. When created by the caller, the
+//  CertCreateCertificateContext function must have been called.
+//
+//  If pIssuerContext == NULL, finds all the CRLs in the store.
+//
+//  An issuer may have multiple CRLs. For example, it generates delta CRLs
+//  using a X.509 v3 extension. pPrevCrlContext MUST BE NULL on the first
+//  call to get the CRL. To get the next CRL for the issuer, the
+//  pPrevCrlContext is set to the CRL_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCrlContext is always CertFreeCRLContext'ed by
+//  this function, even for an error.
+//
+//  The following flags can be set in *pdwFlags to enable verification checks
+//  on the returned CRL:
+//      CERT_STORE_SIGNATURE_FLAG     - use the public key in the
+//                                      issuer's certificate to verify the
+//                                      signature on the returned CRL.
+//                                      Note, if pIssuerContext->hCertStore ==
+//                                      hCertStore, the store provider might
+//                                      be able to eliminate a redo of
+//                                      the signature verify.
+//      CERT_STORE_TIME_VALIDITY_FLAG - get the current time and verify that
+//                                      its within the CRL's ThisUpdate and
+//                                      NextUpdate validity period.
+//      CERT_STORE_BASE_CRL_FLAG      - get base CRL.
+//      CERT_STORE_DELTA_CRL_FLAG     - get delta CRL.
+//
+//  If only one of CERT_STORE_BASE_CRL_FLAG or CERT_STORE_DELTA_CRL_FLAG is
+//  set, then, only returns either a base or delta CRL. In any case, the
+//  appropriate base or delta flag will be cleared upon returned. If both
+//  flags are set, then, only one of flags will be cleared.
+//
+//  If an enabled verification check fails, then, its flag is set upon return.
+//
+//  If pIssuerContext == NULL, then, an enabled CERT_STORE_SIGNATURE_FLAG
+//  always fails and the CERT_STORE_NO_ISSUER_FLAG is also set.
+//
+//  For a verification check failure, a pointer to the first or next
+//  CRL_CONTEXT is still returned and SetLastError isn't updated.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCRL_CONTEXT
+WINAPI
+CertGetCRLFromStore(
+    IN HCERTSTORE hCertStore,
+    IN OPTIONAL PCCERT_CONTEXT pIssuerContext,
+    IN PCCRL_CONTEXT pPrevCrlContext,
+    IN OUT DWORD *pdwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the CRL contexts in the store.
+//
+//  If a CRL isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CRL_CONTEXT is returned. CRL_CONTEXT
+//  must be freed by calling CertFreeCRLContext or is freed when passed as the
+//  pPrevCrlContext on a subsequent call. CertDuplicateCRLContext
+//  can be called to make a duplicate.
+//
+//  pPrevCrlContext MUST BE NULL to enumerate the first
+//  CRL in the store. Successive CRLs are enumerated by setting
+//  pPrevCrlContext to the CRL_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCrlContext is always CertFreeCRLContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCRL_CONTEXT
+WINAPI
+CertEnumCRLsInStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCRL_CONTEXT pPrevCrlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Find the first or next CRL context in the store.
+//
+//  The CRL is found according to the dwFindType and its pvFindPara.
+//  See below for a list of the find types and its parameters.
+//
+//  Currently dwFindFlags isn't used and must be set to 0.
+//
+//  Usage of dwCertEncodingType depends on the dwFindType.
+//
+//  If the first or next CRL isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CRL_CONTEXT is returned. CRL_CONTEXT
+//  must be freed by calling CertFreeCRLContext or is freed when passed as the
+//  pPrevCrlContext on a subsequent call. CertDuplicateCRLContext
+//  can be called to make a duplicate.
+//
+//  pPrevCrlContext MUST BE NULL on the first
+//  call to find the CRL. To find the next CRL, the
+//  pPrevCrlContext is set to the CRL_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCrlContext is always CertFreeCRLContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCRL_CONTEXT
+WINAPI
+CertFindCRLInStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwCertEncodingType,
+    IN DWORD dwFindFlags,
+    IN DWORD dwFindType,
+    IN const void *pvFindPara,
+    IN PCCRL_CONTEXT pPrevCrlContext
+    );
+
+#define CRL_FIND_ANY                0
+#define CRL_FIND_ISSUED_BY          1
+#define CRL_FIND_EXISTING           2
+#define CRL_FIND_ISSUED_FOR         3
+
+//+-------------------------------------------------------------------------
+//  CRL_FIND_ANY
+//
+//  Find any CRL.
+//
+//  pvFindPara isn't used.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CRL_FIND_ISSUED_BY
+//
+//  Find CRL matching the specified issuer.
+//
+//  pvFindPara is the PCCERT_CONTEXT of the CRL issuer. May be NULL to
+//  match any issuer.
+//
+//  By default, only does issuer name matching. The following flags can be
+//  set in dwFindFlags to do additional filtering.
+//
+//  If CRL_FIND_ISSUED_BY_AKI_FLAG is set in dwFindFlags, then, checks if the
+//  CRL has an Authority Key Identifier (AKI) extension. If the CRL has an
+//  AKI, then, only returns a CRL whose AKI matches the issuer.
+//
+//  Note, the AKI extension has the following OID:
+//  szOID_AUTHORITY_KEY_IDENTIFIER2 and its corresponding data structure.
+//
+//  If CRL_FIND_ISSUED_BY_SIGNATURE_FLAG is set in dwFindFlags, then,
+//  uses the public key in the issuer's certificate to verify the
+//  signature on the CRL. Only returns a CRL having a valid signature.
+//
+//  If CRL_FIND_ISSUED_BY_DELTA_FLAG is set in dwFindFlags, then, only
+//  returns a delta CRL.
+//
+//  If CRL_FIND_ISSUED_BY_BASE_FLAG is set in dwFindFlags, then, only
+//  returns a base CRL.
+//--------------------------------------------------------------------------
+#define CRL_FIND_ISSUED_BY_AKI_FLAG         0x1
+#define CRL_FIND_ISSUED_BY_SIGNATURE_FLAG   0x2
+#define CRL_FIND_ISSUED_BY_DELTA_FLAG       0x4
+#define CRL_FIND_ISSUED_BY_BASE_FLAG        0x8
+
+//+-------------------------------------------------------------------------
+//  CRL_FIND_EXISTING
+//
+//  Find existing CRL in the store.
+//
+//  pvFindPara is the PCCRL_CONTEXT of the CRL to check if it already
+//  exists in the store.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CRL_FIND_ISSUED_FOR
+//
+//  Find CRL for the specified subject and its issuer.
+//
+//  pvFindPara points to the following CRL_FIND_ISSUED_FOR_PARA which contains
+//  both the subject and issuer certificates. Not optional.
+//
+//  The subject's issuer name is used to match the CRL's issuer name. Otherwise,
+//  the issuer's certificate is used the same as in the above
+//  CRL_FIND_ISSUED_BY.
+//
+//  Note, when cross certificates are used, the subject name in the issuer's
+//  certificate may not match the issuer name in the subject certificate and
+//  its corresponding CRL.
+//
+//  All of the above CRL_FIND_ISSUED_BY_*_FLAGS apply to this find type.
+//--------------------------------------------------------------------------
+typedef struct _CRL_FIND_ISSUED_FOR_PARA {
+    PCCERT_CONTEXT              pSubjectCert;
+    PCCERT_CONTEXT              pIssuerCert;
+} CRL_FIND_ISSUED_FOR_PARA, *PCRL_FIND_ISSUED_FOR_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  Duplicate a CRL context
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCRL_CONTEXT
+WINAPI
+CertDuplicateCRLContext(
+    IN PCCRL_CONTEXT pCrlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Create a CRL context from the encoded CRL. The created
+//  context isn't put in a store.
+//
+//  Makes a copy of the encoded CRL in the created context.
+//
+//  If unable to decode and create the CRL context, NULL is returned.
+//  Otherwise, a pointer to a read only CRL_CONTEXT is returned.
+//  CRL_CONTEXT must be freed by calling CertFreeCRLContext.
+//  CertDuplicateCRLContext can be called to make a duplicate.
+//
+//  CertSetCRLContextProperty and CertGetCRLContextProperty can be called
+//  to store properties for the CRL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCRL_CONTEXT
+WINAPI
+CertCreateCRLContext(
+    IN DWORD dwCertEncodingType,
+    IN const BYTE *pbCrlEncoded,
+    IN DWORD cbCrlEncoded
+    );
+
+//+-------------------------------------------------------------------------
+//  Free a CRL context
+//
+//  There needs to be a corresponding free for each context obtained by a
+//  get, duplicate or create.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertFreeCRLContext(
+    IN PCCRL_CONTEXT pCrlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Set the property for the specified CRL context.
+//
+//  Same Property Ids and semantics as CertSetCertificateContextProperty.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSetCRLContextProperty(
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the property for the specified CRL context.
+//
+//  Same Property Ids and semantics as CertGetCertificateContextProperty.
+//
+//  CERT_SHA1_HASH_PROP_ID, CERT_MD5_HASH_PROP_ID or
+//  CERT_SIGNATURE_HASH_PROP_ID is the predefined property of most interest.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetCRLContextProperty(
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwPropId,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the properties for the specified CRL context.
+//
+//  To get the first property, set dwPropId to 0. The ID of the first
+//  property is returned. To get the next property, set dwPropId to the
+//  ID returned by the last call. To enumerate all the properties continue
+//  until 0 is returned.
+//
+//  CertGetCRLContextProperty is called to get the property's data.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertEnumCRLContextProperties(
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwPropId
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Search the CRL's list of entries for the specified certificate.
+//
+//  TRUE is returned if we were able to search the list. Otherwise, FALSE is
+//  returned,
+//
+//  For success, if the certificate was found in the list, *ppCrlEntry is
+//  updated with a pointer to the entry. Otherwise, *ppCrlEntry is set to NULL.
+//  The returned entry isn't allocated and must not be freed.
+//
+//  dwFlags and pvReserved currently aren't used and must be set to 0 or NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertFindCertificateInCRL(
+    IN PCCERT_CONTEXT pCert,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    OUT PCRL_ENTRY *ppCrlEntry
+    );
+
+//+-------------------------------------------------------------------------
+//  Is the specified CRL valid for the certificate.
+//
+//  Returns TRUE if the CRL's list of entries would contain the certificate
+//  if it was revoked. Note, doesn't check that the certificate is in the
+//  list of entries.
+//
+//  If the CRL has an Issuing Distribution Point (IDP) extension, checks
+//  that it's valid for the subject certificate.
+//
+//  dwFlags and pvReserved currently aren't used and must be set to 0 and NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertIsValidCRLForCertificate(
+    IN PCCERT_CONTEXT pCert,
+    IN PCCRL_CONTEXT pCrl,
+    IN DWORD dwFlags,
+    IN void *pvReserved
+    );
+
+
+//+-------------------------------------------------------------------------
+// Add certificate/CRL, encoded, context or element disposition values.
+//--------------------------------------------------------------------------
+#define CERT_STORE_ADD_NEW                                  1
+#define CERT_STORE_ADD_USE_EXISTING                         2
+#define CERT_STORE_ADD_REPLACE_EXISTING                     3
+#define CERT_STORE_ADD_ALWAYS                               4
+#define CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES  5
+#define CERT_STORE_ADD_NEWER                                6
+#define CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES             7
+
+
+//+-------------------------------------------------------------------------
+//  Add the encoded certificate to the store according to the specified
+//  disposition action.
+//
+//  Makes a copy of the encoded certificate before adding to the store.
+//
+//  dwAddDispostion specifies the action to take if the certificate
+//  already exists in the store. This parameter must be one of the following
+//  values:
+//    CERT_STORE_ADD_NEW
+//      Fails if the certificate already exists in the store. LastError
+//      is set to CRYPT_E_EXISTS.
+//    CERT_STORE_ADD_USE_EXISTING
+//      If the certifcate already exists, then, its used and if ppCertContext
+//      is non-NULL, the existing context is duplicated.
+//    CERT_STORE_ADD_REPLACE_EXISTING
+//      If the certificate already exists, then, the existing certificate
+//      context is deleted before creating and adding the new context.
+//    CERT_STORE_ADD_ALWAYS
+//      No check is made to see if the certificate already exists. A
+//      new certificate context is always created. This may lead to
+//      duplicates in the store.
+//    CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES
+//      If the certificate already exists, then, its used.
+//    CERT_STORE_ADD_NEWER
+//      Fails if the certificate already exists in the store AND the NotBefore
+//      time of the existing certificate is equal to or greater than the
+//      NotBefore time of the new certificate being added. LastError
+//      is set to CRYPT_E_EXISTS.
+//
+//      If an older certificate is replaced, same as
+//      CERT_STORE_ADD_REPLACE_EXISTING.
+//
+//      For CRLs or CTLs compares the ThisUpdate times.
+//
+//    CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES
+//      Same as CERT_STORE_ADD_NEWER. However, if an older certificate is
+//      replaced, same as CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES.
+//
+//  CertGetSubjectCertificateFromStore is called to determine if the
+//  certificate already exists in the store.
+//
+//  ppCertContext can be NULL, indicating the caller isn't interested
+//  in getting the CERT_CONTEXT of the added or existing certificate.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddEncodedCertificateToStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwCertEncodingType,
+    IN const BYTE *pbCertEncoded,
+    IN DWORD cbCertEncoded,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCERT_CONTEXT *ppCertContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Add the certificate context to the store according to the specified
+//  disposition action.
+//
+//  In addition to the encoded certificate, the context's properties are
+//  also copied.  Note, the CERT_KEY_CONTEXT_PROP_ID property (and its
+//  CERT_KEY_PROV_HANDLE_PROP_ID or CERT_KEY_SPEC_PROP_ID) isn't copied.
+//
+//  Makes a copy of the certificate context before adding to the store.
+//
+//  dwAddDispostion specifies the action to take if the certificate
+//  already exists in the store. This parameter must be one of the following
+//  values:
+//    CERT_STORE_ADD_NEW
+//      Fails if the certificate already exists in the store. LastError
+//      is set to CRYPT_E_EXISTS.
+//    CERT_STORE_ADD_USE_EXISTING
+//      If the certifcate already exists, then, its used and if ppStoreContext
+//      is non-NULL, the existing context is duplicated. Iterates
+//      through pCertContext's properties and only copies the properties
+//      that don't already exist. The SHA1 and MD5 hash properties aren't
+//      copied.
+//    CERT_STORE_ADD_REPLACE_EXISTING
+//      If the certificate already exists, then, the existing certificate
+//      context is deleted before creating and adding a new context.
+//      Properties are copied before doing the add.
+//    CERT_STORE_ADD_ALWAYS
+//      No check is made to see if the certificate already exists. A
+//      new certificate context is always created and added. This may lead to
+//      duplicates in the store. Properties are
+//      copied before doing the add.
+//    CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES
+//      If the certificate already exists, then, the existing certificate
+//      context is used. Properties from the added context are copied and
+//      replace existing properties. However, any existing properties not
+//      in the added context remain and aren't deleted.
+//    CERT_STORE_ADD_NEWER
+//      Fails if the certificate already exists in the store AND the NotBefore
+//      time of the existing context is equal to or greater than the
+//      NotBefore time of the new context being added. LastError
+//      is set to CRYPT_E_EXISTS.
+//
+//      If an older context is replaced, same as
+//      CERT_STORE_ADD_REPLACE_EXISTING.
+//
+//      For CRLs or CTLs compares the ThisUpdate times.
+//
+//    CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES
+//      Same as CERT_STORE_ADD_NEWER. However, if an older context is
+//      replaced, same as CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES.
+//
+//  CertGetSubjectCertificateFromStore is called to determine if the
+//  certificate already exists in the store.
+//
+//  ppStoreContext can be NULL, indicating the caller isn't interested
+//  in getting the CERT_CONTEXT of the added or existing certificate.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddCertificateContextToStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCERT_CONTEXT *ppStoreContext
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Certificate Store Context Types
+//--------------------------------------------------------------------------
+#define CERT_STORE_CERTIFICATE_CONTEXT  1
+#define CERT_STORE_CRL_CONTEXT          2
+#define CERT_STORE_CTL_CONTEXT          3
+
+//+-------------------------------------------------------------------------
+//  Certificate Store Context Bit Flags
+//--------------------------------------------------------------------------
+#define CERT_STORE_ALL_CONTEXT_FLAG             (~0UL)
+#define CERT_STORE_CERTIFICATE_CONTEXT_FLAG     \
+                (1 << CERT_STORE_CERTIFICATE_CONTEXT)
+#define CERT_STORE_CRL_CONTEXT_FLAG             \
+                (1 << CERT_STORE_CRL_CONTEXT)
+#define CERT_STORE_CTL_CONTEXT_FLAG             \
+                (1 << CERT_STORE_CTL_CONTEXT)
+
+//+-------------------------------------------------------------------------
+//  Add the serialized certificate or CRL element to the store.
+//
+//  The serialized element contains the encoded certificate, CRL or CTL and
+//  its properties, such as, CERT_KEY_PROV_INFO_PROP_ID.
+//
+//  If hCertStore is NULL, creates a certificate, CRL or CTL context not
+//  residing in any store.
+//
+//  dwAddDispostion specifies the action to take if the certificate or CRL
+//  already exists in the store. See CertAddCertificateContextToStore for a
+//  list of and actions taken.
+//
+//  dwFlags currently isn't used and should be set to 0.
+//
+//  dwContextTypeFlags specifies the set of allowable contexts. For example, to
+//  add either a certificate or CRL, set dwContextTypeFlags to:
+//      CERT_STORE_CERTIFICATE_CONTEXT_FLAG | CERT_STORE_CRL_CONTEXT_FLAG
+//
+//  *pdwContextType is updated with the type of the context returned in
+//  *ppvContxt. pdwContextType or ppvContext can be NULL, indicating the
+//  caller isn't interested in getting the output. If *ppvContext is
+//  returned it must be freed by calling CertFreeCertificateContext or
+//  CertFreeCRLContext.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddSerializedElementToStore(
+    IN HCERTSTORE hCertStore,
+    IN const BYTE *pbElement,
+    IN DWORD cbElement,
+    IN DWORD dwAddDisposition,
+    IN DWORD dwFlags,
+    IN DWORD dwContextTypeFlags,
+    OUT OPTIONAL DWORD *pdwContextType,
+    OUT OPTIONAL const void **ppvContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Delete the specified certificate from the store.
+//
+//  All subsequent gets or finds for the certificate will fail. However,
+//  memory allocated for the certificate isn't freed until all of its contexts
+//  have also been freed.
+//
+//  The pCertContext is obtained from a get, enum, find or duplicate.
+//
+//  Some store provider implementations might also delete the issuer's CRLs
+//  if this is the last certificate for the issuer in the store.
+//
+//  NOTE: the pCertContext is always CertFreeCertificateContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertDeleteCertificateFromStore(
+    IN PCCERT_CONTEXT pCertContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Add the encoded CRL to the store according to the specified
+//  disposition option.
+//
+//  Makes a copy of the encoded CRL before adding to the store.
+//
+//  dwAddDispostion specifies the action to take if the CRL
+//  already exists in the store. See CertAddEncodedCertificateToStore for a
+//  list of and actions taken.
+//
+//  Compares the CRL's Issuer to determine if the CRL already exists in the
+//  store.
+//
+//  ppCrlContext can be NULL, indicating the caller isn't interested
+//  in getting the CRL_CONTEXT of the added or existing CRL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddEncodedCRLToStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwCertEncodingType,
+    IN const BYTE *pbCrlEncoded,
+    IN DWORD cbCrlEncoded,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCRL_CONTEXT *ppCrlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Add the CRL context to the store according to the specified
+//  disposition option.
+//
+//  In addition to the encoded CRL, the context's properties are
+//  also copied.  Note, the CERT_KEY_CONTEXT_PROP_ID property (and its
+//  CERT_KEY_PROV_HANDLE_PROP_ID or CERT_KEY_SPEC_PROP_ID) isn't copied.
+//
+//  Makes a copy of the encoded CRL before adding to the store.
+//
+//  dwAddDispostion specifies the action to take if the CRL
+//  already exists in the store. See CertAddCertificateContextToStore for a
+//  list of and actions taken.
+//
+//  Compares the CRL's Issuer, ThisUpdate and NextUpdate to determine
+//  if the CRL already exists in the store.
+//
+//  ppStoreContext can be NULL, indicating the caller isn't interested
+//  in getting the CRL_CONTEXT of the added or existing CRL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddCRLContextToStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCRL_CONTEXT *ppStoreContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Delete the specified CRL from the store.
+//
+//  All subsequent gets for the CRL will fail. However,
+//  memory allocated for the CRL isn't freed until all of its contexts
+//  have also been freed.
+//
+//  The pCrlContext is obtained from a get or duplicate.
+//
+//  NOTE: the pCrlContext is always CertFreeCRLContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertDeleteCRLFromStore(
+    IN PCCRL_CONTEXT pCrlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Serialize the certificate context's encoded certificate and its
+//  properties.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSerializeCertificateStoreElement(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwFlags,
+    OUT BYTE *pbElement,
+    IN OUT DWORD *pcbElement
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Serialize the CRL context's encoded CRL and its properties.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSerializeCRLStoreElement(
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwFlags,
+    OUT BYTE *pbElement,
+    IN OUT DWORD *pcbElement
+    );
+
+
+
+//+=========================================================================
+//  Certificate Trust List (CTL) Store Data Structures and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  Duplicate a CTL context
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCTL_CONTEXT
+WINAPI
+CertDuplicateCTLContext(
+    IN PCCTL_CONTEXT pCtlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Create a CTL context from the encoded CTL. The created
+//  context isn't put in a store.
+//
+//  Makes a copy of the encoded CTL in the created context.
+//
+//  If unable to decode and create the CTL context, NULL is returned.
+//  Otherwise, a pointer to a read only CTL_CONTEXT is returned.
+//  CTL_CONTEXT must be freed by calling CertFreeCTLContext.
+//  CertDuplicateCTLContext can be called to make a duplicate.
+//
+//  CertSetCTLContextProperty and CertGetCTLContextProperty can be called
+//  to store properties for the CTL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCTL_CONTEXT
+WINAPI
+CertCreateCTLContext(
+    IN DWORD dwMsgAndCertEncodingType,
+    IN const BYTE *pbCtlEncoded,
+    IN DWORD cbCtlEncoded
+    );
+
+//+-------------------------------------------------------------------------
+//  Free a CTL context
+//
+//  There needs to be a corresponding free for each context obtained by a
+//  get, duplicate or create.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertFreeCTLContext(
+    IN PCCTL_CONTEXT pCtlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Set the property for the specified CTL context.
+//
+//  Same Property Ids and semantics as CertSetCertificateContextProperty.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSetCTLContextProperty(
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the property for the specified CTL context.
+//
+//  Same Property Ids and semantics as CertGetCertificateContextProperty.
+//
+//  CERT_SHA1_HASH_PROP_ID or CERT_NEXT_UPDATE_LOCATION_PROP_ID are the
+//  predefined properties of most interest.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetCTLContextProperty(
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwPropId,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the properties for the specified CTL context.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertEnumCTLContextProperties(
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwPropId
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the CTL contexts in the store.
+//
+//  If a CTL isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CTL_CONTEXT is returned. CTL_CONTEXT
+//  must be freed by calling CertFreeCTLContext or is freed when passed as the
+//  pPrevCtlContext on a subsequent call. CertDuplicateCTLContext
+//  can be called to make a duplicate.
+//
+//  pPrevCtlContext MUST BE NULL to enumerate the first
+//  CTL in the store. Successive CTLs are enumerated by setting
+//  pPrevCtlContext to the CTL_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCtlContext is always CertFreeCTLContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCTL_CONTEXT
+WINAPI
+CertEnumCTLsInStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCTL_CONTEXT pPrevCtlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Attempt to find the specified subject in the CTL.
+//
+//  For CTL_CERT_SUBJECT_TYPE, pvSubject points to a CERT_CONTEXT. The CTL's
+//  SubjectAlgorithm is examined to determine the representation of the
+//  subject's identity. Initially, only SHA1 or MD5 hash will be supported.
+//  The appropriate hash property is obtained from the CERT_CONTEXT.
+//
+//  For CTL_ANY_SUBJECT_TYPE, pvSubject points to the CTL_ANY_SUBJECT_INFO
+//  structure which contains the SubjectAlgorithm to be matched in the CTL
+//  and the SubjectIdentifer to be matched in one of the CTL entries.
+//
+//  The certificate's hash or the CTL_ANY_SUBJECT_INFO's SubjectIdentifier
+//  is used as the key in searching the subject entries. A binary
+//  memory comparison is done between the key and the entry's SubjectIdentifer.
+//
+//  dwEncodingType isn't used for either of the above SubjectTypes.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCTL_ENTRY
+WINAPI
+CertFindSubjectInCTL(
+    IN DWORD dwEncodingType,
+    IN DWORD dwSubjectType,
+    IN void *pvSubject,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwFlags
+    );
+
+// Subject Types:
+//  CTL_ANY_SUBJECT_TYPE, pvSubject points to following CTL_ANY_SUBJECT_INFO.
+//  CTL_CERT_SUBJECT_TYPE, pvSubject points to CERT_CONTEXT.
+#define CTL_ANY_SUBJECT_TYPE            1
+#define CTL_CERT_SUBJECT_TYPE           2
+
+typedef struct _CTL_ANY_SUBJECT_INFO {
+    CRYPT_ALGORITHM_IDENTIFIER  SubjectAlgorithm;
+    CRYPT_DATA_BLOB             SubjectIdentifier;
+} CTL_ANY_SUBJECT_INFO, *PCTL_ANY_SUBJECT_INFO;
+
+//+-------------------------------------------------------------------------
+//  Find the first or next CTL context in the store.
+//
+//  The CTL is found according to the dwFindType and its pvFindPara.
+//  See below for a list of the find types and its parameters.
+//
+//  Currently dwFindFlags isn't used and must be set to 0.
+//
+//  Usage of dwMsgAndCertEncodingType depends on the dwFindType.
+//
+//  If the first or next CTL isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CTL_CONTEXT is returned. CTL_CONTEXT
+//  must be freed by calling CertFreeCTLContext or is freed when passed as the
+//  pPrevCtlContext on a subsequent call. CertDuplicateCTLContext
+//  can be called to make a duplicate.
+//
+//  pPrevCtlContext MUST BE NULL on the first
+//  call to find the CTL. To find the next CTL, the
+//  pPrevCtlContext is set to the CTL_CONTEXT returned by a previous call.
+//
+//  NOTE: a NON-NULL pPrevCtlContext is always CertFreeCTLContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCTL_CONTEXT
+WINAPI
+CertFindCTLInStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwMsgAndCertEncodingType,
+    IN DWORD dwFindFlags,
+    IN DWORD dwFindType,
+    IN const void *pvFindPara,
+    IN PCCTL_CONTEXT pPrevCtlContext
+    );
+
+#define CTL_FIND_ANY                0
+#define CTL_FIND_SHA1_HASH          1
+#define CTL_FIND_MD5_HASH           2
+#define CTL_FIND_USAGE              3
+#define CTL_FIND_SUBJECT            4
+#define CTL_FIND_EXISTING           5
+
+typedef struct _CTL_FIND_USAGE_PARA {
+    DWORD               cbSize;
+    CTL_USAGE           SubjectUsage;   // optional
+    CRYPT_DATA_BLOB     ListIdentifier; // optional
+    PCERT_INFO          pSigner;        // optional
+} CTL_FIND_USAGE_PARA, *PCTL_FIND_USAGE_PARA;
+
+#define CTL_FIND_NO_LIST_ID_CBDATA  0xFFFFFFFF
+#define CTL_FIND_NO_SIGNER_PTR      ((PCERT_INFO) -1)
+
+#define CTL_FIND_SAME_USAGE_FLAG    0x1
+
+
+typedef struct _CTL_FIND_SUBJECT_PARA {
+    DWORD                   cbSize;
+    PCTL_FIND_USAGE_PARA    pUsagePara; // optional
+    DWORD                   dwSubjectType;
+    void                    *pvSubject;
+} CTL_FIND_SUBJECT_PARA, *PCTL_FIND_SUBJECT_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  CTL_FIND_ANY
+//
+//  Find any CTL.
+//
+//  pvFindPara isn't used.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CTL_FIND_SHA1_HASH
+//  CTL_FIND_MD5_HASH
+//
+//  Find a CTL with the specified hash.
+//
+//  pvFindPara points to a CRYPT_HASH_BLOB.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CTL_FIND_USAGE
+//
+//  Find a CTL having the specified usage identifiers, list identifier or
+//  signer. The CertEncodingType of the signer is obtained from the
+//  dwMsgAndCertEncodingType parameter.
+//
+//  pvFindPara points to a CTL_FIND_USAGE_PARA data structure. The
+//  SubjectUsage.cUsageIdentifer can be 0 to match any usage. The
+//  ListIdentifier.cbData can be 0 to match any list identifier. To only match
+//  CTLs without a ListIdentifier, cbData must be set to
+//  CTL_FIND_NO_LIST_ID_CBDATA. pSigner can be NULL to match any signer. Only
+//  the Issuer and SerialNumber fields of the pSigner's PCERT_INFO are used.
+//  To only match CTLs without a signer, pSigner must be set to
+//  CTL_FIND_NO_SIGNER_PTR.
+//
+//  The CTL_FIND_SAME_USAGE_FLAG can be set in dwFindFlags to
+//  only match CTLs with the same usage identifiers. CTLs having additional
+//  usage identifiers aren't matched. For example, if only "1.2.3" is specified
+//  in CTL_FIND_USAGE_PARA, then, for a match, the CTL must only contain
+//  "1.2.3" and not any additional usage identifers.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CTL_FIND_SUBJECT
+//
+//  Find a CTL having the specified subject. CertFindSubjectInCTL can be
+//  called to get a pointer to the subject's entry in the CTL.  pUsagePara can
+//  optionally be set to enable the above CTL_FIND_USAGE matching.
+//
+//  pvFindPara points to a CTL_FIND_SUBJECT_PARA data structure.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Add the encoded CTL to the store according to the specified
+//  disposition option.
+//
+//  Makes a copy of the encoded CTL before adding to the store.
+//
+//  dwAddDispostion specifies the action to take if the CTL
+//  already exists in the store. See CertAddEncodedCertificateToStore for a
+//  list of and actions taken.
+//
+//  Compares the CTL's SubjectUsage, ListIdentifier and any of its signers
+//  to determine if the CTL already exists in the store.
+//
+//  ppCtlContext can be NULL, indicating the caller isn't interested
+//  in getting the CTL_CONTEXT of the added or existing CTL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddEncodedCTLToStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwMsgAndCertEncodingType,
+    IN const BYTE *pbCtlEncoded,
+    IN DWORD cbCtlEncoded,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCTL_CONTEXT *ppCtlContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Add the CTL context to the store according to the specified
+//  disposition option.
+//
+//  In addition to the encoded CTL, the context's properties are
+//  also copied.  Note, the CERT_KEY_CONTEXT_PROP_ID property (and its
+//  CERT_KEY_PROV_HANDLE_PROP_ID or CERT_KEY_SPEC_PROP_ID) isn't copied.
+//
+//  Makes a copy of the encoded CTL before adding to the store.
+//
+//  dwAddDispostion specifies the action to take if the CTL
+//  already exists in the store. See CertAddCertificateContextToStore for a
+//  list of and actions taken.
+//
+//  Compares the CTL's SubjectUsage, ListIdentifier and any of its signers
+//  to determine if the CTL already exists in the store.
+//
+//  ppStoreContext can be NULL, indicating the caller isn't interested
+//  in getting the CTL_CONTEXT of the added or existing CTL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddCTLContextToStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCTL_CONTEXT *ppStoreContext
+    );
+
+//+-------------------------------------------------------------------------
+//  Serialize the CTL context's encoded CTL and its properties.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSerializeCTLStoreElement(
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwFlags,
+    OUT BYTE *pbElement,
+    IN OUT DWORD *pcbElement
+    );
+
+//+-------------------------------------------------------------------------
+//  Delete the specified CTL from the store.
+//
+//  All subsequent gets for the CTL will fail. However,
+//  memory allocated for the CTL isn't freed until all of its contexts
+//  have also been freed.
+//
+//  The pCtlContext is obtained from a get or duplicate.
+//
+//  NOTE: the pCtlContext is always CertFreeCTLContext'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertDeleteCTLFromStore(
+    IN PCCTL_CONTEXT pCtlContext
+    );
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddCertificateLinkToStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCERT_CONTEXT *ppStoreContext
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddCRLLinkToStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCRL_CONTEXT pCrlContext,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCRL_CONTEXT *ppStoreContext
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddCTLLinkToStore(
+    IN HCERTSTORE hCertStore,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwAddDisposition,
+    OUT OPTIONAL PCCTL_CONTEXT *ppStoreContext
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddStoreToCollection(
+    IN HCERTSTORE hCollectionStore,
+    IN OPTIONAL HCERTSTORE hSiblingStore,
+    IN DWORD dwUpdateFlags,
+    IN DWORD dwPriority
+    );
+
+WINCRYPT32API
+void
+WINAPI
+CertRemoveStoreFromCollection(
+    IN HCERTSTORE hCollectionStore,
+    IN HCERTSTORE hSiblingStore
+    );
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertControlStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwFlags,
+    IN DWORD dwCtrlType,
+    IN void const *pvCtrlPara
+    );
+
+//+-------------------------------------------------------------------------
+//  Certificate Store control types
+//--------------------------------------------------------------------------
+#define CERT_STORE_CTRL_RESYNC              1
+#define CERT_STORE_CTRL_NOTIFY_CHANGE       2
+#define CERT_STORE_CTRL_COMMIT              3
+#define CERT_STORE_CTRL_AUTO_RESYNC         4
+#define CERT_STORE_CTRL_CANCEL_NOTIFY       5
+
+#define CERT_STORE_CTRL_INHIBIT_DUPLICATE_HANDLE_FLAG   0x1
+
+//+-------------------------------------------------------------------------
+//  CERT_STORE_CTRL_RESYNC
+//
+//  Re-synchronize the store.
+//
+//  The pvCtrlPara points to the event HANDLE to be signaled on
+//  the next store change. Normally, this would be the same
+//  event HANDLE passed to CERT_STORE_CTRL_NOTIFY_CHANGE during initialization.
+//
+//  If pvCtrlPara is NULL, no events are re-armed.
+//
+//  By default the event HANDLE is DuplicateHandle'd.
+//  CERT_STORE_CTRL_INHIBIT_DUPLICATE_HANDLE_FLAG can be set in dwFlags
+//  to inhibit a DupicateHandle of the event HANDLE. If this flag
+//  is set, then, CertControlStore(CERT_STORE_CTRL_CANCEL_NOTIFY) must be
+//  called for this event HANDLE before closing the hCertStore.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_STORE_CTRL_NOTIFY_CHANGE
+//
+//  Signal the event when the underlying store is changed.
+//
+//  pvCtrlPara points to the event HANDLE to be signaled.
+//
+//  pvCtrlPara can be NULL to inform the store of a subsequent
+//  CERT_STORE_CTRL_RESYNC and allow it to optimize by only doing a resync
+//  if the store has changed. For the registry based stores, an internal
+//  notify change event is created and registered to be signaled.
+//
+//  Recommend calling CERT_STORE_CTRL_NOTIFY_CHANGE once for each event to
+//  be passed to CERT_STORE_CTRL_RESYNC. This should only happen after
+//  the event has been created. Not after each time the event is signaled.
+//
+//  By default the event HANDLE is DuplicateHandle'd.
+//  CERT_STORE_CTRL_INHIBIT_DUPLICATE_HANDLE_FLAG can be set in dwFlags
+//  to inhibit a DupicateHandle of the event HANDLE. If this flag
+//  is set, then, CertControlStore(CERT_STORE_CTRL_CANCEL_NOTIFY) must be
+//  called for this event HANDLE before closing the hCertStore.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_STORE_CTRL_CANCEL_NOTIFY
+//
+//  Cancel notification signaling of the event HANDLE passed in a previous
+//  CERT_STORE_CTRL_NOTIFY_CHANGE or CERT_STORE_CTRL_RESYNC.
+//
+//  pvCtrlPara points to the event HANDLE to be canceled.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_STORE_CTRL_AUTO_RESYNC
+//
+//  At the start of every enumeration or find store API call, check if the
+//  underlying store has changed. If it has changed, re-synchronize.
+//
+//  This check is only done in the enumeration or find APIs when the
+//  pPrevContext is NULL.
+//
+//  The pvCtrlPara isn't used and must be set to NULL.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_STORE_CTRL_COMMIT
+//
+//  If any changes have been to the cached store, they are committed to
+//  persisted storage. If no changes have been made since the store was
+//  opened or the last commit, this call is ignored. May also be ignored by
+//  store providers that persist changes immediately.
+//
+//  CERT_STORE_CTRL_COMMIT_FORCE_FLAG can be set to force the store
+//  to be committed even if it hasn't been touched.
+//
+//  CERT_STORE_CTRL_COMMIT_CLEAR_FLAG can be set to inhibit a commit on
+//  store close.
+//--------------------------------------------------------------------------
+
+#define CERT_STORE_CTRL_COMMIT_FORCE_FLAG   0x1
+#define CERT_STORE_CTRL_COMMIT_CLEAR_FLAG   0x2
+
+
+//+=========================================================================
+//  Cert Store Property Defines and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  Store property IDs. This is a property applicable to the entire store.
+//  Its not a property on an individual certificate, CRL or CTL context.
+//
+//  Currently, no store properties are persisted. (This differs from
+//  most context properties which are persisted.)
+//
+//  See CertSetStoreProperty or CertGetStoreProperty for usage information.
+//
+//  Note, the range for predefined store properties should be outside
+//  the range of predefined context properties. We will start at 4096.
+//--------------------------------------------------------------------------
+#define CERT_STORE_LOCALIZED_NAME_PROP_ID   0x1000
+
+//+-------------------------------------------------------------------------
+//  Set a store property.
+//
+//  The type definition for pvData depends on the dwPropId value.
+//      CERT_STORE_LOCALIZED_NAME_PROP_ID - localized name of the store.
+//      pvData points to a CRYPT_DATA_BLOB. pbData is a pointer to a NULL
+//      terminated unicode, wide character string.
+//      cbData = (wcslen((LPWSTR) pbData) + 1) * sizeof(WCHAR).
+//
+//  For all the other PROP_IDs: an encoded PCRYPT_DATA_BLOB is passed in pvData.
+//
+//  If the property already exists, then, the old value is deleted and silently
+//  replaced. Setting, pvData to NULL, deletes the property.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSetStoreProperty(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN const void *pvData
+    );
+
+//+-------------------------------------------------------------------------
+//  Get a store property.
+//
+//  The type definition for pvData depends on the dwPropId value.
+//      CERT_STORE_LOCALIZED_NAME_PROP_ID - localized name of the store.
+//      pvData points to a NULL terminated unicode, wide character string.
+//      cbData = (wcslen((LPWSTR) pvData) + 1) * sizeof(WCHAR).
+//
+//  For all other PROP_IDs, pvData points to an array of bytes.
+//
+//  If the property doesn't exist, returns FALSE and sets LastError to
+//  CRYPT_E_NOT_FOUND.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetStoreProperty(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwPropId,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+
+typedef struct _CERT_CREATE_CONTEXT_PARA {
+    DWORD                   cbSize;
+    PFN_CRYPT_FREE          pfnFree;            // OPTIONAL
+    void                    *pvFree;            // OPTIONAL
+} CERT_CREATE_CONTEXT_PARA, *PCERT_CREATE_CONTEXT_PARA;
+
+//+-------------------------------------------------------------------------
+//  Creates the specified context from the encoded bytes. The created
+//  context isn't put in a store.
+//
+//  dwContextType values:
+//      CERT_STORE_CERTIFICATE_CONTEXT
+//      CERT_STORE_CRL_CONTEXT
+//      CERT_STORE_CTL_CONTEXT
+//
+//  If CERT_CREATE_CONTEXT_NOCOPY_FLAG is set, the created context points
+//  directly to the pbEncoded instead of an allocated copy. See flag
+//  definition for more details.
+//
+//  If CERT_CREATE_CONTEXT_SORTED_FLAG is set, the context is created
+//  with sorted entries. This flag may only be set for CERT_STORE_CTL_CONTEXT.
+//  Setting this flag implicitly sets CERT_CREATE_CONTEXT_NO_HCRYPTMSG_FLAG and
+//  CERT_CREATE_CONTEXT_NO_ENTRY_FLAG. See flag definition for
+//  more details.
+//
+//  If CERT_CREATE_CONTEXT_NO_HCRYPTMSG_FLAG is set, the context is created
+//  without creating a HCRYPTMSG handle for the context. This flag may only be
+//  set for CERT_STORE_CTL_CONTEXT.  See flag definition for more details.
+//
+//  If CERT_CREATE_CONTEXT_NO_ENTRY_FLAG is set, the context is created
+//  without decoding the entries. This flag may only be set for
+//  CERT_STORE_CTL_CONTEXT.  See flag definition for more details.
+//
+//  If unable to decode and create the context, NULL is returned.
+//  Otherwise, a pointer to a read only CERT_CONTEXT, CRL_CONTEXT or
+//  CTL_CONTEXT is returned. The context must be freed by the appropriate
+//  free context API. The context can be duplicated by calling the
+//  appropriate duplicate context API.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+const void *
+WINAPI
+CertCreateContext(
+    IN DWORD dwContextType,
+    IN DWORD dwEncodingType,
+    IN const BYTE *pbEncoded,
+    IN DWORD cbEncoded,
+    IN DWORD dwFlags,
+    IN OPTIONAL PCERT_CREATE_CONTEXT_PARA pCreatePara
+    );
+
+// When the following flag is set, the created context points directly to the
+// pbEncoded instead of an allocated copy. If pCreatePara and
+// pCreatePara->pfnFree are non-NULL, then, pfnFree is called to free
+// the pbEncoded when the context is last freed. Otherwise, no attempt is
+// made to free the pbEncoded. If pCreatePara->pvFree is non-NULL, then its
+// passed to pfnFree instead of pbEncoded.
+//
+// Note, if CertCreateContext fails, pfnFree is still called.
+#define CERT_CREATE_CONTEXT_NOCOPY_FLAG     0x1
+
+// When the following flag is set, a context with sorted entries is created.
+// Currently only applicable to a CTL context.
+//
+// For CTLs: the cCTLEntry in the returned CTL_INFO is always
+// 0. CertFindSubjectInSortedCTL and CertEnumSubjectInSortedCTL must be called
+// to find or enumerate the CTL entries.
+//
+// The Sorted CTL TrustedSubjects extension isn't returned in the created
+// context's CTL_INFO.
+#define CERT_CREATE_CONTEXT_SORTED_FLAG     0x2
+
+// By default when a CTL context is created, a HCRYPTMSG handle to its
+// SignedData message is created. This flag can be set to improve performance
+// by not creating the HCRYPTMSG handle.
+//
+// This flag is only applicable to a CTL context.
+#define CERT_CREATE_CONTEXT_NO_HCRYPTMSG_FLAG   0x4
+
+// By default when a CTL context is created, its entries are decoded.
+// This flag can be set to improve performance by not decoding the
+// entries.
+//
+// This flag is only applicable to a CTL context.
+#define CERT_CREATE_CONTEXT_NO_ENTRY_FLAG       0x8
+
+
+//+=========================================================================
+//  Certificate System Store Data Structures and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  System Store Information
+//
+//  Currently, no system store information is persisted.
+//--------------------------------------------------------------------------
+typedef struct _CERT_SYSTEM_STORE_INFO {
+    DWORD   cbSize;
+} CERT_SYSTEM_STORE_INFO, *PCERT_SYSTEM_STORE_INFO;
+
+//+-------------------------------------------------------------------------
+//  Physical Store Information
+//
+//  The Open fields are passed directly to CertOpenStore() to open
+//  the physical store.
+//
+//  By default all system stores located in the registry have an
+//  implicit SystemRegistry physical store that is opened. To disable the
+//  opening of this store, the SystemRegistry
+//  physical store corresponding to the System store must be registered with
+//  CERT_PHYSICAL_STORE_OPEN_DISABLE_FLAG set in dwFlags. Alternatively,
+//  a physical store with the name of ".Default" may be registered.
+//
+//  Depending on the store location and store name, additional predefined
+//  physical stores may be opened. For example, system stores in
+//  CURRENT_USER have the predefined physical store, .LocalMachine.
+//  To disable the opening of these predefined physical stores, the
+//  corresponding physical store must be registered with
+//  CERT_PHYSICAL_STORE_OPEN_DISABLE_FLAG set in dwFlags.
+//
+//  The CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG must be set in dwFlags
+//  to enable the adding of a context to the store.
+//
+//  When a system store is opened via the SERVICES or USERS store location,
+//  the ServiceName\ is prepended to the OpenParameters
+//  for CERT_SYSTEM_STORE_CURRENT_USER or CERT_SYSTEM_STORE_CURRENT_SERVICE
+//  physical stores and the dwOpenFlags store location is changed to
+//  CERT_SYSTEM_STORE_USERS or CERT_SYSTEM_STORE_SERVICES.
+//
+//  By default the SYSTEM, SYSTEM_REGISTRY and PHYSICAL provider
+//  stores are also opened remotely when the outer system store is opened.
+//  The CERT_PHYSICAL_STORE_REMOTE_OPEN_DISABLE_FLAG may be set in dwFlags
+//  to disable remote opens.
+//
+//  When opened remotely, the \\ComputerName is implicitly prepended to the
+//  OpenParameters for the SYSTEM, SYSTEM_REGISTRY and PHYSICAL provider types.
+//  To also prepend the \\ComputerName to other provider types, set the
+//  CERT_PHYSICAL_STORE_INSERT_COMPUTER_NAME_ENABLE_FLAG in dwFlags.
+//
+//  When the system store is opened, its physical stores are ordered
+//  according to the dwPriority. A larger dwPriority indicates higher priority.
+//--------------------------------------------------------------------------
+typedef struct _CERT_PHYSICAL_STORE_INFO {
+    DWORD               cbSize;
+    LPSTR               pszOpenStoreProvider;   // REG_SZ
+    DWORD               dwOpenEncodingType;     // REG_DWORD
+    DWORD               dwOpenFlags;            // REG_DWORD
+    CRYPT_DATA_BLOB     OpenParameters;         // REG_BINARY
+    DWORD               dwFlags;                // REG_DWORD
+    DWORD               dwPriority;             // REG_DWORD
+} CERT_PHYSICAL_STORE_INFO, *PCERT_PHYSICAL_STORE_INFO;
+
+//+-------------------------------------------------------------------------
+//  Physical Store Information dwFlags
+//--------------------------------------------------------------------------
+#define CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG                     0x1
+#define CERT_PHYSICAL_STORE_OPEN_DISABLE_FLAG                   0x2
+#define CERT_PHYSICAL_STORE_REMOTE_OPEN_DISABLE_FLAG            0x4
+#define CERT_PHYSICAL_STORE_INSERT_COMPUTER_NAME_ENABLE_FLAG    0x8
+
+
+//+-------------------------------------------------------------------------
+//  Register a system store.
+//
+//  The upper word of the dwFlags parameter is used to specify the location of
+//  the system store.
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvSystemStore
+//  points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure. Otherwise,
+//  pvSystemStore points to a null terminated UNICODE string.
+//
+//  The CERT_SYSTEM_STORE_SERVICES or CERT_SYSTEM_STORE_USERS system store
+//  name must be prefixed with the ServiceName or UserName. For example,
+//  "ServiceName\Trust".
+//
+//  Stores on remote computers can be registered for the
+//  CERT_SYSTEM_STORE_LOCAL_MACHINE, CERT_SYSTEM_STORE_SERVICES,
+//  CERT_SYSTEM_STORE_USERS, CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY
+//  or CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE
+//  locations by prepending the computer name. For example, a remote
+//  local machine store is registered via "\\ComputerName\Trust" or
+//  "ComputerName\Trust". A remote service store is registered via
+//  "\\ComputerName\ServiceName\Trust". The leading "\\" backslashes are
+//  optional in the ComputerName.
+//
+//  Set CERT_STORE_CREATE_NEW_FLAG to cause a failure if the system store
+//  already exists in the store location.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertRegisterSystemStore(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags,
+    IN PCERT_SYSTEM_STORE_INFO pStoreInfo,
+    IN OPTIONAL void *pvReserved
+    );
+
+//+-------------------------------------------------------------------------
+//  Register a physical store for the specified system store.
+//
+//  The upper word of the dwFlags parameter is used to specify the location of
+//  the system store.
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvSystemStore
+//  points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure. Otherwise,
+//  pvSystemStore points to a null terminated UNICODE string.
+//
+//  See CertRegisterSystemStore for details on prepending a ServiceName
+//  and/or ComputerName to the system store name.
+//
+//  Set CERT_STORE_CREATE_NEW_FLAG to cause a failure if the physical store
+//  already exists in the system store.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertRegisterPhysicalStore(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags,
+    IN LPCWSTR pwszStoreName,
+    IN PCERT_PHYSICAL_STORE_INFO pStoreInfo,
+    IN OPTIONAL void *pvReserved
+    );
+
+//+-------------------------------------------------------------------------
+//  Unregister the specified system store.
+//
+//  The upper word of the dwFlags parameter is used to specify the location of
+//  the system store.
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvSystemStore
+//  points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure. Otherwise,
+//  pvSystemStore points to a null terminated UNICODE string.
+//
+//  See CertRegisterSystemStore for details on prepending a ServiceName
+//  and/or ComputerName to the system store name.
+//
+//  CERT_STORE_DELETE_FLAG can optionally be set in dwFlags.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertUnregisterSystemStore(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags
+    );
+
+//+-------------------------------------------------------------------------
+//  Unregister the physical store from the specified system store.
+//
+//  The upper word of the dwFlags parameter is used to specify the location of
+//  the system store.
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvSystemStore
+//  points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure. Otherwise,
+//  pvSystemStore points to a null terminated UNICODE string.
+//
+//  See CertRegisterSystemStore for details on prepending a ServiceName
+//  and/or ComputerName to the system store name.
+//
+//  CERT_STORE_DELETE_FLAG can optionally be set in dwFlags.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertUnregisterPhysicalStore(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags,
+    IN LPCWSTR pwszStoreName
+    );
+
+//+-------------------------------------------------------------------------
+//  Enum callbacks
+//
+//  The CERT_SYSTEM_STORE_LOCATION_MASK bits in the dwFlags parameter
+//  specifies the location of the system store
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvSystemStore
+//  points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure. Otherwise,
+//  pvSystemStore points to a null terminated UNICODE string.
+//
+//  The callback returns FALSE and sets LAST_ERROR to stop the enumeration.
+//  The LAST_ERROR is returned to the caller of the enumeration.
+//
+//  The pvSystemStore passed to the callback has leading ComputerName and/or
+//  ServiceName prefixes where appropriate.
+//--------------------------------------------------------------------------
+
+typedef BOOL (WINAPI *PFN_CERT_ENUM_SYSTEM_STORE_LOCATION)(
+    IN LPCWSTR pwszStoreLocation,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    IN OPTIONAL void *pvArg
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_ENUM_SYSTEM_STORE)(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags,
+    IN PCERT_SYSTEM_STORE_INFO pStoreInfo,
+    IN OPTIONAL void *pvReserved,
+    IN OPTIONAL void *pvArg
+    );
+
+typedef BOOL (WINAPI *PFN_CERT_ENUM_PHYSICAL_STORE)(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags,
+    IN LPCWSTR pwszStoreName,
+    IN PCERT_PHYSICAL_STORE_INFO pStoreInfo,
+    IN OPTIONAL void *pvReserved,
+    IN OPTIONAL void *pvArg
+    );
+
+// In the PFN_CERT_ENUM_PHYSICAL_STORE callback the following flag is
+// set if the physical store wasn't registered and is an implicitly created
+// predefined physical store.
+#define CERT_PHYSICAL_STORE_PREDEFINED_ENUM_FLAG    0x1
+
+// Names of implicitly created predefined physical stores
+#define CERT_PHYSICAL_STORE_DEFAULT_NAME            L".Default"
+#define CERT_PHYSICAL_STORE_GROUP_POLICY_NAME       L".GroupPolicy"
+#define CERT_PHYSICAL_STORE_LOCAL_MACHINE_NAME      L".LocalMachine"
+#define CERT_PHYSICAL_STORE_DS_USER_CERTIFICATE_NAME L".UserCertificate"
+#define CERT_PHYSICAL_STORE_LOCAL_MACHINE_GROUP_POLICY_NAME \
+            L".LocalMachineGroupPolicy"
+#define CERT_PHYSICAL_STORE_ENTERPRISE_NAME         L".Enterprise"
+#define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME          L".AuthRoot"
+
+//+-------------------------------------------------------------------------
+//  Enumerate the system store locations.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertEnumSystemStoreLocation(
+    IN DWORD dwFlags,
+    IN void *pvArg,
+    IN PFN_CERT_ENUM_SYSTEM_STORE_LOCATION pfnEnum
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the system stores.
+//
+//  The upper word of the dwFlags parameter is used to specify the location of
+//  the system store.
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags,
+//  pvSystemStoreLocationPara points to a CERT_SYSTEM_STORE_RELOCATE_PARA
+//  data structure. Otherwise, pvSystemStoreLocationPara points to a null
+//  terminated UNICODE string.
+//
+//  For CERT_SYSTEM_STORE_LOCAL_MACHINE,
+//  CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY or
+//  CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, pvSystemStoreLocationPara can
+//  optionally be set to a unicode computer name for enumerating local machine
+//  stores on a remote computer. For example, "\\ComputerName" or
+//  "ComputerName".  The leading "\\" backslashes are optional in the
+//  ComputerName.
+//
+//  For CERT_SYSTEM_STORE_SERVICES or CERT_SYSTEM_STORE_USERS,
+//  if pvSystemStoreLocationPara is NULL, then,
+//  enumerates both the service/user names and the stores for each service/user
+//  name. Otherwise, pvSystemStoreLocationPara is a unicode string specifying a
+//  remote computer name and/or service/user name. For example:
+//      "ServiceName"
+//      "\\ComputerName" or "ComputerName\"
+//      "ComputerName\ServiceName"
+//  Note, if only the ComputerName is specified, then, it must have either
+//  the leading "\\" backslashes or a trailing backslash. Otherwise, its
+//  interpretted as the ServiceName or UserName.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertEnumSystemStore(
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvSystemStoreLocationPara,
+    IN void *pvArg,
+    IN PFN_CERT_ENUM_SYSTEM_STORE pfnEnum
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the physical stores for the specified system store.
+//
+//  The upper word of the dwFlags parameter is used to specify the location of
+//  the system store.
+//
+//  If CERT_SYSTEM_STORE_RELOCATE_FLAG is set in dwFlags, pvSystemStore
+//  points to a CERT_SYSTEM_STORE_RELOCATE_PARA data structure. Otherwise,
+//  pvSystemStore points to a null terminated UNICODE string.
+//
+//  See CertRegisterSystemStore for details on prepending a ServiceName
+//  and/or ComputerName to the system store name.
+//
+//  If the system store location only supports system stores and doesn't
+//  support physical stores, LastError is set to ERROR_CALL_NOT_IMPLEMENTED.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertEnumPhysicalStore(
+    IN const void *pvSystemStore,
+    IN DWORD dwFlags,
+    IN void *pvArg,
+    IN PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Certificate System Store Installable Functions
+//
+//  The CERT_SYSTEM_STORE_LOCATION_MASK bits in the dwFlags parameter passed
+//  to the CertOpenStore(for "System", "SystemRegistry" or "Physical"
+//  Provider), CertRegisterSystemStore,
+//  CertUnregisterSystemStore, CertEnumSystemStore, CertRegisterPhysicalStore,
+//  CertUnregisterPhysicalStore and CertEnumPhysicalStore APIs is used as the
+//  constant pszOID value passed to the OID installable functions.
+//  Therefore, the pszOID is restricted to a constant <= (LPCSTR) 0x0FFF.
+//
+//  The EncodingType is 0.
+//--------------------------------------------------------------------------
+
+// Installable System Store Provider OID pszFuncNames.
+#define CRYPT_OID_OPEN_SYSTEM_STORE_PROV_FUNC   "CertDllOpenSystemStoreProv"
+#define CRYPT_OID_REGISTER_SYSTEM_STORE_FUNC    "CertDllRegisterSystemStore"
+#define CRYPT_OID_UNREGISTER_SYSTEM_STORE_FUNC  "CertDllUnregisterSystemStore"
+#define CRYPT_OID_ENUM_SYSTEM_STORE_FUNC        "CertDllEnumSystemStore"
+#define CRYPT_OID_REGISTER_PHYSICAL_STORE_FUNC  "CertDllRegisterPhysicalStore"
+#define CRYPT_OID_UNREGISTER_PHYSICAL_STORE_FUNC "CertDllUnregisterPhysicalStore"
+#define CRYPT_OID_ENUM_PHYSICAL_STORE_FUNC      "CertDllEnumPhysicalStore"
+
+// CertDllOpenSystemStoreProv has the same function signature as the
+// installable "CertDllOpenStoreProv" function. See CertOpenStore for
+// more details.
+
+// CertDllRegisterSystemStore has the same function signature as
+// CertRegisterSystemStore.
+//
+// The "SystemStoreLocation" REG_SZ value must also be set for registered
+// CertDllEnumSystemStore OID functions.
+#define CRYPT_OID_SYSTEM_STORE_LOCATION_VALUE_NAME  L"SystemStoreLocation"
+
+// The remaining Register, Enum and Unregister OID installable functions
+// have the same signature as their Cert Store API counterpart.
+
+
+//+=========================================================================
+//  Enhanced Key Usage Helper Functions
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  Get the enhanced key usage extension or property from the certificate
+//  and decode.
+//
+//  If the CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG is set, then, only get the
+//  extension.
+//
+//  If the CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG is set, then, only get the
+//  property.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetEnhancedKeyUsage(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwFlags,
+    OUT PCERT_ENHKEY_USAGE pUsage,
+    IN OUT DWORD *pcbUsage
+    );
+
+//+-------------------------------------------------------------------------
+//  Set the enhanced key usage property for the certificate.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertSetEnhancedKeyUsage(
+    IN PCCERT_CONTEXT pCertContext,
+    IN PCERT_ENHKEY_USAGE pUsage
+    );
+
+//+-------------------------------------------------------------------------
+//  Add the usage identifier to the certificate's enhanced key usage property.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddEnhancedKeyUsageIdentifier(
+    IN PCCERT_CONTEXT pCertContext,
+    IN LPCSTR pszUsageIdentifier
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Remove the usage identifier from the certificate's enhanced key usage
+//  property.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertRemoveEnhancedKeyUsageIdentifier(
+    IN PCCERT_CONTEXT pCertContext,
+    IN LPCSTR pszUsageIdentifier
+    );
+
+//+---------------------------------------------------------------------------
+//
+//
+//  Takes an array of certs and returns an array of usages
+//  which consists of the intersection of the valid usages for each cert.
+//  If each cert is good for all possible usages then the cNumOIDs is set to -1.
+//
+//----------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetValidUsages(
+    IN      DWORD           cCerts,
+    IN      PCCERT_CONTEXT  *rghCerts,
+    OUT     int             *cNumOIDs,
+    OUT     LPSTR           *rghOIDs,
+    IN OUT  DWORD           *pcbOIDs);
+
+//+=========================================================================
+//  Cryptographic Message helper functions for verifying and signing a
+//  CTL.
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  Get and verify the signer of a cryptographic message.
+//
+//  To verify a CTL, the hCryptMsg is obtained from the CTL_CONTEXT's
+//  hCryptMsg field.
+//
+//  If CMSG_TRUSTED_SIGNER_FLAG is set, then, treat the Signer stores as being
+//  trusted and only search them to find the certificate corresponding to the
+//  signer's issuer and serial number.  Otherwise, the SignerStores are
+//  optionally provided to supplement the message's store of certificates.
+//  If a signer certificate is found, its public key is used to verify
+//  the message signature. The CMSG_SIGNER_ONLY_FLAG can be set to
+//  return the signer without doing the signature verify.
+//
+//  If CMSG_USE_SIGNER_INDEX_FLAG is set, then, only get the signer specified
+//  by *pdwSignerIndex. Otherwise, iterate through all the signers
+//  until a signer verifies or no more signers.
+//
+//  For a verified signature, *ppSigner is updated with certificate context
+//  of the signer and *pdwSignerIndex is updated with the index of the signer.
+//  ppSigner and/or pdwSignerIndex can be NULL, indicating the caller isn't
+//  interested in getting the CertContext and/or index of the signer.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgGetAndVerifySigner(
+    IN HCRYPTMSG hCryptMsg,
+    IN DWORD cSignerStore,
+    IN OPTIONAL HCERTSTORE *rghSignerStore,
+    IN DWORD dwFlags,
+    OUT OPTIONAL PCCERT_CONTEXT *ppSigner,
+    IN OUT OPTIONAL DWORD *pdwSignerIndex
+    );
+
+#define CMSG_TRUSTED_SIGNER_FLAG            0x1
+#define CMSG_SIGNER_ONLY_FLAG               0x2
+#define CMSG_USE_SIGNER_INDEX_FLAG          0x4
+
+//+-------------------------------------------------------------------------
+//  Sign an encoded CTL.
+//
+//  The pbCtlContent can be obtained via a CTL_CONTEXT's pbCtlContent
+//  field or via a CryptEncodeObject(PKCS_CTL or PKCS_SORTED_CTL).
+//
+//  CMSG_CMS_ENCAPSULATED_CTL_FLAG can be set to encode a CMS compatible
+//  V3 SignedData message.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgSignCTL(
+    IN DWORD dwMsgEncodingType,
+    IN BYTE *pbCtlContent,
+    IN DWORD cbCtlContent,
+    IN PCMSG_SIGNED_ENCODE_INFO pSignInfo,
+    IN DWORD dwFlags,
+    OUT BYTE *pbEncoded,
+    IN OUT DWORD *pcbEncoded
+    );
+
+// When set, CTL inner content is encapsulated within an OCTET STRING
+#define CMSG_CMS_ENCAPSULATED_CTL_FLAG  0x00008000
+
+//+-------------------------------------------------------------------------
+//  Encode the CTL and create a signed message containing the encoded CTL.
+//
+//  Set CMSG_ENCODE_SORTED_CTL_FLAG if the CTL entries are to be sorted
+//  before encoding. This flag should be set, if the
+//  CertFindSubjectInSortedCTL or CertEnumSubjectInSortedCTL APIs will
+//  be called. If the identifier for the CTL entries is a hash, such as,
+//  MD5 or SHA1, then, CMSG_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG should
+//  also be set.
+//
+//  CMSG_CMS_ENCAPSULATED_CTL_FLAG can be set to encode a CMS compatible
+//  V3 SignedData message.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptMsgEncodeAndSignCTL(
+    IN DWORD dwMsgEncodingType,
+    IN PCTL_INFO pCtlInfo,
+    IN PCMSG_SIGNED_ENCODE_INFO pSignInfo,
+    IN DWORD dwFlags,
+    OUT BYTE *pbEncoded,
+    IN OUT DWORD *pcbEncoded
+    );
+
+//  The following flag is set if the CTL is to be encoded with sorted
+//  trusted subjects and the szOID_SORTED_CTL extension is inserted containing
+//  sorted offsets to the encoded subjects.
+#define CMSG_ENCODE_SORTED_CTL_FLAG                     0x1
+
+//  If the above sorted flag is set, then, the following flag should also
+//  be set if the identifier for the TrustedSubjects is a hash,
+//  such as, MD5 or SHA1.
+#define CMSG_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG      0x2
+
+
+//+-------------------------------------------------------------------------
+//  Returns TRUE if the SubjectIdentifier exists in the CTL. Optionally
+//  returns a pointer to and byte count of the Subject's encoded attributes.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertFindSubjectInSortedCTL(
+    IN PCRYPT_DATA_BLOB pSubjectIdentifier,
+    IN PCCTL_CONTEXT pCtlContext,
+    IN DWORD dwFlags,
+    IN void *pvReserved,
+    OUT OPTIONAL PCRYPT_DER_BLOB pEncodedAttributes
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerates through the sequence of TrustedSubjects in a CTL context
+//  created with CERT_CREATE_CONTEXT_SORTED_FLAG set.
+//
+//  To start the enumeration, *ppvNextSubject must be NULL. Upon return,
+//  *ppvNextSubject is updated to point to the next TrustedSubject in
+//  the encoded sequence.
+//
+//  Returns FALSE for no more subjects or invalid arguments.
+//
+//  Note, the returned DER_BLOBs point directly into the encoded
+//  bytes (not allocated, and must not be freed).
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertEnumSubjectInSortedCTL(
+    IN PCCTL_CONTEXT pCtlContext,
+    IN OUT void **ppvNextSubject,
+    OUT OPTIONAL PCRYPT_DER_BLOB pSubjectIdentifier,
+    OUT OPTIONAL PCRYPT_DER_BLOB pEncodedAttributes
+    );
+
+
+//+=========================================================================
+//  Certificate Verify CTL Usage Data Structures and APIs
+//==========================================================================
+
+typedef struct _CTL_VERIFY_USAGE_PARA {
+    DWORD                   cbSize;
+    CRYPT_DATA_BLOB         ListIdentifier;     // OPTIONAL
+    DWORD                   cCtlStore;
+    HCERTSTORE              *rghCtlStore;       // OPTIONAL
+    DWORD                   cSignerStore;
+    HCERTSTORE              *rghSignerStore;    // OPTIONAL
+} CTL_VERIFY_USAGE_PARA, *PCTL_VERIFY_USAGE_PARA;
+
+typedef struct _CTL_VERIFY_USAGE_STATUS {
+    DWORD                   cbSize;
+    DWORD                   dwError;
+    DWORD                   dwFlags;
+    PCCTL_CONTEXT           *ppCtl;             // IN OUT OPTIONAL
+    DWORD                   dwCtlEntryIndex;
+    PCCERT_CONTEXT          *ppSigner;          // IN OUT OPTIONAL
+    DWORD                   dwSignerIndex;
+} CTL_VERIFY_USAGE_STATUS, *PCTL_VERIFY_USAGE_STATUS;
+
+#define CERT_VERIFY_INHIBIT_CTL_UPDATE_FLAG     0x1
+#define CERT_VERIFY_TRUSTED_SIGNERS_FLAG        0x2
+#define CERT_VERIFY_NO_TIME_CHECK_FLAG          0x4
+#define CERT_VERIFY_ALLOW_MORE_USAGE_FLAG       0x8
+
+#define CERT_VERIFY_UPDATED_CTL_FLAG            0x1
+
+//+-------------------------------------------------------------------------
+//  Verify that a subject is trusted for the specified usage by finding a
+//  signed and time valid CTL with the usage identifiers and containing the
+//  the subject. A subject can be identified by either its certificate context
+//  or any identifier such as its SHA1 hash.
+//
+//  See CertFindSubjectInCTL for definition of dwSubjectType and pvSubject
+//  parameters.
+//
+//  Via pVerifyUsagePara, the caller can specify the stores to be searched
+//  to find the CTL. The caller can also specify the stores containing
+//  acceptable CTL signers. By setting the ListIdentifier, the caller
+//  can also restrict to a particular signer CTL list.
+//
+//  Via pVerifyUsageStatus, the CTL containing the subject, the subject's
+//  index into the CTL's array of entries, and the signer of the CTL
+//  are returned. If the caller is not interested, ppCtl and ppSigner can be set
+//  to NULL. Returned contexts must be freed via the store's free context APIs.
+//
+//  If the CERT_VERIFY_INHIBIT_CTL_UPDATE_FLAG isn't set, then, a time
+//  invalid CTL in one of the CtlStores may be replaced. When replaced, the
+//  CERT_VERIFY_UPDATED_CTL_FLAG is set in pVerifyUsageStatus->dwFlags.
+//
+//  If the CERT_VERIFY_TRUSTED_SIGNERS_FLAG is set, then, only the
+//  SignerStores specified in pVerifyUsageStatus are searched to find
+//  the signer. Otherwise, the SignerStores provide additional sources
+//  to find the signer's certificate.
+//
+//  If CERT_VERIFY_NO_TIME_CHECK_FLAG is set, then, the CTLs aren't checked
+//  for time validity.
+//
+//  If CERT_VERIFY_ALLOW_MORE_USAGE_FLAG is set, then, the CTL may contain
+//  additional usage identifiers than specified by pSubjectUsage. Otherwise,
+//  the found CTL will contain the same usage identifers and no more.
+//
+//  CertVerifyCTLUsage will be implemented as a dispatcher to OID installable
+//  functions. First, it will try to find an OID function matching the first
+//  usage object identifier in the pUsage sequence. Next, it will dispatch
+//  to the default CertDllVerifyCTLUsage functions.
+//
+//  If the subject is trusted for the specified usage, then, TRUE is
+//  returned. Otherwise, FALSE is returned with dwError set to one of the
+//  following:
+//      CRYPT_E_NO_VERIFY_USAGE_DLL
+//      CRYPT_E_NO_VERIFY_USAGE_CHECK
+//      CRYPT_E_VERIFY_USAGE_OFFLINE
+//      CRYPT_E_NOT_IN_CTL
+//      CRYPT_E_NO_TRUSTED_SIGNER
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertVerifyCTLUsage(
+    IN DWORD dwEncodingType,
+    IN DWORD dwSubjectType,
+    IN void *pvSubject,
+    IN PCTL_USAGE pSubjectUsage,
+    IN DWORD dwFlags,
+    IN OPTIONAL PCTL_VERIFY_USAGE_PARA pVerifyUsagePara,
+    IN OUT PCTL_VERIFY_USAGE_STATUS pVerifyUsageStatus
+    );
+
+
+//+=========================================================================
+//  Certificate Revocation Data Structures and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  This data structure is updated by a CRL revocation type handler
+//  with the base and possibly the delta CRL used.
+//--------------------------------------------------------------------------
+typedef struct _CERT_REVOCATION_CRL_INFO {
+    DWORD                   cbSize;
+    PCCRL_CONTEXT           pBaseCrlContext;
+    PCCRL_CONTEXT           pDeltaCrlContext;
+
+    // When revoked, points to entry in either of the above CRL contexts.
+    // Don't free.
+    PCRL_ENTRY              pCrlEntry;
+    BOOL                    fDeltaCrlEntry; // TRUE if in pDeltaCrlContext
+} CERT_REVOCATION_CRL_INFO, *PCERT_REVOCATION_CRL_INFO;
+
+//+-------------------------------------------------------------------------
+//  The following data structure may be passed to CertVerifyRevocation to
+//  assist in finding the issuer of the context to be verified.
+//
+//  When pIssuerCert is specified, pIssuerCert is the issuer of
+//  rgpvContext[cContext - 1].
+//
+//  When cCertStore and rgCertStore are specified, these stores may contain
+//  an issuer certificate.
+//
+//  When hCrlStore is specified then a handler which uses CRLs can search this
+//  store for them
+//
+//  When pftTimeToUse is specified then the handler (if possible) must determine
+//  revocation status relative to the time given otherwise the answer may be
+//  independent of time or relative to current time
+//--------------------------------------------------------------------------
+typedef struct _CERT_REVOCATION_PARA {
+    DWORD                       cbSize;
+    PCCERT_CONTEXT              pIssuerCert;
+    DWORD                       cCertStore;
+    HCERTSTORE                  *rgCertStore;
+    HCERTSTORE                  hCrlStore;
+    LPFILETIME                  pftTimeToUse;
+
+#ifdef CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS
+    // Note, if you #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS, then, you
+    // must zero all unused fields in this data structure.
+    // More fields could be added in a future release.
+
+    // 0 uses revocation handler's default timeout.
+    DWORD                       dwUrlRetrievalTimeout;  // milliseconds
+
+    // When set, checks and attempts to retrieve a CRL where
+    // ThisUpdate >= (CurrentTime - dwFreshnessTime). Otherwise, defaults
+    // to using the CRL's NextUpdate.
+    BOOL                        fCheckFreshnessTime;
+    DWORD                       dwFreshnessTime;        // seconds
+
+    // If NULL, revocation handler gets the current time
+    LPFILETIME                  pftCurrentTime;
+
+    // If nonNULL, a CRL revocation type handler updates with the base and
+    // possibly the delta CRL used. Note, *pCrlInfo must be initialized
+    // by the caller. Any nonNULL CRL contexts are freed. Any updated
+    // CRL contexts must be freed by the caller.
+    //
+    // The CRL info is only applicable to the last context checked. If
+    // interested in this information, then, CertVerifyRevocation should be
+    // called with cContext = 1.
+    PCERT_REVOCATION_CRL_INFO   pCrlInfo;
+#endif
+} CERT_REVOCATION_PARA, *PCERT_REVOCATION_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  The following data structure is returned by CertVerifyRevocation to
+//  specify the status of the revoked or unchecked context. Review the
+//  following CertVerifyRevocation comments for details.
+//
+//  Upon input to CertVerifyRevocation, cbSize must be set to a size
+//  >= (offsetof(CERT_REVOCATION_STATUS, dwReason) + sizeof(DWORD) ).
+//  Otherwise, CertVerifyRevocation returns FALSE and sets LastError to
+//  E_INVALIDARG.
+//
+//  Upon input to the installed or registered CRYPT_OID_VERIFY_REVOCATION_FUNC
+//  functions, the dwIndex, dwError and dwReason have been zero'ed.
+//  If present, fHasFreshnessTime and dwFreshnessTime have been zero'ed.
+//--------------------------------------------------------------------------
+typedef struct _CERT_REVOCATION_STATUS {
+    DWORD                   cbSize;
+    DWORD                   dwIndex;
+    DWORD                   dwError;
+    DWORD                   dwReason;
+
+    // Depending on cbSize, the following fields may optionally be returned.
+
+    // The Freshness time is only applicable to the last context checked. If
+    // interested in this information, then, CertVerifyRevocation should be
+    // called with cContext = 1.
+    //
+    // fHasFreshnessTime is only set if we are able to retrieve revocation
+    // information. For a CRL its CurrentTime - ThisUpdate.
+    BOOL                    fHasFreshnessTime;
+    DWORD                   dwFreshnessTime;    // seconds
+} CERT_REVOCATION_STATUS, *PCERT_REVOCATION_STATUS;
+
+//+-------------------------------------------------------------------------
+//  Verifies the array of contexts for revocation. The dwRevType parameter
+//  indicates the type of the context data structure passed in rgpvContext.
+//  Currently only the revocation of certificates is defined.
+//
+//  If the CERT_VERIFY_REV_CHAIN_FLAG flag is set, then, CertVerifyRevocation
+//  is verifying a chain of certs where, rgpvContext[i + 1] is the issuer
+//  of rgpvContext[i]. Otherwise, CertVerifyRevocation makes no assumptions
+//  about the order of the contexts.
+//
+//  To assist in finding the issuer, the pRevPara may optionally be set. See
+//  the CERT_REVOCATION_PARA data structure for details.
+//
+//  The contexts must contain enough information to allow the
+//  installable or registered revocation DLLs to find the revocation server. For
+//  certificates, this information would normally be conveyed in an
+//  extension such as the IETF's AuthorityInfoAccess extension.
+//
+//  CertVerifyRevocation returns TRUE if all of the contexts were successfully
+//  checked and none were revoked. Otherwise, returns FALSE and updates the
+//  returned pRevStatus data structure as follows:
+//    dwIndex
+//      Index of the first context that was revoked or unable to
+//      be checked for revocation
+//    dwError
+//      Error status. LastError is also set to this error status.
+//      dwError can be set to one of the following error codes defined
+//      in winerror.h:
+//        ERROR_SUCCESS - good context
+//        CRYPT_E_REVOKED - context was revoked. dwReason contains the
+//           reason for revocation
+//        CRYPT_E_REVOCATION_OFFLINE - unable to connect to the
+//           revocation server
+//        CRYPT_E_NOT_IN_REVOCATION_DATABASE - the context to be checked
+//           was not found in the revocation server's database.
+//        CRYPT_E_NO_REVOCATION_CHECK - the called revocation function
+//           wasn't able to do a revocation check on the context
+//        CRYPT_E_NO_REVOCATION_DLL - no installed or registered Dll was
+//           found to verify revocation
+//    dwReason
+//      The dwReason is currently only set for CRYPT_E_REVOKED and contains
+//      the reason why the context was revoked. May be one of the following
+//      CRL reasons defined by the CRL Reason Code extension ("2.5.29.21")
+//          CRL_REASON_UNSPECIFIED              0
+//          CRL_REASON_KEY_COMPROMISE           1
+//          CRL_REASON_CA_COMPROMISE            2
+//          CRL_REASON_AFFILIATION_CHANGED      3
+//          CRL_REASON_SUPERSEDED               4
+//          CRL_REASON_CESSATION_OF_OPERATION   5
+//          CRL_REASON_CERTIFICATE_HOLD         6
+//
+//  For each entry in rgpvContext, CertVerifyRevocation iterates
+//  through the CRYPT_OID_VERIFY_REVOCATION_FUNC
+//  function set's list of installed DEFAULT functions.
+//  CryptGetDefaultOIDFunctionAddress is called with pwszDll = NULL. If no
+//  installed functions are found capable of doing the revocation verification,
+//  CryptVerifyRevocation iterates through CRYPT_OID_VERIFY_REVOCATION_FUNC's
+//  list of registered DEFAULT Dlls. CryptGetDefaultOIDDllList is called to
+//  get the list. CryptGetDefaultOIDFunctionAddress is called to load the Dll.
+//
+//  The called functions have the same signature as CertVerifyRevocation. A
+//  called function returns TRUE if it was able to successfully check all of
+//  the contexts and none were revoked. Otherwise, the called function returns
+//  FALSE and updates pRevStatus. dwIndex is set to the index of
+//  the first context that was found to be revoked or unable to be checked.
+//  dwError and LastError are updated. For CRYPT_E_REVOKED, dwReason
+//  is updated. Upon input to the called function, dwIndex, dwError and
+//  dwReason have been zero'ed. cbSize has been checked to be >=
+//  sizeof(CERT_REVOCATION_STATUS).
+//
+//  If the called function returns FALSE, and dwError isn't set to
+//  CRYPT_E_REVOKED, then, CertVerifyRevocation either continues on to the
+//  next DLL in the list for a returned dwIndex of 0 or for a returned
+//  dwIndex > 0, restarts the process of finding a verify function by
+//  advancing the start of the context array to the returned dwIndex and
+//  decrementing the count of remaining contexts.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertVerifyRevocation(
+    IN DWORD dwEncodingType,
+    IN DWORD dwRevType,
+    IN DWORD cContext,
+    IN PVOID rgpvContext[],
+    IN DWORD dwFlags,
+    IN OPTIONAL PCERT_REVOCATION_PARA pRevPara,
+    IN OUT PCERT_REVOCATION_STATUS pRevStatus
+    );
+
+//+-------------------------------------------------------------------------
+//  Revocation types
+//--------------------------------------------------------------------------
+#define CERT_CONTEXT_REVOCATION_TYPE        1
+
+//+-------------------------------------------------------------------------
+//  When the following flag is set, rgpvContext[] consists of a chain
+//  of certificates, where rgpvContext[i + 1] is the issuer of rgpvContext[i].
+//--------------------------------------------------------------------------
+#define CERT_VERIFY_REV_CHAIN_FLAG              0x00000001
+
+//+-------------------------------------------------------------------------
+// CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION prevents the revocation handler from
+// accessing any network based resources for revocation checking
+//--------------------------------------------------------------------------
+#define CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION 0x00000002
+
+//+-------------------------------------------------------------------------
+//  By default, the dwUrlRetrievalTimeout in pRevPara is the timeout used
+//  for each URL wire retrieval. When the following flag is set,
+//  dwUrlRetrievalTimeout is the accumulative timeout across all URL wire
+//  retrievals.
+//--------------------------------------------------------------------------
+#define CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG   0x00000004
+
+
+//+-------------------------------------------------------------------------
+//  CERT_CONTEXT_REVOCATION_TYPE
+//
+//  pvContext points to a const CERT_CONTEXT.
+//--------------------------------------------------------------------------
+
+//+=========================================================================
+//  Certificate Helper APIs
+//==========================================================================
+
+
+//+-------------------------------------------------------------------------
+//  Compare two multiple byte integer blobs to see if they are identical.
+//
+//  Before doing the comparison, leading zero bytes are removed from a
+//  positive number and leading 0xFF bytes are removed from a negative
+//  number.
+//
+//  The multiple byte integers are treated as Little Endian. pbData[0] is the
+//  least significant byte and pbData[cbData - 1] is the most significant
+//  byte.
+//
+//  Returns TRUE if the integer blobs are identical after removing leading
+//  0 or 0xFF bytes.
+//--------------------------------------------------------------------------
+BOOL
+WINAPI
+CertCompareIntegerBlob(
+    IN PCRYPT_INTEGER_BLOB pInt1,
+    IN PCRYPT_INTEGER_BLOB pInt2
+    );
+
+//+-------------------------------------------------------------------------
+//  Compare two certificates to see if they are identical.
+//
+//  Since a certificate is uniquely identified by its Issuer and SerialNumber,
+//  these are the only fields needing to be compared.
+//
+//  Returns TRUE if the certificates are identical.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertCompareCertificate(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_INFO pCertId1,
+    IN PCERT_INFO pCertId2
+    );
+
+//+-------------------------------------------------------------------------
+//  Compare two certificate names to see if they are identical.
+//
+//  Returns TRUE if the names are identical.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertCompareCertificateName(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_NAME_BLOB pCertName1,
+    IN PCERT_NAME_BLOB pCertName2
+    );
+
+//+-------------------------------------------------------------------------
+//  Compare the attributes in the certificate name with the specified
+//  Relative Distinguished Name's (CERT_RDN) array of attributes.
+//  The comparison iterates through the CERT_RDN attributes and looks for an
+//  attribute match in any of the certificate name's RDNs.
+//  Returns TRUE if all the attributes are found and match.
+//
+//  The CERT_RDN_ATTR fields can have the following special values:
+//    pszObjId == NULL              - ignore the attribute object identifier
+//    dwValueType == RDN_ANY_TYPE   - ignore the value type
+//
+//  CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG should be set to do
+//  a case insensitive match. Otherwise, defaults to an exact, case sensitive
+//  match.
+//
+//  CERT_UNICODE_IS_RDN_ATTRS_FLAG should be set if the pRDN was initialized
+//  with unicode strings as for CryptEncodeObject(X509_UNICODE_NAME).
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertIsRDNAttrsInCertificateName(
+    IN DWORD dwCertEncodingType,
+    IN DWORD dwFlags,
+    IN PCERT_NAME_BLOB pCertName,
+    IN PCERT_RDN pRDN
+    );
+
+#define CERT_UNICODE_IS_RDN_ATTRS_FLAG              0x1
+#define CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG     0x2
+
+//+-------------------------------------------------------------------------
+//  Compare two public keys to see if they are identical.
+//
+//  Returns TRUE if the keys are identical.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertComparePublicKeyInfo(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_PUBLIC_KEY_INFO pPublicKey1,
+    IN PCERT_PUBLIC_KEY_INFO pPublicKey2
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the public/private key's bit length.
+//
+//  Returns 0 if unable to determine the key's length.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertGetPublicKeyLength(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_PUBLIC_KEY_INFO pPublicKey
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify the signature of a subject certificate or a CRL using the
+//  public key info
+//
+//  Returns TRUE for a valid signature.
+//
+//  hCryptProv specifies the crypto provider to use to verify the signature.
+//  It doesn't need to use a private key.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyCertificateSignature(
+    IN HCRYPTPROV               hCryptProv,
+    IN DWORD                    dwCertEncodingType,
+    IN const BYTE *             pbEncoded,
+    IN DWORD                    cbEncoded,
+    IN PCERT_PUBLIC_KEY_INFO    pPublicKey
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify the signature of a subject certificate, CRL, certificate request
+//  or keygen request using the issuer's public key.
+//
+//  Returns TRUE for a valid signature.
+//
+//  The subject can be an encoded blob or a context for a certificate or CRL.
+//  For a subject certificate context, if the certificate is missing
+//  inheritable PublicKey Algorithm Parameters, the context's
+//  CERT_PUBKEY_ALG_PARA_PROP_ID is updated with the issuer's public key
+//  algorithm parameters for a valid signature.
+//
+//  The issuer can be a pointer to a CERT_PUBLIC_KEY_INFO, certificate
+//  context or a chain context.
+//
+//  hCryptProv specifies the crypto provider to use to verify the signature.
+//  Its private key isn't used. If hCryptProv is NULL, a default
+//  provider is picked according to the PublicKey Algorithm OID.
+//
+//  If the signature algorithm is a hashing algorithm, then, the
+//  signature is expected to contain the hash octets. Only dwIssuerType
+//  of CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL may be specified
+//  to verify this no signature case. If any other dwIssuerType is
+//  specified, the verify will fail with LastError set to E_INVALIDARG.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyCertificateSignatureEx(
+    IN OPTIONAL HCRYPTPROV hCryptProv,
+    IN DWORD dwCertEncodingType,
+    IN DWORD dwSubjectType,
+    IN void *pvSubject,
+    IN DWORD dwIssuerType,
+    IN void *pvIssuer,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved
+    );
+
+
+// Subject Types
+#define CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB         1
+    // pvSubject :: PCRYPT_DATA_BLOB
+#define CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT         2
+    // pvSubject :: PCCERT_CONTEXT
+#define CRYPT_VERIFY_CERT_SIGN_SUBJECT_CRL          3
+    // pvSubject :: PCCRL_CONTEXT
+
+// Issuer Types
+#define CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY        1
+    // pvIssuer :: PCERT_PUBLIC_KEY_INFO
+#define CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT          2
+    // pvIssuer :: PCCERT_CONTEXT
+#define CRYPT_VERIFY_CERT_SIGN_ISSUER_CHAIN         3
+    // pvIssuer :: PCCERT_CHAIN_CONTEXT
+#define CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL          4
+    // pvIssuer :: NULL
+
+//+-------------------------------------------------------------------------
+//  Compute the hash of the "to be signed" information in the encoded
+//  signed content (CERT_SIGNED_CONTENT_INFO).
+//
+//  hCryptProv specifies the crypto provider to use to compute the hash.
+//  It doesn't need to use a private key.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptHashToBeSigned(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwCertEncodingType,
+    IN const BYTE *pbEncoded,
+    IN DWORD cbEncoded,
+    OUT BYTE *pbComputedHash,
+    IN OUT DWORD *pcbComputedHash
+    );
+
+//+-------------------------------------------------------------------------
+//  Hash the encoded content.
+//
+//  hCryptProv specifies the crypto provider to use to compute the hash.
+//  It doesn't need to use a private key.
+//
+//  Algid specifies the CAPI hash algorithm to use. If Algid is 0, then, the
+//  default hash algorithm (currently SHA1) is used.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptHashCertificate(
+    IN HCRYPTPROV hCryptProv,
+    IN ALG_ID Algid,
+    IN DWORD dwFlags,
+    IN const BYTE *pbEncoded,
+    IN DWORD cbEncoded,
+    OUT BYTE *pbComputedHash,
+    IN OUT DWORD *pcbComputedHash
+    );
+
+//+-------------------------------------------------------------------------
+//  Sign the "to be signed" information in the encoded signed content.
+//
+//  hCryptProv specifies the crypto provider to use to do the signature.
+//  It uses the specified private key.
+//
+//  If the SignatureAlgorithm is a hash algorithm, then, the signature
+//  contains the hash octets. A private key isn't used to encrypt the hash.
+//  dwKeySpec isn't used and hCryptProv can be NULL where an appropriate
+//  default provider will be used for hashing.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSignCertificate(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwKeySpec,
+    IN DWORD dwCertEncodingType,
+    IN const BYTE *pbEncodedToBeSigned,
+    IN DWORD cbEncodedToBeSigned,
+    IN PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
+    IN OPTIONAL const void *pvHashAuxInfo,
+    OUT BYTE *pbSignature,
+    IN OUT DWORD *pcbSignature
+    );
+
+//+-------------------------------------------------------------------------
+//  Encode the "to be signed" information. Sign the encoded "to be signed".
+//  Encode the "to be signed" and the signature.
+//
+//  hCryptProv specifies the crypto provider to use to do the signature.
+//  It uses the specified private key.
+//
+//  If the SignatureAlgorithm is a hash algorithm, then, the signature
+//  contains the hash octets. A private key isn't used to encrypt the hash.
+//  dwKeySpec isn't used and hCryptProv can be NULL where an appropriate
+//  default provider will be used for hashing.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSignAndEncodeCertificate(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwKeySpec,
+    IN DWORD dwCertEncodingType,
+    IN LPCSTR lpszStructType,       // "to be signed"
+    IN const void *pvStructInfo,
+    IN PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
+    IN OPTIONAL const void *pvHashAuxInfo,
+    OUT PBYTE pbEncoded,
+    IN OUT DWORD *pcbEncoded
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Verify the time validity of a certificate.
+//
+//  Returns -1 if before NotBefore, +1 if after NotAfter and otherwise 0 for
+//  a valid certificate
+//
+//  If pTimeToVerify is NULL, uses the current time.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+LONG
+WINAPI
+CertVerifyTimeValidity(
+    IN LPFILETIME pTimeToVerify,
+    IN PCERT_INFO pCertInfo
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Verify the time validity of a CRL.
+//
+//  Returns -1 if before ThisUpdate, +1 if after NextUpdate and otherwise 0 for
+//  a valid CRL
+//
+//  If pTimeToVerify is NULL, uses the current time.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+LONG
+WINAPI
+CertVerifyCRLTimeValidity(
+    IN LPFILETIME pTimeToVerify,
+    IN PCRL_INFO pCrlInfo
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify that the subject's time validity nests within the issuer's time
+//  validity.
+//
+//  Returns TRUE if it nests. Otherwise, returns FALSE.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertVerifyValidityNesting(
+    IN PCERT_INFO pSubjectInfo,
+    IN PCERT_INFO pIssuerInfo
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify that the subject certificate isn't on its issuer CRL.
+//
+//  Returns true if the certificate isn't on the CRL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertVerifyCRLRevocation(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_INFO pCertId,          // Only the Issuer and SerialNumber
+    // fields are used
+    IN DWORD cCrlInfo,
+    IN PCRL_INFO rgpCrlInfo[]
+    );
+
+//+-------------------------------------------------------------------------
+//  Convert the CAPI AlgId to the ASN.1 Object Identifier string
+//
+//  Returns NULL if there isn't an ObjId corresponding to the AlgId.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+LPCSTR
+WINAPI
+CertAlgIdToOID(
+    IN DWORD dwAlgId
+    );
+
+//+-------------------------------------------------------------------------
+//  Convert the ASN.1 Object Identifier string to the CAPI AlgId.
+//
+//  Returns 0 if there isn't an AlgId corresponding to the ObjId.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertOIDToAlgId(
+    IN LPCSTR pszObjId
+    );
+
+//+-------------------------------------------------------------------------
+//  Find an extension identified by its Object Identifier.
+//
+//  If found, returns pointer to the extension. Otherwise, returns NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCERT_EXTENSION
+WINAPI
+CertFindExtension(
+    IN LPCSTR pszObjId,
+    IN DWORD cExtensions,
+    IN CERT_EXTENSION rgExtensions[]
+    );
+
+//+-------------------------------------------------------------------------
+//  Find the first attribute identified by its Object Identifier.
+//
+//  If found, returns pointer to the attribute. Otherwise, returns NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCRYPT_ATTRIBUTE
+WINAPI
+CertFindAttribute(
+    IN LPCSTR pszObjId,
+    IN DWORD cAttr,
+    IN CRYPT_ATTRIBUTE rgAttr[]
+    );
+
+//+-------------------------------------------------------------------------
+//  Find the first CERT_RDN attribute identified by its Object Identifier in
+//  the name's list of Relative Distinguished Names.
+//
+//  If found, returns pointer to the attribute. Otherwise, returns NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCERT_RDN_ATTR
+WINAPI
+CertFindRDNAttr(
+    IN LPCSTR pszObjId,
+    IN PCERT_NAME_INFO pName
+    );
+
+//+-------------------------------------------------------------------------
+//  Get the intended key usage bytes from the certificate.
+//
+//  If the certificate doesn't have any intended key usage bytes, returns FALSE
+//  and *pbKeyUsage is zeroed. Otherwise, returns TRUE and up through
+//  cbKeyUsage bytes are copied into *pbKeyUsage. Any remaining uncopied
+//  bytes are zeroed.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetIntendedKeyUsage(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_INFO pCertInfo,
+    OUT BYTE *pbKeyUsage,
+    IN DWORD cbKeyUsage
+    );
+
+typedef void *HCRYPTDEFAULTCONTEXT;
+
+//+-------------------------------------------------------------------------
+//  Install a previously CryptAcquiredContext'ed HCRYPTPROV to be used as
+//  a default context.
+//
+//  dwDefaultType and pvDefaultPara specify where the default context is used.
+//  For example, install the HCRYPTPROV to be used to verify certificate's
+//  having szOID_OIWSEC_md5RSA signatures.
+//
+//  By default, the installed HCRYPTPROV is only applicable to the current
+//  thread. Set CRYPT_DEFAULT_CONTEXT_PROCESS_FLAG to allow the HCRYPTPROV
+//  to be used by all threads in the current process.
+//
+//  For a successful install, TRUE is returned and *phDefaultContext is
+//  updated with the HANDLE to be passed to CryptUninstallDefaultContext.
+//
+//  The installed HCRYPTPROVs are stack ordered (the last installed
+//  HCRYPTPROV is checked first). All thread installed HCRYPTPROVs are
+//  checked before any process HCRYPTPROVs.
+//
+//  The installed HCRYPTPROV remains available for default usage until
+//  CryptUninstallDefaultContext is called or the thread or process exits.
+//
+//  If CRYPT_DEFAULT_CONTEXT_AUTO_RELEASE_FLAG is set, then, the HCRYPTPROV
+//  is CryptReleaseContext'ed at thread or process exit. However,
+//  not CryptReleaseContext'ed if CryptUninstallDefaultContext is
+//  called.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptInstallDefaultContext(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwDefaultType,
+    IN const void *pvDefaultPara,
+    IN DWORD dwFlags,
+    IN void *pvReserved,
+    OUT HCRYPTDEFAULTCONTEXT *phDefaultContext
+    );
+
+// dwFlags
+#define CRYPT_DEFAULT_CONTEXT_AUTO_RELEASE_FLAG             0x00000001
+#define CRYPT_DEFAULT_CONTEXT_PROCESS_FLAG                  0x00000002
+
+// List of dwDefaultType's
+#define CRYPT_DEFAULT_CONTEXT_CERT_SIGN_OID         1
+#define CRYPT_DEFAULT_CONTEXT_MULTI_CERT_SIGN_OID   2
+
+
+//+-------------------------------------------------------------------------
+//  CRYPT_DEFAULT_CONTEXT_CERT_SIGN_OID
+//
+//  Install a default HCRYPTPROV used to verify a certificate
+//  signature. pvDefaultPara points to the szOID of the certificate
+//  signature algorithm, for example, szOID_OIWSEC_md5RSA. If
+//  pvDefaultPara is NULL, then, the HCRYPTPROV is used to verify all
+//  certificate signatures. Note, pvDefaultPara can't be NULL when
+//  CRYPT_DEFAULT_CONTEXT_PROCESS_FLAG is set.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CRYPT_DEFAULT_CONTEXT_MULTI_CERT_SIGN_OID
+//
+//  Same as CRYPT_DEFAULT_CONTEXT_CERT_SIGN_OID. However, the default
+//  HCRYPTPROV is to be used for multiple signature szOIDs. pvDefaultPara
+//  points to a CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA structure containing
+//  an array of szOID pointers.
+//--------------------------------------------------------------------------
+
+typedef struct _CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA {
+    DWORD               cOID;
+    LPSTR               *rgpszOID;
+} CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA, *PCRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  Uninstall a default context previously installed by
+//  CryptInstallDefaultContext.
+//
+//  For a default context installed with CRYPT_DEFAULT_CONTEXT_PROCESS_FLAG
+//  set, if any other threads are currently using this context,
+//  this function will block until they finish.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUninstallDefaultContext(
+    HCRYPTDEFAULTCONTEXT hDefaultContext,
+    IN DWORD dwFlags,
+    IN void *pvReserved
+    );
+
+//+-------------------------------------------------------------------------
+//  Export the public key info associated with the provider's corresponding
+//  private key.
+//
+//  Calls CryptExportPublicKeyInfoEx with pszPublicKeyObjId = NULL,
+//  dwFlags = 0 and pvAuxInfo = NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptExportPublicKeyInfo(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwKeySpec,
+    IN DWORD dwCertEncodingType,
+    OUT PCERT_PUBLIC_KEY_INFO pInfo,
+    IN OUT DWORD *pcbInfo
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Export the public key info associated with the provider's corresponding
+//  private key.
+//
+//  Uses the dwCertEncodingType and pszPublicKeyObjId to call the
+//  installable CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FUNC. The called function
+//  has the same signature as CryptExportPublicKeyInfoEx.
+//
+//  If unable to find an installable OID function for the pszPublicKeyObjId,
+//  attempts to export as a RSA Public Key (szOID_RSA_RSA).
+//
+//  The dwFlags and pvAuxInfo aren't used for szOID_RSA_RSA.
+//--------------------------------------------------------------------------
+#define CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FUNC   "CryptDllExportPublicKeyInfoEx"
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptExportPublicKeyInfoEx(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwKeySpec,
+    IN DWORD dwCertEncodingType,
+    IN LPSTR pszPublicKeyObjId,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvAuxInfo,
+    OUT PCERT_PUBLIC_KEY_INFO pInfo,
+    IN OUT DWORD *pcbInfo
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Convert and import the public key info into the provider and return a
+//  handle to the public key.
+//
+//  Calls CryptImportPublicKeyInfoEx with aiKeyAlg = 0, dwFlags = 0 and
+//  pvAuxInfo = NULL.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptImportPublicKeyInfo(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwCertEncodingType,
+    IN PCERT_PUBLIC_KEY_INFO pInfo,
+    OUT HCRYPTKEY *phKey
+    );
+
+//+-------------------------------------------------------------------------
+//  Convert and import the public key info into the provider and return a
+//  handle to the public key.
+//
+//  Uses the dwCertEncodingType and pInfo->Algorithm.pszObjId to call the
+//  installable CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_FUNC. The called function
+//  has the same signature as CryptImportPublicKeyInfoEx.
+//
+//  If unable to find an installable OID function for the pszObjId,
+//  attempts to import as a RSA Public Key (szOID_RSA_RSA).
+//
+//  For szOID_RSA_RSA: aiKeyAlg may be set to CALG_RSA_SIGN or CALG_RSA_KEYX.
+//  Defaults to CALG_RSA_KEYX. The dwFlags and pvAuxInfo aren't used.
+//--------------------------------------------------------------------------
+#define CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_FUNC   "CryptDllImportPublicKeyInfoEx"
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptImportPublicKeyInfoEx(
+    IN HCRYPTPROV hCryptProv,
+    IN DWORD dwCertEncodingType,
+    IN PCERT_PUBLIC_KEY_INFO pInfo,
+    IN ALG_ID aiKeyAlg,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvAuxInfo,
+    OUT HCRYPTKEY *phKey
+    );
+
+
+//+-------------------------------------------------------------------------
+//  Acquire a HCRYPTPROV handle and dwKeySpec for the specified certificate
+//  context. Uses the certificate's CERT_KEY_PROV_INFO_PROP_ID property.
+//  The returned HCRYPTPROV handle may optionally be cached using the
+//  certificate's CERT_KEY_CONTEXT_PROP_ID property.
+//
+//  If CRYPT_ACQUIRE_CACHE_FLAG is set, then, if an already acquired and
+//  cached HCRYPTPROV exists for the certificate, its returned. Otherwise,
+//  a HCRYPTPROV is acquired and then cached via the certificate's
+//  CERT_KEY_CONTEXT_PROP_ID.
+//
+//  The CRYPT_ACQUIRE_USE_PROV_INFO_FLAG can be set to use the dwFlags field of
+//  the certificate's CERT_KEY_PROV_INFO_PROP_ID property's CRYPT_KEY_PROV_INFO
+//  data structure to determine if the returned HCRYPTPROV should be cached.
+//  HCRYPTPROV caching is enabled if the CERT_SET_KEY_CONTEXT_PROP_ID flag was
+//  set.
+//
+//  If CRYPT_ACQUIRE_COMPARE_KEY_FLAG is set, then,
+//  the public key in the certificate is compared with the public
+//  key returned by the cryptographic provider. If the keys don't match, the
+//  acquire fails and LastError is set to NTE_BAD_PUBLIC_KEY. Note, if
+//  a cached HCRYPTPROV is returned, the comparison isn't done. We assume the
+//  comparison was done on the initial acquire.
+//
+//  The CRYPT_ACQUIRE_SILENT_FLAG can be set to suppress any UI by the CSP.
+//  See CryptAcquireContext's CRYPT_SILENT flag for more details.
+//
+//  *pfCallerFreeProv is returned set to FALSE for:
+//    - Acquire or public key comparison fails.
+//    - CRYPT_ACQUIRE_CACHE_FLAG is set.
+//    - CRYPT_ACQUIRE_USE_PROV_INFO_FLAG is set AND
+//      CERT_SET_KEY_CONTEXT_PROP_ID flag is set in the dwFlags field of the
+//      certificate's CERT_KEY_PROV_INFO_PROP_ID property's
+//      CRYPT_KEY_PROV_INFO data structure.
+//  When *pfCallerFreeProv is FALSE, the caller must not release. The
+//  returned HCRYPTPROV will be released on the last free of the certificate
+//  context.
+//
+//  Otherwise, *pfCallerFreeProv is TRUE and the returned HCRYPTPROV must
+//  be released by the caller by calling CryptReleaseContext.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptAcquireCertificatePrivateKey(
+    IN PCCERT_CONTEXT pCert,
+    IN DWORD dwFlags,
+    IN void *pvReserved,
+    OUT HCRYPTPROV *phCryptProv,
+    OUT OPTIONAL DWORD *pdwKeySpec,
+    OUT OPTIONAL BOOL *pfCallerFreeProv
+    );
+
+#define CRYPT_ACQUIRE_CACHE_FLAG                0x00000001
+#define CRYPT_ACQUIRE_USE_PROV_INFO_FLAG        0x00000002
+#define CRYPT_ACQUIRE_COMPARE_KEY_FLAG          0x00000004
+
+#define CRYPT_ACQUIRE_SILENT_FLAG               0x00000040
+
+
+//+-------------------------------------------------------------------------
+//  Enumerates the cryptographic providers and their containers to find the
+//  private key corresponding to the certificate's public key. For a match,
+//  the certificate's CERT_KEY_PROV_INFO_PROP_ID property is updated.
+//
+//  If the CERT_KEY_PROV_INFO_PROP_ID is already set, then, its checked to
+//  see if it matches the provider's public key. For a match, the above
+//  enumeration is skipped.
+//
+//  By default both the user and machine key containers are searched.
+//  The CRYPT_FIND_USER_KEYSET_FLAG or CRYPT_FIND_MACHINE_KEYSET_FLAG
+//  can be set in dwFlags to restrict the search to either of the containers.
+//
+//  The CRYPT_FIND_SILENT_KEYSET_FLAG can be set to suppress any UI by the CSP.
+//  See CryptAcquireContext's CRYPT_SILENT flag for more details.
+//
+//  If a container isn't found, returns FALSE with LastError set to
+//  NTE_NO_KEY.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptFindCertificateKeyProvInfo(
+    IN PCCERT_CONTEXT pCert,
+    IN DWORD dwFlags,
+    IN void *pvReserved
+    );
+
+#define CRYPT_FIND_USER_KEYSET_FLAG        0x00000001
+#define CRYPT_FIND_MACHINE_KEYSET_FLAG     0x00000002
+#define CRYPT_FIND_SILENT_KEYSET_FLAG      0x00000040
+
+
+//+-------------------------------------------------------------------------
+//  This is the prototype for the installable function which is called to
+//  actually import a key into a CSP.  an installable of this type is called
+//  from CryptImportPKCS8.  the algorithm OID of the private key is used
+//  to look up the proper installable function to call.
+//
+//  hCryptProv - the provider to import the key to
+//  pPrivateKeyInfo - describes the key to be imported
+//  dwFlags - The available flags are:
+//              CRYPT_EXPORTABLE
+//              this flag is used when importing private keys, for a full
+//              explanation please see the documentation for CryptImportKey.
+//  pvAuxInfo - reserved for future, must be NULL
+//--------------------------------------------------------------------------
+typedef BOOL (WINAPI *PFN_IMPORT_PRIV_KEY_FUNC) (
+    HCRYPTPROV              hCryptProv,         // in
+    CRYPT_PRIVATE_KEY_INFO  *pPrivateKeyInfo,   // in
+    DWORD                   dwFlags,            // in, optional
+    void                    *pvAuxInfo          // in, optional
+    );
+
+#define CRYPT_OID_IMPORT_PRIVATE_KEY_INFO_FUNC   "CryptDllImportPrivateKeyInfoEx"
+
+//+-------------------------------------------------------------------------
+// Convert (from PKCS8 format) and import the private key into a provider
+// and return a handle to the provider as well as the KeySpec used to import to.
+//
+// This function will call the PRESOLVE_HCRYPTPROV_FUNC in the
+// privateKeyAndParams to obtain a handle of provider to import the key to.
+// if the PRESOLVE_HCRYPTPROV_FUNC is NULL then the default provider will be used.
+//
+// privateKeyAndParams - private key blob and corresponding parameters
+// dwFlags - The available flags are:
+//              CRYPT_EXPORTABLE
+//              this flag is used when importing private keys, for a full
+//              explanation please see the documentation for CryptImportKey.
+// phCryptProv - filled in with the handle of the provider the key was
+//               imported to, the caller is responsible for freeing it
+// pvAuxInfo - This parameter is reserved for future use and should be set
+//             to NULL in the interim.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptImportPKCS8(
+    CRYPT_PKCS8_IMPORT_PARAMS           sImportParams,          // in
+    DWORD                               dwFlags,                // in, optional
+    HCRYPTPROV                          *phCryptProv,           // out, optional
+    void                                *pvAuxInfo              // in, optional
+    );
+
+//+-------------------------------------------------------------------------
+// this is the prototype for installable functions for exporting the private key
+//--------------------------------------------------------------------------
+typedef BOOL (WINAPI *PFN_EXPORT_PRIV_KEY_FUNC) (
+    HCRYPTPROV              hCryptProv,         // in
+    DWORD                   dwKeySpec,          // in
+    LPSTR                   pszPrivateKeyObjId, // in
+    DWORD                   dwFlags,            // in
+    void                    *pvAuxInfo,         // in
+    CRYPT_PRIVATE_KEY_INFO  *pPrivateKeyInfo,   // out
+    DWORD                   *pcbPrivateKeyBlob  // in, out
+    );
+
+#define CRYPT_OID_EXPORT_PRIVATE_KEY_INFO_FUNC   "CryptDllExportPrivateKeyInfoEx"
+
+#define CRYPT_DELETE_KEYSET 0x0001
+//+-------------------------------------------------------------------------
+//  CryptExportPKCS8 -- superseded by CryptExportPKCS8Ex
+//
+//  Export the private key in PKCS8 format
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptExportPKCS8(
+    HCRYPTPROV  hCryptProv,         // in
+    DWORD       dwKeySpec,          // in
+    LPSTR       pszPrivateKeyObjId, // in
+    DWORD       dwFlags,            // in
+    void        *pvAuxInfo,         // in
+    BYTE        *pbPrivateKeyBlob,  // out
+    DWORD       *pcbPrivateKeyBlob  // in, out
+    );
+
+//+-------------------------------------------------------------------------
+// CryptExportPKCS8Ex
+//
+//  Export the private key in PKCS8 format
+//
+//
+//  Uses the pszPrivateKeyObjId to call the
+//  installable CRYPT_OID_EXPORT_PRIVATE_KEY_INFO_FUNC. The called function
+//  has the signature defined by PFN_EXPORT_PRIV_KEY_FUNC.
+//
+//  If unable to find an installable OID function for the pszPrivateKeyObjId,
+//  attempts to export as a RSA Private Key (szOID_RSA_RSA).
+//
+// psExportParams - specifies information about the key to export
+// dwFlags - The flag values. None currently supported
+// pvAuxInfo - This parameter is reserved for future use and should be set to
+//                         NULL in the interim.
+// pbPrivateKeyBlob - A pointer to the private key blob.  It will be encoded
+//                                        as a PKCS8 PrivateKeyInfo.
+// pcbPrivateKeyBlob - A pointer to a DWORD that contains the size, in bytes,
+//                                         of the private key blob being exported.
+//+-------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptExportPKCS8Ex(
+    CRYPT_PKCS8_EXPORT_PARAMS* psExportParams, // in
+    DWORD       dwFlags,            // in
+    void        *pvAuxInfo,         // in
+    BYTE        *pbPrivateKeyBlob,  // out
+    DWORD       *pcbPrivateKeyBlob  // in, out
+    );
+
+//+-------------------------------------------------------------------------
+//  Compute the hash of the encoded public key info.
+//
+//  The public key info is encoded and then hashed.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptHashPublicKeyInfo(
+    IN HCRYPTPROV hCryptProv,
+    IN ALG_ID Algid,
+    IN DWORD dwFlags,
+    IN DWORD dwCertEncodingType,
+    IN PCERT_PUBLIC_KEY_INFO pInfo,
+    OUT BYTE *pbComputedHash,
+    IN OUT DWORD *pcbComputedHash
+    );
+
+//+-------------------------------------------------------------------------
+//  Convert a Name Value to a null terminated char string
+//
+//  Returns the number of characters converted including the terminating null
+//  character. If psz is NULL or csz is 0, returns the required size of the
+//  destination string (including the terminating null char).
+//
+//  If psz != NULL && csz != 0, returned psz is always NULL terminated.
+//
+//  Note: csz includes the NULL char.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertRDNValueToStrA(
+    IN DWORD dwValueType,
+    IN PCERT_RDN_VALUE_BLOB pValue,
+    OUT OPTIONAL LPSTR psz,
+    IN DWORD csz
+    );
+//+-------------------------------------------------------------------------
+//  Convert a Name Value to a null terminated char string
+//
+//  Returns the number of characters converted including the terminating null
+//  character. If psz is NULL or csz is 0, returns the required size of the
+//  destination string (including the terminating null char).
+//
+//  If psz != NULL && csz != 0, returned psz is always NULL terminated.
+//
+//  Note: csz includes the NULL char.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertRDNValueToStrW(
+    IN DWORD dwValueType,
+    IN PCERT_RDN_VALUE_BLOB pValue,
+    OUT OPTIONAL LPWSTR psz,
+    IN DWORD csz
+    );
+#ifdef UNICODE
+#define CertRDNValueToStr  CertRDNValueToStrW
+#else
+#define CertRDNValueToStr  CertRDNValueToStrA
+#endif // !UNICODE
+
+//+-------------------------------------------------------------------------
+//  Convert the certificate name blob to a null terminated char string.
+//
+//  Follows the string representation of distinguished names specified in
+//  RFC 1779. (Note, added double quoting "" for embedded quotes, quote
+//  empty strings and don't quote strings containing consecutive spaces).
+//  RDN values of type CERT_RDN_ENCODED_BLOB or CERT_RDN_OCTET_STRING are
+//  formatted in hexadecimal (e.g. #0A56CF).
+//
+//  The name string is formatted according to the dwStrType:
+//    CERT_SIMPLE_NAME_STR
+//      The object identifiers are discarded. CERT_RDN entries are separated
+//      by ", ". Multiple attributes per CERT_RDN are separated by " + ".
+//      For example:
+//          Microsoft, Joe Cool + Programmer
+//    CERT_OID_NAME_STR
+//      The object identifiers are included with a "=" separator from their
+//      attribute value. CERT_RDN entries are separated by ", ".
+//      Multiple attributes per CERT_RDN are separated by " + ". For example:
+//          2.5.4.11=Microsoft, 2.5.4.3=Joe Cool + 2.5.4.12=Programmer
+//    CERT_X500_NAME_STR
+//      The object identifiers are converted to their X500 key name. Otherwise,
+//      same as CERT_OID_NAME_STR. If the object identifier doesn't have
+//      a corresponding X500 key name, then, the object identifier is used with
+//      a "OID." prefix. For example:
+//          OU=Microsoft, CN=Joe Cool + T=Programmer, OID.1.2.3.4.5.6=Unknown
+//
+//  We quote the RDN value if it contains leading or trailing whitespace
+//  or one of the following characters: ",", "+", "=", """, "\n",  "<", ">",
+//  "#" or ";". The quoting character is ". If the the RDN Value contains
+//  a " it is double quoted (""). For example:
+//      OU="  Microsoft", CN="Joe ""Cool""" + T="Programmer, Manager"
+//
+//  CERT_NAME_STR_SEMICOLON_FLAG can be or'ed into dwStrType to replace
+//  the ", " separator with a "; " separator.
+//
+//  CERT_NAME_STR_CRLF_FLAG can be or'ed into dwStrType to replace
+//  the ", " separator with a "\r\n" separator.
+//
+//  CERT_NAME_STR_NO_PLUS_FLAG can be or'ed into dwStrType to replace the
+//  " + " separator with a single space, " ".
+//
+//  CERT_NAME_STR_NO_QUOTING_FLAG can be or'ed into dwStrType to inhibit
+//  the above quoting.
+//
+//  CERT_NAME_STR_REVERSE_FLAG can be or'ed into dwStrType to reverse the
+//  order of the RDNs before converting to the string.
+//
+//  By default, CERT_RDN_T61_STRING encoded values are initially decoded
+//  as UTF8. If the UTF8 decoding fails, then, decoded as 8 bit characters.
+//  CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG can be or'ed into dwStrType to
+//  skip the initial attempt to decode as UTF8.
+//
+//  Returns the number of characters converted including the terminating null
+//  character. If psz is NULL or csz is 0, returns the required size of the
+//  destination string (including the terminating null char).
+//
+//  If psz != NULL && csz != 0, returned psz is always NULL terminated.
+//
+//  Note: csz includes the NULL char.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertNameToStrA(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_NAME_BLOB pName,
+    IN DWORD dwStrType,
+    OUT OPTIONAL LPSTR psz,
+    IN DWORD csz
+    );
+//+-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertNameToStrW(
+    IN DWORD dwCertEncodingType,
+    IN PCERT_NAME_BLOB pName,
+    IN DWORD dwStrType,
+    OUT OPTIONAL LPWSTR psz,
+    IN DWORD csz
+    );
+#ifdef UNICODE
+#define CertNameToStr  CertNameToStrW
+#else
+#define CertNameToStr  CertNameToStrA
+#endif // !UNICODE
+
+//+-------------------------------------------------------------------------
+//  Certificate name string types
+//--------------------------------------------------------------------------
+#define CERT_SIMPLE_NAME_STR        1
+#define CERT_OID_NAME_STR           2
+#define CERT_X500_NAME_STR          3
+
+//+-------------------------------------------------------------------------
+//  Certificate name string type flags OR'ed with the above types
+//--------------------------------------------------------------------------
+#define CERT_NAME_STR_SEMICOLON_FLAG    0x40000000
+#define CERT_NAME_STR_NO_PLUS_FLAG      0x20000000
+#define CERT_NAME_STR_NO_QUOTING_FLAG   0x10000000
+#define CERT_NAME_STR_CRLF_FLAG         0x08000000
+#define CERT_NAME_STR_COMMA_FLAG        0x04000000
+#define CERT_NAME_STR_REVERSE_FLAG      0x02000000
+
+#define CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG     0x00010000
+#define CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG   0x00020000
+#define CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG  0x00040000
+
+
+//+-------------------------------------------------------------------------
+//  Convert the null terminated X500 string to an encoded certificate name.
+//
+//  The input string is expected to be formatted the same as the output
+//  from the above CertNameToStr API.
+//
+//  The CERT_SIMPLE_NAME_STR type isn't supported. Otherwise, when dwStrType
+//  is set to 0, CERT_OID_NAME_STR or CERT_X500_NAME_STR, allow either a
+//  case insensitive X500 key (CN=), case insensitive "OID." prefixed
+//  object identifier (OID.1.2.3.4.5.6=) or an object identifier (1.2.3.4=).
+//
+//  If no flags are OR'ed into dwStrType, then, allow "," or ";" as RDN
+//  separators and "+" as the multiple RDN value separator. Quoting is
+//  supported. A quote may be included in a quoted value by double quoting,
+//  for example (CN="Joe ""Cool"""). A value starting with a "#" is treated
+//  as ascii hex and converted to a CERT_RDN_OCTET_STRING. Embedded whitespace
+//  is skipped (1.2.3 = # AB CD 01  is the same as 1.2.3=#ABCD01).
+//
+//  Whitespace surrounding the keys, object identifers and values is removed.
+//
+//  CERT_NAME_STR_COMMA_FLAG can be or'ed into dwStrType to only allow the
+//  "," as the RDN separator.
+//
+//  CERT_NAME_STR_SEMICOLON_FLAG can be or'ed into dwStrType to only allow the
+//  ";" as the RDN separator.
+//
+//  CERT_NAME_STR_CRLF_FLAG can be or'ed into dwStrType to only allow
+//  "\r" or "\n" as the RDN separator.
+//
+//  CERT_NAME_STR_NO_PLUS_FLAG can be or'ed into dwStrType to ignore "+"
+//  as a separator and not allow multiple values per RDN.
+//
+//  CERT_NAME_STR_NO_QUOTING_FLAG can be or'ed into dwStrType to inhibit
+//  quoting.
+//
+//  CERT_NAME_STR_REVERSE_FLAG can be or'ed into dwStrType to reverse the
+//  order of the RDNs after converting from the string and before encoding.
+//
+//  CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG can be or'ed into dwStrType to
+//  to select the CERT_RDN_T61_STRING encoded value type instead of
+//  CERT_RDN_UNICODE_STRING if all the UNICODE characters are <= 0xFF.
+//
+//  CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG can be or'ed into dwStrType to
+//  to select the CERT_RDN_UTF8_STRING encoded value type instead of
+//  CERT_RDN_UNICODE_STRING.
+//
+//  Support the following X500 Keys:
+//
+//  Key         Object Identifier               RDN Value Type(s)
+//  ---         -----------------               -----------------
+//  CN          szOID_COMMON_NAME               Printable, Unicode
+//  L           szOID_LOCALITY_NAME             Printable, Unicode
+//  O           szOID_ORGANIZATION_NAME         Printable, Unicode
+//  OU          szOID_ORGANIZATIONAL_UNIT_NAME  Printable, Unicode
+//  E           szOID_RSA_emailAddr             Only IA5
+//  Email       szOID_RSA_emailAddr             Only IA5
+//  C           szOID_COUNTRY_NAME              Only Printable
+//  S           szOID_STATE_OR_PROVINCE_NAME    Printable, Unicode
+//  ST          szOID_STATE_OR_PROVINCE_NAME    Printable, Unicode
+//  STREET      szOID_STREET_ADDRESS            Printable, Unicode
+//  T           szOID_TITLE                     Printable, Unicode
+//  Title       szOID_TITLE                     Printable, Unicode
+//  G           szOID_GIVEN_NAME                Printable, Unicode
+//  GivenName   szOID_GIVEN_NAME                Printable, Unicode
+//  I           szOID_INITIALS                  Printable, Unicode
+//  Initials    szOID_INITIALS                  Printable, Unicode
+//  SN          szOID_SUR_NAME                  Printable, Unicode
+//  DC          szOID_DOMAIN_COMPONENT          IA5, UTF8
+//
+//  Note, T61 is selected instead of Unicode if
+//  CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG is set and all the unicode
+//  characters are <= 0xFF.
+//
+//  Note, UTF8 is selected instead of Unicode if
+//  CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG is set.
+//
+//  Returns TRUE if successfully parsed the input string and encoded
+//  the name.
+//
+//  If the input string is detected to be invalid, *ppszError is updated
+//  to point to the beginning of the invalid character sequence. Otherwise,
+//  *ppszError is set to NULL. *ppszError is updated with a non-NULL pointer
+//  for the following errors:
+//      CRYPT_E_INVALID_X500_STRING
+//      CRYPT_E_INVALID_NUMERIC_STRING
+//      CRYPT_E_INVALID_PRINTABLE_STRING
+//      CRYPT_E_INVALID_IA5_STRING
+//
+//  ppszError can be set to NULL if not interested in getting a pointer
+//  to the invalid character sequence.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertStrToNameA(
+    IN DWORD dwCertEncodingType,
+    IN LPCSTR pszX500,
+    IN DWORD dwStrType,
+    IN OPTIONAL void *pvReserved,
+    OUT BYTE *pbEncoded,
+    IN OUT DWORD *pcbEncoded,
+    OUT OPTIONAL LPCSTR *ppszError
+    );
+//+-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertStrToNameW(
+    IN DWORD dwCertEncodingType,
+    IN LPCWSTR pszX500,
+    IN DWORD dwStrType,
+    IN OPTIONAL void *pvReserved,
+    OUT BYTE *pbEncoded,
+    IN OUT DWORD *pcbEncoded,
+    OUT OPTIONAL LPCWSTR *ppszError
+    );
+#ifdef UNICODE
+#define CertStrToName  CertStrToNameW
+#else
+#define CertStrToName  CertStrToNameA
+#endif // !UNICODE
+
+
+//+-------------------------------------------------------------------------
+//  Get the subject or issuer name from the certificate and
+//  according to the specified format type, convert to a null terminated
+//  character string.
+//
+//  CERT_NAME_ISSUER_FLAG can be set to get the issuer's name. Otherwise,
+//  gets the subject's name.
+//
+//  By default, CERT_RDN_T61_STRING encoded values are initially decoded
+//  as UTF8. If the UTF8 decoding fails, then, decoded as 8 bit characters.
+//  CERT_NAME_DISABLE_IE4_UTF8_FLAG can be set in dwFlags to
+//  skip the initial attempt to decode as UTF8.
+//
+//  The name string is formatted according to the dwType:
+//    CERT_NAME_EMAIL_TYPE
+//      If the certificate has a Subject Alternative Name extension (for
+//      issuer, Issuer Alternative Name), searches for first rfc822Name choice.
+//      If the rfc822Name choice isn't found in the extension, searches the
+//      Subject Name field for the Email OID, "1.2.840.113549.1.9.1".
+//      If the rfc822Name or Email OID is found, returns the string. Otherwise,
+//      returns an empty string (returned character count is 1).
+//    CERT_NAME_DNS_TYPE
+//      If the certificate has a Subject Alternative Name extension (for
+//      issuer, Issuer Alternative Name), searches for first DNSName choice.
+//      If the DNSName choice isn't found in the extension, searches the
+//      Subject Name field for the CN OID, "2.5.4.3".
+//      If the DNSName or CN OID is found, returns the string. Otherwise,
+//      returns an empty string.
+//    CERT_NAME_URL_TYPE
+//      If the certificate has a Subject Alternative Name extension (for
+//      issuer, Issuer Alternative Name), searches for first URL choice.
+//      If the URL choice is found, returns the string. Otherwise,
+//      returns an empty string.
+//    CERT_NAME_UPN_TYPE
+//      If the certificate has a Subject Alternative Name extension,
+//      searches the OtherName choices looking for a
+//      pszObjId == szOID_NT_PRINCIPAL_NAME, "1.3.6.1.4.1.311.20.2.3".
+//      If the UPN OID is found, the blob is decoded as a
+//      X509_UNICODE_ANY_STRING and the decoded string is returned.
+//      Otherwise, returns an empty string.
+//    CERT_NAME_RDN_TYPE
+//      Converts the Subject Name blob by calling CertNameToStr. pvTypePara
+//      points to a DWORD containing the dwStrType passed to CertNameToStr.
+//      If the Subject Name field is empty and the certificate has a
+//      Subject Alternative Name extension, searches for and converts
+//      the first directoryName choice.
+//    CERT_NAME_ATTR_TYPE
+//      pvTypePara points to the Object Identifier specifying the name attribute
+//      to be returned. For example, to get the CN,
+//      pvTypePara = szOID_COMMON_NAME ("2.5.4.3"). Searches, the Subject Name
+//      field for the attribute.
+//      If the Subject Name field is empty and the certificate has a
+//      Subject Alternative Name extension, checks for
+//      the first directoryName choice and searches it.
+//
+//      Note, searches the RDNs in reverse order.
+//
+//    CERT_NAME_SIMPLE_DISPLAY_TYPE
+//      Iterates through the following list of name attributes and searches
+//      the Subject Name and then the Subject Alternative Name extension
+//      for the first occurrence of:
+//          szOID_COMMON_NAME ("2.5.4.3")
+//          szOID_ORGANIZATIONAL_UNIT_NAME ("2.5.4.11")
+//          szOID_ORGANIZATION_NAME ("2.5.4.10")
+//          szOID_RSA_emailAddr ("1.2.840.113549.1.9.1")
+//
+//      If none of the above attributes is found, then, searches the
+//      Subject Alternative Name extension for a rfc822Name choice.
+//
+//      If still no match, then, returns the first attribute.
+//
+//      Note, like CERT_NAME_ATTR_TYPE, searches the RDNs in reverse order.
+//
+//    CERT_NAME_FRIENDLY_DISPLAY_TYPE
+//      First checks if the certificate has a CERT_FRIENDLY_NAME_PROP_ID
+//      property. If it does, then, this property is returned. Otherwise,
+//      returns the above CERT_NAME_SIMPLE_DISPLAY_TYPE.
+//
+//  Returns the number of characters converted including the terminating null
+//  character. If pwszNameString is NULL or cchNameString is 0, returns the
+//  required size of the destination string (including the terminating null
+//  char). If the specified name type isn't found. returns an empty string
+//  with a returned character count of 1.
+//
+//  If pwszNameString != NULL && cwszNameString != 0, returned pwszNameString
+//  is always NULL terminated.
+//
+//  Note: cchNameString includes the NULL char.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertGetNameStringA(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwType,
+    IN DWORD dwFlags,
+    IN void *pvTypePara,
+    OUT OPTIONAL LPSTR pszNameString,
+    IN DWORD cchNameString
+    );
+//+-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+WINCRYPT32API
+DWORD
+WINAPI
+CertGetNameStringW(
+    IN PCCERT_CONTEXT pCertContext,
+    IN DWORD dwType,
+    IN DWORD dwFlags,
+    IN void *pvTypePara,
+    OUT OPTIONAL LPWSTR pszNameString,
+    IN DWORD cchNameString
+    );
+#ifdef UNICODE
+#define CertGetNameString  CertGetNameStringW
+#else
+#define CertGetNameString  CertGetNameStringA
+#endif // !UNICODE
+
+//+-------------------------------------------------------------------------
+//  Certificate name types
+//--------------------------------------------------------------------------
+#define CERT_NAME_EMAIL_TYPE            1
+#define CERT_NAME_RDN_TYPE              2
+#define CERT_NAME_ATTR_TYPE             3
+#define CERT_NAME_SIMPLE_DISPLAY_TYPE   4
+#define CERT_NAME_FRIENDLY_DISPLAY_TYPE 5
+#define CERT_NAME_DNS_TYPE              6
+#define CERT_NAME_URL_TYPE              7
+#define CERT_NAME_UPN_TYPE              8
+
+//+-------------------------------------------------------------------------
+//  Certificate name flags
+//--------------------------------------------------------------------------
+#define CERT_NAME_ISSUER_FLAG           0x1
+#define CERT_NAME_DISABLE_IE4_UTF8_FLAG 0x00010000
+
+
+//+=========================================================================
+//  Simplified Cryptographic Message Data Structures and APIs
+//==========================================================================
+
+
+//+-------------------------------------------------------------------------
+//              Conventions for the *pb and *pcb output parameters:
+//
+//              Upon entry to the function:
+//                  if pcb is OPTIONAL && pcb == NULL, then,
+//                      No output is returned
+//                  else if pb == NULL && pcb != NULL, then,
+//                      Length only determination. No length error is
+//                      returned.
+//                  otherwise where (pb != NULL && pcb != NULL && *pcb != 0)
+//                      Output is returned. If *pcb isn't big enough a
+//                      length error is returned. In all cases *pcb is updated
+//                      with the actual length needed/returned.
+//--------------------------------------------------------------------------
+
+
+//+-------------------------------------------------------------------------
+//  Type definitions of the parameters used for doing the cryptographic
+//  operations.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  Callback to get and verify the signer's certificate.
+//
+//  Passed the CertId of the signer (its Issuer and SerialNumber) and a
+//  handle to its cryptographic signed message's cert store.
+//
+//  For CRYPT_E_NO_SIGNER, called with pSignerId == NULL.
+//
+//  For a valid signer certificate, returns a pointer to a read only
+//  CERT_CONTEXT. The returned CERT_CONTEXT is either obtained from a
+//  cert store or was created via CertCreateCertificateContext. For either case,
+//  its freed via CertFreeCertificateContext.
+//
+//  If a valid certificate isn't found, this callback returns NULL with
+//  LastError set via SetLastError().
+//
+//  The NULL implementation tries to get the Signer certificate from the
+//  message cert store. It doesn't verify the certificate.
+//
+//  Note, if the KEYID choice was selected for a CMS SignerId, then, the
+//  SerialNumber is 0 and the Issuer is encoded containing a single RDN with a
+//  single Attribute whose OID is szOID_KEYID_RDN, value type is
+//  CERT_RDN_OCTET_STRING and value is the KEYID. When the
+//  CertGetSubjectCertificateFromStore and
+//  CertFindCertificateInStore(CERT_FIND_SUBJECT_CERT) APIs see this
+//  special KEYID Issuer and SerialNumber, they do a KEYID match.
+//--------------------------------------------------------------------------
+typedef PCCERT_CONTEXT (WINAPI *PFN_CRYPT_GET_SIGNER_CERTIFICATE)(
+    IN void *pvGetArg,
+    IN DWORD dwCertEncodingType,
+    IN PCERT_INFO pSignerId,    // Only the Issuer and SerialNumber
+                                // fields have been updated
+    IN HCERTSTORE hMsgCertStore
+    );
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_SIGN_MESSAGE_PARA are used for signing messages using the
+//  specified signing certificate context.
+//
+//  Either the CERT_KEY_PROV_HANDLE_PROP_ID or CERT_KEY_PROV_INFO_PROP_ID must
+//  be set for each rgpSigningCert[]. Either one specifies the private
+//  signature key to use.
+//
+//  If any certificates and/or CRLs are to be included in the signed message,
+//  then, the MsgCert and MsgCrl parameters need to be updated. If the
+//  rgpSigningCerts are to be included, then, they must also be in the
+//  rgpMsgCert array.
+//
+//  cbSize must be set to the sizeof(CRYPT_SIGN_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//
+//  pvHashAuxInfo currently isn't used and must be set to NULL.
+//
+//  dwFlags normally is set to 0. However, if the encoded output
+//  is to be a CMSG_SIGNED inner content of an outer cryptographic message,
+//  such as a CMSG_ENVELOPED, then, the CRYPT_MESSAGE_BARE_CONTENT_OUT_FLAG
+//  should be set. If not set, then it would be encoded as an inner content
+//  type of CMSG_DATA.
+//
+//  dwInnerContentType is normally set to 0. It needs to be set if the
+//  ToBeSigned input is the encoded output of another cryptographic
+//  message, such as, an CMSG_ENVELOPED. When set, it's one of the cryptographic
+//  message types, for example, CMSG_ENVELOPED.
+//
+//  If the inner content of a nested cryptographic message is data (CMSG_DATA
+//  the default), then, neither dwFlags or dwInnerContentType need to be set.
+//
+//  For CMS messages, CRYPT_MESSAGE_ENCAPSULATED_CONTENT_OUT_FLAG may be
+//  set to encapsulate nonData inner content within an OCTET STRING.
+//
+//  For CMS messages, CRYPT_MESSAGE_KEYID_SIGNER_FLAG may be set to identify
+//  signers by their Key Identifier and not their Issuer and Serial Number.
+//
+//  The CRYPT_MESSAGE_SILENT_KEYSET_FLAG can be set to suppress any UI by the
+//  CSP. See CryptAcquireContext's CRYPT_SILENT flag for more details.
+//
+//  If HashEncryptionAlgorithm is present and not NULL its used instead of
+//  the SigningCert's PublicKeyInfo.Algorithm.
+//
+//  Note, for RSA, the hash encryption algorithm is normally the same as
+//  the public key algorithm. For DSA, the hash encryption algorithm is
+//  normally a DSS signature algorithm.
+//
+//  pvHashEncryptionAuxInfo currently isn't used and must be set to NULL if
+//  present in the data structure.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_SIGN_MESSAGE_PARA {
+    DWORD                       cbSize;
+    DWORD                       dwMsgEncodingType;
+    PCCERT_CONTEXT              pSigningCert;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    void                        *pvHashAuxInfo;
+    DWORD                       cMsgCert;
+    PCCERT_CONTEXT              *rgpMsgCert;
+    DWORD                       cMsgCrl;
+    PCCRL_CONTEXT               *rgpMsgCrl;
+    DWORD                       cAuthAttr;
+    PCRYPT_ATTRIBUTE            rgAuthAttr;
+    DWORD                       cUnauthAttr;
+    PCRYPT_ATTRIBUTE            rgUnauthAttr;
+    DWORD                       dwFlags;
+    DWORD                       dwInnerContentType;
+
+#ifdef CRYPT_SIGN_MESSAGE_PARA_HAS_CMS_FIELDS
+    CRYPT_ALGORITHM_IDENTIFIER  HashEncryptionAlgorithm;
+    void                        *pvHashEncryptionAuxInfo;
+#endif
+} CRYPT_SIGN_MESSAGE_PARA, *PCRYPT_SIGN_MESSAGE_PARA;
+
+#define CRYPT_MESSAGE_BARE_CONTENT_OUT_FLAG         0x00000001
+
+// When set, nonData type inner content is encapsulated within an
+// OCTET STRING
+#define CRYPT_MESSAGE_ENCAPSULATED_CONTENT_OUT_FLAG 0x00000002
+
+// When set, signers are identified by their Key Identifier and not
+// their Issuer and Serial Number.
+#define CRYPT_MESSAGE_KEYID_SIGNER_FLAG             0x00000004
+
+// When set, suppresses any UI by the CSP.
+// See CryptAcquireContext's CRYPT_SILENT flag for more details.
+#define CRYPT_MESSAGE_SILENT_KEYSET_FLAG            0x00000040
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_VERIFY_MESSAGE_PARA are used to verify signed messages.
+//
+//  hCryptProv is used to do hashing and signature verification.
+//
+//  The dwCertEncodingType specifies the encoding type of the certificates
+//  and/or CRLs in the message.
+//
+//  pfnGetSignerCertificate is called to get and verify the message signer's
+//  certificate.
+//
+//  cbSize must be set to the sizeof(CRYPT_VERIFY_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_VERIFY_MESSAGE_PARA {
+    DWORD                               cbSize;
+    DWORD                               dwMsgAndCertEncodingType;
+    HCRYPTPROV                          hCryptProv;
+    PFN_CRYPT_GET_SIGNER_CERTIFICATE    pfnGetSignerCertificate;
+    void                                *pvGetArg;
+} CRYPT_VERIFY_MESSAGE_PARA, *PCRYPT_VERIFY_MESSAGE_PARA;
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_ENCRYPT_MESSAGE_PARA are used for encrypting messages.
+//
+//  hCryptProv is used to do content encryption, recipient key
+//  encryption, and recipient key export. Its private key
+//  isn't used.
+//
+//  Currently, pvEncryptionAuxInfo is only defined for RC2 or RC4 encryption
+//  algorithms. Otherwise, its not used and must be set to NULL.
+//  See CMSG_RC2_AUX_INFO for the RC2 encryption algorithms.
+//  See CMSG_RC4_AUX_INFO for the RC4 encryption algorithms.
+//
+//  To enable SP3 compatible encryption, pvEncryptionAuxInfo should point to
+//  a CMSG_SP3_COMPATIBLE_AUX_INFO data structure.
+//
+//  cbSize must be set to the sizeof(CRYPT_ENCRYPT_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//
+//  dwFlags normally is set to 0. However, if the encoded output
+//  is to be a CMSG_ENVELOPED inner content of an outer cryptographic message,
+//  such as a CMSG_SIGNED, then, the CRYPT_MESSAGE_BARE_CONTENT_OUT_FLAG
+//  should be set. If not set, then it would be encoded as an inner content
+//  type of CMSG_DATA.
+//
+//  dwInnerContentType is normally set to 0. It needs to be set if the
+//  ToBeEncrypted input is the encoded output of another cryptographic
+//  message, such as, an CMSG_SIGNED. When set, it's one of the cryptographic
+//  message types, for example, CMSG_SIGNED.
+//
+//  If the inner content of a nested cryptographic message is data (CMSG_DATA
+//  the default), then, neither dwFlags or dwInnerContentType need to be set.
+//
+//  For CMS messages, CRYPT_MESSAGE_ENCAPSULATED_CONTENT_OUT_FLAG may be
+//  set to encapsulate nonData inner content within an OCTET STRING before
+//  encrypting.
+//
+//  For CMS messages, CRYPT_MESSAGE_KEYID_RECIPIENT_FLAG may be set to identify
+//  recipients by their Key Identifier and not their Issuer and Serial Number.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_ENCRYPT_MESSAGE_PARA {
+    DWORD                       cbSize;
+    DWORD                       dwMsgEncodingType;
+    HCRYPTPROV                  hCryptProv;
+    CRYPT_ALGORITHM_IDENTIFIER  ContentEncryptionAlgorithm;
+    void                        *pvEncryptionAuxInfo;
+    DWORD                       dwFlags;
+    DWORD                       dwInnerContentType;
+} CRYPT_ENCRYPT_MESSAGE_PARA, *PCRYPT_ENCRYPT_MESSAGE_PARA;
+
+// When set, recipients are identified by their Key Identifier and not
+// their Issuer and Serial Number.
+#define CRYPT_MESSAGE_KEYID_RECIPIENT_FLAG          0x4
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_DECRYPT_MESSAGE_PARA are used for decrypting messages.
+//
+//  The CertContext to use for decrypting a message is obtained from one
+//  of the specified cert stores. An encrypted message can have one or
+//  more recipients. The recipients are identified by their CertId (Issuer
+//  and SerialNumber). The cert stores are searched to find the CertContext
+//  corresponding to the CertId.
+//
+//  For CMS, the recipients may also be identified by their KeyId.
+//  CMS also allows Key Agreement (Diffie Hellman) in addition to
+//  Key Transport (RSA) recipients.
+//
+//  Only CertContexts in the store with either
+//  the CERT_KEY_PROV_HANDLE_PROP_ID or CERT_KEY_PROV_INFO_PROP_ID set
+//  can be used. Either property specifies the private exchange key to use.
+//
+//  cbSize must be set to the sizeof(CRYPT_DECRYPT_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_DECRYPT_MESSAGE_PARA {
+    DWORD                   cbSize;
+    DWORD                   dwMsgAndCertEncodingType;
+    DWORD                   cCertStore;
+    HCERTSTORE              *rghCertStore;
+
+#ifdef CRYPT_DECRYPT_MESSAGE_PARA_HAS_EXTRA_FIELDS
+// The above defined, CRYPT_MESSAGE_SILENT_KEYSET_FLAG, can be set to
+// suppress UI by the CSP.  See CryptAcquireContext's CRYPT_SILENT
+// flag for more details.
+
+    DWORD                   dwFlags;
+#endif
+
+} CRYPT_DECRYPT_MESSAGE_PARA, *PCRYPT_DECRYPT_MESSAGE_PARA;
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_HASH_MESSAGE_PARA are used for hashing or unhashing
+//  messages.
+//
+//  hCryptProv is used to compute the hash.
+//
+//  pvHashAuxInfo currently isn't used and must be set to NULL.
+//
+//  cbSize must be set to the sizeof(CRYPT_HASH_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_HASH_MESSAGE_PARA {
+    DWORD                       cbSize;
+    DWORD                       dwMsgEncodingType;
+    HCRYPTPROV                  hCryptProv;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    void                        *pvHashAuxInfo;
+} CRYPT_HASH_MESSAGE_PARA, *PCRYPT_HASH_MESSAGE_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_KEY_SIGN_MESSAGE_PARA are used for signing messages until a
+//  certificate has been created for the signature key.
+//
+//  pvHashAuxInfo currently isn't used and must be set to NULL.
+//
+//  If PubKeyAlgorithm isn't set, defaults to szOID_RSA_RSA.
+//
+//  cbSize must be set to the sizeof(CRYPT_KEY_SIGN_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_KEY_SIGN_MESSAGE_PARA {
+    DWORD                       cbSize;
+    DWORD                       dwMsgAndCertEncodingType;
+    HCRYPTPROV                  hCryptProv;
+    DWORD                       dwKeySpec;
+    CRYPT_ALGORITHM_IDENTIFIER  HashAlgorithm;
+    void                        *pvHashAuxInfo;
+    CRYPT_ALGORITHM_IDENTIFIER  PubKeyAlgorithm;
+} CRYPT_KEY_SIGN_MESSAGE_PARA, *PCRYPT_KEY_SIGN_MESSAGE_PARA;
+
+//+-------------------------------------------------------------------------
+//  The CRYPT_KEY_VERIFY_MESSAGE_PARA are used to verify signed messages without
+//  a certificate for the signer.
+//
+//  Normally used until a certificate has been created for the key.
+//
+//  hCryptProv is used to do hashing and signature verification.
+//
+//  cbSize must be set to the sizeof(CRYPT_KEY_VERIFY_MESSAGE_PARA) or else
+//  LastError will be updated with E_INVALIDARG.
+//--------------------------------------------------------------------------
+typedef struct _CRYPT_KEY_VERIFY_MESSAGE_PARA {
+    DWORD                   cbSize;
+    DWORD                   dwMsgEncodingType;
+    HCRYPTPROV              hCryptProv;
+} CRYPT_KEY_VERIFY_MESSAGE_PARA, *PCRYPT_KEY_VERIFY_MESSAGE_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  Sign the message.
+//
+//  If fDetachedSignature is TRUE, the "to be signed" content isn't included
+//  in the encoded signed blob.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSignMessage(
+    IN PCRYPT_SIGN_MESSAGE_PARA pSignPara,
+    IN BOOL fDetachedSignature,
+    IN DWORD cToBeSigned,
+    IN const BYTE *rgpbToBeSigned[],
+    IN DWORD rgcbToBeSigned[],
+    OUT BYTE *pbSignedBlob,
+    IN OUT DWORD *pcbSignedBlob
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify a signed message.
+//
+//  If pbDecoded == NULL, then, *pcbDecoded is implicitly set to 0 on input.
+//  For *pcbDecoded == 0 && ppSignerCert == NULL on input, the signer isn't
+//  verified.
+//
+//  A message might have more than one signer. Set dwSignerIndex to iterate
+//  through all the signers. dwSignerIndex == 0 selects the first signer.
+//
+//  pVerifyPara's pfnGetSignerCertificate is called to get the signer's
+//  certificate.
+//
+//  For a verified signer and message, *ppSignerCert is updated
+//  with the CertContext of the signer. It must be freed by calling
+//  CertFreeCertificateContext. Otherwise, *ppSignerCert is set to NULL.
+//
+//  ppSignerCert can be NULL, indicating the caller isn't interested
+//  in getting the CertContext of the signer.
+//
+//  pcbDecoded can be NULL, indicating the caller isn't interested in getting
+//  the decoded content. Furthermore, if the message doesn't contain any
+//  content or signers, then, pcbDecoded must be set to NULL, to allow the
+//  pVerifyPara->pfnGetCertificate to be called. Normally, this would be
+//  the case when the signed message contains only certficates and CRLs.
+//  If pcbDecoded is NULL and the message doesn't have the indicated signer,
+//  pfnGetCertificate is called with pSignerId set to NULL.
+//
+//  If the message doesn't contain any signers || dwSignerIndex > message's
+//  SignerCount, then, an error is returned with LastError set to
+//  CRYPT_E_NO_SIGNER. Also, for CRYPT_E_NO_SIGNER, pfnGetSignerCertificate
+//  is still called with pSignerId set to NULL.
+//
+//  Note, an alternative way to get the certificates and CRLs from a
+//  signed message is to call CryptGetMessageCertificates.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyMessageSignature(
+    IN PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara,
+    IN DWORD dwSignerIndex,
+    IN const BYTE *pbSignedBlob,
+    IN DWORD cbSignedBlob,
+    OUT BYTE OPTIONAL *pbDecoded,
+    IN OUT OPTIONAL DWORD *pcbDecoded,
+    OUT OPTIONAL PCCERT_CONTEXT *ppSignerCert
+    );
+
+//+-------------------------------------------------------------------------
+//  Returns the count of signers in the signed message. For no signers, returns
+//  0. For an error returns -1 with LastError updated accordingly.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+LONG
+WINAPI
+CryptGetMessageSignerCount(
+    IN DWORD dwMsgEncodingType,
+    IN const BYTE *pbSignedBlob,
+    IN DWORD cbSignedBlob
+    );
+
+//+-------------------------------------------------------------------------
+//  Returns the cert store containing the message's certs and CRLs.
+//  For an error, returns NULL with LastError updated.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCERTSTORE
+WINAPI
+CryptGetMessageCertificates(
+    IN DWORD dwMsgAndCertEncodingType,
+    IN HCRYPTPROV hCryptProv,           // passed to CertOpenStore
+    IN DWORD dwFlags,                   // passed to CertOpenStore
+    IN const BYTE *pbSignedBlob,
+    IN DWORD cbSignedBlob
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify a signed message containing detached signature(s).
+//  The "to be signed" content is passed in separately. No
+//  decoded output. Otherwise, identical to CryptVerifyMessageSignature.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyDetachedMessageSignature(
+    IN PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara,
+    IN DWORD dwSignerIndex,
+    IN const BYTE *pbDetachedSignBlob,
+    IN DWORD cbDetachedSignBlob,
+    IN DWORD cToBeSigned,
+    IN const BYTE *rgpbToBeSigned[],
+    IN DWORD rgcbToBeSigned[],
+    OUT OPTIONAL PCCERT_CONTEXT *ppSignerCert
+    );
+
+//+-------------------------------------------------------------------------
+//  Encrypts the message for the recipient(s).
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptEncryptMessage(
+    IN PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara,
+    IN DWORD cRecipientCert,
+    IN PCCERT_CONTEXT rgpRecipientCert[],
+    IN const BYTE *pbToBeEncrypted,
+    IN DWORD cbToBeEncrypted,
+    OUT BYTE *pbEncryptedBlob,
+    IN OUT DWORD *pcbEncryptedBlob
+    );
+
+//+-------------------------------------------------------------------------
+//  Decrypts the message.
+//
+//  If pbDecrypted == NULL, then, *pcbDecrypted is implicitly set to 0 on input.
+//  For *pcbDecrypted == 0 && ppXchgCert == NULL on input, the message isn't
+//  decrypted.
+//
+//  For a successfully decrypted message, *ppXchgCert is updated
+//  with the CertContext used to decrypt. It must be freed by calling
+//  CertStoreFreeCert. Otherwise, *ppXchgCert is set to NULL.
+//
+//  ppXchgCert can be NULL, indicating the caller isn't interested
+//  in getting the CertContext used to decrypt.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptDecryptMessage(
+    IN PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara,
+    IN const BYTE *pbEncryptedBlob,
+    IN DWORD cbEncryptedBlob,
+    OUT OPTIONAL BYTE *pbDecrypted,
+    IN OUT OPTIONAL DWORD *pcbDecrypted,
+    OUT OPTIONAL PCCERT_CONTEXT *ppXchgCert
+    );
+
+//+-------------------------------------------------------------------------
+//  Sign the message and encrypt for the recipient(s). Does a CryptSignMessage
+//  followed with a CryptEncryptMessage.
+//
+//  Note: this isn't the CMSG_SIGNED_AND_ENVELOPED. Its a CMSG_SIGNED
+//  inside of an CMSG_ENVELOPED.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSignAndEncryptMessage(
+    IN PCRYPT_SIGN_MESSAGE_PARA pSignPara,
+    IN PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara,
+    IN DWORD cRecipientCert,
+    IN PCCERT_CONTEXT rgpRecipientCert[],
+    IN const BYTE *pbToBeSignedAndEncrypted,
+    IN DWORD cbToBeSignedAndEncrypted,
+    OUT BYTE *pbSignedAndEncryptedBlob,
+    IN OUT DWORD *pcbSignedAndEncryptedBlob
+    );
+
+//+-------------------------------------------------------------------------
+//  Decrypts the message and verifies the signer. Does a CryptDecryptMessage
+//  followed with a CryptVerifyMessageSignature.
+//
+//  If pbDecrypted == NULL, then, *pcbDecrypted is implicitly set to 0 on input.
+//  For *pcbDecrypted == 0 && ppSignerCert == NULL on input, the signer isn't
+//  verified.
+//
+//  A message might have more than one signer. Set dwSignerIndex to iterate
+//  through all the signers. dwSignerIndex == 0 selects the first signer.
+//
+//  The pVerifyPara's VerifySignerPolicy is called to verify the signer's
+//  certificate.
+//
+//  For a successfully decrypted and verified message, *ppXchgCert and
+//  *ppSignerCert are updated. They must be freed by calling
+//  CertStoreFreeCert. Otherwise, they are set to NULL.
+//
+//  ppXchgCert and/or ppSignerCert can be NULL, indicating the
+//  caller isn't interested in getting the CertContext.
+//
+//  Note: this isn't the CMSG_SIGNED_AND_ENVELOPED. Its a CMSG_SIGNED
+//  inside of an CMSG_ENVELOPED.
+//
+//  The message always needs to be decrypted to allow access to the
+//  signed message. Therefore, if ppXchgCert != NULL, its always updated.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptDecryptAndVerifyMessageSignature(
+    IN PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara,
+    IN PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara,
+    IN DWORD dwSignerIndex,
+    IN const BYTE *pbEncryptedBlob,
+    IN DWORD cbEncryptedBlob,
+    OUT OPTIONAL BYTE *pbDecrypted,
+    IN OUT OPTIONAL DWORD *pcbDecrypted,
+    OUT OPTIONAL PCCERT_CONTEXT *ppXchgCert,
+    OUT OPTIONAL PCCERT_CONTEXT *ppSignerCert
+    );
+
+//+-------------------------------------------------------------------------
+//  Decodes a cryptographic message which may be one of the following types:
+//    CMSG_DATA
+//    CMSG_SIGNED
+//    CMSG_ENVELOPED
+//    CMSG_SIGNED_AND_ENVELOPED
+//    CMSG_HASHED
+//
+//  dwMsgTypeFlags specifies the set of allowable messages. For example, to
+//  decode either SIGNED or ENVELOPED messages, set dwMsgTypeFlags to:
+//      CMSG_SIGNED_FLAG | CMSG_ENVELOPED_FLAG.
+//
+//  dwProvInnerContentType is only applicable when processing nested
+//  crytographic messages. When processing an outer crytographic message
+//  it must be set to 0. When decoding a nested cryptographic message
+//  its the dwInnerContentType returned by a previous CryptDecodeMessage
+//  of the outer message. The InnerContentType can be any of the CMSG types,
+//  for example, CMSG_DATA, CMSG_SIGNED, ...
+//
+//  The optional *pdwMsgType is updated with the type of message.
+//
+//  The optional *pdwInnerContentType is updated with the type of the inner
+//  message. Unless there is cryptographic message nesting, CMSG_DATA
+//  is returned.
+//
+//  For CMSG_DATA: returns decoded content.
+//  For CMSG_SIGNED: same as CryptVerifyMessageSignature.
+//  For CMSG_ENVELOPED: same as CryptDecryptMessage.
+//  For CMSG_SIGNED_AND_ENVELOPED: same as CryptDecryptMessage plus
+//      CryptVerifyMessageSignature.
+//  For CMSG_HASHED: verifies the hash and returns decoded content.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptDecodeMessage(
+    IN DWORD dwMsgTypeFlags,
+    IN PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara,
+    IN PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara,
+    IN DWORD dwSignerIndex,
+    IN const BYTE *pbEncodedBlob,
+    IN DWORD cbEncodedBlob,
+    IN DWORD dwPrevInnerContentType,
+    OUT OPTIONAL DWORD *pdwMsgType,
+    OUT OPTIONAL DWORD *pdwInnerContentType,
+    OUT OPTIONAL BYTE *pbDecoded,
+    IN OUT OPTIONAL DWORD *pcbDecoded,
+    OUT OPTIONAL PCCERT_CONTEXT *ppXchgCert,
+    OUT OPTIONAL PCCERT_CONTEXT *ppSignerCert
+    );
+
+//+-------------------------------------------------------------------------
+//  Hash the message.
+//
+//  If fDetachedHash is TRUE, only the ComputedHash is encoded in the
+//  pbHashedBlob. Otherwise, both the ToBeHashed and ComputedHash
+//  are encoded.
+//
+//  pcbHashedBlob or pcbComputedHash can be NULL, indicating the caller
+//  isn't interested in getting the output.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptHashMessage(
+    IN PCRYPT_HASH_MESSAGE_PARA pHashPara,
+    IN BOOL fDetachedHash,
+    IN DWORD cToBeHashed,
+    IN const BYTE *rgpbToBeHashed[],
+    IN DWORD rgcbToBeHashed[],
+    OUT OPTIONAL BYTE *pbHashedBlob,
+    IN OUT OPTIONAL DWORD *pcbHashedBlob,
+    OUT OPTIONAL BYTE *pbComputedHash,
+    IN OUT OPTIONAL DWORD *pcbComputedHash
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify a hashed message.
+//
+//  pcbToBeHashed or pcbComputedHash can be NULL,
+//  indicating the caller isn't interested in getting the output.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyMessageHash(
+    IN PCRYPT_HASH_MESSAGE_PARA pHashPara,
+    IN BYTE *pbHashedBlob,
+    IN DWORD cbHashedBlob,
+    OUT OPTIONAL BYTE *pbToBeHashed,
+    IN OUT OPTIONAL DWORD *pcbToBeHashed,
+    OUT OPTIONAL BYTE *pbComputedHash,
+    IN OUT OPTIONAL DWORD *pcbComputedHash
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify a hashed message containing a detached hash.
+//  The "to be hashed" content is passed in separately. No
+//  decoded output. Otherwise, identical to CryptVerifyMessageHash.
+//
+//  pcbComputedHash can be NULL, indicating the caller isn't interested
+//  in getting the output.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyDetachedMessageHash(
+    IN PCRYPT_HASH_MESSAGE_PARA pHashPara,
+    IN BYTE *pbDetachedHashBlob,
+    IN DWORD cbDetachedHashBlob,
+    IN DWORD cToBeHashed,
+    IN const BYTE *rgpbToBeHashed[],
+    IN DWORD rgcbToBeHashed[],
+    OUT OPTIONAL BYTE *pbComputedHash,
+    IN OUT OPTIONAL DWORD *pcbComputedHash
+    );
+
+//+-------------------------------------------------------------------------
+//  Sign the message using the provider's private key specified in the
+//  parameters. A dummy SignerId is created and stored in the message.
+//
+//  Normally used until a certificate has been created for the key.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSignMessageWithKey(
+    IN PCRYPT_KEY_SIGN_MESSAGE_PARA pSignPara,
+    IN const BYTE *pbToBeSigned,
+    IN DWORD cbToBeSigned,
+    OUT BYTE *pbSignedBlob,
+    IN OUT DWORD *pcbSignedBlob
+    );
+
+//+-------------------------------------------------------------------------
+//  Verify a signed message using the specified public key info.
+//
+//  Normally called by a CA until it has created a certificate for the
+//  key.
+//
+//  pPublicKeyInfo contains the public key to use to verify the signed
+//  message. If NULL, the signature isn't verified (for instance, the decoded
+//  content may contain the PublicKeyInfo).
+//
+//  pcbDecoded can be NULL, indicating the caller isn't interested
+//  in getting the decoded content.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptVerifyMessageSignatureWithKey(
+    IN PCRYPT_KEY_VERIFY_MESSAGE_PARA pVerifyPara,
+    IN OPTIONAL PCERT_PUBLIC_KEY_INFO pPublicKeyInfo,
+    IN const BYTE *pbSignedBlob,
+    IN DWORD cbSignedBlob,
+    OUT OPTIONAL BYTE *pbDecoded,
+    IN OUT OPTIONAL DWORD *pcbDecoded
+    );
+
+
+//+=========================================================================
+//  System Certificate Store Data Structures and APIs
+//==========================================================================
+
+
+//+-------------------------------------------------------------------------
+//  Get a system certificate store based on a subsystem protocol.
+//
+//  Current examples of subsystems protocols are:
+//      "MY"    Cert Store hold certs with associated Private Keys
+//      "CA"    Certifying Authority certs
+//      "ROOT"  Root Certs
+//      "SPC"   Software publisher certs
+//
+//
+//  If hProv is NULL the default provider "1" is opened for you.
+//  When the store is closed the provider is release. Otherwise
+//  if hProv is not NULL, no provider is created or released.
+//
+//  The returned Cert Store can be searched for an appropriate Cert
+//  using the Cert Store API's (see certstor.h)
+//
+//  When done, the cert store should be closed using CertStoreClose
+//--------------------------------------------------------------------------
+
+
+WINCRYPT32API
+HCERTSTORE
+WINAPI
+CertOpenSystemStoreA(
+    HCRYPTPROV      hProv,
+    LPCSTR            szSubsystemProtocol
+    );
+WINCRYPT32API
+HCERTSTORE
+WINAPI
+CertOpenSystemStoreW(
+    HCRYPTPROV      hProv,
+    LPCWSTR            szSubsystemProtocol
+    );
+#ifdef UNICODE
+#define CertOpenSystemStore  CertOpenSystemStoreW
+#else
+#define CertOpenSystemStore  CertOpenSystemStoreA
+#endif // !UNICODE
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddEncodedCertificateToSystemStoreA(
+    LPCSTR            szCertStoreName,
+    const BYTE *    pbCertEncoded,
+    DWORD           cbCertEncoded
+    );
+WINCRYPT32API
+BOOL
+WINAPI
+CertAddEncodedCertificateToSystemStoreW(
+    LPCWSTR            szCertStoreName,
+    const BYTE *    pbCertEncoded,
+    DWORD           cbCertEncoded
+    );
+#ifdef UNICODE
+#define CertAddEncodedCertificateToSystemStore  CertAddEncodedCertificateToSystemStoreW
+#else
+#define CertAddEncodedCertificateToSystemStore  CertAddEncodedCertificateToSystemStoreA
+#endif // !UNICODE
+
+
+//+-------------------------------------------------------------------------
+//  Find all certificate chains tying the given issuer name to any certificate
+//  that the current user has a private key for.
+//
+//  If no certificate chain is found, FALSE is returned with LastError set
+//  to CRYPT_E_NOT_FOUND and the counts zeroed.
+//
+//  IE 3.0 ASSUMPTION:
+//   The client certificates are in the "My" system store. The issuer
+//   cerificates may be in the "Root", "CA" or "My" system stores.
+//--------------------------------------------------------------------------
+typedef struct _CERT_CHAIN {
+    DWORD                   cCerts;     // number of certs in chain
+    PCERT_BLOB              certs;      // pointer to array of cert chain blobs
+                                        // representing the certs
+    CRYPT_KEY_PROV_INFO     keyLocatorInfo; // key locator for cert
+} CERT_CHAIN, *PCERT_CHAIN;
+
+
+// WINCRYPT32API    This is not exported by crypt32, it is exported by softpub
+HRESULT
+WINAPI
+FindCertsByIssuer(
+    OUT PCERT_CHAIN pCertChains,
+    IN OUT DWORD *pcbCertChains,
+    OUT DWORD *pcCertChains,        // count of certificates chains returned
+    IN BYTE* pbEncodedIssuerName,   // DER encoded issuer name
+    IN DWORD cbEncodedIssuerName,   // count in bytes of encoded issuer name
+    IN LPCWSTR pwszPurpose,         // "ClientAuth" or "CodeSigning"
+    IN DWORD dwKeySpec              // only return signers supporting this
+    // keyspec
+    );
+
+//-------------------------------------------------------------------------
+//
+//  CryptQueryObject takes a CERT_BLOB or a file name and returns the
+//  information about the content in the blob or in the file.
+//
+//  Parameters:
+//  INPUT   dwObjectType:
+//                       Indicate the type of the object.  Should be one of the
+//                       following:
+//                          CERT_QUERY_OBJECT_FILE
+//                          CERT_QUERY_OBJECT_BLOB
+//
+//  INPUT   pvObject:
+//                        If dwObjectType == CERT_QUERY_OBJECT_FILE, it is a
+//                        LPWSTR, that is, the pointer to a wchar file name
+//                        if dwObjectType == CERT_QUERY_OBJECT_BLOB, it is a
+//                        PCERT_BLOB, that is, a pointer to a CERT_BLOB
+//
+//  INPUT   dwExpectedContentTypeFlags:
+//                        Indicate the expected contenet type.
+//                        Can be one of the following:
+//                              CERT_QUERY_CONTENT_FLAG_ALL  (the content can be any type)
+//                              CERT_QUERY_CONTENT_FLAG_CERT
+//                              CERT_QUERY_CONTENT_FLAG_CTL
+//                              CERT_QUERY_CONTENT_FLAG_CRL
+//                              CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE
+//                              CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT
+//                              CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL
+//                              CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL
+//                              CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED
+//                              CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED
+//                              CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED
+//                              CERT_QUERY_CONTENT_FLAG_PKCS10
+//                              CERT_QUERY_CONTENT_FLAG_PFX
+//                              CERT_QUERY_CONTENT_FLAG_CERT_PAIR
+//
+//  INPUT   dwExpectedFormatTypeFlags:
+//                        Indicate the expected format type.
+//                        Can be one of the following:
+//                              CERT_QUERY_FORMAT_FLAG_ALL (the content can be any format)
+//                              CERT_QUERY_FORMAT_FLAG_BINARY
+//                              CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED
+//                              CERT_QUERY_FORMAT_FLAG_ASN_ASCII_HEX_ENCODED
+//
+//
+//  INPUT   dwFlags
+//                        Reserved flag.  Should always set to 0
+//
+//  OUTPUT  pdwMsgAndCertEncodingType
+//                        Optional output.  If NULL != pdwMsgAndCertEncodingType,
+//                        it contains the encoding type of the content as any
+//                        combination of the following:
+//                              X509_ASN_ENCODING
+//                              PKCS_7_ASN_ENCODING
+//
+//  OUTPUT  pdwContentType
+//                        Optional output.  If NULL!=pdwContentType, it contains
+//                        the content type as one of the the following:
+//                              CERT_QUERY_CONTENT_CERT
+//                              CERT_QUERY_CONTENT_CTL
+//                              CERT_QUERY_CONTENT_CRL
+//                              CERT_QUERY_CONTENT_SERIALIZED_STORE
+//                              CERT_QUERY_CONTENT_SERIALIZED_CERT
+//                              CERT_QUERY_CONTENT_SERIALIZED_CTL
+//                              CERT_QUERY_CONTENT_SERIALIZED_CRL
+//                              CERT_QUERY_CONTENT_PKCS7_SIGNED
+//                              CERT_QUERY_CONTENT_PKCS7_UNSIGNED
+//                              CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED
+//                              CERT_QUERY_CONTENT_PKCS10
+//                              CERT_QUERY_CONTENT_PFX
+//                              CERT_QUERY_CONTENT_CERT_PAIR
+//
+//  OUTPUT  pdwFormatType
+//                        Optional output.  If NULL !=pdwFormatType, it
+//                        contains the format type of the content as one of the
+//                        following:
+//                              CERT_QUERY_FORMAT_BINARY
+//                              CERT_QUERY_FORMAT_BASE64_ENCODED
+//                              CERT_QUERY_FORMAT_ASN_ASCII_HEX_ENCODED
+//
+//
+//  OUTPUT  phCertStore
+//                        Optional output.  If NULL !=phStore,
+//                        it contains a cert store that includes all of certificates,
+//                        CRL, and CTL in the object if the object content type is
+//                        one of the following:
+//                              CERT_QUERY_CONTENT_CERT
+//                              CERT_QUERY_CONTENT_CTL
+//                              CERT_QUERY_CONTENT_CRL
+//                              CERT_QUERY_CONTENT_SERIALIZED_STORE
+//                              CERT_QUERY_CONTENT_SERIALIZED_CERT
+//                              CERT_QUERY_CONTENT_SERIALIZED_CTL
+//                              CERT_QUERY_CONTENT_SERIALIZED_CRL
+//                              CERT_QUERY_CONTENT_PKCS7_SIGNED
+//                              CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED
+//                              CERT_QUERY_CONTENT_CERT_PAIR
+//
+//                       Caller should free *phCertStore via CertCloseStore.
+//
+//
+//  OUTPUT  phMsg        Optional output.  If NULL != phMsg,
+//                        it contains a handle to a opened message if
+//                        the content type is one of the following:
+//                              CERT_QUERY_CONTENT_PKCS7_SIGNED
+//                              CERT_QUERY_CONTENT_PKCS7_UNSIGNED
+//                              CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED
+//
+//                       Caller should free *phMsg via CryptMsgClose.
+//
+//  OUTPUT pContext     Optional output.  If NULL != pContext,
+//                      it contains either a PCCERT_CONTEXT or PCCRL_CONTEXT,
+//                      or PCCTL_CONTEXT based on the content type.
+//
+//                      If the content type is CERT_QUERY_CONTENT_CERT or
+//                      CERT_QUERY_CONTENT_SERIALIZED_CERT, it is a PCCERT_CONTEXT;
+//                      Caller should free the pContext via CertFreeCertificateContext.
+//
+//                      If the content type is CERT_QUERY_CONTENT_CRL or
+//                      CERT_QUERY_CONTENT_SERIALIZED_CRL, it is a PCCRL_CONTEXT;
+//                      Caller should free the pContext via CertFreeCRLContext.
+//
+//                      If the content type is CERT_QUERY_CONTENT_CTL or
+//                      CERT_QUERY_CONTENT_SERIALIZED_CTL, it is a PCCTL_CONTEXT;
+//                      Caller should free the pContext via CertFreeCTLContext.
+//
+//  If the *pbObject is of type CERT_QUERY_CONTENT_PKCS10 or CERT_QUERY_CONTENT_PFX, CryptQueryObject
+//  will not return anything in *phCertstore, *phMsg, or *ppvContext.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptQueryObject(
+    DWORD            dwObjectType,
+    const void       *pvObject,
+    DWORD            dwExpectedContentTypeFlags,
+    DWORD            dwExpectedFormatTypeFlags,
+    DWORD            dwFlags,
+    DWORD            *pdwMsgAndCertEncodingType,
+    DWORD            *pdwContentType,
+    DWORD            *pdwFormatType,
+    HCERTSTORE       *phCertStore,
+    HCRYPTMSG        *phMsg,
+    const void       **ppvContext
+    );
+
+
+//-------------------------------------------------------------------------
+//dwObjectType for CryptQueryObject
+//-------------------------------------------------------------------------
+#define     CERT_QUERY_OBJECT_FILE         0x00000001
+#define     CERT_QUERY_OBJECT_BLOB         0x00000002
+
+//-------------------------------------------------------------------------
+//dwContentType for CryptQueryObject
+//-------------------------------------------------------------------------
+//encoded single certificate
+#define     CERT_QUERY_CONTENT_CERT                 1
+//encoded single CTL
+#define     CERT_QUERY_CONTENT_CTL                  2
+//encoded single CRL
+#define     CERT_QUERY_CONTENT_CRL                  3
+//serialized store
+#define     CERT_QUERY_CONTENT_SERIALIZED_STORE     4
+//serialized single certificate
+#define     CERT_QUERY_CONTENT_SERIALIZED_CERT      5
+//serialized single CTL
+#define     CERT_QUERY_CONTENT_SERIALIZED_CTL       6
+//serialized single CRL
+#define     CERT_QUERY_CONTENT_SERIALIZED_CRL       7
+//a PKCS#7 signed message
+#define     CERT_QUERY_CONTENT_PKCS7_SIGNED         8
+//a PKCS#7 message, such as enveloped message.  But it is not a signed message,
+#define     CERT_QUERY_CONTENT_PKCS7_UNSIGNED       9
+//a PKCS7 signed message embedded in a file
+#define     CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED   10
+//an encoded PKCS#10
+#define     CERT_QUERY_CONTENT_PKCS10               11
+//an encoded PKX BLOB
+#define     CERT_QUERY_CONTENT_PFX                                      12
+//an encoded CertificatePair (contains forward and/or reverse cross certs)
+#define     CERT_QUERY_CONTENT_CERT_PAIR            13
+
+
+//-------------------------------------------------------------------------
+//dwExpectedConentTypeFlags for CryptQueryObject
+//-------------------------------------------------------------------------
+
+//encoded single certificate
+#define     CERT_QUERY_CONTENT_FLAG_CERT   \
+                ( 1 << CERT_QUERY_CONTENT_CERT)
+
+//encoded single CTL
+#define     CERT_QUERY_CONTENT_FLAG_CTL   \
+                ( 1 << CERT_QUERY_CONTENT_CTL)
+
+//encoded single CRL
+#define     CERT_QUERY_CONTENT_FLAG_CRL   \
+                ( 1 << CERT_QUERY_CONTENT_CRL)
+
+//serialized store
+#define     CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE   \
+                ( 1 << CERT_QUERY_CONTENT_SERIALIZED_STORE)
+
+//serialized single certificate
+#define     CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT   \
+                ( 1 << CERT_QUERY_CONTENT_SERIALIZED_CERT)
+
+//serialized single CTL
+#define     CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL   \
+                ( 1 << CERT_QUERY_CONTENT_SERIALIZED_CTL)
+
+//serialized single CRL
+#define     CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL   \
+                ( 1 << CERT_QUERY_CONTENT_SERIALIZED_CRL)
+
+//an encoded PKCS#7 signed message
+#define     CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED   \
+                ( 1 << CERT_QUERY_CONTENT_PKCS7_SIGNED)
+
+//an encoded PKCS#7 message.  But it is not a signed message
+#define     CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED   \
+                ( 1 << CERT_QUERY_CONTENT_PKCS7_UNSIGNED)
+
+//the content includes an embedded PKCS7 signed message
+#define     CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED  \
+                ( 1 << CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED)
+
+//an encoded PKCS#10
+#define     CERT_QUERY_CONTENT_FLAG_PKCS10   \
+                ( 1 << CERT_QUERY_CONTENT_PKCS10)
+
+//an encoded PFX BLOB
+#define     CERT_QUERY_CONTENT_FLAG_PFX      \
+                ( 1 << CERT_QUERY_CONTENT_PFX)
+
+//an encoded CertificatePair (contains forward and/or reverse cross certs)
+#define     CERT_QUERY_CONTENT_FLAG_CERT_PAIR   \
+                ( 1 << CERT_QUERY_CONTENT_CERT_PAIR)
+
+//content can be any type
+#define     CERT_QUERY_CONTENT_FLAG_ALL                         \
+                CERT_QUERY_CONTENT_FLAG_CERT |                  \
+                CERT_QUERY_CONTENT_FLAG_CTL  |                  \
+                CERT_QUERY_CONTENT_FLAG_CRL  |                  \
+                CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE |      \
+                CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT  |      \
+                CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL   |      \
+                CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL   |      \
+                CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED     |      \
+                CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED   |      \
+                CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED |    \
+                CERT_QUERY_CONTENT_FLAG_PKCS10                     |    \
+                CERT_QUERY_CONTENT_FLAG_PFX                |    \
+                CERT_QUERY_CONTENT_FLAG_CERT_PAIR
+
+
+//-------------------------------------------------------------------------
+//dwFormatType for CryptQueryObject
+//-------------------------------------------------------------------------
+//the content is in binary format
+#define     CERT_QUERY_FORMAT_BINARY                1
+
+//the content is base64 encoded
+#define     CERT_QUERY_FORMAT_BASE64_ENCODED        2
+
+//the content is ascii hex encoded with "{ASN}" prefix
+#define     CERT_QUERY_FORMAT_ASN_ASCII_HEX_ENCODED 3
+//-------------------------------------------------------------------------
+//dwExpectedFormatTypeFlags for CryptQueryObject
+//-------------------------------------------------------------------------
+//the content is in binary format
+#define     CERT_QUERY_FORMAT_FLAG_BINARY         \
+                ( 1 << CERT_QUERY_FORMAT_BINARY)
+
+//the content is base64 encoded
+#define     CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED \
+                ( 1 << CERT_QUERY_FORMAT_BASE64_ENCODED)
+
+//the content is ascii hex encoded with "{ASN}" prefix
+#define     CERT_QUERY_FORMAT_FLAG_ASN_ASCII_HEX_ENCODED \
+                ( 1 << CERT_QUERY_FORMAT_ASN_ASCII_HEX_ENCODED)
+
+//the content can be of any format
+#define     CERT_QUERY_FORMAT_FLAG_ALL              \
+            CERT_QUERY_FORMAT_FLAG_BINARY   |       \
+            CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED | \
+            CERT_QUERY_FORMAT_FLAG_ASN_ASCII_HEX_ENCODED
+
+
+
+//
+// Crypt32 Memory Management Routines.  All Crypt32 API which return allocated
+// buffers will do so via CryptMemAlloc, CryptMemRealloc.  Clients can free
+// those buffers using CryptMemFree.  Also included is CryptMemSize
+//
+
+WINCRYPT32API
+LPVOID
+WINAPI
+CryptMemAlloc (
+    IN ULONG cbSize
+    );
+
+WINCRYPT32API
+LPVOID
+WINAPI
+CryptMemRealloc (
+    IN LPVOID pv,
+    IN ULONG cbSize
+    );
+
+WINCRYPT32API
+VOID
+WINAPI
+CryptMemFree (
+    IN LPVOID pv
+    );
+
+//
+// Crypt32 Asynchronous Parameter Management Routines.  All Crypt32 API which
+// expose asynchronous mode operation use a Crypt32 Async Handle to pass
+// around information about the operation e.g. callback routines.  The
+// following API are used for manipulation of the async handle
+//
+
+typedef HANDLE HCRYPTASYNC, *PHCRYPTASYNC;
+
+typedef VOID (WINAPI *PFN_CRYPT_ASYNC_PARAM_FREE_FUNC) (
+    LPSTR pszParamOid,
+    LPVOID pvParam
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptCreateAsyncHandle (
+    IN DWORD dwFlags,
+    OUT PHCRYPTASYNC phAsync
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSetAsyncParam (
+    IN HCRYPTASYNC hAsync,
+    IN LPSTR pszParamOid,
+    IN LPVOID pvParam,
+    IN OPTIONAL PFN_CRYPT_ASYNC_PARAM_FREE_FUNC pfnFree
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetAsyncParam (
+    IN HCRYPTASYNC hAsync,
+    IN LPSTR pszParamOid,
+    OUT LPVOID* ppvParam,
+    OUT OPTIONAL PFN_CRYPT_ASYNC_PARAM_FREE_FUNC* ppfnFree
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptCloseAsyncHandle (
+    IN HCRYPTASYNC hAsync
+    );
+
+//
+// Crypt32 Remote Object Retrieval Routines.  This API allows retrieval of
+// remote PKI objects where the location is given by an URL.  The remote
+// object retrieval manager exposes two provider models.  One is the "Scheme
+// Provider" model which allows for installable protocol providers as defined
+// by the URL scheme e.g. ldap, http, ftp.  The scheme provider entry point is
+// the same as the CryptRetrieveObjectByUrl however the *ppvObject returned
+// is ALWAYS a counted array of encoded bits (one per object retrieved).  The
+// second provider model is the "Context Provider" model which allows for
+// installable creators of CAPI2 context handles (objects) based on the
+// retrieved encoded bits.  These are dispatched based on the object OID given
+// in the call to CryptRetrieveObjectByUrl.
+//
+
+typedef struct _CRYPT_BLOB_ARRAY {
+    DWORD            cBlob;
+    PCRYPT_DATA_BLOB rgBlob;
+} CRYPT_BLOB_ARRAY, *PCRYPT_BLOB_ARRAY;
+
+typedef struct _CRYPT_CREDENTIALS {
+    DWORD  cbSize;
+    LPCSTR pszCredentialsOid;
+    LPVOID pvCredentials;
+} CRYPT_CREDENTIALS, *PCRYPT_CREDENTIALS;
+
+#define CREDENTIAL_OID_PASSWORD_CREDENTIALS_A ((LPCSTR)1)
+#define CREDENTIAL_OID_PASSWORD_CREDENTIALS_W ((LPCSTR)2)
+
+#ifdef UNICODE
+#define CREDENTIAL_OID_PASSWORD_CREDENTIALS CREDENTIAL_OID_PASSWORD_CREDENTIALS_W
+#else
+#define CREDENTIAL_OID_PASSWORD_CREDENTIALS CREDENTIAL_OID_PASSWORD_CREDENTIALS_A
+#endif //UNICODE
+
+typedef struct _CRYPT_PASSWORD_CREDENTIALSA {
+    DWORD   cbSize;
+    LPSTR   pszUsername;
+    LPSTR   pszPassword;
+} CRYPT_PASSWORD_CREDENTIALSA, *PCRYPT_PASSWORD_CREDENTIALSA;
+typedef struct _CRYPT_PASSWORD_CREDENTIALSW {
+    DWORD   cbSize;
+    LPWSTR  pszUsername;
+    LPWSTR  pszPassword;
+} CRYPT_PASSWORD_CREDENTIALSW, *PCRYPT_PASSWORD_CREDENTIALSW;
+#ifdef UNICODE
+typedef CRYPT_PASSWORD_CREDENTIALSW CRYPT_PASSWORD_CREDENTIALS;
+typedef PCRYPT_PASSWORD_CREDENTIALSW PCRYPT_PASSWORD_CREDENTIALS;
+#else
+typedef CRYPT_PASSWORD_CREDENTIALSA CRYPT_PASSWORD_CREDENTIALS;
+typedef PCRYPT_PASSWORD_CREDENTIALSA PCRYPT_PASSWORD_CREDENTIALS;
+#endif // UNICODE
+
+//
+// Scheme Provider Signatures
+//
+
+// The following is obsolete and has been replaced with the following
+// definition
+#define SCHEME_OID_RETRIEVE_ENCODED_OBJECT_FUNC "SchemeDllRetrieveEncodedObject"
+
+// 2-8-02 .NET Server changed to use UNICODE Url strings instead of multibyte
+#define SCHEME_OID_RETRIEVE_ENCODED_OBJECTW_FUNC "SchemeDllRetrieveEncodedObjectW"
+
+typedef VOID (WINAPI *PFN_FREE_ENCODED_OBJECT_FUNC) (
+    LPCSTR pszObjectOid,
+    PCRYPT_BLOB_ARRAY pObject,
+    LPVOID pvFreeContext
+    );
+
+//
+// SchemeDllRetrieveEncodedObject was replaced in .NET Server with
+// the following. (Changed to use UNICODE Url Strings.)
+//
+
+//
+// SchemeDllRetrieveEncodedObjectW has the following signature:
+//
+// BOOL WINAPI SchemeDllRetrieveEncodedObjectW (
+//                   IN LPCWSTR pwszUrl,
+//                   IN LPCSTR pszObjectOid,
+//                   IN DWORD dwRetrievalFlags,
+//                   IN DWORD dwTimeout,                // milliseconds
+//                   OUT PCRYPT_BLOB_ARRAY pObject,
+//                   OUT PFN_FREE_ENCODED_OBJECT_FUNC* ppfnFreeObject,
+//                   OUT LPVOID* ppvFreeContext,
+//                   IN HCRYPTASYNC hAsyncRetrieve,
+//                   IN PCRYPT_CREDENTIALS pCredentials,
+//                   IN PCRYPT_RETRIEVE_AUX_INFO pAuxInfo
+//                   )
+//
+
+//
+// Context Provider Signatures
+//
+
+#define CONTEXT_OID_CREATE_OBJECT_CONTEXT_FUNC "ContextDllCreateObjectContext"
+
+#define CONTEXT_OID_CERTIFICATE ((LPCSTR)1)
+#define CONTEXT_OID_CRL         ((LPCSTR)2)
+#define CONTEXT_OID_CTL         ((LPCSTR)3)
+#define CONTEXT_OID_PKCS7       ((LPCSTR)4)
+#define CONTEXT_OID_CAPI2_ANY   ((LPCSTR)5)
+
+//
+// ContextDllCreateObjectContext has the following signature:
+//
+// BOOL WINAPI ContextDllCreateObjectContext (
+//                    IN LPCSTR pszObjectOid,
+//                    IN DWORD dwRetrievalFlags,
+//                    IN PCRYPT_BLOB_ARRAY pObject,
+//                    OUT LPVOID* ppvContext
+//                    )
+//
+
+//
+// Remote Object Retrieval API
+//
+
+//
+// Retrieval flags
+//
+
+#define CRYPT_RETRIEVE_MULTIPLE_OBJECTS         0x00000001
+#define CRYPT_CACHE_ONLY_RETRIEVAL              0x00000002
+#define CRYPT_WIRE_ONLY_RETRIEVAL               0x00000004
+#define CRYPT_DONT_CACHE_RESULT                 0x00000008
+#define CRYPT_ASYNC_RETRIEVAL                   0x00000010
+#define CRYPT_STICKY_CACHE_RETRIEVAL            0x00001000
+#define CRYPT_LDAP_SCOPE_BASE_ONLY_RETRIEVAL    0x00002000
+#define CRYPT_OFFLINE_CHECK_RETRIEVAL           0x00004000
+
+// When the following flag is set, the following 2 NULL terminated ascii
+// strings are inserted at the beginning of each returned blob:
+//  "%d\0%s\0", dwEntryIndex, pszAttribute
+//
+//  The first dwEntryIndex is 0, "0\0". 
+//
+// When set, pszObjectOid must be NULL, so that a PCRYPT_BLOB_ARRAY is returned.
+#define CRYPT_LDAP_INSERT_ENTRY_ATTRIBUTE       0x00008000
+
+// Set this flag to digitally sign all of the ldap traffic to and from a
+// Windows 2000 LDAP server using the Kerberos authentication protocol.
+// This feature provides integrity required by some applications. 
+#define CRYPT_LDAP_SIGN_RETRIEVAL               0x00010000
+
+// Set this flag to inhibit automatic authentication handling. See the
+// wininet flag, INTERNET_FLAG_NO_AUTH, for more details.
+#define CRYPT_NO_AUTH_RETRIEVAL                 0x00020000
+
+// Performs an A-Record only DNS lookup on the supplied host string.
+// This prevents bogus DNS queries from being generated when resolving host
+// names. Use this flag whenever passing a hostname as opposed to a
+// domain name for the hostname parameter. 
+//
+// See LDAP_OPT_AREC_EXCLUSIVE defined in winldap.h for more details.
+#define CRYPT_LDAP_AREC_EXCLUSIVE_RETRIEVAL     0x00040000
+
+// Apply AIA URL restrictions, such as, validate retrieved content before
+// writing to cache.
+#define CRYPT_AIA_RETRIEVAL                     0x00080000
+
+//
+// Data verification retrieval flags
+//
+// CRYPT_VERIFY_CONTEXT_SIGNATURE is used to get signature verification
+// on the context created.  In this case pszObjectOid must be non-NULL and
+// pvVerify points to the signer certificate context
+//
+// CRYPT_VERIFY_DATA_HASH is used to get verification of the blob data
+// retrieved by the protocol.  The pvVerify points to an URL_DATA_HASH
+// structure (TBD)
+//
+
+#define CRYPT_VERIFY_CONTEXT_SIGNATURE  0x00000020
+#define CRYPT_VERIFY_DATA_HASH          0x00000040
+
+//
+// Time Valid Object flags
+//
+
+#define CRYPT_KEEP_TIME_VALID               0x00000080
+#define CRYPT_DONT_VERIFY_SIGNATURE         0x00000100
+#define CRYPT_DONT_CHECK_TIME_VALIDITY      0x00000200
+
+// The default checks if ftNextUpdate >= ftValidFor. Set this flag to
+// check if ftThisUpdate >= ftValidFor.
+#define CRYPT_CHECK_FRESHNESS_TIME_VALIDITY 0x00000400
+
+#define CRYPT_ACCUMULATIVE_TIMEOUT          0x00000800
+
+typedef struct _CRYPT_RETRIEVE_AUX_INFO {
+    DWORD       cbSize;
+    FILETIME    *pLastSyncTime;
+    DWORD       dwMaxUrlRetrievalByteCount;     // 0 => implies no limit
+} CRYPT_RETRIEVE_AUX_INFO, *PCRYPT_RETRIEVE_AUX_INFO;
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptRetrieveObjectByUrlA (
+    IN LPCSTR pszUrl,
+    IN LPCSTR pszObjectOid,
+    IN DWORD dwRetrievalFlags,
+    IN DWORD dwTimeout,                     // milliseconds
+    OUT LPVOID* ppvObject,
+    IN HCRYPTASYNC hAsyncRetrieve,
+    IN OPTIONAL PCRYPT_CREDENTIALS pCredentials,
+    IN OPTIONAL LPVOID pvVerify,
+    IN OPTIONAL PCRYPT_RETRIEVE_AUX_INFO pAuxInfo
+    );
+WINCRYPT32API
+BOOL
+WINAPI
+CryptRetrieveObjectByUrlW (
+    IN LPCWSTR pszUrl,
+    IN LPCSTR pszObjectOid,
+    IN DWORD dwRetrievalFlags,
+    IN DWORD dwTimeout,                     // milliseconds
+    OUT LPVOID* ppvObject,
+    IN HCRYPTASYNC hAsyncRetrieve,
+    IN OPTIONAL PCRYPT_CREDENTIALS pCredentials,
+    IN OPTIONAL LPVOID pvVerify,
+    IN OPTIONAL PCRYPT_RETRIEVE_AUX_INFO pAuxInfo
+    );
+#ifdef UNICODE
+#define CryptRetrieveObjectByUrl  CryptRetrieveObjectByUrlW
+#else
+#define CryptRetrieveObjectByUrl  CryptRetrieveObjectByUrlA
+#endif // !UNICODE
+
+
+//
+// Call back function to cancel object retrieval
+//
+// The function can be installed on a per thread basis.
+// If CryptInstallCancelRetrieval is called for multiple times, only the most recent
+// installation will be kept.
+//
+// This is only effective for http, https, gopher, and ftp protocol.
+// It is ignored by the rest of the protocols.
+
+
+typedef BOOL (WINAPI *PFN_CRYPT_CANCEL_RETRIEVAL)(
+    IN DWORD dwFlags,
+    IN void  *pvArg
+    );
+
+
+//
+// PFN_CRYPT_CANCEL_RETRIEVAL
+//
+// This function should return FALSE when the object retrieval should be continued
+// and return TRUE when the object retrieval should be cancelled.
+//
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptInstallCancelRetrieval(
+    IN PFN_CRYPT_CANCEL_RETRIEVAL pfnCancel,
+    IN const void *pvArg,
+    IN DWORD dwFlags,
+    IN void *pvReserved
+);
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUninstallCancelRetrieval(
+        IN DWORD dwFlags,
+        IN void  *pvReserved
+        );
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptCancelAsyncRetrieval (
+    HCRYPTASYNC hAsyncRetrieval
+    );
+
+//
+// Remote Object Async Retrieval parameters
+//
+
+//
+// A client that wants to be notified of asynchronous object retrieval
+// completion sets this parameter on the async handle
+//
+
+#define CRYPT_PARAM_ASYNC_RETRIEVAL_COMPLETION ((LPCSTR)1)
+
+typedef VOID (WINAPI *PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC) (
+    IN LPVOID pvCompletion,
+    IN DWORD dwCompletionCode,
+    IN LPCSTR pszUrl,
+    IN LPSTR pszObjectOid,
+    IN LPVOID pvObject
+    );
+
+typedef struct _CRYPT_ASYNC_RETRIEVAL_COMPLETION {
+    PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC pfnCompletion;
+    LPVOID pvCompletion;
+} CRYPT_ASYNC_RETRIEVAL_COMPLETION, *PCRYPT_ASYNC_RETRIEVAL_COMPLETION;
+
+//
+// This function is set on the async handle by a scheme provider that
+// supports asynchronous retrieval
+//
+
+#define CRYPT_PARAM_CANCEL_ASYNC_RETRIEVAL ((LPCSTR)2)
+
+typedef BOOL (WINAPI *PFN_CANCEL_ASYNC_RETRIEVAL_FUNC) (
+    HCRYPTASYNC hAsyncRetrieve
+    );
+
+//
+// Get the locator for a CAPI object
+//
+
+#define CRYPT_GET_URL_FROM_PROPERTY         0x00000001
+#define CRYPT_GET_URL_FROM_EXTENSION        0x00000002
+#define CRYPT_GET_URL_FROM_UNAUTH_ATTRIBUTE 0x00000004
+#define CRYPT_GET_URL_FROM_AUTH_ATTRIBUTE   0x00000008
+
+typedef struct _CRYPT_URL_ARRAY {
+    DWORD   cUrl;
+    LPWSTR* rgwszUrl;
+} CRYPT_URL_ARRAY, *PCRYPT_URL_ARRAY;
+
+typedef struct _CRYPT_URL_INFO {
+    DWORD   cbSize;
+
+    // Seconds between syncs
+    DWORD   dwSyncDeltaTime;
+
+    // Returned URLs may be grouped. For instance, groups of cross cert
+    // distribution points. Each distribution point may have multiple
+    // URLs, (LDAP and HTTP scheme).
+    DWORD   cGroup;
+    DWORD   *rgcGroupEntry;
+} CRYPT_URL_INFO, *PCRYPT_URL_INFO;
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetObjectUrl (
+    IN LPCSTR pszUrlOid,
+    IN LPVOID pvPara,
+    IN DWORD dwFlags,
+    OUT OPTIONAL PCRYPT_URL_ARRAY pUrlArray,
+    IN OUT DWORD* pcbUrlArray,
+    OUT OPTIONAL PCRYPT_URL_INFO pUrlInfo,
+    IN OUT OPTIONAL DWORD* pcbUrlInfo,
+    IN OPTIONAL LPVOID pvReserved
+    );
+
+#define URL_OID_GET_OBJECT_URL_FUNC "UrlDllGetObjectUrl"
+
+//
+// UrlDllGetObjectUrl has the same signature as CryptGetObjectUrl
+//
+
+//
+// URL_OID_CERTIFICATE_ISSUER
+//
+// pvPara == PCCERT_CONTEXT, certificate whose issuer's URL is being requested
+//
+// This will be retrieved from the authority info access extension or property
+// on the certificate
+//
+// URL_OID_CERTIFICATE_CRL_DIST_POINT
+//
+// pvPara == PCCERT_CONTEXT, certificate whose CRL distribution point is being
+// requested
+//
+// This will be retrieved from the CRL distribution point extension or property
+// on the certificate
+//
+// URL_OID_CTL_ISSUER
+//
+// pvPara == PCCTL_CONTEXT, Signer Index, CTL whose issuer's URL (identified
+// by the signer index) is being requested
+//
+// This will be retrieved from an authority info access attribute method encoded
+// in each signer info in the PKCS7 (CTL)
+//
+// URL_OID_CTL_NEXT_UPDATE
+//
+// pvPara == PCCTL_CONTEXT, Signer Index, CTL whose next update URL is being
+// requested and an optional signer index in case we need to check signer
+// info attributes
+//
+// This will be retrieved from an authority info access CTL extension, property,
+// or signer info attribute method
+//
+// URL_OID_CRL_ISSUER
+//
+// pvPara == PCCRL_CONTEXT, CRL whose issuer's URL is being requested
+//
+// This will be retrieved from a property on the CRL which has been inherited
+// from the subject cert (either from the subject cert issuer or the subject
+// cert distribution point extension).  It will be encoded as an authority
+// info access extension method.
+//
+// URL_OID_CERTIFICATE_FRESHEST_CRL
+//
+// pvPara == PCCERT_CONTEXT, certificate whose freshest CRL distribution point
+// is being requested
+//
+// This will be retrieved from the freshest CRL extension or property
+// on the certificate
+//
+// URL_OID_CRL_FRESHEST_CRL
+//
+// pvPara == PCCERT_CRL_CONTEXT_PAIR, certificate's base CRL whose
+// freshest CRL distribution point is being requested
+//
+// This will be retrieved from the freshest CRL extension or property
+// on the CRL
+//
+// URL_OID_CROSS_CERT_DIST_POINT
+//
+// pvPara == PCCERT_CONTEXT, certificate whose cross certificate distribution
+// point is being requested
+//
+// This will be retrieved from the cross certificate distribution point
+// extension or property on the certificate
+//
+
+#define URL_OID_CERTIFICATE_ISSUER         ((LPCSTR)1)
+#define URL_OID_CERTIFICATE_CRL_DIST_POINT ((LPCSTR)2)
+#define URL_OID_CTL_ISSUER                 ((LPCSTR)3)
+#define URL_OID_CTL_NEXT_UPDATE            ((LPCSTR)4)
+#define URL_OID_CRL_ISSUER                 ((LPCSTR)5)
+#define URL_OID_CERTIFICATE_FRESHEST_CRL   ((LPCSTR)6)
+#define URL_OID_CRL_FRESHEST_CRL           ((LPCSTR)7)
+#define URL_OID_CROSS_CERT_DIST_POINT      ((LPCSTR)8)
+
+typedef struct _CERT_CRL_CONTEXT_PAIR {
+    PCCERT_CONTEXT          pCertContext;
+    PCCRL_CONTEXT           pCrlContext;
+} CERT_CRL_CONTEXT_PAIR, *PCERT_CRL_CONTEXT_PAIR;
+typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR;
+
+//
+// Get a time valid CAPI2 object
+//
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetTimeValidObject (
+    IN LPCSTR pszTimeValidOid,
+    IN LPVOID pvPara,
+    IN PCCERT_CONTEXT pIssuer,
+    IN OPTIONAL LPFILETIME pftValidFor,
+    IN DWORD dwFlags,
+    IN DWORD dwTimeout,                         // milliseconds
+    OUT OPTIONAL LPVOID* ppvObject,
+    IN OPTIONAL PCRYPT_CREDENTIALS pCredentials,
+    IN OPTIONAL LPVOID pvReserved
+    );
+
+#define TIME_VALID_OID_GET_OBJECT_FUNC "TimeValidDllGetObject"
+
+//
+// TimeValidDllGetObject has the same signature as CryptGetTimeValidObject
+//
+
+//
+// TIME_VALID_OID_GET_CTL
+//
+// pvPara == PCCTL_CONTEXT, the current CTL
+//
+// TIME_VALID_OID_GET_CRL
+//
+// pvPara == PCCRL_CONTEXT, the current CRL
+//
+// TIME_VALID_OID_GET_CRL_FROM_CERT
+//
+// pvPara == PCCERT_CONTEXT, the subject cert
+//
+// TIME_VALID_OID_GET_FRESHEST_CRL_FROM_CERT
+//
+// pvPara == PCCERT_CONTEXT, the subject cert
+//
+// TIME_VALID_OID_GET_FRESHEST_CRL_FROM_CRL
+//
+// pvPara == PCCERT_CRL_CONTEXT_PAIR, the subject cert and its base CRL
+//
+
+#define TIME_VALID_OID_GET_CTL           ((LPCSTR)1)
+#define TIME_VALID_OID_GET_CRL           ((LPCSTR)2)
+#define TIME_VALID_OID_GET_CRL_FROM_CERT ((LPCSTR)3)
+
+#define TIME_VALID_OID_GET_FRESHEST_CRL_FROM_CERT   ((LPCSTR)4)
+#define TIME_VALID_OID_GET_FRESHEST_CRL_FROM_CRL    ((LPCSTR)5)
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptFlushTimeValidObject (
+     IN LPCSTR pszFlushTimeValidOid,
+     IN LPVOID pvPara,
+     IN PCCERT_CONTEXT pIssuer,
+     IN DWORD dwFlags,
+     IN LPVOID pvReserved
+     );
+
+#define TIME_VALID_OID_FLUSH_OBJECT_FUNC "TimeValidDllFlushObject"
+
+//
+// TimeValidDllFlushObject has the same signature as CryptFlushTimeValidObject
+//
+
+//
+// TIME_VALID_OID_FLUSH_CTL
+//
+// pvPara == PCCTL_CONTEXT, the CTL to flush
+//
+// TIME_VALID_OID_FLUSH_CRL
+//
+// pvPara == PCCRL_CONTEXT, the CRL to flush
+//
+// TIME_VALID_OID_FLUSH_CRL_FROM_CERT
+//
+// pvPara == PCCERT_CONTEXT, the subject cert's CRL to flush
+//
+// TIME_VALID_OID_FLUSH_FRESHEST_CRL_FROM_CERT
+//
+// pvPara == PCCERT_CONTEXT, the subject cert's freshest CRL to flush
+//
+// TIME_VALID_OID_FLUSH_FRESHEST_CRL_FROM_CRL
+//
+// pvPara == PCCERT_CRL_CONTEXT_PAIR, the subject cert and its base CRL's
+// freshest CRL to flush
+//
+
+#define TIME_VALID_OID_FLUSH_CTL           ((LPCSTR)1)
+#define TIME_VALID_OID_FLUSH_CRL           ((LPCSTR)2)
+#define TIME_VALID_OID_FLUSH_CRL_FROM_CERT ((LPCSTR)3)
+
+#define TIME_VALID_OID_FLUSH_FRESHEST_CRL_FROM_CERT ((LPCSTR)4)
+#define TIME_VALID_OID_FLUSH_FRESHEST_CRL_FROM_CRL  ((LPCSTR)5)
+
+//-------------------------------------------------------------------------
+// Data Protection APIs
+//-------------------------------------------------------------------------
+
+//
+// Data protection APIs enable applications to easily secure data.
+//
+// The base provider provides protection based on the users' logon
+// credentials. The data secured with these APIs follow the same
+// roaming characteristics as HKCU -- if HKCU roams, the data
+// protected by the base provider may roam as well. This makes
+// the API ideal for the munging of data stored in the registry.
+//
+
+//
+// Prompt struct -- what to tell users about the access
+//
+typedef struct  _CRYPTPROTECT_PROMPTSTRUCT
+{
+    DWORD cbSize;
+    DWORD dwPromptFlags;
+    HWND  hwndApp;
+    LPCWSTR szPrompt;
+} CRYPTPROTECT_PROMPTSTRUCT, *PCRYPTPROTECT_PROMPTSTRUCT;
+
+
+//
+// base provider action
+//
+#define CRYPTPROTECT_DEFAULT_PROVIDER   { 0xdf9d8cd0, 0x1501, 0x11d1, {0x8c, 0x7a, 0x00, 0xc0, 0x4f, 0xc2, 0x97, 0xeb} }
+
+//
+// CryptProtect PromptStruct dwPromtFlags
+//
+//
+// prompt on unprotect
+#define CRYPTPROTECT_PROMPT_ON_UNPROTECT     0x1  // 1<<0
+//
+// prompt on protect
+#define CRYPTPROTECT_PROMPT_ON_PROTECT       0x2  // 1<<1
+#define CRYPTPROTECT_PROMPT_RESERVED         0x04 // reserved, do not use.
+
+//
+// default to strong variant UI protection (user supplied password currently).
+#define CRYPTPROTECT_PROMPT_STRONG           0x08 // 1<<3
+
+//
+// require strong variant UI protection (user supplied password currently).
+#define CRYPTPROTECT_PROMPT_REQUIRE_STRONG   0x10 // 1<<4
+
+//
+// CryptProtectData and CryptUnprotectData dwFlags
+//
+// for remote-access situations where ui is not an option
+// if UI was specified on protect or unprotect operation, the call
+// will fail and GetLastError() will indicate ERROR_PASSWORD_RESTRICTION
+#define CRYPTPROTECT_UI_FORBIDDEN        0x1
+
+//
+// per machine protected data -- any user on machine where CryptProtectData
+// took place may CryptUnprotectData
+#define CRYPTPROTECT_LOCAL_MACHINE       0x4
+
+//
+// force credential synchronize during CryptProtectData()
+// Synchronize is only operation that occurs during this operation
+#define CRYPTPROTECT_CRED_SYNC           0x8
+
+//
+// Generate an Audit on protect and unprotect operations
+//
+#define CRYPTPROTECT_AUDIT              0x10
+
+//
+// Protect data with a non-recoverable key
+//
+#define CRYPTPROTECT_NO_RECOVERY        0x20
+
+
+//
+// Verify the protection of a protected blob
+//
+#define CRYPTPROTECT_VERIFY_PROTECTION  0x40
+
+//
+// Regenerate the local machine protection
+//
+#define CRYPTPROTECT_CRED_REGENERATE    0x80
+
+// flags reserved for system use
+#define CRYPTPROTECT_FIRST_RESERVED_FLAGVAL    0x0FFFFFFF
+#define CRYPTPROTECT_LAST_RESERVED_FLAGVAL     0xFFFFFFFF
+
+//
+// flags specific to base provider
+//
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptProtectData(
+    IN              DATA_BLOB*      pDataIn,
+    IN              LPCWSTR         szDataDescr,
+    IN OPTIONAL     DATA_BLOB*      pOptionalEntropy,
+    IN              PVOID           pvReserved,
+    IN OPTIONAL     CRYPTPROTECT_PROMPTSTRUCT*  pPromptStruct,
+    IN              DWORD           dwFlags,
+    OUT             DATA_BLOB*      pDataOut            // out encr blob
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUnprotectData(
+    IN              DATA_BLOB*      pDataIn,             // in encr blob
+    OUT OPTIONAL    LPWSTR*         ppszDataDescr,       // out
+    IN OPTIONAL     DATA_BLOB*      pOptionalEntropy,
+    IN              PVOID           pvReserved,
+    IN OPTIONAL     CRYPTPROTECT_PROMPTSTRUCT*  pPromptStruct,
+    IN              DWORD           dwFlags,
+    OUT             DATA_BLOB*      pDataOut
+    );
+
+
+//
+// The buffer length passed into CryptProtectMemory and CryptUnprotectMemory
+// must be a multiple of this length (or zero).
+//
+
+#define CRYPTPROTECTMEMORY_BLOCK_SIZE           16
+
+
+//
+// CryptProtectMemory/CryptUnprotectMemory dwFlags
+//
+
+//
+// Encrypt/Decrypt within current process context.
+//
+
+#define CRYPTPROTECTMEMORY_SAME_PROCESS         0x00
+
+//
+// Encrypt/Decrypt across process boundaries.
+// eg: encrypted buffer passed across LPC to another process which calls CryptUnprotectMemory.
+//
+
+#define CRYPTPROTECTMEMORY_CROSS_PROCESS        0x01
+
+//
+// Encrypt/Decrypt across callers with same LogonId.
+// eg: encrypted buffer passed across LPC to another process which calls CryptUnprotectMemory whilst impersonating.
+//
+
+#define CRYPTPROTECTMEMORY_SAME_LOGON           0x02
+
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptProtectMemory(
+    IN OUT          LPVOID          pDataIn,             // in out data to encrypt
+    IN              DWORD           cbDataIn,            // multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE
+    IN              DWORD           dwFlags
+    );
+
+WINCRYPT32API
+BOOL
+WINAPI
+CryptUnprotectMemory(
+    IN OUT          LPVOID          pDataIn,             // in out data to decrypt
+    IN              DWORD           cbDataIn,            // multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE
+    IN              DWORD           dwFlags
+    );
+
+
+//+=========================================================================
+//  Helper functions to build certificates
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//
+// Builds a self-signed certificate and returns a PCCERT_CONTEXT representing
+// the certificate. A hProv must be specified to build the cert context.
+//
+// pSubjectIssuerBlob is the DN for the certifcate. If an alternate subject
+// name is desired it must be specified as an extension in the pExtensions
+// parameter. pSubjectIssuerBlob can NOT be NULL, so minimually an empty DN
+// must be specified.
+//
+// By default:
+// pKeyProvInfo - The CSP is queried for the KeyProvInfo parameters. Only the Provider,
+// Provider Type and Container is queried. Many CSPs don't support these
+// queries and will cause a failure. In such cases the pKeyProvInfo
+// must be specified (RSA BASE works fine).
+//
+// pSignatureAlgorithm - will default to SHA1RSA
+// pStartTime will default to the current time
+// pEndTime will default to 1 year
+// pEntensions will be empty.
+//
+// The returned PCCERT_CONTEXT will reference the private keys by setting the
+// CERT_KEY_PROV_INFO_PROP_ID. However, if this property is not desired specify the
+// CERT_CREATE_SELFSIGN_NO_KEY_INFO in dwFlags.
+//
+// If the cert being built is only a dummy placeholder cert for speed it may not
+// need to be signed. Signing of the cert is skipped if CERT_CREATE_SELFSIGN_NO_SIGN
+// is specified in dwFlags.
+//
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CONTEXT
+WINAPI
+CertCreateSelfSignCertificate(
+    IN          HCRYPTPROV                  hProv,
+    IN          PCERT_NAME_BLOB             pSubjectIssuerBlob,
+    IN          DWORD                       dwFlags,
+    OPTIONAL    PCRYPT_KEY_PROV_INFO        pKeyProvInfo,
+    OPTIONAL    PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
+    OPTIONAL    PSYSTEMTIME                 pStartTime,
+    OPTIONAL    PSYSTEMTIME                 pEndTime,
+    OPTIONAL    PCERT_EXTENSIONS            pExtensions
+    );
+
+#define CERT_CREATE_SELFSIGN_NO_SIGN    1
+#define CERT_CREATE_SELFSIGN_NO_KEY_INFO 2
+
+//+=========================================================================
+//  Key Identifier Property Data Structures and APIs
+//==========================================================================
+
+//+-------------------------------------------------------------------------
+//  Get the property for the specified Key Identifier.
+//
+//  The Key Identifier is the SHA1 hash of the encoded CERT_PUBLIC_KEY_INFO.
+//  The Key Identifier for a certificate can be obtained by getting the
+//  certificate's CERT_KEY_IDENTIFIER_PROP_ID. The
+//  CryptCreateKeyIdentifierFromCSP API can be called to create the Key
+//  Identifier from a CSP Public Key Blob.
+//
+//  A Key Identifier can have the same properties as a certificate context.
+//  CERT_KEY_PROV_INFO_PROP_ID is the property of most interest.
+//  For CERT_KEY_PROV_INFO_PROP_ID, pvData points to a CRYPT_KEY_PROV_INFO
+//  structure. Elements pointed to by fields in the pvData structure follow the
+//  structure. Therefore, *pcbData will exceed the size of the structure.
+//
+//  If CRYPT_KEYID_ALLOC_FLAG is set, then, *pvData is updated with a
+//  pointer to allocated memory. LocalFree() must be called to free the
+//  allocated memory.
+//
+//  By default, searches the CurrentUser's list of Key Identifiers.
+//  CRYPT_KEYID_MACHINE_FLAG can be set to search the LocalMachine's list
+//  of Key Identifiers. When CRYPT_KEYID_MACHINE_FLAG is set, pwszComputerName
+//  can also be set to specify the name of a remote computer to be searched
+//  instead of the local machine.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptGetKeyIdentifierProperty(
+    IN const CRYPT_HASH_BLOB *pKeyIdentifier,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN OPTIONAL LPCWSTR pwszComputerName,
+    IN OPTIONAL void *pvReserved,
+    OUT void *pvData,
+    IN OUT DWORD *pcbData
+    );
+
+// When the following flag is set, searches the LocalMachine instead of the
+// CurrentUser. This flag is applicable to all the KeyIdentifierProperty APIs.
+#define CRYPT_KEYID_MACHINE_FLAG        0x00000020
+
+// When the following flag is set, *pvData is updated with a pointer to
+// allocated memory. LocalFree() must be called to free the allocated memory.
+#define CRYPT_KEYID_ALLOC_FLAG          0x00008000
+
+
+//+-------------------------------------------------------------------------
+//  Set the property for the specified Key Identifier.
+//
+//  For CERT_KEY_PROV_INFO_PROP_ID pvData points to the
+//  CRYPT_KEY_PROV_INFO data structure. For all other properties, pvData
+//  points to a CRYPT_DATA_BLOB.
+//
+//  Setting pvData == NULL, deletes the property.
+//
+//  Set CRYPT_KEYID_MACHINE_FLAG to set the property for a LocalMachine
+//  Key Identifier. Set pwszComputerName, to select a remote computer.
+//
+//  If CRYPT_KEYID_DELETE_FLAG is set, the Key Identifier and all its
+//  properties is deleted.
+//
+//  If CRYPT_KEYID_SET_NEW_FLAG is set, the set fails if the property already
+//  exists. For an existing property, FALSE is returned with LastError set to
+//  CRYPT_E_EXISTS.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptSetKeyIdentifierProperty(
+    IN const CRYPT_HASH_BLOB *pKeyIdentifier,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN OPTIONAL LPCWSTR pwszComputerName,
+    IN OPTIONAL void *pvReserved,
+    IN const void *pvData
+    );
+
+// When the following flag is set, the Key Identifier and all its properties
+// are deleted.
+#define CRYPT_KEYID_DELETE_FLAG         0x00000010
+
+// When the following flag is set, the set fails if the property already
+// exists.
+#define CRYPT_KEYID_SET_NEW_FLAG        0x00002000
+
+
+//+-------------------------------------------------------------------------
+//  For CERT_KEY_PROV_INFO_PROP_ID, rgppvData[] points to a
+//  CRYPT_KEY_PROV_INFO.
+//
+//  Return FALSE to stop the enumeration.
+//--------------------------------------------------------------------------
+typedef BOOL (WINAPI *PFN_CRYPT_ENUM_KEYID_PROP)(
+    IN const CRYPT_HASH_BLOB *pKeyIdentifier,
+    IN DWORD dwFlags,
+    IN void *pvReserved,
+    IN void *pvArg,
+    IN DWORD cProp,
+    IN DWORD *rgdwPropId,
+    IN void **rgpvData,
+    IN DWORD *rgcbData
+    );
+
+//+-------------------------------------------------------------------------
+//  Enumerate the Key Identifiers.
+//
+//  If pKeyIdentifier is NULL, enumerates all Key Identifers. Otherwise,
+//  calls the callback for the specified KeyIdentifier. If dwPropId is
+//  0, calls the callback with all the properties. Otherwise, only calls
+//  the callback with the specified property (cProp = 1).
+//  Furthermore, when dwPropId is specified, skips KeyIdentifiers not
+//  having the property.
+//
+//  Set CRYPT_KEYID_MACHINE_FLAG to enumerate the LocalMachine
+//  Key Identifiers. Set pwszComputerName, to enumerate Key Identifiers on
+//  a remote computer.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptEnumKeyIdentifierProperties(
+    IN OPTIONAL const CRYPT_HASH_BLOB *pKeyIdentifier,
+    IN DWORD dwPropId,
+    IN DWORD dwFlags,
+    IN OPTIONAL LPCWSTR pwszComputerName,
+    IN OPTIONAL void *pvReserved,
+    IN OPTIONAL void *pvArg,
+    IN PFN_CRYPT_ENUM_KEYID_PROP pfnEnum
+    );
+
+//+-------------------------------------------------------------------------
+//  Create a KeyIdentifier from the CSP Public Key Blob.
+//
+//  Converts the CSP PUBLICKEYSTRUC into a X.509 CERT_PUBLIC_KEY_INFO and
+//  encodes. The encoded CERT_PUBLIC_KEY_INFO is SHA1 hashed to obtain
+//  the Key Identifier.
+//
+//  By default, the pPubKeyStruc->aiKeyAlg is used to find the appropriate
+//  public key Object Identifier. pszPubKeyOID can be set to override
+//  the default OID obtained from the aiKeyAlg.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CryptCreateKeyIdentifierFromCSP(
+    IN DWORD dwCertEncodingType,
+    IN OPTIONAL LPCSTR pszPubKeyOID,
+    IN const PUBLICKEYSTRUC *pPubKeyStruc,
+    IN DWORD cbPubKeyStruc,
+    IN DWORD dwFlags,
+    IN OPTIONAL void *pvReserved,
+    OUT BYTE *pbHash,
+    IN OUT DWORD *pcbHash
+    );
+
+
+//+=========================================================================
+//  Certificate Chaining Infrastructure
+//==========================================================================
+
+#define CERT_CHAIN_CONFIG_REGPATH \
+    L"Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CertDllCreateCertificateChainEngine\\Config"
+
+// The following are REG_DWORD's. These configuration parameters are used
+// to restrict Authority Info Access (AIA) URL retrieval.
+
+#define CERT_CHAIN_DISABLE_AIA_URL_RETRIEVAL_VALUE_NAME             \
+    L"DisableAIAUrlRetrieval"
+// By default AIA Url Retrieval is enabled. Set this registry value to nonzero
+// to disable
+
+#define CERT_CHAIN_MAX_AIA_URL_COUNT_IN_CERT_VALUE_NAME             \
+    L"MaxAIAUrlCountInCert"
+#define CERT_CHAIN_MAX_AIA_URL_COUNT_IN_CERT_DEFAULT                5
+
+#define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_COUNT_PER_CHAIN_VALUE_NAME \
+    L"MaxAIAUrlRetrievalCountPerChain"
+#define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_COUNT_PER_CHAIN_DEFAULT    10
+
+#define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_BYTE_COUNT_VALUE_NAME      \
+    L"MaxAIAUrlRetrievalByteCount"
+#define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_BYTE_COUNT_DEFAULT         100000
+
+#define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_CERT_COUNT_VALUE_NAME      \
+    L"MaxAIAUrlRetrievalCertCount"
+#define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_CERT_COUNT_DEFAULT         10
+
+
+//
+// The chain engine defines the store namespace and cache partitioning for
+// the Certificate Chaining infrastructure.  A default chain engine
+// is defined for the process which uses all default system stores e.g.
+// Root, CA, Trust, for chain building and caching.  If an application
+// wishes to define its own store namespace or have its own partitioned
+// cache then it can create its own chain engine.  It is advisable to create
+// a chain engine at application startup and use it throughout the lifetime
+// of the application in order to get optimal caching behavior
+//
+
+typedef HANDLE HCERTCHAINENGINE;
+
+#define HCCE_CURRENT_USER  ((HCERTCHAINENGINE)NULL)
+#define HCCE_LOCAL_MACHINE ((HCERTCHAINENGINE)0x1)
+
+//
+// Create a certificate chain engine.
+//
+
+//
+// Configuration parameters for the certificate chain engine
+//
+//      hRestrictedRoot - restrict the root store (must be a subset of "Root")
+//
+//      hRestrictedTrust - restrict the store for CTLs
+//
+//      hRestrictedOther - restrict the store for certs and CRLs
+//
+//      cAdditionalStore, rghAdditionalStore - additional stores
+//
+//      NOTE: The algorithm used to define the stores for the engine is as
+//            follows:
+//
+//            hRoot = hRestrictedRoot or System Store "Root"
+//
+//            hTrust = hRestrictedTrust or hWorld (defined later)
+//
+//            hOther = hRestrictedOther or (hRestrictedTrust == NULL) ? hWorld :
+//                     hRestrictedTrust + hWorld
+//
+//            hWorld = hRoot + "CA" + "My" + "Trust" + rghAdditionalStore
+//
+//      dwFlags  - flags
+//
+//          CERT_CHAIN_CACHE_END_CERT - information will be cached on
+//                                      the end cert as well as the other
+//                                      certs in the chain
+//
+//          CERT_CHAIN_THREAD_STORE_SYNC - use separate thread for store syncs
+//                                         and related cache updates
+//
+//          CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL - don't hit the wire to get
+//                                                URL based objects
+//
+//      dwUrlRetrievalTimeout - timeout for wire based URL object retrievals
+//                              (milliseconds)
+//
+
+#define CERT_CHAIN_CACHE_END_CERT           0x00000001
+#define CERT_CHAIN_THREAD_STORE_SYNC        0x00000002
+#define CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL 0x00000004
+#define CERT_CHAIN_USE_LOCAL_MACHINE_STORE  0x00000008
+#define CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE 0x00000010
+#define CERT_CHAIN_ENABLE_SHARE_STORE       0x00000020
+
+typedef struct _CERT_CHAIN_ENGINE_CONFIG {
+
+    DWORD       cbSize;
+    HCERTSTORE  hRestrictedRoot;
+    HCERTSTORE  hRestrictedTrust;
+    HCERTSTORE  hRestrictedOther;
+    DWORD       cAdditionalStore;
+    HCERTSTORE* rghAdditionalStore;
+    DWORD       dwFlags;
+    DWORD       dwUrlRetrievalTimeout;      // milliseconds
+    DWORD       MaximumCachedCertificates;
+    DWORD       CycleDetectionModulus;
+
+} CERT_CHAIN_ENGINE_CONFIG, *PCERT_CHAIN_ENGINE_CONFIG;
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertCreateCertificateChainEngine (
+    IN PCERT_CHAIN_ENGINE_CONFIG pConfig,
+    OUT HCERTCHAINENGINE* phChainEngine
+    );
+
+//
+// Free a certificate trust engine
+//
+
+WINCRYPT32API
+VOID
+WINAPI
+CertFreeCertificateChainEngine (
+    IN HCERTCHAINENGINE hChainEngine
+    );
+
+//
+// Resync the certificate chain engine.  This resync's the stores backing
+// the engine and updates the engine caches.
+//
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertResyncCertificateChainEngine (
+    IN HCERTCHAINENGINE hChainEngine
+    );
+
+//
+// When an application requests a certificate chain, the data structure
+// returned is in the form of a CERT_CHAIN_CONTEXT.  This contains
+// an array of CERT_SIMPLE_CHAIN where each simple chain goes from
+// an end cert to a self signed cert and the chain context connects simple
+// chains via trust lists.  Each simple chain contains the chain of
+// certificates, summary trust information about the chain and trust information
+// about each certificate element in the chain.
+//
+
+//
+// Trust status bits
+//
+
+typedef struct _CERT_TRUST_STATUS {
+
+    DWORD dwErrorStatus;
+    DWORD dwInfoStatus;
+
+} CERT_TRUST_STATUS, *PCERT_TRUST_STATUS;
+
+//
+// The following are error status bits
+//
+
+// These can be applied to certificates and chains
+
+#define CERT_TRUST_NO_ERROR                             0x00000000
+#define CERT_TRUST_IS_NOT_TIME_VALID                    0x00000001
+#define CERT_TRUST_IS_NOT_TIME_NESTED                   0x00000002
+#define CERT_TRUST_IS_REVOKED                           0x00000004
+#define CERT_TRUST_IS_NOT_SIGNATURE_VALID               0x00000008
+#define CERT_TRUST_IS_NOT_VALID_FOR_USAGE               0x00000010
+#define CERT_TRUST_IS_UNTRUSTED_ROOT                    0x00000020
+#define CERT_TRUST_REVOCATION_STATUS_UNKNOWN            0x00000040
+#define CERT_TRUST_IS_CYCLIC                            0x00000080
+
+#define CERT_TRUST_INVALID_EXTENSION                    0x00000100
+#define CERT_TRUST_INVALID_POLICY_CONSTRAINTS           0x00000200
+#define CERT_TRUST_INVALID_BASIC_CONSTRAINTS            0x00000400
+#define CERT_TRUST_INVALID_NAME_CONSTRAINTS             0x00000800
+#define CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT    0x00001000
+#define CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT      0x00002000
+#define CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT    0x00004000
+#define CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT         0x00008000
+
+#define CERT_TRUST_IS_OFFLINE_REVOCATION                0x01000000
+#define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY             0x02000000
+
+
+// These can be applied to chains only
+
+#define CERT_TRUST_IS_PARTIAL_CHAIN                     0x00010000
+#define CERT_TRUST_CTL_IS_NOT_TIME_VALID                0x00020000
+#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID           0x00040000
+#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE           0x00080000
+
+//
+// The following are info status bits
+//
+
+// These can be applied to certificates only
+
+#define CERT_TRUST_HAS_EXACT_MATCH_ISSUER               0x00000001
+#define CERT_TRUST_HAS_KEY_MATCH_ISSUER                 0x00000002
+#define CERT_TRUST_HAS_NAME_MATCH_ISSUER                0x00000004
+#define CERT_TRUST_IS_SELF_SIGNED                       0x00000008
+
+// These can be applied to certificates and chains
+
+#define CERT_TRUST_HAS_PREFERRED_ISSUER                 0x00000100
+#define CERT_TRUST_HAS_ISSUANCE_CHAIN_POLICY            0x00000200
+#define CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS           0x00000400
+
+// These can be applied to chains only
+
+#define CERT_TRUST_IS_COMPLEX_CHAIN                     0x00010000
+
+
+
+
+//
+// Each certificate context in a simple chain has a corresponding chain element
+// in the simple chain context
+//
+// dwErrorStatus has CERT_TRUST_IS_REVOKED, pRevocationInfo set
+// dwErrorStatus has CERT_TRUST_REVOCATION_STATUS_UNKNOWN, pRevocationInfo set
+
+//
+//         Note that the post processing revocation supported in the first
+//         version only sets cbSize and dwRevocationResult.  Everything else
+//         is NULL
+//
+
+//
+// Revocation Information
+//
+
+typedef struct _CERT_REVOCATION_INFO {
+
+    DWORD                       cbSize;
+    DWORD                       dwRevocationResult;
+    LPCSTR                      pszRevocationOid;
+    LPVOID                      pvOidSpecificInfo;
+
+    // fHasFreshnessTime is only set if we are able to retrieve revocation
+    // information. For a CRL its CurrentTime - ThisUpdate.
+    BOOL                        fHasFreshnessTime;
+    DWORD                       dwFreshnessTime;    // seconds
+
+    // NonNULL for CRL base revocation checking
+    PCERT_REVOCATION_CRL_INFO   pCrlInfo;
+
+} CERT_REVOCATION_INFO, *PCERT_REVOCATION_INFO;
+
+//
+// Trust List Information
+//
+
+typedef struct _CERT_TRUST_LIST_INFO {
+
+    DWORD         cbSize;
+    PCTL_ENTRY    pCtlEntry;
+    PCCTL_CONTEXT pCtlContext;
+
+} CERT_TRUST_LIST_INFO, *PCERT_TRUST_LIST_INFO;
+
+//
+// Chain Element
+//
+
+typedef struct _CERT_CHAIN_ELEMENT {
+
+    DWORD                 cbSize;
+    PCCERT_CONTEXT        pCertContext;
+    CERT_TRUST_STATUS     TrustStatus;
+    PCERT_REVOCATION_INFO pRevocationInfo;
+
+    PCERT_ENHKEY_USAGE    pIssuanceUsage;       // If NULL, any
+    PCERT_ENHKEY_USAGE    pApplicationUsage;    // If NULL, any
+
+    LPCWSTR               pwszExtendedErrorInfo;    // If NULL, none
+
+} CERT_CHAIN_ELEMENT, *PCERT_CHAIN_ELEMENT;
+
+//
+// The simple chain is an array of chain elements and a summary trust status
+// for the chain
+//
+// rgpElements[0] is the end certificate chain element
+//
+// rgpElements[cElement-1] is the self-signed "root" certificate chain element
+//
+
+typedef struct _CERT_SIMPLE_CHAIN {
+
+    DWORD                 cbSize;
+    CERT_TRUST_STATUS     TrustStatus;
+    DWORD                 cElement;
+    PCERT_CHAIN_ELEMENT*  rgpElement;
+    PCERT_TRUST_LIST_INFO pTrustListInfo;
+
+    // fHasRevocationFreshnessTime is only set if we are able to retrieve
+    // revocation information for all elements checked for revocation.
+    // For a CRL its CurrentTime - ThisUpdate.
+    //
+    // dwRevocationFreshnessTime is the largest time across all elements
+    // checked.
+    BOOL                   fHasRevocationFreshnessTime;
+    DWORD                  dwRevocationFreshnessTime;    // seconds
+
+} CERT_SIMPLE_CHAIN, *PCERT_SIMPLE_CHAIN;
+
+//
+// And the chain context contains an array of simple chains and summary trust
+// status for all the connected simple chains
+//
+// rgpChains[0] is the end certificate simple chain
+//
+// rgpChains[cChain-1] is the final (possibly trust list signer) chain which
+// ends in a certificate which is contained in the root store
+//
+
+typedef struct _CERT_CHAIN_CONTEXT CERT_CHAIN_CONTEXT, *PCERT_CHAIN_CONTEXT;
+typedef const CERT_CHAIN_CONTEXT *PCCERT_CHAIN_CONTEXT;
+
+struct _CERT_CHAIN_CONTEXT {
+    DWORD                   cbSize;
+    CERT_TRUST_STATUS       TrustStatus;
+    DWORD                   cChain;
+    PCERT_SIMPLE_CHAIN*     rgpChain;
+
+    // Following is returned when CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS
+    // is set in dwFlags
+    DWORD                   cLowerQualityChainContext;
+    PCCERT_CHAIN_CONTEXT*   rgpLowerQualityChainContext;
+
+    // fHasRevocationFreshnessTime is only set if we are able to retrieve
+    // revocation information for all elements checked for revocation.
+    // For a CRL its CurrentTime - ThisUpdate.
+    //
+    // dwRevocationFreshnessTime is the largest time across all elements
+    // checked.
+    BOOL                    fHasRevocationFreshnessTime;
+    DWORD                   dwRevocationFreshnessTime;    // seconds
+};
+
+
+//
+// When building a chain, the there are various parameters used for finding
+// issuing certificates and trust lists.  They are identified in the
+// following structure
+//
+
+// Default usage match type is AND with value zero
+#define USAGE_MATCH_TYPE_AND 0x00000000
+#define USAGE_MATCH_TYPE_OR  0x00000001
+
+typedef struct _CERT_USAGE_MATCH {
+
+    DWORD             dwType;
+    CERT_ENHKEY_USAGE Usage;
+
+} CERT_USAGE_MATCH, *PCERT_USAGE_MATCH;
+
+typedef struct _CTL_USAGE_MATCH {
+
+    DWORD     dwType;
+    CTL_USAGE Usage;
+
+} CTL_USAGE_MATCH, *PCTL_USAGE_MATCH;
+
+typedef struct _CERT_CHAIN_PARA {
+
+    DWORD            cbSize;
+    CERT_USAGE_MATCH RequestedUsage;
+
+#ifdef CERT_CHAIN_PARA_HAS_EXTRA_FIELDS
+
+    // Note, if you #define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS, then, you
+    // must zero all unused fields in this data structure.
+    // More fields could be added in a future release.
+
+    CERT_USAGE_MATCH RequestedIssuancePolicy;
+    DWORD            dwUrlRetrievalTimeout;     // milliseconds
+    BOOL             fCheckRevocationFreshnessTime;
+    DWORD            dwRevocationFreshnessTime; // seconds
+
+#endif
+
+} CERT_CHAIN_PARA, *PCERT_CHAIN_PARA;
+
+//
+// The following API is used for retrieving certificate chains
+//
+// Parameters:
+//
+//      hChainEngine     - the chain engine (namespace and cache) to use, NULL
+//                         mean use the default chain engine
+//
+//      pCertContext     - the context we are retrieving the chain for, it
+//                         will be the zero index element in the chain
+//
+//      pTime            - the point in time that we want the chain validated
+//                         for.  Note that the time does not affect trust list,
+//                         revocation, or root store checking.  NULL means use
+//                         the current system time
+//
+//      hAdditionalStore - additional store to use when looking up objects
+//
+//      pChainPara       - parameters for chain building
+//
+//      dwFlags          - flags such as should revocation checking be done
+//                         on the chain?
+//
+//      pvReserved       - reserved parameter, must be NULL
+//
+//      ppChainContext   - chain context returned
+//
+
+// CERT_CHAIN_CACHE_END_CERT can be used here as well
+// Revocation flags are in the high nibble
+#define CERT_CHAIN_REVOCATION_CHECK_END_CERT           0x10000000
+#define CERT_CHAIN_REVOCATION_CHECK_CHAIN              0x20000000
+#define CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 0x40000000
+#define CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY         0x80000000
+
+// By default, the dwUrlRetrievalTimeout in pChainPara is the timeout used
+// for each revocation URL wire retrieval. When the following flag is set,
+// dwUrlRetrievalTimeout is the accumulative timeout across all
+// revocation URL wire retrievals.
+#define CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT     0x08000000
+
+
+// First pass determines highest quality based upon:
+//  - Chain signature valid (higest quality bit of this set)
+//  - Complete chain
+//  - Trusted root          (lowestest quality bit of this set)
+// By default, second pass only considers paths >= highest first pass quality
+#define CERT_CHAIN_DISABLE_PASS1_QUALITY_FILTERING  0x00000040
+
+#define CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS    0x00000080
+
+#define CERT_CHAIN_DISABLE_AUTH_ROOT_AUTO_UPDATE    0x00000100
+
+
+// When this flag is set, pTime will be used as the timestamp time.
+// pTime will be used to determine if the end certificate was valid at this
+// time. Revocation checking will be relative to pTime.
+// In addition, current time will also be used
+// to determine if the certificate is still time valid. All remaining
+// CA and root certificates will be checked using current time and not pTime.
+//
+// This flag was added 4/5/01 in WXP.
+#define CERT_CHAIN_TIMESTAMP_TIME                   0x00000200
+
+WINCRYPT32API
+BOOL
+WINAPI
+CertGetCertificateChain (
+    IN OPTIONAL HCERTCHAINENGINE hChainEngine,
+    IN PCCERT_CONTEXT pCertContext,
+    IN OPTIONAL LPFILETIME pTime,
+    IN OPTIONAL HCERTSTORE hAdditionalStore,
+    IN PCERT_CHAIN_PARA pChainPara,
+    IN DWORD dwFlags,
+    IN LPVOID pvReserved,
+    OUT PCCERT_CHAIN_CONTEXT* ppChainContext
+    );
+
+//
+// Free a certificate chain
+//
+
+WINCRYPT32API
+VOID
+WINAPI
+CertFreeCertificateChain (
+    IN PCCERT_CHAIN_CONTEXT pChainContext
+    );
+
+//
+// Duplicate (add a reference to) a certificate chain
+//
+
+WINCRYPT32API
+PCCERT_CHAIN_CONTEXT
+WINAPI
+CertDuplicateCertificateChain (
+    IN PCCERT_CHAIN_CONTEXT pChainContext
+    );
+
+//
+// Specific Revocation Type OID and structure definitions
+//
+
+//
+// CRL Revocation OID
+//
+
+#define REVOCATION_OID_CRL_REVOCATION ((LPCSTR)1)
+
+//
+// For the CRL revocation OID the pvRevocationPara is NULL
+//
+
+//
+// CRL Revocation Info
+//
+
+typedef struct _CRL_REVOCATION_INFO {
+
+    PCRL_ENTRY           pCrlEntry;
+    PCCRL_CONTEXT        pCrlContext;
+    PCCERT_CHAIN_CONTEXT pCrlIssuerChain;
+
+} CRL_REVOCATION_INFO, *PCRL_REVOCATION_INFO;
+
+//+-------------------------------------------------------------------------
+//  Find the first or next certificate chain context in the store.
+//
+//  The chain context is found according to the dwFindFlags, dwFindType and
+//  its pvFindPara. See below for a list of the find types and its parameters.
+//
+//  If the first or next chain context isn't found, NULL is returned.
+//  Otherwise, a pointer to a read only CERT_CHAIN_CONTEXT is returned.
+//  CERT_CHAIN_CONTEXT must be freed by calling CertFreeCertificateChain
+//  or is freed when passed as the
+//  pPrevChainContext on a subsequent call. CertDuplicateCertificateChain
+//  can be called to make a duplicate.
+//
+//  pPrevChainContext MUST BE NULL on the first
+//  call to find the chain context. To find the next chain context, the
+//  pPrevChainContext is set to the CERT_CHAIN_CONTEXT returned by a previous
+//  call.
+//
+//  NOTE: a NON-NULL pPrevChainContext is always CertFreeCertificateChain'ed by
+//  this function, even for an error.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+PCCERT_CHAIN_CONTEXT
+WINAPI
+CertFindChainInStore(
+    IN HCERTSTORE hCertStore,
+    IN DWORD dwCertEncodingType,
+    IN DWORD dwFindFlags,
+    IN DWORD dwFindType,
+    IN const void *pvFindPara,
+    IN PCCERT_CHAIN_CONTEXT pPrevChainContext
+    );
+
+#define CERT_CHAIN_FIND_BY_ISSUER       1
+
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_FIND_BY_ISSUER
+//
+//  Find a certificate chain having a private key for the end certificate and
+//  matching one of the given issuer names. A matching dwKeySpec and
+//  enhanced key usage can also be specified. Additionally a callback can
+//  be provided for even more caller provided filtering before building the
+//  chain.
+//
+//  By default, only the issuers in the first simple chain are compared
+//  for a name match. CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG can
+//  be set in dwFindFlags to match issuers in all the simple chains.
+//
+//  CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG can be set in dwFindFlags to
+//  not check if the end certificate has a private key.
+//
+//  CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG can be set in dwFindFlags
+//  to compare the public key in the end certificate with the crypto
+//  provider's public key. The dwAcquirePrivateKeyFlags can be set
+//  in CERT_CHAIN_FIND_BY_ISSUER_PARA to enable caching of the private key's
+//  HKEY returned by the CSP.
+//
+//  If dwCertEncodingType == 0, defaults to X509_ASN_ENCODING for the
+//  array of encoded issuer names.
+//
+//  By default, the hCertStore passed to CertFindChainInStore, is passed
+//  as an additional store to CertGetCertificateChain.
+//  CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG can be set in dwFindFlags
+//  to improve performance by only searching the cached system stores
+//  (root, my, ca, trust) to find the issuer certificates. If you are doing
+//  a find in the "my" system store, than, this flag should be set to
+//  improve performance.
+//
+//  Setting CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG in dwFindFlags
+//  restricts CertGetCertificateChain to search the Local Machine
+//  cached system stores instead of the Current User's.
+//
+//  Setting CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG in dwFindFlags
+//  restricts CertGetCertificateChain to only search the URL cache
+//  and not hit the wire.
+//--------------------------------------------------------------------------
+
+// Returns FALSE to skip this certificate. Otherwise, returns TRUE to
+// build a chain for this certificate.
+typedef BOOL (WINAPI *PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK)(
+    IN PCCERT_CONTEXT pCert,
+    IN void *pvFindArg
+    );
+
+typedef struct _CERT_CHAIN_FIND_BY_ISSUER_PARA {
+    DWORD                                   cbSize;
+
+    // If pszUsageIdentifier == NULL, matches any usage.
+    LPCSTR                                  pszUsageIdentifier;
+
+    // If dwKeySpec == 0, matches any KeySpec
+    DWORD                                   dwKeySpec;
+
+    // When CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG is set in dwFindFlags,
+    // CryptAcquireCertificatePrivateKey is called to do the public key
+    // comparison. The following flags can be set to enable caching
+    // of the acquired private key or suppress CSP UI. See the API for more
+    // details on these flags.
+    DWORD                                   dwAcquirePrivateKeyFlags;
+
+    // Pointer to an array of X509, ASN.1 encoded issuer name blobs. If
+    // cIssuer == 0, matches any issuer
+    DWORD                                   cIssuer;
+    CERT_NAME_BLOB                          *rgIssuer;
+
+    // If NULL or Callback returns TRUE, builds the chain for the end
+    // certificate having a private key with the specified KeySpec and
+    // enhanced key usage.
+    PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK pfnFindCallback;
+    void                                    *pvFindArg;
+
+#ifdef CERT_CHAIN_FIND_BY_ISSUER_PARA_HAS_EXTRA_FIELDS
+    // Note, if you #define CERT_CHAIN_FIND_BY_ISSUER_PARA_HAS_EXTRA_FIELDS,
+    // then, you must zero all unused fields in this data structure.
+    // More fields could be added in a future release.
+
+    // If the following pointers are nonNull, returns the index of the
+    // matching issuer certificate, which is at:
+    // pChainContext->
+    //      rgpChain[*pdwIssuerChainIndex]->rgpElement[*pdwIssuerElementIndex].
+    //
+    // The issuer name blob is compared against the Issuer field in the
+    // certificate. The *pdwIssuerElementIndex is set to the index of this
+    // subject certificate + 1. Therefore, its possible for a partial chain or
+    // a self signed certificate matching the name blob, where
+    // *pdwIssuerElementIndex points past the last certificate in the chain.
+    //
+    // Note, not updated if the above cIssuer == 0.
+    DWORD                                   *pdwIssuerChainIndex;
+    DWORD                                   *pdwIssuerElementIndex;
+#endif
+} CERT_CHAIN_FIND_ISSUER_PARA, *PCERT_CHAIN_FIND_ISSUER_PARA,
+    CERT_CHAIN_FIND_BY_ISSUER_PARA, *PCERT_CHAIN_FIND_BY_ISSUER_PARA;
+
+// The following dwFindFlags can be set for CERT_CHAIN_FIND_BY_ISSUER
+
+// If set, compares the public key in the end certificate with the crypto
+// provider's public key. This comparison is the last check made on the
+// build chain.
+#define CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG          0x0001
+
+// If not set, only checks the first simple chain for an issuer name match.
+// When set, also checks second and subsequent simple chains.
+#define CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG        0x0002
+
+// If set, CertGetCertificateChain only searches the URL cache and
+// doesn't hit the wire.
+#define CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG       0x0004
+
+// If set, CertGetCertificateChain only opens the Local Machine
+// certificate stores instead of the Current User's.
+#define CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG        0x0008
+
+// If set, no check is made to see if the end certificate has a private
+// key associated with it.
+#define CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG               0x4000
+
+
+// By default, the hCertStore passed to CertFindChainInStore, is passed
+// as the additional store to CertGetCertificateChain. This flag can be
+// set to improve performance by only searching the cached system stores
+// (root, my, ca, trust) to find the issuer certificates. If not set, then,
+// the hCertStore is always searched in addition to the cached system
+// stores.
+#define CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG           0x8000
+
+
+
+//+=========================================================================
+//  Certificate Chain Policy Data Structures and APIs
+//==========================================================================
+typedef struct _CERT_CHAIN_POLICY_PARA {
+    DWORD                   cbSize;
+    DWORD                   dwFlags;
+    void                    *pvExtraPolicyPara;     // pszPolicyOID specific
+} CERT_CHAIN_POLICY_PARA, *PCERT_CHAIN_POLICY_PARA;
+
+// If both lChainIndex and lElementIndex are set to -1, the dwError applies
+// to the whole chain context. If only lElementIndex is set to -1, the
+// dwError applies to the lChainIndex'ed chain. Otherwise, the dwError applies
+// to the certificate element at
+// pChainContext->rgpChain[lChainIndex]->rgpElement[lElementIndex].
+typedef struct _CERT_CHAIN_POLICY_STATUS {
+    DWORD                   cbSize;
+    DWORD                   dwError;
+    LONG                    lChainIndex;
+    LONG                    lElementIndex;
+    void                    *pvExtraPolicyStatus;   // pszPolicyOID specific
+} CERT_CHAIN_POLICY_STATUS, *PCERT_CHAIN_POLICY_STATUS;
+
+// Common chain policy flags
+#define CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG                0x00000001
+#define CERT_CHAIN_POLICY_IGNORE_CTL_NOT_TIME_VALID_FLAG            0x00000002
+#define CERT_CHAIN_POLICY_IGNORE_NOT_TIME_NESTED_FLAG               0x00000004
+#define CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG     0x00000008
+
+#define CERT_CHAIN_POLICY_IGNORE_ALL_NOT_TIME_VALID_FLAGS ( \
+    CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG                | \
+    CERT_CHAIN_POLICY_IGNORE_CTL_NOT_TIME_VALID_FLAG            | \
+    CERT_CHAIN_POLICY_IGNORE_NOT_TIME_NESTED_FLAG                 \
+    )
+
+
+#define CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG                     0x00000010
+#define CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG                   0x00000020
+#define CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG                  0x00000040
+#define CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG                0x00000080
+
+#define CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG               0x00000100
+#define CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG        0x00000200
+#define CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG                0x00000400
+#define CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG              0x00000800
+
+#define CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS ( \
+    CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG         | \
+    CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG  | \
+    CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG          | \
+    CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG          \
+    )
+
+#define CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG                       0x00008000
+#define CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG                       0x00004000
+
+
+//+-------------------------------------------------------------------------
+//  Verify that the certificate chain satisfies the specified policy
+//  requirements. If we were able to verify the chain policy, TRUE is returned
+//  and the dwError field of the pPolicyStatus is updated. A dwError of 0
+//  (ERROR_SUCCESS, S_OK) indicates the chain satisfies the specified policy.
+//
+//  If dwError applies to the entire chain context, both lChainIndex and
+//  lElementIndex are set to -1. If dwError applies to a simple chain,
+//  lElementIndex is set to -1 and lChainIndex is set to the index of the
+//  first offending chain having the error. If dwError applies to a
+//  certificate element, lChainIndex and lElementIndex are updated to
+//  index the first offending certificate having the error, where, the
+//  the certificate element is at:
+//      pChainContext->rgpChain[lChainIndex]->rgpElement[lElementIndex].
+//
+//  The dwFlags in pPolicyPara can be set to change the default policy checking
+//  behaviour. In addition, policy specific parameters can be passed in
+//  the pvExtraPolicyPara field of pPolicyPara.
+//
+//  In addition to returning dwError, in pPolicyStatus, policy OID specific
+//  extra status may be returned via pvExtraPolicyStatus.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+CertVerifyCertificateChainPolicy(
+    IN LPCSTR pszPolicyOID,
+    IN PCCERT_CHAIN_CONTEXT pChainContext,
+    IN PCERT_CHAIN_POLICY_PARA pPolicyPara,
+    IN OUT PCERT_CHAIN_POLICY_STATUS pPolicyStatus
+    );
+
+// Predefined OID Function Names
+#define CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC  \
+    "CertDllVerifyCertificateChainPolicy"
+
+// CertDllVerifyCertificateChainPolicy has same function signature as
+// CertVerifyCertificateChainPolicy.
+
+//+-------------------------------------------------------------------------
+//  Predefined verify chain policies
+//--------------------------------------------------------------------------
+#define CERT_CHAIN_POLICY_BASE              ((LPCSTR) 1)
+#define CERT_CHAIN_POLICY_AUTHENTICODE      ((LPCSTR) 2)
+#define CERT_CHAIN_POLICY_AUTHENTICODE_TS   ((LPCSTR) 3)
+#define CERT_CHAIN_POLICY_SSL               ((LPCSTR) 4)
+#define CERT_CHAIN_POLICY_BASIC_CONSTRAINTS ((LPCSTR) 5)
+#define CERT_CHAIN_POLICY_NT_AUTH           ((LPCSTR) 6)
+#define CERT_CHAIN_POLICY_MICROSOFT_ROOT    ((LPCSTR) 7)
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_BASE
+//
+//  Implements the base chain policy verification checks. dwFlags can
+//  be set in pPolicyPara to alter the default policy checking behaviour.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_AUTHENTICODE
+//
+//  Implements the Authenticode chain policy verification checks.
+//
+//  pvExtraPolicyPara may optionally be set to point to the following
+//  AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA.
+//
+//  pvExtraPolicyStatus may optionally be set to point to the following
+//  AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS.
+//--------------------------------------------------------------------------
+
+// dwRegPolicySettings are defined in wintrust.h
+typedef struct _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA {
+    DWORD               cbSize;
+    DWORD               dwRegPolicySettings;
+    PCMSG_SIGNER_INFO   pSignerInfo;                // optional
+} AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA,
+    *PAUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA;
+
+typedef struct _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS {
+    DWORD               cbSize;
+    BOOL                fCommercial;        // obtained from signer statement
+} AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS,
+    *PAUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS;
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_AUTHENTICODE_TS
+//
+//  Implements the Authenticode Time Stamp chain policy verification checks.
+//
+//  pvExtraPolicyPara may optionally be set to point to the following
+//  AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA.
+//
+//  pvExtraPolicyStatus isn't used and must be set to NULL.
+//--------------------------------------------------------------------------
+
+// dwRegPolicySettings are defined in wintrust.h
+typedef struct _AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA {
+    DWORD               cbSize;
+    DWORD               dwRegPolicySettings;
+    BOOL                fCommercial;
+} AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA,
+    *PAUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA;
+
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_SSL
+//
+//  Implements the SSL client/server chain policy verification checks.
+//
+//  pvExtraPolicyPara may optionally be set to point to the following
+//  SSL_EXTRA_CERT_CHAIN_POLICY_PARA data structure
+//--------------------------------------------------------------------------
+
+// fdwChecks flags are defined in wininet.h
+typedef struct _HTTPSPolicyCallbackData
+{
+    union {
+        DWORD           cbStruct;       // sizeof(HTTPSPolicyCallbackData);
+        DWORD           cbSize;         // sizeof(HTTPSPolicyCallbackData);
+    };
+
+    DWORD           dwAuthType;
+#                       define      AUTHTYPE_CLIENT         1
+#                       define      AUTHTYPE_SERVER         2
+
+    DWORD           fdwChecks;
+
+    WCHAR           *pwszServerName; // used to check against CN=xxxx
+
+} HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData,
+    SSL_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_EXTRA_CERT_CHAIN_POLICY_PARA;
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_BASIC_CONSTRAINTS
+//
+//  Implements the basic constraints chain policy.
+//
+//  Iterates through all the certificates in the chain checking for either
+//  a szOID_BASIC_CONSTRAINTS or a szOID_BASIC_CONSTRAINTS2 extension. If
+//  neither extension is present, the certificate is assumed to have
+//  valid policy. Otherwise, for the first certificate element, checks if
+//  it matches the expected CA_FLAG or END_ENTITY_FLAG specified in
+//  pPolicyPara->dwFlags. If neither or both flags are set, then, the first
+//  element can be either a CA or END_ENTITY. All other elements must be
+//  a CA. If the PathLenConstraint is present in the extension, its
+//  checked.
+//
+//  The first elements in the remaining simple chains (ie, the certificate
+//  used to sign the CTL) are checked to be an END_ENTITY.
+//
+//  If this verification fails, dwError will be set to
+//  TRUST_E_BASIC_CONSTRAINTS.
+//--------------------------------------------------------------------------
+
+#define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_CA_FLAG         0x80000000
+#define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_END_ENTITY_FLAG 0x40000000
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_NT_AUTH
+//
+//  Implements the NT Authentication chain policy.
+//
+//  The NT Authentication chain policy consists of 3 distinct chain
+//  verifications in the following order:
+//      [1] CERT_CHAIN_POLICY_BASE - Implements the base chain policy
+//          verification checks. The LOWORD of dwFlags can be set in
+//          pPolicyPara to alter the default policy checking behaviour. See
+//          CERT_CHAIN_POLICY_BASE for more details.
+//
+//      [2] CERT_CHAIN_POLICY_BASIC_CONSTRAINTS - Implements the basic
+//          constraints chain policy. The HIWORD of dwFlags can be set
+//          to specify if the first element must be either a CA or END_ENTITY.
+//          See CERT_CHAIN_POLICY_BASIC_CONSTRAINTS for more details.
+//
+//      [3] Checks if the second element in the chain, the CA that issued
+//          the end certificate, is a trusted CA for NT
+//          Authentication. A CA is considered to be trusted if it exists in
+//          the "NTAuth" system registry store found in the
+//          CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE store location.
+//          If this verification fails, whereby the CA isn't trusted,
+//          dwError is set to CERT_E_UNTRUSTEDCA.
+//
+//          If CERT_PROT_ROOT_DISABLE_NT_AUTH_REQUIRED_FLAG is set
+//          in the "Flags" value of the HKLM policy "ProtectedRoots" subkey
+//          defined by CERT_PROT_ROOT_FLAGS_REGPATH, then,
+//          if the above check fails, checks if the chain
+//          has CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS set in dwInfoStatus. This
+//          will only be set if there was a valid name constraint for all
+//          name spaces including UPN. If the chain doesn't have this info
+//          status set, dwError is set to CERT_E_UNTRUSTEDCA.
+//--------------------------------------------------------------------------
+
+//+-------------------------------------------------------------------------
+//  CERT_CHAIN_POLICY_MICROSOFT_ROOT
+//
+//  Checks if the last element of the first simple chain contains a
+//  Microsoft root public key. If it doesn't contain a Microsoft root
+//  public key, dwError is set to CERT_E_UNTRUSTEDROOT.
+//
+//  pPolicyPara is optional. However,
+//  MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG can be set in
+//  the dwFlags in pPolicyPara to also check for the Microsoft Test Roots.
+//
+//  pvExtraPolicyPara and pvExtraPolicyStatus aren't used and must be set
+//  to NULL.
+//--------------------------------------------------------------------------
+#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG 0x00010000
+
+
+
+//+-------------------------------------------------------------------------
+// convert formatted string to binary
+// If cchString is 0, then pszString is NULL terminated and
+// cchString is obtained via strlen() + 1.
+// dwFlags defines string format
+// if pbBinary is NULL, *pcbBinary returns the size of required memory
+// *pdwSkip returns the character count of skipped strings, optional
+// *pdwFlags returns the actual format used in the conversion, optional
+//--------------------------------------------------------------------------
+WINCRYPT32STRINGAPI
+BOOL
+WINAPI
+CryptStringToBinaryA(
+    IN     LPCSTR  pszString,
+    IN     DWORD     cchString,
+    IN     DWORD     dwFlags,
+    IN     BYTE     *pbBinary,
+    IN OUT DWORD    *pcbBinary,
+    OUT    DWORD    *pdwSkip,    //OPTIONAL
+    OUT    DWORD    *pdwFlags    //OPTIONAL
+    );
+//+-------------------------------------------------------------------------
+// convert formatted string to binary
+// If cchString is 0, then pszString is NULL terminated and
+// cchString is obtained via strlen() + 1.
+// dwFlags defines string format
+// if pbBinary is NULL, *pcbBinary returns the size of required memory
+// *pdwSkip returns the character count of skipped strings, optional
+// *pdwFlags returns the actual format used in the conversion, optional
+//--------------------------------------------------------------------------
+WINCRYPT32STRINGAPI
+BOOL
+WINAPI
+CryptStringToBinaryW(
+    IN     LPCWSTR  pszString,
+    IN     DWORD     cchString,
+    IN     DWORD     dwFlags,
+    IN     BYTE     *pbBinary,
+    IN OUT DWORD    *pcbBinary,
+    OUT    DWORD    *pdwSkip,    //OPTIONAL
+    OUT    DWORD    *pdwFlags    //OPTIONAL
+    );
+#ifdef UNICODE
+#define CryptStringToBinary  CryptStringToBinaryW
+#else
+#define CryptStringToBinary  CryptStringToBinaryA
+#endif // !UNICODE
+
+//+-------------------------------------------------------------------------
+// convert binary to formatted string
+// dwFlags defines string format
+// if pszString is NULL, *pcchString returns size in characters
+// including null-terminator
+//--------------------------------------------------------------------------
+WINCRYPT32STRINGAPI
+BOOL
+WINAPI
+CryptBinaryToStringA(
+    IN     CONST BYTE  *pbBinary,
+    IN     DWORD        cbBinary,
+    IN     DWORD        dwFlags,
+    IN     LPSTR      pszString,
+    IN OUT DWORD       *pcchString
+    );
+//+-------------------------------------------------------------------------
+// convert binary to formatted string
+// dwFlags defines string format
+// if pszString is NULL, *pcchString returns size in characters
+// including null-terminator
+//--------------------------------------------------------------------------
+WINCRYPT32STRINGAPI
+BOOL
+WINAPI
+CryptBinaryToStringW(
+    IN     CONST BYTE  *pbBinary,
+    IN     DWORD        cbBinary,
+    IN     DWORD        dwFlags,
+    IN     LPWSTR      pszString,
+    IN OUT DWORD       *pcchString
+    );
+#ifdef UNICODE
+#define CryptBinaryToString  CryptBinaryToStringW
+#else
+#define CryptBinaryToString  CryptBinaryToStringA
+#endif // !UNICODE
+
+// dwFlags has the following defines
+#define CRYPT_STRING_BASE64HEADER           0x00000000
+#define CRYPT_STRING_BASE64                 0x00000001
+#define CRYPT_STRING_BINARY                 0x00000002
+#define CRYPT_STRING_BASE64REQUESTHEADER    0x00000003
+#define CRYPT_STRING_HEX                    0x00000004
+#define CRYPT_STRING_HEXASCII               0x00000005
+#define CRYPT_STRING_BASE64_ANY             0x00000006
+#define CRYPT_STRING_ANY                    0x00000007
+#define CRYPT_STRING_HEX_ANY                0x00000008
+#define CRYPT_STRING_BASE64X509CRLHEADER    0x00000009
+#define CRYPT_STRING_HEXADDR                0x0000000a
+#define CRYPT_STRING_HEXASCIIADDR           0x0000000b
+
+#define CRYPT_STRING_NOCR                   0x80000000
+
+// CryptBinaryToString uses the following flags
+// CRYPT_STRING_BASE64HEADER - base64 format with certificate begin
+//                             and end headers
+// CRYPT_STRING_BASE64 - only base64 without headers
+// CRYPT_STRING_BINARY - pure binary copy
+// CRYPT_STRING_BASE64REQUESTHEADER - base64 format with request begin
+//                                    and end headers
+// CRYPT_STRING_BASE64X509CRLHEADER - base64 format with x509 crl begin
+//                                    and end headers
+// CRYPT_STRING_HEX - only hex format
+// CRYPT_STRING_HEXASCII - hex format with ascii char display
+// CRYPT_STRING_HEXADDR - hex format with address display
+// CRYPT_STRING_HEXASCIIADDR - hex format with ascii char and address display
+//
+// CryptBinaryToString accepts CRYPT_STRING_NOCR or'd into one of the above.
+// When set, line breaks contain only LF, instead of CR-LF pairs.
+
+// CryptStringToBinary uses the following flags
+// CRYPT_STRING_BASE64_ANY tries the following, in order:
+//    CRYPT_STRING_BASE64HEADER
+//    CRYPT_STRING_BASE64
+// CRYPT_STRING_ANY tries the following, in order:
+//    CRYPT_STRING_BASE64_ANY
+//    CRYPT_STRING_BINARY -- should always succeed
+// CRYPT_STRING_HEX_ANY tries the following, in order:
+//    CRYPT_STRING_HEXADDR
+//    CRYPT_STRING_HEXASCIIADDR
+//    CRYPT_STRING_HEXASCII
+//    CRYPT_STRING_HEX
+
+
+//+=========================================================================
+//  PFX (PKCS #12) function defintions and types
+//==========================================================================
+
+
+//+-------------------------------------------------------------------------
+//      PFXImportCertStore
+//
+//  Import the PFX blob and return a store containing certificates
+//
+//  If the password parameter is incorrect or any other problems decoding
+//  the PFX blob are encountered, the function will return NULL and the
+//      error code can be found from GetLastError(). 
+//
+//  The dwFlags parameter may be set to the following:
+//  CRYPT_EXPORTABLE - specify that any imported keys should be marked as 
+//                     exportable (see documentation on CryptImportKey)
+//  CRYPT_USER_PROTECTED - (see documentation on CryptImportKey)
+//  CRYPT_MACHINE_KEYSET - used to force the private key to be stored in the
+//                        the local machine and not the current user.
+//  CRYPT_USER_KEYSET - used to force the private key to be stored in the
+//                      the current user and not the local machine, even if
+//                      the pfx blob specifies that it should go into local
+//                      machine.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+HCERTSTORE
+WINAPI
+PFXImportCertStore(
+    IN CRYPT_DATA_BLOB* pPFX,
+    IN LPCWSTR szPassword,
+    IN DWORD   dwFlags);
+
+// dwFlags definitions for PFXImportCertStore
+//#define CRYPT_EXPORTABLE        0x00000001  // CryptImportKey dwFlags
+//#define CRYPT_USER_PROTECTED    0x00000002  // CryptImportKey dwFlags
+//#define CRYPT_MACHINE_KEYSET    0x00000020  // CryptAcquireContext dwFlags
+
+#define CRYPT_USER_KEYSET         0x00001000     
+
+#define PKCS12_IMPORT_RESERVED_MASK    0xffff0000 
+
+
+//+-------------------------------------------------------------------------
+//      PFXIsPFXBlob
+//
+//  This function will try to decode the outer layer of the blob as a pfx 
+//  blob, and if that works it will return TRUE, it will return FALSE otherwise
+//
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+PFXIsPFXBlob(
+    IN CRYPT_DATA_BLOB* pPFX);
+
+
+
+//+-------------------------------------------------------------------------
+//      PFXVerifyPassword
+//
+//  This function will attempt to decode the outer layer of the blob as a pfx 
+//  blob and decrypt with the given password. No data from the blob will be
+//  imported.
+//
+//  Return value is TRUE if password appears correct, FALSE otherwise.
+//
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL 
+WINAPI
+PFXVerifyPassword(
+    IN CRYPT_DATA_BLOB* pPFX,
+    IN LPCWSTR szPassword,
+    IN DWORD dwFlags);
+
+
+//+-------------------------------------------------------------------------
+//      PFXExportCertStoreEx
+//
+//  Export the certificates and private keys referenced in the passed-in store 
+//
+//  This API encodes the blob under a stronger algorithm. The resulting
+//  PKCS12 blobs are incompatible with the earlier PFXExportCertStore API.
+//
+//  The value passed in the password parameter will be used to encrypt and 
+//  verify the integrity of the PFX packet. If any problems encoding the store
+//  are encountered, the function will return FALSE and the error code can 
+//  be found from GetLastError(). 
+//
+//  The dwFlags parameter may be set to any combination of 
+//      EXPORT_PRIVATE_KEYS
+//      REPORT_NO_PRIVATE_KEY
+//      REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY
+//
+//  The encoded PFX blob is returned in *pPFX. If pPFX->pbData is NULL upon
+//  input, this is a length only calculation, whereby, pPFX->cbData is updated
+//  with the number of bytes required for the encoded blob. Otherwise,
+//  the memory pointed to by pPFX->pbData is updated with the encoded bytes
+//  and pPFX->cbData is updated with the encoded byte length.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+PFXExportCertStoreEx(
+    IN HCERTSTORE hStore,
+    IN OUT CRYPT_DATA_BLOB* pPFX,
+    IN LPCWSTR szPassword,
+    IN void*   pvReserved,
+    IN DWORD   dwFlags);
+
+
+// dwFlags definitions for PFXExportCertStoreEx
+#define REPORT_NO_PRIVATE_KEY                   0x0001
+#define REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY   0x0002
+#define EXPORT_PRIVATE_KEYS                     0x0004
+#define PKCS12_EXPORT_RESERVED_MASK             0xffff0000
+
+
+//+-------------------------------------------------------------------------
+//      PFXExportCertStore
+//
+//  Export the certificates and private keys referenced in the passed-in store 
+//
+//  This is an old API kept for compatibility with IE4 clients. New applications
+//  should call the above PfxExportCertStoreEx for enhanced security.
+//--------------------------------------------------------------------------
+WINCRYPT32API
+BOOL
+WINAPI
+PFXExportCertStore(
+    IN HCERTSTORE hStore,
+    IN OUT CRYPT_DATA_BLOB* pPFX,
+    IN LPCWSTR szPassword,
+    IN DWORD   dwFlags);
+
+
+
+
+#ifdef __cplusplus
+}       // Balance extern "C" above
+#endif
+
+#if defined (_MSC_VER)
+#if ( _MSC_VER >= 800 )
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4201)
+#endif
+
+#endif
+#endif
+
+#endif // __WINCRYPT_H__
+
diff --git a/base/Windows/Inc/WinDef.h b/base/Windows/Inc/WinDef.h
new file mode 100644
index 0000000..5436e7b
--- /dev/null
+++ b/base/Windows/Inc/WinDef.h
@@ -0,0 +1,394 @@
+/****************************************************************************
+*                                                                           *
+* windef.h -- Basic Windows Type Definitions                                *
+*                                                                           *
+* Copyright (c) Microsoft Corporation. All rights reserved.                 *
+*                                                                           *
+****************************************************************************/
+
+
+#ifndef _WINDEF_
+#define _WINDEF_
+
+#ifndef NO_STRICT
+#ifndef STRICT
+#define STRICT 1
+#endif
+#endif /* NO_STRICT */
+
+// Win32 defines _WIN32 automatically,
+// but Macintosh doesn't, so if we are using
+// Win32 Functions, we must do it here
+
+#ifdef _MAC
+#ifndef _WIN32
+#define _WIN32
+#endif
+#endif //_MAC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef WINVER
+#define WINVER 0x0500
+#endif /* WINVER */
+
+/*
+ * BASETYPES is defined in ntdef.h if these types are already defined
+ */
+
+#ifndef BASETYPES
+#define BASETYPES
+typedef unsigned long ULONG;
+typedef ULONG *PULONG;
+typedef unsigned short USHORT;
+typedef USHORT *PUSHORT;
+typedef unsigned char UCHAR;
+typedef UCHAR *PUCHAR;
+typedef char *PSZ;
+#endif  /* !BASETYPES */
+
+#define MAX_PATH          260
+
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+#ifndef FALSE
+#define FALSE               0
+#endif
+
+#ifndef TRUE
+#define TRUE                1
+#endif
+
+#ifndef IN
+#define IN
+#endif
+
+#ifndef OUT
+#define OUT
+#endif
+
+#ifndef OPTIONAL
+#define OPTIONAL
+#endif
+
+#undef far
+#undef near
+#undef pascal
+
+#define far
+#define near
+#if (!defined(_MAC)) && ((_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED))
+#define pascal __stdcall
+#else
+#define pascal
+#endif
+
+#if defined(DOSWIN32) || defined(_MAC)
+#define cdecl _cdecl
+#ifndef CDECL
+#define CDECL _cdecl
+#endif
+#else
+#define cdecl
+#ifndef CDECL
+#define CDECL
+#endif
+#endif
+
+#ifdef _MAC
+#define CALLBACK    PASCAL
+#define WINAPI      CDECL
+#define WINAPIV     CDECL
+#define APIENTRY    WINAPI
+#define APIPRIVATE  CDECL
+#ifdef _68K_
+#define PASCAL      __pascal
+#else
+#define PASCAL
+#endif
+#elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#define CALLBACK    __stdcall
+#define WINAPI      __stdcall
+#define WINAPIV     __cdecl
+#define APIENTRY    WINAPI
+#define APIPRIVATE  __stdcall
+#define PASCAL      __stdcall
+#else
+#define CALLBACK
+#define WINAPI
+#define WINAPIV
+#define APIENTRY    WINAPI
+#define APIPRIVATE
+#define PASCAL      pascal
+#endif
+
+#undef FAR
+#undef  NEAR
+#define FAR                 far
+#define NEAR                near
+#ifndef CONST
+#define CONST               const
+#endif
+
+typedef unsigned long       DWORD;
+typedef int                 BOOL;
+typedef unsigned char       BYTE;
+typedef unsigned short      WORD;
+typedef float               FLOAT;
+typedef FLOAT               *PFLOAT;
+typedef BOOL near           *PBOOL;
+typedef BOOL far            *LPBOOL;
+typedef BYTE near           *PBYTE;
+typedef BYTE far            *LPBYTE;
+typedef int near            *PINT;
+typedef int far             *LPINT;
+typedef WORD near           *PWORD;
+typedef WORD far            *LPWORD;
+typedef long far            *LPLONG;
+typedef DWORD near          *PDWORD;
+typedef DWORD far           *LPDWORD;
+typedef void far            *LPVOID;
+typedef CONST void far      *LPCVOID;
+
+typedef int                 INT;
+typedef unsigned int        UINT;
+typedef unsigned int        *PUINT;
+
+#ifndef NT_INCLUDED
+#include <winnt.h>
+#endif /* NT_INCLUDED */
+
+/* Types use for passing & returning polymorphic values */
+typedef UINT_PTR            WPARAM;
+typedef LONG_PTR            LPARAM;
+typedef LONG_PTR            LRESULT;
+
+#ifndef NOMINMAX
+
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+#endif  /* NOMINMAX */
+
+#define MAKEWORD(a, b)      ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | ((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8))
+#define MAKELONG(a, b)      ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | ((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))
+#define LOWORD(l)           ((WORD)((DWORD_PTR)(l) & 0xffff))
+#define HIWORD(l)           ((WORD)((DWORD_PTR)(l) >> 16))
+#define LOBYTE(w)           ((BYTE)((DWORD_PTR)(w) & 0xff))
+#define HIBYTE(w)           ((BYTE)((DWORD_PTR)(w) >> 8))
+
+
+#ifndef WIN_INTERNAL
+DECLARE_HANDLE            (HWND);
+DECLARE_HANDLE            (HHOOK);
+#ifdef WINABLE
+DECLARE_HANDLE            (HEVENT);
+#endif
+#endif
+
+typedef WORD                ATOM;
+
+typedef HANDLE NEAR         *SPHANDLE;
+typedef HANDLE FAR          *LPHANDLE;
+typedef HANDLE              HGLOBAL;
+typedef HANDLE              HLOCAL;
+typedef HANDLE              GLOBALHANDLE;
+typedef HANDLE              LOCALHANDLE;
+#ifndef _MAC
+#ifdef _WIN64
+typedef INT_PTR (FAR WINAPI *FARPROC)();
+typedef INT_PTR (NEAR WINAPI *NEARPROC)();
+typedef INT_PTR (WINAPI *PROC)();
+#else
+typedef int (FAR WINAPI *FARPROC)();
+typedef int (NEAR WINAPI *NEARPROC)();
+typedef int (WINAPI *PROC)();
+#endif  // _WIN64
+#else
+typedef int (CALLBACK *FARPROC)();
+typedef int (CALLBACK *NEARPROC)();
+typedef int (CALLBACK *PROC)();
+#endif
+
+#if !defined(_MAC) || !defined(GDI_INTERNAL)
+#ifdef STRICT
+typedef void NEAR* HGDIOBJ;
+#else
+DECLARE_HANDLE(HGDIOBJ);
+#endif
+#endif
+
+DECLARE_HANDLE(HKEY);
+typedef HKEY *PHKEY;
+
+#if !defined(_MAC) || !defined(WIN_INTERNAL)
+DECLARE_HANDLE(HACCEL);
+#endif
+#if !defined(_MAC) || !defined(GDI_INTERNAL)
+DECLARE_HANDLE(HBITMAP);
+DECLARE_HANDLE(HBRUSH);
+#endif
+#if(WINVER >= 0x0400)
+DECLARE_HANDLE(HCOLORSPACE);
+#endif /* WINVER >= 0x0400 */
+#if !defined(_MAC) || !defined(GDI_INTERNAL)
+DECLARE_HANDLE(HDC);
+#endif
+DECLARE_HANDLE(HGLRC);          // OpenGL
+DECLARE_HANDLE(HDESK);
+DECLARE_HANDLE(HENHMETAFILE);
+#if !defined(_MAC) || !defined(GDI_INTERNAL)
+DECLARE_HANDLE(HFONT);
+#endif
+DECLARE_HANDLE(HICON);
+#if !defined(_MAC) || !defined(WIN_INTERNAL)
+DECLARE_HANDLE(HMENU);
+#endif
+DECLARE_HANDLE(HMETAFILE);
+DECLARE_HANDLE(HINSTANCE);
+typedef HINSTANCE HMODULE;      /* HMODULEs can be used in place of HINSTANCEs */
+#if !defined(_MAC) || !defined(GDI_INTERNAL)
+DECLARE_HANDLE(HPALETTE);
+DECLARE_HANDLE(HPEN);
+#endif
+DECLARE_HANDLE(HRGN);
+DECLARE_HANDLE(HRSRC);
+DECLARE_HANDLE(HSTR);
+DECLARE_HANDLE(HTASK);
+DECLARE_HANDLE(HWINSTA);
+DECLARE_HANDLE(HKL);
+
+#if(WINVER >= 0x0500)
+#ifndef _MAC
+DECLARE_HANDLE(HMONITOR);
+DECLARE_HANDLE(HWINEVENTHOOK);
+#endif
+DECLARE_HANDLE(HUMPD);
+#endif /* WINVER >= 0x0500 */
+
+#ifndef _MAC
+typedef int HFILE;
+typedef HICON HCURSOR;      /* HICONs & HCURSORs are polymorphic */
+#else
+typedef short HFILE;
+DECLARE_HANDLE(HCURSOR);    /* HICONs & HCURSORs are not polymorphic */
+#endif
+
+typedef DWORD   COLORREF;
+typedef DWORD   *LPCOLORREF;
+
+#define HFILE_ERROR ((HFILE)-1)
+
+typedef struct tagRECT
+{
+    LONG    left;
+    LONG    top;
+    LONG    right;
+    LONG    bottom;
+} RECT, *PRECT, NEAR *NPRECT, FAR *LPRECT;
+
+typedef const RECT FAR* LPCRECT;
+
+typedef struct _RECTL       /* rcl */
+{
+    LONG    left;
+    LONG    top;
+    LONG    right;
+    LONG    bottom;
+} RECTL, *PRECTL, *LPRECTL;
+
+typedef const RECTL FAR* LPCRECTL;
+
+typedef struct tagPOINT
+{
+    LONG  x;
+    LONG  y;
+} POINT, *PPOINT, NEAR *NPPOINT, FAR *LPPOINT;
+
+typedef struct _POINTL      /* ptl  */
+{
+    LONG  x;
+    LONG  y;
+} POINTL, *PPOINTL;
+
+typedef struct tagSIZE
+{
+    LONG        cx;
+    LONG        cy;
+} SIZE, *PSIZE, *LPSIZE;
+
+typedef SIZE               SIZEL;
+typedef SIZE               *PSIZEL, *LPSIZEL;
+
+typedef struct tagPOINTS
+{
+#ifndef _MAC
+    SHORT   x;
+    SHORT   y;
+#else
+    SHORT   y;
+    SHORT   x;
+#endif
+} POINTS, *PPOINTS, *LPPOINTS;
+
+//
+//  File System time stamps are represented with the following structure:
+//
+
+typedef struct _FILETIME {
+    DWORD dwLowDateTime;
+    DWORD dwHighDateTime;
+} FILETIME, *PFILETIME, *LPFILETIME;
+#define _FILETIME_
+
+
+/* mode selections for the device mode function */
+#define DM_UPDATE           1
+#define DM_COPY             2
+#define DM_PROMPT           4
+#define DM_MODIFY           8
+
+#define DM_IN_BUFFER        DM_MODIFY
+#define DM_IN_PROMPT        DM_PROMPT
+#define DM_OUT_BUFFER       DM_COPY
+#define DM_OUT_DEFAULT      DM_UPDATE
+
+/* device capabilities indices */
+#define DC_FIELDS           1
+#define DC_PAPERS           2
+#define DC_PAPERSIZE        3
+#define DC_MINEXTENT        4
+#define DC_MAXEXTENT        5
+#define DC_BINS             6
+#define DC_DUPLEX           7
+#define DC_SIZE             8
+#define DC_EXTRA            9
+#define DC_VERSION          10
+#define DC_DRIVER           11
+#define DC_BINNAMES         12
+#define DC_ENUMRESOLUTIONS  13
+#define DC_FILEDEPENDENCIES 14
+#define DC_TRUETYPE         15
+#define DC_PAPERNAMES       16
+#define DC_ORIENTATION      17
+#define DC_COPIES           18
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDEF_ */
+
diff --git a/base/Windows/Inc/WinError.h b/base/Windows/Inc/WinError.h
new file mode 100644
index 0000000..e44a35a
--- /dev/null
+++ b/base/Windows/Inc/WinError.h
@@ -0,0 +1,27161 @@
+/************************************************************************
+*                                                                       *
+*   winerror.h --  error code definitions for the Win32 API functions   *
+*                                                                       *
+*   Copyright (c) Microsoft Corporation.  All rights reserved.          *
+*                                                                       *
+************************************************************************/
+
+#ifndef _WINERROR_
+#define _WINERROR_
+
+#if defined (_MSC_VER) && (_MSC_VER >= 1020) && !defined(__midl)
+#pragma once
+#endif
+
+//
+//  Values are 32 bit values layed out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +---+-+-+-----------------------+-------------------------------+
+//  |Sev|C|R|     Facility          |               Code            |
+//  +---+-+-+-----------------------+-------------------------------+
+//
+//  where
+//
+//      Sev - is the severity code
+//
+//          00 - Success
+//          01 - Informational
+//          10 - Warning
+//          11 - Error
+//
+//      C - is the Customer code flag
+//
+//      R - is a reserved bit
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+#define FACILITY_WINDOWS_CE              24
+#define FACILITY_WINDOWS                 8
+#define FACILITY_URT                     19
+#define FACILITY_UMI                     22
+#define FACILITY_SXS                     23
+#define FACILITY_STORAGE                 3
+#define FACILITY_STATE_MANAGEMENT        34
+#define FACILITY_SSPI                    9
+#define FACILITY_SCARD                   16
+#define FACILITY_SETUPAPI                15
+#define FACILITY_SECURITY                9
+#define FACILITY_RPC                     1
+#define FACILITY_WIN32                   7
+#define FACILITY_CONTROL                 10
+#define FACILITY_NULL                    0
+#define FACILITY_METADIRECTORY           35
+#define FACILITY_MSMQ                    14
+#define FACILITY_MEDIASERVER             13
+#define FACILITY_INTERNET                12
+#define FACILITY_ITF                     4
+#define FACILITY_HTTP                    25
+#define FACILITY_DPLAY                   21
+#define FACILITY_DISPATCH                2
+#define FACILITY_CONFIGURATION           33
+#define FACILITY_COMPLUS                 17
+#define FACILITY_CERT                    11
+#define FACILITY_BACKGROUNDCOPY          32
+#define FACILITY_ACS                     20
+#define FACILITY_AAF                     18
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: ERROR_SUCCESS
+//
+// MessageText:
+//
+//  The operation completed successfully.
+//
+#define ERROR_SUCCESS                    0L
+
+#define NO_ERROR 0L                                                 // dderror
+#define SEC_E_OK                         ((HRESULT)0x00000000L)
+
+//
+// MessageId: ERROR_INVALID_FUNCTION
+//
+// MessageText:
+//
+//  Incorrect function.
+//
+#define ERROR_INVALID_FUNCTION           1L    // dderror
+
+//
+// MessageId: ERROR_FILE_NOT_FOUND
+//
+// MessageText:
+//
+//  The system cannot find the file specified.
+//
+#define ERROR_FILE_NOT_FOUND             2L
+
+//
+// MessageId: ERROR_PATH_NOT_FOUND
+//
+// MessageText:
+//
+//  The system cannot find the path specified.
+//
+#define ERROR_PATH_NOT_FOUND             3L
+
+//
+// MessageId: ERROR_TOO_MANY_OPEN_FILES
+//
+// MessageText:
+//
+//  The system cannot open the file.
+//
+#define ERROR_TOO_MANY_OPEN_FILES        4L
+
+//
+// MessageId: ERROR_ACCESS_DENIED
+//
+// MessageText:
+//
+//  Access is denied.
+//
+#define ERROR_ACCESS_DENIED              5L
+
+//
+// MessageId: ERROR_INVALID_HANDLE
+//
+// MessageText:
+//
+//  The handle is invalid.
+//
+#define ERROR_INVALID_HANDLE             6L
+
+//
+// MessageId: ERROR_ARENA_TRASHED
+//
+// MessageText:
+//
+//  The storage control blocks were destroyed.
+//
+#define ERROR_ARENA_TRASHED              7L
+
+//
+// MessageId: ERROR_NOT_ENOUGH_MEMORY
+//
+// MessageText:
+//
+//  Not enough storage is available to process this command.
+//
+#define ERROR_NOT_ENOUGH_MEMORY          8L    // dderror
+
+//
+// MessageId: ERROR_INVALID_BLOCK
+//
+// MessageText:
+//
+//  The storage control block address is invalid.
+//
+#define ERROR_INVALID_BLOCK              9L
+
+//
+// MessageId: ERROR_BAD_ENVIRONMENT
+//
+// MessageText:
+//
+//  The environment is incorrect.
+//
+#define ERROR_BAD_ENVIRONMENT            10L
+
+//
+// MessageId: ERROR_BAD_FORMAT
+//
+// MessageText:
+//
+//  An attempt was made to load a program with an incorrect format.
+//
+#define ERROR_BAD_FORMAT                 11L
+
+//
+// MessageId: ERROR_INVALID_ACCESS
+//
+// MessageText:
+//
+//  The access code is invalid.
+//
+#define ERROR_INVALID_ACCESS             12L
+
+//
+// MessageId: ERROR_INVALID_DATA
+//
+// MessageText:
+//
+//  The data is invalid.
+//
+#define ERROR_INVALID_DATA               13L
+
+//
+// MessageId: ERROR_OUTOFMEMORY
+//
+// MessageText:
+//
+//  Not enough storage is available to complete this operation.
+//
+#define ERROR_OUTOFMEMORY                14L
+
+//
+// MessageId: ERROR_INVALID_DRIVE
+//
+// MessageText:
+//
+//  The system cannot find the drive specified.
+//
+#define ERROR_INVALID_DRIVE              15L
+
+//
+// MessageId: ERROR_CURRENT_DIRECTORY
+//
+// MessageText:
+//
+//  The directory cannot be removed.
+//
+#define ERROR_CURRENT_DIRECTORY          16L
+
+//
+// MessageId: ERROR_NOT_SAME_DEVICE
+//
+// MessageText:
+//
+//  The system cannot move the file to a different disk drive.
+//
+#define ERROR_NOT_SAME_DEVICE            17L
+
+//
+// MessageId: ERROR_NO_MORE_FILES
+//
+// MessageText:
+//
+//  There are no more files.
+//
+#define ERROR_NO_MORE_FILES              18L
+
+//
+// MessageId: ERROR_WRITE_PROTECT
+//
+// MessageText:
+//
+//  The media is write protected.
+//
+#define ERROR_WRITE_PROTECT              19L
+
+//
+// MessageId: ERROR_BAD_UNIT
+//
+// MessageText:
+//
+//  The system cannot find the device specified.
+//
+#define ERROR_BAD_UNIT                   20L
+
+//
+// MessageId: ERROR_NOT_READY
+//
+// MessageText:
+//
+//  The device is not ready.
+//
+#define ERROR_NOT_READY                  21L
+
+//
+// MessageId: ERROR_BAD_COMMAND
+//
+// MessageText:
+//
+//  The device does not recognize the command.
+//
+#define ERROR_BAD_COMMAND                22L
+
+//
+// MessageId: ERROR_CRC
+//
+// MessageText:
+//
+//  Data error (cyclic redundancy check).
+//
+#define ERROR_CRC                        23L
+
+//
+// MessageId: ERROR_BAD_LENGTH
+//
+// MessageText:
+//
+//  The program issued a command but the command length is incorrect.
+//
+#define ERROR_BAD_LENGTH                 24L
+
+//
+// MessageId: ERROR_SEEK
+//
+// MessageText:
+//
+//  The drive cannot locate a specific area or track on the disk.
+//
+#define ERROR_SEEK                       25L
+
+//
+// MessageId: ERROR_NOT_DOS_DISK
+//
+// MessageText:
+//
+//  The specified disk or diskette cannot be accessed.
+//
+#define ERROR_NOT_DOS_DISK               26L
+
+//
+// MessageId: ERROR_SECTOR_NOT_FOUND
+//
+// MessageText:
+//
+//  The drive cannot find the sector requested.
+//
+#define ERROR_SECTOR_NOT_FOUND           27L
+
+//
+// MessageId: ERROR_OUT_OF_PAPER
+//
+// MessageText:
+//
+//  The printer is out of paper.
+//
+#define ERROR_OUT_OF_PAPER               28L
+
+//
+// MessageId: ERROR_WRITE_FAULT
+//
+// MessageText:
+//
+//  The system cannot write to the specified device.
+//
+#define ERROR_WRITE_FAULT                29L
+
+//
+// MessageId: ERROR_READ_FAULT
+//
+// MessageText:
+//
+//  The system cannot read from the specified device.
+//
+#define ERROR_READ_FAULT                 30L
+
+//
+// MessageId: ERROR_GEN_FAILURE
+//
+// MessageText:
+//
+//  A device attached to the system is not functioning.
+//
+#define ERROR_GEN_FAILURE                31L
+
+//
+// MessageId: ERROR_SHARING_VIOLATION
+//
+// MessageText:
+//
+//  The process cannot access the file because it is being used by another process.
+//
+#define ERROR_SHARING_VIOLATION          32L
+
+//
+// MessageId: ERROR_LOCK_VIOLATION
+//
+// MessageText:
+//
+//  The process cannot access the file because another process has locked a portion of the file.
+//
+#define ERROR_LOCK_VIOLATION             33L
+
+//
+// MessageId: ERROR_WRONG_DISK
+//
+// MessageText:
+//
+//  The wrong diskette is in the drive.
+//  Insert %2 (Volume Serial Number: %3) into drive %1.
+//
+#define ERROR_WRONG_DISK                 34L
+
+//
+// MessageId: ERROR_SHARING_BUFFER_EXCEEDED
+//
+// MessageText:
+//
+//  Too many files opened for sharing.
+//
+#define ERROR_SHARING_BUFFER_EXCEEDED    36L
+
+//
+// MessageId: ERROR_HANDLE_EOF
+//
+// MessageText:
+//
+//  Reached the end of the file.
+//
+#define ERROR_HANDLE_EOF                 38L
+
+//
+// MessageId: ERROR_HANDLE_DISK_FULL
+//
+// MessageText:
+//
+//  The disk is full.
+//
+#define ERROR_HANDLE_DISK_FULL           39L
+
+//
+// MessageId: ERROR_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The request is not supported.
+//
+#define ERROR_NOT_SUPPORTED              50L
+
+//
+// MessageId: ERROR_REM_NOT_LIST
+//
+// MessageText:
+//
+//  Windows cannot find the network path. Verify that the network path is correct and the destination computer is not busy or turned off. If Windows still cannot find the network path, contact your network administrator.
+//
+#define ERROR_REM_NOT_LIST               51L
+
+//
+// MessageId: ERROR_DUP_NAME
+//
+// MessageText:
+//
+//  You were not connected because a duplicate name exists on the network. Go to System in Control Panel to change the computer name and try again.
+//
+#define ERROR_DUP_NAME                   52L
+
+//
+// MessageId: ERROR_BAD_NETPATH
+//
+// MessageText:
+//
+//  The network path was not found.
+//
+#define ERROR_BAD_NETPATH                53L
+
+//
+// MessageId: ERROR_NETWORK_BUSY
+//
+// MessageText:
+//
+//  The network is busy.
+//
+#define ERROR_NETWORK_BUSY               54L
+
+//
+// MessageId: ERROR_DEV_NOT_EXIST
+//
+// MessageText:
+//
+//  The specified network resource or device is no longer available.
+//
+#define ERROR_DEV_NOT_EXIST              55L    // dderror
+
+//
+// MessageId: ERROR_TOO_MANY_CMDS
+//
+// MessageText:
+//
+//  The network BIOS command limit has been reached.
+//
+#define ERROR_TOO_MANY_CMDS              56L
+
+//
+// MessageId: ERROR_ADAP_HDW_ERR
+//
+// MessageText:
+//
+//  A network adapter hardware error occurred.
+//
+#define ERROR_ADAP_HDW_ERR               57L
+
+//
+// MessageId: ERROR_BAD_NET_RESP
+//
+// MessageText:
+//
+//  The specified server cannot perform the requested operation.
+//
+#define ERROR_BAD_NET_RESP               58L
+
+//
+// MessageId: ERROR_UNEXP_NET_ERR
+//
+// MessageText:
+//
+//  An unexpected network error occurred.
+//
+#define ERROR_UNEXP_NET_ERR              59L
+
+//
+// MessageId: ERROR_BAD_REM_ADAP
+//
+// MessageText:
+//
+//  The remote adapter is not compatible.
+//
+#define ERROR_BAD_REM_ADAP               60L
+
+//
+// MessageId: ERROR_PRINTQ_FULL
+//
+// MessageText:
+//
+//  The printer queue is full.
+//
+#define ERROR_PRINTQ_FULL                61L
+
+//
+// MessageId: ERROR_NO_SPOOL_SPACE
+//
+// MessageText:
+//
+//  Space to store the file waiting to be printed is not available on the server.
+//
+#define ERROR_NO_SPOOL_SPACE             62L
+
+//
+// MessageId: ERROR_PRINT_CANCELLED
+//
+// MessageText:
+//
+//  Your file waiting to be printed was deleted.
+//
+#define ERROR_PRINT_CANCELLED            63L
+
+//
+// MessageId: ERROR_NETNAME_DELETED
+//
+// MessageText:
+//
+//  The specified network name is no longer available.
+//
+#define ERROR_NETNAME_DELETED            64L
+
+//
+// MessageId: ERROR_NETWORK_ACCESS_DENIED
+//
+// MessageText:
+//
+//  Network access is denied.
+//
+#define ERROR_NETWORK_ACCESS_DENIED      65L
+
+//
+// MessageId: ERROR_BAD_DEV_TYPE
+//
+// MessageText:
+//
+//  The network resource type is not correct.
+//
+#define ERROR_BAD_DEV_TYPE               66L
+
+//
+// MessageId: ERROR_BAD_NET_NAME
+//
+// MessageText:
+//
+//  The network name cannot be found.
+//
+#define ERROR_BAD_NET_NAME               67L
+
+//
+// MessageId: ERROR_TOO_MANY_NAMES
+//
+// MessageText:
+//
+//  The name limit for the local computer network adapter card was exceeded.
+//
+#define ERROR_TOO_MANY_NAMES             68L
+
+//
+// MessageId: ERROR_TOO_MANY_SESS
+//
+// MessageText:
+//
+//  The network BIOS session limit was exceeded.
+//
+#define ERROR_TOO_MANY_SESS              69L
+
+//
+// MessageId: ERROR_SHARING_PAUSED
+//
+// MessageText:
+//
+//  The remote server has been paused or is in the process of being started.
+//
+#define ERROR_SHARING_PAUSED             70L
+
+//
+// MessageId: ERROR_REQ_NOT_ACCEP
+//
+// MessageText:
+//
+//  No more connections can be made to this remote computer at this time because there are already as many connections as the computer can accept.
+//
+#define ERROR_REQ_NOT_ACCEP              71L
+
+//
+// MessageId: ERROR_REDIR_PAUSED
+//
+// MessageText:
+//
+//  The specified printer or disk device has been paused.
+//
+#define ERROR_REDIR_PAUSED               72L
+
+//
+// MessageId: ERROR_FILE_EXISTS
+//
+// MessageText:
+//
+//  The file exists.
+//
+#define ERROR_FILE_EXISTS                80L
+
+//
+// MessageId: ERROR_CANNOT_MAKE
+//
+// MessageText:
+//
+//  The directory or file cannot be created.
+//
+#define ERROR_CANNOT_MAKE                82L
+
+//
+// MessageId: ERROR_FAIL_I24
+//
+// MessageText:
+//
+//  Fail on INT 24.
+//
+#define ERROR_FAIL_I24                   83L
+
+//
+// MessageId: ERROR_OUT_OF_STRUCTURES
+//
+// MessageText:
+//
+//  Storage to process this request is not available.
+//
+#define ERROR_OUT_OF_STRUCTURES          84L
+
+//
+// MessageId: ERROR_ALREADY_ASSIGNED
+//
+// MessageText:
+//
+//  The local device name is already in use.
+//
+#define ERROR_ALREADY_ASSIGNED           85L
+
+//
+// MessageId: ERROR_INVALID_PASSWORD
+//
+// MessageText:
+//
+//  The specified network password is not correct.
+//
+#define ERROR_INVALID_PASSWORD           86L
+
+//
+// MessageId: ERROR_INVALID_PARAMETER
+//
+// MessageText:
+//
+//  The parameter is incorrect.
+//
+#define ERROR_INVALID_PARAMETER          87L    // dderror
+
+//
+// MessageId: ERROR_NET_WRITE_FAULT
+//
+// MessageText:
+//
+//  A write fault occurred on the network.
+//
+#define ERROR_NET_WRITE_FAULT            88L
+
+//
+// MessageId: ERROR_NO_PROC_SLOTS
+//
+// MessageText:
+//
+//  The system cannot start another process at this time.
+//
+#define ERROR_NO_PROC_SLOTS              89L
+
+//
+// MessageId: ERROR_TOO_MANY_SEMAPHORES
+//
+// MessageText:
+//
+//  Cannot create another system semaphore.
+//
+#define ERROR_TOO_MANY_SEMAPHORES        100L
+
+//
+// MessageId: ERROR_EXCL_SEM_ALREADY_OWNED
+//
+// MessageText:
+//
+//  The exclusive semaphore is owned by another process.
+//
+#define ERROR_EXCL_SEM_ALREADY_OWNED     101L
+
+//
+// MessageId: ERROR_SEM_IS_SET
+//
+// MessageText:
+//
+//  The semaphore is set and cannot be closed.
+//
+#define ERROR_SEM_IS_SET                 102L
+
+//
+// MessageId: ERROR_TOO_MANY_SEM_REQUESTS
+//
+// MessageText:
+//
+//  The semaphore cannot be set again.
+//
+#define ERROR_TOO_MANY_SEM_REQUESTS      103L
+
+//
+// MessageId: ERROR_INVALID_AT_INTERRUPT_TIME
+//
+// MessageText:
+//
+//  Cannot request exclusive semaphores at interrupt time.
+//
+#define ERROR_INVALID_AT_INTERRUPT_TIME  104L
+
+//
+// MessageId: ERROR_SEM_OWNER_DIED
+//
+// MessageText:
+//
+//  The previous ownership of this semaphore has ended.
+//
+#define ERROR_SEM_OWNER_DIED             105L
+
+//
+// MessageId: ERROR_SEM_USER_LIMIT
+//
+// MessageText:
+//
+//  Insert the diskette for drive %1.
+//
+#define ERROR_SEM_USER_LIMIT             106L
+
+//
+// MessageId: ERROR_DISK_CHANGE
+//
+// MessageText:
+//
+//  The program stopped because an alternate diskette was not inserted.
+//
+#define ERROR_DISK_CHANGE                107L
+
+//
+// MessageId: ERROR_DRIVE_LOCKED
+//
+// MessageText:
+//
+//  The disk is in use or locked by another process.
+//
+#define ERROR_DRIVE_LOCKED               108L
+
+//
+// MessageId: ERROR_BROKEN_PIPE
+//
+// MessageText:
+//
+//  The pipe has been ended.
+//
+#define ERROR_BROKEN_PIPE                109L
+
+//
+// MessageId: ERROR_OPEN_FAILED
+//
+// MessageText:
+//
+//  The system cannot open the device or file specified.
+//
+#define ERROR_OPEN_FAILED                110L
+
+//
+// MessageId: ERROR_BUFFER_OVERFLOW
+//
+// MessageText:
+//
+//  The file name is too long.
+//
+#define ERROR_BUFFER_OVERFLOW            111L
+
+//
+// MessageId: ERROR_DISK_FULL
+//
+// MessageText:
+//
+//  There is not enough space on the disk.
+//
+#define ERROR_DISK_FULL                  112L
+
+//
+// MessageId: ERROR_NO_MORE_SEARCH_HANDLES
+//
+// MessageText:
+//
+//  No more internal file identifiers available.
+//
+#define ERROR_NO_MORE_SEARCH_HANDLES     113L
+
+//
+// MessageId: ERROR_INVALID_TARGET_HANDLE
+//
+// MessageText:
+//
+//  The target internal file identifier is incorrect.
+//
+#define ERROR_INVALID_TARGET_HANDLE      114L
+
+//
+// MessageId: ERROR_INVALID_CATEGORY
+//
+// MessageText:
+//
+//  The IOCTL call made by the application program is not correct.
+//
+#define ERROR_INVALID_CATEGORY           117L
+
+//
+// MessageId: ERROR_INVALID_VERIFY_SWITCH
+//
+// MessageText:
+//
+//  The verify-on-write switch parameter value is not correct.
+//
+#define ERROR_INVALID_VERIFY_SWITCH      118L
+
+//
+// MessageId: ERROR_BAD_DRIVER_LEVEL
+//
+// MessageText:
+//
+//  The system does not support the command requested.
+//
+#define ERROR_BAD_DRIVER_LEVEL           119L
+
+//
+// MessageId: ERROR_CALL_NOT_IMPLEMENTED
+//
+// MessageText:
+//
+//  This function is not supported on this system.
+//
+#define ERROR_CALL_NOT_IMPLEMENTED       120L
+
+//
+// MessageId: ERROR_SEM_TIMEOUT
+//
+// MessageText:
+//
+//  The semaphore timeout period has expired.
+//
+#define ERROR_SEM_TIMEOUT                121L
+
+//
+// MessageId: ERROR_INSUFFICIENT_BUFFER
+//
+// MessageText:
+//
+//  The data area passed to a system call is too small.
+//
+#define ERROR_INSUFFICIENT_BUFFER        122L    // dderror
+
+//
+// MessageId: ERROR_INVALID_NAME
+//
+// MessageText:
+//
+//  The filename, directory name, or volume label syntax is incorrect.
+//
+#define ERROR_INVALID_NAME               123L    // dderror
+
+//
+// MessageId: ERROR_INVALID_LEVEL
+//
+// MessageText:
+//
+//  The system call level is not correct.
+//
+#define ERROR_INVALID_LEVEL              124L
+
+//
+// MessageId: ERROR_NO_VOLUME_LABEL
+//
+// MessageText:
+//
+//  The disk has no volume label.
+//
+#define ERROR_NO_VOLUME_LABEL            125L
+
+//
+// MessageId: ERROR_MOD_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified module could not be found.
+//
+#define ERROR_MOD_NOT_FOUND              126L
+
+//
+// MessageId: ERROR_PROC_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified procedure could not be found.
+//
+#define ERROR_PROC_NOT_FOUND             127L
+
+//
+// MessageId: ERROR_WAIT_NO_CHILDREN
+//
+// MessageText:
+//
+//  There are no child processes to wait for.
+//
+#define ERROR_WAIT_NO_CHILDREN           128L
+
+//
+// MessageId: ERROR_CHILD_NOT_COMPLETE
+//
+// MessageText:
+//
+//  The %1 application cannot be run in Win32 mode.
+//
+#define ERROR_CHILD_NOT_COMPLETE         129L
+
+//
+// MessageId: ERROR_DIRECT_ACCESS_HANDLE
+//
+// MessageText:
+//
+//  Attempt to use a file handle to an open disk partition for an operation other than raw disk I/O.
+//
+#define ERROR_DIRECT_ACCESS_HANDLE       130L
+
+//
+// MessageId: ERROR_NEGATIVE_SEEK
+//
+// MessageText:
+//
+//  An attempt was made to move the file pointer before the beginning of the file.
+//
+#define ERROR_NEGATIVE_SEEK              131L
+
+//
+// MessageId: ERROR_SEEK_ON_DEVICE
+//
+// MessageText:
+//
+//  The file pointer cannot be set on the specified device or file.
+//
+#define ERROR_SEEK_ON_DEVICE             132L
+
+//
+// MessageId: ERROR_IS_JOIN_TARGET
+//
+// MessageText:
+//
+//  A JOIN or SUBST command cannot be used for a drive that contains previously joined drives.
+//
+#define ERROR_IS_JOIN_TARGET             133L
+
+//
+// MessageId: ERROR_IS_JOINED
+//
+// MessageText:
+//
+//  An attempt was made to use a JOIN or SUBST command on a drive that has already been joined.
+//
+#define ERROR_IS_JOINED                  134L
+
+//
+// MessageId: ERROR_IS_SUBSTED
+//
+// MessageText:
+//
+//  An attempt was made to use a JOIN or SUBST command on a drive that has already been substituted.
+//
+#define ERROR_IS_SUBSTED                 135L
+
+//
+// MessageId: ERROR_NOT_JOINED
+//
+// MessageText:
+//
+//  The system tried to delete the JOIN of a drive that is not joined.
+//
+#define ERROR_NOT_JOINED                 136L
+
+//
+// MessageId: ERROR_NOT_SUBSTED
+//
+// MessageText:
+//
+//  The system tried to delete the substitution of a drive that is not substituted.
+//
+#define ERROR_NOT_SUBSTED                137L
+
+//
+// MessageId: ERROR_JOIN_TO_JOIN
+//
+// MessageText:
+//
+//  The system tried to join a drive to a directory on a joined drive.
+//
+#define ERROR_JOIN_TO_JOIN               138L
+
+//
+// MessageId: ERROR_SUBST_TO_SUBST
+//
+// MessageText:
+//
+//  The system tried to substitute a drive to a directory on a substituted drive.
+//
+#define ERROR_SUBST_TO_SUBST             139L
+
+//
+// MessageId: ERROR_JOIN_TO_SUBST
+//
+// MessageText:
+//
+//  The system tried to join a drive to a directory on a substituted drive.
+//
+#define ERROR_JOIN_TO_SUBST              140L
+
+//
+// MessageId: ERROR_SUBST_TO_JOIN
+//
+// MessageText:
+//
+//  The system tried to SUBST a drive to a directory on a joined drive.
+//
+#define ERROR_SUBST_TO_JOIN              141L
+
+//
+// MessageId: ERROR_BUSY_DRIVE
+//
+// MessageText:
+//
+//  The system cannot perform a JOIN or SUBST at this time.
+//
+#define ERROR_BUSY_DRIVE                 142L
+
+//
+// MessageId: ERROR_SAME_DRIVE
+//
+// MessageText:
+//
+//  The system cannot join or substitute a drive to or for a directory on the same drive.
+//
+#define ERROR_SAME_DRIVE                 143L
+
+//
+// MessageId: ERROR_DIR_NOT_ROOT
+//
+// MessageText:
+//
+//  The directory is not a subdirectory of the root directory.
+//
+#define ERROR_DIR_NOT_ROOT               144L
+
+//
+// MessageId: ERROR_DIR_NOT_EMPTY
+//
+// MessageText:
+//
+//  The directory is not empty.
+//
+#define ERROR_DIR_NOT_EMPTY              145L
+
+//
+// MessageId: ERROR_IS_SUBST_PATH
+//
+// MessageText:
+//
+//  The path specified is being used in a substitute.
+//
+#define ERROR_IS_SUBST_PATH              146L
+
+//
+// MessageId: ERROR_IS_JOIN_PATH
+//
+// MessageText:
+//
+//  Not enough resources are available to process this command.
+//
+#define ERROR_IS_JOIN_PATH               147L
+
+//
+// MessageId: ERROR_PATH_BUSY
+//
+// MessageText:
+//
+//  The path specified cannot be used at this time.
+//
+#define ERROR_PATH_BUSY                  148L
+
+//
+// MessageId: ERROR_IS_SUBST_TARGET
+//
+// MessageText:
+//
+//  An attempt was made to join or substitute a drive for which a directory on the drive is the target of a previous substitute.
+//
+#define ERROR_IS_SUBST_TARGET            149L
+
+//
+// MessageId: ERROR_SYSTEM_TRACE
+//
+// MessageText:
+//
+//  System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
+//
+#define ERROR_SYSTEM_TRACE               150L
+
+//
+// MessageId: ERROR_INVALID_EVENT_COUNT
+//
+// MessageText:
+//
+//  The number of specified semaphore events for DosMuxSemWait is not correct.
+//
+#define ERROR_INVALID_EVENT_COUNT        151L
+
+//
+// MessageId: ERROR_TOO_MANY_MUXWAITERS
+//
+// MessageText:
+//
+//  DosMuxSemWait did not execute; too many semaphores are already set.
+//
+#define ERROR_TOO_MANY_MUXWAITERS        152L
+
+//
+// MessageId: ERROR_INVALID_LIST_FORMAT
+//
+// MessageText:
+//
+//  The DosMuxSemWait list is not correct.
+//
+#define ERROR_INVALID_LIST_FORMAT        153L
+
+//
+// MessageId: ERROR_LABEL_TOO_LONG
+//
+// MessageText:
+//
+//  The volume label you entered exceeds the label character limit of the target file system.
+//
+#define ERROR_LABEL_TOO_LONG             154L
+
+//
+// MessageId: ERROR_TOO_MANY_TCBS
+//
+// MessageText:
+//
+//  Cannot create another thread.
+//
+#define ERROR_TOO_MANY_TCBS              155L
+
+//
+// MessageId: ERROR_SIGNAL_REFUSED
+//
+// MessageText:
+//
+//  The recipient process has refused the signal.
+//
+#define ERROR_SIGNAL_REFUSED             156L
+
+//
+// MessageId: ERROR_DISCARDED
+//
+// MessageText:
+//
+//  The segment is already discarded and cannot be locked.
+//
+#define ERROR_DISCARDED                  157L
+
+//
+// MessageId: ERROR_NOT_LOCKED
+//
+// MessageText:
+//
+//  The segment is already unlocked.
+//
+#define ERROR_NOT_LOCKED                 158L
+
+//
+// MessageId: ERROR_BAD_THREADID_ADDR
+//
+// MessageText:
+//
+//  The address for the thread ID is not correct.
+//
+#define ERROR_BAD_THREADID_ADDR          159L
+
+//
+// MessageId: ERROR_BAD_ARGUMENTS
+//
+// MessageText:
+//
+//  One or more arguments are not correct.
+//
+#define ERROR_BAD_ARGUMENTS              160L
+
+//
+// MessageId: ERROR_BAD_PATHNAME
+//
+// MessageText:
+//
+//  The specified path is invalid.
+//
+#define ERROR_BAD_PATHNAME               161L
+
+//
+// MessageId: ERROR_SIGNAL_PENDING
+//
+// MessageText:
+//
+//  A signal is already pending.
+//
+#define ERROR_SIGNAL_PENDING             162L
+
+//
+// MessageId: ERROR_MAX_THRDS_REACHED
+//
+// MessageText:
+//
+//  No more threads can be created in the system.
+//
+#define ERROR_MAX_THRDS_REACHED          164L
+
+//
+// MessageId: ERROR_LOCK_FAILED
+//
+// MessageText:
+//
+//  Unable to lock a region of a file.
+//
+#define ERROR_LOCK_FAILED                167L
+
+//
+// MessageId: ERROR_BUSY
+//
+// MessageText:
+//
+//  The requested resource is in use.
+//
+#define ERROR_BUSY                       170L    // dderror
+
+//
+// MessageId: ERROR_CANCEL_VIOLATION
+//
+// MessageText:
+//
+//  A lock request was not outstanding for the supplied cancel region.
+//
+#define ERROR_CANCEL_VIOLATION           173L
+
+//
+// MessageId: ERROR_ATOMIC_LOCKS_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The file system does not support atomic changes to the lock type.
+//
+#define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174L
+
+//
+// MessageId: ERROR_INVALID_SEGMENT_NUMBER
+//
+// MessageText:
+//
+//  The system detected a segment number that was not correct.
+//
+#define ERROR_INVALID_SEGMENT_NUMBER     180L
+
+//
+// MessageId: ERROR_INVALID_ORDINAL
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INVALID_ORDINAL            182L
+
+//
+// MessageId: ERROR_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  Cannot create a file when that file already exists.
+//
+#define ERROR_ALREADY_EXISTS             183L
+
+//
+// MessageId: ERROR_INVALID_FLAG_NUMBER
+//
+// MessageText:
+//
+//  The flag passed is not correct.
+//
+#define ERROR_INVALID_FLAG_NUMBER        186L
+
+//
+// MessageId: ERROR_SEM_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified system semaphore name was not found.
+//
+#define ERROR_SEM_NOT_FOUND              187L
+
+//
+// MessageId: ERROR_INVALID_STARTING_CODESEG
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INVALID_STARTING_CODESEG   188L
+
+//
+// MessageId: ERROR_INVALID_STACKSEG
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INVALID_STACKSEG           189L
+
+//
+// MessageId: ERROR_INVALID_MODULETYPE
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INVALID_MODULETYPE         190L
+
+//
+// MessageId: ERROR_INVALID_EXE_SIGNATURE
+//
+// MessageText:
+//
+//  Cannot run %1 in Win32 mode.
+//
+#define ERROR_INVALID_EXE_SIGNATURE      191L
+
+//
+// MessageId: ERROR_EXE_MARKED_INVALID
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_EXE_MARKED_INVALID         192L
+
+//
+// MessageId: ERROR_BAD_EXE_FORMAT
+//
+// MessageText:
+//
+//  %1 is not a valid Win32 application.
+//
+#define ERROR_BAD_EXE_FORMAT             193L
+
+//
+// MessageId: ERROR_ITERATED_DATA_EXCEEDS_64k
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_ITERATED_DATA_EXCEEDS_64k  194L
+
+//
+// MessageId: ERROR_INVALID_MINALLOCSIZE
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INVALID_MINALLOCSIZE       195L
+
+//
+// MessageId: ERROR_DYNLINK_FROM_INVALID_RING
+//
+// MessageText:
+//
+//  The operating system cannot run this application program.
+//
+#define ERROR_DYNLINK_FROM_INVALID_RING  196L
+
+//
+// MessageId: ERROR_IOPL_NOT_ENABLED
+//
+// MessageText:
+//
+//  The operating system is not presently configured to run this application.
+//
+#define ERROR_IOPL_NOT_ENABLED           197L
+
+//
+// MessageId: ERROR_INVALID_SEGDPL
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INVALID_SEGDPL             198L
+
+//
+// MessageId: ERROR_AUTODATASEG_EXCEEDS_64k
+//
+// MessageText:
+//
+//  The operating system cannot run this application program.
+//
+#define ERROR_AUTODATASEG_EXCEEDS_64k    199L
+
+//
+// MessageId: ERROR_RING2SEG_MUST_BE_MOVABLE
+//
+// MessageText:
+//
+//  The code segment cannot be greater than or equal to 64K.
+//
+#define ERROR_RING2SEG_MUST_BE_MOVABLE   200L
+
+//
+// MessageId: ERROR_RELOC_CHAIN_XEEDS_SEGLIM
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_RELOC_CHAIN_XEEDS_SEGLIM   201L
+
+//
+// MessageId: ERROR_INFLOOP_IN_RELOC_CHAIN
+//
+// MessageText:
+//
+//  The operating system cannot run %1.
+//
+#define ERROR_INFLOOP_IN_RELOC_CHAIN     202L
+
+//
+// MessageId: ERROR_ENVVAR_NOT_FOUND
+//
+// MessageText:
+//
+//  The system could not find the environment option that was entered.
+//
+#define ERROR_ENVVAR_NOT_FOUND           203L
+
+//
+// MessageId: ERROR_NO_SIGNAL_SENT
+//
+// MessageText:
+//
+//  No process in the command subtree has a signal handler.
+//
+#define ERROR_NO_SIGNAL_SENT             205L
+
+//
+// MessageId: ERROR_FILENAME_EXCED_RANGE
+//
+// MessageText:
+//
+//  The filename or extension is too long.
+//
+#define ERROR_FILENAME_EXCED_RANGE       206L
+
+//
+// MessageId: ERROR_RING2_STACK_IN_USE
+//
+// MessageText:
+//
+//  The ring 2 stack is in use.
+//
+#define ERROR_RING2_STACK_IN_USE         207L
+
+//
+// MessageId: ERROR_META_EXPANSION_TOO_LONG
+//
+// MessageText:
+//
+//  The global filename characters, * or ?, are entered incorrectly or too many global filename characters are specified.
+//
+#define ERROR_META_EXPANSION_TOO_LONG    208L
+
+//
+// MessageId: ERROR_INVALID_SIGNAL_NUMBER
+//
+// MessageText:
+//
+//  The signal being posted is not correct.
+//
+#define ERROR_INVALID_SIGNAL_NUMBER      209L
+
+//
+// MessageId: ERROR_THREAD_1_INACTIVE
+//
+// MessageText:
+//
+//  The signal handler cannot be set.
+//
+#define ERROR_THREAD_1_INACTIVE          210L
+
+//
+// MessageId: ERROR_LOCKED
+//
+// MessageText:
+//
+//  The segment is locked and cannot be reallocated.
+//
+#define ERROR_LOCKED                     212L
+
+//
+// MessageId: ERROR_TOO_MANY_MODULES
+//
+// MessageText:
+//
+//  Too many dynamic-link modules are attached to this program or dynamic-link module.
+//
+#define ERROR_TOO_MANY_MODULES           214L
+
+//
+// MessageId: ERROR_NESTING_NOT_ALLOWED
+//
+// MessageText:
+//
+//  Cannot nest calls to LoadModule.
+//
+#define ERROR_NESTING_NOT_ALLOWED        215L
+
+//
+// MessageId: ERROR_EXE_MACHINE_TYPE_MISMATCH
+//
+// MessageText:
+//
+//  The image file %1 is valid, but is for a machine type other than the current machine.
+//
+#define ERROR_EXE_MACHINE_TYPE_MISMATCH  216L
+
+//
+// MessageId: ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY
+//
+// MessageText:
+//
+//  The image file %1 is signed, unable to modify.
+//
+#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217L
+
+//
+// MessageId: ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY
+//
+// MessageText:
+//
+//  The image file %1 is strong signed, unable to modify.
+//
+#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218L
+
+//
+// MessageId: ERROR_BAD_PIPE
+//
+// MessageText:
+//
+//  The pipe state is invalid.
+//
+#define ERROR_BAD_PIPE                   230L
+
+//
+// MessageId: ERROR_PIPE_BUSY
+//
+// MessageText:
+//
+//  All pipe instances are busy.
+//
+#define ERROR_PIPE_BUSY                  231L
+
+//
+// MessageId: ERROR_NO_DATA
+//
+// MessageText:
+//
+//  The pipe is being closed.
+//
+#define ERROR_NO_DATA                    232L
+
+//
+// MessageId: ERROR_PIPE_NOT_CONNECTED
+//
+// MessageText:
+//
+//  No process is on the other end of the pipe.
+//
+#define ERROR_PIPE_NOT_CONNECTED         233L
+
+//
+// MessageId: ERROR_MORE_DATA
+//
+// MessageText:
+//
+//  More data is available.
+//
+#define ERROR_MORE_DATA                  234L    // dderror
+
+//
+// MessageId: ERROR_VC_DISCONNECTED
+//
+// MessageText:
+//
+//  The session was canceled.
+//
+#define ERROR_VC_DISCONNECTED            240L
+
+//
+// MessageId: ERROR_INVALID_EA_NAME
+//
+// MessageText:
+//
+//  The specified extended attribute name was invalid.
+//
+#define ERROR_INVALID_EA_NAME            254L
+
+//
+// MessageId: ERROR_EA_LIST_INCONSISTENT
+//
+// MessageText:
+//
+//  The extended attributes are inconsistent.
+//
+#define ERROR_EA_LIST_INCONSISTENT       255L
+
+//
+// MessageId: WAIT_TIMEOUT
+//
+// MessageText:
+//
+//  The wait operation timed out.
+//
+#define WAIT_TIMEOUT                     258L    // dderror
+
+//
+// MessageId: ERROR_NO_MORE_ITEMS
+//
+// MessageText:
+//
+//  No more data is available.
+//
+#define ERROR_NO_MORE_ITEMS              259L
+
+//
+// MessageId: ERROR_CANNOT_COPY
+//
+// MessageText:
+//
+//  The copy functions cannot be used.
+//
+#define ERROR_CANNOT_COPY                266L
+
+//
+// MessageId: ERROR_DIRECTORY
+//
+// MessageText:
+//
+//  The directory name is invalid.
+//
+#define ERROR_DIRECTORY                  267L
+
+//
+// MessageId: ERROR_EAS_DIDNT_FIT
+//
+// MessageText:
+//
+//  The extended attributes did not fit in the buffer.
+//
+#define ERROR_EAS_DIDNT_FIT              275L
+
+//
+// MessageId: ERROR_EA_FILE_CORRUPT
+//
+// MessageText:
+//
+//  The extended attribute file on the mounted file system is corrupt.
+//
+#define ERROR_EA_FILE_CORRUPT            276L
+
+//
+// MessageId: ERROR_EA_TABLE_FULL
+//
+// MessageText:
+//
+//  The extended attribute table file is full.
+//
+#define ERROR_EA_TABLE_FULL              277L
+
+//
+// MessageId: ERROR_INVALID_EA_HANDLE
+//
+// MessageText:
+//
+//  The specified extended attribute handle is invalid.
+//
+#define ERROR_INVALID_EA_HANDLE          278L
+
+//
+// MessageId: ERROR_EAS_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The mounted file system does not support extended attributes.
+//
+#define ERROR_EAS_NOT_SUPPORTED          282L
+
+//
+// MessageId: ERROR_NOT_OWNER
+//
+// MessageText:
+//
+//  Attempt to release mutex not owned by caller.
+//
+#define ERROR_NOT_OWNER                  288L
+
+//
+// MessageId: ERROR_TOO_MANY_POSTS
+//
+// MessageText:
+//
+//  Too many posts were made to a semaphore.
+//
+#define ERROR_TOO_MANY_POSTS             298L
+
+//
+// MessageId: ERROR_PARTIAL_COPY
+//
+// MessageText:
+//
+//  Only part of a ReadProcessMemory or WriteProcessMemory request was completed.
+//
+#define ERROR_PARTIAL_COPY               299L
+
+//
+// MessageId: ERROR_OPLOCK_NOT_GRANTED
+//
+// MessageText:
+//
+//  The oplock request is denied.
+//
+#define ERROR_OPLOCK_NOT_GRANTED         300L
+
+//
+// MessageId: ERROR_INVALID_OPLOCK_PROTOCOL
+//
+// MessageText:
+//
+//  An invalid oplock acknowledgment was received by the system.
+//
+#define ERROR_INVALID_OPLOCK_PROTOCOL    301L
+
+//
+// MessageId: ERROR_DISK_TOO_FRAGMENTED
+//
+// MessageText:
+//
+//  The volume is too fragmented to complete this operation.
+//
+#define ERROR_DISK_TOO_FRAGMENTED        302L
+
+//
+// MessageId: ERROR_DELETE_PENDING
+//
+// MessageText:
+//
+//  The file cannot be opened because it is in the process of being deleted.
+//
+#define ERROR_DELETE_PENDING             303L
+
+//
+// MessageId: ERROR_MR_MID_NOT_FOUND
+//
+// MessageText:
+//
+//  The system cannot find message text for message number 0x%1 in the message file for %2.
+//
+#define ERROR_MR_MID_NOT_FOUND           317L
+
+//
+// MessageId: ERROR_SCOPE_NOT_FOUND
+//
+// MessageText:
+//
+//  The scope specified was not found.
+//
+#define ERROR_SCOPE_NOT_FOUND            318L
+
+//
+// MessageId: ERROR_INVALID_ADDRESS
+//
+// MessageText:
+//
+//  Attempt to access invalid address.
+//
+#define ERROR_INVALID_ADDRESS            487L
+
+//
+// MessageId: ERROR_ARITHMETIC_OVERFLOW
+//
+// MessageText:
+//
+//  Arithmetic result exceeded 32 bits.
+//
+#define ERROR_ARITHMETIC_OVERFLOW        534L
+
+//
+// MessageId: ERROR_PIPE_CONNECTED
+//
+// MessageText:
+//
+//  There is a process on other end of the pipe.
+//
+#define ERROR_PIPE_CONNECTED             535L
+
+//
+// MessageId: ERROR_PIPE_LISTENING
+//
+// MessageText:
+//
+//  Waiting for a process to open the other end of the pipe.
+//
+#define ERROR_PIPE_LISTENING             536L
+
+//
+// MessageId: ERROR_EA_ACCESS_DENIED
+//
+// MessageText:
+//
+//  Access to the extended attribute was denied.
+//
+#define ERROR_EA_ACCESS_DENIED           994L
+
+//
+// MessageId: ERROR_OPERATION_ABORTED
+//
+// MessageText:
+//
+//  The I/O operation has been aborted because of either a thread exit or an application request.
+//
+#define ERROR_OPERATION_ABORTED          995L
+
+//
+// MessageId: ERROR_IO_INCOMPLETE
+//
+// MessageText:
+//
+//  Overlapped I/O event is not in a signaled state.
+//
+#define ERROR_IO_INCOMPLETE              996L
+
+//
+// MessageId: ERROR_IO_PENDING
+//
+// MessageText:
+//
+//  Overlapped I/O operation is in progress.
+//
+#define ERROR_IO_PENDING                 997L    // dderror
+
+//
+// MessageId: ERROR_NOACCESS
+//
+// MessageText:
+//
+//  Invalid access to memory location.
+//
+#define ERROR_NOACCESS                   998L
+
+//
+// MessageId: ERROR_SWAPERROR
+//
+// MessageText:
+//
+//  Error performing inpage operation.
+//
+#define ERROR_SWAPERROR                  999L
+
+//
+// MessageId: ERROR_STACK_OVERFLOW
+//
+// MessageText:
+//
+//  Recursion too deep; the stack overflowed.
+//
+#define ERROR_STACK_OVERFLOW             1001L
+
+//
+// MessageId: ERROR_INVALID_MESSAGE
+//
+// MessageText:
+//
+//  The window cannot act on the sent message.
+//
+#define ERROR_INVALID_MESSAGE            1002L
+
+//
+// MessageId: ERROR_CAN_NOT_COMPLETE
+//
+// MessageText:
+//
+//  Cannot complete this function.
+//
+#define ERROR_CAN_NOT_COMPLETE           1003L
+
+//
+// MessageId: ERROR_INVALID_FLAGS
+//
+// MessageText:
+//
+//  Invalid flags.
+//
+#define ERROR_INVALID_FLAGS              1004L
+
+//
+// MessageId: ERROR_UNRECOGNIZED_VOLUME
+//
+// MessageText:
+//
+//  The volume does not contain a recognized file system.
+//  Please make sure that all required file system drivers are loaded and that the volume is not corrupted.
+//
+#define ERROR_UNRECOGNIZED_VOLUME        1005L
+
+//
+// MessageId: ERROR_FILE_INVALID
+//
+// MessageText:
+//
+//  The volume for a file has been externally altered so that the opened file is no longer valid.
+//
+#define ERROR_FILE_INVALID               1006L
+
+//
+// MessageId: ERROR_FULLSCREEN_MODE
+//
+// MessageText:
+//
+//  The requested operation cannot be performed in full-screen mode.
+//
+#define ERROR_FULLSCREEN_MODE            1007L
+
+//
+// MessageId: ERROR_NO_TOKEN
+//
+// MessageText:
+//
+//  An attempt was made to reference a token that does not exist.
+//
+#define ERROR_NO_TOKEN                   1008L
+
+//
+// MessageId: ERROR_BADDB
+//
+// MessageText:
+//
+//  The configuration registry database is corrupt.
+//
+#define ERROR_BADDB                      1009L
+
+//
+// MessageId: ERROR_BADKEY
+//
+// MessageText:
+//
+//  The configuration registry key is invalid.
+//
+#define ERROR_BADKEY                     1010L
+
+//
+// MessageId: ERROR_CANTOPEN
+//
+// MessageText:
+//
+//  The configuration registry key could not be opened.
+//
+#define ERROR_CANTOPEN                   1011L
+
+//
+// MessageId: ERROR_CANTREAD
+//
+// MessageText:
+//
+//  The configuration registry key could not be read.
+//
+#define ERROR_CANTREAD                   1012L
+
+//
+// MessageId: ERROR_CANTWRITE
+//
+// MessageText:
+//
+//  The configuration registry key could not be written.
+//
+#define ERROR_CANTWRITE                  1013L
+
+//
+// MessageId: ERROR_REGISTRY_RECOVERED
+//
+// MessageText:
+//
+//  One of the files in the registry database had to be recovered by use of a log or alternate copy. The recovery was successful.
+//
+#define ERROR_REGISTRY_RECOVERED         1014L
+
+//
+// MessageId: ERROR_REGISTRY_CORRUPT
+//
+// MessageText:
+//
+//  The registry is corrupted. The structure of one of the files containing registry data is corrupted, or the system's memory image of the file is corrupted, or the file could not be recovered because the alternate copy or log was absent or corrupted.
+//
+#define ERROR_REGISTRY_CORRUPT           1015L
+
+//
+// MessageId: ERROR_REGISTRY_IO_FAILED
+//
+// MessageText:
+//
+//  An I/O operation initiated by the registry failed unrecoverably. The registry could not read in, or write out, or flush, one of the files that contain the system's image of the registry.
+//
+#define ERROR_REGISTRY_IO_FAILED         1016L
+
+//
+// MessageId: ERROR_NOT_REGISTRY_FILE
+//
+// MessageText:
+//
+//  The system has attempted to load or restore a file into the registry, but the specified file is not in a registry file format.
+//
+#define ERROR_NOT_REGISTRY_FILE          1017L
+
+//
+// MessageId: ERROR_KEY_DELETED
+//
+// MessageText:
+//
+//  Illegal operation attempted on a registry key that has been marked for deletion.
+//
+#define ERROR_KEY_DELETED                1018L
+
+//
+// MessageId: ERROR_NO_LOG_SPACE
+//
+// MessageText:
+//
+//  System could not allocate the required space in a registry log.
+//
+#define ERROR_NO_LOG_SPACE               1019L
+
+//
+// MessageId: ERROR_KEY_HAS_CHILDREN
+//
+// MessageText:
+//
+//  Cannot create a symbolic link in a registry key that already has subkeys or values.
+//
+#define ERROR_KEY_HAS_CHILDREN           1020L
+
+//
+// MessageId: ERROR_CHILD_MUST_BE_VOLATILE
+//
+// MessageText:
+//
+//  Cannot create a stable subkey under a volatile parent key.
+//
+#define ERROR_CHILD_MUST_BE_VOLATILE     1021L
+
+//
+// MessageId: ERROR_NOTIFY_ENUM_DIR
+//
+// MessageText:
+//
+//  A notify change request is being completed and the information is not being returned in the caller's buffer. The caller now needs to enumerate the files to find the changes.
+//
+#define ERROR_NOTIFY_ENUM_DIR            1022L
+
+//
+// MessageId: ERROR_DEPENDENT_SERVICES_RUNNING
+//
+// MessageText:
+//
+//  A stop control has been sent to a service that other running services are dependent on.
+//
+#define ERROR_DEPENDENT_SERVICES_RUNNING 1051L
+
+//
+// MessageId: ERROR_INVALID_SERVICE_CONTROL
+//
+// MessageText:
+//
+//  The requested control is not valid for this service.
+//
+#define ERROR_INVALID_SERVICE_CONTROL    1052L
+
+//
+// MessageId: ERROR_SERVICE_REQUEST_TIMEOUT
+//
+// MessageText:
+//
+//  The service did not respond to the start or control request in a timely fashion.
+//
+#define ERROR_SERVICE_REQUEST_TIMEOUT    1053L
+
+//
+// MessageId: ERROR_SERVICE_NO_THREAD
+//
+// MessageText:
+//
+//  A thread could not be created for the service.
+//
+#define ERROR_SERVICE_NO_THREAD          1054L
+
+//
+// MessageId: ERROR_SERVICE_DATABASE_LOCKED
+//
+// MessageText:
+//
+//  The service database is locked.
+//
+#define ERROR_SERVICE_DATABASE_LOCKED    1055L
+
+//
+// MessageId: ERROR_SERVICE_ALREADY_RUNNING
+//
+// MessageText:
+//
+//  An instance of the service is already running.
+//
+#define ERROR_SERVICE_ALREADY_RUNNING    1056L
+
+//
+// MessageId: ERROR_INVALID_SERVICE_ACCOUNT
+//
+// MessageText:
+//
+//  The account name is invalid or does not exist, or the password is invalid for the account name specified.
+//
+#define ERROR_INVALID_SERVICE_ACCOUNT    1057L
+
+//
+// MessageId: ERROR_SERVICE_DISABLED
+//
+// MessageText:
+//
+//  The service cannot be started, either because it is disabled or because it has no enabled devices associated with it.
+//
+#define ERROR_SERVICE_DISABLED           1058L
+
+//
+// MessageId: ERROR_CIRCULAR_DEPENDENCY
+//
+// MessageText:
+//
+//  Circular service dependency was specified.
+//
+#define ERROR_CIRCULAR_DEPENDENCY        1059L
+
+//
+// MessageId: ERROR_SERVICE_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  The specified service does not exist as an installed service.
+//
+#define ERROR_SERVICE_DOES_NOT_EXIST     1060L
+
+//
+// MessageId: ERROR_SERVICE_CANNOT_ACCEPT_CTRL
+//
+// MessageText:
+//
+//  The service cannot accept control messages at this time.
+//
+#define ERROR_SERVICE_CANNOT_ACCEPT_CTRL 1061L
+
+//
+// MessageId: ERROR_SERVICE_NOT_ACTIVE
+//
+// MessageText:
+//
+//  The service has not been started.
+//
+#define ERROR_SERVICE_NOT_ACTIVE         1062L
+
+//
+// MessageId: ERROR_FAILED_SERVICE_CONTROLLER_CONNECT
+//
+// MessageText:
+//
+//  The service process could not connect to the service controller.
+//
+#define ERROR_FAILED_SERVICE_CONTROLLER_CONNECT 1063L
+
+//
+// MessageId: ERROR_EXCEPTION_IN_SERVICE
+//
+// MessageText:
+//
+//  An exception occurred in the service when handling the control request.
+//
+#define ERROR_EXCEPTION_IN_SERVICE       1064L
+
+//
+// MessageId: ERROR_DATABASE_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  The database specified does not exist.
+//
+#define ERROR_DATABASE_DOES_NOT_EXIST    1065L
+
+//
+// MessageId: ERROR_SERVICE_SPECIFIC_ERROR
+//
+// MessageText:
+//
+//  The service has returned a service-specific error code.
+//
+#define ERROR_SERVICE_SPECIFIC_ERROR     1066L
+
+//
+// MessageId: ERROR_PROCESS_ABORTED
+//
+// MessageText:
+//
+//  The process terminated unexpectedly.
+//
+#define ERROR_PROCESS_ABORTED            1067L
+
+//
+// MessageId: ERROR_SERVICE_DEPENDENCY_FAIL
+//
+// MessageText:
+//
+//  The dependency service or group failed to start.
+//
+#define ERROR_SERVICE_DEPENDENCY_FAIL    1068L
+
+//
+// MessageId: ERROR_SERVICE_LOGON_FAILED
+//
+// MessageText:
+//
+//  The service did not start due to a logon failure.
+//
+#define ERROR_SERVICE_LOGON_FAILED       1069L
+
+//
+// MessageId: ERROR_SERVICE_START_HANG
+//
+// MessageText:
+//
+//  After starting, the service hung in a start-pending state.
+//
+#define ERROR_SERVICE_START_HANG         1070L
+
+//
+// MessageId: ERROR_INVALID_SERVICE_LOCK
+//
+// MessageText:
+//
+//  The specified service database lock is invalid.
+//
+#define ERROR_INVALID_SERVICE_LOCK       1071L
+
+//
+// MessageId: ERROR_SERVICE_MARKED_FOR_DELETE
+//
+// MessageText:
+//
+//  The specified service has been marked for deletion.
+//
+#define ERROR_SERVICE_MARKED_FOR_DELETE  1072L
+
+//
+// MessageId: ERROR_SERVICE_EXISTS
+//
+// MessageText:
+//
+//  The specified service already exists.
+//
+#define ERROR_SERVICE_EXISTS             1073L
+
+//
+// MessageId: ERROR_ALREADY_RUNNING_LKG
+//
+// MessageText:
+//
+//  The system is currently running with the last-known-good configuration.
+//
+#define ERROR_ALREADY_RUNNING_LKG        1074L
+
+//
+// MessageId: ERROR_SERVICE_DEPENDENCY_DELETED
+//
+// MessageText:
+//
+//  The dependency service does not exist or has been marked for deletion.
+//
+#define ERROR_SERVICE_DEPENDENCY_DELETED 1075L
+
+//
+// MessageId: ERROR_BOOT_ALREADY_ACCEPTED
+//
+// MessageText:
+//
+//  The current boot has already been accepted for use as the last-known-good control set.
+//
+#define ERROR_BOOT_ALREADY_ACCEPTED      1076L
+
+//
+// MessageId: ERROR_SERVICE_NEVER_STARTED
+//
+// MessageText:
+//
+//  No attempts to start the service have been made since the last boot.
+//
+#define ERROR_SERVICE_NEVER_STARTED      1077L
+
+//
+// MessageId: ERROR_DUPLICATE_SERVICE_NAME
+//
+// MessageText:
+//
+//  The name is already in use as either a service name or a service display name.
+//
+#define ERROR_DUPLICATE_SERVICE_NAME     1078L
+
+//
+// MessageId: ERROR_DIFFERENT_SERVICE_ACCOUNT
+//
+// MessageText:
+//
+//  The account specified for this service is different from the account specified for other services running in the same process.
+//
+#define ERROR_DIFFERENT_SERVICE_ACCOUNT  1079L
+
+//
+// MessageId: ERROR_CANNOT_DETECT_DRIVER_FAILURE
+//
+// MessageText:
+//
+//  Failure actions can only be set for Win32 services, not for drivers.
+//
+#define ERROR_CANNOT_DETECT_DRIVER_FAILURE 1080L
+
+//
+// MessageId: ERROR_CANNOT_DETECT_PROCESS_ABORT
+//
+// MessageText:
+//
+//  This service runs in the same process as the service control manager.
+//  Therefore, the service control manager cannot take action if this service's process terminates unexpectedly.
+//
+#define ERROR_CANNOT_DETECT_PROCESS_ABORT 1081L
+
+//
+// MessageId: ERROR_NO_RECOVERY_PROGRAM
+//
+// MessageText:
+//
+//  No recovery program has been configured for this service.
+//
+#define ERROR_NO_RECOVERY_PROGRAM        1082L
+
+//
+// MessageId: ERROR_SERVICE_NOT_IN_EXE
+//
+// MessageText:
+//
+//  The executable program that this service is configured to run in does not implement the service.
+//
+#define ERROR_SERVICE_NOT_IN_EXE         1083L
+
+//
+// MessageId: ERROR_NOT_SAFEBOOT_SERVICE
+//
+// MessageText:
+//
+//  This service cannot be started in Safe Mode
+//
+#define ERROR_NOT_SAFEBOOT_SERVICE       1084L
+
+//
+// MessageId: ERROR_END_OF_MEDIA
+//
+// MessageText:
+//
+//  The physical end of the tape has been reached.
+//
+#define ERROR_END_OF_MEDIA               1100L
+
+//
+// MessageId: ERROR_FILEMARK_DETECTED
+//
+// MessageText:
+//
+//  A tape access reached a filemark.
+//
+#define ERROR_FILEMARK_DETECTED          1101L
+
+//
+// MessageId: ERROR_BEGINNING_OF_MEDIA
+//
+// MessageText:
+//
+//  The beginning of the tape or a partition was encountered.
+//
+#define ERROR_BEGINNING_OF_MEDIA         1102L
+
+//
+// MessageId: ERROR_SETMARK_DETECTED
+//
+// MessageText:
+//
+//  A tape access reached the end of a set of files.
+//
+#define ERROR_SETMARK_DETECTED           1103L
+
+//
+// MessageId: ERROR_NO_DATA_DETECTED
+//
+// MessageText:
+//
+//  No more data is on the tape.
+//
+#define ERROR_NO_DATA_DETECTED           1104L
+
+//
+// MessageId: ERROR_PARTITION_FAILURE
+//
+// MessageText:
+//
+//  Tape could not be partitioned.
+//
+#define ERROR_PARTITION_FAILURE          1105L
+
+//
+// MessageId: ERROR_INVALID_BLOCK_LENGTH
+//
+// MessageText:
+//
+//  When accessing a new tape of a multivolume partition, the current block size is incorrect.
+//
+#define ERROR_INVALID_BLOCK_LENGTH       1106L
+
+//
+// MessageId: ERROR_DEVICE_NOT_PARTITIONED
+//
+// MessageText:
+//
+//  Tape partition information could not be found when loading a tape.
+//
+#define ERROR_DEVICE_NOT_PARTITIONED     1107L
+
+//
+// MessageId: ERROR_UNABLE_TO_LOCK_MEDIA
+//
+// MessageText:
+//
+//  Unable to lock the media eject mechanism.
+//
+#define ERROR_UNABLE_TO_LOCK_MEDIA       1108L
+
+//
+// MessageId: ERROR_UNABLE_TO_UNLOAD_MEDIA
+//
+// MessageText:
+//
+//  Unable to unload the media.
+//
+#define ERROR_UNABLE_TO_UNLOAD_MEDIA     1109L
+
+//
+// MessageId: ERROR_MEDIA_CHANGED
+//
+// MessageText:
+//
+//  The media in the drive may have changed.
+//
+#define ERROR_MEDIA_CHANGED              1110L
+
+//
+// MessageId: ERROR_BUS_RESET
+//
+// MessageText:
+//
+//  The I/O bus was reset.
+//
+#define ERROR_BUS_RESET                  1111L
+
+//
+// MessageId: ERROR_NO_MEDIA_IN_DRIVE
+//
+// MessageText:
+//
+//  No media in drive.
+//
+#define ERROR_NO_MEDIA_IN_DRIVE          1112L
+
+//
+// MessageId: ERROR_NO_UNICODE_TRANSLATION
+//
+// MessageText:
+//
+//  No mapping for the Unicode character exists in the target multi-byte code page.
+//
+#define ERROR_NO_UNICODE_TRANSLATION     1113L
+
+//
+// MessageId: ERROR_DLL_INIT_FAILED
+//
+// MessageText:
+//
+//  A dynamic link library (DLL) initialization routine failed.
+//
+#define ERROR_DLL_INIT_FAILED            1114L
+
+//
+// MessageId: ERROR_SHUTDOWN_IN_PROGRESS
+//
+// MessageText:
+//
+//  A system shutdown is in progress.
+//
+#define ERROR_SHUTDOWN_IN_PROGRESS       1115L
+
+//
+// MessageId: ERROR_NO_SHUTDOWN_IN_PROGRESS
+//
+// MessageText:
+//
+//  Unable to abort the system shutdown because no shutdown was in progress.
+//
+#define ERROR_NO_SHUTDOWN_IN_PROGRESS    1116L
+
+//
+// MessageId: ERROR_IO_DEVICE
+//
+// MessageText:
+//
+//  The request could not be performed because of an I/O device error.
+//
+#define ERROR_IO_DEVICE                  1117L
+
+//
+// MessageId: ERROR_SERIAL_NO_DEVICE
+//
+// MessageText:
+//
+//  No serial device was successfully initialized. The serial driver will unload.
+//
+#define ERROR_SERIAL_NO_DEVICE           1118L
+
+//
+// MessageId: ERROR_IRQ_BUSY
+//
+// MessageText:
+//
+//  Unable to open a device that was sharing an interrupt request (IRQ) with other devices. At least one other device that uses that IRQ was already opened.
+//
+#define ERROR_IRQ_BUSY                   1119L
+
+//
+// MessageId: ERROR_MORE_WRITES
+//
+// MessageText:
+//
+//  A serial I/O operation was completed by another write to the serial port.
+//  (The IOCTL_SERIAL_XOFF_COUNTER reached zero.)
+//
+#define ERROR_MORE_WRITES                1120L
+
+//
+// MessageId: ERROR_COUNTER_TIMEOUT
+//
+// MessageText:
+//
+//  A serial I/O operation completed because the timeout period expired.
+//  (The IOCTL_SERIAL_XOFF_COUNTER did not reach zero.)
+//
+#define ERROR_COUNTER_TIMEOUT            1121L
+
+//
+// MessageId: ERROR_FLOPPY_ID_MARK_NOT_FOUND
+//
+// MessageText:
+//
+//  No ID address mark was found on the floppy disk.
+//
+#define ERROR_FLOPPY_ID_MARK_NOT_FOUND   1122L
+
+//
+// MessageId: ERROR_FLOPPY_WRONG_CYLINDER
+//
+// MessageText:
+//
+//  Mismatch between the floppy disk sector ID field and the floppy disk controller track address.
+//
+#define ERROR_FLOPPY_WRONG_CYLINDER      1123L
+
+//
+// MessageId: ERROR_FLOPPY_UNKNOWN_ERROR
+//
+// MessageText:
+//
+//  The floppy disk controller reported an error that is not recognized by the floppy disk driver.
+//
+#define ERROR_FLOPPY_UNKNOWN_ERROR       1124L
+
+//
+// MessageId: ERROR_FLOPPY_BAD_REGISTERS
+//
+// MessageText:
+//
+//  The floppy disk controller returned inconsistent results in its registers.
+//
+#define ERROR_FLOPPY_BAD_REGISTERS       1125L
+
+//
+// MessageId: ERROR_DISK_RECALIBRATE_FAILED
+//
+// MessageText:
+//
+//  While accessing the hard disk, a recalibrate operation failed, even after retries.
+//
+#define ERROR_DISK_RECALIBRATE_FAILED    1126L
+
+//
+// MessageId: ERROR_DISK_OPERATION_FAILED
+//
+// MessageText:
+//
+//  While accessing the hard disk, a disk operation failed even after retries.
+//
+#define ERROR_DISK_OPERATION_FAILED      1127L
+
+//
+// MessageId: ERROR_DISK_RESET_FAILED
+//
+// MessageText:
+//
+//  While accessing the hard disk, a disk controller reset was needed, but even that failed.
+//
+#define ERROR_DISK_RESET_FAILED          1128L
+
+//
+// MessageId: ERROR_EOM_OVERFLOW
+//
+// MessageText:
+//
+//  Physical end of tape encountered.
+//
+#define ERROR_EOM_OVERFLOW               1129L
+
+//
+// MessageId: ERROR_NOT_ENOUGH_SERVER_MEMORY
+//
+// MessageText:
+//
+//  Not enough server storage is available to process this command.
+//
+#define ERROR_NOT_ENOUGH_SERVER_MEMORY   1130L
+
+//
+// MessageId: ERROR_POSSIBLE_DEADLOCK
+//
+// MessageText:
+//
+//  A potential deadlock condition has been detected.
+//
+#define ERROR_POSSIBLE_DEADLOCK          1131L
+
+//
+// MessageId: ERROR_MAPPED_ALIGNMENT
+//
+// MessageText:
+//
+//  The base address or the file offset specified does not have the proper alignment.
+//
+#define ERROR_MAPPED_ALIGNMENT           1132L
+
+//
+// MessageId: ERROR_SET_POWER_STATE_VETOED
+//
+// MessageText:
+//
+//  An attempt to change the system power state was vetoed by another application or driver.
+//
+#define ERROR_SET_POWER_STATE_VETOED     1140L
+
+//
+// MessageId: ERROR_SET_POWER_STATE_FAILED
+//
+// MessageText:
+//
+//  The system BIOS failed an attempt to change the system power state.
+//
+#define ERROR_SET_POWER_STATE_FAILED     1141L
+
+//
+// MessageId: ERROR_TOO_MANY_LINKS
+//
+// MessageText:
+//
+//  An attempt was made to create more links on a file than the file system supports.
+//
+#define ERROR_TOO_MANY_LINKS             1142L
+
+//
+// MessageId: ERROR_OLD_WIN_VERSION
+//
+// MessageText:
+//
+//  The specified program requires a newer version of Windows.
+//
+#define ERROR_OLD_WIN_VERSION            1150L
+
+//
+// MessageId: ERROR_APP_WRONG_OS
+//
+// MessageText:
+//
+//  The specified program is not a Windows or MS-DOS program.
+//
+#define ERROR_APP_WRONG_OS               1151L
+
+//
+// MessageId: ERROR_SINGLE_INSTANCE_APP
+//
+// MessageText:
+//
+//  Cannot start more than one instance of the specified program.
+//
+#define ERROR_SINGLE_INSTANCE_APP        1152L
+
+//
+// MessageId: ERROR_RMODE_APP
+//
+// MessageText:
+//
+//  The specified program was written for an earlier version of Windows.
+//
+#define ERROR_RMODE_APP                  1153L
+
+//
+// MessageId: ERROR_INVALID_DLL
+//
+// MessageText:
+//
+//  One of the library files needed to run this application is damaged.
+//
+#define ERROR_INVALID_DLL                1154L
+
+//
+// MessageId: ERROR_NO_ASSOCIATION
+//
+// MessageText:
+//
+//  No application is associated with the specified file for this operation.
+//
+#define ERROR_NO_ASSOCIATION             1155L
+
+//
+// MessageId: ERROR_DDE_FAIL
+//
+// MessageText:
+//
+//  An error occurred in sending the command to the application.
+//
+#define ERROR_DDE_FAIL                   1156L
+
+//
+// MessageId: ERROR_DLL_NOT_FOUND
+//
+// MessageText:
+//
+//  One of the library files needed to run this application cannot be found.
+//
+#define ERROR_DLL_NOT_FOUND              1157L
+
+//
+// MessageId: ERROR_NO_MORE_USER_HANDLES
+//
+// MessageText:
+//
+//  The current process has used all of its system allowance of handles for Window Manager objects.
+//
+#define ERROR_NO_MORE_USER_HANDLES       1158L
+
+//
+// MessageId: ERROR_MESSAGE_SYNC_ONLY
+//
+// MessageText:
+//
+//  The message can be used only with synchronous operations.
+//
+#define ERROR_MESSAGE_SYNC_ONLY          1159L
+
+//
+// MessageId: ERROR_SOURCE_ELEMENT_EMPTY
+//
+// MessageText:
+//
+//  The indicated source element has no media.
+//
+#define ERROR_SOURCE_ELEMENT_EMPTY       1160L
+
+//
+// MessageId: ERROR_DESTINATION_ELEMENT_FULL
+//
+// MessageText:
+//
+//  The indicated destination element already contains media.
+//
+#define ERROR_DESTINATION_ELEMENT_FULL   1161L
+
+//
+// MessageId: ERROR_ILLEGAL_ELEMENT_ADDRESS
+//
+// MessageText:
+//
+//  The indicated element does not exist.
+//
+#define ERROR_ILLEGAL_ELEMENT_ADDRESS    1162L
+
+//
+// MessageId: ERROR_MAGAZINE_NOT_PRESENT
+//
+// MessageText:
+//
+//  The indicated element is part of a magazine that is not present.
+//
+#define ERROR_MAGAZINE_NOT_PRESENT       1163L
+
+//
+// MessageId: ERROR_DEVICE_REINITIALIZATION_NEEDED
+//
+// MessageText:
+//
+//  The indicated device requires reinitialization due to hardware errors.
+//
+#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164L    // dderror
+
+//
+// MessageId: ERROR_DEVICE_REQUIRES_CLEANING
+//
+// MessageText:
+//
+//  The device has indicated that cleaning is required before further operations are attempted.
+//
+#define ERROR_DEVICE_REQUIRES_CLEANING   1165L
+
+//
+// MessageId: ERROR_DEVICE_DOOR_OPEN
+//
+// MessageText:
+//
+//  The device has indicated that its door is open.
+//
+#define ERROR_DEVICE_DOOR_OPEN           1166L
+
+//
+// MessageId: ERROR_DEVICE_NOT_CONNECTED
+//
+// MessageText:
+//
+//  The device is not connected.
+//
+#define ERROR_DEVICE_NOT_CONNECTED       1167L
+
+//
+// MessageId: ERROR_NOT_FOUND
+//
+// MessageText:
+//
+//  Element not found.
+//
+#define ERROR_NOT_FOUND                  1168L
+
+//
+// MessageId: ERROR_NO_MATCH
+//
+// MessageText:
+//
+//  There was no match for the specified key in the index.
+//
+#define ERROR_NO_MATCH                   1169L
+
+//
+// MessageId: ERROR_SET_NOT_FOUND
+//
+// MessageText:
+//
+//  The property set specified does not exist on the object.
+//
+#define ERROR_SET_NOT_FOUND              1170L
+
+//
+// MessageId: ERROR_POINT_NOT_FOUND
+//
+// MessageText:
+//
+//  The point passed to GetMouseMovePoints is not in the buffer.
+//
+#define ERROR_POINT_NOT_FOUND            1171L
+
+//
+// MessageId: ERROR_NO_TRACKING_SERVICE
+//
+// MessageText:
+//
+//  The tracking (workstation) service is not running.
+//
+#define ERROR_NO_TRACKING_SERVICE        1172L
+
+//
+// MessageId: ERROR_NO_VOLUME_ID
+//
+// MessageText:
+//
+//  The Volume ID could not be found.
+//
+#define ERROR_NO_VOLUME_ID               1173L
+
+//
+// MessageId: ERROR_UNABLE_TO_REMOVE_REPLACED
+//
+// MessageText:
+//
+//  Unable to remove the file to be replaced.
+//
+#define ERROR_UNABLE_TO_REMOVE_REPLACED  1175L
+
+//
+// MessageId: ERROR_UNABLE_TO_MOVE_REPLACEMENT
+//
+// MessageText:
+//
+//  Unable to move the replacement file to the file to be replaced. The file to be replaced has retained its original name.
+//
+#define ERROR_UNABLE_TO_MOVE_REPLACEMENT 1176L
+
+//
+// MessageId: ERROR_UNABLE_TO_MOVE_REPLACEMENT_2
+//
+// MessageText:
+//
+//  Unable to move the replacement file to the file to be replaced. The file to be replaced has been renamed using the backup name.
+//
+#define ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 1177L
+
+//
+// MessageId: ERROR_JOURNAL_DELETE_IN_PROGRESS
+//
+// MessageText:
+//
+//  The volume change journal is being deleted.
+//
+#define ERROR_JOURNAL_DELETE_IN_PROGRESS 1178L
+
+//
+// MessageId: ERROR_JOURNAL_NOT_ACTIVE
+//
+// MessageText:
+//
+//  The volume change journal is not active.
+//
+#define ERROR_JOURNAL_NOT_ACTIVE         1179L
+
+//
+// MessageId: ERROR_POTENTIAL_FILE_FOUND
+//
+// MessageText:
+//
+//  A file was found, but it may not be the correct file.
+//
+#define ERROR_POTENTIAL_FILE_FOUND       1180L
+
+//
+// MessageId: ERROR_JOURNAL_ENTRY_DELETED
+//
+// MessageText:
+//
+//  The journal entry has been deleted from the journal.
+//
+#define ERROR_JOURNAL_ENTRY_DELETED      1181L
+
+//
+// MessageId: ERROR_BAD_DEVICE
+//
+// MessageText:
+//
+//  The specified device name is invalid.
+//
+#define ERROR_BAD_DEVICE                 1200L
+
+//
+// MessageId: ERROR_CONNECTION_UNAVAIL
+//
+// MessageText:
+//
+//  The device is not currently connected but it is a remembered connection.
+//
+#define ERROR_CONNECTION_UNAVAIL         1201L
+
+//
+// MessageId: ERROR_DEVICE_ALREADY_REMEMBERED
+//
+// MessageText:
+//
+//  The local device name has a remembered connection to another network resource.
+//
+#define ERROR_DEVICE_ALREADY_REMEMBERED  1202L
+
+//
+// MessageId: ERROR_NO_NET_OR_BAD_PATH
+//
+// MessageText:
+//
+//  No network provider accepted the given network path.
+//
+#define ERROR_NO_NET_OR_BAD_PATH         1203L
+
+//
+// MessageId: ERROR_BAD_PROVIDER
+//
+// MessageText:
+//
+//  The specified network provider name is invalid.
+//
+#define ERROR_BAD_PROVIDER               1204L
+
+//
+// MessageId: ERROR_CANNOT_OPEN_PROFILE
+//
+// MessageText:
+//
+//  Unable to open the network connection profile.
+//
+#define ERROR_CANNOT_OPEN_PROFILE        1205L
+
+//
+// MessageId: ERROR_BAD_PROFILE
+//
+// MessageText:
+//
+//  The network connection profile is corrupted.
+//
+#define ERROR_BAD_PROFILE                1206L
+
+//
+// MessageId: ERROR_NOT_CONTAINER
+//
+// MessageText:
+//
+//  Cannot enumerate a noncontainer.
+//
+#define ERROR_NOT_CONTAINER              1207L
+
+//
+// MessageId: ERROR_EXTENDED_ERROR
+//
+// MessageText:
+//
+//  An extended error has occurred.
+//
+#define ERROR_EXTENDED_ERROR             1208L
+
+//
+// MessageId: ERROR_INVALID_GROUPNAME
+//
+// MessageText:
+//
+//  The format of the specified group name is invalid.
+//
+#define ERROR_INVALID_GROUPNAME          1209L
+
+//
+// MessageId: ERROR_INVALID_COMPUTERNAME
+//
+// MessageText:
+//
+//  The format of the specified computer name is invalid.
+//
+#define ERROR_INVALID_COMPUTERNAME       1210L
+
+//
+// MessageId: ERROR_INVALID_EVENTNAME
+//
+// MessageText:
+//
+//  The format of the specified event name is invalid.
+//
+#define ERROR_INVALID_EVENTNAME          1211L
+
+//
+// MessageId: ERROR_INVALID_DOMAINNAME
+//
+// MessageText:
+//
+//  The format of the specified domain name is invalid.
+//
+#define ERROR_INVALID_DOMAINNAME         1212L
+
+//
+// MessageId: ERROR_INVALID_SERVICENAME
+//
+// MessageText:
+//
+//  The format of the specified service name is invalid.
+//
+#define ERROR_INVALID_SERVICENAME        1213L
+
+//
+// MessageId: ERROR_INVALID_NETNAME
+//
+// MessageText:
+//
+//  The format of the specified network name is invalid.
+//
+#define ERROR_INVALID_NETNAME            1214L
+
+//
+// MessageId: ERROR_INVALID_SHARENAME
+//
+// MessageText:
+//
+//  The format of the specified share name is invalid.
+//
+#define ERROR_INVALID_SHARENAME          1215L
+
+//
+// MessageId: ERROR_INVALID_PASSWORDNAME
+//
+// MessageText:
+//
+//  The format of the specified password is invalid.
+//
+#define ERROR_INVALID_PASSWORDNAME       1216L
+
+//
+// MessageId: ERROR_INVALID_MESSAGENAME
+//
+// MessageText:
+//
+//  The format of the specified message name is invalid.
+//
+#define ERROR_INVALID_MESSAGENAME        1217L
+
+//
+// MessageId: ERROR_INVALID_MESSAGEDEST
+//
+// MessageText:
+//
+//  The format of the specified message destination is invalid.
+//
+#define ERROR_INVALID_MESSAGEDEST        1218L
+
+//
+// MessageId: ERROR_SESSION_CREDENTIAL_CONFLICT
+//
+// MessageText:
+//
+//  Multiple connections to a server or shared resource by the same user, using more than one user name, are not allowed. Disconnect all previous connections to the server or shared resource and try again.
+//
+#define ERROR_SESSION_CREDENTIAL_CONFLICT 1219L
+
+//
+// MessageId: ERROR_REMOTE_SESSION_LIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  An attempt was made to establish a session to a network server, but there are already too many sessions established to that server.
+//
+#define ERROR_REMOTE_SESSION_LIMIT_EXCEEDED 1220L
+
+//
+// MessageId: ERROR_DUP_DOMAINNAME
+//
+// MessageText:
+//
+//  The workgroup or domain name is already in use by another computer on the network.
+//
+#define ERROR_DUP_DOMAINNAME             1221L
+
+//
+// MessageId: ERROR_NO_NETWORK
+//
+// MessageText:
+//
+//  The network is not present or not started.
+//
+#define ERROR_NO_NETWORK                 1222L
+
+//
+// MessageId: ERROR_CANCELLED
+//
+// MessageText:
+//
+//  The operation was canceled by the user.
+//
+#define ERROR_CANCELLED                  1223L
+
+//
+// MessageId: ERROR_USER_MAPPED_FILE
+//
+// MessageText:
+//
+//  The requested operation cannot be performed on a file with a user-mapped section open.
+//
+#define ERROR_USER_MAPPED_FILE           1224L
+
+//
+// MessageId: ERROR_CONNECTION_REFUSED
+//
+// MessageText:
+//
+//  The remote system refused the network connection.
+//
+#define ERROR_CONNECTION_REFUSED         1225L
+
+//
+// MessageId: ERROR_GRACEFUL_DISCONNECT
+//
+// MessageText:
+//
+//  The network connection was gracefully closed.
+//
+#define ERROR_GRACEFUL_DISCONNECT        1226L
+
+//
+// MessageId: ERROR_ADDRESS_ALREADY_ASSOCIATED
+//
+// MessageText:
+//
+//  The network transport endpoint already has an address associated with it.
+//
+#define ERROR_ADDRESS_ALREADY_ASSOCIATED 1227L
+
+//
+// MessageId: ERROR_ADDRESS_NOT_ASSOCIATED
+//
+// MessageText:
+//
+//  An address has not yet been associated with the network endpoint.
+//
+#define ERROR_ADDRESS_NOT_ASSOCIATED     1228L
+
+//
+// MessageId: ERROR_CONNECTION_INVALID
+//
+// MessageText:
+//
+//  An operation was attempted on a nonexistent network connection.
+//
+#define ERROR_CONNECTION_INVALID         1229L
+
+//
+// MessageId: ERROR_CONNECTION_ACTIVE
+//
+// MessageText:
+//
+//  An invalid operation was attempted on an active network connection.
+//
+#define ERROR_CONNECTION_ACTIVE          1230L
+
+//
+// MessageId: ERROR_NETWORK_UNREACHABLE
+//
+// MessageText:
+//
+//  The network location cannot be reached. For information about network troubleshooting, see Windows Help.
+//
+#define ERROR_NETWORK_UNREACHABLE        1231L
+
+//
+// MessageId: ERROR_HOST_UNREACHABLE
+//
+// MessageText:
+//
+//  The network location cannot be reached. For information about network troubleshooting, see Windows Help.
+//
+#define ERROR_HOST_UNREACHABLE           1232L
+
+//
+// MessageId: ERROR_PROTOCOL_UNREACHABLE
+//
+// MessageText:
+//
+//  The network location cannot be reached. For information about network troubleshooting, see Windows Help.
+//
+#define ERROR_PROTOCOL_UNREACHABLE       1233L
+
+//
+// MessageId: ERROR_PORT_UNREACHABLE
+//
+// MessageText:
+//
+//  No service is operating at the destination network endpoint on the remote system.
+//
+#define ERROR_PORT_UNREACHABLE           1234L
+
+//
+// MessageId: ERROR_REQUEST_ABORTED
+//
+// MessageText:
+//
+//  The request was aborted.
+//
+#define ERROR_REQUEST_ABORTED            1235L
+
+//
+// MessageId: ERROR_CONNECTION_ABORTED
+//
+// MessageText:
+//
+//  The network connection was aborted by the local system.
+//
+#define ERROR_CONNECTION_ABORTED         1236L
+
+//
+// MessageId: ERROR_RETRY
+//
+// MessageText:
+//
+//  The operation could not be completed. A retry should be performed.
+//
+#define ERROR_RETRY                      1237L
+
+//
+// MessageId: ERROR_CONNECTION_COUNT_LIMIT
+//
+// MessageText:
+//
+//  A connection to the server could not be made because the limit on the number of concurrent connections for this account has been reached.
+//
+#define ERROR_CONNECTION_COUNT_LIMIT     1238L
+
+//
+// MessageId: ERROR_LOGIN_TIME_RESTRICTION
+//
+// MessageText:
+//
+//  Attempting to log in during an unauthorized time of day for this account.
+//
+#define ERROR_LOGIN_TIME_RESTRICTION     1239L
+
+//
+// MessageId: ERROR_LOGIN_WKSTA_RESTRICTION
+//
+// MessageText:
+//
+//  The account is not authorized to log in from this station.
+//
+#define ERROR_LOGIN_WKSTA_RESTRICTION    1240L
+
+//
+// MessageId: ERROR_INCORRECT_ADDRESS
+//
+// MessageText:
+//
+//  The network address could not be used for the operation requested.
+//
+#define ERROR_INCORRECT_ADDRESS          1241L
+
+//
+// MessageId: ERROR_ALREADY_REGISTERED
+//
+// MessageText:
+//
+//  The service is already registered.
+//
+#define ERROR_ALREADY_REGISTERED         1242L
+
+//
+// MessageId: ERROR_SERVICE_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified service does not exist.
+//
+#define ERROR_SERVICE_NOT_FOUND          1243L
+
+//
+// MessageId: ERROR_NOT_AUTHENTICATED
+//
+// MessageText:
+//
+//  The operation being requested was not performed because the user has not been authenticated.
+//
+#define ERROR_NOT_AUTHENTICATED          1244L
+
+//
+// MessageId: ERROR_NOT_LOGGED_ON
+//
+// MessageText:
+//
+//  The operation being requested was not performed because the user has not logged on to the network.
+//  The specified service does not exist.
+//
+#define ERROR_NOT_LOGGED_ON              1245L
+
+//
+// MessageId: ERROR_CONTINUE
+//
+// MessageText:
+//
+//  Continue with work in progress.
+//
+#define ERROR_CONTINUE                   1246L    // dderror
+
+//
+// MessageId: ERROR_ALREADY_INITIALIZED
+//
+// MessageText:
+//
+//  An attempt was made to perform an initialization operation when initialization has already been completed.
+//
+#define ERROR_ALREADY_INITIALIZED        1247L
+
+//
+// MessageId: ERROR_NO_MORE_DEVICES
+//
+// MessageText:
+//
+//  No more local devices.
+//
+#define ERROR_NO_MORE_DEVICES            1248L    // dderror
+
+//
+// MessageId: ERROR_NO_SUCH_SITE
+//
+// MessageText:
+//
+//  The specified site does not exist.
+//
+#define ERROR_NO_SUCH_SITE               1249L
+
+//
+// MessageId: ERROR_DOMAIN_CONTROLLER_EXISTS
+//
+// MessageText:
+//
+//  A domain controller with the specified name already exists.
+//
+#define ERROR_DOMAIN_CONTROLLER_EXISTS   1250L
+
+//
+// MessageId: ERROR_ONLY_IF_CONNECTED
+//
+// MessageText:
+//
+//  This operation is supported only when you are connected to the server.
+//
+#define ERROR_ONLY_IF_CONNECTED          1251L
+
+//
+// MessageId: ERROR_OVERRIDE_NOCHANGES
+//
+// MessageText:
+//
+//  The group policy framework should call the extension even if there are no changes.
+//
+#define ERROR_OVERRIDE_NOCHANGES         1252L
+
+//
+// MessageId: ERROR_BAD_USER_PROFILE
+//
+// MessageText:
+//
+//  The specified user does not have a valid profile.
+//
+#define ERROR_BAD_USER_PROFILE           1253L
+
+//
+// MessageId: ERROR_NOT_SUPPORTED_ON_SBS
+//
+// MessageText:
+//
+//  This operation is not supported on a Microsoft Small Business Server
+//
+#define ERROR_NOT_SUPPORTED_ON_SBS       1254L
+
+//
+// MessageId: ERROR_SERVER_SHUTDOWN_IN_PROGRESS
+//
+// MessageText:
+//
+//  The server machine is shutting down.
+//
+#define ERROR_SERVER_SHUTDOWN_IN_PROGRESS 1255L
+
+//
+// MessageId: ERROR_HOST_DOWN
+//
+// MessageText:
+//
+//  The remote system is not available. For information about network troubleshooting, see Windows Help.
+//
+#define ERROR_HOST_DOWN                  1256L
+
+//
+// MessageId: ERROR_NON_ACCOUNT_SID
+//
+// MessageText:
+//
+//  The security identifier provided is not from an account domain.
+//
+#define ERROR_NON_ACCOUNT_SID            1257L
+
+//
+// MessageId: ERROR_NON_DOMAIN_SID
+//
+// MessageText:
+//
+//  The security identifier provided does not have a domain component.
+//
+#define ERROR_NON_DOMAIN_SID             1258L
+
+//
+// MessageId: ERROR_APPHELP_BLOCK
+//
+// MessageText:
+//
+//  AppHelp dialog canceled thus preventing the application from starting.
+//
+#define ERROR_APPHELP_BLOCK              1259L
+
+//
+// MessageId: ERROR_ACCESS_DISABLED_BY_POLICY
+//
+// MessageText:
+//
+//  Windows cannot open this program because it has been prevented by a software restriction policy. For more information, open Event Viewer or contact your system administrator.
+//
+#define ERROR_ACCESS_DISABLED_BY_POLICY  1260L
+
+//
+// MessageId: ERROR_REG_NAT_CONSUMPTION
+//
+// MessageText:
+//
+//  A program attempt to use an invalid register value.  Normally caused by an uninitialized register. This error is Itanium specific.
+//
+#define ERROR_REG_NAT_CONSUMPTION        1261L
+
+//
+// MessageId: ERROR_CSCSHARE_OFFLINE
+//
+// MessageText:
+//
+//  The share is currently offline or does not exist.
+//
+#define ERROR_CSCSHARE_OFFLINE           1262L
+
+//
+// MessageId: ERROR_PKINIT_FAILURE
+//
+// MessageText:
+//
+//  The kerberos protocol encountered an error while validating the
+//  KDC certificate during smartcard logon.
+//
+#define ERROR_PKINIT_FAILURE             1263L
+
+//
+// MessageId: ERROR_SMARTCARD_SUBSYSTEM_FAILURE
+//
+// MessageText:
+//
+//  The kerberos protocol encountered an error while attempting to utilize
+//  the smartcard subsystem.
+//
+#define ERROR_SMARTCARD_SUBSYSTEM_FAILURE 1264L
+
+//
+// MessageId: ERROR_DOWNGRADE_DETECTED
+//
+// MessageText:
+//
+//  The system detected a possible attempt to compromise security. Please ensure that you can contact the server that authenticated you.
+//
+#define ERROR_DOWNGRADE_DETECTED         1265L
+
+//
+// Do not use ID's 1266 - 1270 as the symbolicNames have been moved to SEC_E_*
+//
+//
+// MessageId: ERROR_MACHINE_LOCKED
+//
+// MessageText:
+//
+//  The machine is locked and can not be shut down without the force option.
+//
+#define ERROR_MACHINE_LOCKED             1271L
+
+//
+// MessageId: ERROR_CALLBACK_SUPPLIED_INVALID_DATA
+//
+// MessageText:
+//
+//  An application-defined callback gave invalid data when called.
+//
+#define ERROR_CALLBACK_SUPPLIED_INVALID_DATA 1273L
+
+//
+// MessageId: ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED
+//
+// MessageText:
+//
+//  The group policy framework should call the extension in the synchronous foreground policy refresh.
+//
+#define ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED 1274L
+
+//
+// MessageId: ERROR_DRIVER_BLOCKED
+//
+// MessageText:
+//
+//  This driver has been blocked from loading
+//
+#define ERROR_DRIVER_BLOCKED             1275L
+
+//
+// MessageId: ERROR_INVALID_IMPORT_OF_NON_DLL
+//
+// MessageText:
+//
+//  A dynamic link library (DLL) referenced a module that was neither a DLL nor the process's executable image.
+//
+#define ERROR_INVALID_IMPORT_OF_NON_DLL  1276L
+
+//
+// MessageId: ERROR_ACCESS_DISABLED_WEBBLADE
+//
+// MessageText:
+//
+//  Windows cannot open this program since it has been disabled.
+//
+#define ERROR_ACCESS_DISABLED_WEBBLADE   1277L
+
+//
+// MessageId: ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER
+//
+// MessageText:
+//
+//  Windows cannot open this program because the license enforcement system has been tampered with or become corrupted.
+//
+#define ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER 1278L
+
+//
+// MessageId: ERROR_RECOVERY_FAILURE
+//
+// MessageText:
+//
+//  A transaction recover failed.
+//
+#define ERROR_RECOVERY_FAILURE           1279L
+
+//
+// MessageId: ERROR_ALREADY_FIBER
+//
+// MessageText:
+//
+//  The current thread has already been converted to a fiber.
+//
+#define ERROR_ALREADY_FIBER              1280L
+
+//
+// MessageId: ERROR_ALREADY_THREAD
+//
+// MessageText:
+//
+//  The current thread has already been converted from a fiber.
+//
+#define ERROR_ALREADY_THREAD             1281L
+
+//
+// MessageId: ERROR_STACK_BUFFER_OVERRUN
+//
+// MessageText:
+//
+//  The system detected an overrun of a stack-based buffer in this application.  This
+//  overrun could potentially allow a malicious user to gain control of this application.
+//
+#define ERROR_STACK_BUFFER_OVERRUN       1282L
+
+//
+// MessageId: ERROR_PARAMETER_QUOTA_EXCEEDED
+//
+// MessageText:
+//
+//  Data present in one of the parameters is more than the function can operate on.
+//
+#define ERROR_PARAMETER_QUOTA_EXCEEDED   1283L
+
+//
+// MessageId: ERROR_DEBUGGER_INACTIVE
+//
+// MessageText:
+//
+//  An attempt to do an operation on a debug object failed because the object is in the process of being deleted.
+//
+#define ERROR_DEBUGGER_INACTIVE          1284L
+
+//
+// MessageId: ERROR_DELAY_LOAD_FAILED
+//
+// MessageText:
+//
+//  An attempt to delay-load a .dll or get a function address in a delay-loaded .dll failed.
+//
+#define ERROR_DELAY_LOAD_FAILED          1285L
+
+//
+// MessageId: ERROR_VDM_DISALLOWED
+//
+// MessageText:
+//
+//  %1 is a 16-bit application. You do not have permissions to execute 16-bit applications. Check your permissions with your system administrator.
+//
+#define ERROR_VDM_DISALLOWED             1286L
+
+
+///////////////////////////
+//
+// Add new status codes before this point unless there is a component specific section below.
+//
+///////////////////////////
+
+
+///////////////////////////
+//                       //
+// Security Status Codes //
+//                       //
+///////////////////////////
+
+
+//
+// MessageId: ERROR_NOT_ALL_ASSIGNED
+//
+// MessageText:
+//
+//  Not all privileges referenced are assigned to the caller.
+//
+#define ERROR_NOT_ALL_ASSIGNED           1300L
+
+//
+// MessageId: ERROR_SOME_NOT_MAPPED
+//
+// MessageText:
+//
+//  Some mapping between account names and security IDs was not done.
+//
+#define ERROR_SOME_NOT_MAPPED            1301L
+
+//
+// MessageId: ERROR_NO_QUOTAS_FOR_ACCOUNT
+//
+// MessageText:
+//
+//  No system quota limits are specifically set for this account.
+//
+#define ERROR_NO_QUOTAS_FOR_ACCOUNT      1302L
+
+//
+// MessageId: ERROR_LOCAL_USER_SESSION_KEY
+//
+// MessageText:
+//
+//  No encryption key is available. A well-known encryption key was returned.
+//
+#define ERROR_LOCAL_USER_SESSION_KEY     1303L
+
+//
+// MessageId: ERROR_NULL_LM_PASSWORD
+//
+// MessageText:
+//
+//  The password is too complex to be converted to a LAN Manager password. The LAN Manager password returned is a NULL string.
+//
+#define ERROR_NULL_LM_PASSWORD           1304L
+
+//
+// MessageId: ERROR_UNKNOWN_REVISION
+//
+// MessageText:
+//
+//  The revision level is unknown.
+//
+#define ERROR_UNKNOWN_REVISION           1305L
+
+//
+// MessageId: ERROR_REVISION_MISMATCH
+//
+// MessageText:
+//
+//  Indicates two revision levels are incompatible.
+//
+#define ERROR_REVISION_MISMATCH          1306L
+
+//
+// MessageId: ERROR_INVALID_OWNER
+//
+// MessageText:
+//
+//  This security ID may not be assigned as the owner of this object.
+//
+#define ERROR_INVALID_OWNER              1307L
+
+//
+// MessageId: ERROR_INVALID_PRIMARY_GROUP
+//
+// MessageText:
+//
+//  This security ID may not be assigned as the primary group of an object.
+//
+#define ERROR_INVALID_PRIMARY_GROUP      1308L
+
+//
+// MessageId: ERROR_NO_IMPERSONATION_TOKEN
+//
+// MessageText:
+//
+//  An attempt has been made to operate on an impersonation token by a thread that is not currently impersonating a client.
+//
+#define ERROR_NO_IMPERSONATION_TOKEN     1309L
+
+//
+// MessageId: ERROR_CANT_DISABLE_MANDATORY
+//
+// MessageText:
+//
+//  The group may not be disabled.
+//
+#define ERROR_CANT_DISABLE_MANDATORY     1310L
+
+//
+// MessageId: ERROR_NO_LOGON_SERVERS
+//
+// MessageText:
+//
+//  There are currently no logon servers available to service the logon request.
+//
+#define ERROR_NO_LOGON_SERVERS           1311L
+
+//
+// MessageId: ERROR_NO_SUCH_LOGON_SESSION
+//
+// MessageText:
+//
+//  A specified logon session does not exist. It may already have been terminated.
+//
+#define ERROR_NO_SUCH_LOGON_SESSION      1312L
+
+//
+// MessageId: ERROR_NO_SUCH_PRIVILEGE
+//
+// MessageText:
+//
+//  A specified privilege does not exist.
+//
+#define ERROR_NO_SUCH_PRIVILEGE          1313L
+
+//
+// MessageId: ERROR_PRIVILEGE_NOT_HELD
+//
+// MessageText:
+//
+//  A required privilege is not held by the client.
+//
+#define ERROR_PRIVILEGE_NOT_HELD         1314L
+
+//
+// MessageId: ERROR_INVALID_ACCOUNT_NAME
+//
+// MessageText:
+//
+//  The name provided is not a properly formed account name.
+//
+#define ERROR_INVALID_ACCOUNT_NAME       1315L
+
+//
+// MessageId: ERROR_USER_EXISTS
+//
+// MessageText:
+//
+//  The specified user already exists.
+//
+#define ERROR_USER_EXISTS                1316L
+
+//
+// MessageId: ERROR_NO_SUCH_USER
+//
+// MessageText:
+//
+//  The specified user does not exist.
+//
+#define ERROR_NO_SUCH_USER               1317L
+
+//
+// MessageId: ERROR_GROUP_EXISTS
+//
+// MessageText:
+//
+//  The specified group already exists.
+//
+#define ERROR_GROUP_EXISTS               1318L
+
+//
+// MessageId: ERROR_NO_SUCH_GROUP
+//
+// MessageText:
+//
+//  The specified group does not exist.
+//
+#define ERROR_NO_SUCH_GROUP              1319L
+
+//
+// MessageId: ERROR_MEMBER_IN_GROUP
+//
+// MessageText:
+//
+//  Either the specified user account is already a member of the specified group, or the specified group cannot be deleted because it contains a member.
+//
+#define ERROR_MEMBER_IN_GROUP            1320L
+
+//
+// MessageId: ERROR_MEMBER_NOT_IN_GROUP
+//
+// MessageText:
+//
+//  The specified user account is not a member of the specified group account.
+//
+#define ERROR_MEMBER_NOT_IN_GROUP        1321L
+
+//
+// MessageId: ERROR_LAST_ADMIN
+//
+// MessageText:
+//
+//  The last remaining administration account cannot be disabled or deleted.
+//
+#define ERROR_LAST_ADMIN                 1322L
+
+//
+// MessageId: ERROR_WRONG_PASSWORD
+//
+// MessageText:
+//
+//  Unable to update the password. The value provided as the current password is incorrect.
+//
+#define ERROR_WRONG_PASSWORD             1323L
+
+//
+// MessageId: ERROR_ILL_FORMED_PASSWORD
+//
+// MessageText:
+//
+//  Unable to update the password. The value provided for the new password contains values that are not allowed in passwords.
+//
+#define ERROR_ILL_FORMED_PASSWORD        1324L
+
+//
+// MessageId: ERROR_PASSWORD_RESTRICTION
+//
+// MessageText:
+//
+//  Unable to update the password. The value provided for the new password does not meet the length, complexity, or history requirement of the domain.
+//
+#define ERROR_PASSWORD_RESTRICTION       1325L
+
+//
+// MessageId: ERROR_LOGON_FAILURE
+//
+// MessageText:
+//
+//  Logon failure: unknown user name or bad password.
+//
+#define ERROR_LOGON_FAILURE              1326L
+
+//
+// MessageId: ERROR_ACCOUNT_RESTRICTION
+//
+// MessageText:
+//
+//  Logon failure: user account restriction.  Possible reasons are blank passwords not allowed, logon hour restrictions, or a policy restriction has been enforced.
+//
+#define ERROR_ACCOUNT_RESTRICTION        1327L
+
+//
+// MessageId: ERROR_INVALID_LOGON_HOURS
+//
+// MessageText:
+//
+//  Logon failure: account logon time restriction violation.
+//
+#define ERROR_INVALID_LOGON_HOURS        1328L
+
+//
+// MessageId: ERROR_INVALID_WORKSTATION
+//
+// MessageText:
+//
+//  Logon failure: user not allowed to log on to this computer.
+//
+#define ERROR_INVALID_WORKSTATION        1329L
+
+//
+// MessageId: ERROR_PASSWORD_EXPIRED
+//
+// MessageText:
+//
+//  Logon failure: the specified account password has expired.
+//
+#define ERROR_PASSWORD_EXPIRED           1330L
+
+//
+// MessageId: ERROR_ACCOUNT_DISABLED
+//
+// MessageText:
+//
+//  Logon failure: account currently disabled.
+//
+#define ERROR_ACCOUNT_DISABLED           1331L
+
+//
+// MessageId: ERROR_NONE_MAPPED
+//
+// MessageText:
+//
+//  No mapping between account names and security IDs was done.
+//
+#define ERROR_NONE_MAPPED                1332L
+
+//
+// MessageId: ERROR_TOO_MANY_LUIDS_REQUESTED
+//
+// MessageText:
+//
+//  Too many local user identifiers (LUIDs) were requested at one time.
+//
+#define ERROR_TOO_MANY_LUIDS_REQUESTED   1333L
+
+//
+// MessageId: ERROR_LUIDS_EXHAUSTED
+//
+// MessageText:
+//
+//  No more local user identifiers (LUIDs) are available.
+//
+#define ERROR_LUIDS_EXHAUSTED            1334L
+
+//
+// MessageId: ERROR_INVALID_SUB_AUTHORITY
+//
+// MessageText:
+//
+//  The subauthority part of a security ID is invalid for this particular use.
+//
+#define ERROR_INVALID_SUB_AUTHORITY      1335L
+
+//
+// MessageId: ERROR_INVALID_ACL
+//
+// MessageText:
+//
+//  The access control list (ACL) structure is invalid.
+//
+#define ERROR_INVALID_ACL                1336L
+
+//
+// MessageId: ERROR_INVALID_SID
+//
+// MessageText:
+//
+//  The security ID structure is invalid.
+//
+#define ERROR_INVALID_SID                1337L
+
+//
+// MessageId: ERROR_INVALID_SECURITY_DESCR
+//
+// MessageText:
+//
+//  The security descriptor structure is invalid.
+//
+#define ERROR_INVALID_SECURITY_DESCR     1338L
+
+//
+// MessageId: ERROR_BAD_INHERITANCE_ACL
+//
+// MessageText:
+//
+//  The inherited access control list (ACL) or access control entry (ACE) could not be built.
+//
+#define ERROR_BAD_INHERITANCE_ACL        1340L
+
+//
+// MessageId: ERROR_SERVER_DISABLED
+//
+// MessageText:
+//
+//  The server is currently disabled.
+//
+#define ERROR_SERVER_DISABLED            1341L
+
+//
+// MessageId: ERROR_SERVER_NOT_DISABLED
+//
+// MessageText:
+//
+//  The server is currently enabled.
+//
+#define ERROR_SERVER_NOT_DISABLED        1342L
+
+//
+// MessageId: ERROR_INVALID_ID_AUTHORITY
+//
+// MessageText:
+//
+//  The value provided was an invalid value for an identifier authority.
+//
+#define ERROR_INVALID_ID_AUTHORITY       1343L
+
+//
+// MessageId: ERROR_ALLOTTED_SPACE_EXCEEDED
+//
+// MessageText:
+//
+//  No more memory is available for security information updates.
+//
+#define ERROR_ALLOTTED_SPACE_EXCEEDED    1344L
+
+//
+// MessageId: ERROR_INVALID_GROUP_ATTRIBUTES
+//
+// MessageText:
+//
+//  The specified attributes are invalid, or incompatible with the attributes for the group as a whole.
+//
+#define ERROR_INVALID_GROUP_ATTRIBUTES   1345L
+
+//
+// MessageId: ERROR_BAD_IMPERSONATION_LEVEL
+//
+// MessageText:
+//
+//  Either a required impersonation level was not provided, or the provided impersonation level is invalid.
+//
+#define ERROR_BAD_IMPERSONATION_LEVEL    1346L
+
+//
+// MessageId: ERROR_CANT_OPEN_ANONYMOUS
+//
+// MessageText:
+//
+//  Cannot open an anonymous level security token.
+//
+#define ERROR_CANT_OPEN_ANONYMOUS        1347L
+
+//
+// MessageId: ERROR_BAD_VALIDATION_CLASS
+//
+// MessageText:
+//
+//  The validation information class requested was invalid.
+//
+#define ERROR_BAD_VALIDATION_CLASS       1348L
+
+//
+// MessageId: ERROR_BAD_TOKEN_TYPE
+//
+// MessageText:
+//
+//  The type of the token is inappropriate for its attempted use.
+//
+#define ERROR_BAD_TOKEN_TYPE             1349L
+
+//
+// MessageId: ERROR_NO_SECURITY_ON_OBJECT
+//
+// MessageText:
+//
+//  Unable to perform a security operation on an object that has no associated security.
+//
+#define ERROR_NO_SECURITY_ON_OBJECT      1350L
+
+//
+// MessageId: ERROR_CANT_ACCESS_DOMAIN_INFO
+//
+// MessageText:
+//
+//  Configuration information could not be read from the domain controller, either because the machine is unavailable, or access has been denied.
+//
+#define ERROR_CANT_ACCESS_DOMAIN_INFO    1351L
+
+//
+// MessageId: ERROR_INVALID_SERVER_STATE
+//
+// MessageText:
+//
+//  The security account manager (SAM) or local security authority (LSA) server was in the wrong state to perform the security operation.
+//
+#define ERROR_INVALID_SERVER_STATE       1352L
+
+//
+// MessageId: ERROR_INVALID_DOMAIN_STATE
+//
+// MessageText:
+//
+//  The domain was in the wrong state to perform the security operation.
+//
+#define ERROR_INVALID_DOMAIN_STATE       1353L
+
+//
+// MessageId: ERROR_INVALID_DOMAIN_ROLE
+//
+// MessageText:
+//
+//  This operation is only allowed for the Primary Domain Controller of the domain.
+//
+#define ERROR_INVALID_DOMAIN_ROLE        1354L
+
+//
+// MessageId: ERROR_NO_SUCH_DOMAIN
+//
+// MessageText:
+//
+//  The specified domain either does not exist or could not be contacted.
+//
+#define ERROR_NO_SUCH_DOMAIN             1355L
+
+//
+// MessageId: ERROR_DOMAIN_EXISTS
+//
+// MessageText:
+//
+//  The specified domain already exists.
+//
+#define ERROR_DOMAIN_EXISTS              1356L
+
+//
+// MessageId: ERROR_DOMAIN_LIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  An attempt was made to exceed the limit on the number of domains per server.
+//
+#define ERROR_DOMAIN_LIMIT_EXCEEDED      1357L
+
+//
+// MessageId: ERROR_INTERNAL_DB_CORRUPTION
+//
+// MessageText:
+//
+//  Unable to complete the requested operation because of either a catastrophic media failure or a data structure corruption on the disk.
+//
+#define ERROR_INTERNAL_DB_CORRUPTION     1358L
+
+//
+// MessageId: ERROR_INTERNAL_ERROR
+//
+// MessageText:
+//
+//  An internal error occurred.
+//
+#define ERROR_INTERNAL_ERROR             1359L
+
+//
+// MessageId: ERROR_GENERIC_NOT_MAPPED
+//
+// MessageText:
+//
+//  Generic access types were contained in an access mask which should already be mapped to nongeneric types.
+//
+#define ERROR_GENERIC_NOT_MAPPED         1360L
+
+//
+// MessageId: ERROR_BAD_DESCRIPTOR_FORMAT
+//
+// MessageText:
+//
+//  A security descriptor is not in the right format (absolute or self-relative).
+//
+#define ERROR_BAD_DESCRIPTOR_FORMAT      1361L
+
+//
+// MessageId: ERROR_NOT_LOGON_PROCESS
+//
+// MessageText:
+//
+//  The requested action is restricted for use by logon processes only. The calling process has not registered as a logon process.
+//
+#define ERROR_NOT_LOGON_PROCESS          1362L
+
+//
+// MessageId: ERROR_LOGON_SESSION_EXISTS
+//
+// MessageText:
+//
+//  Cannot start a new logon session with an ID that is already in use.
+//
+#define ERROR_LOGON_SESSION_EXISTS       1363L
+
+//
+// MessageId: ERROR_NO_SUCH_PACKAGE
+//
+// MessageText:
+//
+//  A specified authentication package is unknown.
+//
+#define ERROR_NO_SUCH_PACKAGE            1364L
+
+//
+// MessageId: ERROR_BAD_LOGON_SESSION_STATE
+//
+// MessageText:
+//
+//  The logon session is not in a state that is consistent with the requested operation.
+//
+#define ERROR_BAD_LOGON_SESSION_STATE    1365L
+
+//
+// MessageId: ERROR_LOGON_SESSION_COLLISION
+//
+// MessageText:
+//
+//  The logon session ID is already in use.
+//
+#define ERROR_LOGON_SESSION_COLLISION    1366L
+
+//
+// MessageId: ERROR_INVALID_LOGON_TYPE
+//
+// MessageText:
+//
+//  A logon request contained an invalid logon type value.
+//
+#define ERROR_INVALID_LOGON_TYPE         1367L
+
+//
+// MessageId: ERROR_CANNOT_IMPERSONATE
+//
+// MessageText:
+//
+//  Unable to impersonate using a named pipe until data has been read from that pipe.
+//
+#define ERROR_CANNOT_IMPERSONATE         1368L
+
+//
+// MessageId: ERROR_RXACT_INVALID_STATE
+//
+// MessageText:
+//
+//  The transaction state of a registry subtree is incompatible with the requested operation.
+//
+#define ERROR_RXACT_INVALID_STATE        1369L
+
+//
+// MessageId: ERROR_RXACT_COMMIT_FAILURE
+//
+// MessageText:
+//
+//  An internal security database corruption has been encountered.
+//
+#define ERROR_RXACT_COMMIT_FAILURE       1370L
+
+//
+// MessageId: ERROR_SPECIAL_ACCOUNT
+//
+// MessageText:
+//
+//  Cannot perform this operation on built-in accounts.
+//
+#define ERROR_SPECIAL_ACCOUNT            1371L
+
+//
+// MessageId: ERROR_SPECIAL_GROUP
+//
+// MessageText:
+//
+//  Cannot perform this operation on this built-in special group.
+//
+#define ERROR_SPECIAL_GROUP              1372L
+
+//
+// MessageId: ERROR_SPECIAL_USER
+//
+// MessageText:
+//
+//  Cannot perform this operation on this built-in special user.
+//
+#define ERROR_SPECIAL_USER               1373L
+
+//
+// MessageId: ERROR_MEMBERS_PRIMARY_GROUP
+//
+// MessageText:
+//
+//  The user cannot be removed from a group because the group is currently the user's primary group.
+//
+#define ERROR_MEMBERS_PRIMARY_GROUP      1374L
+
+//
+// MessageId: ERROR_TOKEN_ALREADY_IN_USE
+//
+// MessageText:
+//
+//  The token is already in use as a primary token.
+//
+#define ERROR_TOKEN_ALREADY_IN_USE       1375L
+
+//
+// MessageId: ERROR_NO_SUCH_ALIAS
+//
+// MessageText:
+//
+//  The specified local group does not exist.
+//
+#define ERROR_NO_SUCH_ALIAS              1376L
+
+//
+// MessageId: ERROR_MEMBER_NOT_IN_ALIAS
+//
+// MessageText:
+//
+//  The specified account name is not a member of the local group.
+//
+#define ERROR_MEMBER_NOT_IN_ALIAS        1377L
+
+//
+// MessageId: ERROR_MEMBER_IN_ALIAS
+//
+// MessageText:
+//
+//  The specified account name is already a member of the local group.
+//
+#define ERROR_MEMBER_IN_ALIAS            1378L
+
+//
+// MessageId: ERROR_ALIAS_EXISTS
+//
+// MessageText:
+//
+//  The specified local group already exists.
+//
+#define ERROR_ALIAS_EXISTS               1379L
+
+//
+// MessageId: ERROR_LOGON_NOT_GRANTED
+//
+// MessageText:
+//
+//  Logon failure: the user has not been granted the requested logon type at this computer.
+//
+#define ERROR_LOGON_NOT_GRANTED          1380L
+
+//
+// MessageId: ERROR_TOO_MANY_SECRETS
+//
+// MessageText:
+//
+//  The maximum number of secrets that may be stored in a single system has been exceeded.
+//
+#define ERROR_TOO_MANY_SECRETS           1381L
+
+//
+// MessageId: ERROR_SECRET_TOO_LONG
+//
+// MessageText:
+//
+//  The length of a secret exceeds the maximum length allowed.
+//
+#define ERROR_SECRET_TOO_LONG            1382L
+
+//
+// MessageId: ERROR_INTERNAL_DB_ERROR
+//
+// MessageText:
+//
+//  The local security authority database contains an internal inconsistency.
+//
+#define ERROR_INTERNAL_DB_ERROR          1383L
+
+//
+// MessageId: ERROR_TOO_MANY_CONTEXT_IDS
+//
+// MessageText:
+//
+//  During a logon attempt, the user's security context accumulated too many security IDs.
+//
+#define ERROR_TOO_MANY_CONTEXT_IDS       1384L
+
+//
+// MessageId: ERROR_LOGON_TYPE_NOT_GRANTED
+//
+// MessageText:
+//
+//  Logon failure: the user has not been granted the requested logon type at this computer.
+//
+#define ERROR_LOGON_TYPE_NOT_GRANTED     1385L
+
+//
+// MessageId: ERROR_NT_CROSS_ENCRYPTION_REQUIRED
+//
+// MessageText:
+//
+//  A cross-encrypted password is necessary to change a user password.
+//
+#define ERROR_NT_CROSS_ENCRYPTION_REQUIRED 1386L
+
+//
+// MessageId: ERROR_NO_SUCH_MEMBER
+//
+// MessageText:
+//
+//  A member could not be added to or removed from the local group because the member does not exist.
+//
+#define ERROR_NO_SUCH_MEMBER             1387L
+
+//
+// MessageId: ERROR_INVALID_MEMBER
+//
+// MessageText:
+//
+//  A new member could not be added to a local group because the member has the wrong account type.
+//
+#define ERROR_INVALID_MEMBER             1388L
+
+//
+// MessageId: ERROR_TOO_MANY_SIDS
+//
+// MessageText:
+//
+//  Too many security IDs have been specified.
+//
+#define ERROR_TOO_MANY_SIDS              1389L
+
+//
+// MessageId: ERROR_LM_CROSS_ENCRYPTION_REQUIRED
+//
+// MessageText:
+//
+//  A cross-encrypted password is necessary to change this user password.
+//
+#define ERROR_LM_CROSS_ENCRYPTION_REQUIRED 1390L
+
+//
+// MessageId: ERROR_NO_INHERITANCE
+//
+// MessageText:
+//
+//  Indicates an ACL contains no inheritable components.
+//
+#define ERROR_NO_INHERITANCE             1391L
+
+//
+// MessageId: ERROR_FILE_CORRUPT
+//
+// MessageText:
+//
+//  The file or directory is corrupted and unreadable.
+//
+#define ERROR_FILE_CORRUPT               1392L
+
+//
+// MessageId: ERROR_DISK_CORRUPT
+//
+// MessageText:
+//
+//  The disk structure is corrupted and unreadable.
+//
+#define ERROR_DISK_CORRUPT               1393L
+
+//
+// MessageId: ERROR_NO_USER_SESSION_KEY
+//
+// MessageText:
+//
+//  There is no user session key for the specified logon session.
+//
+#define ERROR_NO_USER_SESSION_KEY        1394L
+
+//
+// MessageId: ERROR_LICENSE_QUOTA_EXCEEDED
+//
+// MessageText:
+//
+//  The service being accessed is licensed for a particular number of connections.
+//  No more connections can be made to the service at this time because there are already as many connections as the service can accept.
+//
+#define ERROR_LICENSE_QUOTA_EXCEEDED     1395L
+
+//
+// MessageId: ERROR_WRONG_TARGET_NAME
+//
+// MessageText:
+//
+//  Logon Failure: The target account name is incorrect.
+//
+#define ERROR_WRONG_TARGET_NAME          1396L
+
+//
+// MessageId: ERROR_MUTUAL_AUTH_FAILED
+//
+// MessageText:
+//
+//  Mutual Authentication failed. The server's password is out of date at the domain controller.
+//
+#define ERROR_MUTUAL_AUTH_FAILED         1397L
+
+//
+// MessageId: ERROR_TIME_SKEW
+//
+// MessageText:
+//
+//  There is a time and/or date difference between the client and server.
+//
+#define ERROR_TIME_SKEW                  1398L
+
+//
+// MessageId: ERROR_CURRENT_DOMAIN_NOT_ALLOWED
+//
+// MessageText:
+//
+//  This operation can not be performed on the current domain.
+//
+#define ERROR_CURRENT_DOMAIN_NOT_ALLOWED 1399L
+
+// End of security error codes
+
+
+
+///////////////////////////
+//                       //
+// WinUser Error Codes   //
+//                       //
+///////////////////////////
+
+
+//
+// MessageId: ERROR_INVALID_WINDOW_HANDLE
+//
+// MessageText:
+//
+//  Invalid window handle.
+//
+#define ERROR_INVALID_WINDOW_HANDLE      1400L
+
+//
+// MessageId: ERROR_INVALID_MENU_HANDLE
+//
+// MessageText:
+//
+//  Invalid menu handle.
+//
+#define ERROR_INVALID_MENU_HANDLE        1401L
+
+//
+// MessageId: ERROR_INVALID_CURSOR_HANDLE
+//
+// MessageText:
+//
+//  Invalid cursor handle.
+//
+#define ERROR_INVALID_CURSOR_HANDLE      1402L
+
+//
+// MessageId: ERROR_INVALID_ACCEL_HANDLE
+//
+// MessageText:
+//
+//  Invalid accelerator table handle.
+//
+#define ERROR_INVALID_ACCEL_HANDLE       1403L
+
+//
+// MessageId: ERROR_INVALID_HOOK_HANDLE
+//
+// MessageText:
+//
+//  Invalid hook handle.
+//
+#define ERROR_INVALID_HOOK_HANDLE        1404L
+
+//
+// MessageId: ERROR_INVALID_DWP_HANDLE
+//
+// MessageText:
+//
+//  Invalid handle to a multiple-window position structure.
+//
+#define ERROR_INVALID_DWP_HANDLE         1405L
+
+//
+// MessageId: ERROR_TLW_WITH_WSCHILD
+//
+// MessageText:
+//
+//  Cannot create a top-level child window.
+//
+#define ERROR_TLW_WITH_WSCHILD           1406L
+
+//
+// MessageId: ERROR_CANNOT_FIND_WND_CLASS
+//
+// MessageText:
+//
+//  Cannot find window class.
+//
+#define ERROR_CANNOT_FIND_WND_CLASS      1407L
+
+//
+// MessageId: ERROR_WINDOW_OF_OTHER_THREAD
+//
+// MessageText:
+//
+//  Invalid window; it belongs to other thread.
+//
+#define ERROR_WINDOW_OF_OTHER_THREAD     1408L
+
+//
+// MessageId: ERROR_HOTKEY_ALREADY_REGISTERED
+//
+// MessageText:
+//
+//  Hot key is already registered.
+//
+#define ERROR_HOTKEY_ALREADY_REGISTERED  1409L
+
+//
+// MessageId: ERROR_CLASS_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  Class already exists.
+//
+#define ERROR_CLASS_ALREADY_EXISTS       1410L
+
+//
+// MessageId: ERROR_CLASS_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  Class does not exist.
+//
+#define ERROR_CLASS_DOES_NOT_EXIST       1411L
+
+//
+// MessageId: ERROR_CLASS_HAS_WINDOWS
+//
+// MessageText:
+//
+//  Class still has open windows.
+//
+#define ERROR_CLASS_HAS_WINDOWS          1412L
+
+//
+// MessageId: ERROR_INVALID_INDEX
+//
+// MessageText:
+//
+//  Invalid index.
+//
+#define ERROR_INVALID_INDEX              1413L
+
+//
+// MessageId: ERROR_INVALID_ICON_HANDLE
+//
+// MessageText:
+//
+//  Invalid icon handle.
+//
+#define ERROR_INVALID_ICON_HANDLE        1414L
+
+//
+// MessageId: ERROR_PRIVATE_DIALOG_INDEX
+//
+// MessageText:
+//
+//  Using private DIALOG window words.
+//
+#define ERROR_PRIVATE_DIALOG_INDEX       1415L
+
+//
+// MessageId: ERROR_LISTBOX_ID_NOT_FOUND
+//
+// MessageText:
+//
+//  The list box identifier was not found.
+//
+#define ERROR_LISTBOX_ID_NOT_FOUND       1416L
+
+//
+// MessageId: ERROR_NO_WILDCARD_CHARACTERS
+//
+// MessageText:
+//
+//  No wildcards were found.
+//
+#define ERROR_NO_WILDCARD_CHARACTERS     1417L
+
+//
+// MessageId: ERROR_CLIPBOARD_NOT_OPEN
+//
+// MessageText:
+//
+//  Thread does not have a clipboard open.
+//
+#define ERROR_CLIPBOARD_NOT_OPEN         1418L
+
+//
+// MessageId: ERROR_HOTKEY_NOT_REGISTERED
+//
+// MessageText:
+//
+//  Hot key is not registered.
+//
+#define ERROR_HOTKEY_NOT_REGISTERED      1419L
+
+//
+// MessageId: ERROR_WINDOW_NOT_DIALOG
+//
+// MessageText:
+//
+//  The window is not a valid dialog window.
+//
+#define ERROR_WINDOW_NOT_DIALOG          1420L
+
+//
+// MessageId: ERROR_CONTROL_ID_NOT_FOUND
+//
+// MessageText:
+//
+//  Control ID not found.
+//
+#define ERROR_CONTROL_ID_NOT_FOUND       1421L
+
+//
+// MessageId: ERROR_INVALID_COMBOBOX_MESSAGE
+//
+// MessageText:
+//
+//  Invalid message for a combo box because it does not have an edit control.
+//
+#define ERROR_INVALID_COMBOBOX_MESSAGE   1422L
+
+//
+// MessageId: ERROR_WINDOW_NOT_COMBOBOX
+//
+// MessageText:
+//
+//  The window is not a combo box.
+//
+#define ERROR_WINDOW_NOT_COMBOBOX        1423L
+
+//
+// MessageId: ERROR_INVALID_EDIT_HEIGHT
+//
+// MessageText:
+//
+//  Height must be less than 256.
+//
+#define ERROR_INVALID_EDIT_HEIGHT        1424L
+
+//
+// MessageId: ERROR_DC_NOT_FOUND
+//
+// MessageText:
+//
+//  Invalid device context (DC) handle.
+//
+#define ERROR_DC_NOT_FOUND               1425L
+
+//
+// MessageId: ERROR_INVALID_HOOK_FILTER
+//
+// MessageText:
+//
+//  Invalid hook procedure type.
+//
+#define ERROR_INVALID_HOOK_FILTER        1426L
+
+//
+// MessageId: ERROR_INVALID_FILTER_PROC
+//
+// MessageText:
+//
+//  Invalid hook procedure.
+//
+#define ERROR_INVALID_FILTER_PROC        1427L
+
+//
+// MessageId: ERROR_HOOK_NEEDS_HMOD
+//
+// MessageText:
+//
+//  Cannot set nonlocal hook without a module handle.
+//
+#define ERROR_HOOK_NEEDS_HMOD            1428L
+
+//
+// MessageId: ERROR_GLOBAL_ONLY_HOOK
+//
+// MessageText:
+//
+//  This hook procedure can only be set globally.
+//
+#define ERROR_GLOBAL_ONLY_HOOK           1429L
+
+//
+// MessageId: ERROR_JOURNAL_HOOK_SET
+//
+// MessageText:
+//
+//  The journal hook procedure is already installed.
+//
+#define ERROR_JOURNAL_HOOK_SET           1430L
+
+//
+// MessageId: ERROR_HOOK_NOT_INSTALLED
+//
+// MessageText:
+//
+//  The hook procedure is not installed.
+//
+#define ERROR_HOOK_NOT_INSTALLED         1431L
+
+//
+// MessageId: ERROR_INVALID_LB_MESSAGE
+//
+// MessageText:
+//
+//  Invalid message for single-selection list box.
+//
+#define ERROR_INVALID_LB_MESSAGE         1432L
+
+//
+// MessageId: ERROR_SETCOUNT_ON_BAD_LB
+//
+// MessageText:
+//
+//  LB_SETCOUNT sent to non-lazy list box.
+//
+#define ERROR_SETCOUNT_ON_BAD_LB         1433L
+
+//
+// MessageId: ERROR_LB_WITHOUT_TABSTOPS
+//
+// MessageText:
+//
+//  This list box does not support tab stops.
+//
+#define ERROR_LB_WITHOUT_TABSTOPS        1434L
+
+//
+// MessageId: ERROR_DESTROY_OBJECT_OF_OTHER_THREAD
+//
+// MessageText:
+//
+//  Cannot destroy object created by another thread.
+//
+#define ERROR_DESTROY_OBJECT_OF_OTHER_THREAD 1435L
+
+//
+// MessageId: ERROR_CHILD_WINDOW_MENU
+//
+// MessageText:
+//
+//  Child windows cannot have menus.
+//
+#define ERROR_CHILD_WINDOW_MENU          1436L
+
+//
+// MessageId: ERROR_NO_SYSTEM_MENU
+//
+// MessageText:
+//
+//  The window does not have a system menu.
+//
+#define ERROR_NO_SYSTEM_MENU             1437L
+
+//
+// MessageId: ERROR_INVALID_MSGBOX_STYLE
+//
+// MessageText:
+//
+//  Invalid message box style.
+//
+#define ERROR_INVALID_MSGBOX_STYLE       1438L
+
+//
+// MessageId: ERROR_INVALID_SPI_VALUE
+//
+// MessageText:
+//
+//  Invalid system-wide (SPI_*) parameter.
+//
+#define ERROR_INVALID_SPI_VALUE          1439L
+
+//
+// MessageId: ERROR_SCREEN_ALREADY_LOCKED
+//
+// MessageText:
+//
+//  Screen already locked.
+//
+#define ERROR_SCREEN_ALREADY_LOCKED      1440L
+
+//
+// MessageId: ERROR_HWNDS_HAVE_DIFF_PARENT
+//
+// MessageText:
+//
+//  All handles to windows in a multiple-window position structure must have the same parent.
+//
+#define ERROR_HWNDS_HAVE_DIFF_PARENT     1441L
+
+//
+// MessageId: ERROR_NOT_CHILD_WINDOW
+//
+// MessageText:
+//
+//  The window is not a child window.
+//
+#define ERROR_NOT_CHILD_WINDOW           1442L
+
+//
+// MessageId: ERROR_INVALID_GW_COMMAND
+//
+// MessageText:
+//
+//  Invalid GW_* command.
+//
+#define ERROR_INVALID_GW_COMMAND         1443L
+
+//
+// MessageId: ERROR_INVALID_THREAD_ID
+//
+// MessageText:
+//
+//  Invalid thread identifier.
+//
+#define ERROR_INVALID_THREAD_ID          1444L
+
+//
+// MessageId: ERROR_NON_MDICHILD_WINDOW
+//
+// MessageText:
+//
+//  Cannot process a message from a window that is not a multiple document interface (MDI) window.
+//
+#define ERROR_NON_MDICHILD_WINDOW        1445L
+
+//
+// MessageId: ERROR_POPUP_ALREADY_ACTIVE
+//
+// MessageText:
+//
+//  Popup menu already active.
+//
+#define ERROR_POPUP_ALREADY_ACTIVE       1446L
+
+//
+// MessageId: ERROR_NO_SCROLLBARS
+//
+// MessageText:
+//
+//  The window does not have scroll bars.
+//
+#define ERROR_NO_SCROLLBARS              1447L
+
+//
+// MessageId: ERROR_INVALID_SCROLLBAR_RANGE
+//
+// MessageText:
+//
+//  Scroll bar range cannot be greater than MAXLONG.
+//
+#define ERROR_INVALID_SCROLLBAR_RANGE    1448L
+
+//
+// MessageId: ERROR_INVALID_SHOWWIN_COMMAND
+//
+// MessageText:
+//
+//  Cannot show or remove the window in the way specified.
+//
+#define ERROR_INVALID_SHOWWIN_COMMAND    1449L
+
+//
+// MessageId: ERROR_NO_SYSTEM_RESOURCES
+//
+// MessageText:
+//
+//  Insufficient system resources exist to complete the requested service.
+//
+#define ERROR_NO_SYSTEM_RESOURCES        1450L
+
+//
+// MessageId: ERROR_NONPAGED_SYSTEM_RESOURCES
+//
+// MessageText:
+//
+//  Insufficient system resources exist to complete the requested service.
+//
+#define ERROR_NONPAGED_SYSTEM_RESOURCES  1451L
+
+//
+// MessageId: ERROR_PAGED_SYSTEM_RESOURCES
+//
+// MessageText:
+//
+//  Insufficient system resources exist to complete the requested service.
+//
+#define ERROR_PAGED_SYSTEM_RESOURCES     1452L
+
+//
+// MessageId: ERROR_WORKING_SET_QUOTA
+//
+// MessageText:
+//
+//  Insufficient quota to complete the requested service.
+//
+#define ERROR_WORKING_SET_QUOTA          1453L
+
+//
+// MessageId: ERROR_PAGEFILE_QUOTA
+//
+// MessageText:
+//
+//  Insufficient quota to complete the requested service.
+//
+#define ERROR_PAGEFILE_QUOTA             1454L
+
+//
+// MessageId: ERROR_COMMITMENT_LIMIT
+//
+// MessageText:
+//
+//  The paging file is too small for this operation to complete.
+//
+#define ERROR_COMMITMENT_LIMIT           1455L
+
+//
+// MessageId: ERROR_MENU_ITEM_NOT_FOUND
+//
+// MessageText:
+//
+//  A menu item was not found.
+//
+#define ERROR_MENU_ITEM_NOT_FOUND        1456L
+
+//
+// MessageId: ERROR_INVALID_KEYBOARD_HANDLE
+//
+// MessageText:
+//
+//  Invalid keyboard layout handle.
+//
+#define ERROR_INVALID_KEYBOARD_HANDLE    1457L
+
+//
+// MessageId: ERROR_HOOK_TYPE_NOT_ALLOWED
+//
+// MessageText:
+//
+//  Hook type not allowed.
+//
+#define ERROR_HOOK_TYPE_NOT_ALLOWED      1458L
+
+//
+// MessageId: ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION
+//
+// MessageText:
+//
+//  This operation requires an interactive window station.
+//
+#define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION 1459L
+
+//
+// MessageId: ERROR_TIMEOUT
+//
+// MessageText:
+//
+//  This operation returned because the timeout period expired.
+//
+#define ERROR_TIMEOUT                    1460L
+
+//
+// MessageId: ERROR_INVALID_MONITOR_HANDLE
+//
+// MessageText:
+//
+//  Invalid monitor handle.
+//
+#define ERROR_INVALID_MONITOR_HANDLE     1461L
+
+// End of WinUser error codes
+
+
+
+///////////////////////////
+//                       //
+// Eventlog Status Codes //
+//                       //
+///////////////////////////
+
+
+//
+// MessageId: ERROR_EVENTLOG_FILE_CORRUPT
+//
+// MessageText:
+//
+//  The event log file is corrupted.
+//
+#define ERROR_EVENTLOG_FILE_CORRUPT      1500L
+
+//
+// MessageId: ERROR_EVENTLOG_CANT_START
+//
+// MessageText:
+//
+//  No event log file could be opened, so the event logging service did not start.
+//
+#define ERROR_EVENTLOG_CANT_START        1501L
+
+//
+// MessageId: ERROR_LOG_FILE_FULL
+//
+// MessageText:
+//
+//  The event log file is full.
+//
+#define ERROR_LOG_FILE_FULL              1502L
+
+//
+// MessageId: ERROR_EVENTLOG_FILE_CHANGED
+//
+// MessageText:
+//
+//  The event log file has changed between read operations.
+//
+#define ERROR_EVENTLOG_FILE_CHANGED      1503L
+
+// End of eventlog error codes
+
+
+
+///////////////////////////
+//                       //
+// MSI Error Codes       //
+//                       //
+///////////////////////////
+
+
+//
+// MessageId: ERROR_INSTALL_SERVICE_FAILURE
+//
+// MessageText:
+//
+//  The Windows Installer Service could not be accessed. This can occur if you are running Windows in safe mode, or if the Windows Installer is not correctly installed. Contact your support personnel for assistance.
+//
+#define ERROR_INSTALL_SERVICE_FAILURE    1601L
+
+//
+// MessageId: ERROR_INSTALL_USEREXIT
+//
+// MessageText:
+//
+//  User cancelled installation.
+//
+#define ERROR_INSTALL_USEREXIT           1602L
+
+//
+// MessageId: ERROR_INSTALL_FAILURE
+//
+// MessageText:
+//
+//  Fatal error during installation.
+//
+#define ERROR_INSTALL_FAILURE            1603L
+
+//
+// MessageId: ERROR_INSTALL_SUSPEND
+//
+// MessageText:
+//
+//  Installation suspended, incomplete.
+//
+#define ERROR_INSTALL_SUSPEND            1604L
+
+//
+// MessageId: ERROR_UNKNOWN_PRODUCT
+//
+// MessageText:
+//
+//  This action is only valid for products that are currently installed.
+//
+#define ERROR_UNKNOWN_PRODUCT            1605L
+
+//
+// MessageId: ERROR_UNKNOWN_FEATURE
+//
+// MessageText:
+//
+//  Feature ID not registered.
+//
+#define ERROR_UNKNOWN_FEATURE            1606L
+
+//
+// MessageId: ERROR_UNKNOWN_COMPONENT
+//
+// MessageText:
+//
+//  Component ID not registered.
+//
+#define ERROR_UNKNOWN_COMPONENT          1607L
+
+//
+// MessageId: ERROR_UNKNOWN_PROPERTY
+//
+// MessageText:
+//
+//  Unknown property.
+//
+#define ERROR_UNKNOWN_PROPERTY           1608L
+
+//
+// MessageId: ERROR_INVALID_HANDLE_STATE
+//
+// MessageText:
+//
+//  Handle is in an invalid state.
+//
+#define ERROR_INVALID_HANDLE_STATE       1609L
+
+//
+// MessageId: ERROR_BAD_CONFIGURATION
+//
+// MessageText:
+//
+//  The configuration data for this product is corrupt.  Contact your support personnel.
+//
+#define ERROR_BAD_CONFIGURATION          1610L
+
+//
+// MessageId: ERROR_INDEX_ABSENT
+//
+// MessageText:
+//
+//  Component qualifier not present.
+//
+#define ERROR_INDEX_ABSENT               1611L
+
+//
+// MessageId: ERROR_INSTALL_SOURCE_ABSENT
+//
+// MessageText:
+//
+//  The installation source for this product is not available.  Verify that the source exists and that you can access it.
+//
+#define ERROR_INSTALL_SOURCE_ABSENT      1612L
+
+//
+// MessageId: ERROR_INSTALL_PACKAGE_VERSION
+//
+// MessageText:
+//
+//  This installation package cannot be installed by the Windows Installer service.  You must install a Windows service pack that contains a newer version of the Windows Installer service.
+//
+#define ERROR_INSTALL_PACKAGE_VERSION    1613L
+
+//
+// MessageId: ERROR_PRODUCT_UNINSTALLED
+//
+// MessageText:
+//
+//  Product is uninstalled.
+//
+#define ERROR_PRODUCT_UNINSTALLED        1614L
+
+//
+// MessageId: ERROR_BAD_QUERY_SYNTAX
+//
+// MessageText:
+//
+//  SQL query syntax invalid or unsupported.
+//
+#define ERROR_BAD_QUERY_SYNTAX           1615L
+
+//
+// MessageId: ERROR_INVALID_FIELD
+//
+// MessageText:
+//
+//  Record field does not exist.
+//
+#define ERROR_INVALID_FIELD              1616L
+
+//
+// MessageId: ERROR_DEVICE_REMOVED
+//
+// MessageText:
+//
+//  The device has been removed.
+//
+#define ERROR_DEVICE_REMOVED             1617L
+
+//
+// MessageId: ERROR_INSTALL_ALREADY_RUNNING
+//
+// MessageText:
+//
+//  Another installation is already in progress.  Complete that installation before proceeding with this install.
+//
+#define ERROR_INSTALL_ALREADY_RUNNING    1618L
+
+//
+// MessageId: ERROR_INSTALL_PACKAGE_OPEN_FAILED
+//
+// MessageText:
+//
+//  This installation package could not be opened.  Verify that the package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer package.
+//
+#define ERROR_INSTALL_PACKAGE_OPEN_FAILED 1619L
+
+//
+// MessageId: ERROR_INSTALL_PACKAGE_INVALID
+//
+// MessageText:
+//
+//  This installation package could not be opened.  Contact the application vendor to verify that this is a valid Windows Installer package.
+//
+#define ERROR_INSTALL_PACKAGE_INVALID    1620L
+
+//
+// MessageId: ERROR_INSTALL_UI_FAILURE
+//
+// MessageText:
+//
+//  There was an error starting the Windows Installer service user interface.  Contact your support personnel.
+//
+#define ERROR_INSTALL_UI_FAILURE         1621L
+
+//
+// MessageId: ERROR_INSTALL_LOG_FAILURE
+//
+// MessageText:
+//
+//  Error opening installation log file. Verify that the specified log file location exists and that you can write to it.
+//
+#define ERROR_INSTALL_LOG_FAILURE        1622L
+
+//
+// MessageId: ERROR_INSTALL_LANGUAGE_UNSUPPORTED
+//
+// MessageText:
+//
+//  The language of this installation package is not supported by your system.
+//
+#define ERROR_INSTALL_LANGUAGE_UNSUPPORTED 1623L
+
+//
+// MessageId: ERROR_INSTALL_TRANSFORM_FAILURE
+//
+// MessageText:
+//
+//  Error applying transforms.  Verify that the specified transform paths are valid.
+//
+#define ERROR_INSTALL_TRANSFORM_FAILURE  1624L
+
+//
+// MessageId: ERROR_INSTALL_PACKAGE_REJECTED
+//
+// MessageText:
+//
+//  This installation is forbidden by system policy.  Contact your system administrator.
+//
+#define ERROR_INSTALL_PACKAGE_REJECTED   1625L
+
+//
+// MessageId: ERROR_FUNCTION_NOT_CALLED
+//
+// MessageText:
+//
+//  Function could not be executed.
+//
+#define ERROR_FUNCTION_NOT_CALLED        1626L
+
+//
+// MessageId: ERROR_FUNCTION_FAILED
+//
+// MessageText:
+//
+//  Function failed during execution.
+//
+#define ERROR_FUNCTION_FAILED            1627L
+
+//
+// MessageId: ERROR_INVALID_TABLE
+//
+// MessageText:
+//
+//  Invalid or unknown table specified.
+//
+#define ERROR_INVALID_TABLE              1628L
+
+//
+// MessageId: ERROR_DATATYPE_MISMATCH
+//
+// MessageText:
+//
+//  Data supplied is of wrong type.
+//
+#define ERROR_DATATYPE_MISMATCH          1629L
+
+//
+// MessageId: ERROR_UNSUPPORTED_TYPE
+//
+// MessageText:
+//
+//  Data of this type is not supported.
+//
+#define ERROR_UNSUPPORTED_TYPE           1630L
+
+//
+// MessageId: ERROR_CREATE_FAILED
+//
+// MessageText:
+//
+//  The Windows Installer service failed to start.  Contact your support personnel.
+//
+#define ERROR_CREATE_FAILED              1631L
+
+//
+// MessageId: ERROR_INSTALL_TEMP_UNWRITABLE
+//
+// MessageText:
+//
+//  The Temp folder is on a drive that is full or is inaccessible. Free up space on the drive or verify that you have write permission on the Temp folder.
+//
+#define ERROR_INSTALL_TEMP_UNWRITABLE    1632L
+
+//
+// MessageId: ERROR_INSTALL_PLATFORM_UNSUPPORTED
+//
+// MessageText:
+//
+//  This installation package is not supported by this processor type. Contact your product vendor.
+//
+#define ERROR_INSTALL_PLATFORM_UNSUPPORTED 1633L
+
+//
+// MessageId: ERROR_INSTALL_NOTUSED
+//
+// MessageText:
+//
+//  Component not used on this computer.
+//
+#define ERROR_INSTALL_NOTUSED            1634L
+
+//
+// MessageId: ERROR_PATCH_PACKAGE_OPEN_FAILED
+//
+// MessageText:
+//
+//  This patch package could not be opened.  Verify that the patch package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer patch package.
+//
+#define ERROR_PATCH_PACKAGE_OPEN_FAILED  1635L
+
+//
+// MessageId: ERROR_PATCH_PACKAGE_INVALID
+//
+// MessageText:
+//
+//  This patch package could not be opened.  Contact the application vendor to verify that this is a valid Windows Installer patch package.
+//
+#define ERROR_PATCH_PACKAGE_INVALID      1636L
+
+//
+// MessageId: ERROR_PATCH_PACKAGE_UNSUPPORTED
+//
+// MessageText:
+//
+//  This patch package cannot be processed by the Windows Installer service.  You must install a Windows service pack that contains a newer version of the Windows Installer service.
+//
+#define ERROR_PATCH_PACKAGE_UNSUPPORTED  1637L
+
+//
+// MessageId: ERROR_PRODUCT_VERSION
+//
+// MessageText:
+//
+//  Another version of this product is already installed.  Installation of this version cannot continue.  To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.
+//
+#define ERROR_PRODUCT_VERSION            1638L
+
+//
+// MessageId: ERROR_INVALID_COMMAND_LINE
+//
+// MessageText:
+//
+//  Invalid command line argument.  Consult the Windows Installer SDK for detailed command line help.
+//
+#define ERROR_INVALID_COMMAND_LINE       1639L
+
+//
+// MessageId: ERROR_INSTALL_REMOTE_DISALLOWED
+//
+// MessageText:
+//
+//  Only administrators have permission to add, remove, or configure server software during a Terminal services remote session. If you want to install or configure software on the server, contact your network administrator.
+//
+#define ERROR_INSTALL_REMOTE_DISALLOWED  1640L
+
+//
+// MessageId: ERROR_SUCCESS_REBOOT_INITIATED
+//
+// MessageText:
+//
+//  The requested operation completed successfully.  The system will be restarted so the changes can take effect.
+//
+#define ERROR_SUCCESS_REBOOT_INITIATED   1641L
+
+//
+// MessageId: ERROR_PATCH_TARGET_NOT_FOUND
+//
+// MessageText:
+//
+//  The upgrade patch cannot be installed by the Windows Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer an
+//  d that you have the correct upgrade patch.
+//
+#define ERROR_PATCH_TARGET_NOT_FOUND     1642L
+
+//
+// MessageId: ERROR_PATCH_PACKAGE_REJECTED
+//
+// MessageText:
+//
+//  The patch package is not permitted by software restriction policy.
+//
+#define ERROR_PATCH_PACKAGE_REJECTED     1643L
+
+//
+// MessageId: ERROR_INSTALL_TRANSFORM_REJECTED
+//
+// MessageText:
+//
+//  One or more customizations are not permitted by software restriction policy.
+//
+#define ERROR_INSTALL_TRANSFORM_REJECTED 1644L
+
+//
+// MessageId: ERROR_INSTALL_REMOTE_PROHIBITED
+//
+// MessageText:
+//
+//  The Windows Installer does not permit installation from a Remote Desktop Connection.
+//
+#define ERROR_INSTALL_REMOTE_PROHIBITED  1645L
+
+// End of MSI error codes
+
+
+
+///////////////////////////
+//                       //
+//   RPC Status Codes    //
+//                       //
+///////////////////////////
+
+
+//
+// MessageId: RPC_S_INVALID_STRING_BINDING
+//
+// MessageText:
+//
+//  The string binding is invalid.
+//
+#define RPC_S_INVALID_STRING_BINDING     1700L
+
+//
+// MessageId: RPC_S_WRONG_KIND_OF_BINDING
+//
+// MessageText:
+//
+//  The binding handle is not the correct type.
+//
+#define RPC_S_WRONG_KIND_OF_BINDING      1701L
+
+//
+// MessageId: RPC_S_INVALID_BINDING
+//
+// MessageText:
+//
+//  The binding handle is invalid.
+//
+#define RPC_S_INVALID_BINDING            1702L
+
+//
+// MessageId: RPC_S_PROTSEQ_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The RPC protocol sequence is not supported.
+//
+#define RPC_S_PROTSEQ_NOT_SUPPORTED      1703L
+
+//
+// MessageId: RPC_S_INVALID_RPC_PROTSEQ
+//
+// MessageText:
+//
+//  The RPC protocol sequence is invalid.
+//
+#define RPC_S_INVALID_RPC_PROTSEQ        1704L
+
+//
+// MessageId: RPC_S_INVALID_STRING_UUID
+//
+// MessageText:
+//
+//  The string universal unique identifier (UUID) is invalid.
+//
+#define RPC_S_INVALID_STRING_UUID        1705L
+
+//
+// MessageId: RPC_S_INVALID_ENDPOINT_FORMAT
+//
+// MessageText:
+//
+//  The endpoint format is invalid.
+//
+#define RPC_S_INVALID_ENDPOINT_FORMAT    1706L
+
+//
+// MessageId: RPC_S_INVALID_NET_ADDR
+//
+// MessageText:
+//
+//  The network address is invalid.
+//
+#define RPC_S_INVALID_NET_ADDR           1707L
+
+//
+// MessageId: RPC_S_NO_ENDPOINT_FOUND
+//
+// MessageText:
+//
+//  No endpoint was found.
+//
+#define RPC_S_NO_ENDPOINT_FOUND          1708L
+
+//
+// MessageId: RPC_S_INVALID_TIMEOUT
+//
+// MessageText:
+//
+//  The timeout value is invalid.
+//
+#define RPC_S_INVALID_TIMEOUT            1709L
+
+//
+// MessageId: RPC_S_OBJECT_NOT_FOUND
+//
+// MessageText:
+//
+//  The object universal unique identifier (UUID) was not found.
+//
+#define RPC_S_OBJECT_NOT_FOUND           1710L
+
+//
+// MessageId: RPC_S_ALREADY_REGISTERED
+//
+// MessageText:
+//
+//  The object universal unique identifier (UUID) has already been registered.
+//
+#define RPC_S_ALREADY_REGISTERED         1711L
+
+//
+// MessageId: RPC_S_TYPE_ALREADY_REGISTERED
+//
+// MessageText:
+//
+//  The type universal unique identifier (UUID) has already been registered.
+//
+#define RPC_S_TYPE_ALREADY_REGISTERED    1712L
+
+//
+// MessageId: RPC_S_ALREADY_LISTENING
+//
+// MessageText:
+//
+//  The RPC server is already listening.
+//
+#define RPC_S_ALREADY_LISTENING          1713L
+
+//
+// MessageId: RPC_S_NO_PROTSEQS_REGISTERED
+//
+// MessageText:
+//
+//  No protocol sequences have been registered.
+//
+#define RPC_S_NO_PROTSEQS_REGISTERED     1714L
+
+//
+// MessageId: RPC_S_NOT_LISTENING
+//
+// MessageText:
+//
+//  The RPC server is not listening.
+//
+#define RPC_S_NOT_LISTENING              1715L
+
+//
+// MessageId: RPC_S_UNKNOWN_MGR_TYPE
+//
+// MessageText:
+//
+//  The manager type is unknown.
+//
+#define RPC_S_UNKNOWN_MGR_TYPE           1716L
+
+//
+// MessageId: RPC_S_UNKNOWN_IF
+//
+// MessageText:
+//
+//  The interface is unknown.
+//
+#define RPC_S_UNKNOWN_IF                 1717L
+
+//
+// MessageId: RPC_S_NO_BINDINGS
+//
+// MessageText:
+//
+//  There are no bindings.
+//
+#define RPC_S_NO_BINDINGS                1718L
+
+//
+// MessageId: RPC_S_NO_PROTSEQS
+//
+// MessageText:
+//
+//  There are no protocol sequences.
+//
+#define RPC_S_NO_PROTSEQS                1719L
+
+//
+// MessageId: RPC_S_CANT_CREATE_ENDPOINT
+//
+// MessageText:
+//
+//  The endpoint cannot be created.
+//
+#define RPC_S_CANT_CREATE_ENDPOINT       1720L
+
+//
+// MessageId: RPC_S_OUT_OF_RESOURCES
+//
+// MessageText:
+//
+//  Not enough resources are available to complete this operation.
+//
+#define RPC_S_OUT_OF_RESOURCES           1721L
+
+//
+// MessageId: RPC_S_SERVER_UNAVAILABLE
+//
+// MessageText:
+//
+//  The RPC server is unavailable.
+//
+#define RPC_S_SERVER_UNAVAILABLE         1722L
+
+//
+// MessageId: RPC_S_SERVER_TOO_BUSY
+//
+// MessageText:
+//
+//  The RPC server is too busy to complete this operation.
+//
+#define RPC_S_SERVER_TOO_BUSY            1723L
+
+//
+// MessageId: RPC_S_INVALID_NETWORK_OPTIONS
+//
+// MessageText:
+//
+//  The network options are invalid.
+//
+#define RPC_S_INVALID_NETWORK_OPTIONS    1724L
+
+//
+// MessageId: RPC_S_NO_CALL_ACTIVE
+//
+// MessageText:
+//
+//  There are no remote procedure calls active on this thread.
+//
+#define RPC_S_NO_CALL_ACTIVE             1725L
+
+//
+// MessageId: RPC_S_CALL_FAILED
+//
+// MessageText:
+//
+//  The remote procedure call failed.
+//
+#define RPC_S_CALL_FAILED                1726L
+
+//
+// MessageId: RPC_S_CALL_FAILED_DNE
+//
+// MessageText:
+//
+//  The remote procedure call failed and did not execute.
+//
+#define RPC_S_CALL_FAILED_DNE            1727L
+
+//
+// MessageId: RPC_S_PROTOCOL_ERROR
+//
+// MessageText:
+//
+//  A remote procedure call (RPC) protocol error occurred.
+//
+#define RPC_S_PROTOCOL_ERROR             1728L
+
+//
+// MessageId: RPC_S_UNSUPPORTED_TRANS_SYN
+//
+// MessageText:
+//
+//  The transfer syntax is not supported by the RPC server.
+//
+#define RPC_S_UNSUPPORTED_TRANS_SYN      1730L
+
+//
+// MessageId: RPC_S_UNSUPPORTED_TYPE
+//
+// MessageText:
+//
+//  The universal unique identifier (UUID) type is not supported.
+//
+#define RPC_S_UNSUPPORTED_TYPE           1732L
+
+//
+// MessageId: RPC_S_INVALID_TAG
+//
+// MessageText:
+//
+//  The tag is invalid.
+//
+#define RPC_S_INVALID_TAG                1733L
+
+//
+// MessageId: RPC_S_INVALID_BOUND
+//
+// MessageText:
+//
+//  The array bounds are invalid.
+//
+#define RPC_S_INVALID_BOUND              1734L
+
+//
+// MessageId: RPC_S_NO_ENTRY_NAME
+//
+// MessageText:
+//
+//  The binding does not contain an entry name.
+//
+#define RPC_S_NO_ENTRY_NAME              1735L
+
+//
+// MessageId: RPC_S_INVALID_NAME_SYNTAX
+//
+// MessageText:
+//
+//  The name syntax is invalid.
+//
+#define RPC_S_INVALID_NAME_SYNTAX        1736L
+
+//
+// MessageId: RPC_S_UNSUPPORTED_NAME_SYNTAX
+//
+// MessageText:
+//
+//  The name syntax is not supported.
+//
+#define RPC_S_UNSUPPORTED_NAME_SYNTAX    1737L
+
+//
+// MessageId: RPC_S_UUID_NO_ADDRESS
+//
+// MessageText:
+//
+//  No network address is available to use to construct a universal unique identifier (UUID).
+//
+#define RPC_S_UUID_NO_ADDRESS            1739L
+
+//
+// MessageId: RPC_S_DUPLICATE_ENDPOINT
+//
+// MessageText:
+//
+//  The endpoint is a duplicate.
+//
+#define RPC_S_DUPLICATE_ENDPOINT         1740L
+
+//
+// MessageId: RPC_S_UNKNOWN_AUTHN_TYPE
+//
+// MessageText:
+//
+//  The authentication type is unknown.
+//
+#define RPC_S_UNKNOWN_AUTHN_TYPE         1741L
+
+//
+// MessageId: RPC_S_MAX_CALLS_TOO_SMALL
+//
+// MessageText:
+//
+//  The maximum number of calls is too small.
+//
+#define RPC_S_MAX_CALLS_TOO_SMALL        1742L
+
+//
+// MessageId: RPC_S_STRING_TOO_LONG
+//
+// MessageText:
+//
+//  The string is too long.
+//
+#define RPC_S_STRING_TOO_LONG            1743L
+
+//
+// MessageId: RPC_S_PROTSEQ_NOT_FOUND
+//
+// MessageText:
+//
+//  The RPC protocol sequence was not found.
+//
+#define RPC_S_PROTSEQ_NOT_FOUND          1744L
+
+//
+// MessageId: RPC_S_PROCNUM_OUT_OF_RANGE
+//
+// MessageText:
+//
+//  The procedure number is out of range.
+//
+#define RPC_S_PROCNUM_OUT_OF_RANGE       1745L
+
+//
+// MessageId: RPC_S_BINDING_HAS_NO_AUTH
+//
+// MessageText:
+//
+//  The binding does not contain any authentication information.
+//
+#define RPC_S_BINDING_HAS_NO_AUTH        1746L
+
+//
+// MessageId: RPC_S_UNKNOWN_AUTHN_SERVICE
+//
+// MessageText:
+//
+//  The authentication service is unknown.
+//
+#define RPC_S_UNKNOWN_AUTHN_SERVICE      1747L
+
+//
+// MessageId: RPC_S_UNKNOWN_AUTHN_LEVEL
+//
+// MessageText:
+//
+//  The authentication level is unknown.
+//
+#define RPC_S_UNKNOWN_AUTHN_LEVEL        1748L
+
+//
+// MessageId: RPC_S_INVALID_AUTH_IDENTITY
+//
+// MessageText:
+//
+//  The security context is invalid.
+//
+#define RPC_S_INVALID_AUTH_IDENTITY      1749L
+
+//
+// MessageId: RPC_S_UNKNOWN_AUTHZ_SERVICE
+//
+// MessageText:
+//
+//  The authorization service is unknown.
+//
+#define RPC_S_UNKNOWN_AUTHZ_SERVICE      1750L
+
+//
+// MessageId: EPT_S_INVALID_ENTRY
+//
+// MessageText:
+//
+//  The entry is invalid.
+//
+#define EPT_S_INVALID_ENTRY              1751L
+
+//
+// MessageId: EPT_S_CANT_PERFORM_OP
+//
+// MessageText:
+//
+//  The server endpoint cannot perform the operation.
+//
+#define EPT_S_CANT_PERFORM_OP            1752L
+
+//
+// MessageId: EPT_S_NOT_REGISTERED
+//
+// MessageText:
+//
+//  There are no more endpoints available from the endpoint mapper.
+//
+#define EPT_S_NOT_REGISTERED             1753L
+
+//
+// MessageId: RPC_S_NOTHING_TO_EXPORT
+//
+// MessageText:
+//
+//  No interfaces have been exported.
+//
+#define RPC_S_NOTHING_TO_EXPORT          1754L
+
+//
+// MessageId: RPC_S_INCOMPLETE_NAME
+//
+// MessageText:
+//
+//  The entry name is incomplete.
+//
+#define RPC_S_INCOMPLETE_NAME            1755L
+
+//
+// MessageId: RPC_S_INVALID_VERS_OPTION
+//
+// MessageText:
+//
+//  The version option is invalid.
+//
+#define RPC_S_INVALID_VERS_OPTION        1756L
+
+//
+// MessageId: RPC_S_NO_MORE_MEMBERS
+//
+// MessageText:
+//
+//  There are no more members.
+//
+#define RPC_S_NO_MORE_MEMBERS            1757L
+
+//
+// MessageId: RPC_S_NOT_ALL_OBJS_UNEXPORTED
+//
+// MessageText:
+//
+//  There is nothing to unexport.
+//
+#define RPC_S_NOT_ALL_OBJS_UNEXPORTED    1758L
+
+//
+// MessageId: RPC_S_INTERFACE_NOT_FOUND
+//
+// MessageText:
+//
+//  The interface was not found.
+//
+#define RPC_S_INTERFACE_NOT_FOUND        1759L
+
+//
+// MessageId: RPC_S_ENTRY_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The entry already exists.
+//
+#define RPC_S_ENTRY_ALREADY_EXISTS       1760L
+
+//
+// MessageId: RPC_S_ENTRY_NOT_FOUND
+//
+// MessageText:
+//
+//  The entry is not found.
+//
+#define RPC_S_ENTRY_NOT_FOUND            1761L
+
+//
+// MessageId: RPC_S_NAME_SERVICE_UNAVAILABLE
+//
+// MessageText:
+//
+//  The name service is unavailable.
+//
+#define RPC_S_NAME_SERVICE_UNAVAILABLE   1762L
+
+//
+// MessageId: RPC_S_INVALID_NAF_ID
+//
+// MessageText:
+//
+//  The network address family is invalid.
+//
+#define RPC_S_INVALID_NAF_ID             1763L
+
+//
+// MessageId: RPC_S_CANNOT_SUPPORT
+//
+// MessageText:
+//
+//  The requested operation is not supported.
+//
+#define RPC_S_CANNOT_SUPPORT             1764L
+
+//
+// MessageId: RPC_S_NO_CONTEXT_AVAILABLE
+//
+// MessageText:
+//
+//  No security context is available to allow impersonation.
+//
+#define RPC_S_NO_CONTEXT_AVAILABLE       1765L
+
+//
+// MessageId: RPC_S_INTERNAL_ERROR
+//
+// MessageText:
+//
+//  An internal error occurred in a remote procedure call (RPC).
+//
+#define RPC_S_INTERNAL_ERROR             1766L
+
+//
+// MessageId: RPC_S_ZERO_DIVIDE
+//
+// MessageText:
+//
+//  The RPC server attempted an integer division by zero.
+//
+#define RPC_S_ZERO_DIVIDE                1767L
+
+//
+// MessageId: RPC_S_ADDRESS_ERROR
+//
+// MessageText:
+//
+//  An addressing error occurred in the RPC server.
+//
+#define RPC_S_ADDRESS_ERROR              1768L
+
+//
+// MessageId: RPC_S_FP_DIV_ZERO
+//
+// MessageText:
+//
+//  A floating-point operation at the RPC server caused a division by zero.
+//
+#define RPC_S_FP_DIV_ZERO                1769L
+
+//
+// MessageId: RPC_S_FP_UNDERFLOW
+//
+// MessageText:
+//
+//  A floating-point underflow occurred at the RPC server.
+//
+#define RPC_S_FP_UNDERFLOW               1770L
+
+//
+// MessageId: RPC_S_FP_OVERFLOW
+//
+// MessageText:
+//
+//  A floating-point overflow occurred at the RPC server.
+//
+#define RPC_S_FP_OVERFLOW                1771L
+
+//
+// MessageId: RPC_X_NO_MORE_ENTRIES
+//
+// MessageText:
+//
+//  The list of RPC servers available for the binding of auto handles has been exhausted.
+//
+#define RPC_X_NO_MORE_ENTRIES            1772L
+
+//
+// MessageId: RPC_X_SS_CHAR_TRANS_OPEN_FAIL
+//
+// MessageText:
+//
+//  Unable to open the character translation table file.
+//
+#define RPC_X_SS_CHAR_TRANS_OPEN_FAIL    1773L
+
+//
+// MessageId: RPC_X_SS_CHAR_TRANS_SHORT_FILE
+//
+// MessageText:
+//
+//  The file containing the character translation table has fewer than 512 bytes.
+//
+#define RPC_X_SS_CHAR_TRANS_SHORT_FILE   1774L
+
+//
+// MessageId: RPC_X_SS_IN_NULL_CONTEXT
+//
+// MessageText:
+//
+//  A null context handle was passed from the client to the host during a remote procedure call.
+//
+#define RPC_X_SS_IN_NULL_CONTEXT         1775L
+
+//
+// MessageId: RPC_X_SS_CONTEXT_DAMAGED
+//
+// MessageText:
+//
+//  The context handle changed during a remote procedure call.
+//
+#define RPC_X_SS_CONTEXT_DAMAGED         1777L
+
+//
+// MessageId: RPC_X_SS_HANDLES_MISMATCH
+//
+// MessageText:
+//
+//  The binding handles passed to a remote procedure call do not match.
+//
+#define RPC_X_SS_HANDLES_MISMATCH        1778L
+
+//
+// MessageId: RPC_X_SS_CANNOT_GET_CALL_HANDLE
+//
+// MessageText:
+//
+//  The stub is unable to get the remote procedure call handle.
+//
+#define RPC_X_SS_CANNOT_GET_CALL_HANDLE  1779L
+
+//
+// MessageId: RPC_X_NULL_REF_POINTER
+//
+// MessageText:
+//
+//  A null reference pointer was passed to the stub.
+//
+#define RPC_X_NULL_REF_POINTER           1780L
+
+//
+// MessageId: RPC_X_ENUM_VALUE_OUT_OF_RANGE
+//
+// MessageText:
+//
+//  The enumeration value is out of range.
+//
+#define RPC_X_ENUM_VALUE_OUT_OF_RANGE    1781L
+
+//
+// MessageId: RPC_X_BYTE_COUNT_TOO_SMALL
+//
+// MessageText:
+//
+//  The byte count is too small.
+//
+#define RPC_X_BYTE_COUNT_TOO_SMALL       1782L
+
+//
+// MessageId: RPC_X_BAD_STUB_DATA
+//
+// MessageText:
+//
+//  The stub received bad data.
+//
+#define RPC_X_BAD_STUB_DATA              1783L
+
+//
+// MessageId: ERROR_INVALID_USER_BUFFER
+//
+// MessageText:
+//
+//  The supplied user buffer is not valid for the requested operation.
+//
+#define ERROR_INVALID_USER_BUFFER        1784L
+
+//
+// MessageId: ERROR_UNRECOGNIZED_MEDIA
+//
+// MessageText:
+//
+//  The disk media is not recognized. It may not be formatted.
+//
+#define ERROR_UNRECOGNIZED_MEDIA         1785L
+
+//
+// MessageId: ERROR_NO_TRUST_LSA_SECRET
+//
+// MessageText:
+//
+//  The workstation does not have a trust secret.
+//
+#define ERROR_NO_TRUST_LSA_SECRET        1786L
+
+//
+// MessageId: ERROR_NO_TRUST_SAM_ACCOUNT
+//
+// MessageText:
+//
+//  The security database on the server does not have a computer account for this workstation trust relationship.
+//
+#define ERROR_NO_TRUST_SAM_ACCOUNT       1787L
+
+//
+// MessageId: ERROR_TRUSTED_DOMAIN_FAILURE
+//
+// MessageText:
+//
+//  The trust relationship between the primary domain and the trusted domain failed.
+//
+#define ERROR_TRUSTED_DOMAIN_FAILURE     1788L
+
+//
+// MessageId: ERROR_TRUSTED_RELATIONSHIP_FAILURE
+//
+// MessageText:
+//
+//  The trust relationship between this workstation and the primary domain failed.
+//
+#define ERROR_TRUSTED_RELATIONSHIP_FAILURE 1789L
+
+//
+// MessageId: ERROR_TRUST_FAILURE
+//
+// MessageText:
+//
+//  The network logon failed.
+//
+#define ERROR_TRUST_FAILURE              1790L
+
+//
+// MessageId: RPC_S_CALL_IN_PROGRESS
+//
+// MessageText:
+//
+//  A remote procedure call is already in progress for this thread.
+//
+#define RPC_S_CALL_IN_PROGRESS           1791L
+
+//
+// MessageId: ERROR_NETLOGON_NOT_STARTED
+//
+// MessageText:
+//
+//  An attempt was made to logon, but the network logon service was not started.
+//
+#define ERROR_NETLOGON_NOT_STARTED       1792L
+
+//
+// MessageId: ERROR_ACCOUNT_EXPIRED
+//
+// MessageText:
+//
+//  The user's account has expired.
+//
+#define ERROR_ACCOUNT_EXPIRED            1793L
+
+//
+// MessageId: ERROR_REDIRECTOR_HAS_OPEN_HANDLES
+//
+// MessageText:
+//
+//  The redirector is in use and cannot be unloaded.
+//
+#define ERROR_REDIRECTOR_HAS_OPEN_HANDLES 1794L
+
+//
+// MessageId: ERROR_PRINTER_DRIVER_ALREADY_INSTALLED
+//
+// MessageText:
+//
+//  The specified printer driver is already installed.
+//
+#define ERROR_PRINTER_DRIVER_ALREADY_INSTALLED 1795L
+
+//
+// MessageId: ERROR_UNKNOWN_PORT
+//
+// MessageText:
+//
+//  The specified port is unknown.
+//
+#define ERROR_UNKNOWN_PORT               1796L
+
+//
+// MessageId: ERROR_UNKNOWN_PRINTER_DRIVER
+//
+// MessageText:
+//
+//  The printer driver is unknown.
+//
+#define ERROR_UNKNOWN_PRINTER_DRIVER     1797L
+
+//
+// MessageId: ERROR_UNKNOWN_PRINTPROCESSOR
+//
+// MessageText:
+//
+//  The print processor is unknown.
+//
+#define ERROR_UNKNOWN_PRINTPROCESSOR     1798L
+
+//
+// MessageId: ERROR_INVALID_SEPARATOR_FILE
+//
+// MessageText:
+//
+//  The specified separator file is invalid.
+//
+#define ERROR_INVALID_SEPARATOR_FILE     1799L
+
+//
+// MessageId: ERROR_INVALID_PRIORITY
+//
+// MessageText:
+//
+//  The specified priority is invalid.
+//
+#define ERROR_INVALID_PRIORITY           1800L
+
+//
+// MessageId: ERROR_INVALID_PRINTER_NAME
+//
+// MessageText:
+//
+//  The printer name is invalid.
+//
+#define ERROR_INVALID_PRINTER_NAME       1801L
+
+//
+// MessageId: ERROR_PRINTER_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The printer already exists.
+//
+#define ERROR_PRINTER_ALREADY_EXISTS     1802L
+
+//
+// MessageId: ERROR_INVALID_PRINTER_COMMAND
+//
+// MessageText:
+//
+//  The printer command is invalid.
+//
+#define ERROR_INVALID_PRINTER_COMMAND    1803L
+
+//
+// MessageId: ERROR_INVALID_DATATYPE
+//
+// MessageText:
+//
+//  The specified datatype is invalid.
+//
+#define ERROR_INVALID_DATATYPE           1804L
+
+//
+// MessageId: ERROR_INVALID_ENVIRONMENT
+//
+// MessageText:
+//
+//  The environment specified is invalid.
+//
+#define ERROR_INVALID_ENVIRONMENT        1805L
+
+//
+// MessageId: RPC_S_NO_MORE_BINDINGS
+//
+// MessageText:
+//
+//  There are no more bindings.
+//
+#define RPC_S_NO_MORE_BINDINGS           1806L
+
+//
+// MessageId: ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT
+//
+// MessageText:
+//
+//  The account used is an interdomain trust account. Use your global user account or local user account to access this server.
+//
+#define ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 1807L
+
+//
+// MessageId: ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT
+//
+// MessageText:
+//
+//  The account used is a computer account. Use your global user account or local user account to access this server.
+//
+#define ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT 1808L
+
+//
+// MessageId: ERROR_NOLOGON_SERVER_TRUST_ACCOUNT
+//
+// MessageText:
+//
+//  The account used is a server trust account. Use your global user account or local user account to access this server.
+//
+#define ERROR_NOLOGON_SERVER_TRUST_ACCOUNT 1809L
+
+//
+// MessageId: ERROR_DOMAIN_TRUST_INCONSISTENT
+//
+// MessageText:
+//
+//  The name or security ID (SID) of the domain specified is inconsistent with the trust information for that domain.
+//
+#define ERROR_DOMAIN_TRUST_INCONSISTENT  1810L
+
+//
+// MessageId: ERROR_SERVER_HAS_OPEN_HANDLES
+//
+// MessageText:
+//
+//  The server is in use and cannot be unloaded.
+//
+#define ERROR_SERVER_HAS_OPEN_HANDLES    1811L
+
+//
+// MessageId: ERROR_RESOURCE_DATA_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified image file did not contain a resource section.
+//
+#define ERROR_RESOURCE_DATA_NOT_FOUND    1812L
+
+//
+// MessageId: ERROR_RESOURCE_TYPE_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified resource type cannot be found in the image file.
+//
+#define ERROR_RESOURCE_TYPE_NOT_FOUND    1813L
+
+//
+// MessageId: ERROR_RESOURCE_NAME_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified resource name cannot be found in the image file.
+//
+#define ERROR_RESOURCE_NAME_NOT_FOUND    1814L
+
+//
+// MessageId: ERROR_RESOURCE_LANG_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified resource language ID cannot be found in the image file.
+//
+#define ERROR_RESOURCE_LANG_NOT_FOUND    1815L
+
+//
+// MessageId: ERROR_NOT_ENOUGH_QUOTA
+//
+// MessageText:
+//
+//  Not enough quota is available to process this command.
+//
+#define ERROR_NOT_ENOUGH_QUOTA           1816L
+
+//
+// MessageId: RPC_S_NO_INTERFACES
+//
+// MessageText:
+//
+//  No interfaces have been registered.
+//
+#define RPC_S_NO_INTERFACES              1817L
+
+//
+// MessageId: RPC_S_CALL_CANCELLED
+//
+// MessageText:
+//
+//  The remote procedure call was cancelled.
+//
+#define RPC_S_CALL_CANCELLED             1818L
+
+//
+// MessageId: RPC_S_BINDING_INCOMPLETE
+//
+// MessageText:
+//
+//  The binding handle does not contain all required information.
+//
+#define RPC_S_BINDING_INCOMPLETE         1819L
+
+//
+// MessageId: RPC_S_COMM_FAILURE
+//
+// MessageText:
+//
+//  A communications failure occurred during a remote procedure call.
+//
+#define RPC_S_COMM_FAILURE               1820L
+
+//
+// MessageId: RPC_S_UNSUPPORTED_AUTHN_LEVEL
+//
+// MessageText:
+//
+//  The requested authentication level is not supported.
+//
+#define RPC_S_UNSUPPORTED_AUTHN_LEVEL    1821L
+
+//
+// MessageId: RPC_S_NO_PRINC_NAME
+//
+// MessageText:
+//
+//  No principal name registered.
+//
+#define RPC_S_NO_PRINC_NAME              1822L
+
+//
+// MessageId: RPC_S_NOT_RPC_ERROR
+//
+// MessageText:
+//
+//  The error specified is not a valid Windows RPC error code.
+//
+#define RPC_S_NOT_RPC_ERROR              1823L
+
+//
+// MessageId: RPC_S_UUID_LOCAL_ONLY
+//
+// MessageText:
+//
+//  A UUID that is valid only on this computer has been allocated.
+//
+#define RPC_S_UUID_LOCAL_ONLY            1824L
+
+//
+// MessageId: RPC_S_SEC_PKG_ERROR
+//
+// MessageText:
+//
+//  A security package specific error occurred.
+//
+#define RPC_S_SEC_PKG_ERROR              1825L
+
+//
+// MessageId: RPC_S_NOT_CANCELLED
+//
+// MessageText:
+//
+//  Thread is not canceled.
+//
+#define RPC_S_NOT_CANCELLED              1826L
+
+//
+// MessageId: RPC_X_INVALID_ES_ACTION
+//
+// MessageText:
+//
+//  Invalid operation on the encoding/decoding handle.
+//
+#define RPC_X_INVALID_ES_ACTION          1827L
+
+//
+// MessageId: RPC_X_WRONG_ES_VERSION
+//
+// MessageText:
+//
+//  Incompatible version of the serializing package.
+//
+#define RPC_X_WRONG_ES_VERSION           1828L
+
+//
+// MessageId: RPC_X_WRONG_STUB_VERSION
+//
+// MessageText:
+//
+//  Incompatible version of the RPC stub.
+//
+#define RPC_X_WRONG_STUB_VERSION         1829L
+
+//
+// MessageId: RPC_X_INVALID_PIPE_OBJECT
+//
+// MessageText:
+//
+//  The RPC pipe object is invalid or corrupted.
+//
+#define RPC_X_INVALID_PIPE_OBJECT        1830L
+
+//
+// MessageId: RPC_X_WRONG_PIPE_ORDER
+//
+// MessageText:
+//
+//  An invalid operation was attempted on an RPC pipe object.
+//
+#define RPC_X_WRONG_PIPE_ORDER           1831L
+
+//
+// MessageId: RPC_X_WRONG_PIPE_VERSION
+//
+// MessageText:
+//
+//  Unsupported RPC pipe version.
+//
+#define RPC_X_WRONG_PIPE_VERSION         1832L
+
+//
+// MessageId: RPC_S_GROUP_MEMBER_NOT_FOUND
+//
+// MessageText:
+//
+//  The group member was not found.
+//
+#define RPC_S_GROUP_MEMBER_NOT_FOUND     1898L
+
+//
+// MessageId: EPT_S_CANT_CREATE
+//
+// MessageText:
+//
+//  The endpoint mapper database entry could not be created.
+//
+#define EPT_S_CANT_CREATE                1899L
+
+//
+// MessageId: RPC_S_INVALID_OBJECT
+//
+// MessageText:
+//
+//  The object universal unique identifier (UUID) is the nil UUID.
+//
+#define RPC_S_INVALID_OBJECT             1900L
+
+//
+// MessageId: ERROR_INVALID_TIME
+//
+// MessageText:
+//
+//  The specified time is invalid.
+//
+#define ERROR_INVALID_TIME               1901L
+
+//
+// MessageId: ERROR_INVALID_FORM_NAME
+//
+// MessageText:
+//
+//  The specified form name is invalid.
+//
+#define ERROR_INVALID_FORM_NAME          1902L
+
+//
+// MessageId: ERROR_INVALID_FORM_SIZE
+//
+// MessageText:
+//
+//  The specified form size is invalid.
+//
+#define ERROR_INVALID_FORM_SIZE          1903L
+
+//
+// MessageId: ERROR_ALREADY_WAITING
+//
+// MessageText:
+//
+//  The specified printer handle is already being waited on
+//
+#define ERROR_ALREADY_WAITING            1904L
+
+//
+// MessageId: ERROR_PRINTER_DELETED
+//
+// MessageText:
+//
+//  The specified printer has been deleted.
+//
+#define ERROR_PRINTER_DELETED            1905L
+
+//
+// MessageId: ERROR_INVALID_PRINTER_STATE
+//
+// MessageText:
+//
+//  The state of the printer is invalid.
+//
+#define ERROR_INVALID_PRINTER_STATE      1906L
+
+//
+// MessageId: ERROR_PASSWORD_MUST_CHANGE
+//
+// MessageText:
+//
+//  The user's password must be changed before logging on the first time.
+//
+#define ERROR_PASSWORD_MUST_CHANGE       1907L
+
+//
+// MessageId: ERROR_DOMAIN_CONTROLLER_NOT_FOUND
+//
+// MessageText:
+//
+//  Could not find the domain controller for this domain.
+//
+#define ERROR_DOMAIN_CONTROLLER_NOT_FOUND 1908L
+
+//
+// MessageId: ERROR_ACCOUNT_LOCKED_OUT
+//
+// MessageText:
+//
+//  The referenced account is currently locked out and may not be logged on to.
+//
+#define ERROR_ACCOUNT_LOCKED_OUT         1909L
+
+//
+// MessageId: OR_INVALID_OXID
+//
+// MessageText:
+//
+//  The object exporter specified was not found.
+//
+#define OR_INVALID_OXID                  1910L
+
+//
+// MessageId: OR_INVALID_OID
+//
+// MessageText:
+//
+//  The object specified was not found.
+//
+#define OR_INVALID_OID                   1911L
+
+//
+// MessageId: OR_INVALID_SET
+//
+// MessageText:
+//
+//  The object resolver set specified was not found.
+//
+#define OR_INVALID_SET                   1912L
+
+//
+// MessageId: RPC_S_SEND_INCOMPLETE
+//
+// MessageText:
+//
+//  Some data remains to be sent in the request buffer.
+//
+#define RPC_S_SEND_INCOMPLETE            1913L
+
+//
+// MessageId: RPC_S_INVALID_ASYNC_HANDLE
+//
+// MessageText:
+//
+//  Invalid asynchronous remote procedure call handle.
+//
+#define RPC_S_INVALID_ASYNC_HANDLE       1914L
+
+//
+// MessageId: RPC_S_INVALID_ASYNC_CALL
+//
+// MessageText:
+//
+//  Invalid asynchronous RPC call handle for this operation.
+//
+#define RPC_S_INVALID_ASYNC_CALL         1915L
+
+//
+// MessageId: RPC_X_PIPE_CLOSED
+//
+// MessageText:
+//
+//  The RPC pipe object has already been closed.
+//
+#define RPC_X_PIPE_CLOSED                1916L
+
+//
+// MessageId: RPC_X_PIPE_DISCIPLINE_ERROR
+//
+// MessageText:
+//
+//  The RPC call completed before all pipes were processed.
+//
+#define RPC_X_PIPE_DISCIPLINE_ERROR      1917L
+
+//
+// MessageId: RPC_X_PIPE_EMPTY
+//
+// MessageText:
+//
+//  No more data is available from the RPC pipe.
+//
+#define RPC_X_PIPE_EMPTY                 1918L
+
+//
+// MessageId: ERROR_NO_SITENAME
+//
+// MessageText:
+//
+//  No site name is available for this machine.
+//
+#define ERROR_NO_SITENAME                1919L
+
+//
+// MessageId: ERROR_CANT_ACCESS_FILE
+//
+// MessageText:
+//
+//  The file can not be accessed by the system.
+//
+#define ERROR_CANT_ACCESS_FILE           1920L
+
+//
+// MessageId: ERROR_CANT_RESOLVE_FILENAME
+//
+// MessageText:
+//
+//  The name of the file cannot be resolved by the system.
+//
+#define ERROR_CANT_RESOLVE_FILENAME      1921L
+
+//
+// MessageId: RPC_S_ENTRY_TYPE_MISMATCH
+//
+// MessageText:
+//
+//  The entry is not of the expected type.
+//
+#define RPC_S_ENTRY_TYPE_MISMATCH        1922L
+
+//
+// MessageId: RPC_S_NOT_ALL_OBJS_EXPORTED
+//
+// MessageText:
+//
+//  Not all object UUIDs could be exported to the specified entry.
+//
+#define RPC_S_NOT_ALL_OBJS_EXPORTED      1923L
+
+//
+// MessageId: RPC_S_INTERFACE_NOT_EXPORTED
+//
+// MessageText:
+//
+//  Interface could not be exported to the specified entry.
+//
+#define RPC_S_INTERFACE_NOT_EXPORTED     1924L
+
+//
+// MessageId: RPC_S_PROFILE_NOT_ADDED
+//
+// MessageText:
+//
+//  The specified profile entry could not be added.
+//
+#define RPC_S_PROFILE_NOT_ADDED          1925L
+
+//
+// MessageId: RPC_S_PRF_ELT_NOT_ADDED
+//
+// MessageText:
+//
+//  The specified profile element could not be added.
+//
+#define RPC_S_PRF_ELT_NOT_ADDED          1926L
+
+//
+// MessageId: RPC_S_PRF_ELT_NOT_REMOVED
+//
+// MessageText:
+//
+//  The specified profile element could not be removed.
+//
+#define RPC_S_PRF_ELT_NOT_REMOVED        1927L
+
+//
+// MessageId: RPC_S_GRP_ELT_NOT_ADDED
+//
+// MessageText:
+//
+//  The group element could not be added.
+//
+#define RPC_S_GRP_ELT_NOT_ADDED          1928L
+
+//
+// MessageId: RPC_S_GRP_ELT_NOT_REMOVED
+//
+// MessageText:
+//
+//  The group element could not be removed.
+//
+#define RPC_S_GRP_ELT_NOT_REMOVED        1929L
+
+//
+// MessageId: ERROR_KM_DRIVER_BLOCKED
+//
+// MessageText:
+//
+//  The printer driver is not compatible with a policy enabled on your computer that blocks NT 4.0 drivers.
+//
+#define ERROR_KM_DRIVER_BLOCKED          1930L
+
+//
+// MessageId: ERROR_CONTEXT_EXPIRED
+//
+// MessageText:
+//
+//  The context has expired and can no longer be used.
+//
+#define ERROR_CONTEXT_EXPIRED            1931L
+
+//
+// MessageId: ERROR_PER_USER_TRUST_QUOTA_EXCEEDED
+//
+// MessageText:
+//
+//  The current user's delegated trust creation quota has been exceeded.
+//
+#define ERROR_PER_USER_TRUST_QUOTA_EXCEEDED 1932L
+
+//
+// MessageId: ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED
+//
+// MessageText:
+//
+//  The total delegated trust creation quota has been exceeded.
+//
+#define ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED 1933L
+
+//
+// MessageId: ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED
+//
+// MessageText:
+//
+//  The current user's delegated trust deletion quota has been exceeded.
+//
+#define ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED 1934L
+
+//
+// MessageId: ERROR_AUTHENTICATION_FIREWALL_FAILED
+//
+// MessageText:
+//
+//  Logon Failure: The machine you are logging onto is protected by an authentication firewall.  The specified account is not allowed to authenticate to the machine.
+//
+#define ERROR_AUTHENTICATION_FIREWALL_FAILED 1935L
+
+//
+// MessageId: ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED
+//
+// MessageText:
+//
+//  Remote connections to the Print Spooler are blocked by a policy set on your machine.
+//
+#define ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED 1936L
+
+
+
+
+///////////////////////////
+//                       //
+//   OpenGL Error Code   //
+//                       //
+///////////////////////////
+
+
+//
+// MessageId: ERROR_INVALID_PIXEL_FORMAT
+//
+// MessageText:
+//
+//  The pixel format is invalid.
+//
+#define ERROR_INVALID_PIXEL_FORMAT       2000L
+
+//
+// MessageId: ERROR_BAD_DRIVER
+//
+// MessageText:
+//
+//  The specified driver is invalid.
+//
+#define ERROR_BAD_DRIVER                 2001L
+
+//
+// MessageId: ERROR_INVALID_WINDOW_STYLE
+//
+// MessageText:
+//
+//  The window style or class attribute is invalid for this operation.
+//
+#define ERROR_INVALID_WINDOW_STYLE       2002L
+
+//
+// MessageId: ERROR_METAFILE_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The requested metafile operation is not supported.
+//
+#define ERROR_METAFILE_NOT_SUPPORTED     2003L
+
+//
+// MessageId: ERROR_TRANSFORM_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The requested transformation operation is not supported.
+//
+#define ERROR_TRANSFORM_NOT_SUPPORTED    2004L
+
+//
+// MessageId: ERROR_CLIPPING_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The requested clipping operation is not supported.
+//
+#define ERROR_CLIPPING_NOT_SUPPORTED     2005L
+
+// End of OpenGL error codes
+
+
+
+///////////////////////////////////////////
+//                                       //
+//   Image Color Management Error Code   //
+//                                       //
+///////////////////////////////////////////
+
+
+//
+// MessageId: ERROR_INVALID_CMM
+//
+// MessageText:
+//
+//  The specified color management module is invalid.
+//
+#define ERROR_INVALID_CMM                2010L
+
+//
+// MessageId: ERROR_INVALID_PROFILE
+//
+// MessageText:
+//
+//  The specified color profile is invalid.
+//
+#define ERROR_INVALID_PROFILE            2011L
+
+//
+// MessageId: ERROR_TAG_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified tag was not found.
+//
+#define ERROR_TAG_NOT_FOUND              2012L
+
+//
+// MessageId: ERROR_TAG_NOT_PRESENT
+//
+// MessageText:
+//
+//  A required tag is not present.
+//
+#define ERROR_TAG_NOT_PRESENT            2013L
+
+//
+// MessageId: ERROR_DUPLICATE_TAG
+//
+// MessageText:
+//
+//  The specified tag is already present.
+//
+#define ERROR_DUPLICATE_TAG              2014L
+
+//
+// MessageId: ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE
+//
+// MessageText:
+//
+//  The specified color profile is not associated with any device.
+//
+#define ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE 2015L
+
+//
+// MessageId: ERROR_PROFILE_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified color profile was not found.
+//
+#define ERROR_PROFILE_NOT_FOUND          2016L
+
+//
+// MessageId: ERROR_INVALID_COLORSPACE
+//
+// MessageText:
+//
+//  The specified color space is invalid.
+//
+#define ERROR_INVALID_COLORSPACE         2017L
+
+//
+// MessageId: ERROR_ICM_NOT_ENABLED
+//
+// MessageText:
+//
+//  Image Color Management is not enabled.
+//
+#define ERROR_ICM_NOT_ENABLED            2018L
+
+//
+// MessageId: ERROR_DELETING_ICM_XFORM
+//
+// MessageText:
+//
+//  There was an error while deleting the color transform.
+//
+#define ERROR_DELETING_ICM_XFORM         2019L
+
+//
+// MessageId: ERROR_INVALID_TRANSFORM
+//
+// MessageText:
+//
+//  The specified color transform is invalid.
+//
+#define ERROR_INVALID_TRANSFORM          2020L
+
+//
+// MessageId: ERROR_COLORSPACE_MISMATCH
+//
+// MessageText:
+//
+//  The specified transform does not match the bitmap's color space.
+//
+#define ERROR_COLORSPACE_MISMATCH        2021L
+
+//
+// MessageId: ERROR_INVALID_COLORINDEX
+//
+// MessageText:
+//
+//  The specified named color index is not present in the profile.
+//
+#define ERROR_INVALID_COLORINDEX         2022L
+
+
+
+
+///////////////////////////
+//                       //
+// Winnet32 Status Codes //
+//                       //
+// The range 2100 through 2999 is reserved for network status codes.
+// See lmerr.h for a complete listing
+///////////////////////////
+
+
+//
+// MessageId: ERROR_CONNECTED_OTHER_PASSWORD
+//
+// MessageText:
+//
+//  The network connection was made successfully, but the user had to be prompted for a password other than the one originally specified.
+//
+#define ERROR_CONNECTED_OTHER_PASSWORD   2108L
+
+//
+// MessageId: ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT
+//
+// MessageText:
+//
+//  The network connection was made successfully using default credentials.
+//
+#define ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT 2109L
+
+//
+// MessageId: ERROR_BAD_USERNAME
+//
+// MessageText:
+//
+//  The specified username is invalid.
+//
+#define ERROR_BAD_USERNAME               2202L
+
+//
+// MessageId: ERROR_NOT_CONNECTED
+//
+// MessageText:
+//
+//  This network connection does not exist.
+//
+#define ERROR_NOT_CONNECTED              2250L
+
+//
+// MessageId: ERROR_OPEN_FILES
+//
+// MessageText:
+//
+//  This network connection has files open or requests pending.
+//
+#define ERROR_OPEN_FILES                 2401L
+
+//
+// MessageId: ERROR_ACTIVE_CONNECTIONS
+//
+// MessageText:
+//
+//  Active connections still exist.
+//
+#define ERROR_ACTIVE_CONNECTIONS         2402L
+
+//
+// MessageId: ERROR_DEVICE_IN_USE
+//
+// MessageText:
+//
+//  The device is in use by an active process and cannot be disconnected.
+//
+#define ERROR_DEVICE_IN_USE              2404L
+
+
+////////////////////////////////////
+//                                //
+//     Win32 Spooler Error Codes  //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_UNKNOWN_PRINT_MONITOR
+//
+// MessageText:
+//
+//  The specified print monitor is unknown.
+//
+#define ERROR_UNKNOWN_PRINT_MONITOR      3000L
+
+//
+// MessageId: ERROR_PRINTER_DRIVER_IN_USE
+//
+// MessageText:
+//
+//  The specified printer driver is currently in use.
+//
+#define ERROR_PRINTER_DRIVER_IN_USE      3001L
+
+//
+// MessageId: ERROR_SPOOL_FILE_NOT_FOUND
+//
+// MessageText:
+//
+//  The spool file was not found.
+//
+#define ERROR_SPOOL_FILE_NOT_FOUND       3002L
+
+//
+// MessageId: ERROR_SPL_NO_STARTDOC
+//
+// MessageText:
+//
+//  A StartDocPrinter call was not issued.
+//
+#define ERROR_SPL_NO_STARTDOC            3003L
+
+//
+// MessageId: ERROR_SPL_NO_ADDJOB
+//
+// MessageText:
+//
+//  An AddJob call was not issued.
+//
+#define ERROR_SPL_NO_ADDJOB              3004L
+
+//
+// MessageId: ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED
+//
+// MessageText:
+//
+//  The specified print processor has already been installed.
+//
+#define ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED 3005L
+
+//
+// MessageId: ERROR_PRINT_MONITOR_ALREADY_INSTALLED
+//
+// MessageText:
+//
+//  The specified print monitor has already been installed.
+//
+#define ERROR_PRINT_MONITOR_ALREADY_INSTALLED 3006L
+
+//
+// MessageId: ERROR_INVALID_PRINT_MONITOR
+//
+// MessageText:
+//
+//  The specified print monitor does not have the required functions.
+//
+#define ERROR_INVALID_PRINT_MONITOR      3007L
+
+//
+// MessageId: ERROR_PRINT_MONITOR_IN_USE
+//
+// MessageText:
+//
+//  The specified print monitor is currently in use.
+//
+#define ERROR_PRINT_MONITOR_IN_USE       3008L
+
+//
+// MessageId: ERROR_PRINTER_HAS_JOBS_QUEUED
+//
+// MessageText:
+//
+//  The requested operation is not allowed when there are jobs queued to the printer.
+//
+#define ERROR_PRINTER_HAS_JOBS_QUEUED    3009L
+
+//
+// MessageId: ERROR_SUCCESS_REBOOT_REQUIRED
+//
+// MessageText:
+//
+//  The requested operation is successful. Changes will not be effective until the system is rebooted.
+//
+#define ERROR_SUCCESS_REBOOT_REQUIRED    3010L
+
+//
+// MessageId: ERROR_SUCCESS_RESTART_REQUIRED
+//
+// MessageText:
+//
+//  The requested operation is successful. Changes will not be effective until the service is restarted.
+//
+#define ERROR_SUCCESS_RESTART_REQUIRED   3011L
+
+//
+// MessageId: ERROR_PRINTER_NOT_FOUND
+//
+// MessageText:
+//
+//  No printers were found.
+//
+#define ERROR_PRINTER_NOT_FOUND          3012L
+
+//
+// MessageId: ERROR_PRINTER_DRIVER_WARNED
+//
+// MessageText:
+//
+//  The printer driver is known to be unreliable.
+//
+#define ERROR_PRINTER_DRIVER_WARNED      3013L
+
+//
+// MessageId: ERROR_PRINTER_DRIVER_BLOCKED
+//
+// MessageText:
+//
+//  The printer driver is known to harm the system.
+//
+#define ERROR_PRINTER_DRIVER_BLOCKED     3014L
+
+////////////////////////////////////
+//                                //
+//     Wins Error Codes           //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_WINS_INTERNAL
+//
+// MessageText:
+//
+//  WINS encountered an error while processing the command.
+//
+#define ERROR_WINS_INTERNAL              4000L
+
+//
+// MessageId: ERROR_CAN_NOT_DEL_LOCAL_WINS
+//
+// MessageText:
+//
+//  The local WINS can not be deleted.
+//
+#define ERROR_CAN_NOT_DEL_LOCAL_WINS     4001L
+
+//
+// MessageId: ERROR_STATIC_INIT
+//
+// MessageText:
+//
+//  The importation from the file failed.
+//
+#define ERROR_STATIC_INIT                4002L
+
+//
+// MessageId: ERROR_INC_BACKUP
+//
+// MessageText:
+//
+//  The backup failed. Was a full backup done before?
+//
+#define ERROR_INC_BACKUP                 4003L
+
+//
+// MessageId: ERROR_FULL_BACKUP
+//
+// MessageText:
+//
+//  The backup failed. Check the directory to which you are backing the database.
+//
+#define ERROR_FULL_BACKUP                4004L
+
+//
+// MessageId: ERROR_REC_NON_EXISTENT
+//
+// MessageText:
+//
+//  The name does not exist in the WINS database.
+//
+#define ERROR_REC_NON_EXISTENT           4005L
+
+//
+// MessageId: ERROR_RPL_NOT_ALLOWED
+//
+// MessageText:
+//
+//  Replication with a nonconfigured partner is not allowed.
+//
+#define ERROR_RPL_NOT_ALLOWED            4006L
+
+////////////////////////////////////
+//                                //
+//     DHCP Error Codes           //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_DHCP_ADDRESS_CONFLICT
+//
+// MessageText:
+//
+//  The DHCP client has obtained an IP address that is already in use on the network. The local interface will be disabled until the DHCP client can obtain a new address.
+//
+#define ERROR_DHCP_ADDRESS_CONFLICT      4100L
+
+////////////////////////////////////
+//                                //
+//     WMI Error Codes            //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_WMI_GUID_NOT_FOUND
+//
+// MessageText:
+//
+//  The GUID passed was not recognized as valid by a WMI data provider.
+//
+#define ERROR_WMI_GUID_NOT_FOUND         4200L
+
+//
+// MessageId: ERROR_WMI_INSTANCE_NOT_FOUND
+//
+// MessageText:
+//
+//  The instance name passed was not recognized as valid by a WMI data provider.
+//
+#define ERROR_WMI_INSTANCE_NOT_FOUND     4201L
+
+//
+// MessageId: ERROR_WMI_ITEMID_NOT_FOUND
+//
+// MessageText:
+//
+//  The data item ID passed was not recognized as valid by a WMI data provider.
+//
+#define ERROR_WMI_ITEMID_NOT_FOUND       4202L
+
+//
+// MessageId: ERROR_WMI_TRY_AGAIN
+//
+// MessageText:
+//
+//  The WMI request could not be completed and should be retried.
+//
+#define ERROR_WMI_TRY_AGAIN              4203L
+
+//
+// MessageId: ERROR_WMI_DP_NOT_FOUND
+//
+// MessageText:
+//
+//  The WMI data provider could not be located.
+//
+#define ERROR_WMI_DP_NOT_FOUND           4204L
+
+//
+// MessageId: ERROR_WMI_UNRESOLVED_INSTANCE_REF
+//
+// MessageText:
+//
+//  The WMI data provider references an instance set that has not been registered.
+//
+#define ERROR_WMI_UNRESOLVED_INSTANCE_REF 4205L
+
+//
+// MessageId: ERROR_WMI_ALREADY_ENABLED
+//
+// MessageText:
+//
+//  The WMI data block or event notification has already been enabled.
+//
+#define ERROR_WMI_ALREADY_ENABLED        4206L
+
+//
+// MessageId: ERROR_WMI_GUID_DISCONNECTED
+//
+// MessageText:
+//
+//  The WMI data block is no longer available.
+//
+#define ERROR_WMI_GUID_DISCONNECTED      4207L
+
+//
+// MessageId: ERROR_WMI_SERVER_UNAVAILABLE
+//
+// MessageText:
+//
+//  The WMI data service is not available.
+//
+#define ERROR_WMI_SERVER_UNAVAILABLE     4208L
+
+//
+// MessageId: ERROR_WMI_DP_FAILED
+//
+// MessageText:
+//
+//  The WMI data provider failed to carry out the request.
+//
+#define ERROR_WMI_DP_FAILED              4209L
+
+//
+// MessageId: ERROR_WMI_INVALID_MOF
+//
+// MessageText:
+//
+//  The WMI MOF information is not valid.
+//
+#define ERROR_WMI_INVALID_MOF            4210L
+
+//
+// MessageId: ERROR_WMI_INVALID_REGINFO
+//
+// MessageText:
+//
+//  The WMI registration information is not valid.
+//
+#define ERROR_WMI_INVALID_REGINFO        4211L
+
+//
+// MessageId: ERROR_WMI_ALREADY_DISABLED
+//
+// MessageText:
+//
+//  The WMI data block or event notification has already been disabled.
+//
+#define ERROR_WMI_ALREADY_DISABLED       4212L
+
+//
+// MessageId: ERROR_WMI_READ_ONLY
+//
+// MessageText:
+//
+//  The WMI data item or data block is read only.
+//
+#define ERROR_WMI_READ_ONLY              4213L
+
+//
+// MessageId: ERROR_WMI_SET_FAILURE
+//
+// MessageText:
+//
+//  The WMI data item or data block could not be changed.
+//
+#define ERROR_WMI_SET_FAILURE            4214L
+
+//////////////////////////////////////////
+//                                      //
+// NT Media Services (RSM) Error Codes  //
+//                                      //
+//////////////////////////////////////////
+//
+// MessageId: ERROR_INVALID_MEDIA
+//
+// MessageText:
+//
+//  The media identifier does not represent a valid medium.
+//
+#define ERROR_INVALID_MEDIA              4300L
+
+//
+// MessageId: ERROR_INVALID_LIBRARY
+//
+// MessageText:
+//
+//  The library identifier does not represent a valid library.
+//
+#define ERROR_INVALID_LIBRARY            4301L
+
+//
+// MessageId: ERROR_INVALID_MEDIA_POOL
+//
+// MessageText:
+//
+//  The media pool identifier does not represent a valid media pool.
+//
+#define ERROR_INVALID_MEDIA_POOL         4302L
+
+//
+// MessageId: ERROR_DRIVE_MEDIA_MISMATCH
+//
+// MessageText:
+//
+//  The drive and medium are not compatible or exist in different libraries.
+//
+#define ERROR_DRIVE_MEDIA_MISMATCH       4303L
+
+//
+// MessageId: ERROR_MEDIA_OFFLINE
+//
+// MessageText:
+//
+//  The medium currently exists in an offline library and must be online to perform this operation.
+//
+#define ERROR_MEDIA_OFFLINE              4304L
+
+//
+// MessageId: ERROR_LIBRARY_OFFLINE
+//
+// MessageText:
+//
+//  The operation cannot be performed on an offline library.
+//
+#define ERROR_LIBRARY_OFFLINE            4305L
+
+//
+// MessageId: ERROR_EMPTY
+//
+// MessageText:
+//
+//  The library, drive, or media pool is empty.
+//
+#define ERROR_EMPTY                      4306L
+
+//
+// MessageId: ERROR_NOT_EMPTY
+//
+// MessageText:
+//
+//  The library, drive, or media pool must be empty to perform this operation.
+//
+#define ERROR_NOT_EMPTY                  4307L
+
+//
+// MessageId: ERROR_MEDIA_UNAVAILABLE
+//
+// MessageText:
+//
+//  No media is currently available in this media pool or library.
+//
+#define ERROR_MEDIA_UNAVAILABLE          4308L
+
+//
+// MessageId: ERROR_RESOURCE_DISABLED
+//
+// MessageText:
+//
+//  A resource required for this operation is disabled.
+//
+#define ERROR_RESOURCE_DISABLED          4309L
+
+//
+// MessageId: ERROR_INVALID_CLEANER
+//
+// MessageText:
+//
+//  The media identifier does not represent a valid cleaner.
+//
+#define ERROR_INVALID_CLEANER            4310L
+
+//
+// MessageId: ERROR_UNABLE_TO_CLEAN
+//
+// MessageText:
+//
+//  The drive cannot be cleaned or does not support cleaning.
+//
+#define ERROR_UNABLE_TO_CLEAN            4311L
+
+//
+// MessageId: ERROR_OBJECT_NOT_FOUND
+//
+// MessageText:
+//
+//  The object identifier does not represent a valid object.
+//
+#define ERROR_OBJECT_NOT_FOUND           4312L
+
+//
+// MessageId: ERROR_DATABASE_FAILURE
+//
+// MessageText:
+//
+//  Unable to read from or write to the database.
+//
+#define ERROR_DATABASE_FAILURE           4313L
+
+//
+// MessageId: ERROR_DATABASE_FULL
+//
+// MessageText:
+//
+//  The database is full.
+//
+#define ERROR_DATABASE_FULL              4314L
+
+//
+// MessageId: ERROR_MEDIA_INCOMPATIBLE
+//
+// MessageText:
+//
+//  The medium is not compatible with the device or media pool.
+//
+#define ERROR_MEDIA_INCOMPATIBLE         4315L
+
+//
+// MessageId: ERROR_RESOURCE_NOT_PRESENT
+//
+// MessageText:
+//
+//  The resource required for this operation does not exist.
+//
+#define ERROR_RESOURCE_NOT_PRESENT       4316L
+
+//
+// MessageId: ERROR_INVALID_OPERATION
+//
+// MessageText:
+//
+//  The operation identifier is not valid.
+//
+#define ERROR_INVALID_OPERATION          4317L
+
+//
+// MessageId: ERROR_MEDIA_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  The media is not mounted or ready for use.
+//
+#define ERROR_MEDIA_NOT_AVAILABLE        4318L
+
+//
+// MessageId: ERROR_DEVICE_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  The device is not ready for use.
+//
+#define ERROR_DEVICE_NOT_AVAILABLE       4319L
+
+//
+// MessageId: ERROR_REQUEST_REFUSED
+//
+// MessageText:
+//
+//  The operator or administrator has refused the request.
+//
+#define ERROR_REQUEST_REFUSED            4320L
+
+//
+// MessageId: ERROR_INVALID_DRIVE_OBJECT
+//
+// MessageText:
+//
+//  The drive identifier does not represent a valid drive.
+//
+#define ERROR_INVALID_DRIVE_OBJECT       4321L
+
+//
+// MessageId: ERROR_LIBRARY_FULL
+//
+// MessageText:
+//
+//  Library is full.  No slot is available for use.
+//
+#define ERROR_LIBRARY_FULL               4322L
+
+//
+// MessageId: ERROR_MEDIUM_NOT_ACCESSIBLE
+//
+// MessageText:
+//
+//  The transport cannot access the medium.
+//
+#define ERROR_MEDIUM_NOT_ACCESSIBLE      4323L
+
+//
+// MessageId: ERROR_UNABLE_TO_LOAD_MEDIUM
+//
+// MessageText:
+//
+//  Unable to load the medium into the drive.
+//
+#define ERROR_UNABLE_TO_LOAD_MEDIUM      4324L
+
+//
+// MessageId: ERROR_UNABLE_TO_INVENTORY_DRIVE
+//
+// MessageText:
+//
+//  Unable to retrieve the drive status.
+//
+#define ERROR_UNABLE_TO_INVENTORY_DRIVE  4325L
+
+//
+// MessageId: ERROR_UNABLE_TO_INVENTORY_SLOT
+//
+// MessageText:
+//
+//  Unable to retrieve the slot status.
+//
+#define ERROR_UNABLE_TO_INVENTORY_SLOT   4326L
+
+//
+// MessageId: ERROR_UNABLE_TO_INVENTORY_TRANSPORT
+//
+// MessageText:
+//
+//  Unable to retrieve status about the transport.
+//
+#define ERROR_UNABLE_TO_INVENTORY_TRANSPORT 4327L
+
+//
+// MessageId: ERROR_TRANSPORT_FULL
+//
+// MessageText:
+//
+//  Cannot use the transport because it is already in use.
+//
+#define ERROR_TRANSPORT_FULL             4328L
+
+//
+// MessageId: ERROR_CONTROLLING_IEPORT
+//
+// MessageText:
+//
+//  Unable to open or close the inject/eject port.
+//
+#define ERROR_CONTROLLING_IEPORT         4329L
+
+//
+// MessageId: ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA
+//
+// MessageText:
+//
+//  Unable to eject the medium because it is in a drive.
+//
+#define ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA 4330L
+
+//
+// MessageId: ERROR_CLEANER_SLOT_SET
+//
+// MessageText:
+//
+//  A cleaner slot is already reserved.
+//
+#define ERROR_CLEANER_SLOT_SET           4331L
+
+//
+// MessageId: ERROR_CLEANER_SLOT_NOT_SET
+//
+// MessageText:
+//
+//  A cleaner slot is not reserved.
+//
+#define ERROR_CLEANER_SLOT_NOT_SET       4332L
+
+//
+// MessageId: ERROR_CLEANER_CARTRIDGE_SPENT
+//
+// MessageText:
+//
+//  The cleaner cartridge has performed the maximum number of drive cleanings.
+//
+#define ERROR_CLEANER_CARTRIDGE_SPENT    4333L
+
+//
+// MessageId: ERROR_UNEXPECTED_OMID
+//
+// MessageText:
+//
+//  Unexpected on-medium identifier.
+//
+#define ERROR_UNEXPECTED_OMID            4334L
+
+//
+// MessageId: ERROR_CANT_DELETE_LAST_ITEM
+//
+// MessageText:
+//
+//  The last remaining item in this group or resource cannot be deleted.
+//
+#define ERROR_CANT_DELETE_LAST_ITEM      4335L
+
+//
+// MessageId: ERROR_MESSAGE_EXCEEDS_MAX_SIZE
+//
+// MessageText:
+//
+//  The message provided exceeds the maximum size allowed for this parameter.
+//
+#define ERROR_MESSAGE_EXCEEDS_MAX_SIZE   4336L
+
+//
+// MessageId: ERROR_VOLUME_CONTAINS_SYS_FILES
+//
+// MessageText:
+//
+//  The volume contains system or paging files.
+//
+#define ERROR_VOLUME_CONTAINS_SYS_FILES  4337L
+
+//
+// MessageId: ERROR_INDIGENOUS_TYPE
+//
+// MessageText:
+//
+//  The media type cannot be removed from this library since at least one drive in the library reports it can support this media type.
+//
+#define ERROR_INDIGENOUS_TYPE            4338L
+
+//
+// MessageId: ERROR_NO_SUPPORTING_DRIVES
+//
+// MessageText:
+//
+//  This offline media cannot be mounted on this system since no enabled drives are present which can be used.
+//
+#define ERROR_NO_SUPPORTING_DRIVES       4339L
+
+//
+// MessageId: ERROR_CLEANER_CARTRIDGE_INSTALLED
+//
+// MessageText:
+//
+//  A cleaner cartridge is present in the tape library.
+//
+#define ERROR_CLEANER_CARTRIDGE_INSTALLED 4340L
+
+////////////////////////////////////////////
+//                                        //
+// NT Remote Storage Service Error Codes  //
+//                                        //
+////////////////////////////////////////////
+//
+// MessageId: ERROR_FILE_OFFLINE
+//
+// MessageText:
+//
+//  The remote storage service was not able to recall the file.
+//
+#define ERROR_FILE_OFFLINE               4350L
+
+//
+// MessageId: ERROR_REMOTE_STORAGE_NOT_ACTIVE
+//
+// MessageText:
+//
+//  The remote storage service is not operational at this time.
+//
+#define ERROR_REMOTE_STORAGE_NOT_ACTIVE  4351L
+
+//
+// MessageId: ERROR_REMOTE_STORAGE_MEDIA_ERROR
+//
+// MessageText:
+//
+//  The remote storage service encountered a media error.
+//
+#define ERROR_REMOTE_STORAGE_MEDIA_ERROR 4352L
+
+////////////////////////////////////////////
+//                                        //
+// NT Reparse Points Error Codes          //
+//                                        //
+////////////////////////////////////////////
+//
+// MessageId: ERROR_NOT_A_REPARSE_POINT
+//
+// MessageText:
+//
+//  The file or directory is not a reparse point.
+//
+#define ERROR_NOT_A_REPARSE_POINT        4390L
+
+//
+// MessageId: ERROR_REPARSE_ATTRIBUTE_CONFLICT
+//
+// MessageText:
+//
+//  The reparse point attribute cannot be set because it conflicts with an existing attribute.
+//
+#define ERROR_REPARSE_ATTRIBUTE_CONFLICT 4391L
+
+//
+// MessageId: ERROR_INVALID_REPARSE_DATA
+//
+// MessageText:
+//
+//  The data present in the reparse point buffer is invalid.
+//
+#define ERROR_INVALID_REPARSE_DATA       4392L
+
+//
+// MessageId: ERROR_REPARSE_TAG_INVALID
+//
+// MessageText:
+//
+//  The tag present in the reparse point buffer is invalid.
+//
+#define ERROR_REPARSE_TAG_INVALID        4393L
+
+//
+// MessageId: ERROR_REPARSE_TAG_MISMATCH
+//
+// MessageText:
+//
+//  There is a mismatch between the tag specified in the request and the tag present in the reparse point.
+//  
+//
+#define ERROR_REPARSE_TAG_MISMATCH       4394L
+
+////////////////////////////////////////////
+//                                        //
+// NT Single Instance Store Error Codes   //
+//                                        //
+////////////////////////////////////////////
+//
+// MessageId: ERROR_VOLUME_NOT_SIS_ENABLED
+//
+// MessageText:
+//
+//  Single Instance Storage is not available on this volume.
+//
+#define ERROR_VOLUME_NOT_SIS_ENABLED     4500L
+
+////////////////////////////////////
+//                                //
+//     Cluster Error Codes        //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_DEPENDENT_RESOURCE_EXISTS
+//
+// MessageText:
+//
+//  The cluster resource cannot be moved to another group because other resources are dependent on it.
+//
+#define ERROR_DEPENDENT_RESOURCE_EXISTS  5001L
+
+//
+// MessageId: ERROR_DEPENDENCY_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster resource dependency cannot be found.
+//
+#define ERROR_DEPENDENCY_NOT_FOUND       5002L
+
+//
+// MessageId: ERROR_DEPENDENCY_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The cluster resource cannot be made dependent on the specified resource because it is already dependent.
+//
+#define ERROR_DEPENDENCY_ALREADY_EXISTS  5003L
+
+//
+// MessageId: ERROR_RESOURCE_NOT_ONLINE
+//
+// MessageText:
+//
+//  The cluster resource is not online.
+//
+#define ERROR_RESOURCE_NOT_ONLINE        5004L
+
+//
+// MessageId: ERROR_HOST_NODE_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  A cluster node is not available for this operation.
+//
+#define ERROR_HOST_NODE_NOT_AVAILABLE    5005L
+
+//
+// MessageId: ERROR_RESOURCE_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  The cluster resource is not available.
+//
+#define ERROR_RESOURCE_NOT_AVAILABLE     5006L
+
+//
+// MessageId: ERROR_RESOURCE_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster resource could not be found.
+//
+#define ERROR_RESOURCE_NOT_FOUND         5007L
+
+//
+// MessageId: ERROR_SHUTDOWN_CLUSTER
+//
+// MessageText:
+//
+//  The cluster is being shut down.
+//
+#define ERROR_SHUTDOWN_CLUSTER           5008L
+
+//
+// MessageId: ERROR_CANT_EVICT_ACTIVE_NODE
+//
+// MessageText:
+//
+//  A cluster node cannot be evicted from the cluster unless the node is down or it is the last node.
+//
+#define ERROR_CANT_EVICT_ACTIVE_NODE     5009L
+
+//
+// MessageId: ERROR_OBJECT_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The object already exists.
+//
+#define ERROR_OBJECT_ALREADY_EXISTS      5010L
+
+//
+// MessageId: ERROR_OBJECT_IN_LIST
+//
+// MessageText:
+//
+//  The object is already in the list.
+//
+#define ERROR_OBJECT_IN_LIST             5011L
+
+//
+// MessageId: ERROR_GROUP_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  The cluster group is not available for any new requests.
+//
+#define ERROR_GROUP_NOT_AVAILABLE        5012L
+
+//
+// MessageId: ERROR_GROUP_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster group could not be found.
+//
+#define ERROR_GROUP_NOT_FOUND            5013L
+
+//
+// MessageId: ERROR_GROUP_NOT_ONLINE
+//
+// MessageText:
+//
+//  The operation could not be completed because the cluster group is not online.
+//
+#define ERROR_GROUP_NOT_ONLINE           5014L
+
+//
+// MessageId: ERROR_HOST_NODE_NOT_RESOURCE_OWNER
+//
+// MessageText:
+//
+//  The cluster node is not the owner of the resource.
+//
+#define ERROR_HOST_NODE_NOT_RESOURCE_OWNER 5015L
+
+//
+// MessageId: ERROR_HOST_NODE_NOT_GROUP_OWNER
+//
+// MessageText:
+//
+//  The cluster node is not the owner of the group.
+//
+#define ERROR_HOST_NODE_NOT_GROUP_OWNER  5016L
+
+//
+// MessageId: ERROR_RESMON_CREATE_FAILED
+//
+// MessageText:
+//
+//  The cluster resource could not be created in the specified resource monitor.
+//
+#define ERROR_RESMON_CREATE_FAILED       5017L
+
+//
+// MessageId: ERROR_RESMON_ONLINE_FAILED
+//
+// MessageText:
+//
+//  The cluster resource could not be brought online by the resource monitor.
+//
+#define ERROR_RESMON_ONLINE_FAILED       5018L
+
+//
+// MessageId: ERROR_RESOURCE_ONLINE
+//
+// MessageText:
+//
+//  The operation could not be completed because the cluster resource is online.
+//
+#define ERROR_RESOURCE_ONLINE            5019L
+
+//
+// MessageId: ERROR_QUORUM_RESOURCE
+//
+// MessageText:
+//
+//  The cluster resource could not be deleted or brought offline because it is the quorum resource.
+//
+#define ERROR_QUORUM_RESOURCE            5020L
+
+//
+// MessageId: ERROR_NOT_QUORUM_CAPABLE
+//
+// MessageText:
+//
+//  The cluster could not make the specified resource a quorum resource because it is not capable of being a quorum resource.
+//
+#define ERROR_NOT_QUORUM_CAPABLE         5021L
+
+//
+// MessageId: ERROR_CLUSTER_SHUTTING_DOWN
+//
+// MessageText:
+//
+//  The cluster software is shutting down.
+//
+#define ERROR_CLUSTER_SHUTTING_DOWN      5022L
+
+//
+// MessageId: ERROR_INVALID_STATE
+//
+// MessageText:
+//
+//  The group or resource is not in the correct state to perform the requested operation.
+//
+#define ERROR_INVALID_STATE              5023L
+
+//
+// MessageId: ERROR_RESOURCE_PROPERTIES_STORED
+//
+// MessageText:
+//
+//  The properties were stored but not all changes will take effect until the next time the resource is brought online.
+//
+#define ERROR_RESOURCE_PROPERTIES_STORED 5024L
+
+//
+// MessageId: ERROR_NOT_QUORUM_CLASS
+//
+// MessageText:
+//
+//  The cluster could not make the specified resource a quorum resource because it does not belong to a shared storage class.
+//
+#define ERROR_NOT_QUORUM_CLASS           5025L
+
+//
+// MessageId: ERROR_CORE_RESOURCE
+//
+// MessageText:
+//
+//  The cluster resource could not be deleted since it is a core resource.
+//
+#define ERROR_CORE_RESOURCE              5026L
+
+//
+// MessageId: ERROR_QUORUM_RESOURCE_ONLINE_FAILED
+//
+// MessageText:
+//
+//  The quorum resource failed to come online.
+//
+#define ERROR_QUORUM_RESOURCE_ONLINE_FAILED 5027L
+
+//
+// MessageId: ERROR_QUORUMLOG_OPEN_FAILED
+//
+// MessageText:
+//
+//  The quorum log could not be created or mounted successfully.
+//
+#define ERROR_QUORUMLOG_OPEN_FAILED      5028L
+
+//
+// MessageId: ERROR_CLUSTERLOG_CORRUPT
+//
+// MessageText:
+//
+//  The cluster log is corrupt.
+//
+#define ERROR_CLUSTERLOG_CORRUPT         5029L
+
+//
+// MessageId: ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE
+//
+// MessageText:
+//
+//  The record could not be written to the cluster log since it exceeds the maximum size.
+//
+#define ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE 5030L
+
+//
+// MessageId: ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE
+//
+// MessageText:
+//
+//  The cluster log exceeds its maximum size.
+//
+#define ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE 5031L
+
+//
+// MessageId: ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND
+//
+// MessageText:
+//
+//  No checkpoint record was found in the cluster log.
+//
+#define ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND 5032L
+
+//
+// MessageId: ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE
+//
+// MessageText:
+//
+//  The minimum required disk space needed for logging is not available.
+//
+#define ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE 5033L
+
+//
+// MessageId: ERROR_QUORUM_OWNER_ALIVE
+//
+// MessageText:
+//
+//  The cluster node failed to take control of the quorum resource because the resource is owned by another active node.
+//
+#define ERROR_QUORUM_OWNER_ALIVE         5034L
+
+//
+// MessageId: ERROR_NETWORK_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  A cluster network is not available for this operation.
+//
+#define ERROR_NETWORK_NOT_AVAILABLE      5035L
+
+//
+// MessageId: ERROR_NODE_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  A cluster node is not available for this operation.
+//
+#define ERROR_NODE_NOT_AVAILABLE         5036L
+
+//
+// MessageId: ERROR_ALL_NODES_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  All cluster nodes must be running to perform this operation.
+//
+#define ERROR_ALL_NODES_NOT_AVAILABLE    5037L
+
+//
+// MessageId: ERROR_RESOURCE_FAILED
+//
+// MessageText:
+//
+//  A cluster resource failed.
+//
+#define ERROR_RESOURCE_FAILED            5038L
+
+//
+// MessageId: ERROR_CLUSTER_INVALID_NODE
+//
+// MessageText:
+//
+//  The cluster node is not valid.
+//
+#define ERROR_CLUSTER_INVALID_NODE       5039L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_EXISTS
+//
+// MessageText:
+//
+//  The cluster node already exists.
+//
+#define ERROR_CLUSTER_NODE_EXISTS        5040L
+
+//
+// MessageId: ERROR_CLUSTER_JOIN_IN_PROGRESS
+//
+// MessageText:
+//
+//  A node is in the process of joining the cluster.
+//
+#define ERROR_CLUSTER_JOIN_IN_PROGRESS   5041L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster node was not found.
+//
+#define ERROR_CLUSTER_NODE_NOT_FOUND     5042L
+
+//
+// MessageId: ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster local node information was not found.
+//
+#define ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND 5043L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_EXISTS
+//
+// MessageText:
+//
+//  The cluster network already exists.
+//
+#define ERROR_CLUSTER_NETWORK_EXISTS     5044L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster network was not found.
+//
+#define ERROR_CLUSTER_NETWORK_NOT_FOUND  5045L
+
+//
+// MessageId: ERROR_CLUSTER_NETINTERFACE_EXISTS
+//
+// MessageText:
+//
+//  The cluster network interface already exists.
+//
+#define ERROR_CLUSTER_NETINTERFACE_EXISTS 5046L
+
+//
+// MessageId: ERROR_CLUSTER_NETINTERFACE_NOT_FOUND
+//
+// MessageText:
+//
+//  The cluster network interface was not found.
+//
+#define ERROR_CLUSTER_NETINTERFACE_NOT_FOUND 5047L
+
+//
+// MessageId: ERROR_CLUSTER_INVALID_REQUEST
+//
+// MessageText:
+//
+//  The cluster request is not valid for this object.
+//
+#define ERROR_CLUSTER_INVALID_REQUEST    5048L
+
+//
+// MessageId: ERROR_CLUSTER_INVALID_NETWORK_PROVIDER
+//
+// MessageText:
+//
+//  The cluster network provider is not valid.
+//
+#define ERROR_CLUSTER_INVALID_NETWORK_PROVIDER 5049L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_DOWN
+//
+// MessageText:
+//
+//  The cluster node is down.
+//
+#define ERROR_CLUSTER_NODE_DOWN          5050L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_UNREACHABLE
+//
+// MessageText:
+//
+//  The cluster node is not reachable.
+//
+#define ERROR_CLUSTER_NODE_UNREACHABLE   5051L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_NOT_MEMBER
+//
+// MessageText:
+//
+//  The cluster node is not a member of the cluster.
+//
+#define ERROR_CLUSTER_NODE_NOT_MEMBER    5052L
+
+//
+// MessageId: ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS
+//
+// MessageText:
+//
+//  A cluster join operation is not in progress.
+//
+#define ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS 5053L
+
+//
+// MessageId: ERROR_CLUSTER_INVALID_NETWORK
+//
+// MessageText:
+//
+//  The cluster network is not valid.
+//
+#define ERROR_CLUSTER_INVALID_NETWORK    5054L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_UP
+//
+// MessageText:
+//
+//  The cluster node is up.
+//
+#define ERROR_CLUSTER_NODE_UP            5056L
+
+//
+// MessageId: ERROR_CLUSTER_IPADDR_IN_USE
+//
+// MessageText:
+//
+//  The cluster IP address is already in use.
+//
+#define ERROR_CLUSTER_IPADDR_IN_USE      5057L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_NOT_PAUSED
+//
+// MessageText:
+//
+//  The cluster node is not paused.
+//
+#define ERROR_CLUSTER_NODE_NOT_PAUSED    5058L
+
+//
+// MessageId: ERROR_CLUSTER_NO_SECURITY_CONTEXT
+//
+// MessageText:
+//
+//  No cluster security context is available.
+//
+#define ERROR_CLUSTER_NO_SECURITY_CONTEXT 5059L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_NOT_INTERNAL
+//
+// MessageText:
+//
+//  The cluster network is not configured for internal cluster communication.
+//
+#define ERROR_CLUSTER_NETWORK_NOT_INTERNAL 5060L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_ALREADY_UP
+//
+// MessageText:
+//
+//  The cluster node is already up.
+//
+#define ERROR_CLUSTER_NODE_ALREADY_UP    5061L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_ALREADY_DOWN
+//
+// MessageText:
+//
+//  The cluster node is already down.
+//
+#define ERROR_CLUSTER_NODE_ALREADY_DOWN  5062L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_ALREADY_ONLINE
+//
+// MessageText:
+//
+//  The cluster network is already online.
+//
+#define ERROR_CLUSTER_NETWORK_ALREADY_ONLINE 5063L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE
+//
+// MessageText:
+//
+//  The cluster network is already offline.
+//
+#define ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE 5064L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_ALREADY_MEMBER
+//
+// MessageText:
+//
+//  The cluster node is already a member of the cluster.
+//
+#define ERROR_CLUSTER_NODE_ALREADY_MEMBER 5065L
+
+//
+// MessageId: ERROR_CLUSTER_LAST_INTERNAL_NETWORK
+//
+// MessageText:
+//
+//  The cluster network is the only one configured for internal cluster communication between two or more active cluster nodes. The internal communication capability cannot be removed from the network.
+//
+#define ERROR_CLUSTER_LAST_INTERNAL_NETWORK 5066L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS
+//
+// MessageText:
+//
+//  One or more cluster resources depend on the network to provide service to clients. The client access capability cannot be removed from the network.
+//
+#define ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS 5067L
+
+//
+// MessageId: ERROR_INVALID_OPERATION_ON_QUORUM
+//
+// MessageText:
+//
+//  This operation cannot be performed on the cluster resource as it the quorum resource. You may not bring the quorum resource offline or modify its possible owners list.
+//
+#define ERROR_INVALID_OPERATION_ON_QUORUM 5068L
+
+//
+// MessageId: ERROR_DEPENDENCY_NOT_ALLOWED
+//
+// MessageText:
+//
+//  The cluster quorum resource is not allowed to have any dependencies.
+//
+#define ERROR_DEPENDENCY_NOT_ALLOWED     5069L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_PAUSED
+//
+// MessageText:
+//
+//  The cluster node is paused.
+//
+#define ERROR_CLUSTER_NODE_PAUSED        5070L
+
+//
+// MessageId: ERROR_NODE_CANT_HOST_RESOURCE
+//
+// MessageText:
+//
+//  The cluster resource cannot be brought online. The owner node cannot run this resource.
+//
+#define ERROR_NODE_CANT_HOST_RESOURCE    5071L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_NOT_READY
+//
+// MessageText:
+//
+//  The cluster node is not ready to perform the requested operation.
+//
+#define ERROR_CLUSTER_NODE_NOT_READY     5072L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_SHUTTING_DOWN
+//
+// MessageText:
+//
+//  The cluster node is shutting down.
+//
+#define ERROR_CLUSTER_NODE_SHUTTING_DOWN 5073L
+
+//
+// MessageId: ERROR_CLUSTER_JOIN_ABORTED
+//
+// MessageText:
+//
+//  The cluster join operation was aborted.
+//
+#define ERROR_CLUSTER_JOIN_ABORTED       5074L
+
+//
+// MessageId: ERROR_CLUSTER_INCOMPATIBLE_VERSIONS
+//
+// MessageText:
+//
+//  The cluster join operation failed due to incompatible software versions between the joining node and its sponsor.
+//
+#define ERROR_CLUSTER_INCOMPATIBLE_VERSIONS 5075L
+
+//
+// MessageId: ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED
+//
+// MessageText:
+//
+//  This resource cannot be created because the cluster has reached the limit on the number of resources it can monitor.
+//
+#define ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED 5076L
+
+//
+// MessageId: ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED
+//
+// MessageText:
+//
+//  The system configuration changed during the cluster join or form operation. The join or form operation was aborted.
+//
+#define ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED 5077L
+
+//
+// MessageId: ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified resource type was not found.
+//
+#define ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND 5078L
+
+//
+// MessageId: ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The specified node does not support a resource of this type.  This may be due to version inconsistencies or due to the absence of the resource DLL on this node.
+//
+#define ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED 5079L
+
+//
+// MessageId: ERROR_CLUSTER_RESNAME_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified resource name is not supported by this resource DLL. This may be due to a bad (or changed) name supplied to the resource DLL.
+//
+#define ERROR_CLUSTER_RESNAME_NOT_FOUND  5080L
+
+//
+// MessageId: ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED
+//
+// MessageText:
+//
+//  No authentication package could be registered with the RPC server.
+//
+#define ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED 5081L
+
+//
+// MessageId: ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST
+//
+// MessageText:
+//
+//  You cannot bring the group online because the owner of the group is not in the preferred list for the group. To change the owner node for the group, move the group.
+//
+#define ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST 5082L
+
+//
+// MessageId: ERROR_CLUSTER_DATABASE_SEQMISMATCH
+//
+// MessageText:
+//
+//  The join operation failed because the cluster database sequence number has changed or is incompatible with the locker node. This may happen during a join operation if the cluster database was changing during the join.
+//
+#define ERROR_CLUSTER_DATABASE_SEQMISMATCH 5083L
+
+//
+// MessageId: ERROR_RESMON_INVALID_STATE
+//
+// MessageText:
+//
+//  The resource monitor will not allow the fail operation to be performed while the resource is in its current state. This may happen if the resource is in a pending state.
+//
+#define ERROR_RESMON_INVALID_STATE       5084L
+
+//
+// MessageId: ERROR_CLUSTER_GUM_NOT_LOCKER
+//
+// MessageText:
+//
+//  A non locker code got a request to reserve the lock for making global updates.
+//
+#define ERROR_CLUSTER_GUM_NOT_LOCKER     5085L
+
+//
+// MessageId: ERROR_QUORUM_DISK_NOT_FOUND
+//
+// MessageText:
+//
+//  The quorum disk could not be located by the cluster service.
+//
+#define ERROR_QUORUM_DISK_NOT_FOUND      5086L
+
+//
+// MessageId: ERROR_DATABASE_BACKUP_CORRUPT
+//
+// MessageText:
+//
+//  The backed up cluster database is possibly corrupt.
+//
+#define ERROR_DATABASE_BACKUP_CORRUPT    5087L
+
+//
+// MessageId: ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT
+//
+// MessageText:
+//
+//  A DFS root already exists in this cluster node.
+//
+#define ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT 5088L
+
+//
+// MessageId: ERROR_RESOURCE_PROPERTY_UNCHANGEABLE
+//
+// MessageText:
+//
+//  An attempt to modify a resource property failed because it conflicts with another existing property.
+//
+#define ERROR_RESOURCE_PROPERTY_UNCHANGEABLE 5089L
+
+/*
+ Codes from 4300 through 5889 overlap with codes in ds\published\inc\apperr2.w.
+ Do not add any more error codes in that range.
+*/
+//
+// MessageId: ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE
+//
+// MessageText:
+//
+//  An operation was attempted that is incompatible with the current membership state of the node.
+//
+#define ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE 5890L
+
+//
+// MessageId: ERROR_CLUSTER_QUORUMLOG_NOT_FOUND
+//
+// MessageText:
+//
+//  The quorum resource does not contain the quorum log.
+//
+#define ERROR_CLUSTER_QUORUMLOG_NOT_FOUND 5891L
+
+//
+// MessageId: ERROR_CLUSTER_MEMBERSHIP_HALT
+//
+// MessageText:
+//
+//  The membership engine requested shutdown of the cluster service on this node.
+//
+#define ERROR_CLUSTER_MEMBERSHIP_HALT    5892L
+
+//
+// MessageId: ERROR_CLUSTER_INSTANCE_ID_MISMATCH
+//
+// MessageText:
+//
+//  The join operation failed because the cluster instance ID of the joining node does not match the cluster instance ID of the sponsor node.
+//
+#define ERROR_CLUSTER_INSTANCE_ID_MISMATCH 5893L
+
+//
+// MessageId: ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP
+//
+// MessageText:
+//
+//  A matching network for the specified IP address could not be found. Please also specify a subnet mask and a cluster network.
+//
+#define ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP 5894L
+
+//
+// MessageId: ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH
+//
+// MessageText:
+//
+//  The actual data type of the property did not match the expected data type of the property.
+//
+#define ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH 5895L
+
+//
+// MessageId: ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP
+//
+// MessageText:
+//
+//  The cluster node was evicted from the cluster successfully, but the node was not cleaned up.  Extended status information explaining why the node was not cleaned up is available.
+//
+#define ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP 5896L
+
+//
+// MessageId: ERROR_CLUSTER_PARAMETER_MISMATCH
+//
+// MessageText:
+//
+//  Two or more parameter values specified for a resource's properties are in conflict.
+//
+#define ERROR_CLUSTER_PARAMETER_MISMATCH 5897L
+
+//
+// MessageId: ERROR_NODE_CANNOT_BE_CLUSTERED
+//
+// MessageText:
+//
+//  This computer cannot be made a member of a cluster.
+//
+#define ERROR_NODE_CANNOT_BE_CLUSTERED   5898L
+
+//
+// MessageId: ERROR_CLUSTER_WRONG_OS_VERSION
+//
+// MessageText:
+//
+//  This computer cannot be made a member of a cluster because it does not have the correct version of Windows installed.
+//
+#define ERROR_CLUSTER_WRONG_OS_VERSION   5899L
+
+//
+// MessageId: ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME
+//
+// MessageText:
+//
+//  A cluster cannot be created with the specified cluster name because that cluster name is already in use. Specify a different name for the cluster.
+//
+#define ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME 5900L
+
+//
+// MessageId: ERROR_CLUSCFG_ALREADY_COMMITTED
+//
+// MessageText:
+//
+//  The cluster configuration action has already been committed.
+//
+#define ERROR_CLUSCFG_ALREADY_COMMITTED  5901L
+
+//
+// MessageId: ERROR_CLUSCFG_ROLLBACK_FAILED
+//
+// MessageText:
+//
+//  The cluster configuration action could not be rolled back.
+//
+#define ERROR_CLUSCFG_ROLLBACK_FAILED    5902L
+
+//
+// MessageId: ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT
+//
+// MessageText:
+//
+//  The drive letter assigned to a system disk on one node conflicted with the drive letter assigned to a disk on another node.
+//
+#define ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT 5903L
+
+//
+// MessageId: ERROR_CLUSTER_OLD_VERSION
+//
+// MessageText:
+//
+//  One or more nodes in the cluster are running a version of Windows that does not support this operation.
+//
+#define ERROR_CLUSTER_OLD_VERSION        5904L
+
+//
+// MessageId: ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME
+//
+// MessageText:
+//
+//  The name of the corresponding computer account doesn't match the Network Name for this resource.
+//
+#define ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME 5905L
+
+////////////////////////////////////
+//                                //
+//     EFS Error Codes            //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_ENCRYPTION_FAILED
+//
+// MessageText:
+//
+//  The specified file could not be encrypted.
+//
+#define ERROR_ENCRYPTION_FAILED          6000L
+
+//
+// MessageId: ERROR_DECRYPTION_FAILED
+//
+// MessageText:
+//
+//  The specified file could not be decrypted.
+//
+#define ERROR_DECRYPTION_FAILED          6001L
+
+//
+// MessageId: ERROR_FILE_ENCRYPTED
+//
+// MessageText:
+//
+//  The specified file is encrypted and the user does not have the ability to decrypt it.
+//
+#define ERROR_FILE_ENCRYPTED             6002L
+
+//
+// MessageId: ERROR_NO_RECOVERY_POLICY
+//
+// MessageText:
+//
+//  There is no valid encryption recovery policy configured for this system.
+//
+#define ERROR_NO_RECOVERY_POLICY         6003L
+
+//
+// MessageId: ERROR_NO_EFS
+//
+// MessageText:
+//
+//  The required encryption driver is not loaded for this system.
+//
+#define ERROR_NO_EFS                     6004L
+
+//
+// MessageId: ERROR_WRONG_EFS
+//
+// MessageText:
+//
+//  The file was encrypted with a different encryption driver than is currently loaded.
+//
+#define ERROR_WRONG_EFS                  6005L
+
+//
+// MessageId: ERROR_NO_USER_KEYS
+//
+// MessageText:
+//
+//  There are no EFS keys defined for the user.
+//
+#define ERROR_NO_USER_KEYS               6006L
+
+//
+// MessageId: ERROR_FILE_NOT_ENCRYPTED
+//
+// MessageText:
+//
+//  The specified file is not encrypted.
+//
+#define ERROR_FILE_NOT_ENCRYPTED         6007L
+
+//
+// MessageId: ERROR_NOT_EXPORT_FORMAT
+//
+// MessageText:
+//
+//  The specified file is not in the defined EFS export format.
+//
+#define ERROR_NOT_EXPORT_FORMAT          6008L
+
+//
+// MessageId: ERROR_FILE_READ_ONLY
+//
+// MessageText:
+//
+//  The specified file is read only.
+//
+#define ERROR_FILE_READ_ONLY             6009L
+
+//
+// MessageId: ERROR_DIR_EFS_DISALLOWED
+//
+// MessageText:
+//
+//  The directory has been disabled for encryption.
+//
+#define ERROR_DIR_EFS_DISALLOWED         6010L
+
+//
+// MessageId: ERROR_EFS_SERVER_NOT_TRUSTED
+//
+// MessageText:
+//
+//  The server is not trusted for remote encryption operation.
+//
+#define ERROR_EFS_SERVER_NOT_TRUSTED     6011L
+
+//
+// MessageId: ERROR_BAD_RECOVERY_POLICY
+//
+// MessageText:
+//
+//  Recovery policy configured for this system contains invalid recovery certificate.
+//
+#define ERROR_BAD_RECOVERY_POLICY        6012L
+
+//
+// MessageId: ERROR_EFS_ALG_BLOB_TOO_BIG
+//
+// MessageText:
+//
+//  The encryption algorithm used on the source file needs a bigger key buffer than the one on the destination file.
+//
+#define ERROR_EFS_ALG_BLOB_TOO_BIG       6013L
+
+//
+// MessageId: ERROR_VOLUME_NOT_SUPPORT_EFS
+//
+// MessageText:
+//
+//  The disk partition does not support file encryption.
+//
+#define ERROR_VOLUME_NOT_SUPPORT_EFS     6014L
+
+//
+// MessageId: ERROR_EFS_DISABLED
+//
+// MessageText:
+//
+//  This machine is disabled for file encryption.
+//
+#define ERROR_EFS_DISABLED               6015L
+
+//
+// MessageId: ERROR_EFS_VERSION_NOT_SUPPORT
+//
+// MessageText:
+//
+//  A newer system is required to decrypt this encrypted file.
+//
+#define ERROR_EFS_VERSION_NOT_SUPPORT    6016L
+
+// This message number is for historical purposes and cannot be changed or re-used.
+//
+// MessageId: ERROR_NO_BROWSER_SERVERS_FOUND
+//
+// MessageText:
+//
+//  The list of servers for this workgroup is not currently available
+//
+#define ERROR_NO_BROWSER_SERVERS_FOUND   6118L
+
+//////////////////////////////////////////////////////////////////
+//                                                              //
+// Task Scheduler Error Codes that NET START must understand    //
+//                                                              //
+//////////////////////////////////////////////////////////////////
+//
+// MessageId: SCHED_E_SERVICE_NOT_LOCALSYSTEM
+//
+// MessageText:
+//
+//  The Task Scheduler service must be configured to run in the System account to function properly.  Individual tasks may be configured to run in other accounts.
+//
+#define SCHED_E_SERVICE_NOT_LOCALSYSTEM  6200L
+
+////////////////////////////////////
+//                                //
+// Terminal Server Error Codes    //
+//                                //
+////////////////////////////////////
+//
+// MessageId: ERROR_CTX_WINSTATION_NAME_INVALID
+//
+// MessageText:
+//
+//  The specified session name is invalid.
+//
+#define ERROR_CTX_WINSTATION_NAME_INVALID 7001L
+
+//
+// MessageId: ERROR_CTX_INVALID_PD
+//
+// MessageText:
+//
+//  The specified protocol driver is invalid.
+//
+#define ERROR_CTX_INVALID_PD             7002L
+
+//
+// MessageId: ERROR_CTX_PD_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified protocol driver was not found in the system path.
+//
+#define ERROR_CTX_PD_NOT_FOUND           7003L
+
+//
+// MessageId: ERROR_CTX_WD_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified terminal connection driver was not found in the system path.
+//
+#define ERROR_CTX_WD_NOT_FOUND           7004L
+
+//
+// MessageId: ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY
+//
+// MessageText:
+//
+//  A registry key for event logging could not be created for this session.
+//
+#define ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY 7005L
+
+//
+// MessageId: ERROR_CTX_SERVICE_NAME_COLLISION
+//
+// MessageText:
+//
+//  A service with the same name already exists on the system.
+//
+#define ERROR_CTX_SERVICE_NAME_COLLISION 7006L
+
+//
+// MessageId: ERROR_CTX_CLOSE_PENDING
+//
+// MessageText:
+//
+//  A close operation is pending on the session.
+//
+#define ERROR_CTX_CLOSE_PENDING          7007L
+
+//
+// MessageId: ERROR_CTX_NO_OUTBUF
+//
+// MessageText:
+//
+//  There are no free output buffers available.
+//
+#define ERROR_CTX_NO_OUTBUF              7008L
+
+//
+// MessageId: ERROR_CTX_MODEM_INF_NOT_FOUND
+//
+// MessageText:
+//
+//  The MODEM.INF file was not found.
+//
+#define ERROR_CTX_MODEM_INF_NOT_FOUND    7009L
+
+//
+// MessageId: ERROR_CTX_INVALID_MODEMNAME
+//
+// MessageText:
+//
+//  The modem name was not found in MODEM.INF.
+//
+#define ERROR_CTX_INVALID_MODEMNAME      7010L
+
+//
+// MessageId: ERROR_CTX_MODEM_RESPONSE_ERROR
+//
+// MessageText:
+//
+//  The modem did not accept the command sent to it. Verify that the configured modem name matches the attached modem.
+//
+#define ERROR_CTX_MODEM_RESPONSE_ERROR   7011L
+
+//
+// MessageId: ERROR_CTX_MODEM_RESPONSE_TIMEOUT
+//
+// MessageText:
+//
+//  The modem did not respond to the command sent to it. Verify that the modem is properly cabled and powered on.
+//
+#define ERROR_CTX_MODEM_RESPONSE_TIMEOUT 7012L
+
+//
+// MessageId: ERROR_CTX_MODEM_RESPONSE_NO_CARRIER
+//
+// MessageText:
+//
+//  Carrier detect has failed or carrier has been dropped due to disconnect.
+//
+#define ERROR_CTX_MODEM_RESPONSE_NO_CARRIER 7013L
+
+//
+// MessageId: ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE
+//
+// MessageText:
+//
+//  Dial tone not detected within the required time. Verify that the phone cable is properly attached and functional.
+//
+#define ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE 7014L
+
+//
+// MessageId: ERROR_CTX_MODEM_RESPONSE_BUSY
+//
+// MessageText:
+//
+//  Busy signal detected at remote site on callback.
+//
+#define ERROR_CTX_MODEM_RESPONSE_BUSY    7015L
+
+//
+// MessageId: ERROR_CTX_MODEM_RESPONSE_VOICE
+//
+// MessageText:
+//
+//  Voice detected at remote site on callback.
+//
+#define ERROR_CTX_MODEM_RESPONSE_VOICE   7016L
+
+//
+// MessageId: ERROR_CTX_TD_ERROR
+//
+// MessageText:
+//
+//  Transport driver error
+//
+#define ERROR_CTX_TD_ERROR               7017L
+
+//
+// MessageId: ERROR_CTX_WINSTATION_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified session cannot be found.
+//
+#define ERROR_CTX_WINSTATION_NOT_FOUND   7022L
+
+//
+// MessageId: ERROR_CTX_WINSTATION_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The specified session name is already in use.
+//
+#define ERROR_CTX_WINSTATION_ALREADY_EXISTS 7023L
+
+//
+// MessageId: ERROR_CTX_WINSTATION_BUSY
+//
+// MessageText:
+//
+//  The requested operation cannot be completed because the terminal connection is currently busy processing a connect, disconnect, reset, or delete operation.
+//
+#define ERROR_CTX_WINSTATION_BUSY        7024L
+
+//
+// MessageId: ERROR_CTX_BAD_VIDEO_MODE
+//
+// MessageText:
+//
+//  An attempt has been made to connect to a session whose video mode is not supported by the current client.
+//
+#define ERROR_CTX_BAD_VIDEO_MODE         7025L
+
+//
+// MessageId: ERROR_CTX_GRAPHICS_INVALID
+//
+// MessageText:
+//
+//  The application attempted to enable DOS graphics mode.
+//  DOS graphics mode is not supported.
+//
+#define ERROR_CTX_GRAPHICS_INVALID       7035L
+
+//
+// MessageId: ERROR_CTX_LOGON_DISABLED
+//
+// MessageText:
+//
+//  Your interactive logon privilege has been disabled.
+//  Please contact your administrator.
+//
+#define ERROR_CTX_LOGON_DISABLED         7037L
+
+//
+// MessageId: ERROR_CTX_NOT_CONSOLE
+//
+// MessageText:
+//
+//  The requested operation can be performed only on the system console.
+//  This is most often the result of a driver or system DLL requiring direct console access.
+//
+#define ERROR_CTX_NOT_CONSOLE            7038L
+
+//
+// MessageId: ERROR_CTX_CLIENT_QUERY_TIMEOUT
+//
+// MessageText:
+//
+//  The client failed to respond to the server connect message.
+//
+#define ERROR_CTX_CLIENT_QUERY_TIMEOUT   7040L
+
+//
+// MessageId: ERROR_CTX_CONSOLE_DISCONNECT
+//
+// MessageText:
+//
+//  Disconnecting the console session is not supported.
+//
+#define ERROR_CTX_CONSOLE_DISCONNECT     7041L
+
+//
+// MessageId: ERROR_CTX_CONSOLE_CONNECT
+//
+// MessageText:
+//
+//  Reconnecting a disconnected session to the console is not supported.
+//
+#define ERROR_CTX_CONSOLE_CONNECT        7042L
+
+//
+// MessageId: ERROR_CTX_SHADOW_DENIED
+//
+// MessageText:
+//
+//  The request to control another session remotely was denied.
+//
+#define ERROR_CTX_SHADOW_DENIED          7044L
+
+//
+// MessageId: ERROR_CTX_WINSTATION_ACCESS_DENIED
+//
+// MessageText:
+//
+//  The requested session access is denied.
+//
+#define ERROR_CTX_WINSTATION_ACCESS_DENIED 7045L
+
+//
+// MessageId: ERROR_CTX_INVALID_WD
+//
+// MessageText:
+//
+//  The specified terminal connection driver is invalid.
+//
+#define ERROR_CTX_INVALID_WD             7049L
+
+//
+// MessageId: ERROR_CTX_SHADOW_INVALID
+//
+// MessageText:
+//
+//  The requested session cannot be controlled remotely.
+//  This may be because the session is disconnected or does not currently have a user logged on.
+//
+#define ERROR_CTX_SHADOW_INVALID         7050L
+
+//
+// MessageId: ERROR_CTX_SHADOW_DISABLED
+//
+// MessageText:
+//
+//  The requested session is not configured to allow remote control.
+//
+#define ERROR_CTX_SHADOW_DISABLED        7051L
+
+//
+// MessageId: ERROR_CTX_CLIENT_LICENSE_IN_USE
+//
+// MessageText:
+//
+//  Your request to connect to this Terminal Server has been rejected. Your Terminal Server client license number is currently being used by another user.
+//  Please call your system administrator to obtain a unique license number.
+//
+#define ERROR_CTX_CLIENT_LICENSE_IN_USE  7052L
+
+//
+// MessageId: ERROR_CTX_CLIENT_LICENSE_NOT_SET
+//
+// MessageText:
+//
+//  Your request to connect to this Terminal Server has been rejected. Your Terminal Server client license number has not been entered for this copy of the Terminal Server client.
+//  Please contact your system administrator.
+//
+#define ERROR_CTX_CLIENT_LICENSE_NOT_SET 7053L
+
+//
+// MessageId: ERROR_CTX_LICENSE_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  The system has reached its licensed logon limit.
+//  Please try again later.
+//
+#define ERROR_CTX_LICENSE_NOT_AVAILABLE  7054L
+
+//
+// MessageId: ERROR_CTX_LICENSE_CLIENT_INVALID
+//
+// MessageText:
+//
+//  The client you are using is not licensed to use this system.  Your logon request is denied.
+//
+#define ERROR_CTX_LICENSE_CLIENT_INVALID 7055L
+
+//
+// MessageId: ERROR_CTX_LICENSE_EXPIRED
+//
+// MessageText:
+//
+//  The system license has expired.  Your logon request is denied.
+//
+#define ERROR_CTX_LICENSE_EXPIRED        7056L
+
+//
+// MessageId: ERROR_CTX_SHADOW_NOT_RUNNING
+//
+// MessageText:
+//
+//  Remote control could not be terminated because the specified session is not currently being remotely controlled.
+//
+#define ERROR_CTX_SHADOW_NOT_RUNNING     7057L
+
+//
+// MessageId: ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE
+//
+// MessageText:
+//
+//  The remote control of the console was terminated because the display mode was changed. Changing the display mode in a remote control session is not supported.
+//
+#define ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE 7058L
+
+//
+// MessageId: ERROR_ACTIVATION_COUNT_EXCEEDED
+//
+// MessageText:
+//
+//  Activation has already been reset the maximum number of times for this installation. Your activation timer will not be cleared.
+//
+#define ERROR_ACTIVATION_COUNT_EXCEEDED  7059L
+
+///////////////////////////////////////////////////
+//                                                /
+//             Traffic Control Error Codes        /
+//                                                /
+//                  7500 to  7999                 /
+//                                                /
+//         defined in: tcerror.h                  /
+///////////////////////////////////////////////////
+///////////////////////////////////////////////////
+//                                                /
+//             Active Directory Error Codes       /
+//                                                /
+//                  8000 to  8999                 /
+///////////////////////////////////////////////////
+// *****************
+// FACILITY_FILE_REPLICATION_SERVICE
+// *****************
+//
+// MessageId: FRS_ERR_INVALID_API_SEQUENCE
+//
+// MessageText:
+//
+//  The file replication service API was called incorrectly.
+//
+#define FRS_ERR_INVALID_API_SEQUENCE     8001L
+
+//
+// MessageId: FRS_ERR_STARTING_SERVICE
+//
+// MessageText:
+//
+//  The file replication service cannot be started.
+//
+#define FRS_ERR_STARTING_SERVICE         8002L
+
+//
+// MessageId: FRS_ERR_STOPPING_SERVICE
+//
+// MessageText:
+//
+//  The file replication service cannot be stopped.
+//
+#define FRS_ERR_STOPPING_SERVICE         8003L
+
+//
+// MessageId: FRS_ERR_INTERNAL_API
+//
+// MessageText:
+//
+//  The file replication service API terminated the request.
+//  The event log may have more information.
+//
+#define FRS_ERR_INTERNAL_API             8004L
+
+//
+// MessageId: FRS_ERR_INTERNAL
+//
+// MessageText:
+//
+//  The file replication service terminated the request.
+//  The event log may have more information.
+//
+#define FRS_ERR_INTERNAL                 8005L
+
+//
+// MessageId: FRS_ERR_SERVICE_COMM
+//
+// MessageText:
+//
+//  The file replication service cannot be contacted.
+//  The event log may have more information.
+//
+#define FRS_ERR_SERVICE_COMM             8006L
+
+//
+// MessageId: FRS_ERR_INSUFFICIENT_PRIV
+//
+// MessageText:
+//
+//  The file replication service cannot satisfy the request because the user has insufficient privileges.
+//  The event log may have more information.
+//
+#define FRS_ERR_INSUFFICIENT_PRIV        8007L
+
+//
+// MessageId: FRS_ERR_AUTHENTICATION
+//
+// MessageText:
+//
+//  The file replication service cannot satisfy the request because authenticated RPC is not available.
+//  The event log may have more information.
+//
+#define FRS_ERR_AUTHENTICATION           8008L
+
+//
+// MessageId: FRS_ERR_PARENT_INSUFFICIENT_PRIV
+//
+// MessageText:
+//
+//  The file replication service cannot satisfy the request because the user has insufficient privileges on the domain controller.
+//  The event log may have more information.
+//
+#define FRS_ERR_PARENT_INSUFFICIENT_PRIV 8009L
+
+//
+// MessageId: FRS_ERR_PARENT_AUTHENTICATION
+//
+// MessageText:
+//
+//  The file replication service cannot satisfy the request because authenticated RPC is not available on the domain controller.
+//  The event log may have more information.
+//
+#define FRS_ERR_PARENT_AUTHENTICATION    8010L
+
+//
+// MessageId: FRS_ERR_CHILD_TO_PARENT_COMM
+//
+// MessageText:
+//
+//  The file replication service cannot communicate with the file replication service on the domain controller.
+//  The event log may have more information.
+//
+#define FRS_ERR_CHILD_TO_PARENT_COMM     8011L
+
+//
+// MessageId: FRS_ERR_PARENT_TO_CHILD_COMM
+//
+// MessageText:
+//
+//  The file replication service on the domain controller cannot communicate with the file replication service on this computer.
+//  The event log may have more information.
+//
+#define FRS_ERR_PARENT_TO_CHILD_COMM     8012L
+
+//
+// MessageId: FRS_ERR_SYSVOL_POPULATE
+//
+// MessageText:
+//
+//  The file replication service cannot populate the system volume because of an internal error.
+//  The event log may have more information.
+//
+#define FRS_ERR_SYSVOL_POPULATE          8013L
+
+//
+// MessageId: FRS_ERR_SYSVOL_POPULATE_TIMEOUT
+//
+// MessageText:
+//
+//  The file replication service cannot populate the system volume because of an internal timeout.
+//  The event log may have more information.
+//
+#define FRS_ERR_SYSVOL_POPULATE_TIMEOUT  8014L
+
+//
+// MessageId: FRS_ERR_SYSVOL_IS_BUSY
+//
+// MessageText:
+//
+//  The file replication service cannot process the request. The system volume is busy with a previous request.
+//
+#define FRS_ERR_SYSVOL_IS_BUSY           8015L
+
+//
+// MessageId: FRS_ERR_SYSVOL_DEMOTE
+//
+// MessageText:
+//
+//  The file replication service cannot stop replicating the system volume because of an internal error.
+//  The event log may have more information.
+//
+#define FRS_ERR_SYSVOL_DEMOTE            8016L
+
+//
+// MessageId: FRS_ERR_INVALID_SERVICE_PARAMETER
+//
+// MessageText:
+//
+//  The file replication service detected an invalid parameter.
+//
+#define FRS_ERR_INVALID_SERVICE_PARAMETER 8017L
+
+// *****************
+// FACILITY DIRECTORY SERVICE
+// *****************
+#define DS_S_SUCCESS NO_ERROR
+//
+// MessageId: ERROR_DS_NOT_INSTALLED
+//
+// MessageText:
+//
+//  An error occurred while installing the directory service. For more information, see the event log.
+//
+#define ERROR_DS_NOT_INSTALLED           8200L
+
+//
+// MessageId: ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY
+//
+// MessageText:
+//
+//  The directory service evaluated group memberships locally.
+//
+#define ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY 8201L
+
+//
+// MessageId: ERROR_DS_NO_ATTRIBUTE_OR_VALUE
+//
+// MessageText:
+//
+//  The specified directory service attribute or value does not exist.
+//
+#define ERROR_DS_NO_ATTRIBUTE_OR_VALUE   8202L
+
+//
+// MessageId: ERROR_DS_INVALID_ATTRIBUTE_SYNTAX
+//
+// MessageText:
+//
+//  The attribute syntax specified to the directory service is invalid.
+//
+#define ERROR_DS_INVALID_ATTRIBUTE_SYNTAX 8203L
+
+//
+// MessageId: ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED
+//
+// MessageText:
+//
+//  The attribute type specified to the directory service is not defined.
+//
+#define ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED 8204L
+
+//
+// MessageId: ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS
+//
+// MessageText:
+//
+//  The specified directory service attribute or value already exists.
+//
+#define ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS 8205L
+
+//
+// MessageId: ERROR_DS_BUSY
+//
+// MessageText:
+//
+//  The directory service is busy.
+//
+#define ERROR_DS_BUSY                    8206L
+
+//
+// MessageId: ERROR_DS_UNAVAILABLE
+//
+// MessageText:
+//
+//  The directory service is unavailable.
+//
+#define ERROR_DS_UNAVAILABLE             8207L
+
+//
+// MessageId: ERROR_DS_NO_RIDS_ALLOCATED
+//
+// MessageText:
+//
+//  The directory service was unable to allocate a relative identifier.
+//
+#define ERROR_DS_NO_RIDS_ALLOCATED       8208L
+
+//
+// MessageId: ERROR_DS_NO_MORE_RIDS
+//
+// MessageText:
+//
+//  The directory service has exhausted the pool of relative identifiers.
+//
+#define ERROR_DS_NO_MORE_RIDS            8209L
+
+//
+// MessageId: ERROR_DS_INCORRECT_ROLE_OWNER
+//
+// MessageText:
+//
+//  The requested operation could not be performed because the directory service is not the master for that type of operation.
+//
+#define ERROR_DS_INCORRECT_ROLE_OWNER    8210L
+
+//
+// MessageId: ERROR_DS_RIDMGR_INIT_ERROR
+//
+// MessageText:
+//
+//  The directory service was unable to initialize the subsystem that allocates relative identifiers.
+//
+#define ERROR_DS_RIDMGR_INIT_ERROR       8211L
+
+//
+// MessageId: ERROR_DS_OBJ_CLASS_VIOLATION
+//
+// MessageText:
+//
+//  The requested operation did not satisfy one or more constraints associated with the class of the object.
+//
+#define ERROR_DS_OBJ_CLASS_VIOLATION     8212L
+
+//
+// MessageId: ERROR_DS_CANT_ON_NON_LEAF
+//
+// MessageText:
+//
+//  The directory service can perform the requested operation only on a leaf object.
+//
+#define ERROR_DS_CANT_ON_NON_LEAF        8213L
+
+//
+// MessageId: ERROR_DS_CANT_ON_RDN
+//
+// MessageText:
+//
+//  The directory service cannot perform the requested operation on the RDN attribute of an object.
+//
+#define ERROR_DS_CANT_ON_RDN             8214L
+
+//
+// MessageId: ERROR_DS_CANT_MOD_OBJ_CLASS
+//
+// MessageText:
+//
+//  The directory service detected an attempt to modify the object class of an object.
+//
+#define ERROR_DS_CANT_MOD_OBJ_CLASS      8215L
+
+//
+// MessageId: ERROR_DS_CROSS_DOM_MOVE_ERROR
+//
+// MessageText:
+//
+//  The requested cross-domain move operation could not be performed.
+//
+#define ERROR_DS_CROSS_DOM_MOVE_ERROR    8216L
+
+//
+// MessageId: ERROR_DS_GC_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  Unable to contact the global catalog server.
+//
+#define ERROR_DS_GC_NOT_AVAILABLE        8217L
+
+//
+// MessageId: ERROR_SHARED_POLICY
+//
+// MessageText:
+//
+//  The policy object is shared and can only be modified at the root.
+//
+#define ERROR_SHARED_POLICY              8218L
+
+//
+// MessageId: ERROR_POLICY_OBJECT_NOT_FOUND
+//
+// MessageText:
+//
+//  The policy object does not exist.
+//
+#define ERROR_POLICY_OBJECT_NOT_FOUND    8219L
+
+//
+// MessageId: ERROR_POLICY_ONLY_IN_DS
+//
+// MessageText:
+//
+//  The requested policy information is only in the directory service.
+//
+#define ERROR_POLICY_ONLY_IN_DS          8220L
+
+//
+// MessageId: ERROR_PROMOTION_ACTIVE
+//
+// MessageText:
+//
+//  A domain controller promotion is currently active.
+//
+#define ERROR_PROMOTION_ACTIVE           8221L
+
+//
+// MessageId: ERROR_NO_PROMOTION_ACTIVE
+//
+// MessageText:
+//
+//  A domain controller promotion is not currently active
+//
+#define ERROR_NO_PROMOTION_ACTIVE        8222L
+
+// 8223 unused
+//
+// MessageId: ERROR_DS_OPERATIONS_ERROR
+//
+// MessageText:
+//
+//  An operations error occurred.
+//
+#define ERROR_DS_OPERATIONS_ERROR        8224L
+
+//
+// MessageId: ERROR_DS_PROTOCOL_ERROR
+//
+// MessageText:
+//
+//  A protocol error occurred.
+//
+#define ERROR_DS_PROTOCOL_ERROR          8225L
+
+//
+// MessageId: ERROR_DS_TIMELIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  The time limit for this request was exceeded.
+//
+#define ERROR_DS_TIMELIMIT_EXCEEDED      8226L
+
+//
+// MessageId: ERROR_DS_SIZELIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  The size limit for this request was exceeded.
+//
+#define ERROR_DS_SIZELIMIT_EXCEEDED      8227L
+
+//
+// MessageId: ERROR_DS_ADMIN_LIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  The administrative limit for this request was exceeded.
+//
+#define ERROR_DS_ADMIN_LIMIT_EXCEEDED    8228L
+
+//
+// MessageId: ERROR_DS_COMPARE_FALSE
+//
+// MessageText:
+//
+//  The compare response was false.
+//
+#define ERROR_DS_COMPARE_FALSE           8229L
+
+//
+// MessageId: ERROR_DS_COMPARE_TRUE
+//
+// MessageText:
+//
+//  The compare response was true.
+//
+#define ERROR_DS_COMPARE_TRUE            8230L
+
+//
+// MessageId: ERROR_DS_AUTH_METHOD_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The requested authentication method is not supported by the server.
+//
+#define ERROR_DS_AUTH_METHOD_NOT_SUPPORTED 8231L
+
+//
+// MessageId: ERROR_DS_STRONG_AUTH_REQUIRED
+//
+// MessageText:
+//
+//  A more secure authentication method is required for this server.
+//
+#define ERROR_DS_STRONG_AUTH_REQUIRED    8232L
+
+//
+// MessageId: ERROR_DS_INAPPROPRIATE_AUTH
+//
+// MessageText:
+//
+//  Inappropriate authentication.
+//
+#define ERROR_DS_INAPPROPRIATE_AUTH      8233L
+
+//
+// MessageId: ERROR_DS_AUTH_UNKNOWN
+//
+// MessageText:
+//
+//  The authentication mechanism is unknown.
+//
+#define ERROR_DS_AUTH_UNKNOWN            8234L
+
+//
+// MessageId: ERROR_DS_REFERRAL
+//
+// MessageText:
+//
+//  A referral was returned from the server.
+//
+#define ERROR_DS_REFERRAL                8235L
+
+//
+// MessageId: ERROR_DS_UNAVAILABLE_CRIT_EXTENSION
+//
+// MessageText:
+//
+//  The server does not support the requested critical extension.
+//
+#define ERROR_DS_UNAVAILABLE_CRIT_EXTENSION 8236L
+
+//
+// MessageId: ERROR_DS_CONFIDENTIALITY_REQUIRED
+//
+// MessageText:
+//
+//  This request requires a secure connection.
+//
+#define ERROR_DS_CONFIDENTIALITY_REQUIRED 8237L
+
+//
+// MessageId: ERROR_DS_INAPPROPRIATE_MATCHING
+//
+// MessageText:
+//
+//  Inappropriate matching.
+//
+#define ERROR_DS_INAPPROPRIATE_MATCHING  8238L
+
+//
+// MessageId: ERROR_DS_CONSTRAINT_VIOLATION
+//
+// MessageText:
+//
+//  A constraint violation occurred.
+//
+#define ERROR_DS_CONSTRAINT_VIOLATION    8239L
+
+//
+// MessageId: ERROR_DS_NO_SUCH_OBJECT
+//
+// MessageText:
+//
+//  There is no such object on the server.
+//
+#define ERROR_DS_NO_SUCH_OBJECT          8240L
+
+//
+// MessageId: ERROR_DS_ALIAS_PROBLEM
+//
+// MessageText:
+//
+//  There is an alias problem.
+//
+#define ERROR_DS_ALIAS_PROBLEM           8241L
+
+//
+// MessageId: ERROR_DS_INVALID_DN_SYNTAX
+//
+// MessageText:
+//
+//  An invalid dn syntax has been specified.
+//
+#define ERROR_DS_INVALID_DN_SYNTAX       8242L
+
+//
+// MessageId: ERROR_DS_IS_LEAF
+//
+// MessageText:
+//
+//  The object is a leaf object.
+//
+#define ERROR_DS_IS_LEAF                 8243L
+
+//
+// MessageId: ERROR_DS_ALIAS_DEREF_PROBLEM
+//
+// MessageText:
+//
+//  There is an alias dereferencing problem.
+//
+#define ERROR_DS_ALIAS_DEREF_PROBLEM     8244L
+
+//
+// MessageId: ERROR_DS_UNWILLING_TO_PERFORM
+//
+// MessageText:
+//
+//  The server is unwilling to process the request.
+//
+#define ERROR_DS_UNWILLING_TO_PERFORM    8245L
+
+//
+// MessageId: ERROR_DS_LOOP_DETECT
+//
+// MessageText:
+//
+//  A loop has been detected.
+//
+#define ERROR_DS_LOOP_DETECT             8246L
+
+//
+// MessageId: ERROR_DS_NAMING_VIOLATION
+//
+// MessageText:
+//
+//  There is a naming violation.
+//
+#define ERROR_DS_NAMING_VIOLATION        8247L
+
+//
+// MessageId: ERROR_DS_OBJECT_RESULTS_TOO_LARGE
+//
+// MessageText:
+//
+//  The result set is too large.
+//
+#define ERROR_DS_OBJECT_RESULTS_TOO_LARGE 8248L
+
+//
+// MessageId: ERROR_DS_AFFECTS_MULTIPLE_DSAS
+//
+// MessageText:
+//
+//  The operation affects multiple DSAs
+//
+#define ERROR_DS_AFFECTS_MULTIPLE_DSAS   8249L
+
+//
+// MessageId: ERROR_DS_SERVER_DOWN
+//
+// MessageText:
+//
+//  The server is not operational.
+//
+#define ERROR_DS_SERVER_DOWN             8250L
+
+//
+// MessageId: ERROR_DS_LOCAL_ERROR
+//
+// MessageText:
+//
+//  A local error has occurred.
+//
+#define ERROR_DS_LOCAL_ERROR             8251L
+
+//
+// MessageId: ERROR_DS_ENCODING_ERROR
+//
+// MessageText:
+//
+//  An encoding error has occurred.
+//
+#define ERROR_DS_ENCODING_ERROR          8252L
+
+//
+// MessageId: ERROR_DS_DECODING_ERROR
+//
+// MessageText:
+//
+//  A decoding error has occurred.
+//
+#define ERROR_DS_DECODING_ERROR          8253L
+
+//
+// MessageId: ERROR_DS_FILTER_UNKNOWN
+//
+// MessageText:
+//
+//  The search filter cannot be recognized.
+//
+#define ERROR_DS_FILTER_UNKNOWN          8254L
+
+//
+// MessageId: ERROR_DS_PARAM_ERROR
+//
+// MessageText:
+//
+//  One or more parameters are illegal.
+//
+#define ERROR_DS_PARAM_ERROR             8255L
+
+//
+// MessageId: ERROR_DS_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The specified method is not supported.
+//
+#define ERROR_DS_NOT_SUPPORTED           8256L
+
+//
+// MessageId: ERROR_DS_NO_RESULTS_RETURNED
+//
+// MessageText:
+//
+//  No results were returned.
+//
+#define ERROR_DS_NO_RESULTS_RETURNED     8257L
+
+//
+// MessageId: ERROR_DS_CONTROL_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified control is not supported by the server.
+//
+#define ERROR_DS_CONTROL_NOT_FOUND       8258L
+
+//
+// MessageId: ERROR_DS_CLIENT_LOOP
+//
+// MessageText:
+//
+//  A referral loop was detected by the client.
+//
+#define ERROR_DS_CLIENT_LOOP             8259L
+
+//
+// MessageId: ERROR_DS_REFERRAL_LIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  The preset referral limit was exceeded.
+//
+#define ERROR_DS_REFERRAL_LIMIT_EXCEEDED 8260L
+
+//
+// MessageId: ERROR_DS_SORT_CONTROL_MISSING
+//
+// MessageText:
+//
+//  The search requires a SORT control.
+//
+#define ERROR_DS_SORT_CONTROL_MISSING    8261L
+
+//
+// MessageId: ERROR_DS_OFFSET_RANGE_ERROR
+//
+// MessageText:
+//
+//  The search results exceed the offset range specified.
+//
+#define ERROR_DS_OFFSET_RANGE_ERROR      8262L
+
+//
+// MessageId: ERROR_DS_ROOT_MUST_BE_NC
+//
+// MessageText:
+//
+//  The root object must be the head of a naming context. The root object cannot have an instantiated parent.
+//
+#define ERROR_DS_ROOT_MUST_BE_NC         8301L
+
+//
+// MessageId: ERROR_DS_ADD_REPLICA_INHIBITED
+//
+// MessageText:
+//
+//  The add replica operation cannot be performed. The naming context must be writeable in order to create the replica.
+//
+#define ERROR_DS_ADD_REPLICA_INHIBITED   8302L
+
+//
+// MessageId: ERROR_DS_ATT_NOT_DEF_IN_SCHEMA
+//
+// MessageText:
+//
+//  A reference to an attribute that is not defined in the schema occurred.
+//
+#define ERROR_DS_ATT_NOT_DEF_IN_SCHEMA   8303L
+
+//
+// MessageId: ERROR_DS_MAX_OBJ_SIZE_EXCEEDED
+//
+// MessageText:
+//
+//  The maximum size of an object has been exceeded.
+//
+#define ERROR_DS_MAX_OBJ_SIZE_EXCEEDED   8304L
+
+//
+// MessageId: ERROR_DS_OBJ_STRING_NAME_EXISTS
+//
+// MessageText:
+//
+//  An attempt was made to add an object to the directory with a name that is already in use.
+//
+#define ERROR_DS_OBJ_STRING_NAME_EXISTS  8305L
+
+//
+// MessageId: ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA
+//
+// MessageText:
+//
+//  An attempt was made to add an object of a class that does not have an RDN defined in the schema.
+//
+#define ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA 8306L
+
+//
+// MessageId: ERROR_DS_RDN_DOESNT_MATCH_SCHEMA
+//
+// MessageText:
+//
+//  An attempt was made to add an object using an RDN that is not the RDN defined in the schema.
+//
+#define ERROR_DS_RDN_DOESNT_MATCH_SCHEMA 8307L
+
+//
+// MessageId: ERROR_DS_NO_REQUESTED_ATTS_FOUND
+//
+// MessageText:
+//
+//  None of the requested attributes were found on the objects.
+//
+#define ERROR_DS_NO_REQUESTED_ATTS_FOUND 8308L
+
+//
+// MessageId: ERROR_DS_USER_BUFFER_TO_SMALL
+//
+// MessageText:
+//
+//  The user buffer is too small.
+//
+#define ERROR_DS_USER_BUFFER_TO_SMALL    8309L
+
+//
+// MessageId: ERROR_DS_ATT_IS_NOT_ON_OBJ
+//
+// MessageText:
+//
+//  The attribute specified in the operation is not present on the object.
+//
+#define ERROR_DS_ATT_IS_NOT_ON_OBJ       8310L
+
+//
+// MessageId: ERROR_DS_ILLEGAL_MOD_OPERATION
+//
+// MessageText:
+//
+//  Illegal modify operation. Some aspect of the modification is not permitted.
+//
+#define ERROR_DS_ILLEGAL_MOD_OPERATION   8311L
+
+//
+// MessageId: ERROR_DS_OBJ_TOO_LARGE
+//
+// MessageText:
+//
+//  The specified object is too large.
+//
+#define ERROR_DS_OBJ_TOO_LARGE           8312L
+
+//
+// MessageId: ERROR_DS_BAD_INSTANCE_TYPE
+//
+// MessageText:
+//
+//  The specified instance type is not valid.
+//
+#define ERROR_DS_BAD_INSTANCE_TYPE       8313L
+
+//
+// MessageId: ERROR_DS_MASTERDSA_REQUIRED
+//
+// MessageText:
+//
+//  The operation must be performed at a master DSA.
+//
+#define ERROR_DS_MASTERDSA_REQUIRED      8314L
+
+//
+// MessageId: ERROR_DS_OBJECT_CLASS_REQUIRED
+//
+// MessageText:
+//
+//  The object class attribute must be specified.
+//
+#define ERROR_DS_OBJECT_CLASS_REQUIRED   8315L
+
+//
+// MessageId: ERROR_DS_MISSING_REQUIRED_ATT
+//
+// MessageText:
+//
+//  A required attribute is missing.
+//
+#define ERROR_DS_MISSING_REQUIRED_ATT    8316L
+
+//
+// MessageId: ERROR_DS_ATT_NOT_DEF_FOR_CLASS
+//
+// MessageText:
+//
+//  An attempt was made to modify an object to include an attribute that is not legal for its class.
+//
+#define ERROR_DS_ATT_NOT_DEF_FOR_CLASS   8317L
+
+//
+// MessageId: ERROR_DS_ATT_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The specified attribute is already present on the object.
+//
+#define ERROR_DS_ATT_ALREADY_EXISTS      8318L
+
+// 8319 unused
+//
+// MessageId: ERROR_DS_CANT_ADD_ATT_VALUES
+//
+// MessageText:
+//
+//  The specified attribute is not present, or has no values.
+//
+#define ERROR_DS_CANT_ADD_ATT_VALUES     8320L
+
+//
+// MessageId: ERROR_DS_SINGLE_VALUE_CONSTRAINT
+//
+// MessageText:
+//
+//  Multiple values were specified for an attribute that can have only one value.
+//
+#define ERROR_DS_SINGLE_VALUE_CONSTRAINT 8321L
+
+//
+// MessageId: ERROR_DS_RANGE_CONSTRAINT
+//
+// MessageText:
+//
+//  A value for the attribute was not in the acceptable range of values.
+//
+#define ERROR_DS_RANGE_CONSTRAINT        8322L
+
+//
+// MessageId: ERROR_DS_ATT_VAL_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The specified value already exists.
+//
+#define ERROR_DS_ATT_VAL_ALREADY_EXISTS  8323L
+
+//
+// MessageId: ERROR_DS_CANT_REM_MISSING_ATT
+//
+// MessageText:
+//
+//  The attribute cannot be removed because it is not present on the object.
+//
+#define ERROR_DS_CANT_REM_MISSING_ATT    8324L
+
+//
+// MessageId: ERROR_DS_CANT_REM_MISSING_ATT_VAL
+//
+// MessageText:
+//
+//  The attribute value cannot be removed because it is not present on the object.
+//
+#define ERROR_DS_CANT_REM_MISSING_ATT_VAL 8325L
+
+//
+// MessageId: ERROR_DS_ROOT_CANT_BE_SUBREF
+//
+// MessageText:
+//
+//  The specified root object cannot be a subref.
+//
+#define ERROR_DS_ROOT_CANT_BE_SUBREF     8326L
+
+//
+// MessageId: ERROR_DS_NO_CHAINING
+//
+// MessageText:
+//
+//  Chaining is not permitted.
+//
+#define ERROR_DS_NO_CHAINING             8327L
+
+//
+// MessageId: ERROR_DS_NO_CHAINED_EVAL
+//
+// MessageText:
+//
+//  Chained evaluation is not permitted.
+//
+#define ERROR_DS_NO_CHAINED_EVAL         8328L
+
+//
+// MessageId: ERROR_DS_NO_PARENT_OBJECT
+//
+// MessageText:
+//
+//  The operation could not be performed because the object's parent is either uninstantiated or deleted.
+//
+#define ERROR_DS_NO_PARENT_OBJECT        8329L
+
+//
+// MessageId: ERROR_DS_PARENT_IS_AN_ALIAS
+//
+// MessageText:
+//
+//  Having a parent that is an alias is not permitted. Aliases are leaf objects.
+//
+#define ERROR_DS_PARENT_IS_AN_ALIAS      8330L
+
+//
+// MessageId: ERROR_DS_CANT_MIX_MASTER_AND_REPS
+//
+// MessageText:
+//
+//  The object and parent must be of the same type, either both masters or both replicas.
+//
+#define ERROR_DS_CANT_MIX_MASTER_AND_REPS 8331L
+
+//
+// MessageId: ERROR_DS_CHILDREN_EXIST
+//
+// MessageText:
+//
+//  The operation cannot be performed because child objects exist. This operation can only be performed on a leaf object.
+//
+#define ERROR_DS_CHILDREN_EXIST          8332L
+
+//
+// MessageId: ERROR_DS_OBJ_NOT_FOUND
+//
+// MessageText:
+//
+//  Directory object not found.
+//
+#define ERROR_DS_OBJ_NOT_FOUND           8333L
+
+//
+// MessageId: ERROR_DS_ALIASED_OBJ_MISSING
+//
+// MessageText:
+//
+//  The aliased object is missing.
+//
+#define ERROR_DS_ALIASED_OBJ_MISSING     8334L
+
+//
+// MessageId: ERROR_DS_BAD_NAME_SYNTAX
+//
+// MessageText:
+//
+//  The object name has bad syntax.
+//
+#define ERROR_DS_BAD_NAME_SYNTAX         8335L
+
+//
+// MessageId: ERROR_DS_ALIAS_POINTS_TO_ALIAS
+//
+// MessageText:
+//
+//  It is not permitted for an alias to refer to another alias.
+//
+#define ERROR_DS_ALIAS_POINTS_TO_ALIAS   8336L
+
+//
+// MessageId: ERROR_DS_CANT_DEREF_ALIAS
+//
+// MessageText:
+//
+//  The alias cannot be dereferenced.
+//
+#define ERROR_DS_CANT_DEREF_ALIAS        8337L
+
+//
+// MessageId: ERROR_DS_OUT_OF_SCOPE
+//
+// MessageText:
+//
+//  The operation is out of scope.
+//
+#define ERROR_DS_OUT_OF_SCOPE            8338L
+
+//
+// MessageId: ERROR_DS_OBJECT_BEING_REMOVED
+//
+// MessageText:
+//
+//  The operation cannot continue because the object is in the process of being removed.
+//
+#define ERROR_DS_OBJECT_BEING_REMOVED    8339L
+
+//
+// MessageId: ERROR_DS_CANT_DELETE_DSA_OBJ
+//
+// MessageText:
+//
+//  The DSA object cannot be deleted.
+//
+#define ERROR_DS_CANT_DELETE_DSA_OBJ     8340L
+
+//
+// MessageId: ERROR_DS_GENERIC_ERROR
+//
+// MessageText:
+//
+//  A directory service error has occurred.
+//
+#define ERROR_DS_GENERIC_ERROR           8341L
+
+//
+// MessageId: ERROR_DS_DSA_MUST_BE_INT_MASTER
+//
+// MessageText:
+//
+//  The operation can only be performed on an internal master DSA object.
+//
+#define ERROR_DS_DSA_MUST_BE_INT_MASTER  8342L
+
+//
+// MessageId: ERROR_DS_CLASS_NOT_DSA
+//
+// MessageText:
+//
+//  The object must be of class DSA.
+//
+#define ERROR_DS_CLASS_NOT_DSA           8343L
+
+//
+// MessageId: ERROR_DS_INSUFF_ACCESS_RIGHTS
+//
+// MessageText:
+//
+//  Insufficient access rights to perform the operation.
+//
+#define ERROR_DS_INSUFF_ACCESS_RIGHTS    8344L
+
+//
+// MessageId: ERROR_DS_ILLEGAL_SUPERIOR
+//
+// MessageText:
+//
+//  The object cannot be added because the parent is not on the list of possible superiors.
+//
+#define ERROR_DS_ILLEGAL_SUPERIOR        8345L
+
+//
+// MessageId: ERROR_DS_ATTRIBUTE_OWNED_BY_SAM
+//
+// MessageText:
+//
+//  Access to the attribute is not permitted because the attribute is owned by the Security Accounts Manager (SAM).
+//
+#define ERROR_DS_ATTRIBUTE_OWNED_BY_SAM  8346L
+
+//
+// MessageId: ERROR_DS_NAME_TOO_MANY_PARTS
+//
+// MessageText:
+//
+//  The name has too many parts.
+//
+#define ERROR_DS_NAME_TOO_MANY_PARTS     8347L
+
+//
+// MessageId: ERROR_DS_NAME_TOO_LONG
+//
+// MessageText:
+//
+//  The name is too long.
+//
+#define ERROR_DS_NAME_TOO_LONG           8348L
+
+//
+// MessageId: ERROR_DS_NAME_VALUE_TOO_LONG
+//
+// MessageText:
+//
+//  The name value is too long.
+//
+#define ERROR_DS_NAME_VALUE_TOO_LONG     8349L
+
+//
+// MessageId: ERROR_DS_NAME_UNPARSEABLE
+//
+// MessageText:
+//
+//  The directory service encountered an error parsing a name.
+//
+#define ERROR_DS_NAME_UNPARSEABLE        8350L
+
+//
+// MessageId: ERROR_DS_NAME_TYPE_UNKNOWN
+//
+// MessageText:
+//
+//  The directory service cannot get the attribute type for a name.
+//
+#define ERROR_DS_NAME_TYPE_UNKNOWN       8351L
+
+//
+// MessageId: ERROR_DS_NOT_AN_OBJECT
+//
+// MessageText:
+//
+//  The name does not identify an object; the name identifies a phantom.
+//
+#define ERROR_DS_NOT_AN_OBJECT           8352L
+
+//
+// MessageId: ERROR_DS_SEC_DESC_TOO_SHORT
+//
+// MessageText:
+//
+//  The security descriptor is too short.
+//
+#define ERROR_DS_SEC_DESC_TOO_SHORT      8353L
+
+//
+// MessageId: ERROR_DS_SEC_DESC_INVALID
+//
+// MessageText:
+//
+//  The security descriptor is invalid.
+//
+#define ERROR_DS_SEC_DESC_INVALID        8354L
+
+//
+// MessageId: ERROR_DS_NO_DELETED_NAME
+//
+// MessageText:
+//
+//  Failed to create name for deleted object.
+//
+#define ERROR_DS_NO_DELETED_NAME         8355L
+
+//
+// MessageId: ERROR_DS_SUBREF_MUST_HAVE_PARENT
+//
+// MessageText:
+//
+//  The parent of a new subref must exist.
+//
+#define ERROR_DS_SUBREF_MUST_HAVE_PARENT 8356L
+
+//
+// MessageId: ERROR_DS_NCNAME_MUST_BE_NC
+//
+// MessageText:
+//
+//  The object must be a naming context.
+//
+#define ERROR_DS_NCNAME_MUST_BE_NC       8357L
+
+//
+// MessageId: ERROR_DS_CANT_ADD_SYSTEM_ONLY
+//
+// MessageText:
+//
+//  It is not permitted to add an attribute which is owned by the system.
+//
+#define ERROR_DS_CANT_ADD_SYSTEM_ONLY    8358L
+
+//
+// MessageId: ERROR_DS_CLASS_MUST_BE_CONCRETE
+//
+// MessageText:
+//
+//  The class of the object must be structural; you cannot instantiate an abstract class.
+//
+#define ERROR_DS_CLASS_MUST_BE_CONCRETE  8359L
+
+//
+// MessageId: ERROR_DS_INVALID_DMD
+//
+// MessageText:
+//
+//  The schema object could not be found.
+//
+#define ERROR_DS_INVALID_DMD             8360L
+
+//
+// MessageId: ERROR_DS_OBJ_GUID_EXISTS
+//
+// MessageText:
+//
+//  A local object with this GUID (dead or alive) already exists.
+//
+#define ERROR_DS_OBJ_GUID_EXISTS         8361L
+
+//
+// MessageId: ERROR_DS_NOT_ON_BACKLINK
+//
+// MessageText:
+//
+//  The operation cannot be performed on a back link.
+//
+#define ERROR_DS_NOT_ON_BACKLINK         8362L
+
+//
+// MessageId: ERROR_DS_NO_CROSSREF_FOR_NC
+//
+// MessageText:
+//
+//  The cross reference for the specified naming context could not be found.
+//
+#define ERROR_DS_NO_CROSSREF_FOR_NC      8363L
+
+//
+// MessageId: ERROR_DS_SHUTTING_DOWN
+//
+// MessageText:
+//
+//  The operation could not be performed because the directory service is shutting down.
+//
+#define ERROR_DS_SHUTTING_DOWN           8364L
+
+//
+// MessageId: ERROR_DS_UNKNOWN_OPERATION
+//
+// MessageText:
+//
+//  The directory service request is invalid.
+//
+#define ERROR_DS_UNKNOWN_OPERATION       8365L
+
+//
+// MessageId: ERROR_DS_INVALID_ROLE_OWNER
+//
+// MessageText:
+//
+//  The role owner attribute could not be read.
+//
+#define ERROR_DS_INVALID_ROLE_OWNER      8366L
+
+//
+// MessageId: ERROR_DS_COULDNT_CONTACT_FSMO
+//
+// MessageText:
+//
+//  The requested FSMO operation failed. The current FSMO holder could not be contacted.
+//
+#define ERROR_DS_COULDNT_CONTACT_FSMO    8367L
+
+//
+// MessageId: ERROR_DS_CROSS_NC_DN_RENAME
+//
+// MessageText:
+//
+//  Modification of a DN across a naming context is not permitted.
+//
+#define ERROR_DS_CROSS_NC_DN_RENAME      8368L
+
+//
+// MessageId: ERROR_DS_CANT_MOD_SYSTEM_ONLY
+//
+// MessageText:
+//
+//  The attribute cannot be modified because it is owned by the system.
+//
+#define ERROR_DS_CANT_MOD_SYSTEM_ONLY    8369L
+
+//
+// MessageId: ERROR_DS_REPLICATOR_ONLY
+//
+// MessageText:
+//
+//  Only the replicator can perform this function.
+//
+#define ERROR_DS_REPLICATOR_ONLY         8370L
+
+//
+// MessageId: ERROR_DS_OBJ_CLASS_NOT_DEFINED
+//
+// MessageText:
+//
+//  The specified class is not defined.
+//
+#define ERROR_DS_OBJ_CLASS_NOT_DEFINED   8371L
+
+//
+// MessageId: ERROR_DS_OBJ_CLASS_NOT_SUBCLASS
+//
+// MessageText:
+//
+//  The specified class is not a subclass.
+//
+#define ERROR_DS_OBJ_CLASS_NOT_SUBCLASS  8372L
+
+//
+// MessageId: ERROR_DS_NAME_REFERENCE_INVALID
+//
+// MessageText:
+//
+//  The name reference is invalid.
+//
+#define ERROR_DS_NAME_REFERENCE_INVALID  8373L
+
+//
+// MessageId: ERROR_DS_CROSS_REF_EXISTS
+//
+// MessageText:
+//
+//  A cross reference already exists.
+//
+#define ERROR_DS_CROSS_REF_EXISTS        8374L
+
+//
+// MessageId: ERROR_DS_CANT_DEL_MASTER_CROSSREF
+//
+// MessageText:
+//
+//  It is not permitted to delete a master cross reference.
+//
+#define ERROR_DS_CANT_DEL_MASTER_CROSSREF 8375L
+
+//
+// MessageId: ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD
+//
+// MessageText:
+//
+//  Subtree notifications are only supported on NC heads.
+//
+#define ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD 8376L
+
+//
+// MessageId: ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX
+//
+// MessageText:
+//
+//  Notification filter is too complex.
+//
+#define ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX 8377L
+
+//
+// MessageId: ERROR_DS_DUP_RDN
+//
+// MessageText:
+//
+//  Schema update failed: duplicate RDN.
+//
+#define ERROR_DS_DUP_RDN                 8378L
+
+//
+// MessageId: ERROR_DS_DUP_OID
+//
+// MessageText:
+//
+//  Schema update failed: duplicate OID.
+//
+#define ERROR_DS_DUP_OID                 8379L
+
+//
+// MessageId: ERROR_DS_DUP_MAPI_ID
+//
+// MessageText:
+//
+//  Schema update failed: duplicate MAPI identifier.
+//
+#define ERROR_DS_DUP_MAPI_ID             8380L
+
+//
+// MessageId: ERROR_DS_DUP_SCHEMA_ID_GUID
+//
+// MessageText:
+//
+//  Schema update failed: duplicate schema-id GUID.
+//
+#define ERROR_DS_DUP_SCHEMA_ID_GUID      8381L
+
+//
+// MessageId: ERROR_DS_DUP_LDAP_DISPLAY_NAME
+//
+// MessageText:
+//
+//  Schema update failed: duplicate LDAP display name.
+//
+#define ERROR_DS_DUP_LDAP_DISPLAY_NAME   8382L
+
+//
+// MessageId: ERROR_DS_SEMANTIC_ATT_TEST
+//
+// MessageText:
+//
+//  Schema update failed: range-lower less than range upper.
+//
+#define ERROR_DS_SEMANTIC_ATT_TEST       8383L
+
+//
+// MessageId: ERROR_DS_SYNTAX_MISMATCH
+//
+// MessageText:
+//
+//  Schema update failed: syntax mismatch.
+//
+#define ERROR_DS_SYNTAX_MISMATCH         8384L
+
+//
+// MessageId: ERROR_DS_EXISTS_IN_MUST_HAVE
+//
+// MessageText:
+//
+//  Schema deletion failed: attribute is used in must-contain.
+//
+#define ERROR_DS_EXISTS_IN_MUST_HAVE     8385L
+
+//
+// MessageId: ERROR_DS_EXISTS_IN_MAY_HAVE
+//
+// MessageText:
+//
+//  Schema deletion failed: attribute is used in may-contain.
+//
+#define ERROR_DS_EXISTS_IN_MAY_HAVE      8386L
+
+//
+// MessageId: ERROR_DS_NONEXISTENT_MAY_HAVE
+//
+// MessageText:
+//
+//  Schema update failed: attribute in may-contain does not exist.
+//
+#define ERROR_DS_NONEXISTENT_MAY_HAVE    8387L
+
+//
+// MessageId: ERROR_DS_NONEXISTENT_MUST_HAVE
+//
+// MessageText:
+//
+//  Schema update failed: attribute in must-contain does not exist.
+//
+#define ERROR_DS_NONEXISTENT_MUST_HAVE   8388L
+
+//
+// MessageId: ERROR_DS_AUX_CLS_TEST_FAIL
+//
+// MessageText:
+//
+//  Schema update failed: class in aux-class list does not exist or is not an auxiliary class.
+//
+#define ERROR_DS_AUX_CLS_TEST_FAIL       8389L
+
+//
+// MessageId: ERROR_DS_NONEXISTENT_POSS_SUP
+//
+// MessageText:
+//
+//  Schema update failed: class in poss-superiors does not exist.
+//
+#define ERROR_DS_NONEXISTENT_POSS_SUP    8390L
+
+//
+// MessageId: ERROR_DS_SUB_CLS_TEST_FAIL
+//
+// MessageText:
+//
+//  Schema update failed: class in subclassof list does not exist or does not satisfy hierarchy rules.
+//
+#define ERROR_DS_SUB_CLS_TEST_FAIL       8391L
+
+//
+// MessageId: ERROR_DS_BAD_RDN_ATT_ID_SYNTAX
+//
+// MessageText:
+//
+//  Schema update failed: Rdn-Att-Id has wrong syntax.
+//
+#define ERROR_DS_BAD_RDN_ATT_ID_SYNTAX   8392L
+
+//
+// MessageId: ERROR_DS_EXISTS_IN_AUX_CLS
+//
+// MessageText:
+//
+//  Schema deletion failed: class is used as auxiliary class.
+//
+#define ERROR_DS_EXISTS_IN_AUX_CLS       8393L
+
+//
+// MessageId: ERROR_DS_EXISTS_IN_SUB_CLS
+//
+// MessageText:
+//
+//  Schema deletion failed: class is used as sub class.
+//
+#define ERROR_DS_EXISTS_IN_SUB_CLS       8394L
+
+//
+// MessageId: ERROR_DS_EXISTS_IN_POSS_SUP
+//
+// MessageText:
+//
+//  Schema deletion failed: class is used as poss superior.
+//
+#define ERROR_DS_EXISTS_IN_POSS_SUP      8395L
+
+//
+// MessageId: ERROR_DS_RECALCSCHEMA_FAILED
+//
+// MessageText:
+//
+//  Schema update failed in recalculating validation cache.
+//
+#define ERROR_DS_RECALCSCHEMA_FAILED     8396L
+
+//
+// MessageId: ERROR_DS_TREE_DELETE_NOT_FINISHED
+//
+// MessageText:
+//
+//  The tree deletion is not finished.  The request must be made again to continue deleting the tree.
+//
+#define ERROR_DS_TREE_DELETE_NOT_FINISHED 8397L
+
+//
+// MessageId: ERROR_DS_CANT_DELETE
+//
+// MessageText:
+//
+//  The requested delete operation could not be performed.
+//
+#define ERROR_DS_CANT_DELETE             8398L
+
+//
+// MessageId: ERROR_DS_ATT_SCHEMA_REQ_ID
+//
+// MessageText:
+//
+//  Cannot read the governs class identifier for the schema record.
+//
+#define ERROR_DS_ATT_SCHEMA_REQ_ID       8399L
+
+//
+// MessageId: ERROR_DS_BAD_ATT_SCHEMA_SYNTAX
+//
+// MessageText:
+//
+//  The attribute schema has bad syntax.
+//
+#define ERROR_DS_BAD_ATT_SCHEMA_SYNTAX   8400L
+
+//
+// MessageId: ERROR_DS_CANT_CACHE_ATT
+//
+// MessageText:
+//
+//  The attribute could not be cached.
+//
+#define ERROR_DS_CANT_CACHE_ATT          8401L
+
+//
+// MessageId: ERROR_DS_CANT_CACHE_CLASS
+//
+// MessageText:
+//
+//  The class could not be cached.
+//
+#define ERROR_DS_CANT_CACHE_CLASS        8402L
+
+//
+// MessageId: ERROR_DS_CANT_REMOVE_ATT_CACHE
+//
+// MessageText:
+//
+//  The attribute could not be removed from the cache.
+//
+#define ERROR_DS_CANT_REMOVE_ATT_CACHE   8403L
+
+//
+// MessageId: ERROR_DS_CANT_REMOVE_CLASS_CACHE
+//
+// MessageText:
+//
+//  The class could not be removed from the cache.
+//
+#define ERROR_DS_CANT_REMOVE_CLASS_CACHE 8404L
+
+//
+// MessageId: ERROR_DS_CANT_RETRIEVE_DN
+//
+// MessageText:
+//
+//  The distinguished name attribute could not be read.
+//
+#define ERROR_DS_CANT_RETRIEVE_DN        8405L
+
+//
+// MessageId: ERROR_DS_MISSING_SUPREF
+//
+// MessageText:
+//
+//  No superior reference has been configured for the directory service. The directory service is therefore unable to issue referrals to objects outside this forest.
+//
+#define ERROR_DS_MISSING_SUPREF          8406L
+
+//
+// MessageId: ERROR_DS_CANT_RETRIEVE_INSTANCE
+//
+// MessageText:
+//
+//  The instance type attribute could not be retrieved.
+//
+#define ERROR_DS_CANT_RETRIEVE_INSTANCE  8407L
+
+//
+// MessageId: ERROR_DS_CODE_INCONSISTENCY
+//
+// MessageText:
+//
+//  An internal error has occurred.
+//
+#define ERROR_DS_CODE_INCONSISTENCY      8408L
+
+//
+// MessageId: ERROR_DS_DATABASE_ERROR
+//
+// MessageText:
+//
+//  A database error has occurred.
+//
+#define ERROR_DS_DATABASE_ERROR          8409L
+
+//
+// MessageId: ERROR_DS_GOVERNSID_MISSING
+//
+// MessageText:
+//
+//  The attribute GOVERNSID is missing.
+//
+#define ERROR_DS_GOVERNSID_MISSING       8410L
+
+//
+// MessageId: ERROR_DS_MISSING_EXPECTED_ATT
+//
+// MessageText:
+//
+//  An expected attribute is missing.
+//
+#define ERROR_DS_MISSING_EXPECTED_ATT    8411L
+
+//
+// MessageId: ERROR_DS_NCNAME_MISSING_CR_REF
+//
+// MessageText:
+//
+//  The specified naming context is missing a cross reference.
+//
+#define ERROR_DS_NCNAME_MISSING_CR_REF   8412L
+
+//
+// MessageId: ERROR_DS_SECURITY_CHECKING_ERROR
+//
+// MessageText:
+//
+//  A security checking error has occurred.
+//
+#define ERROR_DS_SECURITY_CHECKING_ERROR 8413L
+
+//
+// MessageId: ERROR_DS_SCHEMA_NOT_LOADED
+//
+// MessageText:
+//
+//  The schema is not loaded.
+//
+#define ERROR_DS_SCHEMA_NOT_LOADED       8414L
+
+//
+// MessageId: ERROR_DS_SCHEMA_ALLOC_FAILED
+//
+// MessageText:
+//
+//  Schema allocation failed. Please check if the machine is running low on memory.
+//
+#define ERROR_DS_SCHEMA_ALLOC_FAILED     8415L
+
+//
+// MessageId: ERROR_DS_ATT_SCHEMA_REQ_SYNTAX
+//
+// MessageText:
+//
+//  Failed to obtain the required syntax for the attribute schema.
+//
+#define ERROR_DS_ATT_SCHEMA_REQ_SYNTAX   8416L
+
+//
+// MessageId: ERROR_DS_GCVERIFY_ERROR
+//
+// MessageText:
+//
+//  The global catalog verification failed. The global catalog is not available or does not support the operation. Some part of the directory is currently not available.
+//
+#define ERROR_DS_GCVERIFY_ERROR          8417L
+
+//
+// MessageId: ERROR_DS_DRA_SCHEMA_MISMATCH
+//
+// MessageText:
+//
+//  The replication operation failed because of a schema mismatch between the servers involved.
+//
+#define ERROR_DS_DRA_SCHEMA_MISMATCH     8418L
+
+//
+// MessageId: ERROR_DS_CANT_FIND_DSA_OBJ
+//
+// MessageText:
+//
+//  The DSA object could not be found.
+//
+#define ERROR_DS_CANT_FIND_DSA_OBJ       8419L
+
+//
+// MessageId: ERROR_DS_CANT_FIND_EXPECTED_NC
+//
+// MessageText:
+//
+//  The naming context could not be found.
+//
+#define ERROR_DS_CANT_FIND_EXPECTED_NC   8420L
+
+//
+// MessageId: ERROR_DS_CANT_FIND_NC_IN_CACHE
+//
+// MessageText:
+//
+//  The naming context could not be found in the cache.
+//
+#define ERROR_DS_CANT_FIND_NC_IN_CACHE   8421L
+
+//
+// MessageId: ERROR_DS_CANT_RETRIEVE_CHILD
+//
+// MessageText:
+//
+//  The child object could not be retrieved.
+//
+#define ERROR_DS_CANT_RETRIEVE_CHILD     8422L
+
+//
+// MessageId: ERROR_DS_SECURITY_ILLEGAL_MODIFY
+//
+// MessageText:
+//
+//  The modification was not permitted for security reasons.
+//
+#define ERROR_DS_SECURITY_ILLEGAL_MODIFY 8423L
+
+//
+// MessageId: ERROR_DS_CANT_REPLACE_HIDDEN_REC
+//
+// MessageText:
+//
+//  The operation cannot replace the hidden record.
+//
+#define ERROR_DS_CANT_REPLACE_HIDDEN_REC 8424L
+
+//
+// MessageId: ERROR_DS_BAD_HIERARCHY_FILE
+//
+// MessageText:
+//
+//  The hierarchy file is invalid.
+//
+#define ERROR_DS_BAD_HIERARCHY_FILE      8425L
+
+//
+// MessageId: ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED
+//
+// MessageText:
+//
+//  The attempt to build the hierarchy table failed.
+//
+#define ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED 8426L
+
+//
+// MessageId: ERROR_DS_CONFIG_PARAM_MISSING
+//
+// MessageText:
+//
+//  The directory configuration parameter is missing from the registry.
+//
+#define ERROR_DS_CONFIG_PARAM_MISSING    8427L
+
+//
+// MessageId: ERROR_DS_COUNTING_AB_INDICES_FAILED
+//
+// MessageText:
+//
+//  The attempt to count the address book indices failed.
+//
+#define ERROR_DS_COUNTING_AB_INDICES_FAILED 8428L
+
+//
+// MessageId: ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED
+//
+// MessageText:
+//
+//  The allocation of the hierarchy table failed.
+//
+#define ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED 8429L
+
+//
+// MessageId: ERROR_DS_INTERNAL_FAILURE
+//
+// MessageText:
+//
+//  The directory service encountered an internal failure.
+//
+#define ERROR_DS_INTERNAL_FAILURE        8430L
+
+//
+// MessageId: ERROR_DS_UNKNOWN_ERROR
+//
+// MessageText:
+//
+//  The directory service encountered an unknown failure.
+//
+#define ERROR_DS_UNKNOWN_ERROR           8431L
+
+//
+// MessageId: ERROR_DS_ROOT_REQUIRES_CLASS_TOP
+//
+// MessageText:
+//
+//  A root object requires a class of 'top'.
+//
+#define ERROR_DS_ROOT_REQUIRES_CLASS_TOP 8432L
+
+//
+// MessageId: ERROR_DS_REFUSING_FSMO_ROLES
+//
+// MessageText:
+//
+//  This directory server is shutting down, and cannot take ownership of new floating single-master operation roles.
+//
+#define ERROR_DS_REFUSING_FSMO_ROLES     8433L
+
+//
+// MessageId: ERROR_DS_MISSING_FSMO_SETTINGS
+//
+// MessageText:
+//
+//  The directory service is missing mandatory configuration information, and is unable to determine the ownership of floating single-master operation roles.
+//
+#define ERROR_DS_MISSING_FSMO_SETTINGS   8434L
+
+//
+// MessageId: ERROR_DS_UNABLE_TO_SURRENDER_ROLES
+//
+// MessageText:
+//
+//  The directory service was unable to transfer ownership of one or more floating single-master operation roles to other servers.
+//
+#define ERROR_DS_UNABLE_TO_SURRENDER_ROLES 8435L
+
+//
+// MessageId: ERROR_DS_DRA_GENERIC
+//
+// MessageText:
+//
+//  The replication operation failed.
+//
+#define ERROR_DS_DRA_GENERIC             8436L
+
+//
+// MessageId: ERROR_DS_DRA_INVALID_PARAMETER
+//
+// MessageText:
+//
+//  An invalid parameter was specified for this replication operation.
+//
+#define ERROR_DS_DRA_INVALID_PARAMETER   8437L
+
+//
+// MessageId: ERROR_DS_DRA_BUSY
+//
+// MessageText:
+//
+//  The directory service is too busy to complete the replication operation at this time.
+//
+#define ERROR_DS_DRA_BUSY                8438L
+
+//
+// MessageId: ERROR_DS_DRA_BAD_DN
+//
+// MessageText:
+//
+//  The distinguished name specified for this replication operation is invalid.
+//
+#define ERROR_DS_DRA_BAD_DN              8439L
+
+//
+// MessageId: ERROR_DS_DRA_BAD_NC
+//
+// MessageText:
+//
+//  The naming context specified for this replication operation is invalid.
+//
+#define ERROR_DS_DRA_BAD_NC              8440L
+
+//
+// MessageId: ERROR_DS_DRA_DN_EXISTS
+//
+// MessageText:
+//
+//  The distinguished name specified for this replication operation already exists.
+//
+#define ERROR_DS_DRA_DN_EXISTS           8441L
+
+//
+// MessageId: ERROR_DS_DRA_INTERNAL_ERROR
+//
+// MessageText:
+//
+//  The replication system encountered an internal error.
+//
+#define ERROR_DS_DRA_INTERNAL_ERROR      8442L
+
+//
+// MessageId: ERROR_DS_DRA_INCONSISTENT_DIT
+//
+// MessageText:
+//
+//  The replication operation encountered a database inconsistency.
+//
+#define ERROR_DS_DRA_INCONSISTENT_DIT    8443L
+
+//
+// MessageId: ERROR_DS_DRA_CONNECTION_FAILED
+//
+// MessageText:
+//
+//  The server specified for this replication operation could not be contacted.
+//
+#define ERROR_DS_DRA_CONNECTION_FAILED   8444L
+
+//
+// MessageId: ERROR_DS_DRA_BAD_INSTANCE_TYPE
+//
+// MessageText:
+//
+//  The replication operation encountered an object with an invalid instance type.
+//
+#define ERROR_DS_DRA_BAD_INSTANCE_TYPE   8445L
+
+//
+// MessageId: ERROR_DS_DRA_OUT_OF_MEM
+//
+// MessageText:
+//
+//  The replication operation failed to allocate memory.
+//
+#define ERROR_DS_DRA_OUT_OF_MEM          8446L
+
+//
+// MessageId: ERROR_DS_DRA_MAIL_PROBLEM
+//
+// MessageText:
+//
+//  The replication operation encountered an error with the mail system.
+//
+#define ERROR_DS_DRA_MAIL_PROBLEM        8447L
+
+//
+// MessageId: ERROR_DS_DRA_REF_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The replication reference information for the target server already exists.
+//
+#define ERROR_DS_DRA_REF_ALREADY_EXISTS  8448L
+
+//
+// MessageId: ERROR_DS_DRA_REF_NOT_FOUND
+//
+// MessageText:
+//
+//  The replication reference information for the target server does not exist.
+//
+#define ERROR_DS_DRA_REF_NOT_FOUND       8449L
+
+//
+// MessageId: ERROR_DS_DRA_OBJ_IS_REP_SOURCE
+//
+// MessageText:
+//
+//  The naming context cannot be removed because it is replicated to another server.
+//
+#define ERROR_DS_DRA_OBJ_IS_REP_SOURCE   8450L
+
+//
+// MessageId: ERROR_DS_DRA_DB_ERROR
+//
+// MessageText:
+//
+//  The replication operation encountered a database error.
+//
+#define ERROR_DS_DRA_DB_ERROR            8451L
+
+//
+// MessageId: ERROR_DS_DRA_NO_REPLICA
+//
+// MessageText:
+//
+//  The naming context is in the process of being removed or is not replicated from the specified server.
+//
+#define ERROR_DS_DRA_NO_REPLICA          8452L
+
+//
+// MessageId: ERROR_DS_DRA_ACCESS_DENIED
+//
+// MessageText:
+//
+//  Replication access was denied.
+//
+#define ERROR_DS_DRA_ACCESS_DENIED       8453L
+
+//
+// MessageId: ERROR_DS_DRA_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The requested operation is not supported by this version of the directory service.
+//
+#define ERROR_DS_DRA_NOT_SUPPORTED       8454L
+
+//
+// MessageId: ERROR_DS_DRA_RPC_CANCELLED
+//
+// MessageText:
+//
+//  The replication remote procedure call was cancelled.
+//
+#define ERROR_DS_DRA_RPC_CANCELLED       8455L
+
+//
+// MessageId: ERROR_DS_DRA_SOURCE_DISABLED
+//
+// MessageText:
+//
+//  The source server is currently rejecting replication requests.
+//
+#define ERROR_DS_DRA_SOURCE_DISABLED     8456L
+
+//
+// MessageId: ERROR_DS_DRA_SINK_DISABLED
+//
+// MessageText:
+//
+//  The destination server is currently rejecting replication requests.
+//
+#define ERROR_DS_DRA_SINK_DISABLED       8457L
+
+//
+// MessageId: ERROR_DS_DRA_NAME_COLLISION
+//
+// MessageText:
+//
+//  The replication operation failed due to a collision of object names.
+//
+#define ERROR_DS_DRA_NAME_COLLISION      8458L
+
+//
+// MessageId: ERROR_DS_DRA_SOURCE_REINSTALLED
+//
+// MessageText:
+//
+//  The replication source has been reinstalled.
+//
+#define ERROR_DS_DRA_SOURCE_REINSTALLED  8459L
+
+//
+// MessageId: ERROR_DS_DRA_MISSING_PARENT
+//
+// MessageText:
+//
+//  The replication operation failed because a required parent object is missing.
+//
+#define ERROR_DS_DRA_MISSING_PARENT      8460L
+
+//
+// MessageId: ERROR_DS_DRA_PREEMPTED
+//
+// MessageText:
+//
+//  The replication operation was preempted.
+//
+#define ERROR_DS_DRA_PREEMPTED           8461L
+
+//
+// MessageId: ERROR_DS_DRA_ABANDON_SYNC
+//
+// MessageText:
+//
+//  The replication synchronization attempt was abandoned because of a lack of updates.
+//
+#define ERROR_DS_DRA_ABANDON_SYNC        8462L
+
+//
+// MessageId: ERROR_DS_DRA_SHUTDOWN
+//
+// MessageText:
+//
+//  The replication operation was terminated because the system is shutting down.
+//
+#define ERROR_DS_DRA_SHUTDOWN            8463L
+
+//
+// MessageId: ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET
+//
+// MessageText:
+//
+//  The replication synchronization attempt failed as the destination partial attribute set is not a subset of source partial attribute set.
+//
+#define ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET 8464L
+
+//
+// MessageId: ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA
+//
+// MessageText:
+//
+//  The replication synchronization attempt failed because a master replica attempted to sync from a partial replica.
+//
+#define ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA 8465L
+
+//
+// MessageId: ERROR_DS_DRA_EXTN_CONNECTION_FAILED
+//
+// MessageText:
+//
+//  The server specified for this replication operation was contacted, but that server was unable to contact an additional server needed to complete the operation.
+//
+#define ERROR_DS_DRA_EXTN_CONNECTION_FAILED 8466L
+
+//
+// MessageId: ERROR_DS_INSTALL_SCHEMA_MISMATCH
+//
+// MessageText:
+//
+//  The version of the Active Directory schema of the source forest is not compatible with the version of Active Directory on this computer.
+//
+#define ERROR_DS_INSTALL_SCHEMA_MISMATCH 8467L
+
+//
+// MessageId: ERROR_DS_DUP_LINK_ID
+//
+// MessageText:
+//
+//  Schema update failed: An attribute with the same link identifier already exists.
+//
+#define ERROR_DS_DUP_LINK_ID             8468L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_RESOLVING
+//
+// MessageText:
+//
+//  Name translation: Generic processing error.
+//
+#define ERROR_DS_NAME_ERROR_RESOLVING    8469L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_NOT_FOUND
+//
+// MessageText:
+//
+//  Name translation: Could not find the name or insufficient right to see name.
+//
+#define ERROR_DS_NAME_ERROR_NOT_FOUND    8470L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_NOT_UNIQUE
+//
+// MessageText:
+//
+//  Name translation: Input name mapped to more than one output name.
+//
+#define ERROR_DS_NAME_ERROR_NOT_UNIQUE   8471L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_NO_MAPPING
+//
+// MessageText:
+//
+//  Name translation: Input name found, but not the associated output format.
+//
+#define ERROR_DS_NAME_ERROR_NO_MAPPING   8472L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_DOMAIN_ONLY
+//
+// MessageText:
+//
+//  Name translation: Unable to resolve completely, only the domain was found.
+//
+#define ERROR_DS_NAME_ERROR_DOMAIN_ONLY  8473L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING
+//
+// MessageText:
+//
+//  Name translation: Unable to perform purely syntactical mapping at the client without going out to the wire.
+//
+#define ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING 8474L
+
+//
+// MessageId: ERROR_DS_CONSTRUCTED_ATT_MOD
+//
+// MessageText:
+//
+//  Modification of a constructed attribute is not allowed.
+//
+#define ERROR_DS_CONSTRUCTED_ATT_MOD     8475L
+
+//
+// MessageId: ERROR_DS_WRONG_OM_OBJ_CLASS
+//
+// MessageText:
+//
+//  The OM-Object-Class specified is incorrect for an attribute with the specified syntax.
+//
+#define ERROR_DS_WRONG_OM_OBJ_CLASS      8476L
+
+//
+// MessageId: ERROR_DS_DRA_REPL_PENDING
+//
+// MessageText:
+//
+//  The replication request has been posted; waiting for reply.
+//
+#define ERROR_DS_DRA_REPL_PENDING        8477L
+
+//
+// MessageId: ERROR_DS_DS_REQUIRED
+//
+// MessageText:
+//
+//  The requested operation requires a directory service, and none was available.
+//
+#define ERROR_DS_DS_REQUIRED             8478L
+
+//
+// MessageId: ERROR_DS_INVALID_LDAP_DISPLAY_NAME
+//
+// MessageText:
+//
+//  The LDAP display name of the class or attribute contains non-ASCII characters.
+//
+#define ERROR_DS_INVALID_LDAP_DISPLAY_NAME 8479L
+
+//
+// MessageId: ERROR_DS_NON_BASE_SEARCH
+//
+// MessageText:
+//
+//  The requested search operation is only supported for base searches.
+//
+#define ERROR_DS_NON_BASE_SEARCH         8480L
+
+//
+// MessageId: ERROR_DS_CANT_RETRIEVE_ATTS
+//
+// MessageText:
+//
+//  The search failed to retrieve attributes from the database.
+//
+#define ERROR_DS_CANT_RETRIEVE_ATTS      8481L
+
+//
+// MessageId: ERROR_DS_BACKLINK_WITHOUT_LINK
+//
+// MessageText:
+//
+//  The schema update operation tried to add a backward link attribute that has no corresponding forward link.
+//
+#define ERROR_DS_BACKLINK_WITHOUT_LINK   8482L
+
+//
+// MessageId: ERROR_DS_EPOCH_MISMATCH
+//
+// MessageText:
+//
+//  Source and destination of a cross-domain move do not agree on the object's epoch number.  Either source or destination does not have the latest version of the object.
+//
+#define ERROR_DS_EPOCH_MISMATCH          8483L
+
+//
+// MessageId: ERROR_DS_SRC_NAME_MISMATCH
+//
+// MessageText:
+//
+//  Source and destination of a cross-domain move do not agree on the object's current name.  Either source or destination does not have the latest version of the object.
+//
+#define ERROR_DS_SRC_NAME_MISMATCH       8484L
+
+//
+// MessageId: ERROR_DS_SRC_AND_DST_NC_IDENTICAL
+//
+// MessageText:
+//
+//  Source and destination for the cross-domain move operation are identical.  Caller should use local move operation instead of cross-domain move operation.
+//
+#define ERROR_DS_SRC_AND_DST_NC_IDENTICAL 8485L
+
+//
+// MessageId: ERROR_DS_DST_NC_MISMATCH
+//
+// MessageText:
+//
+//  Source and destination for a cross-domain move are not in agreement on the naming contexts in the forest.  Either source or destination does not have the latest version of the Partitions container.
+//
+#define ERROR_DS_DST_NC_MISMATCH         8486L
+
+//
+// MessageId: ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC
+//
+// MessageText:
+//
+//  Destination of a cross-domain move is not authoritative for the destination naming context.
+//
+#define ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC 8487L
+
+//
+// MessageId: ERROR_DS_SRC_GUID_MISMATCH
+//
+// MessageText:
+//
+//  Source and destination of a cross-domain move do not agree on the identity of the source object.  Either source or destination does not have the latest version of the source object.
+//
+#define ERROR_DS_SRC_GUID_MISMATCH       8488L
+
+//
+// MessageId: ERROR_DS_CANT_MOVE_DELETED_OBJECT
+//
+// MessageText:
+//
+//  Object being moved across-domains is already known to be deleted by the destination server.  The source server does not have the latest version of the source object.
+//
+#define ERROR_DS_CANT_MOVE_DELETED_OBJECT 8489L
+
+//
+// MessageId: ERROR_DS_PDC_OPERATION_IN_PROGRESS
+//
+// MessageText:
+//
+//  Another operation which requires exclusive access to the PDC FSMO is already in progress.
+//
+#define ERROR_DS_PDC_OPERATION_IN_PROGRESS 8490L
+
+//
+// MessageId: ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD
+//
+// MessageText:
+//
+//  A cross-domain move operation failed such that two versions of the moved object exist - one each in the source and destination domains.  The destination object needs to be removed to restore the system to a consistent state.
+//
+#define ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD 8491L
+
+//
+// MessageId: ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION
+//
+// MessageText:
+//
+//  This object may not be moved across domain boundaries either because cross-domain moves for this class are disallowed, or the object has some special characteristics, e.g.: trust account or restricted RID, which prevent its move.
+//
+#define ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION 8492L
+
+//
+// MessageId: ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS
+//
+// MessageText:
+//
+//  Can't move objects with memberships across domain boundaries as once moved, this would violate the membership conditions of the account group.  Remove the object from any account group memberships and retry.
+//
+#define ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS 8493L
+
+//
+// MessageId: ERROR_DS_NC_MUST_HAVE_NC_PARENT
+//
+// MessageText:
+//
+//  A naming context head must be the immediate child of another naming context head, not of an interior node.
+//
+#define ERROR_DS_NC_MUST_HAVE_NC_PARENT  8494L
+
+//
+// MessageId: ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE
+//
+// MessageText:
+//
+//  The directory cannot validate the proposed naming context name because it does not hold a replica of the naming context above the proposed naming context.  Please ensure that the domain naming master role is held by a server that is configured as a global catalog server, and that the server is up to date with its replication partners. (Applies only to Windows 2000 Domain Naming masters)
+//
+#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE 8495L
+
+//
+// MessageId: ERROR_DS_DST_DOMAIN_NOT_NATIVE
+//
+// MessageText:
+//
+//  Destination domain must be in native mode.
+//
+#define ERROR_DS_DST_DOMAIN_NOT_NATIVE   8496L
+
+//
+// MessageId: ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER
+//
+// MessageText:
+//
+//  The operation can not be performed because the server does not have an infrastructure container in the domain of interest.
+//
+#define ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER 8497L
+
+//
+// MessageId: ERROR_DS_CANT_MOVE_ACCOUNT_GROUP
+//
+// MessageText:
+//
+//  Cross-domain move of non-empty account groups is not allowed.
+//
+#define ERROR_DS_CANT_MOVE_ACCOUNT_GROUP 8498L
+
+//
+// MessageId: ERROR_DS_CANT_MOVE_RESOURCE_GROUP
+//
+// MessageText:
+//
+//  Cross-domain move of non-empty resource groups is not allowed.
+//
+#define ERROR_DS_CANT_MOVE_RESOURCE_GROUP 8499L
+
+//
+// MessageId: ERROR_DS_INVALID_SEARCH_FLAG
+//
+// MessageText:
+//
+//  The search flags for the attribute are invalid. The ANR bit is valid only on attributes of Unicode or Teletex strings.
+//
+#define ERROR_DS_INVALID_SEARCH_FLAG     8500L
+
+//
+// MessageId: ERROR_DS_NO_TREE_DELETE_ABOVE_NC
+//
+// MessageText:
+//
+//  Tree deletions starting at an object which has an NC head as a descendant are not allowed.
+//
+#define ERROR_DS_NO_TREE_DELETE_ABOVE_NC 8501L
+
+//
+// MessageId: ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE
+//
+// MessageText:
+//
+//  The directory service failed to lock a tree in preparation for a tree deletion because the tree was in use.
+//
+#define ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE 8502L
+
+//
+// MessageId: ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE
+//
+// MessageText:
+//
+//  The directory service failed to identify the list of objects to delete while attempting a tree deletion.
+//
+#define ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE 8503L
+
+//
+// MessageId: ERROR_DS_SAM_INIT_FAILURE
+//
+// MessageText:
+//
+//  Security Accounts Manager initialization failed because of the following error: %1.
+//  Error Status: 0x%2. Click OK to shut down the system and reboot into Directory Services Restore Mode. Check the event log for detailed information.
+//
+#define ERROR_DS_SAM_INIT_FAILURE        8504L
+
+//
+// MessageId: ERROR_DS_SENSITIVE_GROUP_VIOLATION
+//
+// MessageText:
+//
+//  Only an administrator can modify the membership list of an administrative group.
+//
+#define ERROR_DS_SENSITIVE_GROUP_VIOLATION 8505L
+
+//
+// MessageId: ERROR_DS_CANT_MOD_PRIMARYGROUPID
+//
+// MessageText:
+//
+//  Cannot change the primary group ID of a domain controller account.
+//
+#define ERROR_DS_CANT_MOD_PRIMARYGROUPID 8506L
+
+//
+// MessageId: ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD
+//
+// MessageText:
+//
+//  An attempt is made to modify the base schema.
+//
+#define ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD 8507L
+
+//
+// MessageId: ERROR_DS_NONSAFE_SCHEMA_CHANGE
+//
+// MessageText:
+//
+//  Adding a new mandatory attribute to an existing class, deleting a mandatory attribute from an existing class, or adding an optional attribute to the special class Top that is not a backlink attribute (directly or through inheritance, for example, by adding or deleting an auxiliary class) is not allowed.
+//
+#define ERROR_DS_NONSAFE_SCHEMA_CHANGE   8508L
+
+//
+// MessageId: ERROR_DS_SCHEMA_UPDATE_DISALLOWED
+//
+// MessageText:
+//
+//  Schema update is not allowed on this DC because the DC is not the schema FSMO Role Owner.
+//
+#define ERROR_DS_SCHEMA_UPDATE_DISALLOWED 8509L
+
+//
+// MessageId: ERROR_DS_CANT_CREATE_UNDER_SCHEMA
+//
+// MessageText:
+//
+//  An object of this class cannot be created under the schema container. You can only create attribute-schema and class-schema objects under the schema container.
+//
+#define ERROR_DS_CANT_CREATE_UNDER_SCHEMA 8510L
+
+//
+// MessageId: ERROR_DS_INSTALL_NO_SRC_SCH_VERSION
+//
+// MessageText:
+//
+//  The replica/child install failed to get the objectVersion attribute on the schema container on the source DC. Either the attribute is missing on the schema container or the credentials supplied do not have permission to read it.
+//
+#define ERROR_DS_INSTALL_NO_SRC_SCH_VERSION 8511L
+
+//
+// MessageId: ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE
+//
+// MessageText:
+//
+//  The replica/child install failed to read the objectVersion attribute in the SCHEMA section of the file schema.ini in the system32 directory.
+//
+#define ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE 8512L
+
+//
+// MessageId: ERROR_DS_INVALID_GROUP_TYPE
+//
+// MessageText:
+//
+//  The specified group type is invalid.
+//
+#define ERROR_DS_INVALID_GROUP_TYPE      8513L
+
+//
+// MessageId: ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN
+//
+// MessageText:
+//
+//  You cannot nest global groups in a mixed domain if the group is security-enabled.
+//
+#define ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN 8514L
+
+//
+// MessageId: ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN
+//
+// MessageText:
+//
+//  You cannot nest local groups in a mixed domain if the group is security-enabled.
+//
+#define ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN 8515L
+
+//
+// MessageId: ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER
+//
+// MessageText:
+//
+//  A global group cannot have a local group as a member.
+//
+#define ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER 8516L
+
+//
+// MessageId: ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER
+//
+// MessageText:
+//
+//  A global group cannot have a universal group as a member.
+//
+#define ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER 8517L
+
+//
+// MessageId: ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER
+//
+// MessageText:
+//
+//  A universal group cannot have a local group as a member.
+//
+#define ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER 8518L
+
+//
+// MessageId: ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER
+//
+// MessageText:
+//
+//  A global group cannot have a cross-domain member.
+//
+#define ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER 8519L
+
+//
+// MessageId: ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER
+//
+// MessageText:
+//
+//  A local group cannot have another cross domain local group as a member.
+//
+#define ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER 8520L
+
+//
+// MessageId: ERROR_DS_HAVE_PRIMARY_MEMBERS
+//
+// MessageText:
+//
+//  A group with primary members cannot change to a security-disabled group.
+//
+#define ERROR_DS_HAVE_PRIMARY_MEMBERS    8521L
+
+//
+// MessageId: ERROR_DS_STRING_SD_CONVERSION_FAILED
+//
+// MessageText:
+//
+//  The schema cache load failed to convert the string default SD on a class-schema object.
+//
+#define ERROR_DS_STRING_SD_CONVERSION_FAILED 8522L
+
+//
+// MessageId: ERROR_DS_NAMING_MASTER_GC
+//
+// MessageText:
+//
+//  Only DSAs configured to be Global Catalog servers should be allowed to hold the Domain Naming Master FSMO role. (Applies only to Windows 2000 servers)
+//
+#define ERROR_DS_NAMING_MASTER_GC        8523L
+
+//
+// MessageId: ERROR_DS_DNS_LOOKUP_FAILURE
+//
+// MessageText:
+//
+//  The DSA operation is unable to proceed because of a DNS lookup failure.
+//
+#define ERROR_DS_DNS_LOOKUP_FAILURE      8524L
+
+//
+// MessageId: ERROR_DS_COULDNT_UPDATE_SPNS
+//
+// MessageText:
+//
+//  While processing a change to the DNS Host Name for an object, the Service Principal Name values could not be kept in sync.
+//
+#define ERROR_DS_COULDNT_UPDATE_SPNS     8525L
+
+//
+// MessageId: ERROR_DS_CANT_RETRIEVE_SD
+//
+// MessageText:
+//
+//  The Security Descriptor attribute could not be read.
+//
+#define ERROR_DS_CANT_RETRIEVE_SD        8526L
+
+//
+// MessageId: ERROR_DS_KEY_NOT_UNIQUE
+//
+// MessageText:
+//
+//  The object requested was not found, but an object with that key was found.
+//
+#define ERROR_DS_KEY_NOT_UNIQUE          8527L
+
+//
+// MessageId: ERROR_DS_WRONG_LINKED_ATT_SYNTAX
+//
+// MessageText:
+//
+//  The syntax of the linked attribute being added is incorrect. Forward links can only have syntax 2.5.5.1, 2.5.5.7, and 2.5.5.14, and backlinks can only have syntax 2.5.5.1
+//
+#define ERROR_DS_WRONG_LINKED_ATT_SYNTAX 8528L
+
+//
+// MessageId: ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD
+//
+// MessageText:
+//
+//  Security Account Manager needs to get the boot password.
+//
+#define ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD 8529L
+
+//
+// MessageId: ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY
+//
+// MessageText:
+//
+//  Security Account Manager needs to get the boot key from floppy disk.
+//
+#define ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY 8530L
+
+//
+// MessageId: ERROR_DS_CANT_START
+//
+// MessageText:
+//
+//  Directory Service cannot start.
+//
+#define ERROR_DS_CANT_START              8531L
+
+//
+// MessageId: ERROR_DS_INIT_FAILURE
+//
+// MessageText:
+//
+//  Directory Services could not start.
+//
+#define ERROR_DS_INIT_FAILURE            8532L
+
+//
+// MessageId: ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION
+//
+// MessageText:
+//
+//  The connection between client and server requires packet privacy or better.
+//
+#define ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION 8533L
+
+//
+// MessageId: ERROR_DS_SOURCE_DOMAIN_IN_FOREST
+//
+// MessageText:
+//
+//  The source domain may not be in the same forest as destination.
+//
+#define ERROR_DS_SOURCE_DOMAIN_IN_FOREST 8534L
+
+//
+// MessageId: ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST
+//
+// MessageText:
+//
+//  The destination domain must be in the forest.
+//
+#define ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST 8535L
+
+//
+// MessageId: ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED
+//
+// MessageText:
+//
+//  The operation requires that destination domain auditing be enabled.
+//
+#define ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED 8536L
+
+//
+// MessageId: ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN
+//
+// MessageText:
+//
+//  The operation couldn't locate a DC for the source domain.
+//
+#define ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN 8537L
+
+//
+// MessageId: ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER
+//
+// MessageText:
+//
+//  The source object must be a group or user.
+//
+#define ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER 8538L
+
+//
+// MessageId: ERROR_DS_SRC_SID_EXISTS_IN_FOREST
+//
+// MessageText:
+//
+//  The source object's SID already exists in destination forest.
+//
+#define ERROR_DS_SRC_SID_EXISTS_IN_FOREST 8539L
+
+//
+// MessageId: ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH
+//
+// MessageText:
+//
+//  The source and destination object must be of the same type.
+//
+#define ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH 8540L
+
+//
+// MessageId: ERROR_SAM_INIT_FAILURE
+//
+// MessageText:
+//
+//  Security Accounts Manager initialization failed because of the following error: %1.
+//  Error Status: 0x%2. Click OK to shut down the system and reboot into Safe Mode. Check the event log for detailed information.
+//
+#define ERROR_SAM_INIT_FAILURE           8541L
+
+//
+// MessageId: ERROR_DS_DRA_SCHEMA_INFO_SHIP
+//
+// MessageText:
+//
+//  Schema information could not be included in the replication request.
+//
+#define ERROR_DS_DRA_SCHEMA_INFO_SHIP    8542L
+
+//
+// MessageId: ERROR_DS_DRA_SCHEMA_CONFLICT
+//
+// MessageText:
+//
+//  The replication operation could not be completed due to a schema incompatibility.
+//
+#define ERROR_DS_DRA_SCHEMA_CONFLICT     8543L
+
+//
+// MessageId: ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT
+//
+// MessageText:
+//
+//  The replication operation could not be completed due to a previous schema incompatibility.
+//
+#define ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT 8544L
+
+//
+// MessageId: ERROR_DS_DRA_OBJ_NC_MISMATCH
+//
+// MessageText:
+//
+//  The replication update could not be applied because either the source or the destination has not yet received information regarding a recent cross-domain move operation.
+//
+#define ERROR_DS_DRA_OBJ_NC_MISMATCH     8545L
+
+//
+// MessageId: ERROR_DS_NC_STILL_HAS_DSAS
+//
+// MessageText:
+//
+//  The requested domain could not be deleted because there exist domain controllers that still host this domain.
+//
+#define ERROR_DS_NC_STILL_HAS_DSAS       8546L
+
+//
+// MessageId: ERROR_DS_GC_REQUIRED
+//
+// MessageText:
+//
+//  The requested operation can be performed only on a global catalog server.
+//
+#define ERROR_DS_GC_REQUIRED             8547L
+
+//
+// MessageId: ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY
+//
+// MessageText:
+//
+//  A local group can only be a member of other local groups in the same domain.
+//
+#define ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY 8548L
+
+//
+// MessageId: ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS
+//
+// MessageText:
+//
+//  Foreign security principals cannot be members of universal groups.
+//
+#define ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS 8549L
+
+//
+// MessageId: ERROR_DS_CANT_ADD_TO_GC
+//
+// MessageText:
+//
+//  The attribute is not allowed to be replicated to the GC because of security reasons.
+//
+#define ERROR_DS_CANT_ADD_TO_GC          8550L
+
+//
+// MessageId: ERROR_DS_NO_CHECKPOINT_WITH_PDC
+//
+// MessageText:
+//
+//  The checkpoint with the PDC could not be taken because there too many modifications being processed currently.
+//
+#define ERROR_DS_NO_CHECKPOINT_WITH_PDC  8551L
+
+//
+// MessageId: ERROR_DS_SOURCE_AUDITING_NOT_ENABLED
+//
+// MessageText:
+//
+//  The operation requires that source domain auditing be enabled.
+//
+#define ERROR_DS_SOURCE_AUDITING_NOT_ENABLED 8552L
+
+//
+// MessageId: ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC
+//
+// MessageText:
+//
+//  Security principal objects can only be created inside domain naming contexts.
+//
+#define ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC 8553L
+
+//
+// MessageId: ERROR_DS_INVALID_NAME_FOR_SPN
+//
+// MessageText:
+//
+//  A Service Principal Name (SPN) could not be constructed because the provided hostname is not in the necessary format.
+//
+#define ERROR_DS_INVALID_NAME_FOR_SPN    8554L
+
+//
+// MessageId: ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS
+//
+// MessageText:
+//
+//  A Filter was passed that uses constructed attributes.
+//
+#define ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS 8555L
+
+//
+// MessageId: ERROR_DS_UNICODEPWD_NOT_IN_QUOTES
+//
+// MessageText:
+//
+//  The unicodePwd attribute value must be enclosed in double quotes.
+//
+#define ERROR_DS_UNICODEPWD_NOT_IN_QUOTES 8556L
+
+//
+// MessageId: ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED
+//
+// MessageText:
+//
+//  Your computer could not be joined to the domain. You have exceeded the maximum number of computer accounts you are allowed to create in this domain. Contact your system administrator to have this limit reset or increased.
+//
+#define ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED 8557L
+
+//
+// MessageId: ERROR_DS_MUST_BE_RUN_ON_DST_DC
+//
+// MessageText:
+//
+//  For security reasons, the operation must be run on the destination DC.
+//
+#define ERROR_DS_MUST_BE_RUN_ON_DST_DC   8558L
+
+//
+// MessageId: ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER
+//
+// MessageText:
+//
+//  For security reasons, the source DC must be NT4SP4 or greater.
+//
+#define ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER 8559L
+
+//
+// MessageId: ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ
+//
+// MessageText:
+//
+//  Critical Directory Service System objects cannot be deleted during tree delete operations.  The tree delete may have been partially performed.
+//
+#define ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ 8560L
+
+//
+// MessageId: ERROR_DS_INIT_FAILURE_CONSOLE
+//
+// MessageText:
+//
+//  Directory Services could not start because of the following error: %1.
+//  Error Status: 0x%2. Please click OK to shutdown the system. You can use the recovery console to diagnose the system further.
+//
+#define ERROR_DS_INIT_FAILURE_CONSOLE    8561L
+
+//
+// MessageId: ERROR_DS_SAM_INIT_FAILURE_CONSOLE
+//
+// MessageText:
+//
+//  Security Accounts Manager initialization failed because of the following error: %1.
+//  Error Status: 0x%2. Please click OK to shutdown the system. You can use the recovery console to diagnose the system further.
+//
+#define ERROR_DS_SAM_INIT_FAILURE_CONSOLE 8562L
+
+//
+// MessageId: ERROR_DS_FOREST_VERSION_TOO_HIGH
+//
+// MessageText:
+//
+//  The version of the operating system installed is incompatible with the current forest functional level. You must upgrade to a new version of the operating system before this server can become a domain controller in this forest.
+//
+#define ERROR_DS_FOREST_VERSION_TOO_HIGH 8563L
+
+//
+// MessageId: ERROR_DS_DOMAIN_VERSION_TOO_HIGH
+//
+// MessageText:
+//
+//  The version of the operating system installed is incompatible with the current domain functional level. You must upgrade to a new version of the operating system before this server can become a domain controller in this domain.
+//
+#define ERROR_DS_DOMAIN_VERSION_TOO_HIGH 8564L
+
+//
+// MessageId: ERROR_DS_FOREST_VERSION_TOO_LOW
+//
+// MessageText:
+//
+//  The version of the operating system installed on this server no longer supports the current forest functional level. You must raise the forest functional level before this server can become a domain controller in this forest.
+//
+#define ERROR_DS_FOREST_VERSION_TOO_LOW  8565L
+
+//
+// MessageId: ERROR_DS_DOMAIN_VERSION_TOO_LOW
+//
+// MessageText:
+//
+//  The version of the operating system installed on this server no longer supports the current domain functional level. You must raise the domain functional level before this server can become a domain controller in this domain.
+//
+#define ERROR_DS_DOMAIN_VERSION_TOO_LOW  8566L
+
+//
+// MessageId: ERROR_DS_INCOMPATIBLE_VERSION
+//
+// MessageText:
+//
+//  The version of the operating system installed on this server is incompatible with the functional level of the domain or forest.
+//
+#define ERROR_DS_INCOMPATIBLE_VERSION    8567L
+
+//
+// MessageId: ERROR_DS_LOW_DSA_VERSION
+//
+// MessageText:
+//
+//  The functional level of the domain (or forest) cannot be raised to the requested value, because there exist one or more domain controllers in the domain (or forest) that are at a lower incompatible functional level.
+//
+#define ERROR_DS_LOW_DSA_VERSION         8568L
+
+//
+// MessageId: ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN
+//
+// MessageText:
+//
+//  The forest functional level cannot be raised to the requested value since one or more domains are still in mixed domain mode. All domains in the forest must be in native mode, for you to raise the forest functional level.
+//
+#define ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN 8569L
+
+//
+// MessageId: ERROR_DS_NOT_SUPPORTED_SORT_ORDER
+//
+// MessageText:
+//
+//  The sort order requested is not supported.
+//
+#define ERROR_DS_NOT_SUPPORTED_SORT_ORDER 8570L
+
+//
+// MessageId: ERROR_DS_NAME_NOT_UNIQUE
+//
+// MessageText:
+//
+//  The requested name already exists as a unique identifier.
+//
+#define ERROR_DS_NAME_NOT_UNIQUE         8571L
+
+//
+// MessageId: ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4
+//
+// MessageText:
+//
+//  The machine account was created pre-NT4.  The account needs to be recreated.
+//
+#define ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4 8572L
+
+//
+// MessageId: ERROR_DS_OUT_OF_VERSION_STORE
+//
+// MessageText:
+//
+//  The database is out of version store.
+//
+#define ERROR_DS_OUT_OF_VERSION_STORE    8573L
+
+//
+// MessageId: ERROR_DS_INCOMPATIBLE_CONTROLS_USED
+//
+// MessageText:
+//
+//  Unable to continue operation because multiple conflicting controls were used.
+//
+#define ERROR_DS_INCOMPATIBLE_CONTROLS_USED 8574L
+
+//
+// MessageId: ERROR_DS_NO_REF_DOMAIN
+//
+// MessageText:
+//
+//  Unable to find a valid security descriptor reference domain for this partition.
+//
+#define ERROR_DS_NO_REF_DOMAIN           8575L
+
+//
+// MessageId: ERROR_DS_RESERVED_LINK_ID
+//
+// MessageText:
+//
+//  Schema update failed: The link identifier is reserved.
+//
+#define ERROR_DS_RESERVED_LINK_ID        8576L
+
+//
+// MessageId: ERROR_DS_LINK_ID_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  Schema update failed: There are no link identifiers available.
+//
+#define ERROR_DS_LINK_ID_NOT_AVAILABLE   8577L
+
+//
+// MessageId: ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER
+//
+// MessageText:
+//
+//  An account group can not have a universal group as a member.
+//
+#define ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER 8578L
+
+//
+// MessageId: ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE
+//
+// MessageText:
+//
+//  Rename or move operations on naming context heads or read-only objects are not allowed.
+//
+#define ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE 8579L
+
+//
+// MessageId: ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC
+//
+// MessageText:
+//
+//  Move operations on objects in the schema naming context are not allowed.
+//
+#define ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC 8580L
+
+//
+// MessageId: ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG
+//
+// MessageText:
+//
+//  A system flag has been set on the object and does not allow the object to be moved or renamed.
+//
+#define ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG 8581L
+
+//
+// MessageId: ERROR_DS_MODIFYDN_WRONG_GRANDPARENT
+//
+// MessageText:
+//
+//  This object is not allowed to change its grandparent container. Moves are not forbidden on this object, but are restricted to sibling containers.
+//
+#define ERROR_DS_MODIFYDN_WRONG_GRANDPARENT 8582L
+
+//
+// MessageId: ERROR_DS_NAME_ERROR_TRUST_REFERRAL
+//
+// MessageText:
+//
+//  Unable to resolve completely, a referral to another forest is generated.
+//
+#define ERROR_DS_NAME_ERROR_TRUST_REFERRAL 8583L
+
+//
+// MessageId: ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER
+//
+// MessageText:
+//
+//  The requested action is not supported on standard server.
+//
+#define ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER 8584L
+
+//
+// MessageId: ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD
+//
+// MessageText:
+//
+//  Could not access a partition of the Active Directory located on a remote server.  Make sure at least one server is running for the partition in question.
+//
+#define ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD 8585L
+
+//
+// MessageId: ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2
+//
+// MessageText:
+//
+//  The directory cannot validate the proposed naming context (or partition) name because it does not hold a replica nor can it contact a replica of the naming context above the proposed naming context.  Please ensure that the parent naming context is properly registered in DNS, and at least one replica of this naming context is reachable by the Domain Naming master.
+//
+#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2 8586L
+
+//
+// MessageId: ERROR_DS_THREAD_LIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  The thread limit for this request was exceeded.
+//
+#define ERROR_DS_THREAD_LIMIT_EXCEEDED   8587L
+
+//
+// MessageId: ERROR_DS_NOT_CLOSEST
+//
+// MessageText:
+//
+//  The Global catalog server is not in the closest site.
+//
+#define ERROR_DS_NOT_CLOSEST             8588L
+
+//
+// MessageId: ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF
+//
+// MessageText:
+//
+//  The DS cannot derive a service principal name (SPN) with which to mutually authenticate the target server because the corresponding server object in the local DS database has no serverReference attribute.
+//
+#define ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF 8589L
+
+//
+// MessageId: ERROR_DS_SINGLE_USER_MODE_FAILED
+//
+// MessageText:
+//
+//  The Directory Service failed to enter single user mode.
+//
+#define ERROR_DS_SINGLE_USER_MODE_FAILED 8590L
+
+//
+// MessageId: ERROR_DS_NTDSCRIPT_SYNTAX_ERROR
+//
+// MessageText:
+//
+//  The Directory Service cannot parse the script because of a syntax error.
+//
+#define ERROR_DS_NTDSCRIPT_SYNTAX_ERROR  8591L
+
+//
+// MessageId: ERROR_DS_NTDSCRIPT_PROCESS_ERROR
+//
+// MessageText:
+//
+//  The Directory Service cannot process the script because of an error.
+//
+#define ERROR_DS_NTDSCRIPT_PROCESS_ERROR 8592L
+
+//
+// MessageId: ERROR_DS_DIFFERENT_REPL_EPOCHS
+//
+// MessageText:
+//
+//  The directory service cannot perform the requested operation because the servers
+//  involved are of different replication epochs (which is usually related to a
+//  domain rename that is in progress).
+//
+#define ERROR_DS_DIFFERENT_REPL_EPOCHS   8593L
+
+//
+// MessageId: ERROR_DS_DRS_EXTENSIONS_CHANGED
+//
+// MessageText:
+//
+//  The directory service binding must be renegotiated due to a change in the server
+//  extensions information.
+//
+#define ERROR_DS_DRS_EXTENSIONS_CHANGED  8594L
+
+//
+// MessageId: ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR
+//
+// MessageText:
+//
+//  Operation not allowed on a disabled cross ref.
+//
+#define ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR 8595L
+
+//
+// MessageId: ERROR_DS_NO_MSDS_INTID
+//
+// MessageText:
+//
+//  Schema update failed: No values for msDS-IntId are available.
+//
+#define ERROR_DS_NO_MSDS_INTID           8596L
+
+//
+// MessageId: ERROR_DS_DUP_MSDS_INTID
+//
+// MessageText:
+//
+//  Schema update failed: Duplicate msDS-INtId. Retry the operation.
+//
+#define ERROR_DS_DUP_MSDS_INTID          8597L
+
+//
+// MessageId: ERROR_DS_EXISTS_IN_RDNATTID
+//
+// MessageText:
+//
+//  Schema deletion failed: attribute is used in rDNAttID.
+//
+#define ERROR_DS_EXISTS_IN_RDNATTID      8598L
+
+//
+// MessageId: ERROR_DS_AUTHORIZATION_FAILED
+//
+// MessageText:
+//
+//  The directory service failed to authorize the request.
+//
+#define ERROR_DS_AUTHORIZATION_FAILED    8599L
+
+//
+// MessageId: ERROR_DS_INVALID_SCRIPT
+//
+// MessageText:
+//
+//  The Directory Service cannot process the script because it is invalid.
+//
+#define ERROR_DS_INVALID_SCRIPT          8600L
+
+//
+// MessageId: ERROR_DS_REMOTE_CROSSREF_OP_FAILED
+//
+// MessageText:
+//
+//  The remote create cross reference operation failed on the Domain Naming Master FSMO.  The operation's error is in the extended data.
+//
+#define ERROR_DS_REMOTE_CROSSREF_OP_FAILED 8601L
+
+//
+// MessageId: ERROR_DS_CROSS_REF_BUSY
+//
+// MessageText:
+//
+//  A cross reference is in use locally with the same name.
+//
+#define ERROR_DS_CROSS_REF_BUSY          8602L
+
+//
+// MessageId: ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN
+//
+// MessageText:
+//
+//  The DS cannot derive a service principal name (SPN) with which to mutually authenticate the target server because the server's domain has been deleted from the forest.
+//
+#define ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN 8603L
+
+//
+// MessageId: ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC
+//
+// MessageText:
+//
+//  Writeable NCs prevent this DC from demoting.
+//
+#define ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC 8604L
+
+//
+// MessageId: ERROR_DS_DUPLICATE_ID_FOUND
+//
+// MessageText:
+//
+//  The requested object has a non-unique identifier and cannot be retrieved.
+//
+#define ERROR_DS_DUPLICATE_ID_FOUND      8605L
+
+//
+// MessageId: ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT
+//
+// MessageText:
+//
+//  Insufficient attributes were given to create an object.  This object may not exist because it may have been deleted and already garbage collected.
+//
+#define ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT 8606L
+
+//
+// MessageId: ERROR_DS_GROUP_CONVERSION_ERROR
+//
+// MessageText:
+//
+//  The group cannot be converted due to attribute restrictions on the requested group type.
+//
+#define ERROR_DS_GROUP_CONVERSION_ERROR  8607L
+
+//
+// MessageId: ERROR_DS_CANT_MOVE_APP_BASIC_GROUP
+//
+// MessageText:
+//
+//  Cross-domain move of non-empty basic application groups is not allowed.
+//
+#define ERROR_DS_CANT_MOVE_APP_BASIC_GROUP 8608L
+
+//
+// MessageId: ERROR_DS_CANT_MOVE_APP_QUERY_GROUP
+//
+// MessageText:
+//
+//  Cross-domain move of non-empty query based application groups is not allowed.
+//
+#define ERROR_DS_CANT_MOVE_APP_QUERY_GROUP 8609L
+
+//
+// MessageId: ERROR_DS_ROLE_NOT_VERIFIED
+//
+// MessageText:
+//
+//  The FSMO role ownership could not be verified because its directory partition has not replicated successfully with atleast one replication partner. 
+//
+#define ERROR_DS_ROLE_NOT_VERIFIED       8610L
+
+//
+// MessageId: ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL
+//
+// MessageText:
+//
+//  The target container for a redirection of a well known object container cannot already be a special container.
+//
+#define ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL 8611L
+
+//
+// MessageId: ERROR_DS_DOMAIN_RENAME_IN_PROGRESS
+//
+// MessageText:
+//
+//  The Directory Service cannot perform the requested operation because a domain rename operation is in progress.
+//
+#define ERROR_DS_DOMAIN_RENAME_IN_PROGRESS 8612L
+
+//
+// MessageId: ERROR_DS_EXISTING_AD_CHILD_NC
+//
+// MessageText:
+//
+//  The Active Directory detected an Active Directory child partition below the
+//  requested new partition name.  The Active Directory's partition heiarchy must
+//  be created in a top down method.
+//
+#define ERROR_DS_EXISTING_AD_CHILD_NC    8613L
+
+//
+// MessageId: ERROR_DS_REPL_LIFETIME_EXCEEDED
+//
+// MessageText:
+//
+//  The Active Directory cannot replicate with this server because the time since the last replication with this server has exceeded the tombstone lifetime.
+//
+#define ERROR_DS_REPL_LIFETIME_EXCEEDED  8614L
+
+//
+// MessageId: ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER
+//
+// MessageText:
+//
+//  The requested operation is not allowed on an object under the system container.
+//
+#define ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER 8615L
+
+//
+// MessageId: ERROR_DS_LDAP_SEND_QUEUE_FULL
+//
+// MessageText:
+//
+//  The LDAP servers network send queue has filled up because the client is not
+//  processing the results of it's requests fast enough.  No more requests will
+//  be processed until the client catches up.  If the client does not catch up
+//  then it will be disconnected.
+//
+#define ERROR_DS_LDAP_SEND_QUEUE_FULL    8616L
+
+///////////////////////////////////////////////////
+//                                                /
+//     End of Active Directory Error Codes        /
+//                                                /
+//                  8000 to  8999                 /
+///////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////
+//                                               //
+//                  DNS Error Codes              //
+//                                               //
+//                   9000 to 9999                //
+///////////////////////////////////////////////////
+
+// =============================
+// Facility DNS Error Messages
+// =============================
+
+//
+//  DNS response codes.
+//
+
+#define DNS_ERROR_RESPONSE_CODES_BASE 9000
+
+#define DNS_ERROR_RCODE_NO_ERROR NO_ERROR
+
+#define DNS_ERROR_MASK 0x00002328 // 9000 or DNS_ERROR_RESPONSE_CODES_BASE
+
+// DNS_ERROR_RCODE_FORMAT_ERROR          0x00002329
+//
+// MessageId: DNS_ERROR_RCODE_FORMAT_ERROR
+//
+// MessageText:
+//
+//  DNS server unable to interpret format.
+//
+#define DNS_ERROR_RCODE_FORMAT_ERROR     9001L
+
+// DNS_ERROR_RCODE_SERVER_FAILURE        0x0000232a
+//
+// MessageId: DNS_ERROR_RCODE_SERVER_FAILURE
+//
+// MessageText:
+//
+//  DNS server failure.
+//
+#define DNS_ERROR_RCODE_SERVER_FAILURE   9002L
+
+// DNS_ERROR_RCODE_NAME_ERROR            0x0000232b
+//
+// MessageId: DNS_ERROR_RCODE_NAME_ERROR
+//
+// MessageText:
+//
+//  DNS name does not exist.
+//
+#define DNS_ERROR_RCODE_NAME_ERROR       9003L
+
+// DNS_ERROR_RCODE_NOT_IMPLEMENTED       0x0000232c
+//
+// MessageId: DNS_ERROR_RCODE_NOT_IMPLEMENTED
+//
+// MessageText:
+//
+//  DNS request not supported by name server.
+//
+#define DNS_ERROR_RCODE_NOT_IMPLEMENTED  9004L
+
+// DNS_ERROR_RCODE_REFUSED               0x0000232d
+//
+// MessageId: DNS_ERROR_RCODE_REFUSED
+//
+// MessageText:
+//
+//  DNS operation refused.
+//
+#define DNS_ERROR_RCODE_REFUSED          9005L
+
+// DNS_ERROR_RCODE_YXDOMAIN              0x0000232e
+//
+// MessageId: DNS_ERROR_RCODE_YXDOMAIN
+//
+// MessageText:
+//
+//  DNS name that ought not exist, does exist.
+//
+#define DNS_ERROR_RCODE_YXDOMAIN         9006L
+
+// DNS_ERROR_RCODE_YXRRSET               0x0000232f
+//
+// MessageId: DNS_ERROR_RCODE_YXRRSET
+//
+// MessageText:
+//
+//  DNS RR set that ought not exist, does exist.
+//
+#define DNS_ERROR_RCODE_YXRRSET          9007L
+
+// DNS_ERROR_RCODE_NXRRSET               0x00002330
+//
+// MessageId: DNS_ERROR_RCODE_NXRRSET
+//
+// MessageText:
+//
+//  DNS RR set that ought to exist, does not exist.
+//
+#define DNS_ERROR_RCODE_NXRRSET          9008L
+
+// DNS_ERROR_RCODE_NOTAUTH               0x00002331
+//
+// MessageId: DNS_ERROR_RCODE_NOTAUTH
+//
+// MessageText:
+//
+//  DNS server not authoritative for zone.
+//
+#define DNS_ERROR_RCODE_NOTAUTH          9009L
+
+// DNS_ERROR_RCODE_NOTZONE               0x00002332
+//
+// MessageId: DNS_ERROR_RCODE_NOTZONE
+//
+// MessageText:
+//
+//  DNS name in update or prereq is not in zone.
+//
+#define DNS_ERROR_RCODE_NOTZONE          9010L
+
+// DNS_ERROR_RCODE_BADSIG                0x00002338
+//
+// MessageId: DNS_ERROR_RCODE_BADSIG
+//
+// MessageText:
+//
+//  DNS signature failed to verify.
+//
+#define DNS_ERROR_RCODE_BADSIG           9016L
+
+// DNS_ERROR_RCODE_BADKEY                0x00002339
+//
+// MessageId: DNS_ERROR_RCODE_BADKEY
+//
+// MessageText:
+//
+//  DNS bad key.
+//
+#define DNS_ERROR_RCODE_BADKEY           9017L
+
+// DNS_ERROR_RCODE_BADTIME               0x0000233a
+//
+// MessageId: DNS_ERROR_RCODE_BADTIME
+//
+// MessageText:
+//
+//  DNS signature validity expired.
+//
+#define DNS_ERROR_RCODE_BADTIME          9018L
+
+#define DNS_ERROR_RCODE_LAST DNS_ERROR_RCODE_BADTIME
+
+
+//
+//  Packet format
+//
+
+#define DNS_ERROR_PACKET_FMT_BASE 9500
+
+// DNS_INFO_NO_RECORDS                   0x0000251d
+//
+// MessageId: DNS_INFO_NO_RECORDS
+//
+// MessageText:
+//
+//  No records found for given DNS query.
+//
+#define DNS_INFO_NO_RECORDS              9501L
+
+// DNS_ERROR_BAD_PACKET                  0x0000251e
+//
+// MessageId: DNS_ERROR_BAD_PACKET
+//
+// MessageText:
+//
+//  Bad DNS packet.
+//
+#define DNS_ERROR_BAD_PACKET             9502L
+
+// DNS_ERROR_NO_PACKET                   0x0000251f
+//
+// MessageId: DNS_ERROR_NO_PACKET
+//
+// MessageText:
+//
+//  No DNS packet.
+//
+#define DNS_ERROR_NO_PACKET              9503L
+
+// DNS_ERROR_RCODE                       0x00002520
+//
+// MessageId: DNS_ERROR_RCODE
+//
+// MessageText:
+//
+//  DNS error, check rcode.
+//
+#define DNS_ERROR_RCODE                  9504L
+
+// DNS_ERROR_UNSECURE_PACKET             0x00002521
+//
+// MessageId: DNS_ERROR_UNSECURE_PACKET
+//
+// MessageText:
+//
+//  Unsecured DNS packet.
+//
+#define DNS_ERROR_UNSECURE_PACKET        9505L
+
+#define DNS_STATUS_PACKET_UNSECURE DNS_ERROR_UNSECURE_PACKET
+
+
+//
+//  General API errors
+//
+
+#define DNS_ERROR_NO_MEMORY            ERROR_OUTOFMEMORY
+#define DNS_ERROR_INVALID_NAME         ERROR_INVALID_NAME
+#define DNS_ERROR_INVALID_DATA         ERROR_INVALID_DATA
+
+#define DNS_ERROR_GENERAL_API_BASE 9550
+
+// DNS_ERROR_INVALID_TYPE                0x0000254f
+//
+// MessageId: DNS_ERROR_INVALID_TYPE
+//
+// MessageText:
+//
+//  Invalid DNS type.
+//
+#define DNS_ERROR_INVALID_TYPE           9551L
+
+// DNS_ERROR_INVALID_IP_ADDRESS          0x00002550
+//
+// MessageId: DNS_ERROR_INVALID_IP_ADDRESS
+//
+// MessageText:
+//
+//  Invalid IP address.
+//
+#define DNS_ERROR_INVALID_IP_ADDRESS     9552L
+
+// DNS_ERROR_INVALID_PROPERTY            0x00002551
+//
+// MessageId: DNS_ERROR_INVALID_PROPERTY
+//
+// MessageText:
+//
+//  Invalid property.
+//
+#define DNS_ERROR_INVALID_PROPERTY       9553L
+
+// DNS_ERROR_TRY_AGAIN_LATER             0x00002552
+//
+// MessageId: DNS_ERROR_TRY_AGAIN_LATER
+//
+// MessageText:
+//
+//  Try DNS operation again later.
+//
+#define DNS_ERROR_TRY_AGAIN_LATER        9554L
+
+// DNS_ERROR_NOT_UNIQUE                  0x00002553
+//
+// MessageId: DNS_ERROR_NOT_UNIQUE
+//
+// MessageText:
+//
+//  Record for given name and type is not unique.
+//
+#define DNS_ERROR_NOT_UNIQUE             9555L
+
+// DNS_ERROR_NON_RFC_NAME                0x00002554
+//
+// MessageId: DNS_ERROR_NON_RFC_NAME
+//
+// MessageText:
+//
+//  DNS name does not comply with RFC specifications.
+//
+#define DNS_ERROR_NON_RFC_NAME           9556L
+
+// DNS_STATUS_FQDN                       0x00002555
+//
+// MessageId: DNS_STATUS_FQDN
+//
+// MessageText:
+//
+//  DNS name is a fully-qualified DNS name.
+//
+#define DNS_STATUS_FQDN                  9557L
+
+// DNS_STATUS_DOTTED_NAME                0x00002556
+//
+// MessageId: DNS_STATUS_DOTTED_NAME
+//
+// MessageText:
+//
+//  DNS name is dotted (multi-label).
+//
+#define DNS_STATUS_DOTTED_NAME           9558L
+
+// DNS_STATUS_SINGLE_PART_NAME           0x00002557
+//
+// MessageId: DNS_STATUS_SINGLE_PART_NAME
+//
+// MessageText:
+//
+//  DNS name is a single-part name.
+//
+#define DNS_STATUS_SINGLE_PART_NAME      9559L
+
+// DNS_ERROR_INVALID_NAME_CHAR           0x00002558
+//
+// MessageId: DNS_ERROR_INVALID_NAME_CHAR
+//
+// MessageText:
+//
+//  DNS name contains an invalid character.
+//
+#define DNS_ERROR_INVALID_NAME_CHAR      9560L
+
+// DNS_ERROR_NUMERIC_NAME                0x00002559
+//
+// MessageId: DNS_ERROR_NUMERIC_NAME
+//
+// MessageText:
+//
+//  DNS name is entirely numeric.
+//
+#define DNS_ERROR_NUMERIC_NAME           9561L
+
+// DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER  0x0000255A
+//
+// MessageId: DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER
+//
+// MessageText:
+//
+//  The operation requested is not permitted on a DNS root server.
+//
+#define DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER 9562L
+
+// DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION  0x0000255B
+//
+// MessageId: DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION
+//
+// MessageText:
+//
+//  The record could not be created because this part of the DNS namespace has
+//  been delegated to another server.
+//
+#define DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION 9563L
+
+// DNS_ERROR_CANNOT_FIND_ROOT_HINTS  0x0000255C
+//
+// MessageId: DNS_ERROR_CANNOT_FIND_ROOT_HINTS
+//
+// MessageText:
+//
+//  The DNS server could not find a set of root hints.
+//
+#define DNS_ERROR_CANNOT_FIND_ROOT_HINTS 9564L
+
+// DNS_ERROR_INCONSISTENT_ROOT_HINTS  0x0000255D
+//
+// MessageId: DNS_ERROR_INCONSISTENT_ROOT_HINTS
+//
+// MessageText:
+//
+//  The DNS server found root hints but they were not consistent across
+//  all adapters.
+//
+#define DNS_ERROR_INCONSISTENT_ROOT_HINTS 9565L
+
+
+//
+//  Zone errors
+//
+
+#define DNS_ERROR_ZONE_BASE 9600
+
+// DNS_ERROR_ZONE_DOES_NOT_EXIST         0x00002581
+//
+// MessageId: DNS_ERROR_ZONE_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  DNS zone does not exist.
+//
+#define DNS_ERROR_ZONE_DOES_NOT_EXIST    9601L
+
+// DNS_ERROR_NO_ZONE_INFO                0x00002582
+//
+// MessageId: DNS_ERROR_NO_ZONE_INFO
+//
+// MessageText:
+//
+//  DNS zone information not available.
+//
+#define DNS_ERROR_NO_ZONE_INFO           9602L
+
+// DNS_ERROR_INVALID_ZONE_OPERATION      0x00002583
+//
+// MessageId: DNS_ERROR_INVALID_ZONE_OPERATION
+//
+// MessageText:
+//
+//  Invalid operation for DNS zone.
+//
+#define DNS_ERROR_INVALID_ZONE_OPERATION 9603L
+
+// DNS_ERROR_ZONE_CONFIGURATION_ERROR    0x00002584
+//
+// MessageId: DNS_ERROR_ZONE_CONFIGURATION_ERROR
+//
+// MessageText:
+//
+//  Invalid DNS zone configuration.
+//
+#define DNS_ERROR_ZONE_CONFIGURATION_ERROR 9604L
+
+// DNS_ERROR_ZONE_HAS_NO_SOA_RECORD      0x00002585
+//
+// MessageId: DNS_ERROR_ZONE_HAS_NO_SOA_RECORD
+//
+// MessageText:
+//
+//  DNS zone has no start of authority (SOA) record.
+//
+#define DNS_ERROR_ZONE_HAS_NO_SOA_RECORD 9605L
+
+// DNS_ERROR_ZONE_HAS_NO_NS_RECORDS      0x00002586
+//
+// MessageId: DNS_ERROR_ZONE_HAS_NO_NS_RECORDS
+//
+// MessageText:
+//
+//  DNS zone has no Name Server (NS) record.
+//
+#define DNS_ERROR_ZONE_HAS_NO_NS_RECORDS 9606L
+
+// DNS_ERROR_ZONE_LOCKED                 0x00002587
+//
+// MessageId: DNS_ERROR_ZONE_LOCKED
+//
+// MessageText:
+//
+//  DNS zone is locked.
+//
+#define DNS_ERROR_ZONE_LOCKED            9607L
+
+// DNS_ERROR_ZONE_CREATION_FAILED        0x00002588
+//
+// MessageId: DNS_ERROR_ZONE_CREATION_FAILED
+//
+// MessageText:
+//
+//  DNS zone creation failed.
+//
+#define DNS_ERROR_ZONE_CREATION_FAILED   9608L
+
+// DNS_ERROR_ZONE_ALREADY_EXISTS         0x00002589
+//
+// MessageId: DNS_ERROR_ZONE_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  DNS zone already exists.
+//
+#define DNS_ERROR_ZONE_ALREADY_EXISTS    9609L
+
+// DNS_ERROR_AUTOZONE_ALREADY_EXISTS     0x0000258a
+//
+// MessageId: DNS_ERROR_AUTOZONE_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  DNS automatic zone already exists.
+//
+#define DNS_ERROR_AUTOZONE_ALREADY_EXISTS 9610L
+
+// DNS_ERROR_INVALID_ZONE_TYPE           0x0000258b
+//
+// MessageId: DNS_ERROR_INVALID_ZONE_TYPE
+//
+// MessageText:
+//
+//  Invalid DNS zone type.
+//
+#define DNS_ERROR_INVALID_ZONE_TYPE      9611L
+
+// DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP 0x0000258c
+//
+// MessageId: DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP
+//
+// MessageText:
+//
+//  Secondary DNS zone requires master IP address.
+//
+#define DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP 9612L
+
+// DNS_ERROR_ZONE_NOT_SECONDARY          0x0000258d
+//
+// MessageId: DNS_ERROR_ZONE_NOT_SECONDARY
+//
+// MessageText:
+//
+//  DNS zone not secondary.
+//
+#define DNS_ERROR_ZONE_NOT_SECONDARY     9613L
+
+// DNS_ERROR_NEED_SECONDARY_ADDRESSES    0x0000258e
+//
+// MessageId: DNS_ERROR_NEED_SECONDARY_ADDRESSES
+//
+// MessageText:
+//
+//  Need secondary IP address.
+//
+#define DNS_ERROR_NEED_SECONDARY_ADDRESSES 9614L
+
+// DNS_ERROR_WINS_INIT_FAILED            0x0000258f
+//
+// MessageId: DNS_ERROR_WINS_INIT_FAILED
+//
+// MessageText:
+//
+//  WINS initialization failed.
+//
+#define DNS_ERROR_WINS_INIT_FAILED       9615L
+
+// DNS_ERROR_NEED_WINS_SERVERS           0x00002590
+//
+// MessageId: DNS_ERROR_NEED_WINS_SERVERS
+//
+// MessageText:
+//
+//  Need WINS servers.
+//
+#define DNS_ERROR_NEED_WINS_SERVERS      9616L
+
+// DNS_ERROR_NBSTAT_INIT_FAILED          0x00002591
+//
+// MessageId: DNS_ERROR_NBSTAT_INIT_FAILED
+//
+// MessageText:
+//
+//  NBTSTAT initialization call failed.
+//
+#define DNS_ERROR_NBSTAT_INIT_FAILED     9617L
+
+// DNS_ERROR_SOA_DELETE_INVALID          0x00002592
+//
+// MessageId: DNS_ERROR_SOA_DELETE_INVALID
+//
+// MessageText:
+//
+//  Invalid delete of start of authority (SOA)
+//
+#define DNS_ERROR_SOA_DELETE_INVALID     9618L
+
+// DNS_ERROR_FORWARDER_ALREADY_EXISTS    0x00002593
+//
+// MessageId: DNS_ERROR_FORWARDER_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  A conditional forwarding zone already exists for that name.
+//
+#define DNS_ERROR_FORWARDER_ALREADY_EXISTS 9619L
+
+// DNS_ERROR_ZONE_REQUIRES_MASTER_IP     0x00002594
+//
+// MessageId: DNS_ERROR_ZONE_REQUIRES_MASTER_IP
+//
+// MessageText:
+//
+//  This zone must be configured with one or more master DNS server IP addresses.
+//
+#define DNS_ERROR_ZONE_REQUIRES_MASTER_IP 9620L
+
+// DNS_ERROR_ZONE_IS_SHUTDOWN            0x00002595
+//
+// MessageId: DNS_ERROR_ZONE_IS_SHUTDOWN
+//
+// MessageText:
+//
+//  The operation cannot be performed because this zone is shutdown.
+//
+#define DNS_ERROR_ZONE_IS_SHUTDOWN       9621L
+
+
+//
+//  Datafile errors
+//
+
+#define DNS_ERROR_DATAFILE_BASE 9650
+
+// DNS                                   0x000025b3
+//
+// MessageId: DNS_ERROR_PRIMARY_REQUIRES_DATAFILE
+//
+// MessageText:
+//
+//  Primary DNS zone requires datafile.
+//
+#define DNS_ERROR_PRIMARY_REQUIRES_DATAFILE 9651L
+
+// DNS                                   0x000025b4
+//
+// MessageId: DNS_ERROR_INVALID_DATAFILE_NAME
+//
+// MessageText:
+//
+//  Invalid datafile name for DNS zone.
+//
+#define DNS_ERROR_INVALID_DATAFILE_NAME  9652L
+
+// DNS                                   0x000025b5
+//
+// MessageId: DNS_ERROR_DATAFILE_OPEN_FAILURE
+//
+// MessageText:
+//
+//  Failed to open datafile for DNS zone.
+//
+#define DNS_ERROR_DATAFILE_OPEN_FAILURE  9653L
+
+// DNS                                   0x000025b6
+//
+// MessageId: DNS_ERROR_FILE_WRITEBACK_FAILED
+//
+// MessageText:
+//
+//  Failed to write datafile for DNS zone.
+//
+#define DNS_ERROR_FILE_WRITEBACK_FAILED  9654L
+
+// DNS                                   0x000025b7
+//
+// MessageId: DNS_ERROR_DATAFILE_PARSING
+//
+// MessageText:
+//
+//  Failure while reading datafile for DNS zone.
+//
+#define DNS_ERROR_DATAFILE_PARSING       9655L
+
+
+//
+//  Database errors
+//
+
+#define DNS_ERROR_DATABASE_BASE 9700
+
+// DNS_ERROR_RECORD_DOES_NOT_EXIST       0x000025e5
+//
+// MessageId: DNS_ERROR_RECORD_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  DNS record does not exist.
+//
+#define DNS_ERROR_RECORD_DOES_NOT_EXIST  9701L
+
+// DNS_ERROR_RECORD_FORMAT               0x000025e6
+//
+// MessageId: DNS_ERROR_RECORD_FORMAT
+//
+// MessageText:
+//
+//  DNS record format error.
+//
+#define DNS_ERROR_RECORD_FORMAT          9702L
+
+// DNS_ERROR_NODE_CREATION_FAILED        0x000025e7
+//
+// MessageId: DNS_ERROR_NODE_CREATION_FAILED
+//
+// MessageText:
+//
+//  Node creation failure in DNS.
+//
+#define DNS_ERROR_NODE_CREATION_FAILED   9703L
+
+// DNS_ERROR_UNKNOWN_RECORD_TYPE         0x000025e8
+//
+// MessageId: DNS_ERROR_UNKNOWN_RECORD_TYPE
+//
+// MessageText:
+//
+//  Unknown DNS record type.
+//
+#define DNS_ERROR_UNKNOWN_RECORD_TYPE    9704L
+
+// DNS_ERROR_RECORD_TIMED_OUT            0x000025e9
+//
+// MessageId: DNS_ERROR_RECORD_TIMED_OUT
+//
+// MessageText:
+//
+//  DNS record timed out.
+//
+#define DNS_ERROR_RECORD_TIMED_OUT       9705L
+
+// DNS_ERROR_NAME_NOT_IN_ZONE            0x000025ea
+//
+// MessageId: DNS_ERROR_NAME_NOT_IN_ZONE
+//
+// MessageText:
+//
+//  Name not in DNS zone.
+//
+#define DNS_ERROR_NAME_NOT_IN_ZONE       9706L
+
+// DNS_ERROR_CNAME_LOOP                  0x000025eb
+//
+// MessageId: DNS_ERROR_CNAME_LOOP
+//
+// MessageText:
+//
+//  CNAME loop detected.
+//
+#define DNS_ERROR_CNAME_LOOP             9707L
+
+// DNS_ERROR_NODE_IS_CNAME               0x000025ec
+//
+// MessageId: DNS_ERROR_NODE_IS_CNAME
+//
+// MessageText:
+//
+//  Node is a CNAME DNS record.
+//
+#define DNS_ERROR_NODE_IS_CNAME          9708L
+
+// DNS_ERROR_CNAME_COLLISION             0x000025ed
+//
+// MessageId: DNS_ERROR_CNAME_COLLISION
+//
+// MessageText:
+//
+//  A CNAME record already exists for given name.
+//
+#define DNS_ERROR_CNAME_COLLISION        9709L
+
+// DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT    0x000025ee
+//
+// MessageId: DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT
+//
+// MessageText:
+//
+//  Record only at DNS zone root.
+//
+#define DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT 9710L
+
+// DNS_ERROR_RECORD_ALREADY_EXISTS       0x000025ef
+//
+// MessageId: DNS_ERROR_RECORD_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  DNS record already exists.
+//
+#define DNS_ERROR_RECORD_ALREADY_EXISTS  9711L
+
+// DNS_ERROR_SECONDARY_DATA              0x000025f0
+//
+// MessageId: DNS_ERROR_SECONDARY_DATA
+//
+// MessageText:
+//
+//  Secondary DNS zone data error.
+//
+#define DNS_ERROR_SECONDARY_DATA         9712L
+
+// DNS_ERROR_NO_CREATE_CACHE_DATA        0x000025f1
+//
+// MessageId: DNS_ERROR_NO_CREATE_CACHE_DATA
+//
+// MessageText:
+//
+//  Could not create DNS cache data.
+//
+#define DNS_ERROR_NO_CREATE_CACHE_DATA   9713L
+
+// DNS_ERROR_NAME_DOES_NOT_EXIST         0x000025f2
+//
+// MessageId: DNS_ERROR_NAME_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  DNS name does not exist.
+//
+#define DNS_ERROR_NAME_DOES_NOT_EXIST    9714L
+
+// DNS_WARNING_PTR_CREATE_FAILED         0x000025f3
+//
+// MessageId: DNS_WARNING_PTR_CREATE_FAILED
+//
+// MessageText:
+//
+//  Could not create pointer (PTR) record.
+//
+#define DNS_WARNING_PTR_CREATE_FAILED    9715L
+
+// DNS_WARNING_DOMAIN_UNDELETED          0x000025f4
+//
+// MessageId: DNS_WARNING_DOMAIN_UNDELETED
+//
+// MessageText:
+//
+//  DNS domain was undeleted.
+//
+#define DNS_WARNING_DOMAIN_UNDELETED     9716L
+
+// DNS_ERROR_DS_UNAVAILABLE              0x000025f5
+//
+// MessageId: DNS_ERROR_DS_UNAVAILABLE
+//
+// MessageText:
+//
+//  The directory service is unavailable.
+//
+#define DNS_ERROR_DS_UNAVAILABLE         9717L
+
+// DNS_ERROR_DS_ZONE_ALREADY_EXISTS      0x000025f6
+//
+// MessageId: DNS_ERROR_DS_ZONE_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  DNS zone already exists in the directory service.
+//
+#define DNS_ERROR_DS_ZONE_ALREADY_EXISTS 9718L
+
+// DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE      0x000025f7
+//
+// MessageId: DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE
+//
+// MessageText:
+//
+//  DNS server not creating or reading the boot file for the directory service integrated DNS zone.
+//
+#define DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE 9719L
+
+
+//
+//  Operation errors
+//
+
+#define DNS_ERROR_OPERATION_BASE 9750
+
+// DNS_INFO_AXFR_COMPLETE                0x00002617
+//
+// MessageId: DNS_INFO_AXFR_COMPLETE
+//
+// MessageText:
+//
+//  DNS AXFR (zone transfer) complete.
+//
+#define DNS_INFO_AXFR_COMPLETE           9751L
+
+// DNS_ERROR_AXFR                        0x00002618
+//
+// MessageId: DNS_ERROR_AXFR
+//
+// MessageText:
+//
+//  DNS zone transfer failed.
+//
+#define DNS_ERROR_AXFR                   9752L
+
+// DNS_INFO_ADDED_LOCAL_WINS             0x00002619
+//
+// MessageId: DNS_INFO_ADDED_LOCAL_WINS
+//
+// MessageText:
+//
+//  Added local WINS server.
+//
+#define DNS_INFO_ADDED_LOCAL_WINS        9753L
+
+
+//
+//  Secure update
+//
+
+#define DNS_ERROR_SECURE_BASE 9800
+
+// DNS_STATUS_CONTINUE_NEEDED            0x00002649
+//
+// MessageId: DNS_STATUS_CONTINUE_NEEDED
+//
+// MessageText:
+//
+//  Secure update call needs to continue update request.
+//
+#define DNS_STATUS_CONTINUE_NEEDED       9801L
+
+
+//
+//  Setup errors
+//
+
+#define DNS_ERROR_SETUP_BASE 9850
+
+// DNS_ERROR_NO_TCPIP                    0x0000267b
+//
+// MessageId: DNS_ERROR_NO_TCPIP
+//
+// MessageText:
+//
+//  TCP/IP network protocol not installed.
+//
+#define DNS_ERROR_NO_TCPIP               9851L
+
+// DNS_ERROR_NO_DNS_SERVERS              0x0000267c
+//
+// MessageId: DNS_ERROR_NO_DNS_SERVERS
+//
+// MessageText:
+//
+//  No DNS servers configured for local system.
+//
+#define DNS_ERROR_NO_DNS_SERVERS         9852L
+
+
+//
+//  Directory partition (DP) errors
+//
+
+#define DNS_ERROR_DP_BASE 9900
+
+// DNS_ERROR_DP_DOES_NOT_EXIST           0x000026ad
+//
+// MessageId: DNS_ERROR_DP_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  The specified directory partition does not exist.
+//
+#define DNS_ERROR_DP_DOES_NOT_EXIST      9901L
+
+// DNS_ERROR_DP_ALREADY_EXISTS           0x000026ae
+//
+// MessageId: DNS_ERROR_DP_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The specified directory partition already exists.
+//
+#define DNS_ERROR_DP_ALREADY_EXISTS      9902L
+
+// DNS_ERROR_DP_NOT_ENLISTED             0x000026af
+//
+// MessageId: DNS_ERROR_DP_NOT_ENLISTED
+//
+// MessageText:
+//
+//  This DNS server is not enlisted in the specified directory partition.
+//
+#define DNS_ERROR_DP_NOT_ENLISTED        9903L
+
+// DNS_ERROR_DP_ALREADY_ENLISTED         0x000026b0
+//
+// MessageId: DNS_ERROR_DP_ALREADY_ENLISTED
+//
+// MessageText:
+//
+//  This DNS server is already enlisted in the specified directory partition.
+//
+#define DNS_ERROR_DP_ALREADY_ENLISTED    9904L
+
+// DNS_ERROR_DP_NOT_AVAILABLE            0x000026b1
+//
+// MessageId: DNS_ERROR_DP_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  The directory partition is not available at this time. Please wait
+//  a few minutes and try again.
+//
+#define DNS_ERROR_DP_NOT_AVAILABLE       9905L
+
+///////////////////////////////////////////////////
+//                                               //
+//             End of DNS Error Codes            //
+//                                               //
+//                  9000 to 9999                 //
+///////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////
+//                                               //
+//               WinSock Error Codes             //
+//                                               //
+//                 10000 to 11999                //
+///////////////////////////////////////////////////
+
+//
+// WinSock error codes are also defined in WinSock.h
+// and WinSock2.h, hence the IFDEF
+//
+#ifndef WSABASEERR
+#define WSABASEERR 10000
+//
+// MessageId: WSAEINTR
+//
+// MessageText:
+//
+//  A blocking operation was interrupted by a call to WSACancelBlockingCall.
+//
+#define WSAEINTR                         10004L
+
+//
+// MessageId: WSAEBADF
+//
+// MessageText:
+//
+//  The file handle supplied is not valid.
+//
+#define WSAEBADF                         10009L
+
+//
+// MessageId: WSAEACCES
+//
+// MessageText:
+//
+//  An attempt was made to access a socket in a way forbidden by its access permissions.
+//
+#define WSAEACCES                        10013L
+
+//
+// MessageId: WSAEFAULT
+//
+// MessageText:
+//
+//  The system detected an invalid pointer address in attempting to use a pointer argument in a call.
+//
+#define WSAEFAULT                        10014L
+
+//
+// MessageId: WSAEINVAL
+//
+// MessageText:
+//
+//  An invalid argument was supplied.
+//
+#define WSAEINVAL                        10022L
+
+//
+// MessageId: WSAEMFILE
+//
+// MessageText:
+//
+//  Too many open sockets.
+//
+#define WSAEMFILE                        10024L
+
+//
+// MessageId: WSAEWOULDBLOCK
+//
+// MessageText:
+//
+//  A non-blocking socket operation could not be completed immediately.
+//
+#define WSAEWOULDBLOCK                   10035L
+
+//
+// MessageId: WSAEINPROGRESS
+//
+// MessageText:
+//
+//  A blocking operation is currently executing.
+//
+#define WSAEINPROGRESS                   10036L
+
+//
+// MessageId: WSAEALREADY
+//
+// MessageText:
+//
+//  An operation was attempted on a non-blocking socket that already had an operation in progress.
+//
+#define WSAEALREADY                      10037L
+
+//
+// MessageId: WSAENOTSOCK
+//
+// MessageText:
+//
+//  An operation was attempted on something that is not a socket.
+//
+#define WSAENOTSOCK                      10038L
+
+//
+// MessageId: WSAEDESTADDRREQ
+//
+// MessageText:
+//
+//  A required address was omitted from an operation on a socket.
+//
+#define WSAEDESTADDRREQ                  10039L
+
+//
+// MessageId: WSAEMSGSIZE
+//
+// MessageText:
+//
+//  A message sent on a datagram socket was larger than the internal message buffer or some other network limit, or the buffer used to receive a datagram into was smaller than the datagram itself.
+//
+#define WSAEMSGSIZE                      10040L
+
+//
+// MessageId: WSAEPROTOTYPE
+//
+// MessageText:
+//
+//  A protocol was specified in the socket function call that does not support the semantics of the socket type requested.
+//
+#define WSAEPROTOTYPE                    10041L
+
+//
+// MessageId: WSAENOPROTOOPT
+//
+// MessageText:
+//
+//  An unknown, invalid, or unsupported option or level was specified in a getsockopt or setsockopt call.
+//
+#define WSAENOPROTOOPT                   10042L
+
+//
+// MessageId: WSAEPROTONOSUPPORT
+//
+// MessageText:
+//
+//  The requested protocol has not been configured into the system, or no implementation for it exists.
+//
+#define WSAEPROTONOSUPPORT               10043L
+
+//
+// MessageId: WSAESOCKTNOSUPPORT
+//
+// MessageText:
+//
+//  The support for the specified socket type does not exist in this address family.
+//
+#define WSAESOCKTNOSUPPORT               10044L
+
+//
+// MessageId: WSAEOPNOTSUPP
+//
+// MessageText:
+//
+//  The attempted operation is not supported for the type of object referenced.
+//
+#define WSAEOPNOTSUPP                    10045L
+
+//
+// MessageId: WSAEPFNOSUPPORT
+//
+// MessageText:
+//
+//  The protocol family has not been configured into the system or no implementation for it exists.
+//
+#define WSAEPFNOSUPPORT                  10046L
+
+//
+// MessageId: WSAEAFNOSUPPORT
+//
+// MessageText:
+//
+//  An address incompatible with the requested protocol was used.
+//
+#define WSAEAFNOSUPPORT                  10047L
+
+//
+// MessageId: WSAEADDRINUSE
+//
+// MessageText:
+//
+//  Only one usage of each socket address (protocol/network address/port) is normally permitted.
+//
+#define WSAEADDRINUSE                    10048L
+
+//
+// MessageId: WSAEADDRNOTAVAIL
+//
+// MessageText:
+//
+//  The requested address is not valid in its context.
+//
+#define WSAEADDRNOTAVAIL                 10049L
+
+//
+// MessageId: WSAENETDOWN
+//
+// MessageText:
+//
+//  A socket operation encountered a dead network.
+//
+#define WSAENETDOWN                      10050L
+
+//
+// MessageId: WSAENETUNREACH
+//
+// MessageText:
+//
+//  A socket operation was attempted to an unreachable network.
+//
+#define WSAENETUNREACH                   10051L
+
+//
+// MessageId: WSAENETRESET
+//
+// MessageText:
+//
+//  The connection has been broken due to keep-alive activity detecting a failure while the operation was in progress.
+//
+#define WSAENETRESET                     10052L
+
+//
+// MessageId: WSAECONNABORTED
+//
+// MessageText:
+//
+//  An established connection was aborted by the software in your host machine.
+//
+#define WSAECONNABORTED                  10053L
+
+//
+// MessageId: WSAECONNRESET
+//
+// MessageText:
+//
+//  An existing connection was forcibly closed by the remote host.
+//
+#define WSAECONNRESET                    10054L
+
+//
+// MessageId: WSAENOBUFS
+//
+// MessageText:
+//
+//  An operation on a socket could not be performed because the system lacked sufficient buffer space or because a queue was full.
+//
+#define WSAENOBUFS                       10055L
+
+//
+// MessageId: WSAEISCONN
+//
+// MessageText:
+//
+//  A connect request was made on an already connected socket.
+//
+#define WSAEISCONN                       10056L
+
+//
+// MessageId: WSAENOTCONN
+//
+// MessageText:
+//
+//  A request to send or receive data was disallowed because the socket is not connected and (when sending on a datagram socket using a sendto call) no address was supplied.
+//
+#define WSAENOTCONN                      10057L
+
+//
+// MessageId: WSAESHUTDOWN
+//
+// MessageText:
+//
+//  A request to send or receive data was disallowed because the socket had already been shut down in that direction with a previous shutdown call.
+//
+#define WSAESHUTDOWN                     10058L
+
+//
+// MessageId: WSAETOOMANYREFS
+//
+// MessageText:
+//
+//  Too many references to some kernel object.
+//
+#define WSAETOOMANYREFS                  10059L
+
+//
+// MessageId: WSAETIMEDOUT
+//
+// MessageText:
+//
+//  A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
+//
+#define WSAETIMEDOUT                     10060L
+
+//
+// MessageId: WSAECONNREFUSED
+//
+// MessageText:
+//
+//  No connection could be made because the target machine actively refused it.
+//
+#define WSAECONNREFUSED                  10061L
+
+//
+// MessageId: WSAELOOP
+//
+// MessageText:
+//
+//  Cannot translate name.
+//
+#define WSAELOOP                         10062L
+
+//
+// MessageId: WSAENAMETOOLONG
+//
+// MessageText:
+//
+//  Name component or name was too long.
+//
+#define WSAENAMETOOLONG                  10063L
+
+//
+// MessageId: WSAEHOSTDOWN
+//
+// MessageText:
+//
+//  A socket operation failed because the destination host was down.
+//
+#define WSAEHOSTDOWN                     10064L
+
+//
+// MessageId: WSAEHOSTUNREACH
+//
+// MessageText:
+//
+//  A socket operation was attempted to an unreachable host.
+//
+#define WSAEHOSTUNREACH                  10065L
+
+//
+// MessageId: WSAENOTEMPTY
+//
+// MessageText:
+//
+//  Cannot remove a directory that is not empty.
+//
+#define WSAENOTEMPTY                     10066L
+
+//
+// MessageId: WSAEPROCLIM
+//
+// MessageText:
+//
+//  A Windows Sockets implementation may have a limit on the number of applications that may use it simultaneously.
+//
+#define WSAEPROCLIM                      10067L
+
+//
+// MessageId: WSAEUSERS
+//
+// MessageText:
+//
+//  Ran out of quota.
+//
+#define WSAEUSERS                        10068L
+
+//
+// MessageId: WSAEDQUOT
+//
+// MessageText:
+//
+//  Ran out of disk quota.
+//
+#define WSAEDQUOT                        10069L
+
+//
+// MessageId: WSAESTALE
+//
+// MessageText:
+//
+//  File handle reference is no longer available.
+//
+#define WSAESTALE                        10070L
+
+//
+// MessageId: WSAEREMOTE
+//
+// MessageText:
+//
+//  Item is not available locally.
+//
+#define WSAEREMOTE                       10071L
+
+//
+// MessageId: WSASYSNOTREADY
+//
+// MessageText:
+//
+//  WSAStartup cannot function at this time because the underlying system it uses to provide network services is currently unavailable.
+//
+#define WSASYSNOTREADY                   10091L
+
+//
+// MessageId: WSAVERNOTSUPPORTED
+//
+// MessageText:
+//
+//  The Windows Sockets version requested is not supported.
+//
+#define WSAVERNOTSUPPORTED               10092L
+
+//
+// MessageId: WSANOTINITIALISED
+//
+// MessageText:
+//
+//  Either the application has not called WSAStartup, or WSAStartup failed.
+//
+#define WSANOTINITIALISED                10093L
+
+//
+// MessageId: WSAEDISCON
+//
+// MessageText:
+//
+//  Returned by WSARecv or WSARecvFrom to indicate the remote party has initiated a graceful shutdown sequence.
+//
+#define WSAEDISCON                       10101L
+
+//
+// MessageId: WSAENOMORE
+//
+// MessageText:
+//
+//  No more results can be returned by WSALookupServiceNext.
+//
+#define WSAENOMORE                       10102L
+
+//
+// MessageId: WSAECANCELLED
+//
+// MessageText:
+//
+//  A call to WSALookupServiceEnd was made while this call was still processing. The call has been canceled.
+//
+#define WSAECANCELLED                    10103L
+
+//
+// MessageId: WSAEINVALIDPROCTABLE
+//
+// MessageText:
+//
+//  The procedure call table is invalid.
+//
+#define WSAEINVALIDPROCTABLE             10104L
+
+//
+// MessageId: WSAEINVALIDPROVIDER
+//
+// MessageText:
+//
+//  The requested service provider is invalid.
+//
+#define WSAEINVALIDPROVIDER              10105L
+
+//
+// MessageId: WSAEPROVIDERFAILEDINIT
+//
+// MessageText:
+//
+//  The requested service provider could not be loaded or initialized.
+//
+#define WSAEPROVIDERFAILEDINIT           10106L
+
+//
+// MessageId: WSASYSCALLFAILURE
+//
+// MessageText:
+//
+//  A system call that should never fail has failed.
+//
+#define WSASYSCALLFAILURE                10107L
+
+//
+// MessageId: WSASERVICE_NOT_FOUND
+//
+// MessageText:
+//
+//  No such service is known. The service cannot be found in the specified name space.
+//
+#define WSASERVICE_NOT_FOUND             10108L
+
+//
+// MessageId: WSATYPE_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified class was not found.
+//
+#define WSATYPE_NOT_FOUND                10109L
+
+//
+// MessageId: WSA_E_NO_MORE
+//
+// MessageText:
+//
+//  No more results can be returned by WSALookupServiceNext.
+//
+#define WSA_E_NO_MORE                    10110L
+
+//
+// MessageId: WSA_E_CANCELLED
+//
+// MessageText:
+//
+//  A call to WSALookupServiceEnd was made while this call was still processing. The call has been canceled.
+//
+#define WSA_E_CANCELLED                  10111L
+
+//
+// MessageId: WSAEREFUSED
+//
+// MessageText:
+//
+//  A database query failed because it was actively refused.
+//
+#define WSAEREFUSED                      10112L
+
+//
+// MessageId: WSAHOST_NOT_FOUND
+//
+// MessageText:
+//
+//  No such host is known.
+//
+#define WSAHOST_NOT_FOUND                11001L
+
+//
+// MessageId: WSATRY_AGAIN
+//
+// MessageText:
+//
+//  This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.
+//
+#define WSATRY_AGAIN                     11002L
+
+//
+// MessageId: WSANO_RECOVERY
+//
+// MessageText:
+//
+//  A non-recoverable error occurred during a database lookup.
+//
+#define WSANO_RECOVERY                   11003L
+
+//
+// MessageId: WSANO_DATA
+//
+// MessageText:
+//
+//  The requested name is valid, but no data of the requested type was found.
+//
+#define WSANO_DATA                       11004L
+
+//
+// MessageId: WSA_QOS_RECEIVERS
+//
+// MessageText:
+//
+//  At least one reserve has arrived.
+//
+#define WSA_QOS_RECEIVERS                11005L
+
+//
+// MessageId: WSA_QOS_SENDERS
+//
+// MessageText:
+//
+//  At least one path has arrived.
+//
+#define WSA_QOS_SENDERS                  11006L
+
+//
+// MessageId: WSA_QOS_NO_SENDERS
+//
+// MessageText:
+//
+//  There are no senders.
+//
+#define WSA_QOS_NO_SENDERS               11007L
+
+//
+// MessageId: WSA_QOS_NO_RECEIVERS
+//
+// MessageText:
+//
+//  There are no receivers.
+//
+#define WSA_QOS_NO_RECEIVERS             11008L
+
+//
+// MessageId: WSA_QOS_REQUEST_CONFIRMED
+//
+// MessageText:
+//
+//  Reserve has been confirmed.
+//
+#define WSA_QOS_REQUEST_CONFIRMED        11009L
+
+//
+// MessageId: WSA_QOS_ADMISSION_FAILURE
+//
+// MessageText:
+//
+//  Error due to lack of resources.
+//
+#define WSA_QOS_ADMISSION_FAILURE        11010L
+
+//
+// MessageId: WSA_QOS_POLICY_FAILURE
+//
+// MessageText:
+//
+//  Rejected for administrative reasons - bad credentials.
+//
+#define WSA_QOS_POLICY_FAILURE           11011L
+
+//
+// MessageId: WSA_QOS_BAD_STYLE
+//
+// MessageText:
+//
+//  Unknown or conflicting style.
+//
+#define WSA_QOS_BAD_STYLE                11012L
+
+//
+// MessageId: WSA_QOS_BAD_OBJECT
+//
+// MessageText:
+//
+//  Problem with some part of the filterspec or providerspecific buffer in general.
+//
+#define WSA_QOS_BAD_OBJECT               11013L
+
+//
+// MessageId: WSA_QOS_TRAFFIC_CTRL_ERROR
+//
+// MessageText:
+//
+//  Problem with some part of the flowspec.
+//
+#define WSA_QOS_TRAFFIC_CTRL_ERROR       11014L
+
+//
+// MessageId: WSA_QOS_GENERIC_ERROR
+//
+// MessageText:
+//
+//  General QOS error.
+//
+#define WSA_QOS_GENERIC_ERROR            11015L
+
+//
+// MessageId: WSA_QOS_ESERVICETYPE
+//
+// MessageText:
+//
+//  An invalid or unrecognized service type was found in the flowspec.
+//
+#define WSA_QOS_ESERVICETYPE             11016L
+
+//
+// MessageId: WSA_QOS_EFLOWSPEC
+//
+// MessageText:
+//
+//  An invalid or inconsistent flowspec was found in the QOS structure.
+//
+#define WSA_QOS_EFLOWSPEC                11017L
+
+//
+// MessageId: WSA_QOS_EPROVSPECBUF
+//
+// MessageText:
+//
+//  Invalid QOS provider-specific buffer.
+//
+#define WSA_QOS_EPROVSPECBUF             11018L
+
+//
+// MessageId: WSA_QOS_EFILTERSTYLE
+//
+// MessageText:
+//
+//  An invalid QOS filter style was used.
+//
+#define WSA_QOS_EFILTERSTYLE             11019L
+
+//
+// MessageId: WSA_QOS_EFILTERTYPE
+//
+// MessageText:
+//
+//  An invalid QOS filter type was used.
+//
+#define WSA_QOS_EFILTERTYPE              11020L
+
+//
+// MessageId: WSA_QOS_EFILTERCOUNT
+//
+// MessageText:
+//
+//  An incorrect number of QOS FILTERSPECs were specified in the FLOWDESCRIPTOR.
+//
+#define WSA_QOS_EFILTERCOUNT             11021L
+
+//
+// MessageId: WSA_QOS_EOBJLENGTH
+//
+// MessageText:
+//
+//  An object with an invalid ObjectLength field was specified in the QOS provider-specific buffer.
+//
+#define WSA_QOS_EOBJLENGTH               11022L
+
+//
+// MessageId: WSA_QOS_EFLOWCOUNT
+//
+// MessageText:
+//
+//  An incorrect number of flow descriptors was specified in the QOS structure.
+//
+#define WSA_QOS_EFLOWCOUNT               11023L
+
+//
+// MessageId: WSA_QOS_EUNKOWNPSOBJ
+//
+// MessageText:
+//
+//  An unrecognized object was found in the QOS provider-specific buffer.
+//
+#define WSA_QOS_EUNKOWNPSOBJ             11024L
+
+//
+// MessageId: WSA_QOS_EPOLICYOBJ
+//
+// MessageText:
+//
+//  An invalid policy object was found in the QOS provider-specific buffer.
+//
+#define WSA_QOS_EPOLICYOBJ               11025L
+
+//
+// MessageId: WSA_QOS_EFLOWDESC
+//
+// MessageText:
+//
+//  An invalid QOS flow descriptor was found in the flow descriptor list.
+//
+#define WSA_QOS_EFLOWDESC                11026L
+
+//
+// MessageId: WSA_QOS_EPSFLOWSPEC
+//
+// MessageText:
+//
+//  An invalid or inconsistent flowspec was found in the QOS provider specific buffer.
+//
+#define WSA_QOS_EPSFLOWSPEC              11027L
+
+//
+// MessageId: WSA_QOS_EPSFILTERSPEC
+//
+// MessageText:
+//
+//  An invalid FILTERSPEC was found in the QOS provider-specific buffer.
+//
+#define WSA_QOS_EPSFILTERSPEC            11028L
+
+//
+// MessageId: WSA_QOS_ESDMODEOBJ
+//
+// MessageText:
+//
+//  An invalid shape discard mode object was found in the QOS provider specific buffer.
+//
+#define WSA_QOS_ESDMODEOBJ               11029L
+
+//
+// MessageId: WSA_QOS_ESHAPERATEOBJ
+//
+// MessageText:
+//
+//  An invalid shaping rate object was found in the QOS provider-specific buffer.
+//
+#define WSA_QOS_ESHAPERATEOBJ            11030L
+
+//
+// MessageId: WSA_QOS_RESERVED_PETYPE
+//
+// MessageText:
+//
+//  A reserved policy element was found in the QOS provider-specific buffer.
+//
+#define WSA_QOS_RESERVED_PETYPE          11031L
+
+#endif // defined(WSABASEERR)
+
+///////////////////////////////////////////////////
+//                                               //
+//           End of WinSock Error Codes          //
+//                                               //
+//                 10000 to 11999                //
+///////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////
+//                                               //
+//             Side By Side Error Codes          //
+//                                               //
+//                 14000 to 14999                //
+///////////////////////////////////////////////////
+
+//
+// MessageId: ERROR_SXS_SECTION_NOT_FOUND
+//
+// MessageText:
+//
+//  The requested section was not present in the activation context.
+//
+#define ERROR_SXS_SECTION_NOT_FOUND      14000L
+
+//
+// MessageId: ERROR_SXS_CANT_GEN_ACTCTX
+//
+// MessageText:
+//
+//  This application has failed to start because the application configuration is incorrect. Reinstalling the application may fix this problem.
+//
+#define ERROR_SXS_CANT_GEN_ACTCTX        14001L
+
+//
+// MessageId: ERROR_SXS_INVALID_ACTCTXDATA_FORMAT
+//
+// MessageText:
+//
+//  The application binding data format is invalid.
+//
+#define ERROR_SXS_INVALID_ACTCTXDATA_FORMAT 14002L
+
+//
+// MessageId: ERROR_SXS_ASSEMBLY_NOT_FOUND
+//
+// MessageText:
+//
+//  The referenced assembly is not installed on your system.
+//
+#define ERROR_SXS_ASSEMBLY_NOT_FOUND     14003L
+
+//
+// MessageId: ERROR_SXS_MANIFEST_FORMAT_ERROR
+//
+// MessageText:
+//
+//  The manifest file does not begin with the required tag and format information.
+//
+#define ERROR_SXS_MANIFEST_FORMAT_ERROR  14004L
+
+//
+// MessageId: ERROR_SXS_MANIFEST_PARSE_ERROR
+//
+// MessageText:
+//
+//  The manifest file contains one or more syntax errors.
+//
+#define ERROR_SXS_MANIFEST_PARSE_ERROR   14005L
+
+//
+// MessageId: ERROR_SXS_ACTIVATION_CONTEXT_DISABLED
+//
+// MessageText:
+//
+//  The application attempted to activate a disabled activation context.
+//
+#define ERROR_SXS_ACTIVATION_CONTEXT_DISABLED 14006L
+
+//
+// MessageId: ERROR_SXS_KEY_NOT_FOUND
+//
+// MessageText:
+//
+//  The requested lookup key was not found in any active activation context.
+//
+#define ERROR_SXS_KEY_NOT_FOUND          14007L
+
+//
+// MessageId: ERROR_SXS_VERSION_CONFLICT
+//
+// MessageText:
+//
+//  A component version required by the application conflicts with another component version already active.
+//
+#define ERROR_SXS_VERSION_CONFLICT       14008L
+
+//
+// MessageId: ERROR_SXS_WRONG_SECTION_TYPE
+//
+// MessageText:
+//
+//  The type requested activation context section does not match the query API used.
+//
+#define ERROR_SXS_WRONG_SECTION_TYPE     14009L
+
+//
+// MessageId: ERROR_SXS_THREAD_QUERIES_DISABLED
+//
+// MessageText:
+//
+//  Lack of system resources has required isolated activation to be disabled for the current thread of execution.
+//
+#define ERROR_SXS_THREAD_QUERIES_DISABLED 14010L
+
+//
+// MessageId: ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET
+//
+// MessageText:
+//
+//  An attempt to set the process default activation context failed because the process default activation context was already set.
+//
+#define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET 14011L
+
+//
+// MessageId: ERROR_SXS_UNKNOWN_ENCODING_GROUP
+//
+// MessageText:
+//
+//  The encoding group identifier specified is not recognized.
+//
+#define ERROR_SXS_UNKNOWN_ENCODING_GROUP 14012L
+
+//
+// MessageId: ERROR_SXS_UNKNOWN_ENCODING
+//
+// MessageText:
+//
+//  The encoding requested is not recognized.
+//
+#define ERROR_SXS_UNKNOWN_ENCODING       14013L
+
+//
+// MessageId: ERROR_SXS_INVALID_XML_NAMESPACE_URI
+//
+// MessageText:
+//
+//  The manifest contains a reference to an invalid URI.
+//
+#define ERROR_SXS_INVALID_XML_NAMESPACE_URI 14014L
+
+//
+// MessageId: ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED
+//
+// MessageText:
+//
+//  The application manifest contains a reference to a dependent assembly which is not installed
+//
+#define ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED 14015L
+
+//
+// MessageId: ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED
+//
+// MessageText:
+//
+//  The manifest for an assembly used by the application has a reference to a dependent assembly which is not installed
+//
+#define ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED 14016L
+
+//
+// MessageId: ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE
+//
+// MessageText:
+//
+//  The manifest contains an attribute for the assembly identity which is not valid.
+//
+#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE 14017L
+
+//
+// MessageId: ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE
+//
+// MessageText:
+//
+//  The manifest is missing the required default namespace specification on the assembly element.
+//
+#define ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE 14018L
+
+//
+// MessageId: ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE
+//
+// MessageText:
+//
+//  The manifest has a default namespace specified on the assembly element but its value is not "urn:schemas-microsoft-com:asm.v1".
+//
+#define ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE 14019L
+
+//
+// MessageId: ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT
+//
+// MessageText:
+//
+//  The private manifest probed has crossed reparse-point-associated path
+//
+#define ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT 14020L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_DLL_NAME
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest have files by the same name.
+//
+#define ERROR_SXS_DUPLICATE_DLL_NAME     14021L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest have window classes with the same name.
+//
+#define ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME 14022L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_CLSID
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest have the same COM server CLSIDs.
+//
+#define ERROR_SXS_DUPLICATE_CLSID        14023L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_IID
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest have proxies for the same COM interface IIDs.
+//
+#define ERROR_SXS_DUPLICATE_IID          14024L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_TLBID
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest have the same COM type library TLBIDs.
+//
+#define ERROR_SXS_DUPLICATE_TLBID        14025L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_PROGID
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest have the same COM ProgIDs.
+//
+#define ERROR_SXS_DUPLICATE_PROGID       14026L
+
+//
+// MessageId: ERROR_SXS_DUPLICATE_ASSEMBLY_NAME
+//
+// MessageText:
+//
+//  Two or more components referenced directly or indirectly by the application manifest are different versions of the same component which is not permitted.
+//
+#define ERROR_SXS_DUPLICATE_ASSEMBLY_NAME 14027L
+
+//
+// MessageId: ERROR_SXS_FILE_HASH_MISMATCH
+//
+// MessageText:
+//
+//  A component's file does not match the verification information present in the
+//  component manifest.
+//
+#define ERROR_SXS_FILE_HASH_MISMATCH     14028L
+
+//
+// MessageId: ERROR_SXS_POLICY_PARSE_ERROR
+//
+// MessageText:
+//
+//  The policy manifest contains one or more syntax errors.
+//
+#define ERROR_SXS_POLICY_PARSE_ERROR     14029L
+
+//
+// MessageId: ERROR_SXS_XML_E_MISSINGQUOTE
+//
+// MessageText:
+//
+//  Manifest Parse Error : A string literal was expected, but no opening quote character was found.
+//
+#define ERROR_SXS_XML_E_MISSINGQUOTE     14030L
+
+//
+// MessageId: ERROR_SXS_XML_E_COMMENTSYNTAX
+//
+// MessageText:
+//
+//  Manifest Parse Error : Incorrect syntax was used in a comment.
+//
+#define ERROR_SXS_XML_E_COMMENTSYNTAX    14031L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADSTARTNAMECHAR
+//
+// MessageText:
+//
+//  Manifest Parse Error : A name was started with an invalid character.
+//
+#define ERROR_SXS_XML_E_BADSTARTNAMECHAR 14032L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADNAMECHAR
+//
+// MessageText:
+//
+//  Manifest Parse Error : A name contained an invalid character.
+//
+#define ERROR_SXS_XML_E_BADNAMECHAR      14033L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADCHARINSTRING
+//
+// MessageText:
+//
+//  Manifest Parse Error : A string literal contained an invalid character.
+//
+#define ERROR_SXS_XML_E_BADCHARINSTRING  14034L
+
+//
+// MessageId: ERROR_SXS_XML_E_XMLDECLSYNTAX
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid syntax for an xml declaration.
+//
+#define ERROR_SXS_XML_E_XMLDECLSYNTAX    14035L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADCHARDATA
+//
+// MessageText:
+//
+//  Manifest Parse Error : An Invalid character was found in text content.
+//
+#define ERROR_SXS_XML_E_BADCHARDATA      14036L
+
+//
+// MessageId: ERROR_SXS_XML_E_MISSINGWHITESPACE
+//
+// MessageText:
+//
+//  Manifest Parse Error : Required white space was missing.
+//
+#define ERROR_SXS_XML_E_MISSINGWHITESPACE 14037L
+
+//
+// MessageId: ERROR_SXS_XML_E_EXPECTINGTAGEND
+//
+// MessageText:
+//
+//  Manifest Parse Error : The character '>' was expected.
+//
+#define ERROR_SXS_XML_E_EXPECTINGTAGEND  14038L
+
+//
+// MessageId: ERROR_SXS_XML_E_MISSINGSEMICOLON
+//
+// MessageText:
+//
+//  Manifest Parse Error : A semi colon character was expected.
+//
+#define ERROR_SXS_XML_E_MISSINGSEMICOLON 14039L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNBALANCEDPAREN
+//
+// MessageText:
+//
+//  Manifest Parse Error : Unbalanced parentheses.
+//
+#define ERROR_SXS_XML_E_UNBALANCEDPAREN  14040L
+
+//
+// MessageId: ERROR_SXS_XML_E_INTERNALERROR
+//
+// MessageText:
+//
+//  Manifest Parse Error : Internal error.
+//
+#define ERROR_SXS_XML_E_INTERNALERROR    14041L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE
+//
+// MessageText:
+//
+//  Manifest Parse Error : Whitespace is not allowed at this location.
+//
+#define ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE 14042L
+
+//
+// MessageId: ERROR_SXS_XML_E_INCOMPLETE_ENCODING
+//
+// MessageText:
+//
+//  Manifest Parse Error : End of file reached in invalid state for current encoding.
+//
+#define ERROR_SXS_XML_E_INCOMPLETE_ENCODING 14043L
+
+//
+// MessageId: ERROR_SXS_XML_E_MISSING_PAREN
+//
+// MessageText:
+//
+//  Manifest Parse Error : Missing parenthesis.
+//
+#define ERROR_SXS_XML_E_MISSING_PAREN    14044L
+
+//
+// MessageId: ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE
+//
+// MessageText:
+//
+//  Manifest Parse Error : A single or double closing quote character (\' or \") is missing.
+//
+#define ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE 14045L
+
+//
+// MessageId: ERROR_SXS_XML_E_MULTIPLE_COLONS
+//
+// MessageText:
+//
+//  Manifest Parse Error : Multiple colons are not allowed in a name.
+//
+#define ERROR_SXS_XML_E_MULTIPLE_COLONS  14046L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALID_DECIMAL
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid character for decimal digit.
+//
+#define ERROR_SXS_XML_E_INVALID_DECIMAL  14047L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALID_HEXIDECIMAL
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid character for hexidecimal digit.
+//
+#define ERROR_SXS_XML_E_INVALID_HEXIDECIMAL 14048L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALID_UNICODE
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid unicode character value for this platform.
+//
+#define ERROR_SXS_XML_E_INVALID_UNICODE  14049L
+
+//
+// MessageId: ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK
+//
+// MessageText:
+//
+//  Manifest Parse Error : Expecting whitespace or '?'.
+//
+#define ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK 14050L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNEXPECTEDENDTAG
+//
+// MessageText:
+//
+//  Manifest Parse Error : End tag was not expected at this location.
+//
+#define ERROR_SXS_XML_E_UNEXPECTEDENDTAG 14051L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDTAG
+//
+// MessageText:
+//
+//  Manifest Parse Error : The following tags were not closed: %1.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDTAG      14052L
+
+//
+// MessageId: ERROR_SXS_XML_E_DUPLICATEATTRIBUTE
+//
+// MessageText:
+//
+//  Manifest Parse Error : Duplicate attribute.
+//
+#define ERROR_SXS_XML_E_DUPLICATEATTRIBUTE 14053L
+
+//
+// MessageId: ERROR_SXS_XML_E_MULTIPLEROOTS
+//
+// MessageText:
+//
+//  Manifest Parse Error : Only one top level element is allowed in an XML document.
+//
+#define ERROR_SXS_XML_E_MULTIPLEROOTS    14054L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALIDATROOTLEVEL
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid at the top level of the document.
+//
+#define ERROR_SXS_XML_E_INVALIDATROOTLEVEL 14055L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADXMLDECL
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid xml declaration.
+//
+#define ERROR_SXS_XML_E_BADXMLDECL       14056L
+
+//
+// MessageId: ERROR_SXS_XML_E_MISSINGROOT
+//
+// MessageText:
+//
+//  Manifest Parse Error : XML document must have a top level element.
+//
+#define ERROR_SXS_XML_E_MISSINGROOT      14057L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNEXPECTEDEOF
+//
+// MessageText:
+//
+//  Manifest Parse Error : Unexpected end of file.
+//
+#define ERROR_SXS_XML_E_UNEXPECTEDEOF    14058L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADPEREFINSUBSET
+//
+// MessageText:
+//
+//  Manifest Parse Error : Parameter entities cannot be used inside markup declarations in an internal subset.
+//
+#define ERROR_SXS_XML_E_BADPEREFINSUBSET 14059L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDSTARTTAG
+//
+// MessageText:
+//
+//  Manifest Parse Error : Element was not closed.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDSTARTTAG 14060L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDENDTAG
+//
+// MessageText:
+//
+//  Manifest Parse Error : End element was missing the character '>'.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDENDTAG   14061L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDSTRING
+//
+// MessageText:
+//
+//  Manifest Parse Error : A string literal was not closed.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDSTRING   14062L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDCOMMENT
+//
+// MessageText:
+//
+//  Manifest Parse Error : A comment was not closed.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDCOMMENT  14063L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDDECL
+//
+// MessageText:
+//
+//  Manifest Parse Error : A declaration was not closed.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDDECL     14064L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNCLOSEDCDATA
+//
+// MessageText:
+//
+//  Manifest Parse Error : A CDATA section was not closed.
+//
+#define ERROR_SXS_XML_E_UNCLOSEDCDATA    14065L
+
+//
+// MessageId: ERROR_SXS_XML_E_RESERVEDNAMESPACE
+//
+// MessageText:
+//
+//  Manifest Parse Error : The namespace prefix is not allowed to start with the reserved string "xml".
+//
+#define ERROR_SXS_XML_E_RESERVEDNAMESPACE 14066L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALIDENCODING
+//
+// MessageText:
+//
+//  Manifest Parse Error : System does not support the specified encoding.
+//
+#define ERROR_SXS_XML_E_INVALIDENCODING  14067L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALIDSWITCH
+//
+// MessageText:
+//
+//  Manifest Parse Error : Switch from current encoding to specified encoding not supported.
+//
+#define ERROR_SXS_XML_E_INVALIDSWITCH    14068L
+
+//
+// MessageId: ERROR_SXS_XML_E_BADXMLCASE
+//
+// MessageText:
+//
+//  Manifest Parse Error : The name 'xml' is reserved and must be lower case.
+//
+#define ERROR_SXS_XML_E_BADXMLCASE       14069L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALID_STANDALONE
+//
+// MessageText:
+//
+//  Manifest Parse Error : The standalone attribute must have the value 'yes' or 'no'.
+//
+#define ERROR_SXS_XML_E_INVALID_STANDALONE 14070L
+
+//
+// MessageId: ERROR_SXS_XML_E_UNEXPECTED_STANDALONE
+//
+// MessageText:
+//
+//  Manifest Parse Error : The standalone attribute cannot be used in external entities.
+//
+#define ERROR_SXS_XML_E_UNEXPECTED_STANDALONE 14071L
+
+//
+// MessageId: ERROR_SXS_XML_E_INVALID_VERSION
+//
+// MessageText:
+//
+//  Manifest Parse Error : Invalid version number.
+//
+#define ERROR_SXS_XML_E_INVALID_VERSION  14072L
+
+//
+// MessageId: ERROR_SXS_XML_E_MISSINGEQUALS
+//
+// MessageText:
+//
+//  Manifest Parse Error : Missing equals sign between attribute and attribute value.
+//
+#define ERROR_SXS_XML_E_MISSINGEQUALS    14073L
+
+//
+// MessageId: ERROR_SXS_PROTECTION_RECOVERY_FAILED
+//
+// MessageText:
+//
+//  Assembly Protection Error : Unable to recover the specified assembly.
+//
+#define ERROR_SXS_PROTECTION_RECOVERY_FAILED 14074L
+
+//
+// MessageId: ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT
+//
+// MessageText:
+//
+//  Assembly Protection Error : The public key for an assembly was too short to be allowed.
+//
+#define ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT 14075L
+
+//
+// MessageId: ERROR_SXS_PROTECTION_CATALOG_NOT_VALID
+//
+// MessageText:
+//
+//  Assembly Protection Error : The catalog for an assembly is not valid, or does not match the assembly's manifest.
+//
+#define ERROR_SXS_PROTECTION_CATALOG_NOT_VALID 14076L
+
+//
+// MessageId: ERROR_SXS_UNTRANSLATABLE_HRESULT
+//
+// MessageText:
+//
+//  An HRESULT could not be translated to a corresponding Win32 error code.
+//
+#define ERROR_SXS_UNTRANSLATABLE_HRESULT 14077L
+
+//
+// MessageId: ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING
+//
+// MessageText:
+//
+//  Assembly Protection Error : The catalog for an assembly is missing.
+//
+#define ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING 14078L
+
+//
+// MessageId: ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE
+//
+// MessageText:
+//
+//  The supplied assembly identity is missing one or more attributes which must be present in this context.
+//
+#define ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE 14079L
+
+//
+// MessageId: ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME
+//
+// MessageText:
+//
+//  The supplied assembly identity has one or more attribute names that contain characters not permitted in XML names.
+//
+#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME 14080L
+
+
+///////////////////////////////////////////////////
+//                                               //
+//           End of Side By Side Error Codes     //
+//                                               //
+//                 14000 to 14999                //
+///////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////
+//                                               //
+//           Start of IPSec Error codes          //
+//                                               //
+//                 13000 to 13999                //
+///////////////////////////////////////////////////
+
+
+//
+// MessageId: ERROR_IPSEC_QM_POLICY_EXISTS
+//
+// MessageText:
+//
+//  The specified quick mode policy already exists.
+//
+#define ERROR_IPSEC_QM_POLICY_EXISTS     13000L
+
+//
+// MessageId: ERROR_IPSEC_QM_POLICY_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified quick mode policy was not found.
+//
+#define ERROR_IPSEC_QM_POLICY_NOT_FOUND  13001L
+
+//
+// MessageId: ERROR_IPSEC_QM_POLICY_IN_USE
+//
+// MessageText:
+//
+//  The specified quick mode policy is being used.
+//
+#define ERROR_IPSEC_QM_POLICY_IN_USE     13002L
+
+//
+// MessageId: ERROR_IPSEC_MM_POLICY_EXISTS
+//
+// MessageText:
+//
+//  The specified main mode policy already exists.
+//
+#define ERROR_IPSEC_MM_POLICY_EXISTS     13003L
+
+//
+// MessageId: ERROR_IPSEC_MM_POLICY_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified main mode policy was not found
+//
+#define ERROR_IPSEC_MM_POLICY_NOT_FOUND  13004L
+
+//
+// MessageId: ERROR_IPSEC_MM_POLICY_IN_USE
+//
+// MessageText:
+//
+//  The specified main mode policy is being used.
+//
+#define ERROR_IPSEC_MM_POLICY_IN_USE     13005L
+
+//
+// MessageId: ERROR_IPSEC_MM_FILTER_EXISTS
+//
+// MessageText:
+//
+//  The specified main mode filter already exists.
+//
+#define ERROR_IPSEC_MM_FILTER_EXISTS     13006L
+
+//
+// MessageId: ERROR_IPSEC_MM_FILTER_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified main mode filter was not found.
+//
+#define ERROR_IPSEC_MM_FILTER_NOT_FOUND  13007L
+
+//
+// MessageId: ERROR_IPSEC_TRANSPORT_FILTER_EXISTS
+//
+// MessageText:
+//
+//  The specified transport mode filter already exists.
+//
+#define ERROR_IPSEC_TRANSPORT_FILTER_EXISTS 13008L
+
+//
+// MessageId: ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified transport mode filter does not exist.
+//
+#define ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND 13009L
+
+//
+// MessageId: ERROR_IPSEC_MM_AUTH_EXISTS
+//
+// MessageText:
+//
+//  The specified main mode authentication list exists.
+//
+#define ERROR_IPSEC_MM_AUTH_EXISTS       13010L
+
+//
+// MessageId: ERROR_IPSEC_MM_AUTH_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified main mode authentication list was not found.
+//
+#define ERROR_IPSEC_MM_AUTH_NOT_FOUND    13011L
+
+//
+// MessageId: ERROR_IPSEC_MM_AUTH_IN_USE
+//
+// MessageText:
+//
+//  The specified quick mode policy is being used.
+//
+#define ERROR_IPSEC_MM_AUTH_IN_USE       13012L
+
+//
+// MessageId: ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified main mode policy was not found.
+//
+#define ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND 13013L
+
+//
+// MessageId: ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND
+//
+// MessageText:
+//
+//  The specified quick mode policy was not found
+//
+#define ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND 13014L
+
+//
+// MessageId: ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND
+//
+// MessageText:
+//
+//  The manifest file contains one or more syntax errors.
+//
+#define ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND 13015L
+
+//
+// MessageId: ERROR_IPSEC_TUNNEL_FILTER_EXISTS
+//
+// MessageText:
+//
+//  The application attempted to activate a disabled activation context.
+//
+#define ERROR_IPSEC_TUNNEL_FILTER_EXISTS 13016L
+
+//
+// MessageId: ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND
+//
+// MessageText:
+//
+//  The requested lookup key was not found in any active activation context.
+//
+#define ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND 13017L
+
+//
+// MessageId: ERROR_IPSEC_MM_FILTER_PENDING_DELETION
+//
+// MessageText:
+//
+//  The Main Mode filter is pending deletion.
+//
+#define ERROR_IPSEC_MM_FILTER_PENDING_DELETION 13018L
+
+//
+// MessageId: ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION
+//
+// MessageText:
+//
+//  The transport filter is pending deletion.
+//
+#define ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION 13019L
+
+//
+// MessageId: ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION
+//
+// MessageText:
+//
+//  The tunnel filter is pending deletion.
+//
+#define ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION 13020L
+
+//
+// MessageId: ERROR_IPSEC_MM_POLICY_PENDING_DELETION
+//
+// MessageText:
+//
+//  The Main Mode policy is pending deletion.
+//
+#define ERROR_IPSEC_MM_POLICY_PENDING_DELETION 13021L
+
+//
+// MessageId: ERROR_IPSEC_MM_AUTH_PENDING_DELETION
+//
+// MessageText:
+//
+//  The Main Mode authentication bundle is pending deletion.
+//
+#define ERROR_IPSEC_MM_AUTH_PENDING_DELETION 13022L
+
+//
+// MessageId: ERROR_IPSEC_QM_POLICY_PENDING_DELETION
+//
+// MessageText:
+//
+//  The Quick Mode policy is pending deletion.
+//
+#define ERROR_IPSEC_QM_POLICY_PENDING_DELETION 13023L
+
+//
+// MessageId: WARNING_IPSEC_MM_POLICY_PRUNED
+//
+// MessageText:
+//
+//  The Main Mode policy was successfully added, but some of the requested offers are not supported.
+//
+#define WARNING_IPSEC_MM_POLICY_PRUNED   13024L
+
+//
+// MessageId: WARNING_IPSEC_QM_POLICY_PRUNED
+//
+// MessageText:
+//
+//  The Quick Mode policy was successfully added, but some of the requested offers are not supported.
+//
+#define WARNING_IPSEC_QM_POLICY_PRUNED   13025L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NEG_STATUS_BEGIN
+//
+// MessageText:
+//
+//  ERROR_IPSEC_IKE_NEG_STATUS_BEGIN
+//
+#define ERROR_IPSEC_IKE_NEG_STATUS_BEGIN 13800L
+
+//
+// MessageId: ERROR_IPSEC_IKE_AUTH_FAIL
+//
+// MessageText:
+//
+//  IKE authentication credentials are unacceptable
+//
+#define ERROR_IPSEC_IKE_AUTH_FAIL        13801L
+
+//
+// MessageId: ERROR_IPSEC_IKE_ATTRIB_FAIL
+//
+// MessageText:
+//
+//  IKE security attributes are unacceptable
+//
+#define ERROR_IPSEC_IKE_ATTRIB_FAIL      13802L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NEGOTIATION_PENDING
+//
+// MessageText:
+//
+//  IKE Negotiation in progress
+//
+#define ERROR_IPSEC_IKE_NEGOTIATION_PENDING 13803L
+
+//
+// MessageId: ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR
+//
+// MessageText:
+//
+//  General processing error
+//
+#define ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR 13804L
+
+//
+// MessageId: ERROR_IPSEC_IKE_TIMED_OUT
+//
+// MessageText:
+//
+//  Negotiation timed out
+//
+#define ERROR_IPSEC_IKE_TIMED_OUT        13805L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NO_CERT
+//
+// MessageText:
+//
+//  IKE failed to find valid machine certificate
+//
+#define ERROR_IPSEC_IKE_NO_CERT          13806L
+
+//
+// MessageId: ERROR_IPSEC_IKE_SA_DELETED
+//
+// MessageText:
+//
+//  IKE SA deleted by peer before establishment completed
+//
+#define ERROR_IPSEC_IKE_SA_DELETED       13807L
+
+//
+// MessageId: ERROR_IPSEC_IKE_SA_REAPED
+//
+// MessageText:
+//
+//  IKE SA deleted before establishment completed
+//
+#define ERROR_IPSEC_IKE_SA_REAPED        13808L
+
+//
+// MessageId: ERROR_IPSEC_IKE_MM_ACQUIRE_DROP
+//
+// MessageText:
+//
+//  Negotiation request sat in Queue too long
+//
+#define ERROR_IPSEC_IKE_MM_ACQUIRE_DROP  13809L
+
+//
+// MessageId: ERROR_IPSEC_IKE_QM_ACQUIRE_DROP
+//
+// MessageText:
+//
+//  Negotiation request sat in Queue too long
+//
+#define ERROR_IPSEC_IKE_QM_ACQUIRE_DROP  13810L
+
+//
+// MessageId: ERROR_IPSEC_IKE_QUEUE_DROP_MM
+//
+// MessageText:
+//
+//  Negotiation request sat in Queue too long
+//
+#define ERROR_IPSEC_IKE_QUEUE_DROP_MM    13811L
+
+//
+// MessageId: ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM
+//
+// MessageText:
+//
+//  Negotiation request sat in Queue too long
+//
+#define ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM 13812L
+
+//
+// MessageId: ERROR_IPSEC_IKE_DROP_NO_RESPONSE
+//
+// MessageText:
+//
+//  No response from peer
+//
+#define ERROR_IPSEC_IKE_DROP_NO_RESPONSE 13813L
+
+//
+// MessageId: ERROR_IPSEC_IKE_MM_DELAY_DROP
+//
+// MessageText:
+//
+//  Negotiation took too long
+//
+#define ERROR_IPSEC_IKE_MM_DELAY_DROP    13814L
+
+//
+// MessageId: ERROR_IPSEC_IKE_QM_DELAY_DROP
+//
+// MessageText:
+//
+//  Negotiation took too long
+//
+#define ERROR_IPSEC_IKE_QM_DELAY_DROP    13815L
+
+//
+// MessageId: ERROR_IPSEC_IKE_ERROR
+//
+// MessageText:
+//
+//  Unknown error occurred
+//
+#define ERROR_IPSEC_IKE_ERROR            13816L
+
+//
+// MessageId: ERROR_IPSEC_IKE_CRL_FAILED
+//
+// MessageText:
+//
+//  Certificate Revocation Check failed
+//
+#define ERROR_IPSEC_IKE_CRL_FAILED       13817L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_KEY_USAGE
+//
+// MessageText:
+//
+//  Invalid certificate key usage
+//
+#define ERROR_IPSEC_IKE_INVALID_KEY_USAGE 13818L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_CERT_TYPE
+//
+// MessageText:
+//
+//  Invalid certificate type
+//
+#define ERROR_IPSEC_IKE_INVALID_CERT_TYPE 13819L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NO_PRIVATE_KEY
+//
+// MessageText:
+//
+//  No private key associated with machine certificate
+//
+#define ERROR_IPSEC_IKE_NO_PRIVATE_KEY   13820L
+
+//
+// MessageId: ERROR_IPSEC_IKE_DH_FAIL
+//
+// MessageText:
+//
+//  Failure in Diffie-Helman computation
+//
+#define ERROR_IPSEC_IKE_DH_FAIL          13822L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_HEADER
+//
+// MessageText:
+//
+//  Invalid header
+//
+#define ERROR_IPSEC_IKE_INVALID_HEADER   13824L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NO_POLICY
+//
+// MessageText:
+//
+//  No policy configured
+//
+#define ERROR_IPSEC_IKE_NO_POLICY        13825L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_SIGNATURE
+//
+// MessageText:
+//
+//  Failed to verify signature
+//
+#define ERROR_IPSEC_IKE_INVALID_SIGNATURE 13826L
+
+//
+// MessageId: ERROR_IPSEC_IKE_KERBEROS_ERROR
+//
+// MessageText:
+//
+//  Failed to authenticate using kerberos
+//
+#define ERROR_IPSEC_IKE_KERBEROS_ERROR   13827L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NO_PUBLIC_KEY
+//
+// MessageText:
+//
+//  Peer's certificate did not have a public key
+//
+#define ERROR_IPSEC_IKE_NO_PUBLIC_KEY    13828L
+
+// These must stay as a unit.
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR
+//
+// MessageText:
+//
+//  Error processing error payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR      13829L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_SA
+//
+// MessageText:
+//
+//  Error processing SA payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_SA   13830L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_PROP
+//
+// MessageText:
+//
+//  Error processing Proposal payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_PROP 13831L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_TRANS
+//
+// MessageText:
+//
+//  Error processing Transform payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_TRANS 13832L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_KE
+//
+// MessageText:
+//
+//  Error processing KE payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_KE   13833L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_ID
+//
+// MessageText:
+//
+//  Error processing ID payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_ID   13834L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_CERT
+//
+// MessageText:
+//
+//  Error processing Cert payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT 13835L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ
+//
+// MessageText:
+//
+//  Error processing Certificate Request payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ 13836L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_HASH
+//
+// MessageText:
+//
+//  Error processing Hash payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_HASH 13837L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_SIG
+//
+// MessageText:
+//
+//  Error processing Signature payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_SIG  13838L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_NONCE
+//
+// MessageText:
+//
+//  Error processing Nonce payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_NONCE 13839L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY
+//
+// MessageText:
+//
+//  Error processing Notify payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY 13840L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_DELETE
+//
+// MessageText:
+//
+//  Error processing Delete Payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_DELETE 13841L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR
+//
+// MessageText:
+//
+//  Error processing VendorId payload
+//
+#define ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR 13842L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_PAYLOAD
+//
+// MessageText:
+//
+//  Invalid payload received
+//
+#define ERROR_IPSEC_IKE_INVALID_PAYLOAD  13843L
+
+//
+// MessageId: ERROR_IPSEC_IKE_LOAD_SOFT_SA
+//
+// MessageText:
+//
+//  Soft SA loaded
+//
+#define ERROR_IPSEC_IKE_LOAD_SOFT_SA     13844L
+
+//
+// MessageId: ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN
+//
+// MessageText:
+//
+//  Soft SA torn down
+//
+#define ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN 13845L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_COOKIE
+//
+// MessageText:
+//
+//  Invalid cookie received.
+//
+#define ERROR_IPSEC_IKE_INVALID_COOKIE   13846L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NO_PEER_CERT
+//
+// MessageText:
+//
+//  Peer failed to send valid machine certificate
+//
+#define ERROR_IPSEC_IKE_NO_PEER_CERT     13847L
+
+//
+// MessageId: ERROR_IPSEC_IKE_PEER_CRL_FAILED
+//
+// MessageText:
+//
+//  Certification Revocation check of peer's certificate failed
+//
+#define ERROR_IPSEC_IKE_PEER_CRL_FAILED  13848L
+
+//
+// MessageId: ERROR_IPSEC_IKE_POLICY_CHANGE
+//
+// MessageText:
+//
+//  New policy invalidated SAs formed with old policy
+//
+#define ERROR_IPSEC_IKE_POLICY_CHANGE    13849L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NO_MM_POLICY
+//
+// MessageText:
+//
+//  There is no available Main Mode IKE policy.
+//
+#define ERROR_IPSEC_IKE_NO_MM_POLICY     13850L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NOTCBPRIV
+//
+// MessageText:
+//
+//  Failed to enabled TCB privilege.
+//
+#define ERROR_IPSEC_IKE_NOTCBPRIV        13851L
+
+//
+// MessageId: ERROR_IPSEC_IKE_SECLOADFAIL
+//
+// MessageText:
+//
+//  Failed to load SECURITY.DLL.
+//
+#define ERROR_IPSEC_IKE_SECLOADFAIL      13852L
+
+//
+// MessageId: ERROR_IPSEC_IKE_FAILSSPINIT
+//
+// MessageText:
+//
+//  Failed to obtain security function table dispatch address from SSPI.
+//
+#define ERROR_IPSEC_IKE_FAILSSPINIT      13853L
+
+//
+// MessageId: ERROR_IPSEC_IKE_FAILQUERYSSP
+//
+// MessageText:
+//
+//  Failed to query Kerberos package to obtain max token size.
+//
+#define ERROR_IPSEC_IKE_FAILQUERYSSP     13854L
+
+//
+// MessageId: ERROR_IPSEC_IKE_SRVACQFAIL
+//
+// MessageText:
+//
+//  Failed to obtain Kerberos server credentials for ISAKMP/ERROR_IPSEC_IKE service.  Kerberos authentication will not function.  The most likely reason for this is lack of domain membership.  This is normal if your computer is a member of a workgroup.
+//
+#define ERROR_IPSEC_IKE_SRVACQFAIL       13855L
+
+//
+// MessageId: ERROR_IPSEC_IKE_SRVQUERYCRED
+//
+// MessageText:
+//
+//  Failed to determine SSPI principal name for ISAKMP/ERROR_IPSEC_IKE service (QueryCredentialsAttributes).
+//
+#define ERROR_IPSEC_IKE_SRVQUERYCRED     13856L
+
+//
+// MessageId: ERROR_IPSEC_IKE_GETSPIFAIL
+//
+// MessageText:
+//
+//  Failed to obtain new SPI for the inbound SA from Ipsec driver.  The most common cause for this is that the driver does not have the correct filter.  Check your policy to verify the filters.
+//
+#define ERROR_IPSEC_IKE_GETSPIFAIL       13857L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_FILTER
+//
+// MessageText:
+//
+//  Given filter is invalid
+//
+#define ERROR_IPSEC_IKE_INVALID_FILTER   13858L
+
+//
+// MessageId: ERROR_IPSEC_IKE_OUT_OF_MEMORY
+//
+// MessageText:
+//
+//  Memory allocation failed.
+//
+#define ERROR_IPSEC_IKE_OUT_OF_MEMORY    13859L
+
+//
+// MessageId: ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED
+//
+// MessageText:
+//
+//  Failed to add Security Association to IPSec Driver.  The most common cause for this is if the IKE negotiation took too long to complete.  If the problem persists, reduce the load on the faulting machine.
+//
+#define ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED 13860L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_POLICY
+//
+// MessageText:
+//
+//  Invalid policy
+//
+#define ERROR_IPSEC_IKE_INVALID_POLICY   13861L
+
+//
+// MessageId: ERROR_IPSEC_IKE_UNKNOWN_DOI
+//
+// MessageText:
+//
+//  Invalid DOI
+//
+#define ERROR_IPSEC_IKE_UNKNOWN_DOI      13862L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_SITUATION
+//
+// MessageText:
+//
+//  Invalid situation
+//
+#define ERROR_IPSEC_IKE_INVALID_SITUATION 13863L
+
+//
+// MessageId: ERROR_IPSEC_IKE_DH_FAILURE
+//
+// MessageText:
+//
+//  Diffie-Hellman failure
+//
+#define ERROR_IPSEC_IKE_DH_FAILURE       13864L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_GROUP
+//
+// MessageText:
+//
+//  Invalid Diffie-Hellman group
+//
+#define ERROR_IPSEC_IKE_INVALID_GROUP    13865L
+
+//
+// MessageId: ERROR_IPSEC_IKE_ENCRYPT
+//
+// MessageText:
+//
+//  Error encrypting payload
+//
+#define ERROR_IPSEC_IKE_ENCRYPT          13866L
+
+//
+// MessageId: ERROR_IPSEC_IKE_DECRYPT
+//
+// MessageText:
+//
+//  Error decrypting payload
+//
+#define ERROR_IPSEC_IKE_DECRYPT          13867L
+
+//
+// MessageId: ERROR_IPSEC_IKE_POLICY_MATCH
+//
+// MessageText:
+//
+//  Policy match error
+//
+#define ERROR_IPSEC_IKE_POLICY_MATCH     13868L
+
+//
+// MessageId: ERROR_IPSEC_IKE_UNSUPPORTED_ID
+//
+// MessageText:
+//
+//  Unsupported ID
+//
+#define ERROR_IPSEC_IKE_UNSUPPORTED_ID   13869L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_HASH
+//
+// MessageText:
+//
+//  Hash verification failed
+//
+#define ERROR_IPSEC_IKE_INVALID_HASH     13870L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_HASH_ALG
+//
+// MessageText:
+//
+//  Invalid hash algorithm
+//
+#define ERROR_IPSEC_IKE_INVALID_HASH_ALG 13871L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_HASH_SIZE
+//
+// MessageText:
+//
+//  Invalid hash size
+//
+#define ERROR_IPSEC_IKE_INVALID_HASH_SIZE 13872L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG
+//
+// MessageText:
+//
+//  Invalid encryption algorithm
+//
+#define ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG 13873L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_AUTH_ALG
+//
+// MessageText:
+//
+//  Invalid authentication algorithm
+//
+#define ERROR_IPSEC_IKE_INVALID_AUTH_ALG 13874L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_SIG
+//
+// MessageText:
+//
+//  Invalid certificate signature
+//
+#define ERROR_IPSEC_IKE_INVALID_SIG      13875L
+
+//
+// MessageId: ERROR_IPSEC_IKE_LOAD_FAILED
+//
+// MessageText:
+//
+//  Load failed
+//
+#define ERROR_IPSEC_IKE_LOAD_FAILED      13876L
+
+//
+// MessageId: ERROR_IPSEC_IKE_RPC_DELETE
+//
+// MessageText:
+//
+//  Deleted via RPC call
+//
+#define ERROR_IPSEC_IKE_RPC_DELETE       13877L
+
+//
+// MessageId: ERROR_IPSEC_IKE_BENIGN_REINIT
+//
+// MessageText:
+//
+//  Temporary state created to perform reinit. This is not a real failure.
+//
+#define ERROR_IPSEC_IKE_BENIGN_REINIT    13878L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY
+//
+// MessageText:
+//
+//  The lifetime value received in the Responder Lifetime Notify is below the Windows 2000 configured minimum value.  Please fix the policy on the peer machine.
+//
+#define ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY 13879L
+
+//
+// MessageId: ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN
+//
+// MessageText:
+//
+//  Key length in certificate is too small for configured security requirements.
+//
+#define ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN 13881L
+
+//
+// MessageId: ERROR_IPSEC_IKE_MM_LIMIT
+//
+// MessageText:
+//
+//  Max number of established MM SAs to peer exceeded.
+//
+#define ERROR_IPSEC_IKE_MM_LIMIT         13882L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NEGOTIATION_DISABLED
+//
+// MessageText:
+//
+//  IKE received a policy that disables negotiation.
+//
+#define ERROR_IPSEC_IKE_NEGOTIATION_DISABLED 13883L
+
+//
+// MessageId: ERROR_IPSEC_IKE_NEG_STATUS_END
+//
+// MessageText:
+//
+//  ERROR_IPSEC_IKE_NEG_STATUS_END
+//
+#define ERROR_IPSEC_IKE_NEG_STATUS_END   13884L
+
+////////////////////////////////////
+//                                //
+//     COM Error Codes            //
+//                                //
+////////////////////////////////////
+
+//
+// The return value of COM functions and methods is an HRESULT.
+// This is not a handle to anything, but is merely a 32-bit value
+// with several fields encoded in the value.  The parts of an
+// HRESULT are shown below.
+//
+// Many of the macros and functions below were orginally defined to
+// operate on SCODEs.  SCODEs are no longer used.  The macros are
+// still present for compatibility and easy porting of Win16 code.
+// Newly written code should use the HRESULT macros and functions.
+//
+
+//
+//  HRESULTs are 32 bit values layed out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +-+-+-+-+-+---------------------+-------------------------------+
+//  |S|R|C|N|r|    Facility         |               Code            |
+//  +-+-+-+-+-+---------------------+-------------------------------+
+//
+//  where
+//
+//      S - Severity - indicates success/fail
+//
+//          0 - Success
+//          1 - Fail (COERROR)
+//
+//      R - reserved portion of the facility code, corresponds to NT's
+//              second severity bit.
+//
+//      C - reserved portion of the facility code, corresponds to NT's
+//              C field.
+//
+//      N - reserved portion of the facility code. Used to indicate a
+//              mapped NT status value.
+//
+//      r - reserved portion of the facility code. Reserved for internal
+//              use. Used to indicate HRESULT values that are not status
+//              values, but are instead message ids for display strings.
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+
+//
+// Severity values
+//
+
+#define SEVERITY_SUCCESS    0
+#define SEVERITY_ERROR      1
+
+
+//
+// Generic test for success on any status value (non-negative numbers
+// indicate success).
+//
+
+#define SUCCEEDED(Status) ((HRESULT)(Status) >= 0)
+
+//
+// and the inverse
+//
+
+#define FAILED(Status) ((HRESULT)(Status)<0)
+
+
+//
+// Generic test for error on any status value.
+//
+
+#define IS_ERROR(Status) ((unsigned long)(Status) >> 31 == SEVERITY_ERROR)
+
+//
+// Return the code
+//
+
+#define HRESULT_CODE(hr)    ((hr) & 0xFFFF)
+#define SCODE_CODE(sc)      ((sc) & 0xFFFF)
+
+//
+//  Return the facility
+//
+
+#define HRESULT_FACILITY(hr)  (((hr) >> 16) & 0x1fff)
+#define SCODE_FACILITY(sc)    (((sc) >> 16) & 0x1fff)
+
+//
+//  Return the severity
+//
+
+#define HRESULT_SEVERITY(hr)  (((hr) >> 31) & 0x1)
+#define SCODE_SEVERITY(sc)    (((sc) >> 31) & 0x1)
+
+//
+// Create an HRESULT value from component pieces
+//
+
+#define MAKE_HRESULT(sev,fac,code) \
+    ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+#define MAKE_SCODE(sev,fac,code) \
+    ((SCODE) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+
+
+//
+// Map a WIN32 error value into a HRESULT
+// Note: This assumes that WIN32 errors fall in the range -32k to 32k.
+//
+// Define bits here so macros are guaranteed to work
+
+#define FACILITY_NT_BIT                 0x10000000
+
+// __HRESULT_FROM_WIN32 will always be a macro.
+// The goal will be to enable INLINE_HRESULT_FROM_WIN32 all the time,
+// but there's too much code to change to do that at this time.
+
+#define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)))
+
+#ifdef INLINE_HRESULT_FROM_WIN32
+#ifndef _HRESULT_DEFINED
+#define _HRESULT_DEFINED
+typedef long HRESULT;
+#endif
+#ifndef __midl
+__inline HRESULT HRESULT_FROM_WIN32(long x) { return x <= 0 ? (HRESULT)x : (HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000);}
+#else
+#define HRESULT_FROM_WIN32(x) __HRESULT_FROM_WIN32(x)
+#endif
+#else
+#define HRESULT_FROM_WIN32(x) __HRESULT_FROM_WIN32(x)
+#endif
+
+//
+// Map an NT status value into a HRESULT
+//
+
+#define HRESULT_FROM_NT(x)      ((HRESULT) ((x) | FACILITY_NT_BIT))
+
+
+// ****** OBSOLETE functions
+
+// HRESULT functions
+// As noted above, these functions are obsolete and should not be used.
+
+
+// Extract the SCODE from a HRESULT
+
+#define GetScode(hr) ((SCODE) (hr))
+
+// Convert an SCODE into an HRESULT.
+
+#define ResultFromScode(sc) ((HRESULT) (sc))
+
+
+// PropagateResult is a noop
+#define PropagateResult(hrPrevious, scBase) ((HRESULT) scBase)
+
+
+// ****** End of OBSOLETE functions.
+
+
+// ---------------------- HRESULT value definitions -----------------
+//
+// HRESULT definitions
+//
+
+#ifdef RC_INVOKED
+#define _HRESULT_TYPEDEF_(_sc) _sc
+#else // RC_INVOKED
+#define _HRESULT_TYPEDEF_(_sc) ((HRESULT)_sc)
+#endif // RC_INVOKED
+
+#define NOERROR             0
+
+//
+// Error definitions follow
+//
+
+//
+// Codes 0x4000-0x40ff are reserved for OLE
+//
+//
+// Error codes
+//
+//
+// MessageId: E_UNEXPECTED
+//
+// MessageText:
+//
+//  Catastrophic failure
+//
+#define E_UNEXPECTED                     _HRESULT_TYPEDEF_(0x8000FFFFL)
+
+#if defined(_WIN32) && !defined(_MAC)
+//
+// MessageId: E_NOTIMPL
+//
+// MessageText:
+//
+//  Not implemented
+//
+#define E_NOTIMPL                        _HRESULT_TYPEDEF_(0x80004001L)
+
+//
+// MessageId: E_OUTOFMEMORY
+//
+// MessageText:
+//
+//  Ran out of memory
+//
+#define E_OUTOFMEMORY                    _HRESULT_TYPEDEF_(0x8007000EL)
+
+//
+// MessageId: E_INVALIDARG
+//
+// MessageText:
+//
+//  One or more arguments are invalid
+//
+#define E_INVALIDARG                     _HRESULT_TYPEDEF_(0x80070057L)
+
+//
+// MessageId: E_NOINTERFACE
+//
+// MessageText:
+//
+//  No such interface supported
+//
+#define E_NOINTERFACE                    _HRESULT_TYPEDEF_(0x80004002L)
+
+//
+// MessageId: E_POINTER
+//
+// MessageText:
+//
+//  Invalid pointer
+//
+#define E_POINTER                        _HRESULT_TYPEDEF_(0x80004003L)
+
+//
+// MessageId: E_HANDLE
+//
+// MessageText:
+//
+//  Invalid handle
+//
+#define E_HANDLE                         _HRESULT_TYPEDEF_(0x80070006L)
+
+//
+// MessageId: E_ABORT
+//
+// MessageText:
+//
+//  Operation aborted
+//
+#define E_ABORT                          _HRESULT_TYPEDEF_(0x80004004L)
+
+//
+// MessageId: E_FAIL
+//
+// MessageText:
+//
+//  Unspecified error
+//
+#define E_FAIL                           _HRESULT_TYPEDEF_(0x80004005L)
+
+//
+// MessageId: E_ACCESSDENIED
+//
+// MessageText:
+//
+//  General access denied error
+//
+#define E_ACCESSDENIED                   _HRESULT_TYPEDEF_(0x80070005L)
+
+#else
+//
+// MessageId: E_NOTIMPL
+//
+// MessageText:
+//
+//  Not implemented
+//
+#define E_NOTIMPL                        _HRESULT_TYPEDEF_(0x80000001L)
+
+//
+// MessageId: E_OUTOFMEMORY
+//
+// MessageText:
+//
+//  Ran out of memory
+//
+#define E_OUTOFMEMORY                    _HRESULT_TYPEDEF_(0x80000002L)
+
+//
+// MessageId: E_INVALIDARG
+//
+// MessageText:
+//
+//  One or more arguments are invalid
+//
+#define E_INVALIDARG                     _HRESULT_TYPEDEF_(0x80000003L)
+
+//
+// MessageId: E_NOINTERFACE
+//
+// MessageText:
+//
+//  No such interface supported
+//
+#define E_NOINTERFACE                    _HRESULT_TYPEDEF_(0x80000004L)
+
+//
+// MessageId: E_POINTER
+//
+// MessageText:
+//
+//  Invalid pointer
+//
+#define E_POINTER                        _HRESULT_TYPEDEF_(0x80000005L)
+
+//
+// MessageId: E_HANDLE
+//
+// MessageText:
+//
+//  Invalid handle
+//
+#define E_HANDLE                         _HRESULT_TYPEDEF_(0x80000006L)
+
+//
+// MessageId: E_ABORT
+//
+// MessageText:
+//
+//  Operation aborted
+//
+#define E_ABORT                          _HRESULT_TYPEDEF_(0x80000007L)
+
+//
+// MessageId: E_FAIL
+//
+// MessageText:
+//
+//  Unspecified error
+//
+#define E_FAIL                           _HRESULT_TYPEDEF_(0x80000008L)
+
+//
+// MessageId: E_ACCESSDENIED
+//
+// MessageText:
+//
+//  General access denied error
+//
+#define E_ACCESSDENIED                   _HRESULT_TYPEDEF_(0x80000009L)
+
+#endif //WIN32
+//
+// MessageId: E_PENDING
+//
+// MessageText:
+//
+//  The data necessary to complete this operation is not yet available.
+//
+#define E_PENDING                        _HRESULT_TYPEDEF_(0x8000000AL)
+
+//
+// MessageId: CO_E_INIT_TLS
+//
+// MessageText:
+//
+//  Thread local storage failure
+//
+#define CO_E_INIT_TLS                    _HRESULT_TYPEDEF_(0x80004006L)
+
+//
+// MessageId: CO_E_INIT_SHARED_ALLOCATOR
+//
+// MessageText:
+//
+//  Get shared memory allocator failure
+//
+#define CO_E_INIT_SHARED_ALLOCATOR       _HRESULT_TYPEDEF_(0x80004007L)
+
+//
+// MessageId: CO_E_INIT_MEMORY_ALLOCATOR
+//
+// MessageText:
+//
+//  Get memory allocator failure
+//
+#define CO_E_INIT_MEMORY_ALLOCATOR       _HRESULT_TYPEDEF_(0x80004008L)
+
+//
+// MessageId: CO_E_INIT_CLASS_CACHE
+//
+// MessageText:
+//
+//  Unable to initialize class cache
+//
+#define CO_E_INIT_CLASS_CACHE            _HRESULT_TYPEDEF_(0x80004009L)
+
+//
+// MessageId: CO_E_INIT_RPC_CHANNEL
+//
+// MessageText:
+//
+//  Unable to initialize RPC services
+//
+#define CO_E_INIT_RPC_CHANNEL            _HRESULT_TYPEDEF_(0x8000400AL)
+
+//
+// MessageId: CO_E_INIT_TLS_SET_CHANNEL_CONTROL
+//
+// MessageText:
+//
+//  Cannot set thread local storage channel control
+//
+#define CO_E_INIT_TLS_SET_CHANNEL_CONTROL _HRESULT_TYPEDEF_(0x8000400BL)
+
+//
+// MessageId: CO_E_INIT_TLS_CHANNEL_CONTROL
+//
+// MessageText:
+//
+//  Could not allocate thread local storage channel control
+//
+#define CO_E_INIT_TLS_CHANNEL_CONTROL    _HRESULT_TYPEDEF_(0x8000400CL)
+
+//
+// MessageId: CO_E_INIT_UNACCEPTED_USER_ALLOCATOR
+//
+// MessageText:
+//
+//  The user supplied memory allocator is unacceptable
+//
+#define CO_E_INIT_UNACCEPTED_USER_ALLOCATOR _HRESULT_TYPEDEF_(0x8000400DL)
+
+//
+// MessageId: CO_E_INIT_SCM_MUTEX_EXISTS
+//
+// MessageText:
+//
+//  The OLE service mutex already exists
+//
+#define CO_E_INIT_SCM_MUTEX_EXISTS       _HRESULT_TYPEDEF_(0x8000400EL)
+
+//
+// MessageId: CO_E_INIT_SCM_FILE_MAPPING_EXISTS
+//
+// MessageText:
+//
+//  The OLE service file mapping already exists
+//
+#define CO_E_INIT_SCM_FILE_MAPPING_EXISTS _HRESULT_TYPEDEF_(0x8000400FL)
+
+//
+// MessageId: CO_E_INIT_SCM_MAP_VIEW_OF_FILE
+//
+// MessageText:
+//
+//  Unable to map view of file for OLE service
+//
+#define CO_E_INIT_SCM_MAP_VIEW_OF_FILE   _HRESULT_TYPEDEF_(0x80004010L)
+
+//
+// MessageId: CO_E_INIT_SCM_EXEC_FAILURE
+//
+// MessageText:
+//
+//  Failure attempting to launch OLE service
+//
+#define CO_E_INIT_SCM_EXEC_FAILURE       _HRESULT_TYPEDEF_(0x80004011L)
+
+//
+// MessageId: CO_E_INIT_ONLY_SINGLE_THREADED
+//
+// MessageText:
+//
+//  There was an attempt to call CoInitialize a second time while single threaded
+//
+#define CO_E_INIT_ONLY_SINGLE_THREADED   _HRESULT_TYPEDEF_(0x80004012L)
+
+//
+// MessageId: CO_E_CANT_REMOTE
+//
+// MessageText:
+//
+//  A Remote activation was necessary but was not allowed
+//
+#define CO_E_CANT_REMOTE                 _HRESULT_TYPEDEF_(0x80004013L)
+
+//
+// MessageId: CO_E_BAD_SERVER_NAME
+//
+// MessageText:
+//
+//  A Remote activation was necessary but the server name provided was invalid
+//
+#define CO_E_BAD_SERVER_NAME             _HRESULT_TYPEDEF_(0x80004014L)
+
+//
+// MessageId: CO_E_WRONG_SERVER_IDENTITY
+//
+// MessageText:
+//
+//  The class is configured to run as a security id different from the caller
+//
+#define CO_E_WRONG_SERVER_IDENTITY       _HRESULT_TYPEDEF_(0x80004015L)
+
+//
+// MessageId: CO_E_OLE1DDE_DISABLED
+//
+// MessageText:
+//
+//  Use of Ole1 services requiring DDE windows is disabled
+//
+#define CO_E_OLE1DDE_DISABLED            _HRESULT_TYPEDEF_(0x80004016L)
+
+//
+// MessageId: CO_E_RUNAS_SYNTAX
+//
+// MessageText:
+//
+//  A RunAs specification must be <domain name>\<user name> or simply <user name>
+//
+#define CO_E_RUNAS_SYNTAX                _HRESULT_TYPEDEF_(0x80004017L)
+
+//
+// MessageId: CO_E_CREATEPROCESS_FAILURE
+//
+// MessageText:
+//
+//  The server process could not be started.  The pathname may be incorrect.
+//
+#define CO_E_CREATEPROCESS_FAILURE       _HRESULT_TYPEDEF_(0x80004018L)
+
+//
+// MessageId: CO_E_RUNAS_CREATEPROCESS_FAILURE
+//
+// MessageText:
+//
+//  The server process could not be started as the configured identity.  The pathname may be incorrect or unavailable.
+//
+#define CO_E_RUNAS_CREATEPROCESS_FAILURE _HRESULT_TYPEDEF_(0x80004019L)
+
+//
+// MessageId: CO_E_RUNAS_LOGON_FAILURE
+//
+// MessageText:
+//
+//  The server process could not be started because the configured identity is incorrect.  Check the username and password.
+//
+#define CO_E_RUNAS_LOGON_FAILURE         _HRESULT_TYPEDEF_(0x8000401AL)
+
+//
+// MessageId: CO_E_LAUNCH_PERMSSION_DENIED
+//
+// MessageText:
+//
+//  The client is not allowed to launch this server.
+//
+#define CO_E_LAUNCH_PERMSSION_DENIED     _HRESULT_TYPEDEF_(0x8000401BL)
+
+//
+// MessageId: CO_E_START_SERVICE_FAILURE
+//
+// MessageText:
+//
+//  The service providing this server could not be started.
+//
+#define CO_E_START_SERVICE_FAILURE       _HRESULT_TYPEDEF_(0x8000401CL)
+
+//
+// MessageId: CO_E_REMOTE_COMMUNICATION_FAILURE
+//
+// MessageText:
+//
+//  This computer was unable to communicate with the computer providing the server.
+//
+#define CO_E_REMOTE_COMMUNICATION_FAILURE _HRESULT_TYPEDEF_(0x8000401DL)
+
+//
+// MessageId: CO_E_SERVER_START_TIMEOUT
+//
+// MessageText:
+//
+//  The server did not respond after being launched.
+//
+#define CO_E_SERVER_START_TIMEOUT        _HRESULT_TYPEDEF_(0x8000401EL)
+
+//
+// MessageId: CO_E_CLSREG_INCONSISTENT
+//
+// MessageText:
+//
+//  The registration information for this server is inconsistent or incomplete.
+//
+#define CO_E_CLSREG_INCONSISTENT         _HRESULT_TYPEDEF_(0x8000401FL)
+
+//
+// MessageId: CO_E_IIDREG_INCONSISTENT
+//
+// MessageText:
+//
+//  The registration information for this interface is inconsistent or incomplete.
+//
+#define CO_E_IIDREG_INCONSISTENT         _HRESULT_TYPEDEF_(0x80004020L)
+
+//
+// MessageId: CO_E_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The operation attempted is not supported.
+//
+#define CO_E_NOT_SUPPORTED               _HRESULT_TYPEDEF_(0x80004021L)
+
+//
+// MessageId: CO_E_RELOAD_DLL
+//
+// MessageText:
+//
+//  A dll must be loaded.
+//
+#define CO_E_RELOAD_DLL                  _HRESULT_TYPEDEF_(0x80004022L)
+
+//
+// MessageId: CO_E_MSI_ERROR
+//
+// MessageText:
+//
+//  A Microsoft Software Installer error was encountered.
+//
+#define CO_E_MSI_ERROR                   _HRESULT_TYPEDEF_(0x80004023L)
+
+//
+// MessageId: CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT
+//
+// MessageText:
+//
+//  The specified activation could not occur in the client context as specified.
+//
+#define CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT _HRESULT_TYPEDEF_(0x80004024L)
+
+//
+// MessageId: CO_E_SERVER_PAUSED
+//
+// MessageText:
+//
+//  Activations on the server are paused.
+//
+#define CO_E_SERVER_PAUSED               _HRESULT_TYPEDEF_(0x80004025L)
+
+//
+// MessageId: CO_E_SERVER_NOT_PAUSED
+//
+// MessageText:
+//
+//  Activations on the server are not paused.
+//
+#define CO_E_SERVER_NOT_PAUSED           _HRESULT_TYPEDEF_(0x80004026L)
+
+//
+// MessageId: CO_E_CLASS_DISABLED
+//
+// MessageText:
+//
+//  The component or application containing the component has been disabled.
+//
+#define CO_E_CLASS_DISABLED              _HRESULT_TYPEDEF_(0x80004027L)
+
+//
+// MessageId: CO_E_CLRNOTAVAILABLE
+//
+// MessageText:
+//
+//  The common language runtime is not available
+//
+#define CO_E_CLRNOTAVAILABLE             _HRESULT_TYPEDEF_(0x80004028L)
+
+//
+// MessageId: CO_E_ASYNC_WORK_REJECTED
+//
+// MessageText:
+//
+//  The thread-pool rejected the submitted asynchronous work.
+//
+#define CO_E_ASYNC_WORK_REJECTED         _HRESULT_TYPEDEF_(0x80004029L)
+
+//
+// MessageId: CO_E_SERVER_INIT_TIMEOUT
+//
+// MessageText:
+//
+//  The server started, but did not finish initializing in a timely fashion.
+//
+#define CO_E_SERVER_INIT_TIMEOUT         _HRESULT_TYPEDEF_(0x8000402AL)
+
+//
+// MessageId: CO_E_NO_SECCTX_IN_ACTIVATE
+//
+// MessageText:
+//
+//  Unable to complete the call since there is no COM+ security context inside IObjectControl.Activate.
+//
+#define CO_E_NO_SECCTX_IN_ACTIVATE       _HRESULT_TYPEDEF_(0x8000402BL)
+
+//
+// MessageId: CO_E_TRACKER_CONFIG
+//
+// MessageText:
+//
+//  The provided tracker configuration is invalid
+//
+#define CO_E_TRACKER_CONFIG              _HRESULT_TYPEDEF_(0x80004030L)
+
+//
+// MessageId: CO_E_THREADPOOL_CONFIG
+//
+// MessageText:
+//
+//  The provided thread pool configuration is invalid
+//
+#define CO_E_THREADPOOL_CONFIG           _HRESULT_TYPEDEF_(0x80004031L)
+
+//
+// MessageId: CO_E_SXS_CONFIG
+//
+// MessageText:
+//
+//  The provided side-by-side configuration is invalid
+//
+#define CO_E_SXS_CONFIG                  _HRESULT_TYPEDEF_(0x80004032L)
+
+//
+// MessageId: CO_E_MALFORMED_SPN
+//
+// MessageText:
+//
+//  The server principal name (SPN) obtained during security negotiation is malformed.
+//
+#define CO_E_MALFORMED_SPN               _HRESULT_TYPEDEF_(0x80004033L)
+
+
+//
+// Success codes
+//
+#define S_OK                                   ((HRESULT)0x00000000L)
+#define S_FALSE                                ((HRESULT)0x00000001L)
+
+// ******************
+// FACILITY_ITF
+// ******************
+
+//
+// Codes 0x0-0x01ff are reserved for the OLE group of
+// interfaces.
+//
+
+
+//
+// Generic OLE errors that may be returned by many inerfaces
+//
+
+#define OLE_E_FIRST ((HRESULT)0x80040000L)
+#define OLE_E_LAST  ((HRESULT)0x800400FFL)
+#define OLE_S_FIRST ((HRESULT)0x00040000L)
+#define OLE_S_LAST  ((HRESULT)0x000400FFL)
+
+//
+// Old OLE errors
+//
+//
+// MessageId: OLE_E_OLEVERB
+//
+// MessageText:
+//
+//  Invalid OLEVERB structure
+//
+#define OLE_E_OLEVERB                    _HRESULT_TYPEDEF_(0x80040000L)
+
+//
+// MessageId: OLE_E_ADVF
+//
+// MessageText:
+//
+//  Invalid advise flags
+//
+#define OLE_E_ADVF                       _HRESULT_TYPEDEF_(0x80040001L)
+
+//
+// MessageId: OLE_E_ENUM_NOMORE
+//
+// MessageText:
+//
+//  Can't enumerate any more, because the associated data is missing
+//
+#define OLE_E_ENUM_NOMORE                _HRESULT_TYPEDEF_(0x80040002L)
+
+//
+// MessageId: OLE_E_ADVISENOTSUPPORTED
+//
+// MessageText:
+//
+//  This implementation doesn't take advises
+//
+#define OLE_E_ADVISENOTSUPPORTED         _HRESULT_TYPEDEF_(0x80040003L)
+
+//
+// MessageId: OLE_E_NOCONNECTION
+//
+// MessageText:
+//
+//  There is no connection for this connection ID
+//
+#define OLE_E_NOCONNECTION               _HRESULT_TYPEDEF_(0x80040004L)
+
+//
+// MessageId: OLE_E_NOTRUNNING
+//
+// MessageText:
+//
+//  Need to run the object to perform this operation
+//
+#define OLE_E_NOTRUNNING                 _HRESULT_TYPEDEF_(0x80040005L)
+
+//
+// MessageId: OLE_E_NOCACHE
+//
+// MessageText:
+//
+//  There is no cache to operate on
+//
+#define OLE_E_NOCACHE                    _HRESULT_TYPEDEF_(0x80040006L)
+
+//
+// MessageId: OLE_E_BLANK
+//
+// MessageText:
+//
+//  Uninitialized object
+//
+#define OLE_E_BLANK                      _HRESULT_TYPEDEF_(0x80040007L)
+
+//
+// MessageId: OLE_E_CLASSDIFF
+//
+// MessageText:
+//
+//  Linked object's source class has changed
+//
+#define OLE_E_CLASSDIFF                  _HRESULT_TYPEDEF_(0x80040008L)
+
+//
+// MessageId: OLE_E_CANT_GETMONIKER
+//
+// MessageText:
+//
+//  Not able to get the moniker of the object
+//
+#define OLE_E_CANT_GETMONIKER            _HRESULT_TYPEDEF_(0x80040009L)
+
+//
+// MessageId: OLE_E_CANT_BINDTOSOURCE
+//
+// MessageText:
+//
+//  Not able to bind to the source
+//
+#define OLE_E_CANT_BINDTOSOURCE          _HRESULT_TYPEDEF_(0x8004000AL)
+
+//
+// MessageId: OLE_E_STATIC
+//
+// MessageText:
+//
+//  Object is static; operation not allowed
+//
+#define OLE_E_STATIC                     _HRESULT_TYPEDEF_(0x8004000BL)
+
+//
+// MessageId: OLE_E_PROMPTSAVECANCELLED
+//
+// MessageText:
+//
+//  User canceled out of save dialog
+//
+#define OLE_E_PROMPTSAVECANCELLED        _HRESULT_TYPEDEF_(0x8004000CL)
+
+//
+// MessageId: OLE_E_INVALIDRECT
+//
+// MessageText:
+//
+//  Invalid rectangle
+//
+#define OLE_E_INVALIDRECT                _HRESULT_TYPEDEF_(0x8004000DL)
+
+//
+// MessageId: OLE_E_WRONGCOMPOBJ
+//
+// MessageText:
+//
+//  compobj.dll is too old for the ole2.dll initialized
+//
+#define OLE_E_WRONGCOMPOBJ               _HRESULT_TYPEDEF_(0x8004000EL)
+
+//
+// MessageId: OLE_E_INVALIDHWND
+//
+// MessageText:
+//
+//  Invalid window handle
+//
+#define OLE_E_INVALIDHWND                _HRESULT_TYPEDEF_(0x8004000FL)
+
+//
+// MessageId: OLE_E_NOT_INPLACEACTIVE
+//
+// MessageText:
+//
+//  Object is not in any of the inplace active states
+//
+#define OLE_E_NOT_INPLACEACTIVE          _HRESULT_TYPEDEF_(0x80040010L)
+
+//
+// MessageId: OLE_E_CANTCONVERT
+//
+// MessageText:
+//
+//  Not able to convert object
+//
+#define OLE_E_CANTCONVERT                _HRESULT_TYPEDEF_(0x80040011L)
+
+//
+// MessageId: OLE_E_NOSTORAGE
+//
+// MessageText:
+//
+//  Not able to perform the operation because object is not given storage yet
+//
+#define OLE_E_NOSTORAGE                  _HRESULT_TYPEDEF_(0x80040012L)
+
+//
+// MessageId: DV_E_FORMATETC
+//
+// MessageText:
+//
+//  Invalid FORMATETC structure
+//
+#define DV_E_FORMATETC                   _HRESULT_TYPEDEF_(0x80040064L)
+
+//
+// MessageId: DV_E_DVTARGETDEVICE
+//
+// MessageText:
+//
+//  Invalid DVTARGETDEVICE structure
+//
+#define DV_E_DVTARGETDEVICE              _HRESULT_TYPEDEF_(0x80040065L)
+
+//
+// MessageId: DV_E_STGMEDIUM
+//
+// MessageText:
+//
+//  Invalid STDGMEDIUM structure
+//
+#define DV_E_STGMEDIUM                   _HRESULT_TYPEDEF_(0x80040066L)
+
+//
+// MessageId: DV_E_STATDATA
+//
+// MessageText:
+//
+//  Invalid STATDATA structure
+//
+#define DV_E_STATDATA                    _HRESULT_TYPEDEF_(0x80040067L)
+
+//
+// MessageId: DV_E_LINDEX
+//
+// MessageText:
+//
+//  Invalid lindex
+//
+#define DV_E_LINDEX                      _HRESULT_TYPEDEF_(0x80040068L)
+
+//
+// MessageId: DV_E_TYMED
+//
+// MessageText:
+//
+//  Invalid tymed
+//
+#define DV_E_TYMED                       _HRESULT_TYPEDEF_(0x80040069L)
+
+//
+// MessageId: DV_E_CLIPFORMAT
+//
+// MessageText:
+//
+//  Invalid clipboard format
+//
+#define DV_E_CLIPFORMAT                  _HRESULT_TYPEDEF_(0x8004006AL)
+
+//
+// MessageId: DV_E_DVASPECT
+//
+// MessageText:
+//
+//  Invalid aspect(s)
+//
+#define DV_E_DVASPECT                    _HRESULT_TYPEDEF_(0x8004006BL)
+
+//
+// MessageId: DV_E_DVTARGETDEVICE_SIZE
+//
+// MessageText:
+//
+//  tdSize parameter of the DVTARGETDEVICE structure is invalid
+//
+#define DV_E_DVTARGETDEVICE_SIZE         _HRESULT_TYPEDEF_(0x8004006CL)
+
+//
+// MessageId: DV_E_NOIVIEWOBJECT
+//
+// MessageText:
+//
+//  Object doesn't support IViewObject interface
+//
+#define DV_E_NOIVIEWOBJECT               _HRESULT_TYPEDEF_(0x8004006DL)
+
+#define DRAGDROP_E_FIRST 0x80040100L
+#define DRAGDROP_E_LAST  0x8004010FL
+#define DRAGDROP_S_FIRST 0x00040100L
+#define DRAGDROP_S_LAST  0x0004010FL
+//
+// MessageId: DRAGDROP_E_NOTREGISTERED
+//
+// MessageText:
+//
+//  Trying to revoke a drop target that has not been registered
+//
+#define DRAGDROP_E_NOTREGISTERED         _HRESULT_TYPEDEF_(0x80040100L)
+
+//
+// MessageId: DRAGDROP_E_ALREADYREGISTERED
+//
+// MessageText:
+//
+//  This window has already been registered as a drop target
+//
+#define DRAGDROP_E_ALREADYREGISTERED     _HRESULT_TYPEDEF_(0x80040101L)
+
+//
+// MessageId: DRAGDROP_E_INVALIDHWND
+//
+// MessageText:
+//
+//  Invalid window handle
+//
+#define DRAGDROP_E_INVALIDHWND           _HRESULT_TYPEDEF_(0x80040102L)
+
+#define CLASSFACTORY_E_FIRST  0x80040110L
+#define CLASSFACTORY_E_LAST   0x8004011FL
+#define CLASSFACTORY_S_FIRST  0x00040110L
+#define CLASSFACTORY_S_LAST   0x0004011FL
+//
+// MessageId: CLASS_E_NOAGGREGATION
+//
+// MessageText:
+//
+//  Class does not support aggregation (or class object is remote)
+//
+#define CLASS_E_NOAGGREGATION            _HRESULT_TYPEDEF_(0x80040110L)
+
+//
+// MessageId: CLASS_E_CLASSNOTAVAILABLE
+//
+// MessageText:
+//
+//  ClassFactory cannot supply requested class
+//
+#define CLASS_E_CLASSNOTAVAILABLE        _HRESULT_TYPEDEF_(0x80040111L)
+
+//
+// MessageId: CLASS_E_NOTLICENSED
+//
+// MessageText:
+//
+//  Class is not licensed for use
+//
+#define CLASS_E_NOTLICENSED              _HRESULT_TYPEDEF_(0x80040112L)
+
+#define MARSHAL_E_FIRST  0x80040120L
+#define MARSHAL_E_LAST   0x8004012FL
+#define MARSHAL_S_FIRST  0x00040120L
+#define MARSHAL_S_LAST   0x0004012FL
+#define DATA_E_FIRST     0x80040130L
+#define DATA_E_LAST      0x8004013FL
+#define DATA_S_FIRST     0x00040130L
+#define DATA_S_LAST      0x0004013FL
+#define VIEW_E_FIRST     0x80040140L
+#define VIEW_E_LAST      0x8004014FL
+#define VIEW_S_FIRST     0x00040140L
+#define VIEW_S_LAST      0x0004014FL
+//
+// MessageId: VIEW_E_DRAW
+//
+// MessageText:
+//
+//  Error drawing view
+//
+#define VIEW_E_DRAW                      _HRESULT_TYPEDEF_(0x80040140L)
+
+#define REGDB_E_FIRST     0x80040150L
+#define REGDB_E_LAST      0x8004015FL
+#define REGDB_S_FIRST     0x00040150L
+#define REGDB_S_LAST      0x0004015FL
+//
+// MessageId: REGDB_E_READREGDB
+//
+// MessageText:
+//
+//  Could not read key from registry
+//
+#define REGDB_E_READREGDB                _HRESULT_TYPEDEF_(0x80040150L)
+
+//
+// MessageId: REGDB_E_WRITEREGDB
+//
+// MessageText:
+//
+//  Could not write key to registry
+//
+#define REGDB_E_WRITEREGDB               _HRESULT_TYPEDEF_(0x80040151L)
+
+//
+// MessageId: REGDB_E_KEYMISSING
+//
+// MessageText:
+//
+//  Could not find the key in the registry
+//
+#define REGDB_E_KEYMISSING               _HRESULT_TYPEDEF_(0x80040152L)
+
+//
+// MessageId: REGDB_E_INVALIDVALUE
+//
+// MessageText:
+//
+//  Invalid value for registry
+//
+#define REGDB_E_INVALIDVALUE             _HRESULT_TYPEDEF_(0x80040153L)
+
+//
+// MessageId: REGDB_E_CLASSNOTREG
+//
+// MessageText:
+//
+//  Class not registered
+//
+#define REGDB_E_CLASSNOTREG              _HRESULT_TYPEDEF_(0x80040154L)
+
+//
+// MessageId: REGDB_E_IIDNOTREG
+//
+// MessageText:
+//
+//  Interface not registered
+//
+#define REGDB_E_IIDNOTREG                _HRESULT_TYPEDEF_(0x80040155L)
+
+//
+// MessageId: REGDB_E_BADTHREADINGMODEL
+//
+// MessageText:
+//
+//  Threading model entry is not valid
+//
+#define REGDB_E_BADTHREADINGMODEL        _HRESULT_TYPEDEF_(0x80040156L)
+
+#define CAT_E_FIRST     0x80040160L
+#define CAT_E_LAST      0x80040161L
+//
+// MessageId: CAT_E_CATIDNOEXIST
+//
+// MessageText:
+//
+//  CATID does not exist
+//
+#define CAT_E_CATIDNOEXIST               _HRESULT_TYPEDEF_(0x80040160L)
+
+//
+// MessageId: CAT_E_NODESCRIPTION
+//
+// MessageText:
+//
+//  Description not found
+//
+#define CAT_E_NODESCRIPTION              _HRESULT_TYPEDEF_(0x80040161L)
+
+////////////////////////////////////
+//                                //
+//     Class Store Error Codes    //
+//                                //
+////////////////////////////////////
+#define CS_E_FIRST     0x80040164L
+#define CS_E_LAST      0x8004016FL
+//
+// MessageId: CS_E_PACKAGE_NOTFOUND
+//
+// MessageText:
+//
+//  No package in the software installation data in the Active Directory meets this criteria.
+//
+#define CS_E_PACKAGE_NOTFOUND            _HRESULT_TYPEDEF_(0x80040164L)
+
+//
+// MessageId: CS_E_NOT_DELETABLE
+//
+// MessageText:
+//
+//  Deleting this will break the referential integrity of the software installation data in the Active Directory.
+//
+#define CS_E_NOT_DELETABLE               _HRESULT_TYPEDEF_(0x80040165L)
+
+//
+// MessageId: CS_E_CLASS_NOTFOUND
+//
+// MessageText:
+//
+//  The CLSID was not found in the software installation data in the Active Directory.
+//
+#define CS_E_CLASS_NOTFOUND              _HRESULT_TYPEDEF_(0x80040166L)
+
+//
+// MessageId: CS_E_INVALID_VERSION
+//
+// MessageText:
+//
+//  The software installation data in the Active Directory is corrupt.
+//
+#define CS_E_INVALID_VERSION             _HRESULT_TYPEDEF_(0x80040167L)
+
+//
+// MessageId: CS_E_NO_CLASSSTORE
+//
+// MessageText:
+//
+//  There is no software installation data in the Active Directory.
+//
+#define CS_E_NO_CLASSSTORE               _HRESULT_TYPEDEF_(0x80040168L)
+
+//
+// MessageId: CS_E_OBJECT_NOTFOUND
+//
+// MessageText:
+//
+//  There is no software installation data object in the Active Directory.
+//
+#define CS_E_OBJECT_NOTFOUND             _HRESULT_TYPEDEF_(0x80040169L)
+
+//
+// MessageId: CS_E_OBJECT_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The software installation data object in the Active Directory already exists.
+//
+#define CS_E_OBJECT_ALREADY_EXISTS       _HRESULT_TYPEDEF_(0x8004016AL)
+
+//
+// MessageId: CS_E_INVALID_PATH
+//
+// MessageText:
+//
+//  The path to the software installation data in the Active Directory is not correct.
+//
+#define CS_E_INVALID_PATH                _HRESULT_TYPEDEF_(0x8004016BL)
+
+//
+// MessageId: CS_E_NETWORK_ERROR
+//
+// MessageText:
+//
+//  A network error interrupted the operation.
+//
+#define CS_E_NETWORK_ERROR               _HRESULT_TYPEDEF_(0x8004016CL)
+
+//
+// MessageId: CS_E_ADMIN_LIMIT_EXCEEDED
+//
+// MessageText:
+//
+//  The size of this object exceeds the maximum size set by the Administrator.
+//
+#define CS_E_ADMIN_LIMIT_EXCEEDED        _HRESULT_TYPEDEF_(0x8004016DL)
+
+//
+// MessageId: CS_E_SCHEMA_MISMATCH
+//
+// MessageText:
+//
+//  The schema for the software installation data in the Active Directory does not match the required schema.
+//
+#define CS_E_SCHEMA_MISMATCH             _HRESULT_TYPEDEF_(0x8004016EL)
+
+//
+// MessageId: CS_E_INTERNAL_ERROR
+//
+// MessageText:
+//
+//  An error occurred in the software installation data in the Active Directory.
+//
+#define CS_E_INTERNAL_ERROR              _HRESULT_TYPEDEF_(0x8004016FL)
+
+#define CACHE_E_FIRST     0x80040170L
+#define CACHE_E_LAST      0x8004017FL
+#define CACHE_S_FIRST     0x00040170L
+#define CACHE_S_LAST      0x0004017FL
+//
+// MessageId: CACHE_E_NOCACHE_UPDATED
+//
+// MessageText:
+//
+//  Cache not updated
+//
+#define CACHE_E_NOCACHE_UPDATED          _HRESULT_TYPEDEF_(0x80040170L)
+
+#define OLEOBJ_E_FIRST     0x80040180L
+#define OLEOBJ_E_LAST      0x8004018FL
+#define OLEOBJ_S_FIRST     0x00040180L
+#define OLEOBJ_S_LAST      0x0004018FL
+//
+// MessageId: OLEOBJ_E_NOVERBS
+//
+// MessageText:
+//
+//  No verbs for OLE object
+//
+#define OLEOBJ_E_NOVERBS                 _HRESULT_TYPEDEF_(0x80040180L)
+
+//
+// MessageId: OLEOBJ_E_INVALIDVERB
+//
+// MessageText:
+//
+//  Invalid verb for OLE object
+//
+#define OLEOBJ_E_INVALIDVERB             _HRESULT_TYPEDEF_(0x80040181L)
+
+#define CLIENTSITE_E_FIRST     0x80040190L
+#define CLIENTSITE_E_LAST      0x8004019FL
+#define CLIENTSITE_S_FIRST     0x00040190L
+#define CLIENTSITE_S_LAST      0x0004019FL
+//
+// MessageId: INPLACE_E_NOTUNDOABLE
+//
+// MessageText:
+//
+//  Undo is not available
+//
+#define INPLACE_E_NOTUNDOABLE            _HRESULT_TYPEDEF_(0x800401A0L)
+
+//
+// MessageId: INPLACE_E_NOTOOLSPACE
+//
+// MessageText:
+//
+//  Space for tools is not available
+//
+#define INPLACE_E_NOTOOLSPACE            _HRESULT_TYPEDEF_(0x800401A1L)
+
+#define INPLACE_E_FIRST     0x800401A0L
+#define INPLACE_E_LAST      0x800401AFL
+#define INPLACE_S_FIRST     0x000401A0L
+#define INPLACE_S_LAST      0x000401AFL
+#define ENUM_E_FIRST        0x800401B0L
+#define ENUM_E_LAST         0x800401BFL
+#define ENUM_S_FIRST        0x000401B0L
+#define ENUM_S_LAST         0x000401BFL
+#define CONVERT10_E_FIRST        0x800401C0L
+#define CONVERT10_E_LAST         0x800401CFL
+#define CONVERT10_S_FIRST        0x000401C0L
+#define CONVERT10_S_LAST         0x000401CFL
+//
+// MessageId: CONVERT10_E_OLESTREAM_GET
+//
+// MessageText:
+//
+//  OLESTREAM Get method failed
+//
+#define CONVERT10_E_OLESTREAM_GET        _HRESULT_TYPEDEF_(0x800401C0L)
+
+//
+// MessageId: CONVERT10_E_OLESTREAM_PUT
+//
+// MessageText:
+//
+//  OLESTREAM Put method failed
+//
+#define CONVERT10_E_OLESTREAM_PUT        _HRESULT_TYPEDEF_(0x800401C1L)
+
+//
+// MessageId: CONVERT10_E_OLESTREAM_FMT
+//
+// MessageText:
+//
+//  Contents of the OLESTREAM not in correct format
+//
+#define CONVERT10_E_OLESTREAM_FMT        _HRESULT_TYPEDEF_(0x800401C2L)
+
+//
+// MessageId: CONVERT10_E_OLESTREAM_BITMAP_TO_DIB
+//
+// MessageText:
+//
+//  There was an error in a Windows GDI call while converting the bitmap to a DIB
+//
+#define CONVERT10_E_OLESTREAM_BITMAP_TO_DIB _HRESULT_TYPEDEF_(0x800401C3L)
+
+//
+// MessageId: CONVERT10_E_STG_FMT
+//
+// MessageText:
+//
+//  Contents of the IStorage not in correct format
+//
+#define CONVERT10_E_STG_FMT              _HRESULT_TYPEDEF_(0x800401C4L)
+
+//
+// MessageId: CONVERT10_E_STG_NO_STD_STREAM
+//
+// MessageText:
+//
+//  Contents of IStorage is missing one of the standard streams
+//
+#define CONVERT10_E_STG_NO_STD_STREAM    _HRESULT_TYPEDEF_(0x800401C5L)
+
+//
+// MessageId: CONVERT10_E_STG_DIB_TO_BITMAP
+//
+// MessageText:
+//
+//  There was an error in a Windows GDI call while converting the DIB to a bitmap.
+//  
+//
+#define CONVERT10_E_STG_DIB_TO_BITMAP    _HRESULT_TYPEDEF_(0x800401C6L)
+
+#define CLIPBRD_E_FIRST        0x800401D0L
+#define CLIPBRD_E_LAST         0x800401DFL
+#define CLIPBRD_S_FIRST        0x000401D0L
+#define CLIPBRD_S_LAST         0x000401DFL
+//
+// MessageId: CLIPBRD_E_CANT_OPEN
+//
+// MessageText:
+//
+//  OpenClipboard Failed
+//
+#define CLIPBRD_E_CANT_OPEN              _HRESULT_TYPEDEF_(0x800401D0L)
+
+//
+// MessageId: CLIPBRD_E_CANT_EMPTY
+//
+// MessageText:
+//
+//  EmptyClipboard Failed
+//
+#define CLIPBRD_E_CANT_EMPTY             _HRESULT_TYPEDEF_(0x800401D1L)
+
+//
+// MessageId: CLIPBRD_E_CANT_SET
+//
+// MessageText:
+//
+//  SetClipboard Failed
+//
+#define CLIPBRD_E_CANT_SET               _HRESULT_TYPEDEF_(0x800401D2L)
+
+//
+// MessageId: CLIPBRD_E_BAD_DATA
+//
+// MessageText:
+//
+//  Data on clipboard is invalid
+//
+#define CLIPBRD_E_BAD_DATA               _HRESULT_TYPEDEF_(0x800401D3L)
+
+//
+// MessageId: CLIPBRD_E_CANT_CLOSE
+//
+// MessageText:
+//
+//  CloseClipboard Failed
+//
+#define CLIPBRD_E_CANT_CLOSE             _HRESULT_TYPEDEF_(0x800401D4L)
+
+#define MK_E_FIRST        0x800401E0L
+#define MK_E_LAST         0x800401EFL
+#define MK_S_FIRST        0x000401E0L
+#define MK_S_LAST         0x000401EFL
+//
+// MessageId: MK_E_CONNECTMANUALLY
+//
+// MessageText:
+//
+//  Moniker needs to be connected manually
+//
+#define MK_E_CONNECTMANUALLY             _HRESULT_TYPEDEF_(0x800401E0L)
+
+//
+// MessageId: MK_E_EXCEEDEDDEADLINE
+//
+// MessageText:
+//
+//  Operation exceeded deadline
+//
+#define MK_E_EXCEEDEDDEADLINE            _HRESULT_TYPEDEF_(0x800401E1L)
+
+//
+// MessageId: MK_E_NEEDGENERIC
+//
+// MessageText:
+//
+//  Moniker needs to be generic
+//
+#define MK_E_NEEDGENERIC                 _HRESULT_TYPEDEF_(0x800401E2L)
+
+//
+// MessageId: MK_E_UNAVAILABLE
+//
+// MessageText:
+//
+//  Operation unavailable
+//
+#define MK_E_UNAVAILABLE                 _HRESULT_TYPEDEF_(0x800401E3L)
+
+//
+// MessageId: MK_E_SYNTAX
+//
+// MessageText:
+//
+//  Invalid syntax
+//
+#define MK_E_SYNTAX                      _HRESULT_TYPEDEF_(0x800401E4L)
+
+//
+// MessageId: MK_E_NOOBJECT
+//
+// MessageText:
+//
+//  No object for moniker
+//
+#define MK_E_NOOBJECT                    _HRESULT_TYPEDEF_(0x800401E5L)
+
+//
+// MessageId: MK_E_INVALIDEXTENSION
+//
+// MessageText:
+//
+//  Bad extension for file
+//
+#define MK_E_INVALIDEXTENSION            _HRESULT_TYPEDEF_(0x800401E6L)
+
+//
+// MessageId: MK_E_INTERMEDIATEINTERFACENOTSUPPORTED
+//
+// MessageText:
+//
+//  Intermediate operation failed
+//
+#define MK_E_INTERMEDIATEINTERFACENOTSUPPORTED _HRESULT_TYPEDEF_(0x800401E7L)
+
+//
+// MessageId: MK_E_NOTBINDABLE
+//
+// MessageText:
+//
+//  Moniker is not bindable
+//
+#define MK_E_NOTBINDABLE                 _HRESULT_TYPEDEF_(0x800401E8L)
+
+//
+// MessageId: MK_E_NOTBOUND
+//
+// MessageText:
+//
+//  Moniker is not bound
+//
+#define MK_E_NOTBOUND                    _HRESULT_TYPEDEF_(0x800401E9L)
+
+//
+// MessageId: MK_E_CANTOPENFILE
+//
+// MessageText:
+//
+//  Moniker cannot open file
+//
+#define MK_E_CANTOPENFILE                _HRESULT_TYPEDEF_(0x800401EAL)
+
+//
+// MessageId: MK_E_MUSTBOTHERUSER
+//
+// MessageText:
+//
+//  User input required for operation to succeed
+//
+#define MK_E_MUSTBOTHERUSER              _HRESULT_TYPEDEF_(0x800401EBL)
+
+//
+// MessageId: MK_E_NOINVERSE
+//
+// MessageText:
+//
+//  Moniker class has no inverse
+//
+#define MK_E_NOINVERSE                   _HRESULT_TYPEDEF_(0x800401ECL)
+
+//
+// MessageId: MK_E_NOSTORAGE
+//
+// MessageText:
+//
+//  Moniker does not refer to storage
+//
+#define MK_E_NOSTORAGE                   _HRESULT_TYPEDEF_(0x800401EDL)
+
+//
+// MessageId: MK_E_NOPREFIX
+//
+// MessageText:
+//
+//  No common prefix
+//
+#define MK_E_NOPREFIX                    _HRESULT_TYPEDEF_(0x800401EEL)
+
+//
+// MessageId: MK_E_ENUMERATION_FAILED
+//
+// MessageText:
+//
+//  Moniker could not be enumerated
+//
+#define MK_E_ENUMERATION_FAILED          _HRESULT_TYPEDEF_(0x800401EFL)
+
+#define CO_E_FIRST        0x800401F0L
+#define CO_E_LAST         0x800401FFL
+#define CO_S_FIRST        0x000401F0L
+#define CO_S_LAST         0x000401FFL
+//
+// MessageId: CO_E_NOTINITIALIZED
+//
+// MessageText:
+//
+//  CoInitialize has not been called.
+//
+#define CO_E_NOTINITIALIZED              _HRESULT_TYPEDEF_(0x800401F0L)
+
+//
+// MessageId: CO_E_ALREADYINITIALIZED
+//
+// MessageText:
+//
+//  CoInitialize has already been called.
+//
+#define CO_E_ALREADYINITIALIZED          _HRESULT_TYPEDEF_(0x800401F1L)
+
+//
+// MessageId: CO_E_CANTDETERMINECLASS
+//
+// MessageText:
+//
+//  Class of object cannot be determined
+//
+#define CO_E_CANTDETERMINECLASS          _HRESULT_TYPEDEF_(0x800401F2L)
+
+//
+// MessageId: CO_E_CLASSSTRING
+//
+// MessageText:
+//
+//  Invalid class string
+//
+#define CO_E_CLASSSTRING                 _HRESULT_TYPEDEF_(0x800401F3L)
+
+//
+// MessageId: CO_E_IIDSTRING
+//
+// MessageText:
+//
+//  Invalid interface string
+//
+#define CO_E_IIDSTRING                   _HRESULT_TYPEDEF_(0x800401F4L)
+
+//
+// MessageId: CO_E_APPNOTFOUND
+//
+// MessageText:
+//
+//  Application not found
+//
+#define CO_E_APPNOTFOUND                 _HRESULT_TYPEDEF_(0x800401F5L)
+
+//
+// MessageId: CO_E_APPSINGLEUSE
+//
+// MessageText:
+//
+//  Application cannot be run more than once
+//
+#define CO_E_APPSINGLEUSE                _HRESULT_TYPEDEF_(0x800401F6L)
+
+//
+// MessageId: CO_E_ERRORINAPP
+//
+// MessageText:
+//
+//  Some error in application program
+//
+#define CO_E_ERRORINAPP                  _HRESULT_TYPEDEF_(0x800401F7L)
+
+//
+// MessageId: CO_E_DLLNOTFOUND
+//
+// MessageText:
+//
+//  DLL for class not found
+//
+#define CO_E_DLLNOTFOUND                 _HRESULT_TYPEDEF_(0x800401F8L)
+
+//
+// MessageId: CO_E_ERRORINDLL
+//
+// MessageText:
+//
+//  Error in the DLL
+//
+#define CO_E_ERRORINDLL                  _HRESULT_TYPEDEF_(0x800401F9L)
+
+//
+// MessageId: CO_E_WRONGOSFORAPP
+//
+// MessageText:
+//
+//  Wrong OS or OS version for application
+//
+#define CO_E_WRONGOSFORAPP               _HRESULT_TYPEDEF_(0x800401FAL)
+
+//
+// MessageId: CO_E_OBJNOTREG
+//
+// MessageText:
+//
+//  Object is not registered
+//
+#define CO_E_OBJNOTREG                   _HRESULT_TYPEDEF_(0x800401FBL)
+
+//
+// MessageId: CO_E_OBJISREG
+//
+// MessageText:
+//
+//  Object is already registered
+//
+#define CO_E_OBJISREG                    _HRESULT_TYPEDEF_(0x800401FCL)
+
+//
+// MessageId: CO_E_OBJNOTCONNECTED
+//
+// MessageText:
+//
+//  Object is not connected to server
+//
+#define CO_E_OBJNOTCONNECTED             _HRESULT_TYPEDEF_(0x800401FDL)
+
+//
+// MessageId: CO_E_APPDIDNTREG
+//
+// MessageText:
+//
+//  Application was launched but it didn't register a class factory
+//
+#define CO_E_APPDIDNTREG                 _HRESULT_TYPEDEF_(0x800401FEL)
+
+//
+// MessageId: CO_E_RELEASED
+//
+// MessageText:
+//
+//  Object has been released
+//
+#define CO_E_RELEASED                    _HRESULT_TYPEDEF_(0x800401FFL)
+
+#define EVENT_E_FIRST        0x80040200L
+#define EVENT_E_LAST         0x8004021FL
+#define EVENT_S_FIRST        0x00040200L
+#define EVENT_S_LAST         0x0004021FL
+//
+// MessageId: EVENT_S_SOME_SUBSCRIBERS_FAILED
+//
+// MessageText:
+//
+//  An event was able to invoke some but not all of the subscribers
+//
+#define EVENT_S_SOME_SUBSCRIBERS_FAILED  _HRESULT_TYPEDEF_(0x00040200L)
+
+//
+// MessageId: EVENT_E_ALL_SUBSCRIBERS_FAILED
+//
+// MessageText:
+//
+//  An event was unable to invoke any of the subscribers
+//
+#define EVENT_E_ALL_SUBSCRIBERS_FAILED   _HRESULT_TYPEDEF_(0x80040201L)
+
+//
+// MessageId: EVENT_S_NOSUBSCRIBERS
+//
+// MessageText:
+//
+//  An event was delivered but there were no subscribers
+//
+#define EVENT_S_NOSUBSCRIBERS            _HRESULT_TYPEDEF_(0x00040202L)
+
+//
+// MessageId: EVENT_E_QUERYSYNTAX
+//
+// MessageText:
+//
+//  A syntax error occurred trying to evaluate a query string
+//
+#define EVENT_E_QUERYSYNTAX              _HRESULT_TYPEDEF_(0x80040203L)
+
+//
+// MessageId: EVENT_E_QUERYFIELD
+//
+// MessageText:
+//
+//  An invalid field name was used in a query string
+//
+#define EVENT_E_QUERYFIELD               _HRESULT_TYPEDEF_(0x80040204L)
+
+//
+// MessageId: EVENT_E_INTERNALEXCEPTION
+//
+// MessageText:
+//
+//  An unexpected exception was raised
+//
+#define EVENT_E_INTERNALEXCEPTION        _HRESULT_TYPEDEF_(0x80040205L)
+
+//
+// MessageId: EVENT_E_INTERNALERROR
+//
+// MessageText:
+//
+//  An unexpected internal error was detected
+//
+#define EVENT_E_INTERNALERROR            _HRESULT_TYPEDEF_(0x80040206L)
+
+//
+// MessageId: EVENT_E_INVALID_PER_USER_SID
+//
+// MessageText:
+//
+//  The owner SID on a per-user subscription doesn't exist
+//
+#define EVENT_E_INVALID_PER_USER_SID     _HRESULT_TYPEDEF_(0x80040207L)
+
+//
+// MessageId: EVENT_E_USER_EXCEPTION
+//
+// MessageText:
+//
+//  A user-supplied component or subscriber raised an exception
+//
+#define EVENT_E_USER_EXCEPTION           _HRESULT_TYPEDEF_(0x80040208L)
+
+//
+// MessageId: EVENT_E_TOO_MANY_METHODS
+//
+// MessageText:
+//
+//  An interface has too many methods to fire events from
+//
+#define EVENT_E_TOO_MANY_METHODS         _HRESULT_TYPEDEF_(0x80040209L)
+
+//
+// MessageId: EVENT_E_MISSING_EVENTCLASS
+//
+// MessageText:
+//
+//  A subscription cannot be stored unless its event class already exists
+//
+#define EVENT_E_MISSING_EVENTCLASS       _HRESULT_TYPEDEF_(0x8004020AL)
+
+//
+// MessageId: EVENT_E_NOT_ALL_REMOVED
+//
+// MessageText:
+//
+//  Not all the objects requested could be removed
+//
+#define EVENT_E_NOT_ALL_REMOVED          _HRESULT_TYPEDEF_(0x8004020BL)
+
+//
+// MessageId: EVENT_E_COMPLUS_NOT_INSTALLED
+//
+// MessageText:
+//
+//  COM+ is required for this operation, but is not installed
+//
+#define EVENT_E_COMPLUS_NOT_INSTALLED    _HRESULT_TYPEDEF_(0x8004020CL)
+
+//
+// MessageId: EVENT_E_CANT_MODIFY_OR_DELETE_UNCONFIGURED_OBJECT
+//
+// MessageText:
+//
+//  Cannot modify or delete an object that was not added using the COM+ Admin SDK
+//
+#define EVENT_E_CANT_MODIFY_OR_DELETE_UNCONFIGURED_OBJECT _HRESULT_TYPEDEF_(0x8004020DL)
+
+//
+// MessageId: EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT
+//
+// MessageText:
+//
+//  Cannot modify or delete an object that was added using the COM+ Admin SDK
+//
+#define EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT _HRESULT_TYPEDEF_(0x8004020EL)
+
+//
+// MessageId: EVENT_E_INVALID_EVENT_CLASS_PARTITION
+//
+// MessageText:
+//
+//  The event class for this subscription is in an invalid partition
+//
+#define EVENT_E_INVALID_EVENT_CLASS_PARTITION _HRESULT_TYPEDEF_(0x8004020FL)
+
+//
+// MessageId: EVENT_E_PER_USER_SID_NOT_LOGGED_ON
+//
+// MessageText:
+//
+//  The owner of the PerUser subscription is not logged on to the system specified
+//
+#define EVENT_E_PER_USER_SID_NOT_LOGGED_ON _HRESULT_TYPEDEF_(0x80040210L)
+
+#define XACT_E_FIRST   0x8004D000
+#define XACT_E_LAST    0x8004D029
+#define XACT_S_FIRST   0x0004D000
+#define XACT_S_LAST    0x0004D010
+//
+// MessageId: XACT_E_ALREADYOTHERSINGLEPHASE
+//
+// MessageText:
+//
+//  Another single phase resource manager has already been enlisted in this transaction.
+//
+#define XACT_E_ALREADYOTHERSINGLEPHASE   _HRESULT_TYPEDEF_(0x8004D000L)
+
+//
+// MessageId: XACT_E_CANTRETAIN
+//
+// MessageText:
+//
+//  A retaining commit or abort is not supported
+//
+#define XACT_E_CANTRETAIN                _HRESULT_TYPEDEF_(0x8004D001L)
+
+//
+// MessageId: XACT_E_COMMITFAILED
+//
+// MessageText:
+//
+//  The transaction failed to commit for an unknown reason. The transaction was aborted.
+//
+#define XACT_E_COMMITFAILED              _HRESULT_TYPEDEF_(0x8004D002L)
+
+//
+// MessageId: XACT_E_COMMITPREVENTED
+//
+// MessageText:
+//
+//  Cannot call commit on this transaction object because the calling application did not initiate the transaction.
+//
+#define XACT_E_COMMITPREVENTED           _HRESULT_TYPEDEF_(0x8004D003L)
+
+//
+// MessageId: XACT_E_HEURISTICABORT
+//
+// MessageText:
+//
+//  Instead of committing, the resource heuristically aborted.
+//
+#define XACT_E_HEURISTICABORT            _HRESULT_TYPEDEF_(0x8004D004L)
+
+//
+// MessageId: XACT_E_HEURISTICCOMMIT
+//
+// MessageText:
+//
+//  Instead of aborting, the resource heuristically committed.
+//
+#define XACT_E_HEURISTICCOMMIT           _HRESULT_TYPEDEF_(0x8004D005L)
+
+//
+// MessageId: XACT_E_HEURISTICDAMAGE
+//
+// MessageText:
+//
+//  Some of the states of the resource were committed while others were aborted, likely because of heuristic decisions.
+//
+#define XACT_E_HEURISTICDAMAGE           _HRESULT_TYPEDEF_(0x8004D006L)
+
+//
+// MessageId: XACT_E_HEURISTICDANGER
+//
+// MessageText:
+//
+//  Some of the states of the resource may have been committed while others may have been aborted, likely because of heuristic decisions.
+//
+#define XACT_E_HEURISTICDANGER           _HRESULT_TYPEDEF_(0x8004D007L)
+
+//
+// MessageId: XACT_E_ISOLATIONLEVEL
+//
+// MessageText:
+//
+//  The requested isolation level is not valid or supported.
+//
+#define XACT_E_ISOLATIONLEVEL            _HRESULT_TYPEDEF_(0x8004D008L)
+
+//
+// MessageId: XACT_E_NOASYNC
+//
+// MessageText:
+//
+//  The transaction manager doesn't support an asynchronous operation for this method.
+//
+#define XACT_E_NOASYNC                   _HRESULT_TYPEDEF_(0x8004D009L)
+
+//
+// MessageId: XACT_E_NOENLIST
+//
+// MessageText:
+//
+//  Unable to enlist in the transaction.
+//
+#define XACT_E_NOENLIST                  _HRESULT_TYPEDEF_(0x8004D00AL)
+
+//
+// MessageId: XACT_E_NOISORETAIN
+//
+// MessageText:
+//
+//  The requested semantics of retention of isolation across retaining commit and abort boundaries cannot be supported by this transaction implementation, or isoFlags was not equal to zero.
+//
+#define XACT_E_NOISORETAIN               _HRESULT_TYPEDEF_(0x8004D00BL)
+
+//
+// MessageId: XACT_E_NORESOURCE
+//
+// MessageText:
+//
+//  There is no resource presently associated with this enlistment
+//
+#define XACT_E_NORESOURCE                _HRESULT_TYPEDEF_(0x8004D00CL)
+
+//
+// MessageId: XACT_E_NOTCURRENT
+//
+// MessageText:
+//
+//  The transaction failed to commit due to the failure of optimistic concurrency control in at least one of the resource managers.
+//
+#define XACT_E_NOTCURRENT                _HRESULT_TYPEDEF_(0x8004D00DL)
+
+//
+// MessageId: XACT_E_NOTRANSACTION
+//
+// MessageText:
+//
+//  The transaction has already been implicitly or explicitly committed or aborted
+//
+#define XACT_E_NOTRANSACTION             _HRESULT_TYPEDEF_(0x8004D00EL)
+
+//
+// MessageId: XACT_E_NOTSUPPORTED
+//
+// MessageText:
+//
+//  An invalid combination of flags was specified
+//
+#define XACT_E_NOTSUPPORTED              _HRESULT_TYPEDEF_(0x8004D00FL)
+
+//
+// MessageId: XACT_E_UNKNOWNRMGRID
+//
+// MessageText:
+//
+//  The resource manager id is not associated with this transaction or the transaction manager.
+//
+#define XACT_E_UNKNOWNRMGRID             _HRESULT_TYPEDEF_(0x8004D010L)
+
+//
+// MessageId: XACT_E_WRONGSTATE
+//
+// MessageText:
+//
+//  This method was called in the wrong state
+//
+#define XACT_E_WRONGSTATE                _HRESULT_TYPEDEF_(0x8004D011L)
+
+//
+// MessageId: XACT_E_WRONGUOW
+//
+// MessageText:
+//
+//  The indicated unit of work does not match the unit of work expected by the resource manager.
+//
+#define XACT_E_WRONGUOW                  _HRESULT_TYPEDEF_(0x8004D012L)
+
+//
+// MessageId: XACT_E_XTIONEXISTS
+//
+// MessageText:
+//
+//  An enlistment in a transaction already exists.
+//
+#define XACT_E_XTIONEXISTS               _HRESULT_TYPEDEF_(0x8004D013L)
+
+//
+// MessageId: XACT_E_NOIMPORTOBJECT
+//
+// MessageText:
+//
+//  An import object for the transaction could not be found.
+//
+#define XACT_E_NOIMPORTOBJECT            _HRESULT_TYPEDEF_(0x8004D014L)
+
+//
+// MessageId: XACT_E_INVALIDCOOKIE
+//
+// MessageText:
+//
+//  The transaction cookie is invalid.
+//
+#define XACT_E_INVALIDCOOKIE             _HRESULT_TYPEDEF_(0x8004D015L)
+
+//
+// MessageId: XACT_E_INDOUBT
+//
+// MessageText:
+//
+//  The transaction status is in doubt. A communication failure occurred, or a transaction manager or resource manager has failed
+//
+#define XACT_E_INDOUBT                   _HRESULT_TYPEDEF_(0x8004D016L)
+
+//
+// MessageId: XACT_E_NOTIMEOUT
+//
+// MessageText:
+//
+//  A time-out was specified, but time-outs are not supported.
+//
+#define XACT_E_NOTIMEOUT                 _HRESULT_TYPEDEF_(0x8004D017L)
+
+//
+// MessageId: XACT_E_ALREADYINPROGRESS
+//
+// MessageText:
+//
+//  The requested operation is already in progress for the transaction.
+//
+#define XACT_E_ALREADYINPROGRESS         _HRESULT_TYPEDEF_(0x8004D018L)
+
+//
+// MessageId: XACT_E_ABORTED
+//
+// MessageText:
+//
+//  The transaction has already been aborted.
+//
+#define XACT_E_ABORTED                   _HRESULT_TYPEDEF_(0x8004D019L)
+
+//
+// MessageId: XACT_E_LOGFULL
+//
+// MessageText:
+//
+//  The Transaction Manager returned a log full error.
+//
+#define XACT_E_LOGFULL                   _HRESULT_TYPEDEF_(0x8004D01AL)
+
+//
+// MessageId: XACT_E_TMNOTAVAILABLE
+//
+// MessageText:
+//
+//  The Transaction Manager is not available.
+//
+#define XACT_E_TMNOTAVAILABLE            _HRESULT_TYPEDEF_(0x8004D01BL)
+
+//
+// MessageId: XACT_E_CONNECTION_DOWN
+//
+// MessageText:
+//
+//  A connection with the transaction manager was lost.
+//
+#define XACT_E_CONNECTION_DOWN           _HRESULT_TYPEDEF_(0x8004D01CL)
+
+//
+// MessageId: XACT_E_CONNECTION_DENIED
+//
+// MessageText:
+//
+//  A request to establish a connection with the transaction manager was denied.
+//
+#define XACT_E_CONNECTION_DENIED         _HRESULT_TYPEDEF_(0x8004D01DL)
+
+//
+// MessageId: XACT_E_REENLISTTIMEOUT
+//
+// MessageText:
+//
+//  Resource manager reenlistment to determine transaction status timed out.
+//
+#define XACT_E_REENLISTTIMEOUT           _HRESULT_TYPEDEF_(0x8004D01EL)
+
+//
+// MessageId: XACT_E_TIP_CONNECT_FAILED
+//
+// MessageText:
+//
+//  This transaction manager failed to establish a connection with another TIP transaction manager.
+//
+#define XACT_E_TIP_CONNECT_FAILED        _HRESULT_TYPEDEF_(0x8004D01FL)
+
+//
+// MessageId: XACT_E_TIP_PROTOCOL_ERROR
+//
+// MessageText:
+//
+//  This transaction manager encountered a protocol error with another TIP transaction manager.
+//
+#define XACT_E_TIP_PROTOCOL_ERROR        _HRESULT_TYPEDEF_(0x8004D020L)
+
+//
+// MessageId: XACT_E_TIP_PULL_FAILED
+//
+// MessageText:
+//
+//  This transaction manager could not propagate a transaction from another TIP transaction manager.
+//
+#define XACT_E_TIP_PULL_FAILED           _HRESULT_TYPEDEF_(0x8004D021L)
+
+//
+// MessageId: XACT_E_DEST_TMNOTAVAILABLE
+//
+// MessageText:
+//
+//  The Transaction Manager on the destination machine is not available.
+//
+#define XACT_E_DEST_TMNOTAVAILABLE       _HRESULT_TYPEDEF_(0x8004D022L)
+
+//
+// MessageId: XACT_E_TIP_DISABLED
+//
+// MessageText:
+//
+//  The Transaction Manager has disabled its support for TIP.
+//
+#define XACT_E_TIP_DISABLED              _HRESULT_TYPEDEF_(0x8004D023L)
+
+//
+// MessageId: XACT_E_NETWORK_TX_DISABLED
+//
+// MessageText:
+//
+//  The transaction manager has disabled its support for remote/network transactions.
+//
+#define XACT_E_NETWORK_TX_DISABLED       _HRESULT_TYPEDEF_(0x8004D024L)
+
+//
+// MessageId: XACT_E_PARTNER_NETWORK_TX_DISABLED
+//
+// MessageText:
+//
+//  The partner transaction manager has disabled its support for remote/network transactions.
+//
+#define XACT_E_PARTNER_NETWORK_TX_DISABLED _HRESULT_TYPEDEF_(0x8004D025L)
+
+//
+// MessageId: XACT_E_XA_TX_DISABLED
+//
+// MessageText:
+//
+//  The transaction manager has disabled its support for XA transactions.
+//
+#define XACT_E_XA_TX_DISABLED            _HRESULT_TYPEDEF_(0x8004D026L)
+
+//
+// MessageId: XACT_E_UNABLE_TO_READ_DTC_CONFIG
+//
+// MessageText:
+//
+//  MSDTC was unable to read its configuration information.
+//
+#define XACT_E_UNABLE_TO_READ_DTC_CONFIG _HRESULT_TYPEDEF_(0x8004D027L)
+
+//
+// MessageId: XACT_E_UNABLE_TO_LOAD_DTC_PROXY
+//
+// MessageText:
+//
+//  MSDTC was unable to load the dtc proxy dll.
+//
+#define XACT_E_UNABLE_TO_LOAD_DTC_PROXY  _HRESULT_TYPEDEF_(0x8004D028L)
+
+//
+// MessageId: XACT_E_ABORTING
+//
+// MessageText:
+//
+//  The local transaction has aborted.
+//
+#define XACT_E_ABORTING                  _HRESULT_TYPEDEF_(0x8004D029L)
+
+//
+// TXF & CRM errors start 4d080.
+//
+// MessageId: XACT_E_CLERKNOTFOUND
+//
+// MessageText:
+//
+//  XACT_E_CLERKNOTFOUND
+//
+#define XACT_E_CLERKNOTFOUND             _HRESULT_TYPEDEF_(0x8004D080L)
+
+//
+// MessageId: XACT_E_CLERKEXISTS
+//
+// MessageText:
+//
+//  XACT_E_CLERKEXISTS
+//
+#define XACT_E_CLERKEXISTS               _HRESULT_TYPEDEF_(0x8004D081L)
+
+//
+// MessageId: XACT_E_RECOVERYINPROGRESS
+//
+// MessageText:
+//
+//  XACT_E_RECOVERYINPROGRESS
+//
+#define XACT_E_RECOVERYINPROGRESS        _HRESULT_TYPEDEF_(0x8004D082L)
+
+//
+// MessageId: XACT_E_TRANSACTIONCLOSED
+//
+// MessageText:
+//
+//  XACT_E_TRANSACTIONCLOSED
+//
+#define XACT_E_TRANSACTIONCLOSED         _HRESULT_TYPEDEF_(0x8004D083L)
+
+//
+// MessageId: XACT_E_INVALIDLSN
+//
+// MessageText:
+//
+//  XACT_E_INVALIDLSN
+//
+#define XACT_E_INVALIDLSN                _HRESULT_TYPEDEF_(0x8004D084L)
+
+//
+// MessageId: XACT_E_REPLAYREQUEST
+//
+// MessageText:
+//
+//  XACT_E_REPLAYREQUEST
+//
+#define XACT_E_REPLAYREQUEST             _HRESULT_TYPEDEF_(0x8004D085L)
+
+//
+// OleTx Success codes.
+//
+//
+// MessageId: XACT_S_ASYNC
+//
+// MessageText:
+//
+//  An asynchronous operation was specified. The operation has begun, but its outcome is not known yet.
+//
+#define XACT_S_ASYNC                     _HRESULT_TYPEDEF_(0x0004D000L)
+
+//
+// MessageId: XACT_S_DEFECT
+//
+// MessageText:
+//
+//  XACT_S_DEFECT
+//
+#define XACT_S_DEFECT                    _HRESULT_TYPEDEF_(0x0004D001L)
+
+//
+// MessageId: XACT_S_READONLY
+//
+// MessageText:
+//
+//  The method call succeeded because the transaction was read-only.
+//
+#define XACT_S_READONLY                  _HRESULT_TYPEDEF_(0x0004D002L)
+
+//
+// MessageId: XACT_S_SOMENORETAIN
+//
+// MessageText:
+//
+//  The transaction was successfully aborted. However, this is a coordinated transaction, and some number of enlisted resources were aborted outright because they could not support abort-retaining semantics
+//
+#define XACT_S_SOMENORETAIN              _HRESULT_TYPEDEF_(0x0004D003L)
+
+//
+// MessageId: XACT_S_OKINFORM
+//
+// MessageText:
+//
+//  No changes were made during this call, but the sink wants another chance to look if any other sinks make further changes.
+//
+#define XACT_S_OKINFORM                  _HRESULT_TYPEDEF_(0x0004D004L)
+
+//
+// MessageId: XACT_S_MADECHANGESCONTENT
+//
+// MessageText:
+//
+//  The sink is content and wishes the transaction to proceed. Changes were made to one or more resources during this call.
+//
+#define XACT_S_MADECHANGESCONTENT        _HRESULT_TYPEDEF_(0x0004D005L)
+
+//
+// MessageId: XACT_S_MADECHANGESINFORM
+//
+// MessageText:
+//
+//  The sink is for the moment and wishes the transaction to proceed, but if other changes are made following this return by other event sinks then this sink wants another chance to look
+//
+#define XACT_S_MADECHANGESINFORM         _HRESULT_TYPEDEF_(0x0004D006L)
+
+//
+// MessageId: XACT_S_ALLNORETAIN
+//
+// MessageText:
+//
+//  The transaction was successfully aborted. However, the abort was non-retaining.
+//
+#define XACT_S_ALLNORETAIN               _HRESULT_TYPEDEF_(0x0004D007L)
+
+//
+// MessageId: XACT_S_ABORTING
+//
+// MessageText:
+//
+//  An abort operation was already in progress.
+//
+#define XACT_S_ABORTING                  _HRESULT_TYPEDEF_(0x0004D008L)
+
+//
+// MessageId: XACT_S_SINGLEPHASE
+//
+// MessageText:
+//
+//  The resource manager has performed a single-phase commit of the transaction.
+//
+#define XACT_S_SINGLEPHASE               _HRESULT_TYPEDEF_(0x0004D009L)
+
+//
+// MessageId: XACT_S_LOCALLY_OK
+//
+// MessageText:
+//
+//  The local transaction has not aborted.
+//
+#define XACT_S_LOCALLY_OK                _HRESULT_TYPEDEF_(0x0004D00AL)
+
+//
+// MessageId: XACT_S_LASTRESOURCEMANAGER
+//
+// MessageText:
+//
+//  The resource manager has requested to be the coordinator (last resource manager) for the transaction.
+//
+#define XACT_S_LASTRESOURCEMANAGER       _HRESULT_TYPEDEF_(0x0004D010L)
+
+#define CONTEXT_E_FIRST        0x8004E000L
+#define CONTEXT_E_LAST         0x8004E02FL
+#define CONTEXT_S_FIRST        0x0004E000L
+#define CONTEXT_S_LAST         0x0004E02FL
+//
+// MessageId: CONTEXT_E_ABORTED
+//
+// MessageText:
+//
+//  The root transaction wanted to commit, but transaction aborted
+//
+#define CONTEXT_E_ABORTED                _HRESULT_TYPEDEF_(0x8004E002L)
+
+//
+// MessageId: CONTEXT_E_ABORTING
+//
+// MessageText:
+//
+//  You made a method call on a COM+ component that has a transaction that has already aborted or in the process of aborting.
+//
+#define CONTEXT_E_ABORTING               _HRESULT_TYPEDEF_(0x8004E003L)
+
+//
+// MessageId: CONTEXT_E_NOCONTEXT
+//
+// MessageText:
+//
+//  There is no MTS object context
+//
+#define CONTEXT_E_NOCONTEXT              _HRESULT_TYPEDEF_(0x8004E004L)
+
+//
+// MessageId: CONTEXT_E_WOULD_DEADLOCK
+//
+// MessageText:
+//
+//  The component is configured to use synchronization and this method call would cause a deadlock to occur.
+//
+#define CONTEXT_E_WOULD_DEADLOCK         _HRESULT_TYPEDEF_(0x8004E005L)
+
+//
+// MessageId: CONTEXT_E_SYNCH_TIMEOUT
+//
+// MessageText:
+//
+//  The component is configured to use synchronization and a thread has timed out waiting to enter the context.
+//
+#define CONTEXT_E_SYNCH_TIMEOUT          _HRESULT_TYPEDEF_(0x8004E006L)
+
+//
+// MessageId: CONTEXT_E_OLDREF
+//
+// MessageText:
+//
+//  You made a method call on a COM+ component that has a transaction that has already committed or aborted.
+//
+#define CONTEXT_E_OLDREF                 _HRESULT_TYPEDEF_(0x8004E007L)
+
+//
+// MessageId: CONTEXT_E_ROLENOTFOUND
+//
+// MessageText:
+//
+//  The specified role was not configured for the application
+//
+#define CONTEXT_E_ROLENOTFOUND           _HRESULT_TYPEDEF_(0x8004E00CL)
+
+//
+// MessageId: CONTEXT_E_TMNOTAVAILABLE
+//
+// MessageText:
+//
+//  COM+ was unable to talk to the Microsoft Distributed Transaction Coordinator
+//
+#define CONTEXT_E_TMNOTAVAILABLE         _HRESULT_TYPEDEF_(0x8004E00FL)
+
+//
+// MessageId: CO_E_ACTIVATIONFAILED
+//
+// MessageText:
+//
+//  An unexpected error occurred during COM+ Activation.
+//
+#define CO_E_ACTIVATIONFAILED            _HRESULT_TYPEDEF_(0x8004E021L)
+
+//
+// MessageId: CO_E_ACTIVATIONFAILED_EVENTLOGGED
+//
+// MessageText:
+//
+//  COM+ Activation failed. Check the event log for more information
+//
+#define CO_E_ACTIVATIONFAILED_EVENTLOGGED _HRESULT_TYPEDEF_(0x8004E022L)
+
+//
+// MessageId: CO_E_ACTIVATIONFAILED_CATALOGERROR
+//
+// MessageText:
+//
+//  COM+ Activation failed due to a catalog or configuration error.
+//
+#define CO_E_ACTIVATIONFAILED_CATALOGERROR _HRESULT_TYPEDEF_(0x8004E023L)
+
+//
+// MessageId: CO_E_ACTIVATIONFAILED_TIMEOUT
+//
+// MessageText:
+//
+//  COM+ activation failed because the activation could not be completed in the specified amount of time.
+//
+#define CO_E_ACTIVATIONFAILED_TIMEOUT    _HRESULT_TYPEDEF_(0x8004E024L)
+
+//
+// MessageId: CO_E_INITIALIZATIONFAILED
+//
+// MessageText:
+//
+//  COM+ Activation failed because an initialization function failed.  Check the event log for more information.
+//
+#define CO_E_INITIALIZATIONFAILED        _HRESULT_TYPEDEF_(0x8004E025L)
+
+//
+// MessageId: CONTEXT_E_NOJIT
+//
+// MessageText:
+//
+//  The requested operation requires that JIT be in the current context and it is not
+//
+#define CONTEXT_E_NOJIT                  _HRESULT_TYPEDEF_(0x8004E026L)
+
+//
+// MessageId: CONTEXT_E_NOTRANSACTION
+//
+// MessageText:
+//
+//  The requested operation requires that the current context have a Transaction, and it does not
+//
+#define CONTEXT_E_NOTRANSACTION          _HRESULT_TYPEDEF_(0x8004E027L)
+
+//
+// MessageId: CO_E_THREADINGMODEL_CHANGED
+//
+// MessageText:
+//
+//  The components threading model has changed after install into a COM+ Application.  Please re-install component.
+//
+#define CO_E_THREADINGMODEL_CHANGED      _HRESULT_TYPEDEF_(0x8004E028L)
+
+//
+// MessageId: CO_E_NOIISINTRINSICS
+//
+// MessageText:
+//
+//  IIS intrinsics not available.  Start your work with IIS.
+//
+#define CO_E_NOIISINTRINSICS             _HRESULT_TYPEDEF_(0x8004E029L)
+
+//
+// MessageId: CO_E_NOCOOKIES
+//
+// MessageText:
+//
+//  An attempt to write a cookie failed.
+//
+#define CO_E_NOCOOKIES                   _HRESULT_TYPEDEF_(0x8004E02AL)
+
+//
+// MessageId: CO_E_DBERROR
+//
+// MessageText:
+//
+//  An attempt to use a database generated a database specific error.
+//
+#define CO_E_DBERROR                     _HRESULT_TYPEDEF_(0x8004E02BL)
+
+//
+// MessageId: CO_E_NOTPOOLED
+//
+// MessageText:
+//
+//  The COM+ component you created must use object pooling to work.
+//
+#define CO_E_NOTPOOLED                   _HRESULT_TYPEDEF_(0x8004E02CL)
+
+//
+// MessageId: CO_E_NOTCONSTRUCTED
+//
+// MessageText:
+//
+//  The COM+ component you created must use object construction to work correctly.
+//
+#define CO_E_NOTCONSTRUCTED              _HRESULT_TYPEDEF_(0x8004E02DL)
+
+//
+// MessageId: CO_E_NOSYNCHRONIZATION
+//
+// MessageText:
+//
+//  The COM+ component requires synchronization, and it is not configured for it.
+//
+#define CO_E_NOSYNCHRONIZATION           _HRESULT_TYPEDEF_(0x8004E02EL)
+
+//
+// MessageId: CO_E_ISOLEVELMISMATCH
+//
+// MessageText:
+//
+//  The TxIsolation Level property for the COM+ component being created is stronger than the TxIsolationLevel for the "root" component for the transaction.  The creation failed.
+//
+#define CO_E_ISOLEVELMISMATCH            _HRESULT_TYPEDEF_(0x8004E02FL)
+
+//
+// Old OLE Success Codes
+//
+//
+// MessageId: OLE_S_USEREG
+//
+// MessageText:
+//
+//  Use the registry database to provide the requested information
+//
+#define OLE_S_USEREG                     _HRESULT_TYPEDEF_(0x00040000L)
+
+//
+// MessageId: OLE_S_STATIC
+//
+// MessageText:
+//
+//  Success, but static
+//
+#define OLE_S_STATIC                     _HRESULT_TYPEDEF_(0x00040001L)
+
+//
+// MessageId: OLE_S_MAC_CLIPFORMAT
+//
+// MessageText:
+//
+//  Macintosh clipboard format
+//
+#define OLE_S_MAC_CLIPFORMAT             _HRESULT_TYPEDEF_(0x00040002L)
+
+//
+// MessageId: DRAGDROP_S_DROP
+//
+// MessageText:
+//
+//  Successful drop took place
+//
+#define DRAGDROP_S_DROP                  _HRESULT_TYPEDEF_(0x00040100L)
+
+//
+// MessageId: DRAGDROP_S_CANCEL
+//
+// MessageText:
+//
+//  Drag-drop operation canceled
+//
+#define DRAGDROP_S_CANCEL                _HRESULT_TYPEDEF_(0x00040101L)
+
+//
+// MessageId: DRAGDROP_S_USEDEFAULTCURSORS
+//
+// MessageText:
+//
+//  Use the default cursor
+//
+#define DRAGDROP_S_USEDEFAULTCURSORS     _HRESULT_TYPEDEF_(0x00040102L)
+
+//
+// MessageId: DATA_S_SAMEFORMATETC
+//
+// MessageText:
+//
+//  Data has same FORMATETC
+//
+#define DATA_S_SAMEFORMATETC             _HRESULT_TYPEDEF_(0x00040130L)
+
+//
+// MessageId: VIEW_S_ALREADY_FROZEN
+//
+// MessageText:
+//
+//  View is already frozen
+//
+#define VIEW_S_ALREADY_FROZEN            _HRESULT_TYPEDEF_(0x00040140L)
+
+//
+// MessageId: CACHE_S_FORMATETC_NOTSUPPORTED
+//
+// MessageText:
+//
+//  FORMATETC not supported
+//
+#define CACHE_S_FORMATETC_NOTSUPPORTED   _HRESULT_TYPEDEF_(0x00040170L)
+
+//
+// MessageId: CACHE_S_SAMECACHE
+//
+// MessageText:
+//
+//  Same cache
+//
+#define CACHE_S_SAMECACHE                _HRESULT_TYPEDEF_(0x00040171L)
+
+//
+// MessageId: CACHE_S_SOMECACHES_NOTUPDATED
+//
+// MessageText:
+//
+//  Some cache(s) not updated
+//
+#define CACHE_S_SOMECACHES_NOTUPDATED    _HRESULT_TYPEDEF_(0x00040172L)
+
+//
+// MessageId: OLEOBJ_S_INVALIDVERB
+//
+// MessageText:
+//
+//  Invalid verb for OLE object
+//
+#define OLEOBJ_S_INVALIDVERB             _HRESULT_TYPEDEF_(0x00040180L)
+
+//
+// MessageId: OLEOBJ_S_CANNOT_DOVERB_NOW
+//
+// MessageText:
+//
+//  Verb number is valid but verb cannot be done now
+//
+#define OLEOBJ_S_CANNOT_DOVERB_NOW       _HRESULT_TYPEDEF_(0x00040181L)
+
+//
+// MessageId: OLEOBJ_S_INVALIDHWND
+//
+// MessageText:
+//
+//  Invalid window handle passed
+//
+#define OLEOBJ_S_INVALIDHWND             _HRESULT_TYPEDEF_(0x00040182L)
+
+//
+// MessageId: INPLACE_S_TRUNCATED
+//
+// MessageText:
+//
+//  Message is too long; some of it had to be truncated before displaying
+//
+#define INPLACE_S_TRUNCATED              _HRESULT_TYPEDEF_(0x000401A0L)
+
+//
+// MessageId: CONVERT10_S_NO_PRESENTATION
+//
+// MessageText:
+//
+//  Unable to convert OLESTREAM to IStorage
+//
+#define CONVERT10_S_NO_PRESENTATION      _HRESULT_TYPEDEF_(0x000401C0L)
+
+//
+// MessageId: MK_S_REDUCED_TO_SELF
+//
+// MessageText:
+//
+//  Moniker reduced to itself
+//
+#define MK_S_REDUCED_TO_SELF             _HRESULT_TYPEDEF_(0x000401E2L)
+
+//
+// MessageId: MK_S_ME
+//
+// MessageText:
+//
+//  Common prefix is this moniker
+//
+#define MK_S_ME                          _HRESULT_TYPEDEF_(0x000401E4L)
+
+//
+// MessageId: MK_S_HIM
+//
+// MessageText:
+//
+//  Common prefix is input moniker
+//
+#define MK_S_HIM                         _HRESULT_TYPEDEF_(0x000401E5L)
+
+//
+// MessageId: MK_S_US
+//
+// MessageText:
+//
+//  Common prefix is both monikers
+//
+#define MK_S_US                          _HRESULT_TYPEDEF_(0x000401E6L)
+
+//
+// MessageId: MK_S_MONIKERALREADYREGISTERED
+//
+// MessageText:
+//
+//  Moniker is already registered in running object table
+//
+#define MK_S_MONIKERALREADYREGISTERED    _HRESULT_TYPEDEF_(0x000401E7L)
+
+//
+// Task Scheduler errors
+//
+//
+// MessageId: SCHED_S_TASK_READY
+//
+// MessageText:
+//
+//  The task is ready to run at its next scheduled time.
+//
+#define SCHED_S_TASK_READY               _HRESULT_TYPEDEF_(0x00041300L)
+
+//
+// MessageId: SCHED_S_TASK_RUNNING
+//
+// MessageText:
+//
+//  The task is currently running.
+//
+#define SCHED_S_TASK_RUNNING             _HRESULT_TYPEDEF_(0x00041301L)
+
+//
+// MessageId: SCHED_S_TASK_DISABLED
+//
+// MessageText:
+//
+//  The task will not run at the scheduled times because it has been disabled.
+//
+#define SCHED_S_TASK_DISABLED            _HRESULT_TYPEDEF_(0x00041302L)
+
+//
+// MessageId: SCHED_S_TASK_HAS_NOT_RUN
+//
+// MessageText:
+//
+//  The task has not yet run.
+//
+#define SCHED_S_TASK_HAS_NOT_RUN         _HRESULT_TYPEDEF_(0x00041303L)
+
+//
+// MessageId: SCHED_S_TASK_NO_MORE_RUNS
+//
+// MessageText:
+//
+//  There are no more runs scheduled for this task.
+//
+#define SCHED_S_TASK_NO_MORE_RUNS        _HRESULT_TYPEDEF_(0x00041304L)
+
+//
+// MessageId: SCHED_S_TASK_NOT_SCHEDULED
+//
+// MessageText:
+//
+//  One or more of the properties that are needed to run this task on a schedule have not been set.
+//
+#define SCHED_S_TASK_NOT_SCHEDULED       _HRESULT_TYPEDEF_(0x00041305L)
+
+//
+// MessageId: SCHED_S_TASK_TERMINATED
+//
+// MessageText:
+//
+//  The last run of the task was terminated by the user.
+//
+#define SCHED_S_TASK_TERMINATED          _HRESULT_TYPEDEF_(0x00041306L)
+
+//
+// MessageId: SCHED_S_TASK_NO_VALID_TRIGGERS
+//
+// MessageText:
+//
+//  Either the task has no triggers or the existing triggers are disabled or not set.
+//
+#define SCHED_S_TASK_NO_VALID_TRIGGERS   _HRESULT_TYPEDEF_(0x00041307L)
+
+//
+// MessageId: SCHED_S_EVENT_TRIGGER
+//
+// MessageText:
+//
+//  Event triggers don't have set run times.
+//
+#define SCHED_S_EVENT_TRIGGER            _HRESULT_TYPEDEF_(0x00041308L)
+
+//
+// MessageId: SCHED_E_TRIGGER_NOT_FOUND
+//
+// MessageText:
+//
+//  Trigger not found.
+//
+#define SCHED_E_TRIGGER_NOT_FOUND        _HRESULT_TYPEDEF_(0x80041309L)
+
+//
+// MessageId: SCHED_E_TASK_NOT_READY
+//
+// MessageText:
+//
+//  One or more of the properties that are needed to run this task have not been set.
+//
+#define SCHED_E_TASK_NOT_READY           _HRESULT_TYPEDEF_(0x8004130AL)
+
+//
+// MessageId: SCHED_E_TASK_NOT_RUNNING
+//
+// MessageText:
+//
+//  There is no running instance of the task to terminate.
+//
+#define SCHED_E_TASK_NOT_RUNNING         _HRESULT_TYPEDEF_(0x8004130BL)
+
+//
+// MessageId: SCHED_E_SERVICE_NOT_INSTALLED
+//
+// MessageText:
+//
+//  The Task Scheduler Service is not installed on this computer.
+//
+#define SCHED_E_SERVICE_NOT_INSTALLED    _HRESULT_TYPEDEF_(0x8004130CL)
+
+//
+// MessageId: SCHED_E_CANNOT_OPEN_TASK
+//
+// MessageText:
+//
+//  The task object could not be opened.
+//
+#define SCHED_E_CANNOT_OPEN_TASK         _HRESULT_TYPEDEF_(0x8004130DL)
+
+//
+// MessageId: SCHED_E_INVALID_TASK
+//
+// MessageText:
+//
+//  The object is either an invalid task object or is not a task object.
+//
+#define SCHED_E_INVALID_TASK             _HRESULT_TYPEDEF_(0x8004130EL)
+
+//
+// MessageId: SCHED_E_ACCOUNT_INFORMATION_NOT_SET
+//
+// MessageText:
+//
+//  No account information could be found in the Task Scheduler security database for the task indicated.
+//
+#define SCHED_E_ACCOUNT_INFORMATION_NOT_SET _HRESULT_TYPEDEF_(0x8004130FL)
+
+//
+// MessageId: SCHED_E_ACCOUNT_NAME_NOT_FOUND
+//
+// MessageText:
+//
+//  Unable to establish existence of the account specified.
+//
+#define SCHED_E_ACCOUNT_NAME_NOT_FOUND   _HRESULT_TYPEDEF_(0x80041310L)
+
+//
+// MessageId: SCHED_E_ACCOUNT_DBASE_CORRUPT
+//
+// MessageText:
+//
+//  Corruption was detected in the Task Scheduler security database; the database has been reset.
+//
+#define SCHED_E_ACCOUNT_DBASE_CORRUPT    _HRESULT_TYPEDEF_(0x80041311L)
+
+//
+// MessageId: SCHED_E_NO_SECURITY_SERVICES
+//
+// MessageText:
+//
+//  Task Scheduler security services are available only on Windows NT.
+//
+#define SCHED_E_NO_SECURITY_SERVICES     _HRESULT_TYPEDEF_(0x80041312L)
+
+//
+// MessageId: SCHED_E_UNKNOWN_OBJECT_VERSION
+//
+// MessageText:
+//
+//  The task object version is either unsupported or invalid.
+//
+#define SCHED_E_UNKNOWN_OBJECT_VERSION   _HRESULT_TYPEDEF_(0x80041313L)
+
+//
+// MessageId: SCHED_E_UNSUPPORTED_ACCOUNT_OPTION
+//
+// MessageText:
+//
+//  The task has been configured with an unsupported combination of account settings and run time options.
+//
+#define SCHED_E_UNSUPPORTED_ACCOUNT_OPTION _HRESULT_TYPEDEF_(0x80041314L)
+
+//
+// MessageId: SCHED_E_SERVICE_NOT_RUNNING
+//
+// MessageText:
+//
+//  The Task Scheduler Service is not running.
+//
+#define SCHED_E_SERVICE_NOT_RUNNING      _HRESULT_TYPEDEF_(0x80041315L)
+
+// ******************
+// FACILITY_WINDOWS
+// ******************
+//
+// Codes 0x0-0x01ff are reserved for the OLE group of
+// interfaces.
+//
+//
+// MessageId: CO_E_CLASS_CREATE_FAILED
+//
+// MessageText:
+//
+//  Attempt to create a class object failed
+//
+#define CO_E_CLASS_CREATE_FAILED         _HRESULT_TYPEDEF_(0x80080001L)
+
+//
+// MessageId: CO_E_SCM_ERROR
+//
+// MessageText:
+//
+//  OLE service could not bind object
+//
+#define CO_E_SCM_ERROR                   _HRESULT_TYPEDEF_(0x80080002L)
+
+//
+// MessageId: CO_E_SCM_RPC_FAILURE
+//
+// MessageText:
+//
+//  RPC communication failed with OLE service
+//
+#define CO_E_SCM_RPC_FAILURE             _HRESULT_TYPEDEF_(0x80080003L)
+
+//
+// MessageId: CO_E_BAD_PATH
+//
+// MessageText:
+//
+//  Bad path to object
+//
+#define CO_E_BAD_PATH                    _HRESULT_TYPEDEF_(0x80080004L)
+
+//
+// MessageId: CO_E_SERVER_EXEC_FAILURE
+//
+// MessageText:
+//
+//  Server execution failed
+//
+#define CO_E_SERVER_EXEC_FAILURE         _HRESULT_TYPEDEF_(0x80080005L)
+
+//
+// MessageId: CO_E_OBJSRV_RPC_FAILURE
+//
+// MessageText:
+//
+//  OLE service could not communicate with the object server
+//
+#define CO_E_OBJSRV_RPC_FAILURE          _HRESULT_TYPEDEF_(0x80080006L)
+
+//
+// MessageId: MK_E_NO_NORMALIZED
+//
+// MessageText:
+//
+//  Moniker path could not be normalized
+//
+#define MK_E_NO_NORMALIZED               _HRESULT_TYPEDEF_(0x80080007L)
+
+//
+// MessageId: CO_E_SERVER_STOPPING
+//
+// MessageText:
+//
+//  Object server is stopping when OLE service contacts it
+//
+#define CO_E_SERVER_STOPPING             _HRESULT_TYPEDEF_(0x80080008L)
+
+//
+// MessageId: MEM_E_INVALID_ROOT
+//
+// MessageText:
+//
+//  An invalid root block pointer was specified
+//
+#define MEM_E_INVALID_ROOT               _HRESULT_TYPEDEF_(0x80080009L)
+
+//
+// MessageId: MEM_E_INVALID_LINK
+//
+// MessageText:
+//
+//  An allocation chain contained an invalid link pointer
+//
+#define MEM_E_INVALID_LINK               _HRESULT_TYPEDEF_(0x80080010L)
+
+//
+// MessageId: MEM_E_INVALID_SIZE
+//
+// MessageText:
+//
+//  The requested allocation size was too large
+//
+#define MEM_E_INVALID_SIZE               _HRESULT_TYPEDEF_(0x80080011L)
+
+//
+// MessageId: CO_S_NOTALLINTERFACES
+//
+// MessageText:
+//
+//  Not all the requested interfaces were available
+//
+#define CO_S_NOTALLINTERFACES            _HRESULT_TYPEDEF_(0x00080012L)
+
+//
+// MessageId: CO_S_MACHINENAMENOTFOUND
+//
+// MessageText:
+//
+//  The specified machine name was not found in the cache.
+//
+#define CO_S_MACHINENAMENOTFOUND         _HRESULT_TYPEDEF_(0x00080013L)
+
+// ******************
+// FACILITY_DISPATCH
+// ******************
+//
+// MessageId: DISP_E_UNKNOWNINTERFACE
+//
+// MessageText:
+//
+//  Unknown interface.
+//
+#define DISP_E_UNKNOWNINTERFACE          _HRESULT_TYPEDEF_(0x80020001L)
+
+//
+// MessageId: DISP_E_MEMBERNOTFOUND
+//
+// MessageText:
+//
+//  Member not found.
+//
+#define DISP_E_MEMBERNOTFOUND            _HRESULT_TYPEDEF_(0x80020003L)
+
+//
+// MessageId: DISP_E_PARAMNOTFOUND
+//
+// MessageText:
+//
+//  Parameter not found.
+//
+#define DISP_E_PARAMNOTFOUND             _HRESULT_TYPEDEF_(0x80020004L)
+
+//
+// MessageId: DISP_E_TYPEMISMATCH
+//
+// MessageText:
+//
+//  Type mismatch.
+//
+#define DISP_E_TYPEMISMATCH              _HRESULT_TYPEDEF_(0x80020005L)
+
+//
+// MessageId: DISP_E_UNKNOWNNAME
+//
+// MessageText:
+//
+//  Unknown name.
+//
+#define DISP_E_UNKNOWNNAME               _HRESULT_TYPEDEF_(0x80020006L)
+
+//
+// MessageId: DISP_E_NONAMEDARGS
+//
+// MessageText:
+//
+//  No named arguments.
+//
+#define DISP_E_NONAMEDARGS               _HRESULT_TYPEDEF_(0x80020007L)
+
+//
+// MessageId: DISP_E_BADVARTYPE
+//
+// MessageText:
+//
+//  Bad variable type.
+//
+#define DISP_E_BADVARTYPE                _HRESULT_TYPEDEF_(0x80020008L)
+
+//
+// MessageId: DISP_E_EXCEPTION
+//
+// MessageText:
+//
+//  Exception occurred.
+//
+#define DISP_E_EXCEPTION                 _HRESULT_TYPEDEF_(0x80020009L)
+
+//
+// MessageId: DISP_E_OVERFLOW
+//
+// MessageText:
+//
+//  Out of present range.
+//
+#define DISP_E_OVERFLOW                  _HRESULT_TYPEDEF_(0x8002000AL)
+
+//
+// MessageId: DISP_E_BADINDEX
+//
+// MessageText:
+//
+//  Invalid index.
+//
+#define DISP_E_BADINDEX                  _HRESULT_TYPEDEF_(0x8002000BL)
+
+//
+// MessageId: DISP_E_UNKNOWNLCID
+//
+// MessageText:
+//
+//  Unknown language.
+//
+#define DISP_E_UNKNOWNLCID               _HRESULT_TYPEDEF_(0x8002000CL)
+
+//
+// MessageId: DISP_E_ARRAYISLOCKED
+//
+// MessageText:
+//
+//  Memory is locked.
+//
+#define DISP_E_ARRAYISLOCKED             _HRESULT_TYPEDEF_(0x8002000DL)
+
+//
+// MessageId: DISP_E_BADPARAMCOUNT
+//
+// MessageText:
+//
+//  Invalid number of parameters.
+//
+#define DISP_E_BADPARAMCOUNT             _HRESULT_TYPEDEF_(0x8002000EL)
+
+//
+// MessageId: DISP_E_PARAMNOTOPTIONAL
+//
+// MessageText:
+//
+//  Parameter not optional.
+//
+#define DISP_E_PARAMNOTOPTIONAL          _HRESULT_TYPEDEF_(0x8002000FL)
+
+//
+// MessageId: DISP_E_BADCALLEE
+//
+// MessageText:
+//
+//  Invalid callee.
+//
+#define DISP_E_BADCALLEE                 _HRESULT_TYPEDEF_(0x80020010L)
+
+//
+// MessageId: DISP_E_NOTACOLLECTION
+//
+// MessageText:
+//
+//  Does not support a collection.
+//
+#define DISP_E_NOTACOLLECTION            _HRESULT_TYPEDEF_(0x80020011L)
+
+//
+// MessageId: DISP_E_DIVBYZERO
+//
+// MessageText:
+//
+//  Division by zero.
+//
+#define DISP_E_DIVBYZERO                 _HRESULT_TYPEDEF_(0x80020012L)
+
+//
+// MessageId: DISP_E_BUFFERTOOSMALL
+//
+// MessageText:
+//
+//  Buffer too small
+//
+#define DISP_E_BUFFERTOOSMALL            _HRESULT_TYPEDEF_(0x80020013L)
+
+//
+// MessageId: TYPE_E_BUFFERTOOSMALL
+//
+// MessageText:
+//
+//  Buffer too small.
+//
+#define TYPE_E_BUFFERTOOSMALL            _HRESULT_TYPEDEF_(0x80028016L)
+
+//
+// MessageId: TYPE_E_FIELDNOTFOUND
+//
+// MessageText:
+//
+//  Field name not defined in the record.
+//
+#define TYPE_E_FIELDNOTFOUND             _HRESULT_TYPEDEF_(0x80028017L)
+
+//
+// MessageId: TYPE_E_INVDATAREAD
+//
+// MessageText:
+//
+//  Old format or invalid type library.
+//
+#define TYPE_E_INVDATAREAD               _HRESULT_TYPEDEF_(0x80028018L)
+
+//
+// MessageId: TYPE_E_UNSUPFORMAT
+//
+// MessageText:
+//
+//  Old format or invalid type library.
+//
+#define TYPE_E_UNSUPFORMAT               _HRESULT_TYPEDEF_(0x80028019L)
+
+//
+// MessageId: TYPE_E_REGISTRYACCESS
+//
+// MessageText:
+//
+//  Error accessing the OLE registry.
+//
+#define TYPE_E_REGISTRYACCESS            _HRESULT_TYPEDEF_(0x8002801CL)
+
+//
+// MessageId: TYPE_E_LIBNOTREGISTERED
+//
+// MessageText:
+//
+//  Library not registered.
+//
+#define TYPE_E_LIBNOTREGISTERED          _HRESULT_TYPEDEF_(0x8002801DL)
+
+//
+// MessageId: TYPE_E_UNDEFINEDTYPE
+//
+// MessageText:
+//
+//  Bound to unknown type.
+//
+#define TYPE_E_UNDEFINEDTYPE             _HRESULT_TYPEDEF_(0x80028027L)
+
+//
+// MessageId: TYPE_E_QUALIFIEDNAMEDISALLOWED
+//
+// MessageText:
+//
+//  Qualified name disallowed.
+//
+#define TYPE_E_QUALIFIEDNAMEDISALLOWED   _HRESULT_TYPEDEF_(0x80028028L)
+
+//
+// MessageId: TYPE_E_INVALIDSTATE
+//
+// MessageText:
+//
+//  Invalid forward reference, or reference to uncompiled type.
+//
+#define TYPE_E_INVALIDSTATE              _HRESULT_TYPEDEF_(0x80028029L)
+
+//
+// MessageId: TYPE_E_WRONGTYPEKIND
+//
+// MessageText:
+//
+//  Type mismatch.
+//
+#define TYPE_E_WRONGTYPEKIND             _HRESULT_TYPEDEF_(0x8002802AL)
+
+//
+// MessageId: TYPE_E_ELEMENTNOTFOUND
+//
+// MessageText:
+//
+//  Element not found.
+//
+#define TYPE_E_ELEMENTNOTFOUND           _HRESULT_TYPEDEF_(0x8002802BL)
+
+//
+// MessageId: TYPE_E_AMBIGUOUSNAME
+//
+// MessageText:
+//
+//  Ambiguous name.
+//
+#define TYPE_E_AMBIGUOUSNAME             _HRESULT_TYPEDEF_(0x8002802CL)
+
+//
+// MessageId: TYPE_E_NAMECONFLICT
+//
+// MessageText:
+//
+//  Name already exists in the library.
+//
+#define TYPE_E_NAMECONFLICT              _HRESULT_TYPEDEF_(0x8002802DL)
+
+//
+// MessageId: TYPE_E_UNKNOWNLCID
+//
+// MessageText:
+//
+//  Unknown LCID.
+//
+#define TYPE_E_UNKNOWNLCID               _HRESULT_TYPEDEF_(0x8002802EL)
+
+//
+// MessageId: TYPE_E_DLLFUNCTIONNOTFOUND
+//
+// MessageText:
+//
+//  Function not defined in specified DLL.
+//
+#define TYPE_E_DLLFUNCTIONNOTFOUND       _HRESULT_TYPEDEF_(0x8002802FL)
+
+//
+// MessageId: TYPE_E_BADMODULEKIND
+//
+// MessageText:
+//
+//  Wrong module kind for the operation.
+//
+#define TYPE_E_BADMODULEKIND             _HRESULT_TYPEDEF_(0x800288BDL)
+
+//
+// MessageId: TYPE_E_SIZETOOBIG
+//
+// MessageText:
+//
+//  Size may not exceed 64K.
+//
+#define TYPE_E_SIZETOOBIG                _HRESULT_TYPEDEF_(0x800288C5L)
+
+//
+// MessageId: TYPE_E_DUPLICATEID
+//
+// MessageText:
+//
+//  Duplicate ID in inheritance hierarchy.
+//
+#define TYPE_E_DUPLICATEID               _HRESULT_TYPEDEF_(0x800288C6L)
+
+//
+// MessageId: TYPE_E_INVALIDID
+//
+// MessageText:
+//
+//  Incorrect inheritance depth in standard OLE hmember.
+//
+#define TYPE_E_INVALIDID                 _HRESULT_TYPEDEF_(0x800288CFL)
+
+//
+// MessageId: TYPE_E_TYPEMISMATCH
+//
+// MessageText:
+//
+//  Type mismatch.
+//
+#define TYPE_E_TYPEMISMATCH              _HRESULT_TYPEDEF_(0x80028CA0L)
+
+//
+// MessageId: TYPE_E_OUTOFBOUNDS
+//
+// MessageText:
+//
+//  Invalid number of arguments.
+//
+#define TYPE_E_OUTOFBOUNDS               _HRESULT_TYPEDEF_(0x80028CA1L)
+
+//
+// MessageId: TYPE_E_IOERROR
+//
+// MessageText:
+//
+//  I/O Error.
+//
+#define TYPE_E_IOERROR                   _HRESULT_TYPEDEF_(0x80028CA2L)
+
+//
+// MessageId: TYPE_E_CANTCREATETMPFILE
+//
+// MessageText:
+//
+//  Error creating unique tmp file.
+//
+#define TYPE_E_CANTCREATETMPFILE         _HRESULT_TYPEDEF_(0x80028CA3L)
+
+//
+// MessageId: TYPE_E_CANTLOADLIBRARY
+//
+// MessageText:
+//
+//  Error loading type library/DLL.
+//
+#define TYPE_E_CANTLOADLIBRARY           _HRESULT_TYPEDEF_(0x80029C4AL)
+
+//
+// MessageId: TYPE_E_INCONSISTENTPROPFUNCS
+//
+// MessageText:
+//
+//  Inconsistent property functions.
+//
+#define TYPE_E_INCONSISTENTPROPFUNCS     _HRESULT_TYPEDEF_(0x80029C83L)
+
+//
+// MessageId: TYPE_E_CIRCULARTYPE
+//
+// MessageText:
+//
+//  Circular dependency between types/modules.
+//
+#define TYPE_E_CIRCULARTYPE              _HRESULT_TYPEDEF_(0x80029C84L)
+
+// ******************
+// FACILITY_STORAGE
+// ******************
+//
+// MessageId: STG_E_INVALIDFUNCTION
+//
+// MessageText:
+//
+//  Unable to perform requested operation.
+//
+#define STG_E_INVALIDFUNCTION            _HRESULT_TYPEDEF_(0x80030001L)
+
+//
+// MessageId: STG_E_FILENOTFOUND
+//
+// MessageText:
+//
+//  %1 could not be found.
+//
+#define STG_E_FILENOTFOUND               _HRESULT_TYPEDEF_(0x80030002L)
+
+//
+// MessageId: STG_E_PATHNOTFOUND
+//
+// MessageText:
+//
+//  The path %1 could not be found.
+//
+#define STG_E_PATHNOTFOUND               _HRESULT_TYPEDEF_(0x80030003L)
+
+//
+// MessageId: STG_E_TOOMANYOPENFILES
+//
+// MessageText:
+//
+//  There are insufficient resources to open another file.
+//
+#define STG_E_TOOMANYOPENFILES           _HRESULT_TYPEDEF_(0x80030004L)
+
+//
+// MessageId: STG_E_ACCESSDENIED
+//
+// MessageText:
+//
+//  Access Denied.
+//
+#define STG_E_ACCESSDENIED               _HRESULT_TYPEDEF_(0x80030005L)
+
+//
+// MessageId: STG_E_INVALIDHANDLE
+//
+// MessageText:
+//
+//  Attempted an operation on an invalid object.
+//
+#define STG_E_INVALIDHANDLE              _HRESULT_TYPEDEF_(0x80030006L)
+
+//
+// MessageId: STG_E_INSUFFICIENTMEMORY
+//
+// MessageText:
+//
+//  There is insufficient memory available to complete operation.
+//
+#define STG_E_INSUFFICIENTMEMORY         _HRESULT_TYPEDEF_(0x80030008L)
+
+//
+// MessageId: STG_E_INVALIDPOINTER
+//
+// MessageText:
+//
+//  Invalid pointer error.
+//
+#define STG_E_INVALIDPOINTER             _HRESULT_TYPEDEF_(0x80030009L)
+
+//
+// MessageId: STG_E_NOMOREFILES
+//
+// MessageText:
+//
+//  There are no more entries to return.
+//
+#define STG_E_NOMOREFILES                _HRESULT_TYPEDEF_(0x80030012L)
+
+//
+// MessageId: STG_E_DISKISWRITEPROTECTED
+//
+// MessageText:
+//
+//  Disk is write-protected.
+//
+#define STG_E_DISKISWRITEPROTECTED       _HRESULT_TYPEDEF_(0x80030013L)
+
+//
+// MessageId: STG_E_SEEKERROR
+//
+// MessageText:
+//
+//  An error occurred during a seek operation.
+//
+#define STG_E_SEEKERROR                  _HRESULT_TYPEDEF_(0x80030019L)
+
+//
+// MessageId: STG_E_WRITEFAULT
+//
+// MessageText:
+//
+//  A disk error occurred during a write operation.
+//
+#define STG_E_WRITEFAULT                 _HRESULT_TYPEDEF_(0x8003001DL)
+
+//
+// MessageId: STG_E_READFAULT
+//
+// MessageText:
+//
+//  A disk error occurred during a read operation.
+//
+#define STG_E_READFAULT                  _HRESULT_TYPEDEF_(0x8003001EL)
+
+//
+// MessageId: STG_E_SHAREVIOLATION
+//
+// MessageText:
+//
+//  A share violation has occurred.
+//
+#define STG_E_SHAREVIOLATION             _HRESULT_TYPEDEF_(0x80030020L)
+
+//
+// MessageId: STG_E_LOCKVIOLATION
+//
+// MessageText:
+//
+//  A lock violation has occurred.
+//
+#define STG_E_LOCKVIOLATION              _HRESULT_TYPEDEF_(0x80030021L)
+
+//
+// MessageId: STG_E_FILEALREADYEXISTS
+//
+// MessageText:
+//
+//  %1 already exists.
+//
+#define STG_E_FILEALREADYEXISTS          _HRESULT_TYPEDEF_(0x80030050L)
+
+//
+// MessageId: STG_E_INVALIDPARAMETER
+//
+// MessageText:
+//
+//  Invalid parameter error.
+//
+#define STG_E_INVALIDPARAMETER           _HRESULT_TYPEDEF_(0x80030057L)
+
+//
+// MessageId: STG_E_MEDIUMFULL
+//
+// MessageText:
+//
+//  There is insufficient disk space to complete operation.
+//
+#define STG_E_MEDIUMFULL                 _HRESULT_TYPEDEF_(0x80030070L)
+
+//
+// MessageId: STG_E_PROPSETMISMATCHED
+//
+// MessageText:
+//
+//  Illegal write of non-simple property to simple property set.
+//
+#define STG_E_PROPSETMISMATCHED          _HRESULT_TYPEDEF_(0x800300F0L)
+
+//
+// MessageId: STG_E_ABNORMALAPIEXIT
+//
+// MessageText:
+//
+//  An API call exited abnormally.
+//
+#define STG_E_ABNORMALAPIEXIT            _HRESULT_TYPEDEF_(0x800300FAL)
+
+//
+// MessageId: STG_E_INVALIDHEADER
+//
+// MessageText:
+//
+//  The file %1 is not a valid compound file.
+//
+#define STG_E_INVALIDHEADER              _HRESULT_TYPEDEF_(0x800300FBL)
+
+//
+// MessageId: STG_E_INVALIDNAME
+//
+// MessageText:
+//
+//  The name %1 is not valid.
+//
+#define STG_E_INVALIDNAME                _HRESULT_TYPEDEF_(0x800300FCL)
+
+//
+// MessageId: STG_E_UNKNOWN
+//
+// MessageText:
+//
+//  An unexpected error occurred.
+//
+#define STG_E_UNKNOWN                    _HRESULT_TYPEDEF_(0x800300FDL)
+
+//
+// MessageId: STG_E_UNIMPLEMENTEDFUNCTION
+//
+// MessageText:
+//
+//  That function is not implemented.
+//
+#define STG_E_UNIMPLEMENTEDFUNCTION      _HRESULT_TYPEDEF_(0x800300FEL)
+
+//
+// MessageId: STG_E_INVALIDFLAG
+//
+// MessageText:
+//
+//  Invalid flag error.
+//
+#define STG_E_INVALIDFLAG                _HRESULT_TYPEDEF_(0x800300FFL)
+
+//
+// MessageId: STG_E_INUSE
+//
+// MessageText:
+//
+//  Attempted to use an object that is busy.
+//
+#define STG_E_INUSE                      _HRESULT_TYPEDEF_(0x80030100L)
+
+//
+// MessageId: STG_E_NOTCURRENT
+//
+// MessageText:
+//
+//  The storage has been changed since the last commit.
+//
+#define STG_E_NOTCURRENT                 _HRESULT_TYPEDEF_(0x80030101L)
+
+//
+// MessageId: STG_E_REVERTED
+//
+// MessageText:
+//
+//  Attempted to use an object that has ceased to exist.
+//
+#define STG_E_REVERTED                   _HRESULT_TYPEDEF_(0x80030102L)
+
+//
+// MessageId: STG_E_CANTSAVE
+//
+// MessageText:
+//
+//  Can't save.
+//
+#define STG_E_CANTSAVE                   _HRESULT_TYPEDEF_(0x80030103L)
+
+//
+// MessageId: STG_E_OLDFORMAT
+//
+// MessageText:
+//
+//  The compound file %1 was produced with an incompatible version of storage.
+//
+#define STG_E_OLDFORMAT                  _HRESULT_TYPEDEF_(0x80030104L)
+
+//
+// MessageId: STG_E_OLDDLL
+//
+// MessageText:
+//
+//  The compound file %1 was produced with a newer version of storage.
+//
+#define STG_E_OLDDLL                     _HRESULT_TYPEDEF_(0x80030105L)
+
+//
+// MessageId: STG_E_SHAREREQUIRED
+//
+// MessageText:
+//
+//  Share.exe or equivalent is required for operation.
+//
+#define STG_E_SHAREREQUIRED              _HRESULT_TYPEDEF_(0x80030106L)
+
+//
+// MessageId: STG_E_NOTFILEBASEDSTORAGE
+//
+// MessageText:
+//
+//  Illegal operation called on non-file based storage.
+//
+#define STG_E_NOTFILEBASEDSTORAGE        _HRESULT_TYPEDEF_(0x80030107L)
+
+//
+// MessageId: STG_E_EXTANTMARSHALLINGS
+//
+// MessageText:
+//
+//  Illegal operation called on object with extant marshallings.
+//
+#define STG_E_EXTANTMARSHALLINGS         _HRESULT_TYPEDEF_(0x80030108L)
+
+//
+// MessageId: STG_E_DOCFILECORRUPT
+//
+// MessageText:
+//
+//  The docfile has been corrupted.
+//
+#define STG_E_DOCFILECORRUPT             _HRESULT_TYPEDEF_(0x80030109L)
+
+//
+// MessageId: STG_E_BADBASEADDRESS
+//
+// MessageText:
+//
+//  OLE32.DLL has been loaded at the wrong address.
+//
+#define STG_E_BADBASEADDRESS             _HRESULT_TYPEDEF_(0x80030110L)
+
+//
+// MessageId: STG_E_DOCFILETOOLARGE
+//
+// MessageText:
+//
+//  The compound file is too large for the current implementation
+//
+#define STG_E_DOCFILETOOLARGE            _HRESULT_TYPEDEF_(0x80030111L)
+
+//
+// MessageId: STG_E_NOTSIMPLEFORMAT
+//
+// MessageText:
+//
+//  The compound file was not created with the STGM_SIMPLE flag
+//
+#define STG_E_NOTSIMPLEFORMAT            _HRESULT_TYPEDEF_(0x80030112L)
+
+//
+// MessageId: STG_E_INCOMPLETE
+//
+// MessageText:
+//
+//  The file download was aborted abnormally.  The file is incomplete.
+//
+#define STG_E_INCOMPLETE                 _HRESULT_TYPEDEF_(0x80030201L)
+
+//
+// MessageId: STG_E_TERMINATED
+//
+// MessageText:
+//
+//  The file download has been terminated.
+//
+#define STG_E_TERMINATED                 _HRESULT_TYPEDEF_(0x80030202L)
+
+//
+// MessageId: STG_S_CONVERTED
+//
+// MessageText:
+//
+//  The underlying file was converted to compound file format.
+//
+#define STG_S_CONVERTED                  _HRESULT_TYPEDEF_(0x00030200L)
+
+//
+// MessageId: STG_S_BLOCK
+//
+// MessageText:
+//
+//  The storage operation should block until more data is available.
+//
+#define STG_S_BLOCK                      _HRESULT_TYPEDEF_(0x00030201L)
+
+//
+// MessageId: STG_S_RETRYNOW
+//
+// MessageText:
+//
+//  The storage operation should retry immediately.
+//
+#define STG_S_RETRYNOW                   _HRESULT_TYPEDEF_(0x00030202L)
+
+//
+// MessageId: STG_S_MONITORING
+//
+// MessageText:
+//
+//  The notified event sink will not influence the storage operation.
+//
+#define STG_S_MONITORING                 _HRESULT_TYPEDEF_(0x00030203L)
+
+//
+// MessageId: STG_S_MULTIPLEOPENS
+//
+// MessageText:
+//
+//  Multiple opens prevent consolidated. (commit succeeded).
+//
+#define STG_S_MULTIPLEOPENS              _HRESULT_TYPEDEF_(0x00030204L)
+
+//
+// MessageId: STG_S_CONSOLIDATIONFAILED
+//
+// MessageText:
+//
+//  Consolidation of the storage file failed. (commit succeeded).
+//
+#define STG_S_CONSOLIDATIONFAILED        _HRESULT_TYPEDEF_(0x00030205L)
+
+//
+// MessageId: STG_S_CANNOTCONSOLIDATE
+//
+// MessageText:
+//
+//  Consolidation of the storage file is inappropriate. (commit succeeded).
+//
+#define STG_S_CANNOTCONSOLIDATE          _HRESULT_TYPEDEF_(0x00030206L)
+
+/*++
+
+ MessageId's 0x0305 - 0x031f (inclusive) are reserved for **STORAGE**
+ copy protection errors.
+
+--*/
+//
+// MessageId: STG_E_STATUS_COPY_PROTECTION_FAILURE
+//
+// MessageText:
+//
+//  Generic Copy Protection Error.
+//
+#define STG_E_STATUS_COPY_PROTECTION_FAILURE _HRESULT_TYPEDEF_(0x80030305L)
+
+//
+// MessageId: STG_E_CSS_AUTHENTICATION_FAILURE
+//
+// MessageText:
+//
+//  Copy Protection Error - DVD CSS Authentication failed.
+//
+#define STG_E_CSS_AUTHENTICATION_FAILURE _HRESULT_TYPEDEF_(0x80030306L)
+
+//
+// MessageId: STG_E_CSS_KEY_NOT_PRESENT
+//
+// MessageText:
+//
+//  Copy Protection Error - The given sector does not have a valid CSS key.
+//
+#define STG_E_CSS_KEY_NOT_PRESENT        _HRESULT_TYPEDEF_(0x80030307L)
+
+//
+// MessageId: STG_E_CSS_KEY_NOT_ESTABLISHED
+//
+// MessageText:
+//
+//  Copy Protection Error - DVD session key not established.
+//
+#define STG_E_CSS_KEY_NOT_ESTABLISHED    _HRESULT_TYPEDEF_(0x80030308L)
+
+//
+// MessageId: STG_E_CSS_SCRAMBLED_SECTOR
+//
+// MessageText:
+//
+//  Copy Protection Error - The read failed because the sector is encrypted.
+//
+#define STG_E_CSS_SCRAMBLED_SECTOR       _HRESULT_TYPEDEF_(0x80030309L)
+
+//
+// MessageId: STG_E_CSS_REGION_MISMATCH
+//
+// MessageText:
+//
+//  Copy Protection Error - The current DVD's region does not correspond to the region setting of the drive.
+//
+#define STG_E_CSS_REGION_MISMATCH        _HRESULT_TYPEDEF_(0x8003030AL)
+
+//
+// MessageId: STG_E_RESETS_EXHAUSTED
+//
+// MessageText:
+//
+//  Copy Protection Error - The drive's region setting may be permanent or the number of user resets has been exhausted.
+//
+#define STG_E_RESETS_EXHAUSTED           _HRESULT_TYPEDEF_(0x8003030BL)
+
+/*++
+
+ MessageId's 0x0305 - 0x031f (inclusive) are reserved for **STORAGE**
+ copy protection errors.
+
+--*/
+// ******************
+// FACILITY_RPC
+// ******************
+//
+// Codes 0x0-0x11 are propagated from 16 bit OLE.
+//
+//
+// MessageId: RPC_E_CALL_REJECTED
+//
+// MessageText:
+//
+//  Call was rejected by callee.
+//
+#define RPC_E_CALL_REJECTED              _HRESULT_TYPEDEF_(0x80010001L)
+
+//
+// MessageId: RPC_E_CALL_CANCELED
+//
+// MessageText:
+//
+//  Call was canceled by the message filter.
+//
+#define RPC_E_CALL_CANCELED              _HRESULT_TYPEDEF_(0x80010002L)
+
+//
+// MessageId: RPC_E_CANTPOST_INSENDCALL
+//
+// MessageText:
+//
+//  The caller is dispatching an intertask SendMessage call and cannot call out via PostMessage.
+//
+#define RPC_E_CANTPOST_INSENDCALL        _HRESULT_TYPEDEF_(0x80010003L)
+
+//
+// MessageId: RPC_E_CANTCALLOUT_INASYNCCALL
+//
+// MessageText:
+//
+//  The caller is dispatching an asynchronous call and cannot make an outgoing call on behalf of this call.
+//
+#define RPC_E_CANTCALLOUT_INASYNCCALL    _HRESULT_TYPEDEF_(0x80010004L)
+
+//
+// MessageId: RPC_E_CANTCALLOUT_INEXTERNALCALL
+//
+// MessageText:
+//
+//  It is illegal to call out while inside message filter.
+//
+#define RPC_E_CANTCALLOUT_INEXTERNALCALL _HRESULT_TYPEDEF_(0x80010005L)
+
+//
+// MessageId: RPC_E_CONNECTION_TERMINATED
+//
+// MessageText:
+//
+//  The connection terminated or is in a bogus state and cannot be used any more. Other connections are still valid.
+//
+#define RPC_E_CONNECTION_TERMINATED      _HRESULT_TYPEDEF_(0x80010006L)
+
+//
+// MessageId: RPC_E_SERVER_DIED
+//
+// MessageText:
+//
+//  The callee (server [not server application]) is not available and disappeared; all connections are invalid. The call may have executed.
+//
+#define RPC_E_SERVER_DIED                _HRESULT_TYPEDEF_(0x80010007L)
+
+//
+// MessageId: RPC_E_CLIENT_DIED
+//
+// MessageText:
+//
+//  The caller (client) disappeared while the callee (server) was processing a call.
+//
+#define RPC_E_CLIENT_DIED                _HRESULT_TYPEDEF_(0x80010008L)
+
+//
+// MessageId: RPC_E_INVALID_DATAPACKET
+//
+// MessageText:
+//
+//  The data packet with the marshalled parameter data is incorrect.
+//
+#define RPC_E_INVALID_DATAPACKET         _HRESULT_TYPEDEF_(0x80010009L)
+
+//
+// MessageId: RPC_E_CANTTRANSMIT_CALL
+//
+// MessageText:
+//
+//  The call was not transmitted properly; the message queue was full and was not emptied after yielding.
+//
+#define RPC_E_CANTTRANSMIT_CALL          _HRESULT_TYPEDEF_(0x8001000AL)
+
+//
+// MessageId: RPC_E_CLIENT_CANTMARSHAL_DATA
+//
+// MessageText:
+//
+//  The client (caller) cannot marshall the parameter data - low memory, etc.
+//
+#define RPC_E_CLIENT_CANTMARSHAL_DATA    _HRESULT_TYPEDEF_(0x8001000BL)
+
+//
+// MessageId: RPC_E_CLIENT_CANTUNMARSHAL_DATA
+//
+// MessageText:
+//
+//  The client (caller) cannot unmarshall the return data - low memory, etc.
+//
+#define RPC_E_CLIENT_CANTUNMARSHAL_DATA  _HRESULT_TYPEDEF_(0x8001000CL)
+
+//
+// MessageId: RPC_E_SERVER_CANTMARSHAL_DATA
+//
+// MessageText:
+//
+//  The server (callee) cannot marshall the return data - low memory, etc.
+//
+#define RPC_E_SERVER_CANTMARSHAL_DATA    _HRESULT_TYPEDEF_(0x8001000DL)
+
+//
+// MessageId: RPC_E_SERVER_CANTUNMARSHAL_DATA
+//
+// MessageText:
+//
+//  The server (callee) cannot unmarshall the parameter data - low memory, etc.
+//
+#define RPC_E_SERVER_CANTUNMARSHAL_DATA  _HRESULT_TYPEDEF_(0x8001000EL)
+
+//
+// MessageId: RPC_E_INVALID_DATA
+//
+// MessageText:
+//
+//  Received data is invalid; could be server or client data.
+//
+#define RPC_E_INVALID_DATA               _HRESULT_TYPEDEF_(0x8001000FL)
+
+//
+// MessageId: RPC_E_INVALID_PARAMETER
+//
+// MessageText:
+//
+//  A particular parameter is invalid and cannot be (un)marshalled.
+//
+#define RPC_E_INVALID_PARAMETER          _HRESULT_TYPEDEF_(0x80010010L)
+
+//
+// MessageId: RPC_E_CANTCALLOUT_AGAIN
+//
+// MessageText:
+//
+//  There is no second outgoing call on same channel in DDE conversation.
+//
+#define RPC_E_CANTCALLOUT_AGAIN          _HRESULT_TYPEDEF_(0x80010011L)
+
+//
+// MessageId: RPC_E_SERVER_DIED_DNE
+//
+// MessageText:
+//
+//  The callee (server [not server application]) is not available and disappeared; all connections are invalid. The call did not execute.
+//
+#define RPC_E_SERVER_DIED_DNE            _HRESULT_TYPEDEF_(0x80010012L)
+
+//
+// MessageId: RPC_E_SYS_CALL_FAILED
+//
+// MessageText:
+//
+//  System call failed.
+//
+#define RPC_E_SYS_CALL_FAILED            _HRESULT_TYPEDEF_(0x80010100L)
+
+//
+// MessageId: RPC_E_OUT_OF_RESOURCES
+//
+// MessageText:
+//
+//  Could not allocate some required resource (memory, events, ...)
+//
+#define RPC_E_OUT_OF_RESOURCES           _HRESULT_TYPEDEF_(0x80010101L)
+
+//
+// MessageId: RPC_E_ATTEMPTED_MULTITHREAD
+//
+// MessageText:
+//
+//  Attempted to make calls on more than one thread in single threaded mode.
+//
+#define RPC_E_ATTEMPTED_MULTITHREAD      _HRESULT_TYPEDEF_(0x80010102L)
+
+//
+// MessageId: RPC_E_NOT_REGISTERED
+//
+// MessageText:
+//
+//  The requested interface is not registered on the server object.
+//
+#define RPC_E_NOT_REGISTERED             _HRESULT_TYPEDEF_(0x80010103L)
+
+//
+// MessageId: RPC_E_FAULT
+//
+// MessageText:
+//
+//  RPC could not call the server or could not return the results of calling the server.
+//
+#define RPC_E_FAULT                      _HRESULT_TYPEDEF_(0x80010104L)
+
+//
+// MessageId: RPC_E_SERVERFAULT
+//
+// MessageText:
+//
+//  The server threw an exception.
+//
+#define RPC_E_SERVERFAULT                _HRESULT_TYPEDEF_(0x80010105L)
+
+//
+// MessageId: RPC_E_CHANGED_MODE
+//
+// MessageText:
+//
+//  Cannot change thread mode after it is set.
+//
+#define RPC_E_CHANGED_MODE               _HRESULT_TYPEDEF_(0x80010106L)
+
+//
+// MessageId: RPC_E_INVALIDMETHOD
+//
+// MessageText:
+//
+//  The method called does not exist on the server.
+//
+#define RPC_E_INVALIDMETHOD              _HRESULT_TYPEDEF_(0x80010107L)
+
+//
+// MessageId: RPC_E_DISCONNECTED
+//
+// MessageText:
+//
+//  The object invoked has disconnected from its clients.
+//
+#define RPC_E_DISCONNECTED               _HRESULT_TYPEDEF_(0x80010108L)
+
+//
+// MessageId: RPC_E_RETRY
+//
+// MessageText:
+//
+//  The object invoked chose not to process the call now.  Try again later.
+//
+#define RPC_E_RETRY                      _HRESULT_TYPEDEF_(0x80010109L)
+
+//
+// MessageId: RPC_E_SERVERCALL_RETRYLATER
+//
+// MessageText:
+//
+//  The message filter indicated that the application is busy.
+//
+#define RPC_E_SERVERCALL_RETRYLATER      _HRESULT_TYPEDEF_(0x8001010AL)
+
+//
+// MessageId: RPC_E_SERVERCALL_REJECTED
+//
+// MessageText:
+//
+//  The message filter rejected the call.
+//
+#define RPC_E_SERVERCALL_REJECTED        _HRESULT_TYPEDEF_(0x8001010BL)
+
+//
+// MessageId: RPC_E_INVALID_CALLDATA
+//
+// MessageText:
+//
+//  A call control interfaces was called with invalid data.
+//
+#define RPC_E_INVALID_CALLDATA           _HRESULT_TYPEDEF_(0x8001010CL)
+
+//
+// MessageId: RPC_E_CANTCALLOUT_ININPUTSYNCCALL
+//
+// MessageText:
+//
+//  An outgoing call cannot be made since the application is dispatching an input-synchronous call.
+//
+#define RPC_E_CANTCALLOUT_ININPUTSYNCCALL _HRESULT_TYPEDEF_(0x8001010DL)
+
+//
+// MessageId: RPC_E_WRONG_THREAD
+//
+// MessageText:
+//
+//  The application called an interface that was marshalled for a different thread.
+//
+#define RPC_E_WRONG_THREAD               _HRESULT_TYPEDEF_(0x8001010EL)
+
+//
+// MessageId: RPC_E_THREAD_NOT_INIT
+//
+// MessageText:
+//
+//  CoInitialize has not been called on the current thread.
+//
+#define RPC_E_THREAD_NOT_INIT            _HRESULT_TYPEDEF_(0x8001010FL)
+
+//
+// MessageId: RPC_E_VERSION_MISMATCH
+//
+// MessageText:
+//
+//  The version of OLE on the client and server machines does not match.
+//
+#define RPC_E_VERSION_MISMATCH           _HRESULT_TYPEDEF_(0x80010110L)
+
+//
+// MessageId: RPC_E_INVALID_HEADER
+//
+// MessageText:
+//
+//  OLE received a packet with an invalid header.
+//
+#define RPC_E_INVALID_HEADER             _HRESULT_TYPEDEF_(0x80010111L)
+
+//
+// MessageId: RPC_E_INVALID_EXTENSION
+//
+// MessageText:
+//
+//  OLE received a packet with an invalid extension.
+//
+#define RPC_E_INVALID_EXTENSION          _HRESULT_TYPEDEF_(0x80010112L)
+
+//
+// MessageId: RPC_E_INVALID_IPID
+//
+// MessageText:
+//
+//  The requested object or interface does not exist.
+//
+#define RPC_E_INVALID_IPID               _HRESULT_TYPEDEF_(0x80010113L)
+
+//
+// MessageId: RPC_E_INVALID_OBJECT
+//
+// MessageText:
+//
+//  The requested object does not exist.
+//
+#define RPC_E_INVALID_OBJECT             _HRESULT_TYPEDEF_(0x80010114L)
+
+//
+// MessageId: RPC_S_CALLPENDING
+//
+// MessageText:
+//
+//  OLE has sent a request and is waiting for a reply.
+//
+#define RPC_S_CALLPENDING                _HRESULT_TYPEDEF_(0x80010115L)
+
+//
+// MessageId: RPC_S_WAITONTIMER
+//
+// MessageText:
+//
+//  OLE is waiting before retrying a request.
+//
+#define RPC_S_WAITONTIMER                _HRESULT_TYPEDEF_(0x80010116L)
+
+//
+// MessageId: RPC_E_CALL_COMPLETE
+//
+// MessageText:
+//
+//  Call context cannot be accessed after call completed.
+//
+#define RPC_E_CALL_COMPLETE              _HRESULT_TYPEDEF_(0x80010117L)
+
+//
+// MessageId: RPC_E_UNSECURE_CALL
+//
+// MessageText:
+//
+//  Impersonate on unsecure calls is not supported.
+//
+#define RPC_E_UNSECURE_CALL              _HRESULT_TYPEDEF_(0x80010118L)
+
+//
+// MessageId: RPC_E_TOO_LATE
+//
+// MessageText:
+//
+//  Security must be initialized before any interfaces are marshalled or unmarshalled. It cannot be changed once initialized.
+//
+#define RPC_E_TOO_LATE                   _HRESULT_TYPEDEF_(0x80010119L)
+
+//
+// MessageId: RPC_E_NO_GOOD_SECURITY_PACKAGES
+//
+// MessageText:
+//
+//  No security packages are installed on this machine or the user is not logged on or there are no compatible security packages between the client and server.
+//
+#define RPC_E_NO_GOOD_SECURITY_PACKAGES  _HRESULT_TYPEDEF_(0x8001011AL)
+
+//
+// MessageId: RPC_E_ACCESS_DENIED
+//
+// MessageText:
+//
+//  Access is denied.
+//
+#define RPC_E_ACCESS_DENIED              _HRESULT_TYPEDEF_(0x8001011BL)
+
+//
+// MessageId: RPC_E_REMOTE_DISABLED
+//
+// MessageText:
+//
+//  Remote calls are not allowed for this process.
+//
+#define RPC_E_REMOTE_DISABLED            _HRESULT_TYPEDEF_(0x8001011CL)
+
+//
+// MessageId: RPC_E_INVALID_OBJREF
+//
+// MessageText:
+//
+//  The marshaled interface data packet (OBJREF) has an invalid or unknown format.
+//
+#define RPC_E_INVALID_OBJREF             _HRESULT_TYPEDEF_(0x8001011DL)
+
+//
+// MessageId: RPC_E_NO_CONTEXT
+//
+// MessageText:
+//
+//  No context is associated with this call. This happens for some custom marshalled calls and on the client side of the call.
+//
+#define RPC_E_NO_CONTEXT                 _HRESULT_TYPEDEF_(0x8001011EL)
+
+//
+// MessageId: RPC_E_TIMEOUT
+//
+// MessageText:
+//
+//  This operation returned because the timeout period expired.
+//
+#define RPC_E_TIMEOUT                    _HRESULT_TYPEDEF_(0x8001011FL)
+
+//
+// MessageId: RPC_E_NO_SYNC
+//
+// MessageText:
+//
+//  There are no synchronize objects to wait on.
+//
+#define RPC_E_NO_SYNC                    _HRESULT_TYPEDEF_(0x80010120L)
+
+//
+// MessageId: RPC_E_FULLSIC_REQUIRED
+//
+// MessageText:
+//
+//  Full subject issuer chain SSL principal name expected from the server.
+//
+#define RPC_E_FULLSIC_REQUIRED           _HRESULT_TYPEDEF_(0x80010121L)
+
+//
+// MessageId: RPC_E_INVALID_STD_NAME
+//
+// MessageText:
+//
+//  Principal name is not a valid MSSTD name.
+//
+#define RPC_E_INVALID_STD_NAME           _HRESULT_TYPEDEF_(0x80010122L)
+
+//
+// MessageId: CO_E_FAILEDTOIMPERSONATE
+//
+// MessageText:
+//
+//  Unable to impersonate DCOM client
+//
+#define CO_E_FAILEDTOIMPERSONATE         _HRESULT_TYPEDEF_(0x80010123L)
+
+//
+// MessageId: CO_E_FAILEDTOGETSECCTX
+//
+// MessageText:
+//
+//  Unable to obtain server's security context
+//
+#define CO_E_FAILEDTOGETSECCTX           _HRESULT_TYPEDEF_(0x80010124L)
+
+//
+// MessageId: CO_E_FAILEDTOOPENTHREADTOKEN
+//
+// MessageText:
+//
+//  Unable to open the access token of the current thread
+//
+#define CO_E_FAILEDTOOPENTHREADTOKEN     _HRESULT_TYPEDEF_(0x80010125L)
+
+//
+// MessageId: CO_E_FAILEDTOGETTOKENINFO
+//
+// MessageText:
+//
+//  Unable to obtain user info from an access token
+//
+#define CO_E_FAILEDTOGETTOKENINFO        _HRESULT_TYPEDEF_(0x80010126L)
+
+//
+// MessageId: CO_E_TRUSTEEDOESNTMATCHCLIENT
+//
+// MessageText:
+//
+//  The client who called IAccessControl::IsAccessPermitted was not the trustee provided to the method
+//
+#define CO_E_TRUSTEEDOESNTMATCHCLIENT    _HRESULT_TYPEDEF_(0x80010127L)
+
+//
+// MessageId: CO_E_FAILEDTOQUERYCLIENTBLANKET
+//
+// MessageText:
+//
+//  Unable to obtain the client's security blanket
+//
+#define CO_E_FAILEDTOQUERYCLIENTBLANKET  _HRESULT_TYPEDEF_(0x80010128L)
+
+//
+// MessageId: CO_E_FAILEDTOSETDACL
+//
+// MessageText:
+//
+//  Unable to set a discretionary ACL into a security descriptor
+//
+#define CO_E_FAILEDTOSETDACL             _HRESULT_TYPEDEF_(0x80010129L)
+
+//
+// MessageId: CO_E_ACCESSCHECKFAILED
+//
+// MessageText:
+//
+//  The system function, AccessCheck, returned false
+//
+#define CO_E_ACCESSCHECKFAILED           _HRESULT_TYPEDEF_(0x8001012AL)
+
+//
+// MessageId: CO_E_NETACCESSAPIFAILED
+//
+// MessageText:
+//
+//  Either NetAccessDel or NetAccessAdd returned an error code.
+//
+#define CO_E_NETACCESSAPIFAILED          _HRESULT_TYPEDEF_(0x8001012BL)
+
+//
+// MessageId: CO_E_WRONGTRUSTEENAMESYNTAX
+//
+// MessageText:
+//
+//  One of the trustee strings provided by the user did not conform to the <Domain>\<Name> syntax and it was not the "*" string
+//
+#define CO_E_WRONGTRUSTEENAMESYNTAX      _HRESULT_TYPEDEF_(0x8001012CL)
+
+//
+// MessageId: CO_E_INVALIDSID
+//
+// MessageText:
+//
+//  One of the security identifiers provided by the user was invalid
+//
+#define CO_E_INVALIDSID                  _HRESULT_TYPEDEF_(0x8001012DL)
+
+//
+// MessageId: CO_E_CONVERSIONFAILED
+//
+// MessageText:
+//
+//  Unable to convert a wide character trustee string to a multibyte trustee string
+//
+#define CO_E_CONVERSIONFAILED            _HRESULT_TYPEDEF_(0x8001012EL)
+
+//
+// MessageId: CO_E_NOMATCHINGSIDFOUND
+//
+// MessageText:
+//
+//  Unable to find a security identifier that corresponds to a trustee string provided by the user
+//
+#define CO_E_NOMATCHINGSIDFOUND          _HRESULT_TYPEDEF_(0x8001012FL)
+
+//
+// MessageId: CO_E_LOOKUPACCSIDFAILED
+//
+// MessageText:
+//
+//  The system function, LookupAccountSID, failed
+//
+#define CO_E_LOOKUPACCSIDFAILED          _HRESULT_TYPEDEF_(0x80010130L)
+
+//
+// MessageId: CO_E_NOMATCHINGNAMEFOUND
+//
+// MessageText:
+//
+//  Unable to find a trustee name that corresponds to a security identifier provided by the user
+//
+#define CO_E_NOMATCHINGNAMEFOUND         _HRESULT_TYPEDEF_(0x80010131L)
+
+//
+// MessageId: CO_E_LOOKUPACCNAMEFAILED
+//
+// MessageText:
+//
+//  The system function, LookupAccountName, failed
+//
+#define CO_E_LOOKUPACCNAMEFAILED         _HRESULT_TYPEDEF_(0x80010132L)
+
+//
+// MessageId: CO_E_SETSERLHNDLFAILED
+//
+// MessageText:
+//
+//  Unable to set or reset a serialization handle
+//
+#define CO_E_SETSERLHNDLFAILED           _HRESULT_TYPEDEF_(0x80010133L)
+
+//
+// MessageId: CO_E_FAILEDTOGETWINDIR
+//
+// MessageText:
+//
+//  Unable to obtain the Windows directory
+//
+#define CO_E_FAILEDTOGETWINDIR           _HRESULT_TYPEDEF_(0x80010134L)
+
+//
+// MessageId: CO_E_PATHTOOLONG
+//
+// MessageText:
+//
+//  Path too long
+//
+#define CO_E_PATHTOOLONG                 _HRESULT_TYPEDEF_(0x80010135L)
+
+//
+// MessageId: CO_E_FAILEDTOGENUUID
+//
+// MessageText:
+//
+//  Unable to generate a uuid.
+//
+#define CO_E_FAILEDTOGENUUID             _HRESULT_TYPEDEF_(0x80010136L)
+
+//
+// MessageId: CO_E_FAILEDTOCREATEFILE
+//
+// MessageText:
+//
+//  Unable to create file
+//
+#define CO_E_FAILEDTOCREATEFILE          _HRESULT_TYPEDEF_(0x80010137L)
+
+//
+// MessageId: CO_E_FAILEDTOCLOSEHANDLE
+//
+// MessageText:
+//
+//  Unable to close a serialization handle or a file handle.
+//
+#define CO_E_FAILEDTOCLOSEHANDLE         _HRESULT_TYPEDEF_(0x80010138L)
+
+//
+// MessageId: CO_E_EXCEEDSYSACLLIMIT
+//
+// MessageText:
+//
+//  The number of ACEs in an ACL exceeds the system limit.
+//
+#define CO_E_EXCEEDSYSACLLIMIT           _HRESULT_TYPEDEF_(0x80010139L)
+
+//
+// MessageId: CO_E_ACESINWRONGORDER
+//
+// MessageText:
+//
+//  Not all the DENY_ACCESS ACEs are arranged in front of the GRANT_ACCESS ACEs in the stream.
+//
+#define CO_E_ACESINWRONGORDER            _HRESULT_TYPEDEF_(0x8001013AL)
+
+//
+// MessageId: CO_E_INCOMPATIBLESTREAMVERSION
+//
+// MessageText:
+//
+//  The version of ACL format in the stream is not supported by this implementation of IAccessControl
+//
+#define CO_E_INCOMPATIBLESTREAMVERSION   _HRESULT_TYPEDEF_(0x8001013BL)
+
+//
+// MessageId: CO_E_FAILEDTOOPENPROCESSTOKEN
+//
+// MessageText:
+//
+//  Unable to open the access token of the server process
+//
+#define CO_E_FAILEDTOOPENPROCESSTOKEN    _HRESULT_TYPEDEF_(0x8001013CL)
+
+//
+// MessageId: CO_E_DECODEFAILED
+//
+// MessageText:
+//
+//  Unable to decode the ACL in the stream provided by the user
+//
+#define CO_E_DECODEFAILED                _HRESULT_TYPEDEF_(0x8001013DL)
+
+//
+// MessageId: CO_E_ACNOTINITIALIZED
+//
+// MessageText:
+//
+//  The COM IAccessControl object is not initialized
+//
+#define CO_E_ACNOTINITIALIZED            _HRESULT_TYPEDEF_(0x8001013FL)
+
+//
+// MessageId: CO_E_CANCEL_DISABLED
+//
+// MessageText:
+//
+//  Call Cancellation is disabled
+//
+#define CO_E_CANCEL_DISABLED             _HRESULT_TYPEDEF_(0x80010140L)
+
+//
+// MessageId: RPC_E_UNEXPECTED
+//
+// MessageText:
+//
+//  An internal error occurred.
+//
+#define RPC_E_UNEXPECTED                 _HRESULT_TYPEDEF_(0x8001FFFFL)
+
+
+
+//////////////////////////////////////
+//                                  //
+// Additional Security Status Codes //
+//                                  //
+// Facility=Security                //
+//                                  //
+//////////////////////////////////////
+
+
+//
+// MessageId: ERROR_AUDITING_DISABLED
+//
+// MessageText:
+//
+//  The specified event is currently not being audited.
+//
+#define ERROR_AUDITING_DISABLED          _HRESULT_TYPEDEF_(0xC0090001L)
+
+//
+// MessageId: ERROR_ALL_SIDS_FILTERED
+//
+// MessageText:
+//
+//  The SID filtering operation removed all SIDs.
+//
+#define ERROR_ALL_SIDS_FILTERED          _HRESULT_TYPEDEF_(0xC0090002L)
+
+
+
+/////////////////////////////////////////////
+//                                         //
+// end of Additional Security Status Codes //
+//                                         //
+/////////////////////////////////////////////
+
+
+
+ /////////////////
+ //
+ //  FACILITY_SSPI
+ //
+ /////////////////
+
+//
+// MessageId: NTE_BAD_UID
+//
+// MessageText:
+//
+//  Bad UID.
+//
+#define NTE_BAD_UID                      _HRESULT_TYPEDEF_(0x80090001L)
+
+//
+// MessageId: NTE_BAD_HASH
+//
+// MessageText:
+//
+//  Bad Hash.
+//
+#define NTE_BAD_HASH                     _HRESULT_TYPEDEF_(0x80090002L)
+
+//
+// MessageId: NTE_BAD_KEY
+//
+// MessageText:
+//
+//  Bad Key.
+//
+#define NTE_BAD_KEY                      _HRESULT_TYPEDEF_(0x80090003L)
+
+//
+// MessageId: NTE_BAD_LEN
+//
+// MessageText:
+//
+//  Bad Length.
+//
+#define NTE_BAD_LEN                      _HRESULT_TYPEDEF_(0x80090004L)
+
+//
+// MessageId: NTE_BAD_DATA
+//
+// MessageText:
+//
+//  Bad Data.
+//
+#define NTE_BAD_DATA                     _HRESULT_TYPEDEF_(0x80090005L)
+
+//
+// MessageId: NTE_BAD_SIGNATURE
+//
+// MessageText:
+//
+//  Invalid Signature.
+//
+#define NTE_BAD_SIGNATURE                _HRESULT_TYPEDEF_(0x80090006L)
+
+//
+// MessageId: NTE_BAD_VER
+//
+// MessageText:
+//
+//  Bad Version of provider.
+//
+#define NTE_BAD_VER                      _HRESULT_TYPEDEF_(0x80090007L)
+
+//
+// MessageId: NTE_BAD_ALGID
+//
+// MessageText:
+//
+//  Invalid algorithm specified.
+//
+#define NTE_BAD_ALGID                    _HRESULT_TYPEDEF_(0x80090008L)
+
+//
+// MessageId: NTE_BAD_FLAGS
+//
+// MessageText:
+//
+//  Invalid flags specified.
+//
+#define NTE_BAD_FLAGS                    _HRESULT_TYPEDEF_(0x80090009L)
+
+//
+// MessageId: NTE_BAD_TYPE
+//
+// MessageText:
+//
+//  Invalid type specified.
+//
+#define NTE_BAD_TYPE                     _HRESULT_TYPEDEF_(0x8009000AL)
+
+//
+// MessageId: NTE_BAD_KEY_STATE
+//
+// MessageText:
+//
+//  Key not valid for use in specified state.
+//
+#define NTE_BAD_KEY_STATE                _HRESULT_TYPEDEF_(0x8009000BL)
+
+//
+// MessageId: NTE_BAD_HASH_STATE
+//
+// MessageText:
+//
+//  Hash not valid for use in specified state.
+//
+#define NTE_BAD_HASH_STATE               _HRESULT_TYPEDEF_(0x8009000CL)
+
+//
+// MessageId: NTE_NO_KEY
+//
+// MessageText:
+//
+//  Key does not exist.
+//
+#define NTE_NO_KEY                       _HRESULT_TYPEDEF_(0x8009000DL)
+
+//
+// MessageId: NTE_NO_MEMORY
+//
+// MessageText:
+//
+//  Insufficient memory available for the operation.
+//
+#define NTE_NO_MEMORY                    _HRESULT_TYPEDEF_(0x8009000EL)
+
+//
+// MessageId: NTE_EXISTS
+//
+// MessageText:
+//
+//  Object already exists.
+//
+#define NTE_EXISTS                       _HRESULT_TYPEDEF_(0x8009000FL)
+
+//
+// MessageId: NTE_PERM
+//
+// MessageText:
+//
+//  Access denied.
+//
+#define NTE_PERM                         _HRESULT_TYPEDEF_(0x80090010L)
+
+//
+// MessageId: NTE_NOT_FOUND
+//
+// MessageText:
+//
+//  Object was not found.
+//
+#define NTE_NOT_FOUND                    _HRESULT_TYPEDEF_(0x80090011L)
+
+//
+// MessageId: NTE_DOUBLE_ENCRYPT
+//
+// MessageText:
+//
+//  Data already encrypted.
+//
+#define NTE_DOUBLE_ENCRYPT               _HRESULT_TYPEDEF_(0x80090012L)
+
+//
+// MessageId: NTE_BAD_PROVIDER
+//
+// MessageText:
+//
+//  Invalid provider specified.
+//
+#define NTE_BAD_PROVIDER                 _HRESULT_TYPEDEF_(0x80090013L)
+
+//
+// MessageId: NTE_BAD_PROV_TYPE
+//
+// MessageText:
+//
+//  Invalid provider type specified.
+//
+#define NTE_BAD_PROV_TYPE                _HRESULT_TYPEDEF_(0x80090014L)
+
+//
+// MessageId: NTE_BAD_PUBLIC_KEY
+//
+// MessageText:
+//
+//  Provider's public key is invalid.
+//
+#define NTE_BAD_PUBLIC_KEY               _HRESULT_TYPEDEF_(0x80090015L)
+
+//
+// MessageId: NTE_BAD_KEYSET
+//
+// MessageText:
+//
+//  Keyset does not exist
+//
+#define NTE_BAD_KEYSET                   _HRESULT_TYPEDEF_(0x80090016L)
+
+//
+// MessageId: NTE_PROV_TYPE_NOT_DEF
+//
+// MessageText:
+//
+//  Provider type not defined.
+//
+#define NTE_PROV_TYPE_NOT_DEF            _HRESULT_TYPEDEF_(0x80090017L)
+
+//
+// MessageId: NTE_PROV_TYPE_ENTRY_BAD
+//
+// MessageText:
+//
+//  Provider type as registered is invalid.
+//
+#define NTE_PROV_TYPE_ENTRY_BAD          _HRESULT_TYPEDEF_(0x80090018L)
+
+//
+// MessageId: NTE_KEYSET_NOT_DEF
+//
+// MessageText:
+//
+//  The keyset is not defined.
+//
+#define NTE_KEYSET_NOT_DEF               _HRESULT_TYPEDEF_(0x80090019L)
+
+//
+// MessageId: NTE_KEYSET_ENTRY_BAD
+//
+// MessageText:
+//
+//  Keyset as registered is invalid.
+//
+#define NTE_KEYSET_ENTRY_BAD             _HRESULT_TYPEDEF_(0x8009001AL)
+
+//
+// MessageId: NTE_PROV_TYPE_NO_MATCH
+//
+// MessageText:
+//
+//  Provider type does not match registered value.
+//
+#define NTE_PROV_TYPE_NO_MATCH           _HRESULT_TYPEDEF_(0x8009001BL)
+
+//
+// MessageId: NTE_SIGNATURE_FILE_BAD
+//
+// MessageText:
+//
+//  The digital signature file is corrupt.
+//
+#define NTE_SIGNATURE_FILE_BAD           _HRESULT_TYPEDEF_(0x8009001CL)
+
+//
+// MessageId: NTE_PROVIDER_DLL_FAIL
+//
+// MessageText:
+//
+//  Provider DLL failed to initialize correctly.
+//
+#define NTE_PROVIDER_DLL_FAIL            _HRESULT_TYPEDEF_(0x8009001DL)
+
+//
+// MessageId: NTE_PROV_DLL_NOT_FOUND
+//
+// MessageText:
+//
+//  Provider DLL could not be found.
+//
+#define NTE_PROV_DLL_NOT_FOUND           _HRESULT_TYPEDEF_(0x8009001EL)
+
+//
+// MessageId: NTE_BAD_KEYSET_PARAM
+//
+// MessageText:
+//
+//  The Keyset parameter is invalid.
+//
+#define NTE_BAD_KEYSET_PARAM             _HRESULT_TYPEDEF_(0x8009001FL)
+
+//
+// MessageId: NTE_FAIL
+//
+// MessageText:
+//
+//  An internal error occurred.
+//
+#define NTE_FAIL                         _HRESULT_TYPEDEF_(0x80090020L)
+
+//
+// MessageId: NTE_SYS_ERR
+//
+// MessageText:
+//
+//  A base error occurred.
+//
+#define NTE_SYS_ERR                      _HRESULT_TYPEDEF_(0x80090021L)
+
+//
+// MessageId: NTE_SILENT_CONTEXT
+//
+// MessageText:
+//
+//  Provider could not perform the action since the context was acquired as silent.
+//
+#define NTE_SILENT_CONTEXT               _HRESULT_TYPEDEF_(0x80090022L)
+
+//
+// MessageId: NTE_TOKEN_KEYSET_STORAGE_FULL
+//
+// MessageText:
+//
+//  The security token does not have storage space available for an additional container.
+//
+#define NTE_TOKEN_KEYSET_STORAGE_FULL    _HRESULT_TYPEDEF_(0x80090023L)
+
+//
+// MessageId: NTE_TEMPORARY_PROFILE
+//
+// MessageText:
+//
+//  The profile for the user is a temporary profile.
+//
+#define NTE_TEMPORARY_PROFILE            _HRESULT_TYPEDEF_(0x80090024L)
+
+//
+// MessageId: NTE_FIXEDPARAMETER
+//
+// MessageText:
+//
+//  The key parameters could not be set because the CSP uses fixed parameters.
+//
+#define NTE_FIXEDPARAMETER               _HRESULT_TYPEDEF_(0x80090025L)
+
+//
+// MessageId: SEC_E_INSUFFICIENT_MEMORY
+//
+// MessageText:
+//
+//  Not enough memory is available to complete this request
+//
+#define SEC_E_INSUFFICIENT_MEMORY        _HRESULT_TYPEDEF_(0x80090300L)
+
+//
+// MessageId: SEC_E_INVALID_HANDLE
+//
+// MessageText:
+//
+//  The handle specified is invalid
+//
+#define SEC_E_INVALID_HANDLE             _HRESULT_TYPEDEF_(0x80090301L)
+
+//
+// MessageId: SEC_E_UNSUPPORTED_FUNCTION
+//
+// MessageText:
+//
+//  The function requested is not supported
+//
+#define SEC_E_UNSUPPORTED_FUNCTION       _HRESULT_TYPEDEF_(0x80090302L)
+
+//
+// MessageId: SEC_E_TARGET_UNKNOWN
+//
+// MessageText:
+//
+//  The specified target is unknown or unreachable
+//
+#define SEC_E_TARGET_UNKNOWN             _HRESULT_TYPEDEF_(0x80090303L)
+
+//
+// MessageId: SEC_E_INTERNAL_ERROR
+//
+// MessageText:
+//
+//  The Local Security Authority cannot be contacted
+//
+#define SEC_E_INTERNAL_ERROR             _HRESULT_TYPEDEF_(0x80090304L)
+
+//
+// MessageId: SEC_E_SECPKG_NOT_FOUND
+//
+// MessageText:
+//
+//  The requested security package does not exist
+//
+#define SEC_E_SECPKG_NOT_FOUND           _HRESULT_TYPEDEF_(0x80090305L)
+
+//
+// MessageId: SEC_E_NOT_OWNER
+//
+// MessageText:
+//
+//  The caller is not the owner of the desired credentials
+//
+#define SEC_E_NOT_OWNER                  _HRESULT_TYPEDEF_(0x80090306L)
+
+//
+// MessageId: SEC_E_CANNOT_INSTALL
+//
+// MessageText:
+//
+//  The security package failed to initialize, and cannot be installed
+//
+#define SEC_E_CANNOT_INSTALL             _HRESULT_TYPEDEF_(0x80090307L)
+
+//
+// MessageId: SEC_E_INVALID_TOKEN
+//
+// MessageText:
+//
+//  The token supplied to the function is invalid
+//
+#define SEC_E_INVALID_TOKEN              _HRESULT_TYPEDEF_(0x80090308L)
+
+//
+// MessageId: SEC_E_CANNOT_PACK
+//
+// MessageText:
+//
+//  The security package is not able to marshall the logon buffer, so the logon attempt has failed
+//
+#define SEC_E_CANNOT_PACK                _HRESULT_TYPEDEF_(0x80090309L)
+
+//
+// MessageId: SEC_E_QOP_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The per-message Quality of Protection is not supported by the security package
+//
+#define SEC_E_QOP_NOT_SUPPORTED          _HRESULT_TYPEDEF_(0x8009030AL)
+
+//
+// MessageId: SEC_E_NO_IMPERSONATION
+//
+// MessageText:
+//
+//  The security context does not allow impersonation of the client
+//
+#define SEC_E_NO_IMPERSONATION           _HRESULT_TYPEDEF_(0x8009030BL)
+
+//
+// MessageId: SEC_E_LOGON_DENIED
+//
+// MessageText:
+//
+//  The logon attempt failed
+//
+#define SEC_E_LOGON_DENIED               _HRESULT_TYPEDEF_(0x8009030CL)
+
+//
+// MessageId: SEC_E_UNKNOWN_CREDENTIALS
+//
+// MessageText:
+//
+//  The credentials supplied to the package were not recognized
+//
+#define SEC_E_UNKNOWN_CREDENTIALS        _HRESULT_TYPEDEF_(0x8009030DL)
+
+//
+// MessageId: SEC_E_NO_CREDENTIALS
+//
+// MessageText:
+//
+//  No credentials are available in the security package
+//
+#define SEC_E_NO_CREDENTIALS             _HRESULT_TYPEDEF_(0x8009030EL)
+
+//
+// MessageId: SEC_E_MESSAGE_ALTERED
+//
+// MessageText:
+//
+//  The message or signature supplied for verification has been altered
+//
+#define SEC_E_MESSAGE_ALTERED            _HRESULT_TYPEDEF_(0x8009030FL)
+
+//
+// MessageId: SEC_E_OUT_OF_SEQUENCE
+//
+// MessageText:
+//
+//  The message supplied for verification is out of sequence
+//
+#define SEC_E_OUT_OF_SEQUENCE            _HRESULT_TYPEDEF_(0x80090310L)
+
+//
+// MessageId: SEC_E_NO_AUTHENTICATING_AUTHORITY
+//
+// MessageText:
+//
+//  No authority could be contacted for authentication.
+//
+#define SEC_E_NO_AUTHENTICATING_AUTHORITY _HRESULT_TYPEDEF_(0x80090311L)
+
+//
+// MessageId: SEC_I_CONTINUE_NEEDED
+//
+// MessageText:
+//
+//  The function completed successfully, but must be called again to complete the context
+//
+#define SEC_I_CONTINUE_NEEDED            _HRESULT_TYPEDEF_(0x00090312L)
+
+//
+// MessageId: SEC_I_COMPLETE_NEEDED
+//
+// MessageText:
+//
+//  The function completed successfully, but CompleteToken must be called
+//
+#define SEC_I_COMPLETE_NEEDED            _HRESULT_TYPEDEF_(0x00090313L)
+
+//
+// MessageId: SEC_I_COMPLETE_AND_CONTINUE
+//
+// MessageText:
+//
+//  The function completed successfully, but both CompleteToken and this function must be called to complete the context
+//
+#define SEC_I_COMPLETE_AND_CONTINUE      _HRESULT_TYPEDEF_(0x00090314L)
+
+//
+// MessageId: SEC_I_LOCAL_LOGON
+//
+// MessageText:
+//
+//  The logon was completed, but no network authority was available. The logon was made using locally known information
+//
+#define SEC_I_LOCAL_LOGON                _HRESULT_TYPEDEF_(0x00090315L)
+
+//
+// MessageId: SEC_E_BAD_PKGID
+//
+// MessageText:
+//
+//  The requested security package does not exist
+//
+#define SEC_E_BAD_PKGID                  _HRESULT_TYPEDEF_(0x80090316L)
+
+//
+// MessageId: SEC_E_CONTEXT_EXPIRED
+//
+// MessageText:
+//
+//  The context has expired and can no longer be used.
+//
+#define SEC_E_CONTEXT_EXPIRED            _HRESULT_TYPEDEF_(0x80090317L)
+
+//
+// MessageId: SEC_I_CONTEXT_EXPIRED
+//
+// MessageText:
+//
+//  The context has expired and can no longer be used.
+//
+#define SEC_I_CONTEXT_EXPIRED            _HRESULT_TYPEDEF_(0x00090317L)
+
+//
+// MessageId: SEC_E_INCOMPLETE_MESSAGE
+//
+// MessageText:
+//
+//  The supplied message is incomplete.  The signature was not verified.
+//
+#define SEC_E_INCOMPLETE_MESSAGE         _HRESULT_TYPEDEF_(0x80090318L)
+
+//
+// MessageId: SEC_E_INCOMPLETE_CREDENTIALS
+//
+// MessageText:
+//
+//  The credentials supplied were not complete, and could not be verified. The context could not be initialized.
+//
+#define SEC_E_INCOMPLETE_CREDENTIALS     _HRESULT_TYPEDEF_(0x80090320L)
+
+//
+// MessageId: SEC_E_BUFFER_TOO_SMALL
+//
+// MessageText:
+//
+//  The buffers supplied to a function was too small.
+//
+#define SEC_E_BUFFER_TOO_SMALL           _HRESULT_TYPEDEF_(0x80090321L)
+
+//
+// MessageId: SEC_I_INCOMPLETE_CREDENTIALS
+//
+// MessageText:
+//
+//  The credentials supplied were not complete, and could not be verified. Additional information can be returned from the context.
+//
+#define SEC_I_INCOMPLETE_CREDENTIALS     _HRESULT_TYPEDEF_(0x00090320L)
+
+//
+// MessageId: SEC_I_RENEGOTIATE
+//
+// MessageText:
+//
+//  The context data must be renegotiated with the peer.
+//
+#define SEC_I_RENEGOTIATE                _HRESULT_TYPEDEF_(0x00090321L)
+
+//
+// MessageId: SEC_E_WRONG_PRINCIPAL
+//
+// MessageText:
+//
+//  The target principal name is incorrect.
+//
+#define SEC_E_WRONG_PRINCIPAL            _HRESULT_TYPEDEF_(0x80090322L)
+
+//
+// MessageId: SEC_I_NO_LSA_CONTEXT
+//
+// MessageText:
+//
+//  There is no LSA mode context associated with this context.
+//
+#define SEC_I_NO_LSA_CONTEXT             _HRESULT_TYPEDEF_(0x00090323L)
+
+//
+// MessageId: SEC_E_TIME_SKEW
+//
+// MessageText:
+//
+//  The clocks on the client and server machines are skewed.
+//
+#define SEC_E_TIME_SKEW                  _HRESULT_TYPEDEF_(0x80090324L)
+
+//
+// MessageId: SEC_E_UNTRUSTED_ROOT
+//
+// MessageText:
+//
+//  The certificate chain was issued by an authority that is not trusted.
+//
+#define SEC_E_UNTRUSTED_ROOT             _HRESULT_TYPEDEF_(0x80090325L)
+
+//
+// MessageId: SEC_E_ILLEGAL_MESSAGE
+//
+// MessageText:
+//
+//  The message received was unexpected or badly formatted.
+//
+#define SEC_E_ILLEGAL_MESSAGE            _HRESULT_TYPEDEF_(0x80090326L)
+
+//
+// MessageId: SEC_E_CERT_UNKNOWN
+//
+// MessageText:
+//
+//  An unknown error occurred while processing the certificate.
+//
+#define SEC_E_CERT_UNKNOWN               _HRESULT_TYPEDEF_(0x80090327L)
+
+//
+// MessageId: SEC_E_CERT_EXPIRED
+//
+// MessageText:
+//
+//  The received certificate has expired.
+//
+#define SEC_E_CERT_EXPIRED               _HRESULT_TYPEDEF_(0x80090328L)
+
+//
+// MessageId: SEC_E_ENCRYPT_FAILURE
+//
+// MessageText:
+//
+//  The specified data could not be encrypted.
+//
+#define SEC_E_ENCRYPT_FAILURE            _HRESULT_TYPEDEF_(0x80090329L)
+
+//
+// MessageId: SEC_E_DECRYPT_FAILURE
+//
+// MessageText:
+//
+//  The specified data could not be decrypted.
+//  
+//
+#define SEC_E_DECRYPT_FAILURE            _HRESULT_TYPEDEF_(0x80090330L)
+
+//
+// MessageId: SEC_E_ALGORITHM_MISMATCH
+//
+// MessageText:
+//
+//  The client and server cannot communicate, because they do not possess a common algorithm.
+//
+#define SEC_E_ALGORITHM_MISMATCH         _HRESULT_TYPEDEF_(0x80090331L)
+
+//
+// MessageId: SEC_E_SECURITY_QOS_FAILED
+//
+// MessageText:
+//
+//  The security context could not be established due to a failure in the requested quality of service (e.g. mutual authentication or delegation).
+//
+#define SEC_E_SECURITY_QOS_FAILED        _HRESULT_TYPEDEF_(0x80090332L)
+
+//
+// MessageId: SEC_E_UNFINISHED_CONTEXT_DELETED
+//
+// MessageText:
+//
+//  A security context was deleted before the context was completed.  This is considered a logon failure.
+//
+#define SEC_E_UNFINISHED_CONTEXT_DELETED _HRESULT_TYPEDEF_(0x80090333L)
+
+//
+// MessageId: SEC_E_NO_TGT_REPLY
+//
+// MessageText:
+//
+//  The client is trying to negotiate a context and the server requires user-to-user but didn't send a TGT reply.
+//
+#define SEC_E_NO_TGT_REPLY               _HRESULT_TYPEDEF_(0x80090334L)
+
+//
+// MessageId: SEC_E_NO_IP_ADDRESSES
+//
+// MessageText:
+//
+//  Unable to accomplish the requested task because the local machine does not have any IP addresses.
+//
+#define SEC_E_NO_IP_ADDRESSES            _HRESULT_TYPEDEF_(0x80090335L)
+
+//
+// MessageId: SEC_E_WRONG_CREDENTIAL_HANDLE
+//
+// MessageText:
+//
+//  The supplied credential handle does not match the credential associated with the security context.
+//
+#define SEC_E_WRONG_CREDENTIAL_HANDLE    _HRESULT_TYPEDEF_(0x80090336L)
+
+//
+// MessageId: SEC_E_CRYPTO_SYSTEM_INVALID
+//
+// MessageText:
+//
+//  The crypto system or checksum function is invalid because a required function is unavailable.
+//
+#define SEC_E_CRYPTO_SYSTEM_INVALID      _HRESULT_TYPEDEF_(0x80090337L)
+
+//
+// MessageId: SEC_E_MAX_REFERRALS_EXCEEDED
+//
+// MessageText:
+//
+//  The number of maximum ticket referrals has been exceeded.
+//
+#define SEC_E_MAX_REFERRALS_EXCEEDED     _HRESULT_TYPEDEF_(0x80090338L)
+
+//
+// MessageId: SEC_E_MUST_BE_KDC
+//
+// MessageText:
+//
+//  The local machine must be a Kerberos KDC (domain controller) and it is not.
+//
+#define SEC_E_MUST_BE_KDC                _HRESULT_TYPEDEF_(0x80090339L)
+
+//
+// MessageId: SEC_E_STRONG_CRYPTO_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The other end of the security negotiation is requires strong crypto but it is not supported on the local machine.
+//
+#define SEC_E_STRONG_CRYPTO_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8009033AL)
+
+//
+// MessageId: SEC_E_TOO_MANY_PRINCIPALS
+//
+// MessageText:
+//
+//  The KDC reply contained more than one principal name.
+//
+#define SEC_E_TOO_MANY_PRINCIPALS        _HRESULT_TYPEDEF_(0x8009033BL)
+
+//
+// MessageId: SEC_E_NO_PA_DATA
+//
+// MessageText:
+//
+//  Expected to find PA data for a hint of what etype to use, but it was not found.
+//
+#define SEC_E_NO_PA_DATA                 _HRESULT_TYPEDEF_(0x8009033CL)
+
+//
+// MessageId: SEC_E_PKINIT_NAME_MISMATCH
+//
+// MessageText:
+//
+//  The client certificate does not contain a valid UPN, or does not match the client name 
+//  in the logon request.  Please contact your administrator.
+//
+#define SEC_E_PKINIT_NAME_MISMATCH       _HRESULT_TYPEDEF_(0x8009033DL)
+
+//
+// MessageId: SEC_E_SMARTCARD_LOGON_REQUIRED
+//
+// MessageText:
+//
+//  Smartcard logon is required and was not used.
+//
+#define SEC_E_SMARTCARD_LOGON_REQUIRED   _HRESULT_TYPEDEF_(0x8009033EL)
+
+//
+// MessageId: SEC_E_SHUTDOWN_IN_PROGRESS
+//
+// MessageText:
+//
+//  A system shutdown is in progress.
+//
+#define SEC_E_SHUTDOWN_IN_PROGRESS       _HRESULT_TYPEDEF_(0x8009033FL)
+
+//
+// MessageId: SEC_E_KDC_INVALID_REQUEST
+//
+// MessageText:
+//
+//  An invalid request was sent to the KDC.
+//
+#define SEC_E_KDC_INVALID_REQUEST        _HRESULT_TYPEDEF_(0x80090340L)
+
+//
+// MessageId: SEC_E_KDC_UNABLE_TO_REFER
+//
+// MessageText:
+//
+//  The KDC was unable to generate a referral for the service requested.
+//
+#define SEC_E_KDC_UNABLE_TO_REFER        _HRESULT_TYPEDEF_(0x80090341L)
+
+//
+// MessageId: SEC_E_KDC_UNKNOWN_ETYPE
+//
+// MessageText:
+//
+//  The encryption type requested is not supported by the KDC.
+//
+#define SEC_E_KDC_UNKNOWN_ETYPE          _HRESULT_TYPEDEF_(0x80090342L)
+
+//
+// MessageId: SEC_E_UNSUPPORTED_PREAUTH
+//
+// MessageText:
+//
+//  An unsupported preauthentication mechanism was presented to the kerberos package.
+//
+#define SEC_E_UNSUPPORTED_PREAUTH        _HRESULT_TYPEDEF_(0x80090343L)
+
+//
+// MessageId: SEC_E_DELEGATION_REQUIRED
+//
+// MessageText:
+//
+//  The requested operation cannot be completed.  The computer must be trusted for delegation and the current user account must be configured to allow delegation.
+//
+#define SEC_E_DELEGATION_REQUIRED        _HRESULT_TYPEDEF_(0x80090345L)
+
+//
+// MessageId: SEC_E_BAD_BINDINGS
+//
+// MessageText:
+//
+//  Client's supplied SSPI channel bindings were incorrect.
+//
+#define SEC_E_BAD_BINDINGS               _HRESULT_TYPEDEF_(0x80090346L)
+
+//
+// MessageId: SEC_E_MULTIPLE_ACCOUNTS
+//
+// MessageText:
+//
+//  The received certificate was mapped to multiple accounts.
+//
+#define SEC_E_MULTIPLE_ACCOUNTS          _HRESULT_TYPEDEF_(0x80090347L)
+
+//
+// MessageId: SEC_E_NO_KERB_KEY
+//
+// MessageText:
+//
+//  SEC_E_NO_KERB_KEY
+//
+#define SEC_E_NO_KERB_KEY                _HRESULT_TYPEDEF_(0x80090348L)
+
+//
+// MessageId: SEC_E_CERT_WRONG_USAGE
+//
+// MessageText:
+//
+//  The certificate is not valid for the requested usage.
+//
+#define SEC_E_CERT_WRONG_USAGE           _HRESULT_TYPEDEF_(0x80090349L)
+
+//
+// MessageId: SEC_E_DOWNGRADE_DETECTED
+//
+// MessageText:
+//
+//  The system detected a possible attempt to compromise security.  Please ensure that you can contact the server that authenticated you.
+//
+#define SEC_E_DOWNGRADE_DETECTED         _HRESULT_TYPEDEF_(0x80090350L)
+
+//
+// MessageId: SEC_E_SMARTCARD_CERT_REVOKED
+//
+// MessageText:
+//
+//  The smartcard certificate used for authentication has been revoked.
+//  Please contact your system administrator.  There may be additional information in the
+//  event log.
+//
+#define SEC_E_SMARTCARD_CERT_REVOKED     _HRESULT_TYPEDEF_(0x80090351L)
+
+//
+// MessageId: SEC_E_ISSUING_CA_UNTRUSTED
+//
+// MessageText:
+//
+//  An untrusted certificate authority was detected While processing the
+//  smartcard certificate used for authentication.  Please contact your system
+//  administrator.
+//
+#define SEC_E_ISSUING_CA_UNTRUSTED       _HRESULT_TYPEDEF_(0x80090352L)
+
+//
+// MessageId: SEC_E_REVOCATION_OFFLINE_C
+//
+// MessageText:
+//
+//  The revocation status of the smartcard certificate used for
+//  authentication could not be determined. Please contact your system administrator.
+//
+#define SEC_E_REVOCATION_OFFLINE_C       _HRESULT_TYPEDEF_(0x80090353L)
+
+//
+// MessageId: SEC_E_PKINIT_CLIENT_FAILURE
+//
+// MessageText:
+//
+//  The smartcard certificate used for authentication was not trusted.  Please
+//  contact your system administrator.
+//
+#define SEC_E_PKINIT_CLIENT_FAILURE      _HRESULT_TYPEDEF_(0x80090354L)
+
+//
+// MessageId: SEC_E_SMARTCARD_CERT_EXPIRED
+//
+// MessageText:
+//
+//  The smartcard certificate used for authentication has expired.  Please
+//  contact your system administrator.
+//
+#define SEC_E_SMARTCARD_CERT_EXPIRED     _HRESULT_TYPEDEF_(0x80090355L)
+
+//
+// MessageId: SEC_E_NO_S4U_PROT_SUPPORT
+//
+// MessageText:
+//
+//  The Kerberos subsystem encountered an error.  A service for user protocol request was made 
+//  against a domain controller which does not support service for user.
+//
+#define SEC_E_NO_S4U_PROT_SUPPORT        _HRESULT_TYPEDEF_(0x80090356L)
+
+//
+// MessageId: SEC_E_CROSSREALM_DELEGATION_FAILURE
+//
+// MessageText:
+//
+//  An attempt was made by this server to make a Kerberos constrained delegation request for a target
+//  outside of the server's realm.  This is not supported, and indicates a misconfiguration on this
+//  server's allowed to delegate to list.  Please contact your administrator.
+//
+#define SEC_E_CROSSREALM_DELEGATION_FAILURE _HRESULT_TYPEDEF_(0x80090357L)
+
+//
+// Provided for backwards compatibility
+//
+
+#define SEC_E_NO_SPM SEC_E_INTERNAL_ERROR
+#define SEC_E_NOT_SUPPORTED SEC_E_UNSUPPORTED_FUNCTION
+
+//
+// MessageId: CRYPT_E_MSG_ERROR
+//
+// MessageText:
+//
+//  An error occurred while performing an operation on a cryptographic message.
+//
+#define CRYPT_E_MSG_ERROR                _HRESULT_TYPEDEF_(0x80091001L)
+
+//
+// MessageId: CRYPT_E_UNKNOWN_ALGO
+//
+// MessageText:
+//
+//  Unknown cryptographic algorithm.
+//
+#define CRYPT_E_UNKNOWN_ALGO             _HRESULT_TYPEDEF_(0x80091002L)
+
+//
+// MessageId: CRYPT_E_OID_FORMAT
+//
+// MessageText:
+//
+//  The object identifier is poorly formatted.
+//
+#define CRYPT_E_OID_FORMAT               _HRESULT_TYPEDEF_(0x80091003L)
+
+//
+// MessageId: CRYPT_E_INVALID_MSG_TYPE
+//
+// MessageText:
+//
+//  Invalid cryptographic message type.
+//
+#define CRYPT_E_INVALID_MSG_TYPE         _HRESULT_TYPEDEF_(0x80091004L)
+
+//
+// MessageId: CRYPT_E_UNEXPECTED_ENCODING
+//
+// MessageText:
+//
+//  Unexpected cryptographic message encoding.
+//
+#define CRYPT_E_UNEXPECTED_ENCODING      _HRESULT_TYPEDEF_(0x80091005L)
+
+//
+// MessageId: CRYPT_E_AUTH_ATTR_MISSING
+//
+// MessageText:
+//
+//  The cryptographic message does not contain an expected authenticated attribute.
+//
+#define CRYPT_E_AUTH_ATTR_MISSING        _HRESULT_TYPEDEF_(0x80091006L)
+
+//
+// MessageId: CRYPT_E_HASH_VALUE
+//
+// MessageText:
+//
+//  The hash value is not correct.
+//
+#define CRYPT_E_HASH_VALUE               _HRESULT_TYPEDEF_(0x80091007L)
+
+//
+// MessageId: CRYPT_E_INVALID_INDEX
+//
+// MessageText:
+//
+//  The index value is not valid.
+//
+#define CRYPT_E_INVALID_INDEX            _HRESULT_TYPEDEF_(0x80091008L)
+
+//
+// MessageId: CRYPT_E_ALREADY_DECRYPTED
+//
+// MessageText:
+//
+//  The content of the cryptographic message has already been decrypted.
+//
+#define CRYPT_E_ALREADY_DECRYPTED        _HRESULT_TYPEDEF_(0x80091009L)
+
+//
+// MessageId: CRYPT_E_NOT_DECRYPTED
+//
+// MessageText:
+//
+//  The content of the cryptographic message has not been decrypted yet.
+//
+#define CRYPT_E_NOT_DECRYPTED            _HRESULT_TYPEDEF_(0x8009100AL)
+
+//
+// MessageId: CRYPT_E_RECIPIENT_NOT_FOUND
+//
+// MessageText:
+//
+//  The enveloped-data message does not contain the specified recipient.
+//
+#define CRYPT_E_RECIPIENT_NOT_FOUND      _HRESULT_TYPEDEF_(0x8009100BL)
+
+//
+// MessageId: CRYPT_E_CONTROL_TYPE
+//
+// MessageText:
+//
+//  Invalid control type.
+//
+#define CRYPT_E_CONTROL_TYPE             _HRESULT_TYPEDEF_(0x8009100CL)
+
+//
+// MessageId: CRYPT_E_ISSUER_SERIALNUMBER
+//
+// MessageText:
+//
+//  Invalid issuer and/or serial number.
+//
+#define CRYPT_E_ISSUER_SERIALNUMBER      _HRESULT_TYPEDEF_(0x8009100DL)
+
+//
+// MessageId: CRYPT_E_SIGNER_NOT_FOUND
+//
+// MessageText:
+//
+//  Cannot find the original signer.
+//
+#define CRYPT_E_SIGNER_NOT_FOUND         _HRESULT_TYPEDEF_(0x8009100EL)
+
+//
+// MessageId: CRYPT_E_ATTRIBUTES_MISSING
+//
+// MessageText:
+//
+//  The cryptographic message does not contain all of the requested attributes.
+//
+#define CRYPT_E_ATTRIBUTES_MISSING       _HRESULT_TYPEDEF_(0x8009100FL)
+
+//
+// MessageId: CRYPT_E_STREAM_MSG_NOT_READY
+//
+// MessageText:
+//
+//  The streamed cryptographic message is not ready to return data.
+//
+#define CRYPT_E_STREAM_MSG_NOT_READY     _HRESULT_TYPEDEF_(0x80091010L)
+
+//
+// MessageId: CRYPT_E_STREAM_INSUFFICIENT_DATA
+//
+// MessageText:
+//
+//  The streamed cryptographic message requires more data to complete the decode operation.
+//
+#define CRYPT_E_STREAM_INSUFFICIENT_DATA _HRESULT_TYPEDEF_(0x80091011L)
+
+//
+// MessageId: CRYPT_I_NEW_PROTECTION_REQUIRED
+//
+// MessageText:
+//
+//  The protected data needs to be re-protected.
+//
+#define CRYPT_I_NEW_PROTECTION_REQUIRED  _HRESULT_TYPEDEF_(0x00091012L)
+
+//
+// MessageId: CRYPT_E_BAD_LEN
+//
+// MessageText:
+//
+//  The length specified for the output data was insufficient.
+//
+#define CRYPT_E_BAD_LEN                  _HRESULT_TYPEDEF_(0x80092001L)
+
+//
+// MessageId: CRYPT_E_BAD_ENCODE
+//
+// MessageText:
+//
+//  An error occurred during encode or decode operation.
+//
+#define CRYPT_E_BAD_ENCODE               _HRESULT_TYPEDEF_(0x80092002L)
+
+//
+// MessageId: CRYPT_E_FILE_ERROR
+//
+// MessageText:
+//
+//  An error occurred while reading or writing to a file.
+//
+#define CRYPT_E_FILE_ERROR               _HRESULT_TYPEDEF_(0x80092003L)
+
+//
+// MessageId: CRYPT_E_NOT_FOUND
+//
+// MessageText:
+//
+//  Cannot find object or property.
+//
+#define CRYPT_E_NOT_FOUND                _HRESULT_TYPEDEF_(0x80092004L)
+
+//
+// MessageId: CRYPT_E_EXISTS
+//
+// MessageText:
+//
+//  The object or property already exists.
+//
+#define CRYPT_E_EXISTS                   _HRESULT_TYPEDEF_(0x80092005L)
+
+//
+// MessageId: CRYPT_E_NO_PROVIDER
+//
+// MessageText:
+//
+//  No provider was specified for the store or object.
+//
+#define CRYPT_E_NO_PROVIDER              _HRESULT_TYPEDEF_(0x80092006L)
+
+//
+// MessageId: CRYPT_E_SELF_SIGNED
+//
+// MessageText:
+//
+//  The specified certificate is self signed.
+//
+#define CRYPT_E_SELF_SIGNED              _HRESULT_TYPEDEF_(0x80092007L)
+
+//
+// MessageId: CRYPT_E_DELETED_PREV
+//
+// MessageText:
+//
+//  The previous certificate or CRL context was deleted.
+//
+#define CRYPT_E_DELETED_PREV             _HRESULT_TYPEDEF_(0x80092008L)
+
+//
+// MessageId: CRYPT_E_NO_MATCH
+//
+// MessageText:
+//
+//  Cannot find the requested object.
+//
+#define CRYPT_E_NO_MATCH                 _HRESULT_TYPEDEF_(0x80092009L)
+
+//
+// MessageId: CRYPT_E_UNEXPECTED_MSG_TYPE
+//
+// MessageText:
+//
+//  The certificate does not have a property that references a private key.
+//
+#define CRYPT_E_UNEXPECTED_MSG_TYPE      _HRESULT_TYPEDEF_(0x8009200AL)
+
+//
+// MessageId: CRYPT_E_NO_KEY_PROPERTY
+//
+// MessageText:
+//
+//  Cannot find the certificate and private key for decryption.
+//
+#define CRYPT_E_NO_KEY_PROPERTY          _HRESULT_TYPEDEF_(0x8009200BL)
+
+//
+// MessageId: CRYPT_E_NO_DECRYPT_CERT
+//
+// MessageText:
+//
+//  Cannot find the certificate and private key to use for decryption.
+//
+#define CRYPT_E_NO_DECRYPT_CERT          _HRESULT_TYPEDEF_(0x8009200CL)
+
+//
+// MessageId: CRYPT_E_BAD_MSG
+//
+// MessageText:
+//
+//  Not a cryptographic message or the cryptographic message is not formatted correctly.
+//
+#define CRYPT_E_BAD_MSG                  _HRESULT_TYPEDEF_(0x8009200DL)
+
+//
+// MessageId: CRYPT_E_NO_SIGNER
+//
+// MessageText:
+//
+//  The signed cryptographic message does not have a signer for the specified signer index.
+//
+#define CRYPT_E_NO_SIGNER                _HRESULT_TYPEDEF_(0x8009200EL)
+
+//
+// MessageId: CRYPT_E_PENDING_CLOSE
+//
+// MessageText:
+//
+//  Final closure is pending until additional frees or closes.
+//
+#define CRYPT_E_PENDING_CLOSE            _HRESULT_TYPEDEF_(0x8009200FL)
+
+//
+// MessageId: CRYPT_E_REVOKED
+//
+// MessageText:
+//
+//  The certificate is revoked.
+//
+#define CRYPT_E_REVOKED                  _HRESULT_TYPEDEF_(0x80092010L)
+
+//
+// MessageId: CRYPT_E_NO_REVOCATION_DLL
+//
+// MessageText:
+//
+//  No Dll or exported function was found to verify revocation.
+//
+#define CRYPT_E_NO_REVOCATION_DLL        _HRESULT_TYPEDEF_(0x80092011L)
+
+//
+// MessageId: CRYPT_E_NO_REVOCATION_CHECK
+//
+// MessageText:
+//
+//  The revocation function was unable to check revocation for the certificate.
+//
+#define CRYPT_E_NO_REVOCATION_CHECK      _HRESULT_TYPEDEF_(0x80092012L)
+
+//
+// MessageId: CRYPT_E_REVOCATION_OFFLINE
+//
+// MessageText:
+//
+//  The revocation function was unable to check revocation because the revocation server was offline.
+//
+#define CRYPT_E_REVOCATION_OFFLINE       _HRESULT_TYPEDEF_(0x80092013L)
+
+//
+// MessageId: CRYPT_E_NOT_IN_REVOCATION_DATABASE
+//
+// MessageText:
+//
+//  The certificate is not in the revocation server's database.
+//
+#define CRYPT_E_NOT_IN_REVOCATION_DATABASE _HRESULT_TYPEDEF_(0x80092014L)
+
+//
+// MessageId: CRYPT_E_INVALID_NUMERIC_STRING
+//
+// MessageText:
+//
+//  The string contains a non-numeric character.
+//
+#define CRYPT_E_INVALID_NUMERIC_STRING   _HRESULT_TYPEDEF_(0x80092020L)
+
+//
+// MessageId: CRYPT_E_INVALID_PRINTABLE_STRING
+//
+// MessageText:
+//
+//  The string contains a non-printable character.
+//
+#define CRYPT_E_INVALID_PRINTABLE_STRING _HRESULT_TYPEDEF_(0x80092021L)
+
+//
+// MessageId: CRYPT_E_INVALID_IA5_STRING
+//
+// MessageText:
+//
+//  The string contains a character not in the 7 bit ASCII character set.
+//
+#define CRYPT_E_INVALID_IA5_STRING       _HRESULT_TYPEDEF_(0x80092022L)
+
+//
+// MessageId: CRYPT_E_INVALID_X500_STRING
+//
+// MessageText:
+//
+//  The string contains an invalid X500 name attribute key, oid, value or delimiter.
+//
+#define CRYPT_E_INVALID_X500_STRING      _HRESULT_TYPEDEF_(0x80092023L)
+
+//
+// MessageId: CRYPT_E_NOT_CHAR_STRING
+//
+// MessageText:
+//
+//  The dwValueType for the CERT_NAME_VALUE is not one of the character strings.  Most likely it is either a CERT_RDN_ENCODED_BLOB or CERT_TDN_OCTED_STRING.
+//
+#define CRYPT_E_NOT_CHAR_STRING          _HRESULT_TYPEDEF_(0x80092024L)
+
+//
+// MessageId: CRYPT_E_FILERESIZED
+//
+// MessageText:
+//
+//  The Put operation can not continue.  The file needs to be resized.  However, there is already a signature present.  A complete signing operation must be done.
+//
+#define CRYPT_E_FILERESIZED              _HRESULT_TYPEDEF_(0x80092025L)
+
+//
+// MessageId: CRYPT_E_SECURITY_SETTINGS
+//
+// MessageText:
+//
+//  The cryptographic operation failed due to a local security option setting.
+//
+#define CRYPT_E_SECURITY_SETTINGS        _HRESULT_TYPEDEF_(0x80092026L)
+
+//
+// MessageId: CRYPT_E_NO_VERIFY_USAGE_DLL
+//
+// MessageText:
+//
+//  No DLL or exported function was found to verify subject usage.
+//
+#define CRYPT_E_NO_VERIFY_USAGE_DLL      _HRESULT_TYPEDEF_(0x80092027L)
+
+//
+// MessageId: CRYPT_E_NO_VERIFY_USAGE_CHECK
+//
+// MessageText:
+//
+//  The called function was unable to do a usage check on the subject.
+//
+#define CRYPT_E_NO_VERIFY_USAGE_CHECK    _HRESULT_TYPEDEF_(0x80092028L)
+
+//
+// MessageId: CRYPT_E_VERIFY_USAGE_OFFLINE
+//
+// MessageText:
+//
+//  Since the server was offline, the called function was unable to complete the usage check.
+//
+#define CRYPT_E_VERIFY_USAGE_OFFLINE     _HRESULT_TYPEDEF_(0x80092029L)
+
+//
+// MessageId: CRYPT_E_NOT_IN_CTL
+//
+// MessageText:
+//
+//  The subject was not found in a Certificate Trust List (CTL).
+//
+#define CRYPT_E_NOT_IN_CTL               _HRESULT_TYPEDEF_(0x8009202AL)
+
+//
+// MessageId: CRYPT_E_NO_TRUSTED_SIGNER
+//
+// MessageText:
+//
+//  None of the signers of the cryptographic message or certificate trust list is trusted.
+//
+#define CRYPT_E_NO_TRUSTED_SIGNER        _HRESULT_TYPEDEF_(0x8009202BL)
+
+//
+// MessageId: CRYPT_E_MISSING_PUBKEY_PARA
+//
+// MessageText:
+//
+//  The public key's algorithm parameters are missing.
+//
+#define CRYPT_E_MISSING_PUBKEY_PARA      _HRESULT_TYPEDEF_(0x8009202CL)
+
+//
+// MessageId: CRYPT_E_OSS_ERROR
+//
+// MessageText:
+//
+//  OSS Certificate encode/decode error code base
+//  
+//  See asn1code.h for a definition of the OSS runtime errors. The OSS
+//  error values are offset by CRYPT_E_OSS_ERROR.
+//
+#define CRYPT_E_OSS_ERROR                _HRESULT_TYPEDEF_(0x80093000L)
+
+//
+// MessageId: OSS_MORE_BUF
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Output Buffer is too small.
+//
+#define OSS_MORE_BUF                     _HRESULT_TYPEDEF_(0x80093001L)
+
+//
+// MessageId: OSS_NEGATIVE_UINTEGER
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Signed integer is encoded as a unsigned integer.
+//
+#define OSS_NEGATIVE_UINTEGER            _HRESULT_TYPEDEF_(0x80093002L)
+
+//
+// MessageId: OSS_PDU_RANGE
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Unknown ASN.1 data type.
+//
+#define OSS_PDU_RANGE                    _HRESULT_TYPEDEF_(0x80093003L)
+
+//
+// MessageId: OSS_MORE_INPUT
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Output buffer is too small, the decoded data has been truncated.
+//
+#define OSS_MORE_INPUT                   _HRESULT_TYPEDEF_(0x80093004L)
+
+//
+// MessageId: OSS_DATA_ERROR
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_DATA_ERROR                   _HRESULT_TYPEDEF_(0x80093005L)
+
+//
+// MessageId: OSS_BAD_ARG
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid argument.
+//
+#define OSS_BAD_ARG                      _HRESULT_TYPEDEF_(0x80093006L)
+
+//
+// MessageId: OSS_BAD_VERSION
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Encode/Decode version mismatch.
+//
+#define OSS_BAD_VERSION                  _HRESULT_TYPEDEF_(0x80093007L)
+
+//
+// MessageId: OSS_OUT_MEMORY
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Out of memory.
+//
+#define OSS_OUT_MEMORY                   _HRESULT_TYPEDEF_(0x80093008L)
+
+//
+// MessageId: OSS_PDU_MISMATCH
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Encode/Decode Error.
+//
+#define OSS_PDU_MISMATCH                 _HRESULT_TYPEDEF_(0x80093009L)
+
+//
+// MessageId: OSS_LIMITED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Internal Error.
+//
+#define OSS_LIMITED                      _HRESULT_TYPEDEF_(0x8009300AL)
+
+//
+// MessageId: OSS_BAD_PTR
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_BAD_PTR                      _HRESULT_TYPEDEF_(0x8009300BL)
+
+//
+// MessageId: OSS_BAD_TIME
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_BAD_TIME                     _HRESULT_TYPEDEF_(0x8009300CL)
+
+//
+// MessageId: OSS_INDEFINITE_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Unsupported BER indefinite-length encoding.
+//
+#define OSS_INDEFINITE_NOT_SUPPORTED     _HRESULT_TYPEDEF_(0x8009300DL)
+
+//
+// MessageId: OSS_MEM_ERROR
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Access violation.
+//
+#define OSS_MEM_ERROR                    _HRESULT_TYPEDEF_(0x8009300EL)
+
+//
+// MessageId: OSS_BAD_TABLE
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_BAD_TABLE                    _HRESULT_TYPEDEF_(0x8009300FL)
+
+//
+// MessageId: OSS_TOO_LONG
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_TOO_LONG                     _HRESULT_TYPEDEF_(0x80093010L)
+
+//
+// MessageId: OSS_CONSTRAINT_VIOLATED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_CONSTRAINT_VIOLATED          _HRESULT_TYPEDEF_(0x80093011L)
+
+//
+// MessageId: OSS_FATAL_ERROR
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Internal Error.
+//
+#define OSS_FATAL_ERROR                  _HRESULT_TYPEDEF_(0x80093012L)
+
+//
+// MessageId: OSS_ACCESS_SERIALIZATION_ERROR
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Multi-threading conflict.
+//
+#define OSS_ACCESS_SERIALIZATION_ERROR   _HRESULT_TYPEDEF_(0x80093013L)
+
+//
+// MessageId: OSS_NULL_TBL
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_NULL_TBL                     _HRESULT_TYPEDEF_(0x80093014L)
+
+//
+// MessageId: OSS_NULL_FCN
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_NULL_FCN                     _HRESULT_TYPEDEF_(0x80093015L)
+
+//
+// MessageId: OSS_BAD_ENCRULES
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_BAD_ENCRULES                 _HRESULT_TYPEDEF_(0x80093016L)
+
+//
+// MessageId: OSS_UNAVAIL_ENCRULES
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Encode/Decode function not implemented.
+//
+#define OSS_UNAVAIL_ENCRULES             _HRESULT_TYPEDEF_(0x80093017L)
+
+//
+// MessageId: OSS_CANT_OPEN_TRACE_WINDOW
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Trace file error.
+//
+#define OSS_CANT_OPEN_TRACE_WINDOW       _HRESULT_TYPEDEF_(0x80093018L)
+
+//
+// MessageId: OSS_UNIMPLEMENTED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Function not implemented.
+//
+#define OSS_UNIMPLEMENTED                _HRESULT_TYPEDEF_(0x80093019L)
+
+//
+// MessageId: OSS_OID_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_OID_DLL_NOT_LINKED           _HRESULT_TYPEDEF_(0x8009301AL)
+
+//
+// MessageId: OSS_CANT_OPEN_TRACE_FILE
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Trace file error.
+//
+#define OSS_CANT_OPEN_TRACE_FILE         _HRESULT_TYPEDEF_(0x8009301BL)
+
+//
+// MessageId: OSS_TRACE_FILE_ALREADY_OPEN
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Trace file error.
+//
+#define OSS_TRACE_FILE_ALREADY_OPEN      _HRESULT_TYPEDEF_(0x8009301CL)
+
+//
+// MessageId: OSS_TABLE_MISMATCH
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_TABLE_MISMATCH               _HRESULT_TYPEDEF_(0x8009301DL)
+
+//
+// MessageId: OSS_TYPE_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Invalid data.
+//
+#define OSS_TYPE_NOT_SUPPORTED           _HRESULT_TYPEDEF_(0x8009301EL)
+
+//
+// MessageId: OSS_REAL_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_REAL_DLL_NOT_LINKED          _HRESULT_TYPEDEF_(0x8009301FL)
+
+//
+// MessageId: OSS_REAL_CODE_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_REAL_CODE_NOT_LINKED         _HRESULT_TYPEDEF_(0x80093020L)
+
+//
+// MessageId: OSS_OUT_OF_RANGE
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_OUT_OF_RANGE                 _HRESULT_TYPEDEF_(0x80093021L)
+
+//
+// MessageId: OSS_COPIER_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_COPIER_DLL_NOT_LINKED        _HRESULT_TYPEDEF_(0x80093022L)
+
+//
+// MessageId: OSS_CONSTRAINT_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_CONSTRAINT_DLL_NOT_LINKED    _HRESULT_TYPEDEF_(0x80093023L)
+
+//
+// MessageId: OSS_COMPARATOR_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_COMPARATOR_DLL_NOT_LINKED    _HRESULT_TYPEDEF_(0x80093024L)
+
+//
+// MessageId: OSS_COMPARATOR_CODE_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_COMPARATOR_CODE_NOT_LINKED   _HRESULT_TYPEDEF_(0x80093025L)
+
+//
+// MessageId: OSS_MEM_MGR_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_MEM_MGR_DLL_NOT_LINKED       _HRESULT_TYPEDEF_(0x80093026L)
+
+//
+// MessageId: OSS_PDV_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_PDV_DLL_NOT_LINKED           _HRESULT_TYPEDEF_(0x80093027L)
+
+//
+// MessageId: OSS_PDV_CODE_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_PDV_CODE_NOT_LINKED          _HRESULT_TYPEDEF_(0x80093028L)
+
+//
+// MessageId: OSS_API_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_API_DLL_NOT_LINKED           _HRESULT_TYPEDEF_(0x80093029L)
+
+//
+// MessageId: OSS_BERDER_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_BERDER_DLL_NOT_LINKED        _HRESULT_TYPEDEF_(0x8009302AL)
+
+//
+// MessageId: OSS_PER_DLL_NOT_LINKED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_PER_DLL_NOT_LINKED           _HRESULT_TYPEDEF_(0x8009302BL)
+
+//
+// MessageId: OSS_OPEN_TYPE_ERROR
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Program link error.
+//
+#define OSS_OPEN_TYPE_ERROR              _HRESULT_TYPEDEF_(0x8009302CL)
+
+//
+// MessageId: OSS_MUTEX_NOT_CREATED
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: System resource error.
+//
+#define OSS_MUTEX_NOT_CREATED            _HRESULT_TYPEDEF_(0x8009302DL)
+
+//
+// MessageId: OSS_CANT_CLOSE_TRACE_FILE
+//
+// MessageText:
+//
+//  OSS ASN.1 Error: Trace file error.
+//
+#define OSS_CANT_CLOSE_TRACE_FILE        _HRESULT_TYPEDEF_(0x8009302EL)
+
+//
+// MessageId: CRYPT_E_ASN1_ERROR
+//
+// MessageText:
+//
+//  ASN1 Certificate encode/decode error code base.
+//  
+//  The ASN1 error values are offset by CRYPT_E_ASN1_ERROR.
+//
+#define CRYPT_E_ASN1_ERROR               _HRESULT_TYPEDEF_(0x80093100L)
+
+//
+// MessageId: CRYPT_E_ASN1_INTERNAL
+//
+// MessageText:
+//
+//  ASN1 internal encode or decode error.
+//
+#define CRYPT_E_ASN1_INTERNAL            _HRESULT_TYPEDEF_(0x80093101L)
+
+//
+// MessageId: CRYPT_E_ASN1_EOD
+//
+// MessageText:
+//
+//  ASN1 unexpected end of data.
+//
+#define CRYPT_E_ASN1_EOD                 _HRESULT_TYPEDEF_(0x80093102L)
+
+//
+// MessageId: CRYPT_E_ASN1_CORRUPT
+//
+// MessageText:
+//
+//  ASN1 corrupted data.
+//
+#define CRYPT_E_ASN1_CORRUPT             _HRESULT_TYPEDEF_(0x80093103L)
+
+//
+// MessageId: CRYPT_E_ASN1_LARGE
+//
+// MessageText:
+//
+//  ASN1 value too large.
+//
+#define CRYPT_E_ASN1_LARGE               _HRESULT_TYPEDEF_(0x80093104L)
+
+//
+// MessageId: CRYPT_E_ASN1_CONSTRAINT
+//
+// MessageText:
+//
+//  ASN1 constraint violated.
+//
+#define CRYPT_E_ASN1_CONSTRAINT          _HRESULT_TYPEDEF_(0x80093105L)
+
+//
+// MessageId: CRYPT_E_ASN1_MEMORY
+//
+// MessageText:
+//
+//  ASN1 out of memory.
+//
+#define CRYPT_E_ASN1_MEMORY              _HRESULT_TYPEDEF_(0x80093106L)
+
+//
+// MessageId: CRYPT_E_ASN1_OVERFLOW
+//
+// MessageText:
+//
+//  ASN1 buffer overflow.
+//
+#define CRYPT_E_ASN1_OVERFLOW            _HRESULT_TYPEDEF_(0x80093107L)
+
+//
+// MessageId: CRYPT_E_ASN1_BADPDU
+//
+// MessageText:
+//
+//  ASN1 function not supported for this PDU.
+//
+#define CRYPT_E_ASN1_BADPDU              _HRESULT_TYPEDEF_(0x80093108L)
+
+//
+// MessageId: CRYPT_E_ASN1_BADARGS
+//
+// MessageText:
+//
+//  ASN1 bad arguments to function call.
+//
+#define CRYPT_E_ASN1_BADARGS             _HRESULT_TYPEDEF_(0x80093109L)
+
+//
+// MessageId: CRYPT_E_ASN1_BADREAL
+//
+// MessageText:
+//
+//  ASN1 bad real value.
+//
+#define CRYPT_E_ASN1_BADREAL             _HRESULT_TYPEDEF_(0x8009310AL)
+
+//
+// MessageId: CRYPT_E_ASN1_BADTAG
+//
+// MessageText:
+//
+//  ASN1 bad tag value met.
+//
+#define CRYPT_E_ASN1_BADTAG              _HRESULT_TYPEDEF_(0x8009310BL)
+
+//
+// MessageId: CRYPT_E_ASN1_CHOICE
+//
+// MessageText:
+//
+//  ASN1 bad choice value.
+//
+#define CRYPT_E_ASN1_CHOICE              _HRESULT_TYPEDEF_(0x8009310CL)
+
+//
+// MessageId: CRYPT_E_ASN1_RULE
+//
+// MessageText:
+//
+//  ASN1 bad encoding rule.
+//
+#define CRYPT_E_ASN1_RULE                _HRESULT_TYPEDEF_(0x8009310DL)
+
+//
+// MessageId: CRYPT_E_ASN1_UTF8
+//
+// MessageText:
+//
+//  ASN1 bad unicode (UTF8).
+//
+#define CRYPT_E_ASN1_UTF8                _HRESULT_TYPEDEF_(0x8009310EL)
+
+//
+// MessageId: CRYPT_E_ASN1_PDU_TYPE
+//
+// MessageText:
+//
+//  ASN1 bad PDU type.
+//
+#define CRYPT_E_ASN1_PDU_TYPE            _HRESULT_TYPEDEF_(0x80093133L)
+
+//
+// MessageId: CRYPT_E_ASN1_NYI
+//
+// MessageText:
+//
+//  ASN1 not yet implemented.
+//
+#define CRYPT_E_ASN1_NYI                 _HRESULT_TYPEDEF_(0x80093134L)
+
+//
+// MessageId: CRYPT_E_ASN1_EXTENDED
+//
+// MessageText:
+//
+//  ASN1 skipped unknown extension(s).
+//
+#define CRYPT_E_ASN1_EXTENDED            _HRESULT_TYPEDEF_(0x80093201L)
+
+//
+// MessageId: CRYPT_E_ASN1_NOEOD
+//
+// MessageText:
+//
+//  ASN1 end of data expected
+//
+#define CRYPT_E_ASN1_NOEOD               _HRESULT_TYPEDEF_(0x80093202L)
+
+//
+// MessageId: CERTSRV_E_BAD_REQUESTSUBJECT
+//
+// MessageText:
+//
+//  The request subject name is invalid or too long.
+//
+#define CERTSRV_E_BAD_REQUESTSUBJECT     _HRESULT_TYPEDEF_(0x80094001L)
+
+//
+// MessageId: CERTSRV_E_NO_REQUEST
+//
+// MessageText:
+//
+//  The request does not exist.
+//
+#define CERTSRV_E_NO_REQUEST             _HRESULT_TYPEDEF_(0x80094002L)
+
+//
+// MessageId: CERTSRV_E_BAD_REQUESTSTATUS
+//
+// MessageText:
+//
+//  The request's current status does not allow this operation.
+//
+#define CERTSRV_E_BAD_REQUESTSTATUS      _HRESULT_TYPEDEF_(0x80094003L)
+
+//
+// MessageId: CERTSRV_E_PROPERTY_EMPTY
+//
+// MessageText:
+//
+//  The requested property value is empty.
+//
+#define CERTSRV_E_PROPERTY_EMPTY         _HRESULT_TYPEDEF_(0x80094004L)
+
+//
+// MessageId: CERTSRV_E_INVALID_CA_CERTIFICATE
+//
+// MessageText:
+//
+//  The certification authority's certificate contains invalid data.
+//
+#define CERTSRV_E_INVALID_CA_CERTIFICATE _HRESULT_TYPEDEF_(0x80094005L)
+
+//
+// MessageId: CERTSRV_E_SERVER_SUSPENDED
+//
+// MessageText:
+//
+//  Certificate service has been suspended for a database restore operation.
+//
+#define CERTSRV_E_SERVER_SUSPENDED       _HRESULT_TYPEDEF_(0x80094006L)
+
+//
+// MessageId: CERTSRV_E_ENCODING_LENGTH
+//
+// MessageText:
+//
+//  The certificate contains an encoded length that is potentially incompatible with older enrollment software.
+//
+#define CERTSRV_E_ENCODING_LENGTH        _HRESULT_TYPEDEF_(0x80094007L)
+
+//
+// MessageId: CERTSRV_E_ROLECONFLICT
+//
+// MessageText:
+//
+//  The operation is denied. The user has multiple roles assigned and the certification authority is configured to enforce role separation.
+//
+#define CERTSRV_E_ROLECONFLICT           _HRESULT_TYPEDEF_(0x80094008L)
+
+//
+// MessageId: CERTSRV_E_RESTRICTEDOFFICER
+//
+// MessageText:
+//
+//  The operation is denied. It can only be performed by a certificate manager that is allowed to manage certificates for the current requester.
+//
+#define CERTSRV_E_RESTRICTEDOFFICER      _HRESULT_TYPEDEF_(0x80094009L)
+
+//
+// MessageId: CERTSRV_E_KEY_ARCHIVAL_NOT_CONFIGURED
+//
+// MessageText:
+//
+//  Cannot archive private key.  The certification authority is not configured for key archival.
+//
+#define CERTSRV_E_KEY_ARCHIVAL_NOT_CONFIGURED _HRESULT_TYPEDEF_(0x8009400AL)
+
+//
+// MessageId: CERTSRV_E_NO_VALID_KRA
+//
+// MessageText:
+//
+//  Cannot archive private key.  The certification authority could not verify one or more key recovery certificates.
+//
+#define CERTSRV_E_NO_VALID_KRA           _HRESULT_TYPEDEF_(0x8009400BL)
+
+//
+// MessageId: CERTSRV_E_BAD_REQUEST_KEY_ARCHIVAL
+//
+// MessageText:
+//
+//  The request is incorrectly formatted.  The encrypted private key must be in an unauthenticated attribute in an outermost signature.
+//
+#define CERTSRV_E_BAD_REQUEST_KEY_ARCHIVAL _HRESULT_TYPEDEF_(0x8009400CL)
+
+//
+// MessageId: CERTSRV_E_NO_CAADMIN_DEFINED
+//
+// MessageText:
+//
+//  At least one security principal must have the permission to manage this CA.
+//
+#define CERTSRV_E_NO_CAADMIN_DEFINED     _HRESULT_TYPEDEF_(0x8009400DL)
+
+//
+// MessageId: CERTSRV_E_BAD_RENEWAL_CERT_ATTRIBUTE
+//
+// MessageText:
+//
+//  The request contains an invalid renewal certificate attribute.
+//
+#define CERTSRV_E_BAD_RENEWAL_CERT_ATTRIBUTE _HRESULT_TYPEDEF_(0x8009400EL)
+
+//
+// MessageId: CERTSRV_E_NO_DB_SESSIONS
+//
+// MessageText:
+//
+//  An attempt was made to open a Certification Authority database session, but there are already too many active sessions.  The server may need to be configured to allow additional sessions.
+//
+#define CERTSRV_E_NO_DB_SESSIONS         _HRESULT_TYPEDEF_(0x8009400FL)
+
+//
+// MessageId: CERTSRV_E_ALIGNMENT_FAULT
+//
+// MessageText:
+//
+//  A memory reference caused a data alignment fault.
+//
+#define CERTSRV_E_ALIGNMENT_FAULT        _HRESULT_TYPEDEF_(0x80094010L)
+
+//
+// MessageId: CERTSRV_E_ENROLL_DENIED
+//
+// MessageText:
+//
+//  The permissions on this certification authority do not allow the current user to enroll for certificates.
+//
+#define CERTSRV_E_ENROLL_DENIED          _HRESULT_TYPEDEF_(0x80094011L)
+
+//
+// MessageId: CERTSRV_E_TEMPLATE_DENIED
+//
+// MessageText:
+//
+//  The permissions on the certificate template do not allow the current user to enroll for this type of certificate.
+//
+#define CERTSRV_E_TEMPLATE_DENIED        _HRESULT_TYPEDEF_(0x80094012L)
+
+//
+// MessageId: CERTSRV_E_DOWNLEVEL_DC_SSL_OR_UPGRADE
+//
+// MessageText:
+//
+//  The contacted domain controller cannot support signed LDAP traffic.  Update the domain controller or configure Certificate Services to use SSL for Active Directory access.
+//
+#define CERTSRV_E_DOWNLEVEL_DC_SSL_OR_UPGRADE _HRESULT_TYPEDEF_(0x80094013L)
+
+//
+// MessageId: CERTSRV_E_UNSUPPORTED_CERT_TYPE
+//
+// MessageText:
+//
+//  The requested certificate template is not supported by this CA.
+//
+#define CERTSRV_E_UNSUPPORTED_CERT_TYPE  _HRESULT_TYPEDEF_(0x80094800L)
+
+//
+// MessageId: CERTSRV_E_NO_CERT_TYPE
+//
+// MessageText:
+//
+//  The request contains no certificate template information.
+//
+#define CERTSRV_E_NO_CERT_TYPE           _HRESULT_TYPEDEF_(0x80094801L)
+
+//
+// MessageId: CERTSRV_E_TEMPLATE_CONFLICT
+//
+// MessageText:
+//
+//  The request contains conflicting template information.
+//
+#define CERTSRV_E_TEMPLATE_CONFLICT      _HRESULT_TYPEDEF_(0x80094802L)
+
+//
+// MessageId: CERTSRV_E_SUBJECT_ALT_NAME_REQUIRED
+//
+// MessageText:
+//
+//  The request is missing a required Subject Alternate name extension.
+//
+#define CERTSRV_E_SUBJECT_ALT_NAME_REQUIRED _HRESULT_TYPEDEF_(0x80094803L)
+
+//
+// MessageId: CERTSRV_E_ARCHIVED_KEY_REQUIRED
+//
+// MessageText:
+//
+//  The request is missing a required private key for archival by the server.
+//
+#define CERTSRV_E_ARCHIVED_KEY_REQUIRED  _HRESULT_TYPEDEF_(0x80094804L)
+
+//
+// MessageId: CERTSRV_E_SMIME_REQUIRED
+//
+// MessageText:
+//
+//  The request is missing a required SMIME capabilities extension.
+//
+#define CERTSRV_E_SMIME_REQUIRED         _HRESULT_TYPEDEF_(0x80094805L)
+
+//
+// MessageId: CERTSRV_E_BAD_RENEWAL_SUBJECT
+//
+// MessageText:
+//
+//  The request was made on behalf of a subject other than the caller.  The certificate template must be configured to require at least one signature to authorize the request.
+//
+#define CERTSRV_E_BAD_RENEWAL_SUBJECT    _HRESULT_TYPEDEF_(0x80094806L)
+
+//
+// MessageId: CERTSRV_E_BAD_TEMPLATE_VERSION
+//
+// MessageText:
+//
+//  The request template version is newer than the supported template version.
+//
+#define CERTSRV_E_BAD_TEMPLATE_VERSION   _HRESULT_TYPEDEF_(0x80094807L)
+
+//
+// MessageId: CERTSRV_E_TEMPLATE_POLICY_REQUIRED
+//
+// MessageText:
+//
+//  The template is missing a required signature policy attribute.
+//
+#define CERTSRV_E_TEMPLATE_POLICY_REQUIRED _HRESULT_TYPEDEF_(0x80094808L)
+
+//
+// MessageId: CERTSRV_E_SIGNATURE_POLICY_REQUIRED
+//
+// MessageText:
+//
+//  The request is missing required signature policy information.
+//
+#define CERTSRV_E_SIGNATURE_POLICY_REQUIRED _HRESULT_TYPEDEF_(0x80094809L)
+
+//
+// MessageId: CERTSRV_E_SIGNATURE_COUNT
+//
+// MessageText:
+//
+//  The request is missing one or more required signatures.
+//
+#define CERTSRV_E_SIGNATURE_COUNT        _HRESULT_TYPEDEF_(0x8009480AL)
+
+//
+// MessageId: CERTSRV_E_SIGNATURE_REJECTED
+//
+// MessageText:
+//
+//  One or more signatures did not include the required application or issuance policies.  The request is missing one or more required valid signatures.
+//
+#define CERTSRV_E_SIGNATURE_REJECTED     _HRESULT_TYPEDEF_(0x8009480BL)
+
+//
+// MessageId: CERTSRV_E_ISSUANCE_POLICY_REQUIRED
+//
+// MessageText:
+//
+//  The request is missing one or more required signature issuance policies.
+//
+#define CERTSRV_E_ISSUANCE_POLICY_REQUIRED _HRESULT_TYPEDEF_(0x8009480CL)
+
+//
+// MessageId: CERTSRV_E_SUBJECT_UPN_REQUIRED
+//
+// MessageText:
+//
+//  The UPN is unavailable and cannot be added to the Subject Alternate name.
+//
+#define CERTSRV_E_SUBJECT_UPN_REQUIRED   _HRESULT_TYPEDEF_(0x8009480DL)
+
+//
+// MessageId: CERTSRV_E_SUBJECT_DIRECTORY_GUID_REQUIRED
+//
+// MessageText:
+//
+//  The Active Directory GUID is unavailable and cannot be added to the Subject Alternate name.
+//
+#define CERTSRV_E_SUBJECT_DIRECTORY_GUID_REQUIRED _HRESULT_TYPEDEF_(0x8009480EL)
+
+//
+// MessageId: CERTSRV_E_SUBJECT_DNS_REQUIRED
+//
+// MessageText:
+//
+//  The DNS name is unavailable and cannot be added to the Subject Alternate name.
+//
+#define CERTSRV_E_SUBJECT_DNS_REQUIRED   _HRESULT_TYPEDEF_(0x8009480FL)
+
+//
+// MessageId: CERTSRV_E_ARCHIVED_KEY_UNEXPECTED
+//
+// MessageText:
+//
+//  The request includes a private key for archival by the server, but key archival is not enabled for the specified certificate template.
+//
+#define CERTSRV_E_ARCHIVED_KEY_UNEXPECTED _HRESULT_TYPEDEF_(0x80094810L)
+
+//
+// MessageId: CERTSRV_E_KEY_LENGTH
+//
+// MessageText:
+//
+//  The public key does not meet the minimum size required by the specified certificate template.
+//
+#define CERTSRV_E_KEY_LENGTH             _HRESULT_TYPEDEF_(0x80094811L)
+
+//
+// MessageId: CERTSRV_E_SUBJECT_EMAIL_REQUIRED
+//
+// MessageText:
+//
+//  The EMail name is unavailable and cannot be added to the Subject or Subject Alternate name.
+//
+#define CERTSRV_E_SUBJECT_EMAIL_REQUIRED _HRESULT_TYPEDEF_(0x80094812L)
+
+//
+// MessageId: CERTSRV_E_UNKNOWN_CERT_TYPE
+//
+// MessageText:
+//
+//  One or more certificate templates to be enabled on this certification authority could not be found.
+//
+#define CERTSRV_E_UNKNOWN_CERT_TYPE      _HRESULT_TYPEDEF_(0x80094813L)
+
+//
+// MessageId: CERTSRV_E_CERT_TYPE_OVERLAP
+//
+// MessageText:
+//
+//  The certificate template renewal period is longer than the certificate validity period.  The template should be reconfigured or the CA certificate renewed.
+//
+#define CERTSRV_E_CERT_TYPE_OVERLAP      _HRESULT_TYPEDEF_(0x80094814L)
+
+//
+// The range 0x5000-0x51ff is reserved for XENROLL errors.
+//
+//
+// MessageId: XENROLL_E_KEY_NOT_EXPORTABLE
+//
+// MessageText:
+//
+//  The key is not exportable.
+//
+#define XENROLL_E_KEY_NOT_EXPORTABLE     _HRESULT_TYPEDEF_(0x80095000L)
+
+//
+// MessageId: XENROLL_E_CANNOT_ADD_ROOT_CERT
+//
+// MessageText:
+//
+//  You cannot add the root CA certificate into your local store.
+//
+#define XENROLL_E_CANNOT_ADD_ROOT_CERT   _HRESULT_TYPEDEF_(0x80095001L)
+
+//
+// MessageId: XENROLL_E_RESPONSE_KA_HASH_NOT_FOUND
+//
+// MessageText:
+//
+//  The key archival hash attribute was not found in the response.
+//
+#define XENROLL_E_RESPONSE_KA_HASH_NOT_FOUND _HRESULT_TYPEDEF_(0x80095002L)
+
+//
+// MessageId: XENROLL_E_RESPONSE_UNEXPECTED_KA_HASH
+//
+// MessageText:
+//
+//  An unexpected key archival hash attribute was found in the response.
+//
+#define XENROLL_E_RESPONSE_UNEXPECTED_KA_HASH _HRESULT_TYPEDEF_(0x80095003L)
+
+//
+// MessageId: XENROLL_E_RESPONSE_KA_HASH_MISMATCH
+//
+// MessageText:
+//
+//  There is a key archival hash mismatch between the request and the response.
+//
+#define XENROLL_E_RESPONSE_KA_HASH_MISMATCH _HRESULT_TYPEDEF_(0x80095004L)
+
+//
+// MessageId: XENROLL_E_KEYSPEC_SMIME_MISMATCH
+//
+// MessageText:
+//
+//  Signing certificate cannot include SMIME extension.
+//
+#define XENROLL_E_KEYSPEC_SMIME_MISMATCH _HRESULT_TYPEDEF_(0x80095005L)
+
+//
+// MessageId: TRUST_E_SYSTEM_ERROR
+//
+// MessageText:
+//
+//  A system-level error occurred while verifying trust.
+//
+#define TRUST_E_SYSTEM_ERROR             _HRESULT_TYPEDEF_(0x80096001L)
+
+//
+// MessageId: TRUST_E_NO_SIGNER_CERT
+//
+// MessageText:
+//
+//  The certificate for the signer of the message is invalid or not found.
+//
+#define TRUST_E_NO_SIGNER_CERT           _HRESULT_TYPEDEF_(0x80096002L)
+
+//
+// MessageId: TRUST_E_COUNTER_SIGNER
+//
+// MessageText:
+//
+//  One of the counter signatures was invalid.
+//
+#define TRUST_E_COUNTER_SIGNER           _HRESULT_TYPEDEF_(0x80096003L)
+
+//
+// MessageId: TRUST_E_CERT_SIGNATURE
+//
+// MessageText:
+//
+//  The signature of the certificate can not be verified.
+//
+#define TRUST_E_CERT_SIGNATURE           _HRESULT_TYPEDEF_(0x80096004L)
+
+//
+// MessageId: TRUST_E_TIME_STAMP
+//
+// MessageText:
+//
+//  The timestamp signature and/or certificate could not be verified or is malformed.
+//
+#define TRUST_E_TIME_STAMP               _HRESULT_TYPEDEF_(0x80096005L)
+
+//
+// MessageId: TRUST_E_BAD_DIGEST
+//
+// MessageText:
+//
+//  The digital signature of the object did not verify.
+//
+#define TRUST_E_BAD_DIGEST               _HRESULT_TYPEDEF_(0x80096010L)
+
+//
+// MessageId: TRUST_E_BASIC_CONSTRAINTS
+//
+// MessageText:
+//
+//  A certificate's basic constraint extension has not been observed.
+//
+#define TRUST_E_BASIC_CONSTRAINTS        _HRESULT_TYPEDEF_(0x80096019L)
+
+//
+// MessageId: TRUST_E_FINANCIAL_CRITERIA
+//
+// MessageText:
+//
+//  The certificate does not meet or contain the Authenticode financial extensions.
+//
+#define TRUST_E_FINANCIAL_CRITERIA       _HRESULT_TYPEDEF_(0x8009601EL)
+
+//
+//  Error codes for mssipotf.dll
+//  Most of the error codes can only occur when an error occurs
+//    during font file signing
+//
+//
+//
+// MessageId: MSSIPOTF_E_OUTOFMEMRANGE
+//
+// MessageText:
+//
+//  Tried to reference a part of the file outside the proper range.
+//
+#define MSSIPOTF_E_OUTOFMEMRANGE         _HRESULT_TYPEDEF_(0x80097001L)
+
+//
+// MessageId: MSSIPOTF_E_CANTGETOBJECT
+//
+// MessageText:
+//
+//  Could not retrieve an object from the file.
+//
+#define MSSIPOTF_E_CANTGETOBJECT         _HRESULT_TYPEDEF_(0x80097002L)
+
+//
+// MessageId: MSSIPOTF_E_NOHEADTABLE
+//
+// MessageText:
+//
+//  Could not find the head table in the file.
+//
+#define MSSIPOTF_E_NOHEADTABLE           _HRESULT_TYPEDEF_(0x80097003L)
+
+//
+// MessageId: MSSIPOTF_E_BAD_MAGICNUMBER
+//
+// MessageText:
+//
+//  The magic number in the head table is incorrect.
+//
+#define MSSIPOTF_E_BAD_MAGICNUMBER       _HRESULT_TYPEDEF_(0x80097004L)
+
+//
+// MessageId: MSSIPOTF_E_BAD_OFFSET_TABLE
+//
+// MessageText:
+//
+//  The offset table has incorrect values.
+//
+#define MSSIPOTF_E_BAD_OFFSET_TABLE      _HRESULT_TYPEDEF_(0x80097005L)
+
+//
+// MessageId: MSSIPOTF_E_TABLE_TAGORDER
+//
+// MessageText:
+//
+//  Duplicate table tags or tags out of alphabetical order.
+//
+#define MSSIPOTF_E_TABLE_TAGORDER        _HRESULT_TYPEDEF_(0x80097006L)
+
+//
+// MessageId: MSSIPOTF_E_TABLE_LONGWORD
+//
+// MessageText:
+//
+//  A table does not start on a long word boundary.
+//
+#define MSSIPOTF_E_TABLE_LONGWORD        _HRESULT_TYPEDEF_(0x80097007L)
+
+//
+// MessageId: MSSIPOTF_E_BAD_FIRST_TABLE_PLACEMENT
+//
+// MessageText:
+//
+//  First table does not appear after header information.
+//
+#define MSSIPOTF_E_BAD_FIRST_TABLE_PLACEMENT _HRESULT_TYPEDEF_(0x80097008L)
+
+//
+// MessageId: MSSIPOTF_E_TABLES_OVERLAP
+//
+// MessageText:
+//
+//  Two or more tables overlap.
+//
+#define MSSIPOTF_E_TABLES_OVERLAP        _HRESULT_TYPEDEF_(0x80097009L)
+
+//
+// MessageId: MSSIPOTF_E_TABLE_PADBYTES
+//
+// MessageText:
+//
+//  Too many pad bytes between tables or pad bytes are not 0.
+//
+#define MSSIPOTF_E_TABLE_PADBYTES        _HRESULT_TYPEDEF_(0x8009700AL)
+
+//
+// MessageId: MSSIPOTF_E_FILETOOSMALL
+//
+// MessageText:
+//
+//  File is too small to contain the last table.
+//
+#define MSSIPOTF_E_FILETOOSMALL          _HRESULT_TYPEDEF_(0x8009700BL)
+
+//
+// MessageId: MSSIPOTF_E_TABLE_CHECKSUM
+//
+// MessageText:
+//
+//  A table checksum is incorrect.
+//
+#define MSSIPOTF_E_TABLE_CHECKSUM        _HRESULT_TYPEDEF_(0x8009700CL)
+
+//
+// MessageId: MSSIPOTF_E_FILE_CHECKSUM
+//
+// MessageText:
+//
+//  The file checksum is incorrect.
+//
+#define MSSIPOTF_E_FILE_CHECKSUM         _HRESULT_TYPEDEF_(0x8009700DL)
+
+//
+// MessageId: MSSIPOTF_E_FAILED_POLICY
+//
+// MessageText:
+//
+//  The signature does not have the correct attributes for the policy.
+//
+#define MSSIPOTF_E_FAILED_POLICY         _HRESULT_TYPEDEF_(0x80097010L)
+
+//
+// MessageId: MSSIPOTF_E_FAILED_HINTS_CHECK
+//
+// MessageText:
+//
+//  The file did not pass the hints check.
+//
+#define MSSIPOTF_E_FAILED_HINTS_CHECK    _HRESULT_TYPEDEF_(0x80097011L)
+
+//
+// MessageId: MSSIPOTF_E_NOT_OPENTYPE
+//
+// MessageText:
+//
+//  The file is not an OpenType file.
+//
+#define MSSIPOTF_E_NOT_OPENTYPE          _HRESULT_TYPEDEF_(0x80097012L)
+
+//
+// MessageId: MSSIPOTF_E_FILE
+//
+// MessageText:
+//
+//  Failed on a file operation (open, map, read, write).
+//
+#define MSSIPOTF_E_FILE                  _HRESULT_TYPEDEF_(0x80097013L)
+
+//
+// MessageId: MSSIPOTF_E_CRYPT
+//
+// MessageText:
+//
+//  A call to a CryptoAPI function failed.
+//
+#define MSSIPOTF_E_CRYPT                 _HRESULT_TYPEDEF_(0x80097014L)
+
+//
+// MessageId: MSSIPOTF_E_BADVERSION
+//
+// MessageText:
+//
+//  There is a bad version number in the file.
+//
+#define MSSIPOTF_E_BADVERSION            _HRESULT_TYPEDEF_(0x80097015L)
+
+//
+// MessageId: MSSIPOTF_E_DSIG_STRUCTURE
+//
+// MessageText:
+//
+//  The structure of the DSIG table is incorrect.
+//
+#define MSSIPOTF_E_DSIG_STRUCTURE        _HRESULT_TYPEDEF_(0x80097016L)
+
+//
+// MessageId: MSSIPOTF_E_PCONST_CHECK
+//
+// MessageText:
+//
+//  A check failed in a partially constant table.
+//
+#define MSSIPOTF_E_PCONST_CHECK          _HRESULT_TYPEDEF_(0x80097017L)
+
+//
+// MessageId: MSSIPOTF_E_STRUCTURE
+//
+// MessageText:
+//
+//  Some kind of structural error.
+//
+#define MSSIPOTF_E_STRUCTURE             _HRESULT_TYPEDEF_(0x80097018L)
+
+#define NTE_OP_OK 0
+
+//
+// Note that additional FACILITY_SSPI errors are in issperr.h
+//
+// ******************
+// FACILITY_CERT
+// ******************
+//
+// MessageId: TRUST_E_PROVIDER_UNKNOWN
+//
+// MessageText:
+//
+//  Unknown trust provider.
+//
+#define TRUST_E_PROVIDER_UNKNOWN         _HRESULT_TYPEDEF_(0x800B0001L)
+
+//
+// MessageId: TRUST_E_ACTION_UNKNOWN
+//
+// MessageText:
+//
+//  The trust verification action specified is not supported by the specified trust provider.
+//
+#define TRUST_E_ACTION_UNKNOWN           _HRESULT_TYPEDEF_(0x800B0002L)
+
+//
+// MessageId: TRUST_E_SUBJECT_FORM_UNKNOWN
+//
+// MessageText:
+//
+//  The form specified for the subject is not one supported or known by the specified trust provider.
+//
+#define TRUST_E_SUBJECT_FORM_UNKNOWN     _HRESULT_TYPEDEF_(0x800B0003L)
+
+//
+// MessageId: TRUST_E_SUBJECT_NOT_TRUSTED
+//
+// MessageText:
+//
+//  The subject is not trusted for the specified action.
+//
+#define TRUST_E_SUBJECT_NOT_TRUSTED      _HRESULT_TYPEDEF_(0x800B0004L)
+
+//
+// MessageId: DIGSIG_E_ENCODE
+//
+// MessageText:
+//
+//  Error due to problem in ASN.1 encoding process.
+//
+#define DIGSIG_E_ENCODE                  _HRESULT_TYPEDEF_(0x800B0005L)
+
+//
+// MessageId: DIGSIG_E_DECODE
+//
+// MessageText:
+//
+//  Error due to problem in ASN.1 decoding process.
+//
+#define DIGSIG_E_DECODE                  _HRESULT_TYPEDEF_(0x800B0006L)
+
+//
+// MessageId: DIGSIG_E_EXTENSIBILITY
+//
+// MessageText:
+//
+//  Reading / writing Extensions where Attributes are appropriate, and visa versa.
+//
+#define DIGSIG_E_EXTENSIBILITY           _HRESULT_TYPEDEF_(0x800B0007L)
+
+//
+// MessageId: DIGSIG_E_CRYPTO
+//
+// MessageText:
+//
+//  Unspecified cryptographic failure.
+//
+#define DIGSIG_E_CRYPTO                  _HRESULT_TYPEDEF_(0x800B0008L)
+
+//
+// MessageId: PERSIST_E_SIZEDEFINITE
+//
+// MessageText:
+//
+//  The size of the data could not be determined.
+//
+#define PERSIST_E_SIZEDEFINITE           _HRESULT_TYPEDEF_(0x800B0009L)
+
+//
+// MessageId: PERSIST_E_SIZEINDEFINITE
+//
+// MessageText:
+//
+//  The size of the indefinite-sized data could not be determined.
+//
+#define PERSIST_E_SIZEINDEFINITE         _HRESULT_TYPEDEF_(0x800B000AL)
+
+//
+// MessageId: PERSIST_E_NOTSELFSIZING
+//
+// MessageText:
+//
+//  This object does not read and write self-sizing data.
+//
+#define PERSIST_E_NOTSELFSIZING          _HRESULT_TYPEDEF_(0x800B000BL)
+
+//
+// MessageId: TRUST_E_NOSIGNATURE
+//
+// MessageText:
+//
+//  No signature was present in the subject.
+//
+#define TRUST_E_NOSIGNATURE              _HRESULT_TYPEDEF_(0x800B0100L)
+
+//
+// MessageId: CERT_E_EXPIRED
+//
+// MessageText:
+//
+//  A required certificate is not within its validity period when verifying against the current system clock or the timestamp in the signed file.
+//
+#define CERT_E_EXPIRED                   _HRESULT_TYPEDEF_(0x800B0101L)
+
+//
+// MessageId: CERT_E_VALIDITYPERIODNESTING
+//
+// MessageText:
+//
+//  The validity periods of the certification chain do not nest correctly.
+//
+#define CERT_E_VALIDITYPERIODNESTING     _HRESULT_TYPEDEF_(0x800B0102L)
+
+//
+// MessageId: CERT_E_ROLE
+//
+// MessageText:
+//
+//  A certificate that can only be used as an end-entity is being used as a CA or visa versa.
+//
+#define CERT_E_ROLE                      _HRESULT_TYPEDEF_(0x800B0103L)
+
+//
+// MessageId: CERT_E_PATHLENCONST
+//
+// MessageText:
+//
+//  A path length constraint in the certification chain has been violated.
+//
+#define CERT_E_PATHLENCONST              _HRESULT_TYPEDEF_(0x800B0104L)
+
+//
+// MessageId: CERT_E_CRITICAL
+//
+// MessageText:
+//
+//  A certificate contains an unknown extension that is marked 'critical'.
+//
+#define CERT_E_CRITICAL                  _HRESULT_TYPEDEF_(0x800B0105L)
+
+//
+// MessageId: CERT_E_PURPOSE
+//
+// MessageText:
+//
+//  A certificate being used for a purpose other than the ones specified by its CA.
+//
+#define CERT_E_PURPOSE                   _HRESULT_TYPEDEF_(0x800B0106L)
+
+//
+// MessageId: CERT_E_ISSUERCHAINING
+//
+// MessageText:
+//
+//  A parent of a given certificate in fact did not issue that child certificate.
+//
+#define CERT_E_ISSUERCHAINING            _HRESULT_TYPEDEF_(0x800B0107L)
+
+//
+// MessageId: CERT_E_MALFORMED
+//
+// MessageText:
+//
+//  A certificate is missing or has an empty value for an important field, such as a subject or issuer name.
+//
+#define CERT_E_MALFORMED                 _HRESULT_TYPEDEF_(0x800B0108L)
+
+//
+// MessageId: CERT_E_UNTRUSTEDROOT
+//
+// MessageText:
+//
+//  A certificate chain processed, but terminated in a root certificate which is not trusted by the trust provider.
+//
+#define CERT_E_UNTRUSTEDROOT             _HRESULT_TYPEDEF_(0x800B0109L)
+
+//
+// MessageId: CERT_E_CHAINING
+//
+// MessageText:
+//
+//  A certificate chain could not be built to a trusted root authority.
+//
+#define CERT_E_CHAINING                  _HRESULT_TYPEDEF_(0x800B010AL)
+
+//
+// MessageId: TRUST_E_FAIL
+//
+// MessageText:
+//
+//  Generic trust failure.
+//
+#define TRUST_E_FAIL                     _HRESULT_TYPEDEF_(0x800B010BL)
+
+//
+// MessageId: CERT_E_REVOKED
+//
+// MessageText:
+//
+//  A certificate was explicitly revoked by its issuer.
+//
+#define CERT_E_REVOKED                   _HRESULT_TYPEDEF_(0x800B010CL)
+
+//
+// MessageId: CERT_E_UNTRUSTEDTESTROOT
+//
+// MessageText:
+//
+//  The certification path terminates with the test root which is not trusted with the current policy settings.
+//
+#define CERT_E_UNTRUSTEDTESTROOT         _HRESULT_TYPEDEF_(0x800B010DL)
+
+//
+// MessageId: CERT_E_REVOCATION_FAILURE
+//
+// MessageText:
+//
+//  The revocation process could not continue - the certificate(s) could not be checked.
+//
+#define CERT_E_REVOCATION_FAILURE        _HRESULT_TYPEDEF_(0x800B010EL)
+
+//
+// MessageId: CERT_E_CN_NO_MATCH
+//
+// MessageText:
+//
+//  The certificate's CN name does not match the passed value.
+//
+#define CERT_E_CN_NO_MATCH               _HRESULT_TYPEDEF_(0x800B010FL)
+
+//
+// MessageId: CERT_E_WRONG_USAGE
+//
+// MessageText:
+//
+//  The certificate is not valid for the requested usage.
+//
+#define CERT_E_WRONG_USAGE               _HRESULT_TYPEDEF_(0x800B0110L)
+
+//
+// MessageId: TRUST_E_EXPLICIT_DISTRUST
+//
+// MessageText:
+//
+//  The certificate was explicitly marked as untrusted by the user.
+//
+#define TRUST_E_EXPLICIT_DISTRUST        _HRESULT_TYPEDEF_(0x800B0111L)
+
+//
+// MessageId: CERT_E_UNTRUSTEDCA
+//
+// MessageText:
+//
+//  A certification chain processed correctly, but one of the CA certificates is not trusted by the policy provider.
+//
+#define CERT_E_UNTRUSTEDCA               _HRESULT_TYPEDEF_(0x800B0112L)
+
+//
+// MessageId: CERT_E_INVALID_POLICY
+//
+// MessageText:
+//
+//  The certificate has invalid policy.
+//
+#define CERT_E_INVALID_POLICY            _HRESULT_TYPEDEF_(0x800B0113L)
+
+//
+// MessageId: CERT_E_INVALID_NAME
+//
+// MessageText:
+//
+//  The certificate has an invalid name. The name is not included in the permitted list or is explicitly excluded.
+//
+#define CERT_E_INVALID_NAME              _HRESULT_TYPEDEF_(0x800B0114L)
+
+// *****************
+// FACILITY_SETUPAPI
+// *****************
+//
+// Since these error codes aren't in the standard Win32 range (i.e., 0-64K), define a
+// macro to map either Win32 or SetupAPI error codes into an HRESULT.
+//
+#define HRESULT_FROM_SETUPAPI(x) ((((x) & (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR)) == (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR)) \
+                                 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_SETUPAPI << 16) | 0x80000000))                               \
+                                 : HRESULT_FROM_WIN32(x))
+//
+// MessageId: SPAPI_E_EXPECTED_SECTION_NAME
+//
+// MessageText:
+//
+//  A non-empty line was encountered in the INF before the start of a section.
+//
+#define SPAPI_E_EXPECTED_SECTION_NAME    _HRESULT_TYPEDEF_(0x800F0000L)
+
+//
+// MessageId: SPAPI_E_BAD_SECTION_NAME_LINE
+//
+// MessageText:
+//
+//  A section name marker in the INF is not complete, or does not exist on a line by itself.
+//
+#define SPAPI_E_BAD_SECTION_NAME_LINE    _HRESULT_TYPEDEF_(0x800F0001L)
+
+//
+// MessageId: SPAPI_E_SECTION_NAME_TOO_LONG
+//
+// MessageText:
+//
+//  An INF section was encountered whose name exceeds the maximum section name length.
+//
+#define SPAPI_E_SECTION_NAME_TOO_LONG    _HRESULT_TYPEDEF_(0x800F0002L)
+
+//
+// MessageId: SPAPI_E_GENERAL_SYNTAX
+//
+// MessageText:
+//
+//  The syntax of the INF is invalid.
+//
+#define SPAPI_E_GENERAL_SYNTAX           _HRESULT_TYPEDEF_(0x800F0003L)
+
+//
+// MessageId: SPAPI_E_WRONG_INF_STYLE
+//
+// MessageText:
+//
+//  The style of the INF is different than what was requested.
+//
+#define SPAPI_E_WRONG_INF_STYLE          _HRESULT_TYPEDEF_(0x800F0100L)
+
+//
+// MessageId: SPAPI_E_SECTION_NOT_FOUND
+//
+// MessageText:
+//
+//  The required section was not found in the INF.
+//
+#define SPAPI_E_SECTION_NOT_FOUND        _HRESULT_TYPEDEF_(0x800F0101L)
+
+//
+// MessageId: SPAPI_E_LINE_NOT_FOUND
+//
+// MessageText:
+//
+//  The required line was not found in the INF.
+//
+#define SPAPI_E_LINE_NOT_FOUND           _HRESULT_TYPEDEF_(0x800F0102L)
+
+//
+// MessageId: SPAPI_E_NO_BACKUP
+//
+// MessageText:
+//
+//  The files affected by the installation of this file queue have not been backed up for uninstall.
+//
+#define SPAPI_E_NO_BACKUP                _HRESULT_TYPEDEF_(0x800F0103L)
+
+//
+// MessageId: SPAPI_E_NO_ASSOCIATED_CLASS
+//
+// MessageText:
+//
+//  The INF or the device information set or element does not have an associated install class.
+//
+#define SPAPI_E_NO_ASSOCIATED_CLASS      _HRESULT_TYPEDEF_(0x800F0200L)
+
+//
+// MessageId: SPAPI_E_CLASS_MISMATCH
+//
+// MessageText:
+//
+//  The INF or the device information set or element does not match the specified install class.
+//
+#define SPAPI_E_CLASS_MISMATCH           _HRESULT_TYPEDEF_(0x800F0201L)
+
+//
+// MessageId: SPAPI_E_DUPLICATE_FOUND
+//
+// MessageText:
+//
+//  An existing device was found that is a duplicate of the device being manually installed.
+//
+#define SPAPI_E_DUPLICATE_FOUND          _HRESULT_TYPEDEF_(0x800F0202L)
+
+//
+// MessageId: SPAPI_E_NO_DRIVER_SELECTED
+//
+// MessageText:
+//
+//  There is no driver selected for the device information set or element.
+//
+#define SPAPI_E_NO_DRIVER_SELECTED       _HRESULT_TYPEDEF_(0x800F0203L)
+
+//
+// MessageId: SPAPI_E_KEY_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  The requested device registry key does not exist.
+//
+#define SPAPI_E_KEY_DOES_NOT_EXIST       _HRESULT_TYPEDEF_(0x800F0204L)
+
+//
+// MessageId: SPAPI_E_INVALID_DEVINST_NAME
+//
+// MessageText:
+//
+//  The device instance name is invalid.
+//
+#define SPAPI_E_INVALID_DEVINST_NAME     _HRESULT_TYPEDEF_(0x800F0205L)
+
+//
+// MessageId: SPAPI_E_INVALID_CLASS
+//
+// MessageText:
+//
+//  The install class is not present or is invalid.
+//
+#define SPAPI_E_INVALID_CLASS            _HRESULT_TYPEDEF_(0x800F0206L)
+
+//
+// MessageId: SPAPI_E_DEVINST_ALREADY_EXISTS
+//
+// MessageText:
+//
+//  The device instance cannot be created because it already exists.
+//
+#define SPAPI_E_DEVINST_ALREADY_EXISTS   _HRESULT_TYPEDEF_(0x800F0207L)
+
+//
+// MessageId: SPAPI_E_DEVINFO_NOT_REGISTERED
+//
+// MessageText:
+//
+//  The operation cannot be performed on a device information element that has not been registered.
+//
+#define SPAPI_E_DEVINFO_NOT_REGISTERED   _HRESULT_TYPEDEF_(0x800F0208L)
+
+//
+// MessageId: SPAPI_E_INVALID_REG_PROPERTY
+//
+// MessageText:
+//
+//  The device property code is invalid.
+//
+#define SPAPI_E_INVALID_REG_PROPERTY     _HRESULT_TYPEDEF_(0x800F0209L)
+
+//
+// MessageId: SPAPI_E_NO_INF
+//
+// MessageText:
+//
+//  The INF from which a driver list is to be built does not exist.
+//
+#define SPAPI_E_NO_INF                   _HRESULT_TYPEDEF_(0x800F020AL)
+
+//
+// MessageId: SPAPI_E_NO_SUCH_DEVINST
+//
+// MessageText:
+//
+//  The device instance does not exist in the hardware tree.
+//
+#define SPAPI_E_NO_SUCH_DEVINST          _HRESULT_TYPEDEF_(0x800F020BL)
+
+//
+// MessageId: SPAPI_E_CANT_LOAD_CLASS_ICON
+//
+// MessageText:
+//
+//  The icon representing this install class cannot be loaded.
+//
+#define SPAPI_E_CANT_LOAD_CLASS_ICON     _HRESULT_TYPEDEF_(0x800F020CL)
+
+//
+// MessageId: SPAPI_E_INVALID_CLASS_INSTALLER
+//
+// MessageText:
+//
+//  The class installer registry entry is invalid.
+//
+#define SPAPI_E_INVALID_CLASS_INSTALLER  _HRESULT_TYPEDEF_(0x800F020DL)
+
+//
+// MessageId: SPAPI_E_DI_DO_DEFAULT
+//
+// MessageText:
+//
+//  The class installer has indicated that the default action should be performed for this installation request.
+//
+#define SPAPI_E_DI_DO_DEFAULT            _HRESULT_TYPEDEF_(0x800F020EL)
+
+//
+// MessageId: SPAPI_E_DI_NOFILECOPY
+//
+// MessageText:
+//
+//  The operation does not require any files to be copied.
+//
+#define SPAPI_E_DI_NOFILECOPY            _HRESULT_TYPEDEF_(0x800F020FL)
+
+//
+// MessageId: SPAPI_E_INVALID_HWPROFILE
+//
+// MessageText:
+//
+//  The specified hardware profile does not exist.
+//
+#define SPAPI_E_INVALID_HWPROFILE        _HRESULT_TYPEDEF_(0x800F0210L)
+
+//
+// MessageId: SPAPI_E_NO_DEVICE_SELECTED
+//
+// MessageText:
+//
+//  There is no device information element currently selected for this device information set.
+//
+#define SPAPI_E_NO_DEVICE_SELECTED       _HRESULT_TYPEDEF_(0x800F0211L)
+
+//
+// MessageId: SPAPI_E_DEVINFO_LIST_LOCKED
+//
+// MessageText:
+//
+//  The operation cannot be performed because the device information set is locked.
+//
+#define SPAPI_E_DEVINFO_LIST_LOCKED      _HRESULT_TYPEDEF_(0x800F0212L)
+
+//
+// MessageId: SPAPI_E_DEVINFO_DATA_LOCKED
+//
+// MessageText:
+//
+//  The operation cannot be performed because the device information element is locked.
+//
+#define SPAPI_E_DEVINFO_DATA_LOCKED      _HRESULT_TYPEDEF_(0x800F0213L)
+
+//
+// MessageId: SPAPI_E_DI_BAD_PATH
+//
+// MessageText:
+//
+//  The specified path does not contain any applicable device INFs.
+//
+#define SPAPI_E_DI_BAD_PATH              _HRESULT_TYPEDEF_(0x800F0214L)
+
+//
+// MessageId: SPAPI_E_NO_CLASSINSTALL_PARAMS
+//
+// MessageText:
+//
+//  No class installer parameters have been set for the device information set or element.
+//
+#define SPAPI_E_NO_CLASSINSTALL_PARAMS   _HRESULT_TYPEDEF_(0x800F0215L)
+
+//
+// MessageId: SPAPI_E_FILEQUEUE_LOCKED
+//
+// MessageText:
+//
+//  The operation cannot be performed because the file queue is locked.
+//
+#define SPAPI_E_FILEQUEUE_LOCKED         _HRESULT_TYPEDEF_(0x800F0216L)
+
+//
+// MessageId: SPAPI_E_BAD_SERVICE_INSTALLSECT
+//
+// MessageText:
+//
+//  A service installation section in this INF is invalid.
+//
+#define SPAPI_E_BAD_SERVICE_INSTALLSECT  _HRESULT_TYPEDEF_(0x800F0217L)
+
+//
+// MessageId: SPAPI_E_NO_CLASS_DRIVER_LIST
+//
+// MessageText:
+//
+//  There is no class driver list for the device information element.
+//
+#define SPAPI_E_NO_CLASS_DRIVER_LIST     _HRESULT_TYPEDEF_(0x800F0218L)
+
+//
+// MessageId: SPAPI_E_NO_ASSOCIATED_SERVICE
+//
+// MessageText:
+//
+//  The installation failed because a function driver was not specified for this device instance.
+//
+#define SPAPI_E_NO_ASSOCIATED_SERVICE    _HRESULT_TYPEDEF_(0x800F0219L)
+
+//
+// MessageId: SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE
+//
+// MessageText:
+//
+//  There is presently no default device interface designated for this interface class.
+//
+#define SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE _HRESULT_TYPEDEF_(0x800F021AL)
+
+//
+// MessageId: SPAPI_E_DEVICE_INTERFACE_ACTIVE
+//
+// MessageText:
+//
+//  The operation cannot be performed because the device interface is currently active.
+//
+#define SPAPI_E_DEVICE_INTERFACE_ACTIVE  _HRESULT_TYPEDEF_(0x800F021BL)
+
+//
+// MessageId: SPAPI_E_DEVICE_INTERFACE_REMOVED
+//
+// MessageText:
+//
+//  The operation cannot be performed because the device interface has been removed from the system.
+//
+#define SPAPI_E_DEVICE_INTERFACE_REMOVED _HRESULT_TYPEDEF_(0x800F021CL)
+
+//
+// MessageId: SPAPI_E_BAD_INTERFACE_INSTALLSECT
+//
+// MessageText:
+//
+//  An interface installation section in this INF is invalid.
+//
+#define SPAPI_E_BAD_INTERFACE_INSTALLSECT _HRESULT_TYPEDEF_(0x800F021DL)
+
+//
+// MessageId: SPAPI_E_NO_SUCH_INTERFACE_CLASS
+//
+// MessageText:
+//
+//  This interface class does not exist in the system.
+//
+#define SPAPI_E_NO_SUCH_INTERFACE_CLASS  _HRESULT_TYPEDEF_(0x800F021EL)
+
+//
+// MessageId: SPAPI_E_INVALID_REFERENCE_STRING
+//
+// MessageText:
+//
+//  The reference string supplied for this interface device is invalid.
+//
+#define SPAPI_E_INVALID_REFERENCE_STRING _HRESULT_TYPEDEF_(0x800F021FL)
+
+//
+// MessageId: SPAPI_E_INVALID_MACHINENAME
+//
+// MessageText:
+//
+//  The specified machine name does not conform to UNC naming conventions.
+//
+#define SPAPI_E_INVALID_MACHINENAME      _HRESULT_TYPEDEF_(0x800F0220L)
+
+//
+// MessageId: SPAPI_E_REMOTE_COMM_FAILURE
+//
+// MessageText:
+//
+//  A general remote communication error occurred.
+//
+#define SPAPI_E_REMOTE_COMM_FAILURE      _HRESULT_TYPEDEF_(0x800F0221L)
+
+//
+// MessageId: SPAPI_E_MACHINE_UNAVAILABLE
+//
+// MessageText:
+//
+//  The machine selected for remote communication is not available at this time.
+//
+#define SPAPI_E_MACHINE_UNAVAILABLE      _HRESULT_TYPEDEF_(0x800F0222L)
+
+//
+// MessageId: SPAPI_E_NO_CONFIGMGR_SERVICES
+//
+// MessageText:
+//
+//  The Plug and Play service is not available on the remote machine.
+//
+#define SPAPI_E_NO_CONFIGMGR_SERVICES    _HRESULT_TYPEDEF_(0x800F0223L)
+
+//
+// MessageId: SPAPI_E_INVALID_PROPPAGE_PROVIDER
+//
+// MessageText:
+//
+//  The property page provider registry entry is invalid.
+//
+#define SPAPI_E_INVALID_PROPPAGE_PROVIDER _HRESULT_TYPEDEF_(0x800F0224L)
+
+//
+// MessageId: SPAPI_E_NO_SUCH_DEVICE_INTERFACE
+//
+// MessageText:
+//
+//  The requested device interface is not present in the system.
+//
+#define SPAPI_E_NO_SUCH_DEVICE_INTERFACE _HRESULT_TYPEDEF_(0x800F0225L)
+
+//
+// MessageId: SPAPI_E_DI_POSTPROCESSING_REQUIRED
+//
+// MessageText:
+//
+//  The device's co-installer has additional work to perform after installation is complete.
+//
+#define SPAPI_E_DI_POSTPROCESSING_REQUIRED _HRESULT_TYPEDEF_(0x800F0226L)
+
+//
+// MessageId: SPAPI_E_INVALID_COINSTALLER
+//
+// MessageText:
+//
+//  The device's co-installer is invalid.
+//
+#define SPAPI_E_INVALID_COINSTALLER      _HRESULT_TYPEDEF_(0x800F0227L)
+
+//
+// MessageId: SPAPI_E_NO_COMPAT_DRIVERS
+//
+// MessageText:
+//
+//  There are no compatible drivers for this device.
+//
+#define SPAPI_E_NO_COMPAT_DRIVERS        _HRESULT_TYPEDEF_(0x800F0228L)
+
+//
+// MessageId: SPAPI_E_NO_DEVICE_ICON
+//
+// MessageText:
+//
+//  There is no icon that represents this device or device type.
+//
+#define SPAPI_E_NO_DEVICE_ICON           _HRESULT_TYPEDEF_(0x800F0229L)
+
+//
+// MessageId: SPAPI_E_INVALID_INF_LOGCONFIG
+//
+// MessageText:
+//
+//  A logical configuration specified in this INF is invalid.
+//
+#define SPAPI_E_INVALID_INF_LOGCONFIG    _HRESULT_TYPEDEF_(0x800F022AL)
+
+//
+// MessageId: SPAPI_E_DI_DONT_INSTALL
+//
+// MessageText:
+//
+//  The class installer has denied the request to install or upgrade this device.
+//
+#define SPAPI_E_DI_DONT_INSTALL          _HRESULT_TYPEDEF_(0x800F022BL)
+
+//
+// MessageId: SPAPI_E_INVALID_FILTER_DRIVER
+//
+// MessageText:
+//
+//  One of the filter drivers installed for this device is invalid.
+//
+#define SPAPI_E_INVALID_FILTER_DRIVER    _HRESULT_TYPEDEF_(0x800F022CL)
+
+//
+// MessageId: SPAPI_E_NON_WINDOWS_NT_DRIVER
+//
+// MessageText:
+//
+//  The driver selected for this device does not support Windows XP.
+//
+#define SPAPI_E_NON_WINDOWS_NT_DRIVER    _HRESULT_TYPEDEF_(0x800F022DL)
+
+//
+// MessageId: SPAPI_E_NON_WINDOWS_DRIVER
+//
+// MessageText:
+//
+//  The driver selected for this device does not support Windows.
+//
+#define SPAPI_E_NON_WINDOWS_DRIVER       _HRESULT_TYPEDEF_(0x800F022EL)
+
+//
+// MessageId: SPAPI_E_NO_CATALOG_FOR_OEM_INF
+//
+// MessageText:
+//
+//  The third-party INF does not contain digital signature information.
+//
+#define SPAPI_E_NO_CATALOG_FOR_OEM_INF   _HRESULT_TYPEDEF_(0x800F022FL)
+
+//
+// MessageId: SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE
+//
+// MessageText:
+//
+//  An invalid attempt was made to use a device installation file queue for verification of digital signatures relative to other platforms.
+//
+#define SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE _HRESULT_TYPEDEF_(0x800F0230L)
+
+//
+// MessageId: SPAPI_E_NOT_DISABLEABLE
+//
+// MessageText:
+//
+//  The device cannot be disabled.
+//
+#define SPAPI_E_NOT_DISABLEABLE          _HRESULT_TYPEDEF_(0x800F0231L)
+
+//
+// MessageId: SPAPI_E_CANT_REMOVE_DEVINST
+//
+// MessageText:
+//
+//  The device could not be dynamically removed.
+//
+#define SPAPI_E_CANT_REMOVE_DEVINST      _HRESULT_TYPEDEF_(0x800F0232L)
+
+//
+// MessageId: SPAPI_E_INVALID_TARGET
+//
+// MessageText:
+//
+//  Cannot copy to specified target.
+//
+#define SPAPI_E_INVALID_TARGET           _HRESULT_TYPEDEF_(0x800F0233L)
+
+//
+// MessageId: SPAPI_E_DRIVER_NONNATIVE
+//
+// MessageText:
+//
+//  Driver is not intended for this platform.
+//
+#define SPAPI_E_DRIVER_NONNATIVE         _HRESULT_TYPEDEF_(0x800F0234L)
+
+//
+// MessageId: SPAPI_E_IN_WOW64
+//
+// MessageText:
+//
+//  Operation not allowed in WOW64.
+//
+#define SPAPI_E_IN_WOW64                 _HRESULT_TYPEDEF_(0x800F0235L)
+
+//
+// MessageId: SPAPI_E_SET_SYSTEM_RESTORE_POINT
+//
+// MessageText:
+//
+//  The operation involving unsigned file copying was rolled back, so that a system restore point could be set.
+//
+#define SPAPI_E_SET_SYSTEM_RESTORE_POINT _HRESULT_TYPEDEF_(0x800F0236L)
+
+//
+// MessageId: SPAPI_E_INCORRECTLY_COPIED_INF
+//
+// MessageText:
+//
+//  An INF was copied into the Windows INF directory in an improper manner.
+//
+#define SPAPI_E_INCORRECTLY_COPIED_INF   _HRESULT_TYPEDEF_(0x800F0237L)
+
+//
+// MessageId: SPAPI_E_SCE_DISABLED
+//
+// MessageText:
+//
+//  The Security Configuration Editor (SCE) APIs have been disabled on this Embedded product.
+//
+#define SPAPI_E_SCE_DISABLED             _HRESULT_TYPEDEF_(0x800F0238L)
+
+//
+// MessageId: SPAPI_E_ERROR_NOT_INSTALLED
+//
+// MessageText:
+//
+//  No installed components were detected.
+//
+#define SPAPI_E_ERROR_NOT_INSTALLED      _HRESULT_TYPEDEF_(0x800F1000L)
+
+// *****************
+// FACILITY_SCARD
+// *****************
+//
+// =============================
+// Facility SCARD Error Messages
+// =============================
+//
+#define SCARD_S_SUCCESS NO_ERROR
+//
+// MessageId: SCARD_F_INTERNAL_ERROR
+//
+// MessageText:
+//
+//  An internal consistency check failed.
+//
+#define SCARD_F_INTERNAL_ERROR           _HRESULT_TYPEDEF_(0x80100001L)
+
+//
+// MessageId: SCARD_E_CANCELLED
+//
+// MessageText:
+//
+//  The action was cancelled by an SCardCancel request.
+//
+#define SCARD_E_CANCELLED                _HRESULT_TYPEDEF_(0x80100002L)
+
+//
+// MessageId: SCARD_E_INVALID_HANDLE
+//
+// MessageText:
+//
+//  The supplied handle was invalid.
+//
+#define SCARD_E_INVALID_HANDLE           _HRESULT_TYPEDEF_(0x80100003L)
+
+//
+// MessageId: SCARD_E_INVALID_PARAMETER
+//
+// MessageText:
+//
+//  One or more of the supplied parameters could not be properly interpreted.
+//
+#define SCARD_E_INVALID_PARAMETER        _HRESULT_TYPEDEF_(0x80100004L)
+
+//
+// MessageId: SCARD_E_INVALID_TARGET
+//
+// MessageText:
+//
+//  Registry startup information is missing or invalid.
+//
+#define SCARD_E_INVALID_TARGET           _HRESULT_TYPEDEF_(0x80100005L)
+
+//
+// MessageId: SCARD_E_NO_MEMORY
+//
+// MessageText:
+//
+//  Not enough memory available to complete this command.
+//
+#define SCARD_E_NO_MEMORY                _HRESULT_TYPEDEF_(0x80100006L)
+
+//
+// MessageId: SCARD_F_WAITED_TOO_LONG
+//
+// MessageText:
+//
+//  An internal consistency timer has expired.
+//
+#define SCARD_F_WAITED_TOO_LONG          _HRESULT_TYPEDEF_(0x80100007L)
+
+//
+// MessageId: SCARD_E_INSUFFICIENT_BUFFER
+//
+// MessageText:
+//
+//  The data buffer to receive returned data is too small for the returned data.
+//
+#define SCARD_E_INSUFFICIENT_BUFFER      _HRESULT_TYPEDEF_(0x80100008L)
+
+//
+// MessageId: SCARD_E_UNKNOWN_READER
+//
+// MessageText:
+//
+//  The specified reader name is not recognized.
+//
+#define SCARD_E_UNKNOWN_READER           _HRESULT_TYPEDEF_(0x80100009L)
+
+//
+// MessageId: SCARD_E_TIMEOUT
+//
+// MessageText:
+//
+//  The user-specified timeout value has expired.
+//
+#define SCARD_E_TIMEOUT                  _HRESULT_TYPEDEF_(0x8010000AL)
+
+//
+// MessageId: SCARD_E_SHARING_VIOLATION
+//
+// MessageText:
+//
+//  The smart card cannot be accessed because of other connections outstanding.
+//
+#define SCARD_E_SHARING_VIOLATION        _HRESULT_TYPEDEF_(0x8010000BL)
+
+//
+// MessageId: SCARD_E_NO_SMARTCARD
+//
+// MessageText:
+//
+//  The operation requires a Smart Card, but no Smart Card is currently in the device.
+//
+#define SCARD_E_NO_SMARTCARD             _HRESULT_TYPEDEF_(0x8010000CL)
+
+//
+// MessageId: SCARD_E_UNKNOWN_CARD
+//
+// MessageText:
+//
+//  The specified smart card name is not recognized.
+//
+#define SCARD_E_UNKNOWN_CARD             _HRESULT_TYPEDEF_(0x8010000DL)
+
+//
+// MessageId: SCARD_E_CANT_DISPOSE
+//
+// MessageText:
+//
+//  The system could not dispose of the media in the requested manner.
+//
+#define SCARD_E_CANT_DISPOSE             _HRESULT_TYPEDEF_(0x8010000EL)
+
+//
+// MessageId: SCARD_E_PROTO_MISMATCH
+//
+// MessageText:
+//
+//  The requested protocols are incompatible with the protocol currently in use with the smart card.
+//
+#define SCARD_E_PROTO_MISMATCH           _HRESULT_TYPEDEF_(0x8010000FL)
+
+//
+// MessageId: SCARD_E_NOT_READY
+//
+// MessageText:
+//
+//  The reader or smart card is not ready to accept commands.
+//
+#define SCARD_E_NOT_READY                _HRESULT_TYPEDEF_(0x80100010L)
+
+//
+// MessageId: SCARD_E_INVALID_VALUE
+//
+// MessageText:
+//
+//  One or more of the supplied parameters values could not be properly interpreted.
+//
+#define SCARD_E_INVALID_VALUE            _HRESULT_TYPEDEF_(0x80100011L)
+
+//
+// MessageId: SCARD_E_SYSTEM_CANCELLED
+//
+// MessageText:
+//
+//  The action was cancelled by the system, presumably to log off or shut down.
+//
+#define SCARD_E_SYSTEM_CANCELLED         _HRESULT_TYPEDEF_(0x80100012L)
+
+//
+// MessageId: SCARD_F_COMM_ERROR
+//
+// MessageText:
+//
+//  An internal communications error has been detected.
+//
+#define SCARD_F_COMM_ERROR               _HRESULT_TYPEDEF_(0x80100013L)
+
+//
+// MessageId: SCARD_F_UNKNOWN_ERROR
+//
+// MessageText:
+//
+//  An internal error has been detected, but the source is unknown.
+//
+#define SCARD_F_UNKNOWN_ERROR            _HRESULT_TYPEDEF_(0x80100014L)
+
+//
+// MessageId: SCARD_E_INVALID_ATR
+//
+// MessageText:
+//
+//  An ATR obtained from the registry is not a valid ATR string.
+//
+#define SCARD_E_INVALID_ATR              _HRESULT_TYPEDEF_(0x80100015L)
+
+//
+// MessageId: SCARD_E_NOT_TRANSACTED
+//
+// MessageText:
+//
+//  An attempt was made to end a non-existent transaction.
+//
+#define SCARD_E_NOT_TRANSACTED           _HRESULT_TYPEDEF_(0x80100016L)
+
+//
+// MessageId: SCARD_E_READER_UNAVAILABLE
+//
+// MessageText:
+//
+//  The specified reader is not currently available for use.
+//
+#define SCARD_E_READER_UNAVAILABLE       _HRESULT_TYPEDEF_(0x80100017L)
+
+//
+// MessageId: SCARD_P_SHUTDOWN
+//
+// MessageText:
+//
+//  The operation has been aborted to allow the server application to exit.
+//
+#define SCARD_P_SHUTDOWN                 _HRESULT_TYPEDEF_(0x80100018L)
+
+//
+// MessageId: SCARD_E_PCI_TOO_SMALL
+//
+// MessageText:
+//
+//  The PCI Receive buffer was too small.
+//
+#define SCARD_E_PCI_TOO_SMALL            _HRESULT_TYPEDEF_(0x80100019L)
+
+//
+// MessageId: SCARD_E_READER_UNSUPPORTED
+//
+// MessageText:
+//
+//  The reader driver does not meet minimal requirements for support.
+//
+#define SCARD_E_READER_UNSUPPORTED       _HRESULT_TYPEDEF_(0x8010001AL)
+
+//
+// MessageId: SCARD_E_DUPLICATE_READER
+//
+// MessageText:
+//
+//  The reader driver did not produce a unique reader name.
+//
+#define SCARD_E_DUPLICATE_READER         _HRESULT_TYPEDEF_(0x8010001BL)
+
+//
+// MessageId: SCARD_E_CARD_UNSUPPORTED
+//
+// MessageText:
+//
+//  The smart card does not meet minimal requirements for support.
+//
+#define SCARD_E_CARD_UNSUPPORTED         _HRESULT_TYPEDEF_(0x8010001CL)
+
+//
+// MessageId: SCARD_E_NO_SERVICE
+//
+// MessageText:
+//
+//  The Smart card resource manager is not running.
+//
+#define SCARD_E_NO_SERVICE               _HRESULT_TYPEDEF_(0x8010001DL)
+
+//
+// MessageId: SCARD_E_SERVICE_STOPPED
+//
+// MessageText:
+//
+//  The Smart card resource manager has shut down.
+//
+#define SCARD_E_SERVICE_STOPPED          _HRESULT_TYPEDEF_(0x8010001EL)
+
+//
+// MessageId: SCARD_E_UNEXPECTED
+//
+// MessageText:
+//
+//  An unexpected card error has occurred.
+//
+#define SCARD_E_UNEXPECTED               _HRESULT_TYPEDEF_(0x8010001FL)
+
+//
+// MessageId: SCARD_E_ICC_INSTALLATION
+//
+// MessageText:
+//
+//  No Primary Provider can be found for the smart card.
+//
+#define SCARD_E_ICC_INSTALLATION         _HRESULT_TYPEDEF_(0x80100020L)
+
+//
+// MessageId: SCARD_E_ICC_CREATEORDER
+//
+// MessageText:
+//
+//  The requested order of object creation is not supported.
+//
+#define SCARD_E_ICC_CREATEORDER          _HRESULT_TYPEDEF_(0x80100021L)
+
+//
+// MessageId: SCARD_E_UNSUPPORTED_FEATURE
+//
+// MessageText:
+//
+//  This smart card does not support the requested feature.
+//
+#define SCARD_E_UNSUPPORTED_FEATURE      _HRESULT_TYPEDEF_(0x80100022L)
+
+//
+// MessageId: SCARD_E_DIR_NOT_FOUND
+//
+// MessageText:
+//
+//  The identified directory does not exist in the smart card.
+//
+#define SCARD_E_DIR_NOT_FOUND            _HRESULT_TYPEDEF_(0x80100023L)
+
+//
+// MessageId: SCARD_E_FILE_NOT_FOUND
+//
+// MessageText:
+//
+//  The identified file does not exist in the smart card.
+//
+#define SCARD_E_FILE_NOT_FOUND           _HRESULT_TYPEDEF_(0x80100024L)
+
+//
+// MessageId: SCARD_E_NO_DIR
+//
+// MessageText:
+//
+//  The supplied path does not represent a smart card directory.
+//
+#define SCARD_E_NO_DIR                   _HRESULT_TYPEDEF_(0x80100025L)
+
+//
+// MessageId: SCARD_E_NO_FILE
+//
+// MessageText:
+//
+//  The supplied path does not represent a smart card file.
+//
+#define SCARD_E_NO_FILE                  _HRESULT_TYPEDEF_(0x80100026L)
+
+//
+// MessageId: SCARD_E_NO_ACCESS
+//
+// MessageText:
+//
+//  Access is denied to this file.
+//
+#define SCARD_E_NO_ACCESS                _HRESULT_TYPEDEF_(0x80100027L)
+
+//
+// MessageId: SCARD_E_WRITE_TOO_MANY
+//
+// MessageText:
+//
+//  The smartcard does not have enough memory to store the information.
+//
+#define SCARD_E_WRITE_TOO_MANY           _HRESULT_TYPEDEF_(0x80100028L)
+
+//
+// MessageId: SCARD_E_BAD_SEEK
+//
+// MessageText:
+//
+//  There was an error trying to set the smart card file object pointer.
+//
+#define SCARD_E_BAD_SEEK                 _HRESULT_TYPEDEF_(0x80100029L)
+
+//
+// MessageId: SCARD_E_INVALID_CHV
+//
+// MessageText:
+//
+//  The supplied PIN is incorrect.
+//
+#define SCARD_E_INVALID_CHV              _HRESULT_TYPEDEF_(0x8010002AL)
+
+//
+// MessageId: SCARD_E_UNKNOWN_RES_MNG
+//
+// MessageText:
+//
+//  An unrecognized error code was returned from a layered component.
+//
+#define SCARD_E_UNKNOWN_RES_MNG          _HRESULT_TYPEDEF_(0x8010002BL)
+
+//
+// MessageId: SCARD_E_NO_SUCH_CERTIFICATE
+//
+// MessageText:
+//
+//  The requested certificate does not exist.
+//
+#define SCARD_E_NO_SUCH_CERTIFICATE      _HRESULT_TYPEDEF_(0x8010002CL)
+
+//
+// MessageId: SCARD_E_CERTIFICATE_UNAVAILABLE
+//
+// MessageText:
+//
+//  The requested certificate could not be obtained.
+//
+#define SCARD_E_CERTIFICATE_UNAVAILABLE  _HRESULT_TYPEDEF_(0x8010002DL)
+
+//
+// MessageId: SCARD_E_NO_READERS_AVAILABLE
+//
+// MessageText:
+//
+//  Cannot find a smart card reader.
+//
+#define SCARD_E_NO_READERS_AVAILABLE     _HRESULT_TYPEDEF_(0x8010002EL)
+
+//
+// MessageId: SCARD_E_COMM_DATA_LOST
+//
+// MessageText:
+//
+//  A communications error with the smart card has been detected.  Retry the operation.
+//
+#define SCARD_E_COMM_DATA_LOST           _HRESULT_TYPEDEF_(0x8010002FL)
+
+//
+// MessageId: SCARD_E_NO_KEY_CONTAINER
+//
+// MessageText:
+//
+//  The requested key container does not exist on the smart card.
+//
+#define SCARD_E_NO_KEY_CONTAINER         _HRESULT_TYPEDEF_(0x80100030L)
+
+//
+// MessageId: SCARD_E_SERVER_TOO_BUSY
+//
+// MessageText:
+//
+//  The Smart card resource manager is too busy to complete this operation.
+//
+#define SCARD_E_SERVER_TOO_BUSY          _HRESULT_TYPEDEF_(0x80100031L)
+
+//
+// These are warning codes.
+//
+//
+// MessageId: SCARD_W_UNSUPPORTED_CARD
+//
+// MessageText:
+//
+//  The reader cannot communicate with the smart card, due to ATR configuration conflicts.
+//
+#define SCARD_W_UNSUPPORTED_CARD         _HRESULT_TYPEDEF_(0x80100065L)
+
+//
+// MessageId: SCARD_W_UNRESPONSIVE_CARD
+//
+// MessageText:
+//
+//  The smart card is not responding to a reset.
+//
+#define SCARD_W_UNRESPONSIVE_CARD        _HRESULT_TYPEDEF_(0x80100066L)
+
+//
+// MessageId: SCARD_W_UNPOWERED_CARD
+//
+// MessageText:
+//
+//  Power has been removed from the smart card, so that further communication is not possible.
+//
+#define SCARD_W_UNPOWERED_CARD           _HRESULT_TYPEDEF_(0x80100067L)
+
+//
+// MessageId: SCARD_W_RESET_CARD
+//
+// MessageText:
+//
+//  The smart card has been reset, so any shared state information is invalid.
+//
+#define SCARD_W_RESET_CARD               _HRESULT_TYPEDEF_(0x80100068L)
+
+//
+// MessageId: SCARD_W_REMOVED_CARD
+//
+// MessageText:
+//
+//  The smart card has been removed, so that further communication is not possible.
+//
+#define SCARD_W_REMOVED_CARD             _HRESULT_TYPEDEF_(0x80100069L)
+
+//
+// MessageId: SCARD_W_SECURITY_VIOLATION
+//
+// MessageText:
+//
+//  Access was denied because of a security violation.
+//
+#define SCARD_W_SECURITY_VIOLATION       _HRESULT_TYPEDEF_(0x8010006AL)
+
+//
+// MessageId: SCARD_W_WRONG_CHV
+//
+// MessageText:
+//
+//  The card cannot be accessed because the wrong PIN was presented.
+//
+#define SCARD_W_WRONG_CHV                _HRESULT_TYPEDEF_(0x8010006BL)
+
+//
+// MessageId: SCARD_W_CHV_BLOCKED
+//
+// MessageText:
+//
+//  The card cannot be accessed because the maximum number of PIN entry attempts has been reached.
+//
+#define SCARD_W_CHV_BLOCKED              _HRESULT_TYPEDEF_(0x8010006CL)
+
+//
+// MessageId: SCARD_W_EOF
+//
+// MessageText:
+//
+//  The end of the smart card file has been reached.
+//
+#define SCARD_W_EOF                      _HRESULT_TYPEDEF_(0x8010006DL)
+
+//
+// MessageId: SCARD_W_CANCELLED_BY_USER
+//
+// MessageText:
+//
+//  The action was cancelled by the user.
+//
+#define SCARD_W_CANCELLED_BY_USER        _HRESULT_TYPEDEF_(0x8010006EL)
+
+//
+// MessageId: SCARD_W_CARD_NOT_AUTHENTICATED
+//
+// MessageText:
+//
+//  No PIN was presented to the smart card.
+//
+#define SCARD_W_CARD_NOT_AUTHENTICATED   _HRESULT_TYPEDEF_(0x8010006FL)
+
+// *****************
+// FACILITY_COMPLUS
+// *****************
+//
+// ===============================
+// Facility COMPLUS Error Messages
+// ===============================
+//
+//
+// The following are the subranges  within the COMPLUS facility
+// 0x400 - 0x4ff               COMADMIN_E_CAT
+// 0x600 - 0x6ff               COMQC errors
+// 0x700 - 0x7ff               MSDTC errors
+// 0x800 - 0x8ff               Other COMADMIN errors
+//
+// COMPLUS Admin errors
+//
+//
+// MessageId: COMADMIN_E_OBJECTERRORS
+//
+// MessageText:
+//
+//  Errors occurred accessing one or more objects - the ErrorInfo collection may have more detail
+//
+#define COMADMIN_E_OBJECTERRORS          _HRESULT_TYPEDEF_(0x80110401L)
+
+//
+// MessageId: COMADMIN_E_OBJECTINVALID
+//
+// MessageText:
+//
+//  One or more of the object's properties are missing or invalid
+//
+#define COMADMIN_E_OBJECTINVALID         _HRESULT_TYPEDEF_(0x80110402L)
+
+//
+// MessageId: COMADMIN_E_KEYMISSING
+//
+// MessageText:
+//
+//  The object was not found in the catalog
+//
+#define COMADMIN_E_KEYMISSING            _HRESULT_TYPEDEF_(0x80110403L)
+
+//
+// MessageId: COMADMIN_E_ALREADYINSTALLED
+//
+// MessageText:
+//
+//  The object is already registered
+//
+#define COMADMIN_E_ALREADYINSTALLED      _HRESULT_TYPEDEF_(0x80110404L)
+
+//
+// MessageId: COMADMIN_E_APP_FILE_WRITEFAIL
+//
+// MessageText:
+//
+//  Error occurred writing to the application file
+//
+#define COMADMIN_E_APP_FILE_WRITEFAIL    _HRESULT_TYPEDEF_(0x80110407L)
+
+//
+// MessageId: COMADMIN_E_APP_FILE_READFAIL
+//
+// MessageText:
+//
+//  Error occurred reading the application file
+//
+#define COMADMIN_E_APP_FILE_READFAIL     _HRESULT_TYPEDEF_(0x80110408L)
+
+//
+// MessageId: COMADMIN_E_APP_FILE_VERSION
+//
+// MessageText:
+//
+//  Invalid version number in application file
+//
+#define COMADMIN_E_APP_FILE_VERSION      _HRESULT_TYPEDEF_(0x80110409L)
+
+//
+// MessageId: COMADMIN_E_BADPATH
+//
+// MessageText:
+//
+//  The file path is invalid
+//
+#define COMADMIN_E_BADPATH               _HRESULT_TYPEDEF_(0x8011040AL)
+
+//
+// MessageId: COMADMIN_E_APPLICATIONEXISTS
+//
+// MessageText:
+//
+//  The application is already installed
+//
+#define COMADMIN_E_APPLICATIONEXISTS     _HRESULT_TYPEDEF_(0x8011040BL)
+
+//
+// MessageId: COMADMIN_E_ROLEEXISTS
+//
+// MessageText:
+//
+//  The role already exists
+//
+#define COMADMIN_E_ROLEEXISTS            _HRESULT_TYPEDEF_(0x8011040CL)
+
+//
+// MessageId: COMADMIN_E_CANTCOPYFILE
+//
+// MessageText:
+//
+//  An error occurred copying the file
+//
+#define COMADMIN_E_CANTCOPYFILE          _HRESULT_TYPEDEF_(0x8011040DL)
+
+//
+// MessageId: COMADMIN_E_NOUSER
+//
+// MessageText:
+//
+//  One or more users are not valid
+//
+#define COMADMIN_E_NOUSER                _HRESULT_TYPEDEF_(0x8011040FL)
+
+//
+// MessageId: COMADMIN_E_INVALIDUSERIDS
+//
+// MessageText:
+//
+//  One or more users in the application file are not valid
+//
+#define COMADMIN_E_INVALIDUSERIDS        _HRESULT_TYPEDEF_(0x80110410L)
+
+//
+// MessageId: COMADMIN_E_NOREGISTRYCLSID
+//
+// MessageText:
+//
+//  The component's CLSID is missing or corrupt
+//
+#define COMADMIN_E_NOREGISTRYCLSID       _HRESULT_TYPEDEF_(0x80110411L)
+
+//
+// MessageId: COMADMIN_E_BADREGISTRYPROGID
+//
+// MessageText:
+//
+//  The component's progID is missing or corrupt
+//
+#define COMADMIN_E_BADREGISTRYPROGID     _HRESULT_TYPEDEF_(0x80110412L)
+
+//
+// MessageId: COMADMIN_E_AUTHENTICATIONLEVEL
+//
+// MessageText:
+//
+//  Unable to set required authentication level for update request
+//
+#define COMADMIN_E_AUTHENTICATIONLEVEL   _HRESULT_TYPEDEF_(0x80110413L)
+
+//
+// MessageId: COMADMIN_E_USERPASSWDNOTVALID
+//
+// MessageText:
+//
+//  The identity or password set on the application is not valid
+//
+#define COMADMIN_E_USERPASSWDNOTVALID    _HRESULT_TYPEDEF_(0x80110414L)
+
+//
+// MessageId: COMADMIN_E_CLSIDORIIDMISMATCH
+//
+// MessageText:
+//
+//  Application file CLSIDs or IIDs do not match corresponding DLLs
+//
+#define COMADMIN_E_CLSIDORIIDMISMATCH    _HRESULT_TYPEDEF_(0x80110418L)
+
+//
+// MessageId: COMADMIN_E_REMOTEINTERFACE
+//
+// MessageText:
+//
+//  Interface information is either missing or changed
+//
+#define COMADMIN_E_REMOTEINTERFACE       _HRESULT_TYPEDEF_(0x80110419L)
+
+//
+// MessageId: COMADMIN_E_DLLREGISTERSERVER
+//
+// MessageText:
+//
+//  DllRegisterServer failed on component install
+//
+#define COMADMIN_E_DLLREGISTERSERVER     _HRESULT_TYPEDEF_(0x8011041AL)
+
+//
+// MessageId: COMADMIN_E_NOSERVERSHARE
+//
+// MessageText:
+//
+//  No server file share available
+//
+#define COMADMIN_E_NOSERVERSHARE         _HRESULT_TYPEDEF_(0x8011041BL)
+
+//
+// MessageId: COMADMIN_E_DLLLOADFAILED
+//
+// MessageText:
+//
+//  DLL could not be loaded
+//
+#define COMADMIN_E_DLLLOADFAILED         _HRESULT_TYPEDEF_(0x8011041DL)
+
+//
+// MessageId: COMADMIN_E_BADREGISTRYLIBID
+//
+// MessageText:
+//
+//  The registered TypeLib ID is not valid
+//
+#define COMADMIN_E_BADREGISTRYLIBID      _HRESULT_TYPEDEF_(0x8011041EL)
+
+//
+// MessageId: COMADMIN_E_APPDIRNOTFOUND
+//
+// MessageText:
+//
+//  Application install directory not found
+//
+#define COMADMIN_E_APPDIRNOTFOUND        _HRESULT_TYPEDEF_(0x8011041FL)
+
+//
+// MessageId: COMADMIN_E_REGISTRARFAILED
+//
+// MessageText:
+//
+//  Errors occurred while in the component registrar
+//
+#define COMADMIN_E_REGISTRARFAILED       _HRESULT_TYPEDEF_(0x80110423L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_DOESNOTEXIST
+//
+// MessageText:
+//
+//  The file does not exist
+//
+#define COMADMIN_E_COMPFILE_DOESNOTEXIST _HRESULT_TYPEDEF_(0x80110424L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_LOADDLLFAIL
+//
+// MessageText:
+//
+//  The DLL could not be loaded
+//
+#define COMADMIN_E_COMPFILE_LOADDLLFAIL  _HRESULT_TYPEDEF_(0x80110425L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_GETCLASSOBJ
+//
+// MessageText:
+//
+//  GetClassObject failed in the DLL
+//
+#define COMADMIN_E_COMPFILE_GETCLASSOBJ  _HRESULT_TYPEDEF_(0x80110426L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_CLASSNOTAVAIL
+//
+// MessageText:
+//
+//  The DLL does not support the components listed in the TypeLib
+//
+#define COMADMIN_E_COMPFILE_CLASSNOTAVAIL _HRESULT_TYPEDEF_(0x80110427L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_BADTLB
+//
+// MessageText:
+//
+//  The TypeLib could not be loaded
+//
+#define COMADMIN_E_COMPFILE_BADTLB       _HRESULT_TYPEDEF_(0x80110428L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_NOTINSTALLABLE
+//
+// MessageText:
+//
+//  The file does not contain components or component information
+//
+#define COMADMIN_E_COMPFILE_NOTINSTALLABLE _HRESULT_TYPEDEF_(0x80110429L)
+
+//
+// MessageId: COMADMIN_E_NOTCHANGEABLE
+//
+// MessageText:
+//
+//  Changes to this object and its sub-objects have been disabled
+//
+#define COMADMIN_E_NOTCHANGEABLE         _HRESULT_TYPEDEF_(0x8011042AL)
+
+//
+// MessageId: COMADMIN_E_NOTDELETEABLE
+//
+// MessageText:
+//
+//  The delete function has been disabled for this object
+//
+#define COMADMIN_E_NOTDELETEABLE         _HRESULT_TYPEDEF_(0x8011042BL)
+
+//
+// MessageId: COMADMIN_E_SESSION
+//
+// MessageText:
+//
+//  The server catalog version is not supported
+//
+#define COMADMIN_E_SESSION               _HRESULT_TYPEDEF_(0x8011042CL)
+
+//
+// MessageId: COMADMIN_E_COMP_MOVE_LOCKED
+//
+// MessageText:
+//
+//  The component move was disallowed, because the source or destination application is either a system application or currently locked against changes
+//
+#define COMADMIN_E_COMP_MOVE_LOCKED      _HRESULT_TYPEDEF_(0x8011042DL)
+
+//
+// MessageId: COMADMIN_E_COMP_MOVE_BAD_DEST
+//
+// MessageText:
+//
+//  The component move failed because the destination application no longer exists
+//
+#define COMADMIN_E_COMP_MOVE_BAD_DEST    _HRESULT_TYPEDEF_(0x8011042EL)
+
+//
+// MessageId: COMADMIN_E_REGISTERTLB
+//
+// MessageText:
+//
+//  The system was unable to register the TypeLib
+//
+#define COMADMIN_E_REGISTERTLB           _HRESULT_TYPEDEF_(0x80110430L)
+
+//
+// MessageId: COMADMIN_E_SYSTEMAPP
+//
+// MessageText:
+//
+//  This operation can not be performed on the system application
+//
+#define COMADMIN_E_SYSTEMAPP             _HRESULT_TYPEDEF_(0x80110433L)
+
+//
+// MessageId: COMADMIN_E_COMPFILE_NOREGISTRAR
+//
+// MessageText:
+//
+//  The component registrar referenced in this file is not available
+//
+#define COMADMIN_E_COMPFILE_NOREGISTRAR  _HRESULT_TYPEDEF_(0x80110434L)
+
+//
+// MessageId: COMADMIN_E_COREQCOMPINSTALLED
+//
+// MessageText:
+//
+//  A component in the same DLL is already installed
+//
+#define COMADMIN_E_COREQCOMPINSTALLED    _HRESULT_TYPEDEF_(0x80110435L)
+
+//
+// MessageId: COMADMIN_E_SERVICENOTINSTALLED
+//
+// MessageText:
+//
+//  The service is not installed
+//
+#define COMADMIN_E_SERVICENOTINSTALLED   _HRESULT_TYPEDEF_(0x80110436L)
+
+//
+// MessageId: COMADMIN_E_PROPERTYSAVEFAILED
+//
+// MessageText:
+//
+//  One or more property settings are either invalid or in conflict with each other
+//
+#define COMADMIN_E_PROPERTYSAVEFAILED    _HRESULT_TYPEDEF_(0x80110437L)
+
+//
+// MessageId: COMADMIN_E_OBJECTEXISTS
+//
+// MessageText:
+//
+//  The object you are attempting to add or rename already exists
+//
+#define COMADMIN_E_OBJECTEXISTS          _HRESULT_TYPEDEF_(0x80110438L)
+
+//
+// MessageId: COMADMIN_E_COMPONENTEXISTS
+//
+// MessageText:
+//
+//  The component already exists
+//
+#define COMADMIN_E_COMPONENTEXISTS       _HRESULT_TYPEDEF_(0x80110439L)
+
+//
+// MessageId: COMADMIN_E_REGFILE_CORRUPT
+//
+// MessageText:
+//
+//  The registration file is corrupt
+//
+#define COMADMIN_E_REGFILE_CORRUPT       _HRESULT_TYPEDEF_(0x8011043BL)
+
+//
+// MessageId: COMADMIN_E_PROPERTY_OVERFLOW
+//
+// MessageText:
+//
+//  The property value is too large
+//
+#define COMADMIN_E_PROPERTY_OVERFLOW     _HRESULT_TYPEDEF_(0x8011043CL)
+
+//
+// MessageId: COMADMIN_E_NOTINREGISTRY
+//
+// MessageText:
+//
+//  Object was not found in registry
+//
+#define COMADMIN_E_NOTINREGISTRY         _HRESULT_TYPEDEF_(0x8011043EL)
+
+//
+// MessageId: COMADMIN_E_OBJECTNOTPOOLABLE
+//
+// MessageText:
+//
+//  This object is not poolable
+//
+#define COMADMIN_E_OBJECTNOTPOOLABLE     _HRESULT_TYPEDEF_(0x8011043FL)
+
+//
+// MessageId: COMADMIN_E_APPLID_MATCHES_CLSID
+//
+// MessageText:
+//
+//  A CLSID with the same GUID as the new application ID is already installed on this machine
+//
+#define COMADMIN_E_APPLID_MATCHES_CLSID  _HRESULT_TYPEDEF_(0x80110446L)
+
+//
+// MessageId: COMADMIN_E_ROLE_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  A role assigned to a component, interface, or method did not exist in the application
+//
+#define COMADMIN_E_ROLE_DOES_NOT_EXIST   _HRESULT_TYPEDEF_(0x80110447L)
+
+//
+// MessageId: COMADMIN_E_START_APP_NEEDS_COMPONENTS
+//
+// MessageText:
+//
+//  You must have components in an application in order to start the application
+//
+#define COMADMIN_E_START_APP_NEEDS_COMPONENTS _HRESULT_TYPEDEF_(0x80110448L)
+
+//
+// MessageId: COMADMIN_E_REQUIRES_DIFFERENT_PLATFORM
+//
+// MessageText:
+//
+//  This operation is not enabled on this platform
+//
+#define COMADMIN_E_REQUIRES_DIFFERENT_PLATFORM _HRESULT_TYPEDEF_(0x80110449L)
+
+//
+// MessageId: COMADMIN_E_CAN_NOT_EXPORT_APP_PROXY
+//
+// MessageText:
+//
+//  Application Proxy is not exportable
+//
+#define COMADMIN_E_CAN_NOT_EXPORT_APP_PROXY _HRESULT_TYPEDEF_(0x8011044AL)
+
+//
+// MessageId: COMADMIN_E_CAN_NOT_START_APP
+//
+// MessageText:
+//
+//  Failed to start application because it is either a library application or an application proxy
+//
+#define COMADMIN_E_CAN_NOT_START_APP     _HRESULT_TYPEDEF_(0x8011044BL)
+
+//
+// MessageId: COMADMIN_E_CAN_NOT_EXPORT_SYS_APP
+//
+// MessageText:
+//
+//  System application is not exportable
+//
+#define COMADMIN_E_CAN_NOT_EXPORT_SYS_APP _HRESULT_TYPEDEF_(0x8011044CL)
+
+//
+// MessageId: COMADMIN_E_CANT_SUBSCRIBE_TO_COMPONENT
+//
+// MessageText:
+//
+//  Can not subscribe to this component (the component may have been imported)
+//
+#define COMADMIN_E_CANT_SUBSCRIBE_TO_COMPONENT _HRESULT_TYPEDEF_(0x8011044DL)
+
+//
+// MessageId: COMADMIN_E_EVENTCLASS_CANT_BE_SUBSCRIBER
+//
+// MessageText:
+//
+//  An event class cannot also be a subscriber component
+//
+#define COMADMIN_E_EVENTCLASS_CANT_BE_SUBSCRIBER _HRESULT_TYPEDEF_(0x8011044EL)
+
+//
+// MessageId: COMADMIN_E_LIB_APP_PROXY_INCOMPATIBLE
+//
+// MessageText:
+//
+//  Library applications and application proxies are incompatible
+//
+#define COMADMIN_E_LIB_APP_PROXY_INCOMPATIBLE _HRESULT_TYPEDEF_(0x8011044FL)
+
+//
+// MessageId: COMADMIN_E_BASE_PARTITION_ONLY
+//
+// MessageText:
+//
+//  This function is valid for the base partition only
+//
+#define COMADMIN_E_BASE_PARTITION_ONLY   _HRESULT_TYPEDEF_(0x80110450L)
+
+//
+// MessageId: COMADMIN_E_START_APP_DISABLED
+//
+// MessageText:
+//
+//  You cannot start an application that has been disabled
+//
+#define COMADMIN_E_START_APP_DISABLED    _HRESULT_TYPEDEF_(0x80110451L)
+
+//
+// MessageId: COMADMIN_E_CAT_DUPLICATE_PARTITION_NAME
+//
+// MessageText:
+//
+//  The specified partition name is already in use on this computer
+//
+#define COMADMIN_E_CAT_DUPLICATE_PARTITION_NAME _HRESULT_TYPEDEF_(0x80110457L)
+
+//
+// MessageId: COMADMIN_E_CAT_INVALID_PARTITION_NAME
+//
+// MessageText:
+//
+//  The specified partition name is invalid. Check that the name contains at least one visible character
+//
+#define COMADMIN_E_CAT_INVALID_PARTITION_NAME _HRESULT_TYPEDEF_(0x80110458L)
+
+//
+// MessageId: COMADMIN_E_CAT_PARTITION_IN_USE
+//
+// MessageText:
+//
+//  The partition cannot be deleted because it is the default partition for one or more users
+//
+#define COMADMIN_E_CAT_PARTITION_IN_USE  _HRESULT_TYPEDEF_(0x80110459L)
+
+//
+// MessageId: COMADMIN_E_FILE_PARTITION_DUPLICATE_FILES
+//
+// MessageText:
+//
+//  The partition cannot be exported, because one or more components in the partition have the same file name
+//
+#define COMADMIN_E_FILE_PARTITION_DUPLICATE_FILES _HRESULT_TYPEDEF_(0x8011045AL)
+
+//
+// MessageId: COMADMIN_E_CAT_IMPORTED_COMPONENTS_NOT_ALLOWED
+//
+// MessageText:
+//
+//  Applications that contain one or more imported components cannot be installed into a non-base partition
+//
+#define COMADMIN_E_CAT_IMPORTED_COMPONENTS_NOT_ALLOWED _HRESULT_TYPEDEF_(0x8011045BL)
+
+//
+// MessageId: COMADMIN_E_AMBIGUOUS_APPLICATION_NAME
+//
+// MessageText:
+//
+//  The application name is not unique and cannot be resolved to an application id
+//
+#define COMADMIN_E_AMBIGUOUS_APPLICATION_NAME _HRESULT_TYPEDEF_(0x8011045CL)
+
+//
+// MessageId: COMADMIN_E_AMBIGUOUS_PARTITION_NAME
+//
+// MessageText:
+//
+//  The partition name is not unique and cannot be resolved to a partition id
+//
+#define COMADMIN_E_AMBIGUOUS_PARTITION_NAME _HRESULT_TYPEDEF_(0x8011045DL)
+
+//
+// MessageId: COMADMIN_E_REGDB_NOTINITIALIZED
+//
+// MessageText:
+//
+//  The COM+ registry database has not been initialized
+//
+#define COMADMIN_E_REGDB_NOTINITIALIZED  _HRESULT_TYPEDEF_(0x80110472L)
+
+//
+// MessageId: COMADMIN_E_REGDB_NOTOPEN
+//
+// MessageText:
+//
+//  The COM+ registry database is not open
+//
+#define COMADMIN_E_REGDB_NOTOPEN         _HRESULT_TYPEDEF_(0x80110473L)
+
+//
+// MessageId: COMADMIN_E_REGDB_SYSTEMERR
+//
+// MessageText:
+//
+//  The COM+ registry database detected a system error
+//
+#define COMADMIN_E_REGDB_SYSTEMERR       _HRESULT_TYPEDEF_(0x80110474L)
+
+//
+// MessageId: COMADMIN_E_REGDB_ALREADYRUNNING
+//
+// MessageText:
+//
+//  The COM+ registry database is already running
+//
+#define COMADMIN_E_REGDB_ALREADYRUNNING  _HRESULT_TYPEDEF_(0x80110475L)
+
+//
+// MessageId: COMADMIN_E_MIG_VERSIONNOTSUPPORTED
+//
+// MessageText:
+//
+//  This version of the COM+ registry database cannot be migrated
+//
+#define COMADMIN_E_MIG_VERSIONNOTSUPPORTED _HRESULT_TYPEDEF_(0x80110480L)
+
+//
+// MessageId: COMADMIN_E_MIG_SCHEMANOTFOUND
+//
+// MessageText:
+//
+//  The schema version to be migrated could not be found in the COM+ registry database
+//
+#define COMADMIN_E_MIG_SCHEMANOTFOUND    _HRESULT_TYPEDEF_(0x80110481L)
+
+//
+// MessageId: COMADMIN_E_CAT_BITNESSMISMATCH
+//
+// MessageText:
+//
+//  There was a type mismatch between binaries
+//
+#define COMADMIN_E_CAT_BITNESSMISMATCH   _HRESULT_TYPEDEF_(0x80110482L)
+
+//
+// MessageId: COMADMIN_E_CAT_UNACCEPTABLEBITNESS
+//
+// MessageText:
+//
+//  A binary of unknown or invalid type was provided
+//
+#define COMADMIN_E_CAT_UNACCEPTABLEBITNESS _HRESULT_TYPEDEF_(0x80110483L)
+
+//
+// MessageId: COMADMIN_E_CAT_WRONGAPPBITNESS
+//
+// MessageText:
+//
+//  There was a type mismatch between a binary and an application
+//
+#define COMADMIN_E_CAT_WRONGAPPBITNESS   _HRESULT_TYPEDEF_(0x80110484L)
+
+//
+// MessageId: COMADMIN_E_CAT_PAUSE_RESUME_NOT_SUPPORTED
+//
+// MessageText:
+//
+//  The application cannot be paused or resumed
+//
+#define COMADMIN_E_CAT_PAUSE_RESUME_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80110485L)
+
+//
+// MessageId: COMADMIN_E_CAT_SERVERFAULT
+//
+// MessageText:
+//
+//  The COM+ Catalog Server threw an exception during execution
+//
+#define COMADMIN_E_CAT_SERVERFAULT       _HRESULT_TYPEDEF_(0x80110486L)
+
+//
+// COMPLUS Queued component errors
+//
+//
+// MessageId: COMQC_E_APPLICATION_NOT_QUEUED
+//
+// MessageText:
+//
+//  Only COM+ Applications marked "queued" can be invoked using the "queue" moniker
+//
+#define COMQC_E_APPLICATION_NOT_QUEUED   _HRESULT_TYPEDEF_(0x80110600L)
+
+//
+// MessageId: COMQC_E_NO_QUEUEABLE_INTERFACES
+//
+// MessageText:
+//
+//  At least one interface must be marked "queued" in order to create a queued component instance with the "queue" moniker
+//
+#define COMQC_E_NO_QUEUEABLE_INTERFACES  _HRESULT_TYPEDEF_(0x80110601L)
+
+//
+// MessageId: COMQC_E_QUEUING_SERVICE_NOT_AVAILABLE
+//
+// MessageText:
+//
+//  MSMQ is required for the requested operation and is not installed
+//
+#define COMQC_E_QUEUING_SERVICE_NOT_AVAILABLE _HRESULT_TYPEDEF_(0x80110602L)
+
+//
+// MessageId: COMQC_E_NO_IPERSISTSTREAM
+//
+// MessageText:
+//
+//  Unable to marshal an interface that does not support IPersistStream
+//
+#define COMQC_E_NO_IPERSISTSTREAM        _HRESULT_TYPEDEF_(0x80110603L)
+
+//
+// MessageId: COMQC_E_BAD_MESSAGE
+//
+// MessageText:
+//
+//  The message is improperly formatted or was damaged in transit
+//
+#define COMQC_E_BAD_MESSAGE              _HRESULT_TYPEDEF_(0x80110604L)
+
+//
+// MessageId: COMQC_E_UNAUTHENTICATED
+//
+// MessageText:
+//
+//  An unauthenticated message was received by an application that accepts only authenticated messages
+//
+#define COMQC_E_UNAUTHENTICATED          _HRESULT_TYPEDEF_(0x80110605L)
+
+//
+// MessageId: COMQC_E_UNTRUSTED_ENQUEUER
+//
+// MessageText:
+//
+//  The message was requeued or moved by a user not in the "QC Trusted User" role
+//
+#define COMQC_E_UNTRUSTED_ENQUEUER       _HRESULT_TYPEDEF_(0x80110606L)
+
+//
+// The range 0x700-0x7ff is reserved for MSDTC errors.
+//
+//
+// MessageId: MSDTC_E_DUPLICATE_RESOURCE
+//
+// MessageText:
+//
+//  Cannot create a duplicate resource of type Distributed Transaction Coordinator
+//
+#define MSDTC_E_DUPLICATE_RESOURCE       _HRESULT_TYPEDEF_(0x80110701L)
+
+//
+// More COMADMIN errors from 0x8**
+//
+//
+// MessageId: COMADMIN_E_OBJECT_PARENT_MISSING
+//
+// MessageText:
+//
+//  One of the objects being inserted or updated does not belong to a valid parent collection
+//
+#define COMADMIN_E_OBJECT_PARENT_MISSING _HRESULT_TYPEDEF_(0x80110808L)
+
+//
+// MessageId: COMADMIN_E_OBJECT_DOES_NOT_EXIST
+//
+// MessageText:
+//
+//  One of the specified objects cannot be found
+//
+#define COMADMIN_E_OBJECT_DOES_NOT_EXIST _HRESULT_TYPEDEF_(0x80110809L)
+
+//
+// MessageId: COMADMIN_E_APP_NOT_RUNNING
+//
+// MessageText:
+//
+//  The specified application is not currently running
+//
+#define COMADMIN_E_APP_NOT_RUNNING       _HRESULT_TYPEDEF_(0x8011080AL)
+
+//
+// MessageId: COMADMIN_E_INVALID_PARTITION
+//
+// MessageText:
+//
+//  The partition(s) specified are not valid.
+//
+#define COMADMIN_E_INVALID_PARTITION     _HRESULT_TYPEDEF_(0x8011080BL)
+
+//
+// MessageId: COMADMIN_E_SVCAPP_NOT_POOLABLE_OR_RECYCLABLE
+//
+// MessageText:
+//
+//  COM+ applications that run as NT service may not be pooled or recycled
+//
+#define COMADMIN_E_SVCAPP_NOT_POOLABLE_OR_RECYCLABLE _HRESULT_TYPEDEF_(0x8011080DL)
+
+//
+// MessageId: COMADMIN_E_USER_IN_SET
+//
+// MessageText:
+//
+//  One or more users are already assigned to a local partition set.
+//
+#define COMADMIN_E_USER_IN_SET           _HRESULT_TYPEDEF_(0x8011080EL)
+
+//
+// MessageId: COMADMIN_E_CANTRECYCLELIBRARYAPPS
+//
+// MessageText:
+//
+//  Library applications may not be recycled.
+//
+#define COMADMIN_E_CANTRECYCLELIBRARYAPPS _HRESULT_TYPEDEF_(0x8011080FL)
+
+//
+// MessageId: COMADMIN_E_CANTRECYCLESERVICEAPPS
+//
+// MessageText:
+//
+//  Applications running as NT services may not be recycled.
+//
+#define COMADMIN_E_CANTRECYCLESERVICEAPPS _HRESULT_TYPEDEF_(0x80110811L)
+
+//
+// MessageId: COMADMIN_E_PROCESSALREADYRECYCLED
+//
+// MessageText:
+//
+//  The process has already been recycled.
+//
+#define COMADMIN_E_PROCESSALREADYRECYCLED _HRESULT_TYPEDEF_(0x80110812L)
+
+//
+// MessageId: COMADMIN_E_PAUSEDPROCESSMAYNOTBERECYCLED
+//
+// MessageText:
+//
+//  A paused process may not be recycled.
+//
+#define COMADMIN_E_PAUSEDPROCESSMAYNOTBERECYCLED _HRESULT_TYPEDEF_(0x80110813L)
+
+//
+// MessageId: COMADMIN_E_CANTMAKEINPROCSERVICE
+//
+// MessageText:
+//
+//  Library applications may not be NT services.
+//
+#define COMADMIN_E_CANTMAKEINPROCSERVICE _HRESULT_TYPEDEF_(0x80110814L)
+
+//
+// MessageId: COMADMIN_E_PROGIDINUSEBYCLSID
+//
+// MessageText:
+//
+//  The ProgID provided to the copy operation is invalid. The ProgID is in use by another registered CLSID.
+//
+#define COMADMIN_E_PROGIDINUSEBYCLSID    _HRESULT_TYPEDEF_(0x80110815L)
+
+//
+// MessageId: COMADMIN_E_DEFAULT_PARTITION_NOT_IN_SET
+//
+// MessageText:
+//
+//  The partition specified as default is not a member of the partition set.
+//
+#define COMADMIN_E_DEFAULT_PARTITION_NOT_IN_SET _HRESULT_TYPEDEF_(0x80110816L)
+
+//
+// MessageId: COMADMIN_E_RECYCLEDPROCESSMAYNOTBEPAUSED
+//
+// MessageText:
+//
+//  A recycled process may not be paused.
+//
+#define COMADMIN_E_RECYCLEDPROCESSMAYNOTBEPAUSED _HRESULT_TYPEDEF_(0x80110817L)
+
+//
+// MessageId: COMADMIN_E_PARTITION_ACCESSDENIED
+//
+// MessageText:
+//
+//  Access to the specified partition is denied.
+//
+#define COMADMIN_E_PARTITION_ACCESSDENIED _HRESULT_TYPEDEF_(0x80110818L)
+
+//
+// MessageId: COMADMIN_E_PARTITION_MSI_ONLY
+//
+// MessageText:
+//
+//  Only Application Files (*.MSI files) can be installed into partitions.
+//
+#define COMADMIN_E_PARTITION_MSI_ONLY    _HRESULT_TYPEDEF_(0x80110819L)
+
+//
+// MessageId: COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_1_0_FORMAT
+//
+// MessageText:
+//
+//  Applications containing one or more legacy components may not be exported to 1.0 format.
+//
+#define COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_1_0_FORMAT _HRESULT_TYPEDEF_(0x8011081AL)
+
+//
+// MessageId: COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_NONBASE_PARTITIONS
+//
+// MessageText:
+//
+//  Legacy components may not exist in non-base partitions.
+//
+#define COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_NONBASE_PARTITIONS _HRESULT_TYPEDEF_(0x8011081BL)
+
+//
+// MessageId: COMADMIN_E_COMP_MOVE_SOURCE
+//
+// MessageText:
+//
+//  A component cannot be moved (or copied) from the System Application, an application proxy or a non-changeable application
+//
+#define COMADMIN_E_COMP_MOVE_SOURCE      _HRESULT_TYPEDEF_(0x8011081CL)
+
+//
+// MessageId: COMADMIN_E_COMP_MOVE_DEST
+//
+// MessageText:
+//
+//  A component cannot be moved (or copied) to the System Application, an application proxy or a non-changeable application
+//
+#define COMADMIN_E_COMP_MOVE_DEST        _HRESULT_TYPEDEF_(0x8011081DL)
+
+//
+// MessageId: COMADMIN_E_COMP_MOVE_PRIVATE
+//
+// MessageText:
+//
+//  A private component cannot be moved (or copied) to a library application or to the base partition
+//
+#define COMADMIN_E_COMP_MOVE_PRIVATE     _HRESULT_TYPEDEF_(0x8011081EL)
+
+//
+// MessageId: COMADMIN_E_BASEPARTITION_REQUIRED_IN_SET
+//
+// MessageText:
+//
+//  The Base Application Partition exists in all partition sets and cannot be removed.
+//
+#define COMADMIN_E_BASEPARTITION_REQUIRED_IN_SET _HRESULT_TYPEDEF_(0x8011081FL)
+
+//
+// MessageId: COMADMIN_E_CANNOT_ALIAS_EVENTCLASS
+//
+// MessageText:
+//
+//  Alas, Event Class components cannot be aliased.
+//
+#define COMADMIN_E_CANNOT_ALIAS_EVENTCLASS _HRESULT_TYPEDEF_(0x80110820L)
+
+//
+// MessageId: COMADMIN_E_PRIVATE_ACCESSDENIED
+//
+// MessageText:
+//
+//  Access is denied because the component is private.
+//
+#define COMADMIN_E_PRIVATE_ACCESSDENIED  _HRESULT_TYPEDEF_(0x80110821L)
+
+//
+// MessageId: COMADMIN_E_SAFERINVALID
+//
+// MessageText:
+//
+//  The specified SAFER level is invalid.
+//
+#define COMADMIN_E_SAFERINVALID          _HRESULT_TYPEDEF_(0x80110822L)
+
+//
+// MessageId: COMADMIN_E_REGISTRY_ACCESSDENIED
+//
+// MessageText:
+//
+//  The specified user cannot write to the system registry
+//
+#define COMADMIN_E_REGISTRY_ACCESSDENIED _HRESULT_TYPEDEF_(0x80110823L)
+
+//
+// MessageId: COMADMIN_E_PARTITIONS_DISABLED
+//
+// MessageText:
+//
+//  COM+ partitions are currently disabled.
+//
+#define COMADMIN_E_PARTITIONS_DISABLED   _HRESULT_TYPEDEF_(0x80110824L)
+
+#endif//_WINERROR_
diff --git a/base/Windows/Inc/WinGDI.h b/base/Windows/Inc/WinGDI.h
new file mode 100644
index 0000000..6b75adc
--- /dev/null
+++ b/base/Windows/Inc/WinGDI.h
@@ -0,0 +1,4961 @@
+/**************************************************************************
+*                                                                         *
+* wingdi.h -- GDI procedure declarations, constant definitions and macros *
+*                                                                         *
+* Copyright (c) Microsoft Corporation.  All rights reserved.              *
+*                                                                         *
+**************************************************************************/
+
+#ifndef _WINGDI_
+#define _WINGDI_
+
+
+#ifdef _MAC
+#include <macwin32.h>
+#endif
+//
+// Define API decoration for direct importing of DLL references.
+//
+
+#if !defined(_GDI32_)
+#define WINGDIAPI DECLSPEC_IMPORT
+#else
+#define WINGDIAPI
+#endif
+
+//
+// Define API decoration for direct importing of DLL references.
+//
+
+#if !defined(_SPOOL32_)
+#define WINSPOOLAPI DECLSPEC_IMPORT
+#else
+#define WINSPOOLAPI
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef WINVER
+#define WINVER 0x0500   // version 5.0
+#endif /* WINVER */
+
+#ifndef NOGDI
+
+#ifndef NORASTEROPS
+
+/* Binary raster ops */
+#define R2_BLACK            1   /*  0       */
+#define R2_NOTMERGEPEN      2   /* DPon     */
+#define R2_MASKNOTPEN       3   /* DPna     */
+#define R2_NOTCOPYPEN       4   /* PN       */
+#define R2_MASKPENNOT       5   /* PDna     */
+#define R2_NOT              6   /* Dn       */
+#define R2_XORPEN           7   /* DPx      */
+#define R2_NOTMASKPEN       8   /* DPan     */
+#define R2_MASKPEN          9   /* DPa      */
+#define R2_NOTXORPEN        10  /* DPxn     */
+#define R2_NOP              11  /* D        */
+#define R2_MERGENOTPEN      12  /* DPno     */
+#define R2_COPYPEN          13  /* P        */
+#define R2_MERGEPENNOT      14  /* PDno     */
+#define R2_MERGEPEN         15  /* DPo      */
+#define R2_WHITE            16  /*  1       */
+#define R2_LAST             16
+
+/* Ternary raster operations */
+#define SRCCOPY             (DWORD)0x00CC0020 /* dest = source                   */
+#define SRCPAINT            (DWORD)0x00EE0086 /* dest = source OR dest           */
+#define SRCAND              (DWORD)0x008800C6 /* dest = source AND dest          */
+#define SRCINVERT           (DWORD)0x00660046 /* dest = source XOR dest          */
+#define SRCERASE            (DWORD)0x00440328 /* dest = source AND (NOT dest )   */
+#define NOTSRCCOPY          (DWORD)0x00330008 /* dest = (NOT source)             */
+#define NOTSRCERASE         (DWORD)0x001100A6 /* dest = (NOT src) AND (NOT dest) */
+#define MERGECOPY           (DWORD)0x00C000CA /* dest = (source AND pattern)     */
+#define MERGEPAINT          (DWORD)0x00BB0226 /* dest = (NOT source) OR dest     */
+#define PATCOPY             (DWORD)0x00F00021 /* dest = pattern                  */
+#define PATPAINT            (DWORD)0x00FB0A09 /* dest = DPSnoo                   */
+#define PATINVERT           (DWORD)0x005A0049 /* dest = pattern XOR dest         */
+#define DSTINVERT           (DWORD)0x00550009 /* dest = (NOT dest)               */
+#define BLACKNESS           (DWORD)0x00000042 /* dest = BLACK                    */
+#define WHITENESS           (DWORD)0x00FF0062 /* dest = WHITE                    */
+#if(WINVER >= 0x0500)
+
+#define NOMIRRORBITMAP      (DWORD)0x80000000 /* Do not Mirror the bitmap in this call */
+#define CAPTUREBLT          (DWORD)0x40000000 /* Include layered windows */
+#endif /* WINVER >= 0x0500 */
+
+/* Quaternary raster codes */
+#define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore))
+
+#endif /* NORASTEROPS */
+
+#define GDI_ERROR (0xFFFFFFFFL)
+#define HGDI_ERROR (LongToHandle(0xFFFFFFFFL))
+
+/* Region Flags */
+#define ERROR               0
+#define NULLREGION          1
+#define SIMPLEREGION        2
+#define COMPLEXREGION       3
+#define RGN_ERROR ERROR
+
+/* CombineRgn() Styles */
+#define RGN_AND             1
+#define RGN_OR              2
+#define RGN_XOR             3
+#define RGN_DIFF            4
+#define RGN_COPY            5
+#define RGN_MIN             RGN_AND
+#define RGN_MAX             RGN_COPY
+
+/* StretchBlt() Modes */
+#define BLACKONWHITE                 1
+#define WHITEONBLACK                 2
+#define COLORONCOLOR                 3
+#define HALFTONE                     4
+#define MAXSTRETCHBLTMODE            4
+
+#if(WINVER >= 0x0400)
+/* New StretchBlt() Modes */
+#define STRETCH_ANDSCANS    BLACKONWHITE
+#define STRETCH_ORSCANS     WHITEONBLACK
+#define STRETCH_DELETESCANS COLORONCOLOR
+#define STRETCH_HALFTONE    HALFTONE
+#endif /* WINVER >= 0x0400 */
+
+/* PolyFill() Modes */
+#define ALTERNATE                    1
+#define WINDING                      2
+#define POLYFILL_LAST                2
+
+/* Layout Orientation Options */
+#if(WINVER >= 0x0500)
+#define LAYOUT_RTL                         0x00000001 // Right to left
+#define LAYOUT_BTT                         0x00000002 // Bottom to top
+#define LAYOUT_VBH                         0x00000004 // Vertical before horizontal
+#define LAYOUT_ORIENTATIONMASK             (LAYOUT_RTL | LAYOUT_BTT | LAYOUT_VBH)
+#define LAYOUT_BITMAPORIENTATIONPRESERVED  0x00000008
+#endif /* WINVER >= 0x0500 */
+
+/* Text Alignment Options */
+#define TA_NOUPDATECP                0
+#define TA_UPDATECP                  1
+
+#define TA_LEFT                      0
+#define TA_RIGHT                     2
+#define TA_CENTER                    6
+
+#define TA_TOP                       0
+#define TA_BOTTOM                    8
+#define TA_BASELINE                  24
+#if (WINVER >= 0x0400)
+#define TA_RTLREADING                256
+#define TA_MASK       (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING)
+#else
+#define TA_MASK       (TA_BASELINE+TA_CENTER+TA_UPDATECP)
+#endif
+
+#define VTA_BASELINE TA_BASELINE
+#define VTA_LEFT     TA_BOTTOM
+#define VTA_RIGHT    TA_TOP
+#define VTA_CENTER   TA_CENTER
+#define VTA_BOTTOM   TA_RIGHT
+#define VTA_TOP      TA_LEFT
+
+#define ETO_OPAQUE                   0x0002
+#define ETO_CLIPPED                  0x0004
+#if(WINVER >= 0x0400)
+#define ETO_GLYPH_INDEX              0x0010
+#define ETO_RTLREADING               0x0080
+#define ETO_NUMERICSLOCAL            0x0400
+#define ETO_NUMERICSLATIN            0x0800
+#define ETO_IGNORELANGUAGE           0x1000
+#endif /* WINVER >= 0x0400 */
+#if (_WIN32_WINNT >= 0x0500)
+#define ETO_PDY                      0x2000
+#endif // (_WIN32_WINNT >= 0x0500)
+
+#define ASPECT_FILTERING             0x0001
+
+/* Bounds Accumulation APIs */
+
+#define DCB_RESET       0x0001
+#define DCB_ACCUMULATE  0x0002
+#define DCB_DIRTY       DCB_ACCUMULATE
+#define DCB_SET         (DCB_RESET | DCB_ACCUMULATE)
+#define DCB_ENABLE      0x0004
+#define DCB_DISABLE     0x0008
+
+#ifndef NOMETAFILE
+
+/* Metafile Functions */
+#define META_SETBKCOLOR              0x0201
+#define META_SETBKMODE               0x0102
+#define META_SETMAPMODE              0x0103
+#define META_SETROP2                 0x0104
+#define META_SETRELABS               0x0105
+#define META_SETPOLYFILLMODE         0x0106
+#define META_SETSTRETCHBLTMODE       0x0107
+#define META_SETTEXTCHAREXTRA        0x0108
+#define META_SETTEXTCOLOR            0x0209
+#define META_SETTEXTJUSTIFICATION    0x020A
+#define META_SETWINDOWORG            0x020B
+#define META_SETWINDOWEXT            0x020C
+#define META_SETVIEWPORTORG          0x020D
+#define META_SETVIEWPORTEXT          0x020E
+#define META_OFFSETWINDOWORG         0x020F
+#define META_SCALEWINDOWEXT          0x0410
+#define META_OFFSETVIEWPORTORG       0x0211
+#define META_SCALEVIEWPORTEXT        0x0412
+#define META_LINETO                  0x0213
+#define META_MOVETO                  0x0214
+#define META_EXCLUDECLIPRECT         0x0415
+#define META_INTERSECTCLIPRECT       0x0416
+#define META_ARC                     0x0817
+#define META_ELLIPSE                 0x0418
+#define META_FLOODFILL               0x0419
+#define META_PIE                     0x081A
+#define META_RECTANGLE               0x041B
+#define META_ROUNDRECT               0x061C
+#define META_PATBLT                  0x061D
+#define META_SAVEDC                  0x001E
+#define META_SETPIXEL                0x041F
+#define META_OFFSETCLIPRGN           0x0220
+#define META_TEXTOUT                 0x0521
+#define META_BITBLT                  0x0922
+#define META_STRETCHBLT              0x0B23
+#define META_POLYGON                 0x0324
+#define META_POLYLINE                0x0325
+#define META_ESCAPE                  0x0626
+#define META_RESTOREDC               0x0127
+#define META_FILLREGION              0x0228
+#define META_FRAMEREGION             0x0429
+#define META_INVERTREGION            0x012A
+#define META_PAINTREGION             0x012B
+#define META_SELECTCLIPREGION        0x012C
+#define META_SELECTOBJECT            0x012D
+#define META_SETTEXTALIGN            0x012E
+#define META_CHORD                   0x0830
+#define META_SETMAPPERFLAGS          0x0231
+#define META_EXTTEXTOUT              0x0a32
+#define META_SETDIBTODEV             0x0d33
+#define META_SELECTPALETTE           0x0234
+#define META_REALIZEPALETTE          0x0035
+#define META_ANIMATEPALETTE          0x0436
+#define META_SETPALENTRIES           0x0037
+#define META_POLYPOLYGON             0x0538
+#define META_RESIZEPALETTE           0x0139
+#define META_DIBBITBLT               0x0940
+#define META_DIBSTRETCHBLT           0x0b41
+#define META_DIBCREATEPATTERNBRUSH   0x0142
+#define META_STRETCHDIB              0x0f43
+#define META_EXTFLOODFILL            0x0548
+#if(WINVER >= 0x0500)
+#define META_SETLAYOUT               0x0149
+#endif /* WINVER >= 0x0500 */
+#define META_DELETEOBJECT            0x01f0
+#define META_CREATEPALETTE           0x00f7
+#define META_CREATEPATTERNBRUSH      0x01F9
+#define META_CREATEPENINDIRECT       0x02FA
+#define META_CREATEFONTINDIRECT      0x02FB
+#define META_CREATEBRUSHINDIRECT     0x02FC
+#define META_CREATEREGION            0x06FF
+
+#if(WINVER >= 0x0400)
+typedef struct _DRAWPATRECT {
+        POINT ptPosition;
+        POINT ptSize;
+        WORD wStyle;
+        WORD wPattern;
+} DRAWPATRECT, *PDRAWPATRECT;
+#endif /* WINVER >= 0x0400 */
+
+#endif /* NOMETAFILE */
+
+/* GDI Escapes */
+#define NEWFRAME                     1
+#define ABORTDOC                     2
+#define NEXTBAND                     3
+#define SETCOLORTABLE                4
+#define GETCOLORTABLE                5
+#define FLUSHOUTPUT                  6
+#define DRAFTMODE                    7
+#define QUERYESCSUPPORT              8
+#define SETABORTPROC                 9
+#define STARTDOC                     10
+#define ENDDOC                       11
+#define GETPHYSPAGESIZE              12
+#define GETPRINTINGOFFSET            13
+#define GETSCALINGFACTOR             14
+#define MFCOMMENT                    15
+#define GETPENWIDTH                  16
+#define SETCOPYCOUNT                 17
+#define SELECTPAPERSOURCE            18
+#define DEVICEDATA                   19
+#define PASSTHROUGH                  19
+#define GETTECHNOLGY                 20
+#define GETTECHNOLOGY                20
+#define SETLINECAP                   21
+#define SETLINEJOIN                  22
+#define SETMITERLIMIT                23
+#define BANDINFO                     24
+#define DRAWPATTERNRECT              25
+#define GETVECTORPENSIZE             26
+#define GETVECTORBRUSHSIZE           27
+#define ENABLEDUPLEX                 28
+#define GETSETPAPERBINS              29
+#define GETSETPRINTORIENT            30
+#define ENUMPAPERBINS                31
+#define SETDIBSCALING                32
+#define EPSPRINTING                  33
+#define ENUMPAPERMETRICS             34
+#define GETSETPAPERMETRICS           35
+#define POSTSCRIPT_DATA              37
+#define POSTSCRIPT_IGNORE            38
+#define MOUSETRAILS                  39
+#define GETDEVICEUNITS               42
+
+#define GETEXTENDEDTEXTMETRICS       256
+#define GETEXTENTTABLE               257
+#define GETPAIRKERNTABLE             258
+#define GETTRACKKERNTABLE            259
+#define EXTTEXTOUT                   512
+#define GETFACENAME                  513
+#define DOWNLOADFACE                 514
+#define ENABLERELATIVEWIDTHS         768
+#define ENABLEPAIRKERNING            769
+#define SETKERNTRACK                 770
+#define SETALLJUSTVALUES             771
+#define SETCHARSET                   772
+
+#define STRETCHBLT                   2048
+#define METAFILE_DRIVER              2049
+#define GETSETSCREENPARAMS           3072
+#define QUERYDIBSUPPORT              3073
+#define BEGIN_PATH                   4096
+#define CLIP_TO_PATH                 4097
+#define END_PATH                     4098
+#define EXT_DEVICE_CAPS              4099
+#define RESTORE_CTM                  4100
+#define SAVE_CTM                     4101
+#define SET_ARC_DIRECTION            4102
+#define SET_BACKGROUND_COLOR         4103
+#define SET_POLY_MODE                4104
+#define SET_SCREEN_ANGLE             4105
+#define SET_SPREAD                   4106
+#define TRANSFORM_CTM                4107
+#define SET_CLIP_BOX                 4108
+#define SET_BOUNDS                   4109
+#define SET_MIRROR_MODE              4110
+#define OPENCHANNEL                  4110
+#define DOWNLOADHEADER               4111
+#define CLOSECHANNEL                 4112
+#define POSTSCRIPT_PASSTHROUGH       4115
+#define ENCAPSULATED_POSTSCRIPT      4116
+
+#define POSTSCRIPT_IDENTIFY          4117   /* new escape for NT5 pscript driver */
+#define POSTSCRIPT_INJECTION         4118   /* new escape for NT5 pscript driver */
+
+#define CHECKJPEGFORMAT              4119
+#define CHECKPNGFORMAT               4120
+
+#define GET_PS_FEATURESETTING        4121   /* new escape for NT5 pscript driver */
+
+#define SPCLPASSTHROUGH2             4568   /* new escape for NT5 pscript driver */
+
+/*
+ * Parameters for POSTSCRIPT_IDENTIFY escape
+ */
+
+#define PSIDENT_GDICENTRIC    0
+#define PSIDENT_PSCENTRIC     1
+
+/*
+ * Header structure for the input buffer to POSTSCRIPT_INJECTION escape
+ */
+
+typedef struct _PSINJECTDATA {
+
+    DWORD   DataBytes;      /* number of raw data bytes (NOT including this header) */
+    WORD    InjectionPoint; /* injection point */
+    WORD    PageNumber;     /* page number to apply the injection */
+
+    /* Followed by raw data to be injected */
+
+} PSINJECTDATA, *PPSINJECTDATA;
+
+/*
+ * Constants for PSINJECTDATA.InjectionPoint field
+ */
+
+#define PSINJECT_BEGINSTREAM                1
+#define PSINJECT_PSADOBE                    2
+#define PSINJECT_PAGESATEND                 3
+#define PSINJECT_PAGES                      4
+
+#define PSINJECT_DOCNEEDEDRES               5
+#define PSINJECT_DOCSUPPLIEDRES             6
+#define PSINJECT_PAGEORDER                  7
+#define PSINJECT_ORIENTATION                8
+#define PSINJECT_BOUNDINGBOX                9
+#define PSINJECT_DOCUMENTPROCESSCOLORS      10
+
+#define PSINJECT_COMMENTS                   11
+#define PSINJECT_BEGINDEFAULTS              12
+#define PSINJECT_ENDDEFAULTS                13
+#define PSINJECT_BEGINPROLOG                14
+#define PSINJECT_ENDPROLOG                  15
+#define PSINJECT_BEGINSETUP                 16
+#define PSINJECT_ENDSETUP                   17
+#define PSINJECT_TRAILER                    18
+#define PSINJECT_EOF                        19
+#define PSINJECT_ENDSTREAM                  20
+#define PSINJECT_DOCUMENTPROCESSCOLORSATEND 21
+
+#define PSINJECT_PAGENUMBER                 100
+#define PSINJECT_BEGINPAGESETUP             101
+#define PSINJECT_ENDPAGESETUP               102
+#define PSINJECT_PAGETRAILER                103
+#define PSINJECT_PLATECOLOR                 104
+
+#define PSINJECT_SHOWPAGE                   105
+#define PSINJECT_PAGEBBOX                   106
+#define PSINJECT_ENDPAGECOMMENTS            107
+
+#define PSINJECT_VMSAVE                     200
+#define PSINJECT_VMRESTORE                  201
+
+/*
+ * Parameter for GET_PS_FEATURESETTING escape
+ */
+
+#define FEATURESETTING_NUP                  0
+#define FEATURESETTING_OUTPUT               1
+#define FEATURESETTING_PSLEVEL              2
+#define FEATURESETTING_CUSTPAPER            3
+#define FEATURESETTING_MIRROR               4
+#define FEATURESETTING_NEGATIVE             5
+#define FEATURESETTING_PROTOCOL             6
+
+//
+// The range of selectors between FEATURESETTING_PRIVATE_BEGIN and
+// FEATURESETTING_PRIVATE_END is reserved by Microsoft for private use
+//
+#define FEATURESETTING_PRIVATE_BEGIN 0x1000
+#define FEATURESETTING_PRIVATE_END   0x1FFF
+
+/*
+ * Information about output options
+ */
+
+typedef struct _PSFEATURE_OUTPUT {
+
+    BOOL bPageIndependent;
+    BOOL bSetPageDevice;
+
+} PSFEATURE_OUTPUT, *PPSFEATURE_OUTPUT;
+
+/*
+ * Information about custom paper size
+ */
+
+typedef struct _PSFEATURE_CUSTPAPER {
+
+    LONG lOrientation;
+    LONG lWidth;
+    LONG lHeight;
+    LONG lWidthOffset;
+    LONG lHeightOffset;
+
+} PSFEATURE_CUSTPAPER, *PPSFEATURE_CUSTPAPER;
+
+/* Value returned for FEATURESETTING_PROTOCOL */
+#define PSPROTOCOL_ASCII             0
+#define PSPROTOCOL_BCP               1
+#define PSPROTOCOL_TBCP              2
+#define PSPROTOCOL_BINARY            3
+
+/* Flag returned from QUERYDIBSUPPORT */
+#define QDI_SETDIBITS                1
+#define QDI_GETDIBITS                2
+#define QDI_DIBTOSCREEN              4
+#define QDI_STRETCHDIB               8
+
+/* Spooler Error Codes */
+#define SP_NOTREPORTED               0x4000
+#define SP_ERROR                     (-1)
+#define SP_APPABORT                  (-2)
+#define SP_USERABORT                 (-3)
+#define SP_OUTOFDISK                 (-4)
+#define SP_OUTOFMEMORY               (-5)
+
+#define PR_JOBSTATUS                 0x0000
+
+/* Object Definitions for EnumObjects() */
+#define OBJ_PEN             1
+#define OBJ_BRUSH           2
+#define OBJ_DC              3
+#define OBJ_METADC          4
+#define OBJ_PAL             5
+#define OBJ_FONT            6
+#define OBJ_BITMAP          7
+#define OBJ_REGION          8
+#define OBJ_METAFILE        9
+#define OBJ_MEMDC           10
+#define OBJ_EXTPEN          11
+#define OBJ_ENHMETADC       12
+#define OBJ_ENHMETAFILE     13
+#define OBJ_COLORSPACE      14
+
+/* xform stuff */
+#define MWT_IDENTITY        1
+#define MWT_LEFTMULTIPLY    2
+#define MWT_RIGHTMULTIPLY   3
+
+#define MWT_MIN             MWT_IDENTITY
+#define MWT_MAX             MWT_RIGHTMULTIPLY
+
+#define _XFORM_
+typedef struct  tagXFORM
+  {
+    FLOAT   eM11;
+    FLOAT   eM12;
+    FLOAT   eM21;
+    FLOAT   eM22;
+    FLOAT   eDx;
+    FLOAT   eDy;
+  } XFORM, *PXFORM, FAR *LPXFORM;
+
+/* Bitmap Header Definition */
+typedef struct tagBITMAP
+  {
+    LONG        bmType;
+    LONG        bmWidth;
+    LONG        bmHeight;
+    LONG        bmWidthBytes;
+    WORD        bmPlanes;
+    WORD        bmBitsPixel;
+    LPVOID      bmBits;
+  } BITMAP, *PBITMAP, NEAR *NPBITMAP, FAR *LPBITMAP;
+
+#include <pshpack1.h>
+typedef struct tagRGBTRIPLE {
+        BYTE    rgbtBlue;
+        BYTE    rgbtGreen;
+        BYTE    rgbtRed;
+} RGBTRIPLE;
+#include <poppack.h>
+
+typedef struct tagRGBQUAD {
+        BYTE    rgbBlue;
+        BYTE    rgbGreen;
+        BYTE    rgbRed;
+        BYTE    rgbReserved;
+} RGBQUAD;
+typedef RGBQUAD FAR* LPRGBQUAD;
+
+#if(WINVER >= 0x0400)
+
+/* Image Color Matching color definitions */
+
+#define CS_ENABLE                       0x00000001L
+#define CS_DISABLE                      0x00000002L
+#define CS_DELETE_TRANSFORM             0x00000003L
+
+/* Logcolorspace signature */
+
+#define LCS_SIGNATURE           'PSOC'
+
+/* Logcolorspace lcsType values */
+
+#define LCS_sRGB                'sRGB'
+#define LCS_WINDOWS_COLOR_SPACE 'Win '  // Windows default color space
+
+typedef LONG   LCSCSTYPE;
+#define LCS_CALIBRATED_RGB              0x00000000L
+
+typedef LONG    LCSGAMUTMATCH;
+#define LCS_GM_BUSINESS                 0x00000001L
+#define LCS_GM_GRAPHICS                 0x00000002L
+#define LCS_GM_IMAGES                   0x00000004L
+#define LCS_GM_ABS_COLORIMETRIC         0x00000008L
+
+/* ICM Defines for results from CheckColorInGamut() */
+#define CM_OUT_OF_GAMUT                 255
+#define CM_IN_GAMUT                     0
+
+/* UpdateICMRegKey Constants               */
+#define ICM_ADDPROFILE                  1
+#define ICM_DELETEPROFILE               2
+#define ICM_QUERYPROFILE                3
+#define ICM_SETDEFAULTPROFILE           4
+#define ICM_REGISTERICMATCHER           5
+#define ICM_UNREGISTERICMATCHER         6
+#define ICM_QUERYMATCH                  7
+
+/* Macros to retrieve CMYK values from a COLORREF */
+#define GetKValue(cmyk)      ((BYTE)(cmyk))
+#define GetYValue(cmyk)      ((BYTE)((cmyk)>> 8))
+#define GetMValue(cmyk)      ((BYTE)((cmyk)>>16))
+#define GetCValue(cmyk)      ((BYTE)((cmyk)>>24))
+
+#define CMYK(c,m,y,k)       ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
+
+typedef long            FXPT16DOT16, FAR *LPFXPT16DOT16;
+typedef long            FXPT2DOT30, FAR *LPFXPT2DOT30;
+
+/* ICM Color Definitions */
+// The following two structures are used for defining RGB's in terms of CIEXYZ.
+
+typedef struct tagCIEXYZ
+{
+        FXPT2DOT30 ciexyzX;
+        FXPT2DOT30 ciexyzY;
+        FXPT2DOT30 ciexyzZ;
+} CIEXYZ;
+typedef CIEXYZ  FAR *LPCIEXYZ;
+
+typedef struct tagICEXYZTRIPLE
+{
+        CIEXYZ  ciexyzRed;
+        CIEXYZ  ciexyzGreen;
+        CIEXYZ  ciexyzBlue;
+} CIEXYZTRIPLE;
+typedef CIEXYZTRIPLE    FAR *LPCIEXYZTRIPLE;
+
+// The next structures the logical color space. Unlike pens and brushes,
+// but like palettes, there is only one way to create a LogColorSpace.
+// A pointer to it must be passed, its elements can't be pushed as
+// arguments.
+
+typedef struct tagLOGCOLORSPACEA {
+    DWORD lcsSignature;
+    DWORD lcsVersion;
+    DWORD lcsSize;
+    LCSCSTYPE lcsCSType;
+    LCSGAMUTMATCH lcsIntent;
+    CIEXYZTRIPLE lcsEndpoints;
+    DWORD lcsGammaRed;
+    DWORD lcsGammaGreen;
+    DWORD lcsGammaBlue;
+    CHAR   lcsFilename[MAX_PATH];
+} LOGCOLORSPACEA, *LPLOGCOLORSPACEA;
+typedef struct tagLOGCOLORSPACEW {
+    DWORD lcsSignature;
+    DWORD lcsVersion;
+    DWORD lcsSize;
+    LCSCSTYPE lcsCSType;
+    LCSGAMUTMATCH lcsIntent;
+    CIEXYZTRIPLE lcsEndpoints;
+    DWORD lcsGammaRed;
+    DWORD lcsGammaGreen;
+    DWORD lcsGammaBlue;
+    WCHAR  lcsFilename[MAX_PATH];
+} LOGCOLORSPACEW, *LPLOGCOLORSPACEW;
+#ifdef UNICODE
+typedef LOGCOLORSPACEW LOGCOLORSPACE;
+typedef LPLOGCOLORSPACEW LPLOGCOLORSPACE;
+#else
+typedef LOGCOLORSPACEA LOGCOLORSPACE;
+typedef LPLOGCOLORSPACEA LPLOGCOLORSPACE;
+#endif // UNICODE
+
+#endif /* WINVER >= 0x0400 */
+
+/* structures for defining DIBs */
+typedef struct tagBITMAPCOREHEADER {
+        DWORD   bcSize;                 /* used to get to color table */
+        WORD    bcWidth;
+        WORD    bcHeight;
+        WORD    bcPlanes;
+        WORD    bcBitCount;
+} BITMAPCOREHEADER, FAR *LPBITMAPCOREHEADER, *PBITMAPCOREHEADER;
+
+typedef struct tagBITMAPINFOHEADER{
+        DWORD      biSize;
+        LONG       biWidth;
+        LONG       biHeight;
+        WORD       biPlanes;
+        WORD       biBitCount;
+        DWORD      biCompression;
+        DWORD      biSizeImage;
+        LONG       biXPelsPerMeter;
+        LONG       biYPelsPerMeter;
+        DWORD      biClrUsed;
+        DWORD      biClrImportant;
+} BITMAPINFOHEADER, FAR *LPBITMAPINFOHEADER, *PBITMAPINFOHEADER;
+
+#if(WINVER >= 0x0400)
+typedef struct {
+        DWORD        bV4Size;
+        LONG         bV4Width;
+        LONG         bV4Height;
+        WORD         bV4Planes;
+        WORD         bV4BitCount;
+        DWORD        bV4V4Compression;
+        DWORD        bV4SizeImage;
+        LONG         bV4XPelsPerMeter;
+        LONG         bV4YPelsPerMeter;
+        DWORD        bV4ClrUsed;
+        DWORD        bV4ClrImportant;
+        DWORD        bV4RedMask;
+        DWORD        bV4GreenMask;
+        DWORD        bV4BlueMask;
+        DWORD        bV4AlphaMask;
+        DWORD        bV4CSType;
+        CIEXYZTRIPLE bV4Endpoints;
+        DWORD        bV4GammaRed;
+        DWORD        bV4GammaGreen;
+        DWORD        bV4GammaBlue;
+} BITMAPV4HEADER, FAR *LPBITMAPV4HEADER, *PBITMAPV4HEADER;
+#endif /* WINVER >= 0x0400 */
+
+#if (WINVER >= 0x0500)
+typedef struct {
+        DWORD        bV5Size;
+        LONG         bV5Width;
+        LONG         bV5Height;
+        WORD         bV5Planes;
+        WORD         bV5BitCount;
+        DWORD        bV5Compression;
+        DWORD        bV5SizeImage;
+        LONG         bV5XPelsPerMeter;
+        LONG         bV5YPelsPerMeter;
+        DWORD        bV5ClrUsed;
+        DWORD        bV5ClrImportant;
+        DWORD        bV5RedMask;
+        DWORD        bV5GreenMask;
+        DWORD        bV5BlueMask;
+        DWORD        bV5AlphaMask;
+        DWORD        bV5CSType;
+        CIEXYZTRIPLE bV5Endpoints;
+        DWORD        bV5GammaRed;
+        DWORD        bV5GammaGreen;
+        DWORD        bV5GammaBlue;
+        DWORD        bV5Intent;
+        DWORD        bV5ProfileData;
+        DWORD        bV5ProfileSize;
+        DWORD        bV5Reserved;
+} BITMAPV5HEADER, FAR *LPBITMAPV5HEADER, *PBITMAPV5HEADER;
+
+// Values for bV5CSType
+#define PROFILE_LINKED          'LINK'
+#define PROFILE_EMBEDDED        'MBED'
+#endif
+
+/* constants for the biCompression field */
+#define BI_RGB        0L
+#define BI_RLE8       1L
+#define BI_RLE4       2L
+#define BI_BITFIELDS  3L
+#define BI_JPEG       4L
+#define BI_PNG        5L
+#if (_WIN32_WINNT >= 0x0400)
+#endif
+
+typedef struct tagBITMAPINFO {
+    BITMAPINFOHEADER    bmiHeader;
+    RGBQUAD             bmiColors[1];
+} BITMAPINFO, FAR *LPBITMAPINFO, *PBITMAPINFO;
+
+typedef struct tagBITMAPCOREINFO {
+    BITMAPCOREHEADER    bmciHeader;
+    RGBTRIPLE           bmciColors[1];
+} BITMAPCOREINFO, FAR *LPBITMAPCOREINFO, *PBITMAPCOREINFO;
+
+#include <pshpack2.h>
+typedef struct tagBITMAPFILEHEADER {
+        WORD    bfType;
+        DWORD   bfSize;
+        WORD    bfReserved1;
+        WORD    bfReserved2;
+        DWORD   bfOffBits;
+} BITMAPFILEHEADER, FAR *LPBITMAPFILEHEADER, *PBITMAPFILEHEADER;
+#include <poppack.h>
+
+#define MAKEPOINTS(l)       (*((POINTS FAR *)&(l)))
+
+#if(WINVER >= 0x0400)
+#ifndef NOFONTSIG
+typedef struct tagFONTSIGNATURE
+{
+    DWORD fsUsb[4];
+    DWORD fsCsb[2];
+} FONTSIGNATURE, *PFONTSIGNATURE,FAR *LPFONTSIGNATURE;
+
+typedef struct tagCHARSETINFO
+{
+    UINT ciCharset;
+    UINT ciACP;
+    FONTSIGNATURE fs;
+} CHARSETINFO, *PCHARSETINFO, NEAR *NPCHARSETINFO, FAR *LPCHARSETINFO;
+
+#define TCI_SRCCHARSET  1
+#define TCI_SRCCODEPAGE 2
+#define TCI_SRCFONTSIG  3
+#define TCI_SRCLOCALE   0x1000
+
+typedef struct tagLOCALESIGNATURE
+{
+    DWORD lsUsb[4];
+    DWORD lsCsbDefault[2];
+    DWORD lsCsbSupported[2];
+} LOCALESIGNATURE, *PLOCALESIGNATURE,FAR *LPLOCALESIGNATURE;
+
+
+#endif
+#endif /* WINVER >= 0x0400 */
+
+#ifndef NOMETAFILE
+
+/* Clipboard Metafile Picture Structure */
+typedef struct tagHANDLETABLE
+  {
+    HGDIOBJ     objectHandle[1];
+  } HANDLETABLE, *PHANDLETABLE, FAR *LPHANDLETABLE;
+
+typedef struct tagMETARECORD
+  {
+    DWORD       rdSize;
+    WORD        rdFunction;
+    WORD        rdParm[1];
+  } METARECORD;
+typedef struct tagMETARECORD UNALIGNED *PMETARECORD;
+typedef struct tagMETARECORD UNALIGNED FAR *LPMETARECORD;
+
+typedef struct tagMETAFILEPICT
+  {
+    LONG        mm;
+    LONG        xExt;
+    LONG        yExt;
+    HMETAFILE   hMF;
+  } METAFILEPICT, FAR *LPMETAFILEPICT;
+
+#include <pshpack2.h>
+typedef struct tagMETAHEADER
+{
+    WORD        mtType;
+    WORD        mtHeaderSize;
+    WORD        mtVersion;
+    DWORD       mtSize;
+    WORD        mtNoObjects;
+    DWORD       mtMaxRecord;
+    WORD        mtNoParameters;
+} METAHEADER;
+typedef struct tagMETAHEADER UNALIGNED *PMETAHEADER;
+typedef struct tagMETAHEADER UNALIGNED FAR *LPMETAHEADER;
+
+#include <poppack.h>
+
+/* Enhanced Metafile structures */
+typedef struct tagENHMETARECORD
+{
+    DWORD   iType;              // Record type EMR_XXX
+    DWORD   nSize;              // Record size in bytes
+    DWORD   dParm[1];           // Parameters
+} ENHMETARECORD, *PENHMETARECORD, *LPENHMETARECORD;
+
+typedef struct tagENHMETAHEADER
+{
+    DWORD   iType;              // Record type EMR_HEADER
+    DWORD   nSize;              // Record size in bytes.  This may be greater
+                                // than the sizeof(ENHMETAHEADER).
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    RECTL   rclFrame;           // Inclusive-inclusive Picture Frame of metafile in .01 mm units
+    DWORD   dSignature;         // Signature.  Must be ENHMETA_SIGNATURE.
+    DWORD   nVersion;           // Version number
+    DWORD   nBytes;             // Size of the metafile in bytes
+    DWORD   nRecords;           // Number of records in the metafile
+    WORD    nHandles;           // Number of handles in the handle table
+                                // Handle index zero is reserved.
+    WORD    sReserved;          // Reserved.  Must be zero.
+    DWORD   nDescription;       // Number of chars in the unicode description string
+                                // This is 0 if there is no description string
+    DWORD   offDescription;     // Offset to the metafile description record.
+                                // This is 0 if there is no description string
+    DWORD   nPalEntries;        // Number of entries in the metafile palette.
+    SIZEL   szlDevice;          // Size of the reference device in pels
+    SIZEL   szlMillimeters;     // Size of the reference device in millimeters
+#if(WINVER >= 0x0400)
+    DWORD   cbPixelFormat;      // Size of PIXELFORMATDESCRIPTOR information
+                                // This is 0 if no pixel format is set
+    DWORD   offPixelFormat;     // Offset to PIXELFORMATDESCRIPTOR
+                                // This is 0 if no pixel format is set
+    DWORD   bOpenGL;            // TRUE if OpenGL commands are present in
+                                // the metafile, otherwise FALSE
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+    SIZEL   szlMicrometers;     // Size of the reference device in micrometers
+#endif /* WINVER >= 0x0500 */
+
+} ENHMETAHEADER, *PENHMETAHEADER, *LPENHMETAHEADER;
+
+#endif /* NOMETAFILE */
+
+#ifndef NOTEXTMETRIC
+
+/* tmPitchAndFamily flags */
+#define TMPF_FIXED_PITCH    0x01
+#define TMPF_VECTOR             0x02
+#define TMPF_DEVICE             0x08
+#define TMPF_TRUETYPE       0x04
+
+//
+// BCHAR definition for APPs
+//
+#ifdef UNICODE
+    typedef WCHAR BCHAR;
+#else
+    typedef BYTE BCHAR;
+#endif
+
+#ifndef _TEXTMETRIC_DEFINED
+#define _TEXTMETRIC_DEFINED
+typedef struct tagTEXTMETRICA
+{
+    LONG        tmHeight;
+    LONG        tmAscent;
+    LONG        tmDescent;
+    LONG        tmInternalLeading;
+    LONG        tmExternalLeading;
+    LONG        tmAveCharWidth;
+    LONG        tmMaxCharWidth;
+    LONG        tmWeight;
+    LONG        tmOverhang;
+    LONG        tmDigitizedAspectX;
+    LONG        tmDigitizedAspectY;
+    BYTE        tmFirstChar;
+    BYTE        tmLastChar;
+    BYTE        tmDefaultChar;
+    BYTE        tmBreakChar;
+    BYTE        tmItalic;
+    BYTE        tmUnderlined;
+    BYTE        tmStruckOut;
+    BYTE        tmPitchAndFamily;
+    BYTE        tmCharSet;
+} TEXTMETRICA, *PTEXTMETRICA, NEAR *NPTEXTMETRICA, FAR *LPTEXTMETRICA;
+typedef struct tagTEXTMETRICW
+{
+    LONG        tmHeight;
+    LONG        tmAscent;
+    LONG        tmDescent;
+    LONG        tmInternalLeading;
+    LONG        tmExternalLeading;
+    LONG        tmAveCharWidth;
+    LONG        tmMaxCharWidth;
+    LONG        tmWeight;
+    LONG        tmOverhang;
+    LONG        tmDigitizedAspectX;
+    LONG        tmDigitizedAspectY;
+    WCHAR       tmFirstChar;
+    WCHAR       tmLastChar;
+    WCHAR       tmDefaultChar;
+    WCHAR       tmBreakChar;
+    BYTE        tmItalic;
+    BYTE        tmUnderlined;
+    BYTE        tmStruckOut;
+    BYTE        tmPitchAndFamily;
+    BYTE        tmCharSet;
+} TEXTMETRICW, *PTEXTMETRICW, NEAR *NPTEXTMETRICW, FAR *LPTEXTMETRICW;
+#ifdef UNICODE
+typedef TEXTMETRICW TEXTMETRIC;
+typedef PTEXTMETRICW PTEXTMETRIC;
+typedef NPTEXTMETRICW NPTEXTMETRIC;
+typedef LPTEXTMETRICW LPTEXTMETRIC;
+#else
+typedef TEXTMETRICA TEXTMETRIC;
+typedef PTEXTMETRICA PTEXTMETRIC;
+typedef NPTEXTMETRICA NPTEXTMETRIC;
+typedef LPTEXTMETRICA LPTEXTMETRIC;
+#endif // UNICODE
+#endif // !_TEXTMETRIC_DEFINED
+
+/* ntmFlags field flags */
+#define NTM_REGULAR     0x00000040L
+#define NTM_BOLD        0x00000020L
+#define NTM_ITALIC      0x00000001L
+
+/* new in NT 5.0 */
+
+#define NTM_NONNEGATIVE_AC  0x00010000
+#define NTM_PS_OPENTYPE     0x00020000
+#define NTM_TT_OPENTYPE     0x00040000
+#define NTM_MULTIPLEMASTER  0x00080000
+#define NTM_TYPE1           0x00100000
+#define NTM_DSIG            0x00200000
+
+#include <pshpack4.h>
+typedef struct tagNEWTEXTMETRICA
+{
+    LONG        tmHeight;
+    LONG        tmAscent;
+    LONG        tmDescent;
+    LONG        tmInternalLeading;
+    LONG        tmExternalLeading;
+    LONG        tmAveCharWidth;
+    LONG        tmMaxCharWidth;
+    LONG        tmWeight;
+    LONG        tmOverhang;
+    LONG        tmDigitizedAspectX;
+    LONG        tmDigitizedAspectY;
+    BYTE        tmFirstChar;
+    BYTE        tmLastChar;
+    BYTE        tmDefaultChar;
+    BYTE        tmBreakChar;
+    BYTE        tmItalic;
+    BYTE        tmUnderlined;
+    BYTE        tmStruckOut;
+    BYTE        tmPitchAndFamily;
+    BYTE        tmCharSet;
+    DWORD   ntmFlags;
+    UINT    ntmSizeEM;
+    UINT    ntmCellHeight;
+    UINT    ntmAvgWidth;
+} NEWTEXTMETRICA, *PNEWTEXTMETRICA, NEAR *NPNEWTEXTMETRICA, FAR *LPNEWTEXTMETRICA;
+typedef struct tagNEWTEXTMETRICW
+{
+    LONG        tmHeight;
+    LONG        tmAscent;
+    LONG        tmDescent;
+    LONG        tmInternalLeading;
+    LONG        tmExternalLeading;
+    LONG        tmAveCharWidth;
+    LONG        tmMaxCharWidth;
+    LONG        tmWeight;
+    LONG        tmOverhang;
+    LONG        tmDigitizedAspectX;
+    LONG        tmDigitizedAspectY;
+    WCHAR       tmFirstChar;
+    WCHAR       tmLastChar;
+    WCHAR       tmDefaultChar;
+    WCHAR       tmBreakChar;
+    BYTE        tmItalic;
+    BYTE        tmUnderlined;
+    BYTE        tmStruckOut;
+    BYTE        tmPitchAndFamily;
+    BYTE        tmCharSet;
+    DWORD   ntmFlags;
+    UINT    ntmSizeEM;
+    UINT    ntmCellHeight;
+    UINT    ntmAvgWidth;
+} NEWTEXTMETRICW, *PNEWTEXTMETRICW, NEAR *NPNEWTEXTMETRICW, FAR *LPNEWTEXTMETRICW;
+#ifdef UNICODE
+typedef NEWTEXTMETRICW NEWTEXTMETRIC;
+typedef PNEWTEXTMETRICW PNEWTEXTMETRIC;
+typedef NPNEWTEXTMETRICW NPNEWTEXTMETRIC;
+typedef LPNEWTEXTMETRICW LPNEWTEXTMETRIC;
+#else
+typedef NEWTEXTMETRICA NEWTEXTMETRIC;
+typedef PNEWTEXTMETRICA PNEWTEXTMETRIC;
+typedef NPNEWTEXTMETRICA NPNEWTEXTMETRIC;
+typedef LPNEWTEXTMETRICA LPNEWTEXTMETRIC;
+#endif // UNICODE
+#include <poppack.h>
+
+#if(WINVER >= 0x0400)
+typedef struct tagNEWTEXTMETRICEXA
+{
+    NEWTEXTMETRICA  ntmTm;
+    FONTSIGNATURE   ntmFontSig;
+}NEWTEXTMETRICEXA;
+typedef struct tagNEWTEXTMETRICEXW
+{
+    NEWTEXTMETRICW  ntmTm;
+    FONTSIGNATURE   ntmFontSig;
+}NEWTEXTMETRICEXW;
+#ifdef UNICODE
+typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX;
+#else
+typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
+#endif // UNICODE
+#endif /* WINVER >= 0x0400 */
+
+#endif /* NOTEXTMETRIC */
+/* GDI Logical Objects: */
+
+/* Pel Array */
+typedef struct tagPELARRAY
+  {
+    LONG        paXCount;
+    LONG        paYCount;
+    LONG        paXExt;
+    LONG        paYExt;
+    BYTE        paRGBs;
+  } PELARRAY, *PPELARRAY, NEAR *NPPELARRAY, FAR *LPPELARRAY;
+
+/* Logical Brush (or Pattern) */
+typedef struct tagLOGBRUSH
+  {
+    UINT        lbStyle;
+    COLORREF    lbColor;
+    ULONG_PTR    lbHatch;    // Sundown: lbHatch could hold a HANDLE
+  } LOGBRUSH, *PLOGBRUSH, NEAR *NPLOGBRUSH, FAR *LPLOGBRUSH;
+
+typedef struct tagLOGBRUSH32
+  {
+    UINT        lbStyle;
+    COLORREF    lbColor;
+    ULONG       lbHatch;
+  } LOGBRUSH32, *PLOGBRUSH32, NEAR *NPLOGBRUSH32, FAR *LPLOGBRUSH32;
+
+typedef LOGBRUSH            PATTERN;
+typedef PATTERN             *PPATTERN;
+typedef PATTERN NEAR        *NPPATTERN;
+typedef PATTERN FAR         *LPPATTERN;
+
+/* Logical Pen */
+typedef struct tagLOGPEN
+  {
+    UINT        lopnStyle;
+    POINT       lopnWidth;
+    COLORREF    lopnColor;
+  } LOGPEN, *PLOGPEN, NEAR *NPLOGPEN, FAR *LPLOGPEN;
+
+typedef struct tagEXTLOGPEN {
+    DWORD       elpPenStyle;
+    DWORD       elpWidth;
+    UINT        elpBrushStyle;
+    COLORREF    elpColor;
+    ULONG_PTR    elpHatch;     //Sundown: elpHatch could take a HANDLE
+    DWORD       elpNumEntries;
+    DWORD       elpStyleEntry[1];
+} EXTLOGPEN, *PEXTLOGPEN, NEAR *NPEXTLOGPEN, FAR *LPEXTLOGPEN;
+
+#ifndef _PALETTEENTRY_DEFINED
+#define _PALETTEENTRY_DEFINED
+typedef struct tagPALETTEENTRY {
+    BYTE        peRed;
+    BYTE        peGreen;
+    BYTE        peBlue;
+    BYTE        peFlags;
+} PALETTEENTRY, *PPALETTEENTRY, FAR *LPPALETTEENTRY;
+#endif // !_PALETTEENTRY_DEFINED
+
+#ifndef _LOGPALETTE_DEFINED
+#define _LOGPALETTE_DEFINED
+/* Logical Palette */
+typedef struct tagLOGPALETTE {
+    WORD        palVersion;
+    WORD        palNumEntries;
+    PALETTEENTRY        palPalEntry[1];
+} LOGPALETTE, *PLOGPALETTE, NEAR *NPLOGPALETTE, FAR *LPLOGPALETTE;
+#endif // !_LOGPALETTE_DEFINED
+
+
+/* Logical Font */
+#define LF_FACESIZE         32
+
+typedef struct tagLOGFONTA
+{
+    LONG      lfHeight;
+    LONG      lfWidth;
+    LONG      lfEscapement;
+    LONG      lfOrientation;
+    LONG      lfWeight;
+    BYTE      lfItalic;
+    BYTE      lfUnderline;
+    BYTE      lfStrikeOut;
+    BYTE      lfCharSet;
+    BYTE      lfOutPrecision;
+    BYTE      lfClipPrecision;
+    BYTE      lfQuality;
+    BYTE      lfPitchAndFamily;
+    CHAR      lfFaceName[LF_FACESIZE];
+} LOGFONTA, *PLOGFONTA, NEAR *NPLOGFONTA, FAR *LPLOGFONTA;
+typedef struct tagLOGFONTW
+{
+    LONG      lfHeight;
+    LONG      lfWidth;
+    LONG      lfEscapement;
+    LONG      lfOrientation;
+    LONG      lfWeight;
+    BYTE      lfItalic;
+    BYTE      lfUnderline;
+    BYTE      lfStrikeOut;
+    BYTE      lfCharSet;
+    BYTE      lfOutPrecision;
+    BYTE      lfClipPrecision;
+    BYTE      lfQuality;
+    BYTE      lfPitchAndFamily;
+    WCHAR     lfFaceName[LF_FACESIZE];
+} LOGFONTW, *PLOGFONTW, NEAR *NPLOGFONTW, FAR *LPLOGFONTW;
+#ifdef UNICODE
+typedef LOGFONTW LOGFONT;
+typedef PLOGFONTW PLOGFONT;
+typedef NPLOGFONTW NPLOGFONT;
+typedef LPLOGFONTW LPLOGFONT;
+#else
+typedef LOGFONTA LOGFONT;
+typedef PLOGFONTA PLOGFONT;
+typedef NPLOGFONTA NPLOGFONT;
+typedef LPLOGFONTA LPLOGFONT;
+#endif // UNICODE
+
+#define LF_FULLFACESIZE     64
+
+/* Structure passed to FONTENUMPROC */
+typedef struct tagENUMLOGFONTA
+{
+    LOGFONTA elfLogFont;
+    BYTE     elfFullName[LF_FULLFACESIZE];
+    BYTE     elfStyle[LF_FACESIZE];
+} ENUMLOGFONTA, FAR* LPENUMLOGFONTA;
+/* Structure passed to FONTENUMPROC */
+typedef struct tagENUMLOGFONTW
+{
+    LOGFONTW elfLogFont;
+    WCHAR    elfFullName[LF_FULLFACESIZE];
+    WCHAR    elfStyle[LF_FACESIZE];
+} ENUMLOGFONTW, FAR* LPENUMLOGFONTW;
+#ifdef UNICODE
+typedef ENUMLOGFONTW ENUMLOGFONT;
+typedef LPENUMLOGFONTW LPENUMLOGFONT;
+#else
+typedef ENUMLOGFONTA ENUMLOGFONT;
+typedef LPENUMLOGFONTA LPENUMLOGFONT;
+#endif // UNICODE
+
+#if(WINVER >= 0x0400)
+typedef struct tagENUMLOGFONTEXA
+{
+    LOGFONTA    elfLogFont;
+    BYTE        elfFullName[LF_FULLFACESIZE];
+    BYTE        elfStyle[LF_FACESIZE];
+    BYTE        elfScript[LF_FACESIZE];
+} ENUMLOGFONTEXA, FAR *LPENUMLOGFONTEXA;
+typedef struct tagENUMLOGFONTEXW
+{
+    LOGFONTW    elfLogFont;
+    WCHAR       elfFullName[LF_FULLFACESIZE];
+    WCHAR       elfStyle[LF_FACESIZE];
+    WCHAR       elfScript[LF_FACESIZE];
+} ENUMLOGFONTEXW, FAR *LPENUMLOGFONTEXW;
+#ifdef UNICODE
+typedef ENUMLOGFONTEXW ENUMLOGFONTEX;
+typedef LPENUMLOGFONTEXW LPENUMLOGFONTEX;
+#else
+typedef ENUMLOGFONTEXA ENUMLOGFONTEX;
+typedef LPENUMLOGFONTEXA LPENUMLOGFONTEX;
+#endif // UNICODE
+#endif /* WINVER >= 0x0400 */
+
+#define OUT_DEFAULT_PRECIS          0
+#define OUT_STRING_PRECIS           1
+#define OUT_CHARACTER_PRECIS        2
+#define OUT_STROKE_PRECIS           3
+#define OUT_TT_PRECIS               4
+#define OUT_DEVICE_PRECIS           5
+#define OUT_RASTER_PRECIS           6
+#define OUT_TT_ONLY_PRECIS          7
+#define OUT_OUTLINE_PRECIS          8
+#define OUT_SCREEN_OUTLINE_PRECIS   9
+#define OUT_PS_ONLY_PRECIS          10
+
+#define CLIP_DEFAULT_PRECIS     0
+#define CLIP_CHARACTER_PRECIS   1
+#define CLIP_STROKE_PRECIS      2
+#define CLIP_MASK               0xf
+#define CLIP_LH_ANGLES          (1<<4)
+#define CLIP_TT_ALWAYS          (2<<4)
+#define CLIP_EMBEDDED           (8<<4)
+
+#define DEFAULT_QUALITY         0
+#define DRAFT_QUALITY           1
+#define PROOF_QUALITY           2
+#if(WINVER >= 0x0400)
+#define NONANTIALIASED_QUALITY  3
+#define ANTIALIASED_QUALITY     4
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0500)
+#define CLEARTYPE_QUALITY       5
+#endif
+
+#if (_WIN32_WINNT >= 0x0501)
+#define CLEARTYPE_NATURAL_QUALITY       6
+#endif
+
+#define DEFAULT_PITCH           0
+#define FIXED_PITCH             1
+#define VARIABLE_PITCH          2
+#if(WINVER >= 0x0400)
+#define MONO_FONT               8
+#endif /* WINVER >= 0x0400 */
+
+#define ANSI_CHARSET            0
+#define DEFAULT_CHARSET         1
+#define SYMBOL_CHARSET          2
+#define SHIFTJIS_CHARSET        128
+#define HANGEUL_CHARSET         129
+#define HANGUL_CHARSET          129
+#define GB2312_CHARSET          134
+#define CHINESEBIG5_CHARSET     136
+#define OEM_CHARSET             255
+#if(WINVER >= 0x0400)
+#define JOHAB_CHARSET           130
+#define HEBREW_CHARSET          177
+#define ARABIC_CHARSET          178
+#define GREEK_CHARSET           161
+#define TURKISH_CHARSET         162
+#define VIETNAMESE_CHARSET      163
+#define THAI_CHARSET            222
+#define EASTEUROPE_CHARSET      238
+#define RUSSIAN_CHARSET         204
+
+#define MAC_CHARSET             77
+#define BALTIC_CHARSET          186
+
+#define FS_LATIN1               0x00000001L
+#define FS_LATIN2               0x00000002L
+#define FS_CYRILLIC             0x00000004L
+#define FS_GREEK                0x00000008L
+#define FS_TURKISH              0x00000010L
+#define FS_HEBREW               0x00000020L
+#define FS_ARABIC               0x00000040L
+#define FS_BALTIC               0x00000080L
+#define FS_VIETNAMESE           0x00000100L
+#define FS_THAI                 0x00010000L
+#define FS_JISJAPAN             0x00020000L
+#define FS_CHINESESIMP          0x00040000L
+#define FS_WANSUNG              0x00080000L
+#define FS_CHINESETRAD          0x00100000L
+#define FS_JOHAB                0x00200000L
+#define FS_SYMBOL               0x80000000L
+#endif /* WINVER >= 0x0400 */
+
+/* Font Families */
+#define FF_DONTCARE         (0<<4)  /* Don't care or don't know. */
+#define FF_ROMAN            (1<<4)  /* Variable stroke width, serifed. */
+                                    /* Times Roman, Century Schoolbook, etc. */
+#define FF_SWISS            (2<<4)  /* Variable stroke width, sans-serifed. */
+                                    /* Helvetica, Swiss, etc. */
+#define FF_MODERN           (3<<4)  /* Constant stroke width, serifed or sans-serifed. */
+                                    /* Pica, Elite, Courier, etc. */
+#define FF_SCRIPT           (4<<4)  /* Cursive, etc. */
+#define FF_DECORATIVE       (5<<4)  /* Old English, etc. */
+
+/* Font Weights */
+#define FW_DONTCARE         0
+#define FW_THIN             100
+#define FW_EXTRALIGHT       200
+#define FW_LIGHT            300
+#define FW_NORMAL           400
+#define FW_MEDIUM           500
+#define FW_SEMIBOLD         600
+#define FW_BOLD             700
+#define FW_EXTRABOLD        800
+#define FW_HEAVY            900
+
+#define FW_ULTRALIGHT       FW_EXTRALIGHT
+#define FW_REGULAR          FW_NORMAL
+#define FW_DEMIBOLD         FW_SEMIBOLD
+#define FW_ULTRABOLD        FW_EXTRABOLD
+#define FW_BLACK            FW_HEAVY
+
+#define PANOSE_COUNT               10
+#define PAN_FAMILYTYPE_INDEX        0
+#define PAN_SERIFSTYLE_INDEX        1
+#define PAN_WEIGHT_INDEX            2
+#define PAN_PROPORTION_INDEX        3
+#define PAN_CONTRAST_INDEX          4
+#define PAN_STROKEVARIATION_INDEX   5
+#define PAN_ARMSTYLE_INDEX          6
+#define PAN_LETTERFORM_INDEX        7
+#define PAN_MIDLINE_INDEX           8
+#define PAN_XHEIGHT_INDEX           9
+
+#define PAN_CULTURE_LATIN           0
+
+typedef struct tagPANOSE
+{
+    BYTE    bFamilyType;
+    BYTE    bSerifStyle;
+    BYTE    bWeight;
+    BYTE    bProportion;
+    BYTE    bContrast;
+    BYTE    bStrokeVariation;
+    BYTE    bArmStyle;
+    BYTE    bLetterform;
+    BYTE    bMidline;
+    BYTE    bXHeight;
+} PANOSE, * LPPANOSE;
+
+#define PAN_ANY                         0 /* Any                            */
+#define PAN_NO_FIT                      1 /* No Fit                         */
+
+#define PAN_FAMILY_TEXT_DISPLAY         2 /* Text and Display               */
+#define PAN_FAMILY_SCRIPT               3 /* Script                         */
+#define PAN_FAMILY_DECORATIVE           4 /* Decorative                     */
+#define PAN_FAMILY_PICTORIAL            5 /* Pictorial                      */
+
+#define PAN_SERIF_COVE                  2 /* Cove                           */
+#define PAN_SERIF_OBTUSE_COVE           3 /* Obtuse Cove                    */
+#define PAN_SERIF_SQUARE_COVE           4 /* Square Cove                    */
+#define PAN_SERIF_OBTUSE_SQUARE_COVE    5 /* Obtuse Square Cove             */
+#define PAN_SERIF_SQUARE                6 /* Square                         */
+#define PAN_SERIF_THIN                  7 /* Thin                           */
+#define PAN_SERIF_BONE                  8 /* Bone                           */
+#define PAN_SERIF_EXAGGERATED           9 /* Exaggerated                    */
+#define PAN_SERIF_TRIANGLE             10 /* Triangle                       */
+#define PAN_SERIF_NORMAL_SANS          11 /* Normal Sans                    */
+#define PAN_SERIF_OBTUSE_SANS          12 /* Obtuse Sans                    */
+#define PAN_SERIF_PERP_SANS            13 /* Prep Sans                      */
+#define PAN_SERIF_FLARED               14 /* Flared                         */
+#define PAN_SERIF_ROUNDED              15 /* Rounded                        */
+
+#define PAN_WEIGHT_VERY_LIGHT           2 /* Very Light                     */
+#define PAN_WEIGHT_LIGHT                3 /* Light                          */
+#define PAN_WEIGHT_THIN                 4 /* Thin                           */
+#define PAN_WEIGHT_BOOK                 5 /* Book                           */
+#define PAN_WEIGHT_MEDIUM               6 /* Medium                         */
+#define PAN_WEIGHT_DEMI                 7 /* Demi                           */
+#define PAN_WEIGHT_BOLD                 8 /* Bold                           */
+#define PAN_WEIGHT_HEAVY                9 /* Heavy                          */
+#define PAN_WEIGHT_BLACK               10 /* Black                          */
+#define PAN_WEIGHT_NORD                11 /* Nord                           */
+
+#define PAN_PROP_OLD_STYLE              2 /* Old Style                      */
+#define PAN_PROP_MODERN                 3 /* Modern                         */
+#define PAN_PROP_EVEN_WIDTH             4 /* Even Width                     */
+#define PAN_PROP_EXPANDED               5 /* Expanded                       */
+#define PAN_PROP_CONDENSED              6 /* Condensed                      */
+#define PAN_PROP_VERY_EXPANDED          7 /* Very Expanded                  */
+#define PAN_PROP_VERY_CONDENSED         8 /* Very Condensed                 */
+#define PAN_PROP_MONOSPACED             9 /* Monospaced                     */
+
+#define PAN_CONTRAST_NONE               2 /* None                           */
+#define PAN_CONTRAST_VERY_LOW           3 /* Very Low                       */
+#define PAN_CONTRAST_LOW                4 /* Low                            */
+#define PAN_CONTRAST_MEDIUM_LOW         5 /* Medium Low                     */
+#define PAN_CONTRAST_MEDIUM             6 /* Medium                         */
+#define PAN_CONTRAST_MEDIUM_HIGH        7 /* Mediim High                    */
+#define PAN_CONTRAST_HIGH               8 /* High                           */
+#define PAN_CONTRAST_VERY_HIGH          9 /* Very High                      */
+
+#define PAN_STROKE_GRADUAL_DIAG         2 /* Gradual/Diagonal               */
+#define PAN_STROKE_GRADUAL_TRAN         3 /* Gradual/Transitional           */
+#define PAN_STROKE_GRADUAL_VERT         4 /* Gradual/Vertical               */
+#define PAN_STROKE_GRADUAL_HORZ         5 /* Gradual/Horizontal             */
+#define PAN_STROKE_RAPID_VERT           6 /* Rapid/Vertical                 */
+#define PAN_STROKE_RAPID_HORZ           7 /* Rapid/Horizontal               */
+#define PAN_STROKE_INSTANT_VERT         8 /* Instant/Vertical               */
+
+#define PAN_STRAIGHT_ARMS_HORZ          2 /* Straight Arms/Horizontal       */
+#define PAN_STRAIGHT_ARMS_WEDGE         3 /* Straight Arms/Wedge            */
+#define PAN_STRAIGHT_ARMS_VERT          4 /* Straight Arms/Vertical         */
+#define PAN_STRAIGHT_ARMS_SINGLE_SERIF  5 /* Straight Arms/Single-Serif     */
+#define PAN_STRAIGHT_ARMS_DOUBLE_SERIF  6 /* Straight Arms/Double-Serif     */
+#define PAN_BENT_ARMS_HORZ              7 /* Non-Straight Arms/Horizontal   */
+#define PAN_BENT_ARMS_WEDGE             8 /* Non-Straight Arms/Wedge        */
+#define PAN_BENT_ARMS_VERT              9 /* Non-Straight Arms/Vertical     */
+#define PAN_BENT_ARMS_SINGLE_SERIF     10 /* Non-Straight Arms/Single-Serif */
+#define PAN_BENT_ARMS_DOUBLE_SERIF     11 /* Non-Straight Arms/Double-Serif */
+
+#define PAN_LETT_NORMAL_CONTACT         2 /* Normal/Contact                 */
+#define PAN_LETT_NORMAL_WEIGHTED        3 /* Normal/Weighted                */
+#define PAN_LETT_NORMAL_BOXED           4 /* Normal/Boxed                   */
+#define PAN_LETT_NORMAL_FLATTENED       5 /* Normal/Flattened               */
+#define PAN_LETT_NORMAL_ROUNDED         6 /* Normal/Rounded                 */
+#define PAN_LETT_NORMAL_OFF_CENTER      7 /* Normal/Off Center              */
+#define PAN_LETT_NORMAL_SQUARE          8 /* Normal/Square                  */
+#define PAN_LETT_OBLIQUE_CONTACT        9 /* Oblique/Contact                */
+#define PAN_LETT_OBLIQUE_WEIGHTED      10 /* Oblique/Weighted               */
+#define PAN_LETT_OBLIQUE_BOXED         11 /* Oblique/Boxed                  */
+#define PAN_LETT_OBLIQUE_FLATTENED     12 /* Oblique/Flattened              */
+#define PAN_LETT_OBLIQUE_ROUNDED       13 /* Oblique/Rounded                */
+#define PAN_LETT_OBLIQUE_OFF_CENTER    14 /* Oblique/Off Center             */
+#define PAN_LETT_OBLIQUE_SQUARE        15 /* Oblique/Square                 */
+
+#define PAN_MIDLINE_STANDARD_TRIMMED    2 /* Standard/Trimmed               */
+#define PAN_MIDLINE_STANDARD_POINTED    3 /* Standard/Pointed               */
+#define PAN_MIDLINE_STANDARD_SERIFED    4 /* Standard/Serifed               */
+#define PAN_MIDLINE_HIGH_TRIMMED        5 /* High/Trimmed                   */
+#define PAN_MIDLINE_HIGH_POINTED        6 /* High/Pointed                   */
+#define PAN_MIDLINE_HIGH_SERIFED        7 /* High/Serifed                   */
+#define PAN_MIDLINE_CONSTANT_TRIMMED    8 /* Constant/Trimmed               */
+#define PAN_MIDLINE_CONSTANT_POINTED    9 /* Constant/Pointed               */
+#define PAN_MIDLINE_CONSTANT_SERIFED   10 /* Constant/Serifed               */
+#define PAN_MIDLINE_LOW_TRIMMED        11 /* Low/Trimmed                    */
+#define PAN_MIDLINE_LOW_POINTED        12 /* Low/Pointed                    */
+#define PAN_MIDLINE_LOW_SERIFED        13 /* Low/Serifed                    */
+
+#define PAN_XHEIGHT_CONSTANT_SMALL      2 /* Constant/Small                 */
+#define PAN_XHEIGHT_CONSTANT_STD        3 /* Constant/Standard              */
+#define PAN_XHEIGHT_CONSTANT_LARGE      4 /* Constant/Large                 */
+#define PAN_XHEIGHT_DUCKING_SMALL       5 /* Ducking/Small                  */
+#define PAN_XHEIGHT_DUCKING_STD         6 /* Ducking/Standard               */
+#define PAN_XHEIGHT_DUCKING_LARGE       7 /* Ducking/Large                  */
+
+
+#define ELF_VENDOR_SIZE     4
+
+/* The extended logical font       */
+/* An extension of the ENUMLOGFONT */
+
+typedef struct tagEXTLOGFONTA {
+    LOGFONTA    elfLogFont;
+    BYTE        elfFullName[LF_FULLFACESIZE];
+    BYTE        elfStyle[LF_FACESIZE];
+    DWORD       elfVersion;     /* 0 for the first release of NT */
+    DWORD       elfStyleSize;
+    DWORD       elfMatch;
+    DWORD       elfReserved;
+    BYTE        elfVendorId[ELF_VENDOR_SIZE];
+    DWORD       elfCulture;     /* 0 for Latin                   */
+    PANOSE      elfPanose;
+} EXTLOGFONTA, *PEXTLOGFONTA, NEAR *NPEXTLOGFONTA, FAR *LPEXTLOGFONTA;
+typedef struct tagEXTLOGFONTW {
+    LOGFONTW    elfLogFont;
+    WCHAR       elfFullName[LF_FULLFACESIZE];
+    WCHAR       elfStyle[LF_FACESIZE];
+    DWORD       elfVersion;     /* 0 for the first release of NT */
+    DWORD       elfStyleSize;
+    DWORD       elfMatch;
+    DWORD       elfReserved;
+    BYTE        elfVendorId[ELF_VENDOR_SIZE];
+    DWORD       elfCulture;     /* 0 for Latin                   */
+    PANOSE      elfPanose;
+} EXTLOGFONTW, *PEXTLOGFONTW, NEAR *NPEXTLOGFONTW, FAR *LPEXTLOGFONTW;
+#ifdef UNICODE
+typedef EXTLOGFONTW EXTLOGFONT;
+typedef PEXTLOGFONTW PEXTLOGFONT;
+typedef NPEXTLOGFONTW NPEXTLOGFONT;
+typedef LPEXTLOGFONTW LPEXTLOGFONT;
+#else
+typedef EXTLOGFONTA EXTLOGFONT;
+typedef PEXTLOGFONTA PEXTLOGFONT;
+typedef NPEXTLOGFONTA NPEXTLOGFONT;
+typedef LPEXTLOGFONTA LPEXTLOGFONT;
+#endif // UNICODE
+
+#define ELF_VERSION         0
+#define ELF_CULTURE_LATIN   0
+
+/* EnumFonts Masks */
+#define RASTER_FONTTYPE     0x0001
+#define DEVICE_FONTTYPE     0x002
+#define TRUETYPE_FONTTYPE   0x004
+
+#define RGB(r,g,b)          ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
+#define PALETTERGB(r,g,b)   (0x02000000 | RGB(r,g,b))
+#define PALETTEINDEX(i)     ((COLORREF)(0x01000000 | (DWORD)(WORD)(i)))
+
+/* palette entry flags */
+
+#define PC_RESERVED     0x01    /* palette index used for animation */
+#define PC_EXPLICIT     0x02    /* palette index is explicit to device */
+#define PC_NOCOLLAPSE   0x04    /* do not match color to system palette */
+
+#define GetRValue(rgb)      ((BYTE)(rgb))
+#define GetGValue(rgb)      ((BYTE)(((WORD)(rgb)) >> 8))
+#define GetBValue(rgb)      ((BYTE)((rgb)>>16))
+
+/* Background Modes */
+#define TRANSPARENT         1
+#define OPAQUE              2
+#define BKMODE_LAST         2
+
+/* Graphics Modes */
+
+#define GM_COMPATIBLE       1
+#define GM_ADVANCED         2
+#define GM_LAST             2
+
+/* PolyDraw and GetPath point types */
+#define PT_CLOSEFIGURE      0x01
+#define PT_LINETO           0x02
+#define PT_BEZIERTO         0x04
+#define PT_MOVETO           0x06
+
+/* Mapping Modes */
+#define MM_TEXT             1
+#define MM_LOMETRIC         2
+#define MM_HIMETRIC         3
+#define MM_LOENGLISH        4
+#define MM_HIENGLISH        5
+#define MM_TWIPS            6
+#define MM_ISOTROPIC        7
+#define MM_ANISOTROPIC      8
+
+/* Min and Max Mapping Mode values */
+#define MM_MIN              MM_TEXT
+#define MM_MAX              MM_ANISOTROPIC
+#define MM_MAX_FIXEDSCALE   MM_TWIPS
+
+/* Coordinate Modes */
+#define ABSOLUTE            1
+#define RELATIVE            2
+
+/* Stock Logical Objects */
+#define WHITE_BRUSH         0
+#define LTGRAY_BRUSH        1
+#define GRAY_BRUSH          2
+#define DKGRAY_BRUSH        3
+#define BLACK_BRUSH         4
+#define NULL_BRUSH          5
+#define HOLLOW_BRUSH        NULL_BRUSH
+#define WHITE_PEN           6
+#define BLACK_PEN           7
+#define NULL_PEN            8
+#define OEM_FIXED_FONT      10
+#define ANSI_FIXED_FONT     11
+#define ANSI_VAR_FONT       12
+#define SYSTEM_FONT         13
+#define DEVICE_DEFAULT_FONT 14
+#define DEFAULT_PALETTE     15
+#define SYSTEM_FIXED_FONT   16
+
+#if(WINVER >= 0x0400)
+#define DEFAULT_GUI_FONT    17
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0500)
+#define DC_BRUSH            18
+#define DC_PEN              19
+#endif
+
+#if (_WIN32_WINNT >= 0x0500)
+#define STOCK_LAST          19
+#elif (WINVER >= 0x0400)
+#define STOCK_LAST          17
+#else
+#define STOCK_LAST          16
+#endif
+
+#define CLR_INVALID     0xFFFFFFFF
+
+/* Brush Styles */
+#define BS_SOLID            0
+#define BS_NULL             1
+#define BS_HOLLOW           BS_NULL
+#define BS_HATCHED          2
+#define BS_PATTERN          3
+#define BS_INDEXED          4
+#define BS_DIBPATTERN       5
+#define BS_DIBPATTERNPT     6
+#define BS_PATTERN8X8       7
+#define BS_DIBPATTERN8X8    8
+#define BS_MONOPATTERN      9
+
+/* Hatch Styles */
+#define HS_HORIZONTAL       0       /* ----- */
+#define HS_VERTICAL         1       /* ||||| */
+#define HS_FDIAGONAL        2       /* \\\\\ */
+#define HS_BDIAGONAL        3       /* ///// */
+#define HS_CROSS            4       /* +++++ */
+#define HS_DIAGCROSS        5       /* xxxxx */
+
+/* Pen Styles */
+#define PS_SOLID            0
+#define PS_DASH             1       /* -------  */
+#define PS_DOT              2       /* .......  */
+#define PS_DASHDOT          3       /* _._._._  */
+#define PS_DASHDOTDOT       4       /* _.._.._  */
+#define PS_NULL             5
+#define PS_INSIDEFRAME      6
+#define PS_USERSTYLE        7
+#define PS_ALTERNATE        8
+#define PS_STYLE_MASK       0x0000000F
+
+#define PS_ENDCAP_ROUND     0x00000000
+#define PS_ENDCAP_SQUARE    0x00000100
+#define PS_ENDCAP_FLAT      0x00000200
+#define PS_ENDCAP_MASK      0x00000F00
+
+#define PS_JOIN_ROUND       0x00000000
+#define PS_JOIN_BEVEL       0x00001000
+#define PS_JOIN_MITER       0x00002000
+#define PS_JOIN_MASK        0x0000F000
+
+#define PS_COSMETIC         0x00000000
+#define PS_GEOMETRIC        0x00010000
+#define PS_TYPE_MASK        0x000F0000
+
+#define AD_COUNTERCLOCKWISE 1
+#define AD_CLOCKWISE        2
+
+/* Device Parameters for GetDeviceCaps() */
+#define DRIVERVERSION 0     /* Device driver version                    */
+#define TECHNOLOGY    2     /* Device classification                    */
+#define HORZSIZE      4     /* Horizontal size in millimeters           */
+#define VERTSIZE      6     /* Vertical size in millimeters             */
+#define HORZRES       8     /* Horizontal width in pixels               */
+#define VERTRES       10    /* Vertical height in pixels                */
+#define BITSPIXEL     12    /* Number of bits per pixel                 */
+#define PLANES        14    /* Number of planes                         */
+#define NUMBRUSHES    16    /* Number of brushes the device has         */
+#define NUMPENS       18    /* Number of pens the device has            */
+#define NUMMARKERS    20    /* Number of markers the device has         */
+#define NUMFONTS      22    /* Number of fonts the device has           */
+#define NUMCOLORS     24    /* Number of colors the device supports     */
+#define PDEVICESIZE   26    /* Size required for device descriptor      */
+#define CURVECAPS     28    /* Curve capabilities                       */
+#define LINECAPS      30    /* Line capabilities                        */
+#define POLYGONALCAPS 32    /* Polygonal capabilities                   */
+#define TEXTCAPS      34    /* Text capabilities                        */
+#define CLIPCAPS      36    /* Clipping capabilities                    */
+#define RASTERCAPS    38    /* Bitblt capabilities                      */
+#define ASPECTX       40    /* Length of the X leg                      */
+#define ASPECTY       42    /* Length of the Y leg                      */
+#define ASPECTXY      44    /* Length of the hypotenuse                 */
+
+#define LOGPIXELSX    88    /* Logical pixels/inch in X                 */
+#define LOGPIXELSY    90    /* Logical pixels/inch in Y                 */
+
+#define SIZEPALETTE  104    /* Number of entries in physical palette    */
+#define NUMRESERVED  106    /* Number of reserved entries in palette    */
+#define COLORRES     108    /* Actual color resolution                  */
+
+// Printing related DeviceCaps. These replace the appropriate Escapes
+
+#define PHYSICALWIDTH   110 /* Physical Width in device units           */
+#define PHYSICALHEIGHT  111 /* Physical Height in device units          */
+#define PHYSICALOFFSETX 112 /* Physical Printable Area x margin         */
+#define PHYSICALOFFSETY 113 /* Physical Printable Area y margin         */
+#define SCALINGFACTORX  114 /* Scaling factor x                         */
+#define SCALINGFACTORY  115 /* Scaling factor y                         */
+
+// Display driver specific
+
+#define VREFRESH        116  /* Current vertical refresh rate of the    */
+                             /* display device (for displays only) in Hz*/
+#define DESKTOPVERTRES  117  /* Horizontal width of entire desktop in   */
+                             /* pixels                                  */
+#define DESKTOPHORZRES  118  /* Vertical height of entire desktop in    */
+                             /* pixels                                  */
+#define BLTALIGNMENT    119  /* Preferred blt alignment                 */
+
+#if(WINVER >= 0x0500)
+#define SHADEBLENDCAPS  120  /* Shading and blending caps               */
+#define COLORMGMTCAPS   121  /* Color Management caps                   */
+#endif /* WINVER >= 0x0500 */
+
+#ifndef NOGDICAPMASKS
+
+/* Device Capability Masks: */
+
+/* Device Technologies */
+#define DT_PLOTTER          0   /* Vector plotter                   */
+#define DT_RASDISPLAY       1   /* Raster display                   */
+#define DT_RASPRINTER       2   /* Raster printer                   */
+#define DT_RASCAMERA        3   /* Raster camera                    */
+#define DT_CHARSTREAM       4   /* Character-stream, PLP            */
+#define DT_METAFILE         5   /* Metafile, VDM                    */
+#define DT_DISPFILE         6   /* Display-file                     */
+
+/* Curve Capabilities */
+#define CC_NONE             0   /* Curves not supported             */
+#define CC_CIRCLES          1   /* Can do circles                   */
+#define CC_PIE              2   /* Can do pie wedges                */
+#define CC_CHORD            4   /* Can do chord arcs                */
+#define CC_ELLIPSES         8   /* Can do ellipese                  */
+#define CC_WIDE             16  /* Can do wide lines                */
+#define CC_STYLED           32  /* Can do styled lines              */
+#define CC_WIDESTYLED       64  /* Can do wide styled lines         */
+#define CC_INTERIORS        128 /* Can do interiors                 */
+#define CC_ROUNDRECT        256 /*                                  */
+
+/* Line Capabilities */
+#define LC_NONE             0   /* Lines not supported              */
+#define LC_POLYLINE         2   /* Can do polylines                 */
+#define LC_MARKER           4   /* Can do markers                   */
+#define LC_POLYMARKER       8   /* Can do polymarkers               */
+#define LC_WIDE             16  /* Can do wide lines                */
+#define LC_STYLED           32  /* Can do styled lines              */
+#define LC_WIDESTYLED       64  /* Can do wide styled lines         */
+#define LC_INTERIORS        128 /* Can do interiors                 */
+
+/* Polygonal Capabilities */
+#define PC_NONE             0   /* Polygonals not supported         */
+#define PC_POLYGON          1   /* Can do polygons                  */
+#define PC_RECTANGLE        2   /* Can do rectangles                */
+#define PC_WINDPOLYGON      4   /* Can do winding polygons          */
+#define PC_TRAPEZOID        4   /* Can do trapezoids                */
+#define PC_SCANLINE         8   /* Can do scanlines                 */
+#define PC_WIDE             16  /* Can do wide borders              */
+#define PC_STYLED           32  /* Can do styled borders            */
+#define PC_WIDESTYLED       64  /* Can do wide styled borders       */
+#define PC_INTERIORS        128 /* Can do interiors                 */
+#define PC_POLYPOLYGON      256 /* Can do polypolygons              */
+#define PC_PATHS            512 /* Can do paths                     */
+
+/* Clipping Capabilities */
+#define CP_NONE             0   /* No clipping of output            */
+#define CP_RECTANGLE        1   /* Output clipped to rects          */
+#define CP_REGION           2   /* obsolete                         */
+
+/* Text Capabilities */
+#define TC_OP_CHARACTER     0x00000001  /* Can do OutputPrecision   CHARACTER      */
+#define TC_OP_STROKE        0x00000002  /* Can do OutputPrecision   STROKE         */
+#define TC_CP_STROKE        0x00000004  /* Can do ClipPrecision     STROKE         */
+#define TC_CR_90            0x00000008  /* Can do CharRotAbility    90             */
+#define TC_CR_ANY           0x00000010  /* Can do CharRotAbility    ANY            */
+#define TC_SF_X_YINDEP      0x00000020  /* Can do ScaleFreedom      X_YINDEPENDENT */
+#define TC_SA_DOUBLE        0x00000040  /* Can do ScaleAbility      DOUBLE         */
+#define TC_SA_INTEGER       0x00000080  /* Can do ScaleAbility      INTEGER        */
+#define TC_SA_CONTIN        0x00000100  /* Can do ScaleAbility      CONTINUOUS     */
+#define TC_EA_DOUBLE        0x00000200  /* Can do EmboldenAbility   DOUBLE         */
+#define TC_IA_ABLE          0x00000400  /* Can do ItalisizeAbility  ABLE           */
+#define TC_UA_ABLE          0x00000800  /* Can do UnderlineAbility  ABLE           */
+#define TC_SO_ABLE          0x00001000  /* Can do StrikeOutAbility  ABLE           */
+#define TC_RA_ABLE          0x00002000  /* Can do RasterFontAble    ABLE           */
+#define TC_VA_ABLE          0x00004000  /* Can do VectorFontAble    ABLE           */
+#define TC_RESERVED         0x00008000
+#define TC_SCROLLBLT        0x00010000  /* Don't do text scroll with blt           */
+
+#endif /* NOGDICAPMASKS */
+
+/* Raster Capabilities */
+#define RC_NONE
+#define RC_BITBLT           1       /* Can do standard BLT.             */
+#define RC_BANDING          2       /* Device requires banding support  */
+#define RC_SCALING          4       /* Device requires scaling support  */
+#define RC_BITMAP64         8       /* Device can support >64K bitmap   */
+#define RC_GDI20_OUTPUT     0x0010      /* has 2.0 output calls         */
+#define RC_GDI20_STATE      0x0020
+#define RC_SAVEBITMAP       0x0040
+#define RC_DI_BITMAP        0x0080      /* supports DIB to memory       */
+#define RC_PALETTE          0x0100      /* supports a palette           */
+#define RC_DIBTODEV         0x0200      /* supports DIBitsToDevice      */
+#define RC_BIGFONT          0x0400      /* supports >64K fonts          */
+#define RC_STRETCHBLT       0x0800      /* supports StretchBlt          */
+#define RC_FLOODFILL        0x1000      /* supports FloodFill           */
+#define RC_STRETCHDIB       0x2000      /* supports StretchDIBits       */
+#define RC_OP_DX_OUTPUT     0x4000
+#define RC_DEVBITS          0x8000
+
+#if(WINVER >= 0x0500)
+
+/* Shading and blending caps */
+#define SB_NONE             0x00000000
+#define SB_CONST_ALPHA      0x00000001
+#define SB_PIXEL_ALPHA      0x00000002
+#define SB_PREMULT_ALPHA    0x00000004
+
+#define SB_GRAD_RECT        0x00000010
+#define SB_GRAD_TRI         0x00000020
+
+/* Color Management caps */
+#define CM_NONE             0x00000000
+#define CM_DEVICE_ICM       0x00000001
+#define CM_GAMMA_RAMP       0x00000002
+#define CM_CMYK_COLOR       0x00000004
+
+#endif /* WINVER >= 0x0500 */
+
+
+/* DIB color table identifiers */
+
+#define DIB_RGB_COLORS      0 /* color table in RGBs */
+#define DIB_PAL_COLORS      1 /* color table in palette indices */
+
+/* constants for Get/SetSystemPaletteUse() */
+
+#define SYSPAL_ERROR    0
+#define SYSPAL_STATIC   1
+#define SYSPAL_NOSTATIC 2
+#define SYSPAL_NOSTATIC256 3
+
+/* constants for CreateDIBitmap */
+#define CBM_INIT        0x04L   /* initialize bitmap */
+
+/* ExtFloodFill style flags */
+#define  FLOODFILLBORDER   0
+#define  FLOODFILLSURFACE  1
+
+/* size of a device name string */
+#define CCHDEVICENAME 32
+
+/* size of a form name string */
+#define CCHFORMNAME 32
+
+typedef struct _devicemodeA {
+    BYTE   dmDeviceName[CCHDEVICENAME];
+    WORD dmSpecVersion;
+    WORD dmDriverVersion;
+    WORD dmSize;
+    WORD dmDriverExtra;
+    DWORD dmFields;
+    union {
+      /* printer only fields */
+      struct {
+        short dmOrientation;
+        short dmPaperSize;
+        short dmPaperLength;
+        short dmPaperWidth;
+        short dmScale;
+        short dmCopies;
+        short dmDefaultSource;
+        short dmPrintQuality;
+      };
+      /* display only fields */
+      struct {
+        POINTL dmPosition;
+        DWORD  dmDisplayOrientation;
+        DWORD  dmDisplayFixedOutput; 
+      };
+    };
+    short dmColor;
+    short dmDuplex;
+    short dmYResolution;
+    short dmTTOption;
+    short dmCollate;
+    BYTE   dmFormName[CCHFORMNAME];
+    WORD   dmLogPixels;
+    DWORD  dmBitsPerPel;
+    DWORD  dmPelsWidth;
+    DWORD  dmPelsHeight;
+    union {
+        DWORD  dmDisplayFlags;
+        DWORD  dmNup;
+    };
+    DWORD  dmDisplayFrequency;
+#if(WINVER >= 0x0400)
+    DWORD  dmICMMethod;
+    DWORD  dmICMIntent;
+    DWORD  dmMediaType;
+    DWORD  dmDitherType;
+    DWORD  dmReserved1;
+    DWORD  dmReserved2;
+#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
+    DWORD  dmPanningWidth;
+    DWORD  dmPanningHeight;
+#endif
+#endif /* WINVER >= 0x0400 */
+} DEVMODEA, *PDEVMODEA, *NPDEVMODEA, *LPDEVMODEA;
+typedef struct _devicemodeW {
+    WCHAR  dmDeviceName[CCHDEVICENAME];
+    WORD dmSpecVersion;
+    WORD dmDriverVersion;
+    WORD dmSize;
+    WORD dmDriverExtra;
+    DWORD dmFields;
+    union {
+      /* printer only fields */
+      struct {
+        short dmOrientation;
+        short dmPaperSize;
+        short dmPaperLength;
+        short dmPaperWidth;
+        short dmScale;
+        short dmCopies;
+        short dmDefaultSource;
+        short dmPrintQuality;
+      };
+      /* display only fields */
+      struct {
+        POINTL dmPosition;
+        DWORD  dmDisplayOrientation;
+        DWORD  dmDisplayFixedOutput; 
+      };
+    };
+    short dmColor;
+    short dmDuplex;
+    short dmYResolution;
+    short dmTTOption;
+    short dmCollate;
+    WCHAR  dmFormName[CCHFORMNAME];
+    WORD   dmLogPixels;
+    DWORD  dmBitsPerPel;
+    DWORD  dmPelsWidth;
+    DWORD  dmPelsHeight;
+    union {
+        DWORD  dmDisplayFlags;
+        DWORD  dmNup;
+    };
+    DWORD  dmDisplayFrequency;
+#if(WINVER >= 0x0400)
+    DWORD  dmICMMethod;
+    DWORD  dmICMIntent;
+    DWORD  dmMediaType;
+    DWORD  dmDitherType;
+    DWORD  dmReserved1;
+    DWORD  dmReserved2;
+#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
+    DWORD  dmPanningWidth;
+    DWORD  dmPanningHeight;
+#endif
+#endif /* WINVER >= 0x0400 */
+} DEVMODEW, *PDEVMODEW, *NPDEVMODEW, *LPDEVMODEW;
+#ifdef UNICODE
+typedef DEVMODEW DEVMODE;
+typedef PDEVMODEW PDEVMODE;
+typedef NPDEVMODEW NPDEVMODE;
+typedef LPDEVMODEW LPDEVMODE;
+#else
+typedef DEVMODEA DEVMODE;
+typedef PDEVMODEA PDEVMODE;
+typedef NPDEVMODEA NPDEVMODE;
+typedef LPDEVMODEA LPDEVMODE;
+#endif // UNICODE
+
+/* current version of specification */
+#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
+#define DM_SPECVERSION 0x0401
+#elif (WINVER >= 0x0400)
+#define DM_SPECVERSION 0x0400
+#else
+#define DM_SPECVERSION 0x0320
+#endif /* WINVER */
+
+/* field selection bits */
+#define DM_ORIENTATION          0x00000001L
+#define DM_PAPERSIZE            0x00000002L
+#define DM_PAPERLENGTH          0x00000004L
+#define DM_PAPERWIDTH           0x00000008L
+#define DM_SCALE                0x00000010L
+#if(WINVER >= 0x0500)
+#define DM_POSITION             0x00000020L
+#define DM_NUP                  0x00000040L
+#endif /* WINVER >= 0x0500 */
+#if(WINVER >= 0x0501)
+#define DM_DISPLAYORIENTATION   0x00000080L
+#endif /* WINVER >= 0x0501 */
+#define DM_COPIES               0x00000100L
+#define DM_DEFAULTSOURCE        0x00000200L
+#define DM_PRINTQUALITY         0x00000400L
+#define DM_COLOR                0x00000800L
+#define DM_DUPLEX               0x00001000L
+#define DM_YRESOLUTION          0x00002000L
+#define DM_TTOPTION             0x00004000L
+#define DM_COLLATE              0x00008000L
+#define DM_FORMNAME             0x00010000L
+#define DM_LOGPIXELS            0x00020000L
+#define DM_BITSPERPEL           0x00040000L
+#define DM_PELSWIDTH            0x00080000L
+#define DM_PELSHEIGHT           0x00100000L
+#define DM_DISPLAYFLAGS         0x00200000L
+#define DM_DISPLAYFREQUENCY     0x00400000L
+#if(WINVER >= 0x0400)
+#define DM_ICMMETHOD            0x00800000L
+#define DM_ICMINTENT            0x01000000L
+#define DM_MEDIATYPE            0x02000000L
+#define DM_DITHERTYPE           0x04000000L
+#define DM_PANNINGWIDTH         0x08000000L
+#define DM_PANNINGHEIGHT        0x10000000L
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0501)
+#define DM_DISPLAYFIXEDOUTPUT   0x20000000L
+#endif /* WINVER >= 0x0501 */
+
+/* orientation selections */
+#define DMORIENT_PORTRAIT   1
+#define DMORIENT_LANDSCAPE  2
+
+/* paper selections */
+#define DMPAPER_FIRST                DMPAPER_LETTER
+#define DMPAPER_LETTER               1  /* Letter 8 1/2 x 11 in               */
+#define DMPAPER_LETTERSMALL          2  /* Letter Small 8 1/2 x 11 in         */
+#define DMPAPER_TABLOID              3  /* Tabloid 11 x 17 in                 */
+#define DMPAPER_LEDGER               4  /* Ledger 17 x 11 in                  */
+#define DMPAPER_LEGAL                5  /* Legal 8 1/2 x 14 in                */
+#define DMPAPER_STATEMENT            6  /* Statement 5 1/2 x 8 1/2 in         */
+#define DMPAPER_EXECUTIVE            7  /* Executive 7 1/4 x 10 1/2 in        */
+#define DMPAPER_A3                   8  /* A3 297 x 420 mm                    */
+#define DMPAPER_A4                   9  /* A4 210 x 297 mm                    */
+#define DMPAPER_A4SMALL             10  /* A4 Small 210 x 297 mm              */
+#define DMPAPER_A5                  11  /* A5 148 x 210 mm                    */
+#define DMPAPER_B4                  12  /* B4 (JIS) 250 x 354                 */
+#define DMPAPER_B5                  13  /* B5 (JIS) 182 x 257 mm              */
+#define DMPAPER_FOLIO               14  /* Folio 8 1/2 x 13 in                */
+#define DMPAPER_QUARTO              15  /* Quarto 215 x 275 mm                */
+#define DMPAPER_10X14               16  /* 10x14 in                           */
+#define DMPAPER_11X17               17  /* 11x17 in                           */
+#define DMPAPER_NOTE                18  /* Note 8 1/2 x 11 in                 */
+#define DMPAPER_ENV_9               19  /* Envelope #9 3 7/8 x 8 7/8          */
+#define DMPAPER_ENV_10              20  /* Envelope #10 4 1/8 x 9 1/2         */
+#define DMPAPER_ENV_11              21  /* Envelope #11 4 1/2 x 10 3/8        */
+#define DMPAPER_ENV_12              22  /* Envelope #12 4 \276 x 11           */
+#define DMPAPER_ENV_14              23  /* Envelope #14 5 x 11 1/2            */
+#define DMPAPER_CSHEET              24  /* C size sheet                       */
+#define DMPAPER_DSHEET              25  /* D size sheet                       */
+#define DMPAPER_ESHEET              26  /* E size sheet                       */
+#define DMPAPER_ENV_DL              27  /* Envelope DL 110 x 220mm            */
+#define DMPAPER_ENV_C5              28  /* Envelope C5 162 x 229 mm           */
+#define DMPAPER_ENV_C3              29  /* Envelope C3  324 x 458 mm          */
+#define DMPAPER_ENV_C4              30  /* Envelope C4  229 x 324 mm          */
+#define DMPAPER_ENV_C6              31  /* Envelope C6  114 x 162 mm          */
+#define DMPAPER_ENV_C65             32  /* Envelope C65 114 x 229 mm          */
+#define DMPAPER_ENV_B4              33  /* Envelope B4  250 x 353 mm          */
+#define DMPAPER_ENV_B5              34  /* Envelope B5  176 x 250 mm          */
+#define DMPAPER_ENV_B6              35  /* Envelope B6  176 x 125 mm          */
+#define DMPAPER_ENV_ITALY           36  /* Envelope 110 x 230 mm              */
+#define DMPAPER_ENV_MONARCH         37  /* Envelope Monarch 3.875 x 7.5 in    */
+#define DMPAPER_ENV_PERSONAL        38  /* 6 3/4 Envelope 3 5/8 x 6 1/2 in    */
+#define DMPAPER_FANFOLD_US          39  /* US Std Fanfold 14 7/8 x 11 in      */
+#define DMPAPER_FANFOLD_STD_GERMAN  40  /* German Std Fanfold 8 1/2 x 12 in   */
+#define DMPAPER_FANFOLD_LGL_GERMAN  41  /* German Legal Fanfold 8 1/2 x 13 in */
+#if(WINVER >= 0x0400)
+#define DMPAPER_ISO_B4              42  /* B4 (ISO) 250 x 353 mm              */
+#define DMPAPER_JAPANESE_POSTCARD   43  /* Japanese Postcard 100 x 148 mm     */
+#define DMPAPER_9X11                44  /* 9 x 11 in                          */
+#define DMPAPER_10X11               45  /* 10 x 11 in                         */
+#define DMPAPER_15X11               46  /* 15 x 11 in                         */
+#define DMPAPER_ENV_INVITE          47  /* Envelope Invite 220 x 220 mm       */
+#define DMPAPER_RESERVED_48         48  /* RESERVED--DO NOT USE               */
+#define DMPAPER_RESERVED_49         49  /* RESERVED--DO NOT USE               */
+#define DMPAPER_LETTER_EXTRA        50  /* Letter Extra 9 \275 x 12 in        */
+#define DMPAPER_LEGAL_EXTRA         51  /* Legal Extra 9 \275 x 15 in         */
+#define DMPAPER_TABLOID_EXTRA       52  /* Tabloid Extra 11.69 x 18 in        */
+#define DMPAPER_A4_EXTRA            53  /* A4 Extra 9.27 x 12.69 in           */
+#define DMPAPER_LETTER_TRANSVERSE   54  /* Letter Transverse 8 \275 x 11 in   */
+#define DMPAPER_A4_TRANSVERSE       55  /* A4 Transverse 210 x 297 mm         */
+#define DMPAPER_LETTER_EXTRA_TRANSVERSE 56 /* Letter Extra Transverse 9\275 x 12 in */
+#define DMPAPER_A_PLUS              57  /* SuperA/SuperA/A4 227 x 356 mm      */
+#define DMPAPER_B_PLUS              58  /* SuperB/SuperB/A3 305 x 487 mm      */
+#define DMPAPER_LETTER_PLUS         59  /* Letter Plus 8.5 x 12.69 in         */
+#define DMPAPER_A4_PLUS             60  /* A4 Plus 210 x 330 mm               */
+#define DMPAPER_A5_TRANSVERSE       61  /* A5 Transverse 148 x 210 mm         */
+#define DMPAPER_B5_TRANSVERSE       62  /* B5 (JIS) Transverse 182 x 257 mm   */
+#define DMPAPER_A3_EXTRA            63  /* A3 Extra 322 x 445 mm              */
+#define DMPAPER_A5_EXTRA            64  /* A5 Extra 174 x 235 mm              */
+#define DMPAPER_B5_EXTRA            65  /* B5 (ISO) Extra 201 x 276 mm        */
+#define DMPAPER_A2                  66  /* A2 420 x 594 mm                    */
+#define DMPAPER_A3_TRANSVERSE       67  /* A3 Transverse 297 x 420 mm         */
+#define DMPAPER_A3_EXTRA_TRANSVERSE 68  /* A3 Extra Transverse 322 x 445 mm   */
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define DMPAPER_DBL_JAPANESE_POSTCARD 69 /* Japanese Double Postcard 200 x 148 mm */
+#define DMPAPER_A6                  70  /* A6 105 x 148 mm                 */
+#define DMPAPER_JENV_KAKU2          71  /* Japanese Envelope Kaku #2       */
+#define DMPAPER_JENV_KAKU3          72  /* Japanese Envelope Kaku #3       */
+#define DMPAPER_JENV_CHOU3          73  /* Japanese Envelope Chou #3       */
+#define DMPAPER_JENV_CHOU4          74  /* Japanese Envelope Chou #4       */
+#define DMPAPER_LETTER_ROTATED      75  /* Letter Rotated 11 x 8 1/2 11 in */
+#define DMPAPER_A3_ROTATED          76  /* A3 Rotated 420 x 297 mm         */
+#define DMPAPER_A4_ROTATED          77  /* A4 Rotated 297 x 210 mm         */
+#define DMPAPER_A5_ROTATED          78  /* A5 Rotated 210 x 148 mm         */
+#define DMPAPER_B4_JIS_ROTATED      79  /* B4 (JIS) Rotated 364 x 257 mm   */
+#define DMPAPER_B5_JIS_ROTATED      80  /* B5 (JIS) Rotated 257 x 182 mm   */
+#define DMPAPER_JAPANESE_POSTCARD_ROTATED 81 /* Japanese Postcard Rotated 148 x 100 mm */
+#define DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED 82 /* Double Japanese Postcard Rotated 148 x 200 mm */
+#define DMPAPER_A6_ROTATED          83  /* A6 Rotated 148 x 105 mm         */
+#define DMPAPER_JENV_KAKU2_ROTATED  84  /* Japanese Envelope Kaku #2 Rotated */
+#define DMPAPER_JENV_KAKU3_ROTATED  85  /* Japanese Envelope Kaku #3 Rotated */
+#define DMPAPER_JENV_CHOU3_ROTATED  86  /* Japanese Envelope Chou #3 Rotated */
+#define DMPAPER_JENV_CHOU4_ROTATED  87  /* Japanese Envelope Chou #4 Rotated */
+#define DMPAPER_B6_JIS              88  /* B6 (JIS) 128 x 182 mm           */
+#define DMPAPER_B6_JIS_ROTATED      89  /* B6 (JIS) Rotated 182 x 128 mm   */
+#define DMPAPER_12X11               90  /* 12 x 11 in                      */
+#define DMPAPER_JENV_YOU4           91  /* Japanese Envelope You #4        */
+#define DMPAPER_JENV_YOU4_ROTATED   92  /* Japanese Envelope You #4 Rotated*/
+#define DMPAPER_P16K                93  /* PRC 16K 146 x 215 mm            */
+#define DMPAPER_P32K                94  /* PRC 32K 97 x 151 mm             */
+#define DMPAPER_P32KBIG             95  /* PRC 32K(Big) 97 x 151 mm        */
+#define DMPAPER_PENV_1              96  /* PRC Envelope #1 102 x 165 mm    */
+#define DMPAPER_PENV_2              97  /* PRC Envelope #2 102 x 176 mm    */
+#define DMPAPER_PENV_3              98  /* PRC Envelope #3 125 x 176 mm    */
+#define DMPAPER_PENV_4              99  /* PRC Envelope #4 110 x 208 mm    */
+#define DMPAPER_PENV_5              100 /* PRC Envelope #5 110 x 220 mm    */
+#define DMPAPER_PENV_6              101 /* PRC Envelope #6 120 x 230 mm    */
+#define DMPAPER_PENV_7              102 /* PRC Envelope #7 160 x 230 mm    */
+#define DMPAPER_PENV_8              103 /* PRC Envelope #8 120 x 309 mm    */
+#define DMPAPER_PENV_9              104 /* PRC Envelope #9 229 x 324 mm    */
+#define DMPAPER_PENV_10             105 /* PRC Envelope #10 324 x 458 mm   */
+#define DMPAPER_P16K_ROTATED        106 /* PRC 16K Rotated                 */
+#define DMPAPER_P32K_ROTATED        107 /* PRC 32K Rotated                 */
+#define DMPAPER_P32KBIG_ROTATED     108 /* PRC 32K(Big) Rotated            */
+#define DMPAPER_PENV_1_ROTATED      109 /* PRC Envelope #1 Rotated 165 x 102 mm */
+#define DMPAPER_PENV_2_ROTATED      110 /* PRC Envelope #2 Rotated 176 x 102 mm */
+#define DMPAPER_PENV_3_ROTATED      111 /* PRC Envelope #3 Rotated 176 x 125 mm */
+#define DMPAPER_PENV_4_ROTATED      112 /* PRC Envelope #4 Rotated 208 x 110 mm */
+#define DMPAPER_PENV_5_ROTATED      113 /* PRC Envelope #5 Rotated 220 x 110 mm */
+#define DMPAPER_PENV_6_ROTATED      114 /* PRC Envelope #6 Rotated 230 x 120 mm */
+#define DMPAPER_PENV_7_ROTATED      115 /* PRC Envelope #7 Rotated 230 x 160 mm */
+#define DMPAPER_PENV_8_ROTATED      116 /* PRC Envelope #8 Rotated 309 x 120 mm */
+#define DMPAPER_PENV_9_ROTATED      117 /* PRC Envelope #9 Rotated 324 x 229 mm */
+#define DMPAPER_PENV_10_ROTATED     118 /* PRC Envelope #10 Rotated 458 x 324 mm */
+#endif /* WINVER >= 0x0500 */
+
+#if (WINVER >= 0x0500)
+#define DMPAPER_LAST                DMPAPER_PENV_10_ROTATED
+#elif (WINVER >= 0x0400)
+#define DMPAPER_LAST                DMPAPER_A3_EXTRA_TRANSVERSE
+#else
+#define DMPAPER_LAST                DMPAPER_FANFOLD_LGL_GERMAN
+#endif
+
+#define DMPAPER_USER                256
+
+/* bin selections */
+#define DMBIN_FIRST         DMBIN_UPPER
+#define DMBIN_UPPER         1
+#define DMBIN_ONLYONE       1
+#define DMBIN_LOWER         2
+#define DMBIN_MIDDLE        3
+#define DMBIN_MANUAL        4
+#define DMBIN_ENVELOPE      5
+#define DMBIN_ENVMANUAL     6
+#define DMBIN_AUTO          7
+#define DMBIN_TRACTOR       8
+#define DMBIN_SMALLFMT      9
+#define DMBIN_LARGEFMT      10
+#define DMBIN_LARGECAPACITY 11
+#define DMBIN_CASSETTE      14
+#define DMBIN_FORMSOURCE    15
+#define DMBIN_LAST          DMBIN_FORMSOURCE
+
+#define DMBIN_USER          256     /* device specific bins start here */
+
+/* print qualities */
+#define DMRES_DRAFT         (-1)
+#define DMRES_LOW           (-2)
+#define DMRES_MEDIUM        (-3)
+#define DMRES_HIGH          (-4)
+
+/* color enable/disable for color printers */
+#define DMCOLOR_MONOCHROME  1
+#define DMCOLOR_COLOR       2
+
+/* duplex enable */
+#define DMDUP_SIMPLEX    1
+#define DMDUP_VERTICAL   2
+#define DMDUP_HORIZONTAL 3
+
+/* TrueType options */
+#define DMTT_BITMAP     1       /* print TT fonts as graphics */
+#define DMTT_DOWNLOAD   2       /* download TT fonts as soft fonts */
+#define DMTT_SUBDEV     3       /* substitute device fonts for TT fonts */
+#if(WINVER >= 0x0400)
+#define DMTT_DOWNLOAD_OUTLINE 4 /* download TT fonts as outline soft fonts */
+#endif /* WINVER >= 0x0400 */
+
+/* Collation selections */
+#define DMCOLLATE_FALSE  0
+#define DMCOLLATE_TRUE   1
+
+#if(WINVER >= 0x0501)
+/* DEVMODE dmDisplayOrientation specifiations */
+#define DMDO_DEFAULT    0
+#define DMDO_90         1
+#define DMDO_180        2
+#define DMDO_270        3
+
+/* DEVMODE dmDisplayFixedOutput specifiations */
+#define DMDFO_DEFAULT   0
+#define DMDFO_STRETCH   1
+#define DMDFO_CENTER    2
+#endif /* WINVER >= 0x0501 */
+
+/* DEVMODE dmDisplayFlags flags */
+
+// #define DM_GRAYSCALE            0x00000001 /* This flag is no longer valid */
+// #define DM_INTERLACED           0x00000002 /* This flag is no longer valid */
+#define DMDISPLAYFLAGS_TEXTMODE 0x00000004
+
+/* dmNup , multiple logical page per physical page options */
+#define DMNUP_SYSTEM        1
+#define DMNUP_ONEUP         2
+
+#if(WINVER >= 0x0400)
+/* ICM methods */
+#define DMICMMETHOD_NONE    1   /* ICM disabled */
+#define DMICMMETHOD_SYSTEM  2   /* ICM handled by system */
+#define DMICMMETHOD_DRIVER  3   /* ICM handled by driver */
+#define DMICMMETHOD_DEVICE  4   /* ICM handled by device */
+
+#define DMICMMETHOD_USER  256   /* Device-specific methods start here */
+
+/* ICM Intents */
+#define DMICM_SATURATE          1   /* Maximize color saturation */
+#define DMICM_CONTRAST          2   /* Maximize color contrast */
+#define DMICM_COLORIMETRIC       3   /* Use specific color metric */
+#define DMICM_ABS_COLORIMETRIC   4   /* Use specific color metric */
+
+#define DMICM_USER        256   /* Device-specific intents start here */
+
+/* Media types */
+
+#define DMMEDIA_STANDARD      1   /* Standard paper */
+#define DMMEDIA_TRANSPARENCY  2   /* Transparency */
+#define DMMEDIA_GLOSSY        3   /* Glossy paper */
+
+#define DMMEDIA_USER        256   /* Device-specific media start here */
+
+/* Dither types */
+#define DMDITHER_NONE       1      /* No dithering */
+#define DMDITHER_COARSE     2      /* Dither with a coarse brush */
+#define DMDITHER_FINE       3      /* Dither with a fine brush */
+#define DMDITHER_LINEART    4      /* LineArt dithering */
+#define DMDITHER_ERRORDIFFUSION 5  /* LineArt dithering */
+#define DMDITHER_RESERVED6      6      /* LineArt dithering */
+#define DMDITHER_RESERVED7      7      /* LineArt dithering */
+#define DMDITHER_RESERVED8      8      /* LineArt dithering */
+#define DMDITHER_RESERVED9      9      /* LineArt dithering */
+#define DMDITHER_GRAYSCALE  10     /* Device does grayscaling */
+
+#define DMDITHER_USER     256   /* Device-specific dithers start here */
+#endif /* WINVER >= 0x0400 */
+
+typedef struct _DISPLAY_DEVICEA {
+    DWORD  cb;
+    CHAR   DeviceName[32];
+    CHAR   DeviceString[128];
+    DWORD  StateFlags;
+    CHAR   DeviceID[128];
+    CHAR   DeviceKey[128];
+} DISPLAY_DEVICEA, *PDISPLAY_DEVICEA, *LPDISPLAY_DEVICEA;
+typedef struct _DISPLAY_DEVICEW {
+    DWORD  cb;
+    WCHAR  DeviceName[32];
+    WCHAR  DeviceString[128];
+    DWORD  StateFlags;
+    WCHAR  DeviceID[128];
+    WCHAR  DeviceKey[128];
+} DISPLAY_DEVICEW, *PDISPLAY_DEVICEW, *LPDISPLAY_DEVICEW;
+#ifdef UNICODE
+typedef DISPLAY_DEVICEW DISPLAY_DEVICE;
+typedef PDISPLAY_DEVICEW PDISPLAY_DEVICE;
+typedef LPDISPLAY_DEVICEW LPDISPLAY_DEVICE;
+#else
+typedef DISPLAY_DEVICEA DISPLAY_DEVICE;
+typedef PDISPLAY_DEVICEA PDISPLAY_DEVICE;
+typedef LPDISPLAY_DEVICEA LPDISPLAY_DEVICE;
+#endif // UNICODE
+
+#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
+#define DISPLAY_DEVICE_MULTI_DRIVER        0x00000002
+#define DISPLAY_DEVICE_PRIMARY_DEVICE      0x00000004
+#define DISPLAY_DEVICE_MIRRORING_DRIVER    0x00000008
+#define DISPLAY_DEVICE_VGA_COMPATIBLE      0x00000010
+#define DISPLAY_DEVICE_REMOVABLE           0x00000020
+#define DISPLAY_DEVICE_MODESPRUNED         0x08000000
+#define DISPLAY_DEVICE_REMOTE              0x04000000  
+#define DISPLAY_DEVICE_DISCONNECT          0x02000000  
+
+
+/* Child device state */
+#define DISPLAY_DEVICE_ACTIVE              0x00000001
+#define DISPLAY_DEVICE_ATTACHED            0x00000002
+
+/* GetRegionData/ExtCreateRegion */
+
+#define RDH_RECTANGLES  1
+
+typedef struct _RGNDATAHEADER {
+    DWORD   dwSize;
+    DWORD   iType;
+    DWORD   nCount;
+    DWORD   nRgnSize;
+    RECT    rcBound;
+} RGNDATAHEADER, *PRGNDATAHEADER;
+
+typedef struct _RGNDATA {
+    RGNDATAHEADER   rdh;
+    char            Buffer[1];
+} RGNDATA, *PRGNDATA, NEAR *NPRGNDATA, FAR *LPRGNDATA;
+
+
+/* for GetRandomRgn */
+#define SYSRGN  4
+
+typedef struct _ABC {
+    int     abcA;
+    UINT    abcB;
+    int     abcC;
+} ABC, *PABC, NEAR *NPABC, FAR *LPABC;
+
+typedef struct _ABCFLOAT {
+    FLOAT   abcfA;
+    FLOAT   abcfB;
+    FLOAT   abcfC;
+} ABCFLOAT, *PABCFLOAT, NEAR *NPABCFLOAT, FAR *LPABCFLOAT;
+
+#ifndef NOTEXTMETRIC
+
+#ifdef _MAC
+#include "pshpack4.h"
+#endif
+typedef struct _OUTLINETEXTMETRICA {
+    UINT    otmSize;
+    TEXTMETRICA otmTextMetrics;
+    BYTE    otmFiller;
+    PANOSE  otmPanoseNumber;
+    UINT    otmfsSelection;
+    UINT    otmfsType;
+     int    otmsCharSlopeRise;
+     int    otmsCharSlopeRun;
+     int    otmItalicAngle;
+    UINT    otmEMSquare;
+     int    otmAscent;
+     int    otmDescent;
+    UINT    otmLineGap;
+    UINT    otmsCapEmHeight;
+    UINT    otmsXHeight;
+    RECT    otmrcFontBox;
+     int    otmMacAscent;
+     int    otmMacDescent;
+    UINT    otmMacLineGap;
+    UINT    otmusMinimumPPEM;
+    POINT   otmptSubscriptSize;
+    POINT   otmptSubscriptOffset;
+    POINT   otmptSuperscriptSize;
+    POINT   otmptSuperscriptOffset;
+    UINT    otmsStrikeoutSize;
+     int    otmsStrikeoutPosition;
+     int    otmsUnderscoreSize;
+     int    otmsUnderscorePosition;
+    PSTR    otmpFamilyName;
+    PSTR    otmpFaceName;
+    PSTR    otmpStyleName;
+    PSTR    otmpFullName;
+} OUTLINETEXTMETRICA, *POUTLINETEXTMETRICA, NEAR *NPOUTLINETEXTMETRICA, FAR *LPOUTLINETEXTMETRICA;
+typedef struct _OUTLINETEXTMETRICW {
+    UINT    otmSize;
+    TEXTMETRICW otmTextMetrics;
+    BYTE    otmFiller;
+    PANOSE  otmPanoseNumber;
+    UINT    otmfsSelection;
+    UINT    otmfsType;
+     int    otmsCharSlopeRise;
+     int    otmsCharSlopeRun;
+     int    otmItalicAngle;
+    UINT    otmEMSquare;
+     int    otmAscent;
+     int    otmDescent;
+    UINT    otmLineGap;
+    UINT    otmsCapEmHeight;
+    UINT    otmsXHeight;
+    RECT    otmrcFontBox;
+     int    otmMacAscent;
+     int    otmMacDescent;
+    UINT    otmMacLineGap;
+    UINT    otmusMinimumPPEM;
+    POINT   otmptSubscriptSize;
+    POINT   otmptSubscriptOffset;
+    POINT   otmptSuperscriptSize;
+    POINT   otmptSuperscriptOffset;
+    UINT    otmsStrikeoutSize;
+     int    otmsStrikeoutPosition;
+     int    otmsUnderscoreSize;
+     int    otmsUnderscorePosition;
+    PSTR    otmpFamilyName;
+    PSTR    otmpFaceName;
+    PSTR    otmpStyleName;
+    PSTR    otmpFullName;
+} OUTLINETEXTMETRICW, *POUTLINETEXTMETRICW, NEAR *NPOUTLINETEXTMETRICW, FAR *LPOUTLINETEXTMETRICW;
+#ifdef UNICODE
+typedef OUTLINETEXTMETRICW OUTLINETEXTMETRIC;
+typedef POUTLINETEXTMETRICW POUTLINETEXTMETRIC;
+typedef NPOUTLINETEXTMETRICW NPOUTLINETEXTMETRIC;
+typedef LPOUTLINETEXTMETRICW LPOUTLINETEXTMETRIC;
+#else
+typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC;
+typedef POUTLINETEXTMETRICA POUTLINETEXTMETRIC;
+typedef NPOUTLINETEXTMETRICA NPOUTLINETEXTMETRIC;
+typedef LPOUTLINETEXTMETRICA LPOUTLINETEXTMETRIC;
+#endif // UNICODE
+
+#ifdef _MAC
+#include "poppack.h"
+#endif
+
+#endif /* NOTEXTMETRIC */
+
+
+typedef struct tagPOLYTEXTA
+{
+    int       x;
+    int       y;
+    UINT      n;
+    LPCSTR    lpstr;
+    UINT      uiFlags;
+    RECT      rcl;
+    int      *pdx;
+} POLYTEXTA, *PPOLYTEXTA, NEAR *NPPOLYTEXTA, FAR *LPPOLYTEXTA;
+typedef struct tagPOLYTEXTW
+{
+    int       x;
+    int       y;
+    UINT      n;
+    LPCWSTR   lpstr;
+    UINT      uiFlags;
+    RECT      rcl;
+    int      *pdx;
+} POLYTEXTW, *PPOLYTEXTW, NEAR *NPPOLYTEXTW, FAR *LPPOLYTEXTW;
+#ifdef UNICODE
+typedef POLYTEXTW POLYTEXT;
+typedef PPOLYTEXTW PPOLYTEXT;
+typedef NPPOLYTEXTW NPPOLYTEXT;
+typedef LPPOLYTEXTW LPPOLYTEXT;
+#else
+typedef POLYTEXTA POLYTEXT;
+typedef PPOLYTEXTA PPOLYTEXT;
+typedef NPPOLYTEXTA NPPOLYTEXT;
+typedef LPPOLYTEXTA LPPOLYTEXT;
+#endif // UNICODE
+
+typedef struct _FIXED {
+#ifndef _MAC
+    WORD    fract;
+    short   value;
+#else
+    short   value;
+    WORD    fract;
+#endif
+} FIXED;
+
+
+typedef struct _MAT2 {
+     FIXED  eM11;
+     FIXED  eM12;
+     FIXED  eM21;
+     FIXED  eM22;
+} MAT2, FAR *LPMAT2;
+
+
+
+typedef struct _GLYPHMETRICS {
+    UINT    gmBlackBoxX;
+    UINT    gmBlackBoxY;
+    POINT   gmptGlyphOrigin;
+    short   gmCellIncX;
+    short   gmCellIncY;
+} GLYPHMETRICS, FAR *LPGLYPHMETRICS;
+
+//  GetGlyphOutline constants
+
+#define GGO_METRICS        0
+#define GGO_BITMAP         1
+#define GGO_NATIVE         2
+#define GGO_BEZIER         3
+
+#if(WINVER >= 0x0400)
+#define  GGO_GRAY2_BITMAP   4
+#define  GGO_GRAY4_BITMAP   5
+#define  GGO_GRAY8_BITMAP   6
+#define  GGO_GLYPH_INDEX    0x0080
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0500)
+#define  GGO_UNHINTED       0x0100
+#endif // (_WIN32_WINNT >= 0x0500)
+
+#define TT_POLYGON_TYPE   24
+
+#define TT_PRIM_LINE       1
+#define TT_PRIM_QSPLINE    2
+#define TT_PRIM_CSPLINE    3
+
+typedef struct tagPOINTFX
+{
+    FIXED x;
+    FIXED y;
+} POINTFX, FAR* LPPOINTFX;
+
+typedef struct tagTTPOLYCURVE
+{
+    WORD    wType;
+    WORD    cpfx;
+    POINTFX apfx[1];
+} TTPOLYCURVE, FAR* LPTTPOLYCURVE;
+
+typedef struct tagTTPOLYGONHEADER
+{
+    DWORD   cb;
+    DWORD   dwType;
+    POINTFX pfxStart;
+} TTPOLYGONHEADER, FAR* LPTTPOLYGONHEADER;
+
+
+#if(WINVER >= 0x0400)
+#define GCP_DBCS           0x0001
+#define GCP_REORDER        0x0002
+#define GCP_USEKERNING     0x0008
+#define GCP_GLYPHSHAPE     0x0010
+#define GCP_LIGATE         0x0020
+////#define GCP_GLYPHINDEXING  0x0080
+#define GCP_DIACRITIC      0x0100
+#define GCP_KASHIDA        0x0400
+#define GCP_ERROR          0x8000
+#define FLI_MASK           0x103B
+
+#define GCP_JUSTIFY        0x00010000L
+////#define GCP_NODIACRITICS   0x00020000L
+#define FLI_GLYPHS         0x00040000L
+#define GCP_CLASSIN        0x00080000L
+#define GCP_MAXEXTENT      0x00100000L
+#define GCP_JUSTIFYIN      0x00200000L
+#define GCP_DISPLAYZWG      0x00400000L
+#define GCP_SYMSWAPOFF      0x00800000L
+#define GCP_NUMERICOVERRIDE 0x01000000L
+#define GCP_NEUTRALOVERRIDE 0x02000000L
+#define GCP_NUMERICSLATIN   0x04000000L
+#define GCP_NUMERICSLOCAL   0x08000000L
+
+#define GCPCLASS_LATIN                  1
+#define GCPCLASS_HEBREW                 2
+#define GCPCLASS_ARABIC                 2
+#define GCPCLASS_NEUTRAL                3
+#define GCPCLASS_LOCALNUMBER            4
+#define GCPCLASS_LATINNUMBER            5
+#define GCPCLASS_LATINNUMERICTERMINATOR 6
+#define GCPCLASS_LATINNUMERICSEPARATOR  7
+#define GCPCLASS_NUMERICSEPARATOR       8
+#define GCPCLASS_PREBOUNDLTR         0x80
+#define GCPCLASS_PREBOUNDRTL         0x40
+#define GCPCLASS_POSTBOUNDLTR        0x20
+#define GCPCLASS_POSTBOUNDRTL        0x10
+
+#define GCPGLYPH_LINKBEFORE          0x8000
+#define GCPGLYPH_LINKAFTER           0x4000
+
+
+typedef struct tagGCP_RESULTSA
+    {
+    DWORD   lStructSize;
+    LPSTR     lpOutString;
+    UINT FAR *lpOrder;
+    int FAR  *lpDx;
+    int FAR  *lpCaretPos;
+    LPSTR   lpClass;
+    LPWSTR  lpGlyphs;
+    UINT    nGlyphs;
+    int     nMaxFit;
+    } GCP_RESULTSA, FAR* LPGCP_RESULTSA;
+typedef struct tagGCP_RESULTSW
+    {
+    DWORD   lStructSize;
+    LPWSTR    lpOutString;
+    UINT FAR *lpOrder;
+    int FAR  *lpDx;
+    int FAR  *lpCaretPos;
+    LPSTR   lpClass;
+    LPWSTR  lpGlyphs;
+    UINT    nGlyphs;
+    int     nMaxFit;
+    } GCP_RESULTSW, FAR* LPGCP_RESULTSW;
+#ifdef UNICODE
+typedef GCP_RESULTSW GCP_RESULTS;
+typedef LPGCP_RESULTSW LPGCP_RESULTS;
+#else
+typedef GCP_RESULTSA GCP_RESULTS;
+typedef LPGCP_RESULTSA LPGCP_RESULTS;
+#endif // UNICODE
+#endif /* WINVER >= 0x0400 */
+
+typedef struct _RASTERIZER_STATUS {
+    short   nSize;
+    short   wFlags;
+    short   nLanguageID;
+} RASTERIZER_STATUS, FAR *LPRASTERIZER_STATUS;
+
+/* bits defined in wFlags of RASTERIZER_STATUS */
+#define TT_AVAILABLE    0x0001
+#define TT_ENABLED      0x0002
+
+/* Pixel format descriptor */
+typedef struct tagPIXELFORMATDESCRIPTOR
+{
+    WORD  nSize;
+    WORD  nVersion;
+    DWORD dwFlags;
+    BYTE  iPixelType;
+    BYTE  cColorBits;
+    BYTE  cRedBits;
+    BYTE  cRedShift;
+    BYTE  cGreenBits;
+    BYTE  cGreenShift;
+    BYTE  cBlueBits;
+    BYTE  cBlueShift;
+    BYTE  cAlphaBits;
+    BYTE  cAlphaShift;
+    BYTE  cAccumBits;
+    BYTE  cAccumRedBits;
+    BYTE  cAccumGreenBits;
+    BYTE  cAccumBlueBits;
+    BYTE  cAccumAlphaBits;
+    BYTE  cDepthBits;
+    BYTE  cStencilBits;
+    BYTE  cAuxBuffers;
+    BYTE  iLayerType;
+    BYTE  bReserved;
+    DWORD dwLayerMask;
+    DWORD dwVisibleMask;
+    DWORD dwDamageMask;
+} PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, FAR *LPPIXELFORMATDESCRIPTOR;
+
+/* pixel types */
+#define PFD_TYPE_RGBA        0
+#define PFD_TYPE_COLORINDEX  1
+
+/* layer types */
+#define PFD_MAIN_PLANE       0
+#define PFD_OVERLAY_PLANE    1
+#define PFD_UNDERLAY_PLANE   (-1)
+
+/* PIXELFORMATDESCRIPTOR flags */
+#define PFD_DOUBLEBUFFER            0x00000001
+#define PFD_STEREO                  0x00000002
+#define PFD_DRAW_TO_WINDOW          0x00000004
+#define PFD_DRAW_TO_BITMAP          0x00000008
+#define PFD_SUPPORT_GDI             0x00000010
+#define PFD_SUPPORT_OPENGL          0x00000020
+#define PFD_GENERIC_FORMAT          0x00000040
+#define PFD_NEED_PALETTE            0x00000080
+#define PFD_NEED_SYSTEM_PALETTE     0x00000100
+#define PFD_SWAP_EXCHANGE           0x00000200
+#define PFD_SWAP_COPY               0x00000400
+#define PFD_SWAP_LAYER_BUFFERS      0x00000800
+#define PFD_GENERIC_ACCELERATED     0x00001000
+#define PFD_SUPPORT_DIRECTDRAW      0x00002000
+
+/* PIXELFORMATDESCRIPTOR flags for use in ChoosePixelFormat only */
+#define PFD_DEPTH_DONTCARE          0x20000000
+#define PFD_DOUBLEBUFFER_DONTCARE   0x40000000
+#define PFD_STEREO_DONTCARE         0x80000000
+
+#ifdef STRICT
+#if !defined(NOTEXTMETRIC)
+typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST TEXTMETRICA *, DWORD, LPARAM);
+typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST TEXTMETRICW *, DWORD, LPARAM);
+#ifdef UNICODE
+#define OLDFONTENUMPROC  OLDFONTENUMPROCW
+#else
+#define OLDFONTENUMPROC  OLDFONTENUMPROCA
+#endif // !UNICODE
+#else
+typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST VOID *, DWORD, LPARAM);
+typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST VOID *, DWORD, LPARAM);
+#ifdef UNICODE
+#define OLDFONTENUMPROC  OLDFONTENUMPROCW
+#else
+#define OLDFONTENUMPROC  OLDFONTENUMPROCA
+#endif // !UNICODE
+#endif
+
+typedef OLDFONTENUMPROCA    FONTENUMPROCA;
+typedef OLDFONTENUMPROCW    FONTENUMPROCW;
+#ifdef UNICODE
+typedef FONTENUMPROCW FONTENUMPROC;
+#else
+typedef FONTENUMPROCA FONTENUMPROC;
+#endif // UNICODE
+
+typedef int (CALLBACK* GOBJENUMPROC)(LPVOID, LPARAM);
+typedef VOID (CALLBACK* LINEDDAPROC)(int, int, LPARAM);
+#else
+typedef FARPROC OLDFONTENUMPROC;
+typedef FARPROC FONTENUMPROCA;
+typedef FARPROC FONTENUMPROCW;
+#ifdef UNICODE
+typedef FONTENUMPROCW FONTENUMPROC;
+#else
+typedef FONTENUMPROCA FONTENUMPROC;
+#endif // UNICODE
+typedef FARPROC GOBJENUMPROC;
+typedef FARPROC LINEDDAPROC;
+#endif
+
+
+
+WINGDIAPI int WINAPI AddFontResourceA(IN LPCSTR);
+WINGDIAPI int WINAPI AddFontResourceW(IN LPCWSTR);
+#ifdef UNICODE
+#define AddFontResource  AddFontResourceW
+#else
+#define AddFontResource  AddFontResourceA
+#endif // !UNICODE
+
+
+WINGDIAPI BOOL  WINAPI AnimatePalette( IN HPALETTE, IN UINT, IN  UINT, IN CONST PALETTEENTRY *);
+WINGDIAPI BOOL  WINAPI Arc( IN HDC, IN int, IN int, IN int, IN int, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL  WINAPI BitBlt( IN HDC, IN int, IN int, IN int, IN int, IN HDC, IN int, IN int, IN DWORD);
+WINGDIAPI BOOL  WINAPI CancelDC( IN HDC);
+WINGDIAPI BOOL  WINAPI Chord( IN HDC, IN int, IN int, IN int, IN int, IN int, IN int, IN int, IN int);
+WINGDIAPI int   WINAPI ChoosePixelFormat( IN HDC, IN CONST PIXELFORMATDESCRIPTOR *);
+WINGDIAPI HMETAFILE  WINAPI CloseMetaFile( IN HDC);
+WINGDIAPI int     WINAPI CombineRgn( IN HRGN, IN HRGN, IN HRGN, IN int);
+WINGDIAPI HMETAFILE WINAPI CopyMetaFileA( IN HMETAFILE, IN LPCSTR);
+WINGDIAPI HMETAFILE WINAPI CopyMetaFileW( IN HMETAFILE, IN LPCWSTR);
+#ifdef UNICODE
+#define CopyMetaFile  CopyMetaFileW
+#else
+#define CopyMetaFile  CopyMetaFileA
+#endif // !UNICODE
+WINGDIAPI HBITMAP WINAPI CreateBitmap( IN int, IN int, IN UINT, IN UINT, IN CONST VOID *);
+WINGDIAPI HBITMAP WINAPI CreateBitmapIndirect( IN CONST BITMAP *);
+WINGDIAPI HBRUSH  WINAPI CreateBrushIndirect( IN CONST LOGBRUSH *);
+WINGDIAPI HBITMAP WINAPI CreateCompatibleBitmap( IN HDC, IN int, IN int);
+WINGDIAPI HBITMAP WINAPI CreateDiscardableBitmap( IN HDC, IN int, IN int);
+WINGDIAPI HDC     WINAPI CreateCompatibleDC( IN HDC);
+WINGDIAPI HDC     WINAPI CreateDCA( IN LPCSTR, IN LPCSTR, IN LPCSTR, IN CONST DEVMODEA *);
+WINGDIAPI HDC     WINAPI CreateDCW( IN LPCWSTR, IN LPCWSTR, IN LPCWSTR, IN CONST DEVMODEW *);
+#ifdef UNICODE
+#define CreateDC  CreateDCW
+#else
+#define CreateDC  CreateDCA
+#endif // !UNICODE
+WINGDIAPI HBITMAP WINAPI CreateDIBitmap( IN HDC, IN CONST BITMAPINFOHEADER *, IN DWORD, IN CONST VOID *, IN CONST BITMAPINFO *, IN UINT);
+WINGDIAPI HBRUSH  WINAPI CreateDIBPatternBrush( IN HGLOBAL, IN UINT);
+WINGDIAPI HBRUSH  WINAPI CreateDIBPatternBrushPt( IN CONST VOID *, IN UINT);
+WINGDIAPI HRGN    WINAPI CreateEllipticRgn( IN int, IN int, IN int, IN int);
+WINGDIAPI HRGN    WINAPI CreateEllipticRgnIndirect( IN CONST RECT *);
+WINGDIAPI HFONT   WINAPI CreateFontIndirectA( IN CONST LOGFONTA *);
+WINGDIAPI HFONT   WINAPI CreateFontIndirectW( IN CONST LOGFONTW *);
+#ifdef UNICODE
+#define CreateFontIndirect  CreateFontIndirectW
+#else
+#define CreateFontIndirect  CreateFontIndirectA
+#endif // !UNICODE
+WINGDIAPI HFONT   WINAPI CreateFontA( IN int, IN int, IN int, IN int, IN int, IN DWORD,
+                             IN DWORD, IN DWORD, IN DWORD, IN DWORD, IN DWORD,
+                             IN DWORD, IN DWORD, IN LPCSTR);
+WINGDIAPI HFONT   WINAPI CreateFontW( IN int, IN int, IN int, IN int, IN int, IN DWORD,
+                             IN DWORD, IN DWORD, IN DWORD, IN DWORD, IN DWORD,
+                             IN DWORD, IN DWORD, IN LPCWSTR);
+#ifdef UNICODE
+#define CreateFont  CreateFontW
+#else
+#define CreateFont  CreateFontA
+#endif // !UNICODE
+
+WINGDIAPI HBRUSH  WINAPI CreateHatchBrush( IN int, IN COLORREF);
+WINGDIAPI HDC     WINAPI CreateICA( IN LPCSTR, IN LPCSTR, IN LPCSTR, IN CONST DEVMODEA *);
+WINGDIAPI HDC     WINAPI CreateICW( IN LPCWSTR, IN LPCWSTR, IN LPCWSTR, IN CONST DEVMODEW *);
+#ifdef UNICODE
+#define CreateIC  CreateICW
+#else
+#define CreateIC  CreateICA
+#endif // !UNICODE
+WINGDIAPI HDC     WINAPI CreateMetaFileA( IN LPCSTR);
+WINGDIAPI HDC     WINAPI CreateMetaFileW( IN LPCWSTR);
+#ifdef UNICODE
+#define CreateMetaFile  CreateMetaFileW
+#else
+#define CreateMetaFile  CreateMetaFileA
+#endif // !UNICODE
+WINGDIAPI HPALETTE WINAPI CreatePalette( IN CONST LOGPALETTE *);
+WINGDIAPI HPEN    WINAPI CreatePen( IN int, IN int, IN COLORREF);
+WINGDIAPI HPEN    WINAPI CreatePenIndirect( IN CONST LOGPEN *);
+WINGDIAPI HRGN    WINAPI CreatePolyPolygonRgn( IN CONST POINT *, IN CONST INT *, IN int, IN int);
+WINGDIAPI HBRUSH  WINAPI CreatePatternBrush( IN HBITMAP);
+WINGDIAPI HRGN    WINAPI CreateRectRgn( IN int, IN int, IN int, IN int);
+WINGDIAPI HRGN    WINAPI CreateRectRgnIndirect( IN CONST RECT *);
+WINGDIAPI HRGN    WINAPI CreateRoundRectRgn( IN int, IN int, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL    WINAPI CreateScalableFontResourceA( IN DWORD, IN LPCSTR, IN LPCSTR, IN LPCSTR);
+WINGDIAPI BOOL    WINAPI CreateScalableFontResourceW( IN DWORD, IN LPCWSTR, IN LPCWSTR, IN LPCWSTR);
+#ifdef UNICODE
+#define CreateScalableFontResource  CreateScalableFontResourceW
+#else
+#define CreateScalableFontResource  CreateScalableFontResourceA
+#endif // !UNICODE
+WINGDIAPI HBRUSH  WINAPI CreateSolidBrush( IN COLORREF);
+
+WINGDIAPI BOOL WINAPI DeleteDC( IN HDC);
+WINGDIAPI BOOL WINAPI DeleteMetaFile( IN HMETAFILE);
+WINGDIAPI BOOL WINAPI DeleteObject( IN HGDIOBJ);
+WINGDIAPI int  WINAPI DescribePixelFormat( IN HDC, IN int, IN UINT, OUT LPPIXELFORMATDESCRIPTOR);
+
+/* define types of pointers to ExtDeviceMode() and DeviceCapabilities()
+ * functions for Win 3.1 compatibility
+ */
+
+typedef UINT   (CALLBACK* LPFNDEVMODE)(HWND, HMODULE, LPDEVMODE, LPSTR, LPSTR, LPDEVMODE, LPSTR, UINT);
+
+typedef DWORD  (CALLBACK* LPFNDEVCAPS)(LPSTR, LPSTR, UINT, LPSTR, LPDEVMODE);
+
+/* mode selections for the device mode function */
+#define DM_UPDATE           1
+#define DM_COPY             2
+#define DM_PROMPT           4
+#define DM_MODIFY           8
+
+#define DM_IN_BUFFER        DM_MODIFY
+#define DM_IN_PROMPT        DM_PROMPT
+#define DM_OUT_BUFFER       DM_COPY
+#define DM_OUT_DEFAULT      DM_UPDATE
+
+/* device capabilities indices */
+#define DC_FIELDS           1
+#define DC_PAPERS           2
+#define DC_PAPERSIZE        3
+#define DC_MINEXTENT        4
+#define DC_MAXEXTENT        5
+#define DC_BINS             6
+#define DC_DUPLEX           7
+#define DC_SIZE             8
+#define DC_EXTRA            9
+#define DC_VERSION          10
+#define DC_DRIVER           11
+#define DC_BINNAMES         12
+#define DC_ENUMRESOLUTIONS  13
+#define DC_FILEDEPENDENCIES 14
+#define DC_TRUETYPE         15
+#define DC_PAPERNAMES       16
+#define DC_ORIENTATION      17
+#define DC_COPIES           18
+#if(WINVER >= 0x0400)
+#define DC_BINADJUST            19
+#define DC_EMF_COMPLIANT        20
+#define DC_DATATYPE_PRODUCED    21
+#define DC_COLLATE              22
+#define DC_MANUFACTURER         23
+#define DC_MODEL                24
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define DC_PERSONALITY          25
+#define DC_PRINTRATE            26
+#define DC_PRINTRATEUNIT        27
+#define   PRINTRATEUNIT_PPM     1
+#define   PRINTRATEUNIT_CPS     2
+#define   PRINTRATEUNIT_LPM     3
+#define   PRINTRATEUNIT_IPM     4
+#define DC_PRINTERMEM           28
+#define DC_MEDIAREADY           29
+#define DC_STAPLE               30
+#define DC_PRINTRATEPPM         31
+#define DC_COLORDEVICE          32
+#define DC_NUP                  33
+#define DC_MEDIATYPENAMES       34
+#define DC_MEDIATYPES           35
+#endif /* WINVER >= 0x0500 */
+
+/* bit fields of the return value (DWORD) for DC_TRUETYPE */
+#define DCTT_BITMAP             0x0000001L
+#define DCTT_DOWNLOAD           0x0000002L
+#define DCTT_SUBDEV             0x0000004L
+#if(WINVER >= 0x0400)
+#define DCTT_DOWNLOAD_OUTLINE   0x0000008L
+
+/* return values for DC_BINADJUST */
+#define DCBA_FACEUPNONE       0x0000
+#define DCBA_FACEUPCENTER     0x0001
+#define DCBA_FACEUPLEFT       0x0002
+#define DCBA_FACEUPRIGHT      0x0003
+#define DCBA_FACEDOWNNONE     0x0100
+#define DCBA_FACEDOWNCENTER   0x0101
+#define DCBA_FACEDOWNLEFT     0x0102
+#define DCBA_FACEDOWNRIGHT    0x0103
+#endif /* WINVER >= 0x0400 */
+
+WINSPOOLAPI int  WINAPI DeviceCapabilitiesA( IN LPCSTR, IN LPCSTR, IN WORD,
+                                OUT LPSTR, IN CONST DEVMODEA *);
+WINSPOOLAPI int  WINAPI DeviceCapabilitiesW( IN LPCWSTR, IN LPCWSTR, IN WORD,
+                                OUT LPWSTR, IN CONST DEVMODEW *);
+#ifdef UNICODE
+#define DeviceCapabilities  DeviceCapabilitiesW
+#else
+#define DeviceCapabilities  DeviceCapabilitiesA
+#endif // !UNICODE
+
+WINGDIAPI int  WINAPI DrawEscape( IN HDC, IN int, IN int, IN LPCSTR);
+WINGDIAPI BOOL WINAPI Ellipse( IN HDC, IN int, IN int, IN int, IN int);
+
+#if(WINVER >= 0x0400)
+WINGDIAPI int  WINAPI EnumFontFamiliesExA( IN HDC, IN LPLOGFONTA, IN FONTENUMPROCA, IN LPARAM, IN DWORD);
+WINGDIAPI int  WINAPI EnumFontFamiliesExW( IN HDC, IN LPLOGFONTW, IN FONTENUMPROCW, IN LPARAM, IN DWORD);
+#ifdef UNICODE
+#define EnumFontFamiliesEx  EnumFontFamiliesExW
+#else
+#define EnumFontFamiliesEx  EnumFontFamiliesExA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+WINGDIAPI int  WINAPI EnumFontFamiliesA( IN HDC, IN LPCSTR, IN FONTENUMPROCA, IN LPARAM);
+WINGDIAPI int  WINAPI EnumFontFamiliesW( IN HDC, IN LPCWSTR, IN FONTENUMPROCW, IN LPARAM);
+#ifdef UNICODE
+#define EnumFontFamilies  EnumFontFamiliesW
+#else
+#define EnumFontFamilies  EnumFontFamiliesA
+#endif // !UNICODE
+WINGDIAPI int  WINAPI EnumFontsA( IN HDC, IN LPCSTR,  IN FONTENUMPROCA, IN LPARAM);
+WINGDIAPI int  WINAPI EnumFontsW( IN HDC, IN LPCWSTR,  IN FONTENUMPROCW, IN LPARAM);
+#ifdef UNICODE
+#define EnumFonts  EnumFontsW
+#else
+#define EnumFonts  EnumFontsA
+#endif // !UNICODE
+
+#ifdef STRICT
+WINGDIAPI int  WINAPI EnumObjects( IN HDC, IN int, IN GOBJENUMPROC, IN LPARAM);
+#else
+WINGDIAPI int  WINAPI EnumObjects( IN HDC, IN int, IN GOBJENUMPROC, IN LPVOID);
+#endif
+
+
+WINGDIAPI BOOL WINAPI EqualRgn( IN HRGN, IN HRGN);
+WINGDIAPI int  WINAPI Escape( IN HDC, IN int, IN int, IN LPCSTR,  OUT LPVOID);
+WINGDIAPI int  WINAPI ExtEscape( IN HDC, IN int, IN int, IN LPCSTR,  IN int, OUT LPSTR);
+WINGDIAPI int  WINAPI ExcludeClipRect( IN HDC, IN int, IN int, IN int, IN int);
+WINGDIAPI HRGN WINAPI ExtCreateRegion( IN CONST XFORM *, IN DWORD, IN CONST RGNDATA *);
+WINGDIAPI BOOL  WINAPI ExtFloodFill( IN HDC, IN int, IN int, IN COLORREF, IN UINT);
+WINGDIAPI BOOL   WINAPI FillRgn( IN HDC, IN HRGN, IN HBRUSH);
+WINGDIAPI BOOL   WINAPI FloodFill( IN HDC, IN int, IN int, IN COLORREF);
+WINGDIAPI BOOL   WINAPI FrameRgn( IN HDC, IN HRGN, IN HBRUSH, IN int, IN int);
+WINGDIAPI int   WINAPI GetROP2( IN HDC);
+WINGDIAPI BOOL  WINAPI GetAspectRatioFilterEx( IN HDC, OUT LPSIZE);
+WINGDIAPI COLORREF WINAPI GetBkColor( IN HDC);
+
+#if (_WIN32_WINNT >= 0x0500)
+WINGDIAPI COLORREF WINAPI GetDCBrushColor( IN HDC);
+WINGDIAPI COLORREF WINAPI GetDCPenColor( IN HDC);
+#endif
+
+WINGDIAPI int   WINAPI GetBkMode( IN HDC);
+WINGDIAPI LONG  WINAPI GetBitmapBits( IN HBITMAP, IN LONG, OUT LPVOID);
+WINGDIAPI BOOL  WINAPI GetBitmapDimensionEx( IN HBITMAP, OUT LPSIZE);
+WINGDIAPI UINT  WINAPI GetBoundsRect( IN HDC, OUT LPRECT, IN UINT);
+
+WINGDIAPI BOOL  WINAPI GetBrushOrgEx( IN HDC, OUT LPPOINT);
+
+WINGDIAPI BOOL  WINAPI GetCharWidthA( IN HDC, IN UINT, IN UINT, OUT LPINT);
+WINGDIAPI BOOL  WINAPI GetCharWidthW( IN HDC, IN UINT, IN UINT, OUT LPINT);
+#ifdef UNICODE
+#define GetCharWidth  GetCharWidthW
+#else
+#define GetCharWidth  GetCharWidthA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI GetCharWidth32A( IN HDC, IN UINT, IN UINT,  OUT LPINT);
+WINGDIAPI BOOL  WINAPI GetCharWidth32W( IN HDC, IN UINT, IN UINT,  OUT LPINT);
+#ifdef UNICODE
+#define GetCharWidth32  GetCharWidth32W
+#else
+#define GetCharWidth32  GetCharWidth32A
+#endif // !UNICODE
+WINGDIAPI BOOL  APIENTRY GetCharWidthFloatA( IN HDC, IN UINT, IN UINT, OUT PFLOAT);
+WINGDIAPI BOOL  APIENTRY GetCharWidthFloatW( IN HDC, IN UINT, IN UINT, OUT PFLOAT);
+#ifdef UNICODE
+#define GetCharWidthFloat  GetCharWidthFloatW
+#else
+#define GetCharWidthFloat  GetCharWidthFloatA
+#endif // !UNICODE
+WINGDIAPI BOOL  APIENTRY GetCharABCWidthsA( IN HDC, IN UINT, IN UINT, OUT LPABC);
+WINGDIAPI BOOL  APIENTRY GetCharABCWidthsW( IN HDC, IN UINT, IN UINT, OUT LPABC);
+#ifdef UNICODE
+#define GetCharABCWidths  GetCharABCWidthsW
+#else
+#define GetCharABCWidths  GetCharABCWidthsA
+#endif // !UNICODE
+WINGDIAPI BOOL  APIENTRY GetCharABCWidthsFloatA( IN HDC, IN UINT, IN UINT, OUT LPABCFLOAT);
+WINGDIAPI BOOL  APIENTRY GetCharABCWidthsFloatW( IN HDC, IN UINT, IN UINT, OUT LPABCFLOAT);
+#ifdef UNICODE
+#define GetCharABCWidthsFloat  GetCharABCWidthsFloatW
+#else
+#define GetCharABCWidthsFloat  GetCharABCWidthsFloatA
+#endif // !UNICODE
+WINGDIAPI int   WINAPI GetClipBox( IN HDC,  OUT LPRECT);
+WINGDIAPI int   WINAPI GetClipRgn( IN HDC, IN HRGN);
+WINGDIAPI int   WINAPI GetMetaRgn( IN HDC, IN HRGN);
+WINGDIAPI HGDIOBJ WINAPI GetCurrentObject( IN HDC, IN UINT);
+WINGDIAPI BOOL  WINAPI GetCurrentPositionEx( IN HDC,  OUT LPPOINT);
+WINGDIAPI int   WINAPI GetDeviceCaps( IN HDC, IN int);
+WINGDIAPI int   WINAPI GetDIBits( IN HDC, IN HBITMAP, IN UINT, IN UINT,  OUT LPVOID, IN OUT LPBITMAPINFO, IN UINT);
+WINGDIAPI DWORD WINAPI GetFontData( IN HDC, IN DWORD, IN DWORD, OUT LPVOID, IN DWORD);
+WINGDIAPI DWORD WINAPI GetGlyphOutlineA( IN HDC, IN UINT, IN UINT, OUT LPGLYPHMETRICS, IN DWORD, OUT LPVOID, IN CONST MAT2 *);
+WINGDIAPI DWORD WINAPI GetGlyphOutlineW( IN HDC, IN UINT, IN UINT, OUT LPGLYPHMETRICS, IN DWORD, OUT LPVOID, IN CONST MAT2 *);
+#ifdef UNICODE
+#define GetGlyphOutline  GetGlyphOutlineW
+#else
+#define GetGlyphOutline  GetGlyphOutlineA
+#endif // !UNICODE
+WINGDIAPI int   WINAPI GetGraphicsMode( IN HDC);
+WINGDIAPI int   WINAPI GetMapMode( IN HDC);
+WINGDIAPI UINT  WINAPI GetMetaFileBitsEx( IN HMETAFILE, IN UINT,  OUT LPVOID);
+WINGDIAPI HMETAFILE   WINAPI GetMetaFileA( IN LPCSTR);
+WINGDIAPI HMETAFILE   WINAPI GetMetaFileW( IN LPCWSTR);
+#ifdef UNICODE
+#define GetMetaFile  GetMetaFileW
+#else
+#define GetMetaFile  GetMetaFileA
+#endif // !UNICODE
+WINGDIAPI COLORREF WINAPI GetNearestColor( IN HDC, IN COLORREF);
+WINGDIAPI UINT  WINAPI GetNearestPaletteIndex( IN HPALETTE, IN COLORREF);
+WINGDIAPI DWORD WINAPI GetObjectType( IN HGDIOBJ h);
+
+#ifndef NOTEXTMETRIC
+
+WINGDIAPI UINT APIENTRY GetOutlineTextMetricsA( IN HDC, IN UINT, OUT LPOUTLINETEXTMETRICA);
+WINGDIAPI UINT APIENTRY GetOutlineTextMetricsW( IN HDC, IN UINT, OUT LPOUTLINETEXTMETRICW);
+#ifdef UNICODE
+#define GetOutlineTextMetrics  GetOutlineTextMetricsW
+#else
+#define GetOutlineTextMetrics  GetOutlineTextMetricsA
+#endif // !UNICODE
+
+#endif /* NOTEXTMETRIC */
+
+WINGDIAPI UINT  WINAPI GetPaletteEntries( IN HPALETTE, IN UINT, IN UINT, OUT LPPALETTEENTRY);
+WINGDIAPI COLORREF WINAPI GetPixel( IN HDC, IN int, IN int);
+WINGDIAPI int   WINAPI GetPixelFormat( IN HDC);
+WINGDIAPI int   WINAPI GetPolyFillMode( IN HDC);
+WINGDIAPI BOOL  WINAPI GetRasterizerCaps( OUT LPRASTERIZER_STATUS, IN UINT);
+WINGDIAPI int   WINAPI GetRandomRgn (IN HDC, IN HRGN, IN INT);
+WINGDIAPI DWORD WINAPI GetRegionData( IN HRGN, IN DWORD,  OUT LPRGNDATA);
+WINGDIAPI int   WINAPI GetRgnBox( IN HRGN,  OUT LPRECT);
+WINGDIAPI HGDIOBJ WINAPI GetStockObject( IN int);
+WINGDIAPI int   WINAPI GetStretchBltMode( IN HDC);
+WINGDIAPI UINT  WINAPI GetSystemPaletteEntries( IN HDC, IN UINT, IN UINT, OUT LPPALETTEENTRY);
+WINGDIAPI UINT  WINAPI GetSystemPaletteUse( IN HDC);
+WINGDIAPI int   WINAPI GetTextCharacterExtra( IN HDC);
+WINGDIAPI UINT  WINAPI GetTextAlign( IN HDC);
+WINGDIAPI COLORREF WINAPI GetTextColor( IN HDC);
+
+WINGDIAPI BOOL  APIENTRY GetTextExtentPointA(
+                    IN HDC,
+                    IN LPCSTR,
+                    IN int,
+                    OUT LPSIZE
+                    );
+WINGDIAPI BOOL  APIENTRY GetTextExtentPointW(
+                    IN HDC,
+                    IN LPCWSTR,
+                    IN int,
+                    OUT LPSIZE
+                    );
+#ifdef UNICODE
+#define GetTextExtentPoint  GetTextExtentPointW
+#else
+#define GetTextExtentPoint  GetTextExtentPointA
+#endif // !UNICODE
+
+WINGDIAPI BOOL  APIENTRY GetTextExtentPoint32A(
+                    IN HDC,
+                    IN LPCSTR,
+                    IN int,
+                    OUT LPSIZE
+                    );
+WINGDIAPI BOOL  APIENTRY GetTextExtentPoint32W(
+                    IN HDC,
+                    IN LPCWSTR,
+                    IN int,
+                    OUT LPSIZE
+                    );
+#ifdef UNICODE
+#define GetTextExtentPoint32  GetTextExtentPoint32W
+#else
+#define GetTextExtentPoint32  GetTextExtentPoint32A
+#endif // !UNICODE
+
+WINGDIAPI BOOL  APIENTRY GetTextExtentExPointA(
+                    IN HDC,
+                    IN LPCSTR,
+                    IN int,
+                    IN int,
+                    OUT LPINT,
+                    OUT LPINT,
+                    OUT LPSIZE
+                    );
+WINGDIAPI BOOL  APIENTRY GetTextExtentExPointW(
+                    IN HDC,
+                    IN LPCWSTR,
+                    IN int,
+                    IN int,
+                    OUT LPINT,
+                    OUT LPINT,
+                    OUT LPSIZE
+                    );
+#ifdef UNICODE
+#define GetTextExtentExPoint  GetTextExtentExPointW
+#else
+#define GetTextExtentExPoint  GetTextExtentExPointA
+#endif // !UNICODE
+#if(WINVER >= 0x0400)
+WINGDIAPI int WINAPI GetTextCharset( IN HDC hdc);
+WINGDIAPI int WINAPI GetTextCharsetInfo( IN HDC hdc, OUT LPFONTSIGNATURE lpSig, IN DWORD dwFlags);
+WINGDIAPI BOOL WINAPI TranslateCharsetInfo( IN OUT DWORD FAR *lpSrc,  OUT LPCHARSETINFO lpCs, IN DWORD dwFlags);
+WINGDIAPI DWORD WINAPI GetFontLanguageInfo( IN HDC );
+WINGDIAPI DWORD WINAPI GetCharacterPlacementA(  IN HDC, IN LPCSTR, IN int, IN int, IN OUT LPGCP_RESULTSA, IN DWORD);
+WINGDIAPI DWORD WINAPI GetCharacterPlacementW(  IN HDC, IN LPCWSTR, IN int, IN int, IN OUT LPGCP_RESULTSW, IN DWORD);
+#ifdef UNICODE
+#define GetCharacterPlacement  GetCharacterPlacementW
+#else
+#define GetCharacterPlacement  GetCharacterPlacementA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0500)
+
+typedef struct tagWCRANGE
+{
+    WCHAR  wcLow;
+    USHORT cGlyphs;
+} WCRANGE, *PWCRANGE,FAR *LPWCRANGE;
+
+
+typedef struct tagGLYPHSET
+{
+    DWORD    cbThis;
+    DWORD    flAccel;
+    DWORD    cGlyphsSupported;
+    DWORD    cRanges;
+    WCRANGE  ranges[1];
+} GLYPHSET, *PGLYPHSET, FAR *LPGLYPHSET;
+
+/* flAccel flags for the GLYPHSET structure above */
+
+#define GS_8BIT_INDICES     0x00000001
+
+/* flags for GetGlyphIndices */
+
+#define GGI_MARK_NONEXISTING_GLYPHS  0X0001
+
+WINGDIAPI DWORD WINAPI GetFontUnicodeRanges( IN HDC, OUT LPGLYPHSET);
+WINGDIAPI DWORD WINAPI GetGlyphIndicesA( IN HDC, IN LPCSTR, IN int, OUT LPWORD, IN DWORD);
+WINGDIAPI DWORD WINAPI GetGlyphIndicesW( IN HDC, IN LPCWSTR, IN int, OUT LPWORD, IN DWORD);
+#ifdef UNICODE
+#define GetGlyphIndices  GetGlyphIndicesW
+#else
+#define GetGlyphIndices  GetGlyphIndicesA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI GetTextExtentPointI( IN HDC, IN LPWORD, IN int, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI GetTextExtentExPointI( IN HDC, IN LPWORD, IN int, IN int, OUT LPINT, OUT LPINT, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI GetCharWidthI( IN HDC, IN UINT, IN UINT, IN LPWORD, OUT LPINT);
+WINGDIAPI BOOL  WINAPI GetCharABCWidthsI( IN HDC, IN UINT, IN UINT, IN LPWORD, OUT LPABC);
+
+#define STAMP_DESIGNVECTOR  (0x8000000 + 'd' + ('v' << 8))
+#define STAMP_AXESLIST      (0x8000000 + 'a' + ('l' << 8))
+#define MM_MAX_NUMAXES      16
+
+
+
+typedef struct tagDESIGNVECTOR
+{
+    DWORD  dvReserved;
+    DWORD  dvNumAxes;
+    LONG   dvValues[MM_MAX_NUMAXES];
+} DESIGNVECTOR, *PDESIGNVECTOR, FAR *LPDESIGNVECTOR;
+
+WINGDIAPI int  WINAPI AddFontResourceExA( IN LPCSTR, IN DWORD, IN PVOID);
+WINGDIAPI int  WINAPI AddFontResourceExW( IN LPCWSTR, IN DWORD, IN PVOID);
+#ifdef UNICODE
+#define AddFontResourceEx  AddFontResourceExW
+#else
+#define AddFontResourceEx  AddFontResourceExA
+#endif // !UNICODE
+WINGDIAPI BOOL WINAPI RemoveFontResourceExA( IN LPCSTR, IN DWORD, IN PVOID);
+WINGDIAPI BOOL WINAPI RemoveFontResourceExW( IN LPCWSTR, IN DWORD, IN PVOID);
+#ifdef UNICODE
+#define RemoveFontResourceEx  RemoveFontResourceExW
+#else
+#define RemoveFontResourceEx  RemoveFontResourceExA
+#endif // !UNICODE
+WINGDIAPI HANDLE WINAPI AddFontMemResourceEx( IN PVOID, IN DWORD, IN PVOID , IN DWORD*);
+WINGDIAPI BOOL WINAPI RemoveFontMemResourceEx( IN HANDLE);
+#define FR_PRIVATE     0x10
+#define FR_NOT_ENUM    0x20
+
+// The actual size of the DESIGNVECTOR and ENUMLOGFONTEXDV structures
+// is determined by dvNumAxes,
+// MM_MAX_NUMAXES only detemines the maximal size allowed
+
+#define MM_MAX_AXES_NAMELEN 16
+
+typedef struct tagAXISINFOA
+{
+    LONG   axMinValue;
+    LONG   axMaxValue;
+    BYTE   axAxisName[MM_MAX_AXES_NAMELEN];
+} AXISINFOA, *PAXISINFOA, FAR *LPAXISINFOA;
+typedef struct tagAXISINFOW
+{
+    LONG   axMinValue;
+    LONG   axMaxValue;
+    WCHAR  axAxisName[MM_MAX_AXES_NAMELEN];
+} AXISINFOW, *PAXISINFOW, FAR *LPAXISINFOW;
+#ifdef UNICODE
+typedef AXISINFOW AXISINFO;
+typedef PAXISINFOW PAXISINFO;
+typedef LPAXISINFOW LPAXISINFO;
+#else
+typedef AXISINFOA AXISINFO;
+typedef PAXISINFOA PAXISINFO;
+typedef LPAXISINFOA LPAXISINFO;
+#endif // UNICODE
+
+typedef struct tagAXESLISTA
+{
+    DWORD     axlReserved;
+    DWORD     axlNumAxes;
+    AXISINFOA axlAxisInfo[MM_MAX_NUMAXES];
+} AXESLISTA, *PAXESLISTA, FAR *LPAXESLISTA;
+typedef struct tagAXESLISTW
+{
+    DWORD     axlReserved;
+    DWORD     axlNumAxes;
+    AXISINFOW axlAxisInfo[MM_MAX_NUMAXES];
+} AXESLISTW, *PAXESLISTW, FAR *LPAXESLISTW;
+#ifdef UNICODE
+typedef AXESLISTW AXESLIST;
+typedef PAXESLISTW PAXESLIST;
+typedef LPAXESLISTW LPAXESLIST;
+#else
+typedef AXESLISTA AXESLIST;
+typedef PAXESLISTA PAXESLIST;
+typedef LPAXESLISTA LPAXESLIST;
+#endif // UNICODE
+
+// The actual size of the AXESLIST and ENUMTEXTMETRIC structure is
+// determined by axlNumAxes,
+// MM_MAX_NUMAXES only detemines the maximal size allowed
+
+typedef struct tagENUMLOGFONTEXDVA
+{
+    ENUMLOGFONTEXA elfEnumLogfontEx;
+    DESIGNVECTOR   elfDesignVector;
+} ENUMLOGFONTEXDVA, *PENUMLOGFONTEXDVA, FAR *LPENUMLOGFONTEXDVA;
+typedef struct tagENUMLOGFONTEXDVW
+{
+    ENUMLOGFONTEXW elfEnumLogfontEx;
+    DESIGNVECTOR   elfDesignVector;
+} ENUMLOGFONTEXDVW, *PENUMLOGFONTEXDVW, FAR *LPENUMLOGFONTEXDVW;
+#ifdef UNICODE
+typedef ENUMLOGFONTEXDVW ENUMLOGFONTEXDV;
+typedef PENUMLOGFONTEXDVW PENUMLOGFONTEXDV;
+typedef LPENUMLOGFONTEXDVW LPENUMLOGFONTEXDV;
+#else
+typedef ENUMLOGFONTEXDVA ENUMLOGFONTEXDV;
+typedef PENUMLOGFONTEXDVA PENUMLOGFONTEXDV;
+typedef LPENUMLOGFONTEXDVA LPENUMLOGFONTEXDV;
+#endif // UNICODE
+
+WINGDIAPI HFONT  WINAPI CreateFontIndirectExA( IN CONST ENUMLOGFONTEXDVA *);
+WINGDIAPI HFONT  WINAPI CreateFontIndirectExW( IN CONST ENUMLOGFONTEXDVW *);
+#ifdef UNICODE
+#define CreateFontIndirectEx  CreateFontIndirectExW
+#else
+#define CreateFontIndirectEx  CreateFontIndirectExA
+#endif // !UNICODE
+
+#ifndef NOTEXTMETRIC
+typedef struct tagENUMTEXTMETRICA
+{
+    NEWTEXTMETRICEXA etmNewTextMetricEx;
+    AXESLISTA        etmAxesList;
+} ENUMTEXTMETRICA, *PENUMTEXTMETRICA, FAR *LPENUMTEXTMETRICA;
+typedef struct tagENUMTEXTMETRICW
+{
+    NEWTEXTMETRICEXW etmNewTextMetricEx;
+    AXESLISTW        etmAxesList;
+} ENUMTEXTMETRICW, *PENUMTEXTMETRICW, FAR *LPENUMTEXTMETRICW;
+#ifdef UNICODE
+typedef ENUMTEXTMETRICW ENUMTEXTMETRIC;
+typedef PENUMTEXTMETRICW PENUMTEXTMETRIC;
+typedef LPENUMTEXTMETRICW LPENUMTEXTMETRIC;
+#else
+typedef ENUMTEXTMETRICA ENUMTEXTMETRIC;
+typedef PENUMTEXTMETRICA PENUMTEXTMETRIC;
+typedef LPENUMTEXTMETRICA LPENUMTEXTMETRIC;
+#endif // UNICODE
+#endif /* NOTEXTMETRIC */
+
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+WINGDIAPI BOOL  WINAPI GetViewportExtEx( IN HDC, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI GetViewportOrgEx( IN HDC, OUT LPPOINT);
+WINGDIAPI BOOL  WINAPI GetWindowExtEx( IN HDC, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI GetWindowOrgEx( IN HDC, OUT LPPOINT);
+
+WINGDIAPI int  WINAPI IntersectClipRect( IN HDC, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL WINAPI InvertRgn( IN HDC, IN HRGN);
+WINGDIAPI BOOL WINAPI LineDDA( IN int, IN int, IN int, IN int, IN LINEDDAPROC, IN LPARAM);
+WINGDIAPI BOOL WINAPI LineTo( IN HDC, IN int, IN int);
+WINGDIAPI BOOL WINAPI MaskBlt( IN HDC, IN int, IN int, IN int, IN int,
+              IN HDC, IN int, IN int, IN HBITMAP, IN int, IN int, IN DWORD);
+WINGDIAPI BOOL WINAPI PlgBlt( IN HDC, IN CONST POINT *, IN HDC, IN int, IN int, IN int,
+                     IN int, IN HBITMAP, IN int, IN int);
+
+WINGDIAPI int  WINAPI OffsetClipRgn(IN HDC, IN int, IN int);
+WINGDIAPI int  WINAPI OffsetRgn(IN HRGN, IN int, IN int);
+WINGDIAPI BOOL WINAPI PatBlt(IN HDC, IN int, IN int, IN int, IN int, IN DWORD);
+WINGDIAPI BOOL WINAPI Pie(IN HDC, IN int, IN int, IN int, IN int, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL WINAPI PlayMetaFile(IN HDC, IN HMETAFILE);
+WINGDIAPI BOOL WINAPI PaintRgn(IN HDC, IN HRGN);
+WINGDIAPI BOOL WINAPI PolyPolygon(IN HDC, IN CONST POINT *, IN CONST INT *, IN int);
+WINGDIAPI BOOL WINAPI PtInRegion(IN HRGN, IN int, IN int);
+WINGDIAPI BOOL WINAPI PtVisible(IN HDC, IN int, IN int);
+WINGDIAPI BOOL WINAPI RectInRegion(IN HRGN, IN CONST RECT *);
+WINGDIAPI BOOL WINAPI RectVisible(IN HDC, IN CONST RECT *);
+WINGDIAPI BOOL WINAPI Rectangle(IN HDC, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL WINAPI RestoreDC(IN HDC, IN int);
+WINGDIAPI HDC  WINAPI ResetDCA(IN HDC, IN CONST DEVMODEA *);
+WINGDIAPI HDC  WINAPI ResetDCW(IN HDC, IN CONST DEVMODEW *);
+#ifdef UNICODE
+#define ResetDC  ResetDCW
+#else
+#define ResetDC  ResetDCA
+#endif // !UNICODE
+WINGDIAPI UINT WINAPI RealizePalette(IN HDC);
+WINGDIAPI BOOL WINAPI RemoveFontResourceA(IN LPCSTR);
+WINGDIAPI BOOL WINAPI RemoveFontResourceW(IN LPCWSTR);
+#ifdef UNICODE
+#define RemoveFontResource  RemoveFontResourceW
+#else
+#define RemoveFontResource  RemoveFontResourceA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI RoundRect(IN HDC, IN int, IN int, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL WINAPI ResizePalette(IN HPALETTE, IN UINT);
+
+WINGDIAPI int  WINAPI SaveDC(IN HDC);
+WINGDIAPI int  WINAPI SelectClipRgn(IN HDC, IN HRGN);
+WINGDIAPI int  WINAPI ExtSelectClipRgn(IN HDC, IN HRGN, IN int);
+WINGDIAPI int  WINAPI SetMetaRgn(IN HDC);
+WINGDIAPI HGDIOBJ WINAPI SelectObject(IN HDC, IN HGDIOBJ);
+WINGDIAPI HPALETTE WINAPI SelectPalette(IN HDC, IN HPALETTE, IN BOOL);
+WINGDIAPI COLORREF WINAPI SetBkColor(IN HDC, IN COLORREF);
+
+#if (_WIN32_WINNT >= 0x0500)
+WINGDIAPI COLORREF WINAPI SetDCBrushColor(IN HDC, IN COLORREF);
+WINGDIAPI COLORREF WINAPI SetDCPenColor(IN HDC, IN COLORREF);
+#endif
+
+
+WINGDIAPI int   WINAPI SetBkMode(IN HDC, IN int);
+WINGDIAPI LONG  WINAPI SetBitmapBits(IN HBITMAP, IN DWORD, IN CONST VOID *);
+
+WINGDIAPI UINT  WINAPI SetBoundsRect(IN HDC, IN CONST RECT *, IN UINT);
+WINGDIAPI int   WINAPI SetDIBits(IN HDC, IN HBITMAP, IN UINT, IN UINT, IN CONST VOID *, IN CONST BITMAPINFO *, IN UINT);
+WINGDIAPI int   WINAPI SetDIBitsToDevice(IN HDC, IN int, IN int, IN DWORD, IN DWORD, IN int,
+        IN int, IN UINT, IN UINT, IN CONST VOID *, IN CONST BITMAPINFO *, IN UINT);
+WINGDIAPI DWORD WINAPI SetMapperFlags(IN HDC, IN DWORD);
+WINGDIAPI int   WINAPI SetGraphicsMode(IN HDC hdc, IN int iMode);
+WINGDIAPI int   WINAPI SetMapMode(IN HDC, IN int);
+
+#if(WINVER >= 0x0500)
+WINGDIAPI DWORD WINAPI SetLayout(IN HDC, IN DWORD);
+WINGDIAPI DWORD WINAPI GetLayout(IN HDC);
+#endif /* WINVER >= 0x0500 */
+
+WINGDIAPI HMETAFILE   WINAPI SetMetaFileBitsEx(IN UINT, IN CONST BYTE *);
+WINGDIAPI UINT  WINAPI SetPaletteEntries(IN HPALETTE, IN UINT, IN UINT, IN CONST PALETTEENTRY *);
+WINGDIAPI COLORREF WINAPI SetPixel(IN HDC, IN int, IN int, IN COLORREF);
+WINGDIAPI BOOL   WINAPI SetPixelV(IN HDC, IN int, IN int, IN COLORREF);
+WINGDIAPI BOOL  WINAPI SetPixelFormat(IN HDC, IN int, IN CONST PIXELFORMATDESCRIPTOR *);
+WINGDIAPI int   WINAPI SetPolyFillMode(IN HDC, IN int);
+WINGDIAPI BOOL   WINAPI StretchBlt(IN HDC, IN int, IN int, IN int, IN int, IN HDC, IN int, IN int, IN int, IN int, IN DWORD);
+WINGDIAPI BOOL   WINAPI SetRectRgn(IN HRGN, IN int, IN int, IN int, IN int);
+WINGDIAPI int   WINAPI StretchDIBits(IN HDC, IN int, IN int, IN int, IN int, IN int, IN int, IN int, IN int, IN CONST
+        VOID *, IN CONST BITMAPINFO *, IN UINT, IN DWORD);
+WINGDIAPI int   WINAPI SetROP2(IN HDC, IN int);
+WINGDIAPI int   WINAPI SetStretchBltMode(IN HDC, IN int);
+WINGDIAPI UINT  WINAPI SetSystemPaletteUse(IN HDC, IN UINT);
+WINGDIAPI int   WINAPI SetTextCharacterExtra(IN HDC, IN int);
+WINGDIAPI COLORREF WINAPI SetTextColor(IN HDC, IN COLORREF);
+WINGDIAPI UINT  WINAPI SetTextAlign(IN HDC, IN UINT);
+WINGDIAPI BOOL  WINAPI SetTextJustification(IN HDC, IN int, IN int);
+WINGDIAPI BOOL  WINAPI UpdateColors(IN HDC);
+
+
+#if (WINVER >= 0x0400)
+
+//
+// image blt
+//
+
+typedef USHORT COLOR16;
+
+typedef struct _TRIVERTEX
+{
+    LONG    x;
+    LONG    y;
+    COLOR16 Red;
+    COLOR16 Green;
+    COLOR16 Blue;
+    COLOR16 Alpha;
+}TRIVERTEX,*PTRIVERTEX,*LPTRIVERTEX;
+
+typedef struct _GRADIENT_TRIANGLE
+{
+    ULONG Vertex1;
+    ULONG Vertex2;
+    ULONG Vertex3;
+} GRADIENT_TRIANGLE,*PGRADIENT_TRIANGLE,*LPGRADIENT_TRIANGLE;
+
+typedef struct _GRADIENT_RECT
+{
+    ULONG UpperLeft;
+    ULONG LowerRight;
+}GRADIENT_RECT,*PGRADIENT_RECT,*LPGRADIENT_RECT;
+
+typedef struct _BLENDFUNCTION
+{
+    BYTE   BlendOp;
+    BYTE   BlendFlags;
+    BYTE   SourceConstantAlpha;
+    BYTE   AlphaFormat;
+}BLENDFUNCTION,*PBLENDFUNCTION;
+
+
+//
+// currentlly defined blend function
+//
+
+#define AC_SRC_OVER                 0x00
+
+//
+// alpha format flags
+//
+
+#define AC_SRC_ALPHA                0x01
+
+WINGDIAPI BOOL  WINAPI AlphaBlend( IN HDC, IN int, IN int, IN int, IN int, IN HDC, IN int, IN int, IN int, IN int, IN BLENDFUNCTION);
+
+WINGDIAPI BOOL  WINAPI TransparentBlt(IN HDC,IN int,IN int,IN int,IN int,IN HDC,IN int,IN int,IN int,IN int,IN UINT);
+
+
+//
+// gradient drawing modes
+//
+
+#define GRADIENT_FILL_RECT_H    0x00000000
+#define GRADIENT_FILL_RECT_V    0x00000001
+#define GRADIENT_FILL_TRIANGLE  0x00000002
+#define GRADIENT_FILL_OP_FLAG   0x000000ff
+
+WINGDIAPI BOOL  WINAPI GradientFill( IN HDC, IN PTRIVERTEX, IN ULONG, IN PVOID, IN ULONG, IN ULONG);
+
+#endif
+
+
+#ifndef NOMETAFILE
+
+WINGDIAPI BOOL  WINAPI PlayMetaFileRecord( IN HDC, IN LPHANDLETABLE, IN LPMETARECORD, IN UINT);
+typedef int (CALLBACK* MFENUMPROC)( IN HDC, IN HANDLETABLE FAR*, IN METARECORD FAR*, IN int, IN LPARAM);
+WINGDIAPI BOOL  WINAPI EnumMetaFile(  IN HDC, IN HMETAFILE, IN MFENUMPROC, IN LPARAM);
+
+typedef int (CALLBACK* ENHMFENUMPROC)(HDC, HANDLETABLE FAR*, CONST ENHMETARECORD *, int, LPARAM);
+
+// Enhanced Metafile Function Declarations
+
+WINGDIAPI HENHMETAFILE WINAPI CloseEnhMetaFile( IN HDC);
+WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileA( IN HENHMETAFILE, IN LPCSTR);
+WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileW( IN HENHMETAFILE, IN LPCWSTR);
+#ifdef UNICODE
+#define CopyEnhMetaFile  CopyEnhMetaFileW
+#else
+#define CopyEnhMetaFile  CopyEnhMetaFileA
+#endif // !UNICODE
+WINGDIAPI HDC   WINAPI CreateEnhMetaFileA( IN HDC, IN LPCSTR, IN CONST RECT *, IN LPCSTR);
+WINGDIAPI HDC   WINAPI CreateEnhMetaFileW( IN HDC, IN LPCWSTR, IN CONST RECT *, IN LPCWSTR);
+#ifdef UNICODE
+#define CreateEnhMetaFile  CreateEnhMetaFileW
+#else
+#define CreateEnhMetaFile  CreateEnhMetaFileA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI DeleteEnhMetaFile( IN HENHMETAFILE);
+WINGDIAPI BOOL  WINAPI EnumEnhMetaFile( IN HDC, IN HENHMETAFILE, IN ENHMFENUMPROC,
+                                        IN LPVOID, IN CONST RECT *);
+WINGDIAPI HENHMETAFILE  WINAPI GetEnhMetaFileA( IN LPCSTR);
+WINGDIAPI HENHMETAFILE  WINAPI GetEnhMetaFileW( IN LPCWSTR);
+#ifdef UNICODE
+#define GetEnhMetaFile  GetEnhMetaFileW
+#else
+#define GetEnhMetaFile  GetEnhMetaFileA
+#endif // !UNICODE
+WINGDIAPI UINT  WINAPI GetEnhMetaFileBits( IN HENHMETAFILE, IN UINT, OUT LPBYTE);
+WINGDIAPI UINT  WINAPI GetEnhMetaFileDescriptionA( IN HENHMETAFILE, IN UINT,  OUT LPSTR );
+WINGDIAPI UINT  WINAPI GetEnhMetaFileDescriptionW( IN HENHMETAFILE, IN UINT,  OUT LPWSTR );
+#ifdef UNICODE
+#define GetEnhMetaFileDescription  GetEnhMetaFileDescriptionW
+#else
+#define GetEnhMetaFileDescription  GetEnhMetaFileDescriptionA
+#endif // !UNICODE
+WINGDIAPI UINT  WINAPI GetEnhMetaFileHeader( IN HENHMETAFILE, IN UINT, OUT LPENHMETAHEADER );
+WINGDIAPI UINT  WINAPI GetEnhMetaFilePaletteEntries( IN HENHMETAFILE, IN UINT, OUT LPPALETTEENTRY );
+WINGDIAPI UINT  WINAPI GetEnhMetaFilePixelFormat( IN HENHMETAFILE, IN UINT,
+                                                  OUT PIXELFORMATDESCRIPTOR *);
+WINGDIAPI UINT  WINAPI GetWinMetaFileBits( IN HENHMETAFILE, IN UINT, OUT LPBYTE, IN INT, IN HDC);
+WINGDIAPI BOOL  WINAPI PlayEnhMetaFile( IN HDC, IN HENHMETAFILE, IN CONST RECT *);
+WINGDIAPI BOOL  WINAPI PlayEnhMetaFileRecord( IN HDC, IN LPHANDLETABLE, IN CONST ENHMETARECORD *, IN UINT);
+WINGDIAPI HENHMETAFILE  WINAPI SetEnhMetaFileBits( IN UINT, IN CONST BYTE *);
+WINGDIAPI HENHMETAFILE  WINAPI SetWinMetaFileBits( IN UINT, IN CONST BYTE *, IN HDC, IN CONST METAFILEPICT *);
+WINGDIAPI BOOL  WINAPI GdiComment( IN HDC, IN UINT, IN CONST BYTE *);
+
+#endif  /* NOMETAFILE */
+
+#ifndef NOTEXTMETRIC
+
+WINGDIAPI BOOL WINAPI GetTextMetricsA( IN HDC, OUT LPTEXTMETRICA);
+WINGDIAPI BOOL WINAPI GetTextMetricsW( IN HDC, OUT LPTEXTMETRICW);
+#ifdef UNICODE
+#define GetTextMetrics  GetTextMetricsW
+#else
+#define GetTextMetrics  GetTextMetricsA
+#endif // !UNICODE
+
+#endif
+
+/* new GDI */
+
+typedef struct tagDIBSECTION {
+    BITMAP              dsBm;
+    BITMAPINFOHEADER    dsBmih;
+    DWORD               dsBitfields[3];
+    HANDLE              dshSection;
+    DWORD               dsOffset;
+} DIBSECTION, FAR *LPDIBSECTION, *PDIBSECTION;
+
+WINGDIAPI BOOL WINAPI AngleArc( IN HDC, IN int, IN int, IN DWORD, IN FLOAT, IN FLOAT);
+WINGDIAPI BOOL WINAPI PolyPolyline( IN HDC, IN CONST POINT *, IN CONST DWORD *, IN DWORD);
+WINGDIAPI BOOL WINAPI GetWorldTransform( IN HDC, OUT LPXFORM);
+WINGDIAPI BOOL WINAPI SetWorldTransform( IN HDC, IN CONST XFORM *);
+WINGDIAPI BOOL WINAPI ModifyWorldTransform( IN HDC, IN CONST XFORM *, IN DWORD);
+WINGDIAPI BOOL WINAPI CombineTransform( OUT LPXFORM, IN CONST XFORM *, IN CONST XFORM *);
+WINGDIAPI HBITMAP WINAPI CreateDIBSection( IN HDC, IN CONST BITMAPINFO *, IN UINT, OUT VOID **, IN HANDLE, IN DWORD);
+WINGDIAPI UINT WINAPI GetDIBColorTable( IN HDC, IN UINT, IN UINT, OUT RGBQUAD *);
+WINGDIAPI UINT WINAPI SetDIBColorTable( IN HDC, IN UINT, IN UINT, IN CONST RGBQUAD *);
+
+/* Flags value for COLORADJUSTMENT */
+#define CA_NEGATIVE                 0x0001
+#define CA_LOG_FILTER               0x0002
+
+/* IlluminantIndex values */
+#define ILLUMINANT_DEVICE_DEFAULT   0
+#define ILLUMINANT_A                1
+#define ILLUMINANT_B                2
+#define ILLUMINANT_C                3
+#define ILLUMINANT_D50              4
+#define ILLUMINANT_D55              5
+#define ILLUMINANT_D65              6
+#define ILLUMINANT_D75              7
+#define ILLUMINANT_F2               8
+#define ILLUMINANT_MAX_INDEX        ILLUMINANT_F2
+
+#define ILLUMINANT_TUNGSTEN         ILLUMINANT_A
+#define ILLUMINANT_DAYLIGHT         ILLUMINANT_C
+#define ILLUMINANT_FLUORESCENT      ILLUMINANT_F2
+#define ILLUMINANT_NTSC             ILLUMINANT_C
+
+/* Min and max for RedGamma, GreenGamma, BlueGamma */
+#define RGB_GAMMA_MIN               (WORD)02500
+#define RGB_GAMMA_MAX               (WORD)65000
+
+/* Min and max for ReferenceBlack and ReferenceWhite */
+#define REFERENCE_WHITE_MIN         (WORD)6000
+#define REFERENCE_WHITE_MAX         (WORD)10000
+#define REFERENCE_BLACK_MIN         (WORD)0
+#define REFERENCE_BLACK_MAX         (WORD)4000
+
+/* Min and max for Contrast, Brightness, Colorfulness, RedGreenTint */
+#define COLOR_ADJ_MIN               (SHORT)-100
+#define COLOR_ADJ_MAX               (SHORT)100
+
+typedef struct  tagCOLORADJUSTMENT {
+    WORD   caSize;
+    WORD   caFlags;
+    WORD   caIlluminantIndex;
+    WORD   caRedGamma;
+    WORD   caGreenGamma;
+    WORD   caBlueGamma;
+    WORD   caReferenceBlack;
+    WORD   caReferenceWhite;
+    SHORT  caContrast;
+    SHORT  caBrightness;
+    SHORT  caColorfulness;
+    SHORT  caRedGreenTint;
+} COLORADJUSTMENT, *PCOLORADJUSTMENT, FAR *LPCOLORADJUSTMENT;
+
+WINGDIAPI BOOL WINAPI SetColorAdjustment( IN HDC, IN CONST COLORADJUSTMENT *);
+WINGDIAPI BOOL WINAPI GetColorAdjustment( IN HDC, OUT LPCOLORADJUSTMENT);
+WINGDIAPI HPALETTE WINAPI CreateHalftonePalette( IN HDC);
+
+#ifdef STRICT
+typedef BOOL (CALLBACK* ABORTPROC)( IN HDC, IN int);
+#else
+typedef FARPROC ABORTPROC;
+#endif
+
+typedef struct _DOCINFOA {
+    int     cbSize;
+    LPCSTR   lpszDocName;
+    LPCSTR   lpszOutput;
+#if (WINVER >= 0x0400)
+    LPCSTR   lpszDatatype;
+    DWORD    fwType;
+#endif /* WINVER */
+} DOCINFOA, *LPDOCINFOA;
+typedef struct _DOCINFOW {
+    int     cbSize;
+    LPCWSTR  lpszDocName;
+    LPCWSTR  lpszOutput;
+#if (WINVER >= 0x0400)
+    LPCWSTR  lpszDatatype;
+    DWORD    fwType;
+#endif /* WINVER */
+} DOCINFOW, *LPDOCINFOW;
+#ifdef UNICODE
+typedef DOCINFOW DOCINFO;
+typedef LPDOCINFOW LPDOCINFO;
+#else
+typedef DOCINFOA DOCINFO;
+typedef LPDOCINFOA LPDOCINFO;
+#endif // UNICODE
+
+#if(WINVER >= 0x0400)
+#define DI_APPBANDING               0x00000001
+#define DI_ROPS_READ_DESTINATION    0x00000002
+#endif /* WINVER >= 0x0400 */
+
+WINGDIAPI int WINAPI StartDocA(IN HDC, IN CONST DOCINFOA *);
+WINGDIAPI int WINAPI StartDocW(IN HDC, IN CONST DOCINFOW *);
+#ifdef UNICODE
+#define StartDoc  StartDocW
+#else
+#define StartDoc  StartDocA
+#endif // !UNICODE
+WINGDIAPI int WINAPI EndDoc(IN HDC);
+WINGDIAPI int WINAPI StartPage(IN HDC);
+WINGDIAPI int WINAPI EndPage(IN HDC);
+WINGDIAPI int WINAPI AbortDoc(IN HDC);
+WINGDIAPI int WINAPI SetAbortProc(IN HDC, IN ABORTPROC);
+
+WINGDIAPI BOOL WINAPI AbortPath(IN HDC);
+WINGDIAPI BOOL WINAPI ArcTo(IN HDC, IN int, IN int, IN int, IN int, IN int, IN int, IN int, IN int);
+WINGDIAPI BOOL WINAPI BeginPath(IN HDC);
+WINGDIAPI BOOL WINAPI CloseFigure(IN HDC);
+WINGDIAPI BOOL WINAPI EndPath(IN HDC);
+WINGDIAPI BOOL WINAPI FillPath(IN HDC);
+WINGDIAPI BOOL WINAPI FlattenPath(IN HDC);
+WINGDIAPI int  WINAPI GetPath(IN HDC, OUT LPPOINT, OUT LPBYTE, IN int);
+WINGDIAPI HRGN WINAPI PathToRegion(IN HDC);
+WINGDIAPI BOOL WINAPI PolyDraw(IN HDC, IN CONST POINT *, IN CONST BYTE *, IN int);
+WINGDIAPI BOOL WINAPI SelectClipPath(IN HDC, IN int);
+WINGDIAPI int  WINAPI SetArcDirection(IN HDC, IN int);
+WINGDIAPI BOOL WINAPI SetMiterLimit(IN HDC, IN FLOAT, OUT PFLOAT);
+WINGDIAPI BOOL WINAPI StrokeAndFillPath(IN HDC);
+WINGDIAPI BOOL WINAPI StrokePath(IN HDC);
+WINGDIAPI BOOL WINAPI WidenPath(IN HDC);
+WINGDIAPI HPEN WINAPI ExtCreatePen(IN DWORD, IN DWORD, IN CONST LOGBRUSH *, IN DWORD, IN CONST DWORD *);
+WINGDIAPI BOOL WINAPI GetMiterLimit(IN HDC, OUT PFLOAT);
+WINGDIAPI int  WINAPI GetArcDirection(IN HDC);
+
+WINGDIAPI int   WINAPI GetObjectA( IN HGDIOBJ, IN int, OUT LPVOID);
+WINGDIAPI int   WINAPI GetObjectW( IN HGDIOBJ, IN int, OUT LPVOID);
+#ifdef UNICODE
+#define GetObject  GetObjectW
+#else
+#define GetObject  GetObjectA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI MoveToEx( IN HDC, IN int, IN int, OUT LPPOINT);
+WINGDIAPI BOOL  WINAPI TextOutA( IN HDC, IN int, IN int, IN LPCSTR, IN int);
+WINGDIAPI BOOL  WINAPI TextOutW( IN HDC, IN int, IN int, IN LPCWSTR, IN int);
+#ifdef UNICODE
+#define TextOut  TextOutW
+#else
+#define TextOut  TextOutA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI ExtTextOutA( IN HDC, IN int, IN int, IN UINT, IN CONST RECT *, IN LPCSTR, IN UINT, IN CONST INT *);
+WINGDIAPI BOOL  WINAPI ExtTextOutW( IN HDC, IN int, IN int, IN UINT, IN CONST RECT *, IN LPCWSTR, IN UINT, IN CONST INT *);
+#ifdef UNICODE
+#define ExtTextOut  ExtTextOutW
+#else
+#define ExtTextOut  ExtTextOutA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI PolyTextOutA( IN HDC, IN CONST POLYTEXTA *, IN int);
+WINGDIAPI BOOL  WINAPI PolyTextOutW( IN HDC, IN CONST POLYTEXTW *, IN int);
+#ifdef UNICODE
+#define PolyTextOut  PolyTextOutW
+#else
+#define PolyTextOut  PolyTextOutA
+#endif // !UNICODE
+
+WINGDIAPI HRGN  WINAPI CreatePolygonRgn( IN CONST POINT *, IN int, IN int);
+WINGDIAPI BOOL  WINAPI DPtoLP( IN HDC, IN OUT LPPOINT, IN int);
+WINGDIAPI BOOL  WINAPI LPtoDP( IN HDC, IN OUT LPPOINT, IN int);
+WINGDIAPI BOOL  WINAPI Polygon( IN HDC, IN CONST POINT *, IN int);
+WINGDIAPI BOOL  WINAPI Polyline( IN HDC, IN CONST POINT *, IN int);
+
+WINGDIAPI BOOL  WINAPI PolyBezier( IN HDC, IN CONST POINT *, IN DWORD);
+WINGDIAPI BOOL  WINAPI PolyBezierTo( IN HDC, IN CONST POINT *, IN DWORD);
+WINGDIAPI BOOL  WINAPI PolylineTo( IN HDC, IN CONST POINT *, IN DWORD);
+
+WINGDIAPI BOOL  WINAPI SetViewportExtEx( IN HDC, IN int, IN int, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI SetViewportOrgEx( IN HDC, IN int, IN int, OUT LPPOINT);
+WINGDIAPI BOOL  WINAPI SetWindowExtEx( IN HDC, IN int, IN int, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI SetWindowOrgEx( IN HDC, IN int, IN int, OUT LPPOINT);
+
+WINGDIAPI BOOL  WINAPI OffsetViewportOrgEx( IN HDC, IN int, IN int, OUT LPPOINT);
+WINGDIAPI BOOL  WINAPI OffsetWindowOrgEx( IN HDC, IN int, IN int, OUT LPPOINT);
+WINGDIAPI BOOL  WINAPI ScaleViewportExtEx( IN HDC, IN int, IN int, IN int, IN int, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI ScaleWindowExtEx( IN HDC, IN int, IN int, IN int, IN int, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI SetBitmapDimensionEx( IN HBITMAP, IN int, IN int, OUT LPSIZE);
+WINGDIAPI BOOL  WINAPI SetBrushOrgEx( IN HDC, IN int, IN int, OUT LPPOINT);
+
+WINGDIAPI int   WINAPI GetTextFaceA( IN HDC, IN int, OUT LPSTR);
+WINGDIAPI int   WINAPI GetTextFaceW( IN HDC, IN int, OUT LPWSTR);
+#ifdef UNICODE
+#define GetTextFace  GetTextFaceW
+#else
+#define GetTextFace  GetTextFaceA
+#endif // !UNICODE
+
+#define FONTMAPPER_MAX 10
+
+typedef struct tagKERNINGPAIR {
+   WORD wFirst;
+   WORD wSecond;
+   int  iKernAmount;
+} KERNINGPAIR, *LPKERNINGPAIR;
+
+WINGDIAPI DWORD WINAPI GetKerningPairsA( IN HDC, IN DWORD, OUT LPKERNINGPAIR);
+WINGDIAPI DWORD WINAPI GetKerningPairsW( IN HDC, IN DWORD, OUT LPKERNINGPAIR);
+#ifdef UNICODE
+#define GetKerningPairs  GetKerningPairsW
+#else
+#define GetKerningPairs  GetKerningPairsA
+#endif // !UNICODE
+
+WINGDIAPI BOOL  WINAPI GetDCOrgEx( IN HDC, OUT LPPOINT);
+WINGDIAPI BOOL  WINAPI FixBrushOrgEx( IN HDC, IN int, IN int, IN LPPOINT);
+WINGDIAPI BOOL  WINAPI UnrealizeObject( IN HGDIOBJ);
+
+WINGDIAPI BOOL  WINAPI GdiFlush();
+WINGDIAPI DWORD WINAPI GdiSetBatchLimit( IN DWORD);
+WINGDIAPI DWORD WINAPI GdiGetBatchLimit();
+
+
+#if(WINVER >= 0x0400)
+
+#define ICM_OFF               1
+#define ICM_ON                2
+#define ICM_QUERY             3
+#define ICM_DONE_OUTSIDEDC    4
+
+typedef int (CALLBACK* ICMENUMPROCA)(LPSTR, LPARAM);
+typedef int (CALLBACK* ICMENUMPROCW)(LPWSTR, LPARAM);
+#ifdef UNICODE
+#define ICMENUMPROC  ICMENUMPROCW
+#else
+#define ICMENUMPROC  ICMENUMPROCA
+#endif // !UNICODE
+
+WINGDIAPI int         WINAPI SetICMMode( IN HDC, IN int);
+WINGDIAPI BOOL        WINAPI CheckColorsInGamut( IN HDC, IN LPVOID, OUT LPVOID, IN DWORD);
+WINGDIAPI HCOLORSPACE WINAPI GetColorSpace( IN HDC);
+WINGDIAPI BOOL        WINAPI GetLogColorSpaceA( IN HCOLORSPACE, OUT LPLOGCOLORSPACEA, IN DWORD);
+WINGDIAPI BOOL        WINAPI GetLogColorSpaceW( IN HCOLORSPACE, OUT LPLOGCOLORSPACEW, IN DWORD);
+#ifdef UNICODE
+#define GetLogColorSpace  GetLogColorSpaceW
+#else
+#define GetLogColorSpace  GetLogColorSpaceA
+#endif // !UNICODE
+WINGDIAPI HCOLORSPACE WINAPI CreateColorSpaceA( IN LPLOGCOLORSPACEA);
+WINGDIAPI HCOLORSPACE WINAPI CreateColorSpaceW( IN LPLOGCOLORSPACEW);
+#ifdef UNICODE
+#define CreateColorSpace  CreateColorSpaceW
+#else
+#define CreateColorSpace  CreateColorSpaceA
+#endif // !UNICODE
+WINGDIAPI HCOLORSPACE WINAPI SetColorSpace( IN HDC, IN HCOLORSPACE);
+WINGDIAPI BOOL        WINAPI DeleteColorSpace( IN HCOLORSPACE);
+WINGDIAPI BOOL        WINAPI GetICMProfileA( IN HDC, IN OUT LPDWORD, OUT LPSTR);
+WINGDIAPI BOOL        WINAPI GetICMProfileW( IN HDC, IN OUT LPDWORD, OUT LPWSTR);
+#ifdef UNICODE
+#define GetICMProfile  GetICMProfileW
+#else
+#define GetICMProfile  GetICMProfileA
+#endif // !UNICODE
+WINGDIAPI BOOL        WINAPI SetICMProfileA( IN HDC, IN LPSTR);
+WINGDIAPI BOOL        WINAPI SetICMProfileW( IN HDC, IN LPWSTR);
+#ifdef UNICODE
+#define SetICMProfile  SetICMProfileW
+#else
+#define SetICMProfile  SetICMProfileA
+#endif // !UNICODE
+WINGDIAPI BOOL        WINAPI GetDeviceGammaRamp( IN HDC, OUT LPVOID);
+WINGDIAPI BOOL        WINAPI SetDeviceGammaRamp( IN HDC, IN LPVOID);
+WINGDIAPI BOOL        WINAPI ColorMatchToTarget( IN HDC, IN HDC, IN DWORD);
+WINGDIAPI int         WINAPI EnumICMProfilesA( IN HDC, IN ICMENUMPROCA, IN LPARAM);
+WINGDIAPI int         WINAPI EnumICMProfilesW( IN HDC, IN ICMENUMPROCW, IN LPARAM);
+#ifdef UNICODE
+#define EnumICMProfiles  EnumICMProfilesW
+#else
+#define EnumICMProfiles  EnumICMProfilesA
+#endif // !UNICODE
+WINGDIAPI BOOL        WINAPI UpdateICMRegKeyA( IN DWORD, IN LPSTR, IN LPSTR, IN UINT);
+WINGDIAPI BOOL        WINAPI UpdateICMRegKeyW( IN DWORD, IN LPWSTR, IN LPWSTR, IN UINT);
+#ifdef UNICODE
+#define UpdateICMRegKey  UpdateICMRegKeyW
+#else
+#define UpdateICMRegKey  UpdateICMRegKeyA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+#if (WINVER >= 0x0500)
+WINGDIAPI BOOL        WINAPI ColorCorrectPalette( IN HDC, IN HPALETTE, IN DWORD, IN DWORD);
+#endif
+
+#ifndef NOMETAFILE
+
+// Enhanced metafile constants.
+
+#ifndef _MAC
+#define ENHMETA_SIGNATURE       0x464D4520
+#else
+#define ENHMETA_SIGNATURE       0x20454D46
+#endif
+
+// Stock object flag used in the object handle index in the enhanced
+// metafile records.
+// E.g. The object handle index (META_STOCK_OBJECT | BLACK_BRUSH)
+// represents the stock object BLACK_BRUSH.
+
+#define ENHMETA_STOCK_OBJECT    0x80000000
+
+// Enhanced metafile record types.
+
+#define EMR_HEADER                      1
+#define EMR_POLYBEZIER                  2
+#define EMR_POLYGON                     3
+#define EMR_POLYLINE                    4
+#define EMR_POLYBEZIERTO                5
+#define EMR_POLYLINETO                  6
+#define EMR_POLYPOLYLINE                7
+#define EMR_POLYPOLYGON                 8
+#define EMR_SETWINDOWEXTEX              9
+#define EMR_SETWINDOWORGEX              10
+#define EMR_SETVIEWPORTEXTEX            11
+#define EMR_SETVIEWPORTORGEX            12
+#define EMR_SETBRUSHORGEX               13
+#define EMR_EOF                         14
+#define EMR_SETPIXELV                   15
+#define EMR_SETMAPPERFLAGS              16
+#define EMR_SETMAPMODE                  17
+#define EMR_SETBKMODE                   18
+#define EMR_SETPOLYFILLMODE             19
+#define EMR_SETROP2                     20
+#define EMR_SETSTRETCHBLTMODE           21
+#define EMR_SETTEXTALIGN                22
+#define EMR_SETCOLORADJUSTMENT          23
+#define EMR_SETTEXTCOLOR                24
+#define EMR_SETBKCOLOR                  25
+#define EMR_OFFSETCLIPRGN               26
+#define EMR_MOVETOEX                    27
+#define EMR_SETMETARGN                  28
+#define EMR_EXCLUDECLIPRECT             29
+#define EMR_INTERSECTCLIPRECT           30
+#define EMR_SCALEVIEWPORTEXTEX          31
+#define EMR_SCALEWINDOWEXTEX            32
+#define EMR_SAVEDC                      33
+#define EMR_RESTOREDC                   34
+#define EMR_SETWORLDTRANSFORM           35
+#define EMR_MODIFYWORLDTRANSFORM        36
+#define EMR_SELECTOBJECT                37
+#define EMR_CREATEPEN                   38
+#define EMR_CREATEBRUSHINDIRECT         39
+#define EMR_DELETEOBJECT                40
+#define EMR_ANGLEARC                    41
+#define EMR_ELLIPSE                     42
+#define EMR_RECTANGLE                   43
+#define EMR_ROUNDRECT                   44
+#define EMR_ARC                         45
+#define EMR_CHORD                       46
+#define EMR_PIE                         47
+#define EMR_SELECTPALETTE               48
+#define EMR_CREATEPALETTE               49
+#define EMR_SETPALETTEENTRIES           50
+#define EMR_RESIZEPALETTE               51
+#define EMR_REALIZEPALETTE              52
+#define EMR_EXTFLOODFILL                53
+#define EMR_LINETO                      54
+#define EMR_ARCTO                       55
+#define EMR_POLYDRAW                    56
+#define EMR_SETARCDIRECTION             57
+#define EMR_SETMITERLIMIT               58
+#define EMR_BEGINPATH                   59
+#define EMR_ENDPATH                     60
+#define EMR_CLOSEFIGURE                 61
+#define EMR_FILLPATH                    62
+#define EMR_STROKEANDFILLPATH           63
+#define EMR_STROKEPATH                  64
+#define EMR_FLATTENPATH                 65
+#define EMR_WIDENPATH                   66
+#define EMR_SELECTCLIPPATH              67
+#define EMR_ABORTPATH                   68
+
+#define EMR_GDICOMMENT                  70
+#define EMR_FILLRGN                     71
+#define EMR_FRAMERGN                    72
+#define EMR_INVERTRGN                   73
+#define EMR_PAINTRGN                    74
+#define EMR_EXTSELECTCLIPRGN            75
+#define EMR_BITBLT                      76
+#define EMR_STRETCHBLT                  77
+#define EMR_MASKBLT                     78
+#define EMR_PLGBLT                      79
+#define EMR_SETDIBITSTODEVICE           80
+#define EMR_STRETCHDIBITS               81
+#define EMR_EXTCREATEFONTINDIRECTW      82
+#define EMR_EXTTEXTOUTA                 83
+#define EMR_EXTTEXTOUTW                 84
+#define EMR_POLYBEZIER16                85
+#define EMR_POLYGON16                   86
+#define EMR_POLYLINE16                  87
+#define EMR_POLYBEZIERTO16              88
+#define EMR_POLYLINETO16                89
+#define EMR_POLYPOLYLINE16              90
+#define EMR_POLYPOLYGON16               91
+#define EMR_POLYDRAW16                  92
+#define EMR_CREATEMONOBRUSH             93
+#define EMR_CREATEDIBPATTERNBRUSHPT     94
+#define EMR_EXTCREATEPEN                95
+#define EMR_POLYTEXTOUTA                96
+#define EMR_POLYTEXTOUTW                97
+
+#if(WINVER >= 0x0400)
+#define EMR_SETICMMODE                  98
+#define EMR_CREATECOLORSPACE            99
+#define EMR_SETCOLORSPACE              100
+#define EMR_DELETECOLORSPACE           101
+#define EMR_GLSRECORD                  102
+#define EMR_GLSBOUNDEDRECORD           103
+#define EMR_PIXELFORMAT                104
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define EMR_RESERVED_105               105
+#define EMR_RESERVED_106               106
+#define EMR_RESERVED_107               107
+#define EMR_RESERVED_108               108
+#define EMR_RESERVED_109               109
+#define EMR_RESERVED_110               110
+#define EMR_COLORCORRECTPALETTE        111
+#define EMR_SETICMPROFILEA             112
+#define EMR_SETICMPROFILEW             113
+#define EMR_ALPHABLEND                 114
+#define EMR_SETLAYOUT                  115
+#define EMR_TRANSPARENTBLT             116
+#define EMR_RESERVED_117               117
+#define EMR_GRADIENTFILL               118
+#define EMR_RESERVED_119               119
+#define EMR_RESERVED_120               120
+#define EMR_COLORMATCHTOTARGETW        121
+#define EMR_CREATECOLORSPACEW          122
+#endif /* WINVER >= 0x0500 */
+
+#define EMR_MIN                          1
+
+#if (WINVER >= 0x0500)
+#define EMR_MAX                        122
+#elif (WINVER >= 0x0400)
+#define EMR_MAX                        104
+#else
+#define EMR_MAX                         97
+#endif
+
+// Base record type for the enhanced metafile.
+
+typedef struct tagEMR
+{
+    DWORD   iType;              // Enhanced metafile record type
+    DWORD   nSize;              // Length of the record in bytes.
+                                // This must be a multiple of 4.
+} EMR, *PEMR;
+
+// Base text record type for the enhanced metafile.
+
+typedef struct tagEMRTEXT
+{
+    POINTL  ptlReference;
+    DWORD   nChars;
+    DWORD   offString;          // Offset to the string
+    DWORD   fOptions;
+    RECTL   rcl;
+    DWORD   offDx;              // Offset to the inter-character spacing array.
+                                // This is always given.
+} EMRTEXT, *PEMRTEXT;
+
+// Record structures for the enhanced metafile.
+
+typedef struct tagABORTPATH
+{
+    EMR     emr;
+} EMRABORTPATH,      *PEMRABORTPATH,
+  EMRBEGINPATH,      *PEMRBEGINPATH,
+  EMRENDPATH,        *PEMRENDPATH,
+  EMRCLOSEFIGURE,    *PEMRCLOSEFIGURE,
+  EMRFLATTENPATH,    *PEMRFLATTENPATH,
+  EMRWIDENPATH,      *PEMRWIDENPATH,
+  EMRSETMETARGN,     *PEMRSETMETARGN,
+  EMRSAVEDC,         *PEMRSAVEDC,
+  EMRREALIZEPALETTE, *PEMRREALIZEPALETTE;
+
+typedef struct tagEMRSELECTCLIPPATH
+{
+    EMR     emr;
+    DWORD   iMode;
+} EMRSELECTCLIPPATH,    *PEMRSELECTCLIPPATH,
+  EMRSETBKMODE,         *PEMRSETBKMODE,
+  EMRSETMAPMODE,        *PEMRSETMAPMODE,
+#if(WINVER >= 0x0500)
+  EMRSETLAYOUT,         *PEMRSETLAYOUT,
+#endif /* WINVER >= 0x0500 */
+  EMRSETPOLYFILLMODE,   *PEMRSETPOLYFILLMODE,
+  EMRSETROP2,           *PEMRSETROP2,
+  EMRSETSTRETCHBLTMODE, *PEMRSETSTRETCHBLTMODE,
+  EMRSETICMMODE,        *PEMRSETICMMODE,
+  EMRSETTEXTALIGN,      *PEMRSETTEXTALIGN;
+
+typedef struct tagEMRSETMITERLIMIT
+{
+    EMR     emr;
+    FLOAT   eMiterLimit;
+} EMRSETMITERLIMIT, *PEMRSETMITERLIMIT;
+
+typedef struct tagEMRRESTOREDC
+{
+    EMR     emr;
+    LONG    iRelative;          // Specifies a relative instance
+} EMRRESTOREDC, *PEMRRESTOREDC;
+
+typedef struct tagEMRSETARCDIRECTION
+{
+    EMR     emr;
+    DWORD   iArcDirection;      // Specifies the arc direction in the
+                                // advanced graphics mode.
+} EMRSETARCDIRECTION, *PEMRSETARCDIRECTION;
+
+typedef struct tagEMRSETMAPPERFLAGS
+{
+    EMR     emr;
+    DWORD   dwFlags;
+} EMRSETMAPPERFLAGS, *PEMRSETMAPPERFLAGS;
+
+typedef struct tagEMRSETTEXTCOLOR
+{
+    EMR     emr;
+    COLORREF crColor;
+} EMRSETBKCOLOR,   *PEMRSETBKCOLOR,
+  EMRSETTEXTCOLOR, *PEMRSETTEXTCOLOR;
+
+typedef struct tagEMRSELECTOBJECT
+{
+    EMR     emr;
+    DWORD   ihObject;           // Object handle index
+} EMRSELECTOBJECT, *PEMRSELECTOBJECT,
+  EMRDELETEOBJECT, *PEMRDELETEOBJECT;
+
+typedef struct tagEMRSELECTPALETTE
+{
+    EMR     emr;
+    DWORD   ihPal;              // Palette handle index, background mode only
+} EMRSELECTPALETTE, *PEMRSELECTPALETTE;
+
+typedef struct tagEMRRESIZEPALETTE
+{
+    EMR     emr;
+    DWORD   ihPal;              // Palette handle index
+    DWORD   cEntries;
+} EMRRESIZEPALETTE, *PEMRRESIZEPALETTE;
+
+typedef struct tagEMRSETPALETTEENTRIES
+{
+    EMR     emr;
+    DWORD   ihPal;              // Palette handle index
+    DWORD   iStart;
+    DWORD   cEntries;
+    PALETTEENTRY aPalEntries[1];// The peFlags fields do not contain any flags
+} EMRSETPALETTEENTRIES, *PEMRSETPALETTEENTRIES;
+
+typedef struct tagEMRSETCOLORADJUSTMENT
+{
+    EMR     emr;
+    COLORADJUSTMENT ColorAdjustment;
+} EMRSETCOLORADJUSTMENT, *PEMRSETCOLORADJUSTMENT;
+
+typedef struct tagEMRGDICOMMENT
+{
+    EMR     emr;
+    DWORD   cbData;             // Size of data in bytes
+    BYTE    Data[1];
+} EMRGDICOMMENT, *PEMRGDICOMMENT;
+
+typedef struct tagEMREOF
+{
+    EMR     emr;
+    DWORD   nPalEntries;        // Number of palette entries
+    DWORD   offPalEntries;      // Offset to the palette entries
+    DWORD   nSizeLast;          // Same as nSize and must be the last DWORD
+                                // of the record.  The palette entries,
+                                // if exist, precede this field.
+} EMREOF, *PEMREOF;
+
+typedef struct tagEMRLINETO
+{
+    EMR     emr;
+    POINTL  ptl;
+} EMRLINETO,   *PEMRLINETO,
+  EMRMOVETOEX, *PEMRMOVETOEX;
+
+typedef struct tagEMROFFSETCLIPRGN
+{
+    EMR     emr;
+    POINTL  ptlOffset;
+} EMROFFSETCLIPRGN, *PEMROFFSETCLIPRGN;
+
+typedef struct tagEMRFILLPATH
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+} EMRFILLPATH,          *PEMRFILLPATH,
+  EMRSTROKEANDFILLPATH, *PEMRSTROKEANDFILLPATH,
+  EMRSTROKEPATH,        *PEMRSTROKEPATH;
+
+typedef struct tagEMREXCLUDECLIPRECT
+{
+    EMR     emr;
+    RECTL   rclClip;
+} EMREXCLUDECLIPRECT,   *PEMREXCLUDECLIPRECT,
+  EMRINTERSECTCLIPRECT, *PEMRINTERSECTCLIPRECT;
+
+typedef struct tagEMRSETVIEWPORTORGEX
+{
+    EMR     emr;
+    POINTL  ptlOrigin;
+} EMRSETVIEWPORTORGEX, *PEMRSETVIEWPORTORGEX,
+  EMRSETWINDOWORGEX,   *PEMRSETWINDOWORGEX,
+  EMRSETBRUSHORGEX,    *PEMRSETBRUSHORGEX;
+
+typedef struct tagEMRSETVIEWPORTEXTEX
+{
+    EMR     emr;
+    SIZEL   szlExtent;
+} EMRSETVIEWPORTEXTEX, *PEMRSETVIEWPORTEXTEX,
+  EMRSETWINDOWEXTEX,   *PEMRSETWINDOWEXTEX;
+
+typedef struct tagEMRSCALEVIEWPORTEXTEX
+{
+    EMR     emr;
+    LONG    xNum;
+    LONG    xDenom;
+    LONG    yNum;
+    LONG    yDenom;
+} EMRSCALEVIEWPORTEXTEX, *PEMRSCALEVIEWPORTEXTEX,
+  EMRSCALEWINDOWEXTEX,   *PEMRSCALEWINDOWEXTEX;
+
+typedef struct tagEMRSETWORLDTRANSFORM
+{
+    EMR     emr;
+    XFORM   xform;
+} EMRSETWORLDTRANSFORM, *PEMRSETWORLDTRANSFORM;
+
+typedef struct tagEMRMODIFYWORLDTRANSFORM
+{
+    EMR     emr;
+    XFORM   xform;
+    DWORD   iMode;
+} EMRMODIFYWORLDTRANSFORM, *PEMRMODIFYWORLDTRANSFORM;
+
+typedef struct tagEMRSETPIXELV
+{
+    EMR     emr;
+    POINTL  ptlPixel;
+    COLORREF crColor;
+} EMRSETPIXELV, *PEMRSETPIXELV;
+
+typedef struct tagEMREXTFLOODFILL
+{
+    EMR     emr;
+    POINTL  ptlStart;
+    COLORREF crColor;
+    DWORD   iMode;
+} EMREXTFLOODFILL, *PEMREXTFLOODFILL;
+
+typedef struct tagEMRELLIPSE
+{
+    EMR     emr;
+    RECTL   rclBox;             // Inclusive-inclusive bounding rectangle
+} EMRELLIPSE,  *PEMRELLIPSE,
+  EMRRECTANGLE, *PEMRRECTANGLE;
+
+
+typedef struct tagEMRROUNDRECT
+{
+    EMR     emr;
+    RECTL   rclBox;             // Inclusive-inclusive bounding rectangle
+    SIZEL   szlCorner;
+} EMRROUNDRECT, *PEMRROUNDRECT;
+
+typedef struct tagEMRARC
+{
+    EMR     emr;
+    RECTL   rclBox;             // Inclusive-inclusive bounding rectangle
+    POINTL  ptlStart;
+    POINTL  ptlEnd;
+} EMRARC,   *PEMRARC,
+  EMRARCTO, *PEMRARCTO,
+  EMRCHORD, *PEMRCHORD,
+  EMRPIE,   *PEMRPIE;
+
+typedef struct tagEMRANGLEARC
+{
+    EMR     emr;
+    POINTL  ptlCenter;
+    DWORD   nRadius;
+    FLOAT   eStartAngle;
+    FLOAT   eSweepAngle;
+} EMRANGLEARC, *PEMRANGLEARC;
+
+typedef struct tagEMRPOLYLINE
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cptl;
+    POINTL  aptl[1];
+} EMRPOLYLINE,     *PEMRPOLYLINE,
+  EMRPOLYBEZIER,   *PEMRPOLYBEZIER,
+  EMRPOLYGON,      *PEMRPOLYGON,
+  EMRPOLYBEZIERTO, *PEMRPOLYBEZIERTO,
+  EMRPOLYLINETO,   *PEMRPOLYLINETO;
+
+typedef struct tagEMRPOLYLINE16
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cpts;
+    POINTS  apts[1];
+} EMRPOLYLINE16,     *PEMRPOLYLINE16,
+  EMRPOLYBEZIER16,   *PEMRPOLYBEZIER16,
+  EMRPOLYGON16,      *PEMRPOLYGON16,
+  EMRPOLYBEZIERTO16, *PEMRPOLYBEZIERTO16,
+  EMRPOLYLINETO16,   *PEMRPOLYLINETO16;
+
+typedef struct tagEMRPOLYDRAW
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cptl;               // Number of points
+    POINTL  aptl[1];            // Array of points
+    BYTE    abTypes[1];         // Array of point types
+} EMRPOLYDRAW, *PEMRPOLYDRAW;
+
+typedef struct tagEMRPOLYDRAW16
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cpts;               // Number of points
+    POINTS  apts[1];            // Array of points
+    BYTE    abTypes[1];         // Array of point types
+} EMRPOLYDRAW16, *PEMRPOLYDRAW16;
+
+typedef struct tagEMRPOLYPOLYLINE
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   nPolys;             // Number of polys
+    DWORD   cptl;               // Total number of points in all polys
+    DWORD   aPolyCounts[1];     // Array of point counts for each poly
+    POINTL  aptl[1];            // Array of points
+} EMRPOLYPOLYLINE, *PEMRPOLYPOLYLINE,
+  EMRPOLYPOLYGON,  *PEMRPOLYPOLYGON;
+
+typedef struct tagEMRPOLYPOLYLINE16
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   nPolys;             // Number of polys
+    DWORD   cpts;               // Total number of points in all polys
+    DWORD   aPolyCounts[1];     // Array of point counts for each poly
+    POINTS  apts[1];            // Array of points
+} EMRPOLYPOLYLINE16, *PEMRPOLYPOLYLINE16,
+  EMRPOLYPOLYGON16,  *PEMRPOLYPOLYGON16;
+
+typedef struct tagEMRINVERTRGN
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cbRgnData;          // Size of region data in bytes
+    BYTE    RgnData[1];
+} EMRINVERTRGN, *PEMRINVERTRGN,
+  EMRPAINTRGN,  *PEMRPAINTRGN;
+
+typedef struct tagEMRFILLRGN
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cbRgnData;          // Size of region data in bytes
+    DWORD   ihBrush;            // Brush handle index
+    BYTE    RgnData[1];
+} EMRFILLRGN, *PEMRFILLRGN;
+
+typedef struct tagEMRFRAMERGN
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   cbRgnData;          // Size of region data in bytes
+    DWORD   ihBrush;            // Brush handle index
+    SIZEL   szlStroke;
+    BYTE    RgnData[1];
+} EMRFRAMERGN, *PEMRFRAMERGN;
+
+typedef struct tagEMREXTSELECTCLIPRGN
+{
+    EMR     emr;
+    DWORD   cbRgnData;          // Size of region data in bytes
+    DWORD   iMode;
+    BYTE    RgnData[1];
+} EMREXTSELECTCLIPRGN, *PEMREXTSELECTCLIPRGN;
+
+typedef struct tagEMREXTTEXTOUTA
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   iGraphicsMode;      // Current graphics mode
+    FLOAT   exScale;            // X and Y scales from Page units to .01mm units
+    FLOAT   eyScale;            //   if graphics mode is GM_COMPATIBLE.
+    EMRTEXT emrtext;            // This is followed by the string and spacing
+                                // array
+} EMREXTTEXTOUTA, *PEMREXTTEXTOUTA,
+  EMREXTTEXTOUTW, *PEMREXTTEXTOUTW;
+
+typedef struct tagEMRPOLYTEXTOUTA
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD   iGraphicsMode;      // Current graphics mode
+    FLOAT   exScale;            // X and Y scales from Page units to .01mm units
+    FLOAT   eyScale;            //   if graphics mode is GM_COMPATIBLE.
+    LONG    cStrings;
+    EMRTEXT aemrtext[1];        // Array of EMRTEXT structures.  This is
+                                // followed by the strings and spacing arrays.
+} EMRPOLYTEXTOUTA, *PEMRPOLYTEXTOUTA,
+  EMRPOLYTEXTOUTW, *PEMRPOLYTEXTOUTW;
+
+typedef struct tagEMRBITBLT
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    cxDest;
+    LONG    cyDest;
+    DWORD   dwRop;
+    LONG    xSrc;
+    LONG    ySrc;
+    XFORM   xformSrc;           // Source DC transform
+    COLORREF crBkColorSrc;      // Source DC BkColor in RGB
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+                                // (DIB_RGB_COLORS)
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+} EMRBITBLT, *PEMRBITBLT;
+
+typedef struct tagEMRSTRETCHBLT
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    cxDest;
+    LONG    cyDest;
+    DWORD   dwRop;
+    LONG    xSrc;
+    LONG    ySrc;
+    XFORM   xformSrc;           // Source DC transform
+    COLORREF crBkColorSrc;      // Source DC BkColor in RGB
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+                                // (DIB_RGB_COLORS)
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    LONG    cxSrc;
+    LONG    cySrc;
+} EMRSTRETCHBLT, *PEMRSTRETCHBLT;
+
+typedef struct tagEMRMASKBLT
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    cxDest;
+    LONG    cyDest;
+    DWORD   dwRop;
+    LONG    xSrc;
+    LONG    ySrc;
+    XFORM   xformSrc;           // Source DC transform
+    COLORREF crBkColorSrc;      // Source DC BkColor in RGB
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+                                // (DIB_RGB_COLORS)
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    LONG    xMask;
+    LONG    yMask;
+    DWORD   iUsageMask;         // Mask bitmap info color table usage
+    DWORD   offBmiMask;         // Offset to the mask BITMAPINFO structure if any
+    DWORD   cbBmiMask;          // Size of the mask BITMAPINFO structure if any
+    DWORD   offBitsMask;        // Offset to the mask bitmap bits if any
+    DWORD   cbBitsMask;         // Size of the mask bitmap bits if any
+} EMRMASKBLT, *PEMRMASKBLT;
+
+typedef struct tagEMRPLGBLT
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    POINTL  aptlDest[3];
+    LONG    xSrc;
+    LONG    ySrc;
+    LONG    cxSrc;
+    LONG    cySrc;
+    XFORM   xformSrc;           // Source DC transform
+    COLORREF crBkColorSrc;      // Source DC BkColor in RGB
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+                                // (DIB_RGB_COLORS)
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    LONG    xMask;
+    LONG    yMask;
+    DWORD   iUsageMask;         // Mask bitmap info color table usage
+    DWORD   offBmiMask;         // Offset to the mask BITMAPINFO structure if any
+    DWORD   cbBmiMask;          // Size of the mask BITMAPINFO structure if any
+    DWORD   offBitsMask;        // Offset to the mask bitmap bits if any
+    DWORD   cbBitsMask;         // Size of the mask bitmap bits if any
+} EMRPLGBLT, *PEMRPLGBLT;
+
+typedef struct tagEMRSETDIBITSTODEVICE
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    xSrc;
+    LONG    ySrc;
+    LONG    cxSrc;
+    LONG    cySrc;
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+    DWORD   iStartScan;
+    DWORD   cScans;
+} EMRSETDIBITSTODEVICE, *PEMRSETDIBITSTODEVICE;
+
+typedef struct tagEMRSTRETCHDIBITS
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    xSrc;
+    LONG    ySrc;
+    LONG    cxSrc;
+    LONG    cySrc;
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+    DWORD   dwRop;
+    LONG    cxDest;
+    LONG    cyDest;
+} EMRSTRETCHDIBITS, *PEMRSTRETCHDIBITS;
+
+typedef struct tagEMREXTCREATEFONTINDIRECTW
+{
+    EMR     emr;
+    DWORD   ihFont;             // Font handle index
+    EXTLOGFONTW elfw;
+} EMREXTCREATEFONTINDIRECTW, *PEMREXTCREATEFONTINDIRECTW;
+
+typedef struct tagEMRCREATEPALETTE
+{
+    EMR     emr;
+    DWORD   ihPal;              // Palette handle index
+    LOGPALETTE lgpl;            // The peFlags fields in the palette entries
+                                // do not contain any flags
+} EMRCREATEPALETTE, *PEMRCREATEPALETTE;
+
+typedef struct tagEMRCREATEPEN
+{
+    EMR     emr;
+    DWORD   ihPen;              // Pen handle index
+    LOGPEN  lopn;
+} EMRCREATEPEN, *PEMRCREATEPEN;
+
+typedef struct tagEMREXTCREATEPEN
+{
+    EMR     emr;
+    DWORD   ihPen;              // Pen handle index
+    DWORD   offBmi;             // Offset to the BITMAPINFO structure if any
+    DWORD   cbBmi;              // Size of the BITMAPINFO structure if any
+                                // The bitmap info is followed by the bitmap
+                                // bits to form a packed DIB.
+    DWORD   offBits;            // Offset to the brush bitmap bits if any
+    DWORD   cbBits;             // Size of the brush bitmap bits if any
+    EXTLOGPEN elp;              // The extended pen with the style array.
+} EMREXTCREATEPEN, *PEMREXTCREATEPEN;
+
+typedef struct tagEMRCREATEBRUSHINDIRECT
+{
+    EMR        emr;
+    DWORD      ihBrush;          // Brush handle index
+    LOGBRUSH32 lb;               // The style must be BS_SOLID, BS_HOLLOW,
+                                 // BS_NULL or BS_HATCHED.
+} EMRCREATEBRUSHINDIRECT, *PEMRCREATEBRUSHINDIRECT;
+
+typedef struct tagEMRCREATEMONOBRUSH
+{
+    EMR     emr;
+    DWORD   ihBrush;            // Brush handle index
+    DWORD   iUsage;             // Bitmap info color table usage
+    DWORD   offBmi;             // Offset to the BITMAPINFO structure
+    DWORD   cbBmi;              // Size of the BITMAPINFO structure
+    DWORD   offBits;            // Offset to the bitmap bits
+    DWORD   cbBits;             // Size of the bitmap bits
+} EMRCREATEMONOBRUSH, *PEMRCREATEMONOBRUSH;
+
+typedef struct tagEMRCREATEDIBPATTERNBRUSHPT
+{
+    EMR     emr;
+    DWORD   ihBrush;            // Brush handle index
+    DWORD   iUsage;             // Bitmap info color table usage
+    DWORD   offBmi;             // Offset to the BITMAPINFO structure
+    DWORD   cbBmi;              // Size of the BITMAPINFO structure
+                                // The bitmap info is followed by the bitmap
+                                // bits to form a packed DIB.
+    DWORD   offBits;            // Offset to the bitmap bits
+    DWORD   cbBits;             // Size of the bitmap bits
+} EMRCREATEDIBPATTERNBRUSHPT, *PEMRCREATEDIBPATTERNBRUSHPT;
+
+typedef struct tagEMRFORMAT
+{
+    DWORD   dSignature;         // Format signature, e.g. ENHMETA_SIGNATURE.
+    DWORD   nVersion;           // Format version number.
+    DWORD   cbData;             // Size of data in bytes.
+    DWORD   offData;            // Offset to data from GDICOMMENT_IDENTIFIER.
+                                // It must begin at a DWORD offset.
+} EMRFORMAT, *PEMRFORMAT;
+
+#if(WINVER >= 0x0400)
+
+typedef struct tagEMRGLSRECORD
+{
+    EMR     emr;
+    DWORD   cbData;             // Size of data in bytes
+    BYTE    Data[1];
+} EMRGLSRECORD, *PEMRGLSRECORD;
+
+typedef struct tagEMRGLSBOUNDEDRECORD
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Bounds in recording coordinates
+    DWORD   cbData;             // Size of data in bytes
+    BYTE    Data[1];
+} EMRGLSBOUNDEDRECORD, *PEMRGLSBOUNDEDRECORD;
+
+typedef struct tagEMRPIXELFORMAT
+{
+    EMR     emr;
+    PIXELFORMATDESCRIPTOR pfd;
+} EMRPIXELFORMAT, *PEMRPIXELFORMAT;
+
+typedef struct tagEMRCREATECOLORSPACE
+{
+    EMR             emr;
+    DWORD           ihCS;       // ColorSpace handle index
+    LOGCOLORSPACEA  lcs;        // Ansi version of LOGCOLORSPACE
+} EMRCREATECOLORSPACE, *PEMRCREATECOLORSPACE;
+
+typedef struct tagEMRSETCOLORSPACE
+{
+    EMR     emr;
+    DWORD   ihCS;               // ColorSpace handle index
+} EMRSETCOLORSPACE,    *PEMRSETCOLORSPACE,
+  EMRSELECTCOLORSPACE, *PEMRSELECTCOLORSPACE,
+  EMRDELETECOLORSPACE, *PEMRDELETECOLORSPACE;
+
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+
+typedef struct tagEMREXTESCAPE
+{
+    EMR     emr;
+    INT     iEscape;            // Escape code
+    INT     cbEscData;          // Size of escape data
+    BYTE    EscData[1];         // Escape data
+} EMREXTESCAPE,  *PEMREXTESCAPE,
+  EMRDRAWESCAPE, *PEMRDRAWESCAPE;
+
+typedef struct tagEMRNAMEDESCAPE
+{
+    EMR     emr;
+    INT     iEscape;            // Escape code
+    INT     cbDriver;           // Size of driver name
+    INT     cbEscData;          // Size of escape data
+    BYTE    EscData[1];         // Driver name and Escape data
+} EMRNAMEDESCAPE, *PEMRNAMEDESCAPE;
+
+#define SETICMPROFILE_EMBEDED           0x00000001
+
+typedef struct tagEMRSETICMPROFILE
+{
+    EMR     emr;
+    DWORD   dwFlags;            // flags
+    DWORD   cbName;             // Size of desired profile name
+    DWORD   cbData;             // Size of raw profile data if attached
+    BYTE    Data[1];            // Array size is cbName + cbData
+} EMRSETICMPROFILE,  *PEMRSETICMPROFILE,
+  EMRSETICMPROFILEA, *PEMRSETICMPROFILEA,
+  EMRSETICMPROFILEW, *PEMRSETICMPROFILEW;
+
+#define CREATECOLORSPACE_EMBEDED        0x00000001
+
+typedef struct tagEMRCREATECOLORSPACEW
+{
+    EMR             emr;
+    DWORD           ihCS;       // ColorSpace handle index
+    LOGCOLORSPACEW  lcs;        // Unicode version of logical color space structure
+    DWORD           dwFlags;    // flags
+    DWORD           cbData;     // size of raw source profile data if attached
+    BYTE            Data[1];    // Array size is cbData
+} EMRCREATECOLORSPACEW, *PEMRCREATECOLORSPACEW;
+
+#define COLORMATCHTOTARGET_EMBEDED      0x00000001
+
+typedef struct tagCOLORMATCHTOTARGET
+{
+    EMR     emr;
+    DWORD   dwAction;           // CS_ENABLE, CS_DISABLE or CS_DELETE_TRANSFORM
+    DWORD   dwFlags;            // flags
+    DWORD   cbName;             // Size of desired target profile name
+    DWORD   cbData;             // Size of raw target profile data if attached
+    BYTE    Data[1];            // Array size is cbName + cbData
+} EMRCOLORMATCHTOTARGET, *PEMRCOLORMATCHTOTARGET;
+
+typedef struct tagCOLORCORRECTPALETTE
+{
+    EMR     emr;
+    DWORD   ihPalette;          // Palette handle index
+    DWORD   nFirstEntry;        // Index of first entry to correct
+    DWORD   nPalEntries;        // Number of palette entries to correct
+    DWORD   nReserved;          // Reserved
+} EMRCOLORCORRECTPALETTE, *PEMRCOLORCORRECTPALETTE;
+
+typedef struct tagEMRALPHABLEND
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    cxDest;
+    LONG    cyDest;
+    DWORD   dwRop;
+    LONG    xSrc;
+    LONG    ySrc;
+    XFORM   xformSrc;           // Source DC transform
+    COLORREF crBkColorSrc;      // Source DC BkColor in RGB
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+                                // (DIB_RGB_COLORS)
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    LONG    cxSrc;
+    LONG    cySrc;
+} EMRALPHABLEND, *PEMRALPHABLEND;
+
+typedef struct tagEMRGRADIENTFILL
+{
+    EMR       emr;
+    RECTL     rclBounds;          // Inclusive-inclusive bounds in device units
+    DWORD     nVer;
+    DWORD     nTri;
+    ULONG     ulMode;
+    TRIVERTEX Ver[1];
+}EMRGRADIENTFILL,*PEMRGRADIENTFILL;
+
+typedef struct tagEMRTRANSPARENTBLT
+{
+    EMR     emr;
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    LONG    xDest;
+    LONG    yDest;
+    LONG    cxDest;
+    LONG    cyDest;
+    DWORD   dwRop;
+    LONG    xSrc;
+    LONG    ySrc;
+    XFORM   xformSrc;           // Source DC transform
+    COLORREF crBkColorSrc;      // Source DC BkColor in RGB
+    DWORD   iUsageSrc;          // Source bitmap info color table usage
+                                // (DIB_RGB_COLORS)
+    DWORD   offBmiSrc;          // Offset to the source BITMAPINFO structure
+    DWORD   cbBmiSrc;           // Size of the source BITMAPINFO structure
+    DWORD   offBitsSrc;         // Offset to the source bitmap bits
+    DWORD   cbBitsSrc;          // Size of the source bitmap bits
+    LONG    cxSrc;
+    LONG    cySrc;
+} EMRTRANSPARENTBLT, *PEMRTRANSPARENTBLT;
+
+
+#endif /* WINVER >= 0x0500 */
+
+#define GDICOMMENT_IDENTIFIER           0x43494447
+#define GDICOMMENT_WINDOWS_METAFILE     0x80000001
+#define GDICOMMENT_BEGINGROUP           0x00000002
+#define GDICOMMENT_ENDGROUP             0x00000003
+#define GDICOMMENT_MULTIFORMATS         0x40000004
+#define EPS_SIGNATURE                   0x46535045
+#define GDICOMMENT_UNICODE_STRING       0x00000040
+#define GDICOMMENT_UNICODE_END          0x00000080
+
+#endif  /* NOMETAFILE */
+
+
+// OpenGL wgl prototypes
+
+WINGDIAPI BOOL  WINAPI wglCopyContext(HGLRC, HGLRC, UINT);
+WINGDIAPI HGLRC WINAPI wglCreateContext(HDC);
+WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC, int);
+WINGDIAPI BOOL  WINAPI wglDeleteContext(HGLRC);
+WINGDIAPI HGLRC WINAPI wglGetCurrentContext(VOID);
+WINGDIAPI HDC   WINAPI wglGetCurrentDC(VOID);
+WINGDIAPI PROC  WINAPI wglGetProcAddress(LPCSTR);
+WINGDIAPI BOOL  WINAPI wglMakeCurrent(HDC, HGLRC);
+WINGDIAPI BOOL  WINAPI wglShareLists(HGLRC, HGLRC);
+WINGDIAPI BOOL  WINAPI wglUseFontBitmapsA(HDC, DWORD, DWORD, DWORD);
+WINGDIAPI BOOL  WINAPI wglUseFontBitmapsW(HDC, DWORD, DWORD, DWORD);
+#ifdef UNICODE
+#define wglUseFontBitmaps  wglUseFontBitmapsW
+#else
+#define wglUseFontBitmaps  wglUseFontBitmapsA
+#endif // !UNICODE
+WINGDIAPI BOOL  WINAPI SwapBuffers(HDC);
+
+typedef struct _POINTFLOAT {
+    FLOAT   x;
+    FLOAT   y;
+} POINTFLOAT, *PPOINTFLOAT;
+
+typedef struct _GLYPHMETRICSFLOAT {
+    FLOAT       gmfBlackBoxX;
+    FLOAT       gmfBlackBoxY;
+    POINTFLOAT  gmfptGlyphOrigin;
+    FLOAT       gmfCellIncX;
+    FLOAT       gmfCellIncY;
+} GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, FAR *LPGLYPHMETRICSFLOAT;
+
+#define WGL_FONT_LINES      0
+#define WGL_FONT_POLYGONS   1
+WINGDIAPI BOOL  WINAPI wglUseFontOutlinesA(HDC, DWORD, DWORD, DWORD, FLOAT,
+                                           FLOAT, int, LPGLYPHMETRICSFLOAT);
+WINGDIAPI BOOL  WINAPI wglUseFontOutlinesW(HDC, DWORD, DWORD, DWORD, FLOAT,
+                                           FLOAT, int, LPGLYPHMETRICSFLOAT);
+#ifdef UNICODE
+#define wglUseFontOutlines  wglUseFontOutlinesW
+#else
+#define wglUseFontOutlines  wglUseFontOutlinesA
+#endif // !UNICODE
+
+/* Layer plane descriptor */
+typedef struct tagLAYERPLANEDESCRIPTOR { // lpd
+    WORD  nSize;
+    WORD  nVersion;
+    DWORD dwFlags;
+    BYTE  iPixelType;
+    BYTE  cColorBits;
+    BYTE  cRedBits;
+    BYTE  cRedShift;
+    BYTE  cGreenBits;
+    BYTE  cGreenShift;
+    BYTE  cBlueBits;
+    BYTE  cBlueShift;
+    BYTE  cAlphaBits;
+    BYTE  cAlphaShift;
+    BYTE  cAccumBits;
+    BYTE  cAccumRedBits;
+    BYTE  cAccumGreenBits;
+    BYTE  cAccumBlueBits;
+    BYTE  cAccumAlphaBits;
+    BYTE  cDepthBits;
+    BYTE  cStencilBits;
+    BYTE  cAuxBuffers;
+    BYTE  iLayerPlane;
+    BYTE  bReserved;
+    COLORREF crTransparent;
+} LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, FAR *LPLAYERPLANEDESCRIPTOR;
+
+/* LAYERPLANEDESCRIPTOR flags */
+#define LPD_DOUBLEBUFFER        0x00000001
+#define LPD_STEREO              0x00000002
+#define LPD_SUPPORT_GDI         0x00000010
+#define LPD_SUPPORT_OPENGL      0x00000020
+#define LPD_SHARE_DEPTH         0x00000040
+#define LPD_SHARE_STENCIL       0x00000080
+#define LPD_SHARE_ACCUM         0x00000100
+#define LPD_SWAP_EXCHANGE       0x00000200
+#define LPD_SWAP_COPY           0x00000400
+#define LPD_TRANSPARENT         0x00001000
+
+#define LPD_TYPE_RGBA        0
+#define LPD_TYPE_COLORINDEX  1
+
+/* wglSwapLayerBuffers flags */
+#define WGL_SWAP_MAIN_PLANE     0x00000001
+#define WGL_SWAP_OVERLAY1       0x00000002
+#define WGL_SWAP_OVERLAY2       0x00000004
+#define WGL_SWAP_OVERLAY3       0x00000008
+#define WGL_SWAP_OVERLAY4       0x00000010
+#define WGL_SWAP_OVERLAY5       0x00000020
+#define WGL_SWAP_OVERLAY6       0x00000040
+#define WGL_SWAP_OVERLAY7       0x00000080
+#define WGL_SWAP_OVERLAY8       0x00000100
+#define WGL_SWAP_OVERLAY9       0x00000200
+#define WGL_SWAP_OVERLAY10      0x00000400
+#define WGL_SWAP_OVERLAY11      0x00000800
+#define WGL_SWAP_OVERLAY12      0x00001000
+#define WGL_SWAP_OVERLAY13      0x00002000
+#define WGL_SWAP_OVERLAY14      0x00004000
+#define WGL_SWAP_OVERLAY15      0x00008000
+#define WGL_SWAP_UNDERLAY1      0x00010000
+#define WGL_SWAP_UNDERLAY2      0x00020000
+#define WGL_SWAP_UNDERLAY3      0x00040000
+#define WGL_SWAP_UNDERLAY4      0x00080000
+#define WGL_SWAP_UNDERLAY5      0x00100000
+#define WGL_SWAP_UNDERLAY6      0x00200000
+#define WGL_SWAP_UNDERLAY7      0x00400000
+#define WGL_SWAP_UNDERLAY8      0x00800000
+#define WGL_SWAP_UNDERLAY9      0x01000000
+#define WGL_SWAP_UNDERLAY10     0x02000000
+#define WGL_SWAP_UNDERLAY11     0x04000000
+#define WGL_SWAP_UNDERLAY12     0x08000000
+#define WGL_SWAP_UNDERLAY13     0x10000000
+#define WGL_SWAP_UNDERLAY14     0x20000000
+#define WGL_SWAP_UNDERLAY15     0x40000000
+
+WINGDIAPI BOOL  WINAPI wglDescribeLayerPlane(HDC, int, int, UINT,
+                                             LPLAYERPLANEDESCRIPTOR);
+WINGDIAPI int   WINAPI wglSetLayerPaletteEntries(HDC, int, int, int,
+                                                 CONST COLORREF *);
+WINGDIAPI int   WINAPI wglGetLayerPaletteEntries(HDC, int, int, int,
+                                                 COLORREF *);
+WINGDIAPI BOOL  WINAPI wglRealizeLayerPalette(HDC, int, BOOL);
+WINGDIAPI BOOL  WINAPI wglSwapLayerBuffers(HDC, UINT);
+
+#if (WINVER >= 0x0500)
+
+typedef struct _WGLSWAP
+{
+    HDC hdc;
+    UINT uiFlags;
+} WGLSWAP, *PWGLSWAP, FAR *LPWGLSWAP;
+
+#define WGL_SWAPMULTIPLE_MAX 16
+
+WINGDIAPI DWORD WINAPI wglSwapMultipleBuffers(UINT, CONST WGLSWAP *);
+
+#endif // (WINVER >= 0x0500)
+
+#endif /* NOGDI */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _WINGDI_ */
+
diff --git a/base/Windows/Inc/WinIoCtl.h b/base/Windows/Inc/WinIoCtl.h
new file mode 100644
index 0000000..02c79bb
--- /dev/null
+++ b/base/Windows/Inc/WinIoCtl.h
@@ -0,0 +1,3481 @@
+/*++ BUILD Version: 0015    // Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    winioctl.h
+
+Abstract:
+
+    This module defines the 32-Bit Windows Device I/O control codes.
+
+Revision History:
+
+--*/
+
+
+//
+// Device interface class GUIDs.
+//
+// need these GUIDs outside conditional includes so that user can
+//   #include <winioctl.h> in precompiled header
+//   #include <initguid.h> in a single source file
+//   #include <winioctl.h> in that source file a second time to instantiate the GUIDs
+//
+#ifdef DEFINE_GUID
+//
+// Make sure FAR is defined...
+//
+#ifndef FAR
+#ifdef _WIN32
+#define FAR
+#else
+#define FAR _far
+#endif
+#endif
+
+DEFINE_GUID(GUID_DEVINTERFACE_DISK,                   0x53f56307L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_CDROM,                  0x53f56308L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_PARTITION,              0x53f5630aL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_TAPE,                   0x53f5630bL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_WRITEONCEDISK,          0x53f5630cL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_VOLUME,                 0x53f5630dL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_MEDIUMCHANGER,          0x53f56310L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_FLOPPY,                 0x53f56311L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_CDCHANGER,              0x53f56312L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT,            0x2accfe60L, 0xc130, 0x11d2, 0xb0, 0x82, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
+DEFINE_GUID(GUID_DEVINTERFACE_COMPORT,                0x86e0d1e0L, 0x8089, 0x11d0, 0x9c, 0xe4, 0x08, 0x00, 0x3e, 0x30, 0x1f, 0x73);
+DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);
+
+//
+// Obsolete device interface class GUID names.
+// (use of above GUID_DEVINTERFACE_* names is recommended).
+//
+#define DiskClassGuid               GUID_DEVINTERFACE_DISK
+#define CdRomClassGuid              GUID_DEVINTERFACE_CDROM
+#define PartitionClassGuid          GUID_DEVINTERFACE_PARTITION
+#define TapeClassGuid               GUID_DEVINTERFACE_TAPE
+#define WriteOnceDiskClassGuid      GUID_DEVINTERFACE_WRITEONCEDISK
+#define VolumeClassGuid             GUID_DEVINTERFACE_VOLUME
+#define MediumChangerClassGuid      GUID_DEVINTERFACE_MEDIUMCHANGER
+#define FloppyClassGuid             GUID_DEVINTERFACE_FLOPPY
+#define CdChangerClassGuid          GUID_DEVINTERFACE_CDCHANGER
+#define StoragePortClassGuid        GUID_DEVINTERFACE_STORAGEPORT
+#define GUID_CLASS_COMPORT          GUID_DEVINTERFACE_COMPORT
+#define GUID_SERENUM_BUS_ENUMERATOR GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR
+
+#endif // DEFINE_GUID
+
+#ifndef _WINIOCTL_
+#define _WINIOCTL_
+
+
+#ifndef _DEVIOCTL_
+#define _DEVIOCTL_
+
+// begin_ntddk begin_wdm begin_nthal begin_ntifs
+//
+// Define the various device type values.  Note that values used by Microsoft
+// Corporation are in the range 0-32767, and 32768-65535 are reserved for use
+// by customers.
+//
+
+#define DEVICE_TYPE DWORD
+
+#define FILE_DEVICE_BEEP                0x00000001
+#define FILE_DEVICE_CD_ROM              0x00000002
+#define FILE_DEVICE_CD_ROM_FILE_SYSTEM  0x00000003
+#define FILE_DEVICE_CONTROLLER          0x00000004
+#define FILE_DEVICE_DATALINK            0x00000005
+#define FILE_DEVICE_DFS                 0x00000006
+#define FILE_DEVICE_DISK                0x00000007
+#define FILE_DEVICE_DISK_FILE_SYSTEM    0x00000008
+#define FILE_DEVICE_FILE_SYSTEM         0x00000009
+#define FILE_DEVICE_INPORT_PORT         0x0000000a
+#define FILE_DEVICE_KEYBOARD            0x0000000b
+#define FILE_DEVICE_MAILSLOT            0x0000000c
+#define FILE_DEVICE_MIDI_IN             0x0000000d
+#define FILE_DEVICE_MIDI_OUT            0x0000000e
+#define FILE_DEVICE_MOUSE               0x0000000f
+#define FILE_DEVICE_MULTI_UNC_PROVIDER  0x00000010
+#define FILE_DEVICE_NAMED_PIPE          0x00000011
+#define FILE_DEVICE_NETWORK             0x00000012
+#define FILE_DEVICE_NETWORK_BROWSER     0x00000013
+#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014
+#define FILE_DEVICE_NULL                0x00000015
+#define FILE_DEVICE_PARALLEL_PORT       0x00000016
+#define FILE_DEVICE_PHYSICAL_NETCARD    0x00000017
+#define FILE_DEVICE_PRINTER             0x00000018
+#define FILE_DEVICE_SCANNER             0x00000019
+#define FILE_DEVICE_SERIAL_MOUSE_PORT   0x0000001a
+#define FILE_DEVICE_SERIAL_PORT         0x0000001b
+#define FILE_DEVICE_SCREEN              0x0000001c
+#define FILE_DEVICE_SOUND               0x0000001d
+#define FILE_DEVICE_STREAMS             0x0000001e
+#define FILE_DEVICE_TAPE                0x0000001f
+#define FILE_DEVICE_TAPE_FILE_SYSTEM    0x00000020
+#define FILE_DEVICE_TRANSPORT           0x00000021
+#define FILE_DEVICE_UNKNOWN             0x00000022
+#define FILE_DEVICE_VIDEO               0x00000023
+#define FILE_DEVICE_VIRTUAL_DISK        0x00000024
+#define FILE_DEVICE_WAVE_IN             0x00000025
+#define FILE_DEVICE_WAVE_OUT            0x00000026
+#define FILE_DEVICE_8042_PORT           0x00000027
+#define FILE_DEVICE_NETWORK_REDIRECTOR  0x00000028
+#define FILE_DEVICE_BATTERY             0x00000029
+#define FILE_DEVICE_BUS_EXTENDER        0x0000002a
+#define FILE_DEVICE_MODEM               0x0000002b
+#define FILE_DEVICE_VDM                 0x0000002c
+#define FILE_DEVICE_MASS_STORAGE        0x0000002d
+#define FILE_DEVICE_SMB                 0x0000002e
+#define FILE_DEVICE_KS                  0x0000002f
+#define FILE_DEVICE_CHANGER             0x00000030
+#define FILE_DEVICE_SMARTCARD           0x00000031
+#define FILE_DEVICE_ACPI                0x00000032
+#define FILE_DEVICE_DVD                 0x00000033
+#define FILE_DEVICE_FULLSCREEN_VIDEO    0x00000034
+#define FILE_DEVICE_DFS_FILE_SYSTEM     0x00000035
+#define FILE_DEVICE_DFS_VOLUME          0x00000036
+#define FILE_DEVICE_SERENUM             0x00000037
+#define FILE_DEVICE_TERMSRV             0x00000038
+#define FILE_DEVICE_KSEC                0x00000039
+#define FILE_DEVICE_FIPS                0x0000003A
+#define FILE_DEVICE_INFINIBAND          0x0000003B
+
+//
+// Macro definition for defining IOCTL and FSCTL function control codes.  Note
+// that function codes 0-2047 are reserved for Microsoft Corporation, and
+// 2048-4095 are reserved for customers.
+//
+
+#define CTL_CODE( DeviceType, Function, Method, Access ) (                 \
+    ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \
+)
+
+//
+// Macro to extract device type out of the device io control code
+//
+#define DEVICE_TYPE_FROM_CTL_CODE(ctrlCode)     (((DWORD)(ctrlCode & 0xffff0000)) >> 16)
+
+//
+// Define the method codes for how buffers are passed for I/O and FS controls
+//
+
+#define METHOD_BUFFERED                 0
+#define METHOD_IN_DIRECT                1
+#define METHOD_OUT_DIRECT               2
+#define METHOD_NEITHER                  3
+
+//
+// Define some easier to comprehend aliases:
+//   METHOD_DIRECT_TO_HARDWARE (writes, aka METHOD_IN_DIRECT)
+//   METHOD_DIRECT_FROM_HARDWARE (reads, aka METHOD_OUT_DIRECT)
+//
+
+#define METHOD_DIRECT_TO_HARDWARE       METHOD_OUT_DIRECT
+#define METHOD_DIRECT_FROM_HARDWARE     METHOD_IN_DIRECT
+
+//
+// Define the access check value for any access
+//
+//
+// The FILE_READ_ACCESS and FILE_WRITE_ACCESS constants are also defined in
+// ntioapi.h as FILE_READ_DATA and FILE_WRITE_DATA. The values for these
+// constants *MUST* always be in sync.
+//
+//
+// FILE_SPECIAL_ACCESS is checked by the NT I/O system the same as FILE_ANY_ACCESS.
+// The file systems, however, may add additional access checks for I/O and FS controls
+// that use this value.
+//
+
+
+#define FILE_ANY_ACCESS                 0
+#define FILE_SPECIAL_ACCESS    (FILE_ANY_ACCESS)
+#define FILE_READ_ACCESS          ( 0x0001 )    // file & pipe
+#define FILE_WRITE_ACCESS         ( 0x0002 )    // file & pipe
+
+// end_ntddk end_wdm end_nthal end_ntifs
+
+#endif // _DEVIOCTL_
+
+
+#ifndef _NTDDSTOR_H_
+#define _NTDDSTOR_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//
+// IoControlCode values for storage devices
+//
+
+#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE
+
+//
+// The following device control codes are common for all class drivers.  They
+// should be used in place of the older IOCTL_DISK, IOCTL_CDROM and IOCTL_TAPE
+// common codes
+//
+
+#define IOCTL_STORAGE_CHECK_VERIFY            CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_CHECK_VERIFY2           CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_MEDIA_REMOVAL           CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_EJECT_MEDIA             CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_LOAD_MEDIA              CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_LOAD_MEDIA2             CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_RESERVE                 CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_RELEASE                 CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_FIND_NEW_DEVICES        CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_STORAGE_EJECTION_CONTROL        CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_MCN_CONTROL             CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_STORAGE_GET_MEDIA_TYPES         CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX      CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_GET_HOTPLUG_INFO        CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_SET_HOTPLUG_INFO        CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+#define IOCTL_STORAGE_RESET_BUS               CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_RESET_DEVICE            CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_STORAGE_BREAK_RESERVATION       CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_STORAGE_GET_DEVICE_NUMBER       CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_STORAGE_PREDICT_FAILURE         CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+
+//
+// These ioctl codes are obsolete.  They are defined here to avoid resuing them
+// and to allow class drivers to respond to them more easily.
+//
+
+#define OBSOLETE_IOCTL_STORAGE_RESET_BUS        CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define OBSOLETE_IOCTL_STORAGE_RESET_DEVICE     CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+
+//
+// IOCTL_STORAGE_GET_HOTPLUG_INFO
+//
+
+typedef struct _STORAGE_HOTPLUG_INFO {
+    DWORD Size; // version
+    BOOLEAN MediaRemovable; // ie. zip, jaz, cdrom, mo, etc. vs hdd
+    BOOLEAN MediaHotplug;   // ie. does the device succeed a lock even though its not lockable media?
+    BOOLEAN DeviceHotplug;  // ie. 1394, USB, etc.
+    BOOLEAN WriteCacheEnableOverride; // This field should not be relied upon because it is no longer used
+} STORAGE_HOTPLUG_INFO, *PSTORAGE_HOTPLUG_INFO;
+
+//
+// IOCTL_STORAGE_GET_DEVICE_NUMBER
+//
+// input - none
+//
+// output - STORAGE_DEVICE_NUMBER structure
+//          The values in the STORAGE_DEVICE_NUMBER structure are guaranteed
+//          to remain unchanged until the system is rebooted.  They are not
+//          guaranteed to be persistant across boots.
+//
+
+typedef struct _STORAGE_DEVICE_NUMBER {
+
+    //
+    // The FILE_DEVICE_XXX type for this device.
+    //
+
+    DEVICE_TYPE DeviceType;
+
+    //
+    // The number of this device
+    //
+
+    DWORD       DeviceNumber;
+
+    //
+    // If the device is partitionable, the partition number of the device.
+    // Otherwise -1
+    //
+
+    DWORD       PartitionNumber;
+} STORAGE_DEVICE_NUMBER, *PSTORAGE_DEVICE_NUMBER;
+
+//
+// Define the structures for scsi resets
+//
+
+typedef struct _STORAGE_BUS_RESET_REQUEST {
+    BYTE  PathId;
+} STORAGE_BUS_RESET_REQUEST, *PSTORAGE_BUS_RESET_REQUEST;
+
+//
+// IOCTL_STORAGE_MEDIA_REMOVAL disables the mechanism
+// on a storage device that ejects media. This function
+// may or may not be supported on storage devices that
+// support removable media.
+//
+// TRUE means prevent media from being removed.
+// FALSE means allow media removal.
+//
+
+typedef struct _PREVENT_MEDIA_REMOVAL {
+    BOOLEAN PreventMediaRemoval;
+} PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL;
+
+
+
+//
+//  This is the format of TARGET_DEVICE_CUSTOM_NOTIFICATION.CustomDataBuffer
+//  passed to applications by the classpnp autorun code (via IoReportTargetDeviceChangeAsynchronous).
+//
+typedef struct _CLASS_MEDIA_CHANGE_CONTEXT {
+        DWORD MediaChangeCount;
+        DWORD NewState;		// see MEDIA_CHANGE_DETECTION_STATE enum in classpnp.h in DDK
+} CLASS_MEDIA_CHANGE_CONTEXT, *PCLASS_MEDIA_CHANGE_CONTEXT;
+
+
+// begin_ntminitape
+
+
+typedef struct _TAPE_STATISTICS {
+    DWORD Version;
+    DWORD Flags;
+    LARGE_INTEGER RecoveredWrites;
+    LARGE_INTEGER UnrecoveredWrites;
+    LARGE_INTEGER RecoveredReads;
+    LARGE_INTEGER UnrecoveredReads;
+    BYTE          CompressionRatioReads;
+    BYTE          CompressionRatioWrites;
+} TAPE_STATISTICS, *PTAPE_STATISTICS;
+
+#define RECOVERED_WRITES_VALID   0x00000001
+#define UNRECOVERED_WRITES_VALID 0x00000002
+#define RECOVERED_READS_VALID    0x00000004
+#define UNRECOVERED_READS_VALID  0x00000008
+#define WRITE_COMPRESSION_INFO_VALID  0x00000010
+#define READ_COMPRESSION_INFO_VALID   0x00000020
+
+typedef struct _TAPE_GET_STATISTICS {
+    DWORD Operation;
+} TAPE_GET_STATISTICS, *PTAPE_GET_STATISTICS;
+
+#define TAPE_RETURN_STATISTICS 0L
+#define TAPE_RETURN_ENV_INFO   1L
+#define TAPE_RESET_STATISTICS  2L
+
+//
+// IOCTL_STORAGE_GET_MEDIA_TYPES_EX will return an array of DEVICE_MEDIA_INFO
+// structures, one per supported type, embedded in the GET_MEDIA_TYPES struct.
+//
+
+typedef enum _STORAGE_MEDIA_TYPE {
+    //
+    // Following are defined in ntdddisk.h in the MEDIA_TYPE enum
+    //
+    // Unknown,                // Format is unknown
+    // F5_1Pt2_512,            // 5.25", 1.2MB,  512 bytes/sector
+    // F3_1Pt44_512,           // 3.5",  1.44MB, 512 bytes/sector
+    // F3_2Pt88_512,           // 3.5",  2.88MB, 512 bytes/sector
+    // F3_20Pt8_512,           // 3.5",  20.8MB, 512 bytes/sector
+    // F3_720_512,             // 3.5",  720KB,  512 bytes/sector
+    // F5_360_512,             // 5.25", 360KB,  512 bytes/sector
+    // F5_320_512,             // 5.25", 320KB,  512 bytes/sector
+    // F5_320_1024,            // 5.25", 320KB,  1024 bytes/sector
+    // F5_180_512,             // 5.25", 180KB,  512 bytes/sector
+    // F5_160_512,             // 5.25", 160KB,  512 bytes/sector
+    // RemovableMedia,         // Removable media other than floppy
+    // FixedMedia,             // Fixed hard disk media
+    // F3_120M_512,            // 3.5", 120M Floppy
+    // F3_640_512,             // 3.5" ,  640KB,  512 bytes/sector
+    // F5_640_512,             // 5.25",  640KB,  512 bytes/sector
+    // F5_720_512,             // 5.25",  720KB,  512 bytes/sector
+    // F3_1Pt2_512,            // 3.5" ,  1.2Mb,  512 bytes/sector
+    // F3_1Pt23_1024,          // 3.5" ,  1.23Mb, 1024 bytes/sector
+    // F5_1Pt23_1024,          // 5.25",  1.23MB, 1024 bytes/sector
+    // F3_128Mb_512,           // 3.5" MO 128Mb   512 bytes/sector
+    // F3_230Mb_512,           // 3.5" MO 230Mb   512 bytes/sector
+    // F8_256_128,             // 8",     256KB,  128 bytes/sector
+    // F3_200Mb_512,           // 3.5",   200M Floppy (HiFD)
+    //
+
+    DDS_4mm = 0x20,            // Tape - DAT DDS1,2,... (all vendors)
+    MiniQic,                   // Tape - miniQIC Tape
+    Travan,                    // Tape - Travan TR-1,2,3,...
+    QIC,                       // Tape - QIC
+    MP_8mm,                    // Tape - 8mm Exabyte Metal Particle
+    AME_8mm,                   // Tape - 8mm Exabyte Advanced Metal Evap
+    AIT1_8mm,                  // Tape - 8mm Sony AIT
+    DLT,                       // Tape - DLT Compact IIIxt, IV
+    NCTP,                      // Tape - Philips NCTP
+    IBM_3480,                  // Tape - IBM 3480
+    IBM_3490E,                 // Tape - IBM 3490E
+    IBM_Magstar_3590,          // Tape - IBM Magstar 3590
+    IBM_Magstar_MP,            // Tape - IBM Magstar MP
+    STK_DATA_D3,               // Tape - STK Data D3
+    SONY_DTF,                  // Tape - Sony DTF
+    DV_6mm,                    // Tape - 6mm Digital Video
+    DMI,                       // Tape - Exabyte DMI and compatibles
+    SONY_D2,                   // Tape - Sony D2S and D2L
+    CLEANER_CARTRIDGE,         // Cleaner - All Drive types that support Drive Cleaners
+    CD_ROM,                    // Opt_Disk - CD
+    CD_R,                      // Opt_Disk - CD-Recordable (Write Once)
+    CD_RW,                     // Opt_Disk - CD-Rewriteable
+    DVD_ROM,                   // Opt_Disk - DVD-ROM
+    DVD_R,                     // Opt_Disk - DVD-Recordable (Write Once)
+    DVD_RW,                    // Opt_Disk - DVD-Rewriteable
+    MO_3_RW,                   // Opt_Disk - 3.5" Rewriteable MO Disk
+    MO_5_WO,                   // Opt_Disk - MO 5.25" Write Once
+    MO_5_RW,                   // Opt_Disk - MO 5.25" Rewriteable (not LIMDOW)
+    MO_5_LIMDOW,               // Opt_Disk - MO 5.25" Rewriteable (LIMDOW)
+    PC_5_WO,                   // Opt_Disk - Phase Change 5.25" Write Once Optical
+    PC_5_RW,                   // Opt_Disk - Phase Change 5.25" Rewriteable
+    PD_5_RW,                   // Opt_Disk - PhaseChange Dual Rewriteable
+    ABL_5_WO,                  // Opt_Disk - Ablative 5.25" Write Once Optical
+    PINNACLE_APEX_5_RW,        // Opt_Disk - Pinnacle Apex 4.6GB Rewriteable Optical
+    SONY_12_WO,                // Opt_Disk - Sony 12" Write Once
+    PHILIPS_12_WO,             // Opt_Disk - Philips/LMS 12" Write Once
+    HITACHI_12_WO,             // Opt_Disk - Hitachi 12" Write Once
+    CYGNET_12_WO,              // Opt_Disk - Cygnet/ATG 12" Write Once
+    KODAK_14_WO,               // Opt_Disk - Kodak 14" Write Once
+    MO_NFR_525,                // Opt_Disk - Near Field Recording (Terastor)
+    NIKON_12_RW,               // Opt_Disk - Nikon 12" Rewriteable
+    IOMEGA_ZIP,                // Mag_Disk - Iomega Zip
+    IOMEGA_JAZ,                // Mag_Disk - Iomega Jaz
+    SYQUEST_EZ135,             // Mag_Disk - Syquest EZ135
+    SYQUEST_EZFLYER,           // Mag_Disk - Syquest EzFlyer
+    SYQUEST_SYJET,             // Mag_Disk - Syquest SyJet
+    AVATAR_F2,                 // Mag_Disk - 2.5" Floppy
+    MP2_8mm,                   // Tape - 8mm Hitachi
+    DST_S,                     // Ampex DST Small Tapes
+    DST_M,                     // Ampex DST Medium Tapes
+    DST_L,                     // Ampex DST Large Tapes
+    VXATape_1,                 // Ecrix 8mm Tape
+    VXATape_2,                 // Ecrix 8mm Tape
+    STK_9840,                  // STK 9840
+    LTO_Ultrium,               // IBM, HP, Seagate LTO Ultrium
+    LTO_Accelis,               // IBM, HP, Seagate LTO Accelis
+    DVD_RAM,                   // Opt_Disk - DVD-RAM
+    AIT_8mm,                   // AIT2 or higher
+    ADR_1,                     // OnStream ADR Mediatypes
+    ADR_2,                     
+    STK_9940                   // STK 9940
+} STORAGE_MEDIA_TYPE, *PSTORAGE_MEDIA_TYPE;
+
+#define MEDIA_ERASEABLE         0x00000001
+#define MEDIA_WRITE_ONCE        0x00000002
+#define MEDIA_READ_ONLY         0x00000004
+#define MEDIA_READ_WRITE        0x00000008
+
+#define MEDIA_WRITE_PROTECTED   0x00000100
+#define MEDIA_CURRENTLY_MOUNTED 0x80000000
+
+//
+// Define the different storage bus types
+// Bus types below 128 (0x80) are reserved for Microsoft use
+//
+
+typedef enum _STORAGE_BUS_TYPE {
+    BusTypeUnknown = 0x00,
+    BusTypeScsi,
+    BusTypeAtapi,
+    BusTypeAta,
+    BusType1394,
+    BusTypeSsa,
+    BusTypeFibre,
+    BusTypeUsb,
+    BusTypeRAID,
+    BusTypeMaxReserved = 0x7F
+} STORAGE_BUS_TYPE, *PSTORAGE_BUS_TYPE;
+
+typedef struct _DEVICE_MEDIA_INFO {
+    union {
+        struct {
+            LARGE_INTEGER Cylinders;
+            STORAGE_MEDIA_TYPE MediaType;
+            DWORD TracksPerCylinder;
+            DWORD SectorsPerTrack;
+            DWORD BytesPerSector;
+            DWORD NumberMediaSides;
+            DWORD MediaCharacteristics; // Bitmask of MEDIA_XXX values.
+        } DiskInfo;
+
+        struct {
+            LARGE_INTEGER Cylinders;
+            STORAGE_MEDIA_TYPE MediaType;
+            DWORD TracksPerCylinder;
+            DWORD SectorsPerTrack;
+            DWORD BytesPerSector;
+            DWORD NumberMediaSides;
+            DWORD MediaCharacteristics; // Bitmask of MEDIA_XXX values.
+        } RemovableDiskInfo;
+
+        struct {
+            STORAGE_MEDIA_TYPE MediaType;
+            DWORD   MediaCharacteristics; // Bitmask of MEDIA_XXX values.
+            DWORD   CurrentBlockSize;
+            STORAGE_BUS_TYPE BusType;
+
+            //
+            // Bus specific information describing the medium supported.
+            //
+
+            union {
+                struct {
+                    BYTE  MediumType;
+                    BYTE  DensityCode;
+                } ScsiInformation;
+            } BusSpecificData;
+
+        } TapeInfo;
+    } DeviceSpecific;
+} DEVICE_MEDIA_INFO, *PDEVICE_MEDIA_INFO;
+
+typedef struct _GET_MEDIA_TYPES {
+    DWORD DeviceType;              // FILE_DEVICE_XXX values
+    DWORD MediaInfoCount;
+    DEVICE_MEDIA_INFO MediaInfo[1];
+} GET_MEDIA_TYPES, *PGET_MEDIA_TYPES;
+
+
+//
+// IOCTL_STORAGE_PREDICT_FAILURE
+//
+// input - none
+//
+// output - STORAGE_PREDICT_FAILURE structure
+//          PredictFailure returns zero if no failure predicted and non zero
+//                         if a failure is predicted.
+//
+//          VendorSpecific returns 512 bytes of vendor specific information
+//                         if a failure is predicted
+//
+typedef struct _STORAGE_PREDICT_FAILURE
+{
+    DWORD PredictFailure;
+    BYTE  VendorSpecific[512];
+} STORAGE_PREDICT_FAILURE, *PSTORAGE_PREDICT_FAILURE;
+
+// end_ntminitape
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _NTDDSTOR_H_
+
+//
+// IoControlCode values for disk devices.
+//
+
+#define IOCTL_DISK_BASE                 FILE_DEVICE_DISK
+#define IOCTL_DISK_GET_DRIVE_GEOMETRY   CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_GET_PARTITION_INFO   CTL_CODE(IOCTL_DISK_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_SET_PARTITION_INFO   CTL_CODE(IOCTL_DISK_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GET_DRIVE_LAYOUT     CTL_CODE(IOCTL_DISK_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_SET_DRIVE_LAYOUT     CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_VERIFY               CTL_CODE(IOCTL_DISK_BASE, 0x0005, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_FORMAT_TRACKS        CTL_CODE(IOCTL_DISK_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_REASSIGN_BLOCKS      CTL_CODE(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_PERFORMANCE          CTL_CODE(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_IS_WRITABLE          CTL_CODE(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_LOGGING              CTL_CODE(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_FORMAT_TRACKS_EX     CTL_CODE(IOCTL_DISK_BASE, 0x000b, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_HISTOGRAM_STRUCTURE  CTL_CODE(IOCTL_DISK_BASE, 0x000c, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_HISTOGRAM_DATA       CTL_CODE(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_HISTOGRAM_RESET      CTL_CODE(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_REQUEST_STRUCTURE    CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_REQUEST_DATA         CTL_CODE(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_PERFORMANCE_OFF      CTL_CODE(IOCTL_DISK_BASE, 0x0018, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+
+
+#if(_WIN32_WINNT >= 0x0400)
+#define IOCTL_DISK_CONTROLLER_NUMBER    CTL_CODE(IOCTL_DISK_BASE, 0x0011, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+//
+// IOCTL support for SMART drive fault prediction.
+//
+
+#define SMART_GET_VERSION               CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define SMART_SEND_DRIVE_COMMAND        CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define SMART_RCV_DRIVE_DATA            CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x500)
+
+//
+// New IOCTLs for GUID Partition tabled disks.
+//
+
+#define IOCTL_DISK_GET_PARTITION_INFO_EX    CTL_CODE(IOCTL_DISK_BASE, 0x0012, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_SET_PARTITION_INFO_EX    CTL_CODE(IOCTL_DISK_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GET_DRIVE_LAYOUT_EX      CTL_CODE(IOCTL_DISK_BASE, 0x0014, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_SET_DRIVE_LAYOUT_EX      CTL_CODE(IOCTL_DISK_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_CREATE_DISK              CTL_CODE(IOCTL_DISK_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GET_LENGTH_INFO          CTL_CODE(IOCTL_DISK_BASE, 0x0017, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX    CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#if(_WIN32_WINNT >= 0x0500)
+#define IOCTL_DISK_UPDATE_DRIVE_SIZE        CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GROW_PARTITION           CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+#define IOCTL_DISK_GET_CACHE_INFORMATION    CTL_CODE(IOCTL_DISK_BASE, 0x0035, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_SET_CACHE_INFORMATION    CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GET_WRITE_CACHE_STATE    CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_DISK_DELETE_DRIVE_LAYOUT      CTL_CODE(IOCTL_DISK_BASE, 0x0040, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+//
+// Called to flush cached information that the driver may have about this
+// device's characteristics.  Not all drivers cache characteristics, and not
+// cached properties can be flushed.  This simply serves as an update to the
+// driver that it may want to do an expensive reexamination of the device's
+// characteristics now (fixed media size, partition table, etc...)
+//
+
+#define IOCTL_DISK_UPDATE_PROPERTIES    CTL_CODE(IOCTL_DISK_BASE, 0x0050, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+//
+//  Special IOCTLs needed to support PC-98 machines in Japan
+//
+
+#define IOCTL_DISK_FORMAT_DRIVE         CTL_CODE(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_SENSE_DEVICE         CTL_CODE(IOCTL_DISK_BASE, 0x00f8, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+//
+// The following device control codes are common for all class drivers.  The
+// functions codes defined here must match all of the other class drivers.
+//
+// Warning: these codes will be replaced in the future by equivalent
+// IOCTL_STORAGE codes
+//
+
+#define IOCTL_DISK_CHECK_VERIFY     CTL_CODE(IOCTL_DISK_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_MEDIA_REMOVAL    CTL_CODE(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_EJECT_MEDIA      CTL_CODE(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_LOAD_MEDIA       CTL_CODE(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_RESERVE          CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_RELEASE          CTL_CODE(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+//
+// Define the partition types returnable by known disk drivers.
+//
+
+#define PARTITION_ENTRY_UNUSED          0x00      // Entry unused
+#define PARTITION_FAT_12                0x01      // 12-bit FAT entries
+#define PARTITION_XENIX_1               0x02      // Xenix
+#define PARTITION_XENIX_2               0x03      // Xenix
+#define PARTITION_FAT_16                0x04      // 16-bit FAT entries
+#define PARTITION_EXTENDED              0x05      // Extended partition entry
+#define PARTITION_HUGE                  0x06      // Huge partition MS-DOS V4
+#define PARTITION_IFS                   0x07      // IFS Partition
+#define PARTITION_OS2BOOTMGR            0x0A      // OS/2 Boot Manager/OPUS/Coherent swap
+#define PARTITION_FAT32                 0x0B      // FAT32
+#define PARTITION_FAT32_XINT13          0x0C      // FAT32 using extended int13 services
+#define PARTITION_XINT13                0x0E      // Win95 partition using extended int13 services
+#define PARTITION_XINT13_EXTENDED       0x0F      // Same as type 5 but uses extended int13 services
+#define PARTITION_PREP                  0x41      // PowerPC Reference Platform (PReP) Boot Partition
+#define PARTITION_LDM                   0x42      // Logical Disk Manager partition
+#define PARTITION_UNIX                  0x63      // Unix
+
+#define VALID_NTFT                      0xC0      // NTFT uses high order bits
+
+//
+// The high bit of the partition type code indicates that a partition
+// is part of an NTFT mirror or striped array.
+//
+
+#define PARTITION_NTFT                  0x80     // NTFT partition
+
+//
+// The following macro is used to determine which partitions should be
+// assigned drive letters.
+//
+
+//++
+//
+// BOOLEAN
+// IsRecognizedPartition(
+//     IN DWORD PartitionType
+//     )
+//
+// Routine Description:
+//
+//     This macro is used to determine to which partitions drive letters
+//     should be assigned.
+//
+// Arguments:
+//
+//     PartitionType - Supplies the type of the partition being examined.
+//
+// Return Value:
+//
+//     The return value is TRUE if the partition type is recognized,
+//     otherwise FALSE is returned.
+//
+//--
+
+#define IsRecognizedPartition( PartitionType ) (    \
+     ((PartitionType & PARTITION_NTFT) && ((PartitionType & ~0xC0) == PARTITION_FAT_12)) ||  \
+     ((PartitionType & PARTITION_NTFT) && ((PartitionType & ~0xC0) == PARTITION_IFS)) ||  \
+     ((PartitionType & PARTITION_NTFT) && ((PartitionType & ~0xC0) == PARTITION_HUGE)) ||  \
+     ((PartitionType & PARTITION_NTFT) && ((PartitionType & ~0xC0) == PARTITION_FAT32)) ||  \
+     ((PartitionType & PARTITION_NTFT) && ((PartitionType & ~0xC0) == PARTITION_FAT32_XINT13)) ||  \
+     ((PartitionType & PARTITION_NTFT) && ((PartitionType & ~0xC0) == PARTITION_XINT13)) ||  \
+     ((PartitionType) == PARTITION_FAT_12)          ||  \
+     ((PartitionType) == PARTITION_FAT_16)          ||  \
+     ((PartitionType) == PARTITION_IFS)             ||  \
+     ((PartitionType) == PARTITION_HUGE)            ||  \
+     ((PartitionType) == PARTITION_FAT32)           ||  \
+     ((PartitionType) == PARTITION_FAT32_XINT13)    ||  \
+     ((PartitionType) == PARTITION_XINT13) )
+
+//++
+//
+// BOOLEAN
+// IsContainerPartition(
+//     IN DWORD PartitionType
+//     )
+//
+// Routine Description:
+//
+//     This macro is used to determine to which partition types are actually
+//     containers for other partitions (ie, extended partitions).
+//
+// Arguments:
+//
+//     PartitionType - Supplies the type of the partition being examined.
+//
+// Return Value:
+//
+//     The return value is TRUE if the partition type is a container,
+//     otherwise FALSE is returned.
+//
+//--
+
+#define IsContainerPartition( PartitionType ) \
+    ((PartitionType == PARTITION_EXTENDED) || (PartitionType == PARTITION_XINT13_EXTENDED))
+
+//++
+//
+// BOOLEAN
+// IsFTPartition(
+//     IN DWORD PartitionType
+//     )
+//
+// Routine Description:
+//
+//     This macro is used to determine if the given partition is an FT
+//     partition.
+//
+// Arguments:
+//
+//     PartitionType - Supplies the type of the partition being examined.
+//
+// Return Value:
+//
+//     The return value is TRUE if the partition type is an FT partition,
+//     otherwise FALSE is returned.
+//
+//--
+
+#define IsFTPartition( PartitionType ) \
+    (((PartitionType)&PARTITION_NTFT) && IsRecognizedPartition(PartitionType))
+
+//
+// Define the media types supported by the driver.
+//
+
+typedef enum _MEDIA_TYPE {
+    Unknown,                // Format is unknown
+    F5_1Pt2_512,            // 5.25", 1.2MB,  512 bytes/sector
+    F3_1Pt44_512,           // 3.5",  1.44MB, 512 bytes/sector
+    F3_2Pt88_512,           // 3.5",  2.88MB, 512 bytes/sector
+    F3_20Pt8_512,           // 3.5",  20.8MB, 512 bytes/sector
+    F3_720_512,             // 3.5",  720KB,  512 bytes/sector
+    F5_360_512,             // 5.25", 360KB,  512 bytes/sector
+    F5_320_512,             // 5.25", 320KB,  512 bytes/sector
+    F5_320_1024,            // 5.25", 320KB,  1024 bytes/sector
+    F5_180_512,             // 5.25", 180KB,  512 bytes/sector
+    F5_160_512,             // 5.25", 160KB,  512 bytes/sector
+    RemovableMedia,         // Removable media other than floppy
+    FixedMedia,             // Fixed hard disk media
+    F3_120M_512,            // 3.5", 120M Floppy
+    F3_640_512,             // 3.5" ,  640KB,  512 bytes/sector
+    F5_640_512,             // 5.25",  640KB,  512 bytes/sector
+    F5_720_512,             // 5.25",  720KB,  512 bytes/sector
+    F3_1Pt2_512,            // 3.5" ,  1.2Mb,  512 bytes/sector
+    F3_1Pt23_1024,          // 3.5" ,  1.23Mb, 1024 bytes/sector
+    F5_1Pt23_1024,          // 5.25",  1.23MB, 1024 bytes/sector
+    F3_128Mb_512,           // 3.5" MO 128Mb   512 bytes/sector
+    F3_230Mb_512,           // 3.5" MO 230Mb   512 bytes/sector
+    F8_256_128,             // 8",     256KB,  128 bytes/sector
+    F3_200Mb_512,           // 3.5",   200M Floppy (HiFD)
+    F3_240M_512,            // 3.5",   240Mb Floppy (HiFD)
+    F3_32M_512              // 3.5",   32Mb Floppy
+} MEDIA_TYPE, *PMEDIA_TYPE;
+
+//
+// Define the input buffer structure for the driver, when
+// it is called with IOCTL_DISK_FORMAT_TRACKS.
+//
+
+typedef struct _FORMAT_PARAMETERS {
+   MEDIA_TYPE MediaType;
+   DWORD StartCylinderNumber;
+   DWORD EndCylinderNumber;
+   DWORD StartHeadNumber;
+   DWORD EndHeadNumber;
+} FORMAT_PARAMETERS, *PFORMAT_PARAMETERS;
+
+//
+// Define the BAD_TRACK_NUMBER type. An array of elements of this type is
+// returned by the driver on IOCTL_DISK_FORMAT_TRACKS requests, to indicate
+// what tracks were bad during formatting. The length of that array is
+// reported in the `Information' field of the I/O Status Block.
+//
+
+typedef WORD   BAD_TRACK_NUMBER;
+typedef WORD   *PBAD_TRACK_NUMBER;
+
+//
+// Define the input buffer structure for the driver, when
+// it is called with IOCTL_DISK_FORMAT_TRACKS_EX.
+//
+
+typedef struct _FORMAT_EX_PARAMETERS {
+   MEDIA_TYPE MediaType;
+   DWORD StartCylinderNumber;
+   DWORD EndCylinderNumber;
+   DWORD StartHeadNumber;
+   DWORD EndHeadNumber;
+   WORD   FormatGapLength;
+   WORD   SectorsPerTrack;
+   WORD   SectorNumber[1];
+} FORMAT_EX_PARAMETERS, *PFORMAT_EX_PARAMETERS;
+
+//
+// The following structure is returned on an IOCTL_DISK_GET_DRIVE_GEOMETRY
+// request and an array of them is returned on an IOCTL_DISK_GET_MEDIA_TYPES
+// request.
+//
+
+typedef struct _DISK_GEOMETRY {
+    LARGE_INTEGER Cylinders;
+    MEDIA_TYPE MediaType;
+    DWORD TracksPerCylinder;
+    DWORD SectorsPerTrack;
+    DWORD BytesPerSector;
+} DISK_GEOMETRY, *PDISK_GEOMETRY;
+
+
+
+//
+// This wmi guid returns a DISK_GEOMETRY structure
+//
+#define WMI_DISK_GEOMETRY_GUID         { 0x25007f51, 0x57c2, 0x11d1, { 0xa5, 0x28, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10 } }
+
+
+
+//
+// The following structure is returned on an IOCTL_DISK_GET_PARTITION_INFO
+// and an IOCTL_DISK_GET_DRIVE_LAYOUT request.  It is also used in a request
+// to change the drive layout, IOCTL_DISK_SET_DRIVE_LAYOUT.
+//
+
+typedef struct _PARTITION_INFORMATION {
+    LARGE_INTEGER StartingOffset;
+    LARGE_INTEGER PartitionLength;
+    DWORD HiddenSectors;
+    DWORD PartitionNumber;
+    BYTE  PartitionType;
+    BOOLEAN BootIndicator;
+    BOOLEAN RecognizedPartition;
+    BOOLEAN RewritePartition;
+} PARTITION_INFORMATION, *PPARTITION_INFORMATION;
+
+//
+// The following structure is used to change the partition type of a
+// specified disk partition using an IOCTL_DISK_SET_PARTITION_INFO
+// request.
+//
+
+typedef struct _SET_PARTITION_INFORMATION {
+    BYTE  PartitionType;
+} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION;
+
+//
+// The following structures is returned on an IOCTL_DISK_GET_DRIVE_LAYOUT
+// request and given as input to an IOCTL_DISK_SET_DRIVE_LAYOUT request.
+//
+
+typedef struct _DRIVE_LAYOUT_INFORMATION {
+    DWORD PartitionCount;
+    DWORD Signature;
+    PARTITION_INFORMATION PartitionEntry[1];
+} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION;
+
+//
+// The following structure is passed in on an IOCTL_DISK_VERIFY request.
+// The offset and length parameters are both given in bytes.
+//
+
+typedef struct _VERIFY_INFORMATION {
+    LARGE_INTEGER StartingOffset;
+    DWORD Length;
+} VERIFY_INFORMATION, *PVERIFY_INFORMATION;
+
+//
+// The following structure is passed in on an IOCTL_DISK_REASSIGN_BLOCKS
+// request.
+//
+
+typedef struct _REASSIGN_BLOCKS {
+    WORD   Reserved;
+    WORD   Count;
+    DWORD BlockNumber[1];
+} REASSIGN_BLOCKS, *PREASSIGN_BLOCKS;
+
+
+#if(_WIN32_WINNT >= 0x500)
+
+//
+// Support for GUID Partition Table (GPT) disks.
+//
+
+//
+// There are currently two ways a disk can be partitioned. With a traditional
+// AT-style master boot record (PARTITION_STYLE_MBR) and with a new, GPT
+// partition table (PARTITION_STYLE_GPT). RAW is for an unrecognizable
+// partition style. There are a very limited number of things you can
+// do with a RAW partititon.
+//
+
+typedef enum _PARTITION_STYLE {
+    PARTITION_STYLE_MBR,
+    PARTITION_STYLE_GPT,
+    PARTITION_STYLE_RAW
+} PARTITION_STYLE;
+
+
+//
+// The following structure defines information in a GPT partition that is
+// not common to both GPT and MBR partitions.
+//
+
+typedef struct _PARTITION_INFORMATION_GPT {
+    GUID PartitionType;                 // Partition type. See table 16-3.
+    GUID PartitionId;                   // Unique GUID for this partition.
+    DWORD64 Attributes;                 // See table 16-4.
+    WCHAR Name [36];                    // Partition Name in Unicode.
+} PARTITION_INFORMATION_GPT, *PPARTITION_INFORMATION_GPT;
+
+//
+//  The following are GPT partition attributes applicable for any
+//  partition type. These attributes are not OS-specific
+//
+
+#define GPT_ATTRIBUTE_PLATFORM_REQUIRED             (0x0000000000000001)
+
+//
+// The following are GPT partition attributes applicable when the
+// PartitionType is PARTITION_BASIC_DATA_GUID.
+//
+
+#define GPT_BASIC_DATA_ATTRIBUTE_NO_DRIVE_LETTER    (0x8000000000000000)
+#define GPT_BASIC_DATA_ATTRIBUTE_HIDDEN             (0x4000000000000000)
+#define GPT_BASIC_DATA_ATTRIBUTE_READ_ONLY          (0x1000000000000000)
+
+//
+// The following structure defines information in an MBR partition that is not
+// common to both GPT and MBR partitions.
+//
+
+typedef struct _PARTITION_INFORMATION_MBR {
+    BYTE  PartitionType;
+    BOOLEAN BootIndicator;
+    BOOLEAN RecognizedPartition;
+    DWORD HiddenSectors;
+} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR;
+
+
+//
+// The structure SET_PARTITION_INFO_EX is used with the ioctl
+// IOCTL_SET_PARTITION_INFO_EX to set information about a specific
+// partition. Note that for MBR partitions, you can only set the partition
+// signature, whereas GPT partitions allow setting of all fields that
+// you can get.
+//
+
+typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR;
+typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT;
+
+
+typedef struct _SET_PARTITION_INFORMATION_EX {
+    PARTITION_STYLE PartitionStyle;
+    union {
+        SET_PARTITION_INFORMATION_MBR Mbr;
+        SET_PARTITION_INFORMATION_GPT Gpt;
+    };
+} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX;
+
+
+//
+// The structure CREATE_DISK_GPT with the ioctl IOCTL_DISK_CREATE_DISK
+// to initialize an virgin disk with an empty GPT partition table.
+//
+
+typedef struct _CREATE_DISK_GPT {
+    GUID DiskId;                    // Unique disk id for the disk.
+    DWORD MaxPartitionCount;        // Maximim number of partitions allowable.
+} CREATE_DISK_GPT, *PCREATE_DISK_GPT;
+
+//
+// The structure CREATE_DISK_MBR with the ioctl IOCTL_DISK_CREATE_DISK
+// to initialize an virgin disk with an empty MBR partition table.
+//
+
+typedef struct _CREATE_DISK_MBR {
+    DWORD Signature;
+} CREATE_DISK_MBR, *PCREATE_DISK_MBR;
+
+
+typedef struct _CREATE_DISK {
+    PARTITION_STYLE PartitionStyle;
+    union {
+        CREATE_DISK_MBR Mbr;
+        CREATE_DISK_GPT Gpt;
+    };
+} CREATE_DISK, *PCREATE_DISK;
+
+
+//
+// The structure GET_LENGTH_INFORMATION is used with the ioctl
+// IOCTL_DISK_GET_LENGTH_INFO to obtain the length, in bytes, of the
+// disk, partition, or volume.
+//
+
+typedef struct _GET_LENGTH_INFORMATION {
+    LARGE_INTEGER   Length;
+} GET_LENGTH_INFORMATION, *PGET_LENGTH_INFORMATION;
+
+//
+// The PARTITION_INFORMATION_EX structure is used with the
+// IOCTL_DISK_GET_DRIVE_LAYOUT_EX, IOCTL_DISK_SET_DRIVE_LAYOUT_EX,
+// IOCTL_DISK_GET_PARTITION_INFO_EX and IOCTL_DISK_GET_PARTITION_INFO_EX calls.
+//
+
+typedef struct _PARTITION_INFORMATION_EX {
+    PARTITION_STYLE PartitionStyle;
+    LARGE_INTEGER StartingOffset;
+    LARGE_INTEGER PartitionLength;
+    DWORD PartitionNumber;
+    BOOLEAN RewritePartition;
+    union {
+        PARTITION_INFORMATION_MBR Mbr;
+        PARTITION_INFORMATION_GPT Gpt;
+    };
+} PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
+
+
+//
+// GPT specific drive layout information.
+//
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_GPT {
+    GUID DiskId;
+    LARGE_INTEGER StartingUsableOffset;
+    LARGE_INTEGER UsableLength;
+    DWORD MaxPartitionCount;
+} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT;
+
+
+//
+// MBR specific drive layout information.
+//
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
+    DWORD Signature;
+} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR;
+
+//
+// The structure DRIVE_LAYOUT_INFORMATION_EX is used with the
+// IOCTL_SET_DRIVE_LAYOUT_EX and IOCTL_GET_DRIVE_LAYOUT_EX calls.
+//
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_EX {
+    DWORD PartitionStyle;
+    DWORD PartitionCount;
+    union {
+        DRIVE_LAYOUT_INFORMATION_MBR Mbr;
+        DRIVE_LAYOUT_INFORMATION_GPT Gpt;
+    };
+    PARTITION_INFORMATION_EX PartitionEntry[1];
+} DRIVE_LAYOUT_INFORMATION_EX, *PDRIVE_LAYOUT_INFORMATION_EX;
+
+
+#endif // (_WIN32_WINNT >= 0x0500)
+
+
+#if(_WIN32_WINNT >= 0x0500)
+
+//
+// The DISK_GEOMETRY_EX structure is returned on issuing an
+// IOCTL_DISK_GET_DRIVE_GEOMETRY_EX ioctl.
+//
+
+typedef enum _DETECTION_TYPE {
+        DetectNone,
+        DetectInt13,
+        DetectExInt13
+} DETECTION_TYPE;
+
+typedef struct _DISK_INT13_INFO {
+        WORD   DriveSelect;
+        DWORD MaxCylinders;
+        WORD   SectorsPerTrack;
+        WORD   MaxHeads;
+        WORD   NumberDrives;
+} DISK_INT13_INFO, *PDISK_INT13_INFO;
+
+typedef struct _DISK_EX_INT13_INFO {
+        WORD   ExBufferSize;
+        WORD   ExFlags;
+        DWORD ExCylinders;
+        DWORD ExHeads;
+        DWORD ExSectorsPerTrack;
+        DWORD64 ExSectorsPerDrive;
+        WORD   ExSectorSize;
+        WORD   ExReserved;
+} DISK_EX_INT13_INFO, *PDISK_EX_INT13_INFO;
+
+typedef struct _DISK_DETECTION_INFO {
+        DWORD SizeOfDetectInfo;
+        DETECTION_TYPE DetectionType;
+        union {
+                struct {
+
+                        //
+                        // If DetectionType == DETECTION_INT13 then we have just the Int13
+                        // information.
+                        //
+
+                        DISK_INT13_INFO Int13;
+
+                        //
+                        // If DetectionType == DETECTION_EX_INT13, then we have the
+                        // extended int 13 information.
+                        //
+
+                        DISK_EX_INT13_INFO ExInt13;     // If DetectionType == DetectExInt13
+                };
+        };
+} DISK_DETECTION_INFO, *PDISK_DETECTION_INFO;
+
+
+typedef struct _DISK_PARTITION_INFO {
+        DWORD SizeOfPartitionInfo;
+        PARTITION_STYLE PartitionStyle;                 // PartitionStyle = RAW, GPT or MBR
+        union {
+                struct {                                                        // If PartitionStyle == MBR
+                        DWORD Signature;                                // MBR Signature
+                        DWORD CheckSum;                                 // MBR CheckSum
+                } Mbr;
+                struct {                                                        // If PartitionStyle == GPT
+                        GUID DiskId;
+                } Gpt;
+        };
+} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO;
+
+
+//
+// The Geometry structure is a variable length structure composed of a
+// DISK_GEOMETRY_EX structure followed by a DISK_PARTITION_INFO structure
+// followed by a DISK_DETECTION_DATA structure.
+//
+
+#define DiskGeometryGetPartition(Geometry)\
+                        ((PDISK_PARTITION_INFO)((Geometry)+1))
+
+#define DiskGeometryGetDetect(Geometry)\
+                        ((PDISK_DETECTION_INFO)(((DWORD_PTR)DiskGeometryGetPartition(Geometry)+\
+                                        DiskGeometryGetPartition(Geometry)->SizeOfPartitionInfo)))
+
+typedef struct _DISK_GEOMETRY_EX {
+        DISK_GEOMETRY Geometry;                                 // Standard disk geometry: may be faked by driver.
+        LARGE_INTEGER DiskSize;                                 // Must always be correct
+        BYTE  Data[1];                                                  // Partition, Detect info
+} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX;
+
+#endif // (_WIN32_WINNT > 0x0500)
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// IOCTL_DISK_CONTROLLER_NUMBER returns the controller and disk
+// number for the handle.  This is used to determine if a disk
+// is attached to the primary or secondary IDE controller.
+//
+
+typedef struct _DISK_CONTROLLER_NUMBER {
+    DWORD ControllerNumber;
+    DWORD DiskNumber;
+} DISK_CONTROLLER_NUMBER, *PDISK_CONTROLLER_NUMBER;
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0500)
+
+
+//
+// IOCTL_DISK_SET_CACHE allows the caller to get or set the state of the disk
+// read/write caches.
+//
+// If the structure is provided as the input buffer for the ioctl the read &
+// write caches will be enabled or disabled depending on the parameters
+// provided.
+//
+// If the structure is provided as an output buffer for the ioctl the state
+// of the read & write caches will be returned. If both input and outut buffers
+// are provided the output buffer will contain the cache state BEFORE any
+// changes are made
+//
+
+typedef enum {
+    EqualPriority,
+    KeepPrefetchedData,
+    KeepReadData
+} DISK_CACHE_RETENTION_PRIORITY;
+
+typedef enum _DISK_WRITE_CACHE_STATE {
+    DiskWriteCacheNormal,
+    DiskWriteCacheForceDisable,
+    DiskWriteCacheDisableNotSupported
+} DISK_WRITE_CACHE_STATE, *PDISK_WRITE_CACHE_STATE;
+
+
+typedef struct _DISK_CACHE_INFORMATION {
+
+    //
+    // on return indicates that the device is capable of saving any parameters
+    // in non-volatile storage.  On send indicates that the device should
+    // save the state in non-volatile storage.
+    //
+
+    BOOLEAN ParametersSavable;
+
+    //
+    // Indicates whether the write and read caches are enabled.
+    //
+
+    BOOLEAN ReadCacheEnabled;
+    BOOLEAN WriteCacheEnabled;
+
+    //
+    // Controls the likelyhood of data remaining in the cache depending on how
+    // it got there.  Data cached from a READ or WRITE operation may be given
+    // higher, lower or equal priority to data entered into the cache for other
+    // means (like prefetch)
+    //
+
+    DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority;
+    DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority;
+
+    //
+    // Requests for a larger number of blocks than this may have prefetching
+    // disabled.  If this value is set to 0 prefetch will be disabled.
+    //
+
+    WORD   DisablePrefetchTransferLength;
+
+    //
+    // If TRUE then ScalarPrefetch (below) will be valid.  If FALSE then
+    // the minimum and maximum values should be treated as a block count
+    // (BlockPrefetch)
+    //
+
+    BOOLEAN PrefetchScalar;
+
+    //
+    // Contains the minimum and maximum amount of data which will be
+    // will be prefetched into the cache on a disk operation.  This value
+    // may either be a scalar multiplier of the transfer length of the request,
+    // or an abolute number of disk blocks.  PrefetchScalar (above) indicates
+    // which interpretation is used.
+    //
+
+    union {
+        struct {
+            WORD   Minimum;
+            WORD   Maximum;
+
+            //
+            // The maximum number of blocks which will be prefetched - useful
+            // with the scalar limits to set definite upper limits.
+            //
+
+            WORD   MaximumBlocks;
+        } ScalarPrefetch;
+
+        struct {
+            WORD   Minimum;
+            WORD   Maximum;
+        } BlockPrefetch;
+    };
+
+} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION;
+
+//
+// IOCTL_DISK_GROW_PARTITION will update the size of a partition
+// by adding sectors to the length. The number of sectors must be
+// predetermined by examining PARTITION_INFORMATION.
+//
+
+typedef struct _DISK_GROW_PARTITION {
+    DWORD PartitionNumber;
+    LARGE_INTEGER BytesToGrow;
+} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION;
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+///////////////////////////////////////////////////////
+//                                                   //
+// The following structures define disk performance  //
+// statistics: specifically the locations of all the //
+// reads and writes which have occured on the disk.  //
+//                                                   //
+// To use these structures, you must issue an IOCTL_ //
+// DISK_HIST_STRUCTURE (with a DISK_HISTOGRAM) to    //
+// obtain the basic histogram information. The       //
+// number of buckets which must allocated is part of //
+// this structure. Allocate the required number of   //
+// buckets and call an IOCTL_DISK_HIST_DATA to fill  //
+// in the data                                       //
+//                                                   //
+///////////////////////////////////////////////////////
+
+#define HIST_NO_OF_BUCKETS  24
+
+typedef struct _HISTOGRAM_BUCKET {
+    DWORD       Reads;
+    DWORD       Writes;
+} HISTOGRAM_BUCKET, *PHISTOGRAM_BUCKET;
+
+#define HISTOGRAM_BUCKET_SIZE   sizeof(HISTOGRAM_BUCKET)
+
+typedef struct _DISK_HISTOGRAM {
+    LARGE_INTEGER   DiskSize;
+    LARGE_INTEGER   Start;
+    LARGE_INTEGER   End;
+    LARGE_INTEGER   Average;
+    LARGE_INTEGER   AverageRead;
+    LARGE_INTEGER   AverageWrite;
+    DWORD           Granularity;
+    DWORD           Size;
+    DWORD           ReadCount;
+    DWORD           WriteCount;
+    PHISTOGRAM_BUCKET  Histogram;
+} DISK_HISTOGRAM, *PDISK_HISTOGRAM;
+
+#define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM)
+
+///////////////////////////////////////////////////////
+//                                                   //
+// The following structures define disk debugging    //
+// capabilities. The IOCTLs are directed to one of   //
+// the two disk filter drivers.                      //
+//                                                   //
+// DISKPERF is a utilty for collecting disk request  //
+// statistics.                                       //
+//                                                   //
+// SIMBAD is a utility for injecting faults in       //
+// IO requests to disks.                             //
+//                                                   //
+///////////////////////////////////////////////////////
+
+//
+// The following structure is exchanged on an IOCTL_DISK_GET_PERFORMANCE
+// request. This ioctl collects summary disk request statistics used
+// in measuring performance.
+//
+
+typedef struct _DISK_PERFORMANCE {
+        LARGE_INTEGER BytesRead;
+        LARGE_INTEGER BytesWritten;
+        LARGE_INTEGER ReadTime;
+        LARGE_INTEGER WriteTime;
+        LARGE_INTEGER IdleTime;
+        DWORD ReadCount;
+        DWORD WriteCount;
+        DWORD QueueDepth;
+        DWORD SplitCount;
+        LARGE_INTEGER QueryTime;
+        DWORD   StorageDeviceNumber;
+        WCHAR   StorageManagerName[8];
+} DISK_PERFORMANCE, *PDISK_PERFORMANCE;
+
+//
+// This structure defines the disk logging record. When disk logging
+// is enabled, one of these is written to an internal buffer for each
+// disk request.
+//
+
+typedef struct _DISK_RECORD {
+   LARGE_INTEGER ByteOffset;
+   LARGE_INTEGER StartTime;
+   LARGE_INTEGER EndTime;
+   PVOID VirtualAddress;
+   DWORD NumberOfBytes;
+   BYTE  DeviceNumber;
+   BOOLEAN ReadRequest;
+} DISK_RECORD, *PDISK_RECORD;
+
+//
+// The following structure is exchanged on an IOCTL_DISK_LOG request.
+// Not all fields are valid with each function type.
+//
+
+typedef struct _DISK_LOGGING {
+    BYTE  Function;
+    PVOID BufferAddress;
+    DWORD BufferSize;
+} DISK_LOGGING, *PDISK_LOGGING;
+
+//
+// Disk logging functions
+//
+// Start disk logging. Only the Function and BufferSize fields are valid.
+//
+
+#define DISK_LOGGING_START    0
+
+//
+// Stop disk logging. Only the Function field is valid.
+//
+
+#define DISK_LOGGING_STOP     1
+
+//
+// Return disk log. All fields are valid. Data will be copied from internal
+// buffer to buffer specified for the number of bytes requested.
+//
+
+#define DISK_LOGGING_DUMP     2
+
+//
+// DISK BINNING
+//
+// DISKPERF will keep counters for IO that falls in each of these ranges.
+// The application determines the number and size of the ranges.
+// Joe Lin wanted me to keep it flexible as possible, for instance, IO
+// sizes are interesting in ranges like 0-4096, 4097-16384, 16385-65536, 65537+.
+//
+
+#define DISK_BINNING          3
+
+//
+// Bin types
+//
+
+typedef enum _BIN_TYPES {
+    RequestSize,
+    RequestLocation
+} BIN_TYPES;
+
+//
+// Bin ranges
+//
+
+typedef struct _BIN_RANGE {
+    LARGE_INTEGER StartValue;
+    LARGE_INTEGER Length;
+} BIN_RANGE, *PBIN_RANGE;
+
+//
+// Bin definition
+//
+
+typedef struct _PERF_BIN {
+    DWORD NumberOfBins;
+    DWORD TypeOfBin;
+    BIN_RANGE BinsRanges[1];
+} PERF_BIN, *PPERF_BIN ;
+
+//
+// Bin count
+//
+
+typedef struct _BIN_COUNT {
+    BIN_RANGE BinRange;
+    DWORD BinCount;
+} BIN_COUNT, *PBIN_COUNT;
+
+//
+// Bin results
+//
+
+typedef struct _BIN_RESULTS {
+    DWORD NumberOfBins;
+    BIN_COUNT BinCounts[1];
+} BIN_RESULTS, *PBIN_RESULTS;
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Data structures for SMART drive fault prediction.
+//
+// GETVERSIONINPARAMS contains the data returned from the
+// Get Driver Version function.
+//
+
+#include <pshpack1.h>
+typedef struct _GETVERSIONINPARAMS {
+        BYTE     bVersion;               // Binary driver version.
+        BYTE     bRevision;              // Binary driver revision.
+        BYTE     bReserved;              // Not used.
+        BYTE     bIDEDeviceMap;          // Bit map of IDE devices.
+        DWORD   fCapabilities;          // Bit mask of driver capabilities.
+        DWORD   dwReserved[4];          // For future use.
+} GETVERSIONINPARAMS, *PGETVERSIONINPARAMS, *LPGETVERSIONINPARAMS;
+#include <poppack.h>
+
+//
+// Bits returned in the fCapabilities member of GETVERSIONINPARAMS
+//
+
+#define CAP_ATA_ID_CMD          1       // ATA ID command supported
+#define CAP_ATAPI_ID_CMD        2       // ATAPI ID command supported
+#define CAP_SMART_CMD           4       // SMART commannds supported
+
+//
+// IDE registers
+//
+
+#include <pshpack1.h>
+typedef struct _IDEREGS {
+        BYTE     bFeaturesReg;           // Used for specifying SMART "commands".
+        BYTE     bSectorCountReg;        // IDE sector count register
+        BYTE     bSectorNumberReg;       // IDE sector number register
+        BYTE     bCylLowReg;             // IDE low order cylinder value
+        BYTE     bCylHighReg;            // IDE high order cylinder value
+        BYTE     bDriveHeadReg;          // IDE drive/head register
+        BYTE     bCommandReg;            // Actual IDE command.
+        BYTE     bReserved;                      // reserved for future use.  Must be zero.
+} IDEREGS, *PIDEREGS, *LPIDEREGS;
+#include <poppack.h>
+
+//
+// Valid values for the bCommandReg member of IDEREGS.
+//
+
+#define ATAPI_ID_CMD    0xA1            // Returns ID sector for ATAPI.
+#define ID_CMD          0xEC            // Returns ID sector for ATA.
+#define SMART_CMD       0xB0            // Performs SMART cmd.
+                                        // Requires valid bFeaturesReg,
+                                        // bCylLowReg, and bCylHighReg
+
+//
+// Cylinder register defines for SMART command
+//
+
+#define SMART_CYL_LOW   0x4F
+#define SMART_CYL_HI    0xC2
+
+
+//
+// SENDCMDINPARAMS contains the input parameters for the
+// Send Command to Drive function.
+//
+
+#include <pshpack1.h>
+typedef struct _SENDCMDINPARAMS {
+        DWORD   cBufferSize;            // Buffer size in bytes
+        IDEREGS irDriveRegs;            // Structure with drive register values.
+        BYTE     bDriveNumber;           // Physical drive number to send
+                                                                // command to (0,1,2,3).
+        BYTE     bReserved[3];           // Reserved for future expansion.
+        DWORD   dwReserved[4];          // For future use.
+        BYTE     bBuffer[1];                     // Input buffer.
+} SENDCMDINPARAMS, *PSENDCMDINPARAMS, *LPSENDCMDINPARAMS;
+#include <poppack.h>
+
+//
+// Status returned from driver
+//
+
+#include <pshpack1.h>
+typedef struct _DRIVERSTATUS {
+        BYTE     bDriverError;           // Error code from driver,
+                                                                // or 0 if no error.
+        BYTE     bIDEError;                      // Contents of IDE Error register.
+                                                                // Only valid when bDriverError
+                                                                // is SMART_IDE_ERROR.
+        BYTE     bReserved[2];           // Reserved for future expansion.
+        DWORD   dwReserved[2];          // Reserved for future expansion.
+} DRIVERSTATUS, *PDRIVERSTATUS, *LPDRIVERSTATUS;
+#include <poppack.h>
+
+//
+// bDriverError values
+//
+
+#define SMART_NO_ERROR          0       // No error
+#define SMART_IDE_ERROR         1       // Error from IDE controller
+#define SMART_INVALID_FLAG      2       // Invalid command flag
+#define SMART_INVALID_COMMAND   3       // Invalid command byte
+#define SMART_INVALID_BUFFER    4       // Bad buffer (null, invalid addr..)
+#define SMART_INVALID_DRIVE     5       // Drive number not valid
+#define SMART_INVALID_IOCTL     6       // Invalid IOCTL
+#define SMART_ERROR_NO_MEM      7       // Could not lock user's buffer
+#define SMART_INVALID_REGISTER  8       // Some IDE Register not valid
+#define SMART_NOT_SUPPORTED     9       // Invalid cmd flag set
+#define SMART_NO_IDE_DEVICE     10      // Cmd issued to device not present
+                                        // although drive number is valid
+//
+// SMART sub commands for execute offline diags
+//
+#define SMART_OFFLINE_ROUTINE_OFFLINE       0
+#define SMART_SHORT_SELFTEST_OFFLINE        1
+#define SMART_EXTENDED_SELFTEST_OFFLINE     2
+#define SMART_ABORT_OFFLINE_SELFTEST        127
+#define SMART_SHORT_SELFTEST_CAPTIVE        129
+#define SMART_EXTENDED_SELFTEST_CAPTIVE     130
+
+
+#include <pshpack1.h>
+typedef struct _SENDCMDOUTPARAMS {
+        DWORD                   cBufferSize;            // Size of bBuffer in bytes
+        DRIVERSTATUS            DriverStatus;           // Driver status structure.
+        BYTE                    bBuffer[1];             // Buffer of arbitrary length in which to store the data read from the                                                                                  // drive.
+} SENDCMDOUTPARAMS, *PSENDCMDOUTPARAMS, *LPSENDCMDOUTPARAMS;
+#include <poppack.h>
+
+
+#define READ_ATTRIBUTE_BUFFER_SIZE  512
+#define IDENTIFY_BUFFER_SIZE        512
+#define READ_THRESHOLD_BUFFER_SIZE  512
+#define SMART_LOG_SECTOR_SIZE       512
+
+//
+// Feature register defines for SMART "sub commands"
+//
+
+#define READ_ATTRIBUTES         0xD0
+#define READ_THRESHOLDS         0xD1
+#define ENABLE_DISABLE_AUTOSAVE 0xD2
+#define SAVE_ATTRIBUTE_VALUES   0xD3
+#define EXECUTE_OFFLINE_DIAGS   0xD4
+#define SMART_READ_LOG          0xD5
+#define SMART_WRITE_LOG         0xd6
+#define ENABLE_SMART            0xD8
+#define DISABLE_SMART           0xD9
+#define RETURN_SMART_STATUS     0xDA
+#define ENABLE_DISABLE_AUTO_OFFLINE 0xDB
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+
+#define IOCTL_CHANGER_BASE                FILE_DEVICE_CHANGER
+
+#define IOCTL_CHANGER_GET_PARAMETERS         CTL_CODE(IOCTL_CHANGER_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_GET_STATUS             CTL_CODE(IOCTL_CHANGER_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_GET_PRODUCT_DATA       CTL_CODE(IOCTL_CHANGER_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_SET_ACCESS             CTL_CODE(IOCTL_CHANGER_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_CHANGER_GET_ELEMENT_STATUS     CTL_CODE(IOCTL_CHANGER_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_CHANGER_INITIALIZE_ELEMENT_STATUS  CTL_CODE(IOCTL_CHANGER_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_SET_POSITION           CTL_CODE(IOCTL_CHANGER_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_EXCHANGE_MEDIUM        CTL_CODE(IOCTL_CHANGER_BASE, 0x0008, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_MOVE_MEDIUM            CTL_CODE(IOCTL_CHANGER_BASE, 0x0009, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_REINITIALIZE_TRANSPORT CTL_CODE(IOCTL_CHANGER_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CHANGER_QUERY_VOLUME_TAGS      CTL_CODE(IOCTL_CHANGER_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+
+
+
+#define MAX_VOLUME_ID_SIZE       36
+#define MAX_VOLUME_TEMPLATE_SIZE 40
+
+#define VENDOR_ID_LENGTH          8
+#define PRODUCT_ID_LENGTH        16
+#define REVISION_LENGTH           4
+#define SERIAL_NUMBER_LENGTH     32
+
+//
+// Common structures describing elements.
+//
+
+typedef  enum _ELEMENT_TYPE {
+    AllElements,        // As defined by SCSI
+    ChangerTransport,   // As defined by SCSI
+    ChangerSlot,        // As defined by SCSI
+    ChangerIEPort,      // As defined by SCSI
+    ChangerDrive,       // As defined by SCSI
+    ChangerDoor,        // Front panel, used to access internal of cabinet.
+    ChangerKeypad,      // Keypad/input on front panel.
+    ChangerMaxElement   // Placeholder only. Not a valid type.
+} ELEMENT_TYPE, *PELEMENT_TYPE;
+
+typedef  struct _CHANGER_ELEMENT {
+    ELEMENT_TYPE    ElementType;
+    DWORD   ElementAddress;
+} CHANGER_ELEMENT, *PCHANGER_ELEMENT;
+
+typedef  struct _CHANGER_ELEMENT_LIST {
+    CHANGER_ELEMENT Element;
+    DWORD   NumberOfElements;
+} CHANGER_ELEMENT_LIST , *PCHANGER_ELEMENT_LIST;
+
+
+//
+// Definitions for  IOCTL_CHANGER_GET_PARAMETERS
+//
+
+//
+// Definitions for Features0 of GET_CHANGER_PARAMETERS
+//
+
+#define CHANGER_BAR_CODE_SCANNER_INSTALLED  0x00000001 // The medium-changer has a bar code scanner installed.
+#define CHANGER_INIT_ELEM_STAT_WITH_RANGE   0x00000002 // The medium-changer has the ability to initialize elements within a specified range.
+#define CHANGER_CLOSE_IEPORT                0x00000004 // The medium-changer has the ability to close the i/e port door.
+#define CHANGER_OPEN_IEPORT                 0x00000008 // The medium-changer can open the i/e port door.
+
+#define CHANGER_STATUS_NON_VOLATILE         0x00000010 // The medium-changer uses non-volatile memory for element status information.
+#define CHANGER_EXCHANGE_MEDIA              0x00000020 // The medium-changer supports exchange operations.
+#define CHANGER_CLEANER_SLOT                0x00000040 // The medium-changer has a fixed slot designated for cleaner cartridges.
+#define CHANGER_LOCK_UNLOCK                 0x00000080 // The medium-changer can be (un)secured to (allow)prevent media removal.
+
+#define CHANGER_CARTRIDGE_MAGAZINE          0x00000100 // The medium-changer uses cartridge magazines for some storage slots.
+#define CHANGER_MEDIUM_FLIP                 0x00000200 // The medium-changer can flip medium.
+#define CHANGER_POSITION_TO_ELEMENT         0x00000400 // The medium-changer can position the transport to a particular element.
+#define CHANGER_REPORT_IEPORT_STATE         0x00000800 // The medium-changer can determine whether media is present
+                                                       // in the IE Port.
+
+#define CHANGER_STORAGE_DRIVE               0x00001000 // The medium-changer can use a drive as an independent storage element.
+#define CHANGER_STORAGE_IEPORT              0x00002000 // The medium-changer can use a i/e port as an independent storage element.
+#define CHANGER_STORAGE_SLOT                0x00004000 // The medium-changer can use a slot as an independent storage element.
+#define CHANGER_STORAGE_TRANSPORT           0x00008000 // The medium-changer can use a transport as an independent storage element.
+
+#define CHANGER_DRIVE_CLEANING_REQUIRED     0x00010000 // The drives controlled by the medium changer require periodic cleaning
+                                                       // initiated by an application.
+#define CHANGER_PREDISMOUNT_EJECT_REQUIRED  0x00020000 // The medium-changer requires a drive eject command to be issued, before a changer
+                                                       // move / exchange command can be issued to the drive.
+
+#define CHANGER_CLEANER_ACCESS_NOT_VALID    0x00040000 // The access bit in GES isn't valid for cleaner cartridges.
+#define CHANGER_PREMOUNT_EJECT_REQUIRED     0x00080000 // The medium-changer requires a drive eject command to be issued
+                                                       // before a move / exchange command can be issued with the drive as src/dst.
+
+#define CHANGER_VOLUME_IDENTIFICATION       0x00100000 // The medium-changer supports volume identification.
+#define CHANGER_VOLUME_SEARCH               0x00200000 // The medium-changer can search for volume information.
+#define CHANGER_VOLUME_ASSERT               0x00400000 // The medium-changer can verify volume information.
+#define CHANGER_VOLUME_REPLACE              0x00800000 // The medium-changer can replace volume information.
+#define CHANGER_VOLUME_UNDEFINE             0x01000000 // The medium-changer can undefine volume information.
+
+#define CHANGER_SERIAL_NUMBER_VALID         0x04000000 // The serial number reported in GetProductData is valid
+                                                       // and unique.
+
+#define CHANGER_DEVICE_REINITIALIZE_CAPABLE 0x08000000 // The medium-changer can be issued a ChangerReinitializeUnit.
+#define CHANGER_KEYPAD_ENABLE_DISABLE       0x10000000 // Indicates that the keypad can be enabled/disabled.
+#define CHANGER_DRIVE_EMPTY_ON_DOOR_ACCESS  0x20000000 // Drives must be empty before access via the door is possible.
+
+#define CHANGER_RESERVED_BIT                0x80000000 // Will be used to indicate Features1 capability bits.
+
+
+//
+// Definitions for Features1 of GET_CHANGER_PARAMETERS
+//
+
+#define CHANGER_PREDISMOUNT_ALIGN_TO_SLOT   0x80000001 // The transport must be prepositioned to the slot prior to ejecting the media.
+#define CHANGER_PREDISMOUNT_ALIGN_TO_DRIVE  0x80000002 // The transport must be prepositioned to the drive prior to ejecting the media.
+#define CHANGER_CLEANER_AUTODISMOUNT        0x80000004 // The device will move the cleaner cartridge back into the slot when cleaning has completed.
+#define CHANGER_TRUE_EXCHANGE_CAPABLE       0x80000008 // Device can do src -> dest2 exchanges.
+#define CHANGER_SLOTS_USE_TRAYS             0x80000010 // Slots have removable trays, requiring multiple moves for inject/eject.
+#define CHANGER_RTN_MEDIA_TO_ORIGINAL_ADDR  0x80000020 // Media must be returned to the slot from which it originated after a move to another element.
+#define CHANGER_CLEANER_OPS_NOT_SUPPORTED   0x80000040 // Automated cleaning operations are not supported on this device.
+#define CHANGER_IEPORT_USER_CONTROL_OPEN    0x80000080 // Indicates that user action is necessary to open a closed ieport.
+#define CHANGER_IEPORT_USER_CONTROL_CLOSE   0x80000100 // Indicates that user action is necessary to close an opened ieport.
+#define CHANGER_MOVE_EXTENDS_IEPORT         0x80000200 // Indicates that a move media to the ieport extends the tray.
+#define CHANGER_MOVE_RETRACTS_IEPORT        0x80000400 // Indicates that a move media from the ieport retracts the tray.
+
+
+//
+// Definitions for MoveFrom, ExchangeFrom, and PositionCapabilities
+//
+
+#define CHANGER_TO_TRANSPORT    0x01 // The device can carry out the operation to a transport from the specified element.
+#define CHANGER_TO_SLOT         0x02 // The device can carry out the operation to a slot from the specified element.
+#define CHANGER_TO_IEPORT       0x04 // The device can carry out the operation to an IE Port from the specified element.
+#define CHANGER_TO_DRIVE        0x08 // The device can carry out the operation to a drive from the specified element.
+
+//
+// Definitions for LockUnlockCapabilities
+//
+
+#define LOCK_UNLOCK_IEPORT      0x01 // The device can lock/unlock the ieport(s).
+#define LOCK_UNLOCK_DOOR        0x02 // The device can lock/unlock the door(s).
+#define LOCK_UNLOCK_KEYPAD      0x04 // The device can lock/unlock the keypad.
+
+typedef  struct _GET_CHANGER_PARAMETERS {
+
+    //
+    // Size of the structure. Can be used for versioning.
+    //
+
+    DWORD Size;
+
+    //
+    // Number of N element(s) as defined by the Element Address Page (or equivalent...).
+    //
+
+    WORD   NumberTransportElements;
+    WORD   NumberStorageElements;                // for data cartridges only
+    WORD   NumberCleanerSlots;                   // for cleaner cartridges
+    WORD   NumberIEElements;
+    WORD   NumberDataTransferElements;
+
+    //
+    // Number of doors/front panels (allows user entry into the cabinet).
+    //
+
+    WORD   NumberOfDoors;
+
+    //
+    // The device-specific address (from user manual of the device) of the first N element. Used
+    // by the UI to relate the various elements to the user.
+    //
+
+    WORD   FirstSlotNumber;
+    WORD   FirstDriveNumber;
+    WORD   FirstTransportNumber;
+    WORD   FirstIEPortNumber;
+    WORD   FirstCleanerSlotAddress;
+
+    //
+    // Indicates the capacity of each magazine, if they exist.
+    //
+
+    WORD   MagazineSize;
+
+    //
+    // Specifies the approximate number of seconds for when a cleaning should be completed.
+    // Only applicable if drive cleaning is supported. See Features0.
+    //
+
+    DWORD DriveCleanTimeout;
+
+    //
+    // See features bits, above.
+    //
+
+    DWORD Features0;
+    DWORD Features1;
+
+    //
+    // Bitmask defining Move from N element to element. Defined by Device Capabilities Page (or equivalent).
+    // AND-masking with the TO_XXX values will indicate legal destinations.
+    //
+
+    BYTE  MoveFromTransport;
+    BYTE  MoveFromSlot;
+    BYTE  MoveFromIePort;
+    BYTE  MoveFromDrive;
+
+    //
+    // Bitmask defining Exchange from N element to element. Defined by Device Capabilities Page (or equivalent).
+    // AND-masking with the TO_XXX values will indicate legal destinations.
+    //
+
+    BYTE  ExchangeFromTransport;
+    BYTE  ExchangeFromSlot;
+    BYTE  ExchangeFromIePort;
+    BYTE  ExchangeFromDrive;
+
+    //
+    // Bitmask defining which elements are capable of lock/unlock. Valid only if
+    // CHANGER_LOCK_UNLOCK is set in Features0.
+    //
+
+    BYTE  LockUnlockCapabilities;
+
+    //
+    // Bitmask defining which elements valid for positioning operations. Valid only if
+    // CHANGER_POSITION_TO_ELEMENT is set in Features0.
+    //
+
+    BYTE  PositionCapabilities;
+
+    //
+    // For future expansion.
+    //
+
+    BYTE  Reserved1[2];
+    DWORD Reserved2[2];
+
+} GET_CHANGER_PARAMETERS, * PGET_CHANGER_PARAMETERS;
+
+
+//
+// Definitions for IOCTL_CHANGER_GET_PRODUCT_DATA
+//
+
+typedef  struct _CHANGER_PRODUCT_DATA {
+
+    //
+    // Device manufacturer's name - based on inquiry data
+    //
+
+    BYTE  VendorId[VENDOR_ID_LENGTH];
+
+    //
+    // Product identification as defined by the vendor - based on Inquiry data
+    //
+
+    BYTE  ProductId[PRODUCT_ID_LENGTH];
+
+    //
+    // Product revision as defined by the vendor.
+    //
+
+    BYTE  Revision[REVISION_LENGTH];
+
+    //
+    // Vendor unique value used to globally identify this device. Can
+    // be from Vital Product Data, for example.
+    //
+
+    BYTE  SerialNumber[SERIAL_NUMBER_LENGTH];
+
+    //
+    // Indicates device type of data transports, as defined by SCSI-2.
+    //
+
+    BYTE  DeviceType;
+
+} CHANGER_PRODUCT_DATA, *PCHANGER_PRODUCT_DATA;
+
+
+//
+// Definitions for IOCTL_CHANGER_SET_ACCESS
+//
+
+#define LOCK_ELEMENT        0
+#define UNLOCK_ELEMENT      1
+#define EXTEND_IEPORT       2
+#define RETRACT_IEPORT      3
+
+typedef struct _CHANGER_SET_ACCESS {
+
+    //
+    // Element can be ChangerIEPort, ChangerDoor, ChangerKeypad
+    //
+
+    CHANGER_ELEMENT Element;
+
+    //
+    // See above for possible operations.
+    //
+
+    DWORD           Control;
+} CHANGER_SET_ACCESS, *PCHANGER_SET_ACCESS;
+
+
+//
+// Definitions for IOCTL_CHANGER_GET_ELEMENT_STATUS
+//
+
+//
+// Input buffer.
+//
+
+typedef struct _CHANGER_READ_ELEMENT_STATUS {
+
+    //
+    // List describing the elements and range on which to return information.
+    //
+
+    CHANGER_ELEMENT_LIST ElementList;
+
+    //
+    // Indicates whether volume tag information is to be returned.
+    //
+
+    BOOLEAN VolumeTagInfo;
+} CHANGER_READ_ELEMENT_STATUS, *PCHANGER_READ_ELEMENT_STATUS;
+
+//
+// Output buffer.
+//
+
+typedef  struct _CHANGER_ELEMENT_STATUS {
+
+    //
+    // Element to which this structure refers.
+    //
+
+    CHANGER_ELEMENT Element;
+
+    //
+    // Address of the element from which the media was originally moved.
+    // Valid if ELEMENT_STATUS_SVALID bit of Flags DWORD is set.
+    // Needs to be converted to a zero-based offset from the device-unique value.
+    //
+
+    CHANGER_ELEMENT SrcElementAddress;
+
+    //
+    // See below.
+    //
+
+    DWORD Flags;
+
+    //
+    // See below for possible values.
+    //
+
+    DWORD ExceptionCode;
+
+    //
+    // Scsi Target Id of this element.
+    // Valid only if ELEMENT_STATUS_ID_VALID is set in Flags.
+    //
+
+    BYTE  TargetId;
+
+    //
+    // LogicalUnitNumber of this element.
+    // Valid only if ELEMENT_STATUS_LUN_VALID is set in Flags.
+    //
+
+    BYTE  Lun;
+    WORD   Reserved;
+
+    //
+    // Primary volume identification for the media.
+    // Valid only if ELEMENT_STATUS_PVOLTAG bit is set in Flags.
+    //
+
+    BYTE  PrimaryVolumeID[MAX_VOLUME_ID_SIZE];
+
+    //
+    // Alternate volume identification for the media.
+    // Valid for two-sided media only, and pertains to the id. of the inverted side.
+    // Valid only if ELEMENT_STATUS_AVOLTAG bit is set in Flags.
+    //
+
+    BYTE  AlternateVolumeID[MAX_VOLUME_ID_SIZE];
+
+} CHANGER_ELEMENT_STATUS, *PCHANGER_ELEMENT_STATUS;
+
+//
+// Output buffer. This is same as CHANGER_ELEMENT_STATUS with
+// the addition of product info fields. New applications should
+// use this struct instead of the older CHANGER_ELEMENT_STATUS
+//
+
+typedef  struct _CHANGER_ELEMENT_STATUS_EX {
+
+    //
+    // Element to which this structure refers.
+    //
+
+    CHANGER_ELEMENT Element;
+
+    //
+    // Address of the element from which the media was originally moved.
+    // Valid if ELEMENT_STATUS_SVALID bit of Flags DWORD is set.
+    // Needs to be converted to a zero-based offset from the device-unique value.
+    //
+
+    CHANGER_ELEMENT SrcElementAddress;
+
+    //
+    // See below.
+    //
+
+    DWORD Flags;
+
+    //
+    // See below for possible values.
+    //
+
+    DWORD ExceptionCode;
+
+    //
+    // Scsi Target Id of this element.
+    // Valid only if ELEMENT_STATUS_ID_VALID is set in Flags.
+    //
+
+    BYTE  TargetId;
+
+    //
+    // LogicalUnitNumber of this element.
+    // Valid only if ELEMENT_STATUS_LUN_VALID is set in Flags.
+    //
+
+    BYTE  Lun;
+    WORD   Reserved;
+
+    //
+    // Primary volume identification for the media.
+    // Valid only if ELEMENT_STATUS_PVOLTAG bit is set in Flags.
+    //
+
+    BYTE  PrimaryVolumeID[MAX_VOLUME_ID_SIZE];
+
+    //
+    // Alternate volume identification for the media.
+    // Valid for two-sided media only, and pertains to the id. of the inverted side.
+    // Valid only if ELEMENT_STATUS_AVOLTAG bit is set in Flags.
+    //
+
+    BYTE  AlternateVolumeID[MAX_VOLUME_ID_SIZE];
+
+    //
+    // Vendor ID
+    //
+    BYTE  VendorIdentification[VENDOR_ID_LENGTH];
+
+    //
+    // Product ID
+    //
+    BYTE  ProductIdentification[PRODUCT_ID_LENGTH];
+
+    //
+    // Serial number
+    //
+    BYTE  SerialNumber[SERIAL_NUMBER_LENGTH];
+
+} CHANGER_ELEMENT_STATUS_EX, *PCHANGER_ELEMENT_STATUS_EX;
+
+//
+// Possible flag values
+//
+
+#define ELEMENT_STATUS_FULL      0x00000001 // Element contains a unit of media.
+#define ELEMENT_STATUS_IMPEXP    0x00000002 // Media in i/e port was placed there by an operator.
+#define ELEMENT_STATUS_EXCEPT    0x00000004 // Element is in an abnormal state; check ExceptionCode field for more information.
+#define ELEMENT_STATUS_ACCESS    0x00000008 // Access to the i/e port from the medium changer is allowed.
+#define ELEMENT_STATUS_EXENAB    0x00000010 // Export of media is supported.
+#define ELEMENT_STATUS_INENAB    0x00000020 // Import of media is supported.
+
+#define ELEMENT_STATUS_PRODUCT_DATA 0x00000040 // Serial number valid for the drive
+
+#define ELEMENT_STATUS_LUN_VALID 0x00001000 // Lun information is valid.
+#define ELEMENT_STATUS_ID_VALID  0x00002000 // SCSI Id information is valid.
+#define ELEMENT_STATUS_NOT_BUS   0x00008000 // Lun and SCSI Id fields are not on same bus as medium changer.
+#define ELEMENT_STATUS_INVERT    0x00400000 // Media in element was inverted (valid only if ELEMENT_STATUS_SVALID bit is set)
+#define ELEMENT_STATUS_SVALID    0x00800000 // SourceElementAddress field and ELEMENT_STATUS_INVERT bit are valid.
+
+#define ELEMENT_STATUS_PVOLTAG   0x10000000 // Primary volume information is valid.
+#define ELEMENT_STATUS_AVOLTAG   0x20000000 // Alternate volume information is valid.
+
+//
+// ExceptionCode values.
+//
+
+#define ERROR_LABEL_UNREADABLE    0x00000001 // Bar code scanner could not read bar code label.
+#define ERROR_LABEL_QUESTIONABLE  0x00000002 // Label could be invalid due to unit attention condition.
+#define ERROR_SLOT_NOT_PRESENT    0x00000004 // Slot is currently not addressable in the device.
+#define ERROR_DRIVE_NOT_INSTALLED 0x00000008 // Drive is not installed.
+#define ERROR_TRAY_MALFUNCTION    0x00000010 // Media tray is malfunctioning/broken.
+#define ERROR_INIT_STATUS_NEEDED  0x00000011 // An Initialize Element Status command is needed.
+#define ERROR_UNHANDLED_ERROR     0xFFFFFFFF // Unknown error condition
+
+
+//
+// Definitions for IOCTL_CHANGER_INITIALIZE_ELEMENT_STATUS
+//
+
+typedef struct _CHANGER_INITIALIZE_ELEMENT_STATUS {
+
+    //
+    // List describing the elements and range on which to initialize.
+    //
+
+    CHANGER_ELEMENT_LIST ElementList;
+
+    //
+    // Indicates whether a bar code scan should be used. Only applicable if
+    // CHANGER_BAR_CODE_SCANNER_INSTALLED is set in Features0 of CHANGER_GET_PARAMETERS.
+    //
+
+    BOOLEAN BarCodeScan;
+} CHANGER_INITIALIZE_ELEMENT_STATUS, *PCHANGER_INITIALIZE_ELEMENT_STATUS;
+
+
+//
+// Definitions for IOCTL_CHANGER_SET_POSITION
+//
+
+typedef struct _CHANGER_SET_POSITION {
+
+
+    //
+    // Indicates which transport to move.
+    //
+
+    CHANGER_ELEMENT Transport;
+
+    //
+    // Indicates the final destination of the transport.
+    //
+
+    CHANGER_ELEMENT Destination;
+
+    //
+    // Indicates whether the media currently carried by Transport, should be flipped.
+    //
+
+    BOOLEAN         Flip;
+} CHANGER_SET_POSITION, *PCHANGER_SET_POSITION;
+
+
+//
+// Definitions for IOCTL_CHANGER_EXCHANGE_MEDIUM
+//
+
+typedef struct _CHANGER_EXCHANGE_MEDIUM {
+
+    //
+    // Indicates which transport to use for the exchange operation.
+    //
+
+    CHANGER_ELEMENT Transport;
+
+    //
+    // Indicates the source for the media that is to be moved.
+    //
+
+    CHANGER_ELEMENT Source;
+
+    //
+    // Indicates the final destination of the media originally at Source.
+    //
+
+    CHANGER_ELEMENT Destination1;
+
+    //
+    // Indicates the destination of the media moved from Destination1.
+    //
+
+    CHANGER_ELEMENT Destination2;
+
+    //
+    // Indicates whether the medium should be flipped.
+    //
+
+    BOOLEAN         Flip1;
+    BOOLEAN         Flip2;
+} CHANGER_EXCHANGE_MEDIUM, *PCHANGER_EXCHANGE_MEDIUM;
+
+
+//
+// Definitions for IOCTL_CHANGER_MOVE_MEDIUM
+//
+
+typedef struct _CHANGER_MOVE_MEDIUM {
+
+    //
+    // Indicates which transport to use for the move operation.
+    //
+
+    CHANGER_ELEMENT Transport;
+
+    //
+    // Indicates the source for the media that is to be moved.
+    //
+
+    CHANGER_ELEMENT Source;
+
+    //
+    // Indicates the destination of the media originally at Source.
+    //
+
+    CHANGER_ELEMENT Destination;
+
+    //
+    // Indicates whether the media should be flipped.
+    //
+
+    BOOLEAN         Flip;
+} CHANGER_MOVE_MEDIUM, *PCHANGER_MOVE_MEDIUM;
+
+
+
+//
+// Definitions for IOCTL_QUERY_VOLUME_TAGS
+//
+
+//
+// Input buffer.
+//
+
+typedef  struct _CHANGER_SEND_VOLUME_TAG_INFORMATION {
+
+    //
+    // Describes the starting element for which to return information.
+    //
+
+    CHANGER_ELEMENT StartingElement;
+
+    //
+    // Indicates the specific action to perform. See below.
+    //
+
+    DWORD ActionCode;
+
+    //
+    // Template used by the device to search for volume ids.
+    //
+
+    BYTE  VolumeIDTemplate[MAX_VOLUME_TEMPLATE_SIZE];
+} CHANGER_SEND_VOLUME_TAG_INFORMATION, *PCHANGER_SEND_VOLUME_TAG_INFORMATION;
+
+
+//
+// Output buffer.
+//
+
+typedef struct _READ_ELEMENT_ADDRESS_INFO {
+
+    //
+    // Number of elements matching criteria set forth by ActionCode.
+    //
+
+    DWORD NumberOfElements;
+
+    //
+    // Array of CHANGER_ELEMENT_STATUS structures, one for each element that corresponded
+    // with the information passed in with the CHANGER_SEND_VOLUME_TAG_INFORMATION structure.
+    //
+
+    CHANGER_ELEMENT_STATUS ElementStatus[1];
+} READ_ELEMENT_ADDRESS_INFO, *PREAD_ELEMENT_ADDRESS_INFO;
+
+//
+// Possible ActionCode values. See Features0 of CHANGER_GET_PARAMETERS for compatibility with
+// the current device.
+//
+
+#define SEARCH_ALL         0x0 // Translate - search all defined volume tags.
+#define SEARCH_PRIMARY     0x1 // Translate - search only primary volume tags.
+#define SEARCH_ALTERNATE   0x2 // Translate - search only alternate volume tags.
+#define SEARCH_ALL_NO_SEQ  0x4 // Translate - search all defined volume tags but ignore sequence numbers.
+#define SEARCH_PRI_NO_SEQ  0x5 // Translate - search only primary volume tags but ignore sequence numbers.
+#define SEARCH_ALT_NO_SEQ  0x6 // Translate - search only alternate volume tags but ignore sequence numbers.
+
+#define ASSERT_PRIMARY     0x8 // Assert - as the primary volume tag - if tag now undefined.
+#define ASSERT_ALTERNATE   0x9 // Assert - as the alternate volume tag - if tag now undefined.
+
+#define REPLACE_PRIMARY    0xA // Replace - the primary volume tag - current tag ignored.
+#define REPLACE_ALTERNATE  0xB // Replace - the alternate volume tag - current tag ignored.
+
+#define UNDEFINE_PRIMARY   0xC // Undefine - the primary volume tag - current tag ignored.
+#define UNDEFINE_ALTERNATE 0xD // Undefine - the alternate volume tag - current tag ignored.
+
+
+//
+// Changer diagnostic test related definitions
+//
+typedef enum _CHANGER_DEVICE_PROBLEM_TYPE {
+   DeviceProblemNone,
+   DeviceProblemHardware,
+   DeviceProblemCHMError,
+   DeviceProblemDoorOpen,
+   DeviceProblemCalibrationError,
+   DeviceProblemTargetFailure,
+   DeviceProblemCHMMoveError,
+   DeviceProblemCHMZeroError,
+   DeviceProblemCartridgeInsertError,
+   DeviceProblemPositionError,
+   DeviceProblemSensorError,
+   DeviceProblemCartridgeEjectError,
+   DeviceProblemGripperError,
+   DeviceProblemDriveError
+} CHANGER_DEVICE_PROBLEM_TYPE, *PCHANGER_DEVICE_PROBLEM_TYPE;
+
+
+#define IOCTL_SERIAL_LSRMST_INSERT      CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS)
+
+#define IOCTL_SERENUM_EXPOSE_HARDWARE   CTL_CODE(FILE_DEVICE_SERENUM,128,METHOD_BUFFERED,FILE_ANY_ACCESS)
+#define IOCTL_SERENUM_REMOVE_HARDWARE   CTL_CODE(FILE_DEVICE_SERENUM,129,METHOD_BUFFERED,FILE_ANY_ACCESS)
+#define IOCTL_SERENUM_PORT_DESC         CTL_CODE(FILE_DEVICE_SERENUM,130,METHOD_BUFFERED,FILE_ANY_ACCESS)
+#define IOCTL_SERENUM_GET_PORT_NAME     CTL_CODE(FILE_DEVICE_SERENUM,131,METHOD_BUFFERED,FILE_ANY_ACCESS)
+
+
+//
+// The following values follow the escape designator in the
+// data stream if the LSRMST_INSERT mode has been turned on.
+//
+#define SERIAL_LSRMST_ESCAPE     ((BYTE )0x00)
+
+//
+// Following this value is the contents of the line status
+// register, and then the character in the RX hardware when
+// the line status register was encountered.
+//
+#define SERIAL_LSRMST_LSR_DATA   ((BYTE )0x01)
+
+//
+// Following this value is the contents of the line status
+// register.  No error character follows
+//
+#define SERIAL_LSRMST_LSR_NODATA ((BYTE )0x02)
+
+//
+// Following this value is the contents of the modem status
+// register.
+//
+#define SERIAL_LSRMST_MST        ((BYTE )0x03)
+
+//
+// Bit values for FIFO Control Register
+//
+
+#define SERIAL_IOC_FCR_FIFO_ENABLE      ((DWORD)0x00000001)
+#define SERIAL_IOC_FCR_RCVR_RESET       ((DWORD)0x00000002)
+#define SERIAL_IOC_FCR_XMIT_RESET       ((DWORD)0x00000004)
+#define SERIAL_IOC_FCR_DMA_MODE         ((DWORD)0x00000008)
+#define SERIAL_IOC_FCR_RES1             ((DWORD)0x00000010)
+#define SERIAL_IOC_FCR_RES2             ((DWORD)0x00000020)
+#define SERIAL_IOC_FCR_RCVR_TRIGGER_LSB ((DWORD)0x00000040)
+#define SERIAL_IOC_FCR_RCVR_TRIGGER_MSB ((DWORD)0x00000080)
+
+//
+// Bit values for Modem Control Register
+//
+
+#define SERIAL_IOC_MCR_DTR              ((DWORD)0x00000001)
+#define SERIAL_IOC_MCR_RTS              ((DWORD)0x00000002)
+#define SERIAL_IOC_MCR_OUT1             ((DWORD)0x00000004)
+#define SERIAL_IOC_MCR_OUT2             ((DWORD)0x00000008)
+#define SERIAL_IOC_MCR_LOOP             ((DWORD)0x00000010)
+
+#ifndef _FILESYSTEMFSCTL_
+#define _FILESYSTEMFSCTL_
+
+//
+// The following is a list of the native file system fsctls followed by
+// additional network file system fsctls.  Some values have been
+// decommissioned.
+//
+
+#define FSCTL_REQUEST_OPLOCK_LEVEL_1    CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  0, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_REQUEST_OPLOCK_LEVEL_2    CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  1, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_REQUEST_BATCH_OPLOCK      CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  2, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE  CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  3, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_OPBATCH_ACK_CLOSE_PENDING CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  4, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_OPLOCK_BREAK_NOTIFY       CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  5, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_LOCK_VOLUME               CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  6, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_UNLOCK_VOLUME             CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  7, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_DISMOUNT_VOLUME           CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  8, METHOD_BUFFERED, FILE_ANY_ACCESS)
+// decommissioned fsctl value                                              9
+#define FSCTL_IS_VOLUME_MOUNTED         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_IS_PATHNAME_VALID         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS) // PATHNAME_BUFFER,
+#define FSCTL_MARK_VOLUME_DIRTY         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
+// decommissioned fsctl value                                             13
+#define FSCTL_QUERY_RETRIEVAL_POINTERS  CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14,  METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_GET_COMPRESSION           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_SET_COMPRESSION           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
+// decommissioned fsctl value                                             17
+// decommissioned fsctl value                                             18
+#define FSCTL_MARK_AS_SYSTEM_HIVE       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19,  METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_OPLOCK_BREAK_ACK_NO_2     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 20, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_INVALIDATE_VOLUMES        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 21, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_QUERY_FAT_BPB             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED, FILE_ANY_ACCESS) // FSCTL_QUERY_FAT_BPB_BUFFER
+#define FSCTL_REQUEST_FILTER_OPLOCK     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 23, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) // FILESYSTEM_STATISTICS
+#if(_WIN32_WINNT >= 0x0400)
+#define FSCTL_GET_NTFS_VOLUME_DATA      CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 25, METHOD_BUFFERED, FILE_ANY_ACCESS) // NTFS_VOLUME_DATA_BUFFER
+#define FSCTL_GET_NTFS_FILE_RECORD      CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS) // NTFS_FILE_RECORD_INPUT_BUFFER, NTFS_FILE_RECORD_OUTPUT_BUFFER
+#define FSCTL_GET_VOLUME_BITMAP         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27,  METHOD_NEITHER, FILE_ANY_ACCESS) // STARTING_LCN_INPUT_BUFFER, VOLUME_BITMAP_BUFFER
+#define FSCTL_GET_RETRIEVAL_POINTERS    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28,  METHOD_NEITHER, FILE_ANY_ACCESS) // STARTING_VCN_INPUT_BUFFER, RETRIEVAL_POINTERS_BUFFER
+#define FSCTL_MOVE_FILE                 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) // MOVE_FILE_DATA,
+#define FSCTL_IS_VOLUME_DIRTY           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS)
+// decomissioned fsctl value                                              31
+#define FSCTL_ALLOW_EXTENDED_DASD_IO    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER,  FILE_ANY_ACCESS)
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0500)
+// decommissioned fsctl value                                             33
+// decommissioned fsctl value                                             34
+#define FSCTL_FIND_FILES_BY_SID         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS) // FIND_BY_SID_DATA, FIND_BY_SID_OUTPUT
+// decommissioned fsctl value                                             36
+// decommissioned fsctl value                                             37
+#define FSCTL_SET_OBJECT_ID             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) // FILE_OBJECTID_BUFFER
+#define FSCTL_GET_OBJECT_ID             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS) // FILE_OBJECTID_BUFFER
+#define FSCTL_DELETE_OBJECT_ID          CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
+#define FSCTL_SET_REPARSE_POINT         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) // REPARSE_DATA_BUFFER,
+#define FSCTL_GET_REPARSE_POINT         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) // REPARSE_DATA_BUFFER
+#define FSCTL_DELETE_REPARSE_POINT      CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) // REPARSE_DATA_BUFFER,
+#define FSCTL_ENUM_USN_DATA             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44,  METHOD_NEITHER, FILE_ANY_ACCESS) // MFT_ENUM_DATA,
+#define FSCTL_SECURITY_ID_CHECK         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45,  METHOD_NEITHER, FILE_READ_DATA)  // BULK_SECURITY_TEST_DATA,
+#define FSCTL_READ_USN_JOURNAL          CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46,  METHOD_NEITHER, FILE_ANY_ACCESS) // READ_USN_JOURNAL_DATA, USN
+#define FSCTL_SET_OBJECT_ID_EXTENDED    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
+#define FSCTL_CREATE_OR_GET_OBJECT_ID   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS) // FILE_OBJECTID_BUFFER
+#define FSCTL_SET_SPARSE                CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
+#define FSCTL_SET_ZERO_DATA             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA) // FILE_ZERO_DATA_INFORMATION,
+#define FSCTL_QUERY_ALLOCATED_RANGES    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51,  METHOD_NEITHER, FILE_READ_DATA)  // FILE_ALLOCATED_RANGE_BUFFER, FILE_ALLOCATED_RANGE_BUFFER
+// decommissioned fsctl value                                             52
+#define FSCTL_SET_ENCRYPTION            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53,  METHOD_NEITHER, FILE_ANY_ACCESS) // ENCRYPTION_BUFFER, DECRYPTION_STATUS_BUFFER
+#define FSCTL_ENCRYPTION_FSCTL_IO       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54,  METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_WRITE_RAW_ENCRYPTED       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55,  METHOD_NEITHER, FILE_SPECIAL_ACCESS) // ENCRYPTED_DATA_INFO,
+#define FSCTL_READ_RAW_ENCRYPTED        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56,  METHOD_NEITHER, FILE_SPECIAL_ACCESS) // REQUEST_RAW_ENCRYPTED_DATA, ENCRYPTED_DATA_INFO
+#define FSCTL_CREATE_USN_JOURNAL        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57,  METHOD_NEITHER, FILE_ANY_ACCESS) // CREATE_USN_JOURNAL_DATA,
+#define FSCTL_READ_FILE_USN_DATA        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58,  METHOD_NEITHER, FILE_ANY_ACCESS) // Read the Usn Record for a file
+#define FSCTL_WRITE_USN_CLOSE_RECORD    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59,  METHOD_NEITHER, FILE_ANY_ACCESS) // Generate Close Usn Record
+#define FSCTL_EXTEND_VOLUME             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_QUERY_USN_JOURNAL         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 61, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_DELETE_USN_JOURNAL        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 62, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_MARK_HANDLE               CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_SIS_COPYFILE              CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 64, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_SIS_LINK_FILES            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 65, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
+#define FSCTL_HSM_MSG                   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 66, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
+// decommissioned fsctl value                                             67
+#define FSCTL_HSM_DATA                  CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 68, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA)
+#define FSCTL_RECALL_FILE               CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 69, METHOD_NEITHER, FILE_ANY_ACCESS)
+// decommissioned fsctl value                                             70
+#define FSCTL_READ_FROM_PLEX            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT, FILE_READ_DATA)
+#define FSCTL_FILE_PREFETCH             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) // FILE_PREFETCH
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+//
+// The following long list of structs are associated with the preceeding
+// file system fsctls.
+//
+
+//
+// Structure for FSCTL_IS_PATHNAME_VALID
+//
+
+typedef struct _PATHNAME_BUFFER {
+
+    DWORD PathNameLength;
+    WCHAR Name[1];
+
+} PATHNAME_BUFFER, *PPATHNAME_BUFFER;
+
+//
+// Structure for FSCTL_QUERY_BPB_INFO
+//
+
+typedef struct _FSCTL_QUERY_FAT_BPB_BUFFER {
+
+    BYTE  First0x24BytesOfBootSector[0x24];
+
+} FSCTL_QUERY_FAT_BPB_BUFFER, *PFSCTL_QUERY_FAT_BPB_BUFFER;
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Structures for FSCTL_GET_NTFS_VOLUME_DATA.
+// The user must pass the basic buffer below.  Ntfs
+// will return as many fields as available in the extended
+// buffer which follows immediately after the VOLUME_DATA_BUFFER.
+//
+
+typedef struct {
+
+    LARGE_INTEGER VolumeSerialNumber;
+    LARGE_INTEGER NumberSectors;
+    LARGE_INTEGER TotalClusters;
+    LARGE_INTEGER FreeClusters;
+    LARGE_INTEGER TotalReserved;
+    DWORD BytesPerSector;
+    DWORD BytesPerCluster;
+    DWORD BytesPerFileRecordSegment;
+    DWORD ClustersPerFileRecordSegment;
+    LARGE_INTEGER MftValidDataLength;
+    LARGE_INTEGER MftStartLcn;
+    LARGE_INTEGER Mft2StartLcn;
+    LARGE_INTEGER MftZoneStart;
+    LARGE_INTEGER MftZoneEnd;
+
+} NTFS_VOLUME_DATA_BUFFER, *PNTFS_VOLUME_DATA_BUFFER;
+
+typedef struct {
+
+    DWORD ByteCount;
+
+    WORD   MajorVersion;
+    WORD   MinorVersion;
+
+} NTFS_EXTENDED_VOLUME_DATA, *PNTFS_EXTENDED_VOLUME_DATA;
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Structure for FSCTL_GET_VOLUME_BITMAP
+//
+
+typedef struct {
+
+    LARGE_INTEGER StartingLcn;
+
+} STARTING_LCN_INPUT_BUFFER, *PSTARTING_LCN_INPUT_BUFFER;
+
+typedef struct {
+
+    LARGE_INTEGER StartingLcn;
+    LARGE_INTEGER BitmapSize;
+    BYTE  Buffer[1];
+
+} VOLUME_BITMAP_BUFFER, *PVOLUME_BITMAP_BUFFER;
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Structure for FSCTL_GET_RETRIEVAL_POINTERS
+//
+
+typedef struct {
+
+    LARGE_INTEGER StartingVcn;
+
+} STARTING_VCN_INPUT_BUFFER, *PSTARTING_VCN_INPUT_BUFFER;
+
+typedef struct RETRIEVAL_POINTERS_BUFFER {
+
+    DWORD ExtentCount;
+    LARGE_INTEGER StartingVcn;
+    struct {
+        LARGE_INTEGER NextVcn;
+        LARGE_INTEGER Lcn;
+    } Extents[1];
+
+} RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER;
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Structures for FSCTL_GET_NTFS_FILE_RECORD
+//
+
+typedef struct {
+
+    LARGE_INTEGER FileReferenceNumber;
+
+} NTFS_FILE_RECORD_INPUT_BUFFER, *PNTFS_FILE_RECORD_INPUT_BUFFER;
+
+typedef struct {
+
+    LARGE_INTEGER FileReferenceNumber;
+    DWORD FileRecordLength;
+    BYTE  FileRecordBuffer[1];
+
+} NTFS_FILE_RECORD_OUTPUT_BUFFER, *PNTFS_FILE_RECORD_OUTPUT_BUFFER;
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0400)
+//
+// Structure for FSCTL_MOVE_FILE
+//
+
+typedef struct {
+
+    HANDLE FileHandle;
+    LARGE_INTEGER StartingVcn;
+    LARGE_INTEGER StartingLcn;
+    DWORD ClusterCount;
+
+} MOVE_FILE_DATA, *PMOVE_FILE_DATA;
+
+#if defined(_WIN64)
+//
+//  32/64 Bit thunking support structure
+//
+
+typedef struct _MOVE_FILE_DATA32 {
+
+    UINT32 FileHandle;
+    LARGE_INTEGER StartingVcn;
+    LARGE_INTEGER StartingLcn;
+    DWORD ClusterCount;
+
+} MOVE_FILE_DATA32, *PMOVE_FILE_DATA32;
+#endif
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structures for FSCTL_FIND_FILES_BY_SID
+//
+
+typedef struct {
+    DWORD Restart;
+    SID Sid;
+} FIND_BY_SID_DATA, *PFIND_BY_SID_DATA;
+
+typedef struct {
+    DWORD NextEntryOffset;
+    DWORD FileIndex;
+    DWORD FileNameLength;
+    WCHAR FileName[1];
+} FIND_BY_SID_OUTPUT, *PFIND_BY_SID_OUTPUT;
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+//  The following structures apply to Usn operations.
+//
+
+//
+// Structure for FSCTL_ENUM_USN_DATA
+//
+
+typedef struct {
+
+    DWORDLONG StartFileReferenceNumber;
+    USN LowUsn;
+    USN HighUsn;
+
+} MFT_ENUM_DATA, *PMFT_ENUM_DATA;
+
+//
+// Structure for FSCTL_CREATE_USN_JOURNAL
+//
+
+typedef struct {
+
+    DWORDLONG MaximumSize;
+    DWORDLONG AllocationDelta;
+
+} CREATE_USN_JOURNAL_DATA, *PCREATE_USN_JOURNAL_DATA;
+
+//
+// Structure for FSCTL_READ_USN_JOURNAL
+//
+
+typedef struct {
+
+    USN StartUsn;
+    DWORD ReasonMask;
+    DWORD ReturnOnlyOnClose;
+    DWORDLONG Timeout;
+    DWORDLONG BytesToWaitFor;
+    DWORDLONG UsnJournalID;
+
+} READ_USN_JOURNAL_DATA, *PREAD_USN_JOURNAL_DATA;
+
+//
+//  The initial Major.Minor version of the Usn record will be 2.0.
+//  In general, the MinorVersion may be changed if fields are added
+//  to this structure in such a way that the previous version of the
+//  software can still correctly the fields it knows about.  The
+//  MajorVersion should only be changed if the previous version of
+//  any software using this structure would incorrectly handle new
+//  records due to structure changes.
+//
+//  The first update to this will force the structure to version 2.0.
+//  This will add the extended information about the source as
+//  well as indicate the file name offset within the structure.
+//
+//  The following structure is returned with these fsctls.
+//
+//      FSCTL_READ_USN_JOURNAL
+//      FSCTL_READ_FILE_USN_DATA
+//      FSCTL_ENUM_USN_DATA
+//
+
+typedef struct {
+
+    DWORD RecordLength;
+    WORD   MajorVersion;
+    WORD   MinorVersion;
+    DWORDLONG FileReferenceNumber;
+    DWORDLONG ParentFileReferenceNumber;
+    USN Usn;
+    LARGE_INTEGER TimeStamp;
+    DWORD Reason;
+    DWORD SourceInfo;
+    DWORD SecurityId;
+    DWORD FileAttributes;
+    WORD   FileNameLength;
+    WORD   FileNameOffset;
+    WCHAR FileName[1];
+
+} USN_RECORD, *PUSN_RECORD;
+
+#define USN_PAGE_SIZE                    (0x1000)
+
+#define USN_REASON_DATA_OVERWRITE        (0x00000001)
+#define USN_REASON_DATA_EXTEND           (0x00000002)
+#define USN_REASON_DATA_TRUNCATION       (0x00000004)
+#define USN_REASON_NAMED_DATA_OVERWRITE  (0x00000010)
+#define USN_REASON_NAMED_DATA_EXTEND     (0x00000020)
+#define USN_REASON_NAMED_DATA_TRUNCATION (0x00000040)
+#define USN_REASON_FILE_CREATE           (0x00000100)
+#define USN_REASON_FILE_DELETE           (0x00000200)
+#define USN_REASON_EA_CHANGE             (0x00000400)
+#define USN_REASON_SECURITY_CHANGE       (0x00000800)
+#define USN_REASON_RENAME_OLD_NAME       (0x00001000)
+#define USN_REASON_RENAME_NEW_NAME       (0x00002000)
+#define USN_REASON_INDEXABLE_CHANGE      (0x00004000)
+#define USN_REASON_BASIC_INFO_CHANGE     (0x00008000)
+#define USN_REASON_HARD_LINK_CHANGE      (0x00010000)
+#define USN_REASON_COMPRESSION_CHANGE    (0x00020000)
+#define USN_REASON_ENCRYPTION_CHANGE     (0x00040000)
+#define USN_REASON_OBJECT_ID_CHANGE      (0x00080000)
+#define USN_REASON_REPARSE_POINT_CHANGE  (0x00100000)
+#define USN_REASON_STREAM_CHANGE         (0x00200000)
+
+#define USN_REASON_CLOSE                 (0x80000000)
+
+//
+//  Structure for FSCTL_QUERY_USN_JOUNAL
+//
+
+typedef struct {
+
+    DWORDLONG UsnJournalID;
+    USN FirstUsn;
+    USN NextUsn;
+    USN LowestValidUsn;
+    USN MaxUsn;
+    DWORDLONG MaximumSize;
+    DWORDLONG AllocationDelta;
+
+} USN_JOURNAL_DATA, *PUSN_JOURNAL_DATA;
+
+//
+//  Structure for FSCTL_DELETE_USN_JOURNAL
+//
+
+typedef struct {
+
+    DWORDLONG UsnJournalID;
+    DWORD DeleteFlags;
+
+} DELETE_USN_JOURNAL_DATA, *PDELETE_USN_JOURNAL_DATA;
+
+#define USN_DELETE_FLAG_DELETE              (0x00000001)
+#define USN_DELETE_FLAG_NOTIFY              (0x00000002)
+
+#define USN_DELETE_VALID_FLAGS              (0x00000003)
+
+//
+//  Structure for FSCTL_MARK_HANDLE
+//
+
+typedef struct {
+
+    DWORD UsnSourceInfo;
+    HANDLE VolumeHandle;
+    DWORD HandleInfo;
+
+} MARK_HANDLE_INFO, *PMARK_HANDLE_INFO;
+
+#if defined(_WIN64)
+//
+//  32/64 Bit thunking support structure
+//
+
+typedef struct {
+
+    DWORD UsnSourceInfo;
+    UINT32 VolumeHandle;
+    DWORD HandleInfo;
+
+} MARK_HANDLE_INFO32, *PMARK_HANDLE_INFO32;
+#endif
+
+//
+//  Flags for the additional source information above.
+//
+//      USN_SOURCE_DATA_MANAGEMENT - Service is not modifying the external view
+//          of any part of the file.  Typical case is HSM moving data to
+//          and from external storage.
+//
+//      USN_SOURCE_AUXILIARY_DATA - Service is not modifying the external view
+//          of the file with regard to the application that created this file.
+//          Can be used to add private data streams to a file.
+//
+//      USN_SOURCE_REPLICATION_MANAGEMENT - Service is modifying a file to match
+//          the contents of the same file which exists in another member of the
+//          replica set.
+//
+
+#define USN_SOURCE_DATA_MANAGEMENT          (0x00000001)
+#define USN_SOURCE_AUXILIARY_DATA           (0x00000002)
+#define USN_SOURCE_REPLICATION_MANAGEMENT   (0x00000004)
+
+//
+//  Flags for the HandleInfo field above
+//
+//  MARK_HANDLE_PROTECT_CLUSTERS - disallow any defragmenting (FSCTL_MOVE_FILE) until the
+//      the handle is closed
+//
+
+#define MARK_HANDLE_PROTECT_CLUSTERS        (0x00000001)
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structure for FSCTL_SECURITY_ID_CHECK
+//
+
+typedef struct {
+
+    ACCESS_MASK DesiredAccess;
+    DWORD SecurityIds[1];
+
+} BULK_SECURITY_TEST_DATA, *PBULK_SECURITY_TEST_DATA;
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+//  Output flags for the FSCTL_IS_VOLUME_DIRTY
+//
+
+#define VOLUME_IS_DIRTY                  (0x00000001)
+#define VOLUME_UPGRADE_SCHEDULED         (0x00000002)
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+//
+// Structures for FSCTL_FILE_PREFETCH
+//
+
+typedef struct _FILE_PREFETCH {
+    DWORD Type;
+    DWORD Count;
+    DWORDLONG Prefetch[1];
+} FILE_PREFETCH, *PFILE_PREFETCH;
+
+#define FILE_PREFETCH_TYPE_FOR_CREATE    0x1
+
+// Structures for FSCTL_FILESYSTEM_GET_STATISTICS
+//
+// Filesystem performance counters
+//
+
+typedef struct _FILESYSTEM_STATISTICS {
+
+    WORD   FileSystemType;
+    WORD   Version;                     // currently version 1
+
+    DWORD SizeOfCompleteStructure;      // must by a mutiple of 64 bytes
+
+    DWORD UserFileReads;
+    DWORD UserFileReadBytes;
+    DWORD UserDiskReads;
+    DWORD UserFileWrites;
+    DWORD UserFileWriteBytes;
+    DWORD UserDiskWrites;
+
+    DWORD MetaDataReads;
+    DWORD MetaDataReadBytes;
+    DWORD MetaDataDiskReads;
+    DWORD MetaDataWrites;
+    DWORD MetaDataWriteBytes;
+    DWORD MetaDataDiskWrites;
+
+    //
+    //  The file system's private structure is appended here.
+    //
+
+} FILESYSTEM_STATISTICS, *PFILESYSTEM_STATISTICS;
+
+// values for FS_STATISTICS.FileSystemType
+
+#define FILESYSTEM_STATISTICS_TYPE_NTFS     1
+#define FILESYSTEM_STATISTICS_TYPE_FAT      2
+
+//
+//  File System Specific Statistics Data
+//
+
+typedef struct _FAT_STATISTICS {
+    DWORD CreateHits;
+    DWORD SuccessfulCreates;
+    DWORD FailedCreates;
+
+    DWORD NonCachedReads;
+    DWORD NonCachedReadBytes;
+    DWORD NonCachedWrites;
+    DWORD NonCachedWriteBytes;
+
+    DWORD NonCachedDiskReads;
+    DWORD NonCachedDiskWrites;
+} FAT_STATISTICS, *PFAT_STATISTICS;
+
+typedef struct _NTFS_STATISTICS {
+
+    DWORD LogFileFullExceptions;
+    DWORD OtherExceptions;
+
+    //
+    // Other meta data io's
+    //
+
+    DWORD MftReads;
+    DWORD MftReadBytes;
+    DWORD MftWrites;
+    DWORD MftWriteBytes;
+    struct {
+        WORD   Write;
+        WORD   Create;
+        WORD   SetInfo;
+        WORD   Flush;
+    } MftWritesUserLevel;
+
+    WORD   MftWritesFlushForLogFileFull;
+    WORD   MftWritesLazyWriter;
+    WORD   MftWritesUserRequest;
+
+    DWORD Mft2Writes;
+    DWORD Mft2WriteBytes;
+    struct {
+        WORD   Write;
+        WORD   Create;
+        WORD   SetInfo;
+        WORD   Flush;
+    } Mft2WritesUserLevel;
+
+    WORD   Mft2WritesFlushForLogFileFull;
+    WORD   Mft2WritesLazyWriter;
+    WORD   Mft2WritesUserRequest;
+
+    DWORD RootIndexReads;
+    DWORD RootIndexReadBytes;
+    DWORD RootIndexWrites;
+    DWORD RootIndexWriteBytes;
+
+    DWORD BitmapReads;
+    DWORD BitmapReadBytes;
+    DWORD BitmapWrites;
+    DWORD BitmapWriteBytes;
+
+    WORD   BitmapWritesFlushForLogFileFull;
+    WORD   BitmapWritesLazyWriter;
+    WORD   BitmapWritesUserRequest;
+
+    struct {
+        WORD   Write;
+        WORD   Create;
+        WORD   SetInfo;
+    } BitmapWritesUserLevel;
+
+    DWORD MftBitmapReads;
+    DWORD MftBitmapReadBytes;
+    DWORD MftBitmapWrites;
+    DWORD MftBitmapWriteBytes;
+
+    WORD   MftBitmapWritesFlushForLogFileFull;
+    WORD   MftBitmapWritesLazyWriter;
+    WORD   MftBitmapWritesUserRequest;
+
+    struct {
+        WORD   Write;
+        WORD   Create;
+        WORD   SetInfo;
+        WORD   Flush;
+    } MftBitmapWritesUserLevel;
+
+    DWORD UserIndexReads;
+    DWORD UserIndexReadBytes;
+    DWORD UserIndexWrites;
+    DWORD UserIndexWriteBytes;
+
+    //
+    // Additions for NT 5.0
+    //
+
+    DWORD LogFileReads;
+    DWORD LogFileReadBytes;
+    DWORD LogFileWrites;
+    DWORD LogFileWriteBytes;
+
+    struct {
+        DWORD Calls;                // number of individual calls to allocate clusters
+        DWORD Clusters;             // number of clusters allocated
+        DWORD Hints;                // number of times a hint was specified
+
+        DWORD RunsReturned;         // number of runs used to satisify all the requests
+
+        DWORD HintsHonored;         // number of times the hint was useful
+        DWORD HintsClusters;        // number of clusters allocated via the hint
+        DWORD Cache;                // number of times the cache was useful other than the hint
+        DWORD CacheClusters;        // number of clusters allocated via the cache other than the hint
+        DWORD CacheMiss;            // number of times the cache wasn't useful
+        DWORD CacheMissClusters;    // number of clusters allocated without the cache
+    } Allocate;
+
+} NTFS_STATISTICS, *PNTFS_STATISTICS;
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structure for FSCTL_SET_OBJECT_ID, FSCTL_GET_OBJECT_ID, and FSCTL_CREATE_OR_GET_OBJECT_ID
+//
+
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4201)       // unnamed struct
+
+typedef struct _FILE_OBJECTID_BUFFER {
+
+    //
+    //  This is the portion of the object id that is indexed.
+    //
+
+    BYTE  ObjectId[16];
+
+    //
+    //  This portion of the object id is not indexed, it's just
+    //  some metadata for the user's benefit.
+    //
+
+    union {
+        struct {
+            BYTE  BirthVolumeId[16];
+            BYTE  BirthObjectId[16];
+            BYTE  DomainId[16];
+        } ;
+        BYTE  ExtendedInfo[48];
+    };
+
+} FILE_OBJECTID_BUFFER, *PFILE_OBJECTID_BUFFER;
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning( default : 4201 )
+#endif
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structure for FSCTL_SET_SPARSE
+//
+
+typedef struct _FILE_SET_SPARSE_BUFFER {
+    BOOLEAN SetSparse;
+} FILE_SET_SPARSE_BUFFER, *PFILE_SET_SPARSE_BUFFER;
+
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structure for FSCTL_SET_ZERO_DATA
+//
+
+typedef struct _FILE_ZERO_DATA_INFORMATION {
+
+    LARGE_INTEGER FileOffset;
+    LARGE_INTEGER BeyondFinalZero;
+
+} FILE_ZERO_DATA_INFORMATION, *PFILE_ZERO_DATA_INFORMATION;
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structure for FSCTL_QUERY_ALLOCATED_RANGES
+//
+
+//
+// Querying the allocated ranges requires an output buffer to store the
+// allocated ranges and an input buffer to specify the range to query.
+// The input buffer contains a single entry, the output buffer is an
+// array of the following structure.
+//
+
+typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
+
+    LARGE_INTEGER FileOffset;
+    LARGE_INTEGER Length;
+
+} FILE_ALLOCATED_RANGE_BUFFER, *PFILE_ALLOCATED_RANGE_BUFFER;
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// Structures for FSCTL_SET_ENCRYPTION, FSCTL_WRITE_RAW_ENCRYPTED, and FSCTL_READ_RAW_ENCRYPTED
+//
+
+//
+//  The input buffer to set encryption indicates whether we are to encrypt/decrypt a file
+//  or an individual stream.
+//
+
+typedef struct _ENCRYPTION_BUFFER {
+
+    DWORD EncryptionOperation;
+    BYTE  Private[1];
+
+} ENCRYPTION_BUFFER, *PENCRYPTION_BUFFER;
+
+#define FILE_SET_ENCRYPTION         0x00000001
+#define FILE_CLEAR_ENCRYPTION       0x00000002
+#define STREAM_SET_ENCRYPTION       0x00000003
+#define STREAM_CLEAR_ENCRYPTION     0x00000004
+
+#define MAXIMUM_ENCRYPTION_VALUE    0x00000004
+
+//
+//  The optional output buffer to set encryption indicates that the last encrypted
+//  stream in a file has been marked as decrypted.
+//
+
+typedef struct _DECRYPTION_STATUS_BUFFER {
+
+    BOOLEAN NoEncryptedStreams;
+
+} DECRYPTION_STATUS_BUFFER, *PDECRYPTION_STATUS_BUFFER;
+
+#define ENCRYPTION_FORMAT_DEFAULT        (0x01)
+
+#define COMPRESSION_FORMAT_SPARSE        (0x4000)
+
+//
+//  Request Encrypted Data structure.  This is used to indicate
+//  the range of the file to read.  It also describes the
+//  output buffer used to return the data.
+//
+
+typedef struct _REQUEST_RAW_ENCRYPTED_DATA {
+
+    //
+    //  Requested file offset and requested length to read.
+    //  The fsctl will round the starting offset down
+    //  to a file system boundary.  It will also
+    //  round the length up to a file system boundary.
+    //
+
+    LONGLONG FileOffset;
+    DWORD Length;
+
+} REQUEST_RAW_ENCRYPTED_DATA, *PREQUEST_RAW_ENCRYPTED_DATA;
+
+//
+//  Encrypted Data Information structure.  This structure
+//  is used to return raw encrypted data from a file in
+//  order to perform off-line recovery.  The data will be
+//  encrypted or encrypted and compressed.  The off-line
+//  service will need to use the encryption and compression
+//  format information to recover the file data.  In the
+//  event that the data is both encrypted and compressed then
+//  the decryption must occur before decompression.  All
+//  the data units below must be encrypted and compressed
+//  with the same format.
+//
+//  The data will be returned in units.  The data unit size
+//  will be fixed per request.  If the data is compressed
+//  then the data unit size will be the compression unit size.
+//
+//  This structure is at the beginning of the buffer used to
+//  return the encrypted data.  The actual raw bytes from
+//  the file will follow this buffer.  The offset of the
+//  raw bytes from the beginning of this structure is
+//  specified in the REQUEST_RAW_ENCRYPTED_DATA structure
+//  described above.
+//
+
+typedef struct _ENCRYPTED_DATA_INFO {
+
+    //
+    //  This is the file offset for the first entry in the
+    //  data block array.  The file system will round
+    //  the requested start offset down to a boundary
+    //  that is consistent with the format of the file.
+    //
+
+    DWORDLONG StartingFileOffset;
+
+    //
+    //  Data offset in output buffer.  The output buffer
+    //  begins with an ENCRYPTED_DATA_INFO structure.
+    //  The file system will then store the raw bytes from
+    //  disk beginning at the following offset within the
+    //  output buffer.
+    //
+
+    DWORD OutputBufferOffset;
+
+    //
+    //  The number of bytes being returned that are within
+    //  the size of the file.  If this value is less than
+    //  (NumberOfDataBlocks << DataUnitShift), it means the
+    //  end of the file occurs within this transfer.  Any
+    //  data beyond file size is invalid and was never
+    //  passed to the encryption driver.
+    //
+
+    DWORD BytesWithinFileSize;
+
+    //
+    //  The number of bytes being returned that are below
+    //  valid data length.  If this value is less than
+    //  (NumberOfDataBlocks << DataUnitShift), it means the
+    //  end of the valid data occurs within this transfer.
+    //  After decrypting the data from this transfer, any
+    //  byte(s) beyond valid data length must be zeroed.
+    //
+
+    DWORD BytesWithinValidDataLength;
+
+    //
+    //  Code for the compression format as defined in
+    //  ntrtl.h.  Note that COMPRESSION_FORMAT_NONE
+    //  and COMPRESSION_FORMAT_DEFAULT are invalid if
+    //  any of the described chunks are compressed.
+    //
+
+    WORD   CompressionFormat;
+
+    //
+    //  The DataUnit is the granularity used to access the
+    //  disk.  It will be the same as the compression unit
+    //  size for a compressed file.  For an uncompressed
+    //  file, it will be some cluster-aligned power of 2 that
+    //  the file system deems convenient.  A caller should
+    //  not expect that successive calls will have the
+    //  same data unit shift value as the previous call.
+    //
+    //  Since chunks and compression units are expected to be
+    //  powers of 2 in size, we express them log2.  So, for
+    //  example (1 << ChunkShift) == ChunkSizeInBytes.  The
+    //  ClusterShift indicates how much space must be saved
+    //  to successfully compress a compression unit - each
+    //  successfully compressed data unit must occupy
+    //  at least one cluster less in bytes than an uncompressed
+    //  data block unit.
+    //
+
+    BYTE  DataUnitShift;
+    BYTE  ChunkShift;
+    BYTE  ClusterShift;
+
+    //
+    //  The format for the encryption.
+    //
+
+    BYTE  EncryptionFormat;
+
+    //
+    //  This is the number of entries in the data block size
+    //  array.
+    //
+
+    WORD   NumberOfDataBlocks;
+
+    //
+    //  This is an array of sizes in the data block array.  There
+    //  must be one entry in this array for each data block
+    //  read from disk.  The size has a different meaning
+    //  depending on whether the file is compressed.
+    //
+    //  A size of zero always indicates that the final data consists entirely
+    //  of zeroes.  There is no decryption or decompression to
+    //  perform.
+    //
+    //  If the file is compressed then the data block size indicates
+    //  whether this block is compressed.  A size equal to
+    //  the block size indicates that the corresponding block did
+    //  not compress.  Any other non-zero size indicates the
+    //  size of the compressed data which needs to be
+    //  decrypted/decompressed.
+    //
+    //  If the file is not compressed then the data block size
+    //  indicates the amount of data within the block that
+    //  needs to be decrypted.  Any other non-zero size indicates
+    //  that the remaining bytes in the data unit within the file
+    //  consists of zeros.  An example of this is when the
+    //  the read spans the valid data length of the file.  There
+    //  is no data to decrypt past the valid data length.
+    //
+
+    DWORD DataBlockSize[ANYSIZE_ARRAY];
+
+} ENCRYPTED_DATA_INFO;
+typedef ENCRYPTED_DATA_INFO *PENCRYPTED_DATA_INFO;
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+//  FSCTL_READ_FROM_PLEX support
+//  Request Plex Read Data structure.  This is used to indicate
+//  the range of the file to read.  It also describes
+//  which plex to perform the read from.
+//
+
+typedef struct _PLEX_READ_DATA_REQUEST {
+
+    //
+    //  Requested offset and length to read.
+    //  The offset can be the virtual offset (vbo) in to a file,
+    //  or a volume. In the case of a file offset,
+    //  the fsd will round the starting offset down
+    //  to a file system boundary.  It will also
+    //  round the length up to a file system boundary and
+    //  enforce any other applicable limits.
+    //
+
+    LARGE_INTEGER ByteOffset;
+    DWORD ByteLength;
+    DWORD PlexNumber;
+
+} PLEX_READ_DATA_REQUEST, *PPLEX_READ_DATA_REQUEST;
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+//
+// FSCTL_SIS_COPYFILE support
+// Source and destination file names are passed in the FileNameBuffer.
+// Both strings are null terminated, with the source name starting at
+// the beginning of FileNameBuffer, and the destination name immediately
+// following.  Length fields include terminating nulls.
+//
+
+typedef struct _SI_COPYFILE {
+    DWORD SourceFileNameLength;
+    DWORD DestinationFileNameLength;
+    DWORD Flags;
+    WCHAR FileNameBuffer[1];
+} SI_COPYFILE, *PSI_COPYFILE;
+
+#define COPYFILE_SIS_LINK       0x0001              // Copy only if source is SIS
+#define COPYFILE_SIS_REPLACE    0x0002              // Replace destination if it exists, otherwise don't.
+#define COPYFILE_SIS_FLAGS      0x0003
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#endif // _FILESYSTEMFSCTL_
+
+
+//
+// These IOCTLs are handled by hard disk volumes.
+//
+
+#define IOCTL_VOLUME_BASE   ((DWORD) 'V')
+
+#define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS    CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_VOLUME_IS_CLUSTERED               CTL_CODE(IOCTL_VOLUME_BASE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+//
+// Disk extent definition.
+//
+
+typedef struct _DISK_EXTENT {
+    DWORD           DiskNumber;
+    LARGE_INTEGER   StartingOffset;
+    LARGE_INTEGER   ExtentLength;
+} DISK_EXTENT, *PDISK_EXTENT;
+
+//
+// Output structure for IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS.
+//
+
+typedef struct _VOLUME_DISK_EXTENTS {
+    DWORD       NumberOfDiskExtents;
+    DISK_EXTENT Extents[1];
+} VOLUME_DISK_EXTENTS, *PVOLUME_DISK_EXTENTS;
+
+
+#endif // _WINIOCTL_
+
diff --git a/base/Windows/Inc/WinNT.h b/base/Windows/Inc/WinNT.h
new file mode 100644
index 0000000..62fe4b0
--- /dev/null
+++ b/base/Windows/Inc/WinNT.h
@@ -0,0 +1,9170 @@
+/*++ BUILD Version: 0081     Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    winnt.h
+
+Abstract:
+
+    This module defines the 32-Bit Windows types and constants that are
+    defined by NT, but exposed through the Win32 API.
+
+Revision History:
+
+--*/
+
+#ifndef _WINNT_
+#define _WINNT_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ctype.h>  
+#define ANYSIZE_ARRAY 1       
+
+#if defined(_M_MRX000) && !(defined(MIDL_PASS) || defined(RC_INVOKED)) && defined(ENABLE_RESTRICTED)
+#define RESTRICTED_POINTER __restrict
+#else
+#define RESTRICTED_POINTER
+#endif
+
+#if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) || defined(_M_AMD64)
+#define UNALIGNED __unaligned
+#if defined(_WIN64)
+#define UNALIGNED64 __unaligned
+#else
+#define UNALIGNED64
+#endif
+#else
+#define UNALIGNED
+#define UNALIGNED64
+#endif
+
+
+#if defined(_WIN64) || defined(_M_ALPHA)
+#define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG)
+#define MEMORY_ALLOCATION_ALIGNMENT 16
+#else
+#define MAX_NATURAL_ALIGNMENT sizeof(DWORD)
+#define MEMORY_ALLOCATION_ALIGNMENT 8
+#endif
+
+//
+// TYPE_ALIGNMENT will return the alignment requirements of a given type for
+// the current platform.
+//
+
+#ifdef __cplusplus
+#if _MSC_VER >= 1300
+#define TYPE_ALIGNMENT( t ) __alignof(t)
+#endif
+#else
+#define TYPE_ALIGNMENT( t ) \
+    FIELD_OFFSET( struct { char x; t test; }, test )
+#endif
+
+#if defined(_WIN64)
+
+#define PROBE_ALIGNMENT( _s ) (TYPE_ALIGNMENT( _s ) > TYPE_ALIGNMENT( DWORD ) ? \
+                               TYPE_ALIGNMENT( _s ) : TYPE_ALIGNMENT( DWORD ))
+
+#define PROBE_ALIGNMENT32( _s ) TYPE_ALIGNMENT( DWORD )
+
+#else
+
+#define PROBE_ALIGNMENT( _s ) TYPE_ALIGNMENT( DWORD )
+
+#endif
+
+//
+// C_ASSERT() can be used to perform many compile-time assertions:
+//            type sizes, field offsets, etc.
+//
+// An assertion failure results in error C2118: negative subscript.
+//
+
+#define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
+
+#if !defined(_MAC) && (defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64)) && (_MSC_VER >= 1100) && !(defined(MIDL_PASS) || defined(RC_INVOKED))
+#define POINTER_64 __ptr64
+typedef unsigned __int64 POINTER_64_INT;
+#if defined(_WIN64)
+#define POINTER_32 __ptr32
+#else
+#define POINTER_32
+#endif
+#else
+#if defined(_MAC) && defined(_MAC_INT_64)
+#define POINTER_64 __ptr64
+typedef unsigned __int64 POINTER_64_INT;
+#else
+#define POINTER_64
+typedef unsigned long POINTER_64_INT;
+#endif
+#define POINTER_32
+#endif
+
+#if defined(_IA64_) || defined(_AMD64_)
+#define FIRMWARE_PTR
+#else
+#define FIRMWARE_PTR POINTER_32
+#endif
+
+#include <basetsd.h>
+
+
+#if (defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS)
+#define DECLSPEC_IMPORT __declspec(dllimport)
+#else
+#define DECLSPEC_IMPORT
+#endif
+
+#ifndef DECLSPEC_NORETURN
+#if (_MSC_VER >= 1200) && !defined(MIDL_PASS)
+#define DECLSPEC_NORETURN   __declspec(noreturn)
+#else
+#define DECLSPEC_NORETURN
+#endif
+#endif
+
+#ifndef DECLSPEC_ALIGN
+#if (_MSC_VER >= 1300) && !defined(MIDL_PASS)
+#define DECLSPEC_ALIGN(x)   __declspec(align(x))
+#else
+#define DECLSPEC_ALIGN(x)
+#endif
+#endif
+
+#ifndef DECLSPEC_CACHEALIGN
+#define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(128)
+#endif
+
+#ifndef DECLSPEC_UUID
+#if (_MSC_VER >= 1100) && defined (__cplusplus)
+#define DECLSPEC_UUID(x)    __declspec(uuid(x))
+#else
+#define DECLSPEC_UUID(x)
+#endif
+#endif
+
+#ifndef DECLSPEC_NOVTABLE
+#if (_MSC_VER >= 1100) && defined(__cplusplus)
+#define DECLSPEC_NOVTABLE   __declspec(novtable)
+#else
+#define DECLSPEC_NOVTABLE
+#endif
+#endif
+
+#ifndef DECLSPEC_SELECTANY
+#if (_MSC_VER >= 1100)
+#define DECLSPEC_SELECTANY  __declspec(selectany)
+#else
+#define DECLSPEC_SELECTANY
+#endif
+#endif
+
+#ifndef NOP_FUNCTION
+#if (_MSC_VER >= 1210)
+#define NOP_FUNCTION __noop
+#else
+#define NOP_FUNCTION (void)0
+#endif
+#endif
+
+#ifndef DECLSPEC_ADDRSAFE
+#if (_MSC_VER >= 1200) && (defined(_M_ALPHA) || defined(_M_AXP64))
+#define DECLSPEC_ADDRSAFE  __declspec(address_safe)
+#else
+#define DECLSPEC_ADDRSAFE
+#endif
+#endif
+
+#ifndef FORCEINLINE
+#if (_MSC_VER >= 1200)
+#define FORCEINLINE __forceinline
+#else
+#define FORCEINLINE __inline
+#endif
+#endif
+
+#ifndef DECLSPEC_DEPRECATED
+#if (_MSC_VER >= 1300) && !defined(MIDL_PASS)
+#define DECLSPEC_DEPRECATED   __declspec(deprecated)
+#define DEPRECATE_SUPPORTED
+#else
+#define DECLSPEC_DEPRECATED
+#undef  DEPRECATE_SUPPORTED
+#endif
+#endif
+
+#ifdef DEPRECATE_DDK_FUNCTIONS
+#ifdef _NTDDK_
+#define DECLSPEC_DEPRECATED_DDK DECLSPEC_DEPRECATED
+#ifdef DEPRECATE_SUPPORTED
+#define PRAGMA_DEPRECATED_DDK 1
+#endif
+#else
+#define DECLSPEC_DEPRECATED_DDK
+#define PRAGMA_DEPRECATED_DDK 1
+#endif
+#else
+#define DECLSPEC_DEPRECATED_DDK
+#define PRAGMA_DEPRECATED_DDK 0
+#endif
+
+//
+// Void
+//
+
+typedef void *PVOID;
+typedef void * POINTER_64 PVOID64;
+
+
+#if ((_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)) && !defined(_M_AMD64)
+#define NTAPI __stdcall
+#else
+#define _cdecl
+#define NTAPI
+#endif
+
+//
+// Define API decoration for direct importing system DLL references.
+//
+
+#if !defined(_NTSYSTEM_)
+#define NTSYSAPI     DECLSPEC_IMPORT
+#define NTSYSCALLAPI DECLSPEC_IMPORT
+#else
+#define NTSYSAPI
+#if defined(_NTDLLBUILD_)
+#define NTSYSCALLAPI
+#else
+#define NTSYSCALLAPI DECLSPEC_ADDRSAFE
+#endif
+
+#endif
+
+
+//
+// Basics
+//
+
+#ifndef VOID
+#define VOID void
+typedef char CHAR;
+typedef short SHORT;
+typedef long LONG;
+#endif
+
+//
+// UNICODE (Wide Character) types
+//
+
+#ifndef _MAC
+typedef wchar_t WCHAR;    // wc,   16-bit UNICODE character
+#else
+// some Macintosh compilers don't define wchar_t in a convenient location, or define it as a char
+typedef unsigned short WCHAR;    // wc,   16-bit UNICODE character
+#endif
+
+typedef WCHAR *PWCHAR;
+typedef WCHAR *LPWCH, *PWCH;
+typedef CONST WCHAR *LPCWCH, *PCWCH;
+typedef WCHAR *NWPSTR;
+typedef WCHAR *LPWSTR, *PWSTR;
+typedef WCHAR UNALIGNED *LPUWSTR, *PUWSTR;
+
+typedef CONST WCHAR *LPCWSTR, *PCWSTR;
+typedef CONST WCHAR UNALIGNED *LPCUWSTR, *PCUWSTR;
+
+//
+// ANSI (Multi-byte Character) types
+//
+typedef CHAR *PCHAR;
+typedef CHAR *LPCH, *PCH;
+
+typedef CONST CHAR *LPCCH, *PCCH;
+typedef CHAR *NPSTR;
+typedef CHAR *LPSTR, *PSTR;
+typedef CONST CHAR *LPCSTR, *PCSTR;
+
+//
+// Neutral ANSI/UNICODE types and macros
+//
+#ifdef  UNICODE                     // r_winnt
+
+#ifndef _TCHAR_DEFINED
+typedef WCHAR TCHAR, *PTCHAR;
+typedef WCHAR TBYTE , *PTBYTE ;
+#define _TCHAR_DEFINED
+#endif /* !_TCHAR_DEFINED */
+
+typedef LPWSTR LPTCH, PTCH;
+typedef LPWSTR PTSTR, LPTSTR;
+typedef LPCWSTR PCTSTR, LPCTSTR;
+typedef LPUWSTR PUTSTR, LPUTSTR;
+typedef LPCUWSTR PCUTSTR, LPCUTSTR;
+typedef LPWSTR LP;
+#define __TEXT(quote) L##quote      // r_winnt
+
+#else   /* UNICODE */               // r_winnt
+
+#ifndef _TCHAR_DEFINED
+typedef char TCHAR, *PTCHAR;
+typedef unsigned char TBYTE , *PTBYTE ;
+#define _TCHAR_DEFINED
+#endif /* !_TCHAR_DEFINED */
+
+typedef LPSTR LPTCH, PTCH;
+typedef LPSTR PTSTR, LPTSTR, PUTSTR, LPUTSTR;
+typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
+#define __TEXT(quote) quote         // r_winnt
+
+#endif /* UNICODE */                // r_winnt
+#define TEXT(quote) __TEXT(quote)   // r_winnt
+
+
+typedef SHORT *PSHORT;  
+typedef LONG *PLONG;    
+
+#ifdef STRICT
+typedef void *HANDLE;
+#define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name
+#else
+typedef PVOID HANDLE;
+#define DECLARE_HANDLE(name) typedef HANDLE name
+#endif
+typedef HANDLE *PHANDLE;
+
+//
+// Flag (bit) fields
+//
+
+typedef BYTE   FCHAR;
+typedef WORD   FSHORT;
+typedef DWORD  FLONG;
+
+// Component Object Model defines, and macros
+
+#ifndef _HRESULT_DEFINED
+#define _HRESULT_DEFINED
+typedef LONG HRESULT;
+
+#endif // !_HRESULT_DEFINED
+
+#ifdef __cplusplus
+    #define EXTERN_C    extern "C"
+#else
+    #define EXTERN_C    extern
+#endif
+
+#if defined(_WIN32) || defined(_MPPC_)
+
+// Win32 doesn't support __export
+
+#ifdef _68K_
+#define STDMETHODCALLTYPE       __cdecl
+#else
+#define STDMETHODCALLTYPE       __stdcall
+#endif
+#define STDMETHODVCALLTYPE      __cdecl
+
+#define STDAPICALLTYPE          __stdcall
+#define STDAPIVCALLTYPE         __cdecl
+
+#else
+
+#define STDMETHODCALLTYPE       __export __stdcall
+#define STDMETHODVCALLTYPE      __export __cdecl
+
+#define STDAPICALLTYPE          __export __stdcall
+#define STDAPIVCALLTYPE         __export __cdecl
+
+#endif
+
+
+#define STDAPI                  EXTERN_C HRESULT STDAPICALLTYPE
+#define STDAPI_(type)           EXTERN_C type STDAPICALLTYPE
+
+#define STDMETHODIMP            HRESULT STDMETHODCALLTYPE
+#define STDMETHODIMP_(type)     type STDMETHODCALLTYPE
+
+// The 'V' versions allow Variable Argument lists.
+
+#define STDAPIV                 EXTERN_C HRESULT STDAPIVCALLTYPE
+#define STDAPIV_(type)          EXTERN_C type STDAPIVCALLTYPE
+
+#define STDMETHODIMPV           HRESULT STDMETHODVCALLTYPE
+#define STDMETHODIMPV_(type)    type STDMETHODVCALLTYPE
+
+typedef char CCHAR;          
+typedef DWORD LCID;         
+typedef PDWORD PLCID;       
+typedef WORD   LANGID;      
+#define APPLICATION_ERROR_MASK       0x20000000
+#define ERROR_SEVERITY_SUCCESS       0x00000000
+#define ERROR_SEVERITY_INFORMATIONAL 0x40000000
+#define ERROR_SEVERITY_WARNING       0x80000000
+#define ERROR_SEVERITY_ERROR         0xC0000000
+
+//
+// _M_IX86 included so that EM CONTEXT structure compiles with
+// x86 programs. *** TBD should this be for all architectures?
+//
+
+//
+// 16 byte aligned type for 128 bit floats
+//
+
+//
+// For we define a 128 bit structure and use __declspec(align(16)) pragma to
+// align to 128 bits.
+//
+
+#if defined(_M_IA64) && !defined(MIDL_PASS)
+__declspec(align(16))
+#endif
+typedef struct _FLOAT128 {
+    __int64 LowPart;
+    __int64 HighPart;
+} FLOAT128;
+
+typedef FLOAT128 *PFLOAT128;
+
+
+//
+// __int64 is only supported by 2.0 and later midl.
+// __midl is set by the 2.0 midl and not by 1.0 midl.
+//
+
+#define _ULONGLONG_
+#if (!defined (_MAC) && (!defined(MIDL_PASS) || defined(__midl)) && (!defined(_M_IX86) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)))
+typedef __int64 LONGLONG;
+typedef unsigned __int64 ULONGLONG;
+
+#define MAXLONGLONG                      (0x7fffffffffffffff)
+#else
+
+#if defined(_MAC) && defined(_MAC_INT_64)
+typedef __int64 LONGLONG;
+typedef unsigned __int64 ULONGLONG;
+
+#define MAXLONGLONG                      (0x7fffffffffffffff)
+#else
+typedef double LONGLONG;
+typedef double ULONGLONG;
+#endif //_MAC and int64
+
+#endif
+
+typedef LONGLONG *PLONGLONG;
+typedef ULONGLONG *PULONGLONG;
+
+// Update Sequence Number
+
+typedef LONGLONG USN;
+
+#if defined(MIDL_PASS)
+typedef struct _LARGE_INTEGER {
+#else // MIDL_PASS
+typedef union _LARGE_INTEGER {
+    struct {
+        DWORD LowPart;
+        LONG HighPart;
+    };
+    struct {
+        DWORD LowPart;
+        LONG HighPart;
+    } u;
+#endif //MIDL_PASS
+    LONGLONG QuadPart;
+} LARGE_INTEGER;
+
+typedef LARGE_INTEGER *PLARGE_INTEGER;
+
+#if defined(MIDL_PASS)
+typedef struct _ULARGE_INTEGER {
+#else // MIDL_PASS
+typedef union _ULARGE_INTEGER {
+    struct {
+        DWORD LowPart;
+        DWORD HighPart;
+    };
+    struct {
+        DWORD LowPart;
+        DWORD HighPart;
+    } u;
+#endif //MIDL_PASS
+    ULONGLONG QuadPart;
+} ULARGE_INTEGER;
+
+typedef ULARGE_INTEGER *PULARGE_INTEGER;
+
+// end_ntminiport end_ntndis end_ntminitape
+
+
+//
+// Locally Unique Identifier
+//
+
+typedef struct _LUID {
+    DWORD LowPart;
+    LONG HighPart;
+} LUID, *PLUID;
+
+#define _DWORDLONG_
+typedef ULONGLONG  DWORDLONG;
+typedef DWORDLONG *PDWORDLONG;
+
+
+//
+// Define operations to logically shift an int64 by 0..31 bits and to multiply
+// 32-bits by 32-bits to form a 64-bit product.
+//
+
+#if defined(MIDL_PASS) || defined(RC_INVOKED)
+
+//
+// Midl does not understand inline assembler. Therefore, the Rtl functions
+// are used for shifts by 0.31 and multiplies of 32-bits times 32-bits to
+// form a 64-bit product.
+//
+
+#define Int32x32To64(a, b) ((LONGLONG)((LONG)(a)) * (LONGLONG)((LONG)(b)))
+#define UInt32x32To64(a, b) ((ULONGLONG)((DWORD)(a)) * (ULONGLONG)((DWORD)(b)))
+
+#define Int64ShllMod32(a, b) ((ULONGLONG)(a) << (b))
+#define Int64ShraMod32(a, b) ((LONGLONG)(a) >> (b))
+#define Int64ShrlMod32(a, b) ((ULONGLONG)(a) >> (b))
+
+#elif defined(_M_MRX000)
+
+//
+// MIPS uses intrinsic functions to perform shifts by 0..31 and multiplies of
+// 32-bits times 32-bits to 64-bits.
+//
+
+#define Int32x32To64 __emul
+#define UInt32x32To64 __emulu
+
+#define Int64ShllMod32 __ll_lshift
+#define Int64ShraMod32 __ll_rshift
+#define Int64ShrlMod32 __ull_rshift
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+LONGLONG
+NTAPI
+Int32x32To64 (
+    LONG Multiplier,
+    LONG Multiplicand
+    );
+
+ULONGLONG
+NTAPI
+UInt32x32To64 (
+    DWORD Multiplier,
+    DWORD Multiplicand
+    );
+
+ULONGLONG
+NTAPI
+Int64ShllMod32 (
+    ULONGLONG Value,
+    DWORD ShiftCount
+    );
+
+LONGLONG
+NTAPI
+Int64ShraMod32 (
+    LONGLONG Value,
+    DWORD ShiftCount
+    );
+
+ULONGLONG
+NTAPI
+Int64ShrlMod32 (
+    ULONGLONG Value,
+    DWORD ShiftCount
+    );
+
+#if defined (__cplusplus)
+};
+#endif
+
+#pragma intrinsic(__emul)
+#pragma intrinsic(__emulu)
+
+#pragma intrinsic(__ll_lshift)
+#pragma intrinsic(__ll_rshift)
+#pragma intrinsic(__ull_rshift)
+
+#elif defined(_M_IX86)
+
+//
+// The x86 C compiler understands inline assembler. Therefore, inline functions
+// that employ inline assembler are used for shifts of 0..31.  The multiplies
+// rely on the compiler recognizing the cast of the multiplicand to int64 to
+// generate the optimal code inline.
+//
+
+#define Int32x32To64( a, b ) (LONGLONG)((LONGLONG)(LONG)(a) * (LONG)(b))
+#define UInt32x32To64( a, b ) (ULONGLONG)((ULONGLONG)(DWORD)(a) * (DWORD)(b))
+
+ULONGLONG
+NTAPI
+Int64ShllMod32 (
+    ULONGLONG Value,
+    DWORD ShiftCount
+    );
+
+LONGLONG
+NTAPI
+Int64ShraMod32 (
+    LONGLONG Value,
+    DWORD ShiftCount
+    );
+
+ULONGLONG
+NTAPI
+Int64ShrlMod32 (
+    ULONGLONG Value,
+    DWORD ShiftCount
+    );
+
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4035)               // re-enable below
+
+__inline ULONGLONG
+NTAPI
+Int64ShllMod32 (
+    ULONGLONG Value,
+    DWORD ShiftCount
+    )
+{
+    __asm    {
+        mov     ecx, ShiftCount
+        mov     eax, dword ptr [Value]
+        mov     edx, dword ptr [Value+4]
+        shld    edx, eax, cl
+        shl     eax, cl
+    }
+}
+
+__inline LONGLONG
+NTAPI
+Int64ShraMod32 (
+    LONGLONG Value,
+    DWORD ShiftCount
+    )
+{
+    __asm {
+        mov     ecx, ShiftCount
+        mov     eax, dword ptr [Value]
+        mov     edx, dword ptr [Value+4]
+        shrd    eax, edx, cl
+        sar     edx, cl
+    }
+}
+
+__inline ULONGLONG
+NTAPI
+Int64ShrlMod32 (
+    ULONGLONG Value,
+    DWORD ShiftCount
+    )
+{
+    __asm    {
+        mov     ecx, ShiftCount
+        mov     eax, dword ptr [Value]
+        mov     edx, dword ptr [Value+4]
+        shrd    eax, edx, cl
+        shr     edx, cl
+    }
+}
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4035)
+#endif
+
+#elif defined(_M_ALPHA)
+
+//
+// Alpha has native 64-bit operations that are just as fast as their 32-bit
+// counter parts. Therefore, the int64 data type is used directly to form
+// shifts of 0..31 and multiplies of 32-bits times 32-bits to form a 64-bit
+// product.
+//
+
+#define Int32x32To64(a, b) ((LONGLONG)((LONG)(a)) * (LONGLONG)((LONG)(b)))
+#define UInt32x32To64(a, b) ((ULONGLONG)((DWORD)(a)) * (ULONGLONG)((DWORD)(b)))
+
+#define Int64ShllMod32(a, b) ((ULONGLONG)(a) << (b))
+#define Int64ShraMod32(a, b) ((LONGLONG)(a) >> (b))
+#define Int64ShrlMod32(a, b) ((ULONGLONG)(a) >> (b))
+
+
+#elif defined(_M_PPC)
+
+#define Int32x32To64(a, b) ((LONGLONG)((LONG)(a)) * (LONGLONG)((LONG)(b)))
+#define UInt32x32To64(a, b) ((ULONGLONG)((DWORD)(a)) * (ULONGLONG)((DWORD)(b)))
+
+#define Int64ShllMod32(a, b) ((ULONGLONG)(a) << (b))
+#define Int64ShraMod32(a, b) ((LONGLONG)(a) >> (b))
+#define Int64ShrlMod32(a, b) ((ULONGLONG)(a) >> (b))
+
+#elif defined(_68K_) || defined(_MPPC_)
+
+//
+// The Macintosh 68K and PowerPC compilers do not currently support int64.
+//
+
+#define Int32x32To64(a, b) ((LONGLONG)((LONG)(a)) * (LONGLONG)((LONG)(b)))
+#define UInt32x32To64(a, b) ((DWORDLONG)((DWORD)(a)) * (DWORDLONG)((DWORD)(b)))
+
+#define Int64ShllMod32(a, b) ((DWORDLONG)(a) << (b))
+#define Int64ShraMod32(a, b) ((LONGLONG)(a) >> (b))
+#define Int64ShrlMod32(a, b) ((DWORDLONG)(a) >> (b))
+
+#elif defined(_M_IA64) || defined(_M_AMD64)
+
+//
+// IA64 has native 64-bit operations that are just as fast as their 32-bit
+// counter parts. Therefore, the int64 data type is used directly to form
+// shifts of 0..31 and multiplies of 32-bits times 32-bits to form a 64-bit
+// product.
+//
+
+#define Int32x32To64(a, b) ((LONGLONG)((LONG)(a)) * (LONGLONG)((LONG)(b)))
+#define UInt32x32To64(a, b) ((ULONGLONG)((DWORD)(a)) * (ULONGLONG)((DWORD)(b)))
+
+#define Int64ShllMod32(a, b) ((ULONGLONG)(a) << (b))
+#define Int64ShraMod32(a, b) ((LONGLONG)(a) >> (b))
+#define Int64ShrlMod32(a, b) ((ULONGLONG)(a) >> (b))
+
+#else
+
+#error Must define a target architecture.
+
+#endif
+
+#define ANSI_NULL ((CHAR)0)     
+#define UNICODE_NULL ((WCHAR)0) 
+#define UNICODE_STRING_MAX_BYTES ((WORD  ) 65534) 
+#define UNICODE_STRING_MAX_CHARS (32767) 
+typedef BYTE  BOOLEAN;           
+typedef BOOLEAN *PBOOLEAN;       
+//
+//  Doubly linked list structure.  Can be used as either a list head, or
+//  as link words.
+//
+
+typedef struct _LIST_ENTRY {
+   struct _LIST_ENTRY *Flink;
+   struct _LIST_ENTRY *Blink;
+} LIST_ENTRY, *PLIST_ENTRY, *RESTRICTED_POINTER PRLIST_ENTRY;
+
+//
+//  Singly linked list structure. Can be used as either a list head, or
+//  as link words.
+//
+
+typedef struct _SINGLE_LIST_ENTRY {
+    struct _SINGLE_LIST_ENTRY *Next;
+} SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
+
+//
+// These are needed for portable debugger support.
+//
+
+typedef struct LIST_ENTRY32 {
+    DWORD Flink;
+    DWORD Blink;
+} LIST_ENTRY32;
+typedef LIST_ENTRY32 *PLIST_ENTRY32;
+
+typedef struct LIST_ENTRY64 {
+    ULONGLONG Flink;
+    ULONGLONG Blink;
+} LIST_ENTRY64;
+typedef LIST_ENTRY64 *PLIST_ENTRY64;
+
+
+#include <guiddef.h>
+
+#ifndef __OBJECTID_DEFINED
+#define __OBJECTID_DEFINED
+
+typedef struct  _OBJECTID {     // size is 20
+    GUID Lineage;
+    DWORD Uniquifier;
+} OBJECTID;
+#endif // !_OBJECTID_DEFINED
+
+#define MINCHAR     0x80        
+#define MAXCHAR     0x7f        
+#define MINSHORT    0x8000      
+#define MAXSHORT    0x7fff      
+#define MINLONG     0x80000000  
+#define MAXLONG     0x7fffffff  
+#define MAXBYTE     0xff        
+#define MAXWORD     0xffff      
+#define MAXDWORD    0xffffffff  
+//
+// Calculate the byte offset of a field in a structure of type type.
+//
+
+#define FIELD_OFFSET(type, field)    ((LONG)(LONG_PTR)&(((type *)0)->field))
+
+#if(_WIN32_WINNT > 0x0500)
+
+//
+// Calculate the size of a field in a structure of type type, without
+// knowing or stating the type of the field.
+//
+#define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
+
+//
+// Calculate the size of a structure of type type up through and
+// including a field.
+//
+#define RTL_SIZEOF_THROUGH_FIELD(type, field) \
+    (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
+
+//
+//  RTL_CONTAINS_FIELD usage:
+//
+//      if (RTL_CONTAINS_FIELD(pBlock, pBlock->cbSize, dwMumble)) { // safe to use pBlock->dwMumble
+//
+#define RTL_CONTAINS_FIELD(Struct, Size, Field) \
+    ( (((PCHAR)(&(Struct)->Field)) + sizeof((Struct)->Field)) <= (((PCHAR)(Struct))+(Size)) )
+
+//
+// Return the number of elements in a statically sized array.
+//   DWORD Buffer[100];
+//   RTL_NUMBER_OF(Buffer) == 100
+// This is also popularly known as: NUMBER_OF, ARRSIZE, _countof, NELEM, etc.
+//
+#define RTL_NUMBER_OF(A) (sizeof(A)/sizeof((A)[0]))
+
+//
+// An expression that yields the type of a field in a struct.
+//
+#define RTL_FIELD_TYPE(type, field) (((type*)0)->field)
+
+// RTL_ to avoid collisions in the global namespace.
+//
+// Given typedef struct _FOO { BYTE Bar[123]; } FOO;
+// RTL_NUMBER_OF_FIELD(FOO, Bar) == 123
+//
+#define RTL_NUMBER_OF_FIELD(type, field) (RTL_NUMBER_OF(RTL_FIELD_TYPE(type, field)))
+
+//
+// eg:
+// typedef struct FOO {
+//   DWORD Integer;
+//   PVOID Pointer;
+// } FOO;
+//
+// RTL_PADDING_BETWEEN_FIELDS(FOO, Integer, Pointer) == 0 for Win32, 4 for Win64
+//
+#define RTL_PADDING_BETWEEN_FIELDS(T, F1, F2) \
+    ((FIELD_OFFSET(T, F2) > FIELD_OFFSET(T, F1)) \
+        ? (FIELD_OFFSET(T, F2) - FIELD_OFFSET(T, F1) - RTL_FIELD_SIZE(T, F1)) \
+        : (FIELD_OFFSET(T, F1) - FIELD_OFFSET(T, F2) - RTL_FIELD_SIZE(T, F2)))
+
+// RTL_ to avoid collisions in the global namespace.
+#if defined(__cplusplus)
+#define RTL_CONST_CAST(type) const_cast<type>
+#else
+#define RTL_CONST_CAST(type) (type)
+#endif
+
+
+// like sizeof
+// usually this would be * CHAR_BIT, but we don't necessarily have #include <limits.h>
+#define RTL_BITS_OF(sizeOfArg) (sizeof(sizeOfArg) * 8)
+
+#define RTL_BITS_OF_FIELD(type, field) (RTL_BITS_OF(RTL_FIELD_TYPE(type, field)))
+
+#endif /* _WIN32_WINNT > 0x0500 */
+
+//
+// Calculate the address of the base of the structure given its type, and an
+// address of a field within the structure.
+//
+
+#define CONTAINING_RECORD(address, type, field) ((type *)( \
+                                                  (PCHAR)(address) - \
+                                                  (ULONG_PTR)(&((type *)0)->field)))
+
+
+#define VER_SERVER_NT                       0x80000000
+#define VER_WORKSTATION_NT                  0x40000000
+#define VER_SUITE_SMALLBUSINESS             0x00000001
+#define VER_SUITE_ENTERPRISE                0x00000002
+#define VER_SUITE_BACKOFFICE                0x00000004
+#define VER_SUITE_COMMUNICATIONS            0x00000008
+#define VER_SUITE_TERMINAL                  0x00000010
+#define VER_SUITE_SMALLBUSINESS_RESTRICTED  0x00000020
+#define VER_SUITE_EMBEDDEDNT                0x00000040
+#define VER_SUITE_DATACENTER                0x00000080
+#define VER_SUITE_SINGLEUSERTS              0x00000100
+#define VER_SUITE_PERSONAL                  0x00000200
+#define VER_SUITE_BLADE                     0x00000400
+#define VER_SUITE_EMBEDDED_RESTRICTED       0x00000800
+
+
+//
+//  Language IDs.
+//
+//  The following two combinations of primary language ID and
+//  sublanguage ID have special semantics:
+//
+//    Primary Language ID   Sublanguage ID      Result
+//    -------------------   ---------------     ------------------------
+//    LANG_NEUTRAL          SUBLANG_NEUTRAL     Language neutral
+//    LANG_NEUTRAL          SUBLANG_DEFAULT     User default language
+//    LANG_NEUTRAL          SUBLANG_SYS_DEFAULT System default language
+//    LANG_INVARIANT        SUBLANG_NEUTRAL     Invariant locale
+//
+
+//
+//  Primary language IDs.
+//
+
+#define LANG_NEUTRAL                     0x00
+#define LANG_INVARIANT                   0x7f
+
+#define LANG_AFRIKAANS                   0x36
+#define LANG_ALBANIAN                    0x1c
+#define LANG_ARABIC                      0x01
+#define LANG_ARMENIAN                    0x2b
+#define LANG_ASSAMESE                    0x4d
+#define LANG_AZERI                       0x2c
+#define LANG_BASQUE                      0x2d
+#define LANG_BELARUSIAN                  0x23
+#define LANG_BENGALI                     0x45
+#define LANG_BULGARIAN                   0x02
+#define LANG_CATALAN                     0x03
+#define LANG_CHINESE                     0x04
+#define LANG_CROATIAN                    0x1a
+#define LANG_CZECH                       0x05
+#define LANG_DANISH                      0x06
+#define LANG_DIVEHI                      0x65
+#define LANG_DUTCH                       0x13
+#define LANG_ENGLISH                     0x09
+#define LANG_ESTONIAN                    0x25
+#define LANG_FAEROESE                    0x38
+#define LANG_FARSI                       0x29
+#define LANG_FINNISH                     0x0b
+#define LANG_FRENCH                      0x0c
+#define LANG_GALICIAN                    0x56
+#define LANG_GEORGIAN                    0x37
+#define LANG_GERMAN                      0x07
+#define LANG_GREEK                       0x08
+#define LANG_GUJARATI                    0x47
+#define LANG_HEBREW                      0x0d
+#define LANG_HINDI                       0x39
+#define LANG_HUNGARIAN                   0x0e
+#define LANG_ICELANDIC                   0x0f
+#define LANG_INDONESIAN                  0x21
+#define LANG_ITALIAN                     0x10
+#define LANG_JAPANESE                    0x11
+#define LANG_KANNADA                     0x4b
+#define LANG_KASHMIRI                    0x60
+#define LANG_KAZAK                       0x3f
+#define LANG_KONKANI                     0x57
+#define LANG_KOREAN                      0x12
+#define LANG_KYRGYZ                      0x40
+#define LANG_LATVIAN                     0x26
+#define LANG_LITHUANIAN                  0x27
+#define LANG_MACEDONIAN                  0x2f   // the Former Yugoslav Republic of Macedonia
+#define LANG_MALAY                       0x3e
+#define LANG_MALAYALAM                   0x4c
+#define LANG_MANIPURI                    0x58
+#define LANG_MARATHI                     0x4e
+#define LANG_MONGOLIAN                   0x50
+#define LANG_NEPALI                      0x61
+#define LANG_NORWEGIAN                   0x14
+#define LANG_ORIYA                       0x48
+#define LANG_POLISH                      0x15
+#define LANG_PORTUGUESE                  0x16
+#define LANG_PUNJABI                     0x46
+#define LANG_ROMANIAN                    0x18
+#define LANG_RUSSIAN                     0x19
+#define LANG_SANSKRIT                    0x4f
+#define LANG_SERBIAN                     0x1a
+#define LANG_SINDHI                      0x59
+#define LANG_SLOVAK                      0x1b
+#define LANG_SLOVENIAN                   0x24
+#define LANG_SPANISH                     0x0a
+#define LANG_SWAHILI                     0x41
+#define LANG_SWEDISH                     0x1d
+#define LANG_SYRIAC                      0x5a
+#define LANG_TAMIL                       0x49
+#define LANG_TATAR                       0x44
+#define LANG_TELUGU                      0x4a
+#define LANG_THAI                        0x1e
+#define LANG_TURKISH                     0x1f
+#define LANG_UKRAINIAN                   0x22
+#define LANG_URDU                        0x20
+#define LANG_UZBEK                       0x43
+#define LANG_VIETNAMESE                  0x2a
+
+//
+//  Sublanguage IDs.
+//
+//  The name immediately following SUBLANG_ dictates which primary
+//  language ID that sublanguage ID can be combined with to form a
+//  valid language ID.
+//
+
+#define SUBLANG_NEUTRAL                  0x00    // language neutral
+#define SUBLANG_DEFAULT                  0x01    // user default
+#define SUBLANG_SYS_DEFAULT              0x02    // system default
+
+#define SUBLANG_ARABIC_SAUDI_ARABIA      0x01    // Arabic (Saudi Arabia)
+#define SUBLANG_ARABIC_IRAQ              0x02    // Arabic (Iraq)
+#define SUBLANG_ARABIC_EGYPT             0x03    // Arabic (Egypt)
+#define SUBLANG_ARABIC_LIBYA             0x04    // Arabic (Libya)
+#define SUBLANG_ARABIC_ALGERIA           0x05    // Arabic (Algeria)
+#define SUBLANG_ARABIC_MOROCCO           0x06    // Arabic (Morocco)
+#define SUBLANG_ARABIC_TUNISIA           0x07    // Arabic (Tunisia)
+#define SUBLANG_ARABIC_OMAN              0x08    // Arabic (Oman)
+#define SUBLANG_ARABIC_YEMEN             0x09    // Arabic (Yemen)
+#define SUBLANG_ARABIC_SYRIA             0x0a    // Arabic (Syria)
+#define SUBLANG_ARABIC_JORDAN            0x0b    // Arabic (Jordan)
+#define SUBLANG_ARABIC_LEBANON           0x0c    // Arabic (Lebanon)
+#define SUBLANG_ARABIC_KUWAIT            0x0d    // Arabic (Kuwait)
+#define SUBLANG_ARABIC_UAE               0x0e    // Arabic (U.A.E)
+#define SUBLANG_ARABIC_BAHRAIN           0x0f    // Arabic (Bahrain)
+#define SUBLANG_ARABIC_QATAR             0x10    // Arabic (Qatar)
+#define SUBLANG_AZERI_LATIN              0x01    // Azeri (Latin)
+#define SUBLANG_AZERI_CYRILLIC           0x02    // Azeri (Cyrillic)
+#define SUBLANG_CHINESE_TRADITIONAL      0x01    // Chinese (Taiwan)
+#define SUBLANG_CHINESE_SIMPLIFIED       0x02    // Chinese (PR China)
+#define SUBLANG_CHINESE_HONGKONG         0x03    // Chinese (Hong Kong S.A.R., P.R.C.)
+#define SUBLANG_CHINESE_SINGAPORE        0x04    // Chinese (Singapore)
+#define SUBLANG_CHINESE_MACAU            0x05    // Chinese (Macau S.A.R.)
+#define SUBLANG_DUTCH                    0x01    // Dutch
+#define SUBLANG_DUTCH_BELGIAN            0x02    // Dutch (Belgian)
+#define SUBLANG_ENGLISH_US               0x01    // English (USA)
+#define SUBLANG_ENGLISH_UK               0x02    // English (UK)
+#define SUBLANG_ENGLISH_AUS              0x03    // English (Australian)
+#define SUBLANG_ENGLISH_CAN              0x04    // English (Canadian)
+#define SUBLANG_ENGLISH_NZ               0x05    // English (New Zealand)
+#define SUBLANG_ENGLISH_EIRE             0x06    // English (Irish)
+#define SUBLANG_ENGLISH_SOUTH_AFRICA     0x07    // English (South Africa)
+#define SUBLANG_ENGLISH_JAMAICA          0x08    // English (Jamaica)
+#define SUBLANG_ENGLISH_CARIBBEAN        0x09    // English (Caribbean)
+#define SUBLANG_ENGLISH_BELIZE           0x0a    // English (Belize)
+#define SUBLANG_ENGLISH_TRINIDAD         0x0b    // English (Trinidad)
+#define SUBLANG_ENGLISH_ZIMBABWE         0x0c    // English (Zimbabwe)
+#define SUBLANG_ENGLISH_PHILIPPINES      0x0d    // English (Philippines)
+#define SUBLANG_FRENCH                   0x01    // French
+#define SUBLANG_FRENCH_BELGIAN           0x02    // French (Belgian)
+#define SUBLANG_FRENCH_CANADIAN          0x03    // French (Canadian)
+#define SUBLANG_FRENCH_SWISS             0x04    // French (Swiss)
+#define SUBLANG_FRENCH_LUXEMBOURG        0x05    // French (Luxembourg)
+#define SUBLANG_FRENCH_MONACO            0x06    // French (Monaco)
+#define SUBLANG_GERMAN                   0x01    // German
+#define SUBLANG_GERMAN_SWISS             0x02    // German (Swiss)
+#define SUBLANG_GERMAN_AUSTRIAN          0x03    // German (Austrian)
+#define SUBLANG_GERMAN_LUXEMBOURG        0x04    // German (Luxembourg)
+#define SUBLANG_GERMAN_LIECHTENSTEIN     0x05    // German (Liechtenstein)
+#define SUBLANG_ITALIAN                  0x01    // Italian
+#define SUBLANG_ITALIAN_SWISS            0x02    // Italian (Swiss)
+#if _WIN32_WINNT >= 0x0501
+#define SUBLANG_KASHMIRI_SASIA           0x02    // Kashmiri (South Asia)
+#endif
+#define SUBLANG_KASHMIRI_INDIA           0x02    // For app compatibility only
+#define SUBLANG_KOREAN                   0x01    // Korean (Extended Wansung)
+#define SUBLANG_LITHUANIAN               0x01    // Lithuanian
+#define SUBLANG_MALAY_MALAYSIA           0x01    // Malay (Malaysia)
+#define SUBLANG_MALAY_BRUNEI_DARUSSALAM  0x02    // Malay (Brunei Darussalam)
+#define SUBLANG_NEPALI_INDIA             0x02    // Nepali (India)
+#define SUBLANG_NORWEGIAN_BOKMAL         0x01    // Norwegian (Bokmal)
+#define SUBLANG_NORWEGIAN_NYNORSK        0x02    // Norwegian (Nynorsk)
+#define SUBLANG_PORTUGUESE               0x02    // Portuguese
+#define SUBLANG_PORTUGUESE_BRAZILIAN     0x01    // Portuguese (Brazilian)
+#define SUBLANG_SERBIAN_LATIN            0x02    // Serbian (Latin)
+#define SUBLANG_SERBIAN_CYRILLIC         0x03    // Serbian (Cyrillic)
+#define SUBLANG_SPANISH                  0x01    // Spanish (Castilian)
+#define SUBLANG_SPANISH_MEXICAN          0x02    // Spanish (Mexican)
+#define SUBLANG_SPANISH_MODERN           0x03    // Spanish (Spain)
+#define SUBLANG_SPANISH_GUATEMALA        0x04    // Spanish (Guatemala)
+#define SUBLANG_SPANISH_COSTA_RICA       0x05    // Spanish (Costa Rica)
+#define SUBLANG_SPANISH_PANAMA           0x06    // Spanish (Panama)
+#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07  // Spanish (Dominican Republic)
+#define SUBLANG_SPANISH_VENEZUELA        0x08    // Spanish (Venezuela)
+#define SUBLANG_SPANISH_COLOMBIA         0x09    // Spanish (Colombia)
+#define SUBLANG_SPANISH_PERU             0x0a    // Spanish (Peru)
+#define SUBLANG_SPANISH_ARGENTINA        0x0b    // Spanish (Argentina)
+#define SUBLANG_SPANISH_ECUADOR          0x0c    // Spanish (Ecuador)
+#define SUBLANG_SPANISH_CHILE            0x0d    // Spanish (Chile)
+#define SUBLANG_SPANISH_URUGUAY          0x0e    // Spanish (Uruguay)
+#define SUBLANG_SPANISH_PARAGUAY         0x0f    // Spanish (Paraguay)
+#define SUBLANG_SPANISH_BOLIVIA          0x10    // Spanish (Bolivia)
+#define SUBLANG_SPANISH_EL_SALVADOR      0x11    // Spanish (El Salvador)
+#define SUBLANG_SPANISH_HONDURAS         0x12    // Spanish (Honduras)
+#define SUBLANG_SPANISH_NICARAGUA        0x13    // Spanish (Nicaragua)
+#define SUBLANG_SPANISH_PUERTO_RICO      0x14    // Spanish (Puerto Rico)
+#define SUBLANG_SWEDISH                  0x01    // Swedish
+#define SUBLANG_SWEDISH_FINLAND          0x02    // Swedish (Finland)
+#define SUBLANG_URDU_PAKISTAN            0x01    // Urdu (Pakistan)
+#define SUBLANG_URDU_INDIA               0x02    // Urdu (India)
+#define SUBLANG_UZBEK_LATIN              0x01    // Uzbek (Latin)
+#define SUBLANG_UZBEK_CYRILLIC           0x02    // Uzbek (Cyrillic)
+
+//
+//  Sorting IDs.
+//
+
+#define SORT_DEFAULT                     0x0     // sorting default
+
+#define SORT_JAPANESE_XJIS               0x0     // Japanese XJIS order
+#define SORT_JAPANESE_UNICODE            0x1     // Japanese Unicode order
+
+#define SORT_CHINESE_BIG5                0x0     // Chinese BIG5 order
+#define SORT_CHINESE_PRCP                0x0     // PRC Chinese Phonetic order
+#define SORT_CHINESE_UNICODE             0x1     // Chinese Unicode order
+#define SORT_CHINESE_PRC                 0x2     // PRC Chinese Stroke Count order
+#define SORT_CHINESE_BOPOMOFO            0x3     // Traditional Chinese Bopomofo order
+
+#define SORT_KOREAN_KSC                  0x0     // Korean KSC order
+#define SORT_KOREAN_UNICODE              0x1     // Korean Unicode order
+
+#define SORT_GERMAN_PHONE_BOOK           0x1     // German Phone Book order
+
+#define SORT_HUNGARIAN_DEFAULT           0x0     // Hungarian Default order
+#define SORT_HUNGARIAN_TECHNICAL         0x1     // Hungarian Technical order
+
+#define SORT_GEORGIAN_TRADITIONAL        0x0     // Georgian Traditional order
+#define SORT_GEORGIAN_MODERN             0x1     // Georgian Modern order
+
+// end_r_winnt
+
+//
+//  A language ID is a 16 bit value which is the combination of a
+//  primary language ID and a secondary language ID.  The bits are
+//  allocated as follows:
+//
+//       +-----------------------+-------------------------+
+//       |     Sublanguage ID    |   Primary Language ID   |
+//       +-----------------------+-------------------------+
+//        15                   10 9                       0   bit
+//
+//
+//  Language ID creation/extraction macros:
+//
+//    MAKELANGID    - construct language id from a primary language id and
+//                    a sublanguage id.
+//    PRIMARYLANGID - extract primary language id from a language id.
+//    SUBLANGID     - extract sublanguage id from a language id.
+//
+
+#define MAKELANGID(p, s)       ((((WORD  )(s)) << 10) | (WORD  )(p))
+#define PRIMARYLANGID(lgid)    ((WORD  )(lgid) & 0x3ff)
+#define SUBLANGID(lgid)        ((WORD  )(lgid) >> 10)
+
+
+//
+//  A locale ID is a 32 bit value which is the combination of a
+//  language ID, a sort ID, and a reserved area.  The bits are
+//  allocated as follows:
+//
+//       +-------------+---------+-------------------------+
+//       |   Reserved  | Sort ID |      Language ID        |
+//       +-------------+---------+-------------------------+
+//        31         20 19     16 15                      0   bit
+//
+//
+//  Locale ID creation/extraction macros:
+//
+//    MAKELCID            - construct the locale id from a language id and a sort id.
+//    MAKESORTLCID        - construct the locale id from a language id, sort id, and sort version.
+//    LANGIDFROMLCID      - extract the language id from a locale id.
+//    SORTIDFROMLCID      - extract the sort id from a locale id.
+//    SORTVERSIONFROMLCID - extract the sort version from a locale id.
+//
+
+#define NLS_VALID_LOCALE_MASK  0x000fffff
+
+#define MAKELCID(lgid, srtid)  ((DWORD)((((DWORD)((WORD  )(srtid))) << 16) |  \
+                                         ((DWORD)((WORD  )(lgid)))))
+#define MAKESORTLCID(lgid, srtid, ver)                                            \
+                               ((DWORD)((MAKELCID(lgid, srtid)) |             \
+                                    (((DWORD)((WORD  )(ver))) << 20)))
+#define LANGIDFROMLCID(lcid)   ((WORD  )(lcid))
+#define SORTIDFROMLCID(lcid)   ((WORD  )((((DWORD)(lcid)) >> 16) & 0xf))
+#define SORTVERSIONFROMLCID(lcid)  ((WORD  )((((DWORD)(lcid)) >> 20) & 0xf))
+
+
+//
+//  Default System and User IDs for language and locale.
+//
+
+#define LANG_SYSTEM_DEFAULT    (MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT))
+#define LANG_USER_DEFAULT      (MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT))
+
+#define LOCALE_SYSTEM_DEFAULT  (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
+#define LOCALE_USER_DEFAULT    (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT))
+
+#define LOCALE_NEUTRAL                                                        \
+          (MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT))
+
+#define LOCALE_INVARIANT                                                      \
+          (MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT))
+
+// begin_ntminiport begin_ntndis begin_ntminitape
+
+//
+// Macros used to eliminate compiler warning generated when formal
+// parameters or local variables are not declared.
+//
+// Use DBG_UNREFERENCED_PARAMETER() when a parameter is not yet
+// referenced but will be once the module is completely developed.
+//
+// Use DBG_UNREFERENCED_LOCAL_VARIABLE() when a local variable is not yet
+// referenced but will be once the module is completely developed.
+//
+// Use UNREFERENCED_PARAMETER() if a parameter will never be referenced.
+//
+// DBG_UNREFERENCED_PARAMETER and DBG_UNREFERENCED_LOCAL_VARIABLE will
+// eventually be made into a null macro to help determine whether there
+// is unfinished work.
+//
+
+#if ! defined(lint)
+#define UNREFERENCED_PARAMETER(P)          (P)
+#define DBG_UNREFERENCED_PARAMETER(P)      (P)
+#define DBG_UNREFERENCED_LOCAL_VARIABLE(V) (V)
+
+#else // lint
+
+// Note: lint -e530 says don't complain about uninitialized variables for
+// this varible.  Error 527 has to do with unreachable code.
+// -restore restores checking to the -save state
+
+#define UNREFERENCED_PARAMETER(P)          \
+    /*lint -save -e527 -e530 */ \
+    { \
+        (P) = (P); \
+    } \
+    /*lint -restore */
+#define DBG_UNREFERENCED_PARAMETER(P)      \
+    /*lint -save -e527 -e530 */ \
+    { \
+        (P) = (P); \
+    } \
+    /*lint -restore */
+#define DBG_UNREFERENCED_LOCAL_VARIABLE(V) \
+    /*lint -save -e527 -e530 */ \
+    { \
+        (V) = (V); \
+    } \
+    /*lint -restore */
+
+#endif // lint
+
+//
+// Macro used to eliminate compiler warning 4715 within a switch statement
+// when all possible cases have already been accounted for.
+//
+// switch (a & 3) {
+//     case 0: return 1;
+//     case 1: return Foo();
+//     case 2: return Bar();
+//     case 3: return 1;
+//     DEFAULT_UNREACHABLE;
+//
+
+#if (_MSC_VER > 1200)
+#define DEFAULT_UNREACHABLE default: __assume(0)
+#else
+
+//
+// Older compilers do not support __assume(), and there is no other free
+// method of eliminating the warning.
+//
+
+#define DEFAULT_UNREACHABLE
+
+#endif
+
+#ifndef WIN32_NO_STATUS 
+/*lint -save -e767 */  
+#define STATUS_WAIT_0                    ((DWORD   )0x00000000L)    
+#define STATUS_ABANDONED_WAIT_0          ((DWORD   )0x00000080L)    
+#define STATUS_USER_APC                  ((DWORD   )0x000000C0L)    
+#define STATUS_TIMEOUT                   ((DWORD   )0x00000102L)    
+#define STATUS_PENDING                   ((DWORD   )0x00000103L)    
+#define DBG_EXCEPTION_HANDLED            ((DWORD   )0x00010001L)    
+#define DBG_CONTINUE                     ((DWORD   )0x00010002L)    
+#define STATUS_SEGMENT_NOTIFICATION      ((DWORD   )0x40000005L)    
+#define DBG_TERMINATE_THREAD             ((DWORD   )0x40010003L)    
+#define DBG_TERMINATE_PROCESS            ((DWORD   )0x40010004L)    
+#define DBG_CONTROL_C                    ((DWORD   )0x40010005L)    
+#define DBG_CONTROL_BREAK                ((DWORD   )0x40010008L)    
+#define DBG_COMMAND_EXCEPTION            ((DWORD   )0x40010009L)    
+#define STATUS_GUARD_PAGE_VIOLATION      ((DWORD   )0x80000001L)    
+#define STATUS_DATATYPE_MISALIGNMENT     ((DWORD   )0x80000002L)    
+#define STATUS_BREAKPOINT                ((DWORD   )0x80000003L)    
+#define STATUS_SINGLE_STEP               ((DWORD   )0x80000004L)    
+#define DBG_EXCEPTION_NOT_HANDLED        ((DWORD   )0x80010001L)    
+#define STATUS_ACCESS_VIOLATION          ((DWORD   )0xC0000005L)    
+#define STATUS_IN_PAGE_ERROR             ((DWORD   )0xC0000006L)    
+#define STATUS_INVALID_HANDLE            ((DWORD   )0xC0000008L)    
+#define STATUS_NO_MEMORY                 ((DWORD   )0xC0000017L)    
+#define STATUS_ILLEGAL_INSTRUCTION       ((DWORD   )0xC000001DL)    
+#define STATUS_NONCONTINUABLE_EXCEPTION  ((DWORD   )0xC0000025L)    
+#define STATUS_INVALID_DISPOSITION       ((DWORD   )0xC0000026L)    
+#define STATUS_ARRAY_BOUNDS_EXCEEDED     ((DWORD   )0xC000008CL)    
+#define STATUS_FLOAT_DENORMAL_OPERAND    ((DWORD   )0xC000008DL)    
+#define STATUS_FLOAT_DIVIDE_BY_ZERO      ((DWORD   )0xC000008EL)    
+#define STATUS_FLOAT_INEXACT_RESULT      ((DWORD   )0xC000008FL)    
+#define STATUS_FLOAT_INVALID_OPERATION   ((DWORD   )0xC0000090L)    
+#define STATUS_FLOAT_OVERFLOW            ((DWORD   )0xC0000091L)    
+#define STATUS_FLOAT_STACK_CHECK         ((DWORD   )0xC0000092L)    
+#define STATUS_FLOAT_UNDERFLOW           ((DWORD   )0xC0000093L)    
+#define STATUS_INTEGER_DIVIDE_BY_ZERO    ((DWORD   )0xC0000094L)    
+#define STATUS_INTEGER_OVERFLOW          ((DWORD   )0xC0000095L)    
+#define STATUS_PRIVILEGED_INSTRUCTION    ((DWORD   )0xC0000096L)    
+#define STATUS_STACK_OVERFLOW            ((DWORD   )0xC00000FDL)    
+#define STATUS_CONTROL_C_EXIT            ((DWORD   )0xC000013AL)    
+#define STATUS_FLOAT_MULTIPLE_FAULTS     ((DWORD   )0xC00002B4L)    
+#define STATUS_FLOAT_MULTIPLE_TRAPS      ((DWORD   )0xC00002B5L)    
+#define STATUS_REG_NAT_CONSUMPTION       ((DWORD   )0xC00002C9L)    
+#if defined(STATUS_SUCCESS) || (_WIN32_WINNT > 0x0500) || (_WIN32_FUSION >= 0x0100) 
+#define STATUS_SXS_EARLY_DEACTIVATION    ((DWORD   )0xC015000FL)    
+#define STATUS_SXS_INVALID_DEACTIVATION  ((DWORD   )0xC0150010L)    
+#endif 
+/*lint -restore */  
+#endif 
+#define MAXIMUM_WAIT_OBJECTS 64     // Maximum number of wait objects
+
+#define MAXIMUM_SUSPEND_COUNT MAXCHAR // Maximum times thread can be suspended
+
+typedef ULONG_PTR KSPIN_LOCK;
+typedef KSPIN_LOCK *PKSPIN_LOCK;
+
+
+#if defined(_AMD64_)
+
+
+#if defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS)
+
+//
+// Define bit scan intrinsics.
+//
+
+#define BitScanForward _BitScanForward
+#define BitScanReverse _BitScanReverse
+#define BitScanForward64 _BitScanForward64
+#define BitScanReverse64 _BitScanReverse64
+
+BOOLEAN
+_BitScanForward (
+    OUT DWORD *Index,
+    IN DWORD Mask
+    );
+
+BOOLEAN
+_BitScanReverse (
+    OUT DWORD *Index,
+    IN DWORD Mask
+    );
+
+BOOLEAN
+_BitScanForward64 (
+    OUT DWORD *Index,
+    IN DWORD64 Mask
+    );
+
+BOOLEAN
+_BitScanReverse64 (
+    OUT DWORD *Index,
+    IN DWORD64 Mask
+    );
+
+#pragma intrinsic(_BitScanForward)
+#pragma intrinsic(_BitScanReverse)
+#pragma intrinsic(_BitScanForward64)
+#pragma intrinsic(_BitScanReverse64)
+
+//
+// Define function to flush a cache line.
+//
+
+#define CacheLineFlush(Address) _mm_clflush(Address)
+
+VOID
+_mm_clflush (
+    PVOID Address
+    );
+
+#pragma intrinsic(_mm_clflush)
+
+//
+// Define memory fence intrinsics
+//
+
+#define LoadFence _mm_lfence
+#define MemoryFence _mm_mfence
+#define StoreFence _mm_sfence
+
+VOID
+_mm_lfence (
+    VOID
+    );
+
+VOID
+_mm_mfence (
+    VOID
+    );
+
+VOID
+_mm_sfence (
+    VOID
+    );
+
+#pragma intrinsic(_mm_lfence)
+#pragma intrinsic(_mm_mfence)
+#pragma intrinsic(_mm_sfence)
+
+//
+// Define function to get the caller's EFLAGs value.
+//
+
+#define GetCallersEflags() __getcallerseflags()
+
+unsigned __int32
+__getcallerseflags (
+    VOID
+    );
+
+#pragma intrinsic(__getcallerseflags)
+
+//
+// Define function to read the value of the time stamp counter
+//
+
+#define ReadTimeStampCounter() __rdtsc()
+
+DWORD64
+__rdtsc (
+    VOID
+    );
+
+#pragma intrinsic(__rdtsc)
+
+//
+// Define functions to move strings or bytes, words, dwords, and qwords.
+//
+
+VOID
+__movsb (
+    IN PBYTE  Destination,
+    IN PBYTE  Source,
+    IN DWORD Count
+    );
+
+VOID
+__movsw (
+    IN PWORD   Destination,
+    IN PWORD   Source,
+    IN DWORD Count
+    );
+
+VOID
+__movsd (
+    IN PDWORD Destination,
+    IN PDWORD Source,
+    IN DWORD Count
+    );
+
+VOID
+__movsq (
+    IN PULONGLONG Destination,
+    IN PULONGLONG Source,
+    IN DWORD Count
+    );
+
+#pragma intrinsic(__movsb)
+#pragma intrinsic(__movsw)
+#pragma intrinsic(__movsd)
+#pragma intrinsic(__movsq)
+
+//
+// Define functions to capture the high 64-bits of a 128-bit multiply.
+//
+
+#define MultiplyHigh __mulh
+#define UnsignedMultiplyHigh __umulh
+
+LONGLONG
+MultiplyHigh (
+    IN LONGLONG Multiplier,
+    IN LONGLONG Multiplicand
+    );
+
+ULONGLONG
+UnsignedMultiplyHigh (
+    IN ULONGLONG Multiplier,
+    IN ULONGLONG Multiplicand
+    );
+
+#pragma intrinsic(__mulh)
+#pragma intrinsic(__umulh)
+
+//
+// Define functions to read and write the uer TEB and the system PCR/PRCB.
+//
+
+BYTE 
+__readgsbyte (
+    IN DWORD Offset
+    );
+
+WORD  
+__readgsword (
+    IN DWORD Offset
+    );
+
+DWORD
+__readgsdword (
+    IN DWORD Offset
+    );
+
+DWORD64
+__readgsqword (
+    IN DWORD Offset
+    );
+
+VOID
+__writegsbyte (
+    IN DWORD Offset,
+    IN BYTE  Data
+    );
+
+VOID
+__writegsword (
+    IN DWORD Offset,
+    IN WORD   Data
+    );
+
+VOID
+__writegsdword (
+    IN DWORD Offset,
+    IN DWORD Data
+    );
+
+VOID
+__writegsqword (
+    IN DWORD Offset,
+    IN DWORD64 Data
+    );
+
+#pragma intrinsic(__readgsbyte)
+#pragma intrinsic(__readgsword)
+#pragma intrinsic(__readgsdword)
+#pragma intrinsic(__readgsqword)
+#pragma intrinsic(__writegsbyte)
+#pragma intrinsic(__writegsword)
+#pragma intrinsic(__writegsdword)
+#pragma intrinsic(__writegsqword)
+
+#endif // defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS)
+
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_AMD64   0x100000
+
+// end_wx86
+
+#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x1L)
+#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x2L)
+#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x4L)
+#define CONTEXT_FLOATING_POINT  (CONTEXT_AMD64 | 0x8L)
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x10L)
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT)
+
+#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)
+
+// begin_wx86
+
+#endif // !defined(RC_INVOKED)
+
+//
+// Define initial MxCsr control.
+//
+
+#define INITIAL_MXCSR 0x1f80            // initial MXCSR value
+
+//
+// Define 128-bit 16-byte aligned xmm register type.
+//
+
+typedef struct DECLSPEC_ALIGN(16) _M128 {
+    ULONGLONG Low;
+    LONGLONG High;
+} M128, *PM128;
+
+//
+// Format of data for fnsave/frstor instructions.
+//
+// This structure is used to store the legacy floating point state.
+//
+
+typedef struct _LEGACY_SAVE_AREA {
+    WORD   ControlWord;
+    WORD   Reserved0;
+    WORD   StatusWord;
+    WORD   Reserved1;
+    WORD   TagWord;
+    WORD   Reserved2;
+    DWORD ErrorOffset;
+    WORD   ErrorSelector;
+    WORD   ErrorOpcode;
+    DWORD DataOffset;
+    WORD   DataSelector;
+    WORD   Reserved3;
+    BYTE  FloatRegisters[8 * 10];
+} LEGACY_SAVE_AREA, *PLEGACY_SAVE_AREA;
+
+#define LEGACY_SAVE_AREA_LENGTH  ((sizeof(LEGACY_SAVE_AREA) + 15) & ~15)
+
+//
+// Context Frame
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) is is used to constuct a call frame for APC delivery,
+//  and 3) it is used in the user level thread creation routines.
+//
+//
+// The flags field within this record controls the contents of a CONTEXT
+// record.
+//
+// If the context record is used as an input parameter, then for each
+// portion of the context record controlled by a flag whose value is
+// set, it is assumed that that portion of the context record contains
+// valid context. If the context record is being used to modify a threads
+// context, then only that portion of the threads context is modified.
+//
+// If the context record is used as an output parameter to capture the
+// context of a thread, then only those portions of the thread's context
+// corresponding to set flags will be returned.
+//
+// CONTEXT_CONTROL specifies SegSs, Rsp, SegCs, Rip, and EFlags.
+//
+// CONTEXT_INTEGER specifies Rax, Rcx, Rdx, Rbx, Rbp, Rsi, Rdi, and R8-R15.
+//
+// CONTEXT_SEGMENTS specifies SegDs, SegEs, SegFs, and SegGs.
+//
+// CONTEXT_DEBUG_REGISTERS specifies Dr0-Dr3 and Dr6-Dr7.
+//
+// CONTEXT_MMX_REGISTERS specifies the floating point and extended registers
+//     Mm0/St0-Mm7/St7 and Xmm0-Xmm15).
+//
+
+typedef struct DECLSPEC_ALIGN(16) _CONTEXT {
+
+    //
+    // Register parameter home addresses.
+    //
+
+    DWORD64 P1Home;
+    DWORD64 P2Home;
+    DWORD64 P3Home;
+    DWORD64 P4Home;
+    DWORD64 P5Home;
+    DWORD64 P6Home;
+
+    //
+    // Control flags.
+    //
+
+    DWORD ContextFlags;
+    DWORD MxCsr;
+
+    //
+    // Segment Registers and processor flags.
+    //
+
+    WORD   SegCs;
+    WORD   SegDs;
+    WORD   SegEs;
+    WORD   SegFs;
+    WORD   SegGs;
+    WORD   SegSs;
+    DWORD EFlags;
+
+    //
+    // Debug registers
+    //
+
+    DWORD64 Dr0;
+    DWORD64 Dr1;
+    DWORD64 Dr2;
+    DWORD64 Dr3;
+    DWORD64 Dr6;
+    DWORD64 Dr7;
+
+    //
+    // Integer registers.
+    //
+
+    DWORD64 Rax;
+    DWORD64 Rcx;
+    DWORD64 Rdx;
+    DWORD64 Rbx;
+    DWORD64 Rsp;
+    DWORD64 Rbp;
+    DWORD64 Rsi;
+    DWORD64 Rdi;
+    DWORD64 R8;
+    DWORD64 R9;
+    DWORD64 R10;
+    DWORD64 R11;
+    DWORD64 R12;
+    DWORD64 R13;
+    DWORD64 R14;
+    DWORD64 R15;
+
+    //
+    // Program counter.
+    //
+
+    DWORD64 Rip;
+
+    //
+    // MMX/floating point state.
+    //
+
+    M128 Xmm0;
+    M128 Xmm1;
+    M128 Xmm2;
+    M128 Xmm3;
+    M128 Xmm4;
+    M128 Xmm5;
+    M128 Xmm6;
+    M128 Xmm7;
+    M128 Xmm8;
+    M128 Xmm9;
+    M128 Xmm10;
+    M128 Xmm11;
+    M128 Xmm12;
+    M128 Xmm13;
+    M128 Xmm14;
+    M128 Xmm15;
+
+    //
+    // Legacy floating point state.
+    //
+
+    LEGACY_SAVE_AREA FltSave;
+    DWORD Fill;
+
+    //
+    // Special debug control registers.
+    //
+
+    DWORD64 DebugControl;
+    DWORD64 LastBranchToRip;
+    DWORD64 LastBranchFromRip;
+    DWORD64 LastExceptionToRip;
+    DWORD64 LastExceptionFromRip;
+    DWORD64 Fill1;
+} CONTEXT, *PCONTEXT;
+
+
+#endif // _AMD64_
+
+//
+// Define function to return the current Thread Environment Block
+//
+
+#ifdef _ALPHA_                          // winnt
+void *_rdteb(void);                     // winnt
+#if defined(_M_ALPHA)                   // winnt
+#pragma intrinsic(_rdteb)               // winnt
+#endif                                  // winnt
+#endif                                  // winnt
+
+#if defined(_M_ALPHA)
+#define NtCurrentTeb() ((struct _TEB *)_rdteb())
+#else
+struct _TEB *
+NtCurrentTeb(void);
+#endif
+
+//
+// Define functions to get the address of the current fiber and the
+// current fiber data.
+//
+
+#ifdef _ALPHA_
+
+#define GetCurrentFiber() (((PNT_TIB)NtCurrentTeb())->FiberData)
+#define GetFiberData() (*(PVOID *)(GetCurrentFiber()))
+
+// begin_ntddk begin_nthal
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_ALPHA              0x00020000
+
+#define CONTEXT_CONTROL         (CONTEXT_ALPHA | 0x00000001L)
+#define CONTEXT_FLOATING_POINT  (CONTEXT_ALPHA | 0x00000002L)
+#define CONTEXT_INTEGER         (CONTEXT_ALPHA | 0x00000004L)
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
+
+#endif
+
+#ifndef _PORTABLE_32BIT_CONTEXT
+
+//
+// Context Frame
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) it is used to construct a call frame for APC delivery,
+//  3) it is used to construct a call frame for exception dispatching
+//  in user mode, 4) it is used in the user level thread creation
+//  routines, and 5) it is used to to pass thread state to debuggers.
+//
+//  N.B. Because this record is used as a call frame, it must be EXACTLY
+//  a multiple of 16 bytes in length.
+//
+//  There are two variations of the context structure. This is the real one.
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_FLOATING_POINT.
+    //
+
+    ULONGLONG FltF0;
+    ULONGLONG FltF1;
+    ULONGLONG FltF2;
+    ULONGLONG FltF3;
+    ULONGLONG FltF4;
+    ULONGLONG FltF5;
+    ULONGLONG FltF6;
+    ULONGLONG FltF7;
+    ULONGLONG FltF8;
+    ULONGLONG FltF9;
+    ULONGLONG FltF10;
+    ULONGLONG FltF11;
+    ULONGLONG FltF12;
+    ULONGLONG FltF13;
+    ULONGLONG FltF14;
+    ULONGLONG FltF15;
+    ULONGLONG FltF16;
+    ULONGLONG FltF17;
+    ULONGLONG FltF18;
+    ULONGLONG FltF19;
+    ULONGLONG FltF20;
+    ULONGLONG FltF21;
+    ULONGLONG FltF22;
+    ULONGLONG FltF23;
+    ULONGLONG FltF24;
+    ULONGLONG FltF25;
+    ULONGLONG FltF26;
+    ULONGLONG FltF27;
+    ULONGLONG FltF28;
+    ULONGLONG FltF29;
+    ULONGLONG FltF30;
+    ULONGLONG FltF31;
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_INTEGER.
+    //
+    // N.B. The registers gp, sp, and ra are defined in this section, but are
+    //  considered part of the control context rather than part of the integer
+    //  context.
+    //
+
+    ULONGLONG IntV0;    //  $0: return value register, v0
+    ULONGLONG IntT0;    //  $1: temporary registers, t0 - t7
+    ULONGLONG IntT1;    //  $2:
+    ULONGLONG IntT2;    //  $3:
+    ULONGLONG IntT3;    //  $4:
+    ULONGLONG IntT4;    //  $5:
+    ULONGLONG IntT5;    //  $6:
+    ULONGLONG IntT6;    //  $7:
+    ULONGLONG IntT7;    //  $8:
+    ULONGLONG IntS0;    //  $9: nonvolatile registers, s0 - s5
+    ULONGLONG IntS1;    // $10:
+    ULONGLONG IntS2;    // $11:
+    ULONGLONG IntS3;    // $12:
+    ULONGLONG IntS4;    // $13:
+    ULONGLONG IntS5;    // $14:
+    ULONGLONG IntFp;    // $15: frame pointer register, fp/s6
+    ULONGLONG IntA0;    // $16: argument registers, a0 - a5
+    ULONGLONG IntA1;    // $17:
+    ULONGLONG IntA2;    // $18:
+    ULONGLONG IntA3;    // $19:
+    ULONGLONG IntA4;    // $20:
+    ULONGLONG IntA5;    // $21:
+    ULONGLONG IntT8;    // $22: temporary registers, t8 - t11
+    ULONGLONG IntT9;    // $23:
+    ULONGLONG IntT10;   // $24:
+    ULONGLONG IntT11;   // $25:
+    ULONGLONG IntRa;    // $26: return address register, ra
+    ULONGLONG IntT12;   // $27: temporary register, t12
+    ULONGLONG IntAt;    // $28: assembler temp register, at
+    ULONGLONG IntGp;    // $29: global pointer register, gp
+    ULONGLONG IntSp;    // $30: stack pointer register, sp
+    ULONGLONG IntZero;  // $31: zero register, zero
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_FLOATING_POINT.
+    //
+
+    ULONGLONG Fpcr;     // floating point control register
+    ULONGLONG SoftFpcr; // software extension to FPCR
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_CONTROL.
+    //
+    // N.B. The registers gp, sp, and ra are defined in the integer section,
+    //   but are considered part of the control context rather than part of
+    //   the integer context.
+    //
+
+    ULONGLONG Fir;      // (fault instruction) continuation address
+    DWORD Psr;          // processor status
+
+    //
+    // The flags values within this flag control the contents of
+    // a CONTEXT record.
+    //
+    // If the context record is used as an input parameter, then
+    // for each portion of the context record controlled by a flag
+    // whose value is set, it is assumed that that portion of the
+    // context record contains valid context. If the context record
+    // is being used to modify a thread's context, then only that
+    // portion of the threads context will be modified.
+    //
+    // If the context record is used as an IN OUT parameter to capture
+    // the context of a thread, then only those portions of the thread's
+    // context corresponding to set flags will be returned.
+    //
+    // The context record is never used as an OUT only parameter.
+    //
+
+    DWORD ContextFlags;
+    DWORD Fill[4];      // padding for 16-byte stack frame alignment
+
+} CONTEXT, *PCONTEXT;
+
+#else
+
+#error _PORTABLE_32BIT_CONTEXT no longer supported on Alpha.
+
+#endif // _PORTABLE_32BIT_CONTEXT
+
+// end_ntddk end_nthal
+
+#endif // _ALPHA_
+
+
+#ifdef _ALPHA_
+
+VOID
+__jump_unwind (
+    PVOID VirtualFramePointer,
+    PVOID TargetPc
+    );
+
+#endif // _ALPHA_
+
+
+#ifdef _X86_
+
+//
+// Disable these two pragmas that evaluate to "sti" "cli" on x86 so that driver
+// writers to not leave them inadvertantly in their code.
+//
+
+#if !defined(MIDL_PASS)
+#if !defined(RC_INVOKED)
+
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4164)   // disable C4164 warning so that apps that
+                                // build with /Od don't get weird errors !
+#ifdef _M_IX86
+#pragma function(_enable)
+#pragma function(_disable)
+#endif
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4164)   // reenable C4164 warning
+#endif
+
+#endif
+#endif
+
+
+#if !defined(MIDL_PASS) || defined(_M_IX86)
+
+#if (_MSC_FULL_VER >= 13012035)
+
+//
+// Define bit scan intrinsics.
+//
+
+//#define BitScanForward _BitScanForward
+//#define BitScanReverse _BitScanReverse
+
+//BOOLEAN
+//_BitScanForward (
+//    OUT DWORD *Index,
+//    IN DWORD Mask
+//    );
+
+//BOOLEAN
+//_BitScanReverse (
+//    OUT DWORD *Index,
+//    IN DWORD Mask
+//    );
+
+
+//#pragma intrinsic(_BitScanForward)
+//#pragma intrinsic(_BitScanReverse)
+
+//
+// Define FS referencing intrinsics
+//
+
+BYTE 
+__readfsbyte (
+    IN DWORD Offset
+    );
+ 
+WORD  
+__readfsword (
+    IN DWORD Offset
+    );
+ 
+DWORD
+__readfsdword (
+    IN DWORD Offset
+    );
+ 
+VOID
+__writefsbyte (
+    IN DWORD Offset,
+    IN BYTE  Data
+    );
+ 
+VOID
+__writefsword (
+    IN DWORD Offset,
+    IN WORD   Data
+    );
+ 
+VOID
+__writefsdword (
+    IN DWORD Offset,
+    IN DWORD Data
+    );
+ 
+#pragma intrinsic(__readfsbyte)
+#pragma intrinsic(__readfsword)
+#pragma intrinsic(__readfsdword)
+#pragma intrinsic(__writefsbyte)
+#pragma intrinsic(__writefsword)
+#pragma intrinsic(__writefsdword)
+
+#endif
+
+#endif
+
+
+#if !defined(MIDL_PASS) && defined(_M_IX86)
+
+#if (_MSC_FULL_VER >= 13012035)
+
+_inline PVOID GetFiberData( void )    { return *(PVOID *) (ULONG_PTR) __readfsdword (0x10);}
+_inline PVOID GetCurrentFiber( void ) { return (PVOID) (ULONG_PTR) __readfsdword (0x10);}
+
+#else
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning (disable:4035)        // disable 4035 (function must return something)
+_inline PVOID GetFiberData( void ) { __asm {
+                                        mov eax, fs:[0x10]
+                                        mov eax,[eax]
+                                        }
+                                     }
+_inline PVOID GetCurrentFiber( void ) { __asm mov eax, fs:[0x10] }
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning (default:4035)        // Reenable it
+#endif
+#endif
+#endif
+
+// begin_ntddk begin_wx86
+
+//
+//  Define the size of the 80387 save area, which is in the context frame.
+//
+
+#define SIZE_OF_80387_REGISTERS      80
+
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_i386    0x00010000    // this assumes that i386 and
+#define CONTEXT_i486    0x00010000    // i486 have identical context records
+
+// end_wx86
+
+#define CONTEXT_CONTROL         (CONTEXT_i386 | 0x00000001L) // SS:SP, CS:IP, FLAGS, BP
+#define CONTEXT_INTEGER         (CONTEXT_i386 | 0x00000002L) // AX, BX, CX, DX, SI, DI
+#define CONTEXT_SEGMENTS        (CONTEXT_i386 | 0x00000004L) // DS, ES, FS, GS
+#define CONTEXT_FLOATING_POINT  (CONTEXT_i386 | 0x00000008L) // 387 state
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x00000010L) // DB 0-3,6,7
+#define CONTEXT_EXTENDED_REGISTERS  (CONTEXT_i386 | 0x00000020L) // cpu specific extensions
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER |\
+                      CONTEXT_SEGMENTS)
+
+#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS)
+
+// begin_wx86
+
+#endif
+
+#define MAXIMUM_SUPPORTED_EXTENSION     512
+
+typedef struct _FLOATING_SAVE_AREA {
+    DWORD   ControlWord;
+    DWORD   StatusWord;
+    DWORD   TagWord;
+    DWORD   ErrorOffset;
+    DWORD   ErrorSelector;
+    DWORD   DataOffset;
+    DWORD   DataSelector;
+    BYTE    RegisterArea[SIZE_OF_80387_REGISTERS];
+    DWORD   Cr0NpxState;
+} FLOATING_SAVE_AREA;
+
+typedef FLOATING_SAVE_AREA *PFLOATING_SAVE_AREA;
+
+//
+// Context Frame
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) is is used to constuct a call frame for APC delivery,
+//  and 3) it is used in the user level thread creation routines.
+//
+//  The layout of the record conforms to a standard call frame.
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // The flags values within this flag control the contents of
+    // a CONTEXT record.
+    //
+    // If the context record is used as an input parameter, then
+    // for each portion of the context record controlled by a flag
+    // whose value is set, it is assumed that that portion of the
+    // context record contains valid context. If the context record
+    // is being used to modify a threads context, then only that
+    // portion of the threads context will be modified.
+    //
+    // If the context record is used as an IN OUT parameter to capture
+    // the context of a thread, then only those portions of the thread's
+    // context corresponding to set flags will be returned.
+    //
+    // The context record is never used as an OUT only parameter.
+    //
+
+    DWORD ContextFlags;
+
+    //
+    // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is
+    // set in ContextFlags.  Note that CONTEXT_DEBUG_REGISTERS is NOT
+    // included in CONTEXT_FULL.
+    //
+
+    DWORD   Dr0;
+    DWORD   Dr1;
+    DWORD   Dr2;
+    DWORD   Dr3;
+    DWORD   Dr6;
+    DWORD   Dr7;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contians the flag CONTEXT_FLOATING_POINT.
+    //
+
+    FLOATING_SAVE_AREA FloatSave;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contians the flag CONTEXT_SEGMENTS.
+    //
+
+    DWORD   SegGs;
+    DWORD   SegFs;
+    DWORD   SegEs;
+    DWORD   SegDs;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contians the flag CONTEXT_INTEGER.
+    //
+
+    DWORD   Edi;
+    DWORD   Esi;
+    DWORD   Ebx;
+    DWORD   Edx;
+    DWORD   Ecx;
+    DWORD   Eax;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contians the flag CONTEXT_CONTROL.
+    //
+
+    DWORD   Ebp;
+    DWORD   Eip;
+    DWORD   SegCs;              // MUST BE SANITIZED
+    DWORD   EFlags;             // MUST BE SANITIZED
+    DWORD   Esp;
+    DWORD   SegSs;
+
+    //
+    // This section is specified/returned if the ContextFlags word
+    // contains the flag CONTEXT_EXTENDED_REGISTERS.
+    // The format and contexts are processor specific
+    //
+
+    BYTE    ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
+
+} CONTEXT;
+
+
+
+typedef CONTEXT *PCONTEXT;
+
+// begin_ntminiport
+
+#endif //_X86_
+
+
+#ifndef _LDT_ENTRY_DEFINED
+#define _LDT_ENTRY_DEFINED
+
+typedef struct _LDT_ENTRY {
+    WORD    LimitLow;
+    WORD    BaseLow;
+    union {
+        struct {
+            BYTE    BaseMid;
+            BYTE    Flags1;     // Declare as bytes to avoid alignment
+            BYTE    Flags2;     // Problems.
+            BYTE    BaseHi;
+        } Bytes;
+        struct {
+            DWORD   BaseMid : 8;
+            DWORD   Type : 5;
+            DWORD   Dpl : 2;
+            DWORD   Pres : 1;
+            DWORD   LimitHi : 4;
+            DWORD   Sys : 1;
+            DWORD   Reserved_0 : 1;
+            DWORD   Default_Big : 1;
+            DWORD   Granularity : 1;
+            DWORD   BaseHi : 8;
+        } Bits;
+    } HighWord;
+} LDT_ENTRY, *PLDT_ENTRY;
+
+#endif
+
+
+#if defined(_MIPS_)
+
+//
+// Define functions to get the address of the current fiber and the
+// current fiber data.
+//
+
+#define GetCurrentFiber() ((*(PNT_TIB *)0x7ffff4a8)->FiberData)
+#define GetFiberData() (*(PVOID *)(GetCurrentFiber()))
+
+// begin_ntddk begin_nthal
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_R4000   0x00010000    // r4000 context
+
+#define CONTEXT_CONTROL          (CONTEXT_R4000 | 0x00000001)
+#define CONTEXT_FLOATING_POINT   (CONTEXT_R4000 | 0x00000002)
+#define CONTEXT_INTEGER          (CONTEXT_R4000 | 0x00000004)
+#define CONTEXT_EXTENDED_FLOAT   (CONTEXT_FLOATING_POINT | 0x00000008)
+#define CONTEXT_EXTENDED_INTEGER (CONTEXT_INTEGER | 0x00000010)
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | \
+                      CONTEXT_INTEGER | CONTEXT_EXTENDED_INTEGER)
+
+#endif
+
+//
+// Context Frame
+//
+//  N.B. This frame must be exactly a multiple of 16 bytes in length.
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) it is used to constuct a call frame for APC delivery,
+//  3) it is used to construct a call frame for exception dispatching
+//  in user mode, and 4) it is used in the user level thread creation
+//  routines.
+//
+//  The layout of the record conforms to a standard call frame.
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // This section is always present and is used as an argument build
+    // area.
+    //
+    // N.B. Context records are 0 mod 8 aligned starting with NT 4.0.
+    //
+
+    union {
+        DWORD Argument[4];
+        ULONGLONG Alignment;
+    };
+
+    //
+    // The following union defines the 32-bit and 64-bit register context.
+    //
+
+    union {
+
+        //
+        // 32-bit context.
+        //
+
+        struct {
+
+            //
+            // This section is specified/returned if the ContextFlags contains
+            // the flag CONTEXT_FLOATING_POINT.
+            //
+            // N.B. This section contains the 16 double floating registers f0,
+            //      f2, ..., f30.
+            //
+
+            DWORD FltF0;
+            DWORD FltF1;
+            DWORD FltF2;
+            DWORD FltF3;
+            DWORD FltF4;
+            DWORD FltF5;
+            DWORD FltF6;
+            DWORD FltF7;
+            DWORD FltF8;
+            DWORD FltF9;
+            DWORD FltF10;
+            DWORD FltF11;
+            DWORD FltF12;
+            DWORD FltF13;
+            DWORD FltF14;
+            DWORD FltF15;
+            DWORD FltF16;
+            DWORD FltF17;
+            DWORD FltF18;
+            DWORD FltF19;
+            DWORD FltF20;
+            DWORD FltF21;
+            DWORD FltF22;
+            DWORD FltF23;
+            DWORD FltF24;
+            DWORD FltF25;
+            DWORD FltF26;
+            DWORD FltF27;
+            DWORD FltF28;
+            DWORD FltF29;
+            DWORD FltF30;
+            DWORD FltF31;
+
+            //
+            // This section is specified/returned if the ContextFlags contains
+            // the flag CONTEXT_INTEGER.
+            //
+            // N.B. The registers gp, sp, and ra are defined in this section,
+            //      but are considered part of the control context rather than
+            //      part of the integer context.
+            //
+            // N.B. Register zero is not stored in the frame.
+            //
+
+            DWORD IntZero;
+            DWORD IntAt;
+            DWORD IntV0;
+            DWORD IntV1;
+            DWORD IntA0;
+            DWORD IntA1;
+            DWORD IntA2;
+            DWORD IntA3;
+            DWORD IntT0;
+            DWORD IntT1;
+            DWORD IntT2;
+            DWORD IntT3;
+            DWORD IntT4;
+            DWORD IntT5;
+            DWORD IntT6;
+            DWORD IntT7;
+            DWORD IntS0;
+            DWORD IntS1;
+            DWORD IntS2;
+            DWORD IntS3;
+            DWORD IntS4;
+            DWORD IntS5;
+            DWORD IntS6;
+            DWORD IntS7;
+            DWORD IntT8;
+            DWORD IntT9;
+            DWORD IntK0;
+            DWORD IntK1;
+            DWORD IntGp;
+            DWORD IntSp;
+            DWORD IntS8;
+            DWORD IntRa;
+            DWORD IntLo;
+            DWORD IntHi;
+
+            //
+            // This section is specified/returned if the ContextFlags word contains
+            // the flag CONTEXT_FLOATING_POINT.
+            //
+
+            DWORD Fsr;
+
+            //
+            // This section is specified/returned if the ContextFlags word contains
+            // the flag CONTEXT_CONTROL.
+            //
+            // N.B. The registers gp, sp, and ra are defined in the integer section,
+            //   but are considered part of the control context rather than part of
+            //   the integer context.
+            //
+
+            DWORD Fir;
+            DWORD Psr;
+
+            //
+            // The flags values within this flag control the contents of
+            // a CONTEXT record.
+            //
+            // If the context record is used as an input parameter, then
+            // for each portion of the context record controlled by a flag
+            // whose value is set, it is assumed that that portion of the
+            // context record contains valid context. If the context record
+            // is being used to modify a thread's context, then only that
+            // portion of the threads context will be modified.
+            //
+            // If the context record is used as an IN OUT parameter to capture
+            // the context of a thread, then only those portions of the thread's
+            // context corresponding to set flags will be returned.
+            //
+            // The context record is never used as an OUT only parameter.
+            //
+
+            DWORD ContextFlags;
+        };
+
+        //
+        // 64-bit context.
+        //
+
+        struct {
+
+            //
+            // This section is specified/returned if the ContextFlags contains
+            // the flag CONTEXT_EXTENDED_FLOAT.
+            //
+            // N.B. This section contains the 32 double floating registers f0,
+            //      f1, ..., f31.
+            //
+
+            ULONGLONG XFltF0;
+            ULONGLONG XFltF1;
+            ULONGLONG XFltF2;
+            ULONGLONG XFltF3;
+            ULONGLONG XFltF4;
+            ULONGLONG XFltF5;
+            ULONGLONG XFltF6;
+            ULONGLONG XFltF7;
+            ULONGLONG XFltF8;
+            ULONGLONG XFltF9;
+            ULONGLONG XFltF10;
+            ULONGLONG XFltF11;
+            ULONGLONG XFltF12;
+            ULONGLONG XFltF13;
+            ULONGLONG XFltF14;
+            ULONGLONG XFltF15;
+            ULONGLONG XFltF16;
+            ULONGLONG XFltF17;
+            ULONGLONG XFltF18;
+            ULONGLONG XFltF19;
+            ULONGLONG XFltF20;
+            ULONGLONG XFltF21;
+            ULONGLONG XFltF22;
+            ULONGLONG XFltF23;
+            ULONGLONG XFltF24;
+            ULONGLONG XFltF25;
+            ULONGLONG XFltF26;
+            ULONGLONG XFltF27;
+            ULONGLONG XFltF28;
+            ULONGLONG XFltF29;
+            ULONGLONG XFltF30;
+            ULONGLONG XFltF31;
+
+            //
+            // The following sections must exactly overlay the 32-bit context.
+            //
+
+            DWORD Fill1;
+            DWORD Fill2;
+
+            //
+            // This section is specified/returned if the ContextFlags contains
+            // the flag CONTEXT_FLOATING_POINT.
+            //
+
+            DWORD XFsr;
+
+            //
+            // This section is specified/returned if the ContextFlags contains
+            // the flag CONTEXT_CONTROL.
+            //
+            // N.B. The registers gp, sp, and ra are defined in the integer
+            //      section, but are considered part of the control context
+            //      rather than part of the integer context.
+            //
+
+            DWORD XFir;
+            DWORD XPsr;
+
+            //
+            // The flags values within this flag control the contents of
+            // a CONTEXT record.
+            //
+            // If the context record is used as an input parameter, then
+            // for each portion of the context record controlled by a flag
+            // whose value is set, it is assumed that that portion of the
+            // context record contains valid context. If the context record
+            // is being used to modify a thread's context, then only that
+            // portion of the threads context will be modified.
+            //
+            // If the context record is used as an IN OUT parameter to capture
+            // the context of a thread, then only those portions of the thread's
+            // context corresponding to set flags will be returned.
+            //
+            // The context record is never used as an OUT only parameter.
+            //
+
+            DWORD XContextFlags;
+
+            //
+            // This section is specified/returned if the ContextFlags contains
+            // the flag CONTEXT_EXTENDED_INTEGER.
+            //
+            // N.B. The registers gp, sp, and ra are defined in this section,
+            //      but are considered part of the control context rather than
+            //      part of the integer  context.
+            //
+            // N.B. Register zero is not stored in the frame.
+            //
+
+            ULONGLONG XIntZero;
+            ULONGLONG XIntAt;
+            ULONGLONG XIntV0;
+            ULONGLONG XIntV1;
+            ULONGLONG XIntA0;
+            ULONGLONG XIntA1;
+            ULONGLONG XIntA2;
+            ULONGLONG XIntA3;
+            ULONGLONG XIntT0;
+            ULONGLONG XIntT1;
+            ULONGLONG XIntT2;
+            ULONGLONG XIntT3;
+            ULONGLONG XIntT4;
+            ULONGLONG XIntT5;
+            ULONGLONG XIntT6;
+            ULONGLONG XIntT7;
+            ULONGLONG XIntS0;
+            ULONGLONG XIntS1;
+            ULONGLONG XIntS2;
+            ULONGLONG XIntS3;
+            ULONGLONG XIntS4;
+            ULONGLONG XIntS5;
+            ULONGLONG XIntS6;
+            ULONGLONG XIntS7;
+            ULONGLONG XIntT8;
+            ULONGLONG XIntT9;
+            ULONGLONG XIntK0;
+            ULONGLONG XIntK1;
+            ULONGLONG XIntGp;
+            ULONGLONG XIntSp;
+            ULONGLONG XIntS8;
+            ULONGLONG XIntRa;
+            ULONGLONG XIntLo;
+            ULONGLONG XIntHi;
+        };
+    };
+} CONTEXT, *PCONTEXT;
+
+// end_ntddk end_nthal
+
+#define CONTEXT32_LENGTH 0x130          // The original 32-bit Context length (pre NT 4.0)
+
+#endif // MIPS
+
+
+#if defined(_MIPS_)
+
+VOID
+__jump_unwind (
+    PVOID Fp,
+    PVOID TargetPc
+    );
+
+#endif // MIPS
+
+
+#if defined(_PPC_)
+
+
+//
+// The address of the TEB is placed into GPR 13 at context switch time
+// and should never be destroyed.  To get the address of the TEB use
+// the compiler intrinsic to access it directly from GPR 13.
+//
+
+#if defined(_M_PPC) && defined(_MSC_VER) && (_MSC_VER>=1000)
+unsigned __gregister_get( unsigned const regnum );
+#define NtCurrentTeb() ((struct _TEB *)__gregister_get(13))
+#elif defined(_M_PPC)
+struct _TEB * __builtin_get_gpr13(VOID);
+#define NtCurrentTeb() ((struct _TEB *)__builtin_get_gpr13())
+#endif
+
+
+//
+// Define functions to get the address of the current fiber and the
+// current fiber data.
+//
+
+#define GetCurrentFiber() (((PNT_TIB)NtCurrentTeb())->FiberData)
+#define GetFiberData() (*(PVOID *)(GetCurrentFiber()))
+
+// begin_ntddk begin_nthal
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_CONTROL         0x00000001L
+#define CONTEXT_FLOATING_POINT  0x00000002L
+#define CONTEXT_INTEGER         0x00000004L
+#define CONTEXT_DEBUG_REGISTERS 0x00000008L
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
+
+#endif
+
+//
+// Context Frame
+//
+//  N.B. This frame must be exactly a multiple of 16 bytes in length.
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) it is used to constuct a call frame for APC delivery,
+//  3) it is used to construct a call frame for exception dispatching
+//  in user mode, and 4) it is used in the user level thread creation
+//  routines.
+//
+//  Requires at least 8-byte alignment (double)
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_FLOATING_POINT.
+    //
+
+    double Fpr0;                        // Floating registers 0..31
+    double Fpr1;
+    double Fpr2;
+    double Fpr3;
+    double Fpr4;
+    double Fpr5;
+    double Fpr6;
+    double Fpr7;
+    double Fpr8;
+    double Fpr9;
+    double Fpr10;
+    double Fpr11;
+    double Fpr12;
+    double Fpr13;
+    double Fpr14;
+    double Fpr15;
+    double Fpr16;
+    double Fpr17;
+    double Fpr18;
+    double Fpr19;
+    double Fpr20;
+    double Fpr21;
+    double Fpr22;
+    double Fpr23;
+    double Fpr24;
+    double Fpr25;
+    double Fpr26;
+    double Fpr27;
+    double Fpr28;
+    double Fpr29;
+    double Fpr30;
+    double Fpr31;
+    double Fpscr;                       // Floating point status/control reg
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_INTEGER.
+    //
+
+    DWORD Gpr0;                         // General registers 0..31
+    DWORD Gpr1;
+    DWORD Gpr2;
+    DWORD Gpr3;
+    DWORD Gpr4;
+    DWORD Gpr5;
+    DWORD Gpr6;
+    DWORD Gpr7;
+    DWORD Gpr8;
+    DWORD Gpr9;
+    DWORD Gpr10;
+    DWORD Gpr11;
+    DWORD Gpr12;
+    DWORD Gpr13;
+    DWORD Gpr14;
+    DWORD Gpr15;
+    DWORD Gpr16;
+    DWORD Gpr17;
+    DWORD Gpr18;
+    DWORD Gpr19;
+    DWORD Gpr20;
+    DWORD Gpr21;
+    DWORD Gpr22;
+    DWORD Gpr23;
+    DWORD Gpr24;
+    DWORD Gpr25;
+    DWORD Gpr26;
+    DWORD Gpr27;
+    DWORD Gpr28;
+    DWORD Gpr29;
+    DWORD Gpr30;
+    DWORD Gpr31;
+
+    DWORD Cr;                           // Condition register
+    DWORD Xer;                          // Fixed point exception register
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_CONTROL.
+    //
+
+    DWORD Msr;                          // Machine status register
+    DWORD Iar;                          // Instruction address register
+    DWORD Lr;                           // Link register
+    DWORD Ctr;                          // Count register
+
+    //
+    // The flags values within this flag control the contents of
+    // a CONTEXT record.
+    //
+    // If the context record is used as an input parameter, then
+    // for each portion of the context record controlled by a flag
+    // whose value is set, it is assumed that that portion of the
+    // context record contains valid context. If the context record
+    // is being used to modify a thread's context, then only that
+    // portion of the threads context will be modified.
+    //
+    // If the context record is used as an IN OUT parameter to capture
+    // the context of a thread, then only those portions of the thread's
+    // context corresponding to set flags will be returned.
+    //
+    // The context record is never used as an OUT only parameter.
+    //
+
+    DWORD ContextFlags;
+
+    DWORD Fill[3];                      // Pad out to multiple of 16 bytes
+
+    //
+    // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is
+    // set in ContextFlags.  Note that CONTEXT_DEBUG_REGISTERS is NOT
+    // included in CONTEXT_FULL.
+    //
+    DWORD Dr0;                          // Breakpoint Register 1
+    DWORD Dr1;                          // Breakpoint Register 2
+    DWORD Dr2;                          // Breakpoint Register 3
+    DWORD Dr3;                          // Breakpoint Register 4
+    DWORD Dr4;                          // Breakpoint Register 5
+    DWORD Dr5;                          // Breakpoint Register 6
+    DWORD Dr6;                          // Debug Status Register
+    DWORD Dr7;                          // Debug Control Register
+
+} CONTEXT, *PCONTEXT;
+
+// end_ntddk end_nthal
+
+
+//
+// Stack frame header
+//
+//   Order of appearance in stack frame:
+//      Header (six words)
+//      Parameters (at least eight words)
+//      Local variables
+//      Saved GPRs
+//      Saved FPRs
+//
+//   Minimum alignment is 8 bytes
+
+typedef struct _STACK_FRAME_HEADER {    // GPR 1 points here
+    DWORD BackChain;                    // Addr of previous frame
+    DWORD GlueSaved1;                   // Used by glue code
+    DWORD GlueSaved2;
+    DWORD Reserved1;                    // Reserved
+    DWORD Spare1;                       // Used by tracing, profiling, ...
+    DWORD Spare2;
+
+    DWORD Parameter0;                   // First 8 parameter words are
+    DWORD Parameter1;                   //   always present
+    DWORD Parameter2;
+    DWORD Parameter3;
+    DWORD Parameter4;
+    DWORD Parameter5;
+    DWORD Parameter6;
+    DWORD Parameter7;
+
+} STACK_FRAME_HEADER,*PSTACK_FRAME_HEADER;
+
+
+VOID
+__jump_unwind (
+    PVOID Fp,
+    PVOID TargetPc
+    );
+
+#endif // defined(_PPC_)
+
+#if defined(_MPPC_)
+
+
+//
+// The address of the TEB is placed into GPR 13 at context switch time
+// and should never be destroyed.  To get the address of the TEB use
+// the compiler intrinsic to access it directly from GPR 13.
+//
+
+#if defined(_M_PPC) && defined(_MSC_VER) && (_MSC_VER>=1000)
+unsigned __gregister_get( unsigned const regnum );
+#define NtCurrentTeb() ((struct _TEB *)__gregister_get(13))
+#elif defined(_M_PPC)
+struct _TEB * __builtin_get_gpr13(VOID);
+#define NtCurrentTeb() ((struct _TEB *)__builtin_get_gpr13())
+#endif
+
+
+//
+// Define functions to get the address of the current fiber and the
+// current fiber data.
+//
+
+#define GetCurrentFiber() (((PNT_TIB)NtCurrentTeb())->FiberData)
+#define GetFiberData() (*(PVOID *)(GetCurrentFiber()))
+
+// begin_ntddk begin_nthal
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_CONTROL         0x00000001L
+#define CONTEXT_FLOATING_POINT  0x00000002L
+#define CONTEXT_INTEGER         0x00000004L
+#define CONTEXT_DEBUG_REGISTERS 0x00000008L
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
+
+#endif
+
+//
+// Context Frame
+//
+//  N.B. This frame must be exactly a multiple of 16 bytes in length.
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) it is used to constuct a call frame for APC delivery,
+//  3) it is used to construct a call frame for exception dispatching
+//  in user mode, and 4) it is used in the user level thread creation
+//  routines.
+//
+//  Requires at least 8-byte alignment (double)
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_FLOATING_POINT.
+    //
+
+    double Fpr0;                        // Floating registers 0..31
+    double Fpr1;
+    double Fpr2;
+    double Fpr3;
+    double Fpr4;
+    double Fpr5;
+    double Fpr6;
+    double Fpr7;
+    double Fpr8;
+    double Fpr9;
+    double Fpr10;
+    double Fpr11;
+    double Fpr12;
+    double Fpr13;
+    double Fpr14;
+    double Fpr15;
+    double Fpr16;
+    double Fpr17;
+    double Fpr18;
+    double Fpr19;
+    double Fpr20;
+    double Fpr21;
+    double Fpr22;
+    double Fpr23;
+    double Fpr24;
+    double Fpr25;
+    double Fpr26;
+    double Fpr27;
+    double Fpr28;
+    double Fpr29;
+    double Fpr30;
+    double Fpr31;
+    double Fpscr;                       // Floating point status/control reg
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_INTEGER.
+    //
+
+    DWORD Gpr0;                         // General registers 0..31
+    DWORD Gpr1;
+    DWORD Gpr2;
+    DWORD Gpr3;
+    DWORD Gpr4;
+    DWORD Gpr5;
+    DWORD Gpr6;
+    DWORD Gpr7;
+    DWORD Gpr8;
+    DWORD Gpr9;
+    DWORD Gpr10;
+    DWORD Gpr11;
+    DWORD Gpr12;
+    DWORD Gpr13;
+    DWORD Gpr14;
+    DWORD Gpr15;
+    DWORD Gpr16;
+    DWORD Gpr17;
+    DWORD Gpr18;
+    DWORD Gpr19;
+    DWORD Gpr20;
+    DWORD Gpr21;
+    DWORD Gpr22;
+    DWORD Gpr23;
+    DWORD Gpr24;
+    DWORD Gpr25;
+    DWORD Gpr26;
+    DWORD Gpr27;
+    DWORD Gpr28;
+    DWORD Gpr29;
+    DWORD Gpr30;
+    DWORD Gpr31;
+
+    DWORD Cr;                           // Condition register
+    DWORD Xer;                          // Fixed point exception register
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_CONTROL.
+    //
+
+    DWORD Msr;                          // Machine status register
+    DWORD Iar;                          // Instruction address register
+    DWORD Lr;                           // Link register
+    DWORD Ctr;                          // Count register
+
+    //
+    // The flags values within this flag control the contents of
+    // a CONTEXT record.
+    //
+    // If the context record is used as an input parameter, then
+    // for each portion of the context record controlled by a flag
+    // whose value is set, it is assumed that that portion of the
+    // context record contains valid context. If the context record
+    // is being used to modify a thread's context, then only that
+    // portion of the threads context will be modified.
+    //
+    // If the context record is used as an IN OUT parameter to capture
+    // the context of a thread, then only those portions of the thread's
+    // context corresponding to set flags will be returned.
+    //
+    // The context record is never used as an OUT only parameter.
+    //
+
+    DWORD ContextFlags;
+
+    DWORD Fill[3];                      // Pad out to multiple of 16 bytes
+
+    //
+    // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is
+    // set in ContextFlags.  Note that CONTEXT_DEBUG_REGISTERS is NOT
+    // included in CONTEXT_FULL.
+    //
+    DWORD Dr0;                          // Breakpoint Register 1
+    DWORD Dr1;                          // Breakpoint Register 2
+    DWORD Dr2;                          // Breakpoint Register 3
+    DWORD Dr3;                          // Breakpoint Register 4
+    DWORD Dr4;                          // Breakpoint Register 5
+    DWORD Dr5;                          // Breakpoint Register 6
+    DWORD Dr6;                          // Debug Status Register
+    DWORD Dr7;                          // Debug Control Register
+
+} CONTEXT, *PCONTEXT;
+
+// end_ntddk end_nthal
+
+
+//
+// Stack frame header
+//
+//   Order of appearance in stack frame:
+//      Header (six words)
+//      Parameters (at least eight words)
+//      Local variables
+//      Saved GPRs
+//      Saved FPRs
+//
+//   Minimum alignment is 8 bytes
+
+typedef struct _STACK_FRAME_HEADER {    // GPR 1 points here
+    DWORD BackChain;                    // Addr of previous frame
+    DWORD GlueSaved1;                   // Used by glue code
+    DWORD GlueSaved2;
+    DWORD Reserved1;                    // Reserved
+    DWORD Spare1;                       // Used by tracing, profiling, ...
+    DWORD Spare2;
+
+    DWORD Parameter0;                   // First 8 parameter words are
+    DWORD Parameter1;                   //   always present
+    DWORD Parameter2;
+    DWORD Parameter3;
+    DWORD Parameter4;
+    DWORD Parameter5;
+    DWORD Parameter6;
+    DWORD Parameter7;
+
+} STACK_FRAME_HEADER,*PSTACK_FRAME_HEADER;
+
+
+VOID
+__jump_unwind (
+    PVOID Fp,
+    PVOID TargetPc
+    );
+
+#endif // defined(_MPPC_)
+
+#if !defined(__midl) && !defined(GENUTIL) && !defined(_GENIA64_) && defined(_IA64_)
+
+void * _cdecl _rdteb(void);
+#if defined(_M_IA64)                    // winnt
+#pragma intrinsic(_rdteb)               // winnt
+#endif                                  // winnt
+
+
+#if defined(_M_IA64)
+#define NtCurrentTeb()      ((struct _TEB *)_rdteb())
+#else
+struct _TEB *
+NtCurrentTeb(void);
+#endif
+
+//
+// Define functions to get the address of the current fiber and the
+// current fiber data.
+//
+
+#define GetCurrentFiber() (((PNT_TIB)NtCurrentTeb())->FiberData)
+#define GetFiberData() (*(PVOID *)(GetCurrentFiber()))
+
+#endif  // !defined(__midl) && !defined(GENUTIL) && !defined(_GENIA64_) && defined(_M_IA64)
+
+#ifdef _IA64_
+
+// begin_ntddk begin_nthal
+
+//
+// The following flags control the contents of the CONTEXT structure.
+//
+
+#if !defined(RC_INVOKED)
+
+#define CONTEXT_IA64                    0x00080000
+
+#define CONTEXT_CONTROL                 (CONTEXT_IA64 | 0x00000001L)
+#define CONTEXT_LOWER_FLOATING_POINT    (CONTEXT_IA64 | 0x00000002L)
+#define CONTEXT_HIGHER_FLOATING_POINT   (CONTEXT_IA64 | 0x00000004L)
+#define CONTEXT_INTEGER                 (CONTEXT_IA64 | 0x00000008L)
+#define CONTEXT_DEBUG                   (CONTEXT_IA64 | 0x00000010L)
+#define CONTEXT_IA32_CONTROL            (CONTEXT_IA64 | 0x00000020L)  // Includes StIPSR
+
+
+#define CONTEXT_FLOATING_POINT          (CONTEXT_LOWER_FLOATING_POINT | CONTEXT_HIGHER_FLOATING_POINT)
+#define CONTEXT_FULL                    (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER | CONTEXT_IA32_CONTROL)
+#define CONTEXT_ALL                     (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER | CONTEXT_DEBUG | CONTEXT_IA32_CONTROL)
+
+#endif // !defined(RC_INVOKED)
+
+//
+// Context Frame
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) it is used to construct a call frame for APC delivery,
+//  3) it is used to construct a call frame for exception dispatching
+//  in user mode, 4) it is used in the user level thread creation
+//  routines, and 5) it is used to to pass thread state to debuggers.
+//
+//  N.B. Because this record is used as a call frame, it must be EXACTLY
+//  a multiple of 16 bytes in length and aligned on a 16-byte boundary.
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // The flags values within this flag control the contents of
+    // a CONTEXT record.
+    //
+    // If the context record is used as an input parameter, then
+    // for each portion of the context record controlled by a flag
+    // whose value is set, it is assumed that that portion of the
+    // context record contains valid context. If the context record
+    // is being used to modify a thread's context, then only that
+    // portion of the threads context will be modified.
+    //
+    // If the context record is used as an IN OUT parameter to capture
+    // the context of a thread, then only those portions of the thread's
+    // context corresponding to set flags will be returned.
+    //
+    // The context record is never used as an OUT only parameter.
+    //
+
+    DWORD ContextFlags;
+    DWORD Fill1[3];         // for alignment of following on 16-byte boundary
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_DEBUG.
+    //
+    // N.B. CONTEXT_DEBUG is *not* part of CONTEXT_FULL.
+    //
+
+    ULONGLONG DbI0;
+    ULONGLONG DbI1;
+    ULONGLONG DbI2;
+    ULONGLONG DbI3;
+    ULONGLONG DbI4;
+    ULONGLONG DbI5;
+    ULONGLONG DbI6;
+    ULONGLONG DbI7;
+
+    ULONGLONG DbD0;
+    ULONGLONG DbD1;
+    ULONGLONG DbD2;
+    ULONGLONG DbD3;
+    ULONGLONG DbD4;
+    ULONGLONG DbD5;
+    ULONGLONG DbD6;
+    ULONGLONG DbD7;
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_LOWER_FLOATING_POINT.
+    //
+
+    FLOAT128 FltS0;
+    FLOAT128 FltS1;
+    FLOAT128 FltS2;
+    FLOAT128 FltS3;
+    FLOAT128 FltT0;
+    FLOAT128 FltT1;
+    FLOAT128 FltT2;
+    FLOAT128 FltT3;
+    FLOAT128 FltT4;
+    FLOAT128 FltT5;
+    FLOAT128 FltT6;
+    FLOAT128 FltT7;
+    FLOAT128 FltT8;
+    FLOAT128 FltT9;
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_HIGHER_FLOATING_POINT.
+    //
+
+    FLOAT128 FltS4;
+    FLOAT128 FltS5;
+    FLOAT128 FltS6;
+    FLOAT128 FltS7;
+    FLOAT128 FltS8;
+    FLOAT128 FltS9;
+    FLOAT128 FltS10;
+    FLOAT128 FltS11;
+    FLOAT128 FltS12;
+    FLOAT128 FltS13;
+    FLOAT128 FltS14;
+    FLOAT128 FltS15;
+    FLOAT128 FltS16;
+    FLOAT128 FltS17;
+    FLOAT128 FltS18;
+    FLOAT128 FltS19;
+
+    FLOAT128 FltF32;
+    FLOAT128 FltF33;
+    FLOAT128 FltF34;
+    FLOAT128 FltF35;
+    FLOAT128 FltF36;
+    FLOAT128 FltF37;
+    FLOAT128 FltF38;
+    FLOAT128 FltF39;
+
+    FLOAT128 FltF40;
+    FLOAT128 FltF41;
+    FLOAT128 FltF42;
+    FLOAT128 FltF43;
+    FLOAT128 FltF44;
+    FLOAT128 FltF45;
+    FLOAT128 FltF46;
+    FLOAT128 FltF47;
+    FLOAT128 FltF48;
+    FLOAT128 FltF49;
+
+    FLOAT128 FltF50;
+    FLOAT128 FltF51;
+    FLOAT128 FltF52;
+    FLOAT128 FltF53;
+    FLOAT128 FltF54;
+    FLOAT128 FltF55;
+    FLOAT128 FltF56;
+    FLOAT128 FltF57;
+    FLOAT128 FltF58;
+    FLOAT128 FltF59;
+
+    FLOAT128 FltF60;
+    FLOAT128 FltF61;
+    FLOAT128 FltF62;
+    FLOAT128 FltF63;
+    FLOAT128 FltF64;
+    FLOAT128 FltF65;
+    FLOAT128 FltF66;
+    FLOAT128 FltF67;
+    FLOAT128 FltF68;
+    FLOAT128 FltF69;
+
+    FLOAT128 FltF70;
+    FLOAT128 FltF71;
+    FLOAT128 FltF72;
+    FLOAT128 FltF73;
+    FLOAT128 FltF74;
+    FLOAT128 FltF75;
+    FLOAT128 FltF76;
+    FLOAT128 FltF77;
+    FLOAT128 FltF78;
+    FLOAT128 FltF79;
+
+    FLOAT128 FltF80;
+    FLOAT128 FltF81;
+    FLOAT128 FltF82;
+    FLOAT128 FltF83;
+    FLOAT128 FltF84;
+    FLOAT128 FltF85;
+    FLOAT128 FltF86;
+    FLOAT128 FltF87;
+    FLOAT128 FltF88;
+    FLOAT128 FltF89;
+
+    FLOAT128 FltF90;
+    FLOAT128 FltF91;
+    FLOAT128 FltF92;
+    FLOAT128 FltF93;
+    FLOAT128 FltF94;
+    FLOAT128 FltF95;
+    FLOAT128 FltF96;
+    FLOAT128 FltF97;
+    FLOAT128 FltF98;
+    FLOAT128 FltF99;
+
+    FLOAT128 FltF100;
+    FLOAT128 FltF101;
+    FLOAT128 FltF102;
+    FLOAT128 FltF103;
+    FLOAT128 FltF104;
+    FLOAT128 FltF105;
+    FLOAT128 FltF106;
+    FLOAT128 FltF107;
+    FLOAT128 FltF108;
+    FLOAT128 FltF109;
+
+    FLOAT128 FltF110;
+    FLOAT128 FltF111;
+    FLOAT128 FltF112;
+    FLOAT128 FltF113;
+    FLOAT128 FltF114;
+    FLOAT128 FltF115;
+    FLOAT128 FltF116;
+    FLOAT128 FltF117;
+    FLOAT128 FltF118;
+    FLOAT128 FltF119;
+
+    FLOAT128 FltF120;
+    FLOAT128 FltF121;
+    FLOAT128 FltF122;
+    FLOAT128 FltF123;
+    FLOAT128 FltF124;
+    FLOAT128 FltF125;
+    FLOAT128 FltF126;
+    FLOAT128 FltF127;
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_LOWER_FLOATING_POINT | CONTEXT_HIGHER_FLOATING_POINT | CONTEXT_CONTROL.
+    //
+
+    ULONGLONG StFPSR;       //  FP status
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_INTEGER.
+    //
+    // N.B. The registers gp, sp, rp are part of the control context
+    //
+
+    ULONGLONG IntGp;        //  r1, volatile
+    ULONGLONG IntT0;        //  r2-r3, volatile
+    ULONGLONG IntT1;        //
+    ULONGLONG IntS0;        //  r4-r7, preserved
+    ULONGLONG IntS1;
+    ULONGLONG IntS2;
+    ULONGLONG IntS3;
+    ULONGLONG IntV0;        //  r8, volatile
+    ULONGLONG IntT2;        //  r9-r11, volatile
+    ULONGLONG IntT3;
+    ULONGLONG IntT4;
+    ULONGLONG IntSp;        //  stack pointer (r12), special
+    ULONGLONG IntTeb;       //  teb (r13), special
+    ULONGLONG IntT5;        //  r14-r31, volatile
+    ULONGLONG IntT6;
+    ULONGLONG IntT7;
+    ULONGLONG IntT8;
+    ULONGLONG IntT9;
+    ULONGLONG IntT10;
+    ULONGLONG IntT11;
+    ULONGLONG IntT12;
+    ULONGLONG IntT13;
+    ULONGLONG IntT14;
+    ULONGLONG IntT15;
+    ULONGLONG IntT16;
+    ULONGLONG IntT17;
+    ULONGLONG IntT18;
+    ULONGLONG IntT19;
+    ULONGLONG IntT20;
+    ULONGLONG IntT21;
+    ULONGLONG IntT22;
+
+    ULONGLONG IntNats;      //  Nat bits for r1-r31
+                            //  r1-r31 in bits 1 thru 31.
+    ULONGLONG Preds;        //  predicates, preserved
+
+    ULONGLONG BrRp;         //  return pointer, b0, preserved
+    ULONGLONG BrS0;         //  b1-b5, preserved
+    ULONGLONG BrS1;
+    ULONGLONG BrS2;
+    ULONGLONG BrS3;
+    ULONGLONG BrS4;
+    ULONGLONG BrT0;         //  b6-b7, volatile
+    ULONGLONG BrT1;
+
+    //
+    // This section is specified/returned if the ContextFlags word contains
+    // the flag CONTEXT_CONTROL.
+    //
+
+    // Other application registers
+    ULONGLONG ApUNAT;       //  User Nat collection register, preserved
+    ULONGLONG ApLC;         //  Loop counter register, preserved
+    ULONGLONG ApEC;         //  Epilog counter register, preserved
+    ULONGLONG ApCCV;        //  CMPXCHG value register, volatile
+    ULONGLONG ApDCR;        //  Default control register (TBD)
+
+    // Register stack info
+    ULONGLONG RsPFS;        //  Previous function state, preserved
+    ULONGLONG RsBSP;        //  Backing store pointer, preserved
+    ULONGLONG RsBSPSTORE;
+    ULONGLONG RsRSC;        //  RSE configuration, volatile
+    ULONGLONG RsRNAT;       //  RSE Nat collection register, preserved
+
+    // Trap Status Information
+    ULONGLONG StIPSR;       //  Interruption Processor Status
+    ULONGLONG StIIP;        //  Interruption IP
+    ULONGLONG StIFS;        //  Interruption Function State
+
+    // iA32 related control registers
+    ULONGLONG StFCR;        //  copy of Ar21
+    ULONGLONG Eflag;        //  Eflag copy of Ar24
+    ULONGLONG SegCSD;       //  iA32 CSDescriptor (Ar25)
+    ULONGLONG SegSSD;       //  iA32 SSDescriptor (Ar26)
+    ULONGLONG Cflag;        //  Cr0+Cr4 copy of Ar27
+    ULONGLONG StFSR;        //  x86 FP status (copy of AR28)
+    ULONGLONG StFIR;        //  x86 FP status (copy of AR29)
+    ULONGLONG StFDR;        //  x86 FP status (copy of AR30)
+
+      ULONGLONG UNUSEDPACK;   //  added to pack StFDR to 16-bytes
+
+} CONTEXT, *PCONTEXT;
+
+// begin_winnt
+
+//
+// Plabel descriptor structure definition
+//
+
+typedef struct _PLABEL_DESCRIPTOR {
+   ULONGLONG EntryPoint;
+   ULONGLONG GlobalPointer;
+} PLABEL_DESCRIPTOR, *PPLABEL_DESCRIPTOR;
+
+
+#endif // _IA64_
+
+
+#ifdef _IA64_
+
+VOID
+__jump_unwind (
+    ULONGLONG TargetMsFrame,
+    ULONGLONG TargetBsFrame,
+    ULONGLONG TargetPc
+    );
+
+#endif // _IA64_
+
+#define EXCEPTION_NONCONTINUABLE 0x1    // Noncontinuable exception
+#define EXCEPTION_MAXIMUM_PARAMETERS 15 // maximum number of exception parameters
+
+//
+// Exception record definition.
+//
+
+typedef struct _EXCEPTION_RECORD {
+    DWORD    ExceptionCode;
+    DWORD ExceptionFlags;
+    struct _EXCEPTION_RECORD *ExceptionRecord;
+    PVOID ExceptionAddress;
+    DWORD NumberParameters;
+    ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+    } EXCEPTION_RECORD;
+
+typedef EXCEPTION_RECORD *PEXCEPTION_RECORD;
+
+typedef struct _EXCEPTION_RECORD32 {
+    DWORD    ExceptionCode;
+    DWORD ExceptionFlags;
+    DWORD ExceptionRecord;
+    DWORD ExceptionAddress;
+    DWORD NumberParameters;
+    DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+} EXCEPTION_RECORD32, *PEXCEPTION_RECORD32;
+
+typedef struct _EXCEPTION_RECORD64 {
+    DWORD    ExceptionCode;
+    DWORD ExceptionFlags;
+    DWORD64 ExceptionRecord;
+    DWORD64 ExceptionAddress;
+    DWORD NumberParameters;
+    DWORD __unusedAlignment;
+    DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+} EXCEPTION_RECORD64, *PEXCEPTION_RECORD64;
+
+//
+// Typedef for pointer returned by exception_info()
+//
+
+typedef struct _EXCEPTION_POINTERS {
+    PEXCEPTION_RECORD ExceptionRecord;
+    PCONTEXT ContextRecord;
+} EXCEPTION_POINTERS, *PEXCEPTION_POINTERS;
+typedef PVOID PACCESS_TOKEN;            
+typedef PVOID PSECURITY_DESCRIPTOR;     
+typedef PVOID PSID;     
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//                             ACCESS MASK                            //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+//
+//  Define the access mask as a longword sized structure divided up as
+//  follows:
+//
+//       3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//       1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//      +---------------+---------------+-------------------------------+
+//      |G|G|G|G|Res'd|A| StandardRights|         SpecificRights        |
+//      |R|W|E|A|     |S|               |                               |
+//      +-+-------------+---------------+-------------------------------+
+//
+//      typedef struct _ACCESS_MASK {
+//          WORD   SpecificRights;
+//          BYTE  StandardRights;
+//          BYTE  AccessSystemAcl : 1;
+//          BYTE  Reserved : 3;
+//          BYTE  GenericAll : 1;
+//          BYTE  GenericExecute : 1;
+//          BYTE  GenericWrite : 1;
+//          BYTE  GenericRead : 1;
+//      } ACCESS_MASK;
+//      typedef ACCESS_MASK *PACCESS_MASK;
+//
+//  but to make life simple for programmer's we'll allow them to specify
+//  a desired access mask by simply OR'ing together mulitple single rights
+//  and treat an access mask as a DWORD.  For example
+//
+//      DesiredAccess = DELETE | READ_CONTROL
+//
+//  So we'll declare ACCESS_MASK as DWORD
+//
+
+// begin_ntddk begin_wdm begin_nthal begin_ntifs
+typedef DWORD ACCESS_MASK;
+typedef ACCESS_MASK *PACCESS_MASK;
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//                             ACCESS TYPES                           //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+
+// begin_ntddk begin_wdm begin_nthal begin_ntifs
+//
+//  The following are masks for the predefined standard access types
+//
+
+#define DELETE                           (0x00010000L)
+#define READ_CONTROL                     (0x00020000L)
+#define WRITE_DAC                        (0x00040000L)
+#define WRITE_OWNER                      (0x00080000L)
+#define SYNCHRONIZE                      (0x00100000L)
+
+#define STANDARD_RIGHTS_REQUIRED         (0x000F0000L)
+
+#define STANDARD_RIGHTS_READ             (READ_CONTROL)
+#define STANDARD_RIGHTS_WRITE            (READ_CONTROL)
+#define STANDARD_RIGHTS_EXECUTE          (READ_CONTROL)
+
+#define STANDARD_RIGHTS_ALL              (0x001F0000L)
+
+#define SPECIFIC_RIGHTS_ALL              (0x0000FFFFL)
+
+//
+// AccessSystemAcl access type
+//
+
+#define ACCESS_SYSTEM_SECURITY           (0x01000000L)
+
+//
+// MaximumAllowed access type
+//
+
+#define MAXIMUM_ALLOWED                  (0x02000000L)
+
+//
+//  These are the generic rights.
+//
+
+#define GENERIC_READ                     (0x80000000L)
+#define GENERIC_WRITE                    (0x40000000L)
+#define GENERIC_EXECUTE                  (0x20000000L)
+#define GENERIC_ALL                      (0x10000000L)
+
+
+//
+//  Define the generic mapping array.  This is used to denote the
+//  mapping of each generic access right to a specific access mask.
+//
+
+typedef struct _GENERIC_MAPPING {
+    ACCESS_MASK GenericRead;
+    ACCESS_MASK GenericWrite;
+    ACCESS_MASK GenericExecute;
+    ACCESS_MASK GenericAll;
+} GENERIC_MAPPING;
+typedef GENERIC_MAPPING *PGENERIC_MAPPING;
+
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//                        LUID_AND_ATTRIBUTES                         //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+//
+//
+
+
+#include <pshpack4.h>
+
+typedef struct _LUID_AND_ATTRIBUTES {
+    LUID Luid;
+    DWORD Attributes;
+    } LUID_AND_ATTRIBUTES, * PLUID_AND_ATTRIBUTES;
+typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
+typedef LUID_AND_ATTRIBUTES_ARRAY *PLUID_AND_ATTRIBUTES_ARRAY;
+
+#include <poppack.h>
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//              Security Id     (SID)                                 //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+//
+//
+// Pictorially the structure of an SID is as follows:
+//
+//         1   1   1   1   1   1
+//         5   4   3   2   1   0   9   8   7   6   5   4   3   2   1   0
+//      +---------------------------------------------------------------+
+//      |      SubAuthorityCount        |Reserved1 (SBZ)|   Revision    |
+//      +---------------------------------------------------------------+
+//      |                   IdentifierAuthority[0]                      |
+//      +---------------------------------------------------------------+
+//      |                   IdentifierAuthority[1]                      |
+//      +---------------------------------------------------------------+
+//      |                   IdentifierAuthority[2]                      |
+//      +---------------------------------------------------------------+
+//      |                                                               |
+//      +- -  -  -  -  -  -  -  SubAuthority[]  -  -  -  -  -  -  -  - -+
+//      |                                                               |
+//      +---------------------------------------------------------------+
+//
+//
+
+
+// begin_ntifs
+
+#ifndef SID_IDENTIFIER_AUTHORITY_DEFINED
+#define SID_IDENTIFIER_AUTHORITY_DEFINED
+typedef struct _SID_IDENTIFIER_AUTHORITY {
+    BYTE  Value[6];
+} SID_IDENTIFIER_AUTHORITY, *PSID_IDENTIFIER_AUTHORITY;
+#endif
+
+
+#ifndef SID_DEFINED
+#define SID_DEFINED
+typedef struct _SID {
+   BYTE  Revision;
+   BYTE  SubAuthorityCount;
+   SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
+#ifdef MIDL_PASS
+   [size_is(SubAuthorityCount)] DWORD SubAuthority[*];
+#else // MIDL_PASS
+   DWORD SubAuthority[ANYSIZE_ARRAY];
+#endif // MIDL_PASS
+} SID, *PISID;
+#endif
+
+#define SID_REVISION                     (1)    // Current revision level
+#define SID_MAX_SUB_AUTHORITIES          (15)
+#define SID_RECOMMENDED_SUB_AUTHORITIES  (1)    // Will change to around 6
+
+                                                // in a future release.
+#ifndef MIDL_PASS
+#define SECURITY_MAX_SID_SIZE  \
+      (sizeof(SID) - sizeof(DWORD) + (SID_MAX_SUB_AUTHORITIES * sizeof(DWORD)))
+#endif // MIDL_PASS
+
+
+typedef enum _SID_NAME_USE {
+    SidTypeUser = 1,
+    SidTypeGroup,
+    SidTypeDomain,
+    SidTypeAlias,
+    SidTypeWellKnownGroup,
+    SidTypeDeletedAccount,
+    SidTypeInvalid,
+    SidTypeUnknown,
+    SidTypeComputer
+} SID_NAME_USE, *PSID_NAME_USE;
+
+typedef struct _SID_AND_ATTRIBUTES {
+    PSID Sid;
+    DWORD Attributes;
+    } SID_AND_ATTRIBUTES, * PSID_AND_ATTRIBUTES;
+
+typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
+typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY;
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+//                                                                         //
+// Universal well-known SIDs                                               //
+//                                                                         //
+//     Null SID                     S-1-0-0                                //
+//     World                        S-1-1-0                                //
+//     Local                        S-1-2-0                                //
+//     Creator Owner ID             S-1-3-0                                //
+//     Creator Group ID             S-1-3-1                                //
+//     Creator Owner Server ID      S-1-3-2                                //
+//     Creator Group Server ID      S-1-3-3                                //
+//                                                                         //
+//     (Non-unique IDs)             S-1-4                                  //
+//                                                                         //
+/////////////////////////////////////////////////////////////////////////////
+
+#define SECURITY_NULL_SID_AUTHORITY         {0,0,0,0,0,0}
+#define SECURITY_WORLD_SID_AUTHORITY        {0,0,0,0,0,1}
+#define SECURITY_LOCAL_SID_AUTHORITY        {0,0,0,0,0,2}
+#define SECURITY_CREATOR_SID_AUTHORITY      {0,0,0,0,0,3}
+#define SECURITY_NON_UNIQUE_AUTHORITY       {0,0,0,0,0,4}
+#define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9}
+
+#define SECURITY_NULL_RID                 (0x00000000L)
+#define SECURITY_WORLD_RID                (0x00000000L)
+#define SECURITY_LOCAL_RID                (0x00000000L)
+
+#define SECURITY_CREATOR_OWNER_RID        (0x00000000L)
+#define SECURITY_CREATOR_GROUP_RID        (0x00000001L)
+
+#define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L)
+#define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L)
+
+
+///////////////////////////////////////////////////////////////////////////////
+//                                                                           //
+// NT well-known SIDs                                                        //
+//                                                                           //
+//     NT Authority            S-1-5                                         //
+//     Dialup                  S-1-5-1                                       //
+//                                                                           //
+//     Network                 S-1-5-2                                       //
+//     Batch                   S-1-5-3                                       //
+//     Interactive             S-1-5-4                                       //
+//     (Logon IDs)             S-1-5-5-X-Y                                   //
+//     Service                 S-1-5-6                                       //
+//     AnonymousLogon          S-1-5-7       (aka null logon session)        //
+//     Proxy                   S-1-5-8                                       //
+//     Enterprise DC (EDC)     S-1-5-9       (aka domain controller account) //
+//     Self                    S-1-5-10      (self RID)                      //
+//     Authenticated User      S-1-5-11      (Authenticated user somewhere)  //
+//     Restricted Code         S-1-5-12      (Running restricted code)       //
+//     Terminal Server         S-1-5-13      (Running on Terminal Server)    //
+//     Remote Logon            S-1-5-14      (Remote Interactive Logon)      //
+//     This Organization       S-1-5-15                                      //
+//                                                                           //
+//     Local System            S-1-5-18                                      //
+//     Local Service           S-1-5-19                                      //
+//     Network Service         S-1-5-20                                      //
+//                                                                           //
+//     (NT non-unique IDs)     S-1-5-0x15-... (NT Domain Sids)               //
+//                                                                           //
+//     (Built-in domain)       S-1-5-0x20                                    //
+//                                                                           //
+//     (Security Package IDs)  S-1-5-0x40                                    //
+//     NTLM Authentication     S-1-5-0x40-10                                 //
+//     SChannel Authentication S-1-5-0x40-14                                 //
+//     Digest Authentication   S-1-5-0x40-21                                 //
+//                                                                           //
+//     Other Organization      S-1-5-1000    (>=1000 can not be filtered)    //
+//                                                                           //
+//                                                                           //
+// NOTE: the relative identifier values (RIDs) determine which security      //
+//       boundaries the SID is allowed to cross.  Before adding new RIDs,    //
+//       a determination needs to be made regarding which range they should  //
+//       be added to in order to ensure proper "SID filtering"               //
+//                                                                           //
+///////////////////////////////////////////////////////////////////////////////
+
+
+#define SECURITY_NT_AUTHORITY           {0,0,0,0,0,5}   // ntifs
+
+#define SECURITY_DIALUP_RID             (0x00000001L)
+#define SECURITY_NETWORK_RID            (0x00000002L)
+#define SECURITY_BATCH_RID              (0x00000003L)
+#define SECURITY_INTERACTIVE_RID        (0x00000004L)
+#define SECURITY_LOGON_IDS_RID          (0x00000005L)
+#define SECURITY_LOGON_IDS_RID_COUNT    (3L)
+#define SECURITY_SERVICE_RID            (0x00000006L)
+#define SECURITY_ANONYMOUS_LOGON_RID    (0x00000007L)
+#define SECURITY_PROXY_RID              (0x00000008L)
+#define SECURITY_ENTERPRISE_CONTROLLERS_RID (0x00000009L)
+#define SECURITY_SERVER_LOGON_RID       SECURITY_ENTERPRISE_CONTROLLERS_RID
+#define SECURITY_PRINCIPAL_SELF_RID     (0x0000000AL)
+#define SECURITY_AUTHENTICATED_USER_RID (0x0000000BL)
+#define SECURITY_RESTRICTED_CODE_RID    (0x0000000CL)
+#define SECURITY_TERMINAL_SERVER_RID    (0x0000000DL)
+#define SECURITY_REMOTE_LOGON_RID       (0x0000000EL)
+#define SECURITY_THIS_ORGANIZATION_RID  (0x0000000FL)
+
+#define SECURITY_LOCAL_SYSTEM_RID       (0x00000012L)
+#define SECURITY_LOCAL_SERVICE_RID      (0x00000013L)
+#define SECURITY_NETWORK_SERVICE_RID    (0x00000014L)
+
+#define SECURITY_NT_NON_UNIQUE          (0x00000015L)
+#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT  (3L)
+
+#define SECURITY_BUILTIN_DOMAIN_RID     (0x00000020L)
+
+#define SECURITY_PACKAGE_BASE_RID       (0x00000040L)
+#define SECURITY_PACKAGE_RID_COUNT      (2L)
+#define SECURITY_PACKAGE_NTLM_RID       (0x0000000AL)
+#define SECURITY_PACKAGE_SCHANNEL_RID   (0x0000000EL)
+#define SECURITY_PACKAGE_DIGEST_RID     (0x00000015L)
+
+#define SECURITY_MAX_ALWAYS_FILTERED    (0x000003E7L)
+#define SECURITY_MIN_NEVER_FILTERED     (0x000003E8L)
+
+#define SECURITY_OTHER_ORGANIZATION_RID (0x000003E8L)
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+//                                                                         //
+// well-known domain relative sub-authority values (RIDs)...               //
+//                                                                         //
+/////////////////////////////////////////////////////////////////////////////
+
+// Well-known users ...
+
+#define FOREST_USER_RID_MAX            (0x000001F3L)
+
+#define DOMAIN_USER_RID_ADMIN          (0x000001F4L)
+#define DOMAIN_USER_RID_GUEST          (0x000001F5L)
+#define DOMAIN_USER_RID_KRBTGT         (0x000001F6L)
+
+#define DOMAIN_USER_RID_MAX            (0x000003E7L)
+
+
+// well-known groups ...
+
+#define DOMAIN_GROUP_RID_ADMINS        (0x00000200L)
+#define DOMAIN_GROUP_RID_USERS         (0x00000201L)
+#define DOMAIN_GROUP_RID_GUESTS        (0x00000202L)
+#define DOMAIN_GROUP_RID_COMPUTERS     (0x00000203L)
+#define DOMAIN_GROUP_RID_CONTROLLERS   (0x00000204L)
+#define DOMAIN_GROUP_RID_CERT_ADMINS   (0x00000205L)
+#define DOMAIN_GROUP_RID_SCHEMA_ADMINS (0x00000206L)
+#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS (0x00000207L)
+#define DOMAIN_GROUP_RID_POLICY_ADMINS (0x00000208L)
+
+
+
+
+// well-known aliases ...
+
+#define DOMAIN_ALIAS_RID_ADMINS        (0x00000220L)
+#define DOMAIN_ALIAS_RID_USERS         (0x00000221L)
+#define DOMAIN_ALIAS_RID_GUESTS        (0x00000222L)
+#define DOMAIN_ALIAS_RID_POWER_USERS   (0x00000223L)
+
+#define DOMAIN_ALIAS_RID_ACCOUNT_OPS   (0x00000224L)
+#define DOMAIN_ALIAS_RID_SYSTEM_OPS    (0x00000225L)
+#define DOMAIN_ALIAS_RID_PRINT_OPS     (0x00000226L)
+#define DOMAIN_ALIAS_RID_BACKUP_OPS    (0x00000227L)
+
+#define DOMAIN_ALIAS_RID_REPLICATOR    (0x00000228L)
+#define DOMAIN_ALIAS_RID_RAS_SERVERS   (0x00000229L)
+#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS (0x0000022AL)
+#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS (0x0000022BL)
+#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS (0x0000022CL)
+#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS (0x0000022DL)
+
+#define DOMAIN_ALIAS_RID_MONITORING_USERS       (0x0000022EL)
+#define DOMAIN_ALIAS_RID_LOGGING_USERS          (0x0000022FL)
+
+
+
+typedef enum {
+
+    WinNullSid                                  = 0,
+    WinWorldSid                                 = 1,
+    WinLocalSid                                 = 2,
+    WinCreatorOwnerSid                          = 3,
+    WinCreatorGroupSid                          = 4,
+    WinCreatorOwnerServerSid                    = 5,
+    WinCreatorGroupServerSid                    = 6,
+    WinNtAuthoritySid                           = 7,
+    WinDialupSid                                = 8,
+    WinNetworkSid                               = 9,
+    WinBatchSid                                 = 10,
+    WinInteractiveSid                           = 11,
+    WinServiceSid                               = 12,
+    WinAnonymousSid                             = 13,
+    WinProxySid                                 = 14,
+    WinEnterpriseControllersSid                 = 15,
+    WinSelfSid                                  = 16,
+    WinAuthenticatedUserSid                     = 17,
+    WinRestrictedCodeSid                        = 18,
+    WinTerminalServerSid                        = 19,
+    WinRemoteLogonIdSid                         = 20,
+    WinLogonIdsSid                              = 21,
+    WinLocalSystemSid                           = 22,
+    WinLocalServiceSid                          = 23,
+    WinNetworkServiceSid                        = 24,
+    WinBuiltinDomainSid                         = 25,
+    WinBuiltinAdministratorsSid                 = 26,
+    WinBuiltinUsersSid                          = 27,
+    WinBuiltinGuestsSid                         = 28,
+    WinBuiltinPowerUsersSid                     = 29,
+    WinBuiltinAccountOperatorsSid               = 30,
+    WinBuiltinSystemOperatorsSid                = 31,
+    WinBuiltinPrintOperatorsSid                 = 32,
+    WinBuiltinBackupOperatorsSid                = 33,
+    WinBuiltinReplicatorSid                     = 34,
+    WinBuiltinPreWindows2000CompatibleAccessSid = 35,
+    WinBuiltinRemoteDesktopUsersSid             = 36,
+    WinBuiltinNetworkConfigurationOperatorsSid  = 37,
+    WinAccountAdministratorSid                  = 38,
+    WinAccountGuestSid                          = 39,
+    WinAccountKrbtgtSid                         = 40,
+    WinAccountDomainAdminsSid                   = 41,
+    WinAccountDomainUsersSid                    = 42,
+    WinAccountDomainGuestsSid                   = 43,
+    WinAccountComputersSid                      = 44,
+    WinAccountControllersSid                    = 45,
+    WinAccountCertAdminsSid                     = 46,
+    WinAccountSchemaAdminsSid                   = 47,
+    WinAccountEnterpriseAdminsSid               = 48,
+    WinAccountPolicyAdminsSid                   = 49,
+    WinAccountRasAndIasServersSid               = 50,
+    WinNTLMAuthenticationSid                    = 51,
+    WinDigestAuthenticationSid                  = 52,
+    WinSChannelAuthenticationSid                = 53,
+    WinThisOrganizationSid                      = 54,
+    WinOtherOrganizationSid                     = 55,
+    WinBuiltinIncomingForestTrustBuildersSid    = 56,
+    WinBuiltinPerfMonitoringUsersSid            = 57,
+    WinBuiltinPerfLoggingUsersSid               = 58,
+
+} WELL_KNOWN_SID_TYPE;
+
+//
+// Allocate the System Luid.  The first 1000 LUIDs are reserved.
+// Use #999 here (0x3E7 = 999)
+//
+
+#define SYSTEM_LUID                     { 0x3E7, 0x0 }
+#define ANONYMOUS_LOGON_LUID            { 0x3e6, 0x0 }
+#define LOCALSERVICE_LUID               { 0x3e5, 0x0 }
+#define NETWORKSERVICE_LUID             { 0x3e4, 0x0 }
+
+
+// end_ntifs
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//                          User and Group related SID attributes     //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+//
+// Group attributes
+//
+
+#define SE_GROUP_MANDATORY              (0x00000001L)
+#define SE_GROUP_ENABLED_BY_DEFAULT     (0x00000002L)
+#define SE_GROUP_ENABLED                (0x00000004L)
+#define SE_GROUP_OWNER                  (0x00000008L)
+#define SE_GROUP_USE_FOR_DENY_ONLY      (0x00000010L)
+#define SE_GROUP_LOGON_ID               (0xC0000000L)
+#define SE_GROUP_RESOURCE               (0x20000000L)
+
+
+
+//
+// User attributes
+//
+
+// (None yet defined.)
+
+
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//                         ACL  and  ACE                              //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+//
+//  Define an ACL and the ACE format.  The structure of an ACL header
+//  followed by one or more ACEs.  Pictorally the structure of an ACL header
+//  is as follows:
+//
+//       3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//       1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//      +-------------------------------+---------------+---------------+
+//      |            AclSize            |      Sbz1     |  AclRevision  |
+//      +-------------------------------+---------------+---------------+
+//      |              Sbz2             |           AceCount            |
+//      +-------------------------------+-------------------------------+
+//
+//  The current AclRevision is defined to be ACL_REVISION.
+//
+//  AclSize is the size, in bytes, allocated for the ACL.  This includes
+//  the ACL header, ACES, and remaining free space in the buffer.
+//
+//  AceCount is the number of ACES in the ACL.
+//
+
+// begin_ntddk begin_wdm begin_ntifs
+// This is the *current* ACL revision
+
+#define ACL_REVISION     (2)
+#define ACL_REVISION_DS  (4)
+
+// This is the history of ACL revisions.  Add a new one whenever
+// ACL_REVISION is updated
+
+#define ACL_REVISION1   (1)
+#define MIN_ACL_REVISION ACL_REVISION2
+#define ACL_REVISION2   (2)
+#define ACL_REVISION3   (3)
+#define ACL_REVISION4   (4)
+#define MAX_ACL_REVISION ACL_REVISION4
+
+typedef struct _ACL {
+    BYTE  AclRevision;
+    BYTE  Sbz1;
+    WORD   AclSize;
+    WORD   AceCount;
+    WORD   Sbz2;
+} ACL;
+typedef ACL *PACL;
+
+// end_ntddk end_wdm
+
+//
+//  The structure of an ACE is a common ace header followed by ace type
+//  specific data.  Pictorally the structure of the common ace header is
+//  as follows:
+//
+//       3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//       1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//      +---------------+-------+-------+---------------+---------------+
+//      |            AceSize            |    AceFlags   |     AceType   |
+//      +---------------+-------+-------+---------------+---------------+
+//
+//  AceType denotes the type of the ace, there are some predefined ace
+//  types
+//
+//  AceSize is the size, in bytes, of ace.
+//
+//  AceFlags are the Ace flags for audit and inheritance, defined shortly.
+
+typedef struct _ACE_HEADER {
+    BYTE  AceType;
+    BYTE  AceFlags;
+    WORD   AceSize;
+} ACE_HEADER;
+typedef ACE_HEADER *PACE_HEADER;
+
+//
+//  The following are the predefined ace types that go into the AceType
+//  field of an Ace header.
+//
+
+#define ACCESS_MIN_MS_ACE_TYPE                  (0x0)
+#define ACCESS_ALLOWED_ACE_TYPE                 (0x0)
+#define ACCESS_DENIED_ACE_TYPE                  (0x1)
+#define SYSTEM_AUDIT_ACE_TYPE                   (0x2)
+#define SYSTEM_ALARM_ACE_TYPE                   (0x3)
+#define ACCESS_MAX_MS_V2_ACE_TYPE               (0x3)
+
+#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE        (0x4)
+#define ACCESS_MAX_MS_V3_ACE_TYPE               (0x4)
+
+#define ACCESS_MIN_MS_OBJECT_ACE_TYPE           (0x5)
+#define ACCESS_ALLOWED_OBJECT_ACE_TYPE          (0x5)
+#define ACCESS_DENIED_OBJECT_ACE_TYPE           (0x6)
+#define SYSTEM_AUDIT_OBJECT_ACE_TYPE            (0x7)
+#define SYSTEM_ALARM_OBJECT_ACE_TYPE            (0x8)
+#define ACCESS_MAX_MS_OBJECT_ACE_TYPE           (0x8)
+
+#define ACCESS_MAX_MS_V4_ACE_TYPE               (0x8)
+#define ACCESS_MAX_MS_ACE_TYPE                  (0x8)
+
+#define ACCESS_ALLOWED_CALLBACK_ACE_TYPE        (0x9)
+#define ACCESS_DENIED_CALLBACK_ACE_TYPE         (0xA)
+#define ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE (0xB)
+#define ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE  (0xC)
+#define SYSTEM_AUDIT_CALLBACK_ACE_TYPE          (0xD)
+#define SYSTEM_ALARM_CALLBACK_ACE_TYPE          (0xE)
+#define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE   (0xF)
+#define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE   (0x10)
+
+#define ACCESS_MAX_MS_V5_ACE_TYPE               (0x10)
+
+
+//
+//  The following are the inherit flags that go into the AceFlags field
+//  of an Ace header.
+//
+
+#define OBJECT_INHERIT_ACE                (0x1)
+#define CONTAINER_INHERIT_ACE             (0x2)
+#define NO_PROPAGATE_INHERIT_ACE          (0x4)
+#define INHERIT_ONLY_ACE                  (0x8)
+#define INHERITED_ACE                     (0x10)
+#define VALID_INHERIT_FLAGS               (0x1F)
+
+
+//  The following are the currently defined ACE flags that go into the
+//  AceFlags field of an ACE header.  Each ACE type has its own set of
+//  AceFlags.
+//
+//  SUCCESSFUL_ACCESS_ACE_FLAG - used only with system audit and alarm ACE
+//  types to indicate that a message is generated for successful accesses.
+//
+//  FAILED_ACCESS_ACE_FLAG - used only with system audit and alarm ACE types
+//  to indicate that a message is generated for failed accesses.
+//
+
+//
+//  SYSTEM_AUDIT and SYSTEM_ALARM AceFlags
+//
+//  These control the signaling of audit and alarms for success or failure.
+//
+
+#define SUCCESSFUL_ACCESS_ACE_FLAG       (0x40)
+#define FAILED_ACCESS_ACE_FLAG           (0x80)
+
+
+//
+//  We'll define the structure of the predefined ACE types.  Pictorally
+//  the structure of the predefined ACE's is as follows:
+//
+//       3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//       1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//      +---------------+-------+-------+---------------+---------------+
+//      |    AceFlags   | Resd  |Inherit|    AceSize    |     AceType   |
+//      +---------------+-------+-------+---------------+---------------+
+//      |                              Mask                             |
+//      +---------------------------------------------------------------+
+//      |                                                               |
+//      +                                                               +
+//      |                                                               |
+//      +                              Sid                              +
+//      |                                                               |
+//      +                                                               +
+//      |                                                               |
+//      +---------------------------------------------------------------+
+//
+//  Mask is the access mask associated with the ACE.  This is either the
+//  access allowed, access denied, audit, or alarm mask.
+//
+//  Sid is the Sid associated with the ACE.
+//
+
+//  The following are the four predefined ACE types.
+
+//  Examine the AceType field in the Header to determine
+//  which structure is appropriate to use for casting.
+
+
+typedef struct _ACCESS_ALLOWED_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+} ACCESS_ALLOWED_ACE;
+
+typedef ACCESS_ALLOWED_ACE *PACCESS_ALLOWED_ACE;
+
+typedef struct _ACCESS_DENIED_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+} ACCESS_DENIED_ACE;
+typedef ACCESS_DENIED_ACE *PACCESS_DENIED_ACE;
+
+typedef struct _SYSTEM_AUDIT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+} SYSTEM_AUDIT_ACE;
+typedef SYSTEM_AUDIT_ACE *PSYSTEM_AUDIT_ACE;
+
+typedef struct _SYSTEM_ALARM_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+} SYSTEM_ALARM_ACE;
+typedef SYSTEM_ALARM_ACE *PSYSTEM_ALARM_ACE;
+
+// end_ntifs
+
+
+typedef struct _ACCESS_ALLOWED_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+} ACCESS_ALLOWED_OBJECT_ACE, *PACCESS_ALLOWED_OBJECT_ACE;
+
+typedef struct _ACCESS_DENIED_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+} ACCESS_DENIED_OBJECT_ACE, *PACCESS_DENIED_OBJECT_ACE;
+
+typedef struct _SYSTEM_AUDIT_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+} SYSTEM_AUDIT_OBJECT_ACE, *PSYSTEM_AUDIT_OBJECT_ACE;
+
+typedef struct _SYSTEM_ALARM_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+} SYSTEM_ALARM_OBJECT_ACE, *PSYSTEM_ALARM_OBJECT_ACE;
+
+//
+// Callback ace support in post Win2000.
+// Resource managers can put their own data after Sidstart + Length of the sid
+//
+
+typedef struct _ACCESS_ALLOWED_CALLBACK_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} ACCESS_ALLOWED_CALLBACK_ACE, *PACCESS_ALLOWED_CALLBACK_ACE;
+
+typedef struct _ACCESS_DENIED_CALLBACK_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} ACCESS_DENIED_CALLBACK_ACE, *PACCESS_DENIED_CALLBACK_ACE;
+
+typedef struct _SYSTEM_AUDIT_CALLBACK_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} SYSTEM_AUDIT_CALLBACK_ACE, *PSYSTEM_AUDIT_CALLBACK_ACE;
+
+typedef struct _SYSTEM_ALARM_CALLBACK_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} SYSTEM_ALARM_CALLBACK_ACE, *PSYSTEM_ALARM_CALLBACK_ACE;
+
+typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE;
+
+typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE;
+
+typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE;
+
+typedef struct _SYSTEM_ALARM_CALLBACK_OBJECT_ACE {
+    ACE_HEADER Header;
+    ACCESS_MASK Mask;
+    DWORD Flags;
+    GUID ObjectType;
+    GUID InheritedObjectType;
+    DWORD SidStart;
+    // Opaque resouce manager specific data
+} SYSTEM_ALARM_CALLBACK_OBJECT_ACE, *PSYSTEM_ALARM_CALLBACK_OBJECT_ACE;
+
+//
+// Currently define Flags for "OBJECT" ACE types.
+//
+
+#define ACE_OBJECT_TYPE_PRESENT           0x1
+#define ACE_INHERITED_OBJECT_TYPE_PRESENT 0x2
+
+
+//
+//  The following declarations are used for setting and querying information
+//  about and ACL.  First are the various information classes available to
+//  the user.
+//
+
+typedef enum _ACL_INFORMATION_CLASS {
+    AclRevisionInformation = 1,
+    AclSizeInformation
+} ACL_INFORMATION_CLASS;
+
+//
+//  This record is returned/sent if the user is requesting/setting the
+//  AclRevisionInformation
+//
+
+typedef struct _ACL_REVISION_INFORMATION {
+    DWORD AclRevision;
+} ACL_REVISION_INFORMATION;
+typedef ACL_REVISION_INFORMATION *PACL_REVISION_INFORMATION;
+
+//
+//  This record is returned if the user is requesting AclSizeInformation
+//
+
+typedef struct _ACL_SIZE_INFORMATION {
+    DWORD AceCount;
+    DWORD AclBytesInUse;
+    DWORD AclBytesFree;
+} ACL_SIZE_INFORMATION;
+typedef ACL_SIZE_INFORMATION *PACL_SIZE_INFORMATION;
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//                             SECURITY_DESCRIPTOR                    //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+//
+//  Define the Security Descriptor and related data types.
+//  This is an opaque data structure.
+//
+
+// begin_wdm begin_ntddk begin_ntifs
+//
+// Current security descriptor revision value
+//
+
+#define SECURITY_DESCRIPTOR_REVISION     (1)
+#define SECURITY_DESCRIPTOR_REVISION1    (1)
+
+// end_wdm end_ntddk
+
+
+#define SECURITY_DESCRIPTOR_MIN_LENGTH   (sizeof(SECURITY_DESCRIPTOR))
+
+
+typedef WORD   SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;
+
+#define SE_OWNER_DEFAULTED               (0x0001)
+#define SE_GROUP_DEFAULTED               (0x0002)
+#define SE_DACL_PRESENT                  (0x0004)
+#define SE_DACL_DEFAULTED                (0x0008)
+#define SE_SACL_PRESENT                  (0x0010)
+#define SE_SACL_DEFAULTED                (0x0020)
+#define SE_DACL_AUTO_INHERIT_REQ         (0x0100)
+#define SE_SACL_AUTO_INHERIT_REQ         (0x0200)
+#define SE_DACL_AUTO_INHERITED           (0x0400)
+#define SE_SACL_AUTO_INHERITED           (0x0800)
+#define SE_DACL_PROTECTED                (0x1000)
+#define SE_SACL_PROTECTED                (0x2000)
+#define SE_RM_CONTROL_VALID              (0x4000)
+#define SE_SELF_RELATIVE                 (0x8000)
+
+//
+//  Where:
+//
+//      SE_OWNER_DEFAULTED - This boolean flag, when set, indicates that the
+//          SID pointed to by the Owner field was provided by a
+//          defaulting mechanism rather than explicitly provided by the
+//          original provider of the security descriptor.  This may
+//          affect the treatment of the SID with respect to inheritence
+//          of an owner.
+//
+//      SE_GROUP_DEFAULTED - This boolean flag, when set, indicates that the
+//          SID in the Group field was provided by a defaulting mechanism
+//          rather than explicitly provided by the original provider of
+//          the security descriptor.  This may affect the treatment of
+//          the SID with respect to inheritence of a primary group.
+//
+//      SE_DACL_PRESENT - This boolean flag, when set, indicates that the
+//          security descriptor contains a discretionary ACL.  If this
+//          flag is set and the Dacl field of the SECURITY_DESCRIPTOR is
+//          null, then a null ACL is explicitly being specified.
+//
+//      SE_DACL_DEFAULTED - This boolean flag, when set, indicates that the
+//          ACL pointed to by the Dacl field was provided by a defaulting
+//          mechanism rather than explicitly provided by the original
+//          provider of the security descriptor.  This may affect the
+//          treatment of the ACL with respect to inheritence of an ACL.
+//          This flag is ignored if the DaclPresent flag is not set.
+//
+//      SE_SACL_PRESENT - This boolean flag, when set,  indicates that the
+//          security descriptor contains a system ACL pointed to by the
+//          Sacl field.  If this flag is set and the Sacl field of the
+//          SECURITY_DESCRIPTOR is null, then an empty (but present)
+//          ACL is being specified.
+//
+//      SE_SACL_DEFAULTED - This boolean flag, when set, indicates that the
+//          ACL pointed to by the Sacl field was provided by a defaulting
+//          mechanism rather than explicitly provided by the original
+//          provider of the security descriptor.  This may affect the
+//          treatment of the ACL with respect to inheritence of an ACL.
+//          This flag is ignored if the SaclPresent flag is not set.
+//
+//      SE_SELF_RELATIVE - This boolean flag, when set, indicates that the
+//          security descriptor is in self-relative form.  In this form,
+//          all fields of the security descriptor are contiguous in memory
+//          and all pointer fields are expressed as offsets from the
+//          beginning of the security descriptor.  This form is useful
+//          for treating security descriptors as opaque data structures
+//          for transmission in communication protocol or for storage on
+//          secondary media.
+//
+//
+//
+// Pictorially the structure of a security descriptor is as follows:
+//
+//       3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//       1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//      +---------------------------------------------------------------+
+//      |            Control            |Reserved1 (SBZ)|   Revision    |
+//      +---------------------------------------------------------------+
+//      |                            Owner                              |
+//      +---------------------------------------------------------------+
+//      |                            Group                              |
+//      +---------------------------------------------------------------+
+//      |                            Sacl                               |
+//      +---------------------------------------------------------------+
+//      |                            Dacl                               |
+//      +---------------------------------------------------------------+
+//
+// In general, this data structure should be treated opaquely to ensure future
+// compatibility.
+//
+//
+
+typedef struct _SECURITY_DESCRIPTOR_RELATIVE {
+    BYTE  Revision;
+    BYTE  Sbz1;
+    SECURITY_DESCRIPTOR_CONTROL Control;
+    DWORD Owner;
+    DWORD Group;
+    DWORD Sacl;
+    DWORD Dacl;
+    } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE;
+
+typedef struct _SECURITY_DESCRIPTOR {
+   BYTE  Revision;
+   BYTE  Sbz1;
+   SECURITY_DESCRIPTOR_CONTROL Control;
+   PSID Owner;
+   PSID Group;
+   PACL Sacl;
+   PACL Dacl;
+
+   } SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR;
+
+// end_ntifs
+
+// Where:
+//
+//     Revision - Contains the revision level of the security
+//         descriptor.  This allows this structure to be passed between
+//         systems or stored on disk even though it is expected to
+//         change in the future.
+//
+//     Control - A set of flags which qualify the meaning of the
+//         security descriptor or individual fields of the security
+//         descriptor.
+//
+//     Owner - is a pointer to an SID representing an object's owner.
+//         If this field is null, then no owner SID is present in the
+//         security descriptor.  If the security descriptor is in
+//         self-relative form, then this field contains an offset to
+//         the SID, rather than a pointer.
+//
+//     Group - is a pointer to an SID representing an object's primary
+//         group.  If this field is null, then no primary group SID is
+//         present in the security descriptor.  If the security descriptor
+//         is in self-relative form, then this field contains an offset to
+//         the SID, rather than a pointer.
+//
+//     Sacl - is a pointer to a system ACL.  This field value is only
+//         valid if the DaclPresent control flag is set.  If the
+//         SaclPresent flag is set and this field is null, then a null
+//         ACL  is specified.  If the security descriptor is in
+//         self-relative form, then this field contains an offset to
+//         the ACL, rather than a pointer.
+//
+//     Dacl - is a pointer to a discretionary ACL.  This field value is
+//         only valid if the DaclPresent control flag is set.  If the
+//         DaclPresent flag is set and this field is null, then a null
+//         ACL (unconditionally granting access) is specified.  If the
+//         security descriptor is in self-relative form, then this field
+//         contains an offset to the ACL, rather than a pointer.
+//
+
+
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//               Object Type list for AccessCheckByType               //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+typedef struct _OBJECT_TYPE_LIST {
+    WORD   Level;
+    WORD   Sbz;
+    GUID *ObjectType;
+} OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST;
+
+//
+// DS values for Level
+//
+
+#define ACCESS_OBJECT_GUID       0
+#define ACCESS_PROPERTY_SET_GUID 1
+#define ACCESS_PROPERTY_GUID     2
+
+#define ACCESS_MAX_LEVEL         4
+
+//
+// Parameters to NtAccessCheckByTypeAndAditAlarm
+//
+
+typedef enum _AUDIT_EVENT_TYPE {
+    AuditEventObjectAccess,
+    AuditEventDirectoryServiceAccess
+} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
+
+#define AUDIT_ALLOW_NO_PRIVILEGE 0x1
+
+//
+// DS values for Source and ObjectTypeName
+//
+
+#define ACCESS_DS_SOURCE_A "DS"
+#define ACCESS_DS_SOURCE_W L"DS"
+#define ACCESS_DS_OBJECT_TYPE_NAME_A "Directory Service Object"
+#define ACCESS_DS_OBJECT_TYPE_NAME_W L"Directory Service Object"
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//               Privilege Related Data Structures                    //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+
+// begin_wdm begin_ntddk begin_nthal
+//
+// Privilege attributes
+//
+
+#define SE_PRIVILEGE_ENABLED_BY_DEFAULT (0x00000001L)
+#define SE_PRIVILEGE_ENABLED            (0x00000002L)
+#define SE_PRIVILEGE_REMOVED            (0X00000004L)
+#define SE_PRIVILEGE_USED_FOR_ACCESS    (0x80000000L)
+
+//
+// Privilege Set Control flags
+//
+
+#define PRIVILEGE_SET_ALL_NECESSARY    (1)
+
+//
+//  Privilege Set - This is defined for a privilege set of one.
+//                  If more than one privilege is needed, then this structure
+//                  will need to be allocated with more space.
+//
+//  Note: don't change this structure without fixing the INITIAL_PRIVILEGE_SET
+//  structure (defined in se.h)
+//
+
+typedef struct _PRIVILEGE_SET {
+    DWORD PrivilegeCount;
+    DWORD Control;
+    LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY];
+    } PRIVILEGE_SET, * PPRIVILEGE_SET;
+
+
+////////////////////////////////////////////////////////////////////////
+//                                                                    //
+//               NT Defined Privileges                                //
+//                                                                    //
+////////////////////////////////////////////////////////////////////////
+
+#define SE_CREATE_TOKEN_NAME              TEXT("SeCreateTokenPrivilege")
+#define SE_ASSIGNPRIMARYTOKEN_NAME        TEXT("SeAssignPrimaryTokenPrivilege")
+#define SE_LOCK_MEMORY_NAME               TEXT("SeLockMemoryPrivilege")
+#define SE_INCREASE_QUOTA_NAME            TEXT("SeIncreaseQuotaPrivilege")
+#define SE_UNSOLICITED_INPUT_NAME         TEXT("SeUnsolicitedInputPrivilege")
+#define SE_MACHINE_ACCOUNT_NAME           TEXT("SeMachineAccountPrivilege")
+#define SE_TCB_NAME                       TEXT("SeTcbPrivilege")
+#define SE_SECURITY_NAME                  TEXT("SeSecurityPrivilege")
+#define SE_TAKE_OWNERSHIP_NAME            TEXT("SeTakeOwnershipPrivilege")
+#define SE_LOAD_DRIVER_NAME               TEXT("SeLoadDriverPrivilege")
+#define SE_SYSTEM_PROFILE_NAME            TEXT("SeSystemProfilePrivilege")
+#define SE_SYSTEMTIME_NAME                TEXT("SeSystemtimePrivilege")
+#define SE_PROF_SINGLE_PROCESS_NAME       TEXT("SeProfileSingleProcessPrivilege")
+#define SE_INC_BASE_PRIORITY_NAME         TEXT("SeIncreaseBasePriorityPrivilege")
+#define SE_CREATE_PAGEFILE_NAME           TEXT("SeCreatePagefilePrivilege")
+#define SE_CREATE_PERMANENT_NAME          TEXT("SeCreatePermanentPrivilege")
+#define SE_BACKUP_NAME                    TEXT("SeBackupPrivilege")
+#define SE_RESTORE_NAME                   TEXT("SeRestorePrivilege")
+#define SE_SHUTDOWN_NAME                  TEXT("SeShutdownPrivilege")
+#define SE_DEBUG_NAME                     TEXT("SeDebugPrivilege")
+#define SE_AUDIT_NAME                     TEXT("SeAuditPrivilege")
+#define SE_SYSTEM_ENVIRONMENT_NAME        TEXT("SeSystemEnvironmentPrivilege")
+#define SE_CHANGE_NOTIFY_NAME             TEXT("SeChangeNotifyPrivilege")
+#define SE_REMOTE_SHUTDOWN_NAME           TEXT("SeRemoteShutdownPrivilege")
+#define SE_UNDOCK_NAME                    TEXT("SeUndockPrivilege")
+#define SE_SYNC_AGENT_NAME                TEXT("SeSyncAgentPrivilege")
+#define SE_ENABLE_DELEGATION_NAME         TEXT("SeEnableDelegationPrivilege")
+#define SE_MANAGE_VOLUME_NAME             TEXT("SeManageVolumePrivilege")
+
+
+////////////////////////////////////////////////////////////////////
+//                                                                //
+//           Security Quality Of Service                          //
+//                                                                //
+//                                                                //
+////////////////////////////////////////////////////////////////////
+
+// begin_wdm begin_ntddk begin_nthal begin_ntifs
+//
+// Impersonation Level
+//
+// Impersonation level is represented by a pair of bits in Windows.
+// If a new impersonation level is added or lowest value is changed from
+// 0 to something else, fix the Windows CreateFile call.
+//
+
+typedef enum _SECURITY_IMPERSONATION_LEVEL {
+    SecurityAnonymous,
+    SecurityIdentification,
+    SecurityImpersonation,
+    SecurityDelegation
+    } SECURITY_IMPERSONATION_LEVEL, * PSECURITY_IMPERSONATION_LEVEL;
+
+#define SECURITY_MAX_IMPERSONATION_LEVEL SecurityDelegation
+#define SECURITY_MIN_IMPERSONATION_LEVEL SecurityAnonymous
+#define DEFAULT_IMPERSONATION_LEVEL SecurityImpersonation
+#define VALID_IMPERSONATION_LEVEL(L) (((L) >= SECURITY_MIN_IMPERSONATION_LEVEL) && ((L) <= SECURITY_MAX_IMPERSONATION_LEVEL))
+
+////////////////////////////////////////////////////////////////////
+//                                                                //
+//           Token Object Definitions                             //
+//                                                                //
+//                                                                //
+////////////////////////////////////////////////////////////////////
+
+
+//
+// Token Specific Access Rights.
+//
+
+#define TOKEN_ASSIGN_PRIMARY    (0x0001)
+#define TOKEN_DUPLICATE         (0x0002)
+#define TOKEN_IMPERSONATE       (0x0004)
+#define TOKEN_QUERY             (0x0008)
+#define TOKEN_QUERY_SOURCE      (0x0010)
+#define TOKEN_ADJUST_PRIVILEGES (0x0020)
+#define TOKEN_ADJUST_GROUPS     (0x0040)
+#define TOKEN_ADJUST_DEFAULT    (0x0080)
+#define TOKEN_ADJUST_SESSIONID  (0x0100)
+
+#define TOKEN_ALL_ACCESS_P (STANDARD_RIGHTS_REQUIRED  |\
+                          TOKEN_ASSIGN_PRIMARY      |\
+                          TOKEN_DUPLICATE           |\
+                          TOKEN_IMPERSONATE         |\
+                          TOKEN_QUERY               |\
+                          TOKEN_QUERY_SOURCE        |\
+                          TOKEN_ADJUST_PRIVILEGES   |\
+                          TOKEN_ADJUST_GROUPS       |\
+                          TOKEN_ADJUST_DEFAULT )
+
+#if ((defined(_WIN32_WINNT) && (_WIN32_WINNT > 0x0400)) || (!defined(_WIN32_WINNT)))
+#define TOKEN_ALL_ACCESS  (TOKEN_ALL_ACCESS_P |\
+                          TOKEN_ADJUST_SESSIONID )
+#else
+#define TOKEN_ALL_ACCESS  (TOKEN_ALL_ACCESS_P)
+#endif
+
+#define TOKEN_READ       (STANDARD_RIGHTS_READ      |\
+                          TOKEN_QUERY)
+
+
+#define TOKEN_WRITE      (STANDARD_RIGHTS_WRITE     |\
+                          TOKEN_ADJUST_PRIVILEGES   |\
+                          TOKEN_ADJUST_GROUPS       |\
+                          TOKEN_ADJUST_DEFAULT)
+
+#define TOKEN_EXECUTE    (STANDARD_RIGHTS_EXECUTE)
+
+
+//
+//
+// Token Types
+//
+
+typedef enum _TOKEN_TYPE {
+    TokenPrimary = 1,
+    TokenImpersonation
+    } TOKEN_TYPE;
+typedef TOKEN_TYPE *PTOKEN_TYPE;
+
+
+//
+// Token Information Classes.
+//
+
+
+typedef enum _TOKEN_INFORMATION_CLASS {
+    TokenUser = 1,
+    TokenGroups,
+    TokenPrivileges,
+    TokenOwner,
+    TokenPrimaryGroup,
+    TokenDefaultDacl,
+    TokenSource,
+    TokenType,
+    TokenImpersonationLevel,
+    TokenStatistics,
+    TokenRestrictedSids,
+    TokenSessionId,
+    TokenGroupsAndPrivileges,
+    TokenSessionReference,
+    TokenSandBoxInert,
+    TokenAuditPolicy,
+    MaxTokenInfoClass  // MaxTokenInfoClass should always be the last enum
+} TOKEN_INFORMATION_CLASS, *PTOKEN_INFORMATION_CLASS;
+
+//
+// Token information class structures
+//
+
+
+typedef struct _TOKEN_USER {
+    SID_AND_ATTRIBUTES User;
+} TOKEN_USER, *PTOKEN_USER;
+
+typedef struct _TOKEN_GROUPS {
+    DWORD GroupCount;
+    SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY];
+} TOKEN_GROUPS, *PTOKEN_GROUPS;
+
+
+typedef struct _TOKEN_PRIVILEGES {
+    DWORD PrivilegeCount;
+    LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
+} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES;
+
+
+typedef struct _TOKEN_OWNER {
+    PSID Owner;
+} TOKEN_OWNER, *PTOKEN_OWNER;
+
+
+typedef struct _TOKEN_PRIMARY_GROUP {
+    PSID PrimaryGroup;
+} TOKEN_PRIMARY_GROUP, *PTOKEN_PRIMARY_GROUP;
+
+
+typedef struct _TOKEN_DEFAULT_DACL {
+    PACL DefaultDacl;
+} TOKEN_DEFAULT_DACL, *PTOKEN_DEFAULT_DACL;
+
+typedef struct _TOKEN_GROUPS_AND_PRIVILEGES {
+    DWORD SidCount;
+    DWORD SidLength;
+    PSID_AND_ATTRIBUTES Sids;
+    DWORD RestrictedSidCount;
+    DWORD RestrictedSidLength;
+    PSID_AND_ATTRIBUTES RestrictedSids;
+    DWORD PrivilegeCount;
+    DWORD PrivilegeLength;
+    PLUID_AND_ATTRIBUTES Privileges;
+    LUID AuthenticationId;
+} TOKEN_GROUPS_AND_PRIVILEGES, *PTOKEN_GROUPS_AND_PRIVILEGES;
+
+//
+// Valid bits for each TOKEN_AUDIT_POLICY policy mask field.
+//
+
+#define TOKEN_AUDIT_SUCCESS_INCLUDE 0x1
+#define TOKEN_AUDIT_SUCCESS_EXCLUDE 0x2
+#define TOKEN_AUDIT_FAILURE_INCLUDE 0x4
+#define TOKEN_AUDIT_FAILURE_EXCLUDE 0x8
+
+#define VALID_AUDIT_POLICY_BITS (TOKEN_AUDIT_SUCCESS_INCLUDE | \
+                                 TOKEN_AUDIT_SUCCESS_EXCLUDE | \
+                                 TOKEN_AUDIT_FAILURE_INCLUDE | \
+                                 TOKEN_AUDIT_FAILURE_EXCLUDE)
+
+#define VALID_TOKEN_AUDIT_POLICY_ELEMENT(P) ((((P).PolicyMask & ~VALID_AUDIT_POLICY_BITS) == 0) && \
+                                             ((P).Category <= AuditEventMaxType))
+
+typedef struct _TOKEN_AUDIT_POLICY_ELEMENT {
+    DWORD Category;
+    DWORD PolicyMask;
+} TOKEN_AUDIT_POLICY_ELEMENT, *PTOKEN_AUDIT_POLICY_ELEMENT;
+
+typedef struct _TOKEN_AUDIT_POLICY {
+    DWORD PolicyCount;
+    TOKEN_AUDIT_POLICY_ELEMENT Policy[ANYSIZE_ARRAY];
+} TOKEN_AUDIT_POLICY, *PTOKEN_AUDIT_POLICY;
+
+#define PER_USER_AUDITING_POLICY_SIZE(p) \
+    ( sizeof(TOKEN_AUDIT_POLICY) + (((p)->PolicyCount > ANYSIZE_ARRAY) ? (sizeof(TOKEN_AUDIT_POLICY_ELEMENT) * ((p)->PolicyCount - ANYSIZE_ARRAY)) : 0) )
+#define PER_USER_AUDITING_POLICY_SIZE_BY_COUNT(C) \
+    ( sizeof(TOKEN_AUDIT_POLICY) + (((C) > ANYSIZE_ARRAY) ? (sizeof(TOKEN_AUDIT_POLICY_ELEMENT) * ((C) - ANYSIZE_ARRAY)) : 0) )
+
+
+#define TOKEN_SOURCE_LENGTH 8
+
+typedef struct _TOKEN_SOURCE {
+    CHAR SourceName[TOKEN_SOURCE_LENGTH];
+    LUID SourceIdentifier;
+} TOKEN_SOURCE, *PTOKEN_SOURCE;
+
+
+typedef struct _TOKEN_STATISTICS {
+    LUID TokenId;
+    LUID AuthenticationId;
+    LARGE_INTEGER ExpirationTime;
+    TOKEN_TYPE TokenType;
+    SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;
+    DWORD DynamicCharged;
+    DWORD DynamicAvailable;
+    DWORD GroupCount;
+    DWORD PrivilegeCount;
+    LUID ModifiedId;
+} TOKEN_STATISTICS, *PTOKEN_STATISTICS;
+
+
+
+typedef struct _TOKEN_CONTROL {
+    LUID TokenId;
+    LUID AuthenticationId;
+    LUID ModifiedId;
+    TOKEN_SOURCE TokenSource;
+    } TOKEN_CONTROL, *PTOKEN_CONTROL;
+
+//
+// Security Tracking Mode
+//
+
+#define SECURITY_DYNAMIC_TRACKING      (TRUE)
+#define SECURITY_STATIC_TRACKING       (FALSE)
+
+typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,
+                    * PSECURITY_CONTEXT_TRACKING_MODE;
+
+
+
+//
+// Quality Of Service
+//
+
+typedef struct _SECURITY_QUALITY_OF_SERVICE {
+    DWORD Length;
+    SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;
+    SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode;
+    BOOLEAN EffectiveOnly;
+    } SECURITY_QUALITY_OF_SERVICE, * PSECURITY_QUALITY_OF_SERVICE;
+
+
+//
+// Used to represent information related to a thread impersonation
+//
+
+typedef struct _SE_IMPERSONATION_STATE {
+    PACCESS_TOKEN Token;
+    BOOLEAN CopyOnOpen;
+    BOOLEAN EffectiveOnly;
+    SECURITY_IMPERSONATION_LEVEL Level;
+} SE_IMPERSONATION_STATE, *PSE_IMPERSONATION_STATE;
+
+#define DISABLE_MAX_PRIVILEGE   0x1 
+#define SANDBOX_INERT           0x2 
+
+typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
+
+#define OWNER_SECURITY_INFORMATION       (0x00000001L)
+#define GROUP_SECURITY_INFORMATION       (0x00000002L)
+#define DACL_SECURITY_INFORMATION        (0x00000004L)
+#define SACL_SECURITY_INFORMATION        (0x00000008L)
+
+#define PROTECTED_DACL_SECURITY_INFORMATION     (0x80000000L)
+#define PROTECTED_SACL_SECURITY_INFORMATION     (0x40000000L)
+#define UNPROTECTED_DACL_SECURITY_INFORMATION   (0x20000000L)
+#define UNPROTECTED_SACL_SECURITY_INFORMATION   (0x10000000L)
+
+#define PROCESS_TERMINATE         (0x0001)  
+#define PROCESS_CREATE_THREAD     (0x0002)  
+#define PROCESS_SET_SESSIONID     (0x0004)  
+#define PROCESS_VM_OPERATION      (0x0008)  
+#define PROCESS_VM_READ           (0x0010)  
+#define PROCESS_VM_WRITE          (0x0020)  
+#define PROCESS_DUP_HANDLE        (0x0040)  
+#define PROCESS_CREATE_PROCESS    (0x0080)  
+#define PROCESS_SET_QUOTA         (0x0100)  
+#define PROCESS_SET_INFORMATION   (0x0200)  
+#define PROCESS_QUERY_INFORMATION (0x0400)  
+#define PROCESS_SUSPEND_RESUME    (0x0800)  
+#define PROCESS_ALL_ACCESS        (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | \
+                                   0xFFF)
+// begin_nthal
+
+#if defined(_WIN64)
+
+#define MAXIMUM_PROCESSORS 64
+
+#else
+
+#define MAXIMUM_PROCESSORS 32
+
+#endif
+
+// end_nthal
+
+#define THREAD_TERMINATE               (0x0001)  
+#define THREAD_SUSPEND_RESUME          (0x0002)  
+#define THREAD_GET_CONTEXT             (0x0008)  
+#define THREAD_SET_CONTEXT             (0x0010)  
+#define THREAD_SET_INFORMATION         (0x0020)  
+#define THREAD_QUERY_INFORMATION       (0x0040)  
+#define THREAD_SET_THREAD_TOKEN        (0x0080)
+#define THREAD_IMPERSONATE             (0x0100)
+#define THREAD_DIRECT_IMPERSONATION    (0x0200)
+// begin_ntddk begin_wdm begin_ntifs
+
+#define THREAD_ALL_ACCESS         (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | \
+                                   0x3FF)
+
+// end_ntddk end_wdm end_ntifs
+#define JOB_OBJECT_ASSIGN_PROCESS           (0x0001)
+#define JOB_OBJECT_SET_ATTRIBUTES           (0x0002)
+#define JOB_OBJECT_QUERY                    (0x0004)
+#define JOB_OBJECT_TERMINATE                (0x0008)
+#define JOB_OBJECT_SET_SECURITY_ATTRIBUTES  (0x0010)
+#define JOB_OBJECT_ALL_ACCESS       (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | \
+                                        0x1F )
+
+typedef struct _JOB_SET_ARRAY {
+    HANDLE JobHandle;   // Handle to job object to insert
+    DWORD MemberLevel;  // Level of this job in the set. Must be > 0. Can be sparse.
+    DWORD Flags;        // Unused. Must be zero
+} JOB_SET_ARRAY, *PJOB_SET_ARRAY;
+
+#define FLS_MAXIMUM_AVAILABLE 128   
+#define TLS_MINIMUM_AVAILABLE 64    
+
+typedef struct _NT_TIB {
+    struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;
+    PVOID StackBase;
+    PVOID StackLimit;
+    PVOID SubSystemTib;
+    union {
+        PVOID FiberData;
+        DWORD Version;
+    };
+    PVOID ArbitraryUserPointer;
+    struct _NT_TIB *Self;
+} NT_TIB;
+typedef NT_TIB *PNT_TIB;
+
+//
+// 32 and 64 bit specific version for wow64 and the debugger
+//
+typedef struct _NT_TIB32 {
+    DWORD ExceptionList;
+    DWORD StackBase;
+    DWORD StackLimit;
+    DWORD SubSystemTib;
+    union {
+        DWORD FiberData;
+        DWORD Version;
+    };
+    DWORD ArbitraryUserPointer;
+    DWORD Self;
+} NT_TIB32, *PNT_TIB32;
+
+typedef struct _NT_TIB64 {
+    DWORD64 ExceptionList;
+    DWORD64 StackBase;
+    DWORD64 StackLimit;
+    DWORD64 SubSystemTib;
+    union {
+        DWORD64 FiberData;
+        DWORD Version;
+    };
+    DWORD64 ArbitraryUserPointer;
+    DWORD64 Self;
+} NT_TIB64, *PNT_TIB64;
+
+
+#if !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_)
+#define WX86
+#endif
+
+#define THREAD_BASE_PRIORITY_LOWRT  15  // value that gets a thread to LowRealtime-1
+#define THREAD_BASE_PRIORITY_MAX    2   // maximum thread base priority boost
+#define THREAD_BASE_PRIORITY_MIN    (-2)  // minimum thread base priority boost
+#define THREAD_BASE_PRIORITY_IDLE   (-15) // value that gets a thread to idle
+
+typedef struct _QUOTA_LIMITS {
+    SIZE_T PagedPoolLimit;
+    SIZE_T NonPagedPoolLimit;
+    SIZE_T MinimumWorkingSetSize;
+    SIZE_T MaximumWorkingSetSize;
+    SIZE_T PagefileLimit;
+    LARGE_INTEGER TimeLimit;
+} QUOTA_LIMITS, *PQUOTA_LIMITS;
+
+#define QUOTA_LIMITS_HARDWS_MIN_ENABLE  0x00000001
+#define QUOTA_LIMITS_HARDWS_MIN_DISABLE 0x00000002
+#define QUOTA_LIMITS_HARDWS_MAX_ENABLE  0x00000004
+#define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008
+
+typedef struct _QUOTA_LIMITS_EX {
+    SIZE_T PagedPoolLimit;
+    SIZE_T NonPagedPoolLimit;
+    SIZE_T MinimumWorkingSetSize;
+    SIZE_T MaximumWorkingSetSize;
+    SIZE_T PagefileLimit;
+    LARGE_INTEGER TimeLimit;
+    SIZE_T Reserved1;
+    SIZE_T Reserved2;
+    SIZE_T Reserved3;
+    SIZE_T Reserved4;
+    DWORD  Flags;
+    DWORD  Reserved5;
+} QUOTA_LIMITS_EX, *PQUOTA_LIMITS_EX;
+
+typedef struct _IO_COUNTERS {
+    ULONGLONG  ReadOperationCount;
+    ULONGLONG  WriteOperationCount;
+    ULONGLONG  OtherOperationCount;
+    ULONGLONG ReadTransferCount;
+    ULONGLONG WriteTransferCount;
+    ULONGLONG OtherTransferCount;
+} IO_COUNTERS;
+typedef IO_COUNTERS *PIO_COUNTERS;
+//
+
+typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION {
+    LARGE_INTEGER TotalUserTime;
+    LARGE_INTEGER TotalKernelTime;
+    LARGE_INTEGER ThisPeriodTotalUserTime;
+    LARGE_INTEGER ThisPeriodTotalKernelTime;
+    DWORD TotalPageFaultCount;
+    DWORD TotalProcesses;
+    DWORD ActiveProcesses;
+    DWORD TotalTerminatedProcesses;
+} JOBOBJECT_BASIC_ACCOUNTING_INFORMATION, *PJOBOBJECT_BASIC_ACCOUNTING_INFORMATION;
+
+typedef struct _JOBOBJECT_BASIC_LIMIT_INFORMATION {
+    LARGE_INTEGER PerProcessUserTimeLimit;
+    LARGE_INTEGER PerJobUserTimeLimit;
+    DWORD LimitFlags;
+    SIZE_T MinimumWorkingSetSize;
+    SIZE_T MaximumWorkingSetSize;
+    DWORD ActiveProcessLimit;
+    ULONG_PTR Affinity;
+    DWORD PriorityClass;
+    DWORD SchedulingClass;
+} JOBOBJECT_BASIC_LIMIT_INFORMATION, *PJOBOBJECT_BASIC_LIMIT_INFORMATION;
+
+typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION {
+    JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation;
+    IO_COUNTERS IoInfo;
+    SIZE_T ProcessMemoryLimit;
+    SIZE_T JobMemoryLimit;
+    SIZE_T PeakProcessMemoryUsed;
+    SIZE_T PeakJobMemoryUsed;
+} JOBOBJECT_EXTENDED_LIMIT_INFORMATION, *PJOBOBJECT_EXTENDED_LIMIT_INFORMATION;
+
+typedef struct _JOBOBJECT_BASIC_PROCESS_ID_LIST {
+    DWORD NumberOfAssignedProcesses;
+    DWORD NumberOfProcessIdsInList;
+    ULONG_PTR ProcessIdList[1];
+} JOBOBJECT_BASIC_PROCESS_ID_LIST, *PJOBOBJECT_BASIC_PROCESS_ID_LIST;
+
+typedef struct _JOBOBJECT_BASIC_UI_RESTRICTIONS {
+    DWORD UIRestrictionsClass;
+} JOBOBJECT_BASIC_UI_RESTRICTIONS, *PJOBOBJECT_BASIC_UI_RESTRICTIONS;
+
+typedef struct _JOBOBJECT_SECURITY_LIMIT_INFORMATION {
+    DWORD SecurityLimitFlags ;
+    HANDLE JobToken ;
+    PTOKEN_GROUPS SidsToDisable ;
+    PTOKEN_PRIVILEGES PrivilegesToDelete ;
+    PTOKEN_GROUPS RestrictedSids ;
+} JOBOBJECT_SECURITY_LIMIT_INFORMATION, *PJOBOBJECT_SECURITY_LIMIT_INFORMATION ;
+
+typedef struct _JOBOBJECT_END_OF_JOB_TIME_INFORMATION {
+    DWORD EndOfJobTimeAction;
+} JOBOBJECT_END_OF_JOB_TIME_INFORMATION, *PJOBOBJECT_END_OF_JOB_TIME_INFORMATION;
+
+typedef struct _JOBOBJECT_ASSOCIATE_COMPLETION_PORT {
+    PVOID CompletionKey;
+    HANDLE CompletionPort;
+} JOBOBJECT_ASSOCIATE_COMPLETION_PORT, *PJOBOBJECT_ASSOCIATE_COMPLETION_PORT;
+
+typedef struct _JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION {
+    JOBOBJECT_BASIC_ACCOUNTING_INFORMATION BasicInfo;
+    IO_COUNTERS IoInfo;
+} JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION, *PJOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION;
+
+typedef struct _JOBOBJECT_JOBSET_INFORMATION {
+    DWORD MemberLevel;
+} JOBOBJECT_JOBSET_INFORMATION, *PJOBOBJECT_JOBSET_INFORMATION;
+
+#define JOB_OBJECT_TERMINATE_AT_END_OF_JOB  0
+#define JOB_OBJECT_POST_AT_END_OF_JOB       1
+
+//
+// Completion Port Messages for job objects
+//
+// These values are returned via the lpNumberOfBytesTransferred parameter
+//
+
+#define JOB_OBJECT_MSG_END_OF_JOB_TIME          1
+#define JOB_OBJECT_MSG_END_OF_PROCESS_TIME      2
+#define JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT     3
+#define JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO      4
+#define JOB_OBJECT_MSG_NEW_PROCESS              6
+#define JOB_OBJECT_MSG_EXIT_PROCESS             7
+#define JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS    8
+#define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT     9
+#define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT         10
+
+
+//
+// Basic Limits
+//
+#define JOB_OBJECT_LIMIT_WORKINGSET                 0x00000001
+#define JOB_OBJECT_LIMIT_PROCESS_TIME               0x00000002
+#define JOB_OBJECT_LIMIT_JOB_TIME                   0x00000004
+#define JOB_OBJECT_LIMIT_ACTIVE_PROCESS             0x00000008
+#define JOB_OBJECT_LIMIT_AFFINITY                   0x00000010
+#define JOB_OBJECT_LIMIT_PRIORITY_CLASS             0x00000020
+#define JOB_OBJECT_LIMIT_PRESERVE_JOB_TIME          0x00000040
+#define JOB_OBJECT_LIMIT_SCHEDULING_CLASS           0x00000080
+
+//
+// Extended Limits
+//
+#define JOB_OBJECT_LIMIT_PROCESS_MEMORY             0x00000100
+#define JOB_OBJECT_LIMIT_JOB_MEMORY                 0x00000200
+#define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x00000400
+#define JOB_OBJECT_LIMIT_BREAKAWAY_OK               0x00000800
+#define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK        0x00001000
+#define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE          0x00002000
+
+#define JOB_OBJECT_LIMIT_RESERVED2                  0x00004000
+#define JOB_OBJECT_LIMIT_RESERVED3                  0x00008000
+#define JOB_OBJECT_LIMIT_RESERVED4                  0x00010000
+#define JOB_OBJECT_LIMIT_RESERVED5                  0x00020000
+#define JOB_OBJECT_LIMIT_RESERVED6                  0x00040000
+
+
+#define JOB_OBJECT_LIMIT_VALID_FLAGS            0x0007ffff
+
+#define JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS      0x000000ff
+#define JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS   0x00003fff
+#define JOB_OBJECT_RESERVED_LIMIT_VALID_FLAGS   0x0007ffff
+
+//
+// UI restrictions for jobs
+//
+
+#define JOB_OBJECT_UILIMIT_NONE             0x00000000
+
+#define JOB_OBJECT_UILIMIT_HANDLES          0x00000001
+#define JOB_OBJECT_UILIMIT_READCLIPBOARD    0x00000002
+#define JOB_OBJECT_UILIMIT_WRITECLIPBOARD   0x00000004
+#define JOB_OBJECT_UILIMIT_SYSTEMPARAMETERS 0x00000008
+#define JOB_OBJECT_UILIMIT_DISPLAYSETTINGS  0x00000010
+#define JOB_OBJECT_UILIMIT_GLOBALATOMS      0x00000020
+#define JOB_OBJECT_UILIMIT_DESKTOP          0x00000040
+#define JOB_OBJECT_UILIMIT_EXITWINDOWS      0x00000080
+
+#define JOB_OBJECT_UILIMIT_ALL              0x000000FF
+
+#define JOB_OBJECT_UI_VALID_FLAGS           0x000000FF
+
+#define JOB_OBJECT_SECURITY_NO_ADMIN            0x00000001
+#define JOB_OBJECT_SECURITY_RESTRICTED_TOKEN    0x00000002
+#define JOB_OBJECT_SECURITY_ONLY_TOKEN          0x00000004
+#define JOB_OBJECT_SECURITY_FILTER_TOKENS       0x00000008
+
+#define JOB_OBJECT_SECURITY_VALID_FLAGS         0x0000000f
+
+typedef enum _JOBOBJECTINFOCLASS {
+    JobObjectBasicAccountingInformation = 1,
+    JobObjectBasicLimitInformation,
+    JobObjectBasicProcessIdList,
+    JobObjectBasicUIRestrictions,
+    JobObjectSecurityLimitInformation,
+    JobObjectEndOfJobTimeInformation,
+    JobObjectAssociateCompletionPortInformation,
+    JobObjectBasicAndIoAccountingInformation,
+    JobObjectExtendedLimitInformation,
+    JobObjectJobSetInformation,
+    MaxJobObjectInfoClass
+    } JOBOBJECTINFOCLASS;
+//
+#define EVENT_MODIFY_STATE      0x0002  
+#define EVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) 
+#define MUTANT_QUERY_STATE      0x0001
+
+#define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|\
+                          MUTANT_QUERY_STATE)
+#define SEMAPHORE_MODIFY_STATE      0x0002  
+#define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) 
+//
+// Timer Specific Access Rights.
+//
+
+#define TIMER_QUERY_STATE       0x0001
+#define TIMER_MODIFY_STATE      0x0002
+
+#define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|\
+                          TIMER_QUERY_STATE|TIMER_MODIFY_STATE)
+
+
+#define TIME_ZONE_ID_UNKNOWN  0
+#define TIME_ZONE_ID_STANDARD 1
+#define TIME_ZONE_ID_DAYLIGHT 2
+
+typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP {
+    RelationProcessorCore,
+    RelationNumaNode
+} LOGICAL_PROCESSOR_RELATIONSHIP;
+
+#define LTP_PC_SMT 0x1
+
+typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION {
+    ULONG_PTR   ProcessorMask;
+    LOGICAL_PROCESSOR_RELATIONSHIP Relationship;
+    union {
+        struct {
+            BYTE  Flags;
+        } ProcessorCore;
+        struct {
+            DWORD NodeNumber;
+        } NumaNode;
+        ULONGLONG  Reserved[2];
+    };
+} SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION;
+
+
+#define PROCESSOR_INTEL_386     386
+#define PROCESSOR_INTEL_486     486
+#define PROCESSOR_INTEL_PENTIUM 586
+#define PROCESSOR_INTEL_IA64    2200
+#define PROCESSOR_AMD_X8664     8664
+#define PROCESSOR_MIPS_R4000    4000    // incl R4101 & R3910 for Windows CE
+#define PROCESSOR_ALPHA_21064   21064
+#define PROCESSOR_PPC_601       601
+#define PROCESSOR_PPC_603       603
+#define PROCESSOR_PPC_604       604
+#define PROCESSOR_PPC_620       620
+#define PROCESSOR_HITACHI_SH3   10003   // Windows CE
+#define PROCESSOR_HITACHI_SH3E  10004   // Windows CE
+#define PROCESSOR_HITACHI_SH4   10005   // Windows CE
+#define PROCESSOR_MOTOROLA_821  821     // Windows CE
+#define PROCESSOR_SHx_SH3       103     // Windows CE
+#define PROCESSOR_SHx_SH4       104     // Windows CE
+#define PROCESSOR_STRONGARM     2577    // Windows CE - 0xA11
+#define PROCESSOR_ARM720        1824    // Windows CE - 0x720
+#define PROCESSOR_ARM820        2080    // Windows CE - 0x820
+#define PROCESSOR_ARM920        2336    // Windows CE - 0x920
+#define PROCESSOR_ARM_7TDMI     70001   // Windows CE
+#define PROCESSOR_OPTIL         0x494f  // MSIL
+
+#define PROCESSOR_ARCHITECTURE_INTEL            0
+#define PROCESSOR_ARCHITECTURE_MIPS             1
+#define PROCESSOR_ARCHITECTURE_ALPHA            2
+#define PROCESSOR_ARCHITECTURE_PPC              3
+#define PROCESSOR_ARCHITECTURE_SHX              4
+#define PROCESSOR_ARCHITECTURE_ARM              5
+#define PROCESSOR_ARCHITECTURE_IA64             6
+#define PROCESSOR_ARCHITECTURE_ALPHA64          7
+#define PROCESSOR_ARCHITECTURE_MSIL             8
+#define PROCESSOR_ARCHITECTURE_AMD64            9
+#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64    10
+
+#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
+
+#define PF_FLOATING_POINT_PRECISION_ERRATA  0   
+#define PF_FLOATING_POINT_EMULATED          1   
+#define PF_COMPARE_EXCHANGE_DOUBLE          2   
+#define PF_MMX_INSTRUCTIONS_AVAILABLE       3   
+#define PF_PPC_MOVEMEM_64BIT_OK             4   
+#define PF_ALPHA_BYTE_INSTRUCTIONS          5   
+#define PF_XMMI_INSTRUCTIONS_AVAILABLE      6   
+#define PF_3DNOW_INSTRUCTIONS_AVAILABLE     7   
+#define PF_RDTSC_INSTRUCTION_AVAILABLE      8   
+#define PF_PAE_ENABLED                      9   
+#define PF_XMMI64_INSTRUCTIONS_AVAILABLE   10   
+
+typedef struct _MEMORY_BASIC_INFORMATION {
+    PVOID BaseAddress;
+    PVOID AllocationBase;
+    DWORD AllocationProtect;
+    SIZE_T RegionSize;
+    DWORD State;
+    DWORD Protect;
+    DWORD Type;
+} MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION;
+
+typedef struct _MEMORY_BASIC_INFORMATION32 {
+    DWORD BaseAddress;
+    DWORD AllocationBase;
+    DWORD AllocationProtect;
+    DWORD RegionSize;
+    DWORD State;
+    DWORD Protect;
+    DWORD Type;
+} MEMORY_BASIC_INFORMATION32, *PMEMORY_BASIC_INFORMATION32;
+
+typedef struct _MEMORY_BASIC_INFORMATION64 {
+    ULONGLONG BaseAddress;
+    ULONGLONG AllocationBase;
+    DWORD     AllocationProtect;
+    DWORD     __alignment1;
+    ULONGLONG RegionSize;
+    DWORD     State;
+    DWORD     Protect;
+    DWORD     Type;
+    DWORD     __alignment2;
+} MEMORY_BASIC_INFORMATION64, *PMEMORY_BASIC_INFORMATION64;
+
+#define SECTION_QUERY       0x0001
+#define SECTION_MAP_WRITE   0x0002
+#define SECTION_MAP_READ    0x0004
+#define SECTION_MAP_EXECUTE 0x0008
+#define SECTION_EXTEND_SIZE 0x0010
+
+#define SECTION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SECTION_QUERY|\
+                            SECTION_MAP_WRITE |      \
+                            SECTION_MAP_READ |       \
+                            SECTION_MAP_EXECUTE |    \
+                            SECTION_EXTEND_SIZE)
+#define PAGE_NOACCESS          0x01     
+#define PAGE_READONLY          0x02     
+#define PAGE_READWRITE         0x04     
+#define PAGE_WRITECOPY         0x08     
+#define PAGE_EXECUTE           0x10     
+#define PAGE_EXECUTE_READ      0x20     
+#define PAGE_EXECUTE_READWRITE 0x40     
+#define PAGE_EXECUTE_WRITECOPY 0x80     
+#define PAGE_GUARD            0x100     
+#define PAGE_NOCACHE          0x200     
+#define PAGE_WRITECOMBINE     0x400     
+#define MEM_COMMIT           0x1000     
+#define MEM_RESERVE          0x2000     
+#define MEM_DECOMMIT         0x4000     
+#define MEM_RELEASE          0x8000     
+#define MEM_FREE            0x10000     
+#define MEM_PRIVATE         0x20000     
+#define MEM_MAPPED          0x40000     
+#define MEM_RESET           0x80000     
+#define MEM_TOP_DOWN       0x100000     
+#define MEM_WRITE_WATCH    0x200000     
+#define MEM_PHYSICAL       0x400000     
+#define MEM_LARGE_PAGES  0x20000000     
+#define MEM_4MB_PAGES    0x80000000     
+#define SEC_FILE           0x800000     
+#define SEC_IMAGE         0x1000000     
+#define SEC_RESERVE       0x4000000     
+#define SEC_COMMIT        0x8000000     
+#define SEC_NOCACHE      0x10000000     
+#define MEM_IMAGE         SEC_IMAGE     
+#define WRITE_WATCH_FLAG_RESET 0x01     
+
+//
+// Define access rights to files and directories
+//
+
+//
+// The FILE_READ_DATA and FILE_WRITE_DATA constants are also defined in
+// devioctl.h as FILE_READ_ACCESS and FILE_WRITE_ACCESS. The values for these
+// constants *MUST* always be in sync.
+// The values are redefined in devioctl.h because they must be available to
+// both DOS and NT.
+//
+
+#define FILE_READ_DATA            ( 0x0001 )    // file & pipe
+#define FILE_LIST_DIRECTORY       ( 0x0001 )    // directory
+
+#define FILE_WRITE_DATA           ( 0x0002 )    // file & pipe
+#define FILE_ADD_FILE             ( 0x0002 )    // directory
+
+#define FILE_APPEND_DATA          ( 0x0004 )    // file
+#define FILE_ADD_SUBDIRECTORY     ( 0x0004 )    // directory
+#define FILE_CREATE_PIPE_INSTANCE ( 0x0004 )    // named pipe
+
+
+#define FILE_READ_EA              ( 0x0008 )    // file & directory
+
+#define FILE_WRITE_EA             ( 0x0010 )    // file & directory
+
+#define FILE_EXECUTE              ( 0x0020 )    // file
+#define FILE_TRAVERSE             ( 0x0020 )    // directory
+
+#define FILE_DELETE_CHILD         ( 0x0040 )    // directory
+
+#define FILE_READ_ATTRIBUTES      ( 0x0080 )    // all
+
+#define FILE_WRITE_ATTRIBUTES     ( 0x0100 )    // all
+
+#define FILE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF)
+
+#define FILE_GENERIC_READ         (STANDARD_RIGHTS_READ     |\
+                                   FILE_READ_DATA           |\
+                                   FILE_READ_ATTRIBUTES     |\
+                                   FILE_READ_EA             |\
+                                   SYNCHRONIZE)
+
+
+#define FILE_GENERIC_WRITE        (STANDARD_RIGHTS_WRITE    |\
+                                   FILE_WRITE_DATA          |\
+                                   FILE_WRITE_ATTRIBUTES    |\
+                                   FILE_WRITE_EA            |\
+                                   FILE_APPEND_DATA         |\
+                                   SYNCHRONIZE)
+
+
+#define FILE_GENERIC_EXECUTE      (STANDARD_RIGHTS_EXECUTE  |\
+                                   FILE_READ_ATTRIBUTES     |\
+                                   FILE_EXECUTE             |\
+                                   SYNCHRONIZE)
+
+#define FILE_SHARE_READ                 0x00000001  
+#define FILE_SHARE_WRITE                0x00000002  
+#define FILE_SHARE_DELETE               0x00000004  
+#define FILE_ATTRIBUTE_READONLY             0x00000001  
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002  
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004  
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010  
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020  
+#define FILE_ATTRIBUTE_DEVICE               0x00000040  
+#define FILE_ATTRIBUTE_NORMAL               0x00000080  
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100  
+#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200  
+#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400  
+#define FILE_ATTRIBUTE_COMPRESSED           0x00000800  
+#define FILE_ATTRIBUTE_OFFLINE              0x00001000  
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000  
+#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000  
+#define FILE_NOTIFY_CHANGE_FILE_NAME    0x00000001   
+#define FILE_NOTIFY_CHANGE_DIR_NAME     0x00000002   
+#define FILE_NOTIFY_CHANGE_ATTRIBUTES   0x00000004   
+#define FILE_NOTIFY_CHANGE_SIZE         0x00000008   
+#define FILE_NOTIFY_CHANGE_LAST_WRITE   0x00000010   
+#define FILE_NOTIFY_CHANGE_LAST_ACCESS  0x00000020   
+#define FILE_NOTIFY_CHANGE_CREATION     0x00000040   
+#define FILE_NOTIFY_CHANGE_SECURITY     0x00000100   
+#define FILE_ACTION_ADDED                   0x00000001   
+#define FILE_ACTION_REMOVED                 0x00000002   
+#define FILE_ACTION_MODIFIED                0x00000003   
+#define FILE_ACTION_RENAMED_OLD_NAME        0x00000004   
+#define FILE_ACTION_RENAMED_NEW_NAME        0x00000005   
+#define MAILSLOT_NO_MESSAGE             ((DWORD)-1) 
+#define MAILSLOT_WAIT_FOREVER           ((DWORD)-1) 
+#define FILE_CASE_SENSITIVE_SEARCH      0x00000001  
+#define FILE_CASE_PRESERVED_NAMES       0x00000002  
+#define FILE_UNICODE_ON_DISK            0x00000004  
+#define FILE_PERSISTENT_ACLS            0x00000008  
+#define FILE_FILE_COMPRESSION           0x00000010  
+#define FILE_VOLUME_QUOTAS              0x00000020  
+#define FILE_SUPPORTS_SPARSE_FILES      0x00000040  
+#define FILE_SUPPORTS_REPARSE_POINTS    0x00000080  
+#define FILE_SUPPORTS_REMOTE_STORAGE    0x00000100  
+#define FILE_VOLUME_IS_COMPRESSED       0x00008000  
+#define FILE_SUPPORTS_OBJECT_IDS        0x00010000  
+#define FILE_SUPPORTS_ENCRYPTION        0x00020000  
+#define FILE_NAMED_STREAMS              0x00040000  
+#define FILE_READ_ONLY_VOLUME           0x00080000  
+
+//
+// Define the file notification information structure
+//
+
+typedef struct _FILE_NOTIFY_INFORMATION {
+    DWORD NextEntryOffset;
+    DWORD Action;
+    DWORD FileNameLength;
+    WCHAR FileName[1];
+} FILE_NOTIFY_INFORMATION, *PFILE_NOTIFY_INFORMATION;
+
+
+//
+// Define segement buffer structure for scatter/gather read/write.
+//
+
+typedef union _FILE_SEGMENT_ELEMENT {
+    PVOID64 Buffer;
+    ULONGLONG Alignment;
+}FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT;
+
+//
+// The reparse GUID structure is used by all 3rd party layered drivers to
+// store data in a reparse point. For non-Microsoft tags, The GUID field
+// cannot be GUID_NULL.
+// The constraints on reparse tags are defined below.
+// Microsoft tags can also be used with this format of the reparse point buffer.
+//
+
+typedef struct _REPARSE_GUID_DATA_BUFFER {
+    DWORD  ReparseTag;
+    WORD   ReparseDataLength;
+    WORD   Reserved;
+    GUID   ReparseGuid;
+    struct {
+        BYTE   DataBuffer[1];
+    } GenericReparseBuffer;
+} REPARSE_GUID_DATA_BUFFER, *PREPARSE_GUID_DATA_BUFFER;
+
+#define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE   FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer)
+
+
+
+//
+// Maximum allowed size of the reparse data.
+//
+
+#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE      ( 16 * 1024 )
+
+//
+// Predefined reparse tags.
+// These tags need to avoid conflicting with IO_REMOUNT defined in ntos\inc\io.h
+//
+
+#define IO_REPARSE_TAG_RESERVED_ZERO             (0)
+#define IO_REPARSE_TAG_RESERVED_ONE              (1)
+
+//
+// The value of the following constant needs to satisfy the following conditions:
+//  (1) Be at least as large as the largest of the reserved tags.
+//  (2) Be strictly smaller than all the tags in use.
+//
+
+#define IO_REPARSE_TAG_RESERVED_RANGE            IO_REPARSE_TAG_RESERVED_ONE
+
+//
+// The reparse tags are a DWORD. The 32 bits are laid out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +-+-+-+-+-----------------------+-------------------------------+
+//  |M|R|N|R|     Reserved bits     |       Reparse Tag Value       |
+//  +-+-+-+-+-----------------------+-------------------------------+
+//
+// M is the Microsoft bit. When set to 1, it denotes a tag owned by Microsoft.
+//   All ISVs must use a tag with a 0 in this position.
+//   Note: If a Microsoft tag is used by non-Microsoft software, the
+//   behavior is not defined.
+//
+// R is reserved.  Must be zero for non-Microsoft tags.
+//
+// N is name surrogate. When set to 1, the file represents another named
+//   entity in the system.
+//
+// The M and N bits are OR-able.
+// The following macros check for the M and N bit values:
+//
+
+//
+// Macro to determine whether a reparse point tag corresponds to a tag
+// owned by Microsoft.
+//
+
+#define IsReparseTagMicrosoft(_tag) (              \
+                           ((_tag) & 0x80000000)   \
+                           )
+
+//
+// Macro to determine whether a reparse point tag is a name surrogate
+//
+
+#define IsReparseTagNameSurrogate(_tag) (          \
+                           ((_tag) & 0x20000000)   \
+                           )
+
+#define IO_REPARSE_TAG_MOUNT_POINT              (0xA0000003L)       
+#define IO_REPARSE_TAG_HSM                      (0xC0000004L)       
+#define IO_REPARSE_TAG_SIS                      (0x80000007L)       
+#define IO_REPARSE_TAG_DFS                      (0x8000000AL)       
+#define IO_REPARSE_TAG_FILTER_MANAGER           (0x8000000BL)       
+#define IO_COMPLETION_MODIFY_STATE  0x0002  
+#define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) 
+#define DUPLICATE_CLOSE_SOURCE      0x00000001  
+#define DUPLICATE_SAME_ACCESS       0x00000002  
+
+typedef enum _SYSTEM_POWER_STATE {
+    PowerSystemUnspecified = 0,
+    PowerSystemWorking     = 1,
+    PowerSystemSleeping1   = 2,
+    PowerSystemSleeping2   = 3,
+    PowerSystemSleeping3   = 4,
+    PowerSystemHibernate   = 5,
+    PowerSystemShutdown    = 6,
+    PowerSystemMaximum     = 7
+} SYSTEM_POWER_STATE, *PSYSTEM_POWER_STATE;
+
+#define POWER_SYSTEM_MAXIMUM 7
+
+typedef enum {
+    PowerActionNone = 0,
+    PowerActionReserved,
+    PowerActionSleep,
+    PowerActionHibernate,
+    PowerActionShutdown,
+    PowerActionShutdownReset,
+    PowerActionShutdownOff,
+    PowerActionWarmEject
+} POWER_ACTION, *PPOWER_ACTION;
+
+typedef enum _DEVICE_POWER_STATE {
+    PowerDeviceUnspecified = 0,
+    PowerDeviceD0,
+    PowerDeviceD1,
+    PowerDeviceD2,
+    PowerDeviceD3,
+    PowerDeviceMaximum
+} DEVICE_POWER_STATE, *PDEVICE_POWER_STATE;
+
+
+#define ES_SYSTEM_REQUIRED  ((DWORD)0x00000001)
+#define ES_DISPLAY_REQUIRED ((DWORD)0x00000002)
+#define ES_USER_PRESENT     ((DWORD)0x00000004)
+#define ES_CONTINUOUS       ((DWORD)0x80000000)
+
+typedef DWORD EXECUTION_STATE;
+
+typedef enum {
+    LT_DONT_CARE,
+    LT_LOWEST_LATENCY
+} LATENCY_TIME;
+
+// end_ntminiport end_ntifs end_wdm end_ntddk
+//-----------------------------------------------------------------------------
+// Device Power Information
+// Accessable via CM_Get_DevInst_Registry_Property_Ex(CM_DRP_DEVICE_POWER_DATA)
+//-----------------------------------------------------------------------------
+
+#define PDCAP_D0_SUPPORTED              0x00000001
+#define PDCAP_D1_SUPPORTED              0x00000002
+#define PDCAP_D2_SUPPORTED              0x00000004
+#define PDCAP_D3_SUPPORTED              0x00000008
+#define PDCAP_WAKE_FROM_D0_SUPPORTED    0x00000010
+#define PDCAP_WAKE_FROM_D1_SUPPORTED    0x00000020
+#define PDCAP_WAKE_FROM_D2_SUPPORTED    0x00000040
+#define PDCAP_WAKE_FROM_D3_SUPPORTED    0x00000080
+#define PDCAP_WARM_EJECT_SUPPORTED      0x00000100
+
+typedef struct CM_Power_Data_s {
+    DWORD               PD_Size;
+    DEVICE_POWER_STATE  PD_MostRecentPowerState;
+    DWORD               PD_Capabilities;
+    DWORD               PD_D1Latency;
+    DWORD               PD_D2Latency;
+    DWORD               PD_D3Latency;
+    DEVICE_POWER_STATE  PD_PowerStateMapping[POWER_SYSTEM_MAXIMUM];
+    SYSTEM_POWER_STATE  PD_DeepestSystemWake;
+} CM_POWER_DATA, *PCM_POWER_DATA;
+
+// begin_ntddk
+
+typedef enum {
+    SystemPowerPolicyAc,
+    SystemPowerPolicyDc,
+    VerifySystemPolicyAc,
+    VerifySystemPolicyDc,
+    SystemPowerCapabilities,
+    SystemBatteryState,
+    SystemPowerStateHandler,
+    ProcessorStateHandler,
+    SystemPowerPolicyCurrent,
+    AdministratorPowerPolicy,
+    SystemReserveHiberFile,
+    ProcessorInformation,
+    SystemPowerInformation,
+    ProcessorStateHandler2,
+    LastWakeTime,                                   // Compare with KeQueryInterruptTime()
+    LastSleepTime,                                  // Compare with KeQueryInterruptTime()
+    SystemExecutionState,
+    SystemPowerStateNotifyHandler,
+    ProcessorPowerPolicyAc,
+    ProcessorPowerPolicyDc,
+    VerifyProcessorPowerPolicyAc,
+    VerifyProcessorPowerPolicyDc,
+    ProcessorPowerPolicyCurrent,
+    SystemPowerStateLogging,
+    SystemPowerLoggingEntry
+} POWER_INFORMATION_LEVEL;
+
+// begin_wdm
+
+//
+// System power manager capabilities
+//
+
+typedef struct {
+    DWORD       Granularity;
+    DWORD       Capacity;
+} BATTERY_REPORTING_SCALE, *PBATTERY_REPORTING_SCALE;
+
+//
+
+// Power Policy Management interfaces
+//
+
+typedef struct {
+    POWER_ACTION    Action;
+    DWORD           Flags;
+    DWORD           EventCode;
+} POWER_ACTION_POLICY, *PPOWER_ACTION_POLICY;
+
+// POWER_ACTION_POLICY->Flags:
+#define POWER_ACTION_QUERY_ALLOWED      0x00000001
+#define POWER_ACTION_UI_ALLOWED         0x00000002
+#define POWER_ACTION_OVERRIDE_APPS      0x00000004
+#define POWER_ACTION_LIGHTEST_FIRST     0x10000000
+#define POWER_ACTION_LOCK_CONSOLE       0x20000000
+#define POWER_ACTION_DISABLE_WAKES      0x40000000
+#define POWER_ACTION_CRITICAL           0x80000000
+
+// POWER_ACTION_POLICY->EventCode flags
+#define POWER_LEVEL_USER_NOTIFY_TEXT    0x00000001
+#define POWER_LEVEL_USER_NOTIFY_SOUND   0x00000002
+#define POWER_LEVEL_USER_NOTIFY_EXEC    0x00000004
+#define POWER_USER_NOTIFY_BUTTON        0x00000008
+#define POWER_USER_NOTIFY_SHUTDOWN      0x00000010
+#define POWER_FORCE_TRIGGER_RESET       0x80000000
+
+// system battery drain policies
+typedef struct {
+    BOOLEAN                 Enable;
+    BYTE                    Spare[3];
+    DWORD                   BatteryLevel;
+    POWER_ACTION_POLICY     PowerPolicy;
+    SYSTEM_POWER_STATE      MinSystemState;
+} SYSTEM_POWER_LEVEL, *PSYSTEM_POWER_LEVEL;
+
+// Discharge policy constants
+#define NUM_DISCHARGE_POLICIES      4
+#define DISCHARGE_POLICY_CRITICAL   0
+#define DISCHARGE_POLICY_LOW        1
+
+//
+// Throttling policies
+//
+#define PO_THROTTLE_NONE            0
+#define PO_THROTTLE_CONSTANT        1
+#define PO_THROTTLE_DEGRADE         2
+#define PO_THROTTLE_ADAPTIVE        3
+#define PO_THROTTLE_MAXIMUM         4   // not a policy, just a limit
+
+// system power policies
+typedef struct _SYSTEM_POWER_POLICY {
+    DWORD                   Revision;       // 1
+
+    // events
+    POWER_ACTION_POLICY     PowerButton;
+    POWER_ACTION_POLICY     SleepButton;
+    POWER_ACTION_POLICY     LidClose;
+    SYSTEM_POWER_STATE      LidOpenWake;
+    DWORD                   Reserved;
+
+    // "system idle" detection
+    POWER_ACTION_POLICY     Idle;
+    DWORD                   IdleTimeout;
+    BYTE                    IdleSensitivity;
+
+    // dynamic throttling policy
+    //      PO_THROTTLE_NONE, PO_THROTTLE_CONSTANT, PO_THROTTLE_DEGRADE, or PO_THROTTLE_ADAPTIVE
+    BYTE                    DynamicThrottle;
+
+    BYTE                    Spare2[2];
+
+    // meaning of power action "sleep"
+    SYSTEM_POWER_STATE      MinSleep;
+    SYSTEM_POWER_STATE      MaxSleep;
+    SYSTEM_POWER_STATE      ReducedLatencySleep;
+    DWORD                   WinLogonFlags;
+
+    // parameters for dozing
+    DWORD                   Spare3;
+    DWORD                   DozeS4Timeout;
+
+    // battery policies
+    DWORD                   BroadcastCapacityResolution;
+    SYSTEM_POWER_LEVEL      DischargePolicy[NUM_DISCHARGE_POLICIES];
+
+    // video policies
+    DWORD                   VideoTimeout;
+    BOOLEAN                 VideoDimDisplay;
+    DWORD                   VideoReserved[3];
+
+    // hard disk policies
+    DWORD                   SpindownTimeout;
+
+    // processor policies
+    BOOLEAN                 OptimizeForPower;
+    BYTE                    FanThrottleTolerance;
+    BYTE                    ForcedThrottle;
+    BYTE                    MinThrottle;
+    POWER_ACTION_POLICY     OverThrottled;
+
+} SYSTEM_POWER_POLICY, *PSYSTEM_POWER_POLICY;
+
+// processor power policy state
+typedef struct _PROCESSOR_POWER_POLICY_INFO {
+
+    // Time based information (will be converted to kernel units)
+    DWORD                   TimeCheck;                      // in US
+    DWORD                   DemoteLimit;                    // in US
+    DWORD                   PromoteLimit;                   // in US
+
+    // Percentage based information
+    BYTE                    DemotePercent;
+    BYTE                    PromotePercent;
+    BYTE                    Spare[2];
+
+    // Flags
+    DWORD                   AllowDemotion:1;
+    DWORD                   AllowPromotion:1;
+    DWORD                   Reserved:30;
+
+} PROCESSOR_POWER_POLICY_INFO, *PPROCESSOR_POWER_POLICY_INFO;
+
+// processor power policy
+typedef struct _PROCESSOR_POWER_POLICY {
+    DWORD                       Revision;       // 1
+
+    // Dynamic Throttling Policy
+    BYTE                        DynamicThrottle;
+    BYTE                        Spare[3];
+
+    // Flags
+    DWORD                       DisableCStates:1;
+    DWORD                       Reserved:31;
+
+    // System policy information
+    // The Array is last, in case it needs to be grown and the structure
+    // revision incremented.
+    DWORD                       PolicyCount;
+    PROCESSOR_POWER_POLICY_INFO Policy[3];
+
+} PROCESSOR_POWER_POLICY, *PPROCESSOR_POWER_POLICY;
+
+// administrator power policy overrides
+typedef struct _ADMINISTRATOR_POWER_POLICY {
+
+    // meaning of power action "sleep"
+    SYSTEM_POWER_STATE      MinSleep;
+    SYSTEM_POWER_STATE      MaxSleep;
+
+    // video policies
+    DWORD                   MinVideoTimeout;
+    DWORD                   MaxVideoTimeout;
+
+    // disk policies
+    DWORD                   MinSpindownTimeout;
+    DWORD                   MaxSpindownTimeout;
+} ADMINISTRATOR_POWER_POLICY, *PADMINISTRATOR_POWER_POLICY;
+
+
+typedef struct {
+    // Misc supported system features
+    BOOLEAN             PowerButtonPresent;
+    BOOLEAN             SleepButtonPresent;
+    BOOLEAN             LidPresent;
+    BOOLEAN             SystemS1;
+    BOOLEAN             SystemS2;
+    BOOLEAN             SystemS3;
+    BOOLEAN             SystemS4;           // hibernate
+    BOOLEAN             SystemS5;           // off
+    BOOLEAN             HiberFilePresent;
+    BOOLEAN             FullWake;
+    BOOLEAN             VideoDimPresent;
+    BOOLEAN             ApmPresent;
+    BOOLEAN             UpsPresent;
+
+    // Processors
+    BOOLEAN             ThermalControl;
+    BOOLEAN             ProcessorThrottle;
+    BYTE                ProcessorMinThrottle;
+    BYTE                ProcessorMaxThrottle;
+    BYTE                spare2[4];
+
+    // Disk
+    BOOLEAN             DiskSpinDown;
+    BYTE                spare3[8];
+
+    // System Battery
+    BOOLEAN             SystemBatteriesPresent;
+    BOOLEAN             BatteriesAreShortTerm;
+    BATTERY_REPORTING_SCALE BatteryScale[3];
+
+    // Wake
+    SYSTEM_POWER_STATE  AcOnLineWake;
+    SYSTEM_POWER_STATE  SoftLidWake;
+    SYSTEM_POWER_STATE  RtcWake;
+    SYSTEM_POWER_STATE  MinDeviceWakeState; // note this may change on driver load
+    SYSTEM_POWER_STATE  DefaultLowLatencyWake;
+} SYSTEM_POWER_CAPABILITIES, *PSYSTEM_POWER_CAPABILITIES;
+
+typedef struct {
+    BOOLEAN             AcOnLine;
+    BOOLEAN             BatteryPresent;
+    BOOLEAN             Charging;
+    BOOLEAN             Discharging;
+    BOOLEAN             Spare1[4];
+
+    DWORD               MaxCapacity;
+    DWORD               RemainingCapacity;
+    DWORD               Rate;
+    DWORD               EstimatedTime;
+
+    DWORD               DefaultAlert1;
+    DWORD               DefaultAlert2;
+} SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE;
+
+
+
+//
+// Image Format
+//
+
+
+#ifndef _MAC
+
+#include "pshpack4.h"                   // 4 byte packing is the default
+
+#define IMAGE_DOS_SIGNATURE                 0x5A4D      // MZ
+#define IMAGE_OS2_SIGNATURE                 0x454E      // NE
+#define IMAGE_OS2_SIGNATURE_LE              0x454C      // LE
+#define IMAGE_VXD_SIGNATURE                 0x454C      // LE
+#define IMAGE_NT_SIGNATURE                  0x00004550  // PE00
+
+#include "pshpack2.h"                   // 16 bit headers are 2 byte packed
+
+#else
+
+#include "pshpack1.h"
+
+#define IMAGE_DOS_SIGNATURE                 0x4D5A      // MZ
+#define IMAGE_OS2_SIGNATURE                 0x4E45      // NE
+#define IMAGE_OS2_SIGNATURE_LE              0x4C45      // LE
+#define IMAGE_NT_SIGNATURE                  0x50450000  // PE00
+#endif
+
+typedef struct _IMAGE_DOS_HEADER {      // DOS .EXE header
+    WORD   e_magic;                     // Magic number
+    WORD   e_cblp;                      // Bytes on last page of file
+    WORD   e_cp;                        // Pages in file
+    WORD   e_crlc;                      // Relocations
+    WORD   e_cparhdr;                   // Size of header in paragraphs
+    WORD   e_minalloc;                  // Minimum extra paragraphs needed
+    WORD   e_maxalloc;                  // Maximum extra paragraphs needed
+    WORD   e_ss;                        // Initial (relative) SS value
+    WORD   e_sp;                        // Initial SP value
+    WORD   e_csum;                      // Checksum
+    WORD   e_ip;                        // Initial IP value
+    WORD   e_cs;                        // Initial (relative) CS value
+    WORD   e_lfarlc;                    // File address of relocation table
+    WORD   e_ovno;                      // Overlay number
+    WORD   e_res[4];                    // Reserved words
+    WORD   e_oemid;                     // OEM identifier (for e_oeminfo)
+    WORD   e_oeminfo;                   // OEM information; e_oemid specific
+    WORD   e_res2[10];                  // Reserved words
+    LONG   e_lfanew;                    // File address of new exe header
+  } IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER;
+
+typedef struct _IMAGE_OS2_HEADER {      // OS/2 .EXE header
+    WORD   ne_magic;                    // Magic number
+    CHAR   ne_ver;                      // Version number
+    CHAR   ne_rev;                      // Revision number
+    WORD   ne_enttab;                   // Offset of Entry Table
+    WORD   ne_cbenttab;                 // Number of bytes in Entry Table
+    LONG   ne_crc;                      // Checksum of whole file
+    WORD   ne_flags;                    // Flag word
+    WORD   ne_autodata;                 // Automatic data segment number
+    WORD   ne_heap;                     // Initial heap allocation
+    WORD   ne_stack;                    // Initial stack allocation
+    LONG   ne_csip;                     // Initial CS:IP setting
+    LONG   ne_sssp;                     // Initial SS:SP setting
+    WORD   ne_cseg;                     // Count of file segments
+    WORD   ne_cmod;                     // Entries in Module Reference Table
+    WORD   ne_cbnrestab;                // Size of non-resident name table
+    WORD   ne_segtab;                   // Offset of Segment Table
+    WORD   ne_rsrctab;                  // Offset of Resource Table
+    WORD   ne_restab;                   // Offset of resident name table
+    WORD   ne_modtab;                   // Offset of Module Reference Table
+    WORD   ne_imptab;                   // Offset of Imported Names Table
+    LONG   ne_nrestab;                  // Offset of Non-resident Names Table
+    WORD   ne_cmovent;                  // Count of movable entries
+    WORD   ne_align;                    // Segment alignment shift count
+    WORD   ne_cres;                     // Count of resource segments
+    BYTE   ne_exetyp;                   // Target Operating system
+    BYTE   ne_flagsothers;              // Other .EXE flags
+    WORD   ne_pretthunks;               // offset to return thunks
+    WORD   ne_psegrefbytes;             // offset to segment ref. bytes
+    WORD   ne_swaparea;                 // Minimum code swap area size
+    WORD   ne_expver;                   // Expected Windows version number
+  } IMAGE_OS2_HEADER, *PIMAGE_OS2_HEADER;
+
+typedef struct _IMAGE_VXD_HEADER {      // Windows VXD header
+    WORD   e32_magic;                   // Magic number
+    BYTE   e32_border;                  // The byte ordering for the VXD
+    BYTE   e32_worder;                  // The word ordering for the VXD
+    DWORD  e32_level;                   // The EXE format level for now = 0
+    WORD   e32_cpu;                     // The CPU type
+    WORD   e32_os;                      // The OS type
+    DWORD  e32_ver;                     // Module version
+    DWORD  e32_mflags;                  // Module flags
+    DWORD  e32_mpages;                  // Module # pages
+    DWORD  e32_startobj;                // Object # for instruction pointer
+    DWORD  e32_eip;                     // Extended instruction pointer
+    DWORD  e32_stackobj;                // Object # for stack pointer
+    DWORD  e32_esp;                     // Extended stack pointer
+    DWORD  e32_pagesize;                // VXD page size
+    DWORD  e32_lastpagesize;            // Last page size in VXD
+    DWORD  e32_fixupsize;               // Fixup section size
+    DWORD  e32_fixupsum;                // Fixup section checksum
+    DWORD  e32_ldrsize;                 // Loader section size
+    DWORD  e32_ldrsum;                  // Loader section checksum
+    DWORD  e32_objtab;                  // Object table offset
+    DWORD  e32_objcnt;                  // Number of objects in module
+    DWORD  e32_objmap;                  // Object page map offset
+    DWORD  e32_itermap;                 // Object iterated data map offset
+    DWORD  e32_rsrctab;                 // Offset of Resource Table
+    DWORD  e32_rsrccnt;                 // Number of resource entries
+    DWORD  e32_restab;                  // Offset of resident name table
+    DWORD  e32_enttab;                  // Offset of Entry Table
+    DWORD  e32_dirtab;                  // Offset of Module Directive Table
+    DWORD  e32_dircnt;                  // Number of module directives
+    DWORD  e32_fpagetab;                // Offset of Fixup Page Table
+    DWORD  e32_frectab;                 // Offset of Fixup Record Table
+    DWORD  e32_impmod;                  // Offset of Import Module Name Table
+    DWORD  e32_impmodcnt;               // Number of entries in Import Module Name Table
+    DWORD  e32_impproc;                 // Offset of Import Procedure Name Table
+    DWORD  e32_pagesum;                 // Offset of Per-Page Checksum Table
+    DWORD  e32_datapage;                // Offset of Enumerated Data Pages
+    DWORD  e32_preload;                 // Number of preload pages
+    DWORD  e32_nrestab;                 // Offset of Non-resident Names Table
+    DWORD  e32_cbnrestab;               // Size of Non-resident Name Table
+    DWORD  e32_nressum;                 // Non-resident Name Table Checksum
+    DWORD  e32_autodata;                // Object # for automatic data object
+    DWORD  e32_debuginfo;               // Offset of the debugging information
+    DWORD  e32_debuglen;                // The length of the debugging info. in bytes
+    DWORD  e32_instpreload;             // Number of instance pages in preload section of VXD file
+    DWORD  e32_instdemand;              // Number of instance pages in demand load section of VXD file
+    DWORD  e32_heapsize;                // Size of heap - for 16-bit apps
+    BYTE   e32_res3[12];                // Reserved words
+    DWORD  e32_winresoff;
+    DWORD  e32_winreslen;
+    WORD   e32_devid;                   // Device ID for VxD
+    WORD   e32_ddkver;                  // DDK version for VxD
+  } IMAGE_VXD_HEADER, *PIMAGE_VXD_HEADER;
+
+#ifndef _MAC
+#include "poppack.h"                    // Back to 4 byte packing
+#endif
+
+//
+// File header format.
+//
+
+typedef struct _IMAGE_FILE_HEADER {
+    WORD    Machine;
+    WORD    NumberOfSections;
+    DWORD   TimeDateStamp;
+    DWORD   PointerToSymbolTable;
+    DWORD   NumberOfSymbols;
+    WORD    SizeOfOptionalHeader;
+    WORD    Characteristics;
+} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
+
+#define IMAGE_SIZEOF_FILE_HEADER             20
+
+
+#define IMAGE_FILE_RELOCS_STRIPPED           0x0001  // Relocation info stripped from file.
+#define IMAGE_FILE_EXECUTABLE_IMAGE          0x0002  // File is executable  (i.e. no unresolved externel references).
+#define IMAGE_FILE_LINE_NUMS_STRIPPED        0x0004  // Line nunbers stripped from file.
+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED       0x0008  // Local symbols stripped from file.
+#define IMAGE_FILE_AGGRESIVE_WS_TRIM         0x0010  // Agressively trim working set
+#define IMAGE_FILE_LARGE_ADDRESS_AWARE       0x0020  // App can handle >2gb addresses
+#define IMAGE_FILE_BYTES_REVERSED_LO         0x0080  // Bytes of machine word are reversed.
+#define IMAGE_FILE_32BIT_MACHINE             0x0100  // 32 bit word machine.
+#define IMAGE_FILE_DEBUG_STRIPPED            0x0200  // Debugging info stripped from file in .DBG file
+#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   0x0400  // If Image is on removable media, copy and run from the swap file.
+#define IMAGE_FILE_NET_RUN_FROM_SWAP         0x0800  // If Image is on Net, copy and run from the swap file.
+#define IMAGE_FILE_SYSTEM                    0x1000  // System File.
+#define IMAGE_FILE_DLL                       0x2000  // File is a DLL.
+#define IMAGE_FILE_UP_SYSTEM_ONLY            0x4000  // File should only be run on a UP machine
+#define IMAGE_FILE_BYTES_REVERSED_HI         0x8000  // Bytes of machine word are reversed.
+
+#define IMAGE_FILE_MACHINE_UNKNOWN           0
+#define IMAGE_FILE_MACHINE_I386              0x014c  // Intel 386.
+#define IMAGE_FILE_MACHINE_R3000             0x0162  // MIPS little-endian, 0x160 big-endian
+#define IMAGE_FILE_MACHINE_R4000             0x0166  // MIPS little-endian
+#define IMAGE_FILE_MACHINE_R10000            0x0168  // MIPS little-endian
+#define IMAGE_FILE_MACHINE_WCEMIPSV2         0x0169  // MIPS little-endian WCE v2
+#define IMAGE_FILE_MACHINE_ALPHA             0x0184  // Alpha_AXP
+#define IMAGE_FILE_MACHINE_SH3               0x01a2  // SH3 little-endian
+#define IMAGE_FILE_MACHINE_SH3DSP            0x01a3
+#define IMAGE_FILE_MACHINE_SH3E              0x01a4  // SH3E little-endian
+#define IMAGE_FILE_MACHINE_SH4               0x01a6  // SH4 little-endian
+#define IMAGE_FILE_MACHINE_SH5               0x01a8  // SH5
+#define IMAGE_FILE_MACHINE_ARM               0x01c0  // ARM Little-Endian
+#define IMAGE_FILE_MACHINE_THUMB             0x01c2
+#define IMAGE_FILE_MACHINE_AM33              0x01d3
+#define IMAGE_FILE_MACHINE_POWERPC           0x01F0  // IBM PowerPC Little-Endian
+#define IMAGE_FILE_MACHINE_POWERPCFP         0x01f1
+#define IMAGE_FILE_MACHINE_IA64              0x0200  // Intel 64
+#define IMAGE_FILE_MACHINE_MIPS16            0x0266  // MIPS
+#define IMAGE_FILE_MACHINE_ALPHA64           0x0284  // ALPHA64
+#define IMAGE_FILE_MACHINE_MIPSFPU           0x0366  // MIPS
+#define IMAGE_FILE_MACHINE_MIPSFPU16         0x0466  // MIPS
+#define IMAGE_FILE_MACHINE_AXP64             IMAGE_FILE_MACHINE_ALPHA64
+#define IMAGE_FILE_MACHINE_TRICORE           0x0520  // Infineon
+#define IMAGE_FILE_MACHINE_CEF               0x0CEF
+#define IMAGE_FILE_MACHINE_EBC               0x0EBC  // EFI Byte Code
+#define IMAGE_FILE_MACHINE_AMD64             0x8664  // AMD64 (K8)
+#define IMAGE_FILE_MACHINE_M32R              0x9041  // M32R little-endian
+#define IMAGE_FILE_MACHINE_CEE               0xC0EE
+
+//
+// Directory format.
+//
+
+typedef struct _IMAGE_DATA_DIRECTORY {
+    DWORD   VirtualAddress;
+    DWORD   Size;
+} IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY;
+
+#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES    16
+
+//
+// Optional header format.
+//
+
+typedef struct _IMAGE_OPTIONAL_HEADER {
+    //
+    // Standard fields.
+    //
+
+    WORD    Magic;
+    BYTE    MajorLinkerVersion;
+    BYTE    MinorLinkerVersion;
+    DWORD   SizeOfCode;
+    DWORD   SizeOfInitializedData;
+    DWORD   SizeOfUninitializedData;
+    DWORD   AddressOfEntryPoint;
+    DWORD   BaseOfCode;
+    DWORD   BaseOfData;
+
+    //
+    // NT additional fields.
+    //
+
+    DWORD   ImageBase;
+    DWORD   SectionAlignment;
+    DWORD   FileAlignment;
+    WORD    MajorOperatingSystemVersion;
+    WORD    MinorOperatingSystemVersion;
+    WORD    MajorImageVersion;
+    WORD    MinorImageVersion;
+    WORD    MajorSubsystemVersion;
+    WORD    MinorSubsystemVersion;
+    DWORD   Win32VersionValue;
+    DWORD   SizeOfImage;
+    DWORD   SizeOfHeaders;
+    DWORD   CheckSum;
+    WORD    Subsystem;
+    WORD    DllCharacteristics;
+    DWORD   SizeOfStackReserve;
+    DWORD   SizeOfStackCommit;
+    DWORD   SizeOfHeapReserve;
+    DWORD   SizeOfHeapCommit;
+    DWORD   LoaderFlags;
+    DWORD   NumberOfRvaAndSizes;
+    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32;
+
+typedef struct _IMAGE_ROM_OPTIONAL_HEADER {
+    WORD   Magic;
+    BYTE   MajorLinkerVersion;
+    BYTE   MinorLinkerVersion;
+    DWORD  SizeOfCode;
+    DWORD  SizeOfInitializedData;
+    DWORD  SizeOfUninitializedData;
+    DWORD  AddressOfEntryPoint;
+    DWORD  BaseOfCode;
+    DWORD  BaseOfData;
+    DWORD  BaseOfBss;
+    DWORD  GprMask;
+    DWORD  CprMask[4];
+    DWORD  GpValue;
+} IMAGE_ROM_OPTIONAL_HEADER, *PIMAGE_ROM_OPTIONAL_HEADER;
+
+typedef struct _IMAGE_OPTIONAL_HEADER64 {
+    WORD        Magic;
+    BYTE        MajorLinkerVersion;
+    BYTE        MinorLinkerVersion;
+    DWORD       SizeOfCode;
+    DWORD       SizeOfInitializedData;
+    DWORD       SizeOfUninitializedData;
+    DWORD       AddressOfEntryPoint;
+    DWORD       BaseOfCode;
+    ULONGLONG   ImageBase;
+    DWORD       SectionAlignment;
+    DWORD       FileAlignment;
+    WORD        MajorOperatingSystemVersion;
+    WORD        MinorOperatingSystemVersion;
+    WORD        MajorImageVersion;
+    WORD        MinorImageVersion;
+    WORD        MajorSubsystemVersion;
+    WORD        MinorSubsystemVersion;
+    DWORD       Win32VersionValue;
+    DWORD       SizeOfImage;
+    DWORD       SizeOfHeaders;
+    DWORD       CheckSum;
+    WORD        Subsystem;
+    WORD        DllCharacteristics;
+    ULONGLONG   SizeOfStackReserve;
+    ULONGLONG   SizeOfStackCommit;
+    ULONGLONG   SizeOfHeapReserve;
+    ULONGLONG   SizeOfHeapCommit;
+    DWORD       LoaderFlags;
+    DWORD       NumberOfRvaAndSizes;
+    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+} IMAGE_OPTIONAL_HEADER64, *PIMAGE_OPTIONAL_HEADER64;
+
+#define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER      56
+#define IMAGE_SIZEOF_STD_OPTIONAL_HEADER      28
+#define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER    224
+#define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER    240
+
+#define IMAGE_NT_OPTIONAL_HDR32_MAGIC      0x10b
+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC      0x20b
+#define IMAGE_ROM_OPTIONAL_HDR_MAGIC       0x107
+
+#ifdef _WIN64
+typedef IMAGE_OPTIONAL_HEADER64             IMAGE_OPTIONAL_HEADER;
+typedef PIMAGE_OPTIONAL_HEADER64            PIMAGE_OPTIONAL_HEADER;
+#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER     IMAGE_SIZEOF_NT_OPTIONAL64_HEADER
+#define IMAGE_NT_OPTIONAL_HDR_MAGIC         IMAGE_NT_OPTIONAL_HDR64_MAGIC
+#else
+typedef IMAGE_OPTIONAL_HEADER32             IMAGE_OPTIONAL_HEADER;
+typedef PIMAGE_OPTIONAL_HEADER32            PIMAGE_OPTIONAL_HEADER;
+#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER     IMAGE_SIZEOF_NT_OPTIONAL32_HEADER
+#define IMAGE_NT_OPTIONAL_HDR_MAGIC         IMAGE_NT_OPTIONAL_HDR32_MAGIC
+#endif
+
+typedef struct _IMAGE_NT_HEADERS64 {
+    DWORD Signature;
+    IMAGE_FILE_HEADER FileHeader;
+    IMAGE_OPTIONAL_HEADER64 OptionalHeader;
+} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64;
+
+typedef struct _IMAGE_NT_HEADERS {
+    DWORD Signature;
+    IMAGE_FILE_HEADER FileHeader;
+    IMAGE_OPTIONAL_HEADER32 OptionalHeader;
+} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32;
+
+typedef struct _IMAGE_ROM_HEADERS {
+    IMAGE_FILE_HEADER FileHeader;
+    IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;
+} IMAGE_ROM_HEADERS, *PIMAGE_ROM_HEADERS;
+
+#ifdef _WIN64
+typedef IMAGE_NT_HEADERS64                  IMAGE_NT_HEADERS;
+typedef PIMAGE_NT_HEADERS64                 PIMAGE_NT_HEADERS;
+#else
+typedef IMAGE_NT_HEADERS32                  IMAGE_NT_HEADERS;
+typedef PIMAGE_NT_HEADERS32                 PIMAGE_NT_HEADERS;
+#endif
+
+// IMAGE_FIRST_SECTION doesn't need 32/64 versions since the file header is the same either way.
+
+#define IMAGE_FIRST_SECTION( ntheader ) ((PIMAGE_SECTION_HEADER)        \
+    ((ULONG_PTR)ntheader +                                              \
+     FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) +                 \
+     ((PIMAGE_NT_HEADERS)(ntheader))->FileHeader.SizeOfOptionalHeader   \
+    ))
+
+// Subsystem Values
+
+#define IMAGE_SUBSYSTEM_UNKNOWN              0   // Unknown subsystem.
+#define IMAGE_SUBSYSTEM_NATIVE               1   // Image doesn't require a subsystem.
+#define IMAGE_SUBSYSTEM_WINDOWS_GUI          2   // Image runs in the Windows GUI subsystem.
+#define IMAGE_SUBSYSTEM_WINDOWS_CUI          3   // Image runs in the Windows character subsystem.
+#define IMAGE_SUBSYSTEM_OS2_CUI              5   // image runs in the OS/2 character subsystem.
+#define IMAGE_SUBSYSTEM_POSIX_CUI            7   // image runs in the Posix character subsystem.
+#define IMAGE_SUBSYSTEM_NATIVE_WINDOWS       8   // image is a native Win9x driver.
+#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI       9   // Image runs in the Windows CE subsystem.
+#define IMAGE_SUBSYSTEM_EFI_APPLICATION      10  //
+#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER  11   //
+#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER   12  //
+#define IMAGE_SUBSYSTEM_EFI_ROM              13
+#define IMAGE_SUBSYSTEM_XBOX                 14
+
+// DllCharacteristics Entries
+
+//      IMAGE_LIBRARY_PROCESS_INIT           0x0001     // Reserved.
+//      IMAGE_LIBRARY_PROCESS_TERM           0x0002     // Reserved.
+//      IMAGE_LIBRARY_THREAD_INIT            0x0004     // Reserved.
+//      IMAGE_LIBRARY_THREAD_TERM            0x0008     // Reserved.
+#define IMAGE_DLLCHARACTERISTICS_NO_SEH      0x0400     // Image does not use SEH.  No SE handler may reside in this image
+#define IMAGE_DLLCHARACTERISTICS_NO_BIND     0x0800     // Do not bind this image.
+//                                           0x1000     // Reserved.
+#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER  0x2000     // Driver uses WDM model
+//                                           0x4000     // Reserved.
+#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE     0x8000
+
+// Directory Entries
+
+#define IMAGE_DIRECTORY_ENTRY_EXPORT          0   // Export Directory
+#define IMAGE_DIRECTORY_ENTRY_IMPORT          1   // Import Directory
+#define IMAGE_DIRECTORY_ENTRY_RESOURCE        2   // Resource Directory
+#define IMAGE_DIRECTORY_ENTRY_EXCEPTION       3   // Exception Directory
+#define IMAGE_DIRECTORY_ENTRY_SECURITY        4   // Security Directory
+#define IMAGE_DIRECTORY_ENTRY_BASERELOC       5   // Base Relocation Table
+#define IMAGE_DIRECTORY_ENTRY_DEBUG           6   // Debug Directory
+//      IMAGE_DIRECTORY_ENTRY_COPYRIGHT       7   // (X86 usage)
+#define IMAGE_DIRECTORY_ENTRY_ARCHITECTURE    7   // Architecture Specific Data
+#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR       8   // RVA of GP
+#define IMAGE_DIRECTORY_ENTRY_TLS             9   // TLS Directory
+#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG    10   // Load Configuration Directory
+#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT   11   // Bound Import Directory in headers
+#define IMAGE_DIRECTORY_ENTRY_IAT            12   // Import Address Table
+#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT   13   // Delay Load Import Descriptors
+#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14   // COM Runtime descriptor
+
+//
+// Non-COFF Object file header
+//
+
+typedef struct ANON_OBJECT_HEADER {
+    WORD    Sig1;            // Must be IMAGE_FILE_MACHINE_UNKNOWN
+    WORD    Sig2;            // Must be 0xffff
+    WORD    Version;         // >= 1 (implies the CLSID field is present)
+    WORD    Machine;
+    DWORD   TimeDateStamp;
+    CLSID   ClassID;         // Used to invoke CoCreateInstance
+    DWORD   SizeOfData;      // Size of data that follows the header
+} ANON_OBJECT_HEADER;
+
+//
+// Section header format.
+//
+
+#define IMAGE_SIZEOF_SHORT_NAME              8
+
+typedef struct _IMAGE_SECTION_HEADER {
+    BYTE    Name[IMAGE_SIZEOF_SHORT_NAME];
+    union {
+            DWORD   PhysicalAddress;
+            DWORD   VirtualSize;
+    } Misc;
+    DWORD   VirtualAddress;
+    DWORD   SizeOfRawData;
+    DWORD   PointerToRawData;
+    DWORD   PointerToRelocations;
+    DWORD   PointerToLinenumbers;
+    WORD    NumberOfRelocations;
+    WORD    NumberOfLinenumbers;
+    DWORD   Characteristics;
+} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER;
+
+#define IMAGE_SIZEOF_SECTION_HEADER          40
+
+//
+// Section characteristics.
+//
+//      IMAGE_SCN_TYPE_REG                   0x00000000  // Reserved.
+//      IMAGE_SCN_TYPE_DSECT                 0x00000001  // Reserved.
+//      IMAGE_SCN_TYPE_NOLOAD                0x00000002  // Reserved.
+//      IMAGE_SCN_TYPE_GROUP                 0x00000004  // Reserved.
+#define IMAGE_SCN_TYPE_NO_PAD                0x00000008  // Reserved.
+//      IMAGE_SCN_TYPE_COPY                  0x00000010  // Reserved.
+
+#define IMAGE_SCN_CNT_CODE                   0x00000020  // Section contains code.
+#define IMAGE_SCN_CNT_INITIALIZED_DATA       0x00000040  // Section contains initialized data.
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA     0x00000080  // Section contains uninitialized data.
+
+#define IMAGE_SCN_LNK_OTHER                  0x00000100  // Reserved.
+#define IMAGE_SCN_LNK_INFO                   0x00000200  // Section contains comments or some other type of information.
+//      IMAGE_SCN_TYPE_OVER                  0x00000400  // Reserved.
+#define IMAGE_SCN_LNK_REMOVE                 0x00000800  // Section contents will not become part of image.
+#define IMAGE_SCN_LNK_COMDAT                 0x00001000  // Section contents comdat.
+//                                           0x00002000  // Reserved.
+//      IMAGE_SCN_MEM_PROTECTED - Obsolete   0x00004000
+#define IMAGE_SCN_NO_DEFER_SPEC_EXC          0x00004000  // Reset speculative exceptions handling bits in the TLB entries for this section.
+#define IMAGE_SCN_GPREL                      0x00008000  // Section content can be accessed relative to GP
+#define IMAGE_SCN_MEM_FARDATA                0x00008000
+//      IMAGE_SCN_MEM_SYSHEAP  - Obsolete    0x00010000
+#define IMAGE_SCN_MEM_PURGEABLE              0x00020000
+#define IMAGE_SCN_MEM_16BIT                  0x00020000
+#define IMAGE_SCN_MEM_LOCKED                 0x00040000
+#define IMAGE_SCN_MEM_PRELOAD                0x00080000
+
+#define IMAGE_SCN_ALIGN_1BYTES               0x00100000  //
+#define IMAGE_SCN_ALIGN_2BYTES               0x00200000  //
+#define IMAGE_SCN_ALIGN_4BYTES               0x00300000  //
+#define IMAGE_SCN_ALIGN_8BYTES               0x00400000  //
+#define IMAGE_SCN_ALIGN_16BYTES              0x00500000  // Default alignment if no others are specified.
+#define IMAGE_SCN_ALIGN_32BYTES              0x00600000  //
+#define IMAGE_SCN_ALIGN_64BYTES              0x00700000  //
+#define IMAGE_SCN_ALIGN_128BYTES             0x00800000  //
+#define IMAGE_SCN_ALIGN_256BYTES             0x00900000  //
+#define IMAGE_SCN_ALIGN_512BYTES             0x00A00000  //
+#define IMAGE_SCN_ALIGN_1024BYTES            0x00B00000  //
+#define IMAGE_SCN_ALIGN_2048BYTES            0x00C00000  //
+#define IMAGE_SCN_ALIGN_4096BYTES            0x00D00000  //
+#define IMAGE_SCN_ALIGN_8192BYTES            0x00E00000  //
+// Unused                                    0x00F00000
+#define IMAGE_SCN_ALIGN_MASK                 0x00F00000
+
+#define IMAGE_SCN_LNK_NRELOC_OVFL            0x01000000  // Section contains extended relocations.
+#define IMAGE_SCN_MEM_DISCARDABLE            0x02000000  // Section can be discarded.
+#define IMAGE_SCN_MEM_NOT_CACHED             0x04000000  // Section is not cachable.
+#define IMAGE_SCN_MEM_NOT_PAGED              0x08000000  // Section is not pageable.
+#define IMAGE_SCN_MEM_SHARED                 0x10000000  // Section is shareable.
+#define IMAGE_SCN_MEM_EXECUTE                0x20000000  // Section is executable.
+#define IMAGE_SCN_MEM_READ                   0x40000000  // Section is readable.
+#define IMAGE_SCN_MEM_WRITE                  0x80000000  // Section is writeable.
+
+//
+// TLS Chaacteristic Flags
+//
+#define IMAGE_SCN_SCALE_INDEX                0x00000001  // Tls index is scaled
+
+#ifndef _MAC
+#include "pshpack2.h"                       // Symbols, relocs, and linenumbers are 2 byte packed
+#endif
+
+//
+// Symbol format.
+//
+
+typedef struct _IMAGE_SYMBOL {
+    union {
+        BYTE    ShortName[8];
+        struct {
+            DWORD   Short;     // if 0, use LongName
+            DWORD   Long;      // offset into string table
+        } Name;
+        DWORD   LongName[2];    // PBYTE [2]
+    } N;
+    DWORD   Value;
+    SHORT   SectionNumber;
+    WORD    Type;
+    BYTE    StorageClass;
+    BYTE    NumberOfAuxSymbols;
+} IMAGE_SYMBOL;
+typedef IMAGE_SYMBOL UNALIGNED *PIMAGE_SYMBOL;
+
+
+#define IMAGE_SIZEOF_SYMBOL                  18
+
+//
+// Section values.
+//
+// Symbols have a section number of the section in which they are
+// defined. Otherwise, section numbers have the following meanings:
+//
+
+#define IMAGE_SYM_UNDEFINED           (SHORT)0          // Symbol is undefined or is common.
+#define IMAGE_SYM_ABSOLUTE            (SHORT)-1         // Symbol is an absolute value.
+#define IMAGE_SYM_DEBUG               (SHORT)-2         // Symbol is a special debug item.
+#define IMAGE_SYM_SECTION_MAX         0xFEFF            // Values 0xFF00-0xFFFF are special
+
+//
+// Type (fundamental) values.
+//
+
+#define IMAGE_SYM_TYPE_NULL                 0x0000  // no type.
+#define IMAGE_SYM_TYPE_VOID                 0x0001  //
+#define IMAGE_SYM_TYPE_CHAR                 0x0002  // type character.
+#define IMAGE_SYM_TYPE_SHORT                0x0003  // type short integer.
+#define IMAGE_SYM_TYPE_INT                  0x0004  //
+#define IMAGE_SYM_TYPE_LONG                 0x0005  //
+#define IMAGE_SYM_TYPE_FLOAT                0x0006  //
+#define IMAGE_SYM_TYPE_DOUBLE               0x0007  //
+#define IMAGE_SYM_TYPE_STRUCT               0x0008  //
+#define IMAGE_SYM_TYPE_UNION                0x0009  //
+#define IMAGE_SYM_TYPE_ENUM                 0x000A  // enumeration.
+#define IMAGE_SYM_TYPE_MOE                  0x000B  // member of enumeration.
+#define IMAGE_SYM_TYPE_BYTE                 0x000C  //
+#define IMAGE_SYM_TYPE_WORD                 0x000D  //
+#define IMAGE_SYM_TYPE_UINT                 0x000E  //
+#define IMAGE_SYM_TYPE_DWORD                0x000F  //
+#define IMAGE_SYM_TYPE_PCODE                0x8000  //
+//
+// Type (derived) values.
+//
+
+#define IMAGE_SYM_DTYPE_NULL                0       // no derived type.
+#define IMAGE_SYM_DTYPE_POINTER             1       // pointer.
+#define IMAGE_SYM_DTYPE_FUNCTION            2       // function.
+#define IMAGE_SYM_DTYPE_ARRAY               3       // array.
+
+//
+// Storage classes.
+//
+#define IMAGE_SYM_CLASS_END_OF_FUNCTION     (BYTE )-1
+#define IMAGE_SYM_CLASS_NULL                0x0000
+#define IMAGE_SYM_CLASS_AUTOMATIC           0x0001
+#define IMAGE_SYM_CLASS_EXTERNAL            0x0002
+#define IMAGE_SYM_CLASS_STATIC              0x0003
+#define IMAGE_SYM_CLASS_REGISTER            0x0004
+#define IMAGE_SYM_CLASS_EXTERNAL_DEF        0x0005
+#define IMAGE_SYM_CLASS_LABEL               0x0006
+#define IMAGE_SYM_CLASS_UNDEFINED_LABEL     0x0007
+#define IMAGE_SYM_CLASS_MEMBER_OF_STRUCT    0x0008
+#define IMAGE_SYM_CLASS_ARGUMENT            0x0009
+#define IMAGE_SYM_CLASS_STRUCT_TAG          0x000A
+#define IMAGE_SYM_CLASS_MEMBER_OF_UNION     0x000B
+#define IMAGE_SYM_CLASS_UNION_TAG           0x000C
+#define IMAGE_SYM_CLASS_TYPE_DEFINITION     0x000D
+#define IMAGE_SYM_CLASS_UNDEFINED_STATIC    0x000E
+#define IMAGE_SYM_CLASS_ENUM_TAG            0x000F
+#define IMAGE_SYM_CLASS_MEMBER_OF_ENUM      0x0010
+#define IMAGE_SYM_CLASS_REGISTER_PARAM      0x0011
+#define IMAGE_SYM_CLASS_BIT_FIELD           0x0012
+
+#define IMAGE_SYM_CLASS_FAR_EXTERNAL        0x0044  //
+
+#define IMAGE_SYM_CLASS_BLOCK               0x0064
+#define IMAGE_SYM_CLASS_FUNCTION            0x0065
+#define IMAGE_SYM_CLASS_END_OF_STRUCT       0x0066
+#define IMAGE_SYM_CLASS_FILE                0x0067
+// new
+#define IMAGE_SYM_CLASS_SECTION             0x0068
+#define IMAGE_SYM_CLASS_WEAK_EXTERNAL       0x0069
+
+#define IMAGE_SYM_CLASS_CLR_TOKEN           0x006B
+
+// type packing constants
+
+#define N_BTMASK                            0x000F
+#define N_TMASK                             0x0030
+#define N_TMASK1                            0x00C0
+#define N_TMASK2                            0x00F0
+#define N_BTSHFT                            4
+#define N_TSHIFT                            2
+// MACROS
+
+// Basic Type of  x
+#define BTYPE(x) ((x) & N_BTMASK)
+
+// Is x a pointer?
+#ifndef ISPTR
+#define ISPTR(x) (((x) & N_TMASK) == (IMAGE_SYM_DTYPE_POINTER << N_BTSHFT))
+#endif
+
+// Is x a function?
+#ifndef ISFCN
+#define ISFCN(x) (((x) & N_TMASK) == (IMAGE_SYM_DTYPE_FUNCTION << N_BTSHFT))
+#endif
+
+// Is x an array?
+
+#ifndef ISARY
+#define ISARY(x) (((x) & N_TMASK) == (IMAGE_SYM_DTYPE_ARRAY << N_BTSHFT))
+#endif
+
+// Is x a structure, union, or enumeration TAG?
+#ifndef ISTAG
+#define ISTAG(x) ((x)==IMAGE_SYM_CLASS_STRUCT_TAG || (x)==IMAGE_SYM_CLASS_UNION_TAG || (x)==IMAGE_SYM_CLASS_ENUM_TAG)
+#endif
+
+#ifndef INCREF
+#define INCREF(x) ((((x)&~N_BTMASK)<<N_TSHIFT)|(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)|((x)&N_BTMASK))
+#endif
+#ifndef DECREF
+#define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK))
+#endif
+
+//
+// Auxiliary entry format.
+//
+
+typedef union _IMAGE_AUX_SYMBOL {
+    struct {
+        DWORD    TagIndex;                      // struct, union, or enum tag index
+        union {
+            struct {
+                WORD    Linenumber;             // declaration line number
+                WORD    Size;                   // size of struct, union, or enum
+            } LnSz;
+           DWORD    TotalSize;
+        } Misc;
+        union {
+            struct {                            // if ISFCN, tag, or .bb
+                DWORD    PointerToLinenumber;
+                DWORD    PointerToNextFunction;
+            } Function;
+            struct {                            // if ISARY, up to 4 dimen.
+                WORD     Dimension[4];
+            } Array;
+        } FcnAry;
+        WORD    TvIndex;                        // tv index
+    } Sym;
+    struct {
+        BYTE    Name[IMAGE_SIZEOF_SYMBOL];
+    } File;
+    struct {
+        DWORD   Length;                         // section length
+        WORD    NumberOfRelocations;            // number of relocation entries
+        WORD    NumberOfLinenumbers;            // number of line numbers
+        DWORD   CheckSum;                       // checksum for communal
+        SHORT   Number;                         // section number to associate with
+        BYTE    Selection;                      // communal selection type
+    } Section;
+} IMAGE_AUX_SYMBOL;
+typedef IMAGE_AUX_SYMBOL UNALIGNED *PIMAGE_AUX_SYMBOL;
+
+#define IMAGE_SIZEOF_AUX_SYMBOL             18
+
+typedef enum IMAGE_AUX_SYMBOL_TYPE {
+    IMAGE_AUX_SYMBOL_TYPE_TOKEN_DEF = 1,
+} IMAGE_AUX_SYMBOL_TYPE;
+
+#include <pshpack2.h>
+
+typedef struct IMAGE_AUX_SYMBOL_TOKEN_DEF {
+    BYTE  bAuxType;                  // IMAGE_AUX_SYMBOL_TYPE
+    BYTE  bReserved;                 // Must be 0
+    DWORD SymbolTableIndex;
+    BYTE  rgbReserved[12];           // Must be 0
+} IMAGE_AUX_SYMBOL_TOKEN_DEF;
+
+typedef IMAGE_AUX_SYMBOL_TOKEN_DEF UNALIGNED *PIMAGE_AUX_SYMBOL_TOKEN_DEF;
+
+#include <poppack.h>
+
+//
+// Communal selection types.
+//
+
+#define IMAGE_COMDAT_SELECT_NODUPLICATES    1
+#define IMAGE_COMDAT_SELECT_ANY             2
+#define IMAGE_COMDAT_SELECT_SAME_SIZE       3
+#define IMAGE_COMDAT_SELECT_EXACT_MATCH     4
+#define IMAGE_COMDAT_SELECT_ASSOCIATIVE     5
+#define IMAGE_COMDAT_SELECT_LARGEST         6
+#define IMAGE_COMDAT_SELECT_NEWEST          7
+
+#define IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY  1
+#define IMAGE_WEAK_EXTERN_SEARCH_LIBRARY    2
+#define IMAGE_WEAK_EXTERN_SEARCH_ALIAS      3
+
+//
+// Relocation format.
+//
+
+typedef struct _IMAGE_RELOCATION {
+    union {
+        DWORD   VirtualAddress;
+        DWORD   RelocCount;             // Set to the real count when IMAGE_SCN_LNK_NRELOC_OVFL is set
+    };
+    DWORD   SymbolTableIndex;
+    WORD    Type;
+} IMAGE_RELOCATION;
+typedef IMAGE_RELOCATION UNALIGNED *PIMAGE_RELOCATION;
+
+#define IMAGE_SIZEOF_RELOCATION         10
+
+//
+// I386 relocation types.
+//
+#define IMAGE_REL_I386_ABSOLUTE         0x0000  // Reference is absolute, no relocation is necessary
+#define IMAGE_REL_I386_DIR16            0x0001  // Direct 16-bit reference to the symbols virtual address
+#define IMAGE_REL_I386_REL16            0x0002  // PC-relative 16-bit reference to the symbols virtual address
+#define IMAGE_REL_I386_DIR32            0x0006  // Direct 32-bit reference to the symbols virtual address
+#define IMAGE_REL_I386_DIR32NB          0x0007  // Direct 32-bit reference to the symbols virtual address, base not included
+#define IMAGE_REL_I386_SEG12            0x0009  // Direct 16-bit reference to the segment-selector bits of a 32-bit virtual address
+#define IMAGE_REL_I386_SECTION          0x000A
+#define IMAGE_REL_I386_SECREL           0x000B
+#define IMAGE_REL_I386_TOKEN            0x000C  // clr token
+#define IMAGE_REL_I386_SECREL7          0x000D  // 7 bit offset from base of section containing target
+#define IMAGE_REL_I386_REL32            0x0014  // PC-relative 32-bit reference to the symbols virtual address
+
+//
+// MIPS relocation types.
+//
+#define IMAGE_REL_MIPS_ABSOLUTE         0x0000  // Reference is absolute, no relocation is necessary
+#define IMAGE_REL_MIPS_REFHALF          0x0001
+#define IMAGE_REL_MIPS_REFWORD          0x0002
+#define IMAGE_REL_MIPS_JMPADDR          0x0003
+#define IMAGE_REL_MIPS_REFHI            0x0004
+#define IMAGE_REL_MIPS_REFLO            0x0005
+#define IMAGE_REL_MIPS_GPREL            0x0006
+#define IMAGE_REL_MIPS_LITERAL          0x0007
+#define IMAGE_REL_MIPS_SECTION          0x000A
+#define IMAGE_REL_MIPS_SECREL           0x000B
+#define IMAGE_REL_MIPS_SECRELLO         0x000C  // Low 16-bit section relative referemce (used for >32k TLS)
+#define IMAGE_REL_MIPS_SECRELHI         0x000D  // High 16-bit section relative reference (used for >32k TLS)
+#define IMAGE_REL_MIPS_TOKEN            0x000E  // clr token
+#define IMAGE_REL_MIPS_JMPADDR16        0x0010
+#define IMAGE_REL_MIPS_REFWORDNB        0x0022
+#define IMAGE_REL_MIPS_PAIR             0x0025
+
+//
+// Alpha Relocation types.
+//
+#define IMAGE_REL_ALPHA_ABSOLUTE        0x0000
+#define IMAGE_REL_ALPHA_REFLONG         0x0001
+#define IMAGE_REL_ALPHA_REFQUAD         0x0002
+#define IMAGE_REL_ALPHA_GPREL32         0x0003
+#define IMAGE_REL_ALPHA_LITERAL         0x0004
+#define IMAGE_REL_ALPHA_LITUSE          0x0005
+#define IMAGE_REL_ALPHA_GPDISP          0x0006
+#define IMAGE_REL_ALPHA_BRADDR          0x0007
+#define IMAGE_REL_ALPHA_HINT            0x0008
+#define IMAGE_REL_ALPHA_INLINE_REFLONG  0x0009
+#define IMAGE_REL_ALPHA_REFHI           0x000A
+#define IMAGE_REL_ALPHA_REFLO           0x000B
+#define IMAGE_REL_ALPHA_PAIR            0x000C
+#define IMAGE_REL_ALPHA_MATCH           0x000D
+#define IMAGE_REL_ALPHA_SECTION         0x000E
+#define IMAGE_REL_ALPHA_SECREL          0x000F
+#define IMAGE_REL_ALPHA_REFLONGNB       0x0010
+#define IMAGE_REL_ALPHA_SECRELLO        0x0011  // Low 16-bit section relative reference
+#define IMAGE_REL_ALPHA_SECRELHI        0x0012  // High 16-bit section relative reference
+#define IMAGE_REL_ALPHA_REFQ3           0x0013  // High 16 bits of 48 bit reference
+#define IMAGE_REL_ALPHA_REFQ2           0x0014  // Middle 16 bits of 48 bit reference
+#define IMAGE_REL_ALPHA_REFQ1           0x0015  // Low 16 bits of 48 bit reference
+#define IMAGE_REL_ALPHA_GPRELLO         0x0016  // Low 16-bit GP relative reference
+#define IMAGE_REL_ALPHA_GPRELHI         0x0017  // High 16-bit GP relative reference
+
+//
+// IBM PowerPC relocation types.
+//
+#define IMAGE_REL_PPC_ABSOLUTE          0x0000  // NOP
+#define IMAGE_REL_PPC_ADDR64            0x0001  // 64-bit address
+#define IMAGE_REL_PPC_ADDR32            0x0002  // 32-bit address
+#define IMAGE_REL_PPC_ADDR24            0x0003  // 26-bit address, shifted left 2 (branch absolute)
+#define IMAGE_REL_PPC_ADDR16            0x0004  // 16-bit address
+#define IMAGE_REL_PPC_ADDR14            0x0005  // 16-bit address, shifted left 2 (load doubleword)
+#define IMAGE_REL_PPC_REL24             0x0006  // 26-bit PC-relative offset, shifted left 2 (branch relative)
+#define IMAGE_REL_PPC_REL14             0x0007  // 16-bit PC-relative offset, shifted left 2 (br cond relative)
+#define IMAGE_REL_PPC_TOCREL16          0x0008  // 16-bit offset from TOC base
+#define IMAGE_REL_PPC_TOCREL14          0x0009  // 16-bit offset from TOC base, shifted left 2 (load doubleword)
+
+#define IMAGE_REL_PPC_ADDR32NB          0x000A  // 32-bit addr w/o image base
+#define IMAGE_REL_PPC_SECREL            0x000B  // va of containing section (as in an image sectionhdr)
+#define IMAGE_REL_PPC_SECTION           0x000C  // sectionheader number
+#define IMAGE_REL_PPC_IFGLUE            0x000D  // substitute TOC restore instruction iff symbol is glue code
+#define IMAGE_REL_PPC_IMGLUE            0x000E  // symbol is glue code; virtual address is TOC restore instruction
+#define IMAGE_REL_PPC_SECREL16          0x000F  // va of containing section (limited to 16 bits)
+#define IMAGE_REL_PPC_REFHI             0x0010
+#define IMAGE_REL_PPC_REFLO             0x0011
+#define IMAGE_REL_PPC_PAIR              0x0012
+#define IMAGE_REL_PPC_SECRELLO          0x0013  // Low 16-bit section relative reference (used for >32k TLS)
+#define IMAGE_REL_PPC_SECRELHI          0x0014  // High 16-bit section relative reference (used for >32k TLS)
+#define IMAGE_REL_PPC_GPREL             0x0015
+#define IMAGE_REL_PPC_TOKEN             0x0016  // clr token
+
+#define IMAGE_REL_PPC_TYPEMASK          0x00FF  // mask to isolate above values in IMAGE_RELOCATION.Type
+
+// Flag bits in IMAGE_RELOCATION.TYPE
+
+#define IMAGE_REL_PPC_NEG               0x0100  // subtract reloc value rather than adding it
+#define IMAGE_REL_PPC_BRTAKEN           0x0200  // fix branch prediction bit to predict branch taken
+#define IMAGE_REL_PPC_BRNTAKEN          0x0400  // fix branch prediction bit to predict branch not taken
+#define IMAGE_REL_PPC_TOCDEFN           0x0800  // toc slot defined in file (or, data in toc)
+
+//
+// Hitachi SH3 relocation types.
+//
+#define IMAGE_REL_SH3_ABSOLUTE          0x0000  // No relocation
+#define IMAGE_REL_SH3_DIRECT16          0x0001  // 16 bit direct
+#define IMAGE_REL_SH3_DIRECT32          0x0002  // 32 bit direct
+#define IMAGE_REL_SH3_DIRECT8           0x0003  // 8 bit direct, -128..255
+#define IMAGE_REL_SH3_DIRECT8_WORD      0x0004  // 8 bit direct .W (0 ext.)
+#define IMAGE_REL_SH3_DIRECT8_LONG      0x0005  // 8 bit direct .L (0 ext.)
+#define IMAGE_REL_SH3_DIRECT4           0x0006  // 4 bit direct (0 ext.)
+#define IMAGE_REL_SH3_DIRECT4_WORD      0x0007  // 4 bit direct .W (0 ext.)
+#define IMAGE_REL_SH3_DIRECT4_LONG      0x0008  // 4 bit direct .L (0 ext.)
+#define IMAGE_REL_SH3_PCREL8_WORD       0x0009  // 8 bit PC relative .W
+#define IMAGE_REL_SH3_PCREL8_LONG       0x000A  // 8 bit PC relative .L
+#define IMAGE_REL_SH3_PCREL12_WORD      0x000B  // 12 LSB PC relative .W
+#define IMAGE_REL_SH3_STARTOF_SECTION   0x000C  // Start of EXE section
+#define IMAGE_REL_SH3_SIZEOF_SECTION    0x000D  // Size of EXE section
+#define IMAGE_REL_SH3_SECTION           0x000E  // Section table index
+#define IMAGE_REL_SH3_SECREL            0x000F  // Offset within section
+#define IMAGE_REL_SH3_DIRECT32_NB       0x0010  // 32 bit direct not based
+#define IMAGE_REL_SH3_GPREL4_LONG       0x0011  // GP-relative addressing
+#define IMAGE_REL_SH3_TOKEN             0x0012  // clr token
+
+#define IMAGE_REL_ARM_ABSOLUTE          0x0000  // No relocation required
+#define IMAGE_REL_ARM_ADDR32            0x0001  // 32 bit address
+#define IMAGE_REL_ARM_ADDR32NB          0x0002  // 32 bit address w/o image base
+#define IMAGE_REL_ARM_BRANCH24          0x0003  // 24 bit offset << 2 & sign ext.
+#define IMAGE_REL_ARM_BRANCH11          0x0004  // Thumb: 2 11 bit offsets
+#define IMAGE_REL_ARM_TOKEN             0x0005  // clr token
+#define IMAGE_REL_ARM_GPREL12           0x0006  // GP-relative addressing (ARM)
+#define IMAGE_REL_ARM_GPREL7            0x0007  // GP-relative addressing (Thumb)
+#define IMAGE_REL_ARM_BLX24             0x0008
+#define IMAGE_REL_ARM_BLX11             0x0009
+#define IMAGE_REL_ARM_SECTION           0x000E  // Section table index
+#define IMAGE_REL_ARM_SECREL            0x000F  // Offset within section
+
+#define IMAGE_REL_AM_ABSOLUTE           0x0000
+#define IMAGE_REL_AM_ADDR32             0x0001
+#define IMAGE_REL_AM_ADDR32NB           0x0002
+#define IMAGE_REL_AM_CALL32             0x0003
+#define IMAGE_REL_AM_FUNCINFO           0x0004
+#define IMAGE_REL_AM_REL32_1            0x0005
+#define IMAGE_REL_AM_REL32_2            0x0006
+#define IMAGE_REL_AM_SECREL             0x0007
+#define IMAGE_REL_AM_SECTION            0x0008
+#define IMAGE_REL_AM_TOKEN              0x0009
+
+//
+// X86-64 relocations
+//
+#define IMAGE_REL_AMD64_ABSOLUTE        0x0000  // Reference is absolute, no relocation is necessary
+#define IMAGE_REL_AMD64_ADDR64          0x0001  // 64-bit address (VA).
+#define IMAGE_REL_AMD64_ADDR32          0x0002  // 32-bit address (VA).
+#define IMAGE_REL_AMD64_ADDR32NB        0x0003  // 32-bit address w/o image base (RVA).
+#define IMAGE_REL_AMD64_REL32           0x0004  // 32-bit relative address from byte following reloc
+#define IMAGE_REL_AMD64_REL32_1         0x0005  // 32-bit relative address from byte distance 1 from reloc
+#define IMAGE_REL_AMD64_REL32_2         0x0006  // 32-bit relative address from byte distance 2 from reloc
+#define IMAGE_REL_AMD64_REL32_3         0x0007  // 32-bit relative address from byte distance 3 from reloc
+#define IMAGE_REL_AMD64_REL32_4         0x0008  // 32-bit relative address from byte distance 4 from reloc
+#define IMAGE_REL_AMD64_REL32_5         0x0009  // 32-bit relative address from byte distance 5 from reloc
+#define IMAGE_REL_AMD64_SECTION         0x000A  // Section index
+#define IMAGE_REL_AMD64_SECREL          0x000B  // 32 bit offset from base of section containing target
+#define IMAGE_REL_AMD64_SECREL7         0x000C  // 7 bit unsigned offset from base of section containing target
+#define IMAGE_REL_AMD64_TOKEN           0x000D  // 32 bit metadata token
+
+//
+// IA64 relocation types.
+//
+#define IMAGE_REL_IA64_ABSOLUTE         0x0000
+#define IMAGE_REL_IA64_IMM14            0x0001
+#define IMAGE_REL_IA64_IMM22            0x0002
+#define IMAGE_REL_IA64_IMM64            0x0003
+#define IMAGE_REL_IA64_DIR32            0x0004
+#define IMAGE_REL_IA64_DIR64            0x0005
+#define IMAGE_REL_IA64_PCREL21B         0x0006
+#define IMAGE_REL_IA64_PCREL21M         0x0007
+#define IMAGE_REL_IA64_PCREL21F         0x0008
+#define IMAGE_REL_IA64_GPREL22          0x0009
+#define IMAGE_REL_IA64_LTOFF22          0x000A
+#define IMAGE_REL_IA64_SECTION          0x000B
+#define IMAGE_REL_IA64_SECREL22         0x000C
+#define IMAGE_REL_IA64_SECREL64I        0x000D
+#define IMAGE_REL_IA64_SECREL32         0x000E
+// 
+#define IMAGE_REL_IA64_DIR32NB          0x0010
+#define IMAGE_REL_IA64_SREL14           0x0011
+#define IMAGE_REL_IA64_SREL22           0x0012
+#define IMAGE_REL_IA64_SREL32           0x0013
+#define IMAGE_REL_IA64_UREL32           0x0014
+#define IMAGE_REL_IA64_PCREL60X         0x0015  // This is always a BRL and never converted
+#define IMAGE_REL_IA64_PCREL60B         0x0016  // If possible, convert to MBB bundle with NOP.B in slot 1
+#define IMAGE_REL_IA64_PCREL60F         0x0017  // If possible, convert to MFB bundle with NOP.F in slot 1
+#define IMAGE_REL_IA64_PCREL60I         0x0018  // If possible, convert to MIB bundle with NOP.I in slot 1
+#define IMAGE_REL_IA64_PCREL60M         0x0019  // If possible, convert to MMB bundle with NOP.M in slot 1
+#define IMAGE_REL_IA64_IMMGPREL64       0x001A
+#define IMAGE_REL_IA64_TOKEN            0x001B  // clr token
+#define IMAGE_REL_IA64_GPREL32          0x001C
+#define IMAGE_REL_IA64_ADDEND           0x001F
+
+//
+// CEF relocation types.
+//
+#define IMAGE_REL_CEF_ABSOLUTE          0x0000  // Reference is absolute, no relocation is necessary
+#define IMAGE_REL_CEF_ADDR32            0x0001  // 32-bit address (VA).
+#define IMAGE_REL_CEF_ADDR64            0x0002  // 64-bit address (VA).
+#define IMAGE_REL_CEF_ADDR32NB          0x0003  // 32-bit address w/o image base (RVA).
+#define IMAGE_REL_CEF_SECTION           0x0004  // Section index
+#define IMAGE_REL_CEF_SECREL            0x0005  // 32 bit offset from base of section containing target
+#define IMAGE_REL_CEF_TOKEN             0x0006  // 32 bit metadata token
+
+//
+// clr relocation types.
+//
+#define IMAGE_REL_CEE_ABSOLUTE          0x0000  // Reference is absolute, no relocation is necessary
+#define IMAGE_REL_CEE_ADDR32            0x0001  // 32-bit address (VA).
+#define IMAGE_REL_CEE_ADDR64            0x0002  // 64-bit address (VA).
+#define IMAGE_REL_CEE_ADDR32NB          0x0003  // 32-bit address w/o image base (RVA).
+#define IMAGE_REL_CEE_SECTION           0x0004  // Section index
+#define IMAGE_REL_CEE_SECREL            0x0005  // 32 bit offset from base of section containing target
+#define IMAGE_REL_CEE_TOKEN             0x0006  // 32 bit metadata token
+
+
+#define IMAGE_REL_M32R_ABSOLUTE       0x0000   // No relocation required
+#define IMAGE_REL_M32R_ADDR32         0x0001   // 32 bit address
+#define IMAGE_REL_M32R_ADDR32NB       0x0002   // 32 bit address w/o image base
+#define IMAGE_REL_M32R_ADDR24         0x0003   // 24 bit address
+#define IMAGE_REL_M32R_GPREL16        0x0004   // GP relative addressing
+#define IMAGE_REL_M32R_PCREL24        0x0005   // 24 bit offset << 2 & sign ext.
+#define IMAGE_REL_M32R_PCREL16        0x0006   // 16 bit offset << 2 & sign ext.
+#define IMAGE_REL_M32R_PCREL8         0x0007   // 8 bit offset << 2 & sign ext.
+#define IMAGE_REL_M32R_REFHALF        0x0008   // 16 MSBs
+#define IMAGE_REL_M32R_REFHI          0x0009   // 16 MSBs; adj for LSB sign ext.
+#define IMAGE_REL_M32R_REFLO          0x000A   // 16 LSBs
+#define IMAGE_REL_M32R_PAIR           0x000B   // Link HI and LO
+#define IMAGE_REL_M32R_SECTION        0x000C   // Section table index
+#define IMAGE_REL_M32R_SECREL32       0x000D   // 32 bit section relative reference
+#define IMAGE_REL_M32R_TOKEN          0x000E   // clr token
+
+
+#define EXT_IMM64(Value, Address, Size, InstPos, ValPos)  /* Intel-IA64-Filler */           \
+    Value |= (((ULONGLONG)((*(Address) >> InstPos) & (((ULONGLONG)1 << Size) - 1))) << ValPos)  // Intel-IA64-Filler
+
+#define INS_IMM64(Value, Address, Size, InstPos, ValPos)  /* Intel-IA64-Filler */\
+    *(PDWORD)Address = (*(PDWORD)Address & ~(((1 << Size) - 1) << InstPos)) | /* Intel-IA64-Filler */\
+          ((DWORD)((((ULONGLONG)Value >> ValPos) & (((ULONGLONG)1 << Size) - 1))) << InstPos)  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IMM7B_INST_WORD_X         3  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM7B_SIZE_X              7  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM7B_INST_WORD_POS_X     4  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM7B_VAL_POS_X           0  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IMM9D_INST_WORD_X         3  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM9D_SIZE_X              9  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM9D_INST_WORD_POS_X     18  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM9D_VAL_POS_X           7  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IMM5C_INST_WORD_X         3  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM5C_SIZE_X              5  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM5C_INST_WORD_POS_X     13  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM5C_VAL_POS_X           16  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IC_INST_WORD_X            3  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IC_SIZE_X                 1  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IC_INST_WORD_POS_X        12  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IC_VAL_POS_X              21  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IMM41a_INST_WORD_X        1  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41a_SIZE_X             10  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41a_INST_WORD_POS_X    14  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41a_VAL_POS_X          22  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IMM41b_INST_WORD_X        1  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41b_SIZE_X             8  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41b_INST_WORD_POS_X    24  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41b_VAL_POS_X          32  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_IMM41c_INST_WORD_X        2  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41c_SIZE_X             23  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41c_INST_WORD_POS_X    0  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_IMM41c_VAL_POS_X          40  // Intel-IA64-Filler
+
+#define EMARCH_ENC_I17_SIGN_INST_WORD_X          3  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_SIGN_SIZE_X               1  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_SIGN_INST_WORD_POS_X      27  // Intel-IA64-Filler
+#define EMARCH_ENC_I17_SIGN_VAL_POS_X            63  // Intel-IA64-Filler
+
+
+//
+// Line number format.
+//
+
+typedef struct _IMAGE_LINENUMBER {
+    union {
+        DWORD   SymbolTableIndex;               // Symbol table index of function name if Linenumber is 0.
+        DWORD   VirtualAddress;                 // Virtual address of line number.
+    } Type;
+    WORD    Linenumber;                         // Line number.
+} IMAGE_LINENUMBER;
+typedef IMAGE_LINENUMBER UNALIGNED *PIMAGE_LINENUMBER;
+
+#define IMAGE_SIZEOF_LINENUMBER              6
+
+#ifndef _MAC
+#include "poppack.h"                        // Back to 4 byte packing
+#endif
+
+//
+// Based relocation format.
+//
+
+typedef struct _IMAGE_BASE_RELOCATION {
+    DWORD   VirtualAddress;
+    DWORD   SizeOfBlock;
+//  WORD    TypeOffset[1];
+} IMAGE_BASE_RELOCATION;
+typedef IMAGE_BASE_RELOCATION UNALIGNED * PIMAGE_BASE_RELOCATION;
+
+#define IMAGE_SIZEOF_BASE_RELOCATION         8
+
+//
+// Based relocation types.
+//
+
+#define IMAGE_REL_BASED_ABSOLUTE              0
+#define IMAGE_REL_BASED_HIGH                  1
+#define IMAGE_REL_BASED_LOW                   2
+#define IMAGE_REL_BASED_HIGHLOW               3
+#define IMAGE_REL_BASED_HIGHADJ               4
+#define IMAGE_REL_BASED_MIPS_JMPADDR          5
+#define IMAGE_REL_BASED_MIPS_JMPADDR16        9
+#define IMAGE_REL_BASED_IA64_IMM64            9
+#define IMAGE_REL_BASED_DIR64                 10
+
+
+//
+// Archive format.
+//
+
+#define IMAGE_ARCHIVE_START_SIZE             8
+#define IMAGE_ARCHIVE_START                  "!<arch>\n"
+#define IMAGE_ARCHIVE_END                    "`\n"
+#define IMAGE_ARCHIVE_PAD                    "\n"
+#define IMAGE_ARCHIVE_LINKER_MEMBER          "/               "
+#define IMAGE_ARCHIVE_LONGNAMES_MEMBER       "//              "
+
+typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER {
+    BYTE     Name[16];                          // File member name - `/' terminated.
+    BYTE     Date[12];                          // File member date - decimal.
+    BYTE     UserID[6];                         // File member user id - decimal.
+    BYTE     GroupID[6];                        // File member group id - decimal.
+    BYTE     Mode[8];                           // File member mode - octal.
+    BYTE     Size[10];                          // File member size - decimal.
+    BYTE     EndHeader[2];                      // String to end header.
+} IMAGE_ARCHIVE_MEMBER_HEADER, *PIMAGE_ARCHIVE_MEMBER_HEADER;
+
+#define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR      60
+
+//
+// DLL support.
+//
+
+//
+// Export Format
+//
+
+typedef struct _IMAGE_EXPORT_DIRECTORY {
+    DWORD   Characteristics;
+    DWORD   TimeDateStamp;
+    WORD    MajorVersion;
+    WORD    MinorVersion;
+    DWORD   Name;
+    DWORD   Base;
+    DWORD   NumberOfFunctions;
+    DWORD   NumberOfNames;
+    DWORD   AddressOfFunctions;     // RVA from base of image
+    DWORD   AddressOfNames;         // RVA from base of image
+    DWORD   AddressOfNameOrdinals;  // RVA from base of image
+} IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY;
+
+//
+// Import Format
+//
+
+typedef struct _IMAGE_IMPORT_BY_NAME {
+    WORD    Hint;
+    BYTE    Name[1];
+} IMAGE_IMPORT_BY_NAME, *PIMAGE_IMPORT_BY_NAME;
+
+#include "pshpack8.h"                       // Use align 8 for the 64-bit IAT.
+
+typedef struct _IMAGE_THUNK_DATA64 {
+    union {
+        ULONGLONG ForwarderString;  // PBYTE 
+        ULONGLONG Function;         // PDWORD
+        ULONGLONG Ordinal;
+        ULONGLONG AddressOfData;    // PIMAGE_IMPORT_BY_NAME
+    } u1;
+} IMAGE_THUNK_DATA64;
+typedef IMAGE_THUNK_DATA64 * PIMAGE_THUNK_DATA64;
+
+#include "poppack.h"                        // Back to 4 byte packing
+
+typedef struct _IMAGE_THUNK_DATA32 {
+    union {
+        DWORD ForwarderString;      // PBYTE 
+        DWORD Function;             // PDWORD
+        DWORD Ordinal;
+        DWORD AddressOfData;        // PIMAGE_IMPORT_BY_NAME
+    } u1;
+} IMAGE_THUNK_DATA32;
+typedef IMAGE_THUNK_DATA32 * PIMAGE_THUNK_DATA32;
+
+#define IMAGE_ORDINAL_FLAG64 0x8000000000000000
+#define IMAGE_ORDINAL_FLAG32 0x80000000
+#define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff)
+#define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff)
+#define IMAGE_SNAP_BY_ORDINAL64(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG64) != 0)
+#define IMAGE_SNAP_BY_ORDINAL32(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG32) != 0)
+
+//
+// Thread Local Storage
+//
+
+typedef VOID
+(NTAPI *PIMAGE_TLS_CALLBACK) (
+    PVOID DllHandle,
+    DWORD Reason,
+    PVOID Reserved
+    );
+
+typedef struct _IMAGE_TLS_DIRECTORY64 {
+    ULONGLONG   StartAddressOfRawData;
+    ULONGLONG   EndAddressOfRawData;
+    ULONGLONG   AddressOfIndex;         // PDWORD
+    ULONGLONG   AddressOfCallBacks;     // PIMAGE_TLS_CALLBACK *;
+    DWORD   SizeOfZeroFill;
+    DWORD   Characteristics;
+} IMAGE_TLS_DIRECTORY64;
+typedef IMAGE_TLS_DIRECTORY64 * PIMAGE_TLS_DIRECTORY64;
+
+typedef struct _IMAGE_TLS_DIRECTORY32 {
+    DWORD   StartAddressOfRawData;
+    DWORD   EndAddressOfRawData;
+    DWORD   AddressOfIndex;             // PDWORD
+    DWORD   AddressOfCallBacks;         // PIMAGE_TLS_CALLBACK *
+    DWORD   SizeOfZeroFill;
+    DWORD   Characteristics;
+} IMAGE_TLS_DIRECTORY32;
+typedef IMAGE_TLS_DIRECTORY32 * PIMAGE_TLS_DIRECTORY32;
+
+#ifdef _WIN64
+#define IMAGE_ORDINAL_FLAG              IMAGE_ORDINAL_FLAG64
+#define IMAGE_ORDINAL(Ordinal)          IMAGE_ORDINAL64(Ordinal)
+typedef IMAGE_THUNK_DATA64              IMAGE_THUNK_DATA;
+typedef PIMAGE_THUNK_DATA64             PIMAGE_THUNK_DATA;
+#define IMAGE_SNAP_BY_ORDINAL(Ordinal)  IMAGE_SNAP_BY_ORDINAL64(Ordinal)
+typedef IMAGE_TLS_DIRECTORY64           IMAGE_TLS_DIRECTORY;
+typedef PIMAGE_TLS_DIRECTORY64          PIMAGE_TLS_DIRECTORY;
+#else
+#define IMAGE_ORDINAL_FLAG              IMAGE_ORDINAL_FLAG32
+#define IMAGE_ORDINAL(Ordinal)          IMAGE_ORDINAL32(Ordinal)
+typedef IMAGE_THUNK_DATA32              IMAGE_THUNK_DATA;
+typedef PIMAGE_THUNK_DATA32             PIMAGE_THUNK_DATA;
+#define IMAGE_SNAP_BY_ORDINAL(Ordinal)  IMAGE_SNAP_BY_ORDINAL32(Ordinal)
+typedef IMAGE_TLS_DIRECTORY32           IMAGE_TLS_DIRECTORY;
+typedef PIMAGE_TLS_DIRECTORY32          PIMAGE_TLS_DIRECTORY;
+#endif
+
+typedef struct _IMAGE_IMPORT_DESCRIPTOR {
+    union {
+        DWORD   Characteristics;            // 0 for terminating null import descriptor
+        DWORD   OriginalFirstThunk;         // RVA to original unbound IAT (PIMAGE_THUNK_DATA)
+    };
+    DWORD   TimeDateStamp;                  // 0 if not bound,
+                                            // -1 if bound, and real date\time stamp
+                                            //     in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT (new BIND)
+                                            // O.W. date/time stamp of DLL bound to (Old BIND)
+
+    DWORD   ForwarderChain;                 // -1 if no forwarders
+    DWORD   Name;
+    DWORD   FirstThunk;                     // RVA to IAT (if bound this IAT has actual addresses)
+} IMAGE_IMPORT_DESCRIPTOR;
+typedef IMAGE_IMPORT_DESCRIPTOR UNALIGNED *PIMAGE_IMPORT_DESCRIPTOR;
+
+//
+// New format import descriptors pointed to by DataDirectory[ IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT ]
+//
+
+typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR {
+    DWORD   TimeDateStamp;
+    WORD    OffsetModuleName;
+    WORD    NumberOfModuleForwarderRefs;
+// Array of zero or more IMAGE_BOUND_FORWARDER_REF follows
+} IMAGE_BOUND_IMPORT_DESCRIPTOR,  *PIMAGE_BOUND_IMPORT_DESCRIPTOR;
+
+typedef struct _IMAGE_BOUND_FORWARDER_REF {
+    DWORD   TimeDateStamp;
+    WORD    OffsetModuleName;
+    WORD    Reserved;
+} IMAGE_BOUND_FORWARDER_REF, *PIMAGE_BOUND_FORWARDER_REF;
+
+//
+// Resource Format.
+//
+
+//
+// Resource directory consists of two counts, following by a variable length
+// array of directory entries.  The first count is the number of entries at
+// beginning of the array that have actual names associated with each entry.
+// The entries are in ascending order, case insensitive strings.  The second
+// count is the number of entries that immediately follow the named entries.
+// This second count identifies the number of entries that have 16-bit integer
+// Ids as their name.  These entries are also sorted in ascending order.
+//
+// This structure allows fast lookup by either name or number, but for any
+// given resource entry only one form of lookup is supported, not both.
+// This is consistant with the syntax of the .RC file and the .RES file.
+//
+
+typedef struct _IMAGE_RESOURCE_DIRECTORY {
+    DWORD   Characteristics;
+    DWORD   TimeDateStamp;
+    WORD    MajorVersion;
+    WORD    MinorVersion;
+    WORD    NumberOfNamedEntries;
+    WORD    NumberOfIdEntries;
+//  IMAGE_RESOURCE_DIRECTORY_ENTRY DirectoryEntries[];
+} IMAGE_RESOURCE_DIRECTORY, *PIMAGE_RESOURCE_DIRECTORY;
+
+#define IMAGE_RESOURCE_NAME_IS_STRING        0x80000000
+#define IMAGE_RESOURCE_DATA_IS_DIRECTORY     0x80000000
+//
+// Each directory contains the 32-bit Name of the entry and an offset,
+// relative to the beginning of the resource directory of the data associated
+// with this directory entry.  If the name of the entry is an actual text
+// string instead of an integer Id, then the high order bit of the name field
+// is set to one and the low order 31-bits are an offset, relative to the
+// beginning of the resource directory of the string, which is of type
+// IMAGE_RESOURCE_DIRECTORY_STRING.  Otherwise the high bit is clear and the
+// low-order 16-bits are the integer Id that identify this resource directory
+// entry. If the directory entry is yet another resource directory (i.e. a
+// subdirectory), then the high order bit of the offset field will be
+// set to indicate this.  Otherwise the high bit is clear and the offset
+// field points to a resource data entry.
+//
+
+typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY {
+    union {
+        struct {
+            DWORD NameOffset:31;
+            DWORD NameIsString:1;
+        };
+        DWORD   Name;
+        WORD    Id;
+    };
+    union {
+        DWORD   OffsetToData;
+        struct {
+            DWORD   OffsetToDirectory:31;
+            DWORD   DataIsDirectory:1;
+        };
+    };
+} IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY;
+
+//
+// For resource directory entries that have actual string names, the Name
+// field of the directory entry points to an object of the following type.
+// All of these string objects are stored together after the last resource
+// directory entry and before the first resource data object.  This minimizes
+// the impact of these variable length objects on the alignment of the fixed
+// size directory entry objects.
+//
+
+typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING {
+    WORD    Length;
+    CHAR    NameString[ 1 ];
+} IMAGE_RESOURCE_DIRECTORY_STRING, *PIMAGE_RESOURCE_DIRECTORY_STRING;
+
+
+typedef struct _IMAGE_RESOURCE_DIR_STRING_U {
+    WORD    Length;
+    WCHAR   NameString[ 1 ];
+} IMAGE_RESOURCE_DIR_STRING_U, *PIMAGE_RESOURCE_DIR_STRING_U;
+
+
+//
+// Each resource data entry describes a leaf node in the resource directory
+// tree.  It contains an offset, relative to the beginning of the resource
+// directory of the data for the resource, a size field that gives the number
+// of bytes of data at that offset, a CodePage that should be used when
+// decoding code point values within the resource data.  Typically for new
+// applications the code page would be the unicode code page.
+//
+
+typedef struct _IMAGE_RESOURCE_DATA_ENTRY {
+    DWORD   OffsetToData;
+    DWORD   Size;
+    DWORD   CodePage;
+    DWORD   Reserved;
+} IMAGE_RESOURCE_DATA_ENTRY, *PIMAGE_RESOURCE_DATA_ENTRY;
+
+//
+// Load Configuration Directory Entry
+//
+
+typedef struct {
+    DWORD   Size;
+    DWORD   TimeDateStamp;
+    WORD    MajorVersion;
+    WORD    MinorVersion;
+    DWORD   GlobalFlagsClear;
+    DWORD   GlobalFlagsSet;
+    DWORD   CriticalSectionDefaultTimeout;
+    DWORD   DeCommitFreeBlockThreshold;
+    DWORD   DeCommitTotalFreeThreshold;
+    DWORD   LockPrefixTable;            // VA
+    DWORD   MaximumAllocationSize;
+    DWORD   VirtualMemoryThreshold;
+    DWORD   ProcessHeapFlags;
+    DWORD   ProcessAffinityMask;
+    WORD    CSDVersion;
+    WORD    Reserved1;
+    DWORD   EditList;                   // VA
+    DWORD   SecurityCookie;             // VA
+    DWORD   SEHandlerTable;             // VA
+    DWORD   SEHandlerCount;
+} IMAGE_LOAD_CONFIG_DIRECTORY32, *PIMAGE_LOAD_CONFIG_DIRECTORY32;
+
+typedef struct {
+    DWORD      Size;
+    DWORD      TimeDateStamp;
+    WORD       MajorVersion;
+    WORD       MinorVersion;
+    DWORD      GlobalFlagsClear;
+    DWORD      GlobalFlagsSet;
+    DWORD      CriticalSectionDefaultTimeout;
+    ULONGLONG  DeCommitFreeBlockThreshold;
+    ULONGLONG  DeCommitTotalFreeThreshold;
+    ULONGLONG  LockPrefixTable;         // VA
+    ULONGLONG  MaximumAllocationSize;
+    ULONGLONG  VirtualMemoryThreshold;
+    ULONGLONG  ProcessAffinityMask;
+    DWORD      ProcessHeapFlags;
+    WORD       CSDVersion;
+    WORD       Reserved1;
+    ULONGLONG  EditList;                // VA
+    ULONGLONG  SecurityCookie;          // VA
+    ULONGLONG  SEHandlerTable;          // VA
+    ULONGLONG  SEHandlerCount;
+} IMAGE_LOAD_CONFIG_DIRECTORY64, *PIMAGE_LOAD_CONFIG_DIRECTORY64;
+
+#ifdef _WIN64
+typedef IMAGE_LOAD_CONFIG_DIRECTORY64     IMAGE_LOAD_CONFIG_DIRECTORY;
+typedef PIMAGE_LOAD_CONFIG_DIRECTORY64    PIMAGE_LOAD_CONFIG_DIRECTORY;
+#else
+typedef IMAGE_LOAD_CONFIG_DIRECTORY32     IMAGE_LOAD_CONFIG_DIRECTORY;
+typedef PIMAGE_LOAD_CONFIG_DIRECTORY32    PIMAGE_LOAD_CONFIG_DIRECTORY;
+#endif
+
+//
+// WIN CE Exception table format
+//
+
+//
+// Function table entry format.  Function table is pointed to by the
+// IMAGE_DIRECTORY_ENTRY_EXCEPTION directory entry.
+//
+
+typedef struct _IMAGE_CE_RUNTIME_FUNCTION_ENTRY {
+    DWORD FuncStart;
+    DWORD PrologLen : 8;
+    DWORD FuncLen : 22;
+    DWORD ThirtyTwoBit : 1;
+    DWORD ExceptionFlag : 1;
+} IMAGE_CE_RUNTIME_FUNCTION_ENTRY, * PIMAGE_CE_RUNTIME_FUNCTION_ENTRY;
+
+typedef struct _IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY {
+    ULONGLONG BeginAddress;
+    ULONGLONG EndAddress;
+    ULONGLONG ExceptionHandler;
+    ULONGLONG HandlerData;
+    ULONGLONG PrologEndAddress;
+} IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY, *PIMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY;
+
+typedef struct _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY {
+    DWORD BeginAddress;
+    DWORD EndAddress;
+    DWORD ExceptionHandler;
+    DWORD HandlerData;
+    DWORD PrologEndAddress;
+} IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY, *PIMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY;
+
+typedef struct _IMAGE_RUNTIME_FUNCTION_ENTRY {
+    DWORD BeginAddress;
+    DWORD EndAddress;
+    DWORD UnwindInfoAddress;
+} _IMAGE_RUNTIME_FUNCTION_ENTRY, *_PIMAGE_RUNTIME_FUNCTION_ENTRY;
+
+typedef  _IMAGE_RUNTIME_FUNCTION_ENTRY  IMAGE_IA64_RUNTIME_FUNCTION_ENTRY;
+typedef _PIMAGE_RUNTIME_FUNCTION_ENTRY PIMAGE_IA64_RUNTIME_FUNCTION_ENTRY;
+
+#if defined(_AXP64_)
+
+typedef  IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY  IMAGE_AXP64_RUNTIME_FUNCTION_ENTRY;
+typedef PIMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY PIMAGE_AXP64_RUNTIME_FUNCTION_ENTRY;
+typedef  IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY  IMAGE_RUNTIME_FUNCTION_ENTRY;
+typedef PIMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY PIMAGE_RUNTIME_FUNCTION_ENTRY;
+
+#elif defined(_ALPHA_)
+
+typedef  IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY  IMAGE_RUNTIME_FUNCTION_ENTRY;
+typedef PIMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY PIMAGE_RUNTIME_FUNCTION_ENTRY;
+
+#else
+
+typedef  _IMAGE_RUNTIME_FUNCTION_ENTRY  IMAGE_RUNTIME_FUNCTION_ENTRY;
+typedef _PIMAGE_RUNTIME_FUNCTION_ENTRY PIMAGE_RUNTIME_FUNCTION_ENTRY;
+
+#endif
+
+//
+// Debug Format
+//
+
+typedef struct _IMAGE_DEBUG_DIRECTORY {
+    DWORD   Characteristics;
+    DWORD   TimeDateStamp;
+    WORD    MajorVersion;
+    WORD    MinorVersion;
+    DWORD   Type;
+    DWORD   SizeOfData;
+    DWORD   AddressOfRawData;
+    DWORD   PointerToRawData;
+} IMAGE_DEBUG_DIRECTORY, *PIMAGE_DEBUG_DIRECTORY;
+
+#define IMAGE_DEBUG_TYPE_UNKNOWN          0
+#define IMAGE_DEBUG_TYPE_COFF             1
+#define IMAGE_DEBUG_TYPE_CODEVIEW         2
+#define IMAGE_DEBUG_TYPE_FPO              3
+#define IMAGE_DEBUG_TYPE_MISC             4
+#define IMAGE_DEBUG_TYPE_EXCEPTION        5
+#define IMAGE_DEBUG_TYPE_FIXUP            6
+#define IMAGE_DEBUG_TYPE_OMAP_TO_SRC      7
+#define IMAGE_DEBUG_TYPE_OMAP_FROM_SRC    8
+#define IMAGE_DEBUG_TYPE_BORLAND          9
+#define IMAGE_DEBUG_TYPE_RESERVED10       10
+#define IMAGE_DEBUG_TYPE_CLSID            11
+
+
+typedef struct _IMAGE_COFF_SYMBOLS_HEADER {
+    DWORD   NumberOfSymbols;
+    DWORD   LvaToFirstSymbol;
+    DWORD   NumberOfLinenumbers;
+    DWORD   LvaToFirstLinenumber;
+    DWORD   RvaToFirstByteOfCode;
+    DWORD   RvaToLastByteOfCode;
+    DWORD   RvaToFirstByteOfData;
+    DWORD   RvaToLastByteOfData;
+} IMAGE_COFF_SYMBOLS_HEADER, *PIMAGE_COFF_SYMBOLS_HEADER;
+
+#define FRAME_FPO       0
+#define FRAME_TRAP      1
+#define FRAME_TSS       2
+#define FRAME_NONFPO    3
+
+typedef struct _FPO_DATA {
+    DWORD       ulOffStart;             // offset 1st byte of function code
+    DWORD       cbProcSize;             // # bytes in function
+    DWORD       cdwLocals;              // # bytes in locals/4
+    WORD        cdwParams;              // # bytes in params/4
+    WORD        cbProlog : 8;           // # bytes in prolog
+    WORD        cbRegs   : 3;           // # regs saved
+    WORD        fHasSEH  : 1;           // TRUE if SEH in func
+    WORD        fUseBP   : 1;           // TRUE if EBP has been allocated
+    WORD        reserved : 1;           // reserved for future use
+    WORD        cbFrame  : 2;           // frame type
+} FPO_DATA, *PFPO_DATA;
+#define SIZEOF_RFPO_DATA 16
+
+
+#define IMAGE_DEBUG_MISC_EXENAME    1
+
+typedef struct _IMAGE_DEBUG_MISC {
+    DWORD       DataType;               // type of misc data, see defines
+    DWORD       Length;                 // total length of record, rounded to four
+                                        // byte multiple.
+    BOOLEAN     Unicode;                // TRUE if data is unicode string
+    BYTE        Reserved[ 3 ];
+    BYTE        Data[ 1 ];              // Actual data
+} IMAGE_DEBUG_MISC, *PIMAGE_DEBUG_MISC;
+
+
+//
+// Function table extracted from MIPS/ALPHA/IA64 images.  Does not contain
+// information needed only for runtime support.  Just those fields for
+// each entry needed by a debugger.
+//
+
+typedef struct _IMAGE_FUNCTION_ENTRY {
+    DWORD   StartingAddress;
+    DWORD   EndingAddress;
+    DWORD   EndOfPrologue;
+} IMAGE_FUNCTION_ENTRY, *PIMAGE_FUNCTION_ENTRY;
+
+typedef struct _IMAGE_FUNCTION_ENTRY64 {
+    ULONGLONG   StartingAddress;
+    ULONGLONG   EndingAddress;
+    union {
+        ULONGLONG   EndOfPrologue;
+        ULONGLONG   UnwindInfoAddress;
+    };
+} IMAGE_FUNCTION_ENTRY64, *PIMAGE_FUNCTION_ENTRY64;
+
+//
+// Debugging information can be stripped from an image file and placed
+// in a separate .DBG file, whose file name part is the same as the
+// image file name part (e.g. symbols for CMD.EXE could be stripped
+// and placed in CMD.DBG).  This is indicated by the IMAGE_FILE_DEBUG_STRIPPED
+// flag in the Characteristics field of the file header.  The beginning of
+// the .DBG file contains the following structure which captures certain
+// information from the image file.  This allows a debug to proceed even if
+// the original image file is not accessable.  This header is followed by
+// zero of more IMAGE_SECTION_HEADER structures, followed by zero or more
+// IMAGE_DEBUG_DIRECTORY structures.  The latter structures and those in
+// the image file contain file offsets relative to the beginning of the
+// .DBG file.
+//
+// If symbols have been stripped from an image, the IMAGE_DEBUG_MISC structure
+// is left in the image file, but not mapped.  This allows a debugger to
+// compute the name of the .DBG file, from the name of the image in the
+// IMAGE_DEBUG_MISC structure.
+//
+
+typedef struct _IMAGE_SEPARATE_DEBUG_HEADER {
+    WORD        Signature;
+    WORD        Flags;
+    WORD        Machine;
+    WORD        Characteristics;
+    DWORD       TimeDateStamp;
+    DWORD       CheckSum;
+    DWORD       ImageBase;
+    DWORD       SizeOfImage;
+    DWORD       NumberOfSections;
+    DWORD       ExportedNamesSize;
+    DWORD       DebugDirectorySize;
+    DWORD       SectionAlignment;
+    DWORD       Reserved[2];
+} IMAGE_SEPARATE_DEBUG_HEADER, *PIMAGE_SEPARATE_DEBUG_HEADER;
+
+typedef struct _NON_PAGED_DEBUG_INFO {
+    WORD        Signature;
+    WORD        Flags;
+    DWORD       Size;
+    WORD        Machine;
+    WORD        Characteristics;
+    DWORD       TimeDateStamp;
+    DWORD       CheckSum;
+    DWORD       SizeOfImage;
+    ULONGLONG   ImageBase;
+    //DebugDirectorySize
+    //IMAGE_DEBUG_DIRECTORY
+} NON_PAGED_DEBUG_INFO, *PNON_PAGED_DEBUG_INFO;
+
+#ifndef _MAC
+#define IMAGE_SEPARATE_DEBUG_SIGNATURE 0x4944
+#define NON_PAGED_DEBUG_SIGNATURE      0x494E
+#else
+#define IMAGE_SEPARATE_DEBUG_SIGNATURE 0x4449  // DI
+#define NON_PAGED_DEBUG_SIGNATURE      0x4E49  // NI
+#endif
+
+#define IMAGE_SEPARATE_DEBUG_FLAGS_MASK 0x8000
+#define IMAGE_SEPARATE_DEBUG_MISMATCH   0x8000  // when DBG was updated, the
+                                                // old checksum didn't match.
+
+//
+//  The .arch section is made up of headers, each describing an amask position/value
+//  pointing to an array of IMAGE_ARCHITECTURE_ENTRY's.  Each "array" (both the header
+//  and entry arrays) are terminiated by a quadword of 0xffffffffL.
+//
+//  NOTE: There may be quadwords of 0 sprinkled around and must be skipped.
+//
+
+typedef struct _ImageArchitectureHeader {
+    unsigned int AmaskValue: 1;                 // 1 -> code section depends on mask bit
+                                                // 0 -> new instruction depends on mask bit
+    int :7;                                     // MBZ
+    unsigned int AmaskShift: 8;                 // Amask bit in question for this fixup
+    int :16;                                    // MBZ
+    DWORD FirstEntryRVA;                        // RVA into .arch section to array of ARCHITECTURE_ENTRY's
+} IMAGE_ARCHITECTURE_HEADER, *PIMAGE_ARCHITECTURE_HEADER;
+
+typedef struct _ImageArchitectureEntry {
+    DWORD FixupInstRVA;                         // RVA of instruction to fixup
+    DWORD NewInst;                              // fixup instruction (see alphaops.h)
+} IMAGE_ARCHITECTURE_ENTRY, *PIMAGE_ARCHITECTURE_ENTRY;
+
+#include "poppack.h"                // Back to the initial value
+
+// The following structure defines the new import object.  Note the values of the first two fields,
+// which must be set as stated in order to differentiate old and new import members.
+// Following this structure, the linker emits two null-terminated strings used to recreate the
+// import at the time of use.  The first string is the import's name, the second is the dll's name.
+
+#define IMPORT_OBJECT_HDR_SIG2  0xffff
+
+typedef struct IMPORT_OBJECT_HEADER {
+    WORD    Sig1;                       // Must be IMAGE_FILE_MACHINE_UNKNOWN
+    WORD    Sig2;                       // Must be IMPORT_OBJECT_HDR_SIG2.
+    WORD    Version;
+    WORD    Machine;
+    DWORD   TimeDateStamp;              // Time/date stamp
+    DWORD   SizeOfData;                 // particularly useful for incremental links
+
+    union {
+        WORD    Ordinal;                // if grf & IMPORT_OBJECT_ORDINAL
+        WORD    Hint;
+    };
+
+    WORD    Type : 2;                   // IMPORT_TYPE
+    WORD    NameType : 3;               // IMPORT_NAME_TYPE
+    WORD    Reserved : 11;              // Reserved. Must be zero.
+} IMPORT_OBJECT_HEADER;
+
+typedef enum IMPORT_OBJECT_TYPE
+{
+    IMPORT_OBJECT_CODE = 0,
+    IMPORT_OBJECT_DATA = 1,
+    IMPORT_OBJECT_CONST = 2,
+} IMPORT_OBJECT_TYPE;
+
+typedef enum IMPORT_OBJECT_NAME_TYPE
+{
+    IMPORT_OBJECT_ORDINAL = 0,          // Import by ordinal
+    IMPORT_OBJECT_NAME = 1,             // Import name == public symbol name.
+    IMPORT_OBJECT_NAME_NO_PREFIX = 2,   // Import name == public symbol name skipping leading ?, @, or optionally _.
+    IMPORT_OBJECT_NAME_UNDECORATE = 3,  // Import name == public symbol name skipping leading ?, @, or optionally _
+                                        // and truncating at first @
+} IMPORT_OBJECT_NAME_TYPE;
+
+
+#ifndef __IMAGE_COR20_HEADER_DEFINED__
+#define __IMAGE_COR20_HEADER_DEFINED__
+
+typedef enum ReplacesCorHdrNumericDefines
+{
+// COM+ Header entry point flags.
+    COMIMAGE_FLAGS_ILONLY               =0x00000001,
+    COMIMAGE_FLAGS_32BITREQUIRED        =0x00000002,
+    COMIMAGE_FLAGS_IL_LIBRARY           =0x00000004,
+    COMIMAGE_FLAGS_STRONGNAMESIGNED     =0x00000008,
+    COMIMAGE_FLAGS_TRACKDEBUGDATA       =0x00010000,
+
+// Version flags for image.
+    COR_VERSION_MAJOR_V2                =2,
+    COR_VERSION_MAJOR                   =COR_VERSION_MAJOR_V2,
+    COR_VERSION_MINOR                   =0,
+    COR_DELETED_NAME_LENGTH             =8,
+    COR_VTABLEGAP_NAME_LENGTH           =8,
+
+// Maximum size of a NativeType descriptor.
+    NATIVE_TYPE_MAX_CB                  =1,   
+    COR_ILMETHOD_SECT_SMALL_MAX_DATASIZE=0xFF,
+
+// #defines for the MIH FLAGS
+    IMAGE_COR_MIH_METHODRVA             =0x01,
+    IMAGE_COR_MIH_EHRVA                 =0x02,    
+    IMAGE_COR_MIH_BASICBLOCK            =0x08,
+
+// V-table constants
+    COR_VTABLE_32BIT                    =0x01,          // V-table slots are 32-bits in size.   
+    COR_VTABLE_64BIT                    =0x02,          // V-table slots are 64-bits in size.   
+    COR_VTABLE_FROM_UNMANAGED           =0x04,          // If set, transition from unmanaged.
+    COR_VTABLE_CALL_MOST_DERIVED        =0x10,          // Call most derived method described by
+
+// EATJ constants
+    IMAGE_COR_EATJ_THUNK_SIZE           =32,            // Size of a jump thunk reserved range.
+
+// Max name lengths    
+    //@todo: Change to unlimited name lengths.
+    MAX_CLASS_NAME                      =1024,
+    MAX_PACKAGE_NAME                    =1024,
+} ReplacesCorHdrNumericDefines;
+
+// COM+ 2.0 header structure.
+typedef struct IMAGE_COR20_HEADER
+{
+    // Header versioning
+    DWORD                   cb;              
+    WORD                    MajorRuntimeVersion;
+    WORD                    MinorRuntimeVersion;
+    
+    // Symbol table and startup information
+    IMAGE_DATA_DIRECTORY    MetaData;        
+    DWORD                   Flags;           
+    DWORD                   EntryPointToken;
+    
+    // Binding information
+    IMAGE_DATA_DIRECTORY    Resources;
+    IMAGE_DATA_DIRECTORY    StrongNameSignature;
+
+    // Regular fixup and binding information
+    IMAGE_DATA_DIRECTORY    CodeManagerTable;
+    IMAGE_DATA_DIRECTORY    VTableFixups;
+    IMAGE_DATA_DIRECTORY    ExportAddressTableJumps;
+
+    // Precompiled image info (internal use only - set to zero)
+    IMAGE_DATA_DIRECTORY    ManagedNativeHeader;
+    
+} IMAGE_COR20_HEADER, *PIMAGE_COR20_HEADER;
+
+#endif // __IMAGE_COR20_HEADER_DEFINED__
+
+//
+// End Image Format
+//
+
+//
+// for move macros
+//
+#ifdef _MAC
+#ifndef _INC_STRING
+#include <string.h>
+#endif /* _INC_STRING */
+#else
+#include <string.h>
+#endif // _MAC
+
+
+#ifndef _SLIST_HEADER_
+#define _SLIST_HEADER_
+
+#if defined(_WIN64)
+
+//
+// The type SINGLE_LIST_ENTRY is not suitable for use with SLISTs.  For
+// WIN64, an entry on an SLIST is required to be 16-byte aligned, while a
+// SINGLE_LIST_ENTRY structure has only 8 byte alignment.
+//
+// Therefore, all SLIST code should use the SLIST_ENTRY type instead of the
+// SINGLE_LIST_ENTRY type.
+//
+
+#pragma warning(push)
+#pragma warning(disable:4324)   // structure padded due to align()
+typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY;
+typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
+    PSLIST_ENTRY Next;
+} SLIST_ENTRY;
+#pragma warning(pop)
+
+#else
+
+#define SLIST_ENTRY SINGLE_LIST_ENTRY
+#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
+#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
+
+#endif
+
+#if defined(_WIN64)
+
+typedef struct DECLSPEC_ALIGN(16) _SLIST_HEADER {
+    ULONGLONG Alignment;
+    ULONGLONG Region;
+} SLIST_HEADER;
+
+typedef struct _SLIST_HEADER *PSLIST_HEADER;
+
+#else
+
+typedef union _SLIST_HEADER {
+    ULONGLONG Alignment;
+    struct {
+        SLIST_ENTRY Next;
+        WORD   Depth;
+        WORD   Sequence;
+    };
+} SLIST_HEADER, *PSLIST_HEADER;
+
+#endif
+
+#endif
+
+
+NTSYSAPI
+VOID
+NTAPI
+RtlInitializeSListHead (
+    IN PSLIST_HEADER ListHead
+    );
+
+NTSYSAPI
+PSLIST_ENTRY
+RtlFirstEntrySList (
+    IN const SLIST_HEADER *ListHead
+    );
+
+NTSYSAPI
+PSLIST_ENTRY
+NTAPI
+RtlInterlockedPopEntrySList (
+    IN PSLIST_HEADER ListHead
+    );
+
+NTSYSAPI
+PSLIST_ENTRY
+NTAPI
+RtlInterlockedPushEntrySList (
+    IN PSLIST_HEADER ListHead,
+    IN PSLIST_ENTRY ListEntry
+    );
+
+NTSYSAPI
+PSLIST_ENTRY
+NTAPI
+RtlInterlockedFlushSList (
+    IN PSLIST_HEADER ListHead
+    );
+
+NTSYSAPI
+WORD  
+NTAPI
+RtlQueryDepthSList (
+    IN PSLIST_HEADER ListHead
+    );
+
+#define HEAP_NO_SERIALIZE               0x00000001      
+#define HEAP_GROWABLE                   0x00000002      
+#define HEAP_GENERATE_EXCEPTIONS        0x00000004      
+#define HEAP_ZERO_MEMORY                0x00000008      
+#define HEAP_REALLOC_IN_PLACE_ONLY      0x00000010      
+#define HEAP_TAIL_CHECKING_ENABLED      0x00000020      
+#define HEAP_FREE_CHECKING_ENABLED      0x00000040      
+#define HEAP_DISABLE_COALESCE_ON_FREE   0x00000080      
+#define HEAP_CREATE_ALIGN_16            0x00010000      
+#define HEAP_CREATE_ENABLE_TRACING      0x00020000      
+#define HEAP_MAXIMUM_TAG                0x0FFF              
+#define HEAP_PSEUDO_TAG_FLAG            0x8000              
+#define HEAP_TAG_SHIFT                  18                  
+#define HEAP_MAKE_TAG_FLAGS( b, o ) ((DWORD)((b) + ((o) << 18)))  
+
+#define IS_TEXT_UNICODE_ASCII16               0x0001
+#define IS_TEXT_UNICODE_REVERSE_ASCII16       0x0010
+
+#define IS_TEXT_UNICODE_STATISTICS            0x0002
+#define IS_TEXT_UNICODE_REVERSE_STATISTICS    0x0020
+
+#define IS_TEXT_UNICODE_CONTROLS              0x0004
+#define IS_TEXT_UNICODE_REVERSE_CONTROLS      0x0040
+
+#define IS_TEXT_UNICODE_SIGNATURE             0x0008
+#define IS_TEXT_UNICODE_REVERSE_SIGNATURE     0x0080
+
+#define IS_TEXT_UNICODE_ILLEGAL_CHARS         0x0100
+#define IS_TEXT_UNICODE_ODD_LENGTH            0x0200
+#define IS_TEXT_UNICODE_DBCS_LEADBYTE         0x0400
+#define IS_TEXT_UNICODE_NULL_BYTES            0x1000
+
+#define IS_TEXT_UNICODE_UNICODE_MASK          0x000F
+#define IS_TEXT_UNICODE_REVERSE_MASK          0x00F0
+#define IS_TEXT_UNICODE_NOT_UNICODE_MASK      0x0F00
+#define IS_TEXT_UNICODE_NOT_ASCII_MASK        0xF000
+
+#define COMPRESSION_FORMAT_NONE          (0x0000)   
+#define COMPRESSION_FORMAT_DEFAULT       (0x0001)   
+#define COMPRESSION_FORMAT_LZNT1         (0x0002)   
+#define COMPRESSION_ENGINE_STANDARD      (0x0000)   
+#define COMPRESSION_ENGINE_MAXIMUM       (0x0100)   
+#define COMPRESSION_ENGINE_HIBER         (0x0200)   
+
+NTSYSAPI
+SIZE_T
+NTAPI
+RtlCompareMemory (
+    const VOID *Source1,
+    const VOID *Source2,
+    SIZE_T Length
+    );
+
+#define RtlEqualMemory(Destination,Source,Length) (!memcmp((Destination),(Source),(Length)))
+
+#if defined(_M_AMD64)
+
+NTSYSAPI
+VOID
+NTAPI
+RtlCopyMemory (
+    VOID UNALIGNED *Destination,
+    CONST VOID UNALIGNED *Source,
+    SIZE_T Length
+    );
+
+NTSYSAPI
+VOID
+NTAPI
+RtlMoveMemory (
+    VOID UNALIGNED *Destination,
+    CONST VOID UNALIGNED *Source,
+    SIZE_T Length
+    );
+
+NTSYSAPI
+VOID
+NTAPI
+RtlFillMemory (
+    VOID UNALIGNED *Destination,
+    SIZE_T Length,
+    IN BYTE  Fill
+    );
+
+NTSYSAPI
+VOID
+NTAPI
+RtlZeroMemory (
+    VOID UNALIGNED *Destination,
+    SIZE_T Length
+    );
+
+#else
+
+#define RtlMoveMemory(Destination,Source,Length) memmove((Destination),(Source),(Length))
+#define RtlCopyMemory(Destination,Source,Length) memcpy((Destination),(Source),(Length))
+#define RtlFillMemory(Destination,Length,Fill) memset((Destination),(Fill),(Length))
+#define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length))
+
+#endif
+
+#if !defined(MIDL_PASS)
+FORCEINLINE
+PVOID
+RtlSecureZeroMemory(
+    IN PVOID ptr,
+    IN SIZE_T cnt
+    )
+{
+    volatile char *vptr = (volatile char *)ptr;
+    while (cnt) {
+        *vptr = 0;
+        vptr++;
+        cnt--;
+    }
+    return ptr;
+}
+#endif
+
+
+typedef struct _MESSAGE_RESOURCE_ENTRY {
+    WORD   Length;
+    WORD   Flags;
+    BYTE  Text[ 1 ];
+} MESSAGE_RESOURCE_ENTRY, *PMESSAGE_RESOURCE_ENTRY;
+
+#define MESSAGE_RESOURCE_UNICODE 0x0001
+
+typedef struct _MESSAGE_RESOURCE_BLOCK {
+    DWORD LowId;
+    DWORD HighId;
+    DWORD OffsetToEntries;
+} MESSAGE_RESOURCE_BLOCK, *PMESSAGE_RESOURCE_BLOCK;
+
+typedef struct _MESSAGE_RESOURCE_DATA {
+    DWORD NumberOfBlocks;
+    MESSAGE_RESOURCE_BLOCK Blocks[ 1 ];
+} MESSAGE_RESOURCE_DATA, *PMESSAGE_RESOURCE_DATA;
+
+typedef struct _OSVERSIONINFOA {
+    DWORD dwOSVersionInfoSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformId;
+    CHAR   szCSDVersion[ 128 ];     // Maintenance string for PSS usage
+} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA;
+
+typedef struct _OSVERSIONINFOW {
+    DWORD dwOSVersionInfoSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformId;
+    WCHAR  szCSDVersion[ 128 ];     // Maintenance string for PSS usage
+} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW;
+#ifdef UNICODE
+typedef OSVERSIONINFOW OSVERSIONINFO;
+typedef POSVERSIONINFOW POSVERSIONINFO;
+typedef LPOSVERSIONINFOW LPOSVERSIONINFO;
+#else
+typedef OSVERSIONINFOA OSVERSIONINFO;
+typedef POSVERSIONINFOA POSVERSIONINFO;
+typedef LPOSVERSIONINFOA LPOSVERSIONINFO;
+#endif // UNICODE
+
+typedef struct _OSVERSIONINFOEXA {
+    DWORD dwOSVersionInfoSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformId;
+    CHAR   szCSDVersion[ 128 ];     // Maintenance string for PSS usage
+    WORD   wServicePackMajor;
+    WORD   wServicePackMinor;
+    WORD   wSuiteMask;
+    BYTE  wProductType;
+    BYTE  wReserved;
+} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
+typedef struct _OSVERSIONINFOEXW {
+    DWORD dwOSVersionInfoSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformId;
+    WCHAR  szCSDVersion[ 128 ];     // Maintenance string for PSS usage
+    WORD   wServicePackMajor;
+    WORD   wServicePackMinor;
+    WORD   wSuiteMask;
+    BYTE  wProductType;
+    BYTE  wReserved;
+} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW;
+#ifdef UNICODE
+typedef OSVERSIONINFOEXW OSVERSIONINFOEX;
+typedef POSVERSIONINFOEXW POSVERSIONINFOEX;
+typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX;
+#else
+typedef OSVERSIONINFOEXA OSVERSIONINFOEX;
+typedef POSVERSIONINFOEXA POSVERSIONINFOEX;
+typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX;
+#endif // UNICODE
+
+//
+// RtlVerifyVersionInfo() conditions
+//
+
+#define VER_EQUAL                       1
+#define VER_GREATER                     2
+#define VER_GREATER_EQUAL               3
+#define VER_LESS                        4
+#define VER_LESS_EQUAL                  5
+#define VER_AND                         6
+#define VER_OR                          7
+
+#define VER_CONDITION_MASK              7
+#define VER_NUM_BITS_PER_CONDITION_MASK 3
+
+//
+// RtlVerifyVersionInfo() type mask bits
+//
+
+#define VER_MINORVERSION                0x0000001
+#define VER_MAJORVERSION                0x0000002
+#define VER_BUILDNUMBER                 0x0000004
+#define VER_PLATFORMID                  0x0000008
+#define VER_SERVICEPACKMINOR            0x0000010
+#define VER_SERVICEPACKMAJOR            0x0000020
+#define VER_SUITENAME                   0x0000040
+#define VER_PRODUCT_TYPE                0x0000080
+
+//
+// RtlVerifyVersionInfo() os product type values
+//
+
+#define VER_NT_WORKSTATION              0x0000001
+#define VER_NT_DOMAIN_CONTROLLER        0x0000002
+#define VER_NT_SERVER                   0x0000003
+
+//
+// dwPlatformId defines:
+//
+
+#define VER_PLATFORM_WIN32s             0
+#define VER_PLATFORM_WIN32_WINDOWS      1
+#define VER_PLATFORM_WIN32_NT           2
+
+
+//
+//
+// VerifyVersionInfo() macro to set the condition mask
+//
+// For documentation sakes here's the old version of the macro that got
+// changed to call an API
+// #define VER_SET_CONDITION(_m_,_t_,_c_)  _m_=(_m_|(_c_<<(1<<_t_)))
+//
+
+#define VER_SET_CONDITION(_m_,_t_,_c_)  \
+        ((_m_)=VerSetConditionMask((_m_),(_t_),(_c_)))
+
+ULONGLONG
+NTAPI
+VerSetConditionMask(
+        IN  ULONGLONG   ConditionMask,
+        IN  DWORD   TypeMask,
+        IN  BYTE    Condition
+        );
+//
+
+typedef struct _RTL_CRITICAL_SECTION_DEBUG {
+    WORD   Type;
+    WORD   CreatorBackTraceIndex;
+    struct _RTL_CRITICAL_SECTION *CriticalSection;
+    LIST_ENTRY ProcessLocksList;
+    DWORD EntryCount;
+    DWORD ContentionCount;
+    DWORD Spare[ 2 ];
+} RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG;
+
+#define RTL_CRITSECT_TYPE 0
+#define RTL_RESOURCE_TYPE 1
+
+typedef struct _RTL_CRITICAL_SECTION {
+    PRTL_CRITICAL_SECTION_DEBUG DebugInfo;
+
+    //
+    //  The following three fields control entering and exiting the critical
+    //  section for the resource
+    //
+
+    LONG LockCount;
+    LONG RecursionCount;
+    HANDLE OwningThread;        // from the thread's ClientId->UniqueThread
+    HANDLE LockSemaphore;
+    ULONG_PTR SpinCount;        // force size on 64-bit systems when packed
+} RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION;
+
+typedef VOID (NTAPI * RTL_VERIFIER_DLL_LOAD_CALLBACK) (
+    PWSTR DllName,
+    PVOID DllBase,
+    SIZE_T DllSize,
+    PVOID Reserved
+    );
+
+typedef VOID (NTAPI * RTL_VERIFIER_DLL_UNLOAD_CALLBACK) (
+    PWSTR DllName,
+    PVOID DllBase,
+    SIZE_T DllSize,
+    PVOID Reserved
+    );
+
+typedef struct _RTL_VERIFIER_THUNK_DESCRIPTOR {
+
+    PCHAR ThunkName;
+    PVOID ThunkOldAddress;
+    PVOID ThunkNewAddress;
+
+} RTL_VERIFIER_THUNK_DESCRIPTOR, *PRTL_VERIFIER_THUNK_DESCRIPTOR;
+
+typedef struct _RTL_VERIFIER_DLL_DESCRIPTOR {
+
+    PWCHAR DllName;
+    DWORD DllFlags;
+    PVOID DllAddress;
+    PRTL_VERIFIER_THUNK_DESCRIPTOR DllThunks;
+
+} RTL_VERIFIER_DLL_DESCRIPTOR, *PRTL_VERIFIER_DLL_DESCRIPTOR;
+
+typedef struct _RTL_VERIFIER_PROVIDER_DESCRIPTOR {
+
+    //
+    // Filled by verifier provider DLL
+    // 
+
+    DWORD Length;        
+    PRTL_VERIFIER_DLL_DESCRIPTOR ProviderDlls;
+    RTL_VERIFIER_DLL_LOAD_CALLBACK ProviderDllLoadCallback;
+    RTL_VERIFIER_DLL_UNLOAD_CALLBACK ProviderDllUnloadCallback;
+    
+    //
+    // Filled by verifier engine
+    //
+        
+    PWSTR VerifierImage;
+    DWORD VerifierFlags;
+    DWORD VerifierDebug;
+    
+    PVOID RtlpGetStackTraceAddress;
+    PVOID RtlpDebugPageHeapCreate;
+    PVOID RtlpDebugPageHeapDestroy;
+
+} RTL_VERIFIER_PROVIDER_DESCRIPTOR, *PRTL_VERIFIER_PROVIDER_DESCRIPTOR;
+
+//
+// Application verifier standard flags
+//
+
+#define RTL_VRF_FLG_FULL_PAGE_HEAP                   0x00000001
+#define RTL_VRF_FLG_RESERVED_DONOTUSE                0x00000002 // old RTL_VRF_FLG_LOCK_CHECKS
+#define RTL_VRF_FLG_HANDLE_CHECKS                    0x00000004
+#define RTL_VRF_FLG_STACK_CHECKS                     0x00000008
+#define RTL_VRF_FLG_APPCOMPAT_CHECKS                 0x00000010
+#define RTL_VRF_FLG_TLS_CHECKS                       0x00000020
+#define RTL_VRF_FLG_DIRTY_STACKS                     0x00000040
+#define RTL_VRF_FLG_RPC_CHECKS                       0x00000080
+#define RTL_VRF_FLG_COM_CHECKS                       0x00000100
+#define RTL_VRF_FLG_DANGEROUS_APIS                   0x00000200
+#define RTL_VRF_FLG_RACE_CHECKS                      0x00000400
+#define RTL_VRF_FLG_DEADLOCK_CHECKS                  0x00000800
+#define RTL_VRF_FLG_FIRST_CHANCE_EXCEPTION_CHECKS    0x00001000
+#define RTL_VRF_FLG_VIRTUAL_MEM_CHECKS               0x00002000
+#define RTL_VRF_FLG_ENABLE_LOGGING                   0x00004000
+#define RTL_VRF_FLG_FAST_FILL_HEAP                   0x00008000
+#define RTL_VRF_FLG_VIRTUAL_SPACE_TRACKING           0x00010000
+#define RTL_VRF_FLG_ENABLED_SYSTEM_WIDE              0x00020000
+#define RTL_VRF_FLG_MISCELLANEOUS_CHECKS             0x00020000
+#define RTL_VRF_FLG_LOCK_CHECKS                      0x00040000
+
+//
+// Application verifier standard stop codes
+//
+
+#define APPLICATION_VERIFIER_INTERNAL_ERROR               0x80000000
+#define APPLICATION_VERIFIER_INTERNAL_WARNING             0x40000000
+#define APPLICATION_VERIFIER_NO_BREAK                     0x20000000
+#define APPLICATION_VERIFIER_CONTINUABLE_BREAK            0x10000000
+
+#define APPLICATION_VERIFIER_UNKNOWN_ERROR                0x0001
+#define APPLICATION_VERIFIER_ACCESS_VIOLATION             0x0002
+#define APPLICATION_VERIFIER_UNSYNCHRONIZED_ACCESS        0x0003
+#define APPLICATION_VERIFIER_EXTREME_SIZE_REQUEST         0x0004
+#define APPLICATION_VERIFIER_BAD_HEAP_HANDLE              0x0005
+#define APPLICATION_VERIFIER_SWITCHED_HEAP_HANDLE         0x0006
+#define APPLICATION_VERIFIER_DOUBLE_FREE                  0x0007
+#define APPLICATION_VERIFIER_CORRUPTED_HEAP_BLOCK         0x0008
+#define APPLICATION_VERIFIER_DESTROY_PROCESS_HEAP         0x0009
+#define APPLICATION_VERIFIER_UNEXPECTED_EXCEPTION         0x000A
+#define APPLICATION_VERIFIER_STACK_OVERFLOW               0x000B
+
+#define APPLICATION_VERIFIER_TERMINATE_THREAD_CALL        0x0100
+#define APPLICATION_VERIFIER_INVALID_EXIT_PROCESS_CALL    0x0101
+
+#define APPLICATION_VERIFIER_EXIT_THREAD_OWNS_LOCK        0x0200
+#define APPLICATION_VERIFIER_LOCK_IN_UNLOADED_DLL         0x0201
+#define APPLICATION_VERIFIER_LOCK_IN_FREED_HEAP           0x0202
+#define APPLICATION_VERIFIER_LOCK_DOUBLE_INITIALIZE       0x0203
+#define APPLICATION_VERIFIER_LOCK_IN_FREED_MEMORY         0x0204
+#define APPLICATION_VERIFIER_LOCK_CORRUPTED               0x0205
+#define APPLICATION_VERIFIER_LOCK_INVALID_OWNER           0x0206
+#define APPLICATION_VERIFIER_LOCK_INVALID_RECURSION_COUNT 0x0207
+#define APPLICATION_VERIFIER_LOCK_INVALID_LOCK_COUNT      0x0208
+#define APPLICATION_VERIFIER_LOCK_OVER_RELEASED           0x0209
+#define APPLICATION_VERIFIER_LOCK_NOT_INITIALIZED         0x0210
+#define APPLICATION_VERIFIER_LOCK_ALREADY_INITIALIZED     0x0211
+
+#define APPLICATION_VERIFIER_INVALID_HANDLE               0x0300
+#define APPLICATION_VERIFIER_INVALID_TLS_VALUE            0x0301
+#define APPLICATION_VERIFIER_INCORRECT_WAIT_CALL          0x0302
+#define APPLICATION_VERIFIER_NULL_HANDLE                  0x0303
+#define APPLICATION_VERIFIER_WAIT_IN_DLLMAIN              0x0304
+
+#define APPLICATION_VERIFIER_COM_ERROR                    0x0400
+#define APPLICATION_VERIFIER_COM_API_IN_DLLMAIN           0x0401
+#define APPLICATION_VERIFIER_COM_UNHANDLED_EXCEPTION      0x0402
+#define APPLICATION_VERIFIER_COM_UNBALANCED_COINIT        0x0403
+#define APPLICATION_VERIFIER_COM_UNBALANCED_OLEINIT       0x0404
+#define APPLICATION_VERIFIER_COM_UNBALANCED_SWC           0x0405
+#define APPLICATION_VERIFIER_COM_NULL_DACL                0x0406
+#define APPLICATION_VERIFIER_COM_UNSAFE_IMPERSONATION     0x0407
+#define APPLICATION_VERIFIER_COM_SMUGGLED_WRAPPER         0x0408
+#define APPLICATION_VERIFIER_COM_SMUGGLED_PROXY           0x0409
+#define APPLICATION_VERIFIER_COM_CF_SUCCESS_WITH_NULL     0x040A
+#define APPLICATION_VERIFIER_COM_GCO_SUCCESS_WITH_NULL    0x040B
+#define APPLICATION_VERIFIER_COM_OBJECT_IN_FREED_MEMORY   0x040C
+#define APPLICATION_VERIFIER_COM_OBJECT_IN_UNLOADED_DLL   0x040D
+#define APPLICATION_VERIFIER_COM_VTBL_IN_FREED_MEMORY     0x040E
+#define APPLICATION_VERIFIER_COM_VTBL_IN_UNLOADED_DLL     0x040F
+#define APPLICATION_VERIFIER_COM_HOLDING_LOCKS_ON_CALL    0x0410
+
+#define APPLICATION_VERIFIER_RPC_ERROR                    0x0500
+
+#define APPLICATION_VERIFIER_INVALID_FREEMEM              0x0600
+#define APPLICATION_VERIFIER_INVALID_ALLOCMEM             0x0601
+#define APPLICATION_VERIFIER_INVALID_MAPVIEW              0x0602
+#define APPLICATION_VERIFIER_PROBE_INVALID_ADDRESS        0x0603
+#define APPLICATION_VERIFIER_PROBE_FREE_MEM               0x0604
+#define APPLICATION_VERIFIER_PROBE_GUARD_PAGE             0x0605
+#define APPLICATION_VERIFIER_PROBE_NULL                   0x0606
+#define APPLICATION_VERIFIER_PROBE_INVALID_START_OR_SIZE  0x0607
+
+
+#define VERIFIER_STOP(Code, Msg, P1, S1, P2, S2, P3, S3, P4, S4) {  \
+        RtlApplicationVerifierStop ((Code),                         \
+                                    (Msg),                          \
+                                    (ULONG_PTR)(P1),(S1),           \
+                                    (ULONG_PTR)(P2),(S2),           \
+                                    (ULONG_PTR)(P3),(S3),           \
+                                    (ULONG_PTR)(P4),(S4));          \
+  }
+
+VOID
+NTAPI
+RtlApplicationVerifierStop (
+    ULONG_PTR Code,
+    PCHAR Message,
+    ULONG_PTR Param1, PCHAR Description1,
+    ULONG_PTR Param2, PCHAR Description2,
+    ULONG_PTR Param3, PCHAR Description3,
+    ULONG_PTR Param4, PCHAR Description4
+    );
+
+typedef LONG (NTAPI *PVECTORED_EXCEPTION_HANDLER)(
+    struct _EXCEPTION_POINTERS *ExceptionInfo
+    );
+#define SEF_DACL_AUTO_INHERIT             0x01
+#define SEF_SACL_AUTO_INHERIT             0x02
+#define SEF_DEFAULT_DESCRIPTOR_FOR_OBJECT 0x04
+#define SEF_AVOID_PRIVILEGE_CHECK         0x08
+#define SEF_AVOID_OWNER_CHECK             0x10
+#define SEF_DEFAULT_OWNER_FROM_PARENT     0x20
+#define SEF_DEFAULT_GROUP_FROM_PARENT     0x40
+
+typedef enum _HEAP_INFORMATION_CLASS {
+
+    HeapCompatibilityInformation
+
+} HEAP_INFORMATION_CLASS;
+
+
+DWORD   
+NTAPI
+RtlSetHeapInformation (
+    IN PVOID HeapHandle,
+    IN HEAP_INFORMATION_CLASS HeapInformationClass,
+    IN PVOID HeapInformation OPTIONAL,
+    IN SIZE_T HeapInformationLength OPTIONAL
+    );
+
+DWORD   
+NTAPI
+RtlQueryHeapInformation (
+    IN PVOID HeapHandle,
+    IN HEAP_INFORMATION_CLASS HeapInformationClass,
+    OUT PVOID HeapInformation OPTIONAL,
+    IN SIZE_T HeapInformationLength OPTIONAL,
+    OUT PSIZE_T ReturnLength OPTIONAL
+    );
+
+//
+//  Multiple alloc-free APIS
+//
+
+DWORD
+NTAPI
+RtlMultipleAllocateHeap (
+    IN PVOID HeapHandle,
+    IN DWORD Flags,
+    IN SIZE_T Size,
+    IN DWORD Count,
+    OUT PVOID * Array
+    );
+
+DWORD
+NTAPI
+RtlMultipleFreeHeap (
+    IN PVOID HeapHandle,
+    IN DWORD Flags,
+    IN DWORD Count,
+    OUT PVOID * Array
+    );
+    
+#define WT_EXECUTEDEFAULT       0x00000000                           
+#define WT_EXECUTEINIOTHREAD    0x00000001                           
+#define WT_EXECUTEINUITHREAD    0x00000002                           
+#define WT_EXECUTEINWAITTHREAD  0x00000004                           
+#define WT_EXECUTEONLYONCE      0x00000008                           
+#define WT_EXECUTEINTIMERTHREAD 0x00000020                           
+#define WT_EXECUTELONGFUNCTION  0x00000010                           
+#define WT_EXECUTEINPERSISTENTIOTHREAD  0x00000040                   
+#define WT_EXECUTEINPERSISTENTTHREAD 0x00000080                      
+#define WT_TRANSFER_IMPERSONATION 0x00000100                         
+#define WT_SET_MAX_THREADPOOL_THREADS(Flags, Limit)  ((Flags) |= (Limit)<<16) 
+typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );   
+typedef VOID (NTAPI * WORKERCALLBACKFUNC) (PVOID );                 
+typedef VOID (NTAPI * APC_CALLBACK_FUNCTION) (DWORD   , PVOID, PVOID); 
+#define WT_EXECUTEINLONGTHREAD  0x00000010                           
+#define WT_EXECUTEDELETEWAIT    0x00000008                           
+
+typedef enum _ACTIVATION_CONTEXT_INFO_CLASS {
+    ActivationContextBasicInformation                       = 1,
+    ActivationContextDetailedInformation                    = 2,
+    AssemblyDetailedInformationInActivationContext          = 3,
+    FileInformationInAssemblyOfAssemblyInActivationContext  = 4,
+    MaxActivationContextInfoClass,
+
+    //
+    // compatibility with old names
+    //
+    AssemblyDetailedInformationInActivationContxt           = 3,
+    FileInformationInAssemblyOfAssemblyInActivationContxt   = 4
+} ACTIVATION_CONTEXT_INFO_CLASS;
+
+#define ACTIVATIONCONTEXTINFOCLASS ACTIVATION_CONTEXT_INFO_CLASS
+
+
+typedef struct _ACTIVATION_CONTEXT_QUERY_INDEX {
+    DWORD ulAssemblyIndex; 
+    DWORD ulFileIndexInAssembly; 
+} ACTIVATION_CONTEXT_QUERY_INDEX, * PACTIVATION_CONTEXT_QUERY_INDEX;
+
+typedef const struct _ACTIVATION_CONTEXT_QUERY_INDEX * PCACTIVATION_CONTEXT_QUERY_INDEX;
+
+
+#define ACTIVATION_CONTEXT_PATH_TYPE_NONE (1)
+#define ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE (2)
+#define ACTIVATION_CONTEXT_PATH_TYPE_URL (3)
+#define ACTIVATION_CONTEXT_PATH_TYPE_ASSEMBLYREF (4)
+
+typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION {
+    DWORD ulFlags;
+    DWORD ulFilenameLength;
+    DWORD ulPathLength; 
+
+    PCWSTR lpFileName;
+    PCWSTR lpFilePath;   
+} ASSEMBLY_FILE_DETAILED_INFORMATION, *PASSEMBLY_FILE_DETAILED_INFORMATION;
+typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION;
+
+//
+// compatibility with old names
+// The new names use "file" consistently.
+//
+#define  _ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION  _ASSEMBLY_FILE_DETAILED_INFORMATION
+#define   ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION   ASSEMBLY_FILE_DETAILED_INFORMATION
+#define  PASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION  PASSEMBLY_FILE_DETAILED_INFORMATION
+#define PCASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION PCASSEMBLY_FILE_DETAILED_INFORMATION
+
+typedef struct _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION {
+    DWORD ulFlags;
+    DWORD ulEncodedAssemblyIdentityLength;      // in bytes
+    DWORD ulManifestPathType;                   // ACTIVATION_CONTEXT_PATH_TYPE_*
+    DWORD ulManifestPathLength;                 // in bytes
+    LARGE_INTEGER liManifestLastWriteTime;      // FILETIME
+    DWORD ulPolicyPathType;                     // ACTIVATION_CONTEXT_PATH_TYPE_*
+    DWORD ulPolicyPathLength;                   // in bytes
+    LARGE_INTEGER liPolicyLastWriteTime;        // FILETIME
+    DWORD ulMetadataSatelliteRosterIndex;
+    
+    DWORD ulManifestVersionMajor;               // 1
+    DWORD ulManifestVersionMinor;               // 0
+    DWORD ulPolicyVersionMajor;                 // 0
+    DWORD ulPolicyVersionMinor;                 // 0
+    DWORD ulAssemblyDirectoryNameLength;        // in bytes
+
+    PCWSTR lpAssemblyEncodedAssemblyIdentity;
+    PCWSTR lpAssemblyManifestPath;
+    PCWSTR lpAssemblyPolicyPath;
+    PCWSTR lpAssemblyDirectoryName;
+
+    DWORD  ulFileCount;
+} ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION, * PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
+
+typedef const struct _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION * PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION ;
+
+typedef struct _ACTIVATION_CONTEXT_DETAILED_INFORMATION {
+    DWORD dwFlags;
+    DWORD ulFormatVersion;
+    DWORD ulAssemblyCount;
+    DWORD ulRootManifestPathType;
+    DWORD ulRootManifestPathChars;
+    DWORD ulRootConfigurationPathType;
+    DWORD ulRootConfigurationPathChars;
+    DWORD ulAppDirPathType;
+    DWORD ulAppDirPathChars;
+    PCWSTR lpRootManifestPath;
+    PCWSTR lpRootConfigurationPath;
+    PCWSTR lpAppDirPath;
+} ACTIVATION_CONTEXT_DETAILED_INFORMATION, *PACTIVATION_CONTEXT_DETAILED_INFORMATION;
+
+typedef const struct _ACTIVATION_CONTEXT_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_DETAILED_INFORMATION;
+
+#define DLL_PROCESS_ATTACH   1    
+#define DLL_THREAD_ATTACH    2    
+#define DLL_THREAD_DETACH    3    
+#define DLL_PROCESS_DETACH   0    
+#define DLL_PROCESS_VERIFIER 4    
+
+//
+// Defines for the READ flags for Eventlogging
+//
+#define EVENTLOG_SEQUENTIAL_READ        0x0001
+#define EVENTLOG_SEEK_READ              0x0002
+#define EVENTLOG_FORWARDS_READ          0x0004
+#define EVENTLOG_BACKWARDS_READ         0x0008
+
+//
+// The types of events that can be logged.
+//
+#define EVENTLOG_SUCCESS                0x0000
+#define EVENTLOG_ERROR_TYPE             0x0001
+#define EVENTLOG_WARNING_TYPE           0x0002
+#define EVENTLOG_INFORMATION_TYPE       0x0004
+#define EVENTLOG_AUDIT_SUCCESS          0x0008
+#define EVENTLOG_AUDIT_FAILURE          0x0010
+
+//
+// Defines for the WRITE flags used by Auditing for paired events
+// These are not implemented in Product 1
+//
+
+#define EVENTLOG_START_PAIRED_EVENT    0x0001
+#define EVENTLOG_END_PAIRED_EVENT      0x0002
+#define EVENTLOG_END_ALL_PAIRED_EVENTS 0x0004
+#define EVENTLOG_PAIRED_EVENT_ACTIVE   0x0008
+#define EVENTLOG_PAIRED_EVENT_INACTIVE 0x0010
+
+//
+// Structure that defines the header of the Eventlog record. This is the
+// fixed-sized portion before all the variable-length strings, binary
+// data and pad bytes.
+//
+// TimeGenerated is the time it was generated at the client.
+// TimeWritten is the time it was put into the log at the server end.
+//
+
+typedef struct _EVENTLOGRECORD {
+    DWORD  Length;        // Length of full record
+    DWORD  Reserved;      // Used by the service
+    DWORD  RecordNumber;  // Absolute record number
+    DWORD  TimeGenerated; // Seconds since 1-1-1970
+    DWORD  TimeWritten;   // Seconds since 1-1-1970
+    DWORD  EventID;
+    WORD   EventType;
+    WORD   NumStrings;
+    WORD   EventCategory;
+    WORD   ReservedFlags; // For use with paired events (auditing)
+    DWORD  ClosingRecordNumber; // For use with paired events (auditing)
+    DWORD  StringOffset;  // Offset from beginning of record
+    DWORD  UserSidLength;
+    DWORD  UserSidOffset;
+    DWORD  DataLength;
+    DWORD  DataOffset;    // Offset from beginning of record
+    //
+    // Then follow:
+    //
+    // WCHAR SourceName[]
+    // WCHAR Computername[]
+    // SID   UserSid
+    // WCHAR Strings[]
+    // BYTE  Data[]
+    // CHAR  Pad[]
+    // DWORD Length;
+    //
+} EVENTLOGRECORD, *PEVENTLOGRECORD;
+
+//SS: start of changes to support clustering
+//SS: ideally the
+#define MAXLOGICALLOGNAMESIZE   256
+
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable : 4200)
+typedef struct _EVENTSFORLOGFILE{
+    DWORD           ulSize;
+    WCHAR           szLogicalLogFile[MAXLOGICALLOGNAMESIZE];        //name of the logical file-security/application/system
+    DWORD           ulNumRecords;
+    EVENTLOGRECORD  pEventLogRecords[];
+}EVENTSFORLOGFILE, *PEVENTSFORLOGFILE;
+
+typedef struct _PACKEDEVENTINFO{
+    DWORD               ulSize;  //total size of the structure
+    DWORD               ulNumEventsForLogFile; //number of EventsForLogFile structure that follow
+    DWORD               ulOffsets[];           //the offsets from the start of this structure to the EVENTSFORLOGFILE structure
+}PACKEDEVENTINFO, *PPACKEDEVENTINFO;
+
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default : 4200)
+#endif
+//SS: end of changes to support clustering
+//
+
+// begin_ntddk begin_wdm begin_nthal
+//
+// Registry Specific Access Rights.
+//
+
+#define KEY_QUERY_VALUE         (0x0001)
+#define KEY_SET_VALUE           (0x0002)
+#define KEY_CREATE_SUB_KEY      (0x0004)
+#define KEY_ENUMERATE_SUB_KEYS  (0x0008)
+#define KEY_NOTIFY              (0x0010)
+#define KEY_CREATE_LINK         (0x0020)
+#define KEY_WOW64_32KEY         (0x0200)
+#define KEY_WOW64_64KEY         (0x0100)
+#define KEY_WOW64_RES           (0x0300)
+
+#define KEY_READ                ((STANDARD_RIGHTS_READ       |\
+                                  KEY_QUERY_VALUE            |\
+                                  KEY_ENUMERATE_SUB_KEYS     |\
+                                  KEY_NOTIFY)                 \
+                                  &                           \
+                                 (~SYNCHRONIZE))
+
+
+#define KEY_WRITE               ((STANDARD_RIGHTS_WRITE      |\
+                                  KEY_SET_VALUE              |\
+                                  KEY_CREATE_SUB_KEY)         \
+                                  &                           \
+                                 (~SYNCHRONIZE))
+
+#define KEY_EXECUTE             ((KEY_READ)                   \
+                                  &                           \
+                                 (~SYNCHRONIZE))
+
+#define KEY_ALL_ACCESS          ((STANDARD_RIGHTS_ALL        |\
+                                  KEY_QUERY_VALUE            |\
+                                  KEY_SET_VALUE              |\
+                                  KEY_CREATE_SUB_KEY         |\
+                                  KEY_ENUMERATE_SUB_KEYS     |\
+                                  KEY_NOTIFY                 |\
+                                  KEY_CREATE_LINK)            \
+                                  &                           \
+                                 (~SYNCHRONIZE))
+
+//
+// Open/Create Options
+//
+
+#define REG_OPTION_RESERVED         (0x00000000L)   // Parameter is reserved
+
+#define REG_OPTION_NON_VOLATILE     (0x00000000L)   // Key is preserved
+                                                    // when system is rebooted
+
+#define REG_OPTION_VOLATILE         (0x00000001L)   // Key is not preserved
+                                                    // when system is rebooted
+
+#define REG_OPTION_CREATE_LINK      (0x00000002L)   // Created key is a
+                                                    // symbolic link
+
+#define REG_OPTION_BACKUP_RESTORE   (0x00000004L)   // open for backup or restore
+                                                    // special access rules
+                                                    // privilege required
+
+#define REG_OPTION_OPEN_LINK        (0x00000008L)   // Open symbolic link
+
+#define REG_LEGAL_OPTION            \
+                (REG_OPTION_RESERVED            |\
+                 REG_OPTION_NON_VOLATILE        |\
+                 REG_OPTION_VOLATILE            |\
+                 REG_OPTION_CREATE_LINK         |\
+                 REG_OPTION_BACKUP_RESTORE      |\
+                 REG_OPTION_OPEN_LINK)
+
+//
+// Key creation/open disposition
+//
+
+#define REG_CREATED_NEW_KEY         (0x00000001L)   // New Registry Key created
+#define REG_OPENED_EXISTING_KEY     (0x00000002L)   // Existing Key opened
+
+//
+// hive format to be used by Reg(Nt)SaveKeyEx
+//
+#define REG_STANDARD_FORMAT     1
+#define REG_LATEST_FORMAT       2
+#define REG_NO_COMPRESSION      4
+
+//
+// Key restore flags
+//
+
+#define REG_WHOLE_HIVE_VOLATILE     (0x00000001L)   // Restore whole hive volatile
+#define REG_REFRESH_HIVE            (0x00000002L)   // Unwind changes to last flush
+#define REG_NO_LAZY_FLUSH           (0x00000004L)   // Never lazy flush this hive
+#define REG_FORCE_RESTORE           (0x00000008L)   // Force the restore process even when we have open handles on subkeys
+
+// end_ntddk end_wdm end_nthal
+
+//
+// Notify filter values
+//
+#define REG_NOTIFY_CHANGE_NAME          (0x00000001L) // Create or delete (child)
+#define REG_NOTIFY_CHANGE_ATTRIBUTES    (0x00000002L)
+#define REG_NOTIFY_CHANGE_LAST_SET      (0x00000004L) // time stamp
+#define REG_NOTIFY_CHANGE_SECURITY      (0x00000008L)
+
+#define REG_LEGAL_CHANGE_FILTER                 \
+                (REG_NOTIFY_CHANGE_NAME          |\
+                 REG_NOTIFY_CHANGE_ATTRIBUTES    |\
+                 REG_NOTIFY_CHANGE_LAST_SET      |\
+                 REG_NOTIFY_CHANGE_SECURITY)
+
+//
+//
+// Predefined Value Types.
+//
+
+#define REG_NONE                    ( 0 )   // No value type
+#define REG_SZ                      ( 1 )   // Unicode nul terminated string
+#define REG_EXPAND_SZ               ( 2 )   // Unicode nul terminated string
+                                            // (with environment variable references)
+#define REG_BINARY                  ( 3 )   // Free form binary
+#define REG_DWORD                   ( 4 )   // 32-bit number
+#define REG_DWORD_LITTLE_ENDIAN     ( 4 )   // 32-bit number (same as REG_DWORD)
+#define REG_DWORD_BIG_ENDIAN        ( 5 )   // 32-bit number
+#define REG_LINK                    ( 6 )   // Symbolic Link (unicode)
+#define REG_MULTI_SZ                ( 7 )   // Multiple Unicode strings
+#define REG_RESOURCE_LIST           ( 8 )   // Resource list in the resource map
+#define REG_FULL_RESOURCE_DESCRIPTOR ( 9 )  // Resource list in the hardware description
+#define REG_RESOURCE_REQUIREMENTS_LIST ( 10 )
+#define REG_QWORD                   ( 11 )  // 64-bit number
+#define REG_QWORD_LITTLE_ENDIAN     ( 11 )  // 64-bit number (same as REG_QWORD)
+
+// end_ntddk end_wdm end_nthal
+
+// begin_ntddk begin_wdm begin_nthal
+//
+// Service Types (Bit Mask)
+//
+#define SERVICE_KERNEL_DRIVER          0x00000001
+#define SERVICE_FILE_SYSTEM_DRIVER     0x00000002
+#define SERVICE_ADAPTER                0x00000004
+#define SERVICE_RECOGNIZER_DRIVER      0x00000008
+
+#define SERVICE_DRIVER                 (SERVICE_KERNEL_DRIVER | \
+                                        SERVICE_FILE_SYSTEM_DRIVER | \
+                                        SERVICE_RECOGNIZER_DRIVER)
+
+#define SERVICE_WIN32_OWN_PROCESS      0x00000010
+#define SERVICE_WIN32_SHARE_PROCESS    0x00000020
+#define SERVICE_WIN32                  (SERVICE_WIN32_OWN_PROCESS | \
+                                        SERVICE_WIN32_SHARE_PROCESS)
+
+#define SERVICE_INTERACTIVE_PROCESS    0x00000100
+
+#define SERVICE_TYPE_ALL               (SERVICE_WIN32  | \
+                                        SERVICE_ADAPTER | \
+                                        SERVICE_DRIVER  | \
+                                        SERVICE_INTERACTIVE_PROCESS)
+
+//
+// Start Type
+//
+
+#define SERVICE_BOOT_START             0x00000000
+#define SERVICE_SYSTEM_START           0x00000001
+#define SERVICE_AUTO_START             0x00000002
+#define SERVICE_DEMAND_START           0x00000003
+#define SERVICE_DISABLED               0x00000004
+
+//
+// Error control type
+//
+#define SERVICE_ERROR_IGNORE           0x00000000
+#define SERVICE_ERROR_NORMAL           0x00000001
+#define SERVICE_ERROR_SEVERE           0x00000002
+#define SERVICE_ERROR_CRITICAL         0x00000003
+
+//
+//
+// Define the registry driver node enumerations
+//
+
+typedef enum _CM_SERVICE_NODE_TYPE {
+    DriverType               = SERVICE_KERNEL_DRIVER,
+    FileSystemType           = SERVICE_FILE_SYSTEM_DRIVER,
+    Win32ServiceOwnProcess   = SERVICE_WIN32_OWN_PROCESS,
+    Win32ServiceShareProcess = SERVICE_WIN32_SHARE_PROCESS,
+    AdapterType              = SERVICE_ADAPTER,
+    RecognizerType           = SERVICE_RECOGNIZER_DRIVER
+} SERVICE_NODE_TYPE;
+
+typedef enum _CM_SERVICE_LOAD_TYPE {
+    BootLoad    = SERVICE_BOOT_START,
+    SystemLoad  = SERVICE_SYSTEM_START,
+    AutoLoad    = SERVICE_AUTO_START,
+    DemandLoad  = SERVICE_DEMAND_START,
+    DisableLoad = SERVICE_DISABLED
+} SERVICE_LOAD_TYPE;
+
+typedef enum _CM_ERROR_CONTROL_TYPE {
+    IgnoreError   = SERVICE_ERROR_IGNORE,
+    NormalError   = SERVICE_ERROR_NORMAL,
+    SevereError   = SERVICE_ERROR_SEVERE,
+    CriticalError = SERVICE_ERROR_CRITICAL
+} SERVICE_ERROR_TYPE;
+
+
+
+//
+// IOCTL_TAPE_ERASE definitions
+//
+
+#define TAPE_ERASE_SHORT            0L
+#define TAPE_ERASE_LONG             1L
+
+typedef struct _TAPE_ERASE {
+    DWORD Type;
+    BOOLEAN Immediate;
+} TAPE_ERASE, *PTAPE_ERASE;
+
+//
+// IOCTL_TAPE_PREPARE definitions
+//
+
+#define TAPE_LOAD                   0L
+#define TAPE_UNLOAD                 1L
+#define TAPE_TENSION                2L
+#define TAPE_LOCK                   3L
+#define TAPE_UNLOCK                 4L
+#define TAPE_FORMAT                 5L
+
+typedef struct _TAPE_PREPARE {
+    DWORD Operation;
+    BOOLEAN Immediate;
+} TAPE_PREPARE, *PTAPE_PREPARE;
+
+//
+// IOCTL_TAPE_WRITE_MARKS definitions
+//
+
+#define TAPE_SETMARKS               0L
+#define TAPE_FILEMARKS              1L
+#define TAPE_SHORT_FILEMARKS        2L
+#define TAPE_LONG_FILEMARKS         3L
+
+typedef struct _TAPE_WRITE_MARKS {
+    DWORD Type;
+    DWORD Count;
+    BOOLEAN Immediate;
+} TAPE_WRITE_MARKS, *PTAPE_WRITE_MARKS;
+
+//
+// IOCTL_TAPE_GET_POSITION definitions
+//
+
+#define TAPE_ABSOLUTE_POSITION       0L
+#define TAPE_LOGICAL_POSITION        1L
+#define TAPE_PSEUDO_LOGICAL_POSITION 2L
+
+typedef struct _TAPE_GET_POSITION {
+    DWORD Type;
+    DWORD Partition;
+    LARGE_INTEGER Offset;
+} TAPE_GET_POSITION, *PTAPE_GET_POSITION;
+
+//
+// IOCTL_TAPE_SET_POSITION definitions
+//
+
+#define TAPE_REWIND                 0L
+#define TAPE_ABSOLUTE_BLOCK         1L
+#define TAPE_LOGICAL_BLOCK          2L
+#define TAPE_PSEUDO_LOGICAL_BLOCK   3L
+#define TAPE_SPACE_END_OF_DATA      4L
+#define TAPE_SPACE_RELATIVE_BLOCKS  5L
+#define TAPE_SPACE_FILEMARKS        6L
+#define TAPE_SPACE_SEQUENTIAL_FMKS  7L
+#define TAPE_SPACE_SETMARKS         8L
+#define TAPE_SPACE_SEQUENTIAL_SMKS  9L
+
+typedef struct _TAPE_SET_POSITION {
+    DWORD Method;
+    DWORD Partition;
+    LARGE_INTEGER Offset;
+    BOOLEAN Immediate;
+} TAPE_SET_POSITION, *PTAPE_SET_POSITION;
+
+//
+// IOCTL_TAPE_GET_DRIVE_PARAMS definitions
+//
+
+//
+// Definitions for FeaturesLow parameter
+//
+
+#define TAPE_DRIVE_FIXED            0x00000001
+#define TAPE_DRIVE_SELECT           0x00000002
+#define TAPE_DRIVE_INITIATOR        0x00000004
+
+#define TAPE_DRIVE_ERASE_SHORT      0x00000010
+#define TAPE_DRIVE_ERASE_LONG       0x00000020
+#define TAPE_DRIVE_ERASE_BOP_ONLY   0x00000040
+#define TAPE_DRIVE_ERASE_IMMEDIATE  0x00000080
+
+#define TAPE_DRIVE_TAPE_CAPACITY    0x00000100
+#define TAPE_DRIVE_TAPE_REMAINING   0x00000200
+#define TAPE_DRIVE_FIXED_BLOCK      0x00000400
+#define TAPE_DRIVE_VARIABLE_BLOCK   0x00000800
+
+#define TAPE_DRIVE_WRITE_PROTECT    0x00001000
+#define TAPE_DRIVE_EOT_WZ_SIZE      0x00002000
+
+#define TAPE_DRIVE_ECC              0x00010000
+#define TAPE_DRIVE_COMPRESSION      0x00020000
+#define TAPE_DRIVE_PADDING          0x00040000
+#define TAPE_DRIVE_REPORT_SMKS      0x00080000
+
+#define TAPE_DRIVE_GET_ABSOLUTE_BLK 0x00100000
+#define TAPE_DRIVE_GET_LOGICAL_BLK  0x00200000
+#define TAPE_DRIVE_SET_EOT_WZ_SIZE  0x00400000
+
+#define TAPE_DRIVE_EJECT_MEDIA      0x01000000
+#define TAPE_DRIVE_CLEAN_REQUESTS   0x02000000
+#define TAPE_DRIVE_SET_CMP_BOP_ONLY 0x04000000
+
+#define TAPE_DRIVE_RESERVED_BIT     0x80000000  //don't use this bit!
+//                                              //can't be a low features bit!
+//                                              //reserved; high features only
+
+//
+// Definitions for FeaturesHigh parameter
+//
+
+#define TAPE_DRIVE_LOAD_UNLOAD      0x80000001
+#define TAPE_DRIVE_TENSION          0x80000002
+#define TAPE_DRIVE_LOCK_UNLOCK      0x80000004
+#define TAPE_DRIVE_REWIND_IMMEDIATE 0x80000008
+
+#define TAPE_DRIVE_SET_BLOCK_SIZE   0x80000010
+#define TAPE_DRIVE_LOAD_UNLD_IMMED  0x80000020
+#define TAPE_DRIVE_TENSION_IMMED    0x80000040
+#define TAPE_DRIVE_LOCK_UNLK_IMMED  0x80000080
+
+#define TAPE_DRIVE_SET_ECC          0x80000100
+#define TAPE_DRIVE_SET_COMPRESSION  0x80000200
+#define TAPE_DRIVE_SET_PADDING      0x80000400
+#define TAPE_DRIVE_SET_REPORT_SMKS  0x80000800
+
+#define TAPE_DRIVE_ABSOLUTE_BLK     0x80001000
+#define TAPE_DRIVE_ABS_BLK_IMMED    0x80002000
+#define TAPE_DRIVE_LOGICAL_BLK      0x80004000
+#define TAPE_DRIVE_LOG_BLK_IMMED    0x80008000
+
+#define TAPE_DRIVE_END_OF_DATA      0x80010000
+#define TAPE_DRIVE_RELATIVE_BLKS    0x80020000
+#define TAPE_DRIVE_FILEMARKS        0x80040000
+#define TAPE_DRIVE_SEQUENTIAL_FMKS  0x80080000
+
+#define TAPE_DRIVE_SETMARKS         0x80100000
+#define TAPE_DRIVE_SEQUENTIAL_SMKS  0x80200000
+#define TAPE_DRIVE_REVERSE_POSITION 0x80400000
+#define TAPE_DRIVE_SPACE_IMMEDIATE  0x80800000
+
+#define TAPE_DRIVE_WRITE_SETMARKS   0x81000000
+#define TAPE_DRIVE_WRITE_FILEMARKS  0x82000000
+#define TAPE_DRIVE_WRITE_SHORT_FMKS 0x84000000
+#define TAPE_DRIVE_WRITE_LONG_FMKS  0x88000000
+
+#define TAPE_DRIVE_WRITE_MARK_IMMED 0x90000000
+#define TAPE_DRIVE_FORMAT           0xA0000000
+#define TAPE_DRIVE_FORMAT_IMMEDIATE 0xC0000000
+#define TAPE_DRIVE_HIGH_FEATURES    0x80000000  //mask for high features flag
+
+typedef struct _TAPE_GET_DRIVE_PARAMETERS {
+    BOOLEAN ECC;
+    BOOLEAN Compression;
+    BOOLEAN DataPadding;
+    BOOLEAN ReportSetmarks;
+    DWORD DefaultBlockSize;
+    DWORD MaximumBlockSize;
+    DWORD MinimumBlockSize;
+    DWORD MaximumPartitionCount;
+    DWORD FeaturesLow;
+    DWORD FeaturesHigh;
+    DWORD EOTWarningZoneSize;
+} TAPE_GET_DRIVE_PARAMETERS, *PTAPE_GET_DRIVE_PARAMETERS;
+
+//
+// IOCTL_TAPE_SET_DRIVE_PARAMETERS definitions
+//
+
+typedef struct _TAPE_SET_DRIVE_PARAMETERS {
+    BOOLEAN ECC;
+    BOOLEAN Compression;
+    BOOLEAN DataPadding;
+    BOOLEAN ReportSetmarks;
+    DWORD EOTWarningZoneSize;
+} TAPE_SET_DRIVE_PARAMETERS, *PTAPE_SET_DRIVE_PARAMETERS;
+
+//
+// IOCTL_TAPE_GET_MEDIA_PARAMETERS definitions
+//
+
+typedef struct _TAPE_GET_MEDIA_PARAMETERS {
+    LARGE_INTEGER Capacity;
+    LARGE_INTEGER Remaining;
+    DWORD BlockSize;
+    DWORD PartitionCount;
+    BOOLEAN WriteProtected;
+} TAPE_GET_MEDIA_PARAMETERS, *PTAPE_GET_MEDIA_PARAMETERS;
+
+//
+// IOCTL_TAPE_SET_MEDIA_PARAMETERS definitions
+//
+
+typedef struct _TAPE_SET_MEDIA_PARAMETERS {
+    DWORD BlockSize;
+} TAPE_SET_MEDIA_PARAMETERS, *PTAPE_SET_MEDIA_PARAMETERS;
+
+//
+// IOCTL_TAPE_CREATE_PARTITION definitions
+//
+
+#define TAPE_FIXED_PARTITIONS       0L
+#define TAPE_SELECT_PARTITIONS      1L
+#define TAPE_INITIATOR_PARTITIONS   2L
+
+typedef struct _TAPE_CREATE_PARTITION {
+    DWORD Method;
+    DWORD Count;
+    DWORD Size;
+} TAPE_CREATE_PARTITION, *PTAPE_CREATE_PARTITION;
+
+
+//
+// WMI Methods
+//
+#define TAPE_QUERY_DRIVE_PARAMETERS       0L
+#define TAPE_QUERY_MEDIA_CAPACITY         1L
+#define TAPE_CHECK_FOR_DRIVE_PROBLEM      2L
+#define TAPE_QUERY_IO_ERROR_DATA          3L
+#define TAPE_QUERY_DEVICE_ERROR_DATA      4L
+
+typedef struct _TAPE_WMI_OPERATIONS {
+   DWORD Method;
+   DWORD DataBufferSize;
+   PVOID DataBuffer;
+} TAPE_WMI_OPERATIONS, *PTAPE_WMI_OPERATIONS;
+
+//
+// Type of drive errors
+//
+typedef enum _TAPE_DRIVE_PROBLEM_TYPE {
+   TapeDriveProblemNone, TapeDriveReadWriteWarning,
+   TapeDriveReadWriteError, TapeDriveReadWarning,
+   TapeDriveWriteWarning, TapeDriveReadError,
+   TapeDriveWriteError, TapeDriveHardwareError,
+   TapeDriveUnsupportedMedia, TapeDriveScsiConnectionError,
+   TapeDriveTimetoClean, TapeDriveCleanDriveNow,
+   TapeDriveMediaLifeExpired, TapeDriveSnappedTape
+} TAPE_DRIVE_PROBLEM_TYPE;
+
+
+#if defined(_M_AMD64) && !defined(__midl)
+
+
+__forceinline
+PVOID
+GetCurrentFiber (
+    VOID
+    )
+
+{
+
+    return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB, FiberData));
+}
+
+__forceinline
+PVOID
+GetFiberData (
+    VOID
+    )
+
+{
+
+    return *(PVOID *)GetCurrentFiber();
+}
+
+#endif // _M_AMD64 && !defined(__midl)
+
+#if (_WIN32_WINNT > 0x0500) || (_WIN32_FUSION >= 0x0100) || ISOLATION_AWARE_ENABLED // winnt_only
+#define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION         (1)
+#define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION              (2)
+#define ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION     (3)
+#define ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION       (4)
+#define ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION    (5)
+#define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION (6)
+#define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION       (7)
+#define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE   (8)
+#define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES               (9)
+#endif // winnt_only
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINNT_ */
+
diff --git a/base/Windows/Inc/WinNetWk.h b/base/Windows/Inc/WinNetWk.h
new file mode 100644
index 0000000..509dbf5
--- /dev/null
+++ b/base/Windows/Inc/WinNetWk.h
@@ -0,0 +1,893 @@
+/*++
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    winnetwk.h
+
+Abstract:
+
+    Standard WINNET Header File for WIN32
+
+Environment:
+
+    User Mode -Win32
+
+Notes:
+
+    optional-notes
+
+--*/
+
+#ifndef _WINNETWK_
+#define _WINNETWK_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+//
+// Network types
+//
+
+#define     WNNC_NET_MSNET       0x00010000
+#define     WNNC_NET_LANMAN      0x00020000
+#define     WNNC_NET_NETWARE     0x00030000
+#define     WNNC_NET_VINES       0x00040000
+#define     WNNC_NET_10NET       0x00050000
+#define     WNNC_NET_LOCUS       0x00060000
+#define     WNNC_NET_SUN_PC_NFS  0x00070000
+#define     WNNC_NET_LANSTEP     0x00080000
+#define     WNNC_NET_9TILES      0x00090000
+#define     WNNC_NET_LANTASTIC   0x000A0000
+#define     WNNC_NET_AS400       0x000B0000
+#define     WNNC_NET_FTP_NFS     0x000C0000
+#define     WNNC_NET_PATHWORKS   0x000D0000
+#define     WNNC_NET_LIFENET     0x000E0000
+#define     WNNC_NET_POWERLAN    0x000F0000
+#define     WNNC_NET_BWNFS       0x00100000
+#define     WNNC_NET_COGENT      0x00110000
+#define     WNNC_NET_FARALLON    0x00120000
+#define     WNNC_NET_APPLETALK   0x00130000
+#define     WNNC_NET_INTERGRAPH  0x00140000
+#define     WNNC_NET_SYMFONET    0x00150000
+#define     WNNC_NET_CLEARCASE   0x00160000
+#define     WNNC_NET_FRONTIER    0x00170000
+#define     WNNC_NET_BMC         0x00180000
+#define     WNNC_NET_DCE         0x00190000
+#define     WNNC_NET_AVID        0x001A0000
+#define     WNNC_NET_DOCUSPACE   0x001B0000
+#define     WNNC_NET_MANGOSOFT   0x001C0000
+#define     WNNC_NET_SERNET      0x001D0000
+#define     WNNC_NET_RIVERFRONT1 0X001E0000
+#define     WNNC_NET_RIVERFRONT2 0x001F0000
+#define     WNNC_NET_DECORB      0x00200000
+#define     WNNC_NET_PROTSTOR    0x00210000
+#define     WNNC_NET_FJ_REDIR    0x00220000
+#define     WNNC_NET_DISTINCT    0x00230000
+#define     WNNC_NET_TWINS       0x00240000
+#define     WNNC_NET_RDR2SAMPLE  0x00250000
+#define     WNNC_NET_CSC         0x00260000
+#define     WNNC_NET_3IN1        0x00270000
+#define     WNNC_NET_EXTENDNET   0x00290000
+#define     WNNC_NET_STAC        0x002A0000
+#define     WNNC_NET_FOXBAT      0x002B0000
+#define     WNNC_NET_YAHOO       0x002C0000
+#define     WNNC_NET_EXIFS       0x002D0000
+#define     WNNC_NET_DAV         0x002E0000
+#define     WNNC_NET_KNOWARE     0x002F0000
+#define     WNNC_NET_OBJECT_DIRE 0x00300000
+#define     WNNC_NET_MASFAX      0x00310000
+#define     WNNC_NET_HOB_NFS     0x00320000
+#define     WNNC_NET_SHIVA       0x00330000
+#define     WNNC_NET_IBMAL       0x00340000
+#define     WNNC_NET_LOCK        0x00350000
+#define     WNNC_NET_TERMSRV     0x00360000
+#define     WNNC_NET_SRT         0x00370000
+
+#define     WNNC_CRED_MANAGER   0xFFFF0000
+
+//
+//  Network Resources.
+//
+
+#define RESOURCE_CONNECTED      0x00000001
+#define RESOURCE_GLOBALNET      0x00000002
+#define RESOURCE_REMEMBERED     0x00000003
+#if(WINVER >= 0x0400)
+#define RESOURCE_RECENT         0x00000004
+#define RESOURCE_CONTEXT        0x00000005
+#endif /* WINVER >= 0x0400 */
+
+#define RESOURCETYPE_ANY        0x00000000
+#define RESOURCETYPE_DISK       0x00000001
+#define RESOURCETYPE_PRINT      0x00000002
+#if(WINVER >= 0x0400)
+#define RESOURCETYPE_RESERVED   0x00000008
+#endif /* WINVER >= 0x0400 */
+#define RESOURCETYPE_UNKNOWN    0xFFFFFFFF
+
+#define RESOURCEUSAGE_CONNECTABLE   0x00000001
+#define RESOURCEUSAGE_CONTAINER     0x00000002
+#if(WINVER >= 0x0400)
+#define RESOURCEUSAGE_NOLOCALDEVICE 0x00000004
+#define RESOURCEUSAGE_SIBLING       0x00000008
+#define RESOURCEUSAGE_ATTACHED      0x00000010
+#define RESOURCEUSAGE_ALL           (RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER | RESOURCEUSAGE_ATTACHED)
+#endif /* WINVER >= 0x0400 */
+#define RESOURCEUSAGE_RESERVED      0x80000000
+
+#define RESOURCEDISPLAYTYPE_GENERIC        0x00000000
+#define RESOURCEDISPLAYTYPE_DOMAIN         0x00000001
+#define RESOURCEDISPLAYTYPE_SERVER         0x00000002
+#define RESOURCEDISPLAYTYPE_SHARE          0x00000003
+#define RESOURCEDISPLAYTYPE_FILE           0x00000004
+#define RESOURCEDISPLAYTYPE_GROUP          0x00000005
+#if(WINVER >= 0x0400)
+#define RESOURCEDISPLAYTYPE_NETWORK        0x00000006
+#define RESOURCEDISPLAYTYPE_ROOT           0x00000007
+#define RESOURCEDISPLAYTYPE_SHAREADMIN     0x00000008
+#define RESOURCEDISPLAYTYPE_DIRECTORY      0x00000009
+#endif /* WINVER >= 0x0400 */
+#define RESOURCEDISPLAYTYPE_TREE           0x0000000A
+#if(WINVER >= 0x0400)
+#define RESOURCEDISPLAYTYPE_NDSCONTAINER   0x0000000B
+#endif /* WINVER >= 0x0400 */
+
+typedef struct  _NETRESOURCEA {
+    DWORD    dwScope;
+    DWORD    dwType;
+    DWORD    dwDisplayType;
+    DWORD    dwUsage;
+    LPSTR    lpLocalName;
+    LPSTR    lpRemoteName;
+    LPSTR    lpComment ;
+    LPSTR    lpProvider;
+}NETRESOURCEA, *LPNETRESOURCEA;
+typedef struct  _NETRESOURCEW {
+    DWORD    dwScope;
+    DWORD    dwType;
+    DWORD    dwDisplayType;
+    DWORD    dwUsage;
+    LPWSTR   lpLocalName;
+    LPWSTR   lpRemoteName;
+    LPWSTR   lpComment ;
+    LPWSTR   lpProvider;
+}NETRESOURCEW, *LPNETRESOURCEW;
+#ifdef UNICODE
+typedef NETRESOURCEW NETRESOURCE;
+typedef LPNETRESOURCEW LPNETRESOURCE;
+#else
+typedef NETRESOURCEA NETRESOURCE;
+typedef LPNETRESOURCEA LPNETRESOURCE;
+#endif // UNICODE
+
+
+//
+//  Network Connections.
+//
+
+#define NETPROPERTY_PERSISTENT       1
+
+#define CONNECT_UPDATE_PROFILE      0x00000001
+#define CONNECT_UPDATE_RECENT       0x00000002
+#define CONNECT_TEMPORARY           0x00000004
+#define CONNECT_INTERACTIVE         0x00000008
+#define CONNECT_PROMPT              0x00000010
+#define CONNECT_NEED_DRIVE          0x00000020
+#if(WINVER >= 0x0400)
+#define CONNECT_REFCOUNT            0x00000040
+#define CONNECT_REDIRECT            0x00000080
+#define CONNECT_LOCALDRIVE          0x00000100
+#define CONNECT_CURRENT_MEDIA       0x00000200
+#define CONNECT_DEFERRED            0x00000400
+#define CONNECT_RESERVED            0xFF000000
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+#define CONNECT_COMMANDLINE         0x00000800
+#define CONNECT_CMD_SAVECRED        0x00001000
+#endif /* WINVER >= 0x0500 */
+
+DWORD APIENTRY
+WNetAddConnectionA(
+     IN LPCSTR   lpRemoteName,
+     IN LPCSTR   lpPassword,
+     IN LPCSTR   lpLocalName
+    );
+DWORD APIENTRY
+WNetAddConnectionW(
+     IN LPCWSTR   lpRemoteName,
+     IN LPCWSTR   lpPassword,
+     IN LPCWSTR   lpLocalName
+    );
+#ifdef UNICODE
+#define WNetAddConnection  WNetAddConnectionW
+#else
+#define WNetAddConnection  WNetAddConnectionA
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetAddConnection2A(
+     IN LPNETRESOURCEA lpNetResource,
+     IN LPCSTR       lpPassword,
+     IN LPCSTR       lpUserName,
+     IN DWORD          dwFlags
+    );
+DWORD APIENTRY
+WNetAddConnection2W(
+     IN LPNETRESOURCEW lpNetResource,
+     IN LPCWSTR       lpPassword,
+     IN LPCWSTR       lpUserName,
+     IN DWORD          dwFlags
+    );
+#ifdef UNICODE
+#define WNetAddConnection2  WNetAddConnection2W
+#else
+#define WNetAddConnection2  WNetAddConnection2A
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetAddConnection3A(
+     IN HWND           hwndOwner,
+     IN LPNETRESOURCEA lpNetResource,
+     IN LPCSTR       lpPassword,
+     IN LPCSTR       lpUserName,
+     IN DWORD          dwFlags
+    );
+DWORD APIENTRY
+WNetAddConnection3W(
+     IN HWND           hwndOwner,
+     IN LPNETRESOURCEW lpNetResource,
+     IN LPCWSTR       lpPassword,
+     IN LPCWSTR       lpUserName,
+     IN DWORD          dwFlags
+    );
+#ifdef UNICODE
+#define WNetAddConnection3  WNetAddConnection3W
+#else
+#define WNetAddConnection3  WNetAddConnection3A
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetCancelConnectionA(
+     IN LPCSTR lpName,
+     IN BOOL     fForce
+    );
+DWORD APIENTRY
+WNetCancelConnectionW(
+     IN LPCWSTR lpName,
+     IN BOOL     fForce
+    );
+#ifdef UNICODE
+#define WNetCancelConnection  WNetCancelConnectionW
+#else
+#define WNetCancelConnection  WNetCancelConnectionA
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetCancelConnection2A(
+     IN LPCSTR lpName,
+     IN DWORD    dwFlags,
+     IN BOOL     fForce
+    );
+DWORD APIENTRY
+WNetCancelConnection2W(
+     IN LPCWSTR lpName,
+     IN DWORD    dwFlags,
+     IN BOOL     fForce
+    );
+#ifdef UNICODE
+#define WNetCancelConnection2  WNetCancelConnection2W
+#else
+#define WNetCancelConnection2  WNetCancelConnection2A
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetGetConnectionA(
+     IN LPCSTR lpLocalName,
+     OUT LPSTR  lpRemoteName,
+     IN OUT LPDWORD  lpnLength
+    );
+DWORD APIENTRY
+WNetGetConnectionW(
+     IN LPCWSTR lpLocalName,
+     OUT LPWSTR  lpRemoteName,
+     IN OUT LPDWORD  lpnLength
+    );
+#ifdef UNICODE
+#define WNetGetConnection  WNetGetConnectionW
+#else
+#define WNetGetConnection  WNetGetConnectionA
+#endif // !UNICODE
+
+
+DWORD APIENTRY
+WNetRestoreConnectionA(
+    IN HWND     hwndParent,
+    IN LPCSTR lpDevice
+    );
+DWORD APIENTRY
+WNetRestoreConnectionW(
+    IN HWND     hwndParent,
+    IN LPCWSTR lpDevice
+    );
+#ifdef UNICODE
+#define WNetRestoreConnection  WNetRestoreConnectionW
+#else
+#define WNetRestoreConnection  WNetRestoreConnectionA
+#endif // !UNICODE
+
+
+#if(WINVER >= 0x0400)
+DWORD APIENTRY
+WNetUseConnectionA(
+    IN HWND            hwndOwner,
+    IN LPNETRESOURCEA  lpNetResource,
+    IN LPCSTR        lpPassword,
+    IN LPCSTR        lpUserID,
+    IN DWORD           dwFlags,
+    OUT LPSTR        lpAccessName,
+    IN OUT LPDWORD     lpBufferSize,
+    OUT LPDWORD        lpResult
+    );
+DWORD APIENTRY
+WNetUseConnectionW(
+    IN HWND            hwndOwner,
+    IN LPNETRESOURCEW  lpNetResource,
+    IN LPCWSTR        lpPassword,
+    IN LPCWSTR        lpUserID,
+    IN DWORD           dwFlags,
+    OUT LPWSTR        lpAccessName,
+    IN OUT LPDWORD     lpBufferSize,
+    OUT LPDWORD        lpResult
+    );
+#ifdef UNICODE
+#define WNetUseConnection  WNetUseConnectionW
+#else
+#define WNetUseConnection  WNetUseConnectionA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+
+//
+//  Network Connection Dialogs.
+//
+
+DWORD APIENTRY
+WNetConnectionDialog(
+    IN HWND  hwnd,
+    IN DWORD dwType
+    );
+
+DWORD APIENTRY
+WNetDisconnectDialog(
+    IN HWND  hwnd,
+    IN DWORD dwType
+    );
+
+#if(WINVER >= 0x0400)
+typedef struct _CONNECTDLGSTRUCTA{
+    DWORD cbStructure;       /* size of this structure in bytes */
+    HWND hwndOwner;          /* owner window for the dialog */
+    LPNETRESOURCEA lpConnRes;/* Requested Resource info    */
+    DWORD dwFlags;           /* flags (see below) */
+    DWORD dwDevNum;          /* number of devices connected to */
+} CONNECTDLGSTRUCTA, FAR *LPCONNECTDLGSTRUCTA;
+typedef struct _CONNECTDLGSTRUCTW{
+    DWORD cbStructure;       /* size of this structure in bytes */
+    HWND hwndOwner;          /* owner window for the dialog */
+    LPNETRESOURCEW lpConnRes;/* Requested Resource info    */
+    DWORD dwFlags;           /* flags (see below) */
+    DWORD dwDevNum;          /* number of devices connected to */
+} CONNECTDLGSTRUCTW, FAR *LPCONNECTDLGSTRUCTW;
+#ifdef UNICODE
+typedef CONNECTDLGSTRUCTW CONNECTDLGSTRUCT;
+typedef LPCONNECTDLGSTRUCTW LPCONNECTDLGSTRUCT;
+#else
+typedef CONNECTDLGSTRUCTA CONNECTDLGSTRUCT;
+typedef LPCONNECTDLGSTRUCTA LPCONNECTDLGSTRUCT;
+#endif // UNICODE
+
+#define CONNDLG_RO_PATH     0x00000001 /* Resource path should be read-only    */
+#define CONNDLG_CONN_POINT  0x00000002 /* Netware -style movable connection point enabled */
+#define CONNDLG_USE_MRU     0x00000004 /* Use MRU combobox  */
+#define CONNDLG_HIDE_BOX    0x00000008 /* Hide persistent connect checkbox  */
+
+/*
+ * NOTE:  Set at most ONE of the below flags.  If neither flag is set,
+ *        then the persistence is set to whatever the user chose during
+ *        a previous connection
+ */
+#define CONNDLG_PERSIST     0x00000010 /* Force persistent connection */
+#define CONNDLG_NOT_PERSIST 0x00000020 /* Force connection NOT persistent */
+
+DWORD APIENTRY
+WNetConnectionDialog1A(
+    IN OUT LPCONNECTDLGSTRUCTA lpConnDlgStruct
+    );
+DWORD APIENTRY
+WNetConnectionDialog1W(
+    IN OUT LPCONNECTDLGSTRUCTW lpConnDlgStruct
+    );
+#ifdef UNICODE
+#define WNetConnectionDialog1  WNetConnectionDialog1W
+#else
+#define WNetConnectionDialog1  WNetConnectionDialog1A
+#endif // !UNICODE
+
+typedef struct _DISCDLGSTRUCTA{
+    DWORD           cbStructure;      /* size of this structure in bytes */
+    HWND            hwndOwner;        /* owner window for the dialog */
+    LPSTR           lpLocalName;      /* local device name */
+    LPSTR           lpRemoteName;     /* network resource name */
+    DWORD           dwFlags;          /* flags */
+} DISCDLGSTRUCTA, FAR *LPDISCDLGSTRUCTA;
+typedef struct _DISCDLGSTRUCTW{
+    DWORD           cbStructure;      /* size of this structure in bytes */
+    HWND            hwndOwner;        /* owner window for the dialog */
+    LPWSTR          lpLocalName;      /* local device name */
+    LPWSTR          lpRemoteName;     /* network resource name */
+    DWORD           dwFlags;          /* flags */
+} DISCDLGSTRUCTW, FAR *LPDISCDLGSTRUCTW;
+#ifdef UNICODE
+typedef DISCDLGSTRUCTW DISCDLGSTRUCT;
+typedef LPDISCDLGSTRUCTW LPDISCDLGSTRUCT;
+#else
+typedef DISCDLGSTRUCTA DISCDLGSTRUCT;
+typedef LPDISCDLGSTRUCTA LPDISCDLGSTRUCT;
+#endif // UNICODE
+
+#define DISC_UPDATE_PROFILE         0x00000001
+#define DISC_NO_FORCE               0x00000040
+
+DWORD APIENTRY
+WNetDisconnectDialog1A(
+    IN LPDISCDLGSTRUCTA lpConnDlgStruct
+    );
+DWORD APIENTRY
+WNetDisconnectDialog1W(
+    IN LPDISCDLGSTRUCTW lpConnDlgStruct
+    );
+#ifdef UNICODE
+#define WNetDisconnectDialog1  WNetDisconnectDialog1W
+#else
+#define WNetDisconnectDialog1  WNetDisconnectDialog1A
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+//
+//  Network Browsing.
+//
+
+DWORD APIENTRY
+WNetOpenEnumA(
+     IN DWORD          dwScope,
+     IN DWORD          dwType,
+     IN DWORD          dwUsage,
+     IN LPNETRESOURCEA lpNetResource,
+     OUT LPHANDLE       lphEnum
+    );
+DWORD APIENTRY
+WNetOpenEnumW(
+     IN DWORD          dwScope,
+     IN DWORD          dwType,
+     IN DWORD          dwUsage,
+     IN LPNETRESOURCEW lpNetResource,
+     OUT LPHANDLE       lphEnum
+    );
+#ifdef UNICODE
+#define WNetOpenEnum  WNetOpenEnumW
+#else
+#define WNetOpenEnum  WNetOpenEnumA
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetEnumResourceA(
+     IN HANDLE  hEnum,
+     IN OUT LPDWORD lpcCount,
+     OUT LPVOID  lpBuffer,
+     IN OUT LPDWORD lpBufferSize
+    );
+DWORD APIENTRY
+WNetEnumResourceW(
+     IN HANDLE  hEnum,
+     IN OUT LPDWORD lpcCount,
+     OUT LPVOID  lpBuffer,
+     IN OUT LPDWORD lpBufferSize
+    );
+#ifdef UNICODE
+#define WNetEnumResource  WNetEnumResourceW
+#else
+#define WNetEnumResource  WNetEnumResourceA
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetCloseEnum(
+    IN HANDLE   hEnum
+    );
+
+#if(WINVER >= 0x0400)
+DWORD APIENTRY
+WNetGetResourceParentA(
+    IN LPNETRESOURCEA lpNetResource,
+    OUT LPVOID lpBuffer,
+    IN OUT LPDWORD lpcbBuffer
+    );
+DWORD APIENTRY
+WNetGetResourceParentW(
+    IN LPNETRESOURCEW lpNetResource,
+    OUT LPVOID lpBuffer,
+    IN OUT LPDWORD lpcbBuffer
+    );
+#ifdef UNICODE
+#define WNetGetResourceParent  WNetGetResourceParentW
+#else
+#define WNetGetResourceParent  WNetGetResourceParentA
+#endif // !UNICODE
+
+DWORD APIENTRY
+WNetGetResourceInformationA(
+    IN LPNETRESOURCEA  lpNetResource,
+    OUT LPVOID          lpBuffer,
+    IN OUT LPDWORD         lpcbBuffer,
+    OUT LPSTR         *lplpSystem
+    );
+DWORD APIENTRY
+WNetGetResourceInformationW(
+    IN LPNETRESOURCEW  lpNetResource,
+    OUT LPVOID          lpBuffer,
+    IN OUT LPDWORD         lpcbBuffer,
+    OUT LPWSTR         *lplpSystem
+    );
+#ifdef UNICODE
+#define WNetGetResourceInformation  WNetGetResourceInformationW
+#else
+#define WNetGetResourceInformation  WNetGetResourceInformationA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+//
+//  Universal Naming.
+//
+
+#define UNIVERSAL_NAME_INFO_LEVEL   0x00000001
+#define REMOTE_NAME_INFO_LEVEL      0x00000002
+
+typedef struct  _UNIVERSAL_NAME_INFOA {
+    LPSTR    lpUniversalName;
+}UNIVERSAL_NAME_INFOA, *LPUNIVERSAL_NAME_INFOA;
+typedef struct  _UNIVERSAL_NAME_INFOW {
+    LPWSTR   lpUniversalName;
+}UNIVERSAL_NAME_INFOW, *LPUNIVERSAL_NAME_INFOW;
+#ifdef UNICODE
+typedef UNIVERSAL_NAME_INFOW UNIVERSAL_NAME_INFO;
+typedef LPUNIVERSAL_NAME_INFOW LPUNIVERSAL_NAME_INFO;
+#else
+typedef UNIVERSAL_NAME_INFOA UNIVERSAL_NAME_INFO;
+typedef LPUNIVERSAL_NAME_INFOA LPUNIVERSAL_NAME_INFO;
+#endif // UNICODE
+
+typedef struct  _REMOTE_NAME_INFOA {
+    LPSTR    lpUniversalName;
+    LPSTR    lpConnectionName;
+    LPSTR    lpRemainingPath;
+}REMOTE_NAME_INFOA, *LPREMOTE_NAME_INFOA;
+typedef struct  _REMOTE_NAME_INFOW {
+    LPWSTR   lpUniversalName;
+    LPWSTR   lpConnectionName;
+    LPWSTR   lpRemainingPath;
+}REMOTE_NAME_INFOW, *LPREMOTE_NAME_INFOW;
+#ifdef UNICODE
+typedef REMOTE_NAME_INFOW REMOTE_NAME_INFO;
+typedef LPREMOTE_NAME_INFOW LPREMOTE_NAME_INFO;
+#else
+typedef REMOTE_NAME_INFOA REMOTE_NAME_INFO;
+typedef LPREMOTE_NAME_INFOA LPREMOTE_NAME_INFO;
+#endif // UNICODE
+
+DWORD APIENTRY
+WNetGetUniversalNameA(
+     IN LPCSTR lpLocalPath,
+     IN DWORD    dwInfoLevel,
+     OUT LPVOID   lpBuffer,
+     IN OUT LPDWORD  lpBufferSize
+     );
+DWORD APIENTRY
+WNetGetUniversalNameW(
+     IN LPCWSTR lpLocalPath,
+     IN DWORD    dwInfoLevel,
+     OUT LPVOID   lpBuffer,
+     IN OUT LPDWORD  lpBufferSize
+     );
+#ifdef UNICODE
+#define WNetGetUniversalName  WNetGetUniversalNameW
+#else
+#define WNetGetUniversalName  WNetGetUniversalNameA
+#endif // !UNICODE
+
+//
+//  Authentication and Logon/Logoff.
+//
+
+DWORD APIENTRY
+WNetGetUserA(
+     IN LPCSTR  lpName,
+     OUT LPSTR   lpUserName,
+     IN OUT LPDWORD   lpnLength
+    );
+DWORD APIENTRY
+WNetGetUserW(
+     IN LPCWSTR  lpName,
+     OUT LPWSTR   lpUserName,
+     IN OUT LPDWORD   lpnLength
+    );
+#ifdef UNICODE
+#define WNetGetUser  WNetGetUserW
+#else
+#define WNetGetUser  WNetGetUserA
+#endif // !UNICODE
+
+
+//
+// Other.
+//
+
+#if(WINVER >= 0x0400)
+#define WNFMT_MULTILINE         0x01
+#define WNFMT_ABBREVIATED       0x02
+#define WNFMT_INENUM            0x10
+#define WNFMT_CONNECTION        0x20
+#endif /* WINVER >= 0x0400 */
+
+
+#if(WINVER >= 0x0400)
+DWORD APIENTRY
+WNetGetProviderNameA(
+    IN DWORD   dwNetType,
+    OUT LPSTR lpProviderName,
+    IN OUT LPDWORD lpBufferSize
+    );
+DWORD APIENTRY
+WNetGetProviderNameW(
+    IN DWORD   dwNetType,
+    OUT LPWSTR lpProviderName,
+    IN OUT LPDWORD lpBufferSize
+    );
+#ifdef UNICODE
+#define WNetGetProviderName  WNetGetProviderNameW
+#else
+#define WNetGetProviderName  WNetGetProviderNameA
+#endif // !UNICODE
+
+typedef struct _NETINFOSTRUCT{
+    DWORD cbStructure;
+    DWORD dwProviderVersion;
+    DWORD dwStatus;
+    DWORD dwCharacteristics;
+    ULONG_PTR dwHandle;
+    WORD  wNetType;
+    DWORD dwPrinters;
+    DWORD dwDrives;
+} NETINFOSTRUCT, FAR *LPNETINFOSTRUCT;
+
+#define NETINFO_DLL16       0x00000001  /* Provider running as 16 bit Winnet Driver */
+#define NETINFO_DISKRED     0x00000004  /* Provider requires disk redirections to connect */
+#define NETINFO_PRINTERRED  0x00000008  /* Provider requires printer redirections to connect */
+
+DWORD APIENTRY
+WNetGetNetworkInformationA(
+    IN LPCSTR          lpProvider,
+    OUT LPNETINFOSTRUCT   lpNetInfoStruct
+    );
+DWORD APIENTRY
+WNetGetNetworkInformationW(
+    IN LPCWSTR          lpProvider,
+    OUT LPNETINFOSTRUCT   lpNetInfoStruct
+    );
+#ifdef UNICODE
+#define WNetGetNetworkInformation  WNetGetNetworkInformationW
+#else
+#define WNetGetNetworkInformation  WNetGetNetworkInformationA
+#endif // !UNICODE
+
+//
+//  User Profiles.
+//
+
+typedef UINT (FAR PASCAL *PFNGETPROFILEPATHA) (
+    LPCSTR    pszUsername,
+    LPSTR     pszBuffer,
+    UINT        cbBuffer
+    );
+typedef UINT (FAR PASCAL *PFNGETPROFILEPATHW) (
+    LPCWSTR    pszUsername,
+    LPWSTR     pszBuffer,
+    UINT        cbBuffer
+    );
+#ifdef UNICODE
+#define PFNGETPROFILEPATH  PFNGETPROFILEPATHW
+#else
+#define PFNGETPROFILEPATH  PFNGETPROFILEPATHA
+#endif // !UNICODE
+
+typedef UINT (FAR PASCAL *PFNRECONCILEPROFILEA) (
+    LPCSTR    pszCentralFile,
+    LPCSTR    pszLocalFile,
+    DWORD       dwFlags
+    );
+typedef UINT (FAR PASCAL *PFNRECONCILEPROFILEW) (
+    LPCWSTR    pszCentralFile,
+    LPCWSTR    pszLocalFile,
+    DWORD       dwFlags
+    );
+#ifdef UNICODE
+#define PFNRECONCILEPROFILE  PFNRECONCILEPROFILEW
+#else
+#define PFNRECONCILEPROFILE  PFNRECONCILEPROFILEA
+#endif // !UNICODE
+
+#define RP_LOGON    0x01        /* if set, do for logon, else for logoff */
+#define RP_INIFILE  0x02        /* if set, reconcile .INI file, else reg. hive */
+
+
+//
+//  Policies.
+//
+
+typedef BOOL (FAR PASCAL *PFNPROCESSPOLICIESA) (
+    HWND        hwnd,
+    LPCSTR    pszPath,
+    LPCSTR    pszUsername,
+    LPCSTR    pszComputerName,
+    DWORD       dwFlags
+    );
+typedef BOOL (FAR PASCAL *PFNPROCESSPOLICIESW) (
+    HWND        hwnd,
+    LPCWSTR    pszPath,
+    LPCWSTR    pszUsername,
+    LPCWSTR    pszComputerName,
+    DWORD       dwFlags
+    );
+#ifdef UNICODE
+#define PFNPROCESSPOLICIES  PFNPROCESSPOLICIESW
+#else
+#define PFNPROCESSPOLICIES  PFNPROCESSPOLICIESA
+#endif // !UNICODE
+
+#define PP_DISPLAYERRORS    0x01    /* if set, display error messages, else fail silently if error */
+#endif /* WINVER >= 0x0400 */
+
+//
+//  Error handling.
+//
+
+DWORD APIENTRY
+WNetGetLastErrorA(
+     OUT LPDWORD    lpError,
+     OUT LPSTR    lpErrorBuf,
+     IN DWORD      nErrorBufSize,
+     OUT LPSTR    lpNameBuf,
+     IN DWORD      nNameBufSize
+    );
+DWORD APIENTRY
+WNetGetLastErrorW(
+     OUT LPDWORD    lpError,
+     OUT LPWSTR    lpErrorBuf,
+     IN DWORD      nErrorBufSize,
+     OUT LPWSTR    lpNameBuf,
+     IN DWORD      nNameBufSize
+    );
+#ifdef UNICODE
+#define WNetGetLastError  WNetGetLastErrorW
+#else
+#define WNetGetLastError  WNetGetLastErrorA
+#endif // !UNICODE
+
+//
+//  STATUS CODES
+//
+
+// General
+
+#define WN_SUCCESS                      NO_ERROR
+#define WN_NO_ERROR                     NO_ERROR
+#define WN_NOT_SUPPORTED                ERROR_NOT_SUPPORTED
+#define WN_CANCEL                       ERROR_CANCELLED
+#define WN_RETRY                        ERROR_RETRY
+#define WN_NET_ERROR                    ERROR_UNEXP_NET_ERR
+#define WN_MORE_DATA                    ERROR_MORE_DATA
+#define WN_BAD_POINTER                  ERROR_INVALID_ADDRESS
+#define WN_BAD_VALUE                    ERROR_INVALID_PARAMETER
+#define WN_BAD_USER                     ERROR_BAD_USERNAME
+#define WN_BAD_PASSWORD                 ERROR_INVALID_PASSWORD
+#define WN_ACCESS_DENIED                ERROR_ACCESS_DENIED
+#define WN_FUNCTION_BUSY                ERROR_BUSY
+#define WN_WINDOWS_ERROR                ERROR_UNEXP_NET_ERR
+#define WN_OUT_OF_MEMORY                ERROR_NOT_ENOUGH_MEMORY
+#define WN_NO_NETWORK                   ERROR_NO_NETWORK
+#define WN_EXTENDED_ERROR               ERROR_EXTENDED_ERROR
+#define WN_BAD_LEVEL                    ERROR_INVALID_LEVEL
+#define WN_BAD_HANDLE                   ERROR_INVALID_HANDLE
+#if(WINVER >= 0x0400)
+#define WN_NOT_INITIALIZING             ERROR_ALREADY_INITIALIZED
+#define WN_NO_MORE_DEVICES              ERROR_NO_MORE_DEVICES
+#endif /* WINVER >= 0x0400 */
+
+// Connection
+
+#define WN_NOT_CONNECTED                       ERROR_NOT_CONNECTED
+#define WN_OPEN_FILES                          ERROR_OPEN_FILES
+#define WN_DEVICE_IN_USE                       ERROR_DEVICE_IN_USE
+#define WN_BAD_NETNAME                         ERROR_BAD_NET_NAME
+#define WN_BAD_LOCALNAME                       ERROR_BAD_DEVICE
+#define WN_ALREADY_CONNECTED                   ERROR_ALREADY_ASSIGNED
+#define WN_DEVICE_ERROR                        ERROR_GEN_FAILURE
+#define WN_CONNECTION_CLOSED                   ERROR_CONNECTION_UNAVAIL
+#define WN_NO_NET_OR_BAD_PATH                  ERROR_NO_NET_OR_BAD_PATH
+#define WN_BAD_PROVIDER                        ERROR_BAD_PROVIDER
+#define WN_CANNOT_OPEN_PROFILE                 ERROR_CANNOT_OPEN_PROFILE
+#define WN_BAD_PROFILE                         ERROR_BAD_PROFILE
+#define WN_BAD_DEV_TYPE                        ERROR_BAD_DEV_TYPE
+#define WN_DEVICE_ALREADY_REMEMBERED           ERROR_DEVICE_ALREADY_REMEMBERED
+#define WN_CONNECTED_OTHER_PASSWORD            ERROR_CONNECTED_OTHER_PASSWORD
+#if(WINVER >= 0x0501)
+#define WN_CONNECTED_OTHER_PASSWORD_DEFAULT    ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT
+#endif /* WINVER >= 0x0501 */
+
+// Enumeration
+
+#define WN_NO_MORE_ENTRIES              ERROR_NO_MORE_ITEMS
+#define WN_NOT_CONTAINER                ERROR_NOT_CONTAINER
+
+#if(WINVER >= 0x0400)
+// Authentication
+
+#define WN_NOT_AUTHENTICATED            ERROR_NOT_AUTHENTICATED
+#define WN_NOT_LOGGED_ON                ERROR_NOT_LOGGED_ON
+#define WN_NOT_VALIDATED                ERROR_NO_LOGON_SERVERS
+#endif /* WINVER >= 0x0400 */
+
+//
+//  For Shell
+//
+
+#if(WINVER >= 0x0400)
+typedef struct _NETCONNECTINFOSTRUCT{
+    DWORD cbStructure;
+    DWORD dwFlags;
+    DWORD dwSpeed;
+    DWORD dwDelay;
+    DWORD dwOptDataSize;
+} NETCONNECTINFOSTRUCT,  *LPNETCONNECTINFOSTRUCT;
+
+#define WNCON_FORNETCARD        0x00000001
+#define WNCON_NOTROUTED         0x00000002
+#define WNCON_SLOWLINK          0x00000004
+#define WNCON_DYNAMIC           0x00000008
+
+DWORD APIENTRY
+MultinetGetConnectionPerformanceA(
+        IN LPNETRESOURCEA lpNetResource,
+        OUT LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct
+        );
+DWORD APIENTRY
+MultinetGetConnectionPerformanceW(
+        IN LPNETRESOURCEW lpNetResource,
+        OUT LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct
+        );
+#ifdef UNICODE
+#define MultinetGetConnectionPerformance  MultinetGetConnectionPerformanceW
+#else
+#define MultinetGetConnectionPerformance  MultinetGetConnectionPerformanceA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // _WINNETWK_
+
diff --git a/base/Windows/Inc/WinNls.h b/base/Windows/Inc/WinNls.h
new file mode 100644
index 0000000..329f15e
--- /dev/null
+++ b/base/Windows/Inc/WinNls.h
@@ -0,0 +1,1733 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    winnls.h
+
+Abstract:
+
+    Procedure declarations, constant definitions, and macros for the
+    NLS component.
+
+--*/
+
+
+#ifndef _WINNLS_
+#define _WINNLS_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifndef NONLS
+
+#ifdef _MAC
+#include <macwin32.h>
+#endif
+
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//  Constants
+//
+//  Define all constants for the NLS component here.
+//
+////////////////////////////////////////////////////////////////////////////
+
+//
+//  String Length Maximums.
+//
+#define MAX_LEADBYTES             12          // 5 ranges, 2 bytes ea., 0 term.
+#define MAX_DEFAULTCHAR           2           // single or double byte
+
+
+//
+//  MBCS and Unicode Translation Flags.
+//
+#define MB_PRECOMPOSED            0x00000001  // use precomposed chars
+#define MB_COMPOSITE              0x00000002  // use composite chars
+#define MB_USEGLYPHCHARS          0x00000004  // use glyph chars, not ctrl chars
+#define MB_ERR_INVALID_CHARS      0x00000008  // error for invalid chars
+
+#define WC_COMPOSITECHECK         0x00000200  // convert composite to precomposed
+#define WC_DISCARDNS              0x00000010  // discard non-spacing chars
+#define WC_SEPCHARS               0x00000020  // generate separate chars
+#define WC_DEFAULTCHAR            0x00000040  // replace w/ default char
+
+#if(WINVER >= 0x0500)
+#define WC_NO_BEST_FIT_CHARS      0x00000400  // do not use best fit chars
+#endif /* WINVER >= 0x0500 */
+
+
+//
+//  Character Type Flags.
+//
+#define CT_CTYPE1                 0x00000001  // ctype 1 information
+#define CT_CTYPE2                 0x00000002  // ctype 2 information
+#define CT_CTYPE3                 0x00000004  // ctype 3 information
+
+//
+//  CType 1 Flag Bits.
+//
+#define C1_UPPER                  0x0001      // upper case
+#define C1_LOWER                  0x0002      // lower case
+#define C1_DIGIT                  0x0004      // decimal digits
+#define C1_SPACE                  0x0008      // spacing characters
+#define C1_PUNCT                  0x0010      // punctuation characters
+#define C1_CNTRL                  0x0020      // control characters
+#define C1_BLANK                  0x0040      // blank characters
+#define C1_XDIGIT                 0x0080      // other digits
+#define C1_ALPHA                  0x0100      // any linguistic character
+#define C1_DEFINED                0x0200      // defined character
+
+//
+//  CType 2 Flag Bits.
+//
+#define C2_LEFTTORIGHT            0x0001      // left to right
+#define C2_RIGHTTOLEFT            0x0002      // right to left
+
+#define C2_EUROPENUMBER           0x0003      // European number, digit
+#define C2_EUROPESEPARATOR        0x0004      // European numeric separator
+#define C2_EUROPETERMINATOR       0x0005      // European numeric terminator
+#define C2_ARABICNUMBER           0x0006      // Arabic number
+#define C2_COMMONSEPARATOR        0x0007      // common numeric separator
+
+#define C2_BLOCKSEPARATOR         0x0008      // block separator
+#define C2_SEGMENTSEPARATOR       0x0009      // segment separator
+#define C2_WHITESPACE             0x000A      // white space
+#define C2_OTHERNEUTRAL           0x000B      // other neutrals
+
+#define C2_NOTAPPLICABLE          0x0000      // no implicit directionality
+
+//
+//  CType 3 Flag Bits.
+//
+#define C3_NONSPACING             0x0001      // nonspacing character
+#define C3_DIACRITIC              0x0002      // diacritic mark
+#define C3_VOWELMARK              0x0004      // vowel mark
+#define C3_SYMBOL                 0x0008      // symbols
+
+#define C3_KATAKANA               0x0010      // katakana character
+#define C3_HIRAGANA               0x0020      // hiragana character
+#define C3_HALFWIDTH              0x0040      // half width character
+#define C3_FULLWIDTH              0x0080      // full width character
+#define C3_IDEOGRAPH              0x0100      // ideographic character
+#define C3_KASHIDA                0x0200      // Arabic kashida character
+#define C3_LEXICAL                0x0400      // lexical character
+
+#define C3_ALPHA                  0x8000      // any linguistic char (C1_ALPHA)
+
+#define C3_NOTAPPLICABLE          0x0000      // ctype 3 is not applicable
+
+
+//
+//  String Flags.
+//
+#define NORM_IGNORECASE           0x00000001  // ignore case
+#define NORM_IGNORENONSPACE       0x00000002  // ignore nonspacing chars
+#define NORM_IGNORESYMBOLS        0x00000004  // ignore symbols
+
+#define NORM_IGNOREKANATYPE       0x00010000  // ignore kanatype
+#define NORM_IGNOREWIDTH          0x00020000  // ignore width
+
+
+//
+//  Locale Independent Mapping Flags.
+//
+#define MAP_FOLDCZONE             0x00000010  // fold compatibility zone chars
+#define MAP_PRECOMPOSED           0x00000020  // convert to precomposed chars
+#define MAP_COMPOSITE             0x00000040  // convert to composite chars
+#define MAP_FOLDDIGITS            0x00000080  // all digits to ASCII 0-9
+
+#if(WINVER >= 0x0500)
+#define MAP_EXPAND_LIGATURES      0x00002000  // expand all ligatures
+#endif /* WINVER >= 0x0500 */
+
+//
+//  Locale Dependent Mapping Flags.
+//
+#define LCMAP_LOWERCASE           0x00000100  // lower case letters
+#define LCMAP_UPPERCASE           0x00000200  // upper case letters
+#define LCMAP_SORTKEY             0x00000400  // WC sort key (normalize)
+#define LCMAP_BYTEREV             0x00000800  // byte reversal
+
+#define LCMAP_HIRAGANA            0x00100000  // map katakana to hiragana
+#define LCMAP_KATAKANA            0x00200000  // map hiragana to katakana
+#define LCMAP_HALFWIDTH           0x00400000  // map double byte to single byte
+#define LCMAP_FULLWIDTH           0x00800000  // map single byte to double byte
+
+#define LCMAP_LINGUISTIC_CASING   0x01000000  // use linguistic rules for casing
+
+#define LCMAP_SIMPLIFIED_CHINESE  0x02000000  // map traditional chinese to simplified chinese
+#define LCMAP_TRADITIONAL_CHINESE 0x04000000  // map simplified chinese to traditional chinese
+
+
+//
+//  Language Group Enumeration Flags.
+//
+#define LGRPID_INSTALLED          0x00000001  // installed language group ids
+#define LGRPID_SUPPORTED          0x00000002  // supported language group ids
+
+
+//
+//  Locale Enumeration Flags.
+//
+#define LCID_INSTALLED            0x00000001  // installed locale ids
+#define LCID_SUPPORTED            0x00000002  // supported locale ids
+#define LCID_ALTERNATE_SORTS      0x00000004  // alternate sort locale ids
+
+
+//
+//  Code Page Enumeration Flags.
+//
+#define CP_INSTALLED              0x00000001  // installed code page ids
+#define CP_SUPPORTED              0x00000002  // supported code page ids
+
+
+//
+//  Sorting Flags.
+//
+//    WORD Sort:    culturally correct sort
+//                  hyphen and apostrophe are special cased
+//                  example: "coop" and "co-op" will sort together in a list
+//
+//                        co_op     <-------  underscore (symbol)
+//                        coat
+//                        comb
+//                        coop
+//                        co-op     <-------  hyphen (punctuation)
+//                        cork
+//                        went
+//                        were
+//                        we're     <-------  apostrophe (punctuation)
+//
+//
+//    STRING Sort:  hyphen and apostrophe will sort with all other symbols
+//
+//                        co-op     <-------  hyphen (punctuation)
+//                        co_op     <-------  underscore (symbol)
+//                        coat
+//                        comb
+//                        coop
+//                        cork
+//                        we're     <-------  apostrophe (punctuation)
+//                        went
+//                        were
+//
+#define SORT_STRINGSORT           0x00001000  // use string sort method
+
+
+//
+//  Compare String Return Values.
+//
+#define CSTR_LESS_THAN            1           // string 1 less than string 2
+#define CSTR_EQUAL                2           // string 1 equal to string 2
+#define CSTR_GREATER_THAN         3           // string 1 greater than string 2
+
+
+//
+//  Code Page Default Values.
+//
+#define CP_ACP                    0           // default to ANSI code page
+#define CP_OEMCP                  1           // default to OEM  code page
+#define CP_MACCP                  2           // default to MAC  code page
+#define CP_THREAD_ACP             3           // current thread's ANSI code page
+#define CP_SYMBOL                 42          // SYMBOL translations
+
+#define CP_UTF7                   65000       // UTF-7 translation
+#define CP_UTF8                   65001       // UTF-8 translation
+
+
+//
+//  Country/Region Codes.
+//
+#define CTRY_DEFAULT              0
+
+#define CTRY_ALBANIA              355         // Albania
+#define CTRY_ALGERIA              213         // Algeria
+#define CTRY_ARGENTINA            54          // Argentina
+#define CTRY_ARMENIA              374         // Armenia
+#define CTRY_AUSTRALIA            61          // Australia
+#define CTRY_AUSTRIA              43          // Austria
+#define CTRY_AZERBAIJAN           994         // Azerbaijan
+#define CTRY_BAHRAIN              973         // Bahrain
+#define CTRY_BELARUS              375         // Belarus
+#define CTRY_BELGIUM              32          // Belgium
+#define CTRY_BELIZE               501         // Belize
+#define CTRY_BOLIVIA              591         // Bolivia
+#define CTRY_BRAZIL               55          // Brazil
+#define CTRY_BRUNEI_DARUSSALAM    673         // Brunei Darussalam
+#define CTRY_BULGARIA             359         // Bulgaria
+#define CTRY_CANADA               2           // Canada
+#define CTRY_CARIBBEAN            1           // Caribbean
+#define CTRY_CHILE                56          // Chile
+#define CTRY_COLOMBIA             57          // Colombia
+#define CTRY_COSTA_RICA           506         // Costa Rica
+#define CTRY_CROATIA              385         // Croatia
+#define CTRY_CZECH                420         // Czech Republic
+#define CTRY_DENMARK              45          // Denmark
+#define CTRY_DOMINICAN_REPUBLIC   1           // Dominican Republic
+#define CTRY_ECUADOR              593         // Ecuador
+#define CTRY_EGYPT                20          // Egypt
+#define CTRY_EL_SALVADOR          503         // El Salvador
+#define CTRY_ESTONIA              372         // Estonia
+#define CTRY_FAEROE_ISLANDS       298         // Faeroe Islands
+#define CTRY_FINLAND              358         // Finland
+#define CTRY_FRANCE               33          // France
+#define CTRY_GEORGIA              995         // Georgia
+#define CTRY_GERMANY              49          // Germany
+#define CTRY_GREECE               30          // Greece
+#define CTRY_GUATEMALA            502         // Guatemala
+#define CTRY_HONDURAS             504         // Honduras
+#define CTRY_HONG_KONG            852         // Hong Kong S.A.R., P.R.C.
+#define CTRY_HUNGARY              36          // Hungary
+#define CTRY_ICELAND              354         // Iceland
+#define CTRY_INDIA                91          // India
+#define CTRY_INDONESIA            62          // Indonesia
+#define CTRY_IRAN                 981         // Iran
+#define CTRY_IRAQ                 964         // Iraq
+#define CTRY_IRELAND              353         // Ireland
+#define CTRY_ISRAEL               972         // Israel
+#define CTRY_ITALY                39          // Italy
+#define CTRY_JAMAICA              1           // Jamaica
+#define CTRY_JAPAN                81          // Japan
+#define CTRY_JORDAN               962         // Jordan
+#define CTRY_KAZAKSTAN            7           // Kazakstan
+#define CTRY_KENYA                254         // Kenya
+#define CTRY_KUWAIT               965         // Kuwait
+#define CTRY_KYRGYZSTAN           996         // Kyrgyzstan
+#define CTRY_LATVIA               371         // Latvia
+#define CTRY_LEBANON              961         // Lebanon
+#define CTRY_LIBYA                218         // Libya
+#define CTRY_LIECHTENSTEIN        41          // Liechtenstein
+#define CTRY_LITHUANIA            370         // Lithuania
+#define CTRY_LUXEMBOURG           352         // Luxembourg
+#define CTRY_MACAU                853         // Macau S.A.R., PRC
+#define CTRY_MACEDONIA            389         // Former Yugoslav Republic of Macedonia
+#define CTRY_MALAYSIA             60          // Malaysia
+#define CTRY_MALDIVES             960         // Maldives
+#define CTRY_MEXICO               52          // Mexico
+#define CTRY_MONACO               33          // Principality of Monaco
+#define CTRY_MONGOLIA             976         // Mongolia
+#define CTRY_MOROCCO              212         // Morocco
+#define CTRY_NETHERLANDS          31          // Netherlands
+#define CTRY_NEW_ZEALAND          64          // New Zealand
+#define CTRY_NICARAGUA            505         // Nicaragua
+#define CTRY_NORWAY               47          // Norway
+#define CTRY_OMAN                 968         // Oman
+#define CTRY_PAKISTAN             92          // Islamic Republic of Pakistan
+#define CTRY_PANAMA               507         // Panama
+#define CTRY_PARAGUAY             595         // Paraguay
+#define CTRY_PERU                 51          // Peru
+#define CTRY_PHILIPPINES          63          // Republic of the Philippines
+#define CTRY_POLAND               48          // Poland
+#define CTRY_PORTUGAL             351         // Portugal
+#define CTRY_PRCHINA              86          // People's Republic of China
+#define CTRY_PUERTO_RICO          1           // Puerto Rico
+#define CTRY_QATAR                974         // Qatar
+#define CTRY_ROMANIA              40          // Romania
+#define CTRY_RUSSIA               7           // Russia
+#define CTRY_SAUDI_ARABIA         966         // Saudi Arabia
+#define CTRY_SERBIA               381         // Serbia
+#define CTRY_SINGAPORE            65          // Singapore
+#define CTRY_SLOVAK               421         // Slovak Republic
+#define CTRY_SLOVENIA             386         // Slovenia
+#define CTRY_SOUTH_AFRICA         27          // South Africa
+#define CTRY_SOUTH_KOREA          82          // Korea
+#define CTRY_SPAIN                34          // Spain
+#define CTRY_SWEDEN               46          // Sweden
+#define CTRY_SWITZERLAND          41          // Switzerland
+#define CTRY_SYRIA                963         // Syria
+#define CTRY_TAIWAN               886         // Taiwan
+#define CTRY_TATARSTAN            7           // Tatarstan
+#define CTRY_THAILAND             66          // Thailand
+#define CTRY_TRINIDAD_Y_TOBAGO    1           // Trinidad y Tobago
+#define CTRY_TUNISIA              216         // Tunisia
+#define CTRY_TURKEY               90          // Turkey
+#define CTRY_UAE                  971         // U.A.E.
+#define CTRY_UKRAINE              380         // Ukraine
+#define CTRY_UNITED_KINGDOM       44          // United Kingdom
+#define CTRY_UNITED_STATES        1           // United States
+#define CTRY_URUGUAY              598         // Uruguay
+#define CTRY_UZBEKISTAN           7           // Uzbekistan
+#define CTRY_VENEZUELA            58          // Venezuela
+#define CTRY_VIET_NAM             84          // Viet Nam
+#define CTRY_YEMEN                967         // Yemen
+#define CTRY_ZIMBABWE             263         // Zimbabwe
+
+
+//
+//  Locale Types.
+//
+//  These types are used for the GetLocaleInfo NLS API routine.
+//  Some of these types are also used for the SetLocaleInfo NLS API routine.
+//
+
+//
+//  The following LCTypes may be used in combination with any other LCTypes.
+//
+//    LOCALE_NOUSEROVERRIDE is also used in GetTimeFormat and
+//    GetDateFormat.
+//
+//    LOCALE_USE_CP_ACP is used in many of the A (Ansi) apis that need
+//    to do string translation.
+//
+//    LOCALE_RETURN_NUMBER will return the result from GetLocaleInfo as a
+//    number instead of a string.  This flag is only valid for the LCTypes
+//    beginning with LOCALE_I.
+//
+#define LOCALE_NOUSEROVERRIDE         0x80000000   // do not use user overrides
+#define LOCALE_USE_CP_ACP             0x40000000   // use the system ACP
+
+#if(WINVER >= 0x0400)
+#define LOCALE_RETURN_NUMBER          0x20000000   // return number instead of string
+#endif /* WINVER >= 0x0400 */
+
+//
+//  The following LCTypes are mutually exclusive in that they may NOT
+//  be used in combination with each other.
+//
+#define LOCALE_ILANGUAGE              0x00000001   // language id
+#define LOCALE_SLANGUAGE              0x00000002   // localized name of language
+#define LOCALE_SENGLANGUAGE           0x00001001   // English name of language
+#define LOCALE_SABBREVLANGNAME        0x00000003   // abbreviated language name
+#define LOCALE_SNATIVELANGNAME        0x00000004   // native name of language
+
+#define LOCALE_ICOUNTRY               0x00000005   // country code
+#define LOCALE_SCOUNTRY               0x00000006   // localized name of country
+#define LOCALE_SENGCOUNTRY            0x00001002   // English name of country
+#define LOCALE_SABBREVCTRYNAME        0x00000007   // abbreviated country name
+#define LOCALE_SNATIVECTRYNAME        0x00000008   // native name of country
+
+#define LOCALE_IDEFAULTLANGUAGE       0x00000009   // default language id
+#define LOCALE_IDEFAULTCOUNTRY        0x0000000A   // default country code
+#define LOCALE_IDEFAULTCODEPAGE       0x0000000B   // default oem code page
+#define LOCALE_IDEFAULTANSICODEPAGE   0x00001004   // default ansi code page
+#define LOCALE_IDEFAULTMACCODEPAGE    0x00001011   // default mac code page
+
+#define LOCALE_SLIST                  0x0000000C   // list item separator
+#define LOCALE_IMEASURE               0x0000000D   // 0 = metric, 1 = US
+
+#define LOCALE_SDECIMAL               0x0000000E   // decimal separator
+#define LOCALE_STHOUSAND              0x0000000F   // thousand separator
+#define LOCALE_SGROUPING              0x00000010   // digit grouping
+#define LOCALE_IDIGITS                0x00000011   // number of fractional digits
+#define LOCALE_ILZERO                 0x00000012   // leading zeros for decimal
+#define LOCALE_INEGNUMBER             0x00001010   // negative number mode
+#define LOCALE_SNATIVEDIGITS          0x00000013   // native ascii 0-9
+
+#define LOCALE_SCURRENCY              0x00000014   // local monetary symbol
+#define LOCALE_SINTLSYMBOL            0x00000015   // intl monetary symbol
+#define LOCALE_SMONDECIMALSEP         0x00000016   // monetary decimal separator
+#define LOCALE_SMONTHOUSANDSEP        0x00000017   // monetary thousand separator
+#define LOCALE_SMONGROUPING           0x00000018   // monetary grouping
+#define LOCALE_ICURRDIGITS            0x00000019   // # local monetary digits
+#define LOCALE_IINTLCURRDIGITS        0x0000001A   // # intl monetary digits
+#define LOCALE_ICURRENCY              0x0000001B   // positive currency mode
+#define LOCALE_INEGCURR               0x0000001C   // negative currency mode
+
+#define LOCALE_SDATE                  0x0000001D   // date separator
+#define LOCALE_STIME                  0x0000001E   // time separator
+#define LOCALE_SSHORTDATE             0x0000001F   // short date format string
+#define LOCALE_SLONGDATE              0x00000020   // long date format string
+#define LOCALE_STIMEFORMAT            0x00001003   // time format string
+#define LOCALE_IDATE                  0x00000021   // short date format ordering
+#define LOCALE_ILDATE                 0x00000022   // long date format ordering
+#define LOCALE_ITIME                  0x00000023   // time format specifier
+#define LOCALE_ITIMEMARKPOSN          0x00001005   // time marker position
+#define LOCALE_ICENTURY               0x00000024   // century format specifier (short date)
+#define LOCALE_ITLZERO                0x00000025   // leading zeros in time field
+#define LOCALE_IDAYLZERO              0x00000026   // leading zeros in day field (short date)
+#define LOCALE_IMONLZERO              0x00000027   // leading zeros in month field (short date)
+#define LOCALE_S1159                  0x00000028   // AM designator
+#define LOCALE_S2359                  0x00000029   // PM designator
+
+#define LOCALE_ICALENDARTYPE          0x00001009   // type of calendar specifier
+#define LOCALE_IOPTIONALCALENDAR      0x0000100B   // additional calendar types specifier
+#define LOCALE_IFIRSTDAYOFWEEK        0x0000100C   // first day of week specifier
+#define LOCALE_IFIRSTWEEKOFYEAR       0x0000100D   // first week of year specifier
+
+#define LOCALE_SDAYNAME1              0x0000002A   // long name for Monday
+#define LOCALE_SDAYNAME2              0x0000002B   // long name for Tuesday
+#define LOCALE_SDAYNAME3              0x0000002C   // long name for Wednesday
+#define LOCALE_SDAYNAME4              0x0000002D   // long name for Thursday
+#define LOCALE_SDAYNAME5              0x0000002E   // long name for Friday
+#define LOCALE_SDAYNAME6              0x0000002F   // long name for Saturday
+#define LOCALE_SDAYNAME7              0x00000030   // long name for Sunday
+#define LOCALE_SABBREVDAYNAME1        0x00000031   // abbreviated name for Monday
+#define LOCALE_SABBREVDAYNAME2        0x00000032   // abbreviated name for Tuesday
+#define LOCALE_SABBREVDAYNAME3        0x00000033   // abbreviated name for Wednesday
+#define LOCALE_SABBREVDAYNAME4        0x00000034   // abbreviated name for Thursday
+#define LOCALE_SABBREVDAYNAME5        0x00000035   // abbreviated name for Friday
+#define LOCALE_SABBREVDAYNAME6        0x00000036   // abbreviated name for Saturday
+#define LOCALE_SABBREVDAYNAME7        0x00000037   // abbreviated name for Sunday
+#define LOCALE_SMONTHNAME1            0x00000038   // long name for January
+#define LOCALE_SMONTHNAME2            0x00000039   // long name for February
+#define LOCALE_SMONTHNAME3            0x0000003A   // long name for March
+#define LOCALE_SMONTHNAME4            0x0000003B   // long name for April
+#define LOCALE_SMONTHNAME5            0x0000003C   // long name for May
+#define LOCALE_SMONTHNAME6            0x0000003D   // long name for June
+#define LOCALE_SMONTHNAME7            0x0000003E   // long name for July
+#define LOCALE_SMONTHNAME8            0x0000003F   // long name for August
+#define LOCALE_SMONTHNAME9            0x00000040   // long name for September
+#define LOCALE_SMONTHNAME10           0x00000041   // long name for October
+#define LOCALE_SMONTHNAME11           0x00000042   // long name for November
+#define LOCALE_SMONTHNAME12           0x00000043   // long name for December
+#define LOCALE_SMONTHNAME13           0x0000100E   // long name for 13th month (if exists)
+#define LOCALE_SABBREVMONTHNAME1      0x00000044   // abbreviated name for January
+#define LOCALE_SABBREVMONTHNAME2      0x00000045   // abbreviated name for February
+#define LOCALE_SABBREVMONTHNAME3      0x00000046   // abbreviated name for March
+#define LOCALE_SABBREVMONTHNAME4      0x00000047   // abbreviated name for April
+#define LOCALE_SABBREVMONTHNAME5      0x00000048   // abbreviated name for May
+#define LOCALE_SABBREVMONTHNAME6      0x00000049   // abbreviated name for June
+#define LOCALE_SABBREVMONTHNAME7      0x0000004A   // abbreviated name for July
+#define LOCALE_SABBREVMONTHNAME8      0x0000004B   // abbreviated name for August
+#define LOCALE_SABBREVMONTHNAME9      0x0000004C   // abbreviated name for September
+#define LOCALE_SABBREVMONTHNAME10     0x0000004D   // abbreviated name for October
+#define LOCALE_SABBREVMONTHNAME11     0x0000004E   // abbreviated name for November
+#define LOCALE_SABBREVMONTHNAME12     0x0000004F   // abbreviated name for December
+#define LOCALE_SABBREVMONTHNAME13     0x0000100F   // abbreviated name for 13th month (if exists)
+
+#define LOCALE_SPOSITIVESIGN          0x00000050   // positive sign
+#define LOCALE_SNEGATIVESIGN          0x00000051   // negative sign
+#define LOCALE_IPOSSIGNPOSN           0x00000052   // positive sign position
+#define LOCALE_INEGSIGNPOSN           0x00000053   // negative sign position
+#define LOCALE_IPOSSYMPRECEDES        0x00000054   // mon sym precedes pos amt
+#define LOCALE_IPOSSEPBYSPACE         0x00000055   // mon sym sep by space from pos amt
+#define LOCALE_INEGSYMPRECEDES        0x00000056   // mon sym precedes neg amt
+#define LOCALE_INEGSEPBYSPACE         0x00000057   // mon sym sep by space from neg amt
+
+#if(WINVER >= 0x0400)
+#define LOCALE_FONTSIGNATURE          0x00000058   // font signature
+#define LOCALE_SISO639LANGNAME        0x00000059   // ISO abbreviated language name
+#define LOCALE_SISO3166CTRYNAME       0x0000005A   // ISO abbreviated country name
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define LOCALE_IDEFAULTEBCDICCODEPAGE 0x00001012   // default ebcdic code page
+#define LOCALE_IPAPERSIZE             0x0000100A   // 1 = letter, 5 = legal, 8 = a3, 9 = a4
+#define LOCALE_SENGCURRNAME           0x00001007   // english name of currency
+#define LOCALE_SNATIVECURRNAME        0x00001008   // native name of currency
+#define LOCALE_SYEARMONTH             0x00001006   // year month format string
+#define LOCALE_SSORTNAME              0x00001013   // sort name
+#define LOCALE_IDIGITSUBSTITUTION     0x00001014   // 0 = context, 1 = none, 2 = national
+
+#endif /* WINVER >= 0x0500 */
+
+//
+//  Time Flags for GetTimeFormat.
+//
+#define TIME_NOMINUTESORSECONDS   0x00000001  // do not use minutes or seconds
+#define TIME_NOSECONDS            0x00000002  // do not use seconds
+#define TIME_NOTIMEMARKER         0x00000004  // do not use time marker
+#define TIME_FORCE24HOURFORMAT    0x00000008  // always use 24 hour format
+
+
+//
+//  Date Flags for GetDateFormat.
+//
+#define DATE_SHORTDATE            0x00000001  // use short date picture
+#define DATE_LONGDATE             0x00000002  // use long date picture
+#define DATE_USE_ALT_CALENDAR     0x00000004  // use alternate calendar (if any)
+
+#if(WINVER >= 0x0500)
+#define DATE_YEARMONTH            0x00000008  // use year month picture
+#define DATE_LTRREADING           0x00000010  // add marks for left to right reading order layout
+#define DATE_RTLREADING           0x00000020  // add marks for right to left reading order layout
+#endif /* WINVER >= 0x0500 */
+
+//
+//  Calendar Types.
+//
+//  These types are used for the EnumCalendarInfo and GetCalendarInfo
+//  NLS API routines.
+//  Some of these types are also used for the SetCalendarInfo NLS API
+//  routine.
+//
+
+//
+//  The following CalTypes may be used in combination with any other CalTypes.
+//
+//    CAL_NOUSEROVERRIDE
+//
+//    CAL_USE_CP_ACP is used in the A (Ansi) apis that need to do string
+//    translation.
+//
+//    CAL_RETURN_NUMBER will return the result from GetCalendarInfo as a
+//    number instead of a string.  This flag is only valid for the CalTypes
+//    beginning with CAL_I.
+//
+#if(WINVER >= 0x0500)
+#define CAL_NOUSEROVERRIDE        LOCALE_NOUSEROVERRIDE  // do not use user overrides
+#define CAL_USE_CP_ACP            LOCALE_USE_CP_ACP      // use the system ACP
+#define CAL_RETURN_NUMBER         LOCALE_RETURN_NUMBER   // return number instead of string
+#endif /* WINVER >= 0x0500 */
+
+//
+//  The following CalTypes are mutually exclusive in that they may NOT
+//  be used in combination with each other.
+//
+#define CAL_ICALINTVALUE          0x00000001  // calendar type
+#define CAL_SCALNAME              0x00000002  // native name of calendar
+#define CAL_IYEAROFFSETRANGE      0x00000003  // starting years of eras
+#define CAL_SERASTRING            0x00000004  // era name for IYearOffsetRanges
+#define CAL_SSHORTDATE            0x00000005  // short date format string
+#define CAL_SLONGDATE             0x00000006  // long date format string
+#define CAL_SDAYNAME1             0x00000007  // native name for Monday
+#define CAL_SDAYNAME2             0x00000008  // native name for Tuesday
+#define CAL_SDAYNAME3             0x00000009  // native name for Wednesday
+#define CAL_SDAYNAME4             0x0000000a  // native name for Thursday
+#define CAL_SDAYNAME5             0x0000000b  // native name for Friday
+#define CAL_SDAYNAME6             0x0000000c  // native name for Saturday
+#define CAL_SDAYNAME7             0x0000000d  // native name for Sunday
+#define CAL_SABBREVDAYNAME1       0x0000000e  // abbreviated name for Monday
+#define CAL_SABBREVDAYNAME2       0x0000000f  // abbreviated name for Tuesday
+#define CAL_SABBREVDAYNAME3       0x00000010  // abbreviated name for Wednesday
+#define CAL_SABBREVDAYNAME4       0x00000011  // abbreviated name for Thursday
+#define CAL_SABBREVDAYNAME5       0x00000012  // abbreviated name for Friday
+#define CAL_SABBREVDAYNAME6       0x00000013  // abbreviated name for Saturday
+#define CAL_SABBREVDAYNAME7       0x00000014  // abbreviated name for Sunday
+#define CAL_SMONTHNAME1           0x00000015  // native name for January
+#define CAL_SMONTHNAME2           0x00000016  // native name for February
+#define CAL_SMONTHNAME3           0x00000017  // native name for March
+#define CAL_SMONTHNAME4           0x00000018  // native name for April
+#define CAL_SMONTHNAME5           0x00000019  // native name for May
+#define CAL_SMONTHNAME6           0x0000001a  // native name for June
+#define CAL_SMONTHNAME7           0x0000001b  // native name for July
+#define CAL_SMONTHNAME8           0x0000001c  // native name for August
+#define CAL_SMONTHNAME9           0x0000001d  // native name for September
+#define CAL_SMONTHNAME10          0x0000001e  // native name for October
+#define CAL_SMONTHNAME11          0x0000001f  // native name for November
+#define CAL_SMONTHNAME12          0x00000020  // native name for December
+#define CAL_SMONTHNAME13          0x00000021  // native name for 13th month (if any)
+#define CAL_SABBREVMONTHNAME1     0x00000022  // abbreviated name for January
+#define CAL_SABBREVMONTHNAME2     0x00000023  // abbreviated name for February
+#define CAL_SABBREVMONTHNAME3     0x00000024  // abbreviated name for March
+#define CAL_SABBREVMONTHNAME4     0x00000025  // abbreviated name for April
+#define CAL_SABBREVMONTHNAME5     0x00000026  // abbreviated name for May
+#define CAL_SABBREVMONTHNAME6     0x00000027  // abbreviated name for June
+#define CAL_SABBREVMONTHNAME7     0x00000028  // abbreviated name for July
+#define CAL_SABBREVMONTHNAME8     0x00000029  // abbreviated name for August
+#define CAL_SABBREVMONTHNAME9     0x0000002a  // abbreviated name for September
+#define CAL_SABBREVMONTHNAME10    0x0000002b  // abbreviated name for October
+#define CAL_SABBREVMONTHNAME11    0x0000002c  // abbreviated name for November
+#define CAL_SABBREVMONTHNAME12    0x0000002d  // abbreviated name for December
+#define CAL_SABBREVMONTHNAME13    0x0000002e  // abbreviated name for 13th month (if any)
+
+#if(WINVER >= 0x0500)
+#define CAL_SYEARMONTH            0x0000002f  // year month format string
+#define CAL_ITWODIGITYEARMAX      0x00000030  // two digit year max
+#endif /* WINVER >= 0x0500 */
+
+//
+//  Calendar Enumeration Value.
+//
+#define ENUM_ALL_CALENDARS        0xffffffff  // enumerate all calendars
+
+
+//
+//  Calendar ID Values.
+//
+#define CAL_GREGORIAN                  1      // Gregorian (localized) calendar
+#define CAL_GREGORIAN_US               2      // Gregorian (U.S.) calendar
+#define CAL_JAPAN                      3      // Japanese Emperor Era calendar
+#define CAL_TAIWAN                     4      // Taiwan calendar
+#define CAL_KOREA                      5      // Korean Tangun Era calendar
+#define CAL_HIJRI                      6      // Hijri (Arabic Lunar) calendar
+#define CAL_THAI                       7      // Thai calendar
+#define CAL_HEBREW                     8      // Hebrew (Lunar) calendar
+#define CAL_GREGORIAN_ME_FRENCH        9      // Gregorian Middle East French calendar
+#define CAL_GREGORIAN_ARABIC           10     // Gregorian Arabic calendar
+#define CAL_GREGORIAN_XLIT_ENGLISH     11     // Gregorian Transliterated English calendar
+#define CAL_GREGORIAN_XLIT_FRENCH      12     // Gregorian Transliterated French calendar
+
+
+//
+//  Language Group ID Values.
+//
+#define LGRPID_WESTERN_EUROPE        0x0001   // Western Europe & U.S.
+#define LGRPID_CENTRAL_EUROPE        0x0002   // Central Europe
+#define LGRPID_BALTIC                0x0003   // Baltic
+#define LGRPID_GREEK                 0x0004   // Greek
+#define LGRPID_CYRILLIC              0x0005   // Cyrillic
+#define LGRPID_TURKISH               0x0006   // Turkish
+#define LGRPID_JAPANESE              0x0007   // Japanese
+#define LGRPID_KOREAN                0x0008   // Korean
+#define LGRPID_TRADITIONAL_CHINESE   0x0009   // Traditional Chinese
+#define LGRPID_SIMPLIFIED_CHINESE    0x000a   // Simplified Chinese
+#define LGRPID_THAI                  0x000b   // Thai
+#define LGRPID_HEBREW                0x000c   // Hebrew
+#define LGRPID_ARABIC                0x000d   // Arabic
+#define LGRPID_VIETNAMESE            0x000e   // Vietnamese
+#define LGRPID_INDIC                 0x000f   // Indic
+#define LGRPID_GEORGIAN              0x0010   // Georgian
+#define LGRPID_ARMENIAN              0x0011   // Armenian
+
+
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//  Typedefs
+//
+//  Define all types for the NLS component here.
+//
+////////////////////////////////////////////////////////////////////////////
+
+//
+//  Language Group ID.
+//
+typedef DWORD LGRPID;
+
+
+//
+//  Locale type constant.
+//
+typedef DWORD LCTYPE;
+
+
+//
+//  Calendar type constant.
+//
+typedef DWORD CALTYPE;
+
+
+//
+//  Calendar ID.
+//
+typedef DWORD CALID;
+
+
+//
+//  CP Info.
+//
+
+typedef struct _cpinfo {
+    UINT    MaxCharSize;                    // max length (in bytes) of a char
+    BYTE    DefaultChar[MAX_DEFAULTCHAR];   // default character
+    BYTE    LeadByte[MAX_LEADBYTES];        // lead byte ranges
+} CPINFO, *LPCPINFO;
+
+typedef struct _cpinfoexA {
+    UINT    MaxCharSize;                    // max length (in bytes) of a char
+    BYTE    DefaultChar[MAX_DEFAULTCHAR];   // default character (MB)
+    BYTE    LeadByte[MAX_LEADBYTES];        // lead byte ranges
+    WCHAR   UnicodeDefaultChar;             // default character (Unicode)
+    UINT    CodePage;                       // code page id
+    CHAR    CodePageName[MAX_PATH];         // code page name (Unicode)
+} CPINFOEXA, *LPCPINFOEXA;
+typedef struct _cpinfoexW {
+    UINT    MaxCharSize;                    // max length (in bytes) of a char
+    BYTE    DefaultChar[MAX_DEFAULTCHAR];   // default character (MB)
+    BYTE    LeadByte[MAX_LEADBYTES];        // lead byte ranges
+    WCHAR   UnicodeDefaultChar;             // default character (Unicode)
+    UINT    CodePage;                       // code page id
+    WCHAR   CodePageName[MAX_PATH];         // code page name (Unicode)
+} CPINFOEXW, *LPCPINFOEXW;
+#ifdef UNICODE
+typedef CPINFOEXW CPINFOEX;
+typedef LPCPINFOEXW LPCPINFOEX;
+#else
+typedef CPINFOEXA CPINFOEX;
+typedef LPCPINFOEXA LPCPINFOEX;
+#endif // UNICODE
+
+
+//
+//  Number format.
+//
+
+typedef struct _numberfmtA {
+    UINT    NumDigits;                 // number of decimal digits
+    UINT    LeadingZero;               // if leading zero in decimal fields
+    UINT    Grouping;                  // group size left of decimal
+    LPSTR   lpDecimalSep;              // ptr to decimal separator string
+    LPSTR   lpThousandSep;             // ptr to thousand separator string
+    UINT    NegativeOrder;             // negative number ordering
+} NUMBERFMTA, *LPNUMBERFMTA;
+typedef struct _numberfmtW {
+    UINT    NumDigits;                 // number of decimal digits
+    UINT    LeadingZero;               // if leading zero in decimal fields
+    UINT    Grouping;                  // group size left of decimal
+    LPWSTR  lpDecimalSep;              // ptr to decimal separator string
+    LPWSTR  lpThousandSep;             // ptr to thousand separator string
+    UINT    NegativeOrder;             // negative number ordering
+} NUMBERFMTW, *LPNUMBERFMTW;
+#ifdef UNICODE
+typedef NUMBERFMTW NUMBERFMT;
+typedef LPNUMBERFMTW LPNUMBERFMT;
+#else
+typedef NUMBERFMTA NUMBERFMT;
+typedef LPNUMBERFMTA LPNUMBERFMT;
+#endif // UNICODE
+
+
+//
+//  Currency format.
+//
+
+typedef struct _currencyfmtA {
+    UINT    NumDigits;                 // number of decimal digits
+    UINT    LeadingZero;               // if leading zero in decimal fields
+    UINT    Grouping;                  // group size left of decimal
+    LPSTR   lpDecimalSep;              // ptr to decimal separator string
+    LPSTR   lpThousandSep;             // ptr to thousand separator string
+    UINT    NegativeOrder;             // negative currency ordering
+    UINT    PositiveOrder;             // positive currency ordering
+    LPSTR   lpCurrencySymbol;          // ptr to currency symbol string
+} CURRENCYFMTA, *LPCURRENCYFMTA;
+typedef struct _currencyfmtW {
+    UINT    NumDigits;                 // number of decimal digits
+    UINT    LeadingZero;               // if leading zero in decimal fields
+    UINT    Grouping;                  // group size left of decimal
+    LPWSTR  lpDecimalSep;              // ptr to decimal separator string
+    LPWSTR  lpThousandSep;             // ptr to thousand separator string
+    UINT    NegativeOrder;             // negative currency ordering
+    UINT    PositiveOrder;             // positive currency ordering
+    LPWSTR  lpCurrencySymbol;          // ptr to currency symbol string
+} CURRENCYFMTW, *LPCURRENCYFMTW;
+#ifdef UNICODE
+typedef CURRENCYFMTW CURRENCYFMT;
+typedef LPCURRENCYFMTW LPCURRENCYFMT;
+#else
+typedef CURRENCYFMTA CURRENCYFMT;
+typedef LPCURRENCYFMTA LPCURRENCYFMT;
+#endif // UNICODE
+
+//
+//  NLS function capabilities
+//
+
+enum SYSNLS_FUNCTION{
+    COMPARE_STRING    =  0x0001,
+};
+typedef DWORD NLS_FUNCTION;
+
+
+//
+//  NLS version structure.
+//
+
+typedef struct _nlsversioninfo{ 
+    DWORD dwNLSVersionInfoSize; 
+    DWORD dwNLSVersion; 
+    DWORD dwDefinedVersion; 
+} NLSVERSIONINFO, *LPNLSVERSIONINFO; 
+
+
+//
+//  GEO defines
+//
+
+typedef LONG    GEOID;
+typedef DWORD   GEOTYPE;
+typedef DWORD   GEOCLASS;
+
+#define GEOID_NOT_AVAILABLE -1
+
+//
+//  GEO information types for clients to query
+//
+
+enum SYSGEOTYPE {
+    GEO_NATION      =       0x0001,
+    GEO_LATITUDE    =       0x0002,
+    GEO_LONGITUDE   =       0x0003,
+    GEO_ISO2        =       0x0004,
+    GEO_ISO3        =       0x0005,
+    GEO_RFC1766     =       0x0006,
+    GEO_LCID        =       0x0007,
+    GEO_FRIENDLYNAME=       0x0008,
+    GEO_OFFICIALNAME=       0x0009,
+    GEO_TIMEZONES   =       0x000A,
+    GEO_OFFICIALLANGUAGES = 0x000B,
+};
+
+//
+//  More GEOCLASS defines will be listed here
+//
+
+enum SYSGEOCLASS {
+    GEOCLASS_NATION  = 16,
+    GEOCLASS_REGION  = 14,
+};
+
+
+//
+//  Enumeration function constants.
+//
+
+#ifdef STRICT
+
+typedef BOOL (CALLBACK* LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
+typedef BOOL (CALLBACK* LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
+typedef BOOL (CALLBACK* UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
+typedef BOOL (CALLBACK* LOCALE_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK* CODEPAGE_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK* DATEFMT_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK* DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
+typedef BOOL (CALLBACK* TIMEFMT_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK* CALINFO_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK* CALINFO_ENUMPROCEXA)(LPSTR, CALID);
+
+typedef BOOL (CALLBACK* LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
+typedef BOOL (CALLBACK* LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
+typedef BOOL (CALLBACK* UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
+typedef BOOL (CALLBACK* LOCALE_ENUMPROCW)(LPWSTR);
+typedef BOOL (CALLBACK* CODEPAGE_ENUMPROCW)(LPWSTR);
+typedef BOOL (CALLBACK* DATEFMT_ENUMPROCW)(LPWSTR);
+typedef BOOL (CALLBACK* DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
+typedef BOOL (CALLBACK* TIMEFMT_ENUMPROCW)(LPWSTR);
+typedef BOOL (CALLBACK* CALINFO_ENUMPROCW)(LPWSTR);
+typedef BOOL (CALLBACK* CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
+typedef BOOL (CALLBACK* GEO_ENUMPROC)(GEOID);
+
+#else // !STRICT
+
+typedef FARPROC LANGUAGEGROUP_ENUMPROCA;
+typedef FARPROC LANGGROUPLOCALE_ENUMPROCA;
+typedef FARPROC UILANGUAGE_ENUMPROCA;
+typedef FARPROC LOCALE_ENUMPROCA;
+typedef FARPROC CODEPAGE_ENUMPROCA;
+typedef FARPROC DATEFMT_ENUMPROCA;
+typedef FARPROC DATEFMT_ENUMPROCEXA;
+typedef FARPROC TIMEFMT_ENUMPROCA;
+typedef FARPROC CALINFO_ENUMPROCA;
+typedef FARPROC CALINFO_ENUMPROCEXA;
+typedef FARPROC GEO_ENUMPROC;
+
+typedef FARPROC LANGUAGEGROUP_ENUMPROCW;
+typedef FARPROC LANGGROUPLOCALE_ENUMPROCW;
+typedef FARPROC UILANGUAGE_ENUMPROCW;
+typedef FARPROC LOCALE_ENUMPROCW;
+typedef FARPROC CODEPAGE_ENUMPROCW;
+typedef FARPROC DATEFMT_ENUMPROCW;
+typedef FARPROC DATEFMT_ENUMPROCEXW;
+typedef FARPROC TIMEFMT_ENUMPROCW;
+typedef FARPROC CALINFO_ENUMPROCW;
+typedef FARPROC CALINFO_ENUMPROCEXW;
+
+#endif // !STRICT
+
+#ifdef UNICODE
+
+#define LANGUAGEGROUP_ENUMPROC    LANGUAGEGROUP_ENUMPROCW
+#define LANGGROUPLOCALE_ENUMPROC  LANGGROUPLOCALE_ENUMPROCW
+#define UILANGUAGE_ENUMPROC       UILANGUAGE_ENUMPROCW
+#define LOCALE_ENUMPROC           LOCALE_ENUMPROCW
+#define CODEPAGE_ENUMPROC         CODEPAGE_ENUMPROCW
+#define DATEFMT_ENUMPROC          DATEFMT_ENUMPROCW
+#define DATEFMT_ENUMPROCEX        DATEFMT_ENUMPROCEXW
+#define TIMEFMT_ENUMPROC          TIMEFMT_ENUMPROCW
+#define CALINFO_ENUMPROC          CALINFO_ENUMPROCW
+#define CALINFO_ENUMPROCEX        CALINFO_ENUMPROCEXW
+
+#else
+
+#define LANGUAGEGROUP_ENUMPROC    LANGUAGEGROUP_ENUMPROCA
+#define LANGGROUPLOCALE_ENUMPROC  LANGGROUPLOCALE_ENUMPROCA
+#define UILANGUAGE_ENUMPROC       UILANGUAGE_ENUMPROCA
+#define LOCALE_ENUMPROC           LOCALE_ENUMPROCA
+#define CODEPAGE_ENUMPROC         CODEPAGE_ENUMPROCA
+#define DATEFMT_ENUMPROC          DATEFMT_ENUMPROCA
+#define DATEFMT_ENUMPROCEX        DATEFMT_ENUMPROCEXA
+#define TIMEFMT_ENUMPROC          TIMEFMT_ENUMPROCA
+#define CALINFO_ENUMPROC          CALINFO_ENUMPROCA
+#define CALINFO_ENUMPROCEX        CALINFO_ENUMPROCEXA
+
+#endif // !UNICODE
+
+
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//  Macros
+//
+//  Define all macros for the NLS component here.
+//
+////////////////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//  Function Prototypes
+//
+//  Only prototypes for the NLS APIs should go here.
+//
+////////////////////////////////////////////////////////////////////////////
+
+//
+//  Code Page Dependent APIs.
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+IsValidCodePage(
+    IN UINT  CodePage);
+
+WINBASEAPI
+UINT
+WINAPI
+GetACP(void);
+
+WINBASEAPI
+UINT
+WINAPI
+GetOEMCP(void);
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCPInfo(
+    IN UINT       CodePage,
+    OUT LPCPINFO  lpCPInfo);
+
+WINBASEAPI
+BOOL
+WINAPI
+GetCPInfoExA(
+    IN UINT          CodePage,
+    IN DWORD         dwFlags,
+    OUT LPCPINFOEXA  lpCPInfoEx);
+WINBASEAPI
+BOOL
+WINAPI
+GetCPInfoExW(
+    IN UINT          CodePage,
+    IN DWORD         dwFlags,
+    OUT LPCPINFOEXW  lpCPInfoEx);
+#ifdef UNICODE
+#define GetCPInfoEx  GetCPInfoExW
+#else
+#define GetCPInfoEx  GetCPInfoExA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+IsDBCSLeadByte(
+    IN BYTE  TestChar);
+
+WINBASEAPI
+BOOL
+WINAPI
+IsDBCSLeadByteEx(
+    IN UINT  CodePage,
+    IN BYTE  TestChar);
+
+WINBASEAPI
+int
+WINAPI
+MultiByteToWideChar(
+    IN UINT     CodePage,
+    IN DWORD    dwFlags,
+    IN LPCSTR   lpMultiByteStr,
+    IN int      cbMultiByte,
+    OUT LPWSTR  lpWideCharStr,
+    IN int      cchWideChar);
+
+WINBASEAPI
+int
+WINAPI
+WideCharToMultiByte(
+    IN UINT     CodePage,
+    IN DWORD    dwFlags,
+    IN LPCWSTR  lpWideCharStr,
+    IN int      cchWideChar,
+    OUT LPSTR   lpMultiByteStr,
+    IN int      cbMultiByte,
+    IN LPCSTR   lpDefaultChar,
+    OUT LPBOOL  lpUsedDefaultChar);
+
+
+//
+//  Locale Dependent APIs.
+//
+
+WINBASEAPI
+int
+WINAPI
+CompareStringA(
+    IN LCID     Locale,
+    IN DWORD    dwCmpFlags,
+    IN LPCSTR  lpString1,
+    IN int      cchCount1,
+    IN LPCSTR  lpString2,
+    IN int      cchCount2);
+WINBASEAPI
+int
+WINAPI
+CompareStringW(
+    IN LCID     Locale,
+    IN DWORD    dwCmpFlags,
+    IN LPCWSTR  lpString1,
+    IN int      cchCount1,
+    IN LPCWSTR  lpString2,
+    IN int      cchCount2);
+#ifdef UNICODE
+#define CompareString  CompareStringW
+#else
+#define CompareString  CompareStringA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+LCMapStringA(
+    IN LCID     Locale,
+    IN DWORD    dwMapFlags,
+    IN LPCSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPSTR  lpDestStr,
+    IN int      cchDest);
+WINBASEAPI
+int
+WINAPI
+LCMapStringW(
+    IN LCID     Locale,
+    IN DWORD    dwMapFlags,
+    IN LPCWSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPWSTR  lpDestStr,
+    IN int      cchDest);
+#ifdef UNICODE
+#define LCMapString  LCMapStringW
+#else
+#define LCMapString  LCMapStringA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+GetLocaleInfoA(
+    IN LCID     Locale,
+    IN LCTYPE   LCType,
+    OUT LPSTR  lpLCData,
+    IN int      cchData);
+WINBASEAPI
+int
+WINAPI
+GetLocaleInfoW(
+    IN LCID     Locale,
+    IN LCTYPE   LCType,
+    OUT LPWSTR  lpLCData,
+    IN int      cchData);
+#ifdef UNICODE
+#define GetLocaleInfo  GetLocaleInfoW
+#else
+#define GetLocaleInfo  GetLocaleInfoA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetLocaleInfoA(
+    IN LCID     Locale,
+    IN LCTYPE   LCType,
+    IN LPCSTR  lpLCData);
+WINBASEAPI
+BOOL
+WINAPI
+SetLocaleInfoW(
+    IN LCID     Locale,
+    IN LCTYPE   LCType,
+    IN LPCWSTR  lpLCData);
+#ifdef UNICODE
+#define SetLocaleInfo  SetLocaleInfoW
+#else
+#define SetLocaleInfo  SetLocaleInfoA
+#endif // !UNICODE
+
+#if (WINVER >= 0x040A)
+WINBASEAPI
+int
+WINAPI
+GetCalendarInfoA(
+    LCID     Locale,
+    CALID    Calendar,
+    CALTYPE  CalType,
+    LPSTR   lpCalData,
+    int      cchData,
+    LPDWORD  lpValue);
+WINBASEAPI
+int
+WINAPI
+GetCalendarInfoW(
+    LCID     Locale,
+    CALID    Calendar,
+    CALTYPE  CalType,
+    LPWSTR   lpCalData,
+    int      cchData,
+    LPDWORD  lpValue);
+#ifdef UNICODE
+#define GetCalendarInfo  GetCalendarInfoW
+#else
+#define GetCalendarInfo  GetCalendarInfoA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+SetCalendarInfoA(
+    LCID     Locale,
+    CALID    Calendar,
+    CALTYPE  CalType,
+    LPCSTR  lpCalData);
+WINBASEAPI
+BOOL
+WINAPI
+SetCalendarInfoW(
+    LCID     Locale,
+    CALID    Calendar,
+    CALTYPE  CalType,
+    LPCWSTR  lpCalData);
+#ifdef UNICODE
+#define SetCalendarInfo  SetCalendarInfoW
+#else
+#define SetCalendarInfo  SetCalendarInfoA
+#endif // !UNICODE
+#endif
+
+WINBASEAPI
+int
+WINAPI
+GetTimeFormatA(
+    IN LCID             Locale,
+    IN DWORD            dwFlags,
+    IN CONST SYSTEMTIME *lpTime,
+    IN LPCSTR          lpFormat,
+    OUT LPSTR          lpTimeStr,
+    IN int              cchTime);
+WINBASEAPI
+int
+WINAPI
+GetTimeFormatW(
+    IN LCID             Locale,
+    IN DWORD            dwFlags,
+    IN CONST SYSTEMTIME *lpTime,
+    IN LPCWSTR          lpFormat,
+    OUT LPWSTR          lpTimeStr,
+    IN int              cchTime);
+#ifdef UNICODE
+#define GetTimeFormat  GetTimeFormatW
+#else
+#define GetTimeFormat  GetTimeFormatA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+GetDateFormatA(
+    IN LCID             Locale,
+    IN DWORD            dwFlags,
+    IN CONST SYSTEMTIME *lpDate,
+    IN LPCSTR          lpFormat,
+    OUT LPSTR          lpDateStr,
+    IN int              cchDate);
+WINBASEAPI
+int
+WINAPI
+GetDateFormatW(
+    IN LCID             Locale,
+    IN DWORD            dwFlags,
+    IN CONST SYSTEMTIME *lpDate,
+    IN LPCWSTR          lpFormat,
+    OUT LPWSTR          lpDateStr,
+    IN int              cchDate);
+#ifdef UNICODE
+#define GetDateFormat  GetDateFormatW
+#else
+#define GetDateFormat  GetDateFormatA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+GetNumberFormatA(
+    IN LCID             Locale,
+    IN DWORD            dwFlags,
+    IN LPCSTR          lpValue,
+    IN CONST NUMBERFMTA *lpFormat,
+    OUT LPSTR          lpNumberStr,
+    IN int              cchNumber);
+WINBASEAPI
+int
+WINAPI
+GetNumberFormatW(
+    IN LCID             Locale,
+    IN DWORD            dwFlags,
+    IN LPCWSTR          lpValue,
+    IN CONST NUMBERFMTW *lpFormat,
+    OUT LPWSTR          lpNumberStr,
+    IN int              cchNumber);
+#ifdef UNICODE
+#define GetNumberFormat  GetNumberFormatW
+#else
+#define GetNumberFormat  GetNumberFormatA
+#endif // !UNICODE
+
+WINBASEAPI
+int
+WINAPI
+GetCurrencyFormatA(
+    IN LCID               Locale,
+    IN DWORD              dwFlags,
+    IN LPCSTR            lpValue,
+    IN CONST CURRENCYFMTA *lpFormat,
+    OUT LPSTR            lpCurrencyStr,
+    IN int                cchCurrency);
+WINBASEAPI
+int
+WINAPI
+GetCurrencyFormatW(
+    IN LCID               Locale,
+    IN DWORD              dwFlags,
+    IN LPCWSTR            lpValue,
+    IN CONST CURRENCYFMTW *lpFormat,
+    OUT LPWSTR            lpCurrencyStr,
+    IN int                cchCurrency);
+#ifdef UNICODE
+#define GetCurrencyFormat  GetCurrencyFormatW
+#else
+#define GetCurrencyFormat  GetCurrencyFormatA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumCalendarInfoA(
+    IN CALINFO_ENUMPROCA lpCalInfoEnumProc,
+    IN LCID              Locale,
+    IN CALID             Calendar,
+    IN CALTYPE           CalType);
+WINBASEAPI
+BOOL
+WINAPI
+EnumCalendarInfoW(
+    IN CALINFO_ENUMPROCW lpCalInfoEnumProc,
+    IN LCID              Locale,
+    IN CALID             Calendar,
+    IN CALTYPE           CalType);
+#ifdef UNICODE
+#define EnumCalendarInfo  EnumCalendarInfoW
+#else
+#define EnumCalendarInfo  EnumCalendarInfoA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+EnumCalendarInfoExA(
+    IN CALINFO_ENUMPROCEXA lpCalInfoEnumProcEx,
+    IN LCID                Locale,
+    IN CALID               Calendar,
+    IN CALTYPE             CalType);
+WINBASEAPI
+BOOL
+WINAPI
+EnumCalendarInfoExW(
+    IN CALINFO_ENUMPROCEXW lpCalInfoEnumProcEx,
+    IN LCID                Locale,
+    IN CALID               Calendar,
+    IN CALTYPE             CalType);
+#ifdef UNICODE
+#define EnumCalendarInfoEx  EnumCalendarInfoExW
+#else
+#define EnumCalendarInfoEx  EnumCalendarInfoExA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0500 */
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumTimeFormatsA(
+    IN TIMEFMT_ENUMPROCA lpTimeFmtEnumProc,
+    IN LCID              Locale,
+    IN DWORD             dwFlags);
+WINBASEAPI
+BOOL
+WINAPI
+EnumTimeFormatsW(
+    IN TIMEFMT_ENUMPROCW lpTimeFmtEnumProc,
+    IN LCID              Locale,
+    IN DWORD             dwFlags);
+#ifdef UNICODE
+#define EnumTimeFormats  EnumTimeFormatsW
+#else
+#define EnumTimeFormats  EnumTimeFormatsA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumDateFormatsA(
+    IN DATEFMT_ENUMPROCA lpDateFmtEnumProc,
+    IN LCID              Locale,
+    IN DWORD             dwFlags);
+WINBASEAPI
+BOOL
+WINAPI
+EnumDateFormatsW(
+    IN DATEFMT_ENUMPROCW lpDateFmtEnumProc,
+    IN LCID              Locale,
+    IN DWORD             dwFlags);
+#ifdef UNICODE
+#define EnumDateFormats  EnumDateFormatsW
+#else
+#define EnumDateFormats  EnumDateFormatsA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+EnumDateFormatsExA(
+    IN DATEFMT_ENUMPROCEXA lpDateFmtEnumProcEx,
+    IN LCID                Locale,
+    IN DWORD               dwFlags);
+WINBASEAPI
+BOOL
+WINAPI
+EnumDateFormatsExW(
+    IN DATEFMT_ENUMPROCEXW lpDateFmtEnumProcEx,
+    IN LCID                Locale,
+    IN DWORD               dwFlags);
+#ifdef UNICODE
+#define EnumDateFormatsEx  EnumDateFormatsExW
+#else
+#define EnumDateFormatsEx  EnumDateFormatsExA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0500 */
+
+#if(WINVER >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+IsValidLanguageGroup(
+    IN LGRPID  LanguageGroup,
+    IN DWORD   dwFlags);
+#endif /* WINVER >= 0x0500 */
+
+WINBASEAPI
+BOOL
+WINAPI
+GetNLSVersion(
+    IN  NLS_FUNCTION     Function,
+    IN  LCID             Locale,
+    OUT LPNLSVERSIONINFO lpVersionInformation);
+
+WINBASEAPI
+BOOL
+WINAPI
+IsNLSDefinedString(
+    IN NLS_FUNCTION     Function,
+    IN DWORD            dwFlags,
+    IN LPNLSVERSIONINFO lpVersionInformation,
+    IN LPCWSTR          lpString,
+    IN INT              cchStr);
+
+WINBASEAPI
+BOOL
+WINAPI
+IsValidLocale(
+    IN LCID   Locale,
+    IN DWORD  dwFlags);
+
+WINBASEAPI
+int
+WINAPI
+GetGeoInfoA(
+    GEOID       Location,
+    GEOTYPE     GeoType,
+    LPSTR     lpGeoData,
+    int         cchData,
+    LANGID      LangId);
+WINBASEAPI
+int
+WINAPI
+GetGeoInfoW(
+    GEOID       Location,
+    GEOTYPE     GeoType,
+    LPWSTR     lpGeoData,
+    int         cchData,
+    LANGID      LangId);
+#ifdef UNICODE
+#define GetGeoInfo  GetGeoInfoW
+#else
+#define GetGeoInfo  GetGeoInfoA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemGeoID(
+    GEOCLASS        GeoClass,
+    GEOID           ParentGeoId,
+    GEO_ENUMPROC    lpGeoEnumProc);
+
+WINBASEAPI
+GEOID
+WINAPI
+GetUserGeoID(
+    GEOCLASS    GeoClass);
+
+WINBASEAPI
+BOOL
+WINAPI
+SetUserGeoID(
+    GEOID       GeoId);
+
+WINBASEAPI
+LCID
+WINAPI
+ConvertDefaultLocale(
+    IN OUT LCID   Locale);
+
+WINBASEAPI
+LCID
+WINAPI
+GetThreadLocale(void);
+
+WINBASEAPI
+BOOL
+WINAPI
+SetThreadLocale(
+    IN LCID  Locale
+    );
+
+#if(WINVER >= 0x0500)
+WINBASEAPI
+LANGID
+WINAPI
+GetSystemDefaultUILanguage(void);
+
+WINBASEAPI
+LANGID
+WINAPI
+GetUserDefaultUILanguage(void);
+#endif /* WINVER >= 0x0500 */
+
+WINBASEAPI
+LANGID
+WINAPI
+GetSystemDefaultLangID(void);
+
+WINBASEAPI
+LANGID
+WINAPI
+GetUserDefaultLangID(void);
+
+WINBASEAPI
+LCID
+WINAPI
+GetSystemDefaultLCID(void);
+
+WINBASEAPI
+LCID
+WINAPI
+GetUserDefaultLCID(void);
+
+
+
+//
+//  Locale Independent APIs.
+//
+
+WINBASEAPI
+BOOL
+WINAPI
+GetStringTypeExA(
+    IN LCID     Locale,
+    IN DWORD    dwInfoType,
+    IN LPCSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPWORD  lpCharType);
+WINBASEAPI
+BOOL
+WINAPI
+GetStringTypeExW(
+    IN LCID     Locale,
+    IN DWORD    dwInfoType,
+    IN LPCWSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPWORD  lpCharType);
+#ifdef UNICODE
+#define GetStringTypeEx  GetStringTypeExW
+#else
+#define GetStringTypeEx  GetStringTypeExA
+#endif // !UNICODE
+
+//
+//  NOTE: The parameters for GetStringTypeA and GetStringTypeW are
+//        NOT the same.  The W version was shipped in NT 3.1.  The
+//        A version was then shipped in 16-bit OLE with the wrong
+//        parameters (ported from Win95).  To be compatible, we
+//        must break the relationship between the A and W versions
+//        of GetStringType.  There will be NO function call for the
+//        generic GetStringType.
+//
+//        GetStringTypeEx (above) should be used instead.
+//
+WINBASEAPI
+BOOL
+WINAPI
+GetStringTypeA(
+    IN LCID     Locale,
+    IN DWORD    dwInfoType,
+    IN LPCSTR   lpSrcStr,
+    IN int      cchSrc,
+    OUT LPWORD  lpCharType);
+
+WINBASEAPI
+BOOL
+WINAPI
+GetStringTypeW(
+    IN DWORD    dwInfoType,
+    IN LPCWSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPWORD  lpCharType);
+
+
+WINBASEAPI
+int
+WINAPI
+FoldStringA(
+    IN DWORD    dwMapFlags,
+    IN LPCSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPSTR  lpDestStr,
+    IN int      cchDest);
+WINBASEAPI
+int
+WINAPI
+FoldStringW(
+    IN DWORD    dwMapFlags,
+    IN LPCWSTR  lpSrcStr,
+    IN int      cchSrc,
+    OUT LPWSTR  lpDestStr,
+    IN int      cchDest);
+#ifdef UNICODE
+#define FoldString  FoldStringW
+#else
+#define FoldString  FoldStringA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0500)
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemLanguageGroupsA(
+    IN LANGUAGEGROUP_ENUMPROCA lpLanguageGroupEnumProc,
+    IN DWORD                   dwFlags,
+    IN LONG_PTR                lParam);
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemLanguageGroupsW(
+    IN LANGUAGEGROUP_ENUMPROCW lpLanguageGroupEnumProc,
+    IN DWORD                   dwFlags,
+    IN LONG_PTR                lParam);
+#ifdef UNICODE
+#define EnumSystemLanguageGroups  EnumSystemLanguageGroupsW
+#else
+#define EnumSystemLanguageGroups  EnumSystemLanguageGroupsA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumLanguageGroupLocalesA(
+    IN LANGGROUPLOCALE_ENUMPROCA lpLangGroupLocaleEnumProc,
+    IN LGRPID                    LanguageGroup,
+    IN DWORD                     dwFlags,
+    IN LONG_PTR                  lParam);
+WINBASEAPI
+BOOL
+WINAPI
+EnumLanguageGroupLocalesW(
+    IN LANGGROUPLOCALE_ENUMPROCW lpLangGroupLocaleEnumProc,
+    IN LGRPID                    LanguageGroup,
+    IN DWORD                     dwFlags,
+    IN LONG_PTR                  lParam);
+#ifdef UNICODE
+#define EnumLanguageGroupLocales  EnumLanguageGroupLocalesW
+#else
+#define EnumLanguageGroupLocales  EnumLanguageGroupLocalesA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumUILanguagesA(
+    IN UILANGUAGE_ENUMPROCA lpUILanguageEnumProc,
+    IN DWORD                dwFlags,
+    IN LONG_PTR             lParam);
+WINBASEAPI
+BOOL
+WINAPI
+EnumUILanguagesW(
+    IN UILANGUAGE_ENUMPROCW lpUILanguageEnumProc,
+    IN DWORD                dwFlags,
+    IN LONG_PTR             lParam);
+#ifdef UNICODE
+#define EnumUILanguages  EnumUILanguagesW
+#else
+#define EnumUILanguages  EnumUILanguagesA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0500 */
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemLocalesA(
+    IN LOCALE_ENUMPROCA lpLocaleEnumProc,
+    IN DWORD            dwFlags);
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemLocalesW(
+    IN LOCALE_ENUMPROCW lpLocaleEnumProc,
+    IN DWORD            dwFlags);
+#ifdef UNICODE
+#define EnumSystemLocales  EnumSystemLocalesW
+#else
+#define EnumSystemLocales  EnumSystemLocalesA
+#endif // !UNICODE
+
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemCodePagesA(
+    IN CODEPAGE_ENUMPROCA lpCodePageEnumProc,
+    IN DWORD              dwFlags);
+WINBASEAPI
+BOOL
+WINAPI
+EnumSystemCodePagesW(
+    IN CODEPAGE_ENUMPROCW lpCodePageEnumProc,
+    IN DWORD              dwFlags);
+#ifdef UNICODE
+#define EnumSystemCodePages  EnumSystemCodePagesW
+#else
+#define EnumSystemCodePages  EnumSystemCodePagesA
+#endif // !UNICODE
+
+
+#endif // NONLS
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _WINNLS_
diff --git a/base/Windows/Inc/WinReg.h b/base/Windows/Inc/WinReg.h
new file mode 100644
index 0000000..3050b10
--- /dev/null
+++ b/base/Windows/Inc/WinReg.h
@@ -0,0 +1,896 @@
+/*++ BUILD Version: 0001    // Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    Winreg.h
+
+Abstract:
+
+    This module contains the function prototypes and constant, type and
+    structure definitions for the Windows 32-Bit Registry API.
+
+--*/
+
+#ifndef _WINREG_
+#define _WINREG_
+
+
+#ifdef _MAC
+#include <macwin32.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef WINVER
+#define WINVER 0x0500   // version 5.0
+#endif /* !WINVER */
+
+//
+// Requested Key access mask type.
+//
+
+typedef ACCESS_MASK REGSAM;
+
+//
+// Reserved Key Handles.
+//
+
+#define HKEY_CLASSES_ROOT           (( HKEY ) (ULONG_PTR)((LONG)0x80000000) )
+#define HKEY_CURRENT_USER           (( HKEY ) (ULONG_PTR)((LONG)0x80000001) )
+#define HKEY_LOCAL_MACHINE          (( HKEY ) (ULONG_PTR)((LONG)0x80000002) )
+#define HKEY_USERS                  (( HKEY ) (ULONG_PTR)((LONG)0x80000003) )
+#define HKEY_PERFORMANCE_DATA       (( HKEY ) (ULONG_PTR)((LONG)0x80000004) )
+#define HKEY_PERFORMANCE_TEXT       (( HKEY ) (ULONG_PTR)((LONG)0x80000050) )
+#define HKEY_PERFORMANCE_NLSTEXT    (( HKEY ) (ULONG_PTR)((LONG)0x80000060) )
+#if(WINVER >= 0x0400)
+#define HKEY_CURRENT_CONFIG         (( HKEY ) (ULONG_PTR)((LONG)0x80000005) )
+#define HKEY_DYN_DATA               (( HKEY ) (ULONG_PTR)((LONG)0x80000006) )
+
+/*NOINC*/
+#ifndef _PROVIDER_STRUCTS_DEFINED
+#define _PROVIDER_STRUCTS_DEFINED
+
+#define PROVIDER_KEEPS_VALUE_LENGTH 0x1
+struct val_context {
+    int valuelen;       // the total length of this value
+    LPVOID value_context;   // provider's context
+    LPVOID val_buff_ptr;    // where in the ouput buffer the value is.
+};
+
+typedef struct val_context FAR *PVALCONTEXT;
+
+typedef struct pvalueA {           // Provider supplied value/context.
+    LPSTR   pv_valuename;          // The value name pointer
+    int pv_valuelen;
+    LPVOID pv_value_context;
+    DWORD pv_type;
+}PVALUEA, FAR *PPVALUEA;
+typedef struct pvalueW {           // Provider supplied value/context.
+    LPWSTR  pv_valuename;          // The value name pointer
+    int pv_valuelen;
+    LPVOID pv_value_context;
+    DWORD pv_type;
+}PVALUEW, FAR *PPVALUEW;
+#ifdef UNICODE
+typedef PVALUEW PVALUE;
+typedef PPVALUEW PPVALUE;
+#else
+typedef PVALUEA PVALUE;
+typedef PPVALUEA PPVALUE;
+#endif // UNICODE
+
+typedef
+DWORD _cdecl
+QUERYHANDLER (LPVOID keycontext, PVALCONTEXT val_list, DWORD num_vals,
+          LPVOID outputbuffer, DWORD FAR *total_outlen, DWORD input_blen);
+
+typedef QUERYHANDLER FAR *PQUERYHANDLER;
+
+typedef struct provider_info {
+    PQUERYHANDLER pi_R0_1val;
+    PQUERYHANDLER pi_R0_allvals;
+    PQUERYHANDLER pi_R3_1val;
+    PQUERYHANDLER pi_R3_allvals;
+    DWORD pi_flags;    // capability flags (none defined yet).
+    LPVOID pi_key_context;
+}REG_PROVIDER;
+
+typedef struct provider_info FAR *PPROVIDER;
+
+typedef struct value_entA {
+    LPSTR   ve_valuename;
+    DWORD ve_valuelen;
+    DWORD_PTR ve_valueptr;
+    DWORD ve_type;
+}VALENTA, FAR *PVALENTA;
+typedef struct value_entW {
+    LPWSTR  ve_valuename;
+    DWORD ve_valuelen;
+    DWORD_PTR ve_valueptr;
+    DWORD ve_type;
+}VALENTW, FAR *PVALENTW;
+#ifdef UNICODE
+typedef VALENTW VALENT;
+typedef PVALENTW PVALENT;
+#else
+typedef VALENTA VALENT;
+typedef PVALENTA PVALENT;
+#endif // UNICODE
+
+#endif // not(_PROVIDER_STRUCTS_DEFINED)
+/*INC*/
+
+#endif /* WINVER >= 0x0400 */
+
+//
+// Default values for parameters that do not exist in the Win 3.1
+// compatible APIs.
+//
+
+#define WIN31_CLASS                 NULL
+
+//
+// API Prototypes.
+//
+
+
+WINADVAPI
+LONG
+APIENTRY
+RegCloseKey (
+    IN HKEY hKey
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegOverridePredefKey (
+    IN HKEY hKey,
+    IN HKEY hNewHKey
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegOpenUserClassesRoot(
+    HANDLE hToken,
+    DWORD  dwOptions,
+    REGSAM samDesired,
+    PHKEY  phkResult
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegOpenCurrentUser(
+    REGSAM samDesired,
+    PHKEY phkResult
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegDisablePredefinedCache(
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegConnectRegistryA (
+    IN LPCSTR lpMachineName,
+    IN HKEY hKey,
+    OUT PHKEY phkResult
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegConnectRegistryW (
+    IN LPCWSTR lpMachineName,
+    IN HKEY hKey,
+    OUT PHKEY phkResult
+    );
+#ifdef UNICODE
+#define RegConnectRegistry  RegConnectRegistryW
+#else
+#define RegConnectRegistry  RegConnectRegistryA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegCreateKeyA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey,
+    OUT PHKEY phkResult
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegCreateKeyW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey,
+    OUT PHKEY phkResult
+    );
+#ifdef UNICODE
+#define RegCreateKey  RegCreateKeyW
+#else
+#define RegCreateKey  RegCreateKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegCreateKeyExA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey,
+    IN DWORD Reserved,
+    IN LPSTR lpClass,
+    IN DWORD dwOptions,
+    IN REGSAM samDesired,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    OUT PHKEY phkResult,
+    OUT LPDWORD lpdwDisposition
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegCreateKeyExW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey,
+    IN DWORD Reserved,
+    IN LPWSTR lpClass,
+    IN DWORD dwOptions,
+    IN REGSAM samDesired,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    OUT PHKEY phkResult,
+    OUT LPDWORD lpdwDisposition
+    );
+#ifdef UNICODE
+#define RegCreateKeyEx  RegCreateKeyExW
+#else
+#define RegCreateKeyEx  RegCreateKeyExA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegDeleteKeyA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegDeleteKeyW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey
+    );
+#ifdef UNICODE
+#define RegDeleteKey  RegDeleteKeyW
+#else
+#define RegDeleteKey  RegDeleteKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegDeleteValueA (
+    IN HKEY hKey,
+    IN LPCSTR lpValueName
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegDeleteValueW (
+    IN HKEY hKey,
+    IN LPCWSTR lpValueName
+    );
+#ifdef UNICODE
+#define RegDeleteValue  RegDeleteValueW
+#else
+#define RegDeleteValue  RegDeleteValueA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegEnumKeyA (
+    IN HKEY hKey,
+    IN DWORD dwIndex,
+    OUT LPSTR lpName,
+    IN DWORD cbName
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegEnumKeyW (
+    IN HKEY hKey,
+    IN DWORD dwIndex,
+    OUT LPWSTR lpName,
+    IN DWORD cbName
+    );
+#ifdef UNICODE
+#define RegEnumKey  RegEnumKeyW
+#else
+#define RegEnumKey  RegEnumKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegEnumKeyExA (
+    IN HKEY hKey,
+    IN DWORD dwIndex,
+    OUT LPSTR lpName,
+    IN OUT LPDWORD lpcbName,
+    IN LPDWORD lpReserved,
+    IN OUT LPSTR lpClass,
+    IN OUT LPDWORD lpcbClass,
+    OUT PFILETIME lpftLastWriteTime
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegEnumKeyExW (
+    IN HKEY hKey,
+    IN DWORD dwIndex,
+    OUT LPWSTR lpName,
+    IN OUT LPDWORD lpcbName,
+    IN LPDWORD lpReserved,
+    IN OUT LPWSTR lpClass,
+    IN OUT LPDWORD lpcbClass,
+    OUT PFILETIME lpftLastWriteTime
+    );
+#ifdef UNICODE
+#define RegEnumKeyEx  RegEnumKeyExW
+#else
+#define RegEnumKeyEx  RegEnumKeyExA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegEnumValueA (
+    IN HKEY hKey,
+    IN DWORD dwIndex,
+    OUT LPSTR lpValueName,
+    IN OUT LPDWORD lpcbValueName,
+    IN LPDWORD lpReserved,
+    OUT LPDWORD lpType,
+    OUT LPBYTE lpData,
+    IN OUT LPDWORD lpcbData
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegEnumValueW (
+    IN HKEY hKey,
+    IN DWORD dwIndex,
+    OUT LPWSTR lpValueName,
+    IN OUT LPDWORD lpcbValueName,
+    IN LPDWORD lpReserved,
+    OUT LPDWORD lpType,
+    OUT LPBYTE lpData,
+    IN OUT LPDWORD lpcbData
+    );
+#ifdef UNICODE
+#define RegEnumValue  RegEnumValueW
+#else
+#define RegEnumValue  RegEnumValueA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegFlushKey (
+    IN HKEY hKey
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegGetKeySecurity (
+    IN HKEY hKey,
+    IN SECURITY_INFORMATION SecurityInformation,
+    OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+    IN OUT LPDWORD lpcbSecurityDescriptor
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegLoadKeyA (
+    IN HKEY    hKey,
+    IN LPCSTR  lpSubKey,
+    IN LPCSTR  lpFile
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegLoadKeyW (
+    IN HKEY    hKey,
+    IN LPCWSTR  lpSubKey,
+    IN LPCWSTR  lpFile
+    );
+#ifdef UNICODE
+#define RegLoadKey  RegLoadKeyW
+#else
+#define RegLoadKey  RegLoadKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegNotifyChangeKeyValue (
+    IN HKEY hKey,
+    IN BOOL bWatchSubtree,
+    IN DWORD dwNotifyFilter,
+    IN HANDLE hEvent,
+    IN BOOL fAsynchronus
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegOpenKeyA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey,
+    OUT PHKEY phkResult
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegOpenKeyW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey,
+    OUT PHKEY phkResult
+    );
+#ifdef UNICODE
+#define RegOpenKey  RegOpenKeyW
+#else
+#define RegOpenKey  RegOpenKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegOpenKeyExA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey,
+    IN DWORD ulOptions,
+    IN REGSAM samDesired,
+    OUT PHKEY phkResult
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegOpenKeyExW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey,
+    IN DWORD ulOptions,
+    IN REGSAM samDesired,
+    OUT PHKEY phkResult
+    );
+#ifdef UNICODE
+#define RegOpenKeyEx  RegOpenKeyExW
+#else
+#define RegOpenKeyEx  RegOpenKeyExA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegQueryInfoKeyA (
+    IN HKEY hKey,
+    OUT LPSTR lpClass,
+    IN OUT LPDWORD lpcbClass,
+    IN LPDWORD lpReserved,
+    OUT LPDWORD lpcSubKeys,
+    OUT LPDWORD lpcbMaxSubKeyLen,
+    OUT LPDWORD lpcbMaxClassLen,
+    OUT LPDWORD lpcValues,
+    OUT LPDWORD lpcbMaxValueNameLen,
+    OUT LPDWORD lpcbMaxValueLen,
+    OUT LPDWORD lpcbSecurityDescriptor,
+    OUT PFILETIME lpftLastWriteTime
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegQueryInfoKeyW (
+    IN HKEY hKey,
+    OUT LPWSTR lpClass,
+    IN OUT LPDWORD lpcbClass,
+    IN LPDWORD lpReserved,
+    OUT LPDWORD lpcSubKeys,
+    OUT LPDWORD lpcbMaxSubKeyLen,
+    OUT LPDWORD lpcbMaxClassLen,
+    OUT LPDWORD lpcValues,
+    OUT LPDWORD lpcbMaxValueNameLen,
+    OUT LPDWORD lpcbMaxValueLen,
+    OUT LPDWORD lpcbSecurityDescriptor,
+    OUT PFILETIME lpftLastWriteTime
+    );
+#ifdef UNICODE
+#define RegQueryInfoKey  RegQueryInfoKeyW
+#else
+#define RegQueryInfoKey  RegQueryInfoKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegQueryValueA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey,
+    OUT LPSTR lpValue,
+    IN OUT PLONG   lpcbValue
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegQueryValueW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey,
+    OUT LPWSTR lpValue,
+    IN OUT PLONG   lpcbValue
+    );
+#ifdef UNICODE
+#define RegQueryValue  RegQueryValueW
+#else
+#define RegQueryValue  RegQueryValueA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINADVAPI
+LONG
+APIENTRY
+RegQueryMultipleValuesA (
+    IN HKEY hKey,
+    OUT PVALENTA val_list,
+    IN DWORD num_vals,
+    OUT LPSTR lpValueBuf,
+    IN OUT LPDWORD ldwTotsize
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegQueryMultipleValuesW (
+    IN HKEY hKey,
+    OUT PVALENTW val_list,
+    IN DWORD num_vals,
+    OUT LPWSTR lpValueBuf,
+    IN OUT LPDWORD ldwTotsize
+    );
+#ifdef UNICODE
+#define RegQueryMultipleValues  RegQueryMultipleValuesW
+#else
+#define RegQueryMultipleValues  RegQueryMultipleValuesA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+WINADVAPI
+LONG
+APIENTRY
+RegQueryValueExA (
+    IN HKEY hKey,
+    IN LPCSTR lpValueName,
+    IN LPDWORD lpReserved,
+    OUT LPDWORD lpType,
+    IN OUT LPBYTE lpData,
+    IN OUT LPDWORD lpcbData
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegQueryValueExW (
+    IN HKEY hKey,
+    IN LPCWSTR lpValueName,
+    IN LPDWORD lpReserved,
+    OUT LPDWORD lpType,
+    IN OUT LPBYTE lpData,
+    IN OUT LPDWORD lpcbData
+    );
+#ifdef UNICODE
+#define RegQueryValueEx  RegQueryValueExW
+#else
+#define RegQueryValueEx  RegQueryValueExA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegReplaceKeyA (
+    IN HKEY     hKey,
+    IN LPCSTR  lpSubKey,
+    IN LPCSTR  lpNewFile,
+    IN LPCSTR  lpOldFile
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegReplaceKeyW (
+    IN HKEY     hKey,
+    IN LPCWSTR  lpSubKey,
+    IN LPCWSTR  lpNewFile,
+    IN LPCWSTR  lpOldFile
+    );
+#ifdef UNICODE
+#define RegReplaceKey  RegReplaceKeyW
+#else
+#define RegReplaceKey  RegReplaceKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegRestoreKeyA (
+    IN HKEY hKey,
+    IN LPCSTR lpFile,
+    IN DWORD   dwFlags
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegRestoreKeyW (
+    IN HKEY hKey,
+    IN LPCWSTR lpFile,
+    IN DWORD   dwFlags
+    );
+#ifdef UNICODE
+#define RegRestoreKey  RegRestoreKeyW
+#else
+#define RegRestoreKey  RegRestoreKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegSaveKeyA (
+    IN HKEY hKey,
+    IN LPCSTR lpFile,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegSaveKeyW (
+    IN HKEY hKey,
+    IN LPCWSTR lpFile,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes
+    );
+#ifdef UNICODE
+#define RegSaveKey  RegSaveKeyW
+#else
+#define RegSaveKey  RegSaveKeyA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegSetKeySecurity (
+    IN HKEY hKey,
+    IN SECURITY_INFORMATION SecurityInformation,
+    IN PSECURITY_DESCRIPTOR pSecurityDescriptor
+    );
+
+WINADVAPI
+LONG
+APIENTRY
+RegSetValueA (
+    IN HKEY hKey,
+    IN LPCSTR lpSubKey,
+    IN DWORD dwType,
+    IN LPCSTR lpData,
+    IN DWORD cbData
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegSetValueW (
+    IN HKEY hKey,
+    IN LPCWSTR lpSubKey,
+    IN DWORD dwType,
+    IN LPCWSTR lpData,
+    IN DWORD cbData
+    );
+#ifdef UNICODE
+#define RegSetValue  RegSetValueW
+#else
+#define RegSetValue  RegSetValueA
+#endif // !UNICODE
+
+
+WINADVAPI
+LONG
+APIENTRY
+RegSetValueExA (
+    IN HKEY hKey,
+    IN LPCSTR lpValueName,
+    IN DWORD Reserved,
+    IN DWORD dwType,
+    IN CONST BYTE* lpData,
+    IN DWORD cbData
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegSetValueExW (
+    IN HKEY hKey,
+    IN LPCWSTR lpValueName,
+    IN DWORD Reserved,
+    IN DWORD dwType,
+    IN CONST BYTE* lpData,
+    IN DWORD cbData
+    );
+#ifdef UNICODE
+#define RegSetValueEx  RegSetValueExW
+#else
+#define RegSetValueEx  RegSetValueExA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+RegUnLoadKeyA (
+    IN HKEY    hKey,
+    IN LPCSTR lpSubKey
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegUnLoadKeyW (
+    IN HKEY    hKey,
+    IN LPCWSTR lpSubKey
+    );
+#ifdef UNICODE
+#define RegUnLoadKey  RegUnLoadKeyW
+#else
+#define RegUnLoadKey  RegUnLoadKeyA
+#endif // !UNICODE
+
+//
+// Remoteable System Shutdown APIs
+//
+
+WINADVAPI
+BOOL
+APIENTRY
+InitiateSystemShutdownA(
+    IN LPSTR lpMachineName,
+    IN LPSTR lpMessage,
+    IN DWORD dwTimeout,
+    IN BOOL bForceAppsClosed,
+    IN BOOL bRebootAfterShutdown
+    );
+WINADVAPI
+BOOL
+APIENTRY
+InitiateSystemShutdownW(
+    IN LPWSTR lpMachineName,
+    IN LPWSTR lpMessage,
+    IN DWORD dwTimeout,
+    IN BOOL bForceAppsClosed,
+    IN BOOL bRebootAfterShutdown
+    );
+#ifdef UNICODE
+#define InitiateSystemShutdown  InitiateSystemShutdownW
+#else
+#define InitiateSystemShutdown  InitiateSystemShutdownA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+APIENTRY
+AbortSystemShutdownA(
+    IN LPSTR lpMachineName
+    );
+WINADVAPI
+BOOL
+APIENTRY
+AbortSystemShutdownW(
+    IN LPWSTR lpMachineName
+    );
+#ifdef UNICODE
+#define AbortSystemShutdown  AbortSystemShutdownW
+#else
+#define AbortSystemShutdown  AbortSystemShutdownA
+#endif // !UNICODE
+
+//
+// defines for InitiateSystemShutdownEx reason codes
+//
+
+#include <reason.h>             // get the public reasons
+//
+// Then for Historical reasons support some old symbols, internal only
+
+#define REASON_SWINSTALL    SHTDN_REASON_MAJOR_SOFTWARE|SHTDN_REASON_MINOR_INSTALLATION
+#define REASON_HWINSTALL    SHTDN_REASON_MAJOR_HARDWARE|SHTDN_REASON_MINOR_INSTALLATION
+#define REASON_SERVICEHANG  SHTDN_REASON_MAJOR_SOFTWARE|SHTDN_REASON_MINOR_HUNG
+#define REASON_UNSTABLE     SHTDN_REASON_MAJOR_SYSTEM|SHTDN_REASON_MINOR_UNSTABLE
+#define REASON_SWHWRECONF   SHTDN_REASON_MAJOR_SOFTWARE|SHTDN_REASON_MINOR_RECONFIG
+#define REASON_OTHER        SHTDN_REASON_MAJOR_OTHER|SHTDN_REASON_MINOR_OTHER
+#define REASON_UNKNOWN      SHTDN_REASON_UNKNOWN
+#define REASON_LEGACY_API   SHTDN_REASON_LEGACY_API
+#define REASON_PLANNED_FLAG SHTDN_REASON_FLAG_PLANNED
+
+//
+// MAX Shutdown TimeOut == 10 Years in seconds
+//
+#define MAX_SHUTDOWN_TIMEOUT (10*365*24*60*60)      
+
+WINADVAPI
+BOOL
+APIENTRY
+InitiateSystemShutdownExA(
+    IN LPSTR lpMachineName,
+    IN LPSTR lpMessage,
+    IN DWORD dwTimeout,
+    IN BOOL bForceAppsClosed,
+    IN BOOL bRebootAfterShutdown,
+    IN DWORD dwReason
+    );
+WINADVAPI
+BOOL
+APIENTRY
+InitiateSystemShutdownExW(
+    IN LPWSTR lpMachineName,
+    IN LPWSTR lpMessage,
+    IN DWORD dwTimeout,
+    IN BOOL bForceAppsClosed,
+    IN BOOL bRebootAfterShutdown,
+    IN DWORD dwReason
+    );
+#ifdef UNICODE
+#define InitiateSystemShutdownEx  InitiateSystemShutdownExW
+#else
+#define InitiateSystemShutdownEx  InitiateSystemShutdownExA
+#endif // !UNICODE
+
+
+WINADVAPI
+LONG
+APIENTRY
+RegSaveKeyExA (
+    IN HKEY hKey,
+    IN LPCSTR lpFile,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    IN DWORD Flags
+    );
+WINADVAPI
+LONG
+APIENTRY
+RegSaveKeyExW (
+    IN HKEY hKey,
+    IN LPCWSTR lpFile,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    IN DWORD Flags
+    );
+#ifdef UNICODE
+#define RegSaveKeyEx  RegSaveKeyExW
+#else
+#define RegSaveKeyEx  RegSaveKeyExA
+#endif // !UNICODE
+
+WINADVAPI
+LONG
+APIENTRY
+Wow64Win32ApiEntry (
+    DWORD dwFuncNumber,
+    DWORD dwFlag,
+    DWORD dwRes
+    );
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // _WINREG_
+
diff --git a/base/Windows/Inc/WinSock.h b/base/Windows/Inc/WinSock.h
new file mode 100644
index 0000000..02563df
--- /dev/null
+++ b/base/Windows/Inc/WinSock.h
@@ -0,0 +1,1087 @@
+/* WINSOCK.H--definitions to be used with the WINSOCK.DLL
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ *
+ * This header file corresponds to version 1.1 of the Windows Sockets specification.
+ *
+ * This file includes parts which are Copyright (c) 1982-1986 Regents
+ * of the University of California.  All rights reserved.  The
+ * Berkeley Software License Agreement specifies the terms and
+ * conditions for redistribution.
+ *
+ */
+
+#ifndef _WINSOCKAPI_
+#define _WINSOCKAPI_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+/*
+ * Pull in WINDOWS.H if necessary
+ */
+#ifndef _INC_WINDOWS
+#include <windows.h>
+#endif /* _INC_WINDOWS */
+
+/*
+ * Basic system type definitions, taken from the BSD file sys/types.h.
+ */
+typedef unsigned char   u_char;
+typedef unsigned short  u_short;
+typedef unsigned int    u_int;
+typedef unsigned long   u_long;
+
+/*
+ * The new type to be used in all
+ * instances which refer to sockets.
+ */
+
+typedef UINT_PTR        SOCKET;
+
+/*
+ * Select uses arrays of SOCKETs.  These macros manipulate such
+ * arrays.  FD_SETSIZE may be defined by the user before including
+ * this file, but the default here should be >= 64.
+ *
+ * CAVEAT IMPLEMENTOR and USER: THESE MACROS AND TYPES MUST BE
+ * INCLUDED IN WINSOCK.H EXACTLY AS SHOWN HERE.
+ */
+#ifndef FD_SETSIZE
+#define FD_SETSIZE      64
+#endif /* FD_SETSIZE */
+
+typedef struct fd_set {
+        u_int   fd_count;               /* how many are SET? */
+        SOCKET  fd_array[FD_SETSIZE];   /* an array of SOCKETs */
+} fd_set;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR *);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#define FD_CLR(fd, set) do { \
+    u_int __i; \
+    for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \
+        if (((fd_set FAR *)(set))->fd_array[__i] == fd) { \
+            while (__i < ((fd_set FAR *)(set))->fd_count-1) { \
+                ((fd_set FAR *)(set))->fd_array[__i] = \
+                    ((fd_set FAR *)(set))->fd_array[__i+1]; \
+                __i++; \
+            } \
+            ((fd_set FAR *)(set))->fd_count--; \
+            break; \
+        } \
+    } \
+} while(0)
+
+#define FD_SET(fd, set) do { \
+    if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) \
+        ((fd_set FAR *)(set))->fd_array[((fd_set FAR *)(set))->fd_count++]=(fd);\
+} while(0)
+
+#define FD_ZERO(set) (((fd_set FAR *)(set))->fd_count=0)
+
+#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set FAR *)(set))
+
+/*
+ * Structure used in select() call, taken from the BSD file sys/time.h.
+ */
+struct timeval {
+        long    tv_sec;         /* seconds */
+        long    tv_usec;        /* and microseconds */
+};
+
+/*
+ * Operations on timevals.
+ *
+ * NB: timercmp does not work for >= or <=.
+ */
+#define timerisset(tvp)         ((tvp)->tv_sec || (tvp)->tv_usec)
+#define timercmp(tvp, uvp, cmp) \
+        ((tvp)->tv_sec cmp (uvp)->tv_sec || \
+         (tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec)
+#define timerclear(tvp)         (tvp)->tv_sec = (tvp)->tv_usec = 0
+
+/*
+ * Commands for ioctlsocket(),  taken from the BSD file fcntl.h.
+ *
+ *
+ * Ioctl's have the command encoded in the lower word,
+ * and the size of any in or out parameters in the upper
+ * word.  The high 2 bits of the upper word are used
+ * to encode the in/out status of the parameter; for now
+ * we restrict parameters to at most 128 bytes.
+ */
+#define IOCPARM_MASK    0x7f            /* parameters must be < 128 bytes */
+#define IOC_VOID        0x20000000      /* no parameters */
+#define IOC_OUT         0x40000000      /* copy out parameters */
+#define IOC_IN          0x80000000      /* copy in parameters */
+#define IOC_INOUT       (IOC_IN|IOC_OUT)
+                                        /* 0x20000000 distinguishes new &
+                                           old ioctl's */
+#define _IO(x,y)        (IOC_VOID|((x)<<8)|(y))
+
+#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
+
+#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
+
+#define FIONREAD    _IOR('f', 127, u_long) /* get # bytes to read */
+#define FIONBIO     _IOW('f', 126, u_long) /* set/clear non-blocking i/o */
+#define FIOASYNC    _IOW('f', 125, u_long) /* set/clear async i/o */
+
+/* Socket I/O Controls */
+#define SIOCSHIWAT  _IOW('s',  0, u_long)  /* set high watermark */
+#define SIOCGHIWAT  _IOR('s',  1, u_long)  /* get high watermark */
+#define SIOCSLOWAT  _IOW('s',  2, u_long)  /* set low watermark */
+#define SIOCGLOWAT  _IOR('s',  3, u_long)  /* get low watermark */
+#define SIOCATMARK  _IOR('s',  7, u_long)  /* at oob mark? */
+
+/*
+ * Structures returned by network data base library, taken from the
+ * BSD file netdb.h.  All addresses are supplied in host order, and
+ * returned in network order (suitable for use in system calls).
+ */
+
+struct  hostent {
+        char    FAR * h_name;           /* official name of host */
+        char    FAR * FAR * h_aliases;  /* alias list */
+        short   h_addrtype;             /* host address type */
+        short   h_length;               /* length of address */
+        char    FAR * FAR * h_addr_list; /* list of addresses */
+#define h_addr  h_addr_list[0]          /* address, for backward compat */
+};
+
+/*
+ * It is assumed here that a network number
+ * fits in 32 bits.
+ */
+struct  netent {
+        char    FAR * n_name;           /* official name of net */
+        char    FAR * FAR * n_aliases;  /* alias list */
+        short   n_addrtype;             /* net address type */
+        u_long  n_net;                  /* network # */
+};
+
+struct  servent {
+        char    FAR * s_name;           /* official service name */
+        char    FAR * FAR * s_aliases;  /* alias list */
+#ifdef _WIN64
+        char    FAR * s_proto;          /* protocol to use */
+        short   s_port;                 /* port # */
+#else
+        short   s_port;                 /* port # */
+        char    FAR * s_proto;          /* protocol to use */
+#endif
+};
+
+struct  protoent {
+        char    FAR * p_name;           /* official protocol name */
+        char    FAR * FAR * p_aliases;  /* alias list */
+        short   p_proto;                /* protocol # */
+};
+
+/*
+ * Constants and structures defined by the internet system,
+ * Per RFC 790, September 1981, taken from the BSD file netinet/in.h.
+ */
+
+/*
+ * Protocols
+ */
+#define IPPROTO_IP              0               /* dummy for IP */
+#define IPPROTO_ICMP            1               /* control message protocol */
+#define IPPROTO_IGMP            2               /* group management protocol */
+#define IPPROTO_GGP             3               /* gateway^2 (deprecated) */
+#define IPPROTO_TCP             6               /* tcp */
+#define IPPROTO_PUP             12              /* pup */
+#define IPPROTO_UDP             17              /* user datagram protocol */
+#define IPPROTO_IDP             22              /* xns idp */
+#define IPPROTO_ND              77              /* UNOFFICIAL net disk proto */
+
+#define IPPROTO_RAW             255             /* raw IP packet */
+#define IPPROTO_MAX             256
+
+/*
+ * Port/socket numbers: network standard functions
+ */
+#define IPPORT_ECHO             7
+#define IPPORT_DISCARD          9
+#define IPPORT_SYSTAT           11
+#define IPPORT_DAYTIME          13
+#define IPPORT_NETSTAT          15
+#define IPPORT_FTP              21
+#define IPPORT_TELNET           23
+#define IPPORT_SMTP             25
+#define IPPORT_TIMESERVER       37
+#define IPPORT_NAMESERVER       42
+#define IPPORT_WHOIS            43
+#define IPPORT_MTP              57
+
+/*
+ * Port/socket numbers: host specific functions
+ */
+#define IPPORT_TFTP             69
+#define IPPORT_RJE              77
+#define IPPORT_FINGER           79
+#define IPPORT_TTYLINK          87
+#define IPPORT_SUPDUP           95
+
+/*
+ * UNIX TCP sockets
+ */
+#define IPPORT_EXECSERVER       512
+#define IPPORT_LOGINSERVER      513
+#define IPPORT_CMDSERVER        514
+#define IPPORT_EFSSERVER        520
+
+/*
+ * UNIX UDP sockets
+ */
+#define IPPORT_BIFFUDP          512
+#define IPPORT_WHOSERVER        513
+#define IPPORT_ROUTESERVER      520
+                                        /* 520+1 also used */
+
+/*
+ * Ports < IPPORT_RESERVED are reserved for
+ * privileged processes (e.g. root).
+ */
+#define IPPORT_RESERVED         1024
+
+/*
+ * Link numbers
+ */
+#define IMPLINK_IP              155
+#define IMPLINK_LOWEXPER        156
+#define IMPLINK_HIGHEXPER       158
+
+#ifndef s_addr
+/*
+ * Internet address (old style... should be updated)
+ */
+struct in_addr {
+        union {
+                struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
+                struct { u_short s_w1,s_w2; } S_un_w;
+                u_long S_addr;
+        } S_un;
+#define s_addr  S_un.S_addr
+                                /* can be used for most tcp & ip code */
+#define s_host  S_un.S_un_b.s_b2
+                                /* host on imp */
+#define s_net   S_un.S_un_b.s_b1
+                                /* network */
+#define s_imp   S_un.S_un_w.s_w2
+                                /* imp */
+#define s_impno S_un.S_un_b.s_b4
+                                /* imp # */
+#define s_lh    S_un.S_un_b.s_b3
+                                /* logical host */
+};
+#endif
+
+/*
+ * Definitions of bits in internet address integers.
+ * On subnets, the decomposition of addresses to host and net parts
+ * is done according to subnet mask, not the masks here.
+ */
+#define IN_CLASSA(i)            (((long)(i) & 0x80000000) == 0)
+#define IN_CLASSA_NET           0xff000000
+#define IN_CLASSA_NSHIFT        24
+#define IN_CLASSA_HOST          0x00ffffff
+#define IN_CLASSA_MAX           128
+
+#define IN_CLASSB(i)            (((long)(i) & 0xc0000000) == 0x80000000)
+#define IN_CLASSB_NET           0xffff0000
+#define IN_CLASSB_NSHIFT        16
+#define IN_CLASSB_HOST          0x0000ffff
+#define IN_CLASSB_MAX           65536
+
+#define IN_CLASSC(i)            (((long)(i) & 0xe0000000) == 0xc0000000)
+#define IN_CLASSC_NET           0xffffff00
+#define IN_CLASSC_NSHIFT        8
+#define IN_CLASSC_HOST          0x000000ff
+
+#define INADDR_ANY              (u_long)0x00000000
+#define INADDR_LOOPBACK         0x7f000001
+#define INADDR_BROADCAST        (u_long)0xffffffff
+#define INADDR_NONE             0xffffffff
+
+/*
+ * Socket address, internet style.
+ */
+struct sockaddr_in {
+        short   sin_family;
+        u_short sin_port;
+        struct  in_addr sin_addr;
+        char    sin_zero[8];
+};
+
+#define WSADESCRIPTION_LEN      256
+#define WSASYS_STATUS_LEN       128
+
+typedef struct WSAData {
+        WORD                    wVersion;
+        WORD                    wHighVersion;
+#ifdef _WIN64
+        unsigned short          iMaxSockets;
+        unsigned short          iMaxUdpDg;
+        char FAR *              lpVendorInfo;
+        char                    szDescription[WSADESCRIPTION_LEN+1];
+        char                    szSystemStatus[WSASYS_STATUS_LEN+1];
+#else
+        char                    szDescription[WSADESCRIPTION_LEN+1];
+        char                    szSystemStatus[WSASYS_STATUS_LEN+1];
+        unsigned short          iMaxSockets;
+        unsigned short          iMaxUdpDg;
+        char FAR *              lpVendorInfo;
+#endif
+} WSADATA;
+
+typedef WSADATA FAR *LPWSADATA;
+
+/*
+ * Options for use with [gs]etsockopt at the IP level.
+ */
+#define IP_OPTIONS          1           /* set/get IP per-packet options    */
+#define IP_MULTICAST_IF     2           /* set/get IP multicast interface   */
+#define IP_MULTICAST_TTL    3           /* set/get IP multicast timetolive  */
+#define IP_MULTICAST_LOOP   4           /* set/get IP multicast loopback    */
+#define IP_ADD_MEMBERSHIP   5           /* add  an IP group membership      */
+#define IP_DROP_MEMBERSHIP  6           /* drop an IP group membership      */
+#define IP_TTL              7           /* set/get IP Time To Live          */
+#define IP_TOS              8           /* set/get IP Type Of Service       */
+#define IP_DONTFRAGMENT     9           /* set/get IP Don't Fragment flag   */
+
+
+#define IP_DEFAULT_MULTICAST_TTL   1    /* normally limit m'casts to 1 hop  */
+#define IP_DEFAULT_MULTICAST_LOOP  1    /* normally hear sends if a member  */
+#define IP_MAX_MEMBERSHIPS         20   /* per socket; must fit in one mbuf */
+
+/*
+ * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
+ */
+struct ip_mreq {
+        struct in_addr  imr_multiaddr;  /* IP multicast address of group */
+        struct in_addr  imr_interface;  /* local IP address of interface */
+};
+
+/*
+ * Definitions related to sockets: types, address families, options,
+ * taken from the BSD file sys/socket.h.
+ */
+
+/*
+ * This is used instead of -1, since the
+ * SOCKET type is unsigned.
+ */
+#define INVALID_SOCKET  (SOCKET)(~0)
+#define SOCKET_ERROR            (-1)
+
+/*
+ * Types
+ */
+#define SOCK_STREAM     1               /* stream socket */
+#define SOCK_DGRAM      2               /* datagram socket */
+#define SOCK_RAW        3               /* raw-protocol interface */
+#define SOCK_RDM        4               /* reliably-delivered message */
+#define SOCK_SEQPACKET  5               /* sequenced packet stream */
+
+/*
+ * Option flags per-socket.
+ */
+#define SO_DEBUG        0x0001          /* turn on debugging info recording */
+#define SO_ACCEPTCONN   0x0002          /* socket has had listen() */
+#define SO_REUSEADDR    0x0004          /* allow local address reuse */
+#define SO_KEEPALIVE    0x0008          /* keep connections alive */
+#define SO_DONTROUTE    0x0010          /* just use interface addresses */
+#define SO_BROADCAST    0x0020          /* permit sending of broadcast msgs */
+#define SO_USELOOPBACK  0x0040          /* bypass hardware when possible */
+#define SO_LINGER       0x0080          /* linger on close if data present */
+#define SO_OOBINLINE    0x0100          /* leave received OOB data in line */
+
+#define SO_DONTLINGER   (u_int)(~SO_LINGER)
+
+/*
+ * Additional options.
+ */
+#define SO_SNDBUF       0x1001          /* send buffer size */
+#define SO_RCVBUF       0x1002          /* receive buffer size */
+#define SO_SNDLOWAT     0x1003          /* send low-water mark */
+#define SO_RCVLOWAT     0x1004          /* receive low-water mark */
+#define SO_SNDTIMEO     0x1005          /* send timeout */
+#define SO_RCVTIMEO     0x1006          /* receive timeout */
+#define SO_ERROR        0x1007          /* get error status and clear */
+#define SO_TYPE         0x1008          /* get socket type */
+
+/*
+ * Options for connect and disconnect data and options.  Used only by
+ * non-TCP/IP transports such as DECNet, OSI TP4, etc.
+ */
+#define SO_CONNDATA     0x7000
+#define SO_CONNOPT      0x7001
+#define SO_DISCDATA     0x7002
+#define SO_DISCOPT      0x7003
+#define SO_CONNDATALEN  0x7004
+#define SO_CONNOPTLEN   0x7005
+#define SO_DISCDATALEN  0x7006
+#define SO_DISCOPTLEN   0x7007
+
+/*
+ * Option for opening sockets for synchronous access.
+ */
+#define SO_OPENTYPE     0x7008
+
+#define SO_SYNCHRONOUS_ALERT    0x10
+#define SO_SYNCHRONOUS_NONALERT 0x20
+
+/*
+ * Other NT-specific options.
+ */
+#define SO_MAXDG        0x7009
+#define SO_MAXPATHDG    0x700A
+#define SO_UPDATE_ACCEPT_CONTEXT 0x700B
+#define SO_CONNECT_TIME 0x700C
+
+/*
+ * TCP options.
+ */
+#define TCP_NODELAY     0x0001
+#define TCP_BSDURGENT   0x7000
+
+/*
+ * Address families.
+ */
+#define AF_UNSPEC       0               /* unspecified */
+#define AF_UNIX         1               /* local to host (pipes, portals) */
+#define AF_INET         2               /* internetwork: UDP, TCP, etc. */
+#define AF_IMPLINK      3               /* arpanet imp addresses */
+#define AF_PUP          4               /* pup protocols: e.g. BSP */
+#define AF_CHAOS        5               /* mit CHAOS protocols */
+#define AF_IPX          6               /* IPX and SPX */
+#define AF_NS           6               /* XEROX NS protocols */
+#define AF_ISO          7               /* ISO protocols */
+#define AF_OSI          AF_ISO          /* OSI is ISO */
+#define AF_ECMA         8               /* european computer manufacturers */
+#define AF_DATAKIT      9               /* datakit protocols */
+#define AF_CCITT        10              /* CCITT protocols, X.25 etc */
+#define AF_SNA          11              /* IBM SNA */
+#define AF_DECnet       12              /* DECnet */
+#define AF_DLI          13              /* Direct data link interface */
+#define AF_LAT          14              /* LAT */
+#define AF_HYLINK       15              /* NSC Hyperchannel */
+#define AF_APPLETALK    16              /* AppleTalk */
+#define AF_NETBIOS      17              /* NetBios-style addresses */
+#define AF_VOICEVIEW    18              /* VoiceView */
+#define AF_FIREFOX      19              /* FireFox */
+#define AF_UNKNOWN1     20              /* Somebody is using this! */
+#define AF_BAN          21              /* Banyan */
+
+#define AF_MAX          22
+
+/*
+ * Structure used by kernel to store most
+ * addresses.
+ */
+struct sockaddr {
+        u_short sa_family;              /* address family */
+        char    sa_data[14];            /* up to 14 bytes of direct address */
+};
+
+/*
+ * Structure used by kernel to pass protocol
+ * information in raw sockets.
+ */
+struct sockproto {
+        u_short sp_family;              /* address family */
+        u_short sp_protocol;            /* protocol */
+};
+
+/*
+ * Protocol families, same as address families for now.
+ */
+#define PF_UNSPEC       AF_UNSPEC
+#define PF_UNIX         AF_UNIX
+#define PF_INET         AF_INET
+#define PF_IMPLINK      AF_IMPLINK
+#define PF_PUP          AF_PUP
+#define PF_CHAOS        AF_CHAOS
+#define PF_NS           AF_NS
+#define PF_IPX          AF_IPX
+#define PF_ISO          AF_ISO
+#define PF_OSI          AF_OSI
+#define PF_ECMA         AF_ECMA
+#define PF_DATAKIT      AF_DATAKIT
+#define PF_CCITT        AF_CCITT
+#define PF_SNA          AF_SNA
+#define PF_DECnet       AF_DECnet
+#define PF_DLI          AF_DLI
+#define PF_LAT          AF_LAT
+#define PF_HYLINK       AF_HYLINK
+#define PF_APPLETALK    AF_APPLETALK
+#define PF_VOICEVIEW    AF_VOICEVIEW
+#define PF_FIREFOX      AF_FIREFOX
+#define PF_UNKNOWN1     AF_UNKNOWN1
+#define PF_BAN          AF_BAN
+
+#define PF_MAX          AF_MAX
+
+/*
+ * Structure used for manipulating linger option.
+ */
+struct  linger {
+        u_short l_onoff;                /* option on/off */
+        u_short l_linger;               /* linger time */
+};
+
+/*
+ * Level number for (get/set)sockopt() to apply to socket itself.
+ */
+#define SOL_SOCKET      0xffff          /* options for socket level */
+
+/*
+ * Maximum queue length specifiable by listen.
+ */
+#define SOMAXCONN       5
+
+#define MSG_OOB         0x1             /* process out-of-band data */
+#define MSG_PEEK        0x2             /* peek at incoming message */
+#define MSG_DONTROUTE   0x4             /* send without using routing tables */
+
+#define MSG_MAXIOVLEN   16
+
+#define MSG_PARTIAL     0x8000          /* partial send or recv for message xport */
+
+/*
+ * Define constant based on rfc883, used by gethostbyxxxx() calls.
+ */
+#define MAXGETHOSTSTRUCT        1024
+
+/*
+ * Define flags to be used with the WSAAsyncSelect() call.
+ */
+#define FD_READ         0x01
+#define FD_WRITE        0x02
+#define FD_OOB          0x04
+#define FD_ACCEPT       0x08
+#define FD_CONNECT      0x10
+#define FD_CLOSE        0x20
+
+/*
+ * WinSock error codes are also defined in winerror.h
+ * Hence the IFDEF.
+ */
+#ifndef WSABASEERR
+
+/*
+ * All Windows Sockets error constants are biased by WSABASEERR from
+ * the "normal"
+ */
+#define WSABASEERR              10000
+/*
+ * Windows Sockets definitions of regular Microsoft C error constants
+ */
+#define WSAEINTR                (WSABASEERR+4)
+#define WSAEBADF                (WSABASEERR+9)
+#define WSAEACCES               (WSABASEERR+13)
+#define WSAEFAULT               (WSABASEERR+14)
+#define WSAEINVAL               (WSABASEERR+22)
+#define WSAEMFILE               (WSABASEERR+24)
+
+/*
+ * Windows Sockets definitions of regular Berkeley error constants
+ */
+#define WSAEWOULDBLOCK          (WSABASEERR+35)
+#define WSAEINPROGRESS          (WSABASEERR+36)
+#define WSAEALREADY             (WSABASEERR+37)
+#define WSAENOTSOCK             (WSABASEERR+38)
+#define WSAEDESTADDRREQ         (WSABASEERR+39)
+#define WSAEMSGSIZE             (WSABASEERR+40)
+#define WSAEPROTOTYPE           (WSABASEERR+41)
+#define WSAENOPROTOOPT          (WSABASEERR+42)
+#define WSAEPROTONOSUPPORT      (WSABASEERR+43)
+#define WSAESOCKTNOSUPPORT      (WSABASEERR+44)
+#define WSAEOPNOTSUPP           (WSABASEERR+45)
+#define WSAEPFNOSUPPORT         (WSABASEERR+46)
+#define WSAEAFNOSUPPORT         (WSABASEERR+47)
+#define WSAEADDRINUSE           (WSABASEERR+48)
+#define WSAEADDRNOTAVAIL        (WSABASEERR+49)
+#define WSAENETDOWN             (WSABASEERR+50)
+#define WSAENETUNREACH          (WSABASEERR+51)
+#define WSAENETRESET            (WSABASEERR+52)
+#define WSAECONNABORTED         (WSABASEERR+53)
+#define WSAECONNRESET           (WSABASEERR+54)
+#define WSAENOBUFS              (WSABASEERR+55)
+#define WSAEISCONN              (WSABASEERR+56)
+#define WSAENOTCONN             (WSABASEERR+57)
+#define WSAESHUTDOWN            (WSABASEERR+58)
+#define WSAETOOMANYREFS         (WSABASEERR+59)
+#define WSAETIMEDOUT            (WSABASEERR+60)
+#define WSAECONNREFUSED         (WSABASEERR+61)
+#define WSAELOOP                (WSABASEERR+62)
+#define WSAENAMETOOLONG         (WSABASEERR+63)
+#define WSAEHOSTDOWN            (WSABASEERR+64)
+#define WSAEHOSTUNREACH         (WSABASEERR+65)
+#define WSAENOTEMPTY            (WSABASEERR+66)
+#define WSAEPROCLIM             (WSABASEERR+67)
+#define WSAEUSERS               (WSABASEERR+68)
+#define WSAEDQUOT               (WSABASEERR+69)
+#define WSAESTALE               (WSABASEERR+70)
+#define WSAEREMOTE              (WSABASEERR+71)
+
+#define WSAEDISCON              (WSABASEERR+101)
+
+/*
+ * Extended Windows Sockets error constant definitions
+ */
+#define WSASYSNOTREADY          (WSABASEERR+91)
+#define WSAVERNOTSUPPORTED      (WSABASEERR+92)
+#define WSANOTINITIALISED       (WSABASEERR+93)
+
+/*
+ * Error return codes from gethostbyname() and gethostbyaddr()
+ * (when using the resolver). Note that these errors are
+ * retrieved via WSAGetLastError() and must therefore follow
+ * the rules for avoiding clashes with error numbers from
+ * specific implementations or language run-time systems.
+ * For this reason the codes are based at WSABASEERR+1001.
+ * Note also that [WSA]NO_ADDRESS is defined only for
+ * compatibility purposes.
+ */
+
+
+/* Authoritative Answer: Host not found */
+#define WSAHOST_NOT_FOUND       (WSABASEERR+1001)
+
+/* Non-Authoritative: Host not found, or SERVERFAIL */
+#define WSATRY_AGAIN            (WSABASEERR+1002)
+
+/* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
+#define WSANO_RECOVERY          (WSABASEERR+1003)
+
+/* Valid name, no data record of requested type */
+#define WSANO_DATA              (WSABASEERR+1004)
+
+/*
+ * WinSock error codes are also defined in winerror.h
+ * Hence the IFDEF.
+ */
+#endif /* ifdef WSABASEERR */
+
+/*
+ * Compatibility macros.
+ */
+
+
+#define h_errno         WSAGetLastError()
+#define HOST_NOT_FOUND          WSAHOST_NOT_FOUND
+#define TRY_AGAIN               WSATRY_AGAIN
+#define NO_RECOVERY             WSANO_RECOVERY
+#define NO_DATA                 WSANO_DATA
+/* no address, look for MX record */
+#define WSANO_ADDRESS           WSANO_DATA
+#define NO_ADDRESS              WSANO_ADDRESS
+
+/*
+ * Windows Sockets errors redefined as regular Berkeley error constants.
+ * These are commented out in Windows NT to avoid conflicts with errno.h.
+ * Use the WSA constants instead.
+ */
+#if 0
+#define EWOULDBLOCK             WSAEWOULDBLOCK
+#define EINPROGRESS             WSAEINPROGRESS
+#define EALREADY                WSAEALREADY
+#define ENOTSOCK                WSAENOTSOCK
+#define EDESTADDRREQ            WSAEDESTADDRREQ
+#define EMSGSIZE                WSAEMSGSIZE
+#define EPROTOTYPE              WSAEPROTOTYPE
+#define ENOPROTOOPT             WSAENOPROTOOPT
+#define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
+#define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
+#define EOPNOTSUPP              WSAEOPNOTSUPP
+#define EPFNOSUPPORT            WSAEPFNOSUPPORT
+#define EAFNOSUPPORT            WSAEAFNOSUPPORT
+#define EADDRINUSE              WSAEADDRINUSE
+#define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
+#define ENETDOWN                WSAENETDOWN
+#define ENETUNREACH             WSAENETUNREACH
+#define ENETRESET               WSAENETRESET
+#define ECONNABORTED            WSAECONNABORTED
+#define ECONNRESET              WSAECONNRESET
+#define ENOBUFS                 WSAENOBUFS
+#define EISCONN                 WSAEISCONN
+#define ENOTCONN                WSAENOTCONN
+#define ESHUTDOWN               WSAESHUTDOWN
+#define ETOOMANYREFS            WSAETOOMANYREFS
+#define ETIMEDOUT               WSAETIMEDOUT
+#define ECONNREFUSED            WSAECONNREFUSED
+#define ELOOP                   WSAELOOP
+#define ENAMETOOLONG            WSAENAMETOOLONG
+#define EHOSTDOWN               WSAEHOSTDOWN
+#define EHOSTUNREACH            WSAEHOSTUNREACH
+#define ENOTEMPTY               WSAENOTEMPTY
+#define EPROCLIM                WSAEPROCLIM
+#define EUSERS                  WSAEUSERS
+#define EDQUOT                  WSAEDQUOT
+#define ESTALE                  WSAESTALE
+#define EREMOTE                 WSAEREMOTE
+#endif
+
+/* Socket function prototypes */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SOCKET PASCAL FAR accept (
+                          IN SOCKET s,
+                          OUT struct sockaddr FAR *addr,
+                          IN OUT int FAR *addrlen);
+
+int PASCAL FAR bind (
+                     IN SOCKET s,
+                     IN const struct sockaddr FAR *addr,
+                     IN int namelen);
+
+int PASCAL FAR closesocket ( IN SOCKET s);
+
+int PASCAL FAR connect (
+                        IN SOCKET s,
+                        IN const struct sockaddr FAR *name,
+                        IN int namelen);
+
+int PASCAL FAR ioctlsocket (
+                            IN SOCKET s,
+                            IN long cmd,
+                            IN OUT u_long FAR *argp);
+
+int PASCAL FAR getpeername (
+                            IN SOCKET s,
+                            OUT struct sockaddr FAR *name,
+                            IN OUT int FAR * namelen);
+
+int PASCAL FAR getsockname (
+                            IN SOCKET s,
+                            OUT struct sockaddr FAR *name,
+                            IN OUT int FAR * namelen);
+
+int PASCAL FAR getsockopt (
+                           IN SOCKET s,
+                           IN int level,
+                           IN int optname,
+                           OUT char FAR * optval,
+                           IN OUT int FAR *optlen);
+
+u_long PASCAL FAR htonl ( IN u_long hostlong);
+
+u_short PASCAL FAR htons (IN u_short hostshort);
+
+unsigned long PASCAL FAR inet_addr (IN const char FAR * cp);
+
+char FAR * PASCAL FAR inet_ntoa (IN struct in_addr in);
+
+int PASCAL FAR listen (
+                       IN SOCKET s,
+                       IN int backlog);
+
+u_long PASCAL FAR ntohl (IN u_long netlong);
+
+u_short PASCAL FAR ntohs (IN u_short netshort);
+
+int PASCAL FAR recv (
+                     IN SOCKET s,
+                     OUT char FAR * buf,
+                     IN int len,
+                     IN int flags);
+
+int PASCAL FAR recvfrom (
+                         IN SOCKET s,
+                         OUT char FAR * buf,
+                         IN int len,
+                         IN int flags,
+                         OUT struct sockaddr FAR *from,
+                         IN OUT int FAR * fromlen);
+
+int PASCAL FAR select (
+                        IN int nfds,
+                        IN OUT fd_set FAR *readfds,
+                        IN OUT fd_set FAR *writefds,
+                        IN OUT fd_set FAR *exceptfds,
+                        IN const struct timeval FAR *timeout);
+
+int PASCAL FAR send (
+                     IN SOCKET s,
+                     IN const char FAR * buf,
+                     IN int len,
+                     IN int flags);
+
+int PASCAL FAR sendto (
+                       IN SOCKET s,
+                       IN const char FAR * buf,
+                       IN int len,
+                       IN int flags,
+                       IN const struct sockaddr FAR *to,
+                       IN int tolen);
+
+int PASCAL FAR setsockopt (
+                           IN SOCKET s,
+                           IN int level,
+                           IN int optname,
+                           IN const char FAR * optval,
+                           IN int optlen);
+
+int PASCAL FAR shutdown (
+                         IN SOCKET s,
+                         IN int how);
+
+SOCKET PASCAL FAR socket (
+                          IN int af,
+                          IN int type,
+                          IN int protocol);
+
+/* Database function prototypes */
+
+struct hostent FAR * PASCAL FAR gethostbyaddr(
+                                              IN const char FAR * addr,
+                                              IN int len,
+                                              IN int type);
+
+struct hostent FAR * PASCAL FAR gethostbyname(IN const char FAR * name);
+
+int PASCAL FAR gethostname (
+                            OUT char FAR * name,
+                            IN int namelen);
+
+struct servent FAR * PASCAL FAR getservbyport(
+                                              IN int port,
+                                              IN const char FAR * proto);
+
+struct servent FAR * PASCAL FAR getservbyname(
+                                              IN const char FAR * name,
+                                              IN const char FAR * proto);
+
+struct protoent FAR * PASCAL FAR getprotobynumber(IN int proto);
+
+struct protoent FAR * PASCAL FAR getprotobyname(IN const char FAR * name);
+
+/* Microsoft Windows Extension function prototypes */
+
+int PASCAL FAR WSAStartup(
+                          IN WORD wVersionRequired,
+                          OUT LPWSADATA lpWSAData);
+
+int PASCAL FAR WSACleanup(void);
+
+void PASCAL FAR WSASetLastError(IN int iError);
+
+int PASCAL FAR WSAGetLastError(void);
+
+BOOL PASCAL FAR WSAIsBlocking(void);
+
+int PASCAL FAR WSAUnhookBlockingHook(void);
+
+FARPROC PASCAL FAR WSASetBlockingHook(IN FARPROC lpBlockFunc);
+
+int PASCAL FAR WSACancelBlockingCall(void);
+
+HANDLE PASCAL FAR WSAAsyncGetServByName(
+                                        IN HWND hWnd,
+                                        IN u_int wMsg,
+                                        IN const char FAR * name,
+                                        IN const char FAR * proto,
+                                        OUT char FAR * buf,
+                                        IN int buflen);
+
+HANDLE PASCAL FAR WSAAsyncGetServByPort(
+                                        IN HWND hWnd,
+                                        IN u_int wMsg,
+                                        IN int port,
+                                        IN const char FAR * proto,
+                                        OUT char FAR * buf,
+                                        IN int buflen);
+
+HANDLE PASCAL FAR WSAAsyncGetProtoByName(
+                                         IN HWND hWnd,
+                                         IN u_int wMsg,
+                                         IN const char FAR * name,
+                                         OUT char FAR * buf,
+                                         IN int buflen);
+
+HANDLE PASCAL FAR WSAAsyncGetProtoByNumber(
+                                           IN HWND hWnd,
+                                           IN u_int wMsg,
+                                           IN int number,
+                                           OUT char FAR * buf,
+                                           IN int buflen);
+
+HANDLE PASCAL FAR WSAAsyncGetHostByName(
+                                        IN HWND hWnd,
+                                        IN u_int wMsg,
+                                        IN const char FAR * name,
+                                        OUT char FAR * buf,
+                                        IN int buflen);
+
+HANDLE PASCAL FAR WSAAsyncGetHostByAddr(
+                                        IN HWND hWnd,
+                                        IN u_int wMsg,
+                                        IN const char FAR * addr,
+                                        IN int len,
+                                        IN int type,
+                                        OUT char FAR * buf,
+                                        IN int buflen);
+
+int PASCAL FAR WSACancelAsyncRequest(IN HANDLE hAsyncTaskHandle);
+
+int PASCAL FAR WSAAsyncSelect(
+                              IN SOCKET s,
+                              IN HWND hWnd,
+                              IN u_int wMsg,
+                              IN long lEvent);
+
+int PASCAL FAR WSARecvEx (
+                          IN SOCKET s,
+                          OUT char FAR * buf,
+                          IN int len,
+                          IN OUT int FAR *flags);
+
+typedef struct _TRANSMIT_FILE_BUFFERS {
+    PVOID Head;
+    DWORD HeadLength;
+    PVOID Tail;
+    DWORD TailLength;
+} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, *LPTRANSMIT_FILE_BUFFERS;
+
+#define TF_DISCONNECT       0x01
+#define TF_REUSE_SOCKET     0x02
+#define TF_WRITE_BEHIND     0x04
+
+BOOL
+PASCAL FAR
+TransmitFile (
+    IN SOCKET hSocket,
+    IN HANDLE hFile,
+    IN DWORD nNumberOfBytesToWrite,
+    IN DWORD nNumberOfBytesPerSend,
+    IN LPOVERLAPPED lpOverlapped,
+    IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
+    IN DWORD dwReserved
+    );
+
+BOOL
+PASCAL FAR
+AcceptEx (
+    IN SOCKET sListenSocket,
+    IN SOCKET sAcceptSocket,
+    IN PVOID lpOutputBuffer,
+    IN DWORD dwReceiveDataLength,
+    IN DWORD dwLocalAddressLength,
+    IN DWORD dwRemoteAddressLength,
+    OUT LPDWORD lpdwBytesReceived,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+VOID
+PASCAL FAR
+GetAcceptExSockaddrs (
+    IN PVOID lpOutputBuffer,
+    IN DWORD dwReceiveDataLength,
+    IN DWORD dwLocalAddressLength,
+    IN DWORD dwRemoteAddressLength,
+    OUT struct sockaddr **LocalSockaddr,
+    OUT LPINT LocalSockaddrLength,
+    OUT struct sockaddr **RemoteSockaddr,
+    OUT LPINT RemoteSockaddrLength
+    );
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Microsoft Windows Extended data types */
+typedef struct sockaddr SOCKADDR;
+typedef struct sockaddr *PSOCKADDR;
+typedef struct sockaddr FAR *LPSOCKADDR;
+
+typedef struct sockaddr_in SOCKADDR_IN;
+typedef struct sockaddr_in *PSOCKADDR_IN;
+typedef struct sockaddr_in FAR *LPSOCKADDR_IN;
+
+typedef struct linger LINGER;
+typedef struct linger *PLINGER;
+typedef struct linger FAR *LPLINGER;
+
+typedef struct in_addr IN_ADDR;
+typedef struct in_addr *PIN_ADDR;
+typedef struct in_addr FAR *LPIN_ADDR;
+
+typedef struct fd_set FD_SET;
+typedef struct fd_set *PFD_SET;
+typedef struct fd_set FAR *LPFD_SET;
+
+typedef struct hostent HOSTENT;
+typedef struct hostent *PHOSTENT;
+typedef struct hostent FAR *LPHOSTENT;
+
+typedef struct servent SERVENT;
+typedef struct servent *PSERVENT;
+typedef struct servent FAR *LPSERVENT;
+
+typedef struct protoent PROTOENT;
+typedef struct protoent *PPROTOENT;
+typedef struct protoent FAR *LPPROTOENT;
+
+typedef struct timeval TIMEVAL;
+typedef struct timeval *PTIMEVAL;
+typedef struct timeval FAR *LPTIMEVAL;
+
+/*
+ * Windows message parameter composition and decomposition
+ * macros.
+ *
+ * WSAMAKEASYNCREPLY is intended for use by the Windows Sockets implementation
+ * when constructing the response to a WSAAsyncGetXByY() routine.
+ */
+#define WSAMAKEASYNCREPLY(buflen,error)     MAKELONG(buflen,error)
+/*
+ * WSAMAKESELECTREPLY is intended for use by the Windows Sockets implementation
+ * when constructing the response to WSAAsyncSelect().
+ */
+#define WSAMAKESELECTREPLY(event,error)     MAKELONG(event,error)
+/*
+ * WSAGETASYNCBUFLEN is intended for use by the Windows Sockets application
+ * to extract the buffer length from the lParam in the response
+ * to a WSAGetXByY().
+ */
+#define WSAGETASYNCBUFLEN(lParam)           LOWORD(lParam)
+/*
+ * WSAGETASYNCERROR is intended for use by the Windows Sockets application
+ * to extract the error code from the lParam in the response
+ * to a WSAGetXByY().
+ */
+#define WSAGETASYNCERROR(lParam)            HIWORD(lParam)
+/*
+ * WSAGETSELECTEVENT is intended for use by the Windows Sockets application
+ * to extract the event code from the lParam in the response
+ * to a WSAAsyncSelect().
+ */
+#define WSAGETSELECTEVENT(lParam)           LOWORD(lParam)
+/*
+ * WSAGETSELECTERROR is intended for use by the Windows Sockets application
+ * to extract the error code from the lParam in the response
+ * to a WSAAsyncSelect().
+ */
+#define WSAGETSELECTERROR(lParam)           HIWORD(lParam)
+
+#ifdef IPV6STRICT
+#error WINSOCK2 required.
+#endif // IPV6STRICT
+
+#endif  /* _WINSOCKAPI_ */
diff --git a/base/Windows/Inc/WinSock2.h b/base/Windows/Inc/WinSock2.h
new file mode 100644
index 0000000..f50f8cd
--- /dev/null
+++ b/base/Windows/Inc/WinSock2.h
@@ -0,0 +1,3857 @@
+/* Winsock2.h -- definitions to be used with the WinSock 2 DLL and
+ *               WinSock 2 applications.
+ *
+ * This header file corresponds to version 2.2.x of the WinSock API
+ * specification.
+ *
+ * This file includes parts which are Copyright (c) 1982-1986 Regents
+ * of the University of California.  All rights reserved.  The
+ * Berkeley Software License Agreement specifies the terms and
+ * conditions for redistribution.
+ */
+
+#ifndef _WINSOCK2API_
+#define _WINSOCK2API_
+#define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
+
+/*
+ * Ensure structures are packed consistently.
+ * Not necessary for WIN32, it is already packed >=4 and there are
+ * no structures in this header that have alignment requirement 
+ * higher than 4.
+ * For WIN64 we do not have compatibility requirement because it is
+ * not possible to mix 32/16 bit code with 64 bit code in the same
+ * process.
+ */
+
+#if !defined(WIN32) && !defined(_WIN64)
+#include <pshpack4.h>
+#endif
+
+/*
+ * Default: include function prototypes, don't include function typedefs.
+ */
+
+#ifndef INCL_WINSOCK_API_PROTOTYPES
+#define INCL_WINSOCK_API_PROTOTYPES 1
+#endif
+
+#ifndef INCL_WINSOCK_API_TYPEDEFS
+#define INCL_WINSOCK_API_TYPEDEFS 0
+#endif
+
+/*
+ * Pull in WINDOWS.H if necessary
+ */
+#ifndef _INC_WINDOWS
+#include <windows.h>
+#endif /* _INC_WINDOWS */
+
+/*
+ * Define the current Winsock version. To build an earlier Winsock version
+ * application redefine this value prior to including Winsock2.h.
+ */
+
+#if !defined(MAKEWORD)
+#define MAKEWORD(low,high) \
+        ((WORD)(((BYTE)(low)) | ((WORD)((BYTE)(high))) << 8))
+#endif
+
+#ifndef WINSOCK_VERSION
+#define WINSOCK_VERSION MAKEWORD(2,2)
+#endif
+
+/*
+ * Establish DLL function linkage if supported by the current build
+ * environment and not previously defined.
+ */
+
+#ifndef WINSOCK_API_LINKAGE
+#ifdef DECLSPEC_IMPORT
+#define WINSOCK_API_LINKAGE DECLSPEC_IMPORT
+#else
+#define WINSOCK_API_LINKAGE
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Basic system type definitions, taken from the BSD file sys/types.h.
+ */
+typedef unsigned char   u_char;
+typedef unsigned short  u_short;
+typedef unsigned int    u_int;
+typedef unsigned long   u_long;
+typedef unsigned __int64 u_int64;
+
+
+/*
+ * The new type to be used in all
+ * instances which refer to sockets.
+ */
+typedef UINT_PTR        SOCKET;
+
+/*
+ * Select uses arrays of SOCKETs.  These macros manipulate such
+ * arrays.  FD_SETSIZE may be defined by the user before including
+ * this file, but the default here should be >= 64.
+ *
+ * CAVEAT IMPLEMENTOR and USER: THESE MACROS AND TYPES MUST BE
+ * INCLUDED IN WINSOCK2.H EXACTLY AS SHOWN HERE.
+ */
+#ifndef FD_SETSIZE
+#define FD_SETSIZE      64
+#endif /* FD_SETSIZE */
+
+typedef struct fd_set {
+        u_int fd_count;               /* how many are SET? */
+        SOCKET  fd_array[FD_SETSIZE];   /* an array of SOCKETs */
+} fd_set;
+
+extern int PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR *);
+
+#define FD_CLR(fd, set) do { \
+    u_int __i; \
+    for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \
+        if (((fd_set FAR *)(set))->fd_array[__i] == fd) { \
+            while (__i < ((fd_set FAR *)(set))->fd_count-1) { \
+                ((fd_set FAR *)(set))->fd_array[__i] = \
+                    ((fd_set FAR *)(set))->fd_array[__i+1]; \
+                __i++; \
+            } \
+            ((fd_set FAR *)(set))->fd_count--; \
+            break; \
+        } \
+    } \
+} while(0)
+
+#define FD_SET(fd, set) do { \
+    u_int __i; \
+    for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \
+        if (((fd_set FAR *)(set))->fd_array[__i] == (fd)) { \
+            break; \
+        } \
+    } \
+    if (__i == ((fd_set FAR *)(set))->fd_count) { \
+        if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) { \
+            ((fd_set FAR *)(set))->fd_array[__i] = (fd); \
+            ((fd_set FAR *)(set))->fd_count++; \
+        } \
+    } \
+} while(0)
+
+#define FD_ZERO(set) (((fd_set FAR *)(set))->fd_count=0)
+
+#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set FAR *)(set))
+
+/*
+ * Structure used in select() call, taken from the BSD file sys/time.h.
+ */
+struct timeval {
+        long    tv_sec;         /* seconds */
+        long    tv_usec;        /* and microseconds */
+};
+
+/*
+ * Operations on timevals.
+ *
+ * NB: timercmp does not work for >= or <=.
+ */
+#define timerisset(tvp)         ((tvp)->tv_sec || (tvp)->tv_usec)
+#define timercmp(tvp, uvp, cmp) \
+        ((tvp)->tv_sec cmp (uvp)->tv_sec || \
+         (tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec)
+#define timerclear(tvp)         (tvp)->tv_sec = (tvp)->tv_usec = 0
+
+/*
+ * Commands for ioctlsocket(),  taken from the BSD file fcntl.h.
+ *
+ *
+ * Ioctl's have the command encoded in the lower word,
+ * and the size of any in or out parameters in the upper
+ * word.  The high 2 bits of the upper word are used
+ * to encode the in/out status of the parameter; for now
+ * we restrict parameters to at most 128 bytes.
+ */
+#define IOCPARM_MASK    0x7f            /* parameters must be < 128 bytes */
+#define IOC_VOID        0x20000000      /* no parameters */
+#define IOC_OUT         0x40000000      /* copy out parameters */
+#define IOC_IN          0x80000000      /* copy in parameters */
+#define IOC_INOUT       (IOC_IN|IOC_OUT)
+                                        /* 0x20000000 distinguishes new &
+                                           old ioctl's */
+#define _IO(x,y)        (IOC_VOID|((x)<<8)|(y))
+
+#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
+
+#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
+
+#define FIONREAD    _IOR('f', 127, u_long) /* get # bytes to read */
+#define FIONBIO     _IOW('f', 126, u_long) /* set/clear non-blocking i/o */
+#define FIOASYNC    _IOW('f', 125, u_long) /* set/clear async i/o */
+
+/* Socket I/O Controls */
+#define SIOCSHIWAT  _IOW('s',  0, u_long)  /* set high watermark */
+#define SIOCGHIWAT  _IOR('s',  1, u_long)  /* get high watermark */
+#define SIOCSLOWAT  _IOW('s',  2, u_long)  /* set low watermark */
+#define SIOCGLOWAT  _IOR('s',  3, u_long)  /* get low watermark */
+#define SIOCATMARK  _IOR('s',  7, u_long)  /* at oob mark? */
+
+/*
+ * Structures returned by network data base library, taken from the
+ * BSD file netdb.h.  All addresses are supplied in host order, and
+ * returned in network order (suitable for use in system calls).
+ */
+
+struct  hostent {
+        char    FAR * h_name;           /* official name of host */
+        char    FAR * FAR * h_aliases;  /* alias list */
+        short   h_addrtype;             /* host address type */
+        short   h_length;               /* length of address */
+        char    FAR * FAR * h_addr_list; /* list of addresses */
+#define h_addr  h_addr_list[0]          /* address, for backward compat */
+};
+
+/*
+ * It is assumed here that a network number
+ * fits in 32 bits.
+ */
+struct  netent {
+        char    FAR * n_name;           /* official name of net */
+        char    FAR * FAR * n_aliases;  /* alias list */
+        short   n_addrtype;             /* net address type */
+        u_long  n_net;                  /* network # */
+};
+
+struct  servent {
+        char    FAR * s_name;           /* official service name */
+        char    FAR * FAR * s_aliases;  /* alias list */
+#ifdef _WIN64
+        char    FAR * s_proto;          /* protocol to use */
+        short   s_port;                 /* port # */
+#else
+        short   s_port;                 /* port # */
+        char    FAR * s_proto;          /* protocol to use */
+#endif
+};
+
+struct  protoent {
+        char    FAR * p_name;           /* official protocol name */
+        char    FAR * FAR * p_aliases;  /* alias list */
+        short   p_proto;                /* protocol # */
+};
+
+/*
+ * Constants and structures defined by the internet system,
+ * Per RFC 790, September 1981, taken from the BSD file netinet/in.h.
+ * IPv6 additions per RFC 2292.
+ */
+
+/*
+ * Protocols
+ */
+#define IPPROTO_IP              0               /* dummy for IP */
+#define IPPROTO_HOPOPTS         0               /* IPv6 hop-by-hop options */
+#define IPPROTO_ICMP            1               /* control message protocol */
+#define IPPROTO_IGMP            2               /* internet group management protocol */
+#define IPPROTO_GGP             3               /* gateway^2 (deprecated) */
+#define IPPROTO_IPV4            4               /* IPv4 */
+#define IPPROTO_TCP             6               /* tcp */
+#define IPPROTO_PUP             12              /* pup */
+#define IPPROTO_UDP             17              /* user datagram protocol */
+#define IPPROTO_IDP             22              /* xns idp */
+#define IPPROTO_IPV6            41              /* IPv6 */
+#define IPPROTO_ROUTING         43              /* IPv6 routing header */
+#define IPPROTO_FRAGMENT        44              /* IPv6 fragmentation header */
+#define IPPROTO_ESP             50              /* IPsec ESP header */
+#define IPPROTO_AH              51              /* IPsec AH */
+#define IPPROTO_ICMPV6          58              /* ICMPv6 */
+#define IPPROTO_NONE            59              /* IPv6 no next header */
+#define IPPROTO_DSTOPTS         60              /* IPv6 destination options */
+#define IPPROTO_ND              77              /* UNOFFICIAL net disk proto */
+#define IPPROTO_ICLFXBM         78
+
+#define IPPROTO_RAW             255             /* raw IP packet */
+#define IPPROTO_MAX             256
+
+/*
+ * Port/socket numbers: network standard functions
+ */
+#define IPPORT_ECHO             7
+#define IPPORT_DISCARD          9
+#define IPPORT_SYSTAT           11
+#define IPPORT_DAYTIME          13
+#define IPPORT_NETSTAT          15
+#define IPPORT_FTP              21
+#define IPPORT_TELNET           23
+#define IPPORT_SMTP             25
+#define IPPORT_TIMESERVER       37
+#define IPPORT_NAMESERVER       42
+#define IPPORT_WHOIS            43
+#define IPPORT_MTP              57
+
+/*
+ * Port/socket numbers: host specific functions
+ */
+#define IPPORT_TFTP             69
+#define IPPORT_RJE              77
+#define IPPORT_FINGER           79
+#define IPPORT_TTYLINK          87
+#define IPPORT_SUPDUP           95
+
+/*
+ * UNIX TCP sockets
+ */
+#define IPPORT_EXECSERVER       512
+#define IPPORT_LOGINSERVER      513
+#define IPPORT_CMDSERVER        514
+#define IPPORT_EFSSERVER        520
+
+/*
+ * UNIX UDP sockets
+ */
+#define IPPORT_BIFFUDP          512
+#define IPPORT_WHOSERVER        513
+#define IPPORT_ROUTESERVER      520
+                                        /* 520+1 also used */
+
+/*
+ * Ports < IPPORT_RESERVED are reserved for
+ * privileged processes (e.g. root).
+ */
+#define IPPORT_RESERVED         1024
+
+/*
+ * Link numbers
+ */
+#define IMPLINK_IP              155
+#define IMPLINK_LOWEXPER        156
+#define IMPLINK_HIGHEXPER       158
+
+#ifndef s_addr
+/*
+ * Internet address (old style... should be updated)
+ */
+struct in_addr {
+        union {
+                struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
+                struct { u_short s_w1,s_w2; } S_un_w;
+                u_long S_addr;
+        } S_un;
+#define s_addr  S_un.S_addr
+                                /* can be used for most tcp & ip code */
+#define s_host  S_un.S_un_b.s_b2
+                                /* host on imp */
+#define s_net   S_un.S_un_b.s_b1
+                                /* network */
+#define s_imp   S_un.S_un_w.s_w2
+                                /* imp */
+#define s_impno S_un.S_un_b.s_b4
+                                /* imp # */
+#define s_lh    S_un.S_un_b.s_b3
+                                /* logical host */
+};
+#endif
+
+/*
+ * Definitions of bits in internet address integers.
+ * On subnets, the decomposition of addresses to host and net parts
+ * is done according to subnet mask, not the masks here.
+ */
+#define IN_CLASSA(i)            (((long)(i) & 0x80000000) == 0)
+#define IN_CLASSA_NET           0xff000000
+#define IN_CLASSA_NSHIFT        24
+#define IN_CLASSA_HOST          0x00ffffff
+#define IN_CLASSA_MAX           128
+
+#define IN_CLASSB(i)            (((long)(i) & 0xc0000000) == 0x80000000)
+#define IN_CLASSB_NET           0xffff0000
+#define IN_CLASSB_NSHIFT        16
+#define IN_CLASSB_HOST          0x0000ffff
+#define IN_CLASSB_MAX           65536
+
+#define IN_CLASSC(i)            (((long)(i) & 0xe0000000) == 0xc0000000)
+#define IN_CLASSC_NET           0xffffff00
+#define IN_CLASSC_NSHIFT        8
+#define IN_CLASSC_HOST          0x000000ff
+
+#define IN_CLASSD(i)            (((long)(i) & 0xf0000000) == 0xe0000000)
+#define IN_CLASSD_NET           0xf0000000       /* These ones aren't really */
+#define IN_CLASSD_NSHIFT        28               /* net and host fields, but */
+#define IN_CLASSD_HOST          0x0fffffff       /* routing needn't know.    */
+#define IN_MULTICAST(i)         IN_CLASSD(i)
+
+#define INADDR_ANY              (u_long)0x00000000
+#define INADDR_LOOPBACK         0x7f000001
+#define INADDR_BROADCAST        (u_long)0xffffffff
+#define INADDR_NONE             0xffffffff
+
+#define ADDR_ANY                INADDR_ANY
+
+/*
+ * Socket address, internet style.
+ */
+struct sockaddr_in {
+        short   sin_family;
+        u_short sin_port;
+        struct  in_addr sin_addr;
+        char    sin_zero[8];
+};
+
+#define WSADESCRIPTION_LEN      256
+#define WSASYS_STATUS_LEN       128
+
+typedef struct WSAData {
+        WORD                    wVersion;
+        WORD                    wHighVersion;
+#ifdef _WIN64
+        unsigned short          iMaxSockets;
+        unsigned short          iMaxUdpDg;
+        char FAR *              lpVendorInfo;
+        char                    szDescription[WSADESCRIPTION_LEN+1];
+        char                    szSystemStatus[WSASYS_STATUS_LEN+1];
+#else
+        char                    szDescription[WSADESCRIPTION_LEN+1];
+        char                    szSystemStatus[WSASYS_STATUS_LEN+1];
+        unsigned short          iMaxSockets;
+        unsigned short          iMaxUdpDg;
+        char FAR *              lpVendorInfo;
+#endif
+} WSADATA, FAR * LPWSADATA;
+
+/*
+ * Definitions related to sockets: types, address families, options,
+ * taken from the BSD file sys/socket.h.
+ */
+
+/*
+ * This is used instead of -1, since the
+ * SOCKET type is unsigned.
+ */
+#define INVALID_SOCKET  (SOCKET)(~0)
+#define SOCKET_ERROR            (-1)
+
+/*
+ * The  following  may  be used in place of the address family, socket type, or
+ * protocol  in  a  call  to WSASocket to indicate that the corresponding value
+ * should  be taken from the supplied WSAPROTOCOL_INFO structure instead of the
+ * parameter itself.
+ */
+#define FROM_PROTOCOL_INFO (-1)
+
+/*
+ * Types
+ */
+#define SOCK_STREAM     1               /* stream socket */
+#define SOCK_DGRAM      2               /* datagram socket */
+#define SOCK_RAW        3               /* raw-protocol interface */
+#define SOCK_RDM        4               /* reliably-delivered message */
+#define SOCK_SEQPACKET  5               /* sequenced packet stream */
+
+/*
+ * Option flags per-socket.
+ */
+#define SO_DEBUG        0x0001          /* turn on debugging info recording */
+#define SO_ACCEPTCONN   0x0002          /* socket has had listen() */
+#define SO_REUSEADDR    0x0004          /* allow local address reuse */
+#define SO_KEEPALIVE    0x0008          /* keep connections alive */
+#define SO_DONTROUTE    0x0010          /* just use interface addresses */
+#define SO_BROADCAST    0x0020          /* permit sending of broadcast msgs */
+#define SO_USELOOPBACK  0x0040          /* bypass hardware when possible */
+#define SO_LINGER       0x0080          /* linger on close if data present */
+#define SO_OOBINLINE    0x0100          /* leave received OOB data in line */
+
+#define SO_DONTLINGER   (int)(~SO_LINGER)
+#define SO_EXCLUSIVEADDRUSE ((int)(~SO_REUSEADDR)) /* disallow local address reuse */
+
+/*
+ * Additional options.
+ */
+#define SO_SNDBUF       0x1001          /* send buffer size */
+#define SO_RCVBUF       0x1002          /* receive buffer size */
+#define SO_SNDLOWAT     0x1003          /* send low-water mark */
+#define SO_RCVLOWAT     0x1004          /* receive low-water mark */
+#define SO_SNDTIMEO     0x1005          /* send timeout */
+#define SO_RCVTIMEO     0x1006          /* receive timeout */
+#define SO_ERROR        0x1007          /* get error status and clear */
+#define SO_TYPE         0x1008          /* get socket type */
+
+/*
+ * WinSock 2 extension -- new options
+ */
+#define SO_GROUP_ID       0x2001      /* ID of a socket group */
+#define SO_GROUP_PRIORITY 0x2002      /* the relative priority within a group*/
+#define SO_MAX_MSG_SIZE   0x2003      /* maximum message size */
+#define SO_PROTOCOL_INFOA 0x2004      /* WSAPROTOCOL_INFOA structure */
+#define SO_PROTOCOL_INFOW 0x2005      /* WSAPROTOCOL_INFOW structure */
+#ifdef UNICODE
+#define SO_PROTOCOL_INFO  SO_PROTOCOL_INFOW
+#else
+#define SO_PROTOCOL_INFO  SO_PROTOCOL_INFOA
+#endif /* UNICODE */
+#define PVD_CONFIG        0x3001       /* configuration info for service provider */
+#define SO_CONDITIONAL_ACCEPT 0x3002   /* enable true conditional accept: */
+                                       /*  connection is not ack-ed to the */
+                                       /*  other side until conditional */
+                                       /*  function returns CF_ACCEPT */
+/*
+ * TCP options.
+ */
+#define TCP_NODELAY     0x0001
+
+/*
+ * Address families.
+ */
+#define AF_UNSPEC       0               /* unspecified */
+/*
+ * Although  AF_UNSPEC  is  defined for backwards compatibility, using
+ * AF_UNSPEC for the "af" parameter when creating a socket is STRONGLY
+ * DISCOURAGED.    The  interpretation  of  the  "protocol"  parameter
+ * depends  on the actual address family chosen.  As environments grow
+ * to  include  more  and  more  address families that use overlapping
+ * protocol  values  there  is  more  and  more  chance of choosing an
+ * undesired address family when AF_UNSPEC is used.
+ */
+#define AF_UNIX         1               /* local to host (pipes, portals) */
+#define AF_INET         2               /* internetwork: UDP, TCP, etc. */
+#define AF_IMPLINK      3               /* arpanet imp addresses */
+#define AF_PUP          4               /* pup protocols: e.g. BSP */
+#define AF_CHAOS        5               /* mit CHAOS protocols */
+#define AF_NS           6               /* XEROX NS protocols */
+#define AF_IPX          AF_NS           /* IPX protocols: IPX, SPX, etc. */
+#define AF_ISO          7               /* ISO protocols */
+#define AF_OSI          AF_ISO          /* OSI is ISO */
+#define AF_ECMA         8               /* european computer manufacturers */
+#define AF_DATAKIT      9               /* datakit protocols */
+#define AF_CCITT        10              /* CCITT protocols, X.25 etc */
+#define AF_SNA          11              /* IBM SNA */
+#define AF_DECnet       12              /* DECnet */
+#define AF_DLI          13              /* Direct data link interface */
+#define AF_LAT          14              /* LAT */
+#define AF_HYLINK       15              /* NSC Hyperchannel */
+#define AF_APPLETALK    16              /* AppleTalk */
+#define AF_NETBIOS      17              /* NetBios-style addresses */
+#define AF_VOICEVIEW    18              /* VoiceView */
+#define AF_FIREFOX      19              /* Protocols from Firefox */
+#define AF_UNKNOWN1     20              /* Somebody is using this! */
+#define AF_BAN          21              /* Banyan */
+#define AF_ATM          22              /* Native ATM Services */
+#define AF_INET6        23              /* Internetwork Version 6 */
+#define AF_CLUSTER      24              /* Microsoft Wolfpack */
+#define AF_12844        25              /* IEEE 1284.4 WG AF */
+#define AF_IRDA         26              /* IrDA */
+#define AF_NETDES       28              /* Network Designers OSI & gateway
+                                           enabled protocols */
+#define AF_TCNPROCESS   29
+#define AF_TCNMESSAGE   30
+#define AF_ICLFXBM      31
+
+#define AF_MAX          32
+
+/*
+ * Structure used by kernel to store most
+ * addresses.
+ */
+struct sockaddr {
+        u_short sa_family;              /* address family */
+        char    sa_data[14];            /* up to 14 bytes of direct address */
+};
+
+/*
+ * Portable socket structure (RFC 2553).
+ */
+
+/*
+ * Desired design of maximum size and alignment.
+ * These are implementation specific.
+ */
+#define _SS_MAXSIZE 128                  // Maximum size.
+#define _SS_ALIGNSIZE (sizeof(__int64))  // Desired alignment.
+
+/*
+ * Definitions used for sockaddr_storage structure paddings design.
+ */
+#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (short))
+#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (short) + _SS_PAD1SIZE \
+                                                    + _SS_ALIGNSIZE))
+
+struct sockaddr_storage {
+    short ss_family;               // Address family.
+    char __ss_pad1[_SS_PAD1SIZE];  // 6 byte pad, this is to make
+                                   // implementation specific pad up to
+                                   // alignment field that follows explicit
+                                   // in the data structure.
+    __int64 __ss_align;            // Field to force desired structure.
+    char __ss_pad2[_SS_PAD2SIZE];  // 112 byte pad to achieve desired size;
+                                   // _SS_MAXSIZE value minus size of
+                                   // ss_family, __ss_pad1, and
+                                   // __ss_align fields is 112.
+};
+
+/*
+ * Structure used by kernel to pass protocol
+ * information in raw sockets.
+ */
+struct sockproto {
+        u_short sp_family;              /* address family */
+        u_short sp_protocol;            /* protocol */
+};
+
+/*
+ * Protocol families, same as address families for now.
+ */
+#define PF_UNSPEC       AF_UNSPEC
+#define PF_UNIX         AF_UNIX
+#define PF_INET         AF_INET
+#define PF_IMPLINK      AF_IMPLINK
+#define PF_PUP          AF_PUP
+#define PF_CHAOS        AF_CHAOS
+#define PF_NS           AF_NS
+#define PF_IPX          AF_IPX
+#define PF_ISO          AF_ISO
+#define PF_OSI          AF_OSI
+#define PF_ECMA         AF_ECMA
+#define PF_DATAKIT      AF_DATAKIT
+#define PF_CCITT        AF_CCITT
+#define PF_SNA          AF_SNA
+#define PF_DECnet       AF_DECnet
+#define PF_DLI          AF_DLI
+#define PF_LAT          AF_LAT
+#define PF_HYLINK       AF_HYLINK
+#define PF_APPLETALK    AF_APPLETALK
+#define PF_VOICEVIEW    AF_VOICEVIEW
+#define PF_FIREFOX      AF_FIREFOX
+#define PF_UNKNOWN1     AF_UNKNOWN1
+#define PF_BAN          AF_BAN
+#define PF_ATM          AF_ATM
+#define PF_INET6        AF_INET6
+
+#define PF_MAX          AF_MAX
+
+/*
+ * Structure used for manipulating linger option.
+ */
+struct  linger {
+        u_short l_onoff;                /* option on/off */
+        u_short l_linger;               /* linger time */
+};
+
+/*
+ * Level number for (get/set)sockopt() to apply to socket itself.
+ */
+#define SOL_SOCKET      0xffff          /* options for socket level */
+
+/*
+ * Maximum queue length specifiable by listen.
+ */
+#define SOMAXCONN       0x7fffffff
+
+#define MSG_OOB         0x1             /* process out-of-band data */
+#define MSG_PEEK        0x2             /* peek at incoming message */
+#define MSG_DONTROUTE   0x4             /* send without using routing tables */
+
+#define MSG_PARTIAL     0x8000          /* partial send or recv for message xport */
+
+/*
+ * WinSock 2 extension -- new flags for WSASend(), WSASendTo(), WSARecv() and
+ *                          WSARecvFrom()
+ */
+#define MSG_INTERRUPT   0x10            /* send/recv in the interrupt context */
+
+#define MSG_MAXIOVLEN   16
+
+/*
+ * Define constant based on rfc883, used by gethostbyxxxx() calls.
+ */
+#define MAXGETHOSTSTRUCT        1024
+
+/*
+ * WinSock 2 extension -- bit values and indices for FD_XXX network events
+ */
+#define FD_READ_BIT      0
+#define FD_READ          (1 << FD_READ_BIT)
+
+#define FD_WRITE_BIT     1
+#define FD_WRITE         (1 << FD_WRITE_BIT)
+
+#define FD_OOB_BIT       2
+#define FD_OOB           (1 << FD_OOB_BIT)
+
+#define FD_ACCEPT_BIT    3
+#define FD_ACCEPT        (1 << FD_ACCEPT_BIT)
+
+#define FD_CONNECT_BIT   4
+#define FD_CONNECT       (1 << FD_CONNECT_BIT)
+
+#define FD_CLOSE_BIT     5
+#define FD_CLOSE         (1 << FD_CLOSE_BIT)
+
+#define FD_QOS_BIT       6
+#define FD_QOS           (1 << FD_QOS_BIT)
+
+#define FD_GROUP_QOS_BIT 7
+#define FD_GROUP_QOS     (1 << FD_GROUP_QOS_BIT)
+
+#define FD_ROUTING_INTERFACE_CHANGE_BIT 8
+#define FD_ROUTING_INTERFACE_CHANGE     (1 << FD_ROUTING_INTERFACE_CHANGE_BIT)
+
+#define FD_ADDRESS_LIST_CHANGE_BIT 9
+#define FD_ADDRESS_LIST_CHANGE     (1 << FD_ADDRESS_LIST_CHANGE_BIT)
+
+#define FD_MAX_EVENTS    10
+#define FD_ALL_EVENTS    ((1 << FD_MAX_EVENTS) - 1)
+
+
+/*
+ * WinSock error codes are also defined in winerror.h
+ * Hence the IFDEF.
+ */
+#ifndef WSABASEERR
+
+/*
+ * All Windows Sockets error constants are biased by WSABASEERR from
+ * the "normal"
+ */
+#define WSABASEERR              10000
+
+/*
+ * Windows Sockets definitions of regular Microsoft C error constants
+ */
+#define WSAEINTR                (WSABASEERR+4)
+#define WSAEBADF                (WSABASEERR+9)
+#define WSAEACCES               (WSABASEERR+13)
+#define WSAEFAULT               (WSABASEERR+14)
+#define WSAEINVAL               (WSABASEERR+22)
+#define WSAEMFILE               (WSABASEERR+24)
+
+/*
+ * Windows Sockets definitions of regular Berkeley error constants
+ */
+#define WSAEWOULDBLOCK          (WSABASEERR+35)
+#define WSAEINPROGRESS          (WSABASEERR+36)
+#define WSAEALREADY             (WSABASEERR+37)
+#define WSAENOTSOCK             (WSABASEERR+38)
+#define WSAEDESTADDRREQ         (WSABASEERR+39)
+#define WSAEMSGSIZE             (WSABASEERR+40)
+#define WSAEPROTOTYPE           (WSABASEERR+41)
+#define WSAENOPROTOOPT          (WSABASEERR+42)
+#define WSAEPROTONOSUPPORT      (WSABASEERR+43)
+#define WSAESOCKTNOSUPPORT      (WSABASEERR+44)
+#define WSAEOPNOTSUPP           (WSABASEERR+45)
+#define WSAEPFNOSUPPORT         (WSABASEERR+46)
+#define WSAEAFNOSUPPORT         (WSABASEERR+47)
+#define WSAEADDRINUSE           (WSABASEERR+48)
+#define WSAEADDRNOTAVAIL        (WSABASEERR+49)
+#define WSAENETDOWN             (WSABASEERR+50)
+#define WSAENETUNREACH          (WSABASEERR+51)
+#define WSAENETRESET            (WSABASEERR+52)
+#define WSAECONNABORTED         (WSABASEERR+53)
+#define WSAECONNRESET           (WSABASEERR+54)
+#define WSAENOBUFS              (WSABASEERR+55)
+#define WSAEISCONN              (WSABASEERR+56)
+#define WSAENOTCONN             (WSABASEERR+57)
+#define WSAESHUTDOWN            (WSABASEERR+58)
+#define WSAETOOMANYREFS         (WSABASEERR+59)
+#define WSAETIMEDOUT            (WSABASEERR+60)
+#define WSAECONNREFUSED         (WSABASEERR+61)
+#define WSAELOOP                (WSABASEERR+62)
+#define WSAENAMETOOLONG         (WSABASEERR+63)
+#define WSAEHOSTDOWN            (WSABASEERR+64)
+#define WSAEHOSTUNREACH         (WSABASEERR+65)
+#define WSAENOTEMPTY            (WSABASEERR+66)
+#define WSAEPROCLIM             (WSABASEERR+67)
+#define WSAEUSERS               (WSABASEERR+68)
+#define WSAEDQUOT               (WSABASEERR+69)
+#define WSAESTALE               (WSABASEERR+70)
+#define WSAEREMOTE              (WSABASEERR+71)
+
+/*
+ * Extended Windows Sockets error constant definitions
+ */
+#define WSASYSNOTREADY          (WSABASEERR+91)
+#define WSAVERNOTSUPPORTED      (WSABASEERR+92)
+#define WSANOTINITIALISED       (WSABASEERR+93)
+#define WSAEDISCON              (WSABASEERR+101)
+#define WSAENOMORE              (WSABASEERR+102)
+#define WSAECANCELLED           (WSABASEERR+103)
+#define WSAEINVALIDPROCTABLE    (WSABASEERR+104)
+#define WSAEINVALIDPROVIDER     (WSABASEERR+105)
+#define WSAEPROVIDERFAILEDINIT  (WSABASEERR+106)
+#define WSASYSCALLFAILURE       (WSABASEERR+107)
+#define WSASERVICE_NOT_FOUND    (WSABASEERR+108)
+#define WSATYPE_NOT_FOUND       (WSABASEERR+109)
+#define WSA_E_NO_MORE           (WSABASEERR+110)
+#define WSA_E_CANCELLED         (WSABASEERR+111)
+#define WSAEREFUSED             (WSABASEERR+112)
+
+/*
+ * Error return codes from gethostbyname() and gethostbyaddr()
+ * (when using the resolver). Note that these errors are
+ * retrieved via WSAGetLastError() and must therefore follow
+ * the rules for avoiding clashes with error numbers from
+ * specific implementations or language run-time systems.
+ * For this reason the codes are based at WSABASEERR+1001.
+ * Note also that [WSA]NO_ADDRESS is defined only for
+ * compatibility purposes.
+ */
+
+/* Authoritative Answer: Host not found */
+#define WSAHOST_NOT_FOUND       (WSABASEERR+1001)
+
+/* Non-Authoritative: Host not found, or SERVERFAIL */
+#define WSATRY_AGAIN            (WSABASEERR+1002)
+
+/* Non-recoverable errors, FORMERR, REFUSED, NOTIMP */
+#define WSANO_RECOVERY          (WSABASEERR+1003)
+
+/* Valid name, no data record of requested type */
+#define WSANO_DATA              (WSABASEERR+1004)
+
+/*
+ * Define QOS related error return codes
+ *
+ */
+#define  WSA_QOS_RECEIVERS               (WSABASEERR + 1005)
+         /* at least one Reserve has arrived */
+#define  WSA_QOS_SENDERS                 (WSABASEERR + 1006)
+         /* at least one Path has arrived */
+#define  WSA_QOS_NO_SENDERS              (WSABASEERR + 1007)
+         /* there are no senders */
+#define  WSA_QOS_NO_RECEIVERS            (WSABASEERR + 1008)
+         /* there are no receivers */
+#define  WSA_QOS_REQUEST_CONFIRMED       (WSABASEERR + 1009)
+         /* Reserve has been confirmed */
+#define  WSA_QOS_ADMISSION_FAILURE       (WSABASEERR + 1010)
+         /* error due to lack of resources */
+#define  WSA_QOS_POLICY_FAILURE          (WSABASEERR + 1011)
+         /* rejected for administrative reasons - bad credentials */
+#define  WSA_QOS_BAD_STYLE               (WSABASEERR + 1012)
+         /* unknown or conflicting style */
+#define  WSA_QOS_BAD_OBJECT              (WSABASEERR + 1013)
+         /* problem with some part of the filterspec or providerspecific
+          * buffer in general */
+#define  WSA_QOS_TRAFFIC_CTRL_ERROR      (WSABASEERR + 1014)
+         /* problem with some part of the flowspec */
+#define  WSA_QOS_GENERIC_ERROR           (WSABASEERR + 1015)
+         /* general error */
+#define  WSA_QOS_ESERVICETYPE            (WSABASEERR + 1016)
+         /* invalid service type in flowspec */
+#define  WSA_QOS_EFLOWSPEC               (WSABASEERR + 1017)
+         /* invalid flowspec */
+#define  WSA_QOS_EPROVSPECBUF            (WSABASEERR + 1018)
+         /* invalid provider specific buffer */
+#define  WSA_QOS_EFILTERSTYLE            (WSABASEERR + 1019)
+         /* invalid filter style */
+#define  WSA_QOS_EFILTERTYPE             (WSABASEERR + 1020)
+         /* invalid filter type */
+#define  WSA_QOS_EFILTERCOUNT            (WSABASEERR + 1021)
+         /* incorrect number of filters */
+#define  WSA_QOS_EOBJLENGTH              (WSABASEERR + 1022)
+         /* invalid object length */
+#define  WSA_QOS_EFLOWCOUNT              (WSABASEERR + 1023)
+         /* incorrect number of flows */
+#define  WSA_QOS_EUNKOWNPSOBJ            (WSABASEERR + 1024)
+         /* unknown object in provider specific buffer */
+#define  WSA_QOS_EPOLICYOBJ              (WSABASEERR + 1025)
+         /* invalid policy object in provider specific buffer */
+#define  WSA_QOS_EFLOWDESC               (WSABASEERR + 1026)
+         /* invalid flow descriptor in the list */
+#define  WSA_QOS_EPSFLOWSPEC             (WSABASEERR + 1027)
+         /* inconsistent flow spec in provider specific buffer */
+#define  WSA_QOS_EPSFILTERSPEC           (WSABASEERR + 1028)
+         /* invalid filter spec in provider specific buffer */
+#define  WSA_QOS_ESDMODEOBJ              (WSABASEERR + 1029)
+         /* invalid shape discard mode object in provider specific buffer */
+#define  WSA_QOS_ESHAPERATEOBJ           (WSABASEERR + 1030)
+         /* invalid shaping rate object in provider specific buffer */
+#define  WSA_QOS_RESERVED_PETYPE         (WSABASEERR + 1031)
+         /* reserved policy element in provider specific buffer */
+
+
+
+/*
+ * WinSock error codes are also defined in winerror.h
+ * Hence the IFDEF.
+ */
+#endif /* ifdef WSABASEERR */
+
+/*
+ * Compatibility macros.
+ */
+
+#define h_errno         WSAGetLastError()
+#define HOST_NOT_FOUND          WSAHOST_NOT_FOUND
+#define TRY_AGAIN               WSATRY_AGAIN
+#define NO_RECOVERY             WSANO_RECOVERY
+#define NO_DATA                 WSANO_DATA
+/* no address, look for MX record */
+#define WSANO_ADDRESS           WSANO_DATA
+#define NO_ADDRESS              WSANO_ADDRESS
+
+
+
+/*
+ * Windows Sockets errors redefined as regular Berkeley error constants.
+ * These are commented out in Windows NT to avoid conflicts with errno.h.
+ * Use the WSA constants instead.
+ */
+#if 0
+#define EWOULDBLOCK             WSAEWOULDBLOCK
+#define EINPROGRESS             WSAEINPROGRESS
+#define EALREADY                WSAEALREADY
+#define ENOTSOCK                WSAENOTSOCK
+#define EDESTADDRREQ            WSAEDESTADDRREQ
+#define EMSGSIZE                WSAEMSGSIZE
+#define EPROTOTYPE              WSAEPROTOTYPE
+#define ENOPROTOOPT             WSAENOPROTOOPT
+#define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
+#define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
+#define EOPNOTSUPP              WSAEOPNOTSUPP
+#define EPFNOSUPPORT            WSAEPFNOSUPPORT
+#define EAFNOSUPPORT            WSAEAFNOSUPPORT
+#define EADDRINUSE              WSAEADDRINUSE
+#define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
+#define ENETDOWN                WSAENETDOWN
+#define ENETUNREACH             WSAENETUNREACH
+#define ENETRESET               WSAENETRESET
+#define ECONNABORTED            WSAECONNABORTED
+#define ECONNRESET              WSAECONNRESET
+#define ENOBUFS                 WSAENOBUFS
+#define EISCONN                 WSAEISCONN
+#define ENOTCONN                WSAENOTCONN
+#define ESHUTDOWN               WSAESHUTDOWN
+#define ETOOMANYREFS            WSAETOOMANYREFS
+#define ETIMEDOUT               WSAETIMEDOUT
+#define ECONNREFUSED            WSAECONNREFUSED
+#define ELOOP                   WSAELOOP
+#define ENAMETOOLONG            WSAENAMETOOLONG
+#define EHOSTDOWN               WSAEHOSTDOWN
+#define EHOSTUNREACH            WSAEHOSTUNREACH
+#define ENOTEMPTY               WSAENOTEMPTY
+#define EPROCLIM                WSAEPROCLIM
+#define EUSERS                  WSAEUSERS
+#define EDQUOT                  WSAEDQUOT
+#define ESTALE                  WSAESTALE
+#define EREMOTE                 WSAEREMOTE
+#endif
+
+/*
+ * WinSock 2 extension -- new error codes and type definition
+ */
+
+#ifdef WIN32_LEAN_AND_MEAN
+
+#define WSAAPI                  FAR PASCAL
+#define WSAEVENT                HANDLE
+#define LPWSAEVENT              LPHANDLE
+#define WSAOVERLAPPED           OVERLAPPED
+typedef struct _OVERLAPPED *    LPWSAOVERLAPPED;
+
+#define WSA_IO_PENDING          (ERROR_IO_PENDING)
+#define WSA_IO_INCOMPLETE       (ERROR_IO_INCOMPLETE)
+#define WSA_INVALID_HANDLE      (ERROR_INVALID_HANDLE)
+#define WSA_INVALID_PARAMETER   (ERROR_INVALID_PARAMETER)
+#define WSA_NOT_ENOUGH_MEMORY   (ERROR_NOT_ENOUGH_MEMORY)
+#define WSA_OPERATION_ABORTED   (ERROR_OPERATION_ABORTED)
+
+#define WSA_INVALID_EVENT       ((WSAEVENT)NULL)
+#define WSA_MAXIMUM_WAIT_EVENTS (MAXIMUM_WAIT_OBJECTS)
+#define WSA_WAIT_FAILED         (WAIT_FAILED)
+#define WSA_WAIT_EVENT_0        (WAIT_OBJECT_0)
+#define WSA_WAIT_IO_COMPLETION  (WAIT_IO_COMPLETION)
+#define WSA_WAIT_TIMEOUT        (WAIT_TIMEOUT)
+#define WSA_INFINITE            (INFINITE)
+
+#else /* WIN16 */
+
+#define WSAAPI                  FAR PASCAL
+typedef DWORD                   WSAEVENT, FAR * LPWSAEVENT;
+
+typedef struct _WSAOVERLAPPED {
+    DWORD    Internal;
+    DWORD    InternalHigh;
+    DWORD    Offset;
+    DWORD    OffsetHigh;
+    WSAEVENT hEvent;
+} WSAOVERLAPPED, FAR * LPWSAOVERLAPPED;
+
+#define WSA_IO_PENDING          (WSAEWOULDBLOCK)
+#define WSA_IO_INCOMPLETE       (WSAEWOULDBLOCK)
+#define WSA_INVALID_HANDLE      (WSAENOTSOCK)
+#define WSA_INVALID_PARAMETER   (WSAEINVAL)
+#define WSA_NOT_ENOUGH_MEMORY   (WSAENOBUFS)
+#define WSA_OPERATION_ABORTED   (WSAEINTR)
+
+#define WSA_INVALID_EVENT       ((WSAEVENT)NULL)
+#define WSA_MAXIMUM_WAIT_EVENTS (MAXIMUM_WAIT_OBJECTS)
+#define WSA_WAIT_FAILED         ((DWORD)-1L)
+#define WSA_WAIT_EVENT_0        ((DWORD)0)
+#define WSA_WAIT_TIMEOUT        ((DWORD)0x102L)
+#define WSA_INFINITE            ((DWORD)-1L)
+
+#endif  /* WIN32 */
+
+/*
+ * WinSock 2 extension -- WSABUF and QOS struct, include qos.h
+ * to pull in FLOWSPEC and related definitions
+ */
+
+typedef struct _WSABUF {
+    u_long      len;     /* the length of the buffer */
+    char FAR *  buf;     /* the pointer to the buffer */
+} WSABUF, FAR * LPWSABUF;
+
+#include <qos.h>
+
+typedef struct _QualityOfService
+{
+    FLOWSPEC      SendingFlowspec;       /* the flow spec for data sending */
+    FLOWSPEC      ReceivingFlowspec;     /* the flow spec for data receiving */
+    WSABUF        ProviderSpecific;      /* additional provider specific stuff */
+} QOS, FAR * LPQOS;
+
+/*
+ * WinSock 2 extension -- manifest constants for return values of the condition function
+ */
+#define CF_ACCEPT       0x0000
+#define CF_REJECT       0x0001
+#define CF_DEFER        0x0002
+
+/*
+ * WinSock 2 extension -- manifest constants for shutdown()
+ */
+#define SD_RECEIVE      0x00
+#define SD_SEND         0x01
+#define SD_BOTH         0x02
+
+/*
+ * WinSock 2 extension -- data type and manifest constants for socket groups
+ */
+typedef unsigned int             GROUP;
+
+#define SG_UNCONSTRAINED_GROUP   0x01
+#define SG_CONSTRAINED_GROUP     0x02
+
+/*
+ * WinSock 2 extension -- data type for WSAEnumNetworkEvents()
+ */
+typedef struct _WSANETWORKEVENTS {
+       long lNetworkEvents;
+       int iErrorCode[FD_MAX_EVENTS];
+} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
+
+/*
+ * WinSock 2 extension -- WSAPROTOCOL_INFO structure and associated
+ * manifest constants
+ */
+
+#ifndef GUID_DEFINED
+#include <guiddef.h>
+#endif /* GUID_DEFINED */
+
+#define MAX_PROTOCOL_CHAIN 7
+
+#define BASE_PROTOCOL      1
+#define LAYERED_PROTOCOL   0
+
+typedef struct _WSAPROTOCOLCHAIN {
+    int ChainLen;                                 /* the length of the chain,     */
+                                                  /* length = 0 means layered protocol, */
+                                                  /* length = 1 means base protocol, */
+                                                  /* length > 1 means protocol chain */
+    DWORD ChainEntries[MAX_PROTOCOL_CHAIN];       /* a list of dwCatalogEntryIds */
+} WSAPROTOCOLCHAIN, FAR * LPWSAPROTOCOLCHAIN;
+
+#define WSAPROTOCOL_LEN  255
+
+typedef struct _WSAPROTOCOL_INFOA {
+    DWORD dwServiceFlags1;
+    DWORD dwServiceFlags2;
+    DWORD dwServiceFlags3;
+    DWORD dwServiceFlags4;
+    DWORD dwProviderFlags;
+    GUID ProviderId;
+    DWORD dwCatalogEntryId;
+    WSAPROTOCOLCHAIN ProtocolChain;
+    int iVersion;
+    int iAddressFamily;
+    int iMaxSockAddr;
+    int iMinSockAddr;
+    int iSocketType;
+    int iProtocol;
+    int iProtocolMaxOffset;
+    int iNetworkByteOrder;
+    int iSecurityScheme;
+    DWORD dwMessageSize;
+    DWORD dwProviderReserved;
+    CHAR   szProtocol[WSAPROTOCOL_LEN+1];
+} WSAPROTOCOL_INFOA, FAR * LPWSAPROTOCOL_INFOA;
+typedef struct _WSAPROTOCOL_INFOW {
+    DWORD dwServiceFlags1;
+    DWORD dwServiceFlags2;
+    DWORD dwServiceFlags3;
+    DWORD dwServiceFlags4;
+    DWORD dwProviderFlags;
+    GUID ProviderId;
+    DWORD dwCatalogEntryId;
+    WSAPROTOCOLCHAIN ProtocolChain;
+    int iVersion;
+    int iAddressFamily;
+    int iMaxSockAddr;
+    int iMinSockAddr;
+    int iSocketType;
+    int iProtocol;
+    int iProtocolMaxOffset;
+    int iNetworkByteOrder;
+    int iSecurityScheme;
+    DWORD dwMessageSize;
+    DWORD dwProviderReserved;
+    WCHAR  szProtocol[WSAPROTOCOL_LEN+1];
+} WSAPROTOCOL_INFOW, FAR * LPWSAPROTOCOL_INFOW;
+#ifdef UNICODE
+typedef WSAPROTOCOL_INFOW WSAPROTOCOL_INFO;
+typedef LPWSAPROTOCOL_INFOW LPWSAPROTOCOL_INFO;
+#else
+typedef WSAPROTOCOL_INFOA WSAPROTOCOL_INFO;
+typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO;
+#endif /* UNICODE */
+
+/* Flag bit definitions for dwProviderFlags */
+#define PFL_MULTIPLE_PROTO_ENTRIES          0x00000001
+#define PFL_RECOMMENDED_PROTO_ENTRY         0x00000002
+#define PFL_HIDDEN                          0x00000004
+#define PFL_MATCHES_PROTOCOL_ZERO           0x00000008
+
+/* Flag bit definitions for dwServiceFlags1 */
+#define XP1_CONNECTIONLESS                  0x00000001
+#define XP1_GUARANTEED_DELIVERY             0x00000002
+#define XP1_GUARANTEED_ORDER                0x00000004
+#define XP1_MESSAGE_ORIENTED                0x00000008
+#define XP1_PSEUDO_STREAM                   0x00000010
+#define XP1_GRACEFUL_CLOSE                  0x00000020
+#define XP1_EXPEDITED_DATA                  0x00000040
+#define XP1_CONNECT_DATA                    0x00000080
+#define XP1_DISCONNECT_DATA                 0x00000100
+#define XP1_SUPPORT_BROADCAST               0x00000200
+#define XP1_SUPPORT_MULTIPOINT              0x00000400
+#define XP1_MULTIPOINT_CONTROL_PLANE        0x00000800
+#define XP1_MULTIPOINT_DATA_PLANE           0x00001000
+#define XP1_QOS_SUPPORTED                   0x00002000
+#define XP1_INTERRUPT                       0x00004000
+#define XP1_UNI_SEND                        0x00008000
+#define XP1_UNI_RECV                        0x00010000
+#define XP1_IFS_HANDLES                     0x00020000
+#define XP1_PARTIAL_MESSAGE                 0x00040000
+
+#define BIGENDIAN                           0x0000
+#define LITTLEENDIAN                        0x0001
+
+#define SECURITY_PROTOCOL_NONE              0x0000
+
+/*
+ * WinSock 2 extension -- manifest constants for WSAJoinLeaf()
+ */
+#define JL_SENDER_ONLY    0x01
+#define JL_RECEIVER_ONLY  0x02
+#define JL_BOTH           0x04
+
+/*
+ * WinSock 2 extension -- manifest constants for WSASocket()
+ */
+#define WSA_FLAG_OVERLAPPED           0x01
+#define WSA_FLAG_MULTIPOINT_C_ROOT    0x02
+#define WSA_FLAG_MULTIPOINT_C_LEAF    0x04
+#define WSA_FLAG_MULTIPOINT_D_ROOT    0x08
+#define WSA_FLAG_MULTIPOINT_D_LEAF    0x10
+
+/*
+ * WinSock 2 extension -- manifest constants for WSAIoctl()
+ */
+#define IOC_UNIX                      0x00000000
+#define IOC_WS2                       0x08000000
+#define IOC_PROTOCOL                  0x10000000
+#define IOC_VENDOR                    0x18000000
+
+#define _WSAIO(x,y)                   (IOC_VOID|(x)|(y))
+#define _WSAIOR(x,y)                  (IOC_OUT|(x)|(y))
+#define _WSAIOW(x,y)                  (IOC_IN|(x)|(y))
+#define _WSAIORW(x,y)                 (IOC_INOUT|(x)|(y))
+
+#define SIO_ASSOCIATE_HANDLE          _WSAIOW(IOC_WS2,1)
+#define SIO_ENABLE_CIRCULAR_QUEUEING  _WSAIO(IOC_WS2,2)
+#define SIO_FIND_ROUTE                _WSAIOR(IOC_WS2,3)
+#define SIO_FLUSH                     _WSAIO(IOC_WS2,4)
+#define SIO_GET_BROADCAST_ADDRESS     _WSAIOR(IOC_WS2,5)
+#define SIO_GET_EXTENSION_FUNCTION_POINTER  _WSAIORW(IOC_WS2,6)
+#define SIO_GET_QOS                   _WSAIORW(IOC_WS2,7)
+#define SIO_GET_GROUP_QOS             _WSAIORW(IOC_WS2,8)
+#define SIO_MULTIPOINT_LOOPBACK       _WSAIOW(IOC_WS2,9)
+#define SIO_MULTICAST_SCOPE           _WSAIOW(IOC_WS2,10)
+#define SIO_SET_QOS                   _WSAIOW(IOC_WS2,11)
+#define SIO_SET_GROUP_QOS             _WSAIOW(IOC_WS2,12)
+#define SIO_TRANSLATE_HANDLE          _WSAIORW(IOC_WS2,13)
+#define SIO_ROUTING_INTERFACE_QUERY   _WSAIORW(IOC_WS2,20)
+#define SIO_ROUTING_INTERFACE_CHANGE  _WSAIOW(IOC_WS2,21)
+#define SIO_ADDRESS_LIST_QUERY        _WSAIOR(IOC_WS2,22)
+#define SIO_ADDRESS_LIST_CHANGE       _WSAIO(IOC_WS2,23)
+#define SIO_QUERY_TARGET_PNP_HANDLE   _WSAIOR(IOC_WS2,24)
+#define SIO_ADDRESS_LIST_SORT         _WSAIORW(IOC_WS2,25)
+
+/*
+ * WinSock 2 extensions -- data types for the condition function in
+ * WSAAccept() and overlapped I/O completion routine.
+ */
+
+typedef
+int
+(CALLBACK * LPCONDITIONPROC)(
+    IN LPWSABUF lpCallerId,
+    IN LPWSABUF lpCallerData,
+    IN OUT LPQOS lpSQOS,
+    IN OUT LPQOS lpGQOS,
+    IN LPWSABUF lpCalleeId,
+    IN LPWSABUF lpCalleeData,
+    OUT GROUP FAR * g,
+    IN DWORD_PTR dwCallbackData
+    );
+
+typedef
+void
+(CALLBACK * LPWSAOVERLAPPED_COMPLETION_ROUTINE)(
+    IN DWORD dwError,
+    IN DWORD cbTransferred,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN DWORD dwFlags
+    );
+
+/*
+ * WinSock 2 extension -- manifest constants and associated structures
+ * for WSANSPIoctl()
+ */
+#define SIO_NSP_NOTIFY_CHANGE         _WSAIOW(IOC_WS2,25)
+
+typedef enum _WSACOMPLETIONTYPE {
+    NSP_NOTIFY_IMMEDIATELY = 0,
+    NSP_NOTIFY_HWND,
+    NSP_NOTIFY_EVENT,
+    NSP_NOTIFY_PORT,
+    NSP_NOTIFY_APC,
+} WSACOMPLETIONTYPE, *PWSACOMPLETIONTYPE, FAR * LPWSACOMPLETIONTYPE;
+
+typedef struct _WSACOMPLETION {
+    WSACOMPLETIONTYPE Type;
+    union {
+        struct {
+            HWND hWnd;
+            UINT uMsg;
+            WPARAM context;
+        } WindowMessage;
+        struct {
+            LPWSAOVERLAPPED lpOverlapped;
+        } Event;
+        struct {
+            LPWSAOVERLAPPED lpOverlapped;
+            LPWSAOVERLAPPED_COMPLETION_ROUTINE lpfnCompletionProc;
+        } Apc;
+        struct {
+            LPWSAOVERLAPPED lpOverlapped;
+            HANDLE hPort;
+            ULONG_PTR Key;
+        } Port;
+    } Parameters;
+} WSACOMPLETION, *PWSACOMPLETION, FAR *LPWSACOMPLETION;
+
+/*
+ * WinSock 2 extension -- manifest constants for SIO_TRANSLATE_HANDLE ioctl
+ */
+#define TH_NETDEV        0x00000001
+#define TH_TAPI          0x00000002
+
+
+/*
+ * Microsoft Windows Extended data types required for the functions to
+ * convert   back  and  forth  between  binary  and  string  forms  of
+ * addresses.
+ */
+typedef struct sockaddr SOCKADDR;
+typedef struct sockaddr *PSOCKADDR;
+typedef struct sockaddr FAR *LPSOCKADDR;
+
+typedef struct sockaddr_storage SOCKADDR_STORAGE;
+typedef struct sockaddr_storage *PSOCKADDR_STORAGE;
+typedef struct sockaddr_storage FAR *LPSOCKADDR_STORAGE;
+
+/*
+ * Manifest constants and type definitions related to name resolution and
+ * registration (RNR) API
+ */
+
+#ifndef _tagBLOB_DEFINED
+#define _tagBLOB_DEFINED
+#define _BLOB_DEFINED
+#define _LPBLOB_DEFINED
+typedef struct _BLOB {
+    ULONG cbSize ;
+#ifdef MIDL_PASS
+    [size_is(cbSize)] BYTE *pBlobData;
+#else  /* MIDL_PASS */
+    BYTE *pBlobData ;
+#endif /* MIDL_PASS */
+} BLOB, *LPBLOB ;
+#endif
+
+/*
+ * Service Install Flags
+ */
+
+#define SERVICE_MULTIPLE       (0x00000001)
+
+/*
+ *& Name Spaces
+ */
+
+#define NS_ALL                      (0)
+
+#define NS_SAP                      (1)
+#define NS_NDS                      (2)
+#define NS_PEER_BROWSE              (3)
+#define NS_SLP                      (5)
+#define NS_DHCP                     (6)
+
+#define NS_TCPIP_LOCAL              (10)
+#define NS_TCPIP_HOSTS              (11)
+#define NS_DNS                      (12)
+#define NS_NETBT                    (13)
+#define NS_WINS                     (14)
+#define NS_NLA                      (15)    /* Network Location Awareness */
+
+#define NS_NBP                      (20)
+
+#define NS_MS                       (30)
+#define NS_STDA                     (31)
+#define NS_NTDS                     (32)
+
+#define NS_X500                     (40)
+#define NS_NIS                      (41)
+#define NS_NISPLUS                  (42)
+
+#define NS_WRQ                      (50)
+
+#define NS_NETDES                   (60)    /* Network Designers Limited */
+
+/*
+ * Resolution flags for WSAGetAddressByName().
+ * Note these are also used by the 1.1 API GetAddressByName, so
+ * leave them around.
+ */
+#define RES_UNUSED_1                (0x00000001)
+#define RES_FLUSH_CACHE             (0x00000002)
+#ifndef RES_SERVICE
+#define RES_SERVICE                 (0x00000004)
+#endif /* RES_SERVICE */
+
+/*
+ * Well known value names for Service Types
+ */
+
+#define SERVICE_TYPE_VALUE_IPXPORTA      "IpxSocket"
+#define SERVICE_TYPE_VALUE_IPXPORTW     L"IpxSocket"
+#define SERVICE_TYPE_VALUE_SAPIDA        "SapId"
+#define SERVICE_TYPE_VALUE_SAPIDW       L"SapId"
+
+#define SERVICE_TYPE_VALUE_TCPPORTA      "TcpPort"
+#define SERVICE_TYPE_VALUE_TCPPORTW     L"TcpPort"
+
+#define SERVICE_TYPE_VALUE_UDPPORTA      "UdpPort"
+#define SERVICE_TYPE_VALUE_UDPPORTW     L"UdpPort"
+
+#define SERVICE_TYPE_VALUE_OBJECTIDA     "ObjectId"
+#define SERVICE_TYPE_VALUE_OBJECTIDW    L"ObjectId"
+
+#ifdef UNICODE
+
+#define SERVICE_TYPE_VALUE_SAPID        SERVICE_TYPE_VALUE_SAPIDW
+#define SERVICE_TYPE_VALUE_TCPPORT      SERVICE_TYPE_VALUE_TCPPORTW
+#define SERVICE_TYPE_VALUE_UDPPORT      SERVICE_TYPE_VALUE_UDPPORTW
+#define SERVICE_TYPE_VALUE_OBJECTID     SERVICE_TYPE_VALUE_OBJECTIDW
+
+#else /* not UNICODE */
+
+#define SERVICE_TYPE_VALUE_SAPID        SERVICE_TYPE_VALUE_SAPIDA
+#define SERVICE_TYPE_VALUE_TCPPORT      SERVICE_TYPE_VALUE_TCPPORTA
+#define SERVICE_TYPE_VALUE_UDPPORT      SERVICE_TYPE_VALUE_UDPPORTA
+#define SERVICE_TYPE_VALUE_OBJECTID     SERVICE_TYPE_VALUE_OBJECTIDA
+
+#endif
+
+#ifndef __CSADDR_DEFINED__
+#define __CSADDR_DEFINED__
+
+
+/*
+ * SockAddr Information
+ */
+typedef struct _SOCKET_ADDRESS {
+    LPSOCKADDR lpSockaddr ;
+    INT iSockaddrLength ;
+} SOCKET_ADDRESS, *PSOCKET_ADDRESS, FAR * LPSOCKET_ADDRESS ;
+
+/*
+ * CSAddr Information
+ */
+typedef struct _CSADDR_INFO {
+    SOCKET_ADDRESS LocalAddr ;
+    SOCKET_ADDRESS RemoteAddr ;
+    INT iSocketType ;
+    INT iProtocol ;
+} CSADDR_INFO, *PCSADDR_INFO, FAR * LPCSADDR_INFO ;
+#endif /* __CSADDR_DEFINED__ */
+
+/*
+ * Address list returned via SIO_ADDRESS_LIST_QUERY
+ */
+typedef struct _SOCKET_ADDRESS_LIST {
+    INT             iAddressCount;
+    SOCKET_ADDRESS  Address[1];
+} SOCKET_ADDRESS_LIST, FAR * LPSOCKET_ADDRESS_LIST;
+
+/*
+ *  Address Family/Protocol Tuples
+ */
+typedef struct _AFPROTOCOLS {
+    INT iAddressFamily;
+    INT iProtocol;
+} AFPROTOCOLS, *PAFPROTOCOLS, *LPAFPROTOCOLS;
+
+/*
+ * Client Query API Typedefs
+ */
+
+/*
+ * The comparators
+ */
+typedef enum _WSAEcomparator
+{
+    COMP_EQUAL = 0,
+    COMP_NOTLESS
+} WSAECOMPARATOR, *PWSAECOMPARATOR, *LPWSAECOMPARATOR;
+
+typedef struct _WSAVersion
+{
+    DWORD           dwVersion;
+    WSAECOMPARATOR  ecHow;
+}WSAVERSION, *PWSAVERSION, *LPWSAVERSION;
+
+typedef struct _WSAQuerySetA
+{
+    DWORD           dwSize;
+    LPSTR           lpszServiceInstanceName;
+    LPGUID          lpServiceClassId;
+    LPWSAVERSION    lpVersion;
+    LPSTR           lpszComment;
+    DWORD           dwNameSpace;
+    LPGUID          lpNSProviderId;
+    LPSTR           lpszContext;
+    DWORD           dwNumberOfProtocols;
+    LPAFPROTOCOLS   lpafpProtocols;
+    LPSTR           lpszQueryString;
+    DWORD           dwNumberOfCsAddrs;
+    LPCSADDR_INFO   lpcsaBuffer;
+    DWORD           dwOutputFlags;
+    LPBLOB          lpBlob;
+} WSAQUERYSETA, *PWSAQUERYSETA, *LPWSAQUERYSETA;
+typedef struct _WSAQuerySetW
+{
+    DWORD           dwSize;
+    LPWSTR          lpszServiceInstanceName;
+    LPGUID          lpServiceClassId;
+    LPWSAVERSION    lpVersion;
+    LPWSTR          lpszComment;
+    DWORD           dwNameSpace;
+    LPGUID          lpNSProviderId;
+    LPWSTR          lpszContext;
+    DWORD           dwNumberOfProtocols;
+    LPAFPROTOCOLS   lpafpProtocols;
+    LPWSTR          lpszQueryString;
+    DWORD           dwNumberOfCsAddrs;
+    LPCSADDR_INFO   lpcsaBuffer;
+    DWORD           dwOutputFlags;
+    LPBLOB          lpBlob;
+} WSAQUERYSETW, *PWSAQUERYSETW, *LPWSAQUERYSETW;
+#ifdef UNICODE
+typedef WSAQUERYSETW WSAQUERYSET;
+typedef PWSAQUERYSETW PWSAQUERYSET;
+typedef LPWSAQUERYSETW LPWSAQUERYSET;
+#else
+typedef WSAQUERYSETA WSAQUERYSET;
+typedef PWSAQUERYSETA PWSAQUERYSET;
+typedef LPWSAQUERYSETA LPWSAQUERYSET;
+#endif /* UNICODE */
+
+#define LUP_DEEP                0x0001
+#define LUP_CONTAINERS          0x0002
+#define LUP_NOCONTAINERS        0x0004
+#define LUP_NEAREST             0x0008
+#define LUP_RETURN_NAME         0x0010
+#define LUP_RETURN_TYPE         0x0020
+#define LUP_RETURN_VERSION      0x0040
+#define LUP_RETURN_COMMENT      0x0080
+#define LUP_RETURN_ADDR         0x0100
+#define LUP_RETURN_BLOB         0x0200
+#define LUP_RETURN_ALIASES      0x0400
+#define LUP_RETURN_QUERY_STRING 0x0800
+#define LUP_RETURN_ALL          0x0FF0
+#define LUP_RES_SERVICE         0x8000
+
+#define LUP_FLUSHCACHE       0x1000
+#define LUP_FLUSHPREVIOUS    0x2000
+
+
+/*
+ * Return flags
+ */
+
+#define  RESULT_IS_ALIAS      0x0001
+#define  RESULT_IS_ADDED      0x0010
+#define  RESULT_IS_CHANGED    0x0020
+#define  RESULT_IS_DELETED    0x0040
+
+
+/*
+ * Service Address Registration and Deregistration Data Types.
+ */
+
+typedef enum _WSAESETSERVICEOP
+{
+    RNRSERVICE_REGISTER=0,
+    RNRSERVICE_DEREGISTER,
+    RNRSERVICE_DELETE
+} WSAESETSERVICEOP, *PWSAESETSERVICEOP, *LPWSAESETSERVICEOP;
+
+/*
+ * Service Installation/Removal Data Types.
+ */
+
+typedef struct _WSANSClassInfoA
+{
+    LPSTR   lpszName;
+    DWORD   dwNameSpace;
+    DWORD   dwValueType;
+    DWORD   dwValueSize;
+    LPVOID  lpValue;
+}WSANSCLASSINFOA, *PWSANSCLASSINFOA, *LPWSANSCLASSINFOA;
+typedef struct _WSANSClassInfoW
+{
+    LPWSTR  lpszName;
+    DWORD   dwNameSpace;
+    DWORD   dwValueType;
+    DWORD   dwValueSize;
+    LPVOID  lpValue;
+}WSANSCLASSINFOW, *PWSANSCLASSINFOW, *LPWSANSCLASSINFOW;
+#ifdef UNICODE
+typedef WSANSCLASSINFOW WSANSCLASSINFO;
+typedef PWSANSCLASSINFOW PWSANSCLASSINFO;
+typedef LPWSANSCLASSINFOW LPWSANSCLASSINFO;
+#else
+typedef WSANSCLASSINFOA WSANSCLASSINFO;
+typedef PWSANSCLASSINFOA PWSANSCLASSINFO;
+typedef LPWSANSCLASSINFOA LPWSANSCLASSINFO;
+#endif /* UNICODE */
+
+typedef struct _WSAServiceClassInfoA
+{
+    LPGUID              lpServiceClassId;
+    LPSTR               lpszServiceClassName;
+    DWORD               dwCount;
+    LPWSANSCLASSINFOA   lpClassInfos;
+}WSASERVICECLASSINFOA, *PWSASERVICECLASSINFOA, *LPWSASERVICECLASSINFOA;
+typedef struct _WSAServiceClassInfoW
+{
+    LPGUID              lpServiceClassId;
+    LPWSTR              lpszServiceClassName;
+    DWORD               dwCount;
+    LPWSANSCLASSINFOW   lpClassInfos;
+}WSASERVICECLASSINFOW, *PWSASERVICECLASSINFOW, *LPWSASERVICECLASSINFOW;
+#ifdef UNICODE
+typedef WSASERVICECLASSINFOW WSASERVICECLASSINFO;
+typedef PWSASERVICECLASSINFOW PWSASERVICECLASSINFO;
+typedef LPWSASERVICECLASSINFOW LPWSASERVICECLASSINFO;
+#else
+typedef WSASERVICECLASSINFOA WSASERVICECLASSINFO;
+typedef PWSASERVICECLASSINFOA PWSASERVICECLASSINFO;
+typedef LPWSASERVICECLASSINFOA LPWSASERVICECLASSINFO;
+#endif /* UNICODE */
+
+typedef struct _WSANAMESPACE_INFOA {
+    GUID                NSProviderId;
+    DWORD               dwNameSpace;
+    BOOL                fActive;
+    DWORD               dwVersion;
+    LPSTR               lpszIdentifier;
+} WSANAMESPACE_INFOA, *PWSANAMESPACE_INFOA, *LPWSANAMESPACE_INFOA;
+typedef struct _WSANAMESPACE_INFOW {
+    GUID                NSProviderId;
+    DWORD               dwNameSpace;
+    BOOL                fActive;
+    DWORD               dwVersion;
+    LPWSTR              lpszIdentifier;
+} WSANAMESPACE_INFOW, *PWSANAMESPACE_INFOW, *LPWSANAMESPACE_INFOW;
+#ifdef UNICODE
+typedef WSANAMESPACE_INFOW WSANAMESPACE_INFO;
+typedef PWSANAMESPACE_INFOW PWSANAMESPACE_INFO;
+typedef LPWSANAMESPACE_INFOW LPWSANAMESPACE_INFO;
+#else
+typedef WSANAMESPACE_INFOA WSANAMESPACE_INFO;
+typedef PWSANAMESPACE_INFOA PWSANAMESPACE_INFO;
+typedef LPWSANAMESPACE_INFOA LPWSANAMESPACE_INFO;
+#endif /* UNICODE */
+
+/* Socket function prototypes */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+SOCKET
+WSAAPI
+accept(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * addr,
+    IN OUT int FAR * addrlen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+SOCKET
+(WSAAPI * LPFN_ACCEPT)(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * addr,
+    IN OUT int FAR * addrlen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+bind(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_BIND)(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+closesocket(
+    IN SOCKET s
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_CLOSESOCKET)(
+    IN SOCKET s
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+connect(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_CONNECT)(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+ioctlsocket(
+    IN SOCKET s,
+    IN long cmd,
+    IN OUT u_long FAR * argp
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_IOCTLSOCKET)(
+    IN SOCKET s,
+    IN long cmd,
+    IN OUT u_long FAR * argp
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+getpeername(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * name,
+    IN OUT int FAR * namelen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_GETPEERNAME)(
+    IN SOCKET s,
+    IN struct sockaddr FAR * name,
+    IN OUT int FAR * namelen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+getsockname(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * name,
+    IN OUT int FAR * namelen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_GETSOCKNAME)(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * name,
+    IN OUT int FAR * namelen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+getsockopt(
+    IN SOCKET s,
+    IN int level,
+    IN int optname,
+    OUT char FAR * optval,
+    IN OUT int FAR * optlen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_GETSOCKOPT)(
+    IN SOCKET s,
+    IN int level,
+    IN int optname,
+    OUT char FAR * optval,
+    IN OUT int FAR * optlen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+u_long
+WSAAPI
+htonl(
+    IN u_long hostlong
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+u_long
+(WSAAPI * LPFN_HTONL)(
+    IN u_long hostlong
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+u_short
+WSAAPI
+htons(
+    IN u_short hostshort
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+u_short
+(WSAAPI * LPFN_HTONS)(
+    IN u_short hostshort
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+unsigned long
+WSAAPI
+inet_addr(
+    IN const char FAR * cp
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+unsigned long
+(WSAAPI * LPFN_INET_ADDR)(
+    IN const char FAR * cp
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+char FAR *
+WSAAPI
+inet_ntoa(
+    IN struct in_addr in
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+char FAR *
+(WSAAPI * LPFN_INET_NTOA)(
+    IN struct in_addr in
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+listen(
+    IN SOCKET s,
+    IN int backlog
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_LISTEN)(
+    IN SOCKET s,
+    IN int backlog
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+u_long
+WSAAPI
+ntohl(
+    IN u_long netlong
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+u_long
+(WSAAPI * LPFN_NTOHL)(
+    IN u_long netlong
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+u_short
+WSAAPI
+ntohs(
+    IN u_short netshort
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+u_short
+(WSAAPI * LPFN_NTOHS)(
+    IN u_short netshort
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+recv(
+    IN SOCKET s,
+    OUT char FAR * buf,
+    IN int len,
+    IN int flags
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_RECV)(
+    IN SOCKET s,
+    OUT char FAR * buf,
+    IN int len,
+    IN int flags
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+recvfrom(
+    IN SOCKET s,
+    OUT char FAR * buf,
+    IN int len,
+    IN int flags,
+    OUT struct sockaddr FAR * from,
+    IN OUT int FAR * fromlen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_RECVFROM)(
+    IN SOCKET s,
+    OUT char FAR * buf,
+    IN int len,
+    IN int flags,
+    OUT struct sockaddr FAR * from,
+    IN OUT int FAR * fromlen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+select(
+    IN int nfds,
+    IN OUT fd_set FAR * readfds,
+    IN OUT fd_set FAR * writefds,
+    IN OUT fd_set FAR *exceptfds,
+    IN const struct timeval FAR * timeout
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_SELECT)(
+    IN int nfds,
+    IN OUT fd_set FAR * readfds,
+    IN OUT fd_set FAR * writefds,
+    IN OUT fd_set FAR *exceptfds,
+    IN const struct timeval FAR * timeout
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+send(
+    IN SOCKET s,
+    IN const char FAR * buf,
+    IN int len,
+    IN int flags
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_SEND)(
+    IN SOCKET s,
+    IN const char FAR * buf,
+    IN int len,
+    IN int flags
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+sendto(
+    IN SOCKET s,
+    IN const char FAR * buf,
+    IN int len,
+    IN int flags,
+    IN const struct sockaddr FAR * to,
+    IN int tolen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_SENDTO)(
+    IN SOCKET s,
+    IN const char FAR * buf,
+    IN int len,
+    IN int flags,
+    IN const struct sockaddr FAR * to,
+    IN int tolen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+setsockopt(
+    IN SOCKET s,
+    IN int level,
+    IN int optname,
+    IN const char FAR * optval,
+    IN int optlen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_SETSOCKOPT)(
+    IN SOCKET s,
+    IN int level,
+    IN int optname,
+    IN const char FAR * optval,
+    IN int optlen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+shutdown(
+    IN SOCKET s,
+    IN int how
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_SHUTDOWN)(
+    IN SOCKET s,
+    IN int how
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+SOCKET
+WSAAPI
+socket(
+    IN int af,
+    IN int type,
+    IN int protocol
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+SOCKET
+(WSAAPI * LPFN_SOCKET)(
+    IN int af,
+    IN int type,
+    IN int protocol
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+/* Database function prototypes */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+struct hostent FAR *
+WSAAPI
+gethostbyaddr(
+    IN const char FAR * addr,
+    IN int len,
+    IN int type
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+struct hostent FAR *
+(WSAAPI * LPFN_GETHOSTBYADDR)(
+    IN const char FAR * addr,
+    IN int len,
+    IN int type
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+struct hostent FAR *
+WSAAPI
+gethostbyname(
+    IN const char FAR * name
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+struct hostent FAR *
+(WSAAPI * LPFN_GETHOSTBYNAME)(
+    IN const char FAR * name
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+gethostname(
+    OUT char FAR * name,
+    IN int namelen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_GETHOSTNAME)(
+    OUT char FAR * name,
+    IN int namelen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+struct servent FAR *
+WSAAPI
+getservbyport(
+    IN int port,
+    IN const char FAR * proto
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+struct servent FAR *
+(WSAAPI * LPFN_GETSERVBYPORT)(
+    IN int port,
+    IN const char FAR * proto
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+struct servent FAR *
+WSAAPI
+getservbyname(
+    IN const char FAR * name,
+    IN const char FAR * proto
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+struct servent FAR *
+(WSAAPI * LPFN_GETSERVBYNAME)(
+    IN const char FAR * name,
+    IN const char FAR * proto
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+struct protoent FAR *
+WSAAPI
+getprotobynumber(
+    IN int number
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+struct protoent FAR *
+(WSAAPI * LPFN_GETPROTOBYNUMBER)(
+    IN int number
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+struct protoent FAR *
+WSAAPI
+getprotobyname(
+    IN const char FAR * name
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+struct protoent FAR *
+(WSAAPI * LPFN_GETPROTOBYNAME)(
+    IN const char FAR * name
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+/* Microsoft Windows Extension function prototypes */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAStartup(
+    IN WORD wVersionRequested,
+    OUT LPWSADATA lpWSAData
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSASTARTUP)(
+    IN WORD wVersionRequested,
+    OUT LPWSADATA lpWSAData
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSACleanup(
+    void
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSACLEANUP)(
+    void
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+void
+WSAAPI
+WSASetLastError(
+    IN int iError
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+void
+(WSAAPI * LPFN_WSASETLASTERROR)(
+    IN int iError
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAGetLastError(
+    void
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAGETLASTERROR)(
+    void
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+BOOL
+WSAAPI
+WSAIsBlocking(
+    void
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+BOOL
+(WSAAPI * LPFN_WSAISBLOCKING)(
+    void
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAUnhookBlockingHook(
+    void
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAUNHOOKBLOCKINGHOOK)(
+    void
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+FARPROC
+WSAAPI
+WSASetBlockingHook(
+    IN FARPROC lpBlockFunc
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+FARPROC
+(WSAAPI * LPFN_WSASETBLOCKINGHOOK)(
+    IN FARPROC lpBlockFunc
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSACancelBlockingCall(
+    void
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSACANCELBLOCKINGCALL)(
+    void
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+HANDLE
+WSAAPI
+WSAAsyncGetServByName(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * name,
+    IN const char FAR * proto,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+HANDLE
+(WSAAPI * LPFN_WSAASYNCGETSERVBYNAME)(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * name,
+    IN const char FAR * proto,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+HANDLE
+WSAAPI
+WSAAsyncGetServByPort(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN int port,
+    IN const char FAR * proto,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+HANDLE
+(WSAAPI * LPFN_WSAASYNCGETSERVBYPORT)(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN int port,
+    IN const char FAR * proto,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+HANDLE
+WSAAPI
+WSAAsyncGetProtoByName(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * name,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+HANDLE
+(WSAAPI * LPFN_WSAASYNCGETPROTOBYNAME)(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * name,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+HANDLE
+WSAAPI
+WSAAsyncGetProtoByNumber(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN int number,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+HANDLE
+(WSAAPI * LPFN_WSAASYNCGETPROTOBYNUMBER)(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN int number,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+HANDLE
+WSAAPI
+WSAAsyncGetHostByName(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * name,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+HANDLE
+(WSAAPI * LPFN_WSAASYNCGETHOSTBYNAME)(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * name,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+HANDLE
+WSAAPI
+WSAAsyncGetHostByAddr(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * addr,
+    IN int len,
+    IN int type,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+HANDLE
+(WSAAPI * LPFN_WSAASYNCGETHOSTBYADDR)(
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN const char FAR * addr,
+    IN int len,
+    IN int type,
+    OUT char FAR * buf,
+    IN int buflen
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSACancelAsyncRequest(
+    IN HANDLE hAsyncTaskHandle
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSACANCELASYNCREQUEST)(
+    IN HANDLE hAsyncTaskHandle
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAAsyncSelect(
+    IN SOCKET s,
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN long lEvent
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAASYNCSELECT)(
+    IN SOCKET s,
+    IN HWND hWnd,
+    IN u_int wMsg,
+    IN long lEvent
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+/* WinSock 2 API new function prototypes */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+SOCKET
+WSAAPI
+WSAAccept(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * addr,
+    IN OUT LPINT addrlen,
+    IN LPCONDITIONPROC lpfnCondition,
+    IN DWORD_PTR dwCallbackData
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+SOCKET
+(WSAAPI * LPFN_WSAACCEPT)(
+    IN SOCKET s,
+    OUT struct sockaddr FAR * addr,
+    IN OUT LPINT addrlen,
+    IN LPCONDITIONPROC lpfnCondition,
+    IN DWORD_PTR dwCallbackData
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+BOOL
+WSAAPI
+WSACloseEvent(
+    IN WSAEVENT hEvent
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+BOOL
+(WSAAPI * LPFN_WSACLOSEEVENT)(
+    IN WSAEVENT hEvent
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAConnect(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen,
+    IN LPWSABUF lpCallerData,
+    OUT LPWSABUF lpCalleeData,
+    IN LPQOS lpSQOS,
+    IN LPQOS lpGQOS
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSACONNECT)(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen,
+    IN LPWSABUF lpCallerData,
+    OUT LPWSABUF lpCalleeData,
+    IN LPQOS lpSQOS,
+    IN LPQOS lpGQOS
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+WSAEVENT
+WSAAPI
+WSACreateEvent(
+    void
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+WSAEVENT
+(WSAAPI * LPFN_WSACREATEEVENT)(
+    void
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSADuplicateSocketA(
+    IN SOCKET s,
+    IN DWORD dwProcessId,
+    OUT LPWSAPROTOCOL_INFOA lpProtocolInfo
+    );
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSADuplicateSocketW(
+    IN SOCKET s,
+    IN DWORD dwProcessId,
+    OUT LPWSAPROTOCOL_INFOW lpProtocolInfo
+    );
+#ifdef UNICODE
+#define WSADuplicateSocket  WSADuplicateSocketW
+#else
+#define WSADuplicateSocket  WSADuplicateSocketA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSADUPLICATESOCKETA)(
+    IN SOCKET s,
+    IN DWORD dwProcessId,
+    OUT LPWSAPROTOCOL_INFOA lpProtocolInfo
+    );
+typedef
+int
+(WSAAPI * LPFN_WSADUPLICATESOCKETW)(
+    IN SOCKET s,
+    IN DWORD dwProcessId,
+    OUT LPWSAPROTOCOL_INFOW lpProtocolInfo
+    );
+#ifdef UNICODE
+#define LPFN_WSADUPLICATESOCKET  LPFN_WSADUPLICATESOCKETW
+#else
+#define LPFN_WSADUPLICATESOCKET  LPFN_WSADUPLICATESOCKETA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAEnumNetworkEvents(
+    IN SOCKET s,
+    IN WSAEVENT hEventObject,
+    OUT LPWSANETWORKEVENTS lpNetworkEvents
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAENUMNETWORKEVENTS)(
+    IN SOCKET s,
+    IN WSAEVENT hEventObject,
+    OUT LPWSANETWORKEVENTS lpNetworkEvents
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAEnumProtocolsA(
+    IN LPINT lpiProtocols,
+    OUT LPWSAPROTOCOL_INFOA lpProtocolBuffer,
+    IN OUT LPDWORD lpdwBufferLength
+    );
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAEnumProtocolsW(
+    IN LPINT lpiProtocols,
+    OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer,
+    IN OUT LPDWORD lpdwBufferLength
+    );
+#ifdef UNICODE
+#define WSAEnumProtocols  WSAEnumProtocolsW
+#else
+#define WSAEnumProtocols  WSAEnumProtocolsA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAENUMPROTOCOLSA)(
+    IN LPINT lpiProtocols,
+    OUT LPWSAPROTOCOL_INFOA lpProtocolBuffer,
+    IN OUT LPDWORD lpdwBufferLength
+    );
+typedef
+int
+(WSAAPI * LPFN_WSAENUMPROTOCOLSW)(
+    IN LPINT lpiProtocols,
+    OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer,
+    IN OUT LPDWORD lpdwBufferLength
+    );
+#ifdef UNICODE
+#define LPFN_WSAENUMPROTOCOLS  LPFN_WSAENUMPROTOCOLSW
+#else
+#define LPFN_WSAENUMPROTOCOLS  LPFN_WSAENUMPROTOCOLSA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAEventSelect(
+    IN SOCKET s,
+    IN WSAEVENT hEventObject,
+    IN long lNetworkEvents
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAEVENTSELECT)(
+    IN SOCKET s,
+    IN WSAEVENT hEventObject,
+    IN long lNetworkEvents
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+BOOL
+WSAAPI
+WSAGetOverlappedResult(
+    IN SOCKET s,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    OUT LPDWORD lpcbTransfer,
+    IN BOOL fWait,
+    OUT LPDWORD lpdwFlags
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+BOOL
+(WSAAPI * LPFN_WSAGETOVERLAPPEDRESULT)(
+    IN SOCKET s,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    OUT LPDWORD lpcbTransfer,
+    IN BOOL fWait,
+    OUT LPDWORD lpdwFlags
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+BOOL
+WSAAPI
+WSAGetQOSByName(
+    IN SOCKET s,
+    IN LPWSABUF lpQOSName,
+    OUT LPQOS lpQOS
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+BOOL
+(WSAAPI * LPFN_WSAGETQOSBYNAME)(
+    IN SOCKET s,
+    IN LPWSABUF lpQOSName,
+    OUT LPQOS lpQOS
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAHtonl(
+    IN SOCKET s,
+    IN u_long hostlong,
+    OUT u_long FAR * lpnetlong
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAHTONL)(
+    IN SOCKET s,
+    IN u_long hostlong,
+    OUT u_long FAR * lpnetlong
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAHtons(
+    IN SOCKET s,
+    IN u_short hostshort,
+    OUT u_short FAR * lpnetshort
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAHTONS)(
+    IN SOCKET s,
+    IN u_short hostshort,
+    OUT u_short FAR * lpnetshort
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSAIoctl(
+    IN SOCKET s,
+    IN DWORD dwIoControlCode,
+    IN LPVOID lpvInBuffer,
+    IN DWORD cbInBuffer,
+    OUT LPVOID lpvOutBuffer,
+    IN DWORD cbOutBuffer,
+    OUT LPDWORD lpcbBytesReturned,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSAIOCTL)(
+    IN SOCKET s,
+    IN DWORD dwIoControlCode,
+    IN LPVOID lpvInBuffer,
+    IN DWORD cbInBuffer,
+    OUT LPVOID lpvOutBuffer,
+    IN DWORD cbOutBuffer,
+    OUT LPDWORD lpcbBytesReturned,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+SOCKET
+WSAAPI
+WSAJoinLeaf(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen,
+    IN LPWSABUF lpCallerData,
+    OUT LPWSABUF lpCalleeData,
+    IN LPQOS lpSQOS,
+    IN LPQOS lpGQOS,
+    IN DWORD dwFlags
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+SOCKET
+(WSAAPI * LPFN_WSAJOINLEAF)(
+    IN SOCKET s,
+    IN const struct sockaddr FAR * name,
+    IN int namelen,
+    IN LPWSABUF lpCallerData,
+    OUT LPWSABUF lpCalleeData,
+    IN LPQOS lpSQOS,
+    IN LPQOS lpGQOS,
+    IN DWORD dwFlags
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSANtohl(
+    IN SOCKET s,
+    IN u_long netlong,
+    OUT u_long FAR * lphostlong
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSANTOHL)(
+    IN SOCKET s,
+    IN u_long netlong,
+    OUT u_long FAR * lphostlong
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSANtohs(
+    IN SOCKET s,
+    IN u_short netshort,
+    OUT u_short FAR * lphostshort
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSANTOHS)(
+    IN SOCKET s,
+    IN u_short netshort,
+    OUT u_short FAR * lphostshort
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSARecv(
+    IN SOCKET s,
+    IN OUT LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesRecvd,
+    IN OUT LPDWORD lpFlags,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSARECV)(
+    IN SOCKET s,
+    IN OUT LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesRecvd,
+    IN OUT LPDWORD lpFlags,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSARecvDisconnect(
+    IN SOCKET s,
+    OUT LPWSABUF lpInboundDisconnectData
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSARECVDISCONNECT)(
+    IN SOCKET s,
+    OUT LPWSABUF lpInboundDisconnectData
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSARecvFrom(
+    IN SOCKET s,
+    IN OUT LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesRecvd,
+    IN OUT LPDWORD lpFlags,
+    OUT struct sockaddr FAR * lpFrom,
+    IN OUT LPINT lpFromlen,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSARECVFROM)(
+    IN SOCKET s,
+    IN OUT LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesRecvd,
+    IN OUT LPDWORD lpFlags,
+    OUT struct sockaddr FAR * lpFrom,
+    IN OUT LPINT lpFromlen,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+BOOL
+WSAAPI
+WSAResetEvent(
+    IN WSAEVENT hEvent
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+BOOL
+(WSAAPI * LPFN_WSARESETEVENT)(
+    IN WSAEVENT hEvent
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSASend(
+    IN SOCKET s,
+    IN LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesSent,
+    IN DWORD dwFlags,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSASEND)(
+    IN SOCKET s,
+    IN LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesSent,
+    IN DWORD dwFlags,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSASendDisconnect(
+    IN SOCKET s,
+    IN LPWSABUF lpOutboundDisconnectData
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSASENDDISCONNECT)(
+    IN SOCKET s,
+    IN LPWSABUF lpOutboundDisconnectData
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+int
+WSAAPI
+WSASendTo(
+    IN SOCKET s,
+    IN LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesSent,
+    IN DWORD dwFlags,
+    IN const struct sockaddr FAR * lpTo,
+    IN int iTolen,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+int
+(WSAAPI * LPFN_WSASENDTO)(
+    IN SOCKET s,
+    IN LPWSABUF lpBuffers,
+    IN DWORD dwBufferCount,
+    OUT LPDWORD lpNumberOfBytesSent,
+    IN DWORD dwFlags,
+    IN const struct sockaddr FAR * lpTo,
+    IN int iTolen,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+BOOL
+WSAAPI
+WSASetEvent(
+    IN WSAEVENT hEvent
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+BOOL
+(WSAAPI * LPFN_WSASETEVENT)(
+    IN WSAEVENT hEvent
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+SOCKET
+WSAAPI
+WSASocketA(
+    IN int af,
+    IN int type,
+    IN int protocol,
+    IN LPWSAPROTOCOL_INFOA lpProtocolInfo,
+    IN GROUP g,
+    IN DWORD dwFlags
+    );
+WINSOCK_API_LINKAGE
+SOCKET
+WSAAPI
+WSASocketW(
+    IN int af,
+    IN int type,
+    IN int protocol,
+    IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
+    IN GROUP g,
+    IN DWORD dwFlags
+    );
+#ifdef UNICODE
+#define WSASocket  WSASocketW
+#else
+#define WSASocket  WSASocketA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+SOCKET
+(WSAAPI * LPFN_WSASOCKETA)(
+    IN int af,
+    IN int type,
+    IN int protocol,
+    IN LPWSAPROTOCOL_INFOA lpProtocolInfo,
+    IN GROUP g,
+    IN DWORD dwFlags
+    );
+typedef
+SOCKET
+(WSAAPI * LPFN_WSASOCKETW)(
+    IN int af,
+    IN int type,
+    IN int protocol,
+    IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
+    IN GROUP g,
+    IN DWORD dwFlags
+    );
+#ifdef UNICODE
+#define LPFN_WSASOCKET  LPFN_WSASOCKETW
+#else
+#define LPFN_WSASOCKET  LPFN_WSASOCKETA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+DWORD
+WSAAPI
+WSAWaitForMultipleEvents(
+    IN DWORD cEvents,
+    IN const WSAEVENT FAR * lphEvents,
+    IN BOOL fWaitAll,
+    IN DWORD dwTimeout,
+    IN BOOL fAlertable
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+DWORD
+(WSAAPI * LPFN_WSAWAITFORMULTIPLEEVENTS)(
+    IN DWORD cEvents,
+    IN const WSAEVENT FAR * lphEvents,
+    IN BOOL fWaitAll,
+    IN DWORD dwTimeout,
+    IN BOOL fAlertable
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAAddressToStringA(
+    IN     LPSOCKADDR          lpsaAddress,
+    IN     DWORD               dwAddressLength,
+    IN     LPWSAPROTOCOL_INFOA lpProtocolInfo,
+    IN OUT LPSTR             lpszAddressString,
+    IN OUT LPDWORD             lpdwAddressStringLength
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAAddressToStringW(
+    IN     LPSOCKADDR          lpsaAddress,
+    IN     DWORD               dwAddressLength,
+    IN     LPWSAPROTOCOL_INFOW lpProtocolInfo,
+    IN OUT LPWSTR             lpszAddressString,
+    IN OUT LPDWORD             lpdwAddressStringLength
+    );
+#ifdef UNICODE
+#define WSAAddressToString  WSAAddressToStringW
+#else
+#define WSAAddressToString  WSAAddressToStringA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAADDRESSTOSTRINGA)(
+    IN     LPSOCKADDR          lpsaAddress,
+    IN     DWORD               dwAddressLength,
+    IN     LPWSAPROTOCOL_INFOA lpProtocolInfo,
+    IN OUT LPSTR             lpszAddressString,
+    IN OUT LPDWORD             lpdwAddressStringLength
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSAADDRESSTOSTRINGW)(
+    IN     LPSOCKADDR          lpsaAddress,
+    IN     DWORD               dwAddressLength,
+    IN     LPWSAPROTOCOL_INFOW lpProtocolInfo,
+    IN OUT LPWSTR             lpszAddressString,
+    IN OUT LPDWORD             lpdwAddressStringLength
+    );
+#ifdef UNICODE
+#define LPFN_WSAADDRESSTOSTRING  LPFN_WSAADDRESSTOSTRINGW
+#else
+#define LPFN_WSAADDRESSTOSTRING  LPFN_WSAADDRESSTOSTRINGA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAStringToAddressA(
+    IN     LPSTR               AddressString,
+    IN     INT                 AddressFamily,
+    IN     LPWSAPROTOCOL_INFOA lpProtocolInfo,
+    OUT    LPSOCKADDR          lpAddress,
+    IN OUT LPINT               lpAddressLength
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAStringToAddressW(
+    IN     LPWSTR              AddressString,
+    IN     INT                 AddressFamily,
+    IN     LPWSAPROTOCOL_INFOW lpProtocolInfo,
+    OUT    LPSOCKADDR          lpAddress,
+    IN OUT LPINT               lpAddressLength
+    );
+#ifdef UNICODE
+#define WSAStringToAddress  WSAStringToAddressW
+#else
+#define WSAStringToAddress  WSAStringToAddressA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSASTRINGTOADDRESSA)(
+    IN     LPSTR               AddressString,
+    IN     INT                 AddressFamily,
+    IN     LPWSAPROTOCOL_INFOA lpProtocolInfo,
+    OUT    LPSOCKADDR          lpAddress,
+    IN OUT LPINT               lpAddressLength
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSASTRINGTOADDRESSW)(
+    IN     LPWSTR              AddressString,
+    IN     INT                 AddressFamily,
+    IN     LPWSAPROTOCOL_INFOW lpProtocolInfo,
+    OUT    LPSOCKADDR          lpAddress,
+    IN OUT LPINT               lpAddressLength
+    );
+#ifdef UNICODE
+#define LPFN_WSASTRINGTOADDRESS  LPFN_WSASTRINGTOADDRESSW
+#else
+#define LPFN_WSASTRINGTOADDRESS  LPFN_WSASTRINGTOADDRESSA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+/* Registration and Name Resolution API functions */
+
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSALookupServiceBeginA(
+    IN  LPWSAQUERYSETA lpqsRestrictions,
+    IN  DWORD          dwControlFlags,
+    OUT LPHANDLE       lphLookup
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSALookupServiceBeginW(
+    IN  LPWSAQUERYSETW lpqsRestrictions,
+    IN  DWORD          dwControlFlags,
+    OUT LPHANDLE       lphLookup
+    );
+#ifdef UNICODE
+#define WSALookupServiceBegin  WSALookupServiceBeginW
+#else
+#define WSALookupServiceBegin  WSALookupServiceBeginA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSALOOKUPSERVICEBEGINA)(
+    IN  LPWSAQUERYSETA lpqsRestrictions,
+    IN  DWORD          dwControlFlags,
+    OUT LPHANDLE       lphLookup
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSALOOKUPSERVICEBEGINW)(
+    IN  LPWSAQUERYSETW lpqsRestrictions,
+    IN  DWORD          dwControlFlags,
+    OUT LPHANDLE       lphLookup
+    );
+#ifdef UNICODE
+#define LPFN_WSALOOKUPSERVICEBEGIN  LPFN_WSALOOKUPSERVICEBEGINW
+#else
+#define LPFN_WSALOOKUPSERVICEBEGIN  LPFN_WSALOOKUPSERVICEBEGINA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSALookupServiceNextA(
+    IN     HANDLE           hLookup,
+    IN     DWORD            dwControlFlags,
+    IN OUT LPDWORD          lpdwBufferLength,
+    OUT    LPWSAQUERYSETA   lpqsResults
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSALookupServiceNextW(
+    IN     HANDLE           hLookup,
+    IN     DWORD            dwControlFlags,
+    IN OUT LPDWORD          lpdwBufferLength,
+    OUT    LPWSAQUERYSETW   lpqsResults
+    );
+#ifdef UNICODE
+#define WSALookupServiceNext  WSALookupServiceNextW
+#else
+#define WSALookupServiceNext  WSALookupServiceNextA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSALOOKUPSERVICENEXTA)(
+    IN     HANDLE           hLookup,
+    IN     DWORD            dwControlFlags,
+    IN OUT LPDWORD          lpdwBufferLength,
+    OUT    LPWSAQUERYSETA   lpqsResults
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSALOOKUPSERVICENEXTW)(
+    IN     HANDLE           hLookup,
+    IN     DWORD            dwControlFlags,
+    IN OUT LPDWORD          lpdwBufferLength,
+    OUT    LPWSAQUERYSETW   lpqsResults
+    );
+#ifdef UNICODE
+#define LPFN_WSALOOKUPSERVICENEXT  LPFN_WSALOOKUPSERVICENEXTW
+#else
+#define LPFN_WSALOOKUPSERVICENEXT  LPFN_WSALOOKUPSERVICENEXTA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSANSPIoctl(
+    IN  HANDLE           hLookup,
+    IN  DWORD            dwControlCode,
+    IN  LPVOID           lpvInBuffer,
+    IN  DWORD            cbInBuffer,
+    OUT LPVOID           lpvOutBuffer,
+    IN  DWORD            cbOutBuffer,
+    OUT LPDWORD          lpcbBytesReturned,
+    IN  LPWSACOMPLETION  lpCompletion
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSANSPIOCTL)(
+    IN  HANDLE           hLookup,
+    IN  DWORD            dwControlCode,
+    IN  LPVOID           lpvInBuffer,
+    IN  DWORD            cbInBuffer,
+    OUT LPVOID           lpvOutBuffer,
+    IN  DWORD            cbOutBuffer,
+    OUT LPDWORD          lpcbBytesReturned,
+    IN  LPWSACOMPLETION  lpCompletion
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSALookupServiceEnd(
+    IN HANDLE  hLookup
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSALOOKUPSERVICEEND)(
+    IN HANDLE  hLookup
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAInstallServiceClassA(
+    IN  LPWSASERVICECLASSINFOA   lpServiceClassInfo
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAInstallServiceClassW(
+    IN  LPWSASERVICECLASSINFOW   lpServiceClassInfo
+    );
+#ifdef UNICODE
+#define WSAInstallServiceClass  WSAInstallServiceClassW
+#else
+#define WSAInstallServiceClass  WSAInstallServiceClassA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAINSTALLSERVICECLASSA)(
+    IN  LPWSASERVICECLASSINFOA   lpServiceClassInfo
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSAINSTALLSERVICECLASSW)(
+    IN  LPWSASERVICECLASSINFOW   lpServiceClassInfo
+    );
+#ifdef UNICODE
+#define LPFN_WSAINSTALLSERVICECLASS  LPFN_WSAINSTALLSERVICECLASSW
+#else
+#define LPFN_WSAINSTALLSERVICECLASS  LPFN_WSAINSTALLSERVICECLASSA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSARemoveServiceClass(
+    IN  LPGUID  lpServiceClassId
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAREMOVESERVICECLASS)(
+    IN  LPGUID  lpServiceClassId
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAGetServiceClassInfoA(
+    IN  LPGUID  lpProviderId,
+    IN  LPGUID  lpServiceClassId,
+    IN OUT LPDWORD  lpdwBufSize,
+    OUT LPWSASERVICECLASSINFOA lpServiceClassInfo
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAGetServiceClassInfoW(
+    IN  LPGUID  lpProviderId,
+    IN  LPGUID  lpServiceClassId,
+    IN OUT LPDWORD  lpdwBufSize,
+    OUT LPWSASERVICECLASSINFOW lpServiceClassInfo
+    );
+#ifdef UNICODE
+#define WSAGetServiceClassInfo  WSAGetServiceClassInfoW
+#else
+#define WSAGetServiceClassInfo  WSAGetServiceClassInfoA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAGETSERVICECLASSINFOA)(
+    IN  LPGUID  lpProviderId,
+    IN  LPGUID  lpServiceClassId,
+    IN OUT LPDWORD  lpdwBufSize,
+    OUT LPWSASERVICECLASSINFOA lpServiceClassInfo
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSAGETSERVICECLASSINFOW)(
+    IN  LPGUID  lpProviderId,
+    IN  LPGUID  lpServiceClassId,
+    IN OUT LPDWORD  lpdwBufSize,
+    OUT LPWSASERVICECLASSINFOW lpServiceClassInfo
+    );
+#ifdef UNICODE
+#define LPFN_WSAGETSERVICECLASSINFO  LPFN_WSAGETSERVICECLASSINFOW
+#else
+#define LPFN_WSAGETSERVICECLASSINFO  LPFN_WSAGETSERVICECLASSINFOA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAEnumNameSpaceProvidersA(
+    IN OUT LPDWORD              lpdwBufferLength,
+    OUT    LPWSANAMESPACE_INFOA lpnspBuffer
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAEnumNameSpaceProvidersW(
+    IN OUT LPDWORD              lpdwBufferLength,
+    OUT    LPWSANAMESPACE_INFOW lpnspBuffer
+    );
+#ifdef UNICODE
+#define WSAEnumNameSpaceProviders  WSAEnumNameSpaceProvidersW
+#else
+#define WSAEnumNameSpaceProviders  WSAEnumNameSpaceProvidersA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAENUMNAMESPACEPROVIDERSA)(
+    IN OUT LPDWORD              lpdwBufferLength,
+    OUT    LPWSANAMESPACE_INFOA lpnspBuffer
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSAENUMNAMESPACEPROVIDERSW)(
+    IN OUT LPDWORD              lpdwBufferLength,
+    OUT    LPWSANAMESPACE_INFOW lpnspBuffer
+    );
+#ifdef UNICODE
+#define LPFN_WSAENUMNAMESPACEPROVIDERS  LPFN_WSAENUMNAMESPACEPROVIDERSW
+#else
+#define LPFN_WSAENUMNAMESPACEPROVIDERS  LPFN_WSAENUMNAMESPACEPROVIDERSA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAGetServiceClassNameByClassIdA(
+    IN      LPGUID  lpServiceClassId,
+    OUT     LPSTR lpszServiceClassName,
+    IN OUT  LPDWORD lpdwBufferLength
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAGetServiceClassNameByClassIdW(
+    IN      LPGUID  lpServiceClassId,
+    OUT     LPWSTR lpszServiceClassName,
+    IN OUT  LPDWORD lpdwBufferLength
+    );
+#ifdef UNICODE
+#define WSAGetServiceClassNameByClassId  WSAGetServiceClassNameByClassIdW
+#else
+#define WSAGetServiceClassNameByClassId  WSAGetServiceClassNameByClassIdA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(
+    IN      LPGUID  lpServiceClassId,
+    OUT     LPSTR lpszServiceClassName,
+    IN OUT  LPDWORD lpdwBufferLength
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(
+    IN      LPGUID  lpServiceClassId,
+    OUT     LPWSTR lpszServiceClassName,
+    IN OUT  LPDWORD lpdwBufferLength
+    );
+#ifdef UNICODE
+#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID  LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW
+#else
+#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID  LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSASetServiceA(
+    IN LPWSAQUERYSETA lpqsRegInfo,
+    IN WSAESETSERVICEOP essoperation,
+    IN DWORD dwControlFlags
+    );
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSASetServiceW(
+    IN LPWSAQUERYSETW lpqsRegInfo,
+    IN WSAESETSERVICEOP essoperation,
+    IN DWORD dwControlFlags
+    );
+#ifdef UNICODE
+#define WSASetService  WSASetServiceW
+#else
+#define WSASetService  WSASetServiceA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSASETSERVICEA)(
+    IN LPWSAQUERYSETA lpqsRegInfo,
+    IN WSAESETSERVICEOP essoperation,
+    IN DWORD dwControlFlags
+    );
+typedef
+INT
+(WSAAPI * LPFN_WSASETSERVICEW)(
+    IN LPWSAQUERYSETW lpqsRegInfo,
+    IN WSAESETSERVICEOP essoperation,
+    IN DWORD dwControlFlags
+    );
+#ifdef UNICODE
+#define LPFN_WSASETSERVICE  LPFN_WSASETSERVICEW
+#else
+#define LPFN_WSASETSERVICE  LPFN_WSASETSERVICEA
+#endif /* !UNICODE */
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+#if INCL_WINSOCK_API_PROTOTYPES
+WINSOCK_API_LINKAGE
+INT
+WSAAPI
+WSAProviderConfigChange(
+    IN OUT LPHANDLE lpNotificationHandle,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_PROTOTYPES */
+
+#if INCL_WINSOCK_API_TYPEDEFS
+typedef
+INT
+(WSAAPI * LPFN_WSAPROVIDERCONFIGCHANGE)(
+    IN OUT LPHANDLE lpNotificationHandle,
+    IN LPWSAOVERLAPPED lpOverlapped,
+    IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+    );
+#endif /* INCL_WINSOCK_API_TYPEDEFS */
+
+/* Microsoft Windows Extended data types */
+typedef struct sockaddr_in SOCKADDR_IN;
+typedef struct sockaddr_in *PSOCKADDR_IN;
+typedef struct sockaddr_in FAR *LPSOCKADDR_IN;
+
+typedef struct linger LINGER;
+typedef struct linger *PLINGER;
+typedef struct linger FAR *LPLINGER;
+
+typedef struct in_addr IN_ADDR;
+typedef struct in_addr *PIN_ADDR;
+typedef struct in_addr FAR *LPIN_ADDR;
+
+typedef struct fd_set FD_SET;
+typedef struct fd_set *PFD_SET;
+typedef struct fd_set FAR *LPFD_SET;
+
+typedef struct hostent HOSTENT;
+typedef struct hostent *PHOSTENT;
+typedef struct hostent FAR *LPHOSTENT;
+
+typedef struct servent SERVENT;
+typedef struct servent *PSERVENT;
+typedef struct servent FAR *LPSERVENT;
+
+typedef struct protoent PROTOENT;
+typedef struct protoent *PPROTOENT;
+typedef struct protoent FAR *LPPROTOENT;
+
+typedef struct timeval TIMEVAL;
+typedef struct timeval *PTIMEVAL;
+typedef struct timeval FAR *LPTIMEVAL;
+
+/*
+ * Windows message parameter composition and decomposition
+ * macros.
+ *
+ * WSAMAKEASYNCREPLY is intended for use by the Windows Sockets implementation
+ * when constructing the response to a WSAAsyncGetXByY() routine.
+ */
+#define WSAMAKEASYNCREPLY(buflen,error)     MAKELONG(buflen,error)
+/*
+ * WSAMAKESELECTREPLY is intended for use by the Windows Sockets implementation
+ * when constructing the response to WSAAsyncSelect().
+ */
+#define WSAMAKESELECTREPLY(event,error)     MAKELONG(event,error)
+/*
+ * WSAGETASYNCBUFLEN is intended for use by the Windows Sockets application
+ * to extract the buffer length from the lParam in the response
+ * to a WSAAsyncGetXByY().
+ */
+#define WSAGETASYNCBUFLEN(lParam)           LOWORD(lParam)
+/*
+ * WSAGETASYNCERROR is intended for use by the Windows Sockets application
+ * to extract the error code from the lParam in the response
+ * to a WSAGetXByY().
+ */
+#define WSAGETASYNCERROR(lParam)            HIWORD(lParam)
+/*
+ * WSAGETSELECTEVENT is intended for use by the Windows Sockets application
+ * to extract the event code from the lParam in the response
+ * to a WSAAsyncSelect().
+ */
+#define WSAGETSELECTEVENT(lParam)           LOWORD(lParam)
+/*
+ * WSAGETSELECTERROR is intended for use by the Windows Sockets application
+ * to extract the error code from the lParam in the response
+ * to a WSAAsyncSelect().
+ */
+#define WSAGETSELECTERROR(lParam)           HIWORD(lParam)
+
+#ifdef __cplusplus
+}
+#endif
+
+#if !defined(WIN32) && !defined(_WIN64)
+#include <poppack.h>
+#endif
+
+#ifdef IPV6STRICT
+#include <wsipv6ok.h>
+#endif // IPV6STRICT
+
+#endif  /* _WINSOCK2API_ */
diff --git a/base/Windows/Inc/WinSvc.h b/base/Windows/Inc/WinSvc.h
new file mode 100644
index 0000000..fcb9cee
--- /dev/null
+++ b/base/Windows/Inc/WinSvc.h
@@ -0,0 +1,1059 @@
+/*++ BUILD Version: 0010    // Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    winsvc.h
+
+Abstract:
+
+    Header file for the Service Control Manager
+
+Environment:
+
+    User Mode - Win32
+
+--*/
+#ifndef _WINSVC_
+#define _WINSVC_
+
+//
+// Define API decoration for direct importing of DLL references.
+//
+
+#if !defined(WINADVAPI)
+#if !defined(_ADVAPI32_)
+#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//
+// Constants
+//
+
+//
+// Service database names
+//
+
+#define SERVICES_ACTIVE_DATABASEW      L"ServicesActive"
+#define SERVICES_FAILED_DATABASEW      L"ServicesFailed"
+
+#define SERVICES_ACTIVE_DATABASEA      "ServicesActive"
+#define SERVICES_FAILED_DATABASEA      "ServicesFailed"
+
+//
+// Character to designate that a name is a group
+//
+
+#define SC_GROUP_IDENTIFIERW           L'+'
+#define SC_GROUP_IDENTIFIERA           '+'
+
+#ifdef UNICODE
+
+#define SERVICES_ACTIVE_DATABASE       SERVICES_ACTIVE_DATABASEW
+#define SERVICES_FAILED_DATABASE       SERVICES_FAILED_DATABASEW
+
+
+#define SC_GROUP_IDENTIFIER            SC_GROUP_IDENTIFIERW
+
+#else // ndef UNICODE
+
+#define SERVICES_ACTIVE_DATABASE       SERVICES_ACTIVE_DATABASEA
+#define SERVICES_FAILED_DATABASE       SERVICES_FAILED_DATABASEA
+
+#define SC_GROUP_IDENTIFIER            SC_GROUP_IDENTIFIERA
+#endif // ndef UNICODE
+
+
+//
+// Value to indicate no change to an optional parameter
+//
+#define SERVICE_NO_CHANGE              0xffffffff
+
+//
+// Service State -- for Enum Requests (Bit Mask)
+//
+#define SERVICE_ACTIVE                 0x00000001
+#define SERVICE_INACTIVE               0x00000002
+#define SERVICE_STATE_ALL              (SERVICE_ACTIVE   | \
+                                        SERVICE_INACTIVE)
+
+//
+// Controls
+//
+#define SERVICE_CONTROL_STOP                   0x00000001
+#define SERVICE_CONTROL_PAUSE                  0x00000002
+#define SERVICE_CONTROL_CONTINUE               0x00000003
+#define SERVICE_CONTROL_INTERROGATE            0x00000004
+#define SERVICE_CONTROL_SHUTDOWN               0x00000005
+#define SERVICE_CONTROL_PARAMCHANGE            0x00000006
+#define SERVICE_CONTROL_NETBINDADD             0x00000007
+#define SERVICE_CONTROL_NETBINDREMOVE          0x00000008
+#define SERVICE_CONTROL_NETBINDENABLE          0x00000009
+#define SERVICE_CONTROL_NETBINDDISABLE         0x0000000A
+#define SERVICE_CONTROL_DEVICEEVENT            0x0000000B
+#define SERVICE_CONTROL_HARDWAREPROFILECHANGE  0x0000000C
+#define SERVICE_CONTROL_POWEREVENT             0x0000000D
+#define SERVICE_CONTROL_SESSIONCHANGE          0x0000000E
+
+//
+// Service State -- for CurrentState
+//
+#define SERVICE_STOPPED                        0x00000001
+#define SERVICE_START_PENDING                  0x00000002
+#define SERVICE_STOP_PENDING                   0x00000003
+#define SERVICE_RUNNING                        0x00000004
+#define SERVICE_CONTINUE_PENDING               0x00000005
+#define SERVICE_PAUSE_PENDING                  0x00000006
+#define SERVICE_PAUSED                         0x00000007
+
+//
+// Controls Accepted  (Bit Mask)
+//
+#define SERVICE_ACCEPT_STOP                    0x00000001
+#define SERVICE_ACCEPT_PAUSE_CONTINUE          0x00000002
+#define SERVICE_ACCEPT_SHUTDOWN                0x00000004
+#define SERVICE_ACCEPT_PARAMCHANGE             0x00000008
+#define SERVICE_ACCEPT_NETBINDCHANGE           0x00000010
+#define SERVICE_ACCEPT_HARDWAREPROFILECHANGE   0x00000020
+#define SERVICE_ACCEPT_POWEREVENT              0x00000040
+#define SERVICE_ACCEPT_SESSIONCHANGE           0x00000080
+
+//
+// Service Control Manager object specific access types
+//
+#define SC_MANAGER_CONNECT             0x0001
+#define SC_MANAGER_CREATE_SERVICE      0x0002
+#define SC_MANAGER_ENUMERATE_SERVICE   0x0004
+#define SC_MANAGER_LOCK                0x0008
+#define SC_MANAGER_QUERY_LOCK_STATUS   0x0010
+#define SC_MANAGER_MODIFY_BOOT_CONFIG  0x0020
+
+#define SC_MANAGER_ALL_ACCESS          (STANDARD_RIGHTS_REQUIRED      | \
+                                        SC_MANAGER_CONNECT            | \
+                                        SC_MANAGER_CREATE_SERVICE     | \
+                                        SC_MANAGER_ENUMERATE_SERVICE  | \
+                                        SC_MANAGER_LOCK               | \
+                                        SC_MANAGER_QUERY_LOCK_STATUS  | \
+                                        SC_MANAGER_MODIFY_BOOT_CONFIG)
+
+
+
+//
+// Service object specific access type
+//
+#define SERVICE_QUERY_CONFIG           0x0001
+#define SERVICE_CHANGE_CONFIG          0x0002
+#define SERVICE_QUERY_STATUS           0x0004
+#define SERVICE_ENUMERATE_DEPENDENTS   0x0008
+#define SERVICE_START                  0x0010
+#define SERVICE_STOP                   0x0020
+#define SERVICE_PAUSE_CONTINUE         0x0040
+#define SERVICE_INTERROGATE            0x0080
+#define SERVICE_USER_DEFINED_CONTROL   0x0100
+
+#define SERVICE_ALL_ACCESS             (STANDARD_RIGHTS_REQUIRED     | \
+                                        SERVICE_QUERY_CONFIG         | \
+                                        SERVICE_CHANGE_CONFIG        | \
+                                        SERVICE_QUERY_STATUS         | \
+                                        SERVICE_ENUMERATE_DEPENDENTS | \
+                                        SERVICE_START                | \
+                                        SERVICE_STOP                 | \
+                                        SERVICE_PAUSE_CONTINUE       | \
+                                        SERVICE_INTERROGATE          | \
+                                        SERVICE_USER_DEFINED_CONTROL)
+
+//
+// Service flags for QueryServiceStatusEx
+//
+#define SERVICE_RUNS_IN_SYSTEM_PROCESS  0x00000001
+
+//
+// Info levels for ChangeServiceConfig2 and QueryServiceConfig2
+//
+#define SERVICE_CONFIG_DESCRIPTION     1
+#define SERVICE_CONFIG_FAILURE_ACTIONS 2
+
+//
+// Service description string
+//
+typedef struct _SERVICE_DESCRIPTIONA {
+    LPSTR       lpDescription;
+} SERVICE_DESCRIPTIONA, *LPSERVICE_DESCRIPTIONA;
+//
+// Service description string
+//
+typedef struct _SERVICE_DESCRIPTIONW {
+    LPWSTR      lpDescription;
+} SERVICE_DESCRIPTIONW, *LPSERVICE_DESCRIPTIONW;
+#ifdef UNICODE
+typedef SERVICE_DESCRIPTIONW SERVICE_DESCRIPTION;
+typedef LPSERVICE_DESCRIPTIONW LPSERVICE_DESCRIPTION;
+#else
+typedef SERVICE_DESCRIPTIONA SERVICE_DESCRIPTION;
+typedef LPSERVICE_DESCRIPTIONA LPSERVICE_DESCRIPTION;
+#endif // UNICODE
+
+//
+// Actions to take on service failure
+//
+typedef enum _SC_ACTION_TYPE {
+        SC_ACTION_NONE          = 0,
+        SC_ACTION_RESTART       = 1,
+        SC_ACTION_REBOOT        = 2,
+        SC_ACTION_RUN_COMMAND   = 3
+} SC_ACTION_TYPE;
+
+typedef struct _SC_ACTION {
+    SC_ACTION_TYPE  Type;
+    DWORD           Delay;
+} SC_ACTION, *LPSC_ACTION;
+
+typedef struct _SERVICE_FAILURE_ACTIONSA {
+    DWORD       dwResetPeriod;
+    LPSTR       lpRebootMsg;
+    LPSTR       lpCommand;
+    DWORD       cActions;
+#ifdef MIDL_PASS
+    [size_is(cActions)]
+#endif
+    SC_ACTION * lpsaActions;
+} SERVICE_FAILURE_ACTIONSA, *LPSERVICE_FAILURE_ACTIONSA;
+typedef struct _SERVICE_FAILURE_ACTIONSW {
+    DWORD       dwResetPeriod;
+    LPWSTR      lpRebootMsg;
+    LPWSTR      lpCommand;
+    DWORD       cActions;
+#ifdef MIDL_PASS
+    [size_is(cActions)]
+#endif
+    SC_ACTION * lpsaActions;
+} SERVICE_FAILURE_ACTIONSW, *LPSERVICE_FAILURE_ACTIONSW;
+#ifdef UNICODE
+typedef SERVICE_FAILURE_ACTIONSW SERVICE_FAILURE_ACTIONS;
+typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS;
+#else
+typedef SERVICE_FAILURE_ACTIONSA SERVICE_FAILURE_ACTIONS;
+typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS;
+#endif // UNICODE
+
+
+//
+// Handle Types
+//
+
+DECLARE_HANDLE(SC_HANDLE);
+typedef SC_HANDLE   *LPSC_HANDLE;
+
+DECLARE_HANDLE(SERVICE_STATUS_HANDLE);
+
+//
+// Info levels for QueryServiceStatusEx
+//
+
+typedef enum _SC_STATUS_TYPE {
+        SC_STATUS_PROCESS_INFO      = 0
+} SC_STATUS_TYPE;
+
+//
+// Info levels for EnumServicesStatusEx
+//
+typedef enum _SC_ENUM_TYPE {
+        SC_ENUM_PROCESS_INFO        = 0
+} SC_ENUM_TYPE;
+
+
+//
+// Service Status Structures
+//
+
+typedef struct _SERVICE_STATUS {
+    DWORD   dwServiceType;
+    DWORD   dwCurrentState;
+    DWORD   dwControlsAccepted;
+    DWORD   dwWin32ExitCode;
+    DWORD   dwServiceSpecificExitCode;
+    DWORD   dwCheckPoint;
+    DWORD   dwWaitHint;
+} SERVICE_STATUS, *LPSERVICE_STATUS;
+
+typedef struct _SERVICE_STATUS_PROCESS {
+    DWORD   dwServiceType;
+    DWORD   dwCurrentState;
+    DWORD   dwControlsAccepted;
+    DWORD   dwWin32ExitCode;
+    DWORD   dwServiceSpecificExitCode;
+    DWORD   dwCheckPoint;
+    DWORD   dwWaitHint;
+    DWORD   dwProcessId;
+    DWORD   dwServiceFlags;
+} SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS;
+
+
+//
+// Service Status Enumeration Structure
+//
+
+typedef struct _ENUM_SERVICE_STATUSA {
+    LPSTR             lpServiceName;
+    LPSTR             lpDisplayName;
+    SERVICE_STATUS    ServiceStatus;
+} ENUM_SERVICE_STATUSA, *LPENUM_SERVICE_STATUSA;
+typedef struct _ENUM_SERVICE_STATUSW {
+    LPWSTR            lpServiceName;
+    LPWSTR            lpDisplayName;
+    SERVICE_STATUS    ServiceStatus;
+} ENUM_SERVICE_STATUSW, *LPENUM_SERVICE_STATUSW;
+#ifdef UNICODE
+typedef ENUM_SERVICE_STATUSW ENUM_SERVICE_STATUS;
+typedef LPENUM_SERVICE_STATUSW LPENUM_SERVICE_STATUS;
+#else
+typedef ENUM_SERVICE_STATUSA ENUM_SERVICE_STATUS;
+typedef LPENUM_SERVICE_STATUSA LPENUM_SERVICE_STATUS;
+#endif // UNICODE
+
+typedef struct _ENUM_SERVICE_STATUS_PROCESSA {
+    LPSTR                     lpServiceName;
+    LPSTR                     lpDisplayName;
+    SERVICE_STATUS_PROCESS    ServiceStatusProcess;
+} ENUM_SERVICE_STATUS_PROCESSA, *LPENUM_SERVICE_STATUS_PROCESSA;
+typedef struct _ENUM_SERVICE_STATUS_PROCESSW {
+    LPWSTR                    lpServiceName;
+    LPWSTR                    lpDisplayName;
+    SERVICE_STATUS_PROCESS    ServiceStatusProcess;
+} ENUM_SERVICE_STATUS_PROCESSW, *LPENUM_SERVICE_STATUS_PROCESSW;
+#ifdef UNICODE
+typedef ENUM_SERVICE_STATUS_PROCESSW ENUM_SERVICE_STATUS_PROCESS;
+typedef LPENUM_SERVICE_STATUS_PROCESSW LPENUM_SERVICE_STATUS_PROCESS;
+#else
+typedef ENUM_SERVICE_STATUS_PROCESSA ENUM_SERVICE_STATUS_PROCESS;
+typedef LPENUM_SERVICE_STATUS_PROCESSA LPENUM_SERVICE_STATUS_PROCESS;
+#endif // UNICODE
+
+//
+// Structures for the Lock API functions
+//
+
+typedef LPVOID  SC_LOCK;
+
+typedef struct _QUERY_SERVICE_LOCK_STATUSA {
+    DWORD   fIsLocked;
+    LPSTR   lpLockOwner;
+    DWORD   dwLockDuration;
+} QUERY_SERVICE_LOCK_STATUSA, *LPQUERY_SERVICE_LOCK_STATUSA;
+typedef struct _QUERY_SERVICE_LOCK_STATUSW {
+    DWORD   fIsLocked;
+    LPWSTR  lpLockOwner;
+    DWORD   dwLockDuration;
+} QUERY_SERVICE_LOCK_STATUSW, *LPQUERY_SERVICE_LOCK_STATUSW;
+#ifdef UNICODE
+typedef QUERY_SERVICE_LOCK_STATUSW QUERY_SERVICE_LOCK_STATUS;
+typedef LPQUERY_SERVICE_LOCK_STATUSW LPQUERY_SERVICE_LOCK_STATUS;
+#else
+typedef QUERY_SERVICE_LOCK_STATUSA QUERY_SERVICE_LOCK_STATUS;
+typedef LPQUERY_SERVICE_LOCK_STATUSA LPQUERY_SERVICE_LOCK_STATUS;
+#endif // UNICODE
+
+
+
+//
+// Query Service Configuration Structure
+//
+
+typedef struct _QUERY_SERVICE_CONFIGA {
+    DWORD   dwServiceType;
+    DWORD   dwStartType;
+    DWORD   dwErrorControl;
+    LPSTR   lpBinaryPathName;
+    LPSTR   lpLoadOrderGroup;
+    DWORD   dwTagId;
+    LPSTR   lpDependencies;
+    LPSTR   lpServiceStartName;
+    LPSTR   lpDisplayName;
+} QUERY_SERVICE_CONFIGA, *LPQUERY_SERVICE_CONFIGA;
+typedef struct _QUERY_SERVICE_CONFIGW {
+    DWORD   dwServiceType;
+    DWORD   dwStartType;
+    DWORD   dwErrorControl;
+    LPWSTR  lpBinaryPathName;
+    LPWSTR  lpLoadOrderGroup;
+    DWORD   dwTagId;
+    LPWSTR  lpDependencies;
+    LPWSTR  lpServiceStartName;
+    LPWSTR  lpDisplayName;
+} QUERY_SERVICE_CONFIGW, *LPQUERY_SERVICE_CONFIGW;
+#ifdef UNICODE
+typedef QUERY_SERVICE_CONFIGW QUERY_SERVICE_CONFIG;
+typedef LPQUERY_SERVICE_CONFIGW LPQUERY_SERVICE_CONFIG;
+#else
+typedef QUERY_SERVICE_CONFIGA QUERY_SERVICE_CONFIG;
+typedef LPQUERY_SERVICE_CONFIGA LPQUERY_SERVICE_CONFIG;
+#endif // UNICODE
+
+
+
+//
+// Function Prototype for the Service Main Function
+//
+
+typedef VOID (WINAPI *LPSERVICE_MAIN_FUNCTIONW)(
+    DWORD   dwNumServicesArgs,
+    LPWSTR  *lpServiceArgVectors
+    );
+
+typedef VOID (WINAPI *LPSERVICE_MAIN_FUNCTIONA)(
+    DWORD   dwNumServicesArgs,
+    LPSTR   *lpServiceArgVectors
+    );
+
+#ifdef UNICODE
+#define LPSERVICE_MAIN_FUNCTION LPSERVICE_MAIN_FUNCTIONW
+#else
+#define LPSERVICE_MAIN_FUNCTION LPSERVICE_MAIN_FUNCTIONA
+#endif //UNICODE
+
+
+//
+// Service Start Table
+//
+
+typedef struct _SERVICE_TABLE_ENTRYA {
+    LPSTR                       lpServiceName;
+    LPSERVICE_MAIN_FUNCTIONA    lpServiceProc;
+}SERVICE_TABLE_ENTRYA, *LPSERVICE_TABLE_ENTRYA;
+typedef struct _SERVICE_TABLE_ENTRYW {
+    LPWSTR                      lpServiceName;
+    LPSERVICE_MAIN_FUNCTIONW    lpServiceProc;
+}SERVICE_TABLE_ENTRYW, *LPSERVICE_TABLE_ENTRYW;
+#ifdef UNICODE
+typedef SERVICE_TABLE_ENTRYW SERVICE_TABLE_ENTRY;
+typedef LPSERVICE_TABLE_ENTRYW LPSERVICE_TABLE_ENTRY;
+#else
+typedef SERVICE_TABLE_ENTRYA SERVICE_TABLE_ENTRY;
+typedef LPSERVICE_TABLE_ENTRYA LPSERVICE_TABLE_ENTRY;
+#endif // UNICODE
+
+//
+// Prototype for the Service Control Handler Function
+//
+
+typedef VOID (WINAPI *LPHANDLER_FUNCTION)(
+    DWORD    dwControl
+    );
+
+typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(
+    DWORD    dwControl,
+    DWORD    dwEventType,
+    LPVOID   lpEventData,
+    LPVOID   lpContext
+    );
+
+
+///////////////////////////////////////////////////////////////////////////
+// API Function Prototypes
+///////////////////////////////////////////////////////////////////////////
+
+WINADVAPI
+BOOL
+WINAPI
+ChangeServiceConfigA(
+    __in        SC_HANDLE    hService,
+    __in        DWORD        dwServiceType,
+    __in        DWORD        dwStartType,
+    __in        DWORD        dwErrorControl,
+    __in_opt    LPCSTR     lpBinaryPathName,
+    __in_opt    LPCSTR     lpLoadOrderGroup,
+    __out_opt   LPDWORD      lpdwTagId,
+    __in_opt    LPCSTR     lpDependencies,
+    __in_opt    LPCSTR     lpServiceStartName,
+    __in_opt    LPCSTR     lpPassword,
+    __in_opt    LPCSTR     lpDisplayName
+    );
+WINADVAPI
+BOOL
+WINAPI
+ChangeServiceConfigW(
+    __in        SC_HANDLE    hService,
+    __in        DWORD        dwServiceType,
+    __in        DWORD        dwStartType,
+    __in        DWORD        dwErrorControl,
+    __in_opt    LPCWSTR     lpBinaryPathName,
+    __in_opt    LPCWSTR     lpLoadOrderGroup,
+    __out_opt   LPDWORD      lpdwTagId,
+    __in_opt    LPCWSTR     lpDependencies,
+    __in_opt    LPCWSTR     lpServiceStartName,
+    __in_opt    LPCWSTR     lpPassword,
+    __in_opt    LPCWSTR     lpDisplayName
+    );
+#ifdef UNICODE
+#define ChangeServiceConfig  ChangeServiceConfigW
+#else
+#define ChangeServiceConfig  ChangeServiceConfigA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+ChangeServiceConfig2A(
+    __in        SC_HANDLE    hService,
+    __in        DWORD        dwInfoLevel,
+    __in_opt    LPVOID       lpInfo
+    );
+WINADVAPI
+BOOL
+WINAPI
+ChangeServiceConfig2W(
+    __in        SC_HANDLE    hService,
+    __in        DWORD        dwInfoLevel,
+    __in_opt    LPVOID       lpInfo
+    );
+#ifdef UNICODE
+#define ChangeServiceConfig2  ChangeServiceConfig2W
+#else
+#define ChangeServiceConfig2  ChangeServiceConfig2A
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+CloseServiceHandle(
+    __in        SC_HANDLE   hSCObject
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+ControlService(
+    __in        SC_HANDLE           hService,
+    __in        DWORD               dwControl,
+    __out       LPSERVICE_STATUS    lpServiceStatus
+    );
+
+__checkReturn
+WINADVAPI
+SC_HANDLE
+WINAPI
+CreateServiceA(
+    __in        SC_HANDLE    hSCManager,
+    __in        LPCSTR     lpServiceName,
+    __in_opt    LPCSTR     lpDisplayName,
+    __in        DWORD        dwDesiredAccess,
+    __in        DWORD        dwServiceType,
+    __in        DWORD        dwStartType,
+    __in        DWORD        dwErrorControl,
+    __in_opt    LPCSTR     lpBinaryPathName,
+    __in_opt    LPCSTR     lpLoadOrderGroup,
+    __out_opt   LPDWORD      lpdwTagId,
+    __in_opt    LPCSTR     lpDependencies,
+    __in_opt    LPCSTR     lpServiceStartName,
+    __in_opt    LPCSTR     lpPassword
+    );
+__checkReturn
+WINADVAPI
+SC_HANDLE
+WINAPI
+CreateServiceW(
+    __in        SC_HANDLE    hSCManager,
+    __in        LPCWSTR     lpServiceName,
+    __in_opt    LPCWSTR     lpDisplayName,
+    __in        DWORD        dwDesiredAccess,
+    __in        DWORD        dwServiceType,
+    __in        DWORD        dwStartType,
+    __in        DWORD        dwErrorControl,
+    __in_opt    LPCWSTR     lpBinaryPathName,
+    __in_opt    LPCWSTR     lpLoadOrderGroup,
+    __out_opt   LPDWORD      lpdwTagId,
+    __in_opt    LPCWSTR     lpDependencies,
+    __in_opt    LPCWSTR     lpServiceStartName,
+    __in_opt    LPCWSTR     lpPassword
+    );
+#ifdef UNICODE
+#define CreateService  CreateServiceW
+#else
+#define CreateService  CreateServiceA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+DeleteService(
+    __in        SC_HANDLE   hService
+    );
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+EnumDependentServicesA(
+    __in            SC_HANDLE               hService,
+    __in            DWORD                   dwServiceState,
+    __out_bcount_opt(cbBufSize)     
+                    LPENUM_SERVICE_STATUSA  lpServices,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded,
+    __out           LPDWORD                 lpServicesReturned
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+EnumDependentServicesW(
+    __in            SC_HANDLE               hService,
+    __in            DWORD                   dwServiceState,
+    __out_bcount_opt(cbBufSize)     
+                    LPENUM_SERVICE_STATUSW  lpServices,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded,
+    __out           LPDWORD                 lpServicesReturned
+    );
+#ifdef UNICODE
+#define EnumDependentServices  EnumDependentServicesW
+#else
+#define EnumDependentServices  EnumDependentServicesA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+EnumServicesStatusA(
+    __in            SC_HANDLE               hSCManager,
+    __in            DWORD                   dwServiceType,
+    __in            DWORD                   dwServiceState,
+    __out_bcount_opt(cbBufSize)
+                    LPENUM_SERVICE_STATUSA  lpServices,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded,
+    __out           LPDWORD                 lpServicesReturned,
+    __inout_opt     LPDWORD                 lpResumeHandle
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+EnumServicesStatusW(
+    __in            SC_HANDLE               hSCManager,
+    __in            DWORD                   dwServiceType,
+    __in            DWORD                   dwServiceState,
+    __out_bcount_opt(cbBufSize)
+                    LPENUM_SERVICE_STATUSW  lpServices,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded,
+    __out           LPDWORD                 lpServicesReturned,
+    __inout_opt     LPDWORD                 lpResumeHandle
+    );
+#ifdef UNICODE
+#define EnumServicesStatus  EnumServicesStatusW
+#else
+#define EnumServicesStatus  EnumServicesStatusA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+EnumServicesStatusExA(
+    __in            SC_HANDLE               hSCManager,
+    __in            SC_ENUM_TYPE            InfoLevel,
+    __in            DWORD                   dwServiceType,
+    __in            DWORD                   dwServiceState,
+    __out_bcount_opt(cbBufSize) 
+                    LPBYTE                  lpServices,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded,
+    __out           LPDWORD                 lpServicesReturned,
+    __inout_opt     LPDWORD                 lpResumeHandle,
+    __in_opt        LPCSTR                pszGroupName
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+EnumServicesStatusExW(
+    __in            SC_HANDLE               hSCManager,
+    __in            SC_ENUM_TYPE            InfoLevel,
+    __in            DWORD                   dwServiceType,
+    __in            DWORD                   dwServiceState,
+    __out_bcount_opt(cbBufSize) 
+                    LPBYTE                  lpServices,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded,
+    __out           LPDWORD                 lpServicesReturned,
+    __inout_opt     LPDWORD                 lpResumeHandle,
+    __in_opt        LPCWSTR                pszGroupName
+    );
+#ifdef UNICODE
+#define EnumServicesStatusEx  EnumServicesStatusExW
+#else
+#define EnumServicesStatusEx  EnumServicesStatusExA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+GetServiceKeyNameA(
+    __in            SC_HANDLE               hSCManager,
+    __in            LPCSTR                lpDisplayName,
+    __out_ecount_opt(*lpcchBuffer)
+                    LPSTR                 lpServiceName,
+    __inout         LPDWORD                 lpcchBuffer
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+GetServiceKeyNameW(
+    __in            SC_HANDLE               hSCManager,
+    __in            LPCWSTR                lpDisplayName,
+    __out_ecount_opt(*lpcchBuffer)
+                    LPWSTR                 lpServiceName,
+    __inout         LPDWORD                 lpcchBuffer
+    );
+#ifdef UNICODE
+#define GetServiceKeyName  GetServiceKeyNameW
+#else
+#define GetServiceKeyName  GetServiceKeyNameA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+GetServiceDisplayNameA(
+    __in            SC_HANDLE               hSCManager,
+    __in            LPCSTR                lpServiceName,
+    __out_ecount_opt(*lpcchBuffer) 
+                    LPSTR                 lpDisplayName,
+    __inout         LPDWORD                 lpcchBuffer
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+GetServiceDisplayNameW(
+    __in            SC_HANDLE               hSCManager,
+    __in            LPCWSTR                lpServiceName,
+    __out_ecount_opt(*lpcchBuffer) 
+                    LPWSTR                 lpDisplayName,
+    __inout         LPDWORD                 lpcchBuffer
+    );
+#ifdef UNICODE
+#define GetServiceDisplayName  GetServiceDisplayNameW
+#else
+#define GetServiceDisplayName  GetServiceDisplayNameA
+#endif // !UNICODE
+
+WINADVAPI
+SC_LOCK
+WINAPI
+LockServiceDatabase(
+    __in            SC_HANDLE               hSCManager
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+NotifyBootConfigStatus(
+    __in            BOOL                    BootAcceptable
+    );
+
+__checkReturn
+WINADVAPI
+SC_HANDLE
+WINAPI
+OpenSCManagerA(
+    __in_opt        LPCSTR                lpMachineName,
+    __in_opt        LPCSTR                lpDatabaseName,
+    __in            DWORD                   dwDesiredAccess
+    );
+__checkReturn
+WINADVAPI
+SC_HANDLE
+WINAPI
+OpenSCManagerW(
+    __in_opt        LPCWSTR                lpMachineName,
+    __in_opt        LPCWSTR                lpDatabaseName,
+    __in            DWORD                   dwDesiredAccess
+    );
+#ifdef UNICODE
+#define OpenSCManager  OpenSCManagerW
+#else
+#define OpenSCManager  OpenSCManagerA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+SC_HANDLE
+WINAPI
+OpenServiceA(
+    __in            SC_HANDLE               hSCManager,
+    __in            LPCSTR                lpServiceName,
+    __in            DWORD                   dwDesiredAccess
+    );
+__checkReturn
+WINADVAPI
+SC_HANDLE
+WINAPI
+OpenServiceW(
+    __in            SC_HANDLE               hSCManager,
+    __in            LPCWSTR                lpServiceName,
+    __in            DWORD                   dwDesiredAccess
+    );
+#ifdef UNICODE
+#define OpenService  OpenServiceW
+#else
+#define OpenService  OpenServiceA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceConfigA(
+    __in            SC_HANDLE               hService,
+    __out_bcount_opt(cbBufSize)      
+                    LPQUERY_SERVICE_CONFIGA lpServiceConfig,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceConfigW(
+    __in            SC_HANDLE               hService,
+    __out_bcount_opt(cbBufSize)      
+                    LPQUERY_SERVICE_CONFIGW lpServiceConfig,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded
+    );
+#ifdef UNICODE
+#define QueryServiceConfig  QueryServiceConfigW
+#else
+#define QueryServiceConfig  QueryServiceConfigA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceConfig2A(
+    __in            SC_HANDLE               hService,
+    __in            DWORD                   dwInfoLevel,
+    __out_bcount_opt(cbBufSize) 
+                    LPBYTE                  lpBuffer,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceConfig2W(
+    __in            SC_HANDLE               hService,
+    __in            DWORD                   dwInfoLevel,
+    __out_bcount_opt(cbBufSize) 
+                    LPBYTE                  lpBuffer,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded
+    );
+#ifdef UNICODE
+#define QueryServiceConfig2  QueryServiceConfig2W
+#else
+#define QueryServiceConfig2  QueryServiceConfig2A
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceLockStatusA(
+    __in            SC_HANDLE                       hSCManager,
+    __out_bcount_opt(cbBufSize) 
+                    LPQUERY_SERVICE_LOCK_STATUSA    lpLockStatus,
+    __in            DWORD                           cbBufSize,
+    __out           LPDWORD                         pcbBytesNeeded
+    );
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceLockStatusW(
+    __in            SC_HANDLE                       hSCManager,
+    __out_bcount_opt(cbBufSize) 
+                    LPQUERY_SERVICE_LOCK_STATUSW    lpLockStatus,
+    __in            DWORD                           cbBufSize,
+    __out           LPDWORD                         pcbBytesNeeded
+    );
+#ifdef UNICODE
+#define QueryServiceLockStatus  QueryServiceLockStatusW
+#else
+#define QueryServiceLockStatus  QueryServiceLockStatusA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceObjectSecurity(
+    __in            SC_HANDLE               hService,
+    __in            SECURITY_INFORMATION    dwSecurityInformation,
+    __out_bcount_opt(cbBufSize) 
+                    PSECURITY_DESCRIPTOR    lpSecurityDescriptor,
+    __in            DWORD                   cbBufSize,
+    __out           LPDWORD                 pcbBytesNeeded
+    );
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceStatus(
+    __in            SC_HANDLE           hService,
+    __out           LPSERVICE_STATUS    lpServiceStatus
+    );
+
+__checkReturn
+WINADVAPI
+BOOL
+WINAPI
+QueryServiceStatusEx(
+    __in            SC_HANDLE           hService,
+    __in            SC_STATUS_TYPE      InfoLevel,
+    __out_bcount_opt(cbBufSize) 
+                    LPBYTE              lpBuffer,
+    __in            DWORD               cbBufSize,
+    __out           LPDWORD             pcbBytesNeeded
+    );
+
+__checkReturn
+WINADVAPI
+SERVICE_STATUS_HANDLE
+WINAPI
+RegisterServiceCtrlHandlerA(
+    __in    LPCSTR                    lpServiceName,
+    __in    __callback  
+            LPHANDLER_FUNCTION          lpHandlerProc
+    );
+__checkReturn
+WINADVAPI
+SERVICE_STATUS_HANDLE
+WINAPI
+RegisterServiceCtrlHandlerW(
+    __in    LPCWSTR                    lpServiceName,
+    __in    __callback  
+            LPHANDLER_FUNCTION          lpHandlerProc
+    );
+#ifdef UNICODE
+#define RegisterServiceCtrlHandler  RegisterServiceCtrlHandlerW
+#else
+#define RegisterServiceCtrlHandler  RegisterServiceCtrlHandlerA
+#endif // !UNICODE
+
+__checkReturn
+WINADVAPI
+SERVICE_STATUS_HANDLE
+WINAPI
+RegisterServiceCtrlHandlerExA(
+    __in    LPCSTR                    lpServiceName,
+    __in    __callback
+            LPHANDLER_FUNCTION_EX       lpHandlerProc,
+    __in_opt LPVOID                     lpContext
+    );
+__checkReturn
+WINADVAPI
+SERVICE_STATUS_HANDLE
+WINAPI
+RegisterServiceCtrlHandlerExW(
+    __in    LPCWSTR                    lpServiceName,
+    __in    __callback
+            LPHANDLER_FUNCTION_EX       lpHandlerProc,
+    __in_opt LPVOID                     lpContext
+    );
+#ifdef UNICODE
+#define RegisterServiceCtrlHandlerEx  RegisterServiceCtrlHandlerExW
+#else
+#define RegisterServiceCtrlHandlerEx  RegisterServiceCtrlHandlerExA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+SetServiceObjectSecurity(
+    __in        SC_HANDLE               hService,
+    __in        SECURITY_INFORMATION    dwSecurityInformation,
+    __in        PSECURITY_DESCRIPTOR    lpSecurityDescriptor
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+SetServiceStatus(
+    __in        SERVICE_STATUS_HANDLE   hServiceStatus,
+    __in        LPSERVICE_STATUS        lpServiceStatus
+    );
+
+WINADVAPI
+BOOL
+WINAPI
+StartServiceCtrlDispatcherA(
+    __in CONST  SERVICE_TABLE_ENTRYA    *lpServiceStartTable
+    );
+WINADVAPI
+BOOL
+WINAPI
+StartServiceCtrlDispatcherW(
+    __in CONST  SERVICE_TABLE_ENTRYW    *lpServiceStartTable
+    );
+#ifdef UNICODE
+#define StartServiceCtrlDispatcher  StartServiceCtrlDispatcherW
+#else
+#define StartServiceCtrlDispatcher  StartServiceCtrlDispatcherA
+#endif // !UNICODE
+
+
+WINADVAPI
+BOOL
+WINAPI
+StartServiceA(
+    __in            SC_HANDLE            hService,
+    __in            DWORD                dwNumServiceArgs,
+    __in_ecount_opt(dwNumServiceArgs)       
+                    LPCSTR             *lpServiceArgVectors
+    );
+WINADVAPI
+BOOL
+WINAPI
+StartServiceW(
+    __in            SC_HANDLE            hService,
+    __in            DWORD                dwNumServiceArgs,
+    __in_ecount_opt(dwNumServiceArgs)       
+                    LPCWSTR             *lpServiceArgVectors
+    );
+#ifdef UNICODE
+#define StartService  StartServiceW
+#else
+#define StartService  StartServiceA
+#endif // !UNICODE
+
+WINADVAPI
+BOOL
+WINAPI
+UnlockServiceDatabase(
+    __in            SC_LOCK             ScLock
+    );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _WINSVC_
diff --git a/base/Windows/Inc/WinUser.h b/base/Windows/Inc/WinUser.h
new file mode 100644
index 0000000..516c472
--- /dev/null
+++ b/base/Windows/Inc/WinUser.h
@@ -0,0 +1,11835 @@
+/****************************************************************************
+*                                                                           *
+* winuser.h -- USER procedure declarations, constant definitions and macros *
+*                                                                           *
+* Copyright (c) Microsoft Corporation. All rights reserved.                          *
+*                                                                           *
+****************************************************************************/
+
+
+
+#ifndef _WINUSER_
+#define _WINUSER_
+
+
+
+//
+// Define API decoration for direct importing of DLL references.
+//
+
+#if !defined(_USER32_)
+#define WINUSERAPI DECLSPEC_IMPORT
+#else
+#define WINUSERAPI
+#endif
+
+#ifdef _MAC
+#include <macwin32.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifndef WINVER
+#define WINVER  0x0500      /* version 5.0 */
+#endif /* !WINVER */
+
+#include <stdarg.h>
+
+#ifndef NOUSER
+
+typedef HANDLE HDWP;
+typedef VOID MENUTEMPLATEA;
+typedef VOID MENUTEMPLATEW;
+#ifdef UNICODE
+typedef MENUTEMPLATEW MENUTEMPLATE;
+#else
+typedef MENUTEMPLATEA MENUTEMPLATE;
+#endif // UNICODE
+typedef PVOID LPMENUTEMPLATEA;
+typedef PVOID LPMENUTEMPLATEW;
+#ifdef UNICODE
+typedef LPMENUTEMPLATEW LPMENUTEMPLATE;
+#else
+typedef LPMENUTEMPLATEA LPMENUTEMPLATE;
+#endif // UNICODE
+
+typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM);
+
+#ifdef STRICT
+
+typedef INT_PTR (CALLBACK* DLGPROC)(HWND, UINT, WPARAM, LPARAM);
+typedef VOID (CALLBACK* TIMERPROC)(HWND, UINT, UINT_PTR, DWORD);
+typedef BOOL (CALLBACK* GRAYSTRINGPROC)(HDC, LPARAM, int);
+typedef BOOL (CALLBACK* WNDENUMPROC)(HWND, LPARAM);
+typedef LRESULT (CALLBACK* HOOKPROC)(int code, WPARAM wParam, LPARAM lParam);
+typedef VOID (CALLBACK* SENDASYNCPROC)(HWND, UINT, ULONG_PTR, LRESULT);
+
+typedef BOOL (CALLBACK* PROPENUMPROCA)(HWND, LPCSTR, HANDLE);
+typedef BOOL (CALLBACK* PROPENUMPROCW)(HWND, LPCWSTR, HANDLE);
+
+typedef BOOL (CALLBACK* PROPENUMPROCEXA)(HWND, LPSTR, HANDLE, ULONG_PTR);
+typedef BOOL (CALLBACK* PROPENUMPROCEXW)(HWND, LPWSTR, HANDLE, ULONG_PTR);
+
+typedef int (CALLBACK* EDITWORDBREAKPROCA)(LPSTR lpch, int ichCurrent, int cch, int code);
+typedef int (CALLBACK* EDITWORDBREAKPROCW)(LPWSTR lpch, int ichCurrent, int cch, int code);
+
+#if(WINVER >= 0x0400)
+typedef BOOL (CALLBACK* DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int cx, int cy);
+#endif /* WINVER >= 0x0400 */
+#else /* !STRICT */
+
+typedef FARPROC DLGPROC;
+typedef FARPROC TIMERPROC;
+typedef FARPROC GRAYSTRINGPROC;
+typedef FARPROC WNDENUMPROC;
+typedef FARPROC HOOKPROC;
+typedef FARPROC SENDASYNCPROC;
+
+typedef FARPROC EDITWORDBREAKPROCA;
+typedef FARPROC EDITWORDBREAKPROCW;
+
+typedef FARPROC PROPENUMPROCA;
+typedef FARPROC PROPENUMPROCW;
+
+typedef FARPROC PROPENUMPROCEXA;
+typedef FARPROC PROPENUMPROCEXW;
+
+#if(WINVER >= 0x0400)
+typedef FARPROC DRAWSTATEPROC;
+#endif /* WINVER >= 0x0400 */
+#endif /* !STRICT */
+
+#ifdef UNICODE
+typedef PROPENUMPROCW        PROPENUMPROC;
+typedef PROPENUMPROCEXW      PROPENUMPROCEX;
+typedef EDITWORDBREAKPROCW   EDITWORDBREAKPROC;
+#else  /* !UNICODE */
+typedef PROPENUMPROCA        PROPENUMPROC;
+typedef PROPENUMPROCEXA      PROPENUMPROCEX;
+typedef EDITWORDBREAKPROCA   EDITWORDBREAKPROC;
+#endif /* UNICODE */
+
+#ifdef STRICT
+
+typedef BOOL (CALLBACK* NAMEENUMPROCA)(LPSTR, LPARAM);
+typedef BOOL (CALLBACK* NAMEENUMPROCW)(LPWSTR, LPARAM);
+
+typedef NAMEENUMPROCA   WINSTAENUMPROCA;
+typedef NAMEENUMPROCA   DESKTOPENUMPROCA;
+typedef NAMEENUMPROCW   WINSTAENUMPROCW;
+typedef NAMEENUMPROCW   DESKTOPENUMPROCW;
+
+
+#else /* !STRICT */
+
+typedef FARPROC NAMEENUMPROCA;
+typedef FARPROC NAMEENUMPROCW;
+typedef FARPROC WINSTAENUMPROCA;
+typedef FARPROC DESKTOPENUMPROCA;
+typedef FARPROC WINSTAENUMPROCW;
+typedef FARPROC DESKTOPENUMPROCW;
+
+
+#endif /* !STRICT */
+
+#ifdef UNICODE
+typedef WINSTAENUMPROCW     WINSTAENUMPROC;
+typedef DESKTOPENUMPROCW    DESKTOPENUMPROC;
+
+
+#else  /* !UNICODE */
+typedef WINSTAENUMPROCA     WINSTAENUMPROC;
+typedef DESKTOPENUMPROCA    DESKTOPENUMPROC;
+
+#endif /* UNICODE */
+
+#define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
+#define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i)))
+#define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i)))
+#ifdef UNICODE
+#define MAKEINTRESOURCE  MAKEINTRESOURCEW
+#else
+#define MAKEINTRESOURCE  MAKEINTRESOURCEA
+#endif // !UNICODE
+
+#ifndef NORESOURCE
+
+/*
+ * Predefined Resource Types
+ */
+#define RT_CURSOR           MAKEINTRESOURCE(1)
+#define RT_BITMAP           MAKEINTRESOURCE(2)
+#define RT_ICON             MAKEINTRESOURCE(3)
+#define RT_MENU             MAKEINTRESOURCE(4)
+#define RT_DIALOG           MAKEINTRESOURCE(5)
+#define RT_STRING           MAKEINTRESOURCE(6)
+#define RT_FONTDIR          MAKEINTRESOURCE(7)
+#define RT_FONT             MAKEINTRESOURCE(8)
+#define RT_ACCELERATOR      MAKEINTRESOURCE(9)
+#define RT_RCDATA           MAKEINTRESOURCE(10)
+#define RT_MESSAGETABLE     MAKEINTRESOURCE(11)
+
+#define DIFFERENCE     11
+#define RT_GROUP_CURSOR MAKEINTRESOURCE((ULONG_PTR)RT_CURSOR + DIFFERENCE)
+#define RT_GROUP_ICON   MAKEINTRESOURCE((ULONG_PTR)RT_ICON + DIFFERENCE)
+#define RT_VERSION      MAKEINTRESOURCE(16)
+#define RT_DLGINCLUDE   MAKEINTRESOURCE(17)
+#if(WINVER >= 0x0400)
+#define RT_PLUGPLAY     MAKEINTRESOURCE(19)
+#define RT_VXD          MAKEINTRESOURCE(20)
+#define RT_ANICURSOR    MAKEINTRESOURCE(21)
+#define RT_ANIICON      MAKEINTRESOURCE(22)
+#endif /* WINVER >= 0x0400 */
+#define RT_HTML         MAKEINTRESOURCE(23)
+#ifdef RC_INVOKED
+#define RT_MANIFEST                        24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID  1
+#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
+#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
+#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID 1   /* inclusive */
+#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID 16  /* inclusive */
+#else  /* RC_INVOKED */
+#define RT_MANIFEST                        MAKEINTRESOURCE(24)
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE( 1)
+#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2)
+#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3)
+#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE( 1 /*inclusive*/)
+#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(16 /*inclusive*/)
+#endif /* RC_INVOKED */
+
+
+#endif /* !NORESOURCE */
+
+WINUSERAPI
+int
+WINAPI
+wvsprintfA(
+    OUT LPSTR,
+    IN LPCSTR,
+    IN va_list arglist);
+WINUSERAPI
+int
+WINAPI
+wvsprintfW(
+    OUT LPWSTR,
+    IN LPCWSTR,
+    IN va_list arglist);
+#ifdef UNICODE
+#define wvsprintf  wvsprintfW
+#else
+#define wvsprintf  wvsprintfA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPIV
+wsprintfA(
+    OUT LPSTR,
+    IN LPCSTR,
+    ...);
+WINUSERAPI
+int
+WINAPIV
+wsprintfW(
+    OUT LPWSTR,
+    IN LPCWSTR,
+    ...);
+#ifdef UNICODE
+#define wsprintf  wsprintfW
+#else
+#define wsprintf  wsprintfA
+#endif // !UNICODE
+
+
+/*
+ * SPI_SETDESKWALLPAPER defined constants
+ */
+#define SETWALLPAPER_DEFAULT    ((LPWSTR)-1)
+
+#ifndef NOSCROLL
+
+/*
+ * Scroll Bar Constants
+ */
+#define SB_HORZ             0
+#define SB_VERT             1
+#define SB_CTL              2
+#define SB_BOTH             3
+
+/*
+ * Scroll Bar Commands
+ */
+#define SB_LINEUP           0
+#define SB_LINELEFT         0
+#define SB_LINEDOWN         1
+#define SB_LINERIGHT        1
+#define SB_PAGEUP           2
+#define SB_PAGELEFT         2
+#define SB_PAGEDOWN         3
+#define SB_PAGERIGHT        3
+#define SB_THUMBPOSITION    4
+#define SB_THUMBTRACK       5
+#define SB_TOP              6
+#define SB_LEFT             6
+#define SB_BOTTOM           7
+#define SB_RIGHT            7
+#define SB_ENDSCROLL        8
+
+#endif /* !NOSCROLL */
+
+#ifndef NOSHOWWINDOW
+
+
+/*
+ * ShowWindow() Commands
+ */
+#define SW_HIDE             0
+#define SW_SHOWNORMAL       1
+#define SW_NORMAL           1
+#define SW_SHOWMINIMIZED    2
+#define SW_SHOWMAXIMIZED    3
+#define SW_MAXIMIZE         3
+#define SW_SHOWNOACTIVATE   4
+#define SW_SHOW             5
+#define SW_MINIMIZE         6
+#define SW_SHOWMINNOACTIVE  7
+#define SW_SHOWNA           8
+#define SW_RESTORE          9
+#define SW_SHOWDEFAULT      10
+#define SW_FORCEMINIMIZE    11
+#define SW_MAX              11
+
+/*
+ * Old ShowWindow() Commands
+ */
+#define HIDE_WINDOW         0
+#define SHOW_OPENWINDOW     1
+#define SHOW_ICONWINDOW     2
+#define SHOW_FULLSCREEN     3
+#define SHOW_OPENNOACTIVATE 4
+
+/*
+ * Identifiers for the WM_SHOWWINDOW message
+ */
+#define SW_PARENTCLOSING    1
+#define SW_OTHERZOOM        2
+#define SW_PARENTOPENING    3
+#define SW_OTHERUNZOOM      4
+
+
+#endif /* !NOSHOWWINDOW */
+
+#if(WINVER >= 0x0500)
+/*
+ * AnimateWindow() Commands
+ */
+#define AW_HOR_POSITIVE             0x00000001
+#define AW_HOR_NEGATIVE             0x00000002
+#define AW_VER_POSITIVE             0x00000004
+#define AW_VER_NEGATIVE             0x00000008
+#define AW_CENTER                   0x00000010
+#define AW_HIDE                     0x00010000
+#define AW_ACTIVATE                 0x00020000
+#define AW_SLIDE                    0x00040000
+#define AW_BLEND                    0x00080000
+
+#endif /* WINVER >= 0x0500 */
+
+
+/*
+ * WM_KEYUP/DOWN/CHAR HIWORD(lParam) flags
+ */
+#define KF_EXTENDED       0x0100
+#define KF_DLGMODE        0x0800
+#define KF_MENUMODE       0x1000
+#define KF_ALTDOWN        0x2000
+#define KF_REPEAT         0x4000
+#define KF_UP             0x8000
+
+#ifndef NOVIRTUALKEYCODES
+
+
+/*
+ * Virtual Keys, Standard Set
+ */
+#define VK_LBUTTON        0x01
+#define VK_RBUTTON        0x02
+#define VK_CANCEL         0x03
+#define VK_MBUTTON        0x04    /* NOT contiguous with L & RBUTTON */
+
+#if(_WIN32_WINNT >= 0x0500)
+#define VK_XBUTTON1       0x05    /* NOT contiguous with L & RBUTTON */
+#define VK_XBUTTON2       0x06    /* NOT contiguous with L & RBUTTON */
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+/*
+ * 0x07 : unassigned
+ */
+
+#define VK_BACK           0x08
+#define VK_TAB            0x09
+
+/*
+ * 0x0A - 0x0B : reserved
+ */
+
+#define VK_CLEAR          0x0C
+#define VK_RETURN         0x0D
+
+#define VK_SHIFT          0x10
+#define VK_CONTROL        0x11
+#define VK_MENU           0x12
+#define VK_PAUSE          0x13
+#define VK_CAPITAL        0x14
+
+#define VK_KANA           0x15
+#define VK_HANGEUL        0x15  /* old name - should be here for compatibility */
+#define VK_HANGUL         0x15
+#define VK_JUNJA          0x17
+#define VK_FINAL          0x18
+#define VK_HANJA          0x19
+#define VK_KANJI          0x19
+
+#define VK_ESCAPE         0x1B
+
+#define VK_CONVERT        0x1C
+#define VK_NONCONVERT     0x1D
+#define VK_ACCEPT         0x1E
+#define VK_MODECHANGE     0x1F
+
+#define VK_SPACE          0x20
+#define VK_PRIOR          0x21
+#define VK_NEXT           0x22
+#define VK_END            0x23
+#define VK_HOME           0x24
+#define VK_LEFT           0x25
+#define VK_UP             0x26
+#define VK_RIGHT          0x27
+#define VK_DOWN           0x28
+#define VK_SELECT         0x29
+#define VK_PRINT          0x2A
+#define VK_EXECUTE        0x2B
+#define VK_SNAPSHOT       0x2C
+#define VK_INSERT         0x2D
+#define VK_DELETE         0x2E
+#define VK_HELP           0x2F
+
+/*
+ * VK_0 - VK_9 are the same as ASCII '0' - '9' (0x30 - 0x39)
+ * 0x40 : unassigned
+ * VK_A - VK_Z are the same as ASCII 'A' - 'Z' (0x41 - 0x5A)
+ */
+
+#define VK_LWIN           0x5B
+#define VK_RWIN           0x5C
+#define VK_APPS           0x5D
+
+/*
+ * 0x5E : reserved
+ */
+
+#define VK_SLEEP          0x5F
+
+#define VK_NUMPAD0        0x60
+#define VK_NUMPAD1        0x61
+#define VK_NUMPAD2        0x62
+#define VK_NUMPAD3        0x63
+#define VK_NUMPAD4        0x64
+#define VK_NUMPAD5        0x65
+#define VK_NUMPAD6        0x66
+#define VK_NUMPAD7        0x67
+#define VK_NUMPAD8        0x68
+#define VK_NUMPAD9        0x69
+#define VK_MULTIPLY       0x6A
+#define VK_ADD            0x6B
+#define VK_SEPARATOR      0x6C
+#define VK_SUBTRACT       0x6D
+#define VK_DECIMAL        0x6E
+#define VK_DIVIDE         0x6F
+#define VK_F1             0x70
+#define VK_F2             0x71
+#define VK_F3             0x72
+#define VK_F4             0x73
+#define VK_F5             0x74
+#define VK_F6             0x75
+#define VK_F7             0x76
+#define VK_F8             0x77
+#define VK_F9             0x78
+#define VK_F10            0x79
+#define VK_F11            0x7A
+#define VK_F12            0x7B
+#define VK_F13            0x7C
+#define VK_F14            0x7D
+#define VK_F15            0x7E
+#define VK_F16            0x7F
+#define VK_F17            0x80
+#define VK_F18            0x81
+#define VK_F19            0x82
+#define VK_F20            0x83
+#define VK_F21            0x84
+#define VK_F22            0x85
+#define VK_F23            0x86
+#define VK_F24            0x87
+
+/*
+ * 0x88 - 0x8F : unassigned
+ */
+
+#define VK_NUMLOCK        0x90
+#define VK_SCROLL         0x91
+
+/*
+ * NEC PC-9800 kbd definitions
+ */
+#define VK_OEM_NEC_EQUAL  0x92   // '=' key on numpad
+
+/*
+ * Fujitsu/OASYS kbd definitions
+ */
+#define VK_OEM_FJ_JISHO   0x92   // 'Dictionary' key
+#define VK_OEM_FJ_MASSHOU 0x93   // 'Unregister word' key
+#define VK_OEM_FJ_TOUROKU 0x94   // 'Register word' key
+#define VK_OEM_FJ_LOYA    0x95   // 'Left OYAYUBI' key
+#define VK_OEM_FJ_ROYA    0x96   // 'Right OYAYUBI' key
+
+/*
+ * 0x97 - 0x9F : unassigned
+ */
+
+/*
+ * VK_L* & VK_R* - left and right Alt, Ctrl and Shift virtual keys.
+ * Used only as parameters to GetAsyncKeyState() and GetKeyState().
+ * No other API or message will distinguish left and right keys in this way.
+ */
+#define VK_LSHIFT         0xA0
+#define VK_RSHIFT         0xA1
+#define VK_LCONTROL       0xA2
+#define VK_RCONTROL       0xA3
+#define VK_LMENU          0xA4
+#define VK_RMENU          0xA5
+
+#if(_WIN32_WINNT >= 0x0500)
+#define VK_BROWSER_BACK        0xA6
+#define VK_BROWSER_FORWARD     0xA7
+#define VK_BROWSER_REFRESH     0xA8
+#define VK_BROWSER_STOP        0xA9
+#define VK_BROWSER_SEARCH      0xAA
+#define VK_BROWSER_FAVORITES   0xAB
+#define VK_BROWSER_HOME        0xAC
+
+#define VK_VOLUME_MUTE         0xAD
+#define VK_VOLUME_DOWN         0xAE
+#define VK_VOLUME_UP           0xAF
+#define VK_MEDIA_NEXT_TRACK    0xB0
+#define VK_MEDIA_PREV_TRACK    0xB1
+#define VK_MEDIA_STOP          0xB2
+#define VK_MEDIA_PLAY_PAUSE    0xB3
+#define VK_LAUNCH_MAIL         0xB4
+#define VK_LAUNCH_MEDIA_SELECT 0xB5
+#define VK_LAUNCH_APP1         0xB6
+#define VK_LAUNCH_APP2         0xB7
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+/*
+ * 0xB8 - 0xB9 : reserved
+ */
+
+#define VK_OEM_1          0xBA   // ';:' for US
+#define VK_OEM_PLUS       0xBB   // '+' any country
+#define VK_OEM_COMMA      0xBC   // ',' any country
+#define VK_OEM_MINUS      0xBD   // '-' any country
+#define VK_OEM_PERIOD     0xBE   // '.' any country
+#define VK_OEM_2          0xBF   // '/?' for US
+#define VK_OEM_3          0xC0   // '`~' for US
+
+/*
+ * 0xC1 - 0xD7 : reserved
+ */
+
+/*
+ * 0xD8 - 0xDA : unassigned
+ */
+
+#define VK_OEM_4          0xDB  //  '[{' for US
+#define VK_OEM_5          0xDC  //  '\|' for US
+#define VK_OEM_6          0xDD  //  ']}' for US
+#define VK_OEM_7          0xDE  //  ''"' for US
+#define VK_OEM_8          0xDF
+
+/*
+ * 0xE0 : reserved
+ */
+
+/*
+ * Various extended or enhanced keyboards
+ */
+#define VK_OEM_AX         0xE1  //  'AX' key on Japanese AX kbd
+#define VK_OEM_102        0xE2  //  "<>" or "\|" on RT 102-key kbd.
+#define VK_ICO_HELP       0xE3  //  Help key on ICO
+#define VK_ICO_00         0xE4  //  00 key on ICO
+
+#if(WINVER >= 0x0400)
+#define VK_PROCESSKEY     0xE5
+#endif /* WINVER >= 0x0400 */
+
+#define VK_ICO_CLEAR      0xE6
+
+
+#if(_WIN32_WINNT >= 0x0500)
+#define VK_PACKET         0xE7
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+/*
+ * 0xE8 : unassigned
+ */
+
+/*
+ * Nokia/Ericsson definitions
+ */
+#define VK_OEM_RESET      0xE9
+#define VK_OEM_JUMP       0xEA
+#define VK_OEM_PA1        0xEB
+#define VK_OEM_PA2        0xEC
+#define VK_OEM_PA3        0xED
+#define VK_OEM_WSCTRL     0xEE
+#define VK_OEM_CUSEL      0xEF
+#define VK_OEM_ATTN       0xF0
+#define VK_OEM_FINISH     0xF1
+#define VK_OEM_COPY       0xF2
+#define VK_OEM_AUTO       0xF3
+#define VK_OEM_ENLW       0xF4
+#define VK_OEM_BACKTAB    0xF5
+
+#define VK_ATTN           0xF6
+#define VK_CRSEL          0xF7
+#define VK_EXSEL          0xF8
+#define VK_EREOF          0xF9
+#define VK_PLAY           0xFA
+#define VK_ZOOM           0xFB
+#define VK_NONAME         0xFC
+#define VK_PA1            0xFD
+#define VK_OEM_CLEAR      0xFE
+
+/*
+ * 0xFF : reserved
+ */
+
+
+#endif /* !NOVIRTUALKEYCODES */
+
+#ifndef NOWH
+
+/*
+ * SetWindowsHook() codes
+ */
+#define WH_MIN              (-1)
+#define WH_MSGFILTER        (-1)
+#define WH_JOURNALRECORD    0
+#define WH_JOURNALPLAYBACK  1
+#define WH_KEYBOARD         2
+#define WH_GETMESSAGE       3
+#define WH_CALLWNDPROC      4
+#define WH_CBT              5
+#define WH_SYSMSGFILTER     6
+#define WH_MOUSE            7
+#if defined(_WIN32_WINDOWS)
+#define WH_HARDWARE         8
+#endif
+#define WH_DEBUG            9
+#define WH_SHELL           10
+#define WH_FOREGROUNDIDLE  11
+#if(WINVER >= 0x0400)
+#define WH_CALLWNDPROCRET  12
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0400)
+#define WH_KEYBOARD_LL     13
+#define WH_MOUSE_LL        14
+#endif // (_WIN32_WINNT >= 0x0400)
+
+#if(WINVER >= 0x0400)
+#if (_WIN32_WINNT >= 0x0400)
+#define WH_MAX             14
+#else
+#define WH_MAX             12
+#endif // (_WIN32_WINNT >= 0x0400)
+#else
+#define WH_MAX             11
+#endif
+
+#define WH_MINHOOK         WH_MIN
+#define WH_MAXHOOK         WH_MAX
+
+/*
+ * Hook Codes
+ */
+#define HC_ACTION           0
+#define HC_GETNEXT          1
+#define HC_SKIP             2
+#define HC_NOREMOVE         3
+#define HC_NOREM            HC_NOREMOVE
+#define HC_SYSMODALON       4
+#define HC_SYSMODALOFF      5
+
+/*
+ * CBT Hook Codes
+ */
+#define HCBT_MOVESIZE       0
+#define HCBT_MINMAX         1
+#define HCBT_QS             2
+#define HCBT_CREATEWND      3
+#define HCBT_DESTROYWND     4
+#define HCBT_ACTIVATE       5
+#define HCBT_CLICKSKIPPED   6
+#define HCBT_KEYSKIPPED     7
+#define HCBT_SYSCOMMAND     8
+#define HCBT_SETFOCUS       9
+
+/*
+ * HCBT_CREATEWND parameters pointed to by lParam
+ */
+typedef struct tagCBT_CREATEWNDA
+{
+    struct tagCREATESTRUCTA *lpcs;
+    HWND           hwndInsertAfter;
+} CBT_CREATEWNDA, *LPCBT_CREATEWNDA;
+/*
+ * HCBT_CREATEWND parameters pointed to by lParam
+ */
+typedef struct tagCBT_CREATEWNDW
+{
+    struct tagCREATESTRUCTW *lpcs;
+    HWND           hwndInsertAfter;
+} CBT_CREATEWNDW, *LPCBT_CREATEWNDW;
+#ifdef UNICODE
+typedef CBT_CREATEWNDW CBT_CREATEWND;
+typedef LPCBT_CREATEWNDW LPCBT_CREATEWND;
+#else
+typedef CBT_CREATEWNDA CBT_CREATEWND;
+typedef LPCBT_CREATEWNDA LPCBT_CREATEWND;
+#endif // UNICODE
+
+/*
+ * HCBT_ACTIVATE structure pointed to by lParam
+ */
+typedef struct tagCBTACTIVATESTRUCT
+{
+    BOOL    fMouse;
+    HWND    hWndActive;
+} CBTACTIVATESTRUCT, *LPCBTACTIVATESTRUCT;
+
+#if(_WIN32_WINNT >= 0x0501)
+/*
+ * WTSSESSION_NOTIFICATION struct pointed by lParam, for WM_WTSSESSION_CHANGE
+ */
+typedef struct tagWTSSESSION_NOTIFICATION
+{
+    DWORD cbSize;
+    DWORD dwSessionId;
+
+} WTSSESSION_NOTIFICATION, *PWTSSESSION_NOTIFICATION;
+
+/*
+ * codes passed in WPARAM for WM_WTSSESSION_CHANGE
+ */
+
+#define WTS_CONSOLE_CONNECT                0x1
+#define WTS_CONSOLE_DISCONNECT             0x2
+#define WTS_REMOTE_CONNECT                 0x3
+#define WTS_REMOTE_DISCONNECT              0x4
+#define WTS_SESSION_LOGON                  0x5
+#define WTS_SESSION_LOGOFF                 0x6
+#define WTS_SESSION_LOCK                   0x7
+#define WTS_SESSION_UNLOCK                 0x8
+#define WTS_SESSION_REMOTE_CONTROL         0x9
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+/*
+ * WH_MSGFILTER Filter Proc Codes
+ */
+#define MSGF_DIALOGBOX      0
+#define MSGF_MESSAGEBOX     1
+#define MSGF_MENU           2
+#define MSGF_SCROLLBAR      5
+#define MSGF_NEXTWINDOW     6
+#define MSGF_MAX            8                       // unused
+#define MSGF_USER           4096
+
+/*
+ * Shell support
+ */
+#define HSHELL_WINDOWCREATED        1
+#define HSHELL_WINDOWDESTROYED      2
+#define HSHELL_ACTIVATESHELLWINDOW  3
+
+#if(WINVER >= 0x0400)
+#define HSHELL_WINDOWACTIVATED      4
+#define HSHELL_GETMINRECT           5
+#define HSHELL_REDRAW               6
+#define HSHELL_TASKMAN              7
+#define HSHELL_LANGUAGE             8
+#define HSHELL_SYSMENU              9
+#define HSHELL_ENDTASK              10
+#endif /* WINVER >= 0x0400 */
+#if(_WIN32_WINNT >= 0x0500)
+#define HSHELL_ACCESSIBILITYSTATE   11
+#define HSHELL_APPCOMMAND           12
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define HSHELL_WINDOWREPLACED       13
+#define HSHELL_WINDOWREPLACING      14
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define HSHELL_HIGHBIT            0x8000
+#define HSHELL_FLASH              (HSHELL_REDRAW|HSHELL_HIGHBIT)
+#define HSHELL_RUDEAPPACTIVATED   (HSHELL_WINDOWACTIVATED|HSHELL_HIGHBIT)
+
+#if(_WIN32_WINNT >= 0x0500)
+/* wparam for HSHELL_ACCESSIBILITYSTATE */
+#define    ACCESS_STICKYKEYS            0x0001
+#define    ACCESS_FILTERKEYS            0x0002
+#define    ACCESS_MOUSEKEYS             0x0003
+
+/* cmd for HSHELL_APPCOMMAND and WM_APPCOMMAND */
+#define APPCOMMAND_BROWSER_BACKWARD       1
+#define APPCOMMAND_BROWSER_FORWARD        2
+#define APPCOMMAND_BROWSER_REFRESH        3
+#define APPCOMMAND_BROWSER_STOP           4
+#define APPCOMMAND_BROWSER_SEARCH         5
+#define APPCOMMAND_BROWSER_FAVORITES      6
+#define APPCOMMAND_BROWSER_HOME           7
+#define APPCOMMAND_VOLUME_MUTE            8
+#define APPCOMMAND_VOLUME_DOWN            9
+#define APPCOMMAND_VOLUME_UP              10
+#define APPCOMMAND_MEDIA_NEXTTRACK        11
+#define APPCOMMAND_MEDIA_PREVIOUSTRACK    12
+#define APPCOMMAND_MEDIA_STOP             13
+#define APPCOMMAND_MEDIA_PLAY_PAUSE       14
+#define APPCOMMAND_LAUNCH_MAIL            15
+#define APPCOMMAND_LAUNCH_MEDIA_SELECT    16
+#define APPCOMMAND_LAUNCH_APP1            17
+#define APPCOMMAND_LAUNCH_APP2            18
+#define APPCOMMAND_BASS_DOWN              19
+#define APPCOMMAND_BASS_BOOST             20
+#define APPCOMMAND_BASS_UP                21
+#define APPCOMMAND_TREBLE_DOWN            22
+#define APPCOMMAND_TREBLE_UP              23
+#if(_WIN32_WINNT >= 0x0501)
+#define APPCOMMAND_MICROPHONE_VOLUME_MUTE 24
+#define APPCOMMAND_MICROPHONE_VOLUME_DOWN 25
+#define APPCOMMAND_MICROPHONE_VOLUME_UP   26
+#define APPCOMMAND_HELP                   27
+#define APPCOMMAND_FIND                   28
+#define APPCOMMAND_NEW                    29
+#define APPCOMMAND_OPEN                   30
+#define APPCOMMAND_CLOSE                  31
+#define APPCOMMAND_SAVE                   32
+#define APPCOMMAND_PRINT                  33
+#define APPCOMMAND_UNDO                   34
+#define APPCOMMAND_REDO                   35
+#define APPCOMMAND_COPY                   36
+#define APPCOMMAND_CUT                    37
+#define APPCOMMAND_PASTE                  38
+#define APPCOMMAND_REPLY_TO_MAIL          39
+#define APPCOMMAND_FORWARD_MAIL           40
+#define APPCOMMAND_SEND_MAIL              41
+#define APPCOMMAND_SPELL_CHECK            42
+#define APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE    43
+#define APPCOMMAND_MIC_ON_OFF_TOGGLE      44
+#define APPCOMMAND_CORRECTION_LIST        45
+#define APPCOMMAND_MEDIA_PLAY             46
+#define APPCOMMAND_MEDIA_PAUSE            47
+#define APPCOMMAND_MEDIA_RECORD           48
+#define APPCOMMAND_MEDIA_FAST_FORWARD     49
+#define APPCOMMAND_MEDIA_REWIND           50
+#define APPCOMMAND_MEDIA_CHANNEL_UP       51
+#define APPCOMMAND_MEDIA_CHANNEL_DOWN     52
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define FAPPCOMMAND_MOUSE 0x8000
+#define FAPPCOMMAND_KEY   0
+#define FAPPCOMMAND_OEM   0x1000
+#define FAPPCOMMAND_MASK  0xF000
+
+#define GET_APPCOMMAND_LPARAM(lParam) ((short)(HIWORD(lParam) & ~FAPPCOMMAND_MASK))
+#define GET_DEVICE_LPARAM(lParam)     ((WORD)(HIWORD(lParam) & FAPPCOMMAND_MASK))
+#define GET_MOUSEORKEY_LPARAM         GET_DEVICE_LPARAM
+#define GET_FLAGS_LPARAM(lParam)      (LOWORD(lParam))
+#define GET_KEYSTATE_LPARAM(lParam)   GET_FLAGS_LPARAM(lParam)
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+typedef struct
+{
+    HWND    hwnd;
+    RECT    rc;
+} SHELLHOOKINFO, *LPSHELLHOOKINFO;
+
+/*
+ * Message Structure used in Journaling
+ */
+typedef struct tagEVENTMSG {
+    UINT    message;
+    UINT    paramL;
+    UINT    paramH;
+    DWORD    time;
+    HWND     hwnd;
+} EVENTMSG, *PEVENTMSGMSG, NEAR *NPEVENTMSGMSG, FAR *LPEVENTMSGMSG;
+
+typedef struct tagEVENTMSG *PEVENTMSG, NEAR *NPEVENTMSG, FAR *LPEVENTMSG;
+
+/*
+ * Message structure used by WH_CALLWNDPROC
+ */
+typedef struct tagCWPSTRUCT {
+    LPARAM  lParam;
+    WPARAM  wParam;
+    UINT    message;
+    HWND    hwnd;
+} CWPSTRUCT, *PCWPSTRUCT, NEAR *NPCWPSTRUCT, FAR *LPCWPSTRUCT;
+
+#if(WINVER >= 0x0400)
+/*
+ * Message structure used by WH_CALLWNDPROCRET
+ */
+typedef struct tagCWPRETSTRUCT {
+    LRESULT lResult;
+    LPARAM  lParam;
+    WPARAM  wParam;
+    UINT    message;
+    HWND    hwnd;
+} CWPRETSTRUCT, *PCWPRETSTRUCT, NEAR *NPCWPRETSTRUCT, FAR *LPCWPRETSTRUCT;
+
+#endif /* WINVER >= 0x0400 */
+
+#if (_WIN32_WINNT >= 0x0400)
+
+/*
+ * Low level hook flags
+ */
+
+#define LLKHF_EXTENDED       (KF_EXTENDED >> 8)
+#define LLKHF_INJECTED       0x00000010
+#define LLKHF_ALTDOWN        (KF_ALTDOWN >> 8)
+#define LLKHF_UP             (KF_UP >> 8)
+
+#define LLMHF_INJECTED       0x00000001
+
+/*
+ * Structure used by WH_KEYBOARD_LL
+ */
+typedef struct tagKBDLLHOOKSTRUCT {
+    DWORD   vkCode;
+    DWORD   scanCode;
+    DWORD   flags;
+    DWORD   time;
+    ULONG_PTR dwExtraInfo;
+} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
+
+/*
+ * Structure used by WH_MOUSE_LL
+ */
+typedef struct tagMSLLHOOKSTRUCT {
+    POINT   pt;
+    DWORD   mouseData;
+    DWORD   flags;
+    DWORD   time;
+    ULONG_PTR dwExtraInfo;
+} MSLLHOOKSTRUCT, FAR *LPMSLLHOOKSTRUCT, *PMSLLHOOKSTRUCT;
+
+#endif // (_WIN32_WINNT >= 0x0400)
+
+/*
+ * Structure used by WH_DEBUG
+ */
+typedef struct tagDEBUGHOOKINFO
+{
+    DWORD   idThread;
+    DWORD   idThreadInstaller;
+    LPARAM  lParam;
+    WPARAM  wParam;
+    int     code;
+} DEBUGHOOKINFO, *PDEBUGHOOKINFO, NEAR *NPDEBUGHOOKINFO, FAR* LPDEBUGHOOKINFO;
+
+/*
+ * Structure used by WH_MOUSE
+ */
+typedef struct tagMOUSEHOOKSTRUCT {
+    POINT   pt;
+    HWND    hwnd;
+    UINT    wHitTestCode;
+    ULONG_PTR dwExtraInfo;
+} MOUSEHOOKSTRUCT, FAR *LPMOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT;
+
+#if(_WIN32_WINNT >= 0x0500)
+#ifdef __cplusplus
+typedef struct tagMOUSEHOOKSTRUCTEX : public tagMOUSEHOOKSTRUCT
+{
+    DWORD   mouseData;
+} MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX;
+#else // ndef __cplusplus
+typedef struct tagMOUSEHOOKSTRUCTEX
+{
+    MOUSEHOOKSTRUCT;
+    DWORD   mouseData;
+} MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX;
+#endif
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+/*
+ * Structure used by WH_HARDWARE
+ */
+typedef struct tagHARDWAREHOOKSTRUCT {
+    HWND    hwnd;
+    UINT    message;
+    WPARAM  wParam;
+    LPARAM  lParam;
+} HARDWAREHOOKSTRUCT, FAR *LPHARDWAREHOOKSTRUCT, *PHARDWAREHOOKSTRUCT;
+#endif /* WINVER >= 0x0400 */
+#endif /* !NOWH */
+
+/*
+ * Keyboard Layout API
+ */
+#define HKL_PREV            0
+#define HKL_NEXT            1
+
+
+#define KLF_ACTIVATE        0x00000001
+#define KLF_SUBSTITUTE_OK   0x00000002
+#define KLF_REORDER         0x00000008
+#if(WINVER >= 0x0400)
+#define KLF_REPLACELANG     0x00000010
+#define KLF_NOTELLSHELL     0x00000080
+#endif /* WINVER >= 0x0400 */
+#define KLF_SETFORPROCESS   0x00000100
+#if(_WIN32_WINNT >= 0x0500)
+#define KLF_SHIFTLOCK       0x00010000
+#define KLF_RESET           0x40000000
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#if(WINVER >= 0x0500)
+/*
+ * Bits in wParam of WM_INPUTLANGCHANGEREQUEST message
+ */
+#define INPUTLANGCHANGE_SYSCHARSET 0x0001
+#define INPUTLANGCHANGE_FORWARD    0x0002
+#define INPUTLANGCHANGE_BACKWARD   0x0004
+#endif /* WINVER >= 0x0500 */
+
+/*
+ * Size of KeyboardLayoutName (number of characters), including nul terminator
+ */
+#define KL_NAMELENGTH       9
+
+WINUSERAPI
+HKL
+WINAPI
+LoadKeyboardLayoutA(
+    IN LPCSTR pwszKLID,
+    IN UINT Flags);
+WINUSERAPI
+HKL
+WINAPI
+LoadKeyboardLayoutW(
+    IN LPCWSTR pwszKLID,
+    IN UINT Flags);
+#ifdef UNICODE
+#define LoadKeyboardLayout  LoadKeyboardLayoutW
+#else
+#define LoadKeyboardLayout  LoadKeyboardLayoutA
+#endif // !UNICODE
+
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+HKL
+WINAPI
+ActivateKeyboardLayout(
+    IN HKL hkl,
+    IN UINT Flags);
+#else
+WINUSERAPI
+BOOL
+WINAPI
+ActivateKeyboardLayout(
+    IN HKL hkl,
+    IN UINT Flags);
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+int
+WINAPI
+ToUnicodeEx(
+    IN UINT wVirtKey,
+    IN UINT wScanCode,
+    IN CONST BYTE *lpKeyState,
+    OUT LPWSTR pwszBuff,
+    IN int cchBuff,
+    IN UINT wFlags,
+    IN HKL dwhkl);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+UnloadKeyboardLayout(
+    IN HKL hkl);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetKeyboardLayoutNameA(
+    OUT LPSTR pwszKLID);
+WINUSERAPI
+BOOL
+WINAPI
+GetKeyboardLayoutNameW(
+    OUT LPWSTR pwszKLID);
+#ifdef UNICODE
+#define GetKeyboardLayoutName  GetKeyboardLayoutNameW
+#else
+#define GetKeyboardLayoutName  GetKeyboardLayoutNameA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+int
+WINAPI
+GetKeyboardLayoutList(
+        IN int nBuff,
+        OUT HKL FAR *lpList);
+
+WINUSERAPI
+HKL
+WINAPI
+GetKeyboardLayout(
+    IN DWORD idThread
+);
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+
+typedef struct tagMOUSEMOVEPOINT {
+    int   x;
+    int   y;
+    DWORD time;
+    ULONG_PTR dwExtraInfo;
+} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT, FAR* LPMOUSEMOVEPOINT;
+
+/*
+ * Values for resolution parameter of GetMouseMovePointsEx
+ */
+#define GMMP_USE_DISPLAY_POINTS          1
+#define GMMP_USE_HIGH_RESOLUTION_POINTS  2
+
+WINUSERAPI
+int
+WINAPI
+GetMouseMovePointsEx(
+    IN UINT             cbSize,
+    IN LPMOUSEMOVEPOINT lppt,
+    IN LPMOUSEMOVEPOINT lpptBuf,
+    IN int              nBufPoints,
+    IN DWORD            resolution
+);
+
+#endif /* WINVER >= 0x0500 */
+
+#ifndef NODESKTOP
+/*
+ * Desktop-specific access flags
+ */
+#define DESKTOP_READOBJECTS         0x0001L
+#define DESKTOP_CREATEWINDOW        0x0002L
+#define DESKTOP_CREATEMENU          0x0004L
+#define DESKTOP_HOOKCONTROL         0x0008L
+#define DESKTOP_JOURNALRECORD       0x0010L
+#define DESKTOP_JOURNALPLAYBACK     0x0020L
+#define DESKTOP_ENUMERATE           0x0040L
+#define DESKTOP_WRITEOBJECTS        0x0080L
+#define DESKTOP_SWITCHDESKTOP       0x0100L
+
+/*
+ * Desktop-specific control flags
+ */
+#define DF_ALLOWOTHERACCOUNTHOOK    0x0001L
+
+#ifdef _WINGDI_
+#ifndef NOGDI
+
+WINUSERAPI
+HDESK
+WINAPI
+CreateDesktopA(
+    IN LPCSTR lpszDesktop,
+    IN LPCSTR lpszDevice,
+    IN LPDEVMODEA pDevmode,
+    IN DWORD dwFlags,
+    IN ACCESS_MASK dwDesiredAccess,
+    IN LPSECURITY_ATTRIBUTES lpsa);
+WINUSERAPI
+HDESK
+WINAPI
+CreateDesktopW(
+    IN LPCWSTR lpszDesktop,
+    IN LPCWSTR lpszDevice,
+    IN LPDEVMODEW pDevmode,
+    IN DWORD dwFlags,
+    IN ACCESS_MASK dwDesiredAccess,
+    IN LPSECURITY_ATTRIBUTES lpsa);
+#ifdef UNICODE
+#define CreateDesktop  CreateDesktopW
+#else
+#define CreateDesktop  CreateDesktopA
+#endif // !UNICODE
+
+#endif /* NOGDI */
+#endif /* _WINGDI_ */
+
+WINUSERAPI
+HDESK
+WINAPI
+OpenDesktopA(
+    IN LPCSTR lpszDesktop,
+    IN DWORD dwFlags,
+    IN BOOL fInherit,
+    IN ACCESS_MASK dwDesiredAccess);
+WINUSERAPI
+HDESK
+WINAPI
+OpenDesktopW(
+    IN LPCWSTR lpszDesktop,
+    IN DWORD dwFlags,
+    IN BOOL fInherit,
+    IN ACCESS_MASK dwDesiredAccess);
+#ifdef UNICODE
+#define OpenDesktop  OpenDesktopW
+#else
+#define OpenDesktop  OpenDesktopA
+#endif // !UNICODE
+
+WINUSERAPI
+HDESK
+WINAPI
+OpenInputDesktop(
+    IN DWORD dwFlags,
+    IN BOOL fInherit,
+    IN ACCESS_MASK dwDesiredAccess);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumDesktopsA(
+    IN HWINSTA hwinsta,
+    IN DESKTOPENUMPROCA lpEnumFunc,
+    IN LPARAM lParam);
+WINUSERAPI
+BOOL
+WINAPI
+EnumDesktopsW(
+    IN HWINSTA hwinsta,
+    IN DESKTOPENUMPROCW lpEnumFunc,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define EnumDesktops  EnumDesktopsW
+#else
+#define EnumDesktops  EnumDesktopsA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumDesktopWindows(
+    IN HDESK hDesktop,
+    IN WNDENUMPROC lpfn,
+    IN LPARAM lParam);
+
+WINUSERAPI
+BOOL
+WINAPI
+SwitchDesktop(
+    IN HDESK hDesktop);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetThreadDesktop(
+    IN HDESK hDesktop);
+
+WINUSERAPI
+BOOL
+WINAPI
+CloseDesktop(
+    IN HDESK hDesktop);
+
+WINUSERAPI
+HDESK
+WINAPI
+GetThreadDesktop(
+    IN DWORD dwThreadId);
+#endif  /* !NODESKTOP */
+
+#ifndef NOWINDOWSTATION
+/*
+ * Windowstation-specific access flags
+ */
+#define WINSTA_ENUMDESKTOPS         0x0001L
+#define WINSTA_READATTRIBUTES       0x0002L
+#define WINSTA_ACCESSCLIPBOARD      0x0004L
+#define WINSTA_CREATEDESKTOP        0x0008L
+#define WINSTA_WRITEATTRIBUTES      0x0010L
+#define WINSTA_ACCESSGLOBALATOMS    0x0020L
+#define WINSTA_EXITWINDOWS          0x0040L
+#define WINSTA_ENUMERATE            0x0100L
+#define WINSTA_READSCREEN           0x0200L
+
+#define WINSTA_ALL_ACCESS           (WINSTA_ENUMDESKTOPS  | WINSTA_READATTRIBUTES  | WINSTA_ACCESSCLIPBOARD | \
+                                     WINSTA_CREATEDESKTOP | WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | \
+                                     WINSTA_EXITWINDOWS   | WINSTA_ENUMERATE       | WINSTA_READSCREEN)
+
+/*
+ * Windowstation-specific attribute flags
+ */
+#define WSF_VISIBLE                 0x0001L
+
+WINUSERAPI
+HWINSTA
+WINAPI
+CreateWindowStationA(
+    IN LPCSTR              lpwinsta,
+    IN DWORD                 dwReserved,
+    IN ACCESS_MASK           dwDesiredAccess,
+    IN LPSECURITY_ATTRIBUTES lpsa);
+WINUSERAPI
+HWINSTA
+WINAPI
+CreateWindowStationW(
+    IN LPCWSTR              lpwinsta,
+    IN DWORD                 dwReserved,
+    IN ACCESS_MASK           dwDesiredAccess,
+    IN LPSECURITY_ATTRIBUTES lpsa);
+#ifdef UNICODE
+#define CreateWindowStation  CreateWindowStationW
+#else
+#define CreateWindowStation  CreateWindowStationA
+#endif // !UNICODE
+
+WINUSERAPI
+HWINSTA
+WINAPI
+OpenWindowStationA(
+    IN LPCSTR lpszWinSta,
+    IN BOOL fInherit,
+    IN ACCESS_MASK dwDesiredAccess);
+WINUSERAPI
+HWINSTA
+WINAPI
+OpenWindowStationW(
+    IN LPCWSTR lpszWinSta,
+    IN BOOL fInherit,
+    IN ACCESS_MASK dwDesiredAccess);
+#ifdef UNICODE
+#define OpenWindowStation  OpenWindowStationW
+#else
+#define OpenWindowStation  OpenWindowStationA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumWindowStationsA(
+    IN WINSTAENUMPROCA lpEnumFunc,
+    IN LPARAM lParam);
+WINUSERAPI
+BOOL
+WINAPI
+EnumWindowStationsW(
+    IN WINSTAENUMPROCW lpEnumFunc,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define EnumWindowStations  EnumWindowStationsW
+#else
+#define EnumWindowStations  EnumWindowStationsA
+#endif // !UNICODE
+
+
+WINUSERAPI
+BOOL
+WINAPI
+CloseWindowStation(
+    IN HWINSTA hWinSta);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetProcessWindowStation(
+    IN HWINSTA hWinSta);
+
+WINUSERAPI
+HWINSTA
+WINAPI
+GetProcessWindowStation(
+    VOID);
+#endif  /* !NOWINDOWSTATION */
+
+#ifndef NOSECURITY
+
+WINUSERAPI
+BOOL
+WINAPI
+SetUserObjectSecurity(
+    IN HANDLE hObj,
+    IN PSECURITY_INFORMATION pSIRequested,
+    IN PSECURITY_DESCRIPTOR pSID);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetUserObjectSecurity(
+    IN HANDLE hObj,
+    IN PSECURITY_INFORMATION pSIRequested,
+    IN OUT PSECURITY_DESCRIPTOR pSID,
+    IN DWORD nLength,
+    OUT LPDWORD lpnLengthNeeded);
+
+#define UOI_FLAGS       1
+#define UOI_NAME        2
+#define UOI_TYPE        3
+#define UOI_USER_SID    4
+
+typedef struct tagUSEROBJECTFLAGS {
+    BOOL fInherit;
+    BOOL fReserved;
+    DWORD dwFlags;
+} USEROBJECTFLAGS, *PUSEROBJECTFLAGS;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetUserObjectInformationA(
+    IN HANDLE hObj,
+    IN int nIndex,
+    OUT PVOID pvInfo,
+    IN DWORD nLength,
+    OUT LPDWORD lpnLengthNeeded);
+WINUSERAPI
+BOOL
+WINAPI
+GetUserObjectInformationW(
+    IN HANDLE hObj,
+    IN int nIndex,
+    OUT PVOID pvInfo,
+    IN DWORD nLength,
+    OUT LPDWORD lpnLengthNeeded);
+#ifdef UNICODE
+#define GetUserObjectInformation  GetUserObjectInformationW
+#else
+#define GetUserObjectInformation  GetUserObjectInformationA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+SetUserObjectInformationA(
+    IN HANDLE hObj,
+    IN int nIndex,
+    IN PVOID pvInfo,
+    IN DWORD nLength);
+WINUSERAPI
+BOOL
+WINAPI
+SetUserObjectInformationW(
+    IN HANDLE hObj,
+    IN int nIndex,
+    IN PVOID pvInfo,
+    IN DWORD nLength);
+#ifdef UNICODE
+#define SetUserObjectInformation  SetUserObjectInformationW
+#else
+#define SetUserObjectInformation  SetUserObjectInformationA
+#endif // !UNICODE
+
+#endif  /* !NOSECURITY */
+
+#if(WINVER >= 0x0400)
+typedef struct tagWNDCLASSEXA {
+    UINT        cbSize;
+    /* Win 3.x */
+    UINT        style;
+    WNDPROC     lpfnWndProc;
+    int         cbClsExtra;
+    int         cbWndExtra;
+    HINSTANCE   hInstance;
+    HICON       hIcon;
+    HCURSOR     hCursor;
+    HBRUSH      hbrBackground;
+    LPCSTR      lpszMenuName;
+    LPCSTR      lpszClassName;
+    /* Win 4.0 */
+    HICON       hIconSm;
+} WNDCLASSEXA, *PWNDCLASSEXA, NEAR *NPWNDCLASSEXA, FAR *LPWNDCLASSEXA;
+typedef struct tagWNDCLASSEXW {
+    UINT        cbSize;
+    /* Win 3.x */
+    UINT        style;
+    WNDPROC     lpfnWndProc;
+    int         cbClsExtra;
+    int         cbWndExtra;
+    HINSTANCE   hInstance;
+    HICON       hIcon;
+    HCURSOR     hCursor;
+    HBRUSH      hbrBackground;
+    LPCWSTR     lpszMenuName;
+    LPCWSTR     lpszClassName;
+    /* Win 4.0 */
+    HICON       hIconSm;
+} WNDCLASSEXW, *PWNDCLASSEXW, NEAR *NPWNDCLASSEXW, FAR *LPWNDCLASSEXW;
+#ifdef UNICODE
+typedef WNDCLASSEXW WNDCLASSEX;
+typedef PWNDCLASSEXW PWNDCLASSEX;
+typedef NPWNDCLASSEXW NPWNDCLASSEX;
+typedef LPWNDCLASSEXW LPWNDCLASSEX;
+#else
+typedef WNDCLASSEXA WNDCLASSEX;
+typedef PWNDCLASSEXA PWNDCLASSEX;
+typedef NPWNDCLASSEXA NPWNDCLASSEX;
+typedef LPWNDCLASSEXA LPWNDCLASSEX;
+#endif // UNICODE
+#endif /* WINVER >= 0x0400 */
+
+typedef struct tagWNDCLASSA {
+    UINT        style;
+    WNDPROC     lpfnWndProc;
+    int         cbClsExtra;
+    int         cbWndExtra;
+    HINSTANCE   hInstance;
+    HICON       hIcon;
+    HCURSOR     hCursor;
+    HBRUSH      hbrBackground;
+    LPCSTR      lpszMenuName;
+    LPCSTR      lpszClassName;
+} WNDCLASSA, *PWNDCLASSA, NEAR *NPWNDCLASSA, FAR *LPWNDCLASSA;
+typedef struct tagWNDCLASSW {
+    UINT        style;
+    WNDPROC     lpfnWndProc;
+    int         cbClsExtra;
+    int         cbWndExtra;
+    HINSTANCE   hInstance;
+    HICON       hIcon;
+    HCURSOR     hCursor;
+    HBRUSH      hbrBackground;
+    LPCWSTR     lpszMenuName;
+    LPCWSTR     lpszClassName;
+} WNDCLASSW, *PWNDCLASSW, NEAR *NPWNDCLASSW, FAR *LPWNDCLASSW;
+#ifdef UNICODE
+typedef WNDCLASSW WNDCLASS;
+typedef PWNDCLASSW PWNDCLASS;
+typedef NPWNDCLASSW NPWNDCLASS;
+typedef LPWNDCLASSW LPWNDCLASS;
+#else
+typedef WNDCLASSA WNDCLASS;
+typedef PWNDCLASSA PWNDCLASS;
+typedef NPWNDCLASSA NPWNDCLASS;
+typedef LPWNDCLASSA LPWNDCLASS;
+#endif // UNICODE
+
+WINUSERAPI
+BOOL
+IsHungAppWindow(
+    IN HWND hwnd);
+
+
+#if(WINVER >= 0x0501)
+WINUSERAPI
+VOID
+DisableProcessWindowsGhosting(
+    VOID);
+#endif /* WINVER >= 0x0501 */
+
+#ifndef NOMSG
+
+/*
+ * Message structure
+ */
+typedef struct tagMSG {
+    HWND        hwnd;
+    UINT        message;
+    WPARAM      wParam;
+    LPARAM      lParam;
+    DWORD       time;
+    POINT       pt;
+#ifdef _MAC
+    DWORD       lPrivate;
+#endif
+} MSG, *PMSG, NEAR *NPMSG, FAR *LPMSG;
+
+#define POINTSTOPOINT(pt, pts)                          \
+        { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts);   \
+          (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); }
+
+#define POINTTOPOINTS(pt)      (MAKELONG((short)((pt).x), (short)((pt).y)))
+#define MAKEWPARAM(l, h)      ((WPARAM)(DWORD)MAKELONG(l, h))
+#define MAKELPARAM(l, h)      ((LPARAM)(DWORD)MAKELONG(l, h))
+#define MAKELRESULT(l, h)     ((LRESULT)(DWORD)MAKELONG(l, h))
+
+
+#endif /* !NOMSG */
+
+#ifndef NOWINOFFSETS
+
+/*
+ * Window field offsets for GetWindowLong()
+ */
+#define GWL_WNDPROC         (-4)
+#define GWL_HINSTANCE       (-6)
+#define GWL_HWNDPARENT      (-8)
+#define GWL_STYLE           (-16)
+#define GWL_EXSTYLE         (-20)
+#define GWL_USERDATA        (-21)
+#define GWL_ID              (-12)
+
+#ifdef _WIN64
+
+#undef GWL_WNDPROC
+#undef GWL_HINSTANCE
+#undef GWL_HWNDPARENT
+#undef GWL_USERDATA
+
+#endif /* _WIN64 */
+
+#define GWLP_WNDPROC        (-4)
+#define GWLP_HINSTANCE      (-6)
+#define GWLP_HWNDPARENT     (-8)
+#define GWLP_USERDATA       (-21)
+#define GWLP_ID             (-12)
+
+/*
+ * Class field offsets for GetClassLong()
+ */
+#define GCL_MENUNAME        (-8)
+#define GCL_HBRBACKGROUND   (-10)
+#define GCL_HCURSOR         (-12)
+#define GCL_HICON           (-14)
+#define GCL_HMODULE         (-16)
+#define GCL_CBWNDEXTRA      (-18)
+#define GCL_CBCLSEXTRA      (-20)
+#define GCL_WNDPROC         (-24)
+#define GCL_STYLE           (-26)
+#define GCW_ATOM            (-32)
+
+#if(WINVER >= 0x0400)
+#define GCL_HICONSM         (-34)
+#endif /* WINVER >= 0x0400 */
+
+#ifdef _WIN64
+
+#undef GCL_MENUNAME
+#undef GCL_HBRBACKGROUND
+#undef GCL_HCURSOR
+#undef GCL_HICON
+#undef GCL_HMODULE
+#undef GCL_WNDPROC
+#undef GCL_HICONSM
+
+#endif /* _WIN64 */
+
+#define GCLP_MENUNAME       (-8)
+#define GCLP_HBRBACKGROUND  (-10)
+#define GCLP_HCURSOR        (-12)
+#define GCLP_HICON          (-14)
+#define GCLP_HMODULE        (-16)
+#define GCLP_WNDPROC        (-24)
+#define GCLP_HICONSM        (-34)
+
+#endif /* !NOWINOFFSETS */
+
+#ifndef NOWINMESSAGES
+
+
+/*
+ * Window Messages
+ */
+
+#define WM_NULL                         0x0000
+#define WM_CREATE                       0x0001
+#define WM_DESTROY                      0x0002
+#define WM_MOVE                         0x0003
+#define WM_SIZE                         0x0005
+
+#define WM_ACTIVATE                     0x0006
+/*
+ * WM_ACTIVATE state values
+ */
+#define     WA_INACTIVE     0
+#define     WA_ACTIVE       1
+#define     WA_CLICKACTIVE  2
+
+#define WM_SETFOCUS                     0x0007
+#define WM_KILLFOCUS                    0x0008
+#define WM_ENABLE                       0x000A
+#define WM_SETREDRAW                    0x000B
+#define WM_SETTEXT                      0x000C
+#define WM_GETTEXT                      0x000D
+#define WM_GETTEXTLENGTH                0x000E
+#define WM_PAINT                        0x000F
+#define WM_CLOSE                        0x0010
+#ifndef _WIN32_WCE
+#define WM_QUERYENDSESSION              0x0011
+#define WM_QUERYOPEN                    0x0013
+#define WM_ENDSESSION                   0x0016
+#endif
+#define WM_QUIT                         0x0012
+#define WM_ERASEBKGND                   0x0014
+#define WM_SYSCOLORCHANGE               0x0015
+#define WM_SHOWWINDOW                   0x0018
+#define WM_WININICHANGE                 0x001A
+#if(WINVER >= 0x0400)
+#define WM_SETTINGCHANGE                WM_WININICHANGE
+#endif /* WINVER >= 0x0400 */
+
+
+#define WM_DEVMODECHANGE                0x001B
+#define WM_ACTIVATEAPP                  0x001C
+#define WM_FONTCHANGE                   0x001D
+#define WM_TIMECHANGE                   0x001E
+#define WM_CANCELMODE                   0x001F
+#define WM_SETCURSOR                    0x0020
+#define WM_MOUSEACTIVATE                0x0021
+#define WM_CHILDACTIVATE                0x0022
+#define WM_QUEUESYNC                    0x0023
+
+#define WM_GETMINMAXINFO                0x0024
+/*
+ * Struct pointed to by WM_GETMINMAXINFO lParam
+ */
+typedef struct tagMINMAXINFO {
+    POINT ptReserved;
+    POINT ptMaxSize;
+    POINT ptMaxPosition;
+    POINT ptMinTrackSize;
+    POINT ptMaxTrackSize;
+} MINMAXINFO, *PMINMAXINFO, *LPMINMAXINFO;
+
+#define WM_PAINTICON                    0x0026
+#define WM_ICONERASEBKGND               0x0027
+#define WM_NEXTDLGCTL                   0x0028
+#define WM_SPOOLERSTATUS                0x002A
+#define WM_DRAWITEM                     0x002B
+#define WM_MEASUREITEM                  0x002C
+#define WM_DELETEITEM                   0x002D
+#define WM_VKEYTOITEM                   0x002E
+#define WM_CHARTOITEM                   0x002F
+#define WM_SETFONT                      0x0030
+#define WM_GETFONT                      0x0031
+#define WM_SETHOTKEY                    0x0032
+#define WM_GETHOTKEY                    0x0033
+#define WM_QUERYDRAGICON                0x0037
+#define WM_COMPAREITEM                  0x0039
+#if(WINVER >= 0x0500)
+#ifndef _WIN32_WCE
+#define WM_GETOBJECT                    0x003D
+#endif
+#endif /* WINVER >= 0x0500 */
+#define WM_COMPACTING                   0x0041
+#define WM_COMMNOTIFY                   0x0044  /* no longer suported */
+#define WM_WINDOWPOSCHANGING            0x0046
+#define WM_WINDOWPOSCHANGED             0x0047
+
+#define WM_POWER                        0x0048
+/*
+ * wParam for WM_POWER window message and DRV_POWER driver notification
+ */
+#define PWR_OK              1
+#define PWR_FAIL            (-1)
+#define PWR_SUSPENDREQUEST  1
+#define PWR_SUSPENDRESUME   2
+#define PWR_CRITICALRESUME  3
+
+#define WM_COPYDATA                     0x004A
+#define WM_CANCELJOURNAL                0x004B
+
+
+/*
+ * lParam of WM_COPYDATA message points to...
+ */
+typedef struct tagCOPYDATASTRUCT {
+    ULONG_PTR dwData;
+    DWORD cbData;
+    PVOID lpData;
+} COPYDATASTRUCT, *PCOPYDATASTRUCT;
+
+#if(WINVER >= 0x0400)
+typedef struct tagMDINEXTMENU
+{
+    HMENU   hmenuIn;
+    HMENU   hmenuNext;
+    HWND    hwndNext;
+} MDINEXTMENU, * PMDINEXTMENU, FAR * LPMDINEXTMENU;
+#endif /* WINVER >= 0x0400 */
+
+
+#if(WINVER >= 0x0400)
+#define WM_NOTIFY                       0x004E
+#define WM_INPUTLANGCHANGEREQUEST       0x0050
+#define WM_INPUTLANGCHANGE              0x0051
+#define WM_TCARD                        0x0052
+#define WM_HELP                         0x0053
+#define WM_USERCHANGED                  0x0054
+#define WM_NOTIFYFORMAT                 0x0055
+
+#define NFR_ANSI                             1
+#define NFR_UNICODE                          2
+#define NF_QUERY                             3
+#define NF_REQUERY                           4
+
+#define WM_CONTEXTMENU                  0x007B
+#define WM_STYLECHANGING                0x007C
+#define WM_STYLECHANGED                 0x007D
+#define WM_DISPLAYCHANGE                0x007E
+#define WM_GETICON                      0x007F
+#define WM_SETICON                      0x0080
+#endif /* WINVER >= 0x0400 */
+
+#define WM_NCCREATE                     0x0081
+#define WM_NCDESTROY                    0x0082
+#define WM_NCCALCSIZE                   0x0083
+#define WM_NCHITTEST                    0x0084
+#define WM_NCPAINT                      0x0085
+#define WM_NCACTIVATE                   0x0086
+#define WM_GETDLGCODE                   0x0087
+#ifndef _WIN32_WCE
+#define WM_SYNCPAINT                    0x0088
+#endif
+#define WM_NCMOUSEMOVE                  0x00A0
+#define WM_NCLBUTTONDOWN                0x00A1
+#define WM_NCLBUTTONUP                  0x00A2
+#define WM_NCLBUTTONDBLCLK              0x00A3
+#define WM_NCRBUTTONDOWN                0x00A4
+#define WM_NCRBUTTONUP                  0x00A5
+#define WM_NCRBUTTONDBLCLK              0x00A6
+#define WM_NCMBUTTONDOWN                0x00A7
+#define WM_NCMBUTTONUP                  0x00A8
+#define WM_NCMBUTTONDBLCLK              0x00A9
+
+
+
+#if(_WIN32_WINNT >= 0x0500)
+#define WM_NCXBUTTONDOWN                0x00AB
+#define WM_NCXBUTTONUP                  0x00AC
+#define WM_NCXBUTTONDBLCLK              0x00AD
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#if(_WIN32_WINNT >= 0x0501)
+#define WM_INPUT                        0x00FF
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define WM_KEYFIRST                     0x0100
+#define WM_KEYDOWN                      0x0100
+#define WM_KEYUP                        0x0101
+#define WM_CHAR                         0x0102
+#define WM_DEADCHAR                     0x0103
+#define WM_SYSKEYDOWN                   0x0104
+#define WM_SYSKEYUP                     0x0105
+#define WM_SYSCHAR                      0x0106
+#define WM_SYSDEADCHAR                  0x0107
+#if(_WIN32_WINNT >= 0x0501)
+#define WM_UNICHAR                      0x0109
+#define WM_KEYLAST                      0x0109
+#define UNICODE_NOCHAR                  0xFFFF
+#else
+#define WM_KEYLAST                      0x0108
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(WINVER >= 0x0400)
+#define WM_IME_STARTCOMPOSITION         0x010D
+#define WM_IME_ENDCOMPOSITION           0x010E
+#define WM_IME_COMPOSITION              0x010F
+#define WM_IME_KEYLAST                  0x010F
+#endif /* WINVER >= 0x0400 */
+
+#define WM_INITDIALOG                   0x0110
+#define WM_COMMAND                      0x0111
+#define WM_SYSCOMMAND                   0x0112
+#define WM_TIMER                        0x0113
+#define WM_HSCROLL                      0x0114
+#define WM_VSCROLL                      0x0115
+#define WM_INITMENU                     0x0116
+#define WM_INITMENUPOPUP                0x0117
+#define WM_MENUSELECT                   0x011F
+#define WM_MENUCHAR                     0x0120
+#define WM_ENTERIDLE                    0x0121
+#if(WINVER >= 0x0500)
+#ifndef _WIN32_WCE
+#define WM_MENURBUTTONUP                0x0122
+#define WM_MENUDRAG                     0x0123
+#define WM_MENUGETOBJECT                0x0124
+#define WM_UNINITMENUPOPUP              0x0125
+#define WM_MENUCOMMAND                  0x0126
+
+#ifndef _WIN32_WCE
+#if(_WIN32_WINNT >= 0x0500)
+#define WM_CHANGEUISTATE                0x0127
+#define WM_UPDATEUISTATE                0x0128
+#define WM_QUERYUISTATE                 0x0129
+
+/*
+ * LOWORD(wParam) values in WM_*UISTATE*
+ */
+#define UIS_SET                         1
+#define UIS_CLEAR                       2
+#define UIS_INITIALIZE                  3
+
+/*
+ * HIWORD(wParam) values in WM_*UISTATE*
+ */
+#define UISF_HIDEFOCUS                  0x1
+#define UISF_HIDEACCEL                  0x2
+#if(_WIN32_WINNT >= 0x0501)
+#define UISF_ACTIVE                     0x4
+#endif /* _WIN32_WINNT >= 0x0501 */
+#endif /* _WIN32_WINNT >= 0x0500 */
+#endif
+
+#endif
+#endif /* WINVER >= 0x0500 */
+
+#define WM_CTLCOLORMSGBOX               0x0132
+#define WM_CTLCOLOREDIT                 0x0133
+#define WM_CTLCOLORLISTBOX              0x0134
+#define WM_CTLCOLORBTN                  0x0135
+#define WM_CTLCOLORDLG                  0x0136
+#define WM_CTLCOLORSCROLLBAR            0x0137
+#define WM_CTLCOLORSTATIC               0x0138
+#define MN_GETHMENU                     0x01E1
+
+#define WM_MOUSEFIRST                   0x0200
+#define WM_MOUSEMOVE                    0x0200
+#define WM_LBUTTONDOWN                  0x0201
+#define WM_LBUTTONUP                    0x0202
+#define WM_LBUTTONDBLCLK                0x0203
+#define WM_RBUTTONDOWN                  0x0204
+#define WM_RBUTTONUP                    0x0205
+#define WM_RBUTTONDBLCLK                0x0206
+#define WM_MBUTTONDOWN                  0x0207
+#define WM_MBUTTONUP                    0x0208
+#define WM_MBUTTONDBLCLK                0x0209
+#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+#define WM_MOUSEWHEEL                   0x020A
+#endif
+#if (_WIN32_WINNT >= 0x0500)
+#define WM_XBUTTONDOWN                  0x020B
+#define WM_XBUTTONUP                    0x020C
+#define WM_XBUTTONDBLCLK                0x020D
+#endif
+#if (_WIN32_WINNT >= 0x0500)
+#define WM_MOUSELAST                    0x020D
+#elif (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+#define WM_MOUSELAST                    0x020A
+#else
+#define WM_MOUSELAST                    0x0209
+#endif /* (_WIN32_WINNT >= 0x0500) */
+
+
+#if(_WIN32_WINNT >= 0x0400)
+/* Value for rolling one detent */
+#define WHEEL_DELTA                     120
+#define GET_WHEEL_DELTA_WPARAM(wParam)  ((short)HIWORD(wParam))
+
+/* Setting to scroll one page for SPI_GET/SETWHEELSCROLLLINES */
+#define WHEEL_PAGESCROLL                (UINT_MAX)
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0500)
+#define GET_KEYSTATE_WPARAM(wParam)     (LOWORD(wParam))
+#define GET_NCHITTEST_WPARAM(wParam)    ((short)LOWORD(wParam))
+#define GET_XBUTTON_WPARAM(wParam)      (HIWORD(wParam))
+
+/* XButton values are WORD flags */
+#define XBUTTON1      0x0001
+#define XBUTTON2      0x0002
+/* Were there to be an XBUTTON3, its value would be 0x0004 */
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#define WM_PARENTNOTIFY                 0x0210
+#define WM_ENTERMENULOOP                0x0211
+#define WM_EXITMENULOOP                 0x0212
+
+#if(WINVER >= 0x0400)
+#define WM_NEXTMENU                     0x0213
+#define WM_SIZING                       0x0214
+#define WM_CAPTURECHANGED               0x0215
+#define WM_MOVING                       0x0216
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0400)
+
+
+#define WM_POWERBROADCAST               0x0218
+
+#ifndef _WIN32_WCE
+#define PBT_APMQUERYSUSPEND             0x0000
+#define PBT_APMQUERYSTANDBY             0x0001
+
+#define PBT_APMQUERYSUSPENDFAILED       0x0002
+#define PBT_APMQUERYSTANDBYFAILED       0x0003
+
+#define PBT_APMSUSPEND                  0x0004
+#define PBT_APMSTANDBY                  0x0005
+
+#define PBT_APMRESUMECRITICAL           0x0006
+#define PBT_APMRESUMESUSPEND            0x0007
+#define PBT_APMRESUMESTANDBY            0x0008
+
+#define PBTF_APMRESUMEFROMFAILURE       0x00000001
+
+#define PBT_APMBATTERYLOW               0x0009
+#define PBT_APMPOWERSTATUSCHANGE        0x000A
+
+#define PBT_APMOEMEVENT                 0x000B
+#define PBT_APMRESUMEAUTOMATIC          0x0012
+#endif
+
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0400)
+#define WM_DEVICECHANGE                 0x0219
+#endif /* WINVER >= 0x0400 */
+
+#define WM_MDICREATE                    0x0220
+#define WM_MDIDESTROY                   0x0221
+#define WM_MDIACTIVATE                  0x0222
+#define WM_MDIRESTORE                   0x0223
+#define WM_MDINEXT                      0x0224
+#define WM_MDIMAXIMIZE                  0x0225
+#define WM_MDITILE                      0x0226
+#define WM_MDICASCADE                   0x0227
+#define WM_MDIICONARRANGE               0x0228
+#define WM_MDIGETACTIVE                 0x0229
+
+
+#define WM_MDISETMENU                   0x0230
+#define WM_ENTERSIZEMOVE                0x0231
+#define WM_EXITSIZEMOVE                 0x0232
+#define WM_DROPFILES                    0x0233
+#define WM_MDIREFRESHMENU               0x0234
+
+
+#if(WINVER >= 0x0400)
+#define WM_IME_SETCONTEXT               0x0281
+#define WM_IME_NOTIFY                   0x0282
+#define WM_IME_CONTROL                  0x0283
+#define WM_IME_COMPOSITIONFULL          0x0284
+#define WM_IME_SELECT                   0x0285
+#define WM_IME_CHAR                     0x0286
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+#define WM_IME_REQUEST                  0x0288
+#endif /* WINVER >= 0x0500 */
+#if(WINVER >= 0x0400)
+#define WM_IME_KEYDOWN                  0x0290
+#define WM_IME_KEYUP                    0x0291
+#endif /* WINVER >= 0x0400 */
+
+#if((_WIN32_WINNT >= 0x0400) || (WINVER >= 0x0500))
+#define WM_MOUSEHOVER                   0x02A1
+#define WM_MOUSELEAVE                   0x02A3
+#endif
+#if(WINVER >= 0x0500)
+#define WM_NCMOUSEHOVER                 0x02A0
+#define WM_NCMOUSELEAVE                 0x02A2
+#endif /* WINVER >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define WM_WTSSESSION_CHANGE            0x02B1
+
+#define WM_TABLET_FIRST                 0x02c0
+#define WM_TABLET_LAST                  0x02df
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define WM_CUT                          0x0300
+#define WM_COPY                         0x0301
+#define WM_PASTE                        0x0302
+#define WM_CLEAR                        0x0303
+#define WM_UNDO                         0x0304
+#define WM_RENDERFORMAT                 0x0305
+#define WM_RENDERALLFORMATS             0x0306
+#define WM_DESTROYCLIPBOARD             0x0307
+#define WM_DRAWCLIPBOARD                0x0308
+#define WM_PAINTCLIPBOARD               0x0309
+#define WM_VSCROLLCLIPBOARD             0x030A
+#define WM_SIZECLIPBOARD                0x030B
+#define WM_ASKCBFORMATNAME              0x030C
+#define WM_CHANGECBCHAIN                0x030D
+#define WM_HSCROLLCLIPBOARD             0x030E
+#define WM_QUERYNEWPALETTE              0x030F
+#define WM_PALETTEISCHANGING            0x0310
+#define WM_PALETTECHANGED               0x0311
+#define WM_HOTKEY                       0x0312
+
+#if(WINVER >= 0x0400)
+#define WM_PRINT                        0x0317
+#define WM_PRINTCLIENT                  0x0318
+#endif /* WINVER >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0500)
+#define WM_APPCOMMAND                   0x0319
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define WM_THEMECHANGED                 0x031A
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+
+#if(WINVER >= 0x0400)
+
+#define WM_HANDHELDFIRST                0x0358
+#define WM_HANDHELDLAST                 0x035F
+
+#define WM_AFXFIRST                     0x0360
+#define WM_AFXLAST                      0x037F
+#endif /* WINVER >= 0x0400 */
+
+#define WM_PENWINFIRST                  0x0380
+#define WM_PENWINLAST                   0x038F
+
+
+#if(WINVER >= 0x0400)
+#define WM_APP                          0x8000
+#endif /* WINVER >= 0x0400 */
+
+
+/*
+ * NOTE: All Message Numbers below 0x0400 are RESERVED.
+ *
+ * Private Window Messages Start Here:
+ */
+#define WM_USER                         0x0400
+
+#if(WINVER >= 0x0400)
+
+/*  wParam for WM_SIZING message  */
+#define WMSZ_LEFT           1
+#define WMSZ_RIGHT          2
+#define WMSZ_TOP            3
+#define WMSZ_TOPLEFT        4
+#define WMSZ_TOPRIGHT       5
+#define WMSZ_BOTTOM         6
+#define WMSZ_BOTTOMLEFT     7
+#define WMSZ_BOTTOMRIGHT    8
+#endif /* WINVER >= 0x0400 */
+
+#ifndef NONCMESSAGES
+
+/*
+ * WM_NCHITTEST and MOUSEHOOKSTRUCT Mouse Position Codes
+ */
+#define HTERROR             (-2)
+#define HTTRANSPARENT       (-1)
+#define HTNOWHERE           0
+#define HTCLIENT            1
+#define HTCAPTION           2
+#define HTSYSMENU           3
+#define HTGROWBOX           4
+#define HTSIZE              HTGROWBOX
+#define HTMENU              5
+#define HTHSCROLL           6
+#define HTVSCROLL           7
+#define HTMINBUTTON         8
+#define HTMAXBUTTON         9
+#define HTLEFT              10
+#define HTRIGHT             11
+#define HTTOP               12
+#define HTTOPLEFT           13
+#define HTTOPRIGHT          14
+#define HTBOTTOM            15
+#define HTBOTTOMLEFT        16
+#define HTBOTTOMRIGHT       17
+#define HTBORDER            18
+#define HTREDUCE            HTMINBUTTON
+#define HTZOOM              HTMAXBUTTON
+#define HTSIZEFIRST         HTLEFT
+#define HTSIZELAST          HTBOTTOMRIGHT
+#if(WINVER >= 0x0400)
+#define HTOBJECT            19
+#define HTCLOSE             20
+#define HTHELP              21
+#endif /* WINVER >= 0x0400 */
+
+
+/*
+ * SendMessageTimeout values
+ */
+#define SMTO_NORMAL         0x0000
+#define SMTO_BLOCK          0x0001
+#define SMTO_ABORTIFHUNG    0x0002
+#if(WINVER >= 0x0500)
+#define SMTO_NOTIMEOUTIFNOTHUNG 0x0008
+#endif /* WINVER >= 0x0500 */
+#endif /* !NONCMESSAGES */
+
+/*
+ * WM_MOUSEACTIVATE Return Codes
+ */
+#define MA_ACTIVATE         1
+#define MA_ACTIVATEANDEAT   2
+#define MA_NOACTIVATE       3
+#define MA_NOACTIVATEANDEAT 4
+
+/*
+ * WM_SETICON / WM_GETICON Type Codes
+ */
+#define ICON_SMALL          0
+#define ICON_BIG            1
+#if(_WIN32_WINNT >= 0x0501)
+#define ICON_SMALL2         2
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+
+WINUSERAPI
+UINT
+WINAPI
+RegisterWindowMessageA(
+    IN LPCSTR lpString);
+WINUSERAPI
+UINT
+WINAPI
+RegisterWindowMessageW(
+    IN LPCWSTR lpString);
+#ifdef UNICODE
+#define RegisterWindowMessage  RegisterWindowMessageW
+#else
+#define RegisterWindowMessage  RegisterWindowMessageA
+#endif // !UNICODE
+
+
+/*
+ * WM_SIZE message wParam values
+ */
+#define SIZE_RESTORED       0
+#define SIZE_MINIMIZED      1
+#define SIZE_MAXIMIZED      2
+#define SIZE_MAXSHOW        3
+#define SIZE_MAXHIDE        4
+
+/*
+ * Obsolete constant names
+ */
+#define SIZENORMAL          SIZE_RESTORED
+#define SIZEICONIC          SIZE_MINIMIZED
+#define SIZEFULLSCREEN      SIZE_MAXIMIZED
+#define SIZEZOOMSHOW        SIZE_MAXSHOW
+#define SIZEZOOMHIDE        SIZE_MAXHIDE
+
+/*
+ * WM_WINDOWPOSCHANGING/CHANGED struct pointed to by lParam
+ */
+typedef struct tagWINDOWPOS {
+    HWND    hwnd;
+    HWND    hwndInsertAfter;
+    int     x;
+    int     y;
+    int     cx;
+    int     cy;
+    UINT    flags;
+} WINDOWPOS, *LPWINDOWPOS, *PWINDOWPOS;
+
+/*
+ * WM_NCCALCSIZE parameter structure
+ */
+typedef struct tagNCCALCSIZE_PARAMS {
+    RECT       rgrc[3];
+    PWINDOWPOS lppos;
+} NCCALCSIZE_PARAMS, *LPNCCALCSIZE_PARAMS;
+
+/*
+ * WM_NCCALCSIZE "window valid rect" return values
+ */
+#define WVR_ALIGNTOP        0x0010
+#define WVR_ALIGNLEFT       0x0020
+#define WVR_ALIGNBOTTOM     0x0040
+#define WVR_ALIGNRIGHT      0x0080
+#define WVR_HREDRAW         0x0100
+#define WVR_VREDRAW         0x0200
+#define WVR_REDRAW         (WVR_HREDRAW | \
+                            WVR_VREDRAW)
+#define WVR_VALIDRECTS      0x0400
+
+
+#ifndef NOKEYSTATES
+
+/*
+ * Key State Masks for Mouse Messages
+ */
+#define MK_LBUTTON          0x0001
+#define MK_RBUTTON          0x0002
+#define MK_SHIFT            0x0004
+#define MK_CONTROL          0x0008
+#define MK_MBUTTON          0x0010
+#if(_WIN32_WINNT >= 0x0500)
+#define MK_XBUTTON1         0x0020
+#define MK_XBUTTON2         0x0040
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#endif /* !NOKEYSTATES */
+
+
+#if(_WIN32_WINNT >= 0x0400)
+#ifndef NOTRACKMOUSEEVENT
+
+#define TME_HOVER       0x00000001
+#define TME_LEAVE       0x00000002
+#if(WINVER >= 0x0500)
+#define TME_NONCLIENT   0x00000010
+#endif /* WINVER >= 0x0500 */
+#define TME_QUERY       0x40000000
+#define TME_CANCEL      0x80000000
+
+
+#define HOVER_DEFAULT   0xFFFFFFFF
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0400)
+typedef struct tagTRACKMOUSEEVENT {
+    DWORD cbSize;
+    DWORD dwFlags;
+    HWND  hwndTrack;
+    DWORD dwHoverTime;
+} TRACKMOUSEEVENT, *LPTRACKMOUSEEVENT;
+
+WINUSERAPI
+BOOL
+WINAPI
+TrackMouseEvent(
+    IN OUT LPTRACKMOUSEEVENT lpEventTrack);
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0400)
+
+#endif /* !NOTRACKMOUSEEVENT */
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+
+#endif /* !NOWINMESSAGES */
+
+#ifndef NOWINSTYLES
+
+
+/*
+ * Window Styles
+ */
+#define WS_OVERLAPPED       0x00000000L
+#define WS_POPUP            0x80000000L
+#define WS_CHILD            0x40000000L
+#define WS_MINIMIZE         0x20000000L
+#define WS_VISIBLE          0x10000000L
+#define WS_DISABLED         0x08000000L
+#define WS_CLIPSIBLINGS     0x04000000L
+#define WS_CLIPCHILDREN     0x02000000L
+#define WS_MAXIMIZE         0x01000000L
+#define WS_CAPTION          0x00C00000L     /* WS_BORDER | WS_DLGFRAME  */
+#define WS_BORDER           0x00800000L
+#define WS_DLGFRAME         0x00400000L
+#define WS_VSCROLL          0x00200000L
+#define WS_HSCROLL          0x00100000L
+#define WS_SYSMENU          0x00080000L
+#define WS_THICKFRAME       0x00040000L
+#define WS_GROUP            0x00020000L
+#define WS_TABSTOP          0x00010000L
+
+#define WS_MINIMIZEBOX      0x00020000L
+#define WS_MAXIMIZEBOX      0x00010000L
+
+
+#define WS_TILED            WS_OVERLAPPED
+#define WS_ICONIC           WS_MINIMIZE
+#define WS_SIZEBOX          WS_THICKFRAME
+#define WS_TILEDWINDOW      WS_OVERLAPPEDWINDOW
+
+/*
+ * Common Window Styles
+ */
+#define WS_OVERLAPPEDWINDOW (WS_OVERLAPPED     | \
+                             WS_CAPTION        | \
+                             WS_SYSMENU        | \
+                             WS_THICKFRAME     | \
+                             WS_MINIMIZEBOX    | \
+                             WS_MAXIMIZEBOX)
+
+#define WS_POPUPWINDOW      (WS_POPUP          | \
+                             WS_BORDER         | \
+                             WS_SYSMENU)
+
+#define WS_CHILDWINDOW      (WS_CHILD)
+
+/*
+ * Extended Window Styles
+ */
+#define WS_EX_DLGMODALFRAME     0x00000001L
+#define WS_EX_NOPARENTNOTIFY    0x00000004L
+#define WS_EX_TOPMOST           0x00000008L
+#define WS_EX_ACCEPTFILES       0x00000010L
+#define WS_EX_TRANSPARENT       0x00000020L
+#if(WINVER >= 0x0400)
+#define WS_EX_MDICHILD          0x00000040L
+#define WS_EX_TOOLWINDOW        0x00000080L
+#define WS_EX_WINDOWEDGE        0x00000100L
+#define WS_EX_CLIENTEDGE        0x00000200L
+#define WS_EX_CONTEXTHELP       0x00000400L
+
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0400)
+
+#define WS_EX_RIGHT             0x00001000L
+#define WS_EX_LEFT              0x00000000L
+#define WS_EX_RTLREADING        0x00002000L
+#define WS_EX_LTRREADING        0x00000000L
+#define WS_EX_LEFTSCROLLBAR     0x00004000L
+#define WS_EX_RIGHTSCROLLBAR    0x00000000L
+
+#define WS_EX_CONTROLPARENT     0x00010000L
+#define WS_EX_STATICEDGE        0x00020000L
+#define WS_EX_APPWINDOW         0x00040000L
+
+
+#define WS_EX_OVERLAPPEDWINDOW  (WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE)
+#define WS_EX_PALETTEWINDOW     (WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST)
+
+#endif /* WINVER >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0500)
+#define WS_EX_LAYERED           0x00080000
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#if(WINVER >= 0x0500)
+#define WS_EX_NOINHERITLAYOUT   0x00100000L // Disable inheritence of mirroring by children
+#define WS_EX_LAYOUTRTL         0x00400000L // Right to left mirroring
+#endif /* WINVER >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+#define WS_EX_COMPOSITED        0x02000000L
+#define WS_EX_NOACTIVATE        0x08000000L
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+/*
+ * Class styles
+ */
+#define CS_VREDRAW          0x0001
+#define CS_HREDRAW          0x0002
+#define CS_DBLCLKS          0x0008
+#define CS_OWNDC            0x0020
+#define CS_CLASSDC          0x0040
+#define CS_PARENTDC         0x0080
+#define CS_NOCLOSE          0x0200
+#define CS_SAVEBITS         0x0800
+#define CS_BYTEALIGNCLIENT  0x1000
+#define CS_BYTEALIGNWINDOW  0x2000
+#define CS_GLOBALCLASS      0x4000
+
+#define CS_IME              0x00010000
+#if(_WIN32_WINNT >= 0x0501)
+#define CS_DROPSHADOW       0x00020000
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+
+
+#endif /* !NOWINSTYLES */
+#if(WINVER >= 0x0400)
+/* WM_PRINT flags */
+#define PRF_CHECKVISIBLE    0x00000001L
+#define PRF_NONCLIENT       0x00000002L
+#define PRF_CLIENT          0x00000004L
+#define PRF_ERASEBKGND      0x00000008L
+#define PRF_CHILDREN        0x00000010L
+#define PRF_OWNED           0x00000020L
+
+/* 3D border styles */
+#define BDR_RAISEDOUTER 0x0001
+#define BDR_SUNKENOUTER 0x0002
+#define BDR_RAISEDINNER 0x0004
+#define BDR_SUNKENINNER 0x0008
+
+#define BDR_OUTER       (BDR_RAISEDOUTER | BDR_SUNKENOUTER)
+#define BDR_INNER       (BDR_RAISEDINNER | BDR_SUNKENINNER)
+#define BDR_RAISED      (BDR_RAISEDOUTER | BDR_RAISEDINNER)
+#define BDR_SUNKEN      (BDR_SUNKENOUTER | BDR_SUNKENINNER)
+
+
+#define EDGE_RAISED     (BDR_RAISEDOUTER | BDR_RAISEDINNER)
+#define EDGE_SUNKEN     (BDR_SUNKENOUTER | BDR_SUNKENINNER)
+#define EDGE_ETCHED     (BDR_SUNKENOUTER | BDR_RAISEDINNER)
+#define EDGE_BUMP       (BDR_RAISEDOUTER | BDR_SUNKENINNER)
+
+/* Border flags */
+#define BF_LEFT         0x0001
+#define BF_TOP          0x0002
+#define BF_RIGHT        0x0004
+#define BF_BOTTOM       0x0008
+
+#define BF_TOPLEFT      (BF_TOP | BF_LEFT)
+#define BF_TOPRIGHT     (BF_TOP | BF_RIGHT)
+#define BF_BOTTOMLEFT   (BF_BOTTOM | BF_LEFT)
+#define BF_BOTTOMRIGHT  (BF_BOTTOM | BF_RIGHT)
+#define BF_RECT         (BF_LEFT | BF_TOP | BF_RIGHT | BF_BOTTOM)
+
+#define BF_DIAGONAL     0x0010
+
+// For diagonal lines, the BF_RECT flags specify the end point of the
+// vector bounded by the rectangle parameter.
+#define BF_DIAGONAL_ENDTOPRIGHT     (BF_DIAGONAL | BF_TOP | BF_RIGHT)
+#define BF_DIAGONAL_ENDTOPLEFT      (BF_DIAGONAL | BF_TOP | BF_LEFT)
+#define BF_DIAGONAL_ENDBOTTOMLEFT   (BF_DIAGONAL | BF_BOTTOM | BF_LEFT)
+#define BF_DIAGONAL_ENDBOTTOMRIGHT  (BF_DIAGONAL | BF_BOTTOM | BF_RIGHT)
+
+
+#define BF_MIDDLE       0x0800  /* Fill in the middle */
+#define BF_SOFT         0x1000  /* For softer buttons */
+#define BF_ADJUST       0x2000  /* Calculate the space left over */
+#define BF_FLAT         0x4000  /* For flat rather than 3D borders */
+#define BF_MONO         0x8000  /* For monochrome borders */
+
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawEdge(
+    IN HDC hdc,
+    IN OUT LPRECT qrc,
+    IN UINT edge,
+    IN UINT grfFlags);
+
+/* flags for DrawFrameControl */
+
+#define DFC_CAPTION             1
+#define DFC_MENU                2
+#define DFC_SCROLL              3
+#define DFC_BUTTON              4
+#if(WINVER >= 0x0500)
+#define DFC_POPUPMENU           5
+#endif /* WINVER >= 0x0500 */
+
+#define DFCS_CAPTIONCLOSE       0x0000
+#define DFCS_CAPTIONMIN         0x0001
+#define DFCS_CAPTIONMAX         0x0002
+#define DFCS_CAPTIONRESTORE     0x0003
+#define DFCS_CAPTIONHELP        0x0004
+
+#define DFCS_MENUARROW          0x0000
+#define DFCS_MENUCHECK          0x0001
+#define DFCS_MENUBULLET         0x0002
+#define DFCS_MENUARROWRIGHT     0x0004
+#define DFCS_SCROLLUP           0x0000
+#define DFCS_SCROLLDOWN         0x0001
+#define DFCS_SCROLLLEFT         0x0002
+#define DFCS_SCROLLRIGHT        0x0003
+#define DFCS_SCROLLCOMBOBOX     0x0005
+#define DFCS_SCROLLSIZEGRIP     0x0008
+#define DFCS_SCROLLSIZEGRIPRIGHT 0x0010
+
+#define DFCS_BUTTONCHECK        0x0000
+#define DFCS_BUTTONRADIOIMAGE   0x0001
+#define DFCS_BUTTONRADIOMASK    0x0002
+#define DFCS_BUTTONRADIO        0x0004
+#define DFCS_BUTTON3STATE       0x0008
+#define DFCS_BUTTONPUSH         0x0010
+
+#define DFCS_INACTIVE           0x0100
+#define DFCS_PUSHED             0x0200
+#define DFCS_CHECKED            0x0400
+
+#if(WINVER >= 0x0500)
+#define DFCS_TRANSPARENT        0x0800
+#define DFCS_HOT                0x1000
+#endif /* WINVER >= 0x0500 */
+
+#define DFCS_ADJUSTRECT         0x2000
+#define DFCS_FLAT               0x4000
+#define DFCS_MONO               0x8000
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawFrameControl(
+    IN HDC,
+    IN OUT LPRECT,
+    IN UINT,
+    IN UINT);
+
+
+/* flags for DrawCaption */
+#define DC_ACTIVE           0x0001
+#define DC_SMALLCAP         0x0002
+#define DC_ICON             0x0004
+#define DC_TEXT             0x0008
+#define DC_INBUTTON         0x0010
+#if(WINVER >= 0x0500)
+#define DC_GRADIENT         0x0020
+#endif /* WINVER >= 0x0500 */
+#if(_WIN32_WINNT >= 0x0501)
+#define DC_BUTTONS          0x1000
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawCaption(IN HWND, IN HDC, IN CONST RECT *, IN UINT);
+
+
+#define IDANI_OPEN          1
+#define IDANI_CAPTION       3
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawAnimatedRects(
+    IN HWND hwnd,
+    IN int idAni,
+    IN CONST RECT * lprcFrom,
+    IN CONST RECT * lprcTo);
+
+#endif /* WINVER >= 0x0400 */
+
+#ifndef NOCLIPBOARD
+
+
+/*
+ * Predefined Clipboard Formats
+ */
+#define CF_TEXT             1
+#define CF_BITMAP           2
+#define CF_METAFILEPICT     3
+#define CF_SYLK             4
+#define CF_DIF              5
+#define CF_TIFF             6
+#define CF_OEMTEXT          7
+#define CF_DIB              8
+#define CF_PALETTE          9
+#define CF_PENDATA          10
+#define CF_RIFF             11
+#define CF_WAVE             12
+#define CF_UNICODETEXT      13
+#define CF_ENHMETAFILE      14
+#if(WINVER >= 0x0400)
+#define CF_HDROP            15
+#define CF_LOCALE           16
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+#define CF_DIBV5            17
+#endif /* WINVER >= 0x0500 */
+
+#if(WINVER >= 0x0500)
+#define CF_MAX              18
+#elif(WINVER >= 0x0400)
+#define CF_MAX              17
+#else
+#define CF_MAX              15
+#endif
+
+#define CF_OWNERDISPLAY     0x0080
+#define CF_DSPTEXT          0x0081
+#define CF_DSPBITMAP        0x0082
+#define CF_DSPMETAFILEPICT  0x0083
+#define CF_DSPENHMETAFILE   0x008E
+
+/*
+ * "Private" formats don't get GlobalFree()'d
+ */
+#define CF_PRIVATEFIRST     0x0200
+#define CF_PRIVATELAST      0x02FF
+
+/*
+ * "GDIOBJ" formats do get DeleteObject()'d
+ */
+#define CF_GDIOBJFIRST      0x0300
+#define CF_GDIOBJLAST       0x03FF
+
+
+#endif /* !NOCLIPBOARD */
+
+/*
+ * Defines for the fVirt field of the Accelerator table structure.
+ */
+#define FVIRTKEY  TRUE          /* Assumed to be == TRUE */
+#define FNOINVERT 0x02
+#define FSHIFT    0x04
+#define FCONTROL  0x08
+#define FALT      0x10
+
+typedef struct tagACCEL {
+#ifndef _MAC
+    BYTE   fVirt;               /* Also called the flags field */
+    WORD   key;
+    WORD   cmd;
+#else
+    WORD   fVirt;               /* Also called the flags field */
+    WORD   key;
+    DWORD  cmd;
+#endif
+} ACCEL, *LPACCEL;
+
+typedef struct tagPAINTSTRUCT {
+    HDC         hdc;
+    BOOL        fErase;
+    RECT        rcPaint;
+    BOOL        fRestore;
+    BOOL        fIncUpdate;
+    BYTE        rgbReserved[32];
+} PAINTSTRUCT, *PPAINTSTRUCT, *NPPAINTSTRUCT, *LPPAINTSTRUCT;
+
+typedef struct tagCREATESTRUCTA {
+    LPVOID      lpCreateParams;
+    HINSTANCE   hInstance;
+    HMENU       hMenu;
+    HWND        hwndParent;
+    int         cy;
+    int         cx;
+    int         y;
+    int         x;
+    LONG        style;
+    LPCSTR      lpszName;
+    LPCSTR      lpszClass;
+    DWORD       dwExStyle;
+} CREATESTRUCTA, *LPCREATESTRUCTA;
+typedef struct tagCREATESTRUCTW {
+    LPVOID      lpCreateParams;
+    HINSTANCE   hInstance;
+    HMENU       hMenu;
+    HWND        hwndParent;
+    int         cy;
+    int         cx;
+    int         y;
+    int         x;
+    LONG        style;
+    LPCWSTR     lpszName;
+    LPCWSTR     lpszClass;
+    DWORD       dwExStyle;
+} CREATESTRUCTW, *LPCREATESTRUCTW;
+#ifdef UNICODE
+typedef CREATESTRUCTW CREATESTRUCT;
+typedef LPCREATESTRUCTW LPCREATESTRUCT;
+#else
+typedef CREATESTRUCTA CREATESTRUCT;
+typedef LPCREATESTRUCTA LPCREATESTRUCT;
+#endif // UNICODE
+
+typedef struct tagWINDOWPLACEMENT {
+    UINT  length;
+    UINT  flags;
+    UINT  showCmd;
+    POINT ptMinPosition;
+    POINT ptMaxPosition;
+    RECT  rcNormalPosition;
+#ifdef _MAC
+    RECT  rcDevice;
+#endif
+} WINDOWPLACEMENT;
+typedef WINDOWPLACEMENT *PWINDOWPLACEMENT, *LPWINDOWPLACEMENT;
+
+#define WPF_SETMINPOSITION          0x0001
+#define WPF_RESTORETOMAXIMIZED      0x0002
+#if(_WIN32_WINNT >= 0x0500)
+#define WPF_ASYNCWINDOWPLACEMENT    0x0004
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+typedef struct tagNMHDR
+{
+    HWND      hwndFrom;
+    UINT_PTR  idFrom;
+    UINT      code;         // NM_ code
+}   NMHDR;
+typedef NMHDR FAR * LPNMHDR;
+
+typedef struct tagSTYLESTRUCT
+{
+    DWORD   styleOld;
+    DWORD   styleNew;
+} STYLESTRUCT, * LPSTYLESTRUCT;
+#endif /* WINVER >= 0x0400 */
+
+
+/*
+ * Owner draw control types
+ */
+#define ODT_MENU        1
+#define ODT_LISTBOX     2
+#define ODT_COMBOBOX    3
+#define ODT_BUTTON      4
+#if(WINVER >= 0x0400)
+#define ODT_STATIC      5
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Owner draw actions
+ */
+#define ODA_DRAWENTIRE  0x0001
+#define ODA_SELECT      0x0002
+#define ODA_FOCUS       0x0004
+
+/*
+ * Owner draw state
+ */
+#define ODS_SELECTED    0x0001
+#define ODS_GRAYED      0x0002
+#define ODS_DISABLED    0x0004
+#define ODS_CHECKED     0x0008
+#define ODS_FOCUS       0x0010
+#if(WINVER >= 0x0400)
+#define ODS_DEFAULT         0x0020
+#define ODS_COMBOBOXEDIT    0x1000
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+#define ODS_HOTLIGHT        0x0040
+#define ODS_INACTIVE        0x0080
+#if(_WIN32_WINNT >= 0x0500)
+#define ODS_NOACCEL         0x0100
+#define ODS_NOFOCUSRECT     0x0200
+#endif /* _WIN32_WINNT >= 0x0500 */
+#endif /* WINVER >= 0x0500 */
+
+/*
+ * MEASUREITEMSTRUCT for ownerdraw
+ */
+typedef struct tagMEASUREITEMSTRUCT {
+    UINT       CtlType;
+    UINT       CtlID;
+    UINT       itemID;
+    UINT       itemWidth;
+    UINT       itemHeight;
+    ULONG_PTR  itemData;
+} MEASUREITEMSTRUCT, NEAR *PMEASUREITEMSTRUCT, FAR *LPMEASUREITEMSTRUCT;
+
+
+/*
+ * DRAWITEMSTRUCT for ownerdraw
+ */
+typedef struct tagDRAWITEMSTRUCT {
+    UINT        CtlType;
+    UINT        CtlID;
+    UINT        itemID;
+    UINT        itemAction;
+    UINT        itemState;
+    HWND        hwndItem;
+    HDC         hDC;
+    RECT        rcItem;
+    ULONG_PTR   itemData;
+} DRAWITEMSTRUCT, NEAR *PDRAWITEMSTRUCT, FAR *LPDRAWITEMSTRUCT;
+
+/*
+ * DELETEITEMSTRUCT for ownerdraw
+ */
+typedef struct tagDELETEITEMSTRUCT {
+    UINT       CtlType;
+    UINT       CtlID;
+    UINT       itemID;
+    HWND       hwndItem;
+    ULONG_PTR  itemData;
+} DELETEITEMSTRUCT, NEAR *PDELETEITEMSTRUCT, FAR *LPDELETEITEMSTRUCT;
+
+/*
+ * COMPAREITEMSTUCT for ownerdraw sorting
+ */
+typedef struct tagCOMPAREITEMSTRUCT {
+    UINT        CtlType;
+    UINT        CtlID;
+    HWND        hwndItem;
+    UINT        itemID1;
+    ULONG_PTR   itemData1;
+    UINT        itemID2;
+    ULONG_PTR   itemData2;
+    DWORD       dwLocaleId;
+} COMPAREITEMSTRUCT, NEAR *PCOMPAREITEMSTRUCT, FAR *LPCOMPAREITEMSTRUCT;
+
+#ifndef NOMSG
+
+/*
+ * Message Function Templates
+ */
+
+WINUSERAPI
+BOOL
+WINAPI
+GetMessageA(
+    OUT LPMSG lpMsg,
+    IN HWND hWnd,
+    IN UINT wMsgFilterMin,
+    IN UINT wMsgFilterMax);
+WINUSERAPI
+BOOL
+WINAPI
+GetMessageW(
+    OUT LPMSG lpMsg,
+    IN HWND hWnd,
+    IN UINT wMsgFilterMin,
+    IN UINT wMsgFilterMax);
+#ifdef UNICODE
+#define GetMessage  GetMessageW
+#else
+#define GetMessage  GetMessageA
+#endif // !UNICODE
+
+
+WINUSERAPI
+BOOL
+WINAPI
+TranslateMessage(
+    IN CONST MSG *lpMsg);
+
+WINUSERAPI
+LRESULT
+WINAPI
+DispatchMessageA(
+    IN CONST MSG *lpMsg);
+WINUSERAPI
+LRESULT
+WINAPI
+DispatchMessageW(
+    IN CONST MSG *lpMsg);
+#ifdef UNICODE
+#define DispatchMessage  DispatchMessageW
+#else
+#define DispatchMessage  DispatchMessageA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+SetMessageQueue(
+    IN int cMessagesMax);
+
+WINUSERAPI
+BOOL
+WINAPI
+PeekMessageA(
+    OUT LPMSG lpMsg,
+    IN HWND hWnd,
+    IN UINT wMsgFilterMin,
+    IN UINT wMsgFilterMax,
+    IN UINT wRemoveMsg);
+WINUSERAPI
+BOOL
+WINAPI
+PeekMessageW(
+    OUT LPMSG lpMsg,
+    IN HWND hWnd,
+    IN UINT wMsgFilterMin,
+    IN UINT wMsgFilterMax,
+    IN UINT wRemoveMsg);
+#ifdef UNICODE
+#define PeekMessage  PeekMessageW
+#else
+#define PeekMessage  PeekMessageA
+#endif // !UNICODE
+
+
+/*
+ * PeekMessage() Options
+ */
+#define PM_NOREMOVE         0x0000
+#define PM_REMOVE           0x0001
+#define PM_NOYIELD          0x0002
+#if(WINVER >= 0x0500)
+#define PM_QS_INPUT         (QS_INPUT << 16)
+#define PM_QS_POSTMESSAGE   ((QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER) << 16)
+#define PM_QS_PAINT         (QS_PAINT << 16)
+#define PM_QS_SENDMESSAGE   (QS_SENDMESSAGE << 16)
+#endif /* WINVER >= 0x0500 */
+
+
+#endif /* !NOMSG */
+
+WINUSERAPI
+BOOL
+WINAPI
+RegisterHotKey(
+    IN HWND hWnd,
+    IN int id,
+    IN UINT fsModifiers,
+    IN UINT vk);
+
+WINUSERAPI
+BOOL
+WINAPI
+UnregisterHotKey(
+    IN HWND hWnd,
+    IN int id);
+
+#define MOD_ALT         0x0001
+#define MOD_CONTROL     0x0002
+#define MOD_SHIFT       0x0004
+#define MOD_WIN         0x0008
+
+
+#define IDHOT_SNAPWINDOW        (-1)    /* SHIFT-PRINTSCRN  */
+#define IDHOT_SNAPDESKTOP       (-2)    /* PRINTSCRN        */
+
+#ifdef WIN_INTERNAL
+    #ifndef LSTRING
+    #define NOLSTRING
+    #endif /* LSTRING */
+    #ifndef LFILEIO
+    #define NOLFILEIO
+    #endif /* LFILEIO */
+#endif /* WIN_INTERNAL */
+
+#if(WINVER >= 0x0400)
+
+#define ENDSESSION_LOGOFF    0x80000000
+#endif /* WINVER >= 0x0400 */
+
+#define EWX_LOGOFF          0
+#define EWX_SHUTDOWN        0x00000001
+#define EWX_REBOOT          0x00000002
+#define EWX_FORCE           0x00000004
+#define EWX_POWEROFF        0x00000008
+#if(_WIN32_WINNT >= 0x0500)
+#define EWX_FORCEIFHUNG     0x00000010
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+
+#define ExitWindows(dwReserved, Code) ExitWindowsEx(EWX_LOGOFF, 0xFFFFFFFF)
+
+WINUSERAPI
+BOOL
+WINAPI
+ExitWindowsEx(
+    IN UINT uFlags,
+    IN DWORD dwReserved);
+
+WINUSERAPI
+BOOL
+WINAPI
+SwapMouseButton(
+    IN BOOL fSwap);
+
+WINUSERAPI
+DWORD
+WINAPI
+GetMessagePos(
+    VOID);
+
+WINUSERAPI
+LONG
+WINAPI
+GetMessageTime(
+    VOID);
+
+WINUSERAPI
+LPARAM
+WINAPI
+GetMessageExtraInfo(
+    VOID);
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+LPARAM
+WINAPI
+SetMessageExtraInfo(
+    IN LPARAM lParam);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+LRESULT
+WINAPI
+SendMessageA(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+LRESULT
+WINAPI
+SendMessageW(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define SendMessage  SendMessageW
+#else
+#define SendMessage  SendMessageA
+#endif // !UNICODE
+
+WINUSERAPI
+LRESULT
+WINAPI
+SendMessageTimeoutA(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam,
+    IN UINT fuFlags,
+    IN UINT uTimeout,
+    OUT PDWORD_PTR lpdwResult);
+WINUSERAPI
+LRESULT
+WINAPI
+SendMessageTimeoutW(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam,
+    IN UINT fuFlags,
+    IN UINT uTimeout,
+    OUT PDWORD_PTR lpdwResult);
+#ifdef UNICODE
+#define SendMessageTimeout  SendMessageTimeoutW
+#else
+#define SendMessageTimeout  SendMessageTimeoutA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+SendNotifyMessageA(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+BOOL
+WINAPI
+SendNotifyMessageW(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define SendNotifyMessage  SendNotifyMessageW
+#else
+#define SendNotifyMessage  SendNotifyMessageA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+SendMessageCallbackA(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam,
+    IN SENDASYNCPROC lpResultCallBack,
+    IN ULONG_PTR dwData);
+WINUSERAPI
+BOOL
+WINAPI
+SendMessageCallbackW(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam,
+    IN SENDASYNCPROC lpResultCallBack,
+    IN ULONG_PTR dwData);
+#ifdef UNICODE
+#define SendMessageCallback  SendMessageCallbackW
+#else
+#define SendMessageCallback  SendMessageCallbackA
+#endif // !UNICODE
+
+#if(_WIN32_WINNT >= 0x0501)
+typedef struct {
+    UINT  cbSize;
+    HDESK hdesk;
+    HWND  hwnd;
+    LUID  luid;
+} BSMINFO, *PBSMINFO;
+
+WINUSERAPI
+long
+WINAPI
+BroadcastSystemMessageExA(
+    IN DWORD,
+    IN LPDWORD,
+    IN UINT,
+    IN WPARAM,
+    IN LPARAM,
+    OUT PBSMINFO);
+WINUSERAPI
+long
+WINAPI
+BroadcastSystemMessageExW(
+    IN DWORD,
+    IN LPDWORD,
+    IN UINT,
+    IN WPARAM,
+    IN LPARAM,
+    OUT PBSMINFO);
+#ifdef UNICODE
+#define BroadcastSystemMessageEx  BroadcastSystemMessageExW
+#else
+#define BroadcastSystemMessageEx  BroadcastSystemMessageExA
+#endif // !UNICODE
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(WINVER >= 0x0400)
+
+#if defined(_WIN32_WINNT)
+WINUSERAPI
+long
+WINAPI
+BroadcastSystemMessageA(
+    IN DWORD,
+    IN LPDWORD,
+    IN UINT,
+    IN WPARAM,
+    IN LPARAM);
+WINUSERAPI
+long
+WINAPI
+BroadcastSystemMessageW(
+    IN DWORD,
+    IN LPDWORD,
+    IN UINT,
+    IN WPARAM,
+    IN LPARAM);
+#ifdef UNICODE
+#define BroadcastSystemMessage  BroadcastSystemMessageW
+#else
+#define BroadcastSystemMessage  BroadcastSystemMessageA
+#endif // !UNICODE
+#elif defined(_WIN32_WINDOWS)
+// The Win95 version isn't A/W decorated
+WINUSERAPI
+long
+WINAPI
+BroadcastSystemMessage(
+    IN DWORD,
+    IN LPDWORD,
+    IN UINT,
+    IN WPARAM,
+    IN LPARAM);
+
+#endif
+
+//Broadcast Special Message Recipient list
+#define BSM_ALLCOMPONENTS       0x00000000
+#define BSM_VXDS                0x00000001
+#define BSM_NETDRIVER           0x00000002
+#define BSM_INSTALLABLEDRIVERS  0x00000004
+#define BSM_APPLICATIONS        0x00000008
+#define BSM_ALLDESKTOPS         0x00000010
+
+//Broadcast Special Message Flags
+#define BSF_QUERY               0x00000001
+#define BSF_IGNORECURRENTTASK   0x00000002
+#define BSF_FLUSHDISK           0x00000004
+#define BSF_NOHANG              0x00000008
+#define BSF_POSTMESSAGE         0x00000010
+#define BSF_FORCEIFHUNG         0x00000020
+#define BSF_NOTIMEOUTIFNOTHUNG  0x00000040
+#if(_WIN32_WINNT >= 0x0500)
+#define BSF_ALLOWSFW            0x00000080
+#define BSF_SENDNOTIFYMESSAGE   0x00000100
+#endif /* _WIN32_WINNT >= 0x0500 */
+#if(_WIN32_WINNT >= 0x0501)
+#define BSF_RETURNHDESK         0x00000200
+#define BSF_LUID                0x00000400
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define BROADCAST_QUERY_DENY         0x424D5144  // Return this value to deny a query.
+#endif /* WINVER >= 0x0400 */
+
+// RegisterDeviceNotification
+
+#if(WINVER >= 0x0500)
+typedef  PVOID           HDEVNOTIFY;
+typedef  HDEVNOTIFY     *PHDEVNOTIFY;
+
+#define DEVICE_NOTIFY_WINDOW_HANDLE          0x00000000
+#define DEVICE_NOTIFY_SERVICE_HANDLE         0x00000001
+#if(_WIN32_WINNT >= 0x0501)
+#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES  0x00000004
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI
+HDEVNOTIFY
+WINAPI
+RegisterDeviceNotificationA(
+    IN HANDLE hRecipient,
+    IN LPVOID NotificationFilter,
+    IN DWORD Flags
+    );
+WINUSERAPI
+HDEVNOTIFY
+WINAPI
+RegisterDeviceNotificationW(
+    IN HANDLE hRecipient,
+    IN LPVOID NotificationFilter,
+    IN DWORD Flags
+    );
+#ifdef UNICODE
+#define RegisterDeviceNotification  RegisterDeviceNotificationW
+#else
+#define RegisterDeviceNotification  RegisterDeviceNotificationA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+UnregisterDeviceNotification(
+    IN HDEVNOTIFY Handle
+    );
+#endif /* WINVER >= 0x0500 */
+
+
+WINUSERAPI
+BOOL
+WINAPI
+PostMessageA(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+BOOL
+WINAPI
+PostMessageW(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define PostMessage  PostMessageW
+#else
+#define PostMessage  PostMessageA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+PostThreadMessageA(
+    IN DWORD idThread,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+BOOL
+WINAPI
+PostThreadMessageW(
+    IN DWORD idThread,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define PostThreadMessage  PostThreadMessageW
+#else
+#define PostThreadMessage  PostThreadMessageA
+#endif // !UNICODE
+
+#define PostAppMessageA(idThread, wMsg, wParam, lParam)\
+        PostThreadMessageA((DWORD)idThread, wMsg, wParam, lParam)
+#define PostAppMessageW(idThread, wMsg, wParam, lParam)\
+        PostThreadMessageW((DWORD)idThread, wMsg, wParam, lParam)
+#ifdef UNICODE
+#define PostAppMessage  PostAppMessageW
+#else
+#define PostAppMessage  PostAppMessageA
+#endif // !UNICODE
+
+/*
+ * Special HWND value for use with PostMessage() and SendMessage()
+ */
+#define HWND_BROADCAST  ((HWND)0xffff)
+
+#if(WINVER >= 0x0500)
+#define HWND_MESSAGE     ((HWND)-3)
+#endif /* WINVER >= 0x0500 */
+
+WINUSERAPI
+BOOL
+WINAPI
+AttachThreadInput(
+    IN DWORD idAttach,
+    IN DWORD idAttachTo,
+    IN BOOL fAttach);
+
+
+WINUSERAPI
+BOOL
+WINAPI
+ReplyMessage(
+    IN LRESULT lResult);
+
+WINUSERAPI
+BOOL
+WINAPI
+WaitMessage(
+    VOID);
+
+
+WINUSERAPI
+DWORD
+WINAPI
+WaitForInputIdle(
+    IN HANDLE hProcess,
+    IN DWORD dwMilliseconds);
+
+WINUSERAPI
+#ifndef _MAC
+LRESULT
+WINAPI
+#else
+LRESULT
+CALLBACK
+#endif
+DefWindowProcA(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+#ifndef _MAC
+LRESULT
+WINAPI
+#else
+LRESULT
+CALLBACK
+#endif
+DefWindowProcW(
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define DefWindowProc  DefWindowProcW
+#else
+#define DefWindowProc  DefWindowProcA
+#endif // !UNICODE
+
+WINUSERAPI
+VOID
+WINAPI
+PostQuitMessage(
+    IN int nExitCode);
+
+#ifdef STRICT
+
+WINUSERAPI
+LRESULT
+WINAPI
+CallWindowProcA(
+    IN WNDPROC lpPrevWndFunc,
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+LRESULT
+WINAPI
+CallWindowProcW(
+    IN WNDPROC lpPrevWndFunc,
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define CallWindowProc  CallWindowProcW
+#else
+#define CallWindowProc  CallWindowProcA
+#endif // !UNICODE
+
+#else /* !STRICT */
+
+WINUSERAPI
+LRESULT
+WINAPI
+CallWindowProcA(
+    IN FARPROC lpPrevWndFunc,
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+LRESULT
+WINAPI
+CallWindowProcW(
+    IN FARPROC lpPrevWndFunc,
+    IN HWND hWnd,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define CallWindowProc  CallWindowProcW
+#else
+#define CallWindowProc  CallWindowProcA
+#endif // !UNICODE
+
+#endif /* !STRICT */
+
+WINUSERAPI
+BOOL
+WINAPI
+InSendMessage(
+    VOID);
+
+#if(WINVER >= 0x0500)
+WINUSERAPI
+DWORD
+WINAPI
+InSendMessageEx(
+    IN LPVOID lpReserved);
+
+/*
+ * InSendMessageEx return value
+ */
+#define ISMEX_NOSEND      0x00000000
+#define ISMEX_SEND        0x00000001
+#define ISMEX_NOTIFY      0x00000002
+#define ISMEX_CALLBACK    0x00000004
+#define ISMEX_REPLIED     0x00000008
+#endif /* WINVER >= 0x0500 */
+
+WINUSERAPI
+UINT
+WINAPI
+GetDoubleClickTime(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetDoubleClickTime(
+    IN UINT);
+
+WINUSERAPI
+ATOM
+WINAPI
+RegisterClassA(
+    IN CONST WNDCLASSA *lpWndClass);
+WINUSERAPI
+ATOM
+WINAPI
+RegisterClassW(
+    IN CONST WNDCLASSW *lpWndClass);
+#ifdef UNICODE
+#define RegisterClass  RegisterClassW
+#else
+#define RegisterClass  RegisterClassA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+UnregisterClassA(
+    IN LPCSTR lpClassName,
+    IN HINSTANCE hInstance);
+WINUSERAPI
+BOOL
+WINAPI
+UnregisterClassW(
+    IN LPCWSTR lpClassName,
+    IN HINSTANCE hInstance);
+#ifdef UNICODE
+#define UnregisterClass  UnregisterClassW
+#else
+#define UnregisterClass  UnregisterClassA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+GetClassInfoA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpClassName,
+    OUT LPWNDCLASSA lpWndClass);
+WINUSERAPI
+BOOL
+WINAPI
+GetClassInfoW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpClassName,
+    OUT LPWNDCLASSW lpWndClass);
+#ifdef UNICODE
+#define GetClassInfo  GetClassInfoW
+#else
+#define GetClassInfo  GetClassInfoA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+ATOM
+WINAPI
+RegisterClassExA(
+    IN CONST WNDCLASSEXA *);
+WINUSERAPI
+ATOM
+WINAPI
+RegisterClassExW(
+    IN CONST WNDCLASSEXW *);
+#ifdef UNICODE
+#define RegisterClassEx  RegisterClassExW
+#else
+#define RegisterClassEx  RegisterClassExA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+GetClassInfoExA(
+    IN HINSTANCE,
+    IN LPCSTR,
+    OUT LPWNDCLASSEXA);
+WINUSERAPI
+BOOL
+WINAPI
+GetClassInfoExW(
+    IN HINSTANCE,
+    IN LPCWSTR,
+    OUT LPWNDCLASSEXW);
+#ifdef UNICODE
+#define GetClassInfoEx  GetClassInfoExW
+#else
+#define GetClassInfoEx  GetClassInfoExA
+#endif // !UNICODE
+
+#endif /* WINVER >= 0x0400 */
+
+#define CW_USEDEFAULT       ((int)0x80000000)
+
+/*
+ * Special value for CreateWindow, et al.
+ */
+#define HWND_DESKTOP        ((HWND)0)
+
+#if(_WIN32_WINNT >= 0x0501)
+typedef BOOLEAN (WINAPI * PREGISTERCLASSNAMEW)(LPCWSTR);
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI
+HWND
+WINAPI
+CreateWindowExA(
+    IN DWORD dwExStyle,
+    IN LPCSTR lpClassName,
+    IN LPCSTR lpWindowName,
+    IN DWORD dwStyle,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight,
+    IN HWND hWndParent,
+    IN HMENU hMenu,
+    IN HINSTANCE hInstance,
+    IN LPVOID lpParam);
+WINUSERAPI
+HWND
+WINAPI
+CreateWindowExW(
+    IN DWORD dwExStyle,
+    IN LPCWSTR lpClassName,
+    IN LPCWSTR lpWindowName,
+    IN DWORD dwStyle,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight,
+    IN HWND hWndParent,
+    IN HMENU hMenu,
+    IN HINSTANCE hInstance,
+    IN LPVOID lpParam);
+#ifdef UNICODE
+#define CreateWindowEx  CreateWindowExW
+#else
+#define CreateWindowEx  CreateWindowExA
+#endif // !UNICODE
+
+#define CreateWindowA(lpClassName, lpWindowName, dwStyle, x, y,\
+nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam)\
+CreateWindowExA(0L, lpClassName, lpWindowName, dwStyle, x, y,\
+nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam)
+#define CreateWindowW(lpClassName, lpWindowName, dwStyle, x, y,\
+nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam)\
+CreateWindowExW(0L, lpClassName, lpWindowName, dwStyle, x, y,\
+nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam)
+#ifdef UNICODE
+#define CreateWindow  CreateWindowW
+#else
+#define CreateWindow  CreateWindowA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+IsWindow(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsMenu(
+    IN HMENU hMenu);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsChild(
+    IN HWND hWndParent,
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+DestroyWindow(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+ShowWindow(
+    IN HWND hWnd,
+    IN int nCmdShow);
+
+#if(WINVER >= 0x0500)
+WINUSERAPI
+BOOL
+WINAPI
+AnimateWindow(
+    IN HWND hWnd,
+    IN DWORD dwTime,
+    IN DWORD dwFlags);
+#endif /* WINVER >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+#if defined(_WINGDI_) && !defined (NOGDI)
+
+WINUSERAPI
+BOOL
+WINAPI
+UpdateLayeredWindow(
+    HWND hWnd,
+    HDC hdcDst,
+    POINT *pptDst,
+    SIZE *psize,
+    HDC hdcSrc,
+    POINT *pptSrc,
+    COLORREF crKey,
+    BLENDFUNCTION *pblend,
+    DWORD dwFlags);
+#endif
+
+#if(_WIN32_WINNT >= 0x0501)
+WINUSERAPI
+BOOL
+WINAPI
+GetLayeredWindowAttributes(
+    HWND hwnd,
+    COLORREF *pcrKey,
+    BYTE *pbAlpha,
+    DWORD *pdwFlags);
+
+#define PW_CLIENTONLY           0x00000001
+
+
+WINUSERAPI
+BOOL
+WINAPI
+PrintWindow(
+    IN HWND hwnd,
+    IN HDC hdcBlt,
+    IN UINT nFlags);
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI
+BOOL
+WINAPI
+SetLayeredWindowAttributes(
+    HWND hwnd,
+    COLORREF crKey,
+    BYTE bAlpha,
+    DWORD dwFlags);
+
+#define LWA_COLORKEY            0x00000001
+#define LWA_ALPHA               0x00000002
+
+
+#define ULW_COLORKEY            0x00000001
+#define ULW_ALPHA               0x00000002
+#define ULW_OPAQUE              0x00000004
+
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+BOOL
+WINAPI
+ShowWindowAsync(
+    IN HWND hWnd,
+    IN int nCmdShow);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+FlashWindow(
+    IN HWND hWnd,
+    IN BOOL bInvert);
+
+#if(WINVER >= 0x0500)
+typedef struct {
+    UINT  cbSize;
+    HWND  hwnd;
+    DWORD dwFlags;
+    UINT  uCount;
+    DWORD dwTimeout;
+} FLASHWINFO, *PFLASHWINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+FlashWindowEx(
+    PFLASHWINFO pfwi);
+
+#define FLASHW_STOP         0
+#define FLASHW_CAPTION      0x00000001
+#define FLASHW_TRAY         0x00000002
+#define FLASHW_ALL          (FLASHW_CAPTION | FLASHW_TRAY)
+#define FLASHW_TIMER        0x00000004
+#define FLASHW_TIMERNOFG    0x0000000C
+
+#endif /* WINVER >= 0x0500 */
+
+WINUSERAPI
+BOOL
+WINAPI
+ShowOwnedPopups(
+    IN HWND hWnd,
+    IN BOOL fShow);
+
+WINUSERAPI
+BOOL
+WINAPI
+OpenIcon(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+CloseWindow(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+MoveWindow(
+    IN HWND hWnd,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight,
+    IN BOOL bRepaint);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetWindowPos(
+    IN HWND hWnd,
+    IN HWND hWndInsertAfter,
+    IN int X,
+    IN int Y,
+    IN int cx,
+    IN int cy,
+    IN UINT uFlags);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetWindowPlacement(
+    IN HWND hWnd,
+    OUT WINDOWPLACEMENT *lpwndpl);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetWindowPlacement(
+    IN HWND hWnd,
+    IN CONST WINDOWPLACEMENT *lpwndpl);
+
+
+#ifndef NODEFERWINDOWPOS
+
+WINUSERAPI
+HDWP
+WINAPI
+BeginDeferWindowPos(
+    IN int nNumWindows);
+
+WINUSERAPI
+HDWP
+WINAPI
+DeferWindowPos(
+    IN HDWP hWinPosInfo,
+    IN HWND hWnd,
+    IN HWND hWndInsertAfter,
+    IN int x,
+    IN int y,
+    IN int cx,
+    IN int cy,
+    IN UINT uFlags);
+
+WINUSERAPI
+BOOL
+WINAPI
+EndDeferWindowPos(
+    IN HDWP hWinPosInfo);
+
+#endif /* !NODEFERWINDOWPOS */
+
+WINUSERAPI
+BOOL
+WINAPI
+IsWindowVisible(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsIconic(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+AnyPopup(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+BringWindowToTop(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsZoomed(
+    IN HWND hWnd);
+
+/*
+ * SetWindowPos Flags
+ */
+#define SWP_NOSIZE          0x0001
+#define SWP_NOMOVE          0x0002
+#define SWP_NOZORDER        0x0004
+#define SWP_NOREDRAW        0x0008
+#define SWP_NOACTIVATE      0x0010
+#define SWP_FRAMECHANGED    0x0020  /* The frame changed: send WM_NCCALCSIZE */
+#define SWP_SHOWWINDOW      0x0040
+#define SWP_HIDEWINDOW      0x0080
+#define SWP_NOCOPYBITS      0x0100
+#define SWP_NOOWNERZORDER   0x0200  /* Don't do owner Z ordering */
+#define SWP_NOSENDCHANGING  0x0400  /* Don't send WM_WINDOWPOSCHANGING */
+
+#define SWP_DRAWFRAME       SWP_FRAMECHANGED
+#define SWP_NOREPOSITION    SWP_NOOWNERZORDER
+
+#if(WINVER >= 0x0400)
+#define SWP_DEFERERASE      0x2000
+#define SWP_ASYNCWINDOWPOS  0x4000
+#endif /* WINVER >= 0x0400 */
+
+
+#define HWND_TOP        ((HWND)0)
+#define HWND_BOTTOM     ((HWND)1)
+#define HWND_TOPMOST    ((HWND)-1)
+#define HWND_NOTOPMOST  ((HWND)-2)
+
+#ifndef NOCTLMGR
+
+/*
+ * WARNING:
+ * The following structures must NOT be DWORD padded because they are
+ * followed by strings, etc that do not have to be DWORD aligned.
+ */
+#include <pshpack2.h>
+
+/*
+ * original NT 32 bit dialog template:
+ */
+typedef struct {
+    DWORD style;
+    DWORD dwExtendedStyle;
+    WORD cdit;
+    short x;
+    short y;
+    short cx;
+    short cy;
+} DLGTEMPLATE;
+typedef DLGTEMPLATE *LPDLGTEMPLATEA;
+typedef DLGTEMPLATE *LPDLGTEMPLATEW;
+#ifdef UNICODE
+typedef LPDLGTEMPLATEW LPDLGTEMPLATE;
+#else
+typedef LPDLGTEMPLATEA LPDLGTEMPLATE;
+#endif // UNICODE
+typedef CONST DLGTEMPLATE *LPCDLGTEMPLATEA;
+typedef CONST DLGTEMPLATE *LPCDLGTEMPLATEW;
+#ifdef UNICODE
+typedef LPCDLGTEMPLATEW LPCDLGTEMPLATE;
+#else
+typedef LPCDLGTEMPLATEA LPCDLGTEMPLATE;
+#endif // UNICODE
+
+/*
+ * 32 bit Dialog item template.
+ */
+typedef struct {
+    DWORD style;
+    DWORD dwExtendedStyle;
+    short x;
+    short y;
+    short cx;
+    short cy;
+    WORD id;
+} DLGITEMTEMPLATE;
+typedef DLGITEMTEMPLATE *PDLGITEMTEMPLATEA;
+typedef DLGITEMTEMPLATE *PDLGITEMTEMPLATEW;
+#ifdef UNICODE
+typedef PDLGITEMTEMPLATEW PDLGITEMTEMPLATE;
+#else
+typedef PDLGITEMTEMPLATEA PDLGITEMTEMPLATE;
+#endif // UNICODE
+typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEA;
+typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEW;
+#ifdef UNICODE
+typedef LPDLGITEMTEMPLATEW LPDLGITEMTEMPLATE;
+#else
+typedef LPDLGITEMTEMPLATEA LPDLGITEMTEMPLATE;
+#endif // UNICODE
+
+
+#include <poppack.h> /* Resume normal packing */
+
+WINUSERAPI
+HWND
+WINAPI
+CreateDialogParamA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpTemplateName,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+WINUSERAPI
+HWND
+WINAPI
+CreateDialogParamW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpTemplateName,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+#ifdef UNICODE
+#define CreateDialogParam  CreateDialogParamW
+#else
+#define CreateDialogParam  CreateDialogParamA
+#endif // !UNICODE
+
+WINUSERAPI
+HWND
+WINAPI
+CreateDialogIndirectParamA(
+    IN HINSTANCE hInstance,
+    IN LPCDLGTEMPLATEA lpTemplate,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+WINUSERAPI
+HWND
+WINAPI
+CreateDialogIndirectParamW(
+    IN HINSTANCE hInstance,
+    IN LPCDLGTEMPLATEW lpTemplate,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+#ifdef UNICODE
+#define CreateDialogIndirectParam  CreateDialogIndirectParamW
+#else
+#define CreateDialogIndirectParam  CreateDialogIndirectParamA
+#endif // !UNICODE
+
+#define CreateDialogA(hInstance, lpName, hWndParent, lpDialogFunc) \
+CreateDialogParamA(hInstance, lpName, hWndParent, lpDialogFunc, 0L)
+#define CreateDialogW(hInstance, lpName, hWndParent, lpDialogFunc) \
+CreateDialogParamW(hInstance, lpName, hWndParent, lpDialogFunc, 0L)
+#ifdef UNICODE
+#define CreateDialog  CreateDialogW
+#else
+#define CreateDialog  CreateDialogA
+#endif // !UNICODE
+
+#define CreateDialogIndirectA(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
+CreateDialogIndirectParamA(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
+#define CreateDialogIndirectW(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
+CreateDialogIndirectParamW(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
+#ifdef UNICODE
+#define CreateDialogIndirect  CreateDialogIndirectW
+#else
+#define CreateDialogIndirect  CreateDialogIndirectA
+#endif // !UNICODE
+
+WINUSERAPI
+INT_PTR
+WINAPI
+DialogBoxParamA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpTemplateName,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+WINUSERAPI
+INT_PTR
+WINAPI
+DialogBoxParamW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpTemplateName,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+#ifdef UNICODE
+#define DialogBoxParam  DialogBoxParamW
+#else
+#define DialogBoxParam  DialogBoxParamA
+#endif // !UNICODE
+
+WINUSERAPI
+INT_PTR
+WINAPI
+DialogBoxIndirectParamA(
+    IN HINSTANCE hInstance,
+    IN LPCDLGTEMPLATEA hDialogTemplate,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+WINUSERAPI
+INT_PTR
+WINAPI
+DialogBoxIndirectParamW(
+    IN HINSTANCE hInstance,
+    IN LPCDLGTEMPLATEW hDialogTemplate,
+    IN HWND hWndParent,
+    IN DLGPROC lpDialogFunc,
+    IN LPARAM dwInitParam);
+#ifdef UNICODE
+#define DialogBoxIndirectParam  DialogBoxIndirectParamW
+#else
+#define DialogBoxIndirectParam  DialogBoxIndirectParamA
+#endif // !UNICODE
+
+#define DialogBoxA(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
+DialogBoxParamA(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
+#define DialogBoxW(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
+DialogBoxParamW(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
+#ifdef UNICODE
+#define DialogBox  DialogBoxW
+#else
+#define DialogBox  DialogBoxA
+#endif // !UNICODE
+
+#define DialogBoxIndirectA(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
+DialogBoxIndirectParamA(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
+#define DialogBoxIndirectW(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
+DialogBoxIndirectParamW(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
+#ifdef UNICODE
+#define DialogBoxIndirect  DialogBoxIndirectW
+#else
+#define DialogBoxIndirect  DialogBoxIndirectA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+EndDialog(
+    IN HWND hDlg,
+    IN INT_PTR nResult);
+
+WINUSERAPI
+HWND
+WINAPI
+GetDlgItem(
+    IN HWND hDlg,
+    IN int nIDDlgItem);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetDlgItemInt(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    IN UINT uValue,
+    IN BOOL bSigned);
+
+WINUSERAPI
+UINT
+WINAPI
+GetDlgItemInt(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    OUT BOOL *lpTranslated,
+    IN BOOL bSigned);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetDlgItemTextA(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    IN LPCSTR lpString);
+WINUSERAPI
+BOOL
+WINAPI
+SetDlgItemTextW(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    IN LPCWSTR lpString);
+#ifdef UNICODE
+#define SetDlgItemText  SetDlgItemTextW
+#else
+#define SetDlgItemText  SetDlgItemTextA
+#endif // !UNICODE
+
+WINUSERAPI
+UINT
+WINAPI
+GetDlgItemTextA(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    OUT LPSTR lpString,
+    IN int nMaxCount);
+WINUSERAPI
+UINT
+WINAPI
+GetDlgItemTextW(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    OUT LPWSTR lpString,
+    IN int nMaxCount);
+#ifdef UNICODE
+#define GetDlgItemText  GetDlgItemTextW
+#else
+#define GetDlgItemText  GetDlgItemTextA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+CheckDlgButton(
+    IN HWND hDlg,
+    IN int nIDButton,
+    IN UINT uCheck);
+
+WINUSERAPI
+BOOL
+WINAPI
+CheckRadioButton(
+    IN HWND hDlg,
+    IN int nIDFirstButton,
+    IN int nIDLastButton,
+    IN int nIDCheckButton);
+
+WINUSERAPI
+UINT
+WINAPI
+IsDlgButtonChecked(
+    IN HWND hDlg,
+    IN int nIDButton);
+
+WINUSERAPI
+LRESULT
+WINAPI
+SendDlgItemMessageA(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+LRESULT
+WINAPI
+SendDlgItemMessageW(
+    IN HWND hDlg,
+    IN int nIDDlgItem,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define SendDlgItemMessage  SendDlgItemMessageW
+#else
+#define SendDlgItemMessage  SendDlgItemMessageA
+#endif // !UNICODE
+
+WINUSERAPI
+HWND
+WINAPI
+GetNextDlgGroupItem(
+    IN HWND hDlg,
+    IN HWND hCtl,
+    IN BOOL bPrevious);
+
+WINUSERAPI
+HWND
+WINAPI
+GetNextDlgTabItem(
+    IN HWND hDlg,
+    IN HWND hCtl,
+    IN BOOL bPrevious);
+
+WINUSERAPI
+int
+WINAPI
+GetDlgCtrlID(
+    IN HWND hWnd);
+
+WINUSERAPI
+long
+WINAPI
+GetDialogBaseUnits(VOID);
+
+WINUSERAPI
+#ifndef _MAC
+LRESULT
+WINAPI
+#else
+LRESULT
+CALLBACK
+#endif
+DefDlgProcA(
+    IN HWND hDlg,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+#ifndef _MAC
+LRESULT
+WINAPI
+#else
+LRESULT
+CALLBACK
+#endif
+DefDlgProcW(
+    IN HWND hDlg,
+    IN UINT Msg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define DefDlgProc  DefDlgProcW
+#else
+#define DefDlgProc  DefDlgProcA
+#endif // !UNICODE
+
+/*
+ * Window extra byted needed for private dialog classes.
+ */
+#ifndef _MAC
+#define DLGWINDOWEXTRA 30
+#else
+#define DLGWINDOWEXTRA 48
+#endif
+
+#endif /* !NOCTLMGR */
+
+#ifndef NOMSG
+
+WINUSERAPI
+BOOL
+WINAPI
+CallMsgFilterA(
+    IN LPMSG lpMsg,
+    IN int nCode);
+WINUSERAPI
+BOOL
+WINAPI
+CallMsgFilterW(
+    IN LPMSG lpMsg,
+    IN int nCode);
+#ifdef UNICODE
+#define CallMsgFilter  CallMsgFilterW
+#else
+#define CallMsgFilter  CallMsgFilterA
+#endif // !UNICODE
+
+#endif /* !NOMSG */
+
+#ifndef NOCLIPBOARD
+
+/*
+ * Clipboard Manager Functions
+ */
+
+WINUSERAPI
+BOOL
+WINAPI
+OpenClipboard(
+    IN HWND hWndNewOwner);
+
+WINUSERAPI
+BOOL
+WINAPI
+CloseClipboard(
+    VOID);
+
+
+#if(WINVER >= 0x0500)
+
+WINUSERAPI
+DWORD
+WINAPI
+GetClipboardSequenceNumber(
+    VOID);
+
+#endif /* WINVER >= 0x0500 */
+
+WINUSERAPI
+HWND
+WINAPI
+GetClipboardOwner(
+    VOID);
+
+WINUSERAPI
+HWND
+WINAPI
+SetClipboardViewer(
+    IN HWND hWndNewViewer);
+
+WINUSERAPI
+HWND
+WINAPI
+GetClipboardViewer(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+ChangeClipboardChain(
+    IN HWND hWndRemove,
+    IN HWND hWndNewNext);
+
+WINUSERAPI
+HANDLE
+WINAPI
+SetClipboardData(
+    IN UINT uFormat,
+    IN HANDLE hMem);
+
+WINUSERAPI
+HANDLE
+WINAPI
+GetClipboardData(
+    IN UINT uFormat);
+
+WINUSERAPI
+UINT
+WINAPI
+RegisterClipboardFormatA(
+    IN LPCSTR lpszFormat);
+WINUSERAPI
+UINT
+WINAPI
+RegisterClipboardFormatW(
+    IN LPCWSTR lpszFormat);
+#ifdef UNICODE
+#define RegisterClipboardFormat  RegisterClipboardFormatW
+#else
+#define RegisterClipboardFormat  RegisterClipboardFormatA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+CountClipboardFormats(
+    VOID);
+
+WINUSERAPI
+UINT
+WINAPI
+EnumClipboardFormats(
+    IN UINT format);
+
+WINUSERAPI
+int
+WINAPI
+GetClipboardFormatNameA(
+    IN UINT format,
+    OUT LPSTR lpszFormatName,
+    IN int cchMaxCount);
+WINUSERAPI
+int
+WINAPI
+GetClipboardFormatNameW(
+    IN UINT format,
+    OUT LPWSTR lpszFormatName,
+    IN int cchMaxCount);
+#ifdef UNICODE
+#define GetClipboardFormatName  GetClipboardFormatNameW
+#else
+#define GetClipboardFormatName  GetClipboardFormatNameA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+EmptyClipboard(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsClipboardFormatAvailable(
+    IN UINT format);
+
+WINUSERAPI
+int
+WINAPI
+GetPriorityClipboardFormat(
+    OUT UINT *paFormatPriorityList,
+    IN int cFormats);
+
+WINUSERAPI
+HWND
+WINAPI
+GetOpenClipboardWindow(
+    VOID);
+
+#endif /* !NOCLIPBOARD */
+
+/*
+ * Character Translation Routines
+ */
+
+WINUSERAPI
+BOOL
+WINAPI
+CharToOemA(
+    IN LPCSTR lpszSrc,
+    OUT LPSTR lpszDst);
+WINUSERAPI
+BOOL
+WINAPI
+CharToOemW(
+    IN LPCWSTR lpszSrc,
+    OUT LPSTR lpszDst);
+#ifdef UNICODE
+#define CharToOem  CharToOemW
+#else
+#define CharToOem  CharToOemA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+OemToCharA(
+    IN LPCSTR lpszSrc,
+    OUT LPSTR lpszDst);
+WINUSERAPI
+BOOL
+WINAPI
+OemToCharW(
+    IN LPCSTR lpszSrc,
+    OUT LPWSTR lpszDst);
+#ifdef UNICODE
+#define OemToChar  OemToCharW
+#else
+#define OemToChar  OemToCharA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+CharToOemBuffA(
+    IN LPCSTR lpszSrc,
+    OUT LPSTR lpszDst,
+    IN DWORD cchDstLength);
+WINUSERAPI
+BOOL
+WINAPI
+CharToOemBuffW(
+    IN LPCWSTR lpszSrc,
+    OUT LPSTR lpszDst,
+    IN DWORD cchDstLength);
+#ifdef UNICODE
+#define CharToOemBuff  CharToOemBuffW
+#else
+#define CharToOemBuff  CharToOemBuffA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+OemToCharBuffA(
+    IN LPCSTR lpszSrc,
+    OUT LPSTR lpszDst,
+    IN DWORD cchDstLength);
+WINUSERAPI
+BOOL
+WINAPI
+OemToCharBuffW(
+    IN LPCSTR lpszSrc,
+    OUT LPWSTR lpszDst,
+    IN DWORD cchDstLength);
+#ifdef UNICODE
+#define OemToCharBuff  OemToCharBuffW
+#else
+#define OemToCharBuff  OemToCharBuffA
+#endif // !UNICODE
+
+WINUSERAPI
+LPSTR
+WINAPI
+CharUpperA(
+    IN OUT LPSTR lpsz);
+WINUSERAPI
+LPWSTR
+WINAPI
+CharUpperW(
+    IN OUT LPWSTR lpsz);
+#ifdef UNICODE
+#define CharUpper  CharUpperW
+#else
+#define CharUpper  CharUpperA
+#endif // !UNICODE
+
+WINUSERAPI
+DWORD
+WINAPI
+CharUpperBuffA(
+    IN OUT LPSTR lpsz,
+    IN DWORD cchLength);
+WINUSERAPI
+DWORD
+WINAPI
+CharUpperBuffW(
+    IN OUT LPWSTR lpsz,
+    IN DWORD cchLength);
+#ifdef UNICODE
+#define CharUpperBuff  CharUpperBuffW
+#else
+#define CharUpperBuff  CharUpperBuffA
+#endif // !UNICODE
+
+WINUSERAPI
+LPSTR
+WINAPI
+CharLowerA(
+    IN OUT LPSTR lpsz);
+WINUSERAPI
+LPWSTR
+WINAPI
+CharLowerW(
+    IN OUT LPWSTR lpsz);
+#ifdef UNICODE
+#define CharLower  CharLowerW
+#else
+#define CharLower  CharLowerA
+#endif // !UNICODE
+
+WINUSERAPI
+DWORD
+WINAPI
+CharLowerBuffA(
+    IN OUT LPSTR lpsz,
+    IN DWORD cchLength);
+WINUSERAPI
+DWORD
+WINAPI
+CharLowerBuffW(
+    IN OUT LPWSTR lpsz,
+    IN DWORD cchLength);
+#ifdef UNICODE
+#define CharLowerBuff  CharLowerBuffW
+#else
+#define CharLowerBuff  CharLowerBuffA
+#endif // !UNICODE
+
+WINUSERAPI
+LPSTR
+WINAPI
+CharNextA(
+    IN LPCSTR lpsz);
+WINUSERAPI
+LPWSTR
+WINAPI
+CharNextW(
+    IN LPCWSTR lpsz);
+#ifdef UNICODE
+#define CharNext  CharNextW
+#else
+#define CharNext  CharNextA
+#endif // !UNICODE
+
+WINUSERAPI
+LPSTR
+WINAPI
+CharPrevA(
+    IN LPCSTR lpszStart,
+    IN LPCSTR lpszCurrent);
+WINUSERAPI
+LPWSTR
+WINAPI
+CharPrevW(
+    IN LPCWSTR lpszStart,
+    IN LPCWSTR lpszCurrent);
+#ifdef UNICODE
+#define CharPrev  CharPrevW
+#else
+#define CharPrev  CharPrevA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+LPSTR
+WINAPI
+CharNextExA(
+     IN WORD CodePage,
+     IN LPCSTR lpCurrentChar,
+     IN DWORD dwFlags);
+
+WINUSERAPI
+LPSTR
+WINAPI
+CharPrevExA(
+     IN WORD CodePage,
+     IN LPCSTR lpStart,
+     IN LPCSTR lpCurrentChar,
+     IN DWORD dwFlags);
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Compatibility defines for character translation routines
+ */
+#define AnsiToOem CharToOemA
+#define OemToAnsi OemToCharA
+#define AnsiToOemBuff CharToOemBuffA
+#define OemToAnsiBuff OemToCharBuffA
+#define AnsiUpper CharUpperA
+#define AnsiUpperBuff CharUpperBuffA
+#define AnsiLower CharLowerA
+#define AnsiLowerBuff CharLowerBuffA
+#define AnsiNext CharNextA
+#define AnsiPrev CharPrevA
+
+#ifndef  NOLANGUAGE
+/*
+ * Language dependent Routines
+ */
+
+WINUSERAPI
+BOOL
+WINAPI
+IsCharAlphaA(
+    IN CHAR ch);
+WINUSERAPI
+BOOL
+WINAPI
+IsCharAlphaW(
+    IN WCHAR ch);
+#ifdef UNICODE
+#define IsCharAlpha  IsCharAlphaW
+#else
+#define IsCharAlpha  IsCharAlphaA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+IsCharAlphaNumericA(
+    IN CHAR ch);
+WINUSERAPI
+BOOL
+WINAPI
+IsCharAlphaNumericW(
+    IN WCHAR ch);
+#ifdef UNICODE
+#define IsCharAlphaNumeric  IsCharAlphaNumericW
+#else
+#define IsCharAlphaNumeric  IsCharAlphaNumericA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+IsCharUpperA(
+    IN CHAR ch);
+WINUSERAPI
+BOOL
+WINAPI
+IsCharUpperW(
+    IN WCHAR ch);
+#ifdef UNICODE
+#define IsCharUpper  IsCharUpperW
+#else
+#define IsCharUpper  IsCharUpperA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+IsCharLowerA(
+    IN CHAR ch);
+WINUSERAPI
+BOOL
+WINAPI
+IsCharLowerW(
+    IN WCHAR ch);
+#ifdef UNICODE
+#define IsCharLower  IsCharLowerW
+#else
+#define IsCharLower  IsCharLowerA
+#endif // !UNICODE
+
+#endif  /* !NOLANGUAGE */
+
+WINUSERAPI
+HWND
+WINAPI
+SetFocus(
+    IN HWND hWnd);
+
+WINUSERAPI
+HWND
+WINAPI
+GetActiveWindow(
+    VOID);
+
+WINUSERAPI
+HWND
+WINAPI
+GetFocus(
+    VOID);
+
+WINUSERAPI
+UINT
+WINAPI
+GetKBCodePage(
+    VOID);
+
+WINUSERAPI
+SHORT
+WINAPI
+GetKeyState(
+    IN int nVirtKey);
+
+WINUSERAPI
+SHORT
+WINAPI
+GetAsyncKeyState(
+    IN int vKey);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetKeyboardState(
+    OUT PBYTE lpKeyState);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetKeyboardState(
+    IN LPBYTE lpKeyState);
+
+WINUSERAPI
+int
+WINAPI
+GetKeyNameTextA(
+    IN LONG lParam,
+    OUT LPSTR lpString,
+    IN int nSize
+    );
+WINUSERAPI
+int
+WINAPI
+GetKeyNameTextW(
+    IN LONG lParam,
+    OUT LPWSTR lpString,
+    IN int nSize
+    );
+#ifdef UNICODE
+#define GetKeyNameText  GetKeyNameTextW
+#else
+#define GetKeyNameText  GetKeyNameTextA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+GetKeyboardType(
+    IN int nTypeFlag);
+
+WINUSERAPI
+int
+WINAPI
+ToAscii(
+    IN UINT uVirtKey,
+    IN UINT uScanCode,
+    IN CONST BYTE *lpKeyState,
+    OUT LPWORD lpChar,
+    IN UINT uFlags);
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+int
+WINAPI
+ToAsciiEx(
+    IN UINT uVirtKey,
+    IN UINT uScanCode,
+    IN CONST BYTE *lpKeyState,
+    OUT LPWORD lpChar,
+    IN UINT uFlags,
+    IN HKL dwhkl);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+int
+WINAPI
+ToUnicode(
+    IN UINT wVirtKey,
+    IN UINT wScanCode,
+    IN CONST BYTE *lpKeyState,
+    OUT LPWSTR pwszBuff,
+    IN int cchBuff,
+    IN UINT wFlags);
+
+WINUSERAPI
+DWORD
+WINAPI
+OemKeyScan(
+    IN WORD wOemChar);
+
+WINUSERAPI
+SHORT
+WINAPI
+VkKeyScanA(
+    IN CHAR ch);
+WINUSERAPI
+SHORT
+WINAPI
+VkKeyScanW(
+    IN WCHAR ch);
+#ifdef UNICODE
+#define VkKeyScan  VkKeyScanW
+#else
+#define VkKeyScan  VkKeyScanA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+SHORT
+WINAPI
+VkKeyScanExA(
+    IN CHAR  ch,
+    IN HKL   dwhkl);
+WINUSERAPI
+SHORT
+WINAPI
+VkKeyScanExW(
+    IN WCHAR  ch,
+    IN HKL   dwhkl);
+#ifdef UNICODE
+#define VkKeyScanEx  VkKeyScanExW
+#else
+#define VkKeyScanEx  VkKeyScanExA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+#define KEYEVENTF_EXTENDEDKEY 0x0001
+#define KEYEVENTF_KEYUP       0x0002
+#if(_WIN32_WINNT >= 0x0500)
+#define KEYEVENTF_UNICODE     0x0004
+#define KEYEVENTF_SCANCODE    0x0008
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+WINUSERAPI
+VOID
+WINAPI
+keybd_event(
+    IN BYTE bVk,
+    IN BYTE bScan,
+    IN DWORD dwFlags,
+    IN ULONG_PTR dwExtraInfo);
+
+#define MOUSEEVENTF_MOVE        0x0001 /* mouse move */
+#define MOUSEEVENTF_LEFTDOWN    0x0002 /* left button down */
+#define MOUSEEVENTF_LEFTUP      0x0004 /* left button up */
+#define MOUSEEVENTF_RIGHTDOWN   0x0008 /* right button down */
+#define MOUSEEVENTF_RIGHTUP     0x0010 /* right button up */
+#define MOUSEEVENTF_MIDDLEDOWN  0x0020 /* middle button down */
+#define MOUSEEVENTF_MIDDLEUP    0x0040 /* middle button up */
+#define MOUSEEVENTF_XDOWN       0x0080 /* x button down */
+#define MOUSEEVENTF_XUP         0x0100 /* x button down */
+#define MOUSEEVENTF_WHEEL       0x0800 /* wheel button rolled */
+#define MOUSEEVENTF_VIRTUALDESK 0x4000 /* map to entire virtual desktop */
+#define MOUSEEVENTF_ABSOLUTE    0x8000 /* absolute move */
+
+
+
+WINUSERAPI
+VOID
+WINAPI
+mouse_event(
+    IN DWORD dwFlags,
+    IN DWORD dx,
+    IN DWORD dy,
+    IN DWORD dwData,
+    IN ULONG_PTR dwExtraInfo);
+
+#if (_WIN32_WINNT > 0x0400)
+
+typedef struct tagMOUSEINPUT {
+    LONG    dx;
+    LONG    dy;
+    DWORD   mouseData;
+    DWORD   dwFlags;
+    DWORD   time;
+    ULONG_PTR dwExtraInfo;
+} MOUSEINPUT, *PMOUSEINPUT, FAR* LPMOUSEINPUT;
+
+typedef struct tagKEYBDINPUT {
+    WORD    wVk;
+    WORD    wScan;
+    DWORD   dwFlags;
+    DWORD   time;
+    ULONG_PTR dwExtraInfo;
+} KEYBDINPUT, *PKEYBDINPUT, FAR* LPKEYBDINPUT;
+
+typedef struct tagHARDWAREINPUT {
+    DWORD   uMsg;
+    WORD    wParamL;
+    WORD    wParamH;
+} HARDWAREINPUT, *PHARDWAREINPUT, FAR* LPHARDWAREINPUT;
+
+#define INPUT_MOUSE     0
+#define INPUT_KEYBOARD  1
+#define INPUT_HARDWARE  2
+
+typedef struct tagINPUT {
+    DWORD   type;
+
+    union
+    {
+        MOUSEINPUT      mi;
+        KEYBDINPUT      ki;
+        HARDWAREINPUT   hi;
+    };
+} INPUT, *PINPUT, FAR* LPINPUT;
+
+WINUSERAPI
+UINT
+WINAPI
+SendInput(
+    IN UINT    cInputs,     // number of input in the array
+    IN LPINPUT pInputs,     // array of inputs
+    IN int     cbSize);     // sizeof(INPUT)
+
+#endif // (_WIN32_WINNT > 0x0400)
+
+#if(_WIN32_WINNT >= 0x0500)
+typedef struct tagLASTINPUTINFO {
+    UINT cbSize;
+    DWORD dwTime;
+} LASTINPUTINFO, * PLASTINPUTINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetLastInputInfo(
+    OUT PLASTINPUTINFO plii);
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+WINUSERAPI
+UINT
+WINAPI
+MapVirtualKeyA(
+    IN UINT uCode,
+    IN UINT uMapType);
+WINUSERAPI
+UINT
+WINAPI
+MapVirtualKeyW(
+    IN UINT uCode,
+    IN UINT uMapType);
+#ifdef UNICODE
+#define MapVirtualKey  MapVirtualKeyW
+#else
+#define MapVirtualKey  MapVirtualKeyA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+UINT
+WINAPI
+MapVirtualKeyExA(
+    IN UINT uCode,
+    IN UINT uMapType,
+    IN HKL dwhkl);
+WINUSERAPI
+UINT
+WINAPI
+MapVirtualKeyExW(
+    IN UINT uCode,
+    IN UINT uMapType,
+    IN HKL dwhkl);
+#ifdef UNICODE
+#define MapVirtualKeyEx  MapVirtualKeyExW
+#else
+#define MapVirtualKeyEx  MapVirtualKeyExA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+GetInputState(
+    VOID);
+
+WINUSERAPI
+DWORD
+WINAPI
+GetQueueStatus(
+    IN UINT flags);
+
+
+WINUSERAPI
+HWND
+WINAPI
+GetCapture(
+    VOID);
+
+WINUSERAPI
+HWND
+WINAPI
+SetCapture(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+ReleaseCapture(
+    VOID);
+
+WINUSERAPI
+DWORD
+WINAPI
+MsgWaitForMultipleObjects(
+    IN DWORD nCount,
+    IN CONST HANDLE *pHandles,
+    IN BOOL fWaitAll,
+    IN DWORD dwMilliseconds,
+    IN DWORD dwWakeMask);
+
+WINUSERAPI
+DWORD
+WINAPI
+MsgWaitForMultipleObjectsEx(
+    IN DWORD nCount,
+    IN CONST HANDLE *pHandles,
+    IN DWORD dwMilliseconds,
+    IN DWORD dwWakeMask,
+    IN DWORD dwFlags);
+
+
+#define MWMO_WAITALL        0x0001
+#define MWMO_ALERTABLE      0x0002
+#define MWMO_INPUTAVAILABLE 0x0004
+
+/*
+ * Queue status flags for GetQueueStatus() and MsgWaitForMultipleObjects()
+ */
+#define QS_KEY              0x0001
+#define QS_MOUSEMOVE        0x0002
+#define QS_MOUSEBUTTON      0x0004
+#define QS_POSTMESSAGE      0x0008
+#define QS_TIMER            0x0010
+#define QS_PAINT            0x0020
+#define QS_SENDMESSAGE      0x0040
+#define QS_HOTKEY           0x0080
+#define QS_ALLPOSTMESSAGE   0x0100
+#if(_WIN32_WINNT >= 0x0501)
+#define QS_RAWINPUT         0x0400
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define QS_MOUSE           (QS_MOUSEMOVE     | \
+                            QS_MOUSEBUTTON)
+
+#if (_WIN32_WINNT >= 0x0501)
+#define QS_INPUT           (QS_MOUSE         | \
+                            QS_KEY           | \
+                            QS_RAWINPUT)
+#else
+#define QS_INPUT           (QS_MOUSE         | \
+                            QS_KEY)
+#endif // (_WIN32_WINNT >= 0x0501)
+
+#define QS_ALLEVENTS       (QS_INPUT         | \
+                            QS_POSTMESSAGE   | \
+                            QS_TIMER         | \
+                            QS_PAINT         | \
+                            QS_HOTKEY)
+
+#define QS_ALLINPUT        (QS_INPUT         | \
+                            QS_POSTMESSAGE   | \
+                            QS_TIMER         | \
+                            QS_PAINT         | \
+                            QS_HOTKEY        | \
+                            QS_SENDMESSAGE)
+
+
+/*
+ * Windows Functions
+ */
+
+WINUSERAPI
+UINT_PTR
+WINAPI
+SetTimer(
+    IN HWND hWnd,
+    IN UINT_PTR nIDEvent,
+    IN UINT uElapse,
+    IN TIMERPROC lpTimerFunc);
+
+WINUSERAPI
+BOOL
+WINAPI
+KillTimer(
+    IN HWND hWnd,
+    IN UINT_PTR uIDEvent);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsWindowUnicode(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnableWindow(
+    IN HWND hWnd,
+    IN BOOL bEnable);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsWindowEnabled(
+    IN HWND hWnd);
+
+WINUSERAPI
+HACCEL
+WINAPI
+LoadAcceleratorsA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpTableName);
+WINUSERAPI
+HACCEL
+WINAPI
+LoadAcceleratorsW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpTableName);
+#ifdef UNICODE
+#define LoadAccelerators  LoadAcceleratorsW
+#else
+#define LoadAccelerators  LoadAcceleratorsA
+#endif // !UNICODE
+
+WINUSERAPI
+HACCEL
+WINAPI
+CreateAcceleratorTableA(
+    IN LPACCEL, IN int);
+WINUSERAPI
+HACCEL
+WINAPI
+CreateAcceleratorTableW(
+    IN LPACCEL, IN int);
+#ifdef UNICODE
+#define CreateAcceleratorTable  CreateAcceleratorTableW
+#else
+#define CreateAcceleratorTable  CreateAcceleratorTableA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+DestroyAcceleratorTable(
+    IN HACCEL hAccel);
+
+WINUSERAPI
+int
+WINAPI
+CopyAcceleratorTableA(
+    IN HACCEL hAccelSrc,
+    OUT LPACCEL lpAccelDst,
+    IN int cAccelEntries);
+WINUSERAPI
+int
+WINAPI
+CopyAcceleratorTableW(
+    IN HACCEL hAccelSrc,
+    OUT LPACCEL lpAccelDst,
+    IN int cAccelEntries);
+#ifdef UNICODE
+#define CopyAcceleratorTable  CopyAcceleratorTableW
+#else
+#define CopyAcceleratorTable  CopyAcceleratorTableA
+#endif // !UNICODE
+
+#ifndef NOMSG
+
+WINUSERAPI
+int
+WINAPI
+TranslateAcceleratorA(
+    IN HWND hWnd,
+    IN HACCEL hAccTable,
+    IN LPMSG lpMsg);
+WINUSERAPI
+int
+WINAPI
+TranslateAcceleratorW(
+    IN HWND hWnd,
+    IN HACCEL hAccTable,
+    IN LPMSG lpMsg);
+#ifdef UNICODE
+#define TranslateAccelerator  TranslateAcceleratorW
+#else
+#define TranslateAccelerator  TranslateAcceleratorA
+#endif // !UNICODE
+
+#endif /* !NOMSG */
+
+#ifndef NOSYSMETRICS
+
+/*
+ * GetSystemMetrics() codes
+ */
+
+#define SM_CXSCREEN             0
+#define SM_CYSCREEN             1
+#define SM_CXVSCROLL            2
+#define SM_CYHSCROLL            3
+#define SM_CYCAPTION            4
+#define SM_CXBORDER             5
+#define SM_CYBORDER             6
+#define SM_CXDLGFRAME           7
+#define SM_CYDLGFRAME           8
+#define SM_CYVTHUMB             9
+#define SM_CXHTHUMB             10
+#define SM_CXICON               11
+#define SM_CYICON               12
+#define SM_CXCURSOR             13
+#define SM_CYCURSOR             14
+#define SM_CYMENU               15
+#define SM_CXFULLSCREEN         16
+#define SM_CYFULLSCREEN         17
+#define SM_CYKANJIWINDOW        18
+#define SM_MOUSEPRESENT         19
+#define SM_CYVSCROLL            20
+#define SM_CXHSCROLL            21
+#define SM_DEBUG                22
+#define SM_SWAPBUTTON           23
+#define SM_RESERVED1            24
+#define SM_RESERVED2            25
+#define SM_RESERVED3            26
+#define SM_RESERVED4            27
+#define SM_CXMIN                28
+#define SM_CYMIN                29
+#define SM_CXSIZE               30
+#define SM_CYSIZE               31
+#define SM_CXFRAME              32
+#define SM_CYFRAME              33
+#define SM_CXMINTRACK           34
+#define SM_CYMINTRACK           35
+#define SM_CXDOUBLECLK          36
+#define SM_CYDOUBLECLK          37
+#define SM_CXICONSPACING        38
+#define SM_CYICONSPACING        39
+#define SM_MENUDROPALIGNMENT    40
+#define SM_PENWINDOWS           41
+#define SM_DBCSENABLED          42
+#define SM_CMOUSEBUTTONS        43
+
+#if(WINVER >= 0x0400)
+#define SM_CXFIXEDFRAME           SM_CXDLGFRAME  /* ;win40 name change */
+#define SM_CYFIXEDFRAME           SM_CYDLGFRAME  /* ;win40 name change */
+#define SM_CXSIZEFRAME            SM_CXFRAME     /* ;win40 name change */
+#define SM_CYSIZEFRAME            SM_CYFRAME     /* ;win40 name change */
+
+#define SM_SECURE               44
+#define SM_CXEDGE               45
+#define SM_CYEDGE               46
+#define SM_CXMINSPACING         47
+#define SM_CYMINSPACING         48
+#define SM_CXSMICON             49
+#define SM_CYSMICON             50
+#define SM_CYSMCAPTION          51
+#define SM_CXSMSIZE             52
+#define SM_CYSMSIZE             53
+#define SM_CXMENUSIZE           54
+#define SM_CYMENUSIZE           55
+#define SM_ARRANGE              56
+#define SM_CXMINIMIZED          57
+#define SM_CYMINIMIZED          58
+#define SM_CXMAXTRACK           59
+#define SM_CYMAXTRACK           60
+#define SM_CXMAXIMIZED          61
+#define SM_CYMAXIMIZED          62
+#define SM_NETWORK              63
+#define SM_CLEANBOOT            67
+#define SM_CXDRAG               68
+#define SM_CYDRAG               69
+#endif /* WINVER >= 0x0400 */
+#define SM_SHOWSOUNDS           70
+#if(WINVER >= 0x0400)
+#define SM_CXMENUCHECK          71   /* Use instead of GetMenuCheckMarkDimensions()! */
+#define SM_CYMENUCHECK          72
+#define SM_SLOWMACHINE          73
+#define SM_MIDEASTENABLED       74
+#endif /* WINVER >= 0x0400 */
+
+#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
+#define SM_MOUSEWHEELPRESENT    75
+#endif
+#if(WINVER >= 0x0500)
+#define SM_XVIRTUALSCREEN       76
+#define SM_YVIRTUALSCREEN       77
+#define SM_CXVIRTUALSCREEN      78
+#define SM_CYVIRTUALSCREEN      79
+#define SM_CMONITORS            80
+#define SM_SAMEDISPLAYFORMAT    81
+#endif /* WINVER >= 0x0500 */
+#if(_WIN32_WINNT >= 0x0500)
+#define SM_IMMENABLED           82
+#endif /* _WIN32_WINNT >= 0x0500 */
+#if(_WIN32_WINNT >= 0x0501)
+#define SM_CXFOCUSBORDER        83
+#define SM_CYFOCUSBORDER        84
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define SM_TABLETPC             86
+#define SM_MEDIACENTER          87
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if (WINVER < 0x0500) && (!defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0400))
+#define SM_CMETRICS             76
+#elif WINVER == 0x500
+#define SM_CMETRICS             83
+#else
+#define SM_CMETRICS             88
+#endif
+
+#if(WINVER >= 0x0500)
+#define SM_REMOTESESSION        0x1000
+
+
+#if(_WIN32_WINNT >= 0x0501)
+#define SM_SHUTTINGDOWN         0x2000
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(WINVER >= 0x0501)
+#define SM_REMOTECONTROL        0x2001
+#endif /* WINVER >= 0x0501 */
+
+#endif /* WINVER >= 0x0500 */
+
+
+WINUSERAPI
+int
+WINAPI
+GetSystemMetrics(
+    IN int nIndex);
+
+
+#endif /* !NOSYSMETRICS */
+
+#ifndef NOMENUS
+
+WINUSERAPI
+HMENU
+WINAPI
+LoadMenuA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpMenuName);
+WINUSERAPI
+HMENU
+WINAPI
+LoadMenuW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpMenuName);
+#ifdef UNICODE
+#define LoadMenu  LoadMenuW
+#else
+#define LoadMenu  LoadMenuA
+#endif // !UNICODE
+
+WINUSERAPI
+HMENU
+WINAPI
+LoadMenuIndirectA(
+    IN CONST MENUTEMPLATEA *lpMenuTemplate);
+WINUSERAPI
+HMENU
+WINAPI
+LoadMenuIndirectW(
+    IN CONST MENUTEMPLATEW *lpMenuTemplate);
+#ifdef UNICODE
+#define LoadMenuIndirect  LoadMenuIndirectW
+#else
+#define LoadMenuIndirect  LoadMenuIndirectA
+#endif // !UNICODE
+
+WINUSERAPI
+HMENU
+WINAPI
+GetMenu(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetMenu(
+    IN HWND hWnd,
+    IN HMENU hMenu);
+
+WINUSERAPI
+BOOL
+WINAPI
+ChangeMenuA(
+    IN HMENU hMenu,
+    IN UINT cmd,
+    IN LPCSTR lpszNewItem,
+    IN UINT cmdInsert,
+    IN UINT flags);
+WINUSERAPI
+BOOL
+WINAPI
+ChangeMenuW(
+    IN HMENU hMenu,
+    IN UINT cmd,
+    IN LPCWSTR lpszNewItem,
+    IN UINT cmdInsert,
+    IN UINT flags);
+#ifdef UNICODE
+#define ChangeMenu  ChangeMenuW
+#else
+#define ChangeMenu  ChangeMenuA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+HiliteMenuItem(
+    IN HWND hWnd,
+    IN HMENU hMenu,
+    IN UINT uIDHiliteItem,
+    IN UINT uHilite);
+
+WINUSERAPI
+int
+WINAPI
+GetMenuStringA(
+    IN HMENU hMenu,
+    IN UINT uIDItem,
+    OUT LPSTR lpString,
+    IN int nMaxCount,
+    IN UINT uFlag);
+WINUSERAPI
+int
+WINAPI
+GetMenuStringW(
+    IN HMENU hMenu,
+    IN UINT uIDItem,
+    OUT LPWSTR lpString,
+    IN int nMaxCount,
+    IN UINT uFlag);
+#ifdef UNICODE
+#define GetMenuString  GetMenuStringW
+#else
+#define GetMenuString  GetMenuStringA
+#endif // !UNICODE
+
+WINUSERAPI
+UINT
+WINAPI
+GetMenuState(
+    IN HMENU hMenu,
+    IN UINT uId,
+    IN UINT uFlags);
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawMenuBar(
+    IN HWND hWnd);
+
+#if(_WIN32_WINNT >= 0x0501)
+#define PMB_ACTIVE      0x00000001
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+
+WINUSERAPI
+HMENU
+WINAPI
+GetSystemMenu(
+    IN HWND hWnd,
+    IN BOOL bRevert);
+
+
+WINUSERAPI
+HMENU
+WINAPI
+CreateMenu(
+    VOID);
+
+WINUSERAPI
+HMENU
+WINAPI
+CreatePopupMenu(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+DestroyMenu(
+    IN HMENU hMenu);
+
+WINUSERAPI
+DWORD
+WINAPI
+CheckMenuItem(
+    IN HMENU hMenu,
+    IN UINT uIDCheckItem,
+    IN UINT uCheck);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnableMenuItem(
+    IN HMENU hMenu,
+    IN UINT uIDEnableItem,
+    IN UINT uEnable);
+
+WINUSERAPI
+HMENU
+WINAPI
+GetSubMenu(
+    IN HMENU hMenu,
+    IN int nPos);
+
+WINUSERAPI
+UINT
+WINAPI
+GetMenuItemID(
+    IN HMENU hMenu,
+    IN int nPos);
+
+WINUSERAPI
+int
+WINAPI
+GetMenuItemCount(
+    IN HMENU hMenu);
+
+WINUSERAPI
+BOOL
+WINAPI
+InsertMenuA(
+    IN HMENU hMenu,
+    IN UINT uPosition,
+    IN UINT uFlags,
+    IN UINT_PTR uIDNewItem,
+    IN LPCSTR lpNewItem
+    );
+WINUSERAPI
+BOOL
+WINAPI
+InsertMenuW(
+    IN HMENU hMenu,
+    IN UINT uPosition,
+    IN UINT uFlags,
+    IN UINT_PTR uIDNewItem,
+    IN LPCWSTR lpNewItem
+    );
+#ifdef UNICODE
+#define InsertMenu  InsertMenuW
+#else
+#define InsertMenu  InsertMenuA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+AppendMenuA(
+    IN HMENU hMenu,
+    IN UINT uFlags,
+    IN UINT_PTR uIDNewItem,
+    IN LPCSTR lpNewItem
+    );
+WINUSERAPI
+BOOL
+WINAPI
+AppendMenuW(
+    IN HMENU hMenu,
+    IN UINT uFlags,
+    IN UINT_PTR uIDNewItem,
+    IN LPCWSTR lpNewItem
+    );
+#ifdef UNICODE
+#define AppendMenu  AppendMenuW
+#else
+#define AppendMenu  AppendMenuA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+ModifyMenuA(
+    IN HMENU hMnu,
+    IN UINT uPosition,
+    IN UINT uFlags,
+    IN UINT_PTR uIDNewItem,
+    IN LPCSTR lpNewItem
+    );
+WINUSERAPI
+BOOL
+WINAPI
+ModifyMenuW(
+    IN HMENU hMnu,
+    IN UINT uPosition,
+    IN UINT uFlags,
+    IN UINT_PTR uIDNewItem,
+    IN LPCWSTR lpNewItem
+    );
+#ifdef UNICODE
+#define ModifyMenu  ModifyMenuW
+#else
+#define ModifyMenu  ModifyMenuA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI RemoveMenu(
+    IN HMENU hMenu,
+    IN UINT uPosition,
+    IN UINT uFlags);
+
+WINUSERAPI
+BOOL
+WINAPI
+DeleteMenu(
+    IN HMENU hMenu,
+    IN UINT uPosition,
+    IN UINT uFlags);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetMenuItemBitmaps(
+    IN HMENU hMenu,
+    IN UINT uPosition,
+    IN UINT uFlags,
+    IN HBITMAP hBitmapUnchecked,
+    IN HBITMAP hBitmapChecked);
+
+WINUSERAPI
+LONG
+WINAPI
+GetMenuCheckMarkDimensions(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+TrackPopupMenu(
+    IN HMENU hMenu,
+    IN UINT uFlags,
+    IN int x,
+    IN int y,
+    IN int nReserved,
+    IN HWND hWnd,
+    IN CONST RECT *prcRect);
+
+#if(WINVER >= 0x0400)
+/* return codes for WM_MENUCHAR */
+#define MNC_IGNORE  0
+#define MNC_CLOSE   1
+#define MNC_EXECUTE 2
+#define MNC_SELECT  3
+
+typedef struct tagTPMPARAMS
+{
+    UINT    cbSize;     /* Size of structure */
+    RECT    rcExclude;  /* Screen coordinates of rectangle to exclude when positioning */
+}   TPMPARAMS;
+typedef TPMPARAMS FAR *LPTPMPARAMS;
+
+WINUSERAPI
+BOOL
+WINAPI
+TrackPopupMenuEx(
+    IN HMENU,
+    IN UINT,
+    IN int,
+    IN int,
+    IN HWND,
+    IN LPTPMPARAMS);
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+
+#define MNS_NOCHECK         0x80000000
+#define MNS_MODELESS        0x40000000
+#define MNS_DRAGDROP        0x20000000
+#define MNS_AUTODISMISS     0x10000000
+#define MNS_NOTIFYBYPOS     0x08000000
+#define MNS_CHECKORBMP      0x04000000
+
+#define MIM_MAXHEIGHT               0x00000001
+#define MIM_BACKGROUND              0x00000002
+#define MIM_HELPID                  0x00000004
+#define MIM_MENUDATA                0x00000008
+#define MIM_STYLE                   0x00000010
+#define MIM_APPLYTOSUBMENUS         0x80000000
+
+typedef struct tagMENUINFO
+{
+    DWORD   cbSize;
+    DWORD   fMask;
+    DWORD   dwStyle;
+    UINT    cyMax;
+    HBRUSH  hbrBack;
+    DWORD   dwContextHelpID;
+    ULONG_PTR dwMenuData;
+}   MENUINFO, FAR *LPMENUINFO;
+typedef MENUINFO CONST FAR *LPCMENUINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetMenuInfo(
+    IN HMENU,
+    OUT LPMENUINFO);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetMenuInfo(
+    IN HMENU,
+    IN LPCMENUINFO);
+
+WINUSERAPI
+BOOL
+WINAPI
+EndMenu(
+        VOID);
+
+/*
+ * WM_MENUDRAG return values.
+ */
+#define MND_CONTINUE       0
+#define MND_ENDMENU        1
+
+typedef struct tagMENUGETOBJECTINFO
+{
+    DWORD dwFlags;
+    UINT uPos;
+    HMENU hmenu;
+    PVOID riid;
+    PVOID pvObj;
+} MENUGETOBJECTINFO, * PMENUGETOBJECTINFO;
+
+/*
+ * MENUGETOBJECTINFO dwFlags values
+ */
+#define MNGOF_TOPGAP         0x00000001
+#define MNGOF_BOTTOMGAP      0x00000002
+
+/*
+ * WM_MENUGETOBJECT return values
+ */
+#define MNGO_NOINTERFACE     0x00000000
+#define MNGO_NOERROR         0x00000001
+#endif /* WINVER >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+#define MIIM_STATE       0x00000001
+#define MIIM_ID          0x00000002
+#define MIIM_SUBMENU     0x00000004
+#define MIIM_CHECKMARKS  0x00000008
+#define MIIM_TYPE        0x00000010
+#define MIIM_DATA        0x00000020
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define MIIM_STRING      0x00000040
+#define MIIM_BITMAP      0x00000080
+#define MIIM_FTYPE       0x00000100
+
+#define HBMMENU_CALLBACK            ((HBITMAP) -1)
+#define HBMMENU_SYSTEM              ((HBITMAP)  1)
+#define HBMMENU_MBAR_RESTORE        ((HBITMAP)  2)
+#define HBMMENU_MBAR_MINIMIZE       ((HBITMAP)  3)
+#define HBMMENU_MBAR_CLOSE          ((HBITMAP)  5)
+#define HBMMENU_MBAR_CLOSE_D        ((HBITMAP)  6)
+#define HBMMENU_MBAR_MINIMIZE_D     ((HBITMAP)  7)
+#define HBMMENU_POPUP_CLOSE         ((HBITMAP)  8)
+#define HBMMENU_POPUP_RESTORE       ((HBITMAP)  9)
+#define HBMMENU_POPUP_MAXIMIZE      ((HBITMAP) 10)
+#define HBMMENU_POPUP_MINIMIZE      ((HBITMAP) 11)
+#endif /* WINVER >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+typedef struct tagMENUITEMINFOA
+{
+    UINT     cbSize;
+    UINT     fMask;
+    UINT     fType;         // used if MIIM_TYPE (4.0) or MIIM_FTYPE (>4.0)
+    UINT     fState;        // used if MIIM_STATE
+    UINT     wID;           // used if MIIM_ID
+    HMENU    hSubMenu;      // used if MIIM_SUBMENU
+    HBITMAP  hbmpChecked;   // used if MIIM_CHECKMARKS
+    HBITMAP  hbmpUnchecked; // used if MIIM_CHECKMARKS
+    ULONG_PTR dwItemData;   // used if MIIM_DATA
+    LPSTR    dwTypeData;    // used if MIIM_TYPE (4.0) or MIIM_STRING (>4.0)
+    UINT     cch;           // used if MIIM_TYPE (4.0) or MIIM_STRING (>4.0)
+#if(WINVER >= 0x0500)
+    HBITMAP  hbmpItem;      // used if MIIM_BITMAP
+#endif /* WINVER >= 0x0500 */
+}   MENUITEMINFOA, FAR *LPMENUITEMINFOA;
+typedef struct tagMENUITEMINFOW
+{
+    UINT     cbSize;
+    UINT     fMask;
+    UINT     fType;         // used if MIIM_TYPE (4.0) or MIIM_FTYPE (>4.0)
+    UINT     fState;        // used if MIIM_STATE
+    UINT     wID;           // used if MIIM_ID
+    HMENU    hSubMenu;      // used if MIIM_SUBMENU
+    HBITMAP  hbmpChecked;   // used if MIIM_CHECKMARKS
+    HBITMAP  hbmpUnchecked; // used if MIIM_CHECKMARKS
+    ULONG_PTR dwItemData;   // used if MIIM_DATA
+    LPWSTR   dwTypeData;    // used if MIIM_TYPE (4.0) or MIIM_STRING (>4.0)
+    UINT     cch;           // used if MIIM_TYPE (4.0) or MIIM_STRING (>4.0)
+#if(WINVER >= 0x0500)
+    HBITMAP  hbmpItem;      // used if MIIM_BITMAP
+#endif /* WINVER >= 0x0500 */
+}   MENUITEMINFOW, FAR *LPMENUITEMINFOW;
+#ifdef UNICODE
+typedef MENUITEMINFOW MENUITEMINFO;
+typedef LPMENUITEMINFOW LPMENUITEMINFO;
+#else
+typedef MENUITEMINFOA MENUITEMINFO;
+typedef LPMENUITEMINFOA LPMENUITEMINFO;
+#endif // UNICODE
+typedef MENUITEMINFOA CONST FAR *LPCMENUITEMINFOA;
+typedef MENUITEMINFOW CONST FAR *LPCMENUITEMINFOW;
+#ifdef UNICODE
+typedef LPCMENUITEMINFOW LPCMENUITEMINFO;
+#else
+typedef LPCMENUITEMINFOA LPCMENUITEMINFO;
+#endif // UNICODE
+
+
+WINUSERAPI
+BOOL
+WINAPI
+InsertMenuItemA(
+    IN HMENU,
+    IN UINT,
+    IN BOOL,
+    IN LPCMENUITEMINFOA
+    );
+WINUSERAPI
+BOOL
+WINAPI
+InsertMenuItemW(
+    IN HMENU,
+    IN UINT,
+    IN BOOL,
+    IN LPCMENUITEMINFOW
+    );
+#ifdef UNICODE
+#define InsertMenuItem  InsertMenuItemW
+#else
+#define InsertMenuItem  InsertMenuItemA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+GetMenuItemInfoA(
+    IN HMENU,
+    IN UINT,
+    IN BOOL,
+    IN OUT LPMENUITEMINFOA
+    );
+WINUSERAPI
+BOOL
+WINAPI
+GetMenuItemInfoW(
+    IN HMENU,
+    IN UINT,
+    IN BOOL,
+    IN OUT LPMENUITEMINFOW
+    );
+#ifdef UNICODE
+#define GetMenuItemInfo  GetMenuItemInfoW
+#else
+#define GetMenuItemInfo  GetMenuItemInfoA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+SetMenuItemInfoA(
+    IN HMENU,
+    IN UINT,
+    IN BOOL,
+    IN LPCMENUITEMINFOA
+    );
+WINUSERAPI
+BOOL
+WINAPI
+SetMenuItemInfoW(
+    IN HMENU,
+    IN UINT,
+    IN BOOL,
+    IN LPCMENUITEMINFOW
+    );
+#ifdef UNICODE
+#define SetMenuItemInfo  SetMenuItemInfoW
+#else
+#define SetMenuItemInfo  SetMenuItemInfoA
+#endif // !UNICODE
+
+
+#define GMDI_USEDISABLED    0x0001L
+#define GMDI_GOINTOPOPUPS   0x0002L
+
+WINUSERAPI UINT    WINAPI GetMenuDefaultItem( IN HMENU hMenu, IN UINT fByPos, IN UINT gmdiFlags);
+WINUSERAPI BOOL    WINAPI SetMenuDefaultItem( IN HMENU hMenu, IN UINT uItem,  IN UINT fByPos);
+
+WINUSERAPI BOOL    WINAPI GetMenuItemRect( IN HWND hWnd, IN HMENU hMenu, IN UINT uItem, OUT LPRECT lprcItem);
+WINUSERAPI int     WINAPI MenuItemFromPoint( IN HWND hWnd, IN HMENU hMenu, IN POINT ptScreen);
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Flags for TrackPopupMenu
+ */
+#define TPM_LEFTBUTTON  0x0000L
+#define TPM_RIGHTBUTTON 0x0002L
+#define TPM_LEFTALIGN   0x0000L
+#define TPM_CENTERALIGN 0x0004L
+#define TPM_RIGHTALIGN  0x0008L
+#if(WINVER >= 0x0400)
+#define TPM_TOPALIGN        0x0000L
+#define TPM_VCENTERALIGN    0x0010L
+#define TPM_BOTTOMALIGN     0x0020L
+
+#define TPM_HORIZONTAL      0x0000L     /* Horz alignment matters more */
+#define TPM_VERTICAL        0x0040L     /* Vert alignment matters more */
+#define TPM_NONOTIFY        0x0080L     /* Don't send any notification msgs */
+#define TPM_RETURNCMD       0x0100L
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+#define TPM_RECURSE         0x0001L
+#define TPM_HORPOSANIMATION 0x0400L
+#define TPM_HORNEGANIMATION 0x0800L
+#define TPM_VERPOSANIMATION 0x1000L
+#define TPM_VERNEGANIMATION 0x2000L
+#if(_WIN32_WINNT >= 0x0500)
+#define TPM_NOANIMATION     0x4000L
+#endif /* _WIN32_WINNT >= 0x0500 */
+#if(_WIN32_WINNT >= 0x0501)
+#define TPM_LAYOUTRTL       0x8000L
+#endif /* _WIN32_WINNT >= 0x0501 */
+#endif /* WINVER >= 0x0500 */
+
+
+#endif /* !NOMENUS */
+
+
+#if(WINVER >= 0x0400)
+//
+// Drag-and-drop support
+// Obsolete - use OLE instead
+//
+typedef struct tagDROPSTRUCT
+{
+    HWND    hwndSource;
+    HWND    hwndSink;
+    DWORD   wFmt;
+    ULONG_PTR dwData;
+    POINT   ptDrop;
+    DWORD   dwControlData;
+} DROPSTRUCT, *PDROPSTRUCT, *LPDROPSTRUCT;
+
+#define DOF_EXECUTABLE      0x8001      // wFmt flags
+#define DOF_DOCUMENT        0x8002
+#define DOF_DIRECTORY       0x8003
+#define DOF_MULTIPLE        0x8004
+#define DOF_PROGMAN         0x0001
+#define DOF_SHELLDATA       0x0002
+
+#define DO_DROPFILE         0x454C4946L
+#define DO_PRINTFILE        0x544E5250L
+
+WINUSERAPI
+DWORD
+WINAPI
+DragObject(
+    IN HWND,
+    IN HWND,
+    IN UINT,
+    IN ULONG_PTR,
+    IN HCURSOR);
+
+WINUSERAPI
+BOOL
+WINAPI
+DragDetect(
+    IN HWND,
+    IN POINT);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawIcon(
+    IN HDC hDC,
+    IN int X,
+    IN int Y,
+    IN HICON hIcon);
+
+#ifndef NODRAWTEXT
+
+/*
+ * DrawText() Format Flags
+ */
+#define DT_TOP                      0x00000000
+#define DT_LEFT                     0x00000000
+#define DT_CENTER                   0x00000001
+#define DT_RIGHT                    0x00000002
+#define DT_VCENTER                  0x00000004
+#define DT_BOTTOM                   0x00000008
+#define DT_WORDBREAK                0x00000010
+#define DT_SINGLELINE               0x00000020
+#define DT_EXPANDTABS               0x00000040
+#define DT_TABSTOP                  0x00000080
+#define DT_NOCLIP                   0x00000100
+#define DT_EXTERNALLEADING          0x00000200
+#define DT_CALCRECT                 0x00000400
+#define DT_NOPREFIX                 0x00000800
+#define DT_INTERNAL                 0x00001000
+
+#if(WINVER >= 0x0400)
+#define DT_EDITCONTROL              0x00002000
+#define DT_PATH_ELLIPSIS            0x00004000
+#define DT_END_ELLIPSIS             0x00008000
+#define DT_MODIFYSTRING             0x00010000
+#define DT_RTLREADING               0x00020000
+#define DT_WORD_ELLIPSIS            0x00040000
+#if(WINVER >= 0x0500)
+#define DT_NOFULLWIDTHCHARBREAK     0x00080000
+#if(_WIN32_WINNT >= 0x0500)
+#define DT_HIDEPREFIX               0x00100000
+#define DT_PREFIXONLY               0x00200000
+#endif /* _WIN32_WINNT >= 0x0500 */
+#endif /* WINVER >= 0x0500 */
+
+typedef struct tagDRAWTEXTPARAMS
+{
+    UINT    cbSize;
+    int     iTabLength;
+    int     iLeftMargin;
+    int     iRightMargin;
+    UINT    uiLengthDrawn;
+} DRAWTEXTPARAMS, FAR *LPDRAWTEXTPARAMS;
+#endif /* WINVER >= 0x0400 */
+
+
+WINUSERAPI
+int
+WINAPI
+DrawTextA(
+    IN HDC hDC,
+    IN LPCSTR lpString,
+    IN int nCount,
+    IN OUT LPRECT lpRect,
+    IN UINT uFormat);
+WINUSERAPI
+int
+WINAPI
+DrawTextW(
+    IN HDC hDC,
+    IN LPCWSTR lpString,
+    IN int nCount,
+    IN OUT LPRECT lpRect,
+    IN UINT uFormat);
+#ifdef UNICODE
+#define DrawText  DrawTextW
+#else
+#define DrawText  DrawTextA
+#endif // !UNICODE
+
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+int
+WINAPI
+DrawTextExA(
+    IN HDC,
+    IN OUT LPSTR,
+    IN int,
+    IN OUT LPRECT,
+    IN UINT,
+    IN LPDRAWTEXTPARAMS);
+WINUSERAPI
+int
+WINAPI
+DrawTextExW(
+    IN HDC,
+    IN OUT LPWSTR,
+    IN int,
+    IN OUT LPRECT,
+    IN UINT,
+    IN LPDRAWTEXTPARAMS);
+#ifdef UNICODE
+#define DrawTextEx  DrawTextExW
+#else
+#define DrawTextEx  DrawTextExA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+#endif /* !NODRAWTEXT */
+
+WINUSERAPI
+BOOL
+WINAPI
+GrayStringA(
+    IN HDC hDC,
+    IN HBRUSH hBrush,
+    IN GRAYSTRINGPROC lpOutputFunc,
+    IN LPARAM lpData,
+    IN int nCount,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight);
+WINUSERAPI
+BOOL
+WINAPI
+GrayStringW(
+    IN HDC hDC,
+    IN HBRUSH hBrush,
+    IN GRAYSTRINGPROC lpOutputFunc,
+    IN LPARAM lpData,
+    IN int nCount,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight);
+#ifdef UNICODE
+#define GrayString  GrayStringW
+#else
+#define GrayString  GrayStringA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+/* Monolithic state-drawing routine */
+/* Image type */
+#define DST_COMPLEX     0x0000
+#define DST_TEXT        0x0001
+#define DST_PREFIXTEXT  0x0002
+#define DST_ICON        0x0003
+#define DST_BITMAP      0x0004
+
+/* State type */
+#define DSS_NORMAL      0x0000
+#define DSS_UNION       0x0010  /* Gray string appearance */
+#define DSS_DISABLED    0x0020
+#define DSS_MONO        0x0080
+#if(_WIN32_WINNT >= 0x0500)
+#define DSS_HIDEPREFIX  0x0200
+#define DSS_PREFIXONLY  0x0400
+#endif /* _WIN32_WINNT >= 0x0500 */
+#define DSS_RIGHT       0x8000
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawStateA(
+    IN HDC,
+    IN HBRUSH,
+    IN DRAWSTATEPROC,
+    IN LPARAM,
+    IN WPARAM,
+    IN int,
+    IN int,
+    IN int,
+    IN int,
+    IN UINT);
+WINUSERAPI
+BOOL
+WINAPI
+DrawStateW(
+    IN HDC,
+    IN HBRUSH,
+    IN DRAWSTATEPROC,
+    IN LPARAM,
+    IN WPARAM,
+    IN int,
+    IN int,
+    IN int,
+    IN int,
+    IN UINT);
+#ifdef UNICODE
+#define DrawState  DrawStateW
+#else
+#define DrawState  DrawStateA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+LONG
+WINAPI
+TabbedTextOutA(
+    IN HDC hDC,
+    IN int X,
+    IN int Y,
+    IN LPCSTR lpString,
+    IN int nCount,
+    IN int nTabPositions,
+    IN CONST INT *lpnTabStopPositions,
+    IN int nTabOrigin);
+WINUSERAPI
+LONG
+WINAPI
+TabbedTextOutW(
+    IN HDC hDC,
+    IN int X,
+    IN int Y,
+    IN LPCWSTR lpString,
+    IN int nCount,
+    IN int nTabPositions,
+    IN CONST INT *lpnTabStopPositions,
+    IN int nTabOrigin);
+#ifdef UNICODE
+#define TabbedTextOut  TabbedTextOutW
+#else
+#define TabbedTextOut  TabbedTextOutA
+#endif // !UNICODE
+
+WINUSERAPI
+DWORD
+WINAPI
+GetTabbedTextExtentA(
+    IN HDC hDC,
+    IN LPCSTR lpString,
+    IN int nCount,
+    IN int nTabPositions,
+    IN CONST INT *lpnTabStopPositions);
+WINUSERAPI
+DWORD
+WINAPI
+GetTabbedTextExtentW(
+    IN HDC hDC,
+    IN LPCWSTR lpString,
+    IN int nCount,
+    IN int nTabPositions,
+    IN CONST INT *lpnTabStopPositions);
+#ifdef UNICODE
+#define GetTabbedTextExtent  GetTabbedTextExtentW
+#else
+#define GetTabbedTextExtent  GetTabbedTextExtentA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+UpdateWindow(
+    IN HWND hWnd);
+
+WINUSERAPI
+HWND
+WINAPI
+SetActiveWindow(
+    IN HWND hWnd);
+
+WINUSERAPI
+HWND
+WINAPI
+GetForegroundWindow(
+    VOID);
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+BOOL
+WINAPI
+PaintDesktop(
+    IN HDC hdc);
+
+WINUSERAPI
+VOID
+WINAPI
+SwitchToThisWindow(
+    IN HWND hwnd,
+    IN BOOL fUnknown);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+SetForegroundWindow(
+    IN HWND hWnd);
+
+#if(_WIN32_WINNT >= 0x0500)
+WINUSERAPI
+BOOL
+WINAPI
+AllowSetForegroundWindow(
+    DWORD dwProcessId);
+
+#define ASFW_ANY    ((DWORD)-1)
+
+WINUSERAPI
+BOOL
+WINAPI
+LockSetForegroundWindow(
+    UINT uLockCode);
+
+#define LSFW_LOCK       1
+#define LSFW_UNLOCK     2
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+WINUSERAPI
+HWND
+WINAPI
+WindowFromDC(
+    IN HDC hDC);
+
+WINUSERAPI
+HDC
+WINAPI
+GetDC(
+    IN HWND hWnd);
+
+WINUSERAPI
+HDC
+WINAPI
+GetDCEx(
+    IN HWND hWnd,
+    IN HRGN hrgnClip,
+    IN DWORD flags);
+
+/*
+ * GetDCEx() flags
+ */
+#define DCX_WINDOW           0x00000001L
+#define DCX_CACHE            0x00000002L
+#define DCX_NORESETATTRS     0x00000004L
+#define DCX_CLIPCHILDREN     0x00000008L
+#define DCX_CLIPSIBLINGS     0x00000010L
+#define DCX_PARENTCLIP       0x00000020L
+#define DCX_EXCLUDERGN       0x00000040L
+#define DCX_INTERSECTRGN     0x00000080L
+#define DCX_EXCLUDEUPDATE    0x00000100L
+#define DCX_INTERSECTUPDATE  0x00000200L
+#define DCX_LOCKWINDOWUPDATE 0x00000400L
+
+#define DCX_VALIDATE         0x00200000L
+
+WINUSERAPI
+HDC
+WINAPI
+GetWindowDC(
+    IN HWND hWnd);
+
+WINUSERAPI
+int
+WINAPI
+ReleaseDC(
+    IN HWND hWnd,
+    IN HDC hDC);
+
+WINUSERAPI
+HDC
+WINAPI
+BeginPaint(
+    IN HWND hWnd,
+    OUT LPPAINTSTRUCT lpPaint);
+
+WINUSERAPI
+BOOL
+WINAPI
+EndPaint(
+    IN HWND hWnd,
+    IN CONST PAINTSTRUCT *lpPaint);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetUpdateRect(
+    IN HWND hWnd,
+    OUT LPRECT lpRect,
+    IN BOOL bErase);
+
+WINUSERAPI
+int
+WINAPI
+GetUpdateRgn(
+    IN HWND hWnd,
+    IN HRGN hRgn,
+    IN BOOL bErase);
+
+WINUSERAPI
+int
+WINAPI
+SetWindowRgn(
+    IN HWND hWnd,
+    IN HRGN hRgn,
+    IN BOOL bRedraw);
+
+
+WINUSERAPI
+int
+WINAPI
+GetWindowRgn(
+    IN HWND hWnd,
+    IN HRGN hRgn);
+
+#if(_WIN32_WINNT >= 0x0501)
+
+WINUSERAPI
+int
+WINAPI
+GetWindowRgnBox(
+    IN HWND hWnd,
+    OUT LPRECT lprc);
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI
+int
+WINAPI
+ExcludeUpdateRgn(
+    IN HDC hDC,
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+InvalidateRect(
+    IN HWND hWnd,
+    IN CONST RECT *lpRect,
+    IN BOOL bErase);
+
+WINUSERAPI
+BOOL
+WINAPI
+ValidateRect(
+    IN HWND hWnd,
+    IN CONST RECT *lpRect);
+
+WINUSERAPI
+BOOL
+WINAPI
+InvalidateRgn(
+    IN HWND hWnd,
+    IN HRGN hRgn,
+    IN BOOL bErase);
+
+WINUSERAPI
+BOOL
+WINAPI
+ValidateRgn(
+    IN HWND hWnd,
+    IN HRGN hRgn);
+
+
+WINUSERAPI
+BOOL
+WINAPI
+RedrawWindow(
+    IN HWND hWnd,
+    IN CONST RECT *lprcUpdate,
+    IN HRGN hrgnUpdate,
+    IN UINT flags);
+
+/*
+ * RedrawWindow() flags
+ */
+#define RDW_INVALIDATE          0x0001
+#define RDW_INTERNALPAINT       0x0002
+#define RDW_ERASE               0x0004
+
+#define RDW_VALIDATE            0x0008
+#define RDW_NOINTERNALPAINT     0x0010
+#define RDW_NOERASE             0x0020
+
+#define RDW_NOCHILDREN          0x0040
+#define RDW_ALLCHILDREN         0x0080
+
+#define RDW_UPDATENOW           0x0100
+#define RDW_ERASENOW            0x0200
+
+#define RDW_FRAME               0x0400
+#define RDW_NOFRAME             0x0800
+
+
+/*
+ * LockWindowUpdate API
+ */
+
+WINUSERAPI
+BOOL
+WINAPI
+LockWindowUpdate(
+    IN HWND hWndLock);
+
+WINUSERAPI
+BOOL
+WINAPI
+ScrollWindow(
+    IN HWND hWnd,
+    IN int XAmount,
+    IN int YAmount,
+    IN CONST RECT *lpRect,
+    IN CONST RECT *lpClipRect);
+
+WINUSERAPI
+BOOL
+WINAPI
+ScrollDC(
+    IN HDC hDC,
+    IN int dx,
+    IN int dy,
+    IN CONST RECT *lprcScroll,
+    IN CONST RECT *lprcClip,
+    IN HRGN hrgnUpdate,
+    OUT LPRECT lprcUpdate);
+
+WINUSERAPI
+int
+WINAPI
+ScrollWindowEx(
+    IN HWND hWnd,
+    IN int dx,
+    IN int dy,
+    IN CONST RECT *prcScroll,
+    IN CONST RECT *prcClip,
+    IN HRGN hrgnUpdate,
+    OUT LPRECT prcUpdate,
+    IN UINT flags);
+
+#define SW_SCROLLCHILDREN   0x0001  /* Scroll children within *lprcScroll. */
+#define SW_INVALIDATE       0x0002  /* Invalidate after scrolling */
+#define SW_ERASE            0x0004  /* If SW_INVALIDATE, don't send WM_ERASEBACKGROUND */
+#if(WINVER >= 0x0500)
+#define SW_SMOOTHSCROLL     0x0010  /* Use smooth scrolling */
+#endif /* WINVER >= 0x0500 */
+
+#ifndef NOSCROLL
+
+WINUSERAPI
+int
+WINAPI
+SetScrollPos(
+    IN HWND hWnd,
+    IN int nBar,
+    IN int nPos,
+    IN BOOL bRedraw);
+
+WINUSERAPI
+int
+WINAPI
+GetScrollPos(
+    IN HWND hWnd,
+    IN int nBar);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetScrollRange(
+    IN HWND hWnd,
+    IN int nBar,
+    IN int nMinPos,
+    IN int nMaxPos,
+    IN BOOL bRedraw);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetScrollRange(
+    IN HWND hWnd,
+    IN int nBar,
+    OUT LPINT lpMinPos,
+    OUT LPINT lpMaxPos);
+
+WINUSERAPI
+BOOL
+WINAPI
+ShowScrollBar(
+    IN HWND hWnd,
+    IN int wBar,
+    IN BOOL bShow);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnableScrollBar(
+    IN HWND hWnd,
+    IN UINT wSBflags,
+    IN UINT wArrows);
+
+
+/*
+ * EnableScrollBar() flags
+ */
+#define ESB_ENABLE_BOTH     0x0000
+#define ESB_DISABLE_BOTH    0x0003
+
+#define ESB_DISABLE_LEFT    0x0001
+#define ESB_DISABLE_RIGHT   0x0002
+
+#define ESB_DISABLE_UP      0x0001
+#define ESB_DISABLE_DOWN    0x0002
+
+#define ESB_DISABLE_LTUP    ESB_DISABLE_LEFT
+#define ESB_DISABLE_RTDN    ESB_DISABLE_RIGHT
+
+
+#endif  /* !NOSCROLL */
+
+WINUSERAPI
+BOOL
+WINAPI
+SetPropA(
+    IN HWND hWnd,
+    IN LPCSTR lpString,
+    IN HANDLE hData);
+WINUSERAPI
+BOOL
+WINAPI
+SetPropW(
+    IN HWND hWnd,
+    IN LPCWSTR lpString,
+    IN HANDLE hData);
+#ifdef UNICODE
+#define SetProp  SetPropW
+#else
+#define SetProp  SetPropA
+#endif // !UNICODE
+
+WINUSERAPI
+HANDLE
+WINAPI
+GetPropA(
+    IN HWND hWnd,
+    IN LPCSTR lpString);
+WINUSERAPI
+HANDLE
+WINAPI
+GetPropW(
+    IN HWND hWnd,
+    IN LPCWSTR lpString);
+#ifdef UNICODE
+#define GetProp  GetPropW
+#else
+#define GetProp  GetPropA
+#endif // !UNICODE
+
+WINUSERAPI
+HANDLE
+WINAPI
+RemovePropA(
+    IN HWND hWnd,
+    IN LPCSTR lpString);
+WINUSERAPI
+HANDLE
+WINAPI
+RemovePropW(
+    IN HWND hWnd,
+    IN LPCWSTR lpString);
+#ifdef UNICODE
+#define RemoveProp  RemovePropW
+#else
+#define RemoveProp  RemovePropA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+EnumPropsExA(
+    IN HWND hWnd,
+    IN PROPENUMPROCEXA lpEnumFunc,
+    IN LPARAM lParam);
+WINUSERAPI
+int
+WINAPI
+EnumPropsExW(
+    IN HWND hWnd,
+    IN PROPENUMPROCEXW lpEnumFunc,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define EnumPropsEx  EnumPropsExW
+#else
+#define EnumPropsEx  EnumPropsExA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+EnumPropsA(
+    IN HWND hWnd,
+    IN PROPENUMPROCA lpEnumFunc);
+WINUSERAPI
+int
+WINAPI
+EnumPropsW(
+    IN HWND hWnd,
+    IN PROPENUMPROCW lpEnumFunc);
+#ifdef UNICODE
+#define EnumProps  EnumPropsW
+#else
+#define EnumProps  EnumPropsA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+SetWindowTextA(
+    IN HWND hWnd,
+    IN LPCSTR lpString);
+WINUSERAPI
+BOOL
+WINAPI
+SetWindowTextW(
+    IN HWND hWnd,
+    IN LPCWSTR lpString);
+#ifdef UNICODE
+#define SetWindowText  SetWindowTextW
+#else
+#define SetWindowText  SetWindowTextA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+GetWindowTextA(
+    IN HWND hWnd,
+    OUT LPSTR lpString,
+    IN int nMaxCount);
+WINUSERAPI
+int
+WINAPI
+GetWindowTextW(
+    IN HWND hWnd,
+    OUT LPWSTR lpString,
+    IN int nMaxCount);
+#ifdef UNICODE
+#define GetWindowText  GetWindowTextW
+#else
+#define GetWindowText  GetWindowTextA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+GetWindowTextLengthA(
+    IN HWND hWnd);
+WINUSERAPI
+int
+WINAPI
+GetWindowTextLengthW(
+    IN HWND hWnd);
+#ifdef UNICODE
+#define GetWindowTextLength  GetWindowTextLengthW
+#else
+#define GetWindowTextLength  GetWindowTextLengthA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+GetClientRect(
+    IN HWND hWnd,
+    OUT LPRECT lpRect);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetWindowRect(
+    IN HWND hWnd,
+    OUT LPRECT lpRect);
+
+WINUSERAPI
+BOOL
+WINAPI
+AdjustWindowRect(
+    IN OUT LPRECT lpRect,
+    IN DWORD dwStyle,
+    IN BOOL bMenu);
+
+WINUSERAPI
+BOOL
+WINAPI
+AdjustWindowRectEx(
+    IN OUT LPRECT lpRect,
+    IN DWORD dwStyle,
+    IN BOOL bMenu,
+    IN DWORD dwExStyle);
+
+
+#if(WINVER >= 0x0400)
+#define HELPINFO_WINDOW    0x0001
+#define HELPINFO_MENUITEM  0x0002
+typedef struct tagHELPINFO      /* Structure pointed to by lParam of WM_HELP */
+{
+    UINT    cbSize;             /* Size in bytes of this struct  */
+    int     iContextType;       /* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */
+    int     iCtrlId;            /* Control Id or a Menu item Id. */
+    HANDLE  hItemHandle;        /* hWnd of control or hMenu.     */
+    DWORD_PTR dwContextId;      /* Context Id associated with this item */
+    POINT   MousePos;           /* Mouse Position in screen co-ordinates */
+}  HELPINFO, FAR *LPHELPINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+SetWindowContextHelpId(
+    IN HWND,
+    IN DWORD);
+
+WINUSERAPI
+DWORD
+WINAPI
+GetWindowContextHelpId(
+    IN HWND);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetMenuContextHelpId(
+    IN HMENU,
+    IN DWORD);
+
+WINUSERAPI
+DWORD
+WINAPI
+GetMenuContextHelpId(
+    IN HMENU);
+
+#endif /* WINVER >= 0x0400 */
+
+
+#ifndef NOMB
+
+/*
+ * MessageBox() Flags
+ */
+#define MB_OK                       0x00000000L
+#define MB_OKCANCEL                 0x00000001L
+#define MB_ABORTRETRYIGNORE         0x00000002L
+#define MB_YESNOCANCEL              0x00000003L
+#define MB_YESNO                    0x00000004L
+#define MB_RETRYCANCEL              0x00000005L
+#if(WINVER >= 0x0500)
+#define MB_CANCELTRYCONTINUE        0x00000006L
+#endif /* WINVER >= 0x0500 */
+
+
+#define MB_ICONHAND                 0x00000010L
+#define MB_ICONQUESTION             0x00000020L
+#define MB_ICONEXCLAMATION          0x00000030L
+#define MB_ICONASTERISK             0x00000040L
+
+#if(WINVER >= 0x0400)
+#define MB_USERICON                 0x00000080L
+#define MB_ICONWARNING              MB_ICONEXCLAMATION
+#define MB_ICONERROR                MB_ICONHAND
+#endif /* WINVER >= 0x0400 */
+
+#define MB_ICONINFORMATION          MB_ICONASTERISK
+#define MB_ICONSTOP                 MB_ICONHAND
+
+#define MB_DEFBUTTON1               0x00000000L
+#define MB_DEFBUTTON2               0x00000100L
+#define MB_DEFBUTTON3               0x00000200L
+#if(WINVER >= 0x0400)
+#define MB_DEFBUTTON4               0x00000300L
+#endif /* WINVER >= 0x0400 */
+
+#define MB_APPLMODAL                0x00000000L
+#define MB_SYSTEMMODAL              0x00001000L
+#define MB_TASKMODAL                0x00002000L
+#if(WINVER >= 0x0400)
+#define MB_HELP                     0x00004000L // Help Button
+#endif /* WINVER >= 0x0400 */
+
+#define MB_NOFOCUS                  0x00008000L
+#define MB_SETFOREGROUND            0x00010000L
+#define MB_DEFAULT_DESKTOP_ONLY     0x00020000L
+
+#if(WINVER >= 0x0400)
+#define MB_TOPMOST                  0x00040000L
+#define MB_RIGHT                    0x00080000L
+#define MB_RTLREADING               0x00100000L
+
+
+#endif /* WINVER >= 0x0400 */
+
+#ifdef _WIN32_WINNT
+#if (_WIN32_WINNT >= 0x0400)
+#define MB_SERVICE_NOTIFICATION          0x00200000L
+#else
+#define MB_SERVICE_NOTIFICATION          0x00040000L
+#endif
+#define MB_SERVICE_NOTIFICATION_NT3X     0x00040000L
+#endif
+
+#define MB_TYPEMASK                 0x0000000FL
+#define MB_ICONMASK                 0x000000F0L
+#define MB_DEFMASK                  0x00000F00L
+#define MB_MODEMASK                 0x00003000L
+#define MB_MISCMASK                 0x0000C000L
+
+WINUSERAPI
+int
+WINAPI
+MessageBoxA(
+    IN HWND hWnd,
+    IN LPCSTR lpText,
+    IN LPCSTR lpCaption,
+    IN UINT uType);
+WINUSERAPI
+int
+WINAPI
+MessageBoxW(
+    IN HWND hWnd,
+    IN LPCWSTR lpText,
+    IN LPCWSTR lpCaption,
+    IN UINT uType);
+#ifdef UNICODE
+#define MessageBox  MessageBoxW
+#else
+#define MessageBox  MessageBoxA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+MessageBoxExA(
+    IN HWND hWnd,
+    IN LPCSTR lpText,
+    IN LPCSTR lpCaption,
+    IN UINT uType,
+    IN WORD wLanguageId);
+WINUSERAPI
+int
+WINAPI
+MessageBoxExW(
+    IN HWND hWnd,
+    IN LPCWSTR lpText,
+    IN LPCWSTR lpCaption,
+    IN UINT uType,
+    IN WORD wLanguageId);
+#ifdef UNICODE
+#define MessageBoxEx  MessageBoxExW
+#else
+#define MessageBoxEx  MessageBoxExA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+
+typedef void (CALLBACK *MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
+
+typedef struct tagMSGBOXPARAMSA
+{
+    UINT        cbSize;
+    HWND        hwndOwner;
+    HINSTANCE   hInstance;
+    LPCSTR      lpszText;
+    LPCSTR      lpszCaption;
+    DWORD       dwStyle;
+    LPCSTR      lpszIcon;
+    DWORD_PTR   dwContextHelpId;
+    MSGBOXCALLBACK      lpfnMsgBoxCallback;
+    DWORD       dwLanguageId;
+} MSGBOXPARAMSA, *PMSGBOXPARAMSA, *LPMSGBOXPARAMSA;
+typedef struct tagMSGBOXPARAMSW
+{
+    UINT        cbSize;
+    HWND        hwndOwner;
+    HINSTANCE   hInstance;
+    LPCWSTR     lpszText;
+    LPCWSTR     lpszCaption;
+    DWORD       dwStyle;
+    LPCWSTR     lpszIcon;
+    DWORD_PTR   dwContextHelpId;
+    MSGBOXCALLBACK      lpfnMsgBoxCallback;
+    DWORD       dwLanguageId;
+} MSGBOXPARAMSW, *PMSGBOXPARAMSW, *LPMSGBOXPARAMSW;
+#ifdef UNICODE
+typedef MSGBOXPARAMSW MSGBOXPARAMS;
+typedef PMSGBOXPARAMSW PMSGBOXPARAMS;
+typedef LPMSGBOXPARAMSW LPMSGBOXPARAMS;
+#else
+typedef MSGBOXPARAMSA MSGBOXPARAMS;
+typedef PMSGBOXPARAMSA PMSGBOXPARAMS;
+typedef LPMSGBOXPARAMSA LPMSGBOXPARAMS;
+#endif // UNICODE
+
+WINUSERAPI
+int
+WINAPI
+MessageBoxIndirectA(
+    IN CONST MSGBOXPARAMSA *);
+WINUSERAPI
+int
+WINAPI
+MessageBoxIndirectW(
+    IN CONST MSGBOXPARAMSW *);
+#ifdef UNICODE
+#define MessageBoxIndirect  MessageBoxIndirectW
+#else
+#define MessageBoxIndirect  MessageBoxIndirectA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0400 */
+
+
+WINUSERAPI
+BOOL
+WINAPI
+MessageBeep(
+    IN UINT uType);
+
+#endif /* !NOMB */
+
+WINUSERAPI
+int
+WINAPI
+ShowCursor(
+    IN BOOL bShow);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetCursorPos(
+    IN int X,
+    IN int Y);
+
+WINUSERAPI
+HCURSOR
+WINAPI
+SetCursor(
+    IN HCURSOR hCursor);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetCursorPos(
+    OUT LPPOINT lpPoint);
+
+WINUSERAPI
+BOOL
+WINAPI
+ClipCursor(
+    IN CONST RECT *lpRect);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetClipCursor(
+    OUT LPRECT lpRect);
+
+WINUSERAPI
+HCURSOR
+WINAPI
+GetCursor(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+CreateCaret(
+    IN HWND hWnd,
+    IN HBITMAP hBitmap,
+    IN int nWidth,
+    IN int nHeight);
+
+WINUSERAPI
+UINT
+WINAPI
+GetCaretBlinkTime(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetCaretBlinkTime(
+    IN UINT uMSeconds);
+
+WINUSERAPI
+BOOL
+WINAPI
+DestroyCaret(
+    VOID);
+
+WINUSERAPI
+BOOL
+WINAPI
+HideCaret(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+ShowCaret(
+    IN HWND hWnd);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetCaretPos(
+    IN int X,
+    IN int Y);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetCaretPos(
+    OUT LPPOINT lpPoint);
+
+WINUSERAPI
+BOOL
+WINAPI
+ClientToScreen(
+    IN HWND hWnd,
+    IN OUT LPPOINT lpPoint);
+
+WINUSERAPI
+BOOL
+WINAPI
+ScreenToClient(
+    IN HWND hWnd,
+    IN OUT LPPOINT lpPoint);
+
+WINUSERAPI
+int
+WINAPI
+MapWindowPoints(
+    IN HWND hWndFrom,
+    IN HWND hWndTo,
+    IN OUT LPPOINT lpPoints,
+    IN UINT cPoints);
+
+WINUSERAPI
+HWND
+WINAPI
+WindowFromPoint(
+    IN POINT Point);
+
+WINUSERAPI
+HWND
+WINAPI
+ChildWindowFromPoint(
+    IN HWND hWndParent,
+    IN POINT Point);
+
+#if(WINVER >= 0x0400)
+#define CWP_ALL             0x0000
+#define CWP_SKIPINVISIBLE   0x0001
+#define CWP_SKIPDISABLED    0x0002
+#define CWP_SKIPTRANSPARENT 0x0004
+
+WINUSERAPI HWND    WINAPI ChildWindowFromPointEx( IN HWND, IN POINT, IN UINT);
+#endif /* WINVER >= 0x0400 */
+
+#ifndef NOCOLOR
+
+/*
+ * Color Types
+ */
+#define CTLCOLOR_MSGBOX         0
+#define CTLCOLOR_EDIT           1
+#define CTLCOLOR_LISTBOX        2
+#define CTLCOLOR_BTN            3
+#define CTLCOLOR_DLG            4
+#define CTLCOLOR_SCROLLBAR      5
+#define CTLCOLOR_STATIC         6
+#define CTLCOLOR_MAX            7
+
+#define COLOR_SCROLLBAR         0
+#define COLOR_BACKGROUND        1
+#define COLOR_ACTIVECAPTION     2
+#define COLOR_INACTIVECAPTION   3
+#define COLOR_MENU              4
+#define COLOR_WINDOW            5
+#define COLOR_WINDOWFRAME       6
+#define COLOR_MENUTEXT          7
+#define COLOR_WINDOWTEXT        8
+#define COLOR_CAPTIONTEXT       9
+#define COLOR_ACTIVEBORDER      10
+#define COLOR_INACTIVEBORDER    11
+#define COLOR_APPWORKSPACE      12
+#define COLOR_HIGHLIGHT         13
+#define COLOR_HIGHLIGHTTEXT     14
+#define COLOR_BTNFACE           15
+#define COLOR_BTNSHADOW         16
+#define COLOR_GRAYTEXT          17
+#define COLOR_BTNTEXT           18
+#define COLOR_INACTIVECAPTIONTEXT 19
+#define COLOR_BTNHIGHLIGHT      20
+
+#if(WINVER >= 0x0400)
+#define COLOR_3DDKSHADOW        21
+#define COLOR_3DLIGHT           22
+#define COLOR_INFOTEXT          23
+#define COLOR_INFOBK            24
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define COLOR_HOTLIGHT          26
+#define COLOR_GRADIENTACTIVECAPTION 27
+#define COLOR_GRADIENTINACTIVECAPTION 28
+#if(WINVER >= 0x0501)
+#define COLOR_MENUHILIGHT       29
+#define COLOR_MENUBAR           30
+#endif /* WINVER >= 0x0501 */
+#endif /* WINVER >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+#define COLOR_DESKTOP           COLOR_BACKGROUND
+#define COLOR_3DFACE            COLOR_BTNFACE
+#define COLOR_3DSHADOW          COLOR_BTNSHADOW
+#define COLOR_3DHIGHLIGHT       COLOR_BTNHIGHLIGHT
+#define COLOR_3DHILIGHT         COLOR_BTNHIGHLIGHT
+#define COLOR_BTNHILIGHT        COLOR_BTNHIGHLIGHT
+#endif /* WINVER >= 0x0400 */
+
+
+WINUSERAPI
+DWORD
+WINAPI
+GetSysColor(
+    IN int nIndex);
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+HBRUSH
+WINAPI
+GetSysColorBrush(
+    IN int nIndex);
+
+
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+SetSysColors(
+    IN int cElements,
+    IN CONST INT * lpaElements,
+    IN CONST COLORREF * lpaRgbValues);
+
+#endif /* !NOCOLOR */
+
+WINUSERAPI
+BOOL
+WINAPI
+DrawFocusRect(
+    IN HDC hDC,
+    IN CONST RECT * lprc);
+
+WINUSERAPI
+int
+WINAPI
+FillRect(
+    IN HDC hDC,
+    IN CONST RECT *lprc,
+    IN HBRUSH hbr);
+
+WINUSERAPI
+int
+WINAPI
+FrameRect(
+    IN HDC hDC,
+    IN CONST RECT *lprc,
+    IN HBRUSH hbr);
+
+WINUSERAPI
+BOOL
+WINAPI
+InvertRect(
+    IN HDC hDC,
+    IN CONST RECT *lprc);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetRect(
+    OUT LPRECT lprc,
+    IN int xLeft,
+    IN int yTop,
+    IN int xRight,
+    IN int yBottom);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetRectEmpty(
+    OUT LPRECT lprc);
+
+WINUSERAPI
+BOOL
+WINAPI
+CopyRect(
+    OUT LPRECT lprcDst,
+    IN CONST RECT *lprcSrc);
+
+WINUSERAPI
+BOOL
+WINAPI
+InflateRect(
+    IN OUT LPRECT lprc,
+    IN int dx,
+    IN int dy);
+
+WINUSERAPI
+BOOL
+WINAPI
+IntersectRect(
+    OUT LPRECT lprcDst,
+    IN CONST RECT *lprcSrc1,
+    IN CONST RECT *lprcSrc2);
+
+WINUSERAPI
+BOOL
+WINAPI
+UnionRect(
+    OUT LPRECT lprcDst,
+    IN CONST RECT *lprcSrc1,
+    IN CONST RECT *lprcSrc2);
+
+WINUSERAPI
+BOOL
+WINAPI
+SubtractRect(
+    OUT LPRECT lprcDst,
+    IN CONST RECT *lprcSrc1,
+    IN CONST RECT *lprcSrc2);
+
+WINUSERAPI
+BOOL
+WINAPI
+OffsetRect(
+    IN OUT LPRECT lprc,
+    IN int dx,
+    IN int dy);
+
+WINUSERAPI
+BOOL
+WINAPI
+IsRectEmpty(
+    IN CONST RECT *lprc);
+
+WINUSERAPI
+BOOL
+WINAPI
+EqualRect(
+    IN CONST RECT *lprc1,
+    IN CONST RECT *lprc2);
+
+WINUSERAPI
+BOOL
+WINAPI
+PtInRect(
+    IN CONST RECT *lprc,
+    IN POINT pt);
+
+#ifndef NOWINOFFSETS
+
+WINUSERAPI
+WORD
+WINAPI
+GetWindowWord(
+    IN HWND hWnd,
+    IN int nIndex);
+
+WINUSERAPI
+WORD
+WINAPI
+SetWindowWord(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN WORD wNewWord);
+
+WINUSERAPI
+LONG
+WINAPI
+GetWindowLongA(
+    IN HWND hWnd,
+    IN int nIndex);
+WINUSERAPI
+LONG
+WINAPI
+GetWindowLongW(
+    IN HWND hWnd,
+    IN int nIndex);
+#ifdef UNICODE
+#define GetWindowLong  GetWindowLongW
+#else
+#define GetWindowLong  GetWindowLongA
+#endif // !UNICODE
+
+WINUSERAPI
+LONG
+WINAPI
+SetWindowLongA(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN LONG dwNewLong);
+WINUSERAPI
+LONG
+WINAPI
+SetWindowLongW(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN LONG dwNewLong);
+#ifdef UNICODE
+#define SetWindowLong  SetWindowLongW
+#else
+#define SetWindowLong  SetWindowLongA
+#endif // !UNICODE
+
+#ifdef _WIN64
+
+WINUSERAPI
+LONG_PTR
+WINAPI
+GetWindowLongPtrA(
+    HWND hWnd,
+    int nIndex);
+WINUSERAPI
+LONG_PTR
+WINAPI
+GetWindowLongPtrW(
+    HWND hWnd,
+    int nIndex);
+#ifdef UNICODE
+#define GetWindowLongPtr  GetWindowLongPtrW
+#else
+#define GetWindowLongPtr  GetWindowLongPtrA
+#endif // !UNICODE
+
+WINUSERAPI
+LONG_PTR
+WINAPI
+SetWindowLongPtrA(
+    HWND hWnd,
+    int nIndex,
+    LONG_PTR dwNewLong);
+WINUSERAPI
+LONG_PTR
+WINAPI
+SetWindowLongPtrW(
+    HWND hWnd,
+    int nIndex,
+    LONG_PTR dwNewLong);
+#ifdef UNICODE
+#define SetWindowLongPtr  SetWindowLongPtrW
+#else
+#define SetWindowLongPtr  SetWindowLongPtrA
+#endif // !UNICODE
+
+#else  /* _WIN64 */
+
+#define GetWindowLongPtrA   GetWindowLongA
+#define GetWindowLongPtrW   GetWindowLongW
+#ifdef UNICODE
+#define GetWindowLongPtr  GetWindowLongPtrW
+#else
+#define GetWindowLongPtr  GetWindowLongPtrA
+#endif // !UNICODE
+
+#define SetWindowLongPtrA   SetWindowLongA
+#define SetWindowLongPtrW   SetWindowLongW
+#ifdef UNICODE
+#define SetWindowLongPtr  SetWindowLongPtrW
+#else
+#define SetWindowLongPtr  SetWindowLongPtrA
+#endif // !UNICODE
+
+#endif /* _WIN64 */
+
+WINUSERAPI
+WORD
+WINAPI
+GetClassWord(
+    IN HWND hWnd,
+    IN int nIndex);
+
+WINUSERAPI
+WORD
+WINAPI
+SetClassWord(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN WORD wNewWord);
+
+WINUSERAPI
+DWORD
+WINAPI
+GetClassLongA(
+    IN HWND hWnd,
+    IN int nIndex);
+WINUSERAPI
+DWORD
+WINAPI
+GetClassLongW(
+    IN HWND hWnd,
+    IN int nIndex);
+#ifdef UNICODE
+#define GetClassLong  GetClassLongW
+#else
+#define GetClassLong  GetClassLongA
+#endif // !UNICODE
+
+WINUSERAPI
+DWORD
+WINAPI
+SetClassLongA(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN LONG dwNewLong);
+WINUSERAPI
+DWORD
+WINAPI
+SetClassLongW(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN LONG dwNewLong);
+#ifdef UNICODE
+#define SetClassLong  SetClassLongW
+#else
+#define SetClassLong  SetClassLongA
+#endif // !UNICODE
+
+#ifdef _WIN64
+
+WINUSERAPI
+ULONG_PTR
+WINAPI
+GetClassLongPtrA(
+    IN HWND hWnd,
+    IN int nIndex);
+WINUSERAPI
+ULONG_PTR
+WINAPI
+GetClassLongPtrW(
+    IN HWND hWnd,
+    IN int nIndex);
+#ifdef UNICODE
+#define GetClassLongPtr  GetClassLongPtrW
+#else
+#define GetClassLongPtr  GetClassLongPtrA
+#endif // !UNICODE
+
+WINUSERAPI
+ULONG_PTR
+WINAPI
+SetClassLongPtrA(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN LONG_PTR dwNewLong);
+WINUSERAPI
+ULONG_PTR
+WINAPI
+SetClassLongPtrW(
+    IN HWND hWnd,
+    IN int nIndex,
+    IN LONG_PTR dwNewLong);
+#ifdef UNICODE
+#define SetClassLongPtr  SetClassLongPtrW
+#else
+#define SetClassLongPtr  SetClassLongPtrA
+#endif // !UNICODE
+
+#else  /* _WIN64 */
+
+#define GetClassLongPtrA    GetClassLongA
+#define GetClassLongPtrW    GetClassLongW
+#ifdef UNICODE
+#define GetClassLongPtr  GetClassLongPtrW
+#else
+#define GetClassLongPtr  GetClassLongPtrA
+#endif // !UNICODE
+
+#define SetClassLongPtrA    SetClassLongA
+#define SetClassLongPtrW    SetClassLongW
+#ifdef UNICODE
+#define SetClassLongPtr  SetClassLongPtrW
+#else
+#define SetClassLongPtr  SetClassLongPtrA
+#endif // !UNICODE
+
+#endif /* _WIN64 */
+
+#endif /* !NOWINOFFSETS */
+
+#if(WINVER >= 0x0500)
+WINUSERAPI
+BOOL
+WINAPI
+GetProcessDefaultLayout(
+    OUT DWORD *pdwDefaultLayout);
+
+WINUSERAPI
+BOOL
+WINAPI
+SetProcessDefaultLayout(
+    IN DWORD dwDefaultLayout);
+#endif /* WINVER >= 0x0500 */
+
+WINUSERAPI
+HWND
+WINAPI
+GetDesktopWindow(
+    VOID);
+
+
+WINUSERAPI
+HWND
+WINAPI
+GetParent(
+    IN HWND hWnd);
+
+WINUSERAPI
+HWND
+WINAPI
+SetParent(
+    IN HWND hWndChild,
+    IN HWND hWndNewParent);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumChildWindows(
+    IN HWND hWndParent,
+    IN WNDENUMPROC lpEnumFunc,
+    IN LPARAM lParam);
+
+WINUSERAPI
+HWND
+WINAPI
+FindWindowA(
+    IN LPCSTR lpClassName,
+    IN LPCSTR lpWindowName);
+WINUSERAPI
+HWND
+WINAPI
+FindWindowW(
+    IN LPCWSTR lpClassName,
+    IN LPCWSTR lpWindowName);
+#ifdef UNICODE
+#define FindWindow  FindWindowW
+#else
+#define FindWindow  FindWindowA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI HWND    WINAPI FindWindowExA( IN HWND, IN HWND, IN LPCSTR, IN LPCSTR);
+WINUSERAPI HWND    WINAPI FindWindowExW( IN HWND, IN HWND, IN LPCWSTR, IN LPCWSTR);
+#ifdef UNICODE
+#define FindWindowEx  FindWindowExW
+#else
+#define FindWindowEx  FindWindowExA
+#endif // !UNICODE
+
+WINUSERAPI HWND    WINAPI  GetShellWindow(void);
+#endif /* WINVER >= 0x0400 */
+
+
+WINUSERAPI BOOL    WINAPI  RegisterShellHookWindow( IN HWND);
+WINUSERAPI BOOL    WINAPI  DeregisterShellHookWindow( IN HWND);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumWindows(
+    IN WNDENUMPROC lpEnumFunc,
+    IN LPARAM lParam);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumThreadWindows(
+    IN DWORD dwThreadId,
+    IN WNDENUMPROC lpfn,
+    IN LPARAM lParam);
+
+#define EnumTaskWindows(hTask, lpfn, lParam) EnumThreadWindows(HandleToUlong(hTask), lpfn, lParam)
+
+WINUSERAPI
+int
+WINAPI
+GetClassNameA(
+    IN HWND hWnd,
+    OUT LPSTR lpClassName,
+    IN int nMaxCount);
+WINUSERAPI
+int
+WINAPI
+GetClassNameW(
+    IN HWND hWnd,
+    OUT LPWSTR lpClassName,
+    IN int nMaxCount);
+#ifdef UNICODE
+#define GetClassName  GetClassNameW
+#else
+#define GetClassName  GetClassNameA
+#endif // !UNICODE
+
+WINUSERAPI
+HWND
+WINAPI
+GetTopWindow(
+    IN HWND hWnd);
+
+#define GetNextWindow(hWnd, wCmd) GetWindow(hWnd, wCmd)
+#define GetSysModalWindow() (NULL)
+#define SetSysModalWindow(hWnd) (NULL)
+
+WINUSERAPI
+DWORD
+WINAPI
+GetWindowThreadProcessId(
+    IN HWND hWnd,
+    OUT LPDWORD lpdwProcessId);
+
+#if(_WIN32_WINNT >= 0x0501)
+WINUSERAPI
+BOOL
+WINAPI
+IsGUIThread(
+    BOOL bConvert);
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#define GetWindowTask(hWnd) \
+        ((HANDLE)(DWORD_PTR)GetWindowThreadProcessId(hWnd, NULL))
+
+WINUSERAPI
+HWND
+WINAPI
+GetLastActivePopup(
+    IN HWND hWnd);
+
+/*
+ * GetWindow() Constants
+ */
+#define GW_HWNDFIRST        0
+#define GW_HWNDLAST         1
+#define GW_HWNDNEXT         2
+#define GW_HWNDPREV         3
+#define GW_OWNER            4
+#define GW_CHILD            5
+#if(WINVER <= 0x0400)
+#define GW_MAX              5
+#else
+#define GW_ENABLEDPOPUP     6
+#define GW_MAX              6
+#endif
+
+WINUSERAPI
+HWND
+WINAPI
+GetWindow(
+    IN HWND hWnd,
+    IN UINT uCmd);
+
+
+
+#ifndef NOWH
+
+#ifdef STRICT
+
+WINUSERAPI
+HHOOK
+WINAPI
+SetWindowsHookA(
+    IN int nFilterType,
+    IN HOOKPROC pfnFilterProc);
+WINUSERAPI
+HHOOK
+WINAPI
+SetWindowsHookW(
+    IN int nFilterType,
+    IN HOOKPROC pfnFilterProc);
+#ifdef UNICODE
+#define SetWindowsHook  SetWindowsHookW
+#else
+#define SetWindowsHook  SetWindowsHookA
+#endif // !UNICODE
+
+#else /* !STRICT */
+
+WINUSERAPI
+HOOKPROC
+WINAPI
+SetWindowsHookA(
+    IN int nFilterType,
+    IN HOOKPROC pfnFilterProc);
+WINUSERAPI
+HOOKPROC
+WINAPI
+SetWindowsHookW(
+    IN int nFilterType,
+    IN HOOKPROC pfnFilterProc);
+#ifdef UNICODE
+#define SetWindowsHook  SetWindowsHookW
+#else
+#define SetWindowsHook  SetWindowsHookA
+#endif // !UNICODE
+
+#endif /* !STRICT */
+
+WINUSERAPI
+BOOL
+WINAPI
+UnhookWindowsHook(
+    IN int nCode,
+    IN HOOKPROC pfnFilterProc);
+
+WINUSERAPI
+HHOOK
+WINAPI
+SetWindowsHookExA(
+    IN int idHook,
+    IN HOOKPROC lpfn,
+    IN HINSTANCE hmod,
+    IN DWORD dwThreadId);
+WINUSERAPI
+HHOOK
+WINAPI
+SetWindowsHookExW(
+    IN int idHook,
+    IN HOOKPROC lpfn,
+    IN HINSTANCE hmod,
+    IN DWORD dwThreadId);
+#ifdef UNICODE
+#define SetWindowsHookEx  SetWindowsHookExW
+#else
+#define SetWindowsHookEx  SetWindowsHookExA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+UnhookWindowsHookEx(
+    IN HHOOK hhk);
+
+WINUSERAPI
+LRESULT
+WINAPI
+CallNextHookEx(
+    IN HHOOK hhk,
+    IN int nCode,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+
+/*
+ * Macros for source-level compatibility with old functions.
+ */
+#ifdef STRICT
+#define DefHookProc(nCode, wParam, lParam, phhk)\
+        CallNextHookEx(*phhk, nCode, wParam, lParam)
+#else
+#define DefHookProc(nCode, wParam, lParam, phhk)\
+        CallNextHookEx((HHOOK)*phhk, nCode, wParam, lParam)
+#endif /* STRICT */
+#endif /* !NOWH */
+
+#ifndef NOMENUS
+
+
+/* ;win40  -- A lot of MF_* flags have been renamed as MFT_* and MFS_* flags */
+/*
+ * Menu flags for Add/Check/EnableMenuItem()
+ */
+#define MF_INSERT           0x00000000L
+#define MF_CHANGE           0x00000080L
+#define MF_APPEND           0x00000100L
+#define MF_DELETE           0x00000200L
+#define MF_REMOVE           0x00001000L
+
+#define MF_BYCOMMAND        0x00000000L
+#define MF_BYPOSITION       0x00000400L
+
+#define MF_SEPARATOR        0x00000800L
+
+#define MF_ENABLED          0x00000000L
+#define MF_GRAYED           0x00000001L
+#define MF_DISABLED         0x00000002L
+
+#define MF_UNCHECKED        0x00000000L
+#define MF_CHECKED          0x00000008L
+#define MF_USECHECKBITMAPS  0x00000200L
+
+#define MF_STRING           0x00000000L
+#define MF_BITMAP           0x00000004L
+#define MF_OWNERDRAW        0x00000100L
+
+#define MF_POPUP            0x00000010L
+#define MF_MENUBARBREAK     0x00000020L
+#define MF_MENUBREAK        0x00000040L
+
+#define MF_UNHILITE         0x00000000L
+#define MF_HILITE           0x00000080L
+
+#if(WINVER >= 0x0400)
+#define MF_DEFAULT          0x00001000L
+#endif /* WINVER >= 0x0400 */
+#define MF_SYSMENU          0x00002000L
+#define MF_HELP             0x00004000L
+#if(WINVER >= 0x0400)
+#define MF_RIGHTJUSTIFY     0x00004000L
+#endif /* WINVER >= 0x0400 */
+
+#define MF_MOUSESELECT      0x00008000L
+#if(WINVER >= 0x0400)
+#define MF_END              0x00000080L  /* Obsolete -- only used by old RES files */
+#endif /* WINVER >= 0x0400 */
+
+
+#if(WINVER >= 0x0400)
+#define MFT_STRING          MF_STRING
+#define MFT_BITMAP          MF_BITMAP
+#define MFT_MENUBARBREAK    MF_MENUBARBREAK
+#define MFT_MENUBREAK       MF_MENUBREAK
+#define MFT_OWNERDRAW       MF_OWNERDRAW
+#define MFT_RADIOCHECK      0x00000200L
+#define MFT_SEPARATOR       MF_SEPARATOR
+#define MFT_RIGHTORDER      0x00002000L
+#define MFT_RIGHTJUSTIFY    MF_RIGHTJUSTIFY
+
+/* Menu flags for Add/Check/EnableMenuItem() */
+#define MFS_GRAYED          0x00000003L
+#define MFS_DISABLED        MFS_GRAYED
+#define MFS_CHECKED         MF_CHECKED
+#define MFS_HILITE          MF_HILITE
+#define MFS_ENABLED         MF_ENABLED
+#define MFS_UNCHECKED       MF_UNCHECKED
+#define MFS_UNHILITE        MF_UNHILITE
+#define MFS_DEFAULT         MF_DEFAULT
+#endif /* WINVER >= 0x0400 */
+
+
+#if(WINVER >= 0x0400)
+
+WINUSERAPI
+BOOL
+WINAPI
+CheckMenuRadioItem(
+    IN HMENU,
+    IN UINT,
+    IN UINT,
+    IN UINT,
+    IN UINT);
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Menu item resource format
+ */
+typedef struct {
+    WORD versionNumber;
+    WORD offset;
+} MENUITEMTEMPLATEHEADER, *PMENUITEMTEMPLATEHEADER;
+
+typedef struct {        // version 0
+    WORD mtOption;
+    WORD mtID;
+    WCHAR mtString[1];
+} MENUITEMTEMPLATE, *PMENUITEMTEMPLATE;
+#define MF_END             0x00000080L
+
+#endif /* !NOMENUS */
+
+#ifndef NOSYSCOMMANDS
+
+/*
+ * System Menu Command Values
+ */
+#define SC_SIZE         0xF000
+#define SC_MOVE         0xF010
+#define SC_MINIMIZE     0xF020
+#define SC_MAXIMIZE     0xF030
+#define SC_NEXTWINDOW   0xF040
+#define SC_PREVWINDOW   0xF050
+#define SC_CLOSE        0xF060
+#define SC_VSCROLL      0xF070
+#define SC_HSCROLL      0xF080
+#define SC_MOUSEMENU    0xF090
+#define SC_KEYMENU      0xF100
+#define SC_ARRANGE      0xF110
+#define SC_RESTORE      0xF120
+#define SC_TASKLIST     0xF130
+#define SC_SCREENSAVE   0xF140
+#define SC_HOTKEY       0xF150
+#if(WINVER >= 0x0400)
+#define SC_DEFAULT      0xF160
+#define SC_MONITORPOWER 0xF170
+#define SC_CONTEXTHELP  0xF180
+#define SC_SEPARATOR    0xF00F
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Obsolete names
+ */
+#define SC_ICON         SC_MINIMIZE
+#define SC_ZOOM         SC_MAXIMIZE
+
+#endif /* !NOSYSCOMMANDS */
+
+/*
+ * Resource Loading Routines
+ */
+
+WINUSERAPI
+HBITMAP
+WINAPI
+LoadBitmapA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpBitmapName);
+WINUSERAPI
+HBITMAP
+WINAPI
+LoadBitmapW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpBitmapName);
+#ifdef UNICODE
+#define LoadBitmap  LoadBitmapW
+#else
+#define LoadBitmap  LoadBitmapA
+#endif // !UNICODE
+
+WINUSERAPI
+HCURSOR
+WINAPI
+LoadCursorA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpCursorName);
+WINUSERAPI
+HCURSOR
+WINAPI
+LoadCursorW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpCursorName);
+#ifdef UNICODE
+#define LoadCursor  LoadCursorW
+#else
+#define LoadCursor  LoadCursorA
+#endif // !UNICODE
+
+WINUSERAPI
+HCURSOR
+WINAPI
+LoadCursorFromFileA(
+    IN LPCSTR lpFileName);
+WINUSERAPI
+HCURSOR
+WINAPI
+LoadCursorFromFileW(
+    IN LPCWSTR lpFileName);
+#ifdef UNICODE
+#define LoadCursorFromFile  LoadCursorFromFileW
+#else
+#define LoadCursorFromFile  LoadCursorFromFileA
+#endif // !UNICODE
+
+WINUSERAPI
+HCURSOR
+WINAPI
+CreateCursor(
+    IN HINSTANCE hInst,
+    IN int xHotSpot,
+    IN int yHotSpot,
+    IN int nWidth,
+    IN int nHeight,
+    IN CONST VOID *pvANDPlane,
+    IN CONST VOID *pvXORPlane);
+
+WINUSERAPI
+BOOL
+WINAPI
+DestroyCursor(
+    IN HCURSOR hCursor);
+
+#ifndef _MAC
+#define CopyCursor(pcur) ((HCURSOR)CopyIcon((HICON)(pcur)))
+#else
+WINUSERAPI
+HCURSOR
+WINAPI
+CopyCursor(
+    IN HCURSOR hCursor);
+#endif
+
+/*
+ * Standard Cursor IDs
+ */
+#define IDC_ARROW           MAKEINTRESOURCE(32512)
+#define IDC_IBEAM           MAKEINTRESOURCE(32513)
+#define IDC_WAIT            MAKEINTRESOURCE(32514)
+#define IDC_CROSS           MAKEINTRESOURCE(32515)
+#define IDC_UPARROW         MAKEINTRESOURCE(32516)
+#define IDC_SIZE            MAKEINTRESOURCE(32640)  /* OBSOLETE: use IDC_SIZEALL */
+#define IDC_ICON            MAKEINTRESOURCE(32641)  /* OBSOLETE: use IDC_ARROW */
+#define IDC_SIZENWSE        MAKEINTRESOURCE(32642)
+#define IDC_SIZENESW        MAKEINTRESOURCE(32643)
+#define IDC_SIZEWE          MAKEINTRESOURCE(32644)
+#define IDC_SIZENS          MAKEINTRESOURCE(32645)
+#define IDC_SIZEALL         MAKEINTRESOURCE(32646)
+#define IDC_NO              MAKEINTRESOURCE(32648) /*not in win3.1 */
+#if(WINVER >= 0x0500)
+#define IDC_HAND            MAKEINTRESOURCE(32649)
+#endif /* WINVER >= 0x0500 */
+#define IDC_APPSTARTING     MAKEINTRESOURCE(32650) /*not in win3.1 */
+#if(WINVER >= 0x0400)
+#define IDC_HELP            MAKEINTRESOURCE(32651)
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+BOOL
+WINAPI
+SetSystemCursor(
+    IN HCURSOR hcur,
+    IN DWORD   id);
+
+typedef struct _ICONINFO {
+    BOOL    fIcon;
+    DWORD   xHotspot;
+    DWORD   yHotspot;
+    HBITMAP hbmMask;
+    HBITMAP hbmColor;
+} ICONINFO;
+typedef ICONINFO *PICONINFO;
+
+WINUSERAPI
+HICON
+WINAPI
+LoadIconA(
+    IN HINSTANCE hInstance,
+    IN LPCSTR lpIconName);
+WINUSERAPI
+HICON
+WINAPI
+LoadIconW(
+    IN HINSTANCE hInstance,
+    IN LPCWSTR lpIconName);
+#ifdef UNICODE
+#define LoadIcon  LoadIconW
+#else
+#define LoadIcon  LoadIconA
+#endif // !UNICODE
+
+
+WINUSERAPI UINT PrivateExtractIconsA(
+    IN LPCSTR szFileName,
+    IN int      nIconIndex,
+    IN int      cxIcon,
+    IN int      cyIcon,
+    OUT HICON   *phicon,
+    OUT UINT    *piconid,
+    IN UINT     nIcons,
+    IN UINT     flags);
+WINUSERAPI UINT PrivateExtractIconsW(
+    IN LPCWSTR szFileName,
+    IN int      nIconIndex,
+    IN int      cxIcon,
+    IN int      cyIcon,
+    OUT HICON   *phicon,
+    OUT UINT    *piconid,
+    IN UINT     nIcons,
+    IN UINT     flags);
+#ifdef UNICODE
+#define PrivateExtractIcons  PrivateExtractIconsW
+#else
+#define PrivateExtractIcons  PrivateExtractIconsA
+#endif // !UNICODE
+
+WINUSERAPI
+HICON
+WINAPI
+CreateIcon(
+    IN HINSTANCE hInstance,
+    IN int nWidth,
+    IN int nHeight,
+    IN BYTE cPlanes,
+    IN BYTE cBitsPixel,
+    IN CONST BYTE *lpbANDbits,
+    IN CONST BYTE *lpbXORbits);
+
+WINUSERAPI
+BOOL
+WINAPI
+DestroyIcon(
+    IN HICON hIcon);
+
+WINUSERAPI
+int
+WINAPI
+LookupIconIdFromDirectory(
+    IN PBYTE presbits,
+    IN BOOL fIcon);
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+int
+WINAPI
+LookupIconIdFromDirectoryEx(
+    IN PBYTE presbits,
+    IN BOOL  fIcon,
+    IN int   cxDesired,
+    IN int   cyDesired,
+    IN UINT  Flags);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+HICON
+WINAPI
+CreateIconFromResource(
+    IN PBYTE presbits,
+    IN DWORD dwResSize,
+    IN BOOL fIcon,
+    IN DWORD dwVer);
+
+#if(WINVER >= 0x0400)
+WINUSERAPI
+HICON
+WINAPI
+CreateIconFromResourceEx(
+    IN PBYTE presbits,
+    IN DWORD dwResSize,
+    IN BOOL  fIcon,
+    IN DWORD dwVer,
+    IN int   cxDesired,
+    IN int   cyDesired,
+    IN UINT  Flags);
+
+/* Icon/Cursor header */
+typedef struct tagCURSORSHAPE
+{
+    int     xHotSpot;
+    int     yHotSpot;
+    int     cx;
+    int     cy;
+    int     cbWidth;
+    BYTE    Planes;
+    BYTE    BitsPixel;
+} CURSORSHAPE, FAR *LPCURSORSHAPE;
+#endif /* WINVER >= 0x0400 */
+
+#define IMAGE_BITMAP        0
+#define IMAGE_ICON          1
+#define IMAGE_CURSOR        2
+#if(WINVER >= 0x0400)
+#define IMAGE_ENHMETAFILE   3
+
+#define LR_DEFAULTCOLOR     0x0000
+#define LR_MONOCHROME       0x0001
+#define LR_COLOR            0x0002
+#define LR_COPYRETURNORG    0x0004
+#define LR_COPYDELETEORG    0x0008
+#define LR_LOADFROMFILE     0x0010
+#define LR_LOADTRANSPARENT  0x0020
+#define LR_DEFAULTSIZE      0x0040
+#define LR_VGACOLOR         0x0080
+#define LR_LOADMAP3DCOLORS  0x1000
+#define LR_CREATEDIBSECTION 0x2000
+#define LR_COPYFROMRESOURCE 0x4000
+#define LR_SHARED           0x8000
+
+WINUSERAPI
+HANDLE
+WINAPI
+LoadImageA(
+    IN HINSTANCE,
+    IN LPCSTR,
+    IN UINT,
+    IN int,
+    IN int,
+    IN UINT);
+WINUSERAPI
+HANDLE
+WINAPI
+LoadImageW(
+    IN HINSTANCE,
+    IN LPCWSTR,
+    IN UINT,
+    IN int,
+    IN int,
+    IN UINT);
+#ifdef UNICODE
+#define LoadImage  LoadImageW
+#else
+#define LoadImage  LoadImageA
+#endif // !UNICODE
+
+WINUSERAPI
+HANDLE
+WINAPI
+CopyImage(
+    IN HANDLE,
+    IN UINT,
+    IN int,
+    IN int,
+    IN UINT);
+
+#define DI_MASK         0x0001
+#define DI_IMAGE        0x0002
+#define DI_NORMAL       0x0003
+#define DI_COMPAT       0x0004
+#define DI_DEFAULTSIZE  0x0008
+#if(_WIN32_WINNT >= 0x0501)
+#define DI_NOMIRROR     0x0010
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI BOOL WINAPI DrawIconEx( IN HDC hdc, IN int xLeft, IN int yTop,
+              IN HICON hIcon, IN int cxWidth, IN int cyWidth,
+              IN UINT istepIfAniCur, IN HBRUSH hbrFlickerFreeDraw, IN UINT diFlags);
+#endif /* WINVER >= 0x0400 */
+
+WINUSERAPI
+HICON
+WINAPI
+CreateIconIndirect(
+    IN PICONINFO piconinfo);
+
+WINUSERAPI
+HICON
+WINAPI
+CopyIcon(
+    IN HICON hIcon);
+
+WINUSERAPI
+BOOL
+WINAPI
+GetIconInfo(
+    IN HICON hIcon,
+    OUT PICONINFO piconinfo);
+
+#if(WINVER >= 0x0400)
+#define RES_ICON    1
+#define RES_CURSOR  2
+#endif /* WINVER >= 0x0400 */
+
+#ifdef OEMRESOURCE
+
+
+/*
+ * OEM Resource Ordinal Numbers
+ */
+#define OBM_CLOSE           32754
+#define OBM_UPARROW         32753
+#define OBM_DNARROW         32752
+#define OBM_RGARROW         32751
+#define OBM_LFARROW         32750
+#define OBM_REDUCE          32749
+#define OBM_ZOOM            32748
+#define OBM_RESTORE         32747
+#define OBM_REDUCED         32746
+#define OBM_ZOOMD           32745
+#define OBM_RESTORED        32744
+#define OBM_UPARROWD        32743
+#define OBM_DNARROWD        32742
+#define OBM_RGARROWD        32741
+#define OBM_LFARROWD        32740
+#define OBM_MNARROW         32739
+#define OBM_COMBO           32738
+#define OBM_UPARROWI        32737
+#define OBM_DNARROWI        32736
+#define OBM_RGARROWI        32735
+#define OBM_LFARROWI        32734
+
+#define OBM_OLD_CLOSE       32767
+#define OBM_SIZE            32766
+#define OBM_OLD_UPARROW     32765
+#define OBM_OLD_DNARROW     32764
+#define OBM_OLD_RGARROW     32763
+#define OBM_OLD_LFARROW     32762
+#define OBM_BTSIZE          32761
+#define OBM_CHECK           32760
+#define OBM_CHECKBOXES      32759
+#define OBM_BTNCORNERS      32758
+#define OBM_OLD_REDUCE      32757
+#define OBM_OLD_ZOOM        32756
+#define OBM_OLD_RESTORE     32755
+
+
+#define OCR_NORMAL          32512
+#define OCR_IBEAM           32513
+#define OCR_WAIT            32514
+#define OCR_CROSS           32515
+#define OCR_UP              32516
+#define OCR_SIZE            32640   /* OBSOLETE: use OCR_SIZEALL */
+#define OCR_ICON            32641   /* OBSOLETE: use OCR_NORMAL */
+#define OCR_SIZENWSE        32642
+#define OCR_SIZENESW        32643
+#define OCR_SIZEWE          32644
+#define OCR_SIZENS          32645
+#define OCR_SIZEALL         32646
+#define OCR_ICOCUR          32647   /* OBSOLETE: use OIC_WINLOGO */
+#define OCR_NO              32648
+#if(WINVER >= 0x0500)
+#define OCR_HAND            32649
+#endif /* WINVER >= 0x0500 */
+#if(WINVER >= 0x0400)
+#define OCR_APPSTARTING     32650
+#endif /* WINVER >= 0x0400 */
+
+
+#define OIC_SAMPLE          32512
+#define OIC_HAND            32513
+#define OIC_QUES            32514
+#define OIC_BANG            32515
+#define OIC_NOTE            32516
+#if(WINVER >= 0x0400)
+#define OIC_WINLOGO         32517
+#define OIC_WARNING         OIC_BANG
+#define OIC_ERROR           OIC_HAND
+#define OIC_INFORMATION     OIC_NOTE
+#endif /* WINVER >= 0x0400 */
+
+
+
+#endif /* OEMRESOURCE */
+
+#define ORD_LANGDRIVER    1     /* The ordinal number for the entry point of
+                                ** language drivers.
+                                */
+
+#ifndef NOICONS
+
+/*
+ * Standard Icon IDs
+ */
+#ifdef RC_INVOKED
+#define IDI_APPLICATION     32512
+#define IDI_HAND            32513
+#define IDI_QUESTION        32514
+#define IDI_EXCLAMATION     32515
+#define IDI_ASTERISK        32516
+#if(WINVER >= 0x0400)
+#define IDI_WINLOGO         32517
+#endif /* WINVER >= 0x0400 */
+#else
+#define IDI_APPLICATION     MAKEINTRESOURCE(32512)
+#define IDI_HAND            MAKEINTRESOURCE(32513)
+#define IDI_QUESTION        MAKEINTRESOURCE(32514)
+#define IDI_EXCLAMATION     MAKEINTRESOURCE(32515)
+#define IDI_ASTERISK        MAKEINTRESOURCE(32516)
+#if(WINVER >= 0x0400)
+#define IDI_WINLOGO         MAKEINTRESOURCE(32517)
+#endif /* WINVER >= 0x0400 */
+#endif /* RC_INVOKED */
+
+#if(WINVER >= 0x0400)
+#define IDI_WARNING     IDI_EXCLAMATION
+#define IDI_ERROR       IDI_HAND
+#define IDI_INFORMATION IDI_ASTERISK
+#endif /* WINVER >= 0x0400 */
+
+
+#endif /* !NOICONS */
+
+WINUSERAPI
+int
+WINAPI
+LoadStringA(
+    IN HINSTANCE hInstance,
+    IN UINT uID,
+    OUT LPSTR lpBuffer,
+    IN int nBufferMax);
+WINUSERAPI
+int
+WINAPI
+LoadStringW(
+    IN HINSTANCE hInstance,
+    IN UINT uID,
+    OUT LPWSTR lpBuffer,
+    IN int nBufferMax);
+#ifdef UNICODE
+#define LoadString  LoadStringW
+#else
+#define LoadString  LoadStringA
+#endif // !UNICODE
+
+
+/*
+ * Dialog Box Command IDs
+ */
+#define IDOK                1
+#define IDCANCEL            2
+#define IDABORT             3
+#define IDRETRY             4
+#define IDIGNORE            5
+#define IDYES               6
+#define IDNO                7
+#if(WINVER >= 0x0400)
+#define IDCLOSE         8
+#define IDHELP          9
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define IDTRYAGAIN      10
+#define IDCONTINUE      11
+#endif /* WINVER >= 0x0500 */
+
+#if(WINVER >= 0x0501)
+#ifndef IDTIMEOUT
+#define IDTIMEOUT 32000
+#endif
+#endif /* WINVER >= 0x0501 */
+
+
+#ifndef NOCTLMGR
+
+/*
+ * Control Manager Structures and Definitions
+ */
+
+#ifndef NOWINSTYLES
+
+
+/*
+ * Edit Control Styles
+ */
+#define ES_LEFT             0x0000L
+#define ES_CENTER           0x0001L
+#define ES_RIGHT            0x0002L
+#define ES_MULTILINE        0x0004L
+#define ES_UPPERCASE        0x0008L
+#define ES_LOWERCASE        0x0010L
+#define ES_PASSWORD         0x0020L
+#define ES_AUTOVSCROLL      0x0040L
+#define ES_AUTOHSCROLL      0x0080L
+#define ES_NOHIDESEL        0x0100L
+#define ES_OEMCONVERT       0x0400L
+#define ES_READONLY         0x0800L
+#define ES_WANTRETURN       0x1000L
+#if(WINVER >= 0x0400)
+#define ES_NUMBER           0x2000L
+#endif /* WINVER >= 0x0400 */
+
+
+#endif /* !NOWINSTYLES */
+
+/*
+ * Edit Control Notification Codes
+ */
+#define EN_SETFOCUS         0x0100
+#define EN_KILLFOCUS        0x0200
+#define EN_CHANGE           0x0300
+#define EN_UPDATE           0x0400
+#define EN_ERRSPACE         0x0500
+#define EN_MAXTEXT          0x0501
+#define EN_HSCROLL          0x0601
+#define EN_VSCROLL          0x0602
+
+#if(_WIN32_WINNT >= 0x0500)
+#define EN_ALIGN_LTR_EC     0x0700
+#define EN_ALIGN_RTL_EC     0x0701
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(WINVER >= 0x0400)
+/* Edit control EM_SETMARGIN parameters */
+#define EC_LEFTMARGIN       0x0001
+#define EC_RIGHTMARGIN      0x0002
+#define EC_USEFONTINFO      0xffff
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+/* wParam of EM_GET/SETIMESTATUS  */
+#define EMSIS_COMPOSITIONSTRING        0x0001
+
+/* lParam for EMSIS_COMPOSITIONSTRING  */
+#define EIMES_GETCOMPSTRATONCE         0x0001
+#define EIMES_CANCELCOMPSTRINFOCUS     0x0002
+#define EIMES_COMPLETECOMPSTRKILLFOCUS 0x0004
+#endif /* WINVER >= 0x0500 */
+
+#ifndef NOWINMESSAGES
+
+
+/*
+ * Edit Control Messages
+ */
+#define EM_GETSEL               0x00B0
+#define EM_SETSEL               0x00B1
+#define EM_GETRECT              0x00B2
+#define EM_SETRECT              0x00B3
+#define EM_SETRECTNP            0x00B4
+#define EM_SCROLL               0x00B5
+#define EM_LINESCROLL           0x00B6
+#define EM_SCROLLCARET          0x00B7
+#define EM_GETMODIFY            0x00B8
+#define EM_SETMODIFY            0x00B9
+#define EM_GETLINECOUNT         0x00BA
+#define EM_LINEINDEX            0x00BB
+#define EM_SETHANDLE            0x00BC
+#define EM_GETHANDLE            0x00BD
+#define EM_GETTHUMB             0x00BE
+#define EM_LINELENGTH           0x00C1
+#define EM_REPLACESEL           0x00C2
+#define EM_GETLINE              0x00C4
+#define EM_LIMITTEXT            0x00C5
+#define EM_CANUNDO              0x00C6
+#define EM_UNDO                 0x00C7
+#define EM_FMTLINES             0x00C8
+#define EM_LINEFROMCHAR         0x00C9
+#define EM_SETTABSTOPS          0x00CB
+#define EM_SETPASSWORDCHAR      0x00CC
+#define EM_EMPTYUNDOBUFFER      0x00CD
+#define EM_GETFIRSTVISIBLELINE  0x00CE
+#define EM_SETREADONLY          0x00CF
+#define EM_SETWORDBREAKPROC     0x00D0
+#define EM_GETWORDBREAKPROC     0x00D1
+#define EM_GETPASSWORDCHAR      0x00D2
+#if(WINVER >= 0x0400)
+#define EM_SETMARGINS           0x00D3
+#define EM_GETMARGINS           0x00D4
+#define EM_SETLIMITTEXT         EM_LIMITTEXT   /* ;win40 Name change */
+#define EM_GETLIMITTEXT         0x00D5
+#define EM_POSFROMCHAR          0x00D6
+#define EM_CHARFROMPOS          0x00D7
+#endif /* WINVER >= 0x0400 */
+
+#if(WINVER >= 0x0500)
+#define EM_SETIMESTATUS         0x00D8
+#define EM_GETIMESTATUS         0x00D9
+#endif /* WINVER >= 0x0500 */
+
+
+#endif /* !NOWINMESSAGES */
+
+/*
+ * EDITWORDBREAKPROC code values
+ */
+#define WB_LEFT            0
+#define WB_RIGHT           1
+#define WB_ISDELIMITER     2
+
+
+/*
+ * Button Control Styles
+ */
+#define BS_PUSHBUTTON       0x00000000L
+#define BS_DEFPUSHBUTTON    0x00000001L
+#define BS_CHECKBOX         0x00000002L
+#define BS_AUTOCHECKBOX     0x00000003L
+#define BS_RADIOBUTTON      0x00000004L
+#define BS_3STATE           0x00000005L
+#define BS_AUTO3STATE       0x00000006L
+#define BS_GROUPBOX         0x00000007L
+#define BS_USERBUTTON       0x00000008L
+#define BS_AUTORADIOBUTTON  0x00000009L
+#define BS_PUSHBOX          0x0000000AL
+#define BS_OWNERDRAW        0x0000000BL
+#define BS_TYPEMASK         0x0000000FL
+#define BS_LEFTTEXT         0x00000020L
+#if(WINVER >= 0x0400)
+#define BS_TEXT             0x00000000L
+#define BS_ICON             0x00000040L
+#define BS_BITMAP           0x00000080L
+#define BS_LEFT             0x00000100L
+#define BS_RIGHT            0x00000200L
+#define BS_CENTER           0x00000300L
+#define BS_TOP              0x00000400L
+#define BS_BOTTOM           0x00000800L
+#define BS_VCENTER          0x00000C00L
+#define BS_PUSHLIKE         0x00001000L
+#define BS_MULTILINE        0x00002000L
+#define BS_NOTIFY           0x00004000L
+#define BS_FLAT             0x00008000L
+#define BS_RIGHTBUTTON      BS_LEFTTEXT
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * User Button Notification Codes
+ */
+#define BN_CLICKED          0
+#define BN_PAINT            1
+#define BN_HILITE           2
+#define BN_UNHILITE         3
+#define BN_DISABLE          4
+#define BN_DOUBLECLICKED    5
+#if(WINVER >= 0x0400)
+#define BN_PUSHED           BN_HILITE
+#define BN_UNPUSHED         BN_UNHILITE
+#define BN_DBLCLK           BN_DOUBLECLICKED
+#define BN_SETFOCUS         6
+#define BN_KILLFOCUS        7
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Button Control Messages
+ */
+#define BM_GETCHECK        0x00F0
+#define BM_SETCHECK        0x00F1
+#define BM_GETSTATE        0x00F2
+#define BM_SETSTATE        0x00F3
+#define BM_SETSTYLE        0x00F4
+#if(WINVER >= 0x0400)
+#define BM_CLICK           0x00F5
+#define BM_GETIMAGE        0x00F6
+#define BM_SETIMAGE        0x00F7
+
+#define BST_UNCHECKED      0x0000
+#define BST_CHECKED        0x0001
+#define BST_INDETERMINATE  0x0002
+#define BST_PUSHED         0x0004
+#define BST_FOCUS          0x0008
+#endif /* WINVER >= 0x0400 */
+
+/*
+ * Static Control Constants
+ */
+#define SS_LEFT             0x00000000L
+#define SS_CENTER           0x00000001L
+#define SS_RIGHT            0x00000002L
+#define SS_ICON             0x00000003L
+#define SS_BLACKRECT        0x00000004L
+#define SS_GRAYRECT         0x00000005L
+#define SS_WHITERECT        0x00000006L
+#define SS_BLACKFRAME       0x00000007L
+#define SS_GRAYFRAME        0x00000008L
+#define SS_WHITEFRAME       0x00000009L
+#define SS_USERITEM         0x0000000AL
+#define SS_SIMPLE           0x0000000BL
+#define SS_LEFTNOWORDWRAP   0x0000000CL
+#if(WINVER >= 0x0400)
+#define SS_OWNERDRAW        0x0000000DL
+#define SS_BITMAP           0x0000000EL
+#define SS_ENHMETAFILE      0x0000000FL
+#define SS_ETCHEDHORZ       0x00000010L
+#define SS_ETCHEDVERT       0x00000011L
+#define SS_ETCHEDFRAME      0x00000012L
+#define SS_TYPEMASK         0x0000001FL
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0501)
+#define SS_REALSIZECONTROL  0x00000040L
+#endif /* WINVER >= 0x0501 */
+#define SS_NOPREFIX         0x00000080L /* Don't do "&" character translation */
+#if(WINVER >= 0x0400)
+#define SS_NOTIFY           0x00000100L
+#define SS_CENTERIMAGE      0x00000200L
+#define SS_RIGHTJUST        0x00000400L
+#define SS_REALSIZEIMAGE    0x00000800L
+#define SS_SUNKEN           0x00001000L
+#define SS_EDITCONTROL      0x00002000L
+#define SS_ENDELLIPSIS      0x00004000L
+#define SS_PATHELLIPSIS     0x00008000L
+#define SS_WORDELLIPSIS     0x0000C000L
+#define SS_ELLIPSISMASK     0x0000C000L
+#endif /* WINVER >= 0x0400 */
+
+
+
+#ifndef NOWINMESSAGES
+/*
+ * Static Control Mesages
+ */
+#define STM_SETICON         0x0170
+#define STM_GETICON         0x0171
+#if(WINVER >= 0x0400)
+#define STM_SETIMAGE        0x0172
+#define STM_GETIMAGE        0x0173
+#define STN_CLICKED         0
+#define STN_DBLCLK          1
+#define STN_ENABLE          2
+#define STN_DISABLE         3
+#endif /* WINVER >= 0x0400 */
+#define STM_MSGMAX          0x0174
+#endif /* !NOWINMESSAGES */
+
+/*
+ * Dialog window class
+ */
+#define WC_DIALOG       (MAKEINTATOM(0x8002))
+
+/*
+ * Get/SetWindowWord/Long offsets for use with WC_DIALOG windows
+ */
+#define DWL_MSGRESULT   0
+#define DWL_DLGPROC     4
+#define DWL_USER        8
+
+#ifdef _WIN64
+
+#undef DWL_MSGRESULT
+#undef DWL_DLGPROC
+#undef DWL_USER
+
+#endif /* _WIN64 */
+
+#define DWLP_MSGRESULT  0
+#define DWLP_DLGPROC    DWLP_MSGRESULT + sizeof(LRESULT)
+#define DWLP_USER       DWLP_DLGPROC + sizeof(DLGPROC)
+
+/*
+ * Dialog Manager Routines
+ */
+
+#ifndef NOMSG
+
+WINUSERAPI
+BOOL
+WINAPI
+IsDialogMessageA(
+    IN HWND hDlg,
+    IN LPMSG lpMsg);
+WINUSERAPI
+BOOL
+WINAPI
+IsDialogMessageW(
+    IN HWND hDlg,
+    IN LPMSG lpMsg);
+#ifdef UNICODE
+#define IsDialogMessage  IsDialogMessageW
+#else
+#define IsDialogMessage  IsDialogMessageA
+#endif // !UNICODE
+
+#endif /* !NOMSG */
+
+WINUSERAPI
+BOOL
+WINAPI
+MapDialogRect(
+    IN HWND hDlg,
+    IN OUT LPRECT lpRect);
+
+WINUSERAPI
+int
+WINAPI
+DlgDirListA(
+    IN HWND hDlg,
+    IN OUT LPSTR lpPathSpec,
+    IN int nIDListBox,
+    IN int nIDStaticPath,
+    IN UINT uFileType);
+WINUSERAPI
+int
+WINAPI
+DlgDirListW(
+    IN HWND hDlg,
+    IN OUT LPWSTR lpPathSpec,
+    IN int nIDListBox,
+    IN int nIDStaticPath,
+    IN UINT uFileType);
+#ifdef UNICODE
+#define DlgDirList  DlgDirListW
+#else
+#define DlgDirList  DlgDirListA
+#endif // !UNICODE
+
+/*
+ * DlgDirList, DlgDirListComboBox flags values
+ */
+#define DDL_READWRITE       0x0000
+#define DDL_READONLY        0x0001
+#define DDL_HIDDEN          0x0002
+#define DDL_SYSTEM          0x0004
+#define DDL_DIRECTORY       0x0010
+#define DDL_ARCHIVE         0x0020
+
+#define DDL_POSTMSGS        0x2000
+#define DDL_DRIVES          0x4000
+#define DDL_EXCLUSIVE       0x8000
+
+WINUSERAPI
+BOOL
+WINAPI
+DlgDirSelectExA(
+    IN HWND hDlg,
+    OUT LPSTR lpString,
+    IN int nCount,
+    IN int nIDListBox);
+WINUSERAPI
+BOOL
+WINAPI
+DlgDirSelectExW(
+    IN HWND hDlg,
+    OUT LPWSTR lpString,
+    IN int nCount,
+    IN int nIDListBox);
+#ifdef UNICODE
+#define DlgDirSelectEx  DlgDirSelectExW
+#else
+#define DlgDirSelectEx  DlgDirSelectExA
+#endif // !UNICODE
+
+WINUSERAPI
+int
+WINAPI
+DlgDirListComboBoxA(
+    IN HWND hDlg,
+    IN OUT LPSTR lpPathSpec,
+    IN int nIDComboBox,
+    IN int nIDStaticPath,
+    IN UINT uFiletype);
+WINUSERAPI
+int
+WINAPI
+DlgDirListComboBoxW(
+    IN HWND hDlg,
+    IN OUT LPWSTR lpPathSpec,
+    IN int nIDComboBox,
+    IN int nIDStaticPath,
+    IN UINT uFiletype);
+#ifdef UNICODE
+#define DlgDirListComboBox  DlgDirListComboBoxW
+#else
+#define DlgDirListComboBox  DlgDirListComboBoxA
+#endif // !UNICODE
+
+WINUSERAPI
+BOOL
+WINAPI
+DlgDirSelectComboBoxExA(
+    IN HWND hDlg,
+    OUT LPSTR lpString,
+    IN int nCount,
+    IN int nIDComboBox);
+WINUSERAPI
+BOOL
+WINAPI
+DlgDirSelectComboBoxExW(
+    IN HWND hDlg,
+    OUT LPWSTR lpString,
+    IN int nCount,
+    IN int nIDComboBox);
+#ifdef UNICODE
+#define DlgDirSelectComboBoxEx  DlgDirSelectComboBoxExW
+#else
+#define DlgDirSelectComboBoxEx  DlgDirSelectComboBoxExA
+#endif // !UNICODE
+
+
+
+/*
+ * Dialog Styles
+ */
+#define DS_ABSALIGN         0x01L
+#define DS_SYSMODAL         0x02L
+#define DS_LOCALEDIT        0x20L   /* Edit items get Local storage. */
+#define DS_SETFONT          0x40L   /* User specified font for Dlg controls */
+#define DS_MODALFRAME       0x80L   /* Can be combined with WS_CAPTION  */
+#define DS_NOIDLEMSG        0x100L  /* WM_ENTERIDLE message will not be sent */
+#define DS_SETFOREGROUND    0x200L  /* not in win3.1 */
+
+
+#if(WINVER >= 0x0400)
+#define DS_3DLOOK           0x0004L
+#define DS_FIXEDSYS         0x0008L
+#define DS_NOFAILCREATE     0x0010L
+#define DS_CONTROL          0x0400L
+#define DS_CENTER           0x0800L
+#define DS_CENTERMOUSE      0x1000L
+#define DS_CONTEXTHELP      0x2000L
+
+#define DS_SHELLFONT        (DS_SETFONT | DS_FIXEDSYS)
+#endif /* WINVER >= 0x0400 */
+
+#if(_WIN32_WCE >= 0x0500)
+#define DS_USEPIXELS        0x8000L
+#endif
+
+
+#define DM_GETDEFID         (WM_USER+0)
+#define DM_SETDEFID         (WM_USER+1)
+
+#if(WINVER >= 0x0400)
+#define DM_REPOSITION       (WM_USER+2)
+#endif /* WINVER >= 0x0400 */
+/*
+ * Returned in HIWORD() of DM_GETDEFID result if msg is supported
+ */
+#define DC_HASDEFID         0x534B
+
+/*
+ * Dialog Codes
+ */
+#define DLGC_WANTARROWS     0x0001      /* Control wants arrow keys         */
+#define DLGC_WANTTAB        0x0002      /* Control wants tab keys           */
+#define DLGC_WANTALLKEYS    0x0004      /* Control wants all keys           */
+#define DLGC_WANTMESSAGE    0x0004      /* Pass message to control          */
+#define DLGC_HASSETSEL      0x0008      /* Understands EM_SETSEL message    */
+#define DLGC_DEFPUSHBUTTON  0x0010      /* Default pushbutton               */
+#define DLGC_UNDEFPUSHBUTTON 0x0020     /* Non-default pushbutton           */
+#define DLGC_RADIOBUTTON    0x0040      /* Radio button                     */
+#define DLGC_WANTCHARS      0x0080      /* Want WM_CHAR messages            */
+#define DLGC_STATIC         0x0100      /* Static item: don't include       */
+#define DLGC_BUTTON         0x2000      /* Button item: can be checked      */
+
+#define LB_CTLCODE          0L
+
+/*
+ * Listbox Return Values
+ */
+#define LB_OKAY             0
+#define LB_ERR              (-1)
+#define LB_ERRSPACE         (-2)
+
+/*
+**  The idStaticPath parameter to DlgDirList can have the following values
+**  ORed if the list box should show other details of the files along with
+**  the name of the files;
+*/
+                                  /* all other details also will be returned */
+
+
+/*
+ * Listbox Notification Codes
+ */
+#define LBN_ERRSPACE        (-2)
+#define LBN_SELCHANGE       1
+#define LBN_DBLCLK          2
+#define LBN_SELCANCEL       3
+#define LBN_SETFOCUS        4
+#define LBN_KILLFOCUS       5
+
+
+
+#ifndef NOWINMESSAGES
+
+/*
+ * Listbox messages
+ */
+#define LB_ADDSTRING            0x0180
+#define LB_INSERTSTRING         0x0181
+#define LB_DELETESTRING         0x0182
+#define LB_SELITEMRANGEEX       0x0183
+#define LB_RESETCONTENT         0x0184
+#define LB_SETSEL               0x0185
+#define LB_SETCURSEL            0x0186
+#define LB_GETSEL               0x0187
+#define LB_GETCURSEL            0x0188
+#define LB_GETTEXT              0x0189
+#define LB_GETTEXTLEN           0x018A
+#define LB_GETCOUNT             0x018B
+#define LB_SELECTSTRING         0x018C
+#define LB_DIR                  0x018D
+#define LB_GETTOPINDEX          0x018E
+#define LB_FINDSTRING           0x018F
+#define LB_GETSELCOUNT          0x0190
+#define LB_GETSELITEMS          0x0191
+#define LB_SETTABSTOPS          0x0192
+#define LB_GETHORIZONTALEXTENT  0x0193
+#define LB_SETHORIZONTALEXTENT  0x0194
+#define LB_SETCOLUMNWIDTH       0x0195
+#define LB_ADDFILE              0x0196
+#define LB_SETTOPINDEX          0x0197
+#define LB_GETITEMRECT          0x0198
+#define LB_GETITEMDATA          0x0199
+#define LB_SETITEMDATA          0x019A
+#define LB_SELITEMRANGE         0x019B
+#define LB_SETANCHORINDEX       0x019C
+#define LB_GETANCHORINDEX       0x019D
+#define LB_SETCARETINDEX        0x019E
+#define LB_GETCARETINDEX        0x019F
+#define LB_SETITEMHEIGHT        0x01A0
+#define LB_GETITEMHEIGHT        0x01A1
+#define LB_FINDSTRINGEXACT      0x01A2
+#define LB_SETLOCALE            0x01A5
+#define LB_GETLOCALE            0x01A6
+#define LB_SETCOUNT             0x01A7
+#if(WINVER >= 0x0400)
+#define LB_INITSTORAGE          0x01A8
+#define LB_ITEMFROMPOINT        0x01A9
+#endif /* WINVER >= 0x0400 */
+#if(_WIN32_WCE >= 0x0400)
+#define LB_MULTIPLEADDSTRING    0x01B1
+#endif
+
+
+#if(_WIN32_WINNT >= 0x0501)
+#define LB_GETLISTBOXINFO       0x01B2
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define LB_MSGMAX               0x01B3
+#elif(_WIN32_WCE >= 0x0400)
+#define LB_MSGMAX               0x01B1
+#elif(WINVER >= 0x0400)
+#define LB_MSGMAX               0x01B0
+#else
+#define LB_MSGMAX               0x01A8
+#endif
+
+#endif /* !NOWINMESSAGES */
+
+#ifndef NOWINSTYLES
+
+
+/*
+ * Listbox Styles
+ */
+#define LBS_NOTIFY            0x0001L
+#define LBS_SORT              0x0002L
+#define LBS_NOREDRAW          0x0004L
+#define LBS_MULTIPLESEL       0x0008L
+#define LBS_OWNERDRAWFIXED    0x0010L
+#define LBS_OWNERDRAWVARIABLE 0x0020L
+#define LBS_HASSTRINGS        0x0040L
+#define LBS_USETABSTOPS       0x0080L
+#define LBS_NOINTEGRALHEIGHT  0x0100L
+#define LBS_MULTICOLUMN       0x0200L
+#define LBS_WANTKEYBOARDINPUT 0x0400L
+#define LBS_EXTENDEDSEL       0x0800L
+#define LBS_DISABLENOSCROLL   0x1000L
+#define LBS_NODATA            0x2000L
+#if(WINVER >= 0x0400)
+#define LBS_NOSEL             0x4000L
+#endif /* WINVER >= 0x0400 */
+#define LBS_COMBOBOX          0x8000L
+
+#define LBS_STANDARD          (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER)
+
+
+#endif /* !NOWINSTYLES */
+
+
+/*
+ * Combo Box return Values
+ */
+#define CB_OKAY             0
+#define CB_ERR              (-1)
+#define CB_ERRSPACE         (-2)
+
+
+/*
+ * Combo Box Notification Codes
+ */
+#define CBN_ERRSPACE        (-1)
+#define CBN_SELCHANGE       1
+#define CBN_DBLCLK          2
+#define CBN_SETFOCUS        3
+#define CBN_KILLFOCUS       4
+#define CBN_EDITCHANGE      5
+#define CBN_EDITUPDATE      6
+#define CBN_DROPDOWN        7
+#define CBN_CLOSEUP         8
+#define CBN_SELENDOK        9
+#define CBN_SELENDCANCEL    10
+
+#ifndef NOWINSTYLES
+
+/*
+ * Combo Box styles
+ */
+#define CBS_SIMPLE            0x0001L
+#define CBS_DROPDOWN          0x0002L
+#define CBS_DROPDOWNLIST      0x0003L
+#define CBS_OWNERDRAWFIXED    0x0010L
+#define CBS_OWNERDRAWVARIABLE 0x0020L
+#define CBS_AUTOHSCROLL       0x0040L
+#define CBS_OEMCONVERT        0x0080L
+#define CBS_SORT              0x0100L
+#define CBS_HASSTRINGS        0x0200L
+#define CBS_NOINTEGRALHEIGHT  0x0400L
+#define CBS_DISABLENOSCROLL   0x0800L
+#if(WINVER >= 0x0400)
+#define CBS_UPPERCASE           0x2000L
+#define CBS_LOWERCASE           0x4000L
+#endif /* WINVER >= 0x0400 */
+
+#endif  /* !NOWINSTYLES */
+
+
+/*
+ * Combo Box messages
+ */
+#ifndef NOWINMESSAGES
+#define CB_GETEDITSEL               0x0140
+#define CB_LIMITTEXT                0x0141
+#define CB_SETEDITSEL               0x0142
+#define CB_ADDSTRING                0x0143
+#define CB_DELETESTRING             0x0144
+#define CB_DIR                      0x0145
+#define CB_GETCOUNT                 0x0146
+#define CB_GETCURSEL                0x0147
+#define CB_GETLBTEXT                0x0148
+#define CB_GETLBTEXTLEN             0x0149
+#define CB_INSERTSTRING             0x014A
+#define CB_RESETCONTENT             0x014B
+#define CB_FINDSTRING               0x014C
+#define CB_SELECTSTRING             0x014D
+#define CB_SETCURSEL                0x014E
+#define CB_SHOWDROPDOWN             0x014F
+#define CB_GETITEMDATA              0x0150
+#define CB_SETITEMDATA              0x0151
+#define CB_GETDROPPEDCONTROLRECT    0x0152
+#define CB_SETITEMHEIGHT            0x0153
+#define CB_GETITEMHEIGHT            0x0154
+#define CB_SETEXTENDEDUI            0x0155
+#define CB_GETEXTENDEDUI            0x0156
+#define CB_GETDROPPEDSTATE          0x0157
+#define CB_FINDSTRINGEXACT          0x0158
+#define CB_SETLOCALE                0x0159
+#define CB_GETLOCALE                0x015A
+#if(WINVER >= 0x0400)
+#define CB_GETTOPINDEX              0x015b
+#define CB_SETTOPINDEX              0x015c
+#define CB_GETHORIZONTALEXTENT      0x015d
+#define CB_SETHORIZONTALEXTENT      0x015e
+#define CB_GETDROPPEDWIDTH          0x015f
+#define CB_SETDROPPEDWIDTH          0x0160
+#define CB_INITSTORAGE              0x0161
+#if(_WIN32_WCE >= 0x0400)
+#define CB_MULTIPLEADDSTRING        0x0163
+#endif
+#endif /* WINVER >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define CB_GETCOMBOBOXINFO          0x0164
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define CB_MSGMAX                   0x0165
+#elif(_WIN32_WCE >= 0x0400)
+#define CB_MSGMAX                   0x0163
+#elif(WINVER >= 0x0400)
+#define CB_MSGMAX                   0x0162
+#else
+#define CB_MSGMAX                   0x015B
+#endif
+#endif  /* !NOWINMESSAGES */
+
+
+
+#ifndef NOWINSTYLES
+
+
+/*
+ * Scroll Bar Styles
+ */
+#define SBS_HORZ                    0x0000L
+#define SBS_VERT                    0x0001L
+#define SBS_TOPALIGN                0x0002L
+#define SBS_LEFTALIGN               0x0002L
+#define SBS_BOTTOMALIGN             0x0004L
+#define SBS_RIGHTALIGN              0x0004L
+#define SBS_SIZEBOXTOPLEFTALIGN     0x0002L
+#define SBS_SIZEBOXBOTTOMRIGHTALIGN 0x0004L
+#define SBS_SIZEBOX                 0x0008L
+#if(WINVER >= 0x0400)
+#define SBS_SIZEGRIP                0x0010L
+#endif /* WINVER >= 0x0400 */
+
+
+#endif /* !NOWINSTYLES */
+
+/*
+ * Scroll bar messages
+ */
+#ifndef NOWINMESSAGES
+#define SBM_SETPOS                  0x00E0 /*not in win3.1 */
+#define SBM_GETPOS                  0x00E1 /*not in win3.1 */
+#define SBM_SETRANGE                0x00E2 /*not in win3.1 */
+#define SBM_SETRANGEREDRAW          0x00E6 /*not in win3.1 */
+#define SBM_GETRANGE                0x00E3 /*not in win3.1 */
+#define SBM_ENABLE_ARROWS           0x00E4 /*not in win3.1 */
+#if(WINVER >= 0x0400)
+#define SBM_SETSCROLLINFO           0x00E9
+#define SBM_GETSCROLLINFO           0x00EA
+#endif /* WINVER >= 0x0400 */
+
+#if(_WIN32_WINNT >= 0x0501)
+#define SBM_GETSCROLLBARINFO        0x00EB
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if(WINVER >= 0x0400)
+#define SIF_RANGE           0x0001
+#define SIF_PAGE            0x0002
+#define SIF_POS             0x0004
+#define SIF_DISABLENOSCROLL 0x0008
+#define SIF_TRACKPOS        0x0010
+#define SIF_ALL             (SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS)
+
+typedef struct tagSCROLLINFO
+{
+    UINT    cbSize;
+    UINT    fMask;
+    int     nMin;
+    int     nMax;
+    UINT    nPage;
+    int     nPos;
+    int     nTrackPos;
+}   SCROLLINFO, FAR *LPSCROLLINFO;
+typedef SCROLLINFO CONST FAR *LPCSCROLLINFO;
+
+WINUSERAPI int     WINAPI SetScrollInfo(IN HWND, IN int, IN LPCSCROLLINFO, IN BOOL);
+WINUSERAPI BOOL    WINAPI GetScrollInfo(IN HWND, IN int, IN OUT LPSCROLLINFO);
+
+#endif /* WINVER >= 0x0400 */
+#endif /* !NOWINMESSAGES */
+#endif /* !NOCTLMGR */
+
+#ifndef NOMDI
+
+/*
+ * MDI client style bits
+ */
+#define MDIS_ALLCHILDSTYLES    0x0001
+
+/*
+ * wParam Flags for WM_MDITILE and WM_MDICASCADE messages.
+ */
+#define MDITILE_VERTICAL       0x0000 /*not in win3.1 */
+#define MDITILE_HORIZONTAL     0x0001 /*not in win3.1 */
+#define MDITILE_SKIPDISABLED   0x0002 /*not in win3.1 */
+#if(_WIN32_WINNT >= 0x0500)
+#define MDITILE_ZORDER         0x0004
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+typedef struct tagMDICREATESTRUCTA {
+    LPCSTR   szClass;
+    LPCSTR   szTitle;
+    HANDLE hOwner;
+    int x;
+    int y;
+    int cx;
+    int cy;
+    DWORD style;
+    LPARAM lParam;        /* app-defined stuff */
+} MDICREATESTRUCTA, *LPMDICREATESTRUCTA;
+typedef struct tagMDICREATESTRUCTW {
+    LPCWSTR  szClass;
+    LPCWSTR  szTitle;
+    HANDLE hOwner;
+    int x;
+    int y;
+    int cx;
+    int cy;
+    DWORD style;
+    LPARAM lParam;        /* app-defined stuff */
+} MDICREATESTRUCTW, *LPMDICREATESTRUCTW;
+#ifdef UNICODE
+typedef MDICREATESTRUCTW MDICREATESTRUCT;
+typedef LPMDICREATESTRUCTW LPMDICREATESTRUCT;
+#else
+typedef MDICREATESTRUCTA MDICREATESTRUCT;
+typedef LPMDICREATESTRUCTA LPMDICREATESTRUCT;
+#endif // UNICODE
+
+typedef struct tagCLIENTCREATESTRUCT {
+    HANDLE hWindowMenu;
+    UINT idFirstChild;
+} CLIENTCREATESTRUCT, *LPCLIENTCREATESTRUCT;
+
+WINUSERAPI
+LRESULT
+WINAPI
+DefFrameProcA(
+    IN HWND hWnd,
+    IN HWND hWndMDIClient,
+    IN UINT uMsg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+LRESULT
+WINAPI
+DefFrameProcW(
+    IN HWND hWnd,
+    IN HWND hWndMDIClient,
+    IN UINT uMsg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define DefFrameProc  DefFrameProcW
+#else
+#define DefFrameProc  DefFrameProcA
+#endif // !UNICODE
+
+WINUSERAPI
+#ifndef _MAC
+LRESULT
+WINAPI
+#else
+LRESULT
+CALLBACK
+#endif
+DefMDIChildProcA(
+    IN HWND hWnd,
+    IN UINT uMsg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+WINUSERAPI
+#ifndef _MAC
+LRESULT
+WINAPI
+#else
+LRESULT
+CALLBACK
+#endif
+DefMDIChildProcW(
+    IN HWND hWnd,
+    IN UINT uMsg,
+    IN WPARAM wParam,
+    IN LPARAM lParam);
+#ifdef UNICODE
+#define DefMDIChildProc  DefMDIChildProcW
+#else
+#define DefMDIChildProc  DefMDIChildProcA
+#endif // !UNICODE
+
+#ifndef NOMSG
+
+WINUSERAPI
+BOOL
+WINAPI
+TranslateMDISysAccel(
+    IN HWND hWndClient,
+    IN LPMSG lpMsg);
+
+#endif /* !NOMSG */
+
+WINUSERAPI
+UINT
+WINAPI
+ArrangeIconicWindows(
+    IN HWND hWnd);
+
+WINUSERAPI
+HWND
+WINAPI
+CreateMDIWindowA(
+    IN LPCSTR lpClassName,
+    IN LPCSTR lpWindowName,
+    IN DWORD dwStyle,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight,
+    IN HWND hWndParent,
+    IN HINSTANCE hInstance,
+    IN LPARAM lParam
+    );
+WINUSERAPI
+HWND
+WINAPI
+CreateMDIWindowW(
+    IN LPCWSTR lpClassName,
+    IN LPCWSTR lpWindowName,
+    IN DWORD dwStyle,
+    IN int X,
+    IN int Y,
+    IN int nWidth,
+    IN int nHeight,
+    IN HWND hWndParent,
+    IN HINSTANCE hInstance,
+    IN LPARAM lParam
+    );
+#ifdef UNICODE
+#define CreateMDIWindow  CreateMDIWindowW
+#else
+#define CreateMDIWindow  CreateMDIWindowA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0400)
+WINUSERAPI WORD    WINAPI TileWindows( IN HWND hwndParent, IN UINT wHow, IN CONST RECT * lpRect, IN UINT cKids, IN const HWND FAR * lpKids);
+WINUSERAPI WORD    WINAPI CascadeWindows( IN HWND hwndParent, IN UINT wHow, IN CONST RECT * lpRect, IN UINT cKids,  IN const HWND FAR * lpKids);
+#endif /* WINVER >= 0x0400 */
+#endif /* !NOMDI */
+
+#endif /* !NOUSER */
+
+/****** Help support ********************************************************/
+
+#ifndef NOHELP
+
+typedef DWORD HELPPOLY;
+typedef struct tagMULTIKEYHELPA {
+#ifndef _MAC
+    DWORD  mkSize;
+#else
+    WORD   mkSize;
+#endif
+    CHAR   mkKeylist;
+    CHAR   szKeyphrase[1];
+} MULTIKEYHELPA, *PMULTIKEYHELPA, *LPMULTIKEYHELPA;
+typedef struct tagMULTIKEYHELPW {
+#ifndef _MAC
+    DWORD  mkSize;
+#else
+    WORD   mkSize;
+#endif
+    WCHAR  mkKeylist;
+    WCHAR  szKeyphrase[1];
+} MULTIKEYHELPW, *PMULTIKEYHELPW, *LPMULTIKEYHELPW;
+#ifdef UNICODE
+typedef MULTIKEYHELPW MULTIKEYHELP;
+typedef PMULTIKEYHELPW PMULTIKEYHELP;
+typedef LPMULTIKEYHELPW LPMULTIKEYHELP;
+#else
+typedef MULTIKEYHELPA MULTIKEYHELP;
+typedef PMULTIKEYHELPA PMULTIKEYHELP;
+typedef LPMULTIKEYHELPA LPMULTIKEYHELP;
+#endif // UNICODE
+
+typedef struct tagHELPWININFOA {
+    int  wStructSize;
+    int  x;
+    int  y;
+    int  dx;
+    int  dy;
+    int  wMax;
+    CHAR   rgchMember[2];
+} HELPWININFOA, *PHELPWININFOA, *LPHELPWININFOA;
+typedef struct tagHELPWININFOW {
+    int  wStructSize;
+    int  x;
+    int  y;
+    int  dx;
+    int  dy;
+    int  wMax;
+    WCHAR  rgchMember[2];
+} HELPWININFOW, *PHELPWININFOW, *LPHELPWININFOW;
+#ifdef UNICODE
+typedef HELPWININFOW HELPWININFO;
+typedef PHELPWININFOW PHELPWININFO;
+typedef LPHELPWININFOW LPHELPWININFO;
+#else
+typedef HELPWININFOA HELPWININFO;
+typedef PHELPWININFOA PHELPWININFO;
+typedef LPHELPWININFOA LPHELPWININFO;
+#endif // UNICODE
+
+
+/*
+ * Commands to pass to WinHelp()
+ */
+#define HELP_CONTEXT      0x0001L  /* Display topic in ulTopic */
+#define HELP_QUIT         0x0002L  /* Terminate help */
+#define HELP_INDEX        0x0003L  /* Display index */
+#define HELP_CONTENTS     0x0003L
+#define HELP_HELPONHELP   0x0004L  /* Display help on using help */
+#define HELP_SETINDEX     0x0005L  /* Set current Index for multi index help */
+#define HELP_SETCONTENTS  0x0005L
+#define HELP_CONTEXTPOPUP 0x0008L
+#define HELP_FORCEFILE    0x0009L
+#define HELP_KEY          0x0101L  /* Display topic for keyword in offabData */
+#define HELP_COMMAND      0x0102L
+#define HELP_PARTIALKEY   0x0105L
+#define HELP_MULTIKEY     0x0201L
+#define HELP_SETWINPOS    0x0203L
+#if(WINVER >= 0x0400)
+#define HELP_CONTEXTMENU  0x000a
+#define HELP_FINDER       0x000b
+#define HELP_WM_HELP      0x000c
+#define HELP_SETPOPUP_POS 0x000d
+
+#define HELP_TCARD              0x8000
+#define HELP_TCARD_DATA         0x0010
+#define HELP_TCARD_OTHER_CALLER 0x0011
+
+// These are in winhelp.h in Win95.
+#define IDH_NO_HELP                     28440
+#define IDH_MISSING_CONTEXT             28441 // Control doesn't have matching help context
+#define IDH_GENERIC_HELP_BUTTON         28442 // Property sheet help button
+#define IDH_OK                          28443
+#define IDH_CANCEL                      28444
+#define IDH_HELP                        28445
+
+#endif /* WINVER >= 0x0400 */
+
+
+
+WINUSERAPI
+BOOL
+WINAPI
+WinHelpA(
+    IN HWND hWndMain,
+    IN LPCSTR lpszHelp,
+    IN UINT uCommand,
+    IN ULONG_PTR dwData
+    );
+WINUSERAPI
+BOOL
+WINAPI
+WinHelpW(
+    IN HWND hWndMain,
+    IN LPCWSTR lpszHelp,
+    IN UINT uCommand,
+    IN ULONG_PTR dwData
+    );
+#ifdef UNICODE
+#define WinHelp  WinHelpW
+#else
+#define WinHelp  WinHelpA
+#endif // !UNICODE
+
+#endif /* !NOHELP */
+
+#if(WINVER >= 0x0500)
+
+#define GR_GDIOBJECTS     0       /* Count of GDI objects */
+#define GR_USEROBJECTS    1       /* Count of USER objects */
+
+WINUSERAPI
+DWORD
+WINAPI
+GetGuiResources(
+    IN HANDLE hProcess,
+    IN DWORD uiFlags);
+
+#endif /* WINVER >= 0x0500 */
+
+
+#ifndef NOSYSPARAMSINFO
+
+/*
+ * Parameter for SystemParametersInfo()
+ */
+
+#define SPI_GETBEEP                 0x0001
+#define SPI_SETBEEP                 0x0002
+#define SPI_GETMOUSE                0x0003
+#define SPI_SETMOUSE                0x0004
+#define SPI_GETBORDER               0x0005
+#define SPI_SETBORDER               0x0006
+#define SPI_GETKEYBOARDSPEED        0x000A
+#define SPI_SETKEYBOARDSPEED        0x000B
+#define SPI_LANGDRIVER              0x000C
+#define SPI_ICONHORIZONTALSPACING   0x000D
+#define SPI_GETSCREENSAVETIMEOUT    0x000E
+#define SPI_SETSCREENSAVETIMEOUT    0x000F
+#define SPI_GETSCREENSAVEACTIVE     0x0010
+#define SPI_SETSCREENSAVEACTIVE     0x0011
+#define SPI_GETGRIDGRANULARITY      0x0012
+#define SPI_SETGRIDGRANULARITY      0x0013
+#define SPI_SETDESKWALLPAPER        0x0014
+#define SPI_SETDESKPATTERN          0x0015
+#define SPI_GETKEYBOARDDELAY        0x0016
+#define SPI_SETKEYBOARDDELAY        0x0017
+#define SPI_ICONVERTICALSPACING     0x0018
+#define SPI_GETICONTITLEWRAP        0x0019
+#define SPI_SETICONTITLEWRAP        0x001A
+#define SPI_GETMENUDROPALIGNMENT    0x001B
+#define SPI_SETMENUDROPALIGNMENT    0x001C
+#define SPI_SETDOUBLECLKWIDTH       0x001D
+#define SPI_SETDOUBLECLKHEIGHT      0x001E
+#define SPI_GETICONTITLELOGFONT     0x001F
+#define SPI_SETDOUBLECLICKTIME      0x0020
+#define SPI_SETMOUSEBUTTONSWAP      0x0021
+#define SPI_SETICONTITLELOGFONT     0x0022
+#define SPI_GETFASTTASKSWITCH       0x0023
+#define SPI_SETFASTTASKSWITCH       0x0024
+#if(WINVER >= 0x0400)
+#define SPI_SETDRAGFULLWINDOWS      0x0025
+#define SPI_GETDRAGFULLWINDOWS      0x0026
+#define SPI_GETNONCLIENTMETRICS     0x0029
+#define SPI_SETNONCLIENTMETRICS     0x002A
+#define SPI_GETMINIMIZEDMETRICS     0x002B
+#define SPI_SETMINIMIZEDMETRICS     0x002C
+#define SPI_GETICONMETRICS          0x002D
+#define SPI_SETICONMETRICS          0x002E
+#define SPI_SETWORKAREA             0x002F
+#define SPI_GETWORKAREA             0x0030
+#define SPI_SETPENWINDOWS           0x0031
+
+#define SPI_GETHIGHCONTRAST         0x0042
+#define SPI_SETHIGHCONTRAST         0x0043
+#define SPI_GETKEYBOARDPREF         0x0044
+#define SPI_SETKEYBOARDPREF         0x0045
+#define SPI_GETSCREENREADER         0x0046
+#define SPI_SETSCREENREADER         0x0047
+#define SPI_GETANIMATION            0x0048
+#define SPI_SETANIMATION            0x0049
+#define SPI_GETFONTSMOOTHING        0x004A
+#define SPI_SETFONTSMOOTHING        0x004B
+#define SPI_SETDRAGWIDTH            0x004C
+#define SPI_SETDRAGHEIGHT           0x004D
+#define SPI_SETHANDHELD             0x004E
+#define SPI_GETLOWPOWERTIMEOUT      0x004F
+#define SPI_GETPOWEROFFTIMEOUT      0x0050
+#define SPI_SETLOWPOWERTIMEOUT      0x0051
+#define SPI_SETPOWEROFFTIMEOUT      0x0052
+#define SPI_GETLOWPOWERACTIVE       0x0053
+#define SPI_GETPOWEROFFACTIVE       0x0054
+#define SPI_SETLOWPOWERACTIVE       0x0055
+#define SPI_SETPOWEROFFACTIVE       0x0056
+#define SPI_SETCURSORS              0x0057
+#define SPI_SETICONS                0x0058
+#define SPI_GETDEFAULTINPUTLANG     0x0059
+#define SPI_SETDEFAULTINPUTLANG     0x005A
+#define SPI_SETLANGTOGGLE           0x005B
+#define SPI_GETWINDOWSEXTENSION     0x005C
+#define SPI_SETMOUSETRAILS          0x005D
+#define SPI_GETMOUSETRAILS          0x005E
+#define SPI_SETSCREENSAVERRUNNING   0x0061
+#define SPI_SCREENSAVERRUNNING     SPI_SETSCREENSAVERRUNNING
+#endif /* WINVER >= 0x0400 */
+#define SPI_GETFILTERKEYS          0x0032
+#define SPI_SETFILTERKEYS          0x0033
+#define SPI_GETTOGGLEKEYS          0x0034
+#define SPI_SETTOGGLEKEYS          0x0035
+#define SPI_GETMOUSEKEYS           0x0036
+#define SPI_SETMOUSEKEYS           0x0037
+#define SPI_GETSHOWSOUNDS          0x0038
+#define SPI_SETSHOWSOUNDS          0x0039
+#define SPI_GETSTICKYKEYS          0x003A
+#define SPI_SETSTICKYKEYS          0x003B
+#define SPI_GETACCESSTIMEOUT       0x003C
+#define SPI_SETACCESSTIMEOUT       0x003D
+#if(WINVER >= 0x0400)
+#define SPI_GETSERIALKEYS          0x003E
+#define SPI_SETSERIALKEYS          0x003F
+#endif /* WINVER >= 0x0400 */
+#define SPI_GETSOUNDSENTRY         0x0040
+#define SPI_SETSOUNDSENTRY         0x0041
+#if(_WIN32_WINNT >= 0x0400)
+#define SPI_GETSNAPTODEFBUTTON     0x005F
+#define SPI_SETSNAPTODEFBUTTON     0x0060
+#endif /* _WIN32_WINNT >= 0x0400 */
+#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+#define SPI_GETMOUSEHOVERWIDTH     0x0062
+#define SPI_SETMOUSEHOVERWIDTH     0x0063
+#define SPI_GETMOUSEHOVERHEIGHT    0x0064
+#define SPI_SETMOUSEHOVERHEIGHT    0x0065
+#define SPI_GETMOUSEHOVERTIME      0x0066
+#define SPI_SETMOUSEHOVERTIME      0x0067
+#define SPI_GETWHEELSCROLLLINES    0x0068
+#define SPI_SETWHEELSCROLLLINES    0x0069
+#define SPI_GETMENUSHOWDELAY       0x006A
+#define SPI_SETMENUSHOWDELAY       0x006B
+
+
+#define SPI_GETSHOWIMEUI          0x006E
+#define SPI_SETSHOWIMEUI          0x006F
+#endif
+
+
+#if(WINVER >= 0x0500)
+#define SPI_GETMOUSESPEED         0x0070
+#define SPI_SETMOUSESPEED         0x0071
+#define SPI_GETSCREENSAVERRUNNING 0x0072
+#define SPI_GETDESKWALLPAPER      0x0073
+#endif /* WINVER >= 0x0500 */
+
+
+#if(WINVER >= 0x0500)
+#define SPI_GETACTIVEWINDOWTRACKING         0x1000
+#define SPI_SETACTIVEWINDOWTRACKING         0x1001
+#define SPI_GETMENUANIMATION                0x1002
+#define SPI_SETMENUANIMATION                0x1003
+#define SPI_GETCOMBOBOXANIMATION            0x1004
+#define SPI_SETCOMBOBOXANIMATION            0x1005
+#define SPI_GETLISTBOXSMOOTHSCROLLING       0x1006
+#define SPI_SETLISTBOXSMOOTHSCROLLING       0x1007
+#define SPI_GETGRADIENTCAPTIONS             0x1008
+#define SPI_SETGRADIENTCAPTIONS             0x1009
+#define SPI_GETKEYBOARDCUES                 0x100A
+#define SPI_SETKEYBOARDCUES                 0x100B
+#define SPI_GETMENUUNDERLINES               SPI_GETKEYBOARDCUES
+#define SPI_SETMENUUNDERLINES               SPI_SETKEYBOARDCUES
+#define SPI_GETACTIVEWNDTRKZORDER           0x100C
+#define SPI_SETACTIVEWNDTRKZORDER           0x100D
+#define SPI_GETHOTTRACKING                  0x100E
+#define SPI_SETHOTTRACKING                  0x100F
+#define SPI_GETMENUFADE                     0x1012
+#define SPI_SETMENUFADE                     0x1013
+#define SPI_GETSELECTIONFADE                0x1014
+#define SPI_SETSELECTIONFADE                0x1015
+#define SPI_GETTOOLTIPANIMATION             0x1016
+#define SPI_SETTOOLTIPANIMATION             0x1017
+#define SPI_GETTOOLTIPFADE                  0x1018
+#define SPI_SETTOOLTIPFADE                  0x1019
+#define SPI_GETCURSORSHADOW                 0x101A
+#define SPI_SETCURSORSHADOW                 0x101B
+#if(_WIN32_WINNT >= 0x0501)
+#define SPI_GETMOUSESONAR                   0x101C
+#define SPI_SETMOUSESONAR                   0x101D
+#define SPI_GETMOUSECLICKLOCK               0x101E
+#define SPI_SETMOUSECLICKLOCK               0x101F
+#define SPI_GETMOUSEVANISH                  0x1020
+#define SPI_SETMOUSEVANISH                  0x1021
+#define SPI_GETFLATMENU                     0x1022
+#define SPI_SETFLATMENU                     0x1023
+#define SPI_GETDROPSHADOW                   0x1024
+#define SPI_SETDROPSHADOW                   0x1025
+#define SPI_GETBLOCKSENDINPUTRESETS         0x1026
+#define SPI_SETBLOCKSENDINPUTRESETS         0x1027
+#endif /* _WIN32_WINNT >= 0x0501 */
+#define SPI_GETUIEFFECTS                    0x103E
+#define SPI_SETUIEFFECTS                    0x103F
+
+#define SPI_GETFOREGROUNDLOCKTIMEOUT        0x2000
+#define SPI_SETFOREGROUNDLOCKTIMEOUT        0x2001
+#define SPI_GETACTIVEWNDTRKTIMEOUT          0x2002
+#define SPI_SETACTIVEWNDTRKTIMEOUT          0x2003
+#define SPI_GETFOREGROUNDFLASHCOUNT         0x2004
+#define SPI_SETFOREGROUNDFLASHCOUNT         0x2005
+#define SPI_GETCARETWIDTH                   0x2006
+#define SPI_SETCARETWIDTH                   0x2007
+
+#if(_WIN32_WINNT >= 0x0501)
+#define SPI_GETMOUSECLICKLOCKTIME           0x2008
+#define SPI_SETMOUSECLICKLOCKTIME           0x2009
+#define SPI_GETFONTSMOOTHINGTYPE            0x200A
+#define SPI_SETFONTSMOOTHINGTYPE            0x200B
+
+/* constants for SPI_GETFONTSMOOTHINGTYPE and SPI_SETFONTSMOOTHINGTYPE: */
+#define FE_FONTSMOOTHINGSTANDARD            0x0001
+#define FE_FONTSMOOTHINGCLEARTYPE           0x0002
+#define FE_FONTSMOOTHINGDOCKING             0x8000
+
+#define SPI_GETFONTSMOOTHINGCONTRAST           0x200C
+#define SPI_SETFONTSMOOTHINGCONTRAST           0x200D
+
+#define SPI_GETFOCUSBORDERWIDTH             0x200E
+#define SPI_SETFOCUSBORDERWIDTH             0x200F
+#define SPI_GETFOCUSBORDERHEIGHT            0x2010
+#define SPI_SETFOCUSBORDERHEIGHT            0x2011
+
+#define SPI_GETFONTSMOOTHINGORIENTATION           0x2012
+#define SPI_SETFONTSMOOTHINGORIENTATION           0x2013
+
+/* constants for SPI_GETFONTSMOOTHINGORIENTATION and SPI_SETFONTSMOOTHINGORIENTATION: */
+#define FE_FONTSMOOTHINGORIENTATIONBGR   0x0000
+#define FE_FONTSMOOTHINGORIENTATIONRGB   0x0001
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#endif /* WINVER >= 0x0500 */
+
+/*
+ * Flags
+ */
+#define SPIF_UPDATEINIFILE    0x0001
+#define SPIF_SENDWININICHANGE 0x0002
+#define SPIF_SENDCHANGE       SPIF_SENDWININICHANGE
+
+
+#define METRICS_USEDEFAULT -1
+#ifdef _WINGDI_
+#ifndef NOGDI
+typedef struct tagNONCLIENTMETRICSA
+{
+    UINT    cbSize;
+    int     iBorderWidth;
+    int     iScrollWidth;
+    int     iScrollHeight;
+    int     iCaptionWidth;
+    int     iCaptionHeight;
+    LOGFONTA lfCaptionFont;
+    int     iSmCaptionWidth;
+    int     iSmCaptionHeight;
+    LOGFONTA lfSmCaptionFont;
+    int     iMenuWidth;
+    int     iMenuHeight;
+    LOGFONTA lfMenuFont;
+    LOGFONTA lfStatusFont;
+    LOGFONTA lfMessageFont;
+}   NONCLIENTMETRICSA, *PNONCLIENTMETRICSA, FAR* LPNONCLIENTMETRICSA;
+typedef struct tagNONCLIENTMETRICSW
+{
+    UINT    cbSize;
+    int     iBorderWidth;
+    int     iScrollWidth;
+    int     iScrollHeight;
+    int     iCaptionWidth;
+    int     iCaptionHeight;
+    LOGFONTW lfCaptionFont;
+    int     iSmCaptionWidth;
+    int     iSmCaptionHeight;
+    LOGFONTW lfSmCaptionFont;
+    int     iMenuWidth;
+    int     iMenuHeight;
+    LOGFONTW lfMenuFont;
+    LOGFONTW lfStatusFont;
+    LOGFONTW lfMessageFont;
+}   NONCLIENTMETRICSW, *PNONCLIENTMETRICSW, FAR* LPNONCLIENTMETRICSW;
+#ifdef UNICODE
+typedef NONCLIENTMETRICSW NONCLIENTMETRICS;
+typedef PNONCLIENTMETRICSW PNONCLIENTMETRICS;
+typedef LPNONCLIENTMETRICSW LPNONCLIENTMETRICS;
+#else
+typedef NONCLIENTMETRICSA NONCLIENTMETRICS;
+typedef PNONCLIENTMETRICSA PNONCLIENTMETRICS;
+typedef LPNONCLIENTMETRICSA LPNONCLIENTMETRICS;
+#endif // UNICODE
+#endif /* NOGDI */
+#endif /* _WINGDI_ */
+
+#define ARW_BOTTOMLEFT              0x0000L
+#define ARW_BOTTOMRIGHT             0x0001L
+#define ARW_TOPLEFT                 0x0002L
+#define ARW_TOPRIGHT                0x0003L
+#define ARW_STARTMASK               0x0003L
+#define ARW_STARTRIGHT              0x0001L
+#define ARW_STARTTOP                0x0002L
+
+#define ARW_LEFT                    0x0000L
+#define ARW_RIGHT                   0x0000L
+#define ARW_UP                      0x0004L
+#define ARW_DOWN                    0x0004L
+#define ARW_HIDE                    0x0008L
+
+typedef struct tagMINIMIZEDMETRICS
+{
+    UINT    cbSize;
+    int     iWidth;
+    int     iHorzGap;
+    int     iVertGap;
+    int     iArrange;
+}   MINIMIZEDMETRICS, *PMINIMIZEDMETRICS, *LPMINIMIZEDMETRICS;
+
+#ifdef _WINGDI_
+#ifndef NOGDI
+typedef struct tagICONMETRICSA
+{
+    UINT    cbSize;
+    int     iHorzSpacing;
+    int     iVertSpacing;
+    int     iTitleWrap;
+    LOGFONTA lfFont;
+}   ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA;
+typedef struct tagICONMETRICSW
+{
+    UINT    cbSize;
+    int     iHorzSpacing;
+    int     iVertSpacing;
+    int     iTitleWrap;
+    LOGFONTW lfFont;
+}   ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW;
+#ifdef UNICODE
+typedef ICONMETRICSW ICONMETRICS;
+typedef PICONMETRICSW PICONMETRICS;
+typedef LPICONMETRICSW LPICONMETRICS;
+#else
+typedef ICONMETRICSA ICONMETRICS;
+typedef PICONMETRICSA PICONMETRICS;
+typedef LPICONMETRICSA LPICONMETRICS;
+#endif // UNICODE
+#endif /* NOGDI */
+#endif /* _WINGDI_ */
+
+typedef struct tagANIMATIONINFO
+{
+    UINT    cbSize;
+    int     iMinAnimate;
+}   ANIMATIONINFO, *LPANIMATIONINFO;
+
+typedef struct tagSERIALKEYSA
+{
+    UINT    cbSize;
+    DWORD   dwFlags;
+    LPSTR     lpszActivePort;
+    LPSTR     lpszPort;
+    UINT    iBaudRate;
+    UINT    iPortState;
+    UINT    iActive;
+}   SERIALKEYSA, *LPSERIALKEYSA;
+typedef struct tagSERIALKEYSW
+{
+    UINT    cbSize;
+    DWORD   dwFlags;
+    LPWSTR    lpszActivePort;
+    LPWSTR    lpszPort;
+    UINT    iBaudRate;
+    UINT    iPortState;
+    UINT    iActive;
+}   SERIALKEYSW, *LPSERIALKEYSW;
+#ifdef UNICODE
+typedef SERIALKEYSW SERIALKEYS;
+typedef LPSERIALKEYSW LPSERIALKEYS;
+#else
+typedef SERIALKEYSA SERIALKEYS;
+typedef LPSERIALKEYSA LPSERIALKEYS;
+#endif // UNICODE
+
+/* flags for SERIALKEYS dwFlags field */
+#define SERKF_SERIALKEYSON  0x00000001
+#define SERKF_AVAILABLE     0x00000002
+#define SERKF_INDICATOR     0x00000004
+
+
+typedef struct tagHIGHCONTRASTA
+{
+    UINT    cbSize;
+    DWORD   dwFlags;
+    LPSTR   lpszDefaultScheme;
+}   HIGHCONTRASTA, *LPHIGHCONTRASTA;
+typedef struct tagHIGHCONTRASTW
+{
+    UINT    cbSize;
+    DWORD   dwFlags;
+    LPWSTR  lpszDefaultScheme;
+}   HIGHCONTRASTW, *LPHIGHCONTRASTW;
+#ifdef UNICODE
+typedef HIGHCONTRASTW HIGHCONTRAST;
+typedef LPHIGHCONTRASTW LPHIGHCONTRAST;
+#else
+typedef HIGHCONTRASTA HIGHCONTRAST;
+typedef LPHIGHCONTRASTA LPHIGHCONTRAST;
+#endif // UNICODE
+
+/* flags for HIGHCONTRAST dwFlags field */
+#define HCF_HIGHCONTRASTON  0x00000001
+#define HCF_AVAILABLE       0x00000002
+#define HCF_HOTKEYACTIVE    0x00000004
+#define HCF_CONFIRMHOTKEY   0x00000008
+#define HCF_HOTKEYSOUND     0x00000010
+#define HCF_INDICATOR       0x00000020
+#define HCF_HOTKEYAVAILABLE 0x00000040
+
+/* Flags for ChangeDisplaySettings */
+#define CDS_UPDATEREGISTRY  0x00000001
+#define CDS_TEST            0x00000002
+#define CDS_FULLSCREEN      0x00000004
+#define CDS_GLOBAL          0x00000008
+#define CDS_SET_PRIMARY     0x00000010
+#define CDS_VIDEOPARAMETERS 0x00000020
+#define CDS_RESET           0x40000000
+#define CDS_NORESET         0x10000000
+
+#include <tvout.h>
+
+/* Return values for ChangeDisplaySettings */
+#define DISP_CHANGE_SUCCESSFUL       0
+#define DISP_CHANGE_RESTART          1
+#define DISP_CHANGE_FAILED          -1
+#define DISP_CHANGE_BADMODE         -2
+#define DISP_CHANGE_NOTUPDATED      -3
+#define DISP_CHANGE_BADFLAGS        -4
+#define DISP_CHANGE_BADPARAM        -5
+#if(_WIN32_WINNT >= 0x0501)
+#define DISP_CHANGE_BADDUALVIEW     -6
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#ifdef _WINGDI_
+#ifndef NOGDI
+
+WINUSERAPI
+LONG
+WINAPI
+ChangeDisplaySettingsA(
+    IN LPDEVMODEA  lpDevMode,
+    IN DWORD       dwFlags);
+WINUSERAPI
+LONG
+WINAPI
+ChangeDisplaySettingsW(
+    IN LPDEVMODEW  lpDevMode,
+    IN DWORD       dwFlags);
+#ifdef UNICODE
+#define ChangeDisplaySettings  ChangeDisplaySettingsW
+#else
+#define ChangeDisplaySettings  ChangeDisplaySettingsA
+#endif // !UNICODE
+
+WINUSERAPI
+LONG
+WINAPI
+ChangeDisplaySettingsExA(
+    IN LPCSTR    lpszDeviceName,
+    IN LPDEVMODEA  lpDevMode,
+    IN HWND        hwnd,
+    IN DWORD       dwflags,
+    IN LPVOID      lParam);
+WINUSERAPI
+LONG
+WINAPI
+ChangeDisplaySettingsExW(
+    IN LPCWSTR    lpszDeviceName,
+    IN LPDEVMODEW  lpDevMode,
+    IN HWND        hwnd,
+    IN DWORD       dwflags,
+    IN LPVOID      lParam);
+#ifdef UNICODE
+#define ChangeDisplaySettingsEx  ChangeDisplaySettingsExW
+#else
+#define ChangeDisplaySettingsEx  ChangeDisplaySettingsExA
+#endif // !UNICODE
+
+#define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
+#define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplaySettingsA(
+    IN LPCSTR lpszDeviceName,
+    IN DWORD iModeNum,
+    OUT LPDEVMODEA lpDevMode);
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplaySettingsW(
+    IN LPCWSTR lpszDeviceName,
+    IN DWORD iModeNum,
+    OUT LPDEVMODEW lpDevMode);
+#ifdef UNICODE
+#define EnumDisplaySettings  EnumDisplaySettingsW
+#else
+#define EnumDisplaySettings  EnumDisplaySettingsA
+#endif // !UNICODE
+
+#if(WINVER >= 0x0500)
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplaySettingsExA(
+    IN LPCSTR lpszDeviceName,
+    IN DWORD iModeNum,
+    OUT LPDEVMODEA lpDevMode,
+    IN DWORD dwFlags);
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplaySettingsExW(
+    IN LPCWSTR lpszDeviceName,
+    IN DWORD iModeNum,
+    OUT LPDEVMODEW lpDevMode,
+    IN DWORD dwFlags);
+#ifdef UNICODE
+#define EnumDisplaySettingsEx  EnumDisplaySettingsExW
+#else
+#define EnumDisplaySettingsEx  EnumDisplaySettingsExA
+#endif // !UNICODE
+
+/* Flags for EnumDisplaySettingsEx */
+#define EDS_RAWMODE                   0x00000002
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplayDevicesA(
+    IN LPCSTR lpDevice,
+    IN DWORD iDevNum,
+    OUT PDISPLAY_DEVICEA lpDisplayDevice,
+    IN DWORD dwFlags);
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplayDevicesW(
+    IN LPCWSTR lpDevice,
+    IN DWORD iDevNum,
+    OUT PDISPLAY_DEVICEW lpDisplayDevice,
+    IN DWORD dwFlags);
+#ifdef UNICODE
+#define EnumDisplayDevices  EnumDisplayDevicesW
+#else
+#define EnumDisplayDevices  EnumDisplayDevicesA
+#endif // !UNICODE
+#endif /* WINVER >= 0x0500 */
+
+#endif /* NOGDI */
+#endif /* _WINGDI_ */
+
+
+WINUSERAPI
+BOOL
+WINAPI
+SystemParametersInfoA(
+    IN UINT uiAction,
+    IN UINT uiParam,
+    IN OUT PVOID pvParam,
+    IN UINT fWinIni);
+WINUSERAPI
+BOOL
+WINAPI
+SystemParametersInfoW(
+    IN UINT uiAction,
+    IN UINT uiParam,
+    IN OUT PVOID pvParam,
+    IN UINT fWinIni);
+#ifdef UNICODE
+#define SystemParametersInfo  SystemParametersInfoW
+#else
+#define SystemParametersInfo  SystemParametersInfoA
+#endif // !UNICODE
+
+
+#endif  /* !NOSYSPARAMSINFO  */
+
+/*
+ * Accessibility support
+ */
+typedef struct tagFILTERKEYS
+{
+    UINT  cbSize;
+    DWORD dwFlags;
+    DWORD iWaitMSec;            // Acceptance Delay
+    DWORD iDelayMSec;           // Delay Until Repeat
+    DWORD iRepeatMSec;          // Repeat Rate
+    DWORD iBounceMSec;          // Debounce Time
+} FILTERKEYS, *LPFILTERKEYS;
+
+/*
+ * FILTERKEYS dwFlags field
+ */
+#define FKF_FILTERKEYSON    0x00000001
+#define FKF_AVAILABLE       0x00000002
+#define FKF_HOTKEYACTIVE    0x00000004
+#define FKF_CONFIRMHOTKEY   0x00000008
+#define FKF_HOTKEYSOUND     0x00000010
+#define FKF_INDICATOR       0x00000020
+#define FKF_CLICKON         0x00000040
+
+typedef struct tagSTICKYKEYS
+{
+    UINT  cbSize;
+    DWORD dwFlags;
+} STICKYKEYS, *LPSTICKYKEYS;
+
+/*
+ * STICKYKEYS dwFlags field
+ */
+#define SKF_STICKYKEYSON    0x00000001
+#define SKF_AVAILABLE       0x00000002
+#define SKF_HOTKEYACTIVE    0x00000004
+#define SKF_CONFIRMHOTKEY   0x00000008
+#define SKF_HOTKEYSOUND     0x00000010
+#define SKF_INDICATOR       0x00000020
+#define SKF_AUDIBLEFEEDBACK 0x00000040
+#define SKF_TRISTATE        0x00000080
+#define SKF_TWOKEYSOFF      0x00000100
+#if(_WIN32_WINNT >= 0x0500)
+#define SKF_LALTLATCHED       0x10000000
+#define SKF_LCTLLATCHED       0x04000000
+#define SKF_LSHIFTLATCHED     0x01000000
+#define SKF_RALTLATCHED       0x20000000
+#define SKF_RCTLLATCHED       0x08000000
+#define SKF_RSHIFTLATCHED     0x02000000
+#define SKF_LWINLATCHED       0x40000000
+#define SKF_RWINLATCHED       0x80000000
+#define SKF_LALTLOCKED        0x00100000
+#define SKF_LCTLLOCKED        0x00040000
+#define SKF_LSHIFTLOCKED      0x00010000
+#define SKF_RALTLOCKED        0x00200000
+#define SKF_RCTLLOCKED        0x00080000
+#define SKF_RSHIFTLOCKED      0x00020000
+#define SKF_LWINLOCKED        0x00400000
+#define SKF_RWINLOCKED        0x00800000
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+typedef struct tagMOUSEKEYS
+{
+    UINT cbSize;
+    DWORD dwFlags;
+    DWORD iMaxSpeed;
+    DWORD iTimeToMaxSpeed;
+    DWORD iCtrlSpeed;
+    DWORD dwReserved1;
+    DWORD dwReserved2;
+} MOUSEKEYS, *LPMOUSEKEYS;
+
+/*
+ * MOUSEKEYS dwFlags field
+ */
+#define MKF_MOUSEKEYSON     0x00000001
+#define MKF_AVAILABLE       0x00000002
+#define MKF_HOTKEYACTIVE    0x00000004
+#define MKF_CONFIRMHOTKEY   0x00000008
+#define MKF_HOTKEYSOUND     0x00000010
+#define MKF_INDICATOR       0x00000020
+#define MKF_MODIFIERS       0x00000040
+#define MKF_REPLACENUMBERS  0x00000080
+#if(_WIN32_WINNT >= 0x0500)
+#define MKF_LEFTBUTTONSEL   0x10000000
+#define MKF_RIGHTBUTTONSEL  0x20000000
+#define MKF_LEFTBUTTONDOWN  0x01000000
+#define MKF_RIGHTBUTTONDOWN 0x02000000
+#define MKF_MOUSEMODE       0x80000000
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+typedef struct tagACCESSTIMEOUT
+{
+    UINT  cbSize;
+    DWORD dwFlags;
+    DWORD iTimeOutMSec;
+} ACCESSTIMEOUT, *LPACCESSTIMEOUT;
+
+/*
+ * ACCESSTIMEOUT dwFlags field
+ */
+#define ATF_TIMEOUTON       0x00000001
+#define ATF_ONOFFFEEDBACK   0x00000002
+
+/* values for SOUNDSENTRY iFSGrafEffect field */
+#define SSGF_NONE       0
+#define SSGF_DISPLAY    3
+
+/* values for SOUNDSENTRY iFSTextEffect field */
+#define SSTF_NONE       0
+#define SSTF_CHARS      1
+#define SSTF_BORDER     2
+#define SSTF_DISPLAY    3
+
+/* values for SOUNDSENTRY iWindowsEffect field */
+#define SSWF_NONE     0
+#define SSWF_TITLE    1
+#define SSWF_WINDOW   2
+#define SSWF_DISPLAY  3
+#define SSWF_CUSTOM   4
+
+typedef struct tagSOUNDSENTRYA
+{
+    UINT cbSize;
+    DWORD dwFlags;
+    DWORD iFSTextEffect;
+    DWORD iFSTextEffectMSec;
+    DWORD iFSTextEffectColorBits;
+    DWORD iFSGrafEffect;
+    DWORD iFSGrafEffectMSec;
+    DWORD iFSGrafEffectColor;
+    DWORD iWindowsEffect;
+    DWORD iWindowsEffectMSec;
+    LPSTR   lpszWindowsEffectDLL;
+    DWORD iWindowsEffectOrdinal;
+} SOUNDSENTRYA, *LPSOUNDSENTRYA;
+typedef struct tagSOUNDSENTRYW
+{
+    UINT cbSize;
+    DWORD dwFlags;
+    DWORD iFSTextEffect;
+    DWORD iFSTextEffectMSec;
+    DWORD iFSTextEffectColorBits;
+    DWORD iFSGrafEffect;
+    DWORD iFSGrafEffectMSec;
+    DWORD iFSGrafEffectColor;
+    DWORD iWindowsEffect;
+    DWORD iWindowsEffectMSec;
+    LPWSTR  lpszWindowsEffectDLL;
+    DWORD iWindowsEffectOrdinal;
+} SOUNDSENTRYW, *LPSOUNDSENTRYW;
+#ifdef UNICODE
+typedef SOUNDSENTRYW SOUNDSENTRY;
+typedef LPSOUNDSENTRYW LPSOUNDSENTRY;
+#else
+typedef SOUNDSENTRYA SOUNDSENTRY;
+typedef LPSOUNDSENTRYA LPSOUNDSENTRY;
+#endif // UNICODE
+
+/*
+ * SOUNDSENTRY dwFlags field
+ */
+#define SSF_SOUNDSENTRYON   0x00000001
+#define SSF_AVAILABLE       0x00000002
+#define SSF_INDICATOR       0x00000004
+
+typedef struct tagTOGGLEKEYS
+{
+    UINT cbSize;
+    DWORD dwFlags;
+} TOGGLEKEYS, *LPTOGGLEKEYS;
+
+/*
+ * TOGGLEKEYS dwFlags field
+ */
+#define TKF_TOGGLEKEYSON    0x00000001
+#define TKF_AVAILABLE       0x00000002
+#define TKF_HOTKEYACTIVE    0x00000004
+#define TKF_CONFIRMHOTKEY   0x00000008
+#define TKF_HOTKEYSOUND     0x00000010
+#define TKF_INDICATOR       0x00000020
+
+/*
+ * Set debug level
+ */
+
+WINUSERAPI
+VOID
+WINAPI
+SetDebugErrorLevel(
+    IN DWORD dwLevel
+    );
+
+/*
+ * SetLastErrorEx() types.
+ */
+
+#define SLE_ERROR       0x00000001
+#define SLE_MINORERROR  0x00000002
+#define SLE_WARNING     0x00000003
+
+WINUSERAPI
+VOID
+WINAPI
+SetLastErrorEx(
+    IN DWORD dwErrCode,
+    IN DWORD dwType
+    );
+
+WINUSERAPI
+int
+WINAPI
+InternalGetWindowText(
+    IN HWND hWnd,
+    OUT LPWSTR lpString,
+    IN int nMaxCount);
+
+#if defined(WINNT)
+WINUSERAPI
+BOOL
+WINAPI
+EndTask(
+    IN HWND hWnd,
+    IN BOOL fShutDown,
+    IN BOOL fForce);
+#endif
+
+
+#if(WINVER >= 0x0500)
+
+/*
+ * Multimonitor API.
+ */
+
+#define MONITOR_DEFAULTTONULL       0x00000000
+#define MONITOR_DEFAULTTOPRIMARY    0x00000001
+#define MONITOR_DEFAULTTONEAREST    0x00000002
+
+WINUSERAPI
+HMONITOR
+WINAPI
+MonitorFromPoint(
+    IN POINT pt,
+    IN DWORD dwFlags);
+
+WINUSERAPI
+HMONITOR
+WINAPI
+MonitorFromRect(
+    IN LPCRECT lprc,
+    IN DWORD dwFlags);
+
+WINUSERAPI
+HMONITOR
+WINAPI
+MonitorFromWindow( IN HWND hwnd, IN DWORD dwFlags);
+
+#define MONITORINFOF_PRIMARY        0x00000001
+
+#ifndef CCHDEVICENAME
+#define CCHDEVICENAME 32
+#endif
+
+typedef struct tagMONITORINFO
+{
+    DWORD   cbSize;
+    RECT    rcMonitor;
+    RECT    rcWork;
+    DWORD   dwFlags;
+} MONITORINFO, *LPMONITORINFO;
+
+#ifdef __cplusplus
+typedef struct tagMONITORINFOEXA : public tagMONITORINFO
+{
+    CHAR        szDevice[CCHDEVICENAME];
+} MONITORINFOEXA, *LPMONITORINFOEXA;
+typedef struct tagMONITORINFOEXW : public tagMONITORINFO
+{
+    WCHAR       szDevice[CCHDEVICENAME];
+} MONITORINFOEXW, *LPMONITORINFOEXW;
+#ifdef UNICODE
+typedef MONITORINFOEXW MONITORINFOEX;
+typedef LPMONITORINFOEXW LPMONITORINFOEX;
+#else
+typedef MONITORINFOEXA MONITORINFOEX;
+typedef LPMONITORINFOEXA LPMONITORINFOEX;
+#endif // UNICODE
+#else // ndef __cplusplus
+typedef struct tagMONITORINFOEXA
+{
+    MONITORINFO;
+    CHAR        szDevice[CCHDEVICENAME];
+} MONITORINFOEXA, *LPMONITORINFOEXA;
+typedef struct tagMONITORINFOEXW
+{
+    MONITORINFO;
+    WCHAR       szDevice[CCHDEVICENAME];
+} MONITORINFOEXW, *LPMONITORINFOEXW;
+#ifdef UNICODE
+typedef MONITORINFOEXW MONITORINFOEX;
+typedef LPMONITORINFOEXW LPMONITORINFOEX;
+#else
+typedef MONITORINFOEXA MONITORINFOEX;
+typedef LPMONITORINFOEXA LPMONITORINFOEX;
+#endif // UNICODE
+#endif
+
+WINUSERAPI BOOL WINAPI GetMonitorInfoA( IN HMONITOR hMonitor, OUT LPMONITORINFO lpmi);
+WINUSERAPI BOOL WINAPI GetMonitorInfoW( IN HMONITOR hMonitor, OUT LPMONITORINFO lpmi);
+#ifdef UNICODE
+#define GetMonitorInfo  GetMonitorInfoW
+#else
+#define GetMonitorInfo  GetMonitorInfoA
+#endif // !UNICODE
+
+typedef BOOL (CALLBACK* MONITORENUMPROC)(HMONITOR, HDC, LPRECT, LPARAM);
+
+WINUSERAPI
+BOOL
+WINAPI
+EnumDisplayMonitors(
+    IN HDC             hdc,
+    IN LPCRECT         lprcClip,
+    IN MONITORENUMPROC lpfnEnum,
+    IN LPARAM          dwData);
+
+
+#ifndef NOWINABLE
+
+/*
+ * WinEvents - Active Accessibility hooks
+ */
+
+WINUSERAPI
+VOID
+WINAPI
+NotifyWinEvent(
+    IN DWORD event,
+    IN HWND  hwnd,
+    IN LONG  idObject,
+    IN LONG  idChild);
+
+typedef VOID (CALLBACK* WINEVENTPROC)(
+    HWINEVENTHOOK hWinEventHook,
+    DWORD         event,
+    HWND          hwnd,
+    LONG          idObject,
+    LONG          idChild,
+    DWORD         idEventThread,
+    DWORD         dwmsEventTime);
+
+WINUSERAPI
+HWINEVENTHOOK
+WINAPI
+SetWinEventHook(
+    IN DWORD        eventMin,
+    IN DWORD        eventMax,
+    IN HMODULE      hmodWinEventProc,
+    IN WINEVENTPROC pfnWinEventProc,
+    IN DWORD        idProcess,
+    IN DWORD        idThread,
+    IN DWORD        dwFlags);
+
+#if(_WIN32_WINNT >= 0x0501)
+WINUSERAPI
+BOOL
+WINAPI
+IsWinEventHookInstalled(
+    IN DWORD event);
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+/*
+ * dwFlags for SetWinEventHook
+ */
+#define WINEVENT_OUTOFCONTEXT   0x0000  // Events are ASYNC
+#define WINEVENT_SKIPOWNTHREAD  0x0001  // Don't call back for events on installer's thread
+#define WINEVENT_SKIPOWNPROCESS 0x0002  // Don't call back for events on installer's process
+#define WINEVENT_INCONTEXT      0x0004  // Events are SYNC, this causes your dll to be injected into every process
+
+WINUSERAPI
+BOOL
+WINAPI
+UnhookWinEvent(
+    IN HWINEVENTHOOK hWinEventHook);
+
+/*
+ * idObject values for WinEventProc and NotifyWinEvent
+ */
+
+/*
+ * hwnd + idObject can be used with OLEACC.DLL's OleGetObjectFromWindow()
+ * to get an interface pointer to the container.  indexChild is the item
+ * within the container in question.  Setup a VARIANT with vt VT_I4 and
+ * lVal the indexChild and pass that in to all methods.  Then you
+ * are raring to go.
+ */
+
+
+/*
+ * Common object IDs (cookies, only for sending WM_GETOBJECT to get at the
+ * thing in question).  Positive IDs are reserved for apps (app specific),
+ * negative IDs are system things and are global, 0 means "just little old
+ * me".
+ */
+#define     CHILDID_SELF        0
+#define     INDEXID_OBJECT      0
+#define     INDEXID_CONTAINER   0
+
+/*
+ * Reserved IDs for system objects
+ */
+#define     OBJID_WINDOW        ((LONG)0x00000000)
+#define     OBJID_SYSMENU       ((LONG)0xFFFFFFFF)
+#define     OBJID_TITLEBAR      ((LONG)0xFFFFFFFE)
+#define     OBJID_MENU          ((LONG)0xFFFFFFFD)
+#define     OBJID_CLIENT        ((LONG)0xFFFFFFFC)
+#define     OBJID_VSCROLL       ((LONG)0xFFFFFFFB)
+#define     OBJID_HSCROLL       ((LONG)0xFFFFFFFA)
+#define     OBJID_SIZEGRIP      ((LONG)0xFFFFFFF9)
+#define     OBJID_CARET         ((LONG)0xFFFFFFF8)
+#define     OBJID_CURSOR        ((LONG)0xFFFFFFF7)
+#define     OBJID_ALERT         ((LONG)0xFFFFFFF6)
+#define     OBJID_SOUND         ((LONG)0xFFFFFFF5)
+#define     OBJID_QUERYCLASSNAMEIDX ((LONG)0xFFFFFFF4)
+#define     OBJID_NATIVEOM      ((LONG)0xFFFFFFF0)
+
+/*
+ * EVENT DEFINITION
+ */
+#define EVENT_MIN           0x00000001
+#define EVENT_MAX           0x7FFFFFFF
+
+
+/*
+ *  EVENT_SYSTEM_SOUND
+ *  Sent when a sound is played.  Currently nothing is generating this, we
+ *  this event when a system sound (for menus, etc) is played.  Apps
+ *  generate this, if accessible, when a private sound is played.  For
+ *  example, if Mail plays a "New Mail" sound.
+ *
+ *  System Sounds:
+ *  (Generated by PlaySoundEvent in USER itself)
+ *      hwnd            is NULL
+ *      idObject        is OBJID_SOUND
+ *      idChild         is sound child ID if one
+ *  App Sounds:
+ *  (PlaySoundEvent won't generate notification; up to app)
+ *      hwnd + idObject gets interface pointer to Sound object
+ *      idChild identifies the sound in question
+ *  are going to be cleaning up the SOUNDSENTRY feature in the control panel
+ *  and will use this at that time.  Applications implementing WinEvents
+ *  are perfectly welcome to use it.  Clients of IAccessible* will simply
+ *  turn around and get back a non-visual object that describes the sound.
+ */
+#define EVENT_SYSTEM_SOUND              0x0001
+
+/*
+ * EVENT_SYSTEM_ALERT
+ * System Alerts:
+ * (Generated by MessageBox() calls for example)
+ *      hwnd            is hwndMessageBox
+ *      idObject        is OBJID_ALERT
+ * App Alerts:
+ * (Generated whenever)
+ *      hwnd+idObject gets interface pointer to Alert
+ */
+#define EVENT_SYSTEM_ALERT              0x0002
+
+/*
+ * EVENT_SYSTEM_FOREGROUND
+ * Sent when the foreground (active) window changes, even if it is changing
+ * to another window in the same thread as the previous one.
+ *      hwnd            is hwndNewForeground
+ *      idObject        is OBJID_WINDOW
+ *      idChild    is INDEXID_OBJECT
+ */
+#define EVENT_SYSTEM_FOREGROUND         0x0003
+
+/*
+ * Menu
+ *      hwnd            is window (top level window or popup menu window)
+ *      idObject        is ID of control (OBJID_MENU, OBJID_SYSMENU, OBJID_SELF for popup)
+ *      idChild         is CHILDID_SELF
+ *
+ * EVENT_SYSTEM_MENUSTART
+ * EVENT_SYSTEM_MENUEND
+ * For MENUSTART, hwnd+idObject+idChild refers to the control with the menu bar,
+ *  or the control bringing up the context menu.
+ *
+ * Sent when entering into and leaving from menu mode (system, app bar, and
+ * track popups).
+ */
+#define EVENT_SYSTEM_MENUSTART          0x0004
+#define EVENT_SYSTEM_MENUEND            0x0005
+
+/*
+ * EVENT_SYSTEM_MENUPOPUPSTART
+ * EVENT_SYSTEM_MENUPOPUPEND
+ * Sent when a menu popup comes up and just before it is taken down.  Note
+ * that for a call to TrackPopupMenu(), a client will see EVENT_SYSTEM_MENUSTART
+ * followed almost immediately by EVENT_SYSTEM_MENUPOPUPSTART for the popup
+ * being shown.
+ *
+ * For MENUPOPUP, hwnd+idObject+idChild refers to the NEW popup coming up, not the
+ * parent item which is hierarchical.  You can get the parent menu/popup by
+ * asking for the accParent object.
+ */
+#define EVENT_SYSTEM_MENUPOPUPSTART     0x0006
+#define EVENT_SYSTEM_MENUPOPUPEND       0x0007
+
+
+/*
+ * EVENT_SYSTEM_CAPTURESTART
+ * EVENT_SYSTEM_CAPTUREEND
+ * Sent when a window takes the capture and releases the capture.
+ */
+#define EVENT_SYSTEM_CAPTURESTART       0x0008
+#define EVENT_SYSTEM_CAPTUREEND         0x0009
+
+/*
+ * Move Size
+ * EVENT_SYSTEM_MOVESIZESTART
+ * EVENT_SYSTEM_MOVESIZEEND
+ * Sent when a window enters and leaves move-size dragging mode.
+ */
+#define EVENT_SYSTEM_MOVESIZESTART      0x000A
+#define EVENT_SYSTEM_MOVESIZEEND        0x000B
+
+/*
+ * Context Help
+ * EVENT_SYSTEM_CONTEXTHELPSTART
+ * EVENT_SYSTEM_CONTEXTHELPEND
+ * Sent when a window enters and leaves context sensitive help mode.
+ */
+#define EVENT_SYSTEM_CONTEXTHELPSTART   0x000C
+#define EVENT_SYSTEM_CONTEXTHELPEND     0x000D
+
+/*
+ * Drag & Drop
+ * EVENT_SYSTEM_DRAGDROPSTART
+ * EVENT_SYSTEM_DRAGDROPEND
+ * Send the START notification just before going into drag&drop loop.  Send
+ * the END notification just after canceling out.
+ * Note that it is up to apps and OLE to generate this, since the system
+ * doesn't know.  Like EVENT_SYSTEM_SOUND, it will be a while before this
+ * is prevalent.
+ */
+#define EVENT_SYSTEM_DRAGDROPSTART      0x000E
+#define EVENT_SYSTEM_DRAGDROPEND        0x000F
+
+/*
+ * Dialog
+ * Send the START notification right after the dialog is completely
+ *  initialized and visible.  Send the END right before the dialog
+ *  is hidden and goes away.
+ * EVENT_SYSTEM_DIALOGSTART
+ * EVENT_SYSTEM_DIALOGEND
+ */
+#define EVENT_SYSTEM_DIALOGSTART        0x0010
+#define EVENT_SYSTEM_DIALOGEND          0x0011
+
+/*
+ * EVENT_SYSTEM_SCROLLING
+ * EVENT_SYSTEM_SCROLLINGSTART
+ * EVENT_SYSTEM_SCROLLINGEND
+ * Sent when beginning and ending the tracking of a scrollbar in a window,
+ * and also for scrollbar controls.
+ */
+#define EVENT_SYSTEM_SCROLLINGSTART     0x0012
+#define EVENT_SYSTEM_SCROLLINGEND       0x0013
+
+/*
+ * Alt-Tab Window
+ * Send the START notification right after the switch window is initialized
+ * and visible.  Send the END right before it is hidden and goes away.
+ * EVENT_SYSTEM_SWITCHSTART
+ * EVENT_SYSTEM_SWITCHEND
+ */
+#define EVENT_SYSTEM_SWITCHSTART        0x0014
+#define EVENT_SYSTEM_SWITCHEND          0x0015
+
+/*
+ * EVENT_SYSTEM_MINIMIZESTART
+ * EVENT_SYSTEM_MINIMIZEEND
+ * Sent when a window minimizes and just before it restores.
+ */
+#define EVENT_SYSTEM_MINIMIZESTART      0x0016
+#define EVENT_SYSTEM_MINIMIZEEND        0x0017
+
+
+#if(_WIN32_WINNT >= 0x0501)
+#define EVENT_CONSOLE_CARET             0x4001
+#define EVENT_CONSOLE_UPDATE_REGION     0x4002
+#define EVENT_CONSOLE_UPDATE_SIMPLE     0x4003
+#define EVENT_CONSOLE_UPDATE_SCROLL     0x4004
+#define EVENT_CONSOLE_LAYOUT            0x4005
+#define EVENT_CONSOLE_START_APPLICATION 0x4006
+#define EVENT_CONSOLE_END_APPLICATION   0x4007
+
+/*
+ * Flags for EVENT_CONSOLE_START/END_APPLICATION.
+ */
+#define CONSOLE_APPLICATION_16BIT       0x0001
+
+/*
+ * Flags for EVENT_CONSOLE_CARET
+ */
+#define CONSOLE_CARET_SELECTION         0x0001
+#define CONSOLE_CARET_VISIBLE           0x0002
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+/*
+ * Object events
+ *
+ * The system AND apps generate these.  The system generates these for
+ * real windows.  Apps generate these for objects within their window which
+ * act like a separate control, e.g. an item in a list view.
+ *
+ * When the system generate them, dwParam2 is always WMOBJID_SELF.  When
+ * apps generate them, apps put the has-meaning-to-the-app-only ID value
+ * in dwParam2.
+ * For all events, if you want detailed accessibility information, callers
+ * should
+ *      * Call AccessibleObjectFromWindow() with the hwnd, idObject parameters
+ *          of the event, and IID_IAccessible as the REFIID, to get back an
+ *          IAccessible* to talk to
+ *      * Initialize and fill in a VARIANT as VT_I4 with lVal the idChild
+ *          parameter of the event.
+ *      * If idChild isn't zero, call get_accChild() in the container to see
+ *          if the child is an object in its own right.  If so, you will get
+ *          back an IDispatch* object for the child.  You should release the
+ *          parent, and call QueryInterface() on the child object to get its
+ *          IAccessible*.  Then you talk directly to the child.  Otherwise,
+ *          if get_accChild() returns you nothing, you should continue to
+ *          use the child VARIANT.  You will ask the container for the properties
+ *          of the child identified by the VARIANT.  In other words, the
+ *          child in this case is accessible but not a full-blown object.
+ *          Like a button on a titlebar which is 'small' and has no children.
+ */
+
+/*
+ * For all EVENT_OBJECT events,
+ *      hwnd is the dude to Send the WM_GETOBJECT message to (unless NULL,
+ *          see above for system things)
+ *      idObject is the ID of the object that can resolve any queries a
+ *          client might have.  It's a way to deal with windowless controls,
+ *          controls that are just drawn on the screen in some larger parent
+ *          window (like SDM), or standard frame elements of a window.
+ *      idChild is the piece inside of the object that is affected.  This
+ *          allows clients to access things that are too small to have full
+ *          blown objects in their own right.  Like the thumb of a scrollbar.
+ *          The hwnd/idObject pair gets you to the container, the dude you
+ *          probably want to talk to most of the time anyway.  The idChild
+ *          can then be passed into the acc properties to get the name/value
+ *          of it as needed.
+ *
+ * Example #1:
+ *      System propagating a listbox selection change
+ *      EVENT_OBJECT_SELECTION
+ *          hwnd == listbox hwnd
+ *          idObject == OBJID_WINDOW
+ *          idChild == new selected item, or CHILDID_SELF if
+ *              nothing now selected within container.
+ *      Word '97 propagating a listbox selection change
+ *          hwnd == SDM window
+ *          idObject == SDM ID to get at listbox 'control'
+ *          idChild == new selected item, or CHILDID_SELF if
+ *              nothing
+ *
+ * Example #2:
+ *      System propagating a menu item selection on the menu bar
+ *      EVENT_OBJECT_SELECTION
+ *          hwnd == top level window
+ *          idObject == OBJID_MENU
+ *          idChild == ID of child menu bar item selected
+ *
+ * Example #3:
+ *      System propagating a dropdown coming off of said menu bar item
+ *      EVENT_OBJECT_CREATE
+ *          hwnd == popup item
+ *          idObject == OBJID_WINDOW
+ *          idChild == CHILDID_SELF
+ *
+ * Example #4:
+ *
+ * For EVENT_OBJECT_REORDER, the object referred to by hwnd/idObject is the
+ * PARENT container in which the zorder is occurring.  This is because if
+ * one child is zordering, all of them are changing their relative zorder.
+ */
+#define EVENT_OBJECT_CREATE                 0x8000  // hwnd + ID + idChild is created item
+#define EVENT_OBJECT_DESTROY                0x8001  // hwnd + ID + idChild is destroyed item
+#define EVENT_OBJECT_SHOW                   0x8002  // hwnd + ID + idChild is shown item
+#define EVENT_OBJECT_HIDE                   0x8003  // hwnd + ID + idChild is hidden item
+#define EVENT_OBJECT_REORDER                0x8004  // hwnd + ID + idChild is parent of zordering children
+/*
+ * NOTE:
+ * Minimize the number of notifications!
+ *
+ * When you are hiding a parent object, obviously all child objects are no
+ * longer visible on screen.  They still have the same "visible" status,
+ * but are not truly visible.  Hence do not send HIDE notifications for the
+ * children also.  One implies all.  The same goes for SHOW.
+ */
+
+
+#define EVENT_OBJECT_FOCUS                  0x8005  // hwnd + ID + idChild is focused item
+#define EVENT_OBJECT_SELECTION              0x8006  // hwnd + ID + idChild is selected item (if only one), or idChild is OBJID_WINDOW if complex
+#define EVENT_OBJECT_SELECTIONADD           0x8007  // hwnd + ID + idChild is item added
+#define EVENT_OBJECT_SELECTIONREMOVE        0x8008  // hwnd + ID + idChild is item removed
+#define EVENT_OBJECT_SELECTIONWITHIN        0x8009  // hwnd + ID + idChild is parent of changed selected items
+
+/*
+ * NOTES:
+ * There is only one "focused" child item in a parent.  This is the place
+ * keystrokes are going at a given moment.  Hence only send a notification
+ * about where the NEW focus is going.  A NEW item getting the focus already
+ * implies that the OLD item is losing it.
+ *
+ * SELECTION however can be multiple.  Hence the different SELECTION
+ * notifications.  Here's when to use each:
+ *
+ * (1) Send a SELECTION notification in the simple single selection
+ *     case (like the focus) when the item with the selection is
+ *     merely moving to a different item within a container.  hwnd + ID
+ *     is the container control, idChildItem is the new child with the
+ *     selection.
+ *
+ * (2) Send a SELECTIONADD notification when a new item has simply been added
+ *     to the selection within a container.  This is appropriate when the
+ *     number of newly selected items is very small.  hwnd + ID is the
+ *     container control, idChildItem is the new child added to the selection.
+ *
+ * (3) Send a SELECTIONREMOVE notification when a new item has simply been
+ *     removed from the selection within a container.  This is appropriate
+ *     when the number of newly selected items is very small, just like
+ *     SELECTIONADD.  hwnd + ID is the container control, idChildItem is the
+ *     new child removed from the selection.
+ *
+ * (4) Send a SELECTIONWITHIN notification when the selected items within a
+ *     control have changed substantially.  Rather than propagate a large
+ *     number of changes to reflect removal for some items, addition of
+ *     others, just tell somebody who cares that a lot happened.  It will
+ *     be faster an easier for somebody watching to just turn around and
+ *     query the container control what the new bunch of selected items
+ *     are.
+ */
+
+#define EVENT_OBJECT_STATECHANGE            0x800A  // hwnd + ID + idChild is item w/ state change
+/*
+ * Examples of when to send an EVENT_OBJECT_STATECHANGE include
+ *      * It is being enabled/disabled (USER does for windows)
+ *      * It is being pressed/released (USER does for buttons)
+ *      * It is being checked/unchecked (USER does for radio/check buttons)
+ */
+#define EVENT_OBJECT_LOCATIONCHANGE         0x800B  // hwnd + ID + idChild is moved/sized item
+
+/*
+ * Note:
+ * A LOCATIONCHANGE is not sent for every child object when the parent
+ * changes shape/moves.  Send one notification for the topmost object
+ * that is changing.  For example, if the user resizes a top level window,
+ * USER will generate a LOCATIONCHANGE for it, but not for the menu bar,
+ * title bar, scrollbars, etc.  that are also changing shape/moving.
+ *
+ * In other words, it only generates LOCATIONCHANGE notifications for
+ * real windows that are moving/sizing.  It will not generate a LOCATIONCHANGE
+ * for every non-floating child window when the parent moves (the children are
+ * logically moving also on screen, but not relative to the parent).
+ *
+ * Now, if the app itself resizes child windows as a result of being
+ * sized, USER will generate LOCATIONCHANGEs for those dudes also because
+ * it doesn't know better.
+ *
+ * Note also that USER will generate LOCATIONCHANGE notifications for two
+ * non-window sys objects:
+ *      (1) System caret
+ *      (2) Cursor
+ */
+
+#define EVENT_OBJECT_NAMECHANGE             0x800C  // hwnd + ID + idChild is item w/ name change
+#define EVENT_OBJECT_DESCRIPTIONCHANGE      0x800D  // hwnd + ID + idChild is item w/ desc change
+#define EVENT_OBJECT_VALUECHANGE            0x800E  // hwnd + ID + idChild is item w/ value change
+#define EVENT_OBJECT_PARENTCHANGE           0x800F  // hwnd + ID + idChild is item w/ new parent
+#define EVENT_OBJECT_HELPCHANGE             0x8010  // hwnd + ID + idChild is item w/ help change
+#define EVENT_OBJECT_DEFACTIONCHANGE        0x8011  // hwnd + ID + idChild is item w/ def action change
+#define EVENT_OBJECT_ACCELERATORCHANGE      0x8012  // hwnd + ID + idChild is item w/ keybd accel change
+
+/*
+ * Child IDs
+ */
+
+/*
+ * System Sounds (idChild of system SOUND notification)
+ */
+#define SOUND_SYSTEM_STARTUP            1
+#define SOUND_SYSTEM_SHUTDOWN           2
+#define SOUND_SYSTEM_BEEP               3
+#define SOUND_SYSTEM_ERROR              4
+#define SOUND_SYSTEM_QUESTION           5
+#define SOUND_SYSTEM_WARNING            6
+#define SOUND_SYSTEM_INFORMATION        7
+#define SOUND_SYSTEM_MAXIMIZE           8
+#define SOUND_SYSTEM_MINIMIZE           9
+#define SOUND_SYSTEM_RESTOREUP          10
+#define SOUND_SYSTEM_RESTOREDOWN        11
+#define SOUND_SYSTEM_APPSTART           12
+#define SOUND_SYSTEM_FAULT              13
+#define SOUND_SYSTEM_APPEND             14
+#define SOUND_SYSTEM_MENUCOMMAND        15
+#define SOUND_SYSTEM_MENUPOPUP          16
+#define CSOUND_SYSTEM                   16
+
+/*
+ * System Alerts (indexChild of system ALERT notification)
+ */
+#define ALERT_SYSTEM_INFORMATIONAL      1       // MB_INFORMATION
+#define ALERT_SYSTEM_WARNING            2       // MB_WARNING
+#define ALERT_SYSTEM_ERROR              3       // MB_ERROR
+#define ALERT_SYSTEM_QUERY              4       // MB_QUESTION
+#define ALERT_SYSTEM_CRITICAL           5       // HardSysErrBox
+#define CALERT_SYSTEM                   6
+
+typedef struct tagGUITHREADINFO
+{
+    DWORD   cbSize;
+    DWORD   flags;
+    HWND    hwndActive;
+    HWND    hwndFocus;
+    HWND    hwndCapture;
+    HWND    hwndMenuOwner;
+    HWND    hwndMoveSize;
+    HWND    hwndCaret;
+    RECT    rcCaret;
+} GUITHREADINFO, *PGUITHREADINFO, FAR * LPGUITHREADINFO;
+
+#define GUI_CARETBLINKING   0x00000001
+#define GUI_INMOVESIZE      0x00000002
+#define GUI_INMENUMODE      0x00000004
+#define GUI_SYSTEMMENUMODE  0x00000008
+#define GUI_POPUPMENUMODE   0x00000010
+#if(_WIN32_WINNT >= 0x0501)
+#define GUI_16BITTASK       0x00000020
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+WINUSERAPI
+BOOL
+WINAPI
+GetGUIThreadInfo(
+    IN DWORD idThread,
+    OUT PGUITHREADINFO pgui);
+
+
+WINUSERAPI
+UINT
+WINAPI
+GetWindowModuleFileNameA(
+    IN HWND     hwnd,
+    OUT LPSTR pszFileName,
+    IN UINT     cchFileNameMax);
+WINUSERAPI
+UINT
+WINAPI
+GetWindowModuleFileNameW(
+    IN HWND     hwnd,
+    OUT LPWSTR pszFileName,
+    IN UINT     cchFileNameMax);
+#ifdef UNICODE
+#define GetWindowModuleFileName  GetWindowModuleFileNameW
+#else
+#define GetWindowModuleFileName  GetWindowModuleFileNameA
+#endif // !UNICODE
+
+#ifndef NO_STATE_FLAGS
+#define STATE_SYSTEM_UNAVAILABLE        0x00000001  // Disabled
+#define STATE_SYSTEM_SELECTED           0x00000002
+#define STATE_SYSTEM_FOCUSED            0x00000004
+#define STATE_SYSTEM_PRESSED            0x00000008
+#define STATE_SYSTEM_CHECKED            0x00000010
+#define STATE_SYSTEM_MIXED              0x00000020  // 3-state checkbox or toolbar button
+#define STATE_SYSTEM_INDETERMINATE      STATE_SYSTEM_MIXED
+#define STATE_SYSTEM_READONLY           0x00000040
+#define STATE_SYSTEM_HOTTRACKED         0x00000080
+#define STATE_SYSTEM_DEFAULT            0x00000100
+#define STATE_SYSTEM_EXPANDED           0x00000200
+#define STATE_SYSTEM_COLLAPSED          0x00000400
+#define STATE_SYSTEM_BUSY               0x00000800
+#define STATE_SYSTEM_FLOATING           0x00001000  // Children "owned" not "contained" by parent
+#define STATE_SYSTEM_MARQUEED           0x00002000
+#define STATE_SYSTEM_ANIMATED           0x00004000
+#define STATE_SYSTEM_INVISIBLE          0x00008000
+#define STATE_SYSTEM_OFFSCREEN          0x00010000
+#define STATE_SYSTEM_SIZEABLE           0x00020000
+#define STATE_SYSTEM_MOVEABLE           0x00040000
+#define STATE_SYSTEM_SELFVOICING        0x00080000
+#define STATE_SYSTEM_FOCUSABLE          0x00100000
+#define STATE_SYSTEM_SELECTABLE         0x00200000
+#define STATE_SYSTEM_LINKED             0x00400000
+#define STATE_SYSTEM_TRAVERSED          0x00800000
+#define STATE_SYSTEM_MULTISELECTABLE    0x01000000  // Supports multiple selection
+#define STATE_SYSTEM_EXTSELECTABLE      0x02000000  // Supports extended selection
+#define STATE_SYSTEM_ALERT_LOW          0x04000000  // This information is of low priority
+#define STATE_SYSTEM_ALERT_MEDIUM       0x08000000  // This information is of medium priority
+#define STATE_SYSTEM_ALERT_HIGH         0x10000000  // This information is of high priority
+#define STATE_SYSTEM_PROTECTED          0x20000000  // access to this is restricted
+#define STATE_SYSTEM_VALID              0x3FFFFFFF
+#endif
+
+#define CCHILDREN_TITLEBAR              5
+#define CCHILDREN_SCROLLBAR             5
+
+/*
+ * Information about the global cursor.
+ */
+typedef struct tagCURSORINFO
+{
+    DWORD   cbSize;
+    DWORD   flags;
+    HCURSOR hCursor;
+    POINT   ptScreenPos;
+} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
+
+#define CURSOR_SHOWING     0x00000001
+
+WINUSERAPI
+BOOL
+WINAPI
+GetCursorInfo(
+    OUT PCURSORINFO pci
+);
+
+/*
+ * Window information snapshot
+ */
+typedef struct tagWINDOWINFO
+{
+    DWORD cbSize;
+    RECT  rcWindow;
+    RECT  rcClient;
+    DWORD dwStyle;
+    DWORD dwExStyle;
+    DWORD dwWindowStatus;
+    UINT  cxWindowBorders;
+    UINT  cyWindowBorders;
+    ATOM  atomWindowType;
+    WORD  wCreatorVersion;
+} WINDOWINFO, *PWINDOWINFO, *LPWINDOWINFO;
+
+#define WS_ACTIVECAPTION    0x0001
+
+WINUSERAPI
+BOOL
+WINAPI
+GetWindowInfo(
+    IN HWND hwnd,
+    OUT PWINDOWINFO pwi
+);
+
+/*
+ * Titlebar information.
+ */
+typedef struct tagTITLEBARINFO
+{
+    DWORD cbSize;
+    RECT  rcTitleBar;
+    DWORD rgstate[CCHILDREN_TITLEBAR+1];
+} TITLEBARINFO, *PTITLEBARINFO, *LPTITLEBARINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetTitleBarInfo(
+    IN HWND hwnd,
+    OUT PTITLEBARINFO pti
+);
+
+/*
+ * Menubar information
+ */
+typedef struct tagMENUBARINFO
+{
+    DWORD cbSize;
+    RECT  rcBar;          // rect of bar, popup, item
+    HMENU hMenu;          // real menu handle of bar, popup
+    HWND  hwndMenu;       // hwnd of item submenu if one
+    BOOL  fBarFocused:1;  // bar, popup has the focus
+    BOOL  fFocused:1;     // item has the focus
+} MENUBARINFO, *PMENUBARINFO, *LPMENUBARINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetMenuBarInfo(
+    IN HWND hwnd,
+    IN LONG idObject,
+    IN LONG idItem,
+    OUT PMENUBARINFO pmbi
+);
+
+/*
+ * Scrollbar information
+ */
+typedef struct tagSCROLLBARINFO
+{
+    DWORD cbSize;
+    RECT  rcScrollBar;
+    int   dxyLineButton;
+    int   xyThumbTop;
+    int   xyThumbBottom;
+    int   reserved;
+    DWORD rgstate[CCHILDREN_SCROLLBAR+1];
+} SCROLLBARINFO, *PSCROLLBARINFO, *LPSCROLLBARINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetScrollBarInfo(
+    IN HWND hwnd,
+    IN LONG idObject,
+    OUT PSCROLLBARINFO psbi
+);
+
+/*
+ * Combobox information
+ */
+typedef struct tagCOMBOBOXINFO
+{
+    DWORD cbSize;
+    RECT  rcItem;
+    RECT  rcButton;
+    DWORD stateButton;
+    HWND  hwndCombo;
+    HWND  hwndItem;
+    HWND  hwndList;
+} COMBOBOXINFO, *PCOMBOBOXINFO, *LPCOMBOBOXINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetComboBoxInfo(
+    IN HWND hwndCombo,
+    OUT PCOMBOBOXINFO pcbi
+);
+
+/*
+ * The "real" ancestor window
+ */
+#define     GA_PARENT       1
+#define     GA_ROOT         2
+#define     GA_ROOTOWNER    3
+
+WINUSERAPI
+HWND
+WINAPI
+GetAncestor(
+    IN HWND hwnd,
+    IN UINT gaFlags
+);
+
+
+/*
+ * This gets the REAL child window at the point.  If it is in the dead
+ * space of a group box, it will try a sibling behind it.  But static
+ * fields will get returned.  In other words, it is kind of a cross between
+ * ChildWindowFromPointEx and WindowFromPoint.
+ */
+WINUSERAPI
+HWND
+WINAPI
+RealChildWindowFromPoint(
+    IN HWND hwndParent,
+    IN POINT ptParentClientCoords
+);
+
+
+/*
+ * This gets the name of the window TYPE, not class.  This allows us to
+ * recognize ThunderButton32 et al.
+ */
+WINUSERAPI
+UINT
+WINAPI
+RealGetWindowClassA(
+    IN HWND  hwnd,
+    OUT LPSTR pszType,
+    IN UINT  cchType
+);
+/*
+ * This gets the name of the window TYPE, not class.  This allows us to
+ * recognize ThunderButton32 et al.
+ */
+WINUSERAPI
+UINT
+WINAPI
+RealGetWindowClassW(
+    IN HWND  hwnd,
+    OUT LPWSTR pszType,
+    IN UINT  cchType
+);
+#ifdef UNICODE
+#define RealGetWindowClass  RealGetWindowClassW
+#else
+#define RealGetWindowClass  RealGetWindowClassA
+#endif // !UNICODE
+
+/*
+ * Alt-Tab Switch window information.
+ */
+typedef struct tagALTTABINFO
+{
+    DWORD cbSize;
+    int   cItems;
+    int   cColumns;
+    int   cRows;
+    int   iColFocus;
+    int   iRowFocus;
+    int   cxItem;
+    int   cyItem;
+    POINT ptStart;
+} ALTTABINFO, *PALTTABINFO, *LPALTTABINFO;
+
+WINUSERAPI
+BOOL
+WINAPI
+GetAltTabInfoA(
+    IN HWND hwnd,
+    IN int iItem,
+    OUT PALTTABINFO pati,
+    OUT LPSTR pszItemText,
+    IN UINT cchItemText
+);
+WINUSERAPI
+BOOL
+WINAPI
+GetAltTabInfoW(
+    IN HWND hwnd,
+    IN int iItem,
+    OUT PALTTABINFO pati,
+    OUT LPWSTR pszItemText,
+    IN UINT cchItemText
+);
+#ifdef UNICODE
+#define GetAltTabInfo  GetAltTabInfoW
+#else
+#define GetAltTabInfo  GetAltTabInfoA
+#endif // !UNICODE
+
+/*
+ * Listbox information.
+ * Returns the number of items per row.
+ */
+WINUSERAPI
+DWORD
+WINAPI
+GetListBoxInfo(
+    IN HWND hwnd
+);
+
+#endif /* NOWINABLE */
+#endif /* WINVER >= 0x0500 */
+
+
+#if(_WIN32_WINNT >= 0x0500)
+WINUSERAPI
+BOOL
+WINAPI
+LockWorkStation(
+    VOID);
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0500)
+
+WINUSERAPI
+BOOL
+WINAPI
+UserHandleGrantAccess(
+    HANDLE hUserHandle,
+    HANDLE hJob,
+    BOOL   bGrant);
+
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#if(_WIN32_WINNT >= 0x0501)
+
+/*
+ * Raw Input Messages.
+ */
+
+DECLARE_HANDLE(HRAWINPUT);
+
+/*
+ * WM_INPUT wParam
+ */
+
+/*
+ * Use this macro to get the input code from wParam.
+ */
+#define GET_RAWINPUT_CODE_WPARAM(wParam)    ((wParam) & 0xff)
+
+/*
+ * The input is in the regular message flow,
+ * the app is required to call DefWindowProc
+ * so that the system can perform clean ups.
+ */
+#define RIM_INPUT       0
+
+/*
+ * The input is sink only. The app is expected
+ * to behave nicely.
+ */
+#define RIM_INPUTSINK   1
+
+
+/*
+ * Raw Input data header
+ */
+typedef struct tagRAWINPUTHEADER {
+    DWORD dwType;
+    DWORD dwSize;
+    HANDLE hDevice;
+    WPARAM wParam;
+} RAWINPUTHEADER, *PRAWINPUTHEADER, *LPRAWINPUTHEADER;
+
+/*
+ * Type of the raw input
+ */
+#define RIM_TYPEMOUSE       0
+#define RIM_TYPEKEYBOARD    1
+#define RIM_TYPEHID         2
+
+/*
+ * Raw format of the mouse input
+ */
+typedef struct tagRAWMOUSE {
+    /*
+     * Indicator flags.
+     */
+    USHORT usFlags;
+
+    /*
+     * The transition state of the mouse buttons.
+     */
+    union {
+        ULONG ulButtons;
+        struct  {
+            USHORT  usButtonFlags;
+            USHORT  usButtonData;
+        };
+    };
+
+
+    /*
+     * The raw state of the mouse buttons.
+     */
+    ULONG ulRawButtons;
+
+    /*
+     * The signed relative or absolute motion in the X direction.
+     */
+    LONG lLastX;
+
+    /*
+     * The signed relative or absolute motion in the Y direction.
+     */
+    LONG lLastY;
+
+    /*
+     * Device-specific additional information for the event.
+     */
+    ULONG ulExtraInformation;
+
+} RAWMOUSE, *PRAWMOUSE, *LPRAWMOUSE;
+
+/*
+ * Define the mouse button state indicators.
+ */
+
+#define RI_MOUSE_LEFT_BUTTON_DOWN   0x0001  // Left Button changed to down.
+#define RI_MOUSE_LEFT_BUTTON_UP     0x0002  // Left Button changed to up.
+#define RI_MOUSE_RIGHT_BUTTON_DOWN  0x0004  // Right Button changed to down.
+#define RI_MOUSE_RIGHT_BUTTON_UP    0x0008  // Right Button changed to up.
+#define RI_MOUSE_MIDDLE_BUTTON_DOWN 0x0010  // Middle Button changed to down.
+#define RI_MOUSE_MIDDLE_BUTTON_UP   0x0020  // Middle Button changed to up.
+
+#define RI_MOUSE_BUTTON_1_DOWN      RI_MOUSE_LEFT_BUTTON_DOWN
+#define RI_MOUSE_BUTTON_1_UP        RI_MOUSE_LEFT_BUTTON_UP
+#define RI_MOUSE_BUTTON_2_DOWN      RI_MOUSE_RIGHT_BUTTON_DOWN
+#define RI_MOUSE_BUTTON_2_UP        RI_MOUSE_RIGHT_BUTTON_UP
+#define RI_MOUSE_BUTTON_3_DOWN      RI_MOUSE_MIDDLE_BUTTON_DOWN
+#define RI_MOUSE_BUTTON_3_UP        RI_MOUSE_MIDDLE_BUTTON_UP
+
+#define RI_MOUSE_BUTTON_4_DOWN      0x0040
+#define RI_MOUSE_BUTTON_4_UP        0x0080
+#define RI_MOUSE_BUTTON_5_DOWN      0x0100
+#define RI_MOUSE_BUTTON_5_UP        0x0200
+
+/*
+ * If usButtonFlags has RI_MOUSE_WHEEL, the wheel delta is stored in usButtonData.
+ * Take it as a signed value.
+ */
+#define RI_MOUSE_WHEEL              0x0400
+
+/*
+ * Define the mouse indicator flags.
+ */
+#define MOUSE_MOVE_RELATIVE         0
+#define MOUSE_MOVE_ABSOLUTE         1
+#define MOUSE_VIRTUAL_DESKTOP    0x02  // the coordinates are mapped to the virtual desktop
+#define MOUSE_ATTRIBUTES_CHANGED 0x04  // requery for mouse attributes
+
+
+/*
+ * Raw format of the keyboard input
+ */
+typedef struct tagRAWKEYBOARD {
+    /*
+     * The "make" scan code (key depression).
+     */
+    USHORT MakeCode;
+
+    /*
+     * The flags field indicates a "break" (key release) and other
+     * miscellaneous scan code information defined in ntddkbd.h.
+     */
+    USHORT Flags;
+
+    USHORT Reserved;
+
+    /*
+     * Windows message compatible information
+     */
+    USHORT VKey;
+    UINT   Message;
+
+    /*
+     * Device-specific additional information for the event.
+     */
+    ULONG ExtraInformation;
+
+
+} RAWKEYBOARD, *PRAWKEYBOARD, *LPRAWKEYBOARD;
+
+
+/*
+ * Define the keyboard overrun MakeCode.
+ */
+
+#define KEYBOARD_OVERRUN_MAKE_CODE    0xFF
+
+/*
+ * Define the keyboard input data Flags.
+ */
+#define RI_KEY_MAKE             0
+#define RI_KEY_BREAK            1
+#define RI_KEY_E0               2
+#define RI_KEY_E1               4
+#define RI_KEY_TERMSRV_SET_LED  8
+#define RI_KEY_TERMSRV_SHADOW   0x10
+
+
+/*
+ * Raw format of the input from Human Input Devices
+ */
+typedef struct tagRAWHID {
+    DWORD dwSizeHid;    // byte size of each report
+    DWORD dwCount;      // number of input packed
+    BYTE bRawData[1];
+} RAWHID, *PRAWHID, *LPRAWHID;
+
+/*
+ * RAWINPUT data structure.
+ */
+typedef struct tagRAWINPUT {
+    RAWINPUTHEADER header;
+    union {
+        RAWMOUSE    mouse;
+        RAWKEYBOARD keyboard;
+        RAWHID      hid;
+    } data;
+} RAWINPUT, *PRAWINPUT, *LPRAWINPUT;
+
+#ifdef _WIN64
+#define RAWINPUT_ALIGN(x)   (((x) + sizeof(QWORD) - 1) & ~(sizeof(QWORD) - 1))
+#else   // _WIN64
+#define RAWINPUT_ALIGN(x)   (((x) + sizeof(DWORD) - 1) & ~(sizeof(DWORD) - 1))
+#endif  // _WIN64
+
+#define NEXTRAWINPUTBLOCK(ptr) ((PRAWINPUT)RAWINPUT_ALIGN((ULONG_PTR)((PBYTE)(ptr) + (ptr)->header.dwSize)))
+
+/*
+ * Flags for GetRawInputData
+ */
+
+#define RID_INPUT               0x10000003
+#define RID_HEADER              0x10000005
+
+WINUSERAPI
+UINT
+WINAPI
+GetRawInputData(
+    IN HRAWINPUT    hRawInput,
+    IN UINT         uiCommand,
+    OUT LPVOID      pData,
+    IN OUT PUINT    pcbSize,
+    IN UINT         cbSizeHeader);
+
+/*
+ * Raw Input Device Information
+ */
+#define RIDI_PREPARSEDDATA      0x20000005
+#define RIDI_DEVICENAME         0x20000007  // the return valus is the character length, not the byte size
+#define RIDI_DEVICEINFO         0x2000000b
+
+typedef struct tagRID_DEVICE_INFO_MOUSE {
+    DWORD dwId;
+    DWORD dwNumberOfButtons;
+    DWORD dwSampleRate;
+} RID_DEVICE_INFO_MOUSE, *PRID_DEVICE_INFO_MOUSE;
+
+typedef struct tagRID_DEVICE_INFO_KEYBOARD {
+    DWORD dwType;
+    DWORD dwSubType;
+    DWORD dwKeyboardMode;
+    DWORD dwNumberOfFunctionKeys;
+    DWORD dwNumberOfIndicators;
+    DWORD dwNumberOfKeysTotal;
+} RID_DEVICE_INFO_KEYBOARD, *PRID_DEVICE_INFO_KEYBOARD;
+
+typedef struct tagRID_DEVICE_INFO_HID {
+    DWORD dwVendorId;
+    DWORD dwProductId;
+    DWORD dwVersionNumber;
+
+    /*
+     * Top level collection UsagePage and Usage
+     */
+    USHORT usUsagePage;
+    USHORT usUsage;
+} RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID;
+
+typedef struct tagRID_DEVICE_INFO {
+    DWORD cbSize;
+    DWORD dwType;
+    union {
+        RID_DEVICE_INFO_MOUSE mouse;
+        RID_DEVICE_INFO_KEYBOARD keyboard;
+        RID_DEVICE_INFO_HID hid;
+    };
+} RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO;
+
+WINUSERAPI
+UINT
+WINAPI
+GetRawInputDeviceInfoA(
+    IN HANDLE hDevice,
+    IN UINT uiCommand,
+    OUT LPVOID pData,
+    IN OUT PUINT pcbSize);
+WINUSERAPI
+UINT
+WINAPI
+GetRawInputDeviceInfoW(
+    IN HANDLE hDevice,
+    IN UINT uiCommand,
+    OUT LPVOID pData,
+    IN OUT PUINT pcbSize);
+#ifdef UNICODE
+#define GetRawInputDeviceInfo  GetRawInputDeviceInfoW
+#else
+#define GetRawInputDeviceInfo  GetRawInputDeviceInfoA
+#endif // !UNICODE
+
+
+/*
+ * Raw Input Bulk Read: GetRawInputBuffer
+ */
+WINUSERAPI
+UINT
+WINAPI
+GetRawInputBuffer(
+    OUT PRAWINPUT   pData,
+    IN OUT PUINT    pcbSize,
+    IN UINT         cbSizeHeader);
+
+/*
+ * Raw Input request APIs
+ */
+typedef struct tagRAWINPUTDEVICE {
+    USHORT usUsagePage; // Toplevel collection UsagePage
+    USHORT usUsage;     // Toplevel collection Usage
+    DWORD dwFlags;
+    HWND hwndTarget;    // Target hwnd. NULL = follows keyboard focus
+} RAWINPUTDEVICE, *PRAWINPUTDEVICE, *LPRAWINPUTDEVICE;
+
+typedef CONST RAWINPUTDEVICE* PCRAWINPUTDEVICE;
+
+#define RIDEV_REMOVE            0x00000001
+#define RIDEV_EXCLUDE           0x00000010
+#define RIDEV_PAGEONLY          0x00000020
+#define RIDEV_NOLEGACY          0x00000030
+#define RIDEV_INPUTSINK         0x00000100
+#define RIDEV_CAPTUREMOUSE      0x00000200  // effective when mouse nolegacy is specified, otherwise it would be an error
+#define RIDEV_NOHOTKEYS         0x00000200  // effective for keyboard.
+#define RIDEV_APPKEYS           0x00000400  // effective for keyboard.
+#define RIDEV_EXMODEMASK        0x000000F0
+
+#define RIDEV_EXMODE(mode)  ((mode) & RIDEV_EXMODEMASK)
+
+WINUSERAPI
+BOOL
+WINAPI
+RegisterRawInputDevices(
+    IN PCRAWINPUTDEVICE pRawInputDevices,
+    IN UINT uiNumDevices,
+    IN UINT cbSize);
+
+WINUSERAPI
+UINT
+WINAPI
+GetRegisteredRawInputDevices(
+    OUT PRAWINPUTDEVICE pRawInputDevices,
+    IN OUT PUINT puiNumDevices,
+    IN UINT cbSize);
+
+
+typedef struct tagRAWINPUTDEVICELIST {
+    HANDLE hDevice;
+    DWORD dwType;
+} RAWINPUTDEVICELIST, *PRAWINPUTDEVICELIST;
+
+WINUSERAPI
+UINT
+WINAPI
+GetRawInputDeviceList(
+    OUT PRAWINPUTDEVICELIST pRawInputDeviceList,
+    IN OUT PUINT puiNumDevices,
+    IN UINT cbSize);
+
+
+WINUSERAPI
+LRESULT
+WINAPI
+DefRawInputProc(
+    IN PRAWINPUT* paRawInput,
+    IN INT nInput,
+    IN UINT cbSizeHeader);
+
+
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+
+
+
+#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
+#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
+#include "winuser.inl"
+#endif /* ISOLATION_AWARE_ENABLED */
+#endif /* RC */
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif /* !_WINUSER_ */
+
+
+
+
diff --git a/base/Windows/Inc/WinVer.h b/base/Windows/Inc/WinVer.h
new file mode 100644
index 0000000..c236b20
--- /dev/null
+++ b/base/Windows/Inc/WinVer.h
@@ -0,0 +1,304 @@
+/*****************************************************************************\
+*                                                                             *
+* winver.h -    Version management functions, types, and definitions          *
+*                                                                             *
+*               Include file for VER.DLL.  This library is                    *
+*               designed to allow version stamping of Windows executable files*
+*               and of special .VER files for DOS executable files.           *
+*                                                                             *
+*               Copyright (c) Microsoft Corporation. All rights reserved.     *
+*                                                                             *
+\*****************************************************************************/
+
+#ifndef VER_H
+#define VER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ----- Symbols ----- */
+#define VS_FILE_INFO            RT_VERSION
+#define VS_VERSION_INFO         1
+#define VS_USER_DEFINED         100
+
+/* ----- VS_VERSION.dwFileFlags ----- */
+#ifndef _MAC
+#define VS_FFI_SIGNATURE        0xFEEF04BDL
+#else
+#define VS_FFI_SIGNATURE        0xBD04EFFEL
+#endif
+#define VS_FFI_STRUCVERSION     0x00010000L
+#define VS_FFI_FILEFLAGSMASK    0x0000003FL
+
+/* ----- VS_VERSION.dwFileFlags ----- */
+#define VS_FF_DEBUG             0x00000001L
+#define VS_FF_PRERELEASE        0x00000002L
+#define VS_FF_PATCHED           0x00000004L
+#define VS_FF_PRIVATEBUILD      0x00000008L
+#define VS_FF_INFOINFERRED      0x00000010L
+#define VS_FF_SPECIALBUILD      0x00000020L
+
+/* ----- VS_VERSION.dwFileOS ----- */
+#define VOS_UNKNOWN             0x00000000L
+#define VOS_DOS                 0x00010000L
+#define VOS_OS216               0x00020000L
+#define VOS_OS232               0x00030000L
+#define VOS_NT                  0x00040000L
+#define VOS_WINCE               0x00050000L
+
+#define VOS__BASE               0x00000000L
+#define VOS__WINDOWS16          0x00000001L
+#define VOS__PM16               0x00000002L
+#define VOS__PM32               0x00000003L
+#define VOS__WINDOWS32          0x00000004L
+
+#define VOS_DOS_WINDOWS16       0x00010001L
+#define VOS_DOS_WINDOWS32       0x00010004L
+#define VOS_OS216_PM16          0x00020002L
+#define VOS_OS232_PM32          0x00030003L
+#define VOS_NT_WINDOWS32        0x00040004L
+
+/* ----- VS_VERSION.dwFileType ----- */
+#define VFT_UNKNOWN             0x00000000L
+#define VFT_APP                 0x00000001L
+#define VFT_DLL                 0x00000002L
+#define VFT_DRV                 0x00000003L
+#define VFT_FONT                0x00000004L
+#define VFT_VXD                 0x00000005L
+#define VFT_STATIC_LIB          0x00000007L
+
+/* ----- VS_VERSION.dwFileSubtype for VFT_WINDOWS_DRV ----- */
+#define VFT2_UNKNOWN            0x00000000L
+#define VFT2_DRV_PRINTER        0x00000001L
+#define VFT2_DRV_KEYBOARD       0x00000002L
+#define VFT2_DRV_LANGUAGE       0x00000003L
+#define VFT2_DRV_DISPLAY        0x00000004L
+#define VFT2_DRV_MOUSE          0x00000005L
+#define VFT2_DRV_NETWORK        0x00000006L
+#define VFT2_DRV_SYSTEM         0x00000007L
+#define VFT2_DRV_INSTALLABLE    0x00000008L
+#define VFT2_DRV_SOUND          0x00000009L
+#define VFT2_DRV_COMM           0x0000000AL
+#define VFT2_DRV_INPUTMETHOD    0x0000000BL
+#define VFT2_DRV_VERSIONED_PRINTER    0x0000000CL
+
+/* ----- VS_VERSION.dwFileSubtype for VFT_WINDOWS_FONT ----- */
+#define VFT2_FONT_RASTER        0x00000001L
+#define VFT2_FONT_VECTOR        0x00000002L
+#define VFT2_FONT_TRUETYPE      0x00000003L
+
+/* ----- VerFindFile() flags ----- */
+#define VFFF_ISSHAREDFILE       0x0001
+
+#define VFF_CURNEDEST           0x0001
+#define VFF_FILEINUSE           0x0002
+#define VFF_BUFFTOOSMALL        0x0004
+
+/* ----- VerInstallFile() flags ----- */
+#define VIFF_FORCEINSTALL       0x0001
+#define VIFF_DONTDELETEOLD      0x0002
+
+#define VIF_TEMPFILE            0x00000001L
+#define VIF_MISMATCH            0x00000002L
+#define VIF_SRCOLD              0x00000004L
+
+#define VIF_DIFFLANG            0x00000008L
+#define VIF_DIFFCODEPG          0x00000010L
+#define VIF_DIFFTYPE            0x00000020L
+
+#define VIF_WRITEPROT           0x00000040L
+#define VIF_FILEINUSE           0x00000080L
+#define VIF_OUTOFSPACE          0x00000100L
+#define VIF_ACCESSVIOLATION     0x00000200L
+#define VIF_SHARINGVIOLATION    0x00000400L
+#define VIF_CANNOTCREATE        0x00000800L
+#define VIF_CANNOTDELETE        0x00001000L
+#define VIF_CANNOTRENAME        0x00002000L
+#define VIF_CANNOTDELETECUR     0x00004000L
+#define VIF_OUTOFMEMORY         0x00008000L
+
+#define VIF_CANNOTREADSRC       0x00010000L
+#define VIF_CANNOTREADDST       0x00020000L
+
+#define VIF_BUFFTOOSMALL        0x00040000L
+#define VIF_CANNOTLOADLZ32      0x00080000L
+#define VIF_CANNOTLOADCABINET   0x00100000L
+
+#ifndef RC_INVOKED              /* RC doesn't need to see the rest of this */
+
+/* ----- Types and structures ----- */
+
+typedef struct tagVS_FIXEDFILEINFO
+{
+    DWORD   dwSignature;            /* e.g. 0xfeef04bd */
+    DWORD   dwStrucVersion;         /* e.g. 0x00000042 = "0.42" */
+    DWORD   dwFileVersionMS;        /* e.g. 0x00030075 = "3.75" */
+    DWORD   dwFileVersionLS;        /* e.g. 0x00000031 = "0.31" */
+    DWORD   dwProductVersionMS;     /* e.g. 0x00030010 = "3.10" */
+    DWORD   dwProductVersionLS;     /* e.g. 0x00000031 = "0.31" */
+    DWORD   dwFileFlagsMask;        /* = 0x3F for version "0.42" */
+    DWORD   dwFileFlags;            /* e.g. VFF_DEBUG | VFF_PRERELEASE */
+    DWORD   dwFileOS;               /* e.g. VOS_DOS_WINDOWS16 */
+    DWORD   dwFileType;             /* e.g. VFT_DRIVER */
+    DWORD   dwFileSubtype;          /* e.g. VFT2_DRV_KEYBOARD */
+    DWORD   dwFileDateMS;           /* e.g. 0 */
+    DWORD   dwFileDateLS;           /* e.g. 0 */
+} VS_FIXEDFILEINFO;
+
+/* ----- Function prototypes ----- */
+
+DWORD
+APIENTRY
+VerFindFileA(
+        DWORD uFlags,
+        LPSTR szFileName,
+        LPSTR szWinDir,
+        LPSTR szAppDir,
+        LPSTR szCurDir,
+        PUINT lpuCurDirLen,
+        LPSTR szDestDir,
+        PUINT lpuDestDirLen
+        );
+DWORD
+APIENTRY
+VerFindFileW(
+        DWORD uFlags,
+        LPWSTR szFileName,
+        LPWSTR szWinDir,
+        LPWSTR szAppDir,
+        LPWSTR szCurDir,
+        PUINT lpuCurDirLen,
+        LPWSTR szDestDir,
+        PUINT lpuDestDirLen
+        );
+#ifdef UNICODE
+#define VerFindFile  VerFindFileW
+#else
+#define VerFindFile  VerFindFileA
+#endif // !UNICODE
+
+DWORD
+APIENTRY
+VerInstallFileA(
+        DWORD uFlags,
+        LPSTR szSrcFileName,
+        LPSTR szDestFileName,
+        LPSTR szSrcDir,
+        LPSTR szDestDir,
+        LPSTR szCurDir,
+        LPSTR szTmpFile,
+        PUINT lpuTmpFileLen
+        );
+DWORD
+APIENTRY
+VerInstallFileW(
+        DWORD uFlags,
+        LPWSTR szSrcFileName,
+        LPWSTR szDestFileName,
+        LPWSTR szSrcDir,
+        LPWSTR szDestDir,
+        LPWSTR szCurDir,
+        LPWSTR szTmpFile,
+        PUINT lpuTmpFileLen
+        );
+#ifdef UNICODE
+#define VerInstallFile  VerInstallFileW
+#else
+#define VerInstallFile  VerInstallFileA
+#endif // !UNICODE
+
+/* Returns size of version info in bytes */
+DWORD
+APIENTRY
+GetFileVersionInfoSizeA(
+        LPCSTR lptstrFilename, /* Filename of version stamped file */
+        LPDWORD lpdwHandle
+        );                      /* Information for use by GetFileVersionInfo */
+/* Returns size of version info in bytes */
+DWORD
+APIENTRY
+GetFileVersionInfoSizeW(
+        LPCWSTR lptstrFilename, /* Filename of version stamped file */
+        LPDWORD lpdwHandle
+        );                      /* Information for use by GetFileVersionInfo */
+#ifdef UNICODE
+#define GetFileVersionInfoSize  GetFileVersionInfoSizeW
+#else
+#define GetFileVersionInfoSize  GetFileVersionInfoSizeA
+#endif // !UNICODE
+
+/* Read version info into buffer */
+BOOL
+APIENTRY
+GetFileVersionInfoA(
+        LPCSTR lptstrFilename, /* Filename of version stamped file */
+        DWORD dwHandle,         /* Information from GetFileVersionSize */
+        DWORD dwLen,            /* Length of buffer for info */
+        LPVOID lpData
+        );                      /* Buffer to place the data structure */
+/* Read version info into buffer */
+BOOL
+APIENTRY
+GetFileVersionInfoW(
+        LPCWSTR lptstrFilename, /* Filename of version stamped file */
+        DWORD dwHandle,         /* Information from GetFileVersionSize */
+        DWORD dwLen,            /* Length of buffer for info */
+        LPVOID lpData
+        );                      /* Buffer to place the data structure */
+#ifdef UNICODE
+#define GetFileVersionInfo  GetFileVersionInfoW
+#else
+#define GetFileVersionInfo  GetFileVersionInfoA
+#endif // !UNICODE
+
+DWORD
+APIENTRY
+VerLanguageNameA(
+        DWORD wLang,
+        LPSTR szLang,
+        DWORD nSize
+        );
+DWORD
+APIENTRY
+VerLanguageNameW(
+        DWORD wLang,
+        LPWSTR szLang,
+        DWORD nSize
+        );
+#ifdef UNICODE
+#define VerLanguageName  VerLanguageNameW
+#else
+#define VerLanguageName  VerLanguageNameA
+#endif // !UNICODE
+
+BOOL
+APIENTRY
+VerQueryValueA(
+        const LPVOID pBlock,
+        LPSTR lpSubBlock,
+        LPVOID * lplpBuffer,
+        PUINT puLen
+        );
+BOOL
+APIENTRY
+VerQueryValueW(
+        const LPVOID pBlock,
+        LPWSTR lpSubBlock,
+        LPVOID * lplpBuffer,
+        PUINT puLen
+        );
+#ifdef UNICODE
+#define VerQueryValue  VerQueryValueW
+#else
+#define VerQueryValue  VerQueryValueA
+#endif // !UNICODE
+
+#endif  /* !RC_INVOKED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* !VER_H */
+
diff --git a/base/Windows/Inc/Windows.h b/base/Windows/Inc/Windows.h
new file mode 100644
index 0000000..ab6f2a2
--- /dev/null
+++ b/base/Windows/Inc/Windows.h
@@ -0,0 +1,258 @@
+
+/*++ BUILD Version: 0001    Increment this if a change has global effects
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+
+    windows.h
+
+Abstract:
+
+    Master include file for Windows applications.
+
+--*/
+
+#ifndef _WINDOWS_
+#define _WINDOWS_
+
+
+#ifndef WINVER
+#define WINVER 0x0501
+#else
+#if defined(_WIN32_WINNT) && (WINVER < 0x0400) && (_WIN32_WINNT > 0x0400)
+#error WINVER setting conflicts with _WIN32_WINNT setting
+#endif
+#endif
+
+#ifndef _INC_WINDOWS
+#define _INC_WINDOWS
+
+#if defined (_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/*  If defined, the following flags inhibit definition
+ *     of the indicated items.
+ *
+ *  NOGDICAPMASKS     - CC_*, LC_*, PC_*, CP_*, TC_*, RC_
+ *  NOVIRTUALKEYCODES - VK_*
+ *  NOWINMESSAGES     - WM_*, EM_*, LB_*, CB_*
+ *  NOWINSTYLES       - WS_*, CS_*, ES_*, LBS_*, SBS_*, CBS_*
+ *  NOSYSMETRICS      - SM_*
+ *  NOMENUS           - MF_*
+ *  NOICONS           - IDI_*
+ *  NOKEYSTATES       - MK_*
+ *  NOSYSCOMMANDS     - SC_*
+ *  NORASTEROPS       - Binary and Tertiary raster ops
+ *  NOSHOWWINDOW      - SW_*
+ *  OEMRESOURCE       - OEM Resource values
+ *  NOATOM            - Atom Manager routines
+ *  NOCLIPBOARD       - Clipboard routines
+ *  NOCOLOR           - Screen colors
+ *  NOCTLMGR          - Control and Dialog routines
+ *  NODRAWTEXT        - DrawText() and DT_*
+ *  NOGDI             - All GDI defines and routines
+ *  NOKERNEL          - All KERNEL defines and routines
+ *  NOUSER            - All USER defines and routines
+ *  NONLS             - All NLS defines and routines
+ *  NOMB              - MB_* and MessageBox()
+ *  NOMEMMGR          - GMEM_*, LMEM_*, GHND, LHND, associated routines
+ *  NOMETAFILE        - typedef METAFILEPICT
+ *  NOMINMAX          - Macros min(a,b) and max(a,b)
+ *  NOMSG             - typedef MSG and associated routines
+ *  NOOPENFILE        - OpenFile(), OemToAnsi, AnsiToOem, and OF_*
+ *  NOSCROLL          - SB_* and scrolling routines
+ *  NOSERVICE         - All Service Controller routines, SERVICE_ equates, etc.
+ *  NOSOUND           - Sound driver routines
+ *  NOTEXTMETRIC      - typedef TEXTMETRIC and associated routines
+ *  NOWH              - SetWindowsHook and WH_*
+ *  NOWINOFFSETS      - GWL_*, GCL_*, associated routines
+ *  NOCOMM            - COMM driver routines
+ *  NOKANJI           - Kanji support stuff.
+ *  NOHELP            - Help engine interface.
+ *  NOPROFILER        - Profiler interface.
+ *  NODEFERWINDOWPOS  - DeferWindowPos routines
+ *  NOMCX             - Modem Configuration Extensions
+ */
+
+#if defined(RC_INVOKED) && !defined(NOWINRES)
+
+#include <winresrc.h>
+
+#else
+
+#if defined(RC_INVOKED)
+/* Turn off a bunch of stuff to ensure that RC files compile OK. */
+#define NOATOM
+#define NOGDI
+#define NOGDICAPMASKS
+#define NOMETAFILE
+#define NOMINMAX
+#define NOMSG
+#define NOOPENFILE
+#define NORASTEROPS
+#define NOSCROLL
+#define NOSOUND
+#define NOSYSMETRICS
+#define NOTEXTMETRIC
+#define NOWH
+#define NOCOMM
+#define NOKANJI
+#define NOCRYPT
+#define NOMCX
+#endif
+
+#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_IX86)
+#define _X86_
+#endif
+
+#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_AMD64)
+#define _AMD64_
+#endif
+
+#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_M68K)
+#define _68K_
+#endif
+
+#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_MPPC)
+#define _MPPC_
+#endif
+
+#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_M_IX86) && !defined(_AMD64_) && defined(_M_IA64)
+#if !defined(_IA64_)
+#define _IA64_
+#endif // !_IA64_
+#endif
+
+#ifndef _MAC
+#if defined(_68K_) || defined(_MPPC_)
+#define _MAC
+#endif
+#endif
+
+#if defined (_MSC_VER)
+#if ( _MSC_VER >= 800 )
+#ifndef __cplusplus
+#pragma warning(disable:4116)       // TYPE_ALIGNMENT generates this - move it
+                                    // outside the warning push/pop scope.
+#endif
+#endif
+#endif
+
+#ifndef RC_INVOKED
+#if     ( _MSC_VER >= 800 )
+#pragma warning(disable:4514)
+#ifndef __WINDOWS_DONT_DISABLE_PRAGMA_PACK_WARNING__
+#pragma warning(disable:4103)
+#endif
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4001)
+#pragma warning(disable:4201)
+#pragma warning(disable:4214)
+#endif
+#include <excpt.h>
+#include <stdarg.h>
+#endif /* RC_INVOKED */
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#if !defined(_MAC) || defined(_WIN32NLS)
+#include <winnls.h>
+#endif
+#ifndef _MAC
+#include <wincon.h>
+#include <winver.h>
+#endif
+#if !defined(_MAC) || defined(_WIN32REG)
+#include <winreg.h>
+#endif
+#ifndef _MAC
+#include <winnetwk.h>
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#include <cderr.h>
+#include <dde.h>
+#include <ddeml.h>
+#include <dlgs.h>
+#ifndef _MAC
+#include <lzexpand.h>
+#include <mmsystem.h>
+#include <nb30.h>
+#include <rpc.h>
+#endif
+#include <shellapi.h>
+#ifndef _MAC
+#include <winperf.h>
+#include <winsock.h>
+#endif
+#ifndef NOCRYPT
+#include <wincrypt.h>
+#include <winefs.h>
+#include <winscard.h>
+#endif
+
+#ifndef NOGDI
+#ifndef _MAC
+#include <winspool.h>
+#ifdef INC_OLE1
+#include <ole.h>
+#else
+#include <ole2.h>
+#endif /* !INC_OLE1 */
+#endif /* !MAC */
+#include <commdlg.h>
+#endif /* !NOGDI */
+#endif /* WIN32_LEAN_AND_MEAN */
+
+#include <stralign.h>
+
+#ifdef _MAC
+#include <winwlm.h>
+#endif
+
+
+#ifdef INC_OLE2
+#include <ole2.h>
+#endif /* INC_OLE2 */
+
+#ifndef _MAC
+#ifndef NOSERVICE
+#include <winsvc.h>
+#endif
+
+#if(WINVER >= 0x0400)
+#ifndef NOMCX
+#include <mcx.h>
+#endif /* NOMCX */
+
+#ifndef NOIME
+#include <imm.h>
+#endif
+#endif /* WINVER >= 0x0400 */
+#endif
+
+#ifndef RC_INVOKED
+#if     ( _MSC_VER >= 800 )
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4001)
+#pragma warning(default:4201)
+#pragma warning(default:4214)
+/* Leave 4514 disabled.  It's an unneeded warning anyway. */
+#endif
+#endif
+#endif /* RC_INVOKED */
+
+#endif /* RC_INVOKED */
+
+#endif /* _INC_WINDOWS */
+#endif /* _WINDOWS_ */
+
diff --git a/base/Windows/Inc/assert.h b/base/Windows/Inc/assert.h
new file mode 100644
index 0000000..1d70170
--- /dev/null
+++ b/base/Windows/Inc/assert.h
@@ -0,0 +1,36 @@
+/***
+*assert.h - define the assert macro
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       Defines the assert(exp) macro.
+*       [ANSI/System V]
+*
+*       [Public]
+*
+****/
+
+#include <crtdefs.h>
+
+#undef  assert
+
+#ifdef  NDEBUG
+
+#define assert(_Expression)     ((void)0)
+
+#else
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+_CRTIMP void __cdecl _wassert(__in_z const wchar_t * _Message, __in_z const wchar_t *_File, __in unsigned _Line);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#define assert(_Expression) (void)( (!!(_Expression)) || (_wassert(_CRT_WIDE(#_Expression), _CRT_WIDE(__FILE__), __LINE__), 0) )
+
+#endif  /* NDEBUG */
diff --git a/base/Windows/Inc/crtdefs.h b/base/Windows/Inc/crtdefs.h
new file mode 100644
index 0000000..9359119
--- /dev/null
+++ b/base/Windows/Inc/crtdefs.h
@@ -0,0 +1,1789 @@
+/***
+*crtdefs.h - definitions/declarations common to all CRT
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file has mostly defines used by the entire CRT.
+*
+*       [Public]
+*
+****/
+
+/* Lack of pragma once is deliberate */
+
+/* Define _CRTIMP */ 
+#ifndef _CRTIMP
+#ifdef  _DLL
+#define _CRTIMP __declspec(dllimport)
+#else   /* ndef _DLL */
+#define _CRTIMP
+#endif  /* _DLL */
+#endif  /* _CRTIMP */
+
+#ifndef _INC_CRTDEFS
+#define _INC_CRTDEFS
+
+
+
+#if defined(__midl)
+/* MIDL does not want to see this stuff */
+#undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 
+#undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 
+#undef _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 0
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 0
+#define _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 0
+#endif
+
+#if     !defined(_WIN32)
+#error ERROR: Only Win32 target supported!
+#endif
+
+
+#ifdef _CRT_NOFORCE_MANIFEST
+
+    #ifdef _CRT_FORCE_MANIFEST
+        #pragma message ("_CRT_FORCE_MANIFEST and _CRT_NOFORCE_MANIFEST defined. Define just one")
+        #pragma message ("_CRT_FORCE_MANIFEST ignored")
+    #endif
+
+#else
+
+    #if !defined(_CRT_FORCE_MANIFEST) && defined(_VC_NODEFAULTLIB)
+        #define _CRT_NOFORCE_MANIFEST
+    #endif
+
+#endif
+
+#include <sal.h>
+
+#ifdef _DLL
+
+#if !defined(_CRT_NOFORCE_MANIFEST)
+
+#ifdef _DEBUG
+#ifdef _CRT_MANIFEST_RETAIL
+#define _CRT_MANIFEST_INCONSISTENT
+#else
+#define _CRT_MANIFEST_DEBUG
+#endif
+#else
+#ifdef _CRT_MANIFEST_DEBUG
+#define _CRT_MANIFEST_INCONSISTENT
+#else
+#define _CRT_MANIFEST_RETAIL
+#endif
+#endif
+
+#ifdef _CRT_MANIFEST_INCONSISTENT
+#error You have included some C++/C library header files with _DEBUG defined and some with _DEBUG not defined. This will not work correctly. Please have _DEBUG set or clear consistently.
+#endif
+
+#include <crtassem.h>
+
+#ifdef _M_IX86
+
+#ifdef _DEBUG
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".DebugCRT' "         \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='x86' "                                  \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+#else
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' "              \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='x86' "                                  \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+#endif
+
+#endif	/* _M_IX86 */
+
+#ifdef _M_AMD64
+
+#ifdef _DEBUG
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".DebugCRT' "         \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='amd64' "                                \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+#else
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' "              \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='amd64' "                                \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+#endif
+
+#endif	/* _M_AMD64 */
+
+#ifdef _M_IA64
+
+#ifdef _DEBUG
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".DebugCRT' "         \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='ia64' "                                 \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+#else
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' "              \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='ia64' "                                 \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+#endif
+
+#endif	/* _M_IA64 */
+
+#endif	/* !defined(_CRT_NOFORCE_MANIFEST) */
+
+#endif	/* _DLL */
+
+#ifdef  _MSC_VER
+#undef _CRT_PACKING
+#define _CRT_PACKING 8
+
+#pragma pack(push,_CRT_PACKING)
+#endif  /* _MSC_VER */
+
+#include <vadefs.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* preprocessor string helpers */
+#ifndef _CRT_STRINGIZE
+#define __CRT_STRINGIZE(_Value) #_Value
+#define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value)
+#endif
+
+#ifndef _CRT_WIDE
+#define __CRT_WIDE(_String) L ## _String
+#define _CRT_WIDE(_String) __CRT_WIDE(_String)
+#endif
+
+
+#if !defined(_W64)
+#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#define _W64 __w64
+#else
+#define _W64
+#endif
+#endif
+
+
+/* Define _CRTIMP_NOIA64 */
+#ifndef _CRTIMP_NOIA64
+#if defined(_M_IA64)
+#define _CRTIMP_NOIA64
+#else
+#define _CRTIMP_NOIA64 _CRTIMP
+#endif
+#endif
+
+/* Define _CRTIMP2 */
+
+#ifndef _CRTIMP2
+#if defined(_DLL) && !defined(_STATIC_CPPLIB)
+#define _CRTIMP2 __declspec(dllimport)
+#else   /* ndef _DLL && !STATIC_CPPLIB */
+#define _CRTIMP2
+#endif  /* _DLL && !STATIC_CPPLIB */
+#endif  /* _CRTIMP2 */
+
+/* Define _CRTIMP_ALTERNATIVE */
+
+#ifndef _CRTIMP_ALTERNATIVE
+#ifdef  _DLL
+#ifdef _CRT_ALTERNATIVE_INLINES
+#define _CRTIMP_ALTERNATIVE
+#else
+#define _CRTIMP_ALTERNATIVE _CRTIMP
+#define _CRT_ALTERNATIVE_IMPORTED
+#endif
+#else   /* ndef _DLL */
+#define _CRTIMP_ALTERNATIVE
+#endif  /* _DLL */
+#endif  /* _CRTIMP_ALTERNATIVE */
+
+/* Define _MRTIMP */
+
+#ifndef _MRTIMP
+#define _MRTIMP __declspec(dllimport)
+#endif  /* _MRTIMP */
+
+/* Define _MRTIMP2 */
+#ifndef _MRTIMP2
+
+#if defined(_DLL) && !defined(_STATIC_CPPLIB)
+#define _MRTIMP2	__declspec(dllimport)
+
+#else   /* ndef _DLL && !STATIC_CPPLIB */
+#define _MRTIMP2
+#endif  /* _DLL && !STATIC_CPPLIB */
+
+#endif  /* _MRTIMP2 */
+
+
+#ifndef _MCRTIMP
+#ifdef  _DLL
+#define _MCRTIMP __declspec(dllimport)
+#else   /* ndef _DLL */
+#define _MCRTIMP
+#endif  /* _DLL */
+#endif  /* _CRTIMP */
+
+#ifndef __CLR_OR_THIS_CALL
+#if defined(MRTDLL) || defined(_M_CEE_PURE)
+#define __CLR_OR_THIS_CALL  __clrcall
+#else
+#define __CLR_OR_THIS_CALL
+#endif
+#endif
+
+#ifndef __CLRCALL_OR_CDECL
+#if defined(MRTDLL) || defined(_M_CEE_PURE)
+#define __CLRCALL_OR_CDECL __clrcall
+#else
+#define __CLRCALL_OR_CDECL __cdecl
+#endif
+#endif
+
+#ifndef _CRTIMP_PURE
+ #if defined(_M_CEE_PURE) || defined(_STATIC_CPPLIB)
+  #define _CRTIMP_PURE
+ #else
+  #define _CRTIMP_PURE _CRTIMP
+ #endif
+#endif
+
+#ifndef _PGLOBAL
+#ifdef _M_CEE
+  #if defined(__cplusplus_cli)
+    #define _PGLOBAL __declspec(process)
+  #else
+    #define _PGLOBAL
+  #endif
+#else
+#define _PGLOBAL
+#endif
+#endif
+
+#ifndef _AGLOBAL
+#ifdef _M_CEE
+#define _AGLOBAL __declspec(appdomain)
+#else
+#define _AGLOBAL
+#endif
+#endif
+
+/* define a specific constant for mixed mode */
+#ifdef _M_CEE
+#ifndef _M_CEE_PURE
+#define _M_CEE_MIXED
+#endif
+#endif
+
+/* Define __STDC_SECURE_LIB__ */
+#define __STDC_SECURE_LIB__ 200411L
+
+/* Retain__GOT_SECURE_LIB__ for back-compat */
+#define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__
+
+/* Default value for __STDC_WANT_SECURE_LIB__ is 1 */
+#ifndef __STDC_WANT_SECURE_LIB__
+#define __STDC_WANT_SECURE_LIB__ 1
+#endif
+
+/* Turn off deprecation if __STDC_WANT_SECURE_LIB__ is 0 */
+#if !__STDC_WANT_SECURE_LIB__ && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+#if _MSC_FULL_VER >= 140050320
+#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated(_Text))
+#else
+#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated)
+#endif
+
+/* Define _CRT_INSECURE_DEPRECATE */
+#ifndef _CRT_INSECURE_DEPRECATE
+#ifdef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_INSECURE_DEPRECATE(_Replacement)
+#else
+#define _CRT_INSECURE_DEPRECATE(_Replacement) _CRT_DEPRECATE_TEXT("This function or variable may be unsafe. Consider using " #_Replacement " instead. To disable deprecation, use _CRT_SECURE_NO_DEPRECATE. See online help for details.")
+#endif
+#endif
+
+/* Define _CRT_INSECURE_DEPRECATE_MEMORY */
+#ifndef _CRT_INSECURE_DEPRECATE_MEMORY
+#if !defined(_CRT_SECURE_DEPRECATE_MEMORY)
+#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement)
+#else
+#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) _CRT_INSECURE_DEPRECATE(_Replacement)
+#endif
+#endif
+
+/* Define _CRT_INSECURE_DEPRECATE_GLOBALS */
+#ifndef _CRT_INSECURE_DEPRECATE_GLOBALS
+#if defined (RC_INVOKED) 
+#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement)
+#else
+#if defined(_CRT_SECURE_NO_DEPRECATE_GLOBALS)
+#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement)
+#else
+#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement) _CRT_INSECURE_DEPRECATE(_Replacement)
+#endif
+#endif
+#endif 
+
+/* Define _CRT_MANAGED_HEAP_DEPRECATE */
+#ifndef _CRT_MANAGED_HEAP_DEPRECATE
+#ifdef _CRT_MANAGED_HEAP_NO_DEPRECATE
+#define _CRT_MANAGED_HEAP_DEPRECATE
+#else
+#if defined(_M_CEE)
+#define _CRT_MANAGED_HEAP_DEPRECATE 
+/* Disabled to allow QA tests to get fixed 
+_CRT_DEPRECATE_TEXT("Direct heap access is not safely possible from managed code.") 
+*/
+#else
+#define _CRT_MANAGED_HEAP_DEPRECATE
+#endif
+#endif
+#endif
+
+/* _SECURECRT_FILL_BUFFER_PATTERN is the same as _bNoMansLandFill */
+#define _SECURECRT_FILL_BUFFER_PATTERN 0xFD
+
+/* obsolete stuff */
+
+/* Define _CRT_OBSOLETE */
+#ifndef _CRT_OBSOLETE
+#ifdef _CRT_OBSOLETE_NO_DEPRECATE
+#define _CRT_OBSOLETE(_NewItem) 
+#else
+#define _CRT_OBSOLETE(_NewItem) _CRT_DEPRECATE_TEXT("This function or variable has been superceded by newer library or operating system functionality. Consider using" #_NewItem "instead. See online help for details.")
+#endif
+#endif
+
+
+/* jit64 instrinsic stuff */
+#ifndef _CRT_JIT_INTRINSIC
+#if defined(_M_CEE) && (defined(_M_AMD64) || defined(_M_IA64))
+/* This is only needed when managed code is calling the native APIs, targeting the 64-bit runtime */
+#define _CRT_JIT_INTRINSIC __declspec(jitintrinsic)
+#else
+#define _CRT_JIT_INTRINSIC 
+#endif
+#endif
+
+/* Define overload switches */
+#if !defined (RC_INVOKED) 
+ #if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
+  #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 0
+ #else
+  #if !__STDC_WANT_SECURE_LIB__ && _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+   #error Cannot use Secure CRT C++ overloads when __STDC_WANT_SECURE_LIB__ is 0
+  #endif
+ #endif
+#endif
+
+#if !defined (RC_INVOKED) 
+ #if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT)
+  /* _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT is ignored if _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES is set to 0 */
+  #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 0
+ #else
+  #if !__STDC_WANT_SECURE_LIB__ && _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT
+   #error Cannot use Secure CRT C++ overloads when __STDC_WANT_SECURE_LIB__ is 0
+  #endif
+ #endif
+#endif
+
+#if !defined (RC_INVOKED) 
+ #if !defined(_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES)
+  #if __STDC_WANT_SECURE_LIB__
+   #define _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 1
+  #else
+   #define _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 0
+  #endif
+ #else
+  #if !__STDC_WANT_SECURE_LIB__ && _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES
+   #error Cannot use Secure CRT C++ overloads when __STDC_WANT_SECURE_LIB__ is 0
+  #endif
+ #endif
+#endif
+
+/* Define _CRT_NONSTDC_DEPRECATE */
+#if !defined(_CRT_NONSTDC_DEPRECATE)
+#if defined(_CRT_NONSTDC_NO_DEPRECATE) || defined(_POSIX_)
+#define _CRT_NONSTDC_DEPRECATE(_NewName)
+#else
+#define _CRT_NONSTDC_DEPRECATE(_NewName) _CRT_DEPRECATE_TEXT("The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: " #_NewName ". See online help for details.")
+#endif
+#endif
+
+#ifndef _SIZE_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64    size_t;
+#else
+typedef _W64 unsigned int   size_t;
+#endif
+#define _SIZE_T_DEFINED
+#endif
+
+#if __STDC_WANT_SECURE_LIB__
+#ifndef _RSIZE_T_DEFINED
+typedef size_t rsize_t;
+#define _RSIZE_T_DEFINED
+#endif
+#endif
+
+#ifndef _INTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef __int64             intptr_t;
+#else
+typedef _W64 int            intptr_t;
+#endif
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64    uintptr_t;
+#else
+typedef _W64 unsigned int   uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+
+#ifndef _PTRDIFF_T_DEFINED
+#ifdef  _WIN64
+typedef __int64             ptrdiff_t;
+#else
+typedef _W64 int            ptrdiff_t;
+#endif
+#define _PTRDIFF_T_DEFINED
+#endif
+
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+
+#ifndef _WCTYPE_T_DEFINED
+typedef unsigned short wint_t;
+typedef unsigned short wctype_t;
+#define _WCTYPE_T_DEFINED
+#endif
+
+#ifndef _VA_LIST_DEFINED
+#ifdef _M_CEE_PURE
+typedef System::ArgIterator va_list;
+#else
+typedef char *  va_list;
+#endif
+#define _VA_LIST_DEFINED
+#endif
+
+#ifdef  _USE_32BIT_TIME_T
+#ifdef  _WIN64
+#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64
+#undef  _USE_32BIT_TIME_T
+#endif
+#else
+#if     _INTEGRAL_MAX_BITS < 64
+#define _USE_32BIT_TIME_T
+#endif
+#endif
+
+#ifndef _ERRCODE_DEFINED
+#define _ERRCODE_DEFINED
+/* errcode is deprecated in favor or errno_t, which is part of the standard proposal */
+#if !defined(__midl)
+_CRT_DEPRECATE_TEXT("This name was supported during some Whidbey pre-releases. Instead, use the standard name errno_t." ) typedef int errcode;
+#else
+typedef int errcode;
+#endif
+
+typedef int errno_t;
+#endif
+
+#ifndef _TIME32_T_DEFINED
+typedef _W64 long __time32_t;   /* 32-bit time value */
+#define _TIME32_T_DEFINED
+#endif
+
+#ifndef _TIME64_T_DEFINED
+#if     _INTEGRAL_MAX_BITS >= 64
+typedef __int64 __time64_t;     /* 64-bit time value */
+#endif
+#define _TIME64_T_DEFINED
+#endif
+
+#ifndef _TIME_T_DEFINED
+#ifdef _USE_32BIT_TIME_T
+typedef __time32_t time_t;      /* time value */
+#else
+typedef __time64_t time_t;      /* time value */
+#endif
+#define _TIME_T_DEFINED         /* avoid multiple def's of time_t */
+#endif
+
+#ifndef _CONST_RETURN
+#ifdef  __cplusplus
+#define _CONST_RETURN  const
+#define _CRT_CONST_CORRECT_OVERLOADS
+#else
+#define _CONST_RETURN
+#endif
+#endif
+
+#if !defined(UNALIGNED)
+#if defined(_M_IA64) || defined(_M_AMD64)
+#define UNALIGNED __unaligned
+#else
+#define UNALIGNED
+#endif
+#endif
+
+#if !defined(_CRT_ALIGN)
+#if defined(__midl)
+#define _CRT_ALIGN(x)
+#else
+#define _CRT_ALIGN(x) __declspec(align(x))
+#endif
+#endif
+
+/* Define _CRTNOALIAS, _CRTRESTRICT */
+
+#if     _MSC_FULL_VER >= 13102050
+#if !defined(_MSC_VER_GREATER_THEN_13102050)
+#define _MSC_VER_GREATER_THEN_13102050 
+#endif
+#endif
+
+#if     ( defined(_M_IA64) && defined(_MSC_VER_GREATER_THEN_13102050) ) || _MSC_VER >= 1400
+#ifndef _CRTNOALIAS
+#define _CRTNOALIAS __declspec(noalias)
+#endif  /* _CRTNOALIAS */
+
+#ifndef _CRTRESTRICT
+#define _CRTRESTRICT __declspec(restrict)
+#endif  /* _CRTRESTRICT */
+
+#else
+
+#ifndef _CRTNOALIAS
+#define _CRTNOALIAS
+#endif  /* _CRTNOALIAS */
+
+#ifndef _CRTRESTRICT
+#define _CRTRESTRICT
+#endif  /* _CRTRESTRICT */
+
+#endif
+
+/* Define __cdecl for non-Microsoft compilers */
+#if     ( !defined(_MSC_VER) && !defined(__cdecl) )
+#define __cdecl
+#endif
+
+#if !defined(__CRTDECL)
+#if defined(_M_CEE_PURE)
+#define __CRTDECL
+#else
+#define __CRTDECL   __cdecl
+#endif
+#endif
+
+
+#define _ARGMAX 100
+
+/* _TRUNCATE */
+#if !defined(_TRUNCATE)
+#define _TRUNCATE ((size_t)-1)
+#endif
+
+/* helper macros for cpp overloads */
+#if !defined(RC_INVOKED) 
+#if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(_ReturnType, _FuncName, _DstType, _Dst) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size]) \
+    { \
+        return _FuncName(_Dst, _Size); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1) \
+    { \
+        return _FuncName(_Dst, _Size, _TArg1); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return _FuncName(_Dst, _Size, _TArg1, _TArg2); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return _FuncName(_Dst, _Size, _TArg1, _TArg2, _TArg3); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        return _FuncName(_Dst, _Size, _TArg1, _TArg2, _TArg3, _TArg4); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(_ReturnType, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _DstType (&_Dst)[_Size], _TType1 _TArg1) \
+    { \
+        return _FuncName(_HArg1, _Dst, _Size, _TArg1); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(_ReturnType, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return _FuncName(_HArg1, _Dst, _Size, _TArg1, _TArg2); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(_ReturnType, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return _FuncName(_HArg1, _Dst, _Size, _TArg1, _TArg2, _TArg3); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(_ReturnType, _FuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    extern "C++" \
+    { \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType (&_Dst)[_Size]) \
+    { \
+        return _FuncName(_HArg1, _HArg2, _Dst, _Size); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(_ReturnType, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    extern "C++" \
+    { \
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg1); \
+        return _VFuncName(_Dst, _Size, _TArg1, _ArgList); \
+    } \
+	__pragma(warning(pop)); \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(_ReturnType, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    extern "C++" \
+    { \
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg2); \
+        return _VFuncName(_Dst, _Size, _TArg1, _TArg2, _ArgList); \
+    } \
+	__pragma(warning(pop)); \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(_ReturnType, _FuncName, _DstType, _Src) \
+    extern "C++" \
+    { \
+    template <size_t _DriveSize, size_t _DirSize, size_t _NameSize, size_t _ExtSize> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(__in const _DstType *_Src, __out_ecount_opt(_DriveSize) _DstType (&_Drive)[_DriveSize], __out_ecount_opt(_DirSize) _DstType (&_Dir)[_DirSize], __out_ecount_opt(_NameSize) _DstType (&_Name)[_NameSize], __out_ecount_opt(_ExtSize) _DstType (&_Ext)[_ExtSize]) \
+    { \
+        return _FuncName(_Src, _Drive, _DriveSize, _Dir, _DirSize, _Name, _NameSize, _Ext, _ExtSize); \
+    } \
+    }
+
+#else
+
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(_ReturnType, _FuncName, _DstType, _Dst)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(_ReturnType, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(_ReturnType, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(_ReturnType, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(_ReturnType, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(_ReturnType, _FuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(_ReturnType, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(_ReturnType, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(_ReturnType, _FuncName, _DstType, _Src)
+
+#endif /* _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES */
+#endif
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _VFuncName, _VFuncName##_s, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _VFuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_SIZE(_DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _FuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_SIZE(_DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _FuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst) \
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_4(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_1_1(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_2_0(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _FuncName##_s, _VFuncName, _VFuncName##_s, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE(_DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _FuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE(_DeclSpec, _FuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _FuncName##_s, _DstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+
+
+#if !defined(RC_INVOKED) 
+#if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+
+#define __RETURN_POLICY_SAME(_FunctionCall, _Dst) return (_FunctionCall)
+#define __RETURN_POLICY_DST(_FunctionCall, _Dst) return ((_FunctionCall) == 0 ? _Dst : 0)
+#define __RETURN_POLICY_VOID(_FunctionCall, _Dst) (_FunctionCall); return
+#define __EMPTY_DECLSPEC
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_DstType *_Dst) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_DstType *); \
+        return _FuncName(_Dst); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst)); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst)); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst) \
+    { \
+        return __insecure_##_FuncName(_Dst); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size]) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, _Size), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1]) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, 1), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_CGETS(_ReturnType, _DeclSpec, _FuncName, _DstType, _Dst) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_DstType *_Dst) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_DstType *); \
+        return _FuncName(_Dst); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst)); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst)); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst) \
+    { \
+        return __insecure_##_FuncName(_Dst); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size]) \
+    { \
+        size_t _SizeRead = 0; \
+        errno_t _Err = _FuncName##_s(_Dst + 2, (_Size - 2) < ((size_t)_Dst[0]) ? (_Size - 2) : ((size_t)_Dst[0]), &_SizeRead); \
+        _Dst[1] = (_DstType)(_SizeRead); \
+        return (_Err == 0 ? _Dst + 2 : 0); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1]) \
+    { \
+        return __insecure_##_FuncName((_DstType *)_Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName<2>(_DstType (&_Dst)[2]) \
+    { \
+        return __insecure_##_FuncName((_DstType *)_Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_DstType *_Dst, _TType1 _TArg1) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_DstType *, _TType1); \
+        return _FuncName(_Dst, _TArg1); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1) \
+    { \
+        return __insecure_##_FuncName(_Dst, _TArg1); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, _Size, _TArg1), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, 1, _TArg1), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_DstType *, _TType1, _TType2); \
+        return _FuncName(_Dst, _TArg1, _TArg2); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return __insecure_##_FuncName(_Dst, _TArg1, _TArg2); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_SecureDstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, _Size, _TArg1, _TArg2), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, 1, _TArg1, _TArg2), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_DstType *, _TType1, _TType2, _TType3); \
+        return _FuncName(_Dst, _TArg1, _TArg2, _TArg3); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _TArg3); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _TArg3); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return __insecure_##_FuncName(_Dst, _TArg1, _TArg2, _TArg3); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, _Size, _TArg1, _TArg2, _TArg3), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, 1, _TArg1, _TArg2, _TArg3), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_DstType *, _TType1, _TType2, _TType3, _TType4); \
+        return _FuncName(_Dst, _TArg1, _TArg2, _TArg3, _TArg4); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _TArg3, _TArg4); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _TArg3, _TArg4); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        return __insecure_##_FuncName(_Dst, _TArg1, _TArg2, _TArg3, _TArg4); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, _Size, _TArg1, _TArg2, _TArg3, _TArg4), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_Dst, 1, _TArg1, _TArg2, _TArg3, _TArg4), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_HType1 _HArg1, _DstType *_Dst, _TType1 _TArg1) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_HType1, _DstType *, _TType1); \
+        return _FuncName(_HArg1, _Dst, _TArg1); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _T &_Dst, _TType1 _TArg1) \
+    { \
+        return __insecure_##_FuncName(_HArg1, static_cast<_DstType *>(_Dst), _TArg1); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, const _T &_Dst, _TType1 _TArg1) \
+    { \
+        return __insecure_##_FuncName(_HArg1, static_cast<_DstType *>(_Dst), _TArg1); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _DstType * &_Dst, _TType1 _TArg1) \
+    { \
+        return __insecure_##_FuncName(_HArg1, _Dst, _TArg1); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _DstType (&_Dst)[_Size], _TType1 _TArg1) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_HArg1, _Dst, _Size, _TArg1), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_HType1 _HArg1, _DstType (&_Dst)[1], _TType1 _TArg1) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_HArg1, _Dst, 1, _TArg1), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType *_Dst) \
+    { \
+        _DeclSpec _ReturnType __cdecl _FuncName(_HType1, _HType2, _DstType *); \
+        return _FuncName(_HArg1, _HArg2, _Dst); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _HType2 _HArg2, _T &_Dst) \
+    { \
+        return __insecure_##_FuncName(_HArg1, _HArg2, static_cast<_DstType *>(_Dst)); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _HType2 _HArg2, const _T &_Dst) \
+    { \
+        return __insecure_##_FuncName(_HArg1, _HArg2, static_cast<_DstType *>(_Dst)); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType * &_Dst) \
+    { \
+        return __insecure_##_FuncName(_HArg1, _HArg2, _Dst); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType (&_Dst)[_Size]) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_HArg1, _HArg2, _Dst, _Size), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_HType1 _HArg1, _HType2 _HArg2, _DstType (&_Dst)[1]) \
+    { \
+        _ReturnPolicy(_SecureFuncName(_HArg1, _HArg2, _Dst, 1), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _VFuncName, _SecureVFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_VFuncName(_DstType *_Dst, _TType1 _TArg1, va_list _ArgList) \
+    { \
+        _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *, _TType1, va_list); \
+        return _VFuncName(_Dst, _TArg1, _ArgList); \
+    } \
+    extern "C++" \
+    { \
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg1); \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _ArgList); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg1); \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _ArgList); \
+    } \
+	__pragma(warning(pop)); \
+	\
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+	template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg1); \
+        return __insecure_##_VFuncName(_Dst, _TArg1, _ArgList); \
+    } \
+	__pragma(warning(pop)); \
+	\
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+	template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg1); \
+        _ReturnPolicy(_SecureVFuncName(_Dst, _Size, _TArg1, _ArgList), _Dst); \
+    } \
+	__pragma(warning(pop)); \
+	\
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg1); \
+        _ReturnPolicy(_SecureVFuncName(_Dst, 1, _TArg1, _ArgList), _Dst); \
+    } \
+	__pragma(warning(pop)); \
+	\
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName(_T &_Dst, _TType1 _TArg1, va_list _ArgList) \
+    { \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _ArgList); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName(const _T &_Dst, _TType1 _TArg1, va_list _ArgList) \
+    { \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _ArgList); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName(_DstType *&_Dst, _TType1 _TArg1, va_list _ArgList) \
+    { \
+        return __insecure_##_VFuncName(_Dst, _TArg1, _ArgList); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _VFuncName(_DstType (&_Dst)[_Size], _TType1 _TArg1, va_list _ArgList) \
+    { \
+        _ReturnPolicy(_SecureVFuncName(_Dst, _Size, _TArg1, _ArgList), _Dst); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, va_list _ArgList) \
+    { \
+        _ReturnPolicy(_SecureVFuncName(_Dst, 1, _TArg1, _ArgList), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _SecureVFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __inline \
+    _ReturnType __CRTDECL __insecure_##_VFuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _ArgList) \
+    { \
+        _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *, _TType1, _TType2, va_list); \
+        return _VFuncName(_Dst, _TArg1, _TArg2, _ArgList); \
+    } \
+    extern "C++" \
+    { \
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <typename _T> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg2); \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _ArgList); \
+    } \
+    template <typename _T> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg2); \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _ArgList); \
+    } \
+	__pragma(warning(pop)); \
+	\
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, _TType2 _TArg2, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg2); \
+        return __insecure_##_VFuncName(_Dst, _TArg1, _TArg2, _ArgList); \
+    } \
+	__pragma(warning(pop)); \
+	\
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _FuncName(_SecureDstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg2); \
+        _ReturnPolicy(_SecureVFuncName(_Dst, _Size, _TArg1, _TArg2, _ArgList), _Dst); \
+    } \
+	__pragma(warning(pop)); \
+	\
+	__pragma(warning(push)); \
+	__pragma(warning(disable: 4793)); \
+    template <> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_FuncName##_s) \
+    _ReturnType __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2, ...) \
+    { \
+        va_list _ArgList; \
+        _crt_va_start(_ArgList, _TArg2); \
+        _ReturnPolicy(_SecureVFuncName(_Dst, 1, _TArg1, _TArg2, _ArgList), _Dst); \
+    } \
+	__pragma(warning(pop)); \
+	\
+    template <typename _T> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _ArgList) \
+    { \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _ArgList); \
+    } \
+    template <typename _T> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _ArgList) \
+    { \
+        return __insecure_##_VFuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _ArgList); \
+    } \
+    template <> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName(_DstType *&_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _ArgList) \
+    { \
+        return __insecure_##_VFuncName(_Dst, _TArg1, _TArg2, _ArgList); \
+    } \
+    template <size_t _Size> \
+    inline \
+    _ReturnType __CRTDECL _VFuncName(_SecureDstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, va_list _ArgList) \
+    { \
+        _ReturnPolicy(_SecureVFuncName(_Dst, _Size, _TArg1, _TArg2, _ArgList), _Dst); \
+    } \
+    template <> \
+    inline \
+	_CRT_INSECURE_DEPRECATE(_SecureVFuncName) \
+    _ReturnType __CRTDECL _VFuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2, va_list _ArgList) \
+    { \
+        _ReturnPolicy(_SecureVFuncName(_Dst, 1, _TArg1, _TArg2, _ArgList), _Dst); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __inline \
+    size_t __CRTDECL __insecure_##_FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        _DeclSpec size_t __cdecl _FuncName(_DstType *, _TType1, _TType2); \
+        return _FuncName(_Dst, _TArg1, _TArg2); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        return __insecure_##_FuncName(_Dst, _TArg1, _TArg2); \
+    } \
+    template <size_t _Size> \
+    inline \
+    size_t __CRTDECL _FuncName(_SecureDstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        size_t _Ret = 0; \
+        _SecureFuncName(&_Ret, _Dst, _Size, _TArg1, _TArg2); \
+        return (_Ret > 0 ? (_Ret - 1) : _Ret); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2) \
+    { \
+        size_t _Ret = 0; \
+        _SecureFuncName(&_Ret, _Dst, 1, _TArg1, _TArg2); \
+        return (_Ret > 0 ? (_Ret - 1) : _Ret); \
+    } \
+    }
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __inline \
+    size_t __CRTDECL __insecure_##_FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        _DeclSpec size_t __cdecl _FuncName(_DstType *, _TType1, _TType2, _TType3); \
+        return _FuncName(_Dst, _TArg1, _TArg2, _TArg3); \
+    } \
+    extern "C++" \
+    { \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName(_T &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _TArg3); \
+    } \
+    template <typename _T> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName(const _T &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return __insecure_##_FuncName(static_cast<_DstType *>(_Dst), _TArg1, _TArg2, _TArg3); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName(_DstType * &_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        return __insecure_##_FuncName(_Dst, _TArg1, _TArg2, _TArg3); \
+    } \
+    template <size_t _Size> \
+    inline \
+    size_t __CRTDECL _FuncName(_SecureDstType (&_Dst)[_Size], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        size_t _Ret = 0; \
+        _SecureFuncName(&_Ret, _Dst, _Size, _TArg1, _TArg2, _TArg3); \
+        return (_Ret > 0 ? (_Ret - 1) : _Ret); \
+    } \
+    template <> \
+    inline \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) \
+    size_t __CRTDECL _FuncName<1>(_DstType (&_Dst)[1], _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3) \
+    { \
+        size_t _Ret = 0; \
+        _SecureFuncName(&_Ret, _Dst, 1, _TArg1, _TArg2, _TArg3); \
+        return (_Ret > 0 ? (_Ret - 1) : _Ret); \
+    } \
+    }
+
+#if !defined(RC_INVOKED) && _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_CGETS(_ReturnType, _DeclSpec, _FuncName, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_CGETS(_ReturnType, _DeclSpec, _FuncName, _DstType, _Dst)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _VFuncName, _SecureVFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _VFuncName, _SecureVFuncName, _DstType, _Dst, _TType1, _TArg1)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _VFuncName##_s, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2)
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3)
+
+#else
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst) \
+        _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_GETS(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst) \
+	_CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_HType1 _HArg1, _DstType *_Dst, _TType1 _TArg1);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName,_VFuncName, _SecureVFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, ...); \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, ...); \
+    _CRT_INSECURE_DEPRECATE(_VFuncName##_s) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, ...); \
+    _CRT_INSECURE_DEPRECATE(_VFuncName##_s) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec size_t __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec size_t __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3);
+
+#endif /* _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT */
+
+#else
+
+#define __RETURN_POLICY_SAME(_FunctionCall)
+#define __RETURN_POLICY_DST(_FunctionCall)
+#define __RETURN_POLICY_VOID(_FunctionCall)
+#define __EMPTY_DECLSPEC
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_CGETS(_ReturnType, _DeclSpec, _FuncName, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_HType1 _HArg1, _DstType *_Dst, _TType1 _TArg1);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _VFuncName, _SecureVFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, ...); \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _SecureVFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, ...); \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec size_t __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec size_t __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_0_GETS(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_4_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3, _TType4, _TArg4) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3, _TType4 _TArg4);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_1_1_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_HType1 _HArg1, _DstType *_Dst, _TType1 _TArg1);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_2_0_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _HType1, _HArg1, _HType2, _HArg2, _DstType, _Dst) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_HType1 _HArg1, _HType2 _HArg2, _DstType *_Dst);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_1_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _SecureFuncName, _VFuncName, _SecureVFuncName, _DstType, _Dst, _TType1, _TArg1) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, ...); \
+    _CRT_INSECURE_DEPRECATE(_SecureVFuncName) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, ...); \
+    _CRT_INSECURE_DEPRECATE(_VFuncName##_s) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST_EX(_ReturnType, _ReturnPolicy, _DeclSpec, _FuncName, _VFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_FuncName##_s) _DeclSpec _ReturnType __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, ...); \
+    _CRT_INSECURE_DEPRECATE(_VFuncName##_s) _DeclSpec _ReturnType __cdecl _VFuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, va_list _Args);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec size_t __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2);
+
+#define __DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE_EX(_DeclSpec, _FuncName, _SecureFuncName, _SecureDstType, _DstType, _Dst, _TType1, _TArg1, _TType2, _TArg2, _TType3, _TArg3) \
+    _CRT_INSECURE_DEPRECATE(_SecureFuncName) _DeclSpec size_t __cdecl _FuncName(_DstType *_Dst, _TType1 _TArg1, _TType2 _TArg2, _TType3 _TArg3);
+
+#endif /* _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES */
+#endif
+
+struct threadlocaleinfostruct;
+struct threadmbcinfostruct;
+typedef struct threadlocaleinfostruct * pthreadlocinfo;
+typedef struct threadmbcinfostruct * pthreadmbcinfo;
+struct __lc_time_data;
+
+typedef struct localeinfo_struct
+{
+    pthreadlocinfo locinfo;
+    pthreadmbcinfo mbcinfo;
+} _locale_tstruct, *_locale_t;
+
+#ifndef _TAGLC_ID_DEFINED
+typedef struct tagLC_ID {
+        unsigned short wLanguage;
+        unsigned short wCountry;
+        unsigned short wCodePage;
+} LC_ID, *LPLC_ID;
+#define _TAGLC_ID_DEFINED
+#endif  /* _TAGLC_ID_DEFINED */
+
+#ifndef _THREADLOCALEINFO
+typedef struct threadlocaleinfostruct {
+        int refcount;
+        unsigned int lc_codepage;
+        unsigned int lc_collate_cp;
+        unsigned long lc_handle[6]; /* LCID */
+        LC_ID lc_id[6];
+        struct {
+            char *locale;
+            wchar_t *wlocale;
+            int *refcount;
+            int *wrefcount;
+        } lc_category[6];
+        int lc_clike;
+        int mb_cur_max;
+        int * lconv_intl_refcount;
+        int * lconv_num_refcount;
+        int * lconv_mon_refcount;
+        struct lconv * lconv;
+        int * ctype1_refcount;
+        unsigned short * ctype1;
+        const unsigned short * pctype;
+        const unsigned char * pclmap;
+        const unsigned char * pcumap;
+        struct __lc_time_data * lc_time_curr;
+} threadlocinfo;
+#define _THREADLOCALEINFO
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#if defined(_PREFAST_) && defined(_PFT_SHOULD_CHECK_RETURN)
+#define __checkReturn_opt __checkReturn
+#else
+#define __checkReturn_opt
+#endif
+
+#if defined(_PREFAST_) && defined(_PFT_SHOULD_CHECK_RETURN_WAT)
+#define __checkReturn_wat __checkReturn
+#else
+#define __checkReturn_wat
+#endif
+
+#if !defined(__midl) && !defined(MIDL_PASS) && defined(_PREFAST_) 
+#define __crt_typefix(ctype)              __declspec("SAL_typefix(" __CRT_STRINGIZE(ctype) ")")
+#else
+#define __crt_typefix(ctype)
+#endif
+
+#if (defined(__midl))
+/* suppress tchar inlines */
+#ifndef _NO_INLINING
+#define _NO_INLINING
+#endif
+#endif
+
+#ifndef _CRT_UNUSED
+#define _CRT_UNUSED(x) (void)x
+#endif
+
+#ifdef  _MSC_VER
+#pragma pack(pop)
+#endif  /* _MSC_VER */
+
+#endif  /* _INC_CRTDEFS */
diff --git a/base/Windows/Inc/ctype.h b/base/Windows/Inc/ctype.h
new file mode 100644
index 0000000..e4ffaba
--- /dev/null
+++ b/base/Windows/Inc/ctype.h
@@ -0,0 +1,384 @@
+/***
+*ctype.h - character conversion macros and ctype macros
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       Defines macros for character classification/conversion.
+*       [ANSI/System V]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_CTYPE
+#define _INC_CTYPE
+
+#include <crtdefs.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifndef WEOF
+#define WEOF (wint_t)(0xFFFF)
+#endif
+
+#ifndef _CRT_CTYPEDATA_DEFINED
+#define _CRT_CTYPEDATA_DEFINED
+#ifndef _CTYPE_DISABLE_MACROS
+
+#ifndef __PCTYPE_FUNC
+#if defined(_CRT_DISABLE_PERFCRIT_LOCKS) && !defined(_DLL)
+#define __PCTYPE_FUNC  _pctype
+#else
+#define __PCTYPE_FUNC   __pctype_func()
+#endif  
+#endif  /* __PCTYPE_FUNC */
+
+_CRTIMP const unsigned short * __cdecl __pctype_func(void);
+#if !defined(_M_CEE_PURE)
+_CRTIMP extern const unsigned short *_pctype;
+#else
+#define _pctype (__pctype_func())
+#endif /* !defined(_M_CEE_PURE) */
+#endif  /* _CTYPE_DISABLE_MACROS */
+#endif
+
+#ifndef _CRT_WCTYPEDATA_DEFINED
+#define _CRT_WCTYPEDATA_DEFINED
+#ifndef _CTYPE_DISABLE_MACROS
+#if !defined(_M_CEE_PURE)
+_CRTIMP extern const unsigned short _wctype[];
+#endif /* !defined(_M_CEE_PURE) */
+
+_CRTIMP const wctype_t * __cdecl __pwctype_func(void);
+#if !defined(_M_CEE_PURE)
+_CRTIMP extern const wctype_t *_pwctype;
+#else
+#define _pwctype (__pwctype_func())
+#endif /* !defined(_M_CEE_PURE) */
+#endif  /* _CTYPE_DISABLE_MACROS */
+#endif
+
+#ifndef _CTYPE_DISABLE_MACROS
+#endif  /* _CTYPE_DISABLE_MACROS */
+
+
+
+
+/* set bit masks for the possible character types */
+
+#define _UPPER          0x1     /* upper case letter */
+#define _LOWER          0x2     /* lower case letter */
+#define _DIGIT          0x4     /* digit[0-9] */
+#define _SPACE          0x8     /* tab, carriage return, newline, */
+                                /* vertical tab or form feed */
+#define _PUNCT          0x10    /* punctuation character */
+#define _CONTROL        0x20    /* control character */
+#define _BLANK          0x40    /* space char */
+#define _HEX            0x80    /* hexadecimal digit */
+
+#define _LEADBYTE       0x8000                  /* multibyte leadbyte */
+#define _ALPHA          (0x0100|_UPPER|_LOWER)  /* alphabetic character */
+
+
+/* character classification function prototypes */
+
+#ifndef _CTYPE_DEFINED
+
+_CRTIMP __checkReturn int __cdecl _isctype(__in int _C, __in int _Type);
+_CRTIMP __checkReturn int __cdecl _isctype_l(__in int _C, __in int _Type, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl isalpha(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isalpha_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl isupper(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isupper_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl islower(__in int _C);
+_CRTIMP __checkReturn int __cdecl _islower_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl isdigit(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isdigit_l(__in int _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl isxdigit(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isxdigit_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl isspace(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isspace_l(__in int _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl ispunct(__in int _C);
+_CRTIMP __checkReturn int __cdecl _ispunct_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl isalnum(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isalnum_l(__in int _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl isprint(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isprint_l(__in int _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl isgraph(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isgraph_l(__in int _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iscntrl(__in int _C);
+_CRTIMP __checkReturn int __cdecl _iscntrl_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl toupper(__in int _C);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl tolower(__in int _C);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl _tolower(__in int _C);
+_CRTIMP __checkReturn int __cdecl _tolower_l(__in int _C, __in_opt _locale_t _Locale);
+_CRT_JIT_INTRINSIC _CRTIMP __checkReturn int __cdecl _toupper(__in int _C);
+_CRTIMP __checkReturn int __cdecl _toupper_l(__in int _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl __isascii(__in int _C);
+_CRTIMP __checkReturn int __cdecl __toascii(__in int _C);
+_CRTIMP __checkReturn int __cdecl __iscsymf(__in int _C);
+_CRTIMP __checkReturn int __cdecl __iscsym(__in int _C);
+#define _CTYPE_DEFINED
+#endif
+
+#ifndef _WCTYPE_DEFINED
+
+/* wide function prototypes, also declared in wchar.h  */
+
+/* character classification function prototypes */
+
+_CRTIMP __checkReturn int __cdecl iswalpha(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswalpha_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswupper(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswupper_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswlower(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswlower_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswdigit(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswdigit_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswxdigit(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswxdigit_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswspace(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswspace_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswpunct(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswpunct_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswalnum(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswalnum_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswprint(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswprint_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswgraph(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswgraph_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswcntrl(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswcntrl_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl iswascii(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl isleadbyte(__in int _C);
+_CRTIMP __checkReturn int __cdecl _isleadbyte_l(__in int _C, __in_opt _locale_t _Locale);
+
+_CRTIMP __checkReturn wint_t __cdecl towupper(__in wint_t _C);
+_CRTIMP __checkReturn wint_t __cdecl _towupper_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn wint_t __cdecl towlower(__in wint_t _C);
+_CRTIMP __checkReturn wint_t __cdecl _towlower_l(__in wint_t _C, __in_opt _locale_t _Locale); 
+_CRTIMP __checkReturn int __cdecl iswctype(__in wint_t _C, __in wctype_t _Type);
+_CRTIMP __checkReturn int __cdecl _iswctype_l(__in wint_t _C, __in wctype_t _Type, __in_opt _locale_t _Locale);
+
+_CRTIMP __checkReturn int __cdecl __iswcsymf(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswcsymf_l(__in wint_t _C, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl __iswcsym(__in wint_t _C);
+_CRTIMP __checkReturn int __cdecl _iswcsym_l(__in wint_t _C, __in_opt _locale_t _Locale);
+
+_CRT_OBSOLETE(iswctype) _CRTIMP int __cdecl is_wctype(__in wint_t _C, __in wctype_t _Type);
+
+#define _WCTYPE_DEFINED
+#endif
+
+/* the character classification macro definitions */
+
+#ifndef _CTYPE_DISABLE_MACROS
+
+/*
+ * Maximum number of bytes in multi-byte character in the current locale
+ * (also defined in stdlib.h).
+ */
+#ifndef MB_CUR_MAX
+
+#if defined(_CRT_DISABLE_PERFCRIT_LOCKS) && !defined(_DLL)
+#define MB_CUR_MAX __mb_cur_max
+#else
+#define MB_CUR_MAX ___mb_cur_max_func()
+#endif
+#if !defined(_M_CEE_PURE)
+/* No data exports in pure code */
+_CRTIMP extern int __mb_cur_max;
+#else
+#define __mb_cur_max (___mb_cur_max_func())
+#endif /* !defined(_M_CEE_PURE) */
+_CRTIMP int __cdecl ___mb_cur_max_func(void);
+_CRTIMP int __cdecl ___mb_cur_max_l_func(_locale_t);
+#endif  /* MB_CUR_MAX */
+
+/* Introduced to detect error when character testing functions are called
+ * with illegal input of integer.
+ */
+#ifdef _DEBUG
+_CRTIMP int __cdecl _chvalidator(__in int _Ch, __in int _Mask);
+#define __chvalidchk(a,b)       _chvalidator(a,b)
+#else
+#define __chvalidchk(a,b)       (__PCTYPE_FUNC[(a)] & (b))
+#endif
+
+
+
+#if defined(_CRT_DISABLE_PERFCRIT_LOCKS) && !defined(_DLL)
+#ifndef __cplusplus
+#define isalpha(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_ALPHA) : __chvalidchk(_c, _ALPHA))
+#define isupper(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_UPPER) : __chvalidchk(_c, _UPPER))
+#define islower(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_LOWER) : __chvalidchk(_c, _LOWER))
+#define isdigit(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_DIGIT) : __chvalidchk(_c, _DIGIT))
+#define isxdigit(_c)    (MB_CUR_MAX > 1 ? _isctype(_c,_HEX)   : __chvalidchk(_c, _HEX))
+#define isspace(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_SPACE) : __chvalidchk(_c, _SPACE))
+#define ispunct(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_PUNCT) : __chvalidchk(_c, _PUNCT))
+#define isalnum(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_ALPHA|_DIGIT) : __chvalidchk(_c, (_ALPHA|_DIGIT)))
+#define isprint(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT) : __chvalidchk(_c, (_BLANK|_PUNCT|_ALPHA|_DIGIT)))
+#define isgraph(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_PUNCT|_ALPHA|_DIGIT) : __chvalidchk(_c, (_PUNCT|_ALPHA|_DIGIT)))
+#define iscntrl(_c)     (MB_CUR_MAX > 1 ? _isctype(_c,_CONTROL) : __chvalidchk(_c, _CONTROL))
+#elif   0         /* Pending ANSI C++ integration */
+inline __checkReturn int isalpha(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_ALPHA) : __chvalidchk(_C, _ALPHA)); }
+inline __checkReturn int isupper(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_UPPER) : __chvalidchk(_C, _UPPER)); }
+inline __checkReturn int islower(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_LOWER) : __chvalidchk(_C, _LOWER)); }
+inline __checkReturn int isdigit(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_DIGIT) : __chvalidchk(_C, _DIGIT)); }
+inline __checkReturn int isxdigit(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_HEX)   : __chvalidchk(_C, _HEX)); }
+inline __checkReturn int isspace(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_SPACE) : __chvalidchk(_C, _SPACE)); }
+inline __checkReturn int ispunct(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_PUNCT) : __chvalidchk(_C, _PUNCT)); }
+inline __checkReturn int isalnum(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_ALPHA|_DIGIT)
+                : __chvalidchk(_C) , (_ALPHA|_DIGIT)); }
+inline __checkReturn int isprint(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_BLANK|_PUNCT|_ALPHA|_DIGIT)
+                : __chvalidchk(_C , (_BLANK|_PUNCT|_ALPHA|_DIGIT))); }
+inline __checkReturn int isgraph(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_PUNCT|_ALPHA|_DIGIT)
+                : __chvalidchk(_C , (_PUNCT|_ALPHA|_DIGIT))); }
+inline __checkReturn int iscntrl(__in int _C)
+        {return (MB_CUR_MAX > 1 ? _isctype(_C,_CONTROL)
+                : __chvalidchk(_C , _CONTROL)); }
+#endif  /* __cplusplus */
+#endif  /* _MT */
+
+#ifdef _DEBUG
+int __cdecl _chvalidator_l(__in_opt _locale_t, __in int _Ch, __in int _Mask);
+#define _chvalidchk_l(_Char, _Flag, _Locale)  _chvalidator_l(_Locale, _Char, _Flag)
+#else
+#define _chvalidchk_l(_Char, _Flag, _Locale)  (_Locale==NULL ? __chvalidchk(_Char, _Flag) : ((_locale_t)_Locale)->locinfo->pctype[_Char] & (_Flag))
+#endif  /* DEBUG */
+
+
+#define _ischartype_l(_Char, _Flag, _Locale)    ( ((_Locale)!=NULL && (((_locale_t)(_Locale))->locinfo->mb_cur_max) > 1) ? _isctype_l(_Char, (_Flag), _Locale) : _chvalidchk_l(_Char,_Flag,_Locale))
+#define _isalpha_l(_Char, _Locale)      _ischartype_l(_Char, _ALPHA, _Locale)
+#define _isupper_l(_Char, _Locale)      _ischartype_l(_Char, _UPPER, _Locale)
+#define _islower_l(_Char, _Locale)      _ischartype_l(_Char, _LOWER, _Locale)
+#define _isdigit_l(_Char, _Locale)      _ischartype_l(_Char, _DIGIT, _Locale)
+#define _isxdigit_l(_Char, _Locale)     _ischartype_l(_Char, _HEX, _Locale)
+#define _isspace_l(_Char, _Locale)      _ischartype_l(_Char, _SPACE, _Locale)
+#define _ispunct_l(_Char, _Locale)      _ischartype_l(_Char, _PUNCT, _Locale)
+#define _isalnum_l(_Char, _Locale)      _ischartype_l(_Char, _ALPHA|_DIGIT, _Locale)
+#define _isprint_l(_Char, _Locale)      _ischartype_l(_Char, _BLANK|_PUNCT|_ALPHA|_DIGIT, _Locale)
+#define _isgraph_l(_Char, _Locale)      _ischartype_l(_Char, _PUNCT|_ALPHA|_DIGIT, _Locale)
+#define _iscntrl_l(_Char, _Locale)      _ischartype_l(_Char, _CONTROL, _Locale)
+
+#define _tolower(_Char)    ( (_Char)-'A'+'a' )
+#define _toupper(_Char)    ( (_Char)-'a'+'A' )
+
+#define __isascii(_Char)   ( (unsigned)(_Char) < 0x80 )
+#define __toascii(_Char)   ( (_Char) & 0x7f )
+
+#ifndef _WCTYPE_INLINE_DEFINED
+
+#undef _CRT_WCTYPE_NOINLINE
+
+#if !defined(__cplusplus) || defined(_M_CEE_PURE) || defined(MRTDLL) || defined(_CRT_WCTYPE_NOINLINE)
+#define iswalpha(_c)    ( iswctype(_c,_ALPHA) )
+#define iswupper(_c)    ( iswctype(_c,_UPPER) )
+#define iswlower(_c)    ( iswctype(_c,_LOWER) )
+#define iswdigit(_c)    ( iswctype(_c,_DIGIT) )
+#define iswxdigit(_c)   ( iswctype(_c,_HEX) )
+#define iswspace(_c)    ( iswctype(_c,_SPACE) )
+#define iswpunct(_c)    ( iswctype(_c,_PUNCT) )
+#define iswalnum(_c)    ( iswctype(_c,_ALPHA|_DIGIT) )
+#define iswprint(_c)    ( iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT) )
+#define iswgraph(_c)    ( iswctype(_c,_PUNCT|_ALPHA|_DIGIT) )
+#define iswcntrl(_c)    ( iswctype(_c,_CONTROL) )
+#define iswascii(_c)    ( (unsigned)(_c) < 0x80 )
+
+#define _iswalpha_l(_c,_p)    ( _iswctype_l(_c,_ALPHA, _p) )
+#define _iswupper_l(_c,_p)    ( _iswctype_l(_c,_UPPER, _p) )
+#define _iswlower_l(_c,_p)    ( _iswctype_l(_c,_LOWER, _p) )
+#define _iswdigit_l(_c,_p)    ( _iswctype_l(_c,_DIGIT, _p) )
+#define _iswxdigit_l(_c,_p)   ( _iswctype_l(_c,_HEX, _p) )
+#define _iswspace_l(_c,_p)    ( _iswctype_l(_c,_SPACE, _p) )
+#define _iswpunct_l(_c,_p)    ( _iswctype_l(_c,_PUNCT, _p) )
+#define _iswalnum_l(_c,_p)    ( _iswctype_l(_c,_ALPHA|_DIGIT, _p) )
+#define _iswprint_l(_c,_p)    ( _iswctype_l(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT, _p) )
+#define _iswgraph_l(_c,_p)    ( _iswctype_l(_c,_PUNCT|_ALPHA|_DIGIT, _p) )
+#define _iswcntrl_l(_c,_p)    ( _iswctype_l(_c,_CONTROL, _p) )
+#elif   0         /* __cplusplus */
+inline __checkReturn int iswalpha(__in wint_t _C) {return (iswctype(_C,_ALPHA)); }
+inline __checkReturn int iswupper(__in wint_t _C) {return (iswctype(_C,_UPPER)); }
+inline __checkReturn int iswlower(__in wint_t _C) {return (iswctype(_C,_LOWER)); }
+inline __checkReturn int iswdigit(__in wint_t _C) {return (iswctype(_C,_DIGIT)); }
+inline __checkReturn int iswxdigit(__in wint_t _C) {return (iswctype(_C,_HEX)); }
+inline __checkReturn int iswspace(__in wint_t _C) {return (iswctype(_C,_SPACE)); }
+inline __checkReturn int iswpunct(__in wint_t _C) {return (iswctype(_C,_PUNCT)); }
+inline __checkReturn int iswalnum(__in wint_t _C) {return (iswctype(_C,_ALPHA|_DIGIT)); }
+inline __checkReturn int iswprint(__in wint_t _C) {return (iswctype(_C,_BLANK|_PUNCT|_ALPHA|_DIGIT)); }
+inline __checkReturn int iswgraph(__in wint_t _C) {return (iswctype(_C,_PUNCT|_ALPHA|_DIGIT)); }
+inline __checkReturn int iswcntrl(__in wint_t _C) {return (iswctype(_C,_CONTROL)); }
+inline __checkReturn int iswascii(__in wint_t _C) {return ((unsigned)(_C) < 0x80); }
+
+inline __checkReturn int __CRTDECL _iswalpha_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_ALPHA, _Locale)); }
+inline __checkReturn int __CRTDECL _iswupper_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_UPPER, _Locale)); }
+inline __checkReturn int __CRTDECL _iswlower_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_LOWER, _Locale)); }
+inline __checkReturn int __CRTDECL _iswdigit_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_DIGIT, _Locale)); }
+inline __checkReturn int __CRTDECL _iswxdigit_l(__in wint_t _C, __in_opt _locale_t _Locale) {return(_iswctype_l(_C,_HEX, _Locale)); }
+inline __checkReturn int __CRTDECL _iswspace_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_SPACE, _Locale)); }
+inline __checkReturn int __CRTDECL _iswpunct_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_PUNCT, _Locale)); }
+inline __checkReturn int __CRTDECL _iswalnum_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_ALPHA|_DIGIT, _Locale)); }
+inline __checkReturn int __CRTDECL _iswprint_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_BLANK|_PUNCT|_ALPHA|_DIGIT, _Locale)); }
+inline __checkReturn int __CRTDECL _iswgraph_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_PUNCT|_ALPHA|_DIGIT, _Locale)); }
+inline __checkReturn int __CRTDECL _iswcntrl_l(__in wint_t _C, __in_opt _locale_t _Locale) {return (_iswctype_l(_C,_CONTROL, _Locale)); }
+
+inline __checkReturn int isleadbyte(int _C) {return (__PCTYPE_FUNC[(unsigned char)(_C)] & _LEADBYTE); }
+#endif  /* __cplusplus */
+#define _WCTYPE_INLINE_DEFINED
+#endif  /* _WCTYPE_INLINE_DEFINED */
+
+/* MS C version 2.0 extended ctype macros */
+
+#define __iscsymf(_c)   (isalpha(_c) || ((_c) == '_'))
+#define __iscsym(_c)    (isalnum(_c) || ((_c) == '_'))
+#define __iswcsymf(_c)  (iswalpha(_c) || ((_c) == '_'))
+#define __iswcsym(_c)   (iswalnum(_c) || ((_c) == '_'))
+
+#define _iscsymf_l(_c, _p)   (_isalpha_l(_c, _p) || ((_c) == '_'))
+#define _iscsym_l(_c, _p)    (_isalnum_l(_c, _p) || ((_c) == '_'))
+#define _iswcsymf_l(_c, _p)  (_iswalpha_l(_c, _p) || ((_c) == '_'))
+#define _iswcsym_l(_c, _p)   (_iswalnum_l(_c, _p) || ((_c) == '_'))
+
+#endif  /* _CTYPE_DISABLE_MACROS */
+
+
+#if     !__STDC__
+
+/* Non-ANSI names for compatibility */
+
+#ifndef _CTYPE_DEFINED
+_CRT_NONSTDC_DEPRECATE(__isascii) _CRTIMP __checkReturn int __cdecl isascii(__in int _C);
+_CRT_NONSTDC_DEPRECATE(__toascii) _CRTIMP __checkReturn int __cdecl toascii(__in int _C);
+_CRT_NONSTDC_DEPRECATE(__iscsymf) _CRTIMP __checkReturn int __cdecl iscsymf(__in int _C);
+_CRT_NONSTDC_DEPRECATE(__iscsym) _CRTIMP __checkReturn int __cdecl iscsym(__in int _C);
+#else
+#define isascii __isascii
+#define toascii __toascii
+#define iscsymf __iscsymf
+#define iscsym  __iscsym
+#endif
+
+#endif  /* __STDC__ */
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  /* _INC_CTYPE */
diff --git a/base/Windows/Inc/dbgeng.h b/base/Windows/Inc/dbgeng.h
new file mode 100644
index 0000000..eca01c7
--- /dev/null
+++ b/base/Windows/Inc/dbgeng.h
@@ -0,0 +1,15770 @@
+//----------------------------------------------------------------------------
+//
+// Debugger engine interfaces.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//----------------------------------------------------------------------------
+
+#ifndef __DBGENG_H__
+#define __DBGENG_H__
+
+#include <stdarg.h>
+#include <objbase.h>
+
+#ifndef _WDBGEXTS_
+typedef struct _WINDBG_EXTENSION_APIS32* PWINDBG_EXTENSION_APIS32;
+typedef struct _WINDBG_EXTENSION_APIS64* PWINDBG_EXTENSION_APIS64;
+#endif
+
+#ifndef _CRASHLIB_
+typedef struct _MEMORY_BASIC_INFORMATION64* PMEMORY_BASIC_INFORMATION64;
+#endif
+
+#ifndef __in
+// Should include SpecStrings.h to get proper definitions.
+#define __in
+#define __in_opt
+#define __in_bcount(x)
+#define __in_bcount_opt(x)
+#define __in_ecount(x)
+#define __in_ecount_opt(x)
+#define __out
+#define __out_opt
+#define __out_bcount(x)
+#define __out_bcount_opt(x)
+#define __out_ecount(x)
+#define __out_ecount_opt(x)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//----------------------------------------------------------------------------
+//
+// GUIDs and interface forward declarations.
+//
+//----------------------------------------------------------------------------
+
+/* f2df5f53-071f-47bd-9de6-5734c3fed689 */
+DEFINE_GUID(IID_IDebugAdvanced, 0xf2df5f53, 0x071f, 0x47bd,
+            0x9d, 0xe6, 0x57, 0x34, 0xc3, 0xfe, 0xd6, 0x89);
+/* 716d14c9-119b-4ba5-af1f-0890e672416a */
+DEFINE_GUID(IID_IDebugAdvanced2, 0x716d14c9, 0x119b, 0x4ba5,
+            0xaf, 0x1f, 0x08, 0x90, 0xe6, 0x72, 0x41, 0x6a);
+/* cba4abb4-84c4-444d-87ca-a04e13286739 */
+DEFINE_GUID(IID_IDebugAdvanced3, 0xcba4abb4, 0x84c4, 0x444d,
+            0x87, 0xca, 0xa0, 0x4e, 0x13, 0x28, 0x67, 0x39);
+/* 5bd9d474-5975-423a-b88b-65a8e7110e65 */
+DEFINE_GUID(IID_IDebugBreakpoint, 0x5bd9d474, 0x5975, 0x423a,
+            0xb8, 0x8b, 0x65, 0xa8, 0xe7, 0x11, 0x0e, 0x65);
+/* 1b278d20-79f2-426e-a3f9-c1ddf375d48e */
+DEFINE_GUID(IID_IDebugBreakpoint2, 0x1b278d20, 0x79f2, 0x426e,
+            0xa3, 0xf9, 0xc1, 0xdd, 0xf3, 0x75, 0xd4, 0x8e);
+/* 27fe5639-8407-4f47-8364-ee118fb08ac8 */
+DEFINE_GUID(IID_IDebugClient, 0x27fe5639, 0x8407, 0x4f47,
+            0x83, 0x64, 0xee, 0x11, 0x8f, 0xb0, 0x8a, 0xc8);
+/* edbed635-372e-4dab-bbfe-ed0d2f63be81 */
+DEFINE_GUID(IID_IDebugClient2, 0xedbed635, 0x372e, 0x4dab,
+        0xbb, 0xfe, 0xed, 0x0d, 0x2f, 0x63, 0xbe, 0x81);
+/* dd492d7f-71b8-4ad6-a8dc-1c887479ff91 */
+DEFINE_GUID(IID_IDebugClient3, 0xdd492d7f, 0x71b8, 0x4ad6,
+            0xa8, 0xdc, 0x1c, 0x88, 0x74, 0x79, 0xff, 0x91);
+/* ca83c3de-5089-4cf8-93c8-d892387f2a5e */
+DEFINE_GUID(IID_IDebugClient4, 0xca83c3de, 0x5089, 0x4cf8,
+            0x93, 0xc8, 0xd8, 0x92, 0x38, 0x7f, 0x2a, 0x5e);
+/* e3acb9d7-7ec2-4f0c-a0da-e81e0cbbe628 */
+DEFINE_GUID(IID_IDebugClient5, 0xe3acb9d7, 0x7ec2, 0x4f0c,
+            0xa0, 0xda, 0xe8, 0x1e, 0x0c, 0xbb, 0xe6, 0x28);
+/* 5182e668-105e-416e-ad92-24ef800424ba */
+DEFINE_GUID(IID_IDebugControl, 0x5182e668, 0x105e, 0x416e,
+            0xad, 0x92, 0x24, 0xef, 0x80, 0x04, 0x24, 0xba);
+/* d4366723-44df-4bed-8c7e-4c05424f4588 */
+DEFINE_GUID(IID_IDebugControl2, 0xd4366723, 0x44df, 0x4bed,
+            0x8c, 0x7e, 0x4c, 0x05, 0x42, 0x4f, 0x45, 0x88);
+/* 7df74a86-b03f-407f-90ab-a20dadcead08 */
+DEFINE_GUID(IID_IDebugControl3, 0x7df74a86, 0xb03f, 0x407f,
+            0x90, 0xab, 0xa2, 0x0d, 0xad, 0xce, 0xad, 0x08);
+/* 94e60ce9-9b41-4b19-9fc0-6d9eb35272b3 */
+DEFINE_GUID(IID_IDebugControl4, 0x94e60ce9, 0x9b41, 0x4b19,
+            0x9f, 0xc0, 0x6d, 0x9e, 0xb3, 0x52, 0x72, 0xb3);
+/* 88f7dfab-3ea7-4c3a-aefb-c4e8106173aa */
+DEFINE_GUID(IID_IDebugDataSpaces, 0x88f7dfab, 0x3ea7, 0x4c3a,
+            0xae, 0xfb, 0xc4, 0xe8, 0x10, 0x61, 0x73, 0xaa);
+/* 7a5e852f-96e9-468f-ac1b-0b3addc4a049 */
+DEFINE_GUID(IID_IDebugDataSpaces2, 0x7a5e852f, 0x96e9, 0x468f,
+            0xac, 0x1b, 0x0b, 0x3a, 0xdd, 0xc4, 0xa0, 0x49);
+/* 23f79d6c-8aaf-4f7c-a607-9995f5407e63 */
+DEFINE_GUID(IID_IDebugDataSpaces3, 0x23f79d6c, 0x8aaf, 0x4f7c,
+            0xa6, 0x07, 0x99, 0x95, 0xf5, 0x40, 0x7e, 0x63);
+/* d98ada1f-29e9-4ef5-a6c0-e53349883212 */
+DEFINE_GUID(IID_IDebugDataSpaces4, 0xd98ada1f, 0x29e9, 0x4ef5,
+            0xa6, 0xc0, 0xe5, 0x33, 0x49, 0x88, 0x32, 0x12);
+/* 337be28b-5036-4d72-b6bf-c45fbb9f2eaa */
+DEFINE_GUID(IID_IDebugEventCallbacks, 0x337be28b, 0x5036, 0x4d72,
+            0xb6, 0xbf, 0xc4, 0x5f, 0xbb, 0x9f, 0x2e, 0xaa);
+/* 0690e046-9c23-45ac-a04f-987ac29ad0d3 */
+DEFINE_GUID(IID_IDebugEventCallbacksWide, 0x0690e046, 0x9c23, 0x45ac,
+            0xa0, 0x4f, 0x98, 0x7a, 0xc2, 0x9a, 0xd0, 0xd3);
+/* 9f50e42c-f136-499e-9a97-73036c94ed2d */
+DEFINE_GUID(IID_IDebugInputCallbacks, 0x9f50e42c, 0xf136, 0x499e,
+            0x9a, 0x97, 0x73, 0x03, 0x6c, 0x94, 0xed, 0x2d);
+/* 4bf58045-d654-4c40-b0af-683090f356dc */
+DEFINE_GUID(IID_IDebugOutputCallbacks, 0x4bf58045, 0xd654, 0x4c40,
+            0xb0, 0xaf, 0x68, 0x30, 0x90, 0xf3, 0x56, 0xdc);
+/* 4c7fd663-c394-4e26-8ef1-34ad5ed3764c */
+DEFINE_GUID(IID_IDebugOutputCallbacksWide, 0x4c7fd663, 0xc394, 0x4e26,
+            0x8e, 0xf1, 0x34, 0xad, 0x5e, 0xd3, 0x76, 0x4c);
+/* ce289126-9e84-45a7-937e-67bb18691493 */
+DEFINE_GUID(IID_IDebugRegisters, 0xce289126, 0x9e84, 0x45a7,
+            0x93, 0x7e, 0x67, 0xbb, 0x18, 0x69, 0x14, 0x93);
+/* 1656afa9-19c6-4e3a-97e7-5dc9160cf9c4 */
+DEFINE_GUID(IID_IDebugRegisters2, 0x1656afa9, 0x19c6, 0x4e3a,
+            0x97, 0xe7, 0x5d, 0xc9, 0x16, 0x0c, 0xf9, 0xc4);
+/* f2528316-0f1a-4431-aeed-11d096e1e2ab */
+DEFINE_GUID(IID_IDebugSymbolGroup, 0xf2528316, 0x0f1a, 0x4431,
+            0xae, 0xed, 0x11, 0xd0, 0x96, 0xe1, 0xe2, 0xab);
+/* 6a7ccc5f-fb5e-4dcc-b41c-6c20307bccc7 */
+DEFINE_GUID(IID_IDebugSymbolGroup2, 0x6a7ccc5f, 0xfb5e, 0x4dcc,
+            0xb4, 0x1c, 0x6c, 0x20, 0x30, 0x7b, 0xcc, 0xc7);
+/* 8c31e98c-983a-48a5-9016-6fe5d667a950 */
+DEFINE_GUID(IID_IDebugSymbols, 0x8c31e98c, 0x983a, 0x48a5,
+            0x90, 0x16, 0x6f, 0xe5, 0xd6, 0x67, 0xa9, 0x50);
+/* 3a707211-afdd-4495-ad4f-56fecdf8163f */
+DEFINE_GUID(IID_IDebugSymbols2, 0x3a707211, 0xafdd, 0x4495,
+            0xad, 0x4f, 0x56, 0xfe, 0xcd, 0xf8, 0x16, 0x3f);
+/* f02fbecc-50ac-4f36-9ad9-c975e8f32ff8 */
+DEFINE_GUID(IID_IDebugSymbols3, 0xf02fbecc, 0x50ac, 0x4f36,
+            0x9a, 0xd9, 0xc9, 0x75, 0xe8, 0xf3, 0x2f, 0xf8);
+/* 6b86fe2c-2c4f-4f0c-9da2-174311acc327 */
+DEFINE_GUID(IID_IDebugSystemObjects, 0x6b86fe2c, 0x2c4f, 0x4f0c,
+            0x9d, 0xa2, 0x17, 0x43, 0x11, 0xac, 0xc3, 0x27);
+/* 0ae9f5ff-1852-4679-b055-494bee6407ee */
+DEFINE_GUID(IID_IDebugSystemObjects2, 0x0ae9f5ff, 0x1852, 0x4679,
+            0xb0, 0x55, 0x49, 0x4b, 0xee, 0x64, 0x07, 0xee);
+/* e9676e2f-e286-4ea3-b0f9-dfe5d9fc330e */
+DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3,
+            0xb0, 0xf9, 0xdf, 0xe5, 0xd9, 0xfc, 0x33, 0x0e);
+/* 489468e6-7d0f-4af5-87ab-25207454d553 */
+DEFINE_GUID(IID_IDebugSystemObjects4, 0x489468e6, 0x7d0f, 0x4af5,
+            0x87, 0xab, 0x25, 0x20, 0x74, 0x54, 0xd5, 0x53);
+
+typedef interface DECLSPEC_UUID("f2df5f53-071f-47bd-9de6-5734c3fed689")
+    IDebugAdvanced* PDEBUG_ADVANCED;
+typedef interface DECLSPEC_UUID("716d14c9-119b-4ba5-af1f-0890e672416a")
+    IDebugAdvanced2* PDEBUG_ADVANCED2;
+typedef interface DECLSPEC_UUID("cba4abb4-84c4-444d-87ca-a04e13286739")
+    IDebugAdvanced3* PDEBUG_ADVANCED3;
+typedef interface DECLSPEC_UUID("5bd9d474-5975-423a-b88b-65a8e7110e65")
+    IDebugBreakpoint* PDEBUG_BREAKPOINT;
+typedef interface DECLSPEC_UUID("1b278d20-79f2-426e-a3f9-c1ddf375d48e")
+    IDebugBreakpoint2* PDEBUG_BREAKPOINT2;
+typedef interface DECLSPEC_UUID("27fe5639-8407-4f47-8364-ee118fb08ac8")
+    IDebugClient* PDEBUG_CLIENT;
+typedef interface DECLSPEC_UUID("edbed635-372e-4dab-bbfe-ed0d2f63be81")
+    IDebugClient2* PDEBUG_CLIENT2;
+typedef interface DECLSPEC_UUID("dd492d7f-71b8-4ad6-a8dc-1c887479ff91")
+    IDebugClient3* PDEBUG_CLIENT3;
+typedef interface DECLSPEC_UUID("ca83c3de-5089-4cf8-93c8-d892387f2a5e")
+    IDebugClient4* PDEBUG_CLIENT4;
+typedef interface DECLSPEC_UUID("e3acb9d7-7ec2-4f0c-a0da-e81e0cbbe628")
+    IDebugClient5* PDEBUG_CLIENT5;
+typedef interface DECLSPEC_UUID("5182e668-105e-416e-ad92-24ef800424ba")
+    IDebugControl* PDEBUG_CONTROL;
+typedef interface DECLSPEC_UUID("d4366723-44df-4bed-8c7e-4c05424f4588")
+    IDebugControl2* PDEBUG_CONTROL2;
+typedef interface DECLSPEC_UUID("7df74a86-b03f-407f-90ab-a20dadcead08")
+    IDebugControl3* PDEBUG_CONTROL3;
+typedef interface DECLSPEC_UUID("94e60ce9-9b41-4b19-9fc0-6d9eb35272b3")
+    IDebugControl4* PDEBUG_CONTROL4;
+typedef interface DECLSPEC_UUID("88f7dfab-3ea7-4c3a-aefb-c4e8106173aa")
+    IDebugDataSpaces* PDEBUG_DATA_SPACES;
+typedef interface DECLSPEC_UUID("7a5e852f-96e9-468f-ac1b-0b3addc4a049")
+    IDebugDataSpaces2* PDEBUG_DATA_SPACES2;
+typedef interface DECLSPEC_UUID("23f79d6c-8aaf-4f7c-a607-9995f5407e63")
+    IDebugDataSpaces3* PDEBUG_DATA_SPACES3;
+typedef interface DECLSPEC_UUID("d98ada1f-29e9-4ef5-a6c0-e53349883212")
+    IDebugDataSpaces4* PDEBUG_DATA_SPACES4;
+typedef interface DECLSPEC_UUID("337be28b-5036-4d72-b6bf-c45fbb9f2eaa")
+    IDebugEventCallbacks* PDEBUG_EVENT_CALLBACKS;
+typedef interface DECLSPEC_UUID("0690e046-9c23-45ac-a04f-987ac29ad0d3")
+    IDebugEventCallbacksWide* PDEBUG_EVENT_CALLBACKS_WIDE;
+typedef interface DECLSPEC_UUID("9f50e42c-f136-499e-9a97-73036c94ed2d")
+    IDebugInputCallbacks* PDEBUG_INPUT_CALLBACKS;
+typedef interface DECLSPEC_UUID("4bf58045-d654-4c40-b0af-683090f356dc")
+    IDebugOutputCallbacks* PDEBUG_OUTPUT_CALLBACKS;
+typedef interface DECLSPEC_UUID("4c7fd663-c394-4e26-8ef1-34ad5ed3764c")
+    IDebugOutputCallbacksWide* PDEBUG_OUTPUT_CALLBACKS_WIDE;
+typedef interface DECLSPEC_UUID("ce289126-9e84-45a7-937e-67bb18691493")
+    IDebugRegisters* PDEBUG_REGISTERS;
+typedef interface DECLSPEC_UUID("1656afa9-19c6-4e3a-97e7-5dc9160cf9c4")
+    IDebugRegisters2* PDEBUG_REGISTERS2;
+typedef interface DECLSPEC_UUID("f2528316-0f1a-4431-aeed-11d096e1e2ab")
+    IDebugSymbolGroup* PDEBUG_SYMBOL_GROUP;
+typedef interface DECLSPEC_UUID("6a7ccc5f-fb5e-4dcc-b41c-6c20307bccc7")
+    IDebugSymbolGroup2* PDEBUG_SYMBOL_GROUP2;
+typedef interface DECLSPEC_UUID("8c31e98c-983a-48a5-9016-6fe5d667a950")
+    IDebugSymbols* PDEBUG_SYMBOLS;
+typedef interface DECLSPEC_UUID("3a707211-afdd-4495-ad4f-56fecdf8163f")
+    IDebugSymbols2* PDEBUG_SYMBOLS2;
+typedef interface DECLSPEC_UUID("f02fbecc-50ac-4f36-9ad9-c975e8f32ff8")
+    IDebugSymbols3* PDEBUG_SYMBOLS3;
+typedef interface DECLSPEC_UUID("6b86fe2c-2c4f-4f0c-9da2-174311acc327")
+    IDebugSystemObjects* PDEBUG_SYSTEM_OBJECTS;
+typedef interface DECLSPEC_UUID("0ae9f5ff-1852-4679-b055-494bee6407ee")
+    IDebugSystemObjects2* PDEBUG_SYSTEM_OBJECTS2;
+typedef interface DECLSPEC_UUID("e9676e2f-e286-4ea3-b0f9-dfe5d9fc330e")
+    IDebugSystemObjects3* PDEBUG_SYSTEM_OBJECTS3;
+typedef interface DECLSPEC_UUID("489468e6-7d0f-4af5-87ab-25207454d553")
+    IDebugSystemObjects4* PDEBUG_SYSTEM_OBJECTS4;
+
+//----------------------------------------------------------------------------
+//
+// Macros.
+//
+//----------------------------------------------------------------------------
+
+// Extends a 32-bit address into a 64-bit address.
+#define DEBUG_EXTEND64(Addr) ((ULONG64)(LONG64)(LONG)(Addr))
+
+//----------------------------------------------------------------------------
+//
+// Client creation functions.
+//
+//----------------------------------------------------------------------------
+
+// RemoteOptions specifies connection types and
+// their parameters.  Supported strings are:
+//    npipe:Server=<Machine>,Pipe=<Pipe name>
+//    tcp:Server=<Machine>,Port=<IP port>
+STDAPI
+DebugConnect(
+    __in PCSTR RemoteOptions,
+    __in REFIID InterfaceId,
+    __out PVOID* Interface
+    );
+
+STDAPI
+DebugConnectWide(
+    __in PCWSTR RemoteOptions,
+    __in REFIID InterfaceId,
+    __out PVOID* Interface
+    );
+
+STDAPI
+DebugCreate(
+    __in REFIID InterfaceId,
+    __out PVOID* Interface
+    );
+
+//----------------------------------------------------------------------------
+//
+// IDebugAdvanced.
+//
+//----------------------------------------------------------------------------
+
+typedef struct _DEBUG_OFFSET_REGION
+{
+    ULONG64 Base;
+    ULONG64 Size;
+} DEBUG_OFFSET_REGION, *PDEBUG_OFFSET_REGION;
+
+#undef INTERFACE
+#define INTERFACE IDebugAdvanced
+DECLARE_INTERFACE_(IDebugAdvanced, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugAdvanced.
+
+    // Get/SetThreadContext offer control over
+    // the full processor context for a thread.
+    // Higher-level functions, such as the
+    // IDebugRegisters interface, allow similar
+    // access in simpler and more generic ways.
+    // Get/SetThreadContext are useful when
+    // large amounts of thread context must
+    // be changed and processor-specific code
+    // is not a problem.
+    STDMETHOD(GetThreadContext)(
+        THIS_
+        __out_bcount(ContextSize) /* align_is(16) */ PVOID Context,
+        __in ULONG ContextSize
+        ) PURE;
+    STDMETHOD(SetThreadContext)(
+        THIS_
+        __in_bcount(ContextSize) /* align_is(16) */ PVOID Context,
+        __in ULONG ContextSize
+        ) PURE;
+};
+
+typedef struct _DEBUG_READ_USER_MINIDUMP_STREAM
+{
+    IN ULONG StreamType;
+    IN ULONG Flags;
+    IN ULONG64 Offset;
+    OUT PVOID Buffer;
+    IN ULONG BufferSize;
+    OUT ULONG BufferUsed;
+} DEBUG_READ_USER_MINIDUMP_STREAM, *PDEBUG_READ_USER_MINIDUMP_STREAM;
+
+//
+// Request requests.
+//
+
+// InBuffer - Unused.
+// OutBuffer - Unused.
+#define DEBUG_REQUEST_SOURCE_PATH_HAS_SOURCE_SERVER 0
+
+// InBuffer - Unused.
+// OutBuffer - Machine-specific CONTEXT.
+#define DEBUG_REQUEST_TARGET_EXCEPTION_CONTEXT 1
+
+// InBuffer - Unused.
+// OutBuffer - ULONG system ID of thread.
+#define DEBUG_REQUEST_TARGET_EXCEPTION_THREAD 2
+
+// InBuffer - Unused.
+// OutBuffer - EXCEPTION_RECORD64.
+#define DEBUG_REQUEST_TARGET_EXCEPTION_RECORD 3
+
+// InBuffer - Unused.
+// OutBuffer - DEBUG_CREATE_PROCESS_OPTIONS.
+#define DEBUG_REQUEST_GET_ADDITIONAL_CREATE_OPTIONS 4
+
+// InBuffer - DEBUG_CREATE_PROCESS_OPTIONS.
+// OutBuffer - Unused.
+#define DEBUG_REQUEST_SET_ADDITIONAL_CREATE_OPTIONS 5
+
+// InBuffer - Unused.
+// OutBuffer - ULONG[2] major/minor.
+#define DEBUG_REQUEST_GET_WIN32_MAJOR_MINOR_VERSIONS 6
+
+// InBuffer - DEBUG_READ_USER_MINIDUMP_STREAM.
+// OutBuffer - Unused.
+#define DEBUG_REQUEST_READ_USER_MINIDUMP_STREAM 7
+
+// InBuffer - Unused.
+// OutBuffer - Unused.
+#define DEBUG_REQUEST_TARGET_CAN_DETACH 8
+
+// InBuffer - PTSTR.
+// OutBuffer - Unused.
+#define DEBUG_REQUEST_SET_LOCAL_IMPLICIT_COMMAND_LINE 9
+
+//
+// GetSourceFileInformation requests.
+//
+
+// Arg64 - Module base.
+// Arg32 - Unused.
+#define DEBUG_SRCFILE_SYMBOL_TOKEN 0
+
+// Arg64 - Module base.
+// Arg32 - Unused.
+#define DEBUG_SRCFILE_SYMBOL_TOKEN_SOURCE_COMMAND_WIDE 1
+
+//
+// GetSymbolInformation requests.
+//
+
+// Arg64 - Unused.
+// Arg32 - Breakpoint ID.
+// Buffer - ULONG line number.
+// String - File name.
+#define DEBUG_SYMINFO_BREAKPOINT_SOURCE_LINE 0
+
+// Arg64 - Module base.
+// Arg32 - Unused.
+// Buffer - IMAGEHLP_MODULEW64.
+// String - Unused.
+#define DEBUG_SYMINFO_IMAGEHLP_MODULEW64 1
+
+//
+// GetSystemObjectInformation requests.
+//
+
+// Arg64 - Unused.
+// Arg32 - Debugger thread ID.
+#define DEBUG_SYSOBJINFO_THREAD_BASIC_INFORMATION 0
+
+#define DEBUG_TBINFO_EXIT_STATUS    0x00000001
+#define DEBUG_TBINFO_PRIORITY_CLASS 0x00000002
+#define DEBUG_TBINFO_PRIORITY       0x00000004
+#define DEBUG_TBINFO_TIMES          0x00000008
+#define DEBUG_TBINFO_START_OFFSET   0x00000010
+#define DEBUG_TBINFO_AFFINITY       0x00000020
+#define DEBUG_TBINFO_ALL            0x0000003f
+
+typedef struct _DEBUG_THREAD_BASIC_INFORMATION
+{
+    // Valid members have a DEBUG_TBINFO bit set in Valid.
+    ULONG Valid;
+    ULONG ExitStatus;
+    ULONG PriorityClass;
+    ULONG Priority;
+    ULONG64 CreateTime;
+    ULONG64 ExitTime;
+    ULONG64 KernelTime;
+    ULONG64 UserTime;
+    ULONG64 StartOffset;
+    ULONG64 Affinity;
+} DEBUG_THREAD_BASIC_INFORMATION, *PDEBUG_THREAD_BASIC_INFORMATION;
+
+#undef INTERFACE
+#define INTERFACE IDebugAdvanced2
+DECLARE_INTERFACE_(IDebugAdvanced2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugAdvanced.
+
+    // Get/SetThreadContext offer control over
+    // the full processor context for a thread.
+    // Higher-level functions, such as the
+    // IDebugRegisters interface, allow similar
+    // access in simpler and more generic ways.
+    // Get/SetThreadContext are useful when
+    // large amounts of thread context must
+    // be changed and processor-specific code
+    // is not a problem.
+    STDMETHOD(GetThreadContext)(
+        THIS_
+        __out_bcount(ContextSize) /* align_is(16) */ PVOID Context,
+        __in ULONG ContextSize
+        ) PURE;
+    STDMETHOD(SetThreadContext)(
+        THIS_
+        __in_bcount(ContextSize) /* align_is(16) */ PVOID Context,
+        __in ULONG ContextSize
+        ) PURE;
+
+    // IDebugAdvanced2.
+
+    //
+    // Generalized open-ended methods for querying
+    // and manipulation.  The open-ended nature of
+    // these methods makes it easy to add new requests,
+    // although at a cost in convenience of calling.
+    // Sufficiently common requests may have more specific,
+    // simpler methods elsewhere.
+    //
+
+    STDMETHOD(Request)(
+        THIS_
+        __in ULONG Request,
+        __in_bcount_opt(InBufferSize) PVOID InBuffer,
+        __in ULONG InBufferSize,
+        __out_bcount_opt(OutBufferSize) PVOID OutBuffer,
+        __in ULONG OutBufferSize,
+        __out_opt PULONG OutSize
+        ) PURE;
+
+    STDMETHOD(GetSourceFileInformation)(
+        THIS_
+        __in ULONG Which,
+        __in PSTR SourceFile,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize
+        ) PURE;
+    STDMETHOD(FindSourceFileAndToken)(
+        THIS_
+        __in ULONG StartElement,
+        __in ULONG64 ModAddr,
+        __in PCSTR File,
+        __in ULONG Flags,
+        __in_bcount_opt(FileTokenSize) PVOID FileToken,
+        __in ULONG FileTokenSize,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+
+    STDMETHOD(GetSymbolInformation)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize,
+        __out_ecount_opt(StringBufferSize) PSTR StringBuffer,
+        __in ULONG StringBufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+
+    STDMETHOD(GetSystemObjectInformation)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugAdvanced3
+DECLARE_INTERFACE_(IDebugAdvanced3, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugAdvanced.
+
+    // Get/SetThreadContext offer control over
+    // the full processor context for a thread.
+    // Higher-level functions, such as the
+    // IDebugRegisters interface, allow similar
+    // access in simpler and more generic ways.
+    // Get/SetThreadContext are useful when
+    // large amounts of thread context must
+    // be changed and processor-specific code
+    // is not a problem.
+    STDMETHOD(GetThreadContext)(
+        THIS_
+        __out_bcount(ContextSize) /* align_is(16) */ PVOID Context,
+        __in ULONG ContextSize
+        ) PURE;
+    STDMETHOD(SetThreadContext)(
+        THIS_
+        __in_bcount(ContextSize) /* align_is(16) */ PVOID Context,
+        __in ULONG ContextSize
+        ) PURE;
+
+    // IDebugAdvanced2.
+
+    //
+    // Generalized open-ended methods for querying
+    // and manipulation.  The open-ended nature of
+    // these methods makes it easy to add new requests,
+    // although at a cost in convenience of calling.
+    // Sufficiently common requests may have more specific,
+    // simpler methods elsewhere.
+    //
+
+    STDMETHOD(Request)(
+        THIS_
+        __in ULONG Request,
+        __in_bcount_opt(InBufferSize) PVOID InBuffer,
+        __in ULONG InBufferSize,
+        __out_bcount_opt(OutBufferSize) PVOID OutBuffer,
+        __in ULONG OutBufferSize,
+        __out_opt PULONG OutSize
+        ) PURE;
+
+    STDMETHOD(GetSourceFileInformation)(
+        THIS_
+        __in ULONG Which,
+        __in PSTR SourceFile,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize
+        ) PURE;
+    STDMETHOD(FindSourceFileAndToken)(
+        THIS_
+        __in ULONG StartElement,
+        __in ULONG64 ModAddr,
+        __in PCSTR File,
+        __in ULONG Flags,
+        __in_bcount_opt(FileTokenSize) PVOID FileToken,
+        __in ULONG FileTokenSize,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+
+    STDMETHOD(GetSymbolInformation)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize,
+        __out_ecount_opt(StringBufferSize) PSTR StringBuffer,
+        __in ULONG StringBufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+
+    STDMETHOD(GetSystemObjectInformation)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize
+        ) PURE;
+
+    // IDebugAdvanced3.
+
+    STDMETHOD(GetSourceFileInformationWide)(
+        THIS_
+        __in ULONG Which,
+        __in PWSTR SourceFile,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize
+        ) PURE;
+    STDMETHOD(FindSourceFileAndTokenWide)(
+        THIS_
+        __in ULONG StartElement,
+        __in ULONG64 ModAddr,
+        __in PCWSTR File,
+        __in ULONG Flags,
+        __in_bcount_opt(FileTokenSize) PVOID FileToken,
+        __in ULONG FileTokenSize,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+
+    STDMETHOD(GetSymbolInformationWide)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG64 Arg64,
+        __in ULONG Arg32,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize,
+        __out_ecount_opt(StringBufferSize) PWSTR StringBuffer,
+        __in ULONG StringBufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugBreakpoint.
+//
+//----------------------------------------------------------------------------
+
+// Types of breakpoints.
+#define DEBUG_BREAKPOINT_CODE 0
+#define DEBUG_BREAKPOINT_DATA 1
+
+// Breakpoint flags.
+// Go-only breakpoints are only active when
+// the engine is in unrestricted execution
+// mode.  They do not fire when the engine
+// is stepping.
+#define DEBUG_BREAKPOINT_GO_ONLY    0x00000001
+// A breakpoint is flagged as deferred as long as
+// its offset expression cannot be evaluated.
+// A deferred breakpoint is not active.
+#define DEBUG_BREAKPOINT_DEFERRED   0x00000002
+#define DEBUG_BREAKPOINT_ENABLED    0x00000004
+// The adder-only flag does not affect breakpoint
+// operation.  It is just a marker to restrict
+// output and notifications for the breakpoint to
+// the client that added the breakpoint.  Breakpoint
+// callbacks for adder-only breaks will only be delivered
+// to the adding client.  The breakpoint can not
+// be enumerated and accessed by other clients.
+#define DEBUG_BREAKPOINT_ADDER_ONLY 0x00000008
+// One-shot breakpoints automatically clear themselves
+// the first time they are hit.
+#define DEBUG_BREAKPOINT_ONE_SHOT   0x00000010
+
+// Data breakpoint access types.
+// Different architectures support different
+// sets of these bits.
+#define DEBUG_BREAK_READ    0x00000001
+#define DEBUG_BREAK_WRITE   0x00000002
+#define DEBUG_BREAK_EXECUTE 0x00000004
+#define DEBUG_BREAK_IO      0x00000008
+
+// Structure for querying breakpoint information
+// all at once.
+typedef struct _DEBUG_BREAKPOINT_PARAMETERS
+{
+    ULONG64 Offset;
+    ULONG Id;
+    ULONG BreakType;
+    ULONG ProcType;
+    ULONG Flags;
+    ULONG DataSize;
+    ULONG DataAccessType;
+    ULONG PassCount;
+    ULONG CurrentPassCount;
+    ULONG MatchThread;
+    ULONG CommandSize;
+    ULONG OffsetExpressionSize;
+} DEBUG_BREAKPOINT_PARAMETERS, *PDEBUG_BREAKPOINT_PARAMETERS;
+
+#undef INTERFACE
+#define INTERFACE IDebugBreakpoint
+DECLARE_INTERFACE_(IDebugBreakpoint, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugBreakpoint.
+
+    // Retrieves debugger engine unique ID
+    // for the breakpoint.  This ID is
+    // fixed as long as the breakpoint exists
+    // but after that may be reused.
+    STDMETHOD(GetId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    // Retrieves the type of break and
+    // processor type for the breakpoint.
+    STDMETHOD(GetType)(
+        THIS_
+        __out PULONG BreakType,
+        __out PULONG ProcType
+        ) PURE;
+    // Returns the client that called AddBreakpoint.
+    STDMETHOD(GetAdder)(
+        THIS_
+        __out PDEBUG_CLIENT* Adder
+        ) PURE;
+
+    STDMETHOD(GetFlags)(
+        THIS_
+        __out PULONG Flags
+        ) PURE;
+    // Only certain flags can be changed.  Flags
+    // are: GO_ONLY, ENABLE.
+    // Sets the given flags.
+    STDMETHOD(AddFlags)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Clears the given flags.
+    STDMETHOD(RemoveFlags)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Sets the flags.
+    STDMETHOD(SetFlags)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+
+    // Controls the offset of the breakpoint.  The
+    // interpretation of the offset value depends on
+    // the type of breakpoint and its settings.  It
+    // may be a code address, a data address, an
+    // I/O port, etc.
+    STDMETHOD(GetOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+
+    // Data breakpoint methods will fail if the
+    // target platform does not support the
+    // parameters used.
+    // These methods only function for breakpoints
+    // created as data breakpoints.
+    STDMETHOD(GetDataParameters)(
+        THIS_
+        __out PULONG Size,
+        __out PULONG AccessType
+        ) PURE;
+    STDMETHOD(SetDataParameters)(
+        THIS_
+        __in ULONG Size,
+        __in ULONG AccessType
+        ) PURE;
+
+    // Pass count defaults to one.
+    STDMETHOD(GetPassCount)(
+        THIS_
+        __out PULONG Count
+        ) PURE;
+    STDMETHOD(SetPassCount)(
+        THIS_
+        __in ULONG Count
+        ) PURE;
+    // Gets the current number of times
+    // the breakpoint has been hit since
+    // it was last triggered.
+    STDMETHOD(GetCurrentPassCount)(
+        THIS_
+        __out PULONG Count
+        ) PURE;
+
+    // If a match thread is set this breakpoint will
+    // only trigger if it occurs on the match thread.
+    // Otherwise it triggers for all threads.
+    // Thread restrictions are not currently supported
+    // in kernel mode.
+    STDMETHOD(GetMatchThreadId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetMatchThreadId)(
+        THIS_
+        __in ULONG Thread
+        ) PURE;
+
+    // The command for a breakpoint is automatically
+    // executed by the engine before the event
+    // is propagated.  If the breakpoint continues
+    // execution the event will begin with a continue
+    // status.  If the breakpoint does not continue
+    // the event will begin with a break status.
+    // This allows breakpoint commands to participate
+    // in the normal event status voting.
+    // Breakpoint commands are only executed until
+    // the first command that alters the execution
+    // status, such as g, p and t.
+    STDMETHOD(GetCommand)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetCommand)(
+        THIS_
+        __in PCSTR Command
+        ) PURE;
+
+    // Offset expressions are evaluated immediately
+    // and at module load and unload events.  If the
+    // evaluation is successful the breakpoints
+    // offset is updated and the breakpoint is
+    // handled normally.  If the expression cannot
+    // be evaluated the breakpoint is deferred.
+    // Currently the only offset expression
+    // supported is a module-relative symbol
+    // of the form <Module>!<Symbol>.
+    STDMETHOD(GetOffsetExpression)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExpressionSize
+        ) PURE;
+    STDMETHOD(SetOffsetExpression)(
+        THIS_
+        __in PCSTR Expression
+        ) PURE;
+
+    STDMETHOD(GetParameters)(
+        THIS_
+        __out PDEBUG_BREAKPOINT_PARAMETERS Params
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugBreakpoint2
+DECLARE_INTERFACE_(IDebugBreakpoint2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugBreakpoint.
+
+    // Retrieves debugger engine unique ID
+    // for the breakpoint.  This ID is
+    // fixed as long as the breakpoint exists
+    // but after that may be reused.
+    STDMETHOD(GetId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    // Retrieves the type of break and
+    // processor type for the breakpoint.
+    STDMETHOD(GetType)(
+        THIS_
+        __out PULONG BreakType,
+        __out PULONG ProcType
+        ) PURE;
+    // Returns the client that called AddBreakpoint.
+    STDMETHOD(GetAdder)(
+        THIS_
+        __out PDEBUG_CLIENT* Adder
+        ) PURE;
+
+    STDMETHOD(GetFlags)(
+        THIS_
+        __out PULONG Flags
+        ) PURE;
+    // Only certain flags can be changed.  Flags
+    // are: GO_ONLY, ENABLE.
+    // Sets the given flags.
+    STDMETHOD(AddFlags)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Clears the given flags.
+    STDMETHOD(RemoveFlags)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Sets the flags.
+    STDMETHOD(SetFlags)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+
+    // Controls the offset of the breakpoint.  The
+    // interpretation of the offset value depends on
+    // the type of breakpoint and its settings.  It
+    // may be a code address, a data address, an
+    // I/O port, etc.
+    STDMETHOD(GetOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+
+    // Data breakpoint methods will fail if the
+    // target platform does not support the
+    // parameters used.
+    // These methods only function for breakpoints
+    // created as data breakpoints.
+    STDMETHOD(GetDataParameters)(
+        THIS_
+        __out PULONG Size,
+        __out PULONG AccessType
+        ) PURE;
+    STDMETHOD(SetDataParameters)(
+        THIS_
+        __in ULONG Size,
+        __in ULONG AccessType
+        ) PURE;
+
+    // Pass count defaults to one.
+    STDMETHOD(GetPassCount)(
+        THIS_
+        __out PULONG Count
+        ) PURE;
+    STDMETHOD(SetPassCount)(
+        THIS_
+        __in ULONG Count
+        ) PURE;
+    // Gets the current number of times
+    // the breakpoint has been hit since
+    // it was last triggered.
+    STDMETHOD(GetCurrentPassCount)(
+        THIS_
+        __out PULONG Count
+        ) PURE;
+
+    // If a match thread is set this breakpoint will
+    // only trigger if it occurs on the match thread.
+    // Otherwise it triggers for all threads.
+    // Thread restrictions are not currently supported
+    // in kernel mode.
+    STDMETHOD(GetMatchThreadId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetMatchThreadId)(
+        THIS_
+        __in ULONG Thread
+        ) PURE;
+
+    // The command for a breakpoint is automatically
+    // executed by the engine before the event
+    // is propagated.  If the breakpoint continues
+    // execution the event will begin with a continue
+    // status.  If the breakpoint does not continue
+    // the event will begin with a break status.
+    // This allows breakpoint commands to participate
+    // in the normal event status voting.
+    // Breakpoint commands are only executed until
+    // the first command that alters the execution
+    // status, such as g, p and t.
+    STDMETHOD(GetCommand)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetCommand)(
+        THIS_
+        __in PCSTR Command
+        ) PURE;
+
+    // Offset expressions are evaluated immediately
+    // and at module load and unload events.  If the
+    // evaluation is successful the breakpoints
+    // offset is updated and the breakpoint is
+    // handled normally.  If the expression cannot
+    // be evaluated the breakpoint is deferred.
+    // Currently the only offset expression
+    // supported is a module-relative symbol
+    // of the form <Module>!<Symbol>.
+    STDMETHOD(GetOffsetExpression)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExpressionSize
+        ) PURE;
+    STDMETHOD(SetOffsetExpression)(
+        THIS_
+        __in PCSTR Expression
+        ) PURE;
+
+    STDMETHOD(GetParameters)(
+        THIS_
+        __out PDEBUG_BREAKPOINT_PARAMETERS Params
+        ) PURE;
+
+    // IDebugBreakpoint2.
+
+    STDMETHOD(GetCommandWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetCommandWide)(
+        THIS_
+        __in PCWSTR Command
+        ) PURE;
+
+    STDMETHOD(GetOffsetExpressionWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExpressionSize
+        ) PURE;
+    STDMETHOD(SetOffsetExpressionWide)(
+        THIS_
+        __in PCWSTR Expression
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugClient.
+//
+//----------------------------------------------------------------------------
+
+// Kernel attach flags.
+#define DEBUG_ATTACH_KERNEL_CONNECTION 0x00000000
+// Attach to the local machine.  If this flag is not set
+// a connection is made to a separate target machine using
+// the given connection options.
+#define DEBUG_ATTACH_LOCAL_KERNEL      0x00000001
+// Attach to an eXDI driver.
+#define DEBUG_ATTACH_EXDI_DRIVER       0x00000002
+
+// GetRunningProcessSystemIdByExecutableName flags.
+// By default the match allows a tail match on
+// just the filename.  The match returns the first hit
+// even if multiple matches exist.
+#define DEBUG_GET_PROC_DEFAULT    0x00000000
+// The name must match fully.
+#define DEBUG_GET_PROC_FULL_MATCH 0x00000001
+// The match must be the only match.
+#define DEBUG_GET_PROC_ONLY_MATCH 0x00000002
+
+// GetRunningProcessDescription flags.
+#define DEBUG_PROC_DESC_DEFAULT         0x00000000
+// Return only filenames, not full paths.
+#define DEBUG_PROC_DESC_NO_PATHS        0x00000001
+// Dont look up service names.
+#define DEBUG_PROC_DESC_NO_SERVICES     0x00000002
+// Dont look up MTS package names.
+#define DEBUG_PROC_DESC_NO_MTS_PACKAGES 0x00000004
+// Dont retrieve the command line.
+#define DEBUG_PROC_DESC_NO_COMMAND_LINE 0x00000008
+
+//
+// Attach flags.
+//
+
+// Call DebugActiveProcess when attaching.
+#define DEBUG_ATTACH_DEFAULT                   0x00000000
+// When attaching to a process just examine
+// the process state and suspend the threads.
+// DebugActiveProcess is not called so the process
+// is not actually being debugged.  This is useful
+// for debugging processes holding locks which
+// interfere with the operation of DebugActiveProcess
+// or in situations where it is not desirable to
+// actually set up as a debugger.
+#define DEBUG_ATTACH_NONINVASIVE               0x00000001
+// Attempt to attach to a process that was abandoned
+// when being debugged.  This is only supported in
+// some system versions.
+// This flag also allows multiple debuggers to
+// attach to the same process, which can result
+// in numerous problems unless very carefully
+// managed.
+#define DEBUG_ATTACH_EXISTING                  0x00000002
+// When attaching non-invasively, do not suspend
+// threads.  It is the callers responsibility
+// to either suspend the threads itself or be
+// aware that the attach state may not reflect
+// the current state of the process if threads
+// are still running.
+#define DEBUG_ATTACH_NONINVASIVE_NO_SUSPEND    0x00000004
+// When doing an invasive attach do not inject
+// a break-in thread to generate the initial break-in
+// event.  This can be useful to save resources when
+// an initial break is not necessary or when injecting
+// a thread might affect the debuggee's state.  This
+// option is only supported on Windows XP and above.
+#define DEBUG_ATTACH_INVASIVE_NO_INITIAL_BREAK 0x00000008
+// When doing an invasive attach resume all threads at the
+// time of attach.  This makes it possible to attach
+// to a process created suspended and cause it to start running.
+#define DEBUG_ATTACH_INVASIVE_RESUME_PROCESS   0x00000010
+
+//
+// Process creation flags to merge with Win32 flags.
+//
+
+// On Windows XP this flag prevents the debug
+// heap from being used in the new process.
+#define DEBUG_CREATE_PROCESS_NO_DEBUG_HEAP CREATE_UNICODE_ENVIRONMENT
+// Indicates that the native NT RTL process creation
+// routines should be used instead of Win32.  This
+// is only meaningful for special processes that run
+// as NT native processes.
+#define DEBUG_CREATE_PROCESS_THROUGH_RTL   STACK_SIZE_PARAM_IS_A_RESERVATION
+
+//
+// Process creation flags specific to the debugger engine.
+//
+
+#define DEBUG_ECREATE_PROCESS_DEFAULT                   0x00000000
+#define DEBUG_ECREATE_PROCESS_INHERIT_HANDLES           0x00000001
+#define DEBUG_ECREATE_PROCESS_USE_VERIFIER_FLAGS        0x00000002
+#define DEBUG_ECREATE_PROCESS_USE_IMPLICIT_COMMAND_LINE 0x00000004
+
+typedef struct _DEBUG_CREATE_PROCESS_OPTIONS
+{
+    // Win32 create flags.
+    ULONG CreateFlags;
+    // DEBUG_ECREATE_PROCESS_* flags.
+    ULONG EngCreateFlags;
+    // Application Verifier flags,
+    // if DEBUG_ECREATE_PROCESS_USE_VERIFIER_FLAGS is set.
+    ULONG VerifierFlags;
+    // Must be zero.
+    ULONG Reserved;
+} DEBUG_CREATE_PROCESS_OPTIONS, *PDEBUG_CREATE_PROCESS_OPTIONS;
+
+//
+// Process options.
+//
+
+// Indicates that the debuggee process should be
+// automatically detached when the debugger exits.
+// A debugger can explicitly detach on exit or this
+// flag can be set so that detach occurs regardless
+// of how the debugger exits.
+// This is only supported on some system versions.
+#define DEBUG_PROCESS_DETACH_ON_EXIT    0x00000001
+// Indicates that processes created by the current
+// process should not be debugged.
+// Modifying this flag is only supported on some
+// system versions.
+#define DEBUG_PROCESS_ONLY_THIS_PROCESS 0x00000002
+
+// ConnectSession flags.
+// Default connect.
+#define DEBUG_CONNECT_SESSION_DEFAULT     0x00000000
+// Do not output the debugger version.
+#define DEBUG_CONNECT_SESSION_NO_VERSION  0x00000001
+// Do not announce the connection.
+#define DEBUG_CONNECT_SESSION_NO_ANNOUNCE 0x00000002
+
+// OutputServers flags.
+// Debugger servers from StartSever.
+#define DEBUG_SERVERS_DEBUGGER 0x00000001
+// Process servers from StartProcessServer.
+#define DEBUG_SERVERS_PROCESS  0x00000002
+#define DEBUG_SERVERS_ALL      0x00000003
+
+// EndSession flags.
+// Perform cleanup for the session.
+#define DEBUG_END_PASSIVE          0x00000000
+// Actively terminate the session and then perform cleanup.
+#define DEBUG_END_ACTIVE_TERMINATE 0x00000001
+// If possible, detach from all processes and then perform cleanup.
+#define DEBUG_END_ACTIVE_DETACH    0x00000002
+// Perform whatever cleanup is possible that doesn't require
+// acquiring any locks.  This is useful for situations where
+// a thread is currently using the engine but the application
+// needs to exit and still wants to give the engine
+// the opportunity to clean up as much as possible.
+// This may leave the engine in an indeterminate state so
+// further engine calls should not be made.
+// When making a reentrant EndSession call from a remote
+// client it is the callers responsibility to ensure
+// that the server can process the request.  It is best
+// to avoid making such calls.
+#define DEBUG_END_REENTRANT        0x00000003
+// Notify a server that a remote client is disconnecting.
+// This isnt required but if it isnt called then
+// no disconnect messages will be generated by the server.
+#define DEBUG_END_DISCONNECT       0x00000004
+
+// Output mask bits.
+// Normal output.
+#define DEBUG_OUTPUT_NORMAL            0x00000001
+// Error output.
+#define DEBUG_OUTPUT_ERROR             0x00000002
+// Warnings.
+#define DEBUG_OUTPUT_WARNING           0x00000004
+// Additional output.
+#define DEBUG_OUTPUT_VERBOSE           0x00000008
+// Prompt output.
+#define DEBUG_OUTPUT_PROMPT            0x00000010
+// Register dump before prompt.
+#define DEBUG_OUTPUT_PROMPT_REGISTERS  0x00000020
+// Warnings specific to extension operation.
+#define DEBUG_OUTPUT_EXTENSION_WARNING 0x00000040
+// Debuggee debug output, such as from OutputDebugString.
+#define DEBUG_OUTPUT_DEBUGGEE          0x00000080
+// Debuggee-generated prompt, such as from DbgPrompt.
+#define DEBUG_OUTPUT_DEBUGGEE_PROMPT   0x00000100
+// Symbol messages, such as for !sym noisy.
+#define DEBUG_OUTPUT_SYMBOLS           0x00000200
+
+// Internal debugger output, used mainly
+// for debugging the debugger.  Output
+// may only occur in debug builds.
+// KD protocol output.
+#define DEBUG_IOUTPUT_KD_PROTOCOL      0x80000000
+// Remoting output.
+#define DEBUG_IOUTPUT_REMOTING         0x40000000
+// Breakpoint output.
+#define DEBUG_IOUTPUT_BREAKPOINT       0x20000000
+// Event output.
+#define DEBUG_IOUTPUT_EVENT            0x10000000
+
+// OutputIdentity flags.
+#define DEBUG_OUTPUT_IDENTITY_DEFAULT 0x00000000
+
+#undef INTERFACE
+#define INTERFACE IDebugClient
+DECLARE_INTERFACE_(IDebugClient, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugClient.
+
+    // The following set of methods start
+    // the different kinds of debuggees.
+
+    // Begins a debug session using the kernel
+    // debugging protocol.  This method selects
+    // the protocol as the debuggee communication
+    // mechanism but does not initiate the communication
+    // itself.
+    STDMETHOD(AttachKernel)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PCSTR ConnectOptions
+        ) PURE;
+    STDMETHOD(GetKernelConnectionOptions)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG OptionsSize
+        ) PURE;
+    // Updates the connection options for a live
+    // kernel connection.  This can only be used
+    // to modify parameters for the connection, not
+    // to switch to a completely different kind of
+    // connection.
+    // This method is reentrant.
+    STDMETHOD(SetKernelConnectionOptions)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+
+    // Starts a process server for remote
+    // user-mode process control.
+    // The local process server is server zero.
+    STDMETHOD(StartProcessServer)(
+        THIS_
+        __in ULONG Flags,
+        __in PCSTR Options,
+        __in __reserved PVOID Reserved
+        ) PURE;
+    STDMETHOD(ConnectProcessServer)(
+        THIS_
+        __in PCSTR RemoteOptions,
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(DisconnectProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+
+    // Enumerates and describes processes
+    // accessible through the given process server.
+    STDMETHOD(GetRunningProcessSystemIds)(
+        THIS_
+        __in ULONG64 Server,
+        __out_ecount_opt(Count) PULONG Ids,
+        __in ULONG Count,
+        __out_opt PULONG ActualCount
+        ) PURE;
+    STDMETHOD(GetRunningProcessSystemIdByExecutableName)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescription)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    // Attaches to a running user-mode process.
+    STDMETHOD(AttachProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Creates a new user-mode process for debugging.
+    // CreateFlags are as given to Win32s CreateProcess.
+    // One of DEBUG_PROCESS or DEBUG_ONLY_THIS_PROCESS
+    // must be specified.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in PSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    // Creates or attaches to a user-mode process, or both.
+    // If CommandLine is NULL this method operates as
+    // AttachProcess does.  If ProcessId is zero it
+    // operates as CreateProcess does.  If CommandLine is
+    // non-NULL and ProcessId is non-zero the method first
+    // starts a process with the given information but
+    // in a suspended state.  The engine then attaches to
+    // the indicated process.  Once the attach is successful
+    // the suspended process is resumed.  This provides
+    // synchronization between the new process and the
+    // attachment.
+    STDMETHOD(CreateProcessAndAttach)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Gets and sets process control flags.
+    STDMETHOD(GetProcessOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Opens any kind of user- or kernel-mode dump file
+    // and begins a debug session with the information
+    // contained within it.
+    STDMETHOD(OpenDumpFile)(
+        THIS_
+        __in PCSTR DumpFile
+        ) PURE;
+    // Writes a dump file from the current session information.
+    // The kind of dump file written is determined by the
+    // kind of session and the type qualifier given.
+    // For example, if the current session is a kernel
+    // debug session (DEBUG_CLASS_KERNEL) and the qualifier
+    // is DEBUG_DUMP_SMALL a small kernel dump will be written.
+    STDMETHOD(WriteDumpFile)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier
+        ) PURE;
+
+    // Indicates that a remote client is ready to
+    // begin participating in the current session.
+    // HistoryLimit gives a character limit on
+    // the amount of output history to be sent.
+    STDMETHOD(ConnectSession)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG HistoryLimit
+        ) PURE;
+    // Indicates that the engine should start accepting
+    // remote connections. Options specifies connection types
+    // and their parameters.  Supported strings are:
+    //    npipe:Pipe=<Pipe name>
+    //    tcp:Port=<IP port>
+    STDMETHOD(StartServer)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+    // List the servers running on the given machine.
+    // Uses the line prefix.
+    STDMETHOD(OutputServers)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Machine,
+        __in ULONG Flags
+        ) PURE;
+
+    // Attempts to terminate all processes in the debuggers list.
+    STDMETHOD(TerminateProcesses)(
+        THIS
+        ) PURE;
+    // Attempts to detach from all processes in the debuggers list.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachProcesses)(
+        THIS
+        ) PURE;
+    // Stops the current debug session.  If a process
+    // was created or attached an active EndSession can
+    // terminate or detach from it.
+    // If a kernel connection was opened it will be closed but the
+    // target machine is otherwise unaffected.
+    STDMETHOD(EndSession)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // If a process was started and ran to completion
+    // this method can be used to retrieve its exit code.
+    STDMETHOD(GetExitCode)(
+        THIS_
+        __out PULONG Code
+        ) PURE;
+
+    // Client event callbacks are called on the thread
+    // of the client.  In order to give thread
+    // execution to the engine for callbacks all
+    // client threads should call DispatchCallbacks
+    // when they are idle.  Callbacks are only
+    // received when a thread calls DispatchCallbacks
+    // or WaitForEvent.  WaitForEvent can only be
+    // called by the thread that started the debug
+    // session so all other client threads should
+    // call DispatchCallbacks when possible.
+    // DispatchCallbacks returns when ExitDispatch is used
+    // to interrupt dispatch or when the timeout expires.
+    // DispatchCallbacks dispatches callbacks for all
+    // clients associated with the thread calling
+    // DispatchCallbacks.
+    // DispatchCallbacks returns S_FALSE when the
+    // timeout expires.
+    STDMETHOD(DispatchCallbacks)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+    // ExitDispatch can be used to interrupt callback
+    // dispatch when a client thread is needed by the
+    // client.  This method is reentrant and can
+    // be called from any thread.
+    STDMETHOD(ExitDispatch)(
+        THIS_
+        __in PDEBUG_CLIENT Client
+        ) PURE;
+
+    // Clients are specific to the thread that
+    // created them.  Calls from other threads
+    // fail immediately.  The CreateClient method
+    // is a notable exception; it allows creation
+    // of a new client for a new thread.
+    STDMETHOD(CreateClient)(
+        THIS_
+        __out PDEBUG_CLIENT* Client
+        ) PURE;
+
+    STDMETHOD(GetInputCallbacks)(
+        THIS_
+        __out PDEBUG_INPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetInputCallbacks)(
+        THIS_
+        __in PDEBUG_INPUT_CALLBACKS Callbacks
+        ) PURE;
+
+    // Output callback interfaces are described separately.
+    STDMETHOD(GetOutputCallbacks)(
+        THIS_
+        __out PDEBUG_OUTPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetOutputCallbacks)(
+        THIS_
+        __in PDEBUG_OUTPUT_CALLBACKS Callbacks
+        ) PURE;
+    // Output flags provide control over
+    // the distribution of output among clients.
+    // Output masks select which output streams
+    // should be sent to the output callbacks.
+    // Only Output calls with a mask that
+    // contains one of the output mask bits
+    // will be sent to the output callbacks.
+    // These methods are reentrant.
+    // If such access is not synchronized
+    // disruptions in output may occur.
+    STDMETHOD(GetOutputMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOutputMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+    // These methods allow access to another clients
+    // output mask.  They are necessary for changing
+    // a clients output mask when it is
+    // waiting for events.  These methods are reentrant
+    // and can be called from any thread.
+    STDMETHOD(GetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __in ULONG Mask
+        ) PURE;
+    // Control the width of an output line for
+    // commands which produce formatted output.
+    // This setting is just a suggestion.
+    STDMETHOD(GetOutputWidth)(
+        THIS_
+        __out PULONG Columns
+        ) PURE;
+    STDMETHOD(SetOutputWidth)(
+        THIS_
+        __in ULONG Columns
+        ) PURE;
+    // Some of the engines output commands produce
+    // multiple lines of output.  A prefix can be
+    // set that the engine will automatically output
+    // for each line in that case, allowing a caller
+    // to control indentation or identifying marks.
+    // This is not a general setting for any output
+    // with a newline in it.  Methods which use
+    // the line prefix are marked in their documentation.
+    STDMETHOD(GetOutputLinePrefix)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PrefixSize
+        ) PURE;
+    STDMETHOD(SetOutputLinePrefix)(
+        THIS_
+        __in_opt PCSTR Prefix
+        ) PURE;
+
+    // Returns a string describing the machine
+    // and user this client represents.  The
+    // specific content of the string varies
+    // with operating system.  If the client is
+    // remotely connected some network information
+    // may also be present.
+    STDMETHOD(GetIdentity)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG IdentitySize
+        ) PURE;
+    // Format is a printf-like format string
+    // with one %s where the identity string should go.
+    STDMETHOD(OutputIdentity)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in PCSTR Format
+        ) PURE;
+
+    // Event callbacks allow a client to
+    // receive notification about changes
+    // during the debug session.
+    STDMETHOD(GetEventCallbacks)(
+        THIS_
+        __out PDEBUG_EVENT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetEventCallbacks)(
+        THIS_
+        __in PDEBUG_EVENT_CALLBACKS Callbacks
+        ) PURE;
+
+    // The engine sometimes merges compatible callback
+    // requests to reduce callback overhead.  This is
+    // most noticeable with output as small pieces of
+    // output are collected into larger groups to
+    // reduce the overall number of output callback calls.
+    // A client can use this method to force all pending
+    // callbacks to be delivered.  This is rarely necessary.
+    STDMETHOD(FlushCallbacks)(
+        THIS
+        ) PURE;
+};
+
+// Per-dump-format control flags.
+#define DEBUG_FORMAT_DEFAULT             0x00000000
+// Write dump to a temporary file, then package it
+// into a CAB file and delete the temporary file.
+#define DEBUG_FORMAT_WRITE_CAB           0x20000000
+// When creating a CAB add secondary files such as
+// current symbols and mapped images.
+#define DEBUG_FORMAT_CAB_SECONDARY_FILES 0x40000000
+// Don't overwrite existing files.
+#define DEBUG_FORMAT_NO_OVERWRITE        0x80000000
+
+#define DEBUG_FORMAT_USER_SMALL_FULL_MEMORY               0x00000001
+#define DEBUG_FORMAT_USER_SMALL_HANDLE_DATA               0x00000002
+#define DEBUG_FORMAT_USER_SMALL_UNLOADED_MODULES          0x00000004
+#define DEBUG_FORMAT_USER_SMALL_INDIRECT_MEMORY           0x00000008
+#define DEBUG_FORMAT_USER_SMALL_DATA_SEGMENTS             0x00000010
+#define DEBUG_FORMAT_USER_SMALL_FILTER_MEMORY             0x00000020
+#define DEBUG_FORMAT_USER_SMALL_FILTER_PATHS              0x00000040
+#define DEBUG_FORMAT_USER_SMALL_PROCESS_THREAD_DATA       0x00000080
+#define DEBUG_FORMAT_USER_SMALL_PRIVATE_READ_WRITE_MEMORY 0x00000100
+#define DEBUG_FORMAT_USER_SMALL_NO_OPTIONAL_DATA          0x00000200
+#define DEBUG_FORMAT_USER_SMALL_FULL_MEMORY_INFO          0x00000400
+#define DEBUG_FORMAT_USER_SMALL_THREAD_INFO               0x00000800
+#define DEBUG_FORMAT_USER_SMALL_CODE_SEGMENTS             0x00001000
+
+//
+// Dump information file types.
+//
+
+// Base dump file, returned when querying for dump files.
+#define DEBUG_DUMP_FILE_BASE           0xffffffff
+// Single file containing packed page file information.
+#define DEBUG_DUMP_FILE_PAGE_FILE_DUMP 0x00000000
+
+#undef INTERFACE
+#define INTERFACE IDebugClient2
+DECLARE_INTERFACE_(IDebugClient2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugClient.
+
+    // The following set of methods start
+    // the different kinds of debuggees.
+
+    // Begins a debug session using the kernel
+    // debugging protocol.  This method selects
+    // the protocol as the debuggee communication
+    // mechanism but does not initiate the communication
+    // itself.
+    STDMETHOD(AttachKernel)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PCSTR ConnectOptions
+        ) PURE;
+    STDMETHOD(GetKernelConnectionOptions)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG OptionsSize
+        ) PURE;
+    // Updates the connection options for a live
+    // kernel connection.  This can only be used
+    // to modify parameters for the connection, not
+    // to switch to a completely different kind of
+    // connection.
+    // This method is reentrant.
+    STDMETHOD(SetKernelConnectionOptions)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+
+    // Starts a process server for remote
+    // user-mode process control.
+    // The local process server is server zero.
+    STDMETHOD(StartProcessServer)(
+        THIS_
+        __in ULONG Flags,
+        __in PCSTR Options,
+        __in __reserved PVOID Reserved
+        ) PURE;
+    STDMETHOD(ConnectProcessServer)(
+        THIS_
+        __in PCSTR RemoteOptions,
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(DisconnectProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+
+    // Enumerates and describes processes
+    // accessible through the given process server.
+    STDMETHOD(GetRunningProcessSystemIds)(
+        THIS_
+        __in ULONG64 Server,
+        __out_ecount_opt(Count) PULONG Ids,
+        __in ULONG Count,
+        __out_opt PULONG ActualCount
+        ) PURE;
+    STDMETHOD(GetRunningProcessSystemIdByExecutableName)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescription)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    // Attaches to a running user-mode process.
+    STDMETHOD(AttachProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Creates a new user-mode process for debugging.
+    // CreateFlags are as given to Win32s CreateProcess.
+    // One of DEBUG_PROCESS or DEBUG_ONLY_THIS_PROCESS
+    // must be specified.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in PSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    // Creates or attaches to a user-mode process, or both.
+    // If CommandLine is NULL this method operates as
+    // AttachProcess does.  If ProcessId is zero it
+    // operates as CreateProcess does.  If CommandLine is
+    // non-NULL and ProcessId is non-zero the method first
+    // starts a process with the given information but
+    // in a suspended state.  The engine then attaches to
+    // the indicated process.  Once the attach is successful
+    // the suspended process is resumed.  This provides
+    // synchronization between the new process and the
+    // attachment.
+    STDMETHOD(CreateProcessAndAttach)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Gets and sets process control flags.
+    STDMETHOD(GetProcessOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Opens any kind of user- or kernel-mode dump file
+    // and begins a debug session with the information
+    // contained within it.
+    STDMETHOD(OpenDumpFile)(
+        THIS_
+        __in PCSTR DumpFile
+        ) PURE;
+    // Writes a dump file from the current session information.
+    // The kind of dump file written is determined by the
+    // kind of session and the type qualifier given.
+    // For example, if the current session is a kernel
+    // debug session (DEBUG_CLASS_KERNEL) and the qualifier
+    // is DEBUG_DUMP_SMALL a small kernel dump will be written.
+    STDMETHOD(WriteDumpFile)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier
+        ) PURE;
+
+    // Indicates that a remote client is ready to
+    // begin participating in the current session.
+    // HistoryLimit gives a character limit on
+    // the amount of output history to be sent.
+    STDMETHOD(ConnectSession)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG HistoryLimit
+        ) PURE;
+    // Indicates that the engine should start accepting
+    // remote connections. Options specifies connection types
+    // and their parameters.  Supported strings are:
+    //    npipe:Pipe=<Pipe name>
+    //    tcp:Port=<IP port>
+    STDMETHOD(StartServer)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+    // List the servers running on the given machine.
+    // Uses the line prefix.
+    STDMETHOD(OutputServers)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Machine,
+        __in ULONG Flags
+        ) PURE;
+
+    // Attempts to terminate all processes in the debuggers list.
+    STDMETHOD(TerminateProcesses)(
+        THIS
+        ) PURE;
+    // Attempts to detach from all processes in the debuggers list.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachProcesses)(
+        THIS
+        ) PURE;
+    // Stops the current debug session.  If a process
+    // was created or attached an active EndSession can
+    // terminate or detach from it.
+    // If a kernel connection was opened it will be closed but the
+    // target machine is otherwise unaffected.
+    STDMETHOD(EndSession)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // If a process was started and ran to completion
+    // this method can be used to retrieve its exit code.
+    STDMETHOD(GetExitCode)(
+        THIS_
+        __out PULONG Code
+        ) PURE;
+
+    // Client event callbacks are called on the thread
+    // of the client.  In order to give thread
+    // execution to the engine for callbacks all
+    // client threads should call DispatchCallbacks
+    // when they are idle.  Callbacks are only
+    // received when a thread calls DispatchCallbacks
+    // or WaitForEvent.  WaitForEvent can only be
+    // called by the thread that started the debug
+    // session so all other client threads should
+    // call DispatchCallbacks when possible.
+    // DispatchCallbacks returns when ExitDispatch is used
+    // to interrupt dispatch or when the timeout expires.
+    // DispatchCallbacks dispatches callbacks for all
+    // clients associated with the thread calling
+    // DispatchCallbacks.
+    // DispatchCallbacks returns S_FALSE when the
+    // timeout expires.
+    STDMETHOD(DispatchCallbacks)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+    // ExitDispatch can be used to interrupt callback
+    // dispatch when a client thread is needed by the
+    // client.  This method is reentrant and can
+    // be called from any thread.
+    STDMETHOD(ExitDispatch)(
+        THIS_
+        __in PDEBUG_CLIENT Client
+        ) PURE;
+
+    // Clients are specific to the thread that
+    // created them.  Calls from other threads
+    // fail immediately.  The CreateClient method
+    // is a notable exception; it allows creation
+    // of a new client for a new thread.
+    STDMETHOD(CreateClient)(
+        THIS_
+        __out PDEBUG_CLIENT* Client
+        ) PURE;
+
+    STDMETHOD(GetInputCallbacks)(
+        THIS_
+        __out PDEBUG_INPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetInputCallbacks)(
+        THIS_
+        __in PDEBUG_INPUT_CALLBACKS Callbacks
+        ) PURE;
+
+    // Output callback interfaces are described separately.
+    STDMETHOD(GetOutputCallbacks)(
+        THIS_
+        __out PDEBUG_OUTPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetOutputCallbacks)(
+        THIS_
+        __in PDEBUG_OUTPUT_CALLBACKS Callbacks
+        ) PURE;
+    // Output flags provide control over
+    // the distribution of output among clients.
+    // Output masks select which output streams
+    // should be sent to the output callbacks.
+    // Only Output calls with a mask that
+    // contains one of the output mask bits
+    // will be sent to the output callbacks.
+    // These methods are reentrant.
+    // If such access is not synchronized
+    // disruptions in output may occur.
+    STDMETHOD(GetOutputMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOutputMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+    // These methods allow access to another clients
+    // output mask.  They are necessary for changing
+    // a clients output mask when it is
+    // waiting for events.  These methods are reentrant
+    // and can be called from any thread.
+    STDMETHOD(GetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __in ULONG Mask
+        ) PURE;
+    // Control the width of an output line for
+    // commands which produce formatted output.
+    // This setting is just a suggestion.
+    STDMETHOD(GetOutputWidth)(
+        THIS_
+        __out PULONG Columns
+        ) PURE;
+    STDMETHOD(SetOutputWidth)(
+        THIS_
+        __in ULONG Columns
+        ) PURE;
+    // Some of the engines output commands produce
+    // multiple lines of output.  A prefix can be
+    // set that the engine will automatically output
+    // for each line in that case, allowing a caller
+    // to control indentation or identifying marks.
+    // This is not a general setting for any output
+    // with a newline in it.  Methods which use
+    // the line prefix are marked in their documentation.
+    STDMETHOD(GetOutputLinePrefix)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PrefixSize
+        ) PURE;
+    STDMETHOD(SetOutputLinePrefix)(
+        THIS_
+        __in_opt PCSTR Prefix
+        ) PURE;
+
+    // Returns a string describing the machine
+    // and user this client represents.  The
+    // specific content of the string varies
+    // with operating system.  If the client is
+    // remotely connected some network information
+    // may also be present.
+    STDMETHOD(GetIdentity)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG IdentitySize
+        ) PURE;
+    // Format is a printf-like format string
+    // with one %s where the identity string should go.
+    STDMETHOD(OutputIdentity)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in PCSTR Format
+        ) PURE;
+
+    // Event callbacks allow a client to
+    // receive notification about changes
+    // during the debug session.
+    STDMETHOD(GetEventCallbacks)(
+        THIS_
+        __out PDEBUG_EVENT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetEventCallbacks)(
+        THIS_
+        __in PDEBUG_EVENT_CALLBACKS Callbacks
+        ) PURE;
+
+    // The engine sometimes merges compatible callback
+    // requests to reduce callback overhead.  This is
+    // most noticeable with output as small pieces of
+    // output are collected into larger groups to
+    // reduce the overall number of output callback calls.
+    // A client can use this method to force all pending
+    // callbacks to be delivered.  This is rarely necessary.
+    STDMETHOD(FlushCallbacks)(
+        THIS
+        ) PURE;
+
+    // IDebugClient2.
+
+    // Functions similarly to WriteDumpFile with
+    // the addition of the ability to specify
+    // per-dump-format write control flags.
+    // Comment is not supported in all formats.
+    STDMETHOD(WriteDumpFile2)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier,
+        __in ULONG FormatFlags,
+        __in_opt PCSTR Comment
+        ) PURE;
+    // Registers additional files of supporting information
+    // for a dump file open.  This method must be called
+    // before OpenDumpFile is called.
+    // The files registered may be opened at the time
+    // this method is called but generally will not
+    // be used until OpenDumpFile is called.
+    STDMETHOD(AddDumpInformationFile)(
+        THIS_
+        __in PCSTR InfoFile,
+        __in ULONG Type
+        ) PURE;
+
+    // Requests that the remote process server shut down.
+    STDMETHOD(EndProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+    // Waits for a started process server to
+    // exit.  Allows an application running a
+    // process server to monitor the process
+    // server so that it can tell when a remote
+    // client has asked for it to exit.
+    // Returns S_OK if the process server has
+    // shut down and S_FALSE for a timeout.
+    STDMETHOD(WaitForProcessServerEnd)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+
+    // Returns S_OK if the system is configured
+    // to allow kernel debugging.
+    STDMETHOD(IsKernelDebuggerEnabled)(
+        THIS
+        ) PURE;
+
+    // Attempts to terminate the current process.
+    // Exit process events for the process may be generated.
+    STDMETHOD(TerminateCurrentProcess)(
+        THIS
+        ) PURE;
+    // Attempts to detach from the current process.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachCurrentProcess)(
+        THIS
+        ) PURE;
+    // Removes the process from the debuggers process
+    // list without making any other changes.  The process
+    // will still be marked as being debugged and will
+    // not run.  This allows a debugger to be shut down
+    // and a new debugger attached without taking the
+    // process out of the debugged state.
+    // This is only supported on some system versions.
+    STDMETHOD(AbandonCurrentProcess)(
+        THIS
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugClient3
+DECLARE_INTERFACE_(IDebugClient3, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugClient.
+
+    // The following set of methods start
+    // the different kinds of debuggees.
+
+    // Begins a debug session using the kernel
+    // debugging protocol.  This method selects
+    // the protocol as the debuggee communication
+    // mechanism but does not initiate the communication
+    // itself.
+    STDMETHOD(AttachKernel)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PCSTR ConnectOptions
+        ) PURE;
+    STDMETHOD(GetKernelConnectionOptions)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG OptionsSize
+        ) PURE;
+    // Updates the connection options for a live
+    // kernel connection.  This can only be used
+    // to modify parameters for the connection, not
+    // to switch to a completely different kind of
+    // connection.
+    // This method is reentrant.
+    STDMETHOD(SetKernelConnectionOptions)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+
+    // Starts a process server for remote
+    // user-mode process control.
+    // The local process server is server zero.
+    STDMETHOD(StartProcessServer)(
+        THIS_
+        __in ULONG Flags,
+        __in PCSTR Options,
+        __in __reserved PVOID Reserved
+        ) PURE;
+    STDMETHOD(ConnectProcessServer)(
+        THIS_
+        __in PCSTR RemoteOptions,
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(DisconnectProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+
+    // Enumerates and describes processes
+    // accessible through the given process server.
+    STDMETHOD(GetRunningProcessSystemIds)(
+        THIS_
+        __in ULONG64 Server,
+        __out_ecount_opt(Count) PULONG Ids,
+        __in ULONG Count,
+        __out_opt PULONG ActualCount
+        ) PURE;
+    STDMETHOD(GetRunningProcessSystemIdByExecutableName)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescription)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    // Attaches to a running user-mode process.
+    STDMETHOD(AttachProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Creates a new user-mode process for debugging.
+    // CreateFlags are as given to Win32s CreateProcess.
+    // One of DEBUG_PROCESS or DEBUG_ONLY_THIS_PROCESS
+    // must be specified.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in PSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    // Creates or attaches to a user-mode process, or both.
+    // If CommandLine is NULL this method operates as
+    // AttachProcess does.  If ProcessId is zero it
+    // operates as CreateProcess does.  If CommandLine is
+    // non-NULL and ProcessId is non-zero the method first
+    // starts a process with the given information but
+    // in a suspended state.  The engine then attaches to
+    // the indicated process.  Once the attach is successful
+    // the suspended process is resumed.  This provides
+    // synchronization between the new process and the
+    // attachment.
+    STDMETHOD(CreateProcessAndAttach)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Gets and sets process control flags.
+    STDMETHOD(GetProcessOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Opens any kind of user- or kernel-mode dump file
+    // and begins a debug session with the information
+    // contained within it.
+    STDMETHOD(OpenDumpFile)(
+        THIS_
+        __in PCSTR DumpFile
+        ) PURE;
+    // Writes a dump file from the current session information.
+    // The kind of dump file written is determined by the
+    // kind of session and the type qualifier given.
+    // For example, if the current session is a kernel
+    // debug session (DEBUG_CLASS_KERNEL) and the qualifier
+    // is DEBUG_DUMP_SMALL a small kernel dump will be written.
+    STDMETHOD(WriteDumpFile)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier
+        ) PURE;
+
+    // Indicates that a remote client is ready to
+    // begin participating in the current session.
+    // HistoryLimit gives a character limit on
+    // the amount of output history to be sent.
+    STDMETHOD(ConnectSession)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG HistoryLimit
+        ) PURE;
+    // Indicates that the engine should start accepting
+    // remote connections. Options specifies connection types
+    // and their parameters.  Supported strings are:
+    //    npipe:Pipe=<Pipe name>
+    //    tcp:Port=<IP port>
+    STDMETHOD(StartServer)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+    // List the servers running on the given machine.
+    // Uses the line prefix.
+    STDMETHOD(OutputServers)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Machine,
+        __in ULONG Flags
+        ) PURE;
+
+    // Attempts to terminate all processes in the debuggers list.
+    STDMETHOD(TerminateProcesses)(
+        THIS
+        ) PURE;
+    // Attempts to detach from all processes in the debuggers list.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachProcesses)(
+        THIS
+        ) PURE;
+    // Stops the current debug session.  If a process
+    // was created or attached an active EndSession can
+    // terminate or detach from it.
+    // If a kernel connection was opened it will be closed but the
+    // target machine is otherwise unaffected.
+    STDMETHOD(EndSession)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // If a process was started and ran to completion
+    // this method can be used to retrieve its exit code.
+    STDMETHOD(GetExitCode)(
+        THIS_
+        __out PULONG Code
+        ) PURE;
+
+    // Client event callbacks are called on the thread
+    // of the client.  In order to give thread
+    // execution to the engine for callbacks all
+    // client threads should call DispatchCallbacks
+    // when they are idle.  Callbacks are only
+    // received when a thread calls DispatchCallbacks
+    // or WaitForEvent.  WaitForEvent can only be
+    // called by the thread that started the debug
+    // session so all other client threads should
+    // call DispatchCallbacks when possible.
+    // DispatchCallbacks returns when ExitDispatch is used
+    // to interrupt dispatch or when the timeout expires.
+    // DispatchCallbacks dispatches callbacks for all
+    // clients associated with the thread calling
+    // DispatchCallbacks.
+    // DispatchCallbacks returns S_FALSE when the
+    // timeout expires.
+    STDMETHOD(DispatchCallbacks)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+    // ExitDispatch can be used to interrupt callback
+    // dispatch when a client thread is needed by the
+    // client.  This method is reentrant and can
+    // be called from any thread.
+    STDMETHOD(ExitDispatch)(
+        THIS_
+        __in PDEBUG_CLIENT Client
+        ) PURE;
+
+    // Clients are specific to the thread that
+    // created them.  Calls from other threads
+    // fail immediately.  The CreateClient method
+    // is a notable exception; it allows creation
+    // of a new client for a new thread.
+    STDMETHOD(CreateClient)(
+        THIS_
+        __out PDEBUG_CLIENT* Client
+        ) PURE;
+
+    STDMETHOD(GetInputCallbacks)(
+        THIS_
+        __out PDEBUG_INPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetInputCallbacks)(
+        THIS_
+        __in PDEBUG_INPUT_CALLBACKS Callbacks
+        ) PURE;
+
+    // Output callback interfaces are described separately.
+    STDMETHOD(GetOutputCallbacks)(
+        THIS_
+        __out PDEBUG_OUTPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetOutputCallbacks)(
+        THIS_
+        __in PDEBUG_OUTPUT_CALLBACKS Callbacks
+        ) PURE;
+    // Output flags provide control over
+    // the distribution of output among clients.
+    // Output masks select which output streams
+    // should be sent to the output callbacks.
+    // Only Output calls with a mask that
+    // contains one of the output mask bits
+    // will be sent to the output callbacks.
+    // These methods are reentrant.
+    // If such access is not synchronized
+    // disruptions in output may occur.
+    STDMETHOD(GetOutputMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOutputMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+    // These methods allow access to another clients
+    // output mask.  They are necessary for changing
+    // a clients output mask when it is
+    // waiting for events.  These methods are reentrant
+    // and can be called from any thread.
+    STDMETHOD(GetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __in ULONG Mask
+        ) PURE;
+    // Control the width of an output line for
+    // commands which produce formatted output.
+    // This setting is just a suggestion.
+    STDMETHOD(GetOutputWidth)(
+        THIS_
+        __out PULONG Columns
+        ) PURE;
+    STDMETHOD(SetOutputWidth)(
+        THIS_
+        __in ULONG Columns
+        ) PURE;
+    // Some of the engines output commands produce
+    // multiple lines of output.  A prefix can be
+    // set that the engine will automatically output
+    // for each line in that case, allowing a caller
+    // to control indentation or identifying marks.
+    // This is not a general setting for any output
+    // with a newline in it.  Methods which use
+    // the line prefix are marked in their documentation.
+    STDMETHOD(GetOutputLinePrefix)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PrefixSize
+        ) PURE;
+    STDMETHOD(SetOutputLinePrefix)(
+        THIS_
+        __in_opt PCSTR Prefix
+        ) PURE;
+
+    // Returns a string describing the machine
+    // and user this client represents.  The
+    // specific content of the string varies
+    // with operating system.  If the client is
+    // remotely connected some network information
+    // may also be present.
+    STDMETHOD(GetIdentity)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG IdentitySize
+        ) PURE;
+    // Format is a printf-like format string
+    // with one %s where the identity string should go.
+    STDMETHOD(OutputIdentity)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in PCSTR Format
+        ) PURE;
+
+    // Event callbacks allow a client to
+    // receive notification about changes
+    // during the debug session.
+    STDMETHOD(GetEventCallbacks)(
+        THIS_
+        __out PDEBUG_EVENT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetEventCallbacks)(
+        THIS_
+        __in PDEBUG_EVENT_CALLBACKS Callbacks
+        ) PURE;
+
+    // The engine sometimes merges compatible callback
+    // requests to reduce callback overhead.  This is
+    // most noticeable with output as small pieces of
+    // output are collected into larger groups to
+    // reduce the overall number of output callback calls.
+    // A client can use this method to force all pending
+    // callbacks to be delivered.  This is rarely necessary.
+    STDMETHOD(FlushCallbacks)(
+        THIS
+        ) PURE;
+
+    // IDebugClient2.
+
+    // Functions similarly to WriteDumpFile with
+    // the addition of the ability to specify
+    // per-dump-format write control flags.
+    // Comment is not supported in all formats.
+    STDMETHOD(WriteDumpFile2)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier,
+        __in ULONG FormatFlags,
+        __in_opt PCSTR Comment
+        ) PURE;
+    // Registers additional files of supporting information
+    // for a dump file open.  This method must be called
+    // before OpenDumpFile is called.
+    // The files registered may be opened at the time
+    // this method is called but generally will not
+    // be used until OpenDumpFile is called.
+    STDMETHOD(AddDumpInformationFile)(
+        THIS_
+        __in PCSTR InfoFile,
+        __in ULONG Type
+        ) PURE;
+
+    // Requests that the remote process server shut down.
+    STDMETHOD(EndProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+    // Waits for a started process server to
+    // exit.  Allows an application running a
+    // process server to monitor the process
+    // server so that it can tell when a remote
+    // client has asked for it to exit.
+    // Returns S_OK if the process server has
+    // shut down and S_FALSE for a timeout.
+    STDMETHOD(WaitForProcessServerEnd)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+
+    // Returns S_OK if the system is configured
+    // to allow kernel debugging.
+    STDMETHOD(IsKernelDebuggerEnabled)(
+        THIS
+        ) PURE;
+
+    // Attempts to terminate the current process.
+    // Exit process events for the process may be generated.
+    STDMETHOD(TerminateCurrentProcess)(
+        THIS
+        ) PURE;
+    // Attempts to detach from the current process.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachCurrentProcess)(
+        THIS
+        ) PURE;
+    // Removes the process from the debuggers process
+    // list without making any other changes.  The process
+    // will still be marked as being debugged and will
+    // not run.  This allows a debugger to be shut down
+    // and a new debugger attached without taking the
+    // process out of the debugged state.
+    // This is only supported on some system versions.
+    STDMETHOD(AbandonCurrentProcess)(
+        THIS
+        ) PURE;
+
+    // IDebugClient3.
+
+    STDMETHOD(GetRunningProcessSystemIdByExecutableNameWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCWSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescriptionWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PWSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PWSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    STDMETHOD(CreateProcessWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PWSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    STDMETHOD(CreateProcessAndAttachWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PWSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+};
+
+//
+// Special indices for GetDumpFile to return
+// alternate filenames.
+//
+
+// Special index that returns the name of the last .dmp file
+// that failed to load (whether directly or from inside a
+// .cab file).
+#define DEBUG_DUMP_FILE_LOAD_FAILED_INDEX  0xffffffff
+// Index that returns last cab file opened, this is needed to
+// get the name of original CAB file since debugger returns the
+// extracted dump file in the GetDumpFile method.
+#define DEBUG_DUMP_FILE_ORIGINAL_CAB_INDEX 0xfffffffe
+
+#undef INTERFACE
+#define INTERFACE IDebugClient4
+DECLARE_INTERFACE_(IDebugClient4, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugClient.
+
+    // The following set of methods start
+    // the different kinds of debuggees.
+
+    // Begins a debug session using the kernel
+    // debugging protocol.  This method selects
+    // the protocol as the debuggee communication
+    // mechanism but does not initiate the communication
+    // itself.
+    STDMETHOD(AttachKernel)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PCSTR ConnectOptions
+        ) PURE;
+    STDMETHOD(GetKernelConnectionOptions)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG OptionsSize
+        ) PURE;
+    // Updates the connection options for a live
+    // kernel connection.  This can only be used
+    // to modify parameters for the connection, not
+    // to switch to a completely different kind of
+    // connection.
+    // This method is reentrant.
+    STDMETHOD(SetKernelConnectionOptions)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+
+    // Starts a process server for remote
+    // user-mode process control.
+    // The local process server is server zero.
+    STDMETHOD(StartProcessServer)(
+        THIS_
+        __in ULONG Flags,
+        __in PCSTR Options,
+        __in __reserved PVOID Reserved
+        ) PURE;
+    STDMETHOD(ConnectProcessServer)(
+        THIS_
+        __in PCSTR RemoteOptions,
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(DisconnectProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+
+    // Enumerates and describes processes
+    // accessible through the given process server.
+    STDMETHOD(GetRunningProcessSystemIds)(
+        THIS_
+        __in ULONG64 Server,
+        __out_ecount_opt(Count) PULONG Ids,
+        __in ULONG Count,
+        __out_opt PULONG ActualCount
+        ) PURE;
+    STDMETHOD(GetRunningProcessSystemIdByExecutableName)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescription)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    // Attaches to a running user-mode process.
+    STDMETHOD(AttachProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Creates a new user-mode process for debugging.
+    // CreateFlags are as given to Win32s CreateProcess.
+    // One of DEBUG_PROCESS or DEBUG_ONLY_THIS_PROCESS
+    // must be specified.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in PSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    // Creates or attaches to a user-mode process, or both.
+    // If CommandLine is NULL this method operates as
+    // AttachProcess does.  If ProcessId is zero it
+    // operates as CreateProcess does.  If CommandLine is
+    // non-NULL and ProcessId is non-zero the method first
+    // starts a process with the given information but
+    // in a suspended state.  The engine then attaches to
+    // the indicated process.  Once the attach is successful
+    // the suspended process is resumed.  This provides
+    // synchronization between the new process and the
+    // attachment.
+    STDMETHOD(CreateProcessAndAttach)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Gets and sets process control flags.
+    STDMETHOD(GetProcessOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Opens any kind of user- or kernel-mode dump file
+    // and begins a debug session with the information
+    // contained within it.
+    STDMETHOD(OpenDumpFile)(
+        THIS_
+        __in PCSTR DumpFile
+        ) PURE;
+    // Writes a dump file from the current session information.
+    // The kind of dump file written is determined by the
+    // kind of session and the type qualifier given.
+    // For example, if the current session is a kernel
+    // debug session (DEBUG_CLASS_KERNEL) and the qualifier
+    // is DEBUG_DUMP_SMALL a small kernel dump will be written.
+    STDMETHOD(WriteDumpFile)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier
+        ) PURE;
+
+    // Indicates that a remote client is ready to
+    // begin participating in the current session.
+    // HistoryLimit gives a character limit on
+    // the amount of output history to be sent.
+    STDMETHOD(ConnectSession)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG HistoryLimit
+        ) PURE;
+    // Indicates that the engine should start accepting
+    // remote connections. Options specifies connection types
+    // and their parameters.  Supported strings are:
+    //    npipe:Pipe=<Pipe name>
+    //    tcp:Port=<IP port>
+    STDMETHOD(StartServer)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+    // List the servers running on the given machine.
+    // Uses the line prefix.
+    STDMETHOD(OutputServers)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Machine,
+        __in ULONG Flags
+        ) PURE;
+
+    // Attempts to terminate all processes in the debuggers list.
+    STDMETHOD(TerminateProcesses)(
+        THIS
+        ) PURE;
+    // Attempts to detach from all processes in the debuggers list.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachProcesses)(
+        THIS
+        ) PURE;
+    // Stops the current debug session.  If a process
+    // was created or attached an active EndSession can
+    // terminate or detach from it.
+    // If a kernel connection was opened it will be closed but the
+    // target machine is otherwise unaffected.
+    STDMETHOD(EndSession)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // If a process was started and ran to completion
+    // this method can be used to retrieve its exit code.
+    STDMETHOD(GetExitCode)(
+        THIS_
+        __out PULONG Code
+        ) PURE;
+
+    // Client event callbacks are called on the thread
+    // of the client.  In order to give thread
+    // execution to the engine for callbacks all
+    // client threads should call DispatchCallbacks
+    // when they are idle.  Callbacks are only
+    // received when a thread calls DispatchCallbacks
+    // or WaitForEvent.  WaitForEvent can only be
+    // called by the thread that started the debug
+    // session so all other client threads should
+    // call DispatchCallbacks when possible.
+    // DispatchCallbacks returns when ExitDispatch is used
+    // to interrupt dispatch or when the timeout expires.
+    // DispatchCallbacks dispatches callbacks for all
+    // clients associated with the thread calling
+    // DispatchCallbacks.
+    // DispatchCallbacks returns S_FALSE when the
+    // timeout expires.
+    STDMETHOD(DispatchCallbacks)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+    // ExitDispatch can be used to interrupt callback
+    // dispatch when a client thread is needed by the
+    // client.  This method is reentrant and can
+    // be called from any thread.
+    STDMETHOD(ExitDispatch)(
+        THIS_
+        __in PDEBUG_CLIENT Client
+        ) PURE;
+
+    // Clients are specific to the thread that
+    // created them.  Calls from other threads
+    // fail immediately.  The CreateClient method
+    // is a notable exception; it allows creation
+    // of a new client for a new thread.
+    STDMETHOD(CreateClient)(
+        THIS_
+        __out PDEBUG_CLIENT* Client
+        ) PURE;
+
+    STDMETHOD(GetInputCallbacks)(
+        THIS_
+        __out PDEBUG_INPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetInputCallbacks)(
+        THIS_
+        __in PDEBUG_INPUT_CALLBACKS Callbacks
+        ) PURE;
+
+    // Output callback interfaces are described separately.
+    STDMETHOD(GetOutputCallbacks)(
+        THIS_
+        __out PDEBUG_OUTPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetOutputCallbacks)(
+        THIS_
+        __in PDEBUG_OUTPUT_CALLBACKS Callbacks
+        ) PURE;
+    // Output flags provide control over
+    // the distribution of output among clients.
+    // Output masks select which output streams
+    // should be sent to the output callbacks.
+    // Only Output calls with a mask that
+    // contains one of the output mask bits
+    // will be sent to the output callbacks.
+    // These methods are reentrant.
+    // If such access is not synchronized
+    // disruptions in output may occur.
+    STDMETHOD(GetOutputMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOutputMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+    // These methods allow access to another clients
+    // output mask.  They are necessary for changing
+    // a clients output mask when it is
+    // waiting for events.  These methods are reentrant
+    // and can be called from any thread.
+    STDMETHOD(GetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __in ULONG Mask
+        ) PURE;
+    // Control the width of an output line for
+    // commands which produce formatted output.
+    // This setting is just a suggestion.
+    STDMETHOD(GetOutputWidth)(
+        THIS_
+        __out PULONG Columns
+        ) PURE;
+    STDMETHOD(SetOutputWidth)(
+        THIS_
+        __in ULONG Columns
+        ) PURE;
+    // Some of the engines output commands produce
+    // multiple lines of output.  A prefix can be
+    // set that the engine will automatically output
+    // for each line in that case, allowing a caller
+    // to control indentation or identifying marks.
+    // This is not a general setting for any output
+    // with a newline in it.  Methods which use
+    // the line prefix are marked in their documentation.
+    STDMETHOD(GetOutputLinePrefix)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PrefixSize
+        ) PURE;
+    STDMETHOD(SetOutputLinePrefix)(
+        THIS_
+        __in_opt PCSTR Prefix
+        ) PURE;
+
+    // Returns a string describing the machine
+    // and user this client represents.  The
+    // specific content of the string varies
+    // with operating system.  If the client is
+    // remotely connected some network information
+    // may also be present.
+    STDMETHOD(GetIdentity)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG IdentitySize
+        ) PURE;
+    // Format is a printf-like format string
+    // with one %s where the identity string should go.
+    STDMETHOD(OutputIdentity)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in PCSTR Format
+        ) PURE;
+
+    // Event callbacks allow a client to
+    // receive notification about changes
+    // during the debug session.
+    STDMETHOD(GetEventCallbacks)(
+        THIS_
+        __out PDEBUG_EVENT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetEventCallbacks)(
+        THIS_
+        __in PDEBUG_EVENT_CALLBACKS Callbacks
+        ) PURE;
+
+    // The engine sometimes merges compatible callback
+    // requests to reduce callback overhead.  This is
+    // most noticeable with output as small pieces of
+    // output are collected into larger groups to
+    // reduce the overall number of output callback calls.
+    // A client can use this method to force all pending
+    // callbacks to be delivered.  This is rarely necessary.
+    STDMETHOD(FlushCallbacks)(
+        THIS
+        ) PURE;
+
+    // IDebugClient2.
+
+    // Functions similarly to WriteDumpFile with
+    // the addition of the ability to specify
+    // per-dump-format write control flags.
+    // Comment is not supported in all formats.
+    STDMETHOD(WriteDumpFile2)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier,
+        __in ULONG FormatFlags,
+        __in_opt PCSTR Comment
+        ) PURE;
+    // Registers additional files of supporting information
+    // for a dump file open.  This method must be called
+    // before OpenDumpFile is called.
+    // The files registered may be opened at the time
+    // this method is called but generally will not
+    // be used until OpenDumpFile is called.
+    STDMETHOD(AddDumpInformationFile)(
+        THIS_
+        __in PCSTR InfoFile,
+        __in ULONG Type
+        ) PURE;
+
+    // Requests that the remote process server shut down.
+    STDMETHOD(EndProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+    // Waits for a started process server to
+    // exit.  Allows an application running a
+    // process server to monitor the process
+    // server so that it can tell when a remote
+    // client has asked for it to exit.
+    // Returns S_OK if the process server has
+    // shut down and S_FALSE for a timeout.
+    STDMETHOD(WaitForProcessServerEnd)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+
+    // Returns S_OK if the system is configured
+    // to allow kernel debugging.
+    STDMETHOD(IsKernelDebuggerEnabled)(
+        THIS
+        ) PURE;
+
+    // Attempts to terminate the current process.
+    // Exit process events for the process may be generated.
+    STDMETHOD(TerminateCurrentProcess)(
+        THIS
+        ) PURE;
+    // Attempts to detach from the current process.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachCurrentProcess)(
+        THIS
+        ) PURE;
+    // Removes the process from the debuggers process
+    // list without making any other changes.  The process
+    // will still be marked as being debugged and will
+    // not run.  This allows a debugger to be shut down
+    // and a new debugger attached without taking the
+    // process out of the debugged state.
+    // This is only supported on some system versions.
+    STDMETHOD(AbandonCurrentProcess)(
+        THIS
+        ) PURE;
+
+    // IDebugClient3.
+
+    STDMETHOD(GetRunningProcessSystemIdByExecutableNameWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCWSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescriptionWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PWSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PWSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    STDMETHOD(CreateProcessWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PWSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    STDMETHOD(CreateProcessAndAttachWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PWSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+
+    // IDebugClient4.
+
+    // In the following methods both a filename and a file
+    // handle can be passed in.  If a file handle is given
+    // the filename may be omitted, although providing it
+    // allows the debugger to properly report the name when
+    // queried.
+    // File handles cannot be used in remote calls.
+    STDMETHOD(OpenDumpFileWide)(
+        THIS_
+        __in_opt PCWSTR FileName,
+        __in ULONG64 FileHandle
+        ) PURE;
+    STDMETHOD(WriteDumpFileWide)(
+        THIS_
+        __in_opt PCWSTR FileName,
+        __in ULONG64 FileHandle,
+        __in ULONG Qualifier,
+        __in ULONG FormatFlags,
+        __in_opt PCWSTR Comment
+        ) PURE;
+    STDMETHOD(AddDumpInformationFileWide)(
+        THIS_
+        __in_opt PCWSTR FileName,
+        __in ULONG64 FileHandle,
+        __in ULONG Type
+        ) PURE;
+    // These methods can be used to retrieve
+    // file information for all targets that
+    // involve files.
+    STDMETHOD(GetNumberDumpFiles)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetDumpFile)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Handle,
+        __out PULONG Type
+        ) PURE;
+    STDMETHOD(GetDumpFileWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Handle,
+        __out PULONG Type
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugClient5
+DECLARE_INTERFACE_(IDebugClient5, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugClient.
+
+    // The following set of methods start
+    // the different kinds of debuggees.
+
+    // Begins a debug session using the kernel
+    // debugging protocol.  This method selects
+    // the protocol as the debuggee communication
+    // mechanism but does not initiate the communication
+    // itself.
+    STDMETHOD(AttachKernel)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PCSTR ConnectOptions
+        ) PURE;
+    STDMETHOD(GetKernelConnectionOptions)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG OptionsSize
+        ) PURE;
+    // Updates the connection options for a live
+    // kernel connection.  This can only be used
+    // to modify parameters for the connection, not
+    // to switch to a completely different kind of
+    // connection.
+    // This method is reentrant.
+    STDMETHOD(SetKernelConnectionOptions)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+
+    // Starts a process server for remote
+    // user-mode process control.
+    // The local process server is server zero.
+    STDMETHOD(StartProcessServer)(
+        THIS_
+        __in ULONG Flags,
+        __in PCSTR Options,
+        __in __reserved PVOID Reserved
+        ) PURE;
+    STDMETHOD(ConnectProcessServer)(
+        THIS_
+        __in PCSTR RemoteOptions,
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(DisconnectProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+
+    // Enumerates and describes processes
+    // accessible through the given process server.
+    STDMETHOD(GetRunningProcessSystemIds)(
+        THIS_
+        __in ULONG64 Server,
+        __out_ecount_opt(Count) PULONG Ids,
+        __in ULONG Count,
+        __out_opt PULONG ActualCount
+        ) PURE;
+    STDMETHOD(GetRunningProcessSystemIdByExecutableName)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescription)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    // Attaches to a running user-mode process.
+    STDMETHOD(AttachProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Creates a new user-mode process for debugging.
+    // CreateFlags are as given to Win32s CreateProcess.
+    // One of DEBUG_PROCESS or DEBUG_ONLY_THIS_PROCESS
+    // must be specified.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 Server,
+        __in PSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    // Creates or attaches to a user-mode process, or both.
+    // If CommandLine is NULL this method operates as
+    // AttachProcess does.  If ProcessId is zero it
+    // operates as CreateProcess does.  If CommandLine is
+    // non-NULL and ProcessId is non-zero the method first
+    // starts a process with the given information but
+    // in a suspended state.  The engine then attaches to
+    // the indicated process.  Once the attach is successful
+    // the suspended process is resumed.  This provides
+    // synchronization between the new process and the
+    // attachment.
+    STDMETHOD(CreateProcessAndAttach)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    // Gets and sets process control flags.
+    STDMETHOD(GetProcessOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetProcessOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Opens any kind of user- or kernel-mode dump file
+    // and begins a debug session with the information
+    // contained within it.
+    STDMETHOD(OpenDumpFile)(
+        THIS_
+        __in PCSTR DumpFile
+        ) PURE;
+    // Writes a dump file from the current session information.
+    // The kind of dump file written is determined by the
+    // kind of session and the type qualifier given.
+    // For example, if the current session is a kernel
+    // debug session (DEBUG_CLASS_KERNEL) and the qualifier
+    // is DEBUG_DUMP_SMALL a small kernel dump will be written.
+    STDMETHOD(WriteDumpFile)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier
+        ) PURE;
+
+    // Indicates that a remote client is ready to
+    // begin participating in the current session.
+    // HistoryLimit gives a character limit on
+    // the amount of output history to be sent.
+    STDMETHOD(ConnectSession)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG HistoryLimit
+        ) PURE;
+    // Indicates that the engine should start accepting
+    // remote connections. Options specifies connection types
+    // and their parameters.  Supported strings are:
+    //    npipe:Pipe=<Pipe name>
+    //    tcp:Port=<IP port>
+    STDMETHOD(StartServer)(
+        THIS_
+        __in PCSTR Options
+        ) PURE;
+    // List the servers running on the given machine.
+    // Uses the line prefix.
+    STDMETHOD(OutputServers)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Machine,
+        __in ULONG Flags
+        ) PURE;
+
+    // Attempts to terminate all processes in the debuggers list.
+    STDMETHOD(TerminateProcesses)(
+        THIS
+        ) PURE;
+    // Attempts to detach from all processes in the debuggers list.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachProcesses)(
+        THIS
+        ) PURE;
+    // Stops the current debug session.  If a process
+    // was created or attached an active EndSession can
+    // terminate or detach from it.
+    // If a kernel connection was opened it will be closed but the
+    // target machine is otherwise unaffected.
+    STDMETHOD(EndSession)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // If a process was started and ran to completion
+    // this method can be used to retrieve its exit code.
+    STDMETHOD(GetExitCode)(
+        THIS_
+        __out PULONG Code
+        ) PURE;
+
+    // Client event callbacks are called on the thread
+    // of the client.  In order to give thread
+    // execution to the engine for callbacks all
+    // client threads should call DispatchCallbacks
+    // when they are idle.  Callbacks are only
+    // received when a thread calls DispatchCallbacks
+    // or WaitForEvent.  WaitForEvent can only be
+    // called by the thread that started the debug
+    // session so all other client threads should
+    // call DispatchCallbacks when possible.
+    // DispatchCallbacks returns when ExitDispatch is used
+    // to interrupt dispatch or when the timeout expires.
+    // DispatchCallbacks dispatches callbacks for all
+    // clients associated with the thread calling
+    // DispatchCallbacks.
+    // DispatchCallbacks returns S_FALSE when the
+    // timeout expires.
+    STDMETHOD(DispatchCallbacks)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+    // ExitDispatch can be used to interrupt callback
+    // dispatch when a client thread is needed by the
+    // client.  This method is reentrant and can
+    // be called from any thread.
+    STDMETHOD(ExitDispatch)(
+        THIS_
+        __in PDEBUG_CLIENT Client
+        ) PURE;
+
+    // Clients are specific to the thread that
+    // created them.  Calls from other threads
+    // fail immediately.  The CreateClient method
+    // is a notable exception; it allows creation
+    // of a new client for a new thread.
+    STDMETHOD(CreateClient)(
+        THIS_
+        __out PDEBUG_CLIENT* Client
+        ) PURE;
+
+    STDMETHOD(GetInputCallbacks)(
+        THIS_
+        __out PDEBUG_INPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetInputCallbacks)(
+        THIS_
+        __in PDEBUG_INPUT_CALLBACKS Callbacks
+        ) PURE;
+
+    // Output callback interfaces are described separately.
+    STDMETHOD(GetOutputCallbacks)(
+        THIS_
+        __out PDEBUG_OUTPUT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetOutputCallbacks)(
+        THIS_
+        __in PDEBUG_OUTPUT_CALLBACKS Callbacks
+        ) PURE;
+    // Output flags provide control over
+    // the distribution of output among clients.
+    // Output masks select which output streams
+    // should be sent to the output callbacks.
+    // Only Output calls with a mask that
+    // contains one of the output mask bits
+    // will be sent to the output callbacks.
+    // These methods are reentrant.
+    // If such access is not synchronized
+    // disruptions in output may occur.
+    STDMETHOD(GetOutputMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOutputMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+    // These methods allow access to another clients
+    // output mask.  They are necessary for changing
+    // a clients output mask when it is
+    // waiting for events.  These methods are reentrant
+    // and can be called from any thread.
+    STDMETHOD(GetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetOtherOutputMask)(
+        THIS_
+        __in PDEBUG_CLIENT Client,
+        __in ULONG Mask
+        ) PURE;
+    // Control the width of an output line for
+    // commands which produce formatted output.
+    // This setting is just a suggestion.
+    STDMETHOD(GetOutputWidth)(
+        THIS_
+        __out PULONG Columns
+        ) PURE;
+    STDMETHOD(SetOutputWidth)(
+        THIS_
+        __in ULONG Columns
+        ) PURE;
+    // Some of the engines output commands produce
+    // multiple lines of output.  A prefix can be
+    // set that the engine will automatically output
+    // for each line in that case, allowing a caller
+    // to control indentation or identifying marks.
+    // This is not a general setting for any output
+    // with a newline in it.  Methods which use
+    // the line prefix are marked in their documentation.
+    STDMETHOD(GetOutputLinePrefix)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PrefixSize
+        ) PURE;
+    STDMETHOD(SetOutputLinePrefix)(
+        THIS_
+        __in_opt PCSTR Prefix
+        ) PURE;
+
+    // Returns a string describing the machine
+    // and user this client represents.  The
+    // specific content of the string varies
+    // with operating system.  If the client is
+    // remotely connected some network information
+    // may also be present.
+    STDMETHOD(GetIdentity)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG IdentitySize
+        ) PURE;
+    // Format is a printf-like format string
+    // with one %s where the identity string should go.
+    STDMETHOD(OutputIdentity)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in PCSTR Format
+        ) PURE;
+
+    // Event callbacks allow a client to
+    // receive notification about changes
+    // during the debug session.
+    STDMETHOD(GetEventCallbacks)(
+        THIS_
+        __out PDEBUG_EVENT_CALLBACKS* Callbacks
+        ) PURE;
+    STDMETHOD(SetEventCallbacks)(
+        THIS_
+        __in PDEBUG_EVENT_CALLBACKS Callbacks
+        ) PURE;
+
+    // The engine sometimes merges compatible callback
+    // requests to reduce callback overhead.  This is
+    // most noticeable with output as small pieces of
+    // output are collected into larger groups to
+    // reduce the overall number of output callback calls.
+    // A client can use this method to force all pending
+    // callbacks to be delivered.  This is rarely necessary.
+    STDMETHOD(FlushCallbacks)(
+        THIS
+        ) PURE;
+
+    // IDebugClient2.
+
+    // Functions similarly to WriteDumpFile with
+    // the addition of the ability to specify
+    // per-dump-format write control flags.
+    // Comment is not supported in all formats.
+    STDMETHOD(WriteDumpFile2)(
+        THIS_
+        __in PCSTR DumpFile,
+        __in ULONG Qualifier,
+        __in ULONG FormatFlags,
+        __in_opt PCSTR Comment
+        ) PURE;
+    // Registers additional files of supporting information
+    // for a dump file open.  This method must be called
+    // before OpenDumpFile is called.
+    // The files registered may be opened at the time
+    // this method is called but generally will not
+    // be used until OpenDumpFile is called.
+    STDMETHOD(AddDumpInformationFile)(
+        THIS_
+        __in PCSTR InfoFile,
+        __in ULONG Type
+        ) PURE;
+
+    // Requests that the remote process server shut down.
+    STDMETHOD(EndProcessServer)(
+        THIS_
+        __in ULONG64 Server
+        ) PURE;
+    // Waits for a started process server to
+    // exit.  Allows an application running a
+    // process server to monitor the process
+    // server so that it can tell when a remote
+    // client has asked for it to exit.
+    // Returns S_OK if the process server has
+    // shut down and S_FALSE for a timeout.
+    STDMETHOD(WaitForProcessServerEnd)(
+        THIS_
+        __in ULONG Timeout
+        ) PURE;
+
+    // Returns S_OK if the system is configured
+    // to allow kernel debugging.
+    STDMETHOD(IsKernelDebuggerEnabled)(
+        THIS
+        ) PURE;
+
+    // Attempts to terminate the current process.
+    // Exit process events for the process may be generated.
+    STDMETHOD(TerminateCurrentProcess)(
+        THIS
+        ) PURE;
+    // Attempts to detach from the current process.
+    // This requires OS support for debugger detach.
+    STDMETHOD(DetachCurrentProcess)(
+        THIS
+        ) PURE;
+    // Removes the process from the debuggers process
+    // list without making any other changes.  The process
+    // will still be marked as being debugged and will
+    // not run.  This allows a debugger to be shut down
+    // and a new debugger attached without taking the
+    // process out of the debugged state.
+    // This is only supported on some system versions.
+    STDMETHOD(AbandonCurrentProcess)(
+        THIS
+        ) PURE;
+
+    // IDebugClient3.
+
+    STDMETHOD(GetRunningProcessSystemIdByExecutableNameWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PCWSTR ExeName,
+        __in ULONG Flags,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetRunningProcessDescriptionWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in ULONG SystemId,
+        __in ULONG Flags,
+        __out_ecount_opt(ExeNameSize) PWSTR ExeName,
+        __in ULONG ExeNameSize,
+        __out_opt PULONG ActualExeNameSize,
+        __out_ecount_opt(DescriptionSize) PWSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG ActualDescriptionSize
+        ) PURE;
+
+    STDMETHOD(CreateProcessWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PWSTR CommandLine,
+        __in ULONG CreateFlags
+        ) PURE;
+    STDMETHOD(CreateProcessAndAttachWide)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PWSTR CommandLine,
+        __in ULONG CreateFlags,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+
+    // IDebugClient4.
+
+    // In the following methods both a filename and a file
+    // handle can be passed in.  If a file handle is given
+    // the filename may be omitted, although providing it
+    // allows the debugger to properly report the name when
+    // queried.
+    // File handles cannot be used in remote calls.
+    STDMETHOD(OpenDumpFileWide)(
+        THIS_
+        __in_opt PCWSTR FileName,
+        __in ULONG64 FileHandle
+        ) PURE;
+    STDMETHOD(WriteDumpFileWide)(
+        THIS_
+        __in_opt PCWSTR FileName,
+        __in ULONG64 FileHandle,
+        __in ULONG Qualifier,
+        __in ULONG FormatFlags,
+        __in_opt PCWSTR Comment
+        ) PURE;
+    STDMETHOD(AddDumpInformationFileWide)(
+        THIS_
+        __in_opt PCWSTR FileName,
+        __in ULONG64 FileHandle,
+        __in ULONG Type
+        ) PURE;
+    // These methods can be used to retrieve
+    // file information for all targets that
+    // involve files.
+    STDMETHOD(GetNumberDumpFiles)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetDumpFile)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Handle,
+        __out PULONG Type
+        ) PURE;
+    STDMETHOD(GetDumpFileWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Handle,
+        __out PULONG Type
+        ) PURE;
+
+    // IDebugClient5.
+
+    STDMETHOD(AttachKernelWide)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PCWSTR ConnectOptions
+        ) PURE;
+    STDMETHOD(GetKernelConnectionOptionsWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG OptionsSize
+        ) PURE;
+    STDMETHOD(SetKernelConnectionOptionsWide)(
+        THIS_
+        __in PCWSTR Options
+        ) PURE;
+
+    STDMETHOD(StartProcessServerWide)(
+        THIS_
+        __in ULONG Flags,
+        __in PCWSTR Options,
+        __in __reserved PVOID Reserved
+        ) PURE;
+    STDMETHOD(ConnectProcessServerWide)(
+        THIS_
+        __in PCWSTR RemoteOptions,
+        __out PULONG64 Server
+        ) PURE;
+
+    STDMETHOD(StartServerWide)(
+        THIS_
+        __in PCWSTR Options
+        ) PURE;
+    STDMETHOD(OutputServersWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCWSTR Machine,
+        __in ULONG Flags
+        ) PURE;
+
+    STDMETHOD(GetOutputCallbacksWide)(
+        THIS_
+        __out PDEBUG_OUTPUT_CALLBACKS_WIDE* Callbacks
+        ) PURE;
+    STDMETHOD(SetOutputCallbacksWide)(
+        THIS_
+        __in PDEBUG_OUTPUT_CALLBACKS_WIDE Callbacks
+        ) PURE;
+    STDMETHOD(GetOutputLinePrefixWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PrefixSize
+        ) PURE;
+    STDMETHOD(SetOutputLinePrefixWide)(
+        THIS_
+        __in_opt PCWSTR Prefix
+        ) PURE;
+
+    STDMETHOD(GetIdentityWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG IdentitySize
+        ) PURE;
+    STDMETHOD(OutputIdentityWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in PCWSTR Format
+        ) PURE;
+
+    STDMETHOD(GetEventCallbacksWide)(
+        THIS_
+        __out PDEBUG_EVENT_CALLBACKS_WIDE* Callbacks
+        ) PURE;
+    STDMETHOD(SetEventCallbacksWide)(
+        THIS_
+        __in PDEBUG_EVENT_CALLBACKS_WIDE Callbacks
+        ) PURE;
+
+    STDMETHOD(CreateProcess2)(
+        THIS_
+        __in ULONG64 Server,
+        __in PSTR CommandLine,
+        __in_bcount(OptionsBufferSize) PVOID OptionsBuffer,
+        __in ULONG OptionsBufferSize,
+        __in_opt PCSTR InitialDirectory,
+        __in_opt PCSTR Environment
+        ) PURE;
+    STDMETHOD(CreateProcess2Wide)(
+        THIS_
+        __in ULONG64 Server,
+        __in PWSTR CommandLine,
+        __in_bcount(OptionsBufferSize) PVOID OptionsBuffer,
+        __in ULONG OptionsBufferSize,
+        __in_opt PCWSTR InitialDirectory,
+        __in_opt PCWSTR Environment
+        ) PURE;
+    STDMETHOD(CreateProcessAndAttach2)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PSTR CommandLine,
+        __in_bcount(OptionsBufferSize) PVOID OptionsBuffer,
+        __in ULONG OptionsBufferSize,
+        __in_opt PCSTR InitialDirectory,
+        __in_opt PCSTR Environment,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+    STDMETHOD(CreateProcessAndAttach2Wide)(
+        THIS_
+        __in ULONG64 Server,
+        __in_opt PWSTR CommandLine,
+        __in_bcount(OptionsBufferSize) PVOID OptionsBuffer,
+        __in ULONG OptionsBufferSize,
+        __in_opt PCWSTR InitialDirectory,
+        __in_opt PCWSTR Environment,
+        __in ULONG ProcessId,
+        __in ULONG AttachFlags
+        ) PURE;
+
+    // Helpers for saving and restoring the
+    // current output line prefix.
+    STDMETHOD(PushOutputLinePrefix)(
+        THIS_
+        __in_opt PCSTR NewPrefix,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(PushOutputLinePrefixWide)(
+        THIS_
+        __in_opt PCWSTR NewPrefix,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(PopOutputLinePrefix)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    // Queries to determine if any clients
+    // could potentially respond to the given callback.
+    STDMETHOD(GetNumberInputCallbacks)(
+        THIS_
+        __out PULONG Count
+        ) PURE;
+    STDMETHOD(GetNumberOutputCallbacks)(
+        THIS_
+        __out PULONG Count
+        ) PURE;
+    STDMETHOD(GetNumberEventCallbacks)(
+        THIS_
+        __in ULONG EventFlags,
+        __out PULONG Count
+        ) PURE;
+
+    // Control over locking the session against
+    // undesired quits.  The quit lock string
+    // cannot be retrieved from a secure session.
+    STDMETHOD(GetQuitLockString)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    STDMETHOD(SetQuitLockString)(
+        THIS_
+        __in PCSTR String
+        ) PURE;
+    STDMETHOD(GetQuitLockStringWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    STDMETHOD(SetQuitLockStringWide)(
+        THIS_
+        __in PCWSTR String
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugControl.
+//
+//----------------------------------------------------------------------------
+
+// Execution status codes used for waiting,
+// for returning current status and for
+// event method return values.
+#define DEBUG_STATUS_NO_CHANGE         0
+#define DEBUG_STATUS_GO                1
+#define DEBUG_STATUS_GO_HANDLED        2
+#define DEBUG_STATUS_GO_NOT_HANDLED    3
+#define DEBUG_STATUS_STEP_OVER         4
+#define DEBUG_STATUS_STEP_INTO         5
+#define DEBUG_STATUS_BREAK             6
+#define DEBUG_STATUS_NO_DEBUGGEE       7
+#define DEBUG_STATUS_STEP_BRANCH       8
+#define DEBUG_STATUS_IGNORE_EVENT      9
+#define DEBUG_STATUS_RESTART_REQUESTED 10
+
+#define DEBUG_STATUS_MASK           0xf
+
+// This bit is added in DEBUG_CES_EXECUTION_STATUS
+// notifications when the engines execution status
+// is changing due to operations performed during
+// a wait, such as making synchronous callbacks.  If
+// the bit is not set the execution status is changing
+// due to a wait being satisfied.
+#define DEBUG_STATUS_INSIDE_WAIT 0x100000000
+
+// Output control flags.
+// Output generated by methods called by this
+// client will be sent only to this clients
+// output callbacks.
+#define DEBUG_OUTCTL_THIS_CLIENT       0x00000000
+// Output will be sent to all clients.
+#define DEBUG_OUTCTL_ALL_CLIENTS       0x00000001
+// Output will be sent to all clients except
+// the client generating the output.
+#define DEBUG_OUTCTL_ALL_OTHER_CLIENTS 0x00000002
+// Output will be discarded immediately and will not
+// be logged or sent to callbacks.
+#define DEBUG_OUTCTL_IGNORE            0x00000003
+// Output will be logged but not sent to callbacks.
+#define DEBUG_OUTCTL_LOG_ONLY          0x00000004
+// All send control bits.
+#define DEBUG_OUTCTL_SEND_MASK         0x00000007
+// Do not place output from this client in
+// the global log file.
+#define DEBUG_OUTCTL_NOT_LOGGED        0x00000008
+// Send output to clients regardless of whether the
+// mask allows it or not.
+#define DEBUG_OUTCTL_OVERRIDE_MASK     0x00000010
+
+// Special value which means leave the output settings
+// unchanged.
+#define DEBUG_OUTCTL_AMBIENT           0xffffffff
+
+// Interrupt types.
+// Force a break in if the debuggee is running.
+#define DEBUG_INTERRUPT_ACTIVE  0
+// Notify but do not force a break in.
+#define DEBUG_INTERRUPT_PASSIVE 1
+// Try and get the current engine operation to
+// complete so that the engine will be available
+// again.  If no wait is active this is the same
+// as a passive interrupt.  If a wait is active
+// this will try to cause the wait to fail without
+// breaking in to the debuggee.  There is
+// no guarantee that issuing an exit interrupt
+// will cause the engine to become available
+// as not all operations are arbitrarily
+// interruptible.
+#define DEBUG_INTERRUPT_EXIT    2
+
+// OutputCurrentState flags.  These flags
+// allow a particular type of information
+// to be displayed but do not guarantee
+// that it will be displayed.  Other global
+// settings may override these flags or
+// the particular state may not be available.
+// For example, source line information may
+// not be present so source line information
+// may not be displayed.
+#define DEBUG_CURRENT_DEFAULT     0x0000000f
+#define DEBUG_CURRENT_SYMBOL      0x00000001
+#define DEBUG_CURRENT_DISASM      0x00000002
+#define DEBUG_CURRENT_REGISTERS   0x00000004
+#define DEBUG_CURRENT_SOURCE_LINE 0x00000008
+
+//
+// Disassemble flags.
+//
+
+// Compute the effective address from current register
+// information and display it.
+#define DEBUG_DISASM_EFFECTIVE_ADDRESS  0x00000001
+// If the current disassembly offset has an exact
+// symbol match output the symbol.
+#define DEBUG_DISASM_MATCHING_SYMBOLS   0x00000002
+// Output the source line number for each disassembly offset.
+#define DEBUG_DISASM_SOURCE_LINE_NUMBER 0x00000004
+// Output the source file name (no path) for each disassembly offset.
+#define DEBUG_DISASM_SOURCE_FILE_NAME   0x00000008
+
+// Code interpretation levels for stepping
+// and other operations.
+#define DEBUG_LEVEL_SOURCE   0
+#define DEBUG_LEVEL_ASSEMBLY 1
+
+// Engine control flags.
+#define DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION      0x00000001
+#define DEBUG_ENGOPT_IGNORE_EXTENSION_VERSIONS   0x00000002
+// If neither allow nor disallow is specified
+// the engine will pick one based on what kind
+// of debugging is going on.
+#define DEBUG_ENGOPT_ALLOW_NETWORK_PATHS         0x00000004
+#define DEBUG_ENGOPT_DISALLOW_NETWORK_PATHS      0x00000008
+#define DEBUG_ENGOPT_NETWORK_PATHS               (0x00000004 | 0x00000008)
+// Ignore loader-generated first-chance exceptions.
+#define DEBUG_ENGOPT_IGNORE_LOADER_EXCEPTIONS    0x00000010
+// Break in on a debuggees initial event.  In user-mode
+// this will break at the initial system breakpoint
+// for every created process.  In kernel-mode it
+// will attempt break in on the target at the first
+// WaitForEvent.
+#define DEBUG_ENGOPT_INITIAL_BREAK               0x00000020
+// Break in on the first module load for a debuggee.
+#define DEBUG_ENGOPT_INITIAL_MODULE_BREAK        0x00000040
+// Break in on a debuggees final event.  In user-mode
+// this will break on process exit for every process.
+// In kernel-mode it currently does nothing.
+#define DEBUG_ENGOPT_FINAL_BREAK                 0x00000080
+// By default Execute will repeat the last command
+// if it is given an empty string.  The flags to
+// Execute can override this behavior for a single
+// command or this engine option can be used to
+// change the default globally.
+#define DEBUG_ENGOPT_NO_EXECUTE_REPEAT           0x00000100
+// Disable places in the engine that have fallback
+// code when presented with incomplete information.
+//   1. Fails minidump module loads unless matching
+//      executables can be mapped.
+#define DEBUG_ENGOPT_FAIL_INCOMPLETE_INFORMATION 0x00000200
+// Allow the debugger to manipulate page protections
+// in order to insert code breakpoints on pages that
+// do not have write access.  This option is not on
+// by default as it allows breakpoints to be set
+// in potentially hazardous memory areas.
+#define DEBUG_ENGOPT_ALLOW_READ_ONLY_BREAKPOINTS 0x00000400
+// When using a software (bp/bu) breakpoint in code
+// that will be executed by multiple threads it is
+// possible for breakpoint management to cause the
+// breakpoint to be missed or for spurious single-step
+// exceptions to be generated.  This flag suspends
+// all but the active thread when doing breakpoint
+// management and thereby avoids multithreading
+// problems.  Care must be taken when using it, though,
+// as the suspension of threads can cause deadlocks
+// if the suspended threads are holding resources that
+// the active thread needs.  Additionally, there
+// are still rare situations where problems may
+// occur, but setting this flag corrects nearly
+// all multithreading issues with software breakpoints.
+// Thread-restricted stepping and execution supersedes
+// this flags effect.
+// This flag is ignored in kernel sessions as there
+// is no way to restrict processor execution.
+#define DEBUG_ENGOPT_SYNCHRONIZE_BREAKPOINTS     0x00000800
+// Disallows executing shell commands through the
+// engine with .shell (!!).
+#define DEBUG_ENGOPT_DISALLOW_SHELL_COMMANDS     0x00001000
+// Turns on "quiet mode", a somewhat less verbose mode
+// of operation supported in the debuggers that were
+// superseded by dbgeng.dll.  This equates to the KDQUIET
+// environment variable.
+#define DEBUG_ENGOPT_KD_QUIET_MODE               0x00002000
+// Disables managed code debugging support in the engine.
+// If managed support is already in use this flag has no effect.
+#define DEBUG_ENGOPT_DISABLE_MANAGED_SUPPORT     0x00004000
+// Disables symbol loading for all modules created
+// after this flag is set.
+#define DEBUG_ENGOPT_DISABLE_MODULE_SYMBOL_LOAD  0x00008000
+// Disables execution commands.
+#define DEBUG_ENGOPT_DISABLE_EXECUTION_COMMANDS  0x00010000
+#define DEBUG_ENGOPT_ALL                         0x0001FFFF
+
+// General unspecified ID constant.
+#define DEBUG_ANY_ID 0xffffffff
+
+typedef struct _DEBUG_STACK_FRAME
+{
+    ULONG64 InstructionOffset;
+    ULONG64 ReturnOffset;
+    ULONG64 FrameOffset;
+    ULONG64 StackOffset;
+    ULONG64 FuncTableEntry;
+    ULONG64 Params[4];
+    ULONG64 Reserved[6];
+    BOOL    Virtual;
+    ULONG   FrameNumber;
+} DEBUG_STACK_FRAME, *PDEBUG_STACK_FRAME;
+
+// OutputStackTrace flags.
+// Display a small number of arguments for each call.
+// These may or may not be the actual arguments depending
+// on the architecture, particular function and
+// point during the execution of the function.
+// If the current code level is assembly arguments
+// are dumped as hex values.  If the code level is
+// source the engine attempts to provide symbolic
+// argument information.
+#define DEBUG_STACK_ARGUMENTS               0x00000001
+// Displays information about the functions
+// frame such as __stdcall arguments, FPO
+// information and whatever else is available.
+#define DEBUG_STACK_FUNCTION_INFO           0x00000002
+// Displays source line information for each
+// frame of the stack trace.
+#define DEBUG_STACK_SOURCE_LINE             0x00000004
+// Show return, previous frame and other relevant address
+// values for each frame.
+#define DEBUG_STACK_FRAME_ADDRESSES         0x00000008
+// Show column names.
+#define DEBUG_STACK_COLUMN_NAMES            0x00000010
+// Show non-volatile register context for each
+// frame.  This is only meaningful for some platforms.
+#define DEBUG_STACK_NONVOLATILE_REGISTERS   0x00000020
+// Show frame numbers
+#define DEBUG_STACK_FRAME_NUMBERS           0x00000040
+// Show typed source parameters.
+#define DEBUG_STACK_PARAMETERS              0x00000080
+// Show just return address in stack frame addresses.
+#define DEBUG_STACK_FRAME_ADDRESSES_RA_ONLY 0x00000100
+// Show frame-to-frame memory usage.
+#define DEBUG_STACK_FRAME_MEMORY_USAGE      0x00000200
+// Show typed source parameters one to a line.
+#define DEBUG_STACK_PARAMETERS_NEWLINE      0x00000400
+
+// Classes of debuggee.  Each class
+// has different qualifiers for specific
+// kinds of debuggees.
+#define DEBUG_CLASS_UNINITIALIZED 0
+#define DEBUG_CLASS_KERNEL        1
+#define DEBUG_CLASS_USER_WINDOWS  2
+#define DEBUG_CLASS_IMAGE_FILE    3
+
+// Generic dump types.  These can be used
+// with either user or kernel sessions.
+// Session-type-specific aliases are also
+// provided.
+#define DEBUG_DUMP_SMALL      1024
+#define DEBUG_DUMP_DEFAULT    1025
+#define DEBUG_DUMP_FULL       1026
+#define DEBUG_DUMP_IMAGE_FILE 1027
+#define DEBUG_DUMP_TRACE_LOG  1028
+#define DEBUG_DUMP_WINDOWS_CE 1029
+
+// Specific types of kernel debuggees.
+#define DEBUG_KERNEL_CONNECTION  0
+#define DEBUG_KERNEL_LOCAL       1
+#define DEBUG_KERNEL_EXDI_DRIVER 2
+
+#define DEBUG_KERNEL_SMALL_DUMP  DEBUG_DUMP_SMALL
+#define DEBUG_KERNEL_DUMP        DEBUG_DUMP_DEFAULT
+#define DEBUG_KERNEL_FULL_DUMP   DEBUG_DUMP_FULL
+
+#define DEBUG_KERNEL_TRACE_LOG   DEBUG_DUMP_TRACE_LOG
+
+// Specific types of Windows user debuggees.
+#define DEBUG_USER_WINDOWS_PROCESS         0
+#define DEBUG_USER_WINDOWS_PROCESS_SERVER  1
+#define DEBUG_USER_WINDOWS_SMALL_DUMP      DEBUG_DUMP_SMALL
+#define DEBUG_USER_WINDOWS_DUMP            DEBUG_DUMP_DEFAULT
+#define DEBUG_USER_WINDOWS_DUMP_WINDOWS_CE DEBUG_DUMP_WINDOWS_CE
+
+// Extension flags.
+#define DEBUG_EXTENSION_AT_ENGINE 0x00000000
+
+// Execute and ExecuteCommandFile flags.
+// These flags only apply to the command
+// text itself; output from the executed
+// command is controlled by the output
+// control parameter.
+// Default execution.  Command is logged
+// but not output.
+#define DEBUG_EXECUTE_DEFAULT    0x00000000
+// Echo commands during execution.  In
+// ExecuteCommandFile also echoes the prompt
+// for each line of the file.
+#define DEBUG_EXECUTE_ECHO       0x00000001
+// Do not log or output commands during execution.
+// Overridden by DEBUG_EXECUTE_ECHO.
+#define DEBUG_EXECUTE_NOT_LOGGED 0x00000002
+// If this flag is not set an empty string
+// to Execute will repeat the last Execute
+// string.
+#define DEBUG_EXECUTE_NO_REPEAT  0x00000004
+
+// Specific event filter types.  Some event
+// filters have optional arguments to further
+// qualify their operation.
+#define DEBUG_FILTER_CREATE_THREAD       0x00000000
+#define DEBUG_FILTER_EXIT_THREAD         0x00000001
+#define DEBUG_FILTER_CREATE_PROCESS      0x00000002
+#define DEBUG_FILTER_EXIT_PROCESS        0x00000003
+// Argument is the name of a module to break on.
+#define DEBUG_FILTER_LOAD_MODULE         0x00000004
+// Argument is the base address of a specific module to break on.
+#define DEBUG_FILTER_UNLOAD_MODULE       0x00000005
+#define DEBUG_FILTER_SYSTEM_ERROR        0x00000006
+// Initial breakpoint and initial module load are one-shot
+// events that are triggered at the appropriate points in
+// the beginning of a session.  Their commands are executed
+// and then further processing is controlled by the normal
+// exception and load module filters.
+#define DEBUG_FILTER_INITIAL_BREAKPOINT  0x00000007
+#define DEBUG_FILTER_INITIAL_MODULE_LOAD 0x00000008
+// The debug output filter allows the debugger to stop
+// when output is produced so that the code causing
+// output can be tracked down or synchronized with.
+// This filter is not supported for live dual-machine
+// kernel debugging.
+#define DEBUG_FILTER_DEBUGGEE_OUTPUT     0x00000009
+
+// Event filter execution options.
+// Break in always.
+#define DEBUG_FILTER_BREAK               0x00000000
+// Break in on second-chance exceptions.  For events
+// that are not exceptions this is the same as BREAK.
+#define DEBUG_FILTER_SECOND_CHANCE_BREAK 0x00000001
+// Output a message about the event but continue.
+#define DEBUG_FILTER_OUTPUT              0x00000002
+// Continue the event.
+#define DEBUG_FILTER_IGNORE              0x00000003
+// Used to remove general exception filters.
+#define DEBUG_FILTER_REMOVE              0x00000004
+
+// Event filter continuation options.  These options are
+// only used when DEBUG_STATUS_GO is used to continue
+// execution.  If a specific go status such as
+// DEBUG_STATUS_GO_NOT_HANDLED is used it controls
+// the continuation.
+#define DEBUG_FILTER_GO_HANDLED          0x00000000
+#define DEBUG_FILTER_GO_NOT_HANDLED      0x00000001
+
+// Specific event filter settings.
+typedef struct _DEBUG_SPECIFIC_FILTER_PARAMETERS
+{
+    ULONG ExecutionOption;
+    ULONG ContinueOption;
+    ULONG TextSize;
+    ULONG CommandSize;
+    // If ArgumentSize is zero this filter does
+    // not have an argument.  An empty argument for
+    // a filter which does have an argument will take
+    // one byte for the terminator.
+    ULONG ArgumentSize;
+} DEBUG_SPECIFIC_FILTER_PARAMETERS, *PDEBUG_SPECIFIC_FILTER_PARAMETERS;
+
+// Exception event filter settings.
+typedef struct _DEBUG_EXCEPTION_FILTER_PARAMETERS
+{
+    ULONG ExecutionOption;
+    ULONG ContinueOption;
+    ULONG TextSize;
+    ULONG CommandSize;
+    ULONG SecondCommandSize;
+    ULONG ExceptionCode;
+} DEBUG_EXCEPTION_FILTER_PARAMETERS, *PDEBUG_EXCEPTION_FILTER_PARAMETERS;
+
+// Wait flags.
+#define DEBUG_WAIT_DEFAULT 0x00000000
+
+// Last event information structures.
+typedef struct _DEBUG_LAST_EVENT_INFO_BREAKPOINT
+{
+    ULONG Id;
+} DEBUG_LAST_EVENT_INFO_BREAKPOINT, *PDEBUG_LAST_EVENT_INFO_BREAKPOINT;
+
+typedef struct _DEBUG_LAST_EVENT_INFO_EXCEPTION
+{
+    EXCEPTION_RECORD64 ExceptionRecord;
+    ULONG FirstChance;
+} DEBUG_LAST_EVENT_INFO_EXCEPTION, *PDEBUG_LAST_EVENT_INFO_EXCEPTION;
+
+typedef struct _DEBUG_LAST_EVENT_INFO_EXIT_THREAD
+{
+    ULONG ExitCode;
+} DEBUG_LAST_EVENT_INFO_EXIT_THREAD, *PDEBUG_LAST_EVENT_INFO_EXIT_THREAD;
+
+typedef struct _DEBUG_LAST_EVENT_INFO_EXIT_PROCESS
+{
+    ULONG ExitCode;
+} DEBUG_LAST_EVENT_INFO_EXIT_PROCESS, *PDEBUG_LAST_EVENT_INFO_EXIT_PROCESS;
+
+typedef struct _DEBUG_LAST_EVENT_INFO_LOAD_MODULE
+{
+    ULONG64 Base;
+} DEBUG_LAST_EVENT_INFO_LOAD_MODULE, *PDEBUG_LAST_EVENT_INFO_LOAD_MODULE;
+
+typedef struct _DEBUG_LAST_EVENT_INFO_UNLOAD_MODULE
+{
+    ULONG64 Base;
+} DEBUG_LAST_EVENT_INFO_UNLOAD_MODULE, *PDEBUG_LAST_EVENT_INFO_UNLOAD_MODULE;
+
+typedef struct _DEBUG_LAST_EVENT_INFO_SYSTEM_ERROR
+{
+    ULONG Error;
+    ULONG Level;
+} DEBUG_LAST_EVENT_INFO_SYSTEM_ERROR, *PDEBUG_LAST_EVENT_INFO_SYSTEM_ERROR;
+
+// DEBUG_VALUE types.
+#define DEBUG_VALUE_INVALID      0
+#define DEBUG_VALUE_INT8         1
+#define DEBUG_VALUE_INT16        2
+#define DEBUG_VALUE_INT32        3
+#define DEBUG_VALUE_INT64        4
+#define DEBUG_VALUE_FLOAT32      5
+#define DEBUG_VALUE_FLOAT64      6
+#define DEBUG_VALUE_FLOAT80      7
+#define DEBUG_VALUE_FLOAT82      8
+#define DEBUG_VALUE_FLOAT128     9
+#define DEBUG_VALUE_VECTOR64     10
+#define DEBUG_VALUE_VECTOR128    11
+// Count of type indices.
+#define DEBUG_VALUE_TYPES        12
+
+#if defined(_MSC_VER)
+#if _MSC_VER >= 800
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4201)    /* Nameless struct/union */
+#endif
+#endif
+
+// We want the DEBUG_VALUE structure to have 8-byte alignment
+// and be 32 bytes total.  This is tricky because the compiler
+// wants to pad the union of values out to a even 8-byte multiple,
+// pushing the type out too far.  We can't use 4-packing because
+// then the 8-byte alignment requirement is lost, so instead
+// we shrink the union to 24 bytes and have a reserved field
+// before the type field.  The same amount of space is available
+// and everybody's happy, but the structure is somewhat unusual.
+
+typedef struct _DEBUG_VALUE
+{
+    union
+    {
+        UCHAR I8;
+        USHORT I16;
+        ULONG I32;
+        struct
+        {
+            // Extra NAT indicator for IA64
+            // integer registers.  NAT will
+            // always be false for other CPUs.
+            ULONG64 I64;
+            BOOL Nat;
+        };
+        float F32;
+        double F64;
+        UCHAR F80Bytes[10];
+        UCHAR F82Bytes[11];
+        UCHAR F128Bytes[16];
+        // Vector interpretations.  The actual number
+        // of valid elements depends on the vector length.
+        UCHAR VI8[16];
+        USHORT VI16[8];
+        ULONG VI32[4];
+        ULONG64 VI64[2];
+        float VF32[4];
+        double VF64[2];
+        struct
+        {
+            ULONG LowPart;
+            ULONG HighPart;
+        } I64Parts32;
+        struct
+        {
+            ULONG64 LowPart;
+            LONG64 HighPart;
+        } F128Parts64;
+        // Allows raw byte access to content.  Array
+        // can be indexed for as much data as Type
+        // describes.  This array also serves to pad
+        // the structure out to 32 bytes and reserves
+        // space for future members.
+        UCHAR RawBytes[24];
+    };
+    ULONG TailOfRawBytes;
+  ULONG Type;
+} DEBUG_VALUE, *PDEBUG_VALUE;
+
+#if defined(_MSC_VER)
+#if _MSC_VER >= 800
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4201)    /* Nameless struct/union */
+#endif
+#endif
+#endif
+
+#undef INTERFACE
+#define INTERFACE IDebugControl
+DECLARE_INTERFACE_(IDebugControl, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugControl.
+
+    // Checks for a user interrupt, such a Ctrl-C
+    // or stop button.
+    // This method is reentrant.
+    STDMETHOD(GetInterrupt)(
+        THIS
+        ) PURE;
+    // Registers a user interrupt.
+    // This method is reentrant.
+    STDMETHOD(SetInterrupt)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Interrupting a user-mode process requires
+    // access to some system resources that the
+    // process may hold itself, preventing the
+    // interrupt from occurring.  The engine
+    // will time-out pending interrupt requests
+    // and simulate an interrupt if necessary.
+    // These methods control the interrupt timeout.
+    STDMETHOD(GetInterruptTimeout)(
+        THIS_
+        __out PULONG Seconds
+        ) PURE;
+    STDMETHOD(SetInterruptTimeout)(
+        THIS_
+        __in ULONG Seconds
+        ) PURE;
+
+    STDMETHOD(GetLogFile)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PBOOL Append
+        ) PURE;
+    // Opens a log file which collects all
+    // output.  Output from every client except
+    // those that explicitly disable logging
+    // goes into the log.
+    // Opening a log file closes any log file
+    // already open.
+    STDMETHOD(OpenLogFile)(
+        THIS_
+        __in PCSTR File,
+        __in BOOL Append
+        ) PURE;
+    STDMETHOD(CloseLogFile)(
+        THIS
+        ) PURE;
+    // Controls what output is logged.
+    STDMETHOD(GetLogMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetLogMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+
+    // Input requests input from all clients.
+    // The first input that is returned is used
+    // to satisfy the call.  Other returned
+    // input is discarded.
+    STDMETHOD(Input)(
+        THIS_
+        __out_ecount(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InputSize
+        ) PURE;
+    // This method is used by clients to return
+    // input when it is available.  It will
+    // return S_OK if the input is used to
+    // satisfy an Input call and S_FALSE if
+    // the input is ignored.
+    // This method is reentrant.
+    STDMETHOD(ReturnInput)(
+        THIS_
+        __in PCSTR Buffer
+        ) PURE;
+
+    // Sends output through clients
+    // output callbacks if the mask is allowed
+    // by the current output control mask and
+    // according to the output distribution
+    // settings.
+    STDMETHODV(Output)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputVaList)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // The following methods allow direct control
+    // over the distribution of the given output
+    // for situations where something other than
+    // the default is desired.  These methods require
+    // extra work in the engine so they should
+    // only be used when necessary.
+    STDMETHODV(ControlledOutput)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(ControlledOutputVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+
+    // Displays the standard command-line prompt
+    // followed by the given output.  If Format
+    // is NULL no additional output is produced.
+    // Output is produced under the
+    // DEBUG_OUTPUT_PROMPT mask.
+    // This method only outputs the prompt; it
+    // does not get input.
+    STDMETHODV(OutputPrompt)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputPromptVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // Gets the text that would be displayed by OutputPrompt.
+    STDMETHOD(GetPromptText)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // Outputs information about the current
+    // debuggee state such as a register
+    // summary, disassembly at the current PC,
+    // closest symbol and others.
+    // Uses the line prefix.
+    STDMETHOD(OutputCurrentState)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // Outputs the debugger and extension version
+    // information.  This method is reentrant.
+    // Uses the line prefix.
+    STDMETHOD(OutputVersionInformation)(
+        THIS_
+        __in ULONG OutputControl
+        ) PURE;
+
+    // In user-mode debugging sessions the
+    // engine will set an event when
+    // exceptions are continued.  This can
+    // be used to synchronize other processes
+    // with the debuggers handling of events.
+    // For example, this is used to support
+    // the e argument to ntsd.
+    STDMETHOD(GetNotifyEventHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(SetNotifyEventHandle)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Assemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in PCSTR Instr,
+        __out PULONG64 EndOffset
+        ) PURE;
+    STDMETHOD(Disassemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DisassemblySize,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Returns the value of the effective address
+    // computed for the last Disassemble, if there
+    // was one.
+    STDMETHOD(GetDisassembleEffectiveOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Uses the line prefix if necessary.
+    STDMETHOD(OutputDisassembly)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Produces multiple lines of disassembly output.
+    // There will be PreviousLines of disassembly before
+    // the given offset if a valid disassembly exists.
+    // In all, there will be TotalLines of output produced.
+    // The first and last line offsets are returned
+    // specially and all lines offsets can be retrieved
+    // through LineOffsets.  LineOffsets will contain
+    // offsets for each line where disassembly started.
+    // When disassembly of a single instruction takes
+    // multiple lines the initial offset will be followed
+    // by DEBUG_INVALID_OFFSET.
+    // Uses the line prefix.
+    STDMETHOD(OutputDisassemblyLines)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG PreviousLines,
+        __in ULONG TotalLines,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_opt PULONG OffsetLine,
+        __out_opt PULONG64 StartOffset,
+        __out_opt PULONG64 EndOffset,
+        __out_ecount_opt(TotalLines) PULONG64 LineOffsets
+        ) PURE;
+    // Returns the offset of the start of
+    // the instruction thats the given
+    // delta away from the instruction
+    // at the initial offset.
+    // This routine does not check for
+    // validity of the instruction or
+    // the memory containing it.
+    STDMETHOD(GetNearInstruction)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out PULONG64 NearOffset
+        ) PURE;
+
+    // Offsets can be passed in as zero to use the current
+    // thread state.
+    STDMETHOD(GetStackTrace)(
+        THIS_
+        __in ULONG64 FrameOffset,
+        __in ULONG64 StackOffset,
+        __in ULONG64 InstructionOffset,
+        __out_ecount(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __out_opt PULONG FramesFilled
+        ) PURE;
+    // Does a simple stack trace to determine
+    // what the current return address is.
+    STDMETHOD(GetReturnOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // If Frames is NULL OutputStackTrace will
+    // use GetStackTrace to get FramesSize frames
+    // and then output them.  The current register
+    // values for frame, stack and instruction offsets
+    // are used.
+    // Uses the line prefix.
+    STDMETHOD(OutputStackTrace)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_ecount_opt(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __in ULONG Flags
+        ) PURE;
+
+    // Returns information about the debuggee such
+    // as user vs. kernel, dump vs. live, etc.
+    STDMETHOD(GetDebuggeeType)(
+        THIS_
+        __out PULONG Class,
+        __out PULONG Qualifier
+        ) PURE;
+    // Returns the type of physical processors in
+    // the machine.
+    // Returns one of the IMAGE_FILE_MACHINE values.
+    STDMETHOD(GetActualProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Returns the type of processor used in the
+    // current processor context.
+    STDMETHOD(GetExecutingProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Query all the possible processor types that
+    // may be encountered during this debug session.
+    STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetPossibleExecutingProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Get the number of actual processors in
+    // the machine.
+    STDMETHOD(GetNumberProcessors)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // PlatformId is one of the VER_PLATFORM values.
+    // Major and minor are as given in the NT
+    // kernel debugger protocol.
+    // ServicePackString and ServicePackNumber indicate the
+    // system service pack level.  ServicePackNumber is not
+    // available in some sessions where the service pack level
+    // is only expressed as a string.  The service pack information
+    // will be empty if the system does not have a service pack
+    // applied.
+    // The build string is string information identifying the
+    // particular build of the system.  The build string is
+    // empty if the system has no particular identifying
+    // information.
+    STDMETHOD(GetSystemVersion)(
+        THIS_
+        __out PULONG PlatformId,
+        __out PULONG Major,
+        __out PULONG Minor,
+        __out_ecount_opt(ServicePackStringSize) PSTR ServicePackString,
+        __in ULONG ServicePackStringSize,
+        __out_opt PULONG ServicePackStringUsed,
+        __out PULONG ServicePackNumber,
+        __out_ecount_opt(BuildStringSize) PSTR BuildString,
+        __in ULONG BuildStringSize,
+        __out_opt PULONG BuildStringUsed
+        ) PURE;
+    // Returns the page size for the currently executing
+    // processor context.  The page size may vary between
+    // processor types.
+    STDMETHOD(GetPageSize)(
+        THIS_
+        __out PULONG Size
+        ) PURE;
+    // Returns S_OK if the current processor context uses
+    // 64-bit addresses, otherwise S_FALSE.
+    STDMETHOD(IsPointer64Bit)(
+        THIS
+        ) PURE;
+    // Reads the bugcheck data area and returns the
+    // current contents.  This method only works
+    // in kernel debugging sessions.
+    STDMETHOD(ReadBugCheckData)(
+        THIS_
+        __out PULONG Code,
+        __out PULONG64 Arg1,
+        __out PULONG64 Arg2,
+        __out PULONG64 Arg3,
+        __out PULONG64 Arg4
+        ) PURE;
+
+    // Query all the processor types supported by
+    // the engine.  This is a complete list and is
+    // not related to the machine running the engine
+    // or the debuggee.
+    STDMETHOD(GetNumberSupportedProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetSupportedProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Returns a full, descriptive name and an
+    // abbreviated name for a processor type.
+    STDMETHOD(GetProcessorTypeNames)(
+        THIS_
+        __in ULONG Type,
+        __out_ecount_opt(FullNameBufferSize) PSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    // Gets and sets the type of processor to
+    // use when doing things like setting
+    // breakpoints, accessing registers,
+    // getting stack traces and so on.
+    STDMETHOD(GetEffectiveProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    STDMETHOD(SetEffectiveProcessorType)(
+        THIS_
+        __in ULONG Type
+        ) PURE;
+
+    // Returns information about whether and how
+    // the debuggee is running.  Status will
+    // be GO if the debuggee is running and
+    // BREAK if it isnt.
+    // If no debuggee exists the status is
+    // NO_DEBUGGEE.
+    // This method is reentrant.
+    STDMETHOD(GetExecutionStatus)(
+        THIS_
+        __out PULONG Status
+        ) PURE;
+    // Changes the execution status of the
+    // engine from stopped to running.
+    // Status must be one of the go or step
+    // status values.
+    STDMETHOD(SetExecutionStatus)(
+        THIS_
+        __in ULONG Status
+        ) PURE;
+
+    // Controls what code interpretation level the debugger
+    // runs at.  The debugger checks the code level when
+    // deciding whether to step by a source line or
+    // assembly instruction along with other related operations.
+    STDMETHOD(GetCodeLevel)(
+        THIS_
+        __out PULONG Level
+        ) PURE;
+    STDMETHOD(SetCodeLevel)(
+        THIS_
+        __in ULONG Level
+        ) PURE;
+
+    // Gets and sets engine control flags.
+    // These methods are reentrant.
+    STDMETHOD(GetEngineOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Gets and sets control values for
+    // handling system error events.
+    // If the system error level is less
+    // than or equal to the given levels
+    // the error may be displayed and
+    // the default break for the event
+    // may be set.
+    STDMETHOD(GetSystemErrorControl)(
+        THIS_
+        __out PULONG OutputLevel,
+        __out PULONG BreakLevel
+        ) PURE;
+    STDMETHOD(SetSystemErrorControl)(
+        THIS_
+        __in ULONG OutputLevel,
+        __in ULONG BreakLevel
+        ) PURE;
+
+    // The command processor supports simple
+    // string replacement macros in Evaluate and
+    // Execute.  There are currently ten macro
+    // slots available.  Slots 0-9 map to
+    // the command invocations $u0-$u9.
+    STDMETHOD(GetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MacroSize
+        ) PURE;
+    STDMETHOD(SetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __in PCSTR Macro
+        ) PURE;
+
+    // Controls the default number radix used
+    // in expressions and commands.
+    STDMETHOD(GetRadix)(
+        THIS_
+        __out PULONG Radix
+        ) PURE;
+    STDMETHOD(SetRadix)(
+        THIS_
+        __in ULONG Radix
+        ) PURE;
+
+    // Evaluates the given expression string and
+    // returns the resulting value.
+    // If DesiredType is DEBUG_VALUE_INVALID then
+    // the natural type is used.
+    // RemainderIndex, if provided, is set to the index
+    // of the first character in the input string that was
+    // not used when evaluating the expression.
+    STDMETHOD(Evaluate)(
+        THIS_
+        __in PCSTR Expression,
+        __in ULONG DesiredType,
+        __out PDEBUG_VALUE Value,
+        __out_opt PULONG RemainderIndex
+        ) PURE;
+    // Attempts to convert the input value to a value
+    // of the requested type in the output value.
+    // Conversions can fail if no conversion exists.
+    // Successful conversions may be lossy.
+    STDMETHOD(CoerceValue)(
+        THIS_
+        __in PDEBUG_VALUE In,
+        __in ULONG OutType,
+        __out PDEBUG_VALUE Out
+        ) PURE;
+    STDMETHOD(CoerceValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_VALUE In,
+        __in_ecount(Count) PULONG OutTypes,
+        __out_ecount(Count) PDEBUG_VALUE Out
+        ) PURE;
+
+    // Executes the given command string.
+    // If the string has multiple commands
+    // Execute will not return until all
+    // of them have been executed.  If this
+    // requires waiting for the debuggee to
+    // execute an internal wait will be done
+    // so Execute can take an arbitrary amount
+    // of time.
+    STDMETHOD(Execute)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Command,
+        __in ULONG Flags
+        ) PURE;
+    // Executes the given command file by
+    // reading a line at a time and processing
+    // it with Execute.
+    STDMETHOD(ExecuteCommandFile)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR CommandFile,
+        __in ULONG Flags
+        ) PURE;
+
+    // Breakpoint interfaces are described
+    // elsewhere in this section.
+    STDMETHOD(GetNumberBreakpoints)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // It is possible for this retrieval function to
+    // fail even with an index within the number of
+    // existing breakpoints if the breakpoint is
+    // a private breakpoint.
+    STDMETHOD(GetBreakpointByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    STDMETHOD(GetBreakpointById)(
+        THIS_
+        __in ULONG Id,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // If Ids is non-NULL the Count breakpoints
+    // referred to in the Ids array are returned,
+    // otherwise breakpoints from index Start to
+    // Start + Count  1 are returned.
+    STDMETHOD(GetBreakpointParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Ids,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_BREAKPOINT_PARAMETERS Params
+        ) PURE;
+    // Breakpoints are created empty and disabled.
+    // When their parameters have been set they
+    // should be enabled by setting the ENABLE flag.
+    // If DesiredId is DEBUG_ANY_ID then the
+    // engine picks an unused ID.  If DesiredId
+    // is any other number the engine attempts
+    // to use the given ID for the breakpoint.
+    // If another breakpoint exists with that ID
+    // the call will fail.
+    STDMETHOD(AddBreakpoint)(
+        THIS_
+        __in ULONG Type,
+        __in ULONG DesiredId,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // Breakpoint interface is invalid after this call.
+    STDMETHOD(RemoveBreakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT Bp
+        ) PURE;
+
+    // Control and use extension DLLs.
+    STDMETHOD(AddExtension)(
+        THIS_
+        __in PCSTR Path,
+        __in ULONG Flags,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(RemoveExtension)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetExtensionByPath)(
+        THIS_
+        __in PCSTR Path,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Handle is zero the extension
+    // chain is walked searching for the
+    // function.
+    STDMETHOD(CallExtension)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR Function,
+        __in_opt PCSTR Arguments
+        ) PURE;
+    // GetExtensionFunction works like
+    // GetProcAddress on extension DLLs
+    // to allow raw function-call-level
+    // interaction with extension DLLs.
+    // Such functions do not need to
+    // follow the standard extension prototype
+    // if they are not going to be called
+    // through the text extension interface.
+    // _EFN_ is automatically prepended to
+    // the name string given.
+    // This function cannot be called remotely.
+    STDMETHOD(GetExtensionFunction)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR FuncName,
+        __out FARPROC* Function
+        ) PURE;
+    // These methods return alternate
+    // extension interfaces in order to allow
+    // interface-style extension DLLs to mix in
+    // older extension calls.
+    // Structure sizes must be initialized before
+    // the call.
+    // These methods cannot be called remotely.
+    STDMETHOD(GetWindbgExtensionApis32)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS32 Api
+        ) PURE;
+    STDMETHOD(GetWindbgExtensionApis64)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS64 Api
+        ) PURE;
+
+    // The engine provides a simple mechanism
+    // to filter common events.  Arbitrarily complicated
+    // filtering can be done by registering event callbacks
+    // but simple event filtering only requires
+    // setting the options of one of the predefined
+    // event filters.
+    // Simple event filters are either for specific
+    // events and therefore have an enumerant or
+    // they are for an exception and are based on
+    // the exceptions code.  Exception filters
+    // are further divided into exceptions specially
+    // handled by the engine, which is a fixed set,
+    // and arbitrary exceptions.
+    // All three groups of filters are indexed together
+    // with the specific filters first, then the specific
+    // exception filters and finally the arbitrary
+    // exception filters.
+    // The first specific exception is the default
+    // exception.  If an exception event occurs for
+    // an exception without settings the default
+    // exception settings are used.
+    STDMETHOD(GetNumberEventFilters)(
+        THIS_
+        __out PULONG SpecificEvents,
+        __out PULONG SpecificExceptions,
+        __out PULONG ArbitraryExceptions
+        ) PURE;
+    // Some filters have descriptive text associated with them.
+    STDMETHOD(GetEventFilterText)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // All filters support executing a command when the
+    // event occurs.
+    STDMETHOD(GetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+    STDMETHOD(GetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    STDMETHOD(SetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    // Some specific filters have arguments to further
+    // qualify their operation.
+    STDMETHOD(GetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ArgumentSize
+        ) PURE;
+    STDMETHOD(SetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Argument
+        ) PURE;
+    // If Codes is non-NULL Start is ignored.
+    STDMETHOD(GetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Codes,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // The codes in the parameter data control the application
+    // of the parameter data.  If a code is not already in
+    // the set of filters it is added.  If the ExecutionOption
+    // for a code is REMOVE then the filter is removed.
+    // Specific exception filters cannot be removed.
+    STDMETHOD(SetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // Exception filters support an additional command for
+    // second-chance events.
+    STDMETHOD(GetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+
+    // Yields processing to the engine until
+    // an event occurs.  This method may
+    // only be called by the thread that started
+    // the debug session.
+    // When an event occurs the engine carries
+    // out all event processing such as calling
+    // callbacks.
+    // If the callbacks indicate that execution should
+    // break the wait will return, otherwise it
+    // goes back to waiting for a new event.
+    // If the timeout expires, S_FALSE is returned.
+    // The timeout is not currently supported for
+    // kernel debugging.
+    STDMETHOD(WaitForEvent)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG Timeout
+        ) PURE;
+
+    // Retrieves information about the last event that occurred.
+    // EventType is one of the event callback mask bits.
+    // ExtraInformation contains additional event-specific
+    // information.  Not all events have additional information.
+    STDMETHOD(GetLastEventInformation)(
+        THIS_
+        __out PULONG Type,
+        __out PULONG ProcessId,
+        __out PULONG ThreadId,
+        __out_bcount_opt(ExtraInformationSize) PVOID ExtraInformation,
+        __in ULONG ExtraInformationSize,
+        __out_opt PULONG ExtraInformationUsed,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG DescriptionUsed
+        ) PURE;
+};
+
+// OutputTextReplacements flags.
+#define DEBUG_OUT_TEXT_REPL_DEFAULT 0x00000000
+
+#undef INTERFACE
+#define INTERFACE IDebugControl2
+DECLARE_INTERFACE_(IDebugControl2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugControl.
+
+    // Checks for a user interrupt, such a Ctrl-C
+    // or stop button.
+    // This method is reentrant.
+    STDMETHOD(GetInterrupt)(
+        THIS
+        ) PURE;
+    // Registers a user interrupt.
+    // This method is reentrant.
+    STDMETHOD(SetInterrupt)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Interrupting a user-mode process requires
+    // access to some system resources that the
+    // process may hold itself, preventing the
+    // interrupt from occurring.  The engine
+    // will time-out pending interrupt requests
+    // and simulate an interrupt if necessary.
+    // These methods control the interrupt timeout.
+    STDMETHOD(GetInterruptTimeout)(
+        THIS_
+        __out PULONG Seconds
+        ) PURE;
+    STDMETHOD(SetInterruptTimeout)(
+        THIS_
+        __in ULONG Seconds
+        ) PURE;
+
+    STDMETHOD(GetLogFile)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PBOOL Append
+        ) PURE;
+    // Opens a log file which collects all
+    // output.  Output from every client except
+    // those that explicitly disable logging
+    // goes into the log.
+    // Opening a log file closes any log file
+    // already open.
+    STDMETHOD(OpenLogFile)(
+        THIS_
+        __in PCSTR File,
+        __in BOOL Append
+        ) PURE;
+    STDMETHOD(CloseLogFile)(
+        THIS
+        ) PURE;
+    // Controls what output is logged.
+    STDMETHOD(GetLogMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetLogMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+
+    // Input requests input from all clients.
+    // The first input that is returned is used
+    // to satisfy the call.  Other returned
+    // input is discarded.
+    STDMETHOD(Input)(
+        THIS_
+        __out_ecount(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InputSize
+        ) PURE;
+    // This method is used by clients to return
+    // input when it is available.  It will
+    // return S_OK if the input is used to
+    // satisfy an Input call and S_FALSE if
+    // the input is ignored.
+    // This method is reentrant.
+    STDMETHOD(ReturnInput)(
+        THIS_
+        __in PCSTR Buffer
+        ) PURE;
+
+    // Sends output through clients
+    // output callbacks if the mask is allowed
+    // by the current output control mask and
+    // according to the output distribution
+    // settings.
+    STDMETHODV(Output)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputVaList)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // The following methods allow direct control
+    // over the distribution of the given output
+    // for situations where something other than
+    // the default is desired.  These methods require
+    // extra work in the engine so they should
+    // only be used when necessary.
+    STDMETHODV(ControlledOutput)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(ControlledOutputVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+
+    // Displays the standard command-line prompt
+    // followed by the given output.  If Format
+    // is NULL no additional output is produced.
+    // Output is produced under the
+    // DEBUG_OUTPUT_PROMPT mask.
+    // This method only outputs the prompt; it
+    // does not get input.
+    STDMETHODV(OutputPrompt)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputPromptVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // Gets the text that would be displayed by OutputPrompt.
+    STDMETHOD(GetPromptText)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // Outputs information about the current
+    // debuggee state such as a register
+    // summary, disassembly at the current PC,
+    // closest symbol and others.
+    // Uses the line prefix.
+    STDMETHOD(OutputCurrentState)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // Outputs the debugger and extension version
+    // information.  This method is reentrant.
+    // Uses the line prefix.
+    STDMETHOD(OutputVersionInformation)(
+        THIS_
+        __in ULONG OutputControl
+        ) PURE;
+
+    // In user-mode debugging sessions the
+    // engine will set an event when
+    // exceptions are continued.  This can
+    // be used to synchronize other processes
+    // with the debuggers handling of events.
+    // For example, this is used to support
+    // the e argument to ntsd.
+    STDMETHOD(GetNotifyEventHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(SetNotifyEventHandle)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Assemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in PCSTR Instr,
+        __out PULONG64 EndOffset
+        ) PURE;
+    STDMETHOD(Disassemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DisassemblySize,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Returns the value of the effective address
+    // computed for the last Disassemble, if there
+    // was one.
+    STDMETHOD(GetDisassembleEffectiveOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Uses the line prefix if necessary.
+    STDMETHOD(OutputDisassembly)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Produces multiple lines of disassembly output.
+    // There will be PreviousLines of disassembly before
+    // the given offset if a valid disassembly exists.
+    // In all, there will be TotalLines of output produced.
+    // The first and last line offsets are returned
+    // specially and all lines offsets can be retrieved
+    // through LineOffsets.  LineOffsets will contain
+    // offsets for each line where disassembly started.
+    // When disassembly of a single instruction takes
+    // multiple lines the initial offset will be followed
+    // by DEBUG_INVALID_OFFSET.
+    // Uses the line prefix.
+    STDMETHOD(OutputDisassemblyLines)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG PreviousLines,
+        __in ULONG TotalLines,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_opt PULONG OffsetLine,
+        __out_opt PULONG64 StartOffset,
+        __out_opt PULONG64 EndOffset,
+        __out_ecount_opt(TotalLines) PULONG64 LineOffsets
+        ) PURE;
+    // Returns the offset of the start of
+    // the instruction thats the given
+    // delta away from the instruction
+    // at the initial offset.
+    // This routine does not check for
+    // validity of the instruction or
+    // the memory containing it.
+    STDMETHOD(GetNearInstruction)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out PULONG64 NearOffset
+        ) PURE;
+
+    // Offsets can be passed in as zero to use the current
+    // thread state.
+    STDMETHOD(GetStackTrace)(
+        THIS_
+        __in ULONG64 FrameOffset,
+        __in ULONG64 StackOffset,
+        __in ULONG64 InstructionOffset,
+        __out_ecount(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __out_opt PULONG FramesFilled
+        ) PURE;
+    // Does a simple stack trace to determine
+    // what the current return address is.
+    STDMETHOD(GetReturnOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // If Frames is NULL OutputStackTrace will
+    // use GetStackTrace to get FramesSize frames
+    // and then output them.  The current register
+    // values for frame, stack and instruction offsets
+    // are used.
+    // Uses the line prefix.
+    STDMETHOD(OutputStackTrace)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_ecount_opt(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __in ULONG Flags
+        ) PURE;
+
+    // Returns information about the debuggee such
+    // as user vs. kernel, dump vs. live, etc.
+    STDMETHOD(GetDebuggeeType)(
+        THIS_
+        __out PULONG Class,
+        __out PULONG Qualifier
+        ) PURE;
+    // Returns the type of physical processors in
+    // the machine.
+    // Returns one of the IMAGE_FILE_MACHINE values.
+    STDMETHOD(GetActualProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Returns the type of processor used in the
+    // current processor context.
+    STDMETHOD(GetExecutingProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Query all the possible processor types that
+    // may be encountered during this debug session.
+    STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetPossibleExecutingProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Get the number of actual processors in
+    // the machine.
+    STDMETHOD(GetNumberProcessors)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // PlatformId is one of the VER_PLATFORM values.
+    // Major and minor are as given in the NT
+    // kernel debugger protocol.
+    // ServicePackString and ServicePackNumber indicate the
+    // system service pack level.  ServicePackNumber is not
+    // available in some sessions where the service pack level
+    // is only expressed as a string.  The service pack information
+    // will be empty if the system does not have a service pack
+    // applied.
+    // The build string is string information identifying the
+    // particular build of the system.  The build string is
+    // empty if the system has no particular identifying
+    // information.
+    STDMETHOD(GetSystemVersion)(
+        THIS_
+        __out PULONG PlatformId,
+        __out PULONG Major,
+        __out PULONG Minor,
+        __out_ecount_opt(ServicePackStringSize) PSTR ServicePackString,
+        __in ULONG ServicePackStringSize,
+        __out_opt PULONG ServicePackStringUsed,
+        __out PULONG ServicePackNumber,
+        __out_ecount_opt(BuildStringSize) PSTR BuildString,
+        __in ULONG BuildStringSize,
+        __out_opt PULONG BuildStringUsed
+        ) PURE;
+    // Returns the page size for the currently executing
+    // processor context.  The page size may vary between
+    // processor types.
+    STDMETHOD(GetPageSize)(
+        THIS_
+        __out PULONG Size
+        ) PURE;
+    // Returns S_OK if the current processor context uses
+    // 64-bit addresses, otherwise S_FALSE.
+    STDMETHOD(IsPointer64Bit)(
+        THIS
+        ) PURE;
+    // Reads the bugcheck data area and returns the
+    // current contents.  This method only works
+    // in kernel debugging sessions.
+    STDMETHOD(ReadBugCheckData)(
+        THIS_
+        __out PULONG Code,
+        __out PULONG64 Arg1,
+        __out PULONG64 Arg2,
+        __out PULONG64 Arg3,
+        __out PULONG64 Arg4
+        ) PURE;
+
+    // Query all the processor types supported by
+    // the engine.  This is a complete list and is
+    // not related to the machine running the engine
+    // or the debuggee.
+    STDMETHOD(GetNumberSupportedProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetSupportedProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Returns a full, descriptive name and an
+    // abbreviated name for a processor type.
+    STDMETHOD(GetProcessorTypeNames)(
+        THIS_
+        __in ULONG Type,
+        __out_ecount_opt(FullNameBufferSize) PSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    // Gets and sets the type of processor to
+    // use when doing things like setting
+    // breakpoints, accessing registers,
+    // getting stack traces and so on.
+    STDMETHOD(GetEffectiveProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    STDMETHOD(SetEffectiveProcessorType)(
+        THIS_
+        __in ULONG Type
+        ) PURE;
+
+    // Returns information about whether and how
+    // the debuggee is running.  Status will
+    // be GO if the debuggee is running and
+    // BREAK if it isnt.
+    // If no debuggee exists the status is
+    // NO_DEBUGGEE.
+    // This method is reentrant.
+    STDMETHOD(GetExecutionStatus)(
+        THIS_
+        __out PULONG Status
+        ) PURE;
+    // Changes the execution status of the
+    // engine from stopped to running.
+    // Status must be one of the go or step
+    // status values.
+    STDMETHOD(SetExecutionStatus)(
+        THIS_
+        __in ULONG Status
+        ) PURE;
+
+    // Controls what code interpretation level the debugger
+    // runs at.  The debugger checks the code level when
+    // deciding whether to step by a source line or
+    // assembly instruction along with other related operations.
+    STDMETHOD(GetCodeLevel)(
+        THIS_
+        __out PULONG Level
+        ) PURE;
+    STDMETHOD(SetCodeLevel)(
+        THIS_
+        __in ULONG Level
+        ) PURE;
+
+    // Gets and sets engine control flags.
+    // These methods are reentrant.
+    STDMETHOD(GetEngineOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Gets and sets control values for
+    // handling system error events.
+    // If the system error level is less
+    // than or equal to the given levels
+    // the error may be displayed and
+    // the default break for the event
+    // may be set.
+    STDMETHOD(GetSystemErrorControl)(
+        THIS_
+        __out PULONG OutputLevel,
+        __out PULONG BreakLevel
+        ) PURE;
+    STDMETHOD(SetSystemErrorControl)(
+        THIS_
+        __in ULONG OutputLevel,
+        __in ULONG BreakLevel
+        ) PURE;
+
+    // The command processor supports simple
+    // string replacement macros in Evaluate and
+    // Execute.  There are currently ten macro
+    // slots available.  Slots 0-9 map to
+    // the command invocations $u0-$u9.
+    STDMETHOD(GetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MacroSize
+        ) PURE;
+    STDMETHOD(SetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __in PCSTR Macro
+        ) PURE;
+
+    // Controls the default number radix used
+    // in expressions and commands.
+    STDMETHOD(GetRadix)(
+        THIS_
+        __out PULONG Radix
+        ) PURE;
+    STDMETHOD(SetRadix)(
+        THIS_
+        __in ULONG Radix
+        ) PURE;
+
+    // Evaluates the given expression string and
+    // returns the resulting value.
+    // If DesiredType is DEBUG_VALUE_INVALID then
+    // the natural type is used.
+    // RemainderIndex, if provided, is set to the index
+    // of the first character in the input string that was
+    // not used when evaluating the expression.
+    STDMETHOD(Evaluate)(
+        THIS_
+        __in PCSTR Expression,
+        __in ULONG DesiredType,
+        __out PDEBUG_VALUE Value,
+        __out_opt PULONG RemainderIndex
+        ) PURE;
+    // Attempts to convert the input value to a value
+    // of the requested type in the output value.
+    // Conversions can fail if no conversion exists.
+    // Successful conversions may be lossy.
+    STDMETHOD(CoerceValue)(
+        THIS_
+        __in PDEBUG_VALUE In,
+        __in ULONG OutType,
+        __out PDEBUG_VALUE Out
+        ) PURE;
+    STDMETHOD(CoerceValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_VALUE In,
+        __in_ecount(Count) PULONG OutTypes,
+        __out_ecount(Count) PDEBUG_VALUE Out
+        ) PURE;
+
+    // Executes the given command string.
+    // If the string has multiple commands
+    // Execute will not return until all
+    // of them have been executed.  If this
+    // requires waiting for the debuggee to
+    // execute an internal wait will be done
+    // so Execute can take an arbitrary amount
+    // of time.
+    STDMETHOD(Execute)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Command,
+        __in ULONG Flags
+        ) PURE;
+    // Executes the given command file by
+    // reading a line at a time and processing
+    // it with Execute.
+    STDMETHOD(ExecuteCommandFile)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR CommandFile,
+        __in ULONG Flags
+        ) PURE;
+
+    // Breakpoint interfaces are described
+    // elsewhere in this section.
+    STDMETHOD(GetNumberBreakpoints)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // It is possible for this retrieval function to
+    // fail even with an index within the number of
+    // existing breakpoints if the breakpoint is
+    // a private breakpoint.
+    STDMETHOD(GetBreakpointByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    STDMETHOD(GetBreakpointById)(
+        THIS_
+        __in ULONG Id,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // If Ids is non-NULL the Count breakpoints
+    // referred to in the Ids array are returned,
+    // otherwise breakpoints from index Start to
+    // Start + Count  1 are returned.
+    STDMETHOD(GetBreakpointParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Ids,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_BREAKPOINT_PARAMETERS Params
+        ) PURE;
+    // Breakpoints are created empty and disabled.
+    // When their parameters have been set they
+    // should be enabled by setting the ENABLE flag.
+    // If DesiredId is DEBUG_ANY_ID then the
+    // engine picks an unused ID.  If DesiredId
+    // is any other number the engine attempts
+    // to use the given ID for the breakpoint.
+    // If another breakpoint exists with that ID
+    // the call will fail.
+    STDMETHOD(AddBreakpoint)(
+        THIS_
+        __in ULONG Type,
+        __in ULONG DesiredId,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // Breakpoint interface is invalid after this call.
+    STDMETHOD(RemoveBreakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT Bp
+        ) PURE;
+
+    // Control and use extension DLLs.
+    STDMETHOD(AddExtension)(
+        THIS_
+        __in PCSTR Path,
+        __in ULONG Flags,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(RemoveExtension)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetExtensionByPath)(
+        THIS_
+        __in PCSTR Path,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Handle is zero the extension
+    // chain is walked searching for the
+    // function.
+    STDMETHOD(CallExtension)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR Function,
+        __in_opt PCSTR Arguments
+        ) PURE;
+    // GetExtensionFunction works like
+    // GetProcAddress on extension DLLs
+    // to allow raw function-call-level
+    // interaction with extension DLLs.
+    // Such functions do not need to
+    // follow the standard extension prototype
+    // if they are not going to be called
+    // through the text extension interface.
+    // This function cannot be called remotely.
+    STDMETHOD(GetExtensionFunction)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR FuncName,
+        __out FARPROC* Function
+        ) PURE;
+    // These methods return alternate
+    // extension interfaces in order to allow
+    // interface-style extension DLLs to mix in
+    // older extension calls.
+    // Structure sizes must be initialized before
+    // the call.
+    // These methods cannot be called remotely.
+    STDMETHOD(GetWindbgExtensionApis32)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS32 Api
+        ) PURE;
+    STDMETHOD(GetWindbgExtensionApis64)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS64 Api
+        ) PURE;
+
+    // The engine provides a simple mechanism
+    // to filter common events.  Arbitrarily complicated
+    // filtering can be done by registering event callbacks
+    // but simple event filtering only requires
+    // setting the options of one of the predefined
+    // event filters.
+    // Simple event filters are either for specific
+    // events and therefore have an enumerant or
+    // they are for an exception and are based on
+    // the exceptions code.  Exception filters
+    // are further divided into exceptions specially
+    // handled by the engine, which is a fixed set,
+    // and arbitrary exceptions.
+    // All three groups of filters are indexed together
+    // with the specific filters first, then the specific
+    // exception filters and finally the arbitrary
+    // exception filters.
+    // The first specific exception is the default
+    // exception.  If an exception event occurs for
+    // an exception without settings the default
+    // exception settings are used.
+    STDMETHOD(GetNumberEventFilters)(
+        THIS_
+        __out PULONG SpecificEvents,
+        __out PULONG SpecificExceptions,
+        __out PULONG ArbitraryExceptions
+        ) PURE;
+    // Some filters have descriptive text associated with them.
+    STDMETHOD(GetEventFilterText)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // All filters support executing a command when the
+    // event occurs.
+    STDMETHOD(GetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+    STDMETHOD(GetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    STDMETHOD(SetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    // Some specific filters have arguments to further
+    // qualify their operation.
+    STDMETHOD(GetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ArgumentSize
+        ) PURE;
+    STDMETHOD(SetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Argument
+        ) PURE;
+    // If Codes is non-NULL Start is ignored.
+    STDMETHOD(GetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Codes,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // The codes in the parameter data control the application
+    // of the parameter data.  If a code is not already in
+    // the set of filters it is added.  If the ExecutionOption
+    // for a code is REMOVE then the filter is removed.
+    // Specific exception filters cannot be removed.
+    STDMETHOD(SetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // Exception filters support an additional command for
+    // second-chance events.
+    STDMETHOD(GetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+
+    // Yields processing to the engine until
+    // an event occurs.  This method may
+    // only be called by the thread that started
+    // the debug session.
+    // When an event occurs the engine carries
+    // out all event processing such as calling
+    // callbacks.
+    // If the callbacks indicate that execution should
+    // break the wait will return, otherwise it
+    // goes back to waiting for a new event.
+    // If the timeout expires, S_FALSE is returned.
+    // The timeout is not currently supported for
+    // kernel debugging.
+    STDMETHOD(WaitForEvent)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG Timeout
+        ) PURE;
+
+    // Retrieves information about the last event that occurred.
+    // EventType is one of the event callback mask bits.
+    // ExtraInformation contains additional event-specific
+    // information.  Not all events have additional information.
+    STDMETHOD(GetLastEventInformation)(
+        THIS_
+        __out PULONG Type,
+        __out PULONG ProcessId,
+        __out PULONG ThreadId,
+        __out_bcount_opt(ExtraInformationSize) PVOID ExtraInformation,
+        __in ULONG ExtraInformationSize,
+        __out_opt PULONG ExtraInformationUsed,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG DescriptionUsed
+        ) PURE;
+
+    // IDebugControl2.
+
+    STDMETHOD(GetCurrentTimeDate)(
+        THIS_
+        __out PULONG TimeDate
+        ) PURE;
+    // Retrieves the number of seconds since the
+    // machine started running.
+    STDMETHOD(GetCurrentSystemUpTime)(
+        THIS_
+        __out PULONG UpTime
+        ) PURE;
+
+    // If the current session is a dump session,
+    // retrieves any extended format information.
+    STDMETHOD(GetDumpFormatFlags)(
+        THIS_
+        __out PULONG FormatFlags
+        ) PURE;
+
+    // The debugger has been enhanced to allow
+    // arbitrary text replacements in addition
+    // to the simple $u0-$u9 text macros.
+    // Text replacement takes a given source
+    // text in commands and converts it to the
+    // given destination text.  Replacements
+    // are named by their source text so that
+    // only one replacement for a source text
+    // string can exist.
+    STDMETHOD(GetNumberTextReplacements)(
+        THIS_
+        __out PULONG NumRepl
+        ) PURE;
+    // If SrcText is non-NULL the replacement
+    // is looked up by source text, otherwise
+    // Index is used to get the Nth replacement.
+    STDMETHOD(GetTextReplacement)(
+        THIS_
+        __in_opt PCSTR SrcText,
+        __in ULONG Index,
+        __out_ecount_opt(SrcBufferSize) PSTR SrcBuffer,
+        __in ULONG SrcBufferSize,
+        __out_opt PULONG SrcSize,
+        __out_ecount_opt(DstBufferSize) PSTR DstBuffer,
+        __in ULONG DstBufferSize,
+        __out_opt PULONG DstSize
+        ) PURE;
+    // Setting the destination text to
+    // NULL removes the alias.
+    STDMETHOD(SetTextReplacement)(
+        THIS_
+        __in PCSTR SrcText,
+        __in_opt PCSTR DstText
+        ) PURE;
+    STDMETHOD(RemoveTextReplacements)(
+        THIS
+        ) PURE;
+    // Outputs the complete list of current
+    // replacements.
+    STDMETHOD(OutputTextReplacements)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+};
+
+//
+// Assembly/disassembly options.
+//
+// The specific effects of these flags varies depending
+// on the particular instruction set.
+//
+
+#define DEBUG_ASMOPT_DEFAULT             0x00000000
+// Display additional information in disassembly.
+#define DEBUG_ASMOPT_VERBOSE             0x00000001
+// Do not display raw code bytes in disassembly.
+#define DEBUG_ASMOPT_NO_CODE_BYTES       0x00000002
+// Do not take the output width into account when
+// formatting disassembly.
+#define DEBUG_ASMOPT_IGNORE_OUTPUT_WIDTH 0x00000004
+// Display source file line number before each line if available.
+#define DEBUG_ASMOPT_SOURCE_LINE_NUMBER  0x00000008
+
+//
+// Expression syntax options.
+//
+
+// MASM-style expression evaluation.
+#define DEBUG_EXPR_MASM      0x00000000
+// C++-style expression evaluation.
+#define DEBUG_EXPR_CPLUSPLUS 0x00000001
+
+//
+// Event index description information.
+//
+
+#define DEBUG_EINDEX_NAME 0x00000000
+
+//
+// SetNextEventIndex relation options.
+//
+
+// Value increases forward from the first index.
+#define DEBUG_EINDEX_FROM_START   0x00000000
+// Value increases backwards from the last index.
+#define DEBUG_EINDEX_FROM_END     0x00000001
+// Value is a signed delta from the current index.
+#define DEBUG_EINDEX_FROM_CURRENT 0x00000002
+
+#undef INTERFACE
+#define INTERFACE IDebugControl3
+DECLARE_INTERFACE_(IDebugControl3, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugControl.
+
+    // Checks for a user interrupt, such a Ctrl-C
+    // or stop button.
+    // This method is reentrant.
+    STDMETHOD(GetInterrupt)(
+        THIS
+        ) PURE;
+    // Registers a user interrupt.
+    // This method is reentrant.
+    STDMETHOD(SetInterrupt)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Interrupting a user-mode process requires
+    // access to some system resources that the
+    // process may hold itself, preventing the
+    // interrupt from occurring.  The engine
+    // will time-out pending interrupt requests
+    // and simulate an interrupt if necessary.
+    // These methods control the interrupt timeout.
+    STDMETHOD(GetInterruptTimeout)(
+        THIS_
+        __out PULONG Seconds
+        ) PURE;
+    STDMETHOD(SetInterruptTimeout)(
+        THIS_
+        __in ULONG Seconds
+        ) PURE;
+
+    STDMETHOD(GetLogFile)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PBOOL Append
+        ) PURE;
+    // Opens a log file which collects all
+    // output.  Output from every client except
+    // those that explicitly disable logging
+    // goes into the log.
+    // Opening a log file closes any log file
+    // already open.
+    STDMETHOD(OpenLogFile)(
+        THIS_
+        __in PCSTR File,
+        __in BOOL Append
+        ) PURE;
+    STDMETHOD(CloseLogFile)(
+        THIS
+        ) PURE;
+    // Controls what output is logged.
+    STDMETHOD(GetLogMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetLogMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+
+    // Input requests input from all clients.
+    // The first input that is returned is used
+    // to satisfy the call.  Other returned
+    // input is discarded.
+    STDMETHOD(Input)(
+        THIS_
+        __out_ecount(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InputSize
+        ) PURE;
+    // This method is used by clients to return
+    // input when it is available.  It will
+    // return S_OK if the input is used to
+    // satisfy an Input call and S_FALSE if
+    // the input is ignored.
+    // This method is reentrant.
+    STDMETHOD(ReturnInput)(
+        THIS_
+        __in PCSTR Buffer
+        ) PURE;
+
+    // Sends output through clients
+    // output callbacks if the mask is allowed
+    // by the current output control mask and
+    // according to the output distribution
+    // settings.
+    STDMETHODV(Output)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputVaList)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // The following methods allow direct control
+    // over the distribution of the given output
+    // for situations where something other than
+    // the default is desired.  These methods require
+    // extra work in the engine so they should
+    // only be used when necessary.
+    STDMETHODV(ControlledOutput)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(ControlledOutputVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+
+    // Displays the standard command-line prompt
+    // followed by the given output.  If Format
+    // is NULL no additional output is produced.
+    // Output is produced under the
+    // DEBUG_OUTPUT_PROMPT mask.
+    // This method only outputs the prompt; it
+    // does not get input.
+    STDMETHODV(OutputPrompt)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputPromptVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // Gets the text that would be displayed by OutputPrompt.
+    STDMETHOD(GetPromptText)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // Outputs information about the current
+    // debuggee state such as a register
+    // summary, disassembly at the current PC,
+    // closest symbol and others.
+    // Uses the line prefix.
+    STDMETHOD(OutputCurrentState)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // Outputs the debugger and extension version
+    // information.  This method is reentrant.
+    // Uses the line prefix.
+    STDMETHOD(OutputVersionInformation)(
+        THIS_
+        __in ULONG OutputControl
+        ) PURE;
+
+    // In user-mode debugging sessions the
+    // engine will set an event when
+    // exceptions are continued.  This can
+    // be used to synchronize other processes
+    // with the debuggers handling of events.
+    // For example, this is used to support
+    // the e argument to ntsd.
+    STDMETHOD(GetNotifyEventHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(SetNotifyEventHandle)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Assemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in PCSTR Instr,
+        __out PULONG64 EndOffset
+        ) PURE;
+    STDMETHOD(Disassemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DisassemblySize,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Returns the value of the effective address
+    // computed for the last Disassemble, if there
+    // was one.
+    STDMETHOD(GetDisassembleEffectiveOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Uses the line prefix if necessary.
+    STDMETHOD(OutputDisassembly)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Produces multiple lines of disassembly output.
+    // There will be PreviousLines of disassembly before
+    // the given offset if a valid disassembly exists.
+    // In all, there will be TotalLines of output produced.
+    // The first and last line offsets are returned
+    // specially and all lines offsets can be retrieved
+    // through LineOffsets.  LineOffsets will contain
+    // offsets for each line where disassembly started.
+    // When disassembly of a single instruction takes
+    // multiple lines the initial offset will be followed
+    // by DEBUG_INVALID_OFFSET.
+    // Uses the line prefix.
+    STDMETHOD(OutputDisassemblyLines)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG PreviousLines,
+        __in ULONG TotalLines,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_opt PULONG OffsetLine,
+        __out_opt PULONG64 StartOffset,
+        __out_opt PULONG64 EndOffset,
+        __out_ecount_opt(TotalLines) PULONG64 LineOffsets
+        ) PURE;
+    // Returns the offset of the start of
+    // the instruction thats the given
+    // delta away from the instruction
+    // at the initial offset.
+    // This routine does not check for
+    // validity of the instruction or
+    // the memory containing it.
+    STDMETHOD(GetNearInstruction)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out PULONG64 NearOffset
+        ) PURE;
+
+    // Offsets can be passed in as zero to use the current
+    // thread state.
+    STDMETHOD(GetStackTrace)(
+        THIS_
+        __in ULONG64 FrameOffset,
+        __in ULONG64 StackOffset,
+        __in ULONG64 InstructionOffset,
+        __out_ecount(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __out_opt PULONG FramesFilled
+        ) PURE;
+    // Does a simple stack trace to determine
+    // what the current return address is.
+    STDMETHOD(GetReturnOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // If Frames is NULL OutputStackTrace will
+    // use GetStackTrace to get FramesSize frames
+    // and then output them.  The current register
+    // values for frame, stack and instruction offsets
+    // are used.
+    // Uses the line prefix.
+    STDMETHOD(OutputStackTrace)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_ecount_opt(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __in ULONG Flags
+        ) PURE;
+
+    // Returns information about the debuggee such
+    // as user vs. kernel, dump vs. live, etc.
+    STDMETHOD(GetDebuggeeType)(
+        THIS_
+        __out PULONG Class,
+        __out PULONG Qualifier
+        ) PURE;
+    // Returns the type of physical processors in
+    // the machine.
+    // Returns one of the IMAGE_FILE_MACHINE values.
+    STDMETHOD(GetActualProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Returns the type of processor used in the
+    // current processor context.
+    STDMETHOD(GetExecutingProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Query all the possible processor types that
+    // may be encountered during this debug session.
+    STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetPossibleExecutingProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Get the number of actual processors in
+    // the machine.
+    STDMETHOD(GetNumberProcessors)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // PlatformId is one of the VER_PLATFORM values.
+    // Major and minor are as given in the NT
+    // kernel debugger protocol.
+    // ServicePackString and ServicePackNumber indicate the
+    // system service pack level.  ServicePackNumber is not
+    // available in some sessions where the service pack level
+    // is only expressed as a string.  The service pack information
+    // will be empty if the system does not have a service pack
+    // applied.
+    // The build string is string information identifying the
+    // particular build of the system.  The build string is
+    // empty if the system has no particular identifying
+    // information.
+    STDMETHOD(GetSystemVersion)(
+        THIS_
+        __out PULONG PlatformId,
+        __out PULONG Major,
+        __out PULONG Minor,
+        __out_ecount_opt(ServicePackStringSize) PSTR ServicePackString,
+        __in ULONG ServicePackStringSize,
+        __out_opt PULONG ServicePackStringUsed,
+        __out PULONG ServicePackNumber,
+        __out_ecount_opt(BuildStringSize) PSTR BuildString,
+        __in ULONG BuildStringSize,
+        __out_opt PULONG BuildStringUsed
+        ) PURE;
+    // Returns the page size for the currently executing
+    // processor context.  The page size may vary between
+    // processor types.
+    STDMETHOD(GetPageSize)(
+        THIS_
+        __out PULONG Size
+        ) PURE;
+    // Returns S_OK if the current processor context uses
+    // 64-bit addresses, otherwise S_FALSE.
+    STDMETHOD(IsPointer64Bit)(
+        THIS
+        ) PURE;
+    // Reads the bugcheck data area and returns the
+    // current contents.  This method only works
+    // in kernel debugging sessions.
+    STDMETHOD(ReadBugCheckData)(
+        THIS_
+        __out PULONG Code,
+        __out PULONG64 Arg1,
+        __out PULONG64 Arg2,
+        __out PULONG64 Arg3,
+        __out PULONG64 Arg4
+        ) PURE;
+
+    // Query all the processor types supported by
+    // the engine.  This is a complete list and is
+    // not related to the machine running the engine
+    // or the debuggee.
+    STDMETHOD(GetNumberSupportedProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetSupportedProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Returns a full, descriptive name and an
+    // abbreviated name for a processor type.
+    STDMETHOD(GetProcessorTypeNames)(
+        THIS_
+        __in ULONG Type,
+        __out_ecount_opt(FullNameBufferSize) PSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    // Gets and sets the type of processor to
+    // use when doing things like setting
+    // breakpoints, accessing registers,
+    // getting stack traces and so on.
+    STDMETHOD(GetEffectiveProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    STDMETHOD(SetEffectiveProcessorType)(
+        THIS_
+        __in ULONG Type
+        ) PURE;
+
+    // Returns information about whether and how
+    // the debuggee is running.  Status will
+    // be GO if the debuggee is running and
+    // BREAK if it isnt.
+    // If no debuggee exists the status is
+    // NO_DEBUGGEE.
+    // This method is reentrant.
+    STDMETHOD(GetExecutionStatus)(
+        THIS_
+        __out PULONG Status
+        ) PURE;
+    // Changes the execution status of the
+    // engine from stopped to running.
+    // Status must be one of the go or step
+    // status values.
+    STDMETHOD(SetExecutionStatus)(
+        THIS_
+        __in ULONG Status
+        ) PURE;
+
+    // Controls what code interpretation level the debugger
+    // runs at.  The debugger checks the code level when
+    // deciding whether to step by a source line or
+    // assembly instruction along with other related operations.
+    STDMETHOD(GetCodeLevel)(
+        THIS_
+        __out PULONG Level
+        ) PURE;
+    STDMETHOD(SetCodeLevel)(
+        THIS_
+        __in ULONG Level
+        ) PURE;
+
+    // Gets and sets engine control flags.
+    // These methods are reentrant.
+    STDMETHOD(GetEngineOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Gets and sets control values for
+    // handling system error events.
+    // If the system error level is less
+    // than or equal to the given levels
+    // the error may be displayed and
+    // the default break for the event
+    // may be set.
+    STDMETHOD(GetSystemErrorControl)(
+        THIS_
+        __out PULONG OutputLevel,
+        __out PULONG BreakLevel
+        ) PURE;
+    STDMETHOD(SetSystemErrorControl)(
+        THIS_
+        __in ULONG OutputLevel,
+        __in ULONG BreakLevel
+        ) PURE;
+
+    // The command processor supports simple
+    // string replacement macros in Evaluate and
+    // Execute.  There are currently ten macro
+    // slots available.  Slots 0-9 map to
+    // the command invocations $u0-$u9.
+    STDMETHOD(GetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MacroSize
+        ) PURE;
+    STDMETHOD(SetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __in PCSTR Macro
+        ) PURE;
+
+    // Controls the default number radix used
+    // in expressions and commands.
+    STDMETHOD(GetRadix)(
+        THIS_
+        __out PULONG Radix
+        ) PURE;
+    STDMETHOD(SetRadix)(
+        THIS_
+        __in ULONG Radix
+        ) PURE;
+
+    // Evaluates the given expression string and
+    // returns the resulting value.
+    // If DesiredType is DEBUG_VALUE_INVALID then
+    // the natural type is used.
+    // RemainderIndex, if provided, is set to the index
+    // of the first character in the input string that was
+    // not used when evaluating the expression.
+    STDMETHOD(Evaluate)(
+        THIS_
+        __in PCSTR Expression,
+        __in ULONG DesiredType,
+        __out PDEBUG_VALUE Value,
+        __out_opt PULONG RemainderIndex
+        ) PURE;
+    // Attempts to convert the input value to a value
+    // of the requested type in the output value.
+    // Conversions can fail if no conversion exists.
+    // Successful conversions may be lossy.
+    STDMETHOD(CoerceValue)(
+        THIS_
+        __in PDEBUG_VALUE In,
+        __in ULONG OutType,
+        __out PDEBUG_VALUE Out
+        ) PURE;
+    STDMETHOD(CoerceValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_VALUE In,
+        __in_ecount(Count) PULONG OutTypes,
+        __out_ecount(Count) PDEBUG_VALUE Out
+        ) PURE;
+
+    // Executes the given command string.
+    // If the string has multiple commands
+    // Execute will not return until all
+    // of them have been executed.  If this
+    // requires waiting for the debuggee to
+    // execute an internal wait will be done
+    // so Execute can take an arbitrary amount
+    // of time.
+    STDMETHOD(Execute)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Command,
+        __in ULONG Flags
+        ) PURE;
+    // Executes the given command file by
+    // reading a line at a time and processing
+    // it with Execute.
+    STDMETHOD(ExecuteCommandFile)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR CommandFile,
+        __in ULONG Flags
+        ) PURE;
+
+    // Breakpoint interfaces are described
+    // elsewhere in this section.
+    STDMETHOD(GetNumberBreakpoints)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // It is possible for this retrieval function to
+    // fail even with an index within the number of
+    // existing breakpoints if the breakpoint is
+    // a private breakpoint.
+    STDMETHOD(GetBreakpointByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    STDMETHOD(GetBreakpointById)(
+        THIS_
+        __in ULONG Id,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // If Ids is non-NULL the Count breakpoints
+    // referred to in the Ids array are returned,
+    // otherwise breakpoints from index Start to
+    // Start + Count  1 are returned.
+    STDMETHOD(GetBreakpointParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Ids,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_BREAKPOINT_PARAMETERS Params
+        ) PURE;
+    // Breakpoints are created empty and disabled.
+    // When their parameters have been set they
+    // should be enabled by setting the ENABLE flag.
+    // If DesiredId is DEBUG_ANY_ID then the
+    // engine picks an unused ID.  If DesiredId
+    // is any other number the engine attempts
+    // to use the given ID for the breakpoint.
+    // If another breakpoint exists with that ID
+    // the call will fail.
+    STDMETHOD(AddBreakpoint)(
+        THIS_
+        __in ULONG Type,
+        __in ULONG DesiredId,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // Breakpoint interface is invalid after this call.
+    STDMETHOD(RemoveBreakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT Bp
+        ) PURE;
+
+    // Control and use extension DLLs.
+    STDMETHOD(AddExtension)(
+        THIS_
+        __in PCSTR Path,
+        __in ULONG Flags,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(RemoveExtension)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetExtensionByPath)(
+        THIS_
+        __in PCSTR Path,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Handle is zero the extension
+    // chain is walked searching for the
+    // function.
+    STDMETHOD(CallExtension)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR Function,
+        __in_opt PCSTR Arguments
+        ) PURE;
+    // GetExtensionFunction works like
+    // GetProcAddress on extension DLLs
+    // to allow raw function-call-level
+    // interaction with extension DLLs.
+    // Such functions do not need to
+    // follow the standard extension prototype
+    // if they are not going to be called
+    // through the text extension interface.
+    // This function cannot be called remotely.
+    STDMETHOD(GetExtensionFunction)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR FuncName,
+        __out FARPROC* Function
+        ) PURE;
+    // These methods return alternate
+    // extension interfaces in order to allow
+    // interface-style extension DLLs to mix in
+    // older extension calls.
+    // Structure sizes must be initialized before
+    // the call.
+    // These methods cannot be called remotely.
+    STDMETHOD(GetWindbgExtensionApis32)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS32 Api
+        ) PURE;
+    STDMETHOD(GetWindbgExtensionApis64)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS64 Api
+        ) PURE;
+
+    // The engine provides a simple mechanism
+    // to filter common events.  Arbitrarily complicated
+    // filtering can be done by registering event callbacks
+    // but simple event filtering only requires
+    // setting the options of one of the predefined
+    // event filters.
+    // Simple event filters are either for specific
+    // events and therefore have an enumerant or
+    // they are for an exception and are based on
+    // the exceptions code.  Exception filters
+    // are further divided into exceptions specially
+    // handled by the engine, which is a fixed set,
+    // and arbitrary exceptions.
+    // All three groups of filters are indexed together
+    // with the specific filters first, then the specific
+    // exception filters and finally the arbitrary
+    // exception filters.
+    // The first specific exception is the default
+    // exception.  If an exception event occurs for
+    // an exception without settings the default
+    // exception settings are used.
+    STDMETHOD(GetNumberEventFilters)(
+        THIS_
+        __out PULONG SpecificEvents,
+        __out PULONG SpecificExceptions,
+        __out PULONG ArbitraryExceptions
+        ) PURE;
+    // Some filters have descriptive text associated with them.
+    STDMETHOD(GetEventFilterText)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // All filters support executing a command when the
+    // event occurs.
+    STDMETHOD(GetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+    STDMETHOD(GetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    STDMETHOD(SetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    // Some specific filters have arguments to further
+    // qualify their operation.
+    STDMETHOD(GetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ArgumentSize
+        ) PURE;
+    STDMETHOD(SetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Argument
+        ) PURE;
+    // If Codes is non-NULL Start is ignored.
+    STDMETHOD(GetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Codes,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // The codes in the parameter data control the application
+    // of the parameter data.  If a code is not already in
+    // the set of filters it is added.  If the ExecutionOption
+    // for a code is REMOVE then the filter is removed.
+    // Specific exception filters cannot be removed.
+    STDMETHOD(SetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // Exception filters support an additional command for
+    // second-chance events.
+    STDMETHOD(GetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+
+    // Yields processing to the engine until
+    // an event occurs.  This method may
+    // only be called by the thread that started
+    // the debug session.
+    // When an event occurs the engine carries
+    // out all event processing such as calling
+    // callbacks.
+    // If the callbacks indicate that execution should
+    // break the wait will return, otherwise it
+    // goes back to waiting for a new event.
+    // If the timeout expires, S_FALSE is returned.
+    // The timeout is not currently supported for
+    // kernel debugging.
+    STDMETHOD(WaitForEvent)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG Timeout
+        ) PURE;
+
+    // Retrieves information about the last event that occurred.
+    // EventType is one of the event callback mask bits.
+    // ExtraInformation contains additional event-specific
+    // information.  Not all events have additional information.
+    STDMETHOD(GetLastEventInformation)(
+        THIS_
+        __out PULONG Type,
+        __out PULONG ProcessId,
+        __out PULONG ThreadId,
+        __out_bcount_opt(ExtraInformationSize) PVOID ExtraInformation,
+        __in ULONG ExtraInformationSize,
+        __out_opt PULONG ExtraInformationUsed,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG DescriptionUsed
+        ) PURE;
+
+    // IDebugControl2.
+
+    STDMETHOD(GetCurrentTimeDate)(
+        THIS_
+        __out PULONG TimeDate
+        ) PURE;
+    // Retrieves the number of seconds since the
+    // machine started running.
+    STDMETHOD(GetCurrentSystemUpTime)(
+        THIS_
+        __out PULONG UpTime
+        ) PURE;
+
+    // If the current session is a dump session,
+    // retrieves any extended format information.
+    STDMETHOD(GetDumpFormatFlags)(
+        THIS_
+        __out PULONG FormatFlags
+        ) PURE;
+
+    // The debugger has been enhanced to allow
+    // arbitrary text replacements in addition
+    // to the simple $u0-$u9 text macros.
+    // Text replacement takes a given source
+    // text in commands and converts it to the
+    // given destination text.  Replacements
+    // are named by their source text so that
+    // only one replacement for a source text
+    // string can exist.
+    STDMETHOD(GetNumberTextReplacements)(
+        THIS_
+        __out PULONG NumRepl
+        ) PURE;
+    // If SrcText is non-NULL the replacement
+    // is looked up by source text, otherwise
+    // Index is used to get the Nth replacement.
+    STDMETHOD(GetTextReplacement)(
+        THIS_
+        __in_opt PCSTR SrcText,
+        __in ULONG Index,
+        __out_ecount_opt(SrcBufferSize) PSTR SrcBuffer,
+        __in ULONG SrcBufferSize,
+        __out_opt PULONG SrcSize,
+        __out_ecount_opt(DstBufferSize) PSTR DstBuffer,
+        __in ULONG DstBufferSize,
+        __out_opt PULONG DstSize
+        ) PURE;
+    // Setting the destination text to
+    // NULL removes the alias.
+    STDMETHOD(SetTextReplacement)(
+        THIS_
+        __in PCSTR SrcText,
+        __in_opt PCSTR DstText
+        ) PURE;
+    STDMETHOD(RemoveTextReplacements)(
+        THIS
+        ) PURE;
+    // Outputs the complete list of current
+    // replacements.
+    STDMETHOD(OutputTextReplacements)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // IDebugControl3.
+
+    // Control options for assembly and disassembly.
+    STDMETHOD(GetAssemblyOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddAssemblyOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveAssemblyOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetAssemblyOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Control the expression syntax.
+    STDMETHOD(GetExpressionSyntax)(
+        THIS_
+        __out PULONG Flags
+        ) PURE;
+    STDMETHOD(SetExpressionSyntax)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Look up a syntax by its abbreviated
+    // name and set it.
+    STDMETHOD(SetExpressionSyntaxByName)(
+        THIS_
+        __in PCSTR AbbrevName
+        ) PURE;
+    STDMETHOD(GetNumberExpressionSyntaxes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetExpressionSyntaxNames)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(FullNameBufferSize) PSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    //
+    // Some debug sessions have only a single
+    // possible event, such as a snapshot dump
+    // file; some have dynamic events, such as
+    // a live debug session; and others may have
+    // multiple events, such as a dump file that
+    // contains snapshots from different points
+    // in time.  The following methods allow
+    // discovery and selection of the available
+    // events for a session.
+    // Sessions with one or more static events
+    // will be able to report all of the events
+    // when queried.  Sessions with dynamic events
+    // will only report a single event representing
+    // the current event.
+    // Switching events constitutes execution and
+    // changing the current event will alter the
+    // execution status to a running state, after
+    // which WaitForEvent must be used to process
+    // the selected event.
+    //
+
+    // GetNumberEvents returns S_OK if this is the
+    // complete set of events possible, such as for
+    // a static session; or S_FALSE if other events
+    // may be possible, such as for a dynamic session.
+    STDMETHOD(GetNumberEvents)(
+        THIS_
+        __out PULONG Events
+        ) PURE;
+    // Sessions may have descriptive information for
+    // the various events available.  The amount of
+    // information varies according to the specific
+    // session and data.
+    STDMETHOD(GetEventIndexDescription)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG Which,
+        __in_opt PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DescSize
+        ) PURE;
+    STDMETHOD(GetCurrentEventIndex)(
+        THIS_
+        __out PULONG Index
+        ) PURE;
+    // SetNextEventIndex works like seek in that
+    // it can set an absolute or relative index.
+    // SetNextEventIndex works similarly to SetExecutionStatus
+    // by putting the session into a running state, after
+    // which the caller must call WaitForEvent.  The
+    // current event index only changes when WaitForEvent
+    // is called.
+    STDMETHOD(SetNextEventIndex)(
+        THIS_
+        __in ULONG Relation,
+        __in ULONG Value,
+        __out PULONG NextIndex
+        ) PURE;
+};
+
+//
+// Log file flags.
+//
+
+#define DEBUG_LOG_DEFAULT 0x00000000
+#define DEBUG_LOG_APPEND  0x00000001
+#define DEBUG_LOG_UNICODE 0x00000002
+
+//
+// System version strings.
+//
+
+#define DEBUG_SYSVERSTR_SERVICE_PACK 0x00000000
+#define DEBUG_SYSVERSTR_BUILD        0x00000001
+
+//
+// GetManagedStatus flags and strings.
+//
+
+#define DEBUG_MANAGED_DISABLED   0x00000000
+#define DEBUG_MANAGED_ALLOWED    0x00000001
+#define DEBUG_MANAGED_DLL_LOADED 0x00000002
+
+#define DEBUG_MANSTR_NONE               0x00000000
+#define DEBUG_MANSTR_LOADED_SUPPORT_DLL 0x00000001
+#define DEBUG_MANSTR_LOAD_STATUS        0x00000002
+
+//
+// ResetManagedStatus flags.
+//
+
+// Reset state to default engine startup state with
+// no support loaded.
+#define DEBUG_MANRESET_DEFAULT  0x00000000
+// Force managed support DLL load attempt.
+#define DEBUG_MANRESET_LOAD_DLL 0x00000001
+
+#undef INTERFACE
+#define INTERFACE IDebugControl4
+DECLARE_INTERFACE_(IDebugControl4, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugControl.
+
+    // Checks for a user interrupt, such a Ctrl-C
+    // or stop button.
+    // This method is reentrant.
+    STDMETHOD(GetInterrupt)(
+        THIS
+        ) PURE;
+    // Registers a user interrupt.
+    // This method is reentrant.
+    STDMETHOD(SetInterrupt)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Interrupting a user-mode process requires
+    // access to some system resources that the
+    // process may hold itself, preventing the
+    // interrupt from occurring.  The engine
+    // will time-out pending interrupt requests
+    // and simulate an interrupt if necessary.
+    // These methods control the interrupt timeout.
+    STDMETHOD(GetInterruptTimeout)(
+        THIS_
+        __out PULONG Seconds
+        ) PURE;
+    STDMETHOD(SetInterruptTimeout)(
+        THIS_
+        __in ULONG Seconds
+        ) PURE;
+
+    STDMETHOD(GetLogFile)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PBOOL Append
+        ) PURE;
+    // Opens a log file which collects all
+    // output.  Output from every client except
+    // those that explicitly disable logging
+    // goes into the log.
+    // Opening a log file closes any log file
+    // already open.
+    STDMETHOD(OpenLogFile)(
+        THIS_
+        __in PCSTR File,
+        __in BOOL Append
+        ) PURE;
+    STDMETHOD(CloseLogFile)(
+        THIS
+        ) PURE;
+    // Controls what output is logged.
+    STDMETHOD(GetLogMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+    STDMETHOD(SetLogMask)(
+        THIS_
+        __in ULONG Mask
+        ) PURE;
+
+    // Input requests input from all clients.
+    // The first input that is returned is used
+    // to satisfy the call.  Other returned
+    // input is discarded.
+    STDMETHOD(Input)(
+        THIS_
+        __out_ecount(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InputSize
+        ) PURE;
+    // This method is used by clients to return
+    // input when it is available.  It will
+    // return S_OK if the input is used to
+    // satisfy an Input call and S_FALSE if
+    // the input is ignored.
+    // This method is reentrant.
+    STDMETHOD(ReturnInput)(
+        THIS_
+        __in PCSTR Buffer
+        ) PURE;
+
+    // Sends output through clients
+    // output callbacks if the mask is allowed
+    // by the current output control mask and
+    // according to the output distribution
+    // settings.
+    STDMETHODV(Output)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputVaList)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // The following methods allow direct control
+    // over the distribution of the given output
+    // for situations where something other than
+    // the default is desired.  These methods require
+    // extra work in the engine so they should
+    // only be used when necessary.
+    STDMETHODV(ControlledOutput)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(ControlledOutputVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCSTR Format,
+        __in va_list Args
+        ) PURE;
+
+    // Displays the standard command-line prompt
+    // followed by the given output.  If Format
+    // is NULL no additional output is produced.
+    // Output is produced under the
+    // DEBUG_OUTPUT_PROMPT mask.
+    // This method only outputs the prompt; it
+    // does not get input.
+    STDMETHODV(OutputPrompt)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputPromptVaList)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCSTR Format,
+        __in va_list Args
+        ) PURE;
+    // Gets the text that would be displayed by OutputPrompt.
+    STDMETHOD(GetPromptText)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // Outputs information about the current
+    // debuggee state such as a register
+    // summary, disassembly at the current PC,
+    // closest symbol and others.
+    // Uses the line prefix.
+    STDMETHOD(OutputCurrentState)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // Outputs the debugger and extension version
+    // information.  This method is reentrant.
+    // Uses the line prefix.
+    STDMETHOD(OutputVersionInformation)(
+        THIS_
+        __in ULONG OutputControl
+        ) PURE;
+
+    // In user-mode debugging sessions the
+    // engine will set an event when
+    // exceptions are continued.  This can
+    // be used to synchronize other processes
+    // with the debuggers handling of events.
+    // For example, this is used to support
+    // the e argument to ntsd.
+    STDMETHOD(GetNotifyEventHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(SetNotifyEventHandle)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Assemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in PCSTR Instr,
+        __out PULONG64 EndOffset
+        ) PURE;
+    STDMETHOD(Disassemble)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DisassemblySize,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Returns the value of the effective address
+    // computed for the last Disassemble, if there
+    // was one.
+    STDMETHOD(GetDisassembleEffectiveOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Uses the line prefix if necessary.
+    STDMETHOD(OutputDisassembly)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out PULONG64 EndOffset
+        ) PURE;
+    // Produces multiple lines of disassembly output.
+    // There will be PreviousLines of disassembly before
+    // the given offset if a valid disassembly exists.
+    // In all, there will be TotalLines of output produced.
+    // The first and last line offsets are returned
+    // specially and all lines offsets can be retrieved
+    // through LineOffsets.  LineOffsets will contain
+    // offsets for each line where disassembly started.
+    // When disassembly of a single instruction takes
+    // multiple lines the initial offset will be followed
+    // by DEBUG_INVALID_OFFSET.
+    // Uses the line prefix.
+    STDMETHOD(OutputDisassemblyLines)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG PreviousLines,
+        __in ULONG TotalLines,
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_opt PULONG OffsetLine,
+        __out_opt PULONG64 StartOffset,
+        __out_opt PULONG64 EndOffset,
+        __out_ecount_opt(TotalLines) PULONG64 LineOffsets
+        ) PURE;
+    // Returns the offset of the start of
+    // the instruction thats the given
+    // delta away from the instruction
+    // at the initial offset.
+    // This routine does not check for
+    // validity of the instruction or
+    // the memory containing it.
+    STDMETHOD(GetNearInstruction)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out PULONG64 NearOffset
+        ) PURE;
+
+    // Offsets can be passed in as zero to use the current
+    // thread state.
+    STDMETHOD(GetStackTrace)(
+        THIS_
+        __in ULONG64 FrameOffset,
+        __in ULONG64 StackOffset,
+        __in ULONG64 InstructionOffset,
+        __out_ecount(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __out_opt PULONG FramesFilled
+        ) PURE;
+    // Does a simple stack trace to determine
+    // what the current return address is.
+    STDMETHOD(GetReturnOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // If Frames is NULL OutputStackTrace will
+    // use GetStackTrace to get FramesSize frames
+    // and then output them.  The current register
+    // values for frame, stack and instruction offsets
+    // are used.
+    // Uses the line prefix.
+    STDMETHOD(OutputStackTrace)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_ecount_opt(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __in ULONG Flags
+        ) PURE;
+
+    // Returns information about the debuggee such
+    // as user vs. kernel, dump vs. live, etc.
+    STDMETHOD(GetDebuggeeType)(
+        THIS_
+        __out PULONG Class,
+        __out PULONG Qualifier
+        ) PURE;
+    // Returns the type of physical processors in
+    // the machine.
+    // Returns one of the IMAGE_FILE_MACHINE values.
+    STDMETHOD(GetActualProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Returns the type of processor used in the
+    // current processor context.
+    STDMETHOD(GetExecutingProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    // Query all the possible processor types that
+    // may be encountered during this debug session.
+    STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetPossibleExecutingProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Get the number of actual processors in
+    // the machine.
+    STDMETHOD(GetNumberProcessors)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // PlatformId is one of the VER_PLATFORM values.
+    // Major and minor are as given in the NT
+    // kernel debugger protocol.
+    // ServicePackString and ServicePackNumber indicate the
+    // system service pack level.  ServicePackNumber is not
+    // available in some sessions where the service pack level
+    // is only expressed as a string.  The service pack information
+    // will be empty if the system does not have a service pack
+    // applied.
+    // The build string is string information identifying the
+    // particular build of the system.  The build string is
+    // empty if the system has no particular identifying
+    // information.
+    STDMETHOD(GetSystemVersion)(
+        THIS_
+        __out PULONG PlatformId,
+        __out PULONG Major,
+        __out PULONG Minor,
+        __out_ecount_opt(ServicePackStringSize) PSTR ServicePackString,
+        __in ULONG ServicePackStringSize,
+        __out_opt PULONG ServicePackStringUsed,
+        __out PULONG ServicePackNumber,
+        __out_ecount_opt(BuildStringSize) PSTR BuildString,
+        __in ULONG BuildStringSize,
+        __out_opt PULONG BuildStringUsed
+        ) PURE;
+    // Returns the page size for the currently executing
+    // processor context.  The page size may vary between
+    // processor types.
+    STDMETHOD(GetPageSize)(
+        THIS_
+        __out PULONG Size
+        ) PURE;
+    // Returns S_OK if the current processor context uses
+    // 64-bit addresses, otherwise S_FALSE.
+    STDMETHOD(IsPointer64Bit)(
+        THIS
+        ) PURE;
+    // Reads the bugcheck data area and returns the
+    // current contents.  This method only works
+    // in kernel debugging sessions.
+    STDMETHOD(ReadBugCheckData)(
+        THIS_
+        __out PULONG Code,
+        __out PULONG64 Arg1,
+        __out PULONG64 Arg2,
+        __out PULONG64 Arg3,
+        __out PULONG64 Arg4
+        ) PURE;
+
+    // Query all the processor types supported by
+    // the engine.  This is a complete list and is
+    // not related to the machine running the engine
+    // or the debuggee.
+    STDMETHOD(GetNumberSupportedProcessorTypes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetSupportedProcessorTypes)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Types
+        ) PURE;
+    // Returns a full, descriptive name and an
+    // abbreviated name for a processor type.
+    STDMETHOD(GetProcessorTypeNames)(
+        THIS_
+        __in ULONG Type,
+        __out_ecount_opt(FullNameBufferSize) PSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    // Gets and sets the type of processor to
+    // use when doing things like setting
+    // breakpoints, accessing registers,
+    // getting stack traces and so on.
+    STDMETHOD(GetEffectiveProcessorType)(
+        THIS_
+        __out PULONG Type
+        ) PURE;
+    STDMETHOD(SetEffectiveProcessorType)(
+        THIS_
+        __in ULONG Type
+        ) PURE;
+
+    // Returns information about whether and how
+    // the debuggee is running.  Status will
+    // be GO if the debuggee is running and
+    // BREAK if it isnt.
+    // If no debuggee exists the status is
+    // NO_DEBUGGEE.
+    // This method is reentrant.
+    STDMETHOD(GetExecutionStatus)(
+        THIS_
+        __out PULONG Status
+        ) PURE;
+    // Changes the execution status of the
+    // engine from stopped to running.
+    // Status must be one of the go or step
+    // status values.
+    STDMETHOD(SetExecutionStatus)(
+        THIS_
+        __in ULONG Status
+        ) PURE;
+
+    // Controls what code interpretation level the debugger
+    // runs at.  The debugger checks the code level when
+    // deciding whether to step by a source line or
+    // assembly instruction along with other related operations.
+    STDMETHOD(GetCodeLevel)(
+        THIS_
+        __out PULONG Level
+        ) PURE;
+    STDMETHOD(SetCodeLevel)(
+        THIS_
+        __in ULONG Level
+        ) PURE;
+
+    // Gets and sets engine control flags.
+    // These methods are reentrant.
+    STDMETHOD(GetEngineOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetEngineOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Gets and sets control values for
+    // handling system error events.
+    // If the system error level is less
+    // than or equal to the given levels
+    // the error may be displayed and
+    // the default break for the event
+    // may be set.
+    STDMETHOD(GetSystemErrorControl)(
+        THIS_
+        __out PULONG OutputLevel,
+        __out PULONG BreakLevel
+        ) PURE;
+    STDMETHOD(SetSystemErrorControl)(
+        THIS_
+        __in ULONG OutputLevel,
+        __in ULONG BreakLevel
+        ) PURE;
+
+    // The command processor supports simple
+    // string replacement macros in Evaluate and
+    // Execute.  There are currently ten macro
+    // slots available.  Slots 0-9 map to
+    // the command invocations $u0-$u9.
+    STDMETHOD(GetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MacroSize
+        ) PURE;
+    STDMETHOD(SetTextMacro)(
+        THIS_
+        __in ULONG Slot,
+        __in PCSTR Macro
+        ) PURE;
+
+    // Controls the default number radix used
+    // in expressions and commands.
+    STDMETHOD(GetRadix)(
+        THIS_
+        __out PULONG Radix
+        ) PURE;
+    STDMETHOD(SetRadix)(
+        THIS_
+        __in ULONG Radix
+        ) PURE;
+
+    // Evaluates the given expression string and
+    // returns the resulting value.
+    // If DesiredType is DEBUG_VALUE_INVALID then
+    // the natural type is used.
+    // RemainderIndex, if provided, is set to the index
+    // of the first character in the input string that was
+    // not used when evaluating the expression.
+    STDMETHOD(Evaluate)(
+        THIS_
+        __in PCSTR Expression,
+        __in ULONG DesiredType,
+        __out PDEBUG_VALUE Value,
+        __out_opt PULONG RemainderIndex
+        ) PURE;
+    // Attempts to convert the input value to a value
+    // of the requested type in the output value.
+    // Conversions can fail if no conversion exists.
+    // Successful conversions may be lossy.
+    STDMETHOD(CoerceValue)(
+        THIS_
+        __in PDEBUG_VALUE In,
+        __in ULONG OutType,
+        __out PDEBUG_VALUE Out
+        ) PURE;
+    STDMETHOD(CoerceValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_VALUE In,
+        __in_ecount(Count) PULONG OutTypes,
+        __out_ecount(Count) PDEBUG_VALUE Out
+        ) PURE;
+
+    // Executes the given command string.
+    // If the string has multiple commands
+    // Execute will not return until all
+    // of them have been executed.  If this
+    // requires waiting for the debuggee to
+    // execute an internal wait will be done
+    // so Execute can take an arbitrary amount
+    // of time.
+    STDMETHOD(Execute)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR Command,
+        __in ULONG Flags
+        ) PURE;
+    // Executes the given command file by
+    // reading a line at a time and processing
+    // it with Execute.
+    STDMETHOD(ExecuteCommandFile)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCSTR CommandFile,
+        __in ULONG Flags
+        ) PURE;
+
+    // Breakpoint interfaces are described
+    // elsewhere in this section.
+    STDMETHOD(GetNumberBreakpoints)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // It is possible for this retrieval function to
+    // fail even with an index within the number of
+    // existing breakpoints if the breakpoint is
+    // a private breakpoint.
+    STDMETHOD(GetBreakpointByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    STDMETHOD(GetBreakpointById)(
+        THIS_
+        __in ULONG Id,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // If Ids is non-NULL the Count breakpoints
+    // referred to in the Ids array are returned,
+    // otherwise breakpoints from index Start to
+    // Start + Count  1 are returned.
+    STDMETHOD(GetBreakpointParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Ids,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_BREAKPOINT_PARAMETERS Params
+        ) PURE;
+    // Breakpoints are created empty and disabled.
+    // When their parameters have been set they
+    // should be enabled by setting the ENABLE flag.
+    // If DesiredId is DEBUG_ANY_ID then the
+    // engine picks an unused ID.  If DesiredId
+    // is any other number the engine attempts
+    // to use the given ID for the breakpoint.
+    // If another breakpoint exists with that ID
+    // the call will fail.
+    STDMETHOD(AddBreakpoint)(
+        THIS_
+        __in ULONG Type,
+        __in ULONG DesiredId,
+        __out PDEBUG_BREAKPOINT* Bp
+        ) PURE;
+    // Breakpoint interface is invalid after this call.
+    STDMETHOD(RemoveBreakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT Bp
+        ) PURE;
+
+    // Control and use extension DLLs.
+    STDMETHOD(AddExtension)(
+        THIS_
+        __in PCSTR Path,
+        __in ULONG Flags,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(RemoveExtension)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetExtensionByPath)(
+        THIS_
+        __in PCSTR Path,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Handle is zero the extension
+    // chain is walked searching for the
+    // function.
+    STDMETHOD(CallExtension)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR Function,
+        __in_opt PCSTR Arguments
+        ) PURE;
+    // GetExtensionFunction works like
+    // GetProcAddress on extension DLLs
+    // to allow raw function-call-level
+    // interaction with extension DLLs.
+    // Such functions do not need to
+    // follow the standard extension prototype
+    // if they are not going to be called
+    // through the text extension interface.
+    // This function cannot be called remotely.
+    STDMETHOD(GetExtensionFunction)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCSTR FuncName,
+        __out FARPROC* Function
+        ) PURE;
+    // These methods return alternate
+    // extension interfaces in order to allow
+    // interface-style extension DLLs to mix in
+    // older extension calls.
+    // Structure sizes must be initialized before
+    // the call.
+    // These methods cannot be called remotely.
+    STDMETHOD(GetWindbgExtensionApis32)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS32 Api
+        ) PURE;
+    STDMETHOD(GetWindbgExtensionApis64)(
+        THIS_
+        __inout PWINDBG_EXTENSION_APIS64 Api
+        ) PURE;
+
+    // The engine provides a simple mechanism
+    // to filter common events.  Arbitrarily complicated
+    // filtering can be done by registering event callbacks
+    // but simple event filtering only requires
+    // setting the options of one of the predefined
+    // event filters.
+    // Simple event filters are either for specific
+    // events and therefore have an enumerant or
+    // they are for an exception and are based on
+    // the exceptions code.  Exception filters
+    // are further divided into exceptions specially
+    // handled by the engine, which is a fixed set,
+    // and arbitrary exceptions.
+    // All three groups of filters are indexed together
+    // with the specific filters first, then the specific
+    // exception filters and finally the arbitrary
+    // exception filters.
+    // The first specific exception is the default
+    // exception.  If an exception event occurs for
+    // an exception without settings the default
+    // exception settings are used.
+    STDMETHOD(GetNumberEventFilters)(
+        THIS_
+        __out PULONG SpecificEvents,
+        __out PULONG SpecificExceptions,
+        __out PULONG ArbitraryExceptions
+        ) PURE;
+    // Some filters have descriptive text associated with them.
+    STDMETHOD(GetEventFilterText)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    // All filters support executing a command when the
+    // event occurs.
+    STDMETHOD(GetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetEventFilterCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+    STDMETHOD(GetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    STDMETHOD(SetSpecificFilterParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_SPECIFIC_FILTER_PARAMETERS Params
+        ) PURE;
+    // Some specific filters have arguments to further
+    // qualify their operation.
+    STDMETHOD(GetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ArgumentSize
+        ) PURE;
+    STDMETHOD(SetSpecificFilterArgument)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Argument
+        ) PURE;
+    // If Codes is non-NULL Start is ignored.
+    STDMETHOD(GetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Codes,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // The codes in the parameter data control the application
+    // of the parameter data.  If a code is not already in
+    // the set of filters it is added.  If the ExecutionOption
+    // for a code is REMOVE then the filter is removed.
+    // Specific exception filters cannot be removed.
+    STDMETHOD(SetExceptionFilterParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount(Count) PDEBUG_EXCEPTION_FILTER_PARAMETERS Params
+        ) PURE;
+    // Exception filters support an additional command for
+    // second-chance events.
+    STDMETHOD(GetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetExceptionFilterSecondCommand)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Command
+        ) PURE;
+
+    // Yields processing to the engine until
+    // an event occurs.  This method may
+    // only be called by the thread that started
+    // the debug session.
+    // When an event occurs the engine carries
+    // out all event processing such as calling
+    // callbacks.
+    // If the callbacks indicate that execution should
+    // break the wait will return, otherwise it
+    // goes back to waiting for a new event.
+    // If the timeout expires, S_FALSE is returned.
+    // The timeout is not currently supported for
+    // kernel debugging.
+    STDMETHOD(WaitForEvent)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG Timeout
+        ) PURE;
+
+    // Retrieves information about the last event that occurred.
+    // EventType is one of the event callback mask bits.
+    // ExtraInformation contains additional event-specific
+    // information.  Not all events have additional information.
+    STDMETHOD(GetLastEventInformation)(
+        THIS_
+        __out PULONG Type,
+        __out PULONG ProcessId,
+        __out PULONG ThreadId,
+        __out_bcount_opt(ExtraInformationSize) PVOID ExtraInformation,
+        __in ULONG ExtraInformationSize,
+        __out_opt PULONG ExtraInformationUsed,
+        __out_ecount_opt(DescriptionSize) PSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG DescriptionUsed
+        ) PURE;
+
+    // IDebugControl2.
+
+    STDMETHOD(GetCurrentTimeDate)(
+        THIS_
+        __out PULONG TimeDate
+        ) PURE;
+    // Retrieves the number of seconds since the
+    // machine started running.
+    STDMETHOD(GetCurrentSystemUpTime)(
+        THIS_
+        __out PULONG UpTime
+        ) PURE;
+
+    // If the current session is a dump session,
+    // retrieves any extended format information.
+    STDMETHOD(GetDumpFormatFlags)(
+        THIS_
+        __out PULONG FormatFlags
+        ) PURE;
+
+    // The debugger has been enhanced to allow
+    // arbitrary text replacements in addition
+    // to the simple $u0-$u9 text macros.
+    // Text replacement takes a given source
+    // text in commands and converts it to the
+    // given destination text.  Replacements
+    // are named by their source text so that
+    // only one replacement for a source text
+    // string can exist.
+    STDMETHOD(GetNumberTextReplacements)(
+        THIS_
+        __out PULONG NumRepl
+        ) PURE;
+    // If SrcText is non-NULL the replacement
+    // is looked up by source text, otherwise
+    // Index is used to get the Nth replacement.
+    STDMETHOD(GetTextReplacement)(
+        THIS_
+        __in_opt PCSTR SrcText,
+        __in ULONG Index,
+        __out_ecount_opt(SrcBufferSize) PSTR SrcBuffer,
+        __in ULONG SrcBufferSize,
+        __out_opt PULONG SrcSize,
+        __out_ecount_opt(DstBufferSize) PSTR DstBuffer,
+        __in ULONG DstBufferSize,
+        __out_opt PULONG DstSize
+        ) PURE;
+    // Setting the destination text to
+    // NULL removes the alias.
+    STDMETHOD(SetTextReplacement)(
+        THIS_
+        __in PCSTR SrcText,
+        __in_opt PCSTR DstText
+        ) PURE;
+    STDMETHOD(RemoveTextReplacements)(
+        THIS
+        ) PURE;
+    // Outputs the complete list of current
+    // replacements.
+    STDMETHOD(OutputTextReplacements)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // IDebugControl3.
+
+    // Control options for assembly and disassembly.
+    STDMETHOD(GetAssemblyOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddAssemblyOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveAssemblyOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetAssemblyOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // Control the expression syntax.
+    STDMETHOD(GetExpressionSyntax)(
+        THIS_
+        __out PULONG Flags
+        ) PURE;
+    STDMETHOD(SetExpressionSyntax)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+    // Look up a syntax by its abbreviated
+    // name and set it.
+    STDMETHOD(SetExpressionSyntaxByName)(
+        THIS_
+        __in PCSTR AbbrevName
+        ) PURE;
+    STDMETHOD(GetNumberExpressionSyntaxes)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetExpressionSyntaxNames)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(FullNameBufferSize) PSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    //
+    // Some debug sessions have only a single
+    // possible event, such as a snapshot dump
+    // file; some have dynamic events, such as
+    // a live debug session; and others may have
+    // multiple events, such as a dump file that
+    // contains snapshots from different points
+    // in time.  The following methods allow
+    // discovery and selection of the available
+    // events for a session.
+    // Sessions with one or more static events
+    // will be able to report all of the events
+    // when queried.  Sessions with dynamic events
+    // will only report a single event representing
+    // the current event.
+    // Switching events constitutes execution and
+    // changing the current event will alter the
+    // execution status to a running state, after
+    // which WaitForEvent must be used to process
+    // the selected event.
+    //
+
+    // GetNumberEvents returns S_OK if this is the
+    // complete set of events possible, such as for
+    // a static session; or S_FALSE if other events
+    // may be possible, such as for a dynamic session.
+    STDMETHOD(GetNumberEvents)(
+        THIS_
+        __out PULONG Events
+        ) PURE;
+    // Sessions may have descriptive information for
+    // the various events available.  The amount of
+    // information varies according to the specific
+    // session and data.
+    STDMETHOD(GetEventIndexDescription)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG Which,
+        __in_opt PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DescSize
+        ) PURE;
+    STDMETHOD(GetCurrentEventIndex)(
+        THIS_
+        __out PULONG Index
+        ) PURE;
+    // SetNextEventIndex works like seek in that
+    // it can set an absolute or relative index.
+    // SetNextEventIndex works similarly to SetExecutionStatus
+    // by putting the session into a running state, after
+    // which the caller must call WaitForEvent.  The
+    // current event index only changes when WaitForEvent
+    // is called.
+    STDMETHOD(SetNextEventIndex)(
+        THIS_
+        __in ULONG Relation,
+        __in ULONG Value,
+        __out PULONG NextIndex
+        ) PURE;
+
+    // IDebugControl4.
+
+    STDMETHOD(GetLogFileWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PBOOL Append
+        ) PURE;
+    STDMETHOD(OpenLogFileWide)(
+        THIS_
+        __in PCWSTR File,
+        __in BOOL Append
+        ) PURE;
+
+    STDMETHOD(InputWide)(
+        THIS_
+        __out PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InputSize
+        ) PURE;
+    STDMETHOD(ReturnInputWide)(
+        THIS_
+        __in PCWSTR Buffer
+        ) PURE;
+
+    STDMETHODV(OutputWide)(
+        THIS_
+        __in ULONG Mask,
+        __in PCWSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputVaListWide)(
+        THIS_
+        __in ULONG Mask,
+        __in PCWSTR Format,
+        __in va_list Args
+        ) PURE;
+    STDMETHODV(ControlledOutputWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCWSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(ControlledOutputVaListWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Mask,
+        __in PCWSTR Format,
+        __in va_list Args
+        ) PURE;
+
+    STDMETHODV(OutputPromptWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCWSTR Format,
+        ...
+        ) PURE;
+    STDMETHOD(OutputPromptVaListWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_opt PCWSTR Format,
+        __in va_list Args
+        ) PURE;
+    STDMETHOD(GetPromptTextWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+
+    STDMETHOD(AssembleWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __in PCWSTR Instr,
+        __out PULONG64 EndOffset
+        ) PURE;
+    STDMETHOD(DisassembleWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DisassemblySize,
+        __out PULONG64 EndOffset
+        ) PURE;
+
+    STDMETHOD(GetProcessorTypeNamesWide)(
+        THIS_
+        __in ULONG Type,
+        __out_ecount_opt(FullNameBufferSize) PWSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PWSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    STDMETHOD(GetTextMacroWide)(
+        THIS_
+        __in ULONG Slot,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MacroSize
+        ) PURE;
+    STDMETHOD(SetTextMacroWide)(
+        THIS_
+        __in ULONG Slot,
+        __in PCWSTR Macro
+        ) PURE;
+
+    STDMETHOD(EvaluateWide)(
+        THIS_
+        __in PCWSTR Expression,
+        __in ULONG DesiredType,
+        __out PDEBUG_VALUE Value,
+        __out_opt PULONG RemainderIndex
+        ) PURE;
+
+    STDMETHOD(ExecuteWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCWSTR Command,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(ExecuteCommandFileWide)(
+        THIS_
+        __in ULONG OutputControl,
+        __in PCWSTR CommandFile,
+        __in ULONG Flags
+        ) PURE;
+
+    STDMETHOD(GetBreakpointByIndex2)(
+        THIS_
+        __in ULONG Index,
+        __out PDEBUG_BREAKPOINT2* Bp
+        ) PURE;
+    STDMETHOD(GetBreakpointById2)(
+        THIS_
+        __in ULONG Id,
+        __out PDEBUG_BREAKPOINT2* Bp
+        ) PURE;
+    STDMETHOD(AddBreakpoint2)(
+        THIS_
+        __in ULONG Type,
+        __in ULONG DesiredId,
+        __out PDEBUG_BREAKPOINT2* Bp
+        ) PURE;
+    STDMETHOD(RemoveBreakpoint2)(
+        THIS_
+        __in PDEBUG_BREAKPOINT2 Bp
+        ) PURE;
+
+    STDMETHOD(AddExtensionWide)(
+        THIS_
+        __in PCWSTR Path,
+        __in ULONG Flags,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetExtensionByPathWide)(
+        THIS_
+        __in PCWSTR Path,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(CallExtensionWide)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCWSTR Function,
+        __in_opt PCWSTR Arguments
+        ) PURE;
+    STDMETHOD(GetExtensionFunctionWide)(
+        THIS_
+        __in ULONG64 Handle,
+        __in PCWSTR FuncName,
+        __out FARPROC* Function
+        ) PURE;
+
+    STDMETHOD(GetEventFilterTextWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TextSize
+        ) PURE;
+    STDMETHOD(GetEventFilterCommandWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetEventFilterCommandWide)(
+        THIS_
+        __in ULONG Index,
+        __in PCWSTR Command
+        ) PURE;
+    STDMETHOD(GetSpecificFilterArgumentWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ArgumentSize
+        ) PURE;
+    STDMETHOD(SetSpecificFilterArgumentWide)(
+        THIS_
+        __in ULONG Index,
+        __in PCWSTR Argument
+        ) PURE;
+    STDMETHOD(GetExceptionFilterSecondCommandWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG CommandSize
+        ) PURE;
+    STDMETHOD(SetExceptionFilterSecondCommandWide)(
+        THIS_
+        __in ULONG Index,
+        __in PCWSTR Command
+        ) PURE;
+
+    STDMETHOD(GetLastEventInformationWide)(
+        THIS_
+        __out PULONG Type,
+        __out PULONG ProcessId,
+        __out PULONG ThreadId,
+        __out_bcount_opt(ExtraInformationSize) PVOID ExtraInformation,
+        __in ULONG ExtraInformationSize,
+        __out_opt PULONG ExtraInformationUsed,
+        __out_ecount_opt(DescriptionSize) PWSTR Description,
+        __in ULONG DescriptionSize,
+        __out_opt PULONG DescriptionUsed
+        ) PURE;
+
+    STDMETHOD(GetTextReplacementWide)(
+        THIS_
+        __in_opt PCWSTR SrcText,
+        __in ULONG Index,
+        __out_ecount_opt(SrcBufferSize) PWSTR SrcBuffer,
+        __in ULONG SrcBufferSize,
+        __out_opt PULONG SrcSize,
+        __out_ecount_opt(DstBufferSize) PWSTR DstBuffer,
+        __in ULONG DstBufferSize,
+        __out_opt PULONG DstSize
+        ) PURE;
+    STDMETHOD(SetTextReplacementWide)(
+        THIS_
+        __in PCWSTR SrcText,
+        __in_opt PCWSTR DstText
+        ) PURE;
+
+    STDMETHOD(SetExpressionSyntaxByNameWide)(
+        THIS_
+        __in PCWSTR AbbrevName
+        ) PURE;
+    STDMETHOD(GetExpressionSyntaxNamesWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(FullNameBufferSize) PWSTR FullNameBuffer,
+        __in ULONG FullNameBufferSize,
+        __out_opt PULONG FullNameSize,
+        __out_ecount_opt(AbbrevNameBufferSize) PWSTR AbbrevNameBuffer,
+        __in ULONG AbbrevNameBufferSize,
+        __out_opt PULONG AbbrevNameSize
+        ) PURE;
+
+    STDMETHOD(GetEventIndexDescriptionWide)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG Which,
+        __in_opt PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DescSize
+        ) PURE;
+
+    STDMETHOD(GetLogFile2)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PULONG Flags
+        ) PURE;
+    STDMETHOD(OpenLogFile2)(
+        THIS_
+        __in PCSTR File,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(GetLogFile2Wide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FileSize,
+        __out PULONG Flags
+        ) PURE;
+    STDMETHOD(OpenLogFile2Wide)(
+        THIS_
+        __in PCWSTR File,
+        __in ULONG Flags
+        ) PURE;
+
+    // GetSystemVersion always returns the kd
+    // major/minor version numbers, which are
+    // different than the Win32 version numbers.
+    // GetSystemVersionValues can be used
+    // to determine the Win32 version values.
+    STDMETHOD(GetSystemVersionValues)(
+        THIS_
+        __out PULONG PlatformId,
+        __out PULONG Win32Major,
+        __out PULONG Win32Minor,
+        __out_opt PULONG KdMajor,
+        __out_opt PULONG KdMinor
+        ) PURE;
+    // Strings are selected with DEBUG_SYSVERSTR_*.
+    STDMETHOD(GetSystemVersionString)(
+        THIS_
+        __in ULONG Which,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    STDMETHOD(GetSystemVersionStringWide)(
+        THIS_
+        __in ULONG Which,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+
+    // Stack tracing with a full initial context
+    // and full context return for each frame.
+    // The FrameContextsSize parameter is the total
+    // byte size of FrameContexts.  FrameContextsEntrySize
+    // gives the byte size of each entry in
+    // FrameContexts.
+    STDMETHOD(GetContextStackTrace)(
+        THIS_
+        __in_bcount_opt(StartContextSize) PVOID StartContext,
+        __in ULONG StartContextSize,
+        __out_ecount_opt(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __out_bcount_opt(FrameContextsSize) PVOID FrameContexts,
+        __in ULONG FrameContextsSize,
+        __in ULONG FrameContextsEntrySize,
+        __out_opt PULONG FramesFilled
+        ) PURE;
+    STDMETHOD(OutputContextStackTrace)(
+        THIS_
+        __in ULONG OutputControl,
+        __in_ecount(FramesSize) PDEBUG_STACK_FRAME Frames,
+        __in ULONG FramesSize,
+        __in_bcount(FrameContextsSize) PVOID FrameContexts,
+        __in ULONG FrameContextsSize,
+        __in ULONG FrameContextsEntrySize,
+        __in ULONG Flags
+        ) PURE;
+
+    // Some targets, such as user-mode minidump files,
+    // have separate "event of interest" information
+    // stored within them.  This method allows
+    // access to that information.
+    STDMETHOD(GetStoredEventInformation)(
+        THIS_
+        __out PULONG Type,
+        __out PULONG ProcessId,
+        __out PULONG ThreadId,
+        __out_bcount_opt(ContextSize) PVOID Context,
+        __in ULONG ContextSize,
+        __out_opt PULONG ContextUsed,
+        __out_bcount_opt(ExtraInformationSize) PVOID ExtraInformation,
+        __in ULONG ExtraInformationSize,
+        __out_opt PULONG ExtraInformationUsed
+        ) PURE;
+
+    // Managed debugging support relies on debugging
+    // functionality provided by the Common Language Runtime.
+    // This method provides feedback on the engine's
+    // use of the runtime debugging APIs.
+    STDMETHOD(GetManagedStatus)(
+        THIS_
+        __out_opt PULONG Flags,
+        __in ULONG WhichString,
+        __out_ecount_opt(StringSize) PSTR String,
+        __in ULONG StringSize,
+        __out_opt PULONG StringNeeded
+        ) PURE;
+    STDMETHOD(GetManagedStatusWide)(
+        THIS_
+        __out_opt PULONG Flags,
+        __in ULONG WhichString,
+        __out_ecount_opt(StringSize) PWSTR String,
+        __in ULONG StringSize,
+        __out_opt PULONG StringNeeded
+        ) PURE;
+    // Clears and reinitializes the engine's
+    // managed code debugging support.
+    STDMETHOD(ResetManagedStatus)(
+        THIS_
+        __in ULONG Flags
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugDataSpaces.
+//
+//----------------------------------------------------------------------------
+
+// Data space indices for callbacks and other methods.
+#define DEBUG_DATA_SPACE_VIRTUAL       0
+#define DEBUG_DATA_SPACE_PHYSICAL      1
+#define DEBUG_DATA_SPACE_CONTROL       2
+#define DEBUG_DATA_SPACE_IO            3
+#define DEBUG_DATA_SPACE_MSR           4
+#define DEBUG_DATA_SPACE_BUS_DATA      5
+#define DEBUG_DATA_SPACE_DEBUGGER_DATA 6
+// Count of data spaces.
+#define DEBUG_DATA_SPACE_COUNT         7
+
+// Indices for ReadDebuggerData interface
+#define DEBUG_DATA_KernBase                              24
+#define DEBUG_DATA_BreakpointWithStatusAddr              32
+#define DEBUG_DATA_SavedContextAddr                      40
+#define DEBUG_DATA_KiCallUserModeAddr                    56
+#define DEBUG_DATA_KeUserCallbackDispatcherAddr          64
+#define DEBUG_DATA_PsLoadedModuleListAddr                72
+#define DEBUG_DATA_PsActiveProcessHeadAddr               80
+#define DEBUG_DATA_PspCidTableAddr                       88
+#define DEBUG_DATA_ExpSystemResourcesListAddr            96
+#define DEBUG_DATA_ExpPagedPoolDescriptorAddr           104
+#define DEBUG_DATA_ExpNumberOfPagedPoolsAddr            112
+#define DEBUG_DATA_KeTimeIncrementAddr                  120
+#define DEBUG_DATA_KeBugCheckCallbackListHeadAddr       128
+#define DEBUG_DATA_KiBugcheckDataAddr                   136
+#define DEBUG_DATA_IopErrorLogListHeadAddr              144
+#define DEBUG_DATA_ObpRootDirectoryObjectAddr           152
+#define DEBUG_DATA_ObpTypeObjectTypeAddr                160
+#define DEBUG_DATA_MmSystemCacheStartAddr               168
+#define DEBUG_DATA_MmSystemCacheEndAddr                 176
+#define DEBUG_DATA_MmSystemCacheWsAddr                  184
+#define DEBUG_DATA_MmPfnDatabaseAddr                    192
+#define DEBUG_DATA_MmSystemPtesStartAddr                200
+#define DEBUG_DATA_MmSystemPtesEndAddr                  208
+#define DEBUG_DATA_MmSubsectionBaseAddr                 216
+#define DEBUG_DATA_MmNumberOfPagingFilesAddr            224
+#define DEBUG_DATA_MmLowestPhysicalPageAddr             232
+#define DEBUG_DATA_MmHighestPhysicalPageAddr            240
+#define DEBUG_DATA_MmNumberOfPhysicalPagesAddr          248
+#define DEBUG_DATA_MmMaximumNonPagedPoolInBytesAddr     256
+#define DEBUG_DATA_MmNonPagedSystemStartAddr            264
+#define DEBUG_DATA_MmNonPagedPoolStartAddr              272
+#define DEBUG_DATA_MmNonPagedPoolEndAddr                280
+#define DEBUG_DATA_MmPagedPoolStartAddr                 288
+#define DEBUG_DATA_MmPagedPoolEndAddr                   296
+#define DEBUG_DATA_MmPagedPoolInformationAddr           304
+#define DEBUG_DATA_MmPageSize                           312
+#define DEBUG_DATA_MmSizeOfPagedPoolInBytesAddr         320
+#define DEBUG_DATA_MmTotalCommitLimitAddr               328
+#define DEBUG_DATA_MmTotalCommittedPagesAddr            336
+#define DEBUG_DATA_MmSharedCommitAddr                   344
+#define DEBUG_DATA_MmDriverCommitAddr                   352
+#define DEBUG_DATA_MmProcessCommitAddr                  360
+#define DEBUG_DATA_MmPagedPoolCommitAddr                368
+#define DEBUG_DATA_MmExtendedCommitAddr                 376
+#define DEBUG_DATA_MmZeroedPageListHeadAddr             384
+#define DEBUG_DATA_MmFreePageListHeadAddr               392
+#define DEBUG_DATA_MmStandbyPageListHeadAddr            400
+#define DEBUG_DATA_MmModifiedPageListHeadAddr           408
+#define DEBUG_DATA_MmModifiedNoWritePageListHeadAddr    416
+#define DEBUG_DATA_MmAvailablePagesAddr                 424
+#define DEBUG_DATA_MmResidentAvailablePagesAddr         432
+#define DEBUG_DATA_PoolTrackTableAddr                   440
+#define DEBUG_DATA_NonPagedPoolDescriptorAddr           448
+#define DEBUG_DATA_MmHighestUserAddressAddr             456
+#define DEBUG_DATA_MmSystemRangeStartAddr               464
+#define DEBUG_DATA_MmUserProbeAddressAddr               472
+#define DEBUG_DATA_KdPrintCircularBufferAddr            480
+#define DEBUG_DATA_KdPrintCircularBufferEndAddr         488
+#define DEBUG_DATA_KdPrintWritePointerAddr              496
+#define DEBUG_DATA_KdPrintRolloverCountAddr             504
+#define DEBUG_DATA_MmLoadedUserImageListAddr            512
+#define DEBUG_DATA_NtBuildLabAddr                       520
+#define DEBUG_DATA_KiNormalSystemCall                   528
+#define DEBUG_DATA_KiProcessorBlockAddr                 536
+#define DEBUG_DATA_MmUnloadedDriversAddr                544
+#define DEBUG_DATA_MmLastUnloadedDriverAddr             552
+#define DEBUG_DATA_MmTriageActionTakenAddr              560
+#define DEBUG_DATA_MmSpecialPoolTagAddr                 568
+#define DEBUG_DATA_KernelVerifierAddr                   576
+#define DEBUG_DATA_MmVerifierDataAddr                   584
+#define DEBUG_DATA_MmAllocatedNonPagedPoolAddr          592
+#define DEBUG_DATA_MmPeakCommitmentAddr                 600
+#define DEBUG_DATA_MmTotalCommitLimitMaximumAddr        608
+#define DEBUG_DATA_CmNtCSDVersionAddr                   616
+#define DEBUG_DATA_MmPhysicalMemoryBlockAddr            624
+#define DEBUG_DATA_MmSessionBase                        632
+#define DEBUG_DATA_MmSessionSize                        640
+#define DEBUG_DATA_MmSystemParentTablePage              648
+#define DEBUG_DATA_MmVirtualTranslationBase             656
+#define DEBUG_DATA_OffsetKThreadNextProcessor           664
+#define DEBUG_DATA_OffsetKThreadTeb                     666
+#define DEBUG_DATA_OffsetKThreadKernelStack             668
+#define DEBUG_DATA_OffsetKThreadInitialStack            670
+#define DEBUG_DATA_OffsetKThreadApcProcess              672
+#define DEBUG_DATA_OffsetKThreadState                   674
+#define DEBUG_DATA_OffsetKThreadBStore                  676
+#define DEBUG_DATA_OffsetKThreadBStoreLimit             678
+#define DEBUG_DATA_SizeEProcess                         680
+#define DEBUG_DATA_OffsetEprocessPeb                    682
+#define DEBUG_DATA_OffsetEprocessParentCID              684
+#define DEBUG_DATA_OffsetEprocessDirectoryTableBase     686
+#define DEBUG_DATA_SizePrcb                             688
+#define DEBUG_DATA_OffsetPrcbDpcRoutine                 690
+#define DEBUG_DATA_OffsetPrcbCurrentThread              692
+#define DEBUG_DATA_OffsetPrcbMhz                        694
+#define DEBUG_DATA_OffsetPrcbCpuType                    696
+#define DEBUG_DATA_OffsetPrcbVendorString               698
+#define DEBUG_DATA_OffsetPrcbProcessorState             700
+#define DEBUG_DATA_OffsetPrcbNumber                     702
+#define DEBUG_DATA_SizeEThread                          704
+#define DEBUG_DATA_KdPrintCircularBufferPtrAddr         712
+#define DEBUG_DATA_KdPrintBufferSizeAddr                720
+
+#define DEBUG_DATA_PaeEnabled                        100000
+#define DEBUG_DATA_SharedUserData                    100008
+#define DEBUG_DATA_ProductType                       100016
+#define DEBUG_DATA_SuiteMask                         100024
+#define DEBUG_DATA_DumpWriterStatus                  100032
+#define DEBUG_DATA_DumpFormatVersion                 100040
+#define DEBUG_DATA_DumpWriterVersion                 100048
+#define DEBUG_DATA_DumpPowerState                    100056
+#define DEBUG_DATA_DumpMmStorage                     100064
+
+//
+// Processor information structures.
+//
+
+typedef struct _DEBUG_PROCESSOR_IDENTIFICATION_ALPHA
+{
+    ULONG Type;
+    ULONG Revision;
+} DEBUG_PROCESSOR_IDENTIFICATION_ALPHA, *PDEBUG_PROCESSOR_IDENTIFICATION_ALPHA;
+
+typedef struct _DEBUG_PROCESSOR_IDENTIFICATION_AMD64
+{
+    ULONG Family;
+    ULONG Model;
+    ULONG Stepping;
+    CHAR  VendorString[16];
+} DEBUG_PROCESSOR_IDENTIFICATION_AMD64, *PDEBUG_PROCESSOR_IDENTIFICATION_AMD64;
+
+typedef struct _DEBUG_PROCESSOR_IDENTIFICATION_IA64
+{
+    ULONG Model;
+    ULONG Revision;
+    ULONG Family;
+    ULONG ArchRev;
+    CHAR  VendorString[16];
+} DEBUG_PROCESSOR_IDENTIFICATION_IA64, *PDEBUG_PROCESSOR_IDENTIFICATION_IA64;
+
+typedef struct _DEBUG_PROCESSOR_IDENTIFICATION_X86
+{
+    ULONG Family;
+    ULONG Model;
+    ULONG Stepping;
+    CHAR  VendorString[16];
+} DEBUG_PROCESSOR_IDENTIFICATION_X86, *PDEBUG_PROCESSOR_IDENTIFICATION_X86;
+
+typedef struct _DEBUG_PROCESSOR_IDENTIFICATION_ARM
+{
+    ULONG Type;
+    ULONG Revision;
+} DEBUG_PROCESSOR_IDENTIFICATION_ARM, *PDEBUG_PROCESSOR_IDENTIFICATION_ARM;
+
+typedef union _DEBUG_PROCESSOR_IDENTIFICATION_ALL
+{
+    DEBUG_PROCESSOR_IDENTIFICATION_ALPHA Alpha;
+    DEBUG_PROCESSOR_IDENTIFICATION_AMD64 Amd64;
+    DEBUG_PROCESSOR_IDENTIFICATION_IA64  Ia64;
+    DEBUG_PROCESSOR_IDENTIFICATION_X86   X86;
+    DEBUG_PROCESSOR_IDENTIFICATION_ARM   Arm;
+} DEBUG_PROCESSOR_IDENTIFICATION_ALL, *PDEBUG_PROCESSOR_IDENTIFICATION_ALL;
+
+// Indices for ReadProcessorSystemData.
+#define DEBUG_DATA_KPCR_OFFSET                          0
+#define DEBUG_DATA_KPRCB_OFFSET                         1
+#define DEBUG_DATA_KTHREAD_OFFSET                       2
+#define DEBUG_DATA_BASE_TRANSLATION_VIRTUAL_OFFSET      3
+#define DEBUG_DATA_PROCESSOR_IDENTIFICATION             4
+#define DEBUG_DATA_PROCESSOR_SPEED                      5
+
+#undef INTERFACE
+#define INTERFACE IDebugDataSpaces
+DECLARE_INTERFACE_(IDebugDataSpaces, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugDataSpaces.
+    STDMETHOD(ReadVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // SearchVirtual searches the given virtual
+    // address range for the given pattern.  PatternSize
+    // gives the byte length of the pattern and PatternGranularity
+    // controls the granularity of comparisons during
+    // the search.
+    // For example, a DWORD-granular search would
+    // use a pattern granularity of four to search by DWORD
+    // increments.
+    STDMETHOD(SearchVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Length,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __in ULONG PatternGranularity,
+        __out PULONG64 MatchOffset
+        ) PURE;
+    // These methods are identical to Read/WriteVirtual
+    // except that they avoid the kernel virtual memory
+    // cache entirely and are therefore useful for reading
+    // virtual memory which is inherently volatile, such
+    // as memory-mapped device areas, without contaminating
+    // or invalidating the cache.
+    // In user-mode they are the same as Read/WriteVirtual.
+    STDMETHOD(ReadVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // The following two methods are convenience
+    // methods for accessing pointer values.
+    // They automatically convert between native pointers
+    // and canonical 64-bit values as necessary.
+    // These routines stop at the first failure.
+    STDMETHOD(ReadPointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __out_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    STDMETHOD(WritePointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __in_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    // All non-virtual data spaces are only
+    // available when kernel debugging.
+    STDMETHOD(ReadPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WritePhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadMsr)(
+        THIS_
+        __in ULONG Msr,
+        __out PULONG64 Value
+        ) PURE;
+    STDMETHOD(WriteMsr)(
+        THIS_
+        __in ULONG Msr,
+        __in ULONG64 Value
+        ) PURE;
+    STDMETHOD(ReadBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(CheckLowMemory)(
+        THIS
+        ) PURE;
+    STDMETHOD(ReadDebuggerData)(
+        THIS_
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+    STDMETHOD(ReadProcessorSystemData)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+};
+
+//
+// Handle data types and structures.
+//
+
+#define DEBUG_HANDLE_DATA_TYPE_BASIC            0
+#define DEBUG_HANDLE_DATA_TYPE_TYPE_NAME        1
+#define DEBUG_HANDLE_DATA_TYPE_OBJECT_NAME      2
+#define DEBUG_HANDLE_DATA_TYPE_HANDLE_COUNT     3
+#define DEBUG_HANDLE_DATA_TYPE_TYPE_NAME_WIDE   4
+#define DEBUG_HANDLE_DATA_TYPE_OBJECT_NAME_WIDE 5
+
+typedef struct _DEBUG_HANDLE_DATA_BASIC
+{
+    ULONG TypeNameSize;
+    ULONG ObjectNameSize;
+    ULONG Attributes;
+    ULONG GrantedAccess;
+    ULONG HandleCount;
+    ULONG PointerCount;
+} DEBUG_HANDLE_DATA_BASIC, *PDEBUG_HANDLE_DATA_BASIC;
+
+#undef INTERFACE
+#define INTERFACE IDebugDataSpaces2
+DECLARE_INTERFACE_(IDebugDataSpaces2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugDataSpaces.
+    STDMETHOD(ReadVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // SearchVirtual searches the given virtual
+    // address range for the given pattern.  PatternSize
+    // gives the byte length of the pattern and PatternGranularity
+    // controls the granularity of comparisons during
+    // the search.
+    // For example, a DWORD-granular search would
+    // use a pattern granularity of four to search by DWORD
+    // increments.
+    STDMETHOD(SearchVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Length,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __in ULONG PatternGranularity,
+        __out PULONG64 MatchOffset
+        ) PURE;
+    // These methods are identical to Read/WriteVirtual
+    // except that they avoid the kernel virtual memory
+    // cache entirely and are therefore useful for reading
+    // virtual memory which is inherently volatile, such
+    // as memory-mapped device areas, without contaminating
+    // or invalidating the cache.
+    // In user-mode they are the same as Read/WriteVirtual.
+    STDMETHOD(ReadVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // The following two methods are convenience
+    // methods for accessing pointer values.
+    // They automatically convert between native pointers
+    // and canonical 64-bit values as necessary.
+    // These routines stop at the first failure.
+    STDMETHOD(ReadPointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __out_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    STDMETHOD(WritePointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __in_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    // All non-virtual data spaces are only
+    // available when kernel debugging.
+    STDMETHOD(ReadPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WritePhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadMsr)(
+        THIS_
+        __in ULONG Msr,
+        __out PULONG64 Value
+        ) PURE;
+    STDMETHOD(WriteMsr)(
+        THIS_
+        __in ULONG Msr,
+        __in ULONG64 Value
+        ) PURE;
+    STDMETHOD(ReadBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(CheckLowMemory)(
+        THIS
+        ) PURE;
+    STDMETHOD(ReadDebuggerData)(
+        THIS_
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+    STDMETHOD(ReadProcessorSystemData)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+
+    // IDebugDataSpaces2.
+
+    STDMETHOD(VirtualToPhysical)(
+        THIS_
+        __in ULONG64 Virtual,
+        __out PULONG64 Physical
+        ) PURE;
+    // Returns the physical addresses for the
+    // N levels of the systems paging structures.
+    // Level zero is the starting base physical
+    // address for virtual translations.
+    // Levels one-(N-1) will point to the appropriate
+    // paging descriptor for the virtual address at
+    // the given level of the paging hierarchy.  The
+    // exact number of levels depends on many factors.
+    // The last level will be the fully translated
+    // physical address, matching what VirtualToPhysical
+    // returns.  If the address can only be partially
+    // translated S_FALSE is returned.
+    STDMETHOD(GetVirtualTranslationPhysicalOffsets)(
+        THIS_
+        __in ULONG64 Virtual,
+        __out_ecount_opt(OffsetsSize) PULONG64 Offsets,
+        __in ULONG OffsetsSize,
+        __out_opt PULONG Levels
+        ) PURE;
+
+    // System handle data is accessible in certain
+    // debug sessions.  The particular data available
+    // varies from session to session and platform
+    // to platform.
+    STDMETHOD(ReadHandleData)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG DataType,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+
+    // Fills memory with the given pattern.
+    // The fill stops at the first non-writable byte.
+    STDMETHOD(FillVirtual)(
+        THIS_
+        __in ULONG64 Start,
+        __in ULONG Size,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __out_opt PULONG Filled
+        ) PURE;
+    STDMETHOD(FillPhysical)(
+        THIS_
+        __in ULONG64 Start,
+        __in ULONG Size,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __out_opt PULONG Filled
+        ) PURE;
+
+    // Queries virtual memory mapping information given
+    // an address similarly to the Win32 API VirtualQuery.
+    // MEMORY_BASIC_INFORMATION64 is defined in crash.h.
+    // This method currently only works for user-mode sessions.
+    STDMETHOD(QueryVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PMEMORY_BASIC_INFORMATION64 Info
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugDataSpaces3
+DECLARE_INTERFACE_(IDebugDataSpaces3, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugDataSpaces.
+    STDMETHOD(ReadVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // SearchVirtual searches the given virtual
+    // address range for the given pattern.  PatternSize
+    // gives the byte length of the pattern and PatternGranularity
+    // controls the granularity of comparisons during
+    // the search.
+    // For example, a DWORD-granular search would
+    // use a pattern granularity of four to search by DWORD
+    // increments.
+    STDMETHOD(SearchVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Length,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __in ULONG PatternGranularity,
+        __out PULONG64 MatchOffset
+        ) PURE;
+    // These methods are identical to Read/WriteVirtual
+    // except that they avoid the kernel virtual memory
+    // cache entirely and are therefore useful for reading
+    // virtual memory which is inherently volatile, such
+    // as memory-mapped device areas, without contaminating
+    // or invalidating the cache.
+    // In user-mode they are the same as Read/WriteVirtual.
+    STDMETHOD(ReadVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // The following two methods are convenience
+    // methods for accessing pointer values.
+    // They automatically convert between native pointers
+    // and canonical 64-bit values as necessary.
+    // These routines stop at the first failure.
+    STDMETHOD(ReadPointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __out_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    STDMETHOD(WritePointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __in_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    // All non-virtual data spaces are only
+    // available when kernel debugging.
+    STDMETHOD(ReadPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WritePhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadMsr)(
+        THIS_
+        __in ULONG Msr,
+        __out PULONG64 Value
+        ) PURE;
+    STDMETHOD(WriteMsr)(
+        THIS_
+        __in ULONG Msr,
+        __in ULONG64 Value
+        ) PURE;
+    STDMETHOD(ReadBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(CheckLowMemory)(
+        THIS
+        ) PURE;
+    STDMETHOD(ReadDebuggerData)(
+        THIS_
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+    STDMETHOD(ReadProcessorSystemData)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+
+    // IDebugDataSpaces2.
+
+    STDMETHOD(VirtualToPhysical)(
+        THIS_
+        __in ULONG64 Virtual,
+        __out PULONG64 Physical
+        ) PURE;
+    // Returns the physical addresses for the
+    // N levels of the systems paging structures.
+    // Level zero is the starting base physical
+    // address for virtual translations.
+    // Levels one-(N-1) will point to the appropriate
+    // paging descriptor for the virtual address at
+    // the given level of the paging hierarchy.  The
+    // exact number of levels depends on many factors.
+    // The last level will be the fully translated
+    // physical address, matching what VirtualToPhysical
+    // returns.  If the address can only be partially
+    // translated S_FALSE is returned.
+    STDMETHOD(GetVirtualTranslationPhysicalOffsets)(
+        THIS_
+        __in ULONG64 Virtual,
+        __out_ecount_opt(OffsetsSize) PULONG64 Offsets,
+        __in ULONG OffsetsSize,
+        __out_opt PULONG Levels
+        ) PURE;
+
+    // System handle data is accessible in certain
+    // debug sessions.  The particular data available
+    // varies from session to session and platform
+    // to platform.
+    STDMETHOD(ReadHandleData)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG DataType,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+
+    // Fills memory with the given pattern.
+    // The fill stops at the first non-writable byte.
+    STDMETHOD(FillVirtual)(
+        THIS_
+        __in ULONG64 Start,
+        __in ULONG Size,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __out_opt PULONG Filled
+        ) PURE;
+    STDMETHOD(FillPhysical)(
+        THIS_
+        __in ULONG64 Start,
+        __in ULONG Size,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __out_opt PULONG Filled
+        ) PURE;
+
+    // Queries virtual memory mapping information given
+    // an address similarly to the Win32 API VirtualQuery.
+    // MEMORY_BASIC_INFORMATION64 is defined in crash.h.
+    // This method currently only works for user-mode sessions.
+    STDMETHOD(QueryVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PMEMORY_BASIC_INFORMATION64 Info
+        ) PURE;
+
+    // IDebugDataSpaces3.
+
+    // Convenience method for reading an image
+    // header from virtual memory.  Given the
+    // image base, this method determines where
+    // the NT headers are, validates the necessary
+    // markers and converts the headers into
+    // 64-bit form for consistency.
+    // A caller can check whether the headers were
+    // originally 32-bit by checking the optional
+    // header magic value.
+    // This method will not read ROM headers.
+    STDMETHOD(ReadImageNtHeaders)(
+        THIS_
+        __in ULONG64 ImageBase,
+        __out PIMAGE_NT_HEADERS64 Headers
+        ) PURE;
+
+    // Some debug sessions have arbitrary additional
+    // data available.  For example, additional dump
+    // information files may contain extra information
+    // gathered at the same time as the primary dump.
+    // Such information is tagged with a unique identifier
+    // and can only be retrieved via the tag.
+    // Tagged data cannot be partially available; the
+    // tagged block is either fully present or completely
+    // absent.
+    STDMETHOD(ReadTagged)(
+        THIS_
+        __in LPGUID Tag,
+        __in ULONG Offset,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TotalSize
+        ) PURE;
+    STDMETHOD(StartEnumTagged)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetNextTagged)(
+        THIS_
+        __in ULONG64 Handle,
+        __out LPGUID Tag,
+        __out PULONG Size
+        ) PURE;
+    STDMETHOD(EndEnumTagged)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+};
+
+#define DEBUG_OFFSINFO_VIRTUAL_SOURCE 0x00000001
+
+#define DEBUG_VSOURCE_INVALID      0x00000000
+#define DEBUG_VSOURCE_DEBUGGEE     0x00000001
+#define DEBUG_VSOURCE_MAPPED_IMAGE 0x00000002
+
+#define DEBUG_VSEARCH_DEFAULT       0x00000000
+#define DEBUG_VSEARCH_WRITABLE_ONLY 0x00000001
+
+#define DEBUG_PHYSICAL_DEFAULT        0x00000000
+#define DEBUG_PHYSICAL_CACHED         0x00000001
+#define DEBUG_PHYSICAL_UNCACHED       0x00000002
+#define DEBUG_PHYSICAL_WRITE_COMBINED 0x00000003
+
+#undef INTERFACE
+#define INTERFACE IDebugDataSpaces4
+DECLARE_INTERFACE_(IDebugDataSpaces4, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugDataSpaces.
+
+    STDMETHOD(ReadVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // SearchVirtual searches the given virtual
+    // address range for the given pattern.  PatternSize
+    // gives the byte length of the pattern and PatternGranularity
+    // controls the granularity of comparisons during
+    // the search.
+    // For example, a DWORD-granular search would
+    // use a pattern granularity of four to search by DWORD
+    // increments.
+    STDMETHOD(SearchVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Length,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __in ULONG PatternGranularity,
+        __out PULONG64 MatchOffset
+        ) PURE;
+    // These methods are identical to Read/WriteVirtual
+    // except that they avoid the kernel virtual memory
+    // cache entirely and are therefore useful for reading
+    // virtual memory which is inherently volatile, such
+    // as memory-mapped device areas, without contaminating
+    // or invalidating the cache.
+    // In user-mode they are the same as Read/WriteVirtual.
+    STDMETHOD(ReadVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteVirtualUncached)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    // The following two methods are convenience
+    // methods for accessing pointer values.
+    // They automatically convert between native pointers
+    // and canonical 64-bit values as necessary.
+    // These routines stop at the first failure.
+    STDMETHOD(ReadPointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __out_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    STDMETHOD(WritePointersVirtual)(
+        THIS_
+        __in ULONG Count,
+        __in ULONG64 Offset,
+        __in_ecount(Count) PULONG64 Ptrs
+        ) PURE;
+    // All non-virtual data spaces are only
+    // available when kernel debugging.
+    STDMETHOD(ReadPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WritePhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteControl)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteIo)(
+        THIS_
+        __in ULONG InterfaceType,
+        __in ULONG BusNumber,
+        __in ULONG AddressSpace,
+        __in ULONG64 Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(ReadMsr)(
+        THIS_
+        __in ULONG Msr,
+        __out PULONG64 Value
+        ) PURE;
+    STDMETHOD(WriteMsr)(
+        THIS_
+        __in ULONG Msr,
+        __in ULONG64 Value
+        ) PURE;
+    STDMETHOD(ReadBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteBusData)(
+        THIS_
+        __in ULONG BusDataType,
+        __in ULONG BusNumber,
+        __in ULONG SlotNumber,
+        __in ULONG Offset,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(CheckLowMemory)(
+        THIS
+        ) PURE;
+    STDMETHOD(ReadDebuggerData)(
+        THIS_
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+    STDMETHOD(ReadProcessorSystemData)(
+        THIS_
+        __in ULONG Processor,
+        __in ULONG Index,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+
+    // IDebugDataSpaces2.
+
+    STDMETHOD(VirtualToPhysical)(
+        THIS_
+        __in ULONG64 Virtual,
+        __out PULONG64 Physical
+        ) PURE;
+    // Returns the physical addresses for the
+    // N levels of the systems paging structures.
+    // Level zero is the starting base physical
+    // address for virtual translations.
+    // Levels one-(N-1) will point to the appropriate
+    // paging descriptor for the virtual address at
+    // the given level of the paging hierarchy.  The
+    // exact number of levels depends on many factors.
+    // The last level will be the fully translated
+    // physical address, matching what VirtualToPhysical
+    // returns.  If the address can only be partially
+    // translated S_FALSE is returned.
+    STDMETHOD(GetVirtualTranslationPhysicalOffsets)(
+        THIS_
+        __in ULONG64 Virtual,
+        __out_ecount_opt(OffsetsSize) PULONG64 Offsets,
+        __in ULONG OffsetsSize,
+        __out_opt PULONG Levels
+        ) PURE;
+
+    // System handle data is accessible in certain
+    // debug sessions.  The particular data available
+    // varies from session to session and platform
+    // to platform.
+    STDMETHOD(ReadHandleData)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG DataType,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG DataSize
+        ) PURE;
+
+    // Fills memory with the given pattern.
+    // The fill stops at the first non-writable byte.
+    STDMETHOD(FillVirtual)(
+        THIS_
+        __in ULONG64 Start,
+        __in ULONG Size,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __out_opt PULONG Filled
+        ) PURE;
+    STDMETHOD(FillPhysical)(
+        THIS_
+        __in ULONG64 Start,
+        __in ULONG Size,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __out_opt PULONG Filled
+        ) PURE;
+
+    // Queries virtual memory mapping information given
+    // an address similarly to the Win32 API VirtualQuery.
+    // MEMORY_BASIC_INFORMATION64 is defined in crash.h.
+    // This method currently only works for user-mode sessions.
+    STDMETHOD(QueryVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PMEMORY_BASIC_INFORMATION64 Info
+        ) PURE;
+
+    // IDebugDataSpaces3.
+
+    // Convenience method for reading an image
+    // header from virtual memory.  Given the
+    // image base, this method determines where
+    // the NT headers are, validates the necessary
+    // markers and converts the headers into
+    // 64-bit form for consistency.
+    // A caller can check whether the headers were
+    // originally 32-bit by checking the optional
+    // header magic value.
+    // This method will not read ROM headers.
+    STDMETHOD(ReadImageNtHeaders)(
+        THIS_
+        __in ULONG64 ImageBase,
+        __out PIMAGE_NT_HEADERS64 Headers
+        ) PURE;
+
+    // Some debug sessions have arbitrary additional
+    // data available.  For example, additional dump
+    // information files may contain extra information
+    // gathered at the same time as the primary dump.
+    // Such information is tagged with a unique identifier
+    // and can only be retrieved via the tag.
+    // Tagged data cannot be partially available; the
+    // tagged block is either fully present or completely
+    // absent.
+    STDMETHOD(ReadTagged)(
+        THIS_
+        __in LPGUID Tag,
+        __in ULONG Offset,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG TotalSize
+        ) PURE;
+    STDMETHOD(StartEnumTagged)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetNextTagged)(
+        THIS_
+        __in ULONG64 Handle,
+        __out LPGUID Tag,
+        __out PULONG Size
+        ) PURE;
+    STDMETHOD(EndEnumTagged)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    // IDebugDataSpaces4.
+
+    // General information about an address in the given data space.
+    // Queries are from DEBUG_OFFSINFO_*.
+    STDMETHOD(GetOffsetInformation)(
+        THIS_
+        __in ULONG Space,
+        __in ULONG Which,
+        __in ULONG64 Offset,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG InfoSize
+        ) PURE;
+
+    // Given a particular address, return the
+    // next address which has a different validity.
+    // For example, in debug sessions such as a live
+    // user-mode session where virtual address validity
+    // changes from page to page this will return the
+    // page after the given page.  In sessions such as
+    // a user-mode dump file where validity can change
+    // from byte to byte this will return the start of
+    // the next region that has different validity.
+    STDMETHOD(GetNextDifferentlyValidOffsetVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG64 NextOffset
+        ) PURE;
+
+    // Given a particular range of virtual addresses,
+    // find the first region which is valid memory.
+    STDMETHOD(GetValidRegionVirtual)(
+        THIS_
+        __in ULONG64 Base,
+        __in ULONG Size,
+        __out PULONG64 ValidBase,
+        __out PULONG ValidSize
+        ) PURE;
+
+    STDMETHOD(SearchVirtual2)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Length,
+        __in ULONG Flags,
+        __in_bcount(PatternSize) PVOID Pattern,
+        __in ULONG PatternSize,
+        __in ULONG PatternGranularity,
+        __out PULONG64 MatchOffset
+        ) PURE;
+
+    // Attempts to read a multi-byte string
+    // starting at the given virtual address.
+    // The possible string length, including terminator,
+    // is capped at the given max size.
+    // If a return buffer is given it will always
+    // be terminated.
+    STDMETHOD(ReadMultiByteStringVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG MaxBytes,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringBytes
+        ) PURE;
+    // Reads a multi-byte string and converts
+    // it to Unicode using the given code page.
+    STDMETHOD(ReadMultiByteStringVirtualWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG MaxBytes,
+        __in ULONG CodePage,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringBytes
+        ) PURE;
+    STDMETHOD(ReadUnicodeStringVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG MaxBytes,
+        __in ULONG CodePage,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringBytes
+        ) PURE;
+    STDMETHOD(ReadUnicodeStringVirtualWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG MaxBytes,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringBytes
+        ) PURE;
+
+    STDMETHOD(ReadPhysical2)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WritePhysical2)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugEventCallbacks.
+//
+//----------------------------------------------------------------------------
+
+// Interest mask bits.
+#define DEBUG_EVENT_BREAKPOINT              0x00000001
+#define DEBUG_EVENT_EXCEPTION               0x00000002
+#define DEBUG_EVENT_CREATE_THREAD           0x00000004
+#define DEBUG_EVENT_EXIT_THREAD             0x00000008
+#define DEBUG_EVENT_CREATE_PROCESS          0x00000010
+#define DEBUG_EVENT_EXIT_PROCESS            0x00000020
+#define DEBUG_EVENT_LOAD_MODULE             0x00000040
+#define DEBUG_EVENT_UNLOAD_MODULE           0x00000080
+#define DEBUG_EVENT_SYSTEM_ERROR            0x00000100
+#define DEBUG_EVENT_SESSION_STATUS          0x00000200
+#define DEBUG_EVENT_CHANGE_DEBUGGEE_STATE   0x00000400
+#define DEBUG_EVENT_CHANGE_ENGINE_STATE     0x00000800
+#define DEBUG_EVENT_CHANGE_SYMBOL_STATE     0x00001000
+
+// SessionStatus flags.
+// A debuggee has been discovered for the session.
+#define DEBUG_SESSION_ACTIVE                       0x00000000
+// The session has been ended by EndSession.
+#define DEBUG_SESSION_END_SESSION_ACTIVE_TERMINATE 0x00000001
+#define DEBUG_SESSION_END_SESSION_ACTIVE_DETACH    0x00000002
+#define DEBUG_SESSION_END_SESSION_PASSIVE          0x00000003
+// The debuggee has run to completion.  User-mode only.
+#define DEBUG_SESSION_END                          0x00000004
+// The target machine has rebooted.  Kernel-mode only.
+#define DEBUG_SESSION_REBOOT                       0x00000005
+// The target machine has hibernated.  Kernel-mode only.
+#define DEBUG_SESSION_HIBERNATE                    0x00000006
+// The engine was unable to continue the session.
+#define DEBUG_SESSION_FAILURE                      0x00000007
+
+// ChangeDebuggeeState flags.
+// The debuggees state has changed generally, such
+// as when the debuggee has been executing.
+// Argument is zero.
+#define DEBUG_CDS_ALL       0xffffffff
+// Registers have changed.  If only a single register
+// changed, argument is the index of the register.
+// Otherwise it is DEBUG_ANY_ID.
+#define DEBUG_CDS_REGISTERS 0x00000001
+// Data spaces have changed.  If only a single
+// space was affected, argument is the data
+// space.  Otherwise it is DEBUG_ANY_ID.
+#define DEBUG_CDS_DATA      0x00000002
+
+// ChangeEngineState flags.
+// The engine state has changed generally.
+// Argument is zero.
+#define DEBUG_CES_ALL                 0xffffffff
+// Current thread changed.  This may imply a change
+// of system and process also.  Argument is the ID of the new
+// current thread or DEBUG_ANY_ID if no thread is current.
+#define DEBUG_CES_CURRENT_THREAD      0x00000001
+// Effective processor changed.  Argument is the
+// new processor type.
+#define DEBUG_CES_EFFECTIVE_PROCESSOR 0x00000002
+// Breakpoints changed.  If only a single breakpoint
+// changed, argument is the ID of the breakpoint.
+// Otherwise it is DEBUG_ANY_ID.
+#define DEBUG_CES_BREAKPOINTS         0x00000004
+// Code interpretation level changed.  Argument is
+// the new level.
+#define DEBUG_CES_CODE_LEVEL          0x00000008
+// Execution status changed.  Argument is the new
+// execution status.
+#define DEBUG_CES_EXECUTION_STATUS    0x00000010
+// Engine options have changed.  Argument is the new
+// options value.
+#define DEBUG_CES_ENGINE_OPTIONS      0x00000020
+// Log file information has changed.  Argument
+// is TRUE if a log file was opened and FALSE if
+// a log file was closed.
+#define DEBUG_CES_LOG_FILE            0x00000040
+// Default number radix has changed.  Argument
+// is the new radix.
+#define DEBUG_CES_RADIX               0x00000080
+// Event filters changed.  If only a single filter
+// changed the argument is the filter's index,
+// otherwise it is DEBUG_ANY_ID.
+#define DEBUG_CES_EVENT_FILTERS       0x00000100
+// Process options have changed.  Argument is the new
+// options value.
+#define DEBUG_CES_PROCESS_OPTIONS     0x00000200
+// Extensions have been added or removed.
+#define DEBUG_CES_EXTENSIONS          0x00000400
+// Systems have been added or removed.  The argument
+// is the system ID.  Systems, unlike processes and
+// threads, may be created at any time and not
+// just during WaitForEvent.
+#define DEBUG_CES_SYSTEMS             0x00000800
+// Assembly/disassembly options have changed.  Argument
+// is the new options value.
+#define DEBUG_CES_ASSEMBLY_OPTIONS    0x00001000
+// Expression syntax has changed.  Argument
+// is the new syntax value.
+#define DEBUG_CES_EXPRESSION_SYNTAX   0x00002000
+// Text replacements have changed.
+#define DEBUG_CES_TEXT_REPLACEMENTS   0x00004000
+
+// ChangeSymbolState flags.
+// Symbol state has changed generally, such
+// as after reload operations.  Argument is zero.
+#define DEBUG_CSS_ALL            0xffffffff
+// Modules have been loaded.  If only a
+// single module changed, argument is the
+// base address of the module.  Otherwise
+// it is zero.
+#define DEBUG_CSS_LOADS          0x00000001
+// Modules have been unloaded.  If only a
+// single module changed, argument is the
+// base address of the module.  Otherwise
+// it is zero.
+#define DEBUG_CSS_UNLOADS        0x00000002
+// Current symbol scope changed.
+#define DEBUG_CSS_SCOPE          0x00000004
+// Paths have changed.
+#define DEBUG_CSS_PATHS          0x00000008
+// Symbol options have changed.  Argument is the new
+// options value.
+#define DEBUG_CSS_SYMBOL_OPTIONS 0x00000010
+// Type options have changed.  Argument is the new
+// options value.
+#define DEBUG_CSS_TYPE_OPTIONS   0x00000020
+
+#undef INTERFACE
+#define INTERFACE IDebugEventCallbacks
+DECLARE_INTERFACE_(IDebugEventCallbacks, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugEventCallbacks.
+
+    // The engine calls GetInterestMask once when
+    // the event callbacks are set for a client.
+    STDMETHOD(GetInterestMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+
+    // A breakpoint event is generated when
+    // a breakpoint exception is received and
+    // it can be mapped to an existing breakpoint.
+    // The callback method is given a reference
+    // to the breakpoint and should release it when
+    // it is done with it.
+    STDMETHOD(Breakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT Bp
+        ) PURE;
+
+    // Exceptions include breaks which cannot
+    // be mapped to an existing breakpoint
+    // instance.
+    STDMETHOD(Exception)(
+        THIS_
+        __in PEXCEPTION_RECORD64 Exception,
+        __in ULONG FirstChance
+        ) PURE;
+
+    // Any of these values can be zero if they
+    // cannot be provided by the engine.
+    // Currently the kernel does not return thread
+    // or process change events.
+    STDMETHOD(CreateThread)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG64 DataOffset,
+        __in ULONG64 StartOffset
+        ) PURE;
+    STDMETHOD(ExitThread)(
+        THIS_
+        __in ULONG ExitCode
+        ) PURE;
+
+    // Any of these values can be zero if they
+    // cannot be provided by the engine.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 Handle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in_opt PCSTR ModuleName,
+        __in_opt PCSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp,
+        __in ULONG64 InitialThreadHandle,
+        __in ULONG64 ThreadDataOffset,
+        __in ULONG64 StartOffset
+        ) PURE;
+    STDMETHOD(ExitProcess)(
+        THIS_
+        __in ULONG ExitCode
+        ) PURE;
+
+    // Any of these values may be zero.
+    STDMETHOD(LoadModule)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in_opt PCSTR ModuleName,
+        __in_opt PCSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp
+        ) PURE;
+    STDMETHOD(UnloadModule)(
+        THIS_
+        __in_opt PCSTR ImageBaseName,
+        __in ULONG64 BaseOffset
+        ) PURE;
+
+    STDMETHOD(SystemError)(
+        THIS_
+        __in ULONG Error,
+        __in ULONG Level
+        ) PURE;
+
+    // Session status is synchronous like the other
+    // wait callbacks but it is called as the state
+    // of the session is changing rather than at
+    // specific events so its return value does not
+    // influence waiting.  Implementations should just
+    // return DEBUG_STATUS_NO_CHANGE.
+    // Also, because some of the status
+    // notifications are very early or very
+    // late in the session lifetime there may not be
+    // current processes or threads when the notification
+    // is generated.
+    STDMETHOD(SessionStatus)(
+        THIS_
+        __in ULONG Status
+        ) PURE;
+
+    // The following callbacks are informational
+    // callbacks notifying the provider about
+    // changes in debug state.  The return value
+    // of these callbacks is ignored.  Implementations
+    // can not call back into the engine.
+
+    // Debuggee state, such as registers or data spaces,
+    // has changed.
+    STDMETHOD(ChangeDebuggeeState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        ) PURE;
+    // Engine state has changed.
+    STDMETHOD(ChangeEngineState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        ) PURE;
+    // Symbol state has changed.
+    STDMETHOD(ChangeSymbolState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugEventCallbacksWide
+DECLARE_INTERFACE_(IDebugEventCallbacksWide, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugEventCallbacksWide.
+
+    // The engine calls GetInterestMask once when
+    // the event callbacks are set for a client.
+    STDMETHOD(GetInterestMask)(
+        THIS_
+        __out PULONG Mask
+        ) PURE;
+
+    // A breakpoint event is generated when
+    // a breakpoint exception is received and
+    // it can be mapped to an existing breakpoint.
+    // The callback method is given a reference
+    // to the breakpoint and should release it when
+    // it is done with it.
+    STDMETHOD(Breakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT2 Bp
+        ) PURE;
+
+    // Exceptions include breaks which cannot
+    // be mapped to an existing breakpoint
+    // instance.
+    STDMETHOD(Exception)(
+        THIS_
+        __in PEXCEPTION_RECORD64 Exception,
+        __in ULONG FirstChance
+        ) PURE;
+
+    // Any of these values can be zero if they
+    // cannot be provided by the engine.
+    // Currently the kernel does not return thread
+    // or process change events.
+    STDMETHOD(CreateThread)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG64 DataOffset,
+        __in ULONG64 StartOffset
+        ) PURE;
+    STDMETHOD(ExitThread)(
+        THIS_
+        __in ULONG ExitCode
+        ) PURE;
+
+    // Any of these values can be zero if they
+    // cannot be provided by the engine.
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 Handle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in_opt PCWSTR ModuleName,
+        __in_opt PCWSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp,
+        __in ULONG64 InitialThreadHandle,
+        __in ULONG64 ThreadDataOffset,
+        __in ULONG64 StartOffset
+        ) PURE;
+    STDMETHOD(ExitProcess)(
+        THIS_
+        __in ULONG ExitCode
+        ) PURE;
+
+    // Any of these values may be zero.
+    STDMETHOD(LoadModule)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in_opt PCWSTR ModuleName,
+        __in_opt PCWSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp
+        ) PURE;
+    STDMETHOD(UnloadModule)(
+        THIS_
+        __in_opt PCWSTR ImageBaseName,
+        __in ULONG64 BaseOffset
+        ) PURE;
+
+    STDMETHOD(SystemError)(
+        THIS_
+        __in ULONG Error,
+        __in ULONG Level
+        ) PURE;
+
+    // Session status is synchronous like the other
+    // wait callbacks but it is called as the state
+    // of the session is changing rather than at
+    // specific events so its return value does not
+    // influence waiting.  Implementations should just
+    // return DEBUG_STATUS_NO_CHANGE.
+    // Also, because some of the status
+    // notifications are very early or very
+    // late in the session lifetime there may not be
+    // current processes or threads when the notification
+    // is generated.
+    STDMETHOD(SessionStatus)(
+        THIS_
+        __in ULONG Status
+        ) PURE;
+
+    // The following callbacks are informational
+    // callbacks notifying the provider about
+    // changes in debug state.  The return value
+    // of these callbacks is ignored.  Implementations
+    // can not call back into the engine.
+
+    // Debuggee state, such as registers or data spaces,
+    // has changed.
+    STDMETHOD(ChangeDebuggeeState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        ) PURE;
+    // Engine state has changed.
+    STDMETHOD(ChangeEngineState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        ) PURE;
+    // Symbol state has changed.
+    STDMETHOD(ChangeSymbolState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugInputCallbacks.
+//
+//----------------------------------------------------------------------------
+
+#undef INTERFACE
+#define INTERFACE IDebugInputCallbacks
+DECLARE_INTERFACE_(IDebugInputCallbacks, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugInputCallbacks.
+
+    // A call to the StartInput method is a request for
+    // a line of input from any client.  The returned input
+    // should always be zero-terminated.  The buffer size
+    // provided is only a guideline.  A client can return
+    // more if necessary and the engine will truncate it
+    // before returning from IDebugControl::Input.
+    // The return value is ignored.
+    STDMETHOD(StartInput)(
+        THIS_
+        __in ULONG BufferSize
+        ) PURE;
+    // The return value is ignored.
+    STDMETHOD(EndInput)(
+        THIS
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugOutputCallbacks.
+//
+//----------------------------------------------------------------------------
+
+#undef INTERFACE
+#define INTERFACE IDebugOutputCallbacks
+DECLARE_INTERFACE_(IDebugOutputCallbacks, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugOutputCallbacks.
+
+    // This method is only called if the supplied mask
+    // is allowed by the clients output control.
+    // The return value is ignored.
+    STDMETHOD(Output)(
+        THIS_
+        __in ULONG Mask,
+        __in PCSTR Text
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugOutputCallbacksWide
+DECLARE_INTERFACE_(IDebugOutputCallbacksWide, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugOutputCallbacksWide.
+
+    // This method is only called if the supplied mask
+    // is allowed by the clients output control.
+    // The return value is ignored.
+    STDMETHOD(Output)(
+        THIS_
+        __in ULONG Mask,
+        __in PCWSTR Text
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugRegisters.
+//
+//----------------------------------------------------------------------------
+
+#define DEBUG_REGISTERS_DEFAULT 0x00000000
+#define DEBUG_REGISTERS_INT32   0x00000001
+#define DEBUG_REGISTERS_INT64   0x00000002
+#define DEBUG_REGISTERS_FLOAT   0x00000004
+#define DEBUG_REGISTERS_ALL     0x00000007
+
+#define DEBUG_REGISTER_SUB_REGISTER 0x00000001
+
+typedef struct _DEBUG_REGISTER_DESCRIPTION
+{
+    // DEBUG_VALUE type.
+    ULONG Type;
+    ULONG Flags;
+
+    // If this is a subregister the full
+    // registers description index is
+    // given in SubregMaster.  The length, mask
+    // and shift describe how the subregisters
+    // bits fit into the full register.
+    ULONG SubregMaster;
+    ULONG SubregLength;
+    ULONG64 SubregMask;
+    ULONG SubregShift;
+
+    ULONG Reserved0;
+} DEBUG_REGISTER_DESCRIPTION, *PDEBUG_REGISTER_DESCRIPTION;
+
+#undef INTERFACE
+#define INTERFACE IDebugRegisters
+DECLARE_INTERFACE_(IDebugRegisters, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugRegisters.
+    STDMETHOD(GetNumberRegisters)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetDescription)(
+        THIS_
+        __in ULONG Register,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PDEBUG_REGISTER_DESCRIPTION Desc
+        ) PURE;
+    STDMETHOD(GetIndexByName)(
+        THIS_
+        __in PCSTR Name,
+        __out PULONG Index
+        ) PURE;
+
+    STDMETHOD(GetValue)(
+        THIS_
+        __in ULONG Register,
+        __out PDEBUG_VALUE Value
+        ) PURE;
+    // SetValue makes a best effort at coercing
+    // the given value into the given registers
+    // value type.  If the given value is larger
+    // than the register can hold the least
+    // significant bits will be dropped.  Float
+    // to int and int to float will be done
+    // if necessary.  Subregister bits will be
+    // inserted into the master register.
+    STDMETHOD(SetValue)(
+        THIS_
+        __in ULONG Register,
+        __in PDEBUG_VALUE Value
+        ) PURE;
+    // Gets Count register values.  If Indices is
+    // non-NULL it must contain Count register
+    // indices which control the registers affected.
+    // If Indices is NULL the registers from Start
+    // to Start + Count  1 are retrieved.
+    STDMETHOD(GetValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+    STDMETHOD(SetValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __in_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+
+    // Outputs a group of registers in a well-formatted
+    // way thats specific to the platforms register set.
+    // Uses the line prefix.
+    STDMETHOD(OutputRegisters)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // Abstracted pieces of processor information.
+    // The mapping of these values to architectural
+    // registers is architecture-specific and their
+    // interpretation and existence may vary.  They
+    // are intended to be directly compatible with
+    // calls which take this information, such as
+    // stack walking.
+    STDMETHOD(GetInstructionOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetStackOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetFrameOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+};
+
+//
+// The engine maintains several separate
+// pieces of context information.  There is
+// the current debuggee context, a possible
+// override context, such as from .cxr,
+// a context for the current scope frame and so on.
+//
+
+// Get register information from the debuggee.
+#define DEBUG_REGSRC_DEBUGGEE 0x00000000
+// Get register information from an explicit
+// override context, such as one set by .cxr.
+// If there is no override context the request will fail.
+#define DEBUG_REGSRC_EXPLICIT 0x00000001
+// Get register information from the current scope
+// frame.  Note that stack unwinding does not guarantee
+// accurate updating of the register context,
+// so scope frame register context may not be accurate
+// in all cases.
+#define DEBUG_REGSRC_FRAME    0x00000002
+
+#undef INTERFACE
+#define INTERFACE IDebugRegisters2
+DECLARE_INTERFACE_(IDebugRegisters2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugRegisters.
+
+    STDMETHOD(GetNumberRegisters)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetDescription)(
+        THIS_
+        __in ULONG Register,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PDEBUG_REGISTER_DESCRIPTION Desc
+        ) PURE;
+    STDMETHOD(GetIndexByName)(
+        THIS_
+        __in PCSTR Name,
+        __out PULONG Index
+        ) PURE;
+
+    STDMETHOD(GetValue)(
+        THIS_
+        __in ULONG Register,
+        __out PDEBUG_VALUE Value
+        ) PURE;
+    // SetValue makes a best effort at coercing
+    // the given value into the given registers
+    // value type.  If the given value is larger
+    // than the register can hold the least
+    // significant bits will be dropped.  Float
+    // to int and int to float will be done
+    // if necessary.  Subregister bits will be
+    // inserted into the master register.
+    STDMETHOD(SetValue)(
+        THIS_
+        __in ULONG Register,
+        __in PDEBUG_VALUE Value
+        ) PURE;
+    // Gets Count register values.  If Indices is
+    // non-NULL it must contain Count register
+    // indices which control the registers affected.
+    // If Indices is NULL the registers from Start
+    // to Start + Count  1 are retrieved.
+    STDMETHOD(GetValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+    STDMETHOD(SetValues)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __in_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+
+    // Outputs a group of registers in a well-formatted
+    // way thats specific to the platforms register set.
+    // Uses the line prefix.
+    STDMETHOD(OutputRegisters)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags
+        ) PURE;
+
+    // Abstracted pieces of processor information.
+    // The mapping of these values to architectural
+    // registers is architecture-specific and their
+    // interpretation and existence may vary.  They
+    // are intended to be directly compatible with
+    // calls which take this information, such as
+    // stack walking.
+    STDMETHOD(GetInstructionOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetStackOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetFrameOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+
+    // IDebugRegisters2.
+
+    STDMETHOD(GetDescriptionWide)(
+        THIS_
+        __in ULONG Register,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PDEBUG_REGISTER_DESCRIPTION Desc
+        ) PURE;
+    STDMETHOD(GetIndexByNameWide)(
+        THIS_
+        __in PCWSTR Name,
+        __out PULONG Index
+        ) PURE;
+
+    // Pseudo-registers are synthetic values derived
+    // by the engine that are presented in a manner
+    // similar to regular registers.  They are simple
+    // value holders, similar to actual registers.
+    // Pseudo-registers are defined for concepts,
+    // such as current-instruction-pointer or
+    // current-thread-data.  As such they have
+    // types appropriate for their data.
+    STDMETHOD(GetNumberPseudoRegisters)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetPseudoDescription)(
+        THIS_
+        __in ULONG Register,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 TypeModule,
+        __out_opt PULONG TypeId
+        ) PURE;
+    STDMETHOD(GetPseudoDescriptionWide)(
+        THIS_
+        __in ULONG Register,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 TypeModule,
+        __out_opt PULONG TypeId
+        ) PURE;
+    STDMETHOD(GetPseudoIndexByName)(
+        THIS_
+        __in PCSTR Name,
+        __out PULONG Index
+        ) PURE;
+    STDMETHOD(GetPseudoIndexByNameWide)(
+        THIS_
+        __in PCWSTR Name,
+        __out PULONG Index
+        ) PURE;
+    // Some pseudo-register values are affected
+    // by the register source, others are not.
+    STDMETHOD(GetPseudoValues)(
+        THIS_
+        __in ULONG Source,
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+    // Many pseudo-registers are read-only and cannot be set.
+    STDMETHOD(SetPseudoValues)(
+        THIS_
+        __in ULONG Source,
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __in_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+
+    // These expanded methods allow selection
+    // of the source of register information.
+    STDMETHOD(GetValues2)(
+        THIS_
+        __in ULONG Source,
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+    STDMETHOD(SetValues2)(
+        THIS_
+        __in ULONG Source,
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG Indices,
+        __in ULONG Start,
+        __in_ecount(Count) PDEBUG_VALUE Values
+        ) PURE;
+    STDMETHOD(OutputRegisters2)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Source,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(GetInstructionOffset2)(
+        THIS_
+        __in ULONG Source,
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetStackOffset2)(
+        THIS_
+        __in ULONG Source,
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetFrameOffset2)(
+        THIS_
+        __in ULONG Source,
+        __out PULONG64 Offset
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugSymbolGroup
+//
+//----------------------------------------------------------------------------
+
+// OutputSymbols flags.
+// Default output contains
+//   <Name>**NAME**<Offset>**OFF**<Value>**VALUE**<Type>**TYPE**
+// per symbol.
+#define DEBUG_OUTPUT_SYMBOLS_DEFAULT    0x00000000
+#define DEBUG_OUTPUT_SYMBOLS_NO_NAMES   0x00000001
+#define DEBUG_OUTPUT_SYMBOLS_NO_OFFSETS 0x00000002
+#define DEBUG_OUTPUT_SYMBOLS_NO_VALUES  0x00000004
+#define DEBUG_OUTPUT_SYMBOLS_NO_TYPES   0x00000010
+
+#define DEBUG_OUTPUT_NAME_END           "**NAME**"
+#define DEBUG_OUTPUT_OFFSET_END         "**OFF**"
+#define DEBUG_OUTPUT_VALUE_END          "**VALUE**"
+#define DEBUG_OUTPUT_TYPE_END           "**TYPE**"
+
+#define DEBUG_OUTPUT_NAME_END_WIDE      L"**NAME**"
+#define DEBUG_OUTPUT_OFFSET_END_WIDE    L"**OFF**"
+#define DEBUG_OUTPUT_VALUE_END_WIDE     L"**VALUE**"
+#define DEBUG_OUTPUT_TYPE_END_WIDE      L"**TYPE**"
+
+#ifdef UNICODE
+#define DEBUG_OUTPUT_NAME_END_T DEBUG_OUTPUT_NAME_END_WIDE
+#define DEBUG_OUTPUT_OFFSET_END_T DEBUG_OUTPUT_OFFSET_END_WIDE
+#define DEBUG_OUTPUT_VALUE_END_T DEBUG_OUTPUT_VALUE_END_WIDE
+#define DEBUG_OUTPUT_TYPE_END_T DEBUG_OUTPUT_TYPE_END_WIDE
+#else
+#define DEBUG_OUTPUT_NAME_END_T DEBUG_OUTPUT_NAME_END
+#define DEBUG_OUTPUT_OFFSET_END_T DEBUG_OUTPUT_OFFSET_END
+#define DEBUG_OUTPUT_VALUE_END_T DEBUG_OUTPUT_VALUE_END
+#define DEBUG_OUTPUT_TYPE_END_T DEBUG_OUTPUT_TYPE_END
+#endif
+
+// DEBUG_SYMBOL_PARAMETERS flags.
+// Cumulative expansion level, takes four bits.
+#define DEBUG_SYMBOL_EXPANSION_LEVEL_MASK 0x0000000f
+// Symbols subelements follow.
+#define DEBUG_SYMBOL_EXPANDED             0x00000010
+// Symbols value is read-only.
+#define DEBUG_SYMBOL_READ_ONLY            0x00000020
+// Symbol subelements are array elements.
+#define DEBUG_SYMBOL_IS_ARRAY             0x00000040
+// Symbol is a float value.
+#define DEBUG_SYMBOL_IS_FLOAT             0x00000080
+// Symbol is a scope argument.
+#define DEBUG_SYMBOL_IS_ARGUMENT          0x00000100
+// Symbol is a scope argument.
+#define DEBUG_SYMBOL_IS_LOCAL             0x00000200
+
+typedef struct _DEBUG_SYMBOL_PARAMETERS
+{
+    ULONG64 Module;
+    ULONG TypeId;
+    // ParentSymbol may be DEBUG_ANY_ID when unknown.
+    ULONG ParentSymbol;
+    // A subelement of a symbol can be a field, such
+    // as in structs, unions or classes; or an array
+    // element count for arrays.
+    ULONG SubElements;
+    ULONG Flags;
+    ULONG64 Reserved;
+} DEBUG_SYMBOL_PARAMETERS, *PDEBUG_SYMBOL_PARAMETERS;
+
+#undef INTERFACE
+#define INTERFACE IDebugSymbolGroup
+DECLARE_INTERFACE_(IDebugSymbolGroup, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSymbolGroup.
+    STDMETHOD(GetNumberSymbols)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // On input Index indicates the desired insertion
+    // index.  On output Index contains the actual index.
+    // Use DEBUG_ANY_ID to append a symbol to the end.
+    STDMETHOD(AddSymbol)(
+        THIS_
+        __in PCSTR Name,
+        __inout PULONG Index
+        ) PURE;
+    STDMETHOD(RemoveSymbolByName)(
+        THIS_
+        __in PCSTR Name
+        ) PURE;
+    STDMETHOD(RemoveSymbolByIndex)(
+        THIS_
+        __in ULONG Index
+        ) PURE;
+    STDMETHOD(GetSymbolName)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(GetSymbolParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PDEBUG_SYMBOL_PARAMETERS Params
+        ) PURE;
+    STDMETHOD(ExpandSymbol)(
+        THIS_
+        __in ULONG Index,
+        __in BOOL Expand
+        ) PURE;
+    // Uses the line prefix.
+    STDMETHOD(OutputSymbols)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in ULONG Start,
+        __in ULONG Count
+        ) PURE;
+    STDMETHOD(WriteSymbol)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Value
+        ) PURE;
+    STDMETHOD(OutputAsType)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Type
+        ) PURE;
+};
+
+#define DEBUG_SYMENT_IS_CODE      0x00000001
+#define DEBUG_SYMENT_IS_DATA      0x00000002
+#define DEBUG_SYMENT_IS_PARAMETER 0x00000004
+#define DEBUG_SYMENT_IS_LOCAL     0x00000008
+#define DEBUG_SYMENT_IS_MANAGED   0x00000010
+#define DEBUG_SYMENT_IS_SYNTHETIC 0x00000020
+
+typedef struct _DEBUG_SYMBOL_ENTRY
+{
+    ULONG64 ModuleBase;
+    ULONG64 Offset;
+    ULONG64 Id;
+    ULONG64 Arg64;
+    ULONG Size;
+    ULONG Flags;
+    ULONG TypeId;
+    ULONG NameSize;
+    ULONG Token;
+    ULONG Tag;
+    ULONG Arg32;
+    ULONG Reserved;
+} DEBUG_SYMBOL_ENTRY, *PDEBUG_SYMBOL_ENTRY;
+
+#undef INTERFACE
+#define INTERFACE IDebugSymbolGroup2
+DECLARE_INTERFACE_(IDebugSymbolGroup2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSymbolGroup.
+
+    STDMETHOD(GetNumberSymbols)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // On input Index indicates the desired insertion
+    // index.  On output Index contains the actual index.
+    // Use DEBUG_ANY_ID to append a symbol to the end.
+    STDMETHOD(AddSymbol)(
+        THIS_
+        __in PCSTR Name,
+        __inout PULONG Index
+        ) PURE;
+    STDMETHOD(RemoveSymbolByName)(
+        THIS_
+        __in PCSTR Name
+        ) PURE;
+    STDMETHOD(RemoveSymbolByIndex)(
+        THIS_
+        __in ULONG Index
+        ) PURE;
+    STDMETHOD(GetSymbolName)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(GetSymbolParameters)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PDEBUG_SYMBOL_PARAMETERS Params
+        ) PURE;
+    STDMETHOD(ExpandSymbol)(
+        THIS_
+        __in ULONG Index,
+        __in BOOL Expand
+        ) PURE;
+    // Uses the line prefix.
+    STDMETHOD(OutputSymbols)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in ULONG Start,
+        __in ULONG Count
+        ) PURE;
+    STDMETHOD(WriteSymbol)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Value
+        ) PURE;
+    STDMETHOD(OutputAsType)(
+        THIS_
+        __in ULONG Index,
+        __in PCSTR Type
+        ) PURE;
+
+    // IDebugSymbolGroup2.
+
+    STDMETHOD(AddSymbolWide)(
+        THIS_
+        __in PCWSTR Name,
+        __inout PULONG Index
+        ) PURE;
+    STDMETHOD(RemoveSymbolByNameWide)(
+        THIS_
+        __in PCWSTR Name
+        ) PURE;
+    STDMETHOD(GetSymbolNameWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(WriteSymbolWide)(
+        THIS_
+        __in ULONG Index,
+        __in PCWSTR Value
+        ) PURE;
+    STDMETHOD(OutputAsTypeWide)(
+        THIS_
+        __in ULONG Index,
+        __in PCWSTR Type
+        ) PURE;
+
+    STDMETHOD(GetSymbolTypeName)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(GetSymbolTypeNameWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(GetSymbolSize)(
+        THIS_
+        __in ULONG Index,
+        __out PULONG Size
+        ) PURE;
+    // If the symbol has an absolute address
+    // this method will retrieve it.
+    STDMETHOD(GetSymbolOffset)(
+        THIS_
+        __in ULONG Index,
+        __out PULONG64 Offset
+        ) PURE;
+    // If the symbol is enregistered this
+    // method will return the register index.
+    STDMETHOD(GetSymbolRegister)(
+        THIS_
+        __in ULONG Index,
+        __out PULONG Register
+        ) PURE;
+    STDMETHOD(GetSymbolValueText)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(GetSymbolValueTextWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    STDMETHOD(GetSymbolEntryInformation)(
+        THIS_
+        __in ULONG Index,
+        __out PDEBUG_SYMBOL_ENTRY Entry
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugSymbols.
+//
+//----------------------------------------------------------------------------
+
+//
+// Information about a module.
+//
+
+// Flags.
+#define DEBUG_MODULE_LOADED            0x00000000
+#define DEBUG_MODULE_UNLOADED          0x00000001
+#define DEBUG_MODULE_USER_MODE         0x00000002
+#define DEBUG_MODULE_EXPLICIT          0x00000008
+#define DEBUG_MODULE_SECONDARY         0x00000010
+#define DEBUG_MODULE_SYNTHETIC         0x00000020
+#define DEBUG_MODULE_SYM_BAD_CHECKSUM  0x00010000
+
+// Symbol types.
+#define DEBUG_SYMTYPE_NONE     0
+#define DEBUG_SYMTYPE_COFF     1
+#define DEBUG_SYMTYPE_CODEVIEW 2
+#define DEBUG_SYMTYPE_PDB      3
+#define DEBUG_SYMTYPE_EXPORT   4
+#define DEBUG_SYMTYPE_DEFERRED 5
+#define DEBUG_SYMTYPE_SYM      6
+#define DEBUG_SYMTYPE_DIA      7
+
+typedef struct _DEBUG_MODULE_PARAMETERS
+{
+    ULONG64 Base;
+    ULONG Size;
+    ULONG TimeDateStamp;
+    ULONG Checksum;
+    ULONG Flags;
+    ULONG SymbolType;
+    ULONG ImageNameSize;
+    ULONG ModuleNameSize;
+    ULONG LoadedImageNameSize;
+    ULONG SymbolFileNameSize;
+    ULONG MappedImageNameSize;
+    ULONG64 Reserved[2];
+} DEBUG_MODULE_PARAMETERS, *PDEBUG_MODULE_PARAMETERS;
+
+// Scope arguments are function arguments
+// and thus only change when the scope
+// crosses functions.
+#define DEBUG_SCOPE_GROUP_ARGUMENTS 0x00000001
+// Scope locals are locals declared in a particular
+// scope and are only defined within that scope.
+#define DEBUG_SCOPE_GROUP_LOCALS    0x00000002
+// All symbols in the scope.
+#define DEBUG_SCOPE_GROUP_ALL       0x00000003
+
+// Typed data output control flags.
+#define DEBUG_OUTTYPE_DEFAULT              0x00000000
+#define DEBUG_OUTTYPE_NO_INDENT            0x00000001
+#define DEBUG_OUTTYPE_NO_OFFSET            0x00000002
+#define DEBUG_OUTTYPE_VERBOSE              0x00000004
+#define DEBUG_OUTTYPE_COMPACT_OUTPUT       0x00000008
+#define DEBUG_OUTTYPE_RECURSION_LEVEL(Max) (((Max) & 0xf) << 4)
+#define DEBUG_OUTTYPE_ADDRESS_OF_FIELD     0x00010000
+#define DEBUG_OUTTYPE_ADDRESS_AT_END       0x00020000
+#define DEBUG_OUTTYPE_BLOCK_RECURSE        0x00200000
+
+// FindSourceFile flags.
+#define DEBUG_FIND_SOURCE_DEFAULT      0x00000000
+// Returns fully-qualified paths only.  If this
+// is not set the path returned may be relative.
+#define DEBUG_FIND_SOURCE_FULL_PATH    0x00000001
+// Scans all the path elements for a match and
+// returns the one that has the most similarity
+// between the given file and the matching element.
+#define DEBUG_FIND_SOURCE_BEST_MATCH   0x00000002
+// Do not search source server paths.
+#define DEBUG_FIND_SOURCE_NO_SRCSRV    0x00000004
+// Restrict FindSourceFileAndToken to token lookup only.
+#define DEBUG_FIND_SOURCE_TOKEN_LOOKUP 0x00000008
+
+// A special value marking an offset that should not
+// be treated as a valid offset.  This is only used
+// in special situations where it is unlikely that
+// this value would be a valid offset.
+#define DEBUG_INVALID_OFFSET ((ULONG64)-1)
+
+#undef INTERFACE
+#define INTERFACE IDebugSymbols
+DECLARE_INTERFACE_(IDebugSymbols, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSymbols.
+
+    // Controls the symbol options used during
+    // symbol operations.
+    // Uses the same flags as dbghelps SymSetOptions.
+    STDMETHOD(GetSymbolOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    STDMETHOD(GetNameByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    // A symbol name may not be unique, particularly
+    // when overloaded functions exist which all
+    // have the same name.  If GetOffsetByName
+    // finds multiple matches for the name it
+    // can return any one of them.  In that
+    // case it will return S_FALSE to indicate
+    // that ambiguity was arbitrarily resolved.
+    // A caller can then use SearchSymbols to
+    // find all of the matches if it wishes to
+    // perform different disambiguation.
+    STDMETHOD(GetOffsetByName)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG64 Offset
+        ) PURE;
+    // GetNearNameByOffset returns symbols
+    // located near the symbol closest to
+    // to the offset, such as the previous
+    // or next symbol.  If Delta is zero it
+    // operates identically to GetNameByOffset.
+    // If Delta is nonzero and such a symbol
+    // does not exist an error is returned.
+    // The next symbol, if one exists, will
+    // always have a higher offset than the
+    // input offset so the displacement is
+    // always negative.  The situation is
+    // reversed for the previous symbol.
+    STDMETHOD(GetNearNameByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+
+    STDMETHOD(GetLineByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_opt PULONG Line,
+        __out_ecount_opt(FileBufferSize) PSTR FileBuffer,
+        __in ULONG FileBufferSize,
+        __out_opt PULONG FileSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    STDMETHOD(GetOffsetByLine)(
+        THIS_
+        __in ULONG Line,
+        __in PCSTR File,
+        __out PULONG64 Offset
+        ) PURE;
+
+    // Enumerates the engines list of modules
+    // loaded for the current process.  This may
+    // or may not match the system module list
+    // for the process.  Reload can be used to
+    // synchronize the engines list with the system
+    // if necessary.
+    // Some sessions also track recently unloaded
+    // code modules for help in analyzing failures
+    // where an attempt is made to call unloaded code.
+    // These modules are indexed after the loaded
+    // modules.
+    STDMETHOD(GetNumberModules)(
+        THIS_
+        __out PULONG Loaded,
+        __out PULONG Unloaded
+        ) PURE;
+    STDMETHOD(GetModuleByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PULONG64 Base
+        ) PURE;
+    // The module name may not be unique.
+    // This method returns the first match.
+    STDMETHOD(GetModuleByModuleName)(
+        THIS_
+        __in PCSTR Name,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // Offset can be any offset within
+    // the module extent.  Extents may
+    // not be unique when including unloaded
+    // drivers.  This method returns the
+    // first match.
+    STDMETHOD(GetModuleByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    STDMETHOD(GetModuleNames)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __out_ecount_opt(ImageNameBufferSize) PSTR ImageNameBuffer,
+        __in ULONG ImageNameBufferSize,
+        __out_opt PULONG ImageNameSize,
+        __out_ecount_opt(ModuleNameBufferSize) PSTR ModuleNameBuffer,
+        __in ULONG ModuleNameBufferSize,
+        __out_opt PULONG ModuleNameSize,
+        __out_ecount_opt(LoadedImageNameBufferSize) PSTR LoadedImageNameBuffer,
+        __in ULONG LoadedImageNameBufferSize,
+        __out_opt PULONG LoadedImageNameSize
+        ) PURE;
+    STDMETHOD(GetModuleParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG64 Bases,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_MODULE_PARAMETERS Params
+        ) PURE;
+    // Looks up the module from a <Module>!<Symbol>
+    // string.
+    STDMETHOD(GetSymbolModule)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG64 Base
+        ) PURE;
+
+    // Returns the string name of a type.
+    STDMETHOD(GetTypeName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    // Returns the ID for a type name.
+    STDMETHOD(GetTypeId)(
+        THIS_
+        __in ULONG64 Module,
+        __in PCSTR Name,
+        __out PULONG TypeId
+        ) PURE;
+    STDMETHOD(GetTypeSize)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out PULONG Size
+        ) PURE;
+    // Given a type which can contain members
+    // this method returns the offset of a
+    // particular member within the type.
+    // TypeId should give the container type ID
+    // and Field gives the dot-separated path
+    // to the field of interest.
+    STDMETHOD(GetFieldOffset)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in PCSTR Field,
+        __out PULONG Offset
+        ) PURE;
+
+    STDMETHOD(GetSymbolTypeId)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+    // As with GetOffsetByName a symbol's
+    // name may be ambiguous.  GetOffsetTypeId
+    // returns the type for the symbol closest
+    // to the given offset and can be used
+    // to avoid ambiguity.
+    STDMETHOD(GetOffsetTypeId)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+
+    // Helpers for virtual and physical data
+    // which combine creation of a location with
+    // the actual operation.
+    STDMETHOD(ReadTypedDataVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteTypedDataVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(OutputTypedDataVirtual)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(ReadTypedDataPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteTypedDataPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(OutputTypedDataPhysical)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG Flags
+        ) PURE;
+
+    // Function arguments and scope block symbols
+    // can be retrieved relative to currently
+    // executing code.  A caller can provide just
+    // a code offset for scoping purposes and look
+    // up names or the caller can provide a full frame
+    // and look up actual values.  The values for
+    // scoped symbols are best-guess and may or may not
+    // be accurate depending on program optimizations,
+    // the machine architecture, the current point
+    // in the programs execution and so on.
+    // A caller can also provide a complete register
+    // context for setting a scope to a previous
+    // machine state such as a context saved for
+    // an exception.  Usually this isnt necessary
+    // and the current register context is used.
+    STDMETHOD(GetScope)(
+        THIS_
+        __out_opt PULONG64 InstructionOffset,
+        __out_opt PDEBUG_STACK_FRAME ScopeFrame,
+        __out_bcount_opt(ScopeContextSize) PVOID ScopeContext,
+        __in ULONG ScopeContextSize
+        ) PURE;
+    // If ScopeFrame or ScopeContext is non-NULL then
+    // InstructionOffset is ignored.
+    // If ScopeContext is NULL the current
+    // register context is used.
+    // If the scope identified by the given
+    // information is the same as before
+    // SetScope returns S_OK.  If the scope
+    // information changes, such as when the
+    // scope moves between functions or scope
+    // blocks, SetScope returns S_FALSE.
+    STDMETHOD(SetScope)(
+        THIS_
+        __in ULONG64 InstructionOffset,
+        __in_opt PDEBUG_STACK_FRAME ScopeFrame,
+        __in_bcount_opt(ScopeContextSize) PVOID ScopeContext,
+        __in ULONG ScopeContextSize
+        ) PURE;
+    // ResetScope clears the scope information
+    // for situations where scoped symbols
+    // mask global symbols or when resetting
+    // from explicit information to the current
+    // information.
+    STDMETHOD(ResetScope)(
+        THIS
+        ) PURE;
+    // A scope symbol is tied to its particular
+    // scope and only is meaningful within the scope.
+    // The returned group can be updated by passing it back
+    // into the method for lower-cost
+    // incremental updates when stepping.
+    STDMETHOD(GetScopeSymbolGroup)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PDEBUG_SYMBOL_GROUP Update,
+        __out PDEBUG_SYMBOL_GROUP* Symbols
+        ) PURE;
+
+    // Create a new symbol group.
+    STDMETHOD(CreateSymbolGroup)(
+        THIS_
+        __out PDEBUG_SYMBOL_GROUP* Group
+        ) PURE;
+
+    // StartSymbolMatch matches symbol names
+    // against the given pattern using simple
+    // regular expressions.  The search results
+    // are iterated through using GetNextSymbolMatch.
+    // When the caller is done examining results
+    // the match should be freed via EndSymbolMatch.
+    // If the match pattern contains a module name
+    // the search is restricted to a single module.
+    // Pattern matching is only done on symbol names,
+    // not module names.
+    // All active symbol match handles are invalidated
+    // when the set of loaded symbols changes.
+    STDMETHOD(StartSymbolMatch)(
+        THIS_
+        __in PCSTR Pattern,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Buffer is NULL the match does not
+    // advance.
+    STDMETHOD(GetNextSymbolMatch)(
+        THIS_
+        __in ULONG64 Handle,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MatchSize,
+        __out_opt PULONG64 Offset
+        ) PURE;
+    STDMETHOD(EndSymbolMatch)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Reload)(
+        THIS_
+        __in PCSTR Module
+        ) PURE;
+
+    STDMETHOD(GetSymbolPath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetSymbolPath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendSymbolPath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+
+    // Manipulate the path for executable images.
+    // Some dump files need to load executable images
+    // in order to resolve dump information.  This
+    // path controls where the engine looks for
+    // images.
+    STDMETHOD(GetImagePath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetImagePath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendImagePath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+
+    // Path routines for source file location
+    // methods.
+    STDMETHOD(GetSourcePath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    // Gets the nth part of the source path.
+    STDMETHOD(GetSourcePathElement)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ElementSize
+        ) PURE;
+    STDMETHOD(SetSourcePath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendSourcePath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+    // Uses the given file path and the source path
+    // information to try and locate an existing file.
+    // The given file path is merged with elements
+    // of the source path and checked for existence.
+    // If a match is found the element used is returned.
+    // A starting element can be specified to restrict
+    // the search to a subset of the path elements;
+    // this can be useful when checking for multiple
+    // matches along the source path.
+    // The returned element can be 1, indicating
+    // the file was found directly and not on the path.
+    STDMETHOD(FindSourceFile)(
+        THIS_
+        __in ULONG StartElement,
+        __in PCSTR File,
+        __in ULONG Flags,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+    // Retrieves all the line offset information
+    // for a particular source file.  Buffer is
+    // first intialized to DEBUG_INVALID_OFFSET for
+    // every entry.  Then for each piece of line
+    // symbol information Buffer[Line] set to
+    // Lines offset.  This produces a per-line
+    // map of the offsets for the lines of the
+    // given file.  Line numbers are decremented
+    // for the map so Buffer[0] contains the offset
+    // for line number 1.
+    // If there is no line information at all for
+    // the given file the method fails rather
+    // than returning a map of invalid offsets.
+    STDMETHOD(GetSourceFileLineOffsets)(
+        THIS_
+        __in PCSTR File,
+        __out_ecount_opt(BufferLines) PULONG64 Buffer,
+        __in ULONG BufferLines,
+        __out_opt PULONG FileLines
+        ) PURE;
+};
+
+//
+// GetModuleNameString strings.
+//
+
+#define DEBUG_MODNAME_IMAGE        0x00000000
+#define DEBUG_MODNAME_MODULE       0x00000001
+#define DEBUG_MODNAME_LOADED_IMAGE 0x00000002
+#define DEBUG_MODNAME_SYMBOL_FILE  0x00000003
+#define DEBUG_MODNAME_MAPPED_IMAGE 0x00000004
+
+//
+// Type options, used with Get/SetTypeOptions.
+//
+
+// Display PUSHORT and USHORT arrays in Unicode.
+#define DEBUG_TYPEOPTS_UNICODE_DISPLAY    0x00000001
+// Display LONG types in default base instead of decimal.
+#define DEBUG_TYPEOPTS_LONGSTATUS_DISPLAY 0x00000002
+// Display integer types in default base instead of decimal.
+#define DEBUG_TYPEOPTS_FORCERADIX_OUTPUT  0x00000004
+
+#undef INTERFACE
+#define INTERFACE IDebugSymbols2
+DECLARE_INTERFACE_(IDebugSymbols2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSymbols.
+
+    // Controls the symbol options used during
+    // symbol operations.
+    // Uses the same flags as dbghelps SymSetOptions.
+    STDMETHOD(GetSymbolOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    STDMETHOD(GetNameByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    // A symbol name may not be unique, particularly
+    // when overloaded functions exist which all
+    // have the same name.  If GetOffsetByName
+    // finds multiple matches for the name it
+    // can return any one of them.  In that
+    // case it will return S_FALSE to indicate
+    // that ambiguity was arbitrarily resolved.
+    // A caller can then use SearchSymbols to
+    // find all of the matches if it wishes to
+    // perform different disambiguation.
+    STDMETHOD(GetOffsetByName)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG64 Offset
+        ) PURE;
+    // GetNearNameByOffset returns symbols
+    // located near the symbol closest to
+    // to the offset, such as the previous
+    // or next symbol.  If Delta is zero it
+    // operates identically to GetNameByOffset.
+    // If Delta is nonzero and such a symbol
+    // does not exist an error is returned.
+    // The next symbol, if one exists, will
+    // always have a higher offset than the
+    // input offset so the displacement is
+    // always negative.  The situation is
+    // reversed for the previous symbol.
+    STDMETHOD(GetNearNameByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+
+    STDMETHOD(GetLineByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_opt PULONG Line,
+        __out_ecount_opt(FileBufferSize) PSTR FileBuffer,
+        __in ULONG FileBufferSize,
+        __out_opt PULONG FileSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    STDMETHOD(GetOffsetByLine)(
+        THIS_
+        __in ULONG Line,
+        __in PCSTR File,
+        __out PULONG64 Offset
+        ) PURE;
+
+    // Enumerates the engines list of modules
+    // loaded for the current process.  This may
+    // or may not match the system module list
+    // for the process.  Reload can be used to
+    // synchronize the engines list with the system
+    // if necessary.
+    // Some sessions also track recently unloaded
+    // code modules for help in analyzing failures
+    // where an attempt is made to call unloaded code.
+    // These modules are indexed after the loaded
+    // modules.
+    STDMETHOD(GetNumberModules)(
+        THIS_
+        __out PULONG Loaded,
+        __out PULONG Unloaded
+        ) PURE;
+    STDMETHOD(GetModuleByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PULONG64 Base
+        ) PURE;
+    // The module name may not be unique.
+    // This method returns the first match.
+    STDMETHOD(GetModuleByModuleName)(
+        THIS_
+        __in PCSTR Name,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // Offset can be any offset within
+    // the module extent.  Extents may
+    // not be unique when including unloaded
+    // drivers.  This method returns the
+    // first match.
+    STDMETHOD(GetModuleByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    STDMETHOD(GetModuleNames)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __out_ecount_opt(ImageNameBufferSize) PSTR ImageNameBuffer,
+        __in ULONG ImageNameBufferSize,
+        __out_opt PULONG ImageNameSize,
+        __out_ecount_opt(ModuleNameBufferSize) PSTR ModuleNameBuffer,
+        __in ULONG ModuleNameBufferSize,
+        __out_opt PULONG ModuleNameSize,
+        __out_ecount_opt(LoadedImageNameBufferSize) PSTR LoadedImageNameBuffer,
+        __in ULONG LoadedImageNameBufferSize,
+        __out_opt PULONG LoadedImageNameSize
+        ) PURE;
+    STDMETHOD(GetModuleParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG64 Bases,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_MODULE_PARAMETERS Params
+        ) PURE;
+    // Looks up the module from a <Module>!<Symbol>
+    // string.
+    STDMETHOD(GetSymbolModule)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG64 Base
+        ) PURE;
+
+    // Returns the string name of a type.
+    STDMETHOD(GetTypeName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    // Returns the ID for a type name.
+    STDMETHOD(GetTypeId)(
+        THIS_
+        __in ULONG64 Module,
+        __in PCSTR Name,
+        __out PULONG TypeId
+        ) PURE;
+    STDMETHOD(GetTypeSize)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out PULONG Size
+        ) PURE;
+    // Given a type which can contain members
+    // this method returns the offset of a
+    // particular member within the type.
+    // TypeId should give the container type ID
+    // and Field gives the dot-separated path
+    // to the field of interest.
+    STDMETHOD(GetFieldOffset)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in PCSTR Field,
+        __out PULONG Offset
+        ) PURE;
+
+    STDMETHOD(GetSymbolTypeId)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+    // As with GetOffsetByName a symbol's
+    // name may be ambiguous.  GetOffsetTypeId
+    // returns the type for the symbol closest
+    // to the given offset and can be used
+    // to avoid ambiguity.
+    STDMETHOD(GetOffsetTypeId)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+
+    // Helpers for virtual and physical data
+    // which combine creation of a location with
+    // the actual operation.
+    STDMETHOD(ReadTypedDataVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteTypedDataVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(OutputTypedDataVirtual)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(ReadTypedDataPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteTypedDataPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(OutputTypedDataPhysical)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG Flags
+        ) PURE;
+
+    // Function arguments and scope block symbols
+    // can be retrieved relative to currently
+    // executing code.  A caller can provide just
+    // a code offset for scoping purposes and look
+    // up names or the caller can provide a full frame
+    // and look up actual values.  The values for
+    // scoped symbols are best-guess and may or may not
+    // be accurate depending on program optimizations,
+    // the machine architecture, the current point
+    // in the programs execution and so on.
+    // A caller can also provide a complete register
+    // context for setting a scope to a previous
+    // machine state such as a context saved for
+    // an exception.  Usually this isnt necessary
+    // and the current register context is used.
+    STDMETHOD(GetScope)(
+        THIS_
+        __out_opt PULONG64 InstructionOffset,
+        __out_opt PDEBUG_STACK_FRAME ScopeFrame,
+        __out_bcount_opt(ScopeContextSize) PVOID ScopeContext,
+        __in ULONG ScopeContextSize
+        ) PURE;
+    // If ScopeFrame or ScopeContext is non-NULL then
+    // InstructionOffset is ignored.
+    // If ScopeContext is NULL the current
+    // register context is used.
+    // If the scope identified by the given
+    // information is the same as before
+    // SetScope returns S_OK.  If the scope
+    // information changes, such as when the
+    // scope moves between functions or scope
+    // blocks, SetScope returns S_FALSE.
+    STDMETHOD(SetScope)(
+        THIS_
+        __in ULONG64 InstructionOffset,
+        __in_opt PDEBUG_STACK_FRAME ScopeFrame,
+        __in_bcount_opt(ScopeContextSize) PVOID ScopeContext,
+        __in ULONG ScopeContextSize
+        ) PURE;
+    // ResetScope clears the scope information
+    // for situations where scoped symbols
+    // mask global symbols or when resetting
+    // from explicit information to the current
+    // information.
+    STDMETHOD(ResetScope)(
+        THIS
+        ) PURE;
+    // A scope symbol is tied to its particular
+    // scope and only is meaningful within the scope.
+    // The returned group can be updated by passing it back
+    // into the method for lower-cost
+    // incremental updates when stepping.
+    STDMETHOD(GetScopeSymbolGroup)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PDEBUG_SYMBOL_GROUP Update,
+        __out PDEBUG_SYMBOL_GROUP* Symbols
+        ) PURE;
+
+    // Create a new symbol group.
+    STDMETHOD(CreateSymbolGroup)(
+        THIS_
+        __out PDEBUG_SYMBOL_GROUP* Group
+        ) PURE;
+
+    // StartSymbolMatch matches symbol names
+    // against the given pattern using simple
+    // regular expressions.  The search results
+    // are iterated through using GetNextSymbolMatch.
+    // When the caller is done examining results
+    // the match should be freed via EndSymbolMatch.
+    // If the match pattern contains a module name
+    // the search is restricted to a single module.
+    // Pattern matching is only done on symbol names,
+    // not module names.
+    // All active symbol match handles are invalidated
+    // when the set of loaded symbols changes.
+    STDMETHOD(StartSymbolMatch)(
+        THIS_
+        __in PCSTR Pattern,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Buffer is NULL the match does not
+    // advance.
+    STDMETHOD(GetNextSymbolMatch)(
+        THIS_
+        __in ULONG64 Handle,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MatchSize,
+        __out_opt PULONG64 Offset
+        ) PURE;
+    STDMETHOD(EndSymbolMatch)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Reload)(
+        THIS_
+        __in PCSTR Module
+        ) PURE;
+
+    STDMETHOD(GetSymbolPath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetSymbolPath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendSymbolPath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+
+    // Manipulate the path for executable images.
+    // Some dump files need to load executable images
+    // in order to resolve dump information.  This
+    // path controls where the engine looks for
+    // images.
+    STDMETHOD(GetImagePath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetImagePath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendImagePath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+
+    // Path routines for source file location
+    // methods.
+    STDMETHOD(GetSourcePath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    // Gets the nth part of the source path.
+    STDMETHOD(GetSourcePathElement)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ElementSize
+        ) PURE;
+    STDMETHOD(SetSourcePath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendSourcePath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+    // Uses the given file path and the source path
+    // information to try and locate an existing file.
+    // The given file path is merged with elements
+    // of the source path and checked for existence.
+    // If a match is found the element used is returned.
+    // A starting element can be specified to restrict
+    // the search to a subset of the path elements;
+    // this can be useful when checking for multiple
+    // matches along the source path.
+    // The returned element can be 1, indicating
+    // the file was found directly and not on the path.
+    STDMETHOD(FindSourceFile)(
+        THIS_
+        __in ULONG StartElement,
+        __in PCSTR File,
+        __in ULONG Flags,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+    // Retrieves all the line offset information
+    // for a particular source file.  Buffer is
+    // first intialized to DEBUG_INVALID_OFFSET for
+    // every entry.  Then for each piece of line
+    // symbol information Buffer[Line] set to
+    // Lines offset.  This produces a per-line
+    // map of the offsets for the lines of the
+    // given file.  Line numbers are decremented
+    // for the map so Buffer[0] contains the offset
+    // for line number 1.
+    // If there is no line information at all for
+    // the given file the method fails rather
+    // than returning a map of invalid offsets.
+    STDMETHOD(GetSourceFileLineOffsets)(
+        THIS_
+        __in PCSTR File,
+        __out_ecount_opt(BufferLines) PULONG64 Buffer,
+        __in ULONG BufferLines,
+        __out_opt PULONG FileLines
+        ) PURE;
+
+    // IDebugSymbols2.
+
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    // Item is specified as in VerQueryValue.
+    // Module version information is only
+    // available for loaded modules and may
+    // not be available in all debug sessions.
+    STDMETHOD(GetModuleVersionInformation)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __in PCSTR Item,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG VerInfoSize
+        ) PURE;
+    // Retrieves any available module name string
+    // such as module name or symbol file name.
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    // If symbols are deferred an error will
+    // be returned.
+    // E_NOINTERFACE may be returned, indicating
+    // no information exists.
+    STDMETHOD(GetModuleNameString)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Returns the string name of a constant type.
+    STDMETHOD(GetConstantName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG64 Value,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Gets name of a field in a struct
+    // FieldNumber is 0 based index of field in a struct
+    STDMETHOD(GetFieldName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG FieldIndex,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Control options for typed values.
+    STDMETHOD(GetTypeOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddTypeOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveTypeOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetTypeOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+};
+
+//
+// GetModuleBy* flags.
+//
+
+// Scan all modules, loaded and unloaded.
+#define DEBUG_GETMOD_DEFAULT             0x00000000
+// Do not scan loaded modules.
+#define DEBUG_GETMOD_NO_LOADED_MODULES   0x00000001
+// Do not scan unloaded modules.
+#define DEBUG_GETMOD_NO_UNLOADED_MODULES 0x00000002
+
+//
+// AddSyntheticModule flags.
+//
+
+#define DEBUG_ADDSYNTHMOD_DEFAULT 0x00000000
+
+//
+// AddSyntheticSymbol flags.
+//
+
+#define DEBUG_ADDSYNTHSYM_DEFAULT 0x00000000
+
+//
+// OutputSymbolByOffset flags.
+//
+
+// Use the current debugger settings for symbol output.
+#define DEBUG_OUTSYM_DEFAULT            0x00000000
+// Always display the offset in addition to any symbol hit.
+#define DEBUG_OUTSYM_FORCE_OFFSET       0x00000001
+// Display source line information if found.
+#define DEBUG_OUTSYM_SOURCE_LINE        0x00000002
+// Output symbol hits that don't exactly match.
+#define DEBUG_OUTSYM_ALLOW_DISPLACEMENT 0x00000004
+
+//
+// GetFunctionEntryByOffset flags.
+//
+
+#define DEBUG_GETFNENT_DEFAULT        0x00000000
+// The engine provides artificial entries for well-known
+// cases.  This flag limits the entry search to only
+// the raw entries and disables artificial entry lookup.
+#define DEBUG_GETFNENT_RAW_ENTRY_ONLY 0x00000001
+
+typedef struct _DEBUG_MODULE_AND_ID
+{
+    ULONG64 ModuleBase;
+    ULONG64 Id;
+} DEBUG_MODULE_AND_ID, *PDEBUG_MODULE_AND_ID;
+
+#define DEBUG_SOURCE_IS_STATEMENT 0x00000001
+
+typedef struct _DEBUG_SYMBOL_SOURCE_ENTRY
+{
+    ULONG64 ModuleBase;
+    ULONG64 Offset;
+    ULONG64 FileNameId;
+    ULONG64 EngineInternal;
+    ULONG Size;
+    ULONG Flags;
+    ULONG FileNameSize;
+    // Line numbers are one-based.
+    // May be DEBUG_ANY_ID if unknown.
+    ULONG StartLine;
+    ULONG EndLine;
+    // Column numbers are one-based byte indices.
+    // May be DEBUG_ANY_ID if unknown.
+    ULONG StartColumn;
+    ULONG EndColumn;
+    ULONG Reserved;
+} DEBUG_SYMBOL_SOURCE_ENTRY, *PDEBUG_SYMBOL_SOURCE_ENTRY;
+
+#undef INTERFACE
+#define INTERFACE IDebugSymbols3
+DECLARE_INTERFACE_(IDebugSymbols3, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSymbols.
+
+    // Controls the symbol options used during
+    // symbol operations.
+    // Uses the same flags as dbghelps SymSetOptions.
+    STDMETHOD(GetSymbolOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetSymbolOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    STDMETHOD(GetNameByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    // A symbol name may not be unique, particularly
+    // when overloaded functions exist which all
+    // have the same name.  If GetOffsetByName
+    // finds multiple matches for the name it
+    // can return any one of them.  In that
+    // case it will return S_FALSE to indicate
+    // that ambiguity was arbitrarily resolved.
+    // A caller can then use SearchSymbols to
+    // find all of the matches if it wishes to
+    // perform different disambiguation.
+    STDMETHOD(GetOffsetByName)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG64 Offset
+        ) PURE;
+    // GetNearNameByOffset returns symbols
+    // located near the symbol closest to
+    // to the offset, such as the previous
+    // or next symbol.  If Delta is zero it
+    // operates identically to GetNameByOffset.
+    // If Delta is nonzero and such a symbol
+    // does not exist an error is returned.
+    // The next symbol, if one exists, will
+    // always have a higher offset than the
+    // input offset so the displacement is
+    // always negative.  The situation is
+    // reversed for the previous symbol.
+    STDMETHOD(GetNearNameByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+
+    STDMETHOD(GetLineByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_opt PULONG Line,
+        __out_ecount_opt(FileBufferSize) PSTR FileBuffer,
+        __in ULONG FileBufferSize,
+        __out_opt PULONG FileSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    STDMETHOD(GetOffsetByLine)(
+        THIS_
+        __in ULONG Line,
+        __in PCSTR File,
+        __out PULONG64 Offset
+        ) PURE;
+
+    // Enumerates the engines list of modules
+    // loaded for the current process.  This may
+    // or may not match the system module list
+    // for the process.  Reload can be used to
+    // synchronize the engines list with the system
+    // if necessary.
+    // Some sessions also track recently unloaded
+    // code modules for help in analyzing failures
+    // where an attempt is made to call unloaded code.
+    // These modules are indexed after the loaded
+    // modules.
+    STDMETHOD(GetNumberModules)(
+        THIS_
+        __out PULONG Loaded,
+        __out PULONG Unloaded
+        ) PURE;
+    STDMETHOD(GetModuleByIndex)(
+        THIS_
+        __in ULONG Index,
+        __out PULONG64 Base
+        ) PURE;
+    // The module name may not be unique.
+    // This method returns the first match.
+    STDMETHOD(GetModuleByModuleName)(
+        THIS_
+        __in PCSTR Name,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // Offset can be any offset within
+    // the module extent.  Extents may
+    // not be unique when including unloaded
+    // drivers.  This method returns the
+    // first match.
+    STDMETHOD(GetModuleByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    STDMETHOD(GetModuleNames)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __out_ecount_opt(ImageNameBufferSize) PSTR ImageNameBuffer,
+        __in ULONG ImageNameBufferSize,
+        __out_opt PULONG ImageNameSize,
+        __out_ecount_opt(ModuleNameBufferSize) PSTR ModuleNameBuffer,
+        __in ULONG ModuleNameBufferSize,
+        __out_opt PULONG ModuleNameSize,
+        __out_ecount_opt(LoadedImageNameBufferSize) PSTR LoadedImageNameBuffer,
+        __in ULONG LoadedImageNameBufferSize,
+        __out_opt PULONG LoadedImageNameSize
+        ) PURE;
+    STDMETHOD(GetModuleParameters)(
+        THIS_
+        __in ULONG Count,
+        __in_ecount_opt(Count) PULONG64 Bases,
+        __in ULONG Start,
+        __out_ecount(Count) PDEBUG_MODULE_PARAMETERS Params
+        ) PURE;
+    // Looks up the module from a <Module>!<Symbol>
+    // string.
+    STDMETHOD(GetSymbolModule)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG64 Base
+        ) PURE;
+
+    // Returns the string name of a type.
+    STDMETHOD(GetTypeName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    // Returns the ID for a type name.
+    STDMETHOD(GetTypeId)(
+        THIS_
+        __in ULONG64 Module,
+        __in PCSTR Name,
+        __out PULONG TypeId
+        ) PURE;
+    STDMETHOD(GetTypeSize)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out PULONG Size
+        ) PURE;
+    // Given a type which can contain members
+    // this method returns the offset of a
+    // particular member within the type.
+    // TypeId should give the container type ID
+    // and Field gives the dot-separated path
+    // to the field of interest.
+    STDMETHOD(GetFieldOffset)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in PCSTR Field,
+        __out PULONG Offset
+        ) PURE;
+
+    STDMETHOD(GetSymbolTypeId)(
+        THIS_
+        __in PCSTR Symbol,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+    // As with GetOffsetByName a symbol's
+    // name may be ambiguous.  GetOffsetTypeId
+    // returns the type for the symbol closest
+    // to the given offset and can be used
+    // to avoid ambiguity.
+    STDMETHOD(GetOffsetTypeId)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+
+    // Helpers for virtual and physical data
+    // which combine creation of a location with
+    // the actual operation.
+    STDMETHOD(ReadTypedDataVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteTypedDataVirtual)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(OutputTypedDataVirtual)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(ReadTypedDataPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesRead
+        ) PURE;
+    STDMETHOD(WriteTypedDataPhysical)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in_bcount(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BytesWritten
+        ) PURE;
+    STDMETHOD(OutputTypedDataPhysical)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 Offset,
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG Flags
+        ) PURE;
+
+    // Function arguments and scope block symbols
+    // can be retrieved relative to currently
+    // executing code.  A caller can provide just
+    // a code offset for scoping purposes and look
+    // up names or the caller can provide a full frame
+    // and look up actual values.  The values for
+    // scoped symbols are best-guess and may or may not
+    // be accurate depending on program optimizations,
+    // the machine architecture, the current point
+    // in the programs execution and so on.
+    // A caller can also provide a complete register
+    // context for setting a scope to a previous
+    // machine state such as a context saved for
+    // an exception.  Usually this isnt necessary
+    // and the current register context is used.
+    STDMETHOD(GetScope)(
+        THIS_
+        __out_opt PULONG64 InstructionOffset,
+        __out_opt PDEBUG_STACK_FRAME ScopeFrame,
+        __out_bcount_opt(ScopeContextSize) PVOID ScopeContext,
+        __in ULONG ScopeContextSize
+        ) PURE;
+    // If ScopeFrame or ScopeContext is non-NULL then
+    // InstructionOffset is ignored.
+    // If ScopeContext is NULL the current
+    // register context is used.
+    // If the scope identified by the given
+    // information is the same as before
+    // SetScope returns S_OK.  If the scope
+    // information changes, such as when the
+    // scope moves between functions or scope
+    // blocks, SetScope returns S_FALSE.
+    STDMETHOD(SetScope)(
+        THIS_
+        __in ULONG64 InstructionOffset,
+        __in_opt PDEBUG_STACK_FRAME ScopeFrame,
+        __in_bcount_opt(ScopeContextSize) PVOID ScopeContext,
+        __in ULONG ScopeContextSize
+        ) PURE;
+    // ResetScope clears the scope information
+    // for situations where scoped symbols
+    // mask global symbols or when resetting
+    // from explicit information to the current
+    // information.
+    STDMETHOD(ResetScope)(
+        THIS
+        ) PURE;
+    // A scope symbol is tied to its particular
+    // scope and only is meaningful within the scope.
+    // The returned group can be updated by passing it back
+    // into the method for lower-cost
+    // incremental updates when stepping.
+    STDMETHOD(GetScopeSymbolGroup)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PDEBUG_SYMBOL_GROUP Update,
+        __out PDEBUG_SYMBOL_GROUP* Symbols
+        ) PURE;
+
+    // Create a new symbol group.
+    STDMETHOD(CreateSymbolGroup)(
+        THIS_
+        __out PDEBUG_SYMBOL_GROUP* Group
+        ) PURE;
+
+    // StartSymbolMatch matches symbol names
+    // against the given pattern using simple
+    // regular expressions.  The search results
+    // are iterated through using GetNextSymbolMatch.
+    // When the caller is done examining results
+    // the match should be freed via EndSymbolMatch.
+    // If the match pattern contains a module name
+    // the search is restricted to a single module.
+    // Pattern matching is only done on symbol names,
+    // not module names.
+    // All active symbol match handles are invalidated
+    // when the set of loaded symbols changes.
+    STDMETHOD(StartSymbolMatch)(
+        THIS_
+        __in PCSTR Pattern,
+        __out PULONG64 Handle
+        ) PURE;
+    // If Buffer is NULL the match does not
+    // advance.
+    STDMETHOD(GetNextSymbolMatch)(
+        THIS_
+        __in ULONG64 Handle,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MatchSize,
+        __out_opt PULONG64 Offset
+        ) PURE;
+    STDMETHOD(EndSymbolMatch)(
+        THIS_
+        __in ULONG64 Handle
+        ) PURE;
+
+    STDMETHOD(Reload)(
+        THIS_
+        __in PCSTR Module
+        ) PURE;
+
+    STDMETHOD(GetSymbolPath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetSymbolPath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendSymbolPath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+
+    // Manipulate the path for executable images.
+    // Some dump files need to load executable images
+    // in order to resolve dump information.  This
+    // path controls where the engine looks for
+    // images.
+    STDMETHOD(GetImagePath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetImagePath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendImagePath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+
+    // Path routines for source file location
+    // methods.
+    STDMETHOD(GetSourcePath)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    // Gets the nth part of the source path.
+    STDMETHOD(GetSourcePathElement)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ElementSize
+        ) PURE;
+    STDMETHOD(SetSourcePath)(
+        THIS_
+        __in PCSTR Path
+        ) PURE;
+    STDMETHOD(AppendSourcePath)(
+        THIS_
+        __in PCSTR Addition
+        ) PURE;
+    // Uses the given file path and the source path
+    // information to try and locate an existing file.
+    // The given file path is merged with elements
+    // of the source path and checked for existence.
+    // If a match is found the element used is returned.
+    // A starting element can be specified to restrict
+    // the search to a subset of the path elements;
+    // this can be useful when checking for multiple
+    // matches along the source path.
+    // The returned element can be 1, indicating
+    // the file was found directly and not on the path.
+    STDMETHOD(FindSourceFile)(
+        THIS_
+        __in ULONG StartElement,
+        __in PCSTR File,
+        __in ULONG Flags,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+    // Retrieves all the line offset information
+    // for a particular source file.  Buffer is
+    // first intialized to DEBUG_INVALID_OFFSET for
+    // every entry.  Then for each piece of line
+    // symbol information Buffer[Line] set to
+    // Lines offset.  This produces a per-line
+    // map of the offsets for the lines of the
+    // given file.  Line numbers are decremented
+    // for the map so Buffer[0] contains the offset
+    // for line number 1.
+    // If there is no line information at all for
+    // the given file the method fails rather
+    // than returning a map of invalid offsets.
+    STDMETHOD(GetSourceFileLineOffsets)(
+        THIS_
+        __in PCSTR File,
+        __out_ecount_opt(BufferLines) PULONG64 Buffer,
+        __in ULONG BufferLines,
+        __out_opt PULONG FileLines
+        ) PURE;
+
+    // IDebugSymbols2.
+
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    // Item is specified as in VerQueryValue.
+    // Module version information is only
+    // available for loaded modules and may
+    // not be available in all debug sessions.
+    STDMETHOD(GetModuleVersionInformation)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __in PCSTR Item,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG VerInfoSize
+        ) PURE;
+    // Retrieves any available module name string
+    // such as module name or symbol file name.
+    // If Index is DEBUG_ANY_ID the base address
+    // is used to look up the module instead.
+    // If symbols are deferred an error will
+    // be returned.
+    // E_NOINTERFACE may be returned, indicating
+    // no information exists.
+    STDMETHOD(GetModuleNameString)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Returns the string name of a constant type.
+    STDMETHOD(GetConstantName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG64 Value,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Gets name of a field in a struct
+    // FieldNumber is 0 based index of field in a struct
+    STDMETHOD(GetFieldName)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG FieldIndex,
+        __out_ecount_opt(NameBufferSize) PSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Control options for typed values.
+    STDMETHOD(GetTypeOptions)(
+        THIS_
+        __out PULONG Options
+        ) PURE;
+    STDMETHOD(AddTypeOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(RemoveTypeOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+    STDMETHOD(SetTypeOptions)(
+        THIS_
+        __in ULONG Options
+        ) PURE;
+
+    // IDebugSymbols3.
+
+    STDMETHOD(GetNameByOffsetWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    STDMETHOD(GetOffsetByNameWide)(
+        THIS_
+        __in PCWSTR Symbol,
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetNearNameByOffsetWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __in LONG Delta,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+
+    STDMETHOD(GetLineByOffsetWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __out_opt PULONG Line,
+        __out_ecount_opt(FileBufferSize) PWSTR FileBuffer,
+        __in ULONG FileBufferSize,
+        __out_opt PULONG FileSize,
+        __out_opt PULONG64 Displacement
+        ) PURE;
+    STDMETHOD(GetOffsetByLineWide)(
+        THIS_
+        __in ULONG Line,
+        __in PCWSTR File,
+        __out PULONG64 Offset
+        ) PURE;
+
+    STDMETHOD(GetModuleByModuleNameWide)(
+        THIS_
+        __in PCWSTR Name,
+        __in ULONG StartIndex,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    STDMETHOD(GetSymbolModuleWide)(
+        THIS_
+        __in PCWSTR Symbol,
+        __out PULONG64 Base
+        ) PURE;
+
+    STDMETHOD(GetTypeNameWide)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+    // Returns the ID for a type name.
+    STDMETHOD(GetTypeIdWide)(
+        THIS_
+        __in ULONG64 Module,
+        __in PCWSTR Name,
+        __out PULONG TypeId
+        ) PURE;
+    STDMETHOD(GetFieldOffsetWide)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in PCWSTR Field,
+        __out PULONG Offset
+        ) PURE;
+
+    STDMETHOD(GetSymbolTypeIdWide)(
+        THIS_
+        __in PCWSTR Symbol,
+        __out PULONG TypeId,
+        __out_opt PULONG64 Module
+        ) PURE;
+
+    STDMETHOD(GetScopeSymbolGroup2)(
+        THIS_
+        __in ULONG Flags,
+        __in_opt PDEBUG_SYMBOL_GROUP2 Update,
+        __out PDEBUG_SYMBOL_GROUP2* Symbols
+        ) PURE;
+
+    STDMETHOD(CreateSymbolGroup2)(
+        THIS_
+        __out PDEBUG_SYMBOL_GROUP2* Group
+        ) PURE;
+
+    STDMETHOD(StartSymbolMatchWide)(
+        THIS_
+        __in PCWSTR Pattern,
+        __out PULONG64 Handle
+        ) PURE;
+    STDMETHOD(GetNextSymbolMatchWide)(
+        THIS_
+        __in ULONG64 Handle,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG MatchSize,
+        __out_opt PULONG64 Offset
+        ) PURE;
+
+    STDMETHOD(ReloadWide)(
+        THIS_
+        __in PCWSTR Module
+        ) PURE;
+
+    STDMETHOD(GetSymbolPathWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetSymbolPathWide)(
+        THIS_
+        __in PCWSTR Path
+        ) PURE;
+    STDMETHOD(AppendSymbolPathWide)(
+        THIS_
+        __in PCWSTR Addition
+        ) PURE;
+
+    STDMETHOD(GetImagePathWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(SetImagePathWide)(
+        THIS_
+        __in PCWSTR Path
+        ) PURE;
+    STDMETHOD(AppendImagePathWide)(
+        THIS_
+        __in PCWSTR Addition
+        ) PURE;
+
+    STDMETHOD(GetSourcePathWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG PathSize
+        ) PURE;
+    STDMETHOD(GetSourcePathElementWide)(
+        THIS_
+        __in ULONG Index,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ElementSize
+        ) PURE;
+    STDMETHOD(SetSourcePathWide)(
+        THIS_
+        __in PCWSTR Path
+        ) PURE;
+    STDMETHOD(AppendSourcePathWide)(
+        THIS_
+        __in PCWSTR Addition
+        ) PURE;
+    STDMETHOD(FindSourceFileWide)(
+        THIS_
+        __in ULONG StartElement,
+        __in PCWSTR File,
+        __in ULONG Flags,
+        __out_opt PULONG FoundElement,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG FoundSize
+        ) PURE;
+    STDMETHOD(GetSourceFileLineOffsetsWide)(
+        THIS_
+        __in PCWSTR File,
+        __out_ecount_opt(BufferLines) PULONG64 Buffer,
+        __in ULONG BufferLines,
+        __out_opt PULONG FileLines
+        ) PURE;
+
+    STDMETHOD(GetModuleVersionInformationWide)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __in PCWSTR Item,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG VerInfoSize
+        ) PURE;
+    STDMETHOD(GetModuleNameStringWide)(
+        THIS_
+        __in ULONG Which,
+        __in ULONG Index,
+        __in ULONG64 Base,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    STDMETHOD(GetConstantNameWide)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG64 Value,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    STDMETHOD(GetFieldNameWide)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG TypeId,
+        __in ULONG FieldIndex,
+        __out_ecount_opt(NameBufferSize) PWSTR NameBuffer,
+        __in ULONG NameBufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // Returns S_OK if the engine is using managed
+    // debugging support when retriving information
+    // for the given module.  This can be expensive
+    // to check.
+    STDMETHOD(IsManagedModule)(
+        THIS_
+        __in ULONG Index,
+        __in ULONG64 Base
+        ) PURE;
+
+    // The module name may not be unique.
+    // This method returns the first match.
+    STDMETHOD(GetModuleByModuleName2)(
+        THIS_
+        __in PCSTR Name,
+        __in ULONG StartIndex,
+        __in ULONG Flags,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    STDMETHOD(GetModuleByModuleName2Wide)(
+        THIS_
+        __in PCWSTR Name,
+        __in ULONG StartIndex,
+        __in ULONG Flags,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+    // Offset can be any offset within
+    // the module extent.  Extents may
+    // not be unique when including unloaded
+    // drivers.  This method returns the
+    // first match.
+    STDMETHOD(GetModuleByOffset2)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG StartIndex,
+        __in ULONG Flags,
+        __out_opt PULONG Index,
+        __out_opt PULONG64 Base
+        ) PURE;
+
+    // A caller can create artificial loaded modules in
+    // the engine's module list if desired.
+    // These modules only serve as names for
+    // a region of addresses.  They cannot have
+    // real symbols loaded for them; if that
+    // is desired Reload can be used with explicit
+    // parameters to create a true module entry.
+    // The region must not be in use by any other
+    // module.
+    // A general reload will discard any synthetic modules.
+    STDMETHOD(AddSyntheticModule)(
+        THIS_
+        __in ULONG64 Base,
+        __in ULONG Size,
+        __in PCSTR ImagePath,
+        __in PCSTR ModuleName,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(AddSyntheticModuleWide)(
+        THIS_
+        __in ULONG64 Base,
+        __in ULONG Size,
+        __in PCWSTR ImagePath,
+        __in PCWSTR ModuleName,
+        __in ULONG Flags
+        ) PURE;
+    STDMETHOD(RemoveSyntheticModule)(
+        THIS_
+        __in ULONG64 Base
+        ) PURE;
+
+    // Modify the current frame used for scoping.
+    // This is equivalent to the '.frame' command.
+    STDMETHOD(GetCurrentScopeFrameIndex)(
+        THIS_
+        __out PULONG Index
+        ) PURE;
+    STDMETHOD(SetScopeFrameByIndex)(
+        THIS_
+        __in ULONG Index
+        ) PURE;
+
+    // Recovers JIT_DEBUG_INFO information at the given
+    // address from the debuggee and sets current
+    // debugger scope context from it.
+    // Equivalent to '.jdinfo' command.
+    STDMETHOD(SetScopeFromJitDebugInfo)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG64 InfoOffset
+        ) PURE;
+
+    // Switches the current debugger scope to
+    // the stored event information.
+    // Equivalent to the '.ecxr' command.
+    STDMETHOD(SetScopeFromStoredEvent)(
+        THIS
+        ) PURE;
+
+    // Takes the first symbol hit and outputs it.
+    // Controlled with DEBUG_OUTSYM_* flags.
+    STDMETHOD(OutputSymbolByOffset)(
+        THIS_
+        __in ULONG OutputControl,
+        __in ULONG Flags,
+        __in ULONG64 Offset
+        ) PURE;
+
+    // Function entry information for a particular
+    // piece of code can be retrieved by this method.
+    // The actual data returned is system-dependent.
+    STDMETHOD(GetFunctionEntryByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_bcount_opt(BufferSize) PVOID Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG BufferNeeded
+        ) PURE;
+
+    // Given a type which can contain members
+    // this method returns the type ID and offset of a
+    // particular member within the type.
+    // Field gives the dot-separated path
+    // to the field of interest.
+    STDMETHOD(GetFieldTypeAndOffset)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG ContainerTypeId,
+        __in PCSTR Field,
+        __out_opt PULONG FieldTypeId,
+        __out_opt PULONG Offset
+        ) PURE;
+    STDMETHOD(GetFieldTypeAndOffsetWide)(
+        THIS_
+        __in ULONG64 Module,
+        __in ULONG ContainerTypeId,
+        __in PCWSTR Field,
+        __out_opt PULONG FieldTypeId,
+        __out_opt PULONG Offset
+        ) PURE;
+
+    // Artificial symbols can be created in any
+    // existing module as a way to name an address.
+    // The address must not already have symbol
+    // information.
+    // A reload will discard synthetic symbols
+    // for all address regions reloaded.
+    STDMETHOD(AddSyntheticSymbol)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Size,
+        __in PCSTR Name,
+        __in ULONG Flags,
+        __out_opt PDEBUG_MODULE_AND_ID Id
+        ) PURE;
+    STDMETHOD(AddSyntheticSymbolWide)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Size,
+        __in PCWSTR Name,
+        __in ULONG Flags,
+        __out_opt PDEBUG_MODULE_AND_ID Id
+        ) PURE;
+    STDMETHOD(RemoveSyntheticSymbol)(
+        THIS_
+        __in PDEBUG_MODULE_AND_ID Id
+        ) PURE;
+
+    // The following methods can return multiple
+    // hits for symbol lookups to allow for all
+    // possible hits to be returned.
+    STDMETHOD(GetSymbolEntriesByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(IdsCount) PDEBUG_MODULE_AND_ID Ids,
+        __out_ecount_opt(IdsCount) PULONG64 Displacements,
+        __in ULONG IdsCount,
+        __out_opt PULONG Entries
+        ) PURE;
+    STDMETHOD(GetSymbolEntriesByName)(
+        THIS_
+        __in PCSTR Symbol,
+        __in ULONG Flags,
+        __out_ecount_opt(IdsCount) PDEBUG_MODULE_AND_ID Ids,
+        __in ULONG IdsCount,
+        __out_opt PULONG Entries
+        ) PURE;
+    STDMETHOD(GetSymbolEntriesByNameWide)(
+        THIS_
+        __in PCWSTR Symbol,
+        __in ULONG Flags,
+        __out_ecount_opt(IdsCount) PDEBUG_MODULE_AND_ID Ids,
+        __in ULONG IdsCount,
+        __out_opt PULONG Entries
+        ) PURE;
+    // Symbol lookup by managed metadata token.
+    STDMETHOD(GetSymbolEntryByToken)(
+        THIS_
+        __in ULONG64 ModuleBase,
+        __in ULONG Token,
+        __out PDEBUG_MODULE_AND_ID Id
+        ) PURE;
+
+    // Retrieves full symbol entry information from an ID.
+    STDMETHOD(GetSymbolEntryInformation)(
+        THIS_
+        __in PDEBUG_MODULE_AND_ID Id,
+        __out PDEBUG_SYMBOL_ENTRY Info
+        ) PURE;
+    STDMETHOD(GetSymbolEntryString)(
+        THIS_
+        __in PDEBUG_MODULE_AND_ID Id,
+        __in ULONG Which,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    STDMETHOD(GetSymbolEntryStringWide)(
+        THIS_
+        __in PDEBUG_MODULE_AND_ID Id,
+        __in ULONG Which,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    // Returns all known memory regions associated
+    // with the given symbol.  Simple symbols will
+    // have a single region starting from their base.
+    // More complicated regions, such as functions
+    // with multiple code areas, can have an arbitrarily
+    // large number of regions.
+    // The quality of information returned is highly
+    // dependent on the symbolic information availble.
+    STDMETHOD(GetSymbolEntryOffsetRegions)(
+        THIS_
+        __in PDEBUG_MODULE_AND_ID Id,
+        __in ULONG Flags,
+        __out_ecount_opt(RegionsCount) PDEBUG_OFFSET_REGION Regions,
+        __in ULONG RegionsCount,
+        __out_opt PULONG RegionsAvail
+        ) PURE;
+
+    // This method allows navigating within the
+    // symbol entry hierarchy.
+    STDMETHOD(GetSymbolEntryBySymbolEntry)(
+        THIS_
+        __in PDEBUG_MODULE_AND_ID FromId,
+        __in ULONG Flags,
+        __out PDEBUG_MODULE_AND_ID ToId
+        ) PURE;
+
+    // The following methods can return multiple
+    // hits for source lookups to allow for all
+    // possible hits to be returned.
+    STDMETHOD(GetSourceEntriesByOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __in ULONG Flags,
+        __out_ecount_opt(EntriesCount) PDEBUG_SYMBOL_SOURCE_ENTRY Entries,
+        __in ULONG EntriesCount,
+        __out_opt PULONG EntriesAvail
+        ) PURE;
+    STDMETHOD(GetSourceEntriesByLine)(
+        THIS_
+        __in ULONG Line,
+        __in PCSTR File,
+        __in ULONG Flags,
+        __out_ecount_opt(EntriesCount) PDEBUG_SYMBOL_SOURCE_ENTRY Entries,
+        __in ULONG EntriesCount,
+        __out_opt PULONG EntriesAvail
+        ) PURE;
+    STDMETHOD(GetSourceEntriesByLineWide)(
+        THIS_
+        __in ULONG Line,
+        __in PCWSTR File,
+        __in ULONG Flags,
+        __out_ecount_opt(EntriesCount) PDEBUG_SYMBOL_SOURCE_ENTRY Entries,
+        __in ULONG EntriesCount,
+        __out_opt PULONG EntriesAvail
+        ) PURE;
+
+    STDMETHOD(GetSourceEntryString)(
+        THIS_
+        __in PDEBUG_SYMBOL_SOURCE_ENTRY Entry,
+        __in ULONG Which,
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    STDMETHOD(GetSourceEntryStringWide)(
+        THIS_
+        __in PDEBUG_SYMBOL_SOURCE_ENTRY Entry,
+        __in ULONG Which,
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG StringSize
+        ) PURE;
+    // Returns all known memory regions associated
+    // with the given source entry.  As with
+    // GetSymbolEntryOffsetRegions the regions available
+    // are variable.
+    STDMETHOD(GetSourceEntryOffsetRegions)(
+        THIS_
+        __in PDEBUG_SYMBOL_SOURCE_ENTRY Entry,
+        __in ULONG Flags,
+        __out_ecount_opt(RegionsCount) PDEBUG_OFFSET_REGION Regions,
+        __in ULONG RegionsCount,
+        __out_opt PULONG RegionsAvail
+        ) PURE;
+
+    // This method allows navigating within the
+    // source entries.
+    STDMETHOD(GetSourceEntryBySourceEntry)(
+        THIS_
+        __in PDEBUG_SYMBOL_SOURCE_ENTRY FromEntry,
+        __in ULONG Flags,
+        __out PDEBUG_SYMBOL_SOURCE_ENTRY ToEntry
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// IDebugSystemObjects
+//
+//----------------------------------------------------------------------------
+
+#undef INTERFACE
+#define INTERFACE IDebugSystemObjects
+DECLARE_INTERFACE_(IDebugSystemObjects, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSystemObjects.
+
+    // In user mode debugging the debugger
+    // tracks all threads and processes and
+    // enumerates them through the following
+    // methods.  When enumerating threads
+    // the threads are enumerated for the current
+    // process.
+    // Kernel mode debugging currently is
+    // limited to enumerating only the threads
+    // assigned to processors, not all of
+    // the threads in the system.  Process
+    // enumeration is limited to a single
+    // virtual process representing kernel space.
+
+    // Returns the ID of the thread on which
+    // the last event occurred.
+    STDMETHOD(GetEventThread)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetEventProcess)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+
+    // Controls implicit thread used by the
+    // debug engine.  The debuggers current
+    // thread is just a piece of data held
+    // by the debugger for calls which use
+    // thread-specific information.  In those
+    // calls the debuggers current thread is used.
+    // The debuggers current thread is not related
+    // to any system thread attribute.
+    // IDs for threads are small integer IDs
+    // maintained by the engine.  They are not
+    // related to system thread IDs.
+    STDMETHOD(GetCurrentThreadId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetCurrentThreadId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+    // The current process is the process
+    // that owns the current thread.
+    STDMETHOD(GetCurrentProcessId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    // Setting the current process automatically
+    // sets the current thread to the thread that
+    // was last current in that process.
+    STDMETHOD(SetCurrentProcessId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+
+    // Gets the number of threads in the current process.
+    STDMETHOD(GetNumberThreads)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // Gets thread count information for all processes
+    // and the largest number of threads in a single process.
+    STDMETHOD(GetTotalNumberThreads)(
+        THIS_
+        __out PULONG Total,
+        __out PULONG LargestProcess
+        ) PURE;
+    STDMETHOD(GetThreadIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Gets the debugger ID for the thread
+    // currently running on the given
+    // processor.  Only works in kernel
+    // debugging.
+    STDMETHOD(GetThreadIdByProcessor)(
+        THIS_
+        __in ULONG Processor,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // system data structure.  When kernel debugging
+    // this is the offset of the KTHREAD.
+    // When user debugging it is the offset
+    // of the current TEB.
+    STDMETHOD(GetCurrentThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread data structure.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // TEB.  In user mode this is equivalent to
+    // the threads data offset.
+    STDMETHOD(GetCurrentThreadTeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given TEB.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByTeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current thread.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentThreadSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread ID.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current thread.
+    // In kernel mode the value returned is the
+    // index of the processor the thread is
+    // executing on plus one.
+    STDMETHOD(GetCurrentThreadHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger thread ID for the given handle.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+
+    // Currently kernel mode sessions will only have
+    // a single process representing kernel space.
+    STDMETHOD(GetNumberProcesses)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetProcessIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Returns the offset of the current processs
+    // system data structure.  When kernel debugging
+    // this is the offset of the KPROCESS of
+    // the process that owns the current thread.
+    // When user debugging it is the offset
+    // of the current PEB.
+    STDMETHOD(GetCurrentProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process data structure.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current processs
+    // PEB.  In user mode this is equivalent to
+    // the processs data offset.
+    STDMETHOD(GetCurrentProcessPeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given PEB.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByPeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current process.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentProcessSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process ID.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current process.
+    // In kernel mode this is the kernel processs
+    // artificial handle used for symbol operations
+    // and so can only be used with dbghelp APIs.
+    STDMETHOD(GetCurrentProcessHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger process ID for the given handle.
+    STDMETHOD(GetProcessIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+    // Retrieve the name of the executable loaded
+    // in the process.  This may fail if no executable
+    // was identified.
+    STDMETHOD(GetCurrentProcessExecutableName)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExeSize
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugSystemObjects2
+DECLARE_INTERFACE_(IDebugSystemObjects2, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSystemObjects.
+
+    // In user mode debugging the debugger
+    // tracks all threads and processes and
+    // enumerates them through the following
+    // methods.  When enumerating threads
+    // the threads are enumerated for the current
+    // process.
+    // Kernel mode debugging currently is
+    // limited to enumerating only the threads
+    // assigned to processors, not all of
+    // the threads in the system.  Process
+    // enumeration is limited to a single
+    // virtual process representing kernel space.
+
+    // Returns the ID of the thread on which
+    // the last event occurred.
+    STDMETHOD(GetEventThread)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetEventProcess)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+
+    // Controls implicit thread used by the
+    // debug engine.  The debuggers current
+    // thread is just a piece of data held
+    // by the debugger for calls which use
+    // thread-specific information.  In those
+    // calls the debuggers current thread is used.
+    // The debuggers current thread is not related
+    // to any system thread attribute.
+    // IDs for threads are small integer IDs
+    // maintained by the engine.  They are not
+    // related to system thread IDs.
+    STDMETHOD(GetCurrentThreadId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetCurrentThreadId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+    // The current process is the process
+    // that owns the current thread.
+    STDMETHOD(GetCurrentProcessId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    // Setting the current process automatically
+    // sets the current thread to the thread that
+    // was last current in that process.
+    STDMETHOD(SetCurrentProcessId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+
+    // Gets the number of threads in the current process.
+    STDMETHOD(GetNumberThreads)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // Gets thread count information for all processes
+    // and the largest number of threads in a single process.
+    STDMETHOD(GetTotalNumberThreads)(
+        THIS_
+        __out PULONG Total,
+        __out PULONG LargestProcess
+        ) PURE;
+    STDMETHOD(GetThreadIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Gets the debugger ID for the thread
+    // currently running on the given
+    // processor.  Only works in kernel
+    // debugging.
+    STDMETHOD(GetThreadIdByProcessor)(
+        THIS_
+        __in ULONG Processor,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // system data structure.  When kernel debugging
+    // this is the offset of the KTHREAD.
+    // When user debugging it is the offset
+    // of the current TEB.
+    STDMETHOD(GetCurrentThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread data structure.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // TEB.  In user mode this is equivalent to
+    // the threads data offset.
+    STDMETHOD(GetCurrentThreadTeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given TEB.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByTeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current thread.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentThreadSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread ID.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current thread.
+    // In kernel mode the value returned is the
+    // index of the processor the thread is
+    // executing on plus one.
+    STDMETHOD(GetCurrentThreadHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger thread ID for the given handle.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+
+    // Currently kernel mode sessions will only have
+    // a single process representing kernel space.
+    STDMETHOD(GetNumberProcesses)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetProcessIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Returns the offset of the current processs
+    // system data structure.  When kernel debugging
+    // this is the offset of the KPROCESS of
+    // the process that owns the current thread.
+    // When user debugging it is the offset
+    // of the current PEB.
+    STDMETHOD(GetCurrentProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process data structure.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current processs
+    // PEB.  In user mode this is equivalent to
+    // the processs data offset.
+    STDMETHOD(GetCurrentProcessPeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given PEB.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByPeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current process.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentProcessSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process ID.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current process.
+    // In kernel mode this is the kernel processs
+    // artificial handle used for symbol operations
+    // and so can only be used with dbghelp APIs.
+    STDMETHOD(GetCurrentProcessHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger process ID for the given handle.
+    STDMETHOD(GetProcessIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+    // Retrieve the name of the executable loaded
+    // in the process.  This may fail if no executable
+    // was identified.
+    STDMETHOD(GetCurrentProcessExecutableName)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExeSize
+        ) PURE;
+
+    // IDebugSystemObjects2.
+
+    // Return the number of seconds that the current
+    // process has been running.
+    STDMETHOD(GetCurrentProcessUpTime)(
+        THIS_
+        __out PULONG UpTime
+        ) PURE;
+
+    // During kernel sessions the debugger retrieves
+    // some information from the system thread and process
+    // running on the current processor.  For example,
+    // the debugger will retrieve virtual memory translation
+    // information for when the debugger needs to
+    // carry out its own virtual to physical translations.
+    // Occasionally it can be interesting to perform
+    // similar operations but on a process which isnt
+    // currently running.  The follow methods allow a caller
+    // to override the data offsets used by the debugger
+    // so that other system threads and processes can
+    // be used instead.  These values are defaulted to
+    // the thread and process running on the current
+    // processor each time the debuggee executes or
+    // the current processor changes.
+    // The thread and process settings are independent so
+    // it is possible to refer to a thread in a process
+    // other than the current process and vice versa.
+    // Setting an offset of zero will reload the
+    // default value.
+    STDMETHOD(GetImplicitThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetImplicitThreadDataOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetImplicitProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetImplicitProcessDataOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugSystemObjects3
+DECLARE_INTERFACE_(IDebugSystemObjects3, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSystemObjects.
+
+    // In user mode debugging the debugger
+    // tracks all threads and processes and
+    // enumerates them through the following
+    // methods.  When enumerating threads
+    // the threads are enumerated for the current
+    // process.
+    // Kernel mode debugging currently is
+    // limited to enumerating only the threads
+    // assigned to processors, not all of
+    // the threads in the system.  Process
+    // enumeration is limited to a single
+    // virtual process representing kernel space.
+
+    // Returns the ID of the thread on which
+    // the last event occurred.
+    STDMETHOD(GetEventThread)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetEventProcess)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+
+    // Controls implicit thread used by the
+    // debug engine.  The debuggers current
+    // thread is just a piece of data held
+    // by the debugger for calls which use
+    // thread-specific information.  In those
+    // calls the debuggers current thread is used.
+    // The debuggers current thread is not related
+    // to any system thread attribute.
+    // IDs for threads are small integer IDs
+    // maintained by the engine.  They are not
+    // related to system thread IDs.
+    STDMETHOD(GetCurrentThreadId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetCurrentThreadId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+    // The current process is the process
+    // that owns the current thread.
+    STDMETHOD(GetCurrentProcessId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    // Setting the current process automatically
+    // sets the current thread to the thread that
+    // was last current in that process.
+    STDMETHOD(SetCurrentProcessId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+
+    // Gets the number of threads in the current process.
+    STDMETHOD(GetNumberThreads)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // Gets thread count information for all processes
+    // and the largest number of threads in a single process.
+    STDMETHOD(GetTotalNumberThreads)(
+        THIS_
+        __out PULONG Total,
+        __out PULONG LargestProcess
+        ) PURE;
+    STDMETHOD(GetThreadIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Gets the debugger ID for the thread
+    // currently running on the given
+    // processor.  Only works in kernel
+    // debugging.
+    STDMETHOD(GetThreadIdByProcessor)(
+        THIS_
+        __in ULONG Processor,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // system data structure.  When kernel debugging
+    // this is the offset of the KTHREAD.
+    // When user debugging it is the offset
+    // of the current TEB.
+    STDMETHOD(GetCurrentThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread data structure.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // TEB.  In user mode this is equivalent to
+    // the threads data offset.
+    STDMETHOD(GetCurrentThreadTeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given TEB.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByTeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current thread.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentThreadSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread ID.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current thread.
+    // In kernel mode the value returned is the
+    // index of the processor the thread is
+    // executing on plus one.
+    STDMETHOD(GetCurrentThreadHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger thread ID for the given handle.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+
+    // Currently kernel mode sessions will only have
+    // a single process representing kernel space.
+    STDMETHOD(GetNumberProcesses)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetProcessIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Returns the offset of the current processs
+    // system data structure.  When kernel debugging
+    // this is the offset of the KPROCESS of
+    // the process that owns the current thread.
+    // When user debugging it is the offset
+    // of the current PEB.
+    STDMETHOD(GetCurrentProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process data structure.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current processs
+    // PEB.  In user mode this is equivalent to
+    // the processs data offset.
+    STDMETHOD(GetCurrentProcessPeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given PEB.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByPeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current process.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentProcessSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process ID.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current process.
+    // In kernel mode this is the kernel processs
+    // artificial handle used for symbol operations
+    // and so can only be used with dbghelp APIs.
+    STDMETHOD(GetCurrentProcessHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger process ID for the given handle.
+    STDMETHOD(GetProcessIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+    // Retrieve the name of the executable loaded
+    // in the process.  This may fail if no executable
+    // was identified.
+    STDMETHOD(GetCurrentProcessExecutableName)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExeSize
+        ) PURE;
+
+    // IDebugSystemObjects2.
+
+    // Return the number of seconds that the current
+    // process has been running.
+    STDMETHOD(GetCurrentProcessUpTime)(
+        THIS_
+        __out PULONG UpTime
+        ) PURE;
+
+    // During kernel sessions the debugger retrieves
+    // some information from the system thread and process
+    // running on the current processor.  For example,
+    // the debugger will retrieve virtual memory translation
+    // information for when the debugger needs to
+    // carry out its own virtual to physical translations.
+    // Occasionally it can be interesting to perform
+    // similar operations but on a process which isnt
+    // currently running.  The follow methods allow a caller
+    // to override the data offsets used by the debugger
+    // so that other system threads and processes can
+    // be used instead.  These values are defaulted to
+    // the thread and process running on the current
+    // processor each time the debuggee executes or
+    // the current processor changes.
+    // The thread and process settings are independent so
+    // it is possible to refer to a thread in a process
+    // other than the current process and vice versa.
+    // Setting an offset of zero will reload the
+    // default value.
+    STDMETHOD(GetImplicitThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetImplicitThreadDataOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetImplicitProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetImplicitProcessDataOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+
+    // IDebugSystemObjects3.
+
+    STDMETHOD(GetEventSystem)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+
+    STDMETHOD(GetCurrentSystemId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetCurrentSystemId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+
+    STDMETHOD(GetNumberSystems)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetSystemIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Ids
+        ) PURE;
+    STDMETHOD(GetTotalNumberThreadsAndProcesses)(
+        THIS_
+        __out PULONG TotalThreads,
+        __out PULONG TotalProcesses,
+        __out PULONG LargestProcessThreads,
+        __out PULONG LargestSystemThreads,
+        __out PULONG LargestSystemProcesses
+        ) PURE;
+    STDMETHOD(GetCurrentSystemServer)(
+        THIS_
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(GetSystemByServer)(
+        THIS_
+        __in ULONG64 Server,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetCurrentSystemServerName)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IDebugSystemObjects4
+DECLARE_INTERFACE_(IDebugSystemObjects4, IUnknown)
+{
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        ) PURE;
+    STDMETHOD_(ULONG, AddRef)(
+        THIS
+        ) PURE;
+    STDMETHOD_(ULONG, Release)(
+        THIS
+        ) PURE;
+
+    // IDebugSystemObjects.
+
+    // In user mode debugging the debugger
+    // tracks all threads and processes and
+    // enumerates them through the following
+    // methods.  When enumerating threads
+    // the threads are enumerated for the current
+    // process.
+    // Kernel mode debugging currently is
+    // limited to enumerating only the threads
+    // assigned to processors, not all of
+    // the threads in the system.  Process
+    // enumeration is limited to a single
+    // virtual process representing kernel space.
+
+    // Returns the ID of the thread on which
+    // the last event occurred.
+    STDMETHOD(GetEventThread)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetEventProcess)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+
+    // Controls implicit thread used by the
+    // debug engine.  The debuggers current
+    // thread is just a piece of data held
+    // by the debugger for calls which use
+    // thread-specific information.  In those
+    // calls the debuggers current thread is used.
+    // The debuggers current thread is not related
+    // to any system thread attribute.
+    // IDs for threads are small integer IDs
+    // maintained by the engine.  They are not
+    // related to system thread IDs.
+    STDMETHOD(GetCurrentThreadId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetCurrentThreadId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+    // The current process is the process
+    // that owns the current thread.
+    STDMETHOD(GetCurrentProcessId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    // Setting the current process automatically
+    // sets the current thread to the thread that
+    // was last current in that process.
+    STDMETHOD(SetCurrentProcessId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+
+    // Gets the number of threads in the current process.
+    STDMETHOD(GetNumberThreads)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    // Gets thread count information for all processes
+    // and the largest number of threads in a single process.
+    STDMETHOD(GetTotalNumberThreads)(
+        THIS_
+        __out PULONG Total,
+        __out PULONG LargestProcess
+        ) PURE;
+    STDMETHOD(GetThreadIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Gets the debugger ID for the thread
+    // currently running on the given
+    // processor.  Only works in kernel
+    // debugging.
+    STDMETHOD(GetThreadIdByProcessor)(
+        THIS_
+        __in ULONG Processor,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // system data structure.  When kernel debugging
+    // this is the offset of the KTHREAD.
+    // When user debugging it is the offset
+    // of the current TEB.
+    STDMETHOD(GetCurrentThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread data structure.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current threads
+    // TEB.  In user mode this is equivalent to
+    // the threads data offset.
+    STDMETHOD(GetCurrentThreadTeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger thread ID for the given TEB.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByTeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current thread.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentThreadSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger thread ID for the given
+    // system thread ID.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current thread.
+    // In kernel mode the value returned is the
+    // index of the processor the thread is
+    // executing on plus one.
+    STDMETHOD(GetCurrentThreadHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger thread ID for the given handle.
+    // Currently when kernel debugging this will fail
+    // if the thread is not executing on a processor.
+    STDMETHOD(GetThreadIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+
+    // Currently kernel mode sessions will only have
+    // a single process representing kernel space.
+    STDMETHOD(GetNumberProcesses)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetProcessIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount_opt(Count) PULONG Ids,
+        __out_ecount_opt(Count) PULONG SysIds
+        ) PURE;
+    // Returns the offset of the current processs
+    // system data structure.  When kernel debugging
+    // this is the offset of the KPROCESS of
+    // the process that owns the current thread.
+    // When user debugging it is the offset
+    // of the current PEB.
+    STDMETHOD(GetCurrentProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process data structure.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByDataOffset)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the offset of the current processs
+    // PEB.  In user mode this is equivalent to
+    // the processs data offset.
+    STDMETHOD(GetCurrentProcessPeb)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    // Looks up a debugger process ID for the given PEB.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdByPeb)(
+        THIS_
+        __in ULONG64 Offset,
+        __out PULONG Id
+        ) PURE;
+    // Returns the system unique ID for the current process.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetCurrentProcessSystemId)(
+        THIS_
+        __out PULONG SysId
+        ) PURE;
+    // Looks up a debugger process ID for the given
+    // system process ID.
+    // Not currently supported when kernel debugging.
+    STDMETHOD(GetProcessIdBySystemId)(
+        THIS_
+        __in ULONG SysId,
+        __out PULONG Id
+        ) PURE;
+    // Returns the handle of the current process.
+    // In kernel mode this is the kernel processs
+    // artificial handle used for symbol operations
+    // and so can only be used with dbghelp APIs.
+    STDMETHOD(GetCurrentProcessHandle)(
+        THIS_
+        __out PULONG64 Handle
+        ) PURE;
+    // Looks up a debugger process ID for the given handle.
+    STDMETHOD(GetProcessIdByHandle)(
+        THIS_
+        __in ULONG64 Handle,
+        __out PULONG Id
+        ) PURE;
+    // Retrieve the name of the executable loaded
+    // in the process.  This may fail if no executable
+    // was identified.
+    STDMETHOD(GetCurrentProcessExecutableName)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExeSize
+        ) PURE;
+
+    // IDebugSystemObjects2.
+
+    // Return the number of seconds that the current
+    // process has been running.
+    STDMETHOD(GetCurrentProcessUpTime)(
+        THIS_
+        __out PULONG UpTime
+        ) PURE;
+
+    // During kernel sessions the debugger retrieves
+    // some information from the system thread and process
+    // running on the current processor.  For example,
+    // the debugger will retrieve virtual memory translation
+    // information for when the debugger needs to
+    // carry out its own virtual to physical translations.
+    // Occasionally it can be interesting to perform
+    // similar operations but on a process which isnt
+    // currently running.  The follow methods allow a caller
+    // to override the data offsets used by the debugger
+    // so that other system threads and processes can
+    // be used instead.  These values are defaulted to
+    // the thread and process running on the current
+    // processor each time the debuggee executes or
+    // the current processor changes.
+    // The thread and process settings are independent so
+    // it is possible to refer to a thread in a process
+    // other than the current process and vice versa.
+    // Setting an offset of zero will reload the
+    // default value.
+    STDMETHOD(GetImplicitThreadDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetImplicitThreadDataOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+    STDMETHOD(GetImplicitProcessDataOffset)(
+        THIS_
+        __out PULONG64 Offset
+        ) PURE;
+    STDMETHOD(SetImplicitProcessDataOffset)(
+        THIS_
+        __in ULONG64 Offset
+        ) PURE;
+
+    // IDebugSystemObjects3.
+
+    STDMETHOD(GetEventSystem)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+
+    STDMETHOD(GetCurrentSystemId)(
+        THIS_
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(SetCurrentSystemId)(
+        THIS_
+        __in ULONG Id
+        ) PURE;
+
+    STDMETHOD(GetNumberSystems)(
+        THIS_
+        __out PULONG Number
+        ) PURE;
+    STDMETHOD(GetSystemIdsByIndex)(
+        THIS_
+        __in ULONG Start,
+        __in ULONG Count,
+        __out_ecount(Count) PULONG Ids
+        ) PURE;
+    STDMETHOD(GetTotalNumberThreadsAndProcesses)(
+        THIS_
+        __out PULONG TotalThreads,
+        __out PULONG TotalProcesses,
+        __out PULONG LargestProcessThreads,
+        __out PULONG LargestSystemThreads,
+        __out PULONG LargestSystemProcesses
+        ) PURE;
+    STDMETHOD(GetCurrentSystemServer)(
+        THIS_
+        __out PULONG64 Server
+        ) PURE;
+    STDMETHOD(GetSystemByServer)(
+        THIS_
+        __in ULONG64 Server,
+        __out PULONG Id
+        ) PURE;
+    STDMETHOD(GetCurrentSystemServerName)(
+        THIS_
+        __out_ecount_opt(BufferSize) PSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+
+    // IDebugSystemObjects4.
+
+    STDMETHOD(GetCurrentProcessExecutableNameWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG ExeSize
+        ) PURE;
+
+    STDMETHOD(GetCurrentSystemServerNameWide)(
+        THIS_
+        __out_ecount_opt(BufferSize) PWSTR Buffer,
+        __in ULONG BufferSize,
+        __out_opt PULONG NameSize
+        ) PURE;
+};
+
+//----------------------------------------------------------------------------
+//
+// Debugger/debuggee communication.
+//
+// A distinguished exception, DBG_COMMAND_EXCEPTION (0x40010009),
+// can be used by a debuggee to communicate with the debugger.
+// The arguments of the exception must be:
+// 1. Exception ID.
+// 2. Command code.
+// 3. Size of argument.
+// 4. Pointer to argument.
+//
+// The arguments depend on the command code.
+//
+//----------------------------------------------------------------------------
+
+#define DEBUG_COMMAND_EXCEPTION_ID 0xdbe00dbe
+
+// Invalid command code.
+#define DEBUG_CMDEX_INVALID             0x00000000
+
+//
+// The debugger can collect strings for display at the
+// next event.  A debuggee can use this to register information
+// about a program situation before places where an event
+// may occur, such as a risky operation or assertion.
+// The strings are automatically flushed on the next
+// event continuation.  Strings are kept on a per-thread basis.
+//
+// When adding, the argument is the string to add.
+// Reset has no arguments and clears all strings.
+//
+#define DEBUG_CMDEX_ADD_EVENT_STRING    0x00000001
+#define DEBUG_CMDEX_RESET_EVENT_STRINGS 0x00000002
+
+#ifndef DEBUG_NO_IMPLEMENTATION
+
+FORCEINLINE void
+DebugCommandException(ULONG Command, ULONG ArgSize, PVOID Arg)
+{
+    ULONG_PTR ExArgs[4];
+
+    ExArgs[0] = DEBUG_COMMAND_EXCEPTION_ID;
+    ExArgs[1] = Command;
+    ExArgs[2] = ArgSize;
+    ExArgs[3] = (ULONG_PTR)Arg;
+    RaiseException(DBG_COMMAND_EXCEPTION, 0, 4, ExArgs);
+}
+
+#endif // #ifndef DEBUG_NO_IMPLEMENTATION
+
+//----------------------------------------------------------------------------
+//
+// Extension callbacks.
+//
+//----------------------------------------------------------------------------
+
+// Returns a version with the major version in
+// the high word and the minor version in the low word.
+#define DEBUG_EXTENSION_VERSION(Major, Minor) \
+    ((((Major) & 0xffff) << 16) | ((Minor) & 0xffff))
+
+// Initialization routine.  Called once when the extension DLL
+// is loaded.  Returns a version and returns flags detailing
+// overall qualities of the extension DLL.
+// A session may or may not be active at the time the DLL
+// is loaded so initialization routines should not expect
+// to be able to query session information.
+typedef HRESULT (CALLBACK* PDEBUG_EXTENSION_INITIALIZE)
+    (__out PULONG Version, __out PULONG Flags);
+// Exit routine.  Called once just before the extension DLL is
+// unloaded.  As with initialization, a session may or
+// may not be active at the time of the call.
+typedef void (CALLBACK* PDEBUG_EXTENSION_UNINITIALIZE)
+    (void);
+
+// A debuggee has been discovered for the session.  It
+// is not necessarily halted.
+#define DEBUG_NOTIFY_SESSION_ACTIVE       0x00000000
+// The session no longer has a debuggee.
+#define DEBUG_NOTIFY_SESSION_INACTIVE     0x00000001
+// The debuggee is halted and accessible.
+#define DEBUG_NOTIFY_SESSION_ACCESSIBLE   0x00000002
+// The debuggee is running or inaccessible.
+#define DEBUG_NOTIFY_SESSION_INACCESSIBLE 0x00000003
+
+typedef void (CALLBACK* PDEBUG_EXTENSION_NOTIFY)
+    (__in ULONG Notify, __in ULONG64 Argument);
+
+// A PDEBUG_EXTENSION_CALL function can return this code
+// to indicate that it was unable to handle the request
+// and that the search for an extension function should
+// continue down the extension DLL chain.
+// Taken from STATUS_VALIDATE_CONTINUE
+
+#define DEBUG_EXTENSION_CONTINUE_SEARCH \
+    HRESULT_FROM_NT(0xC0000271L)
+
+// Every routine in an extension DLL has the following prototype.
+// The extension may be called from multiple clients so it
+// should not cache the client value between calls.
+typedef HRESULT (CALLBACK* PDEBUG_EXTENSION_CALL)
+    (__in PDEBUG_CLIENT Client, __in_opt PCSTR Args);
+
+
+// Extensions may export this API in order to dump the struct that
+// are well known to them. Engine would call this to inject extension
+// output into dt's struct dump
+typedef HRESULT (CALLBACK * PDEBUG_ENTENSION_KNOWNSTRUCT)(
+    __in ULONG Flag, __in ULONG64 Address, __in PSTR StructName,
+    __out_ecount_opt(BufferSize) PSTR Buffer, __inout PULONG BufferSize);
+
+//
+// KnownStructOutput flags
+//
+#define DEBUG_KNOWN_STRUCT_GET_NAMES                     1  // Return names of supported structs
+#define DEBUG_KNOWN_STRUCT_GET_SINGLE_LINE_OUTPUT        2  // Return value output for type
+#define DEBUG_KNOWN_STRUCT_SUPPRESS_TYPE_NAME            3  // Return S_OK for suppressing type name
+
+//----------------------------------------------------------------------------
+//
+// Extension functions.
+//
+// Extension functions differ from extension callbacks in that
+// they are arbitrary functions exported from an extension DLL
+// for other code callers instead of for human invocation from
+// debugger commands.  Extension function pointers are retrieved
+// for an extension DLL with IDebugControl::GetExtensionFunction.
+//
+// Extension function names must begin with _EFN_.  Other than that
+// they can have any name and prototype.  Extension functions
+// must be public exports of their extension DLL.  They should
+// have a typedef for their function pointer prototype in an
+// extension header so that callers have a header file to include
+// with a type that allows a correctly-formed invocation of the
+// extension function.
+//
+// The engine does not perform any validation of calls to
+// extension functions.  Once the extension function pointer
+// is retrieved with GetExtensionFunction all calls go
+// directly between the caller and the extension function and
+// are not mediated by the engine.
+//
+//----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+};
+
+//----------------------------------------------------------------------------
+//
+// C++ implementation helper classes.
+//
+//----------------------------------------------------------------------------
+
+#if !defined(DEBUG_NO_IMPLEMENTATION) && !defined(_M_CEE_PURE)
+
+//
+// DebugBaseEventCallbacks provides a do-nothing base implementation
+// of IDebugEventCallbacks.  A program can derive their own
+// event callbacks class from DebugBaseEventCallbacks and implement
+// only the methods they are interested in.  Programs must be
+// careful to implement GetInterestMask appropriately.
+//
+class DebugBaseEventCallbacks : public IDebugEventCallbacks
+{
+public:
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        )
+    {
+        *Interface = NULL;
+
+#if _MSC_VER >= 1100
+        if (IsEqualIID(InterfaceId, __uuidof(IUnknown)) ||
+            IsEqualIID(InterfaceId, __uuidof(IDebugEventCallbacks)))
+#else
+        if (IsEqualIID(InterfaceId, IID_IUnknown) ||
+            IsEqualIID(InterfaceId, IID_IDebugEventCallbacks))
+#endif
+        {
+            *Interface = (IDebugEventCallbacks *)this;
+            AddRef();
+            return S_OK;
+        }
+        else
+        {
+            return E_NOINTERFACE;
+        }
+    }
+
+    // IDebugEventCallbacks.
+
+    STDMETHOD(Breakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT Bp
+        )
+    {
+        UNREFERENCED_PARAMETER(Bp);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(Exception)(
+        THIS_
+        __in PEXCEPTION_RECORD64 Exception,
+        __in ULONG FirstChance
+        )
+    {
+        UNREFERENCED_PARAMETER(Exception);
+        UNREFERENCED_PARAMETER(FirstChance);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(CreateThread)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG64 DataOffset,
+        __in ULONG64 StartOffset
+        )
+    {
+        UNREFERENCED_PARAMETER(Handle);
+        UNREFERENCED_PARAMETER(DataOffset);
+        UNREFERENCED_PARAMETER(StartOffset);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(ExitThread)(
+        THIS_
+        __in ULONG ExitCode
+        )
+    {
+        UNREFERENCED_PARAMETER(ExitCode);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 Handle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in PCSTR ModuleName,
+        __in PCSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp,
+        __in ULONG64 InitialThreadHandle,
+        __in ULONG64 ThreadDataOffset,
+        __in ULONG64 StartOffset
+        )
+    {
+        UNREFERENCED_PARAMETER(ImageFileHandle);
+        UNREFERENCED_PARAMETER(Handle);
+        UNREFERENCED_PARAMETER(BaseOffset);
+        UNREFERENCED_PARAMETER(ModuleSize);
+        UNREFERENCED_PARAMETER(ModuleName);
+        UNREFERENCED_PARAMETER(ImageName);
+        UNREFERENCED_PARAMETER(CheckSum);
+        UNREFERENCED_PARAMETER(TimeDateStamp);
+        UNREFERENCED_PARAMETER(InitialThreadHandle);
+        UNREFERENCED_PARAMETER(ThreadDataOffset);
+        UNREFERENCED_PARAMETER(StartOffset);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(ExitProcess)(
+        THIS_
+        __in ULONG ExitCode
+        )
+    {
+        UNREFERENCED_PARAMETER(ExitCode);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(LoadModule)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in PCSTR ModuleName,
+        __in PCSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp
+        )
+    {
+        UNREFERENCED_PARAMETER(ImageFileHandle);
+        UNREFERENCED_PARAMETER(BaseOffset);
+        UNREFERENCED_PARAMETER(ModuleSize);
+        UNREFERENCED_PARAMETER(ModuleName);
+        UNREFERENCED_PARAMETER(ImageName);
+        UNREFERENCED_PARAMETER(CheckSum);
+        UNREFERENCED_PARAMETER(TimeDateStamp);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(UnloadModule)(
+        THIS_
+        __in PCSTR ImageBaseName,
+        __in ULONG64 BaseOffset
+        )
+    {
+        UNREFERENCED_PARAMETER(ImageBaseName);
+        UNREFERENCED_PARAMETER(BaseOffset);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(SystemError)(
+        THIS_
+        __in ULONG Error,
+        __in ULONG Level
+        )
+    {
+        UNREFERENCED_PARAMETER(Error);
+        UNREFERENCED_PARAMETER(Level);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(SessionStatus)(
+        THIS_
+        __in ULONG Status
+        )
+    {
+        UNREFERENCED_PARAMETER(Status);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(ChangeDebuggeeState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+        return S_OK;
+    }
+    STDMETHOD(ChangeEngineState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+        return S_OK;
+    }
+    STDMETHOD(ChangeSymbolState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+        return S_OK;
+    }
+};
+
+class DebugBaseEventCallbacksWide : public IDebugEventCallbacksWide
+{
+public:
+    // IUnknown.
+    STDMETHOD(QueryInterface)(
+        THIS_
+        __in REFIID InterfaceId,
+        __out PVOID* Interface
+        )
+    {
+        *Interface = NULL;
+
+#if _MSC_VER >= 1100
+        if (IsEqualIID(InterfaceId, __uuidof(IUnknown)) ||
+            IsEqualIID(InterfaceId, __uuidof(IDebugEventCallbacksWide)))
+#else
+        if (IsEqualIID(InterfaceId, IID_IUnknown) ||
+            IsEqualIID(InterfaceId, IID_IDebugEventCallbacksWide))
+#endif
+        {
+            *Interface = (IDebugEventCallbacksWide *)this;
+            AddRef();
+            return S_OK;
+        }
+        else
+        {
+            return E_NOINTERFACE;
+        }
+    }
+
+    // IDebugEventCallbacksWide.
+
+    STDMETHOD(Breakpoint)(
+        THIS_
+        __in PDEBUG_BREAKPOINT2 Bp
+        )
+    {
+        UNREFERENCED_PARAMETER(Bp);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(Exception)(
+        THIS_
+        __in PEXCEPTION_RECORD64 Exception,
+        __in ULONG FirstChance
+        )
+    {
+        UNREFERENCED_PARAMETER(Exception);
+        UNREFERENCED_PARAMETER(FirstChance);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(CreateThread)(
+        THIS_
+        __in ULONG64 Handle,
+        __in ULONG64 DataOffset,
+        __in ULONG64 StartOffset
+        )
+    {
+        UNREFERENCED_PARAMETER(Handle);
+        UNREFERENCED_PARAMETER(DataOffset);
+        UNREFERENCED_PARAMETER(StartOffset);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(ExitThread)(
+        THIS_
+        __in ULONG ExitCode
+        )
+    {
+        UNREFERENCED_PARAMETER(ExitCode);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(CreateProcess)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 Handle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in PCWSTR ModuleName,
+        __in PCWSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp,
+        __in ULONG64 InitialThreadHandle,
+        __in ULONG64 ThreadDataOffset,
+        __in ULONG64 StartOffset
+        )
+    {
+        UNREFERENCED_PARAMETER(ImageFileHandle);
+        UNREFERENCED_PARAMETER(Handle);
+        UNREFERENCED_PARAMETER(BaseOffset);
+        UNREFERENCED_PARAMETER(ModuleSize);
+        UNREFERENCED_PARAMETER(ModuleName);
+        UNREFERENCED_PARAMETER(ImageName);
+        UNREFERENCED_PARAMETER(CheckSum);
+        UNREFERENCED_PARAMETER(TimeDateStamp);
+        UNREFERENCED_PARAMETER(InitialThreadHandle);
+        UNREFERENCED_PARAMETER(ThreadDataOffset);
+        UNREFERENCED_PARAMETER(StartOffset);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(ExitProcess)(
+        THIS_
+        __in ULONG ExitCode
+        )
+    {
+        UNREFERENCED_PARAMETER(ExitCode);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(LoadModule)(
+        THIS_
+        __in ULONG64 ImageFileHandle,
+        __in ULONG64 BaseOffset,
+        __in ULONG ModuleSize,
+        __in PCWSTR ModuleName,
+        __in PCWSTR ImageName,
+        __in ULONG CheckSum,
+        __in ULONG TimeDateStamp
+        )
+    {
+        UNREFERENCED_PARAMETER(ImageFileHandle);
+        UNREFERENCED_PARAMETER(BaseOffset);
+        UNREFERENCED_PARAMETER(ModuleSize);
+        UNREFERENCED_PARAMETER(ModuleName);
+        UNREFERENCED_PARAMETER(ImageName);
+        UNREFERENCED_PARAMETER(CheckSum);
+        UNREFERENCED_PARAMETER(TimeDateStamp);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(UnloadModule)(
+        THIS_
+        __in PCWSTR ImageBaseName,
+        __in ULONG64 BaseOffset
+        )
+    {
+        UNREFERENCED_PARAMETER(ImageBaseName);
+        UNREFERENCED_PARAMETER(BaseOffset);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(SystemError)(
+        THIS_
+        __in ULONG Error,
+        __in ULONG Level
+        )
+    {
+        UNREFERENCED_PARAMETER(Error);
+        UNREFERENCED_PARAMETER(Level);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(SessionStatus)(
+        THIS_
+        __in ULONG Status
+        )
+    {
+        UNREFERENCED_PARAMETER(Status);
+        return DEBUG_STATUS_NO_CHANGE;
+    }
+    STDMETHOD(ChangeDebuggeeState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+        return S_OK;
+    }
+    STDMETHOD(ChangeEngineState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+        return S_OK;
+    }
+    STDMETHOD(ChangeSymbolState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+        return S_OK;
+    }
+};
+
+#endif // #ifndef DEBUG_NO_IMPLEMENTATION
+
+#ifdef DEBUG_UNICODE_MACROS
+
+#ifdef UNICODE
+
+#define IDebugEventCallbacksT IDebugEventCallbacksWide
+#define IID_IDebugEventCallbacksT IID_IDebugEventCallbacksWide
+#define IDebugOutputCallbacksT IDebugOutputCallbacksWide
+#define IID_IDebugOutputCallbacksT IID_IDebugOutputCallbacksWide
+#define DebugBaseEventCallbacksT DebugBaseEventCallbacksWide
+
+#define DebugConnectT DebugConnectWide
+#define GetSourceFileInformationT GetSourceFileInformationWide
+#define FindSourceFileAndTokenT FindSourceFileAndTokenWide
+#define GetSymbolInformationT GetSymbolInformationWide
+#define GetCommandT GetCommandWide
+#define SetCommandT SetCommandWide
+#define GetOffsetExpressionT GetOffsetExpressionWide
+#define SetOffsetExpressionT SetOffsetExpressionWide
+#define GetRunningProcessSystemIdByExecutableNameT GetRunningProcessSystemIdByExecutableNameWide
+#define GetRunningProcessDescriptionT GetRunningProcessDescriptionWide
+#define CreateProcessT CreateProcessWide
+#define CreateProcessAndAttachT CreateProcessAndAttachWide
+#define AddDumpInformationFileT AddDumpInformationFileWide
+#define GetDumpFileT GetDumpFileWide
+#define AttachKernelT AttachKernelWide
+#define GetKernelConnectionOptionsT GetKernelConnectionOptionsWide
+#define SetKernelConnectionOptionsT SetKernelConnectionOptionsWide
+#define StartProcessServerT StartProcessServerWide
+#define ConnectProcessServerT ConnectProcessServerWide
+#define StartServerT StartServerWide
+#define OutputServersT OutputServersWide
+#define GetOutputCallbacksT GetOutputCallbacksWide
+#define SetOutputCallbacksT SetOutputCallbacksWide
+#define GetOutputLinePrefixT GetOutputLinePrefixWide
+#define SetOutputLinePrefixT SetOutputLinePrefixWide
+#define GetIdentityT GetIdentityWide
+#define OutputIdentityT OutputIdentityWide
+#define GetEventCallbacksT GetEventCallbacksWide
+#define SetEventCallbacksT SetEventCallbacksWide
+#define CreateProcess2T CreateProcess2Wide
+#define CreateProcessAndAttach2T CreateProcessAndAttach2Wide
+#define PushOutputLinePrefixT PushOutputLinePrefixWide
+#define GetQuitLockStringT GetQuitLockStringWide
+#define SetQuitLockStringT SetQuitLockStringWide
+#define GetLogFileT GetLogFileWide
+#define OpenLogFileT OpenLogFileWide
+#define InputT InputWide
+#define ReturnInputT ReturnInputWide
+#define OutputT OutputWide
+#define OutputVaListT OutputVaListWide
+#define ControlledOutputT ControlledOutputWide
+#define ControlledOutputVaListT ControlledOutputVaListWide
+#define OutputPromptT OutputPromptWide
+#define OutputPromptVaListT OutputPromptVaListWide
+#define GetPromptTextT GetPromptTextWide
+#define AssembleT AssembleWide
+#define DisassembleT DisassembleWide
+#define GetProcessorTypeNamesT GetProcessorTypeNamesWide
+#define GetTextMacroT GetTextMacroWide
+#define SetTextMacroT SetTextMacroWide
+#define EvaluateT EvaluateWide
+#define ExecuteT ExecuteWide
+#define ExecuteCommandFileT ExecuteCommandFileWide
+#define AddExtensionT AddExtensionWide
+#define GetExtensionByPathT GetExtensionByPathWide
+#define CallExtensionT CallExtensionWide
+#define GetExtensionFunctionT GetExtensionFunctionWide
+#define GetEventFilterTextT GetEventFilterTextWide
+#define GetEventFilterCommandT GetEventFilterCommandWide
+#define SetEventFilterCommandT SetEventFilterCommandWide
+#define GetSpecificFilterArgumentT GetSpecificFilterArgumentWide
+#define SetSpecificFilterArgumentT SetSpecificFilterArgumentWide
+#define GetExceptionFilterSecondCommandT GetExceptionFilterSecondCommandWide
+#define SetExceptionFilterSecondCommandT SetExceptionFilterSecondCommandWide
+#define GetLastEventInformationT GetLastEventInformationWide
+#define GetTextReplacementT GetTextReplacementWide
+#define SetTextReplacementT SetTextReplacementWide
+#define SetExpressionSyntaxByNameT SetExpressionSyntaxByNameWide
+#define GetExpressionSyntaxNamesT GetExpressionSyntaxNamesWide
+#define GetEventIndexDescriptionT GetEventIndexDescriptionWide
+#define GetLogFile2T GetLogFileWide
+#define OpenLogFile2T OpenLogFileWide
+#define GetSystemVersionStringT GetSystemVersionStringWide
+#define ReadMultiByteStringVirtualT ReadMultiByteStringVirtualWide
+#define ReadUnicodeStringVirtualT ReadUnicodeStringVirtualWide
+#define GetDescriptionT GetDescriptionWide
+#define GetIndexByNameT GetIndexByNameWide
+#define GetPseudoDescriptionT GetPseudoDescriptionWide
+#define GetPseudoIndexByNameT GetPseudoIndexByNameWide
+#define AddSymbolT AddSymbolWide
+#define RemoveSymbolByNameT RemoveSymbolByNameWide
+#define GetSymbolNameT GetSymbolNameWide
+#define WriteSymbolT WriteSymbolWide
+#define OutputAsTypeT OutputAsTypeWide
+#define GetSymbolTypeNameT GetSymbolTypeNameWide
+#define GetSymbolValueTextT GetSymbolValueTextWide
+#define GetNameByOffsetT GetNameByOffsetWide
+#define GetOffsetByNameT GetOffsetByNameWide
+#define GetNearNameByOffsetT GetNearNameByOffsetWide
+#define GetLineByOffsetT GetLineByOffsetWide
+#define GetOffsetByLineT GetOffsetByLineWide
+#define GetModuleByModuleNameT GetModuleByModuleNameWide
+#define GetSymbolModuleT GetSymbolModuleWide
+#define GetTypeNameT GetTypeNameWide
+#define GetTypeIdT GetTypeIdWide
+#define GetFieldOffsetT GetFieldOffsetWide
+#define GetSymbolTypeIdT GetSymbolTypeIdWide
+#define StartSymbolMatchT StartSymbolMatchWide
+#define GetNextSymbolMatchT GetNextSymbolMatchWide
+#define ReloadT ReloadWide
+#define GetSymbolPathT GetSymbolPathWide
+#define SetSymbolPathT SetSymbolPathWide
+#define AppendSymbolPathT AppendSymbolPathWide
+#define GetImagePathT GetImagePathWide
+#define SetImagePathT SetImagePathWide
+#define AppendImagePathT AppendImagePathWide
+#define GetSourcePathT GetSourcePathWide
+#define GetSourcePathElementT GetSourcePathElementWide
+#define SetSourcePathT SetSourcePathWide
+#define AppendSourcePathT AppendSourcePathWide
+#define FindSourceFileT FindSourceFileWide
+#define GetSourceFileLineOffsetsT GetSourceFileLineOffsetsWide
+#define GetModuleVersionInformationT GetModuleVersionInformationWide
+#define GetModuleNameStringT GetModuleNameStringWide
+#define GetConstantNameT GetConstantNameWide
+#define GetFieldNameT GetFieldNameWide
+#define GetFieldTypeAndOffsetT GetFieldTypeAndOffsetWide
+#define GetSymbolEntriesByNameT GetSymbolEntriesByNameWide
+#define GetSymbolEntryStringT GetSymbolEntryStringWide
+#define GetSourceEntriesByLineT GetSourceEntriesByLineWide
+#define GetSourceEntryStringT GetSourceEntryStringWide
+#define GetCurrentProcessExecutableNameT GetCurrentProcessExecutableNameWide
+#define GetCurrentSystemServerNameT GetCurrentSystemServerNameWide
+
+#else // #ifdef UNICODE
+
+#define IDebugEventCallbacksT IDebugEventCallbacks
+#define IID_IDebugEventCallbacksT IID_IDebugEventCallbacks
+#define IDebugOutputCallbacksT IDebugOutputCallbacks
+#define IID_IDebugOutputCallbacksT IID_IDebugOutputCallbacks
+#define DebugBaseEventCallbacksT DebugBaseEventCallbacks
+
+#define DebugConnectT DebugConnect
+#define GetSourceFileInformationT GetSourceFileInformation
+#define FindSourceFileAndTokenT FindSourceFileAndToken
+#define GetSymbolInformationT GetSymbolInformation
+#define GetCommandT GetCommand
+#define SetCommandT SetCommand
+#define GetOffsetExpressionT GetOffsetExpression
+#define SetOffsetExpressionT SetOffsetExpression
+#define GetRunningProcessSystemIdByExecutableNameT GetRunningProcessSystemIdByExecutableName
+#define GetRunningProcessDescriptionT GetRunningProcessDescription
+#define CreateProcessT CreateProcess
+#define CreateProcessAndAttachT CreateProcessAndAttach
+#define AddDumpInformationFileT AddDumpInformationFile
+#define GetDumpFileT GetDumpFile
+#define AttachKernelT AttachKernel
+#define GetKernelConnectionOptionsT GetKernelConnectionOptions
+#define SetKernelConnectionOptionsT SetKernelConnectionOptions
+#define StartProcessServerT StartProcessServer
+#define ConnectProcessServerT ConnectProcessServer
+#define StartServerT StartServer
+#define OutputServersT OutputServers
+#define GetOutputCallbacksT GetOutputCallbacks
+#define SetOutputCallbacksT SetOutputCallbacks
+#define GetOutputLinePrefixT GetOutputLinePrefix
+#define SetOutputLinePrefixT SetOutputLinePrefix
+#define GetIdentityT GetIdentity
+#define OutputIdentityT OutputIdentity
+#define GetEventCallbacksT GetEventCallbacks
+#define SetEventCallbacksT SetEventCallbacks
+#define CreateProcess2T CreateProcess2
+#define CreateProcessAndAttach2T CreateProcessAndAttach2
+#define PushOutputLinePrefixT PushOutputLinePrefix
+#define GetQuitLockStringT GetQuitLockString
+#define SetQuitLockStringT SetQuitLockString
+#define GetLogFileT GetLogFile
+#define OpenLogFileT OpenLogFile
+#define InputT Input
+#define ReturnInputT ReturnInput
+#define OutputT Output
+#define OutputVaListT OutputVaList
+#define ControlledOutputT ControlledOutput
+#define ControlledOutputVaListT ControlledOutputVaList
+#define OutputPromptT OutputPrompt
+#define OutputPromptVaListT OutputPromptVaList
+#define GetPromptTextT GetPromptText
+#define AssembleT Assemble
+#define DisassembleT Disassemble
+#define GetProcessorTypeNamesT GetProcessorTypeNames
+#define GetTextMacroT GetTextMacro
+#define SetTextMacroT SetTextMacro
+#define EvaluateT Evaluate
+#define ExecuteT Execute
+#define ExecuteCommandFileT ExecuteCommandFile
+#define AddExtensionT AddExtension
+#define GetExtensionByPathT GetExtensionByPath
+#define CallExtensionT CallExtension
+#define GetExtensionFunctionT GetExtensionFunction
+#define GetEventFilterTextT GetEventFilterText
+#define GetEventFilterCommandT GetEventFilterCommand
+#define SetEventFilterCommandT SetEventFilterCommand
+#define GetSpecificFilterArgumentT GetSpecificFilterArgument
+#define SetSpecificFilterArgumentT SetSpecificFilterArgument
+#define GetExceptionFilterSecondCommandT GetExceptionFilterSecondCommand
+#define SetExceptionFilterSecondCommandT SetExceptionFilterSecondCommand
+#define GetLastEventInformationT GetLastEventInformation
+#define GetTextReplacementT GetTextReplacement
+#define SetTextReplacementT SetTextReplacement
+#define SetExpressionSyntaxByNameT SetExpressionSyntaxByName
+#define GetExpressionSyntaxNamesT GetExpressionSyntaxNames
+#define GetEventIndexDescriptionT GetEventIndexDescription
+#define GetLogFile2T GetLogFile
+#define OpenLogFile2T OpenLogFile
+#define GetSystemVersionStringT GetSystemVersionString
+#define ReadMultiByteStringVirtualT ReadMultiByteStringVirtual
+#define ReadUnicodeStringVirtualT ReadUnicodeStringVirtual
+#define GetDescriptionT GetDescription
+#define GetIndexByNameT GetIndexByName
+#define GetPseudoDescriptionT GetPseudoDescription
+#define GetPseudoIndexByNameT GetPseudoIndexByName
+#define AddSymbolT AddSymbol
+#define RemoveSymbolByNameT RemoveSymbolByName
+#define GetSymbolNameT GetSymbolName
+#define WriteSymbolT WriteSymbol
+#define OutputAsTypeT OutputAsType
+#define GetSymbolTypeNameT GetSymbolTypeName
+#define GetSymbolValueTextT GetSymbolValueText
+#define GetNameByOffsetT GetNameByOffset
+#define GetOffsetByNameT GetOffsetByName
+#define GetNearNameByOffsetT GetNearNameByOffset
+#define GetLineByOffsetT GetLineByOffset
+#define GetOffsetByLineT GetOffsetByLine
+#define GetModuleByModuleNameT GetModuleByModuleName
+#define GetSymbolModuleT GetSymbolModule
+#define GetTypeNameT GetTypeName
+#define GetTypeIdT GetTypeId
+#define GetFieldOffsetT GetFieldOffset
+#define GetSymbolTypeIdT GetSymbolTypeId
+#define StartSymbolMatchT StartSymbolMatch
+#define GetNextSymbolMatchT GetNextSymbolMatch
+#define ReloadT Reload
+#define GetSymbolPathT GetSymbolPath
+#define SetSymbolPathT SetSymbolPath
+#define AppendSymbolPathT AppendSymbolPath
+#define GetImagePathT GetImagePath
+#define SetImagePathT SetImagePath
+#define AppendImagePathT AppendImagePath
+#define GetSourcePathT GetSourcePath
+#define GetSourcePathElementT GetSourcePathElement
+#define SetSourcePathT SetSourcePath
+#define AppendSourcePathT AppendSourcePath
+#define FindSourceFileT FindSourceFile
+#define GetSourceFileLineOffsetsT GetSourceFileLineOffsets
+#define GetModuleVersionInformationT GetModuleVersionInformation
+#define GetModuleNameStringT GetModuleNameString
+#define GetConstantNameT GetConstantName
+#define GetFieldNameT GetFieldName
+#define GetFieldTypeAndOffsetT GetFieldTypeAndOffset
+#define GetSymbolEntriesByNameT GetSymbolEntriesByName
+#define GetSymbolEntryStringT GetSymbolEntryString
+#define GetSourceEntriesByLineT GetSourceEntriesByLine
+#define GetSourceEntryStringT GetSourceEntryString
+#define GetCurrentProcessExecutableNameT GetCurrentProcessExecutableName
+#define GetCurrentSystemServerNameT GetCurrentSystemServerName
+
+#endif // #ifdef UNICODE
+
+#endif // #ifdef DEBUG_UNICODE_MACROS
+
+#endif // #ifdef __cplusplus
+
+#endif // #ifndef __DBGENG_H__
diff --git a/base/Windows/Inc/excpt.h b/base/Windows/Inc/excpt.h
new file mode 100644
index 0000000..0313108
--- /dev/null
+++ b/base/Windows/Inc/excpt.h
@@ -0,0 +1,135 @@
+/***
+*excpt.h - defines exception values, types and routines
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file contains the definitions and prototypes for the compiler-
+*       dependent intrinsics, support functions and keywords which implement
+*       the structured exception handling extensions.
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_EXCPT
+#define _INC_EXCPT
+
+#include <crtdefs.h>
+
+#ifdef  _MSC_VER
+/*
+ * Currently, all MS C compilers for Win32 platforms default to 8 byte
+ * alignment.
+ */
+#pragma pack(push,_CRT_PACKING)
+#endif  /* _MSC_VER */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exception disposition return values.
+ */
+typedef enum _EXCEPTION_DISPOSITION {
+    ExceptionContinueExecution,
+    ExceptionContinueSearch,
+    ExceptionNestedException,
+    ExceptionCollidedUnwind
+} EXCEPTION_DISPOSITION;
+
+
+/*
+ * Prototype for SEH support function.
+ */
+
+#ifdef  _M_IX86
+
+/*
+ * Declarations to keep MS C 8 (386/486) compiler happy
+ */
+struct _EXCEPTION_RECORD;
+struct _CONTEXT;
+
+EXCEPTION_DISPOSITION __cdecl _except_handler (
+    __in struct _EXCEPTION_RECORD *_ExceptionRecord,
+    __in void * _EstablisherFrame,
+    __inout struct _CONTEXT *_ContextRecord,
+    __inout void * _DispatcherContext
+    );
+
+#elif   defined(_M_IA64)
+
+/*
+ * Declarations to keep IA64 compiler happy
+ */
+typedef struct _EXCEPTION_POINTERS *Exception_info_ptr;
+struct _EXCEPTION_RECORD;
+struct _CONTEXT;
+struct _DISPATCHER_CONTEXT;
+
+
+_CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (
+    __in struct _EXCEPTION_RECORD *_ExceptionRecord,
+    __in unsigned __int64 _MemoryStackFp,
+    __in unsigned __int64 _BackingStoreFp,
+    __inout struct _CONTEXT *_ContextRecord,
+    __inout struct _DISPATCHER_CONTEXT *_DispatcherContext,
+    __in unsigned __int64 _GlobalPointer
+    );
+
+#elif   defined(_M_AMD64)
+
+/*
+ * Declarations to keep AMD64 compiler happy
+ */
+struct _EXCEPTION_RECORD;
+struct _CONTEXT;
+
+#endif
+
+
+/*
+ * Keywords and intrinsics for SEH
+ */
+
+#ifdef  _MSC_VER
+
+#define GetExceptionCode            _exception_code
+#define exception_code              _exception_code
+#define GetExceptionInformation     (struct _EXCEPTION_POINTERS *)_exception_info
+#define exception_info              (struct _EXCEPTION_POINTERS *)_exception_info
+#define AbnormalTermination         _abnormal_termination
+#define abnormal_termination        _abnormal_termination
+
+unsigned long __cdecl _exception_code(void);
+void *        __cdecl _exception_info(void);
+int           __cdecl _abnormal_termination(void);
+
+#endif
+
+
+/*
+ * Legal values for expression in except().
+ */
+
+#define EXCEPTION_EXECUTE_HANDLER       1
+#define EXCEPTION_CONTINUE_SEARCH       0
+#define EXCEPTION_CONTINUE_EXECUTION    -1
+
+
+
+#ifdef  __cplusplus
+}
+#endif
+
+#ifdef  _MSC_VER
+#pragma pack(pop)
+#endif  /* _MSC_VER */
+
+#endif  /* _INC_EXCPT */
diff --git a/base/Windows/Inc/limits.h b/base/Windows/Inc/limits.h
new file mode 100644
index 0000000..7f249fa
--- /dev/null
+++ b/base/Windows/Inc/limits.h
@@ -0,0 +1,136 @@
+/***
+*limits.h - implementation dependent values
+*
+*       Copyright (c) Microsoft Corporation.  All rights reserved.
+*
+*Purpose:
+*       Contains defines for a number of implementation dependent values
+*       which are commonly used in C programs.
+*       [ANSI]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <crtdefs.h>
+
+#ifndef _INC_LIMITS
+#define _INC_LIMITS
+
+
+#define CHAR_BIT      8         /* number of bits in a char */
+#define SCHAR_MIN   (-128)      /* minimum signed char value */
+#define SCHAR_MAX     127       /* maximum signed char value */
+#define UCHAR_MAX     0xff      /* maximum unsigned char value */
+
+#ifndef _CHAR_UNSIGNED
+#define CHAR_MIN    SCHAR_MIN   /* mimimum char value */
+#define CHAR_MAX    SCHAR_MAX   /* maximum char value */
+#else
+#define CHAR_MIN      0
+#define CHAR_MAX    UCHAR_MAX
+#endif  /* _CHAR_UNSIGNED */
+
+#define MB_LEN_MAX    5             /* max. # bytes in multibyte char */
+#define SHRT_MIN    (-32768)        /* minimum (signed) short value */
+#define SHRT_MAX      32767         /* maximum (signed) short value */
+#define USHRT_MAX     0xffff        /* maximum unsigned short value */
+#define INT_MIN     (-2147483647 - 1) /* minimum (signed) int value */
+#define INT_MAX       2147483647    /* maximum (signed) int value */
+#define UINT_MAX      0xffffffff    /* maximum unsigned int value */
+#define LONG_MIN    (-2147483647L - 1) /* minimum (signed) long value */
+#define LONG_MAX      2147483647L   /* maximum (signed) long value */
+#define ULONG_MAX     0xffffffffUL  /* maximum unsigned long value */
+#define LLONG_MAX     9223372036854775807i64       /* maximum signed long long int value */
+#define LLONG_MIN   (-9223372036854775807i64 - 1)  /* minimum signed long long int value */
+#define ULLONG_MAX    0xffffffffffffffffui64       /* maximum unsigned long long int value */
+
+#if     _INTEGRAL_MAX_BITS >= 8
+#define _I8_MIN     (-127i8 - 1)    /* minimum signed 8 bit value */
+#define _I8_MAX       127i8         /* maximum signed 8 bit value */
+#define _UI8_MAX      0xffui8       /* maximum unsigned 8 bit value */
+#endif
+
+#if     _INTEGRAL_MAX_BITS >= 16
+#define _I16_MIN    (-32767i16 - 1) /* minimum signed 16 bit value */
+#define _I16_MAX      32767i16      /* maximum signed 16 bit value */
+#define _UI16_MAX     0xffffui16    /* maximum unsigned 16 bit value */
+#endif
+
+#if     _INTEGRAL_MAX_BITS >= 32
+#define _I32_MIN    (-2147483647i32 - 1) /* minimum signed 32 bit value */
+#define _I32_MAX      2147483647i32 /* maximum signed 32 bit value */
+#define _UI32_MAX     0xffffffffui32 /* maximum unsigned 32 bit value */
+#endif
+
+#if     _INTEGRAL_MAX_BITS >= 64
+/* minimum signed 64 bit value */
+#define _I64_MIN    (-9223372036854775807i64 - 1)
+/* maximum signed 64 bit value */
+#define _I64_MAX      9223372036854775807i64
+/* maximum unsigned 64 bit value */
+#define _UI64_MAX     0xffffffffffffffffui64
+#endif
+
+#if     _INTEGRAL_MAX_BITS >= 128
+/* minimum signed 128 bit value */
+#define _I128_MIN   (-170141183460469231731687303715884105727i128 - 1)
+/* maximum signed 128 bit value */
+#define _I128_MAX     170141183460469231731687303715884105727i128
+/* maximum unsigned 128 bit value */
+#define _UI128_MAX    0xffffffffffffffffffffffffffffffffui128
+#endif
+
+#ifndef SIZE_MAX
+#ifdef _WIN64 
+#define SIZE_MAX _UI64_MAX
+#else
+#define SIZE_MAX UINT_MAX
+#endif
+#endif
+
+#if __STDC_WANT_SECURE_LIB__
+/* While waiting to the C standard committee to finalize the decision on RSIZE_MAX and rsize_t,
+ * we define RSIZE_MAX as SIZE_MAX
+ */
+#ifndef RSIZE_MAX
+#define RSIZE_MAX SIZE_MAX
+#endif
+#endif
+
+#ifdef  _POSIX_
+
+#define _POSIX_ARG_MAX      4096
+#define _POSIX_CHILD_MAX    6
+#define _POSIX_LINK_MAX     8
+#define _POSIX_MAX_CANON    255
+#define _POSIX_MAX_INPUT    255
+#define _POSIX_NAME_MAX     14
+#define _POSIX_NGROUPS_MAX  0
+#define _POSIX_OPEN_MAX     16
+#define _POSIX_PATH_MAX     255
+#define _POSIX_PIPE_BUF     512
+#define _POSIX_SSIZE_MAX    32767
+#define _POSIX_STREAM_MAX   8
+#define _POSIX_TZNAME_MAX   3
+
+#define ARG_MAX             14500       /* 16k heap, minus overhead */
+#define LINK_MAX            1024
+#define MAX_CANON           _POSIX_MAX_CANON
+#define MAX_INPUT           _POSIX_MAX_INPUT
+#define NAME_MAX            255
+#define NGROUPS_MAX         16
+#define OPEN_MAX            32
+#define PATH_MAX            512
+#define PIPE_BUF            _POSIX_PIPE_BUF
+#define SSIZE_MAX           _POSIX_SSIZE_MAX
+#define STREAM_MAX          20
+#define TZNAME_MAX          10
+
+#endif  /* POSIX */
+
+#endif  /* _INC_LIMITS */
diff --git a/base/Windows/Inc/objbase.h b/base/Windows/Inc/objbase.h
new file mode 100644
index 0000000..3c58424
--- /dev/null
+++ b/base/Windows/Inc/objbase.h
@@ -0,0 +1,383 @@
+//+---------------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//  File:       objbase.h
+//
+//  Contents:   Component object model defintions for dbg extensions.
+
+// ***************************************************************************
+// ******      Heavily edited to remove many Windows dependencies      *******
+// ***************************************************************************
+
+//
+//----------------------------------------------------------------------------
+
+#if !defined( _OBJBASE_H_ )
+#define _OBJBASE_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <pshpack8.h>
+
+/////////////////////////////////////////////////////////////////// From rpc.h
+//
+#define __RPC_FAR
+
+//////////////////////////////////////////////////////////////// From rpcndr.h
+//
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/****************************************************************************
+ * VC COM support
+ ****************************************************************************/
+
+#ifndef DECLSPEC_NOVTABLE
+#if (_MSC_VER >= 1100) && defined(__cplusplus)
+#define DECLSPEC_NOVTABLE __declspec(novtable)
+#else
+#define DECLSPEC_NOVTABLE
+#endif
+#endif
+
+#ifndef DECLSPEC_UUID
+#if (_MSC_VER >= 1100) && defined(__cplusplus)
+#define DECLSPEC_UUID(x) __declspec(uuid(x))
+#else
+#define DECLSPEC_UUID(x)
+#endif
+#endif
+
+#define MIDL_INTERFACE(x)   struct DECLSPEC_UUID(x) DECLSPEC_NOVTABLE
+
+#if _MSC_VER >= 1100
+#define EXTERN_GUID(itf,l1,s1,s2,c1,c2,c3,c4,c5,c6,c7,c8)  \
+  EXTERN_C const IID DECLSPEC_SELECTANY itf = {l1,s1,s2,{c1,c2,c3,c4,c5,c6,c7,c8}}
+#else
+#define EXTERN_GUID(itf,l1,s1,s2,c1,c2,c3,c4,c5,c6,c7,c8) EXTERN_C const IID itf
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+/****** Interface Declaration ***********************************************/
+
+/*
+ *      These are macros for declaring interfaces.  They exist so that
+ *      a single definition of the interface is simulataneously a proper
+ *      declaration of the interface structures (C++ abstract classes)
+ *      for both C and C++.
+ *
+ *      DECLARE_INTERFACE(iface) is used to declare an interface that does
+ *      not derive from a base interface.
+ *      DECLARE_INTERFACE_(iface, baseiface) is used to declare an interface
+ *      that does derive from a base interface.
+ *
+ *      By default if the source file has a .c extension the C version of
+ *      the interface declaratations will be expanded; if it has a .cpp
+ *      extension the C++ version will be expanded. if you want to force
+ *      the C version expansion even though the source file has a .cpp
+ *      extension, then define the macro "CINTERFACE".
+ *      eg.     cl -DCINTERFACE file.cpp
+ *
+ *      Example Interface declaration:
+ *
+ *          #undef  INTERFACE
+ *          #define INTERFACE   IClassFactory
+ *
+ *          DECLARE_INTERFACE_(IClassFactory, IUnknown)
+ *          {
+ *              // *** IUnknown methods ***
+ *              STDMETHOD(QueryInterface) (THIS_
+ *                                        REFIID riid,
+ *                                        LPVOID FAR* ppvObj) PURE;
+ *              STDMETHOD_(ULONG,AddRef) (THIS) PURE;
+ *              STDMETHOD_(ULONG,Release) (THIS) PURE;
+ *
+ *              // *** IClassFactory methods ***
+ *              STDMETHOD(CreateInstance) (THIS_
+ *                                        LPUNKNOWN pUnkOuter,
+ *                                        REFIID riid,
+ *                                        LPVOID FAR* ppvObject) PURE;
+ *          };
+ *
+ *      Example C++ expansion:
+ *
+ *          struct FAR IClassFactory : public IUnknown
+ *          {
+ *              virtual HRESULT STDMETHODCALLTYPE QueryInterface(
+ *                                                  IID FAR& riid,
+ *                                                  LPVOID FAR* ppvObj) = 0;
+ *              virtual HRESULT STDMETHODCALLTYPE AddRef(void) = 0;
+ *              virtual HRESULT STDMETHODCALLTYPE Release(void) = 0;
+ *              virtual HRESULT STDMETHODCALLTYPE CreateInstance(
+ *                                              LPUNKNOWN pUnkOuter,
+ *                                              IID FAR& riid,
+ *                                              LPVOID FAR* ppvObject) = 0;
+ *          };
+ *
+ *          NOTE: Our documentation says '#define interface class' but we use
+ *          'struct' instead of 'class' to keep a lot of 'public:' lines
+ *          out of the interfaces.  The 'FAR' forces the 'this' pointers to
+ *          be far, which is what we need.
+ *
+ *      Example C expansion:
+ *
+ *          typedef struct IClassFactory
+ *          {
+ *              const struct IClassFactoryVtbl FAR* lpVtbl;
+ *          } IClassFactory;
+ *
+ *          typedef struct IClassFactoryVtbl IClassFactoryVtbl;
+ *
+ *          struct IClassFactoryVtbl
+ *          {
+ *              HRESULT (STDMETHODCALLTYPE * QueryInterface) (
+ *                                                  IClassFactory FAR* This,
+ *                                                  IID FAR* riid,
+ *                                                  LPVOID FAR* ppvObj) ;
+ *              HRESULT (STDMETHODCALLTYPE * AddRef) (IClassFactory FAR* This) ;
+ *              HRESULT (STDMETHODCALLTYPE * Release) (IClassFactory FAR* This) ;
+ *              HRESULT (STDMETHODCALLTYPE * CreateInstance) (
+ *                                                  IClassFactory FAR* This,
+ *                                                  LPUNKNOWN pUnkOuter,
+ *                                                  IID FAR* riid,
+ *                                                  LPVOID FAR* ppvObject);
+ *              HRESULT (STDMETHODCALLTYPE * LockServer) (
+ *                                                  IClassFactory FAR* This,
+ *                                                  BOOL fLock);
+ *          };
+ */
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+//#define interface               struct FAR
+#define interface struct
+#define STDMETHOD(method)       virtual HRESULT STDMETHODCALLTYPE method
+#define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method
+#define STDMETHODV(method)       virtual HRESULT STDMETHODVCALLTYPE method
+#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method
+#define PURE                    = 0
+#define THIS_
+#define THIS                    void
+#define DECLARE_INTERFACE(iface)    interface DECLSPEC_NOVTABLE iface
+#define DECLARE_INTERFACE_(iface, baseiface)    interface DECLSPEC_NOVTABLE iface : public baseiface
+
+
+#if !defined(BEGIN_INTERFACE)
+#if defined(_MPPC_)  && \
+    ( (defined(_MSC_VER) || defined(__SC__) || defined(__MWERKS__)) && \
+    !defined(NO_NULL_VTABLE_ENTRY) )
+   #define BEGIN_INTERFACE virtual void a() {}
+   #define END_INTERFACE
+#else
+   #define BEGIN_INTERFACE
+   #define END_INTERFACE
+#endif
+#endif
+
+#else
+
+#define interface               struct
+
+#define STDMETHOD(method)       HRESULT (STDMETHODCALLTYPE * method)
+#define STDMETHOD_(type,method) type (STDMETHODCALLTYPE * method)
+#define STDMETHODV(method)       HRESULT (STDMETHODVCALLTYPE * method)
+#define STDMETHODV_(type,method) type (STDMETHODVCALLTYPE * method)
+
+#if !defined(BEGIN_INTERFACE)
+#if defined(_MPPC_)
+    #define BEGIN_INTERFACE       void    *b;
+    #define END_INTERFACE
+#else
+    #define BEGIN_INTERFACE
+    #define END_INTERFACE
+#endif
+#endif
+
+
+#define PURE
+#define THIS_                   INTERFACE FAR* This,
+#define THIS                    INTERFACE FAR* This
+#ifdef CONST_VTABLE
+#undef CONST_VTBL
+#define CONST_VTBL const
+#define DECLARE_INTERFACE(iface)    typedef interface iface { \
+                                    const struct iface##Vtbl FAR* lpVtbl; \
+                                } iface; \
+                                typedef const struct iface##Vtbl iface##Vtbl; \
+                                const struct iface##Vtbl
+#else
+#undef CONST_VTBL
+#define CONST_VTBL
+#define DECLARE_INTERFACE(iface)    typedef interface iface { \
+                                    struct iface##Vtbl FAR* lpVtbl; \
+                                } iface; \
+                                typedef struct iface##Vtbl iface##Vtbl; \
+                                struct iface##Vtbl
+#endif
+#define DECLARE_INTERFACE_(iface, baseiface)    DECLARE_INTERFACE(iface)
+
+#endif
+
+/* Forward Declarations */
+
+#ifndef __IUnknown_FWD_DEFINED__
+#define __IUnknown_FWD_DEFINED__
+typedef interface IUnknown IUnknown;
+#endif  /* __IUnknown_FWD_DEFINED__ */
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+/* interface __MIDL_itf_unknwn_0000 */
+/* [local] */
+
+//+-------------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//--------------------------------------------------------------------------
+#if ( _MSC_VER >= 1020 )
+#pragma once
+#endif
+
+#ifndef __IUnknown_INTERFACE_DEFINED__
+#define __IUnknown_INTERFACE_DEFINED__
+
+/* interface IUnknown */
+/* [unique][uuid][object][local] */
+
+typedef /* [unique] */ IUnknown *LPUNKNOWN;
+
+//////////////////////////////////////////////////////////////////
+// IID_IUnknown and all other system IIDs are provided in UUID.LIB
+// Link that library in with your proxies, clients and servers
+//////////////////////////////////////////////////////////////////
+
+#if (_MSC_VER >= 1100) && defined(__cplusplus) && !defined(CINTERFACE)
+    EXTERN_C const IID IID_IUnknown;
+    extern "C++"
+    {
+        MIDL_INTERFACE("00000000-0000-0000-C000-000000000046")
+        IUnknown
+        {
+        public:
+            BEGIN_INTERFACE
+            virtual HRESULT STDMETHODCALLTYPE QueryInterface(
+                /* [in] */ REFIID riid,
+                /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) = 0;
+
+            virtual ULONG STDMETHODCALLTYPE AddRef( void) = 0;
+
+            virtual ULONG STDMETHODCALLTYPE Release( void) = 0;
+
+            template<class Q>
+        HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
+        {
+            return QueryInterface(__uuidof(Q), (void **)pp);
+        }
+
+            END_INTERFACE
+        };
+    } // extern C++
+#else
+
+EXTERN_C const IID IID_IUnknown;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("00000000-0000-0000-C000-000000000046")
+    IUnknown
+    {
+    public:
+        BEGIN_INTERFACE
+        virtual HRESULT STDMETHODCALLTYPE QueryInterface(
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ void **ppvObject) = 0;
+
+        virtual ULONG STDMETHODCALLTYPE AddRef( void) = 0;
+
+        virtual ULONG STDMETHODCALLTYPE Release( void) = 0;
+
+        END_INTERFACE
+    };
+
+#else   /* C style interface */
+
+    typedef struct IUnknownVtbl
+    {
+        BEGIN_INTERFACE
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+            IUnknown * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ void **ppvObject);
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
+            IUnknown * This);
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
+            IUnknown * This);
+
+        END_INTERFACE
+    } IUnknownVtbl;
+
+    interface IUnknown
+    {
+        CONST_VTBL struct IUnknownVtbl *lpVtbl;
+    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define IUnknown_QueryInterface(This,riid,ppvObject)    \
+    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
+
+#define IUnknown_AddRef(This)   \
+    (This)->lpVtbl -> AddRef(This)
+
+#define IUnknown_Release(This)  \
+    (This)->lpVtbl -> Release(This)
+
+#endif /* COBJMACROS */
+
+
+#endif  /* C style interface */
+
+
+
+#endif  /* __IUnknown_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_unknwn_0005 */
+/* [local] */
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <guiddef.h>
+
+#if 0
+#define __reserved
+#define __inout
+#endif
+
+#include <poppack.h>
+
+#endif     // __OBJBASE_H__
diff --git a/base/Windows/Inc/sal.h b/base/Windows/Inc/sal.h
new file mode 100644
index 0000000..1369969
--- /dev/null
+++ b/base/Windows/Inc/sal.h
@@ -0,0 +1,729 @@
+/***
+*sal.h - markers for documenting the semantics of APIs
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       sal.h provides a set of annotations to describe how a function uses its
+*       parameters - the assumptions it makes about them, and the guarantees it makes
+*       upon finishing.
+*
+*       [Public]
+*
+****/
+
+/* 
+ -------------------------------------------------------------------------------
+ Introduction
+
+ sal.h provides a set of annotations to describe how a function uses its
+ parameters - the assumptions it makes about them, and the guarantees it makes
+ upon finishing.
+
+ Annotations may be placed before either a function parameter's type or its return
+ type, and describe the function's behavior regarding the parameter or return value.
+ There are two classes of annotations: buffer annotations and advanced annotations.
+ Buffer annotations describe how functions use their pointer parameters, and
+ advanced annotations either describe complex/unusual buffer behavior, or provide
+ additional information about a parameter that is not otherwise expressible.
+
+ -------------------------------------------------------------------------------
+ Buffer Annotations
+
+ The most important annotations in sal.h provide a consistent way to annotate
+ buffer parameters or return values for a function. Each of these annotations describes
+ a single buffer (which could be a string, a fixed-length or variable-length array,
+ or just a pointer) that the function interacts with: where it is, how large it is,
+ how much is initialized, and what the function does with it.
+
+ The appropriate macro for a given buffer can be constructed using the table below.
+ Just pick the appropriate values from each category, and combine them together
+ with a leading underscore. Some combinations of values do not make sense as buffer
+ annotations. Only meaningful annotations can be added to your code; for a list of
+ these, see the buffer annotation definitions section.
+
+ Only a single buffer annotation should be used for each parameter.
+
+ |------------|------------|---------|--------|----------|----------|---------------|
+ |   Level    |   Usage    |  Size   | Output | NullTerm | Optional |  Parameters   |
+ |------------|------------|---------|--------|----------|----------|---------------|
+ | <>         | <>         | <>      | <>     | _z       | <>       | <>            |
+ | _deref     | _in        | _ecount | _full  | _nz      | _opt     | (size)        |
+ | _deref_opt | _out       | _bcount | _part  |          |          | (size,length) |
+ |            | _inout     |         |        |          |          |               |
+ |            |            |         |        |          |          |               |
+ |------------|------------|---------|--------|----------|----------|---------------|
+
+ Level: Describes the buffer pointer's level of indirection from the parameter or
+          return value 'p'.
+
+ <>         : p is the buffer pointer.
+ _deref     : *p is the buffer pointer. p must not be NULL.
+ _deref_opt : *p may be the buffer pointer. p may be NULL, in which case the rest of
+                the annotation is ignored.
+
+ Usage: Describes how the function uses the buffer.
+
+ <>     : The buffer is not accessed. If used on the return value or with _deref, the
+            function will provide the buffer, and it will be uninitialized at exit.
+            Otherwise, the caller must provide the buffer. This should only be used
+            for alloc and free functions.
+ _in    : The function will only read from the buffer. The caller must provide the
+            buffer and initialize it. Cannot be used with _deref.
+ _out   : The function will only write to the buffer. If used on the return value or
+            with _deref, the function will provide the buffer and initialize it.
+            Otherwise, the caller must provide the buffer, and the function will
+            initialize it.
+ _inout : The function may freely read from and write to the buffer. The caller must
+            provide the buffer and initialize it. If used with _deref, the buffer may
+            be reallocated by the function.
+
+ Size: Describes the total size of the buffer. This may be less than the space actually
+         allocated for the buffer, in which case it describes the accessible amount.
+
+ <>      : No buffer size is given. If the type specifies the buffer size (such as
+             with LPSTR and LPWSTR), that amount is used. Otherwise, the buffer is one
+             element long. Must be used with _in, _out, or _inout.
+ _ecount : The buffer size is an explicit element count.
+ _bcount : The buffer size is an explicit byte count.
+
+ Output: Describes how much of the buffer will be initialized by the function. For
+           _inout buffers, this also describes how much is initialized at entry. Omit this
+           category for _in buffers; they must be fully initialized by the caller.
+
+ <>    : The type specifies how much is initialized. For instance, a function initializing
+           an LPWSTR must NULL-terminate the string.
+ _full : The function initializes the entire buffer.
+ _part : The function initializes part of the buffer, and explicitly indicates how much.
+
+ NullTerm: States if the present of a '\0' marks the end of valid elements in the buffer.
+ _z    : A '\0' indicated the end of the buffer
+ _nz	 : The buffer may not be null terminated and a '\0' does not indicate the end of the
+          buffer.
+ Optional: Describes if the buffer itself is optional.
+
+ <>   : The pointer to the buffer must not be NULL.
+ _opt : The pointer to the buffer might be NULL. It will be checked before being dereferenced.
+
+ Parameters: Gives explicit counts for the size and length of the buffer.
+
+ <>            : There is no explicit count. Use when neither _ecount nor _bcount is used.
+ (size)        : Only the buffer's total size is given. Use with _ecount or _bcount but not _part.
+ (size,length) : The buffer's total size and initialized length are given. Use with _ecount_part
+                   and _bcount_part.
+
+ -------------------------------------------------------------------------------
+ Buffer Annotation Examples
+
+ LWSTDAPI_(BOOL) StrToIntExA(
+     LPCSTR pszString,                    -- No annotation required, const implies __in.
+     DWORD dwFlags,
+     __out int *piRet                     -- A pointer whose dereference will be filled in.
+ );
+
+ void MyPaintingFunction(
+     __in HWND hwndControl,               -- An initialized read-only parameter.
+     __in_opt HDC hdcOptional,            -- An initialized read-only parameter that might be NULL.
+     __inout IPropertyStore *ppsStore     -- An initialized parameter that may be freely used
+                                          --   and modified.
+ );
+
+ LWSTDAPI_(BOOL) PathCompactPathExA(
+     __out_ecount(cchMax) LPSTR pszOut,   -- A string buffer with cch elements that will
+                                          --   be NULL terminated on exit.
+     LPCSTR pszSrc,                       -- No annotation required, const implies __in.
+     UINT cchMax,
+     DWORD dwFlags
+ );
+
+ HRESULT SHLocalAllocBytes(
+     size_t cb,
+     __deref_bcount(cb) T **ppv           -- A pointer whose dereference will be set to an
+                                          --   uninitialized buffer with cb bytes.
+ );
+
+ __inout_bcount_full(cb) : A buffer with cb elements that is fully initialized at
+     entry and exit, and may be written to by this function.
+
+ __out_ecount_part(count, *countOut) : A buffer with count elements that will be
+     partially initialized by this function. The function indicates how much it
+     initialized by setting *countOut.
+
+ -------------------------------------------------------------------------------
+ Advanced Annotations
+
+ Advanced annotations describe behavior that is not expressible with the regular
+ buffer macros. These may be used either to annotate buffer parameters that involve
+ complex or conditional behavior, or to enrich existing annotations with additional
+ information.
+
+ __success(expr) f :
+     <expr> indicates whether function f succeeded or not. If <expr> is true at exit,
+     all the function's guarantees (as given by other annotations) must hold. If <expr>
+     is false at exit, the caller should not expect any of the function's guarantees
+     to hold. If not used, the function must always satisfy its guarantees. Added
+     automatically to functions that indicate success in standard ways, such as by
+     returning an HRESULT.
+
+ __nullterminated p :
+     Pointer p is a buffer that may be read or written up to and including the first
+     NULL character or pointer. May be used on typedefs, which marks valid (properly
+     initialized) instances of that type as being NULL-terminated.
+
+ __nullnullterminated p :
+     Pointer p is a buffer that may be read or written up to and including the first
+     sequence of two NULL characters or pointers. May be used on typedefs, which marks
+     valid instances of that type as being double-NULL terminated.
+
+ __reserved v :
+     Value v must be 0/NULL, reserved for future use.
+
+ __checkReturn v :
+     Return value v must not be ignored by callers of this function.
+
+ __typefix(ctype) v :
+     Value v should be treated as an instance of ctype, rather than its declared type.
+
+ __override f :
+     Specify C#-style 'override' behaviour for overriding virtual methods.
+
+ __callback f :
+     Function f can be used as a function pointer.
+
+ __format_string p :
+     Pointer p is a string that contains % markers in the style of printf.
+
+ __blocksOn(resource) f :
+     Function f blocks on the resource 'resource'.
+
+ __fallthrough :
+     Annotates switch statement labels where fall-through is desired, to distinguish
+     from forgotten break statements.
+
+ -------------------------------------------------------------------------------
+ Advanced Annotation Examples
+
+ __success(return == TRUE) LWSTDAPI_(BOOL) 
+ PathCanonicalizeA(__out_ecount(MAX_PATH) LPSTR pszBuf, LPCSTR pszPath) :
+     pszBuf is only guaranteed to be NULL-terminated when TRUE is returned.
+
+ typedef __nullterminated WCHAR* LPWSTR : Initialized LPWSTRs are NULL-terminated strings.
+
+ __out_ecount(cch) __typefix(LPWSTR) void *psz : psz is a buffer parameter which will be
+     a NULL-terminated WCHAR string at exit, and which initially contains cch WCHARs.
+
+ -------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#define __specstrings
+
+#ifdef  __cplusplus
+#ifndef __nothrow
+# define __nothrow __declspec(nothrow)
+#endif
+extern "C" {
+#else
+#ifndef __nothrow
+# define __nothrow
+#endif
+#endif  /* #ifdef __cplusplus */
+
+/*
+ -------------------------------------------------------------------------------
+ Helper Macro Definitions
+
+ These express behavior common to many of the high-level annotations.
+ DO NOT USE THESE IN YOUR CODE.
+ -------------------------------------------------------------------------------
+*/
+
+/*
+The helper annotations are only understood by the compiler version used by various
+defect detection tools. When the regular compiler is running, they are defined into
+nothing, and do not affect the compiled code.
+*/
+
+#if !defined(__midl) && defined(_PREFAST_) 
+
+    /*
+     In the primitive __declspec("SAL_*") annotations "SAL" stands for Standard
+     Annotation Language.  These __declspec("SAL_*") annotations are the
+     primitives the compiler understands and all high-level SpecString MACROs
+     will decompose into these primivates.
+    */
+
+    #define SPECSTRINGIZE( x ) #x
+
+    /*
+     __null p
+     __notnull p
+     __maybenull p
+    
+     Annotates a pointer p. States that pointer p is null. Commonly used
+     in the negated form __notnull or the possibly null form __maybenull.
+    */
+
+    #define __null                  __declspec("SAL_null")
+    #define __notnull               __declspec("SAL_notnull")
+    #define __maybenull             __declspec("SAL_maybenull")
+
+    /*
+     __readonly l
+     __notreadonly l
+     __mabyereadonly l
+    
+     Annotates a location l. States that location l is not modified after
+     this point.  If the annotation is placed on the precondition state of
+     a function, the restriction only applies until the postcondition state
+     of the function.  __maybereadonly states that the annotated location
+     may be modified, whereas __notreadonly states that a location must be
+     modified.
+    */
+
+    #define __readonly              __declspec("SAL_readonly")
+    #define __notreadonly           __declspec("SAL_notreadonly")
+    #define __maybereadonly         __declspec("SAL_maybereadonly")
+
+    /*
+     __valid v
+     __notvalid v
+     __maybevalid v
+    
+     Annotates any value v. States that the value satisfies all properties of
+     valid values of its type. For example, for a string buffer, valid means
+     that the buffer pointer is either NULL or points to a NULL-terminated string.
+    */
+
+    #define __valid                 __declspec("SAL_valid")
+    #define __notvalid              __declspec("SAL_notvalid")
+    #define __maybevalid            __declspec("SAL_maybevalid")
+
+    /*
+     __readableTo(extent) p
+    
+     Annotates a buffer pointer p.  If the buffer can be read, extent describes
+     how much of the buffer is readable. For a reader of the buffer, this is
+     an explicit permission to read up to that amount, rather than a restriction to
+     read only up to it.
+    */
+
+    #define __readableTo(extent)    __declspec("SAL_readableTo("SPECSTRINGIZE(extent)")")
+
+    /*
+    
+     __elem_readableTo(size)
+    
+     Annotates a buffer pointer p as being readable to size elements.
+    */
+
+    #define __elem_readableTo(size)   __declspec("SAL_readableTo(elementCount("SPECSTRINGIZE(size)"))")
+    
+    /*
+     __byte_readableTo(size)
+    
+     Annotates a buffer pointer p as being readable to size bytes.
+    */
+    #define __byte_readableTo(size)   __declspec("SAL_readableTo(byteCount("SPECSTRINGIZE(size)"))")
+    
+    /*
+     __writableTo(extent) p
+    
+     Annotates a buffer pointer p. If the buffer can be modified, extent
+     describes how much of the buffer is writable (usually the allocation
+     size). For a writer of the buffer, this is an explicit permission to
+     write up to that amount, rather than a restriction to write only up to it.
+    */
+    #define __writableTo(size)   __declspec("SAL_writableTo("SPECSTRINGIZE(size)")")
+
+    /*
+     __elem_writableTo(size)
+    
+     Annotates a buffer pointer p as being writable to size elements.
+    */
+    #define __elem_writableTo(size)   __declspec("SAL_writableTo(elementCount("SPECSTRINGIZE(size)"))")
+    
+    /*
+     __byte_writableTo(size)
+    
+     Annotates a buffer pointer p as being writable to size bytes.
+    */
+    #define __byte_writableTo(size)   __declspec("SAL_writableTo(byteCount("SPECSTRINGIZE(size)"))")
+
+    /*
+     __deref p
+    
+     Annotates a pointer p. The next annotation applies one dereference down
+     in the type. If readableTo(p, size) then the next annotation applies to
+     all elements *(p+i) for which i satisfies the size. If p is a pointer
+     to a struct, the next annotation applies to all fields of the struct.
+    */
+    #define __deref                 __declspec("SAL_deref")
+    
+    /*
+     __pre __next_annotation
+    
+     The next annotation applies in the precondition state
+    */
+    #define __pre                   __declspec("SAL_pre")
+    
+    /*
+     __post __next_annotation
+    
+     The next annotation applies in the postcondition state
+    */
+    #define __post                  __declspec("SAL_post")
+    
+    /*
+     __precond(<expr>)
+    
+     When <expr> is true, the next annotation applies in the precondition state
+     (currently not enabled)
+    */
+    #define __precond(expr)         __pre
+
+    /*
+     __postcond(<expr>)
+    
+     When <expr> is true, the next annotation applies in the postcondition state
+     (currently not enabled)
+    */
+    #define __postcond(expr)        __post
+
+    /*
+     __exceptthat
+    
+     Given a set of annotations Q containing __exceptthat maybeP, the effect of
+     the except clause is to erase any P or notP annotations (explicit or
+     implied) within Q at the same level of dereferencing that the except
+     clause appears, and to replace it with maybeP.
+    
+      Example 1: __valid __exceptthat __maybenull on a pointer p means that the
+                 pointer may be null, and is otherwise valid, thus overriding
+                 the implicit notnull annotation implied by __valid on
+                 pointers.
+    
+      Example 2: __valid __deref __exceptthat __maybenull on an int **p means
+                 that p is not null (implied by valid), but the elements
+                 pointed to by p could be null, and are otherwise valid. 
+    */
+    #define __exceptthat                __declspec("SAL_except")
+    #define __execeptthat               __exceptthat
+ 
+    /*
+     _refparam
+    
+     Added to all out parameter macros to indicate that they are all reference
+     parameters.
+    */
+    #define __refparam                  __deref __notreadonly
+
+    /*
+     __inner_*
+    
+     Helper macros that directly correspond to certain high-level annotations.
+    
+    */
+
+    /*
+     Macros to classify the entrypoints and indicate their category.
+    
+     Pre-defined control point categories include: RPC, LPC, DeviceDriver, UserToKernel, ISAPI, COM.
+    
+    */
+    #define __inner_control_entrypoint(category) __declspec("SAL_entrypoint(controlEntry, "SPECSTRINGIZE(category)")")
+
+    /*
+     Pre-defined data entry point categories include: Registry, File, Network.
+    */
+    #define __inner_data_entrypoint(category)    __declspec("SAL_entrypoint(dataEntry, "SPECSTRINGIZE(category)")")
+
+    #define __inner_success(expr)               __declspec("SAL_success("SPECSTRINGIZE(expr)")")
+    #define __inner_checkReturn                 __declspec("SAL_checkReturn")
+    #define __inner_typefix(ctype)              __declspec("SAL_typefix("SPECSTRINGIZE(ctype)")")
+    #define __inner_override                    __declspec("__override")
+    #define __inner_callback                    __declspec("__callback")
+    #define __inner_blocksOn(resource)          __declspec("SAL_blocksOn("SPECSTRINGIZE(resource)")")
+    #define __inner_fallthrough_dec             __inline __nothrow void __FallThrough() {}
+    #define __inner_fallthrough                 __FallThrough();
+
+#else
+    #define __null
+    #define __notnull
+    #define __maybenull
+    #define __readonly
+    #define __notreadonly
+    #define __maybereadonly
+    #define __valid
+    #define __notvalid
+    #define __maybevalid
+    #define __readableTo(extent)
+    #define __elem_readableTo(size)
+    #define __byte_readableTo(size)
+    #define __writableTo(size)
+    #define __elem_writableTo(size)
+    #define __byte_writableTo(size)
+    #define __deref
+    #define __pre
+    #define __post
+    #define __precond(expr)
+    #define __postcond(expr)
+    #define __exceptthat
+    #define __execeptthat
+    #define __inner_success(expr)
+    #define __inner_checkReturn
+    #define __inner_typefix(ctype)
+    #define __inner_override
+    #define __inner_callback
+    #define __inner_blocksOn(resource)
+    #define __inner_fallthrough_dec
+    #define __inner_fallthrough
+    #define __refparam
+    #define __inner_control_entrypoint(category)
+    #define __inner_data_entrypoint(category)
+#endif /* #if !defined(__midl) && defined(_PREFAST_) */
+
+/* 
+-------------------------------------------------------------------------------
+Buffer Annotation Definitions
+
+Any of these may be used to directly annotate functions, but only one should
+be used for each parameter. To determine which annotation to use for a given
+buffer, use the table in the buffer annotations section.
+-------------------------------------------------------------------------------
+*/
+
+#define __ecount(size)                                          __notnull __elem_writableTo(size)
+#define __bcount(size)                                          __notnull __byte_writableTo(size)
+#define __in                                                    __pre __valid __pre __deref __readonly
+#define __in_ecount(size)                                       __in __pre __elem_readableTo(size)
+#define __in_bcount(size)                                       __in __pre __byte_readableTo(size)
+#define __in_z                                                  __in __pre __nullterminated
+#define __in_ecount_z(size)                                     __in_ecount(size) __pre __nullterminated
+#define __in_bcount_z(size)                                     __in_bcount(size) __pre __nullterminated
+#define __in_nz                                                 __in
+#define __in_ecount_nz(size)                                    __in_ecount(size)
+#define __in_bcount_nz(size)                                    __in_bcount(size)
+#define __out                                                   __ecount(1) __post __valid __refparam
+#define __out_ecount(size)                                      __ecount(size) __post __valid __refparam
+#define __out_bcount(size)                                      __bcount(size) __post __valid __refparam
+#define __out_ecount_part(size,length)                          __out_ecount(size) __post __elem_readableTo(length)
+#define __out_bcount_part(size,length)                          __out_bcount(size) __post __byte_readableTo(length)
+#define __out_ecount_full(size)                                 __out_ecount_part(size,size)
+#define __out_bcount_full(size)                                 __out_bcount_part(size,size)
+#define __out_z                                                 __post __valid __refparam __post __nullterminated
+#define __out_z_opt                                             __post __valid __refparam __post __nullterminated __exceptthat __maybenull
+#define __out_ecount_z(size)                                    __ecount(size) __post __valid __refparam __post __nullterminated
+#define __out_bcount_z(size)                                    __bcount(size) __post __valid __refparam __post __nullterminated
+#define __out_ecount_part_z(size,length)                        __out_ecount_part(size,length) __post __nullterminated
+#define __out_bcount_part_z(size,length)                        __out_bcount_part(size,length) __post __nullterminated
+#define __out_ecount_full_z(size)                               __out_ecount_full(size) __post __nullterminated
+#define __out_bcount_full_z(size)                               __out_bcount_full(size) __post __nullterminated
+#define __out_nz                                                __post __valid __refparam __post
+#define __out_nz_opt                                            __post __valid __refparam __post __exceptthat __maybenull
+#define __out_ecount_nz(size)                                   __ecount(size) __post __valid __refparam
+#define __out_bcount_nz(size)                                   __bcount(size) __post __valid __refparam
+#define __inout                                                 __pre __valid __post __valid __refparam
+#define __inout_ecount(size)                                    __out_ecount(size) __pre __valid
+#define __inout_bcount(size)                                    __out_bcount(size) __pre __valid
+#define __inout_ecount_part(size,length)                        __out_ecount_part(size,length) __pre __valid __pre __elem_readableTo(length)
+#define __inout_bcount_part(size,length)                        __out_bcount_part(size,length) __pre __valid __pre __byte_readableTo(length)
+#define __inout_ecount_full(size)                               __inout_ecount_part(size,size)
+#define __inout_bcount_full(size)                               __inout_bcount_part(size,size)
+#define __inout_z                                               __inout __pre __nullterminated __post __nullterminated
+#define __inout_ecount_z(size)                                  __inout_ecount(size) __pre __nullterminated __post __nullterminated
+#define __inout_bcount_z(size)                                  __inout_bcount(size) __pre __nullterminated __post __nullterminated
+#define __inout_nz                                              __inout
+#define __inout_ecount_nz(size)                                 __inout_ecount(size) 
+#define __inout_bcount_nz(size)                                 __inout_bcount(size) 
+#define __ecount_opt(size)                                      __ecount(size)                              __exceptthat __maybenull
+#define __bcount_opt(size)                                      __bcount(size)                              __exceptthat __maybenull
+#define __in_opt                                                __in                                        __exceptthat __maybenull
+#define __in_ecount_opt(size)                                   __in_ecount(size)                           __exceptthat __maybenull
+#define __in_bcount_opt(size)                                   __in_bcount(size)                           __exceptthat __maybenull
+#define __in_z_opt                                              __in_opt __pre __nullterminated 
+#define __in_ecount_z_opt(size)                                 __in_ecount_opt(size) __pre __nullterminated 
+#define __in_bcount_z_opt(size)                                 __in_bcount_opt(size) __pre __nullterminated
+#define __in_nz_opt                                             __in_opt                                     
+#define __in_ecount_nz_opt(size)                                __in_ecount_opt(size)                         
+#define __in_bcount_nz_opt(size)                                __in_bcount_opt(size)                         
+#define __out_opt                                               __out                                       __exceptthat __maybenull
+#define __out_ecount_opt(size)                                  __out_ecount(size)                          __exceptthat __maybenull
+#define __out_bcount_opt(size)                                  __out_bcount(size)                          __exceptthat __maybenull
+#define __out_ecount_part_opt(size,length)                      __out_ecount_part(size,length)              __exceptthat __maybenull
+#define __out_bcount_part_opt(size,length)                      __out_bcount_part(size,length)              __exceptthat __maybenull
+#define __out_ecount_full_opt(size)                             __out_ecount_full(size)                     __exceptthat __maybenull
+#define __out_bcount_full_opt(size)                             __out_bcount_full(size)                     __exceptthat __maybenull
+#define __out_ecount_z_opt(size)                                __out_ecount_opt(size) __post __nullterminated
+#define __out_bcount_z_opt(size)                                __out_bcount_opt(size) __post __nullterminated
+#define __out_ecount_part_z_opt(size,length)                    __out_ecount_part_opt(size,length) __post __nullterminated
+#define __out_bcount_part_z_opt(size,length)                    __out_bcount_part_opt(size,length) __post __nullterminated
+#define __out_ecount_full_z_opt(size)                           __out_ecount_full_opt(size) __post __nullterminated
+#define __out_bcount_full_z_opt(size)                           __out_bcount_full_opt(size) __post __nullterminated
+#define __out_ecount_nz_opt(size)                               __out_ecount_opt(size) __post __nullterminated                       
+#define __out_bcount_nz_opt(size)                               __out_bcount_opt(size) __post __nullterminated                        
+#define __inout_opt                                             __inout                                     __exceptthat __maybenull
+#define __inout_ecount_opt(size)                                __inout_ecount(size)                        __exceptthat __maybenull
+#define __inout_bcount_opt(size)                                __inout_bcount(size)                        __exceptthat __maybenull
+#define __inout_ecount_part_opt(size,length)                    __inout_ecount_part(size,length)            __exceptthat __maybenull
+#define __inout_bcount_part_opt(size,length)                    __inout_bcount_part(size,length)            __exceptthat __maybenull
+#define __inout_ecount_full_opt(size)                           __inout_ecount_full(size)                   __exceptthat __maybenull
+#define __inout_bcount_full_opt(size)                           __inout_bcount_full(size)                   __exceptthat __maybenull
+#define __inout_z_opt                                           __inout_opt __pre __nullterminated __post __nullterminated
+#define __inout_ecount_z_opt(size)                              __inout_ecount_opt(size) __pre __nullterminated __post __nullterminated
+#define __inout_ecount_z_opt(size)                              __inout_ecount_opt(size) __pre __nullterminated __post __nullterminated
+#define __inout_bcount_z_opt(size)                              __inout_bcount_opt(size) 
+#define __inout_nz_opt                                          __inout_opt
+#define __inout_ecount_nz_opt(size)                             __inout_ecount_opt(size)
+#define __inout_bcount_nz_opt(size)                             __inout_bcount_opt(size)
+#define __deref_ecount(size)                                    __ecount(1) __post __elem_readableTo(1) __post __deref __notnull __post __deref __elem_writableTo(size)
+#define __deref_bcount(size)                                    __ecount(1) __post __elem_readableTo(1) __post __deref __notnull __post __deref __byte_writableTo(size)
+#define __deref_out                                             __deref_ecount(1) __post __deref __valid __refparam
+#define __deref_out_ecount(size)                                __deref_ecount(size) __post __deref __valid __refparam
+#define __deref_out_bcount(size)                                __deref_bcount(size) __post __deref __valid __refparam
+#define __deref_out_ecount_part(size,length)                    __deref_out_ecount(size) __post __deref __elem_readableTo(length)
+#define __deref_out_bcount_part(size,length)                    __deref_out_bcount(size) __post __deref __byte_readableTo(length)
+#define __deref_out_ecount_full(size)                           __deref_out_ecount_part(size,size)
+#define __deref_out_bcount_full(size)                           __deref_out_bcount_part(size,size)
+#define __deref_out_z                                           __post __deref __valid __refparam __post __deref __nullterminated
+#define __deref_out_ecount_z(size)                              __deref_out_ecount(size) __post __deref __nullterminated  
+#define __deref_out_bcount_z(size)                              __deref_out_ecount(size) __post __deref __nullterminated  
+#define __deref_out_nz                                          __deref_out
+#define __deref_out_ecount_nz(size)                             __deref_out_ecount(size)   
+#define __deref_out_bcount_nz(size)                             __deref_out_ecount(size)   
+#define __deref_inout                                           __notnull __elem_readableTo(1) __pre __deref __valid __post __deref __valid __refparam
+#define __deref_inout_z                                         __deref_inout __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_inout_ecount(size)                              __deref_inout __pre __deref __elem_writableTo(size) __post __deref __elem_writableTo(size)
+#define __deref_inout_bcount(size)                              __deref_inout __pre __deref __byte_writableTo(size) __post __deref __byte_writableTo(size)
+#define __deref_inout_ecount_part(size,length)                  __deref_inout_ecount(size) __pre __deref __elem_readableTo(length) __post __deref __elem_readableTo(length)
+#define __deref_inout_bcount_part(size,length)                  __deref_inout_bcount(size) __pre __deref __byte_readableTo(length) __post __deref __byte_readableTo(length)
+#define __deref_inout_ecount_full(size)                         __deref_inout_ecount_part(size,size)
+#define __deref_inout_bcount_full(size)                         __deref_inout_bcount_part(size,size)
+#define __deref_inout_z                                         __deref_inout __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_inout_ecount_z(size)                            __deref_inout_ecount(size) __pre __deref __nullterminated __post __deref __nullterminated   
+#define __deref_inout_bcount_z(size)                            __deref_inout_ecount(size) __pre __deref __nullterminated __post __deref __nullterminated  
+#define __deref_inout_nz                                        __deref_inout
+#define __deref_inout_ecount_nz(size)                           __deref_inout_ecount(size)   
+#define __deref_inout_bcount_nz(size)                           __deref_inout_ecount(size)   
+#define __deref_ecount_opt(size)                                __deref_ecount(size)                        __post __deref __exceptthat __maybenull
+#define __deref_bcount_opt(size)                                __deref_bcount(size)                        __post __deref __exceptthat __maybenull
+#define __deref_out_opt                                         __deref_out                                 __post __deref __exceptthat __maybenull
+#define __deref_out_ecount_opt(size)                            __deref_out_ecount(size)                    __post __deref __exceptthat __maybenull
+#define __deref_out_bcount_opt(size)                            __deref_out_bcount(size)                    __post __deref __exceptthat __maybenull
+#define __deref_out_ecount_part_opt(size,length)                __deref_out_ecount_part(size,length)        __post __deref __exceptthat __maybenull
+#define __deref_out_bcount_part_opt(size,length)                __deref_out_bcount_part(size,length)        __post __deref __exceptthat __maybenull
+#define __deref_out_ecount_full_opt(size)                       __deref_out_ecount_full(size)               __post __deref __exceptthat __maybenull
+#define __deref_out_bcount_full_opt(size)                       __deref_out_bcount_full(size)               __post __deref __exceptthat __maybenull
+#define __deref_out_z_opt                                       __post __deref __valid __refparam __execeptthat __maybenull __post __deref __nullterminated
+#define __deref_out_ecount_z_opt(size)                          __deref_out_ecount_opt(size) __post __deref __nullterminated
+#define __deref_out_bcount_z_opt(size)                          __deref_out_bcount_opt(size) __post __deref __nullterminated
+#define __deref_out_nz_opt                                      __deref_out_opt
+#define __deref_out_ecount_nz_opt(size)                         __deref_out_ecount_opt(size)
+#define __deref_out_bcount_nz_opt(size)                         __deref_out_bcount_opt(size)
+#define __deref_inout_opt                                       __deref_inout                               __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_ecount_opt(size)                          __deref_inout_ecount(size)                  __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_bcount_opt(size)                          __deref_inout_bcount(size)                  __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_ecount_part_opt(size,length)              __deref_inout_ecount_part(size,length)      __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_bcount_part_opt(size,length)              __deref_inout_bcount_part(size,length)      __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_ecount_full_opt(size)                     __deref_inout_ecount_full(size)             __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_bcount_full_opt(size)                     __deref_inout_bcount_full(size)             __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull
+#define __deref_inout_z_opt                                     __deref_inout_opt __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_inout_ecount_z_opt(size)                        __deref_inout_ecount_opt(size) __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_inout_bcount_z_opt(size)                        __deref_inout_bcount_opt(size) __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_inout_nz_opt                                    __deref_inout_opt 
+#define __deref_inout_ecount_nz_opt(size)                       __deref_inout_ecount_opt(size)
+#define __deref_inout_bcount_nz_opt(size)                       __deref_inout_bcount_opt(size)
+#define __deref_opt_ecount(size)                                __deref_ecount(size)                        __exceptthat __maybenull
+#define __deref_opt_bcount(size)                                __deref_bcount(size)                        __exceptthat __maybenull
+#define __deref_opt_out                                         __deref_out                                 __exceptthat __maybenull
+#define __deref_opt_out_z                                       __deref_opt_out __post __deref __nullterminated
+#define __deref_opt_out_ecount(size)                            __deref_out_ecount(size)                    __exceptthat __maybenull
+#define __deref_opt_out_bcount(size)                            __deref_out_bcount(size)                    __exceptthat __maybenull
+#define __deref_opt_out_ecount_part(size,length)                __deref_out_ecount_part(size,length)        __exceptthat __maybenull
+#define __deref_opt_out_bcount_part(size,length)                __deref_out_bcount_part(size,length)        __exceptthat __maybenull
+#define __deref_opt_out_ecount_full(size)                       __deref_out_ecount_full(size)               __exceptthat __maybenull
+#define __deref_opt_out_bcount_full(size)                       __deref_out_bcount_full(size)               __exceptthat __maybenull
+#define __deref_opt_inout                                       __deref_inout                               __exceptthat __maybenull
+#define __deref_opt_inout_ecount(size)                          __deref_inout_ecount(size)                  __exceptthat __maybenull
+#define __deref_opt_inout_bcount(size)                          __deref_inout_bcount(size)                  __exceptthat __maybenull
+#define __deref_opt_inout_ecount_part(size,length)              __deref_inout_ecount_part(size,length)      __exceptthat __maybenull
+#define __deref_opt_inout_bcount_part(size,length)              __deref_inout_bcount_part(size,length)      __exceptthat __maybenull
+#define __deref_opt_inout_ecount_full(size)                     __deref_inout_ecount_full(size)             __exceptthat __maybenull
+#define __deref_opt_inout_bcount_full(size)                     __deref_inout_bcount_full(size)             __exceptthat __maybenull
+#define __deref_opt_inout_z                                     __deref_opt_inout __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_opt_inout_ecount_z(size)                        __deref_opt_inout_ecount(size) __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_opt_inout_bcount_z(size)                        __deref_opt_inout_bcount(size) __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_opt_inout_nz                                    __deref_opt_inout
+#define __deref_opt_inout_ecount_nz(size)                       __deref_opt_inout_ecount(size)
+#define __deref_opt_inout_bcount_nz(size)                       __deref_opt_inout_bcount(size)
+#define __deref_opt_ecount_opt(size)                            __deref_ecount_opt(size)                    __exceptthat __maybenull
+#define __deref_opt_bcount_opt(size)                            __deref_bcount_opt(size)                    __exceptthat __maybenull
+#define __deref_opt_out_opt                                     __deref_out_opt                             __exceptthat __maybenull
+#define __deref_opt_out_ecount_opt(size)                        __deref_out_ecount_opt(size)                __exceptthat __maybenull
+#define __deref_opt_out_bcount_opt(size)                        __deref_out_bcount_opt(size)                __exceptthat __maybenull
+#define __deref_opt_out_ecount_part_opt(size,length)            __deref_out_ecount_part_opt(size,length)    __exceptthat __maybenull
+#define __deref_opt_out_bcount_part_opt(size,length)            __deref_out_bcount_part_opt(size,length)    __exceptthat __maybenull
+#define __deref_opt_out_ecount_full_opt(size)                   __deref_out_ecount_full_opt(size)           __exceptthat __maybenull
+#define __deref_opt_out_bcount_full_opt(size)                   __deref_out_bcount_full_opt(size)           __exceptthat __maybenull
+#define __deref_opt_out_z_opt                                   __post __deref __valid __refparam __exceptthat __maybenull __pre __deref __exceptthat __maybenull __post __deref __exceptthat __maybenull __post __deref __nullterminated
+#define __deref_opt_out_ecount_z_opt(size)                      __deref_opt_out_ecount_opt(size) __post __deref __nullterminated
+#define __deref_opt_out_bcount_z_opt(size)                      __deref_opt_out_bcount_opt(size) __post __deref __nullterminated
+#define __deref_opt_out_nz_opt                                  __deref_opt_out_opt
+#define __deref_opt_out_ecount_nz_opt(size)                     __deref_opt_out_ecount_opt(size)    
+#define __deref_opt_out_bcount_nz_opt(size)                     __deref_opt_out_bcount_opt(size)    
+#define __deref_opt_inout_opt                                   __deref_inout_opt                           __exceptthat __maybenull
+#define __deref_opt_inout_ecount_opt(size)                      __deref_inout_ecount_opt(size)              __exceptthat __maybenull
+#define __deref_opt_inout_bcount_opt(size)                      __deref_inout_bcount_opt(size)              __exceptthat __maybenull
+#define __deref_opt_inout_ecount_part_opt(size,length)          __deref_inout_ecount_part_opt(size,length)  __exceptthat __maybenull
+#define __deref_opt_inout_bcount_part_opt(size,length)          __deref_inout_bcount_part_opt(size,length)  __exceptthat __maybenull
+#define __deref_opt_inout_ecount_full_opt(size)                 __deref_inout_ecount_full_opt(size)         __exceptthat __maybenull
+#define __deref_opt_inout_bcount_full_opt(size)                 __deref_inout_bcount_full_opt(size)         __exceptthat __maybenull
+#define __deref_opt_inout_z_opt                                 __deref_opt_inout_opt  __pre __deref __nullterminated __post __deref __nullterminated             
+#define __deref_opt_inout_ecount_z_opt(size)                    __deref_opt_inout_ecount_opt(size)  __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_opt_inout_bcount_z_opt(size)                    __deref_opt_inout_bcount_opt(size)  __pre __deref __nullterminated __post __deref __nullterminated
+#define __deref_opt_inout_nz_opt                                __deref_opt_inout_opt               
+#define __deref_opt_inout_ecount_nz_opt(size)                   __deref_opt_inout_ecount_opt(size)  
+#define __deref_opt_inout_bcount_nz_opt(size)                   __deref_opt_inout_bcount_opt(size)  
+
+/*
+-------------------------------------------------------------------------------
+Advanced Annotation Definitions
+
+Any of these may be used to directly annotate functions, and may be used in
+combination with each other or with regular buffer macros. For an explanation
+of each annotation, see the advanced annotations section.
+-------------------------------------------------------------------------------
+*/
+
+#define __success(expr)                     __inner_success(expr)
+#define __nullterminated                    __readableTo(sentinel(0))
+#define __nullnullterminated
+#define __reserved                          __pre __null
+#define __checkReturn                       __inner_checkReturn
+#define __typefix(ctype)                    __inner_typefix(ctype)
+#define __override                          __inner_override
+#define __callback                          __inner_callback
+#define __format_string
+#define __blocksOn(resource)                __inner_blocksOn(resource)
+#define __control_entrypoint(category)      __inner_control_entrypoint(category)
+#define __data_entrypoint(category)         __inner_data_entrypoint(category)
+
+#ifndef __fallthrough
+    __inner_fallthrough_dec
+    #define __fallthrough __inner_fallthrough
+#endif
+
+#ifndef __analysis_assume
+#ifdef _PREFAST_
+#define __analysis_assume(expr) __assume(expr)
+#else
+#define __analysis_assume(expr) 
+#endif
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+
diff --git a/base/Windows/Inc/stdarg.h b/base/Windows/Inc/stdarg.h
new file mode 100644
index 0000000..1a53ef0
--- /dev/null
+++ b/base/Windows/Inc/stdarg.h
@@ -0,0 +1,33 @@
+/***
+*stdarg.h - defines ANSI-style macros for variable argument functions
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file defines ANSI-style macros for accessing arguments
+*       of functions which take a variable number of arguments.
+*       [ANSI]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_STDARG
+#define _INC_STDARG
+
+#if     !defined(_WIN32)
+#error ERROR: Only Win32 target supported!
+#endif
+
+
+#include <vadefs.h>
+
+#define va_start _crt_va_start
+#define va_arg _crt_va_arg
+#define va_end _crt_va_end
+
+#endif  /* _INC_STDARG */
diff --git a/base/Windows/Inc/stddef.h b/base/Windows/Inc/stddef.h
new file mode 100644
index 0000000..4cf79bf
--- /dev/null
+++ b/base/Windows/Inc/stddef.h
@@ -0,0 +1,78 @@
+/***
+*stddef.h - definitions/declarations for common constants, types, variables
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file contains definitions and declarations for some commonly
+*       used constants, types, and variables.
+*       [ANSI]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_STDDEF
+#define _INC_STDDEF
+
+#include <crtdefs.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Define NULL pointer value */
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+
+/* Declare reference to errno */
+#ifndef _CRT_ERRNO_DEFINED
+#define _CRT_ERRNO_DEFINED
+_CRTIMP extern int * __cdecl _errno(void);
+#define errno   (*_errno())
+
+errno_t __cdecl _set_errno(__in int _Value);
+errno_t __cdecl _get_errno(__out int * _Value);
+#endif
+
+/* Define offsetof macro */
+#ifdef __cplusplus
+
+#ifdef  _WIN64
+#define offsetof(s,m)   (size_t)( (ptrdiff_t)&reinterpret_cast<const volatile char&>((((s *)0)->m)) )
+#else
+#define offsetof(s,m)   (size_t)&reinterpret_cast<const volatile char&>((((s *)0)->m))
+#endif
+
+#else
+
+#ifdef  _WIN64
+#define offsetof(s,m)   (size_t)( (ptrdiff_t)&(((s *)0)->m) )
+#else
+#define offsetof(s,m)   (size_t)&(((s *)0)->m)
+#endif
+
+#endif	/* __cplusplus */
+
+#ifdef  _MT
+_CRTIMP extern unsigned long  __cdecl __threadid(void);
+#define _threadid       (__threadid())
+_CRTIMP extern uintptr_t __cdecl __threadhandle(void);
+#endif
+
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  /* _INC_STDDEF */
diff --git a/base/Windows/Inc/stdio.h b/base/Windows/Inc/stdio.h
new file mode 100644
index 0000000..e3135f5
--- /dev/null
+++ b/base/Windows/Inc/stdio.h
@@ -0,0 +1,705 @@
+/***
+*stdio.h - definitions/declarations for standard I/O routines
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file defines the structures, values, macros, and functions
+*       used by the level 2 I/O ("standard I/O") routines.
+*       [ANSI/System V]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_STDIO
+#define _INC_STDIO
+
+#include <crtdefs.h>
+#ifdef  _MSC_VER
+/*
+ * Currently, all MS C compilers for Win32 platforms default to 8 byte
+ * alignment.
+ */
+#pragma pack(push,_CRT_PACKING)
+#endif  /* _MSC_VER */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+/* Buffered I/O macros */
+
+#define BUFSIZ  512
+
+
+/*
+ * Default number of supported streams. _NFILE is confusing and obsolete, but
+ * supported anyway for backwards compatibility.
+ */
+#define _NFILE      _NSTREAM_
+
+#define _NSTREAM_   512
+
+/*
+ * Number of entries in _iob[] (declared below). Note that _NSTREAM_ must be
+ * greater than or equal to _IOB_ENTRIES.
+ */
+#define _IOB_ENTRIES 20
+
+#define EOF     (-1)
+
+
+#ifndef _FILE_DEFINED
+struct _iobuf {
+        char *_ptr;
+        int   _cnt;
+        char *_base;
+        int   _flag;
+        int   _file;
+        int   _charbuf;
+        int   _bufsiz;
+        char *_tmpfname;
+        };
+typedef struct _iobuf FILE;
+#define _FILE_DEFINED
+#endif
+
+
+/* Directory where temporary files may be created. */
+
+#ifdef  _POSIX_
+#define _P_tmpdir   "/"
+#define _wP_tmpdir  L"/"
+#else
+#define _P_tmpdir   "\\"
+#define _wP_tmpdir  L"\\"
+#endif
+
+/* L_tmpnam = length of string _P_tmpdir
+ *            + 1 if _P_tmpdir does not end in "/" or "\", else 0
+ *            + 12 (for the filename string)
+ *            + 1 (for the null terminator)
+ * L_tmpnam_s = length of string _P_tmpdir
+ *            + 1 if _P_tmpdir does not end in "/" or "\", else 0
+ *            + 16 (for the filename string)
+ *            + 1 (for the null terminator)
+ */
+#define L_tmpnam   (sizeof(_P_tmpdir) + 12)
+#if __STDC_WANT_SECURE_LIB__
+#define L_tmpnam_s (sizeof(_P_tmpdir) + 16)
+#endif
+
+#ifdef  _POSIX_
+#define L_ctermid   9
+#define L_cuserid   32
+#endif
+
+
+/* Seek method constants */
+
+#define SEEK_CUR    1
+#define SEEK_END    2
+#define SEEK_SET    0
+
+
+#define FILENAME_MAX    260
+#define FOPEN_MAX       20
+#define _SYS_OPEN       20
+#define TMP_MAX         32767  /* SHRT_MAX */
+#if __STDC_WANT_SECURE_LIB__
+#define _TMP_MAX_S      2147483647 /* INT_MAX */
+#endif
+
+/* Define NULL pointer value */
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+/* Declare _iob[] array */
+
+#ifndef _STDIO_DEFINED
+_CRTIMP FILE * __cdecl __iob_func(void);
+#endif  /* _STDIO_DEFINED */
+
+
+/* Define file position type */
+
+#ifndef _FPOS_T_DEFINED
+#undef _FPOSOFF
+
+#if     defined (_POSIX_)
+typedef long fpos_t;
+#define _FPOSOFF(fp) ((long)(fp))
+#else   /* _POSIX_ */
+
+#if     !__STDC__ && _INTEGRAL_MAX_BITS >= 64
+/* At this point we could switch both to long long, but we won't do that till next version to avoid any potential compat issues */
+typedef __int64 fpos_t;
+#define _FPOSOFF(fp) ((long)(fp))
+#else
+typedef long long fpos_t;
+#define _FPOSOFF(fp) ((long)(fp))
+#endif
+#endif  /* _POSIX_ */
+
+#define _FPOS_T_DEFINED
+#endif
+
+#ifndef _STDSTREAM_DEFINED
+#define stdin  (&__iob_func()[0])
+#define stdout (&__iob_func()[1])
+#define stderr (&__iob_func()[2])
+#define _STDSTREAM_DEFINED
+#endif 
+
+#define _IOREAD         0x0001
+#define _IOWRT          0x0002
+
+#define _IOFBF          0x0000
+#define _IOLBF          0x0040
+#define _IONBF          0x0004
+
+#define _IOMYBUF        0x0008
+#define _IOEOF          0x0010
+#define _IOERR          0x0020
+#define _IOSTRG         0x0040
+#define _IORW           0x0080
+#ifdef  _POSIX_
+#define _IOAPPEND       0x0200
+#endif
+
+/* constants used by _set_output_format */
+#define _TWO_DIGIT_EXPONENT 0x1
+
+/* Function prototypes */
+
+#ifndef _STDIO_DEFINED
+
+_CRTIMP __checkReturn int __cdecl _filbuf(__inout FILE * _File );
+_CRTIMP __checkReturn_opt int __cdecl _flsbuf(__in int _Ch, __inout FILE * _File);
+
+#ifdef  _POSIX_
+_CRTIMP __checkReturn FILE * __cdecl _fsopen(__in_z const char * _Filename, __in_z const char * _Mode);
+#else
+_CRTIMP __checkReturn FILE * __cdecl _fsopen(__in_z const char * _Filename, __in_z const char * _Mode, __in int _ShFlag);
+#endif
+
+_CRTIMP void __cdecl clearerr(__inout FILE * _File);
+_CRTIMP __checkReturn_wat errno_t __cdecl clearerr_s(__inout FILE * _File );
+_CRTIMP __checkReturn_opt int __cdecl fclose(__inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _fcloseall(void);
+
+#ifdef  _POSIX_
+_CRTIMP __checkReturn FILE * __cdecl fdopen( __in int _FileHandle, __in_z const char * _Mode);
+#else
+_CRTIMP __checkReturn FILE * __cdecl _fdopen(__in int _FileHandle, __in_z const char * _Mode);
+#endif
+
+_CRTIMP __checkReturn int __cdecl feof(__in FILE * _File);
+_CRTIMP __checkReturn int __cdecl ferror(__in FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl fflush(__inout_opt FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl fgetc(__inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _fgetchar(void);
+_CRTIMP __checkReturn_opt int __cdecl fgetpos(__inout FILE * _File , __out fpos_t * _Pos);
+_CRTIMP __checkReturn_opt char * __cdecl fgets(__out_ecount_z(_MaxCount) char * _Buf, __in int _MaxCount, __inout FILE * _File);
+
+#ifdef  _POSIX_
+_CRTIMP __checkReturn int __cdecl fileno(__in FILE * _File);
+#else
+_CRTIMP __checkReturn int __cdecl _fileno(__in FILE * _File);
+#endif
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_tempnam")
+#undef _tempnam
+#endif
+
+_CRTIMP __checkReturn char * __cdecl _tempnam(__in_z_opt const char * _DirName, __in_z_opt const char * _FilePrefix);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_tempnam")
+#endif
+
+_CRTIMP __checkReturn_opt int __cdecl _flushall(void);
+_CRT_INSECURE_DEPRECATE(fopen_s) _CRTIMP __checkReturn FILE * __cdecl fopen(__in_z const char * _Filename, __in_z const char * _Mode);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl fopen_s(__deref_out_opt FILE ** _File, __in_z const char * _Filename, __in_z const char * _Mode);
+#endif
+_CRTIMP __checkReturn_opt int __cdecl fprintf(__inout FILE * _File, __in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl fprintf_s(__inout FILE * _File, __in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl fputc(__in int _Ch, __inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _fputchar(__in int _Ch);
+_CRTIMP __checkReturn_opt int __cdecl fputs(__in_z const char * _Str, __inout FILE * _File);
+_CRTIMP __checkReturn_opt size_t __cdecl fread(__out_bcount(_ElementSize*_Count) void * _DstBuf, __in size_t _ElementSize, __in size_t _Count, __inout FILE * _File);
+_CRTIMP __checkReturn_opt size_t __cdecl fread_s(__out_bcount(_ElementSize*_Count) void * _DstBuf, __in size_t _DstSize, __in size_t _ElementSize, __in size_t _Count, __inout FILE * _File);
+_CRT_INSECURE_DEPRECATE(freopen_s) _CRTIMP __checkReturn FILE * __cdecl freopen(__in_z const char * _Filename, __in_z const char * _Mode, __inout FILE * _File);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl freopen_s(__deref_out_opt FILE ** _File, __in_z const char * _Filename, __in_z const char * _Mode, __inout FILE * _OldFile);
+#endif
+_CRT_INSECURE_DEPRECATE(fscanf_s) _CRTIMP __checkReturn_opt int __cdecl fscanf(__inout FILE * _File, __in_z __format_string const char * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_fscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _fscanf_l(__inout FILE * _File, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_opt int __cdecl fscanf_s(__inout FILE * _File, __in_z __format_string const char * _Format, ...);
+#endif
+_CRTIMP __checkReturn_opt int __cdecl _fscanf_s_l(__inout FILE * _File, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl fsetpos(__inout FILE * _File, __in const fpos_t * _Pos);
+_CRTIMP __checkReturn_opt int __cdecl fseek(__inout FILE * _File, __in long _Offset, __in int _Origin);
+_CRTIMP __checkReturn long __cdecl ftell(__inout FILE * _File);
+
+_CRTIMP __checkReturn_opt int __cdecl _fseeki64(__inout FILE * _File, __in __int64 _Offset, __in int _Origin);
+_CRTIMP __checkReturn __int64 __cdecl _ftelli64(__inout FILE * _File);
+
+_CRTIMP __checkReturn_opt size_t __cdecl fwrite(__in_ecount(_Size*_Count) const void * _Str, __in size_t _Size, __in size_t _Count, __inout FILE * _File);
+_CRTIMP __checkReturn int __cdecl getc(__inout FILE * _File);
+_CRTIMP __checkReturn int __cdecl getchar(void);
+_CRTIMP __checkReturn int __cdecl _getmaxstdio(void);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP char * __cdecl gets_s(__out_ecount_z(_Size) char * _Buf, __in rsize_t _Size);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(char *, gets_s, __out_ecount(_Size) char, _Buffer)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(char *, __RETURN_POLICY_SAME, _CRTIMP, gets, __out_z char, _Buffer)
+__checkReturn int __cdecl _getw(__inout FILE * _File);
+#ifndef _CRT_PERROR_DEFINED
+#define _CRT_PERROR_DEFINED
+_CRTIMP void __cdecl perror(__in_z_opt const char * _ErrMsg);
+#endif
+_CRTIMP __checkReturn_opt int __cdecl _pclose(__inout FILE * _File);
+_CRTIMP __checkReturn FILE * __cdecl _popen(__in_z const char * _Command, __in_z const char * _Mode);
+_CRTIMP __checkReturn_opt int __cdecl printf(__in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl printf_s(__in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl putc(__in int _Ch, __inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl putchar(__in int _Ch);
+_CRTIMP __checkReturn_opt int __cdecl puts(__in_z const char * _Str);
+_CRTIMP __checkReturn_opt int __cdecl _putw(__in int _Word, __inout FILE * _File);
+#ifndef _CRT_DIRECTORY_DEFINED
+#define _CRT_DIRECTORY_DEFINED
+_CRTIMP __checkReturn int __cdecl remove(__in_z const char * _Filename);
+_CRTIMP __checkReturn int __cdecl rename(__in_z const char * _OldFilename, __in_z const char * _NewFilename);
+_CRTIMP __checkReturn int __cdecl _unlink(__in_z const char * _Filename);
+#if !__STDC__
+_CRT_NONSTDC_DEPRECATE(_unlink) _CRTIMP __checkReturn int __cdecl unlink(__in_z const char * _Filename);
+#endif
+#endif
+_CRTIMP void __cdecl rewind(__inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _rmtmp(void);
+_CRT_INSECURE_DEPRECATE(scanf_s) _CRTIMP __checkReturn_opt int __cdecl scanf(__in_z __format_string const char * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_scanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _scanf_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl scanf_s(__in_z __format_string const char * _Format, ...);
+#endif
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _scanf_s_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(setvbuf) _CRTIMP void __cdecl setbuf(__inout FILE * _File, __inout_ecount_part_opt(BUFSIZ, 0) char * _Buffer);
+_CRTIMP __checkReturn_opt int __cdecl _setmaxstdio(__in int _Max);
+_CRTIMP __checkReturn_opt unsigned int __cdecl _set_output_format(__in unsigned int _Format);
+_CRTIMP __checkReturn_opt unsigned int __cdecl _get_output_format(void);
+_CRTIMP __checkReturn_opt int __cdecl setvbuf(__inout FILE * _File, __inout_bcount_z_opt(_Size) char * _Buf, __in int _Mode, __in size_t _Size);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snprintf_s(__out_bcount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const char * _Format, ...);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(int, _snprintf_s, _vsnprintf_s, __out_bcount(_Size) char, _Dest, __in size_t, _Size, __in_z __format_string const char *,_Format)
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl sprintf_s(__out_bcount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in_z __format_string const char * _Format, ...);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int, sprintf_s, vsprintf_s, __out_bcount(_Size) char, _Dest, __in_z __format_string const char *, _Format)
+_CRTIMP __checkReturn int __cdecl _scprintf(__in_z __format_string const char * _Format, ...);
+_CRT_INSECURE_DEPRECATE(sscanf_s) _CRTIMP __checkReturn_opt int __cdecl sscanf(__in_z const char * _Src, __in_z __format_string const char * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_sscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _sscanf_l(__in_z const char * _Src, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl sscanf_s(__in_z const char * _Src, __in_z __format_string const char * _Format, ...);
+#endif
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _sscanf_s_l(__in_z const char * _Src, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(_snscanf_s) _CRTIMP __checkReturn_opt int __cdecl _snscanf(__in_bcount_z(_MaxCount) const char * _Src, __in size_t _MaxCount, __in_z __format_string const char * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_snscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _snscanf_l(__in_bcount_z(_MaxCount) const char * _Src, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snscanf_s(__in_bcount_z(_MaxCount) const char * _Src, __in size_t _MaxCount, __in_z __format_string const char * _Format, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snscanf_s_l(__in_bcount_z(_MaxCount) const char * _Src, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(tmpfile_s) _CRTIMP __checkReturn FILE * __cdecl tmpfile(void);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl tmpfile_s(__deref_opt_out FILE ** _File);
+_CRTIMP __checkReturn_wat errno_t __cdecl tmpnam_s(__out_ecount_z(_Size) char * _Buf, __in rsize_t _Size);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, tmpnam_s, __out_ecount_z(_Size) char, _Buf)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(char *, __RETURN_POLICY_DST, _CRTIMP, tmpnam, __out_z_opt char, _Buffer)
+_CRTIMP __checkReturn_opt int __cdecl ungetc(__in int _Ch, __inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl vfprintf(__inout FILE * _File, __in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vfprintf_s(__inout FILE * _File, __in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vprintf(__in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vprintf_s(__in_z __format_string const char * _Format, va_list _ArgList);
+_CRT_INSECURE_DEPRECATE(vsnprintf_s) _CRTIMP __checkReturn_opt int __cdecl vsnprintf(__out_ecount(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vsnprintf_s(__out_ecount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _vsnprintf_s(__out_ecount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const char * _Format, va_list _ArgList);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int, _vsnprintf_s, __out_ecount(_Size) char, _Dest, __in size_t, _Size, __in_z __format_string const char *, _Format, va_list, _Args)
+#pragma warning(push)
+#pragma warning(disable:4793)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST_EX(int, __RETURN_POLICY_SAME, _CRTIMP, _snprintf, _vsnprintf, __out_z char, __out_ecount(_Count) char, _Dest, __in size_t, _Count, __in_z __format_string const char *, _Format)
+#pragma warning(pop)
+_CRTIMP_ALTERNATIVE int __cdecl vsprintf_s(__out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in_z __format_string const char * _Format, va_list _ArgList);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vsprintf_s, __out_ecount(_Size) char, _Dest, __in_z __format_string const char *, _Format, va_list, _Args)
+#pragma warning(push)
+#pragma warning(disable:4793)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST(int, __RETURN_POLICY_SAME, _CRTIMP, sprintf, vsprintf, __out_z char, _Dest, __in_z __format_string const char *, _Format)
+#pragma warning(pop)
+_CRTIMP __checkReturn int __cdecl _vscprintf(__in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _snprintf_c(__out_ecount(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vsnprintf_c(__out_ecount(_MaxCount) char *_DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, va_list _ArgList);
+
+_CRTIMP __checkReturn_opt int __cdecl _fprintf_p(__inout FILE * _File, __in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _printf_p(__in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _sprintf_p(__out_ecount_z(_MaxCount) char * _Dst, __in size_t _MaxCount, __in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vfprintf_p(__inout FILE * _File, __in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vprintf_p(__in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vsprintf_p(__out_ecount_z(_MaxCount) char * _Dst, __in size_t _MaxCount, __in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP __checkReturn int __cdecl _scprintf_p(__in_z __format_string const char * _Format, ...);
+_CRTIMP __checkReturn int __cdecl _vscprintf_p(__in_z __format_string const char * _Format, va_list _ArgList);
+_CRTIMP int __cdecl _set_printf_count_output(__in int _Value);
+_CRTIMP int __cdecl _get_printf_count_output();
+
+_CRTIMP __checkReturn_opt int __cdecl _printf_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _printf_p_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _printf_s_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vprintf_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vprintf_p_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vprintf_s_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRTIMP __checkReturn_opt int __cdecl _fprintf_l(__inout FILE * _File, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _fprintf_p_l(__inout FILE * _File, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _fprintf_s_l(__inout FILE * _File, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vfprintf_l(__inout FILE * _File, __in_z const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vfprintf_p_l(__inout FILE * _File, __in_z const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vfprintf_s_l(__inout FILE * _File, __in_z const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRT_INSECURE_DEPRECATE(_sprintf_s_l) _CRTIMP __checkReturn_opt int __cdecl _sprintf_l(__out_z char * _DstBuf, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _sprintf_p_l(__out_ecount_z(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _sprintf_s_l(__out_bcount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(_vsprintf_s_l) _CRTIMP __checkReturn_opt int __cdecl _vsprintf_l(__out_z char * _DstBuf, __in_z const char * _Format, __in_opt _locale_t, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vsprintf_p_l(__out_ecount_z(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char* _Format, __in_opt _locale_t _Locale,  va_list _ArgList);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _vsprintf_s_l(__out_ecount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRTIMP __checkReturn_opt int __cdecl _scprintf_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _scprintf_p_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vscprintf_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vscprintf_p_l(__in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRT_INSECURE_DEPRECATE(_snprintf_s_l) _CRTIMP __checkReturn_opt int __cdecl _snprintf_l(__out_ecount(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _snprintf_c_l(__out_ecount(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snprintf_s_l(__out_ecount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(_vsnprintf_s_l) _CRTIMP __checkReturn_opt int __cdecl _vsnprintf_l(__out_ecount(_MaxCount) char * _DstBuf, __in size_t _MaxCount, __in_z __format_string const char * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vsnprintf_c_l(__out_ecount(_MaxCount) char * _DstBuf, __in size_t _MaxCount, const char *, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vsnprintf_s_l(__out_ecount_z(_DstSize) char * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const char* _Format,__in_opt _locale_t _Locale, va_list _ArgList);
+
+#ifndef _WSTDIO_DEFINED
+
+/* wide function prototypes, also declared in wchar.h  */
+
+#ifndef WEOF
+#define WEOF (wint_t)(0xFFFF)
+#endif
+
+#ifdef  _POSIX_
+_CRTIMP __checkReturn FILE * __cdecl _wfsopen(__in_z const wchar_t * _Filename, __in_z const wchar_t * _Mode);
+#else
+_CRTIMP __checkReturn FILE * __cdecl _wfsopen(__in_z const wchar_t * _Filename, __in_z const wchar_t * _Mode, __in int _ShFlag);
+#endif
+
+_CRTIMP __checkReturn_opt wint_t __cdecl fgetwc(__inout FILE * _File);
+_CRTIMP __checkReturn_opt wint_t __cdecl _fgetwchar(void);
+_CRTIMP __checkReturn_opt wint_t __cdecl fputwc(__in_z wchar_t _Ch, __inout FILE * _File);
+_CRTIMP __checkReturn_opt wint_t __cdecl _fputwchar(__in_z wchar_t _Ch);
+_CRTIMP __checkReturn wint_t __cdecl getwc(__inout FILE * _File);
+_CRTIMP __checkReturn wint_t __cdecl getwchar(void);
+_CRTIMP __checkReturn_opt wint_t __cdecl putwc(__in_z wchar_t _Ch, __inout FILE * _File);
+_CRTIMP __checkReturn_opt wint_t __cdecl putwchar(__in_z wchar_t _Ch);
+_CRTIMP __checkReturn_opt wint_t __cdecl ungetwc(__in wint_t _Ch, __inout FILE * _File);
+
+_CRTIMP __checkReturn_opt wchar_t * __cdecl fgetws(__out_ecount_z(_SizeInWords) wchar_t * _Dst, __in int _SizeInWords, __inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl fputws(__in_z const wchar_t * _Str, __inout FILE * _File);
+_CRTIMP __checkReturn_opt wchar_t * __cdecl _getws_s(__out_ecount_z(_SizeInWords) wchar_t * _Str, __in size_t _SizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(wchar_t *, _getws_s, __out_ecount(_Size) wchar_t, _String)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(wchar_t *, __RETURN_POLICY_SAME, _CRTIMP, _getws, __out_z wchar_t, _String)
+_CRTIMP __checkReturn_opt int __cdecl _putws(__in_z const wchar_t * _Str);
+
+_CRTIMP __checkReturn_opt int __cdecl fwprintf(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl fwprintf_s(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl wprintf(__in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl wprintf_s(__in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn int __cdecl _scwprintf(__in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl vfwprintf(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vfwprintf_s(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vwprintf(__in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl vwprintf_s(__in_z __format_string const wchar_t * _Format, va_list _ArgList);
+
+_CRTIMP_ALTERNATIVE int __cdecl swprintf_s(__out_ecount_z(_SizeInWords) wchar_t * _Dst, __in size_t _SizeInWords, __in_z __format_string const wchar_t * _Format, ...);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int, swprintf_s, vswprintf_s, __out_ecount(_Size) wchar_t, _Dest, __in_z __format_string const wchar_t *, _Format)
+_CRTIMP_ALTERNATIVE int __cdecl vswprintf_s(__out_ecount_z(_SizeInWords) wchar_t * _Dst, __in size_t _SizeInWords, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vswprintf_s, __out_ecount(_Size) wchar_t, _Dest, __in_z __format_string const wchar_t *, _Format, va_list, _Args)
+
+_CRTIMP __checkReturn_opt int __cdecl _swprintf_c(__out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vswprintf_c(__out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snwprintf_s(__out_ecount_z(_DstSizeInWords) wchar_t * _DstBuf, __in size_t _DstSizeInWords, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, ...);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(int, _snwprintf_s, _vsnwprintf_s, __out_ecount(_Size) wchar_t, _Dest, __in size_t, _Count, __in_z __format_string const wchar_t *, _Format)
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _vsnwprintf_s(__out_ecount_z(_DstSizeInWords) wchar_t * _DstBuf, __in size_t _DstSizeInWords, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int, _vsnwprintf_s, __out_ecount(_Size) wchar_t, _Dest, __in size_t, _Count, __in_z __format_string const wchar_t *, _Format, va_list, _Args)
+#pragma warning(push)
+#pragma warning(disable:4793)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_ARGLIST_EX(int, __RETURN_POLICY_SAME, _CRTIMP, _snwprintf, _vsnwprintf, __out_z wchar_t, __out_ecount(_Count) wchar_t, _Dest, __in size_t, _Count, __in_z __format_string const wchar_t *, _Format)
+#pragma warning(pop)
+
+_CRTIMP __checkReturn_opt int __cdecl _fwprintf_p(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _wprintf_p(__in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vfwprintf_p(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vwprintf_p(__in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _swprintf_p(__out_ecount_z(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vswprintf_p(__out_ecount_z(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn int __cdecl _scwprintf_p(__in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP __checkReturn int __cdecl _vscwprintf_p(__in_z __format_string const wchar_t * _Format, va_list _ArgList);
+
+_CRTIMP __checkReturn_opt int __cdecl _wprintf_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _wprintf_p_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _wprintf_s_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vwprintf_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vwprintf_p_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vwprintf_s_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRTIMP __checkReturn_opt int __cdecl _fwprintf_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _fwprintf_p_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _fwprintf_s_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vfwprintf_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vfwprintf_p_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vfwprintf_s_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRTIMP __checkReturn_opt int __cdecl _swprintf_c_l(__out_ecount_z(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _swprintf_p_l(__out_ecount_z(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _swprintf_s_l(__out_ecount_z(_DstSize) wchar_t * _DstBuf, __in size_t _DstSize, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn_opt int __cdecl _vswprintf_c_l(__out_ecount_z(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP __checkReturn_opt int __cdecl _vswprintf_p_l(__out_ecount_z(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _vswprintf_s_l(__out_ecount_z(_DstSize) wchar_t * _DstBuf, __in size_t _DstSize, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRTIMP __checkReturn int __cdecl _scwprintf_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn int __cdecl _scwprintf_p_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP __checkReturn int __cdecl _vscwprintf_p_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+_CRT_INSECURE_DEPRECATE(_snwprintf_s_l) _CRTIMP __checkReturn_opt int __cdecl _snwprintf_l(__out_ecount(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snwprintf_s_l(__out_ecount_z(_DstSize) wchar_t * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(_vsnwprintf_s_l) _CRTIMP __checkReturn_opt int __cdecl _vsnwprintf_l(__out_ecount(_MaxCount) wchar_t * _DstBuf, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _vsnwprintf_s_l(__out_ecount_z(_DstSize) wchar_t * _DstBuf, __in size_t _DstSize, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+
+
+#ifndef _CRT_NON_CONFORMING_SWPRINTFS
+
+#define _SWPRINTFS_DEPRECATED _CRT_DEPRECATE_TEXT("swprintf has been changed to conform with the ISO C standard, adding an extra character count parameter. To use traditional Microsoft swprintf, set _CRT_NON_CONFORMING_SWPRINTFS.")
+
+#else
+
+#define _SWPRINTFS_DEPRECATED 
+
+#endif /* ifndef _CRT_NON_CONFORMING_SWPRINTFS */
+
+/* we could end up with a double deprecation, disable warnings 4141 and 4996 */
+#pragma warning(push)
+#pragma warning(disable:4141 4996 4793)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_ARGLIST_EX(int, __RETURN_POLICY_SAME, _SWPRINTFS_DEPRECATED _CRTIMP, _swprintf, _swprintf_s, _vswprintf, vswprintf_s, __out_z wchar_t, _Dest, __in_z __format_string const wchar_t *, _Format)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_ARGLIST_EX(int, __RETURN_POLICY_SAME, _SWPRINTFS_DEPRECATED _CRTIMP, __swprintf_l, __vswprintf_l, _vswprintf_s_l, __out_z wchar_t, __out wchar_t, _Dest, __in_z __format_string const wchar_t *, _Format, _locale_t, _Plocinfo)
+#pragma warning(pop)
+
+#if !defined(RC_INVOKED) && !defined(__midl)
+#include <swprintf.inl>
+#endif
+
+#ifdef _CRT_NON_CONFORMING_SWPRINTFS
+#ifndef __cplusplus
+#define swprintf _swprintf
+#define vswprintf _vswprintf
+#define _swprintf_l __swprintf_l
+#define _vswprintf_l __vswprintf_l
+#endif
+#endif
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wtempnam")
+#undef _wtempnam
+#endif
+
+_CRTIMP __checkReturn wchar_t * __cdecl _wtempnam(__in_z_opt const wchar_t * _Directory, __in_z_opt const wchar_t * _FilePrefix);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wtempnam")
+#endif
+
+_CRTIMP __checkReturn int __cdecl _vscwprintf(__in_z __format_string const wchar_t * _Format, va_list _ArgList);
+_CRTIMP __checkReturn int __cdecl _vscwprintf_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, va_list _ArgList);
+_CRT_INSECURE_DEPRECATE(fwscanf_s) _CRTIMP __checkReturn_opt int __cdecl fwscanf(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_fwscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _fwscanf_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_opt int __cdecl fwscanf_s(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, ...);
+#endif
+_CRTIMP __checkReturn_opt int __cdecl _fwscanf_s_l(__inout FILE * _File, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(swscanf_s) _CRTIMP __checkReturn_opt int __cdecl swscanf(__in_z const wchar_t * _Src, __in_z __format_string const wchar_t * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_swscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _swscanf_l(__in_z const wchar_t * _Src, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl swscanf_s(__in_z const wchar_t *_Src, __in_z __format_string const wchar_t * _Format, ...);
+#endif
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _swscanf_s_l(__in_z const wchar_t * _Src, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(_snwscanf_s) _CRTIMP __checkReturn_opt int __cdecl _snwscanf(__in_ecount_z(_MaxCount) const wchar_t * _Src, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_snwscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _snwscanf_l(__in_ecount_z(_MaxCount) const wchar_t * _Src, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snwscanf_s(__in_ecount_z(_MaxCount) const wchar_t * _Src, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, ...);
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _snwscanf_s_l(__in_ecount_z(_MaxCount) const wchar_t * _Src, __in size_t _MaxCount, __in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+_CRT_INSECURE_DEPRECATE(wscanf_s) _CRTIMP __checkReturn_opt int __cdecl wscanf(__in_z __format_string const wchar_t * _Format, ...);
+_CRT_INSECURE_DEPRECATE(_wscanf_s_l) _CRTIMP __checkReturn_opt int __cdecl _wscanf_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl wscanf_s(__in_z __format_string const wchar_t * _Format, ...);
+#endif
+_CRTIMP_ALTERNATIVE __checkReturn_opt int __cdecl _wscanf_s_l(__in_z __format_string const wchar_t * _Format, __in_opt _locale_t _Locale, ...);
+
+_CRTIMP __checkReturn FILE * __cdecl _wfdopen(__in int _FileHandle , __in_z const wchar_t * _Mode);
+_CRT_INSECURE_DEPRECATE(_wfopen_s) _CRTIMP __checkReturn FILE * __cdecl _wfopen(__in_z const wchar_t * _Filename, __in_z const wchar_t * _Mode);
+_CRTIMP __checkReturn_wat errno_t __cdecl _wfopen_s(__deref_out_opt FILE ** _File, __in_z const wchar_t * _Filename, __in_z const wchar_t * _Mode);
+_CRT_INSECURE_DEPRECATE(_wfreopen_s) _CRTIMP __checkReturn FILE * __cdecl _wfreopen(__in_z const wchar_t * _Filename, __in_z const wchar_t * _Mode, __inout FILE * _OldFile);
+_CRTIMP __checkReturn_wat errno_t __cdecl _wfreopen_s(__deref_out_opt FILE ** _File, __in_z const wchar_t * _Filename, __in_z const wchar_t * _Mode, __inout FILE * _OldFile);
+
+#ifndef _CRT_WPERROR_DEFINED
+#define _CRT_WPERROR_DEFINED
+_CRTIMP void __cdecl _wperror(__in_z_opt const wchar_t * _ErrMsg);
+#endif 
+_CRTIMP __checkReturn FILE * __cdecl _wpopen(__in_z const wchar_t *_Command, __in_z const wchar_t * _Mode);
+_CRTIMP __checkReturn int __cdecl _wremove(__in_z const wchar_t * _Filename);
+_CRTIMP __checkReturn_wat errno_t __cdecl _wtmpnam_s(__out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wtmpnam_s, __out_ecount_z(_Size) wchar_t, _Buffer)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wtmpnam, __out_z_opt wchar_t, _Buffer)
+
+_CRTIMP __checkReturn_opt wint_t __cdecl _fgetwc_nolock(__inout FILE * _File);
+_CRTIMP __checkReturn_opt wint_t __cdecl _fputwc_nolock(__in_z wchar_t _Ch, __inout FILE * _File);
+_CRTIMP __checkReturn_opt wint_t __cdecl _ungetwc_nolock(__in wint_t _Ch, __inout FILE * _File);
+
+#undef _CRT_GETPUTWCHAR_NOINLINE
+
+#if !defined(__cplusplus) || defined(_M_CEE_PURE) || defined(_CRT_GETPUTWCHAR_NOINLINE)
+#define getwchar()      fgetwc(stdin)
+#define putwchar(_c)    fputwc((_c),stdout)
+#else   /* __cplusplus */
+inline wint_t __CRTDECL getwchar()
+        {return (fgetwc(stdin)); }   /* stdin */
+inline wint_t __CRTDECL putwchar(wchar_t _C)
+        {return (fputwc(_C, stdout)); }       /* stdout */
+#endif  /* __cplusplus */
+
+#define getwc(_stm)             fgetwc(_stm)
+#define putwc(_c,_stm)          fputwc(_c,_stm)
+#define _putwc_nolock(_c,_stm)     _fputwc_nolock(_c,_stm)
+#define _getwc_nolock(_stm)        _fgetwc_nolock(_stm)
+
+#if defined(_CRT_DISABLE_PERFCRIT_LOCKS) && !defined(_DLL)
+#define fgetwc(_stm)            _getwc_nolock(_stm)
+#define fputwc(_c,_stm)         _putwc_nolock(_c,_stm)
+#define ungetwc(_c,_stm)        _ungetwc_nolock(_c,_stm)
+#endif
+
+#define _WSTDIO_DEFINED
+#endif  /* _WSTDIO_DEFINED */
+
+#define _STDIO_DEFINED
+#endif  /* _STDIO_DEFINED */
+
+
+/* Macro definitions */
+
+#if defined(_CRT_DISABLE_PERFCRIT_LOCKS) && !defined(_DLL)
+#define feof(_stream)     ((_stream)->_flag & _IOEOF)
+#define ferror(_stream)   ((_stream)->_flag & _IOERR)
+#define _fileno(_stream)  ((_stream)->_file)
+#define fgetc(_stream)     (--(_stream)->_cnt >= 0 \
+                ? 0xff & *(_stream)->_ptr++ : _filbuf(_stream))
+#define putc(_c,_stream)  (--(_stream)->_cnt >= 0 \
+                ? 0xff & (*(_stream)->_ptr++ = (char)(_c)) :  _flsbuf((_c),(_stream)))
+#define getc(_stream)    fgetc(_stream)
+#define getchar()         getc(stdin)
+#define putchar(_c)       putc((_c),stdout)
+#endif
+
+
+#define _fgetc_nolock(_stream)       (--(_stream)->_cnt >= 0 ? 0xff & *(_stream)->_ptr++ : _filbuf(_stream))
+#define _fputc_nolock(_c,_stream)    (--(_stream)->_cnt >= 0 ? 0xff & (*(_stream)->_ptr++ = (char)(_c)) :  _flsbuf((_c),(_stream)))
+#define _getc_nolock(_stream)       _fgetc_nolock(_stream)
+#define _putc_nolock(_c, _stream)   _fputc_nolock(_c, _stream)
+#define _getchar_nolock()           _getc_nolock(stdin)
+#define _putchar_nolock(_c)         _putc_nolock((_c),stdout)
+#define _getwchar_nolock()          _getwc_nolock(stdin)
+#define _putwchar_nolock(_c)        _putwc_nolock((_c),stdout)
+
+#ifdef _MT
+_CRTIMP void __cdecl _lock_file(__inout FILE * _File);
+_CRTIMP void __cdecl _unlock_file(__inout FILE * _File);
+#else
+#define _lock_file(c)
+#define _unlock_file(c)
+#endif
+
+
+_CRTIMP __checkReturn_opt int __cdecl _fclose_nolock(__inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _fflush_nolock(__inout_opt FILE * _File);
+_CRTIMP __checkReturn_opt size_t __cdecl _fread_nolock(__out_bcount(_ElementSize*_Count) void * _DstBuf, __in size_t _ElementSize, __in size_t _Count, __inout FILE * _File);
+_CRTIMP __checkReturn_opt size_t __cdecl _fread_nolock_s(__out_bcount(_ElementSize*_Count) void * _DstBuf, __in size_t _DstSize, __in size_t _ElementSize, __in size_t _Count, __inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _fseek_nolock(__inout FILE * _File, __in long _Offset, __in int _Origin);
+_CRTIMP __checkReturn long __cdecl _ftell_nolock(__inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _fseeki64_nolock(__inout FILE * _File, __in __int64 _Offset, __in int _Origin);
+_CRTIMP __checkReturn __int64 __cdecl _ftelli64_nolock(__inout FILE * _File);
+_CRTIMP __checkReturn_opt size_t __cdecl _fwrite_nolock(__in_bcount(_Size*_Count) const void * _DstBuf, __in size_t _Size, __in size_t _Count, __inout FILE * _File);
+_CRTIMP __checkReturn_opt int __cdecl _ungetc_nolock(__in int _Ch, __inout FILE * _File);
+
+#if defined(_CRT_DISABLE_PERFCRIT_LOCKS) && !defined(_DLL)
+#define fclose(_stm)                                            _fclose_nolock(_stm)
+#define fflush(_stm)                                            _fflush_nolock(_stm)
+#define fread(_DstBuf, _ElementSize, _Count, _File)             _fread_nolock(_DstBuf, _ElementSize, _Count, _File)
+#define fread_s(_DstBuf, _DstSize, _ElementSize, _Count, _File) _fread_nolock_s(_DstBuf, _DstSize, _ElementSize, _Count, _File)
+#define fseek(_stm,_offset,_origin)                             _fseek_nolock(_stm,_offset,_origin)
+#define ftell(_stm)                                             _ftell_nolock(_stm)
+#define _fseeki64(_stm)                                         _fseeki64_nolock(_stm)
+#define _ftelli64(_stm)                                         _ftelli64_nolock(_stm)
+#define fwrite(_buf,_siz,_cnt,_stm)                             _fwrite_nolock(_buf,_siz,_cnt,_stm)
+#define ungetc(_c,_stm)                                         _ungetc_nolock(_c,_stm)
+#endif
+
+#if     !__STDC__ && !defined(_POSIX_)
+
+/* Non-ANSI names for compatibility */
+
+#define P_tmpdir  _P_tmpdir
+#define SYS_OPEN  _SYS_OPEN
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("tempnam")
+#undef tempnam
+#endif
+
+_CRT_NONSTDC_DEPRECATE(_tempnam) _CRTIMP char * __cdecl tempnam(__in_z_opt const char * _Directory, __in_z_opt const char * _FilePrefix);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("tempnam")
+#endif
+
+_CRT_NONSTDC_DEPRECATE(_fcloseall) _CRTIMP __checkReturn_opt int __cdecl fcloseall(void);
+_CRT_NONSTDC_DEPRECATE(_fdopen) _CRTIMP __checkReturn FILE * __cdecl fdopen(__in int _FileHandle, __in_z __format_string const char * _Format);
+_CRT_NONSTDC_DEPRECATE(_fgetchar) _CRTIMP __checkReturn_opt int __cdecl fgetchar(void);
+_CRT_NONSTDC_DEPRECATE(_fileno) _CRTIMP __checkReturn int __cdecl fileno(__in FILE * _File);
+_CRT_NONSTDC_DEPRECATE(_flushall) _CRTIMP __checkReturn_opt int __cdecl flushall(void);
+_CRT_NONSTDC_DEPRECATE(_fputchar) _CRTIMP __checkReturn_opt int __cdecl fputchar(__in int _Ch);
+_CRT_NONSTDC_DEPRECATE(_getw) _CRTIMP __checkReturn int __cdecl getw(__inout FILE * _File);
+_CRT_NONSTDC_DEPRECATE(_putw) _CRTIMP __checkReturn_opt int __cdecl putw(__in int _Ch, __inout FILE * _File);
+_CRT_NONSTDC_DEPRECATE(_rmtmp) _CRTIMP __checkReturn int __cdecl rmtmp(void);
+
+#endif  /* __STDC__ */
+
+#ifdef  __cplusplus
+}
+#endif
+
+#ifdef  _MSC_VER
+#pragma pack(pop)
+#endif  /* _MSC_VER */
+
+#endif  /* _INC_STDIO */
diff --git a/base/Windows/Inc/stdlib.h b/base/Windows/Inc/stdlib.h
new file mode 100644
index 0000000..bd757f0
--- /dev/null
+++ b/base/Windows/Inc/stdlib.h
@@ -0,0 +1,841 @@
+/***
+*stdlib.h - declarations/definitions for commonly used library functions
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This include file contains the function declarations for commonly
+*       used library functions which either don't fit somewhere else, or,
+*       cannot be declared in the normal place for other reasons.
+*       [ANSI]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_STDLIB
+#define _INC_STDLIB
+
+#include <crtdefs.h>
+#include <limits.h>
+
+#ifdef  _MSC_VER
+/*
+ * Currently, all MS C compilers for Win32 platforms default to 8 byte
+ * alignment.
+ */
+#pragma pack(push,_CRT_PACKING)
+#endif  /* _MSC_VER */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Define NULL pointer value */
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+/* Definition of the argument values for the exit() function */
+
+#define EXIT_SUCCESS    0
+#define EXIT_FAILURE    1
+
+
+#ifndef _ONEXIT_T_DEFINED
+
+#if !defined (_M_CEE_PURE)
+typedef int (__cdecl * _onexit_t)(void);
+#else
+typedef int (__clrcall * _onexit_t)(void);
+typedef _onexit_t _onexit_m_t;
+#endif
+
+#if defined (_M_CEE_MIXED)
+typedef int (__clrcall * _onexit_m_t)(void);
+#endif
+
+#if     !__STDC__
+/* Non-ANSI name for compatibility */
+#define onexit_t _onexit_t
+#endif
+
+#define _ONEXIT_T_DEFINED
+#endif
+
+
+/* Data structure definitions for div and ldiv runtimes. */
+
+#ifndef _DIV_T_DEFINED
+
+typedef struct _div_t {
+        int quot;
+        int rem;
+} div_t;
+
+typedef struct _ldiv_t {
+        long quot;
+        long rem;
+} ldiv_t;
+
+#define _DIV_T_DEFINED
+#endif
+
+/*
+ * structs used to fool the compiler into not generating floating point
+ * instructions when copying and pushing [long] double values
+ */
+
+#ifndef _CRT_DOUBLE_DEC
+
+#ifndef _LDSUPPORT
+
+#pragma pack(4)
+typedef struct {
+    unsigned char ld[10];
+} _LDOUBLE;
+#pragma pack()
+
+#define _PTR_LD(x) ((unsigned char  *)(&(x)->ld))
+
+#else
+
+/* push and pop long, which is #defined as __int64 by a spec2k test */
+#pragma push_macro("long")
+#undef long
+typedef long double _LDOUBLE;
+#pragma pop_macro("long")
+
+#define _PTR_LD(x) ((unsigned char  *)(x))
+
+#endif
+
+typedef struct {
+        double x;
+} _CRT_DOUBLE;
+
+typedef struct {
+    float f;
+} _CRT_FLOAT;
+
+/* push and pop long, which is #defined as __int64 by a spec2k test */
+#pragma push_macro("long")
+#undef long
+
+typedef struct {
+        /*
+         * Assume there is a long double type
+         */
+        long double x;
+} _LONGDOUBLE;
+
+#pragma pop_macro("long")
+
+#pragma pack(4)
+typedef struct {
+    unsigned char ld12[12];
+} _LDBL12;
+#pragma pack()
+
+#define _CRT_DOUBLE_DEC
+#endif
+
+/* Maximum value that can be returned by the rand function. */
+
+#define RAND_MAX 0x7fff
+
+/*
+ * Maximum number of bytes in multi-byte character in the current locale
+ * (also defined in ctype.h).
+ */
+#ifndef MB_CUR_MAX
+#ifdef _MT
+#define MB_CUR_MAX ___mb_cur_max_func()
+#else
+#define MB_CUR_MAX __mb_cur_max
+#endif
+#if !defined(_M_CEE_PURE)
+_CRTIMP extern int __mb_cur_max;
+#else
+_CRTIMP int* __cdecl __p___mb_cur_max();
+#define __mb_cur_max (*__p___mb_cur_max())
+#endif /* !defined(_M_CEE_PURE) */
+_CRTIMP int __cdecl ___mb_cur_max_func(void);
+_CRTIMP int __cdecl ___mb_cur_max_l_func(_locale_t);
+#endif  /* MB_CUR_MAX */
+
+/* Minimum and maximum macros */
+
+#define __max(a,b)  (((a) > (b)) ? (a) : (b))
+#define __min(a,b)  (((a) < (b)) ? (a) : (b))
+
+/*
+ * Sizes for buffers used by the _makepath() and _splitpath() functions.
+ * note that the sizes include space for 0-terminator
+ */
+#define _MAX_PATH   260 /* max. length of full pathname */
+#define _MAX_DRIVE  3   /* max. length of drive component */
+#define _MAX_DIR    256 /* max. length of path component */
+#define _MAX_FNAME  256 /* max. length of file name component */
+#define _MAX_EXT    256 /* max. length of extension component */
+
+/*
+ * Argument values for _set_error_mode().
+ */
+#define _OUT_TO_DEFAULT 0
+#define _OUT_TO_STDERR  1
+#define _OUT_TO_MSGBOX  2
+#define _REPORT_ERRMODE 3
+
+/*
+ * Argument values for _set_abort_behavior().
+ */
+#define _WRITE_ABORT_MSG    0x1
+#define _CALL_REPORTFAULT   0x2
+
+/*
+ * Sizes for buffers used by the getenv/putenv family of functions.
+ */
+#define _MAX_ENV 32767   
+
+#if !defined(_M_CEE_PURE)
+/* a purecall handler procedure. Never returns normally */
+typedef void (__cdecl *_purecall_handler)(void); 
+
+/* establishes a purecall handler for the process */
+_CRTIMP _purecall_handler __cdecl _set_purecall_handler(__in_opt _purecall_handler _Handler);
+_CRTIMP _purecall_handler __cdecl _get_purecall_handler();
+#endif
+
+#if defined(__cplusplus)
+extern "C++"
+{
+#if defined(_M_CEE_PURE)
+    typedef void (__clrcall *_purecall_handler)(void);
+    typedef _purecall_handler _purecall_handler_m;
+    _MRTIMP _purecall_handler __cdecl _set_purecall_handler(__in_opt _purecall_handler _Handler);
+#endif
+
+#if defined(_M_CEE_MIXED)
+    typedef void (__clrcall *_purecall_handler_m)(void);
+
+    _MRTIMP _purecall_handler_m __cdecl _set_purecall_handler(__in_opt _purecall_handler_m _Handler);
+
+    _MRTIMP _purecall_handler __cdecl _set_purecall_handler(__in int _Handler); /* To disambiguate NULL/0 */
+#endif
+}
+#endif
+
+#if !defined(_M_CEE_PURE)
+/* a invalid_arg handler procedure. */
+typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t *, const wchar_t *, const wchar_t *, unsigned int, uintptr_t); 
+
+/* establishes a invalid_arg handler for the process */
+_CRTIMP _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(__in_opt _invalid_parameter_handler _Handler);
+_CRTIMP _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void);
+#endif
+
+#if defined(__cplusplus)
+extern "C++"
+{
+#if defined(_M_CEE_PURE)
+    typedef void (__clrcall *_invalid_parameter_handler)(const wchar_t *, const wchar_t *, const wchar_t *, unsigned int, uintptr_t);
+    typedef _invalid_parameter_handler _invalid_parameter_handler_m;
+    _MRTIMP _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(__in_opt _invalid_parameter_handler _Handlerh);
+#endif
+
+#if defined(_M_CEE_MIXED)
+    typedef void (__clrcall *_invalid_parameter_handler_m)(const wchar_t *, const wchar_t *, const wchar_t *, unsigned int, uintptr_t);
+    _MRTIMP _invalid_parameter_handler_m __cdecl _set_invalid_parameter_handler(__in_opt _invalid_parameter_handler_m _Handlerh);
+
+    _MRTIMP _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(__in int _Handler); /* To disambiguate NULL/0, only when we have both */
+#endif
+}
+#endif
+
+/* External variable declarations */
+#ifndef _CRT_ERRNO_DEFINED
+#define _CRT_ERRNO_DEFINED
+_CRTIMP extern int * __cdecl _errno(void);
+#define errno   (*_errno())
+
+errno_t __cdecl _set_errno(__in int _Value);
+errno_t __cdecl _get_errno(__out int * _Value);
+#endif
+
+_CRTIMP unsigned long * __cdecl __doserrno(void);
+#define _doserrno   (*__doserrno())
+
+errno_t __cdecl _set_doserrno(__in unsigned long _Value);
+errno_t __cdecl _get_doserrno(__out unsigned long * _Value);
+
+/* you can't modify this, but it is non-const for backcompat */
+_CRTIMP _CRT_INSECURE_DEPRECATE(strerror) char ** __cdecl __sys_errlist(void);
+#define _sys_errlist (__sys_errlist())
+
+_CRTIMP _CRT_INSECURE_DEPRECATE(strerror) int * __cdecl __sys_nerr(void);
+#define _sys_nerr (*__sys_nerr())
+
+#if     defined(_DLL) && defined(_M_IX86)
+
+_CRTIMP int *          __cdecl __p___argc(void);
+_CRTIMP char ***       __cdecl __p___argv(void);
+_CRTIMP wchar_t ***    __cdecl __p___wargv(void);
+_CRTIMP char ***       __cdecl __p__environ(void);
+_CRTIMP wchar_t ***    __cdecl __p__wenviron(void);
+_CRTIMP char **        __cdecl __p__pgmptr(void);
+_CRTIMP wchar_t **     __cdecl __p__wpgmptr(void);
+
+
+#endif  /* _M_IX86 && _DLL */
+
+#if !defined(_M_CEE_PURE)
+_CRTIMP extern int __argc;          /* count of cmd line args */
+_CRTIMP extern char ** __argv;      /* pointer to table of cmd line args */
+_CRTIMP extern wchar_t ** __wargv;  /* pointer to table of wide cmd line args */
+#else
+_CRTIMP int* __cdecl __p___argc();
+_CRTIMP char*** __cdecl __p___argv();
+_CRTIMP wchar_t*** __cdecl __p___wargv();
+#define __argv (*__p___argv())
+#define __argc (*__p___argc())
+#define __wargv (*__p___wargv())
+#endif
+
+#if !defined(_M_CEE_PURE)
+#ifdef  _POSIX_
+extern char ** environ;             /* pointer to environment table */
+#else
+_CRTIMP extern char ** _environ;    /* pointer to environment table */
+_CRTIMP extern wchar_t ** _wenviron;    /* pointer to wide environment table */
+#endif  /* _POSIX_ */
+
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_pgmptr) _CRTIMP extern char * _pgmptr;      /* points to the module (EXE) name */
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_wpgmptr) _CRTIMP extern wchar_t * _wpgmptr;  /* points to the module (EXE) wide name */
+
+
+#else
+
+_CRTIMP char*** __cdecl __p__environ();
+_CRTIMP wchar_t*** __cdecl __p__wenviron();
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_pgmptr) _CRTIMP char** __cdecl __p__pgmptr();
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_wpgmptr) _CRTIMP wchar_t** __cdecl __p__wpgmptr();
+
+#define _environ   (*__p__environ())
+#define _wenviron  (*__p__wenviron())
+#define _pgmptr    (*__p__pgmptr())
+#define _wpgmptr   (*__p__wpgmptr())
+
+#endif /* !defined(_M_CEE_PURE) */
+
+errno_t __cdecl _get_pgmptr(__deref_out_z char ** _Value);
+errno_t __cdecl _get_wpgmptr(__deref_out_z wchar_t ** _Value);
+
+
+#if !defined(_M_CEE_PURE)
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_fmode) _CRTIMP extern int _fmode;          /* default file translation mode */
+#else
+_CRTIMP int* __cdecl __p__fmode();
+#define _fmode (*__p__fmode())
+#endif /* !defined(_M_CEE_PURE) */
+
+_CRTIMP errno_t __cdecl _set_fmode(__in int _Mode);
+_CRTIMP errno_t __cdecl _get_fmode(__out int * _PMode);
+
+/* Windows major/minor and O.S. version numbers */
+
+#pragma warning(push)
+#pragma warning(disable:4141)
+
+#if !defined(_M_CEE_PURE)
+_CRT_INSECURE_DEPRECATE(_get_osplatform) _CRT_OBSOLETE(GetVersionEx)	_CRTIMP extern unsigned int _osplatform;
+_CRT_INSECURE_DEPRECATE(_get_osver) _CRT_OBSOLETE(GetVersionEx)			_CRTIMP extern unsigned int _osver;
+_CRT_INSECURE_DEPRECATE(_get_winver) _CRT_OBSOLETE(GetVersionEx)		_CRTIMP extern unsigned int _winver;
+_CRT_INSECURE_DEPRECATE(_get_winmajor) _CRT_OBSOLETE(GetVersionEx)		_CRTIMP extern unsigned int _winmajor;
+_CRT_INSECURE_DEPRECATE(_get_winminor) _CRT_OBSOLETE(GetVersionEx)		_CRTIMP extern unsigned int _winminor;
+
+
+#else
+_CRT_INSECURE_DEPRECATE(_get_osplatform) _CRT_OBSOLETE(GetVersionEx)	_CRTIMP unsigned int* __cdecl __p__osplatform();
+_CRT_INSECURE_DEPRECATE(_get_osver) _CRT_OBSOLETE(GetVersionEx)			_CRTIMP unsigned int* __cdecl __p__osver();
+_CRT_INSECURE_DEPRECATE(_get_winver) _CRT_OBSOLETE(GetVersionEx)		_CRTIMP unsigned int* __cdecl __p__winver();
+_CRT_INSECURE_DEPRECATE(_get_winmajor) _CRT_OBSOLETE(GetVersionEx)		_CRTIMP unsigned int* __cdecl __p__winmajor();
+_CRT_INSECURE_DEPRECATE(_get_winminor) _CRT_OBSOLETE(GetVersionEx)		_CRTIMP unsigned int* __cdecl __p__winminor();
+
+#define _osplatform  (*__p__osplatform())
+#define _osver       (*__p__osver())
+#define _winver      (*__p__winver())
+#define _winmajor    (*__p__winmajor())
+#define _winminor    (*__p__winminor())
+#endif /* !defined(_M_CEE_PURE) */
+
+#pragma warning(pop)
+
+_CRT_OBSOLETE(GetVersionEx) errno_t __cdecl _get_osplatform(__out unsigned int * _Value);
+_CRT_OBSOLETE(GetVersionEx) errno_t __cdecl _get_osver(__out unsigned int * _Value);
+_CRT_OBSOLETE(GetVersionEx) errno_t __cdecl _get_winver(__out unsigned int * _Value);
+_CRT_OBSOLETE(GetVersionEx) errno_t __cdecl _get_winmajor(__out unsigned int * _Value);
+_CRT_OBSOLETE(GetVersionEx) errno_t __cdecl _get_winminor(__out unsigned int * _Value);
+
+/* _countof helper */
+#if !defined(_countof)
+#if !defined(__cplusplus)
+#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#else
+extern "C++"
+{
+template <typename _CountofType, size_t _SizeOfArray>
+char (*__countof_helper(UNALIGNED _CountofType (&_Array)[_SizeOfArray]))[_SizeOfArray];
+#define _countof(_Array) sizeof(*__countof_helper(_Array))
+}
+#endif
+#endif
+
+/* function prototypes */
+
+#ifndef _CRT_TERMINATE_DEFINED
+#define _CRT_TERMINATE_DEFINED
+_CRTIMP __declspec(noreturn) void __cdecl exit(__in int _Code);
+_CRTIMP __declspec(noreturn) void __cdecl _exit(__in int _Code);
+_CRTIMP void __cdecl abort(void);
+#endif
+
+_CRTIMP unsigned int __cdecl _set_abort_behavior(__in unsigned int _Flags, __in unsigned int _Mask);
+
+#ifndef _CRT_ABS_DEFINED
+#define _CRT_ABS_DEFINED
+        int     __cdecl abs(__in int _X);
+        long    __cdecl labs(__in long _X);
+#endif
+
+#if     _INTEGRAL_MAX_BITS >= 64
+        __int64    __cdecl _abs64(__int64);
+#endif
+#if _MSC_VER >= 1400 && defined(_M_CEE)
+        __checkReturn int    __clrcall _atexit_m_appdomain(__in_opt void (__clrcall * _Func)(void));
+#if defined(_M_CEE_MIXED)
+        __checkReturn int    __clrcall _atexit_m(__in_opt void (__clrcall * _Func)(void));
+#else
+        __checkReturn inline int __clrcall _atexit_m(__in_opt void (__clrcall *_Function)(void))
+        {
+            return _atexit_m_appdomain(_Function);
+        }
+#endif
+#endif
+#if defined(_M_CEE_PURE)
+        /* In pure mode, atexit is the same as atexit_m_appdomain */
+extern "C++"
+{
+inline  int    __clrcall atexit
+(
+    void (__clrcall *_Function)(void)
+)
+{
+    return _atexit_m_appdomain(_Function);
+}
+}
+#else
+        int    __cdecl atexit(void (__cdecl *)(void));
+#endif
+#ifndef _CRT_ATOF_DEFINED
+#define _CRT_ATOF_DEFINED
+_CRTIMP double  __cdecl atof(__in_z const char *_String);
+_CRTIMP double  __cdecl _atof_l(__in_z const char *_String, __in_opt _locale_t _Locale);
+#endif
+_CRTIMP _CRT_JIT_INTRINSIC __checkReturn int    __cdecl atoi(__in_z const char *_Str);
+_CRTIMP __checkReturn int    __cdecl _atoi_l(__in_z const char *_Str, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn long   __cdecl atol(__in_z const char *_Str);
+_CRTIMP __checkReturn long   __cdecl _atol_l(__in_z const char *_Str, __in_opt _locale_t _Locale);
+#ifndef _CRT_ALGO_DEFINED
+#define _CRT_ALGO_DEFINED
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn void * __cdecl bsearch_s(__in const void * _Key, __in_bcount(_NumOfElements * _SizeOfElements) const void * _Base, 
+        __in rsize_t _NumOfElements, __in rsize_t _SizeOfElements,
+        __in int (__cdecl * _PtFuncCompare)(void *, const void *, const void *), void * _Context);
+#endif
+_CRTIMP __checkReturn void * __cdecl bsearch(__in const void * _Key, __in_bcount(_NumOfElements * _SizeOfElements) const void * _Base, 
+        __in size_t _NumOfElements, __in size_t _SizeOfElements,
+        __in int (__cdecl * _PtFuncCompare)(const void *, const void *));
+
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP void __cdecl qsort_s(__inout_bcount(_NumOfElements* _SizeOfElements) void * _Base, 
+        __in rsize_t _NumOfElements, __in rsize_t _SizeOfElements,
+        __in int (__cdecl * _PtFuncCompare)(void *, const void *, const void *), void *_Context);
+#endif
+_CRTIMP void __cdecl qsort(__inout_bcount(_NumOfElements * _SizeOfElements) void * _Base, 
+	__in size_t _NumOfElements, __in size_t _SizeOfElements, 
+        __in int (__cdecl * _PtFuncCompare)(const void *, const void *));
+#endif
+        __checkReturn unsigned short __cdecl _byteswap_ushort(__in unsigned short _Short);
+        __checkReturn unsigned long  __cdecl _byteswap_ulong (__in unsigned long _Long);
+#if     _INTEGRAL_MAX_BITS >= 64
+        __checkReturn unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64);
+#endif
+_CRTIMP __checkReturn div_t  __cdecl div(__in int _Numerator, __in int _Denominator);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_dupenv_s) __checkReturn char * __cdecl getenv(__in_z const char * _VarName);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_opt errno_t __cdecl getenv_s(__out size_t * _ReturnSize, __out_ecount_z(_DstSize) char * _DstBuf, __in rsize_t _DstSize, __in_z const char * _VarName);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, getenv_s, __out size_t *, _ReturnSize, __out_ecount(_Size) char, _Dest, __in_z const char *, _VarName)
+_CRTIMP __checkReturn_opt errno_t __cdecl _dupenv_s(__deref_out_ecount_z_opt(*_PBufferSizeInBytes) char **_PBuffer, __out_opt size_t * _PBufferSizeInBytes, __in_z const char * _VarName);
+_CRTIMP __checkReturn_opt errno_t __cdecl _itoa_s(__in int _Value, __out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in int _Radix);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _itoa_s, __in int, _Value, __out_ecount(_Size) char, _Dest, __in int, _Radix)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(char *, __RETURN_POLICY_DST, _CRTIMP, _itoa, __in int, _Value, __out_z char, _Dest, __in int, _Radix)
+#if     _INTEGRAL_MAX_BITS >= 64
+_CRTIMP __checkReturn_opt errno_t __cdecl _i64toa_s(__in __int64 _Val, __out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in int _Radix);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_i64toa_s) char * __cdecl _i64toa(__in __int64 _Val, __out_z char * _DstBuf, __in int _Radix);
+_CRTIMP __checkReturn_opt errno_t __cdecl _ui64toa_s(__in unsigned __int64 _Val, __out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in int _Radix);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_ui64toa_s) char * __cdecl _ui64toa(__in unsigned __int64 _Val, __out_z char * _DstBuf, __in int _Radix);
+_CRTIMP __checkReturn __int64 __cdecl _atoi64(__in_z const char * _String);
+_CRTIMP __checkReturn __int64 __cdecl _atoi64_l(__in_z const char * _String, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn __int64 __cdecl _strtoi64(__in_z const char * _String, __deref_opt_out_z char ** _EndPtr, __in int _Radix);
+_CRTIMP __checkReturn __int64 __cdecl _strtoi64_l(__in_z const char * _String, __deref_opt_out_z char ** _EndPtr, __in int _Radix, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn unsigned __int64 __cdecl _strtoui64(__in_z const char * _String, __deref_opt_out_z char ** _EndPtr, __in int _Radix);
+_CRTIMP __checkReturn unsigned __int64 __cdecl _strtoui64_l(__in_z const char * _String, __deref_opt_out_z char ** _EndPtr, __in int  _Radix, __in_opt _locale_t _Locale);
+#endif
+_CRTIMP __checkReturn ldiv_t __cdecl ldiv(__in long _Numerator, __in long _Denominator);
+#ifdef __cplusplus
+extern "C++"
+{
+    inline ldiv_t  div(__in long _A1, __in long _A2)
+    {
+        return ldiv(_A1, _A2);
+    }
+}
+#endif
+_CRTIMP __checkReturn_opt errno_t __cdecl _ltoa_s(__in long _Val, __out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in int _Radix);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _ltoa_s, __in long, _Value, __out_ecount(_Size) char, _Dest, __in int, _Radix)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(char *, __RETURN_POLICY_DST, _CRTIMP, _ltoa, __in long, _Value, __out_z char, _Dest, __in int, _Radix)
+_CRTIMP __checkReturn int    __cdecl mblen(__in_bcount_z_opt(_MaxCount) const char * _Ch, __in size_t _MaxCount);
+_CRTIMP __checkReturn int    __cdecl _mblen_l(__in_bcount_z_opt(_MaxCount) const char * _Ch, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn size_t __cdecl _mbstrlen(__in_z const char * _Str);
+_CRTIMP __checkReturn size_t __cdecl _mbstrlen_l(__in_z const char *_Str, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn size_t __cdecl _mbstrnlen(__in_bcount_z(_MaxCount) const char *_Str, __in size_t _MaxCount);
+_CRTIMP __checkReturn size_t __cdecl _mbstrnlen_l(__in_bcount_z(_MaxCount) const char *_Str, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP int    __cdecl mbtowc(__out_z wchar_t * _DstCh, __in_bcount_z_opt(_SrcSizeInBytes) const char * _SrcCh, __in size_t _SrcSizeInBytes);
+_CRTIMP int    __cdecl _mbtowc_l(__out_z wchar_t * _DstCh, __in_bcount_z_opt(_SrcSizeInBytes) const char * _SrcCh, __in size_t _SrcSizeInBytes, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn_opt errno_t __cdecl mbstowcs_s(__out_opt size_t * _PtNumOfCharConverted, __out_ecount_part_opt(_SizeInWords, *_PtNumOfCharConverted) wchar_t * _DstBuf, __in size_t _SizeInWords, __in_ecount_z(_MaxCount) const char * _SrcBuf, __in size_t _MaxCount );
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(errno_t, mbstowcs_s, __out_opt size_t *, _PtNumOfCharConverted, __out_ecount_z(_Size) wchar_t, _Dest, __in_z const char *, _Source, __in size_t, _MaxCount)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE(_CRTIMP, mbstowcs, __out_z_opt wchar_t, _Dest, __in_z const char *, _Source, __in size_t, _MaxCount)
+
+_CRTIMP __checkReturn_opt errno_t __cdecl _mbstowcs_s_l(__out_opt size_t * _PtNumOfCharConverted, __out_ecount_part_opt(_SizeInWords, *_PtNumOfCharConverted) wchar_t * _DstBuf, __in size_t _SizeInWords, __in_ecount_z(_MaxCount) const char * _SrcBuf, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t, _mbstowcs_s_l, __out_opt size_t *, _PtNumOfCharConverted, __out_ecount(_Size) wchar_t, _Dest, __in_z const char *, _Source, __in size_t, _MaxCount, __in_opt _locale_t, _Locale)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE_EX(_CRTIMP, _mbstowcs_l, _mbstowcs_s_l, __out_ecount_z_opt(_Size) wchar_t, __out_z_opt wchar_t, _Dest, __in_z const char *, _Source, __in size_t, _MaxCount, __in_opt _locale_t, _Locale)
+
+_CRTIMP __checkReturn int    __cdecl rand(void);
+#if defined(_CRT_RAND_S)
+_CRTIMP errno_t __cdecl rand_s ( __out unsigned int *_RandomValue);
+#endif
+
+_CRTIMP __checkReturn_opt int    __cdecl _set_error_mode(__in int _Mode);
+
+_CRTIMP void   __cdecl srand(__in unsigned int _Seed);
+_CRTIMP __checkReturn double __cdecl strtod(__in_z const char * _Str, __deref_opt_out_z char ** _EndPtr);
+_CRTIMP __checkReturn double __cdecl _strtod_l(__in_z const char * _Str, __deref_opt_out_z char ** _EndPtr, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn long   __cdecl strtol(__in_z const char * _Str, __deref_opt_out_z char ** _EndPtr, __in int _Radix );
+_CRTIMP __checkReturn long   __cdecl _strtol_l(__in_z const char *_Str, __deref_opt_out_z char **_EndPtr, __in int _Radix, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn unsigned long __cdecl strtoul(__in_z const char * _Str, __deref_opt_out_z char ** _EndPtr, __in int _Radix);
+_CRTIMP __checkReturn unsigned long __cdecl _strtoul_l(const char * _Str, __deref_opt_out_z char **_EndPtr, __in int _Radix, __in_opt _locale_t _Locale);
+#ifndef _CRT_SYSTEM_DEFINED
+#define _CRT_SYSTEM_DEFINED
+_CRTIMP int __cdecl system(__in_z_opt const char * _Command);
+#endif
+_CRTIMP __checkReturn_opt errno_t __cdecl _ultoa_s(__in unsigned long _Val, __out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in int _Radix);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _ultoa_s, __in unsigned long, _Value, __out_ecount(_Size) char, _Dest, __in int, _Radix)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(char *, __RETURN_POLICY_DST, _CRTIMP, _ultoa, __in unsigned long, _Value, __out_z char, _Dest, __in int, _Radix)
+_CRTIMP _CRT_INSECURE_DEPRECATE(wctomb_s) int    __cdecl wctomb(__out_bcount_z_opt(MB_LEN_MAX) char * _MbCh, __in_z wchar_t _WCh);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_wctomb_s_l) int    __cdecl _wctomb_l(__out_z_opt char * _MbCh, __in_z wchar_t _WCh, __in_opt _locale_t _Locale);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl wctomb_s(__out_opt int * _SizeConverted, __out_bcount_part_opt(_SizeInBytes, *_SizeConverted) char * _MbCh, __in rsize_t _SizeInBytes, __in_z wchar_t _WCh);
+#endif
+_CRTIMP __checkReturn_wat errno_t __cdecl _wctomb_s_l(__out_opt int * _SizeConverted, __out_bcount_z_opt(_SizeInBytes) char * _MbCh, __in size_t _SizeInBytes, __in_z wchar_t _WCh, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn_wat errno_t __cdecl wcstombs_s(__out_opt size_t * _PtNumOfCharConverted, __out_bcount_part_opt(_DstSizeInBytes, *_PtNumOfCharConverted) char * _Dst, __in size_t _DstSizeInBytes, __in_z const wchar_t * _Src, __in size_t _MaxCountInBytes);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(errno_t, wcstombs_s, __out_opt size_t *, _PtNumOfCharConverted, __out_bcount_opt(_Size) char, _Dest, __in_z const wchar_t *, _Source, __in size_t, _MaxCount)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_SIZE(_CRTIMP, wcstombs, __out_z_opt char, _Dest, __in_z const wchar_t *, _Source, __in size_t, _MaxCount)
+_CRTIMP __checkReturn_wat errno_t __cdecl _wcstombs_s_l(__out_opt size_t * _PtNumOfCharConverted, __out_bcount_part_opt(_DstSizeInBytes, *_PtNumOfCharConverted) char * _Dst, __in size_t _DstSizeInBytes, __in_z const wchar_t * _Src, __in size_t _MaxCountInBytes, __in_opt _locale_t _Locale);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t, _wcstombs_s_l, __out_opt size_t *,_PtNumOfCharConverted, __out_ecount_opt(_Size) char, _Dest, __in_z const wchar_t *, _Source, __in size_t, _MaxCount, __in_opt _locale_t, _Locale)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_3_SIZE_EX(_CRTIMP, _wcstombs_l, _wcstombs_s_l, __out_ecount_z_opt(_Size) char, __out_z_opt char, _Dest, __in_z const wchar_t *, _Source, __in size_t, _MaxCount, __in_opt _locale_t, _Locale)
+
+#if _MSC_VER >= 1400 && defined(__cplusplus) && defined(_M_CEE)
+/*
+ * Managed search routines. Note __cplusplus, this is because we only support
+ * managed C++.
+ */
+extern "C++"
+{
+#if __STDC_WANT_SECURE_LIB__
+__checkReturn void * __clrcall bsearch_s(__in const void * _Key, __in_bcount(_NumOfElements*_SizeOfElements) const void * _Base, __in rsize_t _NumOfElements, __in rsize_t _SizeOfElements, 
+        __in int (__clrcall * _PtFuncCompare)(void *, const void *, const void *), void * _Context);
+#endif
+__checkReturn void * __clrcall bsearch  (__in const void * _Key, __in_bcount(_NumOfElements*_SizeOfElements) const void * _Base, __in size_t _NumOfElements, __in size_t _SizeOfElements,
+        __in int (__clrcall * _PtFuncCompare)(const void *, const void *));
+
+#if __STDC_WANT_SECURE_LIB__
+void __clrcall qsort_s(__inout_bcount(_NumOfElements*_SizeOfElements) void * _Base, __in rsize_t _NumOfElements, __in rsize_t _SizeOfElements, 
+        __in int (__clrcall * _PtFuncCompare)(void *, const void *, const void *), void * _Context);
+#endif
+void __clrcall qsort  (__inout_bcount(_NumOfElements*_SizeOfElements) void * _Base, __in size_t _NumOfElements, __in size_t _SizeOfElements, 
+        __in int (__clrcall * _PtFuncCompare)(const void *, const void *));
+}
+#endif
+
+#ifndef _CRT_ALLOCATION_DEFINED
+#define _CRT_ALLOCATION_DEFINED
+_CRTIMP _CRT_JIT_INTRINSIC  _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_NumOfElements* _SizeOfElements)    void * __cdecl calloc(__in size_t _NumOfElements, __in size_t _SizeOfElements);
+_CRTIMP                     _CRTNOALIAS                                                                             void   __cdecl free(__inout_opt void * _Memory);
+_CRTIMP _CRT_JIT_INTRINSIC  _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size)                              void * __cdecl malloc(__in size_t _Size);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_NewSize)                           void * __cdecl realloc(__in_opt void * _Memory, __in size_t _NewSize);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size*_Count)                       void * __cdecl _recalloc(__in_opt void * _Memory, __in size_t _Count, __in size_t _Size);
+_CRTIMP                     _CRTNOALIAS                                                                             void   __cdecl _aligned_free(__inout_opt void * _Memory);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size)                              void * __cdecl _aligned_malloc(__in size_t _Size, __in size_t _Alignment);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size)                              void * __cdecl _aligned_offset_malloc(__in size_t _Size, __in size_t _Alignment, __in size_t _Offset);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size)                              void * __cdecl _aligned_realloc(__in_opt void * _Memory, __in size_t _Size, __in size_t _Alignment);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size*_Count)                       void * __cdecl _aligned_recalloc(__in_opt void * _Memory, __in size_t _Count, __in size_t _Size, __in size_t _Alignment);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size)                              void * __cdecl _aligned_offset_realloc(__in_opt void * _Memory, __in size_t _Size, __in size_t _Alignment, __in size_t _Offset);
+_CRTIMP                     _CRTNOALIAS _CRTRESTRICT __checkReturn __bcount_opt(_Size*_Count)                       void * __cdecl _aligned_offset_recalloc(__in_opt void * _Memory, __in size_t _Count, __in size_t _Size, __in size_t _Alignment, __in size_t _Offset);
+#endif
+
+#ifndef _WSTDLIB_DEFINED
+
+/* wide function prototypes, also declared in wchar.h  */
+
+_CRTIMP __checkReturn_wat errno_t __cdecl _itow_s (__in int _Val, __out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in int _Radix);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _itow_s, __in int, _Value, __out_ecount(_Size) wchar_t, _Dest, __in int, _Radix)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _itow, __in int, _Value, __out_z wchar_t, _Dest, __in int, _Radix)
+_CRTIMP __checkReturn_wat errno_t __cdecl _ltow_s (__in long _Val, __out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in int _Radix);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _ltow_s, __in long, _Value, __out_ecount(_Size) wchar_t, _Dest, __in int, _Radix)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _ltow, __in long, _Value, __out_z wchar_t, _Dest, __in int, _Radix)
+_CRTIMP __checkReturn_wat errno_t __cdecl _ultow_s (__in unsigned long _Val, __out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in int _Radix);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _ultow_s, __in unsigned long, _Value, __out_ecount(_Size) wchar_t, _Dest, __in int, _Radix)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_1_1(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _ultow, __in unsigned long, _Value, __out_z wchar_t, _Dest, __in int, _Radix)
+_CRTIMP __checkReturn double __cdecl wcstod(__in_z const wchar_t * _Str, __deref_opt_out_z wchar_t ** _EndPtr);
+_CRTIMP __checkReturn double __cdecl _wcstod_l(__in_z const wchar_t *_Str, __deref_opt_out_z wchar_t ** _EndPtr, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn long   __cdecl wcstol(__in_z const wchar_t *_Str, __deref_opt_out_z wchar_t ** _EndPtr, int _Radix);
+_CRTIMP __checkReturn long   __cdecl _wcstol_l(__in_z const wchar_t *_Str, __deref_opt_out_z wchar_t **_EndPtr, int _Radix, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn unsigned long __cdecl wcstoul(__in_z const wchar_t *_Str, __deref_opt_out_z wchar_t ** _EndPtr, int _Radix);
+_CRTIMP __checkReturn unsigned long __cdecl _wcstoul_l(__in_z const wchar_t *_Str, __deref_opt_out_z wchar_t **_EndPtr, int _Radix, __in_opt _locale_t _Locale);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_wdupenv_s) __checkReturn wchar_t * __cdecl _wgetenv(__in_z const wchar_t * _VarName);
+_CRTIMP __checkReturn_wat errno_t __cdecl _wgetenv_s(__out size_t * _ReturnSize, __out_ecount_z(_DstSizeInWords) wchar_t * _DstBuf, __in size_t _DstSizeInWords, __in_z const wchar_t * _VarName);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _wgetenv_s, __out size_t *, _ReturnSize, __out_ecount(_Size) wchar_t, _Dest, __in_z const wchar_t *, _VarName)
+_CRTIMP __checkReturn_wat errno_t __cdecl _wdupenv_s(__deref_out_ecount_z_opt(*_BufferSizeInWords) wchar_t **_Buffer, __out_opt size_t *_BufferSizeInWords, __in_z const wchar_t *_VarName);
+#ifndef _CRT_WSYSTEM_DEFINED
+#define _CRT_WSYSTEM_DEFINED
+_CRTIMP int __cdecl _wsystem(__in_z_opt const wchar_t * _Command);
+#endif
+_CRTIMP __checkReturn double __cdecl _wtof(__in_z const wchar_t *_Str);
+_CRTIMP __checkReturn double __cdecl _wtof_l(__in_z const wchar_t *_Str, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _wtoi(__in_z const wchar_t *_Str);
+_CRTIMP __checkReturn int __cdecl _wtoi_l(__in_z const wchar_t *_Str, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn long __cdecl _wtol(__in_z const wchar_t *_Str);
+_CRTIMP __checkReturn long __cdecl _wtol_l(__in_z const wchar_t *_Str, __in_opt _locale_t _Locale);
+
+#if     _INTEGRAL_MAX_BITS >= 64
+_CRTIMP __checkReturn_wat errno_t __cdecl _i64tow_s(__in __int64 _Val, __out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in int _Radix);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_i65tow_s) wchar_t * __cdecl _i64tow(__in __int64 _Val, __out_z wchar_t * _DstBuf, __in int _Radix);
+_CRTIMP __checkReturn_wat errno_t __cdecl _ui64tow_s(__in unsigned __int64 _Val, __out_ecount_z(_SizeInWords) wchar_t * _DstBuf, __in size_t _SizeInWords, __in int _Radix);
+_CRTIMP _CRT_INSECURE_DEPRECATE(_ui64tow_s) wchar_t * __cdecl _ui64tow(__in unsigned __int64 _Val, __out_z wchar_t * _DstBuf, __in int _Radix);
+_CRTIMP __checkReturn __int64   __cdecl _wtoi64(__in_z const wchar_t *_Str);
+_CRTIMP __checkReturn __int64   __cdecl _wtoi64_l(__in_z const wchar_t *_Str, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn __int64   __cdecl _wcstoi64(__in_z const wchar_t * _Str, __deref_opt_out_z wchar_t ** _EndPtr, __in int _Radix);
+_CRTIMP __checkReturn __int64   __cdecl _wcstoi64_l(__in_z const wchar_t * _Str, __deref_opt_out_z wchar_t ** _EndPtr, __in int _Radix, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn unsigned __int64  __cdecl _wcstoui64(__in_z const wchar_t * _Str, __deref_opt_out_z wchar_t ** _EndPtr, __in int _Radix);
+_CRTIMP __checkReturn unsigned __int64  __cdecl _wcstoui64_l(__in_z const wchar_t *_Str , __deref_opt_out_z wchar_t ** _EndPtr, __in int _Radix, __in_opt _locale_t _Locale);
+#endif
+
+#define _WSTDLIB_DEFINED
+#endif
+
+
+#ifndef _POSIX_
+
+/* 
+Buffer size required to be passed to _gcvt, fcvt and other fp conversion routines
+*/
+#define _CVTBUFSIZE (309+40) /* # of digits in max. dp value + slop */
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_fullpath")
+#undef _fullpath
+#endif
+
+_CRTIMP __checkReturn char * __cdecl _fullpath(__out_ecount_z_opt(_SizeInBytes) char * _FullPath, __in_z const char * _Path, __in size_t _SizeInBytes);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_fullpath")
+#endif
+
+_CRTIMP __checkReturn_wat errno_t __cdecl _ecvt_s(__out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in double _Val, __in int _NumOfDights, __out int * _PtDec, __out int * _PtSign);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(errno_t, _ecvt_s, __out_ecount(_Size) char, _Dest, __in double, _Value, __in int, _NumOfDigits, __out int *, _PtDec, __out int *, _PtSign)
+_CRTIMP _CRT_INSECURE_DEPRECATE(_ecvt_s) __checkReturn char * __cdecl _ecvt(__in double _Val, __in int _NumOfDigits, __out int * _PtDec, __out int * _PtSign);
+_CRTIMP __checkReturn_wat errno_t __cdecl _fcvt_s(__out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in double _Val, __in int _NumOfDec, __out int * _PtDec, __out int * _PtSign);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(errno_t, _fcvt_s, __out_ecount(_Size) char, _Dest, __in double, _Value, __in int, _NumOfDigits, __out int *, _PtDec, __out int *, _PtSign)
+_CRTIMP _CRT_INSECURE_DEPRECATE(_fcvt_s) __checkReturn char * __cdecl _fcvt(__in double _Val, __in int _NumOfDec, __out int * _PtDec, __out int * _PtSign);
+_CRTIMP errno_t __cdecl _gcvt_s(__out_ecount_z(_Size) char * _DstBuf, __in size_t _Size, __in double _Val, __in int _NumOfDigits);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, _gcvt_s, __out_ecount(_Size) char, _Dest, __in double, _Value, __in int, _NumOfDigits)
+_CRTIMP _CRT_INSECURE_DEPRECATE(_gcvt_s) char * __cdecl _gcvt(__in double _Val, __in int _NumOfDigits, __out_z char * _DstBuf);
+
+_CRTIMP __checkReturn int __cdecl _atodbl(__out _CRT_DOUBLE * _Result, __in_z char * _Str);
+_CRTIMP __checkReturn int __cdecl _atoldbl(__out _LDOUBLE * _Result, __in_z char * _Str);
+_CRTIMP __checkReturn int __cdecl _atoflt(__out _CRT_FLOAT * _Result, __in_z char * _Str);
+_CRTIMP __checkReturn int __cdecl _atodbl_l(__out _CRT_DOUBLE * _Result, __in_z char * _Str, __in_opt _locale_t _Locale);
+_CRTIMP int __cdecl _atoldbl_l(__out _LDOUBLE * _Result, __in_z char * _Str, __in_opt _locale_t _Locale);
+_CRTIMP int __cdecl _atoflt_l(__out _CRT_FLOAT * _Result, __in_z char * _Str, __in_opt _locale_t _Locale);
+        __checkReturn unsigned long __cdecl _lrotl(__in unsigned long _Val, __in int _Shift);
+        __checkReturn unsigned long __cdecl _lrotr(__in unsigned long _Val, __in int _Shift);
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t   __cdecl _makepath_s(__out_ecount_z(_Size) char * _PathResult, __in_opt size_t _Size, __in_z_opt const char * _Drive, __in_z_opt const char * _Dir, __in_z_opt const char * _Filename,
+        __in_z_opt const char * _Ext);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(errno_t, _makepath_s, __out_ecount(_Size) char, _Path, __in_z_opt const char *, _Drive, __in_z_opt const char *, _Dir, __in_z_opt const char *, _Filename, __in_z_opt const char *, _Ext)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4(void, __RETURN_POLICY_VOID, _CRTIMP, _makepath, __out_z char, _Path, __in_z_opt const char *, _Drive, __in_z_opt const char *, _Dir, __in_z_opt const char *, _Filename, __in_z_opt const char *, _Ext)
+
+#if _MSC_VER >= 1400 && defined(_M_CEE)
+		_onexit_m_t    __clrcall _onexit_m_appdomain(_onexit_m_t _Function);
+	#if defined(_M_CEE_MIXED)
+		_onexit_m_t    __clrcall _onexit_m(_onexit_m_t _Function);
+	#else
+		inline _onexit_m_t    __clrcall _onexit_m(_onexit_t _Function)
+		{
+			return _onexit_m_appdomain(_Function);
+		}
+	#endif
+        
+#endif
+#if defined(_M_CEE_PURE)
+        /* In pure mode, _onexit is the same as _onexit_m_appdomain */
+extern "C++"
+{
+inline  _onexit_t    __clrcall _onexit
+(
+    _onexit_t _Function
+)
+{
+    return _onexit_m_appdomain(_Function);
+}
+}
+#else
+        _onexit_t __cdecl _onexit(__in_opt _onexit_t _Func);
+#endif
+        
+#ifndef _CRT_PERROR_DEFINED
+#define _CRT_PERROR_DEFINED
+_CRTIMP void __cdecl perror(__in_z_opt const char * _ErrMsg);
+#endif
+_CRTIMP __checkReturn int    __cdecl _putenv(__in_z const char * _EnvString);
+_CRTIMP __checkReturn_wat errno_t __cdecl _putenv_s(__in_z const char * _Name, __in_z const char * _Value);
+        __checkReturn unsigned int __cdecl _rotl(__in unsigned int _Val, __in int _Shift);
+#if     _INTEGRAL_MAX_BITS >= 64
+        __checkReturn unsigned __int64 __cdecl _rotl64(__in unsigned __int64 _Val, __in int _Shift);
+#endif
+        __checkReturn unsigned int __cdecl _rotr(__in unsigned int _Val, __in int _Shift);
+#if     _INTEGRAL_MAX_BITS >= 64
+        __checkReturn unsigned __int64 __cdecl _rotr64(__in unsigned __int64 _Val, __in int _Shift);
+#endif
+_CRTIMP errno_t __cdecl _searchenv_s(__in_z const char * _Filename, __in_z const char * _EnvVar, __out_ecount_z(_SizeInBytes) char * _ResultPath, __in size_t _SizeInBytes);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(errno_t, _searchenv_s, __in_z const char *, _Filename, __in_z const char *, _EnvVar, __out_ecount(_Size) char, _ResultPath)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0(void, __RETURN_POLICY_VOID, _CRTIMP, _searchenv, __in_z const char *, _Filename, __in_z const char *, _EnvVar, __out_z char, _ResultPath)
+
+_CRT_INSECURE_DEPRECATE(_splitpath_s) _CRTIMP void   __cdecl _splitpath(__in_z const char * _FullPath, __out_z_opt char * _Drive, __out_z_opt char * _Dir, __out_z_opt char * _Filename, __out_z_opt char * _Ext);
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t  __cdecl _splitpath_s(__in_z const char * _FullPath, 
+		__out_ecount_z_opt(_DriveSize) char * _Drive, __in size_t _DriveSize, 
+		__out_ecount_z_opt(_DirSize) char * _Dir, __in size_t _DirSize, 
+		__out_ecount_z_opt(_FilenameSize) char * _Filename, __in size_t _FilenameSize, 
+		__out_ecount_z_opt(_ExtSize) char * _Ext, __in size_t _ExtSize);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(errno_t, _splitpath_s,  char, _Dest)
+
+_CRTIMP void   __cdecl _swab(__inout_ecount_full(_SizeInBytes) char * _Buf1, __inout_ecount_full(_SizeInBytes) char * _Buf2, int _SizeInBytes);
+
+#ifndef _WSTDLIBP_DEFINED
+
+/* wide function prototypes, also declared in wchar.h  */
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wfullpath")
+#undef _wfullpath
+#endif
+
+_CRTIMP __checkReturn wchar_t * __cdecl _wfullpath(__out_ecount_z_opt(_SizeInWords) wchar_t * _FullPath, __in_z const wchar_t * _Path, __in size_t _SizeInWords);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wfullpath")
+#endif
+
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl _wmakepath_s(__out_ecount_z(_SizeInWords) wchar_t * _PathResult, __in_opt size_t _SizeInWords, __in_z_opt const wchar_t * _Drive, __in_z_opt const wchar_t * _Dir, __in_z_opt const wchar_t * _Filename,
+        __in_z_opt const wchar_t * _Ext);        
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(errno_t, _wmakepath_s, __out_ecount(_Size) wchar_t, _ResultPath, __in_z_opt const wchar_t *, _Drive, __in_z_opt const wchar_t *, _Dir, __in_z_opt const wchar_t *, _Filename, __in_z_opt const wchar_t *, _Ext)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4(void, __RETURN_POLICY_VOID, _CRTIMP, _wmakepath, __out_z wchar_t, _ResultPath, __in_z_opt const wchar_t *, _Drive, __in_z_opt const wchar_t *, _Dir, __in_z_opt const wchar_t *, _Filename, __in_z_opt const wchar_t *, _Ext)
+#ifndef _CRT_WPERROR_DEFINED
+#define _CRT_WPERROR_DEFINED
+_CRTIMP void __cdecl _wperror(__in_z_opt const wchar_t * _ErrMsg);
+#endif 
+_CRTIMP __checkReturn int    __cdecl _wputenv(__in_z const wchar_t * _EnvString);
+_CRTIMP __checkReturn_wat errno_t __cdecl _wputenv_s(__in_z const wchar_t * _Name, __in_z const wchar_t * _Value);
+_CRTIMP errno_t __cdecl _wsearchenv_s(__in_z const wchar_t * _Filename, __in_z const wchar_t * _EnvVar, __out_ecount_z(_SizeInWords) wchar_t * _ResultPath, __in size_t _SizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(errno_t, _wsearchenv_s, __in_z const wchar_t *, _Filename, __in_z const wchar_t *, _EnvVar, __out_ecount(_Size) wchar_t, _ResultPath)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_2_0(void, __RETURN_POLICY_VOID, _CRTIMP, _wsearchenv, __in_z const wchar_t *, _Filename, __in_z const wchar_t *, _EnvVar, __out_z wchar_t, _ResultPath)
+_CRT_INSECURE_DEPRECATE(_wsplitpath_s) _CRTIMP void   __cdecl _wsplitpath(__in_z const wchar_t * _FullPath, __out_z_opt wchar_t * _Drive, __out_z_opt wchar_t * _Dir, __out_z_opt wchar_t * _Filename, __out_z_opt wchar_t * _Ext);
+_CRTIMP_ALTERNATIVE errno_t __cdecl _wsplitpath_s(__in_z const wchar_t * _FullPath, 
+		__out_ecount_z_opt(_DriveSizeInWords) wchar_t * _Drive, __in size_t _DriveSizeInWords, 
+		__out_ecount_z_opt(_DirSizeInWords) wchar_t * _Dir, __in size_t _DirSizeInWords, 
+		__out_ecount_z_opt(_FilenameSizeInWords) wchar_t * _Filename, __in size_t _FilenameSizeInWords, 
+		__out_ecount_z_opt(_ExtSizeInWords) wchar_t * _Ext, __in size_t _ExtSizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(errno_t, _wsplitpath_s, wchar_t, _Path)
+
+#define _WSTDLIBP_DEFINED
+#endif
+
+/* The Win32 API SetErrorMode, Beep and Sleep should be used instead. */
+_CRT_OBSOLETE(SetErrorMode) _CRTIMP void __cdecl _seterrormode(__in int _Mode);
+_CRT_OBSOLETE(Beep) _CRTIMP void __cdecl _beep(__in unsigned _Frequency, __in unsigned _Duration);
+_CRT_OBSOLETE(Sleep) _CRTIMP void __cdecl _sleep(__in unsigned long _Duration);
+
+#endif  /* _POSIX_ */
+
+#if     !__STDC__
+
+#ifndef _POSIX_
+
+/* Non-ANSI names for compatibility */
+
+#ifndef __cplusplus
+#define max(a,b)    (((a) > (b)) ? (a) : (b))
+#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#endif
+
+#define sys_errlist _sys_errlist
+#define sys_nerr    _sys_nerr
+#define environ     _environ
+
+#pragma warning(push)
+#pragma warning(disable: 4141) /* Using deprecated twice */ 
+_CRT_NONSTDC_DEPRECATE(_ecvt) _CRT_INSECURE_DEPRECATE(_ecvt_s)		_CRTIMP __checkReturn char * __cdecl ecvt(__in double _Val, __in int _NumOfDigits, __out int * _PtDec, __out int * _PtSign);
+_CRT_NONSTDC_DEPRECATE(_fcvt) _CRT_INSECURE_DEPRECATE(_fcvt_s)		_CRTIMP __checkReturn char * __cdecl fcvt(__in double _Val, __in int _NumOfDec, __out int * _PtDec, __out int * _PtSign);
+_CRT_NONSTDC_DEPRECATE(_gcvt) _CRT_INSECURE_DEPRECATE(_fcvt_s)		_CRTIMP char * __cdecl gcvt(__in double _Val, __in int _NumOfDigits, __out_z char * _DstBuf);
+_CRT_NONSTDC_DEPRECATE(_itoa) _CRT_INSECURE_DEPRECATE(_itoa_s)		_CRTIMP char * __cdecl itoa(__in int _Val, __out_z char * _DstBuf, __in int _Radix);
+_CRT_NONSTDC_DEPRECATE(_ltoa) _CRT_INSECURE_DEPRECATE(_ltoa_s)		_CRTIMP char * __cdecl ltoa(__in long _Val, __out_z char * _DstBuf, __in int _Radix);
+_CRT_NONSTDC_DEPRECATE(_putenv) 									_CRTIMP __checkReturn int    __cdecl putenv(__in_z const char * _EnvString);
+_CRT_NONSTDC_DEPRECATE(_swab)										_CRTIMP void   __cdecl swab(__inout_bcount_z(_SizeInBytes) char * _Buf1,__inout_bcount_z(_SizeInBytes) char * _Buf2, __in int _SizeInBytes);
+_CRT_NONSTDC_DEPRECATE(_ultoa) _CRT_INSECURE_DEPRECATE(_ultoa_s)	_CRTIMP char * __cdecl ultoa(__in unsigned long _Val, __out_z char * _Dstbuf, __in int _Radix);
+#pragma warning(pop)
+onexit_t __cdecl onexit(__in_opt onexit_t _Func);
+
+#endif  /* _POSIX_ */
+
+#endif  /* __STDC__ */
+
+#ifdef  __cplusplus
+}
+
+#endif
+
+#ifdef  _MSC_VER
+#pragma pack(pop)
+#endif  /* _MSC_VER */
+
+#endif  /* _INC_STDLIB */
diff --git a/base/Windows/Inc/string.h b/base/Windows/Inc/string.h
new file mode 100644
index 0000000..7eb1161
--- /dev/null
+++ b/base/Windows/Inc/string.h
@@ -0,0 +1,369 @@
+/***
+*string.h - declarations for string manipulation functions
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file contains the function declarations for the string
+*       manipulation functions.
+*       [ANSI/System V]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_STRING
+#define _INC_STRING
+
+#include <crtdefs.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifndef _NLSCMP_DEFINED
+#define _NLSCMPERROR    2147483647  /* currently == INT_MAX */
+#define _NLSCMP_DEFINED
+#endif
+
+/* Define NULL pointer value */
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+/* For backwards compatibility */
+#define _WConst_return _CONST_RETURN
+
+/* Function prototypes */
+#ifndef _CRT_MEMORY_DEFINED
+#define _CRT_MEMORY_DEFINED
+_CRTIMP void *  __cdecl _memccpy( __out_bcount_opt(_MaxCount) void * _Dst, __in const void * _Src, __in int _Val, __in size_t _MaxCount);
+_CRTIMP __checkReturn _CONST_RETURN void *  __cdecl memchr( __in_bcount_opt(_MaxCount) const void * _Buf , __in int _Val, __in size_t _MaxCount);
+_CRTIMP __checkReturn int     __cdecl _memicmp(__in_bcount_opt(_Size) const void * _Buf1, __in_bcount_opt(_Size) const void * _Buf2, __in size_t _Size);
+_CRTIMP __checkReturn int     __cdecl _memicmp_l(__in_bcount_opt(_Size) const void * _Buf1, __in_bcount_opt(_Size) const void * _Buf2, __in size_t _Size, __in_opt _locale_t _Locale);
+        __checkReturn int     __cdecl memcmp(__in_bcount_opt(_Size) const void * _Buf1, __in_bcount_opt(_Size) const void * _Buf2, __in size_t _Size);
+        _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) void *  __cdecl memcpy(__out_bcount_full_opt(_Size) void * _Dst, __in_bcount_opt(_Size) const void * _Src, __in size_t _Size);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP errno_t  __cdecl memcpy_s(__out_bcount_part_opt(_DstSize, _MaxCount) void * _Dst, __in rsize_t _DstSize, __in_bcount_opt(_MaxCount) const void * _Src, __in rsize_t _MaxCount);
+#endif
+        void *  __cdecl memset(__out_bcount_full_opt(_Size) void * _Dst, __in int _Val, __in size_t _Size);
+
+#if     !__STDC__
+/* Non-ANSI names for compatibility */
+_CRT_NONSTDC_DEPRECATE(_memccpy) _CRTIMP void * __cdecl memccpy(__out_bcount_opt(_Size) void * _Dst, __in_bcount_opt(_Size) const void * _Src, __in int _Val, __in size_t _Size);
+_CRT_NONSTDC_DEPRECATE(_memicmp) _CRTIMP __checkReturn int __cdecl memicmp(__in_bcount_opt(_Size) const void * _Buf1, __in_bcount_opt(_Size) const void * _Buf2, __in size_t _Size);
+#endif  /* __STDC__ */
+
+#endif
+
+        _CRT_INSECURE_DEPRECATE(_strset_s) char *  __cdecl _strset(__inout_z char * _Str, __in int _Val);
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl _strset_s(__inout_ecount_z(_DstSize) char * _Dst, __in size_t _DstSize, __in int _Value);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl strcpy_s(__out_ecount_z(_DstSize) char * _Dst, __in rsize_t _DstSize, __in_z const char * _Src);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, strcpy_s, __out_ecount_z(_Size) char, _Dest, __in_z const char *, _Source)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(char *, __RETURN_POLICY_DST, __EMPTY_DECLSPEC, strcpy, __out_z char, _Dest, __in_z const char *, _Source)
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl strcat_s(__inout_ecount_z(_DstSize) char * _Dst, __in rsize_t _DstSize, __in_z const char * _Src);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, strcat_s, __inout_ecount_z(_Size) char, _Dest, __in_z const char *, _Source)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(char *, __RETURN_POLICY_DST, __EMPTY_DECLSPEC, strcat, __inout_z char, _Dest, __in_z const char *, _Source)
+        __checkReturn int     __cdecl strcmp(__in_z const char * _Str1, __in_z const char * _Str2);
+        __checkReturn size_t  __cdecl strlen(__in_z  const char * _Str);
+_CRTIMP __checkReturn size_t  __cdecl strnlen(__in_ecount_z(_MaxCount)  const char * _Str, __in size_t _MaxCount);
+#if __STDC_WANT_SECURE_LIB__ && !defined (__midl)
+static __inline __checkReturn size_t  __CRTDECL strnlen_s(__in_ecount_z(_MaxCount)  const char * _Str, __in size_t _MaxCount)
+{
+    return strnlen(_Str, _MaxCount);
+}
+#endif
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl memmove_s(__out_bcount_part_opt(_DstSize,_MaxCount) void * _Dst, __in rsize_t _DstSize, __in_bcount_opt(_MaxCount) const void * _Src, __in rsize_t _MaxCount);
+#endif
+
+#if     defined(_M_IA64)
+        _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) void *  __cdecl memmove(__out_bcount_full_opt(_Size) void * _Dst, __in_bcount_opt(_Size) const void * _Src, __in size_t _Size);
+#else  /* defined (_M_IA64) */
+_CRTIMP _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) void *  __cdecl memmove(__out_bcount_full_opt(_Size) void * _Dst, __in_bcount_opt(_Size) const void * _Src, __in size_t _Size);
+#endif  /* defined (_M_IA64) */
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_strdup")
+#undef _strdup
+#endif
+
+_CRTIMP __checkReturn char *  __cdecl _strdup(__in_z_opt const char * _Src);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_strdup")
+#endif
+
+_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strchr(__in_z const char * _Str, __in int _Val);
+_CRTIMP __checkReturn int     __cdecl _stricmp(__in_z  const char * _Str1, __in_z  const char * _Str2);
+_CRTIMP __checkReturn int     __cdecl _strcmpi(__in_z  const char * _Str1, __in_z  const char * _Str2);
+_CRTIMP __checkReturn int     __cdecl _stricmp_l(__in_z  const char * _Str1, __in_z  const char * _Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int     __cdecl strcoll(__in_z  const char * _Str1, __in_z  const  char * _Str2);
+_CRTIMP __checkReturn int     __cdecl _strcoll_l(__in_z  const char * _Str1, __in_z  const char * _Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int     __cdecl _stricoll(__in_z  const char * _Str1, __in_z  const char * _Str2);
+_CRTIMP __checkReturn int     __cdecl _stricoll_l(__in_z  const char * _Str1, __in_z  const char * _Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int     __cdecl _strncoll  (__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int     __cdecl _strncoll_l(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int     __cdecl _strnicoll (__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int     __cdecl _strnicoll_l(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn size_t  __cdecl strcspn(__in_z  const char * _Str, __in_z  const char * _Control);
+_CRT_INSECURE_DEPRECATE(_strerror_s) _CRTIMP __checkReturn char *  __cdecl _strerror(__in_z_opt const char * _ErrMsg);
+_CRTIMP __checkReturn_wat errno_t __cdecl _strerror_s(__out_ecount_z(_SizeInBytes) char * _Buf, __in size_t _SizeInBytes, __in_z_opt const char * _ErrMsg);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _strerror_s, __out_ecount(_Size) char, _Buffer, __in_z_opt const char *, _ErrorMessage)
+_CRT_INSECURE_DEPRECATE(strerror_s) _CRTIMP __checkReturn char *  __cdecl strerror(__in int);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl strerror_s(__out_ecount_z(_SizeInBytes) char * _Buf, __in size_t _SizeInBytes, __in int _ErrNum);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, strerror_s, __out_ecount(_Size) char, _Buffer, __in int, _ErrorMessage)
+_CRTIMP __checkReturn_wat errno_t __cdecl _strlwr_s(__inout_ecount_z(_Size) char * _Str, __in size_t _Size);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _strlwr_s, __inout_ecount_z(_Size) char, _String)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(char *, __RETURN_POLICY_DST, _CRTIMP, _strlwr, __inout_z char, _String)
+_CRTIMP __checkReturn_wat errno_t __cdecl _strlwr_s_l(__inout_ecount_z(_Size) char * _Str, __in size_t _Size, __in_opt _locale_t _Locale);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _strlwr_s_l, __inout_ecount_z(_Size) char, _String, __in_opt _locale_t, _Locale)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(char *, __RETURN_POLICY_DST, _CRTIMP, _strlwr_l, _strlwr_s_l, __inout_z char, _String, __in_opt _locale_t, _Locale)
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl strncat_s(__inout_ecount_z(_DstSize) char * _Dst, __in rsize_t _DstSize, __in_z const char * _Src, __in rsize_t _MaxCount);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, strncat_s, __inout_ecount_z(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count)
+#pragma warning(push)
+#pragma warning(disable:4609 6059)
+/* prefast noise VSW 489802 */
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(char *, __RETURN_POLICY_DST, _CRTIMP, strncat, strncat_s, __inout_z char, __inout_ecount_z(_Count) char, _Dest, __in_z const char *, _Source, __in size_t, _Count)
+#pragma warning(pop)
+#if     defined(_M_IA64)
+        __checkReturn int     __cdecl strncmp(__in_z  const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+#else
+_CRTIMP __checkReturn int     __cdecl strncmp(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+#endif
+_CRTIMP __checkReturn int     __cdecl _strnicmp(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int     __cdecl _strnicmp_l(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl strncpy_s(__out_ecount_z(_DstSize) char * _Dst, __in rsize_t _DstSize, __in_z_opt const char * _Src, __in rsize_t _MaxCount);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, strncpy_s, __out_ecount(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(char *, __RETURN_POLICY_DST, _CRTIMP_NOIA64, strncpy, strncpy_s, __out_z char, __out_ecount(_Count) char, _Dest, __in_z const char *, _Source, __in size_t, _Count)
+_CRT_INSECURE_DEPRECATE(_strnset_s) _CRTIMP char *  __cdecl _strnset(__inout_z char * _Str, __in int _Val, __in size_t _MaxCount);
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl _strnset_s(__inout_ecount_z(_Size) char * _Str, __in size_t _Size, __in int _Val, __in size_t _MaxCount);
+_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strpbrk(__in_z const char * _Str, __in_z const char * _Control);
+_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strrchr(__in_z const char * _Str, __in int _Ch);
+_CRTIMP char *  __cdecl _strrev(__inout_z char * _Str);
+_CRTIMP __checkReturn size_t  __cdecl strspn(__in_z const char * _Str, __in_z const char * _Control);
+_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strstr(__in_z const char * _Str, __in_z const char * _SubStr);
+_CRT_INSECURE_DEPRECATE(strtok_s) _CRTIMP __checkReturn char *  __cdecl strtok(__inout_z_opt char * _Str, __in_z const char * _Delim);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn char *  __cdecl strtok_s(__inout_z_opt char * _Str, __in_z const char * _Delim, __deref_inout_z_opt char ** _Context);
+#endif
+_CRTIMP __checkReturn_wat errno_t __cdecl _strupr_s(__inout_ecount_z(_Size) char * _Str, __in size_t _Size);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _strupr_s, __inout_ecount_z(_Size) char, _String)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(char *, __RETURN_POLICY_DST, _CRTIMP, _strupr, __inout_z char, _String)
+_CRTIMP __checkReturn_wat errno_t __cdecl _strupr_s_l(__inout_ecount_z(_Size) char * _Str, __in size_t _Size, _locale_t _Locale);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _strupr_s_l, __inout_ecount_z(_Size) char, _String, _locale_t, _Locale)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(char *, __RETURN_POLICY_DST, _CRTIMP, _strupr_l, _strupr_s_l, __inout_z char, _String, __in_opt _locale_t, _Locale)
+_CRTIMP __checkReturn_opt size_t  __cdecl strxfrm (__out_z_opt char * _Dst, __in_z const char * _Src, __in size_t _MaxCount);
+_CRTIMP __checkReturn_opt size_t  __cdecl _strxfrm_l(__out_z_opt char * _Dst, __in_z const char * _Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+
+#ifdef __cplusplus
+extern "C++" {
+#ifndef _CPP_NARROW_INLINES_DEFINED
+#define _CPP_NARROW_INLINES_DEFINED
+inline __checkReturn char * __CRTDECL strchr(__in_z char * _Str, __in int _Ch)
+	{ return (char*)strchr((const char*)_Str, _Ch); }
+inline __checkReturn char * __CRTDECL strpbrk(__in_z char * _Str, __in_z const char * _Control)
+	{ return (char*)strpbrk((const char*)_Str, _Control); }
+inline __checkReturn char * __CRTDECL strrchr(__in_z char * _Str, __in int _Ch)
+	{ return (char*)strrchr((const char*)_Str, _Ch); }
+inline __checkReturn char * __CRTDECL strstr(__in_z char * _Str, __in_z const char * _SubStr)
+	{ return (char*)strstr((const char*)_Str, _SubStr); }
+#endif
+#ifndef _CPP_MEMCHR_DEFINED
+#define _CPP_MEMCHR_DEFINED
+inline __checkReturn void * __CRTDECL memchr(__in_bcount_opt(_N) void * _Pv, __in int _C, __in size_t _N)
+	{ return (void*)memchr((const void*)_Pv, _C, _N); }
+#endif
+}
+#endif
+
+#if     !__STDC__
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("strdup")
+#undef strdup
+#endif
+
+_CRT_NONSTDC_DEPRECATE(_strdup) _CRTIMP __checkReturn char * __cdecl strdup(__in_z_opt const char * _Src);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("strdup")
+#endif
+
+/* prototypes for oldnames.lib functions */
+_CRT_NONSTDC_DEPRECATE(_strcmpi) _CRTIMP __checkReturn int __cdecl strcmpi(__in_z const char * _Str1, __in_z const char * _Str2);
+_CRT_NONSTDC_DEPRECATE(_stricmp) _CRTIMP __checkReturn int __cdecl stricmp(__in_z const char * _Str1, __in_z const char * _Str2);
+_CRT_NONSTDC_DEPRECATE(_strlwr) _CRTIMP char * __cdecl strlwr(__inout_z char * _Str);
+_CRT_NONSTDC_DEPRECATE(_strnicmp) _CRTIMP __checkReturn int __cdecl strnicmp(__in_z const char * _Str1, __in_z const char * _Str, __in size_t _MaxCount);
+_CRT_NONSTDC_DEPRECATE(_strnset) _CRTIMP char * __cdecl strnset(__inout_z char * _Str, __in int _Val, __in size_t _MaxCount);
+_CRT_NONSTDC_DEPRECATE(_strrev) _CRTIMP char * __cdecl strrev(__inout_z char * _Str);
+_CRT_NONSTDC_DEPRECATE(_strset)         char * __cdecl strset(__inout_z char * _Str, __in int _Val);
+_CRT_NONSTDC_DEPRECATE(_strupr) _CRTIMP char * __cdecl strupr(__inout_z char * _Str);
+
+#endif  /* !__STDC__ */
+
+
+#ifndef _WSTRING_DEFINED
+
+/* wide function prototypes, also declared in wchar.h  */
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wcsdup")
+#undef _wcsdup
+#endif
+
+_CRTIMP __checkReturn wchar_t * __cdecl _wcsdup(__in_z const wchar_t * _Str);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wcsdup")
+#endif
+
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl wcscat_s(__inout_ecount_z(_DstSize) wchar_t * _Dst, __in rsize_t _DstSize, const wchar_t * _Src);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, wcscat_s, __inout_ecount_z(_Size) wchar_t, _Dest, __in_z const wchar_t *, _Source)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, wcscat, __inout_z wchar_t, _Dest, __in_z const wchar_t *, _Source)
+_CRTIMP __checkReturn _CONST_RETURN wchar_t * __cdecl wcschr(__in_z const wchar_t * _Str, wchar_t _Ch);
+_CRTIMP __checkReturn int __cdecl wcscmp(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl wcscpy_s(__out_ecount_z(_DstSize) wchar_t * _Dst, __in rsize_t _DstSize, __in_z const wchar_t * _Src);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, wcscpy_s, __out_ecount(_Size) wchar_t, _Dest, __in_z const wchar_t *, _Source)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, wcscpy, __out_z wchar_t, _Dest, __in_z const wchar_t *, _Source)
+_CRTIMP __checkReturn size_t __cdecl wcscspn(__in_z const wchar_t * _Str, __in_z const wchar_t * _Control);
+_CRTIMP __checkReturn size_t __cdecl wcslen(__in_z const wchar_t * _Str);
+_CRTIMP __checkReturn size_t __cdecl wcsnlen(__in_ecount_z(_MaxCount) const wchar_t * _Src, __in size_t _MaxCount);
+#if __STDC_WANT_SECURE_LIB__ && !defined (__midl)
+static __inline __checkReturn size_t __CRTDECL wcsnlen_s(__in_ecount_z(_MaxCount) const wchar_t * _Src, __in size_t _MaxCount)
+{
+    return wcsnlen(_Src, _MaxCount);
+}
+#endif
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl wcsncat_s(__inout_ecount_z(_DstSize) wchar_t * _Dst, __in rsize_t _DstSize, __in_z const wchar_t * _Src, __in rsize_t _MaxCount);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, wcsncat_s, __inout_ecount_z(_Size) wchar_t, _Dest, __in_z const wchar_t *, _Source, __in size_t, _Count)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, wcsncat, wcsncat_s, __inout_ecount_z(_Count) wchar_t, __inout wchar_t, _Dest, __in_z const wchar_t *, _Source, __in size_t, _Count)
+_CRTIMP __checkReturn int __cdecl wcsncmp(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl wcsncpy_s(__out_ecount_z(_DstSize) wchar_t * _Dst, __in rsize_t _DstSize, __in_z const wchar_t * _Src, __in rsize_t _MaxCount);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, wcsncpy_s, __out_ecount(_Size) wchar_t, _Dest, __in_z const wchar_t *, _Source, __in size_t, _Count)
+__DEFINE_CPP_OVERLOAD_STANDARD_NFUNC_0_2_EX(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, wcsncpy, wcsncpy_s, __out_z wchar_t, __out_ecount(_Count) wchar_t, _Dest, __in_z const wchar_t *, _Source, __in size_t, _Count)
+_CRTIMP __checkReturn _CONST_RETURN wchar_t * __cdecl wcspbrk(__in_z const wchar_t * _Str, __in_z const wchar_t * _Control);
+_CRTIMP __checkReturn _CONST_RETURN wchar_t * __cdecl wcsrchr(__in_z const wchar_t * _Str, __in wchar_t _Ch);
+_CRTIMP __checkReturn size_t __cdecl wcsspn(__in_z const wchar_t * _Str, __in_z const wchar_t * _Control);
+_CRTIMP __checkReturn _CONST_RETURN wchar_t * __cdecl wcsstr(__in_z const wchar_t * _Str, __in_z const wchar_t * _SubStr);
+_CRT_INSECURE_DEPRECATE(wcstok_s) _CRTIMP __checkReturn wchar_t * __cdecl wcstok(__inout_z_opt wchar_t * _Str, __in_z const wchar_t * _Delim);
+_CRTIMP_ALTERNATIVE __checkReturn wchar_t * __cdecl wcstok_s(__inout_z_opt wchar_t * _Str, __in_z const wchar_t * _Delim, __deref_inout_z_opt wchar_t ** _Context);
+_CRT_INSECURE_DEPRECATE(_wcserror_s) _CRTIMP __checkReturn wchar_t * __cdecl _wcserror(__in int _ErrNum);
+_CRTIMP __checkReturn_wat errno_t __cdecl _wcserror_s(__out_ecount_z_opt(_SizeInWords) wchar_t * _Buf, __in size_t _SizeInWords, __in int _ErrNum);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcserror_s, __out_ecount(_Size) wchar_t, _Buffer, __in int, _Error)
+_CRT_INSECURE_DEPRECATE(__wcserror_s) _CRTIMP __checkReturn wchar_t * __cdecl __wcserror(__in_z_opt const wchar_t * _Str);
+_CRTIMP __checkReturn_wat errno_t __cdecl __wcserror_s(__out_ecount_z_opt(_SizeInWords) wchar_t * _Buffer, __in size_t _SizeInWords, __in_z const wchar_t * _ErrMsg);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, __wcserror_s, __out_ecount(_Size) wchar_t, _Buffer, __in_z const wchar_t *, _ErrorMessage)
+
+_CRTIMP __checkReturn int __cdecl _wcsicmp(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2);
+_CRTIMP __checkReturn int __cdecl _wcsicmp_l(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _wcsnicmp(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _wcsnicmp_l(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRT_INSECURE_DEPRECATE(_wcsnset_s) _CRTIMP wchar_t * __cdecl _wcsnset(__inout_z wchar_t * _Str, __in_z wchar_t _Val, __in size_t _MaxCount);
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl _wcsnset_s(__inout_ecount_z(_DstSizeInWords) wchar_t * _Dst, __in size_t _DstSizeInWords, wchar_t _Val, __in size_t _MaxCount);
+_CRTIMP wchar_t * __cdecl _wcsrev(__inout_z wchar_t * _Str);
+_CRT_INSECURE_DEPRECATE(_wcsset_s) _CRTIMP wchar_t * __cdecl _wcsset(__inout_z wchar_t * _Str, wchar_t _Val);
+_CRTIMP_ALTERNATIVE __checkReturn_wat errno_t __cdecl _wcsset_s(__inout_ecount_z(_SizeInWords) wchar_t * _Str, __in size_t _SizeInWords, wchar_t _Val);
+
+_CRTIMP __checkReturn_wat errno_t __cdecl _wcslwr_s(__inout_ecount_z(_SizeInWords) wchar_t * _Str, __in size_t _SizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wcslwr_s, __inout_ecount_z(_Size) wchar_t, _String)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wcslwr, __inout_z wchar_t, _String)
+_CRTIMP __checkReturn_wat errno_t __cdecl _wcslwr_s_l(__inout_ecount_z(_SizeInWords) wchar_t * _Str, __in size_t _SizeInWords, __in_opt _locale_t _Locale);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcslwr_s_l, __inout_ecount_z(_Size) wchar_t, _String, __in_opt _locale_t, _Locale)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wcslwr_l, _wcslwr_s_l, __inout_z wchar_t, _String, __in_opt _locale_t, _Locale)
+_CRTIMP __checkReturn_wat errno_t __cdecl _wcsupr_s(__inout_ecount_z(_Size) wchar_t * _Str, __in size_t _Size);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wcsupr_s, __inout_ecount_z(_Size) wchar_t, _String)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wcsupr, __inout_z wchar_t, _String)
+_CRTIMP __checkReturn_wat errno_t __cdecl _wcsupr_s_l(__inout_ecount_z(_Size) wchar_t * _Str, __in size_t _Size, __in_opt _locale_t _Locale);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcsupr_s_l, __inout_ecount_z(_size) wchar_t, _String, __in_opt _locale_t, _Locale)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wcsupr_l, _wcsupr_s_l, __inout_z wchar_t, _String, __in_opt _locale_t, _Locale)
+_CRTIMP __checkReturn_opt size_t __cdecl wcsxfrm(__out_z_opt wchar_t * _Dst, __in_z const wchar_t * _Src, __in size_t _MaxCount);
+_CRTIMP __checkReturn_opt size_t __cdecl _wcsxfrm_l(__out_z_opt wchar_t * _Dst, __in_z const wchar_t *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl wcscoll(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2);
+_CRTIMP __checkReturn int __cdecl _wcscoll_l(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _wcsicoll(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2);
+_CRTIMP __checkReturn int __cdecl _wcsicoll_l(__in_z const wchar_t * _Str1, __in_z const wchar_t *_Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _wcsncoll(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _wcsncoll_l(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _wcsnicoll(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _wcsnicoll_l(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+
+#ifdef  __cplusplus
+#ifndef _CPP_WIDE_INLINES_DEFINED
+#define _CPP_WIDE_INLINES_DEFINED
+extern "C++" {
+inline __checkReturn wchar_t * __CRTDECL wcschr(__in_z wchar_t *_Str, wchar_t _Ch)
+        {return ((wchar_t *)wcschr((const wchar_t *)_Str, _Ch)); }
+inline __checkReturn wchar_t * __CRTDECL wcspbrk(__in_z wchar_t *_Str, __in_z const wchar_t *_Control)
+        {return ((wchar_t *)wcspbrk((const wchar_t *)_Str, _Control)); }
+inline __checkReturn wchar_t * __CRTDECL wcsrchr(__in_z wchar_t *_Str, __in wchar_t _Ch)
+        {return ((wchar_t *)wcsrchr((const wchar_t *)_Str, _Ch)); }
+inline __checkReturn wchar_t * __CRTDECL wcsstr(__in_z wchar_t *_Str, __in_z const wchar_t *_SubStr)
+        {return ((wchar_t *)wcsstr((const wchar_t *)_Str, _SubStr)); }
+}
+#endif
+#endif
+
+#if     !__STDC__
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("wcsdup")
+#undef wcsdup
+#endif
+
+_CRT_NONSTDC_DEPRECATE(_wcsdup) _CRTIMP __checkReturn wchar_t * __cdecl wcsdup(__in_z const wchar_t * _Str);
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("wcsdup")
+#endif
+
+/* old names */
+#define wcswcs wcsstr
+
+/* prototypes for oldnames.lib functions */
+_CRT_NONSTDC_DEPRECATE(_wcsicmp) _CRTIMP __checkReturn int __cdecl wcsicmp(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2);
+_CRT_NONSTDC_DEPRECATE(_wcsnicmp) _CRTIMP __checkReturn int __cdecl wcsnicmp(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2, __in size_t _MaxCount);
+_CRT_NONSTDC_DEPRECATE(_wcsnset) _CRTIMP wchar_t * __cdecl wcsnset(__inout_z wchar_t * _Str, __in_z wchar_t _Val, __in size_t _MaxCount);
+_CRT_NONSTDC_DEPRECATE(_wcsrev) _CRTIMP wchar_t * __cdecl wcsrev(__inout_z wchar_t * _Str);
+_CRT_NONSTDC_DEPRECATE(_wcsset) _CRTIMP wchar_t * __cdecl wcsset(__inout_z wchar_t * _Str, wchar_t _Val);
+_CRT_NONSTDC_DEPRECATE(_wcslwr) _CRTIMP wchar_t * __cdecl wcslwr(__inout_z wchar_t * _Str);
+_CRT_NONSTDC_DEPRECATE(_wcsupr) _CRTIMP wchar_t * __cdecl wcsupr(__inout_z wchar_t * _Str);
+_CRT_NONSTDC_DEPRECATE(_wcsicoll) _CRTIMP __checkReturn int __cdecl wcsicoll(__in_z const wchar_t * _Str1, __in_z const wchar_t * _Str2);
+
+#endif  /* !__STDC__ */
+
+#define _WSTRING_DEFINED
+#endif
+
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  /* _INC_STRING */
diff --git a/base/Windows/Inc/strsafe.h b/base/Windows/Inc/strsafe.h
new file mode 100644
index 0000000..4368a55
--- /dev/null
+++ b/base/Windows/Inc/strsafe.h
@@ -0,0 +1,6462 @@
+/******************************************************************
+*                                                                 *
+*  strsafe.h -- This module defines safer C library string        *
+*               routine replacements. These are meant to make C   *
+*               a bit more safe in reference to security and      *
+*               robustness                                        *
+*                                                                 *
+*  Copyright (c) Microsoft Corporation.  All rights reserved.     *
+*                                                                 *
+******************************************************************/
+#ifndef _STRSAFE_H_INCLUDED_
+#define _STRSAFE_H_INCLUDED_
+#pragma once
+
+#include <stdio.h>      // for _vsnprintf, _vsnwprintf, getc, getwc
+#include <string.h>     // for memset
+#include <stdarg.h>     // for va_start, etc.
+
+
+#ifndef _SIZE_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64    size_t;
+#else
+typedef __w64 unsigned int  size_t;
+#endif  // !_WIN64
+#define _SIZE_T_DEFINED
+#endif  // !_SIZE_T_DEFINED
+
+#if !defined(_WCHAR_T_DEFINED) && !defined(_NATIVE_WCHAR_T_DEFINED)
+typedef unsigned short wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+
+#ifndef _HRESULT_DEFINED
+#define _HRESULT_DEFINED
+typedef long HRESULT;
+#endif // !_HRESULT_DEFINED
+
+#ifndef SUCCEEDED
+#define SUCCEEDED(hr)  ((HRESULT)(hr) >= 0)
+#endif
+
+#ifndef FAILED
+#define FAILED(hr)  ((HRESULT)(hr) < 0)
+#endif
+
+#ifndef S_OK
+#define S_OK  ((HRESULT)0x00000000L)
+#endif
+
+#ifdef __cplusplus
+#define _STRSAFE_EXTERN_C    extern "C"
+#else
+#define _STRSAFE_EXTERN_C    extern
+#endif
+
+// If you do not want to use these functions inline (and instead want to link w/ strsafe.lib), then
+// #define STRSAFE_LIB before including this header file.
+#if defined(STRSAFE_LIB)
+#define STRSAFEAPI  _STRSAFE_EXTERN_C HRESULT __stdcall
+#pragma comment(lib, "strsafe.lib")
+#elif defined(STRSAFE_LIB_IMPL)
+#define STRSAFEAPI  _STRSAFE_EXTERN_C HRESULT __stdcall
+#else
+#define STRSAFEAPI  __inline HRESULT __stdcall
+#define STRSAFE_INLINE
+#endif
+
+// Some functions always run inline because they use stdin and we want to avoid building multiple
+// versions of strsafe lib depending on if you use msvcrt, libcmt, etc.
+#define STRSAFE_INLINE_API  __inline HRESULT __stdcall
+
+// The user can request no "Cb" or no "Cch" fuctions, but not both!
+#if defined(STRSAFE_NO_CB_FUNCTIONS) && defined(STRSAFE_NO_CCH_FUNCTIONS)
+#error cannot specify both STRSAFE_NO_CB_FUNCTIONS and STRSAFE_NO_CCH_FUNCTIONS !!
+#endif
+
+// This should only be defined when we are building strsafe.lib
+#ifdef STRSAFE_LIB_IMPL
+#define STRSAFE_INLINE
+#endif
+
+
+#define STRSAFE_MAX_CCH  2147483647 // max # of characters we support (same as INT_MAX)
+
+// STRSAFE error return codes
+//
+#define STRSAFE_E_INSUFFICIENT_BUFFER       ((HRESULT)0x8007007AL)  // 0x7A = 122L = ERROR_INSUFFICIENT_BUFFER
+#define STRSAFE_E_INVALID_PARAMETER         ((HRESULT)0x80070057L)  // 0x57 =  87L = ERROR_INVALID_PARAMETER
+#define STRSAFE_E_END_OF_FILE               ((HRESULT)0x80070026L)  // 0x26 =  38L = ERROR_HANDLE_EOF
+
+// Flags for controling the Ex functions
+//
+//      STRSAFE_FILL_BYTE(0xFF)     0x000000FF  // bottom byte specifies fill pattern
+#define STRSAFE_IGNORE_NULLS        0x00000100  // treat null as TEXT("") -- don't fault on NULL buffers
+#define STRSAFE_FILL_BEHIND_NULL    0x00000200  // fill in extra space behind the null terminator
+#define STRSAFE_FILL_ON_FAILURE     0x00000400  // on failure, overwrite pszDest with fill pattern and null terminate it
+#define STRSAFE_NULL_ON_FAILURE     0x00000800  // on failure, set *pszDest = TEXT('\0')
+#define STRSAFE_NO_TRUNCATION       0x00001000  // instead of returning a truncated result, copy/append nothing to pszDest and null terminate it
+
+#define STRSAFE_VALID_FLAGS         (0x000000FF | STRSAFE_IGNORE_NULLS | STRSAFE_FILL_BEHIND_NULL | STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)
+
+// helper macro to set the fill character and specify buffer filling
+#define STRSAFE_FILL_BYTE(x)        ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_BEHIND_NULL))
+#define STRSAFE_FAILURE_BYTE(x)     ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_ON_FAILURE))
+
+#define STRSAFE_GET_FILL_PATTERN(dwFlags)  ((int)(dwFlags & 0x000000FF))
+
+// prototypes for the worker functions
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCopyWorkerA(char* pszDest, size_t cchDest, const char* pszSrc);
+STRSAFEAPI StringCopyWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc);
+STRSAFEAPI StringCopyExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCopyExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCopyNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc);
+STRSAFEAPI StringCopyNWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchSrc);
+STRSAFEAPI StringCopyNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, size_t cchSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCopyNExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, size_t cchSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCatWorkerA(char* pszDest, size_t cchDest, const char* pszSrc);
+STRSAFEAPI StringCatWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc);
+STRSAFEAPI StringCatExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCatExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCatNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend);
+STRSAFEAPI StringCatNWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchMaxAppend);
+STRSAFEAPI StringCatNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, size_t cchMaxAppend, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCatNExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, size_t cchMaxAppend, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringVPrintfWorkerA(char* pszDest, size_t cchDest, const char* pszFormat, va_list argList);
+STRSAFEAPI StringVPrintfWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszFormat, va_list argList);
+STRSAFEAPI StringVPrintfExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const char* pszFormat, va_list argList);
+STRSAFEAPI StringVPrintfExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const wchar_t* pszFormat, va_list argList);
+STRSAFEAPI StringLengthWorkerA(const char* psz, size_t cchMax, size_t* pcch);
+STRSAFEAPI StringLengthWorkerW(const wchar_t* psz, size_t cchMax, size_t* pcch);
+#endif  // STRSAFE_INLINE
+
+#ifndef STRSAFE_LIB_IMPL
+// these functions are always inline
+STRSAFE_INLINE_API StringGetsExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFE_INLINE_API StringGetsExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+#endif
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCopy(LPTSTR pszDest,
+                     size_t cchDest,
+                     LPCTSTR pszSrc);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcpy'.
+    The size of the destination buffer (in characters) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This routine is not a replacement for strncpy.  That function will pad the
+    destination string with extra null termination characters if the count is
+    greater than the length of the source string, and it will fail to null 
+    terminate the destination string if the source string length is greater
+    than or equal to the count. You can not blindly use this instead of strncpy:
+    it is common for code to use it to "patch" strings and you would introduce
+    errors if the code started null terminating in the middle of the string.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was copied without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases as much of pszSrc will be
+    copied to pszDest as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest     -   destination string
+
+    cchDest     -   size of destination buffer in characters.
+                    length must be = (_tcslen(src) + 1) to hold all of the
+                    source including the null terminator
+
+    pszSrc      -   source string which must be null terminated
+
+Notes: 
+    Behavior is undefined if source and destination strings overlap.
+   
+    pszDest and pszSrc should not be NULL. See StringCchCopyEx if you require
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+STRSAFEAPI StringCchCopyA(char* pszDest, size_t cchDest, const char* pszSrc);
+STRSAFEAPI StringCchCopyW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc);
+#ifdef UNICODE
+#define StringCchCopy  StringCchCopyW
+#else
+#define StringCchCopy  StringCchCopyA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCopyA(char* pszDest, size_t cchDest, const char* pszSrc)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyWorkerA(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCopyW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyWorkerW(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCopy(LPTSTR pszDest,
+                    size_t cbDest,
+                    LPCTSTR pszSrc);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcpy'.
+    The size of the destination buffer (in bytes) is a parameter and this
+    function will not write past the end of this buffer and it will ALWAYS
+    null terminate the destination buffer (unless it is zero length).
+
+    This routine is not a replacement for strncpy.  That function will pad the
+    destination string with extra null termination characters if the count is
+    greater than the length of the source string, and it will fail to null 
+    terminate the destination string if the source string length is greater
+    than or equal to the count. You can not blindly use this instead of strncpy:
+    it is common for code to use it to "patch" strings and you would introduce
+    errors if the code started null terminating in the middle of the string.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was copied without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases as much of pszSrc will be
+    copied to pszDest as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest     -   destination string
+
+    cbDest      -   size of destination buffer in bytes.
+                    length must be = ((_tcslen(src) + 1) * sizeof(TCHAR)) to
+                    hold all of the source including the null terminator
+
+    pszSrc      -   source string which must be null terminated
+
+Notes: 
+    Behavior is undefined if source and destination strings overlap.
+   
+    pszDest and pszSrc should not be NULL.  See StringCbCopyEx if you require 
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+STRSAFEAPI StringCbCopyA(char* pszDest, size_t cbDest, const char* pszSrc);
+STRSAFEAPI StringCbCopyW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc);
+#ifdef UNICODE
+#define StringCbCopy  StringCbCopyW
+#else
+#define StringCbCopy  StringCbCopyA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCopyA(char* pszDest, size_t cbDest, const char* pszSrc)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    // convert to count of characters
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyWorkerA(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCopyW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    // convert to count of characters
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyWorkerW(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCopyEx(TCHAR pszDest,
+                       size_t cchDest,
+                       LPCTSTR pszSrc,
+                       LPTSTR* ppszDestEnd,
+                       size_t* pcchRemaining,
+                       DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcpy' with
+    some additional parameters.  In addition to functionality provided by
+    StringCchCopy, this routine also returns a pointer to the end of the
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cchDest         -   size of destination buffer in characters.
+                        length must be = (_tcslen(pszSrc) + 1) to hold all of
+                        the source including the null terminator
+
+    pszSrc          -   source string which must be null terminated
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function copied any data, the result will point to the
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return the
+                        number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+                    this flag is useful for emulating functions like lstrcpy
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchCopyExA(char* pszDest, size_t cchDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCchCopyExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCchCopyEx  StringCchCopyExW
+#else
+#define StringCchCopyEx  StringCchCopyExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCopyExA(char* pszDest, size_t cchDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+
+        hr = StringCopyExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCopyExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringCopyExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCopyEx(TCHAR pszDest,
+                      size_t cbDest,
+                      LPCTSTR pszSrc,
+                      LPTSTR* ppszDestEnd,
+                      size_t* pcbRemaining,
+                      DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcpy' with
+    some additional parameters.  In addition to functionality provided by
+    StringCbCopy, this routine also returns a pointer to the end of the 
+    destination string and the number of bytes left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be ((_tcslen(pszSrc) + 1) * sizeof(TCHAR)) to 
+                        hold all of the source including the null terminator
+
+    pszSrc          -   source string which must be null terminated
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function copied any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   pcbRemaining is non-null,the function will return the
+                        number of bytes left in the destination string, 
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+                    this flag is useful for emulating functions like lstrcpy
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbCopyExA(char* pszDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCbCopyExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCbCopyEx  StringCbCopyExW
+#else
+#define StringCbCopyEx  StringCbCopyExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCopyExA(char* pszDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCopyExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCopyN(LPTSTR pszDest,
+                      size_t cchDest,
+                      LPCTSTR pszSrc,
+                      size_t cchSrc);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strncpy'.
+    The size of the destination buffer (in characters) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This routine is meant as a replacement for strncpy, but it does behave
+    differently. This function will not pad the destination buffer with extra
+    null termination characters if cchSrc is greater than the length of pszSrc.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the entire string or the first cchSrc characters were copied without
+    truncation and the resultant destination string was null terminated, otherwise
+    it will return a failure code. In failure cases as much of pszSrc will be
+    copied to pszDest as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest     -   destination string
+
+    cchDest     -   size of destination buffer in characters.
+                    length must be = (_tcslen(src) + 1) to hold all of the
+                    source including the null terminator
+
+    pszSrc      -   source string
+
+    cchSrc      -   maximum number of characters to copy from source string
+
+Notes: 
+    Behavior is undefined if source and destination strings overlap.
+   
+    pszDest and pszSrc should not be NULL. See StringCchCopyNEx if you require
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+STRSAFEAPI StringCchCopyNA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc);
+STRSAFEAPI StringCchCopyNW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchSrc);
+#ifdef UNICODE
+#define StringCchCopyN  StringCchCopyNW
+#else
+#define StringCchCopyN  StringCchCopyNA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCopyNA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc)
+{
+    HRESULT hr;
+
+    if ((cchDest > STRSAFE_MAX_CCH) ||
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyNWorkerA(pszDest, cchDest, pszSrc, cchSrc);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCopyNW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchSrc)
+{
+    HRESULT hr;
+
+    if ((cchDest > STRSAFE_MAX_CCH) || 
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyNWorkerW(pszDest, cchDest, pszSrc, cchSrc);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCopyN(LPTSTR pszDest,
+                     size_t cbDest,
+                     LPCTSTR pszSrc,
+                     size_t cbSrc);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strncpy'.
+    The size of the destination buffer (in bytes) is a parameter and this
+    function will not write past the end of this buffer and it will ALWAYS
+    null terminate the destination buffer (unless it is zero length).
+
+    This routine is meant as a replacement for strncpy, but it does behave
+    differently. This function will not pad the destination buffer with extra
+    null termination characters if cbSrc is greater than the size of pszSrc.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the entire string or the first cbSrc characters were copied without
+    truncation and the resultant destination string was null terminated, otherwise
+    it will return a failure code. In failure cases as much of pszSrc will be
+    copied to pszDest as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest     -   destination string
+
+    cbDest      -   size of destination buffer in bytes.
+                    length must be = ((_tcslen(src) + 1) * sizeof(TCHAR)) to
+                    hold all of the source including the null terminator
+
+    pszSrc      -   source string
+
+    cbSrc       -   maximum number of bytes to copy from source string
+
+Notes: 
+    Behavior is undefined if source and destination strings overlap.
+   
+    pszDest and pszSrc should not be NULL.  See StringCbCopyEx if you require 
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+STRSAFEAPI StringCbCopyNA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbSrc);
+STRSAFEAPI StringCbCopyNW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbSrc);
+#ifdef UNICODE
+#define StringCbCopyN  StringCbCopyNW
+#else
+#define StringCbCopyN  StringCbCopyNA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCopyNA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbSrc)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchSrc;
+
+    // convert to count of characters
+    cchDest = cbDest / sizeof(char);
+    cchSrc = cbSrc / sizeof(char);
+
+    if ((cchDest > STRSAFE_MAX_CCH) || 
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyNWorkerA(pszDest, cchDest, pszSrc, cchSrc);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCopyNW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbSrc)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchSrc;
+    
+    // convert to count of characters
+    cchDest = cbDest / sizeof(wchar_t);
+    cchSrc = cbSrc / sizeof(wchar_t);
+
+    if ((cchDest > STRSAFE_MAX_CCH) ||
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyNWorkerW(pszDest, cchDest, pszSrc, cchSrc);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCopyNEx(TCHAR pszDest,
+                        size_t cchDest,
+                        LPCTSTR pszSrc,
+                        size_t cchSrc,
+                        LPTSTR* ppszDestEnd,
+                        size_t* pcchRemaining,
+                        DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strncpy' with
+    some additional parameters.  In addition to functionality provided by
+    StringCchCopyN, this routine also returns a pointer to the end of the
+    destination string and the number of characters left in the destination
+    string including the null terminator. The flags parameter allows
+    additional controls.
+
+    This routine is meant as a replacement for strncpy, but it does behave
+    differently. This function will not pad the destination buffer with extra
+    null termination characters if cchSrc is greater than the length of pszSrc.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cchDest         -   size of destination buffer in characters.
+                        length must be = (_tcslen(pszSrc) + 1) to hold all of
+                        the source including the null terminator
+
+    pszSrc          -   source string
+
+    cchSrc          -   maximum number of characters to copy from the source
+                        string
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function copied any data, the result will point to the
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return the
+                        number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+                    this flag is useful for emulating functions like lstrcpy
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified. If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL. An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchCopyNExA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCchCopyNExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCchCopyNEx  StringCchCopyNExW
+#else
+#define StringCchCopyNEx  StringCchCopyNExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCopyNExA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+
+    if ((cchDest > STRSAFE_MAX_CCH) ||
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+
+        hr = StringCopyNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCopyNExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    
+    if ((cchDest > STRSAFE_MAX_CCH) ||
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringCopyNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCopyNEx(TCHAR pszDest,
+                       size_t cbDest,
+                       LPCTSTR pszSrc,
+                       size_t cbSrc,
+                       LPTSTR* ppszDestEnd,
+                       size_t* pcbRemaining,
+                       DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strncpy' with
+    some additional parameters.  In addition to functionality provided by
+    StringCbCopyN, this routine also returns a pointer to the end of the 
+    destination string and the number of bytes left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+    This routine is meant as a replacement for strncpy, but it does behave
+    differently. This function will not pad the destination buffer with extra
+    null termination characters if cbSrc is greater than the size of pszSrc.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be ((_tcslen(pszSrc) + 1) * sizeof(TCHAR)) to 
+                        hold all of the source including the null terminator
+
+    pszSrc          -   source string
+
+    cbSrc           -   maximum number of bytes to copy from source string
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function copied any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   pcbRemaining is non-null,the function will return the
+                        number of bytes left in the destination string, 
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+                    this flag is useful for emulating functions like lstrcpy
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all copied and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the copy operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbCopyNExA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbSrc, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCbCopyNExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbSrc, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCbCopyNEx  StringCbCopyNExW
+#else
+#define StringCbCopyNEx  StringCbCopyNExA
+#endif // !UNICODE
+
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCopyNExA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbSrc, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchSrc;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+    cchSrc = cbSrc / sizeof(char);
+
+    if ((cchDest > STRSAFE_MAX_CCH) ||
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCopyNExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbSrc, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchSrc;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(wchar_t);
+    cchSrc = cbSrc / sizeof(wchar_t);
+
+    if ((cchDest > STRSAFE_MAX_CCH) ||
+        (cchSrc > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCopyNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCat(LPTSTR pszDest,
+                    size_t cchDest,
+                    LPCTSTR pszSrc);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcat'.
+    The size of the destination buffer (in characters) is a parameter and this
+    function will not write past the end of this buffer and it will ALWAYS
+    null terminate the destination buffer (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was concatenated without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases as much of pszSrc will be
+    appended to pszDest as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest     -  destination string which must be null terminated
+
+    cchDest     -  size of destination buffer in characters.
+                   length must be = (_tcslen(pszDest) + _tcslen(pszSrc) + 1)
+                   to hold all of the combine string plus the null 
+                   terminator
+
+    pszSrc      -  source string which must be null terminated
+
+Notes: 
+    Behavior is undefined if source and destination strings overlap.
+   
+    pszDest and pszSrc should not be NULL.  See StringCchCatEx if you require
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchCatA(char* pszDest, size_t cchDest, const char* pszSrc);
+STRSAFEAPI StringCchCatW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc);
+#ifdef UNICODE
+#define StringCchCat  StringCchCatW
+#else
+#define StringCchCat  StringCchCatA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCatA(char* pszDest, size_t cchDest, const char* pszSrc)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatWorkerA(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCatW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatWorkerW(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCat(LPTSTR pszDest,
+                   size_t cbDest,
+                   LPCTSTR pszSrc);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcat'.
+    The size of the destination buffer (in bytes) is a parameter and this
+    function will not write past the end of this buffer and it will ALWAYS
+    null terminate the destination buffer (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was concatenated without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases as much of pszSrc will be
+    appended to pszDest as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest     -  destination string which must be null terminated
+
+    cbDest      -  size of destination buffer in bytes.
+                   length must be = ((_tcslen(pszDest) + _tcslen(pszSrc) + 1) * sizeof(TCHAR)
+                   to hold all of the combine string plus the null 
+                   terminator
+
+    pszSrc      -  source string which must be null terminated
+
+Notes: 
+    Behavior is undefined if source and destination strings overlap.
+   
+    pszDest and pszSrc should not be NULL.  See StringCbCatEx if you require
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbCatA(char* pszDest, size_t cbDest, const char* pszSrc);
+STRSAFEAPI StringCbCatW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc);
+#ifdef UNICODE
+#define StringCbCat  StringCbCatW
+#else
+#define StringCbCat  StringCbCatA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCatA(char* pszDest, size_t cbDest, const char* pszSrc)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatWorkerA(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCatW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatWorkerW(pszDest, cchDest, pszSrc);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCatEx(LPTSTR pszDest,
+                      size_t cchDest,
+                      LPCTSTR pszSrc,
+                      LPTSTR* ppszDestEnd,
+                      size_t* pcchRemaining,
+                      DWORD dwFlags);
+
+Routine Description:
+    
+    This routine is a safer version of the C built-in function 'strcat' with
+    some additional parameters.  In addition to functionality provided by
+    StringCchCat, this routine also returns a pointer to the end of the 
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string which must be null terminated
+
+    cchDest         -   size of destination buffer in characters
+                        length must be (_tcslen(pszDest) + _tcslen(pszSrc) + 1)
+                        to hold all of the combine string plus the null
+                        terminator.
+
+    pszSrc          -   source string which must be null terminated
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function appended any data, the result will point to the
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return the
+                        number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+                    this flag is useful for emulating functions like lstrcat
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any pre-existing
+                    or truncated string
+
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any pre-existing or
+                    truncated string
+
+        STRSAFE_NO_TRUNCATION
+                    if the function returns STRSAFE_E_INSUFFICIENT_BUFFER, pszDest
+                    will not contain a truncated string, it will remain unchanged.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchCatExA(char* pszDest, size_t cchDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCchCatExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCchCatEx  StringCchCatExW
+#else
+#define StringCchCatEx  StringCchCatExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCatExA(char* pszDest, size_t cchDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+
+        hr = StringCatExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCatExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringCatExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCatEx(LPTSTR pszDest,
+                     size_t cbDest,
+                     LPCTSTR pszSrc,
+                     LPTSTR* ppszDestEnd,
+                     size_t* pcbRemaining,
+                     DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strcat' with
+    some additional parameters.  In addition to functionality provided by
+    StringCbCat, this routine also returns a pointer to the end of the 
+    destination string and the number of bytes left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string which must be null terminated
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be ((_tcslen(pszDest) + _tcslen(pszSrc) + 1) * sizeof(TCHAR) 
+                        to hold all of the combine string plus the null
+                        terminator.
+
+    pszSrc          -   source string which must be null terminated
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function appended any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   if pcbRemaining is non-null, the function will return 
+                        the number of bytes left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+                    this flag is useful for emulating functions like lstrcat
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any pre-existing
+                    or truncated string
+
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any pre-existing or
+                    truncated string
+
+        STRSAFE_NO_TRUNCATION
+                    if the function returns STRSAFE_E_INSUFFICIENT_BUFFER, pszDest
+                    will not contain a truncated string, it will remain unchanged.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbCatExA(char* pszDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCbCatExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCbCatEx  StringCbCatExW
+#else
+#define StringCbCatEx  StringCbCatExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCatExA(char* pszDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCatExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCatN(LPTSTR pszDest,
+                     size_t cchDest,
+                     LPCTSTR pszSrc,
+                     size_t cchMaxAppend);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strncat'.
+    The size of the destination buffer (in characters) is a parameter as well as
+    the maximum number of characters to append, excluding the null terminator.
+    This function will not write past the end of the destination buffer and it will
+    ALWAYS null terminate pszDest (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if all of pszSrc or the first cchMaxAppend characters were appended to the
+    destination string and it was null terminated, otherwise it will return a
+    failure code. In failure cases as much of pszSrc will be appended to pszDest
+    as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest         -   destination string which must be null terminated
+
+    cchDest         -   size of destination buffer in characters.
+                        length must be (_tcslen(pszDest) + min(cchMaxAppend, _tcslen(pszSrc)) + 1)
+                        to hold all of the combine string plus the null
+                        terminator.
+
+    pszSrc          -   source string
+
+    cchMaxAppend    -   maximum number of characters to append
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL. See StringCchCatNEx if you require
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if all of pszSrc or the first cchMaxAppend characters were 
+                    concatenated to pszDest and the resultant dest string was
+                    null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchCatNA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend);
+STRSAFEAPI StringCchCatNW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchMaxAppend);
+#ifdef UNICODE
+#define StringCchCatN  StringCchCatNW
+#else
+#define StringCchCatN  StringCchCatNA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCatNA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatNWorkerA(pszDest, cchDest, pszSrc, cchMaxAppend);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCatNW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchMaxAppend)
+{
+    HRESULT hr;
+    
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringCatNWorkerW(pszDest, cchDest, pszSrc, cchMaxAppend);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCatN(LPTSTR pszDest,
+                    size_t cbDest,
+                    LPCTSTR pszSrc,
+                    size_t cbMaxAppend);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strncat'.
+    The size of the destination buffer (in bytes) is a parameter as well as
+    the maximum number of bytes to append, excluding the null terminator.
+    This function will not write past the end of the destination buffer and it will
+    ALWAYS null terminate pszDest (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if all of pszSrc or the first cbMaxAppend bytes were appended to the
+    destination string and it was null terminated, otherwise it will return a
+    failure code. In failure cases as much of pszSrc will be appended to pszDest
+    as possible, and pszDest will be null terminated.
+
+Arguments:
+
+    pszDest         -   destination string which must be null terminated
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be ((_tcslen(pszDest) + min(cbMaxAppend / sizeof(TCHAR), _tcslen(pszSrc)) + 1) * sizeof(TCHAR) 
+                        to hold all of the combine string plus the null
+                        terminator.
+
+    pszSrc          -   source string
+
+    cbMaxAppend     -   maximum number of bytes to append
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL. See StringCbCatNEx if you require
+    the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if all of pszSrc or the first cbMaxAppend bytes were 
+                    concatenated to pszDest and the resultant dest string was
+                    null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbCatNA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbMaxAppend);
+STRSAFEAPI StringCbCatNW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbMaxAppend);
+#ifdef UNICODE
+#define StringCbCatN  StringCbCatNW
+#else
+#define StringCbCatN  StringCbCatNA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCatNA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbMaxAppend)
+{
+    HRESULT hr;
+    size_t cchDest;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cchMaxAppend;
+        
+        cchMaxAppend = cbMaxAppend / sizeof(char);
+
+        hr = StringCatNWorkerA(pszDest, cchDest, pszSrc, cchMaxAppend);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCatNW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbMaxAppend)
+{
+    HRESULT hr;
+    size_t cchDest;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cchMaxAppend;
+
+        cchMaxAppend = cbMaxAppend / sizeof(wchar_t);
+
+        hr = StringCatNWorkerW(pszDest, cchDest, pszSrc, cchMaxAppend);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchCatNEx(LPTSTR pszDest,
+                       size_t cchDest,
+                       LPCTSTR pszSrc,
+                       size_t cchMaxAppend,
+                       LPTSTR* ppszDestEnd,
+                       size_t* pcchRemaining,
+                       DWORD dwFlags);
+
+Routine Description:
+ 
+    This routine is a safer version of the C built-in function 'strncat', with 
+    some additional parameters.  In addition to functionality provided by
+    StringCchCatN, this routine also returns a pointer to the end of the 
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string which must be null terminated
+
+    cchDest         -   size of destination buffer in characters.
+                        length must be (_tcslen(pszDest) + min(cchMaxAppend, _tcslen(pszSrc)) + 1)
+                        to hold all of the combine string plus the null
+                        terminator.
+
+    pszSrc          -   source string
+
+    cchMaxAppend    -   maximum number of characters to append
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function appended any data, the result will point to the
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return the
+                        number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT(""))
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any pre-existing
+                    or truncated string
+
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any pre-existing or
+                    truncated string
+
+        STRSAFE_NO_TRUNCATION
+                    if the function returns STRSAFE_E_INSUFFICIENT_BUFFER, pszDest
+                    will not contain a truncated string, it will remain unchanged.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if all of pszSrc or the first cchMaxAppend characters were 
+                    concatenated to pszDest and the resultant dest string was
+                    null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchCatNExA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCchCatNExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchMaxAppend, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCchCatNEx  StringCchCatNExW
+#else
+#define StringCchCatNEx  StringCchCatNExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchCatNExA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+
+        hr = StringCatNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchCatNExW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchMaxAppend, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringCatNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbCatNEx(LPTSTR pszDest,
+                      size_t cbDest,
+                      LPCTSTR pszSrc,
+                      size_t cbMaxAppend
+                      LPTSTR* ppszDestEnd,
+                      size_t* pcchRemaining,
+                      DWORD dwFlags);
+
+Routine Description:
+    
+    This routine is a safer version of the C built-in function 'strncat', with 
+    some additional parameters.  In addition to functionality provided by
+    StringCbCatN, this routine also returns a pointer to the end of the 
+    destination string and the number of bytes left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string which must be null terminated
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be ((_tcslen(pszDest) + min(cbMaxAppend / sizeof(TCHAR), _tcslen(pszSrc)) + 1) * sizeof(TCHAR) 
+                        to hold all of the combine string plus the null
+                        terminator.
+
+    pszSrc          -   source string
+
+    cbMaxAppend     -   maximum number of bytes to append
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function appended any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   if pcbRemaining is non-null, the function will return the
+                        number of bytes left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT(""))
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any pre-existing
+                    or truncated string
+
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any pre-existing or
+                    truncated string
+
+        STRSAFE_NO_TRUNCATION
+                    if the function returns STRSAFE_E_INSUFFICIENT_BUFFER, pszDest
+                    will not contain a truncated string, it will remain unchanged.
+
+Notes:
+    Behavior is undefined if source and destination strings overlap.
+
+    pszDest and pszSrc should not be NULL unless the STRSAFE_IGNORE_NULLS flag
+    is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and pszSrc
+    may be NULL.  An error may still be returned even though NULLS are ignored
+    due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if all of pszSrc or the first cbMaxAppend bytes were 
+                    concatenated to pszDest and the resultant dest string was
+                    null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbCatNExA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbMaxAppend, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+STRSAFEAPI StringCbCatNExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbMaxAppend, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCbCatNEx  StringCbCatNExW
+#else
+#define StringCbCatNEx  StringCbCatNExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbCatNExA(char* pszDest, size_t cbDest, const char* pszSrc, size_t cbMaxAppend, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cchMaxAppend;
+        
+        cchMaxAppend = cbMaxAppend / sizeof(char);
+
+        hr = StringCatNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbCatNExW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszSrc, size_t cbMaxAppend, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cchMaxAppend;
+        
+        cchMaxAppend = cbMaxAppend / sizeof(wchar_t);
+
+        hr = StringCatNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchVPrintf(LPTSTR pszDest,
+                        size_t cchDest,
+                        LPCTSTR pszFormat,
+                        va_list argList);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'vsprintf'.
+    The size of the destination buffer (in characters) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was printed without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases it will return a truncated
+    version of the ideal result.
+
+Arguments:
+
+    pszDest     -  destination string
+
+    cchDest     -  size of destination buffer in characters
+                   length must be sufficient to hold the resulting formatted
+                   string, including the null terminator.
+
+    pszFormat   -  format string which must be null terminated
+
+    argList     -  va_list from the variable arguments according to the
+                   stdarg.h convention
+
+Notes: 
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+   
+    pszDest and pszFormat should not be NULL.  See StringCchVPrintfEx if you
+    require the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was sufficient space in the dest buffer for
+                    the resultant string and it was null terminated.
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchVPrintfA(char* pszDest, size_t cchDest, const char* pszFormat, va_list argList);
+STRSAFEAPI StringCchVPrintfW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszFormat, va_list argList);
+#ifdef UNICODE
+#define StringCchVPrintf  StringCchVPrintfW
+#else
+#define StringCchVPrintf  StringCchVPrintfA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchVPrintfA(char* pszDest, size_t cchDest, const char* pszFormat, va_list argList)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchVPrintfW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszFormat, va_list argList)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbVPrintf(LPTSTR pszDest,
+                       size_t cbDest,
+                       LPCTSTR pszFormat,
+                       va_list argList);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'vsprintf'.
+    The size of the destination buffer (in bytes) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was printed without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases it will return a truncated
+    version of the ideal result.
+
+Arguments:
+
+    pszDest     -  destination string
+
+    cbDest      -  size of destination buffer in bytes
+                   length must be sufficient to hold the resulting formatted
+                   string, including the null terminator.
+
+    pszFormat   -  format string which must be null terminated
+
+    argList     -  va_list from the variable arguments according to the
+                   stdarg.h convention
+
+Notes: 
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+   
+    pszDest and pszFormat should not be NULL.  See StringCbVPrintfEx if you
+    require the handling of NULL values.
+
+
+Return Value:
+
+    S_OK        -   if there was sufficient space in the dest buffer for
+                    the resultant string and it was null terminated.
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbVPrintfA(char* pszDest, size_t cbDest, const char* pszFormat, va_list argList);
+STRSAFEAPI StringCbVPrintfW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszFormat, va_list argList);
+#ifdef UNICODE
+#define StringCbVPrintf  StringCbVPrintfW
+#else
+#define StringCbVPrintf  StringCbVPrintfA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbVPrintfA(char* pszDest, size_t cbDest, const char* pszFormat, va_list argList)
+{
+    HRESULT hr;
+    size_t cchDest;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbVPrintfW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszFormat, va_list argList)
+{
+    HRESULT hr;
+    size_t cchDest;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchPrintf(LPTSTR pszDest,
+                       size_t cchDest,
+                       LPCTSTR pszFormat,
+                       ...);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'sprintf'.
+    The size of the destination buffer (in characters) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was printed without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases it will return a truncated
+    version of the ideal result.
+
+Arguments:
+
+    pszDest     -  destination string
+
+    cchDest     -  size of destination buffer in characters
+                   length must be sufficient to hold the resulting formatted
+                   string, including the null terminator.
+
+    pszFormat   -  format string which must be null terminated
+
+    ...         -  additional parameters to be formatted according to
+                   the format string
+
+Notes: 
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+   
+    pszDest and pszFormat should not be NULL.  See StringCchPrintfEx if you
+    require the handling of NULL values.
+
+Return Value:
+
+    S_OK        -   if there was sufficient space in the dest buffer for
+                    the resultant string and it was null terminated.
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchPrintfA(char* pszDest, size_t cchDest, const char* pszFormat, ...);
+STRSAFEAPI StringCchPrintfW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszFormat, ...);
+#ifdef UNICODE
+#define StringCchPrintf  StringCchPrintfW
+#else
+#define StringCchPrintf  StringCchPrintfA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchPrintfA(char* pszDest, size_t cchDest, const char* pszFormat, ...)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        va_list argList;
+
+        va_start(argList, pszFormat);
+
+        hr = StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList);
+        
+        va_end(argList);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchPrintfW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszFormat, ...)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        va_list argList;
+
+        va_start(argList, pszFormat);
+
+        hr = StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList);
+    
+        va_end(argList);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbPrintf(LPTSTR pszDest,
+                      size_t cbDest,
+                      LPCTSTR pszFormat,
+                      ...);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'sprintf'.
+    The size of the destination buffer (in bytes) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string was printed without truncation and null terminated, otherwise
+    it will return a failure code. In failure cases it will return a truncated
+    version of the ideal result.
+
+Arguments:
+
+    pszDest     -  destination string
+
+    cbDest      -  size of destination buffer in bytes
+                   length must be sufficient to hold the resulting formatted
+                   string, including the null terminator.
+
+    pszFormat   -  format string which must be null terminated
+
+    ...         -  additional parameters to be formatted according to
+                   the format string
+
+Notes: 
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+   
+    pszDest and pszFormat should not be NULL.  See StringCbPrintfEx if you
+    require the handling of NULL values.
+
+
+Return Value:
+
+    S_OK        -   if there was sufficient space in the dest buffer for
+                    the resultant string and it was null terminated.
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbPrintfA(char* pszDest, size_t cbDest, const char* pszFormat, ...);
+STRSAFEAPI StringCbPrintfW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszFormat, ...);
+#ifdef UNICODE
+#define StringCbPrintf  StringCbPrintfW
+#else
+#define StringCbPrintf  StringCbPrintfA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbPrintfA(char* pszDest, size_t cbDest, const char* pszFormat, ...)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        va_list argList;
+
+        va_start(argList, pszFormat);
+   
+        hr = StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList);
+
+        va_end(argList);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbPrintfW(wchar_t* pszDest, size_t cbDest, const wchar_t* pszFormat, ...)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        va_list argList;
+
+        va_start(argList, pszFormat);
+    
+        hr = StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList);
+
+        va_end(argList);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchPrintfEx(LPTSTR pszDest,
+                         size_t cchDest,
+                         LPTSTR* ppszDestEnd,
+                         size_t* pcchRemaining,
+                         DWORD dwFlags,
+                         LPCTSTR pszFormat,
+                         ...);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'sprintf' with
+    some additional parameters.  In addition to functionality provided by
+    StringCchPrintf, this routine also returns a pointer to the end of the 
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cchDest         -   size of destination buffer in characters.
+                        length must be sufficient to contain the resulting
+                        formatted string plus the null terminator.
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function printed any data, the result will point to the
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return 
+                        the number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT(""))
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+    pszFormat       -   format string which must be null terminated
+
+    ...             -   additional parameters to be formatted according to
+                        the format string
+
+Notes:
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+
+    pszDest and pszFormat should not be NULL unless the STRSAFE_IGNORE_NULLS
+    flag is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and
+    pszFormat may be NULL.  An error may still be returned even though NULLS
+    are ignored due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchPrintfExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const char* pszFormat, ...);
+STRSAFEAPI StringCchPrintfExW(wchar_t* pszDest, size_t cchDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const wchar_t* pszFormat, ...);
+#ifdef UNICODE
+#define StringCchPrintfEx  StringCchPrintfExW
+#else
+#define StringCchPrintfEx  StringCchPrintfExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchPrintfExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const char* pszFormat, ...)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+        va_list argList;
+
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+        va_start(argList, pszFormat);
+
+        hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList);
+        
+        va_end(argList);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchPrintfExW(wchar_t* pszDest, size_t cchDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const wchar_t* pszFormat, ...)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+        va_list argList;
+
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+        va_start(argList, pszFormat);
+
+        hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList);
+    
+        va_end(argList);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbPrintfEx(LPTSTR pszDest,
+                        size_t cbDest,
+                        LPTSTR* ppszDestEnd,
+                        size_t* pcbRemaining,
+                        DWORD dwFlags,
+                        LPCTSTR pszFormat,
+                        ...);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'sprintf' with
+    some additional parameters.  In addition to functionality provided by
+    StringCbPrintf, this routine also returns a pointer to the end of the 
+    destination string and the number of bytes left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be sufficient to contain the resulting
+                        formatted string plus the null terminator.
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function printed any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   if pcbRemaining is non-null, the function will return 
+                        the number of bytes left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT(""))
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+    pszFormat       -   format string which must be null terminated
+
+    ...             -   additional parameters to be formatted according to
+                        the format string
+
+Notes:
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+
+    pszDest and pszFormat should not be NULL unless the STRSAFE_IGNORE_NULLS
+    flag is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and
+    pszFormat may be NULL.  An error may still be returned even though NULLS
+    are ignored due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbPrintfExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const char* pszFormat, ...);
+STRSAFEAPI StringCbPrintfExW(wchar_t* pszDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const wchar_t* pszFormat, ...);
+#ifdef UNICODE
+#define StringCbPrintfEx  StringCbPrintfExW
+#else
+#define StringCbPrintfEx  StringCbPrintfExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbPrintfExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const char* pszFormat, ...)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        va_list argList;
+
+        va_start(argList, pszFormat);
+
+        hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList);
+    
+        va_end(argList);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbPrintfExW(wchar_t* pszDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const wchar_t* pszFormat, ...)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        va_list argList;
+
+        va_start(argList, pszFormat);
+
+        hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList);
+    
+        va_end(argList);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchVPrintfEx(LPTSTR pszDest,
+                          size_t cchDest,
+                          LPTSTR* ppszDestEnd,
+                          size_t* pcchRemaining,
+                          DWORD dwFlags,
+                          LPCTSTR pszFormat,
+                          va_list argList);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'vsprintf' with
+    some additional parameters.  In addition to functionality provided by
+    StringCchVPrintf, this routine also returns a pointer to the end of the 
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cchDest         -   size of destination buffer in characters.
+                        length must be sufficient to contain the resulting
+                        formatted string plus the null terminator.
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a 
+                        pointer to the end of the destination string.  If the 
+                        function printed any data, the result will point to the 
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return
+                        the number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT(""))
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+    pszFormat       -   format string which must be null terminated
+
+    argList         -   va_list from the variable arguments according to the
+                        stdarg.h convention
+
+Notes:
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+
+    pszDest and pszFormat should not be NULL unless the STRSAFE_IGNORE_NULLS
+    flag is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and
+    pszFormat may be NULL.  An error may still be returned even though NULLS
+    are ignored due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCchVPrintfExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const char* pszFormat, va_list argList);
+STRSAFEAPI StringCchVPrintfExW(wchar_t* pszDest, size_t cchDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const wchar_t* pszFormat, va_list argList);
+#ifdef UNICODE
+#define StringCchVPrintfEx  StringCchVPrintfExW
+#else
+#define StringCchVPrintfEx  StringCchVPrintfExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchVPrintfExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const char* pszFormat, va_list argList)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+        
+        hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchVPrintfExW(wchar_t* pszDest, size_t cchDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const wchar_t* pszFormat, va_list argList)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbVPrintfEx(LPTSTR pszDest,
+                         size_t cbDest,
+                         LPTSTR* ppszDestEnd,
+                         size_t* pcbRemaining,
+                         DWORD dwFlags,
+                         LPCTSTR pszFormat,
+                         va_list argList);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'vsprintf' with
+    some additional parameters.  In addition to functionality provided by
+    StringCbVPrintf, this routine also returns a pointer to the end of the 
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cbDest          -   size of destination buffer in bytes.
+                        length must be sufficient to contain the resulting
+                        formatted string plus the null terminator.
+
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return 
+                        a pointer to the end of the destination string.  If the
+                        function printed any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   if pcbRemaining is non-null, the function will return
+                        the number of bytes left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT(""))
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated. This will overwrite any truncated 
+                    string returned when the failure is
+                    STRSAFE_E_INSUFFICIENT_BUFFER
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. This will overwrite any truncated string
+                    returned when the failure is STRSAFE_E_INSUFFICIENT_BUFFER.
+
+    pszFormat       -   format string which must be null terminated
+
+    argList         -   va_list from the variable arguments according to the
+                        stdarg.h convention
+
+Notes:
+    Behavior is undefined if destination, format strings or any arguments
+    strings overlap.
+
+    pszDest and pszFormat should not be NULL unless the STRSAFE_IGNORE_NULLS
+    flag is specified.  If STRSAFE_IGNORE_NULLS is passed, both pszDest and
+    pszFormat may be NULL.  An error may still be returned even though NULLS
+    are ignored due to insufficient space.
+
+Return Value:
+
+    S_OK        -   if there was source data and it was all concatenated and the
+                    resultant dest string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all falure cases
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that the print operation
+                    failed due to insufficient space. When this error occurs,
+                    the destination buffer is modified to contain a truncated
+                    version of the ideal result and is null terminated. This
+                    is useful for situations where truncation is ok.
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function
+
+--*/
+
+STRSAFEAPI StringCbVPrintfExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const char* pszFormat, va_list argList);
+STRSAFEAPI StringCbVPrintfExW(wchar_t* pszDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const wchar_t* pszFormat, va_list argList);
+#ifdef UNICODE
+#define StringCbVPrintfEx  StringCbVPrintfExW
+#else
+#define StringCbVPrintfEx  StringCbVPrintfExA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbVPrintfExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const char* pszFormat, va_list argList)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbVPrintfExW(wchar_t* pszDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags, const wchar_t* pszFormat, va_list argList)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+    
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList);
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchGets(LPTSTR pszDest,
+                     size_t cchDest);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'gets'.
+    The size of the destination buffer (in characters) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This routine is not a replacement for fgets.  That function does not replace
+    newline characters with a null terminator.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if any characters were read from stdin and copied to pszDest and pszDest was
+    null terminated, otherwise it will return a failure code.
+
+Arguments:
+
+    pszDest     -   destination string
+
+    cchDest     -   size of destination buffer in characters.
+
+Notes: 
+    pszDest should not be NULL. See StringCchGetsEx if you require the handling 
+    of NULL values.
+
+    cchDest must be > 1 for this function to succeed.
+
+Return Value:
+
+    S_OK        -   data was read from stdin and copied, and the resultant dest
+                    string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_END_OF_FILE
+                -   this return value indicates an error or end-of-file condition,
+                    use feof or ferror to determine which one has occured.
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that there was insufficient
+                    space in the destination buffer to copy any data
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+#ifndef STRSAFE_LIB_IMPL
+STRSAFE_INLINE_API StringCchGetsA(char* pszDest, size_t cchDest);
+STRSAFE_INLINE_API StringCchGetsW(wchar_t* pszDest, size_t cchDest);
+#ifdef UNICODE
+#define StringCchGets  StringCchGetsW
+#else
+#define StringCchGets  StringCchGetsA
+#endif // !UNICODE
+
+STRSAFE_INLINE_API StringCchGetsA(char* pszDest, size_t cchDest)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+        
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+
+        hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, NULL, NULL, 0);
+    }
+
+    return hr;
+}
+
+STRSAFE_INLINE_API StringCchGetsW(wchar_t* pszDest, size_t cchDest)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+        
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, NULL, NULL, 0);
+    }
+
+    return hr;
+}
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+#endif  // !STRSAFE_LIB_IMPL
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbGets(LPTSTR pszDest,
+                    size_t cbDest);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'gets'.
+    The size of the destination buffer (in bytes) is a parameter and
+    this function will not write past the end of this buffer and it will
+    ALWAYS null terminate the destination buffer (unless it is zero length).
+
+    This routine is not a replacement for fgets.  That function does not replace
+    newline characters with a null terminator.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if any characters were read from stdin and copied to pszDest and pszDest was
+    null terminated, otherwise it will return a failure code.
+
+Arguments:
+
+    pszDest     -   destination string
+
+    cbDest      -   size of destination buffer in bytes.
+
+Notes: 
+    pszDest should not be NULL. See StringCbGetsEx if you require the handling 
+    of NULL values.
+
+    cbDest must be > sizeof(TCHAR) for this function to succeed.
+
+Return Value:
+
+    S_OK        -   data was read from stdin and copied, and the resultant dest
+                    string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_END_OF_FILE
+                -   this return value indicates an error or end-of-file condition,
+                    use feof or ferror to determine which one has occured.
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that there was insufficient
+                    space in the destination buffer to copy any data
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+#ifndef STRSAFE_LIB_IMPL
+STRSAFE_INLINE_API StringCbGetsA(char* pszDest, size_t cbDest);
+STRSAFE_INLINE_API StringCbGetsW(wchar_t* pszDest, size_t cbDest);
+#ifdef UNICODE
+#define StringCbGets  StringCbGetsW
+#else
+#define StringCbGets  StringCbGetsA
+#endif // !UNICODE
+
+STRSAFE_INLINE_API StringCbGetsA(char* pszDest, size_t cbDest)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    // convert to count of characters
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, NULL, NULL, 0);
+    }
+
+    return hr;
+}
+
+STRSAFE_INLINE_API StringCbGetsW(wchar_t* pszDest, size_t cbDest)
+{
+    HRESULT hr;
+    size_t cchDest;
+    
+    // convert to count of characters
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, NULL, NULL, 0);
+    }
+
+    return hr;
+}
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+#endif  // !STRSAFE_LIB_IMPL
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchGetsEx(LPTSTR pszDest,
+                       size_t cchDest,
+                       LPTSTR* ppszDestEnd,
+                       size_t* pcchRemaining,
+                       DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'gets' with
+    some additional parameters. In addition to functionality provided by
+    StringCchGets, this routine also returns a pointer to the end of the
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cchDest         -   size of destination buffer in characters.
+                     
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function copied any data, the result will point to the
+                        null termination character
+
+    pcchRemaining   -   if pcchRemaining is non-null, the function will return the
+                        number of characters left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated.
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. 
+                    
+Notes:
+    pszDest should not be NULL unless the STRSAFE_IGNORE_NULLS flag is specified.
+    If STRSAFE_IGNORE_NULLS is passed and pszDest is NULL, an error may still be 
+    returned even though NULLS are ignored
+
+    cchDest must be > 1 for this function to succeed.
+
+Return Value:
+
+    S_OK        -   data was read from stdin and copied, and the resultant dest
+                    string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_END_OF_FILE
+                -   this return value indicates an error or end-of-file condition,
+                    use feof or ferror to determine which one has occured.
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that there was insufficient
+                    space in the destination buffer to copy any data
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+#ifndef STRSAFE_LIB_IMPL
+STRSAFE_INLINE_API StringCchGetsExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+STRSAFE_INLINE_API StringCchGetsExW(wchar_t* pszDest, size_t cchDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCchGetsEx  StringCchGetsExW
+#else
+#define StringCchGetsEx  StringCchGetsExA
+#endif // !UNICODE
+
+STRSAFE_INLINE_API StringCchGetsExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+        
+        // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1
+        cbDest = cchDest * sizeof(char);
+
+        hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+
+STRSAFE_INLINE_API StringCchGetsExW(wchar_t* pszDest, size_t cchDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cbDest;
+        
+        // safe to multiply cchDest * sizeof(wchar_t) since cchDest < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        cbDest = cchDest * sizeof(wchar_t);
+
+        hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags);
+    }
+
+    return hr;
+}
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+#endif  // !STRSAFE_LIB_IMPL
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbGetsEx(LPTSTR pszDest,
+                      size_t cbDest,
+                      LPTSTR* ppszDestEnd,
+                      size_t* pcbRemaining,
+                      DWORD dwFlags);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'gets' with
+    some additional parameters. In addition to functionality provided by
+    StringCbGets, this routine also returns a pointer to the end of the
+    destination string and the number of characters left in the destination string
+    including the null terminator. The flags parameter allows additional controls.
+
+Arguments:
+
+    pszDest         -   destination string
+
+    cbDest          -   size of destination buffer in bytes.
+                     
+    ppszDestEnd     -   if ppszDestEnd is non-null, the function will return a
+                        pointer to the end of the destination string.  If the
+                        function copied any data, the result will point to the
+                        null termination character
+
+    pcbRemaining    -   if pbRemaining is non-null, the function will return the
+                        number of bytes left in the destination string,
+                        including the null terminator
+
+    dwFlags         -   controls some details of the string copy:
+
+        STRSAFE_FILL_BEHIND_NULL
+                    if the function succeeds, the low byte of dwFlags will be
+                    used to fill the uninitialize part of destination buffer
+                    behind the null terminator
+
+        STRSAFE_IGNORE_NULLS
+                    treat NULL string pointers like empty strings (TEXT("")).
+
+        STRSAFE_FILL_ON_FAILURE
+                    if the function fails, the low byte of dwFlags will be
+                    used to fill all of the destination buffer, and it will
+                    be null terminated.
+
+        STRSAFE_NO_TRUNCATION /
+        STRSAFE_NULL_ON_FAILURE
+                    if the function fails, the destination buffer will be set
+                    to the empty string. 
+                    
+Notes:
+    pszDest should not be NULL unless the STRSAFE_IGNORE_NULLS flag is specified.
+    If STRSAFE_IGNORE_NULLS is passed and pszDest is NULL, an error may still be 
+    returned even though NULLS are ignored
+
+    cbDest must be > sizeof(TCHAR) for this function to succeed
+
+Return Value:
+
+    S_OK        -   data was read from stdin and copied, and the resultant dest
+                    string was null terminated
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    STRSAFE_E_END_OF_FILE
+                -   this return value indicates an error or end-of-file condition,
+                    use feof or ferror to determine which one has occured.
+
+    STRSAFE_E_INSUFFICIENT_BUFFER / 
+    HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER
+                -   this return value is an indication that there was insufficient
+                    space in the destination buffer to copy any data
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+#ifndef STRSAFE_LIB_IMPL
+STRSAFE_INLINE_API StringCbGetsExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pbRemaining, unsigned long dwFlags);
+STRSAFE_INLINE_API StringCbGetsExW(wchar_t* pszDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags);
+#ifdef UNICODE
+#define StringCbGetsEx  StringCbGetsExW
+#else
+#define StringCbGetsEx  StringCbGetsExA
+#endif // !UNICODE
+
+STRSAFE_INLINE_API StringCbGetsExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(char);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr)                           ||
+        (hr == STRSAFE_E_INSUFFICIENT_BUFFER)   ||
+        (hr == STRSAFE_E_END_OF_FILE))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1
+            *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char));
+        }
+    }
+
+    return hr;
+}
+
+STRSAFE_INLINE_API StringCbGetsExW(wchar_t* pszDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags)
+{
+    HRESULT hr;
+    size_t cchDest;
+    size_t cchRemaining = 0;
+
+    cchDest = cbDest / sizeof(wchar_t);
+
+    if (cchDest > STRSAFE_MAX_CCH)
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags);
+    }
+
+    if (SUCCEEDED(hr)                           ||
+        (hr == STRSAFE_E_INSUFFICIENT_BUFFER)   ||
+        (hr == STRSAFE_E_END_OF_FILE))
+    {
+        if (pcbRemaining)
+        {
+            // safe to multiply cchRemaining * sizeof(wchar_t) since cchRemaining < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+            *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
+        }
+    }
+
+    return hr;
+}
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+#endif  // !STRSAFE_LIB_IMPL
+
+#ifndef STRSAFE_NO_CCH_FUNCTIONS
+/*++
+
+STDAPI StringCchLength(LPCTSTR psz,
+                       size_t cchMax,
+                       size_t* pcch);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strlen'.
+    It is used to make sure a string is not larger than a given length, and
+    it optionally returns the current length in characters not including
+    the null terminator.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string is non-null and the length including the null terminator is
+    less than or equal to cchMax characters.
+
+Arguments:
+
+    psz         -   string to check the length of
+
+    cchMax      -   maximum number of characters including the null terminator
+                    that psz is allowed to contain
+
+    pcch        -   if the function succeeds and pcch is non-null, the current length
+                    in characters of psz excluding the null terminator will be returned.
+                    This out parameter is equivalent to the return value of strlen(psz)
+
+Notes: 
+    psz can be null but the function will fail
+
+    cchMax should be greater than zero or the function will fail
+
+Return Value:
+
+    S_OK        -   psz is non-null and the length including the null terminator is
+                    less than or equal to cchMax characters
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+STRSAFEAPI StringCchLengthA(const char* psz, size_t cchMax, size_t* pcch);
+STRSAFEAPI StringCchLengthW(const wchar_t* psz, size_t cchMax, size_t* pcch);
+#ifdef UNICODE
+#define StringCchLength  StringCchLengthW
+#else
+#define StringCchLength  StringCchLengthA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCchLengthA(const char* psz, size_t cchMax, size_t* pcch)
+{
+    HRESULT hr;
+    
+    if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringLengthWorkerA(psz, cchMax, pcch);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCchLengthW(const wchar_t* psz, size_t cchMax, size_t* pcch)
+{
+    HRESULT hr;
+
+    if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringLengthWorkerW(psz, cchMax, pcch);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CCH_FUNCTIONS
+
+
+#ifndef STRSAFE_NO_CB_FUNCTIONS
+/*++
+
+STDAPI StringCbLength(LPCTSTR psz,
+                      size_t cbMax,
+                      size_t* pcb);
+
+Routine Description:
+
+    This routine is a safer version of the C built-in function 'strlen'.
+    It is used to make sure a string is not larger than a given length, and
+    it optionally returns the current length in bytes not including 
+    the null terminator.
+
+    This function returns a hresult, and not a pointer.  It returns a S_OK
+    if the string is non-null and the length including the null terminator is
+    less than or equal to cbMax bytes.
+
+Arguments:
+
+    psz         -   string to check the length of
+
+    cbMax       -   maximum number of bytes including the null terminator
+                    that psz is allowed to contain
+
+    pcb         -   if the function succeeds and pcb is non-null, the current length
+                    in bytes of psz excluding the null terminator will be returned.
+                    This out parameter is equivalent to the return value of strlen(psz) * sizeof(TCHAR)
+
+Notes: 
+    psz can be null but the function will fail
+
+    cbMax should be greater than or equal to sizeof(TCHAR) or the function will fail
+
+Return Value:
+
+    S_OK        -   psz is non-null and the length including the null terminator is
+                    less than or equal to cbMax bytes
+
+    failure     -   you can use the macro HRESULT_CODE() to get a win32 error
+                    code for all hresult falure cases
+
+    It is strongly recommended to use the SUCCEEDED() / FAILED() macros to test the
+    return value of this function.
+
+--*/
+
+STRSAFEAPI StringCbLengthA(const char* psz, size_t cchMax, size_t* pcch);
+STRSAFEAPI StringCbLengthW(const wchar_t* psz, size_t cchMax, size_t* pcch);
+#ifdef UNICODE
+#define StringCbLength  StringCbLengthW
+#else
+#define StringCbLength  StringCbLengthA
+#endif // !UNICODE
+
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCbLengthA(const char* psz, size_t cbMax, size_t* pcb)
+{
+    HRESULT hr;
+    size_t cchMax;
+    size_t cch = 0;
+
+    cchMax = cbMax / sizeof(char);
+
+    if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringLengthWorkerA(psz, cchMax, &cch);
+    }
+
+    if (SUCCEEDED(hr) && pcb)
+    {
+        // safe to multiply cch * sizeof(char) since cch < STRSAFE_MAX_CCH and sizeof(char) is 1
+        *pcb = cch * sizeof(char);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCbLengthW(const wchar_t* psz, size_t cbMax, size_t* pcb)
+{
+    HRESULT hr;
+    size_t cchMax;
+    size_t cch = 0;
+
+    cchMax = cbMax / sizeof(wchar_t);
+
+    if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        hr = StringLengthWorkerW(psz, cchMax, &cch);
+    }
+
+    if (SUCCEEDED(hr) && pcb)
+    {
+        // safe to multiply cch * sizeof(wchar_t) since cch < STRSAFE_MAX_CCH and sizeof(wchar_t) is 2
+        *pcb = cch * sizeof(wchar_t);
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+#endif  // !STRSAFE_NO_CB_FUNCTIONS
+
+
+// these are the worker functions that actually do the work
+#ifdef STRSAFE_INLINE
+STRSAFEAPI StringCopyWorkerA(char* pszDest, size_t cchDest, const char* pszSrc)
+{
+    HRESULT hr = S_OK;
+
+    if (cchDest == 0)
+    {
+        // can not null terminate a zero-byte dest buffer
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        while (cchDest && (*pszSrc != '\0'))
+        {
+            *pszDest++ = *pszSrc++;
+            cchDest--;
+        }
+
+        if (cchDest == 0)
+        {
+            // we are going to truncate pszDest
+            pszDest--;
+            hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+        }
+
+        *pszDest= '\0';
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc)
+{
+    HRESULT hr = S_OK;
+
+    if (cchDest == 0)
+    {
+        // can not null terminate a zero-byte dest buffer
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        while (cchDest && (*pszSrc != L'\0'))
+        {
+            *pszDest++ = *pszSrc++;
+            cchDest--;
+        }
+
+        if (cchDest == 0)
+        {
+            // we are going to truncate pszDest
+            pszDest--;
+            hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+        }
+
+        *pszDest= L'\0';
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    char* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+ 
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = "";
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = 0;
+
+                // only fail if there was actually src data to copy
+                if (*pszSrc != '\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                while (cchRemaining && (*pszSrc != '\0'))
+                {
+                    *pszDestEnd++= *pszSrc++;
+                    cchRemaining--;
+                }
+    
+                if (cchRemaining > 0)
+                {
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char)));
+                    }
+                }
+                else
+                {
+                    // we are going to truncate pszDest
+                    pszDestEnd--;
+                    cchRemaining++;
+
+                    hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                }
+
+                *pszDestEnd = '\0';
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+            
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    wchar_t* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(wchar_t)) ||
+    //        cbDest == (cchDest * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+ 
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = L"";
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = 0;
+
+                // only fail if there was actually src data to copy
+                if (*pszSrc != L'\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                while (cchRemaining && (*pszSrc != L'\0'))
+                {
+                    *pszDestEnd++= *pszSrc++;
+                    cchRemaining--;
+                }
+    
+                if (cchRemaining > 0)
+                {
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+                    }
+                }
+                else
+                {
+                    // we are going to truncate pszDest
+                    pszDestEnd--;
+                    cchRemaining++;
+
+                    hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                }
+
+                *pszDestEnd = L'\0';
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+                           
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc)
+{
+    HRESULT hr = S_OK;
+
+    if (cchDest == 0)
+    {
+        // can not null terminate a zero-byte dest buffer
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        while (cchDest && cchSrc && (*pszSrc != '\0'))
+        {
+            *pszDest++= *pszSrc++;
+            cchDest--;
+            cchSrc--;
+        }
+
+        if (cchDest == 0)
+        {
+            // we are going to truncate pszDest
+            pszDest--;
+            hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+        }
+
+        *pszDest= '\0';
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyNWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchSrc)
+{
+    HRESULT hr = S_OK;
+
+    if (cchDest == 0)
+    {
+        // can not null terminate a zero-byte dest buffer
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        while (cchDest && cchSrc && (*pszSrc != L'\0'))
+        {
+            *pszDest++= *pszSrc++;
+            cchDest--;
+            cchSrc--;
+        }
+
+        if (cchDest == 0)
+        {
+            // we are going to truncate pszDest
+            pszDest--;
+            hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+        }
+
+        *pszDest= L'\0';
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, size_t cchSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    char* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+ 
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = "";
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = 0;
+
+                // only fail if there was actually src data to copy
+                if (*pszSrc != '\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                while (cchRemaining && cchSrc && (*pszSrc != '\0'))
+                {
+                    *pszDestEnd++= *pszSrc++;
+                    cchRemaining--;
+                    cchSrc--;
+                }
+    
+                if (cchRemaining > 0)
+                {
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char)));
+                    }
+                }
+                else
+                {
+                    // we are going to truncate pszDest
+                    pszDestEnd--;
+                    cchRemaining++;
+
+                    hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                }
+
+                *pszDestEnd = '\0';
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+            
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCopyNExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, size_t cchSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    wchar_t* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(wchar_t)) ||
+    //        cbDest == (cchDest * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+ 
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = L"";
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = 0;
+
+                // only fail if there was actually src data to copy
+                if (*pszSrc != L'\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                while (cchRemaining && cchSrc && (*pszSrc != L'\0'))
+                {
+                    *pszDestEnd++= *pszSrc++;
+                    cchRemaining--;
+                    cchSrc--;
+                }
+    
+                if (cchRemaining > 0)
+                {
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+                    }
+                }
+                else
+                {
+                    // we are going to truncate pszDest
+                    pszDestEnd--;
+                    cchRemaining++;
+
+                    hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                }
+
+                *pszDestEnd = L'\0';
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+            
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCatWorkerA(char* pszDest, size_t cchDest, const char* pszSrc)
+{
+   HRESULT hr;
+   size_t cchDestCurrent;
+
+   hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent);
+
+   if (SUCCEEDED(hr))
+   {
+       hr = StringCopyWorkerA(pszDest + cchDestCurrent,
+                              cchDest - cchDestCurrent,
+                              pszSrc);
+   }
+
+   return hr;
+}
+
+STRSAFEAPI StringCatWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc)
+{
+   HRESULT hr;
+   size_t cchDestCurrent;
+
+   hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent);
+
+   if (SUCCEEDED(hr))
+   {
+       hr = StringCopyWorkerW(pszDest + cchDestCurrent,
+                              cchDest - cchDestCurrent,
+                              pszSrc);
+   }
+
+   return hr;
+}
+
+STRSAFEAPI StringCatExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    char* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cchDestCurrent;
+
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest == 0) && (cbDest == 0))
+                {
+                    cchDestCurrent = 0;
+                }
+                else
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+            else
+            {
+                hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent);
+
+                if (SUCCEEDED(hr))
+                {
+                    pszDestEnd = pszDest + cchDestCurrent;
+                    cchRemaining = cchDest - cchDestCurrent;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = "";
+            }
+        }
+        else
+        {
+            hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent);
+
+            if (SUCCEEDED(hr))
+            {
+                pszDestEnd = pszDest + cchDestCurrent;
+                cchRemaining = cchDest - cchDestCurrent;
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                // only fail if there was actually src data to append
+                if (*pszSrc != '\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                // we handle the STRSAFE_FILL_ON_FAILURE and STRSAFE_NULL_ON_FAILURE cases below, so do not pass
+                // those flags through
+                hr = StringCopyExWorkerA(pszDestEnd,
+                                         cchRemaining,
+                                         (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)),
+                                         pszSrc,
+                                         &pszDestEnd,
+                                         &cchRemaining,
+                                         dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE)));
+            }
+        }
+    }
+    
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            // STRSAFE_NO_TRUNCATION is taken care of by StringCopyExWorkerA()
+
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+
+            if (dwFlags & STRSAFE_NULL_ON_FAILURE)
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCatExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    wchar_t* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(wchar_t)) ||
+    //        cbDest == (cchDest * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        size_t cchDestCurrent;
+
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest == 0) && (cbDest == 0))
+                {
+                    cchDestCurrent = 0;
+                }
+                else
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+            else
+            {
+                hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent);
+
+                if (SUCCEEDED(hr))
+                {
+                    pszDestEnd = pszDest + cchDestCurrent;
+                    cchRemaining = cchDest - cchDestCurrent;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = L"";
+            }
+        }
+        else
+        {
+            hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent);
+
+            if (SUCCEEDED(hr))
+            {
+                pszDestEnd = pszDest + cchDestCurrent;
+                cchRemaining = cchDest - cchDestCurrent;
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                // only fail if there was actually src data to append
+                if (*pszSrc != L'\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                // we handle the STRSAFE_FILL_ON_FAILURE and STRSAFE_NULL_ON_FAILURE cases below, so do not pass
+                // those flags through
+                hr = StringCopyExWorkerW(pszDestEnd,
+                                         cchRemaining,
+                                         (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)),
+                                         pszSrc,
+                                         &pszDestEnd,
+                                         &cchRemaining,
+                                         dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE)));            
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            // STRSAFE_NO_TRUNCATION is taken care of by StringCopyExWorkerW()
+
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+            
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+
+            if (dwFlags & STRSAFE_NULL_ON_FAILURE)
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCatNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend)
+{
+    HRESULT hr;
+    size_t cchDestCurrent;
+
+    hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent);
+
+    if (SUCCEEDED(hr))
+    {
+        hr = StringCopyNWorkerA(pszDest + cchDestCurrent,
+                                cchDest - cchDestCurrent,
+                                pszSrc,
+                                cchMaxAppend);
+    }    
+
+    return hr;
+}
+
+STRSAFEAPI StringCatNWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszSrc, size_t cchMaxAppend)
+{
+    HRESULT hr;
+    size_t cchDestCurrent;
+
+    hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent);
+
+    if (SUCCEEDED(hr))
+    {
+        hr = StringCopyNWorkerW(pszDest + cchDestCurrent,
+                                cchDest - cchDestCurrent,
+                                pszSrc,
+                                cchMaxAppend);
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCatNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, size_t cchMaxAppend, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    char* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+    size_t cchDestCurrent = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest == 0) && (cbDest == 0))
+                {
+                    cchDestCurrent = 0;
+                }
+                else
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+            else
+            {
+                hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent);
+
+                if (SUCCEEDED(hr))
+                {
+                    pszDestEnd = pszDest + cchDestCurrent;
+                    cchRemaining = cchDest - cchDestCurrent;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = "";
+            }
+        }
+        else
+        {
+            hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent);
+
+            if (SUCCEEDED(hr))
+            {
+                pszDestEnd = pszDest + cchDestCurrent;
+                cchRemaining = cchDest - cchDestCurrent;
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                // only fail if there was actually src data to append
+                if (*pszSrc != '\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                // we handle the STRSAFE_FILL_ON_FAILURE and STRSAFE_NULL_ON_FAILURE cases below, so do not pass
+                // those flags through
+                hr = StringCopyNExWorkerA(pszDestEnd,
+                                          cchRemaining,
+                                          (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)),
+                                          pszSrc,
+                                          cchMaxAppend,
+                                          &pszDestEnd,
+                                          &cchRemaining,
+                                          dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE)));
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            // STRSAFE_NO_TRUNCATION is taken care of by StringCopyNExWorkerA()
+
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd)
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringCatNExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, const wchar_t* pszSrc, size_t cchMaxAppend, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    wchar_t* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+    size_t cchDestCurrent = 0;
+
+
+    // ASSERT(cbDest == (cchDest * sizeof(wchar_t)) ||
+    //        cbDest == (cchDest * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest == 0) && (cbDest == 0))
+                {
+                    cchDestCurrent = 0;
+                }
+                else
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+            else
+            {
+                hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent);
+
+                if (SUCCEEDED(hr))
+                {
+                    pszDestEnd = pszDest + cchDestCurrent;
+                    cchRemaining = cchDest - cchDestCurrent;
+                }
+            }
+
+            if (pszSrc == NULL)
+            {
+                pszSrc = L"";
+            }
+        }
+        else
+        {
+            hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent);
+
+            if (SUCCEEDED(hr))
+            {
+                pszDestEnd = pszDest + cchDestCurrent;
+                cchRemaining = cchDest - cchDestCurrent;
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                // only fail if there was actually src data to append
+                if (*pszSrc != L'\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                // we handle the STRSAFE_FILL_ON_FAILURE and STRSAFE_NULL_ON_FAILURE cases below, so do not pass
+                // those flags through
+                hr = StringCopyNExWorkerW(pszDestEnd,
+                                          cchRemaining,
+                                          (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)),
+                                          pszSrc,
+                                          cchMaxAppend,
+                                          &pszDestEnd,
+                                          &cchRemaining,
+                                          dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE)));
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            // STRSAFE_NO_TRUNCATION is taken care of by StringCopyNExWorkerW()
+
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd)
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringVPrintfWorkerA(char* pszDest, size_t cchDest, const char* pszFormat, va_list argList)
+{
+    HRESULT hr = S_OK;
+
+    if (cchDest == 0)
+    {
+        // can not null terminate a zero-byte dest buffer
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        int iRet;
+        size_t cchMax;
+
+        // leave the last space for the null terminator
+        cchMax = cchDest - 1;
+
+        iRet = _vsnprintf(pszDest, cchMax, pszFormat, argList);
+        // ASSERT((iRet < 0) || (((size_t)iRet) <= cchMax));
+
+        if ((iRet < 0) || (((size_t)iRet) > cchMax))
+        {
+            // need to null terminate the string
+            pszDest += cchMax;
+            *pszDest = '\0';
+
+            // we have truncated pszDest
+            hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+        }
+        else if (((size_t)iRet) == cchMax)
+        {
+            // need to null terminate the string
+            pszDest += cchMax;
+            *pszDest = '\0';
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringVPrintfWorkerW(wchar_t* pszDest, size_t cchDest, const wchar_t* pszFormat, va_list argList)
+{
+    HRESULT hr = S_OK;
+
+    if (cchDest == 0)
+    {
+        // can not null terminate a zero-byte dest buffer
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else    
+    {
+        int iRet;
+        size_t cchMax;
+
+        // leave the last space for the null terminator
+        cchMax = cchDest - 1;
+
+        iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList);
+        // ASSERT((iRet < 0) || (((size_t)iRet) <= cchMax));
+
+        if ((iRet < 0) || (((size_t)iRet) > cchMax))
+        {
+            // need to null terminate the string
+            pszDest += cchMax;
+            *pszDest = L'\0';
+
+            // we have truncated pszDest
+            hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+        }
+        else if (((size_t)iRet) == cchMax)
+        {
+            // need to null terminate the string
+            pszDest += cchMax;
+            *pszDest = L'\0';
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringVPrintfExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const char* pszFormat, va_list argList)
+{
+    HRESULT hr = S_OK;
+    char* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+
+            if (pszFormat == NULL)
+            {
+                pszFormat = "";
+            }
+        }
+    
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = 0;
+
+                // only fail if there was actually a non-empty format string
+                if (*pszFormat != '\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                int iRet;
+                size_t cchMax;
+
+                // leave the last space for the null terminator
+                cchMax = cchDest - 1;
+
+                iRet = _vsnprintf(pszDest, cchMax, pszFormat, argList);
+                // ASSERT((iRet < 0) || (((size_t)iRet) <= cchMax));
+
+                if ((iRet < 0) || (((size_t)iRet) > cchMax))
+                {
+                    // we have truncated pszDest
+                    pszDestEnd = pszDest + cchMax;
+                    cchRemaining = 1;
+
+                    // need to null terminate the string
+                    *pszDestEnd = '\0';
+
+                    hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                }
+                else if (((size_t)iRet) == cchMax)
+                {
+                    // string fit perfectly
+                    pszDestEnd = pszDest + cchMax;
+                    cchRemaining = 1;
+
+                    // need to null terminate the string
+                    *pszDestEnd = '\0';
+                }
+                else if (((size_t)iRet) < cchMax)
+                {
+                    // there is extra room
+                    pszDestEnd = pszDest + iRet;
+                    cchRemaining = cchDest - iRet;
+
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char)));
+                    }
+                }
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringVPrintfExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags, const wchar_t* pszFormat, va_list argList)
+{
+    HRESULT hr = S_OK;
+    wchar_t* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(wchar_t)) ||
+    //        cbDest == (cchDest * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+
+            if (pszFormat == NULL)
+            {
+                pszFormat = L"";
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest == 0)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = 0;
+
+                // only fail if there was actually a non-empty format string
+                if (*pszFormat != L'\0')
+                {
+                    if (pszDest == NULL)
+                    {
+                        hr = STRSAFE_E_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                    }
+                }
+            }
+            else
+            {
+                int iRet;
+                size_t cchMax;
+
+                // leave the last space for the null terminator
+                cchMax = cchDest - 1;
+
+                iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList);
+                // ASSERT((iRet < 0) || (((size_t)iRet) <= cchMax));
+
+                if ((iRet < 0) || (((size_t)iRet) > cchMax))
+                {
+                    // we have truncated pszDest
+                    pszDestEnd = pszDest + cchMax;
+                    cchRemaining = 1;
+
+                    // need to null terminate the string
+                    *pszDestEnd = L'\0';
+
+                    hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+                }
+                else if (((size_t)iRet) == cchMax)
+                {
+                    // string fit perfectly
+                    pszDestEnd = pszDest + cchMax;
+                    cchRemaining = 1;
+
+                    // need to null terminate the string
+                    *pszDestEnd = L'\0';
+                }
+                else if (((size_t)iRet) < cchMax)
+                {
+                    // there is extra room
+                    pszDestEnd = pszDest + iRet;
+                    cchRemaining = cchDest - iRet;
+
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+                    }
+                }
+            }
+        }
+    }
+    
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER))
+    {
+        if (ppszDestEnd) 
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringLengthWorkerA(const char* psz, size_t cchMax, size_t* pcch)
+{
+    HRESULT hr = S_OK;
+    size_t cchMaxPrev = cchMax;
+
+    while (cchMax && (*psz != '\0'))
+    {
+        psz++;
+        cchMax--;
+    }
+
+    if (cchMax == 0)
+    {
+        // the string is longer than cchMax
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+
+    if (SUCCEEDED(hr) && pcch)
+    {
+        *pcch = cchMaxPrev - cchMax;
+    }
+
+    return hr;
+}
+
+STRSAFEAPI StringLengthWorkerW(const wchar_t* psz, size_t cchMax, size_t* pcch)
+{
+    HRESULT hr = S_OK;
+    size_t cchMaxPrev = cchMax;
+
+    while (cchMax && (*psz != L'\0'))
+    {
+        psz++;
+        cchMax--;
+    }
+
+    if (cchMax == 0)
+    {
+        // the string is longer than cchMax
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+
+    if (SUCCEEDED(hr) && pcch)
+    {
+        *pcch = cchMaxPrev - cchMax;
+    }
+
+    return hr;
+}
+#endif  // STRSAFE_INLINE
+
+#ifndef STRSAFE_LIB_IMPL
+STRSAFE_INLINE_API StringGetsExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    char* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest <= 1)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                if (cchDest == 1)
+                {
+                    *pszDestEnd = '\0';
+                }
+
+                hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+            }
+            else
+            {
+                char ch;
+
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                while ((cchRemaining > 1) && (ch = (char)getc(stdin)) != '\n')
+                {
+                    if (ch == EOF)
+                    {
+                        if (pszDestEnd == pszDest)
+                        {
+                            // we failed to read anything from stdin
+                            hr = STRSAFE_E_END_OF_FILE;
+                        }
+                        break;
+                    }
+
+                    *pszDestEnd = ch;
+
+                    pszDestEnd++;
+                    cchRemaining--;
+                }
+
+                if (cchRemaining > 0)
+                {
+                    // there is extra room
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char)));
+                    }
+                }
+
+                *pszDestEnd = '\0';
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+            
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = '\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr)                           ||
+        (hr == STRSAFE_E_INSUFFICIENT_BUFFER)   ||
+        (hr == STRSAFE_E_END_OF_FILE))
+    {
+        if (ppszDestEnd)
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+
+STRSAFE_INLINE_API StringGetsExWorkerW(wchar_t* pszDest, size_t cchDest, size_t cbDest, wchar_t** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags)
+{
+    HRESULT hr = S_OK;
+    wchar_t* pszDestEnd = pszDest;
+    size_t cchRemaining = 0;
+
+    // ASSERT(cbDest == (cchDest * sizeof(char))    ||
+    //        cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char)));
+
+    // only accept valid flags
+    if (dwFlags & (~STRSAFE_VALID_FLAGS))
+    {
+        hr = STRSAFE_E_INVALID_PARAMETER;
+    }
+    else
+    {
+        if (dwFlags & STRSAFE_IGNORE_NULLS)
+        {
+            if (pszDest == NULL)
+            {
+                if ((cchDest != 0) || (cbDest != 0))
+                {
+                    // NULL pszDest and non-zero cchDest/cbDest is invalid
+                    hr = STRSAFE_E_INVALID_PARAMETER;
+                }
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            if (cchDest <= 1)
+            {
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                if (cchDest == 1)
+                {
+                    *pszDestEnd = L'\0';
+                }
+
+                hr = STRSAFE_E_INSUFFICIENT_BUFFER;
+            }
+            else
+            {
+                wchar_t ch;
+
+                pszDestEnd = pszDest;
+                cchRemaining = cchDest;
+
+                while ((cchRemaining > 1) && (ch = (wchar_t)getwc(stdin)) != L'\n')
+                {
+                    if (ch == EOF)
+                    {
+                        if (pszDestEnd == pszDest)
+                        {
+                            // we failed to read anything from stdin
+                            hr = STRSAFE_E_END_OF_FILE;
+                        }
+                        break;
+                    }
+
+                    *pszDestEnd = ch;
+
+                    pszDestEnd++;
+                    cchRemaining--;
+                }
+
+                if (cchRemaining > 0)
+                {
+                    // there is extra room
+                    if (dwFlags & STRSAFE_FILL_BEHIND_NULL)
+                    {
+                        memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)));
+                    }
+                }
+
+                *pszDestEnd = L'\0';
+            }
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        if (pszDest)
+        {
+            if (dwFlags & STRSAFE_FILL_ON_FAILURE)
+            {
+                memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest);
+
+                if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+                }
+                else if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest + cchDest - 1;
+                    cchRemaining = 1;
+
+                    // null terminate the end of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+
+            if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION))
+            {
+                if (cchDest > 0)
+                {
+                    pszDestEnd = pszDest;
+                    cchRemaining = cchDest;
+
+                    // null terminate the beginning of the string
+                    *pszDestEnd = L'\0';
+                }
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr)                           ||
+        (hr == STRSAFE_E_INSUFFICIENT_BUFFER)   ||
+        (hr == STRSAFE_E_END_OF_FILE))
+    {
+        if (ppszDestEnd)
+        {
+            *ppszDestEnd = pszDestEnd;
+        }
+
+        if (pcchRemaining)
+        {
+            *pcchRemaining = cchRemaining;
+        }
+    }
+
+    return hr;
+}
+#endif  // !STRSAFE_LIB_IMPL
+
+// Do not call these functions, they are worker functions for internal use within this file
+#ifdef DEPRECATE_SUPPORTED
+#pragma deprecated(StringCopyWorkerA)
+#pragma deprecated(StringCopyWorkerW)
+#pragma deprecated(StringCopyExWorkerA)
+#pragma deprecated(StringCopyExWorkerW)
+#pragma deprecated(StringCatWorkerA)
+#pragma deprecated(StringCatWorkerW)
+#pragma deprecated(StringCatExWorkerA)
+#pragma deprecated(StringCatExWorkerW)
+#pragma deprecated(StringCatNWorkerA)
+#pragma deprecated(StringCatNWorkerW)
+#pragma deprecated(StringCatNExWorkerA)
+#pragma deprecated(StringCatNExWorkerW)
+#pragma deprecated(StringVPrintfWorkerA)
+#pragma deprecated(StringVPrintfWorkerW)
+#pragma deprecated(StringVPrintfExWorkerA)
+#pragma deprecated(StringVPrintfExWorkerW)
+#pragma deprecated(StringLengthWorkerA)
+#pragma deprecated(StringLengthWorkerW)
+#else
+#define StringCopyWorkerA        StringCopyWorkerA_instead_use_StringCchCopyA_or_StringCchCopyExA;
+#define StringCopyWorkerW        StringCopyWorkerW_instead_use_StringCchCopyW_or_StringCchCopyExW;
+#define StringCopyExWorkerA      StringCopyExWorkerA_instead_use_StringCchCopyA_or_StringCchCopyExA;
+#define StringCopyExWorkerW      StringCopyExWorkerW_instead_use_StringCchCopyW_or_StringCchCopyExW;
+#define StringCatWorkerA         StringCatWorkerA_instead_use_StringCchCatA_or_StringCchCatExA;
+#define StringCatWorkerW         StringCatWorkerW_instead_use_StringCchCatW_or_StringCchCatExW;
+#define StringCatExWorkerA       StringCatExWorkerA_instead_use_StringCchCatA_or_StringCchCatExA;
+#define StringCatExWorkerW       StringCatExWorkerW_instead_use_StringCchCatW_or_StringCchCatExW;
+#define StringCatNWorkerA        StringCatNWorkerA_instead_use_StringCchCatNA_or_StrincCbCatNA;
+#define StringCatNWorkerW        StringCatNWorkerW_instead_use_StringCchCatNW_or_StringCbCatNW;
+#define StringCatNExWorkerA      StringCatNExWorkerA_instead_use_StringCchCatNExA_or_StringCbCatNExA;
+#define StringCatNExWorkerW      StringCatNExWorkerW_instead_use_StringCchCatNExW_or_StringCbCatNExW;
+#define StringVPrintfWorkerA     StringVPrintfWorkerA_instead_use_StringCchVPrintfA_or_StringCchVPrintfExA;
+#define StringVPrintfWorkerW     StringVPrintfWorkerW_instead_use_StringCchVPrintfW_or_StringCchVPrintfExW;
+#define StringVPrintfExWorkerA   StringVPrintfExWorkerA_instead_use_StringCchVPrintfA_or_StringCchVPrintfExA;
+#define StringVPrintfExWorkerW   StringVPrintfExWorkerW_instead_use_StringCchVPrintfW_or_StringCchVPrintfExW;
+#define StringLengthWorkerA      StringLengthWorkerA_instead_use_StringCchLengthA_or_StringCbLengthA;
+#define StringLengthWorkerW      StringLengthWorkerW_instead_use_StringCchLengthW_or_StringCbLengthW;
+#endif // !DEPRECATE_SUPPORTED
+
+
+#ifndef STRSAFE_NO_DEPRECATE
+// Deprecate all of the unsafe functions to generate compiletime errors. If you do not want
+// this then you can #define STRSAFE_NO_DEPRECATE before including this file.
+#ifdef DEPRECATE_SUPPORTED
+// First all the names that are a/w variants (or shouldn't be #defined by now anyway).
+#pragma deprecated(lstrcpyA)
+#pragma deprecated(lstrcpyW)
+#pragma deprecated(lstrcatA)
+#pragma deprecated(lstrcatW)
+#pragma deprecated(wsprintfA)
+#pragma deprecated(wsprintfW)
+
+#pragma deprecated(StrCpyW)
+#pragma deprecated(StrCatW)
+#pragma deprecated(StrNCatA)
+#pragma deprecated(StrNCatW)
+#pragma deprecated(StrCatNA)
+#pragma deprecated(StrCatNW)
+#pragma deprecated(wvsprintfA)
+#pragma deprecated(wvsprintfW)
+
+#pragma deprecated(strcpy)
+#pragma deprecated(wcscpy)
+#pragma deprecated(strcat)
+#pragma deprecated(wcscat)
+#pragma deprecated(sprintf)
+#pragma deprecated(swprintf)
+#pragma deprecated(vsprintf)
+#pragma deprecated(vswprintf)
+#pragma deprecated(_snprintf)
+#pragma deprecated(_snwprintf)
+#pragma deprecated(_vsnprintf)
+#pragma deprecated(_vsnwprintf)
+#pragma deprecated(gets)
+#pragma deprecated(_getws)
+
+// Then all the windows.h names - we need to undef and redef based on UNICODE setting
+#undef lstrcpy
+#undef lstrcat
+#undef wsprintf
+#undef wvsprintf
+#pragma deprecated(lstrcpy)
+#pragma deprecated(lstrcat)
+#pragma deprecated(wsprintf)
+#pragma deprecated(wvsprintf)
+#ifdef UNICODE
+#define lstrcpy    lstrcpyW
+#define lstrcat    lstrcatW
+#define wsprintf   wsprintfW
+#define wvsprintf  wvsprintfW
+#else
+#define lstrcpy    lstrcpyA
+#define lstrcat    lstrcatA
+#define wsprintf   wsprintfA
+#define wvsprintf  wvsprintfA
+#endif
+
+// Then the shlwapi names - they key off UNICODE also.
+#undef StrCpyA
+#undef StrCpy
+#undef StrCatA
+#undef StrCat
+#undef StrNCat
+#undef StrCatN
+#pragma deprecated(StrCpyA)
+#pragma deprecated(StrCatA)
+#pragma deprecated(StrCatN)
+#pragma deprecated(StrCpy)
+#pragma deprecated(StrCat)
+#pragma deprecated(StrNCat)
+#define StrCpyA lstrcpyA
+#define StrCatA lstrcatA
+#define StrCatN StrNCat
+#ifdef UNICODE
+#define StrCpy  StrCpyW
+#define StrCat  StrCatW
+#define StrNCat StrNCatW
+#else
+#define StrCpy  lstrcpyA
+#define StrCat  lstrcatA
+#define StrNCat StrNCatA
+#endif
+
+// Then all the CRT names - we need to undef/redef based on _UNICODE value.
+#undef _tcscpy
+#undef _ftcscpy
+#undef _tcscat
+#undef _ftcscat
+#undef _stprintf
+#undef _sntprintf
+#undef _vstprintf
+#undef _vsntprintf
+#undef _getts
+#pragma deprecated(_tcscpy)
+#pragma deprecated(_ftcscpy)
+#pragma deprecated(_tcscat)
+#pragma deprecated(_ftcscat)
+#pragma deprecated(_stprintf)
+#pragma deprecated(_sntprintf)
+#pragma deprecated(_vstprintf)
+#pragma deprecated(_vsntprintf)
+#pragma deprecated(_getts)
+#ifdef _UNICODE
+#define _tcscpy     wcscpy
+#define _ftcscpy    wcscpy
+#define _tcscat     wcscat
+#define _ftcscat    wcscat
+#define _stprintf   swprintf
+#define _sntprintf  _snwprintf
+#define _vstprintf  vswprintf
+#define _vsntprintf _vsnwprintf
+#define _getts      _getws
+#else
+#define _tcscpy     strcpy
+#define _ftcscpy    strcpy
+#define _tcscat     strcat
+#define _ftcscat    strcat
+#define _stprintf   sprintf
+#define _sntprintf  _snprintf
+#define _vstprintf  vsprintf
+#define _vsntprintf _vsnprintf
+#define _getts      gets
+#endif
+#else
+#undef strcpy
+#define strcpy      strcpy_instead_use_StringCbCopyA_or_StringCchCopyA;
+
+#undef strcpyA
+#define strcpyA     strcpyA_instead_use_StringCbCopyA_or_StringCchCopyA;
+
+#undef strcpyW
+#define strcpyW     strcpyW_instead_use_StringCbCopyW_or_StringCchCopyW;
+
+#undef lstrcpy
+#define lstrcpy     lstrcpy_instead_use_StringCbCopy_or_StringCchCopy;
+
+#undef lstrcpyA
+#define lstrcpyA    lstrcpyA_instead_use_StringCbCopyA_or_StringCchCopyA;
+
+#undef lstrcpyW
+#define lstrcpyW    lstrcpyW_instead_use_StringCbCopyW_or_StringCchCopyW;
+
+#undef StrCpy
+#define StrCpy      StrCpy_instead_use_StringCbCopy_or_StringCchCopy;
+
+#undef StrCpyA
+#define StrCpyA     StrCpyA_instead_use_StringCbCopyA_or_StringCchCopyA;
+
+#undef StrCpyW
+#define StrCpyW     StrCpyW_instead_use_StringCbCopyW_or_StringCchCopyW;
+
+#undef _tcscpy
+#define _tcscpy     _tcscpy_instead_use_StringCbCopy_or_StringCchCopy;
+
+#undef _ftcscpy
+#define _ftcscpy    _ftcscpy_instead_use_StringCbCopy_or_StringCchCopy;
+
+#undef wcscpy
+#define wcscpy      wcscpy_instead_use_StringCbCopyW_or_StringCchCopyW;
+
+#undef strcat
+#define strcat      strcat_instead_use_StringCbCatA_or_StringCchCatA;
+
+#undef lstrcat
+#define lstrcat     lstrcat_instead_use_StringCbCat_or_StringCchCat;
+
+#undef lstrcatA
+#define lstrcatA    lstrcatA_instead_use_StringCbCatA_or_StringCchCatA;
+
+#undef lstrcatW
+#define lstrcatW    lstrcatW_instead_use_StringCbCatW_or_StringCchCatW;
+
+#undef StrCat
+#define StrCat      StrCat_instead_use_StringCbCat_or_StringCchCat;
+
+#undef StrCatA
+#define StrCatA     StrCatA_instead_use_StringCbCatA_or_StringCchCatA;
+
+#undef StrCatW
+#define StrCatW     StrCatW_instead_use_StringCbCatW_or_StringCchCatW;
+
+#undef StrNCat
+#define StrNCat     StrNCat_instead_use_StringCbCatN_or_StringCchCatN;
+
+#undef StrNCatA
+#define StrNCatA    StrNCatA_instead_use_StringCbCatNA_or_StringCchCatNA;
+
+#undef StrNCatW
+#define StrNCatW    StrNCatW_instead_use_StringCbCatNW_or_StringCchCatNW;
+
+#undef StrCatN
+#define StrCatN     StrCatN_instead_use_StringCbCatN_or_StringCchCatN;
+
+#undef StrCatNA
+#define StrCatNA    StrCatNA_instead_use_StringCbCatNA_or_StringCchCatNA;
+
+#undef StrCatNW
+#define StrCatNW    StrCatNW_instead_use_StringCbCatNW_or_StringCchCatNW;
+
+#undef wcscat
+#define wcscat      wcscat_instead_use_StringCbCatW_or_StringCchCatW;
+
+#undef _tcscat
+#define _tcscat     _tcscat_instead_use_StringCbCat_or_StringCchCat;
+
+#undef _ftcscat
+#define _ftcscat    _ftcscat_instead_use_StringCbCat_or_StringCchCat;
+
+#undef wsprintf     
+#define wsprintf    wsprintf_instead_use_StringCbPrintf_or_StringCchPrintf;
+
+#undef wsprintfA
+#define wsprintfA   wsprintfA_instead_use_StringCbPrintfA_or_StringCchPrintfA;
+
+#undef wsprintfW
+#define wsprintfW   wsprintfW_instead_use_StringCbPrintfW_or_StringCchPrintfW;
+
+#undef sprintf
+#define sprintf     sprintf_instead_use_StringCbPrintfA_or_StringCchPrintfA;
+
+#undef swprintf
+#define swprintf    swprintf_instead_use_StringCbPrintfW_or_StringCchPrintfW;
+
+#undef _stprintf
+#define _stprintf   _stprintf_instead_use_StringCbPrintf_or_StringCchPrintf;
+
+#undef wvsprintf
+#define wvsprintf   wvsprintf_instead_use_StringCbVPrintf_or_StringCchVPrintf;
+
+#undef wvsprintfA
+#define wvsprintfA  wvsprintfA_instead_use_StringCbVPrintfA_or_StringCchVPrintfA;
+
+#undef wvsprintfW
+#define wvsprintfW  wvsprintfW_instead_use_StringCbVPrintfW_or_StringCchVPrintfW;
+
+#undef vsprintf
+#define vsprintf    vsprintf_instead_use_StringCbVPrintfA_or_StringCchVPrintfA;
+
+#undef vswprintf
+#define vswprintf   vswprintf_instead_use_StringCbVPrintfW_or_StringCchVPrintfW;
+
+#undef _vstprintf
+#define _vstprintf  _vstprintf_instead_use_StringCbVPrintf_or_StringCchVPrintf;
+
+#undef _vsnprintf
+#define _vsnprintf  _vsnprintf_instead_use_StringCbVPrintfA_or_StringCchVPrintfA;
+
+#undef _vsnwprintf
+#define _vsnwprintf _vsnwprintf_instead_use_StringCbVPrintfW_or_StringCchVPrintfW;
+
+#undef _vsntprintf
+#define _vsntprintf _vsntprintf_instead_use_StringCbVPrintf_or_StringCchVPrintf;
+
+#undef _snprintf
+#define _snprintf   _snprintf_instead_use_StringCbPrintfA_or_StringCchPrintfA;
+
+#undef _snwprintf
+#define _snwprintf  _snwprintf_instead_use_StringCbPrintfW_or_StringCchPrintfW;
+
+#undef _sntprintf
+#define _sntprintf  _sntprintf_instead_use_StringCbPrintf_or_StringCchPrintf;
+
+#undef _getts
+#define _getts      _getts_instead_use_StringCbGets_or_StringCchGets;
+
+#undef gets
+#define gets        _gets_instead_use_StringCbGetsA_or_StringCchGetsA;
+
+#undef _getws
+#define _getws      _getws_instead_use_StringCbGetsW_or_StringCchGetsW;
+#endif  // !DEPRECATE_SUPPORTED
+#endif  // !STRSAFE_NO_DEPRECATE
+
+#endif  // _STRSAFE_H_INCLUDED_
diff --git a/base/Windows/Inc/swprintf.inl b/base/Windows/Inc/swprintf.inl
new file mode 100644
index 0000000..921e7e3
--- /dev/null
+++ b/base/Windows/Inc/swprintf.inl
@@ -0,0 +1,129 @@
+/***
+*swprintf.inl - inline definitions for (v)swprintf
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file contains the function definitions for (v)swprintf
+*
+*       [Public]
+*
+****/
+
+#pragma once
+
+#if !defined(__CRTDECL)
+#if defined(_M_CEE_PURE) || defined(MRTDLL)
+#define __CRTDECL   __clrcall
+#else
+#define __CRTDECL   __cdecl
+#endif
+#endif
+
+
+#ifndef _INC_SWPRINTF_INL_
+#define _INC_SWPRINTF_INL_
+#ifndef RC_INVOKED
+
+#include <vadefs.h>
+
+#if defined(_M_CEE_MIXED)
+#pragma managed(push, off)
+#endif
+
+#pragma warning( push )
+#pragma warning( disable : 4793 4412 )
+static __inline int swprintf(wchar_t * _String, size_t _Count, const wchar_t * _Format, ...)
+{
+    va_list _Arglist;
+    int _Ret;
+    _crt_va_start(_Arglist, _Format);
+    _Ret = _vswprintf_c_l(_String, _Count, _Format, NULL, _Arglist);
+    _crt_va_end(_Arglist);
+    return _Ret;
+}
+#pragma warning( pop )
+
+#pragma warning( push )
+#pragma warning( disable : 4412 )
+static __inline int __CRTDECL vswprintf(wchar_t * _String, size_t _Count, const wchar_t * _Format, va_list _Ap)
+{
+    return _vswprintf_c_l(_String, _Count, _Format, NULL, _Ap);
+}
+#pragma warning( pop )
+#if defined(_M_CEE_MIXED)
+#pragma managed(pop)
+#endif
+
+#pragma warning( push )
+#pragma warning( disable : 4793 4412 )
+static __inline int _swprintf_l(wchar_t * _String, size_t _Count, const wchar_t * _Format, _locale_t _Plocinfo, ...)
+{
+    va_list _Arglist;
+    int _Ret;
+    _crt_va_start(_Arglist, _Plocinfo);
+    _Ret = _vswprintf_c_l(_String, _Count, _Format, _Plocinfo, _Arglist);
+    _crt_va_end(_Arglist);
+    return _Ret;
+}
+#pragma warning( pop )
+
+#pragma warning( push )
+#pragma warning( disable : 4412 )
+static __inline int __CRTDECL _vswprintf_l(wchar_t * _String, size_t _Count, const wchar_t * _Format, _locale_t _Plocinfo, va_list _Ap)
+{
+    return _vswprintf_c_l(_String, _Count, _Format, _Plocinfo, _Ap);
+}
+#pragma warning( pop )
+
+#ifdef __cplusplus
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+
+#pragma warning( push )
+#pragma warning( disable : 4793 4141 )
+extern "C++" _SWPRINTFS_DEPRECATED _CRT_INSECURE_DEPRECATE(swprintf_s) __inline int swprintf(__out_z wchar_t * _String, __in_z __format_string const wchar_t * _Format, ...)
+{
+    va_list _Arglist;
+    _crt_va_start(_Arglist, _Format);
+    int _Ret = _vswprintf(_String, _Format, _Arglist);
+    _crt_va_end(_Arglist);
+    return _Ret;
+}
+#pragma warning( pop )
+
+#pragma warning( push )
+#pragma warning( disable : 4141 )
+extern "C++" _SWPRINTFS_DEPRECATED _CRT_INSECURE_DEPRECATE(vswprintf_s) __inline int __CRTDECL vswprintf(__out_z wchar_t * _String, __in_z __format_string const wchar_t * _Format, va_list _Ap)
+{
+    return _vswprintf(_String, _Format, _Ap);
+}
+#pragma warning( pop )
+
+#pragma warning( push )
+#pragma warning( disable : 4793 4141 )
+extern "C++" _SWPRINTFS_DEPRECATED _CRT_INSECURE_DEPRECATE(_swprintf_s_l) __inline int _swprintf_l(__out_z wchar_t * _String, __in_z __format_string const wchar_t * _Format, _locale_t _Plocinfo, ...)
+{
+    va_list _Arglist;
+    _crt_va_start(_Arglist, _Plocinfo);
+    int _Ret = __vswprintf_l(_String, _Format, _Plocinfo, _Arglist);
+    _crt_va_end(_Arglist);
+    return _Ret;
+}
+#pragma warning( pop )
+
+#pragma warning( push )
+#pragma warning( disable : 4141 )
+extern "C++" _SWPRINTFS_DEPRECATED _CRT_INSECURE_DEPRECATE(_vswprintf_s_l) __inline int __CRTDECL _vswprintf_l(__out_z wchar_t * _String, __in_z __format_string const wchar_t * _Format, _locale_t _Plocinfo, va_list _Ap)
+{
+    return __vswprintf_l(_String, _Format, _Plocinfo, _Ap);
+}
+#pragma warning( pop )
+
+#pragma warning( pop )
+
+#endif  /* __cplusplus */
+
+#endif /* RC_INVOKED */
+#endif /* _INC_SWPRINTF_INL_ */
+
diff --git a/base/Windows/Inc/tchar.h b/base/Windows/Inc/tchar.h
new file mode 100644
index 0000000..57e85d4
--- /dev/null
+++ b/base/Windows/Inc/tchar.h
@@ -0,0 +1,2298 @@
+/***
+*tchar.h - definitions for generic international text functions
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       Definitions for generic international functions, mostly defines
+*       which map string/formatted-io/ctype functions to char, wchar_t, or
+*       MBCS versions.  To be used for compatibility between single-byte,
+*       multi-byte and Unicode text models.
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <crtdefs.h>
+
+#ifndef _INC_TCHAR
+#define _INC_TCHAR
+
+#ifdef _STRSAFE_H_INCLUDED_
+#error Need to include strsafe.h after tchar.h
+#endif
+
+#ifdef  _MSC_VER
+#pragma warning(disable:4514)       /* disable unwanted C++ /W4 warning */
+/* #pragma warning(default:4514) */ /* use this to reenable, if necessary */
+#endif  /* _MSC_VER */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifndef _CRT_FAR_MAPPINGS_NO_DEPRECATE
+/*
+Long ago, these f prefix text functions referred to handling of text in segmented architectures. Ever since the move
+to Win32 they have been obsolete names, but we kept them around as aliases. Now that we have a deprecation 
+mechanism we can warn about them. You should switch to the identical function without the f prefix.
+*/
+#pragma deprecated("_ftcscat")
+#pragma deprecated("_ftcschr")
+#pragma deprecated("_ftcscpy")
+#pragma deprecated("_ftcscspn")
+#pragma deprecated("_ftcslen")
+#pragma deprecated("_ftcsncat")
+#pragma deprecated("_ftcsncpy")
+#pragma deprecated("_ftcspbrk")
+#pragma deprecated("_ftcsrchr")
+#pragma deprecated("_ftcsspn")
+#pragma deprecated("_ftcsstr")
+#pragma deprecated("_ftcstok")
+#pragma deprecated("_ftcsdup")
+#pragma deprecated("_ftcsnset")
+#pragma deprecated("_ftcsrev")
+#pragma deprecated("_ftcsset")
+#pragma deprecated("_ftcscmp")
+#pragma deprecated("_ftcsicmp")
+#pragma deprecated("_ftcsnccmp")
+#pragma deprecated("_ftcsncmp")
+#pragma deprecated("_ftcsncicmp")
+#pragma deprecated("_ftcsnicmp")
+#pragma deprecated("_ftcscoll")
+#pragma deprecated("_ftcsicoll")
+#pragma deprecated("_ftcsnccoll")
+#pragma deprecated("_ftcsncoll")
+#pragma deprecated("_ftcsncicoll")
+#pragma deprecated("_ftcsnicoll")
+#pragma deprecated("_ftcsclen")
+#pragma deprecated("_ftcsnccat")
+#pragma deprecated("_ftcsnccpy")
+#pragma deprecated("_ftcsncset")
+#pragma deprecated("_ftcsdec")
+#pragma deprecated("_ftcsinc")
+#pragma deprecated("_ftcsnbcnt")
+#pragma deprecated("_ftcsnccnt")
+#pragma deprecated("_ftcsnextc")
+#pragma deprecated("_ftcsninc")
+#pragma deprecated("_ftcsspnp")
+#pragma deprecated("_ftcslwr")
+#pragma deprecated("_ftcsupr")
+#pragma deprecated("_ftclen")
+#pragma deprecated("_ftccpy")
+#pragma deprecated("_ftccmp")
+#endif /* ndef _CRT_FAR_MAPPINGS_NO_DEPRECATE */
+
+#define _ftcscat    _tcscat
+#define _ftcschr    _tcschr
+#define _ftcscpy    _tcscpy
+#define _ftcscspn   _tcscspn
+#define _ftcslen    _tcslen
+#define _ftcsncat   _tcsncat
+#define _ftcsncpy   _tcsncpy
+#define _ftcspbrk   _tcspbrk
+#define _ftcsrchr   _tcsrchr
+#define _ftcsspn    _tcsspn
+#define _ftcsstr    _tcsstr
+#define _ftcstok    _tcstok
+
+#define _ftcsdup    _tcsdup
+#define _ftcsnset   _tcsnset
+#define _ftcsrev    _tcsrev
+#define _ftcsset    _tcsset
+
+#define _ftcscmp      _tcscmp
+#define _ftcsicmp     _tcsicmp
+#define _ftcsnccmp    _tcsnccmp
+#define _ftcsncmp     _tcsncmp
+#define _ftcsncicmp   _tcsncicmp
+#define _ftcsnicmp    _tcsnicmp
+
+#define _ftcscoll     _tcscoll
+#define _ftcsicoll    _tcsicoll
+#define _ftcsnccoll   _tcsnccoll
+#define _ftcsncoll    _tcsncoll
+#define _ftcsncicoll  _tcsncicoll
+#define _ftcsnicoll   _tcsnicoll
+
+/* Redundant "logical-character" mappings */
+
+#define _ftcsclen   _tcsclen
+#define _ftcsnccat  _tcsnccat
+#define _ftcsnccpy  _tcsnccpy
+#define _ftcsncset  _tcsncset
+
+#define _ftcsdec    _tcsdec
+#define _ftcsinc    _tcsinc
+#define _ftcsnbcnt  _tcsnbcnt
+#define _ftcsnccnt  _tcsnccnt
+#define _ftcsnextc  _tcsnextc
+#define _ftcsninc   _tcsninc
+#define _ftcsspnp   _tcsspnp
+
+#define _ftcslwr    _tcslwr
+#define _ftcsupr    _tcsupr
+
+#define _ftclen     _tclen
+#define _ftccpy     _tccpy
+#define _ftccmp     _tccmp
+
+#ifndef _CONST_RETURN
+#ifdef  __cplusplus
+#define _CONST_RETURN  const
+#define _CRT_CONST_CORRECT_OVERLOADS
+#else
+#define _CONST_RETURN
+#endif
+#endif
+
+/* For backwards compatibility */
+#define _WConst_return _CONST_RETURN
+
+#ifdef  _UNICODE
+
+#ifdef  __cplusplus
+}   /* ... extern "C" */
+#endif
+
+/* ++++++++++++++++++++ UNICODE ++++++++++++++++++++ */
+
+#include <wchar.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifndef _WCTYPE_T_DEFINED
+typedef unsigned short wint_t;
+typedef unsigned short wctype_t;
+#define _WCTYPE_T_DEFINED
+#endif
+
+#ifndef __TCHAR_DEFINED
+typedef wchar_t     _TCHAR;
+typedef wchar_t     _TSCHAR;
+typedef wchar_t     _TUCHAR;
+typedef wchar_t     _TXCHAR;
+typedef wint_t      _TINT;
+#define __TCHAR_DEFINED
+#endif
+
+#ifndef _TCHAR_DEFINED
+#if     !__STDC__
+typedef wchar_t     TCHAR;
+#endif
+#define _TCHAR_DEFINED
+#endif
+
+#define _TEOF       WEOF
+
+#define __T(x)      L ## x
+
+
+/* Program */
+
+#define _tmain      wmain
+#define _tWinMain   wWinMain
+#define _tenviron   _wenviron
+#define __targv     __wargv
+
+/* Formatted i/o */
+
+#define _tprintf        wprintf
+#define _tprintf_l      _wprintf_l
+#define _tprintf_s      wprintf_s
+#define _tprintf_s_l    _wprintf_s_l
+#define _tprintf_p      _wprintf_p
+#define _tprintf_p_l    _wprintf_p_l
+#define _tcprintf       _cwprintf
+#define _tcprintf_l     _cwprintf_l
+#define _tcprintf_s     _cwprintf_s
+#define _tcprintf_s_l   _cwprintf_s_l
+#define _tcprintf_p     _cwprintf_p
+#define _tcprintf_p_l   _cwprintf_p_l
+#define _vtcprintf      _vcwprintf
+#define _vtcprintf_l    _vcwprintf_l
+#define _vtcprintf_s    _vcwprintf_s
+#define _vtcprintf_s_l  _vcwprintf_s_l
+#define _vtcprintf_p    _vcwprintf_p
+#define _vtcprintf_p_l  _vcwprintf_p_l
+#define _ftprintf       fwprintf
+#define _ftprintf_l     _fwprintf_l
+#define _ftprintf_s     fwprintf_s
+#define _ftprintf_s_l   _fwprintf_s_l
+#define _ftprintf_p     _fwprintf_p
+#define _ftprintf_p_l   _fwprintf_p_l
+#define _stprintf       _swprintf
+#define _stprintf_l     __swprintf_l
+#define _stprintf_s     swprintf_s
+#define _stprintf_s_l   _swprintf_s_l
+#define _stprintf_p     _swprintf_p
+#define _stprintf_p_l   _swprintf_p_l
+#define _sctprintf      _scwprintf
+#define _sctprintf_l    _scwprintf_l
+#define _sctprintf_p    _scwprintf_p
+#define _sctprintf_p_l  _scwprintf_p_l
+#define _sntprintf      _snwprintf
+#define _sntprintf_l    _snwprintf_l
+#define _sntprintf_s    _snwprintf_s
+#define _sntprintf_s_l  _snwprintf_s_l
+#define _vtprintf       vwprintf
+#define _vtprintf_l     _vwprintf_l
+#define _vtprintf_s     vwprintf_s
+#define _vtprintf_s_l   _vwprintf_s_l
+#define _vtprintf_p     _vwprintf_p
+#define _vtprintf_p_l   _vwprintf_p_l
+#define _vftprintf      vfwprintf
+#define _vftprintf_l    _vfwprintf_l
+#define _vftprintf_s    vfwprintf_s
+#define _vftprintf_s_l  _vfwprintf_s_l
+#define _vftprintf_p    _vfwprintf_p
+#define _vftprintf_p_l  _vfwprintf_p_l
+#define _vstprintf      _vswprintf
+#define _vstprintf_l    _vswprintf_l
+#define _vstprintf_s    vswprintf_s
+#define _vstprintf_s_l  _vswprintf_s_l
+#define _vstprintf_p    _vswprintf_p
+#define _vstprintf_p_l  _vswprintf_p_l
+#define _vsctprintf     _vscwprintf
+#define _vsctprintf_l   _vscwprintf_l
+#define _vsctprintf_p   _vscwprintf_p
+#define _vsctprintf_p_l _vscwprintf_p_l
+#define _vsntprintf     _vsnwprintf
+#define _vsntprintf_l   _vsnwprintf_l
+#define _vsntprintf_s   _vsnwprintf_s
+#define _vsntprintf_s_l _vsnwprintf_s_l
+
+#define _tscanf         wscanf
+#define _tscanf_l       _wscanf_l
+#define _tscanf_s       wscanf_s
+#define _tscanf_s_l     _wscanf_s_l
+#define _tcscanf        _cwscanf
+#define _tcscanf_l      _cwscanf_l
+#define _tcscanf_s      _cwscanf_s
+#define _tcscanf_s_l    _cwscanf_s_l
+#define _ftscanf        fwscanf
+#define _ftscanf_l      _fwscanf_l
+#define _ftscanf_s      fwscanf_s
+#define _ftscanf_s_l    _fwscanf_s_l
+#define _stscanf        swscanf
+#define _stscanf_l      _swscanf_l
+#define _stscanf_s      swscanf_s
+#define _stscanf_s_l    _swscanf_s_l
+#define _sntscanf       _snwscanf
+#define _sntscanf_l     _snwscanf_l
+#define _sntscanf_s     _snwscanf_s
+#define _sntscanf_s_l   _snwscanf_s_l
+
+
+/* Unformatted i/o */
+
+#define _fgettc         fgetwc
+#define _fgettc_nolock  _fgetwc_nolock
+#define _fgettchar      _fgetwchar
+#define _fgetts         fgetws
+#define _fputtc         fputwc
+#define _fputtc_nolock  _fputwc_nolock
+#define _fputtchar      _fputwchar
+#define _fputts         fputws
+#define _cputts         _cputws
+#define _cgetts         _cgetws
+#define _cgetts_s       _cgetws_s
+#define _gettc          getwc
+#define _gettc_nolock   _getwc_nolock
+#define _gettch         _getwch
+#define _gettch_nolock  _getwch_nolock
+#define _gettche        _getwche
+#define _gettche_nolock _getwche_nolock
+#define _gettchar       getwchar
+#define _gettchar_nolock _getwchar_nolock
+#define _getts          _getws
+#define _getts_s        _getws_s
+#define _puttc          putwc
+#define _puttc_nolock   _putwc_nolock
+#define _puttchar       putwchar
+#define _puttchar_nolock _putwchar_nolock
+#define _puttch         _putwch
+#define _puttch_nolock  _putwch_nolock
+#define _putts          _putws
+#define _ungettc        ungetwc
+#define _ungettc_nolock _ungetwc_nolock
+#define _ungettch       _ungetwch
+#define _ungettch_nolock _ungetwch_nolock
+
+
+/* String conversion functions */
+
+#define _tcstod     wcstod
+#define _tcstol     wcstol
+#define _tcstoul    wcstoul
+#define _tcstoi64   _wcstoi64
+#define _tcstoui64  _wcstoui64
+#define _tstof      _wtof
+#define _tstol      _wtol
+#define _tstoi      _wtoi
+#define _tstoi64    _wtoi64
+#define _tcstod_l     _wcstod_l
+#define _tcstol_l     _wcstol_l
+#define _tcstoul_l    _wcstoul_l
+#define _tcstoi64_l   _wcstoi64_l
+#define _tcstoui64_l  _wcstoui64_l
+#define _tstof_l      _wtof_l
+#define _tstol_l      _wtol_l
+#define _tstoi_l      _wtoi_l
+#define _tstoi64_l    _wtoi64_l
+
+#define _itot_s     _itow_s
+#define _ltot_s     _ltow_s
+#define _ultot_s    _ultow_s
+#define _itot       _itow
+#define _ltot       _ltow
+#define _ultot      _ultow
+#define _ttoi       _wtoi
+#define _ttol       _wtol
+
+#define _ttoi64     _wtoi64
+#define _i64tot_s   _i64tow_s
+#define _ui64tot_s  _ui64tow_s
+#define _i64tot     _i64tow
+#define _ui64tot    _ui64tow
+
+/* String functions */
+
+#define _tcscat         wcscat
+#define _tcscat_s       wcscat_s
+#define _tcschr         wcschr
+#define _tcscpy         wcscpy
+#define _tcscpy_s       wcscpy_s
+#define _tcscspn        wcscspn
+#define _tcslen         wcslen
+#define _tcsnlen        wcsnlen
+#define _tcsncat        wcsncat
+#define _tcsncat_s      wcsncat_s
+#define _tcsncat_l      _wcsncat_l
+#define _tcsncat_s_l    _wcsncat_s_l
+#define _tcsncpy        wcsncpy
+#define _tcsncpy_s      wcsncpy_s
+#define _tcsncpy_l      _wcsncpy_l
+#define _tcsncpy_s_l    _wcsncpy_s_l
+#define _tcspbrk        wcspbrk
+#define _tcsrchr        wcsrchr
+#define _tcsspn         wcsspn
+#define _tcsstr         wcsstr
+#define _tcstok         wcstok
+#define _tcstok_s       wcstok_s
+#define _tcstok_l       _wcstok_l
+#define _tcstok_s_l     _wcstok_s_l
+#define _tcserror       _wcserror
+#define _tcserror_s     _wcserror_s
+#define __tcserror      __wcserror
+#define __tcserror_s    __wcserror_s
+
+#define _tcsdup         _wcsdup
+#define _tcsnset        _wcsnset
+#define _tcsnset_s      _wcsnset_s
+#define _tcsnset_l      _wcsnset_l
+#define _tcsnset_s_l    _wcsnset_s_l
+#define _tcsrev         _wcsrev
+#define _tcsset         _wcsset
+#define _tcsset_s       _wcsset_s
+#define _tcsset_l       _wcsset_l
+#define _tcsset_s_l     _wcsset_s_l
+
+#define _tcscmp         wcscmp
+#define _tcsicmp        _wcsicmp
+#define _tcsicmp_l      _wcsicmp_l
+#define _tcsnccmp       wcsncmp
+#define _tcsncmp        wcsncmp
+#define _tcsncicmp      _wcsnicmp
+#define _tcsncicmp_l    _wcsnicmp_l
+#define _tcsnicmp       _wcsnicmp
+#define _tcsnicmp_l     _wcsnicmp_l
+
+#define _tcscoll        wcscoll
+#define _tcscoll_l      _wcscoll_l
+#define _tcsicoll       _wcsicoll
+#define _tcsicoll_l     _wcsicoll_l
+#define _tcsnccoll      _wcsncoll
+#define _tcsnccoll_l    _wcsncoll_l
+#define _tcsncoll       _wcsncoll
+#define _tcsncoll_l     _wcsncoll_l
+#define _tcsncicoll     _wcsnicoll
+#define _tcsncicoll_l   _wcsnicoll_l
+#define _tcsnicoll      _wcsnicoll
+#define _tcsnicoll_l    _wcsnicoll_l
+
+#ifdef _DEBUG
+#define _tcsdup_dbg _wcsdup_dbg
+#endif
+
+/* Execute functions */
+
+#define _texecl     _wexecl
+#define _texecle    _wexecle
+#define _texeclp    _wexeclp
+#define _texeclpe   _wexeclpe
+#define _texecv     _wexecv
+#define _texecve    _wexecve
+#define _texecvp    _wexecvp
+#define _texecvpe   _wexecvpe
+
+#define _tspawnl    _wspawnl
+#define _tspawnle   _wspawnle
+#define _tspawnlp   _wspawnlp
+#define _tspawnlpe  _wspawnlpe
+#define _tspawnv    _wspawnv
+#define _tspawnve   _wspawnve
+#define _tspawnvp   _wspawnvp
+#define _tspawnvp   _wspawnvp
+#define _tspawnvpe  _wspawnvpe
+
+#define _tsystem    _wsystem
+
+
+/* Time functions */
+
+#define _tasctime   _wasctime
+#define _tctime     _wctime
+#define _tctime32   _wctime32
+#define _tctime64   _wctime64
+#define _tstrdate   _wstrdate
+#define _tstrtime   _wstrtime
+#define _tutime     _wutime
+#define _tutime32   _wutime32
+#define _tutime64   _wutime64
+#define _tcsftime   wcsftime
+#define _tcsftime_l _wcsftime_l
+
+#define _tasctime_s   _wasctime_s
+#define _tctime_s     _wctime_s
+#define _tctime32_s   _wctime32_s
+#define _tctime64_s   _wctime64_s
+#define _tstrdate_s   _wstrdate_s
+#define _tstrtime_s   _wstrtime_s
+
+/* Directory functions */
+
+#define _tchdir             _wchdir
+#define _tgetcwd            _wgetcwd
+#define _tgetdcwd           _wgetdcwd
+#define _tgetdcwd_nolock    _wgetdcwd_nolock
+#define _tmkdir             _wmkdir
+#define _trmdir             _wrmdir
+
+#ifdef _DEBUG
+#define _tgetcwd_dbg        _wgetcwd_dbg
+#define _tgetdcwd_dbg       _wgetdcwd_dbg
+#define _tgetdcwd_lk_dbg    _wgetdcwd_lk_dbg
+#endif
+
+/* Environment/Path functions */
+
+#define _tfullpath      _wfullpath
+#define _tgetenv        _wgetenv
+#define _tgetenv_s      _wgetenv_s
+#define _tdupenv_s      _wdupenv_s
+#define _tmakepath      _wmakepath
+#define _tmakepath_s    _wmakepath_s
+#define _tpgmptr        _wpgmptr
+#define _get_tpgmptr    _get_wpgmptr
+#define _tputenv        _wputenv
+#define _tputenv_s      _wputenv_s
+#define _tsearchenv     _wsearchenv
+#define _tsearchenv_s   _wsearchenv_s
+#define _tsplitpath     _wsplitpath
+#define _tsplitpath_s   _wsplitpath_s
+
+#ifdef _DEBUG
+#define _tfullpath_dbg  _wfullpath_dbg
+#define _tdupenv_s_dbg  _wdupenv_s_dbg
+#endif
+
+/* Stdio functions */
+
+#define _tfdopen    _wfdopen
+#define _tfsopen    _wfsopen
+#define _tfopen     _wfopen
+#define _tfopen_s   _wfopen_s
+#define _tfreopen   _wfreopen
+#define _tfreopen_s _wfreopen_s
+#define _tperror    _wperror
+#define _tpopen     _wpopen
+#define _ttempnam   _wtempnam
+#define _ttmpnam    _wtmpnam
+#define _ttmpnam_s  _wtmpnam_s
+
+#ifdef _DEBUG
+#define _ttempnam_dbg   _wtempnam_dbg
+#endif
+
+
+/* Io functions */
+
+#define _taccess    _waccess
+#define _taccess_s  _waccess_s
+#define _tchmod     _wchmod
+#define _tcreat     _wcreat
+#define _tfindfirst       _wfindfirst
+#define _tfindfirst32     _wfindfirst32
+#define _tfindfirst64     _wfindfirst64
+#define _tfindfirsti64    _wfindfirsti64
+#define _tfindfirst32i64  _wfindfirst32i64
+#define _tfindfirst64i32  _wfindfirst64i32
+#define _tfindnext        _wfindnext
+#define _tfindnext32      _wfindnext32
+#define _tfindnext64      _wfindnext64
+#define _tfindnexti64     _wfindnexti64
+#define _tfindnext32i64   _wfindnext32i64
+#define _tfindnext64i32   _wfindnext64i32
+#define _tmktemp    _wmktemp
+#define _tmktemp_s  _wmktemp_s
+#define _topen      _wopen
+#define _tremove    _wremove
+#define _trename    _wrename
+#define _tsopen     _wsopen
+#define _tsopen_s   _wsopen_s
+#define _tunlink    _wunlink
+
+#define _tfinddata_t      _wfinddata_t
+#define _tfinddata32_t    _wfinddata32_t
+#define _tfinddata64_t    _wfinddata64_t
+#define _tfinddatai64_t   _wfinddatai64_t
+#define _tfinddata32i64_t _wfinddata32i64_t
+#define _tfinddata64i32_t _wfinddata64i32_t
+
+
+/* Stat functions */
+
+#define _tstat      _wstat
+#define _tstat32    _wstat32
+#define _tstat32i64 _wstat32i64
+#define _tstat64    _wstat64
+#define _tstat64i32 _wstat64i32
+#define _tstati64   _wstati64
+
+
+/* Setlocale functions */
+
+#define _tsetlocale _wsetlocale
+
+
+/* Redundant "logical-character" mappings */
+
+#define _tcsclen        wcslen
+#define _tcscnlen       wcsnlen
+#define _tcsclen_l(_String, _Locale) wcslen(_String)
+#define _tcscnlen_l(_String, _Max_count, _Locale) wcsnlen_l((_String), (_Max_count))
+#define _tcsnccat       wcsncat
+#define _tcsnccat_s     wcsncat_s
+#define _tcsnccat_l     _wcsncat_l
+#define _tcsnccat_s_l   _wcsncat_s_l
+#define _tcsnccpy       wcsncpy
+#define _tcsnccpy_s     wcsncpy_s
+#define _tcsnccpy_l     _wcsncpy_l
+#define _tcsnccpy_s_l   _wcsncpy_s_l
+#define _tcsncset       _wcsnset
+
+#define _tcsdec     _wcsdec
+#define _tcsinc     _wcsinc
+#define _tcsnbcnt   _wcsncnt
+#define _tcsnccnt   _wcsncnt
+#define _tcsnextc   _wcsnextc
+#define _tcsninc    _wcsninc
+#define _tcsspnp    _wcsspnp
+
+#define _tcslwr     _wcslwr
+#define _tcslwr_l   _wcslwr_l
+#define _tcslwr_s   _wcslwr_s
+#define _tcslwr_s_l _wcslwr_s_l
+#define _tcsupr     _wcsupr
+#define _tcsupr_l   _wcsupr_l
+#define _tcsupr_s   _wcsupr_s
+#define _tcsupr_s_l _wcsupr_s_l
+#define _tcsxfrm    wcsxfrm
+#define _tcsxfrm_l  _wcsxfrm_l
+
+
+#if     __STDC__ || defined(_NO_INLINING)
+#define _tclen(_pc) (1)
+#define _tccpy(_pc1,_cpc2) ((*(_pc1) = *(_cpc2)))
+#define _tccmp(_cpc1,_cpc2) ((*(_cpc1))-(*(_cpc2)))
+#else   /* __STDC__ */
+__inline __checkReturn size_t __CRTDECL _tclen(__in_z const wchar_t *_Cpc)
+{ 
+    /* avoid compiler warning */
+    (void *)_Cpc;
+    return 1;
+}
+__inline void __CRTDECL _tccpy(__out wchar_t *_Pc1, __in_z const wchar_t *_Cpc2) { *_Pc1 = (wchar_t)*_Cpc2; }
+__inline __checkReturn int __CRTDECL _tccmp(__in_z const wchar_t *_Cpc1, __in_z const wchar_t *_Cpc2) { return (int) ((*_Cpc1)-(*_Cpc2)); }
+#endif  /* __STDC__ */
+
+/* ctype functions */
+
+#define _istalnum   iswalnum
+#define _istalnum_l   _iswalnum_l
+#define _istalpha   iswalpha
+#define _istalpha_l   _iswalpha_l
+#define _istascii   iswascii
+#define _istcntrl   iswcntrl
+#define _istcntrl_l   _iswcntrl_l
+#define _istdigit   iswdigit
+#define _istdigit_l   _iswdigit_l
+#define _istgraph   iswgraph
+#define _istgraph_l   _iswgraph_l
+#define _istlower   iswlower
+#define _istlower_l   _iswlower_l
+#define _istprint   iswprint
+#define _istprint_l   _iswprint_l
+#define _istpunct   iswpunct
+#define _istpunct_l   _iswpunct_l
+#define _istspace   iswspace
+#define _istspace_l   _iswspace_l
+#define _istupper   iswupper
+#define _istupper_l   _iswupper_l
+#define _istxdigit  iswxdigit
+#define _istxdigit_l  _iswxdigit_l
+
+#define _totupper   towupper
+#define _totupper_l   _towupper_l
+#define _totlower   towlower
+#define _totlower_l   _towlower_l
+
+#define _istlegal(_Char)                (1)
+#define _istlead(_Char)                 (0)
+#define _istleadbyte(_Char)             (0)
+#define _istleadbyte_l(_Char, _Locale)  (0)
+
+
+#if     __STDC__ || defined(_NO_INLINING)
+#define _wcsdec(_cpc1, _cpc2) ((_cpc1)>=(_cpc2) ? NULL : (_cpc2)-1)
+#define _wcsinc(_pc)    ((_pc)+1)
+#define _wcsnextc(_cpc) ((unsigned int) *(_cpc))
+#define _wcsninc(_pc, _sz) (((_pc)+(_sz)))
+_CRTIMP __checkReturn size_t __cdecl __wcsncnt(__in_ecount_z(_MaxCount) const wchar_t * _Str, __in size_t _MaxCount);
+#define _wcsncnt(_cpc, _sz) (__wcsncnt(_cpc,_sz))
+#define _wcsspnp(_cpc1, _cpc2)                                                          (_cpc1==NULL ? NULL : ((*((_cpc1)+wcsspn(_cpc1,_cpc2))) ? ((_cpc1)+wcsspn(_cpc1,_cpc2)) : NULL))
+#define _wcsncpy_l(_Destination, _Source, _Count, _Locale)                              (wcsncpy(_Destination, _Source, _Count))
+#if __STDC_WANT_SECURE_LIB__
+#define _wcsncpy_s_l(_Destination, _Destination_size_chars, _Source, _Count, _Locale)   (wcsncpy_s(_Destination, _Destination_size_chars, _Source, _Count))
+#endif
+#define _wcsncat_l(_Destination, _Source, _Count, _Locale)                              (wcsncat(_Destination, _Source, _Count))
+#if __STDC_WANT_SECURE_LIB__
+#define _wcsncat_s_l(_Destination, _Destination_size_chars, _Source, _Count, _Locale)   (wcsncat_s(_Destination, _Destination_size_chars, _Source, _Count))
+#endif
+#define _wcstok_l(_String, _Delimiters, _Locale)                                        (wcstok(_String, _Delimiters))
+#define _wcstok_s_l(_String, _Delimiters, _Current_position, _Locale)                   (wcstok_s(_String, _Delimiters, _Current_position))
+#define _wcsnset_l(_Destination, _Value, _Count, _Locale)                               (_wcsnset(_Destination, _Value, _Count))
+#define _wcsnset_s_l(_Destination, _Destination_size_chars, _Value, _Count, _Locale)    (_wcsnset_s(_Destination, _Destination_size_chars, _Value, _Count))
+#define _wcsset_l(_Destination, _Value, _Locale)                                        (_wcsset(_Destination, _Value))
+#define _wcsset_s_l(_Destination, _Destination_size_chars, _Value, _Locale)             (_wcsset_s(_Destination, _Destination_size_chars, _Value))
+#else   /* __STDC__ */
+__inline __checkReturn wchar_t * __CRTDECL _wcsdec(__in_z const wchar_t * _Cpc1, __in_z const wchar_t * _Cpc2) { return (wchar_t *)((_Cpc1)>=(_Cpc2) ? NULL : ((_Cpc2)-1)); }
+__inline __checkReturn wchar_t * __CRTDECL _wcsinc(__in_z const wchar_t * _Pc) { return (wchar_t *)(_Pc+1); }
+__inline __checkReturn unsigned int __CRTDECL _wcsnextc(__in_z const wchar_t * _Cpc) { return (unsigned int)*_Cpc; }
+__inline __checkReturn wchar_t * __CRTDECL _wcsninc(__in_z const wchar_t * _Pc, __in size_t _Sz) { return (wchar_t *)(_Pc+_Sz); }
+__inline __checkReturn size_t __CRTDECL _wcsncnt( __in_ecount_z(_Cnt) const wchar_t * _String, __in size_t _Cnt) 
+{ 
+        size_t n = _Cnt; 
+        wchar_t *cp = (wchar_t *)_String; 
+        while (n-- && *cp) 
+                cp++; 
+        return _Cnt - n - 1; 
+}
+__inline __checkReturn wchar_t * __CRTDECL _wcsspnp
+( 
+    __in_z const wchar_t * _Cpc1, 
+    __in_z const wchar_t * _Cpc2
+)
+{
+    return _Cpc1==NULL ? NULL : ((*(_Cpc1 += wcsspn(_Cpc1,_Cpc2))!='\0') ? (wchar_t*)_Cpc1 : NULL); 
+}
+
+__inline wchar_t * __CRTDECL _wcsncpy_l(__out_ecount(_Count) wchar_t *_Destination, __in_z const wchar_t *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 6054)
+    return wcsncpy(_Destination, _Source, _Count);
+#pragma warning( pop )
+}
+
+#if __STDC_WANT_SECURE_LIB__
+__inline __checkReturn_wat errno_t __CRTDECL _wcsncpy_s_l(__out_ecount_z(_Destination_size_chars) wchar_t *_Destination, __in size_t _Destination_size_chars, __in_z const wchar_t *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return wcsncpy_s(_Destination, _Destination_size_chars, _Source, _Count);
+#pragma warning( pop )
+}
+#endif
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _wcsncpy_s_l, __out_ecount(_Size) wchar_t, _Dest, __in_z const wchar_t *, _Source, __in size_t, _Count, __in_opt _locale_t, _Locale)
+
+__inline wchar_t * __CRTDECL _wcsncat_l(__inout_z wchar_t *_Destination, __in_z const wchar_t *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 6054 6059)
+/* prefast noise VSW 489802 */
+	return wcsncat(_Destination, _Source, _Count);
+#pragma warning( pop )
+}
+
+#if __STDC_WANT_SECURE_LIB__
+__inline __checkReturn_wat errno_t __CRTDECL _wcsncat_s_l(__inout_ecount_z(_Destination_size_chars) wchar_t *_Destination, __in size_t _Destination_size_chars, __in_z const wchar_t *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return wcsncat_s(_Destination, _Destination_size_chars, _Source, _Count);
+#pragma warning( pop )
+}
+#endif
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _wcsncat_s_l, __inout_ecount(_Size) wchar_t, _Dest, __in_z const wchar_t *, _Source, __in size_t, _Count, __in_opt _locale_t, _Locale)
+
+__inline wchar_t * _wcstok_l(__inout_z_opt wchar_t * _String, __in_z const wchar_t * _Delimiters, __in_opt _locale_t _Locale) 
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning(push)
+#pragma warning(disable:4996)
+	return wcstok(_String,_Delimiters);
+#pragma warning(pop)
+}
+
+__inline wchar_t * _wcstok_s_l(__inout_z_opt wchar_t * _String, __in_z const wchar_t * _Delimiters, __deref_inout_z_opt wchar_t **_Current_position, __in_opt _locale_t _Locale) 
+{
+    _CRT_UNUSED(_Locale);
+    return wcstok_s(_String, _Delimiters, _Current_position);
+}
+
+__inline wchar_t * __CRTDECL _wcsnset_l(__inout_z wchar_t * _Destination, __in_z wchar_t _Value, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _wcsnset(_Destination, _Value, _Count);
+#pragma warning( pop )
+}
+
+__inline errno_t _wcsnset_s_l(__inout_ecount_z(_Destination_size_chars) wchar_t * _Destination, __in size_t _Destination_size_chars, __in_z wchar_t _Value, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+    _CRT_UNUSED(_Locale);
+    return _wcsnset_s(_Destination, _Destination_size_chars, _Value, _Count);
+}
+
+__inline wchar_t * __CRTDECL _wcsset_l(__inout_z wchar_t * _Destination, __in_z wchar_t _Value, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _wcsset(_Destination, _Value);
+#pragma warning( pop )
+}
+
+__inline errno_t _wcsset_s_l(__inout_ecount_z(_Destination_size_chars) wchar_t * _Destination, __in size_t _Destination_size_chars, __in_z wchar_t _Value, __in_opt _locale_t _Locale) 
+{
+    _CRT_UNUSED(_Locale);
+    return _wcsset_s(_Destination, _Destination_size_chars, _Value);
+}
+
+#endif  /* __STDC__ */
+
+
+#else   /* ndef _UNICODE */
+
+/* ++++++++++++++++++++ SBCS and MBCS ++++++++++++++++++++ */
+
+#ifdef  __cplusplus
+}   /* ... extern "C" */
+#endif
+
+#include <string.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+#define _TEOF       EOF
+
+#define __T(x)      x
+
+
+/* Program */
+
+#define _tmain      main
+#define _tWinMain   WinMain
+#ifdef  _POSIX_
+#define _tenviron   environ
+#else
+#define _tenviron  _environ
+#endif
+#define __targv     __argv
+
+
+/* Formatted i/o */
+
+#define _tprintf        printf
+#define _tprintf_l      _printf_l
+#define _tprintf_s      printf_s
+#define _tprintf_s_l    _printf_s_l
+#define _tprintf_p      _printf_p
+#define _tprintf_p_l    _printf_p_l
+#define _tcprintf       _cprintf
+#define _tcprintf_l     _cprintf_l
+#define _tcprintf_s     _cprintf_s
+#define _tcprintf_s_l   _cprintf_s_l
+#define _tcprintf_p     _cprintf_p
+#define _tcprintf_p_l   _cprintf_p_l
+#define _vtcprintf      _vcprintf
+#define _vtcprintf_l    _vcprintf_l
+#define _vtcprintf_s    _vcprintf_s
+#define _vtcprintf_s_l  _vcprintf_s_l
+#define _vtcprintf_p    _vcprintf_p
+#define _vtcprintf_p_l  _vcprintf_p_l
+#define _ftprintf       fprintf
+#define _ftprintf_l     _fprintf_l
+#define _ftprintf_s     fprintf_s
+#define _ftprintf_s_l   _fprintf_s_l
+#define _ftprintf_p     _fprintf_p
+#define _ftprintf_p_l   _fprintf_p_l
+#define _stprintf       sprintf
+#define _stprintf_l     _sprintf_l
+#define _stprintf_s     sprintf_s
+#define _stprintf_s_l   _sprintf_s_l
+#define _stprintf_p     _sprintf_p
+#define _stprintf_p_l   _sprintf_p_l
+#define _sctprintf      _scprintf
+#define _sctprintf_l    _scprintf_l
+#define _sctprintf_p    _scprintf_p
+#define _sctprintf_p_l  _scprintf_p_l
+#define _sntprintf      _snprintf
+#define _sntprintf_l    _snprintf_l
+#define _sntprintf_s    _snprintf_s
+#define _sntprintf_s_l  _snprintf_s_l
+#define _vtprintf       vprintf
+#define _vtprintf_l     _vprintf_l
+#define _vtprintf_s     vprintf_s
+#define _vtprintf_s_l   _vprintf_s_l
+#define _vtprintf_p     _vprintf_p
+#define _vtprintf_p_l   _vprintf_p_l
+#define _vftprintf      vfprintf
+#define _vftprintf_l    _vfprintf_l
+#define _vftprintf_s    vfprintf_s
+#define _vftprintf_s_l  _vfprintf_s_l
+#define _vftprintf_p    _vfprintf_p
+#define _vftprintf_p_l  _vfprintf_p_l
+#define _vstprintf      vsprintf
+#define _vstprintf_l    _vsprintf_l
+#define _vstprintf_s    vsprintf_s
+#define _vstprintf_s_l  _vsprintf_s_l
+#define _vstprintf_p    _vsprintf_p
+#define _vstprintf_p_l  _vsprintf_p_l
+#define _vsctprintf     _vscprintf
+#define _vsctprintf_l   _vscprintf_l
+#define _vsctprintf_p   _vscprintf_p
+#define _vsctprintf_p_l _vscprintf_p_l
+#define _vsntprintf     _vsnprintf
+#define _vsntprintf_l   _vsnprintf_l
+#define _vsntprintf_s   _vsnprintf_s
+#define _vsntprintf_s_l _vsnprintf_s_l
+
+#define _tscanf         scanf
+#define _tscanf_l       _scanf_l
+#define _tscanf_s       scanf_s
+#define _tscanf_s_l     _scanf_s_l
+#define _tcscanf        _cscanf
+#define _tcscanf_l      _cscanf_l
+#define _tcscanf_s      _cscanf_s
+#define _tcscanf_s_l    _cscanf_s_l
+#define _ftscanf        fscanf
+#define _ftscanf_l      _fscanf_l
+#define _ftscanf_s      fscanf_s
+#define _ftscanf_s_l    _fscanf_s_l
+#define _stscanf        sscanf
+#define _stscanf_l      _sscanf_l
+#define _stscanf_s      sscanf_s
+#define _stscanf_s_l    _sscanf_s_l
+#define _sntscanf       _snscanf
+#define _sntscanf_l     _snscanf_l
+#define _sntscanf_s     _snscanf_s
+#define _sntscanf_s_l   _snscanf_s_l
+
+
+/* Unformatted i/o */
+
+#define _fgettc         fgetc
+#define _fgettc_nolock  _fgetc_nolock
+#define _fgettchar      _fgetchar
+#define _fgetts         fgets
+#define _fputtc         fputc
+#define _fputtc_nolock  _fputc_nolock
+#define _fputtchar      _fputchar
+#define _fputts         fputs
+#define _cputts         _cputs
+#define _gettc          getc
+#define _gettc_nolock   _getc_nolock
+#define _gettch         _getch
+#define _gettch_nolock  _getch_nolock
+#define _gettche        _getche
+#define _gettche_nolock _getche_nolock
+#define _gettchar       getchar
+#define _gettchar_nolock _getchar_nolock
+#define _getts          gets
+#define _getts_s        gets_s
+#define _cgetts         _cgets
+#define _cgetts_s       _cgets_s
+#define _puttc          putc
+#define _puttc_nolock   _putc_nolock
+#define _puttchar       putchar
+#define _puttchar_nolock _putchar_nolock
+#define _puttch         _putch
+#define _puttch_nolock  _putch_nolock
+#define _putts          puts
+#define _ungettc        ungetc
+#define _ungettc_nolock _ungetc_nolock
+#define _ungettch       _ungetch
+#define _ungettch_nolock _ungetch_nolock
+
+/* String conversion functions */
+
+#define _tcstod     strtod
+#define _tcstol     strtol
+#define _tcstoul    strtoul
+#define _tstof      atof
+#define _tstol      atol
+#define _tstoi      atoi
+#define _tstoi64    _atoi64
+#define _tcstod_l     _strtod_l
+#define _tcstol_l     _strtol_l
+#define _tcstoul_l    _strtoul_l
+#define _tstof_l      _atof_l
+#define _tstol_l      _atol_l
+#define _tstoi_l      _atoi_l
+#define _tstoi64_l    _atoi64_l
+
+#define _itot_s     _itoa_s
+#define _ltot_s     _ltoa_s
+#define _ultot_s    _ultoa_s
+#define _itot       _itoa
+#define _ltot       _ltoa
+#define _ultot      _ultoa
+#define _ttoi       atoi
+#define _ttol       atol
+
+#define _ttoi64     _atoi64
+#define _tcstoi64   _strtoi64
+#define _tcstoi64_l   _strtoi64_l
+#define _tcstoui64  _strtoui64
+#define _tcstoui64_l  _strtoui64_l
+#define _i64tot_s   _i64toa_s
+#define _ui64tot_s  _ui64toa_s
+#define _i64tot     _i64toa
+#define _ui64tot    _ui64toa
+
+/* String functions */
+
+/* Note that _mbscat, _mbscpy and _mbsdup are functionally equivalent to 
+   strcat, strcpy and strdup, respectively. */
+
+#define _tcscat     strcat
+#define _tcscat_s   strcat_s
+#define _tcscpy     strcpy
+#define _tcscpy_s   strcpy_s
+#define _tcsdup     _strdup
+#define _tcslen     strlen
+#define _tcsnlen    strnlen
+#define _tcsxfrm    strxfrm
+#define _tcsxfrm_l    _strxfrm_l
+#define _tcserror   strerror
+#define _tcserror_s   strerror_s
+#define __tcserror  _strerror
+#define __tcserror_s  _strerror_s
+
+#ifdef _DEBUG
+#define _tcsdup_dbg _strdup_dbg
+#endif
+
+/* Execute functions */
+
+#define _texecl     _execl
+#define _texecle    _execle
+#define _texeclp    _execlp
+#define _texeclpe   _execlpe
+#define _texecv     _execv
+#define _texecve    _execve
+#define _texecvp    _execvp
+#define _texecvpe   _execvpe
+
+#define _tspawnl    _spawnl
+#define _tspawnle   _spawnle
+#define _tspawnlp   _spawnlp
+#define _tspawnlpe  _spawnlpe
+#define _tspawnv    _spawnv
+#define _tspawnve   _spawnve
+#define _tspawnvp   _spawnvp
+#define _tspawnvpe  _spawnvpe
+
+#define _tsystem    system
+
+
+/* Time functions */
+
+#define _tasctime   asctime
+#define _tctime     ctime
+#define _tctime32   _ctime32
+#define _tctime64   _ctime64
+#define _tstrdate   _strdate
+#define _tstrtime   _strtime
+#define _tutime     _utime
+#define _tutime32   _utime32
+#define _tutime64   _utime64
+#define _tcsftime   strftime
+#define _tcsftime_l _strftime_l
+
+#define _tasctime_s   asctime_s
+#define _tctime_s     ctime_s
+#define _tctime32_s   _ctime32_s
+#define _tctime64_s   _ctime64_s
+#define _tstrdate_s   _strdate_s
+#define _tstrtime_s   _strtime_s
+
+/* Directory functions */
+
+#define _tchdir             _chdir
+#define _tgetcwd            _getcwd
+#define _tgetdcwd           _getdcwd
+#define _tgetdcwd_nolock    _getdcwd_nolock
+#define _tmkdir             _mkdir
+#define _trmdir             _rmdir
+
+#ifdef _DEBUG
+#define _tgetcwd_dbg        _getcwd_dbg
+#define _tgetdcwd_dbg       _getdcwd_dbg
+#define _tgetdcwd_lk_dbg    _getdcwd_lk_dbg
+#endif
+
+/* Environment/Path functions */
+
+#define _tfullpath      _fullpath
+#define _tgetenv        getenv
+#define _tgetenv_s      getenv_s
+#define _tdupenv_s      _dupenv_s
+#define _tmakepath      _makepath
+#define _tmakepath_s    _makepath_s
+#define _tpgmptr        _pgmptr
+#define _get_tpgmptr    _get_pgmptr
+#define _tputenv        _putenv
+#define _tputenv_s      _putenv_s
+#define _tsearchenv     _searchenv
+#define _tsearchenv_s   _searchenv_s
+#define _tsplitpath     _splitpath
+#define _tsplitpath_s   _splitpath_s
+
+#ifdef _DEBUG
+#define _tfullpath_dbg  _fullpath_dbg
+#define _tdupenv_s_dbg  _dupenv_s_dbg
+#endif
+
+/* Stdio functions */
+
+#ifdef  _POSIX_
+#define _tfdopen    fdopen
+#else
+#define _tfdopen    _fdopen
+#endif
+#define _tfsopen    _fsopen
+#define _tfopen     fopen
+#define _tfopen_s   fopen_s
+#define _tfreopen   freopen
+#define _tfreopen_s freopen_s
+#define _tperror    perror
+#define _tpopen     _popen
+#define _ttempnam   _tempnam
+#define _ttmpnam    tmpnam
+#define _ttmpnam_s  tmpnam_s
+
+#ifdef _DEBUG
+#define _ttempnam_dbg   _tempnam_dbg
+#endif
+
+
+/* Io functions */
+
+#define _tchmod     _chmod
+#define _tcreat     _creat
+#define _tfindfirst      _findfirst
+#define _tfindfirst32    _findfirst32
+#define _tfindfirst64    _findfirst64
+#define _tfindfirsti64   _findfirsti64
+#define _tfindfirst32i64 _findfirst32i64
+#define _tfindfirst64i32 _findfirst64i32
+#define _tfindnext       _findnext
+#define _tfindnext32     _findnext32
+#define _tfindnext64     _findnext64
+#define _tfindnexti64    _findnexti64
+#define _tfindnext32i64  _findnext32i64
+#define _tfindnext64i32  _findnext64i32
+#define _tmktemp            _mktemp
+#define _tmktemp_s          _mktemp_s
+
+#ifdef  _POSIX_
+#define _topen      open
+#define _taccess    access
+#else
+#define _topen      _open
+#define _taccess    _access
+#define _taccess_s  _access_s
+#endif
+
+#define _tremove    remove
+#define _trename    rename
+#define _tsopen     _sopen
+#define _tsopen_s   _sopen_s
+#define _tunlink    _unlink
+
+#define _tfinddata_t      _finddata_t
+#define _tfinddata32_t    _finddata32_t
+#define _tfinddata64_t    __finddata64_t
+#define _tfinddatai64_t   _finddatai64_t
+#define _tfinddata32i64_t _finddata32i64_t
+#define _tfinddata64i32_t _finddata64i32_t
+
+/* ctype functions */
+#define _istascii       __isascii
+#define _istcntrl       iscntrl
+#define _istcntrl_l     _iscntrl_l
+#define _istxdigit      isxdigit
+#define _istxdigit_l    _isxdigit_l
+
+/* Stat functions */
+#define _tstat      _stat
+#define _tstat32    _stat32
+#define _tstat32i64 _stat32i64
+#define _tstat64    _stat64
+#define _tstat64i32 _stat64i32
+#define _tstati64   _stati64
+
+
+/* Setlocale functions */
+
+#define _tsetlocale setlocale
+
+
+#ifdef  _MBCS
+
+/* ++++++++++++++++++++ MBCS ++++++++++++++++++++ */
+
+#ifdef  __cplusplus
+}   /* ... extern "C" */
+#endif
+
+#include <mbstring.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+#ifndef __TCHAR_DEFINED
+typedef char            _TCHAR;
+typedef signed char     _TSCHAR;
+typedef unsigned char   _TUCHAR;
+typedef unsigned char   _TXCHAR;
+typedef unsigned int    _TINT;
+#define __TCHAR_DEFINED
+#endif
+
+#ifndef _TCHAR_DEFINED
+#if     !__STDC__
+typedef char            TCHAR;
+#endif
+#define _TCHAR_DEFINED
+#endif
+
+
+#ifdef  _MB_MAP_DIRECT
+
+/* use mb functions directly - types must match */
+
+/* String functions */
+
+#define _tcschr         _mbschr
+#define _tcscspn        _mbscspn
+#define _tcsncat        _mbsnbcat
+#define _tcsncat_s      _mbsnbcat_s
+#define _tcsncat_l      _mbsnbcat_l
+#define _tcsncat_s_l    _mbsnbcat_s_l
+#define _tcsncpy        _mbsnbcpy
+#define _tcsncpy_s      _mbsnbcpy_s
+#define _tcsncpy_l      _mbsnbcpy_l
+#define _tcsncpy_s_l    _mbsnbcpy_s_l
+#define _tcspbrk        _mbspbrk
+#define _tcsrchr        _mbsrchr
+#define _tcsspn         _mbsspn
+#define _tcsstr         _mbsstr
+#define _tcstok         _mbstok
+#define _tcstok_s       _mbstok_s
+#define _tcstok_l       _mbstok_l
+#define _tcstok_s_l     _mbstok_s_l
+
+#define _tcsnset        _mbsnbset
+#define _tcsnset_l      _mbsnbset_l
+#define _tcsnset_s      _mbsnbset_s
+#define _tcsnset_s_l    _mbsnbset_s_l
+#define _tcsrev         _mbsrev
+#define _tcsset         _mbsset
+#define _tcsset_s       _mbsset_s
+#define _tcsset_l       _mbsset_l
+#define _tcsset_s_l     _mbsset_s_l
+
+#define _tcscmp         _mbscmp
+#define _tcsicmp        _mbsicmp
+#define _tcsicmp_l      _mbsicmp_l
+#define _tcsnccmp       _mbsncmp
+#define _tcsncmp        _mbsnbcmp
+#define _tcsncicmp      _mbsnicmp
+#define _tcsncicmp_l    _mbsnicmp_l
+#define _tcsnicmp       _mbsnbicmp
+#define _tcsnicmp_l     _mbsnbicmp_l
+
+#define _tcscoll        _mbscoll
+#define _tcscoll_l      _mbscoll_l
+#define _tcsicoll       _mbsicoll
+#define _tcsicoll_l     _mbsicoll_l
+#define _tcsnccoll      _mbsncoll
+#define _tcsnccoll_l    _mbsncoll_l
+#define _tcsncoll       _mbsnbcoll
+#define _tcsncoll_l     _mbsnbcoll_l
+#define _tcsncicoll     _mbsnicoll
+#define _tcsncicoll_l   _mbsnicoll_l
+#define _tcsnicoll      _mbsnbicoll
+#define _tcsnicoll_l    _mbsnbicoll_l
+
+/* "logical-character" mappings */
+
+#define _tcsclen        _mbslen
+#define _tcscnlen       _mbsnlen
+#define _tcsclen_l      _mbslen_l
+#define _tcscnlen_l     _mbsnlen_l
+#define _tcsnccat       _mbsncat
+#define _tcsnccat_s     _mbsncat_s
+#define _tcsnccat_l     _mbsncat_l
+#define _tcsnccat_s_l   _mbsncat_s_l
+#define _tcsnccpy       _mbsncpy
+#define _tcsnccpy_s     _mbsncpy_s
+#define _tcsnccpy_l     _mbsncpy_l
+#define _tcsnccpy_s_l   _mbsncpy_s_l
+#define _tcsncset       _mbsnset
+#define _tcsncset_s     _mbsnset_s
+#define _tcsncset_l     _mbsnset_l
+#define _tcsncset_s_l   _mbsnset_s_l
+
+/* MBCS-specific mappings */
+
+#define _tcsdec     _mbsdec
+#define _tcsinc     _mbsinc
+#define _tcsnbcnt   _mbsnbcnt
+#define _tcsnccnt   _mbsnccnt
+#define _tcsnextc   _mbsnextc
+#define _tcsninc    _mbsninc
+#define _tcsspnp    _mbsspnp
+
+#define _tcslwr     _mbslwr
+#define _tcslwr_l   _mbslwr_l
+#define _tcslwr_s   _mbslwr_s
+#define _tcslwr_s_l _mbslwr_s_l
+#define _tcsupr     _mbsupr
+#define _tcsupr_l   _mbsupr_l
+#define _tcsupr_s   _mbsupr_s
+#define _tcsupr_s_l _mbsupr_s_l
+
+#define _tclen      _mbclen
+#define _tccpy      _mbccpy
+#define _tccpy_l    _mbccpy_l
+#define _tccpy_s    _mbccpy_s
+#define _tccpy_s_l  _mbccpy_s_l
+
+#else /* _MB_MAP_DIRECT */
+
+#if     __STDC__ || defined(_NO_INLINING)
+
+/* use type-safe linked-in function thunks */
+
+/* String functions */
+
+_CRTIMP __checkReturn _CONST_RETURN char * __cdecl _tcschr(__in_z const char * _Str, __in unsigned int _Val);
+_CRTIMP __checkReturn size_t __cdecl _tcscspn(__in_z const char * _Str, __in_z const char * _Control);
+_CRTIMP char * __cdecl _tcsncat(__in_z __out_ecount(_MaxCount) char *_Dst, __in_z const char *_Src, __in size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsncat_s(__inout_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsncat_l(__in_z __out_ecount(_MaxCount) char *_Dst, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsncat_s_l(__inout_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsncpy(__out_ecount(_MaxCount) char *_Dst, __in_z const char *_Src, size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsncpy_s(__out_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsncpy_l(__out_ecount(_MaxCount) char *_Dst, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsncpy_s_l(__out_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn _CONST_RETURN char * __cdecl _tcspbrk(__in_z const char * _Str, __in_z const char * _Control);
+_CRTIMP __checkReturn _CONST_RETURN char * __cdecl _tcsrchr(__in_z const char * _Str, __in unsigned int _Ch);
+_CRTIMP __checkReturn size_t __cdecl _tcsspn(__in_z const char * _Str, __in_z const char * _Control);
+_CRTIMP __checkReturn _CONST_RETURN char * __cdecl _tcsstr(__in_z const char * _Str, __in_z const char * _Substr);
+_CRTIMP __checkReturn char * __cdecl _tcstok(__inout_opt char *_Str, __in_z const char *_Delim);
+_CRTIMP __checkReturn char * __cdecl _tcstok_s(__inout_opt char *_Str, __in_z const char *_Delim, __deref_inout_z_opt char **_Context);
+_CRTIMP __checkReturn char * __cdecl _tcstok_l(__inout_opt char *_Str, __in_z const char *_Delim, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn char * __cdecl _tcstok_s_l(__inout_opt char *_Str, __in_z const char *_Delim, __deref_inout_z_opt char **_Context, __in_opt _locale_t _Locale);
+
+_CRTIMP char * __cdecl _tcsnset(__inout_z char * _Str, __in unsigned int _Val, __in size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsrev(__inout_z char * _Str);
+_CRTIMP char * __cdecl _tcsset(__inout_z char * _Str, __in unsigned int _Val);
+_CRTIMP char * __cdecl _tcsset_l(__inout_z char * _Str, __in unsigned int _Val, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn_wat errno_t __cdecl _tcsset_s(__inout_ecount_z(_SizeInChars) char * _Str, __in size_t _SizeInChars, __in unsigned int _Val);
+_CRTIMP __checkReturn_wat errno_t __cdecl _tcsset_s_l(__inout_ecount_z(_SizeInChars) char * _Str, __in size_t _SizeInChars, __in unsigned int, __in_opt _locale_t _Locale);
+
+_CRTIMP __checkReturn int __cdecl _tcscmp(__in_z const char *_Str1, __in_z const char * _Str);
+_CRTIMP __checkReturn int __cdecl _tcsicmp(__in_z const char *_Str1, __in_z const char *_Str2);
+_CRTIMP __checkReturn int __cdecl _tcsicmp_l(__in_z const char *_Str1, __in_z const char *_Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsnccmp(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsncmp(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsncicmp(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsncicmp_l(__in_z const char *_Str1, __in_z const char *_Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsnicmp(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsnicmp_l(__in_z const char *_Str1, __in_z const char *_Str2, size_t _MaxCount, __in_opt _locale_t _Locale);
+
+_CRTIMP __checkReturn int __cdecl _tcscoll(__in_z const char * _Str1, __in_z const char * _Str2);
+_CRTIMP __checkReturn int __cdecl _tcscoll_l(__in_z const char *_Str1, __in_z const char *_Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsicoll(__in_z const char * _Str1, __in_z const char * _Str2);
+_CRTIMP __checkReturn int __cdecl _tcsicoll_l(__in_z const char *_Str1, __in_z const char *_Str2, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsnccoll(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsnccoll_l(__in_z const char *_Str1, __in_z const char *_Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsncoll(__in_z const char *_Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsncoll_l(__in_z const char *_Str1, __in_z const char *_Str2, size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsncicoll(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsncicoll_l(__in_z const char *_Str1, __in_z const char *_Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn int __cdecl _tcsnicoll(__in_z const char * _Str1, __in_z const char * _Str2, __in size_t _MaxCount);
+_CRTIMP __checkReturn int __cdecl _tcsnicoll_l(__in_z const char *_Str1, __in_z const char *_Str2, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+
+/* "logical-character" mappings */
+
+_CRTIMP __checkReturn size_t __cdecl _tcsclen(__in_z const char *_Str);
+_CRTIMP __checkReturn size_t __cdecl _tcscnlen(__in_ecount(_MaxCount) const char *_Str, __in size_t _MaxCount);
+_CRTIMP __checkReturn size_t __cdecl _tcsclen_l(__in_z const char *_Str, __in_opt _locale_t _Locale);
+_CRTIMP __checkReturn size_t __cdecl _tcscnlen_l(__in_z const char *_Str, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsnccat(__inout char *_Dst, __in_z const char *_Src, __in size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsnccat_s(__inout_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, __in size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsnccat_l(__inout char *_Dst, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsnccat_s_l(__inout_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsnccpy(__out_ecount(_MaxCount) char *_Dst, __in_z const char *_Src, __in size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsnccpy_s(__out_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, __in size_t _MaxCount);
+_CRTIMP char * __cdecl _tcsnccpy_l(__out_ecount(_DstSizeInChars) char *_Dst, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsnccpy_s_l(__out_ecount(_DstSizeInChars) char *_Dst, __in size_t _DstSizeInChars, __in_z const char *_Src, __in size_t _MaxCount, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsncset(__inout_ecount_z(_MaxCount) char * _Str, __in unsigned int _Val, __in size_t _MaxCount);
+
+/* MBCS-specific mappings */
+
+_CRTIMP char * __cdecl _tcsdec(__in_ecount_z(_Pos-_Start+1) const char * _Start, __in_z const char * _Pos);
+_CRTIMP char * __cdecl _tcsinc(__in_z const char * _Ptr);
+_CRTIMP size_t __cdecl _tcsnbcnt(__in_ecount_z(_MaxCount) const char * _Str, __in size_t _MaxCount);
+_CRTIMP size_t __cdecl _tcsnccnt(__in_ecount_z(_MaxCount) const char * _Str, __in size_t _MaxCount);
+_CRTIMP unsigned int __cdecl _tcsnextc (__in_z const char * _Str);
+_CRTIMP char * __cdecl _tcsninc(__in_ecount_z(_Count) const char * _Ptr, __in size_t _Count);
+_CRTIMP char * __cdecl _tcsspnp(__in_z const char * _Str1, __in_z const char * _Str2);
+
+_CRTIMP char * __cdecl _tcslwr(__inout char *_Str);
+_CRTIMP char * __cdecl _tcslwr_l(__inout char *_Str, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcslwr_s(__inout_ecount(_SizeInChars) char *_Str, __in size_t _SizeInChars);
+_CRTIMP char * __cdecl _tcslwr_s_l(__inout_ecount(_SizeInChars) char *_Str, __in size_t _SizeInChars, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsupr(__inout char *_Str);
+_CRTIMP char * __cdecl _tcsupr_l(__inout char *_Str, __in_opt _locale_t _Locale);
+_CRTIMP char * __cdecl _tcsupr_s(__inout_ecount(_SizeInChars) char *_Str, __in size_t _SizeInChars);
+_CRTIMP char * __cdecl _tcsupr_s_l(__inout_ecount(_SizeInChars) char *_Str, __in size_t _SizeInChars, __in_opt _locale_t _Locale);
+
+_CRTIMP __checkReturn size_t __cdecl _tclen(__in_z const char * _Str);
+_CRTIMP void __cdecl _tccpy(__out_z char * _DstCh, __in_z const char * _SrcCh);
+
+#else   /* __STDC__ */
+
+/* the default: use type-safe inline function thunks */
+
+#define _PUC    unsigned char *
+#define _CPUC   const unsigned char *
+#define _PC     char *
+#define _CRPC   _CONST_RETURN char *
+#define _CPC    const char *
+#define _UI     unsigned int
+
+
+/* String functions */
+
+__inline _CRPC _tcschr(__in _CPC _s1,__in _UI _c) {return (_CRPC)_mbschr((_CPUC)_s1,_c);}
+__inline size_t _tcscspn(__in _CPC _s1,__in _CPC _s2) {return _mbscspn((_CPUC)_s1,(_CPUC)_s2);}
+
+_CRT_INSECURE_DEPRECATE(_tcsncat_s) __inline char * _tcsncat(__inout_z char *_Destination, __in_z const char *_Source, __in size_t _Count) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnbcat((unsigned char *)_Destination,(const unsigned char *)_Source,_Count);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsncat_s(__inout_bcount_z(_Destination_size_chars) char *_Destination, __in size_t _Destination_size_chars, __in_z const char *_Source, __in size_t _Count) 
+{
+    return _mbsnbcat_s((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source,_Count);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, _tcsncat_s, __inout_ecount_z(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count)
+
+_CRT_INSECURE_DEPRECATE(_tcsncat_s_l) __inline char * _tcsncat_l(__inout_z char *_Destination, __in_z const char *_Source, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnbcat_l((unsigned char *)_Destination,(const unsigned char *)_Source,_Count, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsncat_s_l(__inout_bcount_z(_Destination_size_chars) char *_Destination, __in size_t _Destination_size_chars, __in_z const char *_Source, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+    return _mbsnbcat_s_l((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source,_Count, _Locale);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _tcsncat_s_l, __inout_ecount_z(_Size) char, _Dest, const char *, _Source, size_t, _Count, _locale_t, _Locale)
+
+_CRT_INSECURE_DEPRECATE(_tcsncpy_s) __inline char * _tcsncpy(__inout_z char * _Destination,__in_z const char * _Source,__in size_t _Count) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnbcpy((unsigned char *)_Destination,(const unsigned char *)_Source,_Count);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsncpy_s(__out_bcount_z(_Destination_size_chars) char * _Destination, __in size_t _Destination_size_chars, __in_z const char * _Source,__in size_t _Count) 
+{
+    return _mbsnbcpy_s((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source,_Count);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, _tcsncpy_s, __out_bcount(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count)
+
+_CRT_INSECURE_DEPRECATE(_tcsncpy_s_l) __inline char * _tcsncpy_l(__out_bcount_z(_Count) char * _Destination,__in_z const char * _Source,__in size_t _Count, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnbcpy_l((unsigned char *)_Destination,(const unsigned char *)_Source,_Count, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsncpy_s_l(__out_bcount_z(_Destination_size_chars) char * _Destination, __in size_t _Destination_size_chars, __in_z const char * _Source,__in size_t _Count, __in_opt _locale_t _Locale) 
+{
+    return _mbsnbcpy_s_l((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source,_Count, _Locale);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _tcsncpy_s, __out_bcount(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count, __in_opt _locale_t, _Locale)
+
+__inline __checkReturn _CRPC _tcspbrk(__in _CPC _s1,__in _CPC _s2) {return (_CRPC)_mbspbrk((_CPUC)_s1,(_CPUC)_s2);}
+__inline __checkReturn _CRPC _tcsrchr(__in _CPC _s1,__in _UI _c) {return (_CRPC)_mbsrchr((_CPUC)_s1,_c);}
+__inline __checkReturn size_t _tcsspn(__in _CPC _s1,__in _CPC _s2) {return _mbsspn((_CPUC)_s1,(_CPUC)_s2);}
+__inline __checkReturn _CRPC _tcsstr(__in _CPC _s1,__in _CPC _s2) {return (_CRPC)_mbsstr((_CPUC)_s1,(_CPUC)_s2);}
+
+_CRT_INSECURE_DEPRECATE(_tcstok_s) __inline __checkReturn char *  _tcstok(__inout_z_opt char * _String,__in_z const char * _Delimiters) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+	return (char * )_mbstok((unsigned char *)_String,(const unsigned char *)_Delimiters);
+#pragma warning(pop)
+}
+
+__inline __checkReturn char *  _tcstok_s(__inout_z_opt char * _String,__in_z const char * _Delimiters, __deref_inout_z_opt char **_Current_position) 
+{
+	return (char * )_mbstok_s((unsigned char *)_String,(const unsigned char *)_Delimiters, (unsigned char **)_Current_position);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcstok_s_l) __inline __checkReturn char *  _tcstok_l(__inout_z_opt char * _String,__in_z const char * _Delimiters, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+	return (char * )_mbstok_l((unsigned char *)_String,(const unsigned char *)_Delimiters, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn char *  _tcstok_s_l(__inout_z_opt char * _String,__in_z const char * _Delimiters, __deref_inout_z_opt char **_Current_position, __in_opt _locale_t _Locale) 
+{
+	return (char * )_mbstok_s_l((unsigned char *)_String,(const unsigned char *)_Delimiters, (unsigned char **)_Current_position, _Locale);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsnset_s) __inline char * _tcsnset(__inout_bcount_z(_Count) char * _Dst, __in unsigned int _Value , __in size_t _Count)
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnbset((unsigned char *)_Dst, _Value, _Count);
+#pragma warning(pop)
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsnset_s_l) __inline char * _tcsnset_l(__inout_bcount_z(_Count) char * _Dst, __in unsigned int _Value , __in size_t _Count, __in_opt _locale_t _Locale)
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnbset_l((unsigned char *)_Dst, _Value, _Count, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsnset_s(__inout_bcount_z(_SizeInBytes) char * _Dst, __in size_t _SizeInBytes, __in unsigned int _Value , __in size_t _Count)
+{
+    return _mbsnbset_s((unsigned char *)_Dst, _SizeInBytes, _Value, _Count);
+}
+
+__inline __checkReturn_wat errno_t _tcsnset_s_l(__inout_bcount_z(_SizeInBytes) char * _Dst, __in size_t _SizeInBytes, __in unsigned int _Value , __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    return _mbsnbset_s_l((unsigned char *)_Dst, _SizeInBytes, _Value, _Count, _Locale);
+}
+
+__inline _PC _tcsrev(__inout _PC _s1) {return (_PC)_mbsrev((_PUC)_s1);}
+
+_CRT_INSECURE_DEPRECATE(_tcsset_s) __inline char * _tcsset(__inout_z char * _Dst, __in unsigned int _Value)
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsset((unsigned char *)_Dst, _Value);
+#pragma warning(pop)
+}
+
+_CRT_INSECURE_DEPRECATE(_tscset_s_l) __inline char * _tcsset_l(__inout_z char * _Dst, __in unsigned int _Value, __in_opt _locale_t _Locale)
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsset_l((unsigned char *)_Dst, _Value, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsset_s(__inout_bcount_z(_SizeInBytes) char * _Dst, __in size_t _SizeInBytes, __in unsigned int _Value)
+{
+    return _mbsset_s((unsigned char *)_Dst, _SizeInBytes, _Value);
+}
+
+__inline __checkReturn_wat errno_t _tcsset_s_l(__inout_bcount_z(_SizeInBytes) char * _Dst, __in size_t _SizeInBytes, __in unsigned int _Value, __in_opt _locale_t _Locale)
+{
+    return _mbsset_s_l((unsigned char *)_Dst, _SizeInBytes, _Value, _Locale);
+}
+
+__inline __checkReturn int _tcscmp(__in _CPC _s1,__in _CPC _s2) {return _mbscmp((_CPUC)_s1,(_CPUC)_s2);}
+
+__inline __checkReturn int _tcsicmp(__in_z const char * _String1, __in_z const char * _String2) 
+{
+    return _mbsicmp((const unsigned char *)_String1,(const unsigned char *)_String2);
+}
+
+__inline __checkReturn int _tcsicmp_l(__in_z const char * _String1, __in_z const char * _String2, __in_opt _locale_t _Locale) 
+{
+    return _mbsicmp_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Locale);
+}
+
+__inline __checkReturn int _tcsnccmp(__in _CPC _s1,__in _CPC _s2,__in size_t _n) {return _mbsncmp((_CPUC)_s1,(_CPUC)_s2,_n);}
+__inline int _tcsncmp(__in _CPC _s1,__in _CPC _s2,__in size_t _n) {return _mbsnbcmp((_CPUC)_s1,(_CPUC)_s2,_n);}
+
+__inline __checkReturn int _tcsncicmp(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Char_count)
+{
+    return _mbsnicmp((const unsigned char *)_String1,(const unsigned char *)_String2,_Char_count);
+}
+
+__inline __checkReturn int _tcsncicmp_l(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Char_count, __in_opt _locale_t _Locale)
+{
+    return _mbsnicmp_l((const unsigned char *)_String1,(const unsigned char *)_String2,_Char_count, _Locale);
+}
+
+__inline __checkReturn int _tcsnicmp(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Char_count) 
+{
+    return _mbsnbicmp((const unsigned char *)_String1,(const unsigned char *)_String2,_Char_count);
+}
+
+__inline __checkReturn int _tcsnicmp_l(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Char_count, __in_opt _locale_t _Locale) 
+{
+    return _mbsnbicmp_l((const unsigned char *)_String1,(const unsigned char *)_String2,_Char_count, _Locale);
+}
+
+__inline __checkReturn int _tcscoll(__in_z const char * _String1, __in_z const char * _String2)
+{
+    return _mbscoll((const unsigned char *)_String1,(const unsigned char *)_String2);
+}
+
+__inline __checkReturn int _tcscoll_l(__in_z const char * _String1, __in_z const char * _String2, __in_opt _locale_t _Locale)
+{
+    return _mbscoll_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Locale);
+}
+
+__inline __checkReturn int _tcsicoll(__in_z const char * _String1, __in_z const char * _String2)
+{
+    return _mbsicoll((const unsigned char *)_String1,(const unsigned char *)_String2);
+}
+
+__inline __checkReturn int _tcsicoll_l(__in_z const char * _String1, __in_z const char * _String2, __in_opt _locale_t _Locale)
+{
+    return _mbsicoll_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Locale);
+}
+
+__inline __checkReturn int _tcsnccoll(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count)
+{
+    return _mbsncoll((const unsigned char *)_String1,(const unsigned char *)_String2, _Count);
+}
+
+__inline __checkReturn int _tcsnccoll_l(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    return _mbsncoll_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Count, _Locale);
+}
+
+__inline __checkReturn int _tcsncoll(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count)
+{
+    return _mbsnbcoll((const unsigned char *)_String1,(const unsigned char *)_String2, _Count);
+}
+
+__inline __checkReturn int _tcsncoll_l(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    return _mbsnbcoll_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Count, _Locale);
+}
+
+__inline __checkReturn int _tcsncicoll(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count)
+{
+    return _mbsnicoll((const unsigned char *)_String1,(const unsigned char *)_String2, _Count);
+}
+
+__inline __checkReturn int _tcsncicoll_l(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    return _mbsnicoll_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Count, _Locale);
+}
+
+__inline __checkReturn int _tcsnicoll(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count)
+{
+    return _mbsnbicoll((const unsigned char *)_String1,(const unsigned char *)_String2, _Count);
+}
+
+__inline __checkReturn int _tcsnicoll_l(__in_z const char * _String1, __in_z const char * _String2, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    return _mbsnbicoll_l((const unsigned char *)_String1,(const unsigned char *)_String2, _Count, _Locale);
+}
+
+/* "logical-character" mappings */
+__inline __checkReturn size_t _tcsclen(__in_z const char * _String) 
+{
+    return _mbslen((const unsigned char *)_String);
+}
+
+__inline __checkReturn size_t _tcscnlen(__in_z const char * _String, __in size_t _Maximum) 
+{
+    return _mbsnlen((const unsigned char *)_String, _Maximum);
+}
+
+__inline __checkReturn size_t _tcsclen_l(__in_z const char * _String, __in_opt _locale_t _Locale) 
+{
+    return _mbslen_l((const unsigned char *)_String, _Locale);
+}
+
+__inline __checkReturn size_t _tcscnlen_l(__in_z const char * _String, __in size_t _Maximum, __in_opt _locale_t _Locale) 
+{
+    return _mbsnlen_l((const unsigned char *)_String, _Maximum, _Locale);
+}
+
+_CRT_INSECURE_DEPRECATE(_tscnccat_s) __inline char * _tcsnccat(__inout_z char * _Destination, __in_z const char * _Source, __in size_t _Count) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsncat((unsigned char *)_Destination,(const unsigned char *)_Source, _Count);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsnccat_s(__inout_bcount_z(_Destination_size_chars) char * _Destination, __in size_t _Destination_size_chars, __in_z const char * _Source, __in size_t _Count) 
+{
+    return _mbsncat_s((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source, _Count);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsnccat_s_l) __inline char * _tcsnccat_l(__inout_z char * _Destination, __in_z const char * _Source, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsncat_l((unsigned char *)_Destination,(const unsigned char *)_Source, _Count, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsnccat_s_l(__inout_bcount_z(_Destination_size_chars) char * _Destination, __in size_t _Destination_size_chars, __in_z const char * _Source, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+    return _mbsncat_s_l((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source, _Count, _Locale);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsnccpy_s) __inline char * _tcsnccpy(__in_z char * _Destination, __in_z const char * _Source, __in size_t _Count) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsncpy((unsigned char *)_Destination,(const unsigned char *)_Source, _Count);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsnccpy_s(__out_bcount_z(_Destination_size_chars) char * _Destination, __in size_t _Destination_size_chars, __in_z const char * _Source, __in size_t _Count) 
+{
+    return _mbsncpy_s((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source, _Count);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsnccpy_s_l) __inline char * _tcsnccpy_l(__out_bcount_z(_Count) char * _Destination, __in_z const char * _Source, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsncpy_l((unsigned char *)_Destination,(const unsigned char *)_Source, _Count, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsnccpy_s_l(__out_bcount_z(_Destination_size_chars) char * _Destination, __in size_t _Destination_size_chars, __in_z const char * _Source, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+    return _mbsncpy_s_l((unsigned char *)_Destination, _Destination_size_chars, (const unsigned char *)_Source, _Count, _Locale);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsncset_s) __inline char * _tcsncset(__inout_bcount(_Count) char *_Destination, __in unsigned int _Value, __in size_t _Count)
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnset((unsigned char *)_Destination, _Value, _Count);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsncset_s(__out_bcount(_SizeInBytes) char *_Destination, __in size_t _SizeInBytes, __in unsigned int _Value, __in size_t _Count)
+{
+    return _mbsnset_s((unsigned char *)_Destination, _SizeInBytes, _Value, _Count);
+}
+
+_CRT_INSECURE_DEPRECATE(_tcsncset_s_l) __inline char * _tcsncset_l(__inout char *_Destination, __in unsigned int _Value, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsnset_l((unsigned char *)_Destination, _Value, _Count, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsncset_s_l(__inout_bcount(_SizeInBytes) char *_Destination, __in size_t _SizeInBytes, __in unsigned int _Value, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    return _mbsnset_s_l((unsigned char *)_Destination, _SizeInBytes, _Value, _Count, _Locale);
+}
+
+/* MBCS-specific mappings */
+
+__inline __checkReturn _PC _tcsdec(__in _CPC _s1,__in _CPC _s2) {return (_PC)_mbsdec((_CPUC)_s1,(_CPUC)_s2);}
+__inline __checkReturn _PC _tcsinc(__in _CPC _s1) {return (_PC)_mbsinc((_CPUC)_s1);}
+__inline __checkReturn size_t _tcsnbcnt(__in _CPC _s1,__in size_t _n) {return _mbsnbcnt((_CPUC)_s1,_n);}
+__inline __checkReturn size_t _tcsnccnt(__in _CPC _s1,__in size_t _n) {return _mbsnccnt((_CPUC)_s1,_n);}
+__inline __checkReturn _PC _tcsninc(__in _CPC _s1,__in size_t _n) {return (_PC)_mbsninc((_CPUC)_s1,_n);}
+__inline __checkReturn _PC _tcsspnp(__in _CPC _s1,__in _CPC _s2) {return (_PC)_mbsspnp((_CPUC)_s1,(_CPUC)_s2);}
+
+_CRT_INSECURE_DEPRECATE(_tcslwr_s) __inline char * _tcslwr(__inout_z char * _String) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbslwr((unsigned char *)_String);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcslwr_s(__inout_bcount_z(_SizeInBytes) char * _String, size_t _SizeInBytes) 
+{
+    return _mbslwr_s((unsigned char *)_String, _SizeInBytes);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _tcslwr_s, __inout_bcount(_Size) char, _String)
+
+_CRT_INSECURE_DEPRECATE(_tcslwr_s_l) __inline char * _tcslwr_l(__inout_z char * _String, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbslwr_l((unsigned char *)_String, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcslwr_s_l(__inout_bcount_z(_SizeInBytes) char * _String, __in size_t _SizeInBytes, __in_opt _locale_t _Locale) 
+{
+    return _mbslwr_s_l((unsigned char *)_String, _SizeInBytes, _Locale);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _tcslwr_s_l, __inout_bcount(_Size) char, _String, __in_opt _locale_t, _Locale)
+
+_CRT_INSECURE_DEPRECATE(_tcsupr_s) __inline char * _tcsupr(__inout_z char * _String) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsupr((unsigned char *)_String);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsupr_s(__inout_bcount_z(_Count) char * _String, __in size_t _Count) 
+{
+    return _mbsupr_s((unsigned char *)_String, _Count);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _tcsupr_s, __inout_bcount(_Size) char, _String)
+
+_CRT_INSECURE_DEPRECATE(_tcsupr_s_l) __inline char * _tcsupr_l(__inout_z char * _String, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return (char *)_mbsupr_l((unsigned char *)_String, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tcsupr_s_l(__inout_bcount_z(_Count) char * _String, __in size_t _Count, __in_opt _locale_t _Locale) 
+{
+    return _mbsupr_s_l((unsigned char *)_String, _Count, _Locale);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _tcsupr_s_l, __inout_bcount(_Size) char, _String, __in_opt _locale_t, _Locale)
+
+__inline __checkReturn size_t _tclen(__in_z _CPC _s1) {return _mbclen((_CPUC)_s1);}
+
+_CRT_INSECURE_DEPRECATE(_tccpy_s) __inline void _tccpy(__out_bcount_z(2) char * _Destination, __in_z const char * _Source) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    _mbccpy((unsigned char *)_Destination, (const unsigned char *)_Source);
+#pragma warning(pop)
+}
+
+_CRT_INSECURE_DEPRECATE(_tccpy_s_l) __inline void _tccpy_l(__out_bcount_z(2) char * _Destination, __in_z const char * _Source, __in_opt _locale_t _Locale) 
+{
+#pragma warning(push)
+#pragma warning(disable:4996)
+    _mbccpy_l((unsigned char *)_Destination,( const unsigned char *)_Source, _Locale);
+#pragma warning(pop)
+}
+
+__inline __checkReturn_wat errno_t _tccpy_s(__out_bcount_z(_SizeInBytes) char * _Destination, size_t _SizeInBytes, __out_opt int *_PCopied, __in_z const char * _Source) 
+{
+    return _mbccpy_s((unsigned char *)_Destination, _SizeInBytes, _PCopied, (const unsigned char *)_Source);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(errno_t, _tccpy_s, __out_bcount(_SizeInBytes) char, _Dest, __out_opt  int *, _PCopied, __in_z const char *, _Source)
+
+__inline __checkReturn_wat errno_t _tccpy_s_l(__out_bcount_z(_SizeInBytes) char * _Destination, __in size_t _SizeInBytes, __out_opt int *_PCopied, __in_z const char * _Source, __in_opt _locale_t _Locale) 
+{
+    return _mbccpy_s_l((unsigned char *)_Destination, _SizeInBytes, _PCopied, (const unsigned char *)_Source, _Locale);
+}
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _tccpy_s_l, __out_bcount(_Size) char, _Dest, __out_opt int *, _PCopied, __in_z const char *, _Source, __in_opt _locale_t, _Locale)
+
+/* inline helper */
+__inline __checkReturn _UI _tcsnextc(__in_z _CPC _s1)
+{
+    _UI _n=0; 
+    if (_ismbblead((_UI)*(_PUC)_s1)) 
+    {
+        /*  for a dud MBCS string (leadbyte, EOS), we don't move forward 2
+            We do not assert here because this routine is too low-level
+        */
+        if(_s1[1]!='\0')
+        {
+            _n=((_UI)*(_PUC)_s1)<<8; 
+            _s1++;
+        }
+    } 
+    _n+=(_UI)*(_PUC)_s1; 
+    
+    return(_n);
+}
+
+#endif  /* __STDC__ */
+
+#ifdef  __cplusplus
+#ifndef _CPP_TCHAR_INLINES_DEFINED
+#define _CPP_TCHAR_INLINES_DEFINED
+extern "C++" {
+inline __checkReturn char * __CRTDECL _tcschr(__in_z char *_S, __in unsigned int _C)
+        {return ((char *)_tcschr((const char *)_S, _C)); }
+inline __checkReturn char * __CRTDECL _tcspbrk(__in_z char *_S, __in_z const char *_P)
+        {return ((char *)_tcspbrk((const char *)_S, _P)); }
+inline __checkReturn char * __CRTDECL _tcsrchr(__in_z char *_S, __in unsigned int _C)
+        {return ((char *)_tcsrchr((const char *)_S, _C)); }
+inline __checkReturn char * __CRTDECL _tcsstr(__in_z char *_S, __in_z const char *_P)
+        {return ((char *)_tcsstr((const char *)_S, _P)); }
+}
+#endif
+#endif  /* __cplusplus */
+
+#endif  /* _MB_MAP_DIRECT */
+
+
+/* MBCS-specific mappings */
+
+#define _tccmp(_cp1,_cp2)   _tcsnccmp(_cp1,_cp2,1)
+
+
+/* ctype functions */
+
+#define _istalnum       _ismbcalnum
+#define _istalnum_l     _ismbcalnum_l
+#define _istalpha       _ismbcalpha
+#define _istalpha_l     _ismbcalpha_l
+#define _istdigit       _ismbcdigit
+#define _istdigit_l     _ismbcdigit_l
+#define _istgraph       _ismbcgraph
+#define _istgraph_l     _ismbcgraph_l
+#define _istlegal       _ismbclegal
+#define _istlegal_l     _ismbclegal_l
+#define _istlower       _ismbclower
+#define _istlower_l     _ismbclower_l
+#define _istprint       _ismbcprint
+#define _istprint_l     _ismbcprint_l
+#define _istpunct       _ismbcpunct
+#define _istpunct_l     _ismbcpunct_l
+#define _istspace       _ismbcspace
+#define _istspace_l     _ismbcspace_l
+#define _istupper       _ismbcupper
+#define _istupper_l     _ismbcupper_l
+
+#define _totupper       _mbctoupper
+#define _totupper_l     _mbctoupper_l
+#define _totlower       _mbctolower
+#define _totlower_l     _mbctolower_l
+
+#define _istlead        _ismbblead
+#define _istleadbyte    isleadbyte
+#define _istleadbyte_l  _isleadbyte_l
+
+#else   /* !_MBCS */
+
+/* ++++++++++++++++++++ SBCS ++++++++++++++++++++ */
+
+
+#ifndef __TCHAR_DEFINED
+typedef char            _TCHAR;
+typedef signed char     _TSCHAR;
+typedef unsigned char   _TUCHAR;
+typedef char            _TXCHAR;
+typedef int             _TINT;
+#define __TCHAR_DEFINED
+#endif
+
+#ifndef _TCHAR_DEFINED
+#if     !__STDC__
+typedef char            TCHAR;
+#endif
+#define _TCHAR_DEFINED
+#endif
+
+
+/* String functions */
+
+#define _tcschr         strchr
+#define _tcscspn        strcspn
+#define _tcsncat        strncat
+#define _tcsncat_s      strncat_s
+#define _tcsncat_l      _strncat_l
+#define _tcsncat_s_l    _strncat_s_l
+#define _tcsncpy        strncpy
+#define _tcsncpy_s      strncpy_s
+#define _tcsncpy_l      _strncpy_l
+#define _tcsncpy_s_l    _strncpy_s_l
+#define _tcspbrk        strpbrk
+#define _tcsrchr        strrchr
+#define _tcsspn         strspn
+#define _tcsstr         strstr
+#define _tcstok         strtok
+#define _tcstok_s       strtok_s
+#define _tcstok_l       _strtok_l
+#define _tcstok_s_l     _strtok_s_l
+
+#define _tcsnset        _strnset
+#define _tcsnset_s      _strnset_s
+#define _tcsnset_l      _strnset_l
+#define _tcsnset_s_l    _strnset_s_l
+#define _tcsrev         _strrev
+#define _tcsset         _strset
+#define _tcsset_s       _strset_s
+#define _tcsset_s       _strset_s
+#define _tcsset_s_l     _strset_s_l
+
+#define _tcscmp         strcmp
+#define _tcsicmp        _stricmp
+#define _tcsicmp_l      _stricmp_l
+#define _tcsnccmp       strncmp
+#define _tcsncmp        strncmp
+#define _tcsncicmp      _strnicmp
+#define _tcsncicmp_l    _strnicmp_l
+#define _tcsnicmp       _strnicmp
+#define _tcsnicmp_l     _strnicmp_l
+
+#define _tcscoll        strcoll
+#define _tcscoll_l      _strcoll_l
+#define _tcsicoll       _stricoll
+#define _tcsicoll_l     _stricoll_l
+#define _tcsnccoll      _strncoll
+#define _tcsnccoll_l    _strncoll_l
+#define _tcsncoll       _strncoll
+#define _tcsncoll_l     _strncoll_l
+#define _tcsncicoll     _strnicoll
+#define _tcsncicoll_l   _strnicoll_l
+#define _tcsnicoll      _strnicoll
+#define _tcsnicoll_l    _strnicoll_l
+
+/* "logical-character" mappings */
+
+#define _tcsclen        strlen
+#define _tcscnlen       strnlen
+#define _tcsclen_l(_String, _Locale) strlen(_String)
+#define _tcscnlen_l(_String, _Max_count, _Locale) strnlen_l((_String), (_Max_count))
+#define _tcsnccat       strncat
+#define _tcsnccat_s     strncat_s  
+#define _tcsnccat_l     _strncat_l  
+#define _tcsnccat_s_l   _strncat_s_l
+#define _tcsnccpy       strncpy
+#define _tcsnccpy_s     strncpy_s  
+#define _tcsnccpy_l     _strncpy_l  
+#define _tcsnccpy_s_l   _strncpy_s_l
+#define _tcsncset       _strnset
+
+
+/* MBCS-specific functions */
+
+#define _tcsdec     _strdec
+#define _tcsinc     _strinc
+#define _tcsnbcnt   _strncnt
+#define _tcsnccnt   _strncnt
+#define _tcsnextc   _strnextc
+#define _tcsninc    _strninc
+#define _tcsspnp    _strspnp
+
+#define _tcslwr     _strlwr
+#define _tcslwr_l   _strlwr_l
+#define _tcslwr_s   _strlwr_s
+#define _tcslwr_s_l _strlwr_s_l
+#define _tcsupr     _strupr
+#define _tcsupr_l   _strupr_l
+#define _tcsupr_s   _strupr_s
+#define _tcsupr_s_l _strupr_s_l
+#define _tcsxfrm    strxfrm
+#define _tcsxfrm_l  _strxfrm_l
+
+#define _istlead(_Char)                 (0)
+#define _istleadbyte(_Char)             (0)
+#define _istleadbyte_l(_Char, _Locale)  (0)
+
+#if     __STDC__ || defined(_NO_INLINING)
+#define _tclen(_pc) (1)
+#define _tccpy(_pc1,_cpc2) (*(_pc1) = *(_cpc2))
+#define _tccmp(_cpc1,_cpc2) (((unsigned char)*(_cpc1))-((unsigned char)*(_cpc2)))
+#else   /* __STDC__ */
+__inline __checkReturn size_t __CRTDECL _tclen(__in_z const char *_cpc)
+{ 
+    /* avoid compiler warning */
+    (void *)_cpc;
+    return 1;
+}
+__inline void __CRTDECL _tccpy(__out char *_pc1, __in_z const char *_cpc2) { *_pc1 = *_cpc2; }
+__inline __checkReturn int __CRTDECL _tccmp(__in_z const char *_cpc1, __in_z const char *_cpc2) { return (int) (((unsigned char)*_cpc1)-((unsigned char)*_cpc2)); }
+#endif  /* __STDC__ */
+
+
+/* ctype-functions */
+
+#define _istalnum   isalnum
+#define _istalnum_l   _isalnum_l
+#define _istalpha   isalpha
+#define _istalpha_l   _isalpha_l
+#define _istdigit   isdigit
+#define _istdigit_l   _isdigit_l
+#define _istgraph   isgraph
+#define _istgraph_l   _isgraph_l
+#define _istlower   islower
+#define _istlower_l   _islower_l
+#define _istprint   isprint
+#define _istprint_l   _isprint_l
+#define _istpunct   ispunct
+#define _istpunct_l   _ispunct_l
+#define _istspace   isspace
+#define _istspace_l   _isspace_l
+#define _istupper   isupper
+#define _istupper_l   _isupper_l
+
+#define _totupper   toupper
+#define _totupper_l   _toupper_l
+#define _totlower   tolower
+#define _totlower_l   _tolower_l
+
+#define _istlegal(_c)   (1)
+
+
+/* the following is optional if functional versions are available */
+
+/* define NULL pointer value */
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+
+#if     __STDC__ || defined(_NO_INLINING)
+#define _strdec(_cpc1, _cpc2) ((_cpc1)>=(_cpc2) ? NULL : (_cpc2)-1)
+#define _strinc(_pc)    ((_pc)+1)
+#define _strnextc(_cpc) ((unsigned int) *(const unsigned char *)(_cpc))
+#define _strninc(_pc, _sz) (((_pc)+(_sz)))
+_CRTIMP size_t	__cdecl	__strncnt(__in_ecount_z(_Cnt) const char * _Str, __in size_t _Cnt);
+#define _strncnt(_cpc, _sz) (__strncnt(_cpc,_sz))
+#define _strspnp(_cpc1, _cpc2)                                                          (_cpc1==NULL ? NULL : ((*((_cpc1)+strspn(_cpc1,_cpc2))) ? ((_cpc1)+strspn(_cpc1,_cpc2)) : NULL))
+
+#define _strncpy_l(_Destination, _Source, _Count, _Locale)                              (strncpy(_Destination, _Source, _Count))
+#if __STDC_WANT_SECURE_LIB__
+#define _strncpy_s_l(_Destination, _Destination_size_chars, _Source, _Count, _Locale)   (strncpy_s(_Destination, _Destination_size_chars, _Source, _Count))
+#endif
+#define _strncat_l(_Destination, _Source, _Count, _Locale)                              (strncat(_Destination, _Source, _Count))
+#if __STDC_WANT_SECURE_LIB__
+#define _strncat_s_l(_Destination, _Destination_size_chars, _Source, _Count, _Locale)   (strncat_s(_Destination, _Destination_size_chars, _Source, _Count))
+#endif
+#define _strtok_l(_String, _Delimiters, _Locale)                                        (strtok(_String, _Delimiters))
+#if __STDC_WANT_SECURE_LIB__
+#define _strtok_s_l(_String, _Delimiters, _Current_position, _Locale)                   (strtok_s(_String, _Delimiters, _Current_position))
+#endif
+#define _strnset_l(_Destination, _Value, _Count, _Locale)                               (_strnset(_Destination, _Value, _Count))
+#define _strnset_s_l(_Destination, _Destination_size_chars, _Value, _Count, _Locale)    (_strnset_s(_Destination, _Destination_size_chars, _Value, _Count))
+#define _strset_l(_Destination, _Value, _Locale)                                        (_strset(_Destination, _Value))
+#define _strset_s_l(_Destination, _Destination_size_chars, _Value, _Locale)             (_strset_s(_Destination, _Destination_size_chars, _Value))
+#else   /* __STDC__ */
+__inline __checkReturn char * __CRTDECL _strdec(__in_ecount_z(_Cpc2 - _Cpc1) const char * _Cpc1, __in_z const char * _Cpc2) { return (char *)((_Cpc1)>=(_Cpc2) ? NULL : (_Cpc2-1)); }
+__inline __checkReturn char * __CRTDECL _strinc(__in_z const char * _Pc) { return (char *)(_Pc+1); }
+__inline __checkReturn unsigned int __CRTDECL _strnextc(__in_z const char * _Cpc) { return (unsigned int)*(const unsigned char *)_Cpc; }
+__inline __checkReturn char * __CRTDECL _strninc(__in_ecount_z(_Sz) const char * _Pc, __in size_t _Sz) { return (char *)(_Pc+_Sz); }
+__inline __checkReturn size_t __CRTDECL _strncnt(__in_ecount_z(_Cnt)  const char * _String, __in size_t _Cnt) 
+{ 
+        size_t n = _Cnt; 
+        char *cp = (char *)_String; 
+        while (n-- && *cp) 
+                cp++; 
+        return _Cnt - n - 1; 
+}
+__inline __checkReturn char * __CRTDECL _strspnp
+( 
+    __in_z const char * _Cpc1, 
+    __in_z const char * _Cpc2
+) 
+{ 
+    return _Cpc1==NULL ? NULL : ((*(_Cpc1 += strspn(_Cpc1,_Cpc2))!='\0') ? (char*)_Cpc1 : NULL); 
+}
+
+_CRT_INSECURE_DEPRECATE(_strncpy_s_l) __inline char * __CRTDECL _strncpy_l(__out_ecount(_Count) char *_Destination, __in_z const char *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return strncpy(_Destination, _Source, _Count);
+#pragma warning( pop )
+}
+
+#if __STDC_WANT_SECURE_LIB__
+__inline __checkReturn_wat errno_t __CRTDECL _strncpy_s_l(__out_ecount(_Destination_size_chars) char *_Destination, __in size_t _Destination_size_chars, __in_z const char *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return strncpy_s(_Destination, _Destination_size_chars, _Source, _Count);
+#pragma warning( pop )
+}
+#endif
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _strncpy_s_l, __out_ecount(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count, __in_opt _locale_t, _Locale)
+
+_CRT_INSECURE_DEPRECATE(_strncat_s_l) __inline char * __CRTDECL _strncat_l(__inout_z char *_Destination, __in_z const char *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 6054 )
+    return strncat(_Destination, _Source, _Count);
+#pragma warning( pop )
+}
+
+#if __STDC_WANT_SECURE_LIB__
+__inline __checkReturn_wat errno_t __CRTDECL _strncat_s_l(__inout_ecount_z(_Destination_size_chars) char *_Destination, __in size_t _Destination_size_chars, __in_z const char *_Source, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return strncat_s(_Destination, _Destination_size_chars, _Source, _Count);
+#pragma warning(pop)
+}
+#endif
+
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(errno_t, _strncat_s_l, __inout_ecount_z(_Size) char, _Dest, __in_z const char *, _Source, __in size_t, _Count, __in_opt _locale_t, _Locale)
+
+_CRT_INSECURE_DEPRECATE(_strtok_s_l) __inline __checkReturn char *  _strtok_l(__inout_z_opt char * _String, __in_z const char * _Delimiters, __in_opt _locale_t _Locale) 
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return strtok(_String,_Delimiters);
+#pragma warning(pop)
+}
+
+#if __STDC_WANT_SECURE_LIB__
+__inline __checkReturn char *  _strtok_s_l(__inout_z_opt char * _String, __in_z const char * _Delimiters, __deref_inout_z_opt char **_Current_position, __in_opt _locale_t _Locale) 
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning(push)
+#pragma warning(disable:4996)
+    return strtok_s(_String, _Delimiters, _Current_position);
+#pragma warning(pop)
+}
+#endif
+
+_CRT_INSECURE_DEPRECATE(_strnset_s_l) __inline char * __CRTDECL _strnset_l(__inout char *_Destination, __in int _Value, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 6054 )
+    return _strnset(_Destination, _Value, _Count);
+#pragma warning( pop )
+}
+
+__inline errno_t __CRTDECL _strnset_s_l(__inout_ecount_z(_Destination_size_chars) char *_Destination, __in size_t _Destination_size_chars, __in int _Value, __in size_t _Count, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _strnset_s(_Destination, _Destination_size_chars, _Value, _Count);
+#pragma warning( pop )
+}
+
+_CRT_INSECURE_DEPRECATE(_strset_s_l) __inline char * __CRTDECL _strset_l(__inout_z char * _Destination, __in int _Value, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _strset(_Destination, _Value);
+#pragma warning( pop )
+}
+
+__inline errno_t __CRTDECL _strset_s_l(__inout_ecount_z(_Destination_size_chars) char *_Destination, __in size_t _Destination_size_chars, __in int _Value, __in_opt _locale_t _Locale)
+{
+    _CRT_UNUSED(_Locale);
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _strset_s(_Destination, _Destination_size_chars, _Value);
+#pragma warning( pop )
+}
+
+#endif  /* __STDC__ */
+
+
+#endif  /* _MBCS */
+
+
+#endif  /* _UNICODE */
+
+
+/* Generic text macros to be used with string literals and character constants.
+   Will also allow symbolic constants that resolve to same. */
+
+#define _T(x)       __T(x)
+#define _TEXT(x)    __T(x)
+
+
+#ifdef  __cplusplus
+}   /* ... extern "C" */
+#endif
+
+#endif  /* _INC_TCHAR */
+
diff --git a/base/Windows/Inc/time.h b/base/Windows/Inc/time.h
new file mode 100644
index 0000000..08d1990
--- /dev/null
+++ b/base/Windows/Inc/time.h
@@ -0,0 +1,303 @@
+/***
+*time.h - definitions/declarations for time routines
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file has declarations of time routines and defines
+*       the structure returned by the localtime and gmtime routines and
+*       used by asctime.
+*       [ANSI/System V]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_TIME
+#define _INC_TIME
+
+#include <crtdefs.h>
+
+#if     !defined(_WIN32)
+#error ERROR: Only Win32 target supported!
+#endif
+
+
+#ifdef  _MSC_VER
+/*
+ * Currently, all MS C compilers for Win32 platforms default to 8 byte
+ * alignment.
+ */
+#pragma pack(push,_CRT_PACKING)
+#endif  /* _MSC_VER */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+#if !defined(_W64)
+#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#define _W64 __w64
+#else
+#define _W64
+#endif
+#endif
+
+/* Define _CRTIMP */
+
+#ifndef _CRTIMP
+#ifdef  _DLL
+#define _CRTIMP __declspec(dllimport)
+#else   /* ndef _DLL */
+#define _CRTIMP
+#endif  /* _DLL */
+#endif  /* _CRTIMP */
+
+
+/* Define __cdecl for non-Microsoft compilers */
+
+#if     ( !defined(_MSC_VER) && !defined(__cdecl) )
+#define __cdecl
+#endif
+
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+
+#ifndef _TIME32_T_DEFINED
+typedef _W64 long __time32_t;   /* 32-bit time value */
+#define _TIME32_T_DEFINED
+#endif
+
+#ifndef _TIME64_T_DEFINED
+#if     _INTEGRAL_MAX_BITS >= 64
+typedef __int64 __time64_t;     /* 64-bit time value */
+#endif
+#define _TIME64_T_DEFINED
+#endif
+
+#ifndef _TIME_T_DEFINED
+#ifdef _USE_32BIT_TIME_T
+typedef __time32_t time_t;      /* time value */
+#else
+typedef __time64_t time_t;      /* time value */
+#endif
+#define _TIME_T_DEFINED         /* avoid multiple def's of time_t */
+#endif
+
+#ifndef _CLOCK_T_DEFINED
+typedef long clock_t;
+#define _CLOCK_T_DEFINED
+#endif
+
+#ifndef _SIZE_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64    size_t;
+#else
+typedef _W64 unsigned int   size_t;
+#endif
+#define _SIZE_T_DEFINED
+#endif
+
+/* Define NULL pointer value */
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL    0
+#else
+#define NULL    ((void *)0)
+#endif
+#endif
+
+
+#ifndef _TM_DEFINED
+struct tm {
+        int tm_sec;     /* seconds after the minute - [0,59] */
+        int tm_min;     /* minutes after the hour - [0,59] */
+        int tm_hour;    /* hours since midnight - [0,23] */
+        int tm_mday;    /* day of the month - [1,31] */
+        int tm_mon;     /* months since January - [0,11] */
+        int tm_year;    /* years since 1900 */
+        int tm_wday;    /* days since Sunday - [0,6] */
+        int tm_yday;    /* days since January 1 - [0,365] */
+        int tm_isdst;   /* daylight savings time flag */
+        };
+#define _TM_DEFINED
+#endif
+
+
+/* Clock ticks macro - ANSI version */
+
+#define CLOCKS_PER_SEC  1000
+
+
+/* Extern declarations for the global variables used by the ctime family of
+ * routines.
+ */
+
+/* non-zero if daylight savings time is used */
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_daylight) _CRTIMP __checkReturn int* __cdecl __daylight(void);
+#define _daylight (*__daylight())
+
+/* offset for Daylight Saving Time */
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_dstbias) _CRTIMP __checkReturn long* __cdecl __dstbias(void);
+#define _dstbias (*__dstbias())
+
+/* difference in seconds between GMT and local time */
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_timezone) _CRTIMP __checkReturn long* __cdecl __timezone(void);
+#define _timezone (*__timezone())
+
+/* standard/daylight savings time zone names */
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_tzname) _CRTIMP __checkReturn __deref_out_z char ** __cdecl __tzname(void);
+#define _tzname (__tzname())
+
+_CRTIMP errno_t __cdecl _get_daylight(__out int * _Daylight);
+_CRTIMP errno_t __cdecl _get_dstbias(__out long * _Daylight_savings_bias);
+_CRTIMP errno_t __cdecl _get_timezone(__out long * _Timezone);
+_CRTIMP errno_t __cdecl _get_tzname(__out size_t *_ReturnValue, __out_ecount_z(_SizeInBytes) char *_Buffer, __in size_t _SizeInBytes, __in int _Index);
+
+
+/* Function prototypes */
+_CRT_INSECURE_DEPRECATE(asctime_s) _CRTIMP __checkReturn char * __cdecl asctime(__in const struct tm * _Tm);
+#if __STDC_WANT_SECURE_LIB__
+_CRTIMP __checkReturn_wat errno_t __cdecl asctime_s(__out_ecount_part(_SizeInBytes, 26) char *_Buf, __in size_t _SizeInBytes, __in const struct tm * _Tm);
+#endif
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, asctime_s, __out_ecount_part(_Size,26) char, _Buffer, __in const struct tm *, _Time)
+
+_CRT_INSECURE_DEPRECATE(_ctime32_s) _CRTIMP char * __cdecl _ctime32(__in const __time32_t * _Time);
+_CRTIMP errno_t __cdecl _ctime32_s(__out_ecount_part(_SizeInBytes, 26) char *_Buf, __in size_t _SizeInBytes, __in const __time32_t *_Time);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _ctime32_s, __out_ecount_part(_Size, 26) char, _Buffer, __in const __time32_t *, _Time)
+
+_CRTIMP __checkReturn clock_t __cdecl clock(void);
+_CRTIMP double __cdecl _difftime32(__in __time32_t _Time1, __in __time32_t _Time2);
+
+_CRT_INSECURE_DEPRECATE(_gmtime32_s) _CRTIMP __checkReturn struct tm * __cdecl _gmtime32(__in const __time32_t * _Time);
+_CRTIMP __checkReturn_wat errno_t __cdecl _gmtime32_s(__in struct tm *_Tm, __in const __time32_t * _Time);
+
+_CRT_INSECURE_DEPRECATE(_localtime32_s) _CRTIMP struct tm * __cdecl _localtime32(__in const __time32_t * _Time);
+_CRTIMP errno_t __cdecl _localtime32_s(__out struct tm *_Tm, __in const __time32_t * _Time);
+
+_CRTIMP size_t __cdecl strftime(__out_ecount_z(_SizeInBytes) char * _Buf, __in size_t _SizeInBytes, __in_z __format_string const char * _Format, __in const struct tm * _Tm);
+_CRTIMP size_t __cdecl _strftime_l(__out_z char *_Buf, __in size_t _Max_size, __in_z __format_string const char * _Format, __in const struct tm *_Tm, __in_opt _locale_t _Locale);
+
+_CRTIMP __checkReturn_wat errno_t __cdecl _strdate_s(__out_ecount_part(_SizeInBytes, 9) char *_Buf, __in size_t _SizeInBytes);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _strdate_s, __out_ecount_part(_Size, 9) char, _Buffer)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(char *, __RETURN_POLICY_DST, _CRTIMP, _strdate, __out_ecount_z(9) char, _Buffer)
+
+_CRTIMP __checkReturn_wat errno_t __cdecl _strtime_s(__out_ecount_part(_SizeInBytes, 9) char *_Buf , __in size_t _SizeInBytes);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _strtime_s, __out_ecount_part(_Size,9) char, _Buffer)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(char *, __RETURN_POLICY_DST, _CRTIMP, _strtime, __out_ecount_z(9) char, _Buffer)
+
+_CRTIMP __time32_t __cdecl _time32(__out_opt __time32_t * _Time);
+_CRTIMP __time32_t __cdecl _mktime32(__inout struct tm * _Tm);
+_CRTIMP __time32_t __cdecl _mkgmtime32(__inout struct tm * _Tm);
+
+#ifdef  _POSIX_
+_CRTIMP void __cdecl tzset(void);
+#else
+_CRTIMP void __cdecl _tzset(void);
+#endif
+
+#if     _INTEGRAL_MAX_BITS >= 64
+_CRTIMP __checkReturn double __cdecl _difftime64(__in __time64_t _Time1, __in __time64_t _Time2);
+_CRT_INSECURE_DEPRECATE(_ctime64_s) _CRTIMP char * __cdecl _ctime64(__in const __time64_t * _Time);
+_CRTIMP errno_t __cdecl _ctime64_s(__out_ecount_z(_SizeInBytes) char *_Buf, __in size_t _SizeInBytes, __in const __time64_t * _Time);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _ctime64_s, __out_ecount(_Size) char, _Buffer, __in const __time64_t *, _Time)
+
+_CRT_INSECURE_DEPRECATE(_gmtime64_s) _CRTIMP struct tm * __cdecl _gmtime64(__in const __time64_t * _Time);
+_CRTIMP errno_t __cdecl _gmtime64_s(__out struct tm *_Tm, __in const __time64_t *_Time);
+
+_CRT_INSECURE_DEPRECATE(_localtime64_s) _CRTIMP struct tm * __cdecl _localtime64(__in const __time64_t * _Time);
+_CRTIMP errno_t __cdecl _localtime64_s(__out struct tm *_Tm, __in const __time64_t *_Time);
+
+_CRTIMP __time64_t __cdecl _mktime64(__inout struct tm * _Tm);
+_CRTIMP __time64_t __cdecl _mkgmtime64(__inout struct tm * _Tm);
+_CRTIMP __time64_t __cdecl _time64(__out_opt __time64_t * _Time);
+#endif
+
+/* The Win32 API GetLocalTime and SetLocalTime should be used instead. */
+_CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _getsystime(__out struct tm * _Tm);
+_CRT_OBSOLETE(SetLocalTime) unsigned __cdecl _setsystime(__in struct tm * _Tm, unsigned _MilliSec);
+
+
+#ifndef _SIZE_T_DEFINED
+typedef unsigned int size_t;
+#define _SIZE_T_DEFINED
+#endif
+
+#ifndef _WTIME_DEFINED
+
+/* wide function prototypes, also declared in wchar.h */
+ 
+_CRT_INSECURE_DEPRECATE(_wasctime_s) _CRTIMP wchar_t * __cdecl _wasctime(__in const struct tm * _Tm);
+_CRTIMP errno_t __cdecl _wasctime_s(__out_ecount_part(_SizeInWords, 26) wchar_t *_Buf, __in size_t _SizeInWords, __in const struct tm * _Tm);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wasctime_s, __out_ecount_part(_Size,26) wchar_t, _Buffer, __in const struct tm *, _Time)
+
+_CRT_INSECURE_DEPRECATE(_wctime32_s) _CRTIMP wchar_t * __cdecl _wctime32(__in const __time32_t *_Time);
+_CRTIMP errno_t __cdecl _wctime32_s(__out_ecount_part(_SizeInWords, 26) wchar_t* _Buf, __in size_t _SizeInWords, __in const __time32_t * _Time);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wctime32_s, __out_ecount_part(_Size,26) wchar_t, _Buffer, __in const __time32_t *, _Time)
+
+_CRTIMP size_t __cdecl wcsftime(__out_ecount_z(_SizeInWords) wchar_t * _Buf, __in size_t _SizeInWords, __in_z __format_string const wchar_t * _Format,  __in const struct tm * _Tm);
+_CRTIMP size_t __cdecl _wcsftime_l(__out_ecount_z(_SizeInWords) wchar_t * _Buf, __in size_t _SizeInWords, __in_z __format_string const wchar_t *_Format, __in const struct tm *_Tm, __in_opt _locale_t _Locale);
+
+_CRTIMP errno_t __cdecl _wstrdate_s(__out_ecount_part(_SizeInWords, 9) wchar_t * _Buf, __in size_t _SizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wstrdate_s, __out_ecount_part(_Size, 9) wchar_t, _Buffer)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wstrdate, __out_ecount_z(9) wchar_t, _Buffer)
+
+_CRTIMP errno_t __cdecl _wstrtime_s(__out_ecount_part(_SizeInWords,9) wchar_t * _Buf, __in size_t _SizeInWords);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wstrtime_s, __out_ecount_part(_Size, 9) wchar_t, _Buffer)
+__DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(wchar_t *, __RETURN_POLICY_DST, _CRTIMP, _wstrtime, __out_ecount_z(9) wchar_t, _Buffer)
+
+#if     _INTEGRAL_MAX_BITS >= 64
+_CRT_INSECURE_DEPRECATE(_wctime64_s) _CRTIMP wchar_t * __cdecl _wctime64(__in const __time64_t * _Time);
+_CRTIMP errno_t __cdecl _wctime64_s(__out_ecount_part(_SizeInWords, 26) wchar_t* _Buf, __in size_t _SizeInWords, __in const __time64_t *_Time);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wctime64_s, __out_ecount_part(_Size,26) wchar_t, _Buffer, __in const __time64_t *, _Time)
+#endif
+
+#if !defined(RC_INVOKED) && !defined(__midl)
+#include <wtime.inl>
+#endif
+
+#define _WTIME_DEFINED
+#endif
+
+#if !defined(RC_INVOKED) && !defined(__midl)
+#include <time.inl>
+#endif
+
+#if     !__STDC__ || defined(_POSIX_)
+
+/* Non-ANSI names for compatibility */
+
+#define CLK_TCK  CLOCKS_PER_SEC
+
+/*
+daylight, timezone, and tzname are not available under /clr:pure.
+Please use _daylight, _timezone, and _tzname or 
+_get_daylight, _get_timezone, and _get_tzname instead.
+*/
+#if !defined(_M_CEE_PURE)
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_daylight) _CRTIMP extern int daylight;
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_timezone) _CRTIMP extern long timezone;
+_CRT_INSECURE_DEPRECATE_GLOBALS(_get_tzname) _CRTIMP extern char * tzname[2];
+#endif /* !defined(_M_CEE_PURE) */
+
+_CRT_NONSTDC_DEPRECATE(_tzset) _CRTIMP void __cdecl tzset(void);
+
+#endif  /* __STDC__ */
+
+
+#ifdef  __cplusplus
+}
+#endif
+
+#ifdef  _MSC_VER
+#pragma pack(pop)
+#endif  /* _MSC_VER */
+
+#endif  /* _INC_TIME */
diff --git a/base/Windows/Inc/time.inl b/base/Windows/Inc/time.inl
new file mode 100644
index 0000000..112797b
--- /dev/null
+++ b/base/Windows/Inc/time.inl
@@ -0,0 +1,141 @@
+/***
+*time.inl - inline definitions for time-related functions
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file contains the time-related function definitions.
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#if !defined(__CRTDECL)
+#if defined(_M_CEE_PURE)
+#define __CRTDECL
+#else
+#define __CRTDECL   __cdecl
+#endif
+#endif
+
+#ifndef _INC_TIME_INL
+#define _INC_TIME_INL
+#ifndef RC_INVOKED
+
+#ifdef _USE_32BIT_TIME_T
+static __inline double __CRTDECL difftime(time_t _Time1, time_t _Time2)
+{
+    return _difftime32(_Time1,_Time2);
+}
+_CRT_INSECURE_DEPRECATE(ctime_s) static __inline char * __CRTDECL ctime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _ctime32(_Time);
+#pragma warning( pop )
+}
+#if __STDC_WANT_SECURE_LIB__
+static __inline errno_t __CRTDECL ctime_s(char *_Buffer, size_t _SizeInBytes, const time_t * _Time)
+{
+    return _ctime32_s(_Buffer, _SizeInBytes, _Time);
+}
+#endif
+_CRT_INSECURE_DEPRECATE(gmtime_s) static __inline struct tm * __CRTDECL gmtime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _gmtime32(_Time);
+#pragma warning( pop )
+}
+#if __STDC_WANT_SECURE_LIB__
+static __inline errno_t __CRTDECL gmtime_s(struct tm * _Tm, const time_t * _Time)
+{
+    return _gmtime32_s(_Tm, _Time);
+}
+#endif
+_CRT_INSECURE_DEPRECATE(localtime_s) static __inline struct tm * __CRTDECL localtime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _localtime32(_Time);
+#pragma warning( pop )
+}
+static __inline errno_t __CRTDECL localtime_s(struct tm * _Tm, const time_t * _Time)
+{
+    return _localtime32_s(_Tm, _Time);
+}
+static __inline time_t __CRTDECL mktime(struct tm * _Tm)
+{
+    return _mktime32(_Tm);
+}
+static __inline time_t __CRTDECL _mkgmtime(struct tm * _Tm)
+{
+    return _mkgmtime32(_Tm);
+}
+static __inline time_t __CRTDECL time(time_t * _Time)
+{
+    return _time32(_Time);
+}
+#else
+static __inline double __CRTDECL difftime(time_t _Time1, time_t _Time2)
+{
+    return _difftime64(_Time1,_Time2);
+}
+_CRT_INSECURE_DEPRECATE(ctime_s) static __inline char * __CRTDECL ctime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _ctime64(_Time);
+#pragma warning( pop )
+}
+#if __STDC_WANT_SECURE_LIB__
+static __inline errno_t __CRTDECL ctime_s(char *_Buffer, size_t _SizeInBytes, const time_t * _Time)
+{
+    return _ctime64_s(_Buffer, _SizeInBytes, _Time);
+}
+#endif
+_CRT_INSECURE_DEPRECATE(gmtime_s) static __inline struct tm * __CRTDECL gmtime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _gmtime64(_Time);
+#pragma warning( pop )
+}
+#if __STDC_WANT_SECURE_LIB__
+static __inline errno_t __CRTDECL gmtime_s(struct tm * _Tm, const time_t * _Time)
+{
+    return _gmtime64_s(_Tm, _Time);
+}
+#endif
+_CRT_INSECURE_DEPRECATE(localtime_s) static __inline struct tm * __CRTDECL localtime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _localtime64(_Time);
+#pragma warning( pop )
+}
+static __inline errno_t __CRTDECL localtime_s(struct tm * _Tm, const time_t * _Time)
+{
+    return _localtime64_s(_Tm, _Time);
+}
+static __inline time_t __CRTDECL mktime(struct tm * _Tm)
+{
+    return _mktime64(_Tm);
+}
+static __inline time_t __CRTDECL _mkgmtime(struct tm * _Tm)
+{
+    return _mkgmtime64(_Tm);
+}
+static __inline time_t __CRTDECL time(time_t * _Time)
+{
+    return _time64(_Time);
+}
+#endif /* _USE_32BIT_TIME_T */
+
+
+#endif /* RC_INVOKED */
+#endif /* _INC_TIME_INL */
diff --git a/base/Windows/Inc/vadefs.h b/base/Windows/Inc/vadefs.h
new file mode 100644
index 0000000..6a5d6e3
--- /dev/null
+++ b/base/Windows/Inc/vadefs.h
@@ -0,0 +1,154 @@
+/***
+*vadefs.h - defines helper macros for stdarg.h
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This is a helper file for stdarg.h
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_VADEFS
+#define _INC_VADEFS
+
+#if     !defined(_WIN32)
+#error ERROR: Only Win32 target supported!
+#endif
+
+
+#ifdef  _MSC_VER
+/*
+ * Currently, all MS C compilers for Win32 platforms default to 8 byte
+ * alignment.
+ */
+#undef _CRT_PACKING
+#define _CRT_PACKING 8
+#pragma pack(push,_CRT_PACKING)
+#endif  /* _MSC_VER */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+#if !defined(_W64)
+#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#define _W64 __w64
+#else
+#define _W64
+#endif
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64    uintptr_t;
+#else
+typedef _W64 unsigned int   uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+
+#ifndef _VA_LIST_DEFINED
+#ifdef _M_CEE_PURE
+typedef System::ArgIterator va_list;
+#else
+typedef char *  va_list;
+#endif /* _M_CEE_PURE */
+#define _VA_LIST_DEFINED
+#endif
+
+#ifdef  __cplusplus
+#define _ADDRESSOF(v)   ( &reinterpret_cast<const char &>(v) )
+#else
+#define _ADDRESSOF(v)   ( &(v) )
+#endif
+
+#if     defined(_M_IA64) && !defined(_M_CEE_PURE)
+#define _VA_ALIGN       8
+#define _SLOTSIZEOF(t)   ( (sizeof(t) + _VA_ALIGN - 1) & ~(_VA_ALIGN - 1) )
+
+#define _VA_STRUCT_ALIGN  16 
+
+#define _ALIGNOF(ap) ((((ap)+_VA_STRUCT_ALIGN - 1) & ~(_VA_STRUCT_ALIGN -1)) \
+        - (ap))
+#define _APALIGN(t,ap)  (__alignof(t) > 8 ? _ALIGNOF((uintptr_t) ap) : 0)
+
+#else
+#define _SLOTSIZEOF(t)   (sizeof(t))
+#define _APALIGN(t,ap)  (__alignof(t))
+#endif
+
+#if     defined(_M_CEE)
+
+extern void __cdecl __va_start(va_list*, ...);
+extern void * __cdecl __va_arg(va_list*, ...);
+extern void __cdecl __va_end(va_list*);
+
+#define _crt_va_start(ap,v)  ( __va_start(&ap, _ADDRESSOF(v), _SLOTSIZEOF(v), \
+                                __alignof(v), _ADDRESSOF(v)) )
+#define _crt_va_arg(ap,t)    ( *(t *)__va_arg(&ap, _SLOTSIZEOF(t), \
+                                _APALIGN(t,ap), (t *)0) )
+#define _crt_va_end(ap)      ( __va_end(&ap) )
+
+#elif   defined(_M_IX86)
+
+#define _INTSIZEOF(n)   ( (sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1) )
+
+#define _crt_va_start(ap,v)  ( ap = (va_list)_ADDRESSOF(v) + _INTSIZEOF(v) )
+#define _crt_va_arg(ap,t)    ( *(t *)((ap += _INTSIZEOF(t)) - _INTSIZEOF(t)) )
+#define _crt_va_end(ap)      ( ap = (va_list)0 )
+
+#elif defined(_M_IA64)
+
+#ifdef  __cplusplus
+extern void __cdecl __va_start(va_list*, ...);
+#define _crt_va_start(ap,v)  ( __va_start(&ap, _ADDRESSOF(v), _SLOTSIZEOF(v), \
+                          _ADDRESSOF(v)) )
+#else
+#define _crt_va_start(ap,v)  ( ap = (va_list)_ADDRESSOF(v) + _SLOTSIZEOF(v) )
+#endif
+
+#define _crt_va_arg(ap,t)    (*(t *)((ap += _SLOTSIZEOF(t)+ _APALIGN(t,ap)) \
+                                                     -_SLOTSIZEOF(t)))
+
+#define _crt_va_end(ap)      ( ap = (va_list)0 )
+
+#elif defined(_M_AMD64)
+
+
+extern void __cdecl __va_start(va_list *, ...);
+
+#define _crt_va_start(ap, x) ( __va_start(&ap, x) )
+#define _crt_va_arg(ap, t)   \
+    ( ( sizeof(t) > sizeof(__int64) || ( sizeof(t) & (sizeof(t) - 1) ) != 0 ) \
+        ? **(t **)( ( ap += sizeof(__int64) ) - sizeof(__int64) ) \
+        :  *(t  *)( ( ap += sizeof(__int64) ) - sizeof(__int64) ) )
+#define _crt_va_end(ap)      ( ap = (va_list)0 )
+
+#else
+
+/* A guess at the proper definitions for other platforms */
+
+#define _INTSIZEOF(n)   ( (sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1) )
+
+#define _crt_va_start(ap,v)  ( ap = (va_list)_ADDRESSOF(v) + _INTSIZEOF(v) )
+#define _crt_va_arg(ap,t)    ( *(t *)((ap += _INTSIZEOF(t)) - _INTSIZEOF(t)) )
+#define _crt_va_end(ap)      ( ap = (va_list)0 )
+
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#ifdef  _MSC_VER
+#pragma pack(pop)
+#endif  /* _MSC_VER */
+
+#endif  /* _INC_VADEFS */
diff --git a/base/Windows/Inc/winlean.h b/base/Windows/Inc/winlean.h
new file mode 100644
index 0000000..fc7c251
--- /dev/null
+++ b/base/Windows/Inc/winlean.h
@@ -0,0 +1,141 @@
+/* Copyright (c) Microsoft Corporation.  All rights reserved. */
+
+#if !defined(NO_STATE_FLAGS) && !defined(YES_STATE_FLAGS)
+#define NO_STATE_FLAGS
+#endif // YES_STATE_FLAGS
+
+#if !defined(NOCLIPBOARD) && !defined(YESCLIPBOARD)
+#define NOCLIPBOARD
+#endif // YESCLIPBOARD
+
+#if !defined(NOCOLOR) && !defined(YESCOLOR)
+#define NOCOLOR
+#endif // YESCOLOR
+
+#if !defined(NOCRYPT) && !defined(YESCRYPT)
+#define NOCRYPT
+#endif // YESCRYPT
+
+#if !defined(NOCTLMGR) && !defined(YESCTLMGR)
+#define NOCTLMGR
+#endif // YESCTLMGR
+
+#if !defined(NODEFERWINDOWPOS) && !defined(YESDEFERWINDOWPOS)
+#define NODEFERWINDOWPOS
+#endif // YESDEFERWINDOWPOS
+
+#if !defined(NODESKTOP) && !defined(YESDESKTOP)
+#define NODESKTOP
+#endif // YESDESKTOP
+
+#if !defined(NODRAWTEXT) && !defined(YESDRAWTEXT)
+#define NODRAWTEXT
+#endif // YESDRAWTEXT
+
+#if !defined(NOGDI) && !defined(YESGDI)
+#define NOGDI
+#endif // YESGDI
+
+#if !defined(NOHELP) && !defined(YESHELP)
+#define NOHELP
+#endif // YESHELP
+
+#if !defined(NOICONS) && !defined(YESICONS)
+#define NOICONS
+#endif // YESICONS
+
+#if !defined(NOIME) && !defined(YESIME)
+#define NOIME
+#endif // YESIME
+
+#if !defined(NOKEYSTATES) && !defined(YESKEYSTATES)
+#define NOKEYSTATES
+#endif // YESKEYSTATES
+
+#if !defined(NOMB) && !defined(YESMB)
+#define NOMB
+#endif // YESMB
+
+#if !defined(NOMCX) && !defined(YESMCX)
+#define NOMCX
+#endif // YESMCX
+
+#if !defined(NOMDI) && !defined(YESMDI)
+#define NOMDI
+#endif // YESMDI
+
+#if !defined(NOMENUS) && !defined(YESMENUS)
+#define NOMENUS
+#endif // YESMENUS
+
+#if !defined(NONCMESSAGES) && !defined(YESNCMESSAGES)
+#define NONCMESSAGES
+#endif // YESNCMESSAGES
+
+#if !defined(NONLS) && !defined(YESNLS)
+#define NONLS
+#endif // YESNLS
+
+#if !defined(NORESOURCE) && !defined(YESRESOURCE)
+#define NORESOURCE
+#endif // YESRESOURCE
+
+#if !defined(NOSCROLL) && !defined(YESSCROLL)
+#define NOSCROLL
+#endif // YESSCROLL
+
+#if !defined(NOSECURITY) && !defined(YESSECURITY)
+#define NOSECURITY
+#endif // YESSECURITY
+
+#if !defined(NOSERVICE) && !defined(YESSERVICE)
+#define NOSERVICE
+#endif // YESSERVICE
+
+#if !defined(NOSHOWWINDOW) && !defined(YESSHOWWINDOW)
+#define NOSHOWWINDOW
+#endif // YESSHOWWINDOW
+
+#if !defined(NOSYSCOMMANDS) && !defined(YESSYSCOMMANDS)
+#define NOSYSCOMMANDS
+#endif // YESSYSCOMMANDS
+
+#if !defined(NOSYSMETRICS) && !defined(YESSYSMETRICS)
+#define NOSYSMETRICS
+#endif // YESSYSMETRICS
+
+#if !defined(NOSYSPARAMSINFO) && !defined(YESSYSPARAMSINFO)
+#define NOSYSPARAMSINFO
+#endif // YESSYSPARAMSINFO
+
+#if !defined(NOTRACKMOUSEEVENT) && !defined(YESTRACKMOUSEEVENT)
+#define NOTRACKMOUSEEVENT
+#endif // YESTRACKMOUSEEVENT
+
+#if !defined(NOVIRTUALKEYCODES) && !defined(YESVIRTUALKEYCODES)
+#define NOVIRTUALKEYCODES
+#endif // YESVIRTUALKEYCODES
+
+#if !defined(NOWH) && !defined(YESWH)
+#define NOWH
+#endif // YESWH
+
+#if !defined(NOWINABLE) && !defined(YESWINABLE)
+#define NOWINABLE
+#endif // YESWINABLE
+
+#if !defined(NOWINDOWSTATION) && !defined(YESWINDOWSTATION)
+#define NOWINDOWSTATION
+#endif // YESWINDOWSTATION
+
+#if !defined(NOWINOFFSETS) && !defined(YESWINOFFSETS)
+#define NOWINOFFSETS
+#endif // YESWINOFFSETS
+
+#if !defined(NOWINSTYLES) && !defined(YESWINSTYLES)
+#define NOWINSTYLES
+#endif // YESWINSTYLES
+
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
diff --git a/base/Windows/Inc/wtime.inl b/base/Windows/Inc/wtime.inl
new file mode 100644
index 0000000..fd63ad1
--- /dev/null
+++ b/base/Windows/Inc/wtime.inl
@@ -0,0 +1,63 @@
+/***
+*wtime.inl - inline definitions for wctime()
+*
+*       Copyright (c) Microsoft Corporation. All rights reserved.
+*
+*Purpose:
+*       This file contains the definition of wctime().
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#if !defined(__CRTDECL)
+#if defined(_M_CEE_PURE)
+#define __CRTDECL
+#else
+#define __CRTDECL   __cdecl
+#endif
+#endif
+
+#ifndef _INC_WTIME_INL
+#define _INC_WTIME_INL
+#ifndef RC_INVOKED
+
+#pragma warning(push)
+#pragma warning(disable:4996)
+
+#ifdef _USE_32BIT_TIME_T
+static __inline wchar_t * __CRTDECL _wctime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _wctime32(_Time);
+#pragma warning( pop )
+}
+
+static __inline errno_t __CRTDECL _wctime_s(wchar_t *_Buffer, size_t _SizeInWords, const time_t * _Time)
+{
+    return _wctime32_s(_Buffer, _SizeInWords, _Time);
+}
+#else
+static __inline wchar_t * __CRTDECL _wctime(const time_t * _Time)
+{
+#pragma warning( push )
+#pragma warning( disable : 4996 )
+    return _wctime64(_Time);
+#pragma warning( pop )
+}
+
+static __inline errno_t __CRTDECL _wctime_s(wchar_t *_Buffer, size_t _SizeInWords, const time_t * _Time)
+{
+    return _wctime64_s(_Buffer, _SizeInWords, _Time);
+}
+#endif /* _USE_32BIT_TIME_T */
+
+#pragma warning(pop)
+
+#endif /* RC_INVOKED */
+#endif /* _INC_WTIME_INL */
diff --git a/base/Windows/JobControl/Makefile b/base/Windows/JobControl/Makefile
new file mode 100644
index 0000000..610b0d3
--- /dev/null
+++ b/base/Windows/JobControl/Makefile
@@ -0,0 +1,55 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\JobControl\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\jobcontrol.exe
+
+$(OBJDIR):
+    mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\jobcontrol.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+install: $(OBJDIR) $(OBJDIR)\jobcontrol.exe
+    $(SDEDIT) ..\..\build\jobcontrol.*
+    $(COPY) $(OBJDIR)\jobcontrol.exe ..\..\build
+    $(COPY) $(OBJDIR)\jobcontrol.pdb ..\..\build
+
+##############################################################################
+
+CFLAGS=$(CFLAGS) /I..\inc /WX /W3 /Fd$(OBJDIR)\jobcontrol.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+    kernel32.lib \
+    user32.lib \
+    libcmt.lib
+
+##############################################################################
+
+{.}.c{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##########################################################################
+
+$(OBJDIR)\jobcontrol.obj: jobcontrol.c
+
+OBJS = \
+    $(OBJDIR)\jobcontrol.obj \
+
+$(OBJDIR)\jobcontrol.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
diff --git a/base/Windows/JobControl/jobcontrol.c b/base/Windows/JobControl/jobcontrol.c
new file mode 100644
index 0000000..95ca278
--- /dev/null
+++ b/base/Windows/JobControl/jobcontrol.c
@@ -0,0 +1,698 @@
+// ----------------------------------------------------------------------------
+//
+// Program: JobControl
+//
+// Purpose: Run multiple processes within a job object and/or manually kill
+//          existing job objects.  See usage for more details.
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ----------------------------------------------------------------------------
+
+#define _WIN32_WINNT 0x0500
+
+#define YESWINDOWSTATION
+#define YESSECURITY
+
+#include <winlean.h>
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+typedef struct _CONTROLLED_PROCESS {
+    HANDLE Thread;
+    HANDLE Process;
+    DWORD  ProcessId;
+    BOOL   ErrorExitFatal;
+} CONTROLLED_PROCESS, *PCONTROLLED_PROCESS;
+
+typedef struct _CONTROLLED_PROCESS_SET {
+    DWORD               ProcessCount;
+    DWORD               MaxProcessCount;
+    PCONTROLLED_PROCESS Processes;
+} CONTROLLED_PROCESS_SET, *PCONTROLLED_PROCESS_SET;
+
+typedef struct _MONITOR_THREAD_ARGS {
+    HANDLE                  hJob;
+    PCONTROLLED_PROCESS_SET pSet;
+    DWORD                   dwTimeoutSeconds;
+    HANDLE                  hMonitoringStarted;
+} MONITOR_THREAD_ARGS, *PMONITOR_THREAD_ARGS;
+
+// ----------------------------------------------------------------------------
+
+static const DWORD dwCompletionKey = 2;
+
+// Global job handle needed for graceful shutdown by control
+// event handler.
+static HANDLE ghJob = NULL;
+
+static BOOL gbVerbose = FALSE;
+
+#define tprintf(x, ...) \
+    do { \
+        if (gbVerbose) printf(x, __VA_ARGS__); \
+    } while (FALSE)
+
+// ----------------------------------------------------------------------------
+
+static BOOL WINAPI CtrlHandler(DWORD dwCtrlType)
+{
+    tprintf("Caught control event %I32u", dwCtrlType);
+    switch (dwCtrlType) {
+      case CTRL_C_EVENT:
+      case CTRL_BREAK_EVENT:
+        GenerateConsoleCtrlEvent(dwCtrlType, 0);
+      default:
+        break;
+    }
+    if (ghJob != NULL) {
+        TerminateJobObject(ghJob, (UINT)-1);
+    }
+    ExitProcess((UINT)-2);
+}
+
+static void Usage()
+{
+    printf(
+"Usage:\n" \
+"jobcontrol create|kill <jobname> [options]\n" \
+"\n" \
+"where command is one of create, kill, watch.\n" \
+"\n" \
+"CREATE COMMAND\n" \
+"--------------\n" \
+"\n" \
+"The \"create\" command creates a job object and runs any number\n" \
+"of commands with it.  The command runs for as long as the\n" \
+"specified commands are executing.\n" \
+"\n" \
+"The options available are:\n" \
+"  /LimitJobTime <seconds>          - Set limit on elapsed job time.\n" \
+"  /LimitJobUserTime <seconds>      - Set limit on elapsed job user mode time.\n" \
+"  /LimitProcessUserTime <seconds>  - Set limit on per-process user mode time\n" \
+"  /C <command>                     - Run command in job.\n" \
+"  /T <command>                     - Run command in job and terminate if\n" \
+"                                     the command fails (exit code != 0).\n" \
+"  /V                               - Run verbosely.\n" \
+"\n" \
+"Example:\n" \
+"  jobcontrol create MyJob /LimitJobTime 10 /C \"cmd.exe\"\n" \
+"\n" \
+"KILL COMMAND\n" \
+"------------\n" \
+"\n" \
+"The \"kill\" command terminates the processes within a job\n" \
+"object.  There are no relevant options.\n" \
+"\n" \
+"Example:\n" \
+"  jobcontrol kill MyJob\n" \
+"\n"
+);
+}
+
+static void
+ErrorReport(char *function)
+{
+    VOID *message;
+    DWORD error = GetLastError();
+
+    FormatMessage(
+                  FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                  FORMAT_MESSAGE_FROM_SYSTEM,
+                  NULL,
+                  error,
+                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                  (LPTSTR) &message,
+                  0, NULL );
+
+    printf("jobcontrol: %s failed with error %d: %s",
+           function, error, message);
+
+    LocalFree(message);
+}
+
+static BOOL
+ParseInt64(LPCSTR lpszValue, PINT64 pValue)
+{
+    PCHAR pszStop;
+
+    errno = 0;
+    *pValue = _strtoi64(lpszValue, &pszStop, 10);
+
+    // Return no overflow and all characters parsed.
+    return errno == 0 && *pszStop == '\0';
+}
+
+static BOOL
+ParseUInt32(LPCSTR lpszValue, PUINT32 pValue)
+{
+    PCHAR pszStop;
+
+    errno = 0;
+    *pValue = strtoul(lpszValue, &pszStop, 10);
+
+    // Return no overflow and all characters parsed.
+    return errno == 0 && *pszStop == '\0';
+}
+
+// ----------------------------------------------------------------------------
+// Interactivity check
+
+static BOOL IsInteractive()
+{
+    static int isInteractive = -1;
+
+    if (isInteractive < 0) {
+        HANDLE hwinsta;
+        if (NULL != (hwinsta = GetProcessWindowStation())) {
+            USEROBJECTFLAGS uof;
+            DWORD dwLengthNeeded;
+            if (GetUserObjectInformation(hwinsta, UOI_FLAGS, &uof,
+                                         sizeof(uof), &dwLengthNeeded) == 0) {
+                ErrorReport("GetUserObjectInformation");
+                ExitProcess((DWORD)-1);
+            }
+            isInteractive = (uof.dwFlags & WSF_VISIBLE) ? 1 : 0;
+            tprintf("Process is interactive: %c\n",
+                    isInteractive ? 't' : 'f');
+        }
+        else {
+            ErrorReport("GetProcessWindowStation");
+            ExitProcess((DWORD)-1);
+        }
+    }
+    return isInteractive ? TRUE : FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// Process Set helpers
+
+static PCONTROLLED_PROCESS_SET
+AllocateProcessSet(DWORD dwMaxProcesses)
+{
+    size_t cbBytes = (sizeof(CONTROLLED_PROCESS_SET) +
+                      dwMaxProcesses * sizeof(CONTROLLED_PROCESS));
+    PCONTROLLED_PROCESS_SET pSet = (PCONTROLLED_PROCESS_SET)malloc(cbBytes);
+    if (NULL != pSet) {
+        pSet->ProcessCount    = 0;
+        pSet->MaxProcessCount = dwMaxProcesses;
+        pSet->Processes       = (PCONTROLLED_PROCESS)(pSet + 1);
+    }
+    return pSet;
+}
+
+static void
+FreeProcessSet(PCONTROLLED_PROCESS_SET pSet)
+{
+    free(pSet);
+    pSet = NULL;
+}
+
+static PCONTROLLED_PROCESS
+FindProcessInSet(PCONTROLLED_PROCESS_SET pSet, DWORD dwProcessId)
+{
+    DWORD i;
+    for (i = 0; i < pSet->ProcessCount; i++) {
+        if (pSet->Processes[i].ProcessId == dwProcessId) {
+            return &pSet->Processes[i];
+        }
+    }
+    return NULL;
+}
+
+static void
+AddProcessToSet(PCONTROLLED_PROCESS_SET pSet,
+                HANDLE                  hThread,
+                HANDLE                  hProcess,
+                DWORD                   dwProcessId,
+                BOOL                    bErrorExitFatal)
+{
+    PCONTROLLED_PROCESS pProcess;
+
+    assert(FindProcessInSet(pSet, dwProcessId) == NULL);
+    assert(pSet->ProcessCount < pSet->MaxProcessCount);
+
+    pProcess = &pSet->Processes[pSet->ProcessCount];
+    pProcess->Thread         = hThread;
+    pProcess->Process        = hProcess;
+    pProcess->ProcessId      = dwProcessId;
+    pProcess->ErrorExitFatal = bErrorExitFatal;
+    pSet->ProcessCount++;
+}
+
+static BOOL
+RemoveProcessFromSet(PCONTROLLED_PROCESS_SET pSet, DWORD dwProcessId)
+{
+    DWORD i;
+    for (i = 0; i < pSet->ProcessCount; i++) {
+        if (pSet->Processes[i].ProcessId == dwProcessId) {
+            tprintf("Removing process %u from process set\n", dwProcessId);
+            if (pSet->ProcessCount > 1) {
+                // Swap with last element so it's there for inspection
+                CONTROLLED_PROCESS tmp = pSet->Processes[i];
+                pSet->Processes[i] = pSet->Processes[pSet->ProcessCount - 1];
+                pSet->Processes[pSet->ProcessCount - 1] = tmp;
+            }
+            pSet->ProcessCount--;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+
+static BOOL
+LimitJobUserTime(HANDLE hJob, DWORD dwLimitFlags, LPCSTR lpszValue)
+{
+    JOBOBJECT_BASIC_LIMIT_INFORMATION limits;
+    __int64 timeout;
+
+    __asm int 3;
+
+    ZeroMemory(&limits, sizeof(limits));
+
+    if (ParseInt64(lpszValue, &timeout) == FALSE) {
+        fprintf(stdout, "Bad user time limit value.");
+        return FALSE;
+    }
+    tprintf("Limiting job time to %I64d seconds\n", timeout);
+    timeout *= 1000 * 1000 * 10; // seconds to W32 kernel ticks
+    tprintf("Limiting job time to %I64d ticks\n", timeout);
+
+    if (dwLimitFlags == JOB_OBJECT_LIMIT_JOB_TIME) {
+        CopyMemory(&limits.PerJobUserTimeLimit, &timeout, sizeof(timeout));
+    }
+    else if (dwLimitFlags == JOB_OBJECT_LIMIT_PROCESS_TIME) {
+        CopyMemory(&limits.PerProcessUserTimeLimit, &timeout, sizeof(timeout));
+    }
+    else {
+        fprintf(stdout, "Bad time limit target.\n");
+        return FALSE;
+    }
+    limits.LimitFlags = dwLimitFlags;
+
+    if (SetInformationJobObject(hJob, JobObjectBasicLimitInformation,
+                                &limits, sizeof(limits)) == 0) {
+        ErrorReport("SetInformationJobObject");
+        return FALSE;
+    }
+    ErrorReport("SetInformationJobObject (no error)");
+
+    return TRUE;
+}
+
+static BOOL
+AddProcessToJob(HANDLE                  hJob,
+                LPCSTR                  lpCommandLine,
+                PCONTROLLED_PROCESS_SET pSet,
+                DWORD                   bErrorExitFatal)
+{
+    PROCESS_INFORMATION pi;
+    STARTUPINFO si;
+    DWORD dwCreationFlags;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+
+    dwCreationFlags = CREATE_SUSPENDED /* | CREATE_BREAKAWAY_FROM_JOB */;
+    if (!IsInteractive()) {
+        // If non-interactive we are presumably being run by a
+        // process and do not want to interact with the desktop.
+        // If we attempt to create a window, CreateProcess will
+        // die with permission denied.
+        dwCreationFlags |= CREATE_NO_WINDOW;
+    }
+
+    if (!CreateProcess(NULL, (LPSTR)lpCommandLine, NULL, NULL, FALSE,
+                       dwCreationFlags, NULL, NULL, &si, &pi)) {
+        fprintf(stdout, "Failed to create process: \"%s\"\n", lpCommandLine);
+        ErrorReport("CreateProcess");
+        return FALSE;
+    }
+    else if (!AssignProcessToJobObject(hJob, pi.hProcess)) {
+        ErrorReport("AssignProcessToJobObject");
+        TerminateProcess(pi.hProcess, (UINT)-1);
+        return FALSE;
+    }
+
+    AddProcessToSet(pSet, pi.hThread, pi.hProcess, pi.dwProcessId,
+                    bErrorExitFatal);
+
+    printf("jobcontrol: Adding process (%u): %s\n",
+           pi.dwProcessId, lpCommandLine);
+
+    return TRUE;
+}
+
+static BOOL
+CreateAndAssociateCompletionPort(HANDLE hJob, PHANDLE phIoPort)
+{
+    JOBOBJECT_ASSOCIATE_COMPLETION_PORT jacp;
+    HANDLE hIoPort;
+    DWORD  dwKey;
+
+    *phIoPort = INVALID_HANDLE_VALUE;
+
+    if (NULL == (hIoPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE,
+                                                  NULL, dwCompletionKey, 1))) {
+        ErrorReport("CreateIoCompletionPort");
+        return FALSE;
+    }
+
+    dwKey = dwCompletionKey;
+    jacp.CompletionKey  = (PVOID)dwKey;
+    jacp.CompletionPort = hIoPort;
+    if (!SetInformationJobObject(hJob,
+                                 JobObjectAssociateCompletionPortInformation,
+                                 &jacp, sizeof(jacp))) {
+        ErrorReport("SetInformationJobObject");
+        CloseHandle(hIoPort);
+        return FALSE;
+    }
+    *phIoPort = hIoPort;
+
+    return TRUE;
+}
+
+static DWORD WINAPI MonitorJobThreadProc(LPVOID lpParams)
+{
+    PMONITOR_THREAD_ARGS pJobArgs = (PMONITOR_THREAD_ARGS)lpParams;
+    HANDLE               hIoPort  = NULL;
+    BOOL                 bStop    = FALSE;
+    BOOL                 bFatalError = FALSE;
+
+    time_t nowTime = 0i64;
+    time_t endTime = _I64_MAX;
+
+    if (!CreateAndAssociateCompletionPort(pJobArgs->hJob, &hIoPort)) {
+        ExitThread((DWORD)-1);
+    }
+
+    if (pJobArgs->dwTimeoutSeconds > 0) {
+        time(&nowTime);
+        endTime = nowTime + pJobArgs->dwTimeoutSeconds;
+    }
+
+    tprintf("Watching job (supplied = %u, %I64d, %I64d, timeout = %I64d)\n",
+            pJobArgs->dwTimeoutSeconds, endTime, nowTime, endTime - nowTime);
+
+    SetEvent(pJobArgs->hMonitoringStarted);
+
+    while (time(&nowTime) < endTime && !bStop) {
+        DWORD        dwBytes     = 0;
+        ULONG_PTR    key         = 0;
+        LPOVERLAPPED pOverlapped = NULL;
+        DWORD        waitMillis  = INFINITE;
+
+        if (endTime - nowTime < INFINITE * 1000i64) {
+            waitMillis = (DWORD)((endTime - nowTime) * 1000);
+        }
+
+        if (!GetQueuedCompletionStatus(hIoPort, &dwBytes, &key,
+                                       &pOverlapped, waitMillis)) {
+            continue;
+        }
+        assert (key == dwCompletionKey);
+
+        switch (dwBytes) {
+          case JOB_OBJECT_MSG_END_OF_JOB_TIME:
+          case JOB_OBJECT_MSG_END_OF_PROCESS_TIME:
+          case JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT:
+          case JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT:
+          case JOB_OBJECT_MSG_JOB_MEMORY_LIMIT:
+            break;
+          case JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO:
+            printf("jobcontrol: Requested process all stopped.");
+            bStop = TRUE;
+            break;
+          case JOB_OBJECT_MSG_NEW_PROCESS:
+              {
+                  DWORD  dwProcessId = (DWORD)pOverlapped;
+                  tprintf("Process start (%d)\n", dwProcessId);
+              }
+              break;
+          case JOB_OBJECT_MSG_EXIT_PROCESS:
+          case JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS:
+              {
+                  DWORD  dwExitCode  = 0;
+                  DWORD  dwProcessId = (DWORD)pOverlapped;
+                  PCONTROLLED_PROCESS pProcess =
+                      FindProcessInSet(pJobArgs->pSet, dwProcessId);
+                  if (NULL != pProcess) {
+                      if (!GetExitCodeProcess(pProcess->Process, &dwExitCode)) {
+                          ErrorReport("GetExitCodeProcess");
+                          fprintf(stdout, "jobcontrol: Unable to get exit code of process in job\n");
+                          bStop       = TRUE;
+                          bFatalError = TRUE;
+                      }
+                      else if (dwExitCode != 0 && pProcess->ErrorExitFatal) {
+                          bStop       = TRUE;
+                          bFatalError = TRUE;
+                      }
+
+                      printf("jobcontrol: Process %u exited (%u)\n",
+                             dwProcessId, dwExitCode);
+
+                      RemoveProcessFromSet(pJobArgs->pSet, dwProcessId);
+                      if (pJobArgs->pSet->ProcessCount == 0) {
+                          bStop = TRUE;
+                      }
+                  }
+              }
+              break;
+          default:
+            // Should never happen
+            printf("jobcontrol: Unknown message type %08x", dwBytes);
+            break;
+        }
+    }
+
+    if (nowTime > endTime) {
+        printf("jobcontrol: Timed out\n");
+    }
+
+    tprintf("- Watching job (supplied = %u, %I64d, %I64d, timeout = %I64d)\n",
+            pJobArgs->dwTimeoutSeconds, endTime, nowTime, endTime - nowTime);
+
+
+    tprintf("Watch done (fatal error = %d, stop = %d)\n", bFatalError, bStop);
+
+    CloseHandle(hIoPort);
+
+    ExitThread((bFatalError || !bStop) ? (DWORD)-1 : 0);
+}
+
+static BOOL
+StartJobThreads(PCONTROLLED_PROCESS_SET pSet)
+{
+    DWORD i;
+    for (i = 0; i < pSet->ProcessCount; i++) {
+        tprintf("Starting process %d\n", pSet->Processes[i].ProcessId);
+        ResumeThread(pSet->Processes[i].Thread);
+        pSet->Processes[i].Thread = NULL;
+    }
+    return TRUE;
+}
+
+static void
+CleanupJobHandles(PCONTROLLED_PROCESS_SET pSet)
+{
+    DWORD i;
+    PCONTROLLED_PROCESS pProcess = pSet->Processes;
+    for (i = 0; i < pSet->MaxProcessCount && pProcess->ProcessId != 0;
+         i++, pProcess++) {
+        CloseHandle(pProcess->Thread);
+        CloseHandle(pProcess->Process);
+    }
+}
+
+static DWORD
+StartJobProcessesAndMonitor(HANDLE                  hJob,
+                            PCONTROLLED_PROCESS_SET pSet,
+                            DWORD                   dwTimeoutSeconds)
+{
+    HANDLE              hMonitorThread;
+    DWORD               dwMonitorThreadExitCode;
+    MONITOR_THREAD_ARGS monitorArgs;
+
+    //
+    // Fire up monitoring thread so process can track all activity
+    //
+    monitorArgs.hJob               = hJob;
+    monitorArgs.pSet               = pSet;
+    monitorArgs.dwTimeoutSeconds   = dwTimeoutSeconds;
+    monitorArgs.hMonitoringStarted = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+    hMonitorThread = CreateThread(NULL, 0, MonitorJobThreadProc,
+                                  &monitorArgs, 0, NULL);
+    if (NULL == hMonitorThread) {
+        CloseHandle(monitorArgs.hMonitoringStarted);
+        ErrorReport("CreateThread");
+        return (DWORD)-1;
+    }
+
+    //
+    // Wait for monitoring thread to reach start point
+    //
+    WaitForSingleObject(monitorArgs.hMonitoringStarted, INFINITE);
+
+    //
+    // Resume process threads associated with job
+    //
+    StartJobThreads(pSet);
+
+    //
+    // Wait for monitoring thread to kick the bucket
+    //
+    WaitForSingleObject(hMonitorThread, INFINITE);
+
+    GetExitCodeThread(hMonitorThread, &dwMonitorThreadExitCode);
+
+    CloseHandle(hMonitorThread);
+    CloseHandle(monitorArgs.hMonitoringStarted);
+
+    CleanupJobHandles(pSet);
+
+    return dwMonitorThreadExitCode;
+}
+
+// ----------------------------------------------------------------------------
+// User Commands
+
+static int
+CreateJobAndRun(int argc, LPCSTR argv[])
+{
+    BOOL                    bSuccess, bInJob;
+    DWORD                   dwMaxJobTime = 0;
+    DWORD                   dwResult;
+    PCONTROLLED_PROCESS_SET pSet;
+
+    if (argc == 0) {
+        fprintf(stdout, "Missing <jobname> and options\n");
+        return -1;
+    }
+
+    if (!IsProcessInJob(GetCurrentProcess(), NULL, &bInJob)) {
+        ErrorReport("IsProcessInJob");
+    }
+    else if (bInJob) {
+        fprintf(stdout, "Warning: jobcontrol launched inside a job\n");
+    }
+
+    tprintf("Creating job %s\n", argv[0]);
+
+    if (NULL == (ghJob = CreateJobObject(NULL, argv[0]))) {
+        ErrorReport("CreateJobObject");
+        return -1;
+    }
+
+    argv++;
+    argc--;
+
+    pSet = AllocateProcessSet(argc); // overallocation
+
+    bSuccess = TRUE;
+    while (argc != 0 && bSuccess) {
+        if (argc < 2) {
+            fprintf(stdout, "Unexpected end of arguments\n");
+            bSuccess = FALSE;
+        }
+        else if (!_strcmpi("/LimitJobUserTime", argv[0])) {
+            bSuccess = LimitJobUserTime(ghJob, JOB_OBJECT_LIMIT_JOB_TIME,
+                                        argv[1]);
+        }
+        else if (!_strcmpi("/LimitProcessUserTime", argv[0])) {
+            bSuccess = LimitJobUserTime(ghJob,JOB_OBJECT_LIMIT_PROCESS_TIME,
+                                        argv[1]);
+        }
+        else if (!_strcmpi("/LimitJobTime", argv[0])) {
+            bSuccess = ParseUInt32(argv[1], (PUINT32)&dwMaxJobTime);
+        }
+        else if (!_strcmpi("/C", argv[0])) {
+            bSuccess = AddProcessToJob(ghJob, argv[1], pSet, FALSE);
+        }
+        else if (!_strcmpi("/T", argv[0])) {
+            bSuccess = AddProcessToJob(ghJob, argv[1], pSet, TRUE);
+        }
+        else if (!_strcmpi("/V", argv[0])) {
+            gbVerbose = TRUE;
+            argv += 1;
+            argc -= 1;
+            continue;
+        }
+        else {
+            fprintf(stdout, "Unknown option \"%s\".\n", argv[0]);
+            bSuccess = FALSE;
+        }
+        argv += 2;
+        argc -= 2;
+    }
+
+    dwResult = (DWORD)-1;
+    if (bSuccess && pSet->ProcessCount != 0) {
+        dwResult = StartJobProcessesAndMonitor(ghJob, pSet, dwMaxJobTime);
+    }
+
+    FreeProcessSet(pSet);
+    TerminateJobObject(ghJob, (UINT)-1);
+    CloseHandle(ghJob);
+
+    return (int)dwResult;
+}
+
+static int
+KillJob(int argc, LPCSTR argv[])
+{
+    HANDLE hJob;
+
+    if (argc == 0) {
+        fprintf(stdout, "Missing <jobname> argument\n");
+        return -1;
+    }
+    else if (argc > 1) {
+        fprintf(stdout, "Unknown arguments passed to kill request\n");
+        Usage();
+        return -1;
+    }
+    else if (NULL == (hJob = CreateJobObject(NULL, argv[0]))) {
+        ErrorReport("CreateJobObject");
+        return -1;
+    }
+    else if (0 == TerminateJobObject(hJob, (UINT)-1)) {
+        ErrorReport("TerminateJobObject");
+        return -1;
+    }
+    tprintf("Terminated %s", argv[0]);
+
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// Main
+
+int main(int argc, const char* argv[])
+{
+    if (argc >= 3) {
+        if (_strcmpi(argv[1], "create") == 0) {
+            SetConsoleCtrlHandler(CtrlHandler, TRUE);
+            return CreateJobAndRun(argc - 2, argv + 2);
+        }
+        else if (_strcmpi(argv[1], "kill") == 0) {
+            SetConsoleCtrlHandler(CtrlHandler, TRUE);
+            return KillJob(argc - 2, argv + 2);
+        }
+        else {
+            Usage();
+        }
+    }
+    else {
+        Usage();
+        return -1;
+    }
+}
diff --git a/base/Windows/Lib/AdvAPI32.Lib b/base/Windows/Lib/AdvAPI32.Lib
new file mode 100644
index 0000000..f93e612
Binary files /dev/null and b/base/Windows/Lib/AdvAPI32.Lib differ
diff --git a/base/Windows/Lib/IPHlpApi.Lib b/base/Windows/Lib/IPHlpApi.Lib
new file mode 100644
index 0000000..4d3e1de
Binary files /dev/null and b/base/Windows/Lib/IPHlpApi.Lib differ
diff --git a/base/Windows/Lib/Kernel32.Lib b/base/Windows/Lib/Kernel32.Lib
new file mode 100644
index 0000000..c46b00a
Binary files /dev/null and b/base/Windows/Lib/Kernel32.Lib differ
diff --git a/base/Windows/Lib/Psapi.Lib b/base/Windows/Lib/Psapi.Lib
new file mode 100644
index 0000000..ae89691
Binary files /dev/null and b/base/Windows/Lib/Psapi.Lib differ
diff --git a/base/Windows/Lib/User32.Lib b/base/Windows/Lib/User32.Lib
new file mode 100644
index 0000000..15fdb04
Binary files /dev/null and b/base/Windows/Lib/User32.Lib differ
diff --git a/base/Windows/Lib/WS2_32.Lib b/base/Windows/Lib/WS2_32.Lib
new file mode 100644
index 0000000..ea06d2b
Binary files /dev/null and b/base/Windows/Lib/WS2_32.Lib differ
diff --git a/base/Windows/Lib/dbgeng.lib b/base/Windows/Lib/dbgeng.lib
new file mode 100644
index 0000000..bd70afe
Binary files /dev/null and b/base/Windows/Lib/dbgeng.lib differ
diff --git a/base/Windows/Lib/libcmt.lib b/base/Windows/Lib/libcmt.lib
new file mode 100644
index 0000000..7fb99b9
Binary files /dev/null and b/base/Windows/Lib/libcmt.lib differ
diff --git a/base/Windows/Lib/libcmt.pdb b/base/Windows/Lib/libcmt.pdb
new file mode 100644
index 0000000..0836c9d
Binary files /dev/null and b/base/Windows/Lib/libcmt.pdb differ
diff --git a/base/Windows/Lib/msvcrt.lib b/base/Windows/Lib/msvcrt.lib
new file mode 100644
index 0000000..601c7ac
Binary files /dev/null and b/base/Windows/Lib/msvcrt.lib differ
diff --git a/base/Windows/Lib/oldnames.lib b/base/Windows/Lib/oldnames.lib
new file mode 100644
index 0000000..dd23dde
Binary files /dev/null and b/base/Windows/Lib/oldnames.lib differ
diff --git a/base/Windows/Makefile b/base/Windows/Makefile
new file mode 100644
index 0000000..1a3b497
--- /dev/null
+++ b/base/Windows/Makefile
@@ -0,0 +1,89 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Makefile
+#
+##############################################################################
+
+OBJROOT=.\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+# There is a subset of directories that are just for internal
+# use and these are conditionalized below.  We also use
+# nmake_dirs to simplify variable numbers of sub-directories to
+# build.  Note: the build of nmake_dirs needs to be done
+# independently of running nmake_dirs so it handled on its own
+# in the standard target rules : all, install, clean.
+
+!IF ("$(SINGULARITY_INTERNAL)" == "Yes")
+INTERNAL_SUBDIRS =			\
+    $(MAKEDIR)\DbgDbg 			\
+    $(MAKEDIR)\pfilter 			\
+    $(MAKEDIR)\PowerSwitchService 	\
+    $(MAKEDIR)\sdizepdb
+!ELSE
+INTERNAL_SUBDIRS =
+!ENDIF
+
+SUBDIRS=				\
+    $(MAKEDIR)\bootd    		\
+    $(MAKEDIR)\distrobuilder    	\
+    $(MAKEDIR)\grabsector    		\
+    $(MAKEDIR)\jobcontrol    		\
+    $(MAKEDIR)\mkasm    		\
+    $(MAKEDIR)\mkcore    		\
+    $(MAKEDIR)\mkcontagmap    		\
+    $(MAKEDIR)\mkmani    		\
+    $(MAKEDIR)\mktests    		\
+    $(MAKEDIR)\mutexwrap    		\
+    $(MAKEDIR)\nib    			\
+    $(MAKEDIR)\substitute    		\
+    $(MAKEDIR)\mkpxecom    		\
+    $(MAKEDIR)\ProfMap    		\
+    $(MAKEDIR)\RefGraph    		\
+    $(MAKEDIR)\rialto    		\
+    $(MAKEDIR)\RunAll    		\
+    $(MAKEDIR)\RunParallel    		\
+    $(MAKEDIR)\setvhdboot    		\
+    $(MAKEDIR)\singx86    		\
+    $(MAKEDIR)\spg    			\
+    $(MAKEDIR)\SyscallBuilder    	\
+    $(MAKEDIR)\MpSyscallBuilder    	\
+    $(MAKEDIR)\Verifier    		\
+    $(INTERNAL_SUBDIRS)
+
+all: $(OBJDIR)
+    @nmake_dirs $(SUBDIRS)
+    cd $(MAKEDIR)\nmake_dirs
+    @$(MAKE) /NOLOGO /$(MAKEFLAGS)
+    @cd "$(MAKEDIR)"
+
+$(OBJDIR):
+    @if not exist $(OBJDIR) mkdir $(OBJDIR)
+
+# Please keep directories sorted by alphabetical order where possible.
+clean:
+    @nmake_dirs $(SUBDIRS) /nmake clean
+    cd $(MAKEDIR)\nmake_dirs
+    @$(MAKE) /NOLOGO /$(MAKEFLAGS) clean
+    -rmdir /q /s $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+    -rmdir /q /s "$(MAKEDIR)\SimpleParseGen" 2>nul
+    @-del *~ 2> nul
+
+# Please keep directories sorted by alphabetical order where possible.
+realclean:
+    -rmdir /q /s $(OBJROOT) 2>nul
+    @-del /s *~ 2> nul
+
+# Please keep directories sorted by alphabetical order where possible.
+install:
+    @nmake_dirs $(SUBDIRS) /nmake install
+    cd $(MAKEDIR)\nmake_dirs
+    @$(MAKE) /NOLOGO /$(MAKEFLAGS) install
+    @cd "$(MAKEDIR)"
+
+################################################################# End of File.
diff --git a/base/Windows/MpSyscallBuilder/MpSyscallBuilder.cs b/base/Windows/MpSyscallBuilder/MpSyscallBuilder.cs
new file mode 100644
index 0000000..1cb866d
--- /dev/null
+++ b/base/Windows/MpSyscallBuilder/MpSyscallBuilder.cs
@@ -0,0 +1,1826 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+//
+// File: MpSyscallBuilder.cs
+//
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+
+public class MpSyscallBuilder
+{
+    public class AbiDef
+    {
+        public AbiDef() {}
+
+        public int abiNum; // this number if important
+        public string decl;
+        public string longReturnType;
+        public string shortReturnType;
+        public string longMethodName;
+        public string longClassName;
+        public string namespaceName;
+        public string shortClassName;
+        public string shortMethodName;
+        public string shortMethodNameWithG;
+        public string [] longParamArray;
+        public string [] shortParamArray;
+    }
+
+    const string s4 = "    ";
+    const string s8 = s4 + s4;
+    const string s12 = s8 + s4;
+    const string s16 = s12 + s4;
+
+
+    static Hashtable globalClassTable = new Hashtable();
+    static Hashtable structTable = new Hashtable();
+    static Hashtable paramTable = new Hashtable();
+    static Hashtable linkStackTable = new Hashtable();
+
+    static Hashtable namespaceTable = new Hashtable();
+
+    static Hashtable typeConverter = new Hashtable();
+
+    // we allow 1000 abi defs
+    const int MAX_ABI_DEF = 1000;
+    static AbiDef [] sequentialAbiDef = new AbiDef [MAX_ABI_DEF];
+
+    static int curAbiNum = -1;
+    static int lineNumber = 0;
+    static int printCount = 0;
+
+    static bool genSingStubV1Def = false;
+    static bool genApAbiStub = false;
+    static bool genBspAbiStub = false;
+    static bool genMpSyscallsHeader = false;
+    static bool genMpSyscallsImpl = false;
+
+    static void AddType(string t)
+    {
+        if (t.StartsWith("struct ")) {
+            int end = t.IndexOf(" ", 7);
+            if (end == -1) {
+                end = t.Length;
+            }
+            string structName = t.Substring(7, end - 7);
+
+            //if (!structTable.ContainsKey(structName)) {
+            //Console.WriteLine("// Adding " + structName);
+            //}
+
+            if (end < t.Length) {
+                structTable[structName] = "";
+            }
+            else {
+                int ssize;
+                if (structName.EndsWith("Handle")) {
+                    ssize = 4;
+                }
+                else {
+                    if (!paramTable.ContainsKey("struct " + structName)) {
+                        throw new Exception("unknown struct type: " + t);
+                    }
+                    ssize = (int) paramTable["struct " + structName];
+                }
+                structTable[structName] = "char data[" + ssize + "];";
+            }
+        }
+    }
+
+    static void AddTypeToStructTable(string t)
+    {
+        if (t.StartsWith("struct ")) {
+            int end = t.IndexOf(" ", 7);
+            if (end == -1) {
+                end = t.Length;
+            }
+            string structName = t.Substring(7, end - 7);
+
+            //if (!structTable.ContainsKey(structName)) {
+            //Console.WriteLine("// Adding " + structName);
+            //}
+
+            if (end < t.Length) {
+                structTable[structName] = "";
+            }
+            else {
+                int ssize;
+                if (structName.EndsWith("Handle")) {
+                    ssize = 4;
+                }
+                else {
+                    if (!paramTable.ContainsKey("struct " + structName)) {
+                        throw new Exception("unknown struct type: " + t);
+                    }
+                    ssize = (int) paramTable["struct " + structName];
+                }
+                structTable[structName] = "char data[" + ssize + "];";
+            }
+        }
+    }
+
+    static int GetTypeSize(string type)
+    {
+        int size;
+        if (type.EndsWith("*") || type.EndsWith("Handle")) {
+            size = 4;
+        }
+        else {
+            if (!paramTable.ContainsKey(type)) {
+                throw new Exception ("unknown parameter type: " + type);
+            }
+            size = (int) paramTable[type];
+        }
+        return size;
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    //
+    public static void PrintNamespaceTable()
+    {
+        AbiDef abiDef;
+        Hashtable nsClassTable, methodTable;
+        printCount = 0;
+
+        Console.WriteLine("\n");
+        Console.WriteLine("/////////////////////////////////////");
+        Console.WriteLine("//");
+        Console.WriteLine("// This is the namespace hashtable : ");
+        Console.WriteLine("//");
+        Console.WriteLine("/////////////////////////////////////\n");
+
+        foreach (string namespaceName in namespaceTable.Keys) {
+
+            Console.WriteLine("\n" + namespaceName);
+            Console.WriteLine("###################################################");
+
+            nsClassTable = (Hashtable)namespaceTable[namespaceName];
+
+            foreach (string className in nsClassTable.Keys) {
+
+                Console.WriteLine("\n" + "  " + className);
+                Console.WriteLine("  =================================");
+
+                methodTable = (Hashtable)nsClassTable[className];
+
+                foreach (string decl in methodTable.Keys) {
+
+                    abiDef = (AbiDef)methodTable[decl];
+                    PrintAbiDef(abiDef, "    ");
+                }
+            }
+        }
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    // Print Abi Def
+    public static void PrintAbiDef(AbiDef ad, string pre)
+    {
+        Console.WriteLine(pre + "\n[" + printCount++ + "]");
+        Console.WriteLine(pre + ad.decl);
+        Console.WriteLine(pre + "---------------------------------------------------");
+        Console.WriteLine(pre + "    ABI number      : <{0,3}>", ad.abiNum);
+        Console.WriteLine(pre + "    longReturnType  : <" + ad.longReturnType + ">");
+        Console.WriteLine(pre + "    shortReturnType : <" + ad.shortReturnType + ">" +
+                          "  sz: " + GetTypeSize(ad.longReturnType));
+
+        Console.WriteLine(pre + "    longMethodName  : <" + ad.longMethodName + ">");
+        Console.WriteLine(pre + "    longClassName   : <" + ad.longClassName + ">");
+        Console.WriteLine(pre + "    namespaceName   : <" + ad.namespaceName + ">");
+        Console.WriteLine(pre + "    shortClassName  : <" + ad.shortClassName + ">");
+        Console.WriteLine(pre + "    shortMethodName : <" + ad.shortMethodName + ">");
+        Console.WriteLine(pre + "    shortMethodName2: <" + ad.shortMethodNameWithG + ">");
+
+        // test param
+        for (int v=0; v < ad.longParamArray.Length; v++) {
+            string p = "        ";
+            if (ad.longParamArray[v] != "") {
+                Console.WriteLine(pre + "    param " + v + " : ");
+                Console.WriteLine(pre + p + "longParam     : <" +
+                                  ad.longParamArray[v] + ">");
+                Console.WriteLine(pre + p + "shortParam    : <" +
+                                  ad.shortParamArray[v] + ">" +
+                                  "  sz: " + GetTypeSize(ad.longParamArray[v]));
+            }
+        }
+        Console.WriteLine();
+    }
+
+
+
+    ////////////////////////////////////////////////////////////////
+    // Option      : genSingStubV1Def
+    // Input file  : $(OBJ)/Singularity.V1.def
+    // Output file : $(OBJ)/SingularityStub.V1.def
+    // Note        : This generates SingularityStub.V1.def which is
+    //               basically Singularity.V1.def plus the stubs
+    //               definition
+    // Example     : Given a line like this
+    //               ?g_Abi@Struct_Micr_Sing_V1_Services_ProcessService@@SIHH@Z
+    //               It adds the new stub function in the new stub struct:
+    //               ?g_StubAbi@Struct_Micr_Sing_V1_Services_ProcessService@@SIHH@Z
+    public static void GenerateSingularityStubV1Def()
+    {
+        // String Indexes:
+        // ?g_Break@Struct_Microsoft_Singularity_V1_Services_DebugService@@SIXXZ
+        // a       b                                        c            d
+        //  method             namespaceName                  structName   suffix
+        int a, b, c, d, tmp;
+        string methodName = "";
+        string structName = "";
+        string namespaceName = "";
+        string suffix = "";
+
+        lineNumber = 0;
+
+        while (true) {
+
+            // read line
+            string s = Console.ReadLine();
+            lineNumber++;
+            if (s == null) {
+                break;
+            }
+
+            // print the line first
+            Console.WriteLine(s);
+
+            // is this abi definition
+            a = s.IndexOf('?');
+            if (a == -1) {
+                continue;
+            }
+
+            // At this point, we currently does not support some files
+            // For example: EndpointCore.cs is not located in
+            // Singularity/V1/Services/EndpointCore.cs
+            // instead in Singularity/Channels/EndpointCore
+            // So we're not creating the stubs for here for now.
+            // Need to think some solutions later.
+            if (s.IndexOf("_EndpointCore@") != -1) {
+                continue;
+            }
+
+
+            b = s.IndexOf('@');
+            d = s.IndexOf('@', b+1);
+            tmp = b;
+            c = b;
+            while (true) {
+                tmp = s.IndexOf('_', tmp+1);
+                if (tmp == -1 || tmp > d) {
+                    break;
+                }
+                c = tmp;
+            }
+
+            methodName = s.Substring(a, b-a); // include '?'
+            namespaceName = s.Substring(b+1, c-(b+1));
+            structName = s.Substring(c+1, d-(c+1));
+            suffix = s.Substring(d, s.Length-d);
+
+            // add "Stub" to methodName
+            if (methodName.IndexOf("?g_") != -1) {
+                methodName = methodName.Replace("?g_", "?g_Stub");
+            }
+            else if (methodName.IndexOf("?m_") != -1) {
+                methodName = methodName.Replace("?m_", "?m_Stub");
+            }
+
+            // add "Stub" to structName
+            // Nope not necessary ....
+            // structName = "Stub" + structName;
+
+            // Console.WriteLine("  namespace : <" + namespaceName + ">");
+            // Console.WriteLine("  struct    : <" + structName + ">");
+            // Console.WriteLine("  method    : <" + methodName + ">");
+            // Console.WriteLine("  suffix    : <" + suffix + ">");
+
+            Console.WriteLine("    " + methodName + "@" + namespaceName + "_" +
+                              structName + suffix);
+        }
+    }
+
+
+
+
+    ////////////////////////////////////////////////////////////////
+    // Array string for storing parameter
+    // We allow maximum of 20 parameters. If not enough, change
+    // the constant.
+    public static string [] GetParamArray() {
+        string [] paramArray = new string [20];
+        for (int i = 0; i < paramArray.Length; i++) {
+            paramArray[i] = "";
+        }
+        return paramArray;
+    }
+
+    ////////////////////////////////////////////////////////////////
+    // The function separates a long struct name into two parts
+    // divided by the last underscore mark "_"
+    // Example:
+    //   longName  : struct Struct_Micr_Sing_V1_Services_SharedHeapService_Allocation *
+    //   firstPart : struct Struct_Micr_Sing_V1_Services_SharedHeapService_
+    //   secondPart: Allocation *
+    // WARNING:
+    //   However we must careful with types that have "_". So we need to check if it
+    //   is a struct or not, if not, we just set secondPart = longName
+    public static void SeparateLongStructName(string longName, out string firstPart,
+                                              out string secondPart)
+    {
+        int tmp, i=0;
+        if (longName.IndexOf("_") == -1) {
+            firstPart = "ERROR IGNORE";
+            secondPart = longName;
+            return;
+        }
+
+        // this is not a struct
+        if (longName.IndexOf("Struct_") == -1) {
+            firstPart = "";
+            secondPart = longName;
+            return;
+        }
+
+        tmp = 0;
+        while (true) {
+            tmp = longName.IndexOf('_', tmp+1);
+            if (tmp == -1) {
+                break;
+            }
+            i = tmp;
+        }
+        firstPart = longName.Substring(0, i);
+        secondPart = longName.Substring(i+1, longName.Length-(i+1));
+    }
+
+
+    public static void SeparateNamespaceAndClass(string longName,
+                                                 out string nsName,
+                                                 out string className)
+    {
+        int tmp = 0;
+        int i = 0;
+        tmp = 0;
+        while (true) {
+            tmp = longName.IndexOf('.', tmp+1);
+            if (tmp == -1) {
+                break;
+            }
+            i = tmp;
+        }
+        nsName = longName.Substring(0, i);
+        className = longName.Substring(i+1, longName.Length-(i+1));
+    }
+
+    // increase abi number number
+    static void IncrementAbiNumber(string s)
+    {
+        if (s.IndexOf("?g_") != -1 || s.IndexOf("?m_") != -1) {
+            curAbiNum++;
+        }
+    }
+
+
+
+    ////////////////////////////////////////////////////////////////
+    // Option      : genApAbiStub
+    // Input file  : $(OBJ)/SingularityStub.V1.dumpbin
+    // Output file : StubXXX.cs (Find all Stub*.cs files
+    // Note        : This create the Stub files which contains the stub functions
+    //               that will perform the marshaling and IPI
+    // Example:
+    //
+    //
+    public static void GenerateApAbiStub()
+    {
+        printCount = 0;
+        string s;
+        AbiDef abiDef;
+        while (true) {
+            s = Console.ReadLine();
+            lineNumber++;
+
+            // end of file
+            if (s == null) {
+                break;
+            }
+
+            // We only create stub files and functions for abi definition that has
+            // g_Stub or m_Stub
+            if (s.IndexOf("?g_Stub") == -1 && s.IndexOf("?m_Stub") == -1) {
+                continue;
+            }
+
+            IncrementAbiNumber(s);
+
+            abiDef = new AbiDef();
+
+            ParseLineToAbiDef(s, abiDef);
+            // PrintAbiDef(abiDef, "");
+
+            // Now we add abiDef to hashtable
+            AddAbiDefToHashTable(abiDef);
+        }
+
+        // test
+        PrintNamespaceTable();
+        BeginCreatingApAbiStubFromNamespaceTable();
+
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    //
+    // namespaceTable[Struct_Microsoft_Singularity_V1_Services] --> nsClassTable
+    // nsClassTable[ProcessService] --> methodTable
+    // methodTable[decl] -> abiDef
+    //
+    public static void AddAbiDefToHashTable(AbiDef abiDef)
+    {
+        //
+        Hashtable nsClassTable = (Hashtable)namespaceTable[abiDef.namespaceName];
+        if (nsClassTable == null) {
+            nsClassTable = new Hashtable();
+            namespaceTable[abiDef.namespaceName] = nsClassTable;
+        }
+
+        Hashtable methodTable = (Hashtable)nsClassTable[abiDef.shortClassName];
+        if (methodTable == null) {
+            methodTable = new Hashtable();
+            nsClassTable[abiDef.shortClassName] = methodTable;
+        }
+
+        methodTable[abiDef.decl] = abiDef;
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    //
+    // We need to create the fullFileName = dirName + fileName
+    //
+    public static void BeginCreatingApAbiStubFromNamespaceTable()
+    {
+        AbiDef abiDef;
+        Hashtable nsClassTable, methodTable;
+        string abiFileName, stubFileName, dirName, fileName;
+
+        foreach (string namespaceName in namespaceTable.Keys) {
+
+            nsClassTable = (Hashtable)namespaceTable[namespaceName];
+
+            dirName = namespaceName.Replace("Struct_Microsoft_", "");
+            dirName = dirName.Replace("_","/");
+
+
+            foreach (string className in nsClassTable.Keys) {
+
+                methodTable = (Hashtable)nsClassTable[className];
+
+                fileName = className + ".cs";
+                abiFileName = dirName + "/" + fileName;
+
+                // Now we get the abiFileName at this point. e.g.
+                // Singularity/V1/Services/ProcessService.cs
+                // Next we want to copy the file to
+                // Singularity/V1/Services/StubProcessService.cs with
+                // exception the last bracket "}" because we want to
+                // add the stub functions to the file
+                stubFileName = GetStubFileName(abiFileName);
+
+                Console.WriteLine("Copy " + abiFileName);
+                Console.WriteLine("     " + stubFileName);
+
+                if (File.Exists(stubFileName)) {
+                    File.Delete(stubFileName);
+                }
+
+                FileStream fsOutput =
+                    new FileStream(stubFileName, FileMode.Create, FileAccess.Write);
+                StreamWriter stubOut = new StreamWriter(fsOutput);
+
+                FileStream fsInput =
+                    new FileStream(abiFileName, FileMode.Open, FileAccess.Read);
+                StreamReader abiIn = new StreamReader(fsInput);
+
+                CopyAbiFileToStubFile(abiIn, stubOut, abiFileName, stubFileName, className);
+
+
+                foreach (string decl in methodTable.Keys) {
+
+                    abiDef = (AbiDef)methodTable[decl];
+                    WriteApAbiStubClassMethod(stubOut, abiDef);
+
+                }
+
+                WriteApAbiStubClassFooter(stubOut);
+
+                abiIn.Close();
+                stubOut.Close();
+            }
+        }
+    }
+
+    // Given abiFileName a/b/c/d/ProcessService.cs
+    // this function returns a/b/c/d/StubProcessService.cs
+    public static string GetStubFileName(string abiFileName)
+    {
+        string dirName, fileName;
+        int tmp = 0;
+        int i = 0;
+        tmp = 0;
+        while (true) {
+            tmp = abiFileName.IndexOf('/', tmp+1);
+            if (tmp == -1) {
+                break;
+            }
+            i = tmp;
+        }
+        dirName = abiFileName.Substring(0, i);
+        fileName = abiFileName.Substring(i+1, abiFileName.Length-(i+1));
+
+        return (dirName + "/Stub" + fileName);
+
+    }
+
+    // Copy abi file to stub file, except the last bracket
+    // This is a copy line per line ... maybe in future we should
+    // write a quick script?
+    public static void CopyAbiFileToStubFile(StreamReader abiIn, StreamWriter stubOut,
+                                             string abiFileName, string stubFileName,
+                                             string className)
+    {
+        stubOut.WriteLine("///////////////////////////////////////////////////////");
+        stubOut.WriteLine("// ");
+        stubOut.WriteLine("// THIS IS AUTOMATICALLY GENERATED FILE, DO NOT MODIFY ");
+        stubOut.WriteLine("// ");
+        stubOut.WriteLine("// Generated by: Windows/MpSyscall/MpSyscallBuilder.exe");
+        stubOut.WriteLine("// ");
+        stubOut.WriteLine("// Abi  File " + abiFileName);
+        stubOut.WriteLine("// Stub File " + stubFileName);
+        stubOut.WriteLine("// ");
+        stubOut.WriteLine("// ");
+        stubOut.WriteLine("");
+
+        bool isClassDeclared = false;
+
+        string s = abiIn.ReadLine();
+        while (s != null) {
+
+            if (s.IndexOf("public struct " + className) != -1) {
+                isClassDeclared = true;
+            }
+
+            // find the last bracket after class declaration
+            if (isClassDeclared && s.IndexOf("    }") == 0) {
+                stubOut.WriteLine("");
+                break;
+            }
+            stubOut.WriteLine(s);
+            s = abiIn.ReadLine();
+        }
+    }
+
+
+    public static void WriteApAbiStubClassFooter(StreamWriter sw)
+    {
+        sw.WriteLine("    }");
+        sw.WriteLine("}");
+    }
+
+    public static void WriteApAbiStubClassMethod(StreamWriter sw, AbiDef ad)
+    {
+        string csType;
+
+        sw.WriteLine(s8 + "[ExternalEntryPoint]");
+
+        // Right now we just treat all stub functions as non CLS compliant
+        // For 100% correctness, this is not true
+        sw.WriteLine(s8 + "[CLSCompliant(false)]");
+
+        // function declare
+        sw.Write(s8 + "public static unsafe " +
+                 GetCsType(ad.shortReturnType, ad.longReturnType) + " " +
+                     ad.shortMethodName + "(");
+
+        for (int i = 0; i < ad.shortParamArray.Length; i++) {
+            if (ad.shortParamArray[i] != "") {
+                if (ad.shortParamArray[i] != "void") {
+                    csType = GetCsType(ad.shortParamArray[i], ad.longParamArray[i]);
+                    if (i==0) {
+                        sw.Write(csType + " p" + i) ;
+                    }
+                    else {
+                        sw.Write(", " + csType + " p" + i);
+                    }
+                }
+            }
+        }
+        sw.WriteLine(")");
+        sw.WriteLine(s8 + "{");
+
+        // write function body now
+        bool  allApAbiStub  = true;
+        if (allApAbiStub) {
+            WriteApAbiStubClassMethodBodyGeneric(sw, ad);
+        }
+        else if (ad.shortMethodName ==  "StubHelloProcessABI" ||
+            ad.shortMethodName ==  "StubTestAbiCallOne" ||
+            ad.shortMethodName ==  "StubTestAbiCallTwo" ||
+            ad.shortMethodName ==  "StubTestAbiCallThree" ||
+            false) {
+            WriteApAbiStubClassMethodBodyGeneric(sw, ad);
+            // WriteApAbiStubClassMethodBodySample(sw, ad);
+        }
+        else {
+            WriteApAbiStubClassMethodBodyBlank(sw, ad);
+        }
+
+        sw.WriteLine(s8 + "}");
+        sw.WriteLine();
+    }
+
+    public static string stubHelloProcessABICode =
+"\n            int ap  = Processor.GetCurrentProcessorId();" +
+"\n            int bsp = 0;" +
+"\n" +
+"\n            DebugStub.WriteLine" +
+"\n                (\"\\n\\nHSG: ** cpu.{0} StubHelloProcessABI({1})\"," +
+"\n                 __arglist(ap, p0));" +
+"\n            DebugStub.WriteLine(\"HSG: ** -------------------------\");" +
+"\n" +
+"\n            bool iflag = Processor.DisableInterrupts();" +
+"\n" +
+"\n            MpExecution.AbiCall abiCall = new MpExecution.AbiCall();" +
+"\n" +
+"\n            // 1) set up all the parameters" +
+"\n            abiCall.argVal = p0;" +
+"\n" +
+"\n            // prepare IPI" +
+"\n            DebugStub.Print" +
+"\n                (\"HSG: ** cpu.{0} PutAbiCall(cpu.{1}, arg.{2}) --> \"," +
+"\n                 __arglist(ap, bsp, abiCall.argVal));" +
+"\n" +
+"\n            // 2) register the abiCall," +
+"\n            //    after this, we get the position" +
+"\n            int pos = MpExecution.PutAbiCall(bsp, abiCall);" +
+"\n" +
+"\n            DebugStub.WriteLine(\"pos.{0}\", __arglist(pos));" +
+"\n" +
+"\n            DebugStub.WriteLine" +
+"\n                (\"HSG: ** cpu.{0} SendAbiCall(cpu.{1}, cpu.{2})\"," +
+"\n                 __arglist(ap, ap, bsp));" +
+"\n" +
+"\n            // 3) send" +
+"\n            MpExecution.SendAbiCall(ap, bsp);" +
+"\n" +
+"\n            DebugStub.WriteLine" +
+"\n                (\"HSG: ** cpu.{0} WaitAbiCall(cpu.{1}, pos.{2}) ... zzz \", " +
+"\n                 __arglist(ap, bsp, pos));" +
+"\n" +
+"\n            // 4) spin until done" +
+"\n            MpExecution.WaitAbiCall(bsp, pos, out abiCall);" +
+"\n" +
+"\n            // 5) we have the return value" +
+"\n            int retval = abiCall.retVal;" +
+"\n" +
+"\n            DebugStub.WriteLine" +
+"\n                (\"HSG: ** cpu.{0} is waken up and receives retval.{1}\"," +
+"\n                 __arglist(ap, retval));" +
+"\n" +
+"\n            DebugStub.WriteLine" +
+"\n                (\"HSG: ** cpu.{0} ReleaseAbiCall(cpu.{1}, pos.{2})\"," +
+"\n                 __arglist(ap, bsp, pos));" +
+"\n" +
+"\n            // 6) release abiCall" +
+"\n            MpExecution.ReleaseAbiCall(bsp, pos);" +
+"\n" +
+"\n            Processor.RestoreInterrupts(iflag);" +
+"\n" +
+"\n            return retval;" +
+"\n";
+
+
+    public static void WriteApAbiStubClassMethodBodySample(StreamWriter sw, AbiDef ad)
+    {
+        string type = GetCsType(ad.shortReturnType, ad.longReturnType);
+
+        sw.WriteLine(s12 + "DebugStub.WriteLine(\"HSG: ** In " +
+                     ad.shortMethodName  + "{0}\", __arglist(p0));");
+
+        sw.WriteLine(stubHelloProcessABICode);
+
+    }
+
+    public static void WriteApAbiStubClassMethodBodyGeneric(StreamWriter sw, AbiDef ad)
+    {
+        int curOffset, size;
+
+        // some variables, ap, bsp, iflag, retval
+        sw.WriteLine(s12 + "DebugStub.WriteLine(\"HSG: ** " + ad.shortMethodName + "()\");");
+        sw.WriteLine(s12 + "int ap  = Processor.GetCurrentProcessorId();");
+        sw.WriteLine(s12 + "int bsp = 0;");
+        sw.WriteLine(s12 + "bool iflag;");
+        sw.WriteLine(s12 + "");
+
+
+
+        // declare return value
+        if (ad.shortReturnType != "void") {
+            sw.WriteLine(s12 +
+                         GetCsType(ad.shortReturnType, ad.longReturnType) +
+                         " retval;");
+            sw.WriteLine(s12 + "");
+        }
+
+
+        // get the mpCall
+        sw.WriteLine(s12 + "iflag = Processor.DisableInterrupts();");
+        sw.WriteLine(s12 + "MpExecution.MpCall mpCall = MpExecution.ReserveMpCall(bsp);");
+        sw.WriteLine(s12 + "Processor.RestoreInterrupts(iflag);");
+
+        sw.WriteLine(s12 + "");
+        sw.WriteLine(s12 + "if (mpCall == null) {");
+        sw.WriteLine(s12 + "    DebugStub.WriteLine(\"MpCall buffer full\");");
+        sw.WriteLine(s12 + "    DebugStub.Break();");
+        sw.WriteLine(s12 + "}");
+        sw.WriteLine(s12 + "");
+
+        // set mpCall number
+        sw.WriteLine(s12 + "mpCall.abiNum = " + ad.abiNum + "; // abi number");
+        sw.WriteLine(s12 + "");
+
+        // start marshal arguments
+        sw.WriteLine(s12 + "// future: need check not to overrun buffer");
+        sw.WriteLine(s12 + "// marshall arguments");
+        sw.WriteLine(s12 + "fixed (byte *baseArg = & mpCall.argBuffer[0] ) {");
+
+        curOffset = 0;
+        for (int v=0; v < ad.shortParamArray.Length; v++) {
+            if (ad.shortParamArray[v] != "" && ad.shortParamArray[v] != "void") {
+                size = GetTypeSize(ad.longParamArray[v]);
+                sw.WriteLine(s12 + "    Buffer.MoveMemory(baseArg+" + curOffset +
+                             " , (byte*) & p" + v + " , " + size + ");");
+                curOffset += size;
+            }
+        }
+        sw.WriteLine(s12 + "}");
+        sw.WriteLine(s12 + "");
+
+        // send mp call and wait
+        sw.WriteLine(s12 + "iflag = Processor.DisableInterrupts();");
+        sw.WriteLine(s12 + "MpExecution.SendMpCall(ap, bsp);");
+        sw.WriteLine(s12 + "Processor.RestoreInterrupts(iflag);");
+
+        sw.WriteLine(s12 + "");
+        sw.WriteLine(s12 + "MpExecution.WaitMpCall(bsp, mpCall.position);");
+        sw.WriteLine(s12 + "");
+
+        // return value is available
+        if (ad.shortReturnType != "void") {
+            sw.WriteLine(s12 + "// get return value");
+            sw.WriteLine(s12 + "fixed (byte *baseRet = & mpCall.retBuffer[0] ) {");
+            sw.WriteLine(s12 + "    Buffer.MoveMemory( (byte*) & retval , baseRet, " +
+                         GetTypeSize(ad.longReturnType) + ");");
+            sw.WriteLine(s12 + "}   ");
+            sw.WriteLine(s12 + "");
+        }
+
+        // copy back out parameter
+        sw.WriteLine(s12 + "// also in case we have 'out param', copy back parameters");
+        sw.WriteLine(s12 + "fixed (byte *baseArg = & mpCall.argBuffer[0] ) {");
+
+        curOffset = 0;
+        for (int v=0; v < ad.shortParamArray.Length; v++) {
+            if (ad.shortParamArray[v] != "" && ad.shortParamArray[v] != "void") {
+                size = GetTypeSize(ad.longParamArray[v]);
+                sw.WriteLine(s12 + "    Buffer.MoveMemory((byte*) & p" + v +
+                             " , baseArg+" + curOffset + " , " + size + ");");
+                curOffset += size;
+            }
+        }
+        sw.WriteLine(s12 + "}");
+        sw.WriteLine(s12 + "");
+
+        // release and return value
+        sw.WriteLine(s12 + "iflag = Processor.DisableInterrupts();");
+        sw.WriteLine(s12 + "MpExecution.ReleaseMpCall(bsp, mpCall.position);");
+        sw.WriteLine(s12 + "Processor.RestoreInterrupts(iflag);");
+        sw.WriteLine(s12 + "");
+
+        if (ad.shortReturnType != "void") {
+            sw.WriteLine(s12 + "return retval;");
+        }
+        else {
+            sw.WriteLine(s12 + "return;");
+        }
+
+    }
+
+    public static void WriteApAbiStubClassMethodBodyBlank(StreamWriter sw, AbiDef ad)
+    {
+        string type = GetCsType(ad.shortReturnType, ad.longReturnType);
+
+        // print debug
+        sw.WriteLine(s12 + "DebugStub.WriteLine(\"HSG: ** In " +
+                     ad.shortMethodName  + "\");");
+
+        // if it's a void, do nothing
+        if (type == "void") {
+            sw.WriteLine("");
+        }
+        // it's a pointer
+        else if (type.IndexOf("*") != -1) {
+            // sw.WriteLine(s12 + GetCsType(ad.shortReturnType, ad.longReturnType) + " x;");
+            sw.WriteLine(s12 + "return null;");
+        }
+        // it's a class
+        else if (ad.shortReturnType != ad.longReturnType) {
+            sw.WriteLine(s12 + type + " x = new " + type + "();");
+            sw.WriteLine(s12 + "return x;");
+        }
+        // else
+        else if (type.IndexOf("bool") != -1) {
+            sw.WriteLine(s12 + "return false;");
+        }
+        else {
+             sw.WriteLine(s12 + "return (" +
+                          GetCsType(ad.shortReturnType, ad.longReturnType) +
+                          ") 0;");
+        }
+    }
+
+
+
+    // Convert C/C++ type into C# type
+    // For example convert wchar_t to char
+    // This function consults the typeConverter hash table
+    public static string GetCsType(string cType, string longVersionType) {
+
+        // first before we convert we check some ambiguities
+        string unambiguousType = "";
+        CheckAmbiguities(cType, longVersionType, out unambiguousType);
+        if (unambiguousType != "") {
+            return unambiguousType;
+        }
+
+        // Other than that, we will convert the C/C++ type into
+        // C# type.
+        if (typeConverter[cType] == null) {
+            return cType;
+        }
+        else {
+            return (string)typeConverter[cType];
+        }
+    }
+
+    // This checks ambiguity for BspAbiStub
+    // Here is the ambiguity error:
+    //   Singularity\BspAbiStub.cs(2202,13): error CS0104:
+    //   'ProcessState' is an ambiguous reference
+    //   Singularity\BspAbiStub.cs(2249,13): error CS0104:
+    //   'ThreadState' is an ambiguous reference
+    public static string GetCsTypeForBspAbiStub(string cType, string longVersionType)
+    {
+        string tmp = GetCsType(cType, longVersionType);
+        if (tmp == "ThreadState") {
+            return "Microsoft.Singularity.V1.Threads.ThreadState";
+        }
+        else if (tmp == "ProcessState") {
+            return "Microsoft.Singularity.V1.Processes.ProcessState";
+        }
+        else {
+            return tmp;
+        }
+    }
+
+    // This is all hacks to resolve "ambiguity"
+    public static void CheckAmbiguities(string cType, string longVersionType,
+                                       out string unambiguousType)
+    {
+
+        // Now this is a hack .. for now ..  The problem is when we
+        // get the short version of the type we always get the last
+        // word after the last "_" For example in:
+        // Struct_Microsoft_Singularity_V1_Services_SharedHeapService_Allocation
+        // We set the shortType to be "Allocation". But that is not
+        // correct because the correct type is actually
+        // "SharedHeapService.Allocation"
+        if (cType.IndexOf("Allocation") == 0) {
+            string str1, str2;
+            SeparateLongStructName(longVersionType, out str1, out str2);
+            SeparateLongStructName(str1, out str1, out str2);
+            unambiguousType = (str2 + "." + cType);
+            return;
+        }
+        unambiguousType = "";
+        return;
+    }
+
+
+
+
+
+
+    ////////////////////////////////////////////////////////////////
+    //
+    public static void ParseLineToAbiDef(string s, AbiDef abiDef)
+    {
+        abiDef.abiNum = curAbiNum;
+        ParseLine(s,
+                  out abiDef.decl,
+                  out abiDef.longReturnType,
+                  out abiDef.shortReturnType,
+                  out abiDef.longMethodName,
+                  out abiDef.longClassName,
+                  out abiDef.namespaceName,
+                  out abiDef.shortClassName,
+                  out abiDef.shortMethodName,
+                  out abiDef.shortMethodNameWithG,
+                  out abiDef.longParamArray,
+                  out abiDef.shortParamArray);
+    }
+
+    public static void ParseLine(string s,
+                                 out string decl,
+                                 out string longReturnType,
+                                 out string shortReturnType,
+                                 out string longMethodName,
+                                 out string longClassName,
+                                 out string namespaceName,
+                                 out string shortClassName,
+                                 out string shortMethodName,
+                                 out string shortMethodNameWithG,
+                                 out string [] longParamArray,
+                                 out string [] shortParamArray)
+    {
+        int i, j, k, pnum;
+        string tmpStr, param;
+
+        i = s.IndexOf("static");
+        if (i == -1) {
+            throw new Exception("line " + lineNumber + " not static");
+        }
+        i += 7;
+
+        // the whole declaration
+        // e.g. "int __fastcall
+        //       Struct_Microsoft_Singularity_V1_Services_ProcessService
+        //       ::g_HelloProcessABI(int)"
+        j = s.IndexOf(')', i);
+        decl = s.Substring(i, j + 1 - i);
+
+        // right now we're just working with "decl"
+        i = decl.IndexOf("__fastcall");
+        if (i == -1) {
+            throw new Exception("line " + lineNumber + " not __fastcall");
+        }
+
+        // Get the return type
+        longReturnType = decl.Substring(0, i-1);
+
+        // Add long return type to structTable
+        AddTypeToStructTable(longReturnType);
+
+        // Check if longReturnType is struct type, if so we make
+        // the simple type
+        // Example:
+        //   longReturnType : struct Struct_Micr_Sing_V1_Services_ShrHpServ_Allocation *
+        //   shortReturnType: Allocation *
+        SeparateLongStructName(longReturnType, out tmpStr, out shortReturnType);
+
+        // now shortReturnType (or any return type) could contain "Stub"
+        // The reason for this is when we generate Singularity.V1.lib from
+        // Singularity.V1.def, a method M in class StubC could have return type StubC.
+        // But that's not what we want, we want a return type of C instead of StubC
+        // Here is for example:
+        // StubSystemType::StubRootSystemType returns SubSystemType
+        // It should actually return SystemType
+        // The same thing applies for "param"
+        if (shortReturnType.IndexOf("Stub") == 0) {
+            shortReturnType = shortReturnType.Substring(4,shortReturnType.Length-4);
+        }
+
+        // Right now the string left at index i is:
+        // e.g. " Struct_Microsoft_Singularity_V1_Services_ProcessService
+        //       ::g_HelloProcessABI(int)"
+
+        // Get the long class name
+        i = decl.IndexOf(' ', i) + 1;
+        j = decl.IndexOf("::", i);
+        k = decl.IndexOf("(", j);
+
+        longClassName = decl.Substring(i, j - i);
+
+        // we have the long class name, add this to the globalClassTable
+        globalClassTable[longClassName] = true;
+
+
+        longMethodName = decl.Substring(i, k - i);
+        shortMethodNameWithG = decl.Substring(j + 2, k - (j + 2));
+
+        if (shortMethodNameWithG.IndexOf("g_") != -1) {
+            shortMethodName = shortMethodNameWithG.Replace("g_","");
+        }
+        else if (shortMethodNameWithG.IndexOf("m_") != -1) {
+            shortMethodName = shortMethodNameWithG.Replace("m_","");
+        }
+        else {
+            throw new Exception("line " + lineNumber + " method not have g_/m_");
+        }
+
+        // Now given the longClassName we want to get the
+        // namespaceName and shortClassName
+        // Example:
+        //   longClassName  : Struct_Microsoft_Singularity_V1_Services_StubProcessService
+        //   namespaceName  : Struct_Microsoft_Singularity_V1_Service
+        //   shortClassName : StubProcessService
+        SeparateLongStructName(longClassName, out namespaceName, out shortClassName);
+
+        // Now we're starting to get the arguments
+        longParamArray = GetParamArray();
+        shortParamArray = GetParamArray();
+
+
+        i = decl.IndexOf('(') + 1;
+        pnum = 0;
+        while (decl[i] != ')') {
+            j = decl.IndexOf(',', i);
+            if (j == -1) {
+                j = decl.IndexOf(')', i);
+
+                param = decl.Substring(i, j - i);
+                longParamArray[pnum] = param;
+                pnum++;
+                break;
+            }
+
+            param = decl.Substring(i, j - i);
+
+            longParamArray[pnum] = param;
+            pnum++;
+            i = j + 1;
+        }
+
+        // Add long param array to struct table
+        for (int v=0; v < longParamArray.Length; v++) {
+            if (longParamArray[v] != "") {
+                AddTypeToStructTable(longParamArray[v]);
+            }
+        }
+
+
+        // The params are ready we make shorter param now
+        for (int v=0; v < longParamArray.Length; v++) {
+            if (longParamArray[v] != "") {
+                SeparateLongStructName(longParamArray[v], out tmpStr, out shortParamArray[v]);
+
+                // fix short param (the same case as in shortReturnType above)
+                // this might not be necessary anymore
+                /*
+                if (shortParamArray[v].IndexOf("Stub") == 0) {
+                    shortParamArray[v] = shortParamArray[v].Substring(4,shortParamArray[v].Length-4);
+                    }*/
+            }
+        }
+    }
+
+
+
+    ////////////////////////////////////////////////////////////////
+    // Option      :
+    // Input file  : $(OBJ)/SingularityStub.V1.dumpbin
+    // Output file :
+    // Note        :
+    //
+    // Example:
+    //
+    //
+    public static void GenerateMpSyscallsHeader()
+    {
+        printCount = 0;
+        string s;
+        AbiDef abiDef;
+        while (true) {
+            s = Console.ReadLine();
+            lineNumber++;
+
+            // end of file
+            if (s == null) {
+                break;
+            }
+
+            // g_ or m_
+            if (s.IndexOf("?g_") == -1 && s.IndexOf("?m_") == -1) {
+                continue;
+            }
+
+            abiDef = new AbiDef();
+
+            ParseLineToAbiDef(s, abiDef);
+            // PrintAbiDef(abiDef, "");
+
+            // Now we add abiDef to hashtable
+            AddAbiDefToHashTable(abiDef);
+        }
+
+        // test
+        // PrintNamespaceTable();
+
+
+        BeginCreatingMpSyscallsHeader();
+
+    }
+
+
+    public static void BeginCreatingMpSyscallsHeader()
+    {
+        // go through all the namespace
+
+        AbiDef ad;
+        Hashtable nsClassTable, methodTable;
+
+        // header
+        Console.WriteLine("////////////////////////////////////////////////////////////");
+        Console.WriteLine("// Automatically generated files by MpSyscallsBuilder.exe");
+        Console.WriteLine("// File   : MpSyscalls.h");
+        Console.WriteLine("// Author : t-hargun");
+        Console.WriteLine("// ");
+
+        // First of all create external undefined structs
+        foreach (string s in structTable.Keys) {
+            if (!globalClassTable.ContainsKey(s)) {
+                Console.WriteLine("struct " + s + " {" + structTable[s] + "};");
+            }
+        }
+        Console.WriteLine();
+
+        // Next, create struct declarations
+        foreach (string namespaceName in namespaceTable.Keys) {
+
+            nsClassTable = (Hashtable)namespaceTable[namespaceName];
+
+            foreach (string className in nsClassTable.Keys) {
+
+                Console.WriteLine("struct " + namespaceName + "_" + className);
+                Console.WriteLine("{");
+
+                methodTable = (Hashtable)nsClassTable[className];
+
+                foreach (string decl in methodTable.Keys) {
+
+                    ad = (AbiDef)methodTable[decl];
+
+                    // A stub, export
+                    if (ad.shortMethodName.IndexOf("Stub") == 0) {
+                        Console.Write("    static " + ad.longReturnType +
+                                      " " + ad.shortMethodNameWithG + "(");
+                    }
+                    else {
+                        Console.Write("    __declspec(dllexport) static " +
+                                      ad.longReturnType +
+                                      " __fastcall " +
+                                      ad.shortMethodNameWithG + "(");
+                    }
+
+                    // parameters
+                    for (int v = 0; v < ad.longParamArray.Length; v++) {
+                        if (ad.longParamArray[v] != "") {
+
+                            if (ad.longParamArray[v] != "void") {
+                                if (v==0) {
+                                    Console.Write(ad.longParamArray[v]) ;
+                                }
+                                else {
+                                    Console.Write(", " + ad.longParamArray[v]);
+                                }
+                            }
+                        }
+                    }
+
+
+                    Console.WriteLine(");");
+
+
+                }
+
+
+                Console.WriteLine("};");
+                Console.WriteLine("");
+            }
+        }
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    // Option      :
+    // Input file  : $(OBJ)/SingularityStub.V1.dumpbin
+    // Output file :
+    // Note        :
+    //
+    // Example:
+    //
+    //
+    public static void GenerateMpSyscallsImpl()
+    {
+        printCount = 0;
+        string s;
+        AbiDef abiDef;
+        while (true) {
+            s = Console.ReadLine();
+            lineNumber++;
+
+            // end of file
+            if (s == null) {
+                break;
+            }
+
+            // g_ or m_
+            if (s.IndexOf("?g_") == -1 && s.IndexOf("?m_") == -1) {
+                continue;
+            }
+
+            abiDef = new AbiDef();
+
+            ParseLineToAbiDef(s, abiDef);
+            // PrintAbiDef(abiDef, "");
+
+            // Now we add abiDef to hashtable
+            AddAbiDefToHashTable(abiDef);
+        }
+
+        // test
+        // PrintNamespaceTable();
+
+
+        BeginCreatingMpSyscallsImpl();
+
+    }
+
+    // Whenever MpSyscalls.x86 has bigger .rdata area, the kernel is
+    // crashing (e.g. got different kind of exceptions during boot) no matter
+    // where we allocate MpSyscalls.x86 (either in 0x00500000 or 0x10500000)
+    // So we're not generating all implementations. Right now we are just
+    // generating GetUtcTime and HelloProcessABI
+    // Here is an example of the crash:
+    // This is fine:
+    //   add 00500000..00500400 pe       .\obj\Prototype.ApicMP.Min.MarkSweep\MpSyscalls.x86
+    //   add 00501000..00501200 .text    .\obj\Prototype.ApicMP.Min.MarkSweep\MpSyscalls.x86
+    //   add 00502000..00502c00 .rdata   .\obj\Prototype.ApicMP.Min.MarkSweep\MpSyscalls.x86
+    // This causes a crash:
+    //   add 00500000..00500400 pe       .\obj\Prototype.ApicMP.Min.MarkSweep\MpSyscalls.x86
+    //   add 00501000..00501400 .text    .\obj\Prototype.ApicMP.Min.MarkSweep\MpSyscalls.x86
+    //   add 00502000..00504200 .rdata   .\obj\Prototype.ApicMP.Min.MarkSweep\MpSyscalls.x86
+    public static bool DoesNotCauseKernelCrash(string namespaceName, string className,
+                                               string methodName)
+    {
+        // to test more functions/class/namespace, just add the
+        // corresponding conditions
+        if (methodName.IndexOf("HelloProcessABI")  != -1 ||
+            methodName.IndexOf("TestAbiCallOne")   != -1 ||
+            methodName.IndexOf("TestAbiCallTwo")   != -1 ||
+            methodName.IndexOf("TestAbiCallThree") != -1 ||
+            // methodName.IndexOf("GetUtcTime") != -1 ||
+            false)
+        {
+            return true;
+        }
+        return false;
+    }
+
+
+    public static void BeginCreatingMpSyscallsImpl()
+    {
+        // go through all the namespace
+
+        AbiDef ad;
+        Hashtable nsClassTable, methodTable;
+
+        // header
+        Console.WriteLine("////////////////////////////////////////////////////////////");
+        Console.WriteLine("// Automatically generated files by MpSyscallsBuilder.exe");
+        Console.WriteLine("// File   : MpSyscalls.cpp");
+        Console.WriteLine("// Author : t-hargun");
+        Console.WriteLine("// ");
+
+        Console.WriteLine("#include \"MpSyscalls.h\"");
+        Console.WriteLine("");
+        Console.WriteLine("int entry() { return 0; }");
+        Console.WriteLine("");
+
+
+        // Next, create struct declarations
+        foreach (string namespaceName in namespaceTable.Keys) {
+
+            nsClassTable = (Hashtable)namespaceTable[namespaceName];
+
+            foreach (string className in nsClassTable.Keys) {
+
+                methodTable = (Hashtable)nsClassTable[className];
+
+                foreach (string decl in methodTable.Keys) {
+
+                    ad = (AbiDef)methodTable[decl];
+
+                    // we only generate methods that have no "Stub"
+                    if (ad.shortMethodName.IndexOf("Stub") != 0) {
+
+                        WriteMpSyscallsImplMethod(ad);
+                    }
+                }
+            }
+        }
+    }
+
+
+    public static void WriteMpSyscallsImplMethod(AbiDef ad)
+    {
+        string cm;
+        int ptotal;
+
+        // if cause kernel crash, we just add comment code
+        cm = "// ";
+        if (DoesNotCauseKernelCrash(ad.namespaceName, ad.shortClassName, ad.shortMethodName)) {
+            cm = "";
+        }
+
+        // function
+        Console.Write(cm + "__declspec(dllexport) " +
+                      ad.longReturnType +
+                      " __fastcall " +
+                      ad.longClassName + "::" +
+                      ad.shortMethodNameWithG + "(");
+
+        // parameters
+        ptotal = 0;
+        for (int v = 0; v < ad.longParamArray.Length; v++) {
+            if (ad.longParamArray[v] != "") {
+
+                if (ad.longParamArray[v] != "void") {
+                    if (v==0) {
+                        Console.Write(ad.longParamArray[v] + " p" + v) ;
+                    }
+                    else {
+                        Console.Write(", " + ad.longParamArray[v] + " p" + v);
+                    }
+                    ptotal++;
+                }
+            }
+        }
+
+        Console.WriteLine(")");
+        Console.WriteLine(cm + "{");
+
+        // function body
+        // We are not supporting EndpointCore right now ..
+        if (ad.shortClassName.IndexOf("EndpointCore") != -1) {
+            Console.WriteLine(cm + "    __asm { int 3 }");
+        }
+        else {
+            WriteMpSyscallsImplMethodBody(cm, ad, ptotal);
+        }
+
+        Console.WriteLine(cm + "}");
+        Console.WriteLine("");
+
+    }
+
+    public static void WriteMpSyscallsImplMethodBody(string cm,
+                                                     AbiDef ad,
+                                                     int ptotal)
+    {
+        Console.Write(cm + "    ");
+        if (ad.longReturnType != "void") {
+            Console.Write("return ");
+        }
+        Console.Write(ad.longClassName + "::" +
+                          GetStubMethodName(ad.shortMethodNameWithG) + "(");
+        for (int v=0; v < ptotal; v++) {
+            if (v!=0) {
+                Console.Write(", ");
+            }
+            Console.Write("p" + v);
+        }
+
+        Console.WriteLine(");");
+    }
+
+
+    // Given g_Method, or m_Method it returns g_StubMethod or m_StubMethod
+    public static string GetStubMethodName(string methodNameWithG)
+    {
+        string tmp1, tmp2;
+        int i;
+        i = methodNameWithG.IndexOf("_");
+        tmp1 = methodNameWithG.Substring(0, i);
+        tmp2 = methodNameWithG.Substring(i+1, methodNameWithG.Length-(i+1));
+
+        return (tmp1 + "_Stub" + tmp2);
+
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    // Option      : genBspAbiStub
+    // Input file  : $(OBJ)/SingularityStub.V1.dumpbin
+    // Output file : Singularity\BspAbiStub.cs (Find all Stub*.cs files
+    // Note        : This create the Stub files which contains the stub functions
+    //               that will perform the marshaling and IPI
+    // Example:
+    //
+    //
+    public static void GenerateBspAbiStub()
+    {
+        printCount = 0;
+        string s;
+        AbiDef abiDef;
+        while (true) {
+            s = Console.ReadLine();
+            lineNumber++;
+
+            // end of file
+            if (s == null) {
+                break;
+            }
+
+            // We only create stub files and functions for abi definition that has
+            // g_Stub or m_Stub
+            if (s.IndexOf("?g_Stub") == -1 && s.IndexOf("?m_Stub") == -1) {
+                continue;
+            }
+
+            IncrementAbiNumber(s);
+
+            abiDef = new AbiDef();
+
+            ParseLineToAbiDef(s, abiDef);
+            // PrintAbiDef(abiDef, "");
+
+            InsertToSequentialAbiDef(abiDef);
+
+
+            // Now we add abiDef to hashtable
+            AddAbiDefToHashTable(abiDef);
+        }
+
+        BeginCreatingBspAbiStubFromNamespaceTable();
+    }
+
+
+    public static void InsertToSequentialAbiDef(AbiDef abiDef)
+    {
+        sequentialAbiDef[curAbiNum] = abiDef;
+    }
+
+    public static void BeginCreatingBspAbiStubFromNamespaceTable()
+    {
+        WriteBspAbiStubFileHeader();
+
+        WriteBspAbiStubEntry();
+        WriteBspAbiStubMethods();
+        WriteBspAbiStubFileFooter();
+    }
+
+    public static void WriteBspAbiStubFileHeader()
+    {
+        Console.WriteLine("///////////////////////////////////////////////////////");
+        Console.WriteLine("// ");
+        Console.WriteLine("// THIS IS AUTOMATICALLY GENERATED FILE, DO NOT MODIFY ");
+        Console.WriteLine("// ");
+        Console.WriteLine("// Generated by: Windows/MpSyscall/MpSyscallBuilder.exe");
+        Console.WriteLine("// ");
+        Console.WriteLine("// File: Singularity/BspAbiStub.cs");
+        Console.WriteLine("// ");
+        Console.WriteLine("// ");
+        Console.WriteLine("");
+
+        Console.WriteLine("using System;");
+        Console.WriteLine("using System.Runtime.InteropServices;");
+        Console.WriteLine("using System.Runtime.CompilerServices;");
+        Console.WriteLine("using System.Threading;");
+        Console.WriteLine("using Microsoft.Singularity.Hal;");
+        Console.WriteLine("using Microsoft.Singularity.Io;");
+        Console.WriteLine("using Microsoft.Singularity.Memory;");
+        Console.WriteLine("using Microsoft.Singularity.Scheduling;");
+        Console.WriteLine("using Microsoft.Singularity.X86;");
+        Console.WriteLine("using Microsoft.Singularity.V1.Processes;");
+        Console.WriteLine("using Microsoft.Singularity.V1.Security;");
+        Console.WriteLine("using Microsoft.Singularity.V1.Services;");
+        Console.WriteLine("using Microsoft.Singularity.V1.Stress;");
+        Console.WriteLine("using Microsoft.Singularity.V1.Threads;");
+        Console.WriteLine("using Microsoft.Singularity.V1.Types;");
+        Console.WriteLine("");
+        Console.WriteLine("namespace Microsoft.Singularity");
+        Console.WriteLine("{");
+        Console.WriteLine("    [CLSCompliant(false)]");
+        Console.WriteLine("    public class BspAbiStub");
+        Console.WriteLine("    {");
+    }
+
+    public static void WriteBspAbiStubFileFooter()
+    {
+        Console.WriteLine("    }");
+        Console.WriteLine("}");
+    }
+
+    public static void WriteBspAbiStubEntry()
+    {
+        AbiDef ad;
+        // Console.WriteLine(s8 + "[NoHeapAllocation]");
+        Console.WriteLine(s8 + "public static unsafe void ProcessMpCall(int cpu, MpExecution.MpCall mpCall)");
+        Console.WriteLine(s8 + "{");
+        Console.WriteLine(s12 + "switch (mpCall.abiNum) {");
+
+        for (int i = 0; i < MAX_ABI_DEF; i++) {
+            if (sequentialAbiDef[i] != null) {
+                ad = sequentialAbiDef[i];
+                Console.Write(s12 + "case {0,3}: ", ad.abiNum);
+                Console.Write("BspAbiStub" + ad.abiNum + "(cpu, mpCall); ");
+                Console.WriteLine("break;");
+            }
+        }
+
+        Console.WriteLine(s12 + "default:");
+        Console.WriteLine(s16 + "DebugStub.WriteLine(\"HSG: **** Unknown abi call number {0}\",");
+        Console.WriteLine(s16 + "__arglist(mpCall.abiNum));");
+        Console.WriteLine(s16 + "break;");
+
+        Console.WriteLine(s12 + "}");
+        Console.WriteLine(s8 + "}");
+        Console.WriteLine("");
+    }
+
+    public static void WriteBspAbiStubMethods()
+    {
+        AbiDef ad;
+        for (int i = 0; i < MAX_ABI_DEF; i++) {
+            if (sequentialAbiDef[i] != null) {
+                ad = sequentialAbiDef[i];
+                WriteBspAbiStubMethod(ad);
+            }
+        }
+    }
+
+    // Right now, the actual abi is called from Processor.DSI(), hence
+    // all the subsequent calls must have "NoHeapAllocate". But when
+    // the scheduler comes into play, this requirement is no longer holds.
+    // Right now, only haryadi's abi functions that have been annotated
+    // with NoHeapAllocate
+    public static bool MethodIsNoHeapAllocation(string methodName)
+    {
+        return true;
+
+        // this has been fixed since we have ApThread
+        /*
+        if (methodName == "HelloProcessABI" ||
+            methodName == "TestAbiCallOne" ||
+            methodName == "TestAbiCallTwo" ||
+            methodName == "TestAbiCallThree" ||
+            false) {
+            return true;
+        }
+        return false;*/
+    }
+
+
+    public static void WriteBspAbiStubMethod(AbiDef ad)
+    {
+        int curOffset, size;
+
+        // Console.WriteLine(s8 + "[NoHeapAllocation]");
+        Console.WriteLine(s8 + "private static unsafe void BspAbiStub" + ad.abiNum +
+                          "(int cpu, MpExecution.MpCall mpCall)");
+        Console.WriteLine(s8 + "{");
+
+        Console.WriteLine(s12 + "bool iflag;");
+
+        // parameter declaration
+        for (int v = 0; v < ad.shortParamArray.Length; v++) {
+            if (ad.shortParamArray[v] != "" && ad.shortParamArray[v] != "void") {
+                Console.WriteLine(s12 +
+                                  GetCsType(ad.shortParamArray[v], ad.longParamArray[v]) +
+                                  " p" + v + ";");
+            }
+        }
+
+        if (ad.shortReturnType != "void") {
+            Console.WriteLine(s12 +
+                              GetCsTypeForBspAbiStub(ad.shortReturnType, ad.longReturnType) +
+                              " retval;");
+        }
+        Console.WriteLine("");
+
+        // get args
+        Console.WriteLine(s12 + "// get args");
+        Console.WriteLine(s12 + "fixed (byte *baseArg = & mpCall.argBuffer[0] ) {");
+        curOffset = 0;
+        for (int v=0; v < ad.shortParamArray.Length; v++) {
+            if (ad.shortParamArray[v] != "" && ad.shortParamArray[v] != "void") {
+                size = GetTypeSize(ad.longParamArray[v]);
+                Console.WriteLine(s16 + "    Buffer.MoveMemory((byte*) & p" + v +
+                             " , baseArg+" + curOffset + " , " + size + ");");
+                curOffset += size;
+            }
+        }
+        Console.WriteLine(s12 + "}");
+        Console.WriteLine(s12 + "");
+
+
+        // Call the actual abi
+        Console.WriteLine(s12 + "// call actual abi");
+
+        string actualAbiMethodName =
+            ad.shortMethodName.Substring(4, ad.shortMethodName.Length - 4);
+        string cm = "// ";
+        if (MethodIsNoHeapAllocation(actualAbiMethodName)) {
+            cm = "";
+        }
+        Console.Write(s12 + cm);
+
+        if (ad.shortReturnType != "void") {
+            Console.Write("retval = ");
+        }
+
+        Console.Write(ad.shortClassName + "." + actualAbiMethodName + "(");
+        for (int v=0; v < ad.shortParamArray.Length; v++) {
+            if (ad.shortParamArray[v] != "" && ad.shortParamArray[v] != "void") {
+                if (v != 0) {
+                    Console.Write(", ");
+                }
+                Console.Write("p" + v);
+            }
+        }
+        Console.WriteLine(");");
+        Console.WriteLine("");
+
+        // copy return value
+        if (ad.shortReturnType != "void") {
+            Console.WriteLine(s12 + "// copy return value");
+            Console.WriteLine(s12 + "fixed (byte *baseRet = & mpCall.retBuffer[0] ) {");
+            Console.WriteLine(s16 + "    Buffer.MoveMemory( baseRet , (byte*) & retval , " +
+                         GetTypeSize(ad.longReturnType) + ");");
+            Console.WriteLine(s12 + "}   ");
+            Console.WriteLine(s12 + "");
+        }
+
+        // copy arguments back
+        Console.WriteLine(s12 + "// copy arguments back");
+        Console.WriteLine(s12 + "fixed (byte *baseArg = & mpCall.argBuffer[0] ) {");
+        curOffset = 0;
+        for (int v=0; v < ad.shortParamArray.Length; v++) {
+            if (ad.shortParamArray[v] != "" && ad.shortParamArray[v] != "void") {
+                size = GetTypeSize(ad.longParamArray[v]);
+                Console.WriteLine(s16 + "    Buffer.MoveMemory(baseArg+" + curOffset +
+                             " , (byte*) & p" + v + " , " + size + ");");
+                curOffset += size;
+            }
+        }
+        Console.WriteLine(s12 + "}");
+        Console.WriteLine(s12 + "");
+
+        // return
+        Console.WriteLine(s12 + "iflag = Processor.DisableInterrupts();");
+        Console.WriteLine(s12 + "MpExecution.ReturnMpCall(cpu, mpCall.position);");
+        Console.WriteLine(s12 + "Processor.RestoreInterrupts(iflag);");
+
+
+        Console.WriteLine(s8 + "}");
+        Console.WriteLine("");
+    }
+
+
+    ////////////////////////////////////////////////////////////////
+    //
+    public static void Generate(string[] args)
+    {
+        genSingStubV1Def = args[0] == "/genSingStubV1Def";
+        genApAbiStub = args[0] == "/genApAbiStub";
+        genBspAbiStub = args[0] == "/genBspAbiStub";
+        genMpSyscallsHeader = args[0] == "/genMpSyscallsHeader";
+        genMpSyscallsImpl = args[0] == "/genMpSyscallsImpl";
+
+        bool genlib = args[0] == "/genlib";
+        bool deflib = args[0] == "/deflib";
+        bool defentry = args[0] == "/defentry";
+
+        if (!genSingStubV1Def && !genApAbiStub &&
+            !genMpSyscallsHeader && !genMpSyscallsImpl &&
+            !genBspAbiStub) {
+            throw new Exception("Invalid args ..");
+        }
+
+        if (genSingStubV1Def) {
+            GenerateSingularityStubV1Def();
+            return;
+        }
+        if (genApAbiStub) {
+            GenerateApAbiStub();
+            return;
+        }
+        if (genMpSyscallsHeader) {
+            GenerateMpSyscallsHeader();
+            return;
+        }
+        if (genMpSyscallsImpl) {
+            GenerateMpSyscallsImpl();
+            return;
+        }
+        if (genBspAbiStub) {
+            GenerateBspAbiStub();
+            return;
+        }
+    }
+
+
+
+    // Initialize some tables
+    public static void Initialize()
+    {
+        InitializeTypeConverter();
+        InitializeParamTable();
+
+        /*
+        if (genBspAbiStub) {
+            for (int i = 0; i < MAX_ABI_DEF; i++) {
+                sequentialAbiDef[i] = null;
+            }
+            }*/
+    }
+
+    // Sizes are manually configured
+    // In the future this should come from Bartok
+    public static void InitializeParamTable()
+    {
+        paramTable["void"] = 0;
+        paramTable["int"] = 4;
+        paramTable["unsigned int"] = 4;
+        paramTable["unsigned short"] = 4;
+        paramTable["unsigned char"] = 4;
+        paramTable["wchar_t"] = 4;
+        paramTable["bool"] = 4;
+        paramTable["__int64"] = 8;
+        paramTable["unsigned __int64"] = 8;
+        paramTable["struct Struct_System_TimeSpan"] = 8;
+        paramTable["struct Struct_System_DateTime"] = 8;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Types_SystemType"] = 4;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Threads_ThreadState"] = 4;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Processes_ProcessState"] = 4;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Services_ParameterCode"] = 4;
+    }
+
+    // We need this because for example "unsigned int should become uint"
+    // Right now we just convert types directly, but there could be some automation
+    // e.g. int * means out int
+    public static void InitializeTypeConverter()
+    {
+        typeConverter["__int64"] = "long";
+        typeConverter["__int64 *"] = "long*";
+        typeConverter["__int64 * *"] = "long**";
+        typeConverter["unsigned __int64"] = "ulong";
+        typeConverter["unsigned __int64 *"] = "ulong*";
+        typeConverter["unsigned __int64 * *"] = "ulong**";
+        typeConverter["unsigned int"] = "uint";
+        typeConverter["unsigned int *"] = "uint*";
+        typeConverter["unsigned int * *"] = "uint**";
+        typeConverter["wchar_t"] = "char";
+        typeConverter["wchar_t *"] = "char*";
+        typeConverter["wchar_t * *"] = "char**";
+        typeConverter["unsigned char"] = "byte";
+        typeConverter["unsigned char *"] = "byte*";
+        typeConverter["unsigned char * *"] = "byte **";
+        typeConverter["unsigned char * * *"] = "byte ***";
+        typeConverter["unsigned short"] = "ushort";
+        typeConverter["unsigned short *"] = "ushort *";
+        typeConverter["unsigned short * *"] = "ushort * *";
+        typeConverter["struct uintPtr *"] = "UIntPtr";
+        typeConverter["struct uintPtr * *"] = "UIntPtr*";
+    }
+
+    public static int Main(string[] args)
+    {
+        try {
+            Initialize();
+            Generate(args);
+        }
+        catch (Exception e) {
+            Console.Write(e);
+            return -1;
+        }
+        return 0;
+    }
+}
+
diff --git a/base/Windows/MpSyscallBuilder/MpSyscallBuilder.csproj b/base/Windows/MpSyscallBuilder/MpSyscallBuilder.csproj
new file mode 100644
index 0000000..cd71329
--- /dev/null
+++ b/base/Windows/MpSyscallBuilder/MpSyscallBuilder.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>MpSyscallBuilder</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MpSyscallBuilder.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/MutexWrap/Makefile b/base/Windows/MutexWrap/Makefile
new file mode 100644
index 0000000..30a9507
--- /dev/null
+++ b/base/Windows/MutexWrap/Makefile
@@ -0,0 +1,54 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\JobControl\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mutexwrap.exe
+
+$(OBJDIR):
+    mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\mutexwrap.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+install: $(OBJDIR) $(OBJDIR)\mutexwrap.exe
+    $(SDEDIT) ..\..\build\mutexwrap.*
+    $(COPY) $(OBJDIR)\mutexwrap.exe ..\..\build
+    $(COPY) $(OBJDIR)\mutexwrap.pdb ..\..\build
+
+##############################################################################
+
+CFLAGS=$(CFLAGS) /I..\inc /WX /W3 /Fd$(OBJDIR)\mutexwrap.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+    kernel32.lib \
+    libcmt.lib
+
+##############################################################################
+
+{.}.c{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##########################################################################
+
+$(OBJDIR)\mutexwrap.obj: mutexwrap.c
+
+OBJS = \
+    $(OBJDIR)\mutexwrap.obj \
+
+$(OBJDIR)\mutexwrap.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
diff --git a/base/Windows/MutexWrap/mutexwrap.c b/base/Windows/MutexWrap/mutexwrap.c
new file mode 100644
index 0000000..3ab56a1
--- /dev/null
+++ b/base/Windows/MutexWrap/mutexwrap.c
@@ -0,0 +1,223 @@
+// ----------------------------------------------------------------------------
+//
+// Program: MutexWrap
+//
+// Purpose: This wrapper opens a named mutex and then runs a
+//          user specified process holding the mutex.  The mutex is
+//          relinquished when the program stops executing.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ----------------------------------------------------------------------------
+
+#define _WIN32_WINNT 0x0500
+
+#include <winlean.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#define ACQUIRE_TIMEOUT 1000
+#define HOLD_TIMEOUT    1001
+
+// #define VERBOSE
+
+#ifdef VERBOSE
+#define tprintf(x,...) printf(x, __VA_ARGS__)
+#else
+#define tprintf(x,...)
+#endif
+
+static HANDLE g_hMutex = NULL;
+
+static BOOL WINAPI CtrlHandler(DWORD dwCtrlType)
+{
+    tprintf("Caught control event %I32u", dwCtrlType);
+
+    switch (dwCtrlType) {
+      case CTRL_C_EVENT:
+      case CTRL_BREAK_EVENT:
+        GenerateConsoleCtrlEvent(dwCtrlType, 0);
+      default:
+        break;
+    }
+
+    if (NULL != g_hMutex) {
+        ReleaseMutex(g_hMutex); // May not be acquired
+        CloseHandle(g_hMutex);
+    }
+
+    ExitProcess((UINT)-2);
+}
+
+static BOOL
+ParseDWord(LPCSTR lpszValue, PDWORD pValue)
+{
+    PCHAR pszStop;
+
+    errno = 0;
+    *pValue = strtoul(lpszValue, &pszStop, 10);
+
+    // Return no overflow and all characters parsed.
+    return errno == 0 && *pszStop == '\0';
+}
+
+static void Usage()
+{
+    printf(
+"Usage:\n" \
+"mutexwrap [options] <mutexname> <command>\n\n" \
+"Runs <command> holding named mutex.  Waits up to specifiable timeout to \n" \
+"acquire the mutex, and potentially timeouts command.\n\n" \
+"The available options are:\n" \
+"  /WaitTime <seconds>    - Set limit on time waited to acquire mutex.\n" \
+"  /HoldTime <seconds>    - Set limit on time process runs for.\n" \
+"The process returns 0 on success, %d on mutex acquisition failure, %d on\n" \
+"process run time exceeded.\n\n" \
+"Example:\n  mutexwrap /w 10 /h 10 MyMutex \"sleep.exe 500\"\n"
+,
+ACQUIRE_TIMEOUT, HOLD_TIMEOUT
+);
+}
+
+static void
+ErrorReport(char *function)
+{
+    VOID *message;
+    DWORD error = GetLastError();
+
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                  NULL, error,
+                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                  (LPTSTR) &message, 0, NULL);
+
+    fprintf(stderr, "%s failed with error %d: %s\n", function, error, message);
+
+    LocalFree(message);
+}
+
+static DWORD
+SecondsToMillis(DWORD dwSeconds)
+{
+    if (dwSeconds > INFINITE / 1000) {
+        return INFINITE;
+    }
+    return dwSeconds * 1000;
+}
+
+static DWORD RunProcess(LPCSTR lpCommandLine, DWORD dwHoldSeconds)
+{
+    DWORD dwExitCode   = HOLD_TIMEOUT;
+    DWORD dwHoldMillis = INFINITE;
+
+    PROCESS_INFORMATION pi;
+    STARTUPINFO         si;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+
+    if (!CreateProcess(NULL, (LPSTR)lpCommandLine, NULL, NULL, FALSE,
+                       0, NULL, NULL, &si, &pi)) {
+        fprintf(stderr, "mutexwrap: Failed to create process: \"%s\"\n",
+                lpCommandLine);
+        ErrorReport("CreateProcess");
+        return (DWORD)-1;
+    }
+
+    dwHoldMillis = SecondsToMillis(dwHoldSeconds);
+    if (WaitForSingleObject(pi.hProcess, dwHoldMillis) == WAIT_OBJECT_0) {
+        GetExitCodeProcess(pi.hProcess, &dwExitCode);
+    }
+    else {
+        fprintf(stderr,
+                "mutexwrap: timed out holding mutex with program running.");
+        TerminateProcess(pi.hProcess, (DWORD)-1);
+    }
+
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+
+    return dwExitCode;
+}
+
+static BOOL
+AcquireMutex(HANDLE hMutex, DWORD dwTimeoutSeconds)
+{
+    time_t nowTime;
+    time_t endTime;
+
+    time(&endTime);
+    endTime += dwTimeoutSeconds;
+
+    while (time(&nowTime) < endTime) {
+        DWORD dwWaitMillis = INFINITE;
+        if (endTime - nowTime < INFINITE * 1000i64) {
+            dwWaitMillis = (DWORD)((endTime - nowTime) * 1000);
+        }
+        if (WaitForSingleObject(hMutex, dwWaitMillis) == WAIT_OBJECT_0) {
+            return TRUE;
+        }
+    }
+    fprintf(stderr, "mutexwrap: timed out acquiring mutex.\n");
+    return FALSE;
+}
+
+int main(int argc, LPCSTR argv[])
+{
+    DWORD dwWaitSeconds = INFINITE;
+    DWORD dwHoldSeconds = INFINITE;
+    DWORD dwExitCode    = 0;
+
+    argv++;
+    argc--;
+
+    while (argc > 0 && (argv[0][0] == '/' || argv[0][0] == '-')) {
+        if (tolower(argv[0][1]) == 'w' && argc > 2) {
+            if (!ParseDWord(argv[1], &dwWaitSeconds)) {
+                fprintf(stderr, "mutexwrap: Invalid wait time.\n");
+                return -1;
+            }
+        }
+        else if (tolower(argv[0][1]) == 'h' && argc > 2) {
+            if (!ParseDWord(argv[1], &dwHoldSeconds)) {
+                fprintf(stderr, "mutexwrap: Invalid hold time.\n");
+                return -1;
+            }
+        }
+        else {
+            Usage();
+            return -1;
+        }
+        argv += 2;
+        argc -= 2;
+    }
+
+    tprintf("Wait time %us, Hold time %us\n", dwWaitSeconds, dwHoldSeconds);
+
+    if (argc != 2) {
+        Usage();
+        return -1;
+    }
+
+    SetConsoleCtrlHandler(CtrlHandler, TRUE);
+
+    if (NULL == (g_hMutex = CreateMutex(NULL, FALSE, argv[0]))) {
+        fprintf(stderr, "mutexwrap: failed to create mutex.\n");
+        ErrorReport("CreateMutex");
+        return -1;
+    }
+
+    argc--;
+    argv++;
+
+    if (AcquireMutex(g_hMutex, dwWaitSeconds)) {
+        dwExitCode = RunProcess(argv[0], dwHoldSeconds);
+        ReleaseMutex(g_hMutex);
+    }
+    else {
+        dwExitCode = ACQUIRE_TIMEOUT;
+    }
+
+    CloseHandle(g_hMutex);
+    return dwExitCode;
+}
diff --git a/base/Windows/Paths.targets b/base/Windows/Paths.targets
new file mode 100644
index 0000000..57e0203
--- /dev/null
+++ b/base/Windows/Paths.targets
@@ -0,0 +1,16 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Paths.targets
+#
+#   Note:
+#
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Targets\Paths.targets"/>
+</Project>
diff --git a/base/Windows/ProfMap/ProfMap.cs b/base/Windows/ProfMap/ProfMap.cs
new file mode 100644
index 0000000..2962ee3
--- /dev/null
+++ b/base/Windows/ProfMap/ProfMap.cs
@@ -0,0 +1,271 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.IO;
+
+namespace ProfMap
+{
+	/// <summary>
+	/// ProfMap is a quick and dirty utility that is used to post-process the result
+    // of profiling a Singularity application.  The log contains entries with EIP values
+    // rather than symbolic names.  By consulting the Map for the application, we can
+    // replace those EIP values with symbolic names, prior to feeding the log to the
+    // Profiler.
+	/// </summary>
+
+
+    // Here's an example of a source line we would like to update:
+    //
+    //           f 0x8 Function_EIP_0x120f32b4 (UNKNOWN ARGUMENTS) 0 0
+    //
+    // If we find that EIP value 0x120f32b4 is contained within System.RuntimeType.Name's
+    // property getter, and that method starts at offset 120f3200, we would rewrite this
+    // as:
+    //
+    //           f 0x8 ?m_get$_Name@Class_System_RuntimeType@@SIPAUClass_System_String@@PAU1@@Z (UNKNOWN ARGUMENTS) 0x120f3200 1
+    //
+    // If you don't like mangled names, feel free to add an unmangler at AddMapEntry below.
+    // This would make it much easier to read the profiles in CLR Profiler.
+    //
+    // The following app is very brittle if the log format or map format changes.  Also
+    // it uses heuristics to determine where the image was loaded into memory so it can
+    // bias the EIPs back to image addresses.  These heuristics are brittle.
+    
+    public class ProfMap
+    {
+        internal class Entry : IComparable
+        {
+            internal string symbol;
+            internal ulong  addr;
+
+            // Always sort on address, since that is the typical lookup
+            public int CompareTo(Object o)
+            {
+                Entry other = (Entry) o;
+                return (addr > other.addr
+                        ? 1
+                        : (addr == other.addr
+                           ? 0
+                           : -1));
+            }
+        }
+
+        static ArrayList    entries;
+
+        static StreamReader logStream, mapStream;
+        static StreamWriter newStream;
+
+        static ulong        loadBias;
+
+        // In order to calculate the load address of our image into memory, we need to find
+        // a well-known symbol in the map.
+        static ulong FindWriteHeader()
+        {
+            // For WebServer.x86, the symbol we need is represented in the map as:
+            //
+            // ?m_WriteHeader@Class_Microsoft_Singularity_WebServer_CLRProfiler@@SIXPAU1@PAUClass_Microsoft_Singularity_WebServer_CLRProfiler_Buffer@@@Z
+            //
+            // Of course, the Microsoft_Singularity_WebServer part is application-specific.
+            // So the fragments we are looking for are:
+            //
+            //    ?m_WriteHeader@Class_ +
+            //    <application> +
+            //    _CLRProfiler@@SIXPAU1@PAU +
+            //    <application> +
+            //    _CLRProfiler_Buffer@@@Z
+            //
+            // We only do this operation once, so a linear search isn't outrageous
+            foreach (Entry e in entries) {
+                int index1 = e.symbol.IndexOf("?m_WriteHeader@Class_");
+                if (index1 >= 0) {
+                    int index2 = e.symbol.IndexOf("_CLRProfiler@@SIXPAU1@PAU", index1 + 21);
+                    if (index2 >= 0) {
+                        int index3 = e.symbol.IndexOf("", index2 + 24);
+                        if (index3 >= 0) {
+                            return e.addr;
+                        }
+                    }
+                }
+            }
+            Console.WriteLine("Failure: Couldn't discover the WriteHeader symbol in this map");
+            return 0;
+        }
+
+        static Entry FindEntry(ulong eip)
+        {
+            Entry temp = new Entry();
+            temp.addr =  eip - loadBias;        // convert from physical to map addresses
+            int res = entries.BinarySearch(temp);
+
+            // If we get a negative entry, it's not an exact match.  But it gives us the index of
+            // the next largest entry.  Of course, we want the index of the prior entry, since that
+            // should cover our address.  At least, that's what MSDN says.  I'm obviously doing
+            // something wrong, because I'm off by one.
+            if (res < 0) {
+                res = -res - 2;
+            }
+            return (Entry) entries[res];
+        }
+
+        static void AddMapEntry(ulong addr, String symbol)
+        {
+            Entry e = new Entry();
+            e.symbol = symbol;
+            e.addr = addr;
+
+            entries.Add(e);
+        }
+
+        static void ReadMap()
+        {
+            string textSection = "0001:";           // it usually is, but we will check
+            bool   defaultTextSection = true;
+
+            Console.WriteLine("Reading map ");
+            AddMapEntry(~(ulong) 0, "Unknown Address");
+
+            int counter = 0;
+
+            while (true) {
+                // End of file?
+                String line = mapStream.ReadLine();
+                if (line == null) {
+                    break;
+                }
+
+                // read the section table and find the section containing ".text"
+                if (defaultTextSection &&
+                    line.IndexOf(".text") > 0 &&
+                    line.IndexOf("CODE") > 0) {
+                    textSection = line.Substring(1, 5);
+                    Console.WriteLine("Updating text Section to {0}", textSection);
+                    defaultTextSection = false;     // stop looking
+                    continue;
+                }
+
+                if (line.Length > 31 && line.Substring(1, 5) == textSection) {
+                    if ((counter++ % 500) == 0)
+                        Console.Write(".");
+                    ulong  addr = ulong.Parse(line.Substring(6, 8), NumberStyles.HexNumber);
+                    int    temp = line.IndexOf(" ", 21);
+                    String symbol = (temp > 21
+                                     ? line.Substring(21, temp - 21)
+                                     : line.Substring(21));
+                    AddMapEntry(addr, symbol);
+                }
+            }
+            entries.Sort();
+            /* dump the map
+            for (int i=0; i<entries.Count; i++) {
+                Entry e = (Entry) entries[i];
+                Console.WriteLine("{0} {1:x} {2}", i, e.addr, e.symbol);
+            }
+            */
+            Console.WriteLine(" Okay");
+        }
+
+        static void ProcessLog()
+        {
+            Console.Write("Processing log ");
+
+            int counter = 0;
+
+            while (true) {
+                String line = logStream.ReadLine();
+                // End of file?
+                if (line == null) {
+                    break;
+                }
+
+                // We need the comment line that provides the load address bias for our symbols.
+                // This is always in the first couple of lines of the log and is currently the
+                // only 'z' (comment) entry.
+                if (loadBias == 0 &&
+                    line.Length > 30 &&
+                    line[0] == 'z' &&
+                    line.IndexOf("CLRProfiler_WriteHeader") > 0) {
+                    string eipString = line.Substring(4, line.IndexOf(" ", 4)-4);
+                    ulong eip = ulong.Parse(eipString, NumberStyles.HexNumber);
+                    ulong addr = FindWriteHeader();
+
+                    // round down to a page, discarding any noise in our calculation due to the
+                    // method prolog
+                    loadBias = (eip - addr) & ~(ulong)0xfff;
+                    Console.WriteLine("Deducing .text segment was loaded at {0:x}", loadBias);
+                }
+
+                // Process any function entries, replacing process eip values with symbolic values.
+                if (line.Length > 30 && line[0] == 'f') {
+                    int iStart = line.IndexOf("Function_EIP_0x");
+                    if (iStart > 0) {
+                        int iEnd = line.IndexOf(" (UNKNOWN ARGUMENTS) ", iStart);
+                        if (iEnd > 0) {
+                            string eipString = line.Substring(iStart + 15, iEnd - iStart - 15);
+                            ulong eip = ulong.Parse(eipString, NumberStyles.HexNumber);
+                            Entry e = FindEntry(eip);
+                            ulong adjustEip = e.addr + loadBias;
+
+                            // Recompose a new line with the symbol and the EIP for the start
+                            // of that symbol, rather than the EIP of the stack trace.
+                            line = line.Substring(0, iStart) +
+                                   e.symbol +
+                                   " (UNKNOWN ARGUMENTS) 0x" +
+                                   adjustEip.ToString("x") +
+                                   " 1 ";
+                        }
+                    }
+                }
+                newStream.WriteLine(line);
+                if ((counter++ % 1000) == 0)
+                    Console.Write("*");
+            }
+            newStream.Close();
+            Console.WriteLine(" Okay");
+        }
+
+        static void Main(string[] args)
+        {
+            if (args.Length != 2)
+            {
+                Console.WriteLine("Usage: ProfMap <log> <map>");
+                return;
+            }
+
+            string logName = args[0];
+            string mapName = args[1];
+
+            if (!File.Exists(logName)) {
+                Console.WriteLine("Cannot find log file {0}", logName);
+                return;
+            }
+            logStream = new StreamReader(logName);
+
+            if (!File.Exists(mapName)) {
+                Console.WriteLine("Cannot find map file {1}", mapName);
+                return;
+            }
+            mapStream = new StreamReader(mapName);
+
+            string newName = logName + "new";
+            newStream = new StreamWriter(newName);
+
+            Console.WriteLine("Old log: {0}, map: {1}, creating new log {2}",
+                              logName, mapName, newName);
+
+            entries = new ArrayList();
+
+            ReadMap();
+            ProcessLog();
+
+            Console.WriteLine("Done");
+        }
+    }
+}
diff --git a/base/Windows/ProfMap/ProfMap.csproj b/base/Windows/ProfMap/ProfMap.csproj
new file mode 100644
index 0000000..df6c342
--- /dev/null
+++ b/base/Windows/ProfMap/ProfMap.csproj
@@ -0,0 +1,26 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>profmap</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <DefineConstants>SINGULARITY</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="profmap.cs"/>
+    <Reference Include="System"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/ProfMap/makefile b/base/Windows/ProfMap/makefile
new file mode 100644
index 0000000..65f8141
--- /dev/null
+++ b/base/Windows/ProfMap/makefile
@@ -0,0 +1,29 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\ProfMap\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /define:SINGULARITY
+REFERENCES = /reference:System.dll
+
+all: $(OBJDIR)\ProfMap.exe
+
+clean:
+    @-del /q $(OBJDIR)\ProfMap.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+install: all
+    $(COPY) $(OBJDIR)\ProfMap.exe ..\..\build\ProfMap.exe
+
+$(OBJDIR)\ProfMap.exe: ProfMap.cs
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\ProfMap.exe ProfMap.cs
+
diff --git a/base/Windows/RunAll/Makefile b/base/Windows/RunAll/Makefile
new file mode 100644
index 0000000..00ef879
--- /dev/null
+++ b/base/Windows/RunAll/Makefile
@@ -0,0 +1,55 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\RunAll\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\runall.exe
+
+$(OBJDIR):
+    mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\runall.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+install: $(OBJDIR) $(OBJDIR)\runall.exe
+    $(SDEDIT) ..\..\build\runall.*
+    $(COPY) $(OBJDIR)\runall.exe ..\..\build
+    $(COPY) $(OBJDIR)\runall.pdb ..\..\build
+
+##############################################################################
+
+CFLAGS=$(CFLAGS) /I..\inc /WX /W3 /Fd$(OBJDIR)\runall.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+    kernel32.lib \
+    user32.lib \
+    libcmt.lib
+
+##############################################################################
+
+{.}.c{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##########################################################################
+
+$(OBJDIR)\runall.obj: runall.c
+
+OBJS = \
+    $(OBJDIR)\runall.obj \
+
+$(OBJDIR)\runall.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
diff --git a/base/Windows/RunAll/runall.c b/base/Windows/RunAll/runall.c
new file mode 100644
index 0000000..33e1cd8
--- /dev/null
+++ b/base/Windows/RunAll/runall.c
@@ -0,0 +1,230 @@
+// ----------------------------------------------------------------------------
+//
+// Program: RunAll
+//
+// Purpose: Run all processes simultaneously with optional fatal error
+//          on any process failure or timeout.  This is intended to be
+//          used by the automated build process to wrapper running
+//          bootd and the kernel debugger side-by-side.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// ----------------------------------------------------------------------------
+
+#define _WIN32_WINNT 0x0500
+
+#include <winlean.h>
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+static BOOL g_bVerbose = FALSE;
+
+#define tprintf if (g_bVerbose) printf
+
+static BOOL WINAPI CtrlHandler(DWORD dwCtrlType)
+{
+    printf("Caught control event %I32u", dwCtrlType);
+    switch (dwCtrlType) {
+      case CTRL_C_EVENT:
+      case CTRL_BREAK_EVENT:
+        GenerateConsoleCtrlEvent(dwCtrlType, 0);
+      default:
+        break;
+    }
+    ExitProcess((UINT)-2);
+}
+
+static void
+ErrorReport(char *function)
+{
+    VOID *message;
+    DWORD error = GetLastError();
+
+    FormatMessage(
+                  FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                  FORMAT_MESSAGE_FROM_SYSTEM,
+                  NULL,
+                  error,
+                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                  (LPTSTR) &message,
+                  0, NULL );
+
+    printf("runall: %s failed with error %d: %s",
+           function, error, message);
+
+    LocalFree(message);
+}
+
+void usage()
+{
+    printf("Usage: runall [options] cmd [cmd1] ...\n\n");
+    printf("Options:\n");
+    printf("  /T:seconds    - Set timeout in seconds.");
+    printf("Runs specified commands in parallel and wait for all to terminate successfully.  The program returns -1 if any process fails to launch, or exits with a non zero error-code, or the option timeout expires.");
+}
+
+static BOOL
+ParseInt64(LPCSTR lpszValue, PINT64 pValue)
+{
+    PCHAR pszStop;
+
+    errno = 0;
+    *pValue = _strtoi64(lpszValue, &pszStop, 10);
+
+    // Return no overflow and all characters parsed.
+    return errno == 0 && *pszStop == '\0';
+}
+
+static int
+RunAndWait(int                   nProcesses,
+           LPPROCESS_INFORMATION lpProcessInfo,
+           LPCSTR                lpszCommandLine[],
+           time_t                endTime)
+{
+    HANDLE hProcesses[MAXIMUM_WAIT_OBJECTS];
+    int    nProcessOrdinal[MAXIMUM_WAIT_OBJECTS];
+    int    i;
+
+    for (i = 0; i < nProcesses; i++) {
+        if (ResumeThread(lpProcessInfo[i].hThread) == -1) {
+            ErrorReport("ResumeThread");
+            return -1;
+        }
+        hProcesses[i]      = lpProcessInfo[i].hProcess;
+        nProcessOrdinal[i] = i;
+    }
+
+    while (nProcesses > 0) {
+        DWORD  dwMilliseconds;
+        DWORD  dwResult;
+        time_t t;
+
+        time(&t);
+        if (t > endTime) {
+            printf("runall: timeout\n");
+            return -1;
+        }
+
+        t = (endTime - t) / 1000;
+        dwMilliseconds = (DWORD)((t < INFINITE) ? t : INFINITE - 1);
+
+        dwResult = WaitForMultipleObjects(nProcesses,
+                                          hProcesses,
+                                          FALSE,
+                                          dwMilliseconds);
+        if (dwResult == WAIT_TIMEOUT) {
+        }
+        else if (dwResult >= WAIT_ABANDONED_0 &&
+                 dwResult <= WAIT_ABANDONED_0 + nProcesses) {
+            printf("runall: wait abandoned (process %d)\n",
+                   dwResult - WAIT_ABANDONED_0);
+            return -1;
+        }
+        else {
+            DWORD dwProcess = dwResult - WAIT_OBJECT_0;
+            DWORD dwExitCode;
+
+            hProcesses[dwProcess] = hProcesses[--nProcesses];
+            nProcessOrdinal[dwProcess] = nProcessOrdinal[nProcesses];
+
+            if (GetExitCodeProcess(hProcesses[dwProcess], &dwExitCode) == 0) {
+                ErrorReport("GetExitCodeProcess");
+                return -1;
+            }
+
+            printf("runall: Command \"%s\" => exited %d\n",
+                   lpszCommandLine[nProcessOrdinal[dwProcess]],
+                   dwExitCode);
+
+            if (dwExitCode != 0) {
+                return -1;
+            }
+        }
+    }
+    return 0;
+}
+
+static int
+RunAll(int nProcesses, LPCSTR lpszCommandLine[], time_t endTime)
+{
+    PROCESS_INFORMATION pi[MAXIMUM_WAIT_OBJECTS];
+    STARTUPINFO         si;
+
+    int exitCode = -1;
+    int i;
+
+    for (i = 0; i < nProcesses; i++) {
+        DWORD dwCreationFlags = CREATE_SUSPENDED | CREATE_NO_WINDOW;
+        ZeroMemory(&si, sizeof(si));
+        si.cb = sizeof(si);
+        if (!CreateProcess(NULL, (LPSTR)lpszCommandLine[i], NULL, NULL, FALSE,
+                           dwCreationFlags, NULL, NULL, &si, &pi[i])) {
+            ErrorReport("CreateProcess");
+            break;
+        }
+        tprintf("runall: Created PID %u: %s\n",
+                pi[i].dwProcessId, lpszCommandLine[i]);
+    }
+
+    if (i == nProcesses) {
+        exitCode = RunAndWait(nProcesses, pi, lpszCommandLine, endTime);
+    }
+
+    while (--i >= 0) {
+        if (TerminateProcess(pi[i].hProcess, -1)) {
+            tprintf("runall: Terminated PID %u: %s\n",
+                    pi[i].dwProcessId, lpszCommandLine[i]);
+        }
+    }
+    return exitCode;
+}
+
+int
+main(int argc, LPCSTR argv[])
+{
+    BOOL   bLaunchFailure = FALSE;
+    time_t endTime        = _I64_MAX;
+    INT64  timeout        = 0;
+
+    argc--;
+    argv++;
+
+    while (argc != 0 && (argv[0][0] == '/' || argv[0][0] == '-')) {
+        switch (tolower(argv[0][1])) {
+            case 't':
+                if (argv[0][2] == ':' && ParseInt64(&argv[0][3], &timeout)) {
+                    time(&endTime);
+                    endTime += (time_t)timeout;
+                }
+                else {
+                    printf("Bad timeout argument.");
+                    return -1;
+                }
+                break;
+            case 'v':
+                g_bVerbose = TRUE;
+            break;
+            default:
+                usage();
+                return -1;
+        }
+        argc --;
+        argv ++;
+    }
+
+    if (argc == 0) {
+        usage();
+        return -1;
+    } else if (argc > MAXIMUM_WAIT_OBJECTS) {
+        printf("Supported process limit exceeded.");
+        return -1;
+    }
+
+    SetConsoleCtrlHandler(CtrlHandler, TRUE);
+
+    return RunAll(argc, argv, endTime);
+}
diff --git a/base/Windows/RunParallel/Makefile b/base/Windows/RunParallel/Makefile
new file mode 100644
index 0000000..182597a
--- /dev/null
+++ b/base/Windows/RunParallel/Makefile
@@ -0,0 +1,64 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\RunParallel\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /unsafe
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\RunParallel.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+copy: $(OBJDIR) $(OBJDIR)\RunParallel.exe
+    $(COPY) $(OBJDIR)\RunParallel.exe ..\..\build
+    $(COPY) $(OBJDIR)\RunParallel.pdb ..\..\build
+
+
+install: $(OBJDIR) $(OBJDIR)\RunParallel.exe
+    $(SDEDIT) ..\..\build\RunParallel.*
+    $(COPY) $(OBJDIR)\RunParallel.exe ..\..\build
+    $(COPY) $(OBJDIR)\RunParallel.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\RunParallel.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.Xml.dll \
+    /reference:System.dll \
+
+
+SOURCE_FILES = \
+    Program.cs \
+    ProgressForm.cs \
+    SyncQueue.cs \
+    Task.cs \
+    WorkerThread.cs \
+    TypeSafeWrappers.cs \
+    Util.cs \
+    ..\WindowsInteropLib\Kernel32.cs \
+        
+
+##############################################################################
+
+$(OBJDIR)\RunParallel.exe: $(SOURCE_FILES) Makefile
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\RunParallel.exe $(SOURCE_FILES)
+
+##############################################################################
diff --git a/base/Windows/RunParallel/Program.cs b/base/Windows/RunParallel/Program.cs
new file mode 100644
index 0000000..b29e723
--- /dev/null
+++ b/base/Windows/RunParallel/Program.cs
@@ -0,0 +1,878 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+
+This program is a simple parallel task runner.  It reads a set of tasks from input files
+(or from stdin), builds a queue of tasks, starts N threads, and each thread pulls tasks
+from the queue and runs them.  Each worker thread is affinitized to a specific processor.
+
+The input files are flat text files, one command per line.  Blank lines are ignored.
+If a line consists of "+DRAIN", then the scheduler will wait for all previous tasks
+to finish before continuing.
+
+The program is designed to be run from command-line scripts (automated builds).  It does
+support a GUI for displaying status, but the GUI never prompts the user for anything,
+never blocks, etc. and so is at worst benign during automated builds.  The GUI can be
+enabled with the /gui switch.
+
+
+Arlie Davis
+July 2006
+
+*/
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Diagnostics;
+using Windows;
+
+#if ENABLE_PROGRESS_FORM
+using System.Windows.Forms;
+#endif
+
+namespace RunParallel
+{
+    sealed class Program
+    {
+        static uint _availableProcessorMask;
+        static uint _threadMask;
+
+        /// <summary>
+        /// The shell to use when starting child processes; this comes from the COMSPEC
+        /// variable in the environment.
+        /// </summary>
+        static string _shell;
+
+        static int _errorCount;
+
+        /// <summary>
+        /// Handle to the NT kernel "job" object, created using the Win32 CreateJobObject()
+        /// function.  All processes that this tool starts are put into the job, so that we
+        /// can query the total CPU usage at the end.
+        /// </summary>
+        internal static IntPtr _JobObjectHandle;
+
+
+        static bool _verbose;
+
+        public static string ShellName
+        {
+            get { return _shell; }
+        }
+
+        public static object SyncLock
+        {
+            get { return _lock; }
+        }
+
+        const string DrainBarrierMarker = "+DRAIN";
+
+#if ENABLE_PROGRESS_FORM
+        /// <summary>
+        /// If true, the GUI progress form will be displayed.
+        /// </summary>
+        static bool _enableProgressForm;
+#endif
+
+        /// <summary>
+        /// This is the queue of work items that the main thread uses.
+        /// Only the main thread ever touched this queue.  The main thread
+        /// dequeues items from this queue, and moves them to the _workerTaskQueue.
+        /// When it moves a job, the main thread also increments _workerActiveTaskCount.
+        /// 
+        /// This allows the main thread to implement synchronize/drain.  When the main
+        /// thread needs to wait for all threads to finish processing, it just dequeues
+        /// items from _workerFinishedQueue until _workerActiveTaskCount reaches zero.
+        /// </summary>
+        static readonly Queue_of_Task _taskQueue = new Queue_of_Task();
+
+        /// <summary>
+        /// The synchronized queue of tasks to execute.  Worker threads pull items
+        /// from this queue, process them, and then enqueue those items to _workerFinishedQueue.
+        /// </summary>
+        static internal readonly SyncQueue_of_Task _workerTaskQueue = new SyncQueue_of_Task();
+
+        /// <summary>
+        /// The synchronized queue of tasks that have finished.  Worker threads enqueue
+        /// items here, and the main thread dequeues items.
+        /// </summary>
+        static internal readonly SyncQueue_of_Task _workerFinishedQueue = new SyncQueue_of_Task();
+
+        // number of items that the main thread has submitted to the worker threads
+        static int _workerActiveTaskCount;
+
+        internal static int _tasksCompletedCount;
+        static int _totalTaskCount;
+
+        static IntPtr ThisProcessHandle { get { return (IntPtr)(-1); } }
+
+        static int Main(string[] args)
+        {
+            try
+            {
+                _shell = Environment.GetEnvironmentVariable("COMSPEC");
+                if (Util.StringIsNullOrEmpty(_shell))
+                    _shell = "cmd.exe";
+
+                uint systemAffinityMask;
+                if (!GetProcessAffinityMask(ThisProcessHandle, out _availableProcessorMask, out systemAffinityMask))
+                {
+                    WriteLine("Failed to get process affinity mask?!");
+                    _availableProcessorMask = 1;
+                    systemAffinityMask = 1;
+                }
+
+                _threadMask = _availableProcessorMask;
+
+                if (Kernel32.IsCurrentProcessInJob())
+                {
+                    WriteLine("This process is already in a job; job accounting is disabled.");
+                    _JobObjectHandle = IntPtr.Zero;
+                }
+                else
+                {
+                    try
+                    {
+                        _JobObjectHandle = Kernel32.CreateJobObject();
+                    }
+                    catch (Exception ex)
+                    {
+                        WriteLine("WARNING: Failed to create job for processes.");
+                        ShowException(ex);
+                        _JobObjectHandle = IntPtr.Zero;
+                    }
+                }
+
+                ParseArgs(args);
+
+                _totalTaskCount = _taskQueue.Count;
+
+                DateTime timeStarted = DateTime.Now;
+
+                RunTasks();
+
+
+                DateTime timeEnded = DateTime.Now;
+
+                TimeSpan elapsed = timeEnded - timeStarted;
+
+                const string times_format = " {0,-32} : {1}";
+
+                if (_JobObjectHandle != IntPtr.Zero)
+                {
+                    try
+                    {
+                        JOBOBJECT_BASIC_ACCOUNTING_INFORMATION job_info;
+                        job_info = Kernel32.QueryJobObjectBasicAccountingInformation(_JobObjectHandle);
+
+                        TimeSpan total_job_time = job_info.TotalUserTime + job_info.TotalKernelTime;
+
+                        WriteLine(
+                            times_format,
+                            "CPU time consumed by jobs",
+                            total_job_time);
+
+                        WriteLine(
+                            times_format,
+                            "    in user mode",
+                            job_info.TotalUserTime);
+
+                        WriteLine(
+                            times_format,
+                            "    in kernel mode",
+                            job_info.TotalKernelTime);
+
+                        WriteLine(
+                            times_format,
+                            "Elapsed time (wall time)",
+                            elapsed);
+
+                        WriteLine("");
+                        if (elapsed.TotalMilliseconds > 0)
+                        {
+                            double elapsed_ms = elapsed.TotalMilliseconds;
+                            double total_job_ms = total_job_time.TotalMilliseconds;
+                            double throughput_ratio = total_job_ms / elapsed_ms;
+                            double throughput_percent = Math.Round(throughput_ratio * 100.0);
+                            WriteLine("      Parallel throughput ratio: {0}%", throughput_percent);
+                        }
+                        else
+                        {
+                            WriteLine("      Too little time elapsed to compute ratio.");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        WriteLine("FAILED to query job info!");
+                        ShowException(ex);
+                    }
+                }
+                else
+                {
+                    WriteLine("Child process times not available.");
+                }
+
+                if (_errorCount != 0)
+                {
+                    WriteLine("ERROR: {0} {1} completed unsuccessfully!",
+                        _errorCount, _errorCount != 1 ? "tasks" : "task");
+                    return 2;
+                }
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                WriteLine("A top-level exception occurred.");
+                ShowException(ex);
+                return 1;
+            }
+            finally
+            {
+                if (_JobObjectHandle != IntPtr.Zero)
+                {
+                    Kernel32.CloseHandle(_JobObjectHandle);
+                    _JobObjectHandle = IntPtr.Zero;
+                }
+
+                StopProgressForm();
+            }
+        }
+
+        #region Progress Thread Support
+#if ENABLE_PROGRESS_FORM
+
+        static AutoResetEvent _progressThreadReady;
+
+        static void CreateProgressThread()
+        {
+            using (AutoResetEvent ready = new AutoResetEvent(false))
+            {
+                _progressThreadReady = ready;
+
+                _progressThread = new Thread(new ThreadStart(ProgressThreadRoutine));
+                _progressThread.Start();
+
+                if (!ready.WaitOne(30000, false))
+                {
+                    _progressThread.Abort();
+                    _progressThread.Join();
+                    throw new Exception("The GUI thread failed to start.");
+                }
+
+                _progressThreadReady = null;
+            }
+        }
+
+        static void StopProgressForm()
+        {
+            if (_progressForm != null)
+            {
+                Debug.WriteLine("telling gui thread to quit");
+                MethodInvoker close = new MethodInvoker(_progressForm.PublicClose);
+                _progressForm.Invoke(close);
+                Debug.WriteLine("waiting for GUI thread to quit");
+                _progressForm = null;
+            }
+
+            if (_progressThread != null)
+            {
+                if (!_progressThread.Join(TimeSpan.FromSeconds(3)))
+                {
+                    _progressThread.Abort();
+                    _progressThread.Join();
+                }
+                _progressThread = null;
+            }
+        }
+
+        static void ProgressThreadRoutine()
+        {
+            try
+            {
+                Thread.CurrentThread.Priority = ThreadPriority.Highest;
+
+                Debug.Assert(_progressThreadReady != null);
+
+                using (ProgressForm form = new ProgressForm())
+                {
+                    _progressForm = form;
+
+                    lock (_lock)
+                    {
+                        foreach (WorkerThread worker in _workers)
+                        {
+                            ListViewItem item = new ListViewItem(worker.ThreadIndex.ToString());
+                            item.SubItems.Add("");
+                            item.SubItems.Add("");
+                            _progressForm.WorkerListView.Items.Add(item);
+                            worker.ProgressListItem = item;
+                        }
+                    }
+
+                    _progressThreadReady.Set();
+                    Application.Run(form);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine("Exception on GUI thread: " + ex.Message);
+            }
+        }
+
+        static Thread _progressThread;
+#else
+        static void StopProgressForm()
+        {
+        }
+#endif
+
+        #endregion
+
+        [DllImport("KERNEL32.DLL")]
+        static extern bool GetProcessAffinityMask(IntPtr process, out uint processAffinityMask, out uint systemAffinityMask);
+
+        [DllImport("KERNEL32.DLL")]
+        static extern uint SetThreadIdealProcessor(IntPtr thread, uint processor);
+
+        static uint ComputeProcessorAffinity(int maxThreads)
+        {
+            uint available_mask = _availableProcessorMask;
+            uint enabled_mask = 0;
+            int bit = 0;
+            int enabled_count = 0;
+
+            while (enabled_count < maxThreads)
+            {
+                for (; ; )
+                {
+                    if (bit < 32)
+                    {
+                        uint mask = (1u << bit);
+                        if ((available_mask & mask) != 0)
+                        {
+                            enabled_mask |= mask;
+                            bit++;
+                            break;
+                        }
+                        else
+                        {
+                            bit++;
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        // No more processors!
+                        Print("Max task count specified is higher than number of processors.");
+                        Print("Capping at {0} concurrent tasks.", enabled_count);
+                        return enabled_mask;
+                    }
+                }
+            }
+
+            return enabled_mask;
+        }
+
+
+        static char[] _commandSeparators = { ':', '=' };
+
+        const string Prefix = "RUNPARALLEL: ";
+
+        static void Print(string text)
+        {
+            WriteLine(Prefix + text);
+        }
+
+        static void Print(string format, params object[] args)
+        {
+            Print(String.Format(format, args));
+        }
+
+        /// <summary>
+        /// Actually, this does more than just parse the args.
+        /// It also loads the tasks.
+        /// </summary>
+        /// <param name="args"></param>
+        static void ParseArgs(string[] args)
+        {
+            bool foundInputFiles = false;
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                string arg = args[i];
+
+                if (arg.StartsWith("/") || arg.StartsWith("-"))
+                {
+                    int index = arg.IndexOfAny(_commandSeparators, 1);
+                    string name;
+                    string value;
+                    if (index >= 0)
+                    {
+                        name = arg.Substring(1, index - 1);
+                        value = arg.Substring(index + 1);
+                    }
+                    else
+                    {
+                        name = arg.Substring(1);
+                        value = "";
+                    }
+
+                    name = name.ToLower();
+                    switch (name)
+                    {
+                        case "help":
+                        case "?":
+                            Usage();
+                            break;
+
+                        case "stdin":
+                            ReadTasksText(Console.In);
+                            foundInputFiles = true;
+                            break;
+
+                        case "max":
+                            int maxThreads;
+                            try
+                            {
+                                maxThreads = Int32.Parse(name);
+                            }
+                            catch
+                            {
+                                WriteLine("Invalid value for -max");
+                                Usage();
+                                maxThreads = 0; // satisfy compiler
+                            }
+                            _threadMask = ComputeProcessorAffinity(maxThreads);
+                            break;
+
+                        case "v":
+                        case "verbose":
+                            _verbose = true;
+                            break;
+
+                        case "gui":
+#if ENABLE_PROGRESS_FORM
+                            _enableProgressForm = true;
+#endif
+                            break;
+
+                        case "tasks":
+                            using (StreamReader reader = File.OpenText(arg))
+                            {
+                                ReadTasksText(reader);
+                                foundInputFiles = true;
+                            }
+                            break;
+
+                        default:
+                            WriteLine("Unrecognized switch: " + name);
+                            Usage();
+                            break;
+                    }
+                }
+                else
+                {
+#if false
+                    // It appears to be an inline repeat, sort of like xargs.
+                    int start = i;
+                    i++;
+                    while (i < args.Length && args[i] != "--")
+                        i++;
+                    if (i == args.Length)
+                    {
+                        WriteLine("No tasks were specified.  Please use -- to separate the fixed portion");
+                        WriteLine("of the command line from the list of tasks.");
+                        ShortUsage();
+                    }
+
+                    string command_base = ArgsToString(args, start, i - start);
+                    const string insertion_marker = "$=";
+                    bool has_insertion_marker = command_base.IndexOf(insertion_marker) != -1;
+
+                    // For each remaining argument, build a task.
+                    i++;
+                    bool drain_required = false;
+                    for (int j = i; j < args.Length; j++)
+                    {
+                        string taskarg = args[j];
+
+                        if (Util.StringCompareCaseInsensitive(taskarg, DrainBarrierMarker) == 0)
+                        {
+                            // A drain marker indicates that all tasks in the current sequence must
+                            // finish before any tasks after the marker begin.
+                            drain_required = true;
+                            continue;
+                        }
+
+                        string command = command_base;
+
+                        if (has_insertion_marker)
+                            command = command_base.Replace(insertion_marker, taskarg);
+                        else
+                            command = command_base + " " + taskarg;
+
+                        Task task = new Task();
+                        task.Name = taskarg;
+                        task.CommandLine = command;
+                        task.DrainRequired = drain_required;
+                        _taskQueue.Enqueue(task);
+
+                        if (drain_required)
+                        {
+                            // WriteLine("{0}: task will cause drain", task.CommandLine);
+                        }
+
+                        drain_required = false;
+                    }
+                    foundInputFiles = true;
+                    break;
+#else
+                    ReadTasksText(arg);
+                    foundInputFiles = true;
+#endif
+                }
+            }
+
+            if (!foundInputFiles)
+                Usage();
+        }
+
+        static string ArgsToString(string[] args, int offset, int count)
+        {
+            StringBuilder buffer = new StringBuilder();
+
+            for (int i = 0; i < count; i++)
+            {
+                if (i > 0)
+                    buffer.Append(" ");
+
+                string arg = args[offset + i];
+
+                bool quotes = false;
+                if (arg.IndexOf(" ") != -1)
+                    quotes = true;
+
+                if (quotes)
+                    buffer.Append("\"");
+
+                buffer.Append(arg);
+
+                if (quotes)
+                    buffer.Append("\"");
+            }
+
+            return buffer.ToString();
+        }
+
+        static void ShortUsage()
+        {
+            WriteLine("Use -? or -help for a list of full arguments.");
+            Environment.Exit(1);
+        }
+
+        static void Usage()
+        {
+            WriteLine(
+@"
+RUNPARALLEL: A simple parallel task runner.
+
+Usage: RUNPARALLEL [options] /tasks:foo.txt /tasks:bar.txt [/stdin]
+
+Or:
+        RUNPARALLEL [options] foo.exe arg1 ... $= ... -- task1 task2 task3
+
+where [options] can be:
+
+    /max:nn     Maximum of nn active tasks
+"
+#if ENABLE_PROGRESS_FORM
++ @"    /gui        Show the GUI progress form (non-blocking)\r\n"
+#endif
++ @"    /stdin      Read tasks from stdin
+    /v          Verbose info about job scheduling
+
+Each input file contains commands to run in parallel.  Each command is on a 
+separate line.  The +DRAIN marker will cause all previous commands to complete
+before continuing.  You can use /stdin to read tasks from standard input.
+
+If you use the second form, then no input file is necessary.  The first arguments
+form the command-line for the program to run.  The ""--"" marker separates the
+command-line to run from the tasks to run.  If the command-line to run has a
+'$=' marker in it, then that marker will be replaced with each of the task values.
+If there is no marker, then the task value will be appended to the end of the
+command-line.  For example:
+
+    runparallel cd $= ^&^& nmake /nologo -- app1 app2 app3
+
+will result in these commands being run in parallel:
+
+    cd app1 && nmake /nologo
+    cd app2 && nmake /nologo
+    cd app3 && nmake /nologo
+
+The special task-name +DRAIN will cause the scheduler to wait for all previous
+tasks to complete before scheduling more tasks.
+
+Contact Arlie Davis (arlied) with questions.
+");
+            Environment.Exit(1);
+
+        }
+
+        /// <summary>
+        /// This method reads a text file and creates work items.  Each line in the file
+        /// contains a work item.  There is no comment character.  Blank lines are ignored.
+        /// </summary>
+        /// <param name="reader"></param>
+        static void ReadTasksText(TextReader reader)
+        {
+            bool drain_required = false;
+
+            for (; ; )
+            {
+                string line = reader.ReadLine();
+                if (line == null)
+                    break;
+
+                if (Util.IsBlank(line))
+                    continue;
+
+                line = line.Trim();
+                if (Util.StringCompareCaseInsensitive(line, DrainBarrierMarker) == 0)
+                {
+                    drain_required = true;
+                    continue;
+                }
+
+                Task task = new Task();
+
+                task.Name = line;
+                task.CommandLine = line;
+                task.DrainRequired = drain_required;
+
+                _taskQueue.Enqueue(task);
+
+                drain_required = false;
+            }
+        }
+
+        static void ReadTasksText(string filename)
+        {
+            using (StreamReader reader = File.OpenText(filename))
+            {
+                ReadTasksText(reader);
+            }
+        }
+
+        static int GetSetBitCount(uint value)
+        {
+            uint result = ((value & 0xaaaaaaaau) >> 1) + (value & 0x55555555u);
+            result = ((result & 0xccccccccu) >> 2) + (result & 0x33333333u);
+            result = ((result & 0xf0f0f0f0u) >> 4) + (result & 0x0f0f0f0fu);
+            result = ((result & 0xff00ff00u) >> 8) + (result & 0x00ff00ffu);
+            result = ((result & 0xffff0000u) >> 16) + (result & 0x0000ffffu);
+            return checked((int)result);
+        }
+
+        static void RunTasks()
+        {
+            int threadcount = GetSetBitCount(_threadMask);
+
+            WriteLine("Running {0} tasks on {1} thread(s) in directory: {2}",
+                _taskQueue.Count,
+                threadcount,
+                Environment.CurrentDirectory);
+
+            List_of_WorkerThread slotlist = new List_of_WorkerThread();
+
+            uint runMask = _threadMask;
+
+            for (int i = 0; i < 32; i++)
+            {
+                uint mask = (1u << i);
+                if ((runMask & mask) != 0)
+                {
+                    WorkerThread worker = new WorkerThread();
+                    worker.AffinityMask = mask;
+                    worker.Thread = new Thread(new ThreadStart(worker.ThreadRoutine));
+                    worker.ThreadIndex = i;
+                    slotlist.Add(worker);
+                }
+            }
+
+#if CLR2
+            _workers = slotlist.ToArray();
+#else
+            _workers = (WorkerThread[])slotlist.ToArray(typeof(WorkerThread));
+#endif
+
+#if ENABLE_PROGRESS_FORM
+            if (_enableProgressForm)
+            {
+                CreateProgressThread();
+            }
+#endif
+
+            foreach (WorkerThread worker in _workers)
+            {
+                worker.Thread.Start();
+            }
+
+            // WriteLine("Dispatching work items...");
+
+            _workerActiveTaskCount = 0;
+
+            for (; ; )
+            {
+                if (_taskQueue.Count != 0)
+                {
+                    Task task = (Task)_taskQueue.Dequeue();
+
+                    if (task.DrainRequired)
+                    {
+                        if (_workerActiveTaskCount != 0)
+                            WriteLine("Performing synchronization drain.");
+                        WaitActiveTasks();
+                    }
+
+                    _workerTaskQueue.Enqueue(task);
+                    _workerActiveTaskCount++;
+                }
+                else
+                {
+                    // WriteLine("Main thread has reached end of task queue.  Closing worker queue.");
+                    break;
+                }
+            }
+
+            _workerTaskQueue.Close();
+            WaitActiveTasks();
+
+            foreach (WorkerThread worker in _workers)
+            {
+                if (worker.Thread != null)
+                {
+                    worker.Thread.Join();
+                }
+            }
+
+            WriteLine("Done.");
+        }
+
+        static void WaitActiveTasks()
+        {
+            Debug.Assert(_workerActiveTaskCount >= 0);
+
+            if (_verbose)
+                WriteLine("waiting for {0} active task(s) to complete.", _workerActiveTaskCount);
+
+            if (_workerActiveTaskCount == 0)
+            {
+                // WriteLine("no need to wait; no active tasks");
+                return;
+            }
+
+
+            while (_workerActiveTaskCount > 0)
+            {
+                Task task;
+                if (_workerFinishedQueue.Dequeue(out task))
+                {
+                    _workerActiveTaskCount--;
+                    if (!task.Succeeded)
+                    {
+                        _errorCount++;
+                    }
+                }
+                else
+                {
+                    Debug.Fail("_workerFinishedQueue.Dequeue did not return an item!!");
+                    WriteLine("Internal error!  _workerFinishedQueue did not return an item!");
+                    throw new Exception("Internal error!  _workerFinishedQueue did not return an item!");
+                }
+            }
+        }
+
+        static WorkerThread[] _workers;
+
+        static readonly object _lock = new Object();
+
+#if ENABLE_PROGRESS_FORM
+        static ProgressForm _progressForm;
+
+        static void UpdateProgressAnyThread()
+        {
+            if (_progressForm == null)
+                return;
+
+            _progressForm.Invoke(new MethodInvoker(UpdateProgressGuiThread), null);
+        }
+
+        internal static void UpdateProgressGuiThread()
+        {
+            // This runs on the GUI thread.
+
+            lock (_lock)
+            {
+                if (_totalTaskCount != 0)
+                {
+                    int percent = (100 * _tasksCompletedCount) / _totalTaskCount;
+                    _progressForm.OverallProgressBar.Value = percent;
+                }
+
+                _progressForm._TotalTasksLabel.Text = _totalTaskCount.ToString();
+                int tasksRemaining = _taskQueue.Count;
+                _progressForm._TasksRemainingLabel.Text = tasksRemaining.ToString();
+
+
+                foreach (WorkerThread slot in _workers)
+                {
+                    ListViewItem item = slot.ProgressListItem;
+
+                    if (slot.CurrentTask != null)
+                    {
+                        item.SubItems[1].Text = slot.CurrentTask.Name;
+                        item.SubItems[2].Text = slot.CurrentTask.CommandLine;
+                    }
+                    else
+                    {
+                        item.SubItems[1].Text = "(none)";
+                        item.SubItems[2].Text = "(none)";
+                    }
+                }
+            }
+        }
+#endif
+
+        static public void ShowException(Exception chain)
+        {
+            for (Exception current = chain; current != null; current = current.InnerException)
+            {
+                WriteLine("{0}: {1}", current.GetType().FullName, current.Message);
+            }
+        }
+
+        static void WriteLine(string line)
+        {
+            Console.WriteLine("main> " + line);
+        }
+
+        static void WriteLine(string format, params object[] args)
+        {
+            WriteLine(String.Format(format, args));
+        }
+    }
+
+
+
+}
diff --git a/base/Windows/RunParallel/ProgressForm.cs b/base/Windows/RunParallel/ProgressForm.cs
new file mode 100644
index 0000000..56f4f20
--- /dev/null
+++ b/base/Windows/RunParallel/ProgressForm.cs
@@ -0,0 +1,223 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#if ENABLE_PROGRESS_FORM
+
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace RunParallel
+{
+    public class ProgressForm : Form
+    {
+        public ProgressForm()
+        {
+            InitializeComponent();
+        }
+
+        private void UpdateTimerTick(object sender, EventArgs e)
+        {
+            Program.UpdateProgressGuiThread();
+        }
+
+
+        bool _allowclose;
+
+        public void PublicClose()
+        {
+            Debug.WriteLine("gui - PublicClose");
+            _allowclose = true;
+            this.Close();
+        }
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            base.OnClosing(e);
+
+            if (!_allowclose)
+            {
+                Debug.WriteLine("gui - too early to close");
+                e.Cancel = true;
+            }
+            else
+            {
+
+                Debug.WriteLine("gui - closing");
+            }
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            this._UpdateTimer.Enabled = false;
+            Debug.WriteLine("gui - closed");
+        }
+
+
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.ColumnHeader columnHeader1;
+            System.Windows.Forms.ColumnHeader columnHeader2;
+            System.Windows.Forms.ColumnHeader columnHeader3;
+            this.WorkerListView = new System.Windows.Forms.ListView();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.OverallProgressBar = new System.Windows.Forms.ProgressBar();
+            this._TotalTasksLabel = new System.Windows.Forms.Label();
+            this._TasksRemainingLabel = new System.Windows.Forms.Label();
+            this._UpdateTimer = new System.Windows.Forms.Timer(this.components);
+            columnHeader1 = new System.Windows.Forms.ColumnHeader();
+            columnHeader2 = new System.Windows.Forms.ColumnHeader();
+            columnHeader3 = new System.Windows.Forms.ColumnHeader();
+            this.SuspendLayout();
+            // 
+            // WorkerListView
+            // 
+            this.WorkerListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.WorkerListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            columnHeader1,
+            columnHeader2,
+            columnHeader3});
+            this.WorkerListView.Location = new System.Drawing.Point(14, 98);
+            this.WorkerListView.Name = "WorkerListView";
+            this.WorkerListView.Size = new System.Drawing.Size(728, 157);
+            this.WorkerListView.TabIndex = 0;
+            this.WorkerListView.UseCompatibleStateImageBehavior = false;
+            this.WorkerListView.View = System.Windows.Forms.View.Details;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(14, 17);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(62, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "Total tasks:";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(14, 41);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(78, 13);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "Tasks queued:";
+            // 
+            // OverallProgressBar
+            // 
+            this.OverallProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.OverallProgressBar.Location = new System.Drawing.Point(249, 41);
+            this.OverallProgressBar.Name = "OverallProgressBar";
+            this.OverallProgressBar.Size = new System.Drawing.Size(493, 21);
+            this.OverallProgressBar.TabIndex = 3;
+            // 
+            // columnHeader1
+            // 
+            columnHeader1.Text = "Thread";
+            columnHeader1.Width = 67;
+            // 
+            // columnHeader2
+            // 
+            columnHeader2.Text = "Current Task";
+            columnHeader2.Width = 148;
+            // 
+            // columnHeader3
+            // 
+            columnHeader3.Text = "Command Line";
+            columnHeader3.Width = 470;
+            // 
+            // _TotalTasksLabel
+            // 
+            this._TotalTasksLabel.AutoSize = true;
+            this._TotalTasksLabel.Location = new System.Drawing.Point(116, 17);
+            this._TotalTasksLabel.Name = "_TotalTasksLabel";
+            this._TotalTasksLabel.Size = new System.Drawing.Size(33, 13);
+            this._TotalTasksLabel.TabIndex = 4;
+            this._TotalTasksLabel.Text = "(total)";
+            // 
+            // _TasksRemainingLabel
+            // 
+            this._TasksRemainingLabel.AutoSize = true;
+            this._TasksRemainingLabel.Location = new System.Drawing.Point(116, 41);
+            this._TasksRemainingLabel.Name = "_TasksRemainingLabel";
+            this._TasksRemainingLabel.Size = new System.Drawing.Size(58, 13);
+            this._TasksRemainingLabel.TabIndex = 4;
+            this._TasksRemainingLabel.Text = "(remaining)";
+            // 
+            // _UpdateTimer
+            // 
+            this._UpdateTimer.Enabled = true;
+            this._UpdateTimer.Interval = 250;
+            this._UpdateTimer.Tick += new System.EventHandler(this.UpdateTimerTick);
+            // 
+            // ProgressForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(754, 266);
+            this.Controls.Add(this._TasksRemainingLabel);
+            this.Controls.Add(this._TotalTasksLabel);
+            this.Controls.Add(this.OverallProgressBar);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.WorkerListView);
+            this.MaximizeBox = false;
+            this.Name = "ProgressForm";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
+            this.Text = "Run Parallel";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        internal System.Windows.Forms.ListView WorkerListView;
+        internal System.Windows.Forms.ProgressBar OverallProgressBar;
+        internal System.Windows.Forms.Label _TotalTasksLabel;
+        internal System.Windows.Forms.Label _TasksRemainingLabel;
+        private System.Windows.Forms.Timer _UpdateTimer;
+    }
+}
+
+#endif
diff --git a/base/Windows/RunParallel/ProgressForm.resx b/base/Windows/RunParallel/ProgressForm.resx
new file mode 100644
index 0000000..5d28023
--- /dev/null
+++ b/base/Windows/RunParallel/ProgressForm.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="columnHeader1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="columnHeader2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="columnHeader3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="columnHeader1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="columnHeader2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="columnHeader3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="_UpdateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/base/Windows/RunParallel/RunParallel.sln b/base/Windows/RunParallel/RunParallel.sln
new file mode 100644
index 0000000..8800575
--- /dev/null
+++ b/base/Windows/RunParallel/RunParallel.sln
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunParallel", "RunParallel.csproj", "{8B471570-6DC4-4EF9-BC04-BF5A46476A4D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nmake_dirs", "..\nmake_dirs\nmake_dirs.csproj", "{D24899E6-3650-40A9-92C5-D33FAC1D6ABD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsInteropLib", "..\WindowsInteropLib\WindowsInteropLib.csproj", "{41BB2D74-0A52-47E9-9CE7-10E1EC04180D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "timerun", "..\timerun\timerun.csproj", "{FDED26D2-2F73-474C-BBA9-C8A5CC8E6967}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8B471570-6DC4-4EF9-BC04-BF5A46476A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B471570-6DC4-4EF9-BC04-BF5A46476A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B471570-6DC4-4EF9-BC04-BF5A46476A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B471570-6DC4-4EF9-BC04-BF5A46476A4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D24899E6-3650-40A9-92C5-D33FAC1D6ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D24899E6-3650-40A9-92C5-D33FAC1D6ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D24899E6-3650-40A9-92C5-D33FAC1D6ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D24899E6-3650-40A9-92C5-D33FAC1D6ABD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41BB2D74-0A52-47E9-9CE7-10E1EC04180D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41BB2D74-0A52-47E9-9CE7-10E1EC04180D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41BB2D74-0A52-47E9-9CE7-10E1EC04180D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41BB2D74-0A52-47E9-9CE7-10E1EC04180D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDED26D2-2F73-474C-BBA9-C8A5CC8E6967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDED26D2-2F73-474C-BBA9-C8A5CC8E6967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDED26D2-2F73-474C-BBA9-C8A5CC8E6967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDED26D2-2F73-474C-BBA9-C8A5CC8E6967}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/base/Windows/RunParallel/SyncQueue.cs b/base/Windows/RunParallel/SyncQueue.cs
new file mode 100644
index 0000000..1a9d2d5
--- /dev/null
+++ b/base/Windows/RunParallel/SyncQueue.cs
@@ -0,0 +1,143 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Threading;
+
+// Until we can safely assume that everyone who builds Singularity has CLR2,
+// we'll use non-generic collections.
+
+namespace RunParallel
+{
+#if CLR2
+    using System.Collections.Generic;
+
+    public class SyncQueue<T>
+    {
+        internal readonly object _lock = new object();
+
+        internal readonly Queue<T> _queue = new Queue<T>();
+
+        internal bool _is_closed;
+
+        internal int _waiter_count;
+
+        public void Enqueue(T item)
+        {
+            lock (_lock)
+            {
+                _queue.Enqueue(item);
+                if (_waiter_count > 0)
+                {
+                    _waiter_count--;
+                    Monitor.Pulse(_lock);
+                }
+            }
+        }
+
+        public bool Dequeue(out T item)
+        {
+            lock (_lock)
+            {
+                for (; ; )
+                {
+                    if (_queue.Count == 0)
+                    {
+                        if (_is_closed)
+                        {
+                            item = default(T);
+                            return false;
+                        }
+
+                        _waiter_count++;
+                        Monitor.Wait(_lock);
+                    }
+                    else
+                    {
+                        item = _queue.Dequeue();
+                        return true;
+                    }
+                }
+            }
+        }
+
+        public void Close()
+        {
+            lock (_lock)
+            {
+                _is_closed = true;
+                Monitor.PulseAll(_lock);
+            }
+        }
+    }
+
+#else
+    using System.Collections;
+
+    class SyncQueue_of_Task
+    {
+        internal readonly object _lock = new object();
+
+        internal readonly Queue _queue = new Queue();
+
+        internal bool _is_closed;
+
+        internal int _waiter_count;
+
+        public void Enqueue(Task item)
+        {
+            lock (_lock)
+            {
+                _queue.Enqueue(item);
+                if (_waiter_count > 0)
+                {
+                    _waiter_count--;
+                    Monitor.Pulse(_lock);
+                }
+            }
+        }
+
+        public bool Dequeue(out Task item)
+        {
+            lock (_lock)
+            {
+                for (; ; )
+                {
+                    if (_queue.Count == 0)
+                    {
+                        if (_is_closed)
+                        {
+                            item = null;
+                            return false;
+                        }
+
+                        _waiter_count++;
+                        Monitor.Wait(_lock);
+                    }
+                    else
+                    {
+                        item = (Task)_queue.Dequeue();
+                        return true;
+                    }
+                }
+            }
+        }
+
+        public void Close()
+        {
+            lock (_lock)
+            {
+                _is_closed = true;
+                Monitor.PulseAll(_lock);
+            }
+        }
+    }
+
+#endif
+}
+
diff --git a/base/Windows/RunParallel/Task.cs b/base/Windows/RunParallel/Task.cs
new file mode 100644
index 0000000..97c2ccc
--- /dev/null
+++ b/base/Windows/RunParallel/Task.cs
@@ -0,0 +1,21 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace RunParallel
+{
+    class Task
+    {
+        public string CommandLine;
+        public string Name;
+        public bool DrainRequired;
+        public bool Succeeded;
+        public Exception Error;
+    }
+}
diff --git a/base/Windows/RunParallel/TypeSafeWrappers.cs b/base/Windows/RunParallel/TypeSafeWrappers.cs
new file mode 100644
index 0000000..2ea312e
--- /dev/null
+++ b/base/Windows/RunParallel/TypeSafeWrappers.cs
@@ -0,0 +1,61 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace RunParallel
+{
+#if CLR2
+    using System.Collections.Generic;
+
+    class Queue_of_Task : Queue<Task>
+    {
+    }
+
+    class SyncQueue_of_Task : SyncQueue<Task>
+    {
+    }
+
+    class List_of_WorkerThread : List<WorkerThread>
+    {
+    }
+
+#else
+    using System.Collections;
+
+    class Queue_of_Task
+    {
+        readonly Queue _queue = new Queue();
+
+        public void Enqueue(Task item)
+        {
+            _queue.Enqueue(item);
+        }
+
+        public Task Dequeue()
+        {
+            return (Task)_queue.Dequeue();
+        }
+
+        public int Count
+        {
+            get { return _queue.Count; }
+        }
+    }
+
+    class List_of_WorkerThread : System.Collections.ArrayList
+    {
+        public new WorkerThread[] ToArray()
+        {
+            return (WorkerThread[])base.ToArray(typeof(WorkerThread));
+        }
+    }
+
+#endif
+}
+
diff --git a/base/Windows/RunParallel/Util.cs b/base/Windows/RunParallel/Util.cs
new file mode 100644
index 0000000..d06467c
--- /dev/null
+++ b/base/Windows/RunParallel/Util.cs
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+
+namespace RunParallel
+{
+    sealed class Util
+    {
+        public static bool StringIsNullOrEmpty(string s)
+        {
+            return s == null || s.Length == 0;
+        }
+
+#if CLR2
+        public static int StringCompareCaseInsensitive(string a, string b)
+        {
+            return String.Compare(a, b, StringComparison.OrdinalIgnoreCase);
+        }
+
+#else
+        public static int StringCompareCaseInsensitive(string a, string b)
+        {
+            return String.Compare(a, b, true);
+        }
+
+#endif
+
+        public static bool IsBlank(string s)
+        {
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (!Char.IsWhiteSpace(s[i]))
+                    return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/base/Windows/RunParallel/WorkerThread.cs b/base/Windows/RunParallel/WorkerThread.cs
new file mode 100644
index 0000000..de9f1f2
--- /dev/null
+++ b/base/Windows/RunParallel/WorkerThread.cs
@@ -0,0 +1,186 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Text;
+using System.Diagnostics;
+using Windows;
+
+#if ENABLE_PROGRESS_FORM
+using System.Windows.Forms;
+#endif
+
+namespace RunParallel
+{
+    class WorkerThread
+    {
+        public Thread Thread;
+        public int ThreadIndex;
+        public uint AffinityMask;
+        public int ErrorCount;
+        public string Prefix;
+#if ENABLE_PROGRESS_FORM
+        public ListViewItem ProgressListItem;
+#endif
+        public Task CurrentTask;
+
+        public WorkerThread()
+        {
+            Prefix = "";
+        }
+
+        public void ThreadRoutine()
+        {
+            Prefix = String.Format("{0,4}> ", this.ThreadIndex);
+
+            this.ErrorCount = 0;
+
+            // WriteLine("Starting");
+
+            for (; ; )
+            {
+                Task task = GetTask();
+                if (task == null)
+                    break;
+
+                const int command_display_max = 45;
+
+                string command = task.CommandLine;
+                if (command.Length > command_display_max)
+                    command = command.Substring(0, command_display_max) + "...";
+
+                WriteLine("Running: " + command);
+
+                lock (_lock)
+                {
+                    this.CurrentTask = task;
+                }
+
+                try
+                {
+                    using (Process process = new Process())
+                    {
+                        ProcessStartInfo info = new ProcessStartInfo();
+                        info.UseShellExecute = false;
+                        info.FileName = Program.ShellName;
+                        info.Arguments = "/c 2>&1 (" + task.CommandLine + ")";
+                        info.RedirectStandardOutput = true;
+                        info.RedirectStandardInput = true;
+                        info.RedirectStandardError = false;
+
+                        process.StartInfo = info;
+                        process.Start();
+
+                        try
+                        {
+                            process.PriorityClass = ProcessPriorityClass.BelowNormal;
+                        }
+                        catch
+                        {
+                            Debug.WriteLine("Failed to set process priority class.");
+                        }
+
+                        if (Program._JobObjectHandle != IntPtr.Zero)
+                        {
+                            if (!Kernel32.AssignProcessToJobObject(Program._JobObjectHandle, process.Handle))
+                                WriteLine("FAILED to assign process to job: " + Kernel32.GetLastErrorText());
+                        }
+
+                        try
+                        {
+                            process.ProcessorAffinity = (IntPtr)this.AffinityMask;
+                        }
+                        catch (Exception ex)
+                        {
+                            WriteLine("Failed to set processor affinity of child process.");
+                            Program.ShowException(ex);
+                        }
+                        process.StandardInput.Close();
+
+                        for (; ; )
+                        {
+                            string line = process.StandardOutput.ReadLine();
+                            if (line == null)
+                                break;
+
+                            WriteLine(line);
+                        }
+
+                        process.WaitForExit();
+                        if (process.ExitCode != 0)
+                        {
+                            this.ErrorCount++;
+                            WriteLine("Process exited with error code {0} {0:x8}.", process.ExitCode);
+                            task.Succeeded = false;
+                            task.Error = new Exception(String.Format("Process exited with error code {0}.", process.ExitCode));
+                        }
+                        else
+                        {
+                            task.Succeeded = true;
+                            task.Error = null;
+                        }
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    WriteLine(Prefix + "Task FAILED: " + ex.Message);
+                    lock (_lock)
+                    {
+                        this.ErrorCount++;
+                    }
+
+                    task.Succeeded = false;
+                    task.Error = ex;
+                }
+
+                lock (_lock)
+                {
+                    Program._tasksCompletedCount++;
+                    this.CurrentTask = null;
+                }
+
+                Program._workerFinishedQueue.Enqueue(task);
+            }
+
+            lock (_lock)
+            {
+                this.CurrentTask = null;
+            }
+
+            // WriteLine("Done.");
+        }
+
+        Task GetTask()
+        {
+            Task task;
+
+            if (Program._workerTaskQueue.Dequeue(out task))
+                return task;
+            else
+                return null;
+        }
+
+        object _lock
+        {
+            get { return Program.SyncLock; }
+        }
+
+        void WriteLine(string msg)
+        {
+            Console.WriteLine(Prefix + msg);
+        }
+
+        void WriteLine(string format, params object[] args)
+        {
+            WriteLine(String.Format(format, args));
+        }
+    }
+}
diff --git a/base/Windows/SetVhdBoot/SetVhdBoot.csproj b/base/Windows/SetVhdBoot/SetVhdBoot.csproj
new file mode 100644
index 0000000..5aaf9f0
--- /dev/null
+++ b/base/Windows/SetVhdBoot/SetVhdBoot.csproj
@@ -0,0 +1,27 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>SetVhdBoot</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SetVhdBoot.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/SetVhdBoot/setvhdboot.cs b/base/Windows/SetVhdBoot/setvhdboot.cs
new file mode 100644
index 0000000..e527d8e
--- /dev/null
+++ b/base/Windows/SetVhdBoot/setvhdboot.cs
@@ -0,0 +1,112 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace BootsectorUtils
+{
+    using System;
+    using System.IO;
+    
+    /// <summary>
+    /// VpcFixedDiskInstaller
+    ///     Console utility to install a bootsector onto a VirtualPC FIXED hard disk partition
+    /// </summary>
+    class VpcFixedDiskInstaller
+    {
+        [STAThread]
+        static void Main(string[] args)
+        {
+            try
+            {
+                if (args.Length != 3)
+                    throw new Exception("Error:  The correct argument format is <VHD Name> <Boot Sector File> <partition>");
+                VpcFixedDiskInstaller i = new VpcFixedDiskInstaller();
+                i.Install(args[0], args[1], Convert.ToInt32(args[2]));
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+            }
+        }
+
+        public void Install(string VHDName, string BSName, int whichPartition)
+        {
+            FileStream  HDFile, BSFile, BKFile;
+            int         size = 512;
+            int         skipsize;
+            byte []     buffer = new Byte[size];
+            byte []     oldBootSector = new Byte[size];
+            byte []     newBootSector = new Byte[size];
+            int         bytesread;
+            int         MBRIndex = 446;
+            int         LBA;
+            string      backupFilename = "backup" + System.DateTime.Now.Ticks.ToString() + ".bootsector";
+
+
+            Console.WriteLine("Setting bootsector of disk {0} in HD {1} to contents of file {2} and backing up old bootsector to {3}", 
+                whichPartition, VHDName, BSName, backupFilename);
+
+            if (whichPartition>3 || whichPartition < 0)
+            {
+                throw new Exception("Error:  You must choose a partition between 0 and 3.");
+            }
+
+            HDFile = File.Open(VHDName, FileMode.Open, FileAccess.ReadWrite);
+            
+            // read the MBR from the VPC HDD file
+            bytesread=HDFile.Read(buffer, 0, size);
+
+            // branch based on partition type
+            MBRIndex += ((16*whichPartition)+4);
+            if ((buffer[MBRIndex]!=0x0c) && (buffer[MBRIndex]!=0x0e))
+            {
+                throw new Exception("The partition you selected is not FAT32 type 0c or 0e.");
+            }
+
+            LBA = (int) buffer[MBRIndex+7];
+            LBA = LBA*8 + buffer[MBRIndex+6];
+            LBA = LBA*8 + buffer[MBRIndex+5];
+            LBA = LBA*8 + buffer[MBRIndex+4];            
+            
+            // now that we know the location of the boot sector, let's grab it...
+            HDFile.Seek((LBA)*size, SeekOrigin.Begin);
+            HDFile.Read(oldBootSector, 0, size);
+
+            // read the new BootSector
+            BSFile = File.Open(BSName, FileMode.Open, FileAccess.Read);
+            bytesread = BSFile.Read(newBootSector,0,size);
+            if (bytesread != size)
+            {
+                throw new Exception("Error:  The boot sector is not big enough.");
+            }
+            if (newBootSector[510]!=0x55 || newBootSector[511] != 0xAA)
+            {
+                throw new Exception("Error:  The boot sector file has an invalid signature.");
+            }
+            BSFile.Close();
+
+            skipsize = newBootSector[1]+2;
+
+            // save the old boot sector:
+            BKFile = File.OpenWrite(backupFilename);
+            BKFile.Write(oldBootSector, 0, size);
+            BKFile.Close();
+
+            // generate the new boot sector by copying the BPB and FAT parameters...
+            for (int i=3;i<skipsize;i++)
+            {
+                newBootSector[i] = oldBootSector[i];
+            }
+            
+            // point of no return:
+            // write the new boot sector:
+            HDFile.Seek((LBA)*size, SeekOrigin.Begin);
+            HDFile.Write(newBootSector, 0, size);
+            HDFile.Close();
+        }
+    }
+}
diff --git a/base/Windows/SyscallBuilder/Makefile b/base/Windows/SyscallBuilder/Makefile
new file mode 100644
index 0000000..ea2f1bb
--- /dev/null
+++ b/base/Windows/SyscallBuilder/Makefile
@@ -0,0 +1,44 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\SyscallBuilder\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\SyscallBuilder.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\SyscallBuilder.exe
+    $(SDEDIT) ..\..\build\SyscallBuilder.*
+    $(COPY) $(OBJDIR)\SyscallBuilder.exe ..\..\build
+    $(COPY) $(OBJDIR)\SyscallBuilder.pdb ..\..\build
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\SyscallBuilder.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = /reference:System.Xml.dll /reference:System.dll
+
+SOURCE_FILES = SyscallBuilder.cs
+
+##############################################################################
+
+$(OBJDIR)\SyscallBuilder.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\SyscallBuilder.exe $**
diff --git a/base/Windows/SyscallBuilder/SyscallBuilder.cs b/base/Windows/SyscallBuilder/SyscallBuilder.cs
new file mode 100644
index 0000000..118e702
--- /dev/null
+++ b/base/Windows/SyscallBuilder/SyscallBuilder.cs
@@ -0,0 +1,263 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+
+public class SyscallBuilder
+{
+    static Hashtable classTable = new Hashtable();
+    static Hashtable structTable = new Hashtable();
+    static Hashtable paramTable = new Hashtable();
+
+    static int lineNumber = 0;
+
+    static void AddType(string t)
+    {
+        if (t.StartsWith("struct ")) {
+            int end = t.IndexOf(" ", 7);
+            if (end == -1) {
+                end = t.Length;
+            }
+            string structName = t.Substring(7, end - 7);
+            if (end < t.Length) {
+                structTable[structName] = "";
+            }
+            else {
+                int ssize;
+                if (structName.EndsWith("Handle")) {
+                    ssize = 4;
+                }
+                else {
+                    if (!paramTable.ContainsKey("struct " + structName)) {
+                        throw new Exception("unknown struct type: " + t);
+                    }
+                    ssize = (int) paramTable["struct " + structName];
+                }
+                structTable[structName] = "char data[" + ssize + "];";
+            }
+        }
+    }
+
+    public static void Generate(string[] args)
+    {
+        bool genHdr = args[0] == "/genhdr";
+        bool genLib = args[0] == "/genlib";
+        bool genEntry = args[0] == "/genentry";
+        if (genLib) {
+            Console.WriteLine("#include \"syscalls.h\"");
+            Console.WriteLine();
+        }
+        if (genEntry) {
+            Console.WriteLine("#include \"syscalls.h\"");
+        }
+        int n = 1;
+        paramTable["void"] = 0;
+        paramTable["int"] = 4;
+        paramTable["unsigned int"] = 4;
+        paramTable["unsigned char"] = 4;
+        paramTable["wchar_t"] = 4;
+        paramTable["bool"] = 4;
+        paramTable["__int64"] = 8;
+        paramTable["unsigned __int64"] = 8;
+        paramTable["struct Struct_System_TimeSpan"] = 8;
+        paramTable["struct Struct_System_DateTime"] = 8;
+        paramTable["struct Struct_System_SchedulerTime"] = 8;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Types_SystemType"] = 4;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Threads_ThreadState"] = 4;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Processes_ProcessState"] = 4;
+        paramTable["struct Struct_Microsoft_Singularity_V1_Services_ParameterCode"] = 4;
+
+        while (true) {
+            string s = Console.ReadLine();
+            lineNumber++;
+            if (s == null) {
+                break;
+            }
+            if (s.IndexOf('?') == -1) {
+                continue;
+            }
+            if (   s.IndexOf("Struct_Microsoft_Singularity_V1_Services_SharedHeapService::g_GetData") != -1
+                || s.IndexOf("Struct_Microsoft_Singularity_V1_Services_SharedHeapService::g_GetSize") != -1
+                || s.IndexOf("Struct_Microsoft_Singularity_V1_Types_SystemType::g_IsNull") != -1) {
+                continue;
+            }
+            s = s.Replace("struct void", "void");
+            int i = s.IndexOf("static");
+            if (i == -1) {
+                throw new Exception("not static");
+            }
+            i += 7;
+            string decl = s.Substring(i, s.IndexOf(')', i) + 1 - i);
+            i = s.IndexOf("__fastcall", i);
+            if (i == -1) {
+                throw new Exception("not fastcall");
+            }
+            string ret = decl.Substring(0, decl.IndexOf(" __fastcall"));
+
+            try {
+                AddType(ret);
+            }
+            catch {
+                Console.WriteLine("Failed at input line {0}\n", lineNumber);
+                throw;
+            }
+
+            i = s.IndexOf(' ', i) + 1;
+            bool isAbi;
+
+            {
+                int j = s.IndexOf("::", i);
+                int k = s.IndexOf("(", j);
+                string className = s.Substring(i, j - i);
+                string methodName = s.Substring(i, k - i);
+                string methodLocalName = s.Substring(j + 2, k - (j + 2));
+
+                // These two symbols are special and shouldn't have ring3
+                // stubs
+                isAbi =
+                    (!methodLocalName.StartsWith("g_LinkStack")) &&
+                    (!methodLocalName.StartsWith("g_UnlinkStack"));
+
+                Hashtable methods = (Hashtable)classTable[className];
+                if (methods == null) {
+                    methods = new Hashtable();
+                    classTable[className] = methods;
+                }
+                methods[decl] = true;
+                string typ = ret + "(*)" + s.Substring(k, s.IndexOf(')', k) + 1 - k);
+                if (genEntry && isAbi) {
+                    Console.WriteLine("static int f" + n + " = int((" + typ + ")" + methodName + ");");
+                }
+            }
+
+            i = s.IndexOf('(', i) + 1;
+            int smallWords = 0;
+            int largeWords = 0;
+            while (s[i] != ')') {
+                int j = s.IndexOf(',', i);
+                if (j == -1) {
+                    j = s.IndexOf(')', i);
+                }
+                string param = s.Substring(i, j - i);
+                int size;
+                if (param.EndsWith("*") || param.EndsWith("Handle")) {
+                    size = 4;
+                }
+                else {
+                    if (!paramTable.ContainsKey(param)) {
+                        throw new Exception("unknown parameter type: " + param);
+                    }
+                    size = (int) paramTable[param];
+                }
+                //Console.WriteLine(size + ":" + param);
+                try {
+                    AddType(param);
+                }
+                catch {
+                    Console.WriteLine("Failed at input line {0}\n", lineNumber);
+                    throw;
+                }
+                i = j + 1;
+                if (size <= 4) {
+                    smallWords++;
+                }
+                else {
+                    largeWords += size / 4;
+                }
+            }
+
+            int paramRegs = (smallWords < 2) ? (smallWords) : 2;
+            int paramSlots = smallWords + largeWords - paramRegs;
+
+            if (genLib && isAbi) {
+                Console.WriteLine("__declspec(naked dllexport) " + decl);
+                Console.WriteLine("{__asm {");
+                Console.WriteLine("    push edx");
+                Console.WriteLine("    push ecx");
+
+                Console.WriteLine("    mov ecx, " + n);
+                Console.WriteLine("    mov edx, esp");
+                Console.WriteLine("    push done");
+
+                Console.WriteLine("    _emit   0x0f;");
+                Console.WriteLine("    _emit   0x34;  //sysenter");
+                Console.WriteLine("  done:");
+
+                Console.WriteLine("    ret " + 4 * paramSlots);
+                Console.WriteLine("}}");
+                Console.WriteLine();
+            }
+
+            if (genEntry && isAbi) {
+                Console.WriteLine("__declspec(naked) static void abi" + n + "() {__asm {");
+                for (int j = paramSlots - 1; j >= 0; j--) {
+                    Console.WriteLine("    push [eax + " + (12 + j * 4) + "]");
+                }
+                Console.WriteLine("    mov edx, [eax + 4]");
+                Console.WriteLine("    mov ecx, [eax + 0]");
+                Console.WriteLine("    call f" + n);
+                Console.WriteLine("    ret");
+                Console.WriteLine("}}");
+            }
+            if (isAbi) {
+                n++;
+            }
+        }
+        if (genHdr) {
+            foreach (string s in structTable.Keys) {
+                if (!classTable.ContainsKey(s)) {
+                    Console.WriteLine("struct " + s + " {" + structTable[s] + "};");
+                }
+            }
+            Console.WriteLine();
+            foreach (string c in classTable.Keys) {
+                Console.WriteLine("struct " + c);
+                Console.WriteLine("{");
+                if (structTable.ContainsKey(c)) {
+                    string s = (string) structTable[c];
+                    if (s != "") {
+                        Console.WriteLine("    " + s);
+                    }
+                }
+                foreach (string m in ((Hashtable)classTable[c]).Keys) {
+                    Console.WriteLine("    __declspec(dllexport) static " + m + ";");
+                }
+                Console.WriteLine("};");
+                Console.WriteLine();
+            }
+        }
+        if (genEntry) {
+            Console.WriteLine();
+            Console.WriteLine("void EnterRing0();");
+            Console.WriteLine("int syscallEntryTable[] =");
+            Console.WriteLine("{");
+            Console.WriteLine("int(EnterRing0)");
+            for (int i = 1; i < n; i++) {
+                if (i > 0) {
+                    Console.WriteLine(",");
+                }
+                Console.Write("    int(abi" + i + ")");
+            }
+            Console.WriteLine();
+            Console.WriteLine("};");
+        }
+    }
+
+    public static int Main(string[] args)
+    {
+        try {
+            Generate(args);
+        }
+        catch (Exception e) {
+            Console.Write(e);
+            return -1;
+        }
+        return 0;
+    }
+}
diff --git a/base/Windows/SyscallBuilder/SyscallBuilder.csproj b/base/Windows/SyscallBuilder/SyscallBuilder.csproj
new file mode 100644
index 0000000..333cf39
--- /dev/null
+++ b/base/Windows/SyscallBuilder/SyscallBuilder.csproj
@@ -0,0 +1,26 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>SyscallBuilder</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="SyscallBuilder.cs"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/UdpBlast/Makefile b/base/Windows/UdpBlast/Makefile
new file mode 100644
index 0000000..1d79853
--- /dev/null
+++ b/base/Windows/UdpBlast/Makefile
@@ -0,0 +1,46 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\UdpBlast\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /debug- /optimize /warn:4 /warnaserror+ \
+
+CSCREFS = /r:System.dll
+
+INSTALLDIR=..\..\build
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\udpblast.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\udpblast.exe
+    $(SDEDIT) $(INSTALLDIR)\udpblast.exe
+    $(COPY) $(OBJDIR)\udpblast.exe $(INSTALLDIR)
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\udpblast.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+SOURCE_FILES = \
+    UdpBlast.cs \
+
+$(OBJDIR)\udpblast.exe : $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(CSCREFS) /out:$(OBJDIR)\udpblast.exe $**
+
+################################################################# End of File.
diff --git a/base/Windows/UdpBlast/UdpBlast.csproj b/base/Windows/UdpBlast/UdpBlast.csproj
new file mode 100644
index 0000000..f499b59
--- /dev/null
+++ b/base/Windows/UdpBlast/UdpBlast.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Windows\YourApp\YourApp.csproj
+
+Note:   Windows-based test app for NetStack
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>UdpBlast</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="udpblast.cs"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Net"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/UdpBlast/udpblast.cs b/base/Windows/UdpBlast/udpblast.cs
new file mode 100644
index 0000000..7df562e
--- /dev/null
+++ b/base/Windows/UdpBlast/udpblast.cs
@@ -0,0 +1,251 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpBlast.cs
+//
+//  Note:
+//
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace Microsoft.Singularity.Test.Network
+{
+    public class UdpBlast
+    {
+        private const int FixedHeaderBytes = 42;    // Ether + IP + UDP
+
+        static bool verbose = false;
+
+        public static void Usage()
+        {
+            Console.WriteLine("UdpBlast [-p <bytesPerPkt>] [-r <bitsPerSec>] [-t duration] [-v] host port");
+            Environment.Exit(-2);
+        }
+
+        public static void VerboseLog(string format, params object [] args)
+        {
+            if (verbose) {
+                Console.Write(format, args);
+            }
+        }
+
+        private static int
+        GetPacketSize(long bitsPerSecond,
+                      long bitsThisSecond,
+                      int  bytesPerPacket)
+        {
+            long bitsRemaining = bitsPerSecond - bitsThisSecond;
+            if (bitsRemaining >= (long)8 * bytesPerPacket) {
+                return bytesPerPacket - FixedHeaderBytes;
+            }
+            else {
+                int size = ((int)(bitsPerSecond - bitsThisSecond) / 8
+                            - FixedHeaderBytes);
+                if (size < 1) {
+                    return 1;
+                }
+                return size;
+            }
+        }
+
+        public static void
+        Blast(Socket s,
+              uint   bitsPerSecond,
+              int    bytesPerPacket,
+              uint   durationSeconds
+              )
+        {
+            byte [] bigPacket   =
+                new byte[GetPacketSize(bitsPerSecond, 0, bytesPerPacket)];
+            byte [] smallPacket = null;
+
+            DateTime startTime  = DateTime.Now;
+            DateTime endTime    = (startTime +
+                                   TimeSpan.FromSeconds(durationSeconds));
+
+            DateTime secondStart = startTime;
+            DateTime secondEnd   = startTime + TimeSpan.FromSeconds(1);
+
+            DateTime now = startTime;
+
+            uint second         = 0;
+            long bitsThisSecond = 0;
+            long pktsThisSecond = 0;
+            long totalBits      = 0;
+
+            while (now < endTime) {
+                byte [] packet = bigPacket;
+                while (now < secondEnd && bitsThisSecond < bitsPerSecond) {
+                    int size = GetPacketSize(bitsPerSecond,
+                                             bitsThisSecond,
+                                             bytesPerPacket);
+                    if (size != packet.Length) {
+                        if (smallPacket == null || size != smallPacket.Length)
+                            smallPacket = new byte [size];
+                        packet = smallPacket;
+                        Console.Write(".");
+                    }
+                    s.Send(packet);
+                    bitsThisSecond += (packet.Length + FixedHeaderBytes) * 8;
+                    pktsThisSecond++;
+                    now = DateTime.Now;
+                }
+
+                while (now < secondEnd) {
+                    Thread.Sleep(0);
+                    now = DateTime.Now;
+                }
+
+                TimeSpan tau = secondEnd - secondStart;
+                VerboseLog(
+                    "Round {0} duration(secs) {1:f2} packets {2} rate (bps) {3:e3}\n",
+                    second, tau.TotalSeconds,
+                    pktsThisSecond,
+                    bitsThisSecond / tau.TotalSeconds
+                    );
+
+                second++;
+                totalBits      += bitsThisSecond;
+                bitsThisSecond  = 0;
+                pktsThisSecond   = 0;
+                secondStart     = now;
+                secondEnd       = now + TimeSpan.FromSeconds(1);
+            }
+
+            Console.WriteLine(
+                "Average rate: {0:e3} bps",
+                totalBits / (now - startTime).TotalSeconds
+                );
+        }
+
+        public static IPAddress ParseAddress(string srep)
+        {
+            try {
+                return IPAddress.Parse(srep);
+            }
+            catch {
+                try {
+                    VerboseLog("Resolving: {0}\n", srep);
+                    IPHostEntry iphe = Dns.Resolve(srep);
+                    return iphe.AddressList[0];
+                }
+                catch {
+                    VerboseLog("Falling back to any address");
+                    return IPAddress.Any;
+                }
+            }
+        }
+
+        private static bool ParseUInt32(string srep, out UInt32 value)
+        {
+            try {
+                value = UInt32.Parse(srep);
+                return true;
+            }
+            catch (FormatException) {
+            }
+            catch (OverflowException) {
+            }
+            value = 0;
+            return false;
+        }
+
+        private static bool ParseDouble(string srep, out Double value)
+        {
+            try {
+                value = Double.Parse(srep);
+                return true;
+            }
+            catch (FormatException) {
+            }
+            catch (OverflowException) {
+            }
+            value = 0;
+            return false;
+        }
+
+        public static int Main(string [] args)
+        {
+            int i = 0;
+
+            uint bitsPerSecond  = 64000;
+            uint bytesPerPacket = 1500;
+            uint duration       = 30;
+
+            double rate;
+
+            while (i < args.Length &&
+                   (args[i][0] == '-' || args[i][0] == '/')) {
+                switch (Char.ToLower(args[i][1])) {
+                    case 'p':
+                        if (args.Length - i < 2)
+                            Usage();
+                        if (!ParseUInt32(args[++i], out bytesPerPacket) ||
+                            bytesPerPacket <= FixedHeaderBytes) {
+                            Console.WriteLine("Bad packet size: {0}", args[i]);
+                            Environment.Exit(-1);
+                            return -1;
+                        }
+                        break;
+                    case 'r':
+                        if (args.Length - i < 2)
+                            Usage();
+                        if (!ParseDouble(args[++i], out rate) ||
+                            rate < 0 || rate > UInt32.MaxValue * 1.0) {
+                            Console.WriteLine("Bad rate: {0}", args[i]);
+                            return -1;
+                        }
+                        bitsPerSecond = (UInt32)rate;
+                        break;
+                    case 't':
+                        if (args.Length - i < 2)
+                            Usage();
+                        if (!ParseUInt32(args[++i], out duration)) {
+                            Console.WriteLine("Bad duration: {0}", args[i]);
+                            return -1;
+                        }
+                        break;
+                    case 'v':
+                        verbose = true;
+                        break;
+                }
+                i++;
+            }
+
+            if (args.Length - i < 2) {
+                Usage();
+            }
+
+            IPAddress address = ParseAddress(args[i]);
+            if (address == IPAddress.Any) {
+                Console.WriteLine("Invalid address: {0}", args[i]);
+                return -1;
+            }
+
+            uint port;
+            if (!ParseUInt32(args[++i], out port) || port > 0xffff) {
+                Console.WriteLine("Bad port: {0}", args[i]);
+                return -1;
+            }
+
+            VerboseLog("Sending to {0} {1}\n", address, port);
+            VerboseLog("Packet size = {0} bytes\n", bytesPerPacket);
+            VerboseLog("Send rate = {0} bps ({1} pps).\n",
+                       bitsPerSecond, bitsPerSecond / (8 * bytesPerPacket));
+
+            Socket s = new Socket(AddressFamily.InterNetwork,
+                                  SocketType.Dgram,
+                                  ProtocolType.Udp);
+            s.Connect(new IPEndPoint(address, (ushort)port));
+            Blast(s, bitsPerSecond, (int)bytesPerPacket, duration);
+
+            return 0;
+        }
+    }
+}
diff --git a/base/Windows/UdpGulp/UdpGulp.cs b/base/Windows/UdpGulp/UdpGulp.cs
new file mode 100644
index 0000000..bba945b
--- /dev/null
+++ b/base/Windows/UdpGulp/UdpGulp.cs
@@ -0,0 +1,143 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   UdpBlast.cs
+//
+//  Note:
+//
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace Microsoft.Singularity.Test.Network
+{
+    public class UdpBlast
+    {
+        private const int FixedHeaderBytes = 42;    // Ether + IP + UDP
+
+        public static void Usage()
+        {
+            Console.WriteLine("UdpGulp [-a <address>] [-t <seconds>] port");
+            Environment.Exit(-2);
+        }
+
+        public static void Gulp(Socket s, uint seconds)
+        {
+            long totalBytesReceived  = 0;
+            long recentBytesReceived = 0;
+
+            byte [] buffer = new byte [4096];
+
+            DateTime now      = DateTime.Now;
+            DateTime epochEnd = now + TimeSpan.FromSeconds(1);
+
+            int sleepMillis = 0;
+
+            while (seconds-- != 0) {
+                int pps = 0;
+                while (now < epochEnd) {
+                    if (s.Available > 0) {
+                        int bytesReceived = s.Receive(buffer);
+                        bytesReceived += FixedHeaderBytes;
+                        totalBytesReceived += bytesReceived;
+                        recentBytesReceived += bytesReceived;
+                        pps++;
+                    }
+                    else {
+                        Thread.Sleep(sleepMillis);
+                    }
+                    now = DateTime.Now;
+                }
+                Console.WriteLine("Data rate = {0:e3} bps ({1} pps)",
+                                  recentBytesReceived * 8.0,
+                                  pps);
+                epochEnd = now + TimeSpan.FromSeconds(1);
+                sleepMillis = (pps > 0) ? 0 : 100;
+                recentBytesReceived = 0;
+            }
+        }
+
+        private static IPAddress ParseAddress(string srep)
+        {
+            try {
+                return IPAddress.Parse(srep);
+            }
+            catch {
+                try {
+                    IPHostEntry iphe = Dns.Resolve(srep);
+                    return iphe.AddressList[0];
+                }
+                catch {
+                    return IPAddress.Any;
+                }
+            }
+        }
+
+        private static bool ParseUInt32(string srep, out uint value)
+        {
+            try {
+                value = UInt32.Parse(srep);
+                return true;
+            }
+            catch (FormatException) {
+            }
+            catch (OverflowException) {
+            }
+            value = 0;
+            return false;
+        }
+
+        public static int Main(string [] args)
+        {
+            int i = 0;
+
+            IPAddress address = IPAddress.Any;
+            uint      seconds = 30;
+
+            while (i < args.Length &&
+                   (args[i][0] == '-' || args[i][0] == '/')) {
+                switch (Char.ToLower(args[i][1])) {
+                    case 'a':
+                        if (args.Length - i < 2)
+                            Usage();
+                        address = ParseAddress(args[++i]);
+                        break;
+                    case 't':
+                        if (args.Length - i < 2)
+                            Usage();
+                        if (!ParseUInt32(args[++i], out seconds)) {
+                            Console.WriteLine("Invalid duration: {0}",
+                                              args[i]);
+                            return -1;
+                        }
+                        break;
+                    default:
+                        Usage();
+                        break;
+                }
+                i++;
+            } // end while
+
+            if (args.Length - i != 1) {
+                Usage();
+            }
+
+            uint port;
+            if (!ParseUInt32(args[i], out port) || port > 0xffff) {
+                Console.WriteLine("Bad port: {0}", args[i]);
+                return -1;
+            }
+            Socket s = new Socket(AddressFamily.InterNetwork,
+                                  SocketType.Dgram,
+                                  ProtocolType.Udp);
+            s.Bind(new IPEndPoint(address, (ushort)port));
+            Gulp(s, seconds);
+            return 0;
+        }
+    }
+}
diff --git a/base/Windows/UdpGulp/UdpGulp.csproj b/base/Windows/UdpGulp/UdpGulp.csproj
new file mode 100644
index 0000000..12f4231
--- /dev/null
+++ b/base/Windows/UdpGulp/UdpGulp.csproj
@@ -0,0 +1,31 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>UdpGulp</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="UdpGulp.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/Windows.proj b/base/Windows/Windows.proj
new file mode 100644
index 0000000..f365c62
--- /dev/null
+++ b/base/Windows/Windows.proj
@@ -0,0 +1,74 @@
+<!--
+##############################################################################
+
+ Microsoft Research Singularity
+
+ Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <ItemGroup>
+    <NMakeDir Include="bootd"/>
+    <NMakeDir Include="grabsector"/>
+    <NMakeDir Include="jobcontrol"/>
+    <NMakeDir Include="mkasm"/>
+    <NMakeDir Include="mkcore"/>
+    <NMakeDir Include="mutexwrap"/>
+    <NMakeDir Include="PowerSwitchService"/>
+    <NMakeDir Include="RefGraph"/>
+    <NMakeDir Include="rialto"/>
+    <NMakeDir Include="RunAll"/>
+    <NMakeDir Include="sdizepdb"/>
+    <NMakeDir Include="setvhdboot"/>
+    <NMakeDir Include="singx86"/>
+    <NMakeDir Include="MpSyscallBuilder"/>
+    <NMakeDir Include="Verifier"/>
+
+
+    <ProjectReference Include="TestExport\TestExport.csproj"/>
+    <ProjectReference Include="mkcontagmap\mkcontagmap.csproj"/>
+    <ProjectReference Include="mkmani\mkmani.csproj"/>
+    <ProjectReference Include="mkpxecom\mkpxecom.csproj"/>
+    <ProjectReference Include="mktests\mktests.csproj"/>
+    <ProjectReference Include="nib\nib.csproj"/>
+    <ProjectReference Include="profmap\profmap.csproj"/>
+    <ProjectReference Include="spg\spg.csproj"/>
+    <ProjectReference Include="substitute\substitute.csproj"/>
+    <ProjectReference Include="SyscallBuilder\SyscallBuilder.csproj"/>
+
+  </ItemGroup>
+
+  <PropertyGroup>
+    <BuildDependsOn>$(BuildDependsOn);BuildNMakeDirs</BuildDependsOn>
+    <CleanDependsOn>$(CleanDependsOn);CleanNMakeDirs</CleanDependsOn>
+  </PropertyGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets"/>
+
+  <Target Name="BuildNMakeDirs">
+    <Exec Condition="'%(NMakeDir.identity)'!=''"
+          Command="cd /d %(NMakeDir.identity) &amp;&amp; nmake /nologo"/>
+  </Target>
+
+  <Target Name="CleanNMakeDirs">
+    <Exec Condition="'%(NMakeDir.identity)'!=''"
+          Command="cd /d %(NMakeDir.identity) &amp;&amp; nmake /nologo clean"/>
+  </Target>
+
+  <Target Name="Install" DependsOnTargets="InstallProjectReferences;InstallNMakeDirs">
+  </Target>
+
+  <Target Name="InstallProjectReferences">
+    <MSBuild Projects="@(ProjectReferences)" Targets="Install"/>
+  </Target>
+
+  <Target Name="InstallNMakeDirs">
+    <Exec Condition="'%(NMakeDir.identity)'!=''"
+          Command="cd /d %(NMakeDir.identity) &amp;&amp; nmake /nologo install"/>
+  </Target>
+
+</Project>
diff --git a/base/Windows/blastserver/blastServer.csproj b/base/Windows/blastserver/blastServer.csproj
new file mode 100644
index 0000000..4e8462a
--- /dev/null
+++ b/base/Windows/blastserver/blastServer.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>BlastServer</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\Applications\Network\BlastServer\BlastServer.cs"/>
+    <Compile Include="..\..\Applications\Network\BlastServer\ThreadPool.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/bootd/Makefile b/base/Windows/bootd/Makefile
new file mode 100644
index 0000000..add9c42
--- /dev/null
+++ b/base/Windows/bootd/Makefile
@@ -0,0 +1,72 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Bootd\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS=$(CFLAGS) /I..\inc \
+    /Fd$(OBJDIR)\bootd.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+     user32.lib     \
+     kernel32.lib   \
+     ws2_32.lib     \
+     iphlpapi.lib   \
+     libcmt.lib     \
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\bootd.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\bootd.exe
+    $(SDEDIT) $(BUILDIR)\bootd.*
+    $(COPY) $(OBJDIR)\bootd.exe $(BUILDIR)
+    $(COPY) $(OBJDIR)\bootd.pdb $(BUILDIR)
+
+clean:
+    @-del /q $(OBJDIR)\bootd.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+test: $(OBJDIR) $(OBJDIR)\bootd.exe
+    cd "$(MAKEDIR)\obj"
+    boottest.cmd
+    @cd "$(MAKEDIR)"
+
+
+{.}.cpp{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##########################################################################
+#
+# Build this version of the BMonitor
+#
+
+$(OBJDIR)\bootd.obj: bootd.cpp socksr.h dhcpd.h hashtab.h
+$(OBJDIR)\socksr.obj: socksr.cpp socksr.h
+$(OBJDIR)\hashtab.obj: hashtab.cpp hashtab.h
+$(OBJDIR)\dhcpd.obj : dhcpd.cpp dhcpd.h socksr.h
+$(OBJDIR)\tftpd.obj : tftpd.cpp tftpd.h socksr.h
+
+OBJS = \
+    $(OBJDIR)\dhcpd.obj \
+    $(OBJDIR)\tftpd.obj \
+    $(OBJDIR)\socksr.obj \
+    $(OBJDIR)\bootd.obj \
+
+$(OBJDIR)\bootd.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
+
+################################################################# End of File.
diff --git a/base/Windows/bootd/bootd.cpp b/base/Windows/bootd/bootd.cpp
new file mode 100644
index 0000000..f61e35b
--- /dev/null
+++ b/base/Windows/bootd/bootd.cpp
@@ -0,0 +1,750 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// Boot Service
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include <winlean.h>
+#include <winsock.h>
+#include <stdio.h>
+#include <assert.h>
+#include <iphlpapi.h>
+
+#include "socksr.h"
+#include "hashtab.h"
+#include "dhcpd.h"
+#include "tftpd.h"
+
+#define ARRAYOF(x)      (sizeof(x)/sizeof(x[0]))
+#define ASSERT(a)       assert(a)
+
+#define WM_SOCKET_EVENT  (WM_USER+101)
+
+void SocketErrorBox(DWORD dwWSALastError, PCSTR pszFile, INT nLine)
+{
+    CHAR *szError = NULL;
+
+    switch (dwWSALastError) {
+      case WSAEACCES:
+        szError = "WSAEACCES (%d) Permission denied.";
+        break;
+      case WSAEADDRINUSE:
+        szError = "WSAEADDRINUSE (%d) Address already in use.";
+        break;
+      case WSAEADDRNOTAVAIL:
+        szError = "WSAEADDRNOTAVAIL (%d) Cannot assign requested address.";
+        break;
+      case WSAEAFNOSUPPORT:
+        szError = "WSAEAFNOSUPPORT (%d) Address family not supported by protocol family.";
+        break;
+      case WSAEALREADY:
+        szError = "WSAEALREADY (%d) Operation already in progress.";
+        break;
+      case WSAECONNABORTED:
+        szError = "WSAECONNABORTED (%d) Software caused connection abort.";
+        break;
+      case WSAECONNREFUSED:
+        szError = "WSAECONNREFUSED (%d) Connection refused.";
+        break;
+      case WSAECONNRESET:
+        szError = "WSAECONNRESET (%d) Connection reset by peer.";
+        break;
+      case WSAEDESTADDRREQ:
+        szError = "WSAEDESTADDRREQ (%d) Destination address required.";
+        break;
+      case WSAEFAULT:
+        szError = "WSAEFAULT (%d) Bad address.";
+        break;
+      case WSAEHOSTDOWN:
+        szError = "WSAEHOSTDOWN (%d) Host is down.";
+        break;
+      case WSAEHOSTUNREACH:
+        szError = "WSAEHOSTUNREACH (%d) No route to host.";
+        break;
+      case WSAEINPROGRESS:
+        szError = "WSAEINPROGRESS (%d) Operation now in progress.";
+        break;
+      case WSAEINTR:
+        szError = "WSAEINTR (%d) Interrupted function call.";
+        break;
+      case WSAEINVAL:
+        szError = "WSAEINVAL (%d) Invalid argument.";
+        break;
+      case WSAEISCONN:
+        szError = "WSAEISCONN (%d) Socket is already connected.";
+        break;
+      case WSAEMFILE:
+        szError = "WSAEMFILE (%d) Too many open files.";
+        break;
+      case WSAEMSGSIZE:
+        szError = "WSAEMSGSIZE (%d) Message too long.";
+        break;
+      case WSAENETDOWN:
+        szError = "WSAENETDOWN (%d) Network is down.";
+        break;
+      case WSAENETRESET:
+        szError = "WSAENETRESET (%d) Network dropped connection on reset.";
+        break;
+      case WSAENETUNREACH:
+        szError = "WSAENETUNREACH (%d) Network is unreachable.";
+        break;
+      case WSAENOBUFS:
+        szError = "WSAENOBUFS (%d) No buffer space available.";
+        break;
+      case WSAENOPROTOOPT:
+        szError = "WSAENOPROTOOPT (%d) Bad protocol option.";
+        break;
+      case WSAENOTCONN:
+        szError = "WSAENOTCONN (%d) Socket is not connected.";
+        break;
+      case WSAENOTSOCK:
+        szError = "WSAENOTSOCK (%d) Socket operation on nonsocket.";
+        break;
+      case WSAEOPNOTSUPP:
+        szError = "WSAEOPNOTSUPP (%d) Operation not supported.";
+        break;
+      case WSAEPFNOSUPPORT:
+        szError = "WSAEPFNOSUPPORT (%d) Protocol family not supported.";
+        break;
+      case WSAEPROCLIM:
+        szError = "WSAEPROCLIM (%d) Too many processes.";
+        break;
+      case WSAEPROTONOSUPPORT:
+        szError = "WSAEPROTONOSUPPORT (%d) Protocol not supported.";
+        break;
+      case WSAEPROTOTYPE:
+        szError = "WSAEPROTOTYPE (%d) Protocol wrong type for socket.";
+        break;
+      case WSAESHUTDOWN:
+        szError = "WSAESHUTDOWN (%d) Cannot send after socket shutdown.";
+        break;
+      case WSAESOCKTNOSUPPORT:
+        szError = "WSAESOCKTNOSUPPORT (%d) Socket type not supported.";
+        break;
+      case WSAETIMEDOUT:
+        szError = "WSAETIMEDOUT (%d) Connection timed out.";
+        break;
+      case WSATYPE_NOT_FOUND:
+        szError = "WSATYPE_NOT_FOUND (%d) Class type not found.";
+        break;
+      case WSAEWOULDBLOCK:
+        szError = "WSAEWOULDBLOCK (%d) Resource temporarily unavailable.";
+        break;
+      case WSAHOST_NOT_FOUND:
+        szError = "WSAHOST_NOT_FOUND (%d) Host not found.";
+        break;
+      case WSANOTINITIALISED:
+        szError = "WSANOTINITIALISED (%d) Successful WSAStartup not yet performed.";
+        break;
+      case WSANO_DATA:
+        szError = "WSANO_DATA (%d) Valid name, no data record of requested type.";
+        break;
+      case WSANO_RECOVERY:
+        szError = "WSANO_RECOVERY (%d) This is a nonrecoverable error.";
+        break;
+      case WSASYSCALLFAILURE:
+        szError = "WSASYSCALLFAILURE (%d) System call failure.";
+        break;
+      case WSASYSNOTREADY:
+        szError = "WSASYSNOTREADY (%d) Network subsystem is unavailable.";
+        break;
+      case WSATRY_AGAIN:
+        szError = "WSATRY_AGAIN (%d) Nonauthoritative host not found.";
+        break;
+      case WSAVERNOTSUPPORTED:
+        szError = "WSAVERNOTSUPPORTED (%d) Winsock.";
+        break;
+      case WSAEDISCON:
+        szError = "WSAEDISCON (%d) Graceful shutdown in progress.\nReturned by WS";
+        break;
+      default:
+        szError = "UNKNOWN WSA Socket ERROR! (%d)";
+        break;
+    }
+
+    printf("%s, Line %d.\n", pszFile, nLine);
+    printf(szError, dwWSALastError);
+    printf("\n");
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static inline INT Max(INT a, INT b)
+{
+    return a >= b ? a : b;
+}
+
+static inline INT Min(INT a, INT b)
+{
+    return a <= b ? a : b;
+}
+
+CHAR * StringDuplicate(PCSTR psz)
+{
+    int n = strlen(psz);
+    CHAR *pszNew = new CHAR [n + 1];
+    if (pszNew)
+    {
+        memcpy(pszNew, psz, n + 1);
+    }
+    assert(pszNew);
+    return pszNew;
+}
+
+UINT32 GetIpAddr(PCSTR pszAddr)
+{
+    if (pszAddr[0] >= '0' && pszAddr[0] <= '9')
+    {
+        return ntohl(inet_addr(pszAddr));
+    }
+    else
+    {
+        HOSTENT *pHost = gethostbyname(pszAddr);
+        if (pHost)
+        {
+            return *(UINT32*)pHost->h_addr_list[0];
+        }
+    }
+    return 0;
+}
+
+PCSTR FileTimeToString(UINT64 ftTime)
+{
+    static CHAR rszTimes[16][48];
+    static int nTimes = 0;
+
+    static BOOL bGotTzi = FALSE;
+    static DWORD dwTzi = TIME_ZONE_ID_UNKNOWN;
+    static TIME_ZONE_INFORMATION tzi;
+    if (!bGotTzi)
+    {
+        dwTzi = GetTimeZoneInformation(&tzi);
+        if (dwTzi == TIME_ZONE_ID_UNKNOWN)
+        {
+            ZeroMemory(&tzi, sizeof(tzi));
+        }
+        bGotTzi = TRUE;
+    }
+    SYSTEMTIME stUtc;
+    SYSTEMTIME stLocal;
+
+    CHAR *pszTime = rszTimes[nTimes];
+    nTimes = (nTimes + 1) % ARRAYOF(rszTimes);
+
+    if (!FileTimeToSystemTime((LPFILETIME)&ftTime, &stUtc))
+    {
+        strcpy(pszTime, "00:00:00");
+        return pszTime;
+    }
+    else if (!SystemTimeToTzSpecificLocalTime(&tzi, &stUtc, &stLocal))
+    {
+        CopyMemory(&stLocal, &stUtc, sizeof(stLocal));
+    }
+    sprintf(pszTime, "%2d:%02d:%02d",
+            // stLocal.wYear,
+            // stLocal.wMonth,
+            // stLocal.wDay,
+            stLocal.wHour,
+            stLocal.wMinute,
+            stLocal.wSecond
+            // stLocal.wMilliseconds / 10
+           );
+    return pszTime;
+}
+
+VOID OnNodeMessage(UINT32 nAddr, PCSTR pszProt, PCSTR pszMessage, va_list args)
+{
+    UINT64 ft;
+    GetSystemTimeAsFileTime((LPFILETIME)&ft);
+
+    CHAR szBuffer[2048];
+    PCHAR pszBuffer = szBuffer;
+
+    pszBuffer += sprintf(pszBuffer, "%s: ", pszProt);
+    pszBuffer += vsprintf(pszBuffer, pszMessage, args);
+
+    if (nAddr == 0) {
+        printf("%-8.8s %15.15s %s\n", FileTimeToString(ft), "", szBuffer);
+    }
+    else {
+        printf("%-8.8s %15.15s %s\n", FileTimeToString(ft), SocketToString(nAddr), szBuffer);
+    }
+}
+
+VOID OnNodeMessagef(UINT32 nAddr, PCSTR pszProt, PCSTR pszMessage, ...)
+{
+    va_list args;
+
+    va_start(args, pszMessage);
+    OnNodeMessage(nAddr, pszProt, pszMessage, args);
+    va_end(args);
+}
+
+/////////////////////////////////////////////////////////////////// IDhcpSink.
+//
+class CDhcpSink : public IDhcpSink
+{
+  public:
+    VOID OnDhcpMessage(UINT32 nAddr, PCSTR pszMessage, ...)
+    {
+        va_list args;
+
+        va_start(args, pszMessage);
+        OnNodeMessage(nAddr, "DHCP", pszMessage, args);
+        va_end(args);
+    }
+
+    VOID OnDhcpSocketError(INT nErr)
+    {
+        OnNodeMessagef(0, "DHCP", "Socket Error: %d", nErr);
+    }
+
+    VOID OnDhcpOffer(UINT32 nAddr, UINT64 idMac)
+    {
+        OnNodeMessagef(nAddr, "DHCP", "Offer %s to %02x-%02x-%02x-%02x-%02x-%02x",
+                       SocketToString(nAddr),
+                       ((PBYTE)&idMac)[5],
+                       ((PBYTE)&idMac)[4],
+                       ((PBYTE)&idMac)[3],
+                       ((PBYTE)&idMac)[2],
+                       ((PBYTE)&idMac)[1],
+                       ((PBYTE)&idMac)[0]);
+    }
+
+    VOID OnDhcpAck(UINT32 nAddr, UINT64 idMac)
+    {
+        OnNodeMessagef(nAddr, "DHCP", "Assigned %s to %02x-%02x-%02x-%02x-%02x-%02x",
+                       SocketToString(nAddr),
+                       ((PBYTE)&idMac)[5],
+                       ((PBYTE)&idMac)[4],
+                       ((PBYTE)&idMac)[3],
+                       ((PBYTE)&idMac)[2],
+                       ((PBYTE)&idMac)[1],
+                       ((PBYTE)&idMac)[0]);
+    }
+};
+
+class CPxepSink : public IDhcpSink
+{
+  public:
+    VOID OnDhcpMessage(UINT32 nAddr, PCSTR pszMessage, ...)
+    {
+        va_list args;
+
+        va_start(args, pszMessage);
+        OnNodeMessage(nAddr, "PXE ", pszMessage, args);
+        va_end(args);
+    }
+
+    VOID OnDhcpSocketError(INT nErr)
+    {
+        OnNodeMessagef(0, "PXE ", "Socket Error: %d", nErr);
+    }
+
+    VOID OnDhcpOffer(UINT32 nAddr, UINT64 idMac)
+    {
+        OnNodeMessagef(nAddr, "PXE ", "Offer boot to %02x-%02x-%02x-%02x-%02x-%02x",
+                       ((PBYTE)&idMac)[5],
+                       ((PBYTE)&idMac)[4],
+                       ((PBYTE)&idMac)[3],
+                       ((PBYTE)&idMac)[2],
+                       ((PBYTE)&idMac)[1],
+                       ((PBYTE)&idMac)[0]);
+    }
+
+    VOID OnDhcpAck(UINT32 nAddr, UINT64 idMac)
+    {
+        OnNodeMessagef(nAddr, "PXE ", "Assigned boot to %02x-%02x-%02x-%02x-%02x-%02x",
+                       ((PBYTE)&idMac)[5],
+                       ((PBYTE)&idMac)[4],
+                       ((PBYTE)&idMac)[3],
+                       ((PBYTE)&idMac)[2],
+                       ((PBYTE)&idMac)[1],
+                       ((PBYTE)&idMac)[0]);
+    }
+};
+
+/////////////////////////////////////////////////////////////////// ITftpSink.
+//
+class CTftpSink : public ITftpSink
+{
+    VOID OnTftpMessage(UINT32 nAddr, PCSTR pszMessage, ...)
+    {
+        va_list args;
+
+        va_start(args, pszMessage);
+        OnNodeMessage(nAddr, "TFTP", pszMessage, args);
+        va_end(args);
+    }
+
+    VOID OnTftpSocketError(INT nErr)
+    {
+        OnNodeMessagef(0, "TFTP", "Socket Error: %d", nErr);
+    }
+
+    VOID OnTftpAccessBegin(UINT32 nAddr, UINT16 nPort, BOOL fWrite, PCSTR pszFile)
+    {
+        (void)nPort;
+
+        if (fWrite) {
+            OnNodeMessagef(nAddr, "TFTP", "Put %s", pszFile);
+        }
+        else {
+            OnNodeMessagef(nAddr, "TFTP", "Get %s", pszFile);
+        }
+    }
+
+    VOID OnTftpAccessEnd(UINT32 nAddr, UINT16 nPort, BOOL bSuccess)
+    {
+        (void)nPort;
+
+        if (bSuccess)
+        {
+            OnNodeMessagef(nAddr, "TFTP", "Operation finished.");
+        }
+        else
+        {
+            OnNodeMessagef(nAddr, "TFTP", "Operation terminated.");
+        }
+    }
+};
+
+VOID Usage(VOID)
+{
+    printf("Usage:\n"
+           "    bootd.exe [options]\n"
+           "Options:\n"
+           "    /? or /h  - Print this help text.\n"
+           "    /dhcp ... - Set DHCP Daemon Options.\n"
+           "        /b:bootimg - Default boot image.\n"
+           "        /c:command - Set command line in PXE packet.\n"
+           "        /i:inifile - Path name of dhcpd.ini\n"
+           "        /m:xx-xx-xx-xx-xx-xx - PXE boot MAC.\n"
+           "        /m:xx-xx-xx-xx-xx-xx,i.i.i.i - DCHP & PXE boot MAC.\n"
+           "    /tftp ... - Set TFTP Daemon Options\n"
+           "        /e - Exit on first attempt to read an invalid file.\n"
+           "        /r - Disable rename of *.x86 files to pxe.com.N.\n"
+           "        /v - Verbose output.\n"
+           "        /w:directory - Allow writes to the specified directory.\n"
+           "        {directories} - Directories to serve read only.\n"
+          );
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static HWND s_hWndMain;
+
+BOOL TimerSet(ITimerSink *pTimerSink, UINT nMilliseconds)
+{
+    if (!::SetTimer(s_hWndMain, (UINT_PTR)pTimerSink, nMilliseconds, NULL)) {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+BOOL TimerClr(ITimerSink *pTimerSink)
+{
+    return ::KillTimer(s_hWndMain, (UINT_PTR)pTimerSink);
+}
+
+int main(int argc, char **argv)
+{
+    INT nResult = 0;
+    CDhcpSink dhcpSink;
+    CPxepSink pxepSink;
+    CTftpSink tftpSink;
+
+    CDhcpState *m_pDhcpState = NULL;
+    CDhcp * m_pDhcpRaw = NULL;
+    CDhcp * m_pDhcpPxe = NULL;
+    CTftp * m_pTftp = NULL;
+
+    PCHAR rpszAppsArgs[128];
+    PCHAR rpszDhcpArgs[128];
+    PCHAR rpszTftpArgs[128];
+    INT nAppsArgs = 0;
+    INT nDhcpArgs = 0;
+    INT nTftpArgs = 0;
+
+    // Initialize Winsock, AFTER the window is created above.
+    WSADATA WSAData;
+    int iRes = WSAStartup(MAKEWORD(1,1), &WSAData);
+    if (0 != iRes) {
+        printf("WSAStartup failed.\n");
+        return 1;
+    }
+
+    enum {
+        APPS = 0,
+        DHCP = 1,
+        TFTP = 2,
+    } whose = APPS;
+
+    if (argc == 1) {
+        Usage();
+        return 0;
+    }
+
+    for (int arg = 1; arg < argc; arg++) {
+
+        if (_stricmp(argv[arg], "/apps") == 0 || _stricmp(argv[arg], "-apps") == 0)
+        {
+            whose = APPS;
+        }
+        else if (_stricmp(argv[arg], "/dhcp") == 0 || _stricmp(argv[arg], "-dhcp") == 0)
+        {
+            whose = DHCP;
+        }
+        else if (_stricmp(argv[arg], "/tftp") == 0 || _stricmp(argv[arg], "-tftp") == 0)
+        {
+            whose = TFTP;
+        }
+        else
+        {
+            switch (whose)
+            {
+              case APPS:
+                rpszAppsArgs[nAppsArgs++] = argv[arg];
+                break;
+              case DHCP:
+                rpszDhcpArgs[nDhcpArgs++] = argv[arg];
+                break;
+              case TFTP:
+                rpszTftpArgs[nTftpArgs++] = argv[arg];
+                break;
+            }
+        }
+    }
+
+    rpszAppsArgs[nAppsArgs] = NULL;
+    rpszDhcpArgs[nDhcpArgs] = NULL;
+    rpszTftpArgs[nTftpArgs] = NULL;
+
+    BOOL fNeedHelp = FALSE;
+
+    for (INT arg = 0; arg < nAppsArgs; arg++)
+    {
+        if (rpszAppsArgs[arg][0] == '-' || rpszAppsArgs[arg][0] == '/')
+        {
+            char *argn = rpszAppsArgs[arg]+1;                   // Argument name
+            char *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':')
+            {
+                argp++;
+            }
+            if (*argp == ':')
+            {
+                *argp++ = '\0';
+            }
+
+            switch (argn[0])
+            {
+              case 'h':                                 // Help
+              case 'H':
+              case '?':
+                fNeedHelp = TRUE;
+                break;
+
+              default:
+                printf("Unknown argument: %s\n", rpszAppsArgs[arg]);
+                fNeedHelp = TRUE;
+                break;
+            }
+        }
+        else
+        {
+            printf("Unknown argument: %s\n", rpszAppsArgs[arg]);
+            fNeedHelp = TRUE;
+        }
+    }
+
+    if (fNeedHelp) {
+        Usage();
+        return 1;
+    }
+
+    // Create a message window.
+    //
+    WNDCLASS wc;
+    ZeroMemory(&wc, sizeof(wc));
+
+    wc.lpfnWndProc   = DefWindowProc;   /* Function to retrieve messages for  */
+    wc.lpszClassName = "bootd";  /* Name used in call to CreateWindow. */
+
+    ATOM atomClass = RegisterClass(&wc);
+    assert(atomClass);
+
+    s_hWndMain = CreateWindow("bootd", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+    assert(s_hWndMain);
+
+    SocketInit(s_hWndMain, WM_SOCKET_EVENT);
+
+    UINT nError;
+
+    CTftp::ConfigureFiles(&tftpSink, nTftpArgs, rpszTftpArgs);
+
+    m_pDhcpState = new CDhcpState();
+    assert(m_pDhcpState);
+    m_pDhcpState->Configure(&dhcpSink, nDhcpArgs, rpszDhcpArgs);
+    printf("\n");
+
+    TimerSet(NULL, 10000);
+
+    ////////////////////////////////////////////////////////// Process Events.
+    //
+    MSG msg;
+    BOOL fScanNetwork = TRUE;
+
+    for (;;) {
+        if (fScanNetwork) {
+            fScanNetwork = FALSE;
+
+            CNetwork *pNetworks = NULL;
+            SocketLoadNetworks(&pNetworks);
+
+            for (; pNetworks != NULL; pNetworks = pNetworks->pNext) {
+                if (pNetworks->fChanged) {
+                    OnNodeMessagef(pNetworks->nAddr, "::::", "Changed");
+                    if (m_pDhcpRaw) {
+                        m_pDhcpRaw->OnNetworkChange(pNetworks->nAddr,
+                                                    pNetworks->nMask,
+                                                    pNetworks->nGate);
+                    }
+                    if (m_pTftp) {
+                        m_pTftp->OnNetworkChange(pNetworks->nAddr,
+                                                 pNetworks->nMask,
+                                                 pNetworks->nGate);
+                    }
+                    if (m_pDhcpPxe) {
+                        m_pDhcpPxe->OnNetworkChange(pNetworks->nAddr,
+                                                    pNetworks->nMask,
+                                                    pNetworks->nGate);
+                    }
+                    printf("\n");
+                    continue;
+                }
+                else if (pNetworks->fDeleted) {
+                    OnNodeMessagef(pNetworks->nAddr, "::::", "Deleted");
+                    if (m_pDhcpRaw) {
+                        m_pDhcpRaw->OnNetworkDelete(pNetworks->nAddr, &m_pDhcpRaw);
+                    }
+                    if (m_pTftp) {
+                        m_pTftp->OnNetworkDelete(pNetworks->nAddr, &m_pTftp);
+                    }
+                    if (m_pDhcpPxe) {
+                        m_pDhcpPxe->OnNetworkDelete(pNetworks->nAddr, &m_pDhcpPxe);
+                    }
+                    printf("\n");
+                    continue;
+                }
+                else if (!pNetworks->fCreated) {
+                    continue;
+                }
+
+                OnNodeMessagef(pNetworks->nAddr, "::::", "Mask: %s, Gate: %s",
+                               SocketToString(pNetworks->nMask),
+                               SocketToString(pNetworks->nGate));
+
+                m_pDhcpRaw = new CDhcp(m_pDhcpRaw);
+                assert(m_pDhcpRaw);
+                m_pDhcpRaw->Configure(pNetworks->nAddr,
+                                      pNetworks->nMask,
+                                      pNetworks->nGate,
+                                      m_pDhcpState, &dhcpSink, DHCP_SERVER_PORT);
+                nError = SocketCreate(pNetworks->nAddr, DHCP_SERVER_PORT, m_pDhcpRaw);
+                if (nError != 0)
+                {
+                    SocketErrorBox(nError, __FILE__, __LINE__);
+                    nResult = 1;
+                    goto abort;
+                }
+
+                m_pTftp = new CTftp(m_pTftp);
+                assert(m_pTftp);
+                m_pTftp->Configure(pNetworks->nAddr, TFTP_PORT,
+                                   &tftpSink, nTftpArgs, rpszTftpArgs);
+                nError = SessionFactoryCreate(pNetworks->nAddr, TFTP_PORT, m_pTftp);
+                if (nError != 0)
+                {
+                    SocketErrorBox(nError, __FILE__, __LINE__);
+                    nResult = 3;
+                    goto abort;
+                }
+
+                m_pDhcpPxe = new CDhcp(m_pDhcpPxe);
+                assert(m_pDhcpPxe);
+                m_pDhcpPxe->Configure(pNetworks->nAddr,
+                                      pNetworks->nMask,
+                                      pNetworks->nGate,
+                                      m_pDhcpState, &pxepSink, PXE_SERVER_PORT);
+                nError = SocketCreate(pNetworks->nAddr, PXE_SERVER_PORT, m_pDhcpPxe);
+                if (nError != 0)
+                {
+                    SocketErrorBox(nError, __FILE__, __LINE__);
+                    nResult = 4;
+                    goto abort;
+                }
+
+                printf("\n");
+            }
+        }
+
+        DWORD what = MsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_ALLEVENTS,
+                                                 MWMO_ALERTABLE | MWMO_INPUTAVAILABLE);
+
+        if (what == WAIT_OBJECT_0) {
+            if (!GetMessage(&msg, NULL, 0, 0)) {
+                break;
+            }
+
+            if (msg.hwnd == s_hWndMain) {
+                switch (msg.message) {
+                  case WM_SOCKET_EVENT:
+                    SocketEvent(msg.wParam, msg.lParam);
+                    break;
+                  case WM_TIMER:
+                    if (msg.wParam == 0) {
+                        fScanNetwork = TRUE;
+                    }
+                    else {
+                        ITimerSink *pTimerSink = (ITimerSink *)msg.wParam;
+                        pTimerSink->OnTimerFired();
+                    }
+                    break;
+                }
+            }
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+    }
+
+  abort:
+    if (m_pDhcpPxe)
+    {
+        delete m_pDhcpPxe;
+        m_pDhcpPxe = NULL;
+    }
+    if (m_pTftp)
+    {
+        delete m_pTftp;
+        m_pTftp = NULL;
+    }
+    if (m_pDhcpRaw)
+    {
+        delete m_pDhcpRaw;
+        m_pDhcpRaw = NULL;
+    }
+    if (m_pDhcpState)
+    {
+        delete m_pDhcpState;
+        m_pDhcpState = NULL;
+    }
+
+    // close down winsock
+    WSACleanup();
+
+    return 0;
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/dhcpd.cpp b/base/Windows/bootd/dhcpd.cpp
new file mode 100644
index 0000000..fb3c65a
--- /dev/null
+++ b/base/Windows/bootd/dhcpd.cpp
@@ -0,0 +1,994 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include <winlean.h>
+#include <winsock.h>
+#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
+#include <iphlpapi.h>
+
+#include "dhcpd.h"
+
+/*
+ * DHCP Standard Options.
+ */
+#define DHCP_OPTION_PAD                      0
+#define DHCP_OPTION_SUBNET_MASK              1
+#define DHCP_OPTION_TIME_OFFSET              2
+#define DHCP_OPTION_ROUTER_ADDRESS           3
+#define DHCP_OPTION_TIME_SERVERS             4
+#define DHCP_OPTION_IEN116_NAME_SERVERS      5
+#define DHCP_OPTION_DOMAIN_NAME_SERVERS      6
+#define DHCP_OPTION_LOG_SERVERS              7
+#define DHCP_OPTION_COOKIE_SERVERS           8          // overridden w/ Command Line
+#define DHCP_OPTION_LPR_SERVERS              9
+#define DHCP_OPTION_IMPRESS_SERVERS          10         // overridden w/ Boot File
+#define DHCP_OPTION_RLP_SERVERS              11
+#define DHCP_OPTION_HOST_NAME                12
+#define DHCP_OPTION_BOOT_FILE_SIZE           13
+#define DHCP_OPTION_MERIT_DUMP_FILE          14
+#define DHCP_OPTION_DOMAIN_NAME              15
+#define DHCP_OPTION_SWAP_SERVER              16
+#define DHCP_OPTION_ROOT_DISK                17
+#define DHCP_OPTION_EXTENSIONS_PATH          18
+
+/*
+ * IP Layer Parameters - per host
+ */
+#define DHCP_OPTION_BE_A_ROUTER              19
+#define DHCP_OPTION_NON_LOCAL_SOURCE_ROUTING 20
+#define DHCP_OPTION_POLICY_FILTER_FOR_NLSR   21
+#define DHCP_OPTION_MAX_REASSEMBLY_SIZE      22
+#define DHCP_OPTION_DEFAULT_TTL              23
+#define DHCP_OPTION_PMTU_AGING_TIMEOUT       24
+#define DHCP_OPTION_PMTU_PLATEAU_TABLE       25
+
+/*
+ * IP Layer Parameters - per interface.
+ */
+#define DHCP_OPTION_MTU                      26
+#define DHCP_OPTION_ALL_SUBNETS_MTU          27
+#define DHCP_OPTION_BROADCAST_ADDRESS        28
+#define DHCP_OPTION_PERFORM_MASK_DISCOVERY   29
+#define DHCP_OPTION_BE_A_MASK_SUPPLIER       30
+#define DHCP_OPTION_PERFORM_ROUTER_DISCOVERY 31
+#define DHCP_OPTION_ROUTER_SOLICITATION_ADDR 32
+#define DHCP_OPTION_STATIC_ROUTES            33
+#define DHCP_OPTION_TRAILERS                 34
+#define DHCP_OPTION_ARP_CACHE_TIMEOUT        35
+#define DHCP_OPTION_ETHERNET_ENCAPSULATION   36
+
+/*
+ * TCP Parameters - per host
+ */
+#define DHCP_OPTION_TTL                      37
+#define DHCP_OPTION_KEEP_ALIVE_INTERVAL      38
+#define DHCP_OPTION_KEEP_ALIVE_DATA_SIZE     39
+
+/*
+ * Application Layer Parameters
+ */
+#define DHCP_OPTION_NETWORK_INFO_SERVICE_DOM 40
+#define DHCP_OPTION_NETWORK_INFO_SERVERS     41
+#define DHCP_OPTION_NETWORK_TIME_SERVERS     42
+
+/*
+ * Vender Specific Information Option
+ */
+#define DHCP_OPTION_VENDOR_SPEC_INFO         43
+
+/*
+ * NetBIOS Over TCP/IP Name Server Options
+ */
+#define DHCP_OPTION_NETBIOS_NAME_SERVER      44
+#define DHCP_OPTION_NETBIOS_DATAGRAM_SERVER  45
+#define DHCP_OPTION_NETBIOS_NODE_TYPE        46
+#define DHCP_OPTION_NETBIOS_SCOPE_OPTION     47
+
+/*
+ * X Window System Options
+ */
+#define DHCP_OPTION_XWINDOW_FONT_SERVER      48
+#define DHCP_OPTION_XWINDOW_DISPLAY_MANAGER  49
+
+/*
+ * DHCP Extensions
+ */
+#define DHCP_OPTION_REQUESTED_ADDRESS        50
+#define DHCP_OPTION_LEASE_TIME               51
+#define DHCP_OPTION_OK_TO_OVERLAY            52
+#define DHCP_OPTION_MESSAGE_TYPE             53
+#define DHCP_OPTION_SERVER_IDENTIFIER        54
+#define DHCP_OPTION_PARAMETER_REQUEST_LIST   55
+#define DHCP_OPTION_MESSAGE                  56
+#define DHCP_OPTION_MESSAGE_LENGTH           57
+#define DHCP_OPTION_RENEWAL_TIME             58      /* T1 */
+#define DHCP_OPTION_REBIND_TIME              59      /* T2 */
+#define DHCP_OPTION_CLIENT_CLASS_INFO        60
+#define DHCP_OPTION_CLIENT_ID                61
+
+/*
+ * More Application Layer Parameters
+ */
+#define DHCP_OPTION_NIS_PLUS_DOM             64
+#define DHCP_OPTION_NIS_PLUS                 65
+
+/*
+ * Overlaid Header Field Replacements
+ */
+#define DHCP_OPTION_TFTP_SERVER_NAME         66
+#define DHCP_OPTION_TFTP_BOOTFILE_NAME       67
+
+/*
+ * Even More Application Layer Parameters
+ */
+#define DHCP_OPTION_MOBILE_IP_HOME_AGENTS    68
+#define DHCP_OPTION_SMTP_SERVERS             69
+#define DHCP_OPTION_POP_SERVERS              70
+#define DHCP_OPTION_NNTP_SERVERS             71
+#define DHCP_OPTION_WWW_SERVERS              72
+#define DHCP_OPTION_FINGER_SERVERS           73
+#define DHCP_OPTION_IRC_SERVERS              74
+#define DHCP_OPTION_STREETTALK_SERVERS       75
+#define DHCP_OPTION_STREETTALK_DIR_SERVERS   76
+
+/*
+ * Option codes from 77 to 127 are reserved through the
+ * Internet Assigned Numbers Authority (iana@isi.edu).
+ */
+
+/*
+ * PXE Parameters
+ */
+#define DHCP_OPTION_PXE_CLIENT_ARCH_ID       93
+#define DHCP_OPTION_PXE_CLIENT_NIC_ID        94
+#define DHCP_OPTION_PXE_CLIENT_ID            97
+
+
+/*
+ * Option codes from 128 to 254 are for site-specific options.
+ */
+#define DHCP_OPTION_END                      255
+
+//////////////////////////////////////////////////////////////////////////////
+
+#define DHCP_MAGIC_COOKIE 0x63825363
+
+#pragma pack(push)
+#pragma pack(1)
+
+struct OPTIONS {
+    BYTE    Code;
+    BYTE    Length;
+    BYTE    Data[1];
+};
+
+struct DHCP_CMD {
+    BYTE    op;
+    BYTE    htype;
+    BYTE    hlen;
+    BYTE    hops;
+    UINT32  xid;
+    UINT16  secs;
+    UINT16  flags;  // UNUSED for BOOTP
+    UINT32  ciaddr;
+    UINT32  yiaddr;
+    UINT32  siaddr;
+    UINT32  giaddr;
+    BYTE    chaddr[16];
+    CHAR    sname[64];
+    CHAR    file[128];
+    union {
+        struct {
+            UINT32   cookie;
+            OPTIONS  options;
+        } DHCP;
+        struct {
+            OPTIONS options;
+        } BOOTP;
+    };
+};
+
+#pragma pack(pop)
+
+typedef enum {
+    BOOTREQUEST = 1,
+    BOOTREPLY   = 2
+} BOOT_MESSAGE_TYPE;
+
+typedef enum {
+    DHCPDISCOVER = 1,
+    DHCPOFFER    = 2,
+    DHCPREQUEST  = 3,
+    DHCPDECLINE  = 4,
+    DHCPACK      = 5,
+    DHCPNAK      = 6,
+    DHCPRELEASE  = 7,
+    DHCPINFORM   = 8
+} DHCP_MESSAGE_TYPE;
+
+#define MESSAGE_TYPE_MIN DHCPDISCOVER
+#define MESSAGE_TYPE_MAX DHCPINFORM
+#define MESSAGE_TYPE_COUNT (MESSAGE_TYPE_MAX-MESSAGE_TYPE_MIN+1)
+
+CHAR *szMessageTypes[MESSAGE_TYPE_COUNT] = {"Discover",
+                                            "Offer",
+                                            "Request",
+                                            "Decline",
+                                            "Ack",
+                                            "Nak",
+                                            "Release",
+                                            "Inform" };
+
+
+#define OPERATOR_TYPE_MIN BOOTREQUEST
+#define OPERATOR_TYPE_MAX BOOTREPLY
+#define OPERATOR_TYPE_COUNT (OPERATOR_TYPE_MAX-OPERATOR_TYPE_MIN+1)
+
+CHAR *szOperatorTypes[OPERATOR_TYPE_COUNT] = {"Request",
+                                              "Reply"};
+
+#define ARRAYOF(x)  (sizeof(x)/sizeof(x[0]))
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static void NormalizeMacRep(PSTR str)
+{
+    do {
+        if (*str == ':')
+            *str = '-';
+    } while (*++str != '\0');
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static UINT64 IdFromMac(PBYTE pbMac)
+{
+    UINT64 idMac = 0;
+    ((PBYTE)&idMac)[0] = pbMac[5];
+    ((PBYTE)&idMac)[1] = pbMac[4];
+    ((PBYTE)&idMac)[2] = pbMac[3];
+    ((PBYTE)&idMac)[3] = pbMac[2];
+    ((PBYTE)&idMac)[4] = pbMac[1];
+    ((PBYTE)&idMac)[5] = pbMac[0];
+    return idMac;
+}
+
+#if 0
+static VOID MacFromId(UINT64 idMac, PBYTE pbMac)
+{
+    pbMac[0] = ((PBYTE)&idMac)[5];
+    pbMac[1] = ((PBYTE)&idMac)[4];
+    pbMac[2] = ((PBYTE)&idMac)[3];
+    pbMac[3] = ((PBYTE)&idMac)[2];
+    pbMac[4] = ((PBYTE)&idMac)[1];
+    pbMac[5] = ((PBYTE)&idMac)[0];
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+CDhcpNode::CDhcpNode()
+{
+    Enabled = FALSE;
+    Name[0] = '\0';
+
+    idMac = 0;
+    iaLast = 0;
+    iaAssigned = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+CDhcpState::CDhcpState()
+{
+    strcpy(m_szBootFile, "pxe.com");
+    strcpy(m_szCommand, "");
+}
+
+CDhcpState::~CDhcpState()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static UINT32 ReadIpAddr(PCHAR psz)
+{
+    UINT32 nAddr = 0;
+    UINT32 nDigit = 0;
+
+    for (; *psz; psz++) {
+        if (*psz >= '0' && *psz <= '9') {
+            nDigit = nDigit * 10 + *psz - '0';
+        }
+        else if (*psz == '.') {
+            nAddr = (nAddr << 8) | nDigit;
+            nDigit = 0;
+        }
+    }
+    nAddr = (nAddr << 8) | nDigit;
+    return nAddr;
+}
+
+static void ReadMacFlags(CDhcpNode *pNode, PCHAR pszFlags)
+{
+    while (*pszFlags) {
+
+        /////////////////////////////////////////////////////////// Find Flag.
+        //
+        while (*pszFlags && isspace(*pszFlags)) {
+            pszFlags++;
+        }
+        if (*pszFlags == '\0' || *pszFlags == ';' || *pszFlags == '#') {
+            break;
+        }
+
+        char *argn = pszFlags;                          // Argument name
+        while (*pszFlags && !isspace(*pszFlags) &&
+               *pszFlags != ':' && *pszFlags != '=') {
+            pszFlags++;
+        }
+
+        if (*pszFlags == ':' || *pszFlags == '=') {     // Terminate name.
+            *pszFlags++ = '\0';
+        }
+
+        char *argp = pszFlags;                          // Argument parameter
+        while (*pszFlags && !isspace(*pszFlags)) {
+            pszFlags++;
+        }
+        if (*pszFlags) {                                // Terminate parameter
+            *pszFlags++ = '\0';
+        }
+
+        //////////////////////////////////////////////////////// Process Flag.
+        //
+        if (_strnicmp(argn, "enable", 4) == 0) {
+            pNode->Enabled = TRUE;
+        }
+        else if (_strnicmp(argn, "disable", 4) == 0) {
+            pNode->Enabled = FALSE;
+        }
+        else if (_strnicmp(argn, "name", 4) == 0) {
+            strcpy(pNode->Name, argp);
+        }
+    }
+}
+
+void CDhcpState::CheckMacFlags(CDhcpNode *pNode)
+{
+    if (pNode->Name[0] == '\0') {
+        sprintf(pNode->Name, "IP_%d_%d_%d_%d",
+                ((PBYTE)&pNode->iaAssigned)[3],
+                ((PBYTE)&pNode->iaAssigned)[2],
+                ((PBYTE)&pNode->iaAssigned)[1],
+                ((PBYTE)&pNode->iaAssigned)[0]);
+    }
+    else {
+        PCHAR psz;
+        if ((psz = strchr(pNode->Name, '.')) != NULL) {
+            *psz = '\0';
+        }
+    }
+}
+
+BOOL CDhcpState::AddMacEntry(PCSTR psz)
+{
+    UINT IdMac[6] = { 0,0,0,0,0,0};
+    UINT IpAddr[4] = { 0,0,0,0 };
+
+    INT nRead = sscanf(psz,
+                       "%02x-%02x-%02x-%02x-%02x-%02x,%d.%d.%d.%d",
+                       &IdMac[5],
+                       &IdMac[4],
+                       &IdMac[3],
+                       &IdMac[2],
+                       &IdMac[1],
+                       &IdMac[0],
+                       &IpAddr[3],
+                       &IpAddr[2],
+                       &IpAddr[1],
+                       &IpAddr[0]);
+    if (nRead != 6 && nRead != 10) {
+        return FALSE;
+    }
+
+    CDhcpNode *pNode = new CDhcpNode;
+    pNode->Enabled = TRUE;
+    pNode->idMac = 0;
+    for (INT n = 0; n < 6; n++) {
+        ((PBYTE)&pNode->idMac)[n] = (BYTE)IdMac[n];
+    }
+    for (INT n = 0; n < 4; n++) {
+        ((PBYTE)&pNode->iaAssigned)[n] = (BYTE)IpAddr[n];
+    }
+
+    CheckMacFlags(pNode);
+
+    if (m_pSink) {
+        m_pSink->OnDhcpMessage(pNode->iaAssigned,
+                               "Added mac %02x-%02x-%02x-%02x-%02x-%02x",
+                               ((PBYTE)&pNode->idMac)[5],
+                               ((PBYTE)&pNode->idMac)[4],
+                               ((PBYTE)&pNode->idMac)[3],
+                               ((PBYTE)&pNode->idMac)[2],
+                               ((PBYTE)&pNode->idMac)[1],
+                               ((PBYTE)&pNode->idMac)[0]
+                              );
+    }
+
+    m_MacsById.Insert(pNode->idMac, pNode);
+    return TRUE;
+}
+
+BOOL CDhcpState::ReadMacEntries(PCSTR pszFile)
+{
+    PCHAR psz;
+    CHAR entry[768];
+
+    FILE *fMap = fopen(pszFile, "r");
+    if (fMap != NULL) {
+        while ((psz = fgets(entry, sizeof(entry), fMap)) != NULL) {
+            while (*psz && isspace(*psz)) {
+                psz++;
+            }
+
+            if (*psz == '\0' || *psz == ';' || *psz == '#') { // Comment
+                continue;
+            }
+            else if (*psz == '*') {                     // Defaults
+            }
+            else {
+                char flags[768] = "";
+                UINT IdMac[6] = { 0,0,0,0,0,0};
+                UINT IpAddr[4] = { 0,0,0,0 };
+                CDhcpNode *pNode = new CDhcpNode;
+
+                NormalizeMacRep(psz);
+
+                pNode->idMac = 0;
+                INT nRead = sscanf(psz,
+                                   "%02x-%02x-%02x-%02x-%02x-%02x %d.%d.%d.%d %[^\n]s",
+                                   &IdMac[5],
+                                   &IdMac[4],
+                                   &IdMac[3],
+                                   &IdMac[2],
+                                   &IdMac[1],
+                                   &IdMac[0],
+                                   &IpAddr[3],
+                                   &IpAddr[2],
+                                   &IpAddr[1],
+                                   &IpAddr[0],
+                                   flags);
+
+                pNode->idMac = 0;
+                for (INT n = 0; n < 6; n++) {
+                    ((PBYTE)&pNode->idMac)[n] = (BYTE)IdMac[n];
+                }
+                for (INT n = 0; n < 4; n++) {
+                    ((PBYTE)&pNode->iaAssigned)[n] = (BYTE)IpAddr[n];
+                }
+
+                if (nRead == 6 || nRead >= 10) {
+                    ReadMacFlags(pNode, flags);
+                    CheckMacFlags(pNode);
+
+                    m_MacsById.Insert(pNode->idMac, pNode);
+                    pNode = NULL;
+                }
+                else {
+                    delete pNode;
+                    pNode = NULL;
+
+                    if (m_pSink) {
+                        m_pSink->OnDhcpMessage(0, "INI Error: %s", psz);
+                    }
+                }
+
+            }
+        }
+        fclose(fMap);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+CDhcpNode *CDhcpState::FindMacEntry(UINT64 idMac)
+{
+    return m_MacsById.Find(idMac);
+}
+
+BOOL CDhcpState::IsPxeDhcpPacket(PBYTE pbPacket, UINT32 cbPacket)
+{
+    DHCP_CMD *dhcpPacket = (DHCP_CMD *)pbPacket;
+    OPTIONS *pOption = NULL;
+    OPTIONS *pOptionEnd = (OPTIONS *)(pbPacket + cbPacket);
+
+    if (DHCP_MAGIC_COOKIE == ntohl(dhcpPacket->DHCP.cookie)) {
+        pOption = &dhcpPacket->DHCP.options;
+    }
+    else {
+        pOption = &dhcpPacket->BOOTP.options;
+    }
+
+    while (pOption < pOptionEnd) {
+        if (pOption->Code == DHCP_OPTION_CLIENT_CLASS_INFO) {
+            if (pOption->Length >= 9 &&
+                memcmp(pOption->Data, "PXEClient", 9) == 0) {
+                return TRUE;
+            }
+        }
+
+        if (pOption->Code == 0)
+            pOption = (OPTIONS *)(((CHAR *)pOption) + 1);
+        else
+            pOption = (OPTIONS *)(((CHAR *)pOption) + pOption->Length + 2);
+    }
+    return FALSE;
+}
+
+static BOOL GetDhcpOptions(DHCP_CMD *dhcpPacket,
+                           UINT32 cbPacket,
+                           PCHAR pszName,
+                           PCHAR pszType,
+                           PCHAR pszClas,
+                           PUINT16 pusPxeArch,
+                           PUINT16 pusPxeVers,
+                           GUID * pguidPxeClientId
+                          )
+{
+    OPTIONS *pOptionEnd = (OPTIONS *)(((CHAR *)dhcpPacket) + cbPacket);
+
+    // dump all the options
+    OPTIONS *pOption = NULL;
+    if (DHCP_MAGIC_COOKIE == ntohl(dhcpPacket->DHCP.cookie)) {
+        pOption = &dhcpPacket->DHCP.options;
+    }
+    else {
+        pOption = &dhcpPacket->BOOTP.options;
+    }
+
+    CHAR szTemp[256];
+    if (pszName == NULL) {
+        pszName = szTemp;
+    }
+    if (pszType == NULL) {
+        pszType = szTemp;
+    }
+    if (pszClas == NULL) {
+        pszClas = szTemp;
+    }
+
+    pszName[0] = pszType[0] = pszClas[0] = '\0';
+    *pusPxeArch = 0;
+    *pusPxeVers = 0;
+    memset(pguidPxeClientId, 0, sizeof(*pguidPxeClientId));
+
+    while (pOption < pOptionEnd) {
+        switch (pOption->Code) {
+          case DHCP_OPTION_HOST_NAME: // HOST NAME
+            strncpy(pszName, (PCHAR)pOption->Data, pOption->Length);
+            pszName[pOption->Length] = '\0';
+            break;
+          case DHCP_OPTION_MESSAGE_TYPE:
+            if ((MESSAGE_TYPE_MAX >= pOption->Data[0]) &&
+                (MESSAGE_TYPE_MIN <= pOption->Data[0])) {
+                strcpy(pszType, szMessageTypes[pOption->Data[0] - MESSAGE_TYPE_MIN]);
+            }
+            else {
+                sprintf(pszType, "UNKNOWN (0x%02x)", pOption->Data[0]);
+            }
+            break;
+          case DHCP_OPTION_CLIENT_CLASS_INFO: // CLASS IDENTIFIER
+            strncpy(pszClas, (PCHAR)pOption->Data, pOption->Length);
+            pszClas[pOption->Length] = '\0';
+            break;
+          case DHCP_OPTION_PXE_CLIENT_ARCH_ID:
+            *pusPxeArch = ntohs(*(PUINT16)pOption->Data);
+            break;
+          case DHCP_OPTION_PXE_CLIENT_NIC_ID:
+            if (pOption->Data[0] == 1) {
+                *pusPxeArch = ntohs(*(PUINT16)(pOption->Data + 1));
+            }
+            break;
+          case DHCP_OPTION_PXE_CLIENT_ID:
+            if (pOption->Data[0] == 0) {
+                memcpy(pguidPxeClientId, pOption->Data + 1, 16);
+            }
+            break;
+          case DHCP_OPTION_END:
+            pOption = pOptionEnd;
+            break;
+        }
+        if (0 == pOption->Code)
+            pOption = (OPTIONS *)(((CHAR *)pOption) + 1);
+        else
+            pOption = (OPTIONS *)(((CHAR *)pOption) + pOption->Length + 2);
+    }
+
+    return TRUE;
+}
+
+void AddOption(OPTIONS *&pOption, BYTE code, BYTE len, BYTE *data)
+{
+    pOption->Code = code;
+    pOption->Length = len;
+    if (len > 0) {
+        memcpy(pOption->Data, data, len);
+    }
+
+    // increment pointer to next option location, include code and len bytes too
+    if (DHCP_OPTION_PAD == pOption->Code || DHCP_OPTION_END == pOption->Code) {
+        pOption = (OPTIONS *)(((CHAR *)pOption) + 1);
+    }
+    else {
+        pOption = (OPTIONS *)(((CHAR *)pOption) + pOption->Length + 2);
+    }
+}
+
+void AddOption(OPTIONS *&pOption, BYTE code, UINT32 iaAddr)
+{
+    iaAddr = htonl(iaAddr);
+    AddOption(pOption, code, sizeof(iaAddr), (BYTE*)&iaAddr);
+}
+
+VOID CDhcpState::Configure(IDhcpSink *pSink, INT argc, PCHAR *argv)
+{
+    m_pSink = pSink;
+    m_fQuiet = FALSE;
+
+    for (INT arg = 0; arg < argc; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            CHAR args[1024];
+            strcpy(args, argv[arg]);
+            char *argn = args+1;                   // Argument name
+            char *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':') {
+                argp++;
+            }
+            if (*argp == ':') {
+                *argp++ = '\0';
+            }
+            switch (argn[0]) {
+              case 'b':                                 // Set boot file.
+              case 'B':
+                strcpy(m_szBootFile, argp);
+                break;
+
+              case 'c':                                 // Set cookie.
+              case 'C':
+                if (m_szCommand[0]) {
+                    strcat(m_szCommand, " ");
+                    strcat(m_szCommand, argp);
+                }
+                else {
+                    strcpy(m_szCommand, argp);
+                }
+                break;
+
+              case 'i':                                 // Set .ini file name.
+              case 'I':
+                if (!ReadMacEntries(argp)) {
+                    m_pSink->OnDhcpMessage(0, "Error reading `%s'.");
+                }
+                break;
+              case 'm':                                 // Mac address of client
+              case 'M':
+                NormalizeMacRep(argp);
+                AddMacEntry(argp);
+                break;
+
+              case 'q':
+              case 'Q':
+                m_fQuiet = TRUE;
+                break;
+
+              case '?':
+              case 'h':
+              case 'H':
+                break;
+            }
+        }
+        else {
+        }
+    }
+    m_pSink->OnDhcpMessage(0, "Boot File: %s", m_szBootFile);
+    m_pSink->OnDhcpMessage(0, "CommandLn: %s", m_szCommand);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+CDhcp::CDhcp(CDhcp *pNext)
+{
+    m_pNext = pNext;
+    m_pState = NULL;
+    m_pSink = NULL;
+    m_nAddr = 0;
+    m_nPort = 0;
+}
+
+CDhcp::~CDhcp()
+{
+    if (m_pSink) {
+        m_pSink->OnDhcpMessage(m_nAddr, "Server stopped.");
+    }
+
+    if (m_pNext) {
+        delete m_pNext;
+        m_pNext = NULL;
+    }
+}
+
+VOID CDhcp::OnNetworkChange(UINT32 nAddr, UINT32 nMask, UINT32 nGate)
+{
+    if (m_nAddr == nAddr) {
+        m_nMask = nMask;
+        m_nGate = nGate;
+        if (m_pSink) {
+            m_pSink->OnDhcpMessage(nAddr,
+                                   "Network change %s/%s",
+                                   SocketToString(m_nMask),
+                                   SocketToString(m_nGate));
+        }
+    }
+    if (m_pNext) {
+        m_pNext->OnNetworkChange(nAddr, nMask, nGate);
+    }
+}
+
+VOID CDhcp::OnNetworkDelete(UINT32 nAddr, CDhcp **ppNext)
+{
+    if (m_nAddr == nAddr) {
+        *ppNext = m_pNext;
+
+        if (m_pNext) {
+            m_pNext->OnNetworkDelete(nAddr, ppNext);
+        }
+        m_pNext = NULL;
+
+        delete this;
+    }
+    else {
+        if (m_pNext) {
+            m_pNext->OnNetworkDelete(nAddr, &m_pNext);
+        }
+    }
+}
+
+VOID CDhcp::Configure(UINT32 nAddr, UINT32 nMask, UINT32 nGate,
+                      CDhcpState *pState, IDhcpSink *pSink, UINT16 nPort)
+{
+    m_pState = pState;
+    m_nAddr = nAddr;
+    m_nMask = nMask;
+    m_nGate = nGate;
+    m_nPort = nPort;
+    m_pSink = pSink;
+
+    if (m_pSink) {
+        m_pSink->OnDhcpMessage(0,
+                               "DHCP Server: %s:%d",
+                               SocketToString(m_nAddr), m_nPort);
+    }
+}
+
+VOID CDhcp::OnSocketRecv(UINT dwError,
+                         UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData)
+{
+#if 0
+    m_pSink->OnDhcpMessage(nAddr,
+                           "=> port %d to %d",
+                           nPort, m_nPort);
+#endif
+
+    if (dwError) {
+        m_pSink->OnDhcpSocketError(dwError);
+
+      done:
+        return;
+    }
+
+    if (nAddr == 0) {
+        nAddr = INADDR_BROADCAST;
+    }
+
+    CHAR szName[256];
+    CHAR szType[256];
+    CHAR szClas[256];
+    UINT16 usPxeArchId;
+    UINT16 usPxeUndiId;
+    GUID guidPxeClientId;
+
+    DHCP_CMD *dhcpRequest = (DHCP_CMD *)pbData;
+    UINT64 idMac = IdFromMac(dhcpRequest->chaddr);
+    CDhcpNode *pEntry = m_pState->FindMacEntry(idMac);
+    BOOL fIsPxe = m_pState->IsPxeDhcpPacket(pbData, cbData);
+
+    if (idMac == 0) {
+        // Ignore requests without the ETHERNET Address.
+        goto done;
+    }
+
+    GetDhcpOptions(dhcpRequest, cbData, szName, szType, szClas,
+                   &usPxeArchId, &usPxeUndiId, &guidPxeClientId);
+
+    if (BOOTREQUEST != dhcpRequest->op ||
+        DHCP_MAGIC_COOKIE != ntohl(dhcpRequest->DHCP.cookie)) {
+        goto done;
+    }
+
+    if ((DHCP_OPTION_MESSAGE_TYPE != dhcpRequest->DHCP.options.Code) ||
+        (DHCPREQUEST != dhcpRequest->DHCP.options.Data[0] &&
+         DHCPDISCOVER != dhcpRequest->DHCP.options.Data[0])) {
+        goto done;
+    }
+
+    if (pEntry == NULL && DHCPDISCOVER != dhcpRequest->DHCP.options.Data[0]) {
+        goto done;
+    }
+
+    if (pEntry == NULL && m_pState->m_fQuiet) {
+        goto done;
+    }
+
+    if (m_pSink) {
+        m_pSink->OnDhcpMessage(nAddr,
+                               "=> %s from %02x-%02x-%02x-%02x-%02x-%02x port %d",
+                               szType,
+                               ((PBYTE)&idMac)[5],
+                               ((PBYTE)&idMac)[4],
+                               ((PBYTE)&idMac)[3],
+                               ((PBYTE)&idMac)[2],
+                               ((PBYTE)&idMac)[1],
+                               ((PBYTE)&idMac)[0],
+                               nPort);
+        m_pSink->OnDhcpMessage(nAddr,
+                               "   %s%s %s",
+                               fIsPxe ? "[PXE] " : "",
+                               szClas,
+                               szName);
+    }
+
+    if (pEntry == NULL || pEntry->Enabled == FALSE) {
+        goto done;
+    }
+
+    ///// Send the Reply.
+    BYTE PacketOut[1600];
+
+    // fill in packet before sending
+    DHCP_CMD *pdhcpReply = (DHCP_CMD *)PacketOut;
+
+    memset(pdhcpReply, 0, sizeof(*pdhcpReply));
+
+    // broadcast, or use the client specified address for replies
+    if (dhcpRequest->ciaddr) {
+        pEntry->iaLast = ntohl(dhcpRequest->ciaddr);
+    }
+
+    pdhcpReply->op     = BOOTREPLY; // REPLY
+    pdhcpReply->htype  = 1; // ETHERNET
+    pdhcpReply->hlen   = 6; // 6 BYTE HARDWARE ADDRESS LENGTH (MAC)
+    pdhcpReply->hops   = 0;
+    pdhcpReply->xid    = dhcpRequest->xid;
+    pdhcpReply->secs   = 0;
+    pdhcpReply->flags  = dhcpRequest->flags;
+    pdhcpReply->ciaddr = dhcpRequest->ciaddr;
+    if (fIsPxe && dhcpRequest->ciaddr == htonl(pEntry->iaAssigned)) {
+        pdhcpReply->yiaddr = 0;
+    }
+    else {
+        pdhcpReply->yiaddr = htonl(pEntry->iaAssigned);
+    }
+    pdhcpReply->siaddr = htonl(m_nAddr);
+    pdhcpReply->giaddr = 0;
+    memcpy(pdhcpReply->chaddr, dhcpRequest->chaddr, 16);
+    sprintf(pdhcpReply->sname, "%d.%d.%d.%d",
+            ((BYTE *)&m_nAddr)[3],
+            ((BYTE *)&m_nAddr)[2],
+            ((BYTE *)&m_nAddr)[1],
+            ((BYTE *)&m_nAddr)[0]);
+    strcpy(pdhcpReply->file, m_pState->m_szBootFile);
+    pdhcpReply->DHCP.cookie = htonl(DHCP_MAGIC_COOKIE);
+
+    // start pointing to first location for options
+    OPTIONS *pOptions = &pdhcpReply->DHCP.options;
+
+    // START OF OPTION ADDITIONS
+
+    // DHCP MESSAGE TYPE OPTION - MUST BE FIRST OPTION
+    BYTE data[1] = { DHCPACK };
+    if (dhcpRequest->DHCP.options.Data[0] == DHCPREQUEST) {
+        data[0] = DHCPACK;
+        if (m_pSink) {
+            m_pSink->OnDhcpAck(pEntry->iaAssigned, idMac);
+        }
+    }
+    else if (dhcpRequest->DHCP.options.Data[0] == DHCPDISCOVER) {
+        data[0] = DHCPOFFER;
+        if (m_pSink) {
+            m_pSink->OnDhcpOffer(pEntry->iaAssigned, idMac);
+        }
+    }
+
+    AddOption(pOptions, DHCP_OPTION_MESSAGE_TYPE, 1, data);
+    if (fIsPxe) {
+        AddOption(pOptions, DHCP_OPTION_SERVER_IDENTIFIER, m_nAddr);
+        if (m_nGate) {
+            AddOption(pOptions, DHCP_OPTION_ROUTER_ADDRESS, m_nGate);
+        }
+        else {
+            // Older PXE implementations (like the Windows Boot Floppy)
+            // won't boot without a router address.
+            AddOption(pOptions, DHCP_OPTION_ROUTER_ADDRESS, m_nAddr);
+        }
+        AddOption(pOptions, DHCP_OPTION_SUBNET_MASK, m_nMask);
+
+        BYTE ClientId[17];
+        ClientId[0] = 0x00;
+        memcpy(ClientId + 1, &guidPxeClientId, sizeof(guidPxeClientId));
+
+        AddOption(pOptions, DHCP_OPTION_PXE_CLIENT_ID, sizeof(ClientId), ClientId);
+        AddOption(pOptions, DHCP_OPTION_CLIENT_CLASS_INFO, 9, (BYTE*)"PXEClient");
+        AddOption(pOptions, DHCP_OPTION_HOST_NAME,
+                  (BYTE)strlen(pEntry->Name), (BYTE*)pEntry->Name);
+        AddOption(pOptions, DHCP_OPTION_COOKIE_SERVERS,
+                  (BYTE)strlen(m_pState->m_szCommand), (BYTE*)m_pState->m_szCommand);
+        AddOption(pOptions, DHCP_OPTION_END, 0, NULL);
+    }
+    else {
+        AddOption(pOptions, DHCP_OPTION_SERVER_IDENTIFIER, m_nAddr);
+        if (m_nGate) {
+            AddOption(pOptions, DHCP_OPTION_ROUTER_ADDRESS, m_nGate);
+        }
+        AddOption(pOptions, DHCP_OPTION_SUBNET_MASK, m_nMask);
+        AddOption(pOptions, DHCP_OPTION_HOST_NAME,
+                  (BYTE)strlen(pEntry->Name), (BYTE*)pEntry->Name);
+        // AddOption(pOptions, DHCP_OPTION_END, 0, NULL);
+    }
+
+    // END OF OPTION ADDITIONS
+
+    // calc size of added options, minus the single option already included
+    UINT32 dwOptionSize = (UINT32)pOptions - (UINT32)&pdhcpReply->DHCP.options;
+    UINT32 dwPacketOutSize = sizeof(*pdhcpReply) + dwOptionSize - 3;
+    // 3 since first option is already included in structure
+
+    // always AF_INET
+    if (nAddr == 0) {
+        nAddr = INADDR_BROADCAST;
+    }
+
+    // broadcast, or use the client specified address for replies
+    if (ntohs(dhcpRequest->flags) & 0x8000) {
+        nAddr = INADDR_BROADCAST;
+    }
+    else {
+        if (dhcpRequest->ciaddr) {
+            nAddr = pEntry->iaLast;
+        }
+        else {
+            nAddr = INADDR_BROADCAST;
+        }
+    }
+#if 0
+    nAddr = INADDR_BROADCAST;
+#endif
+    m_pSink->OnDhcpMessage(nAddr, "<= Reply to %02x-%02x-%02x-%02x-%02x-%02x\n",
+                           ((PBYTE)&pEntry->idMac)[5],
+                           ((PBYTE)&pEntry->idMac)[4],
+                           ((PBYTE)&pEntry->idMac)[3],
+                           ((PBYTE)&pEntry->idMac)[2],
+                           ((PBYTE)&pEntry->idMac)[1],
+                           ((PBYTE)&pEntry->idMac)[0]);
+
+    SocketSend(nAddr, DHCP_CLIENT_PORT, (PBYTE)PacketOut, dwPacketOutSize);
+    goto done;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/dhcpd.h b/base/Windows/bootd/dhcpd.h
new file mode 100644
index 0000000..c32028f
--- /dev/null
+++ b/base/Windows/bootd/dhcpd.h
@@ -0,0 +1,100 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+#pragma once
+#include "hashtab.h"
+#include "socksr.h"
+
+#define DHCP_SERVER_PORT 67
+#define DHCP_CLIENT_PORT 68
+#define PXE_SERVER_PORT 4011
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class CDhcp;
+class CDhcpNode;
+
+class IDhcpSink
+{
+  public:
+    virtual VOID OnDhcpMessage(UINT32 nAddr, PCSTR pszMessage, ...) = 0;
+    virtual VOID OnDhcpSocketError(INT nErr) = 0;
+
+    virtual VOID OnDhcpOffer(UINT32 nAddr, UINT64 idMac) = 0;
+    virtual VOID OnDhcpAck(UINT32 nAddr, UINT64 idMac) = 0;
+};
+
+class CDhcpNode
+{
+  public:
+    friend class CDhcpNode;
+    CDhcpNode();
+
+  public:
+    BOOL    Enabled;
+    CHAR    Name[64];
+
+    UINT64  idMac;
+
+    UINT32  iaLast;                                     // Last known good addr.
+    UINT32  iaAssigned;                                 // Addr we want to assign.
+};
+
+class CDhcpState
+{
+  public:
+    friend class CDhcp;
+
+    CDhcpState();
+    ~CDhcpState();
+
+    VOID    Configure(IDhcpSink *pSink, INT argc, PCHAR *argv);
+
+  public:
+    CDhcpNode *FindMacEntry(UINT64 idMac);
+
+  protected:
+    VOID    CheckMacFlags(CDhcpNode *pMap);
+    BOOL    ReadMacEntries(PCSTR pszFile);
+    BOOL    AddMacEntry(PCSTR psz);
+
+    BOOL    IsPxeDhcpPacket(PBYTE pbPacket, UINT32 cbPacket);
+
+  protected:
+    CHAR    m_szBootFile[MAX_PATH];
+    CHAR    m_szCommand[MAX_PATH];
+    BOOL    m_fQuiet;
+
+    CHashTable64<CDhcpNode*>  m_MacsById;
+    IDhcpSink *m_pSink;
+};
+
+class CDhcp : public CSocketSink
+{
+  public:
+    CDhcp(CDhcp *pNext);
+    ~CDhcp();
+
+    VOID    Configure(UINT32 nAddr, UINT32 nMask, UINT32 nGate,
+                      CDhcpState *pState, IDhcpSink *pSink, UINT16 nPort);
+
+    VOID    OnSocketRecv(UINT dwError,
+                         UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData);
+
+    VOID    OnNetworkChange(UINT32 nAddr, UINT32 nMask, UINT32 nGate);
+    VOID    OnNetworkDelete(UINT32 nAddr, CDhcp **ppNext);
+
+  protected:
+    UINT32  m_nAddr;
+    UINT32  m_nMask;
+    UINT32  m_nGate;
+    UINT16  m_nPort;
+
+    CDhcp *m_pNext;
+    CDhcpState *m_pState;
+    IDhcpSink *m_pSink;
+};
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/hashtab.cpp b/base/Windows/bootd/hashtab.cpp
new file mode 100644
index 0000000..79755d6
--- /dev/null
+++ b/base/Windows/bootd/hashtab.cpp
@@ -0,0 +1,389 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  File:       hashtab.cpp
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Abstract:   Implementation of Template CHashTable64<> and class CHashTable64PVOID.
+//
+//  NOTE: The keys 0 and ~0 are both reserved for internal use.
+//
+
+#pragma once
+
+#include <winlean.h>
+#include "hashtab.h"
+
+//////////////////////////////////////////////////////////////////////////////
+#undef EMPTY
+#undef DELETED
+#define EMPTY       0
+#define DELETED     ~0u
+
+CHashTable32PVOID::CHashTable32PVOID()
+{
+    m_pTable = NULL;
+    m_nSize = 0;
+    m_nValid = 0;
+}
+
+CHashTable32PVOID::CHashTable32PVOID(INT nInitialSize)
+{
+    m_pTable = NULL;
+    m_nSize = 0;
+    m_nValid = 0;
+    Resize(nInitialSize);
+}
+
+CHashTable32PVOID::~CHashTable32PVOID()
+{
+    if (m_pTable) {
+        delete[] m_pTable;
+        m_pTable = NULL;
+    }
+    m_nSize = 0;
+    m_nValid = 0;
+}
+
+CHashTable32PVOID::Entry * CHashTable32PVOID::FindEntry(UINT32 key)
+{
+    if (key == EMPTY || key == DELETED || m_nSize <= 0) {
+        return NULL;
+    }
+
+    INT offset = Offset(key);
+    INT orig_offset = offset;
+
+    for (;;) {
+        if (m_pTable[offset].key == EMPTY) {
+            break;                                      // EMPTY, stop.
+        }
+        else if (m_pTable[offset].key == key) {         // Match, return TRUE
+            if (offset != orig_offset) {                // Increase locality.
+                Swap(m_pTable[offset], m_pTable[orig_offset]);
+                offset = orig_offset;
+            }
+            return &m_pTable[offset];
+        }
+        else {                                          // Not, try next bucket.
+            offset = (offset + 1) % m_nSize;
+        }
+    }
+    return NULL;
+}
+
+PVOID CHashTable32PVOID::Find(UINT32 key)
+{
+    Entry *pEntry = FindEntry(key);
+    return pEntry ? pEntry->value : NULL;
+}
+
+BOOL CHashTable32PVOID::Change(UINT32 key, PVOID value)
+{
+    Entry *pEntry = FindEntry(key);
+    if (pEntry) {
+        pEntry->value = value;
+        return TRUE;
+    }
+    return Insert(key, value);
+}
+
+BOOL CHashTable32PVOID::Insert(UINT32 key, PVOID value)
+{
+    if (key == EMPTY || key == DELETED) {
+        return FALSE;
+    }
+
+    if ((m_nValid + 1) > (m_nSize / 2)) {               // Table is never > 1/2 full!
+        if (m_nSize == 0) {
+            if (!Resize(32))
+                return FALSE;
+        }
+        else {
+            if (!Resize(m_nSize * 2))
+                return FALSE;
+        }
+    }
+
+    INT offset = Offset(key);
+
+    for (;;) {
+        if (m_pTable[offset].key == EMPTY || m_pTable[offset].key == DELETED) {
+            // EMPTY, Insert
+            m_pTable[offset].key = key;
+            m_pTable[offset].value = value;
+            m_nValid++;
+            return TRUE;
+        }
+        else {                                          // Not, try next bucket.
+            offset = (offset + 1) % m_nSize;
+        }
+    }
+    // return FALSE;
+}
+
+BOOL CHashTable32PVOID::Delete(UINT32 key)
+{
+    if (key == EMPTY || key == DELETED) {
+        return FALSE;
+    }
+
+    if (m_nSize == 0) {
+        return FALSE;
+    }
+
+    INT offset = Offset(key);
+
+    // First, find the value.
+    for (;;) {
+        if (m_pTable[offset].key == EMPTY) {            // EMPTY, stop.
+            return FALSE;
+        }
+        else if (m_pTable[offset].key == key) {         // Match, return TRUE
+            m_pTable[offset].key = DELETED;
+            m_pTable[offset].value = 0;
+            m_nValid--;
+            return TRUE;
+        }
+        else {                                          // Not, try next bucket.
+            offset = (offset + 1) % m_nSize;
+        }
+    }
+    // return FALSE;
+}
+
+BOOL CHashTable32PVOID::Resize(INT nNewSize)
+{
+    Entry *pOldTable = m_pTable;
+    INT nOldSize = m_nSize;
+
+    m_pTable = new Entry[nNewSize];
+    if (m_pTable == NULL) {
+        return FALSE;
+    }
+
+    for (INT i = 0; i < nNewSize; i++) {
+        m_pTable[i].key = EMPTY;
+        m_pTable[i].value = 0;
+    }
+
+    m_nSize = nNewSize;
+    m_nValid = 0;
+
+    if (pOldTable) {
+        for (INT i = 0; i < nOldSize; i++) {
+            if (pOldTable[i].key != EMPTY && pOldTable[i].key != DELETED) {
+                Insert(pOldTable[i].key, pOldTable[i].value);
+            }
+        }
+        delete[] pOldTable;
+        pOldTable = NULL;
+    }
+
+    return TRUE;
+}
+
+PVOID CHashTable32PVOID::Enumerate(UINT32& key, INT& nIterator)
+{
+    for (; (INT)nIterator < m_nSize; nIterator++) {
+        if (m_pTable[nIterator].key == EMPTY ||
+            m_pTable[nIterator].key == DELETED) {
+            continue;
+        }
+
+        key = m_pTable[nIterator].key;
+        return m_pTable[nIterator++].value;
+    }
+
+    key = EMPTY;
+    nIterator = 0;
+    return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#undef EMPTY
+#undef DELETED
+#define EMPTY       0
+#define DELETED     ~0uI64
+
+CHashTable64PVOID::CHashTable64PVOID()
+{
+    m_pTable = NULL;
+    m_nSize = 0;
+    m_nValid = 0;
+}
+
+CHashTable64PVOID::CHashTable64PVOID(INT nInitialSize)
+{
+    m_pTable = NULL;
+    m_nSize = 0;
+    m_nValid = 0;
+    Resize(nInitialSize);
+}
+
+CHashTable64PVOID::~CHashTable64PVOID()
+{
+    if (m_pTable) {
+        delete[] m_pTable;
+        m_pTable = NULL;
+    }
+    m_nSize = 0;
+    m_nValid = 0;
+}
+
+CHashTable64PVOID::Entry * CHashTable64PVOID::FindEntry(UINT64 key)
+{
+    if (key == EMPTY || key == DELETED || m_nSize <= 0) {
+        return NULL;
+    }
+
+    INT offset = Offset(key);
+    INT orig_offset = offset;
+
+    for (;;) {
+        if (m_pTable[offset].key == EMPTY) {
+            break;                                      // EMPTY, stop.
+        }
+        else if (m_pTable[offset].key == key) {         // Match, return TRUE
+            if (offset != orig_offset) {                // Increase locality.
+                Swap(m_pTable[offset], m_pTable[orig_offset]);
+                offset = orig_offset;
+            }
+            return &m_pTable[offset];
+        }
+        else {                                          // Not, try next bucket.
+            offset = (offset + 1) % m_nSize;
+        }
+    }
+    return NULL;
+}
+
+PVOID CHashTable64PVOID::Find(UINT64 key)
+{
+    Entry *pEntry = FindEntry(key);
+    return pEntry ? pEntry->value : NULL;
+}
+
+BOOL CHashTable64PVOID::Change(UINT64 key, PVOID value)
+{
+    Entry *pEntry = FindEntry(key);
+    if (pEntry) {
+        pEntry->value = value;
+        return TRUE;
+    }
+    return Insert(key, value);
+}
+
+BOOL CHashTable64PVOID::Insert(UINT64 key, PVOID value)
+{
+    if (key == EMPTY || key == DELETED) {
+        return FALSE;
+    }
+
+    if ((m_nValid + 1) > (m_nSize / 2)) {               // Table is never > 1/2 full!
+        if (m_nSize == 0) {
+            if (!Resize(32))
+                return FALSE;
+        }
+        else {
+            if (!Resize(m_nSize * 2))
+                return FALSE;
+        }
+    }
+
+    INT offset = Offset(key);
+
+    for (;;) {
+
+        if (m_pTable[offset].key == EMPTY || m_pTable[offset].key == DELETED) {
+            // EMPTY, Insert
+            m_pTable[offset].key = key;
+            m_pTable[offset].value = value;
+            m_nValid++;
+            return TRUE;
+        }
+        else {                                          // Not, try next bucket.
+            offset = (offset + 1) % m_nSize;
+        }
+    }
+    // return FALSE;
+}
+
+BOOL CHashTable64PVOID::Delete(UINT64 key)
+{
+    if (key == EMPTY || key == DELETED) {
+        return FALSE;
+    }
+
+    if (m_nSize == 0) {
+        return FALSE;
+    }
+
+    INT offset = Offset(key);
+
+    // First, find the value.
+    for (;;) {
+        if (m_pTable[offset].key == EMPTY) {            // EMPTY, stop.
+            return FALSE;
+        }
+        else if (m_pTable[offset].key == key) {         // Match, return TRUE
+            m_pTable[offset].key = DELETED;
+            m_pTable[offset].value = 0;
+            m_nValid--;
+            return TRUE;
+        }
+        else {                                          // Not, try next bucket.
+            offset = (offset + 1) % m_nSize;
+        }
+    }
+    // return FALSE;
+}
+
+BOOL CHashTable64PVOID::Resize(INT nNewSize)
+{
+    Entry *pOldTable = m_pTable;
+    INT nOldSize = m_nSize;
+
+    m_pTable = new Entry[nNewSize];
+    if (m_pTable == NULL) {
+        return FALSE;
+    }
+
+    for (INT i = 0; i < nNewSize; i++) {
+        m_pTable[i].key = EMPTY;
+        m_pTable[i].value = 0;
+    }
+
+    m_nSize = nNewSize;
+    m_nValid = 0;
+
+    if (pOldTable) {
+        for (INT i = 0; i < nOldSize; i++) {
+            if (pOldTable[i].key != EMPTY && pOldTable[i].key != DELETED) {
+                Insert(pOldTable[i].key, pOldTable[i].value);
+            }
+        }
+        delete[] pOldTable;
+        pOldTable = NULL;
+    }
+
+    return TRUE;
+}
+
+PVOID CHashTable64PVOID::Enumerate(UINT64& key, INT& nIterator)
+{
+    for (; (INT)nIterator < m_nSize; nIterator++) {
+        if (m_pTable[nIterator].key == EMPTY ||
+            m_pTable[nIterator].key == DELETED) {
+            continue;
+        }
+
+        key = m_pTable[nIterator].key;
+        return m_pTable[nIterator++].value;
+    }
+
+    key = EMPTY;
+    nIterator = 0;
+    return NULL;
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/hashtab.h b/base/Windows/bootd/hashtab.h
new file mode 100644
index 0000000..573c57c
--- /dev/null
+++ b/base/Windows/bootd/hashtab.h
@@ -0,0 +1,127 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  File:       hashtab.cpp
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Abstract:   Definition of Template CHashTable64<> and class CHashTable64PVOID.
+//  Abstract:   Definition of Template CHashTable32<> and class CHashTable32PVOID.
+//
+//  NOTE: The keys 0 and ~0 are both reserved for internal use.
+//
+
+#pragma once
+
+//////////////////////////////////////////////////////////////// Base Classes.
+//
+class CHashTable32PVOID
+{
+  public:
+    CHashTable32PVOID();
+    CHashTable32PVOID(INT nInitialSize);
+    ~CHashTable32PVOID();
+
+    BOOL    Insert(UINT32 key, PVOID value);
+    BOOL    Change(UINT32 key, PVOID value);
+    BOOL    Delete(UINT32 key);
+
+    PVOID   Find(UINT32 key);
+    PVOID   Enumerate(UINT32& key, INT& nIterator);
+
+    INT     Count(void) { return m_nValid; }
+
+  protected:
+    struct Entry
+    {
+        UINT32  key;
+        PVOID   value;
+    };
+
+    INT     Offset(UINT32 key) { return (INT)((key*1000000007L)%m_nSize); }
+    VOID    Swap(Entry& a, Entry& b) { Entry t = a; a = b; b = t; }
+    BOOL    Resize(INT nNewSize);
+    Entry * FindEntry(UINT32 key);
+
+  protected:
+    Entry * m_pTable;
+    INT     m_nSize;
+    INT     m_nValid;
+};
+
+class CHashTable64PVOID
+{
+  public:
+    CHashTable64PVOID();
+    CHashTable64PVOID(INT nInitialSize);
+    ~CHashTable64PVOID();
+
+    BOOL    Insert(UINT64 key, PVOID value);
+    BOOL    Change(UINT64 key, PVOID value);
+    BOOL    Delete(UINT64 key);
+
+    PVOID   Find(UINT64 key);
+    PVOID   Enumerate(UINT64& key, INT& nIterator);
+
+    INT     Count(void) { return m_nValid; }
+
+  protected:
+    struct Entry
+    {
+        UINT64  key;
+        PVOID   value;
+    };
+
+    INT     Offset(UINT64 key) { return (INT)((key*1000000007UL)%m_nSize); }
+    VOID    Swap(Entry& a, Entry& b) { Entry t = a; a = b; b = t; }
+    BOOL    Resize(INT nNewSize);
+    Entry * FindEntry(UINT64 key);
+
+  protected:
+    Entry * m_pTable;
+    INT     m_nSize;
+    INT     m_nValid;
+};
+
+/////////////////////////////////////////////////////////////////// Templates.
+//
+template<class T> class CHashTable32 : public CHashTable32PVOID
+{
+  public:
+    CHashTable32()
+        : CHashTable32PVOID() {}
+    CHashTable32(INT nInitialSize)
+        : CHashTable32PVOID(nInitializeSize) {}
+
+    BOOL Insert(UINT32 key, T value)
+    { return CHashTable32PVOID::Insert(key, (PVOID)value); }
+
+    BOOL Change(UINT32 key, T value)
+    { return CHashTable32PVOID::Change(key, (PVOID)value); }
+
+    T Find(UINT32 key)
+    { return (T)CHashTable32PVOID::Find(key); }
+
+    T Enumerate(UINT32& key, INT& nIterator)
+    { return (T)CHashTable32PVOID::Enumerate(key, nIterator); }
+};
+
+template<class T> class CHashTable64 : public CHashTable64PVOID
+{
+  public:
+    CHashTable64()
+        : CHashTable64PVOID() {}
+    CHashTable64(INT nInitialSize)
+        : CHashTable64PVOID(nInitializeSize) {}
+
+    BOOL Insert(UINT64 key, T value)
+    { return CHashTable64PVOID::Insert(key, (PVOID)value); }
+
+    BOOL Change(UINT64 key, T value)
+    { return CHashTable64PVOID::Change(key, (PVOID)value); }
+
+    T Find(UINT64 key)
+    { return (T)CHashTable64PVOID::Find(key); }
+
+    T Enumerate(UINT64& key, INT& nIterator)
+    { return (T)CHashTable64PVOID::Enumerate(key, nIterator); }
+};
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/socksr.cpp b/base/Windows/bootd/socksr.cpp
new file mode 100644
index 0000000..7898b7e
--- /dev/null
+++ b/base/Windows/bootd/socksr.cpp
@@ -0,0 +1,853 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//
+//
+#include <winlean.h>
+#include <winsock.h>
+#include <iphlpapi.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "socksr.h"
+#include "hashtab.h"
+
+#define ARRAYOF(x)      (sizeof(x)/sizeof(x[0]))
+#define ASSERT(a)       assert(a)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+// Linked list of networks.  Sorted from low to high by address.
+static CNetwork *s_pNetworks = NULL;
+
+// Get all of the available networks.  Returns true if the list of networks
+// has changed.
+// ISSUE: Currently only adds, doesn't remove.
+static int __cdecl cmpIpAddrRow(const void *fvp, const void *svp)
+{
+    const PMIB_IPADDRROW fp = (const PMIB_IPADDRROW)fvp;
+    const PMIB_IPADDRROW sp = (const PMIB_IPADDRROW)svp;
+
+    if (fp->dwAddr < sp->dwAddr) {
+        return -1;
+    }
+    else if (fp->dwAddr > sp->dwAddr) {
+        return 1;
+    }
+    return 0;
+}
+
+static int __cdecl cmpIpForwardRow(const void *fvp, const void *svp)
+{
+    const PMIB_IPFORWARDROW fp = (const PMIB_IPFORWARDROW)fvp;
+    const PMIB_IPFORWARDROW sp = (const PMIB_IPFORWARDROW)svp;
+
+    if (fp->dwForwardIfIndex < sp->dwForwardIfIndex) {
+        return -1;
+    }
+    else if (fp->dwForwardIfIndex > sp->dwForwardIfIndex) {
+        return 1;
+    }
+    if (fp->dwForwardNextHop < sp->dwForwardNextHop) {
+        return -1;
+    }
+    else if (fp->dwForwardNextHop > sp->dwForwardNextHop) {
+        return 1;
+    }
+    return 0;
+}
+
+PCSTR SocketToString(UINT32 dwAddr)
+{
+    static CHAR rszAddrs[16][32];
+    static int nAddrs = 0;
+
+    CHAR *pszAddr = rszAddrs[nAddrs];
+    nAddrs = (nAddrs + 1) % ARRAYOF(rszAddrs);
+
+    sprintf(pszAddr, "%d.%d.%d.%d",
+            (dwAddr >> 24) & 0xff,
+            (dwAddr >> 16) & 0xff,
+            (dwAddr >>  8) & 0xff,
+            (dwAddr >>  0) & 0xff);
+    return pszAddr;
+}
+
+
+BOOL SocketLoadNetworks(CNetwork ** ppNetworks)
+{
+#if 0
+    PMIB_IFTABLE pIfTable = NULL;
+#endif
+    PMIB_IPADDRTABLE pIpAddrTable = NULL;
+    PMIB_IPFORWARDTABLE pIpForwardTable = NULL;
+#if 0
+    ULONG cbIfTable = 0;
+#endif
+    ULONG cbIpAddrTable = 0;
+    ULONG cbIpForwardTable = 0;
+#if 0
+    ULONG nIfTable = 0;
+#endif
+    ULONG nIpAddrTable = 0;
+    ULONG nIpForwardTable = 0;
+    DWORD err = 0;
+    BOOL fChanged = FALSE;
+
+    // Retrieve the address and forwarding tables.
+    //
+    for (;;) {
+        err = GetIpAddrTable(pIpAddrTable, &cbIpAddrTable, FALSE);
+        if (err == NO_ERROR) {
+            break;
+        }
+        if (pIpAddrTable != NULL) {
+            delete[] (PUINT8)pIpAddrTable;
+            pIpAddrTable = NULL;
+        }
+        if (err != ERROR_INSUFFICIENT_BUFFER) {
+            break;
+        }
+
+        pIpAddrTable = (PMIB_IPADDRTABLE)new UINT8 [cbIpAddrTable];
+    }
+
+    for (;;) {
+        err = GetIpForwardTable(pIpForwardTable, &cbIpForwardTable, FALSE);
+        if (err == NO_ERROR) {
+            break;
+        }
+        if (pIpForwardTable != NULL) {
+            delete[] (PUINT8)pIpForwardTable;
+            pIpForwardTable = NULL;
+        }
+        if (err != ERROR_INSUFFICIENT_BUFFER) {
+            break;
+        }
+
+        pIpForwardTable = (PMIB_IPFORWARDTABLE)new UINT8 [cbIpForwardTable];
+    }
+
+#if 0
+    for (;;) {
+        err = GetIfTable(pIfTable, &cbIfTable, TRUE);
+        if (err == NO_ERROR) {
+            break;
+        }
+        if (pIfTable != NULL) {
+            delete[] (PUINT8)pIfTable;
+            pIfTable = NULL;
+        }
+        if (err != ERROR_INSUFFICIENT_BUFFER) {
+            break;
+        }
+
+        pIfTable = (PMIB_IFTABLE)new UINT8 [cbIfTable];
+        nIfTable = pIfTable->dwNumEntries;
+    }
+#endif
+
+    // Sort the tables.
+    //
+    if (pIpAddrTable) {
+        for (DWORD n = 0; n < pIpAddrTable->dwNumEntries; n++) {
+            pIpAddrTable->table[n].dwAddr
+                = ntohl(pIpAddrTable->table[n].dwAddr);
+            pIpAddrTable->table[n].dwMask
+                = ntohl(pIpAddrTable->table[n].dwMask);
+            pIpAddrTable->table[n].dwBCastAddr
+                = ntohl(pIpAddrTable->table[n].dwBCastAddr);
+        }
+        qsort(pIpAddrTable->table,
+              pIpAddrTable->dwNumEntries,
+              sizeof(pIpAddrTable->table[0]),
+              cmpIpAddrRow);
+        nIpAddrTable = pIpAddrTable->dwNumEntries;
+    }
+
+    if (pIpForwardTable) {
+        for (DWORD n = 0; n < pIpForwardTable->dwNumEntries; n++) {
+            pIpForwardTable->table[n].dwForwardDest
+                = ntohl(pIpForwardTable->table[n].dwForwardDest);
+            pIpForwardTable->table[n].dwForwardMask
+                = ntohl(pIpForwardTable->table[n].dwForwardMask);
+            pIpForwardTable->table[n].dwForwardNextHop
+                = ntohl(pIpForwardTable->table[n].dwForwardNextHop);
+        }
+        qsort(pIpForwardTable->table,
+              pIpForwardTable->dwNumEntries,
+              sizeof(pIpForwardTable->table[0]),
+              cmpIpForwardRow);
+        nIpForwardTable = pIpForwardTable->dwNumEntries;
+    }
+
+#if 0
+    if (pIfTable) {
+        for (DWORD n = 0; n < nIfTable; n++) {
+            printf("%7d. %ls\n",
+                   pIfTable->table[n].dwIndex,
+                   pIfTable->table[n].wszName);
+        }
+    }
+#endif
+
+    // Normalize the list, delete any fDeleted entries.
+    //
+    CNetwork **pNetworkLast = &s_pNetworks;
+    CNetwork *pNetwork = s_pNetworks;
+
+    while (pNetwork != NULL) {
+        if (pNetwork->fDeleted) {
+            *pNetworkLast = pNetwork->pNext;
+
+            delete pNetwork;
+            pNetwork = *pNetworkLast;
+        }
+        else {
+            pNetwork->fCreated = FALSE;
+            pNetwork->fDeleted = FALSE;
+            pNetwork->fChanged = FALSE;
+
+            pNetworkLast = &pNetwork->pNext;
+            pNetwork = pNetwork->pNext;
+        }
+    }
+
+    // Walk through the tables, updating the persistent linked list.
+    //
+    pNetworkLast = &s_pNetworks;
+    pNetwork = s_pNetworks;
+
+#if 0
+    printf("---------------------------------------------------------------------------\n");
+    for (DWORD n = 0; n < nIpAddrTable; n++) {
+        printf("                 %5d: %-15.15s -%15.15s\n",
+               pIpAddrTable->table[n].dwIndex,
+               SocketToString(pIpAddrTable->table[n].dwAddr),
+               SocketToString(pIpAddrTable->table[n].dwMask));
+    }
+#endif
+
+    for (DWORD n = 0; n < nIpAddrTable;) {
+        UINT32 nAddr = 0;
+        UINT32 nMask = 0;
+        UINT32 nCast = 0;
+        UINT32 nGate = 0;
+
+        if (pIpAddrTable->table[n].dwAddr == 0 ||
+            (pIpAddrTable->table[n].dwAddr & 0xff000000) == 0x7f000000) {
+
+            // Drop 0 networks and 127.*.*.*, the local loopback.
+            n++;
+            continue;
+        }
+
+        nAddr = pIpAddrTable->table[n].dwAddr;
+        nMask = pIpAddrTable->table[n].dwMask;
+        nCast = (nMask & nAddr) | ~nMask;
+
+        for (DWORD f = 0; f < nIpForwardTable; f++) {
+            if (pIpForwardTable->table[f].dwForwardIfIndex
+                == pIpAddrTable->table[n].dwIndex &&
+                pIpForwardTable->table[f].dwForwardNextHop
+                != pIpAddrTable->table[n].dwAddr
+               ) {
+
+                nGate = pIpForwardTable->table[f].dwForwardNextHop;
+                break;
+            }
+        }
+
+#if 0
+        MIB_IFROW interface;
+        memset(&interface, 0, sizeof(interface));
+        interface.dwIndex = pIpAddrTable->table[n].dwIndex;
+
+        err = GetIfEntry(&interface);
+        if (err == NO_ERROR) {
+            printf("Interface %d: %ls %s %04x%04x MTU=%d\n",
+                   interface.dwIndex, interface.wszName, interface.wszName,
+                   interface.wszName[0], interface.wszName[1],
+                   interface.dwMtu);
+            printf("    %.*s\n",
+                   interface.dwDescrLen, interface.bDescr);
+        }
+#endif
+
+        // At this point, we have a valid external address
+        //
+        if (pNetwork && pNetwork->nAddr == nAddr) {
+            // The network was known...
+            // Update the flags, and move both list and table to the
+            // next network.
+
+#if 0
+            printf("Existed: %s\n", SocketToString(nAddr));
+#endif
+            // If it was previously deleted, then it has been re-created.
+            pNetwork->fCreated = pNetwork->fDeleted;
+            pNetwork->fChanged = pNetwork->fDeleted;
+            pNetwork->fDeleted = FALSE;
+
+            if (pNetwork->nMask != nMask ||
+                pNetwork->nCast != nCast ||
+                pNetwork->nGate != nGate) {
+
+                pNetwork->nMask = nMask;
+                pNetwork->nCast = nCast;
+                pNetwork->nGate = nGate;
+
+                pNetwork->fChanged = TRUE;
+            }
+
+            if (pNetwork->fCreated ||
+                pNetwork->fDeleted ||
+                pNetwork->fChanged) {
+
+                fChanged = TRUE;
+            }
+
+            pNetworkLast = &pNetwork->pNext;
+            pNetwork = pNetwork->pNext;
+            n++;
+            continue;
+        }
+        else if (pNetwork == NULL || pNetwork->nAddr > nAddr) {
+            // The table network is new...
+
+#if 0
+            printf("Created: %s\n", SocketToString(nAddr));
+#endif
+            CNetwork *pNew = new CNetwork;
+            if (pNew != NULL) {
+                pNew->pNext = pNetwork;
+                pNew->nAddr = nAddr;
+                pNew->nMask = nMask;
+                pNew->nCast = nCast;
+                pNew->nGate = nGate;
+                pNew->fCreated = TRUE;
+                pNew->fDeleted = FALSE;
+                pNew->fChanged = FALSE;
+                fChanged = TRUE;
+
+                *pNetworkLast = pNew;
+                pNetworkLast = &pNew->pNext;
+            }
+#if 0
+            else {
+                printf("Couldn't create: %s\n", SocketToString(nAddr));
+            }
+#endif
+            n++;
+            continue;
+        }
+        else if (pNetwork->nAddr < nAddr) {
+            // The list network was deleted...
+
+#if 0
+            printf("Deleted: %s\n", SocketToString(nAddr));
+#endif
+            pNetwork->fCreated = FALSE;
+            pNetwork->fDeleted = TRUE;
+            pNetwork->fChanged = FALSE;
+            fChanged = TRUE;
+
+            pNetworkLast = &pNetwork->pNext;
+            pNetwork = pNetwork->pNext;
+            continue;
+        }
+        else {
+            ASSERT(!"Untested case.");
+        }
+    }
+
+    while (pNetwork != NULL) {
+        // The list network was deleted...
+
+#if 0
+        printf("Deleted: %s\n", SocketToString(nAddr));
+#endif
+        pNetwork->fCreated = FALSE;
+        pNetwork->fDeleted = TRUE;
+        pNetwork->fChanged = FALSE;
+        fChanged = TRUE;
+
+        pNetworkLast = &pNetwork->pNext;
+        pNetwork = pNetwork->pNext;
+        continue;
+    }
+
+#if 0
+    printf("------------------------------------------------------------------------------\n");
+    for (pNetwork = s_pNetworks; pNetwork != NULL; pNetwork = pNetwork->pNext) {
+        printf("    %-15.15s: %-15.15s %-15.15s %-15.15s %s%s%s\n",
+               SocketToString(pNetwork->nAddr),
+               SocketToString(pNetwork->nMask),
+               SocketToString(pNetwork->nCast),
+               SocketToString(pNetwork->nGate),
+               pNetwork->fCreated ? "Created " : "",
+               pNetwork->fDeleted ? "Deleted " : "",
+               pNetwork->fChanged ? "Changed " : "");
+    }
+#endif
+
+
+    if (pIpAddrTable != NULL) {
+        delete[] (PUINT8)pIpAddrTable;
+        pIpAddrTable = NULL;
+    }
+    if (pIpForwardTable != NULL) {
+        delete[] (PUINT8)pIpForwardTable;
+        pIpForwardTable = NULL;
+    }
+    if (ppNetworks) {
+        *ppNetworks = s_pNetworks;
+    }
+    return FALSE;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+struct CSocketSource : public ISocketSource
+{
+    CSocketSource(ISocketSink *pSink);
+    ~CSocketSource();
+
+    // ISocketSource
+  public:
+    virtual UINT    SocketSend(UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData);
+    virtual UINT    SocketClose(UINT dwError);
+
+  public:
+    VOID OnRecv();
+
+    SOCKET          m_nSocket;
+    ISocketSink *   m_pSink;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static HWND             s_hWnd;                         // Host Window
+static UINT             s_nMsg;                         // Host Event
+static CHashTable32<CSocketSource*> s_Sockets;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+CSocketSource::CSocketSource(ISocketSink *pSink)
+    : m_nSocket(0),
+      m_pSink(pSink)
+{
+}
+
+CSocketSource::~CSocketSource()
+{
+    if (m_pSink)
+    {
+        ISocketSink *pSink = m_pSink;
+        m_pSink = NULL;
+        pSink->OnSocketClose(0);
+    }
+    if (m_nSocket)
+    {
+        closesocket(m_nSocket);
+        m_nSocket = 0;
+    }
+}
+
+UINT CSocketSource::SocketSend(UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData)
+{
+    // Fill out server socket's address information.
+    SOCKADDR_IN server_sin;
+    server_sin.sin_family = AF_INET;
+    server_sin.sin_port = htons(nPort);
+    server_sin.sin_addr.s_addr = htonl(nAddr);
+
+    int iRes = sendto(m_nSocket, (const char *)pbData, cbData,
+                      0, (struct sockaddr FAR *) &server_sin, sizeof(server_sin));
+    return (SOCKET_ERROR == iRes) ? WSAGetLastError() : 0;
+}
+
+VOID CSocketSource::OnRecv()
+{
+    SOCKADDR_IN from;
+    int fromlen = sizeof(from);
+
+    BYTE rbData[2048];
+    int iRes = recvfrom(m_nSocket, (char *)rbData, sizeof(rbData), 0,
+                        (struct sockaddr *)&from, &fromlen);
+    int nErr = (iRes == SOCKET_ERROR) ? WSAGetLastError() : 0;
+
+    if (nErr == WSAECONNRESET || nErr == WSAEWOULDBLOCK) {
+        // Lost a packet.  Don't worry about it.
+    }
+    else {
+        m_pSink->OnSocketRecv(nErr,
+                              ntohl(from.sin_addr.s_addr),
+                              ntohs(from.sin_port),
+                              rbData,
+                              iRes);
+    }
+}
+
+UINT CSocketSource::SocketClose(UINT dwError)
+{
+    if (m_pSink)
+    {
+        ISocketSink *pSink = m_pSink;
+        m_pSink = NULL;
+
+        s_Sockets.Delete(m_nSocket);
+        pSink->OnSocketClose(dwError);
+        delete this;
+    }
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+VOID SocketInit(HWND hWnd, UINT nMsg)
+{
+    s_hWnd = hWnd;
+    s_nMsg = nMsg;
+}
+
+LRESULT SocketEvent(WPARAM wParam, LPARAM lParam)
+{
+    WORD wSelectError = HIWORD(lParam);
+    WORD wSelectEvent = LOWORD(lParam);
+    DWORD dwSocket = wParam;
+
+    (void)wSelectError;
+
+    CSocketSource *pSource = s_Sockets.Find(dwSocket);
+    if (pSource == NULL) {
+        return 0;
+    }
+
+    if (wSelectEvent & FD_READ) {
+        pSource->OnRecv();
+    }
+    return 0;
+}
+
+UINT SocketCreate(UINT32 nLocalAddr, UINT16 wLocalPort, ISocketSink *pSink)
+{
+    SOCKET s = INVALID_SOCKET;
+    CSocketSource *pSource = NULL;
+    UINT nError;
+    int iRes;
+
+    if (pSink == NULL) {
+        nError = (UINT)E_INVALIDARG;
+      Error:
+        if (pSource) {
+            delete pSource;
+            pSource = NULL;
+        }
+        if (s != INVALID_SOCKET) {
+            closesocket(s);
+            s = INVALID_SOCKET;
+        }
+        return nError;
+    }
+
+    if ((pSource = new CSocketSource(pSink)) == NULL) {
+        nError = (UINT)E_OUTOFMEMORY;
+        goto Error;
+    }
+
+    // Create a datagram window socket.
+    s = socket(AF_INET, SOCK_DGRAM, 0);
+    if (INVALID_SOCKET == s) {
+      SocketError:
+        nError = WSAGetLastError();
+        goto Error;
+    }
+
+    // allow broadcasts on this socket
+    BOOL optBOOL = TRUE;
+    iRes = setsockopt(s, SOL_SOCKET, SO_BROADCAST,
+                      (char *)&optBOOL, sizeof(optBOOL));
+    if (0 != iRes) {
+        goto SocketError;
+    }
+
+    // Fill out the client socket's address information.
+    SOCKADDR_IN client_sin;
+    client_sin.sin_family = AF_INET;
+    client_sin.sin_port = htons(wLocalPort);
+    client_sin.sin_addr.s_addr = htonl(nLocalAddr);
+
+    // Associate the client socket's address with the socket, Sock.
+    iRes = bind(s, (LPSOCKADDR)&client_sin, sizeof(client_sin));
+    if (0 != iRes) {
+        goto SocketError;
+    }
+
+    // Set the socket as NON-BLOCKING.
+    DWORD ioctlVal = TRUE;
+    iRes = ioctlsocket(s, FIONBIO, &ioctlVal);
+    if (SOCKET_ERROR == iRes) {
+        goto SocketError;
+    }
+
+    // Set windows for async event..
+    iRes = WSAAsyncSelect(s, s_hWnd, s_nMsg,
+                          FD_READ | FD_WRITE | FD_OOB | FD_ACCEPT | FD_CONNECT);
+    if (SOCKET_ERROR == iRes) {
+        goto SocketError;
+    }
+
+    pSource->m_nSocket = s;
+
+#if 0
+    {
+        // Fill out server socket's address information.
+        SOCKADDR_IN server_sin;
+        server_sin.sin_family = AF_INET;
+        server_sin.sin_port = htons(4011);
+        server_sin.sin_addr.s_addr = 0xffffffff;
+
+        sendto(s, "OpenPort", 8,
+               0, (struct sockaddr FAR *) &server_sin, sizeof(server_sin));
+    }
+#endif
+
+    s_Sockets.Insert(s, pSource);
+
+    pSink->OnSocketCreate(pSource);
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static inline UINT64 MakeId(UINT32 nAddr, UINT16 nPort) {
+    return (UINT64)nAddr | ((UINT64)nPort << 32);
+}
+
+struct CSocketFactory : public ISocketSink,
+                        public ISessionFactorySource
+{
+    friend struct CSocketSession;
+
+    struct CSocketSession : public ISessionSource
+    {
+        CSocketSession(CSocketFactory *pOwner,
+                       UINT32 nPeerAddr,
+                       UINT16 nPeerPort)
+            : m_pOwner(pOwner),
+              m_nPeerAddr(nPeerAddr),
+              m_nPeerPort(nPeerPort),
+              m_pSink(NULL)
+        {
+        }
+        ~CSocketSession()
+        {
+            if (m_pSink)
+            {
+                ISessionSink *pSink = m_pSink;
+                m_pSink = NULL;
+                pSink->OnSessionClose(0);
+            }
+        }
+
+        // ISessionSource
+      public:
+        virtual UINT    SessionSend(PBYTE pbData, UINT cbData)
+        {
+            return m_pOwner->SocketSend(m_nPeerAddr, m_nPeerPort, pbData, cbData);
+        }
+
+        virtual UINT    SessionClose(UINT dwError)
+        {
+            if (m_pSink) {
+                ISessionSink *pSink = m_pSink;
+                m_pSink = NULL;
+
+                m_pOwner->m_Sessions.Delete(MakeId(m_nPeerAddr, m_nPeerPort));
+                pSink->OnSessionClose(dwError);
+            }
+            return 0;
+        }
+
+      public:
+        VOID OnRecv(UINT dwError, PBYTE pbData, UINT cbData)
+        {
+            if (m_pSink)
+            {
+                m_pSink->OnSessionRecv(dwError, pbData, cbData);
+            }
+        }
+
+        CSocketFactory *m_pOwner;
+        UINT32          m_nPeerAddr;
+        UINT16          m_nPeerPort;
+        ISessionSink *  m_pSink;
+    };
+
+    //
+  public:
+    CSocketFactory(ISessionFactorySink *pSink)
+        : m_pSource(NULL),
+          m_pSink(pSink)
+    {
+    }
+
+    ~CSocketFactory()
+    {
+        DoFactoryClose(0);
+    }
+
+    BOOL DoFactoryClose(UINT dwError)
+    {
+        if (m_pSink)
+        {
+            ISessionFactorySink *pSink = m_pSink;
+            m_pSink = NULL;
+
+            CSocketSession *pSession;
+            UINT64 nKey;
+
+            for (INT nIt = 0; (pSession = m_Sessions.Enumerate(nKey, nIt)) != NULL;) {
+                pSession->SessionClose(dwError);
+                pSession = NULL;
+                // Sessions delete themselves from the m_Sessions.
+            }
+            pSink->OnFactoryClose(dwError);
+
+            if (m_pSource) {
+                ISocketSource *pSource = m_pSource;
+                m_pSource = NULL;
+
+                pSource->SocketClose(0);
+            }
+            return TRUE;
+        }
+        return FALSE;
+    }
+
+    // ISessionFactorySource
+  public:
+    virtual UINT    FactorySend(UINT32 nAddr, UINT16 nPort,
+                                PBYTE pbData, UINT cbData)
+    {
+        return m_pSource->SocketSend(nAddr, nPort, pbData, cbData);
+    }
+
+    virtual UINT    FactoryClose()
+    {
+        if (DoFactoryClose(0)) {
+            delete this;
+        }
+        return 0;
+    }
+
+    virtual UINT    FactorySessionCreate(UINT32 nPeerAddr,
+                                         UINT16 nPeerPort,
+                                         ISessionSink **ppSink,
+                                         PVOID pvContext)
+    {
+        // Are we shutting down?
+        if (m_pSink == NULL) {
+            return (UINT)E_PENDING;
+        }
+        if (ppSink == NULL) {
+            return (UINT)E_INVALIDARG;
+        }
+
+        CSocketSession *pSession = m_Sessions.Find(MakeId(nPeerAddr, nPeerPort));
+        if (m_Sessions.Find(MakeId(nPeerAddr, nPeerPort))) {
+            pSession->SessionClose((UINT)E_ABORT);
+            pSession = NULL;
+
+            printf("FactorySessionCreate: closed existing session.\n");
+
+            // return (UINT)E_ABORT;
+        }
+
+        pSession = new CSocketSession(this, nPeerAddr, nPeerPort);
+        if (pSession == NULL) {
+            return (UINT)E_OUTOFMEMORY;
+        }
+
+        m_pSink->OnSessionCreate(nPeerAddr, nPeerPort, pSession, ppSink, pvContext);
+        if (*ppSink == NULL) {
+            delete pSession;
+            return 1;
+        }
+        pSession->m_pSink = *ppSink;
+
+        m_Sessions.Insert(MakeId(nPeerAddr, nPeerPort), pSession);
+        (*ppSink)->OnSessionCreate(pSession, pvContext);
+
+        return 0;
+    }
+
+    // ISocketSink
+  public:
+    virtual VOID    OnSocketCreate(ISocketSource *pSource)
+    {
+        m_pSource = pSource;
+        m_pSink->OnFactoryCreate(this);
+    }
+
+    virtual VOID    OnSocketClose(UINT dwError)
+    {
+        if (DoFactoryClose(dwError)) {
+            delete this;
+        }
+    }
+
+    virtual VOID    OnSocketRecv(UINT dwError,
+                                 UINT32 nAddr, UINT16 nPort,
+                                 PBYTE pbData, UINT cbData)
+    {
+        CSocketSession *pSession = m_Sessions.Find(MakeId(nAddr, nPort));
+        if (pSession) {
+            pSession->OnRecv(dwError, pbData, cbData);
+        }
+        else {
+            m_pSink->OnFactoryRecv(dwError, nAddr, nPort, pbData, cbData);
+        }
+    }
+
+    UINT    SocketSend(UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData)
+    {
+        return m_pSource->SocketSend(nAddr, nPort, pbData, cbData);
+    }
+
+  public:
+    ISessionFactorySink *           m_pSink;
+    ISocketSource *                 m_pSource;
+    CHashTable64<CSocketSession*>   m_Sessions;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////// UDP Sessions.
+//////////////////////////////////////////////////////////////////////////////
+
+UINT SessionFactoryCreate(UINT32 nLocalAddr, UINT16 nLocalPort,
+                          ISessionFactorySink *pFactorySink)
+{
+    CSocketFactory *pFactory = new CSocketFactory(pFactorySink);
+    if (pFactory == NULL) {
+        return (UINT)E_OUTOFMEMORY;
+    }
+
+    UINT nError = SocketCreate(nLocalAddr, nLocalPort, pFactory);
+
+    if (nError != 0) {
+        delete pFactory;
+    }
+    return nError;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/socksr.h b/base/Windows/bootd/socksr.h
new file mode 100644
index 0000000..09ffd2c
--- /dev/null
+++ b/base/Windows/bootd/socksr.h
@@ -0,0 +1,294 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+#pragma once
+
+#ifndef UINT16
+#define INT16   SHORT
+#define UINT16  USHORT
+#define UINT8   BYTE
+#define PINT16  PSHORT
+#define PUINT16 PUSHORT
+#define PUINT8  PBYTE
+#endif
+
+#pragma warning(disable: 4512)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class ITimerSink
+{
+  public:
+    virtual VOID OnTimerFired(VOID) = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+struct CNetwork
+{
+    CNetwork *  pNext;
+    UINT32      nAddr;
+    UINT32      nMask;
+    UINT32      nCast;
+    UINT32      nGate;
+    BOOL        fCreated;           // Updated on SocketLoadNetworks.
+    BOOL        fChanged;           // Updated on SocketLoadNetworks.
+    BOOL        fDeleted;           // Updated on SocketLoadNetworks.
+};
+
+///////////////////////////////////////////////////////////////// UDP Sockets.
+//
+class ISocketSource
+{
+  public:
+    virtual UINT    SocketSend(UINT32 nAddr,
+                               UINT16 nPort,
+                               PBYTE pbData,
+                               UINT cbData) = 0;
+
+    virtual UINT    SocketClose(UINT dwError) = 0;
+};
+
+class ISocketSink
+{
+  public:
+    virtual VOID    OnSocketCreate(ISocketSource *pSource) = 0;
+
+    virtual VOID    OnSocketRecv(UINT dwError,
+                                 UINT32 nAddr,
+                                 UINT16 nPort,
+                                 PBYTE pbData,
+                                 UINT cbRcvd) = 0;
+
+    virtual VOID    OnSocketClose(UINT dwError) = 0;
+};
+
+//////////////////////////////////////////////////////////////////// Sessions.
+//
+class ISessionSource
+{
+  public:
+    virtual UINT    SessionSend(PBYTE pbData, UINT cbData) = 0;
+    virtual UINT    SessionClose(UINT dwError) = 0;
+};
+
+class ISessionSink
+{
+  public:
+    virtual VOID    OnSessionCreate(ISessionSource *pSource,
+                                    PVOID pvContext) = 0;
+
+    virtual VOID    OnSessionRecv(UINT dwError,
+                                  PBYTE pbData,
+                                  UINT cbRcvd) = 0;
+
+    virtual VOID    OnSessionClose(UINT dwError) = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class ISessionFactorySource
+{
+  public:
+    virtual UINT    FactorySessionCreate(UINT32 nPeerAddr,
+                                         UINT16 nPeerPort,
+                                         ISessionSink **ppSink,
+                                         PVOID pvContext) = 0;
+
+    virtual UINT    FactorySend(UINT32 nAddr,
+                                UINT16 nPort,
+                                PBYTE pbData,
+                                UINT cbData) = 0;
+
+    virtual UINT    FactoryClose() = 0;
+};
+
+class ISessionFactorySink
+{
+  public:
+    virtual VOID    OnFactoryCreate(ISessionFactorySource *pFactorySource) = 0;
+
+    virtual VOID    OnFactoryRecv(UINT dwError,
+                                  UINT32 nAddr,
+                                  UINT16 nPort,
+                                  PBYTE pbData,
+                                  UINT cbRcvd) = 0;
+
+    virtual VOID    OnFactoryClose(UINT dwError) = 0;
+
+    virtual VOID    OnSessionCreate(UINT32 nPeerAddr,
+                                    UINT16 nPeerPort,
+                                    ISessionSource *pSource,
+                                    ISessionSink **ppSink,
+                                    PVOID pvContext) = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class CSocketSink : public ISocketSink
+{
+  public:
+    CSocketSink()
+        : m_pSource(NULL)
+    {
+    }
+
+    ~CSocketSink()
+    {
+        if (m_pSource) {
+            m_pSource->SocketClose(0);
+            m_pSource = NULL;
+        }
+    }
+
+    virtual VOID    OnSocketCreate(ISocketSource *pSource)
+    {
+        m_pSource = pSource;
+    }
+
+    virtual VOID    OnSocketClose(UINT dwError)
+    {
+        (void)dwError;
+        m_pSource = NULL;
+    }
+
+    virtual VOID    OnSocketRecv(UINT dwError,
+                                 UINT32 nAddr, UINT16 nPort,
+                                 PBYTE pbData, UINT cbData) = 0;
+
+    UINT    SocketSend(UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData)
+    {
+        return m_pSource->SocketSend(nAddr, nPort, pbData, cbData);
+    }
+
+  public:
+    ISocketSource * m_pSource;
+};
+
+class CSessionSink : public ISessionSink
+{
+  public:
+    CSessionSink()
+        : m_pSource(NULL)
+    {
+    }
+
+    ~CSessionSink()
+    {
+        if (m_pSource) {
+            m_pSource->SessionClose(0);
+            m_pSource = NULL;
+        }
+    }
+
+    virtual VOID    OnSessionCreate(ISessionSource *pSource, PVOID pvContext)
+    {
+        (void)pvContext;
+
+        m_pSource = pSource;
+    }
+
+    virtual VOID    OnSessionClose(UINT dwError)
+    {
+        (void)dwError;
+        m_pSource = NULL;
+    }
+
+    virtual VOID    OnSessionRecv(UINT dwError, PBYTE pbData, UINT cbData) = 0;
+
+    UINT    SessionSend(PBYTE pbData, UINT cbData)
+    {
+        return m_pSource->SessionSend(pbData, cbData);
+    }
+
+  public:
+    ISessionSource * m_pSource;
+};
+
+class CSessionFactorySink : public ISessionFactorySink
+{
+  public:
+    CSessionFactorySink()
+        : m_pFactorySource(NULL)
+    {
+    }
+
+    ~CSessionFactorySink()
+    {
+        if (m_pFactorySource) {
+            m_pFactorySource->FactoryClose();
+            m_pFactorySource = NULL;
+        }
+    }
+
+    // ISessionFactorySink
+  public:
+    virtual VOID    OnFactoryCreate(ISessionFactorySource *pFactorySource)
+    {
+        m_pFactorySource = pFactorySource;
+    }
+
+    virtual VOID    OnFactoryRecv(UINT dwError,
+                                  UINT32 nAddr,
+                                  UINT16 nPort,
+                                  PBYTE pbData,
+                                  UINT cbRcvd) = 0;
+
+    virtual VOID    OnFactoryClose(UINT dwError)
+    {
+        (void)dwError;
+        m_pFactorySource = NULL;
+    }
+
+    virtual VOID    OnSessionCreate(UINT32 nPeerAddr,
+                                    UINT16 nPeerPort,
+                                    ISessionSource *pSource,
+                                    ISessionSink **ppSink,
+                                    PVOID pvContext) = 0;
+
+    UINT    FactorySessionCreate(UINT32 nPeerAddr,
+                                 UINT16 nPeerPort,
+                                 ISessionSink **ppSink,
+                                 PVOID pvContext)
+    {
+        return m_pFactorySource->FactorySessionCreate(nPeerAddr, nPeerPort,
+                                                      ppSink, pvContext);
+    }
+
+    UINT    FactorySend(UINT32 nAddr,
+                        UINT16 nPort,
+                        PBYTE pbData,
+                        UINT cbData)
+    {
+        return m_pFactorySource->FactorySend(nAddr, nPort, pbData, cbData);
+    }
+
+    UINT    FactoryClose()
+    {
+        return m_pFactorySource->FactoryClose();
+    }
+
+  public:
+    ISessionFactorySource * m_pFactorySource;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+BOOL    TimerSet(ITimerSink *pTimerSink, UINT nMilliseconds);
+BOOL    TimerClr(ITimerSink *pTimerSink);
+
+VOID    SocketInit(HWND hWnd, UINT nMsg);
+LRESULT SocketEvent(WPARAM wParam, LPARAM lParam);
+UINT    SocketCreate(UINT32 nLocalAddr, UINT16 wLocalPort,
+                     ISocketSink *pSink);
+UINT    SessionFactoryCreate(UINT32 nLocalAddr, UINT16 wLocalPort,
+                             ISessionFactorySink *pFactorySink);
+
+BOOL    SocketLoadNetworks(CNetwork ** ppNetworks);
+
+PCSTR   SocketToString(UINT32 dwAddr);
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/tftpd.cpp b/base/Windows/bootd/tftpd.cpp
new file mode 100644
index 0000000..bd0727d
--- /dev/null
+++ b/base/Windows/bootd/tftpd.cpp
@@ -0,0 +1,1418 @@
+//------------------------------------------------------------------------------
+//
+//  Microsoft Research
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       tftpd.cpp
+//
+//  Contents:   Simple TFTP Daemon
+//
+//  Owner:
+//
+//  History:    03/30/2000          Created.
+//
+//------------------------------------------------------------------------------
+
+// #define DEBUG 1
+
+#include <winlean.h>
+#include <winsock.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include "socksr.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Debugging
+//
+
+#define VERBOSE(x) if (s_fVerboseOutput) x
+
+//#pragma warning(disable: 4127)
+
+#define ARRAYOF(x)          (sizeof(x)/sizeof(x[0]))
+#define OFFSETOF(s,m)       ((unsigned)&(((s *)0)->m))
+#define assert(x)           if (!(x)) __asm int 3
+#define WM_SOCKET_EVENT     (WM_USER+101)
+
+typedef USHORT UINT16;
+
+#include "hashtab.h"
+#include "tftpd.h"
+
+#include "hashtab.cpp"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+//
+// Trivial File Transfer Protocol (TFTP) as per RFCs 1350, 1782, 1783 & 1784.
+//
+
+//
+// Packet types and their opcodes.
+//
+#define TFTP_RRQ   1  // read request
+#define TFTP_WRQ   2  // write request
+#define TFTP_DATA  3  // data
+#define TFTP_ACK   4  // acknowledgment
+#define TFTP_ERROR 5  // error
+#define TFTP_OACK  6  // option acknowledgment
+
+
+//
+// Error codes.
+//
+#define EUNDEF    0  // not defined, see error message (if any)
+#define ENOTFOUND 1  // file not found
+#define EACCESS   2  // access violation
+#define ENOSPACE  3  // disk full or allocation exceeded
+#define EBADOP    4  // illegal TFTP operation
+
+//
+// TFTP header structure.
+//
+struct TftpHdr {
+    UINT16      Opcode;         // packet type
+    union {
+        CHAR    Options[1];     // options we accept (for OACK packets)
+        UINT16  Block;          // block # (for DATA and ACK packets)
+        UINT16  ErrorCode;      // error code (for ERROR packets)
+    };
+    CHAR        Data[1];        // data/error string
+
+    PCSTR Dump(UINT cbData) {
+        static CHAR szBuffer[2048];
+        PCHAR pszBuffer = szBuffer;
+
+        // In network order
+        switch (ntohs(Opcode)) {
+          default:
+            sprintf(pszBuffer, "??? %04x", ntohs(Opcode));
+            __asm int 3;
+            return szBuffer;
+          case TFTP_DATA:
+            sprintf(pszBuffer, "DATA%5d %d bytes", ntohs(Block), cbData - 4);
+            return szBuffer;
+          case TFTP_ACK:
+            sprintf(pszBuffer, "ACK %5d", ntohs(Block));
+            return szBuffer;
+          case TFTP_ERROR:
+            sprintf(pszBuffer, "ERROR%4d %s", ntohs(ErrorCode), Data);
+            return szBuffer;
+          case TFTP_RRQ:
+            pszBuffer += sprintf(pszBuffer, "RRQ  [");
+            break;
+          case TFTP_WRQ:
+            pszBuffer += sprintf(pszBuffer, "WRQ  [");
+            break;
+          case TFTP_OACK:
+            pszBuffer += sprintf(pszBuffer, "OACK [");
+            break;
+        }
+
+        PCHAR pszTmp = Options;
+        PCHAR pszEnd = ((PCHAR)this) + cbData;
+
+        for (; pszTmp < pszEnd; pszTmp++) {
+            if (*pszTmp) {
+                *pszBuffer++ = *pszTmp;
+            }
+            else {
+                *pszBuffer++ = '^';
+            }
+        }
+        *pszBuffer++ = ']';
+        *pszBuffer = '\0';
+        return szBuffer;
+    }
+};
+
+//
+// With TFTP, all DATA packets except for the last one contain the same
+// number of data bytes (plus four bytes of header).  Barring a "blksize"
+// option in the request packet, this number is 512.
+//
+#define DEFAULT_BLOCKSIZE   512
+#define MAX_BLOCKSIZE       8192
+
+//
+// The TFTP spec says nothing about default timeout values or retransmission
+// algorithms.  RFC 1123, however, says me MUST use an adaptive timeout and
+// recommends doing an exponential backoff.  To keep things simple, we start
+// with DEFAULT_TIMEOUT (which client can override via "timeout" option) and
+// double it for each retry up to MAX_RETRIES.  Each time we need to retransmit
+// a packet to get it through, we double the initial timeout for the next and
+// all successive packets.
+//
+// Keep DEFAULT_TIMEOUT and especially MAX_RETRIES to fairly small values
+// (order 100 and order 10, respectively) or you'll break the implementation
+// (and really try your patience).
+//
+#define DEFAULT_TIMEOUT     2  // in seconds
+#define MAX_RETRIES         5
+
+//////////////////////////////////////////////////////////////////////////////
+//
+CHAR s_rszRenames[64][64];
+UINT s_nRenames     = 0;
+UINT s_nRenamesBase = 0;
+BOOL s_fRenames     = TRUE;
+
+CHAR s_rszReadPaths[16][MAX_PATH];
+CHAR s_szWritePath[MAX_PATH];
+UINT s_nPaths = 0;
+
+BOOL s_fExitOnENotFound = FALSE;
+BOOL s_fVerboseOutput   = FALSE;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Structure for handing incoming requests off to per-connection threads.
+//
+class CTftpNode : public ITimerSink,
+                  public ISessionSink
+{
+  public:
+    CTftpNode(ISessionSource *pSource, ITftpSink *pEventSink,
+              UINT32 nAddr, UINT16 nPort, UINT32 nSession);
+    ~CTftpNode();
+
+    UINT    CheckAndOpenFile(PCHAR pszName, HANDLE *phFile);
+    UINT    CheckAndCreateFile(PCHAR pszName, BOOL fWrite, HANDLE *phFile);
+
+    // Events:
+    VOID    ResendPacket(BOOL fTimeout);
+    VOID    ReadFinished(DWORD dwErrorCode, DWORD dwDone);
+
+    // ISessionSink
+  public:
+    virtual VOID    OnSessionCreate(ISessionSource *pSource, PVOID pvContext);
+    virtual VOID    OnSessionRecv(UINT dwError, PBYTE pbData, UINT cbRcvd);
+    virtual VOID    OnSessionClose(UINT dwError);
+
+  public:
+    // ITimerSink:
+    virtual VOID OnTimerFired();
+
+  protected:
+    // Subroutines:
+    VOID    Ack(UINT16 nBlock);
+    VOID    Nak(UINT16 nErrorCode);
+    VOID    OAck();
+    VOID    Data(UINT16 nBlock, PVOID pvPacket, UINT cbData);
+
+    VOID    SetTimeout();
+    VOID    ClrTimeout();
+
+    UINT    SocketSend(PVOID pbData, UINT cbData);
+    BOOL    ReadBlock(UINT nBlock);
+    BOOL    WriteBlock(INT cbData);
+    VOID    WriteFinished(DWORD dwErrorCode, DWORD dwDone);
+
+    BOOL    IsActiveSession()       { return m_szFilename[0] != '\0'; }
+    VOID    DeactivateSession();
+
+    VOID    Log(PCSTR pszMsg, ...);
+
+    BOOL    ValidateName(PCHAR pszDst, PCHAR pszSrc);
+
+    static VOID CALLBACK ReadCallback(DWORD dwErr, DWORD dwDone, LPOVERLAPPED lpOvrlap);
+    static VOID CALLBACK WriteCallback(DWORD dwErrorCode, DWORD dwDone, LPOVERLAPPED lpOverlap);
+
+  public:
+    UINT32  m_nSession;
+
+  protected:
+    ISessionSource *    m_pSource;
+    ITftpSink *         m_pEventSink;
+
+    UINT32  m_nAddr;
+    UINT16  m_nPort;
+    HANDLE  m_hFile;
+    CHAR    m_szFilename[MAX_PATH];
+
+    BOOL    m_fWrite;
+    BOOL    m_fDone;
+    BOOL    m_fUseOack;
+    BOOL    m_fHadTsize;
+    UINT    m_cbFileSize;
+
+    UINT    m_cbBlock;
+    UINT    m_cbBlockOpt;
+    UINT    m_cbBlockRead;
+
+    UINT    m_nTimeout;
+    UINT    m_nTimeoutOpt;
+    UINT    m_nTimeoutCount;
+    UINT    m_nTimeoutValue;
+
+    // n_nBlock the next block to read and wait for ACK.
+    UINT16  m_nBlock;
+    UINT32  m_nBlockLogLow;
+    UINT32  m_nBlockLogHigh;
+
+    BOOL    m_fIoDone;
+    UINT    m_nIoOffset;
+    BYTE    m_bIoBuffer[MAX_BLOCKSIZE + OFFSETOF(TftpHdr, Data)];
+
+    OVERLAPPED m_Overlapped;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+CTftpNode::CTftpNode(ISessionSource *pSource, ITftpSink *pEventSink,
+                     UINT32 nAddr, UINT16 nPort, UINT32 nSession)
+    : m_pSource(pSource),
+      m_pEventSink(pEventSink),
+      m_nAddr(nAddr),
+      m_nPort(nPort),
+      m_nSession(nSession)
+{
+    m_szFilename[0] = '\0';
+    m_hFile = INVALID_HANDLE_VALUE;
+    m_nTimeout = DEFAULT_TIMEOUT;
+    m_fUseOack = FALSE;
+}
+
+CTftpNode::~CTftpNode()
+{
+    ClrTimeout();
+}
+
+UINT CTftpNode::CheckAndCreateFile(PCHAR pszName, BOOL fWrite, HANDLE *phFile)
+{
+    *phFile = INVALID_HANDLE_VALUE;
+
+    // Set the access and creation flags.
+    //
+    DWORD dwAccess;
+    DWORD dwShare;
+    DWORD dwCreation;
+    PCHAR pszOp;
+
+    if (fWrite) {
+        dwAccess = GENERIC_WRITE;
+        dwShare = 0 /*[: don't let others see inconsistent file */
+            /*FILE_SHARE_READ | FILE_SHARE_WRITE*/;
+        dwCreation = CREATE_ALWAYS;
+        pszOp = "write";
+
+        if (s_szWritePath[0] == '\0') {
+            // Writes not allowed
+            goto fail;
+        }
+
+        // Writes are only allowed to the write path.
+        CHAR szPath[MAX_PATH];
+
+        strcpy(szPath, s_szWritePath);
+        strcat(szPath, pszName);
+
+        *phFile = CreateFile(szPath, dwAccess, dwShare, NULL, dwCreation,
+                             FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_OVERLAPPED, NULL);
+
+        if (*phFile != INVALID_HANDLE_VALUE) {
+            Log("   %02d Write `%s'", m_nSession, szPath);
+            return 0;
+        }
+    }
+    else {
+        dwAccess = GENERIC_READ;
+        dwShare = FILE_SHARE_READ;
+        dwCreation = OPEN_EXISTING;
+        pszOp = "read";
+
+        // Reads are allowed for any path.
+
+        for (UINT n = 0; n < s_nPaths; n++)
+        {
+            CHAR szPath[MAX_PATH];
+
+            strcpy(szPath, s_rszReadPaths[n]);
+            strcat(szPath, pszName);
+
+            *phFile = CreateFile(szPath, dwAccess, dwShare, NULL, dwCreation,
+                                 FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_OVERLAPPED, NULL);
+
+            if (*phFile != INVALID_HANDLE_VALUE) {
+                Log("   %02d Read `%s'", m_nSession, szPath);
+                return 0;
+            }
+        }
+    }
+  fail:
+    Log("   %02d Failed %s `%s'", m_nSession, pszOp, pszName);
+    return EACCESS;
+}
+
+UINT CTftpNode::CheckAndOpenFile(PCHAR pszName, HANDLE *phFile)
+{
+    *phFile = INVALID_HANDLE_VALUE;
+
+    for (UINT n = 0; n < s_nPaths; n++)
+    {
+        CHAR szPath[MAX_PATH * 2];
+
+        strcpy(szPath, s_rszReadPaths[n]);
+        strcat(szPath, pszName);
+
+        *phFile = CreateFile(szPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
+                             FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_OVERLAPPED, NULL);
+
+        if (*phFile != INVALID_HANDLE_VALUE) {
+            Log("   %02d Read `%s'", m_nSession, szPath);
+            return 0;
+        }
+    }
+    Log("   %02d Failed read `%s'", m_nSession, pszName);
+    return EACCESS;
+}
+
+VOID CTftpNode::OnSessionCreate(ISessionSource *pSource, PVOID pvContext)
+{
+    (void)pvContext;
+
+    m_pSource = pSource;
+}
+
+VOID CTftpNode::OnSessionClose(UINT dwError)
+{
+    (void)dwError;
+    VERBOSE(Log("   %02d  close session: %d.", m_nSession, dwError));
+
+    delete this;
+}
+
+VOID CTftpNode::Log(PCSTR pszMsg, ...)
+{
+    if (m_pEventSink) {
+        CHAR szBuffer[2048];
+        va_list args;
+
+        va_start(args, pszMsg);
+        vsprintf(szBuffer, pszMsg, args);
+        va_end(args);
+
+        m_pEventSink->OnTftpMessage(m_nAddr, "%s", szBuffer);
+    }
+}
+
+UINT CTftpNode::SocketSend(PVOID pbData, UINT cbData)
+{
+    TftpHdr *pPacket = (TftpHdr*)pbData;
+
+    if (ntohs(pPacket->Opcode) == TFTP_DATA) {
+        UINT16 nBlock = ntohs(pPacket->Block);
+
+        if (nBlock <= m_nBlockLogLow || nBlock >= m_nBlockLogHigh ||
+            nBlock % 250 == 0) {
+            Log("<= %02d %s", m_nSession, pPacket->Dump(cbData),
+                cbData - 4, m_cbBlockOpt);
+        }
+    }
+    else {
+        Log("<= %02d %s", m_nSession, pPacket->Dump(cbData));
+    }
+
+    return m_pSource->SessionSend((PBYTE)pbData, cbData);
+}
+
+VOID CTftpNode::DeactivateSession()
+{
+    if (m_szFilename[0]) {
+        VERBOSE(Log("-- %02d DeactivateSession", m_nSession));
+
+        m_szFilename[0] = 0;
+        if (m_hFile != INVALID_HANDLE_VALUE) {
+            CancelIo(m_hFile);
+            CloseHandle(m_hFile);
+            m_hFile = INVALID_HANDLE_VALUE;
+        }
+        SetTimeout();
+    }
+}
+
+BOOL CTftpNode::ReadBlock(UINT nBlock)
+{
+    (void)nBlock;
+
+    VERBOSE(Log("   %02d ReadBlock(%d at %d)",
+                m_nSession, nBlock, m_nIoOffset));
+
+    m_fIoDone = FALSE;
+    m_Overlapped.hEvent = (HANDLE)this;
+    m_Overlapped.Offset = m_nIoOffset;
+    m_Overlapped.OffsetHigh = 0;
+
+    if (!ReadFileEx(m_hFile, m_bIoBuffer + OFFSETOF(TftpHdr, Data)
+                    , m_cbBlock, &m_Overlapped, ReadCallback)) {
+        ReadFinished(GetLastError(), 0);
+        return FALSE;
+    }
+    return TRUE;
+}
+
+VOID CTftpNode::ReadFinished(DWORD dwErrorCode, DWORD dwDone)
+{
+    VERBOSE(Log("   %02d ReadFinished(%d, %d)",
+                m_nSession, dwErrorCode, dwDone));
+
+    m_fIoDone = TRUE;
+    m_nIoOffset += dwDone;
+    m_cbBlockRead = dwDone;
+
+    if (dwErrorCode == ERROR_HANDLE_EOF) {
+        dwErrorCode = 0;
+    }
+
+    if (dwErrorCode != 0) {
+        VERBOSE(Log("   %02d Read failed: %d", m_nSession, dwErrorCode));
+        Nak(ENOSPACE);
+    }
+    else {
+        ResendPacket(FALSE);
+    }
+}
+
+VOID CTftpNode::ReadCallback(DWORD dwErrorCode, DWORD dwDone, LPOVERLAPPED lpOverlap)
+{
+    CTftpNode *pInfo = (CTftpNode *)lpOverlap->hEvent;
+    pInfo->ReadFinished(dwErrorCode, dwDone);
+}
+
+BOOL CTftpNode::WriteBlock(INT cbData)
+{
+    m_fIoDone = FALSE;
+    m_Overlapped.hEvent = (HANDLE)this;
+    m_Overlapped.Offset = m_nIoOffset;
+    m_Overlapped.OffsetHigh = 0;
+
+    if (cbData == 0) {
+        WriteFinished(0, 0);
+    }
+    else if (!WriteFileEx(m_hFile, m_bIoBuffer, cbData, &m_Overlapped, WriteCallback)) {
+        WriteFinished(GetLastError(), 0);
+        return FALSE;
+    }
+    return TRUE;
+}
+
+VOID CTftpNode::WriteFinished(DWORD dwErrorCode, DWORD dwDone)
+{
+    VERBOSE(Log("%08x WriteFinished(%d, %d)\n", this, dwErrorCode, dwDone));
+
+    m_fIoDone = TRUE;
+    m_nIoOffset += dwDone;
+
+    if (dwErrorCode != 0) {
+        VERBOSE(Log("%08x Write failed: %d\n", this, dwErrorCode));
+        Nak(ENOSPACE);
+    }
+    else {
+        m_nBlock++;
+    }
+    if (dwDone < 512) {
+        m_fDone = TRUE;
+    }
+
+    ResendPacket(FALSE);
+}
+
+VOID CTftpNode::WriteCallback(DWORD dwErrorCode, DWORD dwDone, LPOVERLAPPED lpOverlap)
+{
+    CTftpNode *pInfo = (CTftpNode *)lpOverlap->hEvent;
+    pInfo->WriteFinished(dwErrorCode, dwDone);
+}
+
+
+VOID CTftpNode::OnTimerFired()
+{
+    if (!m_fDone) {
+        ResendPacket(TRUE);
+    }
+}
+
+VOID CTftpNode::SetTimeout()
+{
+    if (m_nTimeoutValue == 0) {
+        m_nTimeoutCount = 0;
+        m_nTimeoutValue = m_nTimeout;
+    }
+    TimerSet(this, m_nTimeoutValue * 1000);
+}
+
+VOID CTftpNode::ClrTimeout()
+{
+    m_nTimeoutValue = 0;
+    TimerClr(this);
+}
+
+//
+// Send an TFTP_ACK packet.
+//
+VOID CTftpNode::Ack(UINT16 nBlock)
+{
+    BYTE Buffer[8];
+    TftpHdr *pPacket = (TftpHdr *)Buffer;
+
+    pPacket->Opcode = htons((UINT16)TFTP_ACK);
+    pPacket->Block = htons(nBlock);
+    SocketSend(pPacket, OFFSETOF(TftpHdr, Data));
+    SetTimeout();
+}
+
+//
+// Send a TFTP_DATA packet
+//
+VOID CTftpNode::Data(UINT16 nBlock, PVOID pvPacket, UINT cbData)
+{
+    TftpHdr *pPacket = (TftpHdr *)pvPacket;
+
+    pPacket->Opcode = htons((UINT16)TFTP_DATA);
+    pPacket->Block = htons(nBlock);
+    SocketSend(pPacket, cbData + OFFSETOF(TftpHdr, Data));
+    SetTimeout();
+}
+
+//
+// Send a TFTP_NAK packet (i.e. an error message).
+// Error code passed in is one of the standard TFTP codes,
+//
+VOID CTftpNode::Nak(UINT16 nErrorCode)
+{
+    BYTE Buffer[512];
+    TftpHdr *pPacket = (TftpHdr *)Buffer;
+
+    pPacket->Opcode = htons((UINT16)TFTP_ERROR);
+    pPacket->ErrorCode = htons(nErrorCode);
+    pPacket->Data[0] = '\0';
+
+    //
+    // Convert error code into the appropriate ASCII string message.
+    //
+    PCHAR pszError = "Undetermined error";
+
+    switch (nErrorCode) {
+      case ENOTFOUND: pszError = "File not found"; break;
+      case EACCESS:   pszError = "Access violation"; break;
+      case ENOSPACE:  pszError = "Disk full or allocation exceeded"; break;
+      case EBADOP:    pszError = "Illegal TFTP operation"; break;
+    }
+    strcpy(pPacket->Data, pszError);
+
+    INT cbData = OFFSETOF(TftpHdr, Data) + strlen(pPacket->Data) + 1;
+    SocketSend(pPacket, cbData);
+
+    VERBOSE(Log("   %02d Nak'd with errorcode %d (%s).",
+                m_nSession, nErrorCode, pPacket->Data));
+
+    if (m_pEventSink) {
+        m_pEventSink->OnTftpAccessEnd(m_nAddr, m_nPort, 0);
+    }
+
+    // We don't call SetTimeout here because DeactivateSession does.
+    DeactivateSession();
+
+    if (s_fExitOnENotFound && nErrorCode == ENOTFOUND) {
+        ExitProcess(ENOTFOUND);
+    }
+}
+
+//
+// Send a oack (option acknowledgment) packet.
+// Non-zero options passed in are valid.
+//
+VOID CTftpNode::OAck()
+{
+    BYTE Buffer[2048];
+    TftpHdr *pPacket;
+    int cbData = 0;
+
+    pPacket = (TftpHdr *)Buffer;
+    pPacket->Opcode = htons((UINT16)TFTP_OACK);
+
+    //
+    // Convert Option/Value pairs into the appropriate ASCII string messages.
+    //
+    if (m_cbBlockOpt) {
+        cbData += sprintf(pPacket->Options + cbData, "blksize") + 1;
+        cbData += sprintf(pPacket->Options + cbData, "%d", m_cbBlockOpt) + 1;
+    }
+    if (m_nTimeoutOpt) {
+        cbData += sprintf(pPacket->Options + cbData, "timeout") + 1;
+        cbData += sprintf(pPacket->Options + cbData, "%d", m_nTimeoutOpt) + 1;
+    }
+    if (m_fHadTsize) {
+        cbData += sprintf(pPacket->Options + cbData, "tsize") + 1;
+        cbData += sprintf(pPacket->Options + cbData, "%d", m_cbFileSize) + 1;
+    }
+
+    SocketSend(Buffer, cbData + OFFSETOF(TftpHdr, Options));
+    SetTimeout();
+
+    VERBOSE(Log("   %02d OAck sent (%d bytes)", m_nSession, cbData));
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+VOID CTftpNode::ResendPacket(BOOL fTimeout)
+{
+    if (fTimeout) {
+        VERBOSE(Log("   %02d timeout (count=%d, value=%d)",
+                m_nSession, m_nTimeoutCount, m_nTimeoutValue));
+
+        m_nTimeoutValue *= 2;
+        if (m_fDone || ++m_nTimeoutCount > MAX_RETRIES) {
+            if (IsActiveSession()) {
+                VERBOSE(Log("   %02d too many retries, aborting session",
+                            m_nSession));
+                Nak(EUNDEF);
+            }
+
+            // Close the session!
+            m_pSource->SessionClose(0);
+            return;
+        }
+    }
+#if 0
+    if (!IsActiveSession()) {
+        SetTimeout();
+        return;
+    }
+    else if (m_nBlock == 0 && m_nIoOffset == 0) {
+        if (m_cbBlockOpt || m_nTimeoutOpt) {
+            //
+            // Need to send OACK packet to acknowledge options we accept.
+            //
+            // If client is making a read request, wait for an ack to our oack
+            // to arrive (it should acknowledge block 0).  If client is making
+            // a write request, wait for the first data packet to arrive.  In
+            // either case, if we timeout before anything arrives, resend oack.
+            //
+            OAck(); //m_cbBlockOpt, m_nTimeoutOpt);
+        }
+        else {
+            //
+            // Need to acknowledge request with an ack for block 0
+            // since we didn't send an oack.  RecvData() will handle
+            // any retransmission that may be required of this ack.
+            //
+            Ack(0);
+        }
+    }
+    else {
+        if (m_fWrite) {
+            printf(" Write: acking block %d\n",m_nBlock);
+            Ack(m_nBlock);
+        }
+        else {
+            Data(m_nBlock, m_bIoBuffer, m_cbBlockRead);
+        }
+    }
+#endif
+#if 1
+    //printf(" m_nBlock=%d, m_nIoOffset=%d,m_fUseOack=%d,m_fWrite=%d\n",
+    //        m_nBlock, m_nIoOffset, m_fUseOack,m_fWrite);
+
+    if (!IsActiveSession()) {
+        SetTimeout();
+        return;
+    }
+    else if (m_nBlock == 0 && m_nIoOffset == 0)
+    {
+        if ( m_fUseOack ) {
+            //printf("Oacking\n");
+            OAck();
+        }
+        else if (m_fWrite)
+            Ack(m_nBlock);
+    }
+    else if (m_fWrite)
+            Ack(m_nBlock);
+    else if (m_fIoDone) {
+        //printf("m_fIoDone\n");
+        Data(m_nBlock, m_bIoBuffer, m_cbBlockRead);
+    }
+#endif
+}
+
+BOOL CTftpNode::ValidateName(PCHAR pszDst, PCHAR pszSrc)
+{
+    PCHAR pszBeg = pszDst;
+
+    // Remove leading '/'.
+    //
+    while (*pszSrc == '/' || *pszSrc == '\\')
+    {
+        // pszSrc++;
+        return FALSE;
+    }
+
+    // Check for invalid characters, and copy string.
+    //
+    while (*pszSrc)
+    {
+        // Don't allow drive letters followed by colons.
+        //
+        if (*pszSrc == ':') {
+            return FALSE;
+        }
+
+        // Don't allow "./" or "../" in file name.
+        //
+        if (pszDst == pszBeg || pszDst[-1] == '\\')
+        {
+            if ((pszSrc[0] == '.' && pszSrc[1] == '/') ||
+                (pszSrc[0] == '.' && pszSrc[1] == '\\') ||
+                (pszSrc[0] == '.' && pszSrc[1] == '.' && pszSrc[2] == '/') ||
+                (pszSrc[0] == '.' && pszSrc[1] == '.' && pszSrc[2] == '\\'))
+            {
+                return FALSE;
+            }
+        }
+
+        if (*pszSrc == '/')
+        {
+            *pszDst++ = '\\';
+            pszSrc++;
+        }
+        else
+        {
+            *pszDst++ = *pszSrc++;
+        }
+    }
+    *pszDst++ = '\0';
+
+    if (s_fRenames) {
+        if (strncmp(pszBeg, "pxe.com.", 8) == 0) {
+            UINT n = atoi(pszBeg + 8);
+
+            if (n != 0 && n >= s_nRenamesBase && n < s_nRenamesBase + s_nRenames) {
+                strcpy(pszBeg, s_rszRenames[n - s_nRenamesBase]);
+            }
+        }
+    }
+    return TRUE;
+}
+
+VOID CTftpNode::OnSessionRecv(UINT dwError, PBYTE pbData, UINT cbData)
+{
+    (void)dwError;
+
+    TftpHdr *pPacket = (TftpHdr *)pbData;
+
+    UINT16 nOpcode = ntohs(pPacket->Opcode);
+    UINT16 nBlock = ntohs(pPacket->Block);
+
+    if (nOpcode == TFTP_ACK) {
+        if (nBlock <= m_nBlockLogLow || nBlock >= m_nBlockLogHigh ||
+            nBlock % 250 == 0) {
+            Log("=> %02d %s", m_nSession, pPacket->Dump(cbData));
+        }
+    }
+    else {
+        Log("=> %02d %s", m_nSession, pPacket->Dump(cbData));
+    }
+
+    if (nOpcode == TFTP_RRQ  || nOpcode == TFTP_WRQ) {
+        //
+        // Abort an existing session if there is one.
+        //
+        DeactivateSession();
+
+        //
+        // Set initial variables...
+        //
+        m_fWrite = (nOpcode == TFTP_WRQ);
+        m_fDone = FALSE;
+        m_szFilename[0] = '\0';
+        m_cbBlock = DEFAULT_BLOCKSIZE;
+        m_cbBlockOpt = 0;
+        m_nTimeout = DEFAULT_TIMEOUT;
+        m_nTimeoutOpt = 0;
+        m_fHadTsize = FALSE;
+        m_cbFileSize = 0;
+
+        //
+        // Parse request fields (filename mode [option1 value1[opt2 val2 [...]]]).
+        // Note: all matches (including filename!) are case-insensitive.
+        //
+        PCHAR pszVal;
+        PCHAR pszEnd = (PCHAR)pbData + cbData;
+
+        PCHAR pszOpt = pPacket->Options;
+        PCHAR pszTmp = pszOpt + strlen(pszOpt) + 1;
+        if (pszTmp > pszEnd || !ValidateName(m_szFilename, pszOpt))
+        {
+            if (m_pEventSink) {
+                m_pEventSink->OnTftpAccessBegin(m_nAddr, m_nPort, m_fWrite, "<illegal>");
+            }
+
+            VERBOSE(Log("   %02d formatted filename packet", m_nSession));
+            Nak(ENOTFOUND);
+            return;
+        }
+        else {
+            if (m_pEventSink) {
+                m_pEventSink->OnTftpAccessBegin(m_nAddr, m_nPort, m_fWrite, pszOpt);
+            }
+        }
+
+        pszOpt = pszTmp;
+        pszTmp += strlen(pszTmp) + 1;
+        if (pszTmp <= pszEnd) {
+            // Note: we always use binary.
+            if (_stricmp("octet", pszOpt) != 0 && _stricmp("netascii", pszOpt) != 0) {
+                // Unknown recognized mode.
+                Nak(EBADOP);
+                return;
+            }
+        }
+
+        while (pszTmp < pszEnd) {
+            pszOpt = pszTmp;
+            pszTmp += strlen(pszTmp) + 1;
+            if (pszTmp >= pszEnd) {
+                break;
+            }
+            pszVal = pszTmp;
+            pszTmp += strlen(pszTmp) + 1;
+            if (pszTmp > pszEnd) {
+                break;
+            }
+
+            if (_stricmp(pszOpt, "blksize") == 0) {
+                //
+                // "blksize" option: (#octets).
+                //
+                m_cbBlockOpt = min(max(atoi(pszVal), 8), MAX_BLOCKSIZE);
+                m_cbBlock = m_cbBlockOpt;
+                m_fUseOack = TRUE;
+                VERBOSE(Log("   %02d blksize: %d", m_nSession, m_cbBlockOpt));
+            }
+            else if (_stricmp(pszOpt, "timeout") == 0) {
+                //
+                // End of "timeout" option value string (#seconds).
+                //
+                m_nTimeoutOpt = min(max(atoi(pszVal), 1), 10);
+                m_nTimeout = m_nTimeoutOpt;
+                m_fUseOack = TRUE;
+                VERBOSE(Log("   %02d timeout: %d", m_nSession, m_nTimeoutOpt));
+            }
+            else if (_stricmp(pszOpt, "tsize") == 0) {
+                //
+                // "tsize" transmit option value string (#size).
+                //
+                m_fHadTsize = 1;
+                m_fUseOack = TRUE;
+                VERBOSE(Log("   %02d tsize: %d", m_nSession, atoi(pszVal)));
+            }
+            else {
+                // Just ignore the unknown option.
+                VERBOSE(Log("   %02d unknown option: `%s'",
+                            m_nSession, pszOpt));
+            }
+        }
+
+        if (pszTmp > pszEnd) {
+            //
+            // Buffer overrun on packet.
+            //
+            VERBOSE(Log("   %02d badly formatted request packet", m_nSession));
+            Nak(EBADOP);
+            return;
+        }
+
+        //
+        // Open the file.
+        //
+        UINT nErr = CheckAndCreateFile(m_szFilename, m_fWrite, &m_hFile);
+
+        if (nErr != 0)
+        {
+            Nak((UINT16)nErr);
+            return;
+        }
+
+        m_cbFileSize = GetFileSize(m_hFile, NULL);
+        if (m_cbFileSize < 0)
+        {
+            m_cbFileSize = 0;
+        }
+        VERBOSE(Log("   %02d File is %d bytes or %d blocks.",
+                    m_nSession, m_cbFileSize,
+                    (m_cbFileSize + m_cbBlock - 1) / m_cbBlock));
+
+        //
+        // Set final variables...
+        //
+        m_nTimeoutValue = 0;
+        m_nTimeoutCount = 0;
+        m_cbBlockRead = m_cbBlock;
+        m_fIoDone = TRUE;
+        m_nIoOffset = 0;
+        m_nBlockLogLow = 3;
+        m_nBlockLogHigh = (m_cbFileSize / m_cbBlockRead) - 3;
+        m_nBlockLogHigh = m_nBlockLogHigh <= 0 ? 0 : m_nBlockLogHigh;
+
+        if (m_fUseOack) {
+            m_nBlock = 0;
+            ResendPacket(FALSE);
+        }
+        else if (m_fWrite) {
+            m_nBlock = 0;
+            ResendPacket(FALSE);
+        }
+        else {
+            m_nBlock = 1;
+            ReadBlock(0);
+        }
+    }
+    else if (nOpcode == TFTP_DATA ||
+             nOpcode == TFTP_ACK ||
+             nOpcode == TFTP_ERROR ||
+             nOpcode == TFTP_OACK) {
+
+        if (!IsActiveSession()) {
+            return;
+        }
+
+        if (m_szFilename[0] == '\0') {
+            // Ignore packets if we don't have an active session.
+            return;
+        }
+
+        if (nOpcode == TFTP_ERROR) {
+            VERBOSE(Log("   %02d Client reports error (code %d): %s",
+                    m_nSession, nBlock, pPacket->Data));
+            DeactivateSession();
+            return;
+        }
+
+        if (m_fWrite) {
+            // Write requests...
+            //
+            printf("WRITE\n");
+            if (nOpcode == TFTP_DATA) {
+                printf("DATA\n");
+                if (nBlock == (UINT16)(m_nBlock + 1)) {
+                    printf("NEXT\n");
+                    VERBOSE(Log("   %02d got data block %d (%d bytes)\n",
+                            m_nSession, m_nBlock,
+                                cbData - OFFSETOF(TftpHdr, Data)));
+                    printf("   %02d got data block %d (%d bytes)\n",
+                           m_nSession, m_nBlock,
+                           cbData - OFFSETOF(TftpHdr, Data));
+
+                    if (m_fIoDone) {
+                        m_cbBlockRead = cbData - OFFSETOF(TftpHdr, Data);
+                        //printf("WRITEBLOCK\n");
+                        // Buffer is available, initiate the write.
+                        CopyMemory(m_bIoBuffer, pPacket->Data, m_cbBlockRead);
+                        WriteBlock(m_cbBlockRead);
+                    }
+                    else {
+                        // Client will either re-send the packet either on timeout,
+                        // or when we ACK the last packet.
+                        //printf("NOWRITE\n");
+                    }
+                }
+                else if (nBlock == m_nBlock) {
+                    //printf("SAME\n");
+                    // If we got the same block, then we resend our ACK.
+                    ResendPacket(FALSE);
+                }
+                else {
+                    VERBOSE(Log("   %02d Strange ACK %d to %d\n",
+                                m_nSession, nBlock, m_nBlock));
+                    Nak(EBADOP);
+                    return;
+                }
+            }
+            else {
+                // Write streams from clients only contain TFTP_DATA packets.
+                VERBOSE(Log("   %02d aborting due to weird packet when expecting data.\n",
+                            m_nSession));
+                Nak(EBADOP);
+                return;
+            }
+        }
+        else {
+
+            // Read requests...
+            //
+            if (nOpcode == TFTP_ACK) {
+                if (nBlock == m_nBlock) {
+                    // Client ACK'd our packet, read the next block.
+                    if (m_cbBlockRead == m_cbBlock) {
+                        ReadBlock(++m_nBlock);
+                    }
+                    else {
+                        // Client ACK'd our last packet, we're out of here.
+                        if (m_pEventSink) {
+                            m_pEventSink->OnTftpAccessEnd(m_nAddr, m_nPort, TRUE);
+                        }
+                        DeactivateSession();
+                    }
+                }
+                else if (nBlock == (UINT16)(m_nBlock - 1)) {
+                    // Client ACK'd the previous block, resend it.
+                    ResendPacket(FALSE);
+                }
+                else {
+                    VERBOSE(Log("   %02d Strange ACK %d to %d",
+                                m_nSession, nBlock, m_nBlock));
+                    Nak(EBADOP);
+                    return;
+                }
+            }
+            else {
+                // Read streams from clients only contain TFTP_ACK packets.
+                VERBOSE(Log("   %02d aborting due to weird packet when expecting data.",
+                        m_nSession));
+                Nak(EBADOP);
+                return;
+            }
+        }
+    }
+    else {
+        VERBOSE(Log("   %02d bogus following opcode (%d)",
+                    m_nSession, nOpcode));
+        DeactivateSession();
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+UINT32 CTftp::s_nSession = 1;
+
+CTftp::CTftp(CTftp *pNext)
+{
+    m_pNext = pNext;
+    m_pSink = NULL;
+    m_nAddr = 0;
+    m_nPort = 0;
+}
+
+CTftp::~CTftp()
+{
+    if (m_pNext) {
+        delete m_pNext;
+        m_pNext = NULL;
+    }
+
+    if (m_pSink) {
+        m_pSink->OnTftpMessage(m_nAddr, "Server stopped.");
+    }
+
+    m_pSink = NULL;
+}
+
+static BOOL CheckDir(PCHAR pszDir)
+{
+    if (pszDir == NULL || pszDir[0] == '\0') {
+        return FALSE;
+    }
+
+    PCHAR pszBeg = pszDir;
+
+    while (*pszDir) {
+        pszDir++;
+    }
+    if (pszDir > pszBeg && pszDir[-1] != '\\') {
+        *pszDir++ = '\\';
+        *pszDir = '\0';
+    }
+    return TRUE;
+}
+
+VOID CTftp::OnNetworkChange(UINT32 nAddr, UINT32 nMask, UINT32 nGate)
+{
+    if (m_nAddr == nAddr) {
+    }
+    if (m_pNext) {
+        m_pNext->OnNetworkChange(nAddr, nMask, nGate);
+    }
+}
+
+VOID CTftp::OnNetworkDelete(UINT32 nAddr, CTftp **ppNext)
+{
+    if (m_nAddr == nAddr) {
+        *ppNext = m_pNext;
+
+        if (m_pNext) {
+            m_pNext->OnNetworkDelete(nAddr, ppNext);
+        }
+        m_pNext = NULL;
+
+        delete this;
+    }
+    else {
+        if (m_pNext) {
+            m_pNext->OnNetworkDelete(nAddr, &m_pNext);
+        }
+    }
+}
+
+VOID CTftp::ConfigureFiles(ITftpSink *pSink, INT argc, PCHAR *argv)
+{
+    for (INT arg = 0; arg < argc; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            CHAR args[1024];
+            strcpy(args, argv[arg]);
+            char *argn = args+1;                        // Argument name
+            char *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':') {
+                argp++;
+            }
+            if (*argp == ':') {
+                *argp++ = '\0';
+            }
+
+            switch (argn[0]) {
+              case 'e':                                 // Exit on first ENOTFOUND
+              case 'E':
+                s_fExitOnENotFound = TRUE;
+                break;
+              case 'r':                                 // Disable rename.
+              case 'R':
+                s_fRenames = FALSE;
+                break;
+              case 'v':
+              case 'V':
+                s_fVerboseOutput = TRUE;
+                break;
+              case 'w':                                 // Allow writes.
+              case 'W':
+                strcpy(s_szWritePath, argp);
+                if (pSink) {
+                    pSink->OnTftpMessage(0, "Write: %s", argp);
+                }
+                if (s_nPaths < ARRAYOF(s_rszReadPaths)) {
+                    strcpy(s_rszReadPaths[s_nPaths], argv[arg]);
+                    if (CheckDir(s_rszReadPaths[s_nPaths])) {
+                        s_nPaths++;
+                    }
+                }
+                break;
+            }
+        }
+        else {
+            if (s_nPaths < ARRAYOF(s_rszReadPaths)) {
+                strcpy(s_rszReadPaths[s_nPaths], argv[arg]);
+                if (CheckDir(s_rszReadPaths[s_nPaths])) {
+                    if (pSink) {
+                        pSink->OnTftpMessage(0, "Read: %s",
+                                             s_rszReadPaths[s_nPaths]);
+                    }
+                    s_nPaths++;
+                }
+            }
+        }
+    }
+    if (s_fRenames) {
+        OnFilesChange(pSink);
+    }
+}
+
+VOID CTftp::OnFilesChange(ITftpSink *pSink)
+{
+    s_nRenames = 0;
+    s_nRenamesBase = 0;
+
+    // First, could the pxe.com files:
+    for (UINT nPath = 0; nPath < s_nPaths; nPath++) {
+        CHAR szPath[MAX_PATH];
+        WIN32_FIND_DATA wfd;
+
+        strcpy(szPath, s_rszReadPaths[nPath]);
+        strcat(szPath, "pxe.com.*");
+
+        HANDLE hFind = FindFirstFile(szPath, &wfd);
+        while (hFind != INVALID_HANDLE_VALUE) {
+            if ((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+                if (strlen(wfd.cFileName) > 8) {
+                    UINT num = atoi(wfd.cFileName + 8);
+                    if (s_nRenamesBase <= num) {
+                        s_nRenamesBase = num + 1;
+                    }
+                }
+            }
+
+            if (!FindNextFile(hFind, &wfd)) {
+                FindClose(hFind);
+                break;
+            }
+        }
+    }
+
+    // Then see what files we can rename.
+    for (UINT nPath = 0; nPath < s_nPaths; nPath++) {
+        CHAR szPath[MAX_PATH];
+        WIN32_FIND_DATA wfd;
+
+        strcpy(szPath, s_rszReadPaths[nPath]);
+        strcat(szPath, "*.x86");
+
+        HANDLE hFind = FindFirstFile(szPath, &wfd);
+        while (hFind != INVALID_HANDLE_VALUE) {
+            if ((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+                goto next;
+            }
+
+            strcpy(szPath, s_rszReadPaths[nPath]);
+            strcat(szPath, wfd.cFileName);
+
+            if (s_nRenames >= ARRAYOF(s_rszRenames)) {
+                goto next;
+            }
+
+            HANDLE hFile = CreateFile(szPath, GENERIC_READ, FILE_SHARE_READ, NULL,
+                                      OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+            if (hFile == INVALID_HANDLE_VALUE) {
+                goto next;
+            }
+
+            CHAR rbBlock[512];
+            DWORD dwRead = 0;
+            if (ReadFile(hFile, rbBlock, sizeof(rbBlock), &dwRead, NULL) &&
+                dwRead == sizeof(rbBlock)) {
+
+                if (rbBlock[0] = 'M' && rbBlock[1] == 'Z' &&
+                    *(DWORD*)&rbBlock[64] == 0) {
+
+                    sprintf(s_rszRenames[s_nRenames], "%ls", &rbBlock[68]);
+                    if (pSink) {
+                        pSink->OnTftpMessage(0, "Rename pxe.com.%d to %s",
+                                             s_nRenamesBase + s_nRenames,
+                                             s_rszRenames[s_nRenames]);
+                    }
+                    s_nRenames++;
+                }
+            }
+            CloseHandle(hFile);
+
+          next:
+            if (!FindNextFile(hFind, &wfd)) {
+                FindClose(hFind);
+                break;
+            }
+        }
+    }
+}
+
+VOID CTftp::Configure(UINT32 nAddr, UINT16 nPort,
+                      ITftpSink *pSink, INT argc, PCHAR *argv)
+{
+    m_pSink = pSink;
+    m_nAddr = nAddr;
+    m_nPort = nPort;
+
+    for (INT arg = 0; arg < argc; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            CHAR args[1024];
+            strcpy(args, argv[arg]);
+            char *argn = args+1;                        // Argument name
+            char *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':') {
+                argp++;
+            }
+            if (*argp == ':') {
+                *argp++ = '\0';
+            }
+
+            switch (argn[0]) {
+              case '?':
+                break;
+            }
+        }
+    }
+    if (m_pSink) {
+        m_pSink->OnTftpMessage(0,
+                               "TFTP Server: %s:%d",
+                               SocketToString(m_nAddr), m_nPort);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+VOID CTftp::OnSessionCreate(UINT32 nPeerAddr,
+                            UINT16 nPeerPort,
+                            ISessionSource *pSource,
+                            ISessionSink **ppSink,
+                            PVOID pvContext)
+{
+    (void)pvContext;
+
+    *ppSink = new CTftpNode(pSource, m_pSink, nPeerAddr, nPeerPort, s_nSession++);
+}
+
+VOID CTftp::OnFactoryRecv(UINT dwError,
+                          UINT32 nAddr, UINT16 nPort, PBYTE pbData, UINT cbData)
+{
+    if (dwError) {
+        m_pSink->OnTftpSocketError(dwError);
+        return;
+    }
+
+    // Drop anything that clearly isn't a valid TFTP request packet.
+    //
+    if (cbData < OFFSETOF(TftpHdr, Data)) {
+        VERBOSE(Log(nAddr, "<= packet port %d too small (%d bytes)",
+                    nPort, cbData));
+        return;
+    }
+
+    // If we receive then their wasn't a client for this packet.
+
+    TftpHdr *pPacket = (TftpHdr *)pbData;
+    UINT16 nOpcode = ntohs(pPacket->Opcode);
+    if (nOpcode != TFTP_RRQ) {
+        VERBOSE(Log(nAddr, "<= packet from port %d wrong initial opcode (%d)",
+                    nPort, nOpcode));
+        return;
+    }
+
+    // New request.
+    ISessionSink *pSession = NULL;
+    FactorySessionCreate(nAddr, nPort, &pSession, NULL);
+    CTftpNode *pClient = static_cast<CTftpNode *>(pSession);
+
+    if (pClient != NULL) {
+        VERBOSE(Log(nAddr, "** %02d session opened port %d",
+                    pClient->m_nSession, nPort));
+        pClient->OnSessionRecv(0, pbData, cbData);
+    }
+    else {
+        Log(nAddr, "Out of memory!");
+    }
+}
+
+VOID CTftp::OnFactoryClose(UINT dwError)
+{
+    if (dwError) {
+        m_pSink->OnTftpSocketError(dwError);
+    }
+}
+
+VOID CTftp::Log(ULONG nAddr, PCSTR pszMsg, ...)
+{
+    if (m_pSink) {
+        CHAR szBuffer[2048];
+        va_list args;
+
+        va_start(args, pszMsg);
+        vsprintf(szBuffer, pszMsg, args);
+        va_end(args);
+
+        m_pSink->OnTftpMessage(nAddr, "%s", szBuffer);
+    }
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/bootd/tftpd.h b/base/Windows/bootd/tftpd.h
new file mode 100644
index 0000000..73812f5
--- /dev/null
+++ b/base/Windows/bootd/tftpd.h
@@ -0,0 +1,80 @@
+//------------------------------------------------------------------------------
+//
+//  Microsoft Research
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       tftpd.h
+//
+//  Contents:   TFTP Daemon
+//
+//  Owner:
+//
+//  History:    03/30/2000         Created.
+//
+//------------------------------------------------------------------------------
+
+//
+// Trivial File Transfer Protocol (TFTP) as per RFCs 1350, 1782, 1783 & 1784.
+//
+
+#define TFTP_PORT 69  // Internet standard
+
+class ITftpSink
+{
+  public:
+    virtual VOID OnTftpSocketError(INT nErr) = 0;
+    virtual VOID OnTftpMessage(UINT32 nAddr, PCSTR pszMessage, ...) = 0;
+    virtual VOID OnTftpAccessBegin(UINT32 nAddr, UINT16 nPort, BOOL bWrite, PCSTR pszFile) = 0;
+    virtual VOID OnTftpAccessEnd(UINT32 nAddr, UINT16 nPort, BOOL bSuccess) = 0;
+};
+
+class CTftp : public CSessionFactorySink
+{
+  public:
+    friend class CTftpNode;
+
+    CTftp(CTftp *pNext);
+    ~CTftp();
+
+    static VOID ConfigureFiles(ITftpSink *pSink, INT argc, PCHAR *argv);
+    static VOID OnFilesChange(ITftpSink *pSink);
+
+    VOID    Configure(UINT32 nAddr, UINT16 nPort,
+                      ITftpSink *pSink, INT argc, PCHAR *argv);
+
+    VOID    OnNetworkChange(UINT32 nAddr, UINT32 nMask, UINT32 nGate);
+    VOID    OnNetworkDelete(UINT32 nAddr, CTftp **ppNext);
+
+    // ISessionFactorySink
+  public:
+    virtual VOID    OnFactoryRecv(UINT dwError,
+                                  UINT32 nAddr,
+                                  UINT16 nPort,
+                                  PBYTE pbData,
+                                  UINT cbRcvd);
+
+    virtual VOID    OnFactoryClose(UINT dwError);
+
+    virtual VOID    OnSessionCreate(UINT32 nPeerAddr,
+                                    UINT16 nPeerPort,
+                                    ISessionSource *pSource,
+                                    ISessionSink **ppSink,
+                                    PVOID pvContext);
+
+  protected:
+    VOID    Log(ULONG nAddr, PCSTR pszMsg, ...);
+
+    inline UINT64 MakeId(UINT32 nAddr, UINT16 nPort) {
+        return (UINT64)nAddr | ((UINT64)nPort << 32);
+    }
+
+  protected:
+    ITftpSink *     m_pSink;
+    UINT32          m_nAddr;
+    UINT16          m_nPort;
+    CTftp *         m_pNext;
+
+    static UINT32   s_nSession;
+};
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/dumpwav/Makefile b/base/Windows/dumpwav/Makefile
new file mode 100644
index 0000000..f23de3d
--- /dev/null
+++ b/base/Windows/dumpwav/Makefile
@@ -0,0 +1,62 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\DumpWav\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS=$(CFLAGS) /W4 /I..\inc \
+    -DWIN32 -DNT $(CPPFLAGS)  /Fd$(OBJDIR)\dumpwav.pdb
+
+HOST_LINKFLAGS= $(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+    kernel32.lib    \
+    libcmt.lib        \
+
+
+##############################################################################
+
+.SUFFIXES: .cpp .obj
+
+{.}.cpp{obj}.obj:
+    $(CC) /c /nologo $(CFLAGS) /Fo$@ $<
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\dumpwav.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\dumpwav.exe
+    $(COPY) $(OBJDIR)\dumpwav.exe ..\..\build
+    $(COPY) $(OBJDIR)\dumpwav.pdb ..\..\build
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\dumpwav.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+test: $(OBJDIR)\dumpwav.exe doit
+
+doit: c:\*.wav c:\windows\media\*.wav
+    $(OBJDIR)\dumpwav.exe $**
+
+$(OBJDIR)\dumpwav.exe : $(OBJDIR)\dumpwav.obj
+    @echo Linking $@
+    link $(HOST_LINKFLAGS) /out:$@ $(OBJDIR)\dumpwav.obj $(LIBS)
+
+$(OBJDIR)\dumpwav.obj : dumpwav.cpp
+
+################################################################# End of File.
diff --git a/base/Windows/dumpwav/dumpwav.cpp b/base/Windows/dumpwav/dumpwav.cpp
new file mode 100644
index 0000000..12d65fd
--- /dev/null
+++ b/base/Windows/dumpwav/dumpwav.cpp
@@ -0,0 +1,102 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+    struct WAVE
+    {
+        char    riffId[4];
+        int     riffBytes;
+        char    waveId[4];
+    };
+
+    union CHUNK
+    {
+        struct
+        {
+            char    fmtId[4];
+            int     fmtBytes;
+            short   audioFormat;
+            short   numChannels;
+            int     samplesPerSec;
+            int     bytesPerSec;
+            short   blockAlign;
+            short   bitsPerSample;
+            short   byteExtra;
+        } FMT;
+
+        struct
+        {
+            char    dataId[4];
+            int     dataBytes;
+        } DATA;
+    };
+
+    for (int arg = 1; arg < argc; arg++) {
+        FILE *fp = fopen(argv[arg], "rb");
+        if (fp == NULL) {
+            printf("Couldn't read %s\n", argv[arg]);
+        }
+
+        printf("%s\n", argv[arg]);
+
+        WAVE wave;
+        CHUNK chunk;
+
+        fread(&wave, 1, sizeof(wave), fp);
+        if (strncmp(wave.riffId, "RIFF", 4) != 0 ||
+            strncmp(wave.waveId, "WAVE", 4) != 0) {
+            printf("  riffId:         %-4.4s\n", wave.riffId);
+            printf("  riffBytes:      %d\n", wave.riffBytes);
+            printf("  waveId:         %-4.4s\n", wave.waveId);
+            printf("!!!\n");
+            return 1;
+        }
+
+        int offset = ftell(fp);
+
+        while (fread(&chunk.DATA, 1, sizeof(chunk.DATA), fp) != 0) {
+            if (strncmp(chunk.DATA.dataId, "data", 4) == 0) {
+            }
+            else if (strncmp(chunk.DATA.dataId, "fmt ", 4) == 0) {
+                fseek(fp, offset, SEEK_SET);
+                fread(&chunk.FMT, 1, sizeof(chunk.FMT), fp);
+
+                if (chunk.FMT.audioFormat != 1) {
+                    printf("      audioFormat:    %d\n", chunk.FMT.audioFormat);
+                    printf("!!!\n");
+                    break;
+                }
+                if (chunk.FMT.blockAlign !=
+                    (chunk.FMT.bitsPerSample * chunk.FMT.numChannels) / 8) {
+                    printf("      numChannels:    %d\n", chunk.FMT.numChannels);
+                    printf("      blockAlign:     %d\n", chunk.FMT.blockAlign);
+                    printf("      bitsPerSample:  %d\n", chunk.FMT.bitsPerSample);
+                    printf("!!!\n");
+                    break;
+                }
+                printf("channels=%1d samplesPerSec=%5d bitsPerSamples=%2d\n",
+                       chunk.FMT.numChannels,
+                       chunk.FMT.samplesPerSec,
+                       chunk.FMT.bitsPerSample);
+            }
+            else {
+                printf("    Id:             %-4.4s\n", chunk.DATA.dataId);
+                printf("    Bytes:          %d\n", chunk.DATA.dataBytes);
+            }
+
+            offset += 8 + chunk.DATA.dataBytes;
+            fseek(fp, offset, SEEK_SET);
+        }
+        fclose(fp);
+    }
+
+    return 0;
+
+}
+
diff --git a/base/Windows/gulp/Makefile b/base/Windows/gulp/Makefile
new file mode 100644
index 0000000..3dba56d
--- /dev/null
+++ b/base/Windows/gulp/Makefile
@@ -0,0 +1,47 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Benchmarks\gulp\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS=$(CFLAGS) /Ox /I..\inc \
+    /Fd$(OBJDIR)\gulp.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+     user32.lib     \
+     kernel32.lib   \
+     libcmt.lib     \
+     ws2_32.lib     \
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\gulp.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\gulp.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+{.}.c{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+$(OBJDIR)\gulp.obj: gulp.c
+
+OBJS = \
+    $(OBJDIR)\gulp.obj \
+
+$(OBJDIR)\gulp.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
+
+##############################################################################
diff --git a/base/Windows/gulp/gulp.c b/base/Windows/gulp/gulp.c
new file mode 100644
index 0000000..3697837
--- /dev/null
+++ b/base/Windows/gulp/gulp.c
@@ -0,0 +1,421 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "winlean.h"
+#include "winsock2.h"
+#include <stdlib.h>
+#include <stdio.h>
+
+#define DEF_PACKET_SIZE 32
+#define MAX_PACKET 1024
+
+#define xmalloc(s) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (s))
+#define xfree(p)   HeapFree (GetProcessHeap(), 0, (p))
+
+_declspec (thread) void * MC_MyCS_StopEvent;
+
+typedef struct args {
+    LPTSTR  host;
+    int port;
+} thread_args_t, *pthread_args_t;
+
+static HANDLE  endThreadEvent;
+static HANDLE  threadCountMutex;
+static int doneThreads;
+static int   numThreads;
+static int  iterationCount;
+static int  g_totalBytesRead;
+/*
+
+ * MC_GetLastErrorText
+ *
+ *  PURPOSE: copies error message text to string
+ *
+ *  PARAMETERS:
+ *    lpszBuf - destination buffer
+ *    dwSize - size of buffer
+ *
+ *  RETURN VALUE:
+ *    destination buffer
+ */
+LPSTR MC_GetLastErrorText(LPSTR lpszBuf, DWORD dwSize, DWORD errnum)
+{
+    DWORD dwRet;
+    LPTSTR lpszTemp = NULL;
+
+    dwRet = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                           NULL,
+                           errnum,
+                           LANG_NEUTRAL,
+                           (LPTSTR)&lpszTemp,
+                           0,
+                           NULL );
+
+    if ( !dwRet)
+        sprintf(lpszBuf, "error number %d", errnum); /* no message so use errnum */
+    else
+    {
+        lpszTemp[lstrlen(lpszTemp)-2] = '\0';  /* remove cr and newline characters */
+        //sprintf(lpszBuf, "%s (%d)", lpszTemp, errnum);
+        sprintf(lpszBuf, " error %d\n", errnum);
+    }
+
+    if (lpszTemp)
+        LocalFree((HLOCAL) lpszTemp );
+
+    return lpszBuf;
+}
+
+
+static void MC_ErrMsg(LPSTR buf, DWORD bufsize, LPCSTR msg)
+{
+     DWORD tmp;
+
+     tmp = strlen(strcpy(buf, msg));
+     MC_GetLastErrorText(buf + tmp, bufsize - tmp, WSAGetLastError());
+}
+
+/*
+ *  FUNCTION: MC_Recv
+ *
+ *  PURPOSE: A replacement for the Winsock recv() routine.  This version uses
+ *           overlapped I/O to look for data on a socket and also watch
+ *           for the Stop event.
+ *
+ *  PARAMETERS:
+ *    sock - read from this socket.
+ *    buffer - place incoming data into this buffer.
+ *    nbytes - the amount of storage in the buffer.
+ *
+ *  RETURN VALUE:
+ *    -1 - error.
+ *    0  - the socket connection has been closed.
+ *    >0 - the number of bytes read.
+ */
+
+int
+MC_Recv(SOCKET sock, char *buffer, int nbytes)
+{
+    DWORD          bytesreceived;
+    DWORD          flags = 0;
+    WSAOVERLAPPED  ov;
+    WSABUF         wsabuffer[1];
+    HANDLE         ourevents[2];
+
+    ov.hEvent = NULL;
+    ov.Offset = ov.OffsetHigh = 0;
+    wsabuffer[0].buf = buffer;
+    wsabuffer[0].len = nbytes;
+
+    while(1)
+    {
+        if (WSARecv(sock, wsabuffer, 1, &bytesreceived, &flags, &ov, NULL) == SOCKET_ERROR)
+        {
+            switch (WSAGetLastError())
+            {
+            case WSAEWOULDBLOCK: continue;  /* try again */
+            case WSAENETRESET:
+            case WSAECONNRESET:
+            case WSAEDISCON:     return 0;  /* connection closed */
+            //case WSA_IO_PENDING: break;     /* okay */
+            default:             return -1; /* unexpected error */
+            }
+            ourevents[0] = (HANDLE) sock;
+            ourevents[1] = MC_MyCS_StopEvent;
+            if (WaitForMultipleObjects(2, ourevents, FALSE, 10000) != WAIT_OBJECT_0)
+            {
+                printf("MC_Recv(): Stop event or WaitForMultipleObjects() error\n");
+                return -1; /* Stop event or error */
+            }
+            else if (!WSAGetOverlappedResult(sock, &ov, &bytesreceived, FALSE, &flags))
+                return -1; /* error */
+        }
+        return bytesreceived; /* if we got here its due to a successful read */
+    }
+}
+
+static DWORD  Gulp(SOCKET sockfd )
+{
+    int             totalBytes;
+    int             numPackets;
+    int             bytesRead;
+    char            buffer[4096];
+
+    totalBytes = 0;
+    numPackets = 0;
+
+    do {
+        bytesRead = MC_Recv(sockfd, buffer,  4096);
+        if (bytesRead > 0 ) {
+            numPackets++;
+            totalBytes += bytesRead;
+        }
+    } while (bytesRead > 0) ;
+
+    //printf(" Read %d bytes in %d receives\n", totalBytes, numPackets);
+    return totalBytes;
+}
+
+
+static DWORD WINAPI
+MC_DoFetchUrl(LPVOID lpParam)
+{
+    struct hostent      *hostelement;
+    struct sockaddr_in  sock_addr;
+    DWORD               tmp;
+    int                 server_status = 0;
+    int                 ret_count = 0;
+    SOCKET              sockfd;
+    pthread_args_t      args;
+    char                retmsg[1024];
+    int                 size_retmsg;
+    int                 i;
+    struct linger       lo;
+    int                 bytesRead;
+
+    args = (pthread_args_t) lpParam;
+    size_retmsg = 1024;
+
+    bytesRead = 0;
+    for (i=0; i < iterationCount; i++)  {
+
+        memset((void *) &sock_addr, '\0', sizeof(sock_addr));
+        sock_addr.sin_family = AF_INET;
+        sock_addr.sin_port = htons((short) (args->port > 0 ? args->port : 80));
+
+        if ((sockfd = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0)) == INVALID_SOCKET) {
+            MC_ErrMsg(retmsg, size_retmsg, "500 Unable to create socket: ");
+            printf(retmsg);
+            //break;
+        }
+
+        if ((hostelement = gethostbyname(args->host)) == NULL) {
+            tmp = sprintf(retmsg, "Unable to resolve host name '%s':", args->host);
+            MC_GetLastErrorText(retmsg + tmp, size_retmsg - tmp, WSAGetLastError());
+            printf(retmsg);
+            break;
+        }
+
+        memcpy(&sock_addr.sin_addr, hostelement->h_addr, hostelement->h_length);
+        tmp = connect(sockfd, (struct sockaddr *) &sock_addr, sizeof(sock_addr));
+        if (tmp == SOCKET_ERROR) {
+            MC_ErrMsg(retmsg, size_retmsg, "500 Unable to connect to web server: ");
+            printf(retmsg);
+            //break;
+        }
+
+        lo.l_onoff  = 1;
+        lo.l_linger = 0;
+        if (setsockopt(sockfd, SOL_SOCKET, SO_LINGER,
+            (char *) &lo, sizeof(lo)) < 0) {
+            printf("HTDoConnect: Can't set sockopt SO_LINGER (%d)\n", errno);
+            break;
+        }
+
+        bytesRead += Gulp(sockfd);
+        shutdown(sockfd, SD_BOTH);
+        closesocket(sockfd);
+    }
+
+    WaitForSingleObject(threadCountMutex,INFINITE);
+        g_totalBytesRead += bytesRead;
+        doneThreads++;
+        printf("Thread ending..count=%d\n",doneThreads);
+        SetEvent(endThreadEvent);
+    ReleaseMutex(threadCountMutex);
+
+    return 1;
+}
+
+/* print an error message and exit the program */
+void die (char *format,...) {
+    va_list args;
+    char buffer[2048], *ptr=buffer;
+
+    va_start(args,format);
+    ptr += vsprintf (ptr, format, args);
+    va_end (args);
+    *(ptr++) = '\n';
+    *(ptr++) = '\0';
+
+    printf( buffer);
+
+    exit(1);
+}
+int InitChildLayer(void) {
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    int err;
+    int major, minor;
+
+    wVersionRequested = MAKEWORD( 2, 0 );
+
+    err = WSAStartup( wVersionRequested, &wsaData );
+    if ( err != 0 ) {
+    /* Tell the user that we couldn't find a useable */
+    /* WinSock DLL.                                  */
+    die ("Couldn't find a WinSock DLL!\n");
+    }
+
+    /* Confirm that the WinSock DLL supports 2.0.        */
+    /* Note that if the DLL supports versions greater    */
+    /* than 2.0 in addition to 2.0, it will still return */
+    /* 2.0 in wVersion since that is the version we      */
+    /* requested.                                        */
+
+    major = LOBYTE( wsaData.wVersion );
+    minor = LOBYTE( wsaData.wVersion );
+
+    if ( major < 1 || ( major == 1 && minor < 1 ) ) {
+    /* Tell the user that we couldn't find a useable */
+    /* WinSock DLL.                                  */
+    WSACleanup( );
+    die ("Require at least WinSock 1.1, your version is %d.%d!\n",
+         major, minor);
+    }
+    return 0;
+}
+
+void Usage()
+{
+    printf(
+            "Usage:\n"
+            "    gulp [options] \n"
+            "Options:\n"
+            "    /p:N             -- Port to connect to (default=5000)\n"
+            "    /a:nnn.nnn.nnn   -- address to connect to\n"
+            "    /i:N             -- number of iterations\n"
+            );
+}
+int main(int argc, char *argv[]) {
+
+    int                 arg;
+    pthread_args_t      blee;
+    BOOL                fNeedHelp       = FALSE;
+    char                *argn;
+    char                *argp;
+    char                *address;
+    DWORD               dwPort;
+    BOOL                bHaveAddress;
+    LARGE_INTEGER       before;
+    LARGE_INTEGER       after;
+    LARGE_INTEGER       frequency;
+    double              elapsed;
+    double              rate;
+    double              MBS;
+    double              mbs;
+    int                 i;
+    DWORD               dwThreadId;
+    HANDLE              hThread;
+
+    InitChildLayer();
+
+    endThreadEvent = CreateEvent(NULL,FALSE,FALSE,NULL);
+    threadCountMutex = CreateMutex(NULL,FALSE,NULL);
+    doneThreads = 0;
+
+    if (endThreadEvent == NULL) {
+        printf("Unable to allocate event!\n");
+        exit(1);
+    }
+
+   numThreads = 1;
+   dwPort = 5000;
+   iterationCount = 10;
+   fNeedHelp = FALSE;
+   bHaveAddress = FALSE;
+
+   for (arg = 1; arg < argc && !fNeedHelp; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            argn = argv[arg]+1;                   // Argument name
+            argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':') {
+                argp++;
+            }
+            if (*argp == ':')
+                *argp++ = '\0';
+
+            switch (argn[0]) {
+
+              case '?':                                 // Help
+                fNeedHelp = TRUE;
+                break;
+
+              case 'a':                                 // address to connect to
+              case 'A':
+                address = argp;
+                printf("Address = '%s'\n", argp);
+                bHaveAddress = TRUE;
+                break;
+
+              case 'i':                                 // iterations within thread
+              case 'I':
+                iterationCount = atoi(argp);
+                break;
+
+              case 'p':                                 // port to attach to
+              case 'P':
+                dwPort = (DWORD)atoi(argp);
+                break;
+
+              case 't':                                 // Number of  threads to start
+              case 'T':
+                numThreads = atoi(argp);
+                break;
+
+              default:
+                printf("Unknown argument: %s\n", argv[arg]);
+                fNeedHelp = TRUE;
+                break;
+            }
+        }
+        else {
+        }
+    }
+
+   if (fNeedHelp | !bHaveAddress) {
+        Usage();
+        exit(1);
+   }
+
+    printf ("Connecting to %s on port %d. threads=%d iterations=%d..", address, dwPort, numThreads, iterationCount);
+    blee  = malloc(sizeof(pthread_args_t));
+    blee->host = address;
+    blee->port = dwPort;
+
+#if 1
+    for (i=0; i < numThreads; i++) {
+        hThread = CreateThread(
+            NULL,                       // default security attributes
+            0,                          // use default stack size
+            MC_DoFetchUrl,              // thread function
+            blee,                       // argument to thread function
+            0,                          // use default creation flags
+            &dwThreadId);               // returns the thread identifier
+    }
+    //for (i=0; i < numThreads; i++) {
+    QueryPerformanceFrequency(&frequency);
+    QueryPerformanceCounter(&before);
+    while(doneThreads !=  numThreads ) {
+        WaitForSingleObject(endThreadEvent,INFINITE);
+        printf ("received %d of %d events, done=%d\n", i+1, numThreads, doneThreads);
+    }
+    QueryPerformanceCounter(&after);
+    after.QuadPart -= before.QuadPart;
+    elapsed = (double)after.QuadPart / (double)frequency.QuadPart;
+    rate = (double) g_totalBytesRead / elapsed;
+    printf("bytes read =%d, time elapsed = %10.3f seconds rate = %10.3f \n", g_totalBytesRead, elapsed, rate);
+    MBS =  rate / (double) (1024 *1024);
+    mbs =  MBS * 8;
+    printf("MB/s = %10.3f, mb/s = %10.3f\n", MBS, mbs);
+#else
+    MC_DoFetchUrl(blee);
+#endif
+    WSACleanup( );
+
+}
+
+
diff --git a/base/Windows/gulpserver/Makefile b/base/Windows/gulpserver/Makefile
new file mode 100644
index 0000000..c9ecfec
--- /dev/null
+++ b/base/Windows/gulpserver/Makefile
@@ -0,0 +1,47 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Benchmarks\gulpserver\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS=$(CFLAGS) /Ox /I..\inc \
+    /Fd$(OBJDIR)\gulpserver.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS)  /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+     user32.lib     \
+     kernel32.lib   \
+     libcmt.lib     \
+     ws2_32.lib     \
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\gulpserver.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\gulpserver.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+{.}.c{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+$(OBJDIR)\gulpserver.obj: gulpserver.c
+
+OBJS = \
+    $(OBJDIR)\gulpserver.obj \
+
+$(OBJDIR)\gulpserver.exe: $(OBJS)
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
+
+##############################################################################
diff --git a/base/Windows/gulpserver/gulpserver.c b/base/Windows/gulpserver/gulpserver.c
new file mode 100644
index 0000000..e9c10a0
--- /dev/null
+++ b/base/Windows/gulpserver/gulpserver.c
@@ -0,0 +1,341 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "winlean.h"
+#include "winsock2.h"
+#include <stdlib.h>
+#include <stdio.h>
+
+#define DEF_PACKET_SIZE 32
+#define MAX_PACKET 1024
+
+#define xmalloc(s) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (s))
+#define xfree(p)   HeapFree (GetProcessHeap(), 0, (p))
+/*
+ * This event is set when a control socket is closed before the end of a test.
+ * If the user kills the manager script then its end of the control socket will
+ * be closed.  We catch that and use this event to notify any worker threads
+ * associated with that control socket to stop what they're doing.
+ */
+_declspec (thread) void * MC_MyCS_StopEvent;
+
+/* print an error message and exit the program */
+void die (char *format,...) {
+    va_list args;
+    char buffer[2048], *ptr=buffer;
+
+    va_start(args,format);
+    ptr += vsprintf (ptr, format, args);
+    va_end (args);
+    *(ptr++) = '\n';
+    *(ptr++) = '\0';
+
+    printf( buffer);
+
+    exit(1);
+}
+int InitChildLayer(void) {
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    int err;
+    int major, minor;
+
+    wVersionRequested = MAKEWORD( 2, 0 );
+
+    err = WSAStartup( wVersionRequested, &wsaData );
+    if ( err != 0 ) {
+    /* Tell the user that we couldn't find a useable */
+    /* WinSock DLL.                                  */
+    die ("Couldn't find a WinSock DLL!\n");
+    }
+
+    /* Confirm that the WinSock DLL supports 2.0.        */
+    /* Note that if the DLL supports versions greater    */
+    /* than 2.0 in addition to 2.0, it will still return */
+    /* 2.0 in wVersion since that is the version we      */
+    /* requested.                                        */
+
+    major = LOBYTE( wsaData.wVersion );
+    minor = LOBYTE( wsaData.wVersion );
+
+    if ( major < 1 || ( major == 1 && minor < 1 ) ) {
+    /* Tell the user that we couldn't find a useable */
+    /* WinSock DLL.                                  */
+    WSACleanup( );
+    die ("Require at least WinSock 1.1, your version is %d.%d!\n",
+         major, minor);
+    }
+    return 0;
+}
+static USHORT
+checksum(USHORT *buffer, int size)
+{
+    unsigned long cksum=0;
+
+    while(size > 1)
+    {
+        cksum += *buffer++;
+        size -= sizeof(USHORT);
+    }
+
+    if (size)
+        cksum += *(UCHAR*)buffer; /* if there's an odd number of bytes */
+
+    cksum = (cksum >> 16) + (cksum & 0xffff);
+    cksum += (cksum >> 16);
+    return (USHORT)(~cksum);
+}
+
+
+/*
+ * MC_GetLastErrorText
+ *
+ *  PURPOSE: copies error message text to string
+ *
+ *  PARAMETERS:
+ *    lpszBuf - destination buffer
+ *    dwSize - size of buffer
+ *
+ *  RETURN VALUE:
+ *    destination buffer
+ */
+LPSTR
+MC_GetLastErrorText(LPSTR lpszBuf, DWORD dwSize, DWORD errnum)
+{
+    DWORD dwRet;
+    LPTSTR lpszTemp = NULL;
+
+    dwRet = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                           NULL,
+                           errnum,
+                           LANG_NEUTRAL,
+                           (LPTSTR)&lpszTemp,
+                           0,
+                           NULL );
+
+    if ( !dwRet)
+        sprintf(lpszBuf, "error number %d", errnum); /* no message so use errnum */
+    else
+    {
+        lpszTemp[lstrlen(lpszTemp)-2] = '\0';  /* remove cr and newline characters */
+        sprintf(lpszBuf, "%s (0x%x)", lpszTemp, errnum);
+    }
+
+    if (lpszTemp)
+        LocalFree((HLOCAL) lpszTemp );
+
+    return lpszBuf;
+}
+
+
+static void
+MC_ErrMsg(LPSTR buf, DWORD bufsize, LPCSTR msg)
+{
+     DWORD tmp;
+
+     tmp = strlen(strcpy(buf, msg));
+     MC_GetLastErrorText(buf + tmp, bufsize - tmp, WSAGetLastError());
+}
+
+/*
+ *  FUNCTION: MC_Recv
+ *
+ *  PURPOSE: A replacement for the Winsock recv() routine.  This version uses
+ *           overlapped I/O to look for data on a socket and also watch
+ *           for the Stop event.
+ *
+ *  PARAMETERS:
+ *    sock - read from this socket.
+ *    buffer - place incoming data into this buffer.
+ *    nbytes - the amount of storage in the buffer.
+ *
+ *  RETURN VALUE:
+ *    -1 - error.
+ *    0  - the socket connection has been closed.
+ *    >0 - the number of bytes read.
+ */
+int
+MC_Recv(SOCKET sock, char *buffer, int nbytes)
+{
+    DWORD          bytesreceived;
+    DWORD          flags = 0;
+    WSAOVERLAPPED  ov;
+    WSABUF         wsabuffer[1];
+    HANDLE         ourevents[2];
+
+    ov.hEvent = NULL;
+    ov.Offset = ov.OffsetHigh = 0;
+    wsabuffer[0].buf = buffer;
+    wsabuffer[0].len = nbytes;
+
+    while(1)
+    {
+        if (WSARecv(sock, wsabuffer, 1, &bytesreceived, &flags, &ov, NULL) == SOCKET_ERROR)
+        {
+            switch (WSAGetLastError())
+            {
+            case WSAEWOULDBLOCK: continue;  /* try again */
+            case WSAENETRESET:
+            case WSAECONNRESET:
+            case WSAEDISCON:     return 0;  /* connection closed */
+            //case WSA_IO_PENDING: break;     /* okay */
+            default:             return -1; /* unexpected error */
+            }
+            ourevents[0] = (HANDLE) sock;
+            ourevents[1] = MC_MyCS_StopEvent;
+            if (WaitForMultipleObjects(2, ourevents, FALSE, INFINITE) != WAIT_OBJECT_0)
+            {
+                printf("MC_Recv(): Stop event or WaitForMultipleObjects() error\n");
+                return -1; /* Stop event or error */
+            }
+            else if (!WSAGetOverlappedResult(sock, &ov, &bytesreceived, FALSE, &flags))
+                return -1; /* error */
+        }
+        return bytesreceived; /* if we got here its due to a successful read */
+    }
+}
+
+static DWORD  WINAPI Gulp(LPVOID lpParam )
+{
+    int         totalBytes;
+    int         numPackets;
+    int         bytesRead;
+    char        buffer[4096];
+    SOCKET      sockfd;
+
+    INT64 startCounter, endCounter, frequency;
+
+    totalBytes = 0;
+    numPackets = 0;
+    sockfd = *(SOCKET *) lpParam;
+
+    QueryPerformanceCounter((PLARGE_INTEGER)&startCounter);
+    do {
+        bytesRead = MC_Recv(sockfd, buffer,  4096);
+        if (bytesRead > 0 ) {
+            numPackets++;
+            totalBytes += bytesRead;
+        }
+    } while (bytesRead > 0) ;
+    QueryPerformanceCounter((PLARGE_INTEGER)&endCounter);
+    QueryPerformanceFrequency((PLARGE_INTEGER)&frequency);
+
+    printf(" Read %d bytes / %d KB / %d MB in %d receives\n",
+           totalBytes, totalBytes / 1024, totalBytes / 1048576, numPackets);
+
+    if (endCounter != startCounter) {
+        double tau = (double)(endCounter - startCounter) / (double)frequency;
+        double bps = totalBytes * 8.0 / tau;
+
+        printf("Transferred in %.3e seconds => %.3e bps\n",
+               tau, bps);
+    }
+    else {
+        printf("Transfer too quick to measure with this clock\n");
+    }
+
+    return 1;
+}
+
+static DWORD listener (int port, LPSTR retmsg, DWORD size_retmsg)
+{
+    struct sockaddr_in  sock_addr;
+    DWORD       tmp;
+    int         server_status = 0;
+    int         ret_count = 0;
+    SOCKET      listenSockfd;
+    SOCKET      sockfd;
+    HANDLE      hThread;
+    DWORD       dwThreadId;
+
+
+    memset((void *) &sock_addr, '\0', sizeof(sock_addr));
+    sock_addr.sin_family = AF_INET;
+    sock_addr.sin_addr.S_un.S_addr = INADDR_ANY;
+    sock_addr.sin_port = htons((short) (port > 0 ? port : 80));
+
+    if ((listenSockfd = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0)) == INVALID_SOCKET)
+    {
+        MC_ErrMsg(retmsg, size_retmsg, "500 Unable to create socket: ");
+        printf(retmsg);
+        return -1;
+    }
+    if ((listenSockfd = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0)) == INVALID_SOCKET)
+    {
+        MC_ErrMsg(retmsg, size_retmsg, "500 Unable to create socket: ");
+        printf(retmsg);
+        return -1;
+    }
+
+    tmp = bind(listenSockfd, (struct sockaddr *) &sock_addr, sizeof(sock_addr));
+    if (tmp == SOCKET_ERROR)
+    {
+        MC_ErrMsg(retmsg, size_retmsg, "500 Unable to bind to socket: ");
+        printf(retmsg);
+        return -1;
+    }
+
+    tmp = listen( listenSockfd,10);
+    if (tmp == SOCKET_ERROR)
+    {
+        MC_ErrMsg(retmsg, size_retmsg, "500 Unable to listen on socket: ");
+        printf(retmsg);
+        return -1;
+    }
+    do {
+        printf("\n listening\n");
+        sockfd  = accept(listenSockfd,0,0);
+        if (sockfd == SOCKET_ERROR)
+        {
+            MC_ErrMsg(retmsg, size_retmsg, "500 Unable to accept on socket: ");
+            printf(retmsg);
+            return -1;
+        }
+        printf(" ...Accepted connection\n");
+
+        hThread = CreateThread(
+            NULL,                        // default security attributes
+            0,                           // use default stack size
+            Gulp,                        // thread function
+            &sockfd,                // argument to thread function
+            0,                           // use default creation flags
+            &dwThreadId);                // returns the thread identifier
+
+    // Check the return value for success.
+
+    if (hThread == NULL)
+    {
+        printf("CreateThread failed." );
+    }
+    else
+    {
+        CloseHandle( hThread );
+    }
+
+    } while (TRUE);
+}
+
+
+
+
+int main(int argc, char *argv[]) {
+
+    char retmsg[1024];
+    int foo;
+
+    if (argc < 2 ) {
+        printf("gulpserver port\n");
+        printf("    listens on port for TCP blast client \n");
+        return -1;
+    }
+    foo = atoi(argv[1]);
+    InitChildLayer();
+    printf (" Listening on port %d ...",foo);
+    listener(foo, retmsg, 1024);
+    WSACleanup( );
+
+}
+
+
diff --git a/base/Windows/mkasm/Makefile b/base/Windows/mkasm/Makefile
new file mode 100644
index 0000000..0abb2e4
--- /dev/null
+++ b/base/Windows/mkasm/Makefile
@@ -0,0 +1,71 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Mkasm\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS=$(CFLAGS) /I..\inc\
+    -DWIN32 -DNT /Fd$(OBJDIR)\mkasm.pdb
+
+HOST_LINKFLAGS=$(HOST_LINKFLAGS) /nod /libpath:..\lib /subsystem:console
+
+LIBS=\
+    kernel32.lib    \
+    libcmt.lib        \
+
+##############################################################################
+
+.SUFFIXES: .cpp .obj
+
+{.}.cpp{$(OBJDIR)}.obj:
+    $(HOST_CC) /c /nologo $(CFLAGS) /Fo$@ $<
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mkasm.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\mkasm.exe
+    $(SDEDIT) ..\..\build\mkasm.*
+    $(COPY) $(OBJDIR)\mkasm.exe ..\..\build
+    $(COPY) $(OBJDIR)\mkasm.pdb ..\..\build
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\mkasm.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+test: $(OBJDIR) $(OBJDIR)\mkasm.exe
+    $(OBJDIR)\mkasm /o:test.asm /b /l /n:Microsoft.Singularity /c:Shell /f:Logo /a slide1.bmp slide2.bmp slide3.bmp
+    ml /c test.asm
+
+test1: $(OBJDIR) $(OBJDIR)\mkasm.exe $(OBJDIR)\test.exe
+    $(OBJDIR)\mkasm -o:$(OBJDIR)\test.asm -r:TEST $(OBJDIR)\test.exe
+
+$(OBJDIR)\mkasm.exe : $(OBJDIR)\mkasm.obj
+    @echo Linking $@
+    link $(HOST_LINKFLAGS) /out:$@ $(OBJDIR)\mkasm.obj $(LIBS)
+
+$(OBJDIR)\test.exe : $(OBJDIR)\mkasm.obj
+    @echo Linking $@
+    link $(HOST_LINKFLAGS) /out:$@ $(OBJDIR)\mkasm.obj $(LIBS) \
+        /base:0x60000 /fixed /ignore:4078,4096 \
+        /merge:.rdata=.data /merge:.bss=.data /merge:.data=.text
+
+
+$(OBJDIR)\mkasm.obj : mkasm.cpp
+
+################################################################# End of File.
diff --git a/base/Windows/mkasm/mkasm.cpp b/base/Windows/mkasm/mkasm.cpp
new file mode 100644
index 0000000..606a2c7
--- /dev/null
+++ b/base/Windows/mkasm/mkasm.cpp
@@ -0,0 +1,1264 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       mkasm.cpp
+//
+//  Contents:   Converts binary files into .asm or .cs files.
+//
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <winlean.h>
+#include <assert.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//
+enum {
+    TARGET_BASE     = 0x60000,
+    TARGET_RANGE    = 0x10000,
+};
+
+BOOL fAsm = TRUE;
+BOOL fCpp = FALSE;
+BOOL fManaged = FALSE;
+BOOL fCompress = FALSE;
+BOOL fList = FALSE;
+BOOL fAllow64 = FALSE;
+
+CHAR szByteByteVTable[] = "?_vtable@ClassVector_ClassVector_uint8@@2UClass_System_VTable@@A";
+// struct Class_System_VTable ClassVector_ClassVector_uint8::_vtable
+
+CHAR szByteByteSuffix[] = "@@2PAUClassVector_ClassVector_uint8@@A";
+// ?c_Content@Class_Microsoft_Singularity_Shell_Slides@@2PAUClassVector_ClassVector_uint8@@A
+// struct ClassVector_ClassVector_uint8 * Class_Microsoft_Singularity_Shell_Slides::c_Content
+
+CHAR szByteVTable[] = "?_vtable@ClassVector_uint8@@2UClass_System_VTable@@A";
+// struct Class_System_VTable ClassVector_uint8::_vtable
+
+CHAR szByteSuffix[] = "@@2PAUClassVector_uint8@@A";
+// ?c_Content@Class_Microsoft_Singularity_Shell_Slides@@2PAUClassVector_ClassVector_uint8@@A
+// struct ClassVector_ClassVector_uint8 * Class_Microsoft_Singularity_Shell_Slides::c_Content
+
+
+//////////////////////////////////////////////////////////////////////////////
+class CFileInfo
+{
+  public:
+    CFileInfo()
+    {
+        m_pszFile = NULL;
+        m_pNext = NULL;
+        m_cbInput = 0;
+        m_cbOutput = 0;
+    }
+
+    BOOL SetFileName(PCSTR pszFile)
+    {
+        m_pszFile = pszFile;
+        return TRUE;
+    }
+
+    BOOL SetFileAndSize()
+    {
+        HANDLE hFile = CreateFile(m_pszFile,
+                                  GENERIC_READ,
+                                  FILE_SHARE_READ,
+                                  NULL,
+                                  OPEN_EXISTING,
+                                  0,
+                                  NULL);
+        if (hFile == INVALID_HANDLE_VALUE) {
+            return FALSE;
+        }
+
+        m_cbInput = GetFileSize(hFile, NULL);
+        CloseHandle(hFile);
+
+        if (m_cbInput == 0xffffffff) {
+            m_cbInput = 0;
+            return FALSE;
+        }
+
+        m_cbOutput = m_cbInput;
+        return TRUE;
+    }
+
+    BOOL SetOutputSize(UINT32 cbOutput)
+    {
+        m_cbOutput = cbOutput;
+        return TRUE;
+    }
+
+    CFileInfo * m_pNext;
+    PCSTR       m_pszFile;
+    UINT32      m_cbInput;
+    UINT32      m_cbOutput;
+};
+
+//////////////////////////////////////////////////////////////////// CFileMap.
+//
+class CFileMap
+{
+  public:
+    CFileMap();
+    ~CFileMap();
+
+  public:
+    BOOL    Load(PCSTR pszFile);
+    PBYTE   Seek(UINT32 cbPos);
+    UINT32  Size();
+    VOID    Close();
+
+  protected:
+    PBYTE   m_pbData;
+    UINT32  m_cbData;
+};
+
+CFileMap::CFileMap()
+{
+    m_pbData = NULL;
+    m_cbData = 0;
+}
+
+CFileMap::~CFileMap()
+{
+    Close();
+}
+
+VOID CFileMap::Close()
+{
+    if (m_pbData) {
+        UnmapViewOfFile(m_pbData);
+        m_pbData = NULL;
+    }
+    m_cbData = 0;
+}
+
+UINT32 CFileMap::Size()
+{
+    return m_cbData;
+}
+
+PBYTE CFileMap::Seek(UINT32 cbPos)
+{
+    if (m_pbData && cbPos <= m_cbData) {
+        return m_pbData + cbPos;
+    }
+    return NULL;
+}
+
+BOOL CFileMap::Load(PCSTR pszFile)
+{
+    Close();
+
+    HANDLE hFile = CreateFile(pszFile,
+                              GENERIC_READ,
+                              FILE_SHARE_READ,
+                              NULL,
+                              OPEN_EXISTING,
+                              0,
+                              NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    ULONG cbInFileData = GetFileSize(hFile, NULL);
+    if (cbInFileData == 0xffffffff) {
+        CloseHandle(hFile);
+        return FALSE;
+    }
+
+    HANDLE hInFileMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    CloseHandle(hFile);
+    if (hInFileMap == NULL) {
+        return FALSE;
+    }
+
+    m_pbData = (PBYTE)MapViewOfFile(hInFileMap, FILE_MAP_COPY, 0, 0, 0);
+    CloseHandle(hInFileMap);
+    if (m_pbData == NULL) {
+        return FALSE;
+    }
+    m_cbData = cbInFileData;
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////// CFileOut.
+//
+class CFileOut
+{
+  public:
+    CFileOut();
+    ~CFileOut();
+
+  public:
+    BOOL    Create(PCSTR pszFile);
+    BOOL    IsOpen();
+
+    BOOL    Write(PBYTE pbData, UINT32 cbData);
+    BOOL    Print(PCSTR pszMsg, ...);
+    BOOL    VPrint(PCSTR pszMsg, va_list args);
+    BOOL    Delete();
+
+    VOID    Close();
+
+  protected:
+    HANDLE  m_hFile;
+    CHAR    m_szFile[MAX_PATH];
+    CHAR    m_szBuffer[4096];
+    INT     m_cbBuffer;
+};
+
+CFileOut::CFileOut()
+{
+    m_hFile = INVALID_HANDLE_VALUE;
+    m_szFile[0] = '\0';
+    m_cbBuffer = 0;
+}
+
+CFileOut::~CFileOut()
+{
+    Close();
+}
+
+VOID CFileOut::Close()
+{
+    if (m_hFile != INVALID_HANDLE_VALUE) {
+        if (m_cbBuffer) {
+            Write((PBYTE)m_szBuffer, m_cbBuffer);
+            m_cbBuffer = 0;
+        }
+        CloseHandle(m_hFile);
+        m_hFile = INVALID_HANDLE_VALUE;
+    }
+}
+
+BOOL CFileOut::IsOpen()
+{
+    return (m_hFile != INVALID_HANDLE_VALUE);
+}
+
+BOOL CFileOut::Write(PBYTE pbData, UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    DWORD dwWrote = 0;
+    if (!WriteFile(m_hFile, pbData, cbData, &dwWrote, NULL) || dwWrote != cbData) {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+BOOL CFileOut::VPrint(PCSTR pszMsg, va_list args)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    INT cbUsed = m_cbBuffer;
+    INT cbData;
+
+    cbData = _vsnprintf(m_szBuffer + cbUsed, sizeof(m_szBuffer)-cbUsed-1, pszMsg, args);
+    m_cbBuffer += cbData;
+
+    if (m_szBuffer[m_cbBuffer - 1] == '\n' ||
+        m_szBuffer[m_cbBuffer - 1] == '\r') {
+
+        cbData = m_cbBuffer;
+        m_cbBuffer = 0;
+        return Write((PBYTE)m_szBuffer, cbData);
+    }
+    return TRUE;
+}
+
+BOOL CFileOut::Print(PCSTR pszMsg, ...)
+{
+    BOOL f;
+
+    va_list args;
+    va_start(args, pszMsg);
+    f = VPrint(pszMsg, args);
+    va_end(args);
+
+    return f;
+}
+
+BOOL CFileOut::Delete()
+{
+    if (m_hFile != INVALID_HANDLE_VALUE) {
+        Close();
+        return DeleteFile(m_szFile);
+    }
+    return FALSE;
+}
+
+BOOL CFileOut::Create(PCSTR pszFile)
+{
+    Close();
+    m_szFile[0] = '\0';
+    m_hFile = CreateFile(pszFile,
+                         GENERIC_WRITE,
+                         0, NULL, CREATE_ALWAYS,
+                         FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+    strcpy(m_szFile, pszFile);
+    m_cbBuffer = 0;
+    return TRUE;
+}
+//
+//////////////////////////////////////////////////////////////////////////////
+
+class COutput
+{
+    protected:
+    UINT m_nOffset;
+    CFileOut *m_pfOutput;
+
+    public:
+    COutput(CFileOut *pfOutput)
+    {
+        m_pfOutput = pfOutput;
+        m_nOffset = 0;
+    }
+
+    BOOL VPrint(PCSTR pszMsg, va_list args)
+    {
+        return m_pfOutput->VPrint(pszMsg, args);
+    }
+
+    BOOL Print(PCSTR pszMsg, ...)
+    {
+        BOOL f;
+
+        va_list args;
+        va_start(args, pszMsg);
+        f = m_pfOutput->VPrint(pszMsg, args);
+        va_end(args);
+
+        return f;
+    }
+
+    virtual void Dump(PBYTE pbData, UINT cbData) = 0;
+
+    virtual void Finish()
+    {
+        if ((m_nOffset % 16) != 0) {
+            m_pfOutput->Print("\n");
+        }
+        m_nOffset = 0;
+    }
+
+    UINT Size()
+    {
+        return m_nOffset;
+    }
+};
+
+class CAsmOutput : public COutput
+{
+    public:
+    CAsmOutput(CFileOut *pfOutput)
+        : COutput(pfOutput)
+    {
+    }
+
+    void Dump(PBYTE pbData, UINT cbData)
+    {
+        PBYTE pbEnd = pbData + cbData;
+
+        for (; pbData < pbEnd; pbData++, m_nOffset++) {
+            switch (m_nOffset % 16) {
+              case 0:
+                Print("        uint8   %03xh", *pbData);
+                break;
+              default:
+                Print(",%03xh", *pbData);
+                break;
+              case 15:
+                Print(",%03xh\n", *pbData);
+                break;
+            }
+        }
+    }
+};
+
+class CSharpOutput : public COutput
+{
+    public:
+    CSharpOutput(CFileOut *pfOutput)
+        : COutput(pfOutput)
+    {
+    }
+
+    void Dump(PBYTE pbData, UINT cbData)
+    {
+        PBYTE pbEnd = pbData + cbData;
+
+        for (; pbData < pbEnd; pbData++, m_nOffset++) {
+            switch (m_nOffset % 16) {
+              case 0:
+                Print("            0x%02x,", *pbData);
+                break;
+              default:
+                Print("0x%02x,", *pbData);
+                break;
+              case 15:
+                Print("0x%02x,\n", *pbData);
+                break;
+            }
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+UINT DumpBmp(COutput *output, PBYTE pbData, UINT cbData)
+{
+#pragma pack(2)
+    struct BITMAPFILEHEADER {
+        UINT16  bfType;
+        UINT32  bfSize;
+        UINT16  bfReserved1;
+        UINT16  bfReserved2;
+        UINT32  bfOffBits;
+    };
+
+    struct BITMAPINFOHEADER {
+        UINT32  biSize;
+        UINT32  biWidth;
+        UINT32  biHeight;
+        UINT16  biPlanes;
+        UINT16  biBitCount;
+        UINT32  biCompression;
+        UINT32  biSizeImage;
+        UINT32  biXPelsPerMeter;
+        UINT32  biYPelsPerMeter;
+        UINT32  biClrUsed;
+        UINT32  biClrImportant;
+    };
+#pragma pack()
+
+    BITMAPFILEHEADER *pbmf = (BITMAPFILEHEADER *)pbData;
+    BITMAPINFOHEADER *pbmi = (BITMAPINFOHEADER *)(pbmf + 1);
+
+    if (pbmf->bfType != 'MB') {
+        fprintf(stderr, "Can't convert non-BMP files to BMP compression.\n");
+        return 0;
+    }
+
+    UINT cbDumped = 0;
+    INT16 nValue;
+    UINT cbScanLine = (((pbmi->biWidth * pbmi->biBitCount) + 31) & ~31) / 8;
+    PBYTE pbLine = pbData + pbmf->bfOffBits;
+    //PBYTE pbOut = pbData + pbmf->bfOffBits;
+
+    pbmi->biCompression |= 0xff000000;
+    if (output != NULL) {
+        output->Dump(pbData, pbmf->bfOffBits);
+    }
+    cbDumped += pbmf->bfOffBits;
+
+    for (UINT i = 0; i < pbmi->biHeight; i++) {
+        PBYTE pbIn = pbLine;
+        PBYTE pbRaw = pbIn;
+        PBYTE pbEnd = pbLine + cbScanLine;
+
+        while (pbIn < pbEnd) {
+            if (pbIn + 6 < pbEnd &&
+                pbIn[3] == pbIn[0] &&
+                pbIn[4] == pbIn[1] &&
+                pbIn[5] == pbIn[2]) {
+
+                PBYTE pbBase = pbIn;
+                pbIn += 3;
+
+                while (pbIn + 3 <= pbEnd &&
+                       pbIn[0] == pbBase[0] &&
+                       pbIn[1] == pbBase[1] &&
+                       pbIn[2] == pbBase[2]) {
+
+                    pbIn += 3;
+                }
+
+                if (pbBase > pbRaw) {
+                    nValue = (INT16)(pbBase - pbRaw);
+                    if (output != NULL) {
+                        output->Dump((PBYTE)&nValue, sizeof(nValue));
+                        output->Dump(pbRaw, pbBase - pbRaw);
+                    }
+                    cbDumped += sizeof(nValue);
+                    cbDumped += pbBase - pbRaw;
+                }
+
+                nValue = (INT16)(-((pbIn - pbBase) / 3));
+                if (output != NULL) {
+                    output->Dump((PBYTE)&nValue, sizeof(nValue));
+                    output->Dump(pbBase, 3);
+                }
+                cbDumped += sizeof(nValue);
+                cbDumped += 3;
+
+                pbRaw = pbIn;
+            }
+            else {
+                pbIn++;
+            }
+        }
+
+        if (pbEnd > pbRaw) {
+            nValue = (INT16)(pbEnd - pbRaw);
+            if (output != NULL) {
+                output->Dump((PBYTE)&nValue, sizeof(nValue));
+                output->Dump(pbRaw, pbEnd - pbRaw);
+            }
+            cbDumped += sizeof(nValue);
+            cbDumped += pbEnd - pbRaw;
+        }
+
+        pbLine += cbScanLine;
+    }
+
+    if (output != NULL) {
+        printf("    From %8d to %8d bytes\n", cbData, cbDumped);
+        if (output->Size() != cbDumped) {
+            fprintf(stderr, "Failure in compression: %d reported, %d written\n",
+                    cbDumped, output->Size());
+        }
+        output->Finish();
+    }
+
+    return cbDumped;
+}
+
+char *find_contents64(CFileMap *pfFile,
+					PIMAGE_NT_HEADERS64 ppe,
+                    UINT32 *pcbEntry,
+                    UINT32 *pcbBase,
+                    UINT32 *pcbSize,
+                    PBYTE *ppbData)
+{
+    PIMAGE_SECTION_HEADER psec;
+
+    fprintf(stderr,"Processing a 64-bit image.\n"); 
+	
+	psec = IMAGE_FIRST_SECTION(ppe);
+
+    if (ppe->FileHeader.NumberOfSections != 1) {
+        fprintf(stderr, "Warning: More than one section (.pdata)\n");
+    }
+
+    if (ppe->OptionalHeader.SizeOfInitializedData != 0) {
+        fprintf(stderr, "Image has initialized data outside of text section.\n");
+    }
+
+    if (ppe->OptionalHeader.SizeOfUninitializedData != 0) {
+        return "Image has uninitialized data outside of text section.";
+    }
+
+    if (psec->PointerToRawData == 0) {
+        return "Image has no text content.";
+    }
+
+    if (pfFile->Seek(psec->PointerToRawData) == NULL) {
+        return "Image text section is invalid.";
+    }
+
+    *pcbEntry =(UINT32) ppe->OptionalHeader.ImageBase + ppe->OptionalHeader.AddressOfEntryPoint;
+    *pcbBase = (UINT32) ppe->OptionalHeader.ImageBase;
+    *pcbSize = ppe->OptionalHeader.SizeOfImage;
+    *ppbData = pfFile->Seek(0);
+	
+	return NULL;
+}
+char *find_contents32(CFileMap *pfFile,
+					PIMAGE_NT_HEADERS ppe,
+                    UINT32 *pcbEntry,
+                    UINT32 *pcbBase,
+                    UINT32 *pcbSize,
+                    PBYTE *ppbData)
+{
+    PIMAGE_SECTION_HEADER psec;
+
+	psec = IMAGE_FIRST_SECTION(ppe);
+
+    if (ppe->FileHeader.NumberOfSections != 1) {
+        return "Image has more than one sections.";
+    }
+
+    if (ppe->OptionalHeader.SizeOfInitializedData != 0) {
+        return "Image has initialized data outside of text section.";
+    }
+
+    if (ppe->OptionalHeader.SizeOfUninitializedData != 0) {
+        return "Image has uninitialized data outside of text section.";
+    }
+
+    if (psec->PointerToRawData == 0) {
+        return "Image has no text content.";
+    }
+
+    if (pfFile->Seek(psec->PointerToRawData) == NULL) {
+        return "Image text section is invalid.";
+    }
+
+    *pcbEntry = ppe->OptionalHeader.ImageBase + ppe->OptionalHeader.AddressOfEntryPoint;
+    *pcbBase = ppe->OptionalHeader.ImageBase;
+    *pcbSize = ppe->OptionalHeader.SizeOfImage;
+    *ppbData = pfFile->Seek(0);
+	
+	return NULL;
+}
+
+char *find_contents(CFileMap *pfFile,
+                    UINT32 *pcbEntry,
+                    UINT32 *pcbBase,
+                    UINT32 *pcbSize,
+                    PBYTE *ppbData)
+{
+    PIMAGE_DOS_HEADER pdos;
+    PIMAGE_NT_HEADERS ppe;
+    //PIMAGE_NT_HEADERS64 ppe64;
+
+    *pcbEntry = 0;
+    *pcbBase = 0;
+    *pcbSize = 0;
+    *ppbData = NULL;
+
+    // Read in the PE image header
+    //
+    pdos = (PIMAGE_DOS_HEADER)pfFile->Seek(0);
+    if (pdos == NULL || pdos->e_magic != IMAGE_DOS_SIGNATURE) {
+        return "Image doesn't have MZ signature.";
+    }
+
+    ppe = (PIMAGE_NT_HEADERS)pfFile->Seek(pdos->e_lfanew);
+    if (ppe == NULL || ppe->Signature != IMAGE_NT_SIGNATURE) {
+        return "Image doesn't have PE signature.";
+    }
+
+    if (ppe->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) {
+        if (fAllow64) {
+		    return find_contents64(pfFile, (PIMAGE_NT_HEADERS64) ppe, pcbEntry, pcbBase, pcbSize, ppbData);
+	    }
+        else {
+            return "Image is 64-bit. Use /64 option";
+        }
+    }
+	else return find_contents32(pfFile, ppe, pcbEntry, pcbBase, pcbSize, ppbData);
+}
+
+BOOL dump_pe(COutput *pOutput, CFileMap *pInput, PCSTR pszRoot)
+{
+    UINT32 cbEntry = 0;
+    UINT32 cbBase = 0;
+    UINT32 cbSize = 0;
+    PBYTE pbData = NULL;
+
+    char *error = find_contents(pInput, &cbEntry, &cbBase, &cbSize, &pbData);
+    if (error != NULL) {
+        fprintf(stderr, "Failed: %s\n", error);
+        return FALSE;
+    }
+
+    if (cbEntry < cbBase || cbEntry >= cbBase + cbSize) {
+        fprintf(stderr, "Failed: Image entry point is not in text section.");
+        return FALSE;
+    }
+
+    if (cbBase < TARGET_BASE || cbBase > TARGET_BASE + TARGET_RANGE) {
+        fprintf(stderr, "Failed: Image is not based at 0x%x.\n", TARGET_BASE);
+        return FALSE;
+    }
+
+    printf("Total text section:  %d bytes\n", cbSize);
+
+    // Write .asm data.
+    //
+    pOutput->Print("%s_ent  EQU  0%08xh\n", pszRoot, cbEntry);
+    pOutput->Print("%s_dst  EQU  0%08xh\n", pszRoot, cbBase);
+    pOutput->Print("%s_siz  EQU  0%08xh\n", pszRoot, cbSize);
+    pOutput->Print("%s_dat  ", pszRoot);
+    pOutput->Dump(pbData, cbSize);
+    pOutput->Finish();
+    pOutput->Print("\n");
+
+    return TRUE;
+}
+
+BOOL blob_to_asm(COutput *pOutput, CFileMap *pInput)
+{
+    // Copy the rest of the image.
+    //
+    pOutput->Dump(pInput->Seek(0), pInput->Size());
+    pOutput->Finish();
+    return TRUE;
+}
+
+int CompareName(PCSTR psz1, PCSTR psz2)
+{
+    for (;;) {
+        CHAR c1 = *psz1;
+        CHAR c2 = *psz2;
+        if (c1 >= 'A' && c1 <= 'Z') {
+            c1 = c1 - 'A' + 'a';
+        }
+        if (c2 >= 'A' && c2 <= 'Z') {
+            c2 = c2 - 'A' + 'a';
+        }
+
+        if ((c1 >= '0' && c1 <= '9') && (c2 >= '0' && c2 <= '9')) {
+            for (c1 = 0; *psz1 >= '0' && *psz1 <= '9'; psz1++) {
+                c1 = c1 * 10 + (*psz1 - '0');
+            }
+            psz1--;
+            for (c2 = 0; *psz2 >= '0' && *psz2 <= '9'; psz2++) {
+                c2 = c2 * 10 + (*psz2 - '0');
+            }
+            psz2--;
+
+        }
+        if (c1 != c2) {
+            return c1 - c2;
+        }
+        if (c1 == 0 && c2 == 0) {
+            return 0;
+        }
+        psz1++;
+        psz2++;
+    }
+}
+
+PCHAR AppendToName(PCHAR pszDst, PCSTR pszSrc)
+{
+    while (*pszSrc) {
+        if (*pszSrc == '.') {
+            *pszDst++ = '_';
+            pszSrc++;
+        }
+        else {
+            *pszDst++ = *pszSrc++;
+        }
+    }
+    return pszDst;
+}
+
+void AsmName(PCHAR pszAsmName, PCSTR pszNamespace, PCSTR pszClass, PCSTR pszField)
+{
+    pszAsmName = AppendToName(pszAsmName, "?c_");
+    pszAsmName = AppendToName(pszAsmName, pszField);
+    pszAsmName = AppendToName(pszAsmName, "@Class_");
+    pszAsmName = AppendToName(pszAsmName, pszNamespace);
+    pszAsmName = AppendToName(pszAsmName, "_");
+    pszAsmName = AppendToName(pszAsmName, pszClass);
+    *pszAsmName = '\0';
+}
+
+void CppClassName(PCHAR pszCppClassName, PCSTR pszNamespace, PCSTR pszClass)
+{
+    pszCppClassName = AppendToName(pszCppClassName, "Class_");
+    pszCppClassName = AppendToName(pszCppClassName, pszNamespace);
+    pszCppClassName = AppendToName(pszCppClassName, "_");
+    pszCppClassName = AppendToName(pszCppClassName, pszClass);
+    *pszCppClassName = '\0';
+}
+
+int __cdecl main(int argc, char **argv)
+{
+    BOOL fNeedHelp = FALSE;
+    BOOL fFlattenPE = TRUE;
+    PCSTR pszRoot = "asm";
+    CFileOut cfOutput;
+    CFileInfo rFiles[512];
+    CFileInfo *pFiles = NULL;
+    UINT cFiles = 0;
+    CHAR szField[256] = "";
+    CHAR szClass[512] = "";
+    CHAR szNamespace[512] = "";
+    CHAR szAsmName[1024];
+    CHAR szCppClassName[1024];
+
+    for (int arg = 1; arg < argc; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            char *argn = argv[arg]+1;                   // Argument name
+            char *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':')
+                argp++;
+            if (*argp == ':')
+                *argp++ = '\0';
+
+            switch (argn[0]) {
+
+              case 'a':                                 // ASM Format
+              case 'A':
+                fAsm = TRUE;
+                break;
+
+              case 'b':                                 // Binary Blob
+              case 'B':
+                fFlattenPE = FALSE;
+                fManaged = TRUE;
+                break;
+
+              case 'c':                                 // C# Class
+              case 'C':
+                strcpy(szClass, argp);
+                fManaged = TRUE;
+                break;
+
+              case 'f':                                 // C# Field
+              case 'F':
+                strcpy(szField, argp);
+                fManaged = TRUE;
+                break;
+
+              case 'l':                                 // List of files
+              case 'L':
+                fManaged = TRUE;
+                fList = TRUE;
+                break;
+
+              case 'm':                                 // C# Format
+              case 'M':
+                fAsm = FALSE;
+                break;
+
+              case 'n':                                 // C# Namespace
+              case 'N':
+                strcpy(szNamespace, argp);
+                fManaged = TRUE;
+                break;
+
+              case 'o':                                 // Output file.
+              case 'O':
+                if (!cfOutput.Create(argp)) {
+                    fprintf(stderr, "Could not open output file: %s\n", argp);
+                }
+                break;
+
+              case 'p':                                 // Cpp Format
+              case 'P':
+                fCpp = TRUE;
+                fAsm = FALSE;
+                break;
+
+              case 'r':                                 // Set Label Root
+              case 'R':
+                pszRoot = argp;
+                break;
+
+              case 'x':                                 // Compress BMP
+              case 'X':                                 //
+                fCompress = TRUE;
+                fManaged = TRUE;
+                break;
+
+              case '6':                                 // 64-bit PE
+                fAllow64 = TRUE;
+                break;
+
+              case 'h':                                 // Help
+              case 'H':
+              case '?':
+                fNeedHelp = TRUE;
+                break;
+
+              default:
+                printf("Unknown argument: %s\n", argv[arg]);
+                fNeedHelp = TRUE;
+                break;
+            }
+        }
+        else {
+            // Save the input files away in sorted linked list.
+            CFileInfo *pNew = &rFiles[cFiles++];
+            CFileInfo **ppHead = &pFiles;
+
+            pNew->SetFileName(argv[arg]);
+            while (*ppHead != NULL && CompareName(pNew->m_pszFile, (*ppHead)->m_pszFile) > 0) {
+                ppHead = &(*ppHead)->m_pNext;
+            }
+            pNew->m_pNext = *ppHead;
+            *ppHead = pNew;
+        }
+    }
+
+    if (argc == 1) {
+        fNeedHelp = TRUE;
+    }
+
+    if (!fNeedHelp && !cfOutput.IsOpen()) {
+        fprintf(stderr, "No output file specified.\n");
+        fNeedHelp = TRUE;
+    }
+
+    if (!fNeedHelp && pFiles == NULL) {
+        fprintf(stderr, "No output file specified.\n");
+        fNeedHelp = TRUE;
+    }
+
+    if (!fNeedHelp && fManaged &&
+        (szField[0] == '\0' || szClass[0] == '\0')) {
+        fprintf(stderr, "No field or class name specified for target.\n");
+        fNeedHelp = TRUE;
+    }
+
+    if (fNeedHelp) {
+        printf(
+               "Usage:\n"
+               "    mkasm /o:output [options] inputs\n"
+               "Options:\n"
+               "    /o:output     -- Specify output file.\n"
+               "    /r:root       -- Set root label [defaults to `asm'].\n"
+               "    /b            -- Treat file as binary blob (not PE file).\n"
+               "    /a            -- Output ASM format (default for PE).\n"
+               "    /m            -- Output C# format (default for blob).\n"
+               "    /c:class      -- Set C# class.\n"
+               "    /n:namespace  -- Set C# namespace.\n"
+               "    /f:field      -- Set C# field.\n"
+               "    /x            -- Use bizarre compression for BMP files.\n"
+               "    /l            -- Output contents in an array (list).\n"
+               "    /64           -- manipulate 64-bit PE files."
+               "    /h or /?      -- Display this help screen.\n"
+               "Summary:\n"
+               "    Copies the contents of the input files into the output file\n"
+               "    in .asm format.  Specific conversions exists for PE and BMP files.\n"
+              );
+        return 2;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  At this point, we have input file(s), output file, and set of desired
+    //  conversions.  Time to process the output.
+    //
+
+    BOOL fAbort = false;
+    COutput *pOutput = NULL;
+    CAsmOutput asmOutput(&cfOutput);
+    CSharpOutput sharpOutput(&cfOutput);
+
+    AsmName(szAsmName, szNamespace, szClass, szField);
+    CppClassName(szCppClassName, szNamespace, szClass);
+
+    if (fAsm) {
+        pOutput = &asmOutput;
+    }
+    else {
+        pOutput = &sharpOutput;
+    }
+
+    ULONG cbFiles = 0;
+    UINT cFile = 0;
+    for (CFileInfo *pFile = pFiles; pFile != NULL; pFile = pFile->m_pNext) {
+        if (!pFile->SetFileAndSize()) {
+            fprintf(stderr, "Unable to open %s, error = %d\n",
+                    pFile->m_pszFile,
+                    GetLastError());
+            goto abort;
+        }
+        if (fCompress) {
+            CFileMap cfInput;
+            printf(".");
+
+            if (!cfInput.Load(pFile->m_pszFile)) {
+                fprintf(stderr, "Could not open input file: %s\n", pFile->m_pszFile);
+                goto abort;
+            }
+            pFile->SetOutputSize(DumpBmp(NULL, cfInput.Seek(0), cfInput.Size()));
+            cfInput.Close();
+        }
+
+        cFile++;
+        cbFiles += pFile->m_cbOutput;
+    }
+
+    //public: static struct ClassVector_ClassVector_uint8 *
+    //            Class_Microsoft_Singularity_Shell_Slides::c_Content;
+
+    //" (?c_Content@Class_Microsoft_Singularity_Shell_Slides@@2PAUClassVector_ClassVector_uint8@@A
+    if (!fFlattenPE) {
+        if (fAsm) {
+            cfOutput.Print("externdef %s:NEAR\n", szByteVTable);
+
+            if (fList) {
+                cfOutput.Print("externdef %s:NEAR\n", szByteByteVTable);
+            }
+            else {
+                cfOutput.Print("align 4\n");
+                cfOutput.Print("        BARTOK_OBJECT_HEADER {} \n");
+                cfOutput.Print("%s%s_0 UINT32  %s\n",
+                               szAsmName, szByteSuffix, szByteVTable);
+                cfOutput.Print("        UINT32  %d\n", cbFiles);
+            }
+        }
+        else if (fCpp) {
+            if (fList) {
+                cFile = 0;
+                for (CFileInfo *pFile = pFiles; pFile != NULL; pFile = pFile->m_pNext) {
+                    cfOutput.Print("struct Vector_%s_%s_0_%d {\n",
+                                   szCppClassName, szField, cFile);
+                    cfOutput.Print("    uintptr                             headerwords[HDRWORDCOUNT];\n");
+                    cfOutput.Print("    union {\n");
+                    cfOutput.Print("        struct {\n");
+                    cfOutput.Print("            Class_System_VTable *       vtable;\n");
+                    cfOutput.Print("            uint32                      length;\n");
+                    cfOutput.Print("            uint8                       data[%d];\n",
+                                   pFile->m_cbOutput);
+                    cfOutput.Print("        };\n");
+                    cfOutput.Print("        ClassVector_uint8   object;\n");
+                    cfOutput.Print("    };\n");
+                    cfOutput.Print("};\n");
+
+                    cFile++;
+                }
+
+                cfOutput.Print("struct Vector_%s_%s_0 {\n",
+                               szCppClassName, szField);
+                cfOutput.Print("    uintptr                             headerwords[HDRWORDCOUNT];\n");
+                cfOutput.Print("    union {\n");
+                cfOutput.Print("        struct {\n");
+                cfOutput.Print("            Class_System_VTable *       vtable;\n");
+                cfOutput.Print("            uint32                      length;\n");
+                cfOutput.Print("            ClassVector_uint8 *         data[%d];\n", cFiles);
+                cfOutput.Print("        };\n");
+                cfOutput.Print("        ClassVector_ClassVector_uint8   object;\n");
+                cfOutput.Print("    };\n");
+                cfOutput.Print("};\n");
+
+                cfOutput.Print("struct %s {\n", szCppClassName);
+                cfOutput.Print("  private:\n");
+                for (UINT i = 0; i < cFiles; i++) {
+                    cfOutput.Print("    static Vector_%s_%s_0_%d c_%s_0_%d;\n",
+                                   szCppClassName, szField, i,
+                                   szField, i);
+                }
+                cfOutput.Print("    static Vector_%s_%s_0 c_%s_0;\n",
+                               szCppClassName, szField, szField);
+                cfOutput.Print("  public:\n");
+                cfOutput.Print("    static ClassVector_ClassVector_uint8 * c_%s;\n", szField);
+                cfOutput.Print("};\n");
+                cfOutput.Print("\n");
+                cfOutput.Print("ClassVector_ClassVector_uint8 * %s::c_%s = &%s::c_%s_0.object;\n",
+                               szCppClassName, szField,
+                               szCppClassName, szField);
+                cfOutput.Print("\n");
+                cfOutput.Print("Vector_%s_%s_0 %s::c_%s_0 = {\n",
+                               szCppClassName, szField,
+                               szCppClassName, szField);
+                cfOutput.Print("    {},\n");
+                cfOutput.Print("    (Class_System_VTable *)&ClassVector_ClassVector_uint8::_vtable,\n");
+                cfOutput.Print("    %d,\n", cFiles);
+                cfOutput.Print("    {\n");
+                for (UINT i = 0; i < cFiles; i++) {
+                    cfOutput.Print("        &%s::c_%s_0_%d.object,\n",
+                                   szCppClassName, szField, i);
+                }
+                cfOutput.Print("    },\n");
+                cfOutput.Print("};\n");
+                cfOutput.Print("\n");
+            }
+            else {
+                cfOutput.Print("struct Vector_%s_%s_0 {\n",
+                               szCppClassName, szField);
+                cfOutput.Print("    uintptr                             headerwords[HDRWORDCOUNT];\n");
+                cfOutput.Print("    union { \n");
+                cfOutput.Print("        struct {\n");
+                cfOutput.Print("            Class_System_VTable *       vtable;\n");
+                cfOutput.Print("            uint32                      length;\n");
+                cfOutput.Print("            uint8                       data[%d];\n",
+                               cbFiles);
+                cfOutput.Print("        };\n");
+                cfOutput.Print("        ClassVector_uint8   object;\n");
+                cfOutput.Print("    };\n");
+                cfOutput.Print("};\n");
+
+                cfOutput.Print("struct %s {\n", szCppClassName);
+                cfOutput.Print("  private:\n");
+                cfOutput.Print("    static Vector_%s_%s_0 c_%s_0;\n",
+                               szCppClassName, szField, szField);
+                cfOutput.Print("  public:\n");
+                cfOutput.Print("    static ClassVector_uint8 * c_%s;\n", szField);
+                cfOutput.Print("};\n");
+                cfOutput.Print("\n");
+                cfOutput.Print("ClassVector_uint8 * %s::c_%s = &%s::c_%s_0.object;\n",
+                               szCppClassName, szField,
+                               szCppClassName, szField);
+                cfOutput.Print("\n");
+                cfOutput.Print("Vector_%s_%s_0 %s::c_%s_0 = {\n",
+                               szCppClassName, szField,
+                               szCppClassName, szField);
+                cfOutput.Print("    {},\n");
+                cfOutput.Print("    (Class_System_VTable *)&ClassVector_uint8::_vtable,\n");
+                cfOutput.Print("    %d,\n", cbFiles);
+                cfOutput.Print("    {\n");
+            }
+        }
+        else {
+            if (szNamespace) {
+                cfOutput.Print("namespace %s {\n", szNamespace);
+            }
+
+            cfOutput.Print("    public class %s {\n", szClass);
+            if (fList) {
+                cfOutput.Print("        public static readonly byte[][] %s = {\n", szField);
+            }
+            else {
+                cfOutput.Print("        public static readonly byte[] %s = {\n", szField);
+            }
+        }
+    }
+
+    cFile = 0;
+    for (CFileInfo *pFile = pFiles; pFile != NULL; pFile = pFile->m_pNext) {
+        CFileMap cfInput;
+        printf(".");
+
+        if (!cfInput.Load(pFile->m_pszFile)) {
+            fprintf(stderr, "Could not open input file: %s\n", pFile->m_pszFile);
+            goto abort;
+        }
+
+        if (fFlattenPE) {
+            // Flatten PE file
+            if (!dump_pe(pOutput, &cfInput, pszRoot)) {
+                goto abort;
+            }
+        }
+        else {
+            if (fAsm) {
+                if (fList) {
+                    cfOutput.Print("\n");
+                    cfOutput.Print("align 4\n");
+                    cfOutput.Print("        BARTOK_OBJECT_HEADER {} \n");
+                    cfOutput.Print("%s%s_0_%d UINT32  %s\n",
+                                   szAsmName,
+                                   szByteSuffix,
+                                   cFile,
+                                   szByteVTable);
+                    cfOutput.Print("        UINT32  %d\n", cfInput.Size());
+                }
+            }
+            else if (fCpp) {
+                if (fList) {
+                    cfOutput.Print("Vector_%s_%s_0_%d %s::c_%s_0_%d = {\n",
+                                   szCppClassName, szField, cFile,
+                                   szCppClassName, szField, cFile);
+                    cfOutput.Print("    {},\n");
+                    cfOutput.Print("    (Class_System_VTable *)&ClassVector_uint8::_vtable,\n");
+                    cfOutput.Print("    %d,\n", cfInput.Size());
+                    cfOutput.Print("    {\n");
+                }
+            }
+            else {
+                if (fList) {
+                    cfOutput.Print("        new byte[] {\n");
+                }
+            }
+
+            if (fCompress) {
+                if (!DumpBmp(pOutput, cfInput.Seek(0), cfInput.Size())) {
+                    goto abort;
+                }
+            }
+            else {
+                pOutput->Dump(cfInput.Seek(0), cfInput.Size());
+                pOutput->Finish();
+            }
+
+            if (fAsm) {
+            }
+            else if (fCpp) {
+                if (fList) {
+                    cfOutput.Print("    },\n");
+                    cfOutput.Print("};\n");
+                    cfOutput.Print("\n");
+                }
+            }
+            else {
+                if (fList) {
+                    cfOutput.Print("        },\n");
+                }
+            }
+        }
+
+        cfInput.Close();
+        cFile++;
+    }
+
+    if (!fFlattenPE) {
+        if (fAsm) {
+            if (fList) {
+                // create list array at end.
+                cfOutput.Print("\n");
+                cfOutput.Print("align 4\n");
+                cfOutput.Print("        BARTOK_OBJECT_HEADER {} \n");
+                cfOutput.Print("public %s%s\n",
+                               szAsmName,
+                               szByteByteSuffix);
+                cfOutput.Print("%s%s_0 UINT32  %s\n",
+                               szAsmName,
+                               szByteByteSuffix,
+                               szByteByteVTable);
+                cfOutput.Print("        UINT32  %d\n", cFiles);
+                for (UINT i = 0; i < cFiles; i++) {
+                    cfOutput.Print("        UINT32  %s%s_0_%d\n",
+                                   szAsmName,
+                                   szByteSuffix,
+                                   i);
+                }
+                cfOutput.Print("\n");
+                cfOutput.Print("align 4\n");
+                cfOutput.Print("public %s%s\n",
+                               szAsmName,
+                               szByteByteSuffix);
+                cfOutput.Print("%s%s UINT32  %s%s_0\n",
+                               szAsmName,
+                               szByteByteSuffix,
+                               szAsmName,
+                               szByteByteSuffix);
+            }
+            else {
+                cfOutput.Print("\n");
+                cfOutput.Print("align 4\n");
+                cfOutput.Print("public %s%s\n",
+                               szAsmName,
+                               szByteSuffix);
+                cfOutput.Print("%s%s UINT32  %s%s_0\n",
+                               szAsmName,
+                               szByteSuffix,
+                               szAsmName,
+                               szByteSuffix);
+            }
+        }
+        else if (fCpp) {
+            if (!fList) {
+                cfOutput.Print("    },\n");
+                cfOutput.Print("};\n");
+                cfOutput.Print("\n");
+            }
+        }
+        else
+        {
+            cfOutput.Print("        };\n");
+            cfOutput.Print("    }\n");
+            cfOutput.Print("}\n");
+        }
+    }
+
+    if (fAbort) {
+      abort:
+        cfOutput.Delete();
+        return 1;
+    }
+    cfOutput.Close();
+    return 0;
+}
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/mkcontagmap/Makefile b/base/Windows/mkcontagmap/Makefile
new file mode 100644
index 0000000..edefe83
--- /dev/null
+++ b/base/Windows/mkcontagmap/Makefile
@@ -0,0 +1,50 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\mkcontagmap\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mkcontagmap.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\mkcontagmap.exe
+    $(SDEDIT) ..\..\build\mkcontagmap.*
+    $(COPY) $(OBJDIR)\mkcontagmap.exe ..\..\build
+    $(COPY) $(OBJDIR)\mkcontagmap.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\mkcontagmap.* 2>nul
+    @-del /q *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.dll \
+
+SOURCE_FILES = \
+    mkcontagmap.cs \
+
+##############################################################################
+
+$(OBJDIR)\mkcontagmap.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\mkcontagmap.exe $(SOURCE_FILES)
+
+##############################################################################
diff --git a/base/Windows/mkcontagmap/mkcontagmap.cs b/base/Windows/mkcontagmap/mkcontagmap.cs
new file mode 100644
index 0000000..2633996
--- /dev/null
+++ b/base/Windows/mkcontagmap/mkcontagmap.cs
@@ -0,0 +1,127 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+
+class App
+{
+    private static Regex clsDecl = new Regex("= CLASS MEMBERS DECLARATION =");
+    private static Regex contract  = new Regex(@"\.class .* ([A-Za-z]\S*Contract)");
+    private static Regex tagsBegin = new Regex(@"\.class .* Tags");
+    private static Regex tagsEnd   = new Regex(@" \} \/\/ end of class Tags");
+    private static Regex fieldTag  = new Regex(@"\.field .* ([A-z0-9_]*) = int32\(([^)]*)\)");
+    private static string endOfContract = "{\n    ChannelId, ItemLong\n}\n";
+    private static string HexDigits = "00112233445566778899aAbBcCdDeEfF";
+
+    private static int HexToInt32(string s)
+    {
+        int value = 0;
+        if (s.Length < 3 || s[0] != '0' || s[1] != 'x') {
+            throw new ArgumentException();
+        }
+
+        for (int i = 2; i < s.Length; i++) {
+            value = value * 16;
+            int delta = HexDigits.IndexOf(s[i]);
+            if (delta < 0) {
+                throw new ArgumentException("Bad digit");
+            }
+            value += delta / 2;
+        }
+        return value;
+    }
+
+    public void Generate(TextReader input, string inputName, TextWriter output)
+    {
+        bool   inMembers       = false;
+        bool   inContract      = false;
+        bool   inTags          = false;
+        string currentContract = "<none>";
+
+        output.WriteLine(
+            "// autogenerated by mkcontagmap.exe from {0}; do not edit!\n",
+            inputName
+            );
+
+        string line;
+        while (null != (line = input.ReadLine())) {
+            if (!inMembers && clsDecl.Match(line).Success) {
+                inMembers = true;
+            }
+
+            if (inMembers) {
+                Match m = contract.Match(line);
+                if (m.Success) {
+                    if (inContract) {
+                        output.WriteLine(endOfContract);
+                    }
+                    currentContract = m.Groups[1].Captures[0].Value;
+                    output.WriteLine("0{0} {0}", currentContract);
+                    inContract = true;
+                    continue;
+                }
+            }
+
+            if (inContract) {
+                if (tagsBegin.Match(line).Success) {
+                    output.WriteLine("#version 0");
+                    inTags = true;
+                    continue;
+                }
+            }
+
+            if (inTags) {
+                Match m = fieldTag.Match(line);
+                if (m.Success) {
+                    string tag = m.Groups[1].Captures[0].Value;
+                    if ("Any" == tag || "$Tagbase" == tag || "$NextTag" == tag)
+                        continue;
+                    string val = m.Groups[2].Captures[0].Value;
+                    output.WriteLine("#type {0} {1}", tag, HexToInt32(val));
+                    continue;
+                }
+
+                if (tagsEnd.Match(line).Success) {
+                    inTags = false;
+                    continue;
+                }
+            }
+        }
+
+        if (inContract) {
+            output.WriteLine(endOfContract);
+        }
+        output.Flush();
+    }
+
+    public static int Main(string [] args)
+    {
+        if (args.Length == 2) {
+            using (StreamReader input = new StreamReader(args[0])) {
+                using (StreamWriter output = new StreamWriter(args[1])) {
+                    (new App()).Generate(input, args[0], output);
+                }
+            }
+        }
+        else if (args.Length == 1) {
+            using (StreamReader input = new StreamReader(args[0])) {
+                (new App()).Generate(input, args[0], Console.Out);
+            }
+        }
+        else if (args.Length == 0) {
+            (new App()).Generate(Console.In, "stdin", Console.Out);
+        }
+        else {
+            Console.Error.WriteLine("Bad usage");
+            return -1;
+        }
+        return 0;
+    }
+}
diff --git a/base/Windows/mkcontagmap/mkcontagmap.csproj b/base/Windows/mkcontagmap/mkcontagmap.csproj
new file mode 100644
index 0000000..3e49d1c
--- /dev/null
+++ b/base/Windows/mkcontagmap/mkcontagmap.csproj
@@ -0,0 +1,30 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Windows\mkcontagmap\mkcontagmap.csproj
+
+Note:   Builds files that describe contracts for ETS
+        
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>mkcontagmap</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="mkcontagmap.cs"/>
+    <Reference Include="System"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/mkcore/Makefile b/base/Windows/mkcore/Makefile
new file mode 100644
index 0000000..b5bfdd2
--- /dev/null
+++ b/base/Windows/mkcore/Makefile
@@ -0,0 +1,83 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\mkcore\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS = $(CFLAGS) \
+    /I..\inc /I..\..\boot\include \
+    /DWIN32 /DNT /Fd$(OBJDIR)\mkcore.pdb \
+
+HOST_LINKFLAGS = $(HOST_LINKFLAGS) \
+    /nologo /nod /libpath:..\lib /fixed:no /subsystem:console
+
+LIBS = \
+    kernel32.lib    \
+    libcmt.lib        \
+
+##############################################################################
+
+.SUFFIXES: .cpp .obj
+
+{.}.cpp{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mkcore.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\mkcore.exe
+    $(SDEDIT) ..\..\build\mkcore.exe
+    $(SDEDIT) ..\..\build\mkcore.pdb
+    $(COPY) $(OBJDIR)\mkcore.exe ..\..\build
+    $(COPY) $(OBJDIR)\mkcore.pdb ..\..\build
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\mkcore.* *.exe *.dmp *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+test: $(OBJDIR) $(OBJDIR)\mkcore.exe
+    $(COPY) ..\..\Kernel\$(OBJDIR)\system.exe system.exe
+    $(OBJDIR)\mkcore.exe /v /o:system.dmp system.exe
+    $(OBJDIR)\mkcore.exe /d:system.dmp
+
+testx: $(OBJDIR) $(OBJDIR)\mkcore.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 1.exe
+    rebase -f -b 0x100000 1.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 2.exe
+    rebase -f -b 0x200000 2.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 3.exe
+    rebase -f -b 0x300000 3.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 4.exe
+    rebase -f -b 0x400000 4.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 5.exe
+    rebase -f -b 0x500000 5.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 6.exe
+    rebase -f -b 0x600000 6.exe
+    $(COPY) $(OBJDIR)\mkcore.exe 7.exe
+    rebase -f -b 0x700000 7.exe
+    $(OBJDIR)\mkcore.exe /v /o:test.dmp 4.exe 1.exe 2.exe 3.exe 5.exe 6.exe 7.exe
+    $(OBJDIR)\mkcore.exe /d:test.dmp
+
+$(OBJDIR)\mkcore.exe : $(OBJDIR)\mkcore.obj
+    @echo Linking $@
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
+
+$(OBJDIR)\mkcore.obj : mkcore.cpp
+
+################################################################# End of File.
diff --git a/base/Windows/mkcore/mkcore.cpp b/base/Windows/mkcore/mkcore.cpp
new file mode 100644
index 0000000..dd6f275
--- /dev/null
+++ b/base/Windows/mkcore/mkcore.cpp
@@ -0,0 +1,1418 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       mkcore.cpp
+//
+//  Contents:   Creates a core file from one or more PE image by physically
+//              aligning and allocating all of the sections.
+//
+//  Owner:
+//
+//  History:    2003/10/10             Created from mkflat.
+//
+#define UNICODE
+#define _UNICODE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <winlean.h>
+#include <assert.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static BOOL s_fVerbose = FALSE;
+
+typedef signed int INT;
+typedef signed char INT8, *LPINT8;
+typedef signed short INT16, *LPINT16;
+typedef unsigned int UINT;
+typedef unsigned char UINT8, *LPUINT8;
+typedef unsigned short UINT16, *LPUINT16;
+
+#include "minidump.h"
+
+#define arrayof(a)      (sizeof(a)/sizeof(a[0]))
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static inline UINT Max(UINT a, UINT b)
+{
+    return a > b ? a : b;
+}
+
+static inline UINT Min(UINT a, UINT b)
+{
+    return a < b ? a : b;
+}
+
+static inline UINT Align(UINT nValue, UINT nPowerOf2)
+{
+    return (nValue + nPowerOf2 - 1) & ~(nPowerOf2 - 1);
+}
+
+DWORD RvaToFileOffset(DWORD nRva, UINT nSecs, PIMAGE_SECTION_HEADER pSecs)
+{
+    DWORD n;
+    for (n = 0; n < nSecs; n++) {
+        DWORD vaStart = pSecs[n].VirtualAddress;
+        DWORD vaEnd = vaStart + pSecs[n].Misc.VirtualSize;
+
+        if (nRva >= vaStart && nRva < vaEnd) {
+            return pSecs[n].PointerToRawData + nRva - pSecs[n].VirtualAddress;
+        }
+    }
+    return 0;
+}
+
+BOOL error(PCSTR pwzError)
+{
+    fprintf(stderr, "%s\n", pwzError);
+    fclose(stderr);
+    return FALSE;
+}
+
+void Dump(PBYTE pbData, ULONG cbData)
+{
+    for (ULONG n = 0; n < cbData; n += 16) {
+        printf("        ");
+        for (ULONG o = n; o < n + 16; o++) {
+            if (o >= cbData) {
+                printf("  ");
+            }
+            else {
+                printf("%02x", pbData[o]);
+            }
+            if (o % 4 == 3) {
+                printf(" ");
+            }
+        }
+        printf(" ");
+        for (ULONG o = n; o < n + 16; o++) {
+            if (o >= cbData) {
+                printf("  ");
+            }
+            else {
+                if (pbData[o] >= ' ' && pbData[o] < 127) {
+                    printf("%c", pbData[o]);
+                }
+                else {
+                    printf(".");
+                }
+            }
+        }
+        printf("\n");
+    }
+}
+
+//////////////////////////////////////////////////////////////////// CFileMap.
+//
+class CFileMap
+{
+  public:
+    CFileMap()
+    {
+        m_pbData = NULL;
+        m_cbData = 0;
+    }
+
+    ~CFileMap()
+    {
+        Close();
+    }
+
+  public:
+    BOOL    Load(PCWSTR pwzFile);
+    PBYTE   Seek(UINT32 cbPos);
+    UINT32  Size();
+    VOID    Close();
+
+  protected:
+    PBYTE   m_pbData;
+    UINT32  m_cbData;
+};
+
+VOID CFileMap::Close()
+{
+    if (m_pbData) {
+        UnmapViewOfFile(m_pbData);
+        m_pbData = NULL;
+    }
+    m_cbData = 0;
+}
+
+UINT32 CFileMap::Size()
+{
+    return m_cbData;
+}
+
+PBYTE CFileMap::Seek(UINT32 cbPos)
+{
+    if (m_pbData && cbPos <= m_cbData) {
+        return m_pbData + cbPos;
+    }
+    return NULL;
+}
+
+BOOL CFileMap::Load(PCWSTR pwzFile)
+{
+    Close();
+
+    HANDLE hFile = CreateFile(pwzFile,
+                              GENERIC_READ,
+                              FILE_SHARE_READ,
+                              NULL,
+                              OPEN_EXISTING,
+                              0,
+                              NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    ULONG cbInFileData = GetFileSize(hFile, NULL);
+    if (cbInFileData == 0xffffffff) {
+        CloseHandle(hFile);
+        return FALSE;
+    }
+
+    HANDLE hInFileMap = CreateFileMapping(hFile, NULL, PAGE_WRITECOPY, 0, 0, NULL);
+    CloseHandle(hFile);
+    if (hInFileMap == NULL) {
+        return FALSE;
+    }
+
+    m_pbData = (PBYTE)MapViewOfFile(hInFileMap, FILE_MAP_COPY, 0, 0, 0);
+    CloseHandle(hInFileMap);
+    if (m_pbData == NULL) {
+        return FALSE;
+    }
+    m_cbData = cbInFileData;
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class CArrayInternal
+{
+  public:
+    CArrayInternal(UINT cbEach)
+    {
+        m_pbData = new BYTE [cbEach * 32];
+        m_cbData = cbEach * 32;
+        assert(m_pbData);
+
+        m_cbEach = cbEach;
+        m_cbUsed = 0;
+    }
+
+    ~CArrayInternal()
+    {
+        if (m_pbData != NULL) {
+            delete[] m_pbData;
+            m_pbData = NULL;
+        }
+    }
+
+    PVOID   Seek(UINT nEntry)
+    {
+        return m_pbData + m_cbEach * nEntry;
+    }
+
+    PVOID   Add()
+    {
+        if (m_cbUsed + m_cbEach >= m_cbData) {
+            UINT cbData = m_cbData + m_cbEach * 32;
+            PBYTE pbData = new BYTE [cbData];
+            assert(pbData);
+
+            CopyMemory(pbData, m_pbData, m_cbUsed);
+            delete[] m_pbData;
+
+            m_pbData = pbData;
+            m_cbData = cbData;
+        }
+        PBYTE pb = m_pbData + m_cbUsed;
+        m_cbUsed += m_cbEach;
+        ZeroMemory(pb, m_cbEach);
+
+        return pb;
+    }
+
+    UINT    Count()
+    {
+        return m_cbUsed / m_cbEach;
+    }
+
+    UINT    Size()
+    {
+        return m_cbUsed;
+    }
+
+  protected:
+    PBYTE   m_pbData;
+    UINT    m_cbData;
+    UINT    m_cbEach;
+    UINT    m_cbUsed;
+};
+
+template<class T> class CArray : public CArrayInternal
+{
+  public:
+    CArray()
+        : CArrayInternal(sizeof (T)) {}
+
+    T* Seek(UINT nEntry)
+    { return (T*)CArrayInternal::Seek(nEntry); }
+
+    T* Add()
+    { return (T*)CArrayInternal::Add(); }
+};
+
+//////////////////////////////////////////////////////////////////// CFileOut.
+//
+class CFileOut
+{
+  public:
+    CFileOut();
+    ~CFileOut();
+
+  public:
+    BOOL    Create(PCWSTR pwzFile);
+
+    BOOL    Seek(UINT32 cbPos);
+    BOOL    Write(PBYTE pbData, UINT32 cbData);
+    BOOL    Read(PBYTE pbData, UINT32 cbData);
+    BOOL    Zero(UINT32 cbData);
+    BOOL    Delete();
+    UINT32  Size();
+
+    UINT32  Checksum();
+
+    VOID    Close();
+
+  protected:
+    HANDLE  m_hFile;
+    WCHAR   m_wzFile[MAX_PATH];
+    UINT32  m_cbPos;
+};
+
+CFileOut::CFileOut()
+{
+    m_hFile = INVALID_HANDLE_VALUE;
+    m_wzFile[0] = '\0';
+    m_cbPos = 0;
+}
+
+CFileOut::~CFileOut()
+{
+    Close();
+}
+
+VOID CFileOut::Close()
+{
+    if (m_hFile != INVALID_HANDLE_VALUE) {
+        CloseHandle(m_hFile);
+        m_hFile = INVALID_HANDLE_VALUE;
+    }
+}
+
+BOOL CFileOut::Seek(UINT32 cbPos)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+    if (SetFilePointer(m_hFile, cbPos, NULL, FILE_BEGIN) != cbPos) {
+        return FALSE;
+    }
+    m_cbPos = cbPos;
+    return TRUE;
+}
+
+BOOL CFileOut::Write(PBYTE pbData, UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    DWORD dwWrote = 0;
+    if (!WriteFile(m_hFile, pbData, cbData, &dwWrote, NULL) || dwWrote != cbData) {
+        return FALSE;
+    }
+    m_cbPos += cbData;
+    return TRUE;
+}
+
+BOOL CFileOut::Zero(UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    if (cbData == 0) {
+        return TRUE;
+    }
+
+    UINT zero_size = cbData < 65536 ? cbData : 65536;
+    PBYTE buf = new BYTE [zero_size];
+    assert(buf);
+
+    if (!buf) {
+        return FALSE;
+    }
+
+    ZeroMemory(buf, zero_size);
+
+    for (; cbData > 0; cbData -= zero_size) {
+        if (zero_size > cbData) {
+            zero_size = cbData;
+        }
+        if (!Write(buf, zero_size)) {
+            delete[] buf;
+            return FALSE;
+        }
+    }
+    delete[] buf;
+    buf = NULL;
+
+    return TRUE;
+}
+
+BOOL CFileOut::Delete()
+{
+    if (m_hFile != INVALID_HANDLE_VALUE) {
+        Close();
+        return DeleteFile(m_wzFile);
+    }
+    return FALSE;
+}
+
+UINT32 CFileOut::Size()
+{
+    return SetFilePointer(m_hFile, 0, NULL, FILE_END);
+}
+
+BOOL CFileOut::Read(PBYTE pbData, UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    DWORD dwRead = 0;
+    if (!ReadFile(m_hFile, pbData, cbData, &dwRead, NULL) || dwRead != cbData) {
+        return FALSE;
+    }
+    m_cbPos += cbData;
+    return TRUE;
+}
+
+BOOL CFileOut::Create(PCWSTR pwzFile)
+{
+    Close();
+    m_wzFile[0] = '\0';
+    m_hFile = CreateFile(pwzFile,
+                         GENERIC_READ | GENERIC_WRITE,
+                         0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+    wcscpy(m_wzFile, pwzFile);
+    m_cbPos = 0;
+    return TRUE;
+}
+
+
+UINT32 CFileOut::Checksum()
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    PBYTE buf = new BYTE [65536];
+    assert(buf);
+
+    if (!buf) {
+        return ~0u;
+    }
+
+    UINT32 size = Size();
+    UINT32 sum = 0;
+
+    if (!Seek(0)) {
+        assert(!"Couldn't seek.");
+        delete[] buf;
+        return ~0u;
+    }
+
+    for (UINT32 pos = 0; pos < size;) {
+        UINT32 read = size - pos < 65536 ? size - pos : 65536;
+
+        if (!Read(buf, read)) {
+            printf("Pos: %d/%d\n", pos, m_cbPos);
+            printf("Len: %d\n", size);
+            __asm int 3;
+            assert(!"Couldn't read.");
+            delete[] buf;
+            return ~0u;
+        }
+
+        UINT32 *pBeg = (UINT32*)(buf);
+        UINT32 *pEnd = (UINT32*)(buf + read);
+
+        while (pBeg < pEnd) {
+            sum += *pBeg++;
+        }
+
+        pos += read;
+    }
+
+    delete[] buf;
+    buf = NULL;
+
+    return sum;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class CMiniDump
+{
+  public:
+    struct MODULE
+    {
+        PUINT8  pbImageMap;
+        UINT64  vaImageBase;
+        UINT64  vaImageHead;
+        UINT64  vaImageEntry;
+
+        PCWSTR  pwzImage;
+        UINT32  nRegions;
+
+        PUINT8  pbCvData;
+        UINT32  cbCvData;
+    };
+
+    struct BLOB
+    {
+        UINT64  vaBlob;
+        PUINT8  pbBlob;
+        UINT32  cbBlob;
+
+        PCWSTR  pwzImage;
+    };
+
+  public:
+    CMiniDump();
+    ~CMiniDump();
+
+    BOOL    Create(PCWSTR pwzFile);
+    BOOL    Write();
+    VOID    Close();
+    BOOL    Delete();
+
+    BOOL    Stack(UINT64 vaStack, UINT32 cbStack);
+    BOOL    AddModule(PCWSTR pwzImage);
+    BOOL    AddBlob(PCWSTR pwzImage, UINT64 vaBlob, UINT32 *pcbBlob);
+
+  protected:
+    BOOL    AddMemory(ULONG64 address,
+                      PBYTE pbData, UINT32 cbData, UINT32 cbFull,
+                      PMINIDUMP_MEMORY_DESCRIPTOR pOut);
+    BOOL    AddString(PCWSTR pwzString, UINT32 *pRva);
+
+  protected:
+    ULONG   Allocate(UINT32 cbData);
+
+    BOOL    WriteDebug(MODULE *pSelf,
+                       PMINIDUMP_MODULE pModule);
+    BOOL    WriteModule(MODULE *pSelf,
+                        PMINIDUMP_MODULE pModule,
+                        PMINIDUMP_MEMORY_DESCRIPTOR pRegions);
+    BOOL    WriteBlob(BLOB *pBlob,
+                      PMINIDUMP_MEMORY_DESCRIPTOR pRegions);
+
+    BOOL    AddData(PBYTE pbData, UINT32 cbData, UINT32 cbFull,
+                    MINIDUMP_LOCATION_DESCRIPTOR *pOut);
+    PBYTE   AddCreate(UINT32 cbData, UINT32 *pRva);
+    PBYTE   AddCreate(UINT32 cbData, MINIDUMP_LOCATION_DESCRIPTOR* pOut);
+
+    BOOL    Write(PVOID pvData, MINIDUMP_LOCATION_DESCRIPTOR Out);
+
+  protected:
+    static int __cdecl CompareModules(const void *p1, const void *p2);
+    static int __cdecl CompareBlobs(const void *p1, const void *p2);
+    static int __cdecl CompareMinidumpModules(const void *p1, const void *p2);
+
+  protected:
+    CFileOut            m_Out;
+    ULONG               m_cbAllocated;
+    MINIDUMP_HEADER     m_Header;
+    MINIDUMP_DIRECTORY  m_Directory[8];
+    UINT64              m_vaImageBase;
+    UINT64              m_vaImageHead;
+    UINT64              m_vaImageEntry;
+    UINT64              m_vaStack;
+    UINT32              m_cbStack;
+    CArray<MODULE>      m_Modules;
+    CArray<BLOB>        m_Blobs;
+
+    static UINT64       s_vaImageBase;
+
+  public:
+    static const UINT64 c_vaBlob = 0x7b00;
+    static const UINT64 c_vaStack = 0x2fff00;
+    static const UINT32 c_cbStack = 0x100;
+};
+
+UINT64 CMiniDump::s_vaImageBase = 0;
+
+CMiniDump::CMiniDump()
+{
+    m_cbAllocated = sizeof(m_Header) + sizeof(m_Directory);
+
+    ZeroMemory(&m_Header, sizeof(m_Header));
+    ZeroMemory(&m_Directory, sizeof(m_Directory));
+
+    m_Header.Signature = MINIDUMP_SIGNATURE;
+    m_Header.Version = MINIDUMP_VERSION;
+    m_Header.NumberOfStreams = arrayof(m_Directory);
+    m_Header.StreamDirectoryRva = sizeof(MINIDUMP_HEADER);
+    m_Header.CheckSum = 0;
+    m_Header.TimeDateStamp = 0;
+    m_Header.Flags = (MiniDumpNormal | MiniDumpWithDataSegs);
+
+    m_vaImageBase = 0;
+    m_vaImageHead = 0;
+    m_vaImageEntry = 0;
+    m_vaStack = c_vaStack;
+    m_cbStack = c_cbStack;
+}
+
+CMiniDump::~CMiniDump()
+{
+    Close();
+}
+
+BOOL CMiniDump::Create(PCWSTR pwzFile)
+{
+    if (!m_Out.Create(pwzFile)) {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+VOID CMiniDump::Close()
+{
+    m_Out.Close();
+}
+
+BOOL CMiniDump::Stack(UINT64 vaStack, UINT32 cbStack)
+{
+    m_vaStack = vaStack;
+    m_cbStack = cbStack;
+    return TRUE;
+}
+
+int __cdecl CMiniDump::CompareModules(const void *p1, const void *p2)
+{
+    const MODULE *m1 = (const MODULE *)p1;
+    const MODULE *m2 = (const MODULE *)p2;
+
+    return (m1->vaImageBase < m2->vaImageBase) ? -1 : 1;
+}
+
+int __cdecl CMiniDump::CompareBlobs(const void *p1, const void *p2)
+{
+    const BLOB *m1 = (const BLOB *)p1;
+    const BLOB *m2 = (const BLOB *)p2;
+
+    return (m1->vaBlob < m2->vaBlob) ? -1 : 1;
+}
+
+int __cdecl CMiniDump::CompareMinidumpModules(const void *p1, const void *p2)
+{
+    const MINIDUMP_MODULE *m1 = (const MINIDUMP_MODULE *)p1;
+    const MINIDUMP_MODULE *m2 = (const MINIDUMP_MODULE *)p2;
+
+    UINT64 vaImageBase1 = m1->BaseOfImage == s_vaImageBase ? 0 : m1->BaseOfImage;
+    UINT64 vaImageBase2 = m2->BaseOfImage == s_vaImageBase ? 0 : m2->BaseOfImage;
+
+    return (vaImageBase1 < vaImageBase2) ? -1 : 1;
+}
+
+BOOL CMiniDump::Write()
+{
+    s_vaImageBase = m_vaImageBase;
+    qsort(m_Modules.Seek(0), m_Modules.Count(), sizeof(MODULE), CompareModules);
+    qsort(m_Blobs.Seek(0), m_Blobs.Count(), sizeof(BLOB), CompareBlobs);
+
+    UINT32 nRegions = 0;
+
+    nRegions += 1; // one for the thread stack.
+
+    for (UINT m = 0; m < m_Modules.Count(); m++) {
+        nRegions += m_Modules.Seek(m)->nRegions;
+    }
+    for (UINT m = 0; m < m_Blobs.Count(); m++) {
+        nRegions++;
+    }
+
+    //
+    m_Directory[0].StreamType = ThreadListStream;
+    m_Directory[1].StreamType = ModuleListStream;
+    m_Directory[2].StreamType = MemoryListStream;
+    m_Directory[3].StreamType = SystemInfoStream;
+    m_Directory[4].StreamType = 0xcafeface;
+
+    // First we must allocate all of the dump before the memory regions...
+    PMINIDUMP_THREAD_LIST pThreads = (PMINIDUMP_THREAD_LIST)AddCreate
+        (sizeof(MINIDUMP_THREAD_LIST) + sizeof(MINIDUMP_THREAD),
+         &m_Directory[0].Location);
+
+    PMINIDUMP_MODULE_LIST pModules = (PMINIDUMP_MODULE_LIST)AddCreate
+        (sizeof(MINIDUMP_MODULE_LIST) + m_Modules.Count() * sizeof(MINIDUMP_MODULE),
+         &m_Directory[1].Location);
+
+    PMINIDUMP_MEMORY_LIST pRegions = (PMINIDUMP_MEMORY_LIST)AddCreate
+        (sizeof(MINIDUMP_MEMORY_LIST) + nRegions * sizeof(MINIDUMP_MEMORY_DESCRIPTOR),
+         &m_Directory[2].Location);
+
+    PMINIDUMP_SYSTEM_INFO pSystems = (PMINIDUMP_SYSTEM_INFO)AddCreate
+        (sizeof(MINIDUMP_SYSTEM_INFO),
+         &m_Directory[3].Location);
+
+    pThreads->NumberOfThreads = 1;
+    PCONTEXT pContext = (PCONTEXT)AddCreate(sizeof(CONTEXT),
+                                            &pThreads->Threads[0].ThreadContext);
+
+    for (UINT m = 0; m < m_Modules.Count(); m++) {
+        MODULE *pSelf = m_Modules.Seek(m);
+
+        AddString(pSelf->pwzImage, &pModules->Modules[m].ModuleNameRva);
+        WriteDebug(pSelf, &pModules->Modules[m]);
+    }
+
+    // Now, we can write the memory regions...
+
+
+    PMINIDUMP_MEMORY_DESCRIPTOR pRegion = pRegions->MemoryRanges;
+    UINT module = 0;
+    UINT blob = 0;
+    UINT stack = 0;
+
+    while (stack < 1 || module < m_Modules.Count() || blob < m_Blobs.Count()) {
+        UINT64 vaModule = (module < m_Modules.Count())
+            ? m_Modules.Seek(module)->vaImageBase : 0xffffffffffffffff;
+        UINT64 vaBlob = (blob < m_Blobs.Count())
+            ? m_Blobs.Seek(blob)->vaBlob : 0xffffffffffffffff;
+        UINT64 vaStack = (stack < 1)
+            ? m_vaStack : 0xffffffffffffffff;
+
+        if (vaModule <= vaBlob && vaModule <= vaStack) {
+            // Module next.
+
+            WriteModule(m_Modules.Seek(module), &pModules->Modules[module], pRegion);
+            pRegion += m_Modules.Seek(module)->nRegions;
+            module++;
+        }
+        else if (vaBlob < vaModule && vaBlob < vaStack) {
+            // Blob next.
+            WriteBlob(m_Blobs.Seek(blob), pRegion);
+            pRegion++;
+            blob++;
+        }
+        else if (vaStack < vaModule && vaStack < vaBlob) {
+            // Stack next.
+
+            AddMemory(m_vaStack, NULL, 0, 0x100, pRegion);
+            pThreads->Threads[0].Stack = *pRegion;
+
+            if (s_fVerbose) {
+                printf("  add %08I64x..%08I64x %-8.8s\n",
+                       m_vaStack, m_vaStack + 0x100, "stack");
+            }
+
+            stack++;
+            pRegion++;
+        }
+
+    }
+
+    pThreads->Threads[0].ThreadId = 1001;
+    pThreads->Threads[0].SuspendCount = 0;
+    pThreads->Threads[0].PriorityClass = 0;
+    pThreads->Threads[0].Priority = 0;
+    pThreads->Threads[0].Teb = 0;
+    Write(pThreads, m_Directory[0].Location);
+
+    pModules->NumberOfModules = m_Modules.Count();
+    s_vaImageBase = m_vaImageBase;
+    qsort(pModules->Modules, pModules->NumberOfModules,
+          sizeof(MINIDUMP_MODULE), CompareMinidumpModules);
+    Write(pModules, m_Directory[1].Location);
+
+    pRegions->NumberOfMemoryRanges = nRegions;
+    Write(pRegions, m_Directory[2].Location);
+
+    pSystems->NumberOfProcessors = 1;
+    // TODO64 add command-line machine flag
+    if (false) {
+        pSystems->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64;
+    }
+    else {
+        pSystems->ProcessorArchitecture = 0;
+    }
+
+    pSystems->ProcessorLevel = 15;
+    pSystems->ProcessorRevision = 519;
+    pSystems->MajorVersion = 1;
+    pSystems->MinorVersion = 1;
+    pSystems->BuildNumber = 0xdead;
+    pSystems->PlatformId = 7;
+    Write(pSystems, m_Directory[3].Location);
+
+    pContext->Esp = (UINT32)m_vaStack;
+    pContext->Ebx = (UINT32)m_vaImageBase;
+    pContext->Eax = (UINT32)m_vaImageHead;
+    pContext->Eip = (UINT32)m_vaImageEntry;
+    if (s_fVerbose) {
+        printf("  eip: %x, ebx: %x, eax: %x, esp: %x\n",
+               pContext->Eip, pContext->Ebx, pContext->Eax, pContext->Esp);
+    }
+
+    Write(pContext, pThreads->Threads[0].ThreadContext);
+
+    // Finally, the trailer must follow all of the memory regions.
+    PUINT32 pTrailer = (PUINT32)AddCreate(4 * sizeof(UINT32), &m_Directory[4].Location);
+    pTrailer[0] = 0xfeedbeef;
+    pTrailer[1] = 0xcafeface;
+    pTrailer[2] = 0x00000000;
+    pTrailer[3] = 0x00000000;
+    Write(pTrailer, m_Directory[4].Location);
+
+    m_Out.Seek(0);
+    m_Out.Write((PBYTE)&m_Header, sizeof(m_Header));
+    m_Out.Write((PBYTE)&m_Directory, sizeof(m_Directory));
+
+    UINT32 sum = m_Out.Checksum();
+
+    pTrailer[3] = -(INT32)sum;
+    Write(pTrailer, m_Directory[4].Location);
+
+    return TRUE;
+}
+
+BOOL CMiniDump::Delete()
+{
+    return m_Out.Delete();
+}
+
+ULONG CMiniDump::Allocate(UINT32 cbData)
+{
+    ULONG cbWhere = m_cbAllocated;
+    m_cbAllocated += (cbData + 7) & ~7;                 // Align to UINT64.
+
+    return cbWhere;
+}
+
+BOOL CMiniDump::Write(PVOID pvData, MINIDUMP_LOCATION_DESCRIPTOR Out)
+{
+    m_Out.Seek(Out.Rva);
+    return m_Out.Write((PBYTE)pvData, Out.DataSize);
+}
+
+BOOL CMiniDump::AddData(PBYTE pbData, UINT32 cbData, UINT32 cbFull,
+                        MINIDUMP_LOCATION_DESCRIPTOR* pOut)
+{
+    ULONG cbWhere = Allocate(cbData);
+    ULONG cbZero = cbFull - cbData;
+
+    if (!m_Out.Seek(cbWhere)) {
+        return FALSE;
+    }
+
+    if (cbData > 0 && !m_Out.Write(pbData, cbData)) {
+        return FALSE;
+    }
+
+    if (!m_Out.Zero(cbZero)) {
+        return FALSE;
+
+    }
+
+    if (pOut) {
+        pOut->DataSize = cbFull;
+        pOut->Rva = cbWhere;
+    }
+    return TRUE;
+}
+
+PBYTE CMiniDump::AddCreate(UINT32 cbData, UINT32 * pRva)
+{
+    PBYTE pbData = new BYTE [cbData];
+    assert(pbData);
+    ZeroMemory(pbData, cbData);
+
+    *pRva = Allocate(cbData);
+    return pbData;
+}
+
+PBYTE CMiniDump::AddCreate(UINT32 cbData,
+                           MINIDUMP_LOCATION_DESCRIPTOR* pOut)
+{
+    pOut->DataSize = cbData;
+    return AddCreate(cbData, &pOut->Rva);
+}
+
+BOOL CMiniDump::AddString(PCWSTR pwzString, UINT32 *pRva)
+{
+    ULONG cbData = sizeof(MINIDUMP_STRING) + wcslen(pwzString) * 2 + 2;
+    PMINIDUMP_STRING pString = (PMINIDUMP_STRING)AddCreate(cbData, pRva);
+
+    pString->Length = wcslen(pwzString) * 2;
+    wcscpy(pString->Buffer, pwzString);
+
+    m_Out.Seek(*pRva);
+    m_Out.Write((PBYTE)pString, cbData);
+
+    return TRUE;
+}
+
+BOOL CMiniDump::AddMemory(ULONG64 address,
+                          PBYTE pbData, UINT32 cbData, UINT32 cbFull,
+                          PMINIDUMP_MEMORY_DESCRIPTOR pOut)
+{
+    if (AddData(pbData, cbData, cbFull, &pOut->Memory)) {
+        pOut->StartOfMemoryRange = address;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+BOOL CMiniDump::AddModule(PCWSTR pwzImage)
+{
+    bool isPe64 = false;
+    CFileMap *pfImage = new CFileMap();
+    assert(pfImage);
+
+    if (!pfImage->Load(pwzImage)) {
+        fprintf(stderr, "Could not open image file: %ls\n", pwzImage);
+
+      abort:
+        delete pfImage;
+        return FALSE;
+    }
+
+    MODULE * pModule = m_Modules.Add();
+    PIMAGE_DOS_HEADER pdos;
+    PIMAGE_NT_HEADERS ppe;
+    PIMAGE_NT_HEADERS64 ppe64;
+
+    // Read in the PE image header
+    //
+    pdos = (PIMAGE_DOS_HEADER)pfImage->Seek(0);
+    if (pdos == NULL || pdos->e_magic != IMAGE_DOS_SIGNATURE) {
+        error("Image doesn't have MZ signature.");
+        goto abort;
+    }
+
+    ppe = (PIMAGE_NT_HEADERS)pfImage->Seek(pdos->e_lfanew);
+    if (ppe == NULL || ppe->Signature != IMAGE_NT_SIGNATURE) {
+        error("Image doesn't have PE signature.");
+        goto abort;
+    }
+
+    if (ppe->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) {
+        fprintf(stderr, "mkcore: 64-bit PE files!\n");
+        isPe64 = true;
+        ppe64 = (PIMAGE_NT_HEADERS64) ppe;
+    }
+
+    pModule->nRegions = 1+ ppe->FileHeader.NumberOfSections;
+
+    // this is not right we could be truncating addresses here
+    DWORD debugAddr;
+    DWORD debugSize;
+    if (isPe64) {
+         debugAddr = ppe64->OptionalHeader
+            .DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
+         debugSize = ppe64->OptionalHeader
+            .DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
+    }
+    else {
+         debugAddr = ppe->OptionalHeader
+            .DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
+         debugSize = ppe->OptionalHeader
+            .DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
+    }
+        DWORD debugPos = (debugAddr && debugSize)
+        ? RvaToFileOffset(debugAddr, ppe->FileHeader.NumberOfSections,
+                          IMAGE_FIRST_SECTION(ppe))
+        : 0;
+
+    ////////////////////////////////////////////////// Adjust Debug Directory.
+    //
+    if (debugPos) {
+        PIMAGE_DEBUG_DIRECTORY pDir = (PIMAGE_DEBUG_DIRECTORY)pfImage->Seek(debugPos);
+        assert(pDir);
+
+        DWORD nEntries = debugSize / sizeof(*pDir);
+        for (DWORD n = 0; n < nEntries; n++) {
+            PBYTE pbData = pfImage->Seek(pDir[n].PointerToRawData);
+
+            if ((pbData[0] == 'R' && pbData[1] == 'S') ||
+                (pbData[0] == 'N' && pbData[1] == 'B')) {
+
+                pModule->pbCvData = pbData;
+                pModule->cbCvData = pDir[n].SizeOfData;
+                break;
+            }
+        }
+        if (nEntries > 1) {
+            printf("   Dropped %d DBG entries.\n", nEntries - 1);
+        }
+    }
+
+    pModule->pbImageMap = pfImage->Seek(0);
+    pModule->pwzImage = pwzImage;
+    if (isPe64) {
+        pModule->vaImageBase = ppe64->OptionalHeader.ImageBase;
+        pModule->vaImageHead = ppe64->OptionalHeader.ImageBase + pdos->e_lfanew;
+        pModule->vaImageEntry = ppe64->OptionalHeader.ImageBase
+            + ppe64->OptionalHeader.AddressOfEntryPoint;
+    }
+    else {
+        pModule->vaImageBase = ppe->OptionalHeader.ImageBase;
+        pModule->vaImageHead = ppe->OptionalHeader.ImageBase + pdos->e_lfanew;
+        pModule->vaImageEntry = ppe->OptionalHeader.ImageBase
+            + ppe->OptionalHeader.AddressOfEntryPoint;
+    }
+    // Copy the image name into the image...
+    PCWSTR pwzName = pwzImage;
+    PCWSTR pwz;
+    if ((pwz = wcsrchr(pwzName, ':')) != NULL) {
+        pwzName = pwz + 1;
+    }
+    if ((pwz = wcsrchr(pwzName, '\\')) != NULL) {
+        pwzName = pwz + 1;
+    }
+    ZeroMemory(pfImage->Seek(64), 64);
+    wcscpy((PWCHAR)pfImage->Seek(68), pwzName);
+    _wcslwr((PWCHAR)pfImage->Seek(68));
+
+    if (m_vaImageBase == 0) {
+        m_vaImageBase = pModule->vaImageBase;
+        m_vaImageHead = pModule->vaImageHead;
+        m_vaImageEntry = pModule->vaImageEntry;
+    }
+    return TRUE;
+}
+
+BOOL CMiniDump::AddBlob(PCWSTR pwzImage, UINT64 vaBlob, UINT32 *pcbBlob)
+{
+    CFileMap *pfImage = new CFileMap();
+    assert(pfImage);
+
+    if (!pfImage->Load(pwzImage)) {
+        fprintf(stderr, "Could not open blob file: %ls\n", pwzImage);
+
+        delete pfImage;
+        return FALSE;
+    }
+
+    BLOB * pBlob = m_Blobs.Add();
+
+    pBlob->pwzImage = pwzImage;
+    pBlob->pbBlob = pfImage->Seek(0);
+    pBlob->cbBlob = pfImage->Size();
+    pBlob->vaBlob = vaBlob;
+    *pcbBlob = pBlob->cbBlob;
+
+    return TRUE;
+}
+
+BOOL CMiniDump::WriteDebug(MODULE *pSelf,
+                           PMINIDUMP_MODULE pModule)
+{
+    AddString(pSelf->pwzImage, &pModule->ModuleNameRva);
+
+    if (pSelf->cbCvData > 0) {
+        AddData(pSelf->pbCvData, pSelf->cbCvData, pSelf->cbCvData, &pModule->CvRecord);
+    }
+    return TRUE;
+}
+
+BOOL CMiniDump::WriteModule(MODULE *pSelf,
+                            PMINIDUMP_MODULE pModule,
+                            PMINIDUMP_MEMORY_DESCRIPTOR pRegions)
+{
+    UINT32 cbHeader;
+    UINT64 vaImageBase;
+    PIMAGE_DOS_HEADER       pdos;
+    PIMAGE_NT_HEADERS       ppe;
+    PIMAGE_SECTION_HEADER   psec;
+    PIMAGE_SECTION_HEADER   pfsec;
+    PIMAGE_SECTION_HEADER   plsec;
+    bool isPe64;
+    PIMAGE_NT_HEADERS64 ppe64;
+
+    // Read in the PE image header
+    //
+    pdos = (PIMAGE_DOS_HEADER)(pSelf->pbImageMap);
+    ppe = (PIMAGE_NT_HEADERS)(pSelf->pbImageMap + pdos->e_lfanew);
+
+    if (ppe->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) {
+        fprintf(stderr, "WriteModule: 64-bit PE files!\n");
+        isPe64 = true;
+        ppe64 = (PIMAGE_NT_HEADERS64) ppe;
+    }
+
+    pfsec = IMAGE_FIRST_SECTION(ppe);
+    plsec = pfsec + ppe->FileHeader.NumberOfSections;
+
+    if (isPe64) {
+        cbHeader = ppe64->OptionalHeader.SizeOfHeaders;
+        vaImageBase = ppe64->OptionalHeader.ImageBase;
+    }
+    else {
+        cbHeader = ppe->OptionalHeader.SizeOfHeaders;
+        vaImageBase = ppe->OptionalHeader.ImageBase;
+    }
+    AddMemory(vaImageBase, pSelf->pbImageMap, cbHeader, cbHeader, pRegions++);
+    if (s_fVerbose) {
+        printf("  add %08I64x..%08I64x %-8.8s %ls\n",
+               vaImageBase,
+               vaImageBase + cbHeader,
+               "pe",
+               pSelf->pwzImage);
+    }
+
+
+    for (psec = pfsec; psec < plsec; psec++) {
+        DWORD cbData = Min(psec->SizeOfRawData, psec->Misc.VirtualSize);
+        DWORD cbFull = Max(psec->SizeOfRawData, psec->Misc.VirtualSize);
+        PBYTE pbData = (pSelf->pbImageMap + psec->PointerToRawData);
+
+        if (s_fVerbose) {
+            printf("  add %08I64x..%08I64x %-8.8s %ls\n",
+                   vaImageBase + psec->VirtualAddress,
+                   vaImageBase + psec->VirtualAddress + cbFull,
+                   psec->Name,
+                   pSelf->pwzImage);
+        }
+
+        AddMemory(vaImageBase + psec->VirtualAddress, pbData, cbData, cbFull,
+                  pRegions++);
+    }
+
+    pModule->BaseOfImage = ppe->OptionalHeader.ImageBase;
+    pModule->SizeOfImage = ppe->OptionalHeader.SizeOfImage;
+    pModule->CheckSum = ppe->OptionalHeader.CheckSum;
+    pModule->TimeDateStamp = ppe->FileHeader.TimeDateStamp;
+
+    return TRUE;
+}
+
+BOOL CMiniDump::WriteBlob(BLOB *pBlob,
+                          PMINIDUMP_MEMORY_DESCRIPTOR pRegions)
+{
+    if (s_fVerbose) {
+        printf("  add %08I64x..%08I64x %-8.8s %ls\n",
+               pBlob->vaBlob,
+               pBlob->vaBlob + pBlob->cbBlob,
+               "blob",
+               pBlob->pwzImage);
+    }
+    return AddMemory(pBlob->vaBlob, pBlob->pbBlob, pBlob->cbBlob, pBlob->cbBlob, pRegions);
+}
+
+//
+//////////////////////////////////////////////////////////////////////////////
+
+BOOL DumpFile(PCWSTR file)
+{
+    CFileMap cfImage;
+
+    if (!cfImage.Load(file)) {
+        fprintf(stderr, "Could not open dump file: %ls\n", file);
+        return FALSE;
+    }
+
+    PMINIDUMP_HEADER pHeader = (PMINIDUMP_HEADER)cfImage.Seek(0);
+
+    printf("Header: [%08x..%08x]\n", 0, sizeof(MINIDUMP_HEADER));
+    printf("  Signature: %c%c%c%c\n",
+           ((char *)&pHeader->Signature)[0],
+           ((char *)&pHeader->Signature)[1],
+           ((char *)&pHeader->Signature)[2],
+           ((char *)&pHeader->Signature)[3]);
+    printf("  Version:   %08x\n", pHeader->Version);
+    printf("  Streams:   %d\n", pHeader->NumberOfStreams);
+    printf("  Dir RVA:   %08x\n", pHeader->StreamDirectoryRva);
+    printf("  CheckSum:  %08x\n", pHeader->CheckSum);
+    printf("  TimeDate:  %08x\n", pHeader->TimeDateStamp);
+    printf("  Flags:     %016I64x\n", pHeader->Flags);
+
+    PMINIDUMP_DIRECTORY pDir
+        = (PMINIDUMP_DIRECTORY)cfImage.Seek(pHeader->StreamDirectoryRva);
+
+    printf("Directory [%08x..%08x]\n", pHeader->StreamDirectoryRva,
+           pHeader->StreamDirectoryRva
+           + sizeof(MINIDUMP_DIRECTORY) * pHeader->NumberOfStreams);
+
+    for (UINT i = 0; i < pHeader->NumberOfStreams; i++) {
+        printf("%4d. Type: %8x, RVA: %8x, Size: %8x\n",
+               i, pDir[i].StreamType,
+               (UINT32)pDir[i].Location.Rva, pDir[i].Location.DataSize);
+    }
+
+    for (UINT i = 0; i < pHeader->NumberOfStreams; i++) {
+        switch (pDir[i].StreamType) {
+          case UnusedStream:
+            break;
+          case ThreadListStream:
+              {
+                  PMINIDUMP_THREAD_LIST pl =
+                      (PMINIDUMP_THREAD_LIST)cfImage.Seek(pDir[i].Location.Rva);
+                  printf("ThreadList:\n");
+                  printf("  Thread:     %d\n", pl->NumberOfThreads);
+                  for (UINT t = 0; t < pl->NumberOfThreads; t++) {
+                      printf("  %8d: Stack=%08I64x [%08x..%08x] [%08x..%08x] %d\n",
+                             pl->Threads[t].ThreadId,
+                             pl->Threads[t].Stack.StartOfMemoryRange,
+                             pl->Threads[t].Stack.Memory.Rva,
+                             pl->Threads[t].Stack.Memory.Rva +
+                             pl->Threads[t].Stack.Memory.DataSize,
+                             pl->Threads[t].ThreadContext.Rva,
+                             pl->Threads[t].ThreadContext.Rva +
+                             pl->Threads[t].ThreadContext.DataSize,
+                             pl->Threads[t].ThreadContext.DataSize);
+                  }
+              }
+            break;
+
+          case ModuleListStream:
+              {
+                  PMINIDUMP_MODULE_LIST pl =
+                      (PMINIDUMP_MODULE_LIST)cfImage.Seek(pDir[i].Location.Rva);
+                  printf("ModuleList: (%x)\n", pDir[i].Location.Rva);
+                  printf("  Modules:    %d\n", pl->NumberOfModules);
+                  UINT t = 0;
+                  for (; t < pl->NumberOfModules && t < 10; t++) {
+                      printf("  %08I64x Size=%08x NameRva=%08x chks=%08x date=%08x \n"
+                             "           `%.60ls'(%d.%d)\n",
+                             pl->Modules[t].BaseOfImage,
+                             pl->Modules[t].SizeOfImage,
+                             pl->Modules[t].ModuleNameRva,
+                             pl->Modules[t].CheckSum,
+                             pl->Modules[t].TimeDateStamp,
+                             cfImage.Seek(pl->Modules[t].ModuleNameRva)+4,
+                             *(PULONG)cfImage.Seek(pl->Modules[t].ModuleNameRva),
+                             2* wcslen((PWCHAR)cfImage.Seek(pl->Modules[t].ModuleNameRva)+4)
+                            );
+#if 0
+                      if (pl->Modules[t].CvRecord.Rva) {
+                          printf("  CV   [%08x..%08x]\n",
+                                 pl->Modules[t].CvRecord.Rva,
+                                 pl->Modules[t].CvRecord.Rva +
+                                 pl->Modules[t].CvRecord.DataSize);
+                          Dump(cfImage.Seek(pl->Modules[t].CvRecord.Rva),
+                               pl->Modules[t].CvRecord.DataSize);
+                      }
+                      if (pl->Modules[t].MiscRecord.Rva) {
+                          printf("  Misc [%08x..%08x]\n",
+                                 pl->Modules[t].MiscRecord.Rva,
+                                 pl->Modules[t].MiscRecord.Rva +
+                                 pl->Modules[t].MiscRecord.DataSize);
+                          Dump(cfImage.Seek(pl->Modules[t].MiscRecord.Rva),
+                               pl->Modules[t].MiscRecord.DataSize);
+                      }
+#endif
+                  }
+                  if (t < pl->NumberOfModules) {
+                      printf("  ...\n");
+                  }
+              }
+              break;
+          case MemoryListStream:
+              {
+                  PMINIDUMP_MEMORY_LIST pl =
+                      (PMINIDUMP_MEMORY_LIST)cfImage.Seek(pDir[i].Location.Rva);
+                  printf("MemoryList:\n");
+                  printf("  Ranges:     %d\n", pl->NumberOfMemoryRanges);
+                  UINT t = 0;
+                  for (; t < pl->NumberOfMemoryRanges /* && t < 10 */; t++) {
+                      printf("  %08I64x..%08I64x [%08x..%08x]\n",
+                             pl->MemoryRanges[t].StartOfMemoryRange,
+                             pl->MemoryRanges[t].StartOfMemoryRange
+                             + pl->MemoryRanges[t].Memory.DataSize,
+                             pl->MemoryRanges[t].Memory.Rva,
+                             pl->MemoryRanges[t].Memory.Rva
+                             + pl->MemoryRanges[t].Memory.DataSize);
+                  }
+                  if (t < pl->NumberOfMemoryRanges) {
+                      printf("  ...\n");
+                  }
+
+              }
+              break;
+          case SystemInfoStream:
+              {
+                  PMINIDUMP_SYSTEM_INFO pi =
+                      (PMINIDUMP_SYSTEM_INFO)cfImage.Seek(pDir[i].Location.Rva);
+                  printf("SystemInfo:\n");
+                  printf("  Processors: %d\n", pi->NumberOfProcessors);
+                  printf("  Processor:  %d.%d.%d\n",
+                         pi->ProcessorArchitecture,
+                         pi->ProcessorLevel,
+                         pi->ProcessorRevision);
+                  printf("  Version:    %d.%d.%d %d\n",
+                         pi->MajorVersion,
+                         pi->MinorVersion,
+                         pi->BuildNumber,
+                         pi->PlatformId);
+                  printf("  VendorId:   %-12.12s\n", pi->Cpu.X86CpuInfo.VendorId);
+                  printf("  Version:    %08x\n", pi->Cpu.X86CpuInfo.VersionInformation);
+                  printf("  Feature:    %08x\n", pi->Cpu.X86CpuInfo.FeatureInformation);
+                  printf("  AMDFeat:    %08x\n", pi->Cpu.X86CpuInfo.AMDExtendedCpuFeatures);
+              }
+              break;
+        }
+    }
+
+    return TRUE;
+}
+
+int __cdecl wmain(int argc, WCHAR **argv)
+{
+    BOOL fNeedHelp = FALSE;
+    BOOL fGood = FALSE;
+    PCWSTR pwzOutput = NULL;
+    CMiniDump miniDump;
+    UINT64 vaStack = CMiniDump::c_vaStack;
+    UINT32 cbStack = CMiniDump::c_cbStack;
+    UINT64 vaBlob = CMiniDump::c_vaBlob;
+    UINT32 cbBlob = 0;
+
+    for (int arg = 1; arg < argc && !fNeedHelp; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            WCHAR *argn = argv[arg]+1;                   // Argument name
+            WCHAR *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':') {
+                argp++;
+            }
+            if (*argp == ':')
+                *argp++ = '\0';
+
+            switch (argn[0]) {
+
+              case 'a':                                 // Set next blob address
+              case 'A':
+                vaBlob = _wcstoi64(argp, NULL, 0);
+                break;
+
+              case 'b':
+              case 'B':
+                if (!miniDump.AddBlob(argp, vaBlob, &cbBlob)) {
+                    break;
+                }
+                vaBlob += cbBlob;
+                break;
+
+              case 'c':                                 // Stack size
+              case 'C':
+                cbStack = (UINT32)_wcstoi64(argp, NULL, 0);
+                break;
+
+              case 's':                                 // Stack base
+              case 'S':
+                vaStack = _wcstoi64(argp, NULL, 0);
+                break;
+
+              case 'd':                                 // Dump
+              case 'D':
+                DumpFile(argp);
+                break;
+
+              case 'o':                                 // Output file.
+              case 'O':
+                pwzOutput = argp;
+                if (!miniDump.Create(pwzOutput)) {
+                    fprintf(stderr, "Could not open output file: %ls\n", pwzOutput);
+                    break;
+                }
+                printf("%ls:\n", pwzOutput);
+                break;
+
+              case 'v':                                 // Verbose
+              case 'V':
+                s_fVerbose = TRUE;
+                break;
+
+              case '?':                                 // Help
+                fNeedHelp = TRUE;
+                break;
+
+              default:
+                printf("Unknown argument: %ls\n", argv[arg]);
+                fNeedHelp = TRUE;
+                break;
+            }
+        }
+        else {
+            if (pwzOutput == NULL) {
+                fprintf(stderr, "Must specify output file before input files.\n");
+                fNeedHelp = TRUE;
+                break;
+            }
+
+            if (!miniDump.AddModule(argv[arg])) {
+                break;
+            }
+            else {
+                fGood = TRUE;
+            }
+        }
+    }
+    if (!fGood) {
+        miniDump.Delete();
+    }
+    else {
+        miniDump.Stack(vaStack, cbStack);
+        miniDump.Write();
+        miniDump.Close();
+    }
+
+    if (argc == 1) {
+        fNeedHelp = TRUE;
+    }
+
+    if (fNeedHelp) {
+        printf(
+               "Usage:\n"
+               "    mkcore [options] images...\n"
+               "or:\n"
+               "    mkcore /d:minidump\n"
+               "Options:\n"
+               "    /a:address    -- Set virtual address for subsequent blobs.\n"
+               "    /b:file       -- Add a blob file to the minidump.\n"
+               "    /d:minidump   -- Display the context of minidump file.\n"
+               "    /o:out_file   -- Specify output file (defaults to image.exe).\n"
+               "    /s:stackbase  -- Set the base address stack (defaults to 0x%I64x).\n"
+               "    /c:stacksize  -- Set the size of zeroed stack data (defaults to 0x%x).\n"
+               "    /v            -- Verbose.\n"
+               "    /?            -- Display this help screen.\n"
+               "Summary:\n"
+               "    Creates a minidump file from the sections of one or more PEs.\n"
+               "    The first PE file is marked for entry on startup.\n",
+               (UINT64)CMiniDump::c_vaStack,
+               (UINT32)CMiniDump::c_cbStack
+              );
+    }
+
+    return 0;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/mkmani/Makefile b/base/Windows/mkmani/Makefile
new file mode 100644
index 0000000..5864af9
--- /dev/null
+++ b/base/Windows/mkmani/Makefile
@@ -0,0 +1,103 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\mkmani\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mkmani.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\mkmani.exe
+    $(SDEDIT) ..\..\build\mkmani.*
+    $(COPY) $(OBJDIR)\mkmani.exe ..\..\build
+    $(COPY) $(OBJDIR)\mkmani.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\mkmani.* 2>nul
+    @-del /q *~ 2>nul
+    @-del /q shell.manifest sb16.manifest 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.Xml.dll \
+    /reference:System.dll \
+    /reference:$(BUILDIR)\MsilReader.dll \
+
+SOURCE_FILES = \
+    ManifestBuilder.cs \
+    TokenDefinition.cs \
+    mkmani.cs \
+
+##############################################################################
+
+$(OBJDIR)\mkmani.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\mkmani.exe $(SOURCE_FILES)
+
+##############################################################################
+
+SHELL_ASSEMBLIES=\
+    $(APPSDIR)\Shell.exe \
+    $(APPSDIR)\Directory.Contracts.dll \
+    $(APPSDIR)\Io.Contracts.dll \
+    $(APPSDIR)\FileSystem.Contracts.dll \
+    $(LIBSDIR)\FileSystem.Utils.dll \
+    $(APPSDIR)\Corlibsg.dll \
+    $(ILLSDIR)\Singularity.V1.ill \
+    $(APPSDIR)\Corlib.dll \
+    $(APPSDIR)\System.Compiler.Runtime.dll \
+    $(APPSDIR)\Microsoft.SingSharp.Runtime.dll \
+    $(APPSDIR)\ILHelpers.dll \
+
+SB16_ASSEMBLIES=\
+    $(DRIVDIR)\Sb16.exe \
+    $(APPSDIR)\Directory.Contracts.dll \
+    $(APPSDIR)\Io.Contracts.dll \
+    $(APPSDIR)\Corlib.dll \
+    $(APPSDIR)\Corlibsg.dll \
+    $(ILLSDIR)\singularity.V1.ill \
+    $(APPSDIR)\System.Compiler.Runtime.dll \
+    $(APPSDIR)\Microsoft.SingSharp.Runtime.dll \
+    $(APPSDIR)\ILHelpers.dll \
+
+test: $(OBJDIR)\mkmani.exe $(SHELL_ASSEMBLIES)
+    $(OBJDIR)\mkmani.exe \
+        /out:Shell.manifest \
+        /app:Shell \
+        /x86:Shell.x86 \
+        /cache:$(BASEDIR) \
+        $(SHELL_ASSEMBLIES)
+    $(OBJDIR)\mkmani.exe \
+        /out:Sb16.manifest \
+        /app:Sb16 \
+        /x86:Sb16.x86 \
+        /cache:$(BASEDIR) \
+        /linker:/debug \
+        /linker:/merge:ugly=data \
+        /codegen:/DisableX64LirOpts=true \
+        /codegen:/EnableIceCap=false \
+        $(SB16_ASSEMBLIES)
+    @echo.
+    type Shell.manifest
+    @echo.
+    type Sb16.manifest
+
+##############################################################################
diff --git a/base/Windows/mkmani/ManifestBuilder.cs b/base/Windows/mkmani/ManifestBuilder.cs
new file mode 100644
index 0000000..bb16d81
--- /dev/null
+++ b/base/Windows/mkmani/ManifestBuilder.cs
@@ -0,0 +1,936 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   MetaDataParser.cs
+//
+//  [TODO] fix comments in this file
+//
+//  Note:   This is a best-approximation of statically determinable metadata.
+//          We can create a few general properties of an application, and we
+//          can read the ConsoleCategory, Category, and DriverCategory attributes
+//
+using System;
+using System.Collections;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+using Bartok.MSIL;
+
+public class ManifestBuilder
+{
+    //
+    // Note - This is a rather crude recursive descent parser
+    //
+
+    // This parser only deals in relatively flat xml, and as such we can use
+    // a very straightforward parse methodology:
+    //  for a class decorated with a tag that is in the "triggers" list
+    //  - start a new xml tag
+    //  - check every decoration on that class according to the classAttributes
+    //    rules, and for each match add a child
+    //  - check every field in the class according to the fieldAttributes
+    //    rules, and for each match add a child
+    private class ParseRules
+    {
+        public TriggerDefinition[] triggers;
+        public ClassDefinition[] classAttributes;
+        public FieldDefinition[] fieldAttributes;
+
+        public ParseRules(ParseRules inheritFrom,
+                          TriggerDefinition[] triggers,
+                          ClassDefinition[] classAttributes,
+                          FieldDefinition[] fieldAttributes)
+        {
+            this.triggers = triggers;
+
+            if (inheritFrom != null) {
+                this.classAttributes = Inherit(inheritFrom.classAttributes,
+                                               classAttributes);
+                this.fieldAttributes = Inherit(inheritFrom.fieldAttributes,
+                                               fieldAttributes);
+            }
+            else {
+                this.classAttributes = classAttributes;
+                this.fieldAttributes = fieldAttributes;
+            }
+        }
+
+        private static ClassDefinition[] Inherit(ClassDefinition[] root,
+                                                 ClassDefinition[] grow)
+        {
+            ClassDefinition[] target = new ClassDefinition[root.Length + grow.Length];
+            int j = 0;
+            for (int i = 0; i < root.Length; i++, j++) {
+                target[j] = root[i];
+            }
+            for (int i = 0; i < grow.Length; i++, j++) {
+                target[j] = grow[i];
+            }
+            return target;
+        }
+
+        private static FieldDefinition[] Inherit(FieldDefinition[] root,
+                                                 FieldDefinition[] grow)
+        {
+            FieldDefinition[] target = new FieldDefinition[root.Length + grow.Length];
+            int j = 0;
+            for (int i = 0; i < root.Length; i++, j++) {
+                target[j] = root[i];
+            }
+            for (int i = 0; i < grow.Length; i++, j++) {
+                target[j] = grow[i];
+            }
+            return target;
+        }
+    }
+
+    // Construct the parsing tables.
+    private static readonly ParseRules[] rules;
+
+    static ManifestBuilder()
+    {
+        ParseRules categoryRules = new ParseRules(
+            null,
+
+            // "triggers"
+            new TriggerDefinition[] {
+                new TriggerDefinition("category",
+                                      null,
+                                      "Microsoft.Singularity.Configuration.CategoryAttribute",
+                                      "Microsoft.Singularity.Configuration.CategoryDeclaration",
+                                      new string [] {"name"}),
+            },
+
+            // "class" attributes
+            new ClassDefinition[] {},
+
+            // "field" attributes
+            new FieldDefinition[] {
+                // NB: the constructor fields on these are handled specially, unlike
+                // everything else in this tool.  This is indicated by the "true"
+                // value for the last parameter to the constructor
+
+                // [TODO] is this correct?  Should Endpoint declarations in
+                // ConsoleCategories and Configuration be given names so that they are more
+                // human-configurable?  Will an app ever declare multiple Endpoints of
+                // the same type and require the kernel to user to patch those identical
+                // endpoints to different (and conflicting) apps?  Could this problem be
+                // addressed via stronger typing?
+
+                new EndpointDefinition("endpoints",
+                                       "extension",
+                                       "Microsoft.Singularity.Configuration.ExtensionEndpointAttribute",
+                                       "Microsoft.Singularity.Channels.TRef_2"
+                                       + "<Microsoft.Singularity.Extending."
+                                       + "ExtensionContract+Exp,Microsoft.Singularity"
+                                       + ".Extending.ExtensionContract+Start>"),
+                new ServiceEndpointDefinition("endpoints",
+                                       "serviceProvider",
+                                       "Microsoft.Singularity.Configuration.ServiceEndpointAttribute",
+                                       "Microsoft.Singularity.Channels.TRef_2"
+                                       + "<Microsoft.Singularity.Directory."
+                                       + "ServiceProviderContract+Exp,Microsoft."
+                                       + "Singularity.Directory.ServiceProviderContract"
+                                       + "+Start>"),
+                // [TODO] - the inheritance on this is not correct
+                new EndpointDefinition("endpoints",
+                                       "endpoint",
+                                       "Microsoft.Singularity.Configuration.EndpointAttribute",
+                                       null),
+
+                new EndpointDefinition("endpoints",
+                                       "inputPipe",
+                                       "Microsoft.Singularity.Configuration.InputEndpointAttribute",
+                                       null,
+                                       new string [] {"Kind"}),
+                new EndpointDefinition("endpoints",
+                                      "outputPipe",
+                                      "Microsoft.Singularity.Configuration.OutputEndpointAttribute",
+                                      null,
+                                      new string [] {"Kind"}),
+                new ParameterDefinition("StringParameters",
+                                    "StringParameter",
+                                    "Microsoft.Singularity.Configuration.StringParameterAttribute",
+                                    "STRING",
+                                    new string [] {"Name"}),
+                new ParameterDefinition("LongParameters",
+                                    "LongParameter",
+                                    "Microsoft.Singularity.Configuration.LongParameterAttribute",
+                                    "I8",
+                                    new string [] {"Name"}),
+                new ParameterDefinition("BoolParameters",
+                                    "BoolParameter",
+                                    "Microsoft.Singularity.Configuration.BoolParameterAttribute",
+                                    "BOOLEAN",
+                                    new string [] {"Name"}),
+                new ParameterDefinition("StringArrayParameters",
+                                    "StringArrayParameter",
+                                    "Microsoft.Singularity.Configuration.StringArrayParameterAttribute",
+                                    "SZARRAY",
+                                    new string [] {"Name"}),
+            }
+            );
+
+        ParseRules driverCategoryRules = new ParseRules(
+            categoryRules, // inherit "class" and "field" rules from category.
+
+            // "triggers"
+            new TriggerDefinition[] {
+                new TriggerDefinition("category",
+                                      "driver",
+                                      "Microsoft.Singularity.Io.DriverCategoryAttribute",
+                                      "Microsoft.Singularity.Io.DriverCategoryDeclaration"),
+            },
+
+            // "class" attributes
+            new ClassDefinition[] {
+                new ClassDefinition("device",
+                                    "Microsoft.Singularity.Io.SignatureAttribute",
+                                    new string [] {"signature"}),
+                new ClassDefinition("enumerates",
+                                    "Microsoft.Singularity.Io.EnumeratesDeviceAttribute",
+                                    new string [] {"signature"}),
+            },
+
+            // "field" attributes
+            new FieldDefinition[] {
+                new FieldDefinition("dynamicHardware",
+                                    "ioPortRange",
+                                    "Microsoft.Singularity.Io.IoPortRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoPortRange",
+                                    new string [] {"id"},
+                                    new string [] {"Default","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared"}),
+                new FieldDefinition("fixedHardware",
+                                    "ioPortRange",
+                                    "Microsoft.Singularity.Io.IoFixedPortRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoPortRange",
+                                    new string [] {"id"},
+                                    new string [] {"Base","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared"},
+                                    new string [] {"fixed", "true"}),
+                new FieldDefinition("dynamicHardware",
+                                    "ioIrqRange",
+                                    "Microsoft.Singularity.Io.IoIrqRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoIrqRange",
+                                    new string [] {"id"},
+                                    new string [] {"Default","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared"},
+                                    new string [] {"rangeLength", "1"}),
+                new FieldDefinition("fixedHardware",
+                                    "ioIrqRange",
+                                    "Microsoft.Singularity.Io.IoFixedIrqRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoIrqRange",
+                                    new string [] {"id"},
+                                    new string [] {"Base","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared"},
+                                    new string [] {"fixed", "true",
+                                                   "rangeLength", "1"}),
+                new FieldDefinition("dynamicHardware",
+                                    "ioDmaRange",
+                                    "Microsoft.Singularity.Io.IoDmaRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoDmaRange",
+                                    new string [] {"id"},
+                                    new string [] {"Default","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared"},
+                                    new string [] {"rangeLength", "1"}),
+                new FieldDefinition("dynamicHardware",
+                                    "ioMemoryRange",
+                                    "Microsoft.Singularity.Io.IoMemoryRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoMemoryRange",
+                                    new string [] {"id"},
+                                    new string [] {"Default","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared"}),
+                new FieldDefinition("fixedHardware",
+                                    "ioMemoryRange",
+                                    "Microsoft.Singularity.Io.IoFixedMemoryRangeAttribute",
+                                    "Microsoft.Singularity.Io.IoMemoryRange",
+                                    new string [] {"id"},
+                                    new string [] {"Base","baseAddress",
+                                                   "Length","rangeLength",
+                                                   "Shared", "shared",
+                                                   "AddressBits", "addressBits",
+                                                   "Alignment", "alignment"},
+                                    new string [] {"fixed", "true"}),
+            }
+            );
+
+        ParseRules consoleCategoryRules = new ParseRules(
+            categoryRules, // inherit "class" and "field" rules from category.
+
+            // "triggers"
+            new TriggerDefinition[] {
+                new TriggerDefinition("category",
+                                      "console",
+                                      "Microsoft.Singularity.Configuration.ConsoleCategoryAttribute",
+                                      "Microsoft.Singularity.Configuration.ConsoleCategoryDeclaration"),
+            },
+
+            // "class" attributes
+            new ClassDefinition[] {
+            },
+
+            // "field" attributes
+            new FieldDefinition[] {
+            }
+            );
+
+        rules = new ParseRules[3] {
+            driverCategoryRules,
+            categoryRules,
+            consoleCategoryRules,
+        };
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+
+    // the base path of the file cache
+    private String cache;
+    // the list of assembly files
+    private ArrayList assemblies;
+    // The metadata resolver
+    private MetaDataResolver resolver;
+    // the output file
+    private XmlDocument manifest;
+    // the process node
+    private XmlNode process;
+    // the Bartok/code generation parameters.
+    private XmlNode codegen;
+    // the linker parameters.
+    private XmlNode linker;
+
+    private int warningCount;
+    private int errorCount;
+
+    public ManifestBuilder(String cache, ArrayList assemblies)
+    {
+        this.cache = cache.ToLower();
+        this.assemblies = assemblies;
+
+        // create a blank manifest without an <?xml> header:
+        manifest = new XmlDocument();
+    }
+
+    // create a manifest for an app, without looking at any assemblies
+    // this creates the stub manifest into which each assembly's info will
+    // go
+    public bool CreateNewManifest(string appname, string x86filename)
+    {
+        warningCount = 0;
+        errorCount = 0;
+
+        // Create this.resolver using this.assemblyfilename
+        InitializeResolver();
+
+        // Create the basic XML tree.
+        XmlNode application = AddElement(manifest, "application");
+        AddAttribute(application, "name", appname);
+
+        process = AddElement(application, "process");
+        AddAttribute(process, "id", "0");
+        AddAttribute(process, "main", "true");
+        AddAttribute(process, "path", StripPathFromPath(x86filename));
+        AddAttribute(process, "cache", StripCacheFromPath(x86filename));
+
+        bool seenPublisher = false;
+        XmlNode privileges = null;
+        // here we assume that the first assembly is the app assembly
+        // extract the publisher name from there
+        MetaData md0 = (MetaData)resolver.MetaDataList[0];
+        MetaDataAssembly mda0 = (MetaDataAssembly)md0.Assemblies[0];
+        if (mda0.CustomAttributes != null) {
+            foreach (MetaDataCustomAttribute ca in mda0.CustomAttributes) {
+                if (ca.Name == "Microsoft.Singularity.Security.ApplicationPublisherAttribute") {
+                    if (!seenPublisher && ca.FixedArgs != null && ca.FixedArgs[0] != null) {
+                        AddAttribute(application, "publisher", (string)ca.FixedArgs[0]);
+                        seenPublisher = true;
+                    }
+                } else if (ca.Name == "Microsoft.Singularity.Security.AssertPrivilegeAttribute") {
+                    if (ca.FixedArgs != null && ca.FixedArgs[0] != null) {
+                        if (privileges == null)
+                            privileges = AddElement(application, "privileges");
+                        XmlNode privilege = AddElement(privileges, "privilege");
+                        AddAttribute(privilege, "name", (string)ca.FixedArgs[0]);
+                    }
+                }
+            }
+        }
+
+        // Create the list of assemblies.
+        XmlNode assemblies = AddElement(process, "assemblies");
+        foreach (MetaData md in resolver.MetaDataList) {
+            MetaDataAssembly mda = (MetaDataAssembly)md.Assemblies[0];
+
+            string file = md.Name;
+            string assemblyname = StripPathFromPath(file);
+
+            XmlNode assembly = AddElement(assemblies, "assembly");
+            AddAttribute(assembly, "name", assemblyname);
+            if (mda.MajorVersion != 0 || mda.MinorVersion != 0 ||
+                mda.BuildNumber != 0 || mda.RevisionNumber != 0) {
+                AddAttribute(assembly, "version", String.Format("{0}.{1}.{2}.{3}",
+                                                                mda.MajorVersion,
+                                                                mda.MinorVersion,
+                                                                mda.BuildNumber,
+                                                                mda.RevisionNumber));
+            }
+            if (mda.PublicKey != null & mda.PublicKey.Length > 0) {
+                AddAttribute(assembly, "publickey",
+                             String.Format("{0}", KeyToString(mda.PublicKey)));
+            }
+            if (mda.Locale != null && mda.Locale != "") {
+                AddAttribute(assembly, "locale", mda.Locale);
+            }
+            AddAttribute(assembly, "cache", StripCacheFromPath(file));
+        }
+
+        // Create a placeholder for
+
+        // now go through every class in the assembly to locate ConsoleCategory,
+        // Category, and DriverCategory attributes
+        int categoryIndex = 0;
+        XmlNode categories = null;
+        foreach (MetaData md in resolver.MetaDataList) {
+            // NB: md.TypeDefs is a flat list of all classes in this assembly,
+            //     regardless of nesting
+            foreach (MetaDataTypeDefinition type in md.TypeDefs) {
+                for (int i = 0; i < rules.Length; i++) {
+                    if (ProcessType(type, rules[i], process, ref categoryIndex, ref categories)) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (errorCount != 0) {
+            return false;
+        }
+        return true;
+    }
+
+    public bool AddCodegenParameter(string param)
+    {
+        if (codegen == null) {
+            codegen = AddElement(process, "codegen");
+        }
+        XmlNode node = AddElement(codegen, "parameter");
+        AddAttribute(node, "value", param);
+        return true;
+    }
+
+    public bool AddLinkerParameter(string param)
+    {
+        if (linker == null) {
+            linker = AddElement(process, "linker");
+        }
+        XmlNode node = AddElement(linker, "parameter");
+        AddAttribute(node, "value", param);
+        return true;
+    }
+
+    public void Save(XmlTextWriter writer)
+    {
+        manifest.Save(writer);
+    }
+
+    ///////////////////////////////////////////// Methods to help with errors.
+    //
+    private static string LastName(string value)
+    {
+        if (value != null) {
+            int period = value.LastIndexOf('.');
+
+            if (period > 0 && period < value.Length) {
+                return value.Substring(period + 1);
+            }
+        }
+        return value;
+    }
+
+    public void Error(string message, params object[] args)
+    {
+        Console.Write("mkmani: Error: ");
+        Console.WriteLine(message, args);
+        errorCount++;
+    }
+
+    private void Warning(string message, params object[] args)
+    {
+        Console.Write("mkmani: Warning: ");
+        Console.WriteLine(message, args);
+        warningCount++;
+    }
+
+    //////////////////////////////////////////////// Methods to help with XML.
+    //
+    private XmlNode AddElement(XmlNode parent, string name)
+    {
+        XmlNode element = manifest.CreateNode(XmlNodeType.Element, name, "");
+        if (parent != null) {
+            parent.AppendChild(element);
+        }
+        return element;
+    }
+
+    public void AddAttribute(XmlNode node, string name, string value)
+    {
+        XmlAttribute attr = manifest.CreateAttribute(name);
+        attr.Value = value;
+        node.Attributes.Append(attr);
+    }
+
+    // this method creates a MetaData resolver and loads all the assemblies into
+    // it
+    private void InitializeResolver()
+    {
+        resolver = new MetaDataResolver(assemblies, new ArrayList(), new DateTime(),
+                                        false, false);
+
+        MetaDataResolver.ResolveCustomAttributes(
+            new MetaDataResolver[] {resolver});
+    }
+
+    // parse utility function to ensure that a type's inheritance matches the
+    // inheritance specified in the TokenDefinition
+    public bool MatchInheritance(string derivesFromClass,
+                                 MetaDataTypeDefinition type)
+    {
+        //Console.WriteLine("derives=({0}), type = {1}",
+        //    derivesFromClass,
+        //    type.Extends == null ? null: ((MetaDataTypeReference)type.Extends).FullName);
+/*
+        if (derivesFromClass != null) {
+            if (type.Extends == null ||
+                ((MetaDataTypeReference)type.Extends).FullName !=
+                derivesFromClass) {
+                return false;
+            }
+        }
+*/
+      return true;
+    }
+
+    // parse utility function to ensure that the class of a field matches the
+    // class name specified in a TokenDefinition
+    public bool MatchFieldType(FieldDefinition rule,
+                               MetaDataField field)
+    {
+        if (rule.matchClassType != null) {
+            MetaDataObject classobj = field.Signature.FieldType.ClassObject;
+            string classtype = "";
+
+            // Since we can pass in different objects as field, we need to be
+            // careful here about how we get the class type
+            if (classobj is MetaDataTypeDefinition) {
+                classtype = ((MetaDataTypeDefinition) classobj).FullName;
+            }
+            else if (classobj is MetaDataTypeReference) {
+                classtype = ((MetaDataTypeReference) classobj).FullName;
+            }
+            else if (classobj == null) {
+                classtype = field.Signature.FieldType.ElementType.ToString();
+            }
+
+            if (classtype != rule.matchClassType) {
+                Error("{0} can't be applied to {1}",
+                      LastName(rule.attribute), field.FullName);
+                Error("{0}does not match {1}",
+                      classtype, rule.matchClassType);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // This is the only way we create XML tags (except for Endpoints)
+    public XmlNode CreateNode(MetaDataCustomAttribute data,
+                              TokenDefinition rule)
+    {
+        XmlNode node = AddElement(null, rule.xmlTagName);
+
+        // make an attribute for each constructor argument
+        if (data.FixedArgs.Length != 0) {
+            for (int i = 0; i < data.FixedArgs.Length; i++) {
+                string name = rule.constructorFields[i];
+                if (data.FixedArgs[i] == null) {
+                    AddAttribute(node, name, "");
+                }
+                else {
+                    string value = data.FixedArgs[i].ToString();
+                    AddAttribute(node, name, value);
+                }
+            }
+        }
+
+        // make an attribute for each constructor-time property
+        for (int i = 0; i < data.NamedArgs.Length; i++) {
+            string name = rule.FindPropertyReplacement(data.NamedArgs[i].Name);
+            object arg = data.NamedArgs[i].Value;
+            string value;
+            if (arg == null) {
+                // do we want "" or null here?
+                value = null;
+            }
+            else {
+                value = data.NamedArgs[i].Value.ToString();
+                if (arg is System.UInt32) {
+                    // We output unsigned types as 0x because they are generally
+                    // hardware-related numbers which are documented in hexadecimal.
+                    value = String.Format("0x{0:x}", arg);
+                }
+            }
+            AddAttribute(node, name, value);
+        }
+
+        // make an attribute for each default field
+        for (int i = 0; i < rule.defaultFields.Length; i += 2) {
+            string name = rule.defaultFields[i];
+            AddAttribute(node, name, rule.defaultFields[i+1]);
+        }
+        return node;
+    }
+
+    private XmlNode GetEndpointHierarchy(string nodeName, string endpointType)
+    {
+        XmlNode node = AddElement(null, nodeName);
+        MetaDataTypeDefinition epType = resolver.ResolveName(endpointType);
+
+        XmlNode oldChild = null;
+        XmlNode newChild = null;
+
+        while (epType.FullName != "Microsoft.Singularity.Channels.Endpoint") {
+            newChild = manifest.CreateNode(XmlNodeType.Element, "inherit", "");
+
+            AddAttribute(newChild, "name", epType.FullName);
+
+            if (oldChild == null) {
+                node.AppendChild(newChild);
+            }
+            else {
+                node.InsertBefore(newChild, oldChild);
+            }
+            oldChild = newChild;
+
+            string nextName;
+            if (epType.Extends is MetaDataTypeReference) {
+                nextName = ((MetaDataTypeReference) epType.Extends).FullName;
+                if (nextName == "Exp" || nextName == "Imp") {
+                    MetaDataTypeReference mdtr =
+                        (MetaDataTypeReference) epType.Extends;
+                    nextName =
+                        ((MetaDataTypeReference)mdtr.ResolutionScope).FullName
+                        + "." + nextName;
+                }
+
+            }
+            else if (epType.Extends is MetaDataTypeDefinition) {
+                nextName = ((MetaDataTypeDefinition) epType.Extends).FullName;
+            }
+            else {
+                return node;
+            }
+
+            epType = resolver.ResolveName(nextName);
+        }
+
+        newChild = manifest.CreateNode(XmlNodeType.Element, "inherit", "");
+        AddAttribute(newChild, "name", epType.FullName);
+
+        if (oldChild == null) {
+            node.AppendChild(newChild);
+        }
+        else {
+            node.InsertBefore(newChild, oldChild);
+            oldChild = newChild;
+        }
+
+        return node;
+    }
+
+
+    public XmlNode CreateNodeIndexed(MetaDataCustomAttribute data,
+                              TokenDefinition rule,
+                              int index
+                              )
+    {
+        XmlNode node = CreateNode(data, rule);
+        AddAttribute(node, "id", index.ToString());
+        return node;
+    }
+
+    // Endpoints are special in a lot of ways, and require a special method
+    public XmlNode CreateEndpointNode(MetaDataCustomAttribute data,
+                                      EndpointDefinition rule,
+                                      int index)
+    {
+        // assume that the constructor to an endpoint always takes one argument,
+        // and that the argument looks like this:
+        // "<discard*> contractname+Exp*,AssemblyName, Version=foo,
+        //  Culture=bar, PublicKeyToken=fbar"
+
+        // we'll parse this to get all the attributes of the top-level tag, and
+        // then parse field that is being decorated to get the rest of the
+        // information we need.
+
+        // get the type of the field that is decorated:
+        MetaDataObject t = (MetaDataObject)
+            ((MetaDataField)data.Parent).Signature.FieldType.ClassObject;
+
+        // split the field to get the parts we need
+        string typeName = t.FullName;
+        typeName = typeName.Replace("<", ",");
+        typeName = typeName.Replace(">", "");
+        typeName = typeName.Replace("+", ",");
+
+        string [] nameParts = typeName.Split(',');
+
+        string contractName = nameParts[1];
+        string impName = contractName + ".Imp";
+        string expName = contractName + ".Exp";
+        string stateName = contractName + "." + nameParts[4];
+
+
+        XmlNode impNode = GetEndpointHierarchy("imp", impName);
+        XmlNode expNode = GetEndpointHierarchy("exp", expName);
+
+        MetaDataTypeDefinition r1 = resolver.ResolveName(impName);
+        MetaDataTypeDefinition r2 = resolver.ResolveName(expName);
+        MetaDataTypeDefinition r3 = resolver.ResolveName(stateName);
+
+        string startState = "";
+        for (int i = 0; i < r3.Fields.Length; i++) {
+            if (r3.Fields[i].Name == "Value") {
+                startState = r3.Fields[0].DefaultValue.ToString();
+                break;
+            }
+        }
+
+        XmlNode node = manifest.CreateNode(XmlNodeType.Element,
+                                           rule.xmlTagName, "");
+
+        node.AppendChild(impNode);
+        node.AppendChild(expNode);
+        AddAttribute(node, "id", index.ToString());
+        if (startState != "") {
+            AddAttribute(node, "startStateId", startState);
+        }
+
+        // Contract name comes from either the attribute argument
+        // or the TRef type depending on the endpoint kind
+        rule.AddContractNameAttribute(this, node, data, contractName);
+
+        // add an attribute for each constructor argument if there is one
+        // This should only be true for input/ouput pipes
+        if (rule.constructorFields != null && rule.constructorFields.Length != 0) {
+            if (data.FixedArgs.Length != 0) {
+                for (int i = 0; i < data.FixedArgs.Length; i++) {
+                    if (rule.constructorFields[i] != null) {
+                        string name = rule.constructorFields[i];
+                        if (data.FixedArgs[i] == null) {
+                            AddAttribute(node, name, "");
+                        }
+                        else {
+                            string value = data.FixedArgs[i].ToString();
+                            AddAttribute(node, name, value);
+                        }
+                    }
+                    else {
+                        Console.WriteLine(" fixed=({0}), no matching constructor?",
+                            data.FixedArgs[i] == null? null : data.FixedArgs[i].ToString() );
+                    }
+                }
+            }
+        }
+
+        return node;
+    }
+
+    // this does the processing of each field-level decoration on a type,
+    // according to rules.fieldAttributes
+    private void ProcessFieldAttributes(MetaDataTypeDefinition type,
+                                        FieldDefinition[] rules,
+                                        XmlNode parent)
+    {
+        int endpointIndex = 0;
+        int intParameterIndex = 0;
+        int stringParameterIndex = 0;
+        int stringArrayParameterIndex = 0;
+        int boolParameterIndex = 0;
+        foreach (MetaDataField field in type.Fields) {
+            if (field.CustomAttributes == null) {
+                continue;
+            }
+
+            foreach (MetaDataCustomAttribute attrib in field.CustomAttributes) {
+                foreach (FieldDefinition rule in rules) {
+                    if (attrib.Name == rule.attribute) {
+
+                        // type check it
+                        if (MatchFieldType(rule, field)) {
+                            // custom step if Endpoint:
+                            XmlNode node;
+
+                            EndpointDefinition edrule = rule as EndpointDefinition;
+                            if (edrule != null) {
+                                node = CreateEndpointNode(attrib, edrule, endpointIndex++);
+                            }
+                            else if (rule is ParameterDefinition )  {
+                                int index;
+                                if (rule.matchClassType == "I8") {
+                                    index = intParameterIndex++;
+                                }
+                                else if (rule.matchClassType == "STRING") {
+                                    index = stringParameterIndex++;
+                                }
+                                else if (rule.matchClassType == "BOOLEAN") {
+                                    index = boolParameterIndex++;
+                                }
+                                else if (rule.matchClassType == "SZARRAY") {
+                                    index = stringArrayParameterIndex++;
+                                }
+                                else {
+                                    index =999;
+                                }
+                                node = CreateNodeIndexed(attrib, rule, index);
+                            }
+                            else {
+                                node = CreateNode(attrib, rule);
+                            }
+
+                            if (node != null) {
+                                XmlNode group = parent[rule.xmlGroup];
+                                if (group == null) {
+                                    group = AddElement(parent, rule.xmlGroup);
+                                }
+                                group.AppendChild(node);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // this does the processing of each class-level decoration on a type, as
+    // described in rules.classAttributes
+    private void ProcessClassAttributes(MetaDataTypeDefinition type,
+                                        ClassDefinition[] rules,
+                                        XmlNode parent)
+    {
+        if (type.CustomAttributes == null) {
+            return;
+        }
+
+        foreach (MetaDataCustomAttribute attrib in type.CustomAttributes) {
+            foreach (ClassDefinition rule in rules) {
+                if (attrib.Name == rule.attribute) {
+                    XmlNode node = CreateNode(attrib, rule);
+                    parent.AppendChild(node);
+                }
+            }
+        }
+    }
+
+    // this kicks off the processing of a type; see if it is decorated by
+    // rules.triggers, and if so, then build an xml node and process the rest
+    // of the rules object for this type
+    private bool ProcessType(MetaDataTypeDefinition type,
+                             ParseRules rules,
+                             XmlNode parent,
+                             ref int categoryIndex,
+                             ref XmlNode categories)
+    {
+        if (type.CustomAttributes == null) {
+            return false;
+        }
+
+
+        foreach (MetaDataCustomAttribute attrib in type.CustomAttributes) {
+            foreach (TriggerDefinition rule in rules.triggers) {
+                if (attrib.Name == rule.attribute) {
+                    // only process this entry if the ancestry is valid
+                    if (MatchInheritance(rule.derivesFromClass, type)) {
+                        if (categoryIndex == 0) {
+                            categories = AddElement(parent,"categories");
+                        }
+                        // create an xml node from (attrib, rule)
+                        XmlNode node = CreateNode(attrib, rule);
+
+                        AddAttribute(node, "id", (categoryIndex++).ToString());
+                        if (rule.categoryName != null) {
+                            AddAttribute(node, "name", rule.categoryName);
+                        }
+                        AddAttribute(node, "class", type.FullName);
+
+                        // then do the rules.classDefinitions work
+                        ProcessClassAttributes(type, rules.classAttributes, node);
+
+                        // then do the rules.fieldDefinitions work
+                        ProcessFieldAttributes(type, rules.fieldAttributes, node);
+
+                        // then append this xml node to the manifest root doc
+                        if (categories == null) {
+                            Console.WriteLine(" categories is null at index {0}",categoryIndex);
+                        }
+                        else {
+                            categories.AppendChild(node);
+                        }
+                        // once we match once, we stop operating on this type
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    private String KeyToString(byte[] key)
+    {
+        StringBuilder sb = new StringBuilder("");
+        int count = key.Length;
+        if (count > 0) {
+            for (int i = 0; i < count; i++) {
+                sb.Append(key[i].ToString("x2"));
+            }
+        }
+        return sb.ToString();
+    }
+
+    private String StripPathFromPath(string path)
+    {
+        int index = Math.Max(path.LastIndexOf(':'),
+                             Math.Max(path.LastIndexOf('\\'),
+                                      path.LastIndexOf('/')));
+        if (index >= 0) {
+            return path.Substring(index + 1);
+        }
+        return path;
+    }
+
+    private String StripCacheFromPath(string path)
+    {
+        if (cache != null && path.ToLower().StartsWith(cache)) {
+            return path.Substring(cache.Length).Replace('\\', '/');
+        }
+        return path.Replace('\\', '/');
+    }
+
+    // augment a manifest based on the assembly given.  This touches:
+    // <assemblies>, <ConsoleCategory>, <category>, and <drivercategory>
+    private void ParseAssemblies(XmlNode assemblies)
+    {
+    }
+
+}
diff --git a/base/Windows/mkmani/TokenDefinition.cs b/base/Windows/mkmani/TokenDefinition.cs
new file mode 100644
index 0000000..6951f9f
--- /dev/null
+++ b/base/Windows/mkmani/TokenDefinition.cs
@@ -0,0 +1,363 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   TokenDefinition.cs
+//
+//  Note:   Declares a class describing MetaData tokens, so that the
+//          metadata parser's consts can all be easily identified.
+using System;
+using System.Diagnostics;
+using System.Xml;
+using Bartok.MSIL;
+
+public class TokenDefinition
+{
+    // name of the metadata attribute to match
+    public readonly string attribute;
+
+    // name of the xml tag to output
+    public readonly string xmlTagName;
+
+    // labels for constructor fields during output
+    public readonly string [] constructorFields;
+
+    // labels for properties to be renamed during output
+    // each property uses two addresses [default, new name]
+    public readonly string [] propertyReplacements;
+
+    // fields to be added with default values, if not named
+    public readonly string [] defaultFields;
+
+    // basic constructor; everything is public, but now it's all very easy to
+    // keep track of.
+    public TokenDefinition(string xmlTagName,
+                           string attribute,
+                           string [] constructorFields,
+                           string [] propertyReplacements,
+                           string [] defaultFields)
+    {
+        this.xmlTagName = xmlTagName;
+        this.attribute = attribute;
+        this.constructorFields = constructorFields;
+        if (propertyReplacements != null && (propertyReplacements.Length % 2) != 0) {
+            Console.WriteLine("{0} has bad propertyReplacements", xmlTagName);
+        }
+        this.propertyReplacements = propertyReplacements;
+        if (defaultFields != null && (defaultFields.Length % 2) != 0) {
+            Console.WriteLine("{0} has bad defaultFields", xmlTagName);
+        }
+        this.defaultFields = defaultFields;
+    }
+
+    public TokenDefinition(string xmlTagName,
+                           string attribute,
+                           string [] constructorFields,
+                           string [] propertyReplacements)
+        : this(xmlTagName, attribute, constructorFields, propertyReplacements, new string[0])
+    {
+    }
+
+    public TokenDefinition(string xmlTagName,
+                           string attribute,
+                           string [] constructorFields)
+        : this(xmlTagName, attribute, constructorFields, new string[0], new string[0])
+    {
+    }
+
+    public TokenDefinition(string xmlTagName,
+                           string attribute)
+        : this(xmlTagName, attribute, new string[0], new string[0], new string[0])
+    {
+    }
+
+    public string FindPropertyReplacement(string name)
+    {
+        if (propertyReplacements != null) {
+            for (int pair = 0; pair < propertyReplacements.Length; pair += 2) {
+                if (propertyReplacements[pair] == name) {
+                    return propertyReplacements[pair + 1];
+                }
+            }
+        }
+        return name;
+    }
+}
+
+public class TriggerDefinition : TokenDefinition
+{
+    // name of the category
+    public readonly string categoryName;
+
+    // name of the class that the decorated class must directly inherit from
+    public readonly string derivesFromClass;
+
+    public TriggerDefinition(string xmlTagName,
+                             string categoryName,
+                             string attribute,
+                             string derivesFromClass,
+                             string [] constructorFields,
+                             string [] propertyReplacements,
+                             string [] defaultFields)
+        : base(xmlTagName,
+               attribute,
+               constructorFields,
+               propertyReplacements,
+               defaultFields)
+    {
+        this.derivesFromClass = derivesFromClass;
+        this.categoryName = categoryName;
+    }
+
+    public TriggerDefinition(string xmlTagName,
+                             string categoryName,
+                             string attribute,
+                             string derivesFromClass,
+                             string [] constructorFields,
+                             string [] propertyReplacements)
+        : base(xmlTagName, attribute, constructorFields, propertyReplacements, new string[0])
+    {
+        this.derivesFromClass = derivesFromClass;
+        this.categoryName = categoryName;
+    }
+
+    public TriggerDefinition(string xmlTagName,
+                             string categoryName,
+                             string attribute,
+                             string derivesFromClass,
+                             string [] constructorFields)
+        : base(xmlTagName, attribute, constructorFields, new string[0], new string[0])
+    {
+        this.derivesFromClass = derivesFromClass;
+        this.categoryName = categoryName;
+    }
+
+    public TriggerDefinition(string xmlTagName,
+                             string categoryName,
+                             string attribute,
+                             string derivesFromClass)
+        : base(xmlTagName, attribute, new string[0], new string[0], new string[0])
+    {
+        this.derivesFromClass = derivesFromClass;
+        this.categoryName = categoryName;
+    }
+}
+
+public class ClassDefinition : TokenDefinition
+{
+    public ClassDefinition(string xmlTagName,
+                           string attribute,
+                           string [] constructorFields,
+                           string [] propertyReplacements,
+                           string [] defaultFields)
+        : base(xmlTagName,
+               attribute,
+               constructorFields,
+               propertyReplacements,
+               defaultFields)
+    {
+    }
+
+    public ClassDefinition(string xmlTagName,
+                           string attribute,
+                           string [] constructorFields,
+                           string [] propertyReplacements)
+        : base(xmlTagName, attribute, constructorFields, propertyReplacements, new string[0])
+    {
+    }
+
+    public ClassDefinition(string xmlTagName,
+                           string attribute,
+                           string [] constructorFields)
+        : base(xmlTagName, attribute, constructorFields, new string[0], new string[0])
+    {
+    }
+
+    public ClassDefinition(string xmlTagName,
+                           string attribute)
+        : base(xmlTagName, attribute, new string[0], new string[0], new string[0])
+    {
+    }
+}
+
+public class ParameterDefinition : FieldDefinition
+{
+    public ParameterDefinition(string xmlGroup,
+                           string xmlTagName,
+                           string attribute,
+                           string matchClassType,
+                           string [] constructorFields)
+        : base(xmlGroup,
+               xmlTagName,
+               attribute,
+               matchClassType,
+               constructorFields)
+        {
+        }
+    
+}
+public class FieldDefinition : TokenDefinition
+{
+    // name of the group to put the field into.
+    public readonly string xmlGroup;
+
+    // name of the class that the decorated class must be (fields only)
+    public readonly string matchClassType;
+
+    public FieldDefinition(string xmlGroup,
+                           string xmlTagName,
+                           string attribute,
+                           string matchClassType,
+                           string [] constructorFields,
+                           string [] propertyReplacements,
+                           string [] defaultFields)
+        : base(xmlTagName,
+               attribute,
+               constructorFields,
+               propertyReplacements,
+               defaultFields)
+    {
+        this.xmlGroup = xmlGroup;
+        this.matchClassType = matchClassType;
+    }
+
+    public FieldDefinition(string xmlGroup,
+                           string xmlTagName,
+                           string attribute,
+                           string matchClassType,
+                           string [] constructorFields,
+                           string [] propertyReplacements)
+        : base(xmlTagName,
+               attribute,
+               constructorFields,
+               propertyReplacements,
+               new string[0])
+    {
+        this.xmlGroup = xmlGroup;
+        this.matchClassType = matchClassType;
+    }
+
+    public FieldDefinition(string xmlGroup,
+                           string xmlTagName,
+                           string attribute,
+                           string matchClassType,
+                           string [] constructorFields)
+        : base(xmlTagName,
+               attribute,
+               constructorFields,
+               new string[0],
+               new string[0])
+    {
+        this.xmlGroup = xmlGroup;
+        this.matchClassType = matchClassType;
+    }
+
+    public FieldDefinition(string xmlGroup,
+                           string xmlTagName,
+                           string attribute,
+                           string matchClassType)
+        : base(xmlTagName,
+               attribute,
+               new string[0],
+               new string[0],
+               new string[0])
+    {
+        this.xmlGroup = xmlGroup;
+        this.matchClassType = matchClassType;
+    }
+}
+
+public class EndpointDefinition : FieldDefinition
+{
+    public EndpointDefinition(string xmlGroup,
+                              string xmlTagName,
+                              string attribute,
+                              string matchClassType)
+        : base(xmlGroup,
+               xmlTagName,
+               attribute,
+               matchClassType,
+               new string[0],
+               new string[0],
+               new string[0])
+    {
+    }
+    public EndpointDefinition(string xmlGroup,
+                              string xmlTagName,
+                              string attribute,
+                              string matchClassType,
+                              string[] constructorFields)
+        : base(xmlGroup,
+                xmlTagName,
+                attribute,
+                matchClassType,
+                constructorFields,
+                new string[0],
+                new string[0]) 
+    {
+    }
+    
+    public virtual void AddContractNameAttribute(ManifestBuilder mfb, 
+                                                 XmlNode node,
+                                                 MetaDataCustomAttribute data, 
+                                                 string contractName)
+    {
+        mfb.AddAttribute(node, "contractName", contractName);
+    }
+}
+
+public class ServiceEndpointDefinition : EndpointDefinition
+{
+    public ServiceEndpointDefinition(string xmlGroup,
+                                     string xmlTagName,
+                                     string attribute,
+                                     string matchClassType)
+        : base(xmlGroup, xmlTagName, attribute, matchClassType)
+    {
+    }
+
+    public override void AddContractNameAttribute(ManifestBuilder mfb,
+                                                  XmlNode node,
+                                                  MetaDataCustomAttribute data,
+                                                  string contractName)
+    {
+        // takes endpoint type as argument
+        if (data.FixedArgs == null || data.FixedArgs.Length != 1) {
+            mfb.Error("ServiceEndpoint attribute must have 1 type argument");
+            return;
+        }
+
+        // now make it easy to split into name=value pairs by doing some
+        // string replacing
+        string ctorArgument = "contractName=" + data.FixedArgs[0];
+        ctorArgument = ctorArgument.Replace("+", " endpointEnd=");
+        ctorArgument = ctorArgument.Replace(", V", " v");
+        ctorArgument = ctorArgument.Replace(", C", " c");
+        ctorArgument = ctorArgument.Replace(", P", " p");
+        ctorArgument = ctorArgument.Replace(",", " assembly=");
+
+        // now we can split on ' ' and '=' to get name/value pairs
+        string [] endpointConfig = ctorArgument.Split(' ');
+
+        // grab only the contractName, ignore the rest
+#if false
+        foreach (string attrib in endpointConfig) {
+            string [] pair = attrib.Split('=');
+            if (pair.Length == 2) {
+                string name = pair[0];
+                string value = pair[1];
+                AddAttribute(node, name, value);
+            }
+        }
+#else
+        string [] pair = endpointConfig[0].Split('=');
+        Debug.Assert(pair.Length == 2);
+        string name = pair[0];
+        Debug.Assert(name == "contractName");
+        string value = pair[1];
+        base.AddContractNameAttribute(mfb, node, data, value);
+#endif
+    }
+}
diff --git a/base/Windows/mkmani/mkmani.cs b/base/Windows/mkmani/mkmani.cs
new file mode 100644
index 0000000..25c393c
--- /dev/null
+++ b/base/Windows/mkmani/mkmani.cs
@@ -0,0 +1,190 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   DistroBuilder.cs
+//
+//  Note:   Builds a manifest by analyzing a list of assemblies
+
+using System;
+using System.IO;
+using System.Xml;
+using System.Collections;
+
+public class MkMani
+{
+    // Print the correct command line args for the program
+    static void Usage()
+    {
+        Console.WriteLine("Usage:\n" +
+                          "    mkmani /out:<manifest> /app:<app> [options] [assemblies]\n" +
+                          "Options:\n" +
+                          "    /app:<app>          - Set name of application.\n" +
+                          "    /cache:<path>       - Root of file cache.\n" +
+                          "    /out:<manifest>     - Set name of output manifest.\n" +
+                          "    /x86:<image.x86>    - Set name of .x86 image file.\n" +
+                          "    /r:assembly         - Reference an assembly.\n" +
+                          "    /ref:assembly       - Reference an assembly.\n" +
+                          "    /codegen:xxx        - Add a code generation parameter.\n" +
+                          "    /linker:xxx         - Add a linker parameter.\n" +
+                          "");
+    }
+
+    static int Main(string[] args)
+    {
+        ArrayList infiles = new ArrayList();
+        ArrayList codegen = new ArrayList();
+        ArrayList linker = new ArrayList();
+        string outfile = null;
+        string appname = null;
+        string x86file = "";
+        string cacheDirectory = null;
+
+        // Temporaries for command-line parsing
+        bool needHelp = (args.Length == 0);
+
+        for (int i = 0; i < args.Length && !needHelp; i++) {
+            string arg = (string) args[i];
+
+            if (arg.Length >= 2 && (arg[0] == '-' || arg[0] == '/')) {
+                string name = null;
+                string value = null;
+                int n = arg.IndexOf(':');
+                if (n > -1) {
+                    name = arg.Substring(1, n - 1).ToLower();
+                    if (n < arg.Length + 1) {
+                        value = arg.Substring(n + 1);
+                    }
+                }
+                else {
+                    name = arg.Substring(1).ToLower();
+                }
+
+                bool badArg = false;
+                switch (name) {
+                    case "h":
+                    case "help":
+                    case "?":
+                        needHelp = true;
+                        break;
+
+                    case "a":
+                    case "app":
+                        badArg = (value == null);
+                        appname = value;
+                        break;
+
+                    case "ca":
+                    case "cache":
+                        badArg = (value == null);
+                        cacheDirectory = value.TrimEnd('/', '\\') + "\\";
+                        break;
+
+                    case "co":
+                    case "code":
+                    case "codegen":
+                        badArg = (value == null);
+                        codegen.Add(value);
+                        break;
+
+                    case "li":
+                    case "link":
+                    case "linker":
+                        badArg = (value == null);
+                        linker.Add(value);
+                        break;
+
+                    case "o":
+                    case "out":
+                        badArg = (value == null);
+                        outfile = value;
+                        break;
+
+                    case "r":
+                    case "ref":
+                        badArg = (value == null);
+                        if (value != null) {
+                            infiles.Add(value);
+                        }
+                        break;
+
+                    case "x":
+                    case "x86":
+                        badArg = (value == null);
+                        x86file = value;
+                        break;
+
+                    default:
+                        Console.WriteLine("Unknown command line argument: {0}", arg);
+                        needHelp = true;
+                        break;
+                }
+                if (badArg) {
+                    Console.WriteLine("Invalid command line argument: {0}", arg);
+                    needHelp = true;
+                }
+            }
+            else {
+                infiles.Add(arg);
+            }
+        }
+
+        if (appname == null || outfile == null || cacheDirectory == null ||
+            infiles.Count == 0) {
+
+            Console.WriteLine("Arguments missing from command line.");
+            needHelp = true;
+        }
+
+        if (needHelp) {
+            Usage();
+            return 1;
+        }
+
+        // check all input files
+        foreach (string filename in infiles) {
+            if (!File.Exists(filename)) {
+                Console.WriteLine("Error: Assembly '{0}' not found.", filename);
+                return 2;
+            }
+        }
+
+        if (!Directory.Exists(cacheDirectory)) {
+            Console.WriteLine("Error: Cache directory '{0}' not found.", cacheDirectory);
+            return 2;
+        }
+
+        // initialize the empty app manifest.
+        ManifestBuilder mb = new ManifestBuilder(cacheDirectory, infiles);
+
+        // create the app manifest
+        if (mb.CreateNewManifest(appname,
+                                 (x86file != "") ? Path.GetFullPath(x86file) : x86file)) {
+
+            // Add the codegen flags.
+            foreach (string param in codegen) {
+                mb.AddCodegenParameter(param);
+            }
+
+            // Add the linker flags.
+            foreach (string param in linker) {
+                mb.AddLinkerParameter(param);
+            }
+
+            // output the xml document:
+            XmlTextWriter writer = new XmlTextWriter(outfile,
+                                                     System.Text.Encoding.UTF8);
+            writer.Formatting = Formatting.Indented;
+            mb.Save(writer);
+            writer.Close();
+
+            return 0;
+        }
+        else {
+            // Error
+            return 1;
+        }
+    }
+}
diff --git a/base/Windows/mkmani/mkmani.csproj b/base/Windows/mkmani/mkmani.csproj
new file mode 100644
index 0000000..62062c9
--- /dev/null
+++ b/base/Windows/mkmani/mkmani.csproj
@@ -0,0 +1,29 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>mkmani</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ManifestBuilder.cs"/>
+    <Compile Include="TokenDefinition.cs"/>
+    <Compile Include="mkmani.cs"/>
+    <Reference Include="$(BuildDir)\MsilReader.dll"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/mkmar/CheapState.cs b/base/Windows/mkmar/CheapState.cs
new file mode 100644
index 0000000..e8fb77c
--- /dev/null
+++ b/base/Windows/mkmar/CheapState.cs
@@ -0,0 +1,940 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#if BOILER_PLATE
+namespace Bartok.Marshal {
+    public class CheapState {
+#endif // BOILER_PLATE
+        private static CheapState latest;
+
+        private const uint Limit = 16;
+
+        public CheapState(int indent)
+        {
+            used = 0;
+            read = 0;
+            this.indent = indent;
+
+            loadPtrs = new object[128 * 1024];
+
+            regionSize = 8 * 1024 * 1024;
+            region = VirtualAlloc(0, regionSize, MEM_COMMIT, PAGE_READWRITE);
+            Console.WriteLine("Region = {0:x8}", region);
+
+            latest = this;
+        }
+
+        public CheapState(CheapState other)
+        {
+            region = other.region;
+            regionSize = other.regionSize;
+
+            used = 0;
+            read = 0;
+            indent = 0;
+
+            loadPtrs = new object[16 * 1024];
+
+            latest = this;
+        }
+
+        [System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError=true)]
+        private static extern uint VirtualAlloc(uint lpAddress,
+                                                uint dwSize,
+                                                uint flAllocationType,
+                                                uint flProtect);
+        private const uint MEM_COMMIT = 0x1000;
+        private const uint PAGE_READWRITE = 0x04;
+
+        private uint        region;
+        private uint        regionSize;
+
+        private uint        used;
+        private uint        read;
+
+        private ObjectIDGenerator   oig;
+
+        private object[]    loadPtrs;
+        private uint        loadCount;
+
+        private uint        usedTrace;
+        private uint        readTrace;
+        private int         indent;
+
+        public static System.Collections.Hashtable writeHash;
+        public static System.Collections.Hashtable readHash;
+
+        public void WriteOpen()
+        {
+            oig = new ObjectIDGenerator();
+#if false
+            unsafe {
+                byte *ptr = (byte *)region;
+                for (uint i = 0; i < used; i++) {
+                    ptr[i] = 0xdd;
+                }
+            }
+#endif
+
+            used = 0;
+            usedTrace = 0;
+            indent = 0;
+
+            WriteRaw(used);
+            TraceWrite("Zero Buffer Size");
+        }
+
+        public void WriteClose()
+        {
+            unsafe {
+                uint * p = (uint *)region;
+                *p = used;
+            }
+            Trace(0, 4, "Wrote Buffer Size: {0}", used);
+            used = 0;
+            read = 0;
+        }
+
+        public void ReadOpen()
+        {
+            read = 0;
+            readTrace = 0;
+            indent = 0;
+
+#if false
+            for (uint i = 0; i < loadCount; i++) {
+                loadPtrs[i] = null;
+            }
+#endif
+            loadPtrs[0] = null;
+            loadCount = 1;
+
+            used = 4;    // set to 4 so our read don't fail.
+            ReadRaw(out used);
+            TraceRead("Read Buffer Size: {0}", used);
+        }
+
+        public void ReadClose()
+        {
+            if (used != read) {
+                throw new ArgumentOutOfRangeException();
+            }
+            read = 0;
+            used = 0;
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void Trace(uint offset, uint size, string text)
+        {
+            if (offset > Limit) {
+                return;
+            }
+
+#if !USE_DOT_INDENT
+            Console.Write("{0,8:d}: {1}{2}", offset, new String('.', indent), text);
+            if (indent + text.Length < 32) {
+                Console.Write(new String(' ', 32 - (indent + text.Length)));
+            }
+#else
+            Console.Write("{0,8:d}: {1,3} {2,-20} ", offset, indent, text);
+#endif
+            if (size > 0) {
+                if (offset + size > regionSize) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                for (uint i = 0; i < size; i++) {
+                    unsafe {
+                        byte *p = (byte *)region + offset + i;
+                        Console.Write("{0:x2}", *p);
+                    }
+                }
+            }
+            Console.WriteLine();
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void Trace(uint offset, uint size, string text, params object[] args)
+        {
+            Trace(offset, size, String.Format(text, args));
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void TraceRead(string text)
+        {
+            uint offset = readTrace;
+            uint size = read - readTrace;
+            readTrace = read;
+
+            Trace(offset, size, text);
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void TraceRead(string text, params object[] args)
+        {
+            TraceRead(String.Format(text, args));
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void TraceWrite(string text)
+        {
+            uint offset = usedTrace;
+            uint size = used - usedTrace;
+            usedTrace = used;
+
+            Trace(offset, size, text);
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void TraceWrite(string text, params object[] args)
+        {
+            TraceWrite(String.Format(text, args));
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void Trace(string text)
+        {
+            if (read == 0 && used > Limit) {
+                return;
+            }
+            else if (read > Limit) {
+                return;
+            }
+
+#if !USE_DOT_INDENT
+            Console.WriteLine("        : {0}{1}", new String('.', indent), text);
+#else
+            Console.WriteLine("        : {0,3} {1}", indent, text);
+#endif
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void Trace(string text, params object[] args)
+        {
+            Trace(String.Format(text, args));
+        }
+
+        [System.Diagnostics.Conditional("TRACE_CHEAP_STATE")]
+        public void Trace()
+        {
+            Console.WriteLine();
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+        public bool SavePtr(uint id, object ptr)
+        {
+            bool first;
+            long oid = oig.GetId(ptr, out first);
+            if (!first) {
+                id |= 0x8000;
+                WriteType(id);
+                WriteRaw(unchecked((uint)oid));
+                TraceWrite("** pointer {0} of 0x{1:x}", oid, id);;
+                WriteTypeEnd(id);
+                return false;   // already marshaled.
+            }
+            else {
+                TraceWrite("** Save pointer: {0} of 0x{1:x}", oid, id);;
+            }
+            return true;        // needs to be marshaled.
+        }
+
+        // Remember the pointer as we unmarshal an object.
+        public uint AddPtr(object ptr, uint id)
+        {
+            loadPtrs[loadCount] = ptr;
+            Trace(read, 0, "** Load pointer: {0} of 0x{1:x}", loadCount, id);
+            return loadCount++;
+        }
+
+        // Only a pointer was saved because the object was already unmarshaled.
+        public object LoadPtr(uint id)
+        {
+            if ((id & 0x8000) == 0) {
+                throw new Exception("Bad id for pointer: " + id);
+            }
+            uint pi;
+            ReadRaw(out pi);
+            TraceRead("** pointer {0} of 0x{1:x}", pi, id);
+            ReadTypeEnd(id);
+
+            if (pi == 0 || pi > loadCount) {
+                throw new Exception("Unexpected object pi: " + pi);
+            }
+            return loadPtrs[pi];
+        }
+
+        public void WriteRaw(ulong u)
+        {
+            unsafe {
+                if (used + sizeof(ulong) > regionSize) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + used;
+                *((ulong *)p) = u;
+                used += sizeof(ulong);
+            }
+        }
+
+        public void WriteRaw(uint u)
+        {
+            unsafe {
+                if (used + sizeof(uint) > regionSize) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + used;
+                *((uint *)p) = u;
+                used += sizeof(uint);
+            }
+        }
+
+        public void WriteRaw(ushort u)
+        {
+            unsafe {
+                if (used + sizeof(ushort) > regionSize) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + used;
+                *((ushort *)p) = u;
+                used += sizeof(ushort);
+            }
+        }
+
+        public void WriteRaw(byte u)
+        {
+            unsafe {
+                if (used + sizeof(byte) > regionSize) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + used;
+                *((byte *)p) = u;
+                used += sizeof(byte);
+            }
+        }
+
+        public void ReadRaw(out ulong u)
+        {
+            unsafe {
+                if (read + sizeof(ulong) > used) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + read;
+                u = *((ulong *)p);
+                read += sizeof(ulong);
+            }
+        }
+
+        public void ReadRaw(out uint u)
+        {
+            unsafe {
+                if (read + sizeof(uint) > used) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + read;
+                u = *((uint *)p);
+                read += sizeof(uint);
+            }
+        }
+
+        public void ReadRaw(out ushort u)
+        {
+            unsafe {
+                if (read + sizeof(ushort) > used) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + read;
+                u = *((ushort *)p);
+                read += sizeof(ushort);
+            }
+        }
+
+        public void ReadRaw(out byte u)
+        {
+            unsafe {
+                if (read + sizeof(byte) > used) {
+                    throw new ArgumentOutOfRangeException();
+                }
+                byte *p = (byte *)region + read;
+                u = *((byte *)p);
+                read += sizeof(byte);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+        public void WriteType(uint type)
+        {
+            WriteRaw(type | 0xbbbb0000);
+            TraceWrite("WriteType 0x{0:x}", type);
+            if (type != 0) {
+                indent++;
+            }
+        }
+
+        public void WriteTypeEnd(uint type)
+        {
+            if (type == 0) {
+                throw new Exception("Null type can be an end.");
+            }
+            indent--;
+            WriteRaw(type | 0xeeee0000);
+            TraceWrite("WriteTypeEnd 0x{0:x}", type);
+        }
+
+        public uint ReadType()
+        {
+            uint type;
+            ReadRaw(out type);
+            TraceRead("ReadType ~0x{0:x}", (type & 0xffff));
+            if ((type & 0xffff0000) != 0xbbbb0000) {
+                throw new Exception("Missing beg type");
+            }
+            type &= 0x0000ffff;
+
+            if (type != 0) {
+                indent++;
+            }
+            return type;
+        }
+
+        public uint ReadType(uint id)
+        {
+            uint type;
+            ReadRaw(out type);
+            TraceRead("ReadType 0x{0:x}", id);
+            if ((type & 0xffff0000) != 0xbbbb0000) {
+                throw new Exception("Missing beg type");
+            }
+            type &= 0x0000ffff;
+
+            if (type != 0) {
+                indent++;
+            }
+            if (type != id) {
+                throw new Exception("Invalid beg type");
+            }
+            return type;
+        }
+
+        public uint ReadTypeOrNull(uint id)
+        {
+            uint type;
+            ReadRaw(out type);
+            TraceRead("ReadTypeOrNull 0x{0:x}", id);
+            if ((type & 0xffff0000) != 0xbbbb0000) {
+                throw new Exception("Missing beg type");
+            }
+            type &= 0x0000ffff;
+
+            if (type == 0) {
+                return 0;
+            }
+            else if (type == id || type == (id | 0x8000)) {
+                indent++;
+                return type;
+            }
+            else {
+                throw new Exception("Invalid beg type");
+            }
+        }
+
+        public void ReadTypeEnd(uint id)
+        {
+            uint type;
+            indent--;
+            ReadRaw(out type);
+            TraceRead("ReadTypeEnd 0x{0:x}", id);
+            if ((type & 0xffff0000) != 0xeeee0000) {
+                throw new Exception("Missing end type");
+            }
+            type &= 0x0000ffff;
+
+            if (id != 0 && type != id) {
+                throw new Exception("Invalid end type");
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+        public void Write(bool value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Bool);
+#endif
+            if (value) {
+                WriteRaw(unchecked((byte)1));
+                TraceWrite("true");
+            }
+            else {
+                WriteRaw(unchecked((byte)0));
+                TraceWrite("false");
+            }
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Bool);
+#endif
+        }
+
+        public void Read(out bool value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Bool);
+#endif
+            byte t;
+            ReadRaw(out t);
+            TraceRead("bool");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Bool);
+#endif
+            value = (t != 0);
+        }
+
+        public void CheapRead(out bool value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Bool);
+#endif
+            byte t;
+            ReadRaw(out t);
+            TraceRead("bool");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Bool);
+#endif
+            value = (t != 0);
+        }
+
+        public void Write(sbyte value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Sbyte);
+#endif
+            WriteRaw(unchecked((byte)value));
+            TraceWrite("sbyte");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Sbyte);
+#endif
+        }
+
+        public void Read(out sbyte value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Sbyte);
+#endif
+            byte t;
+            ReadRaw(out t);
+            TraceRead("sbyte");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Sbyte);
+#endif
+            value = unchecked((sbyte)t);
+        }
+
+        public void Write(byte value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Byte);
+#endif
+            WriteRaw(value);
+            TraceWrite("byte");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Byte);
+#endif
+        }
+
+        public void Read(out byte value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Byte);
+#endif
+            ReadRaw(out value);
+            TraceRead("byte");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Byte);
+#endif
+        }
+
+        public void Write(short value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Short);
+#endif
+            WriteRaw(unchecked((ushort)value));
+            TraceWrite("short");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Short);
+#endif
+        }
+
+        public void Read(out short value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Short);
+#endif
+            ushort t;
+            ReadRaw(out t);
+            TraceRead("short");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Short);
+#endif
+            value = unchecked((short)t);
+        }
+
+        public void Write(char value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Char);
+#endif
+            WriteRaw(unchecked((ushort)value));
+            TraceWrite("char");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Char);
+#endif
+        }
+
+        public void Read(out char value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Char);
+#endif
+            ushort t;
+            ReadRaw(out t);
+            TraceRead("char");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Char);
+#endif
+            value = unchecked((char)t);
+        }
+
+        public void Write(ushort value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Ushort);
+#endif
+            WriteRaw(value);
+            TraceWrite("ushort");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Ushort);
+#endif
+        }
+
+        public void Read(out ushort value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Ushort);
+#endif
+            ReadRaw(out value);
+            TraceRead("ushort");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Ushort);
+#endif
+        }
+
+        public void Write(int value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Int);
+#endif
+            WriteRaw(unchecked((uint)value));
+            TraceWrite("int");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Int);
+#endif
+        }
+
+        public void Read(out int value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Int);
+#endif
+            uint t;
+            ReadRaw(out t);
+            TraceRead("int");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Int);
+#endif
+            value = unchecked((int)t);
+        }
+
+        public void Write(uint value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Uint);
+#endif
+            WriteRaw(value);
+            TraceWrite("uint");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Uint);
+#endif
+        }
+
+        public void Read(out uint value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Uint);
+#endif
+            ReadRaw(out value);
+            TraceRead("uint");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Uint);
+#endif
+        }
+
+        public void Write(long value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Long);
+#endif
+            WriteRaw(unchecked((ulong)value));
+            TraceWrite("long");
+
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Long);
+#endif
+        }
+
+        public void Read(out long value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Long);
+#endif
+            ulong t;
+            ReadRaw(out t);
+            TraceRead("long");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Long);
+#endif
+            value = unchecked((long)t);
+        }
+
+        public void Write(ulong value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            WriteType((uint)Types.Ulong);
+#endif
+            WriteRaw(value);
+            TraceWrite("ulong");
+#if USE_TYPE_IDS_ON_VALUES
+            WriteTypeEnd((uint)Types.Ulong);
+#endif
+        }
+
+        public void Read(out ulong value)
+        {
+#if USE_TYPE_IDS_ON_VALUES
+            ReadType((uint)Types.Ulong);
+#endif
+            ReadRaw(out value);
+            TraceRead("ulong");
+#if USE_TYPE_IDS_ON_VALUES
+            ReadTypeEnd((uint)Types.Ulong);
+#endif
+        }
+
+        public void Write(string value)
+        {
+            if (value == null) {
+                WriteType(0);
+            }
+            else if (SavePtr((uint)Types.String, value)) {
+                int len = value.Length;
+                WriteType((uint)Types.String);
+                WriteRaw(unchecked((uint)len));
+                for (int i = 0; i < len; i++) {
+                    WriteRaw(unchecked((ushort)value[i]));
+                }
+                TraceWrite("string");
+                WriteTypeEnd((uint)Types.String);
+            }
+        }
+
+        public void Read(out string value)
+        {
+            uint id = ReadTypeOrNull((uint)Types.String);
+            if ((id & 0x8000) != 0) {
+                value = (string)LoadPtr(id);
+            }
+            else if (id != 0) {
+                uint len;
+                ReadRaw(out len);
+                char[] ta = new char [len];
+                for (uint i = 0; i < len; i++) {
+                    ushort t;
+                    ReadRaw(out t);
+                    ta[i] = unchecked((char)t);
+                }
+                TraceRead("string");
+                ReadTypeEnd((uint)Types.String);
+                value = new String(ta);
+                AddPtr(value, (uint)Types.String);
+            }
+            else {
+                value = null;
+            }
+        }
+
+        public void Write(object[] value) {
+            Trace("Write object[]");
+            if (value == null) {
+                WriteType(0);
+            }
+            else if (SavePtr((uint)Types.ObjectArray, value)) {
+                WriteType((uint)Types.ObjectArray);
+                WriteRaw((uint)value.Length);
+                TraceWrite("[].Length");
+                for (int i = 0; i < value.Length; i++) {
+                    if (value[i] == null) {
+                        WriteType(0);
+                    }
+                    else {
+                        Write(value[i]);
+                    }
+                }
+                WriteTypeEnd((uint)Types.ObjectArray);
+            }
+        }
+
+        public void Read(out object[] value) {
+            Trace("Read object[] [outer]");
+            uint id = ReadTypeOrNull((uint)Types.ObjectArray);
+            if ((id & 0x8000) != 0) {
+                value = (object[])LoadPtr(id);
+            }
+            else if (id != 0) {
+                uint len;
+                ReadRaw(out len);
+                TraceRead("[].Length");
+                value = new object [len];
+                AddPtr(value, (uint)Types.ObjectArray);
+                for (int i = 0; i < len; i++) {
+                    Read(out value[i]);
+                }
+                ReadTypeEnd((uint)Types.ObjectArray);
+            }
+            else {
+                value = null;
+            }
+        }
+
+        public void Write(int[] value) {
+            Trace("Write int[]");
+            if (value == null) {
+                WriteType(0);
+            }
+            else if (SavePtr((uint)Types.IntArray, value)) {
+                WriteType((uint)Types.IntArray);
+                WriteRaw((uint)value.Length);
+                for (int i = 0; i < value.Length; i++) {
+                    WriteRaw(unchecked((uint)value[i]));
+                }
+                TraceWrite("[]");
+                WriteTypeEnd((uint)Types.IntArray);
+            }
+        }
+
+        public void Read(out int[] value) {
+            Trace("Read int[] [outer]");
+            uint id = ReadTypeOrNull((uint)Types.IntArray);
+            if ((id & 0x8000) != 0) {
+                value = (int[])LoadPtr(id);
+            }
+            else if (id != 0) {
+                uint len;
+                ReadRaw(out len);
+                value = new int [len];
+                AddPtr(value, (uint)Types.IntArray);
+                for (int i = 0; i < len; i++) {
+                    uint v;
+                    ReadRaw(out v);
+                    value[i] = unchecked((int)v);
+                }
+                TraceRead("[]");
+                ReadTypeEnd((uint)Types.IntArray);
+            }
+            else {
+                value = null;
+            }
+        }
+
+        public void Write(uint[] value) {
+            Trace("Write uint[]");
+            if (value == null) {
+                WriteType(0);
+            }
+            else if (SavePtr((uint)Types.UintArray, value)) {
+                WriteType((uint)Types.UintArray);
+                WriteRaw((uint)value.Length);
+                for (int i = 0; i < value.Length; i++) {
+                    WriteRaw(value[i]);
+                }
+                TraceWrite("[]");
+                WriteTypeEnd((uint)Types.UintArray);
+            }
+        }
+
+        public void Read(out uint[] value) {
+            Trace("Read uint[] [outer]");
+            uint id = ReadTypeOrNull((uint)Types.UintArray);
+            if ((id & 0x8000) != 0) {
+                value = (uint[])LoadPtr(id);
+            }
+            else if (id != 0) {
+                uint len;
+                ReadRaw(out len);
+                value = new uint [len];
+                AddPtr(value, (uint)Types.UintArray);
+                for (int i = 0; i < len; i++) {
+                    ReadRaw(out value[i]);
+                }
+                TraceRead("[]");
+                ReadTypeEnd((uint)Types.UintArray);
+            }
+            else {
+                value = null;
+            }
+        }
+
+        public void Write(object value)
+        {
+            Trace("Write object");
+            if (value == null) {
+                WriteType(0);
+            }
+            else {
+                CheapWriteDelegate wd = writeHash[value.GetType()] as CheapWriteDelegate;
+                if (wd != null) {
+                    wd(this, value);
+                }
+                else {
+                    throw new Exception("Unknown type " + value.GetType());
+                }
+            }
+        }
+
+        public void Read(out object value)
+        {
+            Trace("Read object");
+            uint __id = ReadType();
+            if (__id == 0) {
+                value = null;
+                return;
+            }
+            if ((__id & 0x8000) != 0) {
+                value = LoadPtr(__id);
+                return;
+            }
+
+            CheapReadDelegate rd = readHash[(uint)(__id & 0x7fff)] as CheapReadDelegate;
+            if (rd != null) {
+                value = rd(__id, this);
+                return;
+            }
+            throw new Exception("Unknown type id " + __id);
+        }
+#if BOILER_PLATE
+    } // class
+} // namespace
+#endif // BOILER_PLATE
diff --git a/base/Windows/mkmar/mkmar.cs b/base/Windows/mkmar/mkmar.cs
new file mode 100644
index 0000000..a789afb
--- /dev/null
+++ b/base/Windows/mkmar/mkmar.cs
@@ -0,0 +1,1613 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   mkmar.cs
+//
+//  Make static marshaller.
+//
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+
+using Bartok.MSIL;
+using System.Reflection;
+
+public class mkmar
+{
+    private static void Usage()
+    {
+        Console.WriteLine("Usage:\n" +
+                          "    mkmar /in:file.cs /out:file.cs [assemblies]\n");
+    }
+
+    public static int Main(string[] args)
+    {
+        ArrayList infiles = new ArrayList();
+        StreamWriter outfile = null;
+        StreamReader infile = null;
+
+        if (args.Length == 0) {
+            Usage();
+            return 0;
+        }
+
+        for (int i = 0; i < args.Length; i++) {
+            string arg = args[i];
+
+            if (arg.Length >= 2 && (arg[0] == '-' || arg[0] == '/')) {
+                string name = null;
+                string value = null;
+
+                int n = arg.IndexOf(':');
+
+                if (n > -1) {
+                    name = arg.Substring(1, n - 1).ToLower();
+
+                    if (n < arg.Length + 1) {
+                        value = arg.Substring(n + 1);
+                    }
+                }
+                else {
+                    name = arg.Substring(1).ToLower();
+                }
+
+                bool badArg = false;
+
+                switch (name) {
+                    case "out" :
+                        if (value != null) {
+                            outfile = new StreamWriter(value);
+                        } else {
+                            badArg = true;
+                        }
+                        break;
+                    case "in" :
+                        if (value != null) {
+                            infile = new StreamReader(value);
+                        } else {
+                            badArg = true;
+                        }
+                        break;
+
+                    default :
+                        badArg = true;
+                        break;
+                }
+
+                if (badArg) {
+                    Console.WriteLine("Malformed argument: \"" + arg + "\"");
+                    Usage();
+                    return 1;
+                }
+            }
+            else {
+                // This is just an assembly name
+                infiles.Add(arg);
+            }
+        }
+
+        if (outfile == null) {
+            Console.WriteLine("You must specify the output file.");
+            Usage();
+            return 1;
+        }
+        if (infile == null) {
+            Console.WriteLine("You must specify the input file.");
+            Usage();
+            return 1;
+        }
+
+        if (infiles.Count == 0) {
+            Console.WriteLine("You must specify at least one input file.");
+            Usage();
+            return 1;
+        }
+
+        ProcessAssemblies(infiles, infile, outfile);
+
+        return 0;
+    }
+
+    private static SortedList used;
+    private static MetaDataResolver resolver;
+    private static TypeInfo tiObject;
+    private static TypeInfo tiString;
+
+    private static void ProcessAssemblies(ArrayList infiles, TextReader tr, TextWriter tw)
+    {
+        resolver = new MetaDataResolver(infiles,
+                                        new ArrayList(),
+                                        new DateTime(),
+                                        false,
+                                        false);
+
+        MetaDataResolver.ResolveCustomAttributes(
+            new MetaDataResolver[]{resolver});
+
+        TypeInfo.Add("bool");
+        TypeInfo.Add("char");
+        TypeInfo.Add("byte");
+        TypeInfo.Add("sbyte");
+        TypeInfo.Add("ushort");
+        TypeInfo.Add("short");
+        TypeInfo.Add("uint");
+        TypeInfo.Add("int");
+        TypeInfo.Add("ulong");
+        TypeInfo.Add("long");
+        tiObject = TypeInfo.Add("object");
+        tiObject.isParent = true;
+        tiString = TypeInfo.Add("string");
+        tiObject.isRefType = true;
+
+        // We must always support null.
+        SortedList spaces = new SortedList();
+        tw.WriteLine("#define TRACE_CHEAP_STATE");
+        tw.WriteLine("#if !USE_CLR_REMOTING");
+        tw.WriteLine("using System;");
+        tw.WriteLine("using System.Runtime.Serialization;");
+        tw.WriteLine("using Bartok.Marshal;");
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                if (IsMarshalType(type) &&
+                    type.Namespace != "" &&
+                    !spaces.Contains(type.Namespace)) {
+
+                    spaces.Add(type.Namespace, null);
+                }
+            }
+        }
+        for (int id = 0; id < spaces.Count; id++) {
+            tw.WriteLine("using {0};", spaces.GetKey(id));
+        }
+        tw.WriteLine();
+
+#if false
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            Console.WriteLine("{0}", metadata.Name);
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                Console.WriteLine("    {0,4} {1}", type.GetHashCode(), type.FullName);
+            }
+        }
+#endif
+
+        // We first try to get all of the types from serialized fields
+        // so we have a Signature.Type.
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                if (!IsMarshalType(type)) {
+                    continue;
+                }
+                foreach (MetaDataField field in type.Fields) {
+                    if (!IsMarshalField(field)) {
+                        continue;
+                    }
+                    TypeInfo.Add(field.Signature.FieldType, "field");
+                }
+            }
+        }
+
+        // Then we pick up any [Serializable] classes.
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                if (IsMarshalType(type)) {
+                    TypeInfo.Add(type, "serial");
+                }
+            }
+        }
+
+        // Last we pick up any enclosing classes.
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null) {
+                continue;
+            }
+
+            if (ti.type != null) {
+                MetaDataTypeDefinition md = ti.type;
+                if (md.EnclosingClass != null) {
+                    MetaDataTypeDefinition type = md.EnclosingClass;
+                    TypeInfo.Add(type, "enclose");
+                }
+            }
+        }
+
+        CompleteTypeInfoFields();
+
+        tw.WriteLine("// {0} types.", used.Count);
+        tw.WriteLine("//  {0:x8}: null", 0);
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+
+            if (ti == null) {
+                continue;
+            }
+
+            string attrs = "";
+            attrs += (ti.type != null) ? "d" : "-";
+            attrs += (ti.isUsedInField) ? "f" : "-";
+            attrs += (ti.isParent) ? "p" : "-";
+            attrs += (ti.isAbstract) ? "a" : "-";
+            attrs += (ti.isSealed) ? "s" : "-";
+            attrs += (ti.isOverload) ? "o" : "-";
+            attrs += (ti.isRefType) ? "r" : "-";
+            attrs += (ti.isInterface) ? "i" : "-";
+            attrs += (ti.isEnum) ? "e" : "-";
+            attrs += (ti.isStruct) ? "s" : "-";
+            attrs += (ti.isBuiltIn) ? "b" : "-";
+            attrs += (ti.hasArray != null) ? "v" : "-";
+
+            tw.WriteLine("//  {0:x8}: {1,-7} {2} {3,4} {4} {5}",
+                         id,
+                         ti.reason,
+                         attrs,
+                         ((ti.type != null) ? ti.type.GetHashCode() : 0),
+                         ti.kind,
+                         ti.isArray ? ":" + ti.arrayOf.kind : "");
+        }
+        tw.WriteLine("#endif // !USE_CLR_REMOTING");
+        tw.WriteLine();
+
+        string ns = "";
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null) {
+                // ignore null.
+                continue;
+            }
+
+            if (ti.type == null) {
+                continue;
+            }
+            if (ti.isEnclosed) {
+                // We pick up the enclosed types with their outer class.
+                continue;
+            }
+
+            // need to handle nested classes...
+
+            if (ns != ti.type.Namespace) {
+                if (ns != "") {
+                    tw.WriteLine("}");  //
+                    tw.WriteLine();
+                }
+                ns = ti.type.Namespace;
+                tw.WriteLine("namespace {0} {{", ns);
+            }
+
+            DoClass(ti, tw);
+        }
+
+        if (ns != "") {
+            tw.WriteLine("}");  //
+            tw.WriteLine();
+        }
+
+        tw.WriteLine(new String('/', 78));
+        tw.WriteLine("//");
+        tw.WriteLine("namespace Bartok.Marshal {");
+        tw.WriteLine("#if !USE_CLR_REMOTING");
+        tw.WriteLine("    public delegate void CheapWriteDelegate(CheapState __cs, Object __ob);");
+        tw.WriteLine("    public delegate object CheapReadDelegate(uint __id, CheapState __cs);");
+        tw.WriteLine("#endif // !USE_CLR_REMOTING");
+        tw.WriteLine();
+        tw.WriteLine("    public class CheapState {");
+        tw.WriteLine("#if !USE_CLR_REMOTING");
+        tw.WriteLine("        public enum Types {");
+        tw.WriteLine("            {0,-23} = 0x{1:x8},", "Null", 0);
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null) {
+                continue;
+            }
+            if (ti.isBuiltIn) {
+                if (ti.isArray) {
+                    tw.WriteLine("            {0,-23} = 0x{1:x8},",
+                                 ToEnumName(ti.arrayOf.kind + "Array"),
+                                 id);
+                }
+                else {
+                    tw.WriteLine("            {0,-23} = 0x{1:x8},",
+                                 ToEnumName(ti.kind),
+                                 id);
+                }
+            }
+        }
+        tw.WriteLine("        };");
+        tw.WriteLine();
+        for (string line; (line = tr.ReadLine()) != null;) {
+            tw.WriteLine(line);
+        }
+        tw.WriteLine("#endif //!USE_CLR_REMOTING");
+        tw.WriteLine("    }");
+        tw.WriteLine("}");
+        tw.WriteLine();
+
+        tw.WriteLine("namespace Bartok.Marshal {");
+        tw.WriteLine("    public class CheapMarshal {");
+        tw.WriteLine("        public static int Main()");
+        tw.WriteLine("        {");
+        tw.WriteLine("            Console.WriteLine(\"Testing\");");
+        tw.WriteLine("            CheapState cs = new CheapState(0);");
+        tw.WriteLine("            Test(cs);");
+        tw.WriteLine("            return 0;");
+        tw.WriteLine("        }");
+        tw.WriteLine();
+
+        tw.WriteLine("        static CheapMarshal() {");
+        tw.WriteLine("#if !USE_CLR_REMOTING");
+        tw.WriteLine("            System.Collections.Hashtable writeHash = new System.Collections.Hashtable({0});",
+                     used.Count + 1);
+        tw.WriteLine("            System.Collections.Hashtable readHash = new System.Collections.Hashtable({0});",
+                     used.Count + 1);
+        tw.WriteLine();
+        tw.WriteLine("            CheapState.writeHash = writeHash;");
+        tw.WriteLine("            CheapState.readHash = readHash;");
+        tw.WriteLine();
+
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null) {
+                continue;
+            }
+
+            if (ti.kind == "object" || ti.isInterface) {
+                tw.WriteLine("            // dropping {0} as interface.", ti.kind);
+                continue;
+            }
+            if (ti.isArray) {
+                tw.WriteLine("            // dropping {0} as array.", ti.kind);
+                continue;
+            }
+            if (ti.isEnum) {
+                tw.WriteLine("            // dropping {0} as enum.", ti.kind);
+                continue;
+            }
+            if (ti.isAbstract && ti.children == null) {
+                tw.WriteLine("            // dropping {0} as abstract without children.",
+                             ti.kind);
+                continue;
+            }
+            if (ti.isBuiltIn) {
+                // for now we just drop theses.
+                tw.WriteLine("            // dropping {0} as builtin.", ti.kind);
+                continue;
+            }
+
+            tw.WriteLine("            writeHash.Add(typeof({0}),", ti.kind);
+            tw.WriteLine("                          new CheapWriteDelegate({1}.CheapWriteItem));",
+                         ti.kind, ti.kind);
+            if (!ti.isAbstract) {
+                tw.WriteLine("            readHash.Add((uint)0x{0:x8},", ti.id);
+                tw.WriteLine("                          new CheapReadDelegate({1}.CheapReadItem));",
+                             ti.kind, ti.kind);
+            }
+            else {
+                tw.WriteLine("            // dropping read.{0} as abstract.", ti.kind);
+            }
+
+            if (ti.hasArray != null) {
+                tw.WriteLine("            writeHash.Add(typeof({0}),", ti.hasArray.kind);
+                tw.WriteLine("                          new CheapWriteDelegate({1}.CheapWriteArray));",
+                             ti.hasArray.kind, ti.kind);
+                tw.WriteLine("            readHash.Add((uint)0x{0:x8},", ti.hasArray.id);
+                tw.WriteLine("                          new CheapReadDelegate({1}.CheapReadArray));",
+                             ti.hasArray.kind, ti.kind);
+            }
+        }
+        tw.WriteLine("#endif // !USE_CLR_REMOTING");
+        tw.WriteLine("        }");
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        tw.WriteLine("        public static void Test(CheapState __cw) {");
+        tw.WriteLine("            CheapState __cr = new CheapState(__cw);");
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+
+            if (ti == null) {
+                // We ignore null here.
+                continue;
+            }
+
+            if (!ti.isBuiltIn || ti.isRefType) {
+                continue;
+            }
+
+            if (ti.kind == "bool" || ti.kind == "char") {
+                continue;
+            }
+            tw.WriteLine("            {");
+            tw.WriteLine("                __cw.Trace(\"Testing {0}\");", ti.kind);
+            tw.WriteLine("                {0} value = 0x77;", ti.kind);
+            tw.WriteLine("                __cw.WriteOpen();");
+            tw.WriteLine("                __cw.Write(value);");
+            tw.WriteLine("                __cw.WriteClose();");
+            tw.WriteLine("                __cw.Trace();");
+            tw.WriteLine("                __cr.ReadOpen();");
+            tw.WriteLine("                __cr.Read(out value);");
+            tw.WriteLine("                __cr.ReadClose();");
+            tw.WriteLine("                __cr.Trace();");
+            tw.WriteLine("                Console.WriteLine(\"Testing {0}\");", ti.kind);
+            tw.WriteLine("            }");
+            continue;
+        }
+
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+
+            if (ti == null) {
+                // We ignore null here.
+                continue;
+            }
+
+            if (ti.isInterface || ti.isAbstract) {
+                continue;
+            }
+
+            if (ti.isBuiltIn || ti.isArray || !ti.isRefType) {
+                // Base types are handled manually.
+                continue;
+            }
+
+            tw.WriteLine("            {");
+            tw.WriteLine("                __cw.Trace(\"Testing {0}\");", ti.kind);
+            tw.WriteLine("                {0} value = new {0}();", ti.kind);
+            tw.WriteLine("                __cw.WriteOpen();");
+            tw.WriteLine("                {0}.CheapWrite(__cw, value);", ti.kind);
+            tw.WriteLine("                __cw.WriteClose();");
+            tw.WriteLine("                __cw.Trace();");
+            tw.WriteLine("                __cr.ReadOpen();");
+            tw.WriteLine("                {0}.CheapRead(__cr, out value);", ti.kind);
+            tw.WriteLine("                __cr.ReadClose();");
+            tw.WriteLine("                __cr.Trace();");
+            tw.WriteLine("                Console.WriteLine(\"Testing {0}\");", ti.kind);
+            tw.WriteLine("            }");
+        }
+
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+
+            if (ti == null) {
+                // We ignore null here.
+                continue;
+            }
+
+            if (ti.isInterface || ti.isAbstract) {
+                continue;
+            }
+
+            if (ti.isBuiltIn || ti.isArray || !ti.isRefType) {
+                // Base types are handled manually.
+                continue;
+            }
+
+            tw.WriteLine("            {");
+            tw.WriteLine("                __cw.Trace(\"Testing {0}\");", ti.kind);
+            tw.WriteLine("                {0} value = new {0}();", ti.kind);
+            if (ti.fields != null) {
+                foreach (FieldInfo fi in ti.fields) {
+                    fi.WriteTestInit(tw);
+
+                }
+            }
+            tw.WriteLine("                __cw.WriteOpen();");
+            tw.WriteLine("                {0}.CheapWrite(__cw, value);", ti.kind);
+            tw.WriteLine("                __cw.WriteClose();");
+            tw.WriteLine("                __cw.Trace();");
+            tw.WriteLine("                __cr.ReadOpen();");
+            tw.WriteLine("                {0}.CheapRead(__cr, out value);", ti.kind);
+            tw.WriteLine("                __cr.ReadClose();");
+            tw.WriteLine("                __cr.Trace();");
+            tw.WriteLine("                Console.WriteLine(\"Testing {0}\");", ti.kind);
+            tw.WriteLine("            }");
+        }
+
+        tw.WriteLine("            {");
+        tw.WriteLine("                __cw.Trace(\"Testing Linked List\");");
+        tw.WriteLine("                NullType[] nt = new NullType[4];");
+        tw.WriteLine("                for (int i = 0; i < nt.Length; i++) {");
+        tw.WriteLine("                    nt[i] = new NullType();");
+        tw.WriteLine("                    nt[i].name = \"nt[\" + i.ToString() + \"]\";");
+        tw.WriteLine("                    nt[i].hashCode = i;");
+        tw.WriteLine("                }");
+        tw.WriteLine("                for (int i = 0; i < nt.Length - 1; i++) {");
+        tw.WriteLine("                    nt[i].backEndRep = nt[i+1];");
+        tw.WriteLine("                }");
+        tw.WriteLine("                for (int i = 1; i < nt.Length; i++) {");
+        tw.WriteLine("                    nt[i].backEndMangledName = nt[i-1];");
+        tw.WriteLine("                }");
+        tw.WriteLine("                ");
+        tw.WriteLine("                __cw.WriteOpen();");
+        tw.WriteLine("                NullType.CheapWrite(__cw, nt[0]);");
+        tw.WriteLine("                __cw.WriteClose();");
+        tw.WriteLine("                __cw.Trace();");
+        tw.WriteLine("                NullType value = null;");
+        tw.WriteLine("                __cr.ReadOpen();");
+        tw.WriteLine("                NullType.CheapRead(__cr, out value);");
+        tw.WriteLine("                __cr.ReadClose();");
+        tw.WriteLine("                __cr.Trace();");
+        tw.WriteLine("                for (int i = 0; value != null; i++) {");
+        tw.WriteLine("                    __cr.Trace(\"{0,2}: {1,-10} : {2,2} : {3} {4}\",");
+        tw.WriteLine("                        i, value.name, value.hashCode,");
+        tw.WriteLine("                        value.backEndRep != null ? ((NullType)value.backEndRep).name : \"<null>\",");
+        tw.WriteLine("                        value.backEndMangledName != null ? ((NullType)value.backEndMangledName).name : \"<null>\");");
+        tw.WriteLine("                    value = (NullType)value.backEndRep;");
+        tw.WriteLine("                }");
+        tw.WriteLine("                __cr.Trace();");
+        tw.WriteLine("                Console.WriteLine(\"Testing Linked List\");");
+        tw.WriteLine("            }");
+
+        tw.WriteLine("        }");  // end of Test() method.
+        tw.WriteLine("    }");      // end of CheapMarshal class.
+        tw.WriteLine("}");          // end of Bartok.Marshal namespace.
+        tw.Flush();
+    }
+
+    private static string ToEnumName(string name)
+    {
+        int pos = name.LastIndexOf('.');
+        if (pos >= 0) {
+            return Char.ToUpper(name[pos + 1]) + name.Substring(pos + 2);
+        }
+        return Char.ToUpper(name[0]) + name.Substring(1);
+    }
+
+    private static void DoClass(TypeInfo ti, TextWriter tw)
+    {
+        int id = ti.id;
+        MetaDataTypeDefinition type = ti.type;
+
+        if (ti.isEnum) {
+            tw.WriteLine("    public enum {0} {{ // {1}",
+                         type.Name,
+                         type.FullName);
+            tw.WriteLine("        VALUE = 0,");
+            tw.WriteLine("    }");
+            return;
+        }
+
+        if (ti.isOverload) {
+            tw.WriteLine("    // is child class");
+        }
+        if (ti.isParent) {
+            tw.WriteLine("    // is parent class");
+            foreach (TypeInfo ci in ti.children) {
+                tw.WriteLine("    //      child {0}", ci.kind);
+            }
+            foreach (TypeInfo ci in ti.descendants) {
+                tw.WriteLine("    //      des   {0}", ci.kind);
+            }
+        }
+
+        if (ti.isStruct) {
+            tw.WriteLine("    public struct {0} {{ // {1}",
+                         type.Name,
+                         type.FullName);
+        }
+        else if (ti.isInterface) {
+            if (ti.isOverload) {
+                // else if (type.Extends != null && type.Extends.FullName != "System.Object")
+                tw.WriteLine("    public interface {0} : {1} {{ // {2}",
+                             type.Name,
+                             type.Extends.FullName,
+                             type.FullName);
+            }
+            else {
+                tw.WriteLine("    public interface {0} {{ // {1}",
+                             type.Name,
+                             type.FullName);
+            }
+            tw.WriteLine("    }");
+            tw.WriteLine();
+            return;
+        }
+        else {
+            if (ti.isOverload) {
+                // else if (type.Extends != null && type.Extends.FullName != "System.Object")
+                tw.WriteLine("    public {0}class {1} : {2} {{ // {3}",
+                             ti.isAbstract ? "abstract " : "",
+                             type.Name,
+                             type.Extends.FullName,
+                             type.FullName);
+            }
+            else {
+                tw.WriteLine("    public {0}class {1} : Object {{ // {2}",
+                             ti.isAbstract ? "abstract " : "",
+                             type.Name,
+                             type.FullName);
+            }
+        }
+
+        string vlabel = "";
+        if (ti.isOverload) {
+            vlabel = "override ";
+        }
+        else if (ti.isParent) {
+            vlabel = "virtual ";
+        }
+
+        FieldInfo[] fields = ti.fields;
+
+        //////////////////////////////////////// Null Constructor for Testing.
+        //
+        if (!ti.isStruct && !ti.isAbstract) {
+            tw.WriteLine("        // For Testing.");
+            tw.WriteLine("        public {0}() {{", type.Name);
+            tw.WriteLine("        }");
+        }
+        tw.WriteLine("        // For Testing.");
+        for (int i = 0; i < fields.Length; i++) {
+            tw.WriteLine("        public {0} {1};",
+                         fields[i].Type.kind, fields[i].Name);
+        }
+        tw.WriteLine();
+
+        //////////////////////////////////////////////////////////// Core Constructor.
+        //
+        if (ti.isAbstract && ti.children == null) {
+            // Abort early since class exists only to hold inner types...
+            if (ti.inner != null) {
+                tw.WriteLine();
+                foreach (TypeInfo inner in ti.inner) {
+                    DoClass(inner, tw);
+                }
+            }
+            tw.WriteLine("    }");
+            tw.WriteLine();
+            return;
+        }
+
+        tw.WriteLine("#if !USE_CLR_REMOTING");
+        if (ti.isAbstract) {
+            tw.WriteLine("        public {0}() {{", type.Name);
+            tw.WriteLine("        }");
+            tw.WriteLine();
+        }
+
+        if (ti.isOverload) {
+            tw.WriteLine("        private {0}(uint __id, CheapState __cs)",
+                         type.Name);
+            tw.WriteLine("            : base(__cs) {");
+        }
+        else {
+            tw.WriteLine("        private {0}(uint __id, CheapState __cs) {{", type.Name);
+        }
+        tw.WriteLine("            if (__id != 0x{0:x8}) {{", ti.id);
+        tw.WriteLine("                throw new Exception(\"__id != Type(0x{0:x8}) for {1}\");", ti.id, type.FullName);
+        tw.WriteLine("            }");
+        if (!ti.isOverload && !ti.isStruct) {
+            tw.WriteLine("            __cs.AddPtr(this, 0x{0:x8});", ti.id);
+        }
+
+        bool hadEv = false;
+        bool hadOb = false;
+        for (int i = 0; i < fields.Length; i++) {
+            TypeInfo fi = fields[i].Type;
+            if (fi.isInterface) {
+                if (!hadOb) {
+                    tw.WriteLine("            object __ob;");
+                    hadOb = true;
+                }
+                tw.WriteLine("            __cs.Read(out __ob);");
+                tw.WriteLine("            {0} = ({1})__ob;",
+                             fields[i].Name, fi.kind);
+            }
+            else if (fi.isArray) {
+                if (fi.arrayOf.type != null) {
+                    tw.WriteLine("            {0}.CheapRead(__cs, out {1}); // {2}",
+                                 fi.arrayOf.kind,
+                                 fields[i].Name,
+                                 fi.kind);
+                }
+                else {
+                    tw.WriteLine("            __cs.Read(out {0}); // {1}",
+                                 fields[i].Name, fi.kind);
+                }
+            }
+            else if (fi.isEnum) {
+                if (!hadEv) {
+                    tw.WriteLine("            uint __ev;");
+                    hadEv = true;
+                }
+                tw.WriteLine("            __cs.Read(out __ev); // {0}", fi.kind);
+                tw.WriteLine("            {0} = unchecked(({1})__ev);",
+                             fields[i].Name, fi.kind);
+            }
+            else if (fi.type != null) {
+                tw.WriteLine("            {0}.CheapRead(__cs, out {1});",
+                             fi.kind,
+                             fields[i].Name);
+            }
+            else {
+                // It is a builtin.
+                tw.WriteLine("            __cs.Read(out {0}); // {1}",
+                             fields[i].Name, fi.kind);
+            }
+        }
+        tw.WriteLine("            __cs.ReadTypeEnd(0x{0:x8});", ti.id);
+        tw.WriteLine("        }");
+        tw.WriteLine();
+
+        //////////////////////////////////////////////////////////////////////
+        //
+        if (!ti.isStruct) {
+            tw.WriteLine("        {0}{1}(CheapState __cs)",
+                         ti.isSealed ? "private " : "protected ",
+                         type.Name);
+            tw.WriteLine("            : this(__cs.ReadType(0x{0:x8}), __cs) {{", ti.id);
+            tw.WriteLine("        }");
+            tw.WriteLine();
+        }
+
+        if (ti.isStruct) {
+            tw.WriteLine("        private void CheapWrite(CheapState __cs) {");
+        }
+        else {
+            tw.WriteLine("        {0}{1}void CheapWrite(CheapState __cs) {{",
+                         (ti.isSealed && !ti.isOverload) ? "private " : "protected ",
+                         vlabel);
+        }
+        tw.WriteLine("            __cs.WriteType(0x{0:x8}); ", ti.id);
+        if (ti.isOverload) {
+            tw.WriteLine("            base.CheapWrite(__cs);");
+        }
+        for (int i = 0; i < fields.Length; i++) {
+            TypeInfo fi = fields[i].Type;
+            if (fi.isInterface) {
+                tw.WriteLine("            __cs.Write((object){0}); // {1}",
+                             fields[i].Name, fi.kind);
+            }
+            else if (fi.isArray) {
+                if (fi.arrayOf.type != null) {
+                    tw.WriteLine("            {0}.CheapWrite(__cs, {1}); // {2}",
+                                 fi.arrayOf.kind,
+                                 fields[i].Name,
+                                 fi.kind);
+                }
+                else {
+                    tw.WriteLine("            __cs.Write({0}); // {1}",
+                                 fields[i].Name, fi.kind);
+                }
+            }
+            else if (fi.isEnum) {
+                tw.WriteLine("            __cs.Write(unchecked((uint){0})); // {1}",
+                             fields[i].Name, fi.kind);
+            }
+            else if (fi.type != null) {
+                tw.WriteLine("            {0}.CheapWrite(__cs, {1}); // {2}",
+                             fi.kind,
+                             fields[i].Name,
+                             fi.kind);
+            }
+            else {
+                // It is a builtin.
+                tw.WriteLine("            __cs.Write({0}); // {1}",
+                             fields[i].Name, fi.kind);
+            }
+        }
+        tw.WriteLine("            __cs.WriteTypeEnd(0x{0:x8}); ", ti.id);
+        tw.WriteLine("        }");
+        tw.WriteLine();
+
+        tw.WriteLine("        public static {0}void CheapWriteItem(CheapState __cs, Object __ob) {{",
+                     ti.isOverload ? "new " : "");
+        tw.WriteLine("            CheapWrite(__cs, ({0})__ob);", type.Name);
+        tw.WriteLine("        }");
+        tw.WriteLine();
+
+        if (!ti.isAbstract) {
+            tw.WriteLine("        public static {0}Object CheapReadItem(uint __id, CheapState __cs) {{",
+                         (ti.isOverload && !ti.ParentsAreAllAbstract()) ? "new " : "");
+            tw.WriteLine("            if ((__id & 0x8000) != 0) {");
+            tw.WriteLine("                return __cs.LoadPtr(__id);");
+            tw.WriteLine("            }");
+            if (!ti.isRefType) {
+                tw.WriteLine("            object __ob = new {0}(__id, __cs);", type.Name);
+                tw.WriteLine("            __cs.AddPtr(__ob, __id);");
+                tw.WriteLine("            return __ob;");
+            }
+            else {
+                tw.WriteLine("            return new {0}(__id, __cs);", type.Name);
+            }
+            tw.WriteLine("        }");
+            tw.WriteLine();
+        }
+
+        tw.WriteLine("        public static void CheapWrite(CheapState __cs, {0} value) {{",
+                     type.Name);
+        tw.WriteLine("            __cs.Trace(\"Write {0} [outer]\");", type.Name);
+        if (ti.isRefType) {
+            tw.WriteLine("            if (value == null) {");
+            tw.WriteLine("                __cs.WriteType(0);");
+            tw.WriteLine("            }");
+            tw.WriteLine("            else if (__cs.SavePtr(0x{0:x8}, value)) {{", ti.id);
+            tw.WriteLine("                value.CheapWrite(__cs); ");
+            tw.WriteLine("            }");
+        }
+        else {
+            tw.WriteLine("            value.CheapWrite(__cs); ");
+        }
+        tw.WriteLine("        }");
+        tw.WriteLine();
+
+        tw.WriteLine("        public static void CheapRead(CheapState __cs, out {0} value) {{",
+                     type.Name);
+        tw.WriteLine("            __cs.Trace(\"Read {0} [outer]\");", type.Name);
+        if (ti.isParent) {
+            // Parent ref type.
+            tw.WriteLine("             object __ob;");
+            tw.WriteLine("            __cs.Read(out __ob);");
+            tw.WriteLine("            value = __ob as {0};", type.Name);
+        }
+        else if (ti.isRefType) {
+            // Leaf ref type.
+            tw.WriteLine("            uint __id = __cs.ReadTypeOrNull(0x{0:x8});", ti.id);
+            tw.WriteLine("            if (__id == 0) {");
+            tw.WriteLine("                value = null;");
+            tw.WriteLine("            }");
+            tw.WriteLine("            else {");
+            tw.WriteLine("                value = ({0})CheapReadItem(__id, __cs);", type.Name);
+            tw.WriteLine("            }");
+        }
+        else {
+            // Value type.
+            tw.WriteLine("            uint __id = __cs.ReadType(0x{0:x8});", ti.id);
+            tw.WriteLine("            value = new {0}(__id, __cs);", type.Name);
+            tw.WriteLine("            __cs.AddPtr(value, __id);");
+
+        }
+        tw.WriteLine("        }");
+
+        if (ti.hasArray != null) {
+            string alabel = "";
+            if (ti.isOverload && ti.parent.hasArray != null) {
+                alabel = "new ";
+            }
+
+            tw.WriteLine();
+            tw.WriteLine("        public static {0}void CheapWriteArray(CheapState __cs, Object __ob) {{", alabel);
+            tw.WriteLine("            CheapWrite(__cs, ({0}[])__ob);", type.Name);
+            tw.WriteLine("        }");
+            tw.WriteLine();
+
+            tw.WriteLine("        public static void CheapWrite(CheapState __cs, {0}[] value) {{", type.Name);
+            tw.WriteLine("            __cs.Trace(\"Write {0}[]\");", ti.kind);
+            tw.WriteLine("            if (value == null) {");
+            tw.WriteLine("                __cs.WriteType(0);");
+            tw.WriteLine("            }");
+            tw.WriteLine("            else if (__cs.SavePtr(0x{0:x8}, value)) {{", ti.hasArray.id);
+            tw.WriteLine("                __cs.WriteType(0x{0:x8});", ti.hasArray.id);
+            tw.WriteLine("                __cs.WriteRaw((uint)value.Length);");
+            tw.WriteLine("                for (int i = 0; i < value.Length; i++) {");
+            tw.WriteLine("                    CheapWrite(__cs, value[i]);");
+            tw.WriteLine("                }");
+            tw.WriteLine("                __cs.WriteTypeEnd(0x{0:x8});", ti.hasArray.id);
+            tw.WriteLine("            }");
+            tw.WriteLine("        }");
+            tw.WriteLine();
+
+            tw.WriteLine("        public static void CheapRead(CheapState __cs, out {0}[] value) {{",
+                         type.Name);
+            tw.WriteLine("            __cs.Trace(\"Read {0}[] [outer]\");", ti.kind);
+            tw.WriteLine("            uint __id = __cs.ReadTypeOrNull(0x{0:x8});", ti.hasArray.id);
+            tw.WriteLine("            value = CheapReadArrayBody(__id, __cs);");
+            tw.WriteLine("        }");
+            tw.WriteLine();
+
+            tw.WriteLine("        public static {0}Object CheapReadArray(uint __id, CheapState __cs) {{", alabel);
+            tw.WriteLine("            return (Object)CheapReadArrayBody(__id, __cs);");
+            tw.WriteLine("        }");
+            tw.WriteLine();
+
+            tw.WriteLine("        private static {0}[] CheapReadArrayBody(uint __id, CheapState __cs) {{",
+                         type.Name);
+            tw.WriteLine("            __cs.Trace(\"Read {0}[] [inner]\");", ti.kind);
+            tw.WriteLine("            if (__id == 0) {");
+            tw.WriteLine("                return null;");
+            tw.WriteLine("            }");
+            tw.WriteLine("            else if ((__id & 0x8000) != 0) {");
+            tw.WriteLine("                if (__id != 0x{0:x8}) {{", ti.hasArray.id | 0x8000);
+            tw.WriteLine("                    throw new Exception(\"__id != Type(0x{0:x8}) for {1}[]\");", ti.hasArray.id | 0x8000, ti.kind);
+            tw.WriteLine("                }");
+            tw.WriteLine("                return ({0}[])__cs.LoadPtr(__id);", type.Name);
+            tw.WriteLine("            }");
+            tw.WriteLine("            else {");
+            tw.WriteLine("                if (__id != 0x{0:x8}) {{", ti.hasArray.id);
+            tw.WriteLine("                    throw new Exception(\"__id != Type(0x{0:x8}) for {1}[]\");", ti.hasArray.id, ti.kind);
+            tw.WriteLine("                }");
+            tw.WriteLine("                uint len;");
+            tw.WriteLine("                __cs.ReadRaw(out len);");
+            tw.WriteLine("                {0}[] value = new {1} [len];", type.Name, type.Name);
+            tw.WriteLine("                __cs.AddPtr(value, 0x{0:x8});", ti.hasArray.id);
+            tw.WriteLine("                for (int i = 0; i < len; i++) {");
+            tw.WriteLine("                    CheapRead(__cs, out value[i]);");
+            tw.WriteLine("                }");
+            tw.WriteLine("                __cs.ReadTypeEnd(0x{0:x8});", ti.hasArray.id);
+            tw.WriteLine("                return value;");
+            tw.WriteLine("            }");
+            tw.WriteLine("        }");
+        }
+        tw.WriteLine("#endif // !USE_CLR_REMOTING");
+        tw.WriteLine();
+
+        if (ti.inner != null) {
+            tw.WriteLine();
+            foreach (TypeInfo inner in ti.inner) {
+                DoClass(inner, tw);
+            }
+        }
+        tw.WriteLine("    }");
+        tw.WriteLine();
+    }
+
+    private static bool IsMarshalType(MetaDataTypeDefinition type)
+    {
+        uint flags = (uint)type.Flags & 0xfffffff8;
+
+        if ((type.Flags & TypeAttributes.Serializable) == 0) {
+            // We're only looking for serializable types.
+            return false;
+        }
+        if ((type.Flags & TypeAttributes.Interface) != 0) {
+            // Skip interfaces.
+            return false;
+        }
+        if ((type.Flags & TypeAttributes.Class) != 0) {
+            // We're only looking for classes.
+            // return false; // Currently unreachable
+        }
+
+        if (type.Name == "CheapState" ||
+            type.Name == "ObjectIDGenerator") {
+            // we drop some specific classes.
+            return false;
+        }
+
+        return true;
+    }
+
+    private static bool IsMarshalField(MetaDataField field)
+    {
+        uint flags = (uint)field.Flags & 0xfff8;
+        if (TestAndClear(ref flags, (uint)MetaDataField.FieldAttributes.NotSerialized)) {
+            // We skip over NonSerialized fields.
+            return false;
+        }
+        if (TestAndClear(ref flags, (uint)MetaDataField.FieldAttributes.Static)) {
+            // We skip static.
+            return false;
+        }
+        if (TestAndClear(ref flags, (uint)MetaDataField.FieldAttributes.InitOnly)) {
+            return true;
+#if false
+            // We skip readonly.
+            return false;
+#endif
+        }
+        if (TestAndClear(ref flags, (uint)MetaDataField.FieldAttributes.Literal)) {
+            // We skip const.
+            return false;
+        }
+        return true;
+    }
+
+    private static string ClassToString(MetaDataObject mdo)
+    {
+        if (mdo is MetaDataTypeDefinition) {
+            return ((MetaDataTypeDefinition) mdo).FullName;
+        }
+        else if (mdo is MetaDataTypeReference) {
+            return ((MetaDataTypeReference) mdo).FullName;
+        }
+        else if (mdo == null) {
+            return "<null>";
+        }
+        else {
+            throw new Exception("unknown type: " + mdo.GetType());
+        }
+    }
+
+    private static string TypeToString(Signature.Type type)
+    {
+        switch (type.ElementType) {
+            case ElementTypes.VOID:
+                return "void";
+            case ElementTypes.BOOLEAN:
+                return "bool";
+            case ElementTypes.CHAR:
+                return "char";
+            case ElementTypes.I1:
+                return "sbyte";
+            case ElementTypes.U1:
+                return "byte";
+            case ElementTypes.I2:
+                return "short";
+            case ElementTypes.U2:
+                return "ushort";
+            case ElementTypes.I4:
+                return "int";
+            case ElementTypes.U4:
+                return "uint";
+            case ElementTypes.I8:
+                return "long";
+            case ElementTypes.U8:
+                return "ulong";
+            case ElementTypes.R4:
+                return "float";
+            case ElementTypes.R8:
+                return "double";
+            case ElementTypes.STRING:
+                return "string";
+                //case ElementTypes.PTR:
+                //case ElementTypes.BYREF:
+            case ElementTypes.VALUETYPE:
+                return ClassToString(type.ClassObject);
+            case ElementTypes.CLASS:
+                return ClassToString(type.ClassObject);
+                //case ElementTypes.VAR:
+                //case ElementTypes.ARRAY:
+                //case ElementTypes.GENERICINST:
+                //case ElementTypes.TYPEDBYREF:
+            case ElementTypes.I:
+                return "IntPtr";
+            case ElementTypes.U:
+                return "UIntPtr";
+                //case ElementTypes.FNPTR:
+            case ElementTypes.OBJECT:
+                return "object";
+            case ElementTypes.SZARRAY:
+                return TypeToString(type.TypeObject) + "[]";
+                //case ElementTypes.MVAR:
+                //case ElementTypes.CMOD_REQD:
+                //case ElementTypes.CMOD_OPT:
+                //case ElementTypes.INTERNAL:
+            default:
+                throw new Exception("Unknown Field type");
+        }
+    }
+
+    private static bool TestAndClear(ref uint flags, uint bit)
+    {
+        if ((flags & bit) != 0) {
+            // Console.WriteLine("                    [{0:x4} had {1:x4}]", flags, bit);
+            flags &= ~bit;
+            return true;
+        }
+        return false;
+    }
+
+    private class FieldInfo
+    {
+        public readonly String      Name;
+        public readonly TypeInfo    Type;
+
+        public FieldInfo(String name, TypeInfo type)
+        {
+            this.Name = name;
+            this.Type = type;
+        }
+
+        public void WriteTestInit(TextWriter tw)
+        {
+            if (Type.kind == "bool") {
+                tw.WriteLine("                value.{0} = true;", Name);
+                return;
+            }
+            if (Type.kind == "char") {
+                tw.WriteLine("                value.{0} = 'A';", Name);
+                return;
+            }
+            if (Type.kind == "sbyte") {
+                tw.WriteLine("                value.{0} = 0x76;", Name);
+                return;
+            }
+            if (Type.kind == "byte") {
+                tw.WriteLine("                value.{0} = 0xfe;", Name);
+                return;
+            }
+            if (Type.kind == "short") {
+                tw.WriteLine("                value.{0} = 0x7654;", Name);
+                return;
+            }
+            if (Type.kind == "ushort") {
+                tw.WriteLine("                value.{0} = 0xfedc;", Name);
+                return;
+            }
+            if (Type.kind == "int") {
+                tw.WriteLine("                value.{0} = 0x76543210;", Name);
+                return;
+            }
+            if (Type.kind == "uint") {
+                tw.WriteLine("                value.{0} = 0xfedcba98;", Name);
+                return;
+            }
+            if (Type.kind == "long") {
+                tw.WriteLine("                value.{0} = 0x7654321001234567;", Name);
+                return;
+            }
+            if (Type.kind == "ulong") {
+                tw.WriteLine("                value.{0} = 0xfedcba9876543210;", Name);
+                return;
+            }
+            if (Type.kind == "string") {
+                tw.WriteLine("                value.{0} = \"Hello {1}!\";", Name, Name);
+                return;
+            }
+            if (Type.kind == "object") {
+                tw.WriteLine("                value.{0} = new LirBasicBlock();", Name);
+                return;
+            }
+            if (Type.kind == "object[]") {
+                tw.WriteLine("                value.{0} = new Object[] " +
+                             "{{ new LirBasicBlock(), new LirBasicBlock() }};",
+                             Name);
+                return;
+            }
+            if (Type.kind == "uint[]") {
+                tw.WriteLine("                value.{0} = new uint[] " +
+                             "{{ 0xfedcba98, 0xfedcba97 }};", Name);
+                return;
+            }
+            if (Type.kind == "int[]") {
+                tw.WriteLine("                value.{0} = new int[] " +
+                             "{{ 0x76543210, 0x76543219 }};", Name);
+                return;
+            }
+            if (Type.isArray) {
+                tw.WriteLine("                value.{0} = new {1} {{ null }};",
+                             Name, Type.kind);
+                return;
+            }
+            if (Type.isRefType && !Type.isInterface) {
+                TypeInfo ti = Type;
+                while (ti.isAbstract) {
+#if false
+                    tw.WriteLine("// {0} Bypassing {1} for {2}",
+                                 Name, ti.kind, ti.children[0].kind);
+#endif
+                    ti = ti.children[0];
+                }
+                tw.WriteLine("                value.{0} = new {1}();",
+                             Name, ti.kind);
+            }
+        }
+    }
+
+    private class TypeInfo
+    {
+        static TypeInfo()
+        {
+            used = new SortedList();
+            used.Add("0", null);
+        }
+
+        public String                   kind;
+        public String                   reason;
+        public MetaDataTypeDefinition   type;
+        public TypeInfo                 parent;
+        public TypeInfo[]               children;
+        public TypeInfo[]               descendants;
+        public TypeInfo[]               inner;
+        public TypeInfo[]               users;
+        public TypeInfo                 arrayOf;
+        public TypeInfo                 hasArray;
+        public FieldInfo[]              fields;
+        public int      id;
+        public bool     isUsedInField;
+        public bool     isRefType;
+        public bool     isBuiltIn;
+        public bool     isArray;
+        public bool     isEnum;
+        public bool     isStruct;
+        public bool     isEnclosed;
+        public bool     isSealed;
+        public bool     isAbstract;     // "abstract class foo"
+        public bool     isParent;       // has children.
+        public bool     isOverload;     // has a parent.
+        public bool     isInterface;
+        // public bool     hasZeroConstructor; // Currently unused
+
+        private TypeInfo()
+        {
+        }
+
+        public static TypeInfo Add(string builtin)
+        {
+            TypeInfo ti = new TypeInfo();
+            ti.kind = builtin;
+            ti.reason = "builtin";
+            ti.isBuiltIn = true;
+            used.Add(builtin, ti);
+            return ti;
+        }
+
+        public static TypeInfo Add(MetaDataTypeDefinition md, string reason)
+        {
+            string kind = md.FullName;
+
+            if (kind == "") {
+                System.Diagnostics.Debugger.Break();
+            }
+
+            TypeInfo ti;
+            int id = used.IndexOfKey(kind);
+            if (id > 0) {
+                ti = used.GetByIndex(id) as TypeInfo;
+                if (ti.type == null) {
+                    ti.SetMetaData(md);
+                }
+            }
+            else {
+                ti = new TypeInfo();
+                ti.kind = kind;
+                ti.reason = reason;
+                ti.SetMetaData(md);
+                used.Add(ti.kind, ti);
+            }
+            return ti;
+        }
+
+        public static TypeInfo Add(Signature.Type st, string reason)
+        {
+            string kind = TypeToString(st);
+            if (kind == "") {
+                System.Diagnostics.Debugger.Break();
+            }
+            int id = used.IndexOfKey(kind);
+            TypeInfo ti;
+            if (id > 0) {
+                ti = used.GetByIndex(id) as TypeInfo;
+                if (!ti.isUsedInField) {
+                    ti.isUsedInField = true;
+                    ti.SetFieldInfo(st);
+                }
+            }
+            else {
+                ti = new TypeInfo();
+                ti.kind = kind;
+                ti.reason = reason;
+                ti.SetFieldInfo(st);
+                used.Add(ti.kind, ti);
+            }
+            return ti;
+        }
+
+        private void SetMetaData(MetaDataTypeDefinition md)
+        {
+            type = md;
+            isInterface = ((md.Flags & TypeAttributes.Interface) != 0);
+            isAbstract = ((md.Flags & TypeAttributes.Abstract) != 0);
+            isSealed = ((md.Flags & TypeAttributes.Sealed) != 0);
+        }
+
+        private void SetFieldInfo(Signature.Type st)
+        {
+            switch (st.ElementType) {
+                case ElementTypes.VOID:
+                    break;
+                case ElementTypes.BOOLEAN:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.CHAR:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.I1:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.U1:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.I2:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.U2:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.I4:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.U4:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.I8:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.U8:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.R4:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.R8:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.STRING:
+                    isRefType = true;
+                    isBuiltIn = true;
+                    break;
+                    //case ElementTypes.PTR:
+                    //case ElementTypes.BYREF:
+                case ElementTypes.VALUETYPE:
+                    if (type == null) {
+                        if (st.ClassObject is MetaDataTypeDefinition) {
+                            SetMetaData((MetaDataTypeDefinition)st.ClassObject);
+                        }
+                    }
+                    break;
+                case ElementTypes.CLASS:
+                    if (type == null) {
+                        if (st.ClassObject is MetaDataTypeDefinition) {
+                            SetMetaData((MetaDataTypeDefinition)st.ClassObject);
+                        }
+                    }
+                    isRefType = true;
+                    break;
+                    //case ElementTypes.VAR:
+                    //case ElementTypes.ARRAY:
+                    //case ElementTypes.GENERICINST:
+                    //case ElementTypes.TYPEDBYREF:
+                case ElementTypes.I:
+                    isBuiltIn = true;
+                    break;
+                case ElementTypes.U:
+                    isBuiltIn = true;
+                    break;
+                    //case ElementTypes.FNPTR:
+                case ElementTypes.OBJECT:
+                    isBuiltIn = true;
+                    isRefType = true;
+                    break;
+                case ElementTypes.SZARRAY:
+                    isRefType = true;
+                    isBuiltIn = false;
+                    isArray = true;
+                    if (st.TypeObject.ClassObject is MetaDataTypeDefinition) {
+                        MetaDataTypeDefinition md = (MetaDataTypeDefinition)st.TypeObject.ClassObject;
+                        arrayOf = TypeInfo.Add(md, "arrayed");
+                        arrayOf.hasArray = this;
+                        if (arrayOf.isBuiltIn) {
+                            isBuiltIn = true;
+                        }
+                    }
+                    else {
+                        arrayOf = TypeInfo.Find(kind.Remove(kind.Length-2, 2));
+                        arrayOf.hasArray = this;
+                        if (arrayOf.isBuiltIn) {
+                            isBuiltIn = true;
+                        }
+                    }
+                    break;
+                    //case ElementTypes.MVAR:
+                    //case ElementTypes.CMOD_REQD:
+                    //case ElementTypes.CMOD_OPT:
+                    //case ElementTypes.INTERNAL:
+                default:
+                    throw new Exception("Unknown Field type");
+            }
+        }
+
+        public static TypeInfo Find(string name)
+        {
+            return used[name] as TypeInfo;
+        }
+
+        public static TypeInfo Find(Signature.Type type)
+        {
+            string name = TypeToString(type);
+            return Find(name);
+        }
+
+        public ArrayList GetDescendants(ArrayList des)
+        {
+            if (descendants != null) {
+                foreach (TypeInfo di in descendants) {
+                    des.Add(di);
+                }
+            }
+            else if (children != null) {
+                foreach (TypeInfo di in children) {
+                    di.GetDescendants(des);
+                    des.Add(di);
+                }
+            }
+            return des;
+        }
+
+        public bool ParentsAreAllAbstract()
+        {
+            for (TypeInfo ti = this; ti.parent != null; ti = ti.parent) {
+                if (!ti.parent.isAbstract) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    private static TypeInfo[] FindChildren(string parent)
+    {
+        ArrayList children = null;
+
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                if (type.Extends != null && type.Extends.FullName == parent) {
+                    TypeInfo ti = used[type.FullName] as TypeInfo;
+                    if (ti == null) {
+                        continue;
+                    }
+
+#if false
+                    Console.WriteLine("{0} is extended by {1}", parent, ti.kind);
+#endif
+                    if (children == null) {
+                        children = new ArrayList();
+                    }
+                    children.Add(ti);
+                }
+            }
+        }
+        if (children != null) {
+            return (TypeInfo[])children.ToArray(typeof(TypeInfo));
+        }
+        return null;
+    }
+
+    private static TypeInfo[] FindUsers(string iface)
+    {
+        ArrayList users = null;
+
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                foreach (MetaDataObject imd in type.Interfaces) {
+                    if (imd.FullName == iface) {
+                        TypeInfo ti = used[type.FullName] as TypeInfo;
+                        if (ti == null) {
+                            continue;
+                        }
+#if true
+                        Console.WriteLine("{0} implemented by {1}", iface, ti.kind);
+#endif
+                        if (users == null) {
+                            users = new ArrayList();
+                        }
+                        users.Add(ti);
+                        break;
+                    }
+                }
+            }
+        }
+        if (users != null) {
+            return (TypeInfo[])users.ToArray(typeof(TypeInfo));
+        }
+        return null;
+    }
+
+    private static TypeInfo[] FindInner(string outer)
+    {
+        ArrayList inner = null;
+
+        foreach (MetaData metadata in resolver.MetaDataList) {
+            foreach (MetaDataTypeDefinition type in metadata.TypeDefs) {
+                if ((type.EnclosingClass != null) &&
+                    (type.EnclosingClass.FullName == outer)) {
+                    TypeInfo ti = used[type.FullName] as TypeInfo;
+                    if (ti == null) {
+                        continue;
+                    }
+#if false
+                    Console.WriteLine("{0} encloses {1}", outer, ti.kind);
+#endif
+                    if (inner == null) {
+                        inner = new ArrayList();
+                    }
+                    inner.Add(ti);
+                }
+            }
+        }
+        if (inner != null) {
+            return (TypeInfo[])inner.ToArray(typeof(TypeInfo));
+        }
+        return null;
+    }
+
+    private static void CompleteTypeInfoFields()
+    {
+        // First, fill in the missing base information.
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null) {
+                continue;
+            }
+
+            ti.id = id;
+
+            // Fill in the type definition if we don't have one.
+            if (ti.type == null) {
+                ti.type = resolver.ResolveName(ti.kind);
+                if (ti.type == null && !ti.isBuiltIn  && !ti.isArray) {
+                    Console.WriteLine("!!! Couldn't resolve: {0}", ti.kind);
+                }
+            }
+        }
+
+        // Now fill in information for inheritance tree.
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null || ti.type == null) {
+                continue;
+            }
+
+#if false
+            Console.WriteLine("{0}:", ti.type.FullName);
+#endif
+            if (ti.type.Extends != null) {
+                ti.isEnum = (ti.type.Extends.FullName == "System.Enum");
+                ti.isStruct = (ti.type.Extends.FullName == "System.ValueType");
+                if (ti.isEnum == false && ti.isStruct == false) {
+                    ti.isOverload = !(ti.type.Extends.FullName == "System.Object");
+                }
+                ti.parent = TypeInfo.Find(ti.type.Extends.FullName);
+            }
+
+            if (ti.type.EnclosingClass != null) {
+                ti.isEnclosed = true;
+            }
+
+            ti.children = FindChildren(ti.type.FullName);
+            ti.inner = FindInner(ti.type.FullName);
+            ti.isParent = (ti.children != null);
+
+            if (ti.isStruct || ti.isEnum) {
+                ti.isRefType = false;
+            }
+            else if (!ti.isBuiltIn){
+                ti.isRefType = true;
+            }
+
+            if (ti.isInterface) {
+                ti.users = FindUsers(ti.kind);
+            }
+        }
+
+        // Now fill in deep information for inheritance tree.
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null || ti.type == null) {
+                continue;
+            }
+
+            if (ti.children != null && ti.descendants == null) {
+                ArrayList des = ti.GetDescendants(new ArrayList());
+
+                ti.descendants = (TypeInfo[])des.ToArray(typeof(TypeInfo));
+            }
+        }
+
+        // Now collect all of the field information.
+        for (int id = 0; id < used.Count; id++) {
+            TypeInfo ti = used.GetByIndex(id) as TypeInfo;
+            if (ti == null || ti.type == null) {
+                continue;
+            }
+
+            ArrayList fieldList = new ArrayList();
+            foreach (MetaDataField field in ti.type.Fields) {
+                if (!IsMarshalField(field)) {
+                    continue;
+                }
+                TypeInfo fi = TypeInfo.Find(field.Signature.FieldType);
+
+                fieldList.Add(new FieldInfo(field.Name, fi));
+            }
+
+            ti.fields = (FieldInfo[])fieldList.ToArray(typeof(FieldInfo));
+        }
+    }
+}
diff --git a/base/Windows/mkmar/mkmar.csproj b/base/Windows/mkmar/mkmar.csproj
new file mode 100644
index 0000000..1dd4be4
--- /dev/null
+++ b/base/Windows/mkmar/mkmar.csproj
@@ -0,0 +1,32 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>mkmar</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="mkmar.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+    <Reference Include="$(BuildDir)\MsilReader.dll"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/mkname/Makefile b/base/Windows/mkname/Makefile
new file mode 100644
index 0000000..2865ec6
--- /dev/null
+++ b/base/Windows/mkname/Makefile
@@ -0,0 +1,60 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Mkname\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS= $(CFLAGS) /I..\inc\
+    /DWIN32 /DNT /Fd$(OBJDIR)\mkname.pdb \
+
+HOST_LINKFLAGS= $(HOST_LINKFLAGS) /nod /libpath:..\lib /fixed:no /subsystem:console
+
+LIBS=\
+    kernel32.lib    \
+    libcmt.lib        \
+
+##############################################################################
+
+.SUFFIXES: .cpp .obj
+
+{.}.cpp{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mkname.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\mkname.exe
+    $(SDEDIT) $(BUILDIR)\mkname.*
+    $(COPY) $(OBJDIR)\mkname.exe $(BUILDIR)
+    $(COPY) $(OBJDIR)\mkname.pdb $(BUILDIR)
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\mkname.* *.exe pxe.com.1 *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+test: $(OBJDIR) $(OBJDIR)\mkname.exe
+    $(OBJDIR)\mkname /o:pxe.com.1 $(OBJDIR)\mkname.exe
+
+$(OBJDIR)\mkname.exe : $(OBJDIR)\mkname.obj
+    @echo Linking $@
+    link $(HOST_LINKFLAGS) /out:$@ $** $(LIBS)
+
+$(OBJDIR)\mkname.obj : mkname.cpp
+
+################################################################# End of File.
diff --git a/base/Windows/mkname/mkname.cpp b/base/Windows/mkname/mkname.cpp
new file mode 100644
index 0000000..e6a11de
--- /dev/null
+++ b/base/Windows/mkname/mkname.cpp
@@ -0,0 +1,554 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       mkname.cpp
+//
+//  Contents:   Copy a PE image to a new file and embeds its name in it.
+//
+//  Owner:
+//
+//  History:    2004/12/17              Created from mkcore.
+//
+#define UNICODE
+#define _UNICODE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <winlean.h>
+#include <assert.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static BOOL s_fVerbose = FALSE;
+
+typedef signed int INT;
+typedef signed char INT8, *LPINT8;
+typedef signed short INT16, *LPINT16;
+typedef unsigned int UINT;
+typedef unsigned char UINT8, *LPUINT8;
+typedef unsigned short UINT16, *LPUINT16;
+
+#define arrayof(a)      (sizeof(a)/sizeof(a[0]))
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static inline UINT Max(UINT a, UINT b)
+{
+    return a > b ? a : b;
+}
+
+static inline UINT Min(UINT a, UINT b)
+{
+    return a < b ? a : b;
+}
+
+static inline UINT Align(UINT nValue, UINT nPowerOf2)
+{
+    return (nValue + nPowerOf2 - 1) & ~(nPowerOf2 - 1);
+}
+
+DWORD RvaToFileOffset(DWORD nRva, UINT nSecs, PIMAGE_SECTION_HEADER pSecs)
+{
+    DWORD n;
+    for (n = 0; n < nSecs; n++) {
+        DWORD vaStart = pSecs[n].VirtualAddress;
+        DWORD vaEnd = vaStart + pSecs[n].SizeOfRawData;
+
+        if (nRva >= vaStart && nRva < vaEnd) {
+            return pSecs[n].PointerToRawData + nRva - pSecs[n].VirtualAddress;
+        }
+    }
+    return 0;
+}
+
+BOOL error(PCSTR pwzError)
+{
+    fprintf(stderr, "%s\n", pwzError);
+    fclose(stderr);
+    return FALSE;
+}
+
+void Dump(PBYTE pbData, ULONG cbData)
+{
+    for (ULONG n = 0; n < cbData; n += 16) {
+        printf("        ");
+        for (ULONG o = n; o < n + 16; o++) {
+            if (o >= cbData) {
+                printf("  ");
+            }
+            else {
+                printf("%02x", pbData[o]);
+            }
+            if (o % 4 == 3) {
+                printf(" ");
+            }
+        }
+        printf(" ");
+        for (ULONG o = n; o < n + 16; o++) {
+            if (o >= cbData) {
+                printf("  ");
+            }
+            else {
+                if (pbData[o] >= ' ' && pbData[o] < 127) {
+                    printf("%c", pbData[o]);
+                }
+                else {
+                    printf(".");
+                }
+            }
+        }
+        printf("\n");
+    }
+}
+
+//////////////////////////////////////////////////////////////////// CFileMap.
+//
+class CFileMap
+{
+  public:
+    CFileMap()
+    {
+        m_pbData = NULL;
+        m_cbData = 0;
+    }
+
+    ~CFileMap()
+    {
+        Close();
+    }
+
+  public:
+    BOOL    Load(PCWSTR pwzFile);
+    PBYTE   Seek(UINT32 cbPos);
+    UINT32  Size();
+    VOID    Close();
+
+  protected:
+    PBYTE   m_pbData;
+    UINT32  m_cbData;
+};
+
+VOID CFileMap::Close()
+{
+    if (m_pbData) {
+        UnmapViewOfFile(m_pbData);
+        m_pbData = NULL;
+    }
+    m_cbData = 0;
+}
+
+UINT32 CFileMap::Size()
+{
+    return m_cbData;
+}
+
+PBYTE CFileMap::Seek(UINT32 cbPos)
+{
+    if (m_pbData && cbPos <= m_cbData) {
+        return m_pbData + cbPos;
+    }
+    return NULL;
+}
+
+BOOL CFileMap::Load(PCWSTR pwzFile)
+{
+    Close();
+
+    HANDLE hFile = CreateFile(pwzFile,
+                              GENERIC_READ,
+                              FILE_SHARE_READ,
+                              NULL,
+                              OPEN_EXISTING,
+                              0,
+                              NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    ULONG cbInFileData = GetFileSize(hFile, NULL);
+    if (cbInFileData == 0xffffffff) {
+        CloseHandle(hFile);
+        return FALSE;
+    }
+
+    HANDLE hInFileMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    CloseHandle(hFile);
+    if (hInFileMap == NULL) {
+        return FALSE;
+    }
+
+    m_pbData = (PBYTE)MapViewOfFile(hInFileMap, FILE_MAP_COPY, 0, 0, 0);
+    CloseHandle(hInFileMap);
+    if (m_pbData == NULL) {
+        return FALSE;
+    }
+    m_cbData = cbInFileData;
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////// CFileOut.
+//
+class CFileOut
+{
+  public:
+    CFileOut();
+    ~CFileOut();
+
+  public:
+    BOOL    Create(PCWSTR pwzFile);
+
+    BOOL    Seek(UINT32 cbPos);
+    BOOL    Write(PBYTE pbData, UINT32 cbData);
+    BOOL    Read(PBYTE pbData, UINT32 cbData);
+    BOOL    Zero(UINT32 cbData);
+    BOOL    Delete();
+    UINT32  Size();
+
+    UINT32  Checksum();
+
+    VOID    Close();
+
+  protected:
+    HANDLE  m_hFile;
+    WCHAR   m_wzFile[MAX_PATH];
+    UINT32  m_cbPos;
+};
+
+CFileOut::CFileOut()
+{
+    m_hFile = INVALID_HANDLE_VALUE;
+    m_wzFile[0] = '\0';
+    m_cbPos = 0;
+}
+
+CFileOut::~CFileOut()
+{
+    Close();
+}
+
+VOID CFileOut::Close()
+{
+    if (m_hFile != INVALID_HANDLE_VALUE) {
+        CloseHandle(m_hFile);
+        m_hFile = INVALID_HANDLE_VALUE;
+    }
+}
+
+BOOL CFileOut::Seek(UINT32 cbPos)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+    if (SetFilePointer(m_hFile, cbPos, NULL, FILE_BEGIN) != cbPos) {
+        return FALSE;
+    }
+    m_cbPos = cbPos;
+    return TRUE;
+}
+
+BOOL CFileOut::Write(PBYTE pbData, UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    DWORD dwWrote = 0;
+    if (!WriteFile(m_hFile, pbData, cbData, &dwWrote, NULL) || dwWrote != cbData) {
+        return FALSE;
+    }
+    m_cbPos += cbData;
+    return TRUE;
+}
+
+BOOL CFileOut::Zero(UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    UINT zero_size = cbData < 65536 ? cbData : 65536;
+    PBYTE buf = new BYTE [zero_size];
+    assert(buf);
+
+    if (!buf) {
+        return FALSE;
+    }
+
+    ZeroMemory(buf, zero_size);
+
+    for (; cbData > 0; cbData -= zero_size) {
+        if (zero_size > cbData) {
+            zero_size = cbData;
+        }
+        if (!Write(buf, zero_size)) {
+            delete[] buf;
+            return FALSE;
+        }
+    }
+    delete[] buf;
+    buf = NULL;
+
+    return TRUE;
+}
+
+BOOL CFileOut::Delete()
+{
+    if (m_hFile != INVALID_HANDLE_VALUE) {
+        Close();
+        return DeleteFile(m_wzFile);
+    }
+    return FALSE;
+}
+
+UINT32 CFileOut::Size()
+{
+    return SetFilePointer(m_hFile, 0, NULL, FILE_END);
+}
+
+BOOL CFileOut::Read(PBYTE pbData, UINT32 cbData)
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    DWORD dwRead = 0;
+    if (!ReadFile(m_hFile, pbData, cbData, &dwRead, NULL) || dwRead != cbData) {
+        return FALSE;
+    }
+    m_cbPos += cbData;
+    return TRUE;
+}
+
+BOOL CFileOut::Create(PCWSTR pwzFile)
+{
+    Close();
+    m_wzFile[0] = '\0';
+    m_hFile = CreateFile(pwzFile,
+                         GENERIC_READ | GENERIC_WRITE,
+                         0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+    wcscpy(m_wzFile, pwzFile);
+    m_cbPos = 0;
+    return TRUE;
+}
+
+
+UINT32 CFileOut::Checksum()
+{
+    if (m_hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    PBYTE buf = new BYTE [65536];
+    assert(buf);
+
+    if (!buf) {
+        return ~0u;
+    }
+
+    UINT32 size = Size();
+    UINT32 sum = 0;
+
+    if (!Seek(0)) {
+        assert(!"Couldn't seek.");
+        delete[] buf;
+        return ~0u;
+    }
+
+    for (UINT32 pos = 0; pos < size;) {
+        UINT32 read = size - pos < 65536 ? size - pos : 65536;
+
+        if (!Read(buf, read)) {
+            printf("Pos: %d/%d\n", pos, m_cbPos);
+            printf("Len: %d\n", size);
+            __asm int 3;
+            assert(!"Couldn't read.");
+            delete[] buf;
+            return ~0u;
+        }
+
+        UINT32 *pBeg = (UINT32*)(buf);
+        UINT32 *pEnd = (UINT32*)(buf + read);
+
+        while (pBeg < pEnd) {
+            sum += *pBeg++;
+        }
+
+        pos += read;
+    }
+
+    delete[] buf;
+    buf = NULL;
+
+    return sum;
+}
+
+BOOL UpdateInPlace(PWCHAR pwzFile)
+{
+    BOOL fGood = FALSE;
+    HANDLE hFile = CreateFile(pwzFile, GENERIC_WRITE | GENERIC_READ,
+                              0, NULL, OPEN_EXISTING, 0, NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    PWCHAR pwzName = pwzFile;
+    PWCHAR pwz;
+
+    if ((pwz = wcsrchr(pwzName, ':')) != NULL) {
+        pwzName = pwz + 1;
+    }
+    if ((pwz = wcsrchr(pwzName, '\\')) != NULL) {
+        pwzName = pwz + 1;
+    }
+    _wcslwr(pwzName);
+
+    CHAR rbBlock[512];
+    DWORD dwDone = 0;
+    if (ReadFile(hFile, rbBlock, sizeof(rbBlock), &dwDone, NULL) &&
+        dwDone == sizeof(rbBlock) &&
+        rbBlock[0] == 'M' &&
+        rbBlock[1] == 'Z') {
+
+        memset(rbBlock + 64, 0, 64);
+        wcscpy((PWCHAR)(rbBlock + 68), pwzName);
+
+        if (SetFilePointer(hFile, 0, NULL, FILE_BEGIN) == 0) {
+            dwDone = 0;
+            if (WriteFile(hFile, rbBlock, sizeof(rbBlock), &dwDone, NULL) &&
+                dwDone == sizeof(rbBlock)) {
+                fGood = TRUE;
+            }
+        }
+    }
+
+    CloseHandle(hFile);
+    return fGood;
+}
+
+int __cdecl wmain(int argc, WCHAR **argv)
+{
+    BOOL fNeedHelp = FALSE;
+    BOOL fGood = FALSE;
+    BOOL fUpdateInPlace = FALSE;
+    CFileOut output;
+    CFileMap input;
+    PWCHAR pwzOutput = NULL;
+
+    for (int arg = 1; arg < argc && !fNeedHelp; arg++) {
+        if (argv[arg][0] == '-' || argv[arg][0] == '/') {
+            WCHAR *argn = argv[arg]+1;                   // Argument name
+            WCHAR *argp = argn;                          // Argument parameter
+
+            while (*argp && *argp != ':') {
+                argp++;
+            }
+            if (*argp == ':')
+                *argp++ = '\0';
+
+            switch (argn[0]) {
+
+              case 'u':                                 // Update in place.
+              case 'U':
+                fUpdateInPlace = TRUE;
+                break;
+
+              case 'o':                                 // Output file.
+              case 'O':
+                output.Close();
+                pwzOutput = argp;
+                if (!output.Create(pwzOutput)) {
+                    fprintf(stderr, "Could not open output file: %ls\n", pwzOutput);
+                    pwzOutput = NULL;
+                    break;
+                }
+                printf("%ls:\n", pwzOutput);
+                break;
+
+              case '?':                                 // Help
+                fNeedHelp = TRUE;
+                break;
+
+              default:
+                printf("Unknown argument: %ls\n", argv[arg]);
+                fNeedHelp = TRUE;
+                break;
+            }
+        }
+        else {
+            if (fUpdateInPlace) {
+                if (!UpdateInPlace(argv[arg])) {
+                    fprintf(stderr, "Couldn't update file: %ls\n", argv[arg]);
+                    break;
+                }
+                continue;
+            }
+
+            if (pwzOutput == NULL) {
+                fprintf(stderr, "Must specify output file before input files.\n");
+                fNeedHelp = TRUE;
+                break;
+            }
+
+            if (!input.Load(argv[arg])) {
+                fprintf(stderr, "Couldn't open input file: %ls\n", argv[arg]);
+                output.Delete();
+                break;
+            }
+
+            PWCHAR pwzName = argv[arg];
+            PWCHAR pwz;
+
+            if ((pwz = wcsrchr(pwzName, ':')) != NULL) {
+                pwzName = pwz + 1;
+            }
+            if ((pwz = wcsrchr(pwzName, '\\')) != NULL) {
+                pwzName = pwz + 1;
+            }
+            _wcslwr(pwzName);
+
+            PBYTE pbData = input.Seek(0);
+            UINT32 cbData = input.Size();
+
+            output.Seek(0);
+            output.Write(pbData, cbData);
+            output.Seek(64);
+            output.Zero(64);
+            output.Seek(68);
+            output.Write((PBYTE)pwzName, (wcslen(pwzName) + 1) * sizeof(WCHAR));
+
+            output.Close();
+            pwzOutput = NULL;
+            fGood = TRUE;
+        }
+    }
+    if (!fGood) {
+        output.Delete();
+    }
+
+    if (argc == 1) {
+        fNeedHelp = TRUE;
+    }
+
+    if (fNeedHelp) {
+        printf(
+               "Usage:\n"
+               "    mkname [options] images...\n"
+               "Options:\n"
+               "    /o:out_file   -- Specify output file.\n"
+               "    /u            -- Update input files in place.\n"
+               "    /?            -- Display this help screen.\n"
+               "Summary:\n"
+               "    Copies the file and writes its name into the DOS section of header.\n");
+    }
+
+    return 0;
+}
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/mkpxecom/Makefile b/base/Windows/mkpxecom/Makefile
new file mode 100644
index 0000000..e2d6c8f
--- /dev/null
+++ b/base/Windows/mkpxecom/Makefile
@@ -0,0 +1,33 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\mkpxecom\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /define:SINGULARITY
+REFERENCES = /reference:System.dll
+
+all: $(OBJDIR) $(OBJDIR)\mkpxecom.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+clean:
+    @-del /q $(OBJDIR)\mkpxecom.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+install: all
+    $(SDEDIT) ..\..\build\mkpxecom.exe
+    $(COPY) $(OBJDIR)\mkpxecom.exe ..\..\build\mkpxecom.exe
+
+$(OBJDIR)\mkpxecom.exe: mkpxecom.cs
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\mkpxecom.exe mkpxecom.cs
+
diff --git a/base/Windows/mkpxecom/mkpxecom.cs b/base/Windows/mkpxecom/mkpxecom.cs
new file mode 100644
index 0000000..476928e
--- /dev/null
+++ b/base/Windows/mkpxecom/mkpxecom.cs
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+namespace mkpxecom
+{
+	/// <summary>
+	/// Summary description for mkpxecom.
+	/// </summary>
+    public class mkpxecom
+    {
+        static void Main(string[] args)
+        {
+            if (args.Length != 2)
+            {
+                Console.WriteLine("Incorrect usage");
+                return;
+            }
+        int size = Convert.ToInt32(args[0]);
+            string fileName = args[1];
+            if(!File.Exists(fileName))
+            {
+                FileStream fs = new FileStream(fileName, FileMode.Create);
+                byte[] buffer = new byte[size];
+                fs.Write(buffer, 0, size);
+            }
+            else
+            {
+                FileStream fs = new FileStream(fileName, FileMode.Open);
+                if(fs.Length != size)
+                {
+                    throw new Exception("File is of wrong size");
+                }
+            }
+            
+        }
+    }
+}
diff --git a/base/Windows/mkpxecom/mkpxecom.csproj b/base/Windows/mkpxecom/mkpxecom.csproj
new file mode 100644
index 0000000..7d7d6ea
--- /dev/null
+++ b/base/Windows/mkpxecom/mkpxecom.csproj
@@ -0,0 +1,24 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>mkpxecom</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="mkpxecom.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/mktests/Makefile b/base/Windows/mktests/Makefile
new file mode 100644
index 0000000..4591bdf
--- /dev/null
+++ b/base/Windows/mktests/Makefile
@@ -0,0 +1,52 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\mktests\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\mktests.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\mktests.exe
+    $(SDEDIT) ..\..\build\mktests.*
+    $(COPY) $(OBJDIR)\mktests.exe ..\..\build
+    $(COPY) $(OBJDIR)\mktests.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\mktests.* 2>nul
+    @-del /q *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.Xml.dll \
+    /reference:System.dll \
+    /reference:$(BUILDIR)\MsilReader.dll \
+
+SOURCE_FILES = \
+    mktests.cs \
+
+##############################################################################
+
+$(OBJDIR)\mktests.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\mktests.exe $(SOURCE_FILES)
+
+##############################################################################
diff --git a/base/Windows/mktests/mktests.cs b/base/Windows/mktests/mktests.cs
new file mode 100644
index 0000000..634ff96
--- /dev/null
+++ b/base/Windows/mktests/mktests.cs
@@ -0,0 +1,203 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   mktests.cs
+//
+//  Examine assembly metadata to compile a manifest of test code in a Singularity
+//  distribution.
+//
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+
+using Bartok.MSIL;
+
+public class mktests
+{
+    private static void Usage()
+    {
+        Console.WriteLine("Usage:\n" +
+                          "    mktests /out:<test_manifest_file> [assemblies]\n");
+    }
+
+    public static int Main(string[] args)
+    {
+        DateTime timeBegin = DateTime.Now;
+        ArrayList infiles = new ArrayList();
+        string outfile = null;
+
+        if (args.Length == 0) {
+            Usage();
+            return 0;
+        }
+
+        for (int i = 0; i < args.Length; i++) {
+            string arg = args[i];
+
+            if (arg.Length >= 2 && (arg[0] == '-' || arg[0] == '/')) {
+                string name = null;
+                string value = null;
+
+                int n = arg.IndexOf(':');
+
+                if (n > -1) {
+                    name = arg.Substring(1, n - 1).ToLower();
+
+                    if (n < arg.Length + 1) {
+                        value = arg.Substring(n + 1);
+                    }
+                }
+                else {
+                    name = arg.Substring(1).ToLower();
+                }
+
+                bool badArg = false;
+
+                switch (name) {
+                    case "out" :
+                        if (value != null) {
+                            outfile = value;
+                        } else {
+                            badArg = true;
+                        }
+                        break;
+
+                    default :
+                        badArg = true;
+                        break;
+                }
+
+                if (badArg) {
+                    Console.WriteLine("Malformed argument: \"" + arg + "\"");
+                    Usage();
+                    return 1;
+                }
+            }
+            else {
+                // This is just an assembly name
+                infiles.Add(arg);
+            }
+        }
+
+        if (outfile == null) {
+            Console.WriteLine("You must specify the output file.");
+            Usage();
+            return 1;
+        }
+
+        if (infiles.Count == 0) {
+            Console.WriteLine("You must specify at least one input file.");
+            Usage();
+            return 1;
+        }
+
+        ProcessAssemblies(infiles, outfile);
+
+        TimeSpan elapsed = DateTime.Now - timeBegin;
+        Console.WriteLine("mktests: {0} seconds elapsed.", elapsed.TotalSeconds);
+
+        return 0;
+    }
+
+    private static void ProcessAssemblies(ArrayList infiles, string outfile)
+    {
+        MetaDataResolver resolver = new MetaDataResolver(infiles, new ArrayList(), new DateTime(),
+                                                         false, false);
+
+        MetaDataResolver.ResolveCustomAttributes(
+            new MetaDataResolver[]{resolver});
+
+        XmlDocument outDoc = new XmlDocument();
+        XmlNode root = outDoc.CreateNode(XmlNodeType.Element, "testManifest", "");
+        outDoc.AppendChild(root);
+
+        foreach (MetaData md in resolver.MetaDataList) {
+            ProcessAssembly(md, outDoc);
+        }
+
+        // Write out our constructed XML
+        XmlTextWriter writer = new XmlTextWriter(outfile,
+                                                 System.Text.Encoding.UTF8);
+        outDoc.Save(writer);
+        writer.Close();
+    }
+
+    private static void ProcessAssembly(MetaData md,
+                                        XmlDocument outDoc)
+    {
+        // Look for the annotation that tells us that this assembly is a stand-alone
+        // test app.
+        MetaDataAssembly mda = (MetaDataAssembly)md.Assemblies[0];
+
+        foreach (MetaDataCustomAttribute attrib in md.CustomAttributes) {
+            MetaDataObject parent = attrib.Parent;
+            MetaDataAssembly assembly = parent as MetaDataAssembly;
+
+            // Is this an attribute attached to an entire assembly?
+            if (assembly != null) {
+                Debug.Assert(assembly == mda);
+
+                switch (attrib.Name) {
+                    case "Microsoft.Singularity.UnitTest.TestAppAttribute" :
+                        // This assembly is a stand-alone test app
+                        string group = GetNamedArg(attrib, "TestGroup") as string;
+
+                        if (group == null) {
+                            group = "default";
+                        }
+
+                        XmlNode groupNode = GetGroupNode(outDoc, group);
+                        Debug.Assert(groupNode != null);
+                        XmlNode newEntry = AddElement(outDoc, groupNode, "standAloneApp");
+                        AddAttribute(outDoc, newEntry, "name", assembly.Name);
+                        break;
+                }
+            }
+        }
+    }
+
+    private static Object GetNamedArg(MetaDataCustomAttribute attrib, string argName)
+    {
+        foreach (MetaDataCustomAttribute.NamedArg arg in attrib.NamedArgs) {
+            if (arg.Name == argName) {
+                return arg.Value;
+            }
+        }
+
+        return null;
+    }
+
+    private static XmlNode GetGroupNode(XmlDocument doc, string groupName)
+    {
+        XmlNode groupNode = doc.SelectSingleNode("child::group[name=\"" + groupName + "\"]");
+
+        if (groupNode == null) {
+            // No existing node for this group; create one.
+            groupNode = AddElement(doc, doc.DocumentElement, "group");
+            AddAttribute(doc, groupNode, "name", groupName);
+        }
+
+        return groupNode;
+    }
+
+    private static XmlNode AddElement(XmlDocument outDoc, XmlNode parent, string name)
+    {
+        XmlNode element = outDoc.CreateNode(XmlNodeType.Element, name, "");
+        parent.AppendChild(element);
+        return element;
+    }
+
+    private static void AddAttribute(XmlDocument outDoc, XmlNode node, string name, string value)
+    {
+        XmlAttribute attr = outDoc.CreateAttribute(name);
+        attr.Value = value;
+        node.Attributes.Append(attr);
+    }
+}
diff --git a/base/Windows/mktests/mktests.csproj b/base/Windows/mktests/mktests.csproj
new file mode 100644
index 0000000..751ff9b
--- /dev/null
+++ b/base/Windows/mktests/mktests.csproj
@@ -0,0 +1,27 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>mktests</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="mktests.cs"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+    <Reference Include="$(BuildDir)\MsilReader.dll"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/nib/Makefile b/base/Windows/nib/Makefile
new file mode 100644
index 0000000..24521ad
--- /dev/null
+++ b/base/Windows/nib/Makefile
@@ -0,0 +1,113 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\nib\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /unsafe
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\nib.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\nib.exe
+    $(SDEDIT) ..\..\build\nib.*
+    $(COPY) $(OBJDIR)\nib.exe ..\..\build
+    $(COPY) $(OBJDIR)\nib.pdb ..\..\build
+
+
+copy: $(OBJDIR) $(OBJDIR)\nib.exe
+    $(COPY) $(OBJDIR)\nib.exe ..\..\build
+    $(COPY) $(OBJDIR)\nib.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\nib.* Shell.* Sb16.* *~ 2>nul
+    @-rmdir /q /s x86  2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.Xml.dll \
+    /reference:System.dll \
+
+SOURCE_FILES = \
+    nib.cs \
+    ..\WindowsInteropLib\Kernel32.cs \
+    
+
+##############################################################################
+
+$(OBJDIR)\nib.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\nib.exe $**
+
+##############################################################################
+
+SHELL_ASSEMBLIES=\
+    $(APPSDIR)\Shell.exe \
+    $(APPSDIR)\Directory.Contracts.dll \
+    $(APPSDIR)\Io.Contracts.dll \
+    $(APPSDIR)\FileSystem.Contracts.dll \
+    $(LIBSDIR)\FileSystem.Utils.dll \
+    $(APPSDIR)\Corlibsg.dll \
+    $(ILLSDIR)\Singularity.V1.ill \
+    $(APPSDIR)\Corlib.dll \
+    $(APPSDIR)\System.Compiler.Runtime.dll \
+    $(APPSDIR)\Microsoft.SingSharp.Runtime.dll \
+    $(APPSDIR)\ILHelpers.dll \
+
+SB16_ASSEMBLIES=\
+    $(DRIVDIR)\Sb16.exe \
+    $(APPSDIR)\Directory.Contracts.dll \
+    $(APPSDIR)\Io.Contracts.dll \
+    $(APPSDIR)\Corlib.dll \
+    $(APPSDIR)\Corlibsg.dll \
+    $(ILLSDIR)\singularity.V1.ill \
+    $(APPSDIR)\System.Compiler.Runtime.dll \
+    $(APPSDIR)\Microsoft.SingSharp.Runtime.dll \
+    $(APPSDIR)\ILHelpers.dll \
+
+test: $(OBJDIR)\nib.exe $(SHELL_ASSEMBLIES) $(SB16_ASSEMBLIES)
+    @-mkdir x86 2> nul
+    $(OBJDIR)\mkmani.exe \
+        /out:Shell.manifest \
+        /app:Shell \
+        /x86:Shell.x86 \
+        /cache:$(BASEDIR) \
+        $(SHELL_ASSEMBLIES)
+    $(OBJDIR)\nib.exe \
+        /v \
+        /cache:$(BASEDIR) \
+        /options:$(OBJRELDIR).options \
+        /temp:x86 \
+        /native:x86 \
+        Shell.manifest
+    $(OBJDIR)\mkmani.exe \
+        /out:Sb16.manifest \
+        /app:Sb16 \
+        /x86:Sb16.x86 \
+        /cache:$(BASEDIR) \
+        $(SB16_ASSEMBLIES)
+    $(OBJDIR)\nib.exe \
+        /v \
+        /cache:$(BASEDIR) \
+        /options:$(OBJRELDIR).options \
+        /temp:x86 \
+        /native:x86 \
+        Sb16.manifest
+
+##############################################################################
diff --git a/base/Windows/nib/Prototype.MarkSweep.options b/base/Windows/nib/Prototype.MarkSweep.options
new file mode 100644
index 0000000..90cc841
--- /dev/null
+++ b/base/Windows/nib/Prototype.MarkSweep.options
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<options>
+  <assembly name="Singularity.V1.ill"
+            version="1.0.0"
+            publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf">
+    <replacement name="Singularity.V1.dll"
+                 cache="Libraries\obj\Prototype.MarkSweep\Singularity.V1.dll"
+                 version="1.0.0.0"
+                 publickey="00240000048000009400000006020000002400005253413100040000010001002b96128273b1f0b289a15381a7a11abf0740a0082151dedf0d8c660d619a9719070876e494445aab22bcb397d7b4ff97ca80ed49b3fc2b87bb767b60cafbf949aa435fcf17deb31901be16493c87dfe61d71f5185f0697a70ab5e0f1e05c7046db0d28c1be6d83da3fac58161c563ca59dc2ef9ce30230d9377aa63dd276cdbf" />
+  </assembly>
+  <codegen>
+    <parameter value="/Singularity" />
+    <parameter value="/LinkedStacksRequireExternalBound=true" />
+    <parameter value="/LinkedStacksDumpBounds=true" />
+    <parameter value="/Verbosity:silence" />
+    <parameter value="/BackEndComments=true" />
+    <parameter value="/DisablePInvoke=true" />
+    <parameter value="/GCInlineAllocations=false" />
+    <parameter value="/GCInlineWriteBarrier=false" />
+    <parameter value="/LinkedStacks=true" />
+    <parameter value="/UseSegmentRegister=true" />
+    <parameter value="/OmitFramePointer=false" />
+    <parameter value="/SymbolicDebug=true" />
+    <parameter value="/DebugInline=true" />
+    <parameter value="/UnnameTracedPtrs=true" />
+    <parameter value="/Warnings=true" />
+    <parameter value="/WholeProgram=true" />
+    <parameter value="/GenCoffLineNumber=false" />
+    <parameter value="/MarkSweepGC" />
+    <parameter value="/minopt" />
+    <parameter value="/IrSimpleInliner=false" />
+  </codegen>
+  <linker>
+    <parameter value="/nologo" />
+    <parameter value="/debug" />
+    <parameter value="/debugtype:cv" />
+    <parameter value="/incremental:no" />
+    <parameter value="/opt:ref" />
+    <parameter value="/release" />
+    <parameter value="/nod" />
+    <parameter value="/machine:ix86" />
+    <parameter value="/subsystem:native" />
+    <parameter value="/fixed:no" />
+    <parameter value="/base:0x2000000" />
+    <parameter value="/entry:RuntimeEntryPoint" />
+    <library name="native.lib" cache="Applications\obj\Prototype.MarkSweep\native.lib" />
+    <library name="singularity.V1.lib" cache="Kernel\obj\Prototype.MarkSweep\Singularity.V1.lib" />
+  </linker>
+</options>
diff --git a/base/Windows/nib/nib.cs b/base/Windows/nib/nib.cs
new file mode 100644
index 0000000..d9c278a
--- /dev/null
+++ b/base/Windows/nib/nib.cs
@@ -0,0 +1,2109 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   nib.cs
+//
+//  Note:   Native image building tool.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.IO;
+using System.Text;
+using System.Threading;
+
+#if !SINGULARITY
+using System.Xml;
+using Windows;
+#else
+using Microsoft.Singularity.Xml;
+using Microsoft.Singularity.Channels;
+using Microsoft.Singularity.Io;
+using Microsoft.Singularity.Directory;
+using Microsoft.Singularity;
+using Microsoft.Singularity.Applications;
+#endif
+
+namespace Microsoft.Singularity.Applications
+{
+    public class NativeImageBuilder
+    {
+        //
+        // Global flags.
+        //
+#if !SINGULARITY
+        public static string Bartok        = "bartok.exe";
+#else
+        public static string Bartok        = "bartok";
+#endif
+        public static bool   DoClean       = false;
+        public static bool   DoCodegen     = true;
+        public static bool   DoLinker      = true;
+        public static bool   DoManifest    = true;
+        public static bool   DoLogBartok   = false;
+        public static bool   ForceCodegen  = false;
+        public static bool   ForceLinker   = false;
+        public static bool   ForceManifest = false;
+        public static bool   Verbose       = false;
+
+        //
+        // Fields in the native image building class
+        //
+        private Options options;
+        // private string currentFile; // For warning and error messages.
+        private static string machine;
+        private string cacheDirectory;
+        private string libCacheDirectory;
+        private string nativeDirectory;
+        private string tempDirectory;
+        private string optionsFile;
+
+#if !SINGULARITY
+        private XmlDocument optManifest;
+        private XmlDocument appManifest;
+#else
+        private XmlNode optManifest;
+        private XmlNode appManifest;
+#endif
+
+        // set up an object that can build native images based on the system manifest.
+        public NativeImageBuilder(string cacheDirectory,
+                                  string libCacheDirectory,
+                                  string nativeDirectory,
+                                  string tempDirectory)
+        {
+            this.options = null;
+            this.cacheDirectory = cacheDirectory;
+            this.libCacheDirectory = libCacheDirectory;
+            this.nativeDirectory = nativeDirectory;
+            this.tempDirectory = tempDirectory;
+        }
+
+        public bool LoadOptionsManifest(string optionsFile)
+        {
+            this.optionsFile = optionsFile;
+            this.options = ParseOptionsManifest(optionsFile, out optManifest);
+            return (options != null);
+        }
+
+        //////////////////////////////////////////////// Methods to help with XML.
+        //
+        private XmlNode AddElement(XmlNode parent, string name)
+        {
+#if !SINGULARITY
+            XmlNode element = appManifest.CreateNode(XmlNodeType.Element, name, "");
+            if (parent != null) {
+                parent.AppendChild(element);
+            }
+            return element;
+#else
+            XmlNode element = appManifest.CreateNode(name);
+            if (parent != null) {
+                parent.AddChild(element);
+            }
+            return element;
+
+#endif
+        }
+
+        private void AddAttribute(XmlNode node, string name, string value)
+        {
+#if !SINGULARITY
+            XmlAttribute attr = appManifest.CreateAttribute(name);
+            attr.Value = value;
+            node.Attributes.Append(attr);
+#else
+            node.AddAttribute(name,value);
+#endif
+        }
+
+        private void InsertAttribute(XmlNode node, string name, string value)
+        {
+#if !SINGULARITY
+            XmlAttribute attr = appManifest.CreateAttribute(name);
+            attr.Value = value;
+            node.Attributes.Prepend(attr);
+#else
+            node.PrependAttribute(name,value);
+#endif
+        }
+
+        // Return an array with every child of the parent whose name matches
+        // <name>
+        private static XmlNode[] GetChildren(XmlNode parent, string name)
+        {
+            ArrayList result = new ArrayList();
+
+            foreach (XmlNode child in parent.ChildNodes) {
+                if (child.Name == name) {
+                    result.Add(child);
+                }
+            }
+
+            if (result.Count == 0) {
+                return new XmlNode[0];
+            }
+
+            XmlNode[] children = new XmlNode [result.Count];
+            for (int i = 0; i < result.Count; i++) {
+                children[i] = (XmlNode)result[i];
+            }
+            return children;
+
+        }
+
+        // Get the first child named `name'
+        private static XmlNode GetChild(XmlNode parent, string name)
+        {
+#if !SINGULARITY
+            return parent[name];
+#else
+            return parent.GetChild(name);
+#endif
+        }
+
+        // Get end node along a path of first matches
+        private static XmlNode GetDescendant(XmlNode root, string [] path)
+        {
+            XmlNode parent = root;
+
+            foreach (string pathelement in path) {
+                parent = GetChild(parent, pathelement);
+                if (parent == null) {
+                    return null;
+                }
+            }
+            return parent;
+        }
+
+        // Get the named attribute if it exists.
+        private static string GetAttribute(XmlNode node, string attrib)
+        {
+#if !SINGULARITY
+            XmlAttribute xa = node.Attributes[attrib];
+            return xa != null ? xa.Value : null;
+#else
+            return node.GetAttribute(attrib, null);
+#endif
+        }
+
+        private static string GetAttribute(XmlNode node, string attrib, string value)
+        {
+#if !SINGULARITY
+            XmlAttribute xa = node.Attributes[attrib];
+            return xa != null ? xa.Value : value;
+#else
+            string val = node.GetAttribute(attrib,null);
+            return  val != null ? val : value;
+#endif
+        }
+
+        private static int GetAttribute(XmlNode node, string attrib, int value)
+        {
+#if !SINGULARITY
+            XmlAttribute xa = node.Attributes[attrib];
+            return xa != null ? Int32.Parse(xa.Value) : value;
+#else
+            string val = node.GetAttribute(attrib,null);
+            return  val != null ? Int32.Parse(val) : value;
+#endif
+        }
+
+
+#if SINGULARITY
+
+        public bool RunProgram(string appname, string program, string arguments, StreamWriter log, PipeMultiplexer! outputMux)
+        {
+            string commandName;
+            string[]! args;
+            Process p = null;
+
+            UnicodePipeContract.Imp! childStdInImp;
+            UnicodePipeContract.Exp! childStdInExp;
+            UnicodePipeContract.Imp! childStdOutImp;
+            UnicodePipeContract.Exp! childStdOutExp;
+
+            NibHelper.BreakCommandLine(program + " " + arguments, new char[] {' '},
+                         out commandName, out args);
+
+            DirectoryServiceContract.Imp:Ready! ds = NibHelper.GetDirectoryServiceContract();
+            WriteLine("\t\t[{0,-30}] {1}", appname, program);
+            try {
+                if (log != null) {
+                    UnicodePipeContract.NewChannel(out childStdInImp, out childStdInExp);
+                    UnicodePipeContract.NewChannel(out childStdOutImp, out childStdOutExp);
+
+                    p = Binder.CreateProcess(ds,args,(!)childStdInExp,(!)childStdOutImp);
+                    if (p == null)  return false;
+
+                    p.Start();
+
+                    bool done = false;
+                    assert childStdOutExp != null;
+                    char[] buffer = null;
+                    while (!done) {
+                        switch receive {
+                        case childStdOutExp.Write(i_buffer,i_offset, i_count):
+                             //copy buffer;
+                            buffer =  new char[i_count];
+                            int i=0;
+                            int j = i_offset;
+                            for (; i < i_count; ) {
+                                buffer[i++] = i_buffer[j++];
+                            }
+                            childStdOutExp.SendAckWrite(i_buffer);
+                            Console.WriteLine(buffer);
+                            log.Write(buffer, 0, i_count);
+                            if (i_count < buffer.Length) {
+                                break;
+                            }
+                            buffer = null;
+                            continue;
+                        case childStdOutExp.ChannelClosed():
+                            done = true;
+                            continue;
+                        }
+                    }
+                    try {
+                        delete childStdInExp;  // kill our end of the input pipe;
+                    } catch(Exception ex) {
+                        Console.WriteLine("error deleting endpoint");
+                        ShowException(ex);
+                    }
+                }
+                else {
+                    p = Binder.CreateProcess(ds,args,outputMux);
+                    if (p == null)  return false;
+                    p.Start();
+                }
+                if (p != null) {
+                    p.Join();
+                }
+            } finally {
+                NibHelper.ReleaseDirectoryServiceContract(ds);
+            }
+            return true;
+        }
+#else
+        public bool RunProgram(string appname, string program, string arguments, StreamWriter log)
+        {
+            Process p = new Process();
+            p.StartInfo.UseShellExecute = false;
+            p.StartInfo.RedirectStandardOutput = (log != null);
+            p.StartInfo.FileName = program;
+            p.StartInfo.Arguments = arguments;
+            int exit = -1;
+
+            long peakPagedMemorySize = 0;
+            long peakVirtualMemorySize = 0;
+            long peakWorkingSet = 0;
+            try {
+                p.Start();
+                p.PriorityClass = ProcessPriorityClass.BelowNormal;
+
+                // In Win32, the usual sequence is to create a process with the initial thread
+                // suspended, then add the process to a job object.  But the .Net framework
+                // doesn't provide any way to do this; the process is not created until
+                // Process.Create(), and there is no flag in ProcessStartInfo to indicate that
+                // the initial thread should be created suspended.  So, we just start the
+                // process and immediately try to set the relevant parameters.
+
+                if (_BuildingParallel) {
+                    if (_JobHandle != IntPtr.Zero) {
+                        if (!Kernel32.AssignProcessToJobObject(_JobHandle, p.Handle))
+                            Console.WriteLine("FAILED to assign process to job: " + Kernel32.GetLastErrorText());
+                    }
+
+                    try {
+                        p.ProcessorAffinity = _ChildProcessorAffinityMask;
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine("FAILED to set processor affinity of child process!");
+                        ShowException(ex);
+                    }
+                }
+
+                WriteLine("\t\t[{0,-30}] {1}", appname, program);
+
+                if (Verbose) {
+                    WriteLine("\t{0}", arguments);
+                }
+                if (log != null) {
+                    StreamReader reader = p.StandardOutput;
+                    char[] buffer = new char [4096];
+
+                    for (;;) {
+                        int read = reader.ReadBlock(buffer, 0, buffer.Length);
+                        if (_ShowDots)
+                            Console.Write(".");
+                        log.Write(buffer, 0, read);
+                        if (read < buffer.Length) {
+                            break;
+                        }
+                        try {
+                            peakPagedMemorySize
+                                = Math.Max(p.PeakPagedMemorySize64, peakPagedMemorySize);
+                            peakVirtualMemorySize
+                                = Math.Max(p.PeakVirtualMemorySize64, peakVirtualMemorySize);
+                            peakWorkingSet
+                                = Math.Max(p.PeakWorkingSet64, peakWorkingSet);
+                        }
+                        catch (Exception) {
+                        }
+                    }
+                }
+                if (_ShowDots)
+                    Console.WriteLine();
+                p.WaitForExit();
+                exit = p.ExitCode;
+            }
+            catch (Exception e) {
+                Console.WriteLine("nib: Exception: {0}", e);
+            }
+            if (log != null) {
+                log.WriteLine("# peak memory: paged={0}KB, virtual={1}KB, working={2}KB",
+                              peakPagedMemorySize / 1024,
+                              peakWorkingSet / 1024,
+                              peakVirtualMemorySize / 1024);
+            }
+
+            if (exit != 0) {
+                if (true) {
+                    WriteLine("nib: Error: [{0}] {1} failed with exit code: {2}", appname, program, exit);
+                }
+                return false;
+            }
+            else {
+                return true;
+            }
+        }
+
+#endif
+
+        //////////////////////////////////////////////////////////////////////////
+        //
+        class OAssembly
+        {
+            public readonly string Name;
+            public readonly int MajorVersion;   // -1 if null.
+            public readonly int MinorVersion;   // -1 if null.
+            public readonly int Build;          // -1 if null.
+            public readonly int Revision;       // -1 if null.
+            public string Locale;
+            public string PublicKey;
+            public string Cache;
+            // products:
+            public string Final;
+
+            public OAssembly(string name, string version)
+            {
+                this.Name = name;
+                this.MajorVersion = -1;
+                this.MinorVersion = -1;
+                this.Build = -1;
+                this.Revision = -1;
+
+                if (version != null) {
+                    int offset = 0;
+                    this.MajorVersion = ParseInt(version, ref offset);
+                    this.MinorVersion = ParseInt(version, ref offset);
+                    this.Build = ParseInt(version, ref offset);
+                    this.Revision = ParseInt(version, ref offset);
+                }
+            }
+
+            private static int ParseInt(string s, ref int offset)
+            {
+                int num = -1;
+
+                while (offset < s.Length && s[offset] >= '0' && s[offset] <= '9') {
+                    if (num == -1) {
+                        num = (s[offset++] - '0');
+                    }
+                    else {
+                        num = num * 10 + (s[offset++] - '0');
+                    }
+                }
+                if (offset < s.Length && s[offset] == '.') {
+                    offset++;
+                }
+                return num;
+            }
+
+#if xxx
+            public override String ToString()
+            {
+                return String.Format("{0}.{1}.{2}.{3}.{4}.{5}.{6}",
+                                     Name,
+                                     MajorVersion,
+                                     MinorVersion,
+                                     Build,
+                                     Revision,
+                                     Locale != null ? Locale : "",
+                                     PublicKey != null ? PublicKey.Substring(0,8) : "");
+            }
+#endif
+            // Only non-null fields in the target should be compared.
+            // So that a 1.0.3000.3 in "this" matches 1.0.3000 in target.
+            public bool IsMatch(OAssembly target)
+            {
+                if (String.Compare(Name, target.Name, true) != 0) {
+                    return false;
+                }
+                if (target.Locale != null) {
+                    if (Locale == null || String.Compare(Locale, target.Locale, true) != 0) {
+                        return false;
+                    }
+                }
+                if (target.PublicKey != null) {
+                    if (PublicKey == null ||
+                        String.Compare(PublicKey, target.PublicKey, true) != 0) {
+                        return false;
+                    }
+                }
+                if (target.MajorVersion != -1 && MajorVersion != target.MajorVersion) {
+                    return false;
+                }
+                if (target.MinorVersion != -1 && MinorVersion != target.MinorVersion) {
+                    return false;
+                }
+                if (target.Build != -1 && Build != target.Build) {
+                    return false;
+                }
+                if (target.Revision != -1 && Revision != target.Revision) {
+                    return false;
+                }
+                return true;
+            }
+        }
+
+        class OReplacement : OAssembly
+        {
+            public OReplacement(string name, string version)
+                : base(name, version)
+            {
+            }
+
+            public OAssembly[] replacements;
+        }
+
+        class OCodegen
+        {
+            public string[] parameters;
+        }
+
+        class OLibrary
+        {
+            public readonly string Name;
+            public string Cache;
+            // products:
+            public string Final;
+
+            public OLibrary(string name)
+            {
+                this.Name = name;
+            }
+        }
+
+        class OLinker
+        {
+            public string[] parameters;
+            public OLibrary[] libraries;
+        }
+
+        class Options
+        {
+            public OReplacement[] assemblies;
+            public OCodegen codegen;
+            public OLinker linker;
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        //
+#if !SINGULARITY
+        private Options ParseOptionsManifest(string optionsFile,
+                                                    out XmlDocument optManifest)
+#else
+        private Options ParseOptionsManifest(string optionsFile,
+                                                    out XmlNode optManifest)
+#endif
+        {
+            // <options>
+            //   <assembly name= version= publickey= locale= />
+            //     <replacement name= cache= version= publickey= locale= />
+            //   </assembly>
+            //   <codegen>
+            //     <parameter value= />
+            //   </codegen>
+            //   <linker>
+            //     <parameter value= />
+            //     <library name= cache= />
+            //   </linker>
+            // <options>
+
+#if SINGULARITY
+            // read the file
+            optManifest = NibHelper.OpenXmlDocument(optionsFile);
+            if (optManifest != null) Console.WriteLine("parse of {0} successful", optionsFile);
+            else Console.WriteLine("parse of {0} failed", optionsFile);
+#else
+            optManifest = new XmlDocument();
+            optManifest.Load(optionsFile);
+#endif
+            XmlNode options = GetChild(optManifest, "options");
+            if (options == null) {
+                WriteLine("nib: Error: missing top-level <options> tag.");
+                return null;
+            }
+            Options opts = new Options();
+
+            XmlNode[] assemblies = GetChildren(options, "assembly");
+            if (assemblies.Length != 0) {
+                opts.assemblies = new OReplacement[assemblies.Length];
+                for (int a = 0; a < assemblies.Length; a++) {
+                    XmlNode anode = assemblies[a];
+                    string name = GetAttribute(anode, "name");
+                    string version = GetAttribute(anode, "version");
+
+                    if (name == null) {
+                        WriteLine("nib: Error: <assembly> tag missing 'name' attribute.");
+                        return null;
+                    }
+
+                    OReplacement assembly = new OReplacement(name, version);
+                    assembly.PublicKey = GetAttribute(anode, "publickey");
+                    assembly.Locale = GetAttribute(anode, "locale");
+
+                    XmlNode[] replacements = GetChildren(anode, "replacement");
+                    if (replacements.Length == 0) {
+                        WriteLine("nib: Error: <assembly> tag missing <replacement> child.");
+                        return null;
+                    }
+
+                    assembly.replacements = new OAssembly[replacements.Length];
+                    for (int r = 0; r < replacements.Length; r++) {
+                        XmlNode rnode = replacements[r];
+                        name = GetAttribute(rnode, "name");
+                        version = GetAttribute(rnode, "version");
+                        if (name == null) {
+                            WriteLine("nib: Error: <replacement> tag missing 'name' attribute.");
+                            return null;
+                        }
+
+                        OAssembly replacement = new OAssembly(name, version);
+                        replacement.PublicKey = GetAttribute(rnode, "publickey");
+                        replacement.Locale = GetAttribute(rnode, "locale");
+                        replacement.Cache = GetAttribute(rnode, "cache");
+                        assembly.replacements[r] = replacement;
+                    }
+                    opts.assemblies[a] = assembly;
+                }
+            }
+
+            // Parse the codegen section.
+            XmlNode codegen = GetChild(options, "codegen");
+            if (codegen == null) {
+                WriteLine("nib: Error: <options> tag missing <codegen> child.");
+            }
+            opts.codegen = new OCodegen();
+
+            XmlNode[] parameters = GetChildren(codegen, "parameter");
+            if (parameters.Length != 0) {
+                string[] pars = new string [parameters.Length];
+                for (int p = 0; p < parameters.Length; p++) {
+                    pars[p] = GetAttribute(parameters[p], "value");
+                    if (pars[p] == null) {
+                        WriteLine("nib: Error: <parameter> tag missing 'value' attribute.");
+                        return null;
+                    }
+                }
+                opts.codegen.parameters = pars;
+            }
+
+            // Parse the linker section.
+            XmlNode linker = GetChild(options, "linker");
+            if (linker == null) {
+                WriteLine("nib: Error: <options> tag missing <linker> child.");
+            }
+            opts.linker = new OLinker();
+
+            parameters = GetChildren(linker, "parameter");
+            if (parameters.Length != 0) {
+                string[] pars = new string [parameters.Length];
+                for (int p = 0; p < parameters.Length; p++) {
+                    pars[p] = GetAttribute(parameters[p], "value");
+                    if (pars[p] == null) {
+                        WriteLine("nib: Error: <parameter> tag missing 'value' attribute.");
+                        return null;
+                    }
+                }
+                opts.linker.parameters = pars;
+            }
+
+            XmlNode[] libraries = GetChildren(linker, "library");
+            if (libraries.Length != 0) {
+                opts.linker.libraries = new OLibrary [libraries.Length];
+                for (int l = 0; l < libraries.Length; l++) {
+                    XmlNode lnode = libraries[l];
+                    string name = GetAttribute(lnode, "name");
+                    if (name == null) {
+                        WriteLine("nib: Error: <library> tag missing 'name' attribute.");
+                        return null;
+                    }
+
+                    OLibrary library = new OLibrary(name);
+                    library.Cache = GetAttribute(lnode, "cache");
+                    opts.linker.libraries[l] = library;
+                }
+            }
+
+            return opts;
+        }
+
+        class Application
+        {
+            public readonly string Name;
+            public string Path;
+            public string Cache;
+            public OAssembly[] assemblies;
+            // products:
+            public string obj;
+            public string info;
+            public string super;
+            public string pdb;
+            public string x86;
+            public string xman; // Output manifest
+            public string map;
+            public string log;
+
+            public OCodegen codegen;
+            public OLinker linker;
+
+            public Application(string name)
+            {
+                this.Name = name;
+            }
+        }
+
+        ///////////////////////////////////////////////////// Manifest Processing.
+        //
+        // <application name=>
+        //   <process id= main= path= cache=>
+        //     <assemblies>
+        //       <assembly name= version= publickey= cache= />
+        //     </assemblies>
+        //     <categories>
+        //       <category id= name= class=>
+        //         <device signature=  />
+        //         <ioPortRange id= baseAddress= rangeLength= />
+        //         <ioIrqRange id= baseAddress= rangeLength= />
+        //         <ioDmaRange id= baseAddress= rangeLength= />
+        //         <ioMemoryRange addressBits= alignment= rangeLength= fixed= />
+        //         <extension id= startStateId= contractName= endpointEnd= assembly=...>
+        //           <imp>
+        //             <inherit name= />
+        //           </imp>
+        //           <exp>
+        //             <inherit name= />
+        //           </exp>
+        //         </extension>
+        //         <serviceProvider id= startStateId= contractName= endpointEnd= assembly=...>
+        //           <imp>
+        //             <inherit name= />
+        //           </imp>
+        //           <exp>
+        //             <inherit name= />
+        //           </exp>
+        //         </serviceProvider>
+        //       </category>
+        //     </categories>
+        //     <codegen>
+        //       <parameter value= />
+        //     </codegen>
+        //     <linker>
+        //       <parameter value= />
+        //     </linker>
+        //   </process>
+        // </application>
+        //
+#if !SINGULARITY
+        private Application ParseApplicationManifest(string applicationFile,
+                                                     out XmlDocument appManifest)
+        {
+            appManifest = new XmlDocument();
+            appManifest.Load(applicationFile);
+#else
+        private Application ParseApplicationManifest(string applicationFile,
+                                                     out XmlNode appManifest)
+        {
+            appManifest = NibHelper.CreateXmlDocument(applicationFile);
+#endif
+
+            XmlNode application  = GetChild(appManifest, "application");
+            if (application == null) {
+                WriteLine("nib: Error: missing top-level <application> tag.");
+                return null;
+            }
+            string name = GetAttribute(application, "name");
+            if (name == null) {
+                WriteLine("nib: Error: <application> tag missing 'name' attribute.");
+                return null;
+            }
+            XmlNode process = GetChild(application, "process");
+            if (process == null) {
+                WriteLine("nib: Error: <application> tag missing <process> child tag.");
+                return null;
+            }
+            Application app = new Application(name);
+
+            app.Path = GetAttribute(process, "path");
+            app.Cache = GetAttribute(process, "cache");
+
+            XmlNode assemblyHolder = GetChild(process, "assemblies");
+            if (assemblyHolder == null) {
+                WriteLine("nib: Error: <process> tag missing <assemblies> child tag.");
+                return null;
+            }
+
+            XmlNode[] assemblies = GetChildren(assemblyHolder, "assembly");
+            if (assemblies.Length != 0) {
+                app.assemblies = new OAssembly[assemblies.Length];
+                for (int a = 0; a < assemblies.Length; a++) {
+                    XmlNode anode = assemblies[a];
+                    name = GetAttribute(anode, "name");
+                    string version = GetAttribute(anode, "version");
+                    if (name == null) {
+                        WriteLine("nib: Error: <assembly> tag missing 'name' attribute.");
+                        return null;
+                    }
+
+                    OAssembly assembly = new OAssembly(name, version);
+                    assembly.Cache = GetAttribute(anode, "cache");
+                    assembly.Locale = GetAttribute(anode, "locale");
+                    assembly.PublicKey = GetAttribute(anode, "publickey");
+
+                    app.assemblies[a] = assembly;
+                }
+            }
+
+            // Parse the optional codegen section.
+            XmlNode codegen = GetChild(process, "codegen");
+            if (codegen != null) {
+                app.codegen = new OCodegen();
+
+                XmlNode[] parameters = GetChildren(codegen, "parameter");
+                if (parameters.Length != 0) {
+                    string[] pars = new string [parameters.Length];
+                    for (int p = 0; p < parameters.Length; p++) {
+                        pars[p] = GetAttribute(parameters[p], "value");
+                        if (pars[p] == null) {
+                            WriteLine("nib: Error: <parameter> tag missing 'value' attribute.");
+                            return null;
+                        }
+                    }
+                    app.codegen.parameters = pars;
+                }
+            }
+
+            // Parse the optional linker section.
+            XmlNode linker = GetChild(process, "linker");
+            if (linker != null) {
+                app.linker = new OLinker();
+
+                XmlNode[] parameters = GetChildren(linker, "parameter");
+                if (parameters.Length != 0) {
+                    string[] pars = new string [parameters.Length];
+                    for (int p = 0; p < parameters.Length; p++) {
+                        pars[p] = GetAttribute(parameters[p], "value");
+                        if (pars[p] == null) {
+                            WriteLine("nib: Error: <parameter> tag missing 'value' attribute.");
+                            return null;
+                        }
+                    }
+                    app.linker.parameters = pars;
+                }
+
+    #if false
+                // For now, we don't allow libraries in the application linker section.
+                XmlNode[] libraries = GetChildren(linker, "library");
+                if (libraries.Length != 0) {
+                    app.linker.libraries = new OLibrary [libraries.Length];
+                    for (int l = 0; l < libraries.Length; l++) {
+                        XmlNode lnode = libraries[l];
+                        string lname = GetAttribute(lnode, "name");
+                        if (lname == null) {
+                            WriteLine("nib: Error: <library> tag missing 'name' attribute.");
+                            return null;
+                        }
+
+                        OLibrary library = new OLibrary(lname);
+                        library.Cache = GetAttribute(lnode, "cache");
+                        app.linker.libraries[l] = library;
+                    }
+                }
+    #endif
+            }
+
+            return app;
+        }
+
+        private bool SetMaxChildId(XmlNode root, string xmlGroup)
+        {
+            XmlNode group = GetChild(root, xmlGroup);
+            if (group != null) {
+                int maxId = -1;
+                foreach (XmlNode node in group.ChildNodes) {
+                    int id = GetAttribute(node, "id", -1);
+                    if (id == -1) {
+                        id = maxId + 1;
+                        InsertAttribute(node, "id", id.ToString());
+                    }
+                    maxId = Math.Max(maxId, id);
+                }
+                InsertAttribute(group, "length", (maxId + 1).ToString());
+                return true;
+            }
+            else {
+                group = AddElement(root, xmlGroup);
+                AddAttribute(group, "length", "0");
+            }
+            return false;
+        }
+
+        private bool InstallApplicationManifest()
+        {
+            XmlNode application = GetChild(appManifest, "application");
+            if (application == null) {
+                WriteLine("nib: Error: missing top-level <application> tag.");
+                return false;
+            }
+
+            int maxProcessId = -1;
+            foreach (XmlNode process in GetChildren(application, "process")) {
+                int maxCategoryId = -1;
+
+                maxProcessId = Math.Max(maxProcessId, GetAttribute(process, "id", -1));
+                // look for categories node
+
+                foreach (XmlNode categories in GetChildren(process, "categories")) {
+                    foreach (XmlNode category in GetChildren(categories, "category")) {
+                        maxCategoryId++;
+                        SetMaxChildId(category, "endpoints");
+                        string name = GetAttribute(category, "name", "");
+                        if (name == "driver") {
+                            SetMaxChildId(category, "fixedHardware");
+                            SetMaxChildId(category, "dynamicHardware");
+                            SetMaxChildId(category, "configs");
+                        }
+                        // set these for all categories
+                        SetMaxChildId(category, "StringParameters");
+                        SetMaxChildId(category, "StringArrayParameters");
+                        SetMaxChildId(category, "LongParameters");
+                        SetMaxChildId(category, "BoolParameters");
+                    }
+                }
+                AddAttribute(process, "categories", (maxCategoryId + 1).ToString());
+            }
+            AddAttribute(application, "processes", (maxProcessId + 1).ToString());
+            return true;
+        }
+        //
+        //////////////////////////////////////////////////////////////////////////
+
+        private OAssembly[] FindReplacements(OAssembly assembly)
+        {
+            if (options == null) {
+                return null;
+            }
+
+            OAssembly[] assemblies = options.assemblies;
+
+            for (int a = 0; a < assemblies.Length; a++) {
+                if (assembly.IsMatch(assemblies[a])) {
+                    return ((OReplacement)assemblies[a]).replacements;
+                }
+            }
+            return null;
+        }
+
+        private OAssembly[] FindReplacements(OAssembly[] assemblies)
+        {
+            // Short circuit search if there are no replacement assemblies.
+            if (options == null || options.assemblies == null) {
+                return assemblies;
+            }
+
+            ArrayList list = new ArrayList();
+
+            for (int a = 0; a < assemblies.Length; a++) {
+                OAssembly[] replacements = FindReplacements(assemblies[a]);
+                if (replacements != null) {
+                    for (int r = 0; r < replacements.Length; r++) {
+                        if (Verbose) {
+                            WriteLine("Replacing {0} with {1}", assemblies[a], replacements[r]);
+                        }
+                        list.Add(replacements[r]);
+                    }
+                }
+                else {
+                    list.Add(assemblies[a]);
+                }
+            }
+
+            OAssembly[] final = new OAssembly[list.Count];
+            for (int a = 0; a < list.Count; a++) {
+                final[a] = (OAssembly)list[a];
+            }
+            return final;
+        }
+
+        public void DeleteIfExists(string file)
+        {
+            if (File.Exists(file)) {
+                File.Delete(file);
+                if (Verbose) {
+                    WriteLine("deleted {0}", file);
+                }
+            }
+        }
+
+        private static string ReplaceSuffix(string value, string old, string suffix)
+        {
+            if (value.EndsWith(old)) {
+                return value.Substring(0, value.Length - old.Length) + suffix;
+            }
+            return value + suffix;
+        }
+
+        // Returns true of the application was built or is up to date.
+#if !SINGULARITY
+        private bool BuildApplication(string applicationFile)
+        {
+#else
+        private bool BuildApplication(string applicationFile, PipeMultiplexer! outputMux)
+        {
+#endif
+            StreamWriter log = null;
+            DateTime logBegin = DateTime.Now;
+            bool doCodegen = DoCodegen;
+            bool doLinker = DoLinker;
+            bool doManifest = DoManifest;
+            bool doForceCodegen = ForceCodegen;
+            bool doForceLinker = ForceLinker;
+            bool doForceManifest = ForceManifest;
+
+            try {
+                Application app = ParseApplicationManifest(applicationFile, out appManifest);
+                if (app == null) {
+                    // parse failed.
+                    return false;
+                }
+                if (app.Path == null || app.Path == "") {
+                    WriteLine(
+                        "nib: Warning: No executable in manifest: {0}.",
+                        applicationFile);
+                    doCodegen = false;
+                    doLinker = false;
+                    doForceCodegen = false;
+                    doForceLinker = false;
+
+                    // This is hack just for the sake of the kernel.
+                    app.Path = app.Name + ".x86";
+                }
+
+                WriteLine("\t{0}", applicationFile);
+
+                app.obj = tempDirectory + app.Name + ".obj";
+                app.info = tempDirectory + app.Name + "_info.obj";
+                app.super = tempDirectory + app.Name + "_superObj.obj";
+                app.map = tempDirectory + app.Name + ".map";
+                app.log = tempDirectory + app.Name + ".log";
+                if (nativeDirectory != null) {
+                    app.x86 = nativeDirectory + app.Path;
+                }
+                else {
+                    app.x86 = cacheDirectory + app.Cache.Replace('/', '\\');
+                }
+                app.xman = ReplaceSuffix(app.x86, ".x86", ".manifest");
+                app.pdb = tempDirectory + app.Path + ".pdb";
+
+                DateTime written;
+                DateTime update =
+                    optionsFile == null ? DateTime.MinValue : File.GetLastWriteTime(optionsFile);
+                DateTime newest = File.GetLastWriteTime(applicationFile);
+                if (update < newest) {
+                    update = newest;
+                }
+
+                if (Verbose) {
+                    WriteLine("Name = [{0}]", app.Name);
+                    WriteLine("Path = [{0}]", app.Path);
+                    WriteLine("Cache= [{0}]", app.Cache);
+                    WriteLine("obj  = [{0}]", app.obj);
+                    WriteLine("info = [{0}]", app.info);
+                    WriteLine("super= [{0}]", app.super);
+                    WriteLine("pdb  = [{0}]", app.pdb);
+                    WriteLine("x86  = [{0}]", app.x86);
+                    WriteLine("xman = [{0}]", app.xman);
+                    WriteLine("map  = [{0}]", app.map);
+                    WriteLine("log  = [{0}]", app.log);
+                }
+
+                if (DoClean) {
+                    DeleteIfExists(app.obj);
+                    DeleteIfExists(app.info);
+                    DeleteIfExists(app.super);
+                    DeleteIfExists(app.pdb);
+                    DeleteIfExists(app.x86);
+                    DeleteIfExists(app.xman);
+                    DeleteIfExists(app.map);
+                    DeleteIfExists(app.log);
+                    return true;
+                }
+
+#if VERY_VERBOSE
+                WriteLine("  >>> Pre replace ***");
+                for (int a = 0; a < app.assemblies.Length; a++) {
+                    if (Verbose) {
+                        WriteLine("  {0}", app.assemblies[a]);
+                        WriteLine("     {0}", app.assemblies[a].Cache);
+                        WriteLine("     {0}", app.assemblies[a].Final);
+                    }
+                }
+#endif
+                // Now that we've parsed the manifest, we replace any mapped assemblies.
+                OAssembly[] assemblies = FindReplacements(app.assemblies);
+
+#if VERY_VERBOSE
+                WriteLine("  <<< Post replace ***");
+#endif
+                // Now, find the final code (if it isn't already cached).
+                for (int a = 0; a < assemblies.Length; a++) {
+                    string test = cacheDirectory + assemblies[a].Name;
+                    if (File.Exists(test)) {
+                        assemblies[a].Final = test;
+                    }
+                    else {
+                        if (assemblies[a].Cache == null) {
+                            WriteLine("nib: Error: Couldn't find assembly: {0}", assemblies[a]);
+                            return false;
+                        }
+                        string assemblyCachePath = assemblies[a].Cache.Replace('/', '\\');
+                        string finalAssemblyPath = Path.Combine(cacheDirectory, assemblyCachePath);
+                        assemblies[a].Final = finalAssemblyPath;
+                    }
+
+#if VERY_VERBOSE
+                    if (Verbose) {
+                        WriteLine("  {0}", assemblies[a]);
+                        WriteLine("     {0}", assemblies[a].Cache);
+                        WriteLine("     {0}", assemblies[a].Final);
+                    }
+#endif
+                }
+
+                if (doCodegen) {
+                    // Verify that all of the assemblies exist.
+                    bool errorFound = false;
+                    for (int a = 0; a < assemblies.Length; a++) {
+                        if (!File.Exists(assemblies[a].Final)) {
+                            WriteLine("nib: Error: Couldn't assembly file: {0}",
+                                              assemblies[a].Final);
+                            errorFound = true;
+                        }
+                    }
+                    if (errorFound) return false;
+
+                    // Find the newest assembly.
+                    newest = update;
+                    for (int a = 0; a < assemblies.Length; a++) {
+                        written = File.GetLastWriteTime(assemblies[a].Final);
+                        if (newest < written) {
+                            newest = written;
+                        }
+                    }
+
+                    DateTime target = DateTime.MinValue;
+                    if (File.Exists(app.obj)) {
+                        target = File.GetLastWriteTime(app.obj);
+                    }
+
+                    if (newest >= target || doForceCodegen) {
+                        // Codegen is necessary.
+
+                        // <option>
+                        // /out: ..\obj\Prototype.MarkSweep\Shell.obj
+                        // /outdir: ..\obj\Prototype.MarkSweep
+                        // <assembly>
+
+                        StringBuilder sb = new StringBuilder(4096);
+                        if (machine == "x64") sb.Append(" /x64 ");
+                        if (options != null) {
+                            foreach (string arg in options.codegen.parameters) {
+                                sb.Append(" ");
+                                sb.Append(arg);
+                            }
+                        }
+                        if (app.codegen != null) {
+                            foreach (string arg in app.codegen.parameters) {
+                                sb.Append(" ");
+                                sb.Append(arg);
+                            }
+                        }
+                        sb.Append(" /out: \"");
+                        sb.Append(app.obj);
+                        sb.Append("\"");
+                        sb.Append(" /outdir: \"");
+                        sb.Append(tempDirectory.Trim('\\'));
+                        sb.Append("\"");
+                        for (int a = 0; a < assemblies.Length; a++) {
+                            sb.Append(" \"");
+                            sb.Append(assemblies[a].Final);
+                            sb.Append("\"");
+                        }
+
+                        log = new StreamWriter(app.log);
+                        log.WriteLine("# Name = [{0}]", app.Name);
+                        log.WriteLine("# Path = [{0}]", app.Path);
+                        log.WriteLine("# Cache= [{0}]", app.Cache);
+                        log.WriteLine("# obj  = [{0}]", app.obj);
+                        log.WriteLine("# info = [{0}]", app.info);
+                        log.WriteLine("# super= [{0}]", app.super);
+                        log.WriteLine("# pdb  = [{0}]", app.pdb);
+                        log.WriteLine("# x86  = [{0}]", app.x86);
+                        log.WriteLine("# map  = [{0}]", app.map);
+                        log.WriteLine("# log  = [{0}]", app.log);
+                        log.WriteLine("# target = {0}", target);
+                        log.WriteLine("#newest = {0}", newest);
+
+                        log.WriteLine("#{0} {1}", Bartok, sb.ToString());
+                        if (Verbose) {
+                            WriteLine(sb.ToString());
+                        }
+#if !SINGULARITY
+                        if (!RunProgram(app.Name, Bartok, sb.ToString(), log)) {
+#else
+                        if (!RunProgram(app.Name, Bartok, sb.ToString(), log, outputMux)) {
+#endif
+                            return false;
+                        }
+                    }
+                    else {
+                        if (Verbose) {
+                            WriteLine("nib: Codegen unneeded: {0}", app.obj);
+                        }
+                    }
+                }
+
+                // Now that we've parsed the manifest, we replace any mapped libraries.
+                OLibrary[] libraries =
+                    options != null ? options.linker.libraries : new OLibrary[0];
+
+                // Now, find the final code (if it isn't already cached).
+                for (int l = 0; l < libraries.Length; l++) {
+                    string test = libCacheDirectory + libraries[l].Name;
+                    //WriteLine(" looking for final code @ {0}", test);
+                    if (File.Exists(test)) {
+                        libraries[l].Final = test;
+                        if (libraries[l].Cache == null) {
+                            libraries[l].Cache = libraries[l].Name;
+                        }
+                    }
+                    else {
+                        if (libraries[l].Cache == null) {
+                            WriteLine("nib: Error: Couldn't find library: {0}",
+                                              libraries[l]);
+                            return false;
+                        }
+
+                        libraries[l].Final = Path.Combine(cacheDirectory,
+                            libraries[l].Cache.Replace('/', '\\'));
+                    }
+
+                    if (Verbose) {
+                        WriteLine("  {0}", libraries[l].Cache);
+                        WriteLine("     {0}", libraries[l].Final);
+                    }
+                }
+
+                if (doLinker) {
+                    // Verify that all of the libraries exist.
+                    for (int l = 0; l < libraries.Length; l++) {
+                        if (!File.Exists(libraries[l].Final)) {
+                            WriteLine("nib: Error: Couldn't find library: {0}", libraries[l].Final);
+                            return false;
+                        }
+                    }
+
+                    if (!File.Exists(app.obj)) {
+                        WriteLine("nib: Error: Couldn't find file: {0}", app.obj);
+                        return false;
+                    }
+                    if (!File.Exists(app.super)) {
+                        WriteLine("nib: Error: Couldn't find file: {0}", app.super);
+                        return false;
+                    }
+
+                    // Find the newest library.
+                    newest = update;
+                    for (int l = 0; l < libraries.Length; l++) {
+                        written = File.GetLastWriteTime(libraries[l].Final);
+                        if (newest < written) {
+                            newest = written;
+                        }
+                    }
+                    written = File.GetLastWriteTime(app.obj);
+                    if (newest < written) {
+                        newest = written;
+                    }
+                    written = File.GetLastWriteTime(app.super);
+                    if (newest < written) {
+                        newest = written;
+                    }
+
+                    DateTime target = DateTime.MinValue;
+                    if (File.Exists(app.x86)) {
+                        target = File.GetLastWriteTime(app.x86);
+                    }
+
+
+                    if (newest >= target || doForceLinker) {
+                        // Linking is necessary
+
+                        // <option>
+                        // /out:..\obj\Prototype.MarkSweep\Shell.x86
+                        // /pdb:..\obj\Prototype.MarkSweep\Shell.x86.pdb
+                        // ..\obj\Prototype.MarkSweep\Shell.obj
+                        // ..\obj\Prototype.MarkSweep\Shell_superObj.obj
+                        // <library>
+                        StringBuilder sb = new StringBuilder(4096);
+                        if (options != null) {
+                            foreach (string arg in options.linker.parameters) {
+                                sb.Append(" ");
+                                sb.Append(arg);
+                            }
+                        }
+                        if (app.linker != null) {
+                            foreach (string arg in app.linker.parameters) {
+                                sb.Append(" ");
+                                sb.Append(arg);
+                            }
+                        }
+                        sb.Append(" /machine:");
+                        sb.Append(machine);
+                        sb.Append(" /out:");
+                        sb.Append(app.x86);
+                        sb.Append(" /pdb:");
+                        sb.Append(app.pdb);
+                        sb.Append(" /map:");
+                        sb.Append(app.map);
+                        sb.Append(" ");
+                        sb.Append(app.obj);
+                        sb.Append(" ");
+                        sb.Append(app.super);
+                        for (int l = 0; l < libraries.Length; l++) {
+                            sb.Append(" ");
+                            sb.Append(libraries[l].Final);
+                        }
+                        String args = sb.ToString();
+
+#if !SINGULARITY
+                        if (log != null) {
+                            log.WriteLine("#{0} {1}", "link.exe", args);
+                        }
+                        if (!RunProgram(app.Name, "link.exe", args, null)) {
+                            return false;
+                        }
+#else
+                        if (log != null) {
+                            log.WriteLine("#{0} {1}", "link", args);
+                        }
+                        if (!RunProgram(app.Name, "link", args, null, outputMux)) {
+                            return false;
+                        }
+#endif
+
+    #if CALL_MKNAME
+                        args = "/u " + app.x86;
+                        if (log != null) {
+                            log.WriteLine("#{0} {1}", "mkname.exe", args);
+                        }
+#if !SINGULARITY
+                        if (!RunProgram(app.Name, "mkname.exe", args, null)) {
+#else
+                        if (!RunProgram(app.Name, "mkname.exe", args, null, PipeMultiplexer! outputMux)) {
+#endif
+                            return false;
+                        }
+    #endif
+                    }
+                    else {
+                        if (Verbose) {
+                            WriteLine("nib: Linker unneeded: {0}", app.x86);
+                        }
+                    }
+                }
+
+                if (doManifest) {
+                    // Find the newest library.
+                    newest = File.GetLastWriteTime(applicationFile);
+                    if (newest < update) {
+                        newest = update;
+                    }
+                    DateTime target = DateTime.MinValue;
+                    if (File.Exists(app.xman)) {
+                        target = File.GetLastWriteTime(app.xman);
+                    }
+
+                    if (newest >= target || doForceManifest) {
+                        //////////////////////////////////////////////////////////
+                        // Update the installed manifest and write it out.
+                        //
+                        if (!InstallApplicationManifest()) {
+                            return false;
+                        }
+#if SINGULARITY
+                        Console.WriteLine(" manifest ->{0}",app.xman);
+                        FileStream fs =new FileStream("/fs/temp/outfile", FileMode.Create,
+                            FileAccess.Write, FileShare.None);
+                        XmlWriter writer = new XmlWriter(fs, System.Text.Encoding.UTF8);
+                        //writer.Formatting = Formatting.Indented;
+                        NibHelper.SaveXmlDocument(writer, appManifest);
+                        writer.Close();
+#else
+                        XmlTextWriter writer = new XmlTextWriter(app.xman,
+                                                                 System.Text.Encoding.UTF8);
+                        writer.Formatting = Formatting.Indented;
+                        appManifest.Save(writer);
+                        writer.Close();
+#endif
+                    }
+                    else {
+                        if (Verbose) {
+                            WriteLine("nib: Manifest generation unneeded: {0}", app.xman);
+                        }
+                    }
+                }
+            }
+            finally {
+                if (log != null) {
+                    TimeSpan elapsed = DateTime.Now - logBegin;
+                    log.WriteLine("# {0} seconds elapsed.", elapsed.TotalSeconds);
+                    log.Close();
+                }
+                appManifest = null;
+            }
+            return true;
+        }
+
+        #region Parallel Build Support
+
+        // Per-worker state
+        string _PrintPrefix = "";
+        IntPtr _ChildProcessorAffinityMask;
+
+        // Global state
+        static bool _ShowDots = true;
+        readonly static Object _PrintLock = new Object();
+        static IntPtr _JobHandle;
+
+        void WriteLine(string line)
+        {
+            if (_BuildingParallel)
+                Monitor.Enter(_PrintLock);
+
+            if (_PrintPrefix != null && _PrintPrefix.Length != 0)
+                Console.WriteLine(_PrintPrefix + line);
+            else {
+#if SINGULARITY
+                DebugStub.WriteLine(line);
+#endif
+                Console.WriteLine(line);
+            }
+            if (_BuildingParallel)
+                Monitor.Exit(_PrintLock);
+        }
+
+        void WriteLine(string format, params object[] args)
+        {
+            WriteLine(String.Format(format, args));
+        }
+
+
+        class QueueJob
+        {
+            public string Filename;
+            public bool Result;
+        }
+
+        // Contains
+        static readonly Object _JobQueueMonitor = new Object();
+        static readonly Queue _WaitingJobQueue = new Queue();
+        static readonly ArrayList _FinishedJobList = new ArrayList();
+        static bool _BuildingParallel;
+
+        class WorkerThread
+        {
+            public string DebugPrefix = "";
+
+            // zero-based processor index
+            public int Id;
+            public Thread Thread;
+
+            public TimeSpan KernelTime;
+            public TimeSpan UserTime;
+
+
+            public WorkerThread(NativeImageBuilder nib, int id)
+            {
+                this.Id = id;
+                this.nib = nib;
+                this.DebugPrefix = String.Format("{0}> ", id);
+                this._printPrefix = String.Format("{0}> ", id);
+            }
+
+            string _printPrefix;
+
+            NativeImageBuilder nib;
+
+            void DebugLine(string line)
+            {
+#if !SINGULARITY
+                Debug.WriteLine(DebugPrefix + line);
+#else
+                DebugStub.WriteLine(DebugPrefix + line);
+#endif
+            }
+
+            void DebugLine(string format, params object[] args)
+            {
+                DebugLine(String.Format(format, args));
+            }
+
+            void WriteLine(string line)
+            {
+                Console.WriteLine(DebugPrefix + line);
+            }
+
+            void WriteLine(string format, params object[] args)
+            {
+                WriteLine(String.Format(format, args));
+            }
+
+            public void ThreadMain()
+            {
+                try {
+                    RunQueuedJobs();
+                }
+                catch (Exception e) {
+                    ShowException(e);
+                    Environment.Exit(1);
+                }
+            }
+
+            private void RunQueuedJobs()
+            {
+                DebugLine("worker thread started");
+#if SINGULARITY
+                // build a pipe mux
+                // Use a mux to splice our own output together with the child
+                // processes we will run.
+                // Make ourselves a new output pipe
+                UnicodePipeContract.Exp! newOutputExp;
+                UnicodePipeContract.Imp! newOutputImp;
+                UnicodePipeContract.NewChannel(out newOutputImp, out newOutputExp);
+
+                // Retrieve our real stdOut and start using the one we just created
+                // instead
+                UnicodePipeContract.Imp stdOut = ConsoleOutput.Swap(newOutputImp);
+                PipeMultiplexer! outputMux = PipeMultiplexer.Start(stdOut, newOutputExp);
+#endif
+                for (;;) {
+                    QueueJob job;
+
+                    lock (_JobQueueMonitor)
+                    {
+                        if (_WaitingJobQueue.Count == 0) {
+                            DebugLine("no more jobs in queue -- exiting");
+                            break;
+                        }
+
+                        job = (QueueJob)_WaitingJobQueue.Dequeue();
+
+                    }
+
+                    // Execute the job.
+
+                    DebugLine("starting job - " + job.Filename);
+                    job.Result = false;
+                    try {
+#if !SINGULARITY
+                        job.Result = nib.BuildApplication(job.Filename);
+#else
+                        job.Result = nib.BuildApplication(job.Filename, outputMux);
+#endif
+                    }
+                    catch (Exception e) {
+                        Console.WriteLine("Failed building {0}\n", job.Filename);
+                        throw e;
+                    }
+
+                    DebugLine("job finished - " + job.Filename);
+
+                    if (!job.Result)
+                        DebugLine("job FAILED - " + job.Filename);
+
+                    lock (_JobQueueMonitor)
+                    {
+                        _FinishedJobList.Add(job);
+                    }
+                }
+#if !SINGULARITY
+                long creationTime;
+                long exitTime;
+                long kernelTime;
+                long userTime;
+                if (Kernel32.GetThreadTimes(Kernel32.GetCurrentThread(), out creationTime, out exitTime, out kernelTime, out userTime)) {
+                    this.KernelTime = new TimeSpan(kernelTime);
+                    this.UserTime = new TimeSpan(userTime);
+                }
+                else {
+                    WriteLine("Failed to get thread times!  error = " + Marshal.GetLastWin32Error());
+                }
+#else
+                    WriteLine("need to fix up thread times");
+                    outputMux.Dispose();
+#endif
+            }
+        }
+
+        static void ShowException(Exception chain)
+        {
+            for (Exception ex = chain; ex != null; ex = ex.InnerException) {
+                Console.WriteLine("{0}: {1}", ex.GetType().FullName, ex.Message);
+            }
+        }
+
+        #endregion
+
+
+        // Print the correct command line args for the program
+        static void Usage()
+        {
+            Console.WriteLine(
+                "Usage:\n" +
+                "    nib /cache:<path> [options] app.manifest [app1.manifest ...]\n" +
+                "Options:\n" +
+                "    /apps:<file>        - File containing list of app.manifests.\n" +
+                "    /bartok:<file>      - Specify Bartok to use.\n" +
+                "    /c                  - Code generation only, don't link.\n" +
+                "    /clean              - Clean up output only.\n" +
+                "    /cache:<path>       - Root of file cache.\n" +
+                "    /force              - Force generation even if output files are newer.\n" +
+                "    /link               - Link only, don't compile.\n" +
+                "    /libcache:<path>    - Root of Architecture-dependent cache.\n" +
+                "    /machine:<arch>     - Binary target architecture.\n" +
+                "    /manifest           - Generate reified manifest only.\n" +
+                "    /native:<path>      - Root of native files.\n" +
+                "    /options:<file>     - Options manifest file.\n" +
+                "    /temp:<path>        - Temporary directory.\n" +
+                "    /v                  - Verbose logging output.\n" +
+                "    /par                - Disable parallel builds.\n" +
+                "    /par:<nn>           - Set to use <nn> parallel processors.\n" +
+                "Summary:\n" +
+                "    Create a native image for each application manifest.\n" +
+                "");
+        }
+
+        static bool ReadInfilesFromFile(string filePath, ArrayList infiles)
+        {
+            try {
+                using (StreamReader sr = new StreamReader(filePath)) {
+                    string line;
+                    while ((line = sr.ReadLine()) != null) {
+                        infiles.Add(line);
+                    }
+                }
+                return true;
+            }
+            catch (FileNotFoundException) {
+                Console.WriteLine("File not found {0}\n", filePath);
+                return false;
+            }
+        }
+
+        static int Main(string[] args)
+        {
+            ArrayList infiles = new ArrayList();
+            string optionsFile = null;
+            string cacheDirectory = null;
+            string libCacheDirectory = null;
+            string tempDirectory = null;
+            string nativeDirectory = null;
+            DateTime beg = DateTime.Now;
+
+#if !SINGULARITY
+            string bartok = Environment.GetEnvironmentVariable("BARTOK");
+            if (bartok != null) {
+                Bartok = bartok;
+            }
+#endif
+
+#if !SINGULARITY
+            int maxWorkerThreads = Kernel32.GetProcessorCount();
+#else
+            int maxWorkerThreads = 1;
+#endif
+            int numWorkerThreads = maxWorkerThreads;
+
+            // Temporaries for command-line parsing
+            bool needHelp = (args.Length == 0);
+
+#if !SINGULARITY
+            for (int i = 0; i < args.Length && !needHelp; i++) {
+#else
+            for (int i = 1; i < args.Length && !needHelp; i++) {
+#endif
+                string arg = (string) args[i];
+
+                if (arg.Length >= 2 && (arg[0] == '-' || arg[0] == '/')) {
+                    string name = null;
+                    string value = null;
+                    int n = arg.IndexOf(':');
+                    if (n > -1) {
+                        name = arg.Substring(1, n - 1).ToLower();
+                        if (n < arg.Length + 1) {
+                            value = arg.Substring(n + 1);
+                        }
+                    }
+                    else {
+                        name = arg.Substring(1).ToLower();
+                    }
+                    bool badArg = false;
+                    switch (name) {
+                        case "h":
+                        case "help":
+                        case "?":
+                            needHelp = true;
+                            break;
+
+#if SINGULARITY
+                        case "app":
+                            if (value != null) {
+                                 infiles.Add(value);
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+#endif
+                        case "apps":
+                            if (value != null) {
+#if !SINGULARITY
+                                badArg = !ReadInfilesFromFile(value, infiles);
+#else
+                                Console.WriteLine("'apps' not supported");
+                                needHelp = true;
+                                break;
+#endif
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "bartok":
+                            if (value != null) {
+                                Bartok = value.Trim(new char[] {'"'});
+                                if (!File.Exists(Bartok)) {
+                                    Console.WriteLine("Bartok not found: {0}",
+                                                      Bartok);
+                                    badArg = true;
+                                }
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "c":
+                            DoCodegen = true;
+                            DoLinker = false;
+                            DoManifest = false;
+                            break;
+
+                        case "clean":
+                            DoClean = true;
+                            break;
+
+                        case "cache":
+                            if (value != null) {
+                                cacheDirectory = value.TrimEnd('/', '\\') + "\\";
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "force":
+                            ForceCodegen = true;
+                            ForceLinker = true;
+                            ForceManifest = true;
+                            break;
+
+                        case "libcache":
+                            if (value != null) {
+#if !SINGULARITY
+                                libCacheDirectory = value.TrimEnd('/', '\\') + "\\";
+#else
+                                libCacheDirectory = value + "/";
+#endif
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "link":
+                            DoCodegen = false;
+                            DoLinker = true;
+                            DoManifest = true;
+                            break;
+
+                        case "manifest":
+                            DoCodegen = false;
+                            DoLinker = false;
+                            DoManifest = true;
+                            break;
+
+                        case "log":
+#if !SINGULARITY
+                            cacheDirectory = value.TrimEnd('/', '\\') + "\\";
+#else
+                            cacheDirectory = value + "/";
+#endif
+                            break;
+
+                        case "native":
+                            if (value != null) {
+#if  true //!SINGULARITY
+                            nativeDirectory = value.TrimEnd('/', '\\') + "\\";
+#else
+                            nativeDirectory = value + "/";
+#endif
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "options":
+                            if (value != null) {
+                                optionsFile = value;
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "temp":
+                            if (value != null) {
+#if  true //!SINGULARITY
+                                tempDirectory = value.TrimEnd('/', '\\') + "\\";
+#else
+                                tempDirectory = value + "/";
+#endif
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        case "v":
+                            Verbose = true;
+                            break;
+
+                        case "par":
+                            if (value != null) {
+                                bool force = false;
+                                if (value.EndsWith("!")) {
+                                    value = value.Substring(0, value.Length - 1);
+                                    force = true;
+                                }
+                                int count;
+                                try {
+#if !SINGULARITY
+                                    count = Convert.ToInt32(value);
+#else
+                                    count = Int32.Parse(value);
+#endif
+                                }
+                                catch {
+                                    badArg = true;
+                                    break;
+                                }
+                                if (count < 1) {
+                                    badArg = true;
+                                    break;
+                                }
+                                if (count > maxWorkerThreads && !force) {
+                                    Console.WriteLine("nib: Warning: Cannot use {0} worker threads; this machine only has {1} processors.", count, maxWorkerThreads);
+                                    Console.WriteLine("nib: Using {0} worker threads.", maxWorkerThreads);
+                                    count = maxWorkerThreads;
+                                }
+                                else {
+                                    numWorkerThreads = count;
+                                }
+                            }
+                            else {
+                                // Parallel builds disabled.
+                                numWorkerThreads = 1;
+                            }
+                            break;
+
+                        case "machine":
+                            if (value != null) {
+                                machine = value;
+                            }
+                            else {
+                                badArg = true;
+                            }
+                            break;
+
+                        default:
+                            Console.WriteLine("nib: Unknown command line argument: {0}", arg);
+                            needHelp = true;
+                            break;
+                    }
+                    if (badArg) {
+                        Console.WriteLine("nib: Invalid command line argument: {0}", arg);
+                        needHelp = true;
+                    }
+                }
+                else {
+                    infiles.Add(arg);
+                }
+            }
+
+            if (machine == null) {
+                Console.WriteLine("No machine architecture specified. Terminating.");
+                Usage();
+                return -1;
+            }
+
+            if (infiles.Count == 0 ||
+                cacheDirectory == null || tempDirectory == null) {
+
+                Console.WriteLine("nib: Arguments missing from command line.");
+                needHelp = true;
+            }
+
+            if (needHelp) {
+                Usage();
+                return 1;
+            }
+
+            // check all input files
+            foreach (string filename in infiles) {
+                if (!File.Exists(filename)) {
+                    Console.WriteLine("nib: Error: Application manifest '{0}' not found.",
+                                      filename);
+                    return 2;
+                }
+            }
+
+            // check all input files
+            if (optionsFile != null && !File.Exists(optionsFile)) {
+                Console.WriteLine("nib: Error: Options manifest '{0}' not found.",
+                                  optionsFile);
+                return 2;
+            }
+            if (!Directory.Exists(cacheDirectory)) {
+                Console.WriteLine("nib: Error: Cache directory '{0}' not found.",
+                                  cacheDirectory);
+                return 2;
+            }
+            if (!Directory.Exists(tempDirectory)) {
+                Console.WriteLine("nib: Error: Temp directory '{0}' not found.",
+                                  tempDirectory);
+                return 2;
+            }
+
+            foreach (string filename in infiles) {
+                QueueJob job = new QueueJob();
+                job.Filename = filename;
+                _WaitingJobQueue.Enqueue(job);
+            }
+
+#if !SINGULARITY
+            if (Kernel32.IsCurrentProcessInJob()) {
+                Console.WriteLine("nib: Current process is already in a job.  Accounting disabled.");
+                _JobHandle = IntPtr.Zero;
+            }
+            else {
+                try {
+                    IntPtr job = Kernel32.CreateJobObject();
+                    _JobHandle = job;
+                }
+                catch (Exception ex)
+                {
+                    ShowException(ex);
+                    _JobHandle = IntPtr.Zero;
+                }
+            }
+#else
+        Console.WriteLine(" call to IsCurrentProcessJob");
+#endif
+            int worker_count = numWorkerThreads;
+
+            if (worker_count > 1) {
+                Console.WriteLine("nib: Using {0} processors.", worker_count);
+
+                _BuildingParallel = true;
+                _ShowDots = false;
+            }
+            else {
+                Console.WriteLine("nib: Using 1 processor.");
+                _BuildingParallel = false;
+                _ShowDots = true;
+            }
+
+            WorkerThread[] workers = new WorkerThread[worker_count];
+            for (int i = 0; i < worker_count; i++) {
+                NativeImageBuilder nib = new NativeImageBuilder(cacheDirectory,
+                                                                libCacheDirectory,
+                                                                nativeDirectory,
+                                                                tempDirectory);
+
+                if (optionsFile != null && !nib.LoadOptionsManifest(optionsFile)) {
+                    return 3;
+                }
+
+                if (_BuildingParallel) {
+                    nib._PrintPrefix = String.Format("{0}> ", i);
+                    nib._ChildProcessorAffinityMask = (IntPtr)(1 << i);
+                }
+                else {
+                    nib._PrintPrefix = "";
+                    nib._ChildProcessorAffinityMask = IntPtr.Zero;
+                }
+
+                WorkerThread worker = new WorkerThread(nib, i);
+                Thread thread = new Thread(new ThreadStart(worker.ThreadMain));
+#if !SINGULARITY
+                thread.IsBackground = true;
+#endif
+                worker.Thread = thread;
+
+                workers[i] = worker;
+            }
+
+            // Console.WriteLine("nib: starting worker threads...");
+
+            for (int i = 0; i < worker_count; i++) {
+                workers[i].Thread.Start();
+            }
+
+            // Console.WriteLine("nib: waiting for all worker threads...");
+
+            for (int i = 0; i < worker_count; i++) {
+                Thread thread = workers[i].Thread;
+                thread.Join();
+            }
+
+            // Console.WriteLine("nib: all worker threads finished.");
+            Console.WriteLine();
+
+            TimeSpan elapsed = DateTime.Now - beg;
+
+            // const string times_format_uk = "nib: {0,-30} : {1,-16} total = {2,-16} user + {3,-16} kernel";
+            const string times_format    = "nib: {0,-32} : {1}";
+
+#if !SINGULARITY
+            if (_JobHandle != IntPtr.Zero) {
+                try {
+                    JOBOBJECT_BASIC_ACCOUNTING_INFORMATION job_info;
+                    job_info = Kernel32.QueryJobObjectBasicAccountingInformation(_JobHandle);
+
+                    TimeSpan total_job_time = job_info.TotalUserTime + job_info.TotalKernelTime;
+
+                    Console.WriteLine(
+                        times_format,
+                        "CPU time consumed by jobs",
+                        total_job_time);
+
+                    Console.WriteLine(
+                        times_format,
+                        "    in user mode",
+                        job_info.TotalUserTime);
+
+                    Console.WriteLine(
+                        times_format,
+                        "    in kernel mode",
+                        job_info.TotalKernelTime);
+
+                    Console.WriteLine(
+                        times_format,
+                        "Elapsed time (wall time)",
+                        elapsed);
+
+                    Console.WriteLine("nib:");
+                    if (elapsed.TotalMilliseconds > 0) {
+                        double elapsed_ms = elapsed.TotalMilliseconds;
+                        double total_job_ms = total_job_time.TotalMilliseconds;
+                        double throughput_ratio = total_job_ms / elapsed_ms;
+                        double throughput_percent = Math.Round(throughput_ratio * 100.0);
+                        Console.WriteLine("nib:      Parallel throughput ratio: {0}%", throughput_percent);
+                    }
+                    else {
+                        Console.WriteLine("nib:      Too little time elapsed to compute ratio.");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("FAILED to query job info!");
+                    ShowException(ex);
+                }
+            }
+            else {
+                Console.WriteLine("nib: Child process times not available.");
+            }
+#else
+                Console.WriteLine("nib: Child process times not available.");
+                Console.WriteLine(
+                        times_format,
+                        "Elapsed time (wall time)",
+                        elapsed);
+#endif
+            int succeeded = 0;
+            int failed = 0;
+            foreach (QueueJob job in _FinishedJobList) {
+                if (job.Result)
+                    succeeded++;
+                else
+                    failed++;
+            }
+
+            if (_FinishedJobList.Count != infiles.Count) {
+                // This is defensive check.  Previously worker
+                // threads could raise and exception and leave nib
+                // running to completion without placing job on
+                // _FinishedJobList.
+                failed += infiles.Count - _FinishedJobList.Count;
+            }
+#if !SINGULARITY
+            if (_JobHandle != IntPtr.Zero)
+                Kernel32.CloseHandle(_JobHandle);
+#endif
+            Console.WriteLine("nib:      {0} job(s) succeeded, {1} job(s) failed", succeeded, failed);
+
+            return (failed != 0) ? 4 : 0;
+        }
+    }
+}
diff --git a/base/Windows/nib/nib.csproj b/base/Windows/nib/nib.csproj
new file mode 100644
index 0000000..3ac2eec
--- /dev/null
+++ b/base/Windows/nib/nib.csproj
@@ -0,0 +1,39 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Windows\Nib\Nib.csproj
+
+Note:   Native Image Builder
+
+        This program handles converting collections of IL assemblies into native
+        executable images.  It is mostly a front-end to Bartok and LINK.
+        
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>nib</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="nib.cs"/>
+    <Compile Include="..\WindowsInteropLib\Kernel32.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/nmake_dirs/Makefile b/base/Windows/nmake_dirs/Makefile
new file mode 100644
index 0000000..40f68a5
--- /dev/null
+++ b/base/Windows/nmake_dirs/Makefile
@@ -0,0 +1,57 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\nmake_dirs\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /unsafe
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\nmake_dirs.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+copy: $(OBJDIR) $(OBJDIR)\nmake_dirs.exe
+    $(COPY) $(OBJDIR)\nmake_dirs.exe ..\..\build
+    $(COPY) $(OBJDIR)\nmake_dirs.pdb ..\..\build
+
+
+install: $(OBJDIR) $(OBJDIR)\nmake_dirs.exe
+    $(SDEDIT) ..\..\build\nmake_dirs.*
+    $(COPY) $(OBJDIR)\nmake_dirs.exe ..\..\build
+    $(COPY) $(OBJDIR)\nmake_dirs.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\nmake_dirs.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.Xml.dll \
+    /reference:System.dll \
+
+
+SOURCE_FILES = \
+    NMakeDirs.cs \
+        
+
+##############################################################################
+
+$(OBJDIR)\nmake_dirs.exe: $(SOURCE_FILES) Makefile
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\nmake_dirs.exe $(SOURCE_FILES)
+
+##############################################################################
diff --git a/base/Windows/nmake_dirs/NMakeDirs.cs b/base/Windows/nmake_dirs/NMakeDirs.cs
new file mode 100644
index 0000000..515b0e5
--- /dev/null
+++ b/base/Windows/nmake_dirs/NMakeDirs.cs
@@ -0,0 +1,195 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+class NMakeDirs
+{
+    const string NMakeProgram = "nmake.exe";
+    const string RunParallelProgram = "runparallel.exe";
+    const string DrainMarker = "+DRAIN";
+
+    static int Main(string[] args)
+    {
+        try
+        {
+            ArrayList dirs = new ArrayList();
+            int dir_count = 0; // this count excludes drain markers
+
+            bool parallel = false;
+
+            string nmake_args = "/nologo ";
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                string arg = args[i];
+
+                if (arg.Length == 0)
+                    continue;
+
+                if (arg.StartsWith("/"))
+                {
+                    arg = arg.ToLower();
+                    if (arg == "/nmake")
+                    {
+                        // The rest of the arguments are for NMAKE.
+                        i++;
+                        nmake_args = nmake_args + String.Join(" ", args, i, args.Length - i);
+                        break;
+                    }
+                    else if (arg == "/p")
+                    {
+                        parallel = true;
+                    }
+                    else if (arg == "/?")
+                    {
+                        Usage();
+                        return 0;
+                    }
+                    else
+                    {
+                        WriteLine("WARNING: Unrecognized switch: " + arg);
+                    }
+                }
+                else
+                {
+                    dirs.Add(arg);
+                    if (String.Compare(arg, DrainMarker, true) != 0)
+                        dir_count++;
+                }
+            }
+
+            if (dir_count == 0)
+            {
+                Usage();
+                return 1;
+            }
+
+            if (parallel)
+            {
+                WriteLine("Building {0} dirs in parallel.", dir_count);
+
+                using (Process process = new Process())
+                {
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.RedirectStandardInput = true;
+                    process.StartInfo.FileName = RunParallelProgram;
+                    process.StartInfo.Arguments = "/stdin";
+
+                    process.Start();
+
+                    TextWriter pipe = process.StandardInput;
+
+                    foreach (string dir in dirs)
+                    {
+                        if (String.Compare(dir, DrainMarker, true) == 0)
+                        {
+                            pipe.WriteLine(dir);
+                            continue;
+                        }
+                        string line = String.Format("cd \"{0}\" && " + NMakeProgram + " {1}", dir, nmake_args);
+                        // WriteLine("    cmd - " + line);
+                        pipe.WriteLine(line);
+                    }
+
+                    pipe.Close();
+
+                    process.WaitForExit();
+
+                    if (process.ExitCode != 0)
+                    {
+                        WriteLine("RUNPARALLEL failed: " + process.ExitCode);
+                        return process.ExitCode;
+                    }
+
+                    return 0;
+                }
+            }
+            else
+            {
+                WriteLine("Building {0} dirs serially.", dir_count);
+
+                string initial_directory = Environment.CurrentDirectory;
+
+                foreach (string dir in dirs)
+                {
+                    if (String.Compare(dir, DrainMarker, true) == 0)
+                        continue;
+
+                    string path = Path.Combine(initial_directory, dir);
+                    WriteLine("building dir - " + path);
+
+                    using (Process process = new Process())
+                    {
+                        process.StartInfo.UseShellExecute = false;
+                        process.StartInfo.FileName = NMakeProgram;
+                        process.StartInfo.Arguments = nmake_args;
+                        process.StartInfo.WorkingDirectory = dir;
+
+                        process.Start();
+                        process.WaitForExit();
+
+                        if (process.ExitCode != 0)
+                        {
+                            WriteLine("[{0} NMAKE failed: {1}", dir, process.ExitCode);
+                            return process.ExitCode;
+                        }
+                    }
+                }
+
+                return 0;
+            }
+        }
+        catch (Exception ex)
+        {
+            ShowException(ex);
+            return 1;
+        }
+    }
+
+    static void WriteLine(string line)
+    {
+        Console.WriteLine(Prefix + line);
+    }
+
+    static void WriteLine(string format, params object[] args)
+    {
+        WriteLine(String.Format(format, args));
+    }
+
+    const string Prefix = "NMAKE_DIRS: ";
+
+    static void Usage()
+    {
+        Console.WriteLine("Usage: nmake_dirs [/p] dir1 dir2 ... dirN [/nmake args to nmake.exe]");
+        Console.WriteLine();
+        Console.WriteLine("    /p      Enables parallel builds of subdirectories.");
+        Console.WriteLine("    /nmake  All args following /nmake are passed to nmake.exe.");
+    }
+
+    static void ShowException(Exception chain)
+    {
+        for (Exception ex = chain; ex != null; ex = ex.InnerException)
+        {
+            Console.WriteLine(ex.GetType().FullName + ": " + ex.Message);
+        }
+    }
+
+    static string RemoveQuotes(string str)
+    {
+        str = str.Trim();
+        if (str.StartsWith("\"") && str.EndsWith("\""))
+            return str.Substring(1, str.Length - 2);
+        return str;
+    }
+
+}
diff --git a/base/Windows/singx86/Documentation.cmd b/base/Windows/singx86/Documentation.cmd
new file mode 100644
index 0000000..4a775e4
--- /dev/null
+++ b/base/Windows/singx86/Documentation.cmd
@@ -0,0 +1 @@
+start http://dbg/docs/dbgeng.doc
diff --git a/base/Windows/singx86/Makefile b/base/Windows/singx86/Makefile
new file mode 100644
index 0000000..033dd55
--- /dev/null
+++ b/base/Windows/singx86/Makefile
@@ -0,0 +1,87 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\singx86\Makefile
+#
+#   Note:
+#
+#   *** When adding extensions, create the .cpp file and an export
+#       entry in singx86.def. ***
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CFLAGS=$(CFLAGS) /DWIN32 /DNT /Oi- /I..\inc /I..\..\boot\include \
+    /Fd$(OBJDIR)\singx86.pdb \
+
+HOST_LINKFLAGS= $(HOST_LINKFLAGS) /nod /libpath:..\lib /fixed:no /subsystem:console
+
+LIBS=\
+    kernel32.lib    \
+    libcmt.lib      \
+    dbgeng.lib      \
+
+OBJS=\
+    $(OBJDIR)\singx86.res \
+    \
+    $(OBJDIR)\apic.obj \
+    $(OBJDIR)\bytev.obj \
+    $(OBJDIR)\charv.obj \
+    $(OBJDIR)\dump.obj \
+    $(OBJDIR)\help.obj \
+    $(OBJDIR)\ioapic.obj \
+    $(OBJDIR)\log.obj \
+    $(OBJDIR)\object.obj \
+    $(OBJDIR)\procs.obj \
+    $(OBJDIR)\sample.obj \
+    $(OBJDIR)\singx86.obj \
+    $(OBJDIR)\sips.obj \
+    $(OBJDIR)\stack.obj \
+    $(OBJDIR)\structs.obj \
+    $(OBJDIR)\thread.obj \
+    $(OBJDIR)\threads.obj \
+
+##############################################################################
+
+.SUFFIXES: .cpp .obj
+
+{.}.cpp{$(OBJDIR)}.obj:
+    cl /c $(CFLAGS) /Fo$@ $<
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\singx86.dll
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\singx86.dll
+    $(SDEDIT) ..\..\build\singx86.*
+    $(COPY) $(OBJDIR)\singx86.dll ..\..\build
+    $(COPY) $(OBJDIR)\singx86.pdb ..\..\build
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\singx86.* *~ 2>nul
+    @-del /q $(OBJS) 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+$(OBJDIR)\singx86.dll : $(OBJS) singx86.def
+    @echo Linking $@
+    link /dll /out:$(OBJDIR)\singx86.dll /pdb:$(OBJDIR)\singx86.pdb /def:singx86.def \
+        $(HOST_LINKFLAGS) \
+        $(OBJS) $(LIBS)
+
+$(OBJDIR)\singx86.res : singx86.rc
+    rc /fo$(OBJDIR)\singx86.res singx86.rc
+
+################################################################# End of File.
diff --git a/base/Windows/singx86/Readme.txt b/base/Windows/singx86/Readme.txt
new file mode 100644
index 0000000..97775f8
--- /dev/null
+++ b/base/Windows/singx86/Readme.txt
@@ -0,0 +1,24 @@
+The Singularity Debugger Extensions use the Debugger Interface for
+the Microsoft(R) Debugging Tools for Windows(R).  The Debugger Interface
+is also known as dbgeng.
+
+The latest documentation on dbgeng is at http://dbg/docs/dbgeng.doc.
+The dbgeng files, dbgeng.h and dbgeng.lig, come straight from the
+Debugger distribution (http://dbg).
+
+The objbase.h file was hand crafted to minimize the cruft
+imported by the standard Windows objbase.h (12KB vs. 1MB).
+
+To add a new command, you need to:
+1) Create a the new function.
+2) Add descriptive text to help.cpp
+3) Add an export entry to singx86.def.
+
+Windbg supports dynamic load and unloading of extensions.
+Type ".unload singx86" at the windbg command prompt to unload it.
+Type ".load singx86" at the windbg command prompt to load it.
+
+The code for the debuggers can be found in the Windows source tree in
+the \nt\sdktools\debuggers directory.  The most important sources are
+in \nt\sdktools\debuggers\ntsd64.  The sources for the Windows debugger
+stub are in \nt\base\ntos\kd64.
diff --git a/base/Windows/singx86/apic.cpp b/base/Windows/singx86/apic.cpp
new file mode 100644
index 0000000..8eeed6c
--- /dev/null
+++ b/base/Windows/singx86/apic.cpp
@@ -0,0 +1,138 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  apic.cpp - Extension to inspect APIC
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "singx86.h"
+
+inline static ULONG ApicRead32(const BYTE* apic, int offsetInBytes)
+{
+    return ((ULONG*) apic)[offsetInBytes / sizeof(ULONG)];
+}
+
+inline static BYTE ApicRead8(const BYTE* apic, int offsetInBytes)
+{
+    return apic[offsetInBytes];
+}
+
+inline static const char* TimerMode(ULONG flag)
+{
+    return (flag == 0) ? "One-shot" : "Periodic";
+}
+
+inline static const char* Mask(ULONG flag)
+{
+    return (flag == 0) ? "Unmasked" : "Masked  ";
+}
+
+inline static const char* TriggerMode(ULONG pmask, ULONG flag)
+{
+    if ((pmask & (1 << 15)) == 0)
+        return "-----";
+    return (flag == 0) ? "Edge " : "Level";
+}
+
+inline static const char* RemoteIRR(ULONG pmask, ULONG flag)
+{
+    if ((pmask & (1 << 14)) == 0)
+        return "------";
+    return (flag == 0) ? "No IRR" : "IRR   ";
+}
+
+inline static const char* PinPolarity(ULONG pmask, ULONG flag)
+{
+    if ((pmask & (1 << 13)) == 0)
+        return "---------";
+    return (flag == 0) ? "Active-Hi" : "Active-Lo";
+}
+
+inline static const char* DeliveryStatus(ULONG flag)
+{
+    return (flag == 0) ? "Idle" : "Pend";
+}
+
+inline static const char* DeliveryMode(ULONG pmask, ULONG value)
+{
+    if ((pmask & 0x700) == 0)
+        return "---";
+    const char * dm[8] = {
+        "Fix", "Res", "SMI", "Res", "NMI", "INI", "Res", "Ext"
+    };
+    value = (value & 0x700u) >> 8;
+    return dm[value];
+}
+
+static void DumpTimer(ULONG t)
+{
+    ExtOut("Timer:  %08x => Vector %02x ", t & 0x310ff, t & 0xff);
+    ExtOut("%s %s %s\n", Mask(t & 0x10000), TimerMode(t & 0x20000),
+           DeliveryStatus(t & 0x1000));
+}
+
+static void DumpLvt(const char* name, ULONG pmask, ULONG value)
+{
+    ExtOut("%s:  %08x => Vector %02x ", name, value & pmask, value & 0xff);
+    ExtOut("%s  %s  %s  %s  %s  %s\n",
+           Mask(value), TriggerMode(pmask, value),
+           RemoteIRR(pmask, value), PinPolarity(pmask, value),
+           DeliveryStatus(value), DeliveryMode(pmask, value));
+}
+
+static void DumpBits(const char* name, const BYTE* apic, int startOffset)
+{
+    ExtOut("%s: ", name);
+    for (int w = 0; w < 8; w++)
+    {
+        ULONG bits = ApicRead32(apic, startOffset + w * 16);
+        for (int i = 0; i < 32; i++)
+        {
+            if ((bits & (1 << i)) != 0)
+            {
+                ExtOut("0x%02x ", w * 32 + i);
+            }
+        }
+    }
+    ExtOut("\n");
+}
+
+EXT_DECL(apic) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    UNREFERENCED_PARAMETER(args);
+
+    static const ULONG64 ApicBase = 0x00000000fee00000;
+    BYTE apic[0x400];
+
+    EXT_CHECK(g_ExtData->ReadPhysical(ApicBase, &apic, sizeof(apic), NULL));
+
+    int maxLvt = ApicRead8(apic, 0x32);
+
+    ExtOut("Apic Id %u Version %02x Max LVT %u\n",
+           ApicRead8(apic, 0x23), ApicRead8(apic, 0x30), maxLvt);
+    ExtOut("TPR %08x APR %08x PPR %08x\n",
+           ApicRead32(apic, 0x80), ApicRead32(apic, 0x90),
+           ApicRead32(apic, 0xa0));
+    ExtOut("Logical Destination %08x Destination Format %08x\n",
+           ApicRead32(apic, 0xd0), ApicRead32(apic, 0xe0));
+    ExtOut("Spurious Interrupt Vector %08x\n", ApicRead32(apic, 0xf0));
+    ExtOut("Fault Status %02x\n", ApicRead8(apic, 0x280));
+
+    DumpTimer(ApicRead32(apic, 0x320));
+    DumpLvt("LINT0", 0x1f7ff, ApicRead32(apic, 0x350));
+    DumpLvt("LINT1", 0x1f7ff, ApicRead32(apic, 0x360));
+    DumpLvt("Fault", 0x110ff, ApicRead32(apic, 0x370));
+
+    if (maxLvt >= 4)
+        DumpLvt("Perf ", 0x117ff, ApicRead32(apic, 0x340));
+
+    if (maxLvt >= 5)
+        DumpLvt("Therm", 0x117ff, ApicRead32(apic, 0x343));
+
+    DumpBits("ISR", apic, 0x100);
+    DumpBits("IRR", apic, 0x200);
+    DumpBits("TMR", apic, 0x180);
+
+    EXT_LEAVE();
+}
diff --git a/base/Windows/singx86/bytev.cpp b/base/Windows/singx86/bytev.cpp
new file mode 100644
index 0000000..e9bd861
--- /dev/null
+++ b/base/Windows/singx86/bytev.cpp
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "singx86.h"
+
+struct ByteVector {
+    ULONG64 ulDataOffset;
+    ULONG64 ulDataLength;
+};
+
+EXT_DECL(bytev) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER(); // Defines: HRESULT status = S_OK;
+
+    if (!isalpha(args[0])) {
+        ExtOut("Usage:\n    !bytev <var>\n");
+        goto Exit;
+    }
+
+    ULONG64 indirect = 0;
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName(args, &indirect));
+
+    ULONG64 offset = 0;
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, indirect, &offset));
+
+    // Add type check here.
+    ULONG typeId;
+    ULONG64 module;
+    EXT_CHECK(g_ExtSymbols->GetSymbolTypeId(args, &typeId, &module));
+
+    CHAR szTypeName[255];
+    const SIZE_T cbTypeName = sizeof(szTypeName) / sizeof(szTypeName[0]);
+    EXT_CHECK(g_ExtSymbols->GetTypeName(module, typeId,
+                                        szTypeName, cbTypeName, NULL));
+
+    const CHAR szExpected[] = "unsigned char**";
+    const SIZE_T cbExpected = sizeof(szExpected) / sizeof(szExpected[0]);
+    if (strncmp(szTypeName, szExpected, cbExpected)) {
+        ExtOut("%s is not a byte vector.\n", args);
+        goto Exit;
+    }
+
+    struct ByteVector bv;
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(2, offset, (PULONG64)&bv));
+    ExtOut("Byte vector %s : address 0x%p length 0x%p\n",
+           args, bv.ulDataOffset, bv.ulDataLength);
+    EXT_LEAVE();
+}
diff --git a/base/Windows/singx86/charv.cpp b/base/Windows/singx86/charv.cpp
new file mode 100644
index 0000000..db0bac4
--- /dev/null
+++ b/base/Windows/singx86/charv.cpp
@@ -0,0 +1,72 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "singx86.h"
+
+struct CharVector {
+    ULONG64 ulDataOffset;
+    ULONG64 ulDataLength;
+};
+
+EXT_DECL(charv) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER(); // Defines: HRESULT status = S_OK;
+
+    if (!isalpha(args[0])) {
+        ExtOut("Usage:\n    !charv <var>\n");
+        goto Exit;
+    }
+
+    ULONG64 indirect = 0;
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName(args, &indirect));
+
+    ULONG64 offset = 0;
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, indirect, &offset));
+
+    ULONG typeId;
+    ULONG64 module;
+    EXT_CHECK(g_ExtSymbols->GetSymbolTypeId(args, &typeId, &module));
+
+    CHAR szTypeName[255];
+    const SIZE_T cbTypeName = sizeof(szTypeName) / sizeof(szTypeName[0]);
+    EXT_CHECK(g_ExtSymbols->GetTypeName(module, typeId,
+                                        szTypeName, cbTypeName, NULL));
+
+    const CHAR   szExpected[] = "char**";
+    const SIZE_T cbExpected   = sizeof(szExpected) / sizeof(szExpected[0]);
+    if (strncmp(szTypeName, szExpected, cbExpected)) {
+        ExtOut("%s is not a char vector.\n", args);
+        goto Exit;
+    }
+
+    struct CharVector cv;
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(2, offset, (PULONG64)&cv));
+
+    SIZE_T cChars = (SIZE_T) cv.ulDataLength / sizeof(WCHAR);
+    PWCHAR pwcText = new WCHAR[cChars + 1];
+    pwcText[cChars] = UNICODE_NULL;
+
+    HRESULT hRR =
+        g_ExtData->ReadVirtual(cv.ulDataOffset,
+                               pwcText,
+                               (ULONG)cv.ulDataLength,
+                               NULL);
+    if (S_OK == hRR) {
+        g_ExtControl->Output(DEBUG_OUTPUT_NORMAL,
+                             "Char vector %s : address 0x%p length " \
+                             "0x%p\nValue = \"",
+                             args, cv.ulDataOffset,
+                             (cv.ulDataLength / sizeof(WCHAR)));
+        g_ExtControl->OutputWide(DEBUG_OUTPUT_NORMAL, pwcText);
+        g_ExtControl->Output(DEBUG_OUTPUT_NORMAL, "\"\n");
+    }
+    else {
+        ExtVerb("ReadVirtual failed (%p)", hRR);
+    }
+
+    delete [] pwcText;
+
+    EXT_LEAVE();
+}
diff --git a/base/Windows/singx86/dump.cpp b/base/Windows/singx86/dump.cpp
new file mode 100644
index 0000000..3f1e5ef
--- /dev/null
+++ b/base/Windows/singx86/dump.cpp
@@ -0,0 +1,206 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  dump.cpp - Extension to dump a Singularity core.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+#include "minidump.h"
+
+HRESULT GetValue(PVOID pvData, ULONG Size, ULONG64 *valueOut)
+{
+    switch (Size) {
+      case 1:
+        *valueOut = *(BYTE *)pvData;
+        return S_OK;
+      case 2:
+        *valueOut = *(USHORT *)pvData;
+        return S_OK;
+      case 4:
+        *valueOut = *(ULONG *)pvData;
+        return S_OK;
+      case 8:
+        *valueOut = *(ULONG64 *)pvData;
+        return S_OK;
+      default:
+        ExtErr("GetValue: Invalid size: %d\n", Size);
+        return E_FAIL;
+    }
+}
+
+struct FieldAccessor
+{
+    ULONG64 Module;
+    ULONG   TypeId;
+    ULONG   Offset;
+    ULONG   Size;
+    PCSTR   Field;
+
+    HRESULT Init(ULONG64 Module, ULONG TypeId, PCSTR Field)
+    {
+        HRESULT status = S_OK;
+
+        this->Module = Module;
+        this->TypeId = TypeId;
+        this->Field = Field;
+
+        EXT_CHECK(g_ExtSymbols->GetFieldOffset(Module, TypeId, Field, &Offset));
+        EXT_CHECK(g_ExtSymbols->GetFieldOffset(Module, TypeId, Field, &Offset));
+
+      Exit:
+        return status;
+    }
+
+    HRESULT GetValueIn(ULONG64 vaStruct, ULONG64 *valueOut)
+    {
+        HRESULT status = S_OK;
+        BYTE buffer[8];
+
+        EXT_CHECK(g_ExtData->ReadVirtual(vaStruct + Offset, &buffer, sizeof(buffer), NULL));
+        EXT_CHECK(GetValue(&buffer, Size, valueOut));
+
+      Exit:
+        return status;
+    }
+
+    HRESULT GetValueIn(PVOID pvStruct, ULONG64 *valueOut)
+    {
+        return GetValue((PBYTE)pvStruct + Offset, Size, valueOut);
+    }
+};
+
+EXT_DECL(dump) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    PCSTR pszFile = NULL;
+    BOOL fOverwrite = FALSE;
+
+    while (*args != '\0') {
+        // skip whitespace
+        while (*args == ' ' || *args == '\t') {
+            args++;
+        }
+
+        // process argument
+        if (*args == '-' || *args == '/') {
+            args++;
+            switch (*args++) {
+              case 'o': // detail
+              case 'O':
+                fOverwrite = !fOverwrite;
+                break;
+              case '?': // Help
+              case 'h':
+              case 'H':
+                status = S_FALSE;
+                goto Exit;
+            }
+            while (*args != ' ') {
+                args++;
+            }
+        }
+        else {
+            if (*args == '\"') {
+                pszFile = ++args;
+                while (*args != '\0' && *args != '\"') {
+                    args++;
+                }
+                if (*args == '\"') {
+                    *((PCHAR&)args)++ = '\0';
+                }
+            }
+            else {
+                while (*args != '\0' && *args != ' ' && *args != '\t') {
+                    args++;
+                }
+                if (*args != '\0') {
+                    *((PCHAR&)args)++ = '\0';
+                }
+            }
+            break;
+        }
+    }
+
+    ULONG64 vaBootInfo = GetStaticPointer("nt!g_pBootInfo");
+
+    ULONG TypeId;
+    EXT_CHECK(g_ExtSymbols->GetTypeId(0, "nt!g_pBootInfo", &TypeId));
+    ExtOut("nt!g_pBootInfo = %08x\n", TypeId);
+    EXT_CHECK(g_ExtSymbols->GetSymbolTypeId("nt!Struct_Microsoft_Singularity_BootInfo", &TypeId, NULL));
+    ExtOut("nt!Struct_Microsoft_Singularity_BootInfo = %08x\n", TypeId);
+    EXT_CHECK(g_ExtSymbols->GetSymbolTypeId("nt!Struct_Microsoft_Singularity_BootInfo._SmapData32", &TypeId, NULL));
+    ExtOut("nt!Struct_Microsoft_Singularity_BootInfo._SmapData32 = %08x\n", TypeId);
+
+
+    ExtOut("vaBootInfo=%p\n", vaBootInfo);
+
+#if 0
+    // Dumps are almost always written sequentially so
+    // add that hint to the file flags.
+    HANDLE hFile = CreateFile(pszFile,
+                              GENERIC_READ | GENERIC_WRITE,
+                              0,
+                              NULL,
+                              fOverwrite ? CREATE_ALWAYS : CREATE_NEW,
+                              FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN,
+                              NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        status = HRESULT_FROM_WIN32(GetLastError());
+        ExtErr("Unable to create file '%s' - %d\n",
+               pszFile, GetLastError());
+        goto Exit;
+    }
+#endif
+
+#if 0
+    Class_System_Dumping_Dump data;
+    ULONG ret;
+
+    EXT_CHECK(g_ExtData->ReadVirtual(dump, &data, sizeof(data), &ret));
+    ExtOut("  %p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p }\n",
+           dump,
+           data.context.tid == -1 ? 0xfff : data.context.tid,
+           data.context.pid == -1 ? 0xfff : data.context.pid,
+           (ULONG64)data.context.eip,
+           (ULONG64)data.context.ebp,
+           (ULONG64)data.context.esp);
+
+    CONTEXT context;
+
+    EXT_CHECK(g_ExtSymbols->GetScope(NULL, NULL, &context, sizeof(context)));
+    context.Eip = data.context.eip;
+    context.Esp = data.context.esp;
+    context.Ebp = data.context.ebp;
+    context.Eax = data.context.eax;
+    context.Ebx = data.context.ebx;
+    context.Ecx = data.context.ecx;
+    context.Edx = data.context.edx;
+    context.Esi = data.context.esi;
+    context.Edi = data.context.edi;
+    context.EFlags = data.context.efl;
+
+    // CONTEXT_FLOATING_POINT
+    context.FloatSave.ControlWord = data.context.mmx.fcw;
+    context.FloatSave.StatusWord = data.context.mmx.fsw;
+    context.FloatSave.TagWord = data.context.mmx.ftw;
+    context.FloatSave.ErrorOffset = data.context.mmx.cs;
+    context.FloatSave.ErrorSelector = data.context.mmx.eip;
+    context.FloatSave.DataOffset = data.context.mmx.ds;
+    context.FloatSave.DataSelector = data.context.mmx.dp;
+
+    memcpy((uint8*)context.FloatSave.RegisterArea+0, &data.context.mmx.st0, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+10, &data.context.mmx.st1, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+20, &data.context.mmx.st2, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+30, &data.context.mmx.st3, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+40, &data.context.mmx.st4, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+50, &data.context.mmx.st5, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+60, &data.context.mmx.st6, 10);
+    memcpy((uint8*)context.FloatSave.RegisterArea+70, &data.context.mmx.st7, 10);
+
+    memcpy(context.ExtendedRegisters, &data.context.mmx, 512);
+
+    EXT_CHECK(g_ExtSymbols->SetScope(0, NULL, &context, sizeof(context)));
+#endif
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/dumpwrite.cpp b/base/Windows/singx86/dumpwrite.cpp
new file mode 100644
index 0000000..cb5dbe8
--- /dev/null
+++ b/base/Windows/singx86/dumpwrite.cpp
@@ -0,0 +1,5678 @@
+//----------------------------------------------------------------------------
+//
+// Dump file writing.
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//----------------------------------------------------------------------------
+
+#include "ntsdp.hpp"
+
+#include <uminiprov.hpp>
+#include <dbgver.h>
+#include <bugcodes.h>
+
+#define GENERIC_FORMATS \
+    (DEBUG_FORMAT_WRITE_CAB | \
+     DEBUG_FORMAT_CAB_SECONDARY_FILES | \
+     DEBUG_FORMAT_NO_OVERWRITE)
+#define UMINI_FORMATS \
+    (DEBUG_FORMAT_USER_SMALL_FULL_MEMORY | \
+     DEBUG_FORMAT_USER_SMALL_HANDLE_DATA | \
+     DEBUG_FORMAT_USER_SMALL_UNLOADED_MODULES | \
+     DEBUG_FORMAT_USER_SMALL_INDIRECT_MEMORY | \
+     DEBUG_FORMAT_USER_SMALL_DATA_SEGMENTS | \
+     DEBUG_FORMAT_USER_SMALL_FILTER_MEMORY | \
+     DEBUG_FORMAT_USER_SMALL_FILTER_PATHS | \
+     DEBUG_FORMAT_USER_SMALL_PROCESS_THREAD_DATA | \
+     DEBUG_FORMAT_USER_SMALL_PRIVATE_READ_WRITE_MEMORY | \
+     DEBUG_FORMAT_USER_SMALL_NO_OPTIONAL_DATA | \
+     DEBUG_FORMAT_USER_SMALL_FULL_MEMORY_INFO | \
+     DEBUG_FORMAT_USER_SMALL_THREAD_INFO | \
+     DEBUG_FORMAT_USER_SMALL_CODE_SEGMENTS)
+
+// Internal format flags for testing of microdumps.
+#define UMINI_MICRO       0x00000001
+#define UMINI_FORCE_DBG   0x00000002
+#define UMINI_WRITE_KMINI 0x00000004
+
+HRESULT
+DumpTargetInfo::DumpWriteFile(HANDLE File, PVOID Buffer, ULONG Size)
+{
+    HRESULT Status = S_OK;
+    ULONG Done;
+    
+    if (!WriteFile(File, Buffer, Size, &Done, NULL))
+    {
+        Status = WIN32_LAST_STATUS();
+    }
+    else if (Done != Size)
+    {
+        Status = HRESULT_FROM_WIN32(ERROR_DISK_FULL);
+    }
+
+    if (Status != S_OK)
+    {
+        ErrOut(_T("Error writing to dump file - %s\n    \"%s\"\n"),
+               FormatStatusCode(Status),
+               FormatStatusArgs(Status, NULL));
+    }
+
+    return Status;
+}
+
+//----------------------------------------------------------------------------
+//
+// UserFullDumpTargetInfo::Write.
+//
+//----------------------------------------------------------------------------
+
+#define USER_DUMP_MEMORY_BUFFER 65536
+
+struct CREATE_USER_DUMP_STATE
+{
+    ThreadInfo* Thread;
+    ImageInfo* Image;
+    ULONG64 MemHandle;
+    HANDLE DumpFileHandle;
+    MEMORY_BASIC_INFORMATION64 MemInfo;
+    MEMORY_BASIC_INFORMATION32 MemInfo32;
+    ULONG64 MemBufDone;
+    ULONG64 TotalMemQueried;
+    ULONG64 TotalMemData;
+    CROSS_PLATFORM_CONTEXT TargetContext;
+    DEBUG_EVENT Event;
+    CRASH_THREAD CrashThread;
+    ULONG64 MemBuf[USER_DUMP_MEMORY_BUFFER / sizeof(ULONG64)];
+};
+
+BOOL WINAPI
+CreateUserDumpCallback(ULONG DataType,
+                       PVOID* Data,
+                       PULONG DataLength,
+                       PVOID UserData)
+{
+    CREATE_USER_DUMP_STATE* State = (CREATE_USER_DUMP_STATE*)UserData;
+    ThreadInfo* Thread;
+
+    switch(DataType)
+    {
+    case DMP_DUMP_FILE_HANDLE:
+        *Data = State->DumpFileHandle;
+        *DataLength = sizeof(HANDLE);
+        break;
+
+    case DMP_DEBUG_EVENT:
+        ADDR PcAddr;
+
+        //
+        // Fake up an exception event for the current thread.
+        //
+
+        ZeroMemory(&State->Event, sizeof(State->Event));
+
+        g_Machine->GetPC(&PcAddr);
+
+        State->Event.dwDebugEventCode = EXCEPTION_DEBUG_EVENT;
+        State->Event.dwProcessId = g_Process->m_SystemId;
+        if (g_LastEventType == DEBUG_EVENT_EXCEPTION)
+        {
+            // Use the exception record from the last exception.
+            State->Event.dwThreadId = g_EventThread->m_SystemId;
+            ExceptionRecord64To(&g_LastEventInfo.Exception.ExceptionRecord,
+                                &State->Event.u.Exception.ExceptionRecord);
+            State->Event.u.Exception.dwFirstChance =
+                g_LastEventInfo.Exception.FirstChance;
+        }
+        else
+        {
+            // Fake a breakpoint exception.
+            State->Event.dwThreadId = g_Thread->m_SystemId;
+            State->Event.u.Exception.ExceptionRecord.ExceptionCode =
+                STATUS_BREAKPOINT;
+            State->Event.u.Exception.ExceptionRecord.ExceptionAddress =
+                (PVOID)(ULONG_PTR)Flat(PcAddr);
+            State->Event.u.Exception.dwFirstChance = TRUE;
+        }
+
+        *Data = &State->Event;
+        *DataLength = sizeof(State->Event);
+        break;
+
+    case DMP_THREAD_STATE:
+        ULONG64 Teb64;
+
+        if (State->Thread == NULL)
+        {
+            Thread = g_Process->m_ThreadHead;
+        }
+        else
+        {
+            Thread = State->Thread->m_Next;
+        }
+        State->Thread = Thread;
+        if (Thread == NULL)
+        {
+            return FALSE;
+        }
+
+        ZeroMemory(&State->CrashThread, sizeof(State->CrashThread));
+
+        State->CrashThread.ThreadId = Thread->m_SystemId;
+        State->CrashThread.SuspendCount = Thread->m_SuspendCount;
+        Thread->GetBasicInfo(DEBUG_TBINFO_PRIORITY_CLASS |
+                             DEBUG_TBINFO_PRIORITY);
+        if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_PRIORITY_CLASS)
+        {
+            State->CrashThread.PriorityClass =
+                Thread->m_BasicInfo.PriorityClass;
+        }
+        else
+        {
+            State->CrashThread.PriorityClass = NORMAL_PRIORITY_CLASS;
+        }
+        if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_PRIORITY)
+        {
+            State->CrashThread.Priority = Thread->m_BasicInfo.Priority;
+        }
+        else
+        {
+            State->CrashThread.Priority = THREAD_PRIORITY_NORMAL;
+        }
+        if (g_Target->GetThreadInfoDataOffset(Thread, NULL, &Teb64) != S_OK)
+        {
+            Teb64 = 0;
+        }
+        State->CrashThread.Teb = (ULONG_PTR)Teb64;
+
+        *Data = &State->CrashThread;
+        *DataLength = sizeof(State->CrashThread);
+        break;
+
+    case DMP_MEMORY_BASIC_INFORMATION:
+        for (;;)
+        {
+            if (g_Target->QueryMemoryRegion(g_Process,
+                                            &State->MemHandle,
+                                            &State->MemInfo) != S_OK)
+            {
+                State->MemHandle = 0;
+                State->MemInfo.RegionSize = 0;
+                return FALSE;
+            }
+
+            State->MemHandle = State->MemInfo.BaseAddress +
+                State->MemInfo.RegionSize;
+
+            if (!((State->MemInfo.Protect & PAGE_GUARD) ||
+                  (State->MemInfo.Protect & PAGE_NOACCESS) ||
+                  (State->MemInfo.State & MEM_FREE) ||
+                  (State->MemInfo.State & MEM_RESERVE)))
+            {
+                break;
+            }
+        }
+
+        State->TotalMemQueried += State->MemInfo.RegionSize;
+
+#ifdef _WIN64
+        *Data = &State->MemInfo;
+        *DataLength = sizeof(State->MemInfo);
+#else
+        State->MemInfo32.BaseAddress = (ULONG)State->MemInfo.BaseAddress;
+        State->MemInfo32.AllocationBase = (ULONG)State->MemInfo.AllocationBase;
+        State->MemInfo32.AllocationProtect = State->MemInfo.AllocationProtect;
+        State->MemInfo32.RegionSize = (ULONG)State->MemInfo.RegionSize;
+        State->MemInfo32.State = State->MemInfo.State;
+        State->MemInfo32.Protect = State->MemInfo.Protect;
+        State->MemInfo32.Type = State->MemInfo.Type;
+        *Data = &State->MemInfo32;
+        *DataLength = sizeof(State->MemInfo32);
+#endif
+        break;
+
+    case DMP_THREAD_CONTEXT:
+        if (State->Thread == NULL)
+        {
+            Thread = g_Process->m_ThreadHead;
+        }
+        else
+        {
+            Thread = State->Thread->m_Next;
+        }
+        State->Thread = Thread;
+        if (Thread == NULL)
+        {
+            g_Target->ChangeRegContext(g_Thread);
+            return FALSE;
+        }
+
+        g_Target->ChangeRegContext(Thread);
+        if (g_Machine->GetContextState(MCTX_CONTEXT) != S_OK ||
+            g_Machine->
+            ConvertCanonContextToTarget(&g_Machine->m_Context,
+                                        g_Target->m_TypeInfo.SizeTargetContext,
+                                        &State->TargetContext) != S_OK)
+        {
+            ErrOut(_T("Unable to retrieve context for thread %d. ")
+                   _T("Dump may be corrupt."), Thread->m_UserId);
+            return FALSE;
+        }
+
+        *Data = &State->TargetContext;
+        *DataLength = g_Target->m_TypeInfo.SizeTargetContext;
+        break;
+
+    case DMP_MODULE:
+        ImageInfo* Image;
+        PCRASH_MODULE Module;
+
+        if (State->Image == NULL)
+        {
+            Image = g_Process->m_ImageHead;
+        }
+        else
+        {
+            Image = State->Image->m_Next;
+        }
+
+        // Skip over modules that are marked for unload
+        // as they don't have valid memory and thus
+        // will confuse the loaded module list validation
+        // when the dump is loaded.
+        for (;;)
+        {
+            State->Image = Image;
+            if (!Image)
+            {
+                return FALSE;
+            }
+
+            if (!Image->m_Unloaded)
+            {
+                break;
+            }
+            
+            Image = State->Image->m_Next;
+        }
+
+        Module = (PCRASH_MODULE)State->MemBuf;
+        Module->BaseOfImage = (ULONG_PTR)Image->m_BaseOfImage;
+        Module->SizeOfImage = Image->m_SizeOfImage;
+        Module->ImageNameLength = _tcslen(Image->m_ImagePath) + 1;
+#ifndef UNICODE
+        CopyString(Module->ImageName, Image->m_ImagePath,
+                   USER_DUMP_MEMORY_BUFFER - sizeof(*Module));
+#else
+        FillStringBufferTA(Image->m_ImagePath, 0,
+                           Module->ImageName,
+                           USER_DUMP_MEMORY_BUFFER - sizeof(*Module),
+                           NULL);
+#endif
+
+        *Data = Module;
+        *DataLength = sizeof(*Module) + Module->ImageNameLength;
+        break;
+
+    case DMP_MEMORY_DATA:
+        ULONG64 Left;
+
+        Left = State->MemInfo.RegionSize - State->MemBufDone;
+        if (Left == 0)
+        {
+            State->MemBufDone = 0;
+
+            for (;;)
+            {
+                if (g_Target->QueryMemoryRegion(g_Process,
+                                                &State->MemHandle,
+                                                &State->MemInfo) != S_OK)
+                {
+                    State->MemHandle = 0;
+                    State->MemInfo.RegionSize = 0;
+
+                    // Sanity check that we wrote out as much data
+                    // as we stored in the MEMORY_BASIC phase.
+                    if (State->TotalMemQueried != State->TotalMemData)
+                    {
+                        ErrOut(_T("Queried %s bytes of memory but wrote %s ")
+                               _T("bytes of memory data.\n")
+                               _T("Dump may be corrupt.\n"),
+                               FormatDisp64(State->TotalMemQueried),
+                               FormatDisp64(State->TotalMemData));
+                    }
+
+                    return FALSE;
+                }
+
+                State->MemHandle = State->MemInfo.BaseAddress +
+                    State->MemInfo.RegionSize;
+
+                if (!((State->MemInfo.Protect & PAGE_GUARD) ||
+                      (State->MemInfo.Protect & PAGE_NOACCESS) ||
+                      (State->MemInfo.State & MEM_FREE) ||
+                      (State->MemInfo.State & MEM_RESERVE)))
+                {
+                    break;
+                }
+            }
+
+            Left = State->MemInfo.RegionSize;
+            State->TotalMemData += State->MemInfo.RegionSize;
+        }
+
+        if (Left > USER_DUMP_MEMORY_BUFFER)
+        {
+            Left = USER_DUMP_MEMORY_BUFFER;
+        }
+        if (CurReadAllVirtual(State->MemInfo.BaseAddress +
+                              State->MemBufDone, State->MemBuf,
+                              (ULONG)Left) != S_OK)
+        {
+            ErrOut(_T("ReadVirtual at %s failed. Dump may be corrupt.\n"),
+                   FormatAddr64(State->MemInfo.BaseAddress +
+                                State->MemBufDone));
+            return FALSE;
+        }
+
+        State->MemBufDone += Left;
+
+        *Data = State->MemBuf;
+        *DataLength = (ULONG)Left;
+        break;
+    }
+
+    return TRUE;
+}
+
+HRESULT
+UserFullDumpTargetInfo::Write(HANDLE hFile, DUMP_WRITE_ARGS* Args)
+{
+    dprintf(_T("user full dump\n"));
+    FlushCallbacks();
+
+    if (!IS_LIVE_USER_TARGET(g_Target))
+    {
+        ErrOut(_T("User full dumps can only be written in ")
+               _T("live user-mode sessions\n"));
+        return E_UNEXPECTED;
+    }
+    if (Args->CommentA != NULL || Args->CommentW != NULL)
+    {
+        ErrOut(_T("User full dumps do not support comments\n"));
+        return E_INVALIDARG;
+    }
+
+    CREATE_USER_DUMP_STATE* State;
+
+    State = (CREATE_USER_DUMP_STATE*)calloc(1, sizeof(*State));
+    if (State == NULL)
+    {
+        ErrOut(_T("Unable to allocate memory for dump state\n"));
+        return E_OUTOFMEMORY;
+    }
+
+    State->DumpFileHandle = hFile;
+
+    HRESULT Status;
+
+    if (!DbgHelpCreateUserDump(NULL, CreateUserDumpCallback, State))
+    {
+        Status = WIN32_LAST_STATUS();
+        ErrOut(_T("Dump creation failed, %s\n    \"%s\"\n"),
+               FormatStatusCode(Status), FormatStatus(Status));
+    }
+    else
+    {
+        Status = S_OK;
+    }
+
+    free(State);
+    return Status;
+}
+
+//----------------------------------------------------------------------------
+//
+// UserMiniDumpTargetInfo::Write.
+//
+//----------------------------------------------------------------------------
+
+class DbgSystemProvider : public MiniDumpSystemProvider
+{
+public:
+    DbgSystemProvider(void);
+    ~DbgSystemProvider(void);
+
+    virtual void Release(void);
+    virtual HRESULT GetCurrentTimeDate(OUT PULONG TimeDate);
+    virtual HRESULT GetCpuType(OUT PULONG Type,
+                               OUT PBOOL BackingStore);
+    virtual HRESULT GetCpuInfo(OUT PUSHORT Architecture,
+                               OUT PUSHORT Level,
+                               OUT PUSHORT Revision,
+                               OUT PUCHAR NumberOfProcessors,
+                               OUT PCPU_INFORMATION Info);
+    virtual void GetContextSizes(OUT PULONG Size,
+                                 OUT PULONG RegScanStart,
+                                 OUT PULONG RegScanCount);
+    virtual void GetPointerSize(OUT PULONG Size);
+    virtual void GetPageSize(OUT PULONG Size);
+    virtual void GetFunctionTableSizes(OUT PULONG TableSize,
+                                       OUT PULONG EntrySize);
+    virtual void GetInstructionWindowSize(OUT PULONG Size);
+    virtual HRESULT GetOsInfo(OUT PULONG PlatformId,
+                              OUT PULONG Major,
+                              OUT PULONG Minor,
+                              OUT PULONG BuildNumber,
+                              OUT PUSHORT ProductType,
+                              OUT PUSHORT SuiteMask);
+    virtual HRESULT GetOsCsdString(OUT PWSTR Buffer,
+                                   IN ULONG BufferChars);
+    virtual HRESULT OpenMapping(IN PCWSTR FilePath,
+                                OUT PULONG Size,
+                                OUT PWSTR LongPath,
+                                IN ULONG LongPathChars,
+                                OUT PVOID* Mapping);
+    virtual void    CloseMapping(PVOID Mapping);
+    virtual HRESULT GetImageHeaderInfo(IN HANDLE Process,
+                                       IN PCWSTR FilePath,
+                                       IN ULONG64 ImageBase,
+                                       OUT PULONG MachineType,
+                                       OUT PULONG Size,
+                                       OUT PULONG CheckSum,
+                                       OUT PULONG TimeDateStamp,
+                                       OUT PULONG TlsDirRva);
+    virtual HRESULT GetImageVersionInfo(IN HANDLE Process,
+                                        IN PCWSTR FilePath,
+                                        IN ULONG64 ImageBase,
+                                        OUT VS_FIXEDFILEINFO* Info);
+    virtual HRESULT GetImageDebugRecord(IN HANDLE Process,
+                                        IN PCWSTR FilePath,
+                                        IN ULONG64 ImageBase,
+                                        IN ULONG RecordType,
+                                        OUT OPTIONAL PVOID Data,
+                                        IN OUT PULONG DataLen);
+    virtual HRESULT EnumImageSections(IN HANDLE Process,
+                                      IN PCWSTR FilePath,
+                                      IN ULONG64 ImageBase,
+                                      IN ULONG WriteFlags,
+                                      IN MiniDumpProviderCallbacks*
+                                      Callback);
+    virtual HRESULT OpenThread(IN ULONG DesiredAccess,
+                               IN BOOL InheritHandle,
+                               IN ULONG ThreadId,
+                               OUT PHANDLE Handle);
+    virtual void    CloseThread(IN HANDLE Handle);
+    virtual ULONG   GetCurrentThreadId(void);
+    virtual ULONG   SuspendThread(IN HANDLE Thread);
+    virtual ULONG   ResumeThread(IN HANDLE Thread);
+    virtual HRESULT GetThreadContext(IN HANDLE Thread,
+                                     OUT PVOID Context,
+                                     IN ULONG ContextSize,
+                                     OUT PULONG64 CurrentPc,
+                                     OUT PULONG64 CurrentStack,
+                                     OUT PULONG64 CurrentStore);
+    virtual HRESULT GetTeb(IN HANDLE Thread,
+                           OUT PULONG64 Offset,
+                           OUT PULONG Size);
+    virtual HRESULT GetThreadTebInfo(IN HANDLE Process,
+                                     IN HANDLE Thread,
+                                     OUT PULONG64 Teb,
+                                     OUT PULONG SizeOfTeb,
+                                     OUT PULONG64 StackBase,
+                                     OUT PULONG64 StackLimit,
+                                     OUT PULONG64 StoreBase,
+                                     OUT PULONG64 StoreLimit,
+                                     OUT PULONG64 StaticTlsPointer);
+    virtual HRESULT GetThreadOsInfo(IN HANDLE Process,
+                                    IN HANDLE Thread,
+                                    IN OUT PUMINIPROV_THREAD_INFO Info);
+    virtual HRESULT GetPeb(IN HANDLE Process,
+                           OUT PULONG64 Offset,
+                           OUT PULONG Size);
+    virtual HRESULT GetProcessTimes(IN HANDLE Process,
+                                    OUT LPFILETIME Create,
+                                    OUT LPFILETIME User,
+                                    OUT LPFILETIME Kernel);
+    virtual HRESULT ReadVirtual(IN HANDLE Process,
+                                IN ULONG64 Offset,
+                                OUT PVOID Buffer,
+                                IN ULONG Request,
+                                OUT PULONG Done);
+    virtual HRESULT ReadAllVirtual(IN HANDLE Process,
+                                   IN ULONG64 Offset,
+                                   OUT PVOID Buffer,
+                                   IN ULONG Request);
+    virtual HRESULT QueryVirtual(IN HANDLE Process,
+                                 IN ULONG64 Offset,
+                                 OUT PMINIDUMP_MEMORY_INFO Info);
+    virtual HRESULT GetValidVirtualRange(IN HANDLE Process,
+                                         IN ULONG64 Start,
+                                         IN ULONG Size,
+                                         OUT PULONG64 ValidStart,
+                                         OUT PULONG ValidSize);
+    virtual HRESULT StartProcessEnum(IN HANDLE Process,
+                                     IN ULONG ProcessId);
+    virtual HRESULT EnumThreads(OUT PULONG ThreadId);
+    virtual HRESULT EnumModules(OUT PULONG64 Base,
+                                OUT PWSTR Path,
+                                IN ULONG PathChars);
+    virtual HRESULT EnumFunctionTables(OUT PULONG64 MinAddress,
+                                       OUT PULONG64 MaxAddress,
+                                       OUT PULONG64 BaseAddress,
+                                       OUT PULONG EntryCount,
+                                       OUT PVOID RawTable,
+                                       IN ULONG RawTableSize,
+                                       OUT PVOID* RawEntryHandle);
+    virtual HRESULT EnumFunctionTableEntries(IN PVOID RawTable,
+                                             IN ULONG RawTableSize,
+                                             IN PVOID RawEntryHandle,
+                                             OUT PVOID RawEntries,
+                                             IN ULONG RawEntriesSize);
+    virtual HRESULT EnumFunctionTableEntryMemory(IN ULONG64 TableBase,
+                                                 IN PVOID RawEntries,
+                                                 IN ULONG Index,
+                                                 OUT PULONG64 Start,
+                                                 OUT PULONG Size);
+    virtual HRESULT EnumUnloadedModules(OUT PWSTR Path,
+                                        IN ULONG PathChars,
+                                        OUT PULONG64 BaseOfModule,
+                                        OUT PULONG SizeOfModule,
+                                        OUT PULONG CheckSum,
+                                        OUT PULONG TimeDateStamp);
+    virtual void    FinishProcessEnum(void);
+    virtual HRESULT StartHandleEnum(IN HANDLE Process,
+                                    IN ULONG ProcessId,
+                                    OUT PULONG Count);
+    virtual HRESULT EnumHandles(OUT PULONG64 Handle,
+                                OUT PULONG Attributes,
+                                OUT PULONG GrantedAccess,
+                                OUT PULONG HandleCount,
+                                OUT PULONG PointerCount,
+                                OUT PWSTR TypeName,
+                                IN ULONG TypeNameChars,
+                                OUT PWSTR ObjectName,
+                                IN ULONG ObjectNameChars);
+    virtual void    FinishHandleEnum(void);
+
+    virtual HRESULT EnumPebMemory(IN HANDLE Process,
+                                  IN ULONG64 PebOffset,
+                                  IN ULONG PebSize,
+                                  IN MiniDumpProviderCallbacks* Callback);
+    virtual HRESULT EnumTebMemory(IN HANDLE Process,
+                                  IN HANDLE Thread,
+                                  IN ULONG64 TebOffset,
+                                  IN ULONG TebSize,
+                                  IN MiniDumpProviderCallbacks* Callback);
+
+    virtual HRESULT GetClrEnum(IN PWSTR DacDllName,
+                               IN struct ICLRDataTarget* Target,
+                               OUT struct ICLRDataEnumMemoryRegions** Enum);
+    virtual void    ReleaseClrEnum(IN struct ICLRDataEnumMemoryRegions* Enum);
+
+    virtual HRESULT WriteKernelMinidump(IN HANDLE File,
+                                        IN HANDLE Process,
+                                        IN ULONG NumThreads,
+                                        IN HANDLE* ThreadHandles,
+                                        IN ULONG BugCheckCode,
+                                        IN ULONG Flags);
+
+protected:
+    ThreadInfo* m_Thread;
+    ImageInfo* m_Image;
+    UnloadedModuleInfo* m_UnlEnum;
+    ULONG m_Handle;
+    ULONG64 m_FuncTableStart;
+    ULONG64 m_FuncTableHandle;
+};
+
+DbgSystemProvider::DbgSystemProvider(void)
+{
+}
+
+DbgSystemProvider::~DbgSystemProvider(void)
+{
+}
+
+void
+DbgSystemProvider::Release(void)
+{
+    delete this;
+}
+
+HRESULT
+DbgSystemProvider::GetCurrentTimeDate(OUT PULONG TimeDate)
+{
+    *TimeDate = FileTimeToTimeDateStamp(g_Target->GetCurrentTimeDateN());
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetCpuType(OUT PULONG Type,
+                              OUT PBOOL BackingStore)
+{
+    *Type = g_Target->m_MachineType;
+    *BackingStore = *Type == IMAGE_FILE_MACHINE_IA64;
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetCpuInfo(OUT PUSHORT Architecture,
+                              OUT PUSHORT Level,
+                              OUT PUSHORT Revision,
+                              OUT PUCHAR NumberOfProcessors,
+                              OUT PCPU_INFORMATION Info)
+{
+    DEBUG_PROCESSOR_IDENTIFICATION_ALL ProcId;
+    ULONG64 ProcFeatures[4];
+    ULONG NumVals;
+
+    *Architecture = (USHORT)ImageMachineToProcArch(g_Target->m_MachineType);
+    *NumberOfProcessors = (UCHAR)g_Target->m_NumProcessors;
+
+    //
+    // We've set the basic processor type so that the dump
+    // can be interpreted correctly.  Any other failures should
+    // not be considered fatal.
+    //
+
+    *Level = 0;
+    *Revision = 0;
+    ZeroMemory(Info, sizeof(*Info));
+
+    if (g_Target->GetProcessorId(0, &ProcId) != S_OK)
+    {
+        return S_OK;
+    }
+
+    switch(g_Target->m_MachineType)
+    {
+    case IMAGE_FILE_MACHINE_I386:
+        *Level = (USHORT)ProcId.X86.Family;
+        *Revision = ((USHORT)ProcId.X86.Model << 8) |
+            (USHORT)ProcId.X86.Stepping;
+
+        memcpy(Info->X86CpuInfo.VendorId, ProcId.X86.VendorString,
+               sizeof(Info->X86CpuInfo.VendorId));
+        if (SUCCEEDED(g_Target->
+                      GetSpecificProcessorFeatures(0,
+                                                   ProcFeatures,
+                                                   DIMA(ProcFeatures),
+                                                   &NumVals)) &&
+            NumVals >= 2)
+        {
+            Info->X86CpuInfo.VersionInformation =
+                (ULONG32)ProcFeatures[0];
+            Info->X86CpuInfo.FeatureInformation =
+                (ULONG32)ProcFeatures[1];
+
+            if (NumVals >= 3)
+            {
+                Info->X86CpuInfo.AMDExtendedCpuFeatures =
+                    (ULONG32)ProcFeatures[2];
+            }
+        }
+        break;
+
+    case IMAGE_FILE_MACHINE_IA64:
+        *Level = (USHORT)ProcId.Ia64.Model;
+        *Revision = (USHORT)ProcId.Ia64.Revision;
+        break;
+
+    case IMAGE_FILE_MACHINE_AMD64:
+        *Level = (USHORT)ProcId.Amd64.Family;
+        *Revision = ((USHORT)ProcId.Amd64.Model << 8) |
+            (USHORT)ProcId.Amd64.Stepping;
+        break;
+    }
+
+    if (g_Target->m_MachineType != IMAGE_FILE_MACHINE_I386 &&
+        SUCCEEDED(g_Target->
+                  GetGenericProcessorFeatures(0,
+                                              ProcFeatures,
+                                              DIMA(ProcFeatures),
+                                              &NumVals)))
+    {
+        C_ASSERT(sizeof(Info->OtherCpuInfo.ProcessorFeatures) <=
+                 sizeof(ProcFeatures));
+
+        if (NumVals < DIMA(ProcFeatures))
+        {
+            ZeroMemory(ProcFeatures + NumVals,
+                       (DIMA(ProcFeatures) - NumVals) *
+                       sizeof(ProcFeatures[0]));
+        }
+
+        memcpy(Info->OtherCpuInfo.ProcessorFeatures, ProcFeatures,
+               sizeof(Info->OtherCpuInfo.ProcessorFeatures));
+    }
+
+    return S_OK;
+}
+
+void
+DbgSystemProvider::GetContextSizes(OUT PULONG Size,
+                                   OUT PULONG RegScanOffset,
+                                   OUT PULONG RegScanCount)
+{
+    *Size = g_Target->m_TypeInfo.SizeTargetContext;
+    // Default reg scan.
+    *RegScanOffset = -1;
+    *RegScanCount = -1;
+}
+
+void
+DbgSystemProvider::GetPointerSize(OUT PULONG Size)
+{
+    *Size = g_Machine->m_Ptr64 ? 8 : 4;
+}
+
+void
+DbgSystemProvider::GetPageSize(OUT PULONG Size)
+{
+    *Size = g_Machine->m_PageSize;
+}
+
+void
+DbgSystemProvider::GetFunctionTableSizes(OUT PULONG TableSize,
+                                         OUT PULONG EntrySize)
+{
+    *TableSize = g_Target->m_TypeInfo.SizeDynamicFunctionTable;
+    *EntrySize = g_Target->m_TypeInfo.SizeRuntimeFunction;
+}
+
+void
+DbgSystemProvider::GetInstructionWindowSize(OUT PULONG Size)
+{
+    // Default window.
+    *Size = -1;
+}
+
+HRESULT
+DbgSystemProvider::GetOsInfo(OUT PULONG PlatformId,
+                             OUT PULONG Major,
+                             OUT PULONG Minor,
+                             OUT PULONG BuildNumber,
+                             OUT PUSHORT ProductType,
+                             OUT PUSHORT SuiteMask)
+{
+    *PlatformId = g_Target->m_PlatformId;
+    *Major = g_Target->m_Win32Major;
+    *Minor = g_Target->m_Win32Minor;
+    *BuildNumber = g_Target->m_BuildNumber;
+    *ProductType = (USHORT)g_Target->m_ProductType;
+    *SuiteMask = (USHORT)g_Target->m_SuiteMask;
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetOsCsdString(OUT PWSTR Buffer,
+                                  IN ULONG BufferChars)
+{
+    return CopyStringW(Buffer, g_Target->m_ServicePackString, BufferChars) ?
+        S_OK : E_INVALIDARG;
+}
+
+HRESULT
+DbgSystemProvider::OpenMapping(IN PCWSTR FilePath,
+                               OUT PULONG Size,
+                               OUT PWSTR LongPath,
+                               IN ULONG LongPathChars,
+                               OUT PVOID* ViewRet)
+{
+    // We could potentially support this via image file
+    // location but the minidump code is deliberately
+    // written to not rely to mappings.
+    return E_NOTIMPL;
+}
+
+void
+DbgSystemProvider::CloseMapping(PVOID Mapping)
+{
+    // No mapping support.
+    DBG_ASSERT(!Mapping);
+}
+
+HRESULT
+DbgSystemProvider::GetImageHeaderInfo(IN HANDLE _Process,
+                                      IN PCWSTR FilePath,
+                                      IN ULONG64 ImageBase,
+                                      OUT PULONG MachineType,
+                                      OUT PULONG Size,
+                                      OUT PULONG CheckSum,
+                                      OUT PULONG TimeDateStamp,
+                                      OUT PULONG TlsDirRva)
+{
+    ProcessInfo* Process = (ProcessInfo*)_Process;
+    
+    ImageInfo* Image = Process->
+        FindImageByOffset(ImageBase, FALSE);
+    if (!Image)
+    {
+        return E_NOINTERFACE;
+    }
+
+    Image->UpdateHeaderInfo(IMINFO_BASE_HEADER_ALL);
+
+    *MachineType = Image->m_HeaderInfo.MachineType;
+    *Size = Image->m_SizeOfImage;
+    *CheckSum = Image->m_HeaderInfo.CheckSum;
+    *TimeDateStamp = Image->m_HeaderInfo.TimeDateStamp;
+
+    IMAGE_NT_HEADERS64 Hdrs;
+
+    if (Process->m_Target->
+        ReadImageNtHeaders(Process, ImageBase, &Hdrs) == S_OK &&
+        Hdrs.OptionalHeader.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_TLS &&
+        Hdrs.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].Size > 0)
+    {
+        *TlsDirRva = Hdrs.OptionalHeader.
+            DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress;
+    }
+    else
+    {
+        *TlsDirRva = 0;
+    }
+    
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetImageVersionInfo(IN HANDLE Process,
+                                       IN PCWSTR FilePath,
+                                       IN ULONG64 ImageBase,
+                                       OUT VS_FIXEDFILEINFO* Info)
+{
+    return g_Target->
+        GetImageVersionInformation((ProcessInfo*)Process,
+                                   FilePath, ImageBase, L"\\",
+                                   Info, sizeof(*Info), NULL);
+}
+
+HRESULT
+DbgSystemProvider::GetImageDebugRecord(IN HANDLE Process,
+                                       IN PCWSTR FilePath,
+                                       IN ULONG64 ImageBase,
+                                       IN ULONG RecordType,
+                                       IN OUT OPTIONAL PVOID Data,
+                                       OUT PULONG DataLen)
+{
+    // We can rely on the default processing.
+    return E_NOINTERFACE;
+}
+
+HRESULT
+DbgSystemProvider::EnumImageSections(IN HANDLE Process,
+                                     IN PCWSTR FilePath,
+                                     IN ULONG64 ImageBase,
+                                     IN ULONG WriteFlags,
+                                     IN MiniDumpProviderCallbacks*
+                                     Callback)
+{
+    // We can rely on the default processing.
+    return E_NOINTERFACE;
+}
+
+HRESULT
+DbgSystemProvider::OpenThread(IN ULONG DesiredAccess,
+                              IN BOOL InheritHandle,
+                              IN ULONG ThreadId,
+                              OUT PHANDLE Handle)
+{
+    // Just use the thread pointer as the "handle".
+    *Handle = g_Process->FindThreadBySystemId(ThreadId);
+    return *Handle ? S_OK : E_NOINTERFACE;
+}
+
+void
+DbgSystemProvider::CloseThread(IN HANDLE Handle)
+{
+    // "Handle" is just a pointer so nothing to do.
+}
+
+ULONG
+DbgSystemProvider::GetCurrentThreadId(void)
+{
+    // The minidump code uses the current thread ID
+    // to avoid suspending the thread running the dump
+    // code.  That's not a problem for the debugger,
+    // so return an ID that will never match.
+    // SuspendThread will always be called so all
+    // suspend counts will be set properly.
+    return 0;
+}
+
+ULONG
+DbgSystemProvider::SuspendThread(IN HANDLE Thread)
+{
+    return ((ThreadInfo*)Thread)->m_SuspendCount;
+}
+
+ULONG
+DbgSystemProvider::ResumeThread(IN HANDLE Thread)
+{
+    return ((ThreadInfo*)Thread)->m_SuspendCount;
+}
+
+HRESULT
+DbgSystemProvider::GetThreadContext(IN HANDLE Thread,
+                                    OUT PVOID Context,
+                                    IN ULONG ContextSize,
+                                    OUT PULONG64 CurrentPc,
+                                    OUT PULONG64 CurrentStack,
+                                    OUT PULONG64 CurrentStore)
+{
+    HRESULT Status;
+    ADDR Addr;
+
+    g_Target->ChangeRegContext((ThreadInfo*)Thread);
+    if ((Status = g_Machine->
+         GetContextState(MCTX_CONTEXT)) != S_OK ||
+        (Status = g_Machine->
+         ConvertCanonContextToTarget(&g_Machine->m_Context,
+                                     g_Target->m_TypeInfo.SizeTargetContext,
+                                     Context)) != S_OK)
+    {
+        return Status;
+    }
+
+    g_Machine->GetPC(&Addr);
+    *CurrentPc = Flat(Addr);
+    g_Machine->GetSP(&Addr);
+    *CurrentStack = Flat(Addr);
+    if (g_Target->m_MachineType == IMAGE_FILE_MACHINE_IA64)
+    {
+        *CurrentStore = g_Machine->m_Context.IA64Context.RsBSP;
+    }
+    else
+    {
+        *CurrentStore = 0;
+    }
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetTeb(IN HANDLE Thread,
+                          OUT PULONG64 Offset,
+                          OUT PULONG Size)
+{
+    // Always save a whole page for the TEB.
+    *Size = g_Machine->m_PageSize;
+    return g_Target->
+        GetThreadInfoTeb((ThreadInfo*)Thread, 0, 0, Offset);
+}
+
+HRESULT
+DbgSystemProvider::GetThreadTebInfo(IN HANDLE Process,
+                                    IN HANDLE Thread,
+                                    OUT PULONG64 Teb,
+                                    OUT PULONG SizeOfTeb,
+                                    OUT PULONG64 StackBase,
+                                    OUT PULONG64 StackLimit,
+                                    OUT PULONG64 StoreBase,
+                                    OUT PULONG64 StoreLimit,
+                                    OUT PULONG64 StaticTlsPointer)
+{
+    HRESULT Status;
+    MEMORY_BASIC_INFORMATION64 MemInfo;
+    ULONG64 MemHandle;
+
+    if ((Status = g_Target->
+         GetThreadInfoTeb((ThreadInfo*)Thread, 0, 0, Teb)) != S_OK)
+    {
+        return Status;
+    }
+
+    //
+    // Try and save a whole page for the TEB.  If that's
+    // not possible, save as much as is there.
+    //
+
+    MemHandle = *Teb;
+    if ((Status = g_Target->
+         QueryMemoryRegion((ProcessInfo*)Process, &MemHandle,
+                           &MemInfo)) != S_OK)
+    {
+        return Status;
+    }
+
+    *SizeOfTeb = g_Machine->m_PageSize;
+    if (*Teb + *SizeOfTeb > MemInfo.BaseAddress + MemInfo.RegionSize)
+    {
+        *SizeOfTeb = (ULONG)
+            ((MemInfo.BaseAddress + MemInfo.RegionSize) - *Teb);
+    }
+
+    //
+    // Read the TIB for TLS information.
+    //
+
+    ULONG PtrSize = g_Machine->m_Ptr64 ? 8 : 4;
+
+    if ((Status = g_Target->
+         ReadPointer((ProcessInfo*)Process, g_Machine, *Teb + 11 * PtrSize,
+                     StaticTlsPointer)) != S_OK)
+    {
+        return Status;
+    }
+
+    THREAD_STACK_BOUNDS Bounds;
+    
+    if ((Status = g_Target->
+         GetThreadStackBounds((ThreadInfo*)Thread, *Teb, &Bounds)) != S_OK)
+    {
+        return Status;
+    }
+
+    *StackBase = Bounds.StackBase;
+    *StackLimit = Bounds.StackLimit;
+    *StoreBase = Bounds.StoreBase;
+    *StoreLimit = Bounds.StoreLimit;
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetThreadOsInfo(IN HANDLE Process,
+                                   IN HANDLE _Thread,
+                                   IN OUT PUMINIPROV_THREAD_INFO Info)
+{
+    HRESULT Status;
+    ThreadInfo* Thread = (ThreadInfo*)_Thread;
+
+    if ((Status = Thread->GetBasicInfo(DEBUG_TBINFO_ALL)) != S_OK)
+    {
+        return Status;
+    }
+
+    Info->ExitStatus = Thread->m_ExitStatus;
+
+    if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_PRIORITY_CLASS)
+    {
+        Info->PriorityClass = Thread->m_BasicInfo.PriorityClass;
+    }
+    if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_PRIORITY)
+    {
+        Info->Priority = Thread->m_BasicInfo.Priority;
+    }
+    if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_TIMES)
+    {
+        Info->CreateTime = Thread->m_BasicInfo.CreateTime;
+        Info->ExitTime = Thread->m_BasicInfo.ExitTime;
+        Info->KernelTime = Thread->m_BasicInfo.KernelTime;
+        Info->UserTime = Thread->m_BasicInfo.UserTime;
+    }
+    if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_START_OFFSET)
+    {
+        Info->StartAddress = Thread->m_BasicInfo.StartOffset;
+    }
+    if (Thread->m_BasicInfo.Valid & DEBUG_TBINFO_AFFINITY)
+    {
+        Info->Affinity = Thread->m_BasicInfo.Affinity;
+    }
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetPeb(IN HANDLE Process,
+                          OUT PULONG64 Offset,
+                          OUT PULONG Size)
+{
+    HRESULT Status;
+    MEMORY_BASIC_INFORMATION64 MemInfo;
+    ULONG64 MemHandle;
+
+    // The passed in process isn't very useful but we know
+    // that we're dumping the current state so always
+    // retrieve the PEB for the current thread.
+    if ((Status = g_Target->
+         GetProcessInfoPeb(g_Thread, 0, 0, Offset)) != S_OK)
+    {
+        return Status;
+    }
+
+    //
+    // Try and save a whole page for the PEB.  If that's
+    // not possible, save as much as is there.
+    //
+
+    MemHandle = *Offset;
+    if ((Status = g_Target->
+         QueryMemoryRegion((ProcessInfo*)Process, &MemHandle,
+                           &MemInfo)) != S_OK)
+    {
+        return Status;
+    }
+
+    *Size = g_Machine->m_PageSize;
+    if (*Offset + *Size > MemInfo.BaseAddress + MemInfo.RegionSize)
+    {
+        *Size = (ULONG)
+            ((MemInfo.BaseAddress + MemInfo.RegionSize) - *Offset);
+    }
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetProcessTimes(IN HANDLE Process,
+                                   OUT LPFILETIME Create,
+                                   OUT LPFILETIME User,
+                                   OUT LPFILETIME Kernel)
+{
+    HRESULT Status;
+    ULONG64 Create64, Exit64, User64, Kernel64;
+
+    if ((Status = g_Target->GetProcessTimes((ProcessInfo*)Process,
+                                            &Create64, &Exit64,
+                                            &Kernel64, &User64)) != S_OK)
+    {
+        return Status;
+    }
+
+    Create->dwHighDateTime = (ULONG)(Create64 >> 32);
+    Create->dwLowDateTime = (ULONG)Create64;
+    User->dwHighDateTime = (ULONG)(User64 >> 32);
+    User->dwLowDateTime = (ULONG)User64;
+    Kernel->dwHighDateTime = (ULONG)(Kernel64 >> 32);
+    Kernel->dwLowDateTime = (ULONG)Kernel64;
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::ReadVirtual(IN HANDLE Process,
+                               IN ULONG64 Offset,
+                               OUT PVOID Buffer,
+                               IN ULONG Request,
+                               OUT PULONG Done)
+{
+    return g_Target->ReadVirtual((ProcessInfo*)Process, Offset,
+                                 Buffer, Request, Done);
+}
+
+HRESULT
+DbgSystemProvider::ReadAllVirtual(IN HANDLE Process,
+                                  IN ULONG64 Offset,
+                                  OUT PVOID Buffer,
+                                  IN ULONG Request)
+{
+    return g_Target->ReadAllVirtual((ProcessInfo*)Process, Offset,
+                                    Buffer, Request);
+}
+
+HRESULT
+DbgSystemProvider::QueryVirtual(IN HANDLE Process,
+                                IN ULONG64 Offset,
+                                OUT PMINIDUMP_MEMORY_INFO Info)
+{
+    DBG_ASSERT(sizeof(MEMORY_BASIC_INFORMATION64) == sizeof(*Info));
+
+    return g_Target->
+        QueryMemoryRegion((ProcessInfo*)Process, &Offset,
+                          (PMEMORY_BASIC_INFORMATION64)Info);
+}
+
+HRESULT
+DbgSystemProvider::GetValidVirtualRange(IN HANDLE _Process,
+                                        IN ULONG64 Start,
+                                        IN ULONG Size,
+                                        OUT PULONG64 ValidStart,
+                                        OUT PULONG ValidSize)
+{
+    ProcessInfo* Process = (ProcessInfo*)_Process;
+    return g_Target->GetValidRegionVirtual(Process, Start, Size,
+                                           ValidStart, ValidSize);
+}
+
+HRESULT
+DbgSystemProvider::StartProcessEnum(IN HANDLE Process,
+                                    IN ULONG ProcessId)
+{
+    m_Thread = ((ProcessInfo*)Process)->m_ThreadHead;
+    m_Image = ((ProcessInfo*)Process)->m_ImageHead;
+
+    // Unloaded modules aren't critical, so just
+    // ignore them if the enumerator fails.
+    if (((ProcessInfo*)Process)->m_Target->
+        GetUnloadedModuleInfo(FALSE, &m_UnlEnum) != S_OK ||
+        m_UnlEnum->Initialize(g_Thread, MODULE_INFO_ALL_STD) != S_OK)
+    {
+        m_UnlEnum = NULL;
+    }
+
+    m_FuncTableStart = 0;
+    m_FuncTableHandle = 0;
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumThreads(OUT PULONG ThreadId)
+{
+    if (!m_Thread)
+    {
+        return S_FALSE;
+    }
+
+    *ThreadId = m_Thread->m_SystemId;
+    m_Thread = m_Thread->m_Next;
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumModules(OUT PULONG64 Base,
+                               OUT PWSTR Path,
+                               IN ULONG PathChars)
+{
+    if (!m_Image)
+    {
+        return S_FALSE;
+    }
+
+    *Base = m_Image->m_BaseOfImage;
+
+#ifdef UNICODE
+    CopyStringW(Path, m_Image->m_ImagePath, PathChars);
+#else
+    if (!MultiByteToWideChar(CP_ACP, 0,
+                             m_Image->m_ImagePath, -1,
+                             Path, PathChars))
+    {
+        return WIN32_LAST_STATUS();
+    }
+#endif
+
+    m_Image = m_Image->m_Next;
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumFunctionTables(OUT PULONG64 MinAddress,
+                                      OUT PULONG64 MaxAddress,
+                                      OUT PULONG64 BaseAddress,
+                                      OUT PULONG EntryCount,
+                                      OUT PVOID RawTable,
+                                      IN ULONG RawTableSize,
+                                      OUT PVOID* RawEntryHandle)
+{
+    HRESULT Status;
+    CROSS_PLATFORM_DYNAMIC_FUNCTION_TABLE CpTable;
+
+    if ((Status = g_Target->
+         EnumFunctionTables(g_Process,
+                            &m_FuncTableStart,
+                            &m_FuncTableHandle,
+                            MinAddress,
+                            MaxAddress,
+                            BaseAddress,
+                            EntryCount,
+                            &CpTable,
+                            RawEntryHandle)) != S_OK)
+    {
+        return Status;
+    }
+
+    memcpy(RawTable, &CpTable, RawTableSize);
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumFunctionTableEntries(IN PVOID RawTable,
+                                            IN ULONG RawTableSize,
+                                            IN PVOID RawEntryHandle,
+                                            OUT PVOID RawEntries,
+                                            IN ULONG RawEntriesSize)
+{
+    memcpy(RawEntries, RawEntryHandle, RawEntriesSize);
+    free(RawEntryHandle);
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumFunctionTableEntryMemory(IN ULONG64 TableBase,
+                                                IN PVOID RawEntries,
+                                                IN ULONG Index,
+                                                OUT PULONG64 Start,
+                                                OUT PULONG Size)
+{
+    return g_Machine->GetUnwindInfoBounds(g_Process,
+                                          TableBase,
+                                          RawEntries,
+                                          Index,
+                                          Start,
+                                          Size);
+}
+
+HRESULT
+DbgSystemProvider::EnumUnloadedModules(OUT PWSTR Path,
+                                       IN ULONG PathChars,
+                                       OUT PULONG64 BaseOfModule,
+                                       OUT PULONG SizeOfModule,
+                                       OUT PULONG CheckSum,
+                                       OUT PULONG TimeDateStamp)
+{
+    TCHAR UnlName[MAX_INFO_UNLOADED_NAME];
+    DEBUG_MODULE_PARAMETERS Params;
+
+    if (!m_UnlEnum ||
+        m_UnlEnum->GetEntry(UnlName, &Params) != S_OK)
+    {
+        return S_FALSE;
+    }
+
+#ifdef UNICODE
+    CopyStringW(Path, UnlName, PathChars);
+#else
+    if (!MultiByteToWideChar(CP_ACP, 0,
+                             UnlName, -1,
+                             Path, PathChars))
+    {
+        return WIN32_LAST_STATUS();
+    }
+#endif
+
+    *BaseOfModule = Params.Base;
+    *SizeOfModule = Params.Size;
+    *CheckSum = Params.Checksum;
+    *TimeDateStamp = Params.TimeDateStamp;
+
+    return S_OK;
+}
+
+void
+DbgSystemProvider::FinishProcessEnum(void)
+{
+    // Nothing to do.
+}
+
+HRESULT
+DbgSystemProvider::StartHandleEnum(IN HANDLE Process,
+                                   IN ULONG ProcessId,
+                                   OUT PULONG Count)
+{
+    m_Handle = 4;
+
+    // If the target doesn't have handle data don't make
+    // it a fatal error, just don't enumerate anything.
+    if (g_Target->
+        ReadHandleData((ProcessInfo*)Process, 0,
+                       DEBUG_HANDLE_DATA_TYPE_HANDLE_COUNT,
+                       Count, sizeof(*Count), NULL) != S_OK)
+    {
+        *Count = 0;
+    }
+
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumHandles(OUT PULONG64 Handle,
+                               OUT PULONG Attributes,
+                               OUT PULONG GrantedAccess,
+                               OUT PULONG HandleCount,
+                               OUT PULONG PointerCount,
+                               OUT PWSTR TypeName,
+                               IN ULONG TypeNameChars,
+                               OUT PWSTR ObjectName,
+                               IN ULONG ObjectNameChars)
+{
+    DEBUG_HANDLE_DATA_BASIC BasicInfo;
+
+    for (;;)
+    {
+        if (m_Handle >= (1 << 24))
+        {
+            return S_FALSE;
+        }
+
+        // If we can't get the basic info and type there isn't much
+        // point in writing anything out so skip the handle.
+        if (g_Target->
+            ReadHandleData(g_Process, m_Handle,
+                           DEBUG_HANDLE_DATA_TYPE_BASIC,
+                           &BasicInfo, sizeof(BasicInfo), NULL) == S_OK &&
+            SUCCEEDED(g_Target->
+                      ReadHandleData(g_Process, m_Handle,
+                                     DEBUG_HANDLE_DATA_TYPE_TYPE_NAME_WIDE,
+                                     TypeName,
+                                     TypeNameChars * sizeof(*TypeName),
+                                     NULL)))
+        {
+            break;
+        }
+
+        m_Handle += 4;
+    }
+
+    // Try and get the object name.
+    if (FAILED(g_Target->
+               ReadHandleData(g_Process, m_Handle,
+                              DEBUG_HANDLE_DATA_TYPE_OBJECT_NAME_WIDE,
+                              ObjectName,
+                              ObjectNameChars * sizeof(*ObjectName),
+                              NULL)))
+    {
+        *ObjectName = 0;
+    }
+
+    *Handle = m_Handle;
+    *Attributes = BasicInfo.Attributes;
+    *GrantedAccess = BasicInfo.GrantedAccess;
+    *HandleCount = BasicInfo.HandleCount;
+    *PointerCount = BasicInfo.PointerCount;
+
+    m_Handle += 4;
+    return S_OK;
+}
+
+void
+DbgSystemProvider::FinishHandleEnum(void)
+{
+    // Nothing to do.
+}
+
+HRESULT
+DbgSystemProvider::EnumPebMemory(IN HANDLE Process,
+                                 IN ULONG64 PebOffset,
+                                 IN ULONG PebSize,
+                                 IN MiniDumpProviderCallbacks* Callback)
+{
+    if (g_Target->m_SystemVersion <= NT_SVER_START ||
+        g_Target->m_SystemVersion >= NT_SVER_END)
+    {
+        // Basic Win32 doesn't have a defined PEB.
+        return S_OK;
+    }
+
+    // XXX drewb - This requires a whole set of constants
+    // to abstract data structure locations.  Leave it
+    // for when we really need it.
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::EnumTebMemory(IN HANDLE Process,
+                                 IN HANDLE Thread,
+                                 IN ULONG64 TebOffset,
+                                 IN ULONG TebSize,
+                                 IN MiniDumpProviderCallbacks* Callback)
+{
+    if (g_Target->m_SystemVersion <= NT_SVER_START ||
+        g_Target->m_SystemVersion >= NT_SVER_END)
+    {
+        // Basic Win32 doesn't have a defined TEB beyond
+        // the TIB.  The TIB can reference fiber data but
+        // that's NT-specific.
+        return S_OK;
+    }
+
+    // XXX drewb - This requires a whole set of constants
+    // to abstract data structure locations.  Leave it
+    // for when we really need it.
+    return S_OK;
+}
+
+HRESULT
+DbgSystemProvider::GetClrEnum(IN PWSTR DacDllName,
+                              IN struct ICLRDataTarget* Target,
+                              OUT struct ICLRDataEnumMemoryRegions** Enum)
+{
+    HRESULT Status;
+
+    // We're providing all of the system services to
+    // the minidump code so we know that its state
+    // matches what's available directly from the debugger's
+    // state.  Just ignore the given DLL name and
+    // service interface in favor of the one the
+    // debugger already has.
+    if ((Status = g_Process->LoadClrDebugDll(NULL)) != S_OK ||
+        (Status = g_Process->m_ClrProcess->
+         QueryInterface(__uuidof(ICLRDataEnumMemoryRegions),
+                        (void**)Enum)) != S_OK)
+    {
+        return Status;
+    }
+
+    return S_OK;
+}
+
+void
+DbgSystemProvider::ReleaseClrEnum(IN struct ICLRDataEnumMemoryRegions* Enum)
+{
+    Enum->Release();
+}
+
+HRESULT
+DbgSystemProvider::WriteKernelMinidump(IN HANDLE File,
+                                       IN HANDLE Process,
+                                       IN ULONG NumThreads,
+                                       IN PHANDLE ThreadHandles,
+                                       IN ULONG BugCheckCode,
+                                       IN ULONG Flags)
+{
+    // We could support this in the live user debug case
+    // by remoting NtSystemDebugControl via IUserDebugServices
+    // but it's not important right now.
+    return E_NOINTERFACE;
+}
+
+class DbgStatusProvider : public MiniDumpStatusProvider
+{
+public:
+    DbgStatusProvider(ULONG Filter)
+    {
+        m_Filter = Filter;
+    }
+
+    virtual void Release(void);
+
+    virtual void Status(ULONG Flags, PCSTR Format, ...);
+
+    ULONG m_Filter;
+};
+
+void
+DbgStatusProvider::Release(void)
+{
+    delete this;
+}
+
+void
+DbgStatusProvider::Status(ULONG Flags, PCSTR Format, ...)
+{
+    if (Flags & m_Filter)
+    {
+        ULONG Mask = 0;
+        va_list Args;
+
+        if (Flags & UMINIPROV_ERROR)
+        {
+            Mask |= DEBUG_OUTPUT_ERROR;
+        }
+        if (Flags & (UMINIPROV_WARNING | UMINIPROV_DATA_MISSING))
+        {
+            Mask |= DEBUG_OUTPUT_WARNING;
+        }
+        if (Flags & UMINIPROV_STATUS)
+        {
+            Mask |= DEBUG_OUTPUT_NORMAL;
+        }
+
+        va_start(Args, Format);
+        MaskOutVaA(Mask, Format, Args, FALSE);
+        va_end(Args);
+        MaskOut(Mask, _T("\n"));
+    }
+}
+
+PMINIDUMP_EXCEPTION_INFORMATION64
+CreateMiniExceptionInformation(DUMP_WRITE_ARGS* Args,
+                               PMINIDUMP_EXCEPTION_INFORMATION64 ExInfo,
+                               PVOID ExRecord,
+                               PCROSS_PLATFORM_CONTEXT Context)
+{
+    MachineInfo* Machine;
+    JIT_DEBUG_INFO64 Info;
+    BOOL ExEvent = 
+        g_LastEventType == DEBUG_EVENT_EXCEPTION &&
+        g_Process == g_EventProcess;
+    
+    // If the last event was not an exception and
+    // we don't have override information don't
+    // put any exception info in the dump.
+    if (!Args->JitDebugInfoAddr &&
+        (!Args->ExContextAddr || !Args->ExRecordAddr) &&
+        !ExEvent)
+    {
+        return NULL;
+    }
+
+    //
+    // If the user provided the address of a JIT_DEBUG_INFO
+    // use that as the exception information to carry in
+    // the minidump.  This makes it possible to take a minidump
+    // from AeDebug with JIT_DEBUG_INFO that is the same as
+    // if the process had been debugged and JIT_DEBUG_INFO hadn't been used.
+    //
+    
+    if (Args->JitDebugInfoAddr)
+    {
+        if (g_Target->ReadJitDebugInfo(g_Process, Args->JitDebugInfoAddr,
+                                       &Machine, &Info) != S_OK)
+        {
+            ErrOut(_T("Unable to read JIT_DEBUG_INFO at %s\n"),
+                   FormatAddr64(Args->JitDebugInfoAddr));
+            return NULL;
+        }
+        if (!Info.ContextRecord ||
+            !Info.ExceptionRecord)
+        {
+            ErrOut(_T("JIT_DEBUG_INFO is invalid\n"));
+            return NULL;
+        }
+        if (Machine != g_Machine)
+        {
+            ErrOut(_T("JIT_DEBUG_INFO machine must ")
+                   _T("match the native machine\n"));
+            return NULL;
+        }
+    }
+    else
+    {
+        Info.ContextRecord = Args->ExContextAddr;
+        Info.ExceptionRecord = Args->ExRecordAddr;
+        Info.dwThreadID = Args->ExThreadId ?
+            Args->ExThreadId : g_EventThreadSysId;
+    }
+
+    if (Info.ContextRecord)
+    {
+        if (g_Target->ReadAllVirtual(g_Process, Info.ContextRecord,
+                                     Context, g_Target->m_TypeInfo.
+                                     SizeTargetContext) != S_OK)
+        {
+            ErrOut(_T("Unable to read context record at %s\n"),
+                   FormatAddr64(Info.ContextRecord));
+            return NULL;
+        }
+    }
+    else
+    {
+        g_Target->ChangeRegContext(g_EventThread);
+        if (g_Machine->GetContextState(MCTX_CONTEXT) != S_OK)
+        {
+            ErrOut(_T("Unable to get event thread context\n"));
+            return NULL;
+        }
+        *Context = g_Machine->m_Context;
+    }
+
+    if (Info.ExceptionRecord)
+    {
+        if (g_Target->ReadAllVirtual(g_Process, Info.ExceptionRecord,
+                                     ExRecord, g_Machine->m_Ptr64 ?
+                                     sizeof(EXCEPTION_RECORD64) :
+                                     sizeof(EXCEPTION_RECORD32)) != S_OK)
+        {
+            ErrOut(_T("Unable to read exception record at %s\n"),
+                   FormatAddr64(Info.ExceptionRecord));
+            return NULL;
+        }
+    }
+    else
+    {
+        if (g_EventMachine->m_Ptr64)
+        {
+            memcpy(ExRecord, &g_LastEventInfo.Exception.ExceptionRecord,
+                   sizeof(g_LastEventInfo.Exception.ExceptionRecord));
+        }
+        else
+        {
+            ExceptionRecord64To32(&g_LastEventInfo.Exception.ExceptionRecord,
+                                  (PEXCEPTION_RECORD32)ExRecord);
+        }
+    }
+        
+    ExInfo->ThreadId = Info.dwThreadID;
+    ExInfo->ClientPointers = FALSE;
+    ExInfo->ExceptionRecord = (LONG_PTR)ExRecord;
+    ExInfo->ContextRecord = (LONG_PTR)Context;
+
+    return ExInfo;
+}
+
+BOOL WINAPI
+UserMiniCallback(IN PVOID CallbackParam,
+                 IN CONST PMINIDUMP_CALLBACK_INPUT CallbackInput,
+                 IN OUT PMINIDUMP_CALLBACK_OUTPUT CallbackOutput)
+{
+    DUMP_WRITE_ARGS* Args = (DUMP_WRITE_ARGS*)CallbackParam;
+    
+    switch(CallbackInput->CallbackType)
+    {
+    case IncludeModuleCallback:
+        if (Args->InternalFlags & UMINI_MICRO)
+        {
+            // Mask off all flags other than the basic write flag.
+            CallbackOutput->ModuleWriteFlags &= ModuleWriteModule;
+        }
+        break;
+    case ModuleCallback:
+        if (Args->InternalFlags & UMINI_MICRO)
+        {
+            // Eliminate all unreferenced modules.
+            if (!(CallbackOutput->ModuleWriteFlags & ModuleReferencedByMemory))
+            {
+                CallbackOutput->ModuleWriteFlags = 0;
+            }
+        }
+        break;
+    case IncludeThreadCallback:
+        if (Args->InternalFlags & UMINI_MICRO)
+        {
+            if (CallbackInput->IncludeThread.ThreadId != g_EventThreadSysId)
+            {
+                return FALSE;
+            }
+
+            // Reduce write to the minimum of information
+            // necessary for a stack walk.
+            CallbackOutput->ThreadWriteFlags &= ~ThreadWriteInstructionWindow;
+        }
+        break;
+
+    case CancelCallback:
+        CallbackOutput->Cancel = CheckUserInterrupt();
+        CallbackOutput->CheckCancel = TRUE;
+        break;
+
+    case WriteKernelMinidumpCallback:
+        if (Args->InternalFlags & UMINI_WRITE_KMINI)
+        {
+            Args->ExtraFileHandle =
+                CreateFile(Args->ExtraFileName, GENERIC_WRITE, 0,
+                           NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+            if (Args->ExtraFileHandle == INVALID_HANDLE_VALUE ||
+                !Args->ExtraFileHandle)
+            {
+                Args->ExtraFileHandle = NULL;
+                ErrOut(_T("Unable to create kernel minidump file, %s\n"),
+                       FormatStatusCode(WIN32_LAST_STATUS()));
+            }
+            else
+            {
+                CallbackOutput->Handle = Args->ExtraFileHandle;
+            }
+        }
+        break;
+
+    case KernelMinidumpStatusCallback:
+        if (Args->ExtraFileHandle)
+        {
+            CloseHandle(Args->ExtraFileHandle);
+            Args->ExtraFileHandle = NULL;
+
+            if (CallbackInput->Status == S_OK)
+            {
+                dprintf(_T("Wrote kernel minidump '%s'\n"),
+                        Args->ExtraFileName);
+            }
+            else
+            {
+                WideDeleteFile(Args->ExtraFileName);
+            }
+        }
+        break;
+    }
+
+    return TRUE;
+}
+
+HRESULT
+UserMiniDumpTargetInfo::Write(HANDLE hFile, DUMP_WRITE_ARGS* Args)
+{
+    if (!IS_USER_TARGET(g_Target))
+    {
+        ErrOut(_T("User minidumps can only be written ")
+               _T("in user-mode sessions\n"));
+        return E_UNEXPECTED;
+    }
+
+    dprintf(_T("mini user dump\n"));
+    FlushCallbacks();
+
+    // Clear interrupt status.
+    CheckUserInterrupt();
+    
+    HRESULT Status;
+    MINIDUMP_EXCEPTION_INFORMATION64 ExInfoBuf, *ExInfo;
+    EXCEPTION_RECORD64 ExRecord;
+    CROSS_PLATFORM_CONTEXT Context;
+    ULONG MiniType;
+    MINIDUMP_USER_STREAM UserStreams[2];
+    MINIDUMP_USER_STREAM_INFORMATION UserStreamInfo;
+    MINIDUMP_CALLBACK_INFORMATION CallbackBuffer;
+
+    MiniType = MiniDumpNormal;
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_FULL_MEMORY)
+    {
+        MiniType |= MiniDumpWithFullMemory;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_HANDLE_DATA)
+    {
+        MiniType |= MiniDumpWithHandleData;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_UNLOADED_MODULES)
+    {
+        MiniType |= MiniDumpWithUnloadedModules;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_INDIRECT_MEMORY)
+    {
+        MiniType |= MiniDumpWithIndirectlyReferencedMemory;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_DATA_SEGMENTS)
+    {
+        MiniType |= MiniDumpWithDataSegs;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_FILTER_MEMORY)
+    {
+        MiniType |= MiniDumpFilterMemory;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_FILTER_PATHS)
+    {
+        MiniType |= MiniDumpFilterModulePaths;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_PROCESS_THREAD_DATA)
+    {
+        MiniType |= MiniDumpWithProcessThreadData;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_PRIVATE_READ_WRITE_MEMORY)
+    {
+        MiniType |= MiniDumpWithPrivateReadWriteMemory;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_NO_OPTIONAL_DATA)
+    {
+        MiniType |= MiniDumpWithoutOptionalData;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_FULL_MEMORY_INFO)
+    {
+        MiniType |= MiniDumpWithFullMemoryInfo;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_THREAD_INFO)
+    {
+        MiniType |= MiniDumpWithThreadInfo;
+    }
+    if (Args->FormatFlags & DEBUG_FORMAT_USER_SMALL_CODE_SEGMENTS)
+    {
+        MiniType |= MiniDumpWithCodeSegs;
+    }
+
+    UserStreamInfo.UserStreamCount = 0;
+    UserStreamInfo.UserStreamArray = UserStreams;
+    if (Args->CommentA != NULL)
+    {
+        UserStreams[UserStreamInfo.UserStreamCount].Type =
+            CommentStreamA;
+        UserStreams[UserStreamInfo.UserStreamCount].BufferSize =
+            strlen(Args->CommentA) + 1;
+        UserStreams[UserStreamInfo.UserStreamCount].Buffer =
+            (PVOID)Args->CommentA;
+        UserStreamInfo.UserStreamCount++;
+    }
+    if (Args->CommentW != NULL)
+    {
+        UserStreams[UserStreamInfo.UserStreamCount].Type =
+            CommentStreamW;
+        UserStreams[UserStreamInfo.UserStreamCount].BufferSize =
+            (wcslen(Args->CommentW) + 1) * sizeof(WCHAR);
+        UserStreams[UserStreamInfo.UserStreamCount].Buffer =
+            (PVOID)Args->CommentW;
+        UserStreamInfo.UserStreamCount++;
+    }
+
+    ExInfo = CreateMiniExceptionInformation(Args, &ExInfoBuf,
+                                            &ExRecord, &Context);
+
+    CallbackBuffer.CallbackRoutine = UserMiniCallback;
+    CallbackBuffer.CallbackParam = Args;
+    
+    if (Args->InternalFlags & UMINI_MICRO)
+    {
+        // This case isn't expected to be used by users,
+        // it's for testing of the microdump support.
+        ExInfo = NULL;
+        MiniType |= MiniDumpScanMemory;
+    }
+
+    HANDLE ProcHandle;
+    MiniDumpSystemProvider* SysProv = NULL;
+    MiniDumpOutputProvider* OutProv = NULL;
+    MiniDumpAllocationProvider* AllocProv = NULL;
+    DbgStatusProvider StatusProv(UMINIPROV_WARNING |
+                                 UMINIPROV_ERROR);
+
+    if ((Status =
+         MiniDumpCreateLiveAllocationProvider(&AllocProv)) != S_OK ||
+        (Status =
+         MiniDumpCreateFileOutputProvider(AllocProv, hFile,
+                                          &OutProv)) != S_OK)
+    {
+        goto Exit;
+    }
+
+    //
+    // If we're live we can let the official minidump
+    // code do all the work.  If not, hook up a provider
+    // that uses debugger information.  This provider
+    // could always be used but the default live-system
+    // provider offers slightly more information so
+    // check and use that if possible.
+    //
+
+    if (IS_LIVE_USER_TARGET(g_Target) &&
+        ((LiveUserTargetInfo*)g_Target)->m_Local &&
+        !(Args->InternalFlags & UMINI_FORCE_DBG))
+    {
+        if ((Status =
+             MiniDumpCreateLiveSystemProvider(AllocProv, &SysProv)) != S_OK)
+        {
+            goto Exit;
+        }
+
+        ProcHandle = OS_HANDLE(g_Process->m_SysHandle);
+    }
+    else
+    {
+        DbgSystemProvider* DbgSysProv = new DbgSystemProvider;
+        if (!DbgSysProv)
+        {
+            Status = E_OUTOFMEMORY;
+            goto Exit;
+        }
+
+        SysProv = DbgSysProv;
+        ProcHandle = (HANDLE)g_Process;
+    }
+
+    Status = MiniDumpProvideDump(ProcHandle, g_Process->m_SystemId,
+                                 SysProv, OutProv, AllocProv, &StatusProv,
+                                 MiniType, ExInfo,
+                                 &UserStreamInfo, &CallbackBuffer);
+
+ Exit:
+
+    if (Status != S_OK)
+    {
+        ErrOut(_T("Dump creation failed, %s\n    \"%s\"\n"),
+               FormatStatusCode(Status), FormatStatus(Status));
+    }
+
+    if (SysProv)
+    {
+        SysProv->Release();
+    }
+    if (OutProv)
+    {
+        OutProv->Release();
+    }
+    if (AllocProv)
+    {
+        AllocProv->Release();
+    }
+
+    // Reset the current register context in case
+    // it was changed at some point.
+    g_Target->ChangeRegContext(g_Thread);
+
+    return Status;
+}
+
+//-------------------------------------------------------------------
+//  initialize the dump headers
+//
+
+#define MINIDUMP_BUGCHECK 0x10000000
+
+void
+KernelDumpTargetInfo::InitDumpHeader32(PDUMP_HEADER32 Hdr,
+                                       PCSTR CommentA,
+                                       PCWSTR CommentW,
+                                       ULONG BugCheckCodeModifier)
+{
+    ULONG64 Data[4];
+    PULONG  FillPtr = (PULONG)Hdr;
+
+    while (FillPtr < (PULONG)(Hdr + 1))
+    {
+        *FillPtr++ = DUMP_SIGNATURE32;
+    }
+
+    Hdr->Signature           = DUMP_SIGNATURE32;
+    Hdr->ValidDump           = DUMP_VALID_DUMP32;
+    Hdr->MajorVersion        = g_Target->m_KdVersion.MajorVersion;
+    Hdr->MinorVersion        = g_Target->m_KdVersion.MinorVersion;
+
+    g_Target->ReadDirectoryTableBase(Data);
+    Hdr->DirectoryTableBase  = (ULONG)Data[0];
+
+    Hdr->PfnDataBase         =
+        (ULONG)g_Target->m_KdDebuggerData.MmPfnDatabase;
+    Hdr->PsLoadedModuleList  =
+        (ULONG)g_Target->m_KdDebuggerData.PsLoadedModuleList;
+    Hdr->PsActiveProcessHead =
+        (ULONG)g_Target->m_KdDebuggerData.PsActiveProcessHead;
+    Hdr->MachineImageType    = g_Target->m_KdVersion.MachineType;
+    Hdr->NumberProcessors    = g_Target->m_NumProcessors;
+
+    g_Target->ReadBugCheckData(&(Hdr->BugCheckCode), Data);
+    Hdr->BugCheckCode       |= BugCheckCodeModifier;
+    Hdr->BugCheckParameter1  = (ULONG)Data[0];
+    Hdr->BugCheckParameter2  = (ULONG)Data[1];
+    Hdr->BugCheckParameter3  = (ULONG)Data[2];
+    Hdr->BugCheckParameter4  = (ULONG)Data[3];
+
+    Hdr->PaeEnabled          = g_Target->m_KdDebuggerData.PaeEnabled;
+    Hdr->KdDebuggerDataBlock = (ULONG)g_Target->m_KdDebuggerDataOffset;
+
+    if (IS_CONTEXT_POSSIBLE(g_Target))
+    {
+        g_Machine->GetContextState(MCTX_CONTEXT);
+        g_Machine->ConvertCanonContextToTarget(&g_Machine->m_Context,
+                                               sizeof(Hdr->ContextRecord),
+                                               Hdr->ContextRecord);
+    }
+    else
+    {
+        ZeroMemory(Hdr->ContextRecord, sizeof(Hdr->ContextRecord));
+    }
+
+    if (g_LastEventType == DEBUG_EVENT_EXCEPTION)
+    {
+        // Use the exception record from the last event.
+        ExceptionRecord64To32(&g_LastEventInfo.Exception.ExceptionRecord,
+                              &Hdr->Exception);
+    }
+    else
+    {
+        ADDR PcAddr;
+
+        // Fake a breakpoint exception.
+        ZeroMemory(&Hdr->Exception, sizeof(Hdr->Exception));
+        Hdr->Exception.ExceptionCode = STATUS_BREAKPOINT;
+        if (IS_CONTEXT_POSSIBLE(g_Target))
+        {
+            g_Machine->GetPC(&PcAddr);
+            Hdr->Exception.ExceptionAddress = (ULONG)Flat(PcAddr);
+        }
+    }
+
+    Hdr->RequiredDumpSpace.QuadPart = TRIAGE_DUMP_SIZE32 +
+        DumpGetTaggedDataSize();
+
+    Hdr->SystemTime.QuadPart = g_Target->GetCurrentTimeDateN();
+    Hdr->SystemUpTime.QuadPart = g_Target->GetCurrentSystemUpTimeN();
+
+    if (g_Target->m_ProductType != INVALID_PRODUCT_TYPE)
+    {
+        Hdr->ProductType = g_Target->m_ProductType;
+        Hdr->SuiteMask = g_Target->m_SuiteMask;
+    }
+
+    PSTR ConvComment = NULL;
+
+    if (!CommentA && CommentW)
+    {
+        if (WideToAnsi(CommentW, &ConvComment) != S_OK)
+        {
+            ConvComment = NULL;
+        }
+        else
+        {
+            CommentA = ConvComment;
+        }
+    }
+    if (CommentA != NULL && CommentA[0])
+    {
+        CopyString(Hdr->Comment, CommentA, DIMA(Hdr->Comment));
+    }
+    FreeAnsi(ConvComment);
+}
+
+void
+KernelDumpTargetInfo::InitDumpHeader64(PDUMP_HEADER64 Hdr,
+                                       PCSTR CommentA,
+                                       PCWSTR CommentW,
+                                       ULONG BugCheckCodeModifier)
+{
+    ULONG64 Data[4];
+    PULONG  FillPtr = (PULONG)Hdr;
+
+    while (FillPtr < (PULONG)(Hdr + 1))
+    {
+        *FillPtr++ = DUMP_SIGNATURE32;
+    }
+
+    Hdr->Signature           = DUMP_SIGNATURE64;
+    Hdr->ValidDump           = DUMP_VALID_DUMP64;
+    Hdr->MajorVersion        = g_Target->m_KdVersion.MajorVersion;
+    Hdr->MinorVersion        = g_Target->m_KdVersion.MinorVersion;
+
+    // IA64 has several page directories.  The defined
+    // behavior is to put the kernel page directory
+    // in the dump header as that's the one that can
+    // be most useful when first initializing the dump.
+    if (g_Target->m_EffMachineType == IMAGE_FILE_MACHINE_IA64)
+    {
+        ULONG Next;
+
+        if (g_Machine->
+            SetPageDirectory(g_Thread, PAGE_DIR_KERNEL, 0, &Next) != S_OK)
+        {
+            ErrOut(_T("Unable to update the kernel dirbase\n"));
+            Data[0] = 0;
+        }
+        else
+        {
+            Data[0] = g_Machine->m_PageDirectories[PAGE_DIR_KERNEL];
+        }
+    }
+    else
+    {
+        g_Target->ReadDirectoryTableBase(Data);
+    }
+    Hdr->DirectoryTableBase  = Data[0];
+
+    Hdr->PfnDataBase         =
+        g_Target->m_KdDebuggerData.MmPfnDatabase;
+    Hdr->PsLoadedModuleList  =
+        g_Target->m_KdDebuggerData.PsLoadedModuleList;
+    Hdr->PsActiveProcessHead =
+        g_Target->m_KdDebuggerData.PsActiveProcessHead;
+    Hdr->MachineImageType    = g_Target->m_KdVersion.MachineType;
+    Hdr->NumberProcessors    = g_Target->m_NumProcessors;
+
+    g_Target->ReadBugCheckData(&(Hdr->BugCheckCode), Data);
+    Hdr->BugCheckCode       |= BugCheckCodeModifier;
+    Hdr->BugCheckParameter1  = Data[0];
+    Hdr->BugCheckParameter2  = Data[1];
+    Hdr->BugCheckParameter3  = Data[2];
+    Hdr->BugCheckParameter4  = Data[3];
+
+    Hdr->KdDebuggerDataBlock = g_Target->m_KdDebuggerDataOffset;
+
+    if (IS_CONTEXT_POSSIBLE(g_Target))
+    {
+        g_Machine->GetContextState(MCTX_CONTEXT);
+        g_Machine->ConvertCanonContextToTarget(&g_Machine->m_Context,
+                                               sizeof(Hdr->ContextRecord),
+                                               Hdr->ContextRecord);
+    }
+    else
+    {
+        ZeroMemory(Hdr->ContextRecord, sizeof(Hdr->ContextRecord));
+    }
+
+    if (g_LastEventType == DEBUG_EVENT_EXCEPTION)
+    {
+        // Use the exception record from the last event.
+        Hdr->Exception = g_LastEventInfo.Exception.ExceptionRecord;
+    }
+    else
+    {
+        ADDR PcAddr;
+
+        // Fake a breakpoint exception.
+        ZeroMemory(&Hdr->Exception, sizeof(Hdr->Exception));
+        Hdr->Exception.ExceptionCode = STATUS_BREAKPOINT;
+        if (IS_CONTEXT_POSSIBLE(g_Target))
+        {
+            g_Machine->GetPC(&PcAddr);
+            Hdr->Exception.ExceptionAddress = Flat(PcAddr);
+        }
+    }
+
+    Hdr->RequiredDumpSpace.QuadPart = TRIAGE_DUMP_SIZE64 +
+        DumpGetTaggedDataSize();
+
+    Hdr->SystemTime.QuadPart = g_Target->GetCurrentTimeDateN();
+    Hdr->SystemUpTime.QuadPart = g_Target->GetCurrentSystemUpTimeN();
+
+    if (g_Target->m_ProductType != INVALID_PRODUCT_TYPE)
+    {
+        Hdr->ProductType = g_Target->m_ProductType;
+        Hdr->SuiteMask = g_Target->m_SuiteMask;
+    }
+
+    PSTR ConvComment = NULL;
+
+    if (!CommentA && CommentW)
+    {
+        if (WideToAnsi(CommentW, &ConvComment) != S_OK)
+        {
+            ConvComment = NULL;
+        }
+        else
+        {
+            CommentA = ConvComment;
+        }
+    }
+    if (CommentA != NULL && CommentA[0])
+    {
+        CopyString(Hdr->Comment, CommentA, DIMA(Hdr->Comment));
+    }
+    FreeAnsi(ConvComment);
+}
+
+#define DUMP_BLOB_ALIGN 8
+
+ULONG
+KernelDumpTargetInfo::DumpGetTaggedDataSize(void)
+{
+    HRESULT Status;
+    ULONG64 HdrOffs;
+    DUMP_BLOB_HEADER BlobHdr;
+    ULONG Size;
+
+    if ((Status = GetFirstBlobHeaderOffset(&HdrOffs)) != S_OK)
+    {
+        return 0;
+    }
+
+    Size = sizeof(DUMP_BLOB_FILE_HEADER);
+
+    //
+    // Loop over every entry and accumulate the size.
+    // We assume only 8-byte-alignment post-padding
+    // will be necessary.
+    //
+
+    while (ReadBlobHeaderAtOffset(HdrOffs, &BlobHdr) == S_OK)
+    {
+        Size += sizeof(BlobHdr) +
+            ((BlobHdr.DataSize + (DUMP_BLOB_ALIGN - 1)) &
+             ~(DUMP_BLOB_ALIGN - 1));
+        
+        HdrOffs += BlobHdr.HeaderSize + BlobHdr.PrePad +
+            BlobHdr.DataSize + BlobHdr.PostPad;
+    }
+
+    return Size;
+}
+
+HRESULT
+KernelDumpTargetInfo::DumpWriteTaggedData(HANDLE File)
+{
+    HRESULT Status;
+    ULONG64 HdrOffs;
+    DUMP_BLOB_FILE_HEADER FileHdr;
+    DUMP_BLOB_HEADER BlobHdr;
+    BYTE Buffer[8192];
+
+    C_ASSERT((sizeof(FileHdr) & (DUMP_BLOB_ALIGN - 1)) == 0);
+    C_ASSERT((sizeof(BlobHdr) & (DUMP_BLOB_ALIGN - 1)) == 0);
+    
+    if ((Status = GetFirstBlobHeaderOffset(&HdrOffs)) != S_OK)
+    {
+        // E_NOINTERFACE indicates no tagged data, so
+        // we trivially succeed in that case.
+        return Status == E_NOINTERFACE ? S_OK : Status;
+    }
+
+    //
+    // We have tagged data, so write a file header.
+    //
+
+    FileHdr.Signature1 = DUMP_BLOB_SIGNATURE1;
+    FileHdr.Signature2 = DUMP_BLOB_SIGNATURE2;
+    FileHdr.HeaderSize = sizeof(FileHdr);
+    FileHdr.BuildNumber = g_Target->m_BuildNumber |
+        (g_Target->m_CheckedBuild << 28);
+
+    if ((Status = DumpWriteFile(File, &FileHdr, sizeof(FileHdr))) != S_OK)
+    {
+        return Status;
+    }
+
+    //
+    // Loop over every entry and copy the data into the
+    // dump file being written.
+    //
+
+    while (ReadBlobHeaderAtOffset(HdrOffs, &BlobHdr) == S_OK)
+    {
+        DUMP_BLOB_HEADER WriteBlobHdr;
+
+        //
+        // We're always going to write out data packed so the
+        // only padding we need is a post-pad on the data to
+        // keep headers 8-byte-aligned.
+        //
+
+        ZeroMemory(&WriteBlobHdr, sizeof(WriteBlobHdr));
+        memcpy(&WriteBlobHdr, &BlobHdr, BlobHdr.HeaderSize);
+        WriteBlobHdr.HeaderSize = sizeof(WriteBlobHdr);
+        WriteBlobHdr.PrePad = 0;
+        WriteBlobHdr.PostPad =
+            ((BlobHdr.DataSize + (DUMP_BLOB_ALIGN - 1)) &
+             ~(DUMP_BLOB_ALIGN - 1)) - BlobHdr.DataSize;
+        
+        if ((Status = DumpWriteFile(File, &WriteBlobHdr,
+                                    sizeof(WriteBlobHdr))) != S_OK)
+        {
+            return Status;
+        }
+
+        //
+        // Copy the raw data.
+        //
+        
+        HdrOffs += BlobHdr.HeaderSize + BlobHdr.PrePad;
+
+        while (BlobHdr.DataSize)
+        {
+            ULONG Req = BlobHdr.DataSize < sizeof(Buffer) ?
+                BlobHdr.DataSize : sizeof(Buffer);
+            if ((Status = g_Target->
+                 ReadTagged(HdrOffs, Buffer, Req)) != S_OK ||
+                (Status = DumpWriteFile(File, Buffer, Req)) != S_OK)
+            {
+                return Status;
+            }
+
+            BlobHdr.DataSize -= Req;
+            HdrOffs += Req;
+        }
+
+        //
+        // Write postpad.
+        //
+
+        if (WriteBlobHdr.PostPad)
+        {
+            ZeroMemory(Buffer, WriteBlobHdr.PostPad);
+            if ((Status = DumpWriteFile(File, Buffer,
+                                        WriteBlobHdr.PostPad)) != S_OK)
+            {
+                return Status;
+            }
+        }
+        
+        HdrOffs += BlobHdr.PostPad;
+    }
+
+    return S_OK;
+}
+
+//----------------------------------------------------------------------------
+//
+// Kernel full dumps.
+//
+//----------------------------------------------------------------------------
+
+HRESULT
+KernelDumpTargetInfo::DumpWritePhysicalMemoryToFile(HANDLE File,
+                                                    DUMP_WRITE_ARGS* Args,
+                                                    PVOID PhysDesc,
+                                                    BOOL Ptr64)
+{
+    HRESULT Status;
+    DbgKdTransport* KdTrans;
+    HANDLE PhysMemFile = NULL;
+    PUCHAR PageBuffer = NULL;
+
+    //
+    // Write the physical memory out to disk.
+    // There are three sources of physical memory data:
+    // 1. The user specified a file to open and read.  The
+    //    file offsets must correspond to physical addresses.
+    // 2. Some transports, such as 1394, directly support access
+    //    to physical memory.
+    // 3. The target's physical memory read routine.
+    //
+
+    if (IS_CONN_KERNEL_TARGET(g_Target))
+    {
+        KdTrans = ((ConnLiveKernelTargetInfo*)g_Target)->m_Transport;
+    }
+    else
+    {
+        KdTrans = NULL;
+    }
+
+    if (Args->PhysMemFileName)
+    {
+        PhysMemFile = CreateFileT(Args->PhysMemFileName,
+                                  GENERIC_READ, FILE_SHARE_READ,
+                                  NULL, OPEN_EXISTING,
+                                  FILE_ATTRIBUTE_NORMAL, NULL);
+        if (!PhysMemFile || PhysMemFile == INVALID_HANDLE_VALUE)
+        {
+            PhysMemFile = NULL;
+            Status = WIN32_LAST_STATUS();
+            ErrOut(_T("Unable to open physical memory file '%s' - %s\n    ")
+                   _T("\"%s\"\n"),
+                   Args->PhysMemFileName,
+                   FormatStatusCode(Status), FormatStatus(Status));
+            goto Exit;
+        }
+    }
+            
+    PageBuffer = (PUCHAR)malloc(g_Machine->m_PageSize);
+    if (!PageBuffer)
+    {
+        ErrOut(_T("Unable to allocate page buffer\n"));
+        Status = E_OUTOFMEMORY;
+        goto Exit;
+    }
+
+    ULONG NumRuns;
+    ULONG64 NumPages;
+    PPHYSICAL_MEMORY_RUN64 Run64;
+    PPHYSICAL_MEMORY_RUN32 Run32;
+
+    if (Ptr64)
+    {
+        PPHYSICAL_MEMORY_DESCRIPTOR64 Phys =
+            (PPHYSICAL_MEMORY_DESCRIPTOR64)PhysDesc;
+
+        NumRuns = Phys->NumberOfRuns;
+        NumPages = Phys->NumberOfPages;
+        Run64 = Phys->Run;
+    }
+    else
+    {
+        PPHYSICAL_MEMORY_DESCRIPTOR32 Phys =
+            (PPHYSICAL_MEMORY_DESCRIPTOR32)PhysDesc;
+
+        NumRuns = Phys->NumberOfRuns;
+        NumPages = Phys->NumberOfPages;
+        Run32 = Phys->Run;
+    }
+        
+    ULONG64 CurrentPagesWritten = 0;
+    ULONG Percent = 0;
+
+    for (ULONG Run = 0; Run < NumRuns; Run++)
+    {
+        ULONG64 RunPages;
+        ULONG64 Offset;
+        
+        if (Ptr64)
+        {
+            RunPages = Run64[Run].PageCount;
+            Offset = Run64[Run].BasePage * g_Machine->m_PageSize;
+        }
+        else
+        {
+            RunPages = Run32[Run].PageCount;
+            Offset = (ULONG64)Run32[Run].BasePage * g_Machine->m_PageSize;
+        }
+
+        for (ULONG64 Page = 0; Page < RunPages; Page++)
+        {
+            if (CheckUserInterrupt())
+            {
+                ErrOut(_T("--Interrupt\n"));
+                Status = HRESULT_FROM_NT(STATUS_CONTROL_C_EXIT);
+                goto Exit;
+            }
+
+            if ((CurrentPagesWritten * 100) / NumPages ==
+                Percent)
+            {
+                dprintf(_T("Percent written %d\n"), Percent);
+                FlushCallbacks();
+                
+                if (PhysMemFile ||
+                    (KdTrans &&
+                     KdTrans->m_DirectPhysicalMemory))
+                {
+                    Percent += 5;
+                }
+                else
+                {
+                    Percent += 1;
+                }
+            }
+
+            ULONG Done;
+            PCTSTR SourceName;
+
+            if (PhysMemFile)
+            {
+                SourceName = _T("physical memory file");
+                
+                LONG High = (LONG)(Offset >> 32);
+                ULONG Low = (ULONG)Offset;
+
+                Low = SetFilePointer(PhysMemFile, Low, &High, FILE_BEGIN);
+                if (Low == INVALID_SET_FILE_POINTER && GetLastError())
+                {
+                    Status = WIN32_LAST_STATUS();
+                }
+                else if (!ReadFile(PhysMemFile, PageBuffer,
+                                   g_Machine->m_PageSize, &Done, NULL))
+                {
+                    Status = WIN32_LAST_STATUS();
+                }
+                else if (Done < g_Machine->m_PageSize)
+                {
+                    Status = HRESULT_FROM_WIN32(ERROR_READ_FAULT);
+                }
+                else
+                {
+                    Status = S_OK;
+                }
+            }
+            else if (KdTrans &&
+                     KdTrans->m_DirectPhysicalMemory)
+            {
+                SourceName = _T("transport physical memory");
+
+                Status = KdTrans->
+                    ReadTargetPhysicalMemory(Offset,
+                                             PageBuffer,
+                                             g_Machine->m_PageSize,
+                                             &Done);
+                if (Status == S_OK && Done < g_Machine->m_PageSize)
+                {
+                    Status = HRESULT_FROM_WIN32(ERROR_READ_FAULT);
+                }
+            }
+            else
+            {
+                SourceName = _T("target physical memory");
+                
+                Status = g_Target->ReadPhysical(Offset,
+                                                PageBuffer,
+                                                g_Machine->m_PageSize,
+                                                PHYS_FLAG_DEFAULT,
+                                                &Done);
+                if (Status == S_OK && Done < g_Machine->m_PageSize)
+                {
+                    Status = HRESULT_FROM_WIN32(ERROR_READ_FAULT);
+                }
+            }
+
+            if (Status != S_OK)
+            {
+                ErrOut(_T("Failed reading %s at %I64x, %s\n"),
+                       SourceName, Offset, FormatStatusCode(Status));
+                goto Exit;
+            }
+
+            if ((Status = DumpWriteFile(File, PageBuffer,
+                                        g_Machine->m_PageSize)) != S_OK)
+            {
+                goto Exit;
+            }
+
+            Offset += g_Machine->m_PageSize;
+            CurrentPagesWritten++;
+        }
+    }
+
+    Status = S_OK;
+    
+ Exit:
+    if (PhysMemFile)
+    {
+        CloseHandle(PhysMemFile);
+    }
+    free(PageBuffer);
+    return Status;
+}
+
+HRESULT
+KernelFull64DumpTargetInfo::Write(HANDLE File, DUMP_WRITE_ARGS* Args)
+{
+    HRESULT Status;
+    PDUMP_HEADER64 DumpHeader;
+    ULONG64 Offset;
+    PPHYSICAL_MEMORY_DESCRIPTOR64 PhysMem;
+    ULONG BytesRead;
+
+    if (!IS_REMOTE_KERNEL_TARGET(g_Target) &&
+        !IS_KERNEL_FULL_DUMP(g_Target) &&
+        !IS_LOCAL_KERNEL_TARGET(g_Target))
+    {
+        ErrOut(_T("\nKernel full dumps can only be ")
+               _T("written when all of physical ")
+               _T("memory is accessible - aborting now\n"));
+        return E_INVALIDARG;
+    }
+
+    DumpHeader = (PDUMP_HEADER64)malloc(sizeof(*DumpHeader));
+    if (!DumpHeader)
+    {
+        ErrOut(_T("Unable to allocate dump header buffer\n"));
+        return E_OUTOFMEMORY;
+    }
+
+    dprintf(_T("Full kernel dump\n"));
+    FlushCallbacks();
+
+    KernelDumpTargetInfo::InitDumpHeader64(DumpHeader,
+                                           Args->CommentA,
+                                           Args->CommentW,
+                                           0);
+    DumpHeader->DumpType = DUMP_TYPE_FULL;
+    DumpHeader->WriterStatus = DUMP_DBGENG_SUCCESS;
+
+    //
+    // Copy the memory descriptor list to our header.
+    // First get the pointer VA.
+    //
+
+    if ((Status = g_Target->
+         ReadPointer(g_Process, g_Target->m_Machine,
+                     g_Target->m_KdDebuggerData.
+                     MmPhysicalMemoryBlock,
+                     &Offset)) != S_OK ||
+        !Offset)
+    {
+        ErrOut(_T("Unable to read MmPhysicalMemoryBlock\n"));
+        Status = Status != S_OK ? Status : E_INVALIDARG;
+        goto Exit;
+    }
+
+    //
+    // First read the memory descriptor size.
+    //
+
+    PhysMem = &DumpHeader->PhysicalMemoryBlock;
+    if ((Status = g_Target->
+         ReadVirtual(g_Process, Offset,
+                     PhysMem, DMP_PHYSICAL_MEMORY_BLOCK_SIZE_64,
+                     &BytesRead)) != S_OK ||
+        BytesRead < sizeof(*PhysMem) +
+        (sizeof(PhysMem->Run[0]) * (PhysMem->NumberOfRuns - 1)))
+    {
+        ErrOut(_T("Unable to read MmPhysicalMemoryBlock\n"));
+        Status = Status != S_OK ? Status : E_INVALIDARG;
+        goto Exit;
+    }
+    
+    //
+    // Calculate total dump file size.
+    //
+
+    DumpHeader->RequiredDumpSpace.QuadPart =
+        sizeof(*DumpHeader) +
+        DumpHeader->PhysicalMemoryBlock.NumberOfPages *
+        g_Machine->m_PageSize +
+        DumpGetTaggedDataSize();
+
+    //
+    // Write dump header to crash dump file.
+    //
+
+    if ((Status = DumpWriteFile(File, DumpHeader,
+                                sizeof(*DumpHeader))) != S_OK)
+    {
+        goto Exit;
+    }
+
+    Status = DumpWritePhysicalMemoryToFile(File, Args, PhysMem, TRUE);
+
+    if (Status == S_OK)
+    {
+        Status = DumpWriteTaggedData(File);
+    }
+
+ Exit:
+    free(DumpHeader);
+    return Status;
+}
+
+HRESULT
+KernelFull32DumpTargetInfo::Write(HANDLE File, DUMP_WRITE_ARGS* Args)
+{
+    HRESULT Status;
+    PDUMP_HEADER32 DumpHeader;
+    ULONG64 Offset;
+    PPHYSICAL_MEMORY_DESCRIPTOR32 PhysMem;
+    ULONG BytesRead;
+
+    if (!IS_REMOTE_KERNEL_TARGET(g_Target) &&
+        !IS_KERNEL_FULL_DUMP(g_Target) &&
+        !IS_LOCAL_KERNEL_TARGET(g_Target))
+    {
+        ErrOut(_T("\nKernel full dumps can only be ")
+               _T("written when all of physical ")
+               _T("memory is accessible - aborting now\n"));
+        return E_INVALIDARG;
+    }
+
+    DumpHeader = (PDUMP_HEADER32)malloc(sizeof(*DumpHeader));
+    if (!DumpHeader)
+    {
+        ErrOut(_T("Unable to allocate dump header buffer\n"));
+        return E_OUTOFMEMORY;
+    }
+
+    dprintf(_T("Full kernel dump\n"));
+    FlushCallbacks();
+
+    KernelDumpTargetInfo::InitDumpHeader32(DumpHeader,
+                                           Args->CommentA,
+                                           Args->CommentW,
+                                           0);
+    DumpHeader->DumpType = DUMP_TYPE_FULL;
+    DumpHeader->WriterStatus = DUMP_DBGENG_SUCCESS;
+
+    //
+    // Copy the memory descriptor list to our header.
+    // First get the pointer VA.
+    //
+
+    if ((Status = g_Target->
+         ReadPointer(g_Process, g_Target->m_Machine,
+                     g_Target->m_KdDebuggerData.
+                     MmPhysicalMemoryBlock,
+                     &Offset)) != S_OK ||
+        !Offset)
+    {
+        ErrOut(_T("Unable to read MmPhysicalMemoryBlock\n"));
+        Status = Status != S_OK ? Status : E_INVALIDARG;
+        goto Exit;
+    }
+
+    //
+    // First read the memory descriptor size.
+    //
+
+    PhysMem = &DumpHeader->PhysicalMemoryBlock;
+    if ((Status = g_Target->
+         ReadVirtual(g_Process, Offset,
+                     PhysMem, DMP_PHYSICAL_MEMORY_BLOCK_SIZE_32,
+                     &BytesRead)) != S_OK ||
+        BytesRead < sizeof(*PhysMem) +
+        (sizeof(PhysMem->Run[0]) * (PhysMem->NumberOfRuns - 1)))
+    {
+        ErrOut(_T("Unable to read MmPhysicalMemoryBlock\n"));
+        Status = Status != S_OK ? Status : E_INVALIDARG;
+        goto Exit;
+    }
+    
+    //
+    // Calculate total dump file size.
+    //
+
+    DumpHeader->RequiredDumpSpace.QuadPart =
+        sizeof(*DumpHeader) +
+        DumpHeader->PhysicalMemoryBlock.NumberOfPages *
+        g_Machine->m_PageSize +
+        DumpGetTaggedDataSize();
+
+    //
+    // Write dump header to crash dump file.
+    //
+
+    if ((Status = DumpWriteFile(File, DumpHeader,
+                                sizeof(*DumpHeader))) != S_OK)
+    {
+        goto Exit;
+    }
+
+    Status = DumpWritePhysicalMemoryToFile(File, Args, PhysMem, FALSE);
+
+    if (Status == S_OK)
+    {
+        Status = DumpWriteTaggedData(File);
+    }
+
+ Exit:
+    free(DumpHeader);
+    return Status;
+}
+
+enum
+{
+    GNME_ENTRY,
+    GNME_DONE,
+    GNME_NO_NAME,
+    GNME_CORRUPT,
+};
+
+ULONG
+GetNextModuleEntry(ModuleInfo *ModIter,
+                   MODULE_INFO_ENTRY *ModEntry)
+{
+    HRESULT Status;
+
+    ModEntry->Reset();
+    if ((Status = ModIter->GetEntry(ModEntry)) != S_OK)
+    {
+        return Status == S_FALSE ? GNME_DONE : GNME_CORRUPT;
+    }
+
+    if (ModEntry->NameBytes > (MAX_IMAGE_PATH - 1) * ModEntry->NameCharBytes)
+    {
+        ErrOut(_T("Module list is corrupt."));
+        if (IS_KERNEL_TARGET(g_Target))
+        {
+            ErrOut(_T("  Check your kernel symbols.\n"));
+        }
+        else
+        {
+            ErrOut(_T("  Loader list may be invalid\n"));
+        }
+        return GNME_CORRUPT;
+    }
+
+    // If this entry has no name just skip it.
+    if (!ModEntry->NamePtr || !ModEntry->NameBytes)
+    {
+        ErrOut(_T("  Module List has empty entry in it - skipping\n"));
+        return GNME_NO_NAME;
+    }
+
+    // If the image header information couldn't be read
+    // we end up with placeholder values for certain entries.
+    // The kernel writes out zeroes in this case so copy
+    // its behavior so that there's one consistent value
+    // for unknown.
+    if (ModEntry->CheckSum == UNKNOWN_CHECKSUM)
+    {
+        ModEntry->CheckSum = 0;
+    }
+    if (ModEntry->TimeDateStamp == UNKNOWN_TIMESTAMP)
+    {
+        ModEntry->TimeDateStamp = 0;
+    }
+
+    return GNME_ENTRY;
+}
+
+//----------------------------------------------------------------------------
+//
+// Shared triage writing things.
+//
+//----------------------------------------------------------------------------
+
+#define ExtractValue(NAME, val)  {                                        \
+    if (!g_Target->m_KdDebuggerData.NAME) {                               \
+        val = 0;                                                          \
+        ErrOut(_T("KdDebuggerData.") _T(#NAME) _T(" is NULL\n"));         \
+    } else {                                                              \
+        g_Target->ReadAllVirtual(g_Process,                               \
+                                 g_Target->m_KdDebuggerData.NAME, &(val), \
+                                 sizeof(val));                            \
+    }                                                                     \
+}
+
+inline ALIGN_8(unsigned Offset)
+{
+    return (Offset + 7) & 0xfffffff8;
+}
+
+const unsigned MAX_TRIAGE_STACK_SIZE32 = 16 * 1024;
+const unsigned MAX_TRIAGE_STACK_SIZE64 = 32 * 1024;
+const unsigned MAX_TRIAGE_BSTORE_SIZE = 16 * 4096;  // as defined in ntia64.h
+const ULONG TRIAGE_DRIVER_NAME_SIZE_GUESS = 0x40;
+
+typedef struct _TRIAGE_PTR_DATA_BLOCK
+{
+    ULONG64 MinAddress;
+    ULONG64 MaxAddress;
+} TRIAGE_PTR_DATA_BLOCK, *PTRIAGE_PTR_DATA_BLOCK;
+
+// A triage dump is sixteen pages long.  Some of that is
+// header information and at least a few other pages will
+// be used for basic dump information so limit the number
+// of extra data blocks to something less than sixteen
+// to save array space.
+#define IO_MAX_TRIAGE_DUMP_DATA_BLOCKS 64
+
+ULONG IopNumTriageDumpDataBlocks;
+TRIAGE_PTR_DATA_BLOCK IopTriageDumpDataBlocks[IO_MAX_TRIAGE_DUMP_DATA_BLOCKS];
+
+//
+// If space is available in a triage dump it's possible
+// to add "interesting" data pages referenced by runtime
+// information such as context registers.  The following
+// lists are offsets into the CONTEXT structure of pointers
+// which usually point to interesting data.  They are
+// in priority order.
+//
+
+#define IOP_LAST_CONTEXT_OFFSET 0xffff
+
+USHORT IopRunTimeContextOffsetsX86[] =
+{
+    FIELD_OFFSET(X86_NT5_CONTEXT, Ebx),
+    FIELD_OFFSET(X86_NT5_CONTEXT, Esi),
+    FIELD_OFFSET(X86_NT5_CONTEXT, Edi),
+    FIELD_OFFSET(X86_NT5_CONTEXT, Ecx),
+    FIELD_OFFSET(X86_NT5_CONTEXT, Edx),
+    FIELD_OFFSET(X86_NT5_CONTEXT, Eax),
+    FIELD_OFFSET(X86_NT5_CONTEXT, Eip),
+    IOP_LAST_CONTEXT_OFFSET
+};
+
+USHORT IopRunTimeContextOffsetsIa64[] =
+{
+    FIELD_OFFSET(IA64_CONTEXT, IntS0),
+    FIELD_OFFSET(IA64_CONTEXT, IntS1),
+    FIELD_OFFSET(IA64_CONTEXT, IntS2),
+    FIELD_OFFSET(IA64_CONTEXT, IntS3),
+    FIELD_OFFSET(IA64_CONTEXT, StIIP),
+    IOP_LAST_CONTEXT_OFFSET
+};
+
+USHORT IopRunTimeContextOffsetsAmd64[] =
+{
+    FIELD_OFFSET(AMD64_CONTEXT, Rbx),
+    FIELD_OFFSET(AMD64_CONTEXT, Rsi),
+    FIELD_OFFSET(AMD64_CONTEXT, Rdi),
+    FIELD_OFFSET(AMD64_CONTEXT, Rcx),
+    FIELD_OFFSET(AMD64_CONTEXT, Rdx),
+    FIELD_OFFSET(AMD64_CONTEXT, Rax),
+    FIELD_OFFSET(AMD64_CONTEXT, Rip),
+    IOP_LAST_CONTEXT_OFFSET
+};
+
+USHORT IopRunTimeContextOffsetsEmpty[] =
+{
+    IOP_LAST_CONTEXT_OFFSET
+};
+
+BOOLEAN
+IopIsAddressRangeValid(
+    IN ULONG64 VirtualAddress,
+    IN ULONG Length
+    )
+{
+    VirtualAddress = PAGE_ALIGN(g_Machine, VirtualAddress);
+    Length = (Length + g_Machine->m_PageSize - 1) >> g_Machine->m_PageShift;
+    while (Length > 0)
+    {
+        UCHAR Data;
+
+        if (CurReadAllVirtual(VirtualAddress, &Data, sizeof(Data)) != S_OK)
+        {
+            return FALSE;
+        }
+
+        VirtualAddress += g_Machine->m_PageSize;
+        Length--;
+    }
+
+    return TRUE;
+}
+
+BOOLEAN
+IoAddTriageDumpDataBlock(
+    IN ULONG64 Address,
+    IN ULONG Length
+    )
+{
+    ULONG i;
+    PTRIAGE_PTR_DATA_BLOCK Block;
+    ULONG64 MinAddress, MaxAddress;
+
+    // Check against SIZE32 for both 32 and 64-bit dumps
+    // as no data block needs to be larger than that.
+    if (Length >= TRIAGE_DUMP_SIZE32 ||
+        !IopIsAddressRangeValid(Address, Length))
+    {
+        return FALSE;
+    }
+
+    MinAddress = Address;
+    MaxAddress = MinAddress + Length;
+
+    //
+    // Minimize overlap between the new block and existing blocks.
+    // Blocks cannot simply be merged as blocks are inserted in
+    // priority order for storage in the dump.  Combining a low-priority
+    // block with a high-priority block could lead to a medium-
+    // priority block being bumped improperly from the dump.
+    //
+
+    Block = IopTriageDumpDataBlocks;
+    for (i = 0; i < IopNumTriageDumpDataBlocks; i++, Block++)
+    {
+        if (MinAddress >= Block->MaxAddress ||
+            MaxAddress <= Block->MinAddress)
+        {
+            // No overlap.
+            continue;
+        }
+
+        //
+        // Trim overlap out of the new block.  If this
+        // would split the new block into pieces don't
+        // trim to keep things simple.  Content may then
+        // be duplicated in the dump.
+        //
+
+        if (MinAddress >= Block->MinAddress)
+        {
+            if (MaxAddress <= Block->MaxAddress)
+            {
+                // New block is completely contained.
+                return TRUE;
+            }
+
+            // New block extends above the current block
+            // so trim off the low-range overlap.
+            MinAddress = Block->MaxAddress;
+        }
+        else if (MaxAddress <= Block->MaxAddress)
+        {
+            // New block extends below the current block
+            // so trim off the high-range overlap.
+            MaxAddress = Block->MinAddress;
+        }
+    }
+
+    if (IopNumTriageDumpDataBlocks >= IO_MAX_TRIAGE_DUMP_DATA_BLOCKS)
+    {
+        return FALSE;
+    }
+
+    Block = IopTriageDumpDataBlocks + IopNumTriageDumpDataBlocks++;
+    Block->MinAddress = MinAddress;
+    Block->MaxAddress = MaxAddress;
+
+    return TRUE;
+}
+
+VOID
+IopAddRunTimeTriageDataBlocks(
+    IN PCROSS_PLATFORM_CONTEXT Context,
+    IN ULONG64 StackMin,
+    IN ULONG64 StackMax,
+    IN ULONG64 StoreMin,
+    IN ULONG64 StoreMax
+    )
+{
+    PUSHORT ContextOffset;
+
+    switch(g_Target->m_MachineType)
+    {
+    case IMAGE_FILE_MACHINE_I386:
+        ContextOffset = IopRunTimeContextOffsetsX86;
+        break;
+    case IMAGE_FILE_MACHINE_IA64:
+        ContextOffset = IopRunTimeContextOffsetsIa64;
+        break;
+    case IMAGE_FILE_MACHINE_AMD64:
+        ContextOffset = IopRunTimeContextOffsetsAmd64;
+        break;
+    default:
+        ContextOffset = IopRunTimeContextOffsetsEmpty;
+        break;
+    }
+
+    while (*ContextOffset < IOP_LAST_CONTEXT_OFFSET)
+    {
+        ULONG64 Ptr;
+
+        //
+        // Retrieve possible pointers from the context
+        // registers.
+        //
+
+        if (g_Machine->m_Ptr64)
+        {
+            Ptr = *(PULONG64)((PUCHAR)Context + *ContextOffset);
+        }
+        else
+        {
+            Ptr = EXTEND64(*(PULONG)((PUCHAR)Context + *ContextOffset));
+        }
+
+        // Stack and backing store memory is already saved
+        // so ignore any pointers that fall into those ranges.
+        if ((Ptr < StackMin || Ptr >= StackMax) &&
+            (Ptr < StoreMin || Ptr >= StoreMax))
+        {
+            IoAddTriageDumpDataBlock(PAGE_ALIGN(g_Machine, Ptr),
+                                     g_Machine->m_PageSize);
+        }
+
+        ContextOffset++;
+    }
+}
+
+void
+AddInMemoryTriageDataBlocks(void)
+{
+    //
+    // Look at the global data for nt!IopTriageDumpDataBlocks
+    // and include the same data blocks so that dump conversion
+    // preserves data blocks.
+    //
+
+    // If we don't know where IopTriageDumpDataBlocks is then
+    // we don't have anything to do.
+    if (!g_Target->m_KdDebuggerData.IopNumTriageDumpDataBlocks ||
+        !g_Target->m_KdDebuggerData.IopTriageDumpDataBlocks)
+    {
+        return;
+    }
+
+    ULONG NumBlocks;
+
+    if (g_Target->
+        ReadAllVirtual(g_Process, g_Target->
+                       m_KdDebuggerData.IopNumTriageDumpDataBlocks,
+                       &NumBlocks, sizeof(NumBlocks)) != S_OK)
+    {
+        return;
+    }
+
+    if (NumBlocks > IO_MAX_TRIAGE_DUMP_DATA_BLOCKS)
+    {
+        NumBlocks = IO_MAX_TRIAGE_DUMP_DATA_BLOCKS;
+    }
+
+    ULONG64 BlockDescOffs =
+        g_Target->m_KdDebuggerData.IopTriageDumpDataBlocks;
+    TRIAGE_PTR_DATA_BLOCK BlockDesc;
+    ULONG i;
+    ULONG PtrSize = g_Machine->m_Ptr64 ? 8 : 4;
+
+    for (i = 0; i < NumBlocks; i++)
+    {
+        if (g_Target->ReadPointer(g_Process, g_Machine,
+                                  BlockDescOffs,
+                                  &BlockDesc.MinAddress) != S_OK ||
+            g_Target->ReadPointer(g_Process, g_Machine,
+                                  BlockDescOffs + PtrSize,
+                                  &BlockDesc.MaxAddress) != S_OK)
+        {
+            return;
+        }
+
+        BlockDescOffs += 2 * PtrSize;
+
+        IoAddTriageDumpDataBlock(BlockDesc.MinAddress,
+                                 (LONG)(BlockDesc.MaxAddress -
+                                        BlockDesc.MinAddress));
+    }
+}
+
+ULONG
+IopSizeTriageDumpDataBlocks(
+    ULONG Offset,
+    ULONG BufferSize,
+    PULONG StartOffset,
+    PULONG Count
+    )
+{
+    ULONG i;
+    ULONG Size;
+    PTRIAGE_PTR_DATA_BLOCK Block;
+
+    *Count = 0;
+
+    Block = IopTriageDumpDataBlocks;
+    for (i = 0; i < IopNumTriageDumpDataBlocks; i++, Block++)
+    {
+        Size = ALIGN_8(sizeof(TRIAGE_DATA_BLOCK)) +
+            ALIGN_8((ULONG)(Block->MaxAddress - Block->MinAddress));
+        if (Offset + Size >= BufferSize)
+        {
+            break;
+        }
+
+        if (i == 0)
+        {
+            *StartOffset = Offset;
+        }
+
+        Offset += Size;
+        (*Count)++;
+    }
+
+    return Offset;
+}
+
+VOID
+IopWriteTriageDumpDataBlocks(
+    ULONG StartOffset,
+    ULONG Count,
+    PUCHAR BufferAddress
+    )
+{
+    ULONG i;
+    PTRIAGE_PTR_DATA_BLOCK Block;
+    PUCHAR DataBuffer;
+    PTRIAGE_DATA_BLOCK DumpBlock;
+
+    DumpBlock = (PTRIAGE_DATA_BLOCK)
+        (BufferAddress + StartOffset);
+    DataBuffer = (PUCHAR)(DumpBlock + Count);
+
+    Block = IopTriageDumpDataBlocks;
+    for (i = 0; i < Count; i++, Block++)
+    {
+        DumpBlock->Address = Block->MinAddress;
+        DumpBlock->Offset = (ULONG)(DataBuffer - BufferAddress);
+        DumpBlock->Size = (ULONG)(Block->MaxAddress - Block->MinAddress);
+
+        CurReadAllVirtual(Block->MinAddress, DataBuffer, DumpBlock->Size);
+
+        DataBuffer += DumpBlock->Size;
+        DumpBlock++;
+    }
+}
+
+void
+KernelTriageDumpTargetInfo::WriteDriverList32(PUCHAR DataBase,
+                                              TRIAGE_DUMP32* TriageHdr)
+{
+    PDUMP_DRIVER_ENTRY32 pdde;
+    PDUMP_STRING pds;
+    ModuleInfo* ModIter;
+    ULONG MaxEntries = TriageHdr->DriverCount;
+
+    TriageHdr->DriverCount = 0;
+
+    if (((ModIter = g_Target->GetModuleInfo(FALSE)) == NULL) ||
+        ((ModIter->Initialize(g_Thread, MODULE_INFO_ALL_STD)) != S_OK))
+    {
+        return;
+    }
+
+    // pointer to first driver entry to write out
+    pdde = (PDUMP_DRIVER_ENTRY32) (DataBase + TriageHdr->DriverListOffset);
+
+    // pointer to first module name to write out
+    pds = (PDUMP_STRING) (DataBase + TriageHdr->StringPoolOffset);
+
+    while ((PUCHAR)(pds + 1) < DataBase + TRIAGE_DUMP_SIZE32 &&
+           TriageHdr->DriverCount < MaxEntries)
+    {
+        MODULE_INFO_ENTRY ModEntry;
+
+        ULONG EntryRet = GetNextModuleEntry(ModIter, &ModEntry);
+
+        if (EntryRet == GNME_CORRUPT ||
+            EntryRet == GNME_DONE)
+        {
+            break;
+        }
+        else if (EntryRet == GNME_NO_NAME)
+        {
+            continue;
+        }
+
+        pdde->LdrEntry.DllBase       = (ULONG)(ULONG_PTR)ModEntry.Base;
+        pdde->LdrEntry.SizeOfImage   = ModEntry.SizeOfImage;
+        pdde->LdrEntry.CheckSum      = ModEntry.CheckSum;
+        pdde->LdrEntry.TimeDateStamp = ModEntry.TimeDateStamp;
+
+        if (ModEntry.NameCharBytes == sizeof(WCHAR))
+        {
+            // Convert length from bytes to characters.
+            pds->Length = ModEntry.NameBytes / sizeof(WCHAR);
+            if ((PUCHAR)pds->Buffer + pds->Length + sizeof(WCHAR) >
+                DataBase + TRIAGE_DUMP_SIZE32)
+            {
+                break;
+            }
+
+            CopyMemory(pds->Buffer,
+                       ModEntry.NamePtr,
+                       ModEntry.NameBytes);
+        }
+        else
+        {
+            pds->Length = ModEntry.NameBytes;
+            if ((PUCHAR)pds->Buffer + pds->Length + sizeof(WCHAR) >
+                DataBase + TRIAGE_DUMP_SIZE32)
+            {
+                break;
+            }
+
+            MultiByteToWideChar(CP_ACP, 0,
+                                (PSTR)ModEntry.NamePtr, ModEntry.NameBytes,
+                                pds->Buffer, ModEntry.NameBytes);
+        }
+
+        // null terminate string
+        pds->Buffer[pds->Length] = 0;
+
+        pdde->DriverNameOffset = (ULONG)
+            ((ULONG_PTR) pds - (ULONG_PTR) DataBase);
+
+        // get pointer to next string
+        pds = (PDUMP_STRING)
+            (DataBase + ALIGN_8(pdde->DriverNameOffset +
+                                sizeof(DUMP_STRING) +
+                                sizeof(WCHAR) * (pds->Length + 1)));
+
+        pdde = (PDUMP_DRIVER_ENTRY32)(((PUCHAR) pdde) + sizeof(*pdde));
+
+        TriageHdr->DriverCount++;
+    }
+
+    TriageHdr->StringPoolSize = (ULONG)
+        ((ULONG_PTR)pds -
+         (ULONG_PTR)(DataBase + TriageHdr->StringPoolOffset));
+}
+
+PUCHAR
+KernelTriageDumpTargetInfo::WriteUnloadedDrivers32(PUCHAR Data)
+{
+    ULONG i;
+    ULONG Index;
+    UNLOADED_DRIVERS32 ud;
+    PDUMP_UNLOADED_DRIVERS32 pdud;
+    ULONG64 pvMiUnloadedDrivers = 0;
+    ULONG ulMiLastUnloadedDriver = 0;
+    PUCHAR CountInData = Data;
+    ULONG Written = 0;
+
+    *((PULONG) CountInData) = 0;
+    Data += sizeof(ULONG);
+
+    //
+    // find location of unloaded drivers
+    //
+
+    if (!g_Target->m_KdDebuggerData.MmUnloadedDrivers ||
+        !g_Target->m_KdDebuggerData.MmLastUnloadedDriver)
+    {
+        return Data;
+    }
+
+    if (g_Target->ReadPointer(g_Process, g_Target->m_Machine,
+                              g_Target->m_KdDebuggerData.MmUnloadedDrivers,
+                              &pvMiUnloadedDrivers) != S_OK ||
+        CurReadAllVirtual(g_Target->m_KdDebuggerData.MmLastUnloadedDriver,
+                          &ulMiLastUnloadedDriver,
+                          sizeof(ULONG)) != S_OK)
+    {
+        return Data;
+    }
+
+    if (pvMiUnloadedDrivers == NULL || ulMiLastUnloadedDriver == 0)
+    {
+        return Data;
+    }
+
+    // point to last unloaded drivers
+    pdud = (PDUMP_UNLOADED_DRIVERS32)Data;
+
+    //
+    // Write the list with the most recently unloaded driver first to the
+    // least recently unloaded driver last.
+    //
+
+    Index = ulMiLastUnloadedDriver - 1;
+
+    for (i = 0; i < MAX_KERNEL_UNLOADED_DRIVERS; i++, Index--)
+    {
+        if (Index >= MAX_KERNEL_UNLOADED_DRIVERS)
+        {
+            Index = MAX_KERNEL_UNLOADED_DRIVERS - 1;
+        }
+
+        // read in unloaded driver
+        if (CurReadAllVirtual(pvMiUnloadedDrivers +
+                              Index * sizeof(UNLOADED_DRIVERS32),
+                              &ud, sizeof(ud)) != S_OK)
+        {
+            ErrOut(_T("Can't read memory from %s\n"),
+                   FormatAddr64(pvMiUnloadedDrivers +
+                                Index * sizeof(UNLOADED_DRIVERS32)));
+            continue;
+        }
+
+        // copy name lengths
+        pdud->Name.MaximumLength = ud.Name.MaximumLength;
+        pdud->Name.Length = ud.Name.Length;
+        if (ud.Name.Buffer == NULL)
+        {
+            continue;
+        }
+
+        // copy start and end address
+        pdud->StartAddress = ud.StartAddress;
+        pdud->EndAddress = ud.EndAddress;
+
+        // restrict name length and maximum name length to 12 characters
+        if (pdud->Name.Length > MAX_UNLOADED_NAME_LENGTH)
+        {
+            pdud->Name.Length = MAX_UNLOADED_NAME_LENGTH;
+        }
+        if (pdud->Name.MaximumLength > MAX_UNLOADED_NAME_LENGTH)
+        {
+            pdud->Name.MaximumLength = MAX_UNLOADED_NAME_LENGTH;
+        }
+        // Can't store pointers in the dump so just zero it.
+        pdud->Name.Buffer = 0;
+        // Read in name.
+        if (CurReadAllVirtual(EXTEND64(ud.Name.Buffer),
+                              pdud->DriverName,
+                              pdud->Name.MaximumLength) != S_OK)
+        {
+            ErrOut(_T("Can't read memory at address %s\n"),
+                   FormatAddr64(ud.Name.Buffer));
+            continue;
+        }
+
+        // move to previous driver
+        pdud += 1;
+        Written++;
+    }
+
+    // number of drivers in the list
+    *((PULONG) CountInData) = Written;
+    return (PUCHAR)pdud;
+}
+
+PUCHAR
+KernelTriageDumpTargetInfo::WriteMmTriageInformation32(PUCHAR Data)
+{
+    DUMP_MM_STORAGE32 TriageInformation;
+    ULONG64 pMmVerifierData;
+    ULONG64 pvMmPagedPoolInfo;
+    ULONG cbNonPagedPool;
+    ULONG cbPagedPool;
+
+    // version information
+    TriageInformation.Version = 1;
+
+    // size information
+    TriageInformation.Size = sizeof(TriageInformation);
+
+    // get special pool tag
+    ExtractValue(MmSpecialPoolTag, TriageInformation.MmSpecialPoolTag);
+
+    // get triage action taken
+    ExtractValue(MmTriageActionTaken, TriageInformation.MiTriageActionTaken);
+    pMmVerifierData = g_Target->m_KdDebuggerData.MmVerifierData;
+
+    // read in verifier level
+    // BUGBUG - should not read internal data structures in MM
+    //if (pMmVerifierData)
+    //    DmpReadMemory(
+    //        (ULONG64) &((MM_DRIVER_VERIFIER_DATA *) pMmVerifierData)->Level,
+    //        &TriageInformation.MmVerifyDriverLevel,
+    //        sizeof(TriageInformation.MmVerifyDriverLevel));
+    //else
+        TriageInformation.MmVerifyDriverLevel = 0;
+
+    // read in verifier
+    ExtractValue(KernelVerifier, TriageInformation.KernelVerifier);
+
+    // read non paged pool info
+    ExtractValue(MmMaximumNonPagedPoolInBytes, cbNonPagedPool);
+    TriageInformation.MmMaximumNonPagedPool =
+        cbNonPagedPool / g_Target->m_Machine->m_PageSize;
+    ExtractValue(MmAllocatedNonPagedPool,
+                 TriageInformation.MmAllocatedNonPagedPool);
+
+    // read paged pool info
+    ExtractValue(MmSizeOfPagedPoolInBytes, cbPagedPool);
+    TriageInformation.PagedPoolMaximum =
+        cbPagedPool / g_Target->m_Machine->m_PageSize;
+    pvMmPagedPoolInfo = g_Target->m_KdDebuggerData.MmPagedPoolInformation;
+
+    // BUGBUG - should not read internal data structures in MM
+    //if (pvMmPagedPoolInfo)
+    //    DmpReadMemory(
+    //        (ULONG64) &((MM_PAGED_POOL_INFO *) pvMmPagedPoolInfo)->AllocatedPagedPool,
+    //        &TriageInformation.PagedPoolAllocated,
+    //        sizeof(TriageInformation.PagedPoolAllocated));
+    //else
+        TriageInformation.PagedPoolAllocated = 0;
+
+    // read committed pages info
+    ExtractValue(MmTotalCommittedPages, TriageInformation.CommittedPages);
+    ExtractValue(MmPeakCommitment, TriageInformation.CommittedPagesPeak);
+    ExtractValue(MmTotalCommitLimitMaximum,
+                 TriageInformation.CommitLimitMaximum);
+    memcpy(Data, &TriageInformation, sizeof(TriageInformation));
+    return Data + sizeof(TriageInformation);
+}
+
+void
+KernelTriageDumpTargetInfo::WriteDriverList64(PUCHAR DataBase,
+                                              TRIAGE_DUMP64* TriageHdr)
+{
+    PDUMP_DRIVER_ENTRY64 pdde;
+    PDUMP_STRING pds;
+    ModuleInfo* ModIter;
+    ULONG MaxEntries = TriageHdr->DriverCount;
+
+    TriageHdr->DriverCount = 0;
+
+    if (((ModIter = g_Target->GetModuleInfo(FALSE)) == NULL) ||
+        ((ModIter->Initialize(g_Thread, MODULE_INFO_ALL_STD)) != S_OK))
+    {
+        return;
+    }
+
+    // pointer to first driver entry to write out
+    pdde = (PDUMP_DRIVER_ENTRY64) (DataBase + TriageHdr->DriverListOffset);
+
+    // pointer to first module name to write out
+    pds = (PDUMP_STRING) (DataBase + TriageHdr->StringPoolOffset);
+
+    while ((PUCHAR)(pds + 1) < DataBase + TRIAGE_DUMP_SIZE64 &&
+           TriageHdr->DriverCount < MaxEntries)
+    {
+        MODULE_INFO_ENTRY ModEntry;
+
+        ULONG EntryRet = GetNextModuleEntry(ModIter, &ModEntry);
+
+        if (EntryRet == GNME_CORRUPT ||
+            EntryRet == GNME_DONE)
+        {
+            break;
+        }
+        else if (EntryRet == GNME_NO_NAME)
+        {
+            continue;
+        }
+
+        pdde->LdrEntry.DllBase       = ModEntry.Base;
+        pdde->LdrEntry.SizeOfImage   = ModEntry.SizeOfImage;
+        pdde->LdrEntry.CheckSum      = ModEntry.CheckSum;
+        pdde->LdrEntry.TimeDateStamp = ModEntry.TimeDateStamp;
+
+        if (ModEntry.NameCharBytes == sizeof(WCHAR))
+        {
+            // Convert length from bytes to characters.
+            pds->Length = ModEntry.NameBytes / sizeof(WCHAR);
+            if ((PUCHAR)pds->Buffer + pds->Length + sizeof(WCHAR) >
+                DataBase + TRIAGE_DUMP_SIZE64)
+            {
+                break;
+            }
+
+            CopyMemory(pds->Buffer,
+                       ModEntry.NamePtr,
+                       ModEntry.NameBytes);
+        }
+        else
+        {
+            pds->Length = ModEntry.NameBytes;
+            if ((PUCHAR)pds->Buffer + pds->Length + sizeof(WCHAR) >
+                DataBase + TRIAGE_DUMP_SIZE64)
+            {
+                break;
+            }
+
+            MultiByteToWideChar(CP_ACP, 0,
+                                (PSTR)ModEntry.NamePtr, ModEntry.NameBytes,
+                                pds->Buffer, ModEntry.NameBytes);
+        }
+
+        // null terminate string
+        pds->Buffer[pds->Length] = 0;
+
+        pdde->DriverNameOffset = (ULONG)
+            ((ULONG_PTR) pds - (ULONG_PTR) DataBase);
+
+        // get pointer to next string
+        pds = (PDUMP_STRING)
+            (DataBase + ALIGN_8(pdde->DriverNameOffset +
+                                sizeof(DUMP_STRING) +
+                                sizeof(WCHAR) * (pds->Length + 1)));
+
+        pdde = (PDUMP_DRIVER_ENTRY64)(((PUCHAR) pdde) + sizeof(*pdde));
+
+        TriageHdr->DriverCount++;
+    }
+
+    TriageHdr->StringPoolSize = (ULONG)
+        ((ULONG_PTR)pds -
+         (ULONG_PTR)(DataBase + TriageHdr->StringPoolOffset));
+}
+
+PUCHAR
+KernelTriageDumpTargetInfo::WriteUnloadedDrivers64(PUCHAR Data)
+{
+    ULONG i;
+    ULONG Index;
+    UNLOADED_DRIVERS64 ud;
+    PDUMP_UNLOADED_DRIVERS64 pdud;
+    ULONG64 pvMiUnloadedDrivers = 0;
+    ULONG ulMiLastUnloadedDriver = 0;
+    PUCHAR CountInData = Data;
+    ULONG Written = 0;
+
+    *((PULONG64) CountInData) = 0;
+    Data += sizeof(ULONG64);
+
+    //
+    // find location of unloaded drivers
+    //
+
+    if (!g_Target->m_KdDebuggerData.MmUnloadedDrivers ||
+        !g_Target->m_KdDebuggerData.MmLastUnloadedDriver)
+    {
+        return Data;
+    }
+
+    if (g_Target->ReadPointer(g_Process, g_Target->m_Machine,
+                              g_Target->m_KdDebuggerData.MmUnloadedDrivers,
+                              &pvMiUnloadedDrivers) != S_OK ||
+        CurReadAllVirtual(g_Target->m_KdDebuggerData.MmLastUnloadedDriver,
+                          &ulMiLastUnloadedDriver,
+                          sizeof(ULONG)) != S_OK)
+    {
+        return Data;
+    }
+
+    if (pvMiUnloadedDrivers == NULL || ulMiLastUnloadedDriver == 0)
+    {
+        return Data;
+    }
+
+    // point to last unloaded drivers
+    pdud = (PDUMP_UNLOADED_DRIVERS64)Data;
+
+    //
+    // Write the list with the most recently unloaded driver first to the
+    // least recently unloaded driver last.
+    //
+
+    Index = ulMiLastUnloadedDriver - 1;
+
+    for (i = 0; i < MAX_KERNEL_UNLOADED_DRIVERS; i++, Index--)
+    {
+        if (Index >= MAX_KERNEL_UNLOADED_DRIVERS)
+        {
+            Index = MAX_KERNEL_UNLOADED_DRIVERS - 1;
+        }
+
+        // read in unloaded driver
+        if (CurReadAllVirtual(pvMiUnloadedDrivers +
+                              Index * sizeof(UNLOADED_DRIVERS64),
+                              &ud, sizeof(ud)) != S_OK)
+        {
+            ErrOut(_T("Can't read memory from %s\n"),
+                   FormatAddr64(pvMiUnloadedDrivers +
+                                Index * sizeof(UNLOADED_DRIVERS64)));
+            continue;
+        }
+
+        // copy name lengths
+        pdud->Name.MaximumLength = ud.Name.MaximumLength;
+        pdud->Name.Length = ud.Name.Length;
+        if (ud.Name.Buffer == NULL)
+        {
+            continue;
+        }
+
+        // copy start and end address
+        pdud->StartAddress = ud.StartAddress;
+        pdud->EndAddress = ud.EndAddress;
+
+        // restrict name length and maximum name length to 12 characters
+        if (pdud->Name.Length > MAX_UNLOADED_NAME_LENGTH)
+        {
+            pdud->Name.Length = MAX_UNLOADED_NAME_LENGTH;
+        }
+        if (pdud->Name.MaximumLength > MAX_UNLOADED_NAME_LENGTH)
+        {
+            pdud->Name.MaximumLength = MAX_UNLOADED_NAME_LENGTH;
+        }
+        // Can't store pointers in the dump so just zero it.
+        pdud->Name.Buffer = 0;
+        // Read in name.
+        if (CurReadAllVirtual(ud.Name.Buffer,
+                              pdud->DriverName,
+                              pdud->Name.MaximumLength) != S_OK)
+        {
+            ErrOut(_T("Can't read memory at address %s\n"),
+                   FormatAddr64(ud.Name.Buffer));
+            continue;
+        }
+
+        // move to previous driver
+        pdud += 1;
+        Written++;
+    }
+
+    // number of drivers in the list
+    *((PULONG) CountInData) = Written;
+    return (PUCHAR)pdud;
+}
+
+PUCHAR
+KernelTriageDumpTargetInfo::WriteMmTriageInformation64(PUCHAR Data)
+{
+    DUMP_MM_STORAGE64 TriageInformation;
+    ULONG64 pMmVerifierData;
+    ULONG64 pvMmPagedPoolInfo;
+    ULONG cbNonPagedPool;
+    ULONG cbPagedPool;
+
+    // version information
+    TriageInformation.Version = 1;
+
+    // size information
+    TriageInformation.Size = sizeof(TriageInformation);
+
+    // get special pool tag
+    ExtractValue(MmSpecialPoolTag, TriageInformation.MmSpecialPoolTag);
+
+    // get triage action taken
+    ExtractValue(MmTriageActionTaken, TriageInformation.MiTriageActionTaken);
+    pMmVerifierData = g_Target->m_KdDebuggerData.MmVerifierData;
+
+    // read in verifier level
+    // BUGBUG - should not read internal data structures in MM
+    //if (pMmVerifierData)
+    //    DmpReadMemory(
+    //        (ULONG64) &((MM_DRIVER_VERIFIER_DATA *) pMmVerifierData)->Level,
+    //        &TriageInformation.MmVerifyDriverLevel,
+    //        sizeof(TriageInformation.MmVerifyDriverLevel));
+    //else
+        TriageInformation.MmVerifyDriverLevel = 0;
+
+    // read in verifier
+    ExtractValue(KernelVerifier, TriageInformation.KernelVerifier);
+
+    // read non paged pool info
+    ExtractValue(MmMaximumNonPagedPoolInBytes, cbNonPagedPool);
+    TriageInformation.MmMaximumNonPagedPool =
+        cbNonPagedPool / g_Target->m_Machine->m_PageSize;
+    ExtractValue(MmAllocatedNonPagedPool,
+                 TriageInformation.MmAllocatedNonPagedPool);
+
+    // read paged pool info
+    ExtractValue(MmSizeOfPagedPoolInBytes, cbPagedPool);
+    TriageInformation.PagedPoolMaximum =
+        cbPagedPool / g_Target->m_Machine->m_PageSize;
+    pvMmPagedPoolInfo = g_Target->m_KdDebuggerData.MmPagedPoolInformation;
+
+    // BUGBUG - should not read internal data structures in MM
+    //if (pvMmPagedPoolInfo)
+    //    DmpReadMemory(
+    //        (ULONG64) &((MM_PAGED_POOL_INFO *) pvMmPagedPoolInfo)->AllocatedPagedPool,
+    //        &TriageInformation.PagedPoolAllocated,
+    //        sizeof(TriageInformation.PagedPoolAllocated));
+    //else
+        TriageInformation.PagedPoolAllocated = 0;
+
+    // read committed pages info
+    ExtractValue(MmTotalCommittedPages, TriageInformation.CommittedPages);
+    ExtractValue(MmPeakCommitment, TriageInformation.CommittedPagesPeak);
+    ExtractValue(MmTotalCommitLimitMaximum,
+                 TriageInformation.CommitLimitMaximum);
+    memcpy(Data, &TriageInformation, sizeof(TriageInformation));
+    return Data + sizeof(TriageInformation);
+}
+
+//----------------------------------------------------------------------------
+//
+// KernelTriage32DumpTargetInfo::Write.
+//
+//----------------------------------------------------------------------------
+
+HRESULT
+KernelTriage32DumpTargetInfo::Write(HANDLE File, DUMP_WRITE_ARGS* Args)
+{
+    HRESULT Status;
+    PMEMORY_DUMP32 NewHeader;
+    PUCHAR DumpData;
+    ULONG64 ThreadAddr, ProcAddr;
+    BOOL ThreadAddrValid = FALSE;
+    ULONG CodeMod = 0;
+    ULONG BugCheckCode;
+    ULONG64 BugCheckData[4];
+    ULONG64 SaveDataPage = 0;
+    ULONG64 PrcbAddr;
+    // Set a special marker to indicate there is no pushed context.
+    ContextSave* PushedContext = (ContextSave*)&PushedContext;
+    ULONG i;
+    ULONG Done;
+
+    if (!IS_KERNEL_TARGET(g_Target))
+    {
+        ErrOut(_T("kernel minidumps can only be written ")
+               _T("in kernel-mode sessions\n"));
+        return E_UNEXPECTED;
+    }
+
+    dprintf(_T("mini kernel dump\n"));
+    FlushCallbacks();
+
+    NewHeader = (PMEMORY_DUMP32)malloc(TRIAGE_DUMP_SIZE32);
+    if (NewHeader == NULL)
+    {
+        ErrOut(_T("Unable to allocate dump buffer\n"));
+        return E_OUTOFMEMORY;
+    }
+    DumpData = (PUCHAR)NewHeader;
+
+    //
+    // For some bugchecks the interesting thread is a different
+    // thread than the current thread, so make the following code
+    // generic so it handles any thread.
+    //
+
+    if ((Status = g_Target->
+         ReadBugCheckData(&BugCheckCode, BugCheckData)) != S_OK)
+    {
+        ErrOut(_T("Unable to read bugcheck data\n"));
+        goto NewHeader;
+    }
+
+    if (BugCheckCode == THREAD_STUCK_IN_DEVICE_DRIVER)
+    {
+        CROSS_PLATFORM_CONTEXT Context;
+
+        // Modify the bugcheck code to indicate this
+        // minidump represents a special state.
+        CodeMod = MINIDUMP_BUGCHECK;
+
+        // The interesting thread is the first bugcheck parameter.
+        ThreadAddr = BugCheckData[0];
+        ThreadAddrValid = TRUE;
+
+        // We need to make the thread's context the current
+        // machine context for the duration of dump generation.
+        if ((Status = g_Target->
+             GetContextFromThreadStack(ThreadAddr, &Context, FALSE)) != S_OK)
+        {
+            ErrOut(_T("Unable to get context for thread %s\n"),
+                   FormatAddr64(ThreadAddr));
+            goto NewHeader;
+        }
+
+        PushedContext = g_Machine->PushContext(&Context);
+    }
+    else if (BugCheckCode == SYSTEM_THREAD_EXCEPTION_NOT_HANDLED)
+    {
+        //
+        // System thread stores a context record as the 4th parameter.
+        // use that.
+        // Also save the context record in case someone needs to look
+        // at it.
+        //
+
+        if (BugCheckData[3])
+        {
+            CROSS_PLATFORM_CONTEXT TargetContext, Context;
+
+            if (CurReadAllVirtual(BugCheckData[3], &TargetContext,
+                                  g_Target->m_TypeInfo.
+                                  SizeTargetContext) == S_OK &&
+                g_Machine->
+                ConvertTargetContextToCanon(g_Target->
+                                            m_TypeInfo.SizeTargetContext,
+                                            &TargetContext,
+                                            &Context) == S_OK)
+            {
+                CodeMod = MINIDUMP_BUGCHECK;
+                PushedContext = g_Machine->PushContext(&Context);
+                SaveDataPage = BugCheckData[3];
+            }
+        }
+    }
+    else if (BugCheckCode == KERNEL_MODE_EXCEPTION_NOT_HANDLED)
+    {
+        CROSS_PLATFORM_CONTEXT Context;
+
+        //
+        // 3rd parameter is a trap frame.
+        //
+        // Build a context record out of that only if it's a kernel mode
+        // failure because esp may be wrong in that case ???.
+        //
+        if (BugCheckData[2] &&
+            g_Machine->GetContextFromTrapFrame(BugCheckData[2], &Context,
+                                               FALSE) == S_OK)
+        {
+            CodeMod = MINIDUMP_BUGCHECK;
+            PushedContext = g_Machine->PushContext(&Context);
+            SaveDataPage = BugCheckData[2];
+        }
+    }
+    else if (BugCheckCode == UNEXPECTED_KERNEL_MODE_TRAP)
+    {
+        CROSS_PLATFORM_CONTEXT Context;
+
+        //
+        // Double fault
+        //
+        // The thread is correct in this case.
+        // Second parameter is the TSS.  If we have a TSS, convert
+        // the context and mark the bugcheck as converted.
+        //
+
+        if (BugCheckData[0] == 8 &&
+            BugCheckData[1] &&
+            g_Machine->GetContextFromTaskSegment(BugCheckData[1], &Context,
+                                                 FALSE) == S_OK)
+        {
+            CodeMod = MINIDUMP_BUGCHECK;
+            PushedContext = g_Machine->PushContext(&Context);
+        }
+    }
+
+    if (!ThreadAddrValid &&
+        (Status = g_Process->
+         GetImplicitThreadData(g_Thread, &ThreadAddr)) != S_OK)
+    {
+        ErrOut(_T("Unable to get current thread\n"));
+        goto NewHeader;
+    }
+
+    if (PushedContext == (ContextSave*)&PushedContext)
+    {
+        // If an explicit context wasn't pushed we need
+        // to make sure that the dump thread's context
+        // is active as it may not be the current thread.
+        if ((Status = GetRegSourceContext(GetDefRegSource(), TRUE,
+                                          NULL, &PushedContext)) != S_OK)
+        {
+            goto NewHeader;
+        }
+
+        // If there wasn't a push it gets NULLed, so
+        // translate that to our special no-push marker.
+        if (!PushedContext)
+        {
+            PushedContext = (ContextSave*)&PushedContext;
+        }
+    }
+    
+    //
+    // Set up the main header.
+    //
+
+    KernelDumpTargetInfo::InitDumpHeader32(&NewHeader->Header,
+                                           Args->CommentA,
+                                           Args->CommentW,
+                                           CodeMod);
+    NewHeader->Header.DumpType = DUMP_TYPE_TRIAGE;
+    NewHeader->Header.MiniDumpFields = TRIAGE_DUMP_BASIC_INFO;
+    NewHeader->Header.WriterStatus = DUMP_DBGENG_SUCCESS;
+
+    //
+    // Triage dump header begins after dump header.
+    //
+
+    TRIAGE_DUMP32 *TriageHdr = &NewHeader->Triage;
+
+    ZeroMemory(TriageHdr, sizeof(*TriageHdr));
+    
+    TriageHdr->ServicePackBuild = g_Target->m_ServicePackNumber;
+    TriageHdr->SizeOfDump = TRIAGE_DUMP_SIZE32;
+
+    TriageHdr->ContextOffset = FIELD_OFFSET(DUMP_HEADER32, ContextRecord);
+    TriageHdr->ExceptionOffset = FIELD_OFFSET(DUMP_HEADER32, Exception);
+
+    //
+    // Starting offset in triage dump follows the triage dump header.
+    //
+
+    unsigned Offset =
+        ALIGN_8(sizeof(DUMP_HEADER32) + sizeof(TRIAGE_DUMP32));
+
+    //
+    // Write MM information for Win2K and above only.
+    //
+
+    if (g_Target->m_SystemVersion >= NT_SVER_W2K)
+    {
+        TriageHdr->MmOffset = Offset;
+        Offset =
+            ALIGN_8((ULONG)(WriteMmTriageInformation32(DumpData + Offset) -
+                            DumpData));
+    }
+
+    //
+    // Write unloaded drivers.
+    //
+
+    TriageHdr->UnloadedDriversOffset = Offset;
+    Offset = ALIGN_8((ULONG)(WriteUnloadedDrivers32(DumpData + Offset) -
+                             DumpData));
+
+    //
+    // Write processor control block (KPRCB).
+    //
+
+    if ((Status = g_Target->
+         GetProcessorSystemDataOffset(CURRENT_PROC,
+                                      DEBUG_DATA_KPRCB_OFFSET,
+                                      &PrcbAddr)) != S_OK ||
+        (Status = CurReadAllVirtual(PrcbAddr,
+                                    DumpData + Offset,
+                                    g_Target->
+                                    m_KdDebuggerData.SizePrcb)) != S_OK)
+    {
+        ErrOut(_T("Unable to get current PRCB\n"));
+        goto NewHeader;
+    }
+
+    TriageHdr->PrcbOffset = Offset;
+    Offset += ALIGN_8(g_Target->m_KdDebuggerData.SizePrcb);
+
+    //
+    // Write the thread and process data structures.
+    //
+
+    if (g_Target->ReadPointer(g_Process, g_Machine,
+                              ThreadAddr + g_Target->
+                              m_KdDebuggerData.OffsetKThreadApcProcess,
+                              &ProcAddr) == S_OK &&
+        CurReadAllVirtual(ProcAddr,
+                          DumpData + Offset,
+                          g_Target->m_KdDebuggerData.SizeEProcess) == S_OK)
+    {
+        TriageHdr->ProcessOffset = Offset;
+        Offset += ALIGN_8(g_Target->m_KdDebuggerData.SizeEProcess);
+    }
+    else
+    {
+        ProcAddr = 0;
+    }
+    
+    if (CurReadAllVirtual(ThreadAddr,
+                          DumpData + Offset,
+                          g_Target->m_KdDebuggerData.SizeEThread) == S_OK)
+    {
+        TriageHdr->ThreadOffset = Offset;
+        Offset += ALIGN_8(g_Target->m_KdDebuggerData.SizeEThread);
+    }
+
+    //
+    // Write the call stack.
+    //
+
+    ADDR StackPtr;
+    ULONG64 StackBase;
+    BOOL MustReadAll = TRUE;
+
+    g_Machine->GetSP(&StackPtr);
+    TriageHdr->TopOfStack = (ULONG)(ULONG_PTR)Flat(StackPtr);
+
+    if (g_Target->
+        ReadPointer(g_Process, g_Machine,
+                    g_Target->m_KdDebuggerData.OffsetKThreadInitialStack +
+                    ThreadAddr,
+                    &StackBase) != S_OK)
+    {
+        StackBase = Flat(StackPtr) + MAX_TRIAGE_STACK_SIZE32;
+        MustReadAll = FALSE;
+    }
+
+    //
+    // There may have been a stack switch (DPCs, double-faults, etc.)
+    // so the current stack pointer may not be within the
+    // stack bounds.  If that's the case just try and read
+    // as much of the stack as possible.
+    //
+
+    if (StackBase <= Flat(StackPtr) ||
+        Flat(StackPtr) < StackBase - 16 * g_Machine->m_PageSize)
+    {
+        TriageHdr->SizeOfCallStack = MAX_TRIAGE_STACK_SIZE32;
+        MustReadAll = FALSE;
+    }
+    else
+    {
+        TriageHdr->SizeOfCallStack =
+            min((ULONG)(ULONG_PTR)(StackBase - Flat(StackPtr)),
+                MAX_TRIAGE_STACK_SIZE32);
+    }
+
+    if (TriageHdr->SizeOfCallStack)
+    {
+        if ((Status =
+             CurReadVirtual(EXTEND64(TriageHdr->TopOfStack),
+                            DumpData + Offset,
+                            TriageHdr->SizeOfCallStack,
+                            &Done)) != S_OK)
+        {
+            ErrOut(_T("Unable to read thread stack at %s\n"),
+                   FormatAddr64(TriageHdr->TopOfStack));
+            goto NewHeader;
+        }
+        if (MustReadAll && Done < TriageHdr->SizeOfCallStack)
+        {
+            ErrOut(_T("Unable to read full thread stack at %s\n"),
+                   FormatAddr64(TriageHdr->TopOfStack));
+            Status = HRESULT_FROM_WIN32(ERROR_READ_FAULT);
+            goto NewHeader;
+        }
+
+        TriageHdr->CallStackOffset = Offset;
+        TriageHdr->SizeOfCallStack = Done;
+        Offset += ALIGN_8(TriageHdr->SizeOfCallStack);
+    }
+
+    //
+    // Write debugger data.
+    //
+
+    if (g_Target->m_SystemVersion >= NT_SVER_XP &&
+        g_Target->m_KdDebuggerDataOffset &&
+        (!IS_KERNEL_TRIAGE_DUMP(g_Target) ||
+         ((KernelTriageDumpTargetInfo*)g_Target)->m_HasDebuggerData) &&
+        Offset +
+        ALIGN_8(sizeof(g_Target->m_KdDebuggerData)) < TRIAGE_DUMP_SIZE32)
+    {
+        NewHeader->Header.MiniDumpFields |= TRIAGE_DUMP_DEBUGGER_DATA;
+        TriageHdr->DebuggerDataSize = sizeof(g_Target->m_KdDebuggerData);
+        memcpy(DumpData + Offset,
+               &g_Target->m_KdDebuggerData,
+               sizeof(g_Target->m_KdDebuggerData));
+        TriageHdr->DebuggerDataOffset = Offset;
+        Offset += ALIGN_8(sizeof(g_Target->m_KdDebuggerData));
+    }
+
+    //
+    // Write loaded driver list.
+    //
+
+    ModuleInfo* ModIter;
+    ULONG MaxEntries;
+
+    // Use a heuristic to guess how many entries we
+    // can pack into the remaining space.
+    MaxEntries = (TRIAGE_DUMP_SIZE32 - Offset) /
+        (sizeof(DUMP_DRIVER_ENTRY32) + TRIAGE_DRIVER_NAME_SIZE_GUESS);
+
+    TriageHdr->DriverCount = 0;
+    if (ModIter = g_Target->GetModuleInfo(FALSE))
+    {
+        if ((Status = ModIter->
+             Initialize(g_Thread, MODULE_INFO_ALL_STD)) == S_OK)
+        {
+            while (TriageHdr->DriverCount < MaxEntries)
+            {
+                MODULE_INFO_ENTRY ModEntry;
+
+                ULONG EntryRet = GetNextModuleEntry(ModIter, &ModEntry);
+
+                if (EntryRet == GNME_CORRUPT ||
+                    EntryRet == GNME_DONE)
+                {
+                    if (EntryRet == GNME_CORRUPT)
+                    {
+                        NewHeader->Header.WriterStatus =
+                            DUMP_DBGENG_CORRUPT_MODULE_LIST;
+                    }
+                    break;
+                }
+                else if (EntryRet == GNME_NO_NAME)
+                {
+                    continue;
+                }
+
+                TriageHdr->DriverCount++;
+            }
+        }
+        else
+        {
+            NewHeader->Header.WriterStatus =
+                DUMP_DBGENG_NO_MODULE_LIST;
+        }
+    }
+
+    TriageHdr->DriverListOffset = Offset;
+    Offset += ALIGN_8(TriageHdr->DriverCount * sizeof(DUMP_DRIVER_ENTRY32));
+    TriageHdr->StringPoolOffset = Offset;
+    TriageHdr->BrokenDriverOffset = 0;
+
+    WriteDriverList32(DumpData, TriageHdr);
+
+    Offset = TriageHdr->StringPoolOffset + TriageHdr->StringPoolSize;
+    Offset = ALIGN_8(Offset);
+
+    //
+    // For XP and above add in any additional data pages and write out
+    // whatever fits.
+    //
+
+    if (g_Target->m_SystemVersion >= NT_SVER_XP)
+    {
+        if (SaveDataPage)
+        {
+            IoAddTriageDumpDataBlock(PAGE_ALIGN(g_Machine, SaveDataPage),
+                                     g_Machine->m_PageSize);
+        }
+
+        // If there are other interesting data pages, such as
+        // alternate stacks for DPCs and such, pick them up.
+        if (PrcbAddr)
+        {
+            ADDR_RANGE AltData[MAX_ALT_ADDR_RANGES];
+
+            ZeroMemory(AltData, sizeof(AltData));
+            if (g_Machine->GetAlternateTriageDumpDataRanges(PrcbAddr,
+                                                            ThreadAddr,
+                                                            AltData) == S_OK)
+            {
+                for (i = 0; i < MAX_ALT_ADDR_RANGES; i++)
+                {
+                    if (AltData[i].Base)
+                    {
+                        IoAddTriageDumpDataBlock(AltData[i].Base,
+                                                 AltData[i].Size);
+                    }
+                }
+            }
+        }
+
+        // Add any data blocks that were registered
+        // in the debuggee.
+        AddInMemoryTriageDataBlocks();
+
+        // Add data blocks which might be referred to by
+        // the context or other runtime state.
+        IopAddRunTimeTriageDataBlocks(&g_Machine->m_Context,
+                                      EXTEND64(TriageHdr->TopOfStack),
+                                      EXTEND64(TriageHdr->TopOfStack +
+                                               TriageHdr->SizeOfCallStack),
+                                      0, 0);
+
+        // Check which data blocks fit and write them.
+        Offset = IopSizeTriageDumpDataBlocks(Offset, TRIAGE_DUMP_SIZE32,
+                                             &TriageHdr->DataBlocksOffset,
+                                             &TriageHdr->DataBlocksCount);
+        Offset = ALIGN_8(Offset);
+        if (TriageHdr->DataBlocksCount)
+        {
+            NewHeader->Header.MiniDumpFields |= TRIAGE_DUMP_DATA_BLOCKS;
+            IopWriteTriageDumpDataBlocks(TriageHdr->DataBlocksOffset,
+                                         TriageHdr->DataBlocksCount,
+                                         DumpData);
+        }
+    }
+
+    //
+    // All options are enabled.
+    //
+
+    TriageHdr->TriageOptions = 0xffffffff;
+
+    //
+    // End of triage dump validated.
+    //
+
+    TriageHdr->ValidOffset = TRIAGE_DUMP_SIZE32 - sizeof(ULONG);
+    *(PULONG)(DumpData + TriageHdr->ValidOffset) = TRIAGE_DUMP_VALID;
+
+    //
+    // Write it out to the file.
+    //
+
+    if ((Status = DumpWriteFile(File, DumpData,
+                                TRIAGE_DUMP_SIZE32)) == S_OK)
+    {
+        Status = DumpWriteTaggedData(File);
+    }
+
+ NewHeader:
+    if (PushedContext != (ContextSave*)&PushedContext)
+    {
+        g_Machine->PopContext(PushedContext);
+    }
+    free(NewHeader);
+    return Status;
+}
+
+//----------------------------------------------------------------------------
+//
+// KernelTriage64DumpTargetInfo::Write.
+//
+//----------------------------------------------------------------------------
+
+HRESULT
+KernelTriage64DumpTargetInfo::Write(HANDLE File, DUMP_WRITE_ARGS* Args)
+{
+    HRESULT Status;
+    PMEMORY_DUMP64 NewHeader;
+    PUCHAR DumpData;
+    ULONG64 ThreadAddr, ProcAddr;
+    BOOL ThreadAddrValid = FALSE;
+    ULONG CodeMod = 0;
+    ULONG BugCheckCode;
+    ULONG64 BugCheckData[4];
+    ULONG64 SaveDataPage = 0;
+    ULONG64 BStoreBase = 0;
+    ULONG BStoreSize = 0;
+    ULONG64 BStoreLimit;
+    ULONG64 PrcbAddr;
+    // Set a special marker to indicate there is no pushed context.
+    ContextSave* PushedContext = (ContextSave*)&PushedContext;
+    ULONG i;
+    ULONG Done;
+
+    if (!IS_KERNEL_TARGET(g_Target))
+    {
+        ErrOut(_T("kernel minidumps can only be written ")
+               _T("in kernel-mode sessions\n"));
+        return E_UNEXPECTED;
+    }
+
+    dprintf(_T("mini kernel dump\n"));
+    FlushCallbacks();
+
+    NewHeader = (PMEMORY_DUMP64)malloc(TRIAGE_DUMP_SIZE64);
+    if (NewHeader == NULL)
+    {
+        ErrOut(_T("Unable to allocate dump buffer\n"));
+        return E_OUTOFMEMORY;
+    }
+    DumpData = (PUCHAR)NewHeader;
+
+    //
+    // For some bugchecks the interesting thread is a different
+    // thread than the current thread, so make the following code
+    // generic so it handles any thread.
+    //
+
+    if ((Status = g_Target->
+         ReadBugCheckData(&BugCheckCode, BugCheckData)) != S_OK)
+    {
+        ErrOut(_T("Unable to read bugcheck data\n"));
+        goto NewHeader;
+    }
+
+    if (BugCheckCode == THREAD_STUCK_IN_DEVICE_DRIVER)
+    {
+        CROSS_PLATFORM_CONTEXT Context;
+
+        // Modify the bugcheck code to indicate this
+        // minidump represents a special state.
+        CodeMod = MINIDUMP_BUGCHECK;
+
+        // The interesting thread is the first bugcheck parameter.
+        ThreadAddr = BugCheckData[0];
+        ThreadAddrValid = TRUE;
+
+        // We need to make the thread's context the current
+        // machine context for the duration of dump generation.
+        if ((Status = g_Target->
+             GetContextFromThreadStack(ThreadAddr, &Context, FALSE)) != S_OK)
+        {
+            ErrOut(_T("Unable to get context for thread %s\n"),
+                   FormatAddr64(ThreadAddr));
+            goto NewHeader;
+        }
+
+        PushedContext = g_Machine->PushContext(&Context);
+    }
+    else if (BugCheckCode == SYSTEM_THREAD_EXCEPTION_NOT_HANDLED)
+    {
+        //
+        // System thread stores a context record as the 4th parameter.
+        // use that.
+        // Also save the context record in case someone needs to look
+        // at it.
+        //
+
+        if (BugCheckData[3])
+        {
+            CROSS_PLATFORM_CONTEXT TargetContext, Context;
+
+            if (CurReadAllVirtual(BugCheckData[3], &TargetContext,
+                                  g_Target->
+                                  m_TypeInfo.SizeTargetContext) == S_OK &&
+                g_Machine->
+                ConvertTargetContextToCanon(g_Target->
+                                            m_TypeInfo.SizeTargetContext,
+                                            &TargetContext,
+                                            &Context) == S_OK)
+            {
+                CodeMod = MINIDUMP_BUGCHECK;
+                PushedContext = g_Machine->PushContext(&Context);
+                SaveDataPage = BugCheckData[3];
+            }
+        }
+    }
+    else if (BugCheckCode == KERNEL_MODE_EXCEPTION_NOT_HANDLED)
+    {
+        CROSS_PLATFORM_CONTEXT Context;
+
+        //
+        // 3rd parameter is a trap frame.
+        //
+        // Build a context record out of that only if it's a kernel mode
+        // failure because esp may be wrong in that case ???.
+        //
+        if (BugCheckData[2] &&
+            g_Machine->GetContextFromTrapFrame(BugCheckData[2], &Context,
+                                               FALSE) == S_OK)
+        {
+            CodeMod = MINIDUMP_BUGCHECK;
+            PushedContext = g_Machine->PushContext(&Context);
+            SaveDataPage = BugCheckData[2];
+        }
+    }
+
+    if (!ThreadAddrValid &&
+        (Status = g_Process->
+         GetImplicitThreadData(g_Thread, &ThreadAddr)) != S_OK)
+    {
+        ErrOut(_T("Unable to get current thread\n"));
+        goto NewHeader;
+    }
+
+    if (PushedContext == (ContextSave*)&PushedContext)
+    {
+        // If an explicit context wasn't pushed we need
+        // to make sure that the dump thread's context
+        // is active as it may not be the current thread.
+        if ((Status = GetRegSourceContext(GetDefRegSource(), TRUE,
+                                          NULL, &PushedContext)) != S_OK)
+        {
+            goto NewHeader;
+        }
+
+        // If there wasn't a push it gets NULLed, so
+        // translate that to our special no-push marker.
+        if (!PushedContext)
+        {
+            PushedContext = (ContextSave*)&PushedContext;
+        }
+    }
+    
+    //
+    // Set up the main header.
+    //
+
+    KernelDumpTargetInfo::InitDumpHeader64(&NewHeader->Header,
+                                           Args->CommentA,
+                                           Args->CommentW,
+                                           CodeMod);
+    NewHeader->Header.DumpType = DUMP_TYPE_TRIAGE;
+    NewHeader->Header.MiniDumpFields = TRIAGE_DUMP_BASIC_INFO;
+    NewHeader->Header.WriterStatus = DUMP_DBGENG_SUCCESS;
+
+    //
+    // Triage dump header begins after dump header.
+    //
+
+    TRIAGE_DUMP64 *TriageHdr = &NewHeader->Triage;
+
+    ZeroMemory(TriageHdr, sizeof(*TriageHdr));
+    
+    TriageHdr->ServicePackBuild = g_Target->m_ServicePackNumber;
+    TriageHdr->SizeOfDump = TRIAGE_DUMP_SIZE64;
+
+    TriageHdr->ContextOffset = FIELD_OFFSET(DUMP_HEADER64, ContextRecord);
+    TriageHdr->ExceptionOffset = FIELD_OFFSET(DUMP_HEADER64, Exception);
+
+    //
+    // Starting offset in triage dump follows the triage dump header.
+    //
+
+    unsigned Offset =
+        ALIGN_8(sizeof(DUMP_HEADER64) + sizeof(TRIAGE_DUMP64));
+
+    //
+    // Write MM information.
+    //
+
+    TriageHdr->MmOffset = Offset;
+    Offset =
+        ALIGN_8((ULONG)(WriteMmTriageInformation64(DumpData + Offset) -
+                        DumpData));
+
+    //
+    // Write unloaded drivers.
+    //
+
+    TriageHdr->UnloadedDriversOffset = Offset;
+    Offset = ALIGN_8((ULONG)(WriteUnloadedDrivers64(DumpData + Offset) -
+                             DumpData));
+
+    //
+    // Write processor control block (KPRCB).
+    //
+
+    if ((Status = g_Target->
+         GetProcessorSystemDataOffset(CURRENT_PROC,
+                                      DEBUG_DATA_KPRCB_OFFSET,
+                                      &PrcbAddr)) != S_OK ||
+        (Status = CurReadAllVirtual(PrcbAddr,
+                                    DumpData + Offset,
+                                    g_Target->
+                                    m_KdDebuggerData.SizePrcb)) != S_OK)
+    {
+        ErrOut(_T("Unable to get current PRCB\n"));
+        goto NewHeader;
+    }
+    
+    TriageHdr->PrcbOffset = Offset;
+    Offset += ALIGN_8(g_Target->m_KdDebuggerData.SizePrcb);
+
+    //
+    // Write the thread and process data structures.
+    //
+
+    if (g_Target->ReadPointer(g_Process, g_Machine,
+                              ThreadAddr + g_Target->
+                              m_KdDebuggerData.OffsetKThreadApcProcess,
+                              &ProcAddr) == S_OK &&
+        CurReadAllVirtual(ProcAddr,
+                          DumpData + Offset,
+                          g_Target->m_KdDebuggerData.SizeEProcess) == S_OK)
+    {
+        TriageHdr->ProcessOffset = Offset;
+        Offset += ALIGN_8(g_Target->m_KdDebuggerData.SizeEProcess);
+    }
+    else
+    {
+        ProcAddr = 0;
+    }
+    
+    if (CurReadAllVirtual(ThreadAddr,
+                          DumpData + Offset,
+                          g_Target->m_KdDebuggerData.SizeEThread) == S_OK)
+    {
+        TriageHdr->ThreadOffset = Offset;
+        Offset += ALIGN_8(g_Target->m_KdDebuggerData.SizeEThread);
+    }
+
+    //
+    // Write the call stack.
+    //
+
+    ADDR StackPtr;
+    ULONG64 StackBase;
+    BOOL MustReadAll = TRUE;
+
+    g_Machine->GetSP(&StackPtr);
+    TriageHdr->TopOfStack = Flat(StackPtr);
+
+    if (g_Target->
+        ReadPointer(g_Process, g_Machine,
+                    g_Target->m_KdDebuggerData.OffsetKThreadInitialStack +
+                    ThreadAddr,
+                    &StackBase) != S_OK)
+    {
+        StackBase = Flat(StackPtr) + MAX_TRIAGE_STACK_SIZE64;
+        MustReadAll = FALSE;
+    }
+
+    //
+    // There may have been a stack switch (DPCs, double-faults, etc.)
+    // so the current stack pointer may not be within the
+    // stack bounds.  If that's the case just try and read
+    // as much of the stack as possible.
+    //
+
+    if (StackBase <= Flat(StackPtr) ||
+        Flat(StackPtr) < StackBase - 16 * g_Machine->m_PageSize)
+    {
+        TriageHdr->SizeOfCallStack = MAX_TRIAGE_STACK_SIZE64;
+        MustReadAll = FALSE;
+    }
+    else
+    {
+        TriageHdr->SizeOfCallStack =
+            min((ULONG)(ULONG_PTR)(StackBase - Flat(StackPtr)),
+                MAX_TRIAGE_STACK_SIZE64);
+    }
+
+    if (TriageHdr->SizeOfCallStack)
+    {
+        if ((Status =
+             CurReadVirtual(TriageHdr->TopOfStack,
+                            DumpData + Offset,
+                            TriageHdr->SizeOfCallStack,
+                            &Done)) != S_OK)
+        {
+            ErrOut(_T("Unable to read thread stack at %s\n"),
+                   FormatAddr64(TriageHdr->TopOfStack));
+            goto NewHeader;
+        }
+        if (MustReadAll && Done < TriageHdr->SizeOfCallStack)
+        {
+            ErrOut(_T("Unable to read full thread stack at %s\n"),
+                   FormatAddr64(TriageHdr->TopOfStack));
+            Status = HRESULT_FROM_WIN32(ERROR_READ_FAULT);
+            goto NewHeader;
+        }
+    
+        TriageHdr->CallStackOffset = Offset;
+        TriageHdr->SizeOfCallStack = Done;
+        Offset += ALIGN_8(TriageHdr->SizeOfCallStack);
+    }
+
+    //
+    // The IA64 contains two call stacks. The first is the normal
+    // call stack, and the second is a scratch region where
+    // the processor can spill registers. It is this latter stack,
+    // the backing-store, that we now save.
+    //
+
+    if (g_Target->m_MachineType == IMAGE_FILE_MACHINE_IA64 &&
+        g_Target->ReadPointer(g_Process, g_Machine,
+                              ThreadAddr +
+                              g_Target->m_KdDebuggerData.OffsetKThreadBStore,
+                              &BStoreBase) == S_OK &&
+        g_Target->ReadPointer(g_Process, g_Machine,
+                              ThreadAddr +
+                              g_Target->
+                              m_KdDebuggerData.OffsetKThreadBStoreLimit,
+                              &BStoreLimit) == S_OK)
+    {
+        BStoreSize = min((ULONG)(BStoreLimit - BStoreBase),
+                         MAX_TRIAGE_BSTORE_SIZE);
+
+        if (BStoreSize &&
+            CurReadAllVirtual(BStoreBase,
+                              DumpData + Offset,
+                              BStoreSize) == S_OK)
+        {
+            TriageHdr->ArchitectureSpecific.Ia64.BStoreOffset = Offset;
+            TriageHdr->ArchitectureSpecific.Ia64.LimitOfBStore = BStoreLimit;
+            TriageHdr->ArchitectureSpecific.Ia64.SizeOfBStore = BStoreSize;
+            Offset += ALIGN_8(BStoreSize);
+        }
+    }
+
+    //
+    // Write debugger data.
+    //
+
+    if (g_Target->m_SystemVersion >= NT_SVER_XP &&
+        g_Target->m_KdDebuggerDataOffset &&
+        (!IS_KERNEL_TRIAGE_DUMP(g_Target) ||
+         ((KernelTriageDumpTargetInfo*)g_Target)->m_HasDebuggerData) &&
+        Offset +
+        ALIGN_8(sizeof(g_Target->m_KdDebuggerData)) < TRIAGE_DUMP_SIZE64)
+    {
+        NewHeader->Header.MiniDumpFields |= TRIAGE_DUMP_DEBUGGER_DATA;
+        TriageHdr->DebuggerDataSize = sizeof(g_Target->m_KdDebuggerData);
+        memcpy(DumpData + Offset,
+               &g_Target->m_KdDebuggerData,
+               sizeof(g_Target->m_KdDebuggerData));
+        TriageHdr->DebuggerDataOffset = Offset;
+        Offset += ALIGN_8(sizeof(g_Target->m_KdDebuggerData));
+    }
+
+    //
+    // Write loaded driver list.
+    //
+
+    ModuleInfo* ModIter;
+    ULONG MaxEntries;
+
+    // Use a heuristic to guess how many entries we
+    // can pack into the remaining space.
+    MaxEntries = (TRIAGE_DUMP_SIZE64 - Offset) /
+        (sizeof(DUMP_DRIVER_ENTRY64) + TRIAGE_DRIVER_NAME_SIZE_GUESS);
+
+    TriageHdr->DriverCount = 0;
+    if (ModIter = g_Target->GetModuleInfo(FALSE))
+    {
+        if ((Status = ModIter->
+             Initialize(g_Thread, MODULE_INFO_ALL_STD)) == S_OK)
+        {
+            while (TriageHdr->DriverCount < MaxEntries)
+            {
+                MODULE_INFO_ENTRY ModEntry;
+
+                ULONG EntryRet = GetNextModuleEntry(ModIter, &ModEntry);
+
+                if (EntryRet == GNME_CORRUPT ||
+                    EntryRet == GNME_DONE)
+                {
+                    if (EntryRet == GNME_CORRUPT)
+                    {
+                        NewHeader->Header.WriterStatus =
+                            DUMP_DBGENG_CORRUPT_MODULE_LIST;
+                    }
+                    break;
+                }
+                else if (EntryRet == GNME_NO_NAME)
+                {
+                    continue;
+                }
+
+                TriageHdr->DriverCount++;
+            }
+        }
+        else
+        {
+            NewHeader->Header.WriterStatus =
+                DUMP_DBGENG_NO_MODULE_LIST;
+        }
+    }
+
+    TriageHdr->DriverListOffset = Offset;
+    Offset += ALIGN_8(TriageHdr->DriverCount * sizeof(DUMP_DRIVER_ENTRY64));
+    TriageHdr->StringPoolOffset = Offset;
+    TriageHdr->BrokenDriverOffset = 0;
+
+    WriteDriverList64(DumpData, TriageHdr);
+
+    Offset = TriageHdr->StringPoolOffset + TriageHdr->StringPoolSize;
+    Offset = ALIGN_8(Offset);
+
+    //
+    // For XP and above add in any additional data pages and write out
+    // whatever fits.
+    //
+
+    if (g_Target->m_SystemVersion >= NT_SVER_XP)
+    {
+        if (SaveDataPage)
+        {
+            IoAddTriageDumpDataBlock(PAGE_ALIGN(g_Machine, SaveDataPage),
+                                     g_Machine->m_PageSize);
+        }
+
+        // If there are other interesting data pages, such as
+        // alternate stacks for DPCs and such, pick them up.
+        if (PrcbAddr)
+        {
+            ADDR_RANGE AltData[MAX_ALT_ADDR_RANGES];
+
+            ZeroMemory(AltData, sizeof(AltData));
+            if (g_Machine->GetAlternateTriageDumpDataRanges(PrcbAddr,
+                                                            ThreadAddr,
+                                                            AltData) == S_OK)
+            {
+                for (i = 0; i < MAX_ALT_ADDR_RANGES; i++)
+                {
+                    if (AltData[i].Base)
+                    {
+                        IoAddTriageDumpDataBlock(AltData[i].Base,
+                                                 AltData[i].Size);
+                    }
+                }
+            }
+        }
+
+        // Add any data blocks that were registered
+        // in the debuggee.
+        AddInMemoryTriageDataBlocks();
+
+        // Add data blocks which might be referred to by
+        // the context or other runtime state.
+        IopAddRunTimeTriageDataBlocks(&g_Machine->m_Context,
+                                      TriageHdr->TopOfStack,
+                                      TriageHdr->TopOfStack +
+                                      TriageHdr->SizeOfCallStack,
+                                      BStoreBase,
+                                      BStoreSize);
+
+        // Check which data blocks fit and write them.
+        Offset = IopSizeTriageDumpDataBlocks(Offset, TRIAGE_DUMP_SIZE64,
+                                             &TriageHdr->DataBlocksOffset,
+                                             &TriageHdr->DataBlocksCount);
+        Offset = ALIGN_8(Offset);
+        if (TriageHdr->DataBlocksCount)
+        {
+            NewHeader->Header.MiniDumpFields |= TRIAGE_DUMP_DATA_BLOCKS;
+            IopWriteTriageDumpDataBlocks(TriageHdr->DataBlocksOffset,
+                                         TriageHdr->DataBlocksCount,
+                                         (PUCHAR)NewHeader);
+        }
+    }
+
+    //
+    // All options are enabled.
+    //
+
+    TriageHdr->TriageOptions = 0xffffffff;
+
+    //
+    // End of triage dump validated.
+    //
+
+    TriageHdr->ValidOffset = TRIAGE_DUMP_SIZE64 - sizeof(ULONG);
+    *(PULONG)(DumpData + TriageHdr->ValidOffset) = TRIAGE_DUMP_VALID;
+
+    //
+    // Write it out to the file.
+    //
+
+    if ((Status = DumpWriteFile(File, DumpData,
+                                TRIAGE_DUMP_SIZE64)) == S_OK)
+    {
+        Status = DumpWriteTaggedData(File);
+    }
+
+ NewHeader:
+    if (PushedContext != (ContextSave*)&PushedContext)
+    {
+        g_Machine->PopContext(PushedContext);
+    }
+    free(NewHeader);
+    return Status;
+}
+
+//----------------------------------------------------------------------------
+//
+// Functions.
+//
+//----------------------------------------------------------------------------
+
+HRESULT
+WriteDumpFile(PCWSTR FileName, ULONG64 FileHandle,
+              DUMP_WRITE_ARGS* Args)
+{
+    ULONG DumpType = DTYPE_COUNT;
+    DumpTargetInfo* WriteTarget;
+    HRESULT Status;
+    ULONG OldMachine;
+    WCHAR TempFile[2 * MAX_PATH];
+    PCWSTR DumpWriteFile;
+    HANDLE DumpWriteHandle;
+
+    if (!IS_CUR_MACHINE_ACCESSIBLE())
+    {
+        return E_UNEXPECTED;
+    }
+
+    if (IS_KERNEL_TARGET(g_Target))
+    {
+        DbgKdTransport* KdTrans;
+
+        if (Args->FormatFlags & ~GENERIC_FORMATS)
+        {
+            return E_INVALIDARG;
+        }
+
+        //
+        // not much we can do without the processor block
+        // or at least the PRCB for the current process in a minidump.
+        //
+
+        if (!g_Target->m_KdDebuggerData.KiProcessorBlock &&
+            IS_DUMP_TARGET(g_Target) &&
+            !((KernelDumpTargetInfo*)g_Target)->m_KiProcessors[CURRENT_PROC])
+        {
+            ErrOut(_T("Cannot find KiProcessorBlock - ")
+                   _T("can not create dump file\n"));
+
+            return E_FAIL;
+        }
+
+        if (IS_CONN_KERNEL_TARGET(g_Target))
+        {
+            KdTrans = ((ConnLiveKernelTargetInfo*)g_Target)->m_Transport;
+        }
+        else
+        {
+            KdTrans = NULL;
+        }
+
+        switch(Args->Qualifier)
+        {
+        case DEBUG_KERNEL_SMALL_DUMP:
+            DumpType = g_Target->m_Machine->m_Ptr64 ?
+                DTYPE_KERNEL_TRIAGE64 : DTYPE_KERNEL_TRIAGE32;
+            break;
+        case DEBUG_KERNEL_FULL_DUMP:
+            if (KdTrans != NULL &&
+                KdTrans->m_DirectPhysicalMemory == FALSE)
+            {
+                WarnOut(_T("Creating a full kernel dump over the COM port is ")
+                        _T("a VERY VERY slow operation.\n")
+                        _T("This command may take many HOURS to complete.  ")
+                        _T("Ctrl-C if you want to terminate the command.\n"));
+            }
+            DumpType = g_Target->m_Machine->m_Ptr64 ?
+                DTYPE_KERNEL_FULL64 : DTYPE_KERNEL_FULL32;
+            break;
+        default:
+            // Other formats are not supported.
+            return E_INVALIDARG;
+        }
+    }
+    else
+    {
+        DBG_ASSERT(IS_USER_TARGET(g_Target));
+
+        switch(Args->Qualifier)
+        {
+        case DEBUG_USER_WINDOWS_SMALL_DUMP:
+            if (Args->FormatFlags & ~(GENERIC_FORMATS |
+                                      UMINI_FORMATS))
+            {
+                return E_INVALIDARG;
+            }
+
+            DumpType = (Args->FormatFlags &
+                        DEBUG_FORMAT_USER_SMALL_FULL_MEMORY) ?
+                DTYPE_USER_MINI_FULL : DTYPE_USER_MINI_PARTIAL;
+            break;
+
+        case DEBUG_USER_WINDOWS_DUMP:
+            if (Args->FormatFlags & ~GENERIC_FORMATS)
+            {
+                return E_INVALIDARG;
+            }
+
+            DumpType = g_Target->m_Machine->m_Ptr64 ?
+                DTYPE_USER_FULL64 : DTYPE_USER_FULL32;
+            break;
+        default:
+            // Other formats are not supported.
+            return E_INVALIDARG;
+        }
+    }
+
+    WriteTarget = NewDumpTargetInfo(DumpType);
+    if (WriteTarget == NULL)
+    {
+        ErrOut(_T("Unable to create dump write target\n"));
+        return E_OUTOFMEMORY;
+    }
+
+    // Ensure that the dump is always written according to the
+    // target machine type and not any emulated machine.
+    OldMachine = g_Target->m_EffMachineType;
+    g_Target->SetEffMachine(g_Target->m_MachineType, FALSE);
+
+    // Flush context first so that the minidump reads the
+    // same register values the debugger has.
+    g_Target->FlushRegContext();
+
+    //
+    // If we're producing a CAB put the dump in a temp file.
+    //
+
+    if (Args->FormatFlags & DEBUG_FORMAT_WRITE_CAB)
+    {
+        if (FileHandle)
+        {
+            Status = E_INVALIDARG;
+            goto Exit;
+        }
+
+        if (!GetTempPathW(DIMA(TempFile), TempFile))
+        {
+            wcscpy(TempFile, L".\\");
+        }
+        // Use the CAB name as the dump file name so the
+        // name in the CAB will match.
+        CatStringW(TempFile, PathTailW(FileName), DIMA(TempFile));
+        CatStringW(TempFile, L".dmp", DIMA(TempFile));
+
+        DumpWriteFile = TempFile;
+        Args->FormatFlags &= ~DEBUG_FORMAT_NO_OVERWRITE;
+    }
+    else
+    {
+        DumpWriteFile = FileName;
+        if (!DumpWriteFile)
+        {
+            DumpWriteFile = L"<HandleOnly>";
+        }
+    }
+
+    if (FileHandle)
+    {
+        DumpWriteHandle = OS_HANDLE(FileHandle);
+        if (!DumpWriteHandle || DumpWriteHandle == INVALID_HANDLE_VALUE)
+        {
+            Status = E_INVALIDARG;
+        }
+        else
+        {
+            Status = S_OK;
+        }
+    }
+    else
+    {
+        if (g_SymOptions & SYMOPT_SECURE)
+        {
+            ErrOut(_T("SECURE: Dump writing disallowed\n"));
+            return E_ACCESSDENIED;
+        }
+
+        // Dumps are almost always written sequentially so
+        // add that hint to the file flags.
+        DumpWriteHandle =
+            WideCreateFile(DumpWriteFile,
+                           GENERIC_READ | GENERIC_WRITE,
+                           0,
+                           NULL,
+                           (Args->FormatFlags & DEBUG_FORMAT_NO_OVERWRITE) ?
+                           CREATE_NEW : CREATE_ALWAYS,
+                           FILE_ATTRIBUTE_NORMAL |
+                           FILE_FLAG_SEQUENTIAL_SCAN,
+                           NULL);
+        if (!DumpWriteHandle || DumpWriteHandle == INVALID_HANDLE_VALUE)
+        {
+            Status = WIN32_LAST_STATUS();
+            ErrOut(_T("Unable to create file '%ws' - %s\n    \"%s\"\n"),
+                   DumpWriteFile,
+                   FormatStatusCode(Status), FormatStatus(Status));
+        }
+        else
+        {
+            Status = S_OK;
+        }
+    }
+
+    if (Status == S_OK)
+    {
+        dprintf(_T("Creating %ws - "), DumpWriteFile);
+        Status = WriteTarget->Write(DumpWriteHandle, Args);
+
+        if (Status == S_OK)
+        {
+            dprintf(_T("Dump successfully written\n"));
+        }
+
+        if (!FileHandle)
+        {
+            CloseHandle(DumpWriteHandle);
+            if (Status != S_OK)
+            {
+                WideDeleteFile(DumpWriteFile);
+            }
+        }
+    }
+
+    if (Status == S_OK && (Args->FormatFlags & DEBUG_FORMAT_WRITE_CAB))
+    {
+        GCONV_WA(DumpWriteFile, MAX_PATH, TRUE,
+                 Status = E_OUTOFMEMORY; goto Exit);
+        GCONV_WA(FileName, MAX_PATH, TRUE,
+                 Status = E_OUTOFMEMORY; goto Exit);
+
+        Status = CreateCabFromDump(DumpWriteFileA, FileNameA,
+                                   Args->FormatFlags);
+
+        WideDeleteFile(TempFile);
+    }
+
+ Exit:
+    g_Target->SetEffMachine(OldMachine, FALSE);
+    delete WriteTarget;
+    return Status;
+}
+
+void
+DotDump(PDOT_COMMAND Cmd, DebugClient* Client)
+{
+    BOOL Usage = FALSE;
+    DUMP_WRITE_ARGS ArgsBuffer, *Args = &ArgsBuffer;
+
+    ZeroMemory(Args, sizeof(*Args));
+    
+    //
+    // Default to minidumps
+    //
+
+    if (IS_KERNEL_TARGET(g_Target))
+    {
+        Args->Qualifier = DEBUG_KERNEL_SMALL_DUMP;
+    }
+    else
+    {
+        Args->Qualifier = DEBUG_USER_WINDOWS_SMALL_DUMP;
+    }
+    Args->FormatFlags = DEBUG_FORMAT_DEFAULT | DEBUG_FORMAT_NO_OVERWRITE;
+
+    //
+    // Scan for options.
+    //
+
+    TCHAR Save;
+    PTSTR FileName;
+    BOOL SubLoop;
+    PTSTR CommentEnd = NULL;
+    PTSTR PhysMemFileNameEnd = NULL;
+    BOOL Unique = FALSE;
+    ProcessInfo* DumpProcess = g_Process;
+    ULONG64 Addr;
+
+    for (;;)
+    {
+        if (PeekChar() == '-' || *g_CurCmd == '/')
+        {
+            SubLoop = TRUE;
+
+            g_CurCmd++;
+            switch(*g_CurCmd)
+            {
+            case 'a':
+                DumpProcess = NULL;
+                g_CurCmd++;
+                break;
+
+            case 'b':
+                Args->FormatFlags |= DEBUG_FORMAT_WRITE_CAB;
+                g_CurCmd++;
+                if (*g_CurCmd == 'a')
+                {
+                    Args->FormatFlags |= DEBUG_FORMAT_CAB_SECONDARY_FILES;
+                    g_CurCmd++;
+                }
+                break;
+
+            case 'c':
+                g_CurCmd++;
+#ifdef UNICODE
+                Args->CommentW = StringValue(STRV_SPACE_IS_SEPARATOR |
+                                             STRV_TRIM_TRAILING_SPACE, &Save);
+#else
+                Args->CommentA = StringValue(STRV_SPACE_IS_SEPARATOR |
+                                             STRV_TRIM_TRAILING_SPACE, &Save);
+#endif
+                *g_CurCmd = Save;
+                CommentEnd = g_CurCmd;
+                break;
+
+            case 'f':
+                if (IS_KERNEL_TARGET(g_Target))
+                {
+                    Args->Qualifier = DEBUG_KERNEL_FULL_DUMP;
+                }
+                else
+                {
+                    Args->Qualifier = DEBUG_USER_WINDOWS_DUMP;
+                    ErrOut(_T("*****************************************************************************\n"));
+                    ErrOut(_T("* .dump /ma is the recommend method of creating a complete memory dump      *\n"));
+                    ErrOut(_T("* of a user mode process.                                                   *\n"));
+                    ErrOut(_T("*****************************************************************************\n"));
+
+                }
+                g_CurCmd++;
+                break;
+
+            case 'j':
+                g_CurCmd++;
+                Args->JitDebugInfoAddr =
+                    GetTermExpression(_T("JIT_DEBUG_INFO address ")
+                                      _T("missing from"));
+                break;
+
+            case 'k':
+                if (g_CurCmd[1] == 'p' &&
+                    g_CurCmd[2] == 'm' &&
+                    g_CurCmd[3] == 'f' &&
+                    IsNzCmdSep(g_CurCmd[4]))
+                {
+                    g_CurCmd += 4;
+                    Args->PhysMemFileName =
+                        StringValue(STRV_SPACE_IS_SEPARATOR |
+                                    STRV_TRIM_TRAILING_SPACE, &Save);
+                    *g_CurCmd = Save;
+                    PhysMemFileNameEnd = g_CurCmd;
+                }
+                else
+                {
+                    goto UnknownOption;
+                }
+                break;
+                
+            case 'm':
+                g_CurCmd++;
+                if (IS_KERNEL_TARGET(g_Target))
+                {
+                    Args->Qualifier = DEBUG_KERNEL_SMALL_DUMP;
+
+                    if (*g_CurCmd != '/' &&
+                        *g_CurCmd != '-' &&
+                        !IsSpaceT(*g_CurCmd))
+                    {
+                        Usage = TRUE;
+                        break;
+                    }
+                }
+                else
+                {
+                    Args->Qualifier = DEBUG_USER_WINDOWS_SMALL_DUMP;
+
+                    for (;;)
+                    {
+                        switch(*g_CurCmd)
+                        {
+                        case 'a':
+                            // Synthetic flag meaning "save the
+                            // maximum amount of data."
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_FULL_MEMORY |
+                                DEBUG_FORMAT_USER_SMALL_HANDLE_DATA |
+                                DEBUG_FORMAT_USER_SMALL_UNLOADED_MODULES |
+                                DEBUG_FORMAT_USER_SMALL_FULL_MEMORY_INFO |
+                                DEBUG_FORMAT_USER_SMALL_THREAD_INFO;
+                            break;
+                        case 'c':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_CODE_SEGMENTS;
+                            break;
+                        case 'C':
+                            // Flag to test microdump code.
+                            Args->InternalFlags |= UMINI_MICRO;
+                            break;
+                        case 'd':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_DATA_SEGMENTS;
+                            break;
+                        case 'D':
+                            // Flag to test debugger provider.
+                            Args->InternalFlags |= UMINI_FORCE_DBG;
+                            break;
+                        case 'f':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_FULL_MEMORY;
+                            break;
+                        case 'F':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_FULL_MEMORY_INFO;
+                            break;
+                        case 'h':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_HANDLE_DATA;
+                            break;
+                        case 'i':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_INDIRECT_MEMORY;
+                            break;
+                        case 'k':
+                            g_CurCmd++;
+                            SubLoop = FALSE;
+                            Args->InternalFlags |= UMINI_WRITE_KMINI;
+                            Args->ExtraFileName =
+                                StringValue(STRV_REQUIRE_QUOTES, &Save);
+                            // We required an opening quote so we should
+                            // be past a close quote, which we can just
+                            // leave zeroed.
+                            g_CurCmd++;
+                            break;
+                        case 'p':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_PROCESS_THREAD_DATA;
+                            break;
+                        case 'r':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_FILTER_MEMORY;
+                            break;
+                        case 'R':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_FILTER_PATHS;
+                            break;
+                        case 't':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_THREAD_INFO;
+                            break;
+                        case 'u':
+                            Args->FormatFlags |=
+                                DEBUG_FORMAT_USER_SMALL_UNLOADED_MODULES;
+                            break;
+                        case 'w':
+                            Args->FormatFlags |=
+                            DEBUG_FORMAT_USER_SMALL_PRIVATE_READ_WRITE_MEMORY;
+                            break;
+                        default:
+                            SubLoop = FALSE;
+                            break;
+                        }
+
+                        if (SubLoop)
+                        {
+                            g_CurCmd++;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+                break;
+
+            case 'o':
+                Args->FormatFlags &= ~DEBUG_FORMAT_NO_OVERWRITE;
+                g_CurCmd++;
+                break;
+
+            case 'u':
+                Unique = TRUE;
+                g_CurCmd++;
+                break;
+
+            case 'x':
+                g_CurCmd++;
+                switch(*g_CurCmd)
+                {
+                case 'c':
+                    g_CurCmd++;
+                    Args->ExContextAddr =
+                        GetTermExpression(_T("Context record address ")
+                                          _T("missing from"));
+                    break;
+                case 'p':
+                    g_CurCmd++;
+                    Addr = GetTermExpression(_T("Exception pointers address ")
+                                             _T("missing from"));
+                    if (g_Target->ReadPointer(g_Process, g_Machine, Addr,
+                                              &Args->ExRecordAddr) != S_OK)
+                    {
+                        error(MEMORY);
+                    }
+                    Addr += g_Machine->m_Ptr64 ? 8 : 4;
+                    if (g_Target->ReadPointer(g_Process, g_Machine, Addr,
+                                              &Args->ExContextAddr) != S_OK)
+                    {
+                        error(MEMORY);
+                    }
+                    break;
+                case 'r':
+                    g_CurCmd++;
+                    Args->ExRecordAddr =
+                        GetTermExpression(_T("Exception record address ")
+                                          _T("missing from"));
+                    break;
+                case 't':
+                    g_CurCmd++;
+                    Args->ExThreadId = (ULONG)
+                        GetTermExpression(_T("Thread ID ")
+                                          _T("missing from"));
+                    break;
+                default:
+                    error(SYNTAX);
+                }
+                break;
+
+            case '?':
+                Usage = TRUE;
+                g_CurCmd++;
+                break;
+
+            default:
+            UnknownOption:
+                ErrOut(_T("Unknown option '%c'\n"), *g_CurCmd);
+                Usage = TRUE;
+                g_CurCmd++;
+                break;
+            }
+        }
+        else
+        {
+            FileName = StringValue(STRV_TRIM_TRAILING_SPACE, &Save);
+            if (*FileName)
+            {
+                break;
+            }
+            else
+            {
+                *g_CurCmd = Save;
+                Usage = TRUE;
+            }
+        }
+
+        if (Usage)
+        {
+            break;
+        }
+    }
+
+    if (DumpProcess == NULL && !Unique)
+    {
+        Usage = TRUE;
+    }
+
+    if (Usage)
+    {
+        ErrOut(_T("Usage: .dump [options] filename\n"));
+        ErrOut(_T("Options are:\n"));
+        ErrOut(_T("  /a - Create dumps for all processes (requires -u)\n"));
+        ErrOut(_T("  /b[a] - Package dump in a CAB and delete dump\n"));
+        ErrOut(_T("  /c <comment> - Add a comment ")
+               _T("(not supported in all formats)\n"));
+        ErrOut(_T("  /j <addr> - Provide a JIT_DEBUG_INFO address\n"));
+        if (IS_KERNEL_TARGET(g_Target))
+        {
+            ErrOut(_T("  /f - Create a full dump\n"));
+            ErrOut(_T("  /m - Create a minidump (default)\n"));
+        }
+        else
+        {
+            ErrOut(_T("  /f - Create a legacy style full dump\n"));
+            ErrOut(_T("  /m[acdfFhiprRtuw] - Create a minidump (default)\n"));
+        }
+        ErrOut(_T("  /o - Overwrite any existing file\n"));
+        ErrOut(_T("  /u - Append unique identifier to dump name\n"));
+
+        ErrOut(_T("\nUse \".hh .dump\" or open debugger.chm in the ")
+               _T("debuggers directory to get\n")
+               _T("detailed documentation on this command.\n\n"));
+
+        return;
+    }
+
+    if (IS_LOCAL_KERNEL_TARGET(g_Target))
+    {
+        // It's possible to allow lkd to capture dump files
+        // but because the system is running during the capture
+        // the dump state will be a mishmash of different data.
+        // We could mark the dump headers and warn when such
+        // dumps are opened but it still seems too risky.
+        // Leave this disabled for now.
+#ifdef ALLOW_LOCAL_KD_DUMP
+        if (Args->Qualifier != DEBUG_KERNEL_FULL_DUMP)
+        {
+            error(SESSIONNOTSUP);
+        }
+
+        WarnOut(_T("***************************************")
+                _T("***************************************\n"));
+        WarnOut(_T("WARNING: System state is changing as ")
+                _T("local kd is running.\n"));
+        WarnOut(_T("         Dump state will not be consistent.\n"));
+        WarnOut(_T("***************************************")
+                _T("***************************************\n"));
+#else
+        error(SESSIONNOTSUP);
+#endif
+    }
+
+    if (CommentEnd)
+    {
+        *CommentEnd = 0;
+    }
+    if (PhysMemFileNameEnd)
+    {
+        *PhysMemFileNameEnd = 0;
+    }
+
+    ThreadInfo* OldThread = g_Thread;
+    TargetInfo* Target;
+    ProcessInfo* Process;
+
+    ForAllLayersToProcess()
+    {
+        PTSTR DumpFileName;
+        TCHAR UniqueName[2 * MAX_PATH];
+
+        if (DumpProcess != NULL && Process != DumpProcess)
+        {
+            continue;
+        }
+
+        if (Process != g_Process)
+        {
+            SetCurrentThread(Process->m_ThreadHead, TRUE);
+        }
+
+        if (Unique)
+        {
+            MakeFileNameUnique(FileName, UniqueName, DIMA(UniqueName),
+                               TRUE, g_Process);
+            DumpFileName = UniqueName;
+        }
+        else
+        {
+            DumpFileName = FileName;
+        }
+
+#ifdef UNICODE
+        WriteDumpFile(DumpFileName, 0, Args);
+#else
+        PWSTR WideName;
+        
+        if (AnsiToWide(DumpFileName, &WideName) == S_OK)
+        {
+            WriteDumpFile(WideName, 0, Args);
+            FreeWide(WideName);
+        }
+        else
+        {
+            ErrOut(_T("Unable to convert dump filename\n"));
+        }
+#endif
+    }
+
+    if (!OldThread || OldThread->m_Process != g_Process)
+    {
+        SetCurrentThread(OldThread, TRUE);
+    }
+
+    *g_CurCmd = Save;
+}
+
+BOOL
+DumpCabAdd(PCSTR File)
+{
+    HRESULT Status;
+
+    dprintf(_T("  Adding %hs - "), File);
+    FlushCallbacks();
+    if ((Status = AddToDumpCab(File)) != S_OK)
+    {
+        ErrOut(_T("%s\n"), FormatStatusCode(Status));
+    }
+    else
+    {
+        dprintf(_T("added\n"));
+    }
+
+    if (CheckUserInterrupt())
+    {
+        return FALSE;
+    }
+    FlushCallbacks();
+    return TRUE;
+}
+
+HRESULT
+CreateCabFromDump(PCSTR DumpFile, PCSTR CabFile, ULONG Flags)
+{
+    HRESULT Status;
+
+    if ((Status = CreateDumpCab(CabFile)) != S_OK)
+    {
+        ErrOut(_T("Unable to create CAB, %s\n"), FormatStatusCode(Status));
+        return Status;
+    }
+
+
+    WarnOut(_T("Creating a cab file can take a VERY VERY long time\n.")
+            _T("Ctrl-C can only interrupt the command after a file ")
+             _T("has been added to the cab.\n"));
+    //
+    // First add all base dump files.
+    //
+
+    if (!DumpFile)
+    {
+        DumpTargetInfo* Dump = (DumpTargetInfo*)g_Target;
+        ULONG i;
+
+        for (i = DUMP_INFO_DUMP; i < DUMP_INFO_COUNT; i++)
+        {
+            if (Dump->m_InfoFiles[i].m_File)
+            {
+                if (!DumpCabAdd(Dump->m_InfoFiles[i].m_FileNameA))
+                {
+                    Status = E_UNEXPECTED;
+                    goto Exit;
+                }
+            }
+        }
+    }
+    else
+    {
+        if (!DumpCabAdd(DumpFile))
+        {
+            Status = E_UNEXPECTED;
+            goto Exit;
+        }
+    }
+
+    if (Flags & DEBUG_FORMAT_CAB_SECONDARY_FILES)
+    {
+        ImageInfo* Image;
+
+        //
+        // Add all symbols and images.
+        //
+
+        if (g_Process->m_ClrDebugDll)
+        {
+            char ClrPath[MAX_PATH];
+
+            if (GetModuleFileNameA(g_Process->m_ClrDebugDll,
+                                   ClrPath, DIMA(ClrPath)))
+            {
+                if (!DumpCabAdd(ClrPath))
+                {
+                    Status = E_UNEXPECTED;
+                    goto Exit;
+                }
+            }
+        }
+        
+        for (Image = g_Process->m_ImageHead; Image; Image = Image->m_Next)
+        {
+            if (Image->m_MappedImagePath[0])
+            {
+                PTSTR MapPath = Image->m_MappedImagePath;
+                GCONV_TA(MapPath, MAX_IMAGE_PATH, TRUE,
+                         Status = E_OUTOFMEMORY; break);
+                if (!DumpCabAdd(MapPathA))
+                {
+                    Status = E_UNEXPECTED;
+                    break;
+                }
+            }
+
+            IMAGEHLP_MODULE64 ModInfo;
+
+            ModInfo.SizeOfStruct = sizeof(ModInfo);
+            if (SymGetModuleInfo64(g_Process->m_SymHandle,
+                                   Image->m_BaseOfImage, &ModInfo))
+            {
+                ULONG Len;
+                PTSTR Str;
+
+                // The loaded image name often refers directly to the
+                // image.  Only save the loaded image file if it
+                // refers to a .dbg file.
+                if (ModInfo.LoadedImageName[0] &&
+                    (Len = _tcslen(ModInfo.LoadedImageName)) > 4 &&
+                    !_tcsicmp(ModInfo.LoadedImageName + (Len - 4), _T(".dbg")))
+                {
+                    Str = ModInfo.LoadedImageName;
+                    GCONV_TA(Str, MAX_PATH, TRUE,
+                             Status = E_OUTOFMEMORY; break);
+                    
+                    if (!DumpCabAdd(StrA))
+                    {
+                        Status = E_UNEXPECTED;
+                        break;
+                    }
+                }
+
+                // Save any PDB that was opened.
+                if (ModInfo.LoadedPdbName[0])
+                {
+                    Str = ModInfo.LoadedPdbName;
+                    GCONV_TA(Str, MAX_PATH, TRUE,
+                             Status = E_OUTOFMEMORY; break);
+                    
+                    if (!DumpCabAdd(StrA))
+                    {
+                        Status = E_UNEXPECTED;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+ Exit:
+    CloseDumpCab();
+
+    if (Status == S_OK)
+    {
+        dprintf(_T("Wrote %hs\n"), CabFile);
+    }
+
+    return Status;
+}
diff --git a/base/Windows/singx86/help.cpp b/base/Windows/singx86/help.cpp
new file mode 100644
index 0000000..7d74116
--- /dev/null
+++ b/base/Windows/singx86/help.cpp
@@ -0,0 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  help.cpp - Help for Singularity Debugger Extensions.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+EXT_DECL(help) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    UNREFERENCED_PARAMETER(args);
+
+    ExtOut("Singularity Debugger Extensions:  [SingX86.dll compiled %s %s]\n"
+           "  !apic                     - Dump APIC state.\n"
+           "  !bytev <name>             - show byte vector information.\n"
+           "  !charv <name>             - show character vector information.\n"
+           //           "  !core                     - Write a core dump to disk.\n"
+           "  !ioapic                   - Dump I/O APIC state.\n"
+           "  !log                      - Dump system log.\n"
+           "  !object <address> <args>  - Display the object at address; args are same as `dt'.\n"
+           "  !procs                    - List all processes.\n"
+           "  !stack <address>          - Dump the stack of the given thread object.\n"
+           "  !sips                     - List all SIPs.\n"
+           "  !thread                   - Select the currently scheduled thread object.\n"
+           "  !thread <address>         - Select the given thread object.\n"
+           "  !threads                  - List all threads.\n"
+           "  !threads -s               - List all threads with first 10 stack frames.\n"
+           "  !threads -f               - List all threads with first 30 stack frames.\n"
+           "  !threads -s -d            - List all threads with stacks more detail.\n"
+           "  !help                     - Shows this help.\n"
+           ,__DATE__, __TIME__);
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/ioapic.cpp b/base/Windows/singx86/ioapic.cpp
new file mode 100644
index 0000000..fd3cb20
--- /dev/null
+++ b/base/Windows/singx86/ioapic.cpp
@@ -0,0 +1,88 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  apic.cpp - Extension to inspect APIC
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "singx86.h"
+
+static ULONG64 ioApicAddress;
+
+static ULONG IoApicRead(ULONG64 ioApicAddress, ULONG regAddr)
+{
+    ULONG value;
+    g_ExtData->WritePhysical(ioApicAddress, &regAddr, sizeof(regAddr), NULL);
+    g_ExtData->ReadPhysical(ioApicAddress + 0x10, &value, sizeof(value), NULL);
+    return value;
+}
+
+static const char* DeliveryMode(ULONG lo)
+{
+    const char* dm[8] = { "Fixed", "LowPr", "SMI  ", "Rsvd ",
+                          "NMI  ", "Init ", "Rsvd ", "ExInt" };
+    return dm[(lo >> 8) & 0x7];
+}
+
+static const char* Destination(ULONG hi, ULONG lo)
+{
+    static char buf[16];
+    if (lo & 0x0f00)
+    {
+        sprintf(buf, "Logical:%02x", (hi >> 24) & 0xff);
+    } else {
+        sprintf(buf, "PhysDst:%02x", (hi >> 24) & 0x0f);
+    }
+    return buf;
+}
+
+static const char* TriggerMode(ULONG lo)
+{
+    return (lo & 0xf000) ? "lvl" : "edg";
+}
+
+static const char* Masked(ULONG lo)
+{
+    return (lo & 0x10000) ? "masked" : "live  ";
+}
+
+static const char* DeliveryStatus(ULONG lo)
+{
+    return (lo & 0x1000) ? "pend" : "idle";
+}
+
+static const char* RemoteIrr(ULONG lo)
+{
+    return ((lo & 0xc000) == 0xc000) ? "remote-irr" : "          ";
+}
+
+static void DumpIoApic(ULONG64 address)
+{
+    ULONG value = IoApicRead(address, 0x01);
+    ULONG entries = (value >> 16) & 0xff;
+    ExtOut("IoApic @ %08x ID: %u Version %02x\n",
+           (ULONG) address,
+           (IoApicRead(address, 0x02) >> 24) & 0xf,
+           value & 0xff);
+
+    for (ULONG i = 0; i <= entries; i++)
+    {
+        ULONG lo = IoApicRead(address, 0x10 + i * 2);
+        ULONG hi = IoApicRead(address, 0x11 + i * 2);
+        ExtOut("Inti%02x.: %08x  Vec:%02x  %s  %s  %s  %s  %s  %s\n",
+               i, lo, lo & 0xff,
+               DeliveryMode(lo), Destination(hi, lo), TriggerMode(lo),
+               Masked(lo), DeliveryStatus(lo), RemoteIrr(lo));
+    }
+}
+
+EXT_DECL(ioapic) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    UNREFERENCED_PARAMETER(args);
+
+    // XXX TODO: Get Io Apic addresses from value from MP table.
+    DumpIoApic(0xfec00000);
+
+    EXT_LEAVE();
+}
diff --git a/base/Windows/singx86/log.cpp b/base/Windows/singx86/log.cpp
new file mode 100644
index 0000000..915351d
--- /dev/null
+++ b/base/Windows/singx86/log.cpp
@@ -0,0 +1,920 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  log.cpp - Extension to find parse Singularity trace log.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+bool fCachedLogStateValid = false;
+
+static ULONG64 c_txtBegin   = 0;
+static ULONG64 c_txtLimit   = 0;
+static ULONG64 c_txtHead    = 0;
+static ULONG64 c_logBegin   = 0;
+static ULONG64 c_logLimit   = 0;
+static ULONG64 c_logHead    = 0;
+static LONG    c_logHeadPos = 0;
+static LONG    c_logCount   = 0;
+
+static ULONG64 c_tscOffsets = 0;
+
+static bool    difftsc              = true;
+static ULONG64 tsc                  = 0;
+static bool    filter_by_cpu        = false;
+static bool    filter_by_process    = false;
+static bool    filter_by_thread     = false;
+static bool    filter_by_tag        = false;
+static int     filter_by_class      = 0;
+static int     filter_by_not_class  = 0;
+static int     filter_by_method     = false;
+static int     filter_by_not_method = false;
+static bool    filter_by_severity   = false;
+static LONG    filter_range_low     = 0;
+static LONG    filter_range_high    = 0;
+
+static int filter_cpu     = 0;
+static int filter_process = 0;
+static int filter_thread  = 0;
+static int filter_tag     = 0;
+static char filter_class[16][128];
+static int filter_class_wild[16];
+static bool filter_class_not[16];
+static char filter_method[16][128];
+static int filter_method_wild[16];
+static bool filter_method_not[16];
+static int filter_severity = 0;
+
+static char szSymbol[512];
+static char *pszSymbol;
+static char *pszClass;
+static char *pszMethod;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+static HRESULT Usage()
+{
+    ExtOut("Usage:\n"
+           "    !log {options} {entry}\n"
+           "    !log clear\n"
+           "Options:\n"
+           "    -a                : Print all matching entries.\n"
+           "    -c class          : Filter by class (can use tail wild card like `cl*').\n"
+           "    -nc class         : Filter out class (can use tail wild card).\n"
+           "    -m method         : Filter by method (can use tail wild card).\n"
+           "    -nc method        : Filter out method (can use tail wild card).\n"
+           "    -p pid            : Filter by process ID.\n"
+           "    -t tid            : Filter by thread ID.\n"
+           "    -u cpuid          : Filter by cpu ID.\n"
+           "    -x tag            : Filter by tag.\n"
+           "    -s severity       : Filter by severity.\n"
+           "    -r begin[,number] : Filter by range of entry ids.\n"
+           "    -n [skip,]number  : Print at most `number' entries (default is 10).\n"
+           "    -f                : Display full timespaces instead of indexes and diffs.\n"
+           "    -q                : Quiet, not class and method.\n"
+           "Examples:\n"
+           "    !log -c timer* -d            : Print last entries from timer* class with diffs.\n"
+           "    !log -a -c timer* -c irq*    : Print all timer or irq entries.\n"
+           "    !log -n 15 -p 020            : Print last 15 entries for process 020.\n"
+           "    !log -n 5,10                 : Print the first 10 of the last 15.\n"
+           "    !log -c t* -nc ti*           : Print class entries starting with t, but not ti.\n"
+           "    !log clear                   : Clear the log.\n"
+           "Notes:\n"
+           "    Log index numbers count backwards in time from 0.\n"
+           "    0 is the most recent log entry, 1 the entry before that, etc.\n"
+           "    The -c and -m filters are applied first, followed by -nc and -nm filters.\n"
+           "    String and method name comparisons are case insensitive.\n"
+          );
+    return S_FALSE;
+}
+
+HRESULT DumpLogHead(bool detail)
+{
+    if (detail) {
+        ExtOut("     Cycle Count: CPU   EIP    PID TID TAG S Class.Method             : Message\n");
+    }
+    else {
+        ExtOut("     Cycle Count: CPU   EIP    PID TID TAG S: Message\n");
+    }
+    return S_OK;
+}
+
+HRESULT FindBound(const char *symbol, ULONG64 *ptrval)
+{
+    HRESULT status = S_OK;
+    ULONG64 address;
+
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName(symbol, &address));
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, ptrval));
+
+    ExtVerb("Find(%s) = %p\n", symbol, *ptrval);
+  Exit:
+    return status;
+}
+
+HRESULT SetBound(const char *symbol, ULONG64 ptrval)
+{
+    HRESULT status = S_OK;
+    ULONG64 address;
+
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName(symbol, &address));
+    EXT_CHECK(g_ExtData->WritePointersVirtual(1, address, &ptrval));
+  Exit:
+    return status;
+}
+
+HRESULT FindBounds()
+{
+    HRESULT status = S_OK;
+
+    if (!fCachedLogStateValid) {
+
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_txtBegin",
+                            &c_txtBegin));
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_txtLimit",
+                            &c_txtLimit));
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_txtHead",
+                            &c_txtHead));
+
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_logBegin",
+                            &c_logBegin));
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_logLimit",
+                            &c_logLimit));
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_logHead",
+                            &c_logHead));
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_logHead",
+                            &c_logHead));
+        EXT_CHECK(FindBound("nt!Class_Microsoft_Singularity_Tracing::c_tscOffsets",
+                            &c_tscOffsets));
+
+        c_logHeadPos = (LONG)((c_logHead - c_logBegin) / LogEntryStruct.size);
+        c_logCount = (LONG)((c_logLimit - c_logBegin) / LogEntryStruct.size);
+
+        fCachedLogStateValid = true;
+        status = S_OK;
+    }
+
+  Exit:
+    return status;
+}
+
+static LONG64 GetTscOffset(int cpuId, PLONG64 pValue)
+{
+    HRESULT status = S_OK;
+
+    ULONG64 address = c_tscOffsets + cpuId * sizeof(LONG64);
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, (PULONG64)pValue));
+    // ExtOut("Cpu %d tscOffset %I64d\n", cpuId, *pValue);
+  Exit:
+    return status;
+}
+
+static ULONG64 IdToEntry(LONG id)
+{
+    LONG pos = (c_logHeadPos + (c_logCount - (id + 1))) % c_logCount;
+    ULONG64 entry = c_logBegin + pos * LogEntryStruct.size;
+    return entry;
+}
+
+static LONG EntryToId(ULONG64 entry)
+{
+    LONG pos = (ULONG)((entry - c_logBegin) / LogEntryStruct.size);
+    return ((c_logCount - (pos + 1)) + c_logHeadPos) % c_logCount;
+}
+
+HRESULT FilterLogEntry(LONG id, LogEntry& log, bool detail)
+{
+    pszSymbol = NULL;
+    pszClass = NULL;
+    pszMethod = NULL;
+
+    HRESULT status = S_OK;
+
+    if ((ULONG64)log._text < c_txtBegin || (ULONG64)log._text > c_txtLimit) {
+        return S_FALSE;
+    }
+    if (id < filter_range_low || id >= filter_range_high) {
+        return S_FALSE;
+    }
+    if (filter_by_cpu && log._cpuId != filter_cpu) {
+        return S_FALSE;
+    }
+    if (filter_by_process && log._processId != filter_process) {
+        return S_FALSE;
+    }
+    if (filter_by_thread && log._threadId != filter_thread) {
+        return S_FALSE;
+    }
+    if (filter_by_tag && log._tag != filter_tag) {
+        return S_FALSE;
+    }
+    if (filter_by_severity && log._severity < filter_process) {
+        return S_FALSE;
+    }
+
+    if (filter_by_class > 0 || filter_by_method > 0 || detail) {
+        ULONG64 displacement = 0;
+
+        status = g_ExtSymbols->GetNameByOffset((ULONG64)log._eip,
+                                               szSymbol,
+                                               arrayof(szSymbol),
+                                               NULL,
+                                               &displacement);
+        if (status == S_OK) {
+            CHAR *p;
+            pszSymbol = szSymbol;
+
+            if ((p = strrchr(szSymbol, '!')) != NULL) {
+                pszSymbol = p + 1;
+            }
+            if ((p = strchr(szSymbol, ':')) != NULL && p[1] == ':') {
+                pszClass = pszSymbol;
+                pszMethod = p + 2;
+                *p = '\0';
+
+                if ((p = strrchr(pszClass, '_')) != NULL) {
+                    pszClass = p + 1;
+                }
+                if ((p = strrchr(pszMethod, '_')) != NULL) {
+                    pszMethod = p + 1;
+                }
+            }
+        }
+
+        PCHAR pszC = pszClass != NULL ? pszClass : (pszSymbol != NULL ? pszSymbol : "::");
+        PCHAR pszM = pszMethod ? pszMethod : "::";
+
+        // Do inclusive filters first.
+        if (filter_by_class > filter_by_not_class) {
+            bool found = false;
+            for (int i = 0; i < filter_by_class; i++) {
+                if (filter_class_not[i]) {
+                    continue;
+                }
+                if (filter_class_wild[i] > 0) {
+                    if (_strnicmp(filter_class[i], pszC, filter_class_wild[i]) == 0) {
+                        found = true;
+                        break;
+                    }
+                }
+                else {
+                    if (_strcmpi(filter_class[i], pszC) == 0) {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+            if (!found) {
+                return S_FALSE;
+            }
+        }
+        if (filter_by_method > filter_by_not_method) {
+            if (pszMethod == NULL) {
+                return S_FALSE;
+            }
+            bool found = false;
+            for (int i = 0; i < filter_by_method; i++) {
+                if (filter_method_not[i]) {
+                    continue;
+                }
+                if (filter_method_wild[i] > 0) {
+                    if (_strnicmp(filter_method[i], pszM, filter_method_wild[i]) == 0) {
+                        found = true;
+                        break;
+                    }
+                }
+                else {
+                    if (_strcmpi(filter_method[i], pszM) == 0) {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+            if (!found) {
+                return S_FALSE;
+            }
+        }
+
+        // Then do exclusive filters.
+        if (filter_by_not_class > 0) {
+            for (int i = 0; i < filter_by_class; i++) {
+                if (!filter_class_not[i]) {
+                    continue;
+                }
+                if (filter_class_wild[i] > 0) {
+                    if (_strnicmp(filter_class[i], pszC, filter_class_wild[i]) == 0) {
+                        return S_FALSE;
+                    }
+                }
+                else {
+                    if (_strcmpi(filter_class[i], pszC) == 0) {
+                        return S_FALSE;
+                    }
+                }
+            }
+        }
+        if (filter_by_not_method > 0) {
+            for (int i = 0; i < filter_by_method; i++) {
+                if (!filter_method_not[i]) {
+                    continue;
+                }
+                if (filter_method_wild[i] > 0) {
+                    if (_strnicmp(filter_method[i], pszM, filter_method_wild[i]) == 0) {
+                        return S_FALSE;
+                    }
+                }
+                else {
+                    if (_strcmpi(filter_method[i], pszM) == 0) {
+                        return S_FALSE;
+                    }
+                }
+            }
+        }
+    }
+    return S_OK;
+}
+
+static PCHAR Skip(PCHAR psz)
+{
+    while (*psz) {
+        psz++;
+    }
+    return psz + 1;
+}
+
+
+HRESULT DumpLogEntry(LONG id, LogEntry& log, bool detail)
+{
+    HRESULT status = S_OK;
+
+    CHAR msg[512];
+    BYTE text[256];
+    ULONG ret;
+    EXT_CHECK(g_ExtData->ReadVirtual((ULONG64)log._text, text, sizeof(text), &ret));
+    if (text[0] != (BYTE)log._cycleCount) {
+        sprintf(msg, "<%p: message not available>", log._text);
+    }
+    else {
+        CHAR *  pmsg = msg;
+        CHAR *  ptxt = (CHAR *)(text + 1);
+        CHAR *  sargs[6];
+        CHAR *  pstr = Skip(ptxt);
+
+        for (int i = 0 ; i < arrayof(sargs); i++) {
+            if ((log._strings & ((ULONG64)1 << i)) != 0) {
+                sargs[i] = pstr;
+                pstr = Skip(pstr);
+            }
+            else {
+                sargs[i] = NULL;
+            }
+        }
+
+        while (*ptxt != '\0') {
+            if (*ptxt == '{') {
+                char * pbeg = ptxt;
+                bool bad = false;
+                ptxt++;
+
+                int ndx = 0;
+                int aln = 0;
+                int wid = 0;
+                char fmt = 'd';
+
+                if (*ptxt == '{') {
+                    *pmsg++ = *ptxt++;
+                }
+                else if (*ptxt >= '0' && *ptxt <= '9') {
+
+                    // {index,alignment:type width}
+                    // Get Index
+                    while (*ptxt >= '0' && *ptxt <= '9') {
+                        ndx = ndx * 10 + (*ptxt++ - '0');
+                    }
+
+                    // Get Alignment
+                    if (*ptxt == ',') {
+                        ptxt++;
+                        while (*ptxt >= '0' && *ptxt <= '9') {
+                            aln = aln * 10 + (*ptxt++ - '0');
+                        }
+                    }
+
+                    // Get FormatString
+                    if (*ptxt == ':') {
+                        ptxt++;
+                        if (*ptxt >= 'a' && *ptxt <= 'z') {
+                            fmt = *ptxt++;
+                        }
+                        else if (*ptxt >= 'A' && *ptxt <= 'Z') {
+                            fmt = *ptxt++ - 'A' + 'a';
+                        }
+                        while (*ptxt >= '0' && *ptxt <= '9') {
+                            wid = wid * 10 + (*ptxt++ - '0');
+                        }
+                    }
+
+                    // Get closing brace.
+                    if (*ptxt == '}') {
+                        ptxt++;
+                    }
+                    else {
+                        bad = true;
+                        ExtErr("Missing closing brace: `%s'\n", ptxt);
+                    }
+
+                    if (ndx >= arrayof(sargs)) {
+                        bad = true;
+                        ExtErr("Aln too large: %d\n", ndx);
+                    }
+
+                    if (sargs[ndx] != NULL) {
+                        if (wid > 0) {
+                            if (aln < wid) {
+                                aln = wid;
+                            }
+                            pmsg += sprintf(pmsg, "%*.*s", aln, wid, sargs[ndx]);
+                        }
+                        else {
+                            pmsg += sprintf(pmsg, "%*s", aln, sargs[ndx]);
+                        }
+                    }
+                    else {
+                        if (aln < wid) {
+                            aln = wid;
+                        }
+                        if (fmt == 'x') {
+                            if (wid > 0) {
+                                pmsg += sprintf(pmsg, "%0*x", aln, log._args[ndx]);
+                            }
+                            else {
+                                pmsg += sprintf(pmsg, "%*x", aln, log._args[ndx]);
+                            }
+                        }
+                        else {
+                            pmsg += sprintf(pmsg, "%*d", aln, log._args[ndx]);
+                        }
+                    }
+
+                    // If the format was bad, then copy it.
+                    if (bad) {
+                        ExtErr("Format error: `%*s'\n", ptxt - pbeg, pbeg);
+                        while (pbeg < ptxt) {
+                            *pmsg++ = *pbeg++;
+                        }
+                    }
+                }
+            }
+            else if (*ptxt == '}') {
+                ptxt++;
+                *pmsg++ = *ptxt++;
+            }
+            else if (*ptxt == '\n') {
+                ptxt++;
+            }
+            else {
+                *pmsg++ = *ptxt++;
+            }
+        }
+        *pmsg++ = '\0';
+    }
+
+    LONG64 tscOffset = 0;
+    if (GetTscOffset((int)log._cpuId, &tscOffset) != S_OK) {
+        tscOffset = 0;
+    }
+
+    ULONG64 cycleCount = log._cycleCount - tscOffset;
+    if (difftsc) {
+        if (tsc == 0) {
+            ExtOut("%16I64x: ", cycleCount);
+        }
+        else {
+            ExtOut("%5d: %9I64x+ ", id, cycleCount - tsc);
+        }
+    }
+    else {
+        ExtOut("%16I64x: ", cycleCount);
+    }
+    tsc = cycleCount;
+
+    if (detail) {
+        CHAR name[512] = "";
+
+        if (pszClass != NULL && pszMethod != NULL) {
+            sprintf(name, "%s.%s", pszClass, pszMethod);
+        }
+        else if (pszSymbol != NULL) {
+            strcat(name, pszSymbol);
+        }
+
+        ExtOut("%03x %p %03x %03x %03x %x %-25.25s: %s\n",
+               (ULONG)log._cpuId,
+               log._eip,
+               (ULONG)log._processId,
+               (ULONG)log._threadId,
+               (ULONG)log._tag,
+               (ULONG)log._severity,
+               name,
+               msg);
+    }
+    else {
+        ExtOut("%03x %p %03x %03x %03x %x: %s\n",
+               (ULONG)log._cpuId,
+               log._eip,
+               (ULONG)log._processId,
+               (ULONG)log._threadId,
+               (ULONG)log._tag,
+               (ULONG)log._severity,
+               msg);
+    }
+
+    status = S_OK;
+  Exit:
+    return status;
+}
+
+HRESULT ClearLog()
+{
+    HRESULT status = S_OK;
+
+    ExtOut("Clearing %p..%p\n", c_logBegin, c_logLimit);
+    LogEntryStruct.Clear();
+    for (ULONG64 entry = c_logBegin; entry < c_logLimit; entry += LogEntryStruct.size) {
+        if ((entry & 0xff) == 0) {
+            ExtOut(" %p\r", entry);
+        }
+        EXT_CHECK(LogEntryStruct.Flush(entry));
+    }
+    ExtOut("\n");
+    EXT_CHECK(SetBound("nt!Class_Microsoft_Singularity_Tracing::c_txtHead", c_txtBegin));
+    EXT_CHECK(SetBound("nt!Class_Microsoft_Singularity_Tracing::c_logHead", c_logBegin));
+
+  Exit:
+    return status;
+}
+
+static ULONG64 GetValue(PCSTR& args, bool fHex)
+{
+    ULONG base = fHex ? 16 : 10;
+    if (*args == '0') {
+        fHex = true;
+        base = 16;
+    }
+    ULONG64 value = 0;
+
+    while (*args && *args != ' ' && *args != '\t') {
+        if (*args >= '0' && *args <= '9') {
+            value = value * base + (*args++ - '0');
+        }
+        else if (*args >= 'A' && *args <= 'F' && fHex) {
+            value = value * base + (*args++ - 'A') + 10;
+        }
+        else if (*args >= 'a' && *args <= 'f' && fHex) {
+            value = value * base + (*args++ - 'a') + 10;
+        }
+        else {
+            break;
+        }
+    }
+    return value;
+}
+
+EXT_DECL(log) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    bool detail = true;
+    bool doall = false;
+
+    status = FindBounds();
+
+#if TEST_ENTRY
+    if (fCachedLogStateValid) {
+        for (LONG id = 0; id < 10; id++) {
+            ULONG64 entry = IdToEntry(id);
+            ULONG bid = EntryToId(entry);
+            ExtOut("%4d: %p :%4d\n", id, entry, bid);
+        }
+        for (LONG id = c_logCount - 10; id < c_logCount; id++) {
+            ULONG64 entry = IdToEntry(id);
+            ULONG bid = EntryToId(entry);
+            ExtOut("%4d: %p :%4d\n", id, entry, bid);
+        }
+        goto Exit;
+    }
+#endif
+
+    difftsc = true;
+
+    filter_range_low  = 0;
+    filter_range_high = c_logCount;
+
+    filter_by_cpu        = false;
+    filter_by_process    = false;
+    filter_by_thread     = false;
+    filter_by_tag        = false;
+    filter_by_class      = 0;
+    filter_by_not_class  = 0;
+    filter_by_method     = 0;
+    filter_by_not_method = 0;
+    filter_by_severity   = false;
+
+    filter_cpu      = 0;
+    filter_process  = 0;
+    filter_thread   = 0;
+    filter_tag      = 0;
+    filter_severity = 0;
+
+    int limit = 10;
+    int skip = 0;
+    char *p;
+
+    tsc = 0;
+    if (_strcmpi(args, "clear") == 0) {
+        return ClearLog();
+    }
+
+    while (*args != '\0') {
+        // skip whitespace
+        while (*args == ' ' || *args == '\t') {
+            args++;
+        }
+
+        // process argument
+        if (*args == '-' || *args == '/') {
+            args++;
+            switch (*args++) {
+              case 'q': // Quiet
+              case 'Q':
+                detail = false;
+                break;
+
+              case 'f': // Full timestamps, not diffs (not absolute value)
+              case 'F':
+                difftsc = false;
+                break;
+
+              case 'a': // All records
+              case 'A':
+                doall = true;
+                limit = 100000;
+                break;
+
+              case 'n':
+              case 'N':
+                if (*args == 'c') {
+                    // Not class
+                    args++;
+                    while (*args == ' ' || *args == '\t') {
+                        args++;
+                    }
+                    filter_class[filter_by_class][0] = '\0';
+                    filter_class_wild[filter_by_class] = 0;
+                    filter_class_not[filter_by_class] = true;
+                    p = filter_class[filter_by_class];
+                    while (*args && *args != ' ' && *args != '\t') {
+                        *p++ = *args++;
+                    }
+                    *p = '\0';
+                    if ((p = strchr(filter_class[filter_by_class], '*')) != NULL) {
+                        filter_class_wild[filter_by_class] = p - filter_class[filter_by_class];
+                    }
+                    ExtVerb("Filter out class: `%s'\n", filter_class[filter_by_class]);
+                    filter_by_class++;
+                    filter_by_not_class++;
+                }
+                else if (*args == 'm') {
+                    // Not method
+                    args++;
+                    while (*args == ' ' || *args == '\t') {
+                        args++;
+                    }
+                    filter_method[filter_by_method][0] = '\0';
+                    filter_method_wild[filter_by_method] = 0;
+                    filter_method_not[filter_by_method] = true;
+                    p = filter_method[filter_by_method];
+                    while (*args && *args != ' ' && *args != '\t') {
+                        *p++ = *args++;
+                    }
+                    *p = '\0';
+                    if ((p = strchr(filter_method[filter_by_method], '*')) != NULL) {
+                        filter_method_wild[filter_by_method] = p - filter_method[filter_by_method];
+                    }
+                    ExtVerb("Filter not method: `%s'\n", filter_method[filter_by_method]);
+                    filter_by_method++;
+                    filter_by_not_method++;
+                }
+                else {
+                    // Number of entries to display
+                    while (*args == ' ' || *args == '\t') {
+                        args++;
+                    }
+                    limit = (int)GetValue(args, false);
+                    if (*args == ',') {
+                        skip = limit;
+                        args++;
+                        limit = (int)GetValue(args, false);
+                    }
+                    ExtVerb("Limit to: %d (skip %d)\n", limit, skip);
+                }
+                break;
+
+              case 'r': // filter by range
+              case 'R':
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_range_low = (LONG)GetValue(args, false);
+                if (filter_range_low < 0) {
+                    filter_range_low = 0;
+                }
+                if (filter_range_low >= c_logCount) {
+                    filter_range_low = c_logCount - 1;
+                }
+                if (*args == ',') {
+                    args++;
+                    filter_range_high = filter_range_low + (LONG)GetValue(args, false);
+                    if (filter_range_high > c_logCount) {
+                        filter_range_high = c_logCount;
+                    }
+                }
+                ExtVerb("Range %d..%d\n", filter_range_low, filter_range_high);
+                break;
+
+              case 'u': // filter by cpu
+              case 'U':
+                filter_by_cpu = true;
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_cpu = (int)GetValue(args, true);
+                ExtVerb("Filter by cpu: 0x%x\n", filter_cpu);
+                break;
+
+              case 'p': // filter by process
+              case 'P':
+                filter_by_process = true;
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_process = (int)GetValue(args, true);
+                ExtVerb("Filter by process: 0x%x\n", filter_process);
+                break;
+
+              case 't': // filter by thread
+              case 'T':
+                filter_by_thread = true;
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_thread = (int)GetValue(args, true);
+                ExtVerb("Filter by tid: 0x%x\n", filter_thread);
+                break;
+
+              case 'x': // filter by tag
+              case 'X':
+                filter_by_tag = true;
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_tag = (int)GetValue(args, true);
+                ExtVerb("Filter by tag: 0x%x\n", filter_tag);
+                break;
+
+              case 'c': // filter by class
+              case 'C':
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_class[filter_by_class][0] = '\0';
+                filter_class_wild[filter_by_class] = 0;
+                filter_class_not[filter_by_class] = false;
+                p = filter_class[filter_by_class];
+                while (*args && *args != ' ' && *args != '\t') {
+                    *p++ = *args++;
+                }
+                *p = '\0';
+                if ((p = strchr(filter_class[filter_by_class], '*')) != NULL) {
+                    filter_class_wild[filter_by_class] = p - filter_class[filter_by_class];
+                }
+                ExtVerb("Filter by class: `%s'\n", filter_class[filter_by_class]);
+                filter_by_class++;
+                break;
+
+              case 'm': // filter by method
+              case 'M':
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_method[filter_by_method][0] = '\0';
+                filter_method_wild[filter_by_method] = 0;
+                filter_method_not[filter_by_method] = false;
+                p = filter_method[filter_by_method];
+                while (*args && *args != ' ' && *args != '\t') {
+                    *p++ = *args++;
+                }
+                *p = '\0';
+                if ((p = strchr(filter_method[filter_by_method], '*')) != NULL) {
+                    filter_method_wild[filter_by_method] = p - filter_method[filter_by_method];
+                }
+                ExtVerb("Filter by method: `%s'\n", filter_method[filter_by_method]);
+                filter_by_method++;
+                break;
+
+              case 's': // filter by severity
+              case 'S':
+                filter_by_severity = true;
+                while (*args == ' ' || *args == '\t') {
+                    args++;
+                }
+                filter_severity = (int)GetValue(args, true);
+                break;
+
+              case '?': // Help
+              case 'h':
+              case 'H':
+                status = Usage();
+                goto Exit;
+            }
+            while (*args && *args != ' ') {
+                args++;
+            }
+        }
+        else {
+            break;
+        }
+    }
+
+    DumpLogHead(detail);
+
+    ULONG64 entry = 0;
+    LogEntry log;
+
+    if (*args != '\0') {
+        status = ExtEvalU64(&args, &entry);
+        if (status == S_OK) {
+            if (entry < c_logBegin || entry >= c_logLimit) {
+                ExtErr("Entry value %p not supported.\n", entry);
+                return S_FALSE;
+            }
+            EXT_CHECK(LogEntryStruct.Read(entry, &log));
+            LONG id = EntryToId(entry);
+            status = FilterLogEntry(id, log, detail);
+            status = DumpLogEntry(id, log, detail);
+            goto Exit;
+        }
+        else {
+            ExtErr("Invalid argument %s.\n", args);
+            goto Exit;
+        }
+    }
+
+    ExtVerb("Range [%d..%d], Skip=%d, Limit=%d\n",
+            filter_range_low, filter_range_high, skip, limit);
+
+    // First, we search backward until we find the right number of records
+    if (!doall) {
+        int find = limit + skip;
+        for (LONG id = filter_range_low; id < filter_range_high; id++) {
+            entry = IdToEntry(id);
+
+            EXT_CHECK(LogEntryStruct.Read(entry, &log));
+            if (log._eip == 0 || log._cycleCount == 0) {
+                continue;
+            }
+
+            status = FilterLogEntry(id, log, detail);
+            if (status == S_OK) {
+                find--;
+                if (find < 0) {
+                    filter_range_high = id;
+                    break;
+                }
+            }
+        }
+    }
+    ExtVerb("Begin: %p, Head: %p, Limit: %p, Base: %p [%d..%d]\n",
+            c_logBegin, c_logHead, c_logLimit, entry, filter_range_low, filter_range_high);
+
+    for (LONG id = filter_range_high - 1; id >= filter_range_low; id--) {
+        entry = IdToEntry(id);
+
+        EXT_CHECK(LogEntryStruct.Read(entry, &log));
+        if (log._eip == 0 || log._cycleCount == 0) {
+            continue;
+        }
+
+        status = FilterLogEntry(id, log, detail);
+        if (status != S_OK) {
+            continue;
+        }
+
+        status = DumpLogEntry(id, log, detail);
+        limit--;
+        if (limit <= 0) {
+            break;
+        }
+    }
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/object.cpp b/base/Windows/singx86/object.cpp
new file mode 100644
index 0000000..99004f8
--- /dev/null
+++ b/base/Windows/singx86/object.cpp
@@ -0,0 +1,144 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  object.cpp - Extension to find Singularity object.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+#define VERBOSE 0
+
+static bool isVtable(PSTR name,
+                     __out PSTR fullclassname,
+                     __out PSTR classname,
+                     __out bool *vector,
+                     __out bool *value)
+{
+    if (vector != NULL) {
+        *vector = false;
+    }
+    if (value != NULL) {
+        *value = false;
+    }
+
+    // Walk over the module name...
+    while (*name && *name != '!') {
+        *classname++ = *name;
+        *fullclassname++ = *name++;
+    }
+    *classname = '\0';
+    *fullclassname = '\0';
+
+    if (*name != '!') {
+        return false;
+    }
+
+    *classname++ = *name;
+    *fullclassname++ = *name++;
+
+    // Walk over the ClassVector_ if this is a vector type.
+    if (strncmp(name, "ClassVector_", 12) == 0) {
+        if (vector != NULL) {
+            *vector = true;
+        }
+        name += 12;
+    }
+
+    // Walk over the Class_ or Struct_ prefix.
+    if (strncmp(name, "Struct_", 7) == 0) {
+        if (value != NULL) {
+            *value = true;
+        }
+        name += 7;
+    }
+    else if (strncmp(name, "Class_", 6) == 0) {
+        name += 6;
+    }
+
+    // Walk over the class name.
+    PSTR classbeg = classname;
+
+    while (*name && *name != ':') {
+        if (*name == '_') {
+            classname = classbeg;
+            *fullclassname++ = *name++;
+            continue;
+        }
+        else {
+            *classname++ = *name;
+            *fullclassname++ = *name++;
+        }
+    }
+    *classname = '\0';
+    *fullclassname = '\0';
+
+    // Check if this is a vtable field.
+    return ((strcmp(name, "::_vtable") == 0) ||
+            (strcmp(name, "::`vftable'") == 0));
+}
+
+EXT_DECL(object) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    UNREFERENCED_PARAMETER(args);
+
+    ULONG64 address = 0;
+
+    status = ExtEvalU64(&args, &address);
+    if (status != S_OK) {
+        goto Exit;
+    }
+
+    ULONG64 vtable = 0;
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, &vtable));
+    vtable &= ~(ULONG64)3;
+
+    CHAR name[512];
+    ULONG64 displacement = 0;
+    status = g_ExtSymbols->GetNameByOffset(vtable,
+                                           name,
+                                           arrayof(name),
+                                           NULL,
+                                           &displacement);
+    if (status != S_OK) {
+        ExtErr("%p: No type information for vtable: [%p]\n", address, vtable);
+        status = E_INVALIDARG;
+        goto Exit;
+    }
+
+    if (displacement != 0) {
+        ExtErr("%p: Invalid vtable %p, nearest symbol is %s+%I64d\n",
+               address, vtable, name, displacement);
+        status = E_INVALIDARG;
+        goto Exit;
+    }
+
+    ExtVerb("%p: name %s\n", vtable, name);
+
+    CHAR fullclassname[512];
+    CHAR classname[128];
+    bool vector = false;
+    bool value = false;
+
+    if (!isVtable(name, fullclassname, classname, &vector, &value)) {
+        ExtErr("%p: Invalid symbol for vtable: %s\n", address, name);
+        goto Exit;
+    }
+
+    ExtOut("%p: %s [vtable=%p]\n", address, classname, vtable);
+
+    // We should automatically determine whether classname or
+    // fullclassname is correct.
+
+    CHAR command[1024];
+    sprintf(command, "dt -n %s %s 0x%p", classname, args, address);
+    ExtVerb("Command: %s\n", command);
+
+    status = g_ExtControl->Execute(DEBUG_OUTCTL_ALL_CLIENTS |
+                                   DEBUG_OUTCTL_OVERRIDE_MASK |
+                                   DEBUG_OUTCTL_NOT_LOGGED,
+                                   command,
+                                   DEBUG_EXECUTE_DEFAULT );
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/procs.cpp b/base/Windows/singx86/procs.cpp
new file mode 100644
index 0000000..470f970
--- /dev/null
+++ b/base/Windows/singx86/procs.cpp
@@ -0,0 +1,165 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  procs.cpp - Extension to find Singularity Processes.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+HRESULT DumpProcess(ULONG64 address, bool stack, bool detail)
+{
+    if (address == 0) {
+        return S_FALSE;
+    }
+
+    HRESULT status = S_OK;
+    Thread thread;
+
+    EXT_CHECK(ThreadStruct.Read(address, &thread));
+
+    if (stack) {
+        ExtOut("  thread=%p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p }\n",
+               address,
+               (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+               (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+               thread.context.eip,
+               thread.context.ebp,
+               thread.context.esp);
+
+        DEBUG_STACK_FRAME frames[10];
+        ULONG filled = 0;
+
+        status = g_ExtControl->GetStackTrace(thread.context.ebp,
+                                             thread.context.esp,
+                                             thread.context.eip,
+                                             frames,
+                                             arrayof(frames),
+                                             &filled);
+
+        if (status == S_OK) {
+            g_ExtClient->SetOutputLinePrefix("      ");
+            g_ExtControl->OutputStackTrace(DEBUG_OUTPUT_NORMAL,
+                                           frames,
+                                           filled,
+                                           detail ? (DEBUG_STACK_FRAME_ADDRESSES |
+                                                     DEBUG_STACK_COLUMN_NAMES |
+                                                     DEBUG_STACK_SOURCE_LINE) : 0);
+        }
+    }
+    else {
+        CHAR name[512];
+        ULONG64 displacement = 0;
+
+        status = g_ExtSymbols->GetNameByOffset((ULONG64)thread.context.eip,
+                                               name,
+                                               arrayof(name),
+                                               NULL,
+                                               &displacement);
+        if (status == S_OK) {
+            ExtOut("  thread=%p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p } %s+%I64d\n",
+                   address,
+                   (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+                   (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+                   thread.context.eip,
+                   thread.context.ebp,
+                   thread.context.esp,
+                   name,
+                   (LONG64)displacement);
+        }
+        else {
+            ExtOut("  thread=%p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p }\n",
+                   address,
+                   (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+                   (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+                   thread.context.eip,
+                   thread.context.ebp,
+                   thread.context.esp);
+        }
+    }
+  Exit:
+    return status;
+}
+
+
+EXT_DECL(procs) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    bool stack = false;
+    bool detail = false;
+
+    while (*args != '\0') {
+        if (*args == '-' || *args == '/') {
+            args++;
+            switch (*args++) {
+              case 'd': // detail
+              case 'D':
+                detail = !detail;
+                break;
+              case 's': // stack
+              case 'S':
+                stack = !stack;
+                break;
+            }
+            while (*args != ' ') {
+                args++;
+            }
+        }
+        else {
+            break;
+        }
+    }
+
+    ULONG pointerSize = (g_ExtControl->IsPointer64Bit() == S_OK) ? 8 : 4;
+    ULONG64 address = 0;
+    ULONG64 procs = 0;
+    ULONG type = 0;
+    ULONG subtype = 0;
+    ULONG64 module = 0;
+
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName("nt!Process::processTable", &address));
+    EXT_CHECK(g_ExtSymbols->GetOffsetTypeId(address, &type, &module));
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, &procs));
+    ExtVerb("processTable: %p\n", procs);
+
+    CHAR name[512];
+
+    EXT_CHECK(g_ExtSymbols->GetTypeName(module, type, name, arrayof(name), NULL));
+    ExtVerb("  processTable type: %s\n", name);
+    int len = strlen(name);
+    if (len > 3 &&
+        name[len-3] == '[' &&
+        name[len-2] == ']' &&
+        name[len-1] == '*') {
+        name[len-3] = '\0';
+
+        EXT_CHECK(g_ExtSymbols->GetTypeId(module, name, &subtype));
+        EXT_CHECK(g_ExtSymbols->GetTypeName(module, subtype, name, arrayof(name), NULL));
+        ExtVerb("  processTable[] type: %s\n", name);
+    }
+
+    ULONG lengthOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "overall_length", &lengthOffset));
+
+    ULONG valuesOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "values", &valuesOffset));
+
+    ULONG length = 0;
+    EXT_CHECK(g_ExtData->ReadVirtual(procs + lengthOffset, &length, sizeof(length), NULL));
+    ExtOut("processTable: %p [maximum %d entries]\n", procs, length);
+
+    for (ULONG id = 0; id < length; id++) {
+        ULONG64 process = 0;
+
+        EXT_CHECK(g_ExtData->ReadPointersVirtual(1, procs + valuesOffset + id * pointerSize, &process));
+        if (process != 0) {
+            if (detail) {
+                ExtOut("      %p\n", process);
+            }
+            else {
+                ExtOut("      %p\n", process);
+            }
+        }
+    }
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/sample.cpp b/base/Windows/singx86/sample.cpp
new file mode 100644
index 0000000..566fb55
--- /dev/null
+++ b/base/Windows/singx86/sample.cpp
@@ -0,0 +1,770 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  profile.cpp - Extension to dump profiling information.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Preprocessor material
+
+// #define TEST 1
+#ifdef TEST
+
+#include <windows.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ExtOut printf
+
+#else
+
+#include "singx86.h"
+#define assert //
+
+#endif
+
+#define UNUSED(x) (x) = (x);
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Forward declarations
+
+extern "C" {
+    int OriginCompare(const void* a, const void* b);
+    int TargetCompare(const void* a, const void* b);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Global variables
+
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Utility methods
+#ifdef TEST
+
+static const char* fake_methods[] = { "foo", "bar", "puck", "po", "dizzy", "bazz", "escher", "ringo", "borix" };
+static const size_t n_fake_methods = sizeof(fake_methods) / sizeof(fake_methods[0]);
+
+ULONG64 MethodIp(ULONG64 ip)
+{
+    return ip;
+}
+
+void GetMethodName(ULONG64 ip, PSTR buffer, ULONG bufferLength)
+{
+    strncpy(buffer, fake_methods[ip], bufferLength);
+}
+
+#else // TEST
+
+ULONG64 RoundIp(ULONG64 ip)
+{
+    ULONG64 displacement;
+    if (g_ExtSymbols->GetNameByOffset(ip, NULL, 0, NULL, &displacement) == S_OK) {
+        return (ip - displacement);
+    }
+    return ip;
+}
+
+void GetMethodName(ULONG64 ip, PSTR buffer, ULONG bufferLength)
+{
+    ULONG64 displacement;
+    ULONG   bufferUsed = 0;
+
+    int status = g_ExtSymbols->GetNameByOffset(ip, buffer, bufferLength,
+                                               &bufferUsed, &displacement);
+    if (status != S_OK) {
+        _snprintf(buffer, bufferLength, "%I64x", ip);
+        return;
+    }
+    else if (displacement != 0) {
+        _snprintf(buffer + bufferUsed - 1, bufferLength - bufferUsed, "+0x%I64x", displacement);
+    }
+}
+#endif // TEST
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Target Node
+
+struct TargetNode
+{
+    ULONG64 jumpTarget;
+    int     jumpCount;
+
+    struct TargetNode* next;
+    struct TargetNode* prev;
+
+    TargetNode(ULONG64 theJumpTarget = 0)
+        : jumpTarget(theJumpTarget), jumpCount(1)
+    {
+        next = this;
+        prev = this;
+    }
+
+    inline ULONG64 JumpTarget() const   { return jumpTarget; }
+    inline int JumpCount() const        { return jumpCount; }
+
+    static int CompareJumps(const TargetNode* a, const TargetNode* b)
+    {
+        if (a->jumpCount > b->jumpCount) {
+            return -1;
+        } else if (a->jumpCount < b->jumpCount) {
+            return +1;
+        }
+        return 0;
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Originating Node
+
+struct OriginNode
+{
+    struct OriginNode* next;
+    struct OriginNode* prev;
+
+  private:
+    TargetNode sentinel;
+    ULONG64  jumpOrigin;
+    int      jumpCount;
+    int      nodeCount;
+
+    inline void Append(TargetNode* node)
+    {
+        node->next = sentinel.next;
+        node->next->prev = node;
+        node->prev = &sentinel;
+        sentinel.next = node;
+        nodeCount++;
+    }
+
+  public:
+    OriginNode(ULONG64 theJumpOrigin = 0) : sentinel(0)
+    {
+        jumpOrigin = theJumpOrigin;
+        jumpCount  = 0;
+        nodeCount  = 0;
+
+        this->next = this;
+        this->prev = this;
+    }
+
+    ~OriginNode()
+    {
+        TargetNode* node = sentinel.next;
+        while (node != &sentinel) {
+            TargetNode* next = node->next;
+            delete node;
+            node = next;
+        }
+    }
+
+    void AddJump(ULONG64 theJumpTarget)
+    {
+        jumpCount++;
+
+        TargetNode* node = sentinel.next;
+        TargetNode* stop = &sentinel;
+
+        while (node != stop) {
+            if (node->jumpTarget == theJumpTarget) {
+                node->jumpCount++;
+                return;
+            }
+            node = node->next;
+        }
+        Append(new TargetNode(theJumpTarget));
+    }
+
+    inline int JumpCount() const
+    {
+        return jumpCount;
+    }
+
+    inline ULONG64 JumpOrigin() const { return jumpOrigin; }
+
+    TargetNode** CreateSortTable()
+    {
+        TargetNode** sortTable = new TargetNode* [nodeCount];
+        int insert = 0;
+
+        TargetNode* stop = &sentinel;
+        TargetNode* node = stop->next;
+        while (node != stop) {
+            sortTable[insert++] = node;
+            node = node->next;
+        }
+        assert(insert == nodeCount);
+        qsort(sortTable, nodeCount, sizeof(TargetNode*), TargetCompare);
+        return sortTable;
+    }
+
+    void ReleaseSortTable(TargetNode** sortTable)
+    {
+        delete [] sortTable;
+    }
+
+    void DisplayTargets(const char* preamble)
+    {
+        char name[512];
+
+        TargetNode** sortTable = CreateSortTable();
+
+        for (int i = 0; i < nodeCount; i++) {
+            TargetNode* node = sortTable[i];
+            GetMethodName(node->JumpTarget(), name, sizeof(name) - 1);
+            ExtOut("%s [%d] %s\n", preamble, node->JumpCount(), name);
+        }
+        ReleaseSortTable(sortTable);
+    }
+
+    static int CompareJumps(const OriginNode* a, const OriginNode* b)
+    {
+        if (a->jumpCount> b->jumpCount) {
+            return -1;
+        }
+        else if (a->jumpCount < b->jumpCount) {
+            return +1;
+        }
+        return 0;
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Jump Table to store all IP jumps
+
+class JumpTable
+{
+    static const int hashBins = 32;
+
+    OriginNode hashTable[hashBins];
+    int totalJumps;
+    int nodeCount;
+
+    inline int Hash(ULONG64 theJumpOrigin)
+    {
+        return (int) ((theJumpOrigin ^
+                       (theJumpOrigin >> 12) ^
+                       (theJumpOrigin >> 24)
+                      ) % hashBins);
+    }
+
+  public:
+
+    JumpTable()
+        : nodeCount(0), totalJumps(0)
+    {
+    }
+
+    ~JumpTable()
+    {
+        for (int i = 0; i < hashBins; i++) {
+            OriginNode* sentinel = &hashTable[i];
+            OriginNode* node = sentinel->next;
+            while (node != sentinel) {
+                OriginNode* next = node->next;
+                delete node;
+                node = next;
+            }
+        }
+    }
+
+    void AddJump(ULONG64 theJumpOrigin, ULONG64 theJumpTarget)
+    {
+        int bin = Hash(theJumpOrigin);
+
+        OriginNode* sentinel = &hashTable[bin];
+        OriginNode* node = sentinel->next;
+        while (node != sentinel) {
+            if (node->JumpOrigin() == theJumpOrigin) {
+                node->AddJump(theJumpTarget);
+                totalJumps++;
+                return;
+            }
+            node = node->next;
+        }
+
+        node = new OriginNode(theJumpOrigin);
+        nodeCount++;
+
+        node->AddJump(theJumpTarget);
+        totalJumps++;
+
+        node->next = sentinel->next;
+        node->prev = sentinel;
+        node->next->prev = node;
+        sentinel->next = node;
+    }
+
+    OriginNode** CreateSortTable()
+    {
+        // Build table to sort
+        OriginNode** sortTable = new OriginNode* [nodeCount];
+        int insert = 0;
+
+        for (int i = 0; i < hashBins; i++)
+        {
+            OriginNode* sentinel = &hashTable[i];
+            OriginNode* node = sentinel->next;
+            while (node != sentinel) {
+                assert(node->JumpOrigin() < 0xffffffffULL);
+                sortTable[insert++] = node;
+                node = node->next;
+            }
+        }
+        qsort(sortTable, nodeCount, sizeof(OriginNode*), OriginCompare);
+
+        for (int i = 1; i < nodeCount; i++) {
+            assert(sortTable[i-1]->JumpCount() >= sortTable[i]->JumpCount());
+        }
+
+        return sortTable;
+    }
+
+    void ReleaseSortTable(OriginNode** sortTable)
+    {
+        delete [] sortTable;
+    }
+
+    void Display(const char* parentPreamble, const char* childPreamble)
+    {
+        OriginNode** sortTable = CreateSortTable();
+        char name[512];
+
+        int lastJumps = 0x7fffffff;
+        for (int i = 0; i < nodeCount; i++) {
+            OriginNode* node = sortTable[i];
+            int nodeJumps = node->JumpCount();
+            assert(nodeJumps <= lastJumps);
+            lastJumps = nodeJumps;
+
+            GetMethodName(node->JumpOrigin(), name, sizeof(name) - 1);
+
+            ExtOut("%d. %s %s [%d calls (%.2f%%)]\n",
+                   i, parentPreamble, name, nodeJumps,
+                   100.0 * (float)nodeJumps / (float) totalJumps);
+            node->DisplayTargets(childPreamble);
+        }
+
+        ReleaseSortTable(sortTable);
+    }
+};
+
+int OriginCompare(const void* pa, const void* pb)
+{
+    return OriginNode::CompareJumps(*((const OriginNode**)pa),
+                                    *((const OriginNode**)pb));
+}
+
+int TargetCompare(const void* pa, const void* pb)
+{
+    return TargetNode::CompareJumps(*(const TargetNode**)pa,
+                                    *(const TargetNode**)pb);
+}
+
+#ifdef TEST
+
+int main()
+{
+    JumpTable jt;
+    for (int calls = 0; calls < 150; calls++) {
+        int n = sizeof(fake_methods) / sizeof(fake_methods[0]);
+        int s = rand() % n_fake_methods;
+        int t = rand() % n_fake_methods;
+        jt.AddJump((ULONG64)s, (ULONG64)t);
+    }
+    jt.Display("  ", "   >>");
+
+    return 0;
+}
+
+#else
+
+struct SampleDescriptor
+{
+    ULONG64 eip;
+    int     count;
+};
+
+extern "C" {
+    static int eip_sort(const void* a, const void* b)
+    {
+        SampleDescriptor* sa = (SampleDescriptor*)a;
+        SampleDescriptor* sb = (SampleDescriptor*)b;
+
+        if (sa->eip > sb->eip)
+            return +1;
+        if (sa->eip < sb->eip)
+            return -1;
+        return 0;
+    }
+
+    static int count_sort(const void* a, const void* b)
+    {
+        SampleDescriptor* sa = (SampleDescriptor*)a;
+        SampleDescriptor* sb = (SampleDescriptor*)b;
+
+        if (sa->count < sb->count)
+            return +1;
+        if (sa->count > sb->count)
+            return -1;
+        return 0;
+    }
+};
+
+static HRESULT Usage()
+{
+    ExtOut("Usage:\n"
+           "    !sample {options}\n"
+           "    !sample clear\n"
+           "Options:\n"
+           "    -c       : Print caller-callee information\n"
+           "    -f       : Print frequency distribution of methods\n"
+           "    -k       : Print callee-caller information\n"
+           "    -l       : Analyze call graph leafs only\n"
+           "    -n count : Print count most recent sample stack traces\n"
+           "    -t       : Print sample stack traces\n"
+           "    -x       : Use exact IP values rather than rounding to method start\n"
+          );
+
+    return S_FALSE;
+}
+
+static void
+ClearLog()
+{
+    ULONG64 address;
+    int newPcLength = 0;
+    if (g_ExtSymbols->GetOffsetByName("nt!Processor::pcLength", &address) == S_OK) {
+        g_ExtData->WriteVirtual(address, &newPcLength, 4, NULL);
+        ExtOut("Log cleared.\n");
+        return;
+    }
+    ExtOut("Failed: Could not locate log length variable.\n");
+}
+
+static ULONG
+ScanBack(ULONG64 arrayBase,
+         ULONG   arrayElements,
+         ULONG   pointerSize,
+         ULONG   pcHead,
+         ULONG   pcLength,
+         ULONG   traces)
+{
+    // head points to start of next record, end of last record is zero
+    // so skip back 2 to get to the ending eip
+    ULONG pos = (pcHead + arrayElements - 2) % arrayElements;
+    ULONG wrap = pos;
+
+    while (traces != 0) {
+        ULONG64 element;
+        if (g_ExtData->ReadPointersVirtual(1, arrayBase + pos * pointerSize,
+                                           &element) != S_OK) {
+            ExtErr("Scan failed to read value.");
+            return pcLength;
+        }
+
+        if (element == 0) {
+            traces--;
+        }
+
+        pos = (pos + arrayElements - 1) % arrayElements;
+        if (pos == wrap)
+            return pcLength;
+    }
+    return (wrap + arrayElements - pos) % arrayElements;
+}
+
+EXT_DECL(sample) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    JumpTable foreTable;
+    JumpTable backTable;
+    SampleDescriptor* statsValues = NULL;
+
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+
+    ULONG pointerSize = (g_ExtControl->IsPointer64Bit() == S_OK) ? 8 : 4;
+    ULONG64 address = 0;
+    ULONG64 samples = 0;
+    ULONG type = 0;
+    ULONG subtype = 0;
+    ULONG64 module = 0;
+
+    bool doExactIps     = false;
+    bool doCallerCallee = false;
+    bool doCalleeCaller = false;
+    bool doLeavesOnly   = false;
+    bool doTraces       = false;
+    bool doFrequencies  = false;
+    int  mostRecent = 0;
+
+    if (_strcmpi(args, "clear") == 0) {
+        ClearLog();
+        goto Exit;
+    }
+
+    while (*args != '\0') {
+        while (*args == ' ' || * args == '\t') {
+            args++;
+        }
+
+        if (*args != '-' && *args != '/') {
+            Usage();
+            EXT_CHECK(~S_OK);
+        }
+        args++;
+        switch (tolower(*args++)) {
+          case 'c':
+            doCallerCallee = true;
+            break;
+          case 'f':
+            doFrequencies = true;
+            break;
+          case 'k':
+            doCalleeCaller = true;
+            break;
+          case 'l':
+            doLeavesOnly = true;
+            break;
+          case 'n':
+            while ((*args == ' ' || *args == '\t') && *args != '\0') {
+                args++;
+            }
+            mostRecent = atoi(args);
+            while (*args != ' ' && *args != '\t' && *args != '\0') {
+                args++;
+            }
+            break;
+          case 't':
+            doTraces = true;
+            break;
+          case 'x':
+            doExactIps = true;
+            break;
+          default:
+            Usage();
+            EXT_CHECK(~S_OK);
+        }
+    }
+
+    if (doCallerCallee == false &&
+        doCalleeCaller == false &&
+        doTraces       == false &&
+        doFrequencies  == false) {
+        Usage();
+        EXT_CHECK(~S_OK);
+    }
+
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName("nt!Processor::pcSamples", &address));
+    EXT_CHECK(g_ExtSymbols->GetOffsetTypeId(address, &type, &module));
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, &samples));
+
+    int pcHead;
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName("nt!Processor::pcHead", &address));
+    EXT_CHECK(g_ExtData->ReadVirtual(address, &pcHead, 4, NULL));
+
+    int pcLength;
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName("nt!Processor::pcLength", &address));
+    EXT_CHECK(g_ExtData->ReadVirtual(address, &pcLength, 4, NULL));
+
+    CHAR name[512];
+    EXT_CHECK(g_ExtSymbols->GetTypeName(module, type, name, arrayof(name), NULL));
+    ExtVerb("  pcSamples type: %s\n", name);
+
+    int len = strlen(name);
+    if (len > 3 &&
+        name[len-3] == '[' &&
+        name[len-2] == ']' &&
+        name[len-1] == '*') {
+        name[len-3] = '\0';
+
+        EXT_CHECK(g_ExtSymbols->GetTypeId(module, name, &subtype));
+        EXT_CHECK(g_ExtSymbols->GetTypeName(module, subtype, name, arrayof(name), NULL));
+        ExtVerb("  pcSamples type: %s\n", name);
+    }
+
+    ULONG lengthOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "overall_length", &lengthOffset));
+
+    ULONG valuesOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "values", &valuesOffset));
+
+    ULONG maxLength = 0;
+    EXT_CHECK(g_ExtData->ReadVirtual(samples + lengthOffset,
+                                     &maxLength, sizeof(maxLength), NULL));
+
+    if (mostRecent != 0) {
+        pcLength = ScanBack(samples + valuesOffset, maxLength, pointerSize, pcHead, pcLength, mostRecent);
+    }
+
+    if (doTraces)
+        ExtOut("<Sample Round> <DeltaTicks> <interrupt> <eip ...>\n");
+
+    int pos = (pcHead + maxLength - pcLength) % maxLength;
+
+    // Allocate statistics array
+    statsValues = new SampleDescriptor [pcLength];
+    int statsCount = 0;
+
+    ExtOut("Starting analysis of sample log of %d entries.\n", pcLength);
+    if (doLeavesOnly)
+        ExtOut("Analyzing leaf nodes only.\n");
+
+    if (doTraces) {
+        ExtOut("==================================================================\n");
+        ExtOut("Raw call stacks");
+    }
+
+    while (pcLength > 0)
+    {
+        // Get Sample number
+        ULONG64 number;
+        EXT_CHECK(g_ExtData->ReadPointersVirtual(1, samples + valuesOffset + pos * pointerSize, &number));
+        pos = (pos + 1) % maxLength;
+
+        // Get ticks since last sample
+        ULONG64 deltaTicks;
+        EXT_CHECK(g_ExtData->ReadPointersVirtual(1, samples + valuesOffset + pos * pointerSize, &deltaTicks));
+        pos = (pos + 1) % maxLength;
+
+        // Get interrupt
+        ULONG64 interrupt;
+        EXT_CHECK(g_ExtData->ReadPointersVirtual(1, samples + valuesOffset + pos * pointerSize, &interrupt));
+        pos = (pos + 1) % maxLength;
+
+        pcLength -= 3;
+
+        if (doTraces) {
+            ExtOut(" %10d %10d %2x",
+                   (int)number, (int)deltaTicks, (int)interrupt);
+        }
+
+        // Get instruction pointers
+        int doneFirst = 0;
+        ULONG64 lastIp = 0;
+        bool leafJumpDone = false;
+        bool leafIpDone  = false;
+        do {
+            ULONG64 eip = 0;
+            EXT_CHECK(g_ExtData->ReadPointersVirtual(1, samples + valuesOffset + pos * pointerSize, &eip));
+
+            if (!doExactIps) {
+                eip = RoundIp(eip);
+            }
+
+            if ((leafIpDone == false || doLeavesOnly == false) && eip != 0) {
+                statsValues[statsCount].eip   = eip;
+                statsValues[statsCount].count = 0;
+                statsCount++;
+                leafIpDone = true;
+            }
+
+            if (lastIp != 0 && eip != 0 &&
+                (leafJumpDone == false || doLeavesOnly == false)) {
+                foreTable.AddJump(lastIp, eip);
+                backTable.AddJump(eip, lastIp);
+                leafJumpDone = true;
+            }
+
+            lastIp = eip;
+
+            pos = (pos + 1) % maxLength;
+            pcLength -= 1;
+
+            if (eip == 0) {
+                break;
+            }
+
+            doneFirst |= 1;
+
+            if (doTraces == false)
+                continue;
+
+            if (g_ExtSymbols->GetNameByOffset(eip, (PSTR)&name, sizeof(name), NULL, NULL) == S_OK) {
+                if (doneFirst)
+                    ExtOut(" <- %s", name);
+                else
+                    ExtOut(" %s", name);
+            }
+            else {
+                if (doneFirst)
+                    ExtOut(" <- %p", eip);
+                else
+                    ExtOut(" %p", eip);
+            }
+        } while (pcLength > 0);
+
+        if (doTraces)
+            ExtOut("\n");
+    }
+
+    if (doFrequencies) {
+        ExtOut("==================================================================\n");
+        ExtOut("Raw instruction hits\n");
+
+        if (statsCount > 0) {
+            // Sort instruction pointers so we can count frequency of each unique
+            // value.
+            qsort(statsValues, statsCount, sizeof(SampleDescriptor), eip_sort);
+
+            int outIndex = 0;
+            ULONG64 lastIp = statsValues[0].eip;
+            for (int i = 0; i < statsCount; i++) {
+                if (statsValues[i].eip == lastIp) {
+                    statsValues[outIndex].count++;
+                }
+                else {
+                    outIndex++;
+                    statsValues[outIndex].eip = statsValues[i].eip;
+                    statsValues[outIndex].count = 1;
+                    lastIp = statsValues[i].eip;
+                }
+            }
+
+            // Sort on frequency and display
+            qsort(statsValues, outIndex, sizeof(SampleDescriptor), count_sort);
+            ExtOut("Top of the pops has %d entries:\n", outIndex);
+
+            for (int i = 0; i < outIndex; i++) {
+                if (g_ExtSymbols->GetNameByOffset(statsValues[i].eip,
+                                                  (PSTR)&name,
+                                                  sizeof(name),
+                                                  NULL, NULL) == S_OK) {
+                    ExtOut("% 7d %s\n", statsValues[i].count, name);
+                }
+                else {
+                    ExtOut("% 7d %p\n", statsValues[i].count, statsValues[i].eip);
+                }
+            }
+        }
+    }
+
+    if (doCallerCallee) {
+        ExtOut("==================================================================\n");
+        ExtOut("Calls by target method to other methods:\n");
+        backTable.Display("Calls made by", "       ");
+    }
+
+    if (doCalleeCaller) {
+        ExtOut("==================================================================\n");
+        ExtOut("Calls to target method by other methods.\n");
+        foreTable.Display("Calls made to",   "       ");
+    }
+
+    // EXT_LEAVE equivalent
+  Exit:
+    delete [] statsValues;
+    ExtRelease();
+    return status;
+}
+#endif // TEST
diff --git a/base/Windows/singx86/singx86.cpp b/base/Windows/singx86/singx86.cpp
new file mode 100644
index 0000000..44321b6
--- /dev/null
+++ b/base/Windows/singx86/singx86.cpp
@@ -0,0 +1,599 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  singx86.cpp - Singularity Debugger Extension.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  For more information, see http://ddkslingshot/webs/debugexw/
+//
+#include "singx86.h"
+#include <strsafe.h>
+
+extern bool fCachedLogStateValid;
+
+ULONG   TargetMachine;
+BOOL    Connected;
+
+PDEBUG_ADVANCED       g_ExtAdvanced;
+PDEBUG_CLIENT         g_ExtClient;
+PDEBUG_CONTROL4       g_ExtControl;
+PDEBUG_DATA_SPACES4   g_ExtData;
+PDEBUG_REGISTERS2     g_ExtRegisters;
+PDEBUG_SYMBOLS        g_ExtSymbols = NULL;
+PDEBUG_SYSTEM_OBJECTS g_ExtSystem;
+
+// Queries for all debugger interfaces.
+HRESULT
+ExtQuery(PDEBUG_CLIENT Client)
+{
+    HRESULT status;
+
+    //
+    // Required interfaces.
+    //
+
+    if ((status = Client->QueryInterface(__uuidof(IDebugAdvanced),
+                                         (void **)&g_ExtAdvanced)) != S_OK) {
+        goto Fail;
+    }
+    if ((status = Client->QueryInterface(__uuidof(IDebugControl4),
+                                         (void **)&g_ExtControl)) != S_OK) {
+        goto Fail;
+    }
+    if ((status = Client->QueryInterface(__uuidof(IDebugDataSpaces4),
+                                         (void **)&g_ExtData)) != S_OK) {
+        goto Fail;
+    }
+    if ((status = Client->QueryInterface(__uuidof(IDebugRegisters2),
+                                         (void **)&g_ExtRegisters)) != S_OK) {
+        goto Fail;
+    }
+    if ((status = Client->QueryInterface(__uuidof(IDebugSymbols),
+                                         (void **)&g_ExtSymbols)) != S_OK) {
+        goto Fail;
+    }
+    if ((status = Client->QueryInterface(__uuidof(IDebugSystemObjects),
+                                         (void **)&g_ExtSystem)) != S_OK) {
+        goto Fail;
+    }
+
+    g_ExtClient = Client;
+
+    return S_OK;
+
+ Fail:
+    ExtRelease();
+    return status;
+}
+
+// Cleans up all debugger interfaces.
+void
+ExtRelease(void)
+{
+    g_ExtClient = NULL;
+    EXT_RELEASE(g_ExtAdvanced);
+    EXT_RELEASE(g_ExtControl);
+    EXT_RELEASE(g_ExtData);
+    EXT_RELEASE(g_ExtRegisters);
+    EXT_RELEASE(g_ExtSymbols);
+    EXT_RELEASE(g_ExtSystem);
+}
+
+// Normal output.
+void __cdecl
+ExtOut(PCSTR Format, ...)
+{
+    va_list Args;
+
+    va_start(Args, Format);
+    g_ExtControl->OutputVaList(DEBUG_OUTPUT_NORMAL, Format, Args);
+    va_end(Args);
+}
+
+// Error output.
+void __cdecl
+ExtErr(PCSTR Format, ...)
+{
+    va_list Args;
+
+    va_start(Args, Format);
+    g_ExtControl->OutputVaList(DEBUG_OUTPUT_ERROR, Format, Args);
+    va_end(Args);
+}
+
+// Warning output.
+void __cdecl
+ExtWarn(PCSTR Format, ...)
+{
+    va_list Args;
+
+    va_start(Args, Format);
+    g_ExtControl->OutputVaList(DEBUG_OUTPUT_WARNING, Format, Args);
+    va_end(Args);
+}
+
+// Verbose output.
+void __cdecl
+ExtVerb(PCSTR Format, ...)
+{
+    va_list Args;
+
+    va_start(Args, Format);
+    g_ExtControl->OutputVaList(DEBUG_OUTPUT_VERBOSE, Format, Args);
+    va_end(Args);
+}
+
+HRESULT
+ExtEvalU64(PCSTR* Str, PULONG64 Val)
+{
+    HRESULT status;
+    DEBUG_VALUE FullVal;
+    ULONG EndIdx;
+
+    if ((status = g_ExtControl->
+         Evaluate(*Str, DEBUG_VALUE_INT64, &FullVal, &EndIdx)) != S_OK) {
+        return status;
+    }
+
+    *Val = FullVal.I64;
+    (*Str) += EndIdx;
+
+    while (**Str == ' ' || **Str == '\t' ||
+           **Str == '\n' || **Str == '\r') {
+        (*Str)++;
+    }
+
+    return S_OK;
+}
+
+HRESULT
+ExtDefPointer(ULONG64 address, PULONG64 val)
+{
+    *val = 0;
+
+    return g_ExtData->ReadPointersVirtual(1, address, val);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+class MyEventCallbacks : public DebugBaseEventCallbacks
+{
+    ULONG count;
+
+  public:
+    MyEventCallbacks()
+    {
+        count = 1;
+    }
+
+    STDMETHOD_(ULONG, AddRef)(THIS)
+    {
+        count++;
+        return count;
+    }
+
+    STDMETHOD_(ULONG, Release)(THIS)
+    {
+        count--;
+        return count;
+    }
+
+    STDMETHOD(GetInterestMask)(
+        THIS_
+        __out PULONG Mask)
+    {
+        *Mask = DEBUG_EVENT_CHANGE_DEBUGGEE_STATE;
+        return S_OK;
+    }
+
+    STDMETHOD(ChangeDebuggeeState)(
+        THIS_
+        __in ULONG Flags,
+        __in ULONG64 Argument
+        )
+    {
+        UNREFERENCED_PARAMETER(Flags);
+        UNREFERENCED_PARAMETER(Argument);
+
+        PDEBUG_CLIENT DebugClient;
+        PDEBUG_CONTROL DebugControl;
+        HRESULT Hr;
+
+        if ((Hr = DebugCreate(__uuidof(IDebugClient),
+                              (void **)&DebugClient)) != S_OK) {
+            return Hr;
+        }
+
+        if ((Hr = DebugClient->QueryInterface(__uuidof(IDebugControl),
+                                              (void **)&DebugControl)) == S_OK) {
+            return Hr;
+        }
+
+        fCachedLogStateValid = false;
+
+        EXT_RELEASE(DebugControl);
+        EXT_RELEASE(DebugClient);
+
+        return S_OK;
+    }
+};
+
+static MyEventCallbacks g_Callback;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+extern "C"
+HRESULT
+CALLBACK
+DebugExtensionInitialize(PULONG Version, PULONG Flags)
+{
+    PDEBUG_CLIENT DebugClient;
+    PDEBUG_CONTROL DebugControl;
+    HRESULT Hr;
+
+    *Version = DEBUG_EXTENSION_VERSION(1, 0);
+    *Flags = 0;
+    Hr = S_OK;
+
+    if ((Hr = DebugCreate(__uuidof(IDebugClient),
+                          (void **)&DebugClient)) != S_OK) {
+        return Hr;
+    }
+
+    if ((Hr = DebugClient->QueryInterface(__uuidof(IDebugControl),
+                                          (void **)&DebugControl)) == S_OK) {
+    }
+
+    Hr = DebugClient->SetEventCallbacks(&g_Callback);
+
+    ULONG execStatus = 0;
+    if ((Hr = DebugControl->GetExecutionStatus(&execStatus)) == S_OK) {
+
+        // #define DEBUG_STATUS_NO_CHANGE         0
+        // #define DEBUG_STATUS_GO                1
+        // #define DEBUG_STATUS_GO_HANDLED        2
+        // #define DEBUG_STATUS_GO_NOT_HANDLED    3
+        // #define DEBUG_STATUS_STEP_OVER         4
+        // #define DEBUG_STATUS_STEP_INTO         5
+        // #define DEBUG_STATUS_BREAK             6
+        // #define DEBUG_STATUS_NO_DEBUGGEE       7
+        // #define DEBUG_STATUS_STEP_BRANCH       8
+        // #define DEBUG_STATUS_IGNORE_EVENT      9
+        // #define DEBUG_STATUS_RESTART_REQUESTED 10
+
+    }
+
+    EXT_RELEASE(DebugControl);
+    EXT_RELEASE(DebugClient);
+    return Hr;
+}
+
+
+extern "C"
+void
+CALLBACK
+DebugExtensionNotify(ULONG Notify, ULONG64 Argument)
+{
+    UNREFERENCED_PARAMETER(Argument);
+
+    //
+    // The first time we actually connect to a target
+    //
+
+    if ((Notify == DEBUG_NOTIFY_SESSION_ACCESSIBLE) && (!Connected)) {
+        IDebugClient *DebugClient;
+        HRESULT Hr;
+        PDEBUG_CONTROL DebugControl;
+
+        if ((Hr = DebugCreate(__uuidof(IDebugClient),
+                              (void **)&DebugClient)) == S_OK) {
+            //
+            // Get the architecture type.
+            //
+
+            if ((Hr = DebugClient->QueryInterface(__uuidof(IDebugControl),
+                                                  (void **)&DebugControl)) == S_OK) {
+                if ((Hr = DebugControl->GetActualProcessorType(&TargetMachine)) == S_OK) {
+                    Connected = TRUE;
+                }
+                OnTargetAccessible(DebugClient);
+                DebugControl->Release();
+            }
+            DebugClient->Release();
+        }
+    }
+
+    if (Notify == DEBUG_NOTIFY_SESSION_INACTIVE) {
+        Connected = FALSE;
+        TargetMachine = 0;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+/*
+  This gets called (by DebugExtensionNotify when target is halted and is accessible
+*/
+HRESULT
+OnTargetAccessible(PDEBUG_CLIENT client)
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+
+    ExtOut("**** SingX86.dll [" __DATE__ " " __TIME__ "] detected a break");
+    if (Connected) {
+        ExtOut(" connected to ");
+        switch (TargetMachine) {
+          case IMAGE_FILE_MACHINE_I386:
+            ExtOut("X86");
+            break;
+          case IMAGE_FILE_MACHINE_IA64:
+            ExtOut("IA64");
+            break;
+          default:
+            ExtOut("Other");
+            break;
+        }
+    }
+    ExtOut(" ****\n");
+
+    EXT_CHECK(StructType::InitializeRegistered());
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
+
+extern "C"
+void
+CALLBACK
+DebugExtensionUninitialize(void)
+{
+    PDEBUG_CLIENT DebugClient;
+    HRESULT Hr;
+
+    if ((Hr = DebugCreate(__uuidof(IDebugClient), (void **)&DebugClient)) != S_OK) {
+        return;
+    }
+
+    Hr = DebugClient->SetEventCallbacks(NULL);
+
+    EXT_RELEASE(DebugClient);
+}
+
+extern "C"
+HRESULT
+CALLBACK
+KnownStructOutput(
+    ULONG Flag,
+    ULONG64 Address,
+    PSTR StructName,
+    PSTR Buffer,
+    PULONG BufferSize
+    )
+{
+    IDebugClient *Client;
+    HRESULT status;
+
+    if ((status = DebugCreate(__uuidof(IDebugClient),
+                              (void **)&Client)) == S_OK) {
+        switch (Flag) {
+          case DEBUG_KNOWN_STRUCT_GET_NAMES:
+            status = OnGetKnownStructNames(Client, Buffer, BufferSize);
+            break;
+
+          case DEBUG_KNOWN_STRUCT_GET_SINGLE_LINE_OUTPUT:
+            status = OnGetSingleLineOutput(Client,
+                                           Address,
+                                           StructName,
+                                           Buffer,
+                                           BufferSize);
+            break;
+
+          case DEBUG_KNOWN_STRUCT_SUPPRESS_TYPE_NAME:
+            status = OnGetSuppressTypeName(Client,
+                                           StructName);
+            break;
+
+          default:
+            status = E_INVALIDARG;
+            break;
+        }
+    }
+
+    EXT_RELEASE(Client);
+
+    return status;
+}
+
+ULONG64 GetStaticPointer(PCSTR name)
+{
+    HRESULT status = S_OK;
+    ULONG64 address;
+    ULONG64 value = 0;
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName(name, &address));
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, &value));
+  Exit:
+    return value;
+}
+
+///////////////////////////////////// Remote to Local conversions for structs.
+//
+StructType * StructType::registered = NULL;
+
+StructType::StructType(PCSTR name, ULONG localSize, struct FieldType *fields)
+{
+    this->next = registered;
+    registered = this;
+
+    this->name = name;
+    this->localSize = localSize;
+    this->fields = fields;
+
+    this->fieldCount = 0;
+    this->module = 0;
+    this->type = 0;
+    this->size = 0;
+    this->temp = NULL;
+}
+
+HRESULT StructType::InitializeRegistered()
+{
+    for (StructType *next = registered; next != NULL; next = next->next) {
+        next->Initialize();
+    }
+    return S_OK;
+}
+
+HRESULT StructType::Initialize()
+{
+    HRESULT status = S_OK;
+
+    ExtVerb("Initializing: %s [%p]\n", name, fields);
+    EXT_CHECK(g_ExtSymbols->GetSymbolTypeId(name, &type, &module));
+    EXT_CHECK(g_ExtSymbols->GetTypeSize(module, type, &size));
+    ExtVerb("Initializing: %s [size=%d]\n", name, size);
+    if (temp != NULL) {
+        delete[] temp;
+    }
+    temp = new BYTE [size];
+    ZeroMemory(temp, size);
+
+    fieldCount = 0;
+    for (FieldType *field = fields; field->name != NULL; field++) {
+        CHAR fieldName[512];
+
+        EXT_CHECK(StringCbPrintf(fieldName, sizeof(fieldName), "%s.%s", name, field->name));
+        status = g_ExtSymbols->GetSymbolTypeId(fieldName, &field->type, &field->module);
+        if (status == S_OK) {
+            EXT_CHECK(g_ExtSymbols->GetTypeSize(field->module, field->type, &field->size));
+            EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, field->name, &field->offset));
+            ExtVerb("Initializing: %s [offset=%d,size=%d]\n", fieldName, field->offset, field->size);
+        }
+        else {
+            ExtErr("Can't find: %s\n", fieldName);
+            field->size = 0;
+            field->offset = 0;
+        }
+
+        field->parent = this;
+        fieldCount++;
+    }
+
+  Exit:
+    ExtVerb("** Exited with %08x\n", status);
+    return status;
+}
+
+HRESULT StructType::RemoteOffsetFromLocal(ULONG localOffset, ULONG *remoteOffset)
+{
+    for (ULONG f = 0; f < fieldCount; f++) {
+        FieldType *field = &fields[f];
+
+        if (field->localOffset == localOffset) {
+            if (remoteOffset != NULL) {
+                *remoteOffset = field->offset;
+                return S_OK;
+            }
+            return S_FALSE;
+        }
+    }
+    return E_FAIL;
+}
+
+HRESULT StructType::RawAccess(ULONG remoteOffset, PVOID *raw)
+{
+    *raw = temp + remoteOffset;
+    return S_OK;
+}
+
+HRESULT StructType::Read(ULONG64 address, PVOID local)
+{
+    HRESULT status = S_OK;
+
+    ZeroMemory(temp, size);
+    ZeroMemory(local, localSize);
+
+    EXT_CHECK(g_ExtData->ReadVirtual(address, temp, size, NULL));
+
+    for (ULONG f = 0; f < fieldCount; f++) {
+        FieldType *field = &fields[f];
+
+        PBYTE pbLocal = ((PBYTE)local) + field->localOffset;
+        PBYTE pbTemp = &temp[field->offset];
+
+        switch (field->size) {
+          case 1:
+            *(ULONG64 *)pbLocal = *(BYTE *)pbTemp;
+            break;
+          case 2:
+            *(ULONG64 *)pbLocal = *(USHORT *)pbTemp;
+            break;
+          case 4:
+            *(ULONG64 *)pbLocal = *(ULONG *)pbTemp;
+            break;
+          case 8:
+            *(ULONG64 *)pbLocal = *(ULONG64 *)pbTemp;
+            break;
+          default:
+#if 0
+              // We allow bigger sizes, for raw access only.
+            ExtOut("Unknown size: %d, in field %s\n", field->size, field->name);
+#endif
+            break;
+        }
+    }
+
+  Exit:
+    return status;
+}
+
+HRESULT StructType::Clear()
+{
+    HRESULT status = S_OK;
+
+    ZeroMemory(temp, size);
+
+    return status;
+}
+
+HRESULT StructType::Update(PVOID local)
+{
+    HRESULT status = S_OK;
+
+    for (ULONG f = 0; f < fieldCount; f++) {
+        FieldType *field = &fields[f];
+
+        PBYTE pbLocal = ((PBYTE)local) + field->localOffset;
+        PBYTE pbTemp = &temp[field->offset];
+
+        switch (field->size) {
+          case 1:
+            *(BYTE *)pbTemp = (BYTE)*(ULONG64 *)pbLocal;
+            break;
+          case 2:
+            *(USHORT *)pbTemp = (USHORT)*(ULONG64 *)pbLocal;
+            break;
+          case 4:
+            *(ULONG *)pbTemp = (ULONG)*(ULONG64 *)pbLocal;
+            break;
+          case 8:
+            *(ULONG64 *)pbTemp = *(ULONG64 *)pbLocal;
+            break;
+        }
+    }
+
+    return status;
+}
+
+HRESULT StructType::Flush(ULONG64 address)
+{
+    HRESULT status = S_OK;
+
+    EXT_CHECK(g_ExtData->WriteVirtual(address, temp, size, NULL));
+
+  Exit:
+    return status;
+}
+
+
+//
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/Windows/singx86/singx86.def b/base/Windows/singx86/singx86.def
new file mode 100644
index 0000000..aeafc62
--- /dev/null
+++ b/base/Windows/singx86/singx86.def
@@ -0,0 +1,37 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  singx86.def - Singularity Debugger Extension Export Table
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+;;  For more information, see http://ddkslingshot/webs/debugexw/
+;;
+
+EXPORTS
+
+;; Functions providing new command extensions.
+
+    apic
+    bytev
+    charv
+    dump
+    help
+    ioapic
+    log
+    object
+    procs
+    sample
+    sips
+    stack
+    thread
+    threads
+
+;; Functions required by the debugger.
+
+    DebugExtensionNotify
+    DebugExtensionInitialize
+    DebugExtensionUninitialize
+    KnownStructOutput
+
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/base/Windows/singx86/singx86.h b/base/Windows/singx86/singx86.h
new file mode 100644
index 0000000..1bff5bc
--- /dev/null
+++ b/base/Windows/singx86/singx86.h
@@ -0,0 +1,357 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  singx86.h - Singularity Debugger Extension common Header.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  For more information, see http://ddkslingshot/webs/debugexw/
+//
+
+#pragma warning(disable:4201) // Enable nameless structs and unions.
+
+#include <winlean.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+
+//
+// Define KDEXT_64BIT to make all wdbgexts APIs recognize 64 bit addresses
+// It is recommended for extensions to use 64 bit headers from wdbgexts so
+// the extensions could support 64 bit targets.
+//
+// #define KDEXT_64BIT
+// #include <wdbgexts.h>
+#include <dbgeng.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Load the Singularity types exported by halclass.h
+//
+
+#define arrayof(a)      (sizeof(a)/sizeof(a[0]))
+
+#include <pshpack4.h>
+
+/////////////////////////////////////////////////////////////// Static Assert.
+//
+// Compile-time (not run-time) assertion. Code will not compile if
+// expr is false. Note: there is no non-debug version of this; we
+// want this for all builds. The compiler optimizes the code away.
+//
+template <bool x> struct STATIC_ASSERT_FAILURE;
+template <> struct STATIC_ASSERT_FAILURE<true> { };
+template <int x> struct static_assert_test { };
+
+#define STATIC_CAT_INNER(x,y) x##y
+#define STATIC_CAT(x,y) STATIC_CAT_INNER(x,y)
+#define STATIC_ASSERT(condition) \
+   typedef static_assert_test< \
+      sizeof(STATIC_ASSERT_FAILURE<(bool)(condition)>)> \
+         STATIC_CAT(__static_assert_typedef_, __COUNTER__)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define OFFSETOF(s,m)   ((uintptr)&(((s *)0)->m))
+#define ARRAYOF(a)      (sizeof(a)/sizeof(a[0]))
+
+
+//#include <halclass.h>
+#include <poppack.h>
+
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    // Declares an extension routine.
+#define EXT_DECL(Name) \
+    extern "C" HRESULT CALLBACK \
+    Name(PDEBUG_CLIENT client, PCSTR args)
+
+    // Set up and clean up for an extension routine.
+#define EXT_ENTER() \
+    HRESULT status = ExtQuery(client); \
+    if (status != S_OK) goto Exit; else 0
+
+#define EXT_LEAVE() \
+    Exit: ExtRelease(); return status
+
+    // Safe release and NULL.
+#define EXT_RELEASE(Unk) \
+    ((Unk) != NULL ? ((Unk)->Release(), (Unk) = NULL) : NULL)
+
+    // Evaluates a numeric expression from the current args
+    // and updates the Args location.
+    // Assumes variables args and status, plus exit label Exit.
+#define EXT_ARG(Dst) \
+    if ((status = ExtEvalU64(&args, &(Dst))) != S_OK) goto Exit; else 0
+
+#define EXT_CHECK(expr) \
+    if ((status = expr) != S_OK) goto Exit; else 0
+
+    // Global variables initialized by query.
+    extern PDEBUG_ADVANCED       g_ExtAdvanced;
+    extern PDEBUG_CLIENT         g_ExtClient;
+    extern PDEBUG_CONTROL4       g_ExtControl;
+    extern PDEBUG_DATA_SPACES4   g_ExtData;
+    extern PDEBUG_REGISTERS2     g_ExtRegisters;
+    extern PDEBUG_SYMBOLS        g_ExtSymbols;
+    extern PDEBUG_SYSTEM_OBJECTS g_ExtSystem;
+
+    // Queries for all debugger interfaces.
+    HRESULT ExtQuery(PDEBUG_CLIENT Client);
+
+    // Cleans up all debugger interfaces.
+    void ExtRelease(void);
+
+    // Normal output.
+    void __cdecl ExtOut(PCSTR Format, ...);
+    // Error output.
+    void __cdecl ExtErr(PCSTR Format, ...);
+    // Warning output.
+    void __cdecl ExtWarn(PCSTR Format, ...);
+    // Verbose output.
+    void __cdecl ExtVerb(PCSTR Format, ...);
+
+
+    // Evaluates an expression from the given string
+    // and updates the string pointer.  Consumes trailing whitespace.
+    HRESULT ExtEvalU64(PCSTR* Str, PULONG64 Val);
+    HRESULT ExtDefPointer(ULONG64 Address, PULONG64 Val);
+
+    extern BOOL  Connected;
+    extern ULONG TargetMachine;
+
+    HRESULT OnTargetAccessible(PDEBUG_CLIENT Client);
+
+    HRESULT OnGetKnownStructNames(PDEBUG_CLIENT Client,
+                                  PSTR Buffer,
+                                  PULONG BufferSize);
+    HRESULT OnGetSingleLineOutput(PDEBUG_CLIENT Client,
+                                  ULONG64 Address,
+                                  PSTR StructName,
+                                  PSTR Buffer,
+                                  PULONG BufferSize);
+    HRESULT OnGetSuppressTypeName(PDEBUG_CLIENT Client,
+                                  PSTR StructName);
+
+    ULONG64 GetStaticPointer(PCSTR name);
+
+    ///////////////////////////////// Remote to Local conversions for structs.
+    //
+
+    // Metadata structures.
+    struct StructType
+    {
+        struct StructType * next;
+        struct FieldType * fields;
+        ULONG       fieldCount;
+        PCSTR       name;
+        ULONG64     module;
+        ULONG       type;
+        ULONG       size;
+        PBYTE       temp;
+        ULONG       localSize;
+
+        public:
+        static StructType * registered;
+        static HRESULT InitializeRegistered();
+
+        public:
+        StructType(PCSTR name, ULONG localSize, struct FieldType *fields);
+
+        HRESULT Initialize();
+        HRESULT RemoteOffsetFromLocal(ULONG localOffset, ULONG *remoteOffset);
+
+        HRESULT Clear();
+        HRESULT Read(ULONG64 address, PVOID local);
+        HRESULT RawAccess(ULONG remoteOffset, PVOID *raw);
+        HRESULT Update(PVOID local);
+        HRESULT Flush(ULONG64 address);
+    };
+
+    struct FieldType
+    {
+        struct StructType *parent;
+        PCSTR       name;
+        ULONG       localOffset;
+        ULONG64     module;
+        ULONG       type;
+        ULONG       offset;
+        ULONG       size;
+    };
+
+    // Macros for defining metadata.
+#define FIELD(s,f)  { NULL, #f, offsetof(s,f), 0, 0, 0, 0 }
+#define FIELDEND()  { NULL, NULL, 0, 0, 0, 0, 0 }
+
+    /////////////////////////////////////////////////////////// Known Structs.
+    //
+    struct MmxContext
+    {
+        ULONG64     fcw;
+        ULONG64     fsw;
+        ULONG64     ftw;
+        ULONG64     fop;
+        ULONG64     eip;
+        ULONG64     cs;
+        ULONG64     dp;
+        ULONG64     ds;
+        ULONG64     mxcsr;
+        ULONG64     mxcsrmask;
+        ULONG64     st0;
+        ULONG64     st1;
+        ULONG64     st2;
+        ULONG64     st3;
+        ULONG64     st4;
+        ULONG64     st5;
+        ULONG64     st6;
+        ULONG64     st7;
+    };
+
+    struct ThreadContext
+    {
+        ULONG64     regs;
+        ULONG64     prev;
+        ULONG64     next;
+        ULONG64     eip;
+        ULONG64     efl;
+        ULONG64     num;
+        ULONG64     err;
+        ULONG64     cr2;
+        ULONG64     eax;
+        ULONG64     ebx;
+        ULONG64     ecx;
+        ULONG64     edx;
+        ULONG64     esp;
+        ULONG64     ebp;
+        ULONG64     esi;
+        ULONG64     edi;
+        ULONG64     stackBegin;
+        ULONG64     stackLimit;
+        ULONG64     processId;
+        ULONG64     uncaughtFlag;
+        ULONG64     suspendAlert;
+        ULONG64     _thread;
+        ULONG64     processThread;
+        ULONG64     stackMarkers;
+        ULONG64     processMarkers;
+        ULONG64     threadIndex;
+        ULONG64     processThreadIndex;
+        ULONG64     gcStates;
+        struct MmxContext   mmx;
+    };
+
+    extern FieldType ThreadContextFields[];
+    extern StructType ThreadContextStruct;
+
+    struct Thread
+    {
+        ULONG64     blocked;
+        ULONG64     blockedOn;
+        ULONG64     blockedOnCount;
+        ULONG64     blockedUntil;
+        ULONG64     process;
+        ULONG64     schedulerEntry;
+        ThreadContext   context;
+    };
+
+    extern FieldType ThreadFields[];
+    extern StructType ThreadStruct;
+
+    struct ThreadEntry
+    {
+        ULONG64     queue;
+    };
+
+    extern FieldType ThreadEntryFields[];
+    extern StructType ThreadEntryStruct;
+
+    struct ProcessorContext
+    {
+        ULONG64     threadContext;
+        ULONG64     _processor;
+        ULONG64     exception;
+        ULONG64     schedulerStackBegin;
+        ULONG64     schedulerStackLimit;
+        ULONG64     interruptStackBegin;
+        ULONG64     interruptStackLimit;
+        ULONG64     exceptionStackBegin;
+        ULONG64     exceptionStackLimit;
+
+        ThreadContext   exceptionContext;
+        ThreadContext   thirdContext;
+
+        ULONG64     cpuId;
+        ULONG64     nextProcessorContext;
+    };
+    extern FieldType ProcessorContextFields[];
+    extern StructType ProcessorContextStruct;
+
+    struct Processor
+    {
+        ULONG64     context;
+        ULONG64     nextTimerInterrupt;
+
+        ULONG64     pic;
+        ULONG64     timer;
+        ULONG64     clock;
+
+        ULONG64     timerInterrupt;
+        ULONG64     clockInterrupt;
+        ULONG64     inInterruptContext;
+        ULONG64     halted;
+
+        ULONG64     NumExceptions;
+        ULONG64     NumInterrupts;
+        ULONG64     NumContextSwitches;
+
+        ULONG64     interruptCounts;
+    };
+    extern FieldType ProcessorFields[];
+    extern StructType ProcessorStruct;
+
+    struct String
+    {
+        ULONG64     m_stringLength;
+        ULONG64     m_firstChar;
+    };
+
+    extern FieldType StringFields[];
+    extern StructType StringStruct;
+
+    struct LogEntry
+    {
+        ULONG64     _cycleCount;
+        ULONG64     _cpuId;
+        ULONG64     _eip;
+        ULONG64     _threadId;
+        ULONG64     _processId;
+        ULONG64     _tag;
+        ULONG64     _severity;
+        ULONG64     _strings;
+        ULONG64     _text;
+        union
+        {
+            ULONG64     _args[6];
+            struct
+            {
+                ULONG64 _arg0;
+                ULONG64 _arg1;
+                ULONG64 _arg2;
+                ULONG64 _arg3;
+                ULONG64 _arg4;
+                ULONG64 _arg5;
+            };
+        };
+    };
+    extern FieldType LogEntryFields[];
+    extern StructType LogEntryStruct;
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/base/Windows/singx86/singx86.rc b/base/Windows/singx86/singx86.rc
new file mode 100644
index 0000000..c2a4941
--- /dev/null
+++ b/base/Windows/singx86/singx86.rc
@@ -0,0 +1,34 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  singx86.rc - Singularity Debugger Extension Version Information
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,0,0,52
+ PRODUCTVERSION 2,0,0,52
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x00040004L
+ FILETYPE 0x00000002L
+ FILESUBTYPE 0x00000000L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "CompanyName", "Microsoft Corporation"
+            VALUE "FileDescription", "Debugger extensions for Microsoft Research Singularity"
+            VALUE "FileVersion", "2.0"
+            VALUE "InternalName", "SingX86.dll"
+            VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation.  All rights reserved."
+            VALUE "OriginalFilename", "SingX86.dll"
+            VALUE "ProductName", "Microsoft Research Singularity"
+            VALUE "ProductVersion", "2.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/base/Windows/singx86/sips.cpp b/base/Windows/singx86/sips.cpp
new file mode 100644
index 0000000..46392de
--- /dev/null
+++ b/base/Windows/singx86/sips.cpp
@@ -0,0 +1,165 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  sips.cpp - Extension to find Singularity SIPs.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+HRESULT DumpSip(ULONG64 address, bool stack, bool detail)
+{
+    if (address == 0) {
+        return S_FALSE;
+    }
+
+    HRESULT status = S_OK;
+    Thread thread;
+
+    EXT_CHECK(ThreadStruct.Read(address, &thread));
+
+    if (stack) {
+        ExtOut("  thread=%p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p }\n",
+               address,
+               (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+               (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+               thread.context.eip,
+               thread.context.ebp,
+               thread.context.esp);
+
+        DEBUG_STACK_FRAME frames[10];
+        ULONG filled = 0;
+
+        status = g_ExtControl->GetStackTrace(thread.context.ebp,
+                                             thread.context.esp,
+                                             thread.context.eip,
+                                             frames,
+                                             arrayof(frames),
+                                             &filled);
+
+        if (status == S_OK) {
+            g_ExtClient->SetOutputLinePrefix("      ");
+            g_ExtControl->OutputStackTrace(DEBUG_OUTPUT_NORMAL,
+                                           frames,
+                                           filled,
+                                           detail ? (DEBUG_STACK_FRAME_ADDRESSES |
+                                                     DEBUG_STACK_COLUMN_NAMES |
+                                                     DEBUG_STACK_SOURCE_LINE) : 0);
+        }
+    }
+    else {
+        CHAR name[512];
+        ULONG64 displacement = 0;
+
+        status = g_ExtSymbols->GetNameByOffset((ULONG64)thread.context.eip,
+                                               name,
+                                               arrayof(name),
+                                               NULL,
+                                               &displacement);
+        if (status == S_OK) {
+            ExtOut("  thread=%p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p } %s+%I64d\n",
+                   address,
+                   (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+                   (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+                   thread.context.eip,
+                   thread.context.ebp,
+                   thread.context.esp,
+                   name,
+                   (LONG64)displacement);
+        }
+        else {
+            ExtOut("  thread=%p { tid=%03x pid=%03x ebp=%p, esp=%p, eip=%p }\n",
+                   address,
+                   (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+                   (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+                   thread.context.eip,
+                   thread.context.ebp,
+                   thread.context.esp);
+        }
+    }
+  Exit:
+    return status;
+}
+
+
+EXT_DECL(sips) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    bool stack = false;
+    bool detail = false;
+
+    while (*args != '\0') {
+        if (*args == '-' || *args == '/') {
+            args++;
+            switch (*args++) {
+              case 'd': // detail
+              case 'D':
+                detail = !detail;
+                break;
+              case 's': // stack
+              case 'S':
+                stack = !stack;
+                break;
+            }
+            while (*args != ' ') {
+                args++;
+            }
+        }
+        else {
+            break;
+        }
+    }
+
+    ULONG pointerSize = (g_ExtControl->IsPointer64Bit() == S_OK) ? 8 : 4;
+    ULONG64 address = 0;
+    ULONG64 procs = 0;
+    ULONG type = 0;
+    ULONG subtype = 0;
+    ULONG64 module = 0;
+
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName("nt!Process::processTable", &address));
+    EXT_CHECK(g_ExtSymbols->GetOffsetTypeId(address, &type, &module));
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, &procs));
+    ExtVerb("processTable: %p\n", procs);
+
+    CHAR name[512];
+
+    EXT_CHECK(g_ExtSymbols->GetTypeName(module, type, name, arrayof(name), NULL));
+    ExtVerb("  processTable type: %s\n", name);
+    int len = strlen(name);
+    if (len > 3 &&
+        name[len-3] == '[' &&
+        name[len-2] == ']' &&
+        name[len-1] == '*') {
+        name[len-3] = '\0';
+
+        EXT_CHECK(g_ExtSymbols->GetTypeId(module, name, &subtype));
+        EXT_CHECK(g_ExtSymbols->GetTypeName(module, subtype, name, arrayof(name), NULL));
+        ExtVerb("  processTable[] type: %s\n", name);
+    }
+
+    ULONG lengthOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "overall_length", &lengthOffset));
+
+    ULONG valuesOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "values", &valuesOffset));
+
+    ULONG length = 0;
+    EXT_CHECK(g_ExtData->ReadVirtual(procs + lengthOffset, &length, sizeof(length), NULL));
+    ExtOut("processTable: %p [maximum %d entries]\n", procs, length);
+
+    for (ULONG id = 0; id < length; id++) {
+        ULONG64 process = 0;
+
+        EXT_CHECK(g_ExtData->ReadPointersVirtual(1, procs + valuesOffset + id * pointerSize, &process));
+        if (process != 0) {
+            if (detail) {
+                ExtOut("      %p\n", process);
+            }
+            else {
+                ExtOut("      %p\n", process);
+            }
+        }
+    }
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/stack.cpp b/base/Windows/singx86/stack.cpp
new file mode 100644
index 0000000..0665cbb
--- /dev/null
+++ b/base/Windows/singx86/stack.cpp
@@ -0,0 +1,28 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  threads.cpp - Extension to find Singularity threads.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+HRESULT DumpThread(ULONG64 thread, bool verbose, bool fullstack, bool detail, bool blocked);
+
+EXT_DECL(stack) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+
+    ULONG64 thread = 0;
+
+    status = ExtEvalU64(&args, &thread);
+    if (status != S_OK) {
+        goto Exit;
+    }
+
+    CHAR prefix[256];
+    EXT_CHECK(g_ExtClient->GetOutputLinePrefix(prefix, arrayof(prefix), NULL));
+    DumpThread(thread, true, false, true, true);
+    EXT_CHECK(g_ExtClient->SetOutputLinePrefix(prefix));
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/structs.cpp b/base/Windows/singx86/structs.cpp
new file mode 100644
index 0000000..38f1638
--- /dev/null
+++ b/base/Windows/singx86/structs.cpp
@@ -0,0 +1,331 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  structs.cpp - extensions to dump well-known structs.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "singx86.h"
+#include <strsafe.h>
+
+//////////////////////////////////////////////////////////////////////////////
+//
+FieldType ThreadContextFields[] = {
+    FIELD(ThreadContext, mmx.st0),                  // Accessed directly as Field[0]
+    FIELD(ThreadContext, mmx.st1),                  // Accessed directly as Field[1]
+    FIELD(ThreadContext, mmx.st2),                  // Accessed directly as Field[2]
+    FIELD(ThreadContext, mmx.st3),                  // Accessed directly as Field[3]
+    FIELD(ThreadContext, mmx.st4),                  // Accessed directly as Field[4]
+    FIELD(ThreadContext, mmx.st5),                  // Accessed directly as Field[5]
+    FIELD(ThreadContext, mmx.st6),                  // Accessed directly as Field[6]
+    FIELD(ThreadContext, mmx.st7),                  // Accessed directly as Field[7]
+    FIELD(ThreadContext, mmx.fcw),                  // Accessed directly as Field[8]
+    FIELD(ThreadContext, mmx.fsw),
+    FIELD(ThreadContext, mmx.ftw),
+    FIELD(ThreadContext, mmx.fop),
+    FIELD(ThreadContext, mmx.eip),
+    FIELD(ThreadContext, mmx.cs),
+    FIELD(ThreadContext, mmx.dp),
+    FIELD(ThreadContext, mmx.ds),
+    FIELD(ThreadContext, mmx.mxcsr),
+    FIELD(ThreadContext, mmx.mxcsrmask),
+    FIELD(ThreadContext, regs),
+    FIELD(ThreadContext, prev),
+    FIELD(ThreadContext, next),
+    FIELD(ThreadContext, eip),
+    FIELD(ThreadContext, efl),
+    FIELD(ThreadContext, num),
+    FIELD(ThreadContext, err),
+    FIELD(ThreadContext, cr2),
+    FIELD(ThreadContext, eax),
+    FIELD(ThreadContext, ebx),
+    FIELD(ThreadContext, ecx),
+    FIELD(ThreadContext, edx),
+    FIELD(ThreadContext, esp),
+    FIELD(ThreadContext, ebp),
+    FIELD(ThreadContext, esi),
+    FIELD(ThreadContext, edi),
+    FIELD(ThreadContext, stackBegin),
+    FIELD(ThreadContext, stackLimit),
+    FIELD(ThreadContext, processId),
+    FIELD(ThreadContext, uncaughtFlag),
+    FIELD(ThreadContext, suspendAlert),
+    FIELD(ThreadContext, _thread),
+    FIELD(ThreadContext, processThread),
+    FIELD(ThreadContext, stackMarkers),
+    FIELD(ThreadContext, processMarkers),
+    FIELD(ThreadContext, threadIndex),
+    FIELD(ThreadContext, processThreadIndex),
+    FIELD(ThreadContext, gcStates),
+    FIELDEND(),
+};
+
+StructType ThreadContextStruct
+= StructType("nt!ThreadContext",
+             sizeof(ThreadContext), ThreadContextFields);
+
+FieldType ThreadFields[] = {
+    FIELD(Thread, context.mmx.st0),                  // Accessed directly as Field[0]
+    FIELD(Thread, context.mmx.st1),                  // Accessed directly as Field[1]
+    FIELD(Thread, context.mmx.st2),                  // Accessed directly as Field[2]
+    FIELD(Thread, context.mmx.st3),                  // Accessed directly as Field[3]
+    FIELD(Thread, context.mmx.st4),                  // Accessed directly as Field[4]
+    FIELD(Thread, context.mmx.st5),                  // Accessed directly as Field[5]
+    FIELD(Thread, context.mmx.st6),                  // Accessed directly as Field[6]
+    FIELD(Thread, context.mmx.st7),                  // Accessed directly as Field[7]
+    FIELD(Thread, context.mmx.fcw),                  // Accessed directly as Field[8]
+    FIELD(Thread, context),                          // Accessed directly as Field[9]
+    FIELD(Thread, context.mmx.fsw),
+    FIELD(Thread, context.mmx.ftw),
+    FIELD(Thread, context.mmx.fop),
+    FIELD(Thread, context.mmx.eip),
+    FIELD(Thread, context.mmx.cs),
+    FIELD(Thread, context.mmx.dp),
+    FIELD(Thread, context.mmx.ds),
+    FIELD(Thread, context.mmx.mxcsr),
+    FIELD(Thread, context.mmx.mxcsrmask),
+    FIELD(Thread, blocked),
+    FIELD(Thread, blockedOn),
+    FIELD(Thread, blockedOnCount),
+    FIELD(Thread, blockedUntil),
+    FIELD(Thread, process),
+    FIELD(Thread, schedulerEntry),
+    FIELD(Thread, context.regs),
+    FIELD(Thread, context.prev),
+    FIELD(Thread, context.next),
+    FIELD(Thread, context.eip),
+    FIELD(Thread, context.efl),
+    FIELD(Thread, context.num),
+    FIELD(Thread, context.err),
+    FIELD(Thread, context.cr2),
+    FIELD(Thread, context.eax),
+    FIELD(Thread, context.ebx),
+    FIELD(Thread, context.ecx),
+    FIELD(Thread, context.edx),
+    FIELD(Thread, context.esp),
+    FIELD(Thread, context.ebp),
+    FIELD(Thread, context.esi),
+    FIELD(Thread, context.edi),
+    FIELD(Thread, context.stackBegin),
+    FIELD(Thread, context.stackLimit),
+    FIELD(Thread, context.processId),
+    FIELD(Thread, context.uncaughtFlag),
+    FIELD(Thread, context.suspendAlert),
+    FIELD(Thread, context._thread),
+    FIELD(Thread, context.processThread),
+    FIELD(Thread, context.stackMarkers),
+    FIELD(Thread, context.processMarkers),
+    FIELD(Thread, context.threadIndex),
+    FIELD(Thread, context.processThreadIndex),
+    FIELD(Thread, context.gcStates),
+    FIELDEND(),
+};
+
+StructType ThreadStruct
+= StructType("nt!Thread",
+             sizeof(Thread), ThreadFields);
+
+FieldType ThreadEntryFields[] = {
+    FIELD(ThreadEntry, queue),
+    FIELDEND(),
+};
+
+StructType ThreadEntryStruct
+= StructType("nt!ThreadEntry",
+             sizeof(ThreadEntry), ThreadEntryFields);
+
+FieldType StringFields[] = {
+    FIELD(String, m_firstChar),                         // Accessed directly as Field[0]
+    FIELD(String, m_stringLength),
+    FIELDEND(),
+};
+
+StructType StringStruct = StructType("nt!String",
+                                     sizeof(String), StringFields);
+
+FieldType LogEntryFields[] = {
+    FIELD(LogEntry, _cycleCount),
+    FIELD(LogEntry, _eip),
+    FIELD(LogEntry, _cpuId),
+    FIELD(LogEntry, _threadId),
+    FIELD(LogEntry, _processId),
+    FIELD(LogEntry, _tag),
+    FIELD(LogEntry, _severity),
+    FIELD(LogEntry, _strings),
+    FIELD(LogEntry, _text),
+    FIELD(LogEntry, _arg0),
+    FIELD(LogEntry, _arg1),
+    FIELD(LogEntry, _arg2),
+    FIELD(LogEntry, _arg3),
+    FIELD(LogEntry, _arg4),
+    FIELD(LogEntry, _arg5),
+    FIELDEND(),
+};
+
+StructType LogEntryStruct = StructType("nt!Struct_Microsoft_Singularity_Tracing_LogEntry",
+                                       sizeof(LogEntry), LogEntryFields);
+
+FieldType ProcessorContextFields[] = {
+    FIELD(ProcessorContext, threadContext),
+    FIELD(ProcessorContext, threadContext),
+    FIELD(ProcessorContext, _processor),
+    FIELD(ProcessorContext, exception),
+    FIELD(ProcessorContext, schedulerStackBegin),
+    FIELD(ProcessorContext, schedulerStackLimit),
+    FIELD(ProcessorContext, interruptStackBegin),
+    FIELD(ProcessorContext, interruptStackLimit),
+    FIELD(ProcessorContext, exceptionStackBegin),
+    FIELD(ProcessorContext, exceptionStackLimit),
+    FIELD(ProcessorContext, cpuId),
+    FIELD(ProcessorContext, nextProcessorContext),
+    FIELDEND(),
+};
+
+StructType ProcessorContextStruct
+= StructType("nt!ProcessorContext",
+             sizeof(ProcessorContext), ProcessorContextFields);
+
+FieldType ProcessorFields[] = {
+    FIELD(Processor, context),
+    FIELD(Processor, nextTimerInterrupt),
+    FIELD(Processor, pic),
+    FIELD(Processor, timer),
+    FIELD(Processor, clock),
+    FIELD(Processor, timerInterrupt),
+    FIELD(Processor, clockInterrupt),
+    FIELD(Processor, inInterruptContext),
+    FIELD(Processor, halted),
+    FIELD(Processor, NumExceptions),
+    FIELD(Processor, NumInterrupts),
+    FIELD(Processor, NumContextSwitches),
+    FIELD(Processor, interruptCounts),
+    FIELDEND(),
+};
+
+StructType ProcessorStruct
+= StructType("nt!Processor",
+             sizeof(Processor), ProcessorFields);
+
+/////////////////////////////////////////////////////////// KnownStructOutput.
+//
+const char* KnownStructs[] = {"String",
+                              "Thread",
+                              "System_String",
+                              "System_Threading_Thread",
+#if 0
+                              "ProcessorContext",
+                              "Microsoft_Singularity_X86_ProcessorContext"
+#endif
+};
+
+HRESULT OnGetKnownStructNames(PDEBUG_CLIENT client,
+                              PSTR buffer,
+                              PULONG bufferSize)
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+
+    //
+    // Return names of known structs in multi string
+    //
+    ULONG sizeRemaining = *bufferSize, SizeNeeded = 0, Length;
+    PCHAR copyAt = buffer;
+
+    for (ULONG i = 0; i < arrayof(KnownStructs); i++) {
+        if (sizeRemaining > (Length = (ULONG)strlen(KnownStructs[i]) + 1) &&
+            status == S_OK) {
+            status = StringCbCopy(copyAt, sizeRemaining, KnownStructs[i]);
+
+            sizeRemaining -= Length;
+            copyAt += Length;
+        }
+        else {
+            status = S_FALSE;
+        }
+        SizeNeeded += Length;
+    }
+    // Terminate multistring and return size copied
+    *copyAt = 0;
+    *bufferSize = SizeNeeded+1;
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
+
+HRESULT OnGetSingleLineOutput(PDEBUG_CLIENT client,
+                              ULONG64 address,
+                              PSTR structName,
+                              PSTR buffer,
+                              PULONG bufferSize)
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+
+    ExtVerb("OnGetSingleLineOutput [%s]\n", structName);
+
+    if (strcmp(structName, "System_String") == 0 ||
+        strcmp(structName, "String") == 0) {
+        String str;
+        ExtVerb("OnGetSingleLineOutput [%s] is string\n", structName);
+        EXT_CHECK(StringStruct.Read(address, &str));
+        ExtVerb("OnGetSingleLineOutput [%s] is still string\n", structName);
+
+        WCHAR data[256];
+        ULONG len;
+        ULONG ret;
+
+        len = (ULONG)str.m_stringLength;
+        if (len > arrayof(data)) {
+            len = arrayof(data);
+        }
+        if (len > *bufferSize - 20) {
+            len = *bufferSize - 20;
+        }
+
+        if (len > 0) {
+            EXT_CHECK(g_ExtData->ReadVirtual(address + StringFields[0].offset,
+                                             data,
+                                             sizeof(data[0]) * len,
+                                             &ret));
+            ExtVerb("OnGetSingleLineOutput [%s] read %d of %d chars to %p\n",
+                    structName, len, *bufferSize, buffer);
+        }
+
+        status = StringCbPrintf(buffer, *bufferSize, " { [%d] \"%.*ls\" }",
+                                (ULONG)str.m_stringLength, len, data);
+        ExtVerb("OnGetSingleLineOutput [%s] status = %x\n",
+                structName, status);
+    }
+    else if (!strcmp(structName, "System_Threading_Thread") ||
+             !strcmp(structName, "Thread")) {
+        Thread thread;
+        EXT_CHECK(ThreadStruct.Read(address, &thread));
+
+        status = StringCbPrintf(buffer, *bufferSize, " { eip=%I64x ebp=%I64x esp=%I64x }",
+                                thread.context.eip,
+                                thread.context.ebp,
+                                thread.context.esp);
+    }
+#if 0
+    else if (!strcmp(structName, "Microsoft_Singularity_X86_ProcessorContext") ||
+             !strcmp(structName, "ProcessorContext")) {
+        ProcessorContext pc;
+        EXT_CHECK(ProcessorContext.Read(address, &pc));
+
+        status = StringCbPrintf(buffer, *bufferSize, " { eip=%I64x ebp=%I64x esp=%I64x }",
+                                thread.context.eip,
+                                thread.context.ebp,
+                                thread.context.esp);
+    }
+#endif
+    else {
+        status = E_INVALIDARG;
+    }
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
+
+HRESULT OnGetSuppressTypeName(PDEBUG_CLIENT client, PSTR structName)
+{
+    UNREFERENCED_PARAMETER(structName);
+
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/thread.cpp b/base/Windows/singx86/thread.cpp
new file mode 100644
index 0000000..114ac0e
--- /dev/null
+++ b/base/Windows/singx86/thread.cpp
@@ -0,0 +1,217 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  thread.cpp - Extension to select a Singularity thread.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+struct GDTE
+{
+    USHORT     limit;
+    USHORT     base0_15;
+    BYTE       base16_23;
+    BYTE       access;
+    BYTE       granularity;
+    BYTE       base24_31;
+};
+
+static void Usage()
+{
+    ExtOut("Usage:\n"
+           "    !thread {options} thread_addr\n"
+           "Options:\n"
+           "    -p show stack prior to interrupt or exception (if any)\n"
+           "    -t show top stack (i.e. interrupt or exception (if any))\n"
+           "Notes:\n"
+           "    There are potentially three contexts associated with a thread:\n"
+           "    the scheduler context, the interrupt context, and the exception\n"
+           "    context.  The -p flag is only useful if an exception or interrupt\n"
+           "    has occurred.  Using -p -p always gets the scheduler context.");
+}
+
+static PCSTR ParseArguments(PCSTR args,
+                            OUT PLONG plPriorStack,
+                            OUT PLONG plTopStack)
+{
+    *plPriorStack = 0;
+    *plTopStack = 0;
+    while (*args != '\0') {
+        while (*args == ' ' || *args == '\t') {
+            args++;
+        }
+        if (*args != '-' && *args != '/') {
+            break;
+        }
+        args++;
+        switch (*args++) {
+            case 'p':
+              *plPriorStack = *plPriorStack + 1;
+              break;
+            case 't':
+              *plTopStack = 1;
+              break;
+            default:
+              Usage();
+              return NULL;
+        }
+    }
+    return args;
+}
+
+EXT_DECL(thread) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+
+    Thread thread;
+    ThreadContext tc;
+
+    LONG priorStack = 0;
+    LONG topStack = 0;
+    ULONG64 address = 0;
+    PVOID extendedRegs = NULL;
+    PVOID floatingRegs = NULL;
+
+    if ((args = ParseArguments(args, &priorStack, &topStack)) == NULL) {
+        status = S_FALSE;
+        goto Exit;
+    }
+
+    status = ExtEvalU64(&args, &address);
+    if (status != S_OK) {
+        ULONG indexGdtr = 0;
+        ULONG indexGdtl = 0;
+        ULONG indexFs = 0;
+        EXT_CHECK(g_ExtRegisters->GetIndexByName("gdtr", &indexGdtr));
+        EXT_CHECK(g_ExtRegisters->GetIndexByName("gdtl", &indexGdtl));
+        EXT_CHECK(g_ExtRegisters->GetIndexByName("fs", &indexFs));
+
+        ExtVerb("gdtr: %04x\n", indexGdtr);
+        ExtVerb("gdtl: %04x\n", indexGdtl);
+        ExtVerb("fs: %04x\n", indexFs);
+
+        ULONG64 gdtr;
+        ULONG64 gdtl;
+        ULONG64 fs;
+
+        DEBUG_VALUE v;
+        EXT_CHECK(g_ExtRegisters->GetValue(indexGdtr, &v));
+        ExtVerb("gdtr: %04x -> %p\n", indexGdtr, v.I64);
+        gdtr = v.I64;
+        EXT_CHECK(g_ExtRegisters->GetValue(indexGdtl, &v));
+        gdtl = v.I64;
+        ExtVerb("gdtl: %04x -> %p\n", indexGdtl, v.I64);
+        EXT_CHECK(g_ExtRegisters->GetValue(indexFs, &v));
+        fs = v.I64;
+        ExtVerb("fs: %04x -> %p\n", indexFs, v.I64);
+
+        GDTE fse;
+        ZeroMemory(&fse, sizeof(fse));
+        EXT_CHECK(g_ExtData->ReadVirtual(gdtr + fs, &fse, sizeof(fse), NULL));
+        ULONG64 fs0 = ((ULONG64)fse.base0_15 +
+                       ((ULONG64)fse.base16_23 << 16) |
+                       ((ULONG64)fse.base24_31 << 24));
+        ExtVerb("fs[0] = %p\n", fs0);
+
+        ProcessorContext pc;
+        EXT_CHECK(ProcessorContextStruct.Read(fs0, &pc));
+
+        ExtVerb("  threadContext:        %p\n", pc.threadContext);
+        ExtVerb("  _processor:           %p\n", pc._processor);
+        ExtVerb("  exception:            %p\n", pc.exception);
+        ExtVerb("  cpuId:                %p\n", pc.cpuId);
+        ExtOut("%d: Stacks: Int: %p..%p, Exc: %p..%p, Sch: %p..%p\n",
+               (int)pc.cpuId,
+               pc.interruptStackLimit, pc.interruptStackBegin - 1,
+               pc.exceptionStackLimit, pc.exceptionStackBegin - 1,
+               pc.schedulerStackLimit, pc.schedulerStackBegin - 1);
+
+        ThreadContext tc;
+        EXT_CHECK(ThreadContextStruct.Read(pc.threadContext, &tc));
+
+        address = tc._thread;
+    }
+
+    if (address == 0) {
+        ExtErr("Null is invalid thread address.\n");
+        return S_FALSE;
+    }
+
+    EXT_CHECK(ThreadStruct.Read(address, &thread));
+
+    ULONG64 caddress[3];
+    int currentStack = 0;
+    caddress[0] = address + ThreadFields[9].offset;
+
+    if (thread.context.next) {
+        caddress[1] = thread.context.next;
+        currentStack++;
+        EXT_CHECK(ThreadContextStruct.Read(caddress[1], &tc));
+        if (tc.next) {
+            caddress[2] = tc.next;
+            EXT_CHECK(ThreadContextStruct.Read(caddress[2], &tc));
+            currentStack++;
+        }
+    }
+
+    if (topStack == 0) {
+        currentStack = 0;
+    }
+    else {
+        if (priorStack != 0) {
+            currentStack -= priorStack;
+            if (currentStack < 0) {
+                currentStack = 0;
+            }
+        }
+    }
+
+    EXT_CHECK(ThreadContextStruct.Read(caddress[currentStack], &tc));
+    EXT_CHECK(ThreadContextStruct.RawAccess(ThreadContextFields[0].offset, &floatingRegs));
+    EXT_CHECK(ThreadContextStruct.RawAccess(ThreadContextFields[8].offset, &extendedRegs));
+
+    ExtOut("  %p { tid=%03x pid=%03x eip=%p, ebp=%p, esp=%p %02x }\n",
+           address,
+           (ULONG)(tc.threadIndex == 0xffff ? 0xfff : tc.threadIndex),
+           (ULONG)(tc.processId == 0xffff ? 0xfff : tc.processId),
+           tc.eip,
+           tc.ebp,
+           tc.esp,
+           (ULONG)tc.gcStates);
+
+    CONTEXT context;
+
+    EXT_CHECK(g_ExtSymbols->GetScope(NULL, NULL, &context, sizeof(context)));
+    context.Eip = (ULONG)tc.eip;
+    context.Esp = (ULONG)tc.esp;
+    context.Ebp = (ULONG)tc.ebp;
+    context.Eax = (ULONG)tc.eax;
+    context.Ebx = (ULONG)tc.ebx;
+    context.Ecx = (ULONG)tc.ecx;
+    context.Edx = (ULONG)tc.edx;
+    context.Esi = (ULONG)tc.esi;
+    context.Edi = (ULONG)tc.edi;
+    context.EFlags = (ULONG)tc.efl;
+
+    // CONTEXT_FLOATING_POINT
+    context.FloatSave.ControlWord = (ULONG)tc.mmx.fcw;
+    context.FloatSave.StatusWord = (ULONG)tc.mmx.fsw;
+    context.FloatSave.TagWord = (ULONG)tc.mmx.ftw;
+    context.FloatSave.ErrorOffset = (ULONG)tc.mmx.cs;
+    context.FloatSave.ErrorSelector = (ULONG)tc.mmx.eip;
+    context.FloatSave.DataOffset = (ULONG)tc.mmx.ds;
+    context.FloatSave.DataSelector = (ULONG)tc.mmx.dp;
+
+    memcpy((PBYTE)context.FloatSave.RegisterArea+0, (PBYTE)floatingRegs + 0x00, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+10, (PBYTE)floatingRegs + 0x10, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+20, (PBYTE)floatingRegs + 0x20, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+30, (PBYTE)floatingRegs + 0x30, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+40, (PBYTE)floatingRegs + 0x40, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+50, (PBYTE)floatingRegs + 0x50, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+60, (PBYTE)floatingRegs + 0x60, 10);
+    memcpy((PBYTE)context.FloatSave.RegisterArea+70, (PBYTE)floatingRegs + 0x70, 10);
+    memcpy(context.ExtendedRegisters, extendedRegs, 512);
+
+    EXT_CHECK(g_ExtSymbols->SetScope(0, NULL, &context, sizeof(context)));
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/singx86/threads.cpp b/base/Windows/singx86/threads.cpp
new file mode 100644
index 0000000..deeb89c
--- /dev/null
+++ b/base/Windows/singx86/threads.cpp
@@ -0,0 +1,269 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  threads.cpp - Extension to find Singularity threads.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+#include "singx86.h"
+
+ULONG64 stoppedThreads;
+ULONG64 blockedThreads;
+ULONG64 runnableThreads;
+ULONG64 unblockedThreads;
+ULONG64 idleThreads;
+
+CHAR * GetQueueName(ULONG64 queue)
+{
+    if (stoppedThreads == 0) {
+        stoppedThreads = GetStaticPointer("nt!Scheduler::stoppedThreads");
+        blockedThreads = GetStaticPointer("nt!Scheduler::blockedThreads");
+        runnableThreads = GetStaticPointer("nt!Scheduler::runnableThreads");
+        unblockedThreads = GetStaticPointer("nt!Scheduler::unblockedThreads");
+        idleThreads = GetStaticPointer("nt!Scheduler::idleThreads");
+        ExtVerb("Queues: stopped=%p blocked=%p runnable=%p unblocked=%p idle=%p\n",
+                stoppedThreads, blockedThreads, runnableThreads,
+                unblockedThreads, idleThreads);
+    }
+
+    if (queue == stoppedThreads) {
+        return "stopped";
+    }
+    if (queue == blockedThreads) {
+        return "blocked";
+    }
+    if (queue == runnableThreads) {
+        return "runnable";
+    }
+    if (queue == unblockedThreads) {
+        return "unblocked";
+    }
+    if (queue == idleThreads) {
+        return "idle";
+    }
+    return "running";
+}
+
+HRESULT DumpThread(ULONG64 threadaddr, bool stack, bool fullstack, bool detail, bool blocked)
+{
+    HRESULT status = S_OK;
+
+    if (threadaddr == 0) {
+        return S_FALSE;
+    }
+
+    Thread thread;
+    ThreadEntry entry;
+
+    EXT_CHECK(ThreadStruct.Read(threadaddr, &thread));
+    EXT_CHECK(ThreadEntryStruct.Read(thread.schedulerEntry, &entry));
+
+    char *which = GetQueueName(entry.queue);
+    char offQueueMarker = (entry.queue != NULL) ? ' ' : '*';
+
+    if ((stack) || (fullstack)) {
+        ExtOut("%c thread=%p { tid=%03x pid=%03x eip=%p, ebp=%p, esp=%p %02x }\n",
+               offQueueMarker,
+               threadaddr,
+               (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+               (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+               thread.context.eip,
+               thread.context.ebp,
+               thread.context.esp,
+               (ULONG)thread.context.gcStates);
+
+        if (fullstack) {
+            DEBUG_STACK_FRAME frames[30];
+            ULONG filled = 0;
+
+            status = g_ExtControl->GetStackTrace(thread.context.ebp,
+                                                 thread.context.esp,
+                                                 thread.context.eip,
+                                                 frames,
+                                                 arrayof(frames),
+                                                 &filled);
+
+            if (status == S_OK) {
+                g_ExtClient->SetOutputLinePrefix("      ");
+                g_ExtControl->OutputStackTrace(DEBUG_OUTPUT_NORMAL,
+                                               frames,
+                                               filled,
+                                               detail ? (DEBUG_STACK_FRAME_ADDRESSES |
+                                                         DEBUG_STACK_COLUMN_NAMES |
+                                                         DEBUG_STACK_SOURCE_LINE) : 0);
+            }
+        }
+        else {
+            DEBUG_STACK_FRAME frames[10];
+            ULONG filled = 0;
+
+            status = g_ExtControl->GetStackTrace(thread.context.ebp,
+                                                 thread.context.esp,
+                                                 thread.context.eip,
+                                                 frames,
+                                                 arrayof(frames),
+                                                 &filled);
+
+            if (status == S_OK) {
+                g_ExtClient->SetOutputLinePrefix("      ");
+                g_ExtControl->OutputStackTrace(DEBUG_OUTPUT_NORMAL,
+                                               frames,
+                                               filled,
+                                               detail ? (DEBUG_STACK_FRAME_ADDRESSES |
+                                                         DEBUG_STACK_COLUMN_NAMES |
+                                                         DEBUG_STACK_SOURCE_LINE) : 0);
+            }
+        }
+    }
+    else {
+        CHAR name[512];
+        ULONG64 displacement = 0;
+
+        status = g_ExtSymbols->GetNameByOffset(thread.context.eip,
+                                               name,
+                                               arrayof(name),
+                                               NULL,
+                                               &displacement);
+        if (status == S_OK) {
+            ExtOut("%c thread=%p { tid=%03x pid=%03x eip=%p, ebp=%p, esp=%p %02x } %s+%I64d\n",
+                   offQueueMarker,
+                   threadaddr,
+                   (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+                   (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+                   thread.context.eip,
+                   thread.context.ebp,
+                   thread.context.esp,
+                   (ULONG)thread.context.gcStates,
+                   name,
+                   (LONG64)displacement);
+        }
+        else {
+            ExtOut("%c thread=%p { tid=%03x pid=%03x eip=%p, ebp=%p, esp=%p %02x }\n",
+                   offQueueMarker,
+                   threadaddr,
+                   (ULONG)(thread.context.threadIndex == 0xffff ? 0xfff : thread.context.threadIndex),
+                   (ULONG)(thread.context.processId == 0xffff ? 0xfff : thread.context.processId),
+                   thread.context.eip,
+                   thread.context.ebp,
+                   thread.context.esp,
+                   (ULONG)thread.context.gcStates);
+        }
+    }
+    if (blocked) {
+        if (entry.queue != NULL) {
+        }
+    }
+
+    if (blocked) {
+        ExtOut("                  { %-8.8s blocked=%d count=%d until=%16I64x queue=%p entry=%p}\n",
+               which,
+               (ULONG)thread.blocked,
+               (ULONG)thread.blockedOnCount,
+               thread.blockedUntil,
+               entry.queue,
+               thread.schedulerEntry);
+    }
+  Exit:
+    return status;
+}
+
+EXT_DECL(threads) // Defines: PDEBUG_CLIENT Client, PCSTR args
+{
+    EXT_ENTER();    // Defines: HRESULT status = S_OK;
+    bool stack = false;
+    bool fullstack = false;
+    bool detail = false;
+    bool blocked = false;
+
+    while (*args != '\0') {
+        // skip whitespace
+        while (*args == ' ' || *args == '\t') {
+            args++;
+        }
+
+        // process argument
+        if (*args == '-' || *args == '/') {
+            args++;
+            switch (*args++) {
+              case 'd': // detail
+              case 'D':
+                detail = !detail;
+                break;
+              case 'f': // fullstack
+              case 'F':
+                fullstack = !fullstack;
+                break;
+              case 's': // stack
+              case 'S':
+                stack = !stack;
+                break;
+              case 'b': // Blocked information
+              case 'B':
+                blocked = !blocked;
+                break;
+              case '?': // Help
+              case 'h':
+              case 'H':
+                status = S_FALSE;
+                goto Exit;
+            }
+            while (*args != ' ') {
+                args++;
+            }
+        }
+        else {
+            break;
+        }
+    }
+
+    ULONG pointerSize = (g_ExtControl->IsPointer64Bit() == S_OK) ? 8 : 4;
+    ULONG64 address = 0;
+    ULONG64 threads = 0;
+    ULONG type = 0;
+    ULONG subtype = 0;
+    ULONG64 module = 0;
+
+    EXT_CHECK(g_ExtSymbols->GetOffsetByName("nt!Thread::threadTable", &address));
+    EXT_CHECK(g_ExtSymbols->GetOffsetTypeId(address, &type, &module));
+    EXT_CHECK(g_ExtData->ReadPointersVirtual(1, address, &threads));
+    ExtVerb("threadTable: %p\n", threads);
+
+    CHAR name[512];
+
+    EXT_CHECK(g_ExtSymbols->GetTypeName(module, type, name, arrayof(name), NULL));
+    ExtVerb("  threadTable type: %s\n", name);
+    int len = strlen(name);
+    if (len > 3 &&
+        name[len-3] == '[' &&
+        name[len-2] == ']' &&
+        name[len-1] == '*') {
+        name[len-3] = '\0';
+
+        EXT_CHECK(g_ExtSymbols->GetTypeId(module, name, &subtype));
+        EXT_CHECK(g_ExtSymbols->GetTypeName(module, subtype, name, arrayof(name), NULL));
+        ExtVerb("  threadTable[] type: %s\n", name);
+    }
+
+    ULONG lengthOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "overall_length", &lengthOffset));
+
+    ULONG valuesOffset = 0;
+    EXT_CHECK(g_ExtSymbols->GetFieldOffset(module, type, "values", &valuesOffset));
+
+    ULONG length = 0;
+    EXT_CHECK(g_ExtData->ReadVirtual(threads + lengthOffset, &length, sizeof(length), NULL));
+    ExtOut("threadTable: %p [maximum %d entries]\n", threads, length);
+
+    CHAR prefix[256];
+    EXT_CHECK(client->GetOutputLinePrefix(prefix, arrayof(prefix), NULL));
+    for (ULONG id = 0; id < length; id++) {
+        ULONG64 thread = 0;
+
+        EXT_CHECK(g_ExtData->ReadPointersVirtual(1, threads + valuesOffset + id * pointerSize, &thread));
+        if (thread != 0) {
+            DumpThread(thread, stack, fullstack, detail, blocked);
+            g_ExtClient->SetOutputLinePrefix(prefix);
+        }
+    }
+
+    EXT_LEAVE();    // Macro includes: return status;
+}
diff --git a/base/Windows/spg/Generator.cs b/base/Windows/spg/Generator.cs
new file mode 100644
index 0000000..a4639ca
--- /dev/null
+++ b/base/Windows/spg/Generator.cs
@@ -0,0 +1,1126 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Singularity.Applications
+{
+    class Generator
+    {
+        private String specFile;
+        private String outputFile;
+        private String className;
+        private String targetNamespace;
+        private const String fieldsSectionHeader = "[fields]";
+        private String fieldsSectionCode;
+        private static bool compileRegex = false;
+        private const String initSection = "[init]";
+        private const String tokensSection = "[tokens]";
+        private const String grammarSection = "[grammar]";
+
+        private const String EPSILON = "epsilon";
+        private const int EPSILON_ID = 1;
+        private Terminal epsilonTerm;
+
+        private const String END_MARKER = "$";
+        private const int END_MARKER_ID = 2;
+        private Terminal endMarkerTerm;
+
+        private ArrayList terminalList;
+        private Hashtable productionStrings;
+        private Hashtable grammarStringTable;
+        private Hashtable precedenceTable;
+
+        private Symbol[] grammarTable;
+        private int numTerminals = 0;
+        public Generator(String specFile,
+                         String targetNamespace,
+                         String className,
+                         String outputFile)
+        {
+            this.specFile = specFile;
+            this.targetNamespace = targetNamespace;
+            this.className = className;
+            this.outputFile = outputFile;
+
+            terminalList = new System.Collections.ArrayList();
+            productionStrings = new Hashtable();
+            grammarStringTable = new Hashtable();
+            precedenceTable = new Hashtable();
+        }
+
+        public static void Main(String[] args)
+        {
+            if (args.Length < 4)
+            {
+                Console.WriteLine("Usage: spg specfile targetNamespace targetClass outputFile");
+                return;
+            }
+
+            //ScriptEngine.Run(fileString, new ScriptEngine.CommandLineRunner(nothing));
+            Generator gen = new Generator(args[0], args[1], args[2], args[3]);
+            gen.Generate();
+        }
+
+        public static int nothing(String[] args, bool isBackground){ return 0; }
+        private static Regex comment = new Regex("#.*"); //will eat more than it should
+
+        public void Generate()
+        {
+
+            String actionTableCode, gotoTableCode, tokenTypeTableCode, lexerActionMethodsCode,
+                productionTable, productionActionMethods;
+
+            epsilonTerm = new Terminal(EPSILON, 1);
+            grammarStringTable[EPSILON] = epsilonTerm;
+            numTerminals++;
+            endMarkerTerm = new Terminal(END_MARKER, 2);
+            grammarStringTable[END_MARKER] = epsilonTerm;
+            numTerminals++;
+
+            ParseSpecification();
+            GenerateGrammarTable();
+
+            GenerateParseTables(out actionTableCode, out gotoTableCode, out tokenTypeTableCode, out lexerActionMethodsCode, out productionTable, out productionActionMethods);
+            DerivedParserClassTemplate template = GenerateParserClass(actionTableCode, gotoTableCode, tokenTypeTableCode, lexerActionMethodsCode, productionTable, productionActionMethods);
+
+            WriteClassFile(template);
+        }
+
+        private void ParseSpecification()
+        {
+            FileStream file = new FileStream(specFile, FileMode.Open, FileAccess.Read);
+            StreamReader fr = new StreamReader(file);
+            String fileString = fr.ReadToEnd();
+
+            StringReader sr = new StringReader(fileString);
+            String line;
+            bool parsedTokens = false, parsedGrammar = false;
+            while ((line = sr.ReadLine()) != null) {
+                line = line.Trim();
+                if (line.Length == 0) continue;
+                if (line[0] == '#') continue; //skip comments
+                switch (line) {
+                    case fieldsSectionHeader:
+                        ParseFieldsSection(sr);
+                        break;
+                    case initSection:
+                        ParseInitSection(sr);
+                        break;
+                    case tokensSection:
+                        ParseTokenSection(sr);
+                        parsedTokens = true;
+                        break;
+                    case grammarSection:
+                        ParseGrammarSection(sr);
+                        parsedGrammar = true;
+                        break;
+                    default:
+                        continue;
+                }
+            }
+            sr.Close();
+            file.Close();
+            if (!parsedTokens) {
+                throw new Exception("missing lexical spec");
+            } else if (!parsedGrammar) {
+                throw new Exception("missing grammar spec");
+            }
+        }
+
+        private void GenerateGrammarTable()
+        {
+            grammarTable = new Symbol[Symbol.idCount];
+            grammarTable[1] = epsilonTerm;
+            grammarTable[2] = endMarkerTerm;
+            foreach (Terminal token in terminalList) {
+                grammarTable[token.id] = token;
+            }
+            foreach (System.Collections.DictionaryEntry entry in productionStrings) {
+                String name = entry.Key as String;
+                Nonterminal nonterm = grammarStringTable[name] as Nonterminal;
+                grammarTable[nonterm.id] = nonterm;
+                System.Collections.ArrayList prods = entry.Value as System.Collections.ArrayList;
+                int[][] rhss = new int[prods.Count][];
+                String[][] allBindings = new string[prods.Count][];
+                ProductionAction[] actions = new ProductionAction[prods.Count];
+                int i = 0;
+                foreach (ProductionString prod in prods) {
+                    actions[i] = new ProductionAction(this, nonterm.id, i, prod.action);
+                    ArrayList elems = new System.Collections.ArrayList();
+                    ArrayList bindingsList = new ArrayList();
+                    foreach (String elemAndBinding in prod.rhs.Split(new char[] { ' ' })) {
+                        if(elemAndBinding == "") continue;
+                        String[] split = elemAndBinding.Split(":".ToCharArray());
+                        if (split[0] == EPSILON) continue;
+                        Symbol sym = grammarStringTable[split[0]] as Symbol;
+                        if (sym == null) throw new Exception("Undefined symbol: " + split[0]);
+                        elems.Add(sym.id);
+                        String binding = null;
+                        if (split.Length > 1) {
+                            binding = split[1];
+                        }
+                        bindingsList.Add(binding);
+                    }
+                    int[] rhs = new int[elems.Count];
+                    for (int j = 0; j < rhs.Length; ++j) {
+                        rhs[j] = (int)elems[j];
+                    }
+                    rhss[i] = rhs;
+
+                    String[] bindings = new String[bindingsList.Count];
+                    for (int j = 0; j < bindings.Length; ++j) {
+                        bindings[j] = (String)bindingsList[j];
+                    }
+                    allBindings[i] = bindings;
+
+                    ++i;
+                }
+                nonterm.rhss = rhss;
+                nonterm.bindings = allBindings;
+                nonterm.actions = actions;
+            }
+        }
+
+        private void WriteClassFile(DerivedParserClassTemplate template)
+        {
+            String classText = template.Dump();
+            FileStream file = new FileStream(outputFile, FileMode.Create, FileAccess.Write);
+            StreamWriter sw = new StreamWriter(file);
+            sw.Write(classText);
+            sw.Close();
+            file.Close();
+        }
+
+        private DerivedParserClassTemplate GenerateParserClass(String actionTableCode, String gotoTableCode, String tokenTypeTableCode, String lexerActionMethodsCode, String productionTable, String productionActionMethods)
+        {
+            DerivedParserClassTemplate template = new DerivedParserClassTemplate(targetNamespace, className);
+            template.AddUsingCode("using System;\r\nusing System.Collections;\r\nusing System.Text;\r\nusing System.IO;\r\nusing System.Text.RegularExpressions;\r\nusing Microsoft.Contracts;\r\n");
+            template.AddFieldCode(fieldsSectionCode);
+            template.AddConstructorCode(actionTableCode + gotoTableCode + tokenTypeTableCode + productionTable);
+            template.AddMethodCode(lexerActionMethodsCode + productionActionMethods);
+            template.AddDefaultMembers();
+            return template;
+        }
+
+        private void GenerateParseTables(out String actionTableCode, out String gotoTableCode, out String tokenTypeTableCode, out String lexerActionMethodsCode, out String productionTable, out String productionActionMethods)
+        {
+            ISet setsOfItems = ComputeSetsOfItems();
+            computeFirst();
+            computeFollow();
+            String parserType = "Parser.";
+            ArrayList productions;
+            Parser.Action[][] actionTable = computeActionTable(setsOfItems, out productions);
+            actionTableCode = GetProductionActionTableCode(parserType, "actionTable", actionTable);
+            Parser.State[][] gotoTable = computeGotoTable(setsOfItems);
+            gotoTableCode = GetGotoTableCode(parserType, "gotoTable", gotoTable);
+            GetTokenTypeTableCode("tokenList", out tokenTypeTableCode, out lexerActionMethodsCode);
+            GetProductionListCode(parserType, productions, out productionTable, out productionActionMethods);
+        }
+
+        public class DerivedParserClassTemplate
+        {
+            private String nspace;
+            private String className;
+            StringBuilder usings;
+            StringBuilder derivations;
+            StringBuilder fields;
+            StringBuilder constructor;
+            StringBuilder methods;
+
+            public DerivedParserClassTemplate(String nspace, String className)
+            {
+                this.nspace = nspace; this.className = className;
+                usings = new StringBuilder();
+                derivations = new StringBuilder(",");
+                fields = new StringBuilder();
+                constructor = new StringBuilder();
+                methods = new StringBuilder();
+            }
+            public void AddDefaultMembers() {
+                fields.Append("  private Action[,]! actionTable;\n");
+                fields.Append("  private State[,]! gotoTable;\n");
+                fields.Append("  private Production[]! productionTable;\n");
+                fields.Append("  private TokenType[]! tokenList;\n");
+                methods.Append("  protected override Action[,]! ActionTable { get { return this.actionTable; } }\n");
+                methods.Append("  protected override State[,]! GotoTable { get { return this.gotoTable; } }\n");
+                methods.Append("  protected override Production[]! ProductionTable { get { return this.productionTable; } }\n");
+                methods.Append("  protected override TokenType[]! TokenList { get { return this.tokenList; } }\n");
+
+            }
+            public void AddDerivationCode(String code)
+            {
+                derivations.Append(code);
+            }
+            public void AddMethodCode(String code){
+                methods.Append(code);
+            }
+
+            public void AddFieldCode(String code)
+            {
+                fields.Append(code);
+            }
+            public void AddConstructorCode(String code)
+            {
+                constructor.Append(code);
+            }
+
+            public void AddUsingCode(String code)
+            {
+                usings.Append(code);
+            }
+
+            public String Dump()
+            {
+                StringBuilder dump = new StringBuilder();
+                dump.Append("//This file is automatically generated\r\n" + usings + "\r\n" +
+                            "namespace " + nspace + "{\r\n"
+                            + "\r\n class " + className + " : Parser" + "\r\n" +
+                                        "{\r\n" +
+                                        fields +
+                            //    "[NotDelayed]\r\n" +
+                                        "public " + className + "(){\r\n " + constructor +
+                            ";\r\n" +
+                            //"base();\r\n" +
+                            "}\r\n" +
+                                        methods +
+                                        "\t}\r\n" +
+                              "}");
+
+                return dump.ToString();
+            }
+        }
+
+        private void GetProductionListCode(String parserTypeString, ArrayList productions, out String productionTable, out String productionActionMethods)
+        {
+            parserTypeString = "";
+            StringBuilder array = new StringBuilder();
+            StringBuilder methods = new StringBuilder();
+            int i = 0;
+            array.Append(parserTypeString + "productionTable = new[Delayed] Production[]{");
+            foreach (ProductionAction action in productions) {
+                String methodName = "production_action_" + i;
+                StringBuilder method = new StringBuilder();
+                method.Append("private Object " + methodName + "(Stack! stack) {\r\n");
+                method.Append("\tObject value = null;\r\n");
+                String[] bindings = (grammarTable[action.nonterm] as Nonterminal).bindings[action.production];
+                for (int j = bindings.Length - 1; j >= 0; --j) {
+                    if(bindings[j] != null){
+                        method.Append("\tObject " + bindings[j] + " = ( (StackElement!) stack.Pop()).value;");
+
+                    }else{
+                        method.Append("\tstack.Pop(); //pop non binding element");
+                    }
+                    method.Append(j != 0 ? "\r\n\tstack.Pop(); //pop state\r\n" : "");
+                }
+                method.Append("\r\n\t\t//user code:\r\n" + action.action);
+                method.Append("\r\n\treturn value;");
+                method.Append("\r\n}\r\n");
+                methods.Append(method);
+                array.Append("new " + parserTypeString + "Production( " + action.nonterm + ", new " + parserTypeString + "Reducer(this." + methodName + ")),");
+                ++i;
+            }
+            array.Remove(array.Length - 1, 1);
+            array.Append("};\r\n");
+            productionTable = array.ToString();
+            productionActionMethods = methods.ToString();
+
+        }
+        private String lexActionMethodPrefix = "LexActionMethod_";
+        private void GetTokenTypeTableCode(String tableName, out String tokenTableCode, out String lexerMethodsCode)
+        {
+            StringBuilder sb = new StringBuilder();
+            StringBuilder methods = new StringBuilder();
+            sb.Append(tableName + " = new[Delayed] TokenType[] \r\n\t\t{");
+            int i = 0;
+            int regExId = 0;
+            RegexCompilationInfo[] regexCompInfo = new RegexCompilationInfo[terminalList.Count];
+            foreach (Terminal term in terminalList) {
+                String methodName = lexActionMethodPrefix + i;
+                String id = term.id.ToString();
+                if(compileRegex)
+                {
+                    regexCompInfo[regExId] = new RegexCompilationInfo(term.regex, RegexOptions.None, "LexRegex" + regExId, targetNamespace, true);
+                }
+                String regex = compileRegex ?  "(new LexRegex" + regExId++ + "())" : "new Regex(@" + term.regex + ")" ;
+
+                String lexer;
+                if (term.action != null && term.action != "") {
+                    String method =
+                        "\tprivate void " + methodName + "(Token! tok) { \r\n" + term.action + "\r\n\t}\r\n";
+                    methods.Append(method);
+                    lexer = "new Lexer(this." + methodName + ")";
+                    ++i;
+                } else {
+                    lexer = "null";
+                }
+                sb.Append("new  TokenType(" + id + "," + regex + "," + lexer + " ),");
+            }
+            if (terminalList.Count != 0)
+                sb.Remove(sb.Length - 1, 1);
+            sb.Append("}\r\n;");
+            if(compileRegex)
+            {
+                AssemblyName assembly = new AssemblyName();
+                assembly.Name = "LexerRegex";
+                Regex.CompileToAssembly(regexCompInfo, assembly);
+            }
+                tokenTableCode = sb.ToString();
+            lexerMethodsCode = methods.ToString();
+
+        }
+        private String GetGotoTableCode(String parserTypeString, String tableName, Parser.State[][] gotoTable)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append(tableName + " = new State[,]\r\n\t{\r\n");
+            foreach (Parser.State[] row in gotoTable) {
+                sb.Append("\r\n\t\t{");
+                foreach (Parser.State state in row) {
+                    if (state == null) {
+                        sb.Append("null,");
+                        continue;
+                    }
+                    sb.Append("new " + parserTypeString + "State(" + state.id.ToString() + "),");
+                }
+                if (row.Length != 0)
+                    sb.Remove(sb.Length - 1, 1);
+                sb.Append("},");
+            }
+            if (gotoTable.Length != 0)
+                sb.Remove(sb.Length - 1, 1);
+            sb.Append("\r\n\t};\r\n");
+
+            return sb.ToString();
+        }
+
+        private Parser.State[][] computeGotoTable(ISet setsOfItems)
+        {
+            Parser.State[][] gotoTable = new Parser.State[setsOfItems.Count][];
+            Hashtable/*ISet -> int*/ stateTable = new Hashtable();
+            int i = 0;
+            foreach (ISet set in setsOfItems) {
+                gotoTable[i] = new Parser.State[Symbol.idCount];
+                stateTable[set] = i++;
+            }
+
+            foreach (ISet items in setsOfItems) {
+                foreach (Symbol symbol in grammarTable) {
+
+                    if (symbol is Terminal) {
+                        gotoTable[(int)stateTable[items]][symbol.id] = null;
+                        continue;
+                    }
+                    ISet gotoSet = computeGoto(items, symbol);
+                    if (gotoSet.Count == 0) continue;
+                    Object gotoState = stateTable[gotoSet];
+                    if (gotoState == null) throw new Exception("missing state"); ;
+                    gotoTable[(int)stateTable[items]][symbol.id] = new Parser.State((int)gotoState);
+                }
+            }
+            return gotoTable;
+
+        }
+
+        private String GetProductionActionTableCode(String parserTypeString, String tableName, Parser.Action[][] actionTable)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(tableName);
+            sb.Append(" = new Parser.Action[,]\r\n\t{\r\n");
+            foreach (Parser.Action[] row in actionTable) {
+                sb.Append("\r\n\t\t{");
+                foreach (Parser.Action action in row) {
+                    if (action == null) {
+                        sb.Append("null,");
+                        continue;
+                    }
+                    sb.Append("new " + parserTypeString + "Action(");
+                    String actionType = "";
+                    switch (action.type) {
+                        case Parser.ActionType.ACCEPT:
+                            actionType = parserTypeString + "ActionType.ACCEPT";
+                            break;
+                        case Parser.ActionType.REDUCE:
+                            actionType = parserTypeString + "ActionType.REDUCE";
+                            break;
+                        case Parser.ActionType.SHIFT:
+                            actionType = parserTypeString + "ActionType.SHIFT";
+                            break;
+                        default:
+                            throw new Exception("missed action type");
+                    }
+                    sb.Append(actionType + "," + action.stateOrProduction.ToString() + "),");
+                }
+                if (row.Length != 0)
+                    sb.Remove(sb.Length - 1, 1);
+                sb.Append("},");
+            }
+            if (actionTable.Length != 0)
+                sb.Remove(sb.Length - 1, 1);
+            sb.Append("\r\n\t};\r\n");
+
+            return sb.ToString();
+        }
+        private Parser.Action[][] computeActionTable(ISet setsOfItems, out ArrayList productions)
+        {
+            //TODO: could be reduced since we only consult on terminals
+            productions = new ArrayList();
+            Parser.Action[][] actionTable = new Parser.Action[setsOfItems.Count][];
+            Hashtable/*ISet -> int*/ stateTable = new Hashtable();
+            Object[][] productionCacheTable = new Object[ Symbol.idCount][];
+
+            int i = 0;
+            foreach (ISet set in setsOfItems) {
+                actionTable[i] = new Parser.Action[Symbol.idCount];
+                stateTable[set] = i++;
+            }
+            foreach (ISet items in setsOfItems) {
+                foreach (Item item in items) {
+                    Nonterminal nonterm = grammarTable[item.nonterm] as Nonterminal;
+                    int[] production = nonterm.rhss[item.production];
+                    if (item.position == production.Length) {
+                        if (item.nonterm == 0) {
+                            Object obj = stateTable[items];
+                            if (obj == null) throw new Exception("Missing state:" + items);
+                            if (actionTable[(int)obj][END_MARKER_ID] != null) throw new Exception("not slr");
+                            actionTable[(int)obj][END_MARKER_ID] = new Parser.Action(Parser.ActionType.ACCEPT, 0);
+                            continue;
+                        }
+
+                        Object[] nontermProds = productionCacheTable[item.nonterm];
+                        if (nontermProds == null) {
+                            productionCacheTable[item.nonterm] = nontermProds = new Object[nonterm.rhss.Length];
+                        }
+                        Object prodIndexObject = nontermProds[item.production];
+                        foreach (int followSym in followTable[item.nonterm] as HashSet) {
+                            if (prodIndexObject == null) {
+                                nontermProds[item.production] = prodIndexObject = productions.Add(nonterm.actions[item.production]);
+                            }
+                            int prodIndex = (int) prodIndexObject;
+                            Object obj = stateTable[items];
+                            if (obj == null) throw new Exception("Missing state:" + items);
+                            Parser.Action newAction = new Parser.Action(Parser.ActionType.REDUCE, prodIndex);
+                            Parser.Action currentAction = actionTable[(Int32)obj][followSym];
+                            if (currentAction != null && !currentAction.Equals(newAction)) {
+                                newAction = ResolveAction(currentAction, newAction, (Terminal) grammarTable[followSym], items, productions);
+                            }
+                            actionTable[(Int32)obj][followSym] = newAction;
+                        }
+                    } else {
+                        foreach (Symbol symbol in grammarTable) {
+                            if (symbol is Nonterminal) continue;
+                            ISet gotoSet = computeGoto(items, symbol);
+                            Object nextState = (Object)stateTable[gotoSet];
+                            if (nextState == null) continue;
+                            Parser.Action newAction = new Parser.Action(Parser.ActionType.SHIFT, (Int32)nextState);
+                            Parser.Action currentAction = actionTable[(Int32)stateTable[items]][symbol.id];
+                            if (currentAction != null && !currentAction.Equals(newAction)) {
+                                newAction = ResolveAction(currentAction, newAction, (Terminal) symbol ,items, productions);
+                            }
+                            actionTable[(Int32)stateTable[items]][symbol.id] = newAction;
+                        }
+                    }
+                }
+            }
+            return actionTable;
+        }
+        private Parser.Action ResolveAction(Parser.Action a1, Parser.Action a2, Terminal symbol, ISet items, ArrayList productions)
+        {
+            Parser.Action reducer;
+            Parser.Action shifter;
+            if (a1.type == Parser.ActionType.REDUCE) {
+                reducer = a1; shifter = a2;
+            } else {
+                reducer = a2; shifter = a1;
+            }
+            ProductionAction reduction = productions[reducer.stateOrProduction] as ProductionAction;
+            int[] reductionSymbols = (grammarTable[reduction.nonterm] as Nonterminal).rhss[reduction.production];
+            int j;
+            for (j = reductionSymbols.Length - 1; j >= 0; --j) {
+                if (grammarTable[reductionSymbols[j]] is Terminal) break;
+            }
+            if (j == -1) throw new Exception("non terminal in reduction");
+            int reductionTerminal = reductionSymbols[j];
+            int precedence;
+            PrecedenceRelation precedenceRelation = precedenceTable[new HashSet(new int[] { symbol.id, reductionTerminal })] as PrecedenceRelation;
+                if (precedenceRelation == null) {
+                    //Console.Write("no precedence relation between " + grammarTable[symbol.id].name + " and " + grammarTable[reductionTerminal].name);
+                    //Console.WriteLine(" defaulting to equivalent precedence");
+                    precedence = PrecedenceRelation.EQUAL;
+                } else {
+                    precedence = precedenceRelation.Precedence(symbol.id);
+                }
+
+            Parser.Action action;
+            switch (precedence) {
+                case PrecedenceRelation.EQUAL:
+                    action = reducer; //left associative by default?
+                    break;
+                case PrecedenceRelation.GREATER:
+                    action = shifter;
+                    break;
+                case PrecedenceRelation.LESS:
+                    action = reducer;
+                    break;
+                default:
+                    throw new Exception("missing precedence type");
+            }
+            return action;
+        }
+        private Parser.Action PromptAction(Parser.Action a1, Parser.Action a2, Terminal symbol, ISet items, ArrayList productions)
+        {
+            Console.WriteLine("In State: ");
+            foreach (Item item in items) {
+                Console.WriteLine(item.ToString());
+            }
+            Console.WriteLine("On symbol: " + symbol.name);
+            Console.WriteLine("1) " + ActionString(a1, productions));
+            Console.WriteLine("2) " + ActionString(a2, productions));
+            Console.Write("Selection: ");
+
+            int selection;
+            do {
+                selection = Convert.ToInt32(Console.ReadLine());
+            } while (selection != 1 && selection != 2);
+
+            return selection == 1 ? a1 : a2;
+        }
+
+        private string ActionString(Parser.Action action, ArrayList productions)
+        {
+            switch (action.type) {
+                case Parser.ActionType.ACCEPT:
+                    return "ACCEPT";
+                case Parser.ActionType.REDUCE:
+                    return "REDUCE by " + productions[action.stateOrProduction];
+                case Parser.ActionType.SHIFT:
+
+                    return "SHIFT";
+                default:
+                    throw new Exception("missing action type");
+            }
+        }
+
+        private class Item
+        {
+            public int nonterm;
+            public int production;
+            public int position;
+            public Generator gen;
+            public Item(Generator gen, int nonterm, int production, int position)
+            {
+                this.gen = gen; this.nonterm = nonterm; this.production = production; this.position = position;
+            }
+            public override int GetHashCode()
+            {
+                return nonterm.GetHashCode() ^ production.GetHashCode() ^ position.GetHashCode();
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (!(obj is Item)) return false;
+                Item that = obj as Item;
+                return this.nonterm == that.nonterm && this.production == that.production && this.position == that.position;
+            }
+
+            public override String ToString()
+            {
+                StringBuilder sb = new StringBuilder();
+                Nonterminal nonterm = gen.grammarTable[this.nonterm] as Nonterminal;
+                for (int i = 0; i < nonterm.rhss[production].Length; ++i) {
+                    String spacer = i == this.position ? " . " : " ";
+                    sb.Append(spacer + gen.grammarTable[nonterm.rhss[production][i]].ToString());
+                }
+                if (this.position == nonterm.rhss[production].Length) sb.Append(" . ");
+                return gen.grammarTable[this.nonterm] + "=>" + sb.ToString();
+            }
+
+        }
+
+        private ISet doClosure(ISet items)
+        {
+            Queue toProcess = new Queue(items);
+            ISet newItems = new HashSet(items);
+            while (toProcess.Count != 0) {
+                Item item = toProcess.Dequeue() as Item;
+                Nonterminal nonterm = grammarTable[item.nonterm] as Nonterminal;
+                if (item.position == nonterm.rhss[item.production].Length) continue;
+                Symbol nextSymbol = grammarTable[nonterm.rhss[item.production][item.position]];
+                if (nextSymbol is Nonterminal) {
+                    for (int j = 0; j < ((Nonterminal)nextSymbol).rhss.Length; ++j) {
+                        Item newItem = new Item(this, nextSymbol.id, j, 0);
+                        if (!newItems.Contains(newItem)) {
+                            toProcess.Enqueue(newItem);
+                            newItems.Add(newItem);
+                        }
+                    }
+                }
+            }
+            return newItems;
+        }
+
+        private ISet computeGoto(ISet items, Symbol symbol)
+        {
+            ISet gotoSet = new HashSet();
+            foreach (Item item in items) {
+                Nonterminal nonterm = grammarTable[item.nonterm] as Nonterminal;
+                if (item.position == nonterm.rhss[item.production].Length) continue;
+                if (nonterm.rhss[item.production][item.position] != symbol.id) continue;
+                Item nextItem = new Item(this, item.nonterm, item.production, item.position + 1);
+                gotoSet.Add(nextItem);
+            }
+
+            gotoSet = doClosure(gotoSet);
+            return gotoSet;
+        }
+        /* these need to be ordered by creation so set 0 is the initial state*/
+        private ISet ComputeSetsOfItems()
+        {
+            ISet sets = new HashSet();
+            ISet rootSet = new HashSet();
+            rootSet.Add(new Item(this, 0, 0, 0));
+            rootSet = doClosure(rootSet);
+            sets.Add(rootSet);
+            Queue toProcess = new Queue(sets);
+            while (toProcess.Count != 0) {
+                ISet set = toProcess.Dequeue() as ISet;
+                foreach (Symbol symbol in grammarTable) {
+                    ISet gotoSet = computeGoto(set, symbol);
+                    if (gotoSet.Count == 0)
+                        continue;
+                    if (sets.Contains(gotoSet)) continue;
+                    toProcess.Enqueue(gotoSet);
+                    sets.Add(gotoSet);
+                }
+            }
+            return sets;
+        }
+        ISet[] firstTable;
+        public void computeFirst()
+        {
+            firstTable = new ISet[Symbol.idCount];
+            bool changed = true;
+            while (changed) {
+                changed = false;
+                foreach (Symbol symbol in grammarTable) {
+                    if (symbol is Terminal) {
+                        ISet first = firstTable[symbol.id];
+                        if (first == null) {
+                            first = new HashSet();
+                            changed = true;
+                        }
+                        first.Add(symbol.id);
+
+                        firstTable[symbol.id] = first;
+
+                    } else if (symbol is Nonterminal) {
+                        Nonterminal nonterm = symbol as Nonterminal;
+                        foreach (int[] rhs in nonterm.rhss) {
+                            ISet newFirst = firstTable[nonterm.id];
+
+                            if (newFirst == null) {
+                                firstTable[nonterm.id] = newFirst = new HashSet();
+                            }
+                            HashSet oldFirst = new HashSet(newFirst);
+                            if (rhs.Length == 0) {  /* epsilon production*/
+                                newFirst.Add(EPSILON_ID);
+                            } else {
+                                bool epsilonPrior = true;
+                                for (int i = 0; i < rhs.Length && epsilonPrior; ++i) {
+                                    Symbol sym = grammarTable[rhs[i]];
+                                    if (sym is Terminal) {
+                                        newFirst.Add(rhs[i]);
+                                        if (sym.id != EPSILON_ID)
+                                            epsilonPrior = false;
+                                    } else if (sym is Nonterminal) {
+                                        ISet moreFirst = firstTable[sym.id];
+                                        if (moreFirst == null) {
+                                            moreFirst = new HashSet();
+                                            firstTable[sym.id] = moreFirst;
+                                            break;
+                                        }
+                                        newFirst.AddAll(moreFirst);
+                                        if (!moreFirst.Contains(EPSILON_ID))
+                                            epsilonPrior = false;
+                                    }
+                                }
+                            }
+                            changed |= !oldFirst.Equals(newFirst);
+                        }
+                    }
+                }
+            }
+
+        }
+
+        private ISet[] followTable;
+        public void computeFollow()
+        {
+            followTable = new ISet[Symbol.idCount];
+            followTable[0] = new HashSet();
+            followTable[0].Add(END_MARKER_ID);
+            bool changed = false;
+            do {
+                changed = false;
+                foreach (Symbol symbol in grammarTable) {
+                    if (!(symbol is Nonterminal)) continue;
+                    Nonterminal nonterm = symbol as Nonterminal;
+                    changed |= ComputeFollowForNonterminal(changed, nonterm);
+                }
+            } while (changed);
+        }
+
+        private bool ComputeFollowForNonterminal(bool changed, Nonterminal nonterm)
+        {
+            foreach (int[] rhs in nonterm.rhss) {
+                changed |= ComputeFollowForProduction(changed, nonterm, rhs);
+            }
+            return changed;
+        }
+
+        private bool ComputeFollowForProduction(bool changed, Nonterminal nonterm, int[] rhs)
+        {
+            ISet endFirst = new HashSet();
+            for (int i = rhs.Length - 1; i >= 0; --i) {
+                Symbol sym = grammarTable[rhs[i]];
+                if (sym is Nonterminal) {
+                    ISet follow = followTable[sym.id];
+                    if (follow == null) {
+                        followTable[sym.id] = follow = new HashSet();
+                    }
+                    ISet oldFollow = new HashSet(follow);
+                    follow.AddAll(endFirst);
+                    follow.Remove(EPSILON_ID);
+                    if (i == rhs.Length - 1 || endFirst.Contains(EPSILON_ID)) {
+                        ISet prodFollow = followTable[nonterm.id];
+                        if (prodFollow == null) {
+                            followTable[nonterm.id] = prodFollow = new HashSet();
+                        }
+                        follow.AddAll(prodFollow);
+                    }
+                    if (!oldFollow.Equals(follow)) changed = true;
+                    if (!firstTable[sym.id].Contains(EPSILON_ID))
+                        endFirst = new HashSet();
+                    endFirst.AddAll(firstTable[sym.id]);
+                } else {
+                    endFirst = new HashSet();
+                    endFirst.Add(sym.id);
+                }
+            }
+            return changed;
+        }
+
+        public void ParseFieldsSection(TextReader sr)
+        {
+            fieldsSectionCode = ParseSection(sr);
+        }
+
+        public String ParseInitSection(TextReader sr)
+        {
+            return ParseSection(sr);
+        }
+        private const String tokenAssign = ":=";
+
+        class TokenSpec
+        {
+
+            public Terminal token;
+            public Regex regex;
+            public TokenSpec(Terminal token, Regex regex)
+            {
+                this.token = token; this.regex = regex;
+            }
+        }
+
+        private class PrecedenceRelation
+        {
+            public const int LESS = -1, EQUAL = 0, GREATER = 1;
+            public int type;
+            public int leftTerminal;
+            public int rightTerminal;
+            public PrecedenceRelation(int type, int leftTerminal, int rightTerminal)
+            {
+                this.type = type; this.leftTerminal = leftTerminal; this.rightTerminal = rightTerminal;
+            }
+
+            public override int GetHashCode()
+            {
+                return type.GetHashCode() ^ leftTerminal.GetHashCode() ^ rightTerminal.GetHashCode();
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (!(obj is PrecedenceRelation)) return false;
+                PrecedenceRelation that = obj as PrecedenceRelation;
+                return this.type == that.type && this.leftTerminal == that.leftTerminal && this.rightTerminal == that.rightTerminal;
+            }
+            //assumes that you that right side of the caller and this instance match
+            public int Precedence(int leftSide)
+            {
+                if (this.leftTerminal == leftSide) return this.type;
+                else {
+                    switch (this.type) {
+                        case LESS:
+                            return GREATER;
+                        case EQUAL:
+                            return EQUAL;
+                        case GREATER:
+                            return LESS;
+                        default:
+                            throw new Exception("missed type");
+                    }
+                }
+            }
+
+        }
+        public void ParseTokenSection(TextReader sr)
+        {
+            String line = sr.ReadLine();
+            if (line == null || line.Trim() != "{") throw new Exception("missing left brace");
+            while ((line = sr.ReadLine()) != null) {
+                line = line.Trim();
+                if (line == "") continue;
+                if (line == "}") {
+                    return;
+                }
+                int index = line.IndexOf(tokenAssign);
+                if (index == -1) {
+                    int precedence = PrecedenceRelation.GREATER;
+                    index = line.IndexOf(">");
+                    if (index == -1) {
+                        precedence = PrecedenceRelation.LESS;
+                        index = line.IndexOf("<");
+                        if (index == -1) {
+                            precedence = PrecedenceRelation.EQUAL;
+                            index = line.IndexOf("=");
+                            if (index == -1) throw new Exception("invalid token line");
+                        }
+                    }
+
+                    String[] leftTerminalNames = whitespace.Split(line.Substring(0, index));
+                    String[] rightTerminalNames = whitespace.Split(line.Substring(index + 1));
+                    Symbol[] rightTerminalSymbols = new Symbol[rightTerminalNames.Length];
+                    for (int i = 0; i < rightTerminalSymbols.Length; ++i) {
+                        if (rightTerminalNames[i] == "") continue;
+                        Symbol rightSymbol = grammarStringTable[rightTerminalNames[i]] as Terminal;
+                        if (rightSymbol == null || !(rightSymbol is Terminal))
+                            throw new Exception("Symbol is either not defined for non a terminal:" + rightTerminalNames[i]);
+                        rightTerminalSymbols[i] = rightSymbol;
+                    }
+                    foreach (String leftTerminalName in leftTerminalNames) {
+                        if (leftTerminalName == "") continue;
+                        Symbol leftSymbol = grammarStringTable[leftTerminalName] as Symbol;
+                        if (leftSymbol == null || !(leftSymbol is Terminal))
+                            throw new Exception("Symbol is either not defined for non a terminal:" + leftTerminalName);
+                        foreach (Symbol rightSymbol in rightTerminalSymbols) {
+                            if (rightSymbol == null) continue;
+                            precedenceTable[new HashSet(new int[] { leftSymbol.id, rightSymbol.id })] = new PrecedenceRelation(precedence, leftSymbol.id, rightSymbol.id);
+                        }
+                    }
+
+                    continue;
+                }
+                String regex = line.Substring(index + tokenAssign.Length).Trim();
+                String action = ParseSection(sr);
+                Terminal token = new Terminal(line.Substring(0, index).Trim(), regex, action);
+                grammarStringTable[token.name] = token;
+                numTerminals++;
+                terminalList.Add(token);
+            }
+        }
+
+
+        private const String startSymbol = "S";
+        private const String productionSym = "=>";
+        public void ParseGrammarSection(TextReader sr)
+        {
+            String line = sr.ReadLine();
+            if (line == null || line.Trim() != "{") throw new Exception("missing left brace");
+            bool foundStart = false;
+            while ((line = sr.ReadLine()) != null) {
+                line = line.Trim();
+                if (line == "") continue;
+                if (line == "}") {
+                    if (!foundStart) {
+                        throw new Exception("No start symbol S");
+                    }
+                    return;
+                }
+                int index = line.IndexOf(productionSym);
+                if (index == -1) throw new Exception("bad grammar format");
+                String name = line.Substring(0, index).Trim();
+                if (!foundStart && name == startSymbol) {
+                    Nonterminal augment = new Nonterminal(startSymbol + "'", 0);
+                    grammarStringTable[augment.name] = augment;
+                    System.Collections.ArrayList augProdList = new System.Collections.ArrayList();
+                    productionStrings[augment.name] = augProdList;
+                    augProdList.Add(new ProductionString(augment, startSymbol, ""));
+                    foundStart = true;
+                }
+                String rhs = line.Substring(index + productionSym.Length).Trim();
+                String action = ParseSection(sr);
+
+                System.Collections.ArrayList prodList = productionStrings[name] as System.Collections.ArrayList;
+                if (prodList == null) {
+                    productionStrings[name] = prodList = new System.Collections.ArrayList();
+                }
+
+                Nonterminal nonterm = grammarStringTable[name] as Nonterminal;
+                if (nonterm == null) {
+                    grammarStringTable[name] = nonterm = new Nonterminal(name);
+                }
+                prodList.Add(new ProductionString(nonterm, rhs, action));
+
+            }
+
+            throw new Exception("missing right brace");
+        }
+        private static Regex whitespace = new Regex("\\s");
+
+        public static String ParseSection(TextReader sr)
+        {
+            StringBuilder section = new StringBuilder();
+            while (true) {
+                int peek = sr.Peek();
+                if (peek == -1) return null;
+                char cpeek = (char)peek;
+                if (whitespace.IsMatch(((char)peek).ToString())) {
+                    sr.Read();
+                } else if (peek != '{') {
+                    return null;
+                } else
+                    break;
+            }
+            sr.Read();
+            /*if(line == null || line.Trim() != "{") throw new Exception();*/
+            int numBrackets = 1;
+            int last = -1;
+            bool inString = false;
+            bool inQuotes = false;
+            int curr;
+            while ((curr = sr.Read()) != -1) {
+                switch (curr) {
+                    case '{':
+                        if (!inString && !inQuotes && last != '\\') numBrackets++;
+                        break;
+                    case '}':
+                        if (!inString && !inQuotes && last != '\\') numBrackets--;
+                        break;
+                    case '"':
+                        if (!inString && last != '\\') {
+                            inQuotes = !inQuotes;
+                        }
+                        break;
+                    case '\'':
+                        if (!inQuotes && last != '\\')
+                            inString = !inString;
+                        break;
+                }
+                if (numBrackets == 0) break;
+                section.Append((char)curr);
+                last = curr;
+            }
+            if (numBrackets > 0) throw new Exception("missing bracket");
+            return section.ToString();
+        }
+
+
+        private class Symbol
+        {
+            public static int idCount = 3;
+            public int id;
+            public String name;
+            protected Symbol(String name)
+            {
+                id = idCount++;
+                this.name = name;
+            }
+            protected Symbol(String name, int id)
+            {
+                this.name = name;
+                this.id = id;
+            }
+
+            public override int GetHashCode()
+            {
+                return name.GetHashCode();
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (!(obj is Symbol)) {
+                    return false;
+                }
+                return name.Equals(((Symbol)obj).name);
+            }
+
+            public override string ToString()
+            {
+                return name + ":" + id;
+            }
+        }
+
+        private class Nonterminal : Symbol
+        {
+            public int[][] rhss;
+            public String[][] bindings;
+            public ProductionAction[] actions;
+            public Nonterminal(String name) : base(name) { }
+            public Nonterminal(String name, int id) : base(name, id) { }
+        }
+
+        private class Terminal : Symbol
+        {
+            public String regex;
+            public String action;
+            public Terminal(String name, String regex, String action) : base(name) { this.regex = regex; this.action = action; }
+            public Terminal(String name, int id) : base(name, id) { }
+        }
+
+        private class ProductionAction
+        {
+            public String action;
+            public int nonterm;
+            public int production;
+            public Generator gen;
+            public ProductionAction(Generator gen, int nonterm, int production, String action)
+            {
+                this.gen = gen;
+                this.nonterm = nonterm;
+                this.production = production;
+                this.action = action;
+            }
+
+            public override String ToString()
+            {
+                StringBuilder sb = new StringBuilder(gen.grammarTable[nonterm].name + " => ");
+                foreach (int sym in (gen.grammarTable[nonterm] as Nonterminal).rhss[production]) {
+                    sb.Append(gen.grammarTable[sym].name + " ");
+                }
+                return sb.ToString();
+            }
+        }
+        private class ProductionString
+        {
+            Nonterminal nonterm;
+            public String rhs;
+            public String action;
+            public ProductionString(Nonterminal nonterm, String rhs, String action)
+            {
+                this.nonterm = nonterm;
+                this.rhs = rhs;
+                this.action = action;
+            }
+        }
+    }
+}
diff --git a/base/Windows/spg/HashSet.cs b/base/Windows/spg/HashSet.cs
new file mode 100644
index 0000000..ce7081b
--- /dev/null
+++ b/base/Windows/spg/HashSet.cs
@@ -0,0 +1,124 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text;
+
+namespace Microsoft.Singularity.Applications
+{
+    class HashSet : ISet
+    {
+        Hashtable table;
+        ArrayList list;
+        public HashSet()
+        {
+            table = new Hashtable();
+            list = new ArrayList();
+        }
+
+        public HashSet(ICollection i)
+            : this()
+        {
+            AddAll(i);
+        }
+        public bool Contains(Object elem)
+        {
+            return table.ContainsKey(elem);
+        }
+
+        public void Add(Object elem)
+        {
+            if (Contains(elem)) return;
+            int index = list.Add(elem);
+            table[elem] = index;
+        }
+
+        public void AddAll(ICollection coll)
+        {
+            if (coll == null) return;
+            foreach (Object obj in coll) {
+                Add(obj);
+            }
+        }
+
+        public void Remove(Object obj)
+        {
+            Object index = table[obj];
+            if (index == null) return;
+            list.RemoveAt((int)index);
+            table.Remove(obj);
+        }
+        public int Count
+        {
+            get
+            {
+                return table.Count;
+            }
+        }
+
+        public void CopyTo(System.Array arr, int n)
+        {
+            int i = n;
+            foreach (Object key in table.Keys) {
+                arr.SetValue(key, n++);
+            }
+        }
+
+        public Object SyncRoot
+        {
+            get { throw new InvalidOperationException("operation not supported"); }
+        }
+
+        public bool IsSynchronized
+        {
+            get { return false; }
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is ISet)) return false;
+            return this.ContainsAll(((ISet)obj)) && ((ISet)obj).ContainsAll(this); ; //sort maybe?
+        }
+
+        public bool ContainsAll(ISet thatCol)
+        {
+            foreach (DictionaryEntry entry in table) {
+                Object key = entry.Key;
+                ISet that = thatCol as ISet;
+                if (!that.Contains(key)) return false;
+            }
+            return true;
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return list.GetEnumerator();
+        }
+
+        public override int GetHashCode()
+        {
+            int hash = 0;
+            foreach (DictionaryEntry entry in table) {
+                hash ^= entry.Key.GetHashCode();
+            }
+
+            return hash;
+        }
+
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            bool first = true;
+            foreach (Object elem in table.Keys) {
+                sb.Append(elem.ToString() + (first ? "" : " , "));
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/base/Windows/spg/ISet.cs b/base/Windows/spg/ISet.cs
new file mode 100644
index 0000000..bcbec86
--- /dev/null
+++ b/base/Windows/spg/ISet.cs
@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Singularity.Applications
+{
+    interface ISet : ICollection
+    {
+        bool Contains(Object elem);
+        void Add(Object elem);
+        bool ContainsAll(ISet coll);
+        void AddAll(ICollection cool);
+        void Remove(Object elem);
+    }
+}
diff --git a/base/Windows/spg/Makefile b/base/Windows/spg/Makefile
new file mode 100644
index 0000000..549dc8e
--- /dev/null
+++ b/base/Windows/spg/Makefile
@@ -0,0 +1,50 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Spg\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /warnaserror+
+
+SGC = sgc
+
+SGCFLAGS = $(SGFLAGS) /nologo $(CSFLAGS) /warn:2 /warnaserror+ \
+
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\spg.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\spg.exe
+    $(SDEDIT) ..\..\build\spg.exe
+    $(COPY) $(OBJDIR)\spg.exe ..\..\build
+    $(SDEDIT) ..\..\build\spg.pdb
+    $(COPY) $(OBJDIR)\spg.pdb ..\..\build
+
+
+SOURCE_FILES = \
+    Generator.cs \
+    HashSet.cs \
+    ISet.cs \
+    Parser.cs \
+
+
+$(OBJDIR)\spg.exe: $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) /r:System.dll /out:$(OBJDIR)\spg.exe $**
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\spg.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
diff --git a/base/Windows/spg/Parser.cs b/base/Windows/spg/Parser.cs
new file mode 100644
index 0000000..a6ed52f
--- /dev/null
+++ b/base/Windows/spg/Parser.cs
@@ -0,0 +1,231 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Singularity.Applications
+{
+    /**
+     * This is a general lr parser driver.
+     * Parses the programming by first lexing it into a number
+     * of tokens for a token stack. Then parser then pops tokens off
+     * this stack, consults the parse tables and push the corresponding
+     * nonterminals and states on the operand stack. This is the same
+     * algorithm from the dragon book with some tweaks to support optional
+     * tokens (i.e. newlines).
+     **/
+    abstract class Parser
+    {
+        private const int END_INPUT_MARKER_ID = 2;
+
+        protected Action[,] actionTable = null;
+        protected State[,] gotoTable = null;
+        protected Production[] productionTable = null;
+        protected TokenType[] tokenList = null;
+
+
+        public class ParseException : Exception
+        {
+            public ParseException(Token token, String error)
+                : base("Parse error on line " + token.lineNumber + ", char " + token.charIndex + ": " + error) { }
+        }
+
+        public Object parse(String input)
+        {
+            Stack leftStack = new Stack();
+            leftStack.Push(new State(0));
+
+            ArrayList list = Lex(ref input);
+            list.Reverse(); //could return a stack out of lex instead
+            Stack rightStack = new Stack(list);
+            while (rightStack.Count != 0) {
+                State st = (State)leftStack.Pop();
+                Token tok = (Token)rightStack.Pop();
+                Action action = actionTable[st.id, tok.id];
+                while (tok.optional && action == null && rightStack.Count != 0) {
+                    tok = (Token)rightStack.Pop();
+                    action = actionTable[st.id, tok.id];
+                }
+
+                if (action == null) {
+                    if (tok.id == END_INPUT_MARKER_ID) {
+                        throw new ParseException(tok, " unexpected EOF");
+                    }
+                    throw new ParseException(tok, tok.value + " unexpected input");
+                }
+
+                if (action.type == ActionType.SHIFT) {
+                    leftStack.Push(st);
+                    leftStack.Push(tok);
+                    leftStack.Push(new State(action.stateOrProduction));
+                } else if (action.type == ActionType.REDUCE) {
+                    Production production = productionTable[action.stateOrProduction];
+                    Object value = production.reduction(leftStack);
+                    StackElement topLeft = (StackElement)leftStack.Pop();
+                    State previousState;
+                    if (topLeft is State) {
+                        previousState = (State)topLeft;
+                    } else {
+                        leftStack.Push(topLeft);
+                        previousState = st; /* took an epsilon transition */
+                    }
+                    State nextState = gotoTable[previousState.id, production.nonterminalType];
+                    if (nextState == null) throw new Exception("missing state");
+                    leftStack.Push(previousState);
+                    leftStack.Push(new Nonterminal(production.nonterminalType, value));
+                    leftStack.Push(nextState);
+                    rightStack.Push(tok);
+                } else if (action.type == ActionType.ACCEPT) {
+                    break;
+                }
+            }
+            Nonterminal result = (Nonterminal)leftStack.Pop();
+            return result.value;
+        }
+
+        private static int CountOccurrences(String input, char c, out int last)
+        {
+            int count = 0;
+            last = -1;
+            for (int i = 0; i < input.Length; ++i) {
+                if (c == input[i]) {
+                    ++count;
+                    last = i;
+                }
+            }
+            return count;
+        }
+
+        private static bool IsNewLine(char t) { return t == '\n'; }
+        public ArrayList Lex(ref String input)
+        {
+            ArrayList tokens = new ArrayList();
+            int lineNumber = 1;
+            int charIndex = 1;
+        outer:
+            while (input.Length != 0) {
+                foreach (TokenType spec in tokenList) {
+                    Match match = spec.regex.Match(input);
+                    if (match == null || !match.Success) continue;
+                    input = input.Remove(0, match.Value.Length);
+                    if (spec.lexer != null) {
+                        Token token = new Token(spec.type, match.Value, lineNumber, charIndex);
+                        spec.lexer(token);
+                        if (token.value != null)
+                            tokens.Add(token);
+                    } else {
+                        tokens.Add(new Token(spec.type, match.Value, lineNumber, charIndex));
+                    }
+                    int lastIndex;
+                    int occurrences = CountOccurrences(match.Value, '\n', out lastIndex);
+                    if (occurrences > 0) {
+                        lineNumber += occurrences;
+                        charIndex = match.Value.Length - (lastIndex + 1);
+                    } else {
+                        charIndex += match.Value.Length;
+                    }
+                    goto outer;
+                }
+                throw new Exception("unknown input: " + input);
+            }
+            tokens.Add(new Token(END_INPUT_MARKER_ID, null, lineNumber, charIndex));
+            return tokens;
+        }
+
+        public delegate Object Reducer(Stack stack);
+        public delegate void Lexer(Token tok);
+
+        public class Production
+        {
+            public int nonterminalType;
+            public Reducer reduction;
+            public Production(int nonterminalType, Reducer reduction)
+            {
+                this.nonterminalType = nonterminalType;
+                this.reduction = reduction;
+            }
+        }
+
+        public class StackElement
+        {
+            public readonly int id;
+            public Object value;
+            public StackElement(int id) { this.id = id; }
+            public override string ToString()
+            {
+                return id.ToString();
+            }
+        }
+        public class State : StackElement
+        {
+            public State(int number) : base(number) { }
+
+        }
+        public class Token : StackElement
+        {
+            public readonly int lineNumber;
+            public readonly int charIndex;
+            public bool optional = false;
+            public Token(int type, Object value, int lineNumber, int charIndex)
+                : base(type)
+            {
+                this.value = value;
+                this.lineNumber = lineNumber;
+                this.charIndex = charIndex;
+            }
+
+            public override string ToString()
+            {
+                return value + ":" + id;
+            }
+        }
+        private class Nonterminal : StackElement
+        {
+            public Nonterminal(int type, Object value) : base(type) { this.value = value; }
+        }
+
+        public enum ActionType { SHIFT, REDUCE, ACCEPT }
+        public class Action
+        {
+            public ActionType type;
+            public int stateOrProduction;
+            public Action(ActionType type, int stateOrProduction)
+            {
+                this.type = type; this.stateOrProduction = stateOrProduction;
+            }
+            public override int GetHashCode()
+            {
+                return type.GetHashCode() ^ stateOrProduction.GetHashCode();
+            }
+            public override bool Equals(object obj)
+            {
+                if (!(obj is Action)) return false;
+                Action that = obj as Action;
+                return this.type == that.type && this.stateOrProduction == that.stateOrProduction;
+            }
+
+            public override string ToString()
+            {
+                return type + " " + stateOrProduction;
+            }
+        }
+
+        protected class TokenType
+        {
+            public int type;
+            public Regex regex;
+            public Lexer lexer;
+            public TokenType(int type, Regex regex, Lexer lexer)
+            {
+                this.type = type; this.regex = regex; this.lexer = lexer;
+            }
+        }
+    }
+}
diff --git a/base/Windows/spg/spg.csproj b/base/Windows/spg/spg.csproj
new file mode 100644
index 0000000..4efad59
--- /dev/null
+++ b/base/Windows/spg/spg.csproj
@@ -0,0 +1,28 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>spg</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Generator.cs"/>
+    <Compile Include="HashSet.cs"/>
+    <Compile Include="ISet.cs"/>
+    <Compile Include="Parser.cs"/>
+    <Reference Include="System"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/substitute/App.ico b/base/Windows/substitute/App.ico
new file mode 100644
index 0000000..3a5525f
Binary files /dev/null and b/base/Windows/substitute/App.ico differ
diff --git a/base/Windows/substitute/AssemblyInfo.cs b/base/Windows/substitute/AssemblyInfo.cs
new file mode 100644
index 0000000..f2358ca
--- /dev/null
+++ b/base/Windows/substitute/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+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("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation.  All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/base/Windows/substitute/Makefile b/base/Windows/substitute/Makefile
new file mode 100644
index 0000000..021e0ad
--- /dev/null
+++ b/base/Windows/substitute/Makefile
@@ -0,0 +1,55 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\Substitute\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:4 /warnaserror+ /r:System.dll
+
+INSTALLDIR=..\..\build
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\substitute.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+install: $(OBJDIR) $(OBJDIR)\substitute.exe
+    $(SDEDIT) $(INSTALLDIR)\substitute.exe
+    $(COPY) $(OBJDIR)\substitute.exe $(INSTALLDIR)
+    $(SDEDIT) $(INSTALLDIR)\substitute.pdb
+    $(COPY) $(OBJDIR)\substitute.pdb $(INSTALLDIR)
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\substitute.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+test: $(OBJDIR) $(OBJDIR)\substitute.exe
+    $(OBJDIR)\substitute Tools Fools <Substitute.cs >Test.cs
+
+test2: $(OBJDIR) $(OBJDIR)\substitute.exe Makefile
+    $(OBJDIR)\substitute "(?<x>//)" "$${x}$${x}" <Substitute.cs >Test.cs
+
+##############################################################################
+
+SOURCE_FILES = \
+    Substitute.cs \
+    AssemblyInfo.cs \
+
+$(OBJDIR)\substitute.exe : $(SOURCE_FILES)
+    $(CSC) $(CSCFLAGS) /out:$(OBJDIR)\substitute.exe $**
+
+################################################################# End of File.
diff --git a/base/Windows/substitute/Substitute.cs b/base/Windows/substitute/Substitute.cs
new file mode 100644
index 0000000..ecbe62e
--- /dev/null
+++ b/base/Windows/substitute/Substitute.cs
@@ -0,0 +1,61 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   Substitute.cs
+//
+//  Note:
+//
+
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Singularity.Tools
+{
+    class Substitute
+    {
+        private static void Apply(TextReader input,
+                                  TextWriter output,
+                                  string     inPattern,
+                                  string     outPattern)
+        {
+            string line;
+            while (null != (line = input.ReadLine())) {
+                line = Regex.Replace(line, inPattern, outPattern);
+                output.WriteLine(line);
+            }
+        }
+
+        public static int Main(string[] args)
+        {
+            switch (args.Length) {
+                case 2:
+                    Apply(Console.In, Console.Out, args[0], args[1]);
+                    return 0;
+
+                case 3:
+                    using (StreamReader sr = new StreamReader(args[2])) {
+                        Apply(sr, Console.Out, args[0], args[1]);
+                    }
+                    return 0;
+
+                case 4:
+                    using (StreamReader sr = new StreamReader(args[2])) {
+                        if (sr.Peek() >= 0) {
+                            using (StreamWriter sw = new StreamWriter(args[3], false, sr.CurrentEncoding)) {
+                                Apply(sr, sw, args[0], args[1]);
+                            }
+                        }
+                    }
+                    return 0;
+
+                default:
+                    Console.WriteLine("Usage: replace <string1> <string2> [<Input file> [<OutputFile>]]");
+                    return -1;
+            }
+        }
+    }
+}
diff --git a/base/Windows/substitute/Substitute.csproj b/base/Windows/substitute/Substitute.csproj
new file mode 100644
index 0000000..48ff979
--- /dev/null
+++ b/base/Windows/substitute/Substitute.csproj
@@ -0,0 +1,26 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <AssemblyName>Substitute</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Substitute.cs"/>
+    <Compile Include="AssemblyInfo.cs"/>
+    <Reference Include="System"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/substitute/Substitute.sln b/base/Windows/substitute/Substitute.sln
new file mode 100644
index 0000000..0efcd6f
--- /dev/null
+++ b/base/Windows/substitute/Substitute.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substitute", "Substitute.csproj", "{4C264E37-3E92-4AE4-B64B-106C90FB96B1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{4C264E37-3E92-4AE4-B64B-106C90FB96B1}.Debug.ActiveCfg = Debug|.NET
+		{4C264E37-3E92-4AE4-B64B-106C90FB96B1}.Debug.Build.0 = Debug|.NET
+		{4C264E37-3E92-4AE4-B64B-106C90FB96B1}.Release.ActiveCfg = Release|.NET
+		{4C264E37-3E92-4AE4-B64B-106C90FB96B1}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/base/Windows/tcpcat/tcpcat.csproj b/base/Windows/tcpcat/tcpcat.csproj
new file mode 100644
index 0000000..16d1c1f
--- /dev/null
+++ b/base/Windows/tcpcat/tcpcat.csproj
@@ -0,0 +1,29 @@
+<!--
+###############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+###############################################################################
+-->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>TcpCat</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="tcpcat.cs"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Net"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/Windows/timerun/Makefile b/base/Windows/timerun/Makefile
new file mode 100644
index 0000000..d897ad2
--- /dev/null
+++ b/base/Windows/timerun/Makefile
@@ -0,0 +1,58 @@
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Windows\timerun\Makefile
+#
+##############################################################################
+
+OBJROOT=..\obj
+!INCLUDE "$(SINGULARITY_ROOT)/Makefile.inc"
+
+CSCFLAGS = /nologo $(CSFLAGS) /warn:2 /unsafe
+
+##############################################################################
+
+all: $(OBJDIR) $(OBJDIR)\timerun.exe
+
+$(OBJDIR):
+    -mkdir $(OBJDIR)
+
+copy: $(OBJDIR) $(OBJDIR)\timerun.exe
+    $(COPY) $(OBJDIR)\timerun.exe ..\..\build
+    $(COPY) $(OBJDIR)\timerun.pdb ..\..\build
+
+
+install: $(OBJDIR) $(OBJDIR)\timerun.exe
+    $(SDEDIT) ..\..\build\timerun.*
+    $(COPY) $(OBJDIR)\timerun.exe ..\..\build
+    $(COPY) $(OBJDIR)\timerun.pdb ..\..\build
+
+
+##############################################################################
+
+clean:
+    @-del /q $(OBJDIR)\timerun.* *~ 2>nul
+    @-rmdir $(OBJDIR) 2>nul
+    @-rmdir $(OBJROOT) 2>nul
+
+##############################################################################
+
+REFERENCES = \
+    /reference:System.Xml.dll \
+    /reference:System.dll \
+
+
+SOURCE_FILES = \
+    timerun.cs \
+    ..\WindowsInteropLib\Kernel32.cs \
+        
+
+##############################################################################
+
+$(OBJDIR)\timerun.exe: $(SOURCE_FILES) Makefile
+    $(CSC) $(CSCFLAGS) $(REFERENCES) /out:$(OBJDIR)\timerun.exe $(SOURCE_FILES)
+
+##############################################################################
diff --git a/base/Windows/timerun/timerun.cs b/base/Windows/timerun/timerun.cs
new file mode 100644
index 0000000..53f35cb
--- /dev/null
+++ b/base/Windows/timerun/timerun.cs
@@ -0,0 +1,158 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Windows;
+
+namespace timerun
+{
+    class timerun
+    {
+        static int Main(string[] args)
+        {
+            try
+            {
+                if (args.Length < 1)
+                {
+                    Usage();
+                    return 1;
+                }
+
+                string program = args[0];
+                string arguments = String.Join(" ", args, 1, args.Length - 1);
+
+                IntPtr job_handle = Kernel32.CreateJobObject();
+                if (job_handle == IntPtr.Zero)
+                {
+                    WriteLine("WARNING: Failed to create job object; cannot gather CPU usage info.");
+                }
+
+                using (Process process = new Process())
+                {
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.Arguments = arguments;
+                    process.StartInfo.FileName = program;
+
+                    DateTime timeStarted = DateTime.Now;
+
+                    process.Start();
+
+                    if (job_handle != IntPtr.Zero)
+                    {
+                        if (!Kernel32.AssignProcessToJobObject(job_handle, process.Handle))
+                        {
+                            WriteLine("WARNING: Failed to assign child process to job.");
+                            WriteLine("The process may have already terminated.");
+                        }
+                    }
+
+                    process.WaitForExit();
+
+                    DateTime timeEnded = DateTime.Now;
+
+                    TimeSpan elapsed = timeEnded - timeStarted;
+
+                    const string times_format = " {0,-32} : {1}";
+
+                    if (job_handle != IntPtr.Zero)
+                    {
+                        try
+                        {
+                            JOBOBJECT_BASIC_ACCOUNTING_INFORMATION job_info;
+                            job_info = Kernel32.QueryJobObjectBasicAccountingInformation(job_handle);
+
+                            TimeSpan total_job_time = job_info.TotalUserTime + job_info.TotalKernelTime;
+
+                            WriteLine(
+                                times_format,
+                                "CPU time consumed by jobs",
+                                total_job_time);
+
+                            WriteLine(
+                                times_format,
+                                "    in user mode",
+                                job_info.TotalUserTime);
+
+                            WriteLine(
+                                times_format,
+                                "    in kernel mode",
+                                job_info.TotalKernelTime);
+
+                            WriteLine(
+                                times_format,
+                                "Elapsed time (wall time)",
+                                elapsed);
+
+                            WriteLine("");
+                            if (elapsed.TotalMilliseconds > 0)
+                            {
+                                double elapsed_ms = elapsed.TotalMilliseconds;
+                                double total_job_ms = total_job_time.TotalMilliseconds;
+                                double throughput_ratio = total_job_ms / elapsed_ms;
+                                double throughput_percent = Math.Round(throughput_ratio * 100.0);
+                                WriteLine("      Parallel throughput ratio: {0}%", throughput_percent);
+                            }
+                            else
+                            {
+                                WriteLine("      Too little time elapsed to compute ratio.");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            WriteLine("FAILED to query job info!");
+                            ShowException(ex);
+                        }
+                    }
+                    else
+                    {
+                        WriteLine(" Child process times not available.");
+                    }
+
+                    return process.ExitCode;
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowException(ex);
+                return 1;
+            }
+        }
+
+        static void WriteLine(string line)
+        {
+            Console.WriteLine(Prefix + line);
+        }
+
+        static void WriteLine(string format, params object[] args)
+        {
+            WriteLine(String.Format(format, args));
+        }
+
+        const string Prefix = "TIMERUN: ";
+
+        static void Usage()
+        {
+            Console.WriteLine("Usage: TIMERUN program args ...");
+            Console.WriteLine();
+            Console.WriteLine("    TIMERUN runs a program, then displays CPU usage information for the program");
+            Console.WriteLine("    and all of its child processes.");
+        }
+
+        static void ShowException(Exception chain)
+        {
+            for (Exception ex = chain; ex != null; ex = ex.InnerException)
+            {
+                Console.WriteLine(ex.GetType().FullName + ": " + ex.Message);
+            }
+        }
+
+
+    }
+}
diff --git a/base/Windows/txref/TxRef.cs b/base/Windows/txref/TxRef.cs
new file mode 100644
index 0000000..bb97463
--- /dev/null
+++ b/base/Windows/txref/TxRef.cs
@@ -0,0 +1,1006 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Collections;
+using System.Text;
+
+public class TypeWriter
+{
+    static Hashtable typeNames;
+    static Hashtable opNames;
+    static Hashtable opSortKeys;
+
+    public static int memberCt;
+
+    TextWriter writer;
+    int indent;
+    bool startOfLine;
+    bool includeMemberKeys = false;
+    bool fullTypeNames;
+
+    public TypeWriter(TextWriter writer)
+    {
+        this.writer = writer;
+    }
+
+    static TypeWriter()
+    {
+        typeNames = new Hashtable();
+        typeNames.Add(typeof(void), "void");
+        typeNames.Add(typeof(System.Object), "object");
+        typeNames.Add(typeof(System.String), "string");
+        typeNames.Add(typeof(System.SByte), "sbyte");
+        typeNames.Add(typeof(System.Byte), "byte");
+        typeNames.Add(typeof(System.Int16), "short");
+        typeNames.Add(typeof(System.UInt16), "ushort");
+        typeNames.Add(typeof(System.Int32), "int");
+        typeNames.Add(typeof(System.UInt32), "uint");
+        typeNames.Add(typeof(System.Int64), "long");
+        typeNames.Add(typeof(System.UInt64), "ulong");
+        typeNames.Add(typeof(System.Char), "char");
+        typeNames.Add(typeof(System.Boolean), "bool");
+        typeNames.Add(typeof(System.Single), "float");
+        typeNames.Add(typeof(System.Double), "double");
+        typeNames.Add(typeof(System.Decimal), "decimal");
+        opNames = new Hashtable();
+        opNames.Add("op_UnaryPlus", "+");
+        opNames.Add("op_Addition", "+");
+        opNames.Add("op_Increment", "++");
+        opNames.Add("op_UnaryNegation", "-");
+        opNames.Add("op_Subtraction", "-");
+        opNames.Add("op_Decrement", "--");
+        opNames.Add("op_Multiply", "*");
+        opNames.Add("op_Division", "/");
+        opNames.Add("op_Modulus", "%");
+        opNames.Add("op_BitwiseAnd", "&");
+        opNames.Add("op_BitwiseOr", "|");
+        opNames.Add("op_ExclusiveOr", "^");
+        opNames.Add("op_Negation", "!");
+        opNames.Add("op_OnesComplement", "~");
+        opNames.Add("op_LeftShift", "<<");
+        opNames.Add("op_RightShift", ">>");
+        opNames.Add("op_Equality", "==");
+        opNames.Add("op_Inequality", "!=");
+        opNames.Add("op_GreaterThanOrEqual", ">=");
+        opNames.Add("op_LessThanOrEqual", "<=");
+        opNames.Add("op_GreaterThan", ">");
+        opNames.Add("op_LessThan", "<");
+        opNames.Add("op_True", "true");
+        opNames.Add("op_False", "false");
+        opNames.Add("op_Implicit", "implicit");
+        opNames.Add("op_Explicit", "explicit");
+        opSortKeys = new Hashtable();
+        opSortKeys.Add("op_UnaryPlus", "A");
+        opSortKeys.Add("op_Addition", "B");
+        opSortKeys.Add("op_Increment", "C");
+        opSortKeys.Add("op_UnaryNegation", "D");
+        opSortKeys.Add("op_Subtraction", "E");
+        opSortKeys.Add("op_Decrement", "F");
+        opSortKeys.Add("op_Multiply", "G");
+        opSortKeys.Add("op_Division", "H");
+        opSortKeys.Add("op_Modulus", "I");
+        opSortKeys.Add("op_BitwiseAnd", "J");
+        opSortKeys.Add("op_BitwiseOr", "K");
+        opSortKeys.Add("op_ExclusiveOr", "L");
+        opSortKeys.Add("op_Negation", "M");
+        opSortKeys.Add("op_OnesComplement", "N");
+        opSortKeys.Add("op_LeftShift", "O");
+        opSortKeys.Add("op_RightShift", "P");
+        opSortKeys.Add("op_Equality", "Q");
+        opSortKeys.Add("op_Inequality", "R");
+        opSortKeys.Add("op_GreaterThanOrEqual", "S");
+        opSortKeys.Add("op_LessThanOrEqual", "T");
+        opSortKeys.Add("op_GreaterThan", "U");
+        opSortKeys.Add("op_LessThan", "V");
+        opSortKeys.Add("op_True", "W");
+        opSortKeys.Add("op_False", "X");
+        opSortKeys.Add("op_Implicit", "Y");
+        opSortKeys.Add("op_Explicit", "Z");
+    }
+
+    public bool FullTypeNames
+    {
+        get { return fullTypeNames; }
+        set { fullTypeNames = value; }
+    }
+
+    void AddMemberEntries(ArrayList list, Type type, bool inherited)
+    {
+        foreach (MemberInfo member in type.GetMembers(
+            //| BindingFlags.DeclaredOnly
+            BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
+        {
+            if (member.DeclaringType != member.ReflectedType)
+            {
+                continue;
+            }
+            // if (!inherited || member.MemberType != MemberTypes.Constructor) {
+            list.Add(new MemberEntry(member));
+            //}
+        }
+    }
+
+
+
+    static void AppendParams(StringBuilder sb, ParameterInfo[] parameters)
+    {
+        sb.Append('(');
+        for (int i = 0; i < parameters.Length; i++)
+        {
+            if (i != 0) sb.Append(',');
+            AppendType(sb, parameters[i].ParameterType);
+        }
+        sb.Append(')');
+    }
+
+    static void AppendType(StringBuilder sb, Type type)
+    {
+        if (IsArray(type))
+        {
+            AppendType(sb, type.GetElementType());
+            sb.Append("[]");
+        }
+        else if (type.IsByRef)
+        {
+            AppendType(sb, type.GetElementType());
+            sb.Append("@");
+        }
+        else if (type.IsPointer)
+        {
+            AppendType(sb, type.GetElementType());
+            sb.Append("*");
+        }
+        else
+        {
+            sb.Append(type.FullName);
+        }
+    }
+
+
+
+    static bool ContainsInterface(Type[] types, Type type)
+    {
+        foreach (Type t in types)
+        {
+            if (ContainsType(t.GetInterfaces(), type)) return true;
+        }
+        return false;
+    }
+
+    static bool ContainsType(Type[] types, Type type)
+    {
+        if (types != null)
+        {
+            foreach (Type t in types)
+            {
+                if (t == type) return true;
+            }
+        }
+        return false;
+    }
+
+    static MethodInfo GetAccessor(EventInfo evnt)
+    {
+        return evnt.GetAddMethod();
+    }
+
+    static MethodInfo GetAccessor(PropertyInfo property)
+    {
+        MethodInfo result = property.GetGetMethod();
+        if (result == null) result = property.GetSetMethod();
+        return result;
+    }
+
+    static string GetMemberKey(MemberInfo member)
+    {
+        StringBuilder sb = new StringBuilder();
+        switch (member.MemberType)
+        {
+            case MemberTypes.Constructor:
+                sb.Append("M:");
+                sb.Append(member.DeclaringType.FullName);
+                sb.Append(".#ctor");
+                AppendParams(sb, ((ConstructorInfo)member).GetParameters());
+                break;
+            case MemberTypes.Field:
+                sb.Append("F:");
+                sb.Append(member.DeclaringType.FullName);
+                sb.Append('.');
+                sb.Append(((FieldInfo)member).Name);
+                break;
+            case MemberTypes.Property:
+                sb.Append("P:");
+                sb.Append(member.DeclaringType.FullName);
+                sb.Append('.');
+                sb.Append(((PropertyInfo)member).Name);
+                ParameterInfo[] pi = ((PropertyInfo)member).GetIndexParameters();
+                if (pi.Length != 0) AppendParams(sb, pi);
+                break;
+            case MemberTypes.Method:
+                sb.Append("M:");
+                sb.Append(member.DeclaringType.FullName);
+                sb.Append('.');
+                sb.Append(((MethodInfo)member).Name);
+                AppendParams(sb, ((MethodInfo)member).GetParameters());
+                break;
+            case MemberTypes.Event:
+                sb.Append("E:");
+                sb.Append(member.DeclaringType.FullName);
+                sb.Append('.');
+                sb.Append(((EventInfo)member).Name);
+                break;
+        }
+        return sb.ToString().Trim();
+    }
+
+    string[] GetInterfaceNames(Type type)
+    {
+        Type[] typeIntfs = type.GetInterfaces();
+        if (typeIntfs.Length == 0) return new string[0];
+        Type[] baseIntfs = type.BaseType == null ? null : type.BaseType.GetInterfaces();
+        ArrayList list = new ArrayList();
+        foreach (Type intf in typeIntfs)
+        {
+            if (!ContainsInterface(typeIntfs, intf))
+            {
+                string s = intf.Name;
+#if GENERICS
+                if (intf.HasGenericArguments)
+                {
+                    s+="<";
+                    Type[] types = intf.GetGenericArguments();
+                    for (int i = 0; i < types.Length; i++)
+                    {
+                        if (i != 0) s+=", ";
+                        s+=types[i].Name;
+                    }
+                    s+=">";
+                }
+#endif
+                list.Add(s);
+                s = "";
+            }
+        }
+        list.Sort();
+        return (string[])list.ToArray(typeof(string));
+    }
+
+    static bool IsVarArgs(MethodBase m)
+    {
+        return (m.CallingConvention == CallingConventions.VarArgs);
+    }
+    static bool IsArray(Type type)
+    {
+        return type.IsArray && type != typeof(Array);
+    }
+
+    static bool IsDelegate(Type type)
+    {
+        return type.IsSubclassOf(typeof(Delegate)) && type != typeof(MulticastDelegate);
+    }
+
+    static bool IsOverride(MethodInfo method)
+    {
+        return (method.Attributes & (MethodAttributes.Virtual |
+            MethodAttributes.NewSlot)) == MethodAttributes.Virtual;
+    }
+
+    void Write(string s)
+    {
+        WriteIndent();
+        writer.Write(s);
+    }
+
+    void Write(char ch)
+    {
+        WriteIndent();
+        writer.Write(ch);
+    }
+    public void WriteNamespace(string namespaceName, Type[] types)
+    {
+        Write("namespace ");
+        Write(namespaceName);
+        WriteLine();
+        Write("{");
+        WriteLine();
+        indent++;
+        foreach (Type t in types)
+        {
+            if (t.IsPublic && t.Namespace == namespaceName)
+            {
+                WriteTypeDecl(t);
+            }
+        }
+        indent--;
+        Write("} ");
+        WriteLine();
+    }
+
+    void WriteConstructor(ConstructorInfo ctor)
+    {
+        if (!(ctor.IsPublic || ctor.IsFamily || ctor.IsFamilyOrAssembly)) return;
+        if (ctor.IsStatic) return;
+        Write(ctor.IsPublic ? "public " : "protected ");
+        Write(ctor.DeclaringType.Name);
+        Write('(');
+        WriteParamList(ctor.GetParameters());
+        if (IsVarArgs(ctor))
+        {
+            Write(", __arglist");
+        }
+        Write(");");
+        WriteMemberEnd(ctor);
+    }
+
+    void WriteEvent(EventInfo evnt)
+    {
+        if (evnt.GetAddMethod() == null)
+        {
+            return;
+        }
+        if (!(evnt.GetAddMethod().IsPublic || evnt.GetAddMethod().IsFamily || evnt.GetAddMethod().IsFamilyOrAssembly)) return;
+        memberCt++;
+        Write(evnt.GetAddMethod().IsPublic ? "public " : "protected ");
+        Write("event ");
+        Write(evnt.EventHandlerType.Name);
+        Write(" ");
+        Write(evnt.Name);
+        Write(";");
+        WriteMemberEnd(evnt);
+    }
+
+    void WriteField(FieldInfo field)
+    {
+        if (!(field.IsPublic || field.IsFamily || field.IsFamilyOrAssembly)) return;
+        if (field.DeclaringType.IsEnum)
+        {
+            if (!field.IsLiteral) return;
+            Write(field.Name);
+            Write(',');
+        }
+        else
+        {
+            Write(field.IsPublic ? "public " : "protected ");
+            if (field.IsStatic && field.IsLiteral)
+            {
+                Write("const ");
+            }
+            else
+            {
+                if (field.IsStatic) Write("static ");
+                if (field.IsInitOnly) Write("readonly ");
+            }
+            WriteType(field.FieldType);
+            Write(' ');
+            Write(field.Name);
+            Write(';');
+        }
+        WriteMemberEnd(field);
+    }
+
+    void WriteIndent()
+    {
+        if (startOfLine)
+        {
+            for (int i = 0; i < indent; i++) writer.Write("    ");
+            startOfLine = false;
+        }
+    }
+
+    void WriteLine()
+    {
+        writer.WriteLine();
+        startOfLine = true;
+    }
+
+    public void WriteMember(MemberInfo member)
+    {
+        switch (member.MemberType)
+        {
+            case MemberTypes.Constructor:
+                WriteConstructor((ConstructorInfo)member);
+                break;
+            case MemberTypes.Field:
+                WriteField((FieldInfo)member);
+                break;
+            case MemberTypes.Property:
+                WriteProperty((PropertyInfo)member);
+                break;
+            case MemberTypes.Method:
+                WriteMethod((MethodInfo)member);
+                break;
+            case MemberTypes.Event:
+                WriteEvent((EventInfo)member);
+                break;
+        }
+    }
+
+    void WriteMemberEnd(MemberInfo member)
+    {
+        if (includeMemberKeys)
+        {
+            Write(" // ");
+            Write(GetMemberKey(member));
+        }
+        WriteLine();
+    }
+
+    void WriteMethod(MethodInfo method)
+    {
+        if (!(method.IsPublic || method.IsFamily || method.IsFamilyOrAssembly)) return;
+        if (method.IsSpecialName && !opNames.Contains(method.Name)) return;
+        if (IsOverride(method)) Write(""); //return;
+        memberCt++;
+        Write(method.IsPublic ? "public " : "protected ");
+        if (method.IsStatic) Write("static ");
+        WriteMethodModifiers(method);
+        if (method.IsSpecialName)
+        {
+            string op = (string)opNames[method.Name];
+            if (op == "explicit" || op == "implicit")
+            {
+                Write(op);
+                Write(" operator ");
+                WriteType(method.ReturnType);
+            }
+            else
+            {
+                WriteType(method.ReturnType);
+                Write(" operator ");
+                Write(op);
+            }
+        }
+        else
+        {
+            WriteType(method.ReturnType);
+            Write(' ');
+            Write(method.Name);
+        }
+#if GENERICS
+        if (method.IsGenericMethodDefinition)
+        {
+            Write("<");
+            WriteTypeList(method.GetGenericArguments());
+            Write(">");
+        }
+#endif
+        Write('(');
+        WriteParamList(method.GetParameters());
+        if (IsVarArgs(method))
+        {
+            Write(", __arglist");
+        }
+        Write(");");
+        WriteMemberEnd(method);
+    }
+
+    void WriteMethodModifiers(MethodInfo method)
+    {
+        if (method.DeclaringType.IsInterface)
+        {
+            return;
+        }
+        MethodAttributes attrs = method.Attributes;
+        if ((attrs & MethodAttributes.Final) != 0 &&
+            (attrs & MethodAttributes.Virtual) != 0 &&
+            (attrs & MethodAttributes.NewSlot) != 0)
+        {
+            attrs = 0;
+        }
+        if ((attrs & MethodAttributes.Final) != 0) Write("sealed ");
+        if ((attrs & MethodAttributes.Virtual) != 0)
+        {
+            switch (attrs & (MethodAttributes.NewSlot | MethodAttributes.Abstract))
+            {
+                case 0:
+                    Write("override ");
+                    break;
+                case MethodAttributes.NewSlot:
+                    Write("virtual ");
+                    break;
+                case MethodAttributes.Abstract:
+                    Write("abstract override ");
+                    break;
+                case MethodAttributes.NewSlot | MethodAttributes.Abstract:
+                    Write("abstract ");
+                    break;
+            }
+        }
+    }
+
+    void WriteParamList(ParameterInfo[] parameters)
+    {
+        for (int i = 0; i < parameters.Length; i++)
+        {
+            ParameterInfo param = parameters[i];
+            if (i != 0) Write(", ");
+            Type type = param.ParameterType;
+            if (IsArray(type) && Attribute.IsDefined(param, typeof(ParamArrayAttribute), true))
+            {
+                Write("params ");
+            }
+            WriteType(type);
+            Write(' ');
+            Write(param.Name);
+        }
+    }
+
+    void WriteProperty(PropertyInfo property)
+    {
+        MethodInfo accessor = GetAccessor(property);
+        if (accessor == null) return;
+        if (!(accessor.IsPublic || accessor.IsFamily || accessor.IsFamilyOrAssembly)) return;
+        if (IsOverride(accessor)) return;
+        ParameterInfo[] parameters = property.GetIndexParameters();
+        memberCt++;
+        Write(accessor.IsPublic ? "public " : "protected ");
+        if (accessor.IsStatic) Write("static ");
+        WriteMethodModifiers(accessor);
+        WriteType(property.PropertyType);
+        Write(' ');
+        if (parameters.Length == 0)
+        {
+            Write(property.Name);
+        }
+        else
+        {
+            Write("this[");
+            WriteParamList(accessor.GetParameters());
+            Write("]");
+        }
+        Write(" { ");
+        if (property.CanRead) Write("get; ");
+        if (property.CanWrite) Write("set; ");
+        Write("}");
+        WriteMemberEnd(property);
+    }
+
+    void WriteType(Type type)
+    {
+
+        if (IsArray(type))
+        {
+            WriteType(type.GetElementType());
+            Write('[');
+            for (int i = type.GetArrayRank(); i > 1; i--) Write(',');
+            Write(']');
+        }
+        else if (type.IsByRef)
+        {
+            Write("ref ");
+            WriteType(type.GetElementType());
+        }
+        else if (type.IsPointer)
+        {
+            WriteType(type.GetElementType());
+            Write('*');
+        }
+#if GENERICS
+        else if (type.HasGenericArguments)
+        {
+            WriteSimpleTypeName(type);
+            Write("<");
+            WriteTypeList(type.GetGenericArguments());
+            Write(">");
+        }
+#endif
+        else
+        {
+            WriteSimpleTypeName(type);
+        }
+    }
+    private void WriteTypeList(Type[] types)
+    {
+        for (int i = 0; i < types.Length; i++)
+        {
+            if (i != 0) Write(",");
+            WriteType(types[i]);
+        }
+    }
+    private void WriteSimpleTypeName(Type type)
+    {
+        string name = (string)typeNames[type];
+        if (name == null) name = type.Name;
+        Write(name);
+    }
+
+    public void WriteCustomAttribute(Attribute att)
+    {
+        Write("[");
+        Write(att.GetType().Name);
+        Write("(..)");
+        Write("]");
+        WriteLine();
+
+    }
+
+    public void WriteTypeDecl(Type type)
+    {
+
+        Attribute[] attrs = Attribute.GetCustomAttributes(type);
+        foreach (Attribute a in attrs)
+        {
+            WriteCustomAttribute(a);
+        }
+
+        if (type.IsPublic || type.IsNestedPublic)
+        {
+            Write("public ");
+        }
+        else if (type.IsNestedPrivate)
+        {
+            Write("private ");
+        }
+        else if (type.IsNestedAssembly)
+        {
+            Write("internal ");
+        }
+        else if (type.IsNestedFamily)
+        {
+            Write("protected ");
+        }
+        else if (type.IsNestedFamORAssem)
+        {
+            Write("protected internal ");
+        }
+        if (IsDelegate(type))
+        {
+            Write("delegate ");
+            MethodInfo method = type.GetMethod("Invoke");
+            WriteType(method.ReturnType);
+            Write(' ');
+            WriteTypeName(type);
+            Write('(');
+            WriteParamList(method.GetParameters());
+            Write(")");
+            WriteTypeConstraints(type);
+            Write(";");
+        }
+        else
+        {
+            ArrayList list = new ArrayList();
+            AddMemberEntries(list, type, true);
+            if (type.IsEnum)
+            {
+                Write("enum ");
+                WriteTypeName(type);
+            }
+            else
+            {
+                bool colonWritten = false;
+                if (type.IsValueType)
+                {
+                    Write("struct ");
+                    WriteTypeName(type);
+                }
+                else if (type.IsInterface)
+                {
+                    Write("interface ");
+                    WriteTypeName(type);
+                }
+                else
+                {
+                    if (type.IsAbstract) Write("abstract ");
+                    if (type.IsSealed) Write("sealed ");
+                    Write("class ");
+                    WriteTypeName(type);
+                    Type baseType = type.BaseType;
+                    if (baseType != null && baseType != typeof(object))
+                    {
+                        Write(": ");
+                        Write(baseType.Name);
+                        colonWritten = true;
+                    }
+                }
+                foreach (string s in GetInterfaceNames(type))
+                {
+                    Write(colonWritten ? ", " : ": ");
+                    Write(s);
+                    colonWritten = true;
+                }
+            }
+            WriteTypeConstraints(type);
+            WriteLine();
+            Write('{');
+            WriteLine();
+            list.Sort();
+            indent++;
+            foreach (MemberEntry entry in list)
+            {
+                if (!entry.IsSecured)
+                    WriteMember(entry.Member);
+            }
+            indent--;
+            Write('}');
+        }
+        WriteLine();
+        WriteLine();
+    }
+
+    void WriteTypeName(Type type)
+    {
+
+        Write(fullTypeNames ? type.FullName : type.Name);
+#if GENERICS
+        if (type.IsGenericTypeDefinition)
+        {
+            Write("<");
+            WriteTypeList(type.GetGenericArguments());
+            Write(">");
+        }
+#endif
+    }
+    void WriteTypeConstraints(Type type)
+    {
+
+#if GENERICS
+        foreach (Type t in type.GetGenericArguments())
+        {
+            Type[] arr = t.GetInterfaces();
+
+            object[] arr2 = t.GetCustomAttributes(true);
+            if (t.BaseType != typeof(object) || arr.Length+arr2.Length > 0)
+            {
+                Write(" where ");
+                WriteTypeName(t);
+                Write(":");
+            }
+            if (t.BaseType != typeof(Object))
+            {
+                WriteTypeName(t.BaseType);
+                if (arr.Length + arr2.Length > 0) Write(",");
+            }
+            for (int i = 0; i < arr.Length; i++ )
+            {
+                WriteTypeName(arr[i]);
+                if (i < arr.Length-1 || arr2.Length>0) Write(",");
+            }
+
+            for (int i = 0; i < arr2.Length; i++)
+            {
+                if (arr2[i].GetType() == typeof(System.Runtime.CompilerServices.NewConstraintAttribute))
+                {
+                    Write("new()");
+                }
+                else
+                {
+                    Write(arr2[i].ToString());
+                }
+                if (i < arr.Length - 1) Write(",");
+            }
+        }
+#endif
+    }
+
+    class MemberEntry : IComparable
+    {
+        MemberInfo member;
+        string sortKey;
+        bool secured = false;
+
+        public MemberEntry(MemberInfo member)
+        {
+            this.member = member;
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+                switch (member.MemberType)
+                {
+                    case MemberTypes.Constructor:
+                        sb.Append('A');
+                        AppendParams(sb, ((ConstructorInfo)member).GetParameters());
+                        break;
+                    case MemberTypes.Field:
+                        sb.Append('B');
+                        sb.Append(member.Name);
+                        break;
+                    case MemberTypes.Property:
+                        ParameterInfo[] parameters = ((PropertyInfo)member).GetIndexParameters();
+                        if (parameters.Length == 0)
+                        {
+                            sb.Append('C');
+                            sb.Append(member.Name);
+                        }
+                        else
+                        {
+                            sb.Append('D');
+                            AppendParams(sb, parameters);
+                        }
+                        break;
+                    case MemberTypes.Method:
+                        if (((MethodInfo)member).IsSpecialName && opSortKeys.Contains(member.Name))
+                        {
+                            sb.Append('F');
+                            sb.Append((string)opSortKeys[member.Name]);
+                            if (member.Name == "op_Implicit" || member.Name == "op_Explicit")
+                            {
+                                AppendType(sb, ((MethodInfo)member).ReturnType);
+                            }
+                        }
+                        else
+                        {
+                            sb.Append('E');
+                            sb.Append(member.Name);
+                        }
+                        AppendParams(sb, ((MethodInfo)member).GetParameters());
+                        break;
+                    case MemberTypes.Event:
+                        sb.Append('G');
+                        sb.Append(member.Name);
+                        ((EventInfo)member).GetAddMethod(); // Force strong name security exception here
+                        break;
+                }
+                sortKey = sb.ToString();
+            }
+            catch (System.Security.SecurityException)
+            {
+                secured = true;
+            }
+
+        }
+
+        public MemberInfo Member
+        {
+            get { return member; }
+        }
+
+        public bool IsSecured
+        {
+            get { return secured; }
+        }
+
+        int IComparable.CompareTo(object other)
+        {
+            if (sortKey == null)
+                return -1;
+            return sortKey.CompareTo(((MemberEntry)other).sortKey);
+        }
+
+        static void AppendParams(StringBuilder sb, ParameterInfo[] parameters)
+        {
+            foreach (ParameterInfo param in parameters)
+            {
+                AppendType(sb, param.ParameterType);
+            }
+        }
+
+        static void AppendType(StringBuilder sb, Type type)
+        {
+            if (IsArray(type))
+            {
+                AppendType(sb, type.GetElementType());
+                sb.Append("[]");
+            }
+            else if (type.IsByRef)
+            {
+                AppendType(sb, type.GetElementType());
+                sb.Append("@");
+            }
+            else if (type.IsPointer)
+            {
+                AppendType(sb, type.GetElementType());
+                sb.Append("*");
+            }
+            else
+            {
+                sb.Append(',');
+                string name = (string)typeNames[type];
+                if (name == null) name = type.Name;
+                sb.Append(name);
+            }
+        }
+    }
+}
+
+class TXRef
+{
+    static void Main(string[] args)
+    {
+#if GENERICS
+        System.Diagnostics.Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;
+#endif
+
+        TypeWriter writer = new TypeWriter(Console.Out);
+        foreach (string s in args)
+        {
+            Assembly a = null;
+            try
+            {
+                a = Assembly.LoadFrom(s);
+                if (a == null)
+                    a = Assembly.Load(s);
+            }
+            catch (Exception e) { Console.WriteLine(e); }
+            if (a == null)
+            {
+                Console.WriteLine("TxRef: could not load assembly '{0}'.", s);
+                return;
+            }
+            ArrayList l = new ArrayList();
+            Type[] types;
+            try
+            {
+                types = a.GetTypes();
+            }
+            catch (ReflectionTypeLoadException re)
+            {
+                foreach (Exception e in re.LoaderExceptions)
+                {
+                    Console.WriteLine(e);
+                }
+                types = RemoveNulls(re.Types);
+
+            }
+
+            Array.Sort(types, new TypeComparer());
+
+            foreach (Type t in types)
+            {
+                if (t.IsPublic)
+                {
+                    if (!l.Contains(t.Namespace))
+                        l.Add(t.Namespace);
+                }
+            }
+
+            l.Sort(null);
+
+            foreach (string namespaceName in l)
+            {
+                writer.WriteNamespace(namespaceName, types);
+            }
+        }
+    }
+
+    static Type[] RemoveNulls(Type[] types)
+    {
+        ArrayList l = new ArrayList();
+        foreach (Type t in types)
+        {
+            if (t != null) l.Add(t);
+        }
+        return (Type[])l.ToArray(typeof(Type));
+    }
+}
+
+public class TypeComparer : IComparer
+{
+    internal enum TypeGroup {
+        MainGroup = 0,
+        Enums = 1,
+        Collections = 2,
+        DelegatesAndEventArgs = 3,
+        Attributes = 4,
+        Exceptions = 5
+    }
+
+    internal static TypeGroup GetGroupForType(Type type) {
+        if (type.IsEnum) return TypeGroup.Enums;
+        if ((typeof(IEnumerable).IsAssignableFrom(type))) return TypeGroup.Collections;
+        if (type.IsSubclassOf(typeof(Delegate)) || type.IsSubclassOf(typeof(EventArgs))) return TypeGroup.DelegatesAndEventArgs;
+        if (type.IsSubclassOf(typeof(Attribute))) return TypeGroup.Attributes;
+        if (type.IsSubclassOf(typeof(Exception))) return TypeGroup.Exceptions;
+        return TypeGroup.MainGroup;
+    }
+
+    public int Compare(object obj1, object obj2)
+    {
+        Type t1 = obj1 as Type;
+        Type t2 = obj2 as Type;
+
+        // these are used to group by (for example all enums together)
+        TypeGroup t1Group = TypeComparer.GetGroupForType(t1);
+        TypeGroup t2Group = TypeComparer.GetGroupForType(t2);
+
+        if (t2Group != t1Group) return ((int)t1Group) < ((int)t2Group) ? -1 : 1;
+        return t1.Name.CompareTo(t2.Name);
+    }
+}
diff --git a/base/Windows/txref/txref.csproj b/base/Windows/txref/txref.csproj
new file mode 100644
index 0000000..6673dcf
--- /dev/null
+++ b/base/Windows/txref/txref.csproj
@@ -0,0 +1,27 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+##############################################################################
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets"/>
+
+  <PropertyGroup>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>txref</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="txref.cs"/>
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Windows.targets" />
+
+</Project>
diff --git a/base/boot/Boot.proj b/base/boot/Boot.proj
new file mode 100644
index 0000000..0f213c3
--- /dev/null
+++ b/base/boot/Boot.proj
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Paths.targets" />  
+
+  <ItemGroup>
+    <ProjectReference Include="BootSectors\BootSectors.proj" />
+    <ProjectReference Include="SINGLDR\SINGLDR.proj" />
+  </ItemGroup>
+
+  <Import Project="$(SINGULARITY_ROOT)\Targets\Dirs.targets" />
+
+</Project>
+
diff --git a/base/boot/BootSectors/BootSectors.proj b/base/boot/BootSectors/BootSectors.proj
new file mode 100644
index 0000000..6ed09bd
--- /dev/null
+++ b/base/boot/BootSectors/BootSectors.proj
@@ -0,0 +1,57 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Boot\BootSectors\Makefile
+#
+#   Note:
+#
+##############################################################################
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <!--
+ Truncate PATH for 16-bit tools because if it is
+     too long it'll give an out-of-memory error.
+    -->
+    <CC16>PATH ; &amp; $(BUILDDIR)\cl16.exe</CC16>
+    <LINK16>PATH ; &amp; $(BUILDDIR)\link16.exe</LINK16>
+    <AS>$(BUILDDIR)\ml.exe</AS>
+    <SDIZEPDB>$(BUILDDIR)\sdizepdb.exe</SDIZEPDB>
+    <MLINKFLAGS>/NOD /STACK:0x8000 /ONERROR:NOEXE /FAR /PACKC /NOLOGO</MLINKFLAGS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <BootProgram Include="Fat32_BS.asm"/>
+    <BootProgram Include="Fat16_BS.asm"/>
+    <BootProgram Include="Etfs_BS.asm"/>
+    <BootProgram Include="UsbFat16_BS.asm"/>
+  </ItemGroup>
+
+  <Target Name="Build" DependsOnTargets="CompileBootPrograms"/>
+
+  <Target Name="CreateDirs">
+    <MakeDir Directories="$(BOOTDIR)"/>
+  </Target>
+
+  <Target Name="CompileBootPrograms"
+          Inputs="@(BootProgram)"
+          Outputs="$(BOOTDIR)\%(BootProgram.filename).bin"
+          DependsOnTargets="CreateDirs">
+    <Exec Command="$(AS) /nologo /c /omf /Cp /AT /I$(BOOTDIR) /Fl$(BOOTDIR)\%(BootProgram.filename).lst /Fo$(BOOTDIR)\%(BootProgram.filename).obj %(BootProgram.identity)"/>
+    <Exec WorkingDirectory="$(BOOTDIR)"
+          Command="$(LINK16) /nologo /tiny %(BootProgram.filename).obj,%(BootProgram.filename).bin;"/>
+  </Target>
+
+  <Target Name="Clean">
+    <Delete Files="$(BOOTDIR)\%(BootProgram.filename).bin;$(BOOTDIR)\%(BootProgram.filename).obj;$(BOOTDIR)\%(BootProgram.filename).lst"/>
+  </Target>
+
+</Project>
diff --git a/base/boot/BootSectors/Etfs_BS.asm b/base/boot/BootSectors/Etfs_BS.asm
new file mode 100644
index 0000000..93ce0d2
--- /dev/null
+++ b/base/boot/BootSectors/Etfs_BS.asm
@@ -0,0 +1,244 @@
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+
+;;;;;;;;;;;;;;;;;;;;
+; Concerns
+;  1 - there is no error checking on the int13 calls
+;  2 - we assume that the block size is 2048 bytes
+;  3 - this cannot handle large root directories (>64KB)
+
+;;;;;;;;;;;;;;;;;;;;
+; Constants
+
+BootSecOrigin       EQU     07c00h      ; the BIOS puts the boot sector at 07c0h:0000 == 0000:7c00h
+StackOffset         EQU     -12         ; we will put the stack a small bit below it (we hardly use the stack, so it is safe...)
+
+;;;;;;;;;;;;;;;;;;;;
+; Directives
+
+.model tiny
+.686p
+
+;;;;;;;;;;;;;;;;;;;;
+; Begin Code segment
+
+_TEXT SEGMENT use16 ; 16-bit code segment
+.code
+ORG     0h                          ; ETFS puts us at 07c0h:0000
+
+start:
+
+Step1:    ; set stack and data segments
+    mov     cx, cs
+    mov     ss, cx
+    mov     sp, BootSecOrigin + StackOffset
+    mov     es, cx
+    mov     ds, cx
+    mov     bp, sp
+
+Step2:    ; Save the boot drive (dl holds it on boot)
+    mov     [CDDrive], dl
+
+Step3:    ; Clear the Screen
+    mov     ax, 02h
+    int     010h
+
+Step4:    ; Load the PVD to get the Logical Block Size
+    mov     eax, 10h                ; the PVD is in the 16th block
+    mov     bx, 2000h
+    mov     es, bx                  ; transfer address = 2000:0000
+    mov     cx, 1
+    call    ReadDisk
+    mov     ax, es:128              ; block size is at offset 128
+    mov     [BlockSize], ax
+
+Step5:    ; Find the Joliet SVD, and then find the Root Directory Information
+    mov     eax, 10h                ; start with the PVD, even though it will fail
+GetNextVD:
+    push    eax
+    mov     cx, 1
+    call    ReadDisk
+    mov     si, OFFSET SVDesc       ; [ds:si] points to the desired first 6 bytes of this VD
+    xor     di, di                  ; [es:di] points to the start of what we just read
+    mov     cx, 6
+    repe    cmpsb
+    je      FoundSVD
+    mov     al, es:0000h
+    cmp     al, 0FFh                ; is this the last Volume Descriptor?
+    je      SVDError
+    pop     eax
+    inc     eax
+    jmp     GetNextVD               ; try another VD
+
+FoundSVD:                           ; need to make sure this is a Joliet SVD - we need 025h, 02Fh, 045h in [88,89,90]
+    mov     si, OFFSET JolietSig    ; [ds:si] points to the Joliet Signature
+    mov     di, 88                  ; [es:di] points to the escape sequence field of the current SVD
+    mov     cx, 3
+    repe    cmpsb
+    je      FoundJoliet
+    pop     eax
+    inc     eax
+    jmp     GetNextVD
+
+FoundJoliet:
+    mov     eax, es:158             ; now get the rootstart and rootsize fields
+    mov     [RootStart], eax
+    mov     eax, es:166
+    mov     [RootSize], eax
+
+Step6:    ; Load the Root Directory (SVD), and search it for SINGLDR
+    movzx   ebx, [BlockSize]
+    div     ebx                     ; eax has # blocks in root directory.  Round up if necessary:
+    cmp     edx, 0
+    je      ReadyToLoad
+    add     eax, 1
+ReadyToLoad:                        ; we're going to assume that the root directory will not be bigger than 64K
+    mov     ecx, eax
+    mov     eax, [RootStart]
+    call    ReadDisk
+
+    xor     ebx, ebx                ; bx will hold the start of the current entry
+CheckEntry:
+    mov     di, bx
+    add     di, 25                  ; let's check the file flags - should be 00
+    mov     al, es:[di]
+    cmp     al, 0
+    jne     PrepNextEntry
+                                    ; file flags are good.  now check the file identifier:
+    mov     si, OFFSET Stage2FileSize
+    xor     cx, cx
+    mov     cl, ds:[si]             ; first byte is file name length
+    add     cx, 2                   ; add two because we check the length byte of the directory entry and the padding byte, too
+    add     di, 7                   ; now es:di points to the file length/name field, and ds:si has our desired content
+    repe    cmpsb
+    je      FoundEntry
+
+PrepNextEntry:
+    xor     cx, cx                  ; increment bx by adding the byte value in es:[bx]
+    mov     cl, es:[bx]             ; if es:[bx]==0 and ebx!= [RootSize], then we are in a padding zone
+    cmp     cx, 0                   ; designed to prevent a directory entry from spilling over a block.
+    jne     LoadNext                ; Should this be the case, we will increment bx until es:[bx] is not null
+    inc     bx
+    jmp     PrepNextEntry
+
+LoadNext:
+    add     bx, cx
+    cmp     ebx, [RootSize]
+    jl      CheckEntry
+    jmp     FileNotFoundError
+
+FoundEntry:
+    mov     eax, es:[bx+2]
+    mov     [FileStart], eax
+    mov     eax, es:[bx+10]
+    mov     [FileSize], eax
+    
+Step7:    ; Load the file to 57c0:0000
+    mov     cx, 057c0h
+    mov     es, cx
+    movzx   ebx, [BlockSize]
+    div     ebx                     ; eax has # blocks in root directory
+    cmp     edx, 0                  ; on carry, there will be one more block
+    je      ReadyToLoadFile
+    add     eax, 1
+
+ReadyToLoadFile:
+    mov     ecx, eax
+    mov     eax, [FileStart]
+    call    ReadDisk
+
+Step8:    ; Now we need to set up the stack for SINGLDR and do a jump
+    xor     cx, cx                  ; Always point the stack to 0000:7c00h - 12
+    mov     ss, cx
+    mov     sp, BootSecOrigin + StackOffset
+
+    movzx   edx, [CDDrive]
+    push    edx                     ; SINGLDR will need to know the boot drive #
+    pushd   04344h                  ; CD boot signature
+    pushw   offset infloop          ; return address = "infloop", which is the infinite loop
+    push    cs
+    
+    db      0EAh                    ; emit a long jump to 5000:7c00
+    dd      50007c00h
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadDisk
+;
+; Inputs:       eax     = Block Number
+;               cx      = number of blocks to read (warning: cx > 32 will cause overflow)
+;               es      = destination segment
+; Assumptions:  1 - assumes request will not cause overflow of es:00 (limit on # sectors)
+;               2 - assumes int13 extensions available
+
+ReadDisk PROC NEAR
+    pushad
+    mov     dl, [CDDrive]           ; set the drive
+                
+    pushd   00
+    push    eax                     ; push 64-bit block number (top half always null)
+
+    push    es
+    pushw   00h                     ; push transfer address
+
+    push    cx                      ; # sectors
+    pushw   0010h                   ; this request packet is 16 bytes
+    mov     ah,42h                  ; extended read
+    mov     si,sp                   ; ds:si = address of params
+    int     13h                     ; perform the read
+
+    add     sp, 10h                 ; clean the stack and return
+    popad
+    ret
+ReadDisk ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; Error Routines (these are jump points that never return)
+
+SVDError:
+    mov     al, "S"
+    jmp     PrintError
+FileNotFoundError:
+    mov     al, "F"
+PrintError:
+    mov     bx, 07h                 ; normal attribute
+    mov     ah, 0eh                 ; default print 1 char
+    mov     cx, 6
+    mov     si, offset ErrorMsg
+    int 10h
+printnext:
+    lodsb
+    or  al, al
+    jz  infloop
+    int 10h
+    jmp printnext
+infloop:
+    jmp     infloop
+
+;;;;;;;;;;;;;;;;;;;;
+; Global Vars
+
+    RootStart       DD  0
+    RootSize        DD  0
+    CDDrive         DB  0
+    BlockSize       DW  0
+    FileStart       DD  0
+    FileSize        DD  0
+    
+;;;;;;;;;;;;;;;;;;;;
+; String Constants
+
+    SVDesc          DB  02h, "CD001"
+    JolietSig       DB  25h, 2fh, 45h                               ; this is the value of the escape sequence for a Joliet CD 
+                                                                    ;   we'll use it as the signature...
+    Stage2FileSize  DB  OFFSET Stage2FilePad - OFFSET Stage2File
+    Stage2File      DB  0,"S",0,"i",0,"n",0,"g",0,"l",0,"d",0,"r"   ; in unicode, this is how our filename will appear
+    Stage2FilePad   DB  0
+    ErrorMsg        DB  " Error", 0
+
+;;;;;;;;;;;;;;;;;;;;
+; Boot Sector Signature
+    ORG     510
+    DW      0AA55h
+
+end start
diff --git a/base/boot/BootSectors/Fat16_BS.asm b/base/boot/BootSectors/Fat16_BS.asm
new file mode 100644
index 0000000..100baa0
--- /dev/null
+++ b/base/boot/BootSectors/Fat16_BS.asm
@@ -0,0 +1,326 @@
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+
+;;;;;;;;;;;;;;;;;;;;
+; Concerns
+;  1 - there is no error checking on the int13 calls
+;  2 - we assume that the disk is FAT16, and that the parameters in the BPB are correct.
+
+;;;;;;;;;;;;;;;;;;;;
+; Constants
+
+BootSecOrigin       EQU     07c00h      ; the BIOS always puts the boot sector here
+StackOffset         EQU     -12         ; we will put the stack a small bit below it (we hardly use the stack, so it is safe...)
+EndOfClusterMarker  EQU     0FFF8h      ; End of cluster is here or higher
+
+; a little trickery here:  Inside the Boot Sector data structure, there several bytes that we never use.
+; whether the real file system uses them or not, we don't need them, and we could use the space for locals.
+
+FirstDataSector     EQU     OemName
+RootDirSectors      EQU     OemName+2
+RootDirStart        EQU     OemName+4
+LBAStart            EQU     SerialNum
+
+;;;;;;;;;;;;;;;;;;;;
+; Directives
+
+.model tiny
+.686p
+
+;;;;;;;;;;;;;;;;;;;;
+; Begin Code segment
+
+_TEXT SEGMENT use16 ; 16-bit code segment
+.code
+ORG     BootSecOrigin               ; this is going to anger the linker when it tries to make a COM executable
+                                    ; however, this is necessary in order to get the assembler to compute offsets correctly
+
+start:
+
+    ; standard boot loader procedcure is to jump over the BPB and BS data structures, then nop
+    jmp short bootloader
+    nop
+
+;;; Example BPB and BS for Singularity, assuming a 64MB disk.  Installers must NEVER copy these 59 bytes - use what the HD has...
+BPB:
+    OemName         DW      'IS'    ; setting up the first 8 bytes like this lets us address them via the hack above
+                    DB      'NGULAR'
+    BytesPerSector  DW      512
+    SecsPerClust    DB      4
+    ReservedSecs    DW      1
+    NumFats         DB      2
+    RootDirEntries  DW      512
+    TotalSectors    DW      0
+    MediaByte       DB      0F8H
+    NumFatSecs      DW      128
+    SecPerTrack     DW      011h
+    NumHeads        DW      08h
+    HiddenSecs      DD      011h
+    BigTotalSecs    DD      1ff87h
+    BootDrv         DB      80h
+    BSReserved1     DB      0h
+    ExtBootSig      DB      41
+    SerialNum       DD      0
+    VolumeLabel     DB      'SINGULARITY'
+    FatId           DB      'FAT16   '
+
+bootloader:
+
+Step1:    ; set stack and data segments
+    mov     cx, cs
+    mov     ss, cx
+    mov     sp, BootSecOrigin + StackOffset
+    mov     es, cx
+    mov     ds, cx
+    mov     bp, sp
+
+Step2:    ; Clear the Screen
+    mov     ax, 02h
+    int     010h
+
+Step3:    ; Save the boot drive
+    mov     [BootDrv], dl
+
+Step4:    ; Ensure Int13X is supported.  (It's the only way we'll access the HD)
+    mov     ax, 4100h
+    mov     bx, 055aah              ; required parameter
+   
+    int     13h                     ; check availability of extended int 13 (dl holds BootDrv)
+
+    jc      HWUnsupportedError      ; CF is set on error
+    cmp     bx,0aa55h
+    jne     HWUnsupportedError      ; BX != 0xaa55 on error
+    test    cl,1
+    jz      HWUnsupportedError      ; bit 0 off on error
+
+Step5:    ; Find the first FAT16 partition in the MBR and store the starting LBA offset.
+    xor     eax, eax
+    mov     bx, 4000h
+    mov     es, bx
+    mov     cx, 1
+    call    ReadDisk                ; load the MBR to 4000:0000
+
+    mov     cx, 4                   ; check up to 4 entries in the partition table
+    mov     di, 446                 ; the offset of the table within the MBR
+
+    mov     eax, 00eh               ; 00eh is the signature for a Fat16 LBA-accessible partition
+FindFat16Partition:
+    cmp     al, es:[di+4]
+    je      FoundFat16Partition
+    add     di, 16
+    dec     cx
+    jz      PartitionNotFoundError
+    jmp     FindFat16Partition
+
+FoundFat16Partition:
+    mov     eax, es:[di+8]
+    mov     [LBAStart], eax         ; save the starting lba
+
+Step6:    ; Compute the First Data Sector of the FAT
+    movzx   eax, [RootDirEntries]
+    shl     eax, 5                  ; (assume no overflow)
+    movzx   ecx, [BytesPerSector]
+    add     eax, ecx
+    dec     eax
+    div     ecx                     ; (discard remainder)
+    mov     [RootDirSectors], ax    ; RootDirSectors = ((RootDirEntries * 32) + (BytesPerSector - 1)) / BytesPerSector
+
+    movzx   eax, [SecsPerClust]
+    mul     ecx
+    shr     eax, 4
+    push    ax                      ; save the cluster size on the stack
+
+    movzx   eax, [NumFats]
+    mul     [NumFatSecs]            ; (assume no overflow)
+    add     ax, [ReservedSecs]
+    mov     [RootDirStart], ax      ; RootDirStart = ReservedSecs + (NumFats * NumFatSecs)
+
+    add     ax, [RootDirSectors]
+    mov     [FirstDataSector], ax   ; FirstDataSector = RootDirStart + RootDirSectors
+
+Step7:    ; Search the Root Directory for 'SINGLDR ', find its starting cluster
+
+    mov     dx, [RootDirSectors]    ; set counter for # sectors in root dir
+
+    mov     ax, 4000h
+    mov     es, ax                  ; set up ES for a disk transfer
+
+    movzx   eax, [RootDirStart]
+    add     eax, [LBAStart]         ; compute true first sector of root dir
+
+LoadNextSector:
+    mov     ecx, 1
+    call    ReadDisk                ; read 1 sector (eax has sector #) to es:0000h
+
+    mov     bx, [BytesPerSector]    ; set a counter for how many directory entries we will check (32 bytes per entry)
+    xor     di, di                  ; prep for comparison between [ds:si] (search string) and [es:di] (sector data)
+
+CompareDirEntries:
+    mov     si, OFFSET Stage2File   ; [ds:si] points to the string we are looking for...
+    mov     cx, 11                  ; we are matching an 11-character file name
+    repe    cmpsb
+    je      FoundMatch
+    add     di, cx
+    add     di, 21                  ; move to next dir entry, but first make sure we aren't at the last entry!
+    sub     bx,32
+    jnz     CompareDirEntries
+
+    inc     eax                     ; prep to read next entry
+    dec     edx
+    jz      FileNotFoundError
+    jmp     LoadNextSector
+
+FoundMatch:
+                                    ; es:[di] points to 12th byte of the 32-byte 
+                                    ; directory entry for the 2nd stage boot loader file
+    mov     ax, es:[di+15]          ; read the cluster at offset 26
+
+Step8:    ; Load the file whose first cluster is ax to 57c0:0000
+
+    mov     cx, 057c0h
+    mov     es, cx
+
+DoRead:
+    call    ReadCluster
+    push    es
+    
+    mov     cx, 04000h              ; use different segment to find next cluster
+    mov     es, cx
+    call    CalcNextCluster
+    pop     cx
+    add     cx, [bp-2]
+    mov     es, cx
+    cmp     ax, EndOfClusterMarker
+    jb      DoRead
+
+Step9:    ; Transfer Control to the boot loader file, which we stored at 5000:7c00
+
+    movzx   edx, [BootDrv]
+    push    edx                     ; SINGLDR will need to know the boot drive #
+    pushd   04806h                  ; H6 boot signature = HD, Fat16
+    pushw   offset infloop          ; return address = "infloop", which is the infinite loop
+    push    cs
+    
+    db      0EAh                    ; emit a long jump to 5000:7c00
+    dd      50007c00h
+
+;;;;;;;;;;;;;;;;;;;;
+; CalcNextCluster
+;
+; Inputs:       ax      = current cluster
+;               es      = target segment for disk read (es:00)
+; Operation:    Read the FAT, lookup the value for the cluster in ax, and return it as ax
+
+CalcNextCluster PROC NEAR
+    and     eax, 0FFFFh             ; clear top half of eax
+    shl     ax, 1
+    xor     dx, dx                  ; clear top half of dividend
+    div     [BytesPerSector]
+    push    dx                      ; save remainder for later - it is the offset
+    add     ax, [ReservedSecs]
+    add     eax, [LBAStart]         ; eax has the sector to read
+
+    ; Call ReadDisk for 1 sector to es:0000
+    mov     cx, 1
+    call    ReadDisk
+
+    ; read cluster# at the offset
+    pop        bx                   ; pop the offset
+    mov        ax, es:[bx]          ; get the value, put it in ax
+    ret
+CalcNextCluster ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadCluster
+;
+; Inputs:       ax      = cluster number to read
+;               es      = segment into which we will read (at es:0000)
+; Operation:    Read a cluster from the HD, using ReadDisk as a subroutine
+
+ReadCluster PROC NEAR
+    pushad
+
+    ; compute the sector that starts the cluster
+    and     eax, 0FFFFh             ; clear top half of eax for safety.
+    sub     eax, 2
+    movzx   ecx, [SecsPerClust]     ; cx = sectors to load (this always read full clusters)
+    mul     ecx
+    add     ax, [FirstDataSector]
+    add     eax, [LBAStart]         ; eax holds the sector to read
+    call    ReadDisk
+
+    popad
+    ret
+ReadCluster ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadDisk
+;
+; Inputs:       eax     = LBA sector to read
+;               cx      = number of sectors to read (limit to 64 or less)
+;               es:bx   = destination address (always read to offset 0)
+; Assumptions:  1 - assumes request will not cause overflow of es (limit on # sectors)
+;               2 - assumes int13 extensions available
+;               3 - LBA is limited to 32-bit values.  If the disk is > 2 TB, we have a problem
+
+ReadDisk PROC NEAR
+    pushad
+    mov     dl, [BootDrv]           ; set the drive
+                
+    pushd   00
+    push    eax                     ; push 64-bit sector address (top half always null)
+
+    push    es
+    pushw   00                      ; push transfer address
+
+    push    cx                      ; # sectors
+    pushw   0010h                   ; this request packet is 16 bytes
+    mov     ah,42h                  ; extended read
+    mov     si,sp                   ; ds:si = address of params
+    int     13h                     ; perform the read
+
+    add     sp, 10h                 ; clean the stack and return
+    popad
+    ret
+ReadDisk ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; Error Routines (these are jump points that never return)
+
+PartitionNotFoundError:
+    mov     al, "P"        
+    jmp     PrintError
+FileNotFoundError:
+    mov     al, "F"
+    jmp     PrintError
+HWUnsupportedError:
+    mov     al, "H"
+PrintError:
+    mov     bx, 07h                 ; normal attribute
+    mov     ah, 0eh                 ; default print 1 char
+    mov     cx, 6
+    mov     si, offset ErrorMsg
+    int 10h
+printnext:
+    lodsb
+    or  al, al
+    jz  infloop
+    int 10h
+    jmp printnext
+infloop:
+    jmp     infloop
+
+;;;;;;;;;;;;;;;;;;;;
+; String Constants
+
+    Stage2File  DB  "SINGLDR    "   ; spaces are important for FAT file name determination.  Compare all 11 bytes!
+    ErrorMsg    DB  " Error", 0
+
+;;;;;;;;;;;;;;;;;;;;
+; Boot Sector Signature
+
+    ORG     BootSecOrigin+510
+    DW      0AA55h
+    
+end start
diff --git a/base/boot/BootSectors/Fat32_BS.asm b/base/boot/BootSectors/Fat32_BS.asm
new file mode 100644
index 0000000..e6920d8
--- /dev/null
+++ b/base/boot/BootSectors/Fat32_BS.asm
@@ -0,0 +1,332 @@
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+
+;;;;;;;;;;;;;;;;;;;;
+; Concerns
+;  1 - there is no error checking on the int13 calls
+;  2 - we assume that the disk is FAT32, and that the parameters in the BPB are correct.
+
+;;;;;;;;;;;;;;;;;;;;
+; Constants
+
+BootSecOrigin       EQU     07c00h      ; the BIOS always puts the boot sector here
+StackOffset         EQU     -12         ; we will put the stack a small bit below it (we hardly use the stack, so it is safe...)
+EndOfClusterMarker  EQU     0FFFFFF8h   ; End of cluster is here or higher
+
+; a little trickery here:  Inside the Boot Sector data structure, there several bytes that we never use.
+; whether the real file system uses them or not, we don't need them, and we could use the space for locals.
+
+FirstDataSector     EQU     BPBReserved2
+LBAStart            EQU     BPBReserved2+4
+
+;;;;;;;;;;;;;;;;;;;;
+; Directives
+
+.model tiny
+.686p
+
+;;;;;;;;;;;;;;;;;;;;
+; Begin Code segment
+
+_TEXT SEGMENT use16 ; 16-bit code segment
+.code
+ORG     BootSecOrigin               ; this is going to anger the linker when the linker tries to make a COM executable
+                                    ; however, this is necessary in order to get the assembler to compute offsets correctly
+
+start:
+
+    ; standard boot loader procedcure is to jump over the BPB and BS data structures, then nop
+    jmp short bootloader
+    nop
+
+;;; Example BPB and BS for Singularity, assuming a 1GB disk.  Installers must NEVER copy these 87 bytes - use what the HD has...
+BPB:
+    OemName         DB  'SINGULAR'
+    BytesPerSector  DW  512         ; used by boot loader
+    SecsPerClust    DB  8           ; used by boot loader
+    ReservedSecs    DW  32          ; used by boot loader
+    NumFats         DB  2           ; used by boot loader
+    NumDirEntries   DW  0
+    TotalSectors    DW  0
+    MediaByte       DB  0F8H
+    NumFatSecs      DW  0
+    SecPerTrack     DW  03fh
+    NumHeads        DW  64
+    HiddenSecs      DD  03fh
+    BigTotalSecs    DD  1ffdc1h
+    BigNumFatSecs   DD  7feh        ; used by boot loader
+    ExtFlags        DW  0
+    BPBReserved1    DW  0
+    RootStrtClus    DD  2           ; used by boot loader
+    FSInfoSec       dw  1
+    BkUpBootSec     dw  6
+    BPBReserved2    DD  3 DUP (0)   ; used (by another name)
+    BootDrv         DB  80h         ; used by boot loader
+    BSReserved1     DB  0h
+    ExtBootSig      DB  41
+    SerialNum       DD  0
+    VolumeLabel     DB  'SINGULARITY'
+    FileSysType     DB  'FAT32   '
+
+bootloader:
+
+Step1:    ; set stack and data segments
+    mov     cx, cs
+    mov     ss, cx
+    mov     sp, BootSecOrigin + StackOffset
+    mov     es, cx
+    mov     ds, cx
+    mov     bp, sp
+
+Step2:    ; Clear the Screen
+    mov     ax, 02h
+    int     010h
+        
+Step3:    ; Save the boot drive
+    mov     [BootDrv], dl
+
+Step4:    ; Ensure Int13X is supported.  (It's the only way we'll access the HD)
+    mov     ax, 4100h
+    mov     bx, 055aah              ; required parameter
+
+    int     13h                     ; check availability of extended int 13 (dl holds BootDrv)
+
+    jc      HWUnsupportedError      ; CF is set on error
+    cmp     bx,0aa55h
+    jne     HWUnsupportedError      ; BX != 0xaa55 on error
+    test    cl,1
+    jz      HWUnsupportedError      ; bit 0 off on error
+
+Step5:    ; Find the first FAT16 partition in the MBR and store the starting LBA offset.
+    xor     eax, eax
+    mov     bx, 4000h
+    mov     es, bx
+    mov     cx, 1
+    call    ReadDisk                ; load the MBR to 4000:0000
+
+    mov     cx, 4                   ; check up to 4 entries in the partition table
+    mov     di, 446                 ; the offset of the table within the MBR
+
+    mov     eax, 00ch               ; 00ch is the signature for a Fat32 LBA-accessible partition
+FindFat16Partition:
+    cmp     al, es:[di+4]
+    je      FoundFat16Partition
+    add     di, 16
+    dec     cx
+    jz      PartitionNotFoundError
+    jmp     FindFat16Partition
+
+FoundFat16Partition:
+    mov     eax, es:[di+8]
+    mov     [LBAStart], eax         ; save the starting lba
+
+Step6:    ; Compute the First Data Sector of the FAT
+    movzx   ecx, [NumFats]
+    mov     eax, [BigNumFatSecs]
+    mul     ecx                     ; assume overflow is impossible here
+    mov     cx, [ReservedSecs]
+    add     eax, ecx
+    mov     [FirstDataSector], eax
+
+Step7:    ; Search the Root Directory for SINGLDR, find its starting cluster
+
+    ; calc # of directory entries in a cluster
+    xor     ax, ax
+    mov     al, [SecsPerClust]
+    mul     [BytesPerSector]
+    shr     ax, 4
+    push    ax                      ; save this for later as BytesPerCluster/16
+    shr     ax, 1                   ; BytesPerCluster/32 = # FAT directory entries that fit in a cluster
+    push    ax                      ; we will use this to init a counter
+
+    ; set up ES for a disk transfer
+    mov     ax, 4000h
+    mov     es, ax
+    mov     eax, [RootStrtClus]     ; eax has the current cluster to read
+
+LoadNextCluster:                    ; eax holds the cluster to read
+    call    ReadCluster
+
+    ; set a counter for how many directory entries we will check
+    pop     bx
+    push    bx                      ; sadly, this is cheaper than "mov bx, [bp-2]"
+    xor     di, di                  ; prep for comparison between [ds:si] (search string) and [es:di] (sector data)
+
+CompareDirEntries:
+    mov     si, OFFSET Stage2File   ; [ds:si] points to the string we are looking for...
+    mov     cx, 11                  ; we are looking for an 11-character file name
+    repe    cmpsb
+    je      FoundMatch              ; jump on match
+    add     di, cx
+    add     di, 21                  ; ready to test the next one, but first make sure we aren't at the last entry!
+    dec     bx
+    jnz     CompareDirEntries
+
+FindNextCluster:
+    call    CalcNextCluster
+    cmp     eax, EndOfClusterMarker ; if this is the end of the cluster chain, we are totally sunk - file not found
+    jae     FileNotFoundError
+    jmp     LoadNextCluster
+
+FoundMatch:
+    pop     ax                      ; remove our temp var from the stack
+
+                                    ; es:[di] points to 12th byte of the 32-byte 
+                                    ; directory entry for the 2nd stage boot loader file
+    mov     ax, es:[di+9]           ; read high 16 bits of the cluster
+    shl     eax, 16
+    mov     ax, es:[di+15]          ; read low 16 bits of the cluster
+
+Step8:    ; Load the file whose first cluster is eax to 57c0:0000
+
+    mov     cx, 057c0h
+    mov     es, cx
+
+DoRead:
+    call    ReadCluster
+    push    es
+
+    mov     cx, 04000h              ; use different segment to find next cluster
+    mov     es, cx
+    call    CalcNextCluster
+    pop     cx
+    add     cx, [bp-2]
+    mov     es, cx
+    cmp     eax, EndOfClusterMarker
+    jb      DoRead
+
+Step9:    ; Transfer Control to the boot loader file, which we stored at 5000:7c00
+
+    movzx   edx, [BootDrv]
+    push    edx                     ; SINGLDR will need to know the boot drive #
+    pushd   04803h                  ; H3 boot signature = HD, Fat32
+    pushw   offset infloop          ; return address = "infloop", which is the infinite loop
+    push    cs
+    
+    db      0EAh                    ; emit a long jump to 5000:7c00
+    dd      50007c00h
+
+;;;;;;;;;;;;;;;;;;;;
+; CalcNextCluster
+;
+; Inputs:       eax     = current cluster
+;               es      = target segment for disk read (es:00)
+; Operation:    Read the FAT, lookup the value for the cluster in eax, and return its low 28 bits
+
+CalcNextCluster PROC NEAR
+    shl     eax, 2
+    xor     edx, edx
+    movzx   ecx, [BytesPerSector]
+    div     ecx ; edx has remainder, eax has quotient
+    push    edx ; save remainder for later - it is the offset
+    mov     dx, [ReservedSecs]
+    add     eax, edx
+    add     eax, [LBAStart]         ; eax has the sector to read
+
+    ; Call ReadDisk for 1 sector to es:0000
+    mov     cx, 1
+    call    ReadDisk
+
+    ; read cluster# at the offset
+    pop     ebx                     ; pop the offset
+    mov     eax, es:[ebx]           ; get the value, put it in eax
+    and     eax, 0FFFFFFFh          ; make it a 28-bit value
+    ret
+CalcNextCluster ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadCluster
+;
+; Inputs:       eax     = cluster number to read
+;               es      = segment into which we will read (at es:0000)
+; Operation:    Read a cluster from the HD, using ReadDisk as a subroutine
+
+ReadCluster PROC NEAR
+    pushad
+
+    ; compute the sector that starts the cluster
+    sub     eax, 2
+    movzx   ecx, [SecsPerClust]     ; cx = sectors to load (this always read full clusters)
+    mul     ecx
+    add     eax, [FirstDataSector]
+    add     eax, [LBAStart]         ; eax holds the sector to read
+    call    ReadDisk
+
+    popad
+    ret
+ReadCluster ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadDisk
+;
+; Inputs:       eax     = LBA sector to read
+;               cx      = number of sectors to read (limit to 64 or less)
+;               es      = destination segment (always read to offset 0)
+; Assumptions:  1 - assumes request will not cause overflow of es (limit on # sectors)
+;               2 - assumes int13 extensions available
+;               3 - LBA is limited to 32-bit values.  If the disk is > 2 TB, we have a problem
+
+ReadDisk PROC NEAR
+    pushad
+    mov     dl, [BootDrv]           ; set the drive
+                
+    pushd   00
+    push    eax                     ; push 64-bit sector address (top half always null)
+
+    push    es
+    pushw   00                      ; push transfer address (offset always 0)
+
+    push    cx                      ; # sectors
+    pushw   0010h                   ; this request packet is 16 bytes
+    mov     ah,42h                  ; extended read
+    mov     si,sp                   ; ds:si = address of params
+    int     13h                     ; perform the read
+
+    add     sp, 10h                 ; clean the stack and return
+    popad
+    ret
+ReadDisk ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; Error Routines (these are jump points that never return)
+
+InvalidPartitionTypeError:
+    mov     al, "T"
+    jmp     PrintError
+PartitionNotFoundError:
+    mov     al, "P"        
+    jmp     PrintError
+FileNotFoundError:
+    mov     al, "F"
+    jmp     PrintError
+HWUnsupportedError:
+    mov     al, "H"
+PrintError:
+    mov     bx, 07h                 ; normal attribute
+    mov     ah, 0eh                 ; default print 1 char
+    mov     cx, 6
+    mov     si, offset ErrorMsg
+    int 10h
+printnext:
+    lodsb
+    or  al, al
+    jz  infloop
+    int 10h
+    jmp printnext
+infloop:
+    jmp     infloop
+
+;;;;;;;;;;;;;;;;;;;;
+; String Constants
+
+    Stage2File  DB  "SINGLDR    "   ; spaces are important for FAT file name determination.  Compare all 11 bytes!
+    ErrorMsg    DB  " Error", 0
+
+;;;;;;;;;;;;;;;;;;;;
+; Boot Sector Signature
+
+    ORG     BootSecOrigin+510
+    DW      0AA55h
+
+end start
diff --git a/base/boot/BootSectors/UsbFat16_BS.asm b/base/boot/BootSectors/UsbFat16_BS.asm
new file mode 100644
index 0000000..0cfc4ce
--- /dev/null
+++ b/base/boot/BootSectors/UsbFat16_BS.asm
@@ -0,0 +1,294 @@
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+
+;;;;;;;;;;;;;;;;;;;;
+; Concerns
+;  1 - there is no error checking on the int13 calls
+;  2 - we assume that the disk is FAT16, and that the parameters in the BPB are correct.
+;  3 - There is a risk that the LBA->CHS conversion will overflow
+
+;;;;;;;;;;;;;;;;;;;;
+; Constants
+
+BootSecOrigin       EQU     07c00h      ; the BIOS always puts the boot sector here
+StackOffset         EQU     -12         ; we will put the stack a small bit below it (we hardly use the stack, so it is safe...)
+EndOfClusterMarker  EQU     0FFF8h      ; End of cluster is here or higher
+
+; a little trickery here:  Inside the Boot Sector data structure, there several bytes that we never use.
+; whether the real file system uses them or not, we don't need them, and we could use the space for locals.
+
+FirstDataSector     EQU     OemName
+RootDirSectors      EQU     OemName+2
+RootDirStart        EQU     OemName+4
+
+;;;;;;;;;;;;;;;;;;;;
+; Directives
+
+.model tiny
+.686p
+
+;;;;;;;;;;;;;;;;;;;;
+; Begin Code segment
+
+_TEXT SEGMENT use16 ; 16-bit code segment
+.code
+ORG     BootSecOrigin               ; this is going to anger the linker when the linker tries to make a COM executable
+                                    ; however, this is necessary in order to get the assembler to compute offsets correctly
+
+start:
+
+    ; standard boot loader procedcure is to jump over the BPB and BS data structures, then nop
+    jmp short bootloader
+    nop
+
+;;; Example BPB and BS for Singularity, assuming a 64MB disk.  Installers must NEVER copy these 59 bytes - use what the HD has...
+BPB:
+    OemName         DW      'IS'        ; setting up the first 8 bytes like this lets us address them in other ways
+                    DB      'NGULAR'
+    BytesPerSector  DW      512
+    SecsPerClust    DB      4
+    ReservedSecs    DW      4
+    NumFats         DB      2
+    RootDirEntries  DW      512
+    TotalSectors    DW      0
+    MediaByte       DB      0F8H
+    NumFatSecs      DW      00fah
+    SecPerTrack     DW      03fh
+    NumHeads        DW      00FFh
+    HiddenSecs      DD      020h
+    BigTotalSecs    DD      03e7e0h
+    BootDrv         DB      00h
+    BSReserved1     DB      0h
+    ExtBootSig      DB      29h
+    SerialNum       DD      0
+    VolumeLabel     DB      'SINGULARITY'
+    FatId           DB      'FAT16   '
+
+bootloader:
+
+Step1:    ; set stack and data segments
+    mov     cx, cs
+    mov     ss, cx
+    mov     sp, BootSecOrigin + StackOffset
+    mov     es, cx
+    mov     ds, cx
+    mov     bp, sp
+    
+Step2:    ; Save the boot drive (dl holds it on boot)
+    mov     [BootDrv], dl
+    mov     al, dl
+    
+Step3:    ; Clear the Screen
+    mov     ax, 02h
+    int     010h
+
+Step4:    ; Compute the First Data Sector of the FAT
+    movzx   eax, [RootDirEntries]
+    shl     eax, 5                  ; (assume no overflow)
+    movzx   ecx, [BytesPerSector]
+    add     eax, ecx
+    dec     eax
+    div     ecx                     ; (discard remainder)
+    mov     [RootDirSectors], ax    ; RootDirSectors = ((RootDirEntries * 32) + (BytesPerSector - 1)) / BytesPerSector
+
+    movzx   eax, [SecsPerClust]
+    mul     ecx
+    shr     eax, 4
+    push    ax                      ; save the cluster size on the stack
+
+    movzx   eax, [NumFats]
+    mul     [NumFatSecs]            ; (assume no overflow)
+    add     ax, [ReservedSecs]
+    mov     [RootDirStart], ax      ; RootDirStart = ReservedSecs + (NumFats * NumFatSecs)
+
+    add     ax, [RootDirSectors]
+    mov     [FirstDataSector], ax   ; FirstDataSector = RootDirStart + RootDirSectors
+
+
+Step5:    ; Search the Root Directory for 'SINGLDR ', find its starting cluster
+
+    mov     dx, [RootDirSectors]    ; set counter for # sectors in root dir
+
+    mov     ax, 4000h
+    mov     es, ax                  ; set up ES for a disk transfer
+
+    movzx   eax, [RootDirStart]     ; compute true first sector of root dir
+
+LoadNextSector:
+    xor     bx,bx
+    call    ReadDiskCHS             ; read sector eax to es:bx
+
+    mov     bx, [BytesPerSector]    ; set a counter for how many directory entries we will check (32 bytes per entry)
+    xor     di, di                  ; prep for comparison between [ds:si] (search string) and [es:di] (sector data)
+
+CompareDirEntries:
+    mov     si, OFFSET Stage2File   ; [ds:si] points to the string we are looking for...
+    mov     cx, 11                  ; we are matching an 11-character file name
+    repe    cmpsb
+    je      FoundMatch
+    add     di, cx
+    add     di, 21                  ; move to next dir entry, but first make sure we aren't at the last entry!
+    sub     bx, 32
+    jnz     CompareDirEntries;
+
+    inc     eax                     ; prep to read next entry
+    dec     edx
+    jz      FileNotFoundError
+    jmp     LoadNextSector
+
+FoundMatch:
+                                    ; es:[di] points to 12th byte of the 32-byte 
+                                    ; directory entry for the 2nd stage boot loader file
+    mov     ax, es:[di+15]          ; read the cluster at offset 26
+
+
+Step6:    ; Load the file whose first cluster is ax to 57c0:0000
+
+    mov     cx, 057c0h
+    mov     es, cx
+
+DoRead:
+    call    ReadCluster
+
+    push    es
+    mov     cx, 04000h              ; use different segment to find next cluster
+    mov     es, cx
+    call    CalcNextCluster
+
+    pop     cx
+    add     cx, [bp-2]
+    mov     es, cx
+
+    cmp     ax, EndOfClusterMarker
+    jb      DoRead
+
+Step7:    ; Transfer Control to the boot loader file, which we stored at 5000:7c00
+
+    movzx   edx, [BootDrv]
+    push    edx                     ; SINGLDR will need to know the boot drive #
+    pushd   05544h                  ; UD boot signature (UsbDisk)
+    pushw   offset infloop          ; return address = "infloop", which is the infinite loop
+    push    cs
+
+    db      0EAh                    ; emit a long jump to 5000:7c00
+    dd      50007c00h
+
+;;;;;;;;;;;;;;;;;;;;
+; CalcNextCluster
+;
+; Inputs:       ax      = current cluster
+;               es      = target segment for disk read (es:00)
+; Operation:    Read the FAT, lookup the value for the cluster in ax, and return it as ax
+
+CalcNextCluster PROC NEAR
+    and     eax, 0FFFFh             ; clear top half of eax
+    shl     ax, 1
+    xor     dx, dx                  ; clear top half of dividend
+    div     [BytesPerSector]
+    push    dx                      ; save remainder for later - it is the offset
+    add     ax, [ReservedSecs]      ; eax has the sector to read
+
+    ; Call ReadDiskCHS to load sector eax at es:bx
+    xor     bx, bx
+    call    ReadDiskCHS
+
+    ; read cluster# at the offset
+    pop        bx                   ; pop the offset
+    mov        ax, es:[bx]          ; get the value, put it in ax
+    ret
+CalcNextCluster ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadCluster
+;
+; Inputs:       ax      = cluster number to read
+;               es      = segment into which we will read (at es:0000)
+; Operation:    Read a cluster from the HD, using ReadDisk as a subroutine
+
+ReadCluster PROC NEAR
+    pushad
+
+    ; compute the sector that starts the cluster
+    xor     bx, bx                  ; initially write to es:0000
+    and     eax, 0FFFFh             ; clear top half of eax for safety.
+    sub     eax, 2
+    movzx   ecx, [SecsPerClust]     ; cx = sectors to load (this always read full clusters)
+    mul     ecx
+    add     ax, [FirstDataSector]   ; eax holds the sector to read
+LoadSector:
+    call    ReadDiskCHS
+    add     bx, [BytesPerSector]
+    inc     eax
+    dec     cx
+    jnz     LoadSector
+
+    popad
+    ret
+ReadCluster ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; ReadDiskCHS   read one sector as indicated by eax to es:bx
+;
+; Inputs:       eax     = LBA sector to read
+;               es:bx   = destination address
+;
+; Assumptions:  1 - assumes LBA is not beyond CHS representation
+
+ReadDiskCHS PROC NEAR
+    pushad
+
+    xor     edx, edx                ; edx:eax = absolute sector number
+    movzx   ecx, [SecPerTrack]      ; ecx = sectors per track
+    div     ecx                     ; eax = track, edx = sector within track (0-62)
+    inc     dl                      ; dl = sector within track (1-63)
+    mov     cl, dl                  ; cl = sector within track
+    mov     edx, eax
+    shr     edx, 16                 ; dx:ax = track
+    div     [NumHeads]              ; ax = cylinder (0-1023), dx = head (0-255)
+    xchg    dl, dh                  ; dh = head
+    mov     dl, [BootDrv]           ; dl = int13 unit #
+    mov     ch, al                  ; ch = bits 0-7 of cylinder
+    shl     ah, 6
+    or      cl, ah                  ; bits 6-7 of cl = bits 8-9 of cylinder
+    mov     ax, 201h                ; read 1 sector
+    int 13h
+
+    popad
+    ret
+ReadDiskCHS ENDP
+
+;;;;;;;;;;;;;;;;;;;;
+; Error Routines (these are jump points that never return)
+
+FileNotFoundError:
+    mov     al, "F"
+    jmp     PrintError
+PrintError:
+    mov     bx, 07h                 ; normal attribute
+    mov     ah, 0eh                 ; default print 1 char
+    mov     cx, 6
+    mov     si, offset ErrorMsg
+    int 10h
+printnext:
+    lodsb
+    or  al, al
+    jz  infloop
+    int 10h
+    jmp printnext
+infloop:
+    jmp     infloop
+
+;;;;;;;;;;;;;;;;;;;;
+; String Constants
+
+    Stage2File  DB  "SINGLDR    "   ; spaces are important for FAT file name determination.  Compare all 11 bytes!
+    ErrorMsg    DB  " Error", 0
+
+;;;;;;;;;;;;;;;;;;;;
+; Boot Sector Signature
+
+    ORG     BootSecOrigin+510
+    DW      0AA55h
+    
+end start
diff --git a/base/boot/Dhcp.df b/base/boot/Dhcp.df
new file mode 100644
index 0000000..81e8249
--- /dev/null
+++ b/base/boot/Dhcp.df
@@ -0,0 +1,19 @@
+[Filter]
+Lines=17
+Line1=0,6,0
+Line2=1,97,1,3,4,BOOKMARK,COMMENT,GENERIC,MESSAGE,Protocol == BOOKMARK or COMMENT or GENERIC or MESSAGE
+Line3=1,5,0
+Line4=2,6,2
+Line5=3,97,6,3,1,ARP_RARP,Protocol == ARP_RARP
+Line6=3,97,6,3,1,ISAKMP,Protocol == ISAKMP
+Line7=3,97,6,3,1,DHCP,Protocol == DHCP
+Line8=3,97,6,1,UDP,:Source Port,0,13,2,4011,UDP:Source Port == 4011
+Line9=3,97,6,1,UDP,:Destination Port,0,13,2,4011,UDP:Destination Port == 4011
+Line10=3,97,6,1,UDP,:Source Port,0,13,2,69,UDP:Source Port == 69
+Line11=3,97,6,1,UDP,:Destination Port,0,13,2,69,UDP:Destination Port == 69
+Line12=3,97,6,1,UDP,:Source Port,0,13,2,67,UDP:Source Port == 67
+Line13=3,97,6,1,UDP,:Destination Port,0,13,2,67,UDP:Destination Port == 67
+Line14=3,97,6,1,UDP,:Source Port,0,13,2,8197,UDP:Source Port == 8197
+Line15=3,97,6,1,UDP,:Destination Port,0,13,2,8197,UDP:Destination Port == 8197
+Line16=3,97,2,1,TCP,:Destination Port,0,13,2,8192,TCP:Destination Port == 8192
+Line17=2,97,0,2,27,30,27,ANY <--> ANY
diff --git a/base/boot/Singldr/Singldr.proj b/base/boot/Singldr/Singldr.proj
new file mode 100644
index 0000000..cbca706
--- /dev/null
+++ b/base/boot/Singldr/Singldr.proj
@@ -0,0 +1,276 @@
+<!--
+##############################################################################
+#
+#   Microsoft Research Singularity
+#
+#   Copyright (c) Microsoft Corporation.  All rights reserved.
+#
+#   File:   Boot\Singldr\Makefile
+#
+#   Note:
+
+The components built by this project require knowledge of some
+of the data structures used by the managed kernel.  We handle
+this by building the kernel first and running it through native
+code generation (Bartok).  This generates halclass.h and
+halclass.inc, which contain structure layouts that the unmanaged
+C/C++ and assembly compilers can use.
+
+MSBuild is smart enough to handle this correctly.  Projects can
+build other projects, and can refer to specific targets within
+those projects.  So Kernel.proj and SINGLDR.proj contain
+references to each other.  The reference graph is acyclic,
+because references are really to tuples of (project, target),
+not just to (project).
+
+The result is that you get a clean, correct build, no matter
+what order you build the projects.
+
+-->
+
+<Project DefaultTarget="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Paths.targets" />
+
+  <PropertyGroup>
+    <!--
+ Truncate PATH for 16-bit tools because if it is
+     too long it'll give an out-of-memory error.
+    -->
+    <CC16>PATH ; &amp; $(BUILDDIR)\cl16.exe</CC16>
+    <LINK16>PATH ; &amp; $(BUILDDIR)\link16.exe</LINK16>
+    <CC>$(BUILDDIR)\cl.exe /D_CRT_SECURE_NO_DEPRECATE</CC>
+    <AS>$(BUILDDIR)\ml.exe</AS>
+    <SDIZEPDB>$(BUILDDIR)\sdizepdb.exe</SDIZEPDB>
+    <PATH>$(SINGULARITY_PATH)</PATH>
+    <LIBDIR>..\..\windows\lib\</LIBDIR>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(Machine)'=='x86'">
+      <PropertyGroup>
+        <UNDUMP>undump</UNDUMP>
+        <UNDUMP_CL>$(CC)</UNDUMP_CL>
+        <UNDUMP_FLAGS>$(LINKFLAGS)</UNDUMP_FLAGS>
+      </PropertyGroup>
+      <ItemGroup>
+        <UndumpSource Include="undump.cpp"/>
+      </ItemGroup>
+      <ItemGroup>
+        <UndumpIncludes Include="$(BOOTDIR)\halclass.h"/>
+        <UndumpIncludes Include="include\minidump.h"/>
+        <UndumpIncludes Include="include\winctx.h"/>
+        <UndumpIncludes Include="include\printf.cpp"/>
+        <UndumpIncludes Include="debug.cpp"/>
+      </ItemGroup>
+    </When>
+  </Choose>
+
+  <PropertyGroup>
+    <MLINKFLAGS>/NOD /STACK:0x8000 /ONERROR:NOEXE /FAR /PACKC /NOLOGO</MLINKFLAGS>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(SINGULARITY_MP)'=='true'">
+    <ASM_FLAGS>$(ASM_FLAGS) /DSINGULARITY_MP=1</ASM_FLAGS>
+    <CC_FLAGS>$(CC_FLAGS) /DSINGULARITY_MP=1</CC_FLAGS>
+  </PropertyGroup>
+
+  <Target Name="Build"
+          DependsOnTargets="LinkSingldr;CopySingldr"/>
+
+  <Target Name="Clean">
+    <Delete Files="$(BOOTDIR)\undump.exe;$(BOOTDIR)\undump.lst;$(BOOTDIR)\undump.map;$(BOOTDIR)\undump.pdb;$(BOOTDIR)\%(UndumpSource.filename).obj"/>
+  </Target>
+
+  <PropertyGroup>
+    <CC16FLAGS>/nologo /c /AT /G3 /Gs /Gd /Gf /Gy /W4 /WX</CC16FLAGS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <OBJ Include="$(BOOTDIR)\singldr0.obj"/>
+    <OBJ Include="$(BOOTDIR)\singldr.obj"/>
+    <OBJ Include="$(BOOTDIR)\pxe.obj"/>
+    <OBJ Include="$(BOOTDIR)\jolietdevice.obj"/>
+    <OBJ Include="$(BOOTDIR)\fatdevice.obj"/>
+    <OBJ Include="$(BOOTDIR)\usbdevice.obj"/>
+    <OBJ Include="$(BOOTDIR)\fnames.obj"/>
+    <OBJ Include="$(BOOTDIR)\inifile.obj"/>
+    <OBJ Include="$(BOOTDIR)\ulrem.obj"/>
+    <OBJ Include="$(BOOTDIR)\uldiv.obj"/>
+    <OBJ Include="$(BOOTDIR)\lmul.obj"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <CppSource16 Include="FatDevice.cpp">
+      <Dependencies>..\Include\printf.cpp;debug.cpp;debug.h;fatdevice.h;fnames.h;fnames.cpp;bootdevice.h</Dependencies>
+    </CppSource16>
+
+    <CppSource16 Include="jolietdevice.cpp">
+      <Dependencies>..\Include\printf.cpp;debug.cpp;debug.h;jolietdevice.h;fnames.h;fnames.cpp;bootdevice.h</Dependencies>
+    </CppSource16>
+
+    <CppSource16 Include="usbdevice.cpp">
+      <Dependencies>..\Include\printf.cpp;debug.cpp;debug.h;usbdevice.h;fnames.h;fnames.cpp;bootdevice.h</Dependencies>
+    </CppSource16>
+
+    <CppSource16 Include="inifile.cpp">
+      <Dependencies>inifile.h</Dependencies>
+    </CppSource16>
+
+    <CppSource16 Include="fnames.cpp">
+      <Dependencies>fnames.h</Dependencies>
+    </CppSource16>
+
+    <CppSource16 Include="pxe.cpp">
+      <Dependencies>..\Include\printf.cpp;debug.cpp;debug.h;pxe.h;fnames.h;fnames.cpp;bootdevice.h</Dependencies>
+    </CppSource16>
+
+    <CppSource16 Include="$(BOOTDIR)\singldr.cpp">
+      <Dependencies></Dependencies>
+    </CppSource16>
+
+  </ItemGroup>
+
+  <ItemGroup>
+    <SourceFilesToCopy Include="@(CppSource16)"/>
+    <SourceFilesToCopy Include="$(SINGULARITY_ROOT)\Boot\Include\*.*"/>
+    <SourceFilesToCopy Include="$(KERNEL_NATIVE_DIR)\halclass.h"/>
+    <SourceFilesToCopy Include="$(KERNEL_NATIVE_DIR)\halclass.inc"/>
+    <SourceFilesToCopy Include="*.h"/>
+    <SourceFilesToCopy Include="*.inc"/>
+  </ItemGroup>
+
+  <Target Name="CreateItems">
+    <CreateItem Include="$(BOOTDIR)\%(CppSource16.filename).obj">
+      <Output TaskParameter="Include" ItemName="__singldr_objs"/>
+    </CreateItem>
+    <CreateItem Include="$(BOOTDIR)\%(AssemblySource16.filename).obj">
+      <Output TaskParameter="Include" ItemName="__singldr_objs"/>
+    </CreateItem>
+    <CreateItem Include="$(BOOTDIR)\%(UndumpSource.filename).obj">
+      <Output TaskParameter="Include" ItemName="__undump_obj"/>
+    </CreateItem>
+  </Target>
+
+  <ItemGroup>
+    <__singldr_objs Include="$(BOOTDIR)\singldr0.obj"/>
+  </ItemGroup>
+
+  <Target Name="CopySourceFilesForCL16"
+          Inputs="@(SourceFilesToCopy)"
+          Outputs="$(BOOTDIR)\%(SourceFilesToCopy.filename)%(SourceFilesToCopy.extension)">
+    <Copy SourceFiles="@(SourceFilesToCopy)" DestinationFolder="$(BOOTDIR)" SkipUnchangedFiles="true"/>
+  </Target>
+
+  <Target Name="CompileCppSource16"
+          Inputs="%(CppSource16.identity);%(CppSource16.Dependencies)"
+          Outputs="$(BOOTDIR)\%(CppSource16.filename).obj"
+          DependsOnTargets="BuildHalclass;PreprocessSingldrCpp;CopySourceFilesForCL16">
+    <!--
+    CL16 is sensitive to long paths.  It will fail with the
+    cryptic message "Out of memory" if it isn't happy with the
+    path lengths.  To work around this, we copy the source code
+    to the object directory, trim the PATH to the smallest set
+    that we need, and invoke CL16 in the object directory.
+    -->
+    <Exec WorkingDirectory="$(BOOTDIR)"
+      Command="$(CC16) $(CC16FLAGS) /DSINGULARITY_LOADER /Fo%(CppSource16.filename).obj /Fa%(CppSource16.filename).lst /I. %(CppSource16.filename)%(CppSource16.extension)"/>
+  </Target>
+
+  <ItemGroup>
+    <Singldr16Sources Include="singldr.cpp;..\Include\printf.cpp;debug.cpp;debug.h;pxe.h;singldr.h;fatdevice.h;jolietdevice.h;fnames.h;usbdevice.h;bootdevice.h;$(KERNEL_NATIVE_DIR)\halclass.h"/>
+  </ItemGroup>
+
+  <Target Name="PreprocessSingldrCpp"
+          Inputs="@(Singldr16Sources)"
+          Outputs="$(BOOTDIR)\singldr.cpp"
+          DependsOnTargets="BuildHalclass">
+    <Message Text="Preprocessing singldr.cpp using 32-bit C++ compiler"/>
+    <Exec Command="$(CC) $(CC_FLAGS) /DSINGULARITY_LOADER /nologo /E /I..\include /I$(KERNEL_NATIVE_DIR) singldr.cpp &gt; $(BOOTDIR)\singldr.cpp"/>
+  </Target>
+
+
+  <Target Name="CompileSingldr0"
+          Inputs="singldr0.asm;$(BOOTDIR)\undump.asb;$(KERNEL_NATIVE_DIR)\halclass.inc"
+          Outputs="$(BOOTDIR)\singldr0.obj"
+          DependsOnTargets="CreateDirs;BuildHalclass;CreateUndumpAsb">
+    <Exec Command="$(AS) $(ASM_FLAGS) /DSINGULARITY_LOADER /nologo /c /omf /Cp /AT /I$(BOOTDIR) /I$(KERNEL_NATIVE_DIR) /Fl$(BOOTDIR)\singldr0.lst /Fo$(BOOTDIR)\singldr0.obj singldr0.asm"/>
+  </Target>
+
+  <ItemGroup>
+    <AssemblySource16 Include="ulrem.asm"/>
+    <AssemblySource16 Include="lmul.asm"/>
+    <AssemblySource16 Include="uldiv.asm"/>
+  </ItemGroup>
+
+  <Target Name="CompileAssemblySource16"
+          Inputs="@(AssemblySource16)"
+          Outputs="$(BOOTDIR)\%(AssemblySource16.filename).obj"
+          DependsOnTargets="CreateDirs"
+          >
+    <Exec Command="$(AS) /nologo /c /omf /AT /Fo$(BOOTDIR)\%(AssemblySource16.filename).obj %(AssemblySource16.identity)"/>
+  </Target>
+
+
+  <Target Name="CreateDirs">
+    <MakeDir Directories="$(BOOTDIR)"/>
+  </Target>
+
+  <!-- ============================ UNDUMP =============================================== -->
+
+  <Target Name="CompileUndumpSources"
+          Inputs="@(UndumpSource);@(UndumpIncludes)"
+          Outputs="$(BOOTDIR)\%(UndumpSource.filename).obj"
+          DependsOnTargets="CreateDirs;BuildHalclass">
+
+    <Exec Condition="'%(UndumpSource.extension)' == '.cpp'"
+          Command="$(UNDUMP_CL) $(CC_FLAGS) /nologo /c /Oxs /Oi /GFy /Gd /Gy /W3 /Zi /Zl /GS- /I..\include /I$(KERNEL_NATIVE_DIR) /FAsc /Fa$(BOOTDIR)\undump.lst /Fd$(BOOTDIR)\undump.pdb /Fo$(BOOTDIR)\undump.obj undump.cpp"/>
+  </Target>
+
+  <Target Name="LinkUndump"
+          Outputs="$(BOOTDIR)\undump.exe"
+          Inputs="@(__undump_obj)"
+          DependsOnTargets="CreateDirs;CreateItems;CompileUndumpSources">
+    <!-- # NB Swapped /DEBUGTYPE:CV,FIXUP for $(LINKDFLAGS) which does not have FIXUP -->
+    <Message Text="UndumpSource: %(UndumpSource.identity)"/>
+    <Exec Command="$(LINK) /machine:$(Machine) $(UNDUMP_FLAGS) /out:$(BOOTDIR)\undump.exe @(__undump_obj,' ') /pdb:$(BOOTDIR)\undump.pdb /map:$(BOOTDIR)\undump.map /driver /align:0x200 /base:0x60000 /fixed /entry:$(UNDUMP) /subsystem:native /ignore:4078 /merge:.rdata=.data /merge:.bss=.data /merge:.data=.text"/>
+    <Exec Condition="'$(EnableSdize)'=='true'"
+      ContinueOnError="true" Command="$(SDIZEPDB) /t:$(BOOTDIR)\undump.txt $(BOOTDIR)\undump.pdb"/>
+  </Target>
+
+
+  <Target Name="CreateUndumpAsb"
+          Outputs="$(BOOTDIR)\undump.asb"
+          Inputs="$(BOOTDIR)\undump.exe"
+          DependsOnTargets="LinkUndump">
+    <Exec Command="$(BUILDDIR)\mkasm $(MKASM_FLAGS) /r:undump /o:$(BOOTDIR)\undump.asb $(BOOTDIR)\undump.exe"/>
+  </Target>
+
+  <!-- ================================================================= -->
+
+
+  <Target Name="CopySingldr"
+          Outputs="$(BOOTDIR)\singldr"
+          Inputs="$(BOOTDIR)\singldr.com"
+          DependsOnTargets="CreateDirs;LinkSingldr">
+    <Copy SourceFiles="$(BOOTDIR)\singldr.com" DestinationFiles="$(BOOTDIR)\singldr" SkipUnchangedFiles="true" />
+  </Target>
+
+  <Target Name="LinkSingldr"
+          Outputs="$(BOOTDIR)\singldr.com"
+          Inputs="@(__singldr_objs)"
+          DependsOnTargets="CreateDirs;CreateItems;CompileSingldr0;CompileAssemblySource16;CompileCppSource16">
+    <!--
+    NB LINK16 refuses to handle file2s when BOOTDIR length is too long so
+    we change to the object directory before it is invoked
+    -->
+    <Exec WorkingDirectory="$(BOOTDIR)"
+      Command="$(LINK16) /nologo /tiny /batch @(__singldr_objs->'%(filename)%(extension)',' '),singldr.com,singldr.map,,$(MLINKFLAGS);"/>
+  </Target>
+
+
+  <Target Name="BuildHalclass">
+    <Message Text="Building kernel (for halclass.h)"/>
+    <MSBuild Projects="$(SINGULARITY_ROOT)\Kernel\Kernel.proj" Targets="CompileKernelObj"/>
+  </Target>
+
+</Project>
diff --git a/base/boot/Singldr/acpi/acpi.cpp b/base/boot/Singldr/acpi/acpi.cpp
new file mode 100644
index 0000000..297e371
--- /dev/null
+++ b/base/boot/Singldr/acpi/acpi.cpp
@@ -0,0 +1,3550 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//////////////////////////////////////////////////////////////////////////////
+//
+namespace ACPI
+{
+#pragma pack(push, 1)
+    struct GAS  // Generic Address Structure
+    {
+        UINT8   SpaceId;
+        UINT8   RegisterBitWidth;
+        UINT8   RegisterBitOffset;
+        UINT8   AddressSize;
+        UINT64  Address;
+
+        const char * Space()
+        {
+            static char szBuffer[4];
+
+            switch (SpaceId) {
+              case 0: return "Mem";
+              case 1: return "I/O";
+              case 2: return "PCI";
+              case 3: return "Emb";
+              case 4: return "SMB";
+              case 0x7f: return "Fix";
+              default:
+                sprintf(szBuffer, "x%02x", SpaceId);
+                return szBuffer;
+            }
+        }
+
+        const char * String()
+        {
+            static char szBuffer[8][40];
+            static int nBuffer = 0;
+
+            char *psz = szBuffer[nBuffer++];
+
+            sprintf(psz, "[%-3.3s %02x:%02x:%04x %016lx]",
+                    Space(),
+                    RegisterBitWidth,
+                    RegisterBitOffset,
+                    AddressSize,
+                    Address);
+            return psz;
+        }
+    };
+
+    struct RSDP // Root System Description Pointer
+    {
+        CHAR    Signature[8];
+        UINT8   Checksum;
+        CHAR    OemId[6];
+        UINT8   Revision;
+        UINT32  RsdtAddress;
+        UINT32  RsdtLength;
+        UINT64  XsdtAddress;
+        UINT8   ExtendedChecksum;
+        UINT8   Reserved[3];
+    };
+
+    struct SDT  // Common System Description Table Header
+    {
+        CHAR    Signature[4];
+        UINT32  Length;
+        UINT8   Revision;
+        UINT8   Checksum;
+        CHAR    OemId[6];
+        CHAR    OemTableId[8];
+        UINT32  OemRevision;
+        CHAR    CreatorId[4];
+        UINT32  CreatorRevision;
+
+        bool IsValid() const
+        {
+            UINT8 checksum = 0;
+            PUINT8 pbData = (PUINT8)this;
+            PUINT8 pbLimit = pbData + Length;
+
+            while (pbData < pbLimit) {
+                checksum += *pbData++;
+            }
+            return (checksum == 0);
+        }
+
+        void Print() const
+        {
+            printf("      %c%c%c%c %5d bytes V%d "
+                   "%c%c%c%c%c%c %c%c%c%c%c%c%c%c %4x %c%c%c%c %x %s\n",
+                   Signature[0],
+                   Signature[1],
+                   Signature[2],
+                   Signature[3],
+                   Length,
+                   Revision,
+                   OemId[0],
+                   OemId[1],
+                   OemId[2],
+                   OemId[3],
+                   OemId[4],
+                   OemId[5],
+                   OemTableId[0],
+                   OemTableId[1],
+                   OemTableId[2],
+                   OemTableId[3],
+                   OemTableId[4],
+                   OemTableId[5],
+                   OemTableId[6],
+                   OemTableId[7],
+                   OemRevision,
+                   CreatorId[0],
+                   CreatorId[1],
+                   CreatorId[2],
+                   CreatorId[3],
+                   CreatorRevision,
+                   IsValid() ? "valid" : "invalid");
+        }
+    };
+
+    struct RSDT : SDT   // Root System Description Table
+    {
+        UINT32  SdtAddress[1];
+    };
+
+    struct XSDT : SDT   // Extended System Description Table
+    {
+        UINT64  SdtAddress[1];
+    };
+
+    struct FADT : SDT   // Fixed ACPI Description Table
+    {
+        UINT32  FacsAddress;
+        UINT32  DsdtAddress;
+        UINT8   Reserved1;
+        UINT8   PreferredPowerProfile;
+        UINT16  SciInterrupt;
+        UINT32  SmiPort;
+        UINT8   SmiAcpiEnable;
+        UINT8   SmiAcpiDisable;
+        UINT8   SmiS4Bios;
+        UINT8   SmiProcStateControl;
+        UINT32  PM1aEventBlock;
+        UINT32  PM1bEventBlock;
+        UINT32  PM1aControlBlock;
+        UINT32  PM1bControlBlock;
+        UINT32  PM2ControlBlock;
+        UINT32  PMTimerBlock;
+        UINT32  GPE0Block;
+        UINT32  GPE1Block;
+        UINT8   PM1EventLength;
+        UINT8   PM1ControlLength;
+        UINT8   PM2ControlLength;
+        UINT8   PMTimerLength;
+        UINT8   GPE0Length;
+        UINT8   GPE1Length;
+        UINT8   GPE1Base;
+        UINT8   SmiCstChange;
+        UINT16  C2Milliseconds;
+        UINT16  C3Milliseconds;
+        UINT16  FlushSize;
+        UINT16  FlushStride;
+        UINT8   DutyOffset;
+        UINT8   DutyWidth;
+        UINT8   DayAlarmOffset;                         // See Section 4.7.2.4
+        UINT8   MonthAlarmOffset;
+        UINT8   CenturyOffset;
+        UINT16  IAPCBootFlags;                          // See Table 5-10
+        UINT8   Reserved2;
+        UINT32  Flags;                                  // See Table 5-9
+        GAS     ResetPort;                              // See Section 4.7.3.6
+        UINT8   ResetValue;
+        UINT8   Reserved3[3];
+    };
+
+    struct FADT3 : FADT
+    {
+        // Revision 3 or greater FADT...
+        UINT64  XFacsAddress;
+        UINT64  XDsdtAddress;
+        GAS     XPM1aEventBlock;
+        GAS     XPM1bEventBlock;
+        GAS     XPM1aControlBock;
+        GAS     XPM1bControlBock;
+        GAS     XPM2ControlBlock;
+        GAS     XPMTimerBlock;
+        GAS     XGPE0Block;
+        GAS     XGPE1Block;
+    };
+
+    struct FACS   // Firmware ACPI Control Structure
+    {
+        CHAR    Signature[4];
+        UINT32  Length;
+        UINT32  HardwareSignature;
+        UINT32  OSWakeVector;                           // NB: _far real mode address.
+        UINT32  GlobalLock;
+        UINT32  Flags;                                  // See Table 5-12.
+        UINT64  XOSWakeVector;                          // Preferred Protected Mode vector.
+        UINT8   Version;
+        UINT8   Reserved;
+    };
+
+    struct DSDT : SDT   // Differentiated System Description Table
+    {
+        UINT8   AmlCode[1];
+    };
+
+    struct SSDT : SDT   // Secondary System Description Table
+    {
+        UINT8   AmlCode[1];
+    };
+
+    struct APIC : SDT   // Multiple APIC Description Table
+    {
+        UINT32  LocalApicAddress;
+        UINT32  Flags;
+        UINT8   Structs[2];
+    };
+
+    struct APIC_PROC    // Processor Local APIC
+    {
+        UINT8   Type;   // == 0x00
+        UINT8   Length;
+        UINT8   ProcId;
+        UINT8   ApicId;
+        UINT32  Flags;
+    };
+
+    struct APIC_IO      // I/O APIC
+    {
+        UINT8   Type;   // == 0x01
+        UINT8   Length;
+        UINT8   ApicId;
+        UINT8   Reserved;
+        UINT32  Address;
+        UINT32  GlobalInterruptBase;
+    };
+
+    struct APIC_INT_OVERRIDE    // Interrupt Source Override
+    {
+        UINT8   Type;   // == 0x02
+        UINT8   Length;
+        UINT8   Bus;
+        UINT8   SrcIrq;
+        UINT32  GlobalInterrupt;
+        UINT16  Flags;
+    };
+
+    struct APIC_NMI_SOURCE      // Non-maskable Interrupt Sources
+    {
+        UINT8   Type;   // == 0x03
+        UINT8   Length;
+        UINT16  Flags;
+        UINT32  GlobalInterrupt;
+    };
+
+    struct APIC_LOCAL_NMI       // Local APIC NMI
+    {
+        UINT8   Type;   // == 0x04
+        UINT8   Length;
+        UINT8   ProcId;
+        UINT16  Flags;
+        UINT8   LocalIrq;
+    };
+
+    struct APIC_LOCAL_OVERRIDE  // Local APIC Address Override
+    {
+        UINT8   Type;   // == 0x05
+        UINT8   Length;
+        UINT16  Reserved;
+        UINT64  LocalApicAddress;
+    };
+
+    struct APIC_SIO     // I/O SAPIC
+    {
+        UINT8   Type;   // == 0x06
+        UINT8   Length;
+        UINT8   ApicId;
+        UINT8   Reserved;
+        UINT32  GlobalInterruptBase;
+        UINT64  Address;
+    };
+
+    struct APIC_SPROC   // Processor Local SAPIC
+    {
+        UINT8   Type;   // == 0x07
+        UINT8   Length;
+        UINT8   ProcId;
+        UINT8   ApicId;
+        UINT8   ApicEid;
+        UINT8   Reserved[3];
+        UINT32  Flags;
+    };
+
+    struct APIC_PMI     // Platform Interrupt Sources
+    {
+        UINT8   Type;   // == 0x08
+        UINT8   Length;
+        UINT16  Flags;
+        UINT8   InterruptType;
+        UINT8   ProcessorId;
+        UINT8   ProcessorEid;
+        UINT8   SapicVector;
+        UINT32  GlobalInterrupt;
+        UINT32  Reserved;
+    };
+
+#pragma pack(pop)
+
+#if 0
+    class Parser
+    {
+        enum Prefix {
+            NullName                = 0x00,
+        };
+
+        enum Op {
+            ZeroOp                  = 0x00,
+            OneOp                   = 0x01,
+            AliasOp                 = 0x06,
+            NameOp                  = 0x08,
+            BytePrefix              = 0x0a,
+            WordPrefix              = 0x0b,
+            DWordPrefix             = 0x0c,
+            QWordPrefix             = 0x0e,
+            StringPrefix            = 0x0d,
+            ScopeOp                 = 0x10,
+            BufferOp                = 0x11,
+            PackageOp               = 0x12,
+            VarPackageOp            = 0x13,
+            MethodOp                = 0x14,
+            DualNamePrefix          = 0x2e,
+            MultiNamePrefix         = 0x2f,
+            // 0x30-0x39 ('0'-'9')  : DigitChar
+            // 0x41-0x5a ('A'-'Z')  : LeadNameChars
+            ExtOpPrefix             = 0x5b,
+            RootChar                = '\\', // 0x5c
+            ParentPrefixChar        = '^',  // 0x5e
+            // 0x5f ('_')           : LeadNameChars
+            Local0Op                = 0x60,
+            Local1Op                = 0x61,
+            Local2Op                = 0x62,
+            Local3Op                = 0x63,
+            Local4Op                = 0x64,
+            Local5Op                = 0x65,
+            Local6Op                = 0x66,
+            Local7Op                = 0x67,
+            Arg0Op                  = 0x68,
+            Arg1Op                  = 0x69,
+            Arg2Op                  = 0x6a,
+            Arg3Op                  = 0x6b,
+            Arg4Op                  = 0x6c,
+            Arg5Op                  = 0x6d,
+            Arg6Op                  = 0x6e,
+            StoreOp                 = 0x70,
+            RefOfOp                 = 0x71,
+            AddOp                   = 0x72,
+            ConcatOp                = 0x73,
+            SubtractOp              = 0x74,
+            IncrementOp             = 0x75,
+            DecrementOp             = 0x76,
+            MultiplyOp              = 0x77,
+            DivideOp                = 0x78,
+            ShiftLeftOp             = 0x79,
+            ShiftRightOp            = 0x7a,
+            AndOp                   = 0x7b,
+            NandOp                  = 0x7c,
+            OrOp                    = 0x7d,
+            NorOp                   = 0x7e,
+            XorOp                   = 0x7f,
+            NotOp                   = 0x80,
+            FindSetLeftBitOp        = 0x81,
+            FindSetRightBitOp       = 0x82,
+            DerefOfOp               = 0x83,
+            ConcatResOp             = 0x84,
+            ModOp                   = 0x85,
+            NotifyOp                = 0x86,
+            SizeOfOp                = 0x87,
+            IndexOp                 = 0x88,
+            MatchOp                 = 0x89,
+            CreateDWordFieldOp      = 0x8a,
+            CreateWordFieldOp       = 0x8b,
+            CreateByteFieldOp       = 0x8c,
+            CreateBitFieldOp        = 0x8d,
+            ObjectTypeOp            = 0x8e,
+            CreateQWordFieldOp      = 0x8f,
+            LandOp                  = 0x90,
+            LorOp                   = 0x91,
+            LnotOp                  = 0x92,
+            LequalOp                = 0x93,
+            LgreaterOp              = 0x94,
+            LlessOp                 = 0x95,
+            ToBufferOp              = 0x96,
+            ToDecimalStringOp       = 0x97,
+            ToHexStringOp           = 0x98,
+            ToIntegerOp             = 0x99,
+            ToStringOp              = 0x9c,
+            CopyObjectOp            = 0x9d,
+            MidOp                   = 0x9E,
+            ContinueOp              = 0x9f,
+            IfOp                    = 0xa0,
+            ElseOp                  = 0xa1,
+            WhileOp                 = 0xa2,
+            NoopOp                  = 0xa3,
+            ReturnOp                = 0xa4,
+            BreakOp                 = 0xa5,
+            BreakPointOp            = 0xcc,
+            OnesOp                  = 0xff,
+        };
+
+        enum ExtOp {    // NB: little-endian (thus 0x305b is 0x5b,0x30)
+            MutexOp                 = 0x015b,   /* ExtOpPrefix 0x01 */
+            EventOp                 = 0x025b,   /* ExtOpPrefix 0x02 */
+            CondRefOfOp             = 0x125b,   /* ExtOpPrefix 0x12 */
+            CreateFieldOp           = 0x135b,   /* ExtOpPrefix 0x13 */
+            LoadTableOp             = 0x1F5b,   /* ExtOpPrefix 0x1F */
+            LoadOp                  = 0x205b,   /* ExtOpPrefix 0x20 */
+            StallOp                 = 0x215b,   /* ExtOpPrefix 0x21 */
+            SleepOp                 = 0x225b,   /* ExtOpPrefix 0x22 */
+            AcquireOp               = 0x235b,   /* ExtOpPrefix 0x23 */
+            SignalOp                = 0x245b,   /* ExtOpPrefix 0x24 */
+            WaitOp                  = 0x255b,   /* ExtOpPrefix 0x25 */
+            ResetOp                 = 0x265b,   /* ExtOpPrefix 0x26 */
+            ReleaseOp               = 0x275b,   /* ExtOpPrefix 0x27 */
+            FromBCDOp               = 0x285b,   /* ExtOpPrefix 0x28 */
+            ToBCDOp                 = 0x295b,   /* ExtOpPrefix 0x29 */
+            UnloadOp                = 0x2a5b,   /* ExtOpPrefix 0x2a */
+            RevisionOp              = 0x305b,   /* ExtOpPrefix 0x30 */
+            DebugOp                 = 0x315b,   /* ExtOpPrefix 0x31 */
+            FatalOp                 = 0x325b,   /* ExtOpPrefix 0x32 */
+            OpRegionOp              = 0x805b,   /* ExtOpPrefix 0x80 */
+            FieldOp                 = 0x815b,   /* ExtOpPrefix 0x81 */
+            DeviceOp                = 0x825b,   /* ExtOpPrefix 0x82 */
+            ProcessorOp             = 0x835b,   /* ExtOpPrefix 0x83 */
+            PowerResOp              = 0x845b,   /* ExtOpPrefix 0x84 */
+            ThermalZoneOp           = 0x855b,   /* ExtOpPrefix 0x85 */
+            IndexFieldOp            = 0x865b,   /* ExtOpPrefix 0x86 */
+            BankFieldOp             = 0x875b,   /* ExtOpPrefix 0x87 */
+            DataRegionOp            = 0x885b,   /* ExtOpPrefix 0x88 */
+        };
+
+        static Parser *s_pCurrent;
+
+        class ParseOp
+        {
+            struct ParseOpValues
+            {
+                const char *    func;
+                int             line;
+                int             depth;
+                int             offset;
+                int             retval;
+
+                ParseOpValues()
+                {
+                }
+
+                ParseOpValues(const char * _func, int _line, int _depth, int _offset)
+                {
+                    for (const char *psz = _func; *psz; psz++) {
+                        if (*psz == ':') {
+                            _func = psz + 1;
+                        }
+                    }
+                    if (_func[0] == 'P' &&
+                        _func[1] == 'a' &&
+                        _func[2] == 'r' &&
+                        _func[3] == 's' &&
+                        _func[4] == 'e' &&
+                        _func[5] != '\0') {
+                        _func += 5;
+                    }
+
+
+                    func = _func;
+                    line = _line;
+                    depth = _depth;
+                    offset = _offset;
+                    retval = -1;
+                }
+
+                void Indent(int n)
+                {
+                    if (n > 60) {
+                        n = 60;
+                    }
+                    if (n > 0) {
+                        printf("%.*s", n, " . . . . . . . . . . . . . . . . . . . . . . .");
+                    }
+                }
+
+                void PrintDeep(const char *msg = "")
+                {
+                    Indent(depth);
+                    printf(" %s %d %s\n", func, offset, msg);
+                }
+
+                void Print()
+                {
+                    printf(" > %s %d\n", func, offset);
+                }
+
+                void PrintValue(const char *label, char *value)
+                {
+                    Indent(depth);
+                    printf(" > %s=[%s]\n", label, value);
+                }
+
+                void PrintValue(const char *label, UINT32 value)
+                {
+                    Indent(depth);
+                    printf(" > %s=0x%x\n", label, value);
+                }
+
+                void PrintValue(const char *label, UINT64 value)
+                {
+                    Indent(depth);
+                    printf(" > %s=0x%lx\n", label, value);
+                }
+
+                void Return(int value)
+                {
+                    retval = value;
+                }
+            };
+
+            static ParseOpValues    s_rStack[128];
+            static int              s_nStack;
+            static ParseOpValues    s_rTrace[512];
+            static int              s_nTrace;
+
+          public:
+            ParseOp(int offset, const char *func, int line)
+            {
+                if (s_nStack >= arrayof(s_rStack) - 1) {
+                    printf("Stack Overflow (%d of %d):\n",
+                           s_nStack, arrayof(s_rStack));
+                    Parser::s_pCurrent->Error();
+                    Halt();
+                }
+                s_rStack[s_nStack] = ParseOpValues(func, line, s_nStack, offset);
+                s_rStack[s_nStack].PrintDeep();
+
+                s_rTrace[s_nTrace] = s_rStack[s_nStack];
+
+                s_nStack++;
+                s_nTrace = (s_nTrace + 1) % arrayof(s_rTrace);
+            }
+
+            ~ParseOp()
+            {
+                s_nStack--;
+                if (s_rStack[s_nStack].retval != 0) {
+                    s_rStack[s_nStack].PrintDeep(" <<GOOD>>");
+                }
+                //s_rStack[s_nStack].PrintDeep(" <Return>");
+            }
+
+            static bool Good(int offset)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = 1;
+                // s_rStack[s_nStack-1].PrintDeep(" <Good>");
+                return true;
+            }
+
+            static bool Fail(int offset)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = 0;
+                // s_rStack[s_nStack-1].PrintDeep(" <Fail>");
+                return false;
+            }
+
+            static bool Pass(int offset, bool value)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = value;
+                // s_rStack[s_nStack-1].PrintDeep(" <Fail>");
+                return value;
+            }
+
+            static void Error(int offset)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = -2;
+                // s_rStack[s_nStack-1].PrintDeep(" <Error>");
+                if (s_rStack[s_nStack-1].retval != 0) {
+                    s_rStack[s_nStack-1].PrintDeep(" <<Error>>");
+                }
+            }
+
+            static void PrintValue(const char *label, char * value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, value);
+            }
+
+            static void PrintValue(const char *label, int value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, (UINT32)value);
+            }
+
+            static void PrintValue(const char *label, UINT value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, (UINT32)value);
+            }
+
+            static void PrintValue(const char *label, UINT32 value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, value);
+            }
+
+            static void PrintValue(const char *label, UINT64 value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, value);
+            }
+
+            static void Dump()
+            {
+#if 0
+                printf("Trace:\n");
+                for (int n = 0; n < arrayof(s_rTrace); n++) {
+                    int t = (s_nTrace + n) % arrayof(s_rTrace);
+
+                    if (s_rTrace[t].func != NULL) {
+                        s_rTrace[t].PrintDeep();
+                    }
+                }
+#endif
+                printf("Stack:\n");
+                for (int n = 0; n < s_nStack; n++) {
+                    s_rStack[n].Print();
+                }
+            }
+
+        };
+
+#define PARSEOP() ParseOp _self(m_pbStream - m_pbBegin, __FUNCTION__, __LINE__)
+#define PARSEVAL(label,value) _self.PrintValue(label,value)
+#define PARSEVALX(label) _self.PrintValue(#label,label)
+#define PARSEGOOD() _self.Good(m_pbStream - m_pbBegin)
+#define PARSEFAIL() _self.Fail(m_pbStream - m_pbBegin)
+#define PARSEPASS(x) _self.Pass(m_pbStream - m_pbBegin,x)
+
+      public:
+        Parser(UINT8 *_pbStream, UINT32 _cbStream)
+        {
+            m_pbBegin = _pbStream;
+            m_pbLimit = _pbStream + _cbStream;
+            m_pbStream = _pbStream;
+            s_pCurrent = this;
+        }
+
+      private:
+        UINT8 Peek() const
+        {
+            return Peek8();
+        }
+
+        UINT8 Peek8() const
+        {
+            return (m_pbStream < m_pbLimit) ? *m_pbStream : 0;
+        }
+
+        UINT16 Peek16() const
+        {
+            return (m_pbStream + 1 <= m_pbLimit) ? *((UINT16*&)m_pbStream) : 0;
+        }
+
+        UINT8 Pop()
+        {
+            return Pop8();
+        }
+
+        UINT8 Pop8()
+        {
+            return (m_pbStream + sizeof(UINT8) <= m_pbLimit) ? *((UINT8*&)m_pbStream)++ : 0;
+        }
+
+        UINT16 Pop16()
+        {
+            return (m_pbStream + sizeof(UINT16) <= m_pbLimit) ? *((UINT16*&)m_pbStream)++ : 0;
+        }
+
+        UINT32 Pop32()
+        {
+            return (m_pbStream + sizeof(UINT32) <= m_pbLimit) ? *((UINT32*&)m_pbStream)++ : 0;
+        }
+
+        UINT64 Pop64()
+        {
+            return (m_pbStream + sizeof(UINT64) <= m_pbLimit) ? *((UINT64*&)m_pbStream)++ : 0;
+        }
+
+        bool Error()
+        {
+            printf("Parsing Error.\n");
+            Dump(m_pbStream, m_pbLimit - m_pbStream < 16 ? m_pbLimit - m_pbStream : 16);
+            ParseOp::Dump();
+            ParseOp::Error(m_pbStream - m_pbBegin);
+            Halt();
+            return false;
+        }
+
+      private:
+        UINT8 * m_pbBegin;
+        UINT8 * m_pbLimit;
+        UINT8 * m_pbStream;
+        CHAR    m_szName[256];
+        CHAR *  m_pszName;
+        UINT32  m_cbLength;
+        UINT8 * m_pbPkgLimit;
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        //////////////////////////////////////////////////////////////////////////
+        //
+        bool ParseNameSeg()
+        {
+            PARSEOP();
+
+            //NameSeg         := <LeadNameChar NameChar NameChar NameChar>
+            //                    // Notice that NameSegs shorter than 4 characters are
+            //                    // filled with trailing '_'s.
+
+            UINT8 c = Peek();
+
+            if (!(c >= 'A' && c <= 'Z') && !(c == '_')) {
+                return PARSEFAIL();
+            }
+
+            m_pszName[0] = Pop();
+            for (int i = 1; i <= 3; i++) {
+                c = Peek();
+                if (!(c >= 'A' && c <= 'Z') &&
+                    !(c >= '0' && c <= '9') &&
+                    !(c == '_')) {
+                    return PARSEFAIL();
+                }
+                m_pszName[i] = Pop();
+            }
+            m_pszName[4] = '\0';
+            // Remove trailing underscores.
+            for (int i = 3; i > 1 && m_pszName[i] == '_'; i--) {
+                m_pszName[i] = '\0';
+            }
+            while (*m_pszName != '\0') {
+                m_pszName++;
+            }
+            return PARSEGOOD();
+        }
+
+        bool CanBeNameString(UINT8 c)
+        {
+            return ((c == RootChar) ||
+                    (c == ParentPrefixChar) ||
+                    (c >= 'A' && c <= 'Z') ||
+                    (c == '_') ||
+                    (c == DualNamePrefix) ||
+                    (c == MultiNamePrefix) ||
+                    (c == '\0'));
+        }
+
+        bool ParseNameString()
+        {
+            PARSEOP();
+
+            //NameString      := <RootChar NamePath> | <PrefixPath NamePath>
+            //PrefixPath      := Nothing | <'^' PrefixPath>
+            //NamePath        := NameSeg | DualNamePath | MultiNamePath | NullName
+            //DualNamePath    := DualNamePrefix NameSeg NameSeg
+            //DualNamePrefix  := 0x2e
+            //MultiNamePath   := MultiNamePrefix SegCount NameSeg(SegCount)
+            //MultiNamePrefix := 0x2f
+            //SegCount        := ByteData
+
+            m_pszName = m_szName;
+            m_szName[0] = '0';
+
+            UINT8 c = Peek();
+
+            if (c == RootChar || c == ParentPrefixChar) {
+                *m_pszName++ = Pop();
+            }
+
+            if ((c >= 'A' && c <= 'Z') || (c == '_')) {
+                if (!ParseNameSeg()) {
+                    return Error();
+                }
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            else if (c == DualNamePrefix) {
+                Pop();
+                if (!ParseNameSeg()) {
+                    return Error();
+                }
+                *m_pszName++ = '.';
+                if (!ParseNameSeg()) {
+                    return Error();
+                }
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            else if (c == MultiNamePrefix) {
+                Pop();
+                for (c = Pop(); c > 0; c--) {
+                    if (!ParseNameSeg()) {
+                        return Error();
+                    }
+                    if (c > 0) {
+                        *m_pszName++ = '.';
+                    }
+                }
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            else if (c == '\0') {
+                Pop();
+                *m_pszName = '\0';
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParsePkgLength()
+        {
+            PARSEOP();
+
+            //PkgLength       := PkgLeadByte | <PkgLeadByte ByteData> | <PkgLeadByte ByteData ByteData> | <PkgLeadByte ByteData ByteData ByteData>
+            //PkgLeadByte     := <bit 7-6: follow ByteData count> <bit 5-4: reserved> <bit 3-0: least significant package length byte>
+            // Note: The high 2 bits of the first byte reveal how
+            //      many follow bytes are in the PkgLength. If the
+            //      PkgLength has only one byte, bit 0 through 5 are
+            //      used to encode the package length (in other words,
+            //  values 0-63).
+            //      If the package length value is more than
+            //      63, more than one byte must be used for the
+            //      encoding in which case bit 5 and 4 of the
+            //      PkgLeadByte are reserved and must be zero. If
+            //      multiple bytes encoding is used, bits 3-0 of the
+            //      PkgLeadByte become the least significant 4 bits
+            //      of the resulting package length value. The next
+            //      ByteData will become the next least significant
+            //      8 bits of the resulting value and so on.
+            m_pbPkgLimit = m_pbStream;
+            UINT8 c = Pop();
+
+            m_cbLength = 0;
+
+            if (c >= 0x00 && c <= 0x3f) {
+                m_cbLength = c;
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            else if (c >= 0x40 && c <= 0x4f) {
+                m_cbLength = (c & 0xf);
+                m_cbLength |= (Pop() << 4);
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            else if (c >= 0x80 && c <= 0x8f) {
+                m_cbLength = (c & 0xf);
+                m_cbLength |= (Pop() << 4);
+                m_cbLength |= (Pop() << 12);
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            else if (c >= 0xc0 && c <= 0xcf) {
+                m_cbLength = (c & 0xf);
+                m_cbLength |= (Pop() << 4);
+                m_cbLength |= (Pop() << 12);
+                m_cbLength |= (Pop() << 20);
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            return Error();
+        }
+
+        bool ParseSimpleName()
+        {
+            PARSEOP();
+
+            UINT8 c = Peek();
+
+            if (CanBeNameString(c)) {
+                return PARSEPASS(ParseNameString());
+            }
+
+            switch (c) {
+              case Arg0Op:
+              case Arg1Op:
+              case Arg2Op:
+              case Arg3Op:
+              case Arg4Op:
+              case Arg5Op:
+              case Arg6Op:
+                return PARSEPASS(ParseArgObj());
+
+              case Local0Op:
+              case Local1Op:
+              case Local2Op:
+              case Local3Op:
+              case Local4Op:
+              case Local5Op:
+              case Local6Op:
+              case Local7Op:
+                return PARSEPASS(ParseLocalObj());
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseSuperName()
+        {
+            PARSEOP();
+
+            // SimpleName
+            if (CanBeNameString(Peek())) {                   // Ambiguous
+                return PARSEPASS(ParseNameString());
+            }
+
+            switch (Peek()) {
+              case Arg0Op:
+              case Arg1Op:
+              case Arg2Op:
+              case Arg3Op:
+              case Arg4Op:
+              case Arg5Op:
+              case Arg6Op:
+                return PARSEPASS(ParseArgObj());
+
+              case Local0Op:
+              case Local1Op:
+              case Local2Op:
+              case Local3Op:
+              case Local4Op:
+              case Local5Op:
+              case Local6Op:
+              case Local7Op:
+                return PARSEPASS(ParseLocalObj());
+
+                // Type6Opcode
+              case RefOfOp: return PARSEPASS(ParseDefRefOf());
+              case DerefOfOp: return PARSEPASS(ParseDefDerefOf());
+              case IndexOp: return PARSEPASS(ParseDefIndex());
+
+                // DebugObj
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case DebugOp: Pop16(); return PARSEGOOD();
+                }
+                break;
+            }
+
+            // Last option of Type6Opcode
+            if (CanBeNameString(Peek())) {                   // Ambiguous
+                if (!ParseUserTermObj()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+            }
+
+            return PARSEFAIL();
+        }
+
+        bool ParseArgObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case Arg0Op:
+              case Arg1Op:
+              case Arg2Op:
+              case Arg3Op:
+              case Arg4Op:
+              case Arg5Op:
+              case Arg6Op:
+                Pop();
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseLocalObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case Local0Op:
+              case Local1Op:
+              case Local2Op:
+              case Local3Op:
+              case Local4Op:
+              case Local5Op:
+              case Local6Op:
+              case Local7Op:
+                Pop();
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseDDBHandleObject()
+        {
+            PARSEOP();
+
+            return ParseSuperName();
+        }
+
+        //////////////////////////////////////////////////////////////// Ugly!
+        //
+        bool ParseDataRefObject()   //
+        {
+            PARSEOP();
+
+            if (!ParseDataObject() &&
+                !ParseTermArg() /*ObjectReference*/ &&
+                !ParseDDBHandleObject()) {
+                return PARSEFAIL();
+            }
+            return PARSEGOOD();
+        }
+        bool ParseDataObject()   //
+        {
+            PARSEOP();
+
+            if (ParseComputationalData() ||
+                ParseDefPackage() ||
+                ParseDefVarPackage()) {
+
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseTermArg()   //
+        {
+            PARSEOP();
+
+            if (!ParseType2Opcode() &&
+                !ParseDataObject() &&
+                !ParseArgObj() &&
+                !ParseLocalObj()) {
+                return PARSEFAIL();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseUserTermObj()   //
+        {
+            PARSEOP();
+
+            // UserTermObj     := NameString TermArgList
+            if (ParseNameString()) {
+                while (ParseTermArg()) {
+                }
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParsePackageElementList(UINT8 *pbLimit)   //
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                if (!ParseDataRefObject() &&
+                    !ParseNameString()) {
+                    return Error();
+                }
+            }
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseTermList(UINT8 *pbLimit)   //
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                if (!ParseNameSpaceModifierObj() &&
+                    !ParseNamedObj() &&
+                    !ParseType1Opcode() &&
+                    !ParseType2Opcode()) {
+                    return Error();
+                }
+            }
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseObjectList(UINT8 *pbLimit)   //
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                if (!ParseNameSpaceModifierObj() &&
+                    !ParseNamedObj()) {
+                    return Error();
+                }
+            }
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+        //
+        //////////////////////////////////////////////////////////////////////
+
+        bool ParseNameSpaceModifierObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case AliasOp: return ParseDefAlias();
+              case NameOp: return ParseDefName();
+              case ScopeOp: return ParseDefScope();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseNamedObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case CreateBitFieldOp: return ParseDefCreateBitField();
+              case CreateByteFieldOp: return ParseDefCreateByteField();
+              case CreateDWordFieldOp: return ParseDefCreateDWordField();
+              case CreateQWordFieldOp: return ParseDefCreateQWordField();
+              case CreateWordFieldOp: return ParseDefCreateWordField();
+              case MethodOp: return ParseDefMethod();
+
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case BankFieldOp: return ParseDefBankField();
+                  case MutexOp: return ParseDefMutex();
+                  case CreateFieldOp: return ParseDefCreateField();
+                  case EventOp: return ParseDefEvent();
+                  case FieldOp: return ParseDefField();
+                  case OpRegionOp: return ParseDefOpRegion();
+                  case DeviceOp: return ParseDefDevice();
+                  case ProcessorOp: return ParseDefProcessor();
+                  case PowerResOp: return ParseDefPowerRes();
+                  case ThermalZoneOp: return ParseDefThermalZone();
+                  case IndexFieldOp: return ParseDefIndexField();
+                  case DataRegionOp: return ParseDefDataRegion();
+                }
+                break;
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseType1Opcode()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case BreakOp: return ParseDefBreak();
+              case BreakPointOp: return ParseDefBreakPoint();
+              case ContinueOp: return ParseDefContinue();
+              case IfOp: return ParseDefIfElse();
+              case NoopOp: return ParseDefNoop();
+              case NotifyOp: return ParseDefNotify();
+              case ReturnOp: return ParseDefReturn();
+              case WhileOp: return ParseDefWhile();
+
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case LoadOp: return ParseDefLoad();
+                  case StallOp: return ParseDefStall();
+                  case SleepOp: return ParseDefSleep();
+                  case SignalOp: return ParseDefSignal();
+                  case ResetOp: return ParseDefReset();
+                  case ReleaseOp: return ParseDefRelease();
+                  case UnloadOp: return ParseDefUnload();
+                  case FatalOp: return ParseDefFatal();
+                }
+                break;
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseString()
+        {
+            PARSEOP();
+
+            if (Peek() != StringPrefix) {
+                return PARSEFAIL();
+            }
+            Pop();
+            m_pszName = m_szName;
+            m_szName[0] = '\0';
+            while (Peek() != 0) {
+                if (Peek() >= 0x7f) {
+                    return Error();
+                }
+                *m_pszName = Pop();
+            }
+            if (Peek() != 0) {
+                return Error();
+            }
+            Pop();
+            *m_pszName = '\0';
+            PARSEVAL("string", m_szName);
+            return PARSEGOOD();
+        }
+
+        bool ParseComputationalData()
+        {
+            PARSEOP();
+
+            //ComputationalData       := ByteConst | WordConst | DwordConst | QwordConst | String | ConstObj | RevisionOp | DefBuffer
+
+            switch (Peek()) {
+              case BytePrefix: Pop(); PARSEVAL("byte", Pop8()); return PARSEGOOD();
+              case WordPrefix: Pop(); PARSEVAL("word", Pop16()); return PARSEGOOD();
+              case DWordPrefix: Pop(); PARSEVAL("dword", Pop32()); return PARSEGOOD();
+              case QWordPrefix: Pop(); PARSEVAL("qword", Pop64()); return PARSEGOOD();
+              case StringPrefix: return ParseString();
+
+                // ConstObj
+              case ZeroOp: Pop(); PARSEVAL("zero", 0); return PARSEGOOD();
+              case OneOp: Pop(); PARSEVAL("one", 1); return PARSEGOOD();
+              case OnesOp: Pop(); PARSEVAL("ones", 0xff); return PARSEGOOD();
+
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case RevisionOp: Pop16(); return PARSEGOOD();
+                }
+                break;
+
+              case BufferOp: return ParseDefBuffer();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseTermArgInteger()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgBuffer()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>Buffer
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgDataRefObject()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>DataRefObject
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgByteData()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>ByteData
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgComputationalData()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>ComputationalData
+            return PARSEGOOD();
+        }
+
+        bool ParseType2Opcode()
+        {
+            PARSEOP();
+
+            UINT8 c = Peek();
+
+            switch (c) {
+              case AddOp: return ParseDefAdd();
+              case AndOp: return ParseDefAnd();
+              case BufferOp: return ParseDefBuffer();
+              case ConcatOp: return ParseDefConcat();
+              case ConcatResOp: return ParseDefConcatRes();
+              case CopyObjectOp: return ParseDefCopyObject();
+              case DecrementOp: return ParseDefDecrement();
+              case DerefOfOp: return ParseDefDerefOf();
+              case DivideOp: return ParseDefDivide();
+              case FindSetLeftBitOp: return ParseDefFindSetLeftBit();
+              case FindSetRightBitOp: return ParseDefFindSetRightBit();
+              case IncrementOp: return ParseDefIncrement();
+              case IndexOp: return ParseDefIndex();
+              case LandOp: return ParseDefLAnd();
+              case LequalOp: return ParseDefLEqual();
+              case LgreaterOp: return ParseDefLGreater();
+              case LlessOp: return ParseDefLLess();
+              case MidOp: return ParseDefMid();
+              case LnotOp: return ParseDefLNot();
+              case LorOp: return ParseDefLOr();
+              case MatchOp: return ParseDefMatch();
+              case ModOp: return ParseDefMod();
+              case MultiplyOp: return ParseDefMultiply();
+              case NandOp: return ParseDefNAnd();
+              case NorOp: return ParseDefNOr();
+              case NotOp: return ParseDefNot();
+              case ObjectTypeOp: return ParseDefObjectType();
+              case OrOp: return ParseDefOr();
+              case PackageOp: return ParseDefPackage();
+              case VarPackageOp: return ParseDefVarPackage();
+              case RefOfOp: return ParseDefRefOf();
+              case ShiftLeftOp: return ParseDefShiftLeft();
+              case ShiftRightOp: return ParseDefShiftRight();
+              case SizeOfOp: return ParseDefSizeOf();
+              case StoreOp: return ParseDefStore();
+              case SubtractOp: return ParseDefSubtract();
+              case ToBufferOp: return ParseDefToBuffer();
+              case ToDecimalStringOp: return ParseDefToDecimalString();
+              case ToHexStringOp: return ParseDefToHexString();
+              case ToIntegerOp: return ParseDefToInteger();
+              case ToStringOp: return ParseDefToString();
+              case XorOp: return ParseDefXOr();
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case AcquireOp: return ParseDefAcquire();
+                  case CondRefOfOp: return ParseDefCondRefOf();
+                  case LoadTableOp: return ParseDefLoadTable();
+                  case WaitOp: return ParseDefWait();
+                  case FromBCDOp: return ParseDefFromBCD();
+                  case ToBCDOp: return ParseDefToBCD();
+                }
+                break;
+            }
+
+            if (CanBeNameString(c)) {
+                if (!ParseUserTermObj()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseFieldList(UINT8 *pbLimit)
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                UINT8 c = Peek();
+                switch (c) {
+                  case 0x00:
+                    if (ParseReservedField()) {
+                        continue;
+                    }
+                    break;
+                  case 0x01:
+                    if (ParseAccessField()) {
+                        continue;
+                    }
+                    break;
+                }
+
+                if ((c >= 'A' && c <= 'Z') || (c == '_')) {
+                    if (ParseNamedField()) {
+                        continue;
+                    }
+                }
+                break;
+            }
+
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+        bool ParseNamedField()
+        {
+            PARSEOP();
+
+            m_pszName = m_szName;
+            m_szName[0] = '0';
+
+            if (!ParseNameSeg()) {
+                return PARSEFAIL();
+            }
+            PARSEVAL("field", m_szName);
+
+            if (!ParsePkgLength()) {
+                return PARSEFAIL();
+            }
+            // Skip over Pkg.
+            m_pbStream = m_pbPkgLimit;
+            return PARSEGOOD();
+        }
+
+        bool ParseReservedField()
+        {
+            PARSEOP();
+
+            if (Peek() != 0x00) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParsePkgLength()) {
+                return PARSEFAIL();
+            }
+            // Skip over Pkg.
+            m_pbStream = m_pbPkgLimit;
+            return PARSEGOOD();
+        }
+
+        bool ParseAccessField()
+        {
+            PARSEOP();
+
+            if (Peek() != 0x01) {
+                return PARSEFAIL();
+            }
+            Pop();
+            UINT8 AccessType = Pop();
+            PARSEVALX(AccessType);
+            UINT8 AccessAttrib = Pop();
+            PARSEVALX(AccessAttrib);
+            return PARSEGOOD();
+        }
+
+        ////////////////////////////////////////////////// Guarded and Simple.
+        //
+        //  These functions are only called from functions that begin with
+        //  a specific Opcode (i.e. by a ParseDef* function.  They are also
+        //  deterministic and don't call conditionally any subfunctions.
+        //
+        bool ParsePredicate()
+        {
+            PARSEOP();
+
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // Predicate := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseTarget()
+        {
+            PARSEOP();
+
+            if (Peek() == NullName) {
+                Pop();
+                return PARSEGOOD();
+            }
+            if (!ParseSuperName()) {
+                return PARSEFAIL();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseOperand()
+        {
+            PARSEOP();
+
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseMutexObject() //
+        {
+            PARSEOP();
+
+            return ParseSuperName();
+        }
+
+        bool ParseEventObject() //
+        {
+            PARSEOP();
+
+            return ParseSuperName();
+        }
+
+        ///////////////////////////////////////////////////// bool ParseDef*()
+        //
+        //  These function all begin with a specific OpCode.  They are also
+        //  deterministic and don't call conditionally any subfunctions.
+        //
+        bool ParseDefAlias()
+        {
+            PARSEOP();
+
+            if (Peek() != AliasOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefName()
+        {
+            PARSEOP();
+
+            if (Peek() != NameOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseDataRefObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateDWordField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateDWordFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // ByteIndex       := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateQWordField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateQWordFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // ByteIndex       := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateWordField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateWordFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // ByteIndex       := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBreak()
+        {
+            PARSEOP();
+
+            if (Peek() != BreakOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBreakPoint()
+        {
+            PARSEOP();
+
+            if (Peek() != BreakPointOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefContinue()
+        {
+            PARSEOP();
+
+            if (Peek() != ContinueOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNoop()
+        {
+            PARSEOP();
+
+            if (Peek() != NoopOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefWhile()
+        {
+            PARSEOP();
+
+            if (Peek() != WhileOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParsePredicate()) {
+                return Error();
+            }
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefAnd()
+        {
+            PARSEOP();
+
+            if (Peek() != AndOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCopyObject()
+        {
+            PARSEOP();
+
+            if (Peek() != CopyObjectOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseSimpleName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDecrement()
+        {
+            PARSEOP();
+
+            if (Peek() != DecrementOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFindSetLeftBit()
+        {
+            PARSEOP();
+
+            if (Peek() != FindSetLeftBitOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFindSetRightBit()
+        {
+            PARSEOP();
+
+            if (Peek() != FindSetRightBitOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIncrement()
+        {
+            PARSEOP();
+
+            if (Peek() != IncrementOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLAnd()
+        {
+            PARSEOP();
+
+            if (Peek() != LandOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLEqual()
+        {
+            PARSEOP();
+
+            if (Peek() != LequalOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLGreater()
+        {
+            PARSEOP();
+
+            if (Peek() != LgreaterOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLLess()
+        {
+            PARSEOP();
+
+            if (Peek() != LlessOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLOr()
+        {
+            PARSEOP();
+
+            if (Peek() != LorOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMod()
+        {
+            PARSEOP();
+
+            if (Peek() != ModOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Dividend := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Dividend := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMultiply()
+        {
+            PARSEOP();
+
+            if (Peek() != MultiplyOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNAnd()
+        {
+            PARSEOP();
+
+            if (Peek() != NandOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNOr()
+        {
+            PARSEOP();
+
+            if (Peek() != NorOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNot()
+        {
+            PARSEOP();
+
+            if (Peek() != NotOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefObjectType()
+        {
+            PARSEOP();
+
+            if (Peek() != ObjectTypeOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefOr()
+        {
+            PARSEOP();
+
+            if (Peek() != OrOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefRefOf()
+        {
+            PARSEOP();
+
+            if (Peek() != RefOfOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefShiftRight()
+        {
+            PARSEOP();
+
+            if (Peek() != ShiftRightOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //ShiftCount := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSizeOf()
+        {
+            PARSEOP();
+
+            if (Peek() != SizeOfOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefStore()
+        {
+            PARSEOP();
+
+            if (Peek() != StoreOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSubtract()
+        {
+            PARSEOP();
+
+            if (Peek() != SubtractOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToBuffer()
+        {
+            PARSEOP();
+
+            if (Peek() != ToBufferOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToDecimalString()
+        {
+            PARSEOP();
+
+            if (Peek() != ToDecimalStringOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToHexString()
+        {
+            PARSEOP();
+
+            if (Peek() != ToHexStringOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToInteger()
+        {
+            PARSEOP();
+
+            if (Peek() != ToIntegerOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefXOr()
+        {
+            PARSEOP();
+
+            if (Peek() != XorOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDataRegion()
+        {
+            PARSEOP();
+
+            if (Peek16() != DataRegionOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDevice()
+        {
+            PARSEOP();
+
+            if (Peek16() != DeviceOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefEvent()
+        {
+            PARSEOP();
+
+            if (Peek16() != EventOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefField()
+        {
+            PARSEOP();
+
+            if (Peek16() != FieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 FieldFlags = Pop();
+            PARSEVALX(FieldFlags);
+            if (!ParseFieldList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIndexField()
+        {
+            PARSEOP();
+
+            if (Peek16() != IndexFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 FieldFlags = Pop();
+            PARSEVALX(FieldFlags);
+
+            if (!ParseFieldList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefThermalZone()
+        {
+            PARSEOP();
+
+            if (Peek16() != ThermalZoneOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLoad()
+        {
+            PARSEOP();
+
+            if (Peek16() != LoadOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseDDBHandleObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefRelease()
+        {
+            PARSEOP();
+
+            if (Peek16() != ReleaseOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseMutexObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefReset()
+        {
+            PARSEOP();
+
+            if (Peek16() != ResetOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseEventObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSignal()
+        {
+            PARSEOP();
+
+            if (Peek16() != SignalOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseEventObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefUnload()
+        {
+            PARSEOP();
+
+            if (Peek16() != UnloadOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseDDBHandleObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCondRefOf()
+        {
+            PARSEOP();
+
+            if (Peek16() != CondRefOfOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLoadTable()
+        {
+            PARSEOP();
+
+            if (Peek16() != LoadTableOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToBCD()
+        {
+            PARSEOP();
+
+            if (Peek16() != ToBCDOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefWait()
+        {
+            PARSEOP();
+
+            if (Peek16() != WaitOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseEventObject()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMutex()
+        {
+            PARSEOP();
+
+            if (Peek16() != MutexOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseNameString()) {
+                return PARSEFAIL();
+            }
+            UINT8 SyncFlags = Pop();
+            PARSEVALX(SyncFlags);
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefPowerRes()
+        {
+            PARSEOP();
+
+            if (Peek16() != PowerResOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 SystemLevel = Pop();
+            PARSEVALX(SystemLevel);
+
+            UINT16 ResourceOrder = Pop16();
+            PARSEVALX(ResourceOrder);
+
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefProcessor()
+        {
+            PARSEOP();
+
+            if (Peek16() != ProcessorOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 ProcId = Pop();
+            PARSEVALX(ProcId);
+
+            UINT32 PblkAddr = Pop32();
+            PARSEVALX(PblkAddr);
+
+            UINT32 PblkLen = Pop();
+            PARSEVALX(PblkLen);
+
+
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMethod()
+        {
+            PARSEOP();
+
+            if (Peek() != MethodOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 MethodFlags = Pop();
+            PARSEVALX(MethodFlags);
+
+
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefAcquire()
+        {
+            PARSEOP();
+
+            if (Peek16() != AcquireOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseMutexObject()) {
+                return PARSEFAIL();
+            }
+            UINT16 Timeout = Pop16();
+            PARSEVALX(Timeout);
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefPackage()
+        {
+            PARSEOP();
+
+            if (Peek() != PackageOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            UINT8 NumElements = Pop();
+            PARSEVALX(NumElements);
+
+
+            if (!ParsePackageElementList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefVarPackage()
+        {
+            PARSEOP();
+
+            if (Peek() != VarPackageOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            // TermArg=>Integer;
+
+            if (!ParsePackageElementList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateField()
+        {
+            PARSEOP();
+
+            if (Peek16() != CreateFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BitIndex := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //NumBits := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSleep()
+        {
+            PARSEOP();
+
+            if (Peek16() != SleepOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //MsecTime := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefStall()
+        {
+            PARSEOP();
+
+            if (Peek16() != StallOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgByteData()) {
+                return Error();
+            }
+            //UsecTime := TermArg=>ByteData
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFromBCD()
+        {
+            PARSEOP();
+
+            if (Peek16() != FromBCDOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BCDValue := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefShiftLeft()
+        {
+            PARSEOP();
+
+            if (Peek() != ShiftLeftOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //ShiftCount := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToString()
+        {
+            PARSEOP();
+
+            if (Peek() != ToStringOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //LengthArg := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMid()
+        {
+            PARSEOP();
+
+            if (Peek() != MidOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //MidObj := TermArg=>Buffer|String
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateBitField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateBitFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //SourceBuff := TermArg=>Buffer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BitIndex := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateByteField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateByteFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //SourceBuff := TermArg=>Buffer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //ByteIndex := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefReturn()
+        {
+            PARSEOP();
+
+            if (Peek() != ReturnOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //ArgObject := TermArg=>DataRefObject
+            return PARSEGOOD();
+        }
+
+        bool ParseDefAdd()
+        {
+            PARSEOP();
+
+            if (Peek() != AddOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Operand := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBuffer()
+        {
+            PARSEOP();
+
+            if (Peek() != BufferOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BufferSize := TermArg=>Integer
+            // Skip over data.
+            m_pbStream = pbLimit;
+            return PARSEGOOD();
+        }
+
+        bool ParseDefConcat()
+        {
+            PARSEOP();
+
+            if (Peek() != ConcatOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgComputationalData()) {
+                return Error();
+            }
+            //Data := TermArg=>ComputationalData
+            if (!ParseTermArgComputationalData()) {
+                return Error();
+            }
+            //Data := TermArg=>ComputationalData
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefConcatRes()
+        {
+            PARSEOP();
+
+            if (Peek() != ConcatResOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //BufData := TermArg=>Buffer
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //BufData := TermArg=>Buffer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDivide()
+        {
+            PARSEOP();
+
+            if (Peek() != DivideOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Dividend := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Divisor := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            // Remainder
+            if (!ParseTarget()) {
+                return Error();
+            }
+            // Quotient
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIndex()
+        {
+            PARSEOP();
+
+            if (Peek() != IndexOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //BuffPkgStrObj := TermArg=>Buffer, Package or String
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //IndexValue := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDerefOf()
+        {
+            PARSEOP();
+
+            if (Peek() != DerefOfOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //ObjReference := TermArg=>ObjectReference|String
+            return PARSEGOOD();
+        }
+
+        bool ParseDefOpRegion()
+        {
+            PARSEOP();
+
+            if (Peek16() != OpRegionOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT RegionSpace = Pop();
+            PARSEVALX(RegionSpace);
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //RegionOffset    := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //RegionLen       := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFatal()
+        {
+            PARSEOP();
+
+            if (Peek16() != FatalOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            UINT8 FatalType = Pop();
+            PARSEVALX(FatalType);
+            UINT32 FatalCode = Pop32();
+            PARSEVALX(FatalCode);
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //FatalArg        := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNotify()
+        {
+            PARSEOP();
+
+            if (Peek() != NotifyOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            //NotifyObject    := SuperName=>ThermalZone|Processor|Device
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //NotifyValue     := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMatch()
+        {
+            PARSEOP();
+
+            if (Peek() != MatchOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //SearchPkg       := TermArg=>Package
+            UINT8 MatchOpcode1 = Pop();
+            PARSEVALX(MatchOpcode1);
+            if (!ParseOperand()) {
+                return Error();
+            }
+            UINT8 MatchOpcode2 = Pop();
+            PARSEVALX(MatchOpcode2);
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //StartIndex      := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefScope()
+        {
+            PARSEOP();
+
+            if (Peek() != ScopeOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8* pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBankField()
+        {
+            PARSEOP();
+
+            if (Peek16() != BankFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            // BankValue := TermArg=>Integer
+            UINT8 FieldFlags = Pop();
+            PARSEVALX(FieldFlags);
+
+            if (!ParseFieldList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIfElse()
+        {
+            PARSEOP();
+
+            if (Peek() != IfOp) {
+                return PARSEFAIL();
+            }
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParsePredicate()) {
+                return Error();
+            }
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            ParseDefElse();
+            return PARSEGOOD();
+
+        }
+
+        bool ParseDefElse()
+        {
+            PARSEOP();
+
+            if (Peek() != ElseOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLNot()
+        {
+            PARSEOP();
+
+            if (Peek() != LnotOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            switch (Peek()) {
+              case LlessOp:
+              case LgreaterOp:
+              case LequalOp:
+                Pop();
+                if (!ParseOperand()) {
+                    return Error();
+                }
+                if (!ParseOperand()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+
+              default:
+                if (!ParseOperand()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+      public:
+        bool Parse()
+        {
+            PARSEOP();
+
+            return ParseTermList(m_pbLimit);
+        }
+    };
+
+    Parser::ParseOp::ParseOpValues Parser::ParseOp::s_rStack[128];
+    int Parser::ParseOp::s_nStack;
+    Parser::ParseOp::ParseOpValues Parser::ParseOp::s_rTrace[512];
+    int Parser::ParseOp::s_nTrace;
+    Parser *Parser::s_pCurrent = NULL;
+#endif
+}
+
+void Acpi(void * rsdp)
+{
+    ACPI::RSDP *pRsdp = (ACPI::RSDP *)rsdp;
+
+    if (pRsdp->Revision >= 2) {
+        printf("    ACPI V%d %c%c%c%c%c%c %08x(%d) %08lx\n",
+               pRsdp->Revision,
+               pRsdp->OemId[0],
+               pRsdp->OemId[1],
+               pRsdp->OemId[2],
+               pRsdp->OemId[3],
+               pRsdp->OemId[4],
+               pRsdp->OemId[5],
+               pRsdp->RsdtAddress,
+               pRsdp->RsdtLength,
+               pRsdp->XsdtAddress);
+    }
+    else {
+        printf("    ACPI V%d %c%c%c%c%c%c %08x(%d)\n",
+               pRsdp->Revision,
+               pRsdp->OemId[0],
+               pRsdp->OemId[1],
+               pRsdp->OemId[2],
+               pRsdp->OemId[3],
+               pRsdp->OemId[4],
+               pRsdp->OemId[5],
+               pRsdp->RsdtAddress,
+               pRsdp->RsdtLength);
+    }
+
+    ACPI::RSDT *pRsdt = (ACPI::RSDT *)pRsdp->RsdtAddress;
+
+    if (!pRsdt->IsValid()) {
+        Yellow();
+        printf("ACPI RSDT is invalid.\n");
+        Halt();
+    }
+
+    UINT nEntries = ((pRsdt->Length - offsetof(ACPI::RSDT, SdtAddress)) / sizeof(UINT32));
+    //ACPI::SDT **pEntries =(ACPI::SDT **)pRsdt->SdtAddress;
+    UINT32 *pEntries =(UINT32 *)pRsdt->SdtAddress;
+
+    printf("     RSDT[%u]\n", nEntries);
+    for (UINT n = 0; n < nEntries; n++) {
+//        ACPI::SDT * pTable = pEntries[n];
+        UINT32 temp = pEntries[n];
+        ACPI::SDT * pTable = (ACPI::SDT *) temp;
+
+        pTable->Print();
+
+        if (!pTable->IsValid()) {
+            continue;
+        }
+
+        if (pTable->Signature[0] == 'F' &&
+            pTable->Signature[1] == 'A' &&
+            pTable->Signature[2] == 'C' &&
+            pTable->Signature[3] == 'P') {
+
+            ACPI::FADT *pFadt = (ACPI::FADT *)pTable;
+
+            printf("       FACS: %08x, DSDT: %08x, Profile: %d (sizeof=%d)\n",
+                   pFadt->FacsAddress,
+                   pFadt->DsdtAddress,
+                   pFadt->PreferredPowerProfile,
+                   sizeof(*pFadt));
+            printf("       SCI: %04x, SMI: %08x (En %02x/Di %02x/S4 %02x/PS %02x/CS %02x)\n",
+                   pFadt->SciInterrupt,
+                   pFadt->SmiPort,
+                   pFadt->SmiAcpiEnable,
+                   pFadt->SmiAcpiDisable,
+                   pFadt->SmiS4Bios,
+                   pFadt->SmiProcStateControl,
+                   pFadt->SmiCstChange);
+            printf("       PM1 Event %08x/%08x:%02x Control %08x/%08x:%02x\n",
+                   pFadt->PM1aEventBlock,
+                   pFadt->PM1bEventBlock,
+                   pFadt->PM1EventLength,
+                   pFadt->PM1aControlBlock,
+                   pFadt->PM1bControlBlock,
+                   pFadt->PM1ControlLength);
+            printf("       PM2 Control %08x:%02x, PM Timer: %08x:%02x\n",
+                   pFadt->PM2ControlBlock,
+                   pFadt->PM2ControlLength,
+                   pFadt->PMTimerBlock,
+                   pFadt->PMTimerLength);
+            printf("       GP0 %08x:%02x GP1 %08x:%02x:%02x\n",
+                   pFadt->GPE0Block,
+                   pFadt->GPE0Length,
+                   pFadt->GPE1Block,
+                   pFadt->GPE1Length,
+                   pFadt->GPE1Base);
+            printf("       C2: %4d, C3: %4d\n",
+                   pFadt->C2Milliseconds,
+                   pFadt->C3Milliseconds);
+            printf("       Flush: Size:%d, Stride:%d,  Duty: Offset:%d, Width:%d\n",
+                   pFadt->FlushSize,
+                   pFadt->FlushStride,
+                   pFadt->DutyOffset,
+                   pFadt->DutyWidth);
+            printf("       Alarm: Day:%d, Month:%d, Century:%d\n",
+                   pFadt->DayAlarmOffset,
+                   pFadt->MonthAlarmOffset,
+                   pFadt->CenturyOffset);
+
+            printf("       IA-PC Boot Flags: %04x", pFadt->IAPCBootFlags);
+            if (pFadt->IAPCBootFlags & 0x1) { printf(" Legacy"); }
+            if (pFadt->IAPCBootFlags & 0x2) { printf(" 8042"); }
+            printf("\n");
+
+            printf("       Flags: %08x", pFadt->Flags);
+            if (pFadt->Flags & 0x1) { printf(" WBINVD"); }
+            if (pFadt->Flags & 0x2) { printf(" Flush"); }
+            if (pFadt->Flags & 0x4) { printf(" C1"); }
+            if (pFadt->Flags & 0x8) { printf(" MP"); }
+            if (pFadt->Flags & 0x10) { printf(" noPower"); }
+            if (pFadt->Flags & 0x20) { printf(" noSleep"); }
+            if (pFadt->Flags & 0x40) { printf(" noRTC"); }
+            if (pFadt->Flags & 0x80) { printf(" S4"); }
+            if (pFadt->Flags & 0x100) { printf(" T32"); }
+            if (pFadt->Flags & 0x200) { printf(" Dock"); }
+            if (pFadt->Flags & 0x400) { printf(" Reset"); }
+            if (pFadt->Flags & 0x800) { printf(" Sealed"); }
+            if (pFadt->Flags & 0x1000) { printf(" Headless"); }
+            if (pFadt->Flags & 0x2000) { printf(" SwSlp"); }
+            printf("\n");
+
+            printf("       Reset: %s, Value:%d\n",
+                   pFadt->ResetPort.String(),
+                   pFadt->ResetValue);
+
+            ACPI::FACS * pFacs = (ACPI::FACS *)pFadt->FacsAddress;
+            if (pFacs != NULL) {
+                printf("       FACS: %c%c%c%c %4d bytes, V%d\n",
+                       pFacs->Signature[0],
+                       pFacs->Signature[1],
+                       pFacs->Signature[2],
+                       pFacs->Signature[3],
+                       pFacs->Length,
+                       pFacs->Version);
+                printf("        HwSign: %08x, Lock: %08x\n",
+                       pFacs->HardwareSignature,
+                       pFacs->GlobalLock);
+                printf("        OsWake: %08x, XWake: %016lx\n",
+                       pFacs->OSWakeVector,
+                       pFacs->XOSWakeVector);
+
+                printf("        Flags: %08x", pFacs->Flags);
+                if (pFacs->Flags & 0x01) { printf("S4"); }
+                printf("\n");
+            }
+
+            ACPI::DSDT * pDsdt = (ACPI::DSDT *)pFadt->DsdtAddress;
+            if (pDsdt != NULL) {
+                pDsdt->Print();
+
+                PUINT8 pbData = pDsdt->AmlCode;
+                UINT cbData = pDsdt->Length - offsetof(ACPI::DSDT, AmlCode);
+
+                Dump(pbData, cbData <= 128 ? cbData : 128);
+#if 0
+                printf("----0----\n");
+                ACPI::Parser parser(pbData, cbData);
+                printf("----1----\n");
+                parser.Parse();
+                printf("----2----\n");
+#endif
+            }
+        }
+
+        if (pTable->Signature[0] == 'O' &&
+            pTable->Signature[1] == 'E' &&
+            pTable->Signature[2] == 'M' &&
+            pTable->Signature[3] == 'B') {
+        }
+
+        if (pTable->Signature[0] == 'S' &&
+            pTable->Signature[1] == 'S' &&
+            pTable->Signature[2] == 'D' &&
+            pTable->Signature[3] == 'T') {
+
+            ACPI::SSDT * pSsdt = (ACPI::SSDT *)pTable;
+            PUINT8 pbData = pSsdt->AmlCode;
+            UINT cbData = pSsdt->Length - offsetof(ACPI::SSDT, AmlCode);
+
+            Dump(pbData, cbData <= 128 ? cbData : 128);
+#if 0
+            ACPI::Parser parser(pbData, cbData);
+            parser.Parse();
+#endif
+        }
+
+        if (pTable->Signature[0] == 'A' &&
+            pTable->Signature[1] == 'P' &&
+            pTable->Signature[2] == 'I' &&
+            pTable->Signature[3] == 'C') {
+
+            ACPI::APIC * pApic = (ACPI::APIC *)pTable;
+
+            printf("      LocalApic: %08x, Flag=%08x\n",
+                   pApic->LocalApicAddress, pApic->Flags);
+
+            UINT8 * pbBegin = pApic->Structs;
+            UINT8 * pbLimit = ((UINT8 *)pApic) + pApic->Length;
+
+            for (; pbBegin < pbLimit; pbBegin += pbBegin[1]) {
+                printf("      %4d: ", pbBegin - (UINT8 *)pApic);
+                switch (pbBegin[0]) {
+                  case 0x00:
+                      {
+                          ACPI::APIC_PROC * p = (ACPI::APIC_PROC *)pbBegin;
+                          printf("Proc Proc=%02x Apic=%02x Flags=%08x\n",
+                                 p->ProcId, p->ApicId, p->Flags);
+                          break;
+                      }
+
+                  case 0x01:
+                      {
+                          ACPI::APIC_IO * p = (ACPI::APIC_IO *)pbBegin;
+                          printf("I/O  Apic=%02x Addr=%08x Glob=%08x\n",
+                                 p->ApicId, p->Address, p->GlobalInterruptBase);
+                          break;
+                      }
+
+                  case 0x02:
+                      {
+                          ACPI::APIC_INT_OVERRIDE * p = (ACPI::APIC_INT_OVERRIDE *)pbBegin;
+                          printf("Over Bus=%02x Irq=%02x Glob=%08x Flags=%04x\n",
+                                 p->Bus, p->SrcIrq, p->GlobalInterrupt, p->Flags);
+                          break;
+                      }
+
+                  case 0x03:
+                      {
+                          ACPI::APIC_NMI_SOURCE * p = (ACPI::APIC_NMI_SOURCE *)pbBegin;
+                          printf("NmiS Flags=%04x Glob=%08x\n",
+                                 p->Flags, p->GlobalInterrupt);
+                          break;
+                      }
+
+                  case 0x04:
+                      {
+                          ACPI::APIC_LOCAL_NMI * p = (ACPI::APIC_LOCAL_NMI *)pbBegin;
+                          printf("NmiL Proc=%02x Flags=%04x Irq=%02x\n",
+                                 p->ProcId, p->Flags, p->LocalIrq);
+                          break;
+                      }
+
+                  case 0x05:
+                      {
+                          ACPI::APIC_LOCAL_OVERRIDE * p = (ACPI::APIC_LOCAL_OVERRIDE *)pbBegin;
+                          printf("Over Addr=%016lx\n",
+                                 p->LocalApicAddress);
+                          break;
+                      }
+
+                  default:
+                    printf("Unknown Type: %02x\n", pbBegin[0]);
+                    break;
+                }
+            }
+        }
+    }
+}
+
+#if 0
+void main()
+{
+    ////////////////////////////////////////////////////////////// Check ACPI.
+    //
+    if (bi->AcpiRsdp32 == 0) {
+        Yellow();
+        printf("Hardware does not support ACPI.\n");
+        Halt();
+    }
+    Acpi(bi->AcpiRsdp32);
+    Halt();
+
+}
+#endif
diff --git a/base/boot/Singldr/acpi/aml.txt b/base/boot/Singldr/acpi/aml.txt
new file mode 100644
index 0000000..063292f
--- /dev/null
+++ b/base/boot/Singldr/acpi/aml.txt
@@ -0,0 +1,506 @@
+AMLCode         := DefBlockHdr TermList
+DefBlockHdr     := TableSig TableLen SpecCompliance CheckSum OemID OemTableID OemRev CreatorID CreatorRev
+
+LeadNameChar    := 'A'-'Z' | '_'
+DigitChar       := '0'-'9'
+NameChar        := DigitChar | LeadNameChar
+RootChar        := '\'
+ParentPrefixChar        := '^'
+
+'A'-'Z'         := 0x41-0x5a
+'_'             := 0x5f
+'0'-'9'         := 0x30-0x39
+'\'             := 0x5c
+'^'             := 0x5e
+
+NameSeg         := <LeadNameChar NameChar NameChar NameChar>
+                    // Notice that NameSegs shorter than 4 characters are
+                    // filled with trailing '_'s.
+NameString      := <RootChar NamePath> | <PrefixPath NamePath>
+PrefixPath      := Nothing | <'^' PrefixPath>
+NamePath        := NameSeg | DualNamePath | MultiNamePath | NullName
+
+DualNamePath    := DualNamePrefix NameSeg NameSeg
+DualNamePrefix  := 0x2e
+MultiNamePath   := MultiNamePrefix SegCount NameSeg(SegCount)
+MultiNamePrefix := 0x2f
+SegCount        := ByteData
+                    // SegCount can be from 1 to 255.
+                    // MultiNamePrefix(35) => 0x2f 0x23
+                    // and following by 35 NameSegs.
+                    // So, the total encoding length
+                    // will be 1 + 1 + 35*4 = 142.
+                    // Notice that:
+                    //   DualNamePrefix NameSeg NameSeg
+                    // has a smaller encoding than the
+                    // equivalent encoding of:
+                    //        MultiNamePrefix(2) NameSeg NameSeg
+SimpleName      := NameString | ArgObj | LocalObj
+SuperName       := SimpleName | DebugObj | Type6Opcode
+NullName        := 0x00
+Target          := SuperName | NullName
+
+ComputationalData       := ByteConst | WordConst | DwordConst | QwordConst | String | ConstObj | RevisionOp | DefBuffer
+DataObject      := ComputationalData | DefPackage | DefVarPackage
+DataRefObject   := DataObject | ObjectReference | DDBHandleObject
+
+ByteConst       := BytePrefix ByteData
+BytePrefix      := 0x0a
+WordConst       := WordPrefix WordData
+WordPrefix      := 0x0b
+DWordConst      := DWordPrefix DWordData
+DWordPrefix     := 0x0c
+QWordConst      := QWordPrefix QWordData
+QWordPrefix     := 0x0e
+
+String          := StringPrefix AsciiCharList NullChar
+StringPrefix    := 0x0d
+ConstObj        := ZeroOp | OneOp | OnesOp
+ByteList        := Nothing | <ByteData ByteList>
+ByteData        := 0x00-0xff
+WordData        := ByteData[0:7] ByteData[8:15] // 0x0000-0xffff
+DWordData       := WordData[0:15] WordData[16:31] // 0x00000000-0xffffffff
+QWordData       := DwordData[0:31] DwordData[32:63] // 0x0000000000000000-0xffffffffffffffff
+AsciiCharList   := Nothing | <AsciiChar AsciiCharList>
+AsciiChar       := 0x01-0x7f
+NullChar        := 0x00
+ZeroOp          := 0x00
+OneOp           := 0x01
+OnesOp          := 0xff
+RevisionOp      := ExtOpPrefix 0x30
+ExtOpPrefix     := 0x5b
+
+PkgLength       := PkgLeadByte | <PkgLeadByte ByteData> | <PkgLeadByte ByteData ByteData> | <PkgLeadByte ByteData ByteData ByteData>
+PkgLeadByte     := <bit 7-6: follow ByteData count> <bit 5-4: reserved> <bit 3-0: least significant package length byte>
+                    // Note: The high 2 bits of the first byte reveal how
+                    //      many follow bytes are in the PkgLength. If the
+                    //      PkgLength has only one byte, bit 0 through 5 are
+                    //      used to encode the package length (in other words,
+                    //      values 0-63).
+                    //      If the package length value is more than
+                    //      63, more than one byte must be used for the
+                    //      encoding in which case bit 5 and 4 of the
+                    //      PkgLeadByte are reserved and must be zero. If
+                    //      multiple bytes encoding is used, bits 3-0 of the
+                    //      PkgLeadByte become the least significant 4 bits
+                    //      of the resulting package length value. The next
+                    //      ByteData will become the next least significant
+                    //      8 bits of the resulting value and so on.
+
+
+TermObj         := NameSpaceModifierObj | NamedObj | Type1Opcode | Type2Opcode
+TermList       := Nothing | <TermObj TermList>
+
+TermArg         := Type2Opcode | DataObject | ArgObj | LocalObj
+UserTermObj     := NameString TermArgList
+TermArgList     := Nothing | <TermArg TermArgList>
+
+ObjectList      := Nothing | <Object ObjectList>
+Object          := NameSpaceModifierObj | NamedObj
+
+NameSpaceModifierObj    := DefAlias | DefName | DefScope
+
+DefAlias        := AliasOp NameString NameString
+AliasOp         := 0x06
+
+DefName         := NameOp NameString DataRefObject
+NameOp          := 0x08
+
+DefScope        := ScopeOp PkgLength NameString TermList
+ScopeOp         := 0x10
+
+NamedObj        := DefBankField | DefCreateBitField | DefCreateByteField | DefCreateDWordField | DefCreateField | DefCreateQWordField | DefCreateWordField | DefDataRegion | DefDevice | DefEvent | DefField | DefIndexField | DefMethod | DefMutex | DefOpRegion | DefPowerRes | DefProcessor | DefThermalZone
+
+DefBankField    := BankFieldOp PkgLength NameString NameString BankValue FieldFlags FieldList
+BankFieldOp     := ExtOpPrefix 0x87
+BankValue       := TermArg=>Integer
+FieldFlags      := ByteData
+                    // bit 0-3: AccessType
+                    //    0: AnyAcc
+                    //    1: ByteAcc
+                    //    2: WordAcc
+                    //    3: DWordAcc
+                    //    4: QWordAcc
+                    //    5: BufferAcc
+                    //    6: Reserved
+                    //        7-15: Reserved
+                    // bit 4: LockRule
+                    //    0: NoLock
+                    //    1: Lock
+                    // bit 5-6: UpdateRule
+                    //    0: Preserve
+                    //    1: WriteAsOnes
+                    //    2: WriteAsZeros
+                    // bit 7: reserved (must be 0)
+FieldList       := Nothing | <FieldElement FieldList>
+FieldElement    := NamedField | ReservedField | AccessField
+NamedField      := NameSeg PkgLength
+ReservedField   := 0x00 PkgLength
+AccessField     := 0x01 AccessType AccessAttrib
+AccessType      := ByteData
+                    // Same as AccessType bits of FieldFlags
+
+AccessAttrib    := ByteData
+                    // If AccessType is BufferAcc for the SMB OpRegion,
+                    // AccessAttrib can be one of the following values:
+                    //   0x02 - SMBQuick
+                    //   0x04 - SMBSendReceive
+                    //   0x06 - SMBByte
+                    //   0x08 - SMBWord
+                    //   0x0a - SMBBlock
+                    //   0x0c - SMBProcessCall
+                    //   0x0d - SMBBlockProcessCall
+
+DefCreateBitField       := CreateBitFieldOp SourceBuff BitIndex NameString
+CreateBitFieldOp        := 0x8d
+SourceBuff      := TermArg=>Buffer
+BitIndex        := TermArg=>Integer
+
+DefCreateByteField      := CreateByteFieldOp SourceBuff ByteIndex NameString
+CreateByteFieldOp       := 0x8c
+ByteIndex       := TermArg=>Integer
+
+DefCreateDWordField     := CreateDWordFieldOp SourceBuff ByteIndex NameString
+CreateDWordFieldOp      := 0x8a
+
+DefCreateField  := CreateFieldOp SourceBuff BitIndex NumBits NameString
+CreateFieldOp   := ExtOpPrefix 0x13
+NumBits         := TermArg=>Integer
+
+DefCreateQWordField     := CreateQWordFieldOp SourceBuff ByteIndex NameString
+CreateQWordFieldOp      := 0x8f
+
+DefCreateWordField      := CreateWordFieldOp SourceBuff ByteIndex NameString
+CreateWordFieldOp       := 0x8b
+
+DefDataRegion   := DataRegionOp NameString TermArg TermArg TermArg
+DataRegionOp    := ExtOpPrefix 0x88
+
+DefDevice       := DeviceOp PkgLength NameString ObjectList
+DeviceOp        := ExtOpPrefix 0x82
+
+DefEvent        := EventOp NameString
+EventOp         := ExtOpPrefix 0x02
+
+DefField        := FieldOp PkgLength NameString FieldFlags FieldList
+FieldOp         := ExtOpPrefix 0x81
+
+DefIndexField   := IndexFieldOp PkgLength NameString NameString FieldFlags FieldList
+IndexFieldOp    := ExtOpPrefix 0x86
+
+DefMethod       := MethodOp PkgLength NameString MethodFlags TermList
+MethodOp        := 0x14
+MethodFlags     := ByteData
+                    // bit 0-2: ArgCount (0-7)
+                    // bit 3: SerializeFlag
+                    //    0: NotSerialized
+                    //    1: Serialized
+                    // bit 4-7: SyncLevel (0x00-0x0f)
+
+DefMutex        := MutexOp NameString SyncFlags
+MutexOp         := ExtOpPrefix 0x01
+SyncFlags       := ByteData
+                    // bit 0-3: SyncLevel (0x00-0x0f)
+                    // bit 4-7: reserved (must be 0)
+
+DefOpRegion     := OpRegionOp NameString RegionSpace RegionOffset RegionLen
+OpRegionOp      := ExtOpPrefix 0x80
+RegionSpace     := ByteData
+                    // 0x00: SystemMemory
+                    // 0x01: SystemIO
+                    // 0x02: PCI_Config
+                    // 0x03: EmbeddedControl
+                    // 0x04: SMBus
+                    // 0x05: CMOS
+                    // 0x06: PciBarTarget
+                    // 0x80-0xff: user defined
+RegionOffset    := TermArg=>Integer
+RegionLen       := TermArg=>Integer
+
+DefPowerRes     := PowerResOp PkgLength NameString SystemLevel ResourceOrder ObjectList
+PowerResOp      := ExtOpPrefix 0x84
+SystemLevel     := ByteData
+ResourceOrder   := WordData
+
+DefProcessor    := ProcessorOp PkgLength NameString ProcID PblkAddr PblkLen ObjectList
+ProcessorOp     := ExtOpPrefix 0x83
+ProcID          := ByteData
+PblkAddr        := DwordData
+PblkLen         := ByteData
+
+DefThermalZone  := ThermalZoneOp PkgLength NameString ObjectList
+ThermalZoneOp   := ExtOpPrefix 0x85
+
+Type1Opcode     := DefBreak | DefBreakPoint | DefContinue | DefFatal | DefIfElse | DefLoad | DefNoop | DefNotify | DefRelease | DefReset | DefReturn | DefSignal | DefSleep | DefStall | DefUnload | DefWhile
+
+DefBreak        := BreakOp
+BreakOp         := 0xa5
+
+DefBreakPoint   := BreakPointOp
+BreakPointOp    := 0xcc
+
+DefContinue     := ContinueOp
+ContinueOp      := 0x9f
+
+DefElse         := Nothing | <ElseOp PkgLength TermList>
+ElseOp          := 0xa1
+
+DefFatal        := FatalOp FatalType FatalCode FatalArg
+FatalOp         := ExtOpPrefix 0x32
+FatalType       := ByteData
+FatalCode       := DwordData
+FatalArg        := TermArg=>Integer
+
+DefIfElse       := IfOp PkgLength Predicate TermList DefElse
+IfOp            := 0xa0
+Predicate       := TermArg=>Integer
+
+DefLoad         := LoadOp NameString DDBHandleObject
+LoadOp          := ExtOpPrefix 0x20
+DDBHandleObject := SuperName
+
+DefNoop         := NoopOp
+NoopOp          := 0xa3
+
+DefNotify       := NotifyOp NotifyObject NotifyValue
+NotifyOp        := 0x86
+NotifyObject    := SuperName=>ThermalZone|Processor|Device
+NotifyValue     := TermArg=>Integer
+
+DefRelease      := ReleaseOp MutexObject
+ReleaseOp       := ExtOpPrefix 0x27
+MutexObject     := SuperName
+
+DefReset        := ResetOp EventObject
+ResetOp         := ExtOpPrefix 0x26
+EventObject     := SuperName
+
+DefReturn       := ReturnOp ArgObject
+ReturnOp        := 0xa4
+ArgObject       := TermArg=>DataRefObject
+
+DefSignal       := SignalOp EventObject
+SignalOp        := ExtOpPrefix 0x24
+
+DefSleep        := SleepOp MsecTime
+SleepOp         := ExtOpPrefix 0x22
+MsecTime        := TermArg=>Integer
+
+DefStall        := StallOp UsecTime
+StallOp         := ExtOpPrefix 0x21
+UsecTime        := TermArg=>ByteData
+
+DefUnload       := UnloadOp DDBHandleObject
+UnloadOp        := ExtOpPrefix 0x2a
+
+DefWhile        := WhileOp PkgLength Predicate TermList
+WhileOp         := 0xa2
+
+Type2Opcode     := DefAcquire | DefAdd | DefAnd | DefBuffer | DefConcat | DefConcatRes | DefCondRefOf | DefCopyObject | DefDecrement | DefDerefOf | DefDivide | DefFindSetLeftBit | DefFindSetRightBit | DefFromBCD | DefIncrement | DefIndex | DefLAnd | DefLEqual | DefLGreater | DefLGreaterEqual | DefLLess | DefLLessEqual | DefMid | DefLNot | DefLNotEqual | DefLoadTable | DefLOr | DefMatch | DefMod | DefMultiply | DefNAnd | DefNOr | DefNot | DefObjectType | DefOr | DefPackage | DefVarPackage | DefRefOf | DefShiftLeft | DefShiftRight | DefSizeOf | DefStore | DefSubtract | DefToBCD | DefToBuffer | DefToDecimalString | DefToHexString | DefToInteger | DefToString | DefWait | DefXOr | UserTermObj
+Type6Opcode     := DefRefOf | DefDerefOf | DefIndex | UserTermObj
+
+DefAcquire      := AcquireOp MutexObject Timeout
+AcquireOp       := ExtOpPrefix 0x23
+Timeout         := WordData
+
+DefAdd          := AddOp Operand Operand Target
+AddOp           := 0x72
+Operand         := TermArg=>Integer
+
+DefAnd          := AndOp Operand Operand Target
+AndOp           := 0x7b
+
+DefBuffer       := BufferOp PkgLength BufferSize ByteList
+BufferOp        := 0x11
+BufferSize      := TermArg=>Integer
+
+DefConcat       := ConcatOp Data Data Target
+ConcatOp        := 0x73
+Data            := TermArg=>ComputationalData
+
+DefConcatRes    := ConcatResOp BufData BufData Target
+ConcatResOp     := 0x84
+BufData         := TermArg=>Buffer
+
+DefCondRefOf    := CondRefOfOp SuperName Target
+CondRefOfOp     := ExtOpPrefix 0x12
+
+DefCopyObject   := CopyObjectOp TermArg SimpleName
+CopyObjectOp    := 0x9d
+
+DefDecrement    := DecrementOp SuperName
+DecrementOp     := 0x76
+
+DefDerefOf      := DerefOfOp ObjReference
+DerefOfOp       := 0x83
+ObjReference    := TermArg=>ObjectReference|String
+                    //ObjectReference is an object produced by terms such as Index, RefOf or CondRefOf.
+
+DefDivide       := DivideOp Dividend Divisor Remainder Quotient
+DivideOp        := 0x78
+Dividend        := TermArg=>Integer
+Divisor         := TermArg=>Integer
+Remainder       := Target
+Quotient        := Target
+
+DefFindSetLeftBit       := FindSetLeftBitOp Operand Target
+FindSetLeftBitOp        := 0x81
+
+
+DefFindSetRightBit      := FindSetRightBitOp Operand Target
+FindSetRightBitOp       := 0x82
+
+DefFromBCD      := FromBCDOp BCDValue Target
+FromBCDOp       := ExtOpPrefix 0x28
+BCDValue        := TermArg=>Integer
+
+DefIncrement    := IncrementOp SuperName
+IncrementOp     := 0x75
+
+DefIndex        := IndexOp BuffPkgStrObj IndexValue Target
+IndexOp         := 0x88
+BuffPkgStrObj   := TermArg=>Buffer, Package or String
+IndexValue      := TermArg=>Integer
+
+DefLAnd         := LandOp Operand Operand
+LandOp          := 0x90
+
+DefLEqual       := LequalOp Operand Operand
+LequalOp        := 0x93
+
+DefLGreater     := LgreaterOp Operand Operand
+LgreaterOp      := 0x94
+
+DefLGreaterEqual        := LgreaterEqualOp Operand Operand
+LgreaterEqualOp := LnotOp LlessOp
+
+DefLLess        := LlessOp Operand Operand
+LlessOp         := 0x95
+
+DefLLessEqual   := LlessEqualOp Operand Operand
+LlessEqualOp    := LnotOp LgreaterOp
+
+DefLNot         := LnotOp Operand
+LnotOp          := 0x92
+
+DefLNotEqual    := LnotEqualOp Operand Operand
+LnotEqualOp     := LnotOp LequalOp
+
+DefLoadTable    := LoadTableOp TermArg TermArg TermArg TermArg TermArg TermArg
+LoadTableOp     := ExtOpPrefix 0x1F
+
+DefLOr          := LorOp Operand Operand
+LorOp           := 0x91
+
+DefMatch        := MatchOp SearchPkg MatchOpcode Operand MatchOpcode Operand StartIndex
+MatchOp         := 0x89
+SearchPkg       := TermArg=>Package
+MatchOpcode     := ByteData
+                    // 0: MTR
+                    // 1: MEQ
+                    // 2: MLE
+                    // 3: MLT
+                    // 4: MGE
+                    // 5: MGT
+
+StartIndex      := TermArg=>Integer
+
+DefMid          := MidOp MidObj TermArg TermArg Target
+MidOp           := 0x9E
+MidObj          := TermArg=>Buffer|String
+
+DefMod          := ModOp Dividend Divisor Target
+ModOp           := 0x85
+
+DefMultiply     := MultiplyOp Operand Operand Target
+MultiplyOp      := 0x77
+
+DefNAnd         := NandOp Operand Operand Target
+NandOp          := 0x7c
+
+DefNOr          := NorOp Operand Operand Target
+NorOp           := 0x7e
+
+DefNot          := NotOp Operand Target
+NotOp           := 0x80
+
+DefObjectType   := ObjectTypeOp SuperName
+ObjectTypeOp    := 0x8e
+
+DefOr           := OrOp Operand Operand Target
+OrOp            := 0x7d
+
+DefPackage      := PackageOp PkgLength NumElements PackageElementList
+PackageOp       := 0x12
+DefVarPackage   := VarPackageOp PkgLength VarNumElements PackageElementList
+VarPackageOp    := 0x13
+NumElements     := ByteData
+VarNumElements  := TermArg=>Integer
+PackageElementList      := Nothing | <PackageElement PackageElementList>
+PackageElement  := DataRefObject | NameString
+
+DefRefOf        := RefOfOp SuperName
+RefOfOp         := 0x71
+
+DefShiftLeft    := ShiftLeftOp Operand ShiftCount Target
+ShiftLeftOp     := 0x79
+ShiftCount      := TermArg=>Integer
+
+DefShiftRight   := ShiftRightOp Operand ShiftCount Target
+ShiftRightOp    := 0x7a
+
+DefSizeOf       := SizeOfOp SuperName
+SizeOfOp        := 0x87
+
+DefStore        := StoreOp TermArg SuperName
+StoreOp         := 0x70
+
+DefSubtract     := SubtractOp Operand Operand Target
+SubtractOp      := 0x74
+
+DefToBCD        := ToBCDOp Operand Target
+ToBCDOp         := ExtOpPrefix 0x29
+
+DefToBuffer     := ToBufferOp Operand Target
+ToBufferOp      := 0x96
+
+DefToDecimalString      := ToDecimalStringOp Operand Target
+ToDecimalStringOp       := 0x97
+
+DefToHexString  := ToHexStringOp Operand Target
+ToHexStringOp   := 0x98
+
+DefToInteger    := ToIntegerOp Operand Target
+ToIntegerOp     := 0x99
+
+DefToString     := ToStringOp TermArg LengthArg Target
+LengthArg       := TermArg=>Integer
+ToStringOp      := 0x9c
+
+DefWait         := WaitOp EventObject Operand
+WaitOp          := ExtOpPrefix 0x25
+
+DefXOr          := XorOp Operand Operand Target
+XorOp           := 0x7f
+
+ArgObj          := Arg0Op | Arg1Op | Arg2Op | Arg3Op | Arg4Op | Arg5Op | Arg6Op
+Arg0Op          := 0x68
+Arg1Op          := 0x69
+Arg2Op          := 0x6a
+Arg3Op          := 0x6b
+Arg4Op          := 0x6c
+Arg5Op          := 0x6d
+Arg6Op          := 0x6e
+
+LocalObj        := Local0Op | Local1Op | Local2Op | Local3Op | Local4Op | Local5Op | Local6Op | Local7Op
+Local0Op        := 0x60
+Local1Op        := 0x61
+Local2Op        := 0x62
+Local3Op        := 0x63
+Local4Op        := 0x64
+Local5Op        := 0x65
+Local6Op        := 0x66
+Local7Op        := 0x67
+
+DebugObj        := DebugOp
+DebugOp         := ExtOpPrefix 0x31
diff --git a/base/boot/Singldr/acpi/log.txt b/base/boot/Singldr/acpi/log.txt
new file mode 100644
index 0000000..8b371f1
--- /dev/null
+++ b/base/boot/Singldr/acpi/log.txt
@@ -0,0 +1,204 @@
+
+-------------------------------------------------------------------------------
+32-bit Undump [Jan  9 2004 22:34:31]
+BOOT_INFO: 00018000
+    GdtPtr              : 0001800c.0030
+    GdtNull             : 00000000.0000.00.00
+    GdtPD               : 00000000.ffff.93.cf
+    GdtPC               : 00000000.ffff.9b.cf
+    GdtRS               : 00007b00.ffff.93.0f
+    Info32              : 00018000
+    Start32             : 000095d0
+    Pdpt32              : 0001d000
+    Pdts32              : 0001e000
+    DumpAddr32          : 00110000
+    DumpSize32          : 001b1f50
+    Heap32              : 00022000
+
+        Base Address             Size Type      
+    ================ ================ ==========
+                   0            9fc00 1:RAM     
+               9fc00              400 2:Reserved
+               e0000            20000 2:Reserved
+              100000          8af0000 1:RAM     
+             8bf0000             f000 3:ACPI RAM
+             8bff000             1000 4:ACPI NVS
+            fffc0000            40000 2:Reserved
+
+CPUID: GenuineIntel Family 15, Model 2, Step 7, Brand 11
+      CFlush 64 bytes
+      Hyperthreads: 2
+    Features: L1C 
+      x87 VME PSE TSC MSR PAE CX8 SEP PGE CMOV 
+      ACPI MMX FXSR SSE SSE2 
+    Caches:
+      ITLB: 4KB and 4MB pages, 64 entries
+      DTLB: 4KB and 4MB pages, 64 entries
+      L1-D: 8KB, 4-way, 64 byte line size
+      L2  : 512KB, 8-way, 64 byte line size, 128 byte sector size
+      No L2 or, if processor contains a valid L2, no L3
+      TC  : 12K-uop, 8-way
+    Brand: Intel(R) Xeon(TM) CPU 3.06GHz
+
+    IO APIC:
+    Local APIC:
+      fee00000: ffffffff ffffffff
+      MSR[0x10] = 00000000b0903df8
+      MSR[0x17] = 0000000000000000
+      MSR[0x1b] = 0000000000000000
+
+    ACPI V0 ACPIAM 08bf0000(33)
+     RSDT[2]
+      FACP   129 bytes V2 A M I  OEMFACP  8000314 MSFT 97 valid
+       FACS: 08bff000, DSDT: 08bf0300, Profile: 0 (sizeof=132)
+       SCI: 0009, SMI: 000000b2 (En e1/Di 1e/S4 00/PS e2/CS e3)
+       PM1 Event 00000400/00000000:04 Control 00000404/00000000:02
+       PM2 Control 00000022:01, PM Timer: 00000408:04
+       GP0 0000040c:04 GP1 00000000:00:00
+       C2:  101, C3: 1001
+       Flush: Size:1024, Stride:16,  Duty: Offset:0, Width:0
+       Alarm: Day:13, Month:0, Century:0
+       IA-PC Boot Flags: 0003 Legacy 8042
+       Flags: 000010a5 WBINVD C1 noSleep S4 Headless
+       Reset: [I/O 08:00:0000 0000000000000cf9], Value:6
+       FACS: FACS   64 bytes, V1
+        HwSign: 00000000, Lock: 00000000
+        OsWake: 00000000, XWake: 0000000000000000
+        Flags: 00000000
+      DSDT  8347 bytes V1 AMIBI AMIBI002    2 INTL 2002026 valid
+        5b804249 4f53000c 64f0bf08 0aff5b81  [.BIOS..d.....[.
+        47074249 4f530153 53315f01 5353325f  G.BIOS.SS1_.SS2_
+        01535333 5f015353 345f0100 04494f53  .SS3_.SS4_...IOS
+        54105350 494f1050 4d425310 504d4c4e  T.SPIO.PMBS.PMLN
+        08534d42 5310534d 4c4e0849 4f314210  .SMBS.SMLN.IO1B.
+        494f314c 08494f32 4210494f 324c0854  IO1L.IO2B.IO2L.T
+        4f504d20 524f4d53 20415043 42204150  OPM ROMS APCB AP
+        434c104d 47314220 4d47314c 204d4732  CL.MG1B MG1L MG2
+----0----
+----1----
+ Parse 0 
+  TermList 0 
+  > limit=0x2077
+ . NameSpaceModifierObj 0 
+ . NamedObj 0 
+ .  DefOpRegion 0 
+ . . NameString 2 
+ . .  NameSeg 2 
+ . .  NameSeg 6  <<GOOD>>
+ . . > name=[BIOS]
+ . . NameString 6  <<GOOD>>
+ .  > RegionSpace=0x0
+ . . TermArgInteger 7 
+ . .  TermArg 7 
+ . . . Type2Opcode 7 
+ . . . DataObject 7 
+ . . .  ComputationalData 7 
+ . . .  > dword=0x8bff064
+ . . .  ComputationalData 12  <<GOOD>>
+ . . . DataObject 12  <<GOOD>>
+ . .  TermArg 12  <<GOOD>>
+ . . TermArgInteger 12  <<GOOD>>
+ . . TermArgInteger 12 
+ . .  TermArg 12 
+ . . . Type2Opcode 12 
+ . . . DataObject 12 
+ . . .  ComputationalData 12 
+ . . .  > byte=0xff
+ . . .  ComputationalData 14  <<GOOD>>
+ . . . DataObject 14  <<GOOD>>
+ . .  TermArg 14  <<GOOD>>
+ . . TermArgInteger 14  <<GOOD>>
+ .  DefOpRegion 14  <<GOOD>>
+ . NamedObj 0  <<GOOD>>
+ . NameSpaceModifierObj 14 
+ . NamedObj 14 
+ .  DefField 14 
+ . . PkgLength 16 
+ . . > PkgLength=0x77
+ . . > PkgLimit=0x8bf03ab
+        42494f53 01535331 5f015353 325f0153  BIOS.SS1_.SS2_.S
+        53335f01 5353345f 01000449 4f535410  S3_.SS4_...IOST.
+        5350494f 10504d42 5310504d 4c4e0853  SPIO.PMBS.PMLN.S
+        4d425310 534d4c4e 08494f31 4210494f  MBS.SMLN.IO1B.IO
+        314c0849 4f324210 494f324c 08544f50  1L.IO2B.IO2L.TOP
+        4d20524f 4d532041 50434220 4150434c  M ROMS APCB APCL
+        104d4731 42204d47 314c204d 47324220  .MG1B MG1L MG2B 
+        4d47324c 20                          MG2L                       
+ . . PkgLength 18  <<GOOD>>
+ . . NameString 18 
+ . .  NameSeg 18 
+ . .  NameSeg 22  <<GOOD>>
+ . . > name=[BIOS]
+ . . NameString 22  <<GOOD>>
+ .  > FieldFlags=0x1
+ . . FieldList 23 
+ . . > stream=0x8bf033b
+ . . > limit=0x8bf03ab
+ . .  NamedField 23 
+ . . . NameSeg 23 
+ . . . NameSeg 27  <<GOOD>>
+ . .  > field=[SS1]
+ . . . PkgLength 27 
+ . . . > PkgLength=0x1
+ . . . > PkgLimit=0x8bf0340
+ . . . PkgLength 28  <<GOOD>>
+ . .  NamedField 28  <<GOOD>>
+ . . > stream=0x8bf0340
+ . . > limit=0x8bf03ab
+ . .  NamedField 28 
+ . . . NameSeg 28 
+ . . . NameSeg 32  <<GOOD>>
+ . .  > field=[SS2]
+ . . . PkgLength 32 
+ . . . > PkgLength=0x1
+ . . . > PkgLimit=0x8bf0345
+ . . . PkgLength 33  <<GOOD>>
+ . .  NamedField 33  <<GOOD>>
+ . . > stream=0x8bf0345
+ . . > limit=0x8bf03ab
+ . .  NamedField 33 
+ . . . NameSeg 33 
+ . . . NameSeg 37  <<GOOD>>
+ . .  > field=[SS3]
+ . . . PkgLength 37 
+ . . . > PkgLength=0x1
+ . . . > PkgLimit=0x8bf034a
+ . . . PkgLength 38  <<GOOD>>
+ . .  NamedField 38  <<GOOD>>
+ . . > stream=0x8bf034a
+ . . > limit=0x8bf03ab
+ . .  NamedField 38 
+ . . . NameSeg 38 
+ . . . NameSeg 42  <<GOOD>>
+ . .  > field=[SS4]
+ . . . PkgLength 42 
+ . . . > PkgLength=0x1
+ . . . > PkgLimit=0x8bf034f
+ . . . PkgLength 43  <<GOOD>>
+ . .  NamedField 43  <<GOOD>>
+ . . > stream=0x8bf034f
+ . . > limit=0x8bf03ab
+ . .  ReservedField 43 
+ . . . PkgLength 44 
+ . . . > PkgLength=0x4
+ . . . > PkgLimit=0x8bf0354
+        494f53                               IOS                          
+ . . . PkgLength 45  <<GOOD>>
+ . .  ReservedField 48  <<GOOD>>
+ . . > stream=0x8bf0354
+ . . > limit=0x8bf03ab
+ . .  NamedField 48 
+ . . . NameSeg 48 
+ . . > leftover=0x56
+ . . > stream=0x8bf0355
+ . . > limit=0x8bf03ab
+Parsing Error.
+        10535049 4f10504d 42531050 4d4c4e08  .SPIO.PMBS.PMLN.
+Stack:
+ > Parse 0
+ > TermList 0
+ > NamedObj 14
+ > DefField 14
+ > FieldList 23
+ . . FieldList 49  <<Error>>
+Halt.
\ No newline at end of file
diff --git a/base/boot/Singldr/acpi/parser.cpp b/base/boot/Singldr/acpi/parser.cpp
new file mode 100644
index 0000000..ff2a573
--- /dev/null
+++ b/base/boot/Singldr/acpi/parser.cpp
@@ -0,0 +1,2963 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+namespace ACPI
+{
+#if 0
+    class Parser
+    {
+        enum Prefix {
+            NullName                = 0x00,
+        };
+
+        enum Op {
+            ZeroOp                  = 0x00,
+            OneOp                   = 0x01,
+            AliasOp                 = 0x06,
+            NameOp                  = 0x08,
+            BytePrefix              = 0x0a,
+            WordPrefix              = 0x0b,
+            DWordPrefix             = 0x0c,
+            QWordPrefix             = 0x0e,
+            StringPrefix            = 0x0d,
+            ScopeOp                 = 0x10,
+            BufferOp                = 0x11,
+            PackageOp               = 0x12,
+            VarPackageOp            = 0x13,
+            MethodOp                = 0x14,
+            DualNamePrefix          = 0x2e,
+            MultiNamePrefix         = 0x2f,
+            // 0x30-0x39 ('0'-'9')  : DigitChar
+            // 0x41-0x5a ('A'-'Z')  : LeadNameChars
+            ExtOpPrefix             = 0x5b,
+            RootChar                = '\\', // 0x5c
+            ParentPrefixChar        = '^',  // 0x5e
+            // 0x5f ('_')           : LeadNameChars
+            Local0Op                = 0x60,
+            Local1Op                = 0x61,
+            Local2Op                = 0x62,
+            Local3Op                = 0x63,
+            Local4Op                = 0x64,
+            Local5Op                = 0x65,
+            Local6Op                = 0x66,
+            Local7Op                = 0x67,
+            Arg0Op                  = 0x68,
+            Arg1Op                  = 0x69,
+            Arg2Op                  = 0x6a,
+            Arg3Op                  = 0x6b,
+            Arg4Op                  = 0x6c,
+            Arg5Op                  = 0x6d,
+            Arg6Op                  = 0x6e,
+            StoreOp                 = 0x70,
+            RefOfOp                 = 0x71,
+            AddOp                   = 0x72,
+            ConcatOp                = 0x73,
+            SubtractOp              = 0x74,
+            IncrementOp             = 0x75,
+            DecrementOp             = 0x76,
+            MultiplyOp              = 0x77,
+            DivideOp                = 0x78,
+            ShiftLeftOp             = 0x79,
+            ShiftRightOp            = 0x7a,
+            AndOp                   = 0x7b,
+            NandOp                  = 0x7c,
+            OrOp                    = 0x7d,
+            NorOp                   = 0x7e,
+            XorOp                   = 0x7f,
+            NotOp                   = 0x80,
+            FindSetLeftBitOp        = 0x81,
+            FindSetRightBitOp       = 0x82,
+            DerefOfOp               = 0x83,
+            ConcatResOp             = 0x84,
+            ModOp                   = 0x85,
+            NotifyOp                = 0x86,
+            SizeOfOp                = 0x87,
+            IndexOp                 = 0x88,
+            MatchOp                 = 0x89,
+            CreateDWordFieldOp      = 0x8a,
+            CreateWordFieldOp       = 0x8b,
+            CreateByteFieldOp       = 0x8c,
+            CreateBitFieldOp        = 0x8d,
+            ObjectTypeOp            = 0x8e,
+            CreateQWordFieldOp      = 0x8f,
+            LandOp                  = 0x90,
+            LorOp                   = 0x91,
+            LnotOp                  = 0x92,
+            LequalOp                = 0x93,
+            LgreaterOp              = 0x94,
+            LlessOp                 = 0x95,
+            ToBufferOp              = 0x96,
+            ToDecimalStringOp       = 0x97,
+            ToHexStringOp           = 0x98,
+            ToIntegerOp             = 0x99,
+            ToStringOp              = 0x9c,
+            CopyObjectOp            = 0x9d,
+            MidOp                   = 0x9E,
+            ContinueOp              = 0x9f,
+            IfOp                    = 0xa0,
+            ElseOp                  = 0xa1,
+            WhileOp                 = 0xa2,
+            NoopOp                  = 0xa3,
+            ReturnOp                = 0xa4,
+            BreakOp                 = 0xa5,
+            BreakPointOp            = 0xcc,
+            OnesOp                  = 0xff,
+        };
+
+        enum ExtOp {    // NB: little-endian (thus 0x305b is 0x5b,0x30)
+            MutexOp                 = 0x015b,   /* ExtOpPrefix 0x01 */
+            EventOp                 = 0x025b,   /* ExtOpPrefix 0x02 */
+            CondRefOfOp             = 0x125b,   /* ExtOpPrefix 0x12 */
+            CreateFieldOp           = 0x135b,   /* ExtOpPrefix 0x13 */
+            LoadTableOp             = 0x1F5b,   /* ExtOpPrefix 0x1F */
+            LoadOp                  = 0x205b,   /* ExtOpPrefix 0x20 */
+            StallOp                 = 0x215b,   /* ExtOpPrefix 0x21 */
+            SleepOp                 = 0x225b,   /* ExtOpPrefix 0x22 */
+            AcquireOp               = 0x235b,   /* ExtOpPrefix 0x23 */
+            SignalOp                = 0x245b,   /* ExtOpPrefix 0x24 */
+            WaitOp                  = 0x255b,   /* ExtOpPrefix 0x25 */
+            ResetOp                 = 0x265b,   /* ExtOpPrefix 0x26 */
+            ReleaseOp               = 0x275b,   /* ExtOpPrefix 0x27 */
+            FromBCDOp               = 0x285b,   /* ExtOpPrefix 0x28 */
+            ToBCDOp                 = 0x295b,   /* ExtOpPrefix 0x29 */
+            UnloadOp                = 0x2a5b,   /* ExtOpPrefix 0x2a */
+            RevisionOp              = 0x305b,   /* ExtOpPrefix 0x30 */
+            DebugOp                 = 0x315b,   /* ExtOpPrefix 0x31 */
+            FatalOp                 = 0x325b,   /* ExtOpPrefix 0x32 */
+            OpRegionOp              = 0x805b,   /* ExtOpPrefix 0x80 */
+            FieldOp                 = 0x815b,   /* ExtOpPrefix 0x81 */
+            DeviceOp                = 0x825b,   /* ExtOpPrefix 0x82 */
+            ProcessorOp             = 0x835b,   /* ExtOpPrefix 0x83 */
+            PowerResOp              = 0x845b,   /* ExtOpPrefix 0x84 */
+            ThermalZoneOp           = 0x855b,   /* ExtOpPrefix 0x85 */
+            IndexFieldOp            = 0x865b,   /* ExtOpPrefix 0x86 */
+            BankFieldOp             = 0x875b,   /* ExtOpPrefix 0x87 */
+            DataRegionOp            = 0x885b,   /* ExtOpPrefix 0x88 */
+        };
+
+        static Parser *s_pCurrent;
+
+        class ParseOp
+        {
+            struct ParseOpValues
+            {
+                const char *    func;
+                int             line;
+                int             depth;
+                int             offset;
+                int             retval;
+
+                ParseOpValues()
+                {
+                }
+
+                ParseOpValues(const char * _func, int _line, int _depth, int _offset)
+                {
+                    for (const char *psz = _func; *psz; psz++) {
+                        if (*psz == ':') {
+                            _func = psz + 1;
+                        }
+                    }
+                    if (_func[0] == 'P' &&
+                        _func[1] == 'a' &&
+                        _func[2] == 'r' &&
+                        _func[3] == 's' &&
+                        _func[4] == 'e' &&
+                        _func[5] != '\0') {
+                        _func += 5;
+                    }
+
+
+                    func = _func;
+                    line = _line;
+                    depth = _depth;
+                    offset = _offset;
+                    retval = -1;
+                }
+
+                void Indent(int n)
+                {
+                    if (n > 60) {
+                        n = 60;
+                    }
+                    if (n > 0) {
+                        printf("%.*s", n, " . . . . . . . . . . . . . . . . . . . . . . .");
+                    }
+                }
+
+                void PrintDeep(const char *msg = "")
+                {
+                    Indent(depth);
+                    printf(" %s %d %s\n", func, offset, msg);
+                }
+
+                void Print()
+                {
+                    printf(" > %s %d\n", func, offset);
+                }
+
+                void PrintValue(const char *label, char *value)
+                {
+                    Indent(depth);
+                    printf(" > %s=[%s]\n", label, value);
+                }
+
+                void PrintValue(const char *label, UINT32 value)
+                {
+                    Indent(depth);
+                    printf(" > %s=0x%x\n", label, value);
+                }
+
+                void PrintValue(const char *label, UINT64 value)
+                {
+                    Indent(depth);
+                    printf(" > %s=0x%lx\n", label, value);
+                }
+
+                void Return(int value)
+                {
+                    retval = value;
+                }
+            };
+
+            static ParseOpValues    s_rStack[128];
+            static int              s_nStack;
+            static ParseOpValues    s_rTrace[512];
+            static int              s_nTrace;
+
+          public:
+            ParseOp(int offset, const char *func, int line)
+            {
+                if (s_nStack >= arrayof(s_rStack) - 1) {
+                    printf("Stack Overflow (%d of %d):\n",
+                           s_nStack, arrayof(s_rStack));
+                    Parser::s_pCurrent->Error();
+                    Halt();
+                }
+                s_rStack[s_nStack] = ParseOpValues(func, line, s_nStack, offset);
+                s_rStack[s_nStack].PrintDeep();
+
+                s_rTrace[s_nTrace] = s_rStack[s_nStack];
+
+                s_nStack++;
+                s_nTrace = (s_nTrace + 1) % arrayof(s_rTrace);
+            }
+
+            ~ParseOp()
+            {
+                s_nStack--;
+                if (s_rStack[s_nStack].retval != 0) {
+                    s_rStack[s_nStack].PrintDeep(" <<GOOD>>");
+                }
+                //s_rStack[s_nStack].PrintDeep(" <Return>");
+            }
+
+            static bool Good(int offset)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = 1;
+                // s_rStack[s_nStack-1].PrintDeep(" <Good>");
+                return true;
+            }
+
+            static bool Fail(int offset)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = 0;
+                // s_rStack[s_nStack-1].PrintDeep(" <Fail>");
+                return false;
+            }
+
+            static bool Pass(int offset, bool value)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = value;
+                // s_rStack[s_nStack-1].PrintDeep(" <Fail>");
+                return value;
+            }
+
+            static void Error(int offset)
+            {
+                s_rStack[s_nStack-1].offset = offset;
+                s_rStack[s_nStack-1].retval = -2;
+                // s_rStack[s_nStack-1].PrintDeep(" <Error>");
+                if (s_rStack[s_nStack-1].retval != 0) {
+                    s_rStack[s_nStack-1].PrintDeep(" <<Error>>");
+                }
+            }
+
+            static void PrintValue(const char *label, char * value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, value);
+            }
+
+            static void PrintValue(const char *label, int value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, (UINT32)value);
+            }
+
+            static void PrintValue(const char *label, UINT value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, (UINT32)value);
+            }
+
+            static void PrintValue(const char *label, UINT32 value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, value);
+            }
+
+            static void PrintValue(const char *label, UINT64 value)
+            {
+                s_rStack[s_nStack-1].PrintValue(label, value);
+            }
+
+            static void Dump()
+            {
+#if 0
+                printf("Trace:\n");
+                for (int n = 0; n < arrayof(s_rTrace); n++) {
+                    int t = (s_nTrace + n) % arrayof(s_rTrace);
+
+                    if (s_rTrace[t].func != NULL) {
+                        s_rTrace[t].PrintDeep();
+                    }
+                }
+#endif
+                printf("Stack:\n");
+                for (int n = 0; n < s_nStack; n++) {
+                    s_rStack[n].Print();
+                }
+            }
+
+        };
+
+#define PARSEOP() ParseOp _self(m_pbStream - m_pbBegin, __FUNCTION__, __LINE__)
+#define PARSEVAL(label,value) _self.PrintValue(label,value)
+#define PARSEVALX(label) _self.PrintValue(#label,label)
+#define PARSEGOOD() _self.Good(m_pbStream - m_pbBegin)
+#define PARSEFAIL() _self.Fail(m_pbStream - m_pbBegin)
+#define PARSEPASS(x) _self.Pass(m_pbStream - m_pbBegin,x)
+
+      public:
+        Parser(UINT8 *_pbStream, UINT32 _cbStream)
+        {
+            m_pbBegin = _pbStream;
+            m_pbLimit = _pbStream + _cbStream;
+            m_pbStream = _pbStream;
+            s_pCurrent = this;
+        }
+
+      private:
+        UINT8 Peek() const
+        {
+            return Peek8();
+        }
+
+        UINT8 Peek8() const
+        {
+            return (m_pbStream < m_pbLimit) ? *m_pbStream : 0;
+        }
+
+        UINT16 Peek16() const
+        {
+            return (m_pbStream + 1 <= m_pbLimit) ? *((UINT16*&)m_pbStream) : 0;
+        }
+
+        UINT8 Pop()
+        {
+            return Pop8();
+        }
+
+        UINT8 Pop8()
+        {
+            return (m_pbStream + sizeof(UINT8) <= m_pbLimit) ? *((UINT8*&)m_pbStream)++ : 0;
+        }
+
+        UINT16 Pop16()
+        {
+            return (m_pbStream + sizeof(UINT16) <= m_pbLimit) ? *((UINT16*&)m_pbStream)++ : 0;
+        }
+
+        UINT32 Pop32()
+        {
+            return (m_pbStream + sizeof(UINT32) <= m_pbLimit) ? *((UINT32*&)m_pbStream)++ : 0;
+        }
+
+        UINT64 Pop64()
+        {
+            return (m_pbStream + sizeof(UINT64) <= m_pbLimit) ? *((UINT64*&)m_pbStream)++ : 0;
+        }
+
+        bool Error()
+        {
+            printf("Parsing Error.\n");
+            Dump(m_pbStream, m_pbLimit - m_pbStream < 16 ? m_pbLimit - m_pbStream : 16);
+            ParseOp::Dump();
+            ParseOp::Error(m_pbStream - m_pbBegin);
+            Halt();
+            return false;
+        }
+
+      private:
+        UINT8 * m_pbBegin;
+        UINT8 * m_pbLimit;
+        UINT8 * m_pbStream;
+        CHAR    m_szName[256];
+        CHAR *  m_pszName;
+        UINT32  m_cbLength;
+        UINT8 * m_pbPkgLimit;
+
+        //////////////////////////////////////////////////////////////////////
+        //
+
+        //////////////////////////////////////////////////////////////////////////
+        //
+        bool ParseNameSeg()
+        {
+            PARSEOP();
+
+            //NameSeg         := <LeadNameChar NameChar NameChar NameChar>
+            //                    // Notice that NameSegs shorter than 4 characters are
+            //                    // filled with trailing '_'s.
+
+            UINT8 c = Peek();
+
+            if (!(c >= 'A' && c <= 'Z') && !(c == '_')) {
+                return PARSEFAIL();
+            }
+
+            m_pszName[0] = Pop();
+            for (int i = 1; i <= 3; i++) {
+                c = Peek();
+                if (!(c >= 'A' && c <= 'Z') &&
+                    !(c >= '0' && c <= '9') &&
+                    !(c == '_')) {
+                    return PARSEFAIL();
+                }
+                m_pszName[i] = Pop();
+            }
+            m_pszName[4] = '\0';
+            // Remove trailing underscores.
+            for (int i = 3; i > 1 && m_pszName[i] == '_'; i--) {
+                m_pszName[i] = '\0';
+            }
+            while (*m_pszName != '\0') {
+                m_pszName++;
+            }
+            return PARSEGOOD();
+        }
+
+        bool CanBeNameString(UINT8 c)
+        {
+            return ((c == RootChar) ||
+                    (c == ParentPrefixChar) ||
+                    (c >= 'A' && c <= 'Z') ||
+                    (c == '_') ||
+                    (c == DualNamePrefix) ||
+                    (c == MultiNamePrefix) ||
+                    (c == '\0'));
+        }
+
+        bool ParseNameString()
+        {
+            PARSEOP();
+
+            //NameString      := <RootChar NamePath> | <PrefixPath NamePath>
+            //PrefixPath      := Nothing | <'^' PrefixPath>
+            //NamePath        := NameSeg | DualNamePath | MultiNamePath | NullName
+            //DualNamePath    := DualNamePrefix NameSeg NameSeg
+            //DualNamePrefix  := 0x2e
+            //MultiNamePath   := MultiNamePrefix SegCount NameSeg(SegCount)
+            //MultiNamePrefix := 0x2f
+            //SegCount        := ByteData
+
+            m_pszName = m_szName;
+            m_szName[0] = '0';
+
+            UINT8 c = Peek();
+
+            if (c == RootChar || c == ParentPrefixChar) {
+                *m_pszName++ = Pop();
+            }
+
+            if ((c >= 'A' && c <= 'Z') || (c == '_')) {
+                if (!ParseNameSeg()) {
+                    return Error();
+                }
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            else if (c == DualNamePrefix) {
+                Pop();
+                if (!ParseNameSeg()) {
+                    return Error();
+                }
+                *m_pszName++ = '.';
+                if (!ParseNameSeg()) {
+                    return Error();
+                }
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            else if (c == MultiNamePrefix) {
+                Pop();
+                for (c = Pop(); c > 0; c--) {
+                    if (!ParseNameSeg()) {
+                        return Error();
+                    }
+                    if (c > 0) {
+                        *m_pszName++ = '.';
+                    }
+                }
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            else if (c == '\0') {
+                Pop();
+                *m_pszName = '\0';
+                PARSEVAL("name", m_szName);
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParsePkgLength()
+        {
+            PARSEOP();
+
+            //PkgLength       := PkgLeadByte | <PkgLeadByte ByteData> | <PkgLeadByte ByteData ByteData> | <PkgLeadByte ByteData ByteData ByteData>
+            //PkgLeadByte     := <bit 7-6: follow ByteData count> <bit 5-4: reserved> <bit 3-0: least significant package length byte>
+            // Note: The high 2 bits of the first byte reveal how
+            //      many follow bytes are in the PkgLength. If the
+            //      PkgLength has only one byte, bit 0 through 5 are
+            //      used to encode the package length (in other words,
+            //  values 0-63).
+            //      If the package length value is more than
+            //      63, more than one byte must be used for the
+            //      encoding in which case bit 5 and 4 of the
+            //      PkgLeadByte are reserved and must be zero. If
+            //      multiple bytes encoding is used, bits 3-0 of the
+            //      PkgLeadByte become the least significant 4 bits
+            //      of the resulting package length value. The next
+            //      ByteData will become the next least significant
+            //      8 bits of the resulting value and so on.
+            m_pbPkgLimit = m_pbStream;
+            UINT8 c = Pop();
+
+            m_cbLength = 0;
+
+            if (c >= 0x00 && c <= 0x3f) {
+                m_cbLength = c;
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            else if (c >= 0x40 && c <= 0x4f) {
+                m_cbLength = (c & 0xf);
+                m_cbLength |= (Pop() << 4);
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            else if (c >= 0x80 && c <= 0x8f) {
+                m_cbLength = (c & 0xf);
+                m_cbLength |= (Pop() << 4);
+                m_cbLength |= (Pop() << 12);
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            else if (c >= 0xc0 && c <= 0xcf) {
+                m_cbLength = (c & 0xf);
+                m_cbLength |= (Pop() << 4);
+                m_cbLength |= (Pop() << 12);
+                m_cbLength |= (Pop() << 20);
+                m_pbPkgLimit += m_cbLength;
+                PARSEVAL("PkgLength",m_cbLength);
+                ::Dump(m_pbStream, m_pbPkgLimit, 128);
+                return PARSEGOOD();
+            }
+            return Error();
+        }
+
+        bool ParseSimpleName()
+        {
+            PARSEOP();
+
+            UINT8 c = Peek();
+
+            if (CanBeNameString(c)) {
+                return PARSEPASS(ParseNameString());
+            }
+
+            switch (c) {
+              case Arg0Op:
+              case Arg1Op:
+              case Arg2Op:
+              case Arg3Op:
+              case Arg4Op:
+              case Arg5Op:
+              case Arg6Op:
+                return PARSEPASS(ParseArgObj());
+
+              case Local0Op:
+              case Local1Op:
+              case Local2Op:
+              case Local3Op:
+              case Local4Op:
+              case Local5Op:
+              case Local6Op:
+              case Local7Op:
+                return PARSEPASS(ParseLocalObj());
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseSuperName()
+        {
+            PARSEOP();
+
+            // SimpleName
+            if (CanBeNameString(Peek())) {                   // Ambiguous
+                return PARSEPASS(ParseNameString());
+            }
+
+            switch (Peek()) {
+              case Arg0Op:
+              case Arg1Op:
+              case Arg2Op:
+              case Arg3Op:
+              case Arg4Op:
+              case Arg5Op:
+              case Arg6Op:
+                return PARSEPASS(ParseArgObj());
+
+              case Local0Op:
+              case Local1Op:
+              case Local2Op:
+              case Local3Op:
+              case Local4Op:
+              case Local5Op:
+              case Local6Op:
+              case Local7Op:
+                return PARSEPASS(ParseLocalObj());
+
+                // Type6Opcode
+              case RefOfOp: return PARSEPASS(ParseDefRefOf());
+              case DerefOfOp: return PARSEPASS(ParseDefDerefOf());
+              case IndexOp: return PARSEPASS(ParseDefIndex());
+
+                // DebugObj
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case DebugOp: Pop16(); return PARSEGOOD();
+                }
+                break;
+            }
+
+            // Last option of Type6Opcode
+            if (CanBeNameString(Peek())) {                   // Ambiguous
+                if (!ParseUserTermObj()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+            }
+
+            return PARSEFAIL();
+        }
+
+        bool ParseArgObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case Arg0Op:
+              case Arg1Op:
+              case Arg2Op:
+              case Arg3Op:
+              case Arg4Op:
+              case Arg5Op:
+              case Arg6Op:
+                Pop();
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseLocalObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case Local0Op:
+              case Local1Op:
+              case Local2Op:
+              case Local3Op:
+              case Local4Op:
+              case Local5Op:
+              case Local6Op:
+              case Local7Op:
+                Pop();
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseDDBHandleObject()
+        {
+            PARSEOP();
+
+            return ParseSuperName();
+        }
+
+        //////////////////////////////////////////////////////////////// Ugly!
+        //
+        bool ParseDataRefObject()   //
+        {
+            PARSEOP();
+
+            if (!ParseDataObject() &&
+                !ParseTermArg() /*ObjectReference*/ &&
+                !ParseDDBHandleObject()) {
+                return PARSEFAIL();
+            }
+            return PARSEGOOD();
+        }
+        bool ParseDataObject()   //
+        {
+            PARSEOP();
+
+            if (ParseComputationalData() ||
+                ParseDefPackage() ||
+                ParseDefVarPackage()) {
+
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseTermArg()   //
+        {
+            PARSEOP();
+
+            if (!ParseType2Opcode() &&
+                !ParseDataObject() &&
+                !ParseArgObj() &&
+                !ParseLocalObj()) {
+                return PARSEFAIL();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseUserTermObj()   //
+        {
+            PARSEOP();
+
+            // UserTermObj     := NameString TermArgList
+            if (ParseNameString()) {
+                while (ParseTermArg()) {
+                }
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParsePackageElementList(UINT8 *pbLimit)   //
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                if (!ParseDataRefObject() &&
+                    !ParseNameString()) {
+                    return Error();
+                }
+            }
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseTermList(UINT8 *pbLimit)   //
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                if (!ParseNameSpaceModifierObj() &&
+                    !ParseNamedObj() &&
+                    !ParseType1Opcode() &&
+                    !ParseType2Opcode()) {
+                    return Error();
+                }
+            }
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseObjectList(UINT8 *pbLimit)   //
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                if (!ParseNameSpaceModifierObj() &&
+                    !ParseNamedObj()) {
+                    return Error();
+                }
+            }
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+        //
+        //////////////////////////////////////////////////////////////////////
+
+        bool ParseNameSpaceModifierObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case AliasOp: return ParseDefAlias();
+              case NameOp: return ParseDefName();
+              case ScopeOp: return ParseDefScope();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseNamedObj()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case CreateBitFieldOp: return ParseDefCreateBitField();
+              case CreateByteFieldOp: return ParseDefCreateByteField();
+              case CreateDWordFieldOp: return ParseDefCreateDWordField();
+              case CreateQWordFieldOp: return ParseDefCreateQWordField();
+              case CreateWordFieldOp: return ParseDefCreateWordField();
+              case MethodOp: return ParseDefMethod();
+
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case BankFieldOp: return ParseDefBankField();
+                  case MutexOp: return ParseDefMutex();
+                  case CreateFieldOp: return ParseDefCreateField();
+                  case EventOp: return ParseDefEvent();
+                  case FieldOp: return ParseDefField();
+                  case OpRegionOp: return ParseDefOpRegion();
+                  case DeviceOp: return ParseDefDevice();
+                  case ProcessorOp: return ParseDefProcessor();
+                  case PowerResOp: return ParseDefPowerRes();
+                  case ThermalZoneOp: return ParseDefThermalZone();
+                  case IndexFieldOp: return ParseDefIndexField();
+                  case DataRegionOp: return ParseDefDataRegion();
+                }
+                break;
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseType1Opcode()
+        {
+            PARSEOP();
+
+            switch (Peek()) {
+              case BreakOp: return ParseDefBreak();
+              case BreakPointOp: return ParseDefBreakPoint();
+              case ContinueOp: return ParseDefContinue();
+              case IfOp: return ParseDefIfElse();
+              case NoopOp: return ParseDefNoop();
+              case NotifyOp: return ParseDefNotify();
+              case ReturnOp: return ParseDefReturn();
+              case WhileOp: return ParseDefWhile();
+
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case LoadOp: return ParseDefLoad();
+                  case StallOp: return ParseDefStall();
+                  case SleepOp: return ParseDefSleep();
+                  case SignalOp: return ParseDefSignal();
+                  case ResetOp: return ParseDefReset();
+                  case ReleaseOp: return ParseDefRelease();
+                  case UnloadOp: return ParseDefUnload();
+                  case FatalOp: return ParseDefFatal();
+                }
+                break;
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseString()
+        {
+            PARSEOP();
+
+            if (Peek() != StringPrefix) {
+                return PARSEFAIL();
+            }
+            Pop();
+            m_pszName = m_szName;
+            m_szName[0] = '\0';
+            while (Peek() != 0) {
+                if (Peek() >= 0x7f) {
+                    return Error();
+                }
+                *m_pszName = Pop();
+            }
+            if (Peek() != 0) {
+                return Error();
+            }
+            Pop();
+            *m_pszName = '\0';
+            PARSEVAL("string", m_szName);
+            return PARSEGOOD();
+        }
+
+        bool ParseComputationalData()
+        {
+            PARSEOP();
+
+            //ComputationalData       := ByteConst | WordConst | DwordConst | QwordConst | String | ConstObj | RevisionOp | DefBuffer
+
+            switch (Peek()) {
+              case BytePrefix: Pop(); PARSEVAL("byte", Pop8()); return PARSEGOOD();
+              case WordPrefix: Pop(); PARSEVAL("word", Pop16()); return PARSEGOOD();
+              case DWordPrefix: Pop(); PARSEVAL("dword", Pop32()); return PARSEGOOD();
+              case QWordPrefix: Pop(); PARSEVAL("qword", Pop64()); return PARSEGOOD();
+              case StringPrefix: return ParseString();
+
+                // ConstObj
+              case ZeroOp: Pop(); PARSEVAL("zero", 0); return PARSEGOOD();
+              case OneOp: Pop(); PARSEVAL("one", 1); return PARSEGOOD();
+              case OnesOp: Pop(); PARSEVAL("ones", 0xff); return PARSEGOOD();
+
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case RevisionOp: Pop16(); return PARSEGOOD();
+                }
+                break;
+
+              case BufferOp: return ParseDefBuffer();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseTermArgInteger()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgBuffer()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>Buffer
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgDataRefObject()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>DataRefObject
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgByteData()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>ByteData
+            return PARSEGOOD();
+        }
+
+        bool ParseTermArgComputationalData()
+        {
+            PARSEOP();
+
+            if (!ParseTermArg()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>ComputationalData
+            return PARSEGOOD();
+        }
+
+        bool ParseType2Opcode()
+        {
+            PARSEOP();
+
+            UINT8 c = Peek();
+
+            switch (c) {
+              case AddOp: return ParseDefAdd();
+              case AndOp: return ParseDefAnd();
+              case BufferOp: return ParseDefBuffer();
+              case ConcatOp: return ParseDefConcat();
+              case ConcatResOp: return ParseDefConcatRes();
+              case CopyObjectOp: return ParseDefCopyObject();
+              case DecrementOp: return ParseDefDecrement();
+              case DerefOfOp: return ParseDefDerefOf();
+              case DivideOp: return ParseDefDivide();
+              case FindSetLeftBitOp: return ParseDefFindSetLeftBit();
+              case FindSetRightBitOp: return ParseDefFindSetRightBit();
+              case IncrementOp: return ParseDefIncrement();
+              case IndexOp: return ParseDefIndex();
+              case LandOp: return ParseDefLAnd();
+              case LequalOp: return ParseDefLEqual();
+              case LgreaterOp: return ParseDefLGreater();
+              case LlessOp: return ParseDefLLess();
+              case MidOp: return ParseDefMid();
+              case LnotOp: return ParseDefLNot();
+              case LorOp: return ParseDefLOr();
+              case MatchOp: return ParseDefMatch();
+              case ModOp: return ParseDefMod();
+              case MultiplyOp: return ParseDefMultiply();
+              case NandOp: return ParseDefNAnd();
+              case NorOp: return ParseDefNOr();
+              case NotOp: return ParseDefNot();
+              case ObjectTypeOp: return ParseDefObjectType();
+              case OrOp: return ParseDefOr();
+              case PackageOp: return ParseDefPackage();
+              case VarPackageOp: return ParseDefVarPackage();
+              case RefOfOp: return ParseDefRefOf();
+              case ShiftLeftOp: return ParseDefShiftLeft();
+              case ShiftRightOp: return ParseDefShiftRight();
+              case SizeOfOp: return ParseDefSizeOf();
+              case StoreOp: return ParseDefStore();
+              case SubtractOp: return ParseDefSubtract();
+              case ToBufferOp: return ParseDefToBuffer();
+              case ToDecimalStringOp: return ParseDefToDecimalString();
+              case ToHexStringOp: return ParseDefToHexString();
+              case ToIntegerOp: return ParseDefToInteger();
+              case ToStringOp: return ParseDefToString();
+              case XorOp: return ParseDefXOr();
+              case ExtOpPrefix:
+                switch (Peek16()) {
+                  case AcquireOp: return ParseDefAcquire();
+                  case CondRefOfOp: return ParseDefCondRefOf();
+                  case LoadTableOp: return ParseDefLoadTable();
+                  case WaitOp: return ParseDefWait();
+                  case FromBCDOp: return ParseDefFromBCD();
+                  case ToBCDOp: return ParseDefToBCD();
+                }
+                break;
+            }
+
+            if (CanBeNameString(c)) {
+                if (!ParseUserTermObj()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+        bool ParseFieldList(UINT8 *pbLimit)
+        {
+            PARSEOP();
+
+            while (m_pbStream < pbLimit) {
+                UINT8 c = Peek();
+                switch (c) {
+                  case 0x00:
+                    if (ParseReservedField()) {
+                        continue;
+                    }
+                    break;
+                  case 0x01:
+                    if (ParseAccessField()) {
+                        continue;
+                    }
+                    break;
+                }
+
+                if ((c >= 'A' && c <= 'Z') || (c == '_')) {
+                    if (ParseNamedField()) {
+                        continue;
+                    }
+                }
+                break;
+            }
+
+            if (m_pbStream != pbLimit) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+        //
+        bool ParseNamedField()
+        {
+            PARSEOP();
+
+            m_pszName = m_szName;
+            m_szName[0] = '0';
+
+            if (!ParseNameSeg()) {
+                return PARSEFAIL();
+            }
+            PARSEVAL("field", m_szName);
+
+            if (!ParsePkgLength()) {
+                return PARSEFAIL();
+            }
+            // Skip over Pkg.
+            m_pbStream = m_pbPkgLimit;
+            return PARSEGOOD();
+        }
+
+        bool ParseReservedField()
+        {
+            PARSEOP();
+
+            if (Peek() != 0x00) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParsePkgLength()) {
+                return PARSEFAIL();
+            }
+            // Skip over Pkg.
+            m_pbStream = m_pbPkgLimit;
+            return PARSEGOOD();
+        }
+
+        bool ParseAccessField()
+        {
+            PARSEOP();
+
+            if (Peek() != 0x01) {
+                return PARSEFAIL();
+            }
+            Pop();
+            UINT8 AccessType = Pop();
+            PARSEVALX(AccessType);
+            UINT8 AccessAttrib = Pop();
+            PARSEVALX(AccessAttrib);
+            return PARSEGOOD();
+        }
+
+        ////////////////////////////////////////////////// Guarded and Simple.
+        //
+        //  These functions are only called from functions that begin with
+        //  a specific Opcode (i.e. by a ParseDef* function.  They are also
+        //  deterministic and don't call conditionally any subfunctions.
+        //
+        bool ParsePredicate()
+        {
+            PARSEOP();
+
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // Predicate := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseTarget()
+        {
+            PARSEOP();
+
+            if (Peek() == NullName) {
+                Pop();
+                return PARSEGOOD();
+            }
+            if (!ParseSuperName()) {
+                return PARSEFAIL();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseOperand()
+        {
+            PARSEOP();
+
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseMutexObject() //
+        {
+            PARSEOP();
+
+            return ParseSuperName();
+        }
+
+        bool ParseEventObject() //
+        {
+            PARSEOP();
+
+            return ParseSuperName();
+        }
+
+        ///////////////////////////////////////////////////// bool ParseDef*()
+        //
+        //  These function all begin with a specific OpCode.  They are also
+        //  deterministic and don't call conditionally any subfunctions.
+        //
+        bool ParseDefAlias()
+        {
+            PARSEOP();
+
+            if (Peek() != AliasOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefName()
+        {
+            PARSEOP();
+
+            if (Peek() != NameOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseDataRefObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateDWordField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateDWordFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // ByteIndex       := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateQWordField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateQWordFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // ByteIndex       := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateWordField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateWordFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return PARSEFAIL();
+            }
+            // ByteIndex       := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBreak()
+        {
+            PARSEOP();
+
+            if (Peek() != BreakOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBreakPoint()
+        {
+            PARSEOP();
+
+            if (Peek() != BreakPointOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefContinue()
+        {
+            PARSEOP();
+
+            if (Peek() != ContinueOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNoop()
+        {
+            PARSEOP();
+
+            if (Peek() != NoopOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefWhile()
+        {
+            PARSEOP();
+
+            if (Peek() != WhileOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParsePredicate()) {
+                return Error();
+            }
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefAnd()
+        {
+            PARSEOP();
+
+            if (Peek() != AndOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCopyObject()
+        {
+            PARSEOP();
+
+            if (Peek() != CopyObjectOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseSimpleName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDecrement()
+        {
+            PARSEOP();
+
+            if (Peek() != DecrementOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFindSetLeftBit()
+        {
+            PARSEOP();
+
+            if (Peek() != FindSetLeftBitOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFindSetRightBit()
+        {
+            PARSEOP();
+
+            if (Peek() != FindSetRightBitOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIncrement()
+        {
+            PARSEOP();
+
+            if (Peek() != IncrementOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLAnd()
+        {
+            PARSEOP();
+
+            if (Peek() != LandOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLEqual()
+        {
+            PARSEOP();
+
+            if (Peek() != LequalOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLGreater()
+        {
+            PARSEOP();
+
+            if (Peek() != LgreaterOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLLess()
+        {
+            PARSEOP();
+
+            if (Peek() != LlessOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLOr()
+        {
+            PARSEOP();
+
+            if (Peek() != LorOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMod()
+        {
+            PARSEOP();
+
+            if (Peek() != ModOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Dividend := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Dividend := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMultiply()
+        {
+            PARSEOP();
+
+            if (Peek() != MultiplyOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNAnd()
+        {
+            PARSEOP();
+
+            if (Peek() != NandOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNOr()
+        {
+            PARSEOP();
+
+            if (Peek() != NorOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNot()
+        {
+            PARSEOP();
+
+            if (Peek() != NotOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefObjectType()
+        {
+            PARSEOP();
+
+            if (Peek() != ObjectTypeOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefOr()
+        {
+            PARSEOP();
+
+            if (Peek() != OrOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefRefOf()
+        {
+            PARSEOP();
+
+            if (Peek() != RefOfOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefShiftRight()
+        {
+            PARSEOP();
+
+            if (Peek() != ShiftRightOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //ShiftCount := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSizeOf()
+        {
+            PARSEOP();
+
+            if (Peek() != SizeOfOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefStore()
+        {
+            PARSEOP();
+
+            if (Peek() != StoreOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSubtract()
+        {
+            PARSEOP();
+
+            if (Peek() != SubtractOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToBuffer()
+        {
+            PARSEOP();
+
+            if (Peek() != ToBufferOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToDecimalString()
+        {
+            PARSEOP();
+
+            if (Peek() != ToDecimalStringOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToHexString()
+        {
+            PARSEOP();
+
+            if (Peek() != ToHexStringOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToInteger()
+        {
+            PARSEOP();
+
+            if (Peek() != ToIntegerOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefXOr()
+        {
+            PARSEOP();
+
+            if (Peek() != XorOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDataRegion()
+        {
+            PARSEOP();
+
+            if (Peek16() != DataRegionOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDevice()
+        {
+            PARSEOP();
+
+            if (Peek16() != DeviceOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefEvent()
+        {
+            PARSEOP();
+
+            if (Peek16() != EventOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefField()
+        {
+            PARSEOP();
+
+            if (Peek16() != FieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 FieldFlags = Pop();
+            PARSEVALX(FieldFlags);
+            if (!ParseFieldList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIndexField()
+        {
+            PARSEOP();
+
+            if (Peek16() != IndexFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 FieldFlags = Pop();
+            PARSEVALX(FieldFlags);
+
+            if (!ParseFieldList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefThermalZone()
+        {
+            PARSEOP();
+
+            if (Peek16() != ThermalZoneOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLoad()
+        {
+            PARSEOP();
+
+            if (Peek16() != LoadOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseDDBHandleObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefRelease()
+        {
+            PARSEOP();
+
+            if (Peek16() != ReleaseOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseMutexObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefReset()
+        {
+            PARSEOP();
+
+            if (Peek16() != ResetOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseEventObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSignal()
+        {
+            PARSEOP();
+
+            if (Peek16() != SignalOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseEventObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefUnload()
+        {
+            PARSEOP();
+
+            if (Peek16() != UnloadOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseDDBHandleObject()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCondRefOf()
+        {
+            PARSEOP();
+
+            if (Peek16() != CondRefOfOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLoadTable()
+        {
+            PARSEOP();
+
+            if (Peek16() != LoadTableOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToBCD()
+        {
+            PARSEOP();
+
+            if (Peek16() != ToBCDOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefWait()
+        {
+            PARSEOP();
+
+            if (Peek16() != WaitOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseEventObject()) {
+                return Error();
+            }
+            if (!ParseOperand()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMutex()
+        {
+            PARSEOP();
+
+            if (Peek16() != MutexOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseNameString()) {
+                return PARSEFAIL();
+            }
+            UINT8 SyncFlags = Pop();
+            PARSEVALX(SyncFlags);
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefPowerRes()
+        {
+            PARSEOP();
+
+            if (Peek16() != PowerResOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 SystemLevel = Pop();
+            PARSEVALX(SystemLevel);
+
+            UINT16 ResourceOrder = Pop16();
+            PARSEVALX(ResourceOrder);
+
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefProcessor()
+        {
+            PARSEOP();
+
+            if (Peek16() != ProcessorOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 ProcId = Pop();
+            PARSEVALX(ProcId);
+
+            UINT32 PblkAddr = Pop32();
+            PARSEVALX(PblkAddr);
+
+            UINT32 PblkLen = Pop();
+            PARSEVALX(PblkLen);
+
+
+            if (!ParseObjectList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMethod()
+        {
+            PARSEOP();
+
+            if (Peek() != MethodOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT8 MethodFlags = Pop();
+            PARSEVALX(MethodFlags);
+
+
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefAcquire()
+        {
+            PARSEOP();
+
+            if (Peek16() != AcquireOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseMutexObject()) {
+                return PARSEFAIL();
+            }
+            UINT16 Timeout = Pop16();
+            PARSEVALX(Timeout);
+
+            return PARSEGOOD();
+        }
+
+        bool ParseDefPackage()
+        {
+            PARSEOP();
+
+            if (Peek() != PackageOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            UINT8 NumElements = Pop();
+            PARSEVALX(NumElements);
+
+
+            if (!ParsePackageElementList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefVarPackage()
+        {
+            PARSEOP();
+
+            if (Peek() != VarPackageOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            // TermArg=>Integer;
+
+            if (!ParsePackageElementList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateField()
+        {
+            PARSEOP();
+
+            if (Peek16() != CreateFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BitIndex := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //NumBits := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefSleep()
+        {
+            PARSEOP();
+
+            if (Peek16() != SleepOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //MsecTime := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefStall()
+        {
+            PARSEOP();
+
+            if (Peek16() != StallOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgByteData()) {
+                return Error();
+            }
+            //UsecTime := TermArg=>ByteData
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFromBCD()
+        {
+            PARSEOP();
+
+            if (Peek16() != FromBCDOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BCDValue := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefShiftLeft()
+        {
+            PARSEOP();
+
+            if (Peek() != ShiftLeftOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //ShiftCount := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefToString()
+        {
+            PARSEOP();
+
+            if (Peek() != ToStringOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //LengthArg := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMid()
+        {
+            PARSEOP();
+
+            if (Peek() != MidOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //MidObj := TermArg=>Buffer|String
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateBitField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateBitFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //SourceBuff := TermArg=>Buffer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BitIndex := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefCreateByteField()
+        {
+            PARSEOP();
+
+            if (Peek() != CreateByteFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //SourceBuff := TermArg=>Buffer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //ByteIndex := TermArg=>Integer
+            if (!ParseNameString()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefReturn()
+        {
+            PARSEOP();
+
+            if (Peek() != ReturnOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //ArgObject := TermArg=>DataRefObject
+            return PARSEGOOD();
+        }
+
+        bool ParseDefAdd()
+        {
+            PARSEOP();
+
+            if (Peek() != AddOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Operand := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBuffer()
+        {
+            PARSEOP();
+
+            if (Peek() != BufferOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //BufferSize := TermArg=>Integer
+            // Skip over data.
+            m_pbStream = pbLimit;
+            return PARSEGOOD();
+        }
+
+        bool ParseDefConcat()
+        {
+            PARSEOP();
+
+            if (Peek() != ConcatOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgComputationalData()) {
+                return Error();
+            }
+            //Data := TermArg=>ComputationalData
+            if (!ParseTermArgComputationalData()) {
+                return Error();
+            }
+            //Data := TermArg=>ComputationalData
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefConcatRes()
+        {
+            PARSEOP();
+
+            if (Peek() != ConcatResOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //BufData := TermArg=>Buffer
+            if (!ParseTermArgBuffer()) {
+                return Error();
+            }
+            //BufData := TermArg=>Buffer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDivide()
+        {
+            PARSEOP();
+
+            if (Peek() != DivideOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Dividend := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //Divisor := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            // Remainder
+            if (!ParseTarget()) {
+                return Error();
+            }
+            // Quotient
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIndex()
+        {
+            PARSEOP();
+
+            if (Peek() != IndexOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //BuffPkgStrObj := TermArg=>Buffer, Package or String
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //IndexValue := TermArg=>Integer
+            if (!ParseTarget()) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefDerefOf()
+        {
+            PARSEOP();
+
+            if (Peek() != DerefOfOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //ObjReference := TermArg=>ObjectReference|String
+            return PARSEGOOD();
+        }
+
+        bool ParseDefOpRegion()
+        {
+            PARSEOP();
+
+            if (Peek16() != OpRegionOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            if (!ParseNameString()) {
+                return Error();
+            }
+            UINT RegionSpace = Pop();
+            PARSEVALX(RegionSpace);
+
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //RegionOffset    := TermArg=>Integer
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //RegionLen       := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefFatal()
+        {
+            PARSEOP();
+
+            if (Peek16() != FatalOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+            UINT8 FatalType = Pop();
+            PARSEVALX(FatalType);
+            UINT32 FatalCode = Pop32();
+            PARSEVALX(FatalCode);
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //FatalArg        := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefNotify()
+        {
+            PARSEOP();
+
+            if (Peek() != NotifyOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParseSuperName()) {
+                return Error();
+            }
+            //NotifyObject    := SuperName=>ThermalZone|Processor|Device
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //NotifyValue     := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefMatch()
+        {
+            PARSEOP();
+
+            if (Peek() != MatchOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParseTermArg()) {
+                return Error();
+            }
+            //SearchPkg       := TermArg=>Package
+            UINT8 MatchOpcode1 = Pop();
+            PARSEVALX(MatchOpcode1);
+            if (!ParseOperand()) {
+                return Error();
+            }
+            UINT8 MatchOpcode2 = Pop();
+            PARSEVALX(MatchOpcode2);
+            if (!ParseOperand()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            //StartIndex      := TermArg=>Integer
+            return PARSEGOOD();
+        }
+
+        bool ParseDefScope()
+        {
+            PARSEOP();
+
+            if (Peek() != ScopeOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8* pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefBankField()
+        {
+            PARSEOP();
+
+            if (Peek16() != BankFieldOp) {
+                return PARSEFAIL();
+            }
+            Pop16();
+
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseNameString()) {
+                return Error();
+            }
+            if (!ParseTermArgInteger()) {
+                return Error();
+            }
+            // BankValue := TermArg=>Integer
+            UINT8 FieldFlags = Pop();
+            PARSEVALX(FieldFlags);
+
+            if (!ParseFieldList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefIfElse()
+        {
+            PARSEOP();
+
+            if (Peek() != IfOp) {
+                return PARSEFAIL();
+            }
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParsePredicate()) {
+                return Error();
+            }
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            ParseDefElse();
+            return PARSEGOOD();
+
+        }
+
+        bool ParseDefElse()
+        {
+            PARSEOP();
+
+            if (Peek() != ElseOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+            if (!ParsePkgLength()) {
+                return Error();
+            }
+            UINT8 *pbLimit = m_pbPkgLimit;
+            if (!ParseTermList(pbLimit)) {
+                return Error();
+            }
+            return PARSEGOOD();
+        }
+
+        bool ParseDefLNot()
+        {
+            PARSEOP();
+
+            if (Peek() != LnotOp) {
+                return PARSEFAIL();
+            }
+            Pop();
+
+            switch (Peek()) {
+              case LlessOp:
+              case LgreaterOp:
+              case LequalOp:
+                Pop();
+                if (!ParseOperand()) {
+                    return Error();
+                }
+                if (!ParseOperand()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+
+              default:
+                if (!ParseOperand()) {
+                    return Error();
+                }
+                return PARSEGOOD();
+            }
+            return PARSEFAIL();
+        }
+
+      public:
+        bool Parse()
+        {
+            PARSEOP();
+
+            return ParseTermList(m_pbLimit);
+        }
+    };
+
+    Parser::ParseOp::ParseOpValues Parser::ParseOp::s_rStack[128];
+    int Parser::ParseOp::s_nStack;
+    Parser::ParseOp::ParseOpValues Parser::ParseOp::s_rTrace[512];
+    int Parser::ParseOp::s_nTrace;
+    Parser *Parser::s_pCurrent = NULL;
+#endif
+}
diff --git a/base/boot/Singldr/bootdevice.h b/base/boot/Singldr/bootdevice.h
new file mode 100644
index 0000000..2b6ec17
--- /dev/null
+++ b/base/boot/Singldr/bootdevice.h
@@ -0,0 +1,89 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  bootdevice.h - base class for all boot devices used by Singldr
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#ifndef __BOOTDEVICE_H__
+#define __BOOTDEVICE_H__
+
+#include "singldr.h"
+
+// This is a virtual class for a read only filesystem device.
+//
+// 0 - Constructor
+// 1 - OpenDevice()         -- initialize the device and filesystem
+// 2 - GetFileProperties()  -- open a file for reading, get its
+//                             size and position
+// 3 - ReadFileLow()        -- read a file into low memory
+//                             is a hack, we could do without it)
+// 4 - ReadFileHigh()       -- read a file into high memory
+// 5 - CloseDevice()        -- close the device
+
+// There is some linker wizardry going on here.  We're in TINY mode, which
+// means that all code must be in the same segment, but data can reside
+// elsewhere (if it uses a __far pointer).  This class definition says that
+// the data objects will be __far, but the methods themselves will be __near.
+//
+// Consider the following text:
+//     struct __near [1] BootDevice
+//     {
+//         virtual int __near [2] OpenDevice __far [3] = 0;
+//     }
+//
+// The first __near, [1], says that the classes vtable pointer is in near
+// space, i.e. is in the same code segment as CS.
+// The second __near, [2], says that the OpenDevice virtual function pointer
+// is in the near space, i.e. is in the same code segment as CS.
+// The __far, [3], says that the object is not in the common code segment,
+// as it is allocated the global heap.
+//
+
+extern void __far * operator new(uint cbSize);
+
+struct __near BootDevice
+{
+public:
+    // We'll expose one public field, since it is used to adjust
+    // the debug port.  This lets us avoid creating a property
+    // that returns a pointer to an internal field.
+    uint16 __far *CmdLine;
+
+    // each constructor will be different, as each will take parameters
+    // the default constructor will do nothing:
+    BootDevice() __far {};
+
+    // As discussed above, we'll have an Init() in addition to the
+    // constructor.
+    // just to reiterate:  every method will be __near, since the code is
+    // in ds=cs=ss.  The __far at the end indicates that the this pointer
+    // is to an object in the far heap.
+    virtual int __near OpenDevice() __far = 0;
+
+    // We don't have free(), and we don't destroy objects, but we do
+    // need a way to close down a boot medium (in particular PXE).
+    virtual int __near CloseDevice() __far = 0;
+
+    // Open the file described by filename, put its parameters in file
+    // directory is used to avoid multiple allocs
+    virtual int __near GetFileProperties(LPCHAR  filename,
+                                         FilePtr file,
+                                         FilePtr directory) __far = 0;
+
+    // Get the file described by filename/file and put it in a
+    // small (32KB) buffer
+    virtual INT16 __near ReadFileLow(LPCHAR  filename,
+                                     FilePtr file,
+                                     uint8 __far * buffer) __far = 0;
+
+    // Get the file described by filename/file and put it in high memory.
+    virtual UINT32 __near ReadFileHigh(LPCHAR  filename,
+                                       FilePtr file,
+                                       uint32  buffer,
+                                       uint32  cbBuffer
+                                       ) __far = 0;
+
+};
+
+#endif
diff --git a/base/boot/Singldr/debug.cpp b/base/boot/Singldr/debug.cpp
new file mode 100644
index 0000000..6ce1e77
--- /dev/null
+++ b/base/boot/Singldr/debug.cpp
@@ -0,0 +1,1123 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// debug.h: runtime support for debugging
+//
+
+#include "debug.h"
+
+extern "C" void  IoSpaceWrite8(uint16 port, uint8 value);
+extern "C" uint8 IoSpaceRead8(uint16 port);
+
+#define FALSE 0
+#define TRUE   1
+
+#define IN
+#define OUT
+
+// Define the maximum number of retries for packet sends.
+//
+#define MAXIMUM_RETRIES 20
+
+// Define packet waiting status codes.
+//
+#define BD_PACKET_RECEIVED 0
+#define BD_PACKET_TIMEOUT 1
+#define BD_PACKET_RESEND 2
+
+// COM PORT Constants
+//
+#define COM1_PORT   0x03f8
+#define COM2_PORT   0x02f8
+#define COM3_PORT   0x03e8
+#define COM4_PORT   0x02e8
+
+#define COM_DAT     0x00
+#define COM_IEN     0x01            // interrupt enable register
+#define COM_FCR     0x02            // FIFO Control Register
+#define COM_LCR     0x03            // line control registers
+#define COM_MCR     0x04            // modem control reg
+#define COM_LSR     0x05            // line status register
+#define COM_MSR     0x06            // modem status register
+#define COM_SCR     0x07            // scratch register
+#define COM_DLL     0x00            // divisor latch least sig
+#define COM_DLM     0x01            // divisor latch most sig
+
+#define COM_DATRDY  0x01
+#define COM_OUTRDY  0x20
+
+#define LC_DLAB     0x80
+
+#define CLOCK_RATE  0x1C200         // USART clock rate
+
+#define MC_DTRRTS   0x03            // Control bits to assert DTR and RTS
+#define MS_DSRCTSCD 0xB0            // Status bits for DSR, CTS and CD
+#define MS_CD       0x80
+
+//
+// Communication functions (comio.c)
+//
+
+static
+UINT32
+BdComputeChecksum(
+    IN PUINT8 Buffer,
+    IN UINT32 Length
+    );
+
+static
+UINT16
+BdReceivePacketLeader(
+    IN UINT32 PacketType,
+    OUT PUINT32 PacketLeader
+    );
+
+static
+void
+BdSendControlPacket(
+    IN UINT16 PacketType,
+    IN UINT32 PacketId
+    );
+
+static
+UINT32
+BdReceivePacket(
+    IN UINT32 ExpectedPacketType,
+    OUT PSTRING MessageHeader,
+    OUT PSTRING MessageData,
+    OUT PUINT32 DataLength
+    );
+
+static
+void
+BdSendPacket(
+    IN UINT32 PacketType,
+    IN PSTRING MessageHeader,
+    IN PSTRING MessageData
+    );
+
+static
+UINT32
+BdReceiveString(
+    OUT PUINT8 Destination,
+    IN UINT32 Length
+    );
+
+static
+void
+BdSendString(
+    IN PUINT8 Source,
+    IN UINT32 Length
+    );
+
+static
+void
+BdSendControlPacket(
+    IN UINT16 PacketType,
+    IN UINT32 PacketId
+    );
+
+// Debugger enabled and present.
+//
+static BOOL BdDebuggerNotPresent = FALSE;
+static UINT16 BdBasePort = COM2_PORT;
+
+// Next packet id to send and next packet id to expect.
+//
+static UINT32 BdPacketIdExpected;
+static UINT32 BdNextPacketIdToSend;
+
+// Number of retries and the retry count.
+//
+static UINT32 BdNumberRetries = MAXIMUM_RETRIES;
+static UINT32 BdRetryCount = MAXIMUM_RETRIES;
+
+////////////////////////////////////////////////////////// Serial Port Input & Output.
+//
+
+static UINT8 BdReadInt8(UINT16 port)
+{
+    UINT8 value;
+
+    __asm {
+        mov dx,port;
+        in al,dx;
+        mov value, al
+    }
+
+    return value;
+}
+
+static void BdWriteInt8(UINT16 port, UINT8 value)
+{
+    __asm {
+        mov dx,port;
+        mov al,value;
+        out dx,al;
+    }
+}
+
+static void ResetTimer0()
+{
+    // Put into periodic mode with maximum period.
+    IoSpaceWrite8(0x43, 0x33);
+    IoSpaceWrite8(0x40, 0);
+    IoSpaceWrite8(0x40, 0);
+}
+
+static uint16 GetTimer0()
+{
+    // Latch timer values
+    IoSpaceWrite8(0x43, 0x00);
+    // Combine low and high byte values
+    return IoSpaceRead8(0x40) + (((UINT16)IoSpaceRead8(0x40)) << 8);
+}
+
+static bool BdComInit(UINT16 debugBasePort)
+// Initializes the communication port (baud rate, parity etc.)
+{
+    ResetTimer0();
+
+    BdBasePort = debugBasePort;
+
+    UINT16    BaudRate = 1;      // 115200 bps
+
+    // turn off interrupts
+    BdWriteInt8(BdBasePort + COM_LCR, 0x00);
+    BdWriteInt8(BdBasePort + COM_IEN, 0x00);
+
+    // Turn on DTS/RTS
+    BdWriteInt8(BdBasePort + COM_MCR, MC_DTRRTS); // Needed for VirtualPC PIPE/Serial
+
+    // Turn on FIFO
+    BdWriteInt8(BdBasePort + COM_FCR, 1);
+
+    // Set the baud rate
+    BdWriteInt8(BdBasePort + COM_LCR, LC_DLAB);  // Divisor latch access bit
+    BdWriteInt8(BdBasePort + COM_DLM, (UINT8)(BaudRate >> 8));
+    BdWriteInt8(BdBasePort + COM_DLL, (UINT8)(BaudRate & 0xFF));
+
+    // initialize the LCR
+    BdWriteInt8(BdBasePort + COM_LCR, 0x03);
+    // 8 data bits, 1 stop bit, no parity, no break
+
+    // See if the 16450/16550 scratch register is available.
+    // If not, we'll assume the serial port doesn't really exist.
+    BdWriteInt8(BdBasePort + COM_SCR, 0xff);
+    UINT8 a1 = BdReadInt8(BdBasePort + COM_SCR);
+    BdWriteInt8(BdBasePort + COM_SCR, 0x00);
+    UINT8 a2 = BdReadInt8(BdBasePort + COM_SCR);
+
+    return (bool) ((a1 == (UINT8)0xff) && (a2 == (UINT8)0x00));
+}
+
+static void Stall(UINT16 DelayMicros)
+{
+/*++
+
+Routine Description:
+
+    Stall processor for approximately the number microseconds.  This method
+    uses the i8254 timer, which runs at around 1.13MHz.  For the purposes
+    of this method this is close enough to 1MHz.
+
+Arguments:
+
+    DelayMicros - Number of microseconds to stall.
+
+Return Value:
+
+    None
+*/
+    UINT16 t0 = GetTimer0();
+    UINT16 delta;
+    while ((delta = t0 - GetTimer0()) < DelayMicros) ;
+}
+
+static
+UINT32
+BdPortGetByte(
+    OUT PUINT8 Input
+    )
+/*++
+
+Routine Description:
+
+    Fetch a byte from the debug port and return it.
+
+Arguments:
+
+    Input - Returns the data byte.
+
+Return Value:
+
+    CP_GET_SUCCESS is returned if a byte is successfully read from the
+        kernel debugger line.
+    CP_GET_ERROR is returned if error encountered during reading.
+    CP_GET_NODATA is returned if timeout.
+
+--*/
+{
+    //
+    // Define wait timeout value.
+    //
+
+#define TIMEOUT_COUNT 2000 /* 1024 * 30 */
+
+    UINT8 lsr;
+    UINT8 value;
+    UINT32 limitcount = TIMEOUT_COUNT;
+
+    UINT8 msr;
+    msr = BdReadInt8(BdBasePort + COM_MSR);
+
+    while (limitcount != 0) {
+        limitcount--;
+
+        lsr = BdReadInt8(BdBasePort + COM_LSR);
+        if (lsr & COM_DATRDY) {
+            value = BdReadInt8(BdBasePort + COM_DAT);
+            *Input = (UINT8)(value & 0xff);
+            return CP_GET_SUCCESS;
+        }
+        Stall(50);
+    }
+    return CP_GET_NODATA;
+}
+
+
+static
+void
+BdPortPutByte(
+    IN UINT8 Output
+    )
+{
+    // wait for the com port to be ready
+    while ((BdReadInt8( BdBasePort + COM_LSR ) & COM_OUTRDY) == 0) { }
+
+    // write a single char
+    BdWriteInt8(BdBasePort + COM_DAT, Output);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+static
+UINT32
+BdComputeChecksum(
+    IN PUINT8 Buffer,
+    IN UINT32 Length
+    )
+
+/*++
+
+Routine Description:
+
+    This routine computes the checksum of the specified buffer.
+
+Arguments:
+
+    Buffer - Supplies a pointer to the buffer.
+
+    Length - Supplies the length of the buffer.
+
+Return Value:
+
+    A UINT32 is return as the checksum for the input string.
+
+--*/
+
+{
+
+    UINT32 Checksum = 0;
+
+    while (Length > 0) {
+        Checksum = Checksum + (UINT32)*Buffer++;
+        Length--;
+    }
+
+    return Checksum;
+}
+
+static
+UINT16
+BdReceivePacketLeader(
+                      IN UINT32 /* PacketType */,
+                      OUT PUINT32 PacketLeader
+                     )
+
+/*++
+
+Routine Description:
+
+    This routine waits for a packet header leader.
+
+Arguments:
+
+    PacketType - supplies the type of packet we are expecting.
+
+    PacketLeader - supplies a pointer to a ulong variable to receive
+                   packet leader bytes.
+
+Return Value:
+
+    BD_PACKET_RESEND - if resend is required.
+    BD_PAKCET_TIMEOUT - if timeout.
+    BD_PACKET_RECEIVED - if packet received.
+
+--*/
+
+{
+
+    UINT8 Input, PreviousByte = 0;
+    UINT32 PacketId = 0;
+    UINT32 Index;
+    UINT32 ReturnCode;
+
+    // NOTE - With all the interrupts being off, it is very hard
+    // to implement the actual timeout code. (Maybe, by reading the CMOS.)
+    // Here we use a loop count to wait about 3 seconds.  The CpGetByte
+    // will return with error code = CP_GET_NODATA if it cannot find data
+    // byte within 1 second. Kernel debugger's timeout period is 5 seconds.
+    //
+    Index = 0;
+    do {
+        ReturnCode = BdPortGetByte(&Input);
+        if (ReturnCode == CP_GET_NODATA) {
+            return BD_PACKET_TIMEOUT;
+        } else if (ReturnCode == CP_GET_ERROR) {
+            Index = 0;
+            continue;
+
+        } else {                    // if (ReturnCode == CP_GET_SUCCESS)
+            if ( Input == PACKET_LEADER_BYTE ||
+                 Input == CONTROL_PACKET_LEADER_BYTE ) {
+                if ( Index == 0 ) {
+                    PreviousByte = Input;
+                    Index++;
+                } else if (Input == PreviousByte ) {
+                    Index++;
+                } else {
+                    PreviousByte = Input;
+                    Index = 1;
+                }
+            } else {
+
+                Index = 0;
+            }
+        }
+    } while ( Index < 4 );
+
+    // return the packet leader and FALSE to indicate no resend is needed.
+    //
+    if ( Input == PACKET_LEADER_BYTE ) {
+        *PacketLeader = PACKET_LEADER;
+
+    } else {
+        *PacketLeader = CONTROL_PACKET_LEADER;
+    }
+
+    BdDebuggerNotPresent = FALSE;
+    return BD_PACKET_RECEIVED;
+}
+
+static
+void
+BdSendControlPacket(
+    IN UINT16 PacketType,
+    IN UINT32 PacketId
+    )
+
+/*++
+
+Routine Description:
+
+    This routine sends a control packet to the host machine that is running the
+    kernel debugger and waits for an ACK.
+
+Arguments:
+
+    PacketType - Supplies the type of packet to send.
+
+    PacketId - Supplies packet id, optionally.
+
+Return Value:
+
+    None.
+
+--*/
+
+{
+
+    KD_PACKET PacketHeader;
+
+    // Initialize and send the packet header.
+    //
+    PacketHeader.PacketLeader = CONTROL_PACKET_LEADER;
+    if (PacketId != 0) {
+        PacketHeader.PacketId = PacketId;
+    }
+
+    PacketHeader.ByteCount = 0;
+    PacketHeader.Checksum = 0;
+    PacketHeader.PacketType = PacketType;
+    BdSendString((PUINT8)&PacketHeader, sizeof(KD_PACKET));
+    return;
+}
+
+static
+UINT32
+BdReceivePacket(
+    IN UINT32 PacketType,
+    OUT PSTRING MessageHeader,
+    OUT PSTRING MessageData,
+    OUT PUINT32 DataLength
+    )
+
+/*++
+
+Routine Description:
+
+    This routine receives a packet from the host machine that is running
+    the kernel debugger UI.  This routine is ALWAYS called after packet being
+    sent by caller.  It first waits for ACK packet for the packet sent and
+    then waits for the packet desired.
+
+    N.B. If caller is BdrintString, the parameter PacketType is
+       PACKET_TYPE_KD_ACKNOWLEDGE.  In this case, this routine will return
+       right after the ack packet is received.
+
+Arguments:
+
+    PacketType - Supplies the type of packet that is excepted.
+
+    MessageHeader - Supplies a pointer to a string descriptor for the input
+        message.
+
+    MessageData - Supplies a pointer to a string descriptor for the input data.
+
+    DataLength - Supplies pointer to UINT32 to receive length of recv. data.
+
+Return Value:
+
+    BD_PACKET_RESEND - if resend is required.
+    BD_PAKCET_TIMEOUT - if timeout.
+    BD_PACKET_RECEIVED - if packet received.
+
+--*/
+
+{
+
+    UINT8 Input;
+    UINT32 MessageLength;
+    KD_PACKET PacketHeader;
+    UINT32 ReturnCode;
+    UINT32 Checksum;
+
+WaitForPacketLeader:
+
+    //
+    // Read Packet Leader
+    //
+
+    ReturnCode = BdReceivePacketLeader(PacketType, &PacketHeader.PacketLeader);
+
+    //
+    // If we can successfully read packet leader, it has high possibility that
+    // kernel debugger is alive.  So reset count.
+    //
+
+    if (ReturnCode != BD_PACKET_TIMEOUT) {
+        BdNumberRetries = BdRetryCount;
+    }
+    if (ReturnCode != BD_PACKET_RECEIVED) {
+        return ReturnCode;
+    }
+
+    //
+    // Read packet type.
+    //
+
+    ReturnCode = BdReceiveString((PUINT8)&PacketHeader.PacketType,
+                                 sizeof(PacketHeader.PacketType));
+
+    if (ReturnCode == CP_GET_NODATA) {
+        return BD_PACKET_TIMEOUT;
+
+    } else if (ReturnCode == CP_GET_ERROR) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+
+            //
+            // If read error and it is for a control packet, simply
+            // pretend that we have not seen this packet.  Hopefully
+            // we will receive the packet we desire which automatically acks
+            // the packet we just sent.
+            //
+
+            goto WaitForPacketLeader;
+
+        } else {
+
+            //
+            // if read error while reading data packet, we have to ask
+            // kernel debugger to resend us the packet.
+            //
+
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // if the packet we received is a resend request, we return true and
+    // let caller resend the packet.
+    //
+
+    if ( PacketHeader.PacketLeader == CONTROL_PACKET_LEADER &&
+         PacketHeader.PacketType == PACKET_TYPE_KD_RESEND ) {
+        return BD_PACKET_RESEND;
+    }
+
+    //
+    // Read data length.
+    //
+
+    ReturnCode = BdReceiveString((PUINT8)&PacketHeader.ByteCount,
+                                 sizeof(PacketHeader.ByteCount));
+
+    if (ReturnCode == CP_GET_NODATA) {
+        return BD_PACKET_TIMEOUT;
+    } else if (ReturnCode == CP_GET_ERROR) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            goto WaitForPacketLeader;
+        } else {
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // Read Packet Id.
+    //
+
+    ReturnCode = BdReceiveString((PUINT8)&PacketHeader.PacketId,
+                                 sizeof(PacketHeader.PacketId));
+
+    if (ReturnCode == CP_GET_NODATA) {
+        return BD_PACKET_TIMEOUT;
+    } else if (ReturnCode == CP_GET_ERROR) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            goto WaitForPacketLeader;
+        } else {
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // Read packet checksum.
+    //
+
+    ReturnCode = BdReceiveString((PUINT8)&PacketHeader.Checksum,
+                                 sizeof(PacketHeader.Checksum));
+
+    if (ReturnCode == CP_GET_NODATA) {
+        return BD_PACKET_TIMEOUT;
+
+    } else if (ReturnCode == CP_GET_ERROR) {
+        if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER) {
+            goto WaitForPacketLeader;
+        } else {
+            goto SendResendPacket;
+        }
+    }
+
+    //
+    // A complete packet header is received.  Check its validity and
+    // perform appropriate action depending on packet type.
+    //
+
+    if (PacketHeader.PacketLeader == CONTROL_PACKET_LEADER ) {
+        if (PacketHeader.PacketType == PACKET_TYPE_KD_ACKNOWLEDGE ) {
+
+            //
+            // If we received an expected ACK packet and we are not
+            // waiting for any new packet, update outgoing packet id
+            // and return.  If we are NOT waiting for ACK packet
+            // we will keep on waiting.  If the ACK packet
+            // is not for the packet we send, ignore it and keep on waiting.
+            //
+
+            if (PacketHeader.PacketId !=
+                (BdNextPacketIdToSend & ~SYNC_PACKET_ID))  {
+                goto WaitForPacketLeader;
+
+            } else if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) {
+                BdNextPacketIdToSend ^= 1;
+                return BD_PACKET_RECEIVED;
+
+            } else {
+                goto WaitForPacketLeader;
+            }
+
+        } else if (PacketHeader.PacketType == PACKET_TYPE_KD_RESET) {
+
+            //
+            // if we received Reset packet, reset the packet control variables
+            // and resend earlier packet.
+            //
+
+            BdNextPacketIdToSend = INITIAL_PACKET_ID;
+            BdPacketIdExpected = INITIAL_PACKET_ID;
+            BdSendControlPacket(PACKET_TYPE_KD_RESET, 0L);
+            return BD_PACKET_RESEND;
+
+        } else if (PacketHeader.PacketType == PACKET_TYPE_KD_RESEND) {
+            return BD_PACKET_RESEND;
+
+        } else {
+
+            //
+            // Invalid packet header, ignore it.
+            //
+
+            goto WaitForPacketLeader;
+        }
+
+    //
+    // The packet header is for data packet (not control packet).
+    //
+
+    } else if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) {
+
+        //
+        // if we are waiting for ACK packet ONLY
+        // and we receive a data packet header, check if the packet id
+        // is what we expected.  If yes, assume the acknowledge is lost (but
+        // sent), ask sender to resend and return with PACKET_RECEIVED.
+        //
+
+        if (PacketHeader.PacketId == BdPacketIdExpected) {
+            BdSendControlPacket(PACKET_TYPE_KD_RESEND, 0L);
+            BdNextPacketIdToSend ^= 1;
+            return BD_PACKET_RECEIVED;
+
+        } else {
+            BdSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                                PacketHeader.PacketId);
+
+            goto WaitForPacketLeader;
+        }
+    }
+
+    //
+    // we are waiting for data packet and we received the packet header
+    // for data packet. Perform the following checks to make sure
+    // it is the packet we are waiting for.
+    //
+    // Check ByteCount received is valid
+    //
+
+    MessageLength = MessageHeader->MaximumLength;
+    if ((PacketHeader.ByteCount > (UINT16)PACKET_MAX_SIZE) ||
+        (PacketHeader.ByteCount < (UINT16)MessageLength)) {
+        goto SendResendPacket;
+    }
+
+    *DataLength = PacketHeader.ByteCount - MessageLength;
+
+    //
+    // Read the message header.
+    //
+
+    ReturnCode = BdReceiveString(MessageHeader->Buffer, MessageLength);
+    if (ReturnCode != CP_GET_SUCCESS) {
+        goto SendResendPacket;
+    }
+
+    MessageHeader->Length = (UINT16)MessageLength;
+
+    //
+    // Read the message data.
+    //
+
+    ReturnCode = BdReceiveString(MessageData->Buffer, *DataLength);
+    if (ReturnCode != CP_GET_SUCCESS) {
+        goto SendResendPacket;
+    }
+
+    MessageData->Length = (UINT16)*DataLength;
+
+    //
+    // Read packet trailing byte
+    //
+
+    ReturnCode = BdPortGetByte(&Input);
+    if (ReturnCode != CP_GET_SUCCESS || Input != PACKET_TRAILING_BYTE) {
+        goto SendResendPacket;
+    }
+
+    //
+    // Check PacketType is what we are waiting for.
+    //
+
+    if (PacketType != PacketHeader.PacketType) {
+        BdSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                             PacketHeader.PacketId
+                             );
+        goto WaitForPacketLeader;
+    }
+
+    //
+    // Check PacketId is valid.
+    //
+
+    if (PacketHeader.PacketId == INITIAL_PACKET_ID ||
+        PacketHeader.PacketId == (INITIAL_PACKET_ID ^ 1)) {
+        if (PacketHeader.PacketId != BdPacketIdExpected) {
+            BdSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                                 PacketHeader.PacketId
+                                 );
+            goto WaitForPacketLeader;
+        }
+
+    } else {
+        goto SendResendPacket;
+    }
+
+    //
+    // Check checksum is valid.
+    //
+
+    Checksum = BdComputeChecksum(MessageHeader->Buffer,
+                                 MessageHeader->Length);
+
+
+    Checksum += BdComputeChecksum(MessageData->Buffer,
+                                  MessageData->Length);
+
+    if (Checksum != PacketHeader.Checksum) {
+        goto SendResendPacket;
+    }
+
+    //
+    // Send Acknowledge byte and the Id of the packet received.
+    // Then, update the ExpectId for next incoming packet.
+    //
+
+    BdSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                        PacketHeader.PacketId);
+
+    //
+    // We have successfully received the packet so update the
+    // packet control variables and return success.
+    //
+
+    BdPacketIdExpected ^= 1;
+    return BD_PACKET_RECEIVED;
+
+SendResendPacket:
+    BdSendControlPacket(PACKET_TYPE_KD_RESEND, 0L);
+    goto WaitForPacketLeader;
+}
+
+static
+void
+BdSendPacket(
+    IN UINT32 PacketType,
+    IN PSTRING MessageHeader,
+    IN PSTRING MessageData
+    )
+
+/*++
+
+Routine Description:
+
+    This routine sends a packet to the host machine that is running the
+    kernel debugger and waits for an ACK.
+
+Arguments:
+
+    PacketType - Supplies the type of packet to send.
+
+    MessageHeader - Supplies a pointer to a string descriptor that describes
+        the message information.
+
+    MessageData - Supplies a pointer to a string descriptor that describes
+        the optional message data.
+
+Return Value:
+
+    None.
+
+--*/
+
+{
+
+    KD_PACKET PacketHeader;
+    UINT32 MessageDataLength;
+    UINT32 ReturnCode;
+    PDBGKD_DEBUG_IO DebugIo;
+
+    if (MessageData != NULL) {
+        MessageDataLength = MessageData->Length;
+        PacketHeader.Checksum = BdComputeChecksum(MessageData->Buffer,
+                                                  MessageData->Length);
+
+    } else {
+        MessageDataLength = 0;
+        PacketHeader.Checksum = 0;
+    }
+
+    PacketHeader.Checksum += BdComputeChecksum(MessageHeader->Buffer,
+                                               MessageHeader->Length);
+
+    //
+    // Initialize and send the packet header.
+    //
+
+    PacketHeader.PacketLeader = PACKET_LEADER;
+    PacketHeader.ByteCount = (UINT16)(MessageHeader->Length + MessageDataLength);
+    PacketHeader.PacketType = (UINT16)PacketType;
+    BdNumberRetries = BdRetryCount;
+    do {
+        if (BdNumberRetries == 0) {
+
+            //
+            // If the packet is not for reporting exception, we give up
+            // and declare debugger not present.
+            //
+
+            if (PacketType == PACKET_TYPE_KD_DEBUG_IO) {
+                DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer;
+                if (DebugIo->ApiNumber == DbgKdPrintStringApi) {
+                    BdDebuggerNotPresent = TRUE;
+                    BdNextPacketIdToSend = INITIAL_PACKET_ID | SYNC_PACKET_ID;
+                    BdPacketIdExpected = INITIAL_PACKET_ID;
+                    return;
+                }
+            }
+        }
+
+        //
+        // Setting PacketId has to be in the do loop in case Packet Id was
+        // reset.
+        //
+
+        PacketHeader.PacketId = BdNextPacketIdToSend;
+        BdSendString((PUINT8)&PacketHeader, sizeof(KD_PACKET));
+
+        //
+        // Output message header.
+        //
+
+        BdSendString(MessageHeader->Buffer, MessageHeader->Length);
+
+        //
+        // Output message data.
+        //
+
+        if ( MessageDataLength ) {
+            BdSendString(MessageData->Buffer, MessageData->Length);
+        }
+
+        //
+        // Output a packet trailing byte
+        //
+
+        BdPortPutByte(PACKET_TRAILING_BYTE);
+
+        //
+        // Wait for the Ack Packet
+        //
+
+        ReturnCode = BdReceivePacket(PACKET_TYPE_KD_ACKNOWLEDGE,
+                                     NULL,
+                                     NULL,
+                                     NULL);
+
+        if (ReturnCode == BD_PACKET_TIMEOUT) {
+            BdNumberRetries--;
+        }
+
+    } while (ReturnCode != BD_PACKET_RECEIVED);
+
+    //
+    // Reset Sync bit in packet id.  The packet we sent may have Sync bit set
+    //
+
+    BdNextPacketIdToSend &= ~SYNC_PACKET_ID;
+
+    //
+    // Since we are able to talk to debugger, the retrycount is set to
+    // maximum value.
+    //
+
+    BdRetryCount = MAXIMUM_RETRIES;
+}
+
+static
+UINT32
+BdReceiveString(
+    OUT PUINT8 Destination,
+    IN UINT32 Length
+    )
+
+/*++
+
+Routine Description:
+
+    This routine reads a string from the kernel debugger port.
+
+Arguments:
+
+    Destination - Supplies a pointer to the input string.
+
+    Length - Supplies the length of the string to be read.
+
+Return Value:
+
+    CP_GET_SUCCESS is returned if string is successfully read from the
+        kernel debugger line.
+    CP_GET_ERROR is returned if error encountered during reading.
+    CP_GET_NODATA is returned if timeout.
+
+--*/
+
+{
+
+    UINT8 Input;
+    UINT32 ReturnCode;
+
+    //
+    // Read bytes until either an error is encountered or the entire string
+    // has been read.
+    //
+    while (Length > 0) {
+        ReturnCode = BdPortGetByte(&Input);
+        if (ReturnCode != CP_GET_SUCCESS) {
+            return ReturnCode;
+        } else {
+            *Destination++ = Input;
+            Length -= 1;
+        }
+    }
+
+    return CP_GET_SUCCESS;
+}
+
+static
+void
+BdSendString(
+    IN PUINT8 Source,
+    IN UINT32 Length
+    )
+
+/*++
+
+Routine Description:
+
+    This routine writes a string to the kernel debugger port.
+
+Arguments:
+
+    Source - Supplies a pointer to the output string.
+
+    Length - Supplies the length of the string to be written.
+
+Return Value:
+
+    None.
+
+--*/
+
+{
+
+    UINT8 Output;
+
+    //
+    // Write bytes to the kernel debugger port.
+    //
+
+    while (Length > 0) {
+        Output = *Source++;
+        BdPortPutByte(Output);
+        Length -= 1;
+    }
+
+    return;
+}
+
+void BdPrintString(char *Output, UINT Length)
+
+/*++
+
+Routine Description:
+
+    This routine prints a string.
+
+Arguments:
+
+    Output - Supplies a pointer to a string descriptor for the output string.
+
+--*/
+
+{
+
+    STRING MessageData;
+    STRING MessageHeader;
+    DBGKD_DEBUG_IO DebugIo;
+
+    if (BdDebuggerNotPresent) {
+        return;
+    }
+
+    // If the total message length is greater than the maximum packet size,
+    // then truncate the output string.
+    //
+    if ((sizeof(DBGKD_DEBUG_IO) + Length) > PACKET_MAX_SIZE) {
+        Length = PACKET_MAX_SIZE - sizeof(DBGKD_DEBUG_IO);
+    }
+
+    // Construct the print string message and message descriptor.
+    //
+    DebugIo.ApiNumber = DbgKdPrintStringApi;
+    DebugIo.ProcessorLevel = 0;
+    DebugIo.Processor = 0;
+    DebugIo.LengthOfString = Length;
+    MessageHeader.Length = sizeof(DBGKD_DEBUG_IO);
+    MessageHeader.Buffer = (PUINT8)&DebugIo;
+
+    // Construct the print string data and data descriptor.
+    //
+    MessageData.Length = (UINT16)Length;
+    MessageData.Buffer = (PUINT8)Output;
+
+    // Send packet to the kernel debugger on the host machine.
+    //
+    BdSendPacket(PACKET_TYPE_KD_DEBUG_IO, &MessageHeader, &MessageData);
+}
+
+
+bool
+BdInitDebugger(UINT16 basePort)
+{
+    // Attempt to initialize the debug port.
+    //
+    if (basePort >= 0x100 && BdComInit(basePort)) {
+        BdDebuggerNotPresent = FALSE;
+
+        // Initialize the ID for the NEXT packet to send and the Expect
+        // ID of next incoming packet.
+        //
+        BdNextPacketIdToSend = INITIAL_PACKET_ID | SYNC_PACKET_ID;
+        BdPacketIdExpected = INITIAL_PACKET_ID;
+
+        // Number of retries and the retry count.
+        //
+        BdNumberRetries = 5;
+        BdRetryCount = 5;
+
+        return TRUE;
+    }
+
+    BdDebuggerNotPresent = TRUE;
+    return FALSE;
+}
diff --git a/base/boot/Singldr/debug.h b/base/boot/Singldr/debug.h
new file mode 100644
index 0000000..f2f9483
--- /dev/null
+++ b/base/boot/Singldr/debug.h
@@ -0,0 +1,127 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// debug.h: runtime support for debugging
+//
+
+#pragma pack(4)
+
+typedef struct _STRING {
+    UINT16  Length;
+    UINT16  MaximumLength;
+    PUINT8  Buffer;
+} STRING, *PSTRING;
+
+//======================================================================
+// Selected structs and defines used by the KD protocol
+//
+
+//
+// If the packet type is PACKET_TYPE_KD_DEBUG_IO, then
+// the format of the packet data is as follows:
+//
+
+#define DbgKdPrintStringApi     0x00003230L
+
+//
+// For get string, the Null terminated prompt string
+// immediately follows the message. The LengthOfStringRead
+// field initially contains the maximum number of characters
+// to read. Upon reply, this contains the number of bytes actually
+// read. The data read immediately follows the message.
+//
+//
+typedef struct _DBGKD_DEBUG_IO {
+    UINT32 ApiNumber;
+    UINT16 ProcessorLevel;
+    UINT16 Processor;
+    UINT32 LengthOfString;
+    UINT32 LengthOfStringRead;
+} DBGKD_DEBUG_IO, *PDBGKD_DEBUG_IO;
+
+//
+// DbgKd APIs are for the portable kernel debugger
+//
+
+//
+// KD_PACKETS are the low level data format used in KD. All packets
+// begin with a packet leader, byte count, packet type. The sequence
+// for accepting a packet is:
+//
+//  - read 4 bytes to get packet leader.  If read times out (10 seconds)
+//    with a short read, or if packet leader is incorrect, then retry
+//    the read.
+//
+//  - next read 2 byte packet type.  If read times out (10 seconds) with
+//    a short read, or if packet type is bad, then start again looking
+//    for a packet leader.
+//
+//  - next read 4 byte packet Id.  If read times out (10 seconds)
+//    with a short read, or if packet Id is not what we expect, then
+//    ask for resend and restart again looking for a packet leader.
+//
+//  - next read 2 byte count.  If read times out (10 seconds) with
+//    a short read, or if byte count is greater than PACKET_MAX_SIZE,
+//    then start again looking for a packet leader.
+//
+//  - next read 4 byte packet data checksum.
+//
+//  - The packet data immediately follows the packet.  There should be
+//    ByteCount bytes following the packet header.  Read the packet
+//    data, if read times out (10 seconds) then start again looking for
+//    a packet leader.
+//
+
+typedef struct _KD_PACKET {
+    UINT32 PacketLeader;
+    UINT16 PacketType;
+    UINT16 ByteCount;
+    UINT32 PacketId;
+    UINT32 Checksum;
+} KD_PACKET, *PKD_PACKET;
+
+#define PACKET_MAX_SIZE 4000
+#define INITIAL_PACKET_ID 0x80800000    // Don't use 0
+#define SYNC_PACKET_ID    0x00000800    // Or in with INITIAL_PACKET_ID
+                                        // to force a packet ID reset.
+
+//
+// Packet lead in sequence
+//
+
+#define PACKET_LEADER                   0x30303030 //0x77000077
+#define PACKET_LEADER_BYTE              0x30
+
+#define CONTROL_PACKET_LEADER           0x69696969
+#define CONTROL_PACKET_LEADER_BYTE      0x69
+
+//
+// Packet Trailing Byte
+//
+
+#define PACKET_TRAILING_BYTE            0xAA
+
+//
+// Packet Types
+//
+
+#define PACKET_TYPE_KD_DEBUG_IO         3
+#define PACKET_TYPE_KD_ACKNOWLEDGE      4       // Packet-control type
+#define PACKET_TYPE_KD_RESEND           5       // Packet-control type
+#define PACKET_TYPE_KD_RESET            6       // Packet-control type
+#define PACKET_TYPE_MAX                 12
+
+//
+// Status Constants for reading data from comport
+//
+
+#define CP_GET_SUCCESS  0
+#define CP_GET_NODATA   1
+#define CP_GET_ERROR    2
+
+#define DBGKD_64BIT_PROTOCOL_VERSION2 6
+
+#pragma pack()
+
+
diff --git a/base/boot/Singldr/fatdevice.cpp b/base/boot/Singldr/fatdevice.cpp
new file mode 100644
index 0000000..2887616
--- /dev/null
+++ b/base/boot/Singldr/fatdevice.cpp
@@ -0,0 +1,590 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  fatdevice.cpp - Access Fat16/32 volumes from SINGLDR
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "fatdevice.h"
+#include "fnames.h"
+
+#pragma warning(disable: 4505) // Compiler generated constructor unreferenced
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Functions for reading the disk
+
+// read the FAT to find the cluster that follows currentCluster
+uint32 FatDevice::CalcNextCluster(uint32 currentCluster) __far
+{
+    uint32 SectorToRead, OffsetInSector;
+    uint32 result32;
+    uint16 result16;
+
+    OffsetInSector = (currentCluster*FatOffsetMultiplier) % (BytesPerSec);
+    SectorToRead = ((currentCluster*FatOffsetMultiplier) / (BytesPerSec)) + (RsvdSecs) + (LBAStart);
+
+    uint8 __far * buffer = FatBuffer;
+    BiosDiskRead(buffer, SectorToRead, 1, BootDrive);
+    if (FatType == 32) {
+        result32 = *((uint32 __far *)(buffer+OffsetInSector));
+        result32 = result32 & 0x0FFFFFFF; // make it 28-bits
+    }
+    else {
+        result16 = *((uint16 __far *)(buffer+OffsetInSector));
+        result32 = result16; // implicit cast
+    }
+    return result32;
+}
+
+// read cluster # ClusterNum into a (pre-allocated) buffer
+void FatDevice::ReadCluster(uint32 ClusterNum, uint8 __far * buffer) __far
+{
+    // figure out the first sector:
+    uint32 startingSector = ((ClusterNum - 2) * SecsPerClus) + FirstDataSec + LBAStart;
+
+    // do the read
+    BiosDiskRead(buffer, startingSector, SecsPerClus, BootDrive);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Functions for matching filenames
+
+// match a short filename (8.3, dot implicit)
+int FatShortNameMatch(uint8 __far * buffer, LPCHAR filename)
+{
+    int counter = 0;
+
+    // check up to the first dot or 8 chars, whatever comes first
+    while (counter < 8) {
+        if (*filename == '.' || *filename == 0) {
+            break;
+        }
+        if (UCase(buffer[counter]) != UCase(*filename)) {
+            return 0;
+        }
+        counter++;
+        filename++;
+    }
+
+    // pad out to 8 chars with spaces
+    while (counter < 8) {
+        if (UCase(buffer[counter++]) != ' ') {
+            return 0;
+        }
+    }
+
+    if (*filename == '.') {
+        filename++;
+    }
+    // check the file extension
+    while (counter < 11) {
+        if (*filename == 0) {
+            break;
+        }
+        if (UCase(buffer[counter]) != UCase(*filename)) {
+            return 0;
+        }
+        filename++;
+        counter++;
+    }
+
+    // pad out to 11 chars with spaces
+    while (counter < 11) {
+        if (UCase(buffer[counter++]) != ' ') {
+            return 0;
+        }
+    }
+    return 1;
+}
+
+// match a piece of a long filename.  This is case insensitive,
+// and assumes ascii (high byte of 2-byte strings=0)
+int FatLongNamePartialMatch(uint8 __far * buffer,
+                            LPCHAR filename,
+                            uint8 signature,
+                            uint8 checksum)
+{
+    // We don't really check 13 consecutive positions.
+    // These are the places to check in the dir entry.
+    int positions[] = {1, 3, 5, 7, 9, 14, 16, 18, 20, 22, 24, 28, 30};
+    int counter = 0;
+
+    // check entry signature in position 0
+    if (buffer[0] != signature) {
+        return 0;
+    }
+
+    // check FAT LFN signature in positions 11, 26, 27
+    if (buffer[11] != 0x0F || buffer[26] != 0 || buffer[27] != 0) {
+        return 0;
+    }
+
+    // verify checksum
+    if (buffer[13] != checksum) {
+        return 0;
+    }
+
+    // advance the filename to the current "segment" as indicated by signature
+    filename += (13 * ((signature & ~0x40)-1));
+
+    // compare the characters of the filename, and pad it out to 13
+    // with 0x0000 and 0xFFFF's
+    while (*filename != 0 && counter < 13) {
+        // if this char doesn't match, fail instantly
+        if ((UCase(buffer[positions[counter]]) != UCase(*filename)) ||
+            (buffer[positions[counter]+1] != 0))
+        {
+            return 0;
+        }
+        counter++;
+        filename++;
+    }
+
+    // all that's left is to check the padding
+    if (counter < 13) {
+        if ((buffer[positions[counter]] != 0) ||
+            buffer[positions[counter]+1] != 0)
+        {
+            return 0;
+        }
+        counter++;
+
+        while (counter < 13) {
+            if ((buffer[positions[counter]] != 0xFF) ||
+                buffer[positions[counter]+1] != 0xFF)
+            {
+                return 0;
+            }
+            counter++;
+        }
+    }
+    return signature;
+}
+
+// this is straight out of the Fat docs:  compute the checksum for
+// an 8.3 filename
+uint8 FatChecksum(uint8 __far * buffer)
+{
+    uint8 checksum = 0;
+    for (int i = 0; i < 11; i++) {
+        checksum = (uint8)
+            (((checksum & 1) ? 0x80 : 0) + (checksum>>1) + buffer[i]);
+    }
+    return checksum;
+}
+
+// Search from the first cluster of a directory entry to find the Fat
+// encoding of a filename.  We accomplish this through a FSM.  Fat16RootDir
+// is a special flag because Fat16 and Fat32 differ on the representation
+// of a root directory.  The Fat32 code treats the root directory like any
+// other.  The Fat16 code does not.
+int FatDevice::DirLookup(LPCHAR filename,
+                         uint8  /* len */,
+                         FilePtr Directory,
+                         FilePtr File,
+                         int Fat16RootDir) __far
+{
+    // points into the data we've loaded from disk:
+    uint8 __far * buffer;
+
+    // we will use the generic term "block" to refer to a readable
+    // entity on the disk, since the Fat16 root dir is in sectors while
+    // the rest of Fat is in clusters
+    uint32 totalBlocks, blockCounter = 0;
+    uint32 nextBlock, entriesPerBlock, entryCounter = 0;
+
+    if (Fat16RootDir) {
+        totalBlocks = RootDirSecs;
+        entriesPerBlock = BytesPerSec / 32;
+        nextBlock = RootStartSec  + LBAStart;
+    }
+    else {
+        totalBlocks = 2;  // keep this less than blockCounter
+        entriesPerBlock = DirEntriesPerClus;
+        nextBlock = Directory->FirstBlock;
+    }
+
+    // "segment" will refer to the portion of the LongFileName
+    // about which we care, since it will be in 13-char chunks
+    uint8 totalSegs, segCounter, segsMatched = 0;
+    totalSegs = FullFNameLength(filename);
+    totalSegs = (uint8) ((totalSegs + 12) / 13);
+    segCounter = totalSegs;
+
+    // long file name verification requires a checksum, as well
+    // as matching a special "entry signature" in byte[0] of the
+    // directory entry
+    uint8 checksum = 0, signature = 0;
+
+    // the primary loop fetches data to check
+    while (blockCounter < totalBlocks) {
+        // read some data and set a counter for when we need more data
+        if (Fat16RootDir) {
+            BiosDiskRead(FatBuffer, nextBlock, 1, BootDrive);
+            entryCounter = BytesPerSec / 32;
+        }
+        else {
+            ReadCluster(nextBlock, FatBuffer);
+            entryCounter = DirEntriesPerClus;
+        }
+        buffer = FatBuffer;
+
+        // the inner loop checks entries
+        while (entryCounter > 0) {
+            // failure condition #1:  if the first bit is zero,
+            // there are no more directory entries.
+            if (buffer[0] == 0) {
+                return -1;
+            }
+
+            // success condition #1:  do we match on 8.3?
+            // success condition #2:  if segCounter == 0, does checksum match?
+            if ((FatShortNameMatch(buffer, filename) == 1) ||
+                (segCounter == 0 && FatChecksum(buffer) == checksum))
+            {
+                File->FirstBlock = (*((uint16 __far *)(buffer+20))<<16) +
+                                   *((uint16 __far *)(buffer+26));
+                File->Size = *((uint32 __far *)(buffer+28));
+                return 0;
+            }
+
+            // progress condition: do we match on the current
+            // segment of long file name?
+            // first calc checksum and the signature
+            if (segCounter == totalSegs) {
+                signature = (uint8) (segCounter | 0x40);
+                checksum = buffer[13];
+            }
+            else {
+                signature = segCounter;
+            }
+            // now do the check
+            if (signature == FatLongNamePartialMatch(buffer, filename, signature, checksum)) {
+                // advance to next directory entry and earlier
+                // segment in the filename
+                segCounter--;
+                buffer += 32;
+                entryCounter--;
+            }
+            else {
+                // if we were checking the first LFN entry then it's
+                // time to advance the counter
+                if (segCounter == totalSegs) {
+                    buffer += 32;
+                    entryCounter--;
+                }
+                else {
+                    // otherwise this might just be the start of the
+                    // correct entry, so don't advance the counter,
+                    // just reset to the first segment of the filename
+                    segCounter = totalSegs;
+                }
+            }
+        }
+        // calculate next data block
+        if (Fat16RootDir == 1) {
+            nextBlock++;
+            blockCounter++;
+        }
+        else {
+            nextBlock = CalcNextCluster(nextBlock);
+            if (nextBlock >= (EndOfClusterMarker))
+                blockCounter = 2;
+        }
+    }
+    return -1;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Public Functions
+
+int FatDevice::OpenDevice() __far
+{
+    uint8 expectedType = FatType;
+    int entrycounter = 4;   // up to 4 entries in partition table
+
+    // allocate memory for reading a sector (assume 512-byte sector size)
+    MbrBuffer = (uint8 __far *) alloc(512, 0);
+
+    // Read the MBR
+    BiosDiskRead(MbrBuffer, 0, 1, BootDrive);
+
+    // temp to make using far pointers easier
+    uint8 __far * buffer = MbrBuffer;
+
+    // search the partition table for a partition whose
+    // type matches our desired type
+    buffer += 446;  // first entry is at offset 446
+    while (entrycounter > 0) {
+        // does the partition type match expectedtype
+        if (buffer[4] == 0x0c && expectedType == 32) {
+            FatType = 32;
+            break;
+        }
+        if (buffer[4] == 0x0e && expectedType == 16) {
+            FatType = 16;
+            break;
+        }// try the next entry
+        entrycounter--;
+        buffer += 16;
+    }
+    // exceptional condition, should never happen...
+    if (entrycounter == 0) {
+        printf("USB: Valid Fat partition not found\n");
+        return -1;
+    }
+
+    // now get the first sector of the active partition, and the
+    // partition size
+    LBAStart = *((uint32 __far *)(buffer+8));
+    LBASize  = *((uint32 __far *)(buffer+12));
+
+    // we are done with the MBR.  now we need to read the boot sector
+    // to get the FAT parameters
+    BiosDiskRead(MbrBuffer, LBAStart, 1, BootDrive);
+    buffer = MbrBuffer;
+
+    // Verify the FileSystem type:
+    // the Microsoft Fat32 documentation is very specific about how this ought to be done.
+    // However, this is rather ugly, because it requires information that may not be in the bootsector.
+    // For example, suppose that the volume is Fat16, and the volume is in very bad shape.
+    // we may read 0 for a 16-bit value, and then look in an invalid portion of the boot sector for a 32-bit value.
+    // UGH!  Well, we'll do it nonetheless:
+
+    // read data that should always be in the same place, no matter what
+    BytesPerSec = *((uint16 __far *)(buffer+11));
+    SecsPerClus = buffer[13];
+    RsvdSecs = *((uint16 __far *)(buffer+14));
+    NumFats = buffer[16];
+    RootDirEntries = *((uint16 __far *)(buffer+17));
+    HiddenSecs = *((uint32 __far *)(buffer+28));
+
+    // compute the NumFatSecs and TotalSecs fields
+    // (i.e. read one value, if it is zero, read another)
+    uint16 tmp16;
+    tmp16 = *((uint16 __far *)(buffer+19));
+    if (tmp16 == 0) {
+        TotalSecs = *((uint32 __far *)(buffer+32));
+    }
+    else {
+        TotalSecs = tmp16;
+    }
+
+    tmp16 = *((uint16 __far *)(buffer+22));
+    if (tmp16 == 0) {
+        NumFatSecs = *((uint32 __far *)(buffer+36));
+    }
+    else {
+        NumFatSecs = tmp16;
+    }
+
+    // now we may compute RootDirSectors =
+    // ((BPB_RootEntCnt*32) + (BPB_BytsPerSec-1))/BPB_BytesPerSec
+    RootDirSecs = ((RootDirEntries*32) + (BytesPerSec-1))/BytesPerSec;
+
+    // Next compute the total data sectors in the volume:
+    TotalDataSecs = TotalSecs - (RsvdSecs + (NumFats*NumFatSecs) + RootDirSecs);
+
+    // Finally, compute the # of clusters in the volume:
+    ClusterCount = TotalDataSecs / SecsPerClus;
+
+    // Do the verification:
+    if (!(ClusterCount >= 4085 && ClusterCount < 65525 && FatType == 16) && !(ClusterCount >= 65525 && FatType == 32)) {
+        printf("USB: File System Type does not match Partition Table\n");
+        return -1; // the partition table did not match the boot sector.
+                   // we can't trust this filesystem.
+    }
+
+    // now we can set fields that are FAT-type specific:
+    if (FatType == 16) {
+        RootStartClus = 0;
+        EndOfClusterMarker = 0xFFF8;
+        BadClusterMarker = 0xFFF7;
+        FatOffsetMultiplier = 2;
+        RootStartSec = (RsvdSecs + (NumFats*NumFatSecs));
+    }
+    else {
+        RootStartClus = *((uint32 __far *)(buffer+44));
+        EndOfClusterMarker = 0x0FFFFFF8;
+        BadClusterMarker = 0x0FFFFFF7;
+        FatOffsetMultiplier = 4;
+    }
+
+    // final computations:
+    FirstDataSec = (NumFats*NumFatSecs) + RsvdSecs + RootDirSecs;
+    BytesPerClus = SecsPerClus * BytesPerSec;
+    DirEntriesPerClus = BytesPerClus/32;
+
+    // allocate data for remaining fs buffers:
+    FatBuffer = (uint8 __far *) alloc((uint16)BytesPerClus, 0); // exactly the size of a cluster
+    FileBuffer = (uint8 __far *) alloc(0x7FFF, 0);    // 32KB
+
+    // display results
+#if 0
+    printf("\nDisk Configuration\n");
+    printf("------------------------------\n");
+    printf("Boot Drive = %2xh\n", BootDrive);
+    printf("First Sector of Active Partition = %8lxh\n", LBAStart);
+    printf("Sectors in Partition = %8lxh\n", LBASize);
+    printf("Bytes/Sector = %4xh\n", BytesPerSec);
+    printf("\nFileSystem Configuration\n");
+    printf("------------------------------\n");
+    printf("Fat Type = FAT%d\n", FatType);
+    printf("Sectors/Cluster  = %2xh\n", SecsPerClus);
+    printf("Reserved Sectors = %4xh\n", RsvdSecs);
+    printf("Number of Fats = %2xh\n", NumFats);
+    printf("Hidden Sectors = %8lxh\n", HiddenSecs);
+    printf("Sectors per Fat = %8lxh\n", NumFatSecs);
+    printf("First Cluster of Root Dir = %8lxh\n", RootStartClus);
+    printf("First Data Sector in Partition = %8lxh\n", FirstDataSec);
+    printf("Bytes/Cluster = %8lxh\n", BytesPerClus);
+    printf("Dir Entries/Cluster = %8lxh\n", DirEntriesPerClus);
+#endif
+
+    return 0;
+}
+
+int FatDevice::CloseDevice() __far
+{
+    return 0;
+}
+
+int FatDevice::GetFileProperties(LPCHAR filename,
+                                 FilePtr file,
+                                 FilePtr directory) __far
+{
+    LPCHAR fname = filename;
+    uint8 len;
+    int result;
+    char c;
+    int Fat16RootDir = (FatType == 16); // Fat16 Root Dir is special.
+                                        // Flag 1st Fat16 read
+
+    // we'll continually recycle the File and Directory structs
+    file->Size = 0;
+    file->FirstBlock = 0;
+    directory->FirstBlock = RootStartClus;
+
+    // traverse through the filename, identifying tokens and
+    // looking them up in the current context
+    bool done = 0;
+    while (!done) {
+        // consume the leading '/'
+        while (fname[0] == '/') {
+            fname++;
+        }
+
+        // failure condition:  whitespace
+        if (IsEndToken(fname[0])) {
+            printf("FAT: Invalid filename: ");
+            PutFName(filename);
+            printf("\n");
+            return -1;
+        }
+
+        // find the next separator in the filename ('/' or whitespace),
+        // store it, and replace it with 0
+        len = ShortFNameLength(fname);
+        c = fname[len];
+        fname[len] = 0;
+
+        // look it up and put the results into File
+        result = DirLookup(fname, len, directory, file, Fat16RootDir);
+
+        // undo the change we made to the filename:
+        fname[len] = c;
+
+        // now shut off the Fat16RootDir flag for subsequent directory scans
+        Fat16RootDir = 0;
+        if (result == -1) {
+            printf("FAT: File not found: ");
+            PutFName(filename);
+            printf("\n");
+            return -1;
+        }
+
+        // check loop termination condition
+        if (c != '/') {
+            done = 1;
+        }
+        else {
+            fname += len;
+            // transfer results from File into Directory
+            directory->FirstBlock = file->FirstBlock;
+            directory->Size = file->Size;
+            file->Size = 0;
+            file->FirstBlock = 0;
+        }
+    }
+    return 0;
+}
+
+INT16 FatDevice::ReadFileLow(LPCHAR /* filename */,
+                             FilePtr file,
+                             uint8 __far * buffer) __far
+{
+    uint32 bytesread = 0;
+    uint8 __far * destination = buffer;
+    uint32 currentcluster = file->FirstBlock;
+
+    while (bytesread < file->Size) {
+        // read the current cluster
+        if (currentcluster == BadClusterMarker) {
+            printf("FAT: Bad Cluster encountered\n");
+            return -1;
+        }
+        ReadCluster(currentcluster, destination);
+        currentcluster = CalcNextCluster(currentcluster);
+        bytesread += BytesPerClus;
+        destination = (uint8 __far *) _MK_FP(_FP_SEG(destination), (_FP_OFF(destination)+BytesPerClus));
+    }
+    return 0;
+}
+
+UINT32 FatDevice::ReadFileHigh(LPCHAR  /* filename */,
+                               FilePtr file,
+                               uint32 destinationAddress,
+                               uint32 /* cbDestination */) __far
+{
+    uint32 bytesread = 0;
+    uint32 nextdestination = destinationAddress;
+    uint32 currentcluster = file->FirstBlock;
+    uint32 sector;
+
+    uint32 bufferaddress = PointerToUint32(FileBuffer);
+
+    while (bytesread < file->Size) {
+        // ensure cluster is valid
+        if (currentcluster == BadClusterMarker) {
+            printf("FAT: Bad Cluster encountered\n");
+            return bytesread;
+        }
+
+        // calc true sector for this cluster
+        sector = ((currentcluster-2) * SecsPerClus)+ FirstDataSec + LBAStart;
+
+        // do the read
+        BiosDiskRead(FileBuffer, sector, SecsPerClus, BootDrive);
+
+        // move the data into extended memory
+        PModeTransfer(bufferaddress, nextdestination, BytesPerClus);
+
+        // get next cluster number
+        currentcluster = CalcNextCluster(currentcluster);
+
+        // update the count of bytes read
+        bytesread += BytesPerClus;
+
+        // and update the destination address
+        nextdestination += BytesPerClus;
+    }
+
+    // since we read full sectors at the bios level,
+    // we should trim our count back down a bit here
+    if (bytesread > file->Size)
+        bytesread = file->Size;
+    return bytesread;
+}
diff --git a/base/boot/Singldr/fatdevice.h b/base/boot/Singldr/fatdevice.h
new file mode 100644
index 0000000..2893463
--- /dev/null
+++ b/base/boot/Singldr/fatdevice.h
@@ -0,0 +1,122 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  fatdevice.h - implementation of BootDevice class for Fat16/32 volumes
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#ifndef __FATDEVICE_H__
+#define __FATDEVICE_H__
+
+#include "singldr.h"
+#include "bootdevice.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Linked-in Functions (not declared in any headers)
+
+// from singldr0.asm
+extern "C" uint16 __cdecl
+BiosDiskRead(uint8 __far * addr,
+             uint32 diskblock,
+             uint16 blocks,
+             uint16 driveid);
+
+extern "C" uint16 __cdecl
+PModeTransfer(uint32 StartAddress,
+              uint32 DestinationAddress,
+              uint32 bytes);
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Declaration for class FatDevice
+
+#pragma pack(4)
+struct __near FatDevice : BootDevice
+{
+private:
+    // disk characteristics
+    uint8   BootDrive;
+
+    // partition characteristics
+    uint32  LBAStart;
+    uint32  LBASize;
+
+    // Fat characteristics (read from boot sector, same for all FAT types)
+    uint16  BytesPerSec;
+    uint8   SecsPerClus;
+    uint16  RsvdSecs;
+    uint8   NumFats;
+    uint16  RootDirEntries;
+    uint32  HiddenSecs;
+
+    // Fat characteristics (location in boot sector differs by FAT type)
+    uint32  TotalSecs;
+    uint32  NumFatSecs;
+
+    // Fat characteristics (computed)
+    uint16  RootDirSecs;
+    uint32  TotalDataSecs;
+    uint32  ClusterCount;
+    uint8   FatType;
+    uint32  RootStartClus;  // for fat32
+    uint32  RootStartSec;   // for fat16
+    uint32  FirstDataSec;
+    uint32  BytesPerClus;
+    uint32  DirEntriesPerClus;
+    uint32  EndOfClusterMarker;
+    uint32  BadClusterMarker;
+    uint8   FatOffsetMultiplier;
+
+    // data buffers -- these are reused frequently.  Be careful
+    //                 about what you assume is in them.
+    uint8 __far * MbrBuffer;
+    uint8 __far * FatBuffer;
+    uint8 __far * FileBuffer;
+
+    uint32 __near CalcNextCluster(uint32 currentCluster) __far;
+
+    void __near ReadCluster(uint32 ClusterNum, uint8 __far * buffer) __far;
+
+    int __near DirLookup(LPCHAR filename,
+                         uint8 len,
+                         FilePtr directory,
+                         FilePtr file,
+                         int Fat16RootDir) __far;
+
+public:
+
+    // constructor
+    FatDevice(uint8 driveId, uint8 expectedType) __far
+    {
+        // set the boot drive and expected type
+        this->BootDrive = driveId;
+        this->FatType = expectedType;
+
+        // since this is global, define it as part of constructing the object
+        // for maximum compatibility, we just allocate it and leave it
+        // null (alloc zeros it)
+        this->CmdLine = (uint16 __far *)alloc(2048, 2);
+    }
+
+    // implement the virtual functions from the base class
+    int __near OpenDevice() __far;
+
+    int __near CloseDevice() __far;
+
+    int __near GetFileProperties(LPCHAR  filename,
+                                 FilePtr file,
+                                 FilePtr directory) __far;
+
+    INT16 __near ReadFileLow(LPCHAR  filename,
+                             FilePtr file,
+                             uint8 __far * buffer) __far;
+
+    UINT32 __near ReadFileHigh(LPCHAR  filename,
+                               FilePtr file,
+                               uint32  buffer,
+                               uint32 cbBuffer) __far;
+};
+
+#pragma pack()
+#endif
diff --git a/base/boot/Singldr/fnames.cpp b/base/boot/Singldr/fnames.cpp
new file mode 100644
index 0000000..6a27c55
--- /dev/null
+++ b/base/boot/Singldr/fnames.cpp
@@ -0,0 +1,62 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  fnames.cpp - routines for manipulating strings representing filenames
+//               and lists of filenames
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "fnames.h"
+
+// return the uppercase equivalent of an ASCII char
+char UCase(char c)
+{
+    if (c >= 'a' && c <= 'z' ) {
+        return (char) (c - ('a'-'A'));
+    }
+    return c;
+}
+
+// return true if the character is '/', '\t', EOF, CR, or LF
+int IsEndToken(char c)
+{
+    return (c==10 || c==13 || c==0 || c=='/' || c=='\t');
+}
+
+// given a filename, return its length
+uint8 FullFNameLength(LPCHAR fname)
+{
+    uint8 len=0;
+    while(fname[len]!=' ' && fname[len]!='\t'  && fname[len]!=0  && fname[len]!=13  && fname[len]!=10)
+        len++;
+    return len;
+}
+
+// given a filename, the length of the first token
+uint8 ShortFNameLength(LPCHAR fname)
+{
+    uint8 len=0;
+    while(!IsEndToken(fname[len]) && fname[len]!=' ')
+        len++;
+    return len;
+}
+
+void PutFName(LPCHAR fname)
+{
+    int n = FullFNameLength(fname);
+    for (int i = 0; i < n; i++) {
+        PutChar(fname[i]);
+    }
+}
+
+void FNameToCStr(LPCHAR lpcFName, LPCHAR lpszCStr, UINT32 cbCStr)
+{
+    INT32 n = FullFNameLength(lpcFName);
+    if ((INT32)cbCStr <= n) {
+        n = (INT32)cbCStr - 1;
+    }
+    lpszCStr[n] = '\0';
+    while (--n >= 0) {
+        *lpszCStr++ = *lpcFName++;
+    }
+}
diff --git a/base/boot/Singldr/fnames.h b/base/boot/Singldr/fnames.h
new file mode 100644
index 0000000..a4d0753
--- /dev/null
+++ b/base/boot/Singldr/fnames.h
@@ -0,0 +1,38 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  fnames.h - routines for manipulating strings representing filenames
+//             and lists of filenames
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#ifndef __FILEMANIP_H__
+#define __FILEMANIP_H__
+
+#include "singldr.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// These are general-purpose functions for manipulating filenames
+
+// return the uppercase equivalent of an ASCII char
+char UCase(char c);
+
+// return true if the character is '/', '\t', EOF, CR, or LF
+int IsEndToken(char c);
+
+// given a filename, return its length (i.e. foo/boo/waloo
+// returns 13)
+uint8 FullFNameLength(LPCHAR fname);
+
+// given a filename, the length of the first token
+// (i.e. foo/boo/waloo returns 3)
+uint8 ShortFNameLength(LPCHAR fname);
+
+// write filename to screen and debugger
+void PutFName(LPCHAR fname);
+
+// copy filename to zero terminated string
+void FNameToCStr(LPCHAR lpcFName, LPCHAR lpszCStr, UINT32 cbCStr);
+
+#endif
diff --git a/base/boot/Singldr/inifile.cpp b/base/boot/Singldr/inifile.cpp
new file mode 100644
index 0000000..9f639e9
--- /dev/null
+++ b/base/boot/Singldr/inifile.cpp
@@ -0,0 +1,201 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  inifile.cpp - Parser/Iterator for ini file generated by DistroBuilder
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  Note: The format is assumed to be:
+//
+//   #############################################
+//   # Header comment
+//   #############################################
+//   Hash-MD5=XXX Size=XXX Path=XXX/YYY/ZZZ
+//   Hash-MD5=XXX Size=XXX Path=XXX/YYY/ZZZ
+//   ...
+//   ############################################
+//
+#include "inifile.h"
+
+#pragma warning(disable: 4505) // Compiler generated constructor unreferenced
+
+// ----------------------------------------------------------------------------
+// Utility routines
+
+static bool IsWhitespace(UINT8 value)
+{
+    return (bool)(value == (UINT8)' ' || value == (UINT8)'\t');
+}
+
+static LPUINT8
+SkipWhitespace(LPUINT8 pBuffer, LPUINT8 pBufferEnd)
+{
+    while (pBuffer != pBufferEnd && IsWhitespace(*pBuffer)) {
+        pBuffer++;
+    }
+    return pBuffer;
+}
+
+static LPUINT8
+SkipLine(LPUINT8 pBuffer, LPUINT8 pBufferEnd)
+{
+    // Skip ASCII text
+    while (pBuffer != pBufferEnd && *pBuffer >= 32) {
+        pBuffer++;
+    }
+    // Skip control characters
+    while (pBuffer != pBufferEnd && *pBuffer < 32) {
+        pBuffer++;
+    }
+    return pBuffer;
+}
+
+static LPUINT8
+SkipComments(LPUINT8 pBuffer, UINT32 cbBuffer)
+{
+    LPUINT8 pBufferEnd = pBuffer + cbBuffer;
+
+    while (pBuffer != pBufferEnd) {
+        pBuffer = SkipWhitespace(pBuffer, pBufferEnd);
+        if (*pBuffer != '#') {
+            return pBuffer;
+        }
+        pBuffer = SkipLine(pBuffer, pBufferEnd);
+    }
+    return pBufferEnd;
+}
+
+static bool
+ReverseMatch(LPUINT8 pBufferA, LPUINT8 pBufferB, INT8 nLength)
+{
+    while (--nLength >= 0) {
+        if (*pBufferA-- != *pBufferB--) {
+            return 0;
+        }
+    }
+    return 1;
+}
+
+static LPUINT8
+FindAndSkipString(LPCSTR pChars, INT8 nChars,
+                  LPUINT8 pBuffer, LPUINT8 pBufferEnd)
+{
+    pBuffer += nChars - 1;
+
+    if (pBuffer > pBufferEnd) {
+        return pBufferEnd;
+    }
+
+    while (pBuffer < pBufferEnd) {
+        if (*pBuffer == pChars[nChars - 1] &&
+            ReverseMatch(pBuffer, (LPUINT8)(pChars + nChars - 1), nChars)) {
+                return pBuffer + 1;
+        }
+        pBuffer++;
+    }
+
+    return pBufferEnd;
+}
+
+static UINT32
+ParseFileSize(LPUINT8 pBuffer, LPUINT8 pBufferEnd)
+{
+    UINT32 nBytes = 0;
+    pBuffer = FindAndSkipString("Size=", 5, pBuffer, pBufferEnd);
+    while (pBuffer != pBufferEnd &&
+           *pBuffer >= (UINT8)'0' && *pBuffer <= (UINT8)'9') {
+        nBytes *= 10;
+        nBytes += (UINT32)(*pBuffer - (UINT8)'0');
+        pBuffer++;
+    }
+    return nBytes;
+}
+
+static LPUINT8
+ParseFileName(LPUINT8 pBuffer, LPUINT8 pBufferEnd)
+{
+    pBuffer = FindAndSkipString("Path=", 5, pBuffer, pBufferEnd);
+    // Force null termination
+    for (LPUINT8 pTemp = pBuffer; pTemp != pBufferEnd; pTemp++) {
+        if (*pTemp < 32) {
+            *pTemp = 0;
+            break;
+        }
+    }
+    return pBuffer;
+}
+
+static LPUINT8 SkipToEndOfFile(LPUINT8 pBuffer, LPUINT8 pBufferEnd)
+{
+    // Last line of file is a comment.
+    while (pBuffer != pBufferEnd && *pBuffer != '#') {
+        pBuffer++;
+    }
+    return pBuffer;
+}
+
+// ----------------------------------------------------------------------------
+// IniFile class
+
+IniFile::IniFile(LPUINT8 pBuffer, UINT32 cbBuffer) __far
+{
+    this->_pBuffer    = SkipComments(pBuffer, cbBuffer);
+    this->_pBufferEnd = SkipToEndOfFile(this->_pBuffer, pBuffer + cbBuffer);
+    this->_pCurrent   = this->_pBuffer;
+}
+
+UINT16
+IniFile::GetFileCount() __far
+{
+    LPUINT8 pBuffer = this->_pBuffer;
+    UINT16 nFiles = 0;
+
+    while (pBuffer != this->_pBufferEnd) {
+        if (ParseFileSize(pBuffer, this->_pBufferEnd) == 0) {
+            break;
+        }
+        pBuffer = SkipLine(pBuffer, this->_pBufferEnd);
+        nFiles++;
+    }
+    return nFiles;
+}
+
+UINT32
+IniFile::GetTotalBytes() __far
+{
+    LPUINT8 pBuffer = this->_pBuffer;
+    UINT32 nTotalBytes = 0;
+    while (pBuffer != this->_pBufferEnd) {
+        nTotalBytes += ParseFileSize(pBuffer, this->_pBufferEnd);
+        pBuffer = SkipLine(pBuffer, this->_pBufferEnd);
+    }
+    return nTotalBytes;
+}
+
+UINT32
+IniFile::GetCurrentFileSize() __far
+{
+    return ParseFileSize(this->_pCurrent, this->_pBufferEnd);
+}
+
+LPUINT8
+IniFile::GetCurrentFileName() __far
+{
+    LPUINT8 pFileName = ParseFileName(this->_pCurrent, this->_pBufferEnd);
+    if (pFileName != this->_pBufferEnd) {
+        return pFileName;
+    }
+    return NULL;
+}
+
+void
+IniFile::Rewind() __far
+{
+    this->_pCurrent = this->_pBuffer;
+}
+
+bool
+IniFile::MoveNext() __far
+{
+    this->_pCurrent = SkipLine(this->_pCurrent, this->_pBufferEnd);
+    return (bool)(this->_pCurrent != this->_pBufferEnd);
+}
diff --git a/base/boot/Singldr/inifile.h b/base/boot/Singldr/inifile.h
new file mode 100644
index 0000000..dc69c37
--- /dev/null
+++ b/base/boot/Singldr/inifile.h
@@ -0,0 +1,42 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  inifile.h - Parser/Iterator for ini file generated by DistroBuilder
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  Note: The format is assumed to be a bunch of #-prefixed
+//  comment lines followed by space delimited lines describing
+//  files thus:
+//
+//   Hash-MD5=XXX Size=XXX Path=XXX/YYY/ZZZ
+//
+
+#ifndef __INIFILE_H__
+#define __INIFILE_H__
+
+#include "singldr.h"
+
+struct __near IniFile
+{
+  private:
+    LPUINT8 _pBuffer;
+    LPUINT8 _pBufferEnd;
+    LPUINT8 _pCurrent;
+
+    IniFile();
+    IniFile(const IniFile&);
+
+  public:
+    IniFile(LPUINT8 pBuffer, UINT32 cbBuffer) __far;
+
+    void   Rewind() __far;
+    bool   MoveNext() __far;
+
+    LPUINT8 GetCurrentFileName() __far;
+    UINT32  GetCurrentFileSize() __far;
+
+    UINT16 GetFileCount() __far;
+    UINT32 GetTotalBytes() __far;
+};
+
+#endif // __INIFILE_H__
diff --git a/base/boot/Singldr/jolietdevice.cpp b/base/boot/Singldr/jolietdevice.cpp
new file mode 100644
index 0000000..e87230e
--- /dev/null
+++ b/base/boot/Singldr/jolietdevice.cpp
@@ -0,0 +1,279 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  jolietdevice.cpp - Access Joliet volumes from SINGLDR
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "jolietdevice.h"
+#include "fnames.h"
+
+#pragma warning(disable: 4505) // Compiler generated constructor unreferenced
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Data
+static uint32 MaxBlocksInBuffer;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Function
+
+// helper function to match an ASCII string from the ini file
+// against a Unicode entry in a directory
+int CompareJolietEntry(LPCHAR filename, uint8 len, uint8 __far * entry)
+{
+    // first check length of file identifier at offset 32
+    if (2 * len != entry[32]) {
+        return 0;
+    }
+
+    // now try to match all chars
+    for (uint8 indx = 0; indx < len-1; indx++) {
+        if (UCase(filename[indx]) != UCase(entry[33 + 2 * indx + 1])) {
+            return 0;
+        }
+    }
+    return 1;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Method
+
+// given a file name and a directory, populate a FilePtr structure
+// or return an empty one if the file doesn't exist in the directory
+int JolietDevice::DirLookup(LPCHAR filename,
+                            uint8 len,
+                            FilePtr directory,
+                            FilePtr file) __far
+{
+    uint16 numblocks =
+        (uint16) ((directory->Size + BlockSize - 1) / BlockSize);
+
+    uint8 __far * buffer = FileBuffer; // for progressing through buffer
+    uint16 bytecounter = 0; // count # bytes of dir entry we've already checked
+
+    // read the directory from the disk (32KB limit)
+    if (directory->Size>0x7FFF) {
+        printf("Directory too large\n");
+        return -1;
+    }
+    BiosDiskRead(buffer,
+                 directory->FirstBlock,
+                 numblocks,
+                 (uint16)BootDrive);
+
+    // scan through entries:
+    while (bytecounter < directory->Size) {
+        // check this entry
+        if (CompareJolietEntry(filename, len, buffer) == 1) {
+            // on success, save the info for this file and exit
+            file->FirstBlock = *((uint32 __far *)(buffer+2));
+            file->Size = *((uint32 __far *)(buffer+10));
+            return 0;
+        }
+        else {
+            uint8 tmp = buffer[0];
+            buffer += tmp;
+            bytecounter += (uint16)buffer[0];
+            // handle the zero-padding that might exist to
+            // block-align the next entry:
+            while (buffer[0] == 0 && bytecounter < directory->Size) {
+                buffer++;
+                bytecounter++;
+            }
+        }
+        if (bytecounter == directory->Size) {
+            return -1;
+        }
+    }
+    return -1;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Public Methods
+
+static int IsJolietSignature(uint8 __far* buffer)
+{
+        // check the signatures:  chars 1-5 = "CD001" and
+        // chars 88-90 = 0x25 0x2fh 0x45
+    return (buffer[0] == 2 &&
+            buffer[1] == 'C' &&
+            buffer[2] == 'D' &&
+            buffer[3] == '0' &&
+            buffer[4] == '0' &&
+            buffer[5] == '1' &&
+            buffer[88] == 0x25 &&
+            buffer[89] == 0x2f &&
+            buffer[90] == 0x45);
+}
+
+int JolietDevice::OpenDevice() __far
+{
+    uint8 currentblock;
+
+    // allocate memory for reading a block
+    FileBuffer = (uint8 __far *) alloc(0x7FFF, 0); // 32KB
+
+    // temp to make using far pointers easier
+    uint8 __far * buffer = FileBuffer;
+
+    // find the SVD
+    currentblock = 16;
+    do {
+        BiosDiskRead(FileBuffer, currentblock, 1, BootDrive);
+        currentblock++;
+        if (buffer[0] == 0xFF) {
+            // somehow we couldn't find the SVD even
+            // though we booted off of it...
+            printf("Unable to find Joliet SVD");
+            return -1;
+        }
+    } while (!IsJolietSignature(buffer));
+
+    // get the block size
+    uint16 tmp16 = *((uint16 __far *)(buffer+128));
+    BlockSize = tmp16;
+    MaxBlocksInBuffer = 0x7FFF / BlockSize;
+
+    // read the root directory info
+    RootStartBlock = *((uint32 __far *)(buffer+158));
+    RootSize = *((uint32 __far *)(buffer+166));
+
+    // display results
+    printf("\nCD Configuration\n");
+    printf("------------------------------\n");
+    printf("Boot Drive = %2xh\n", BootDrive);
+    printf("Block Size = %8xh\n", BlockSize);
+    printf("Root Start = %8xh\n", RootStartBlock);
+    printf("Root Size  = %8xh\n", RootSize);
+
+    return 0;
+}
+
+int JolietDevice::CloseDevice() __far
+{
+    return 0;
+}
+
+int JolietDevice::GetFileProperties(LPCHAR filename,
+                                    FilePtr file,
+                                    FilePtr directory) __far
+{
+    LPCHAR fname = filename;
+    uint8 len;
+    int result;
+    char c;
+
+    // we'll continually recycle the File and Directory structs
+    directory->FirstBlock = RootStartBlock;
+    directory->Size = RootSize;
+    file->Size = 0;
+    file->FirstBlock = 0;
+
+    // traverse through the filename, identifying tokens and
+    // looking them up in the current context
+    bool done = 0;
+    while (!done) {
+        // consume the leading '/'
+        while (fname[0] == '/') {
+            fname++;
+        }
+
+        // failure condition:  whitespace
+        if (IsEndToken(fname[0])) {
+            printf("CD: Invalid filename: ");
+            PutFName(filename);
+            printf("\n");
+            return -1;
+        }
+
+        // find the next separator in the filename ('/' or whitespace),
+        // store it, and replace it with 0
+        len = ShortFNameLength(fname);
+        c = fname[len];
+        fname[len] = 0;
+
+        // look it up and put the results into File
+        result = DirLookup(fname, len, directory, file);
+
+        // undo the change we made to the filename:
+        fname[len] = c;
+
+        if (result == -1) {
+            printf("CD: File not found: ");
+            PutFName(filename);
+            printf("\n");
+            return -1;
+        }
+
+        // check loop termination condition
+        if (c != '/') {
+            done = 1;
+        }
+        else {
+            fname += len;
+            // transfer results from File into Directory
+            directory->FirstBlock = file->FirstBlock;
+            directory->Size = file->Size;
+            file->Size = 0;
+            file->FirstBlock = 0;
+        }
+    }
+    return 0;
+}
+
+INT16 JolietDevice::ReadFileLow(LPCHAR /* filename */,
+                                FilePtr file,
+                                uint8 __far * buffer) __far
+{
+    uint32 size = file->Size;
+    uint16 blocks = (uint16) ((size + BlockSize - 1) / BlockSize);
+
+    BiosDiskRead(buffer, file->FirstBlock, blocks, BootDrive);
+    return 0;
+}
+
+UINT32 JolietDevice::ReadFileHigh(LPCHAR  /* filename */,
+                                  FilePtr file,
+                                  uint32 destinationAddress,
+                                  uint32 /* cbDestinationAddress */) __far
+{
+    uint32 bytesread = 0;
+    uint32 nextdestination = destinationAddress;
+    uint32 nextblocknum = file->FirstBlock;
+    uint32 bufferaddress = PointerToUint32(FileBuffer);
+
+    while (bytesread < file->Size) {
+        uint32 blocksThisRead = ((file->Size - bytesread) + BlockSize - 1) / BlockSize;
+        if (blocksThisRead > MaxBlocksInBuffer) {
+            blocksThisRead = MaxBlocksInBuffer;
+        }
+        uint32 bytesThisRead = blocksThisRead * BlockSize;
+
+        // do the read
+        BiosDiskRead(FileBuffer, nextblocknum, (uint16) blocksThisRead, BootDrive);
+
+        // move the data into extended memory
+        PModeTransfer(bufferaddress, nextdestination, bytesThisRead);
+
+        // get next block number
+        nextblocknum += blocksThisRead;
+
+        // update the count of bytes read
+        bytesread += bytesThisRead;
+
+        // and update the destination address
+        nextdestination += bytesThisRead;
+    }
+
+    // since we read full blocks at the bios level, we should trim
+    // our count back down a bit here
+    if (bytesread > file->Size) {
+        bytesread = file->Size;
+    }
+    return bytesread;
+}
diff --git a/base/boot/Singldr/jolietdevice.h b/base/boot/Singldr/jolietdevice.h
new file mode 100644
index 0000000..33f0ac7
--- /dev/null
+++ b/base/boot/Singldr/jolietdevice.h
@@ -0,0 +1,83 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  jolietdevice.h - implementation of BootDevice class for Joliet volumes
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#ifndef __JOLIETDEVICE_H__
+#define __JOLIETDEVICE_H__
+
+#include "singldr.h"
+#include "bootdevice.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Linked-in Functions (not declared in any headers)
+
+// from singldr0.asm
+extern "C" uint16 __cdecl BiosDiskRead(uint8 __far * addr, uint32 diskblock, uint16 blocks, uint16 driveid);
+extern "C" uint16 __cdecl PModeTransfer(uint32 StartAddress, uint32 DestinationAddress, uint32 bytes);
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Declaration for class JolietDevice
+
+#pragma pack(4)
+struct __near JolietDevice : BootDevice
+{
+private:
+    // Drive Characteristics
+    uint8   BootDrive;
+
+    // Volume Characteristics
+    uint32  BlockSize;
+
+    // Root Directory Characteristics
+    uint32  RootStartBlock;
+    uint32  RootSize;
+
+    // data buffer  -- this is reused frequently.  Be careful
+    //                 about what you assume is in it.
+    uint8 __far * FileBuffer;
+
+    // method for looking an entry up in a directory
+    int __near DirLookup(LPCHAR filename,
+                         uint8 len,
+                         FilePtr Directory,
+                         FilePtr File) __far;
+public:
+    // constructor -- Hack alert - the complier claims that:
+    //   "2 overloads have similar conversions" when the second
+    // parameter isn't given.
+    JolietDevice(uint8 driveId, uint8 /* nullParam */) __far
+    {
+        this->BootDrive = driveId;
+
+        // since this is public, define it as part of constructing the object
+        // for maximum compatibility, we just allocate it and leave it
+        // null (alloc zeros it)
+        this->CmdLine = (uint16 __far *)alloc(2048, 2);
+
+    }
+
+    // implement the virtual functions from the base class
+    int __near OpenDevice() __far;
+
+    int __near CloseDevice() __far;
+
+    int __near GetFileProperties(LPCHAR filename,
+                                 FilePtr file,
+                                 FilePtr directory) __far;
+
+    INT16 __near ReadFileLow(LPCHAR filename,
+                             FilePtr file,
+                             uint8 __far * buffer) __far;
+
+    UINT32 __near ReadFileHigh(LPCHAR  filename,
+                               FilePtr file,
+                               uint32  buffer,
+                               uint32  cbBuffer) __far;
+};
+#pragma pack()
+#endif
diff --git a/base/boot/Singldr/lmul.asm b/base/boot/Singldr/lmul.asm
new file mode 100644
index 0000000..6c51f92
--- /dev/null
+++ b/base/boot/Singldr/lmul.asm
@@ -0,0 +1,114 @@
+	page	,132
+	title	lmul - long multiply routine
+;***
+;lmul.asm - long multiply routine
+;
+;	Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;Purpose:
+;	Defines long multiply routines
+;	Both signed and unsigned routines are the same, since multiply's
+;	work out the same in 2's complement
+;	creates the following routines:
+;	    __aFlmul, __aFulmul (large, medium model)
+;	    __aNlmul, __aNulmul (small, compact model)
+;
+;*******************************************************************************
+
+.xlist
+include ulhelp.inc
+.list
+
+sBegin	code
+	assumes cs,code
+	assumes ds,data
+
+page
+;***
+;lmul - long multiply routine
+;
+;Purpose:
+;	Does a long multiply (same for signed/unsigned)
+;	Parameters are not changed.
+;
+;Entry:
+;	Parameters are passed on the stack:
+;		1st pushed: multiplier (DWORD)
+;		2nd pushed: multiplicand (DWORD)
+;
+;Exit:
+;	DX:AX - product of multiplier and multiplicand
+;	NOTE: parameters are removed from the stack
+;
+;Uses:
+;	CX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+if	sizeC
+cProc	_aFulmul,<PUBLIC>,<>
+cBegin	nogen
+cEnd	nogen
+else
+cProc	_aNulmul,<PUBLIC>,<>
+cBegin	nogen
+cEnd	nogen
+endif
+
+
+if	sizeC
+cProc	_aFlmul,<PUBLIC>,<>
+else
+cProc	_aNlmul,<PUBLIC>,<>
+endif
+
+cBegin
+A	equ	BPARGBAS[bp]	; stack address of a
+B	equ	BPARGBAS+4[bp]	; stack address of b
+
+;
+;	AHI, BHI : upper 16 bits of A and B
+;	ALO, BLO : lower 16 bits of A and B
+;
+;	      ALO * BLO
+;	ALO * BHI
+; +	BLO * AHI
+; ---------------------
+;
+	mov	ax,HIWORD(A)
+	mov	cx,HIWORD(B)
+	or	cx,ax		;test for both hiwords zero.
+	mov	cx,LOWORD(B)
+	jnz	hard		;both are zero, just mult ALO and BLO
+
+	mov	ax,LOWORD(A)
+	mul	cx
+
+	pop	bp
+	ret
+	return	8		; callee restores the stack
+
+hard:
+	push	bx
+
+	mul	cx		;ax has AHI, cx has BLO, so AHI * BLO
+	mov	bx,ax		;save result
+
+	mov	ax,LOWORD(A)
+	mul	word ptr HIWORD(B) ;ALO * BHI
+	add	bx,ax		;bx = ((ALO * BHI) + (AHI * BLO))
+
+	mov	ax,LOWORD(A)	;cx = BLO
+	mul	cx		;so dx:ax = ALO*BLO
+	add	dx,bx		;now dx has all the LO*HI stuff
+
+	pop	bx
+
+cEnd	nolocals
+	return	8		; callee restores the stack
+
+sEnd
+
+	end
diff --git a/base/boot/Singldr/pci.h b/base/boot/Singldr/pci.h
new file mode 100644
index 0000000..6407a27
--- /dev/null
+++ b/base/boot/Singldr/pci.h
@@ -0,0 +1,216 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  PCI Structures and declarations.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//
+// A PCI driver can read the complete 256 bytes of configuration
+// information for any PCI device.
+//      A return value of 0 means that the specified PCI bus does not exist.
+//      A return value of 2, with a VendorID of PCI_INVALID_VENDORID means
+//      that the PCI bus does exist, but there is no device at the specified
+//      VirtualSlotNumber (PCI Device/Function number).
+
+#define PCI_TYPE0_ADDRESSES             6
+#define PCI_TYPE1_ADDRESSES             2
+
+struct PCI_COMMON_CONFIG {
+    UINT16  VendorID;                   // (ro)
+    UINT16  DeviceID;                   // (ro)
+    UINT16  Command;                    // Device control
+    UINT16  Status;
+    UINT8   RevisionID;                 // (ro)
+    UINT8   ProgIf;                     // (ro)
+    UINT8   SubClass;                   // (ro)
+    UINT8   BaseClass;                  // (ro)
+    UINT8   CacheLineSize;              // (ro+)
+    UINT8   LatencyTimer;               // (ro+)
+    UINT8   HeaderType;                 // (ro)
+    UINT8   BIST;                       // Built in self test
+
+    // 0x10:
+    union {
+        // Devices: (HeaderType & ~PCI_MULTIFUNCTION) == PCI_DEVICE_TYPE
+        struct _PCI_HEADER_TYPE_0 {
+            // 0x10:
+            UINT32  BaseAddresses[PCI_TYPE0_ADDRESSES];
+            // 0x28:
+            UINT32  Reserved1; // => UINT32 CardBusCisPtr;
+            // 0x2C:
+            UINT16  SubVendorID;
+            // 0x2E:
+            UINT16  SubSystemID;
+            // 0x30:
+            UINT32  ROMBaseAddress;
+            // 0x34:
+            UINT32  Reserved2[2];
+            // 0x3c:
+            UINT8   InterruptLine;      //
+            UINT8   InterruptPin;       // (ro)
+            UINT8   MinimumGrant;       // (ro)
+            UINT8   MaximumLatency;     // (ro)
+            // 0x40:
+        } type0;
+
+        // Bridges: (HeaderType & ~PCI_MULTIFUNCTION) == PCI_BRIDGE_TYPE
+        struct _PCI_HEADER_TYPE_1 {
+            // 0x10:
+            UINT32  BaseAddresses[PCI_TYPE1_ADDRESSES];
+            // 0x18:
+            UINT8   PrimaryBus;
+            UINT8   SecondaryBus;
+            UINT8   SubordinateBus;
+            UINT8   SecondaryLatency;
+            // 0x1c:
+            UINT8   IOBase;
+            UINT8   IOLimit;
+            UINT16  SecondaryStatus;
+            // 0x20:
+            UINT16  MemoryBase;
+            UINT16  MemoryLimit;
+            // 0x24:
+            UINT16  PrefetchBase;
+            UINT16  PrefetchLimit;
+            // 0x28:
+            UINT32  PrefetchBaseUpper32;
+            // 0x2c:
+            UINT32  PrefetchLimitUpper32;
+            // 0x30:
+            UINT16  IOBaseUpper16;
+            UINT16  IOLimitUpper16;
+            // 0x34:
+            UINT32  Reserved;
+            // 0x38:
+            UINT32  ROMBaseAddress;
+            // 0x3c:
+            UINT8   InterruptLine;
+            UINT8   InterruptPin;
+            UINT16  BridgeControl;
+            // 0x40:
+        } type1;
+    };
+
+    // 0x40:
+    UINT8   DeviceSpecific[192];
+};
+
+
+#define PCI_FIXED_HDR_LENGTH                16          // Through BIST
+#define PCI_COMMON_HDR_LENGTH               64          // Through union
+
+#define PCI_MAX_BUSES                       128
+#define PCI_MAX_DEVICES                     32
+#define PCI_MAX_FUNCTION                    8
+
+#define PCI_INVALID_VENDORID                0xFFFF
+
+//
+// Bit encodings for  PCI_COMMON_CONFIG.HeaderType
+//
+
+#define PCI_MULTIFUNCTION                   0x80
+#define PCI_DEVICE_TYPE                     0x00
+#define PCI_BRIDGE_TYPE                     0x01
+
+//
+// Bit encodings for PCI_COMMON_CONFIG.Command
+//
+
+#define PCI_ENABLE_IO_SPACE                 0x0001
+#define PCI_ENABLE_MEMORY_SPACE             0x0002
+#define PCI_ENABLE_BUS_MASTER               0x0004
+#define PCI_ENABLE_SPECIAL_CYCLES           0x0008
+#define PCI_ENABLE_WRITE_AND_INVALIDATE     0x0010
+#define PCI_ENABLE_VGA_COMPATIBLE_PALETTE   0x0020
+#define PCI_ENABLE_PARITY                   0x0040  // (ro+)
+#define PCI_ENABLE_WAIT_CYCLE               0x0080  // (ro+)
+#define PCI_ENABLE_SERR                     0x0100  // (ro+)
+#define PCI_ENABLE_FAST_BACK_TO_BACK        0x0200  // (ro)
+
+//
+// Bit encodings for PCI_COMMON_CONFIG.Status
+//
+
+#define PCI_STATUS_FAST_BACK_TO_BACK        0x0080  // (ro)
+#define PCI_STATUS_DATA_PARITY_DETECTED     0x0100
+#define PCI_STATUS_DEVSEL                   0x0600  // 2 bits wide
+#define PCI_STATUS_SIGNALED_TARGET_ABORT    0x0800
+#define PCI_STATUS_RECEIVED_TARGET_ABORT    0x1000
+#define PCI_STATUS_RECEIVED_MASTER_ABORT    0x2000
+#define PCI_STATUS_SIGNALED_SYSTEM_ERROR    0x4000
+#define PCI_STATUS_DETECTED_PARITY_ERROR    0x8000
+
+
+// Bit encodes for PCI_COMMON_CONFIG.u.type0.BaseAddresses
+//
+#define PCI_BAR_MEMORY_TYPE_MASK            0x00000006  // (ro)
+#define PCI_BAR_MEMORY_TYPE_32BIT           0x00000000
+#define PCI_BAR_MEMORY_TYPE_64BIT           0x00000004
+#define PCI_BAR_MEMORY_PREFETCHABLE         0x00000008  // (ro)
+#define PCI_BAR_TYPE_MASK                   0x00000003
+#define PCI_BAR_TYPE_IO_SPACE               0x00000001  // (ro)
+#define PCI_BAR_TYPE_MEMORY                 0x00000000
+#define PCI_BAR_ADDRESS_MASK                0xfffffff0
+
+
+//
+// Bit encodes for PCI_COMMON_CONFIG.u.type0.ROMBaseAddresses
+//
+
+#define PCI_ROMADDRESS_ENABLED              0x00000001
+#define PCI_ROMADDRESS_MASK                 0xfffff800
+
+//
+// Reference notes for PCI configuration fields:
+//
+// ro   these field are read only.  changes to these fields are ignored
+//
+// ro+  these field are intended to be read only and should be initialized
+//      by the system to their proper values.  However, driver may change
+//      these settings.
+//
+// ---
+//
+//      All resources consumed by a PCI device start as uninitialized
+//      under NT.  An uninitialized memory or I/O base address can be
+//      determined by checking its corresponding enabled bit in the
+//      PCI_COMMON_CONFIG.Command value.  An InterruptLine is uninitialized
+//      if it contains the value of -1.
+//
+
+//
+// Bit encodes for PCI_COMMON_CONFIG.u.type1.BridgeControl
+//
+
+#define PCI_ENABLE_BRIDGE_PARITY_ERROR        0x0001
+#define PCI_ENABLE_BRIDGE_SERR                0x0002
+#define PCI_ENABLE_BRIDGE_ISA                 0x0004
+#define PCI_ENABLE_BRIDGE_VGA                 0x0008
+#define PCI_ENABLE_BRIDGE_MASTER_ABORT_SERR   0x0020
+#define PCI_ASSERT_BRIDGE_RESET               0x0040
+#define PCI_ENABLE_BRIDGE_FAST_BACK_TO_BACK   0x0080
+
+//
+//  Definitions needed for Access to Hardware Type 1
+//
+
+#define PCI_ADDR_PORT     0xcf8
+#define PCI_DATA_PORT     0xcfc
+
+union PCI_CONFIG_BITS {
+    struct {
+        UINT32   offset     : 8;
+        UINT32   function   : 3;
+        UINT32   device     : 5;
+        UINT32   bus        : 15;
+        UINT32   enable     : 1;
+    } bits;
+
+    UINT32   value;
+};
+
+///////////////////////////////////////////////////////////////// End of File.
diff --git a/base/boot/Singldr/pxe.cpp b/base/boot/Singldr/pxe.cpp
new file mode 100644
index 0000000..9d21c63
--- /dev/null
+++ b/base/boot/Singldr/pxe.cpp
@@ -0,0 +1,302 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  pxe.cpp - Get files via PXE from SINGLDR
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "pxe.h"
+#include "fnames.h"
+
+#pragma warning(disable: 4505) // Compiler generated constructor unreferenced
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Functions
+
+// The only way to talk to the hardware for PXE boot:
+void PxeCall(int16 api, LPVOID args)
+{
+    if (s_fpPxenv) {
+        __asm {
+            mov bx, api;
+            les di, args;
+            call s_fpPxenv;
+        }
+    }
+    else if (s_fpPxe) {
+        (*s_fpPxe)(api, args);
+    }
+}
+
+static uint32 parse_ip_addr(LPCHAR psz)
+{
+    uint32 addr = 0;
+    uint16 num = 0;
+    for (; (*psz >= '0' && *psz <= '9') || *psz == '.'; psz++) {
+        if (*psz >= '0' && *psz <= '9') {
+            num = num * 10 + (*psz - '0');
+        }
+        else if (*psz == '.') {
+            addr = (addr >> 8) + ((uint32)num << 24);
+            num = 0;
+        }
+    }
+    addr = (addr >> 8) + ((uint32)num << 24);
+    return addr;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Public Functions
+
+int PxeDevice::OpenDevice() __far
+{
+    reply = (DHCP_PACKET __far *)alloc(1500, 4);
+
+    // Get PXE Configuration.
+    if (pxe->Signature[0] == '!' &&
+        pxe->Signature[1] == 'P' &&
+        pxe->Signature[2] == 'X' &&
+        pxe->Signature[3] == 'E') {
+
+        printf("PXE Signature   :   %c%c%c%c %d\n",
+               pxe->Signature[0],
+               pxe->Signature[1],
+               pxe->Signature[2],
+               pxe->Signature[3],
+               pxe->StructRev);
+        s_fpPxe = pxe->EntryPoint;
+    }
+    else if (pxenv->Signature[0] == 'P' &&
+             pxenv->Signature[1] == 'X' &&
+             pxenv->Signature[2] == 'E' &&
+             pxenv->Signature[3] == 'N' &&
+             pxenv->Signature[4] == 'V' &&
+             pxenv->Signature[5] == '+')
+    {
+        printf("PXE Signature:      %c%c%c%c%c%c version %d.%d\n",
+               pxenv->Signature[0],
+               pxenv->Signature[1],
+               pxenv->Signature[2],
+               pxenv->Signature[3],
+               pxenv->Signature[4],
+               pxenv->Signature[5],
+               pxenv->Version >> 8,
+               pxenv->Version&0xff);
+
+        s_fpPxenv = pxenv->EntryPoint;
+    }
+
+    reply = (DHCP_PACKET __far *)alloc(1500, 4);
+    CmdLine = (uint16 __far *)alloc(2048, 2);
+
+    for (int j = 3; j > 0; j--) {
+        CHAR szTemp[128];   // Needed so string is near pointer.
+        PXENV_GET_CACHED_INFO pgci;
+        pgci.PacketType = (UINT16)j; //CACHED_REPLY;
+        pgci.Buffer = reply;
+        pgci.BufferSize = 1500;
+        pgci.BufferLimit = 1500;
+        memzero(reply, 1500);
+
+        printf("  PXE GetCachedInfo (Type=%d):\n", j);
+        PxeCall(GET_CACHED_INFO, &pgci);
+
+        if (pgci.Status != 0) {
+            printf("    Error 0x%04x on request.\n", pgci.Status);
+            continue;
+        }
+
+        printf("    client: %d.%d.%d.%d, dhcp: %d.%d.%d.%d, gate: %d.%d.%d.%d (%d bytes)\n",
+               ((uint8 __far *)&reply->yiaddr)[0],
+               ((uint8 __far *)&reply->yiaddr)[1],
+               ((uint8 __far *)&reply->yiaddr)[2],
+               ((uint8 __far *)&reply->yiaddr)[3],
+               ((uint8 __far *)&reply->siaddr)[0],
+               ((uint8 __far *)&reply->siaddr)[1],
+               ((uint8 __far *)&reply->siaddr)[2],
+               ((uint8 __far *)&reply->siaddr)[3],
+               ((uint8 __far *)&reply->giaddr)[0],
+               ((uint8 __far *)&reply->giaddr)[1],
+               ((uint8 __far *)&reply->giaddr)[2],
+               ((uint8 __far *)&reply->giaddr)[3],
+               pgci.BufferSize);
+        if (reply->sname[0] != '\0') {
+            strcpy(szTemp, reply->sname);
+            printf("    server: [%s]\n", szTemp);
+        }
+        if (reply->file[0] != '\0') {
+            strcpy(szTemp, reply->file);
+            printf("    file:   [%s]\n", szTemp);
+        }
+        if (reply->cookie[0] == 0x63 &&
+            reply->cookie[1] == 0x82 &&
+            reply->cookie[2] == 0x53 &&
+            reply->cookie[3] == 0x63) {
+
+            DHCP_OPTIONS __far *options = &reply->options;
+            DHCP_OPTIONS __far *optionsEnd
+                = (DHCP_OPTIONS __far *)reply + pgci.BufferSize;
+
+            while (options < optionsEnd) {
+                if (options->Code == DHCP_OPTION_COOKIE_SERVERS) {
+                    uint16 __far * pwzCmdLine = CmdLine;
+                    for (int i = 0; i < options->Length; i++) {
+                        *pwzCmdLine++ = options->Data[i];
+                    }
+                    *pwzCmdLine++ = '\0';
+                    printf("    cmd: %s\n", CmdLine);
+                    break;
+                }
+
+                if (options->Code == 0) {
+                    options = (DHCP_OPTIONS __far *)(((CHAR __far *)options) + 1);
+                }
+                else {
+                    options = (DHCP_OPTIONS __far *)(((CHAR __far *)options)
+                                                     + options->Length + 2);
+                }
+            }
+        }
+        else {
+            printf("    cookie: %02x %02x %02x %02x\n",
+                   reply->cookie[0],
+                   reply->cookie[1],
+                   reply->cookie[2],
+                   reply->cookie[3]);
+        }
+
+        if (reply->sname[0] != '\0') {
+            break;
+        }
+    }
+    ServerIP = parse_ip_addr(reply->sname);
+    return 0;
+}
+
+int PxeDevice::CloseDevice() __far
+{
+    // create a packet that will fail
+    PXENV_TFTP_GET_FSIZE ptfg;
+    LPCHAR terminate = "end.:"; // request an invalid filename :)
+    memzero(&ptfg, sizeof(ptfg));
+    strcpy(ptfg.FileName, terminate);
+    ptfg.Status = ~0u;
+    ptfg.GatewayIpAddress = reply->giaddr;
+    ptfg.ServerIpAddress = ServerIP;
+
+    printf("  Size: %d.%d.%d.%d [%s] (to close)\n",
+           ((uint8 __far *)&ptfg.ServerIpAddress)[0],
+           ((uint8 __far *)&ptfg.ServerIpAddress)[1],
+           ((uint8 __far *)&ptfg.ServerIpAddress)[2],
+           ((uint8 __far *)&ptfg.ServerIpAddress)[3],
+           ptfg.FileName);
+
+    PxeCall(TFTP_GET_FSIZE, &ptfg);
+
+    return 0;
+}
+
+int PxeDevice::GetFileProperties(LPCHAR /* filename */,
+                                 FilePtr /* file */,
+                                 FilePtr /* directory */) __far
+{
+    // We could call PxeCall(TFTP_GET_FSIZE here, but some PXE
+    // implementations fetch the entire file to determine its
+    // size.  Instead we rely on size information in Singboot.ini.
+
+#if DEPRECATED
+    // consume leading '/' chars in filename
+    LPCHAR fname = filename;
+    while (fname[0]=='/') {
+        fname++;
+    }
+
+    // build the message packet
+    PXENV_TFTP_GET_FSIZE ptfg;
+    memzero(&ptfg, sizeof(ptfg));
+
+    FNameToCStr(fname, ptfg.FileName, sizeof(ptfg.FileName));
+
+    ptfg.Status = ~0u;
+    ptfg.GatewayIpAddress = reply->giaddr;
+    ptfg.ServerIpAddress = ServerIP;
+
+    PxeCall(TFTP_GET_FSIZE, &ptfg);
+
+    if (ptfg.Status != 0) {
+        printf("PXE: Size: %d.%d.%d.%d ",
+               ((uint8 __far *)&ptfg.ServerIpAddress)[0],
+               ((uint8 __far *)&ptfg.ServerIpAddress)[1],
+               ((uint8 __far *)&ptfg.ServerIpAddress)[2],
+               ((uint8 __far *)&ptfg.ServerIpAddress)[3]);
+        PutFName(filename);
+        printf("\n    Error 0x%04x on request.\n", ptfg.Status);
+        return -1;
+    }
+    //    file->Size = ptfg.FileSize;
+#endif
+    return 0;
+}
+
+INT16 PxeDevice::ReadFileLow(LPCHAR filename,
+                             FilePtr /* file */,
+                             uint8 __far * buffer) __far
+{
+    // consume leading '/' chars
+    LPCHAR fname = filename;
+    while (fname[0] == '/') {
+        fname++;
+    }
+
+    // build the message packet
+    PXENV_TFTP_READ_FILE ptrf;
+    memzero(&ptrf, sizeof(ptrf));
+    strcpy(ptrf.FileName, fname);
+    ptrf.Status           = ~0u;
+    ptrf.BufferSize       = 0x8000;
+    ptrf.Buffer           = PointerToUint32(buffer);
+    ptrf.GatewayIpAddress = reply->giaddr;
+    ptrf.ServerIpAddress  = ServerIP;
+
+    PxeCall(TFTP_READ_FILE, &ptrf);
+
+    if (ptrf.Status != 0) {
+        printf("PXE: Loading low: %s", filename);
+        printf("\n    Error 0x%04x on request.\n", ptrf.Status);
+        return -1;
+    }
+    return 0;
+}
+
+UINT32 PxeDevice::ReadFileHigh(LPCHAR  filename,
+                               FilePtr file,
+                               uint32  destinationAddress,
+                               uint32  cbDestinationAddress) __far
+{
+    // consume leading '/' chars
+    LPCHAR fname = filename;
+    while (fname[0] == '/') {
+        fname++;
+    }
+
+    // build the message packet
+    PXENV_TFTP_READ_FILE ptrf;
+    memzero(&ptrf, sizeof(ptrf));
+    FNameToCStr(fname, ptrf.FileName, sizeof(ptrf.FileName));
+    ptrf.Status           = ~0u;
+    ptrf.BufferSize       = cbDestinationAddress;
+    ptrf.Buffer           = destinationAddress;
+    ptrf.GatewayIpAddress = reply->giaddr;
+    ptrf.ServerIpAddress  = ServerIP;
+
+    PxeCall(TFTP_READ_FILE, &ptrf);
+
+    if (ptrf.Status != 0) {
+        printf("PXE: Loading high: %s", ptrf.FileName);
+        printf("\n    Error 0x%04x on request.\n", ptrf.Status);
+        return -1;
+    }
+    return file->Size;
+}
diff --git a/base/boot/Singldr/pxe.h b/base/boot/Singldr/pxe.h
new file mode 100644
index 0000000..4fe2113
--- /dev/null
+++ b/base/boot/Singldr/pxe.h
@@ -0,0 +1,366 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  pxe.h - implementation of BootDevice class for pxe boot
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#ifndef __PXE_H__
+#define __PXE_H__
+
+#include "singldr.h"
+#include "bootdevice.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Various declarations that should probably be private
+// (unmodified from original implementation)
+
+#define IN
+#define OUT
+#define INOUT
+
+// MAC_ADDR Hardware address.
+#define MAC_ADDR_LEN 16
+typedef UINT8 MAC_ADDR[MAC_ADDR_LEN];
+
+//////////////////////////////////////////////////////////////////////////////
+
+struct PXE
+{
+    UINT8   Signature[4];
+    UINT8   StructLength;
+    UINT8   StructCksum;
+    UINT8   StructRev;
+    UINT8   reserved1;
+    LPVOID  UndiRomID;
+    LPVOID  BaseRomID;
+    FPENTRY EntryPoint;
+    LPVOID  EntryPointProt;
+    LPVOID  StatusCallout;
+    UINT8   reserved2;
+};
+
+struct PXENV
+{
+    UINT8   Signature[6];
+    UINT16  Version;
+    UINT8   Length;
+    UINT8   Checksum;
+    FPENTRY EntryPoint;
+    UINT32  ProtOffset;
+    UINT16  ProtSelector;
+    UINT16  StackSeg;
+    UINT16  StackSize;
+    UINT16  BC_CodeSeg;
+    UINT16  BC_CodeSize;
+    UINT16  UndiDataSeg;
+    UINT16  UndiDataSize;
+    UINT16  UndiCodeSeg;
+    UINT16  UndiCodeSize;
+    PXE __far * PXEPtr;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+enum PXENV_COMMAND {
+    TFTP_READ_FILE      = 0x23,
+    TFTP_GET_FSIZE      = 0x25,
+    UDP_OPEN            = 0x30,
+    UDP_CLOSE           = 0x31,
+    UDP_READ            = 0x32,
+    UDP_WRITE           = 0x33,
+    GET_CACHED_INFO     = 0x71
+};
+
+enum PXENV_PACKET_TYPE {
+    DHCP_DISCOVER       = 1,
+    DHCP_ACK            = 2,
+    CACHED_REPLY        = 3
+};
+
+struct PXENV_GET_CACHED_INFO
+{
+    OUT     UINT16 Status;
+    IN      UINT16 PacketType;
+    INOUT   UINT16 BufferSize;
+    INOUT   LPVOID Buffer;
+    OUT     UINT16 BufferLimit;
+};
+
+struct PXENV_TFTP_GET_FSIZE
+{
+    OUT     UINT16  Status;
+    IN      UINT32  ServerIpAddress;
+    IN      UINT32  GatewayIpAddress;
+    IN      CHAR    FileName[128];
+    OUT     UINT32  FileSize;
+};
+
+struct PXENV_TFTP_READ_FILE
+{
+    OUT     UINT16  Status;
+    IN      CHAR    FileName[128];
+    IN      UINT32  BufferSize;
+    IN      ADDR32  Buffer;
+    IN      UINT32  ServerIpAddress;
+    IN      UINT32  GatewayIpAddress;
+    IN      UINT32  McastIpAddress;
+    IN      UINT16  TftpClntPort;
+    IN      UINT16  TftpSrvPort;
+    IN      UINT16  TftpOpenTimeOut;
+    IN      UINT16  TftpReopenDelay;
+};
+
+struct PXENV_UDP_OPEN
+{
+    OUT     UINT16  Status;
+    IN      UINT32  SelfAddress;
+};
+
+struct PXENV_UDP_CLOSE
+{
+    OUT     UINT16  Status;
+};
+
+struct PXENV_UDP_READ
+{
+    OUT     UINT16  Status;
+    OUT     UINT32  ServerIpAddress;
+    IN      UINT32  SelfIpAddress;
+    OUT     UINT16  ServerPort;
+    IN      UINT16  SelfPort;
+    INOUT   UINT16  BufferSize;
+    IN      LPVOID  Buffer;
+};
+
+struct PXENV_UDP_WRITE
+{
+    OUT     UINT16  Status;
+    IN      UINT32  ServerIpAddress;
+    IN      UINT32  GatewayIpAddress;
+    IN      UINT16  SelfPort;
+    IN      UINT16  ServerPort;
+    IN      UINT16  BufferSize;
+    IN      LPVOID  Buffer;
+};
+
+struct DHCP_OPTIONS {
+    UINT8   Code;
+    UINT8   Length;
+    UINT8   Data[1];
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+struct DHCP_PACKET {
+    UINT8   op;
+    UINT8   htype;
+    UINT8   hlen;
+    UINT8   hops;
+    UINT32  xid;
+    UINT16  secs;
+    UINT16  flags;  // UNUSED for BOOTP
+    UINT32  ciaddr;
+    UINT32  yiaddr;
+    UINT32  siaddr;
+    UINT32  giaddr;
+    UINT8   chaddr[16];
+    CHAR    sname[64];
+    CHAR    file[128];
+    UINT8   cookie[4];
+    DHCP_OPTIONS options;
+};
+
+/*
+* DHCP Standard Options.
+*/
+#define DHCP_OPTION_PAD                      0
+#define DHCP_OPTION_SUBNET_MASK              1
+#define DHCP_OPTION_TIME_OFFSET              2
+#define DHCP_OPTION_ROUTER_ADDRESS           3
+#define DHCP_OPTION_TIME_SERVERS             4
+#define DHCP_OPTION_IEN116_NAME_SERVERS      5
+#define DHCP_OPTION_DOMAIN_NAME_SERVERS      6
+#define DHCP_OPTION_LOG_SERVERS              7
+#define DHCP_OPTION_COOKIE_SERVERS           8
+#define DHCP_OPTION_LPR_SERVERS              9
+#define DHCP_OPTION_IMPRESS_SERVERS          10
+#define DHCP_OPTION_RLP_SERVERS              11
+#define DHCP_OPTION_HOST_NAME                12
+#define DHCP_OPTION_BOOT_FILE_SIZE           13
+#define DHCP_OPTION_MERIT_DUMP_FILE          14
+#define DHCP_OPTION_DOMAIN_NAME              15
+#define DHCP_OPTION_SWAP_SERVER              16
+#define DHCP_OPTION_ROOT_DISK                17
+#define DHCP_OPTION_EXTENSIONS_PATH          18
+
+/*
+* IP Layer Parameters - per host
+*/
+#define DHCP_OPTION_BE_A_ROUTER              19
+#define DHCP_OPTION_NON_LOCAL_SOURCE_ROUTING 20
+#define DHCP_OPTION_POLICY_FILTER_FOR_NLSR   21
+#define DHCP_OPTION_MAX_REASSEMBLY_SIZE      22
+#define DHCP_OPTION_DEFAULT_TTL              23
+#define DHCP_OPTION_PMTU_AGING_TIMEOUT       24
+#define DHCP_OPTION_PMTU_PLATEAU_TABLE       25
+
+/*
+* IP Layer Parameters - per interface.
+*/
+#define DHCP_OPTION_MTU                      26
+#define DHCP_OPTION_ALL_SUBNETS_MTU          27
+#define DHCP_OPTION_BROADCAST_ADDRESS        28
+#define DHCP_OPTION_PERFORM_MASK_DISCOVERY   29
+#define DHCP_OPTION_BE_A_MASK_SUPPLIER       30
+#define DHCP_OPTION_PERFORM_ROUTER_DISCOVERY 31
+#define DHCP_OPTION_ROUTER_SOLICITATION_ADDR 32
+#define DHCP_OPTION_STATIC_ROUTES            33
+#define DHCP_OPTION_TRAILERS                 34
+#define DHCP_OPTION_ARP_CACHE_TIMEOUT        35
+#define DHCP_OPTION_ETHERNET_ENCAPSULATION   36
+
+/*
+* TCP Parameters - per host
+*/
+#define DHCP_OPTION_TTL                      37
+#define DHCP_OPTION_KEEP_ALIVE_INTERVAL      38
+#define DHCP_OPTION_KEEP_ALIVE_DATA_SIZE     39
+
+/*
+* Application Layer Parameters
+*/
+#define DHCP_OPTION_NETWORK_INFO_SERVICE_DOM 40
+#define DHCP_OPTION_NETWORK_INFO_SERVERS     41
+#define DHCP_OPTION_NETWORK_TIME_SERVERS     42
+
+/*
+* Vender Specific Information Option
+*/
+#define DHCP_OPTION_VENDOR_SPEC_INFO         43
+
+/*
+* NetBIOS Over TCP/IP Name Server Options
+*/
+#define DHCP_OPTION_NETBIOS_NAME_SERVER      44
+#define DHCP_OPTION_NETBIOS_DATAGRAM_SERVER  45
+#define DHCP_OPTION_NETBIOS_NODE_TYPE        46
+#define DHCP_OPTION_NETBIOS_SCOPE_OPTION     47
+
+/*
+* X Window System Options
+*/
+#define DHCP_OPTION_XWINDOW_FONT_SERVER      48
+#define DHCP_OPTION_XWINDOW_DISPLAY_MANAGER  49
+
+/*
+* DHCP Extensions
+*/
+#define DHCP_OPTION_REQUESTED_ADDRESS        50
+#define DHCP_OPTION_LEASE_TIME               51
+#define DHCP_OPTION_OK_TO_OVERLAY            52
+#define DHCP_OPTION_MESSAGE_TYPE             53
+#define DHCP_OPTION_SERVER_IDENTIFIER        54
+#define DHCP_OPTION_PARAMETER_REQUEST_LIST   55
+#define DHCP_OPTION_MESSAGE                  56
+#define DHCP_OPTION_MESSAGE_LENGTH           57
+#define DHCP_OPTION_RENEWAL_TIME             58      /* T1 */
+#define DHCP_OPTION_REBIND_TIME              59      /* T2 */
+#define DHCP_OPTION_CLIENT_CLASS_INFO        60
+#define DHCP_OPTION_CLIENT_ID                61
+
+/*
+* More Application Layer Parameters
+*/
+#define DHCP_OPTION_NIS_PLUS_DOM             64
+#define DHCP_OPTION_NIS_PLUS                 65
+
+/*
+* Overlayed Header Field Replacements
+*/
+#define DHCP_OPTION_TFTP_SERVER_NAME         66
+#define DHCP_OPTION_TFTP_BOOTFILE_NAME       67
+
+/*
+* Even More Application Layer Parameters
+*/
+#define DHCP_OPTION_MOBILE_IP_HOME_AGENTS    68
+#define DHCP_OPTION_SMTP_SERVERS             69
+#define DHCP_OPTION_POP_SERVERS              70
+#define DHCP_OPTION_NNTP_SERVERS             71
+#define DHCP_OPTION_WWW_SERVERS              72
+#define DHCP_OPTION_FINGER_SERVERS           73
+#define DHCP_OPTION_IRC_SERVERS              74
+#define DHCP_OPTION_STREETTALK_SERVERS       75
+#define DHCP_OPTION_STREETTALK_DIR_SERVERS   76
+
+/*
+* Option codes from 77 to 127 are reserved through the
+* Internet Assigned Numbers Authority (iana@isi.edu).
+*/
+
+/*
+* PXE Parameters
+*/
+#define DHCP_OPTION_PXE_CLIENT_ARCH_ID       93
+#define DHCP_OPTION_PXE_CLIENT_NIC_ID        94
+#define DHCP_OPTION_PXE_CLIENT_ID            97
+
+
+/*
+* Option codes from 128 to 254 are for site-specific options.
+*/
+#define DHCP_OPTION_END                      255
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// static info from original implementation
+
+static FPENTRY s_fpPxe = NULL;
+static FPENTRY s_fpPxenv = NULL;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Declaration for class PxeDevice
+
+struct __near PxeDevice : BootDevice
+{
+private:
+
+    PXE __far *pxe;          // on pxe boot, these two pointers are given
+    PXENV __far * pxenv;     // to SINGLDR as params to BootPhase1
+
+    DHCP_PACKET __far *reply;
+
+    uint32 ServerIP;
+
+public:
+    // constructor
+    PxeDevice(PXE __far *pxePtr, PXENV __far * pxenvPtr) __far
+    {
+        // set private fields based on params
+        this->pxe = pxePtr;
+        this->pxenv = pxenvPtr;
+    }
+
+    // implement the virtual functions from the base class
+    int __near OpenDevice() __far;
+
+    int __near CloseDevice() __far;
+
+    int __near GetFileProperties(LPCHAR  filename,
+                                 FilePtr file,
+                                 FilePtr directory) __far;
+
+    INT16 __near ReadFileLow(LPCHAR        filename,
+                             FilePtr       file,
+                             uint8 __far * buffer) __far;
+
+    UINT32 __near ReadFileHigh(LPCHAR  filename,
+                               FilePtr file,
+                               uint32  pBuffer,
+                               uint32  cbBuffer) __far;
+};
+
+#endif
diff --git a/base/boot/Singldr/singldr.cpp b/base/boot/Singldr/singldr.cpp
new file mode 100644
index 0000000..2aab891
--- /dev/null
+++ b/base/boot/Singldr/singldr.cpp
@@ -0,0 +1,1716 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  singldr.cpp - Singularity PXE Boot Loader.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#pragma data_seg("_TEXT")
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#pragma warning(disable: 4103)
+
+#include "singldr.h"
+#include "fnames.h"
+#include "inifile.h"
+#include "pxe.h"
+#include "fatdevice.h"
+#include "jolietdevice.h"
+#include "usbdevice.h"
+#include "printf.cpp"
+#include "debug.cpp"
+#include "pci.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+extern "C" void __cdecl BootGetBiosInfo(Struct_Microsoft_Singularity_BootInfo __far *);
+extern "C" void __cdecl BootPhase2(Struct_Microsoft_Singularity_BootInfo __far *);
+extern "C" void __cdecl StopPhase0(void);
+extern "C" void __cdecl StopPhase3();
+extern "C" int _cdecl BootGetSMAP(Struct_Microsoft_Singularity_SMAPINFO __far * pSmap, uint32 __far * pNext);
+extern "C" void __cdecl BootHalt(void);
+extern "C" void __cdecl Reset(void);
+
+extern "C" void __cdecl MpEnter(void);
+extern "C" void __cdecl MpBootPhase2(Struct_Microsoft_Singularity_BootInfo __far *, Struct_Microsoft_Singularity_CpuInfo __far *);
+extern "C" uint16 MpStartupLock;
+
+extern "C" void __cdecl IdtEnter0(void);
+extern "C" void __cdecl IdtEnter1(void);
+extern "C" void __cdecl IdtEnterN(void);
+extern "C" uint32 IdtTarget;
+extern "C" uint8 undump_dat[];;
+
+extern "C" void IoSpaceWrite8(uint16 port, uint8 value);
+extern "C" void IoSpaceWrite32(uint16 port, uint32 value);
+extern "C" uint8 IoSpaceRead8(uint16 port);
+extern "C" uint32 IoSpaceRead32(uint16 port);
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#pragma warning(disable: 4704)
+
+/////////////////////////////////////////////////////////////////////// Video.
+//
+static uint16 __far * pwScreen = (uint16 __far *)_MK_FP(0xb800, 0);
+static uint16 nCursor = 0;
+static uint16 s_wAttr = 0x1f00;
+static BOOL fDebuggerInitialized = FALSE;
+
+void Cls()
+{
+    for (uint16 n = 0; n < 4000; n++)
+    {
+        pwScreen[n] = s_wAttr | ' ';
+    }
+
+    nCursor = 0;
+}
+
+void VPutChar(char cOut)
+{
+    if (cOut == '\r')
+    {
+        nCursor -= nCursor % 80;
+    }
+    else if (cOut == '\n')
+    {
+        do {
+            pwScreen[nCursor++] = s_wAttr | ' ';
+        } while ((nCursor % 80) != 0);
+    }
+    else
+    {
+        pwScreen[nCursor++] = (uint16)(s_wAttr | cOut);
+    }
+
+    while (nCursor >= 4000)
+    {
+        for (uint16 n = 0; n < 4000 - 80; n++)
+        {
+            pwScreen[n] = pwScreen[n + 80];
+        }
+        for (; n < 4000; n++)
+        {
+            pwScreen[n] = s_wAttr | ' ';
+        }
+        nCursor -= 80;
+    }
+
+    IoSpaceWrite8(0x3d4, 0xe);
+    IoSpaceWrite8(0x3d5, (uint8)(nCursor >> 8));
+    IoSpaceWrite8(0x3d4, 0xf);
+    IoSpaceWrite8(0x3d5, (uint8)(nCursor & 0xff));
+}
+
+void PutChar(char cOut)
+{
+    VPutChar(cOut);
+
+    // If the debugger is not initialized, don't attempt
+    // to output over the connection
+    if (!fDebuggerInitialized) {
+        return;
+    }
+
+    static CHAR szBuffer[128];
+    static int nBuffer = 0;
+
+    szBuffer[nBuffer++] = cOut;
+    if (cOut == '\n' || nBuffer >= sizeof(szBuffer) - 1) {
+        BdPrintString(szBuffer, nBuffer);
+        nBuffer = 0;
+    }
+}
+
+void VideoInit()
+{
+    __asm {
+        mov     ax, 1202h;           // LINES_400_CONFIGURATION
+        mov     bx, 0301h;           // SELECT_SCAN_LINE
+        int     10h;
+
+        mov     ax, 3h;              // SET_80X25_16_COLOR_MODE
+        mov     bx, 0h;              // PAGE0
+        int     10h;
+
+        mov     ax, 1112h;           // LOAD_8X8_CHARACTER_SET
+        mov     bx, 0h;
+        int     10h;
+
+        mov     ax, 1003h;           // Disable BLINK mode, enable background intensity.
+        mov     bx, 0h;
+        int     10h;
+
+        mov     ax, 0200h;           // Set Cursor position to 0, 0
+        mov     bx, 0h;
+        mov     dx, 0h;
+        int     10h;
+    }
+    Cls();
+}
+
+////////////////////////////////////////////////////////////////////// Memory.
+//
+void strcpy(LPCHAR dst, LPCHAR src)
+{
+    while (*src) {
+        *dst++ = *src++;
+    }
+    *dst = '\0';
+}
+
+void memzero(LPVOID vp, uint32 cb)
+{
+    uint8 __far * bp = (uint8 __far *)vp;
+    while (cb-- > 0) {
+        *bp++ = 0;
+    }
+}
+
+void memset(LPVOID vp, uint8 value, uint32 cb)
+{
+    uint8 __far * bp = (uint8 __far *)vp;
+    while (cb-- > 0) {
+        *bp++ = value;
+    }
+}
+
+void memcopy(LPVOID dvp, LPVOID svp, int cb)
+{
+    uint8 __far * dp = (uint8 __far *)dvp;
+    uint8 __far * sp = (uint8 __far *)svp;
+    while (cb-- > 0) {
+        *dp++ = *sp++;
+    }
+}
+
+uint8 Sum(uint8 __far * pbData, int cbData)
+{
+    uint8 sum = 0;
+
+    while (cbData-- > 0) {
+        sum = (UINT8) (sum + *pbData++);
+    }
+    return sum;
+}
+
+int Checksum(uint8 __far * pbData, int cbData)
+{
+    return (Sum(pbData, cbData) == 0);
+}
+
+uint32 PointerToUint32(LPVOID vp)
+{
+    return (((uint32)_FP_SEG(vp)) << 4) + ((uint32)_FP_OFF(vp));
+}
+
+// warning:  alloc() behaves improperly if you
+// request a segment of size 0xFFFF
+static uint16 npHeapTop = 0x1800;
+static const uint16 npHeapMax = 0x6000;
+
+LPVOID alloc(uint16 cbSize, uint16 cbPad)
+{
+    cbPad = (cbPad != 0) ? (cbPad + 0xf) >> 4 : 0x10;
+    npHeapTop = (npHeapTop + (cbPad - 1)) & ~(cbPad - 1);
+
+    uint16 pbData = npHeapTop;
+
+    cbSize = (cbSize != 0) ? (cbSize + 0xf) >> 4 : 1;
+    npHeapTop += cbSize;
+    if (npHeapTop > npHeapMax)
+    {
+        npHeapTop = pbData;
+        return NULL;
+    }
+
+    LPVOID pvData = _MK_FP(pbData, 0);
+
+    memzero(pvData, cbSize << 4);
+
+    return pvData;
+}
+
+LPVOID allocpages(uint16 cPages)
+{
+    return alloc(Struct_Microsoft_Singularity_BootInfo_PAGE_SIZE * cPages,
+                 Struct_Microsoft_Singularity_BootInfo_PAGE_SIZE);
+}
+
+void __far * operator new(uint cbSize)
+{
+    return alloc((uint16)cbSize, (uint16)0x10);
+}
+
+/////////////////////////////////////////////////////////////////////// Debug.
+//
+void dump(uint8 __far * pbData, uint cbData)
+{
+    for (uint n = 0; n < cbData; n += 16)
+    {
+        printf("    %08lx ", PointerToUint32(pbData) + n);
+
+        for (uint s = n; s < n + 16; s++)
+        {
+            if (s % 4 == 0)
+            {
+                printf(" ");
+            }
+            if (s < cbData)
+            {
+                printf("%02x", pbData[s]);
+            }
+            else
+            {
+                printf("  ");
+            }
+        }
+        printf(" ");
+        for (s = n; s < n + 16; s++)
+        {
+            if (s % 4 == 0)
+            {
+                printf(" ");
+            }
+            if (s < cbData)
+            {
+                if (pbData[s] >= ' ' && pbData[s] < 127)
+                {
+                    printf("%c", pbData[s]);
+                }
+                else
+                {
+                    printf(".");
+                }
+            }
+            else
+            {
+                printf(" ");
+            }
+        }
+        printf("\n");
+    }
+}
+
+const char * ToString(LPCHAR pszIn)
+{
+    char szBuffer[128];
+    char *psz = szBuffer;
+
+    while (*psz) {
+        *psz++ = *pszIn++;
+    }
+    return szBuffer;
+}
+
+///////////////////////////////////////////////////////////////////////// APM.
+//
+void ApmPowerOff()
+{
+    uint16 version = 0;
+    uint16 signature = 0;
+    uint16 flags = 0;
+    uint16 connection = 0;
+
+    uint8  error = 0;
+    uint16 which = 0;
+    uint16 good = 0;
+
+    __asm {
+        mov ax, 0x5300;
+        mov which, ax;
+        mov bx, 0;
+        int 0x15;   // APM Check.
+        jc ifailed;
+        mov version, ax;
+        mov signature, bx;
+        mov flags, cx;
+        mov good, 1;
+        jmp idone;
+ifailed:
+        mov error, ah;
+        mov good, 0;
+idone:
+    }
+
+    if (!good) {
+        goto exit;
+    }
+
+    printf("  APM: %c%c %x.%02x, fl=%04x\n",
+        signature >> 8, signature & 0xff,
+        version >> 8, version & 0xff,
+        flags);
+
+    __asm {
+        mov ax, 0x5301;
+        mov which, ax;
+        mov bx, 0;
+        int 0x15;   // Real Mode Connect.
+        jc failed;
+
+        mov ax, 0x530e;
+        mov which, ax;
+        mov bx, 0;
+        mov cx, 0x0102;
+        int 0x15;   // Set APM Driver (i.e. our code) Version.
+        jc failed;
+        mov connection, ax;
+    }
+
+    printf("  APM: Connect %x.%02x\n",
+        connection >> 8, connection & 0xff);
+
+    __asm {
+        mov ax, 0x530d;
+        mov which, ax;
+        mov bx, 1;
+        mov cx, 1;
+        int 0x15;   // Enable Power Management
+        jc failed;
+
+        mov ax, 0x530f;
+        mov which, ax;
+        mov bx, 1;
+        mov cx, 1;
+        int 0x15;   // Engage Power Management
+        jc failed;
+
+        mov ax, 0x5307;
+        mov which, ax;
+        mov bx, 1;
+        mov cx, 3;
+        int 0x15;   // Power Off
+        jc failed;
+
+        mov good, 1;
+        jmp done;
+
+failed:
+        mov error, ah;
+        mov good, 0;
+
+done:
+    }
+
+exit:
+    if (!good || signature != 'PM') {
+        printf("APM Call (%04x) failed: %02x\n", which, error);
+        return;
+    }
+
+    printf("  APM: Power Off\n");
+    BootHalt();
+}
+
+///////////////////////////////////////////////////////////////////// Globals.
+//
+
+static Struct_Microsoft_Singularity_BootInfo __far *g_bi;
+static Struct_Microsoft_Singularity_MpBootInfo __far *g_mbi;
+static uint16 __far *g_CmdLine;
+
+//////////////////////////////////////////////////////////// PCI Mechanism #1.
+//
+
+UINT PciReadConfig(UINT8 nBus, UINT8 nDev, UINT8 nFun, void * pvData, UINT cbData)
+{
+    PCI_CONFIG_BITS sel;
+
+    sel.bits.enable = 1;
+    sel.bits.bus = nBus;
+    sel.bits.device = nDev;
+    sel.bits.function = nFun;
+
+    for (UINT cbDone = 0; cbDone < cbData; cbDone += sizeof(UINT32)) {
+        sel.bits.offset = cbDone;
+        IoSpaceWrite32(PCI_ADDR_PORT, sel.value);
+        *((UINT32*&)pvData)++ = IoSpaceRead32(PCI_DATA_PORT);
+    }
+    return cbDone;
+}
+
+UINT32 PciGetSize(UINT8 nBus, UINT8 nDev, UINT8 nFun, UINT8 nIgnore, UINT32 nOffset)
+{
+    PCI_CONFIG_BITS sel;
+    UINT32 saved, size;
+
+    sel.bits.enable   = 1;
+    sel.bits.bus      = nBus;
+    sel.bits.device   = nDev;
+    sel.bits.function = nFun;
+    sel.bits.offset   = nOffset;
+
+    // Save existing address
+    IoSpaceWrite32(PCI_ADDR_PORT, sel.value);
+    saved = IoSpaceRead32(PCI_DATA_PORT);
+
+    // Write size
+    IoSpaceWrite32(PCI_ADDR_PORT, sel.value);
+    IoSpaceWrite32(PCI_DATA_PORT, 0xffffffff);
+
+    // Read size (masking off reserved lower bits)
+    IoSpaceWrite32(PCI_ADDR_PORT, sel.value);
+    size = IoSpaceRead32(PCI_DATA_PORT) & ~((1 << nIgnore) - 1);
+    size = ~size + 1;
+
+    // Restore saved address
+    IoSpaceWrite32(PCI_ADDR_PORT, sel.value);
+    IoSpaceWrite32(PCI_DATA_PORT, saved);
+
+    return size;
+}
+
+UINT32 PciGetBarSize(UINT8 nBus, UINT8 nDev, UINT8 nFun, UINT32 nOffset)
+{
+    return PciGetSize(nBus, nDev, nFun, 4, nOffset);
+}
+
+UINT32 PciGetRomSize(UINT8 nBus, UINT8 nDev, UINT8 nFun, UINT32 nOffset)
+{
+    return PciGetSize(nBus, nDev, nFun, 10, nOffset);
+}
+
+#if DEBUG_PCI
+#define pciprintf(...) printf(__VA_ARGS__)
+#else
+#define pciprintf(...)
+#endif
+
+struct PCI_MEMORY_RANGE32 {
+    // We could store cacheability state
+    // here, e.g. ROM ranges can be cached.
+    UINT32 base;
+    UINT32 length;
+};
+
+UINT16 ScanPci(const Struct_Microsoft_Singularity_BootInfo _far *bi,
+               struct PCI_MEMORY_RANGE32 _far                   *lpPciMemRanges,
+               UINT16                                            nMaxPciMemRangesCount)
+{
+    UINT   nFound    = 0;
+    UINT16 nMemCount = 0;
+
+    ///////////////////////////////////////////////// Check for Compatibility.
+    //
+    pciprintf("Searching for PCI devices [%d busses].\n", bi->PciBiosCX + 1);
+
+    if ((bi->PciBiosAX >> 8) != 0 || (bi->PciBiosEDX != 0x20494350)) {
+        pciprintf("Hardware does not support PCI V2.x.\n");
+        pciprintf("PCI V2.x: AX:%04x, BX:%04x, CX:%04x, EDX:%08x\n",
+                  bi->PciBiosAX, bi->PciBiosBX, bi->PciBiosCX, bi->PciBiosEDX);
+        return 0;
+    }
+    if (!(bi->PciBiosAX & 0x01)) {
+        pciprintf("Hardware does not support multiple PCI buses.\n");
+        pciprintf("PCI V2.x: AX:%04x, BX:%04x, CX:%04x, EDX:%08x\n",
+                  bi->PciBiosAX, bi->PciBiosBX, bi->PciBiosCX, bi->PciBiosEDX);
+        return 0;
+    }
+
+    for (UINT8 nBus = 0; nBus <= bi->PciBiosCX; nBus++) {
+        for (UINT8 nDev = 0; nDev < PCI_MAX_DEVICES; nDev++) {
+            BOOL bIsMultiFunction;
+            PCI_COMMON_CONFIG config;
+
+            config.VendorID = PCI_INVALID_VENDORID;
+            PciReadConfig(nBus, nDev, 0, &config, PCI_FIXED_HDR_LENGTH);
+            bIsMultiFunction = config.HeaderType & PCI_MULTIFUNCTION;
+
+            for (UINT8 nFun = 0; nFun < PCI_MAX_FUNCTION; nFun++) {
+                if (nFun > 0 && !bIsMultiFunction) {
+                    break;
+                }
+
+                if (nMemCount == nMaxPciMemRangesCount) {
+                    printf("PCI address ranges saturated storage.");
+                    return nMaxPciMemRangesCount;
+                }
+
+                // Read configuration header.
+                //
+                config.VendorID = PCI_INVALID_VENDORID;
+                PciReadConfig(nBus, nDev, nFun, &config, sizeof(config));
+
+                if (config.VendorID == PCI_INVALID_VENDORID) {
+                    continue;
+                }
+
+                pciprintf("%2d.%2d.%1d: class %02x-%02x device %04x-%04x-%04x-%04x-%02x %02x il=%02x ip=%02x\n",
+                          nBus, nDev, nFun,
+                          config.BaseClass,
+                          config.SubClass,
+                          config.VendorID,
+                          config.DeviceID,
+                          config.type0.SubVendorID,
+                          config.type0.SubSystemID,
+                          config.RevisionID,
+                          config.HeaderType,
+                          config.type0.InterruptLine,
+                          config.type0.InterruptPin);
+
+                switch (config.HeaderType & ~PCI_MULTIFUNCTION) {
+                  case PCI_DEVICE_TYPE:
+                    if (config.type0.BaseAddresses[0] ||
+                        config.type0.BaseAddresses[1] ||
+                        config.type0.BaseAddresses[2] ||
+                        config.type0.BaseAddresses[3] ||
+                        config.type0.BaseAddresses[4] ||
+                        config.type0.BaseAddresses[5] ||
+                        config.type0.ROMBaseAddress) {
+                        pciprintf("         A0=%08lx A1=%08lx A2=%08lx A3=%08lx A4=%08lx "
+                                  "A5=%08lx RM=%08lx\n",
+                                  config.type0.BaseAddresses[0],
+                                  config.type0.BaseAddresses[1],
+                                  config.type0.BaseAddresses[2],
+                                  config.type0.BaseAddresses[3],
+                                  config.type0.BaseAddresses[4],
+                                  config.type0.BaseAddresses[5],
+                                  config.type0.ROMBaseAddress);
+                        for (int i = 0; i < PCI_TYPE0_ADDRESSES; i++) {
+                            if (config.type0.BaseAddresses[i] & PCI_BAR_TYPE_IO_SPACE) {
+                                continue;
+                            }
+                            else if (config.type0.BaseAddresses[i] & PCI_BAR_MEMORY_TYPE_64BIT) {
+                                i++;
+                                continue;
+                            }
+                            else if ((config.type0.BaseAddresses[i] & PCI_BAR_ADDRESS_MASK) == 0) {
+                                continue;
+                            }
+                            lpPciMemRanges[nMemCount].base   =
+                                config.type0.BaseAddresses[i] & PCI_BAR_ADDRESS_MASK;
+                            lpPciMemRanges[nMemCount].length =
+                                PciGetBarSize(nBus, nDev, nFun, 0x10 + i * 4);
+                            nMemCount++;
+                        }
+                        if (config.type0.ROMBaseAddress & PCI_ROMADDRESS_MASK) {
+                            lpPciMemRanges[nMemCount].base   =
+                                config.type0.ROMBaseAddress & PCI_ROMADDRESS_MASK;
+                            lpPciMemRanges[nMemCount].length =
+                                PciGetRomSize(nBus, nDev, nFun, 0x30);
+                            nMemCount++;
+                        }
+                    }
+                    break;
+                  case PCI_BRIDGE_TYPE:
+                    pciprintf("         BUS=%02x/%02x/%02x IO=%02x/%02x "
+                              "A0=%08lx A1=%08lx RM=%08x\n",
+                              config.type1.PrimaryBus,
+                              config.type1.SecondaryBus,
+                              config.type1.SubordinateBus,
+                              config.type1.IOBase,
+                              config.type1.IOLimit,
+                              config.type1.BaseAddresses[0],
+                              config.type1.BaseAddresses[1],
+                              config.type1.ROMBaseAddress);
+                    for (int i = 0; i < PCI_TYPE1_ADDRESSES; i++) {
+                        if (config.type0.BaseAddresses[i] & PCI_BAR_TYPE_IO_SPACE) {
+                            continue;
+                        }
+                        else if (config.type0.BaseAddresses[i] & PCI_BAR_MEMORY_TYPE_64BIT) {
+                            i++;
+                            continue;
+                        }
+                        else if ((config.type0.BaseAddresses[i] & PCI_BAR_ADDRESS_MASK) == 0) {
+                            continue;
+                        }
+                        lpPciMemRanges[nMemCount].base   = config.type0.BaseAddresses[i];
+                        lpPciMemRanges[nMemCount].length = PciGetBarSize(nBus, nDev, nFun,
+                                                                          0x10 + i * 4);
+                        nMemCount++;
+                    }
+                    if (config.type0.ROMBaseAddress & PCI_ROMADDRESS_MASK) {
+                        lpPciMemRanges[nMemCount].base   = config.type0.ROMBaseAddress;
+                        lpPciMemRanges[nMemCount].length = PciGetRomSize(nBus, nDev, nFun, 0x38);
+                        nMemCount++;
+                    }
+                    break;
+                }
+                nFound++;
+            }
+        }
+    }
+    pciprintf("\n");
+    return nMemCount;
+}
+
+/////////////////////////////////////////////// BootPhase1 - main entry point.
+//
+extern "C" int BootPhase1(PXE __far *pxe, PXENV __far * pxenv, uint32 diskid)
+{
+    uint16 port = 0;                // debug port
+    BootDevice __far *bootDevice;   // base class ptr
+
+    // allocate 32KB for the ini file:
+    uint8 __far * IniFileBuffer = (uint8 __far *) alloc(0x7FFF, 0);
+
+    // constant, hard-coded filename
+    LPCHAR initfile = "/Singularity/Singboot.ini";
+
+    VideoInit();
+    VPutChar('1');
+
+    //
+    // Initialize the Debugger
+    //
+    if (BdInitDebugger(COM2_PORT)) {
+        VPutChar('a');
+        port = COM2_PORT;
+        fDebuggerInitialized = TRUE;
+    }
+    else {
+        VPutChar('A');
+        if (BdInitDebugger(COM1_PORT)) {
+            VPutChar('b');
+            port = COM1_PORT;
+            fDebuggerInitialized = TRUE;
+        }
+        else {
+            VPutChar('B');
+            if (BdInitDebugger(COM2_PORT)) {
+                fDebuggerInitialized = TRUE;
+                port = COM2_PORT;
+            }
+        }
+    }
+    VPutChar('2');
+
+    //
+    // Get the BIOS info
+    //
+    Struct_Microsoft_Singularity_BootInfo __far *bi =
+        (Struct_Microsoft_Singularity_BootInfo __far *)
+        alloc(sizeof(Struct_Microsoft_Singularity_BootInfo), 0x10);
+    g_bi = bi;
+    VPutChar('3');
+
+    BootGetBiosInfo(bi);
+    bi->Info16 = (uint32)bi;
+    VPutChar('4');
+
+    const UINT16 nMaxPciRanges = 64;
+    struct PCI_MEMORY_RANGE32 __far *lpPciRanges = (struct PCI_MEMORY_RANGE32 __far*)
+        alloc(nMaxPciRanges * sizeof(struct PCI_MEMORY_RANGE32), 0);
+    UINT16 nPciMemoryRanges = ScanPci(bi, lpPciRanges, nMaxPciRanges);
+
+    //
+    // Try to find a PCI 1394 connection for the debugger.
+    //
+    for (UINT8 nBus = 0; nBus <= bi->PciBiosCX; nBus++) {
+        for (UINT8 nDev = 0; nDev < PCI_MAX_DEVICES; nDev++) {
+            BOOL bIsMultiFunction;
+            PCI_COMMON_CONFIG config;
+
+            config.VendorID = PCI_INVALID_VENDORID;
+            PciReadConfig(nBus, nDev, 0, &config, sizeof(config));
+            bIsMultiFunction = config.HeaderType & PCI_MULTIFUNCTION;
+
+            for (UINT8 nFun = 0; nFun < PCI_MAX_FUNCTION; nFun++) {
+                if (nFun > 0 && !bIsMultiFunction) {
+                    break;
+                }
+
+                if (config.BaseClass == 0x0c && config.SubClass == 0x00 &&
+                    bi->Ohci1394Base.lo == 0) {
+                    // Found firewire.
+
+                    printf("%2d.%2d.%1d: 1394 device %04x-%04x-%04x-%04x-%02x\n",
+                           nBus, nDev, nFun,
+                           config.VendorID,
+                           config.DeviceID,
+                           config.type0.SubVendorID,
+                           config.type0.SubSystemID,
+                           config.RevisionID);
+                    printf("          %08lx %08lx %08lx %08lx %08lx %08lx\n",
+                           config.type0.BaseAddresses[0],
+                           config.type0.BaseAddresses[1],
+                           config.type0.BaseAddresses[2],
+                           config.type0.BaseAddresses[3],
+                           config.type0.BaseAddresses[4],
+                           config.type0.BaseAddresses[5]);
+
+                    bi->Ohci1394Base.lo = config.type0.BaseAddresses[0] & ~0xflu;
+                    bi->Ohci1394BufferAddr32.lo = PointerToUint32(allocpages(3));
+                    bi->Ohci1394BufferSize32
+                        = 3 * Struct_Microsoft_Singularity_BootInfo_PAGE_SIZE;
+                    break;
+                }
+            }
+        }
+    }
+
+    // figure out the boot device
+    if (pxe->Signature[0] == '!' &&
+        pxe->Signature[1] == 'P' &&
+        pxe->Signature[2] == 'X' &&
+        pxe->Signature[3] == 'E') {
+        bootDevice = new __far PxeDevice(pxe, pxenv);
+    }
+    else if (pxenv->Signature[0] == 'P' &&
+             pxenv->Signature[1] == 'X' &&
+             pxenv->Signature[2] == 'E' &&
+             pxenv->Signature[3] == 'N' &&
+             pxenv->Signature[4] == 'V' &&
+             pxenv->Signature[5] == '+') {
+        bootDevice = new __far PxeDevice(pxe, pxenv);
+    }
+    else if (PointerToUint32(pxe) == diskid &&
+             PointerToUint32(pxenv) == 0x4803) {
+        bootDevice = new __far FatDevice((uint8)diskid, (uint8)32);
+    }
+    else if (PointerToUint32(pxe) == diskid &&
+             PointerToUint32(pxenv) == 0x4806) {
+        bootDevice = new __far FatDevice((uint8)diskid, (uint8)16);
+    }
+    else if (PointerToUint32(pxe) == diskid &&
+             PointerToUint32(pxenv) == 0x4344) {
+        bootDevice = new __far JolietDevice((uint8)diskid, (uint8)0);
+    }
+    else if (PointerToUint32(pxe) == diskid &&
+             PointerToUint32(pxenv) == 0x5544) {
+        bootDevice = new __far UsbDevice((uint8)diskid, (uint8)0);
+    }
+    else {
+        printf("Error:  Invalid Boot Medium:  diskid=%lx, pxe=%lx, pxenv=%lx",
+               diskid,
+               PointerToUint32(pxe),
+               PointerToUint32(pxenv));
+        BootHalt();
+    }
+
+    VPutChar('5');
+    BdPrintString("-------------------------------------------------------------------------------\n", 80);
+    VPutChar('6');
+
+    //
+    // print welcome message:
+    //
+
+    printf("16-bit Singularity Boot Loader [%s %s] (bi=%d) [com2]\n",
+           __DATE__, __TIME__, sizeof(Struct_Microsoft_Singularity_BootInfo));
+    VPutChar('7');
+    VPutChar('.');
+
+    //
+    // partial verify of the bios data
+    //
+    if (sizeof(Struct_Microsoft_Singularity_BootInfo) != bi->RecSize) {
+        printf("sizeof(Struct_Microsoft_Singularity_BootInfo)=%d, bi->RecSize=%ld\n",
+               sizeof(Struct_Microsoft_Singularity_BootInfo),
+               bi->RecSize);
+        BootHalt();
+    }
+
+    //
+    // Initialize the boot device
+    //
+    if (bootDevice->OpenDevice()==-1) {
+        BootHalt();
+    }
+
+    // read these globals from the boot device, to use in adjusting the
+    // debug port
+    g_CmdLine = bootDevice->CmdLine;
+    bi->CmdLine32.lo = PointerToUint32(bootDevice->CmdLine);
+
+    printf("\n");
+
+    //
+    // Adjust Debug Port.
+    //
+    bi->DebugBasePort = port;
+
+    for (uint16 __far * pwz = bootDevice->CmdLine; *pwz != '\0'; pwz++) {
+        if ((pwz[0] == 'd' || pwz[0] == 'D') &&
+            (pwz[1] == 'b' || pwz[1] == 'B') &&
+            (pwz[2] == 'g' || pwz[2] == 'G') &&
+            pwz[3] == '=') {
+            *pwz++ = ' ';   // Remove 'd'
+            *pwz++ = ' ';   // Remove 'b'
+            *pwz++ = ' ';   // Remove 'g'
+            *pwz++ = ' ';   // Remove '='
+
+            bi->DebugBasePort = 0;
+            while (*pwz != '\0' && *pwz != ' ') {
+                if (*pwz >= 'a' && *pwz <= 'f') {
+                    bi->DebugBasePort = bi->DebugBasePort * 0x10 + (*pwz - 'a') + 10;
+                    *pwz++ = ' ';
+                }
+                else if (*pwz >= 'A' && *pwz <= 'F') {
+                    bi->DebugBasePort = bi->DebugBasePort * 0x10 + (*pwz - 'A') + 10;
+                    *pwz++ = ' ';
+                }
+                else if (*pwz >= '0' && *pwz <= '9') {
+                    bi->DebugBasePort = bi->DebugBasePort * 0x10 + (*pwz - '0');
+                    *pwz++ = ' ';
+                }
+                else {
+                    break;
+                }
+            }
+        }
+    }
+
+    if (bi->DebugBasePort < 0x100) {
+        printf("Using default debug port until 1394 starts [%04x com1=%04x com2=%04x].\n",
+               port, COM1_PORT, COM2_PORT);
+    }
+    else if (bi->DebugBasePort != port) {
+        printf("Changing to debug port %x.\n", bi->DebugBasePort);
+        BdInitDebugger(bi->DebugBasePort);
+        BdPrintString("-------------------------------------------------------------------------------\n", 80);
+
+        printf("16-bit Singularity Boot Loader [%s %s] (bi=%d) [dbg=%x]\n",
+               __DATE__, __TIME__,
+               sizeof(Struct_Microsoft_Singularity_BootInfo),
+               bi->DebugBasePort);
+    }
+    else {
+        printf("Default debug port [%04x com1=%04x com2=%04x].\n",
+               port, COM1_PORT, COM2_PORT);
+        bi->DebugBasePort = port;
+    }
+
+    //
+    // Set up Memory Map
+    //
+    Struct_Microsoft_Singularity_SMAPINFO __far *sm =
+        (Struct_Microsoft_Singularity_SMAPINFO __far *)
+        alloc(sizeof(Struct_Microsoft_Singularity_SMAPINFO) * 128, 0x10);
+    bi->SmapData32.lo = PointerToUint32(sm);
+
+    // Read the system memory map.
+    for (uint32 index = 0; bi->SmapCount < 128;) {
+        uint32 next = index;
+
+        int ax = BootGetSMAP(&sm[bi->SmapCount], &next);
+        if (ax != 0x4150) {
+            break;
+        }
+        bi->SmapCount++;
+
+        if (next == 0) {
+            break;
+        }
+        index = next;
+    }
+
+    //
+    // Drop SMAP entries above supported limit
+    //
+    for (uint i = 0; i < bi->SmapCount; i++) {
+        if (sm[i].type != Struct_Microsoft_Singularity_SMAPINFO_AddressTypeFree) {
+            continue;
+        }
+
+        uint32 startKB = (sm[i].addr.lo >> 10) + (sm[i].addr.hi << 22);
+        uint32 sizeKB  = (sm[i].size.lo >> 10) + (sm[i].size.hi << 22);
+
+        if ((sm[i].addr.hi != 0ul) ||
+            sm[i].addr.lo >= Struct_Microsoft_Singularity_BootInfo_MAX_VIRTUAL_ADDR) {
+            sm[i] = sm[--bi->SmapCount];
+        }
+        else if (startKB + sizeKB >= Struct_Microsoft_Singularity_BootInfo_MAX_VIRTUAL_ADDR / 1024ul) {
+            sm[i].size.hi = 0;
+            sm[i].size.lo = Struct_Microsoft_Singularity_BootInfo_MAX_VIRTUAL_ADDR - startKB * 1024;
+        }
+    }
+
+    // Sort the system memory map.
+  sortagain:
+    for (i = 0; i < bi->SmapCount - 1; i++) {
+        if ((sm[i].addr.hi > sm[i + 1].addr.hi) ||
+            (sm[i].addr.hi == sm[i + 1].addr.hi &&
+             sm[i].addr.lo > sm[i + 1].addr.lo)) {
+
+            Struct_Microsoft_Singularity_SMAPINFO s = sm[i];
+            sm[i] = sm[i+1];
+            sm[i+1] = s;
+
+            goto sortagain;
+        }
+    }
+
+    //
+    // Make a reasonable guess at the top of physical memory.
+    //
+    uint32 memoryKB = 0;
+    for (i = 0; i < bi->SmapCount; i++) {
+        uint32 limitKB = (sm[i].addr.lo >> 10) + (sm[i].size.lo >> 10);
+        switch (sm[i].type) {
+            case Struct_Microsoft_Singularity_SMAPINFO_AddressTypeFree:
+            // case Struct_Microsoft_Singularity_SMAPINFO_AddressTypeACPI:
+            // case Struct_Microsoft_Singularity_SMAPINFO_AddressTypeNVS:
+                if (limitKB > memoryKB) {
+                    memoryKB = limitKB;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    printf("Physical memory detected: %8luKB\n", memoryKB);
+
+    //
+    // Save the EBDA.
+    //
+    uint16 __far * pEbdaSegment = (uint16 __far *)_MK_FP(0x40, 0x0e);
+    uint8 __far * pEbdaRegion = (uint8 __far *)_MK_FP(*pEbdaSegment, 0);
+
+    bi->Ebda32 = PointerToUint32(pEbdaRegion);
+
+
+    //
+    // Scan for PNP.
+    //
+    LPPNP_ROOT pPnp = NULL;
+    LPSMBIOS_ROOT pSmbios = NULL;
+    LPDMIBIOS_ROOT pDmi = NULL;
+
+    for (uint segment = 0xf000; segment < 0xffff; segment++) {
+
+        LPPNP_ROOT ppr = (LPPNP_ROOT)_MK_FP(segment, 0);
+
+        if (pPnp == NULL &&
+            ppr->Signature[0] == '$' &&
+            ppr->Signature[1] == 'P' &&
+            ppr->Signature[2] == 'n' &&
+            ppr->Signature[3] == 'P' &&
+            Checksum((uint8 __far *)ppr, ppr->Length)) {
+
+            pPnp = ppr;
+        }
+
+        LPSMBIOS_ROOT psr = (LPSMBIOS_ROOT)ppr;
+        if (pSmbios == NULL &&
+            psr->Signature[0] == '_' &&
+            psr->Signature[1] == 'S' &&
+            psr->Signature[2] == 'M' &&
+            psr->Signature[3] == '_' &&
+            psr->Signature2[0] == '_' &&
+            psr->Signature2[1] == 'D' &&
+            psr->Signature2[2] == 'M' &&
+            psr->Signature2[3] == 'I' &&
+            psr->Signature2[4] == '_' &&
+            Checksum((uint8 __far *)psr, psr->Length)) {
+
+            pSmbios = psr;
+            pDmi = (LPDMIBIOS_ROOT)&psr->Signature2[0];
+        }
+
+        LPDMIBIOS_ROOT pdr = (LPDMIBIOS_ROOT)ppr;
+        if (pDmi == NULL &&
+            pdr->Signature2[0] == '_' &&
+            pdr->Signature2[1] == 'D' &&
+            pdr->Signature2[2] == 'M' &&
+            pdr->Signature2[3] == 'I' &&
+            pdr->Signature2[4] == '_' &&
+            Checksum((uint8 __far *)pdr, sizeof(DMIBIOS_ROOT))) {
+
+            pDmi = pdr;
+        }
+    }
+
+    if (pPnp != NULL) {
+        printf("Found PnP at %lp\n", pPnp);
+        printf("    Rev=%02x, Len=%02x/%02x/%02x, Ctl=%04x Evt=%08lx\n",
+               pPnp->Revision,
+               pPnp->Length,
+               sizeof(*pPnp),
+               Sum((uint8 __far *)pPnp, pPnp->Length),
+               pPnp->ControlField,
+               pPnp->EventFlagAddress);
+        printf("    RealMode: entry=%lp data=%04x [oem=%08lx]\n",
+               pPnp->RealModeEntry,
+               pPnp->RealModeDataSegment,
+               pPnp->OemDeviceId);
+
+        PNP_FN pfPnp = pPnp->RealModeEntry;
+        int err;
+        uint8 cNodes = 0;
+        uint16 cbNode = 0;
+
+        err = pfPnp(0, (uint8 __far *)&cNodes, (uint16 __far *)&cbNode, pPnp->RealModeDataSegment);
+        if (err != 0) {
+            printf("Get Number of System Device Nodes failed: %d\n", err);
+        }
+
+        LPPNP_NODE pNode = (LPPNP_NODE)alloc(cbNode, 4);
+
+        uint16 cbNodes = 0;
+        for (uint8 n = 0; n < 0xff;) {
+            err = pfPnp(1, (uint8 __far *)&n, pNode, 1, pPnp->RealModeDataSegment);
+            if (err != 0) {
+                break;
+            }
+            cbNodes += pNode->Size;
+        }
+
+        uint8 __far * pNodes = (uint8 __far *)alloc(cbNodes, 4);
+        bi->PnpNodesAddr32.lo = PointerToUint32(pNodes);
+        bi->PnpNodesSize32 = cbNodes;
+
+        for (n = 0; n < 0xff;) {
+            pNode = (LPPNP_NODE)pNodes;
+            err = pfPnp(1, (uint8 __far *)&n, pNode, 1, pPnp->RealModeDataSegment);
+            if (err != 0) {
+                printf("Get Number of System Device Node failed: %d\n", err);
+                n = 0xff;
+                continue;
+            }
+
+            pNodes += pNode->Size;
+        }
+
+        pNode = (LPPNP_NODE)pNodes;
+        pNode->Size = 0;
+
+        printf("\n");
+
+        PNP_ISACONFIG isaConfig;
+        isaConfig.Revision = 1;
+
+        err = pfPnp(0x40, (LPPNP_ISACONFIG)&isaConfig, pPnp->RealModeDataSegment);
+        if (err != 0) {
+            printf("Get ISA Config failed: %d\n", err);
+        }
+        else {
+            bi->IsaCsns = isaConfig.TotalCSNs;
+            bi->IsaReadPort = isaConfig.IsaReadDataPort;
+
+            printf("ISA PnP Revision: %d, TotalCSNs: %d, IsaReadDatPort: %04x\n",
+                   isaConfig.Revision,
+                   isaConfig.TotalCSNs,
+                   isaConfig.IsaReadDataPort);
+        }
+    }
+
+    if (pSmbios != NULL) {
+        printf("Found SMBIOS at %lp\n", pSmbios);
+
+        printf("    Version=%02x.%02x Len=%02x/%02x/%02x Max=%04x EPR=%02x\n",
+               pSmbios->MajorVersion,
+               pSmbios->MinorVersion,
+               pSmbios->Length,
+               sizeof(*pSmbios),
+               Sum((uint8 __far *)pSmbios, pSmbios->Length),
+               pSmbios->MaximumStructureSize,
+               pSmbios->EntryPointRevision);
+        printf("\n");
+        bi->SmbiosRoot32.lo = PointerToUint32(pSmbios);
+    }
+    if (pDmi != NULL) {
+        printf("Found DMI at %lp\n", pDmi);
+
+        printf("    Rev=%02x Len=%04x Num=%04x Addr=%08lx\n",
+               pDmi->Revision,
+               pDmi->StructureTableLength,
+               pDmi->NumberStructures,
+               pDmi->StructureTableAddress);
+        printf("\n");
+        bi->DmiRoot32.lo = PointerToUint32(pDmi);
+    }
+
+    //
+    // Load dump images
+    //
+    bi->DumpSize32 = 0;
+
+    // Since we don't want to allocate much memory, we'll
+    // recycle these 2 pointers to file structs for all filesystem ops
+    FileData directory;
+    FilePtr pDirectory = (FilePtr) &directory;
+    FileData file;
+    FilePtr pFile = (FilePtr) &file;
+
+    pFile->Size       = 0x7fff;
+    pFile->FirstBlock = 0;
+
+    // Zero the IniFileBuffer
+    memzero((LPVOID)IniFileBuffer, 0x8000);
+
+    // Find the .ini file and get file metadata for loaders that cache it
+    if (bootDevice->GetFileProperties(initfile, pFile, pDirectory) == -1) {
+        // the device-specific function already printed something, just halt
+        BootHalt();
+    }
+
+    if (pFile->Size > 0x8000) {
+        printf(".ini file too big for SINGLDR.\n");
+        BootHalt();
+    }
+
+    // Load the .ini file
+    if (bootDevice->ReadFileLow(initfile, pFile, IniFileBuffer) == -1) {
+        // the device-specific function already printed something, just halt
+        BootHalt();
+    }
+
+    IniFile iniFile(IniFileBuffer, pFile->Size);
+
+    uint16 nMaxImages = iniFile.GetFileCount();
+
+    Struct_Microsoft_Singularity_Io_FileImage __far* fileImage =
+        (Struct_Microsoft_Singularity_Io_FileImage __far*)
+        alloc((uint16)(sizeof(Struct_Microsoft_Singularity_Io_FileImage) *
+                       nMaxImages), 0x10);
+
+    iniFile.Rewind();
+
+    for (i = 0; i < nMaxImages; i++) {
+        LPUINT8 nextFname = iniFile.GetCurrentFileName();
+        if (bootDevice->GetFileProperties((LPCHAR)nextFname,
+                                          pFile, pDirectory) == -1) {
+            BootHalt();
+        }
+        fileImage[i].Size     = iniFile.GetCurrentFileSize();
+        fileImage[i].Address  = pFile->FirstBlock;
+        bi->DumpSize32       += fileImage[i].Size;
+
+        iniFile.MoveNext();
+    }
+
+    // Pad size by one byte to work around
+    // a bug in a popular pxeboot disk that has an off by one
+    // buffer overflow check and wrongly refuses to copy last block
+    // of file if provided buffer is exactly the right size.
+    bi->DumpSize32 += 1;
+
+    //
+    // Find memory to load image.
+    //
+    uint32 dumpRegionSize = (bi->DumpSize32 + 0xffff) & 0xffff0000;
+    bi->DumpAddr32.lo = 0;
+
+    printf("System Memory Map:\n");
+    // Find a suitable region of memory.
+    for (i = 0; i < bi->SmapCount; i++) {
+        if (sm[i].type == 1 && sm[i].size.lo > dumpRegionSize) {
+            // round down to nearest 2MB boundary (to start on super page boundary).
+            uint32 target = (sm[i].addr.lo + sm[i].size.lo - dumpRegionSize) & 0xffe00000;
+            if (target < sm[i].addr.lo) {
+                continue;
+            }
+            if (bi->DumpAddr32.lo < target) {
+                bi->DumpAddr32.lo = target;
+                dumpRegionSize = sm[i].size.lo;
+            }
+        }
+        printf("  %08lx..%08lx %ld.%ld\n",
+               sm[i].addr.lo,
+               sm[i].addr.lo + sm[i].size.lo,
+               sm[i].type,
+               sm[i].extendedAttributes
+               );
+    }
+
+    printf("\n");
+    printf("Editing the SMAP to protect the dump area...\n");
+
+    for (i = 0; i < bi->SmapCount; i++) {
+        // Does this region straddle the start of the dump area?
+        // if so, truncate it
+        if (sm[i].type == 1 &&
+            sm[i].addr.lo < bi->DumpAddr32.lo &&
+            sm[i].addr.lo + sm[i].size.lo > bi->DumpAddr32.lo) {
+
+            sm[i].size.lo = bi->DumpAddr32.lo - sm[i].addr.lo;
+            printf("  %08lx..%08lx %d (truncated)\n",
+                   sm[i].addr.lo,
+                   sm[i].addr.lo + sm[i].size.lo,
+                   sm[i].type);
+        }
+
+        if (sm[i].type == 1 &&
+            sm[i].addr.lo >= bi->DumpAddr32.lo) {
+
+            sm[i].type = 2; // Arbitrary non-free value
+            printf("  %08lx..%08lx %d (marked unavailable)\n",
+                   sm[i].addr.lo,
+                   sm[i].addr.lo + sm[i].size.lo,
+                   sm[i].type);
+        }
+    }
+
+    printf("\n");
+    printf("Loading image at %08lx..%08lx in %d files.\n",
+           bi->DumpAddr32.lo, bi->DumpAddr32.lo + bi->DumpSize32, nMaxImages);
+
+    //
+    // Download image
+    //
+    bi->DumpSize32 = 0;
+
+    iniFile.Rewind();
+
+    uint32 bytesread; // to ensure we read right amount for each file
+
+    printf("Loading files");
+    // request each file, in order
+    for (i = 0; i < nMaxImages; i++) {
+        uint32 destination = bi->DumpAddr32.lo + bi->DumpSize32;
+        LPUINT8 nextFname = iniFile.GetCurrentFileName();
+
+        // get the first block and size of the file
+        pFile->FirstBlock = fileImage[i].Address;
+        pFile->Size       = fileImage[i].Size;
+
+        // some media use the file name, others use the FilePtr object.  We
+        // send both to the function, and leave it up to the media to use
+        // what it needs.
+        bytesread = bootDevice->ReadFileHigh((LPCHAR) nextFname,
+                                             pFile,
+                                             destination,
+                                             dumpRegionSize);
+        if (bytesread != fileImage[i].Size) {
+            printf("\n    Read wrong # of bytes: %ld != %ld.\n",
+                   bytesread, fileImage[i].Size);
+            BootHalt();
+        }
+        else {
+            printf(".");
+        }
+
+        // Change from address of first sector to physical memory address
+        fileImage[i].Address  = destination;
+        bi->DumpSize32       += fileImage[i].Size;
+        dumpRegionSize       -= fileImage[i].Size;
+
+        iniFile.MoveNext();
+    }
+    printf("\n");
+
+    bi->FileImageTableBase32.lo  = PointerToUint32(fileImage);
+    bi->FileImageTableEntries = nMaxImages;
+
+    //
+    // Close the Boot Medium:
+    //
+    bootDevice->CloseDevice();
+
+    //
+    // Allocate MpBootInfo structure
+    //
+    g_mbi = (Struct_Microsoft_Singularity_MpBootInfo __far *)
+        alloc(sizeof(Struct_Microsoft_Singularity_MpBootInfo), 0x04);
+    bi->MpBootInfo32.lo    = PointerToUint32(g_mbi);
+    bi->MpCpuCount         = 0;
+    bi->MpStartupLock32.lo = PointerToUint32(&MpStartupLock);
+
+    //
+    // Allocate pages for commonly referenced data
+    //
+
+    // 2 Pages (1 RW, 1 RO) for processor context
+    LPVOID pfs = allocpages(2);
+
+    // 2 Pages (1 RW, 1 RO) for thread
+    LPVOID pgs = allocpages(2);
+
+    uint32 pfsBase = PointerToUint32(pfs);
+    uint32 pgsBase = PointerToUint32(pgs);
+
+    //
+    // Set up the GDT
+    //
+    bi->Cpu0.GdtPtr.addr = PointerToUint32(&bi->Cpu0.GdtNull);
+    bi->Cpu0.GdtPtr.limit = (OFFSETOF(Struct_Microsoft_Singularity_CpuInfo, GdtEnd) -
+                             OFFSETOF(Struct_Microsoft_Singularity_CpuInfo, GdtNull));
+
+    bi->Cpu0.GdtRS.base0_15 = Struct_Microsoft_Singularity_BootInfo_REAL_CODE_BASE;
+    bi->Cpu0.GdtRS.base16_23 = Struct_Microsoft_Singularity_BootInfo_REAL_CODE_BASE >> 16;
+    bi->Cpu0.GdtRS.base24_31 = Struct_Microsoft_Singularity_BootInfo_REAL_CODE_BASE >> 24;
+
+    bi->Cpu0.GdtRC.base0_15 = Struct_Microsoft_Singularity_BootInfo_REAL_CODE_BASE;
+    bi->Cpu0.GdtRC.base16_23 = Struct_Microsoft_Singularity_BootInfo_REAL_CODE_BASE >> 16;
+    bi->Cpu0.GdtRC.base24_31 = Struct_Microsoft_Singularity_BootInfo_REAL_CODE_BASE >> 24;
+
+    bi->Cpu0.GdtPF.base0_15  = (uint16)pfsBase;
+    bi->Cpu0.GdtPF.base16_23 = (uint8)(pfsBase >> 16);
+    bi->Cpu0.GdtPF.base24_31 = (uint8)(pfsBase >> 24);
+
+    bi->Cpu0.GdtPG.base0_15  = (uint16)pgsBase;
+    bi->Cpu0.GdtPG.base16_23 = (uint8)(pgsBase >> 16);
+    bi->Cpu0.GdtPG.base24_31 = (uint8)(pgsBase >> 24);
+
+    bi->Cpu0.GdtRS.limit = 0xffff;
+    bi->Cpu0.GdtRC.limit = 0xffff;
+    bi->Cpu0.GdtPC.limit = 0xffff;
+    bi->Cpu0.GdtPD.limit = 0xffff;
+    bi->Cpu0.GdtUC.limit = 0xffff;
+    bi->Cpu0.GdtUD.limit = 0xffff;
+    bi->Cpu0.GdtPF.limit = 0x1;  // 2 Pages (1 RW, 1 RO)
+    bi->Cpu0.GdtPG.limit = 0x1;  // 2 Pages (1 RW, 1 RO)
+
+    bi->Cpu0.GdtRS.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING0 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_WRITEABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtRC.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING0 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_READABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_CODE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtPC.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING0 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_READABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_CODE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtPD.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING0 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_WRITEABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtUC.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING3 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_READABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_CODE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtUD.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING3 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_WRITEABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtPF.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING3 | // for the moment, share UF and PF
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_WRITEABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+    bi->Cpu0.GdtPG.access = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                             Struct_Microsoft_Singularity_X86_GDTE_RING0 |
+                             Struct_Microsoft_Singularity_X86_GDTE_USER |
+                             Struct_Microsoft_Singularity_X86_GDTE_WRITEABLE |
+                             Struct_Microsoft_Singularity_X86_GDTE_ACCESSED);
+
+    bi->Cpu0.GdtRS.granularity = 0;
+    bi->Cpu0.GdtRC.granularity = 0;
+    bi->Cpu0.GdtPC.granularity = (Struct_Microsoft_Singularity_X86_GDTE_PAGES |
+                                  Struct_Microsoft_Singularity_X86_GDTE_IS32BIT |
+                                  Struct_Microsoft_Singularity_X86_GDTE_LIMIT20);
+    bi->Cpu0.GdtPD.granularity = (Struct_Microsoft_Singularity_X86_GDTE_PAGES |
+                                  Struct_Microsoft_Singularity_X86_GDTE_IS32BIT |
+                                  Struct_Microsoft_Singularity_X86_GDTE_LIMIT20);
+    bi->Cpu0.GdtUC.granularity = (Struct_Microsoft_Singularity_X86_GDTE_PAGES |
+                                  Struct_Microsoft_Singularity_X86_GDTE_IS32BIT |
+                                  Struct_Microsoft_Singularity_X86_GDTE_LIMIT20);
+    bi->Cpu0.GdtUD.granularity = (Struct_Microsoft_Singularity_X86_GDTE_PAGES |
+                                  Struct_Microsoft_Singularity_X86_GDTE_IS32BIT |
+                                  Struct_Microsoft_Singularity_X86_GDTE_LIMIT20);
+    bi->Cpu0.GdtPF.granularity = (Struct_Microsoft_Singularity_X86_GDTE_PAGES |
+                                  Struct_Microsoft_Singularity_X86_GDTE_IS32BIT);
+    bi->Cpu0.GdtPG.granularity = (Struct_Microsoft_Singularity_X86_GDTE_PAGES |
+                                  Struct_Microsoft_Singularity_X86_GDTE_IS32BIT);
+
+    Struct_Microsoft_Singularity_X86_TSS __far* ptss;
+    ptss = (Struct_Microsoft_Singularity_X86_TSS __far*)allocpages(1);
+    ptss->ss0 = (OFFSETOF(Struct_Microsoft_Singularity_CpuInfo, GdtPD) -
+                 OFFSETOF(Struct_Microsoft_Singularity_CpuInfo, GdtNull));
+    ptss->esp0 = PointerToUint32(ptss) + Struct_Microsoft_Singularity_BootInfo_PAGE_SIZE-0x10;
+    ptss->io_bitmap_offset = sizeof(*ptss);
+
+    uint32 tssaddr = PointerToUint32(ptss);
+    bi->Cpu0.GdtTSS.base0_15  = (uint16)((tssaddr) & 0xffff);
+    bi->Cpu0.GdtTSS.base16_23 = (uint8)((tssaddr >> 16) & 0xff);
+    bi->Cpu0.GdtTSS.base24_31 = (uint8)((tssaddr >> 24) & 0xff);
+    bi->Cpu0.GdtTSS.limit     = sizeof(*ptss) - 1;
+    bi->Cpu0.GdtTSS.access    = (Struct_Microsoft_Singularity_X86_GDTE_PRESENT |
+                                 Struct_Microsoft_Singularity_X86_GDTE_RING0 |
+                                 Struct_Microsoft_Singularity_X86_GDTE_Tss32Free);
+
+#if !MAP_ZERO_PAGE
+    //
+    // Create a simple PAE page table for the double-fault handler.
+    //
+
+    uint64 __far * pdpe = (uint64 __far *) allocpages(1);   // Page-directory-pointer table
+    uint64 __far * pde = (uint64 __far *) allocpages(4);   // Page-directory table
+    uint64 __far * pte = (uint64 __far *) allocpages(1);   // Page table
+
+    uint32 pdptBase = PointerToUint32(pdpe);
+    uint32 pdtsBase = PointerToUint32(pde);
+    uint32 pteBase = PointerToUint32(pte);
+
+    // Create page-directory-pointer entries
+    for (i = 0; i < 4; i++) {
+        pdpe[i].lo = (pdtsBase + (((uint32)i) << 12)) |
+            (Struct_Microsoft_Singularity_X86_PE_VALID);
+    }
+
+    // Create PDE entries for full 4GB of addressable RAM.
+    for (i = 0; i < 2048; i++) {
+        pde[i].lo = (((uint32)i) << 21) |
+            (Struct_Microsoft_Singularity_X86_PE_IS2MB |
+             Struct_Microsoft_Singularity_X86_PE_ACCESSED |
+             Struct_Microsoft_Singularity_X86_PE_WRITEABLE);
+    }
+
+    // Create a small-page entry for the low 2MB.
+    pde[0].lo = (pteBase) |
+        (Struct_Microsoft_Singularity_X86_PE_ACCESSED |
+         Struct_Microsoft_Singularity_X86_PE_WRITEABLE);
+
+    // Create the page table for the low 2MB page.
+    for (i = 0; i < 512; i++) {
+        pte[i].lo = (((uint32)i) << 12) |
+            (Struct_Microsoft_Singularity_X86_PE_ACCESSED |
+             Struct_Microsoft_Singularity_X86_PE_WRITEABLE);
+    }
+
+    // Map from 16KB to 2MB.
+    for (i = 4; i < 512; i++) {
+        pte[i].lo |= Struct_Microsoft_Singularity_X86_PE_VALID;
+    }
+
+    // Map physical memory pages (rounding up to 2MB)
+    uint32 pages = (memoryKB + 0x7ff) >> 11;
+    for (i = 0; i < pages; i++) {
+        pde[i].lo |= Struct_Microsoft_Singularity_X86_PE_VALID;
+    }
+
+    // Make sure all SMAP addresses below 4GB are mapped.  ACPI
+    // data structures may be mapped higher than supported
+    // physical memory (2GB), and we need to be able to read
+    // these.
+    for (i = 0; i < bi->SmapCount; i++) {
+        if (sm[i].addr.hi == 0) {
+            uint32 startKB = sm[i].addr.lo / 1024ul;
+            uint32 sizeKB  = sm[i].size.lo / 1024ul;
+            uint32 currKB  = startKB;
+            while (currKB < startKB + sizeKB) {
+                pde[currKB / 2048ul].lo |= Struct_Microsoft_Singularity_X86_PE_VALID;
+                currKB += 2048ul;
+            }
+        }
+    }
+
+    // Mark the cached images as read-only.
+    for (uint32 addr = bi->DumpAddr32.lo;
+         addr < bi->DumpAddr32.lo + bi->DumpSize32;
+         addr += 0x200000) {
+        pde[addr >> 21].lo &= ~Struct_Microsoft_Singularity_X86_PE_WRITEABLE;
+        printf("  %08lx..%08lx readonly\n", addr, addr + 0x1fffff);
+    }
+
+    // Map PCI memory based I/O ranges
+    for (i = 0; i < nPciMemoryRanges; i++) {
+        UINT32 start = lpPciRanges[i].base;
+        UINT32 end   = (start + lpPciRanges[i].length);
+        printf("  %08lx..%08lx write-through, cache disabled (PCI memory)\n",
+               start, end);
+        start >>= 21;
+        end   >>= 21;
+        do {
+            pde[start].lo |=
+                (Struct_Microsoft_Singularity_X86_PE_CACHEDISABLE |
+                 Struct_Microsoft_Singularity_X86_PE_WRITETHROUGH |
+                 Struct_Microsoft_Singularity_X86_PE_VALID);
+            start ++;
+        } while (start < end);
+    }
+
+    // Hack for I/O apics on NUMA box.  We should be extracting
+    // this from ACPI / MP Resources. (0xd0000000 >> 21)
+    pde[0xd000 >> 5].lo |=
+        (Struct_Microsoft_Singularity_X86_PE_CACHEDISABLE |
+         Struct_Microsoft_Singularity_X86_PE_WRITETHROUGH |
+         Struct_Microsoft_Singularity_X86_PE_VALID);
+
+    // The last 64MB is mapped with caching disabled to allow
+    // access to the APICs.
+    for (i = 2016; i < 2048; i++) {
+        pde[i].lo |=
+            (Struct_Microsoft_Singularity_X86_PE_CACHEDISABLE |
+             Struct_Microsoft_Singularity_X86_PE_WRITETHROUGH |
+             Struct_Microsoft_Singularity_X86_PE_VALID);
+    }
+    bi->Pdpt32.lo = pdptBase;
+#endif
+
+    //
+    // Set up the IDT and some function vectors
+    //
+    bi->Info32.lo = PointerToUint32(bi);
+    bi->Cpu0.Fs32 = pfsBase;
+    bi->Cpu0.Gs32 = pgsBase;
+    bi->Kill32.lo = PointerToUint32((LPVOID)StopPhase0);
+    bi->KillAction = 0;
+    bi->Undump.lo    = PointerToUint32((LPVOID)undump_dat);
+    bi->IdtEnter0.lo = PointerToUint32((LPVOID)IdtEnter0);
+    bi->IdtEnter1.lo = PointerToUint32((LPVOID)IdtEnter1);
+    bi->IdtEnterN.lo = PointerToUint32((LPVOID)IdtEnterN);
+    bi->IdtTarget.lo = PointerToUint32((LPVOID)&IdtTarget);
+    bi->MpEnter32.lo = PointerToUint32((LPVOID)MpEnter);
+
+    uint32 __far * pWarmReset = (uint32 __far *)_MK_FP(0x40, 0x67);
+    bi->BiosWarmResetVector = *pWarmReset;
+
+    IoSpaceWrite8(CMOS_SELECT, 0xf);
+    bi->BiosWarmResetCmos = IoSpaceRead8(CMOS_DATA);
+
+    printf("  Warm Reset CMOS   = %8x          (before)\n", bi->BiosWarmResetCmos);
+    printf("  Warm Reset Vector = %8lx %8lx (before)\n",
+           bi->BiosWarmResetVector,
+           (bi->BiosWarmResetVector >> 12) + (bi->BiosWarmResetVector & 0xffff));
+
+    *pWarmReset = (uint32)(LPVOID)MpEnter;
+    IoSpaceWrite8(CMOS_SELECT, 0xf);
+    IoSpaceWrite8(CMOS_DATA, 0xa);
+
+    IoSpaceWrite8(CMOS_SELECT, 0xf);
+    uint8 cmos = IoSpaceRead8(CMOS_DATA);
+
+    printf("  Warm Reset CMOS   = %8x          (pre-boot)\n", cmos);
+    printf("  Warm Reset Vector = %8lx %8lx (pre-boot)\n",
+           *pWarmReset,
+           (*pWarmReset >> 12) + (*pWarmReset & 0xffff));
+
+    //
+    // Save the heap pointer.
+    //
+    bi->Heap32.lo = ((uint32)npHeapTop) << 4;
+
+    //
+    // Move to next phase
+    //
+    printf("Calling 32-bit code.\n");
+    BootPhase2(bi);
+
+    return 0;
+}
+
+extern "C" void __cdecl StopPhase3()
+{
+    Struct_Microsoft_Singularity_BootInfo __far *bi = g_bi;
+
+    Cls();
+    BdInitDebugger(g_bi->DebugBasePort);
+    printf("\n");
+    Cls();
+    printf("Singularity Boot Loader: Kernel Terminated w/ 0x%08x\n", bi->KillAction);
+
+    uint32 __far * pWarmReset = (uint32 __far *)_MK_FP(0x40, 0x67);
+
+    *pWarmReset = bi->BiosWarmResetVector;
+    IoSpaceWrite8(CMOS_SELECT, 0xf);
+    IoSpaceWrite8(CMOS_DATA, bi->BiosWarmResetCmos);
+
+    IoSpaceWrite8(CMOS_SELECT, 0xf);
+    uint8 cmos = IoSpaceRead8(CMOS_DATA);
+
+    printf("  Warm Reset CMOS   = %8x          (restored)\n", cmos);
+    printf("  Warm Reset Vector = %8lx %8lx (restored)\n",
+        *pWarmReset,
+        (*pWarmReset >> 12) + (*pWarmReset & 0xffff));
+
+again:
+    switch (bi->KillAction) {
+        case Struct_Microsoft_Singularity_BootInfo_EXIT_AND_RESTART:
+            printf("Reset via 8042.\n");
+            Reset();
+            BootHalt();
+            break;
+        case Struct_Microsoft_Singularity_BootInfo_EXIT_AND_SHUTDOWN:
+            printf("Power-off via APM. (idt=%08lx..%08lx)\n",
+                bi->BiosIdtPtr.addr,
+                bi->BiosIdtPtr.addr + bi->BiosIdtPtr.limit);
+            ApmPowerOff();
+            BootHalt();
+            break;
+        case Struct_Microsoft_Singularity_BootInfo_EXIT_AND_WARMBOOT:
+            printf("Error: Warm boot requested, but wasn't handled by HAL.\n");
+            BootHalt();
+            break;
+        case Struct_Microsoft_Singularity_BootInfo_EXIT_AND_HALT:
+            printf("Halt requested.\n");
+            BootHalt();
+            break;
+        default:
+            printf("Unknown KillAction=%x\n", bi->KillAction);
+            if (g_CmdLine[0] != '\0') {
+                printf("Forcing to EXIT_AND_WARMBOOT\n");
+                bi->KillAction = Struct_Microsoft_Singularity_BootInfo_EXIT_AND_WARMBOOT;
+                goto again;
+            }
+            BootHalt();
+            break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// MP Specific Routines
+//
+extern "C" void MpBootPhase1()
+{
+    Struct_Microsoft_Singularity_MpBootInfo __far *p_mbi = g_mbi;
+
+    g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_Phase1Entry;
+    if (p_mbi->signature != Struct_Microsoft_Singularity_MpBootInfo_Signature) {
+        printf("Bad MP Signature");
+        g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_BadSignature;
+        BootHalt();
+    }
+
+    int cpuId = (int)p_mbi->TargetCpu;
+    if (cpuId >= Struct_Microsoft_Singularity_MpBootInfo_MAX_CPU) {
+        printf("Stopping processor (%d >= %d)\n",
+               cpuId,
+               Struct_Microsoft_Singularity_MpBootInfo_MAX_CPU);
+        g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_ConfigLimit;
+        BootHalt();
+    }
+
+    //
+    // Allocate pages for FS and GS data
+    //
+
+    // 2 Pages (1 RW, 1 RO) for processor context
+    LPVOID pfs = (LPVOID) allocpages(2);
+    if (pfs == 0) {
+        g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_AllocFailure;
+        BootHalt;
+    }
+
+    // 2 Pages (1 RW, 1 RO) for processor context
+    LPVOID pgs = (LPVOID) allocpages(2);
+    if (pgs == 0) {
+        g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_AllocFailure;
+        BootHalt();
+    }
+
+    //
+    // Copy CpuInfo of bootstrap processor and modify copy to suit
+    //
+    Struct_Microsoft_Singularity_CpuInfo __far* bsp = &g_bi->Cpu0;
+    Struct_Microsoft_Singularity_CpuInfo __far* cpu = bsp + cpuId;
+    memcopy(cpu, bsp, sizeof(Struct_Microsoft_Singularity_CpuInfo));
+
+    cpu->GdtPtr.addr = PointerToUint32(&cpu->GdtNull);
+    cpu->Fs32 = PointerToUint32(pfs);
+    cpu->GdtPF.base0_15  = (uint16)(cpu->Fs32);
+    cpu->GdtPF.base16_23 = (uint8)(cpu->Fs32 >> 16);
+    cpu->GdtPF.base24_31 = (uint8)(cpu->Fs32 >> 24);
+    cpu->Gs32 = PointerToUint32(pgs);
+    cpu->GdtPG.base0_15  = (uint16)cpu->Gs32;
+    cpu->GdtPG.base16_23 = (uint8)(cpu->Gs32 >> 16);
+    cpu->GdtPG.base24_31 = (uint8)(cpu->Gs32 >> 24);
+
+    cpu->KernelStackBegin = p_mbi->KernelStackBegin;
+    cpu->KernelStack      = p_mbi->KernelStack;
+    cpu->KernelStackLimit = p_mbi->KernelStackLimit;
+
+    cpu->ProcessorId = cpuId;
+
+    g_bi->MpCpuCount = cpuId;
+    g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_Phase2Entry;
+
+    MpBootPhase2(g_bi, cpu);
+}
diff --git a/base/boot/Singldr/singldr.h b/base/boot/Singldr/singldr.h
new file mode 100644
index 0000000..8b0ae7c
--- /dev/null
+++ b/base/boot/Singldr/singldr.h
@@ -0,0 +1,303 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  singldr.h - SINGLDR Related Information.
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#ifndef __SINGLDR_H__
+#define __SINGLDR_H__
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Type declarations
+
+typedef char CHAR;
+typedef char INT8;
+typedef short INT16;
+typedef long INT32;
+typedef unsigned char UINT8;
+typedef unsigned short UINT16;
+typedef unsigned long UINT32;
+typedef unsigned long ADDR32;
+typedef void __far * LPVOID;
+
+typedef INT16 (__far * FPENTRY)(INT16 api, LPVOID args);
+typedef int INT;
+typedef char INT8, __far *LPINT8;
+typedef short INT16, __far *LPINT16;
+typedef long INT32, __far *LPINT32;
+typedef long LARGEST;
+typedef long BOOL;
+
+typedef signed long LARGEST;
+typedef unsigned long ULARGEST;
+
+typedef unsigned int UINT;
+typedef unsigned char UINT8, *PUINT8, __far *LPUINT8;
+typedef unsigned short UINT16, __far *LPUINT16;
+typedef unsigned long UINT32, *PUINT32, __far *LPUINT32;
+typedef unsigned long ULARGEST;
+typedef void __far * LPVOID;
+typedef char CHAR, __far * LPCHAR;
+typedef const char __far * LPCSTR;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Macro constants
+
+#define NULL 0
+#define DEBUG_VESA_MODES 0
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Core types used by runtime system.
+
+typedef signed char         bool;
+
+typedef unsigned short      bartok_char;
+
+typedef signed char         int8;
+typedef signed short        int16;
+typedef signed long         int32;
+
+typedef struct
+{
+    unsigned long lo;
+    unsigned long hi;
+} int64;
+
+typedef unsigned char       uint8;
+typedef unsigned short      uint16;
+typedef unsigned long       uint32;
+
+typedef struct
+{
+    unsigned long lo;
+    unsigned long hi;
+} uint64;
+
+typedef float               float32;
+typedef double              float64;
+
+typedef long                intptr;
+typedef unsigned long       uintptr;
+
+typedef unsigned int uint;
+
+struct uintPtr
+{
+    uintptr value;
+};
+
+struct intPtr
+{
+    intptr value;
+};
+
+typedef struct uintPtr *UIntPtr;
+typedef struct intPtr *IntPtr;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Global Functions
+//
+LPVOID alloc(uint16 cbSize, uint16 cbPad);
+int printf(const char *pszFmt, ...);
+uint32 PointerToUint32(LPVOID vp);
+void memzero(LPVOID vp, uint32 cb);
+void strcpy(LPCHAR dst, LPCHAR src);
+void PutChar(char cOut);
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// File Type used by bootable devices
+
+typedef struct
+{
+    uint32  Size;
+    uint32  FirstBlock;
+    //char    Name[11];
+} FileData;
+typedef FileData __far *FilePtr;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  MACROS to break C "far" pointers into their segment and offset components
+
+#define _FP_SEG(fp) (* ((uint16 *)&(fp)+1) )
+#define _FP_OFF(fp) (* ((uint16 *)&(fp)) )
+#define _MK_FP(seg,offset)  ((LPVOID)(((uint32)(seg)<<16) | (uint32)(offset)))
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// more / misc defines
+
+#define ARRAYOF(a)  (sizeof(a)/sizeof(a[0]))
+#define OFFSETOF(s,m)   ((uint16)((uint8*)&((s *)0)->m - (uint8*)0))
+
+#if USE_STRUCT_FIXED_ARRAYS
+#define ELEMENT_PTR(array, index) &(array)[index]
+#else
+#define ELEMENT_PTR(array, index) &(array) + (index)
+#endif
+
+#define STATIC_ASSERT(condition)
+
+#define CMOS_SELECT     0x70
+#define CMOS_DATA       0x71
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// PNP / BIOS types
+
+#pragma pack(1)
+typedef struct _PNP_NODE {
+    uint16  Size;                                       // 0x00:
+    uint8   Node;                                       // 0x02:
+    uint8   ProductId[4];                               // 0x03:
+    uint8   DeviceType[3];                              // 0x07:
+    uint16  DeviceAttributes;                           // 0x0a:
+    // 0x0c:
+    // followed by AllocatedResourceBlock, PossibleResourceBlock
+    // and CompatibleDeviceId
+} PNP_NODE, far *LPPNP_NODE;
+
+typedef struct _PNP_ISACONFIG {
+    uint8   Revision;                                   // 0x00:
+    uint8   TotalCSNs;                                  // 0x01
+    uint16  IsaReadDataPort;                            // 0x02
+    uint16  Reserved;                                   // 0x04
+} PNP_ISACONFIG, far *LPPNP_ISACONFIG;
+
+typedef int16 (__far * PNP_FN)(int function, ...);
+
+typedef struct _PNP_ROOT {
+    uint8   Signature[4];                   // 0x00: $PnP (ascii)
+    uint8   Revision;                       // 0x04:
+    uint8   Length;                         // 0x05:
+    uint16  ControlField;                   // 0x06:
+    uint8   Checksum;                       // 0x08:
+    uint32  EventFlagAddress;               // 0x09: Physical address
+    PNP_FN  RealModeEntry;
+    uint16  ProtectedModeEntryOffset;       // 0x11:
+    uint32  ProtectedModeCodeBaseAddress;   // 0x13:
+    uint32  OemDeviceId;                    // 0x17:
+    uint16  RealModeDataSegment;            // 0x1b:
+    uint32  ProtectedModeDataAddress;       // 0x1d
+} PNP_ROOT, far *LPPNP_ROOT;
+
+typedef struct _SMBIOS_ROOT
+{
+    uint8   Signature[4];                        // _SM_ (ascii)
+    uint8   Checksum;
+    uint8   Length;
+    uint8   MajorVersion;
+    uint8   MinorVersion;
+    uint16  MaximumStructureSize;
+    uint8   EntryPointRevision;
+    uint8   Reserved[5];
+    uint8   Signature2[5];                      // _DMI_ (ascii)
+    uint8   IntermediateChecksum;
+    uint16  StructureTableLength;
+    uint32  StructureTableAddress;
+    uint16  NumberStructures;
+    uint8   Revision;
+} SMBIOS_ROOT, far *LPSMBIOS_ROOT;
+
+typedef struct _DMIBIOS_ROOT
+{
+    uint8   Signature2[5];                      // _DMI_ (ascii)
+    uint8   IntermediateChecksum;
+    uint16  StructureTableLength;
+    uint32  StructureTableAddress;
+    uint16  NumberStructures;
+    uint8   Revision;
+} DMIBIOS_ROOT, far *LPDMIBIOS_ROOT;
+
+#pragma pack()
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// HAL and Pentium special registers
+
+#pragma pack(4)
+#include "halclass.h"
+#pragma pack()
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Vesa
+
+#if DEBUG_VESA_MODES
+
+typedef struct _VESA_INFO
+{
+    uint8   Signature[4];
+    uint16  Version;
+    LPCHAR  Oem;
+    uint8   Capabilities[4];
+    LPuint16    Modes;
+    uint16  Memory;
+
+    // VBE 2.0+
+    uint16  OemVersion;
+    LPCHAR  OemVendor;
+    LPCHAR  OemProduct;
+    LPCHAR  OemRevision;
+} VESA_INFO, __far *LPVESA_INFO;
+
+typedef struct _VESA_MODE
+{
+    uint16  Attributes;
+    uint8   WindowA;
+    uint8   WindowB;
+    uint16  Granularity;
+    uint16  Size;
+    uint16  WindowASegment;
+    uint16  WindowBSegment;
+    uint8 __far * WindowFuncPtr;
+    uint16  BytesPerLine;
+    uint16  XRes;
+    uint16  YRes;
+    uint8   XCharSize;
+    uint8   YCharSize;
+    uint8   Planes;
+    uint8   BitsPerPixel;
+    uint8   Banks;
+    uint8   MemoryModel;
+    uint8   BankSize;
+    uint8   ImagePages;
+    uint8   Reserved;
+    uint8   RedMaskSize;
+    uint8   RedFieldPos;
+    uint8   GreenMaskSize;
+    uint8   GreenFieldPos;
+    uint8   BlueMaskSize;
+    uint8   BlueFieldPos;
+    uint8   ReservedMaskSize;
+    uint8   ReservedFieldPos;
+    uint8   DirectColorInfo;
+
+    // VBE 2.0
+    uint32  PhysBasePtr;
+    uint32  Reserved1;
+    uint16  Reserved2;
+
+    // VBE 3.0
+    uint16  LinearBytesPerLine;
+    uint8   BankImagePages;
+    uint16  LinearImagePages;
+    uint8   LinearRedMaskSize;
+    uint8   LinearRedFieldPos;
+    uint8   LinearGreenMaskSize;
+    uint8   LinearGreenFieldPos;
+    uint8   LinearBlueMaskSize;
+    uint8   LinearBlueFieldPos;
+    uint8   LinearReservedMaskSize;
+    uint8   LinearReservedFieldPos;
+    uint32  MaxPixelClock;
+} VESA_MODE, __far *LPVESA_MODE;
+#endif
+
+#endif
diff --git a/base/boot/Singldr/singldr0.asm b/base/boot/Singldr/singldr0.asm
new file mode 100644
index 0000000..5329146
--- /dev/null
+++ b/base/boot/Singldr/singldr0.asm
@@ -0,0 +1,1390 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  singldr0.asm - X86 Portion of Singularity Boot Loader
+;;
+;;  Copyright (c) Microsoft Corporation.  All rights reserved.
+;;
+;;  Notes:
+;;    This file has three main purposes.
+;;      1) Initialize context for the 16-bit C++ boot loader
+;;         (BootPhase0 -> BootPhase1).
+;;      2) Manage the transition from 16-bit real to 32-bit protected mode
+;;         (BootPhase2 -> BootPhase3 -> undump).
+;;      3) Manage the transition from 32-bit protected to 16-bit real mode
+;;         (StopPhase0 -> StopPhase1 -> StopPhase2 -> StopPhase3).
+;;
+;;    In addition, this file provides a few helper functions used by the
+;;    16-bit loader code in singldr.cpp.
+;;
+;;    Since there is only one .asm function (BiosDiskRead) specific to the
+;;    disk boot process, it is in here too
+;;
+;;    The three-function-in-one PModeTransfer routine is also located here
+;;    in order to ensure it links correctly, since it has mixed 16-bit and
+;;    32-bit portions
+;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+    .model tiny, c
+    .686p
+    .mmx
+    .xmm
+
+    .xlist
+    .list
+
+OPTION SCOPED
+
+DEBUG_BOOT EQU 0
+DEBUG_VESA_MODES EQU 0
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Bartok Types
+;;
+
+uint8 TYPEDEF BYTE
+uint16 TYPEDEF WORD
+uint32 TYPEDEF DWORD
+uint64 TYPEDEF QWORD
+
+int8 TYPEDEF BYTE
+int16 TYPEDEF WORD
+int32 TYPEDEF DWORD
+int64 TYPEDEF QWORD
+
+bool TYPEDEF BYTE
+bartok_char TYPEDEF WORD
+
+intptr TYPEDEF DWORD
+uintptr TYPEDEF DWORD
+
+uintPtr STRUCT 4
+        value  uintptr ?
+uintPtr ENDS
+
+intPtr STRUCT 4
+        value  intptr ?
+intPtr ENDS
+
+PTR_uintptr TYPEDEF PTR uintptr
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Other Types
+;;
+
+GDTDesc STRUCT
+        GDT_limit   dw      0
+        GDT_base1   dw      0
+        GDT_base2   db      0
+        GDT_access  db      0
+        GDT_limacc  db      0
+        GDT_base3   db      0
+GDTDesc ENDS
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+
+_TEXT32 segment para public use32 'CODE'    ; this segment contains all 32-bit
+include halclass.inc
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  Macros
+;;
+
+CONSOLE_WRITE macro loc,value
+    push    edx
+    mov     edx, loc
+    mov     ah, 01fh
+    mov     al, value
+    mov     [edx], ax
+    pop	    edx
+endm
+	
+
+LOAD_EAX_FLAT MACRO reg
+    xor     eax,eax
+    mov     ax,reg
+    shl     eax,4
+ENDM
+
+OPERAND_SIZE_OVERLOAD MACRO
+    uint8   066h
+ENDM
+
+MOV_EAX_CR4 MACRO
+    uint8   00fh
+    uint8   020h
+    uint8   0e0h
+ENDM
+
+MOV_CR4_EAX MACRO
+    uint8   00fh
+    uint8   022h
+    uint8   0e0h
+ENDM
+
+LEA_EAX_REALATIVE MACRO target
+    call    @pusheip
+@pusheip:
+    pop     eax
+    add     eax, target - @pusheip
+ENDM
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; 16-bit code segment
+;;
+
+_TEXT segment public use16 'CODE'    ; this segment contains all 16-bit
+
+EXTRN BootPhase1:NEAR
+EXTRN StopPhase3:NEAR
+EXTRN MpBootPhase1:NEAR
+    .data
+
+PUBLIC MpStartupLock
+MpStartupLock dw 1
+
+    .code
+
+    ORG     100h
+BootPhase0 PROC NEAR
+
+    ; if we are booting from PXE, the stack holds the return address and the
+    ; !PXE address, and es:bx is the PXENV+ address.  CS:IP=0000:7c00
+    ;
+    ; if we are booting from HD/CD, the stack holds a null return address, the
+    ; boot signature ("CD" or "HD"), and the boot drive.  CS:IP=5000:7c00
+
+    ; First, we will move the IP to 100h, and CS to X7b0, where x=0 or x=5
+    ; this lets us build this as a DOS .com file
+
+    mov     ax, cs
+    add     ax, 07b0h
+    push    ax
+    push    OFFSET begin
+    retf                        ; really returns to next statement.
+
+begin:
+
+    ; if we booted off of the Hard Disk or CD, we're now at 57b0:0100
+    ; relocate this segment to 07b0:1000
+
+    cmp     ax, 07b0h           ; ax holds cs
+    je      ConfigNetboot       ; if cs is already 07b0, this was a net boot
+
+    ; relocate from 57b0:0100 to 07b0:0100
+    mov     ax, 07c0h
+    mov     es, ax
+    xor     di, di              ; es:di points to 07c0:0000
+    mov     ax, cs
+    add     ax, 010h
+    mov     ds, ax
+    xor     si, si              ; ds:si points to 57c0:0000
+    mov     ecx, 04000h
+    rep     movsd               ; transfer 4000h DWORDS (64KB)
+
+    ; since we are here, this wasn't a PXE boot.  set the stack appropriately:
+    pop     eax                 ; pop the return address for a disk boot
+    pop     ebx                 ; pop the boot device signature
+    pop     edx                 ; pop the boot drive
+    push    edx                 ; on a disk boot, we set the PXE! address to diskid
+    push    eax                 ; put the return address back on the stack
+
+    pushw   07b0h
+    push    OFFSET relocated
+    retf                        ; jump to the 'relocated' block
+
+ConfigNetboot:
+    push    es                  ; ebx holds the PXENV+ address
+    push    bx
+    pop     ebx
+    xor     edx, edx            ; on a PXE boot, the bootdriveid=0
+
+relocated:
+    mov     ax, cs
+    mov     ds, ax              ; set FS=GS=DS=CS for TINY model.
+    mov     fs, ax
+    mov     gs, ax
+
+    pop     eax                 ; pop the return address.
+    pop     ecx                 ; pop the !PXE address.
+    push    ecx                 ; return !PXE address. (arg0)
+    push    eax                 ; push the return address. (ret)
+
+    push    ss                  ;
+    push    sp                  ;
+    pop     ebp                 ; get the stack pointer.
+
+    mov     ax, ds              ; move the stack to cs:fff0h
+    mov     ss, ax
+    mov     ax, 0fff0h
+    mov     sp, ax
+
+    push    ebp                 ; push the old stack pointer.
+    push    edx                 ; push the disk id (arg2)
+    push    ebx                 ; push the PXENV+ address (arg1)
+    push    ecx                 ; push the !PXE address (arg0)
+    call    EnableA20
+    call    BootPhase1
+
+    pop     ecx                 ; pop the !PXE address
+    pop     ecx                 ; pop the PXENV+ address
+    pop     sp                  ; pop the old stack pointer.
+    pop     ss
+
+    retf
+BootPhase0 ENDP
+
+; void IoSpaceWrite8(uint16 port, uint8 value);
+;   Called by 16-bit C++ code to access video registers.
+PUBLIC IoSpaceWrite8
+IoSpaceWrite8 PROC NEAR
+    push    bp
+    mov     bp, sp
+    mov     dx, [bp+4]          ; dx = address segment
+    mov     al, [bp+6]         ; eax = value
+    out     dx, al
+    pop     bp
+    ret
+IoSpaceWrite8 ENDP
+
+; void IoSpaceWrite32(uint16 port, uint32 value);
+;   Called by 16-bit C++ code to access PCI config space.
+PUBLIC IoSpaceWrite32
+IoSpaceWrite32 PROC NEAR
+    push    bp
+    mov     bp, sp
+    mov     dx, [bp+4]          ; dx = address segment
+    mov     eax, [bp+6]         ; eax = value
+    out     dx, eax
+    pop     bp
+    ret
+IoSpaceWrite32 ENDP
+
+; uint8 IoSpaceRead8(uint16 port);
+;   Called by 16-bit C++ code to access video registers.
+PUBLIC IoSpaceRead8
+IoSpaceRead8 PROC NEAR
+    push    bp
+    mov     bp, sp
+    mov     dx, [bp+4]          ; dx = address segment
+    in      al, dx
+    pop     bp
+    ret
+IoSpaceRead8 ENDP
+
+; uint32 IoSpaceRead32(uint16 port);
+;   Called by 16-bit C++ code to access PCI config space.
+PUBLIC IoSpaceRead32
+IoSpaceRead32 PROC NEAR
+    push    bp
+    mov     bp, sp
+    mov     dx, [bp+4]          ; dx = address segment
+    in      eax, dx
+    mov     edx, eax
+    shr     edx, 16
+    pop     bp
+    ret
+IoSpaceRead32 ENDP
+
+; uint16 BiosDiskRead(uint8 __far * addr, uint32 diskblock, uint16 blocks, uint16 driveid);
+;   Called by 16-bit C++ code to read from the disk (HD or CD) using extended int13h
+PUBLIC BiosDiskRead
+BiosDiskRead PROC NEAR
+    push    bp
+    mov     bp, sp
+    pushad
+
+    mov     dx, [bp+14]         ; dl = drive #
+    mov     eax, [bp+8]         ; eax = LBA #
+    mov     cx, [bp+12]         ; ecx = count (# of sectors)
+    mov     bx, [bp+6]          ; bx = address segment
+    mov     di, [bp+4]          ; di = address offset
+
+    pushd   00
+    push    eax                 ; push 64-bit sector address (top half always null)
+
+    push    bx
+    push    di                  ; push transfer address
+
+    push    cx                  ; # sectors
+    pushw   0010h               ; this request packet is 16 bytes
+
+    mov     ah,42h              ; extended read
+    mov     si,sp               ; set ds:si = address of params
+    int     13h                 ; perform the read
+
+    add     sp, 10h             ; clean the stack, discard the return code
+
+    popad
+    pop     bp
+    ret
+BiosDiskRead ENDP
+
+; uint16 BiosDiskReadCHS(uint8 __far * addr, uint32 diskblock, uint16 driveid, uint16 sectors, uint16 secpertrack, uint16 numheads)
+;   Called by 16-bit C++ code to read from a Usb disk using CHS-style int13h
+PUBLIC BiosDiskReadCHS
+BiosDiskReadCHS PROC NEAR
+    push    bp
+    mov     bp, sp
+    pushad
+    push    es
+
+    mov     eax, [bp+8]         ; eax = 32-bit absolute sector number
+
+    xor     edx,edx             ; clear edx before long divide
+    xor     ecx,ecx
+    mov     cx,[bp+16]          ; ecx = sectors per track
+    div     ecx                 ; eax = track, edx = sector within track (0-62)
+    inc     dl                  ; dl = sector within track (1-63)
+    mov     cl,dl               ; cl = sector within track
+    mov     edx,eax
+    shr     edx,16              ; dx:ax = track
+    xor     ebx, ebx
+    mov     bx, [bp+18]
+    div     bx                  ; ax = cylinder (0-1023), dx = head (0-255)
+    xchg    dl,dh               ; dh = head
+
+    mov     ch,al               ; ch = bits 0-7 of cylinder
+    shl     ah,6
+    or      cl,ah               ; bits 6-7 of cl = bits 8-9 of cylinder
+
+    mov     ax, [bp+12]
+    mov     dl, al              ; dl = int13 unit #
+
+    mov     bx, [bp+6]
+    mov     es, bx              ; es = address segment
+    mov     bx, [bp+4]          ; bx = address offset
+
+    mov     ax, [bp+14]         ; ax = number of sectors, let's hope it's less than 256!
+    mov     ah, 02h             ; read 1 sector
+
+    int 13h
+
+    pop     es
+    popad
+    pop     bp
+    ret
+BiosDiskReadCHS ENDP
+
+; void BootGetBiosInfo(Struct_Microsoft_Singularity_BootInfo __far * pInfo);
+;   Called by 16-bit C++ code to fill in portions of BootInfo.
+PUBLIC BootGetBiosInfo
+BootGetBiosInfo PROC NEAR
+    push    bp
+    mov     bp, sp
+    mov     es, [bp+6]
+    mov     si, [bp+4]  ; pInfo
+
+    push    di
+    push    cx
+    push    dx
+
+    mov     eax, SIZEOF Struct_Microsoft_Singularity_BootInfo
+    mov     es:[si].Struct_Microsoft_Singularity_BootInfo._RecSize, eax
+
+    ; Set Bios-related Information.
+    ;
+    xor     edx,edx
+    mov     ax,0b101h
+    stc
+    int     1ah
+    jc      skip_1A_B101
+    mov     es, [bp+6]
+    mov     si, [bp+4]  ; pInfo
+    and     eax, 0ffffh
+    mov     es:[si].Struct_Microsoft_Singularity_BootInfo._PciBiosAX, eax
+    and     ebx, 0ffffh
+    mov     es:[si].Struct_Microsoft_Singularity_BootInfo._PciBiosBX, ebx
+    and     ecx, 0ffh
+    mov     es:[si].Struct_Microsoft_Singularity_BootInfo._PciBiosCX, ecx
+    mov     es:[si].Struct_Microsoft_Singularity_BootInfo._PciBiosEDX, edx
+skip_1A_B101:
+
+    ; Save the IDT and PIC information.
+    xor     ax, ax
+    mov     dx, 0a0h
+    in      al, dx
+    mov     ah, al
+    mov     dx, 020h
+    in      al, dx
+
+    mov     es:[si].Struct_Microsoft_Singularity_BootInfo._BiosPicMask, ax
+    sidt    es:[si].Struct_Microsoft_Singularity_BootInfo._BiosIdtPtr._limit
+
+    pop     dx
+    pop     cx
+    pop     di
+
+    pop     bp
+    ret
+BootGetBiosInfo ENDP
+
+; void BootPhase2(Struct_Microsoft_Singularity_BootInfo *)
+;   Entered in 16-bit real mode.
+;   Transitions to 32-bit protected mode (to BootPhase3).
+;   Loads EDX = Struct_Microsoft_Singularity_BootInfo far *
+PUBLIC BootPhase2
+BootPhase2 PROC NEAR
+
+    push    bp
+    xor     ebp, ebp
+    mov     bp, sp
+    mov     ax, [bp+6]
+    mov     bp, [bp+4]  ; pBootInfo
+    mov     ss, ax
+
+    ; disable interrupts until kernel turns them back on.
+    cli
+
+    ; prepare for jump to 32-bit protected mode.
+    ;   edx = physical address of Struct_Microsoft_Singularity_BootInfo.
+    ;
+    mov     edx, DWORD PTR [bp].Struct_Microsoft_Singularity_BootInfo._Info32
+
+    ; set segments before switch
+    lgdt    FWORD PTR [bp].Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPtr._limit
+
+    ; Turn prot mode on, flush prefetch
+    mov     eax, cr0
+    or      eax, Struct_Microsoft_Singularity_X86_CR0_PE + Struct_Microsoft_Singularity_X86_CR0_NE
+    mov     cr0, eax
+
+    jmp cont
+cont:
+
+    ; Load protected stack segment registers.
+    mov     ax,Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtRS - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     ss,ax
+    mov     esp,ebp
+
+    ; push the 16:32 address onto the stack, then "return" to it.
+    push    0
+    push    Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPC - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     eax, 07b00h + OFFSET BootPhase3
+    push    eax
+    OPERAND_SIZE_OVERLOAD
+    retf
+
+BootPhase2 ENDP
+
+; StopPhase1
+;   Entered in 16-bit protected mode.
+;   Transitions to 16-bit real mode (StopPhase2).
+;   Passes through BootInfo __far * in ebx.
+;
+StopPhase1 PROC NEAR
+    ; Turn off protected mode.
+    mov     eax, cr0
+    and     eax, NOT (Struct_Microsoft_Singularity_X86_CR0_PE + Struct_Microsoft_Singularity_X86_CR0_NE)
+    mov     cr0, eax
+
+    db      0EAh                        ; JMP FAR PTR
+    dw      offset StopPhase2           ; 07b0:StopPhase2
+    dw      07b0h
+StopPhase1 ENDP
+
+; StopPhase2
+;   Entered in 16-bit real mode.  Shuts the machine down.
+;   Assumes BootInfo __far * is in ebx.
+;
+PUBLIC StopPhase2
+StopPhase2 PROC NEAR
+    mov     ax, 07b0h           ; move the stack to 07b0:fff0h (17AF0)
+    mov     ss, ax
+    mov     ds, ax              ; set DS=CS for TINY model.
+    mov     es, ax              ; set ES=CS for TINY model.
+    mov     fs, ax              ; set FS=CS for TINY model.
+    mov     gs, ax              ; set GS=CS for TINY model.
+    mov     ax, 0fff0h
+    mov     sp, ax
+
+    ; Set ES:SI = BootInfo __far *.
+    mov     si, bx
+    shr     ebx, 16
+    mov     es, bx
+
+    ; Restore the PIC and BIOS IDT.
+    mov     ax, es:[si].Struct_Microsoft_Singularity_BootInfo._BiosPicMask
+    mov     dx, 0a0h
+    mov     ah, al
+    out     dx, al
+    mov     ax, es:[si].Struct_Microsoft_Singularity_BootInfo._BiosPicMask
+    mov     dx, 020h
+    out     dx, al
+
+    lidt    FWORD PTR es:[si].Struct_Microsoft_Singularity_BootInfo._BiosIdtPtr._limit
+
+    call    StopPhase3
+
+again:
+    jmp again
+StopPhase2 ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; empty_8042 -- wait for 8042 input buffer to drain
+;      al=0, z=0   => 8042 input buffer empty
+; Uses:
+;      ax, flags
+;
+
+_8042_STATUS    EQU     64h             ; 8042 com port
+_8042_DATA      EQU     60h             ; 8042 data port
+_8042_BUF_FULL  EQU     2               ; 8042 busy bit
+
+empty_8042 PROC NEAR
+    sub     cx,cx                   ; cx = 0, timeout loop counter
+empty:
+    in      al,_8042_STATUS         ; read 8042 status port
+    jmp     $+2
+    jmp     $+2
+    jmp     $+2
+    jmp     $+2
+    and     al,_8042_BUF_FULL       ; test buffer full bit
+    loopnz  empty
+    ret
+empty_8042 ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;EnableA20:
+;    Enables the A20 line for any machine.  If the MachineType global variable
+;    is set to MCA, then it will call the EnableMcaA20 routine.  If not, it
+;    will execute the ISA code for enabling the A20 line.
+;
+EnableA20 PROC NEAR
+    stc
+    mov     ax, 2401h
+    int     15h                 ; Call BIOS Enable A20
+    jnc     exit
+
+    mov     ah,0dfh             ; (AH) = Code for enable
+
+    ; Enable or disable the A20 line (disable=dd, enable=df)
+
+    call    empty_8042          ; ensure 8042 input buffer empty
+    jnz     exit                ; 8042 error return
+
+    mov     al,0d1h             ; 8042 cmd to write output port
+    out     _8042_STATUS,al     ; send cmd to 8042
+    call    empty_8042          ; wait for 8042 to accept cmd
+    jnz     exit                ; 8042 error return
+
+    mov     al,ah               ; 8042 port data
+    out     _8042_DATA,al       ; output port data to 8042
+    call    empty_8042
+
+    ; We must wait for the a20 line to settle down, which (on an AT)
+    ; may not happen until up to 20 usec after the 8042 has accepted
+    ; the command.  We make use of the fact that the 8042 will not
+    ; accept another command until it is finished with the last one.
+    ; The 0FFh command does a NULL 'Pulse Output Port'.  Total execution
+    ; time is on the order of 30 usec, easily satisfying the IBM 8042
+    ; settling requirement.
+    ;
+    mov     al,0FFh             ; Pulse Output Port (pulse no lines)
+    out     _8042_STATUS,al     ; send cmd to 8042
+    call    empty_8042          ; wait for 8042 to accept cmd
+exit:
+    ret
+EnableA20 ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; void Reset()
+;
+_CMOS_CTRL      EQU     70h             ; CMOS ctrl port
+_CMOS_DATA      EQU     71h             ; CMOS data port
+
+PUBLIC Reset
+Reset PROC NEAR
+    mov     al, 0bh             ; Set up for control reg B
+    out     _CMOS_CTRL, al
+    call    empty_8042          ; stall
+    in      al, _CMOS_DATA
+    and     al, 0bfh            ; Clear periodic interrupt enable.
+    out     _CMOS_DATA, al
+    call    empty_8042          ; stall
+
+    mov     al, 0ah             ; Set up for control reg A
+    out     _CMOS_CTRL, al
+    call    empty_8042          ; stall
+    in      al, _CMOS_DATA
+    and     al, 0f0h            ; clear rate setting
+    or      al, 006h
+    out     _CMOS_DATA, al
+
+    mov     al, 015h            ; Set a "neutral" cmos address.
+    out     _CMOS_CTRL, al
+
+    call    empty_8042          ; ensure 8042 input buffer empty
+    mov     al,0feh             ; 8042 cmd to write output port
+    out     _8042_STATUS,al     ; send cmd to 8042
+    ret
+Reset ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; int GetSystemMap(SMAP_INFO __far *pDesc, uint32 __far *pNext)
+;
+PUBLIC BootGetSMAP
+BootGetSMAP PROC NEAR
+    push    bp
+    mov     bp, sp
+
+    push    es
+    push    esi
+    push    edi
+    push    ecx
+    push    edx
+    push    ebx
+
+    mov     es, [bp+10]
+    mov     di, [bp+8]  ; pNext
+    mov     ebx, es:[di]
+
+    mov     es, [bp+6]
+    mov     di, [bp+4]  ; pDesc
+
+    mov     eax, 0e820h
+    mov     ecx, 20
+    mov     edx, 534D4150h                              ; 'SMAP'
+    int     15h
+
+    mov     es, [bp+10]
+    mov     di, [bp+8]  ; pNext
+    mov     es:[di], ebx
+
+    pop     ebx
+    pop     edx
+    pop     ecx
+    pop     edi
+    pop     esi
+    pop     es
+
+    pop     bp
+    ret
+BootGetSMAP ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; int BootCallVesa(uint16 ax, uint16 bx, uint16 cx, uint8 __far *pBuffer)
+;       ax = [bp+4]
+;       bx = [bp+6]
+;       cx = [bp+8]
+;       es:di = [bp+12/10]
+;
+if DEBUG_VESA_MODES
+PUBLIC BootCallVesa
+BootCallVesa PROC NEAR
+    push    bp
+    mov     bp, sp
+
+    push    es
+    push    esi
+    push    edi
+    push    ecx
+    push    edx
+    push    ebx
+
+    mov     ax, [bp+4]
+    mov     bx, [bp+6]
+    mov     cx, [bp+8]
+    mov     di, [bp+10]  ; pNext
+    mov     es, [bp+12]
+
+    int     10h
+
+    pop     ebx
+    pop     edx
+    pop     ecx
+    pop     edi
+    pop     esi
+    pop     es
+
+    pop     bp
+    ret
+BootCallVesa ENDP
+endif
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; void BootHalt(void)
+;
+PUBLIC BootHalt
+BootHalt PROC NEAR
+    hlt
+again:  jmp again
+    ret
+BootHalt ENDP
+
+; void PModeTransfer(uint32 StartAddress, uint32 DestinationAddress, uint32 bytes);
+;   Entered in 16-bit real mode.
+;   Transitions to 32-bit protected mode and jumps to CopySector
+;   This is one of 3 functions that together comprise a single function call that moves from real to protected and back
+;
+; It appears that this can be done through the use of int15 AH=87h instead
+;   refer to http://www.ctyme.com/intr/rb-1527.htm for more information
+;
+
+PUBLIC PModeTransfer
+PModeTransfer PROC NEAR
+    cli                         ; shut off interrupts
+
+    push    bp
+    mov     bp, sp
+    pushad
+    push    ds
+    push    es
+    push    fs
+    push    gs
+
+    mov     ecx, [bp+12]        ; # bytes to copy
+    mov     edx, [bp+8]         ; destination address
+    mov     ebx, [bp+4]         ; origin address
+
+    push    dword ptr 0
+    popfd                       ; clear flags
+
+    xor     ax,ax               ; set the segments to null
+    mov     gs,ax
+    mov     es,ax
+    mov     fs,ax
+    mov     ss,ax
+
+    lgdt    FWORD PTR [gdtptr1] ; load the GDT register
+
+    xor     ax, ax
+    mov     ds, ax              ; set ds to null
+
+    mov     eax, cr0            ; turn on protected mode
+    or      al, Struct_Microsoft_Singularity_X86_CR0_PE
+    mov     cr0, eax
+
+    ; emit a 32-bit address intersegment jump
+    db      66h
+    db      0eah
+    dd      offset _TEXT32:CopySector + 07b00h  ; this is the 32-bit address of CopySector
+    dw      offset codeSeg - offset nullSeg     ; protected mode code segment = 08h
+PModeTransfer ENDP
+
+; this is the GDT we use for the PModeTransfer function
+nullSeg     GDTDesc     <0, 0, 0, 0, 0, 0>
+codeSeg     GDTDesc     <0FFFFh, 0h, 0h, 9ah, 0cfh, 0>              ; flat 4GB code segment
+dataSeg     GDTDesc     <0FFFFh, 0h, 0h, 92h, 0cfh, 0>              ; flat 4GB data segment
+codeSegR    GDTDesc     <0FFFFh, 07b00h, 000h, 09Ah, 000h, 000h>    ; real mode code segment
+dataSegR    GDTDesc     <0FFFFh, 07b00h, 000h, 092h, 000h, 000h>    ; real mode data segment
+gdtptr1     dw          offset gdtptr1 - offset nullSeg
+gdtptr2     dd          offset nullSeg + 7b00h
+
+; CopyReturn
+; This is the 3rd piece of the real-protected-real jump (the 2nd piece is in the 32bit code seg)
+CopyReturn PROC NEAR
+
+    ; Turn off protected mode.
+    mov     eax, cr0
+    and     eax, NOT Struct_Microsoft_Singularity_X86_CR0_PE
+    mov     cr0, eax
+
+    db      0EAh                ; JMP FAR PTR to the next instruction
+    dw      offset RealMode
+    dw      07b0h
+
+RealMode:
+    ; reset all segment registers:
+    mov     ax, 07b0h
+    mov     ss, ax
+    pop     gs
+    pop     fs
+    pop     es
+    pop     ds
+
+    sti                         ; reset interrupts and return to calling procedure
+    popad
+    pop     bp
+    ret
+CopyReturn ENDP
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; void MpEnter(void)
+;
+; This function must be aligned on a 4KB boundary to be usable by IPI STARTUP.
+; It should be the last 16-bit assembly function to avoid wasting space.
+; NB: the entry point is 7c00 - 100 + ORG.
+;
+    ORG     500h        ; Base at 08000h.  Must be 4KB aligned for IPI START.
+PUBLIC MpEnter
+MpEnter PROC NEAR
+    cli
+    mov     ax, 07b0h   ; Select data segment
+    mov     ds, ax
+
+spinlock:
+    cmp     MpStartupLock, 0
+    je      get_lock
+    pause
+    jmp     spinlock
+
+get_lock:
+    mov     ax, 1
+    xchg    ax, MpStartupLock
+    cmp     ax, 0
+    jne     spinlock
+
+    ; Switch to tiny mode with same descriptors as uniprocessor and reuse
+    ; real-mode stack.
+    mov     ax, 07b0h
+    mov     ds, ax              ; set GS=FS=ES=DS=CS for TINY model.
+    mov     es, ax
+    mov     fs, ax
+    mov     gs, ax
+    mov     ss, ax
+    mov     sp, 0fff0h
+    push    ax
+    push    OFFSET init_cpu
+    retf
+
+init_cpu:
+    call    MpBootPhase1        ;  Point of no return
+
+MpEnter ENDP
+
+; void MpBootPhase2(Struct_Microsoft_Singularity_BootInfo __far *, Struct_Microsoft_Singularity_CpuInfo*)
+; Entered in 16-bit real-mode and transitions to 32-bit Protected mode.
+PUBLIC MpBootPhase2
+MpBootPhase2 PROC NEAR
+    push    bp
+    xor     ebp, ebp
+    mov     bp, sp
+    mov     bx, [bp + 8]                            ; CpuInfo
+    mov     ax, [bp + 6]                            ; segment(BootInfo)
+    mov     bp, [bp + 4]                            ; bp + 4 = BootInfo
+    mov     ss, ax
+    mov     ds, ax
+
+    ; disable interrupts until kernel turns them back on.
+    cli
+
+    ; prepare for jump to 32-bit protected mode.
+    ;   edx = physical address of Struct_Microsoft_Singularity_BootInfo.
+    ;
+    mov     edx, DWORD PTR [bp].Struct_Microsoft_Singularity_BootInfo._Info32
+
+    ; prepare segments
+    lgdt    FWORD PTR [bx].Struct_Microsoft_Singularity_CpuInfo._GdtPtr._limit
+
+    ; Turn protected mode on and jump to flush prefetch
+    mov     eax, cr0
+    or      eax, Struct_Microsoft_Singularity_X86_CR0_PE + Struct_Microsoft_Singularity_X86_CR0_NE
+    mov     cr0, eax
+    jmp cont
+cont:
+    ; Load protected stack segment registers.
+    mov     ax,Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtRS - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     ss,ax
+    mov     esp,ebp
+
+    ; push the 16:32 address onto the stack, then "return" to it.
+    push    0
+    push    Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPC - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     eax, 07b00h + OFFSET MpBootPhase3
+    push    eax
+    OPERAND_SIZE_OVERLOAD
+    retf
+MpBootPhase2 ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; 32-bit code segment
+;
+
+.686p
+_TEXT32 segment para public use32 'CODE'    ; this segment contains all 32-bit
+assume cs:_TEXT32, ds:_TEXT32
+
+; BootPhase3:
+;   Entered in 32-bit protected mode with paging disabled.
+;   Configures the segment registers and stack.  Does not turn on paging.
+;   Transitions to the 32-bit loader (undump.cpp)
+PUBLIC BootPhase3
+BootPhase3 PROC NEAR
+    ;   edx = physical address of Struct_Microsoft_Singularity_BootInfo structure.
+
+    ; load the 32-bit segment selectors.
+    mov     bx, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPD - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     ds, bx
+    mov     es, bx
+    mov     ss, bx
+    mov     bx, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPF - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     fs, bx
+    mov     bx, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPG - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     gs, bx
+
+    ; set the initial stack.
+    mov     esp, Struct_Microsoft_Singularity_BootInfo_REAL_STACK
+    mov     ebp, Struct_Microsoft_Singularity_BootInfo_REAL_PBOOTINFO
+    mov     [ebp], edx
+    mov     ebp, esp
+
+    ; copy the undumper into place.
+    mov     esi, DWORD PTR [edx].Struct_Microsoft_Singularity_BootInfo._Undump
+    mov     edi, undump_dst
+    mov     ecx, undump_siz
+    call    memcopy
+
+    ; Select the stack
+    mov     esp, Struct_Microsoft_Singularity_BootInfo_REAL_STACK
+
+    ; Enable super pages. note that MASM doesn't support the opcode
+    ; for these instructions. so we are going to emit them manually
+
+    MOV_EAX_CR4
+    or      eax, (Struct_Microsoft_Singularity_X86_CR4_PAE + Struct_Microsoft_Singularity_X86_CR4_PSE + Struct_Microsoft_Singularity_X86_CR4_PCE + Struct_Microsoft_Singularity_X86_CR4_OSFXSR)
+    MOV_CR4_EAX
+
+;;; ifdef DOUBLE_FAULT_HANDLER
+    ; Set the PDBR
+    mov     eax, DWORD PTR [edx].Struct_Microsoft_Singularity_BootInfo._Pdpt32
+    mov     cr3, eax
+
+    ; Turn on paging.
+    mov     eax, cr0
+    or      eax, Struct_Microsoft_Singularity_X86_CR0_PG + Struct_Microsoft_Singularity_X86_CR0_WP
+    mov     cr0, eax
+
+    jmp     @reload_tlb
+    ALIGN 010h
+@reload_tlb:
+;;; endif
+
+    ; Set the TSS selector
+    mov     ax, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtTSS - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    ltr     ax
+
+    ; Set the IO privilege level to 3, so that ring-3 apps can disable
+    ; interrupts.  (TODO: eliminate CLI from ring-3 apps.)
+    pushfd
+    pop     eax
+    or      eax, Struct_Microsoft_Singularity_X86_EFlags_IOPL
+    push    eax
+    popfd
+
+    ; Set up the initial stack.
+    mov     esp, Struct_Microsoft_Singularity_BootInfo_REAL_STACK
+    xor     ecx, ecx
+    push    ecx
+    push    ecx
+    push    ecx
+    push    ecx
+    push    ecx                                         ; cpu = 0 (bsp)
+    push    edx                                         ; bootinfo
+
+    mov     eax, undump_ent
+    call    eax
+
+BootPhase3 ENDP
+
+; MpBootPhase3:
+;   Entered in 32-bit protected mode with paging disabled.
+;   Configures the segment registers and stack.  Does not turn on paging.
+;   On entry edx contains the physical address of the BootInfo structure.
+PUBLIC MpBootPhase3
+MpBootPhase3 PROC NEAR
+    ; load the 32-bit segment selectors.
+    mov     bx, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPD - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     ds, bx
+    mov     es, bx
+    mov     ss, bx
+    mov     bx, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPF - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     fs, bx
+    mov     bx, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtPG - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     gs, bx
+
+    ; locate pre-allocated kernel stack
+    imul    eax, [edx].Struct_Microsoft_Singularity_BootInfo._MpCpuCount, SIZEOF Struct_Microsoft_Singularity_CpuInfo
+    add     eax, Struct_Microsoft_Singularity_BootInfo._Cpu0
+    mov     eax, DWORD PTR [edx + eax].Struct_Microsoft_Singularity_CpuInfo._KernelStack
+
+    ; switch to kernel stack
+    mov     esp, eax
+    mov     ebp, eax
+
+    ; Save cpu number as other starting CPU's will bump value
+    mov     ecx, [edx].Struct_Microsoft_Singularity_BootInfo._MpCpuCount
+
+    mov     [edx].Struct_Microsoft_Singularity_BootInfo._MpStatus32, Struct_Microsoft_Singularity_MpBootStatus_Phase3Entry
+
+    ; Enable super pages. note that MASM doesn't support the opcode
+    ; for these instructions. so we are going to emit them manually
+    MOV_EAX_CR4
+    or      eax, (Struct_Microsoft_Singularity_X86_CR4_PAE + Struct_Microsoft_Singularity_X86_CR4_PSE + Struct_Microsoft_Singularity_X86_CR4_PCE + Struct_Microsoft_Singularity_X86_CR4_OSFXSR)
+    MOV_CR4_EAX
+
+    mov     eax, DWORD PTR [edx].Struct_Microsoft_Singularity_BootInfo._Pdpt32
+    mov     cr3, eax
+
+    ; Turn on paging.
+    mov     eax, cr0
+    or      eax, Struct_Microsoft_Singularity_X86_CR0_PG + Struct_Microsoft_Singularity_X86_CR0_WP
+    mov     cr0, eax
+
+    jmp     @reload_tlb_mp
+    ALIGN 010h
+@reload_tlb_mp:
+
+    ;  stack already has cpu number on it
+    push    ecx                                   ; cpu number
+    push    edx                                   ; bootinfo
+    mov     eax, undump_ent
+    call    eax
+
+deadloop:
+    cli
+    hlt
+    jmp deadloop
+
+MpBootPhase3 ENDP
+
+; StopPhase0
+;   Entered in 32-bit protected mode with paging enabled..
+;   Turns off paging.
+;   Transitions to the 16-bit protected mode (StopPhase1)
+;   Loads BootInfo __far * into ebx.
+PUBLIC StopPhase0
+StopPhase0 PROC NEAR
+    ; no intrs for a while
+    ; Configures EBX = Struct_Microsoft_Singularity_BootInfo
+    cli
+
+    mov     esp, Struct_Microsoft_Singularity_BootInfo_REAL_STACK
+    mov     ebp, Struct_Microsoft_Singularity_BootInfo_REAL_PBOOTINFO
+    mov     ebx, [ebp]
+
+ifdef DEBUG_BOOT
+    mov     edx, 0b8000h
+    mov     ah, 01fh
+    mov     al, '['
+    mov     [edx], ax
+
+    mov     edx, 0b8002h
+    mov     ah, 01fh
+    mov     al, '1'
+    mov     [edx], ax
+endif
+
+    ; Set the IO privilege level to 0.
+    pushfd
+    pop     eax
+    and     eax, NOT Struct_Microsoft_Singularity_X86_EFlags_IOPL
+    push    eax
+    popfd
+
+    ; Turn off paging.
+    mov     eax, cr0
+    and     eax, NOT (Struct_Microsoft_Singularity_X86_CR0_PG + Struct_Microsoft_Singularity_X86_CR0_WP)
+    mov     cr0, eax
+
+    ; Flush and reset the TLB.
+    mov     eax,0
+    mov     cr3,eax
+
+    jmp     reload_tlb
+    ALIGN 010h
+reload_tlb:
+
+    ; restore the segments to the 16-bit defaults from the Gdt
+    mov     ebx, [ebx].Struct_Microsoft_Singularity_BootInfo._Info16
+    mov     ax, Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtRS - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+    mov     ds, ax
+    mov     es, ax
+    mov     fs, ax
+    mov     gs, ax
+    mov     ss, ax
+
+    db      0EAh                        ; JMP FAR PTR
+    dd      offset _TEXT:StopPhase1     ; RC:StopPhase1
+    dw      Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtRC - Struct_Microsoft_Singularity_BootInfo._Cpu0._GdtNull
+
+again:
+    jmp again
+
+StopPhase0 ENDP
+
+; Copy a memory region.
+;   [in] ds:si = pointer to source buffer.
+;   [in] es:di = pointer to destination buffer.
+;   [in] ecx = number of bytes to copy
+;
+memcopy PROC NEAR
+    jecxz   done
+    cld
+    add     ecx,3               ; Pad to DWORD
+    shr     ecx,2               ; Shift ECX for count of dwords
+    rep     movsd               ; Copy the data.
+done:
+    ret
+memcopy ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
+;;; The IDT_ENTER building macros insure that each IDT target has
+;;; an offset of form _IdtEnter + 0x10 * interrupt_number.
+;;;
+public IdtTarget
+public IdtEnter0
+public IdtEnter1
+public IdtEnterN
+
+IDT_TARGET_ARGS STRUCT 1
+        _ret            uint32          ?
+        _edi            uint32          ?
+        _esi            uint32          ?
+        _ebp            uint32          ?
+        _esp            uint32          ?
+        _ebx            uint32          ?
+        _edx            uint32          ?
+        _ecx            uint32          ?
+        _eax            uint32          ?
+        _num            uint32          ?
+        _err            uint32          ?
+        _eip            uint32          ?
+        _cs0            uint32          ?
+        _efl            uint32          ?
+IDT_TARGET_ARGS ENDS
+
+IDT_ENTER_CLEAN MACRO num
+        push    0 ; No error
+        push    num
+        jmp     _IdtEnterBody
+        align   16
+ENDM
+
+IDT_ENTER_ERR   MACRO num
+        push    num
+        jmp     _IdtEnterBody
+        align   16
+ENDM
+
+        align 16
+IdtEnter PROC NEAR
+IdtEnter0 LABEL NEAR
+        IDT_ENTER_CLEAN       000h                            ; #DE Divide-by-Zero
+IdtEnter1::
+        IDT_ENTER_CLEAN       001h                            ; #DB Debug Exception
+        IDT_ENTER_CLEAN       002h                            ; NMI Non-Maskable-Interrupt
+        IDT_ENTER_CLEAN       003h                            ; #BP Breakpoint
+        IDT_ENTER_CLEAN       004h                            ; #OF OVerflow
+        IDT_ENTER_CLEAN       005h                            ; #BR Bound-Range
+        IDT_ENTER_CLEAN       006h                            ; #UD Invalid Opcode
+        IDT_ENTER_CLEAN       007h                            ; #NM Device Not Available
+        IDT_ENTER_ERR         008h                            ; #DF Double Fault
+        IDT_ENTER_CLEAN       009h                            ; Unused (was x87 segment except)
+        IDT_ENTER_ERR         00ah                            ; #TS Invalid TSS
+        IDT_ENTER_ERR         00bh                            ; #NP Sgement Not Present
+        IDT_ENTER_ERR         00ch                            ; #SS Stack Exception
+        IDT_ENTER_ERR         00dh                            ; #GP General Protection
+        IDT_ENTER_ERR         00eh                            ; #PF Page Fault
+        IDT_ENTER_CLEAN       00fh                            ; Reserved
+        IDT_ENTER_CLEAN       010h                            ; #MF x87 Math Error
+        IDT_ENTER_ERR         011h                            ; #AC Alignment Check
+        IDT_ENTER_CLEAN       012h                            ; #MC Machine Check
+        IDT_ENTER_CLEAN       013h                            ; #XF SIMD Exception
+
+        _num = 014h                                     ; 014h to 020h
+        WHILE _num LE 020h
+                IDT_ENTER_CLEAN       _num
+                _num = _num + 1
+        ENDM
+IdtEnterN::
+
+_IdtEnterBody::
+        pushad
+        mov eax, cr2
+        push eax
+
+        LEA_EAX_REALATIVE IdtTarget
+        mov eax, [eax]
+        call eax
+again:  jmp again
+
+        align 4
+IdtTarget::
+        dd 0
+
+IdtEnter endp
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+if 1
+; Print a DWORD to the screen
+;   [in] ebx = address of screen
+;   [in] eax = dword to print
+;   [in] ecx = trashed for temporary
+;
+printdw PROC NEAR
+    mov     ecx, eax
+    shr     ecx, 28
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print28
+    add     ecx, 7h
+print28:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 24
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print24
+    add     ecx, 7h
+print24:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 20
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print20
+    add     ecx, 7h
+print20:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 16
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print16
+    add     ecx, 7h
+print16:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 12
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print12
+    add     ecx, 7h
+print12:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 08
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print08
+    add     ecx, 7h
+print08:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 04
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print04
+    add     ecx, 7h
+print04:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, eax
+    shr     ecx, 00
+    and     ecx, 0fh
+    add     ecx, 00f30h
+    cmp     ecx, 00f3ah
+    jl      print00
+    add     ecx, 7h
+print00:
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    mov     ecx, 00f20h
+    mov     [ebx+0], ecx
+    add     ebx, 2
+    mov     [ebx+0], ecx
+    add     ebx, 2
+
+    ret
+printdw ENDP
+endif
+
+
+; CopySector:
+;   Entered in 32-bit protected mode with paging disabled.
+;   this routine moves back into 16-bit code by going to CopyReturn
+;   on the way, we'll have it move ecx bytes from [ebx] to [edx]
+CopySector PROC NEAR
+
+    ; load the 32-bit segment selectors.
+    mov     ax, dataSeg - nullSeg
+    mov     ds, ax
+    mov     es, ax
+    mov     fs, ax
+    mov     gs, ax
+    mov     ss, ax
+
+    jecxz   copydone
+
+    cld
+    add     ecx,3               ; Pad ecx to DWORD
+    shr     ecx,2               ; Shift ecx for count of dwords
+
+    mov     esi, ebx
+    mov     edi, edx
+    rep     movsd
+
+copydone:
+    ; set the segment registers back to real mode selectors
+    mov     ax, dataSegR - nullSeg
+    mov     ds, ax
+    mov     es, ax
+    mov     fs, ax
+    mov     gs, ax
+    mov     ss, ax
+
+    ; now return to 16-bit code...
+    db      0EAh                        ; emit a JMP FAR PTR
+    dd      offset _TEXT:CopyReturn
+    dw      codeSegR - nullSeg
+
+CopySector ENDP
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; 32-bit Code Generated by C Compiler
+;
+; Contains:
+;   undump_ent  EQU     001112d5h
+;   undump_dst  EQU     00111000h
+;   undump_siz  EQU     00000480h
+;   undump_dat  uint8   000h,080h,00bh,000h,030h,031h,032h,033h,...
+;
+PUBLIC undump_dat
+include undump.asb
+
+_TEXT32 ends
+
+end BootPhase0
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; End of File.
diff --git a/base/boot/Singldr/uldiv.asm b/base/boot/Singldr/uldiv.asm
new file mode 100644
index 0000000..5e9c20f
--- /dev/null
+++ b/base/boot/Singldr/uldiv.asm
@@ -0,0 +1,166 @@
+    page    ,132
+    title   uldiv - unsigned long divide routine
+;***
+;uldiv.asm - unsigned long divide routine
+;
+;   Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;Purpose:
+;   defines the unsigned long divide routine
+;   the following routines are created:
+;       __aFuldiv   (large, medium models)
+;       __aNuldiv   (small, compact models)
+;
+;*******************************************************************************
+
+.xlist
+include ulhelp.inc
+.list
+
+sBegin  code
+    assumes cs,code
+    assumes ds,data
+
+page
+;***
+;uldiv - unsigned long divide
+;
+;Purpose:
+;   Does a unsigned long divide of the arguments.  Arguments are
+;   not changed.
+;
+;Entry:
+;   Arguments are passed on the stack:
+;       1st pushed: divisor (DWORD)
+;       2nd pushed: dividend (DWORD)
+;
+;Exit:
+;   DX:AX contains the quotient (dividend/divisor)
+;   NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;   CX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+    ASGN    uldiv
+
+    push    bx
+    push    si
+
+; Set up the local stack and save the index registers.  When this is done
+; the stack frame will look as follows (assuming that the expression a/b will
+; generate a call to uldiv(a, b)):
+;
+;       -----------------
+;       |       |
+;       |---------------|
+;       |       |
+;       |--divisor (b)--|
+;       |       |
+;       |---------------|
+;       |       |
+;       |--dividend (a)-|
+;       |       |
+;       |---------------|
+;       | return addr** |
+;       |---------------|
+;   BP----->|    old BP |
+;       |---------------|
+;       |      BX   |
+;       |---------------|
+;   SP----->|      SI   |
+;       -----------------
+;
+; ** - 2 bytes if small/compact model; 4 bytes if medium/large model
+
+DVND    equ BPARGBAS[bp]    ; stack address of dividend (a)
+DVSR    equ BPARGBAS+4[bp]  ; stack address of divisor (b)
+
+;
+; Now do the divide.  First look to see if the divisor is less than 64K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+
+    mov ax,HIWORD(DVSR) ; check to see if divisor < 64K
+    or  ax,ax
+    jnz L1      ; nope, gotta do this the hard way
+    mov cx,LOWORD(DVSR) ; load divisor
+    mov ax,HIWORD(DVND) ; load high word of dividend
+    xor dx,dx
+    div cx      ; get high order bits of quotient
+    mov bx,ax       ; save high bits of quotient
+    mov ax,LOWORD(DVND) ; dx:ax <- remainder:lo word of dividend
+    div cx      ; get low order bits of quotient
+    mov dx,bx       ; dx:ax <- quotient hi:quotient lo
+    jmp short L2    ; restore stack and return
+
+;
+; Here we do it the hard way.  Remember, ax contains DVSRHI
+;
+
+L1:
+    mov cx,ax       ; cx:bx <- divisor
+    mov bx,LOWORD(DVSR)
+    mov dx,HIWORD(DVND) ; dx:ax <- dividend
+    mov ax,LOWORD(DVND)
+L3:
+    shr cx,1        ; shift divisor right one bit; hi bit <- 0
+    rcr bx,1
+    shr dx,1        ; shift dividend right one bit; hi bit <- 0
+    rcr ax,1
+    or  cx,cx
+    jnz L3      ; loop until divisor < 64K
+    div bx      ; now divide, ignore remainder
+    mov si,ax       ; save quotient
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**32 and the quotient is off by 1.
+;
+
+    mul word ptr HIWORD(DVSR) ; QUOT * HIWORD(DVSR)
+    xchg    cx,ax       ; "mov cx,ax" but only 1 byte
+    mov ax,LOWORD(DVSR)
+    mul si      ; QUOT * LOWORD(DVSR)
+    add dx,cx       ; DX:AX = QUOT * DVSR
+    jc  L4      ; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in dx:ax.  If original is larger or equal, we are ok, otherwise
+; subtract one (1) from the quotient.
+;
+
+    cmp dx,HIWORD(DVND) ; compare hi words of result and original
+    ja  L4      ; if result > original, do subtract
+    jb  L5      ; if result < original, we are ok
+    cmp ax,LOWORD(DVND) ; hi words are equal, compare lo words
+    jbe L5      ; if less or equal we are ok, else subtract
+L4:
+    dec si      ; subtract 1 from quotient
+L5:
+    xor dx,dx       ; dx:ax <- quotient
+    xchg    ax,si       ; "mov ax,si" but only 1 byte
+
+;
+; Just the cleanup left to do.  dx:ax contains the quotient.
+; Restore the saved registers and return.
+;
+
+L2:
+
+    pop si
+    pop bx
+
+cEnd    <nolocals>
+return  8
+
+sEnd
+
+    end
diff --git a/base/boot/Singldr/ulhelp.inc b/base/boot/Singldr/ulhelp.inc
new file mode 100644
index 0000000..55c49c5
--- /dev/null
+++ b/base/boot/Singldr/ulhelp.inc
@@ -0,0 +1,1098 @@
+;*******************************************************************************
+;
+; Functions from c7rt (\\products\public\boneyard\us\rellang\c700a.dos
+;
+;*******************************************************************************
+
+;*******************************************************************************
+;version.inc - defines current memory model
+;
+;       Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;Purpose:
+;       This file defines the current memory model being used.
+;
+;*******************************************************************************
+
+?PLM=   0
+
+ifdef   mem_s
+        memS    equ     1       ; small model
+endif
+
+ifdef   mem_m
+        memM    equ     1       ; medium model
+endif
+
+ifdef   mem_c
+        memC    equ     1       ; compact model
+endif
+
+ifdef   mem_l
+        memL    equ     1       ; large model
+endif
+;*******************************************************************************
+
+;*******************************************************************************
+;cmacros.inc - assembly macros for interfacing to HHLs
+;
+;       Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;*******************************************************************************
+comment $
+cmacros - assembly macros for interfacing to HHLs
+Copyright (c) Microsoft Corporation.  All rights reserved.
+$
+if @Version gt 510
+option m510, oldmacros
+else
+f510 equ <>
+endif
+.xcref ??_out
+??_out MACRO string
+ifndef ?QUIET
+%out string
+endif
+ENDM
+if1
+outif MACRO id,defval,onmsg,offmsg
+ifndef id
+ifb <defval>
+id=0
+else
+id=defval
+endif
+endif
+if id
+id=1
+ifnb <onmsg>
+??_out <! onmsg>
+endif
+else
+ifnb <offmsg>
+??_out <! offmsg>
+endif
+endif
+endm
+error MACRO msg
+bug
+%out E r r o r ----- msg
+ENDM
+;??_out <cMacros Version 1.06+>
+outif memS,0,<Small Model>
+outif memM,0,<Medium Model>
+outif memL,0,<Large Model>
+outif memC,0,<Compact Model>
+outif memH,0,<Huge Model>
+memMOD= memS + memM + memL + memC + memH
+if memMOD ne 1
+if memMOD eq 0
+memS= 1
+outif memS,0,<Small Model>
+else
+error <Must have only 1 memory model selected>
+endif
+endif
+sizeC= memM + memL + memH
+sizeD= memL + memC + (memH*2)
+outif ?DF,0,<No segments or groups will be defined>
+outif ?WIN,1,<Windows Support>
+outif ?PLM,1,<PLM calling convention>
+endif
+.XCREF
+.XCREF ?N,?AX,?AH,?AL,?BX,?BH
+.XCREF ?BL,?CX,?CH,?CL,?DX,?DH
+.XCREF ?DL,?SI,?DI,?ES,?DS,?BP
+.XCREF ?SP,?SS,?CS
+.XCREF ?RSL,?CPD,?argl,?argc,?BA
+.XCREF ?ACB,???,?PO
+.XCREF ?PAS,?PC
+.XCREF Uconcat,mPush,mPop
+.XCREF ?RI,?pp,?pp1,?al1
+.XCREF ?aD,?AP,?Atal,?pd,?dd,?dd1,?ex1
+.XCREF ?pg,?pg1,?aloc,?cs1,?cs2
+.XCREF ?lb1,?lblpu
+.XCREF ?DF,?PLM,?WIN,?IA,?PU,?ADJ
+.CREF
+?RSL = 0
+?CPD = 0
+?ArgL = 0
+?ArgC = 0
+?BA = 0
+?ACB = 0
+??? = 0
+?PO = 0
+?PAS = 0
+?PC = 0
+?IA = 0
+?PU = 0
+?ADJ = 0
+?lblpu = 0
+?N = 0000000000000000B
+?AX = 0000000000000011B
+?AH = 0000000000000001B
+?AL = 0000000000000010B
+?BX = 0000000000001100B
+?BH = 0000000000000100B
+?BL = 0000000000001000B
+?CX = 0000000000110000B
+?CH = 0000000000010000B
+?CL = 0000000000100000B
+?DX = 0000000011000000B
+?DH = 0000000001000000B
+?DL = 0000000010000000B
+?SI = 0000000100000000B
+?DI = 0000001000000000B
+?ES = 0000010000000000B
+?DS = 0000100000000000B
+?BP = 0001000000000000B
+?SP = 0010000000000000B
+?SS = 0100000000000000B
+?CS = 1000000000000000B
+uconcat macro n1,n2,o1,o2,p1,p2
+n1&n2 o1&o2 p1&p2
+endm
+mpush macro rV
+irp x,<ax,bx,cx,dx,si,di,es,ds,bp,sp,ss,cs>
+if rV AND ?&&x
+push x
+endif
+endm
+endm
+mpop macro rV
+irp x,<cs,ss,sp,bp,ds,es,di,si,dx,cx,bx,ax>
+if rV AND ?&&x
+pop x
+endif
+endm
+endm
+SAVE macro rL
+?RSL = 0
+?RI ?RSL,<rL>
+endm
+smashes macro n,rL
+.xcref
+.xcref ?SM&n
+.cref
+?SM&n = 0
+?RI ?SM&n,<rL>
+endm
+?RI macro n,rL
+irp x,<rL>
+ifdef ?&&x
+n = n or ?&&x
+endif
+endm
+endm
+parmB macro nl
+?pp <&nL>,<byte>,2,1
+endm
+parmW macro nl
+?pp <&nL>,<word>,2,2
+endm
+parmD macro nl
+ife ?PLM
+irp x,<nL>
+?pp <&&x>,<DWORD>,0,4
+?pp <Off_&&x>,<WORD>,2,2
+?pp <Seg_&&x>,<WORD>,2,2
+endm
+else
+irp x,<nL>
+?pp <Seg_&&x>,<WORD>,2,2
+?pp <Off_&&x>,<WORD>,2,2
+?pp <&&x>,<DWORD>,0,4
+endm
+endif
+endm
+parmQ macro nl
+?pp <&nL>,<QWORD>,8,8
+endm
+parmT macro nl
+?pp <&nL>,<TBYTE>,10,10
+endm
+if sizeC
+parmCP macro nl
+parmD <nl>
+endm
+else
+parmCP macro nl
+parmW <nl>
+endm
+endif
+if sizeD
+parmDP macro nl
+parmD <nl>
+endm
+else
+parmDP macro nl
+parmW <nl>
+endm
+endif
+?pp macro nL,t,l,s
+if ?CPD
+.xcref
+ife ?PLM
+irp x,<nL>
+?pp1 x,<t>,%?PO,%?adj,%(?PO+?adj)
+?PO = ?PO + l
+.xcref ?T&&x
+?T&&x = s
+endm
+else
+irp x,<nL>
+?PO = ?PO + l
+?pp1 x,<t>,%?PO,%?adj,%(?PO+?adj)
+.xcref ?T&&x
+?T&&x = s
+endm
+endif
+.cref
+else
+%out Parm(s) "&nl" declared outside proc def.
+endif
+endm
+?pp1 macro n,t,o,a,b
+ife ?PLM
+n equ <t ptr [bp+b]>
+else
+n equ <t ptr [bp+a+?PO-o]>
+endif
+endm
+localB macro nL
+?aLoc <&nL>,<BYTE ptr>,1,1,0
+endm
+localW macro nL
+?aLoc <&nL>,<WORD PTR>,2,2,1
+endm
+localD macro nL
+irp x,<nL>
+?aLoc <Seg_&&x>,<WORD PTR>,2,2,1
+?aLoc <Off_&&x>,<WORD PTR>,2,2,1
+?aLoc <&&x>,<DWORD PTR>,0,4,1
+endm
+endm
+localQ macro nL
+?aLoc <&nL>,<QWORD PTR>,8,8,1
+endm
+localT macro nL
+?aLoc <&nL>,<TBYTE PTR>,10,10,1
+endm
+if sizeC
+localCP macro nL
+localD <nL>
+endm
+else
+localCP macro nL
+localW <nL>
+endm
+endif
+if sizeD
+localDP macro nL
+localD <nL>
+endm
+else
+localDP macro nL
+localW <nL>
+endm
+endif
+localV macro n,a
+?aLoc <&n>,<BYTE PTR>,%(&a),0,1
+endm
+?aLoc macro nL,t,l,s,a
+if ?CPD
+.xcref
+??? = ??? + l
+if a
+??? = ((??? + 1) AND 0FFFEH)
+endif
+irp x,<nL>
+?aL1 x,<t>,%???
+.xcref ?T&&x
+?T&&x = s
+endm
+.cref
+else
+%out Locals "&nl" declared outside procedure def.
+endif
+endm
+?aL1 macro n,t,o
+if ?IA
+n equ <t [bp-?IA-o]>
+else
+n equ <t [bp-o]>
+endif
+endm
+globalB macro n,i,s
+?aD <n>,1
+?dd n,1,<BYTE>,<DB>,<i>,<s>
+endm
+globalW macro n,i,s
+?aD <n>,2
+?dd n,1,<WORD>,<DW>,<i>,<s>
+endm
+globalD macro n,i,s
+?aD <n>,4
+?dd n,1,<DWORD>,<DD>,<i>,<s>
+endm
+globalQ macro n,i,s
+?aD <n>,8
+?dd n,1,<QWORD>,<DQ>,<i>,<s>
+endm
+globalT macro n,i,s
+?aD <n>,10
+?dd n,1,<TBYTE>,<DT>,<i>,<s>
+endm
+if sizeC
+globalCP macro n,i,s
+globalD n,<i>,<s>
+endm
+else
+globalCP macro n,i,s
+globalW n,<i>,<s>
+endm
+endif
+if sizeD
+globalDP macro n,i,s
+globalD n,<i>,<s>
+endm
+else
+globalDP macro n,i,s
+globalW n,<i>,<s>
+endm
+endif
+staticB macro n,i,s
+?aD <n>,1
+?dd n,0,<BYTE>,<DB>,<i>,<s>
+endm
+staticW macro n,i,s
+?aD <n>,2
+?dd n,0,<WORD>,<DW>,<i>,<s>
+endm
+staticD macro n,i,s
+?aD <n>,4
+?dd n,0,<DWORD>,<DD>,<i>,<s>
+endm
+staticQ macro n,i,s
+?aD <n>,8
+?dd n,0,<QWORD>,<DQ>,<i>,<s>
+endm
+staticT macro n,i,s
+?aD <n>,10
+?dd n,0,<TBYTE>,<DT>,<i>,<s>
+endm
+if sizeC
+staticCP macro n,i,s
+staticD n,<i>,<s>
+endm
+else
+staticCP macro n,i,s
+staticW n,<i>,<s>
+endm
+endif
+if sizeD
+staticDP macro n,i,s
+staticD n,<i>,<s>
+endm
+else
+staticDP macro n,i,s
+staticW n,<i>,<s>
+endm
+endif
+?dd macro n,p,t,d,i,s
+ife ?PLM
+n label t
+?dd1 _&n,p,<d>,<i>,<s>
+else
+?dd1 n,p,<d>,<i>,<s>
+endif
+endm
+?dd1 macro n,p,d,i,s
+if p
+PUBLIC n
+endif
+ifb <s>
+n d i
+else
+ifb <i>
+n d s DUP (?)
+else
+n d s DUP (i)
+endif
+endif
+endm
+externB macro nL
+?ex1 <&nL>,1,<BYTE>
+endm
+externW macro nL
+?ex1 <&nL>,2,<WORD>
+endm
+externD macro nL
+?ex1 <&nL>,4,<DWORD>
+endm
+externQ macro nL
+?ex1 <&nL>,8,<QWORD>
+endm
+externT macro nL
+?ex1 <&nL>,10,<TBYTE>
+endm
+externNP macro nL
+?ex1 <&nL>,2,<NEAR>
+endm
+externFP macro nL
+?ex1 <&nL>,4,<FAR>
+endm
+if sizeC
+externP macro nL
+?ex1 <&nL>,4,<FAR>
+endm
+else
+externP macro nL
+?ex1 <&nL>,2,<NEAR>
+endm
+endif
+if sizeC
+externCP macro nL
+?ex1 <&nL>,4,<DWORD>
+endm
+else
+externCP macro nL
+?ex1 <&nL>,2,<WORD>
+endm
+endif
+if sizeD
+externDP macro nL
+?ex1 <&nL>,4,<DWORD>
+endm
+else
+externDP macro nL
+?ex1 <&nL>,2,<WORD>
+endm
+endif
+?ex1 macro nL,s,d
+irp x,<nL>
+.xcref
+.xcref ?T&&x
+.cref
+?T&&x = s
+ife ?PLM
+extrn _&&x:&d
+x equ _&&x
+else
+extrn x:&d
+endif
+endm
+endm
+labelB macro nL
+?lb1 <&nL>,1,<BYTE>
+endm
+labelW macro nL
+?lb1 <&nL>,2,<WORD>
+endm
+labelD macro nL
+?lb1 <&nL>,4,<DWORD>
+endm
+labelQ macro nL
+?lb1 <&nL>,8,<QWORD>
+endm
+labelT macro nL
+?lb1 <&nL>,10,<TBYTE>
+endm
+labelNP macro nL
+?lb1 <&nL>,2,<NEAR>
+endm
+labelFP macro nL
+?lb1 <&nL>,4,<FAR>
+endm
+if sizeC
+labelP macro nL
+?lb1 <&nL>,4,<FAR>
+endm
+else
+labelP macro nL
+?lb1 <&nL>,2,<NEAR>
+endm
+endif
+if sizeC
+labelCP macro nL
+?lb1 <&nL>,4,<DWORD>
+endm
+else
+labelCP macro nL
+?lb1 <&nL>,2,<WORD>
+endm
+endif
+if sizeD
+labelDP macro nL
+?lb1 <&nL>,4,<DWORD>
+endm
+else
+labelDP macro nL
+?lb1 <&nL>,2,<WORD>
+endm
+endif
+?lb1 macro nL,s,d
+?lblpu = 0
+irp x,<nL>
+ifidn <x>,<PUBLIC>
+?lblpu = 1
+else
+.xcref
+.xcref ?T&&x
+.cref
+?T&&x = s
+ife ?PLM
+if ?lblpu
+public _&&x
+endif
+_&&x label &d
+x equ _&&x
+else
+if ?lblpu
+public x
+endif
+x label &d
+endif
+endif
+endm
+endm
+defB macro nL
+?aD <&nL>,1
+endm
+defW macro nL
+?aD <&nL>,2
+endm
+defD macro nL
+?aD <&nL>,4
+endm
+defQ macro nL
+?aD <&nL>,8
+endm
+defT macro nL
+?aD <&nL>,10
+endm
+if sizeC
+defCP macro nL
+defD <nL>
+endm
+else
+defCP macro nL
+defW <nL>
+endm
+endif
+if sizeD
+defDP macro nL
+defD <nL>
+endm
+else
+defDP macro nL
+defW <nL>
+endm
+endif
+?aD macro nL,s
+irp x,<nL>
+.xcref
+.xcref ?T&&x
+.cref
+?T&&x = s
+endm
+endm
+regPtr macro n,S,O
+.xcref
+.xcref ?T&n,?SR&n,?OR&n
+.cref
+?T&n = 0FFFFH
+?SR&n = 0
+?RI ?SR&n,<&S>
+?OR&n = 0
+?RI ?OR&n,<&O>
+endm
+arg macro aArg
+irp x,<aArg>
+?argc = ?argc + 1
+?Atal <x>,%?argc
+endm
+endm
+?Atal macro n,i
+.xcref
+.xcref ?ALI&i
+.cref
+?ALI&i &macro
+?AP n
+&endm
+endm
+?AP macro n
+?argl = ?argl + 2
+ifdef ?T&n
+ife ?T&n-1
+push word ptr (n)
+exitm
+endif
+ife ?T&n-2
+push n
+exitm
+endif
+ife ?T&n-4
+push word ptr (n)+2
+push word ptr (n)
+?argl = ?argl + 2
+exitm
+endif
+ife ?T&n-8
+push word ptr (n)+6
+push word ptr (n)+4
+push word ptr (n)+2
+push word ptr (n)
+?argl = ?argl + 6
+exitm
+endif
+ife ?T&n-0FFFFH
+mpush %(?SR&n)
+mpush %(?OR&n)
+?argl = ?argl + 2
+exitm
+endif
+ife ?T&n
+push word ptr (n)
+exitm
+endif
+endif
+push n
+endm
+ife ?PLM
+ccall macro n,a,extraArg
+ifnb <a>
+Arg <a>
+endif
+ifdef ?SM&n
+?RSL = ?RSL AND ?SM&n
+endif
+mpush %?RSL
+?argl = 0
+?ACB = ?argc
+rept ?argc
+uconcat <?ALI>,%?ACB
+uconcat <purge>,,<?ALI>,%?ACB
+?ACB = ?ACB - 1
+endm
+ife ?PLM
+ifb <extraArg>
+call _&n
+else
+call n
+endif
+else
+call n
+endif
+if ?argl
+add sp,?argl
+endif
+mpop %?RSL
+?RSL = 0
+?argc = 0
+?argl = 0
+endm
+else
+ccall macro n,a
+ifnb <a>
+Arg <a>
+endif
+ifdef ?SM&n
+?RSL = ?RSL AND ?SM&n
+endif
+mpush %?RSL
+?argl = 0
+?ACB = 1
+rept ?argc
+uconcat <?ALI>,%?ACB
+uconcat <purge>,,<?ALI>,%?ACB
+?ACB = ?ACB + 1
+endm
+ife ?PLM
+call _&n
+else
+call n
+endif
+mpop %?RSL
+?RSL = 0
+?argc = 0
+?argl = 0
+endm
+endif
+cProc macro n,cla,s
+?pd n,<cla>,<s>,4
+endm
+?pd macro n,cla,a,i
+if ?CPD
+?UTPE
+endif
+?CPD = 1
+??? = 0
+?argc = 0
+?BA = 0
+?PO = 0
+?PU = 0
+?IA = 0
+?adj = i
+?PAS = 0
+ifnb <a>
+?RI ?PAS,<a>
+endif
+?PC = sizeC
+irp x,<cla>
+ifidn <x>,<FAR>
+?PC = 1
+endif
+ifidn <x>,<NEAR>
+?PC = 0
+endif
+ifidn <x>,<PUBLIC>
+?PU = 1
+endif
+endm
+if ?PC
+?adj = ?adj + 2
+endif
+ife ?PLM
+ife ?PC
+n label near
+else
+n label far
+endif
+?pg <_&n>,%?PU,%?PC,%?PAS
+else
+?pg <n>,%?PU,%?PC,%?PAS
+endif
+endm
+?pg macro n,p,cla,a
+.xcref
+cBegin &macro g
+.xcref
+?pg1 <n>,c,a,%?PO
+?CPD = 0
+?argc = 0
+?BA = 1
+??? = (???+1) AND 0FFFEH
+if p
+PUBLIC n
+endif
+ife cla
+n proc NEAR
+else
+n proc FAR
+endif
+ifidn <g>,<nogen>
+if ???+?PO+a
+??_out <cBegin - nogen>
+endif
+else
+if ?IA
+mov ax,ds
+nop
+inc bp
+push bp
+mov bp,sp
+push ds
+mov ds,ax
+else
+push bp
+mov bp,sp
+endif
+if ???
+sub sp,???
+endif
+mPush a
+endif
+.cref
+purge cBegin
+&endm
+?UTPE &macro
+%out Unterminated Procedure Definition: "&n"
+&endm
+endm
+?pg1 macro n,cla,a,o
+.xcref
+cEnd &macro g
+.xcref
+?BA = 0
+ifidn <g>,<nogen>
+if o+a
+%out <cEnd - nogen>
+endif
+else
+mPop a
+if ?IA
+sub bp,2
+mov sp,bp
+pop ds
+pop bp
+dec bp
+else
+ifdif <g>,<nolocals>
+mov sp,bp
+endif
+pop bp
+endif
+ife ?PLM
+ret
+else
+ret o
+endif
+endif
+n endp
+.cref
+purge cEnd
+&endm
+.cref
+endm
+assumes macro s,g
+local assumed
+assumed = 0
+ifidn <code>,<g>
+assume s&:_TEXT
+assumed = 1
+endif
+ifidn <CODE>,<g>
+assume s&:_TEXT
+assumed = 1
+endif
+ifidn <data>,<g>
+assume s&:dgroup
+assumed = 1
+endif
+ifidn <DATA>,<g>
+assume s&:dgroup
+assumed = 1
+endif
+ife assumed
+assume s&:&g
+endif
+endm
+createSeg macro n,ln,a,co,cla,grp
+ifnb <cla>
+n segment a co '&cla'
+else
+n segment a co
+endif
+n ends
+?cs1 <n>,<ln>
+ifnb <grp>
+grp group n
+endif
+endm
+defGrp macro nam
+endm
+?cs1 macro n,ln
+begin&ln &macro
+?cs2 <n>
+n segment
+&endm
+endm
+?cs2 macro n
+sEnd &macro dummy
+n ends
+&endm
+endm
+sBegin macro ln
+begin&ln
+endm
+ife ?DF
+createSeg _TEXT,code,word,public,CODE
+createSeg _DATA,data,word,public,DATA,DGROUP
+defGrp DGROUP
+codeOFFSET equ <OFFSET _TEXT:>
+dataOFFSET equ <OFFSET DGROUP:>
+endif
+errnz macro x
+if x
+errnz1 <x>,%(x)
+endif
+endm
+errnz1 macro x1,x2
+= *ERRNZ* x1 = x2
+endm
+errn$ macro l,x
+errnz <OFFSET $ - OFFSET l x>
+ENDM
+callcrt MACRO funcname
+if sizeC
+push cs
+call near ptr (funcname)
+else
+call funcname
+endif
+ENDM
+;*******************************************************************************
+
+;*******************************************************************************
+;cmphlp.inc - include to aid in generating compiler helpers
+;
+;       Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;Purpose:
+;       This file is a compiler helper include to aid in generating
+;       backwards compatible compiler helpers.
+;
+;*******************************************************************************
+
+
+callnahlpr MACRO nm             ;;call non-assigning helper
+if      sizeC
+        push    cs
+        call    near ptr __aF&nm
+else
+        call    near ptr __aN&nm
+endif
+ENDM
+
+
+DFLT    MACRO   tag,prfx,nm
+externP _a&prfx&tag&nm
+cProc   _&tag&nm,<PUBLIC>,<>
+cBegin  nogen
+        jmp     _a&prfx&tag&nm
+cEnd    nogen
+ENDM
+
+DFLT2   MACRO   tag,prfx,nm
+externP _a&prfx&tag&nm
+cProc   _&tag&u&nm,<PUBLIC>,<>
+cBegin  nogen
+cEnd    nogen
+cProc   _&tag&nm,<PUBLIC>,<>
+cBegin  nogen
+        jmp     _a&prfx&tag&nm
+cEnd    nogen
+ENDM
+
+ASGN    MACRO   nm              ;;macro to fix up entry sequence of non
+                                ;;assigning code helpers
+if      sizeC
+cProc   _aF&nm,<PUBLIC>,<>
+cBegin
+
+else
+cProc   _aN&nm,<PUBLIC>,<>
+cBegin
+endif
+ENDM
+
+
+
+aASGN   MACRO   nm              ;;macro to fix up entry sequence of assigning
+                                ;;code helpers
+if      memL    eq 1
+externP _aF&nm
+cProc   _aFFa&nm,<PUBLIC>,<>
+cBegin
+endif
+if      memM    eq 1
+externP _aF&nm
+cProc   _aFNa&nm,<PUBLIC>,<>
+cBegin
+endif
+if      memC    eq 1
+externP _aN&nm
+cProc   _aNFa&nm,<PUBLIC>,<>
+cBegin
+endif
+if      memS    eq 1
+externP _aN&nm
+cProc   _aNNa&nm,<PUBLIC>,<>
+cBegin
+endif
+ENDM
+
+
+OLDSLEAZ MACRO
+
+ifdef   lhdiff
+OLDASGN hdiff
+endif
+
+ifdef   llshl
+OLDASGN lshl
+endif
+
+ifdef   llshr
+OLDASGN lshr
+endif
+
+ifdef   lulshr
+OLDASGN ulshr
+endif
+
+ifdef   lldiv
+OLDASGN ldiv
+endif
+
+ifdef   llmul
+OLDASGN2 lmul
+endif
+
+ifdef   llrem
+OLDASGN lrem
+endif
+
+ifdef   luldiv
+OLDASGN uldiv
+endif
+
+ifdef   lulrem
+OLDASGN ulrem
+endif
+        ENDM
+;*******************************************************************************
+
+;*******************************************************************************
+;mm.inc - macros to write memory model dependent code
+;
+;       Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;Purpose:
+;       This file contains definitions of a number of macros which
+;       make the writing of memory model dependent code for the
+;       8086 a little easier and more portable.
+;
+;*******************************************************************************
+
+; general code & data size constants & macros
+
+if      sizeD                   ; 4 byte data addresses
+DAT_ADDR_SZ =   4
+BDAT_ADDR_SZ =  2
+else                            ; 2 byte data addresses
+DAT_ADDR_SZ =   2
+BDAT_ADDR_SZ =  4
+endif
+
+if      sizeC                   ; 4 byte code addresses
+TXT_ADDR_SZ =   4
+else                            ; 2 byte code addresses
+TXT_ADDR_SZ =   2
+endif
+
+
+; Big/Little Endian Definitions for Long Integers
+
+LOWORD  equ     [0]
+HIWORD  equ     [2]
+
+
+; All Model Definitions
+
+BPARGBAS equ    TXT_ADDR_SZ+2   ; offset from BP to first argument
+
+
+; macro for windows fixup with retf #
+
+return  macro   n
+        org     $-1
+if      sizeC
+        db      0cah
+else
+        db      0c2h
+endif
+        dw      n
+        endm
+;*******************************************************************************
diff --git a/base/boot/Singldr/ulrem.asm b/base/boot/Singldr/ulrem.asm
new file mode 100644
index 0000000..756a092
--- /dev/null
+++ b/base/boot/Singldr/ulrem.asm
@@ -0,0 +1,170 @@
+    page    ,132
+    title   ulrem - unsigned long remainder routine
+;***
+;ulrem.asm - unsigned long remainder routine
+;
+;   Copyright (c) Microsoft Corporation.  All rights reserved.
+;
+;Purpose:
+;   defines the unsigned long remainder routine
+;   the following routines are created:
+;       __aFulrem   (large, medium models)
+;       __aNulrem   (small, compact models)
+;
+;*******************************************************************************
+
+.xlist
+include ulhelp.inc
+.list
+
+sBegin  code
+    assumes cs,code
+    assumes ds,data
+
+page
+;***
+;ulrem - unsigned long remainder
+;
+;Purpose:
+;   Does a unsigned long remainder of the arguments.  Arguments are
+;   not changed.
+;
+;Entry:
+;   Arguments are passed on the stack:
+;       1st pushed: divisor (DWORD)
+;       2nd pushed: dividend (DWORD)
+;
+;Exit:
+;   DX:AX contains the remainder (dividend%divisor)
+;   NOTE: this routine removes the parameters from the stack.
+;
+;Uses:
+;   CX
+;
+;Exceptions:
+;
+;*******************************************************************************
+
+    ASGN    ulrem
+
+    push    bx
+
+; Set up the local stack and save the index registers.  When this is done
+; the stack frame will look as follows (assuming that the expression a%b will
+; generate a call to ulrem(a, b)):
+;
+;       -----------------
+;       |       |
+;       |---------------|
+;       |       |
+;       |--divisor (b)--|
+;       |       |
+;       |---------------|
+;       |       |
+;       |--dividend (a)-|
+;       |       |
+;       |---------------|
+;       | return addr** |
+;       |---------------|
+;   BP----->|    old BP |
+;       |---------------|
+;   SP----->|      BX   |
+;       -----------------
+;
+; ** - 2 bytes if small model; 4 bytes if medium/large model
+
+DVND    equ BPARGBAS[bp]    ; stack address of dividend (a)
+DVSR    equ BPARGBAS+4[bp]  ; stack address of divisor (b)
+
+; Now do the divide.  First look to see if the divisor is less than 64K.
+; If so, then we can use a simple algorithm with word divides, otherwise
+; things get a little more complex.
+;
+
+    mov ax,HIWORD(DVSR) ; check to see if divisor < 64K
+    or  ax,ax
+    jnz L1      ; nope, gotta do this the hard way
+    mov cx,LOWORD(DVSR) ; load divisor
+    mov ax,HIWORD(DVND) ; load high word of dividend
+    xor dx,dx
+    div cx      ; dx <- remainder, ax <- quotient
+    mov ax,LOWORD(DVND) ; dx:ax <- remainder:lo word of dividend
+    div cx      ; dx <- final remainder
+    mov ax,dx       ; dx:ax <- remainder
+    xor dx,dx
+    jmp short L2    ; restore stack and return
+
+;
+; Here we do it the hard way.  Remember, ax contains DVSRHI
+;
+
+L1:
+    mov cx,ax       ; cx:bx <- divisor
+    mov bx,LOWORD(DVSR)
+    mov dx,HIWORD(DVND) ; dx:ax <- dividend
+    mov ax,LOWORD(DVND)
+L3:
+    shr cx,1        ; shift divisor right one bit; hi bit <- 0
+    rcr bx,1
+    shr dx,1        ; shift dividend right one bit; hi bit <- 0
+    rcr ax,1
+    or  cx,cx
+    jnz L3      ; loop until divisor < 64K
+    div bx      ; now divide, ignore remainder
+
+;
+; We may be off by one, so to check, we will multiply the quotient
+; by the divisor and check the result against the orignal dividend
+; Note that we must also check for overflow, which can occur if the
+; dividend is close to 2**32 and the quotient is off by 1.
+;
+
+    mov cx,ax       ; save a copy of quotient in CX
+    mul word ptr HIWORD(DVSR)
+    xchg    cx,ax       ; put partial product in CX, get quotient in AX
+    mul word ptr LOWORD(DVSR)
+    add dx,cx       ; DX:AX = QUOT * DVSR
+    jc  L4      ; carry means Quotient is off by 1
+
+;
+; do long compare here between original dividend and the result of the
+; multiply in dx:ax.  If original is larger or equal, we're ok, otherwise
+; subtract the original divisor from the result.
+;
+
+    cmp dx,HIWORD(DVND) ; compare hi words of result and original
+    ja  L4      ; if result > original, do subtract
+    jb  L5      ; if result < original, we're ok
+    cmp ax,LOWORD(DVND) ; hi words are equal, compare lo words
+    jbe L5      ; if less or equal we're ok, else subtract
+L4:
+    sub ax,LOWORD(DVSR) ; subtract divisor from result
+    sbb dx,HIWORD(DVSR)
+L5:
+
+;
+; Calculate remainder by subtracting the result from the original dividend.
+; Since the result is already in a register, we will perform the subtract in
+; the opposite direction and negate the result to make it positive.
+;
+
+    sub ax,LOWORD(DVND) ; subtract original dividend from result
+    sbb dx,HIWORD(DVND)
+    neg dx      ; and negate it
+    neg ax
+    sbb dx,0
+
+;
+; Just the cleanup left to do.  dx:ax contains the remainder.
+; Restore the saved registers and return.
+;
+
+L2:
+
+    pop bx
+cEnd    <nolocals>
+return  8
+
+sEnd
+
+    end
diff --git a/base/boot/Singldr/undump.cpp b/base/boot/Singldr/undump.cpp
new file mode 100644
index 0000000..46231b7
--- /dev/null
+++ b/base/boot/Singldr/undump.cpp
@@ -0,0 +1,1858 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  undump.cpp - Minidump Kernel Expander
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+typedef int INT;
+typedef char INT8, *PINT8;
+typedef short INT16, *PINT16;
+typedef long INT32, *PINT32;
+typedef __int64 INT64, *PINT64;
+typedef long LARGEST;
+typedef char CHAR, *PCHAR;
+typedef unsigned int UINT;
+typedef unsigned char UINT8, *PUINT8;
+typedef unsigned short UINT16, *PUINT16;
+typedef unsigned long UINT32, *PUINT32;
+typedef unsigned __int64 UINT64, *PUINT64;
+typedef unsigned long ULARGEST;
+typedef unsigned short WCHAR;
+typedef unsigned char UCHAR;
+typedef int BOOL;
+typedef void *PVOID;
+typedef UINT32 ULONG_PTR;
+typedef UINT32 UINTPTR;
+
+#define NULL    0
+#define arrayof(a)      (sizeof(a)/sizeof(a[0]))
+#define offsetof(s,m)   (size_t)&(((s *)0)->m)
+
+#define DO_ACPI    1
+//#define DEBUG 1
+
+//////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////// Core types used by runtime system.
+//
+
+extern "C" ULONG_PTR _security_cookie = 0;
+
+typedef __wchar_t           bartok_char;
+
+typedef signed char         int8;
+typedef signed short        int16;
+typedef signed int          int32;
+typedef __int64             int64;
+
+typedef unsigned char       uint8;
+typedef unsigned short      uint16;
+typedef unsigned int        uint32;
+typedef unsigned __int64    uint64;
+
+typedef float               float32;
+typedef double              float64;
+
+typedef int                 intptr;
+typedef unsigned int        uintptr;
+
+struct uintPtr
+{
+    uintptr value;
+};
+
+struct intPtr
+{
+    intptr value;
+};
+
+typedef struct uintPtr *UIntPtr;
+typedef struct intPtr *IntPtr;
+
+/////////////////////////////////////////////////////////////// Static Assert.
+//
+// Compile-time (not run-time) assertion. Code will not compile if
+// expr is false. Note: there is no non-debug version of this; we
+// want this for all builds. The compiler optimizes the code away.
+//
+template <bool x> struct STATIC_ASSERT_FAILURE;
+template <> struct STATIC_ASSERT_FAILURE<true> { };
+template <int x> struct static_assert_test { };
+
+#define STATIC_CAT_INNER(x,y) x##y
+#define STATIC_CAT(x,y) STATIC_CAT_INNER(x,y)
+
+#define STATIC_ASSERT(condition) \
+   typedef static_assert_test< \
+      sizeof(STATIC_ASSERT_FAILURE<(bool)(condition)>)> \
+         STATIC_CAT(__static_assert_typedef_, __COUNTER__)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define OFFSETOF(s,m)   ((uintptr)&(((s *)0)->m))
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#pragma warning(disable: 4103)
+#pragma pack(push, 4)
+#include "halclass.h"
+#pragma pack(pop)
+
+#include "winctx.h"
+#include "minidump.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+#define TEST 1
+
+#if TEST
+
+typedef unsigned int uint;
+typedef unsigned int UINT;
+typedef signed long LARGEST;
+typedef unsigned long ULARGEST;
+
+#include "printf.cpp"
+#include "debug.cpp"
+
+UINT64 __fastcall RDMSR(UINT32 msr)
+{
+    __asm rdmsr;
+}
+
+void WRMSR(UINT32 msr, UINT64 value)
+{
+    __asm {
+        lea ebx, value;
+        mov eax, [ebx+0];
+        mov edx, [ebx+4];
+        mov ecx, msr;
+        wrmsr;
+    }
+}
+
+// Routine to read Pentium time stamp counter
+_inline _declspec( naked ) UINT64 RDTSC()
+{
+    __asm {
+        rdtsc;
+        ret;
+    }
+}
+
+void CPUID(UINT32 feature, UINT32 *output)
+{
+    __asm {
+        mov eax, feature;
+        cpuid;
+        mov edi, output;
+        mov [edi+0], eax;
+        mov [edi+4], ebx;
+        mov [edi+8], ecx;
+        mov [edi+12], edx;
+    }
+}
+
+void IoSpaceWrite8(UINT16 This, UINT8 Value)
+{
+    __asm {
+        mov dx,This;
+        mov al,Value;
+        out dx,al;
+    }
+}
+
+UINT8 IoSpaceRead8(UINT16 Port)
+{
+    UINT8 Value;
+    __asm {
+        mov dx, Port;
+        in  al, dx;
+        mov Value, al;
+    }
+    return Value;
+}
+
+void FpuInit()
+{
+    __asm fninit;
+}
+
+UINT8 Sum(UINT8 * pbData, int cbData)
+{
+    UINT8 sum = 0;
+
+    while (cbData-- > 0) {
+        sum += *pbData++;
+    }
+    return sum;
+}
+
+int Checksum(UINT8 * pbData, int cbData)
+{
+    return (Sum(pbData, cbData) == 0);
+}
+
+///////////////////////////////////////////////////////////// Screen Routines.
+//
+static UINT16 s_wAttr = 0x1f00;
+
+void Dim()
+{
+    s_wAttr = 0x1800;
+}
+
+void Yellow()
+{
+    s_wAttr = 0x1e00;
+}
+
+void Green()
+{
+    s_wAttr = 0x1a00;
+}
+
+void Red()
+{
+    s_wAttr = 0x1c00;
+}
+
+void Normal()
+{
+    s_wAttr = 0x1f00;
+}
+
+static UINT nCursor = 0;
+
+void Halt()
+{
+    Yellow();
+    printf("Halt.");
+    __asm hlt;
+}
+
+void Cls()
+{
+    BdPrintString("-------------------------------------------------------------------------------\n", 80);
+
+    for (UINT16 n = 0; n < 4000; n++)
+    {
+        ((UINT16*)0xb8000)[n] = s_wAttr | ' ';
+    }
+
+    nCursor = 0;
+}
+
+void __cdecl PutChar(char cOut)
+{
+    if (cOut == '\r')
+    {
+        nCursor -= nCursor % 80;
+    }
+    else if (cOut == '\n')
+    {
+        do {
+            ((UINT16*)0xb8000)[nCursor++] = s_wAttr | ' ';
+        } while ((nCursor % 80) != 0);
+    }
+    else
+    {
+        ((UINT16*)0xb8000)[nCursor++] = (UINT16)(s_wAttr | cOut);
+    }
+
+    while (nCursor >= 4000)
+    {
+        UINT16 n = 0;
+        for (; n < 4000 - 80; n++)
+        {
+            ((UINT16*)0xb8000)[n] = ((UINT16*)0xb8000)[n + 80];
+        }
+        for (; n < 4000; n++)
+        {
+            ((UINT16*)0xb8000)[n] = s_wAttr | ' ';
+        }
+        nCursor -= 80;
+    }
+
+    IoSpaceWrite8(0x3d4, 0xe);
+    IoSpaceWrite8(0x3d5, (UINT8)(nCursor >> 8));
+    IoSpaceWrite8(0x3d4, 0xf);
+    IoSpaceWrite8(0x3d5, (UINT8)(nCursor & 0xff));
+
+    static CHAR szBuffer[256];
+    static INT nBuffer = 0;
+
+    szBuffer[nBuffer++] = cOut;
+    if (cOut == '\n' || nBuffer >= sizeof(szBuffer) - 1) {
+        BdPrintString(szBuffer, nBuffer);
+        nBuffer = 0;
+    }
+}
+
+void Probe(UINT8 * pbData, UINT cbData)
+{
+    UINT8 b;
+
+    for (UINT i = 0; i < cbData; i++) {
+        b = pbData[i];
+        pbData[i] = b;
+    }
+}
+
+void Dump(UINT8 * pbData, UINT cbData)
+{
+    for (UINT n = 0; n < cbData; n += 16) {
+        printf("  %08x:", pbData + n);
+        UINT o = n;
+        for (; o < n + 16; o++) {
+            if (o >= cbData) {
+                printf("  ");
+            }
+            else {
+                printf("%02x", pbData[o]);
+            }
+            if (o % 4 == 3) {
+                printf(" ");
+            }
+        }
+        printf(" ");
+        for (o = n; o < n + 16; o++) {
+            if (o >= cbData) {
+                printf("  ");
+            }
+            else {
+                if (pbData[o] >= ' ' && pbData[o] < 127) {
+                    printf("%c", pbData[o]);
+                }
+                else {
+                    printf(".");
+                }
+            }
+        }
+        printf("\n");
+    }
+}
+
+void Dump(UINT8 * pbData, UINT8 * pbLimit, UINT cbMax)
+{
+    UINT cbData = (uint) (pbLimit - pbData);
+    if (cbData > cbMax) {
+        cbData = cbMax;
+    }
+    Dump(pbData, cbData);
+}
+
+#endif
+
+
+static void CopyUp(UINT8 *pbDst, UINT8 *pbSrc, UINT32 cbSrc)
+{
+    //!!! pbDst >= pbSrc
+    if (pbDst < pbSrc) {
+        printf("CopyUp(dst=%p < src=%p)\n", pbDst, pbSrc);
+        Halt();
+    }
+
+    INT32 nSrc = (cbSrc + 3) / 4;
+    UINT32 *pDst = ((UINT32*)pbDst) + nSrc;
+    UINT32 *pSrc = ((UINT32*)pbSrc) + nSrc;
+
+    while (nSrc-- > 0) {
+        *--pDst = *--pSrc;
+    }
+}
+
+static void CopyDown(UINT8 *pbDst, UINT8 *pbSrc, UINT32 cbSrc)
+{
+    //!!! pbDst <= pbSrc
+    if (pbDst > pbSrc) {
+        printf("CopyDown(dst=%p > src=%p)\n", pbDst, pbSrc);
+        Halt();
+    }
+
+    INT32 nSrc = (cbSrc + 3) / 4;
+    volatile UINT32 *pDst = (UINT32*)pbDst;
+    volatile UINT32 *pSrc = (UINT32*)pbSrc;
+
+    while (nSrc-- > 0) {
+        *pDst = *pSrc;
+        if (*pDst != *pSrc) {
+            printf("CopyDown error at %p/%p : %08x != %08x\n",
+                   pDst, pSrc, *pDst, *pSrc);
+            Halt();
+        }
+        pDst++;
+        pSrc++;
+    }
+}
+
+const char * SmapTypeToString(int type)
+{
+    switch (type) {
+      case 1: return "RAM     ";
+      case 2: return "Reserved";
+      case 3: return "ACPI RAM";
+      case 4: return "ACPI NVS";
+      default: return "Other   ";
+    }
+}
+
+bool check(UINT8 *pbCache, UINT8 value, const char *pszDesc)
+{
+    for (int i = 0; i < 16; i++) {
+        if (pbCache[i] == value) {
+            pbCache[i] = 0;
+            printf("      %s\n", pszDesc);
+            return 1;
+        }
+    }
+    return 0;
+}
+
+static int wcseq(UINT16 * pwzData, UINT16 * pwzKnown)
+{
+    while (*pwzData && *pwzKnown && *pwzData == *pwzKnown) {
+        pwzData++;
+        pwzKnown++;
+    }
+    return (*pwzData == *pwzKnown);
+}
+
+static int wcslen(UINT16 *pwz)
+{
+    int len = 0;
+
+    while (*pwz++) {
+        len++;
+    }
+    return len;
+}
+
+static int wcsfindcmd(UINT16 *pwzCmd, UINT16 *pwzKnown)
+{
+    for (;;) {
+        int len = wcslen(pwzCmd);
+        if (len == 0) {
+            return 0;
+        }
+        if (wcseq(pwzCmd, pwzKnown) != 0) {
+            return 1;
+        }
+
+        pwzCmd += len + 1;
+    }
+}
+
+#if DO_ACPI
+#include "acpi/acpi.cpp"
+#endif
+
+static void CheckPci(const Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    ///////////////////////////////////////////////// Check for Compatibility.
+    //
+    if ((bi->PciBiosAX >> 8) != 0 || (bi->PciBiosEDX != 0x20494350)) {
+        Yellow();
+        printf("Hardware does not support PCI V2.x.\n");
+        printf("PCI V2.x: AX:%04x, BX:%04x, CX:%04x, EDX:%08x\n",
+               bi->PciBiosAX, bi->PciBiosBX, bi->PciBiosCX, bi->PciBiosEDX);
+        Halt();
+    }
+    if (!(bi->PciBiosAX & 0x01)) {
+        Yellow();
+        printf("Hardware does not support multiple PCI buses.\n");
+        printf("PCI V2.x: AX:%04x, BX:%04x, CX:%04x, EDX:%08x\n",
+               bi->PciBiosAX, bi->PciBiosBX, bi->PciBiosCX, bi->PciBiosEDX);
+        Halt();
+    }
+
+}
+
+static bool CheckSmapForRam(const Struct_Microsoft_Singularity_BootInfo *bi, UINT64 base, UINT64 size)
+{
+    Struct_Microsoft_Singularity_SMAPINFO *sm = (Struct_Microsoft_Singularity_SMAPINFO *)bi->SmapData32;
+    for (UINT i = 0; i < bi->SmapCount; i++) {
+        if (sm[i].type == 1 &&
+            sm[i].addr <= base &&
+            sm[i].addr + sm[i].size >= base + size) {
+
+            return true;
+        }
+    }
+    return false;
+}
+
+static void CheckSmap(const Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    /////////////////////////////////////////////////////// System Memory Map.
+    //
+    printf("        Base Address    Limit Address Type      \n");
+    printf("    ================ ================ ==========\n");
+
+    Struct_Microsoft_Singularity_SMAPINFO *sm = (Struct_Microsoft_Singularity_SMAPINFO *)bi->SmapData32;
+    for (UINT i = 0; i < bi->SmapCount; i++) {
+        printf("    %16lx", (UINT64)sm[i].addr);
+        printf(" %16lx", (UINT64)sm[i].addr + (UINT64)sm[i].size);
+        printf(" %d:%s\n",
+               sm[i].type,
+               SmapTypeToString((int)sm[i].type));
+    }
+    printf("\n");
+}
+
+static void DumpFeatures(UINT32 features)
+{
+    printf("      ");
+    if (features & 0x1) { printf("x87 "); }
+    if (features & 0x2) { printf("VME "); }
+    if (features & 0x4) { printf("DBG "); }
+    if (features & 0x8) { printf("PSE "); }
+    if (features & 0x10) { printf("TSC "); }
+    if (features & 0x20) { printf("MSR "); }
+    if (features & 0x40) { printf("PAE "); }
+    if (features & 0x80) { printf("MCE "); }
+    if (features & 0x100) { printf("CX8 "); }
+    if (features & 0x200) { printf("APIC "); }
+    if (features & 0x200) { printf("R0 "); }
+    if (features & 0x800) { printf("SEP "); }
+    if (features & 0x1000) { printf("MTRR "); }
+    if (features & 0x2000) { printf("PGE "); }
+    if (features & 0x4000) { printf("MCA "); }
+    if (features & 0x8000) { printf("CMOV "); }
+    printf("\n      ");
+    if (features & 0x10000) { printf("PAT "); }
+    if (features & 0x20000) { printf("PSE36 "); }
+    if (features & 0x40000) { printf("PSN "); }
+    if (features & 0x80000) { printf("CFLUSH "); }
+    if (features & 0x100000) { printf("R1 "); }
+    if (features & 0x200000) { printf("DS "); }
+    if (features & 0x400000) { printf("ACPI "); }
+    if (features & 0x800000) { printf("MMX "); }
+    if (features & 0x1000000) { printf("FXSR "); }
+    if (features & 0x2000000) { printf("SSE "); }
+    if (features & 0x4000000) { printf("SSE2 "); }
+    if (features & 0x8000000) { printf("SS "); }
+    if (features & 0x10000000) { printf("HTT "); }
+    if (features & 0x20000000) { printf("TM "); }
+    if (features & 0x40000000) { printf("R2 "); }
+    if (features & 0x80000000) { printf("PBE "); }
+    printf("\n");
+}
+
+static void CheckCpuid(const Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    /////////////////////////////////////////////////////////////////// CPUID.
+#if 1
+    {
+        UINT32 output[4];
+
+        CPUID(1, output);
+
+        UINT family = (output[0] & 0xf00) >> 8;
+        UINT model = (output[0] & 0x0f0) >> 4;
+        UINT step = (output[0] & 0x00f);
+        UINT brand = (output[1] & 0xff);
+
+        if (family == 0xf) {
+            family += (output[0] & 0xff00000) >> 24;
+        }
+        if (model == 0xf) {
+            model +=  (output[0] & 0xf0000) >> 16;
+        }
+
+        CPUID(0, output);
+        printf("CPUID: %c%c%c%c%c%c%c%c%c%c%c%c Family %d, Model %d, Step %d, Brand %d\n",
+               ((char *)output)[4],
+               ((char *)output)[5],
+               ((char *)output)[6],
+               ((char *)output)[7],
+               ((char *)output)[12],
+               ((char *)output)[13],
+               ((char *)output)[14],
+               ((char *)output)[15],
+               ((char *)output)[8],
+               ((char *)output)[9],
+               ((char *)output)[10],
+               ((char *)output)[11],
+               family, model, step, brand);
+
+        UINT32 max = output[0];
+        for (UINT32 i = 3; i <= max; i++) {
+            CPUID(i, output);
+            printf("    %08x: %08x %08x %08x %08x\n",
+                   i, output[0], output[1], output[2], output[3]);
+        }
+
+        CPUID(1, output);
+#if DEBUG
+        if ((output[1] & 0xff00) != 0) {
+            printf("      CFlush %d bytes\n", ((output[1] & 0xff00) >> 8) * 8);
+        }
+        if ((output[1] & 0xff0000) != 0) {
+            printf("      Hyperthreads: %d\n", (output[1] & 0xff0000) >> 16);
+        }
+        if ((output[1] & 0xff000000) != 0xff) {
+            printf("      Local APIC Id: %d\n", (output[1] & 0xff000000) >> 24);
+        }
+#endif
+
+        printf("    Features: ");
+        if (output[2] & 0x80) { printf("EST "); }
+        if (output[2] & 0x100) { printf("TM2 "); }
+        if (output[2] & 0x400) { printf("L1C "); }
+        printf("\n");
+        DumpFeatures(output[3]);
+
+#if DEBUG
+        printf("    Caches:\n");
+
+        CPUID(2, output);
+        for (int j = 0; j < 4; j++) {
+            if (output[j] & 0x80000000) {
+                output[j] = 0;
+            }
+        }
+        output[0] &= 0xffffff00;
+
+        UINT8 *pbCache = (UINT8*)output;
+
+        check(pbCache, 0x01, "ITLB: 4KB Pages, 4-way, 32 entries");
+        check(pbCache, 0x02, "ITLB: 4MB Pages, 4-way, 2 entries");
+        check(pbCache, 0x03, "DTLB: 4KB Pages, 4-way, 64 entries");
+        check(pbCache, 0x04, "DTLB: 4MB Pages, 4-way, 8 entries");
+        check(pbCache, 0x06, "L1-I: 8KB, 4-way, 32 byte line size");
+        check(pbCache, 0x08, "L1-I: 16KB, 4-way, 32 byte line size");
+        check(pbCache, 0x0A, "L1-D: 8KB, 2-way, 32 byte line size");
+        check(pbCache, 0x0C, "L1-D: 16KB, 4-way, 32 byte line size");
+        check(pbCache, 0x22, "L3  : 512KB, 4-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x23, "L3  : 1MB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x25, "L3  : 2MB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x29, "L3  : 4MB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x2C, "L1-D: 32KB, 8-way, 64 byte line size");
+        check(pbCache, 0x30, "L1-I: 32KB, 8-way, 64 byte line size");
+        check(pbCache, 0x40, "----: No L2 or, if processor contains a valid L2, no L3");
+        check(pbCache, 0x41, "L2  : 128KB, 4-way, 32 byte line size");
+        check(pbCache, 0x42, "L2  : 256KB, 4-way, 32 byte line size");
+        check(pbCache, 0x43, "L2  : 512KB, 4-way, 32 byte line size");
+        check(pbCache, 0x44, "L2  : 1MB, 4-way, 32 byte line size");
+        check(pbCache, 0x45, "L2  : 2MB, 4-way, 32 byte line size");
+        check(pbCache, 0x50, "ITLB: 4KB and 4MB pages, 64 entries");
+        check(pbCache, 0x51, "ITLB: 4KB and 4MB pages, 128 entries");
+        check(pbCache, 0x52, "ITLB: 4KB and 4MB pages, 256 entries");
+        check(pbCache, 0x5B, "DTLB: 4KB and 4MB pages, 64 entries");
+        check(pbCache, 0x5C, "DTLB: 4KB and 4MB pages, 128 entries");
+        check(pbCache, 0x5D, "DTLB: 4KB and 4MB pages, 256 entries");
+        check(pbCache, 0x60, "L1-D: 16KB, 8-way, 64 byte line size");
+        check(pbCache, 0x66, "L1-D: 8KB, 4-way, 64 byte line size");
+        check(pbCache, 0x67, "L1-D: 16KB, 4-way, 64 byte line size");
+        check(pbCache, 0x68, "L1-D: 32KB, 4-way, 64 byte line size");
+        check(pbCache, 0x70, "TC  : 12K-uop, 8-way");
+        check(pbCache, 0x71, "TC  : 16K-uop, 8-way");
+        check(pbCache, 0x72, "TC  : 32K-uop, 8-way");
+        check(pbCache, 0x78, "L2  : 1MB, 8-way, 64 byte line size");
+        check(pbCache, 0x79, "L2  : 128KB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x7A, "L2  : 256KB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x7B, "L2  : 512KB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x7C, "L2  : 1MB, 8-way, 64 byte line size, 128 byte sector size");
+        check(pbCache, 0x7D, "L2  : 2MB, 8-way, 64 byte line size");
+        check(pbCache, 0x7F, "L2  : 512KB, 2-way, 64 byte line size");
+        check(pbCache, 0x82, "L2  : 256KB, 8-way, 32 byte line size");
+        check(pbCache, 0x83, "L2  : 512KB, 8-way, 32 byte line size");
+        check(pbCache, 0x84, "L2  : 1MB, 8-way, 32 byte line size");
+        check(pbCache, 0x85, "L2  : 2MB, 8-way, 32 byte line size");
+        check(pbCache, 0x86, "L2  : 512KB, 4-way, 64 byte line size");
+        check(pbCache, 0x87, "L2  : 1MB, 8-way, 64 byte line size");
+        check(pbCache, 0xB0, "ITLB: 4KB Pages, 4-way, 128 entries");
+        check(pbCache, 0xB3, "DTLB: 4KB Pages, 4-way, 128 entries");
+        check(pbCache, 0xF0, "----: 64 byte prefetch");
+        check(pbCache, 0xF1, "----: 128 byte prefetch");
+
+        for (int j = 0; j < 16; j++) {
+            if (pbCache[j] != 0) {
+                printf("      Missed %02x\n", pbCache[j]);
+            }
+        }
+#endif
+
+        CPUID(0x80000000, output);
+        if ((output[0] & 0x80000000)) {
+            UINT32 max = output[0];
+#if DEBUG
+            printf("Max ext CPUID = %x\n", max);
+            for (UINT32 i = 0x80000005; i <= max; i++) {
+                CPUID(i, output);
+                printf("    %08x: %08x %08x %08x %08x\n",
+                       i, output[0], output[1], output[2], output[3]);
+            }
+#endif
+
+            CPUID(0x80000001, output);
+            if (output[3] != 0) {
+                printf("    AMD Features:\n");
+                printf("      ");
+                if (output[3] & 0x1) { printf("x87 "); }
+                if (output[3] & 0x2) { printf("VME "); }
+                if (output[3] & 0x4) { printf("DBG "); }
+                if (output[3] & 0x8) { printf("PSE "); }
+                if (output[3] & 0x10) { printf("TSC "); }
+                if (output[3] & 0x20) { printf("MSR "); }
+                if (output[3] & 0x40) { printf("PAE "); }
+                if (output[3] & 0x80) { printf("MCE "); }
+                if (output[3] & 0x100) { printf("CX8 "); }
+                if (output[3] & 0x200) { printf("APIC "); }
+                if (output[3] & 0x400) { printf("R0 "); }
+                if (output[3] & 0x800) { printf("FSEP "); }
+                if (output[3] & 0x1000) { printf("MTRR "); }
+                if (output[3] & 0x2000) { printf("PGE "); }
+                if (output[3] & 0x4000) { printf("MCA "); }
+                if (output[3] & 0x8000) { printf("CMOV "); }
+                printf("\n      ");
+                if (output[3] & 0x10000) { printf("PAT "); }
+                if (output[3] & 0x20000) { printf("PSE36 "); }
+                if (output[3] & 0x40000) { printf("R1 "); }
+                if (output[3] & 0x80000) { printf("R2 "); }
+                if (output[3] & 0x100000) { printf("NX "); }
+                if (output[3] & 0x200000) { printf("R3 "); }
+                if (output[3] & 0x400000) { printf("xMMX "); }
+                if (output[3] & 0x800000) { printf("MMX "); }
+                if (output[3] & 0x1000000) { printf("FXSR "); }
+                if (output[3] & 0x2000000) { printf("FFXSR "); }
+                if (output[3] & 0x4000000) { printf("R4 "); }
+                if (output[3] & 0x8000000) { printf("R5 "); }
+                if (output[3] & 0x10000000) { printf("R6 "); }
+                if (output[3] & 0x20000000) { printf("LM "); }
+                if (output[3] & 0x40000000) { printf("x3D "); }
+                if (output[3] & 0x80000000) { printf("3D "); }
+                printf("\n");
+            }
+
+            CHAR szBrand[64];
+            CPUID(0x80000002, (UINT32*)&szBrand[0]);
+            CPUID(0x80000003, (UINT32*)&szBrand[16]);
+            CPUID(0x80000004, (UINT32*)&szBrand[32]);
+            szBrand[48] = '\0';
+            CHAR *pszBrand = szBrand;
+            while (*pszBrand == ' ') {
+                pszBrand++;
+            }
+            printf("    Brand: %s\n", pszBrand);
+        }
+        printf("\n");
+    }
+#endif
+}
+
+static void CheckApic(const Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    ////////////////////////////////////////////////////// Local and I/O APIC.
+    //
+#if DEBUG
+    UINT32 apicid = 0;
+    UINT32 apicver = 0;
+
+    printf("    IO APIC:\n");
+    for (UINT32 base = 0xfec00000; base <= 0xfec0fc00; base += 0x400) {
+        __asm {
+            mov ebx, base;
+            mov eax, 0;
+            mov [ebx], eax;
+            mov eax, [ebx+0x10];
+            mov apicid, eax;
+
+            mov eax, 1;
+            mov [ebx], eax;
+            mov eax, [ebx+0x10];
+            mov apicver, eax;
+        }
+        if (apicid == ~0u && apicver == ~0u) {
+            continue;
+        }
+        printf("      %08x: %08x %08x\n", base, apicid, apicver);
+    }
+
+    printf("    Local APIC:\n");
+    for (UINT32 base = 0xfee00000; base <= 0xfee00000; base += 0x400) {
+        __asm {
+            mov ebx, base;
+            mov eax, [ebx+0x20];
+            mov apicid, eax;
+            mov eax, [ebx+0x30];
+            mov apicver, eax;
+        }
+        printf("      %08x: id=%08x ver=%08x\n", base, apicid, apicver);
+    }
+
+    printf("      MSR[0x%02x] = %016lx\n", 0x10, RDMSR(0x10));
+    //printf("      MSR[0x%02x] = %016lx\n", 0x17, RDMSR(0x17));
+    //printf("      MSR[0x%02x] = %016lx\n", 0x1b, RDMSR(0x1b));
+
+    printf("\n");
+#endif
+}
+
+struct ACPI_RSDP
+{
+    CHAR    Signature[8];                       // "RSD PTR "
+    UINT8   Checksum;
+    CHAR    OemId[6];
+    UINT8   Revision;
+    UINT32  RsdtAddress;
+    UINT32  RsdtLength;
+    UINT32  XsdtAddrLo;
+    UINT32  XsdtAddrHi;
+    UINT8   ExtendedChecksum;
+    UINT8   Reserved[3];
+};
+typedef ACPI_RSDP * PACPI_RSDP;
+
+int IsAcpiRsdp(PACPI_RSDP pScan)
+{
+    if (pScan->Signature[0] != 'R' || pScan->Signature[1] != 'S' ||
+        pScan->Signature[2] != 'D' || pScan->Signature[3] != ' ' ||
+        pScan->Signature[4] != 'P' || pScan->Signature[5] != 'T' ||
+        pScan->Signature[6] != 'R' || pScan->Signature[7] != ' ') {
+
+        return 0;
+    }
+    return Checksum((UINT8*)pScan, 20);
+}
+
+static void CheckAcpi(Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    /////////////////////////////////////////////////////////// Scan for ACPI.
+    //
+    PACPI_RSDP pAcpi = NULL;
+
+    for (UINT8 *pbScan = (UINT8*)0xe0000; pbScan < (UINT8*)0xfffff; pbScan += 0x10) {
+        PACPI_RSDP pScan = (PACPI_RSDP)pbScan;
+        if (IsAcpiRsdp(pScan)) {
+            pAcpi = pScan;
+            break;
+        }
+    }
+
+    if (pAcpi == NULL && bi->Ebda32 != NULL) {
+#if 0
+        printf("bi->Ebda32 = %08x\n", bi->Ebda32);
+        Dump((UINT8*)bi->Ebda32, 0x400);
+#endif
+
+        for (UINT8 *pbScan = (UINT8*)bi->Ebda32;
+             pbScan < (UINT8*)bi->Ebda32 + 0x400; pbScan += 0x10) {
+
+            PACPI_RSDP pScan = (PACPI_RSDP)pbScan;
+            if (IsAcpiRsdp(pScan)) {
+                pAcpi = pScan;
+                break;
+            }
+        }
+    }
+
+    bi->AcpiRoot32 = (UINT)pAcpi;
+
+#if DO_ACPI
+    if (pAcpi != NULL) {
+        printf("ACPI Information:\n");
+        Acpi(pAcpi);
+    }
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+struct MP_FLOAT
+{
+    UINT8       Signature[4];                          // "_MP_"
+    UINT32      AddrMpConfigTable32;  //canonical form
+    UINT8       Paragraphs;
+    UINT8       Version;
+    UINT8       Checksum;
+    UINT8       Features[5];
+};
+
+struct MP_FIXED
+{
+    UINT8       Signature[4];
+    UINT16      BaseTableSize;
+    UINT8       Version;
+    UINT8       Checksum;
+    UINT8       OemId[8];
+    UINT8       ProductId[12];
+    UINT32      AddrOemTablePointer; //canonical form
+    UINT16      OemTableSize;
+    UINT32      LocalAPIC;
+    UINT16      ExtendedTableSize;
+    UINT8       ExtendedTableChecksum;
+};
+
+struct MP_PROCESSOR
+{
+    UINT8       EntryType;  // == 0x00
+    UINT8       ApicId;
+    UINT8       ApicVersion;
+    UINT8       Flags;
+    UINT32      Signature;
+    UINT32      Features;
+    UINT32      Reserved0;
+    UINT32      Reserved1;
+};
+
+struct MP_BUS
+{
+    UINT8       EntryType;  // == 0x01
+    UINT8       BusId;
+    UINT8       BusType[6];
+};
+
+struct MP_IO_APIC
+{
+    UINT8       EntryType;  // == 0x02
+    UINT8       ApicId;
+    UINT8       ApicVersion;
+    UINT8       Flags;
+    UINT32      Address;
+};
+
+struct MP_IO_INTERRUPT
+{
+    UINT8       EntryType;  // == 0x03
+    UINT8       Type;
+    UINT16      Flags;
+    UINT8       SrcBusId;
+    UINT8       SrcBusIrq;
+    UINT8       DstApicId;
+    UINT8       DstApicIrq;
+};
+
+struct MP_LOCAL_INTERRUPT
+{
+    UINT8       EntryType;  // == 0x04
+    UINT8       Type;
+    UINT16      Flags;
+    UINT8       SrcBusId;
+    UINT8       SrcBusIrq;
+    UINT8       DstApicId;
+    UINT8       DstApicIrq;
+};
+
+struct MP_ADDRESS_SPACE_MAPPING
+{
+    UINT8       EntryType;  // == 0x80
+    UINT8       EntrySize;
+    UINT8       BusId;
+    UINT8       AddressType;
+    UINT64      AddressBase;
+    UINT64      AddressSize;
+};
+
+struct MP_BUS_HIERARCHY
+{
+    UINT8       EntryType;  // == 0x81
+    UINT8       EntrySize;
+    UINT8       BusId;
+    UINT8       BusInfo;
+    UINT8       ParentBusId;
+    UINT8       Reserved[3];
+};
+
+struct MP_ADDRESS_SPACE_MODIFIER
+{
+    UINT8       EntryType;  // == 0x82
+    UINT8       EntrySize;
+    UINT8       BusId;
+    UINT8       Predefined;
+    UINT32      RangeList;
+};
+
+int IsMpsFps(MP_FLOAT * pScan)
+{
+    if (pScan->Signature[0] != '_' || pScan->Signature[1] != 'M' ||
+        pScan->Signature[2] != 'P' || pScan->Signature[3] != '_') {
+
+        return 0;
+    }
+    return Checksum((UINT8*)pScan, pScan->Paragraphs * 0x10);
+}
+
+MP_FLOAT * ScanForMp(UINT8 * pbBase, UINT8 * pbLimit)
+{
+    for (; pbBase < pbLimit; pbBase += 0x10) {
+        MP_FLOAT * pScan = (MP_FLOAT *)pbBase;
+        if (IsMpsFps(pScan)) {
+            return pScan;
+        }
+    }
+    return NULL;
+}
+
+static void CheckMp(Struct_Microsoft_Singularity_BootInfo *bi)
+{
+    printf("MP Information:\n");
+
+    const UINT16 CMOS_SELECT        = 0x70;
+    const UINT16 CMOS_DATA          = 0x71;
+
+    IoSpaceWrite8(CMOS_SELECT, 0xf);
+    UINT8 boot = IoSpaceRead8(CMOS_DATA);
+#if DEBUG
+    printf("CMOS Boot type = %02x\n", boot);
+#endif
+
+    if ((bi->MpEnter32 & 0xfff00fff) != 0) {
+        printf("MpEnter is not valid for IPI Startup: %08x\n", bi->MpEnter32);
+        Halt();
+    }
+
+    //////////////////////////////////////////////////////////// Scan for MPS.
+    //
+    MP_FLOAT * pFloat = NULL;
+
+    if (pFloat == NULL && bi->Ebda32 != NULL) {
+        pFloat = ScanForMp((UINT8*)bi->Ebda32, (UINT8*)bi->Ebda32 + 0x400);
+    }
+    if (pFloat == NULL) {
+        pFloat = ScanForMp((UINT8*)0x9fc00, (UINT8*)0xa0000);
+    }
+    if (pFloat == NULL) {
+        pFloat = ScanForMp((UINT8*)0x7fc00, (UINT8*)0x80000);
+    }
+    if (pFloat == NULL) {
+        pFloat = ScanForMp((UINT8*)0xf0000, (UINT8*)0xfffff);
+    }
+    if (pFloat == NULL) {
+        return;
+    }
+
+    printf("  Found MPS Version 1.%d at %lp\n", pFloat->Version, pFloat);
+    if (pFloat->Version < 4) {
+        pFloat = NULL;
+        return;
+    }
+    bi->MpFloat32 = (UINT32) pFloat;
+
+#if DEBUG
+    printf("    MpConfigTable32=%x, Features=%02x%02x%02x%02x%02x\n",
+           pFloat->AddrMpConfigTable32,
+           pFloat->Features[0],
+           pFloat->Features[1],
+           pFloat->Features[2],
+           pFloat->Features[3],
+           pFloat->Features[4]);
+#endif
+
+    if (pFloat->AddrMpConfigTable32) {
+#if DEBUG
+        MP_FIXED * pFixed = (MP_FIXED *) pFloat->AddrMpConfigTable32;
+
+        printf("    %c%c%c%c len=%d ver=%d sum=%02x\n",
+               pFixed->Signature[0],
+               pFixed->Signature[1],
+               pFixed->Signature[2],
+               pFixed->Signature[3],
+               pFixed->BaseTableSize,
+               pFixed->Version,
+               pFixed->Checksum);
+        printf("    Oem=[%-8.8s] Product=[%-12.12s] table=%x size=%d\n",
+               pFixed->OemId,
+               pFixed->ProductId,
+               pFixed->AddrOemTablePointer,
+               pFixed->OemTableSize);
+        printf("    LocalAPIC=%08x ExtSize=%d ExtSum=%02x\n",
+               pFixed->LocalAPIC,
+               pFixed->ExtendedTableSize,
+               pFixed->ExtendedTableChecksum);
+
+        UINT8 *pbBegin = ((UINT8*)pFixed) + sizeof(*pFixed);
+        UINT8 *pbLimit = ((UINT8*)pFixed) + pFixed->BaseTableSize;
+
+        while (pbBegin < pbLimit) {
+            printf("    %4d: ", pbBegin - ((UINT8*)pFixed));
+
+            switch (pbBegin[0]) {
+              case 0:
+                  {
+                      MP_PROCESSOR *pProc = (MP_PROCESSOR *)pbBegin;
+
+                      printf("Proc Apic=%02x Ver=%02x Flags=%02x Sign=%08x Feat=%08x\n",
+                             pProc->ApicId,
+                             pProc->ApicVersion,
+                             pProc->Flags,
+                             pProc->Signature,
+                             pProc->Features);
+                      DumpFeatures(pProc->Features);
+
+                      pbBegin = (UINT8*)(pProc + 1);
+                  }
+                  break;
+
+              case 1:
+                  {
+                      MP_BUS *pBus = (MP_BUS *)pbBegin;
+
+                      printf("Bus  Id=%02x Type=[%-6.6s]\n",
+                             pBus->BusId,
+                             pBus->BusType);
+
+                      pbBegin = (UINT8*)(pBus + 1);
+                  }
+                  break;
+
+              case 2:
+                  {
+                      MP_IO_APIC *pApic = (MP_IO_APIC *)pbBegin;
+
+                      printf("Apic Apic=%02x Ver=%02x Flags=%02x Address=%08x\n",
+                             pApic->ApicId,
+                             pApic->ApicVersion,
+                             pApic->Flags,
+                             pApic->Address);
+
+                      pbBegin = (UINT8*)(pApic + 1);
+                  }
+                  break;
+
+              case 3:
+                  {
+                      MP_IO_INTERRUPT *pInterrupt = (MP_IO_INTERRUPT *)pbBegin;
+
+                      printf("I/O  Type=%02x Flags=%04x [Bus=%02x Irq=%02x] -> [Apic=%02x Irq=%02x]\n",
+                             pInterrupt->Type,
+                             pInterrupt->Flags,
+                             pInterrupt->SrcBusId,
+                             pInterrupt->SrcBusIrq,
+                             pInterrupt->DstApicId,
+                             pInterrupt->DstApicIrq);
+
+                      pbBegin = (UINT8*)(pInterrupt + 1);
+                  }
+                  break;
+
+              case 4:
+                  {
+                      MP_LOCAL_INTERRUPT *pInterrupt = (MP_LOCAL_INTERRUPT *)pbBegin;
+
+                      printf("Loc  Type=%02x Flags=%04x [Id=%02x Irq=%02x] -> [Id=%02x Irq=%02x]\n",
+                             pInterrupt->Type,
+                             pInterrupt->Flags,
+                             pInterrupt->SrcBusId,
+                             pInterrupt->SrcBusIrq,
+                             pInterrupt->DstApicId,
+                             pInterrupt->DstApicIrq);
+
+                      pbBegin = (UINT8*)(pInterrupt + 1);
+                  }
+                  break;
+
+              default:
+                printf("Unknown Configuration Type = %02x\n", pbBegin[0]);
+                pbBegin = pbLimit;
+                break;
+            }
+        }
+
+        pbBegin = ((UINT8*)pFixed) + pFixed->BaseTableSize;
+        pbLimit = pbBegin + pFixed->ExtendedTableSize;
+
+        while (pbBegin < pbLimit) {
+            printf("    %4d: ", pbBegin - ((UINT8*)pFixed));
+
+            switch (pbBegin[0]) {
+              case 0x80:
+                  {
+                      MP_ADDRESS_SPACE_MAPPING *pMap = (MP_ADDRESS_SPACE_MAPPING *)pbBegin;
+
+                      printf("Map  Bus=%02x Type=%02x Base=%08lx Size=%08lx\n",
+                             pMap->BusId,
+                             pMap->AddressType,
+                             pMap->AddressBase,
+                             pMap->AddressSize);
+                  }
+                  break;
+
+              case 0x81:
+                  {
+                      MP_BUS_HIERARCHY *pHier = (MP_BUS_HIERARCHY *)pbBegin;
+
+                      printf("Hier Bus=%02x Info=%02x ParentBusId=%02x\n",
+                             pHier->BusId,
+                             pHier->BusInfo,
+                             pHier->ParentBusId);
+                  }
+                  break;
+
+              case 0x82:
+                  {
+                      MP_ADDRESS_SPACE_MODIFIER *pMap = (MP_ADDRESS_SPACE_MODIFIER *)pbBegin;
+
+                      printf("Mod  Bus=%02x Prefined=%02x RangeList=%08x\n",
+                             pMap->BusId,
+                             pMap->Predefined,
+                             pMap->RangeList);
+                  }
+                  break;
+
+              default:
+                printf("Unknown Extended Type = %02x (len=%d bytes)\n", pbBegin[0], pbBegin[1]);
+                break;
+            }
+
+            pbBegin += pbBegin[1];
+        }
+#endif
+
+#if BOOT_START_MP
+        printf("   MP Init:\n");
+        volatile UINT32 * LocalApicIcrLo = (UINT32 *)(pFixed->LocalAPIC + 0x300);
+        volatile UINT32 * LocalApicIcrHi = (UINT32 *)(pFixed->LocalAPIC + 0x310);
+        volatile UINT32 * LocalApicEoi = (UINT32 *)(pFixed->LocalAPIC + 0x0b0);
+        volatile UINT32 * LocalApicEsr = (UINT32 *)(pFixed->LocalAPIC + 0x280);
+
+        const UINT32 AllExcludingSelf   = 0xc0000;
+        const UINT32 LevelAssert        = 0x04000;
+        const UINT32 SendPending        = 0x01000;
+        const UINT32 DeliveryStartup    = 0x00600;
+        const UINT32 DeliveryInit       = 0x00500;
+
+        printf("    Sending IPI Init.\n");
+        *LocalApicEsr = 0;
+        *LocalApicEsr = 0;
+        *LocalApicIcrLo = (AllExcludingSelf |
+                           LevelAssert |
+                           SendPending |
+                           DeliveryInit);
+
+        while (*LocalApicIcrLo & SendPending) {
+            __asm pause;
+
+            // Write tells APIC to update ESR.
+            *LocalApicEsr = 0;
+            if (*LocalApicEsr != 0) {
+                printf("      APIC Error: %08x\n", *LocalApicEsr);
+                break;
+            }
+        }
+
+        printf("    Sent IPI Init.\n");
+
+        for (int i = 0; i < 10000; i++) {
+        }
+
+        for (int i = 0; i < 2; i++) {
+            printf(    "Sending IPI Startup %d.\n", i);
+            *LocalApicEsr = 0;
+            *LocalApicEsr = 0;
+            *LocalApicIcrLo = (AllExcludingSelf |
+                               LevelAssert |
+                               SendPending |
+                               DeliveryStartup |
+                               (bi->MpEnter32 >> 12));
+
+            while (*LocalApicIcrLo & SendPending) {
+                __asm pause;
+
+                // Write tells APIC to update ESR.
+                *LocalApicEsr = 0;
+                if (*LocalApicEsr != 0) {
+                    printf("  APIC Error: %08x\n", *LocalApicEsr);
+                    break;
+                }
+            }
+            printf("    Sent IPI Startup.\n");
+
+            for (int i = 0; i < 10000; i++) {
+            }
+        }
+#endif // BOOT_START_MP
+    }
+    printf("\n");
+}
+
+static void CheckMinidump(Struct_Microsoft_Singularity_BootInfo *bi, uintptr *pEntry, uintptr *pStack)
+{
+    //////////////////////////////////////////////////////////// Vet Minidump.
+    //
+    UINT8* pbImage = (UINT8*)bi->DumpAddr32;
+    UINT32 cbImage = bi->DumpSize32;
+
+    UINT32 *plHeader = (UINT32*)pbImage;
+    UINT32 *plTrailer = NULL;
+
+#if DEBUG
+    printf("Minidump at %x\n", pbImage);
+#endif
+
+    if (plHeader[0] != MINIDUMP_SIGNATURE ||
+        plHeader[1] != MINIDUMP_VERSION) {
+
+        printf("Image is corrupt!\n");
+        printf("  Addr: %8x, Size: %8x\n", bi->DumpAddr32, bi->DumpSize32);
+        printf("  %08x != %08x, %08x != %08x\n",
+               MINIDUMP_SIGNATURE, plHeader[0],
+               MINIDUMP_VERSION, plHeader[1]);
+        Halt();
+    }
+
+    /////////////////////////////////////////////////////// Size the Minidump.
+    //
+    UINT32 Entry = 0;
+    UINT32 Stack = 0;
+    UINT32 Base = 0xffffffff;
+    UINT32 Limit = 0;
+    UINT32 cbSave = 0xfffffff;
+
+    PMINIDUMP_HEADER pHeader = (PMINIDUMP_HEADER)(pbImage + 0);
+    PMINIDUMP_DIRECTORY pDir
+        = (PMINIDUMP_DIRECTORY)(pbImage + pHeader->StreamDirectoryRva);
+
+#if DEBUG
+    printf("  Streams: %d\n", pHeader->NumberOfStreams);
+#endif
+    for (UINT i = 0; i < pHeader->NumberOfStreams; i++) {
+        switch (pDir[i].StreamType) {
+          case ThreadListStream:
+              {
+                  PMINIDUMP_THREAD_LIST pl =
+                      (PMINIDUMP_THREAD_LIST)(pbImage + pDir[i].Location.Rva);
+#if DEBUG
+                  printf("   Threads: %d\n", pl->NumberOfThreads);
+#endif
+                  for (UINT t = 0; t < pl->NumberOfThreads; t++) {
+                      PCONTEXT pContext = (PCONTEXT)(pbImage + pl->Threads[t].ThreadContext.Rva);
+                      Entry = pContext->Eip;
+                      Stack = pContext->Esp;
+#if DEBUG
+                  printf("       entry: %x, stack %x \n", Entry, Stack);
+#endif
+                  }
+              }
+              break;
+
+          case MemoryListStream:
+              {
+                  PMINIDUMP_MEMORY_LIST pl =
+                      (PMINIDUMP_MEMORY_LIST)(pbImage + pDir[i].Location.Rva);
+#if DEBUG
+                  printf("   Number of Memory Ranges: %d, pl =%lx \n", pl->NumberOfMemoryRanges);
+                  for (UINT t = 0; t < pl->NumberOfMemoryRanges; t++) {
+                          printf("    stream at %lx, size =%lx \n",
+                                 pl->MemoryRanges[t].StartOfMemoryRange,
+                                 pl->MemoryRanges[t].Memory.DataSize);
+                  }
+#endif
+
+                  for (UINT t = 0; t < pl->NumberOfMemoryRanges; t++) {
+                      if (cbSave > pl->MemoryRanges[t].Memory.Rva) {
+                          cbSave = pl->MemoryRanges[t].Memory.Rva;
+                      }
+
+                      UINT32 pbDst = (UINT32)pl->MemoryRanges[t].StartOfMemoryRange;
+                      UINT32 cbSrc = (UINT32)pl->MemoryRanges[t].Memory.DataSize;
+
+                      if (!CheckSmapForRam(bi,
+                                           pl->MemoryRanges[t].StartOfMemoryRange,
+                                           pl->MemoryRanges[t].Memory.DataSize)) {
+                          printf("No RAM available at %lx..%lx.\n",
+                                 pl->MemoryRanges[t].StartOfMemoryRange,
+                                 pl->MemoryRanges[t].StartOfMemoryRange +
+                                 pl->MemoryRanges[t].Memory.DataSize);
+                          Halt();
+                      }
+
+                      if (pbDst > 0x100000) {
+                          if (Base > pbDst) {
+                              Base = pbDst;
+                          }
+                          if (Limit < pbDst + cbSrc) {
+                              Limit = pbDst + cbSrc;
+                          }
+                      }
+                  }
+              }
+              break;
+
+          case 0xcafeface:
+            plTrailer = (UINT32 *)(pbImage + pDir[i].Location.Rva);
+            break;
+        }
+    }
+
+    /////////////////////////////////////////////////// Validate the minidump.
+
+    if (plTrailer == NULL || plTrailer[0] != 0xfeedbeef || plTrailer[1] != 0xcafeface) {
+        printf("Image is corrupt!\n");
+        printf("  Addr: %8x, Size: %8x\n", bi->DumpAddr32, bi->DumpSize32);
+        printf("  0xfeedbeef != 0x%08x, 0xcafeface != 0x%08x\n",
+               plTrailer[0], plTrailer[1]);
+        Halt();
+    }
+    else {
+        UINT32 *plPos = (UINT32*)pbImage;
+        UINT32 *plEnd = (UINT32*)(plTrailer + 4);
+        UINT32 sum = 0;
+        for (; plPos < plEnd;) {
+            sum += *plPos++;
+        }
+        if (sum != 0) {
+            printf("Image is corrupt!\n");
+            printf("  Addr: %8x, Size: %8x\n", bi->DumpAddr32, bi->DumpSize32);
+            printf("  Checksum: %08x\n", sum);
+            Halt();
+        }
+    }
+
+    ///////////////////////////////////////////////////// Expand the minidump.
+    //
+    for (UINT i = 0; i < pHeader->NumberOfStreams; i++) {
+        if (pDir[i].StreamType == MemoryListStream) {
+            PMINIDUMP_MEMORY_LIST pl =
+                (PMINIDUMP_MEMORY_LIST)(pbImage + pDir[i].Location.Rva);
+
+            for (UINT t = 0; t < pl->NumberOfMemoryRanges; t++) {
+                UINT8 *pbSrc = pbImage + pl->MemoryRanges[t].Memory.Rva;
+                UINT8 *pbDst = (UINT8*)pl->MemoryRanges[t].StartOfMemoryRange;
+                UINT32 cbSrc = pl->MemoryRanges[t].Memory.DataSize;
+
+                if (pbDst < (UINT8*)0x100000) {
+                    // Don't write into memory below 1MB.
+#if DEBUG
+                    printf("   %p..%p -> %p..%p Ignored.\n",
+                           pbSrc, pbSrc + cbSrc,
+                           pbDst, pbDst + cbSrc);
+#endif
+                }
+                else {
+#if DEBUG
+                    printf("   %p..%p -> %p..%p Copied\n",
+                           pbSrc, pbSrc + cbSrc,
+                           pbDst, pbDst + cbSrc);
+#endif
+                    CopyDown(pbDst, pbSrc, cbSrc);
+                }
+            }
+        }
+    }
+
+#if DEBUG
+    printf("   Minidump at %x..%x\n",
+           bi->DumpAddr32, bi->DumpAddr32 + bi->DumpSize32);
+    printf("   Kernel at %x..%x [Entry=%x, Stack=%x]\n", Base, Limit, Entry, Stack);
+#endif
+
+    *pEntry = Entry;
+    *pStack = Stack;
+
+    bi->DumpBase = Base;
+    bi->DumpLimit = Limit;
+    bi->DumpRemainder = (UINT32)(plTrailer + 4);
+}
+
+static uintptr g_Entry = 0;
+static uintptr g_Stack = 0;
+static Struct_Microsoft_Singularity_BootInfo *g_bi = 0;
+static Struct_Microsoft_Singularity_X86_IDTP g_idt;
+static Struct_Microsoft_Singularity_X86_IDTE g_idtEntries[32];
+
+extern "C" void __cdecl IdtHandler(UINT32 _cr2,
+                                   UINT32 _edi, UINT32 _esi, UINT32 _ebp, UINT32 _esp,
+                                   UINT32 _ebx, UINT32 _edx, UINT32 _ecx, UINT32 _eax,
+                                   UINT32 _num, UINT32 _err, UINT32 _eip, UINT32 _cs0,
+                                   UINT32 _efl)
+{
+    printf("\n");
+    printf("=-=-=-= X86 Exception 0x%x [%x] =-=-=-=\n", _num, &_efl);
+    printf("err=%08x cr2=%08x eip=%08x efl=%08x\n",
+           _err, _cr2, _eip, _efl);
+    printf("eax=%08x ebx=%08x ecx=%08x edx=%08x\n",
+           _eax, _ebx, _ecx, _edx);
+    printf("esi=%08x edi=%08x ebp=%08x esp=%08x\n",
+           _esi, _edi, _ebp, _esp);
+
+    printf("Stack:\n");
+    UINT32 * stack = ((UINT32*)_esp);
+    for (int i = 0; i < 10; i++) {
+        printf("    %08x: %08x\n", &stack[i], stack[i]);
+    }
+    printf("Call Stack:\n");
+    for (int i = 0; i < 10 && _ebp >= Struct_Microsoft_Singularity_BootInfo_PHYSICAL_DISABLED; i++) {
+        ULONG_PTR next = ((ULONG_PTR *)_ebp)[0];
+        ULONG_PTR code = ((ULONG_PTR *)_ebp)[1];
+
+        printf("    %p: %p %p\n", _ebp, next, code);
+        _ebp = next;
+    }
+
+    Halt();
+    for (;;);
+}
+
+static void IdtInit()
+{
+    Struct_Microsoft_Singularity_BootInfo *bi = g_bi;
+
+    UINT32 entry = (UINT32)bi->IdtEnter0;
+    UINT32 offset = ((UINT32)bi->IdtEnter1) - ((UINT32)bi->IdtEnter0);
+
+    for (int i = 0; i < arrayof(g_idtEntries); i++) {
+        g_idtEntries[i].offset_0_15 = (UINT16)entry;
+        g_idtEntries[i].selector =
+            (UINT16)(offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtPC) -
+                     offsetof(Struct_Microsoft_Singularity_CpuInfo,GdtNull));
+        g_idtEntries[i].access =
+            (Struct_Microsoft_Singularity_X86_IDTE_PRESENT |
+             Struct_Microsoft_Singularity_X86_IDTE_DPL_RING0 |
+             Struct_Microsoft_Singularity_X86_IDTE_INT_GATE);
+        g_idtEntries[i].offset_16_31 = (UINT16)(entry >> 16);
+
+        entry += offset;
+    }
+
+    *(void **)bi->IdtTarget = (void *)IdtHandler;
+
+    g_idt.limit = sizeof(g_idtEntries);
+    g_idt.addr = (UINT32)g_idtEntries;
+
+    __asm {
+        lidt g_idt.limit;
+    }
+
+}
+
+static void __declspec(naked) __fastcall SwitchStack
+(
+ void (__fastcall *pfNext)(void) /* ECX */,
+ UINT32 _esp /* EDX */
+)
+{
+    __asm {
+#if 0
+        push ebp;
+        mov ebp, esp;
+
+        mov ebx, 0xb8000;
+        mov eax, ecx;
+        call printdw;
+
+        mov eax, edx;
+        call printdw;
+
+        mov eax, ecx;
+        call printdw;
+#endif
+
+        mov esp, edx;
+        jmp ecx;
+
+#if 0
+        // Print a DWORD to the screen
+        // [in] ebx = address of screen
+        // [in] eax = dword to print
+        // [in] edi = trashed for temporary
+        //
+      printdw:
+        mov     edi, eax;
+        shr     edi, 28;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print28;
+        add     edi, 7;
+      print28:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 24;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print24;
+        add     edi, 7;
+      print24:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 20;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print20;
+        add     edi, 7;
+      print20:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 16;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print16;
+        add     edi, 7;
+      print16:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 12;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print12;
+        add     edi, 7;
+      print12:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 8;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print08;
+        add     edi, 7;
+      print08:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 4;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print04;
+        add     edi, 7;
+      print04:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 0;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print00;
+        add     edi, 7;
+      print00:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, 0x0f20;
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+        ret;
+#endif
+    }
+}
+
+static void __fastcall undump1(void);
+static void __fastcall undump2(void);
+
+static void __fastcall undump_mp(int cpu);
+
+extern "C" void undump(Struct_Microsoft_Singularity_BootInfo *bi, int cpu)
+{
+    if (cpu == 0)
+    {
+        g_bi = bi;
+        g_bi->BootCount = 0;
+        undump1();
+    }
+    else
+    {
+        g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_UndumpEntry;
+        undump_mp(cpu);
+    }
+}
+
+
+static void __fastcall undump1(void)
+{
+    BdInitDebugger(g_bi->DebugBasePort);
+    Normal();
+    Cls();
+
+    Struct_Microsoft_Singularity_BootInfo *bi = (Struct_Microsoft_Singularity_BootInfo *)g_bi;
+
+    printf("32-bit Singularity Undump [" __DATE__ " " __TIME__ "]\n");
+    printf("BootInfo: %08lx (0x%x/%d bytes)\n", bi, sizeof(*bi), sizeof(*bi));
+
+    if (sizeof(Struct_Microsoft_Singularity_BootInfo) != bi->RecSize) {
+        printf("sizeof(BootInfo)=%d, bi->RecSize=%ld\n",
+               sizeof(Struct_Microsoft_Singularity_BootInfo), bi->RecSize);
+        for(;;);
+    }
+
+    IdtInit();
+
+
+    CheckMinidump(bi, &g_Entry, &g_Stack);
+
+#if 0
+    UINT32 _esp;
+    __asm mov _esp, esp;
+    printf("    SwitchStack(bi=%x, next=%x, esp=%x) was esp=%x\n",
+           bi, undump2, g_Stack, _esp);
+
+    Dump(((UINT8*)undump2) - 8, 16);
+    Probe(((UINT8*)undump2) - 8, 16);
+    Dump(((UINT8*)g_Stack) - 8, 16);
+    Probe(((UINT8*)g_Stack) - 8, 16);
+#endif
+    printf("Switching stack to %x and calling  %x\n", g_Stack, undump2);
+    SwitchStack(undump2, g_Stack);   // Transfers execution to undump2();
+}
+
+static void __fastcall undump2(void)
+{
+#if 0
+    __asm {
+        mov eax, esp;
+        call printdw;
+
+        int 3;
+
+      again: jmp again;
+        jmp ecx;
+
+        // Print a DWORD to the screen
+        // [in] ebx = address of screen
+        // [in] eax = dword to print
+        // [in] edi = trashed for temporary
+        //
+      printdw:
+        mov     edi, eax;
+        shr     edi, 28;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print28;
+        add     edi, 7;
+      print28:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 24;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print24;
+        add     edi, 7;
+      print24:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 20;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print20;
+        add     edi, 7;
+      print20:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 16;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print16;
+        add     edi, 7;
+      print16:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 12;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print12;
+        add     edi, 7;
+      print12:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 8;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print08;
+        add     edi, 7;
+      print08:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 4;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print04;
+        add     edi, 7;
+      print04:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, eax;
+        shr     edi, 0;
+        and     edi, 0xf;
+        add     edi, 0x0f30;
+        cmp     edi, 0x0f3a;
+        jl      print00;
+        add     edi, 7;
+      print00:
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+
+        mov     edi, 0x0f20;
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+        mov     [ebx+0], edi;
+        add     ebx, 2;
+        ret;
+    }
+#endif
+
+    Struct_Microsoft_Singularity_BootInfo *bi = g_bi;
+    void (__cdecl * pfHal)(const Struct_Microsoft_Singularity_BootInfo *, int)
+        = (void (__cdecl *)(const Struct_Microsoft_Singularity_BootInfo *, int))g_Entry;
+
+#if DEBUG
+    printf("Probing basic hardware.\n");
+#endif
+
+    CheckPci(bi);
+    CheckCpuid(bi);
+    CheckApic(bi);
+    CheckAcpi(bi);
+    CheckMp(bi);
+    FpuInit();
+    printf("Starting Singularity Kernel (at 0x%x)\n", pfHal);
+
+    pfHal(bi, 0);
+
+    bi->BootCount++;
+
+    SwitchStack(undump1, Struct_Microsoft_Singularity_BootInfo_REAL_STACK);
+    // Transfers execution to undump1();
+}
+
+static void __fastcall undump_mp(int cpu)
+{
+    IdtInit();
+    FpuInit();
+
+    g_bi->MpStatus32 = Struct_Microsoft_Singularity_MpBootStatus_HalEntry;
+
+    void (__cdecl * pfHal)(const Struct_Microsoft_Singularity_BootInfo *, int)
+        = (void (__cdecl *)(const Struct_Microsoft_Singularity_BootInfo *, int))g_Entry;
+
+    pfHal(g_bi, cpu);
+}
diff --git a/base/boot/Singldr/usbdevice.cpp b/base/boot/Singldr/usbdevice.cpp
new file mode 100644
index 0000000..a9bbf35
--- /dev/null
+++ b/base/boot/Singldr/usbdevice.cpp
@@ -0,0 +1,428 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  usbdevice.cpp - Access Fat16 USB volumes from SINGLDR
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+#include "usbdevice.h"
+#include "fnames.h"
+
+#pragma warning(disable: 4505) // Compiler generated constructor unreferenced
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private functions for reading the USB disk
+
+// read the FAT to find the cluster that follows currentCluster
+uint32 UsbDevice::CalcNextCluster(uint32 currentCluster) __far
+{
+    uint32 SectorToRead, OffsetInSector;
+    uint32 result32;
+    uint16 result16;
+
+    OffsetInSector = (currentCluster*FatOffsetMultiplier) % (BytesPerSec);
+    SectorToRead = ((currentCluster*FatOffsetMultiplier) / (BytesPerSec)) + (RsvdSecs);
+
+    uint8 __far * buffer = FatBuffer;
+
+    BiosDiskReadCHS(buffer, SectorToRead, BootDrive, 1, SecsPerTrack, NumHeads);
+
+    result16 = *((uint16 __far *)(buffer+OffsetInSector));
+    result32 = result16; // implicit cast
+    return result32;
+}
+
+// read cluster # ClusterNum into a (pre-allocated) buffer
+// due to CHS limitations, we have to read it one sector at a time...
+void UsbDevice::ReadCluster(uint32 ClusterNum, uint8 __far * buffer) __far
+{
+    uint8 __far * buff = buffer;
+    int sectorcounter;
+
+    // figure out the first sector:
+    uint32 startingSector = ((ClusterNum - 2) * (SecsPerClus)) + (FirstDataSec);
+
+    for (sectorcounter = 0; sectorcounter < SecsPerClus; sectorcounter++) {
+        // read one sector
+        BiosDiskReadCHS(buff, startingSector, BootDrive, 1, SecsPerTrack, NumHeads);
+
+        // advance to next sector
+        startingSector++;
+
+        // advance the buffer
+        buff += BytesPerSec;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Private Method for matching filenames
+//   (uses public funcs from FatDevice code)
+
+// Search from the first cluster of a directory entry to find the Fat
+// encoding of a filename.  We accomplish this through a FSM.
+// Fat16RootDir is a special flag  the root directory is not a cluster chain,
+// but all other directories are.
+int UsbDevice::DirLookup(LPCHAR filename,
+                         uint8  /* len */,
+                         FilePtr directory,
+                         FilePtr file,
+                         int Fat16RootDir) __far
+{
+    // points into the data we've loaded from disk:
+    uint8 __far * buffer;
+
+    // we will use the generic term "block" to refer to a readable entity
+    // on the disk, since the Fat16 root dir is in sectors while the rest
+    // of Fat is in clusters
+    uint16 totalBlocks, blockCounter = 0;
+    uint16 nextBlock, entriesPerBlock, entryCounter = 0;
+
+    if (Fat16RootDir) {
+        totalBlocks = RootDirSecs;
+        entriesPerBlock = BytesPerSec / 32;
+        nextBlock = (uint16)RootStartSec;
+    }
+    else {
+        totalBlocks = 2;  // value doesn't matter; make sure totalBlocks>blockCounter
+        entriesPerBlock = (uint16)DirEntriesPerClus;
+        nextBlock = (uint16)directory->FirstBlock;
+    }
+
+    // "segment" will refer to the portion of the LongFileName
+    // about which we care, since it will be in 13-char chunks
+    uint8 totalSegs, segCounter, segsMatched = 0;
+    totalSegs = FullFNameLength(filename);
+    totalSegs = (uint8) ((totalSegs + 12) / 13);
+    segCounter = totalSegs;
+
+    // long file name verification requires a checksum, as well as matching a
+    // special "entry signature" in byte[0] of the directory entry
+    uint8 checksum = 0, signature = 0;
+
+    // the primary loop fetches data to check
+    while (blockCounter < totalBlocks) {
+        // read some data and set a counter for when we need more data
+        if (Fat16RootDir) {
+            BiosDiskReadCHS(FatBuffer, nextBlock, BootDrive, 1, SecsPerTrack, NumHeads);
+            entryCounter = BytesPerSec / 32;
+        }
+        else {
+            ReadCluster(nextBlock, FatBuffer);
+            entryCounter = (uint16)DirEntriesPerClus;
+        }
+        buffer = FatBuffer;
+
+        // the inner loop checks entries
+        while (entryCounter>0) {
+            // failure condition #1:  if the first bit is zero,
+            // there are no more directory entries.
+            if (buffer[0] == 0) {
+                return -1;
+            }
+
+            // success condition #1:  do we match on 8.3?
+            // success condition #2:  if segCounter == 0, does checksum match?
+            if ((FatShortNameMatch(buffer, filename) == 1) ||
+                (segCounter == 0 && FatChecksum(buffer) == checksum))
+            {
+                file->FirstBlock = (*((uint16 __far *)(buffer+20))<<16) +
+                                   *((uint16 __far *)(buffer+26));
+                file->Size = *((uint32 __far *)(buffer+28));
+                return 0;
+            }
+
+            // progress condition: do we match on the current segment of
+            // long file name?
+            // first calc checksum and the signature
+            if (segCounter == totalSegs) {
+                signature = (uint8) (segCounter | 0x40);
+                checksum = buffer[13];
+            }
+            else {
+                signature = segCounter;
+            }
+            // now do the check
+            if (signature == FatLongNamePartialMatch(buffer, filename, signature, checksum)) {
+                // advance to next directory entry and earlier segment in the filename
+                segCounter--;
+                buffer += 32;
+                entryCounter--;
+            }
+            else {
+                // if we were checking the first LFN entry then it's time
+                // to advance the counter
+                if (segCounter == totalSegs) {
+                    buffer += 32;
+                    entryCounter--;
+                }
+                else {
+                    // otherwise this might just be the start of
+                    // the correct entry, so don't advance the counter,
+                    // just reset to the first segment of the filename
+                    segCounter = totalSegs;
+                }
+            }
+        }
+        // calculate next data block
+        if (Fat16RootDir == 1) {
+            nextBlock++;
+            blockCounter++;
+        }
+        else {
+            nextBlock = (uint16) CalcNextCluster(nextBlock);
+            if (nextBlock >= (EndOfClusterMarker)) {
+                blockCounter = 2;
+            }
+        }
+    }
+    return -1;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Public Functions
+
+int UsbDevice::OpenDevice() __far
+{
+    int entrycounter = 4;   // up to 4 entries in partition table
+
+    // allocate memory for reading a sector (assume 512-byte sector size)
+    BootSectorBuffer = (uint8 __far *) alloc(512, 0);
+
+    // Read the BootSector
+    // we are in a bind here: we don't know the SecsPerTrack or the NumHeads
+    // but we need them to do the read!
+    BiosDiskReadCHS(BootSectorBuffer, 0, BootDrive, 1, 1, 1);
+
+    // temp to make using far pointers easier
+    uint8 __far * buffer = BootSectorBuffer;
+
+    // read data that should always be in the same place, no matter what
+    BytesPerSec = *((uint16 __far *)(buffer+11));
+    SecsPerClus = buffer[13];
+    SecsPerTrack = *((uint16 __far *)(buffer+24));
+    NumHeads = *((uint16 __far *)(buffer+26));
+    RsvdSecs = *((uint16 __far *)(buffer+14));
+    NumFats = buffer[16];
+    RootDirEntries = *((uint16 __far *)(buffer+17));
+    HiddenSecs = *((uint32 __far *)(buffer+28));
+
+    // "compute" the NumFatSecs and TotalSecs fields
+    // (i.e. read one value, if it is zero, read another)
+    uint16 tmp16;
+    tmp16 = *((uint16 __far *)(buffer+19));
+    if (tmp16 == 0) {
+        TotalSecs = *((uint32 __far *)(buffer+32));
+    }
+    else {
+        TotalSecs = tmp16;
+    }
+
+    tmp16 = *((uint16 __far *)(buffer+22));
+    if (tmp16 == 0) {
+        NumFatSecs = *((uint32 __far *)(buffer+36));
+    }
+    else {
+        NumFatSecs = tmp16;
+    }
+
+    // now we may compute RootDirSectors =
+    // ((BPB_RootEntCnt*32) + (BPB_BytsPerSec-1))/BPB_BytesPerSec
+    RootDirSecs = ((RootDirEntries*32) + (BytesPerSec-1))/BytesPerSec;
+
+    // Next compute the total data sectors in the volume:
+    TotalDataSecs = TotalSecs - (RsvdSecs + (NumFats*NumFatSecs) + RootDirSecs);
+
+    // Finally, compute the # of clusters in the volume:
+    ClusterCount = TotalDataSecs / SecsPerClus;
+
+    // Do the verification:
+    if (!(ClusterCount >= 4085 && ClusterCount<65525)) {
+        printf("USB: File System Type is not supported\n");
+        return -1; // the partition table did not match the boot sector
+                   // we can't trust this filesystem.
+    }
+    FatType = 16;
+
+    // now we can set fields that are FAT-type specific:
+    EndOfClusterMarker = 0xFFF8;
+    BadClusterMarker = 0xFFF7;
+    FatOffsetMultiplier = 2;
+    RootStartSec = (RsvdSecs + (NumFats*NumFatSecs));
+
+    // final computations:
+    FirstDataSec = (NumFats*NumFatSecs) + RsvdSecs + RootDirSecs;
+    BytesPerClus = SecsPerClus * BytesPerSec;
+    DirEntriesPerClus = BytesPerClus/32;
+
+    // allocate data for remaining fs buffers:
+    FatBuffer = (uint8 __far *) alloc((uint16)BytesPerClus, 0); // exactly the size of a cluster
+    FileBuffer = (uint8 __far *) alloc(0x7FFF, 0);    // 32KB
+
+    // display results
+#if 0
+    printf("\nUsb Configuration\n");
+    printf("------------------------------\n");
+    printf("Boot Drive = %2xh\n", BootDrive);
+    printf("Bytes/Sector = %4xh\n", BytesPerSec);
+    printf("\nFileSystem Configuration\n");
+    printf("------------------------------\n");
+    printf("Fat Type = FAT%d\n", FatType);
+    printf("Sectors/Cluster  = %2xh\n", SecsPerClus);
+    printf("Reserved Sectors = %4xh\n", RsvdSecs);
+    printf("Number of Fats = %2xh\n", NumFats);
+    printf("Hidden Sectors = %8lxh\n", HiddenSecs);
+    printf("Sectors per Fat = %8lxh\n", NumFatSecs);
+    printf("First Data Sector in Partition = %8lxh\n", FirstDataSec);
+    printf("Bytes/Cluster = %8lxh\n", BytesPerClus);
+    printf("Dir Entries/Cluster = %8lxh\n", DirEntriesPerClus);
+#endif
+
+    return 0;
+}
+
+int UsbDevice::CloseDevice() __far
+{
+    return 0;
+}
+
+int UsbDevice::GetFileProperties(LPCHAR filename,
+                                 FilePtr file,
+                                 FilePtr directory) __far
+{
+    LPCHAR fname = filename;
+    uint8 len;
+    int result;
+    char c;
+    int isRootDir = 1; // the Fat16 Root Directory is special.
+                       // Flag the first Fat16 read (but not subsequent reads)
+
+    // we'll continually recycle the File and Directory structs
+    file->Size = 0;
+    file->FirstBlock = 0;
+
+    // traverse through the filename, identifying tokens and looking them
+    // up in the current context
+    bool done = 0;
+    while (!done) {
+        // consume the leading '/'
+        while (fname[0] == '/') {
+            fname++;
+        }
+
+        // failure condition:  whitespace
+        if (IsEndToken(fname[0])) {
+            printf("USB: Invalid filename: ");
+            PutFName(filename);
+            printf("\n");
+            return -1;
+        }
+
+        // find the next separator in the filename ('/' or whitespace),
+        // store it, and replace it with 0
+        len = ShortFNameLength(fname);
+        c = fname[len];
+        fname[len] = 0;
+
+        // look it up and put the results into File
+        result = DirLookup(fname, len, directory, file, isRootDir);
+
+        // undo the change we made to the filename:
+        fname[len] = c;
+
+        // now shut off the isRootDir flag for subsequent directory scans
+        isRootDir = 0;
+        if (result == -1) {
+            printf("USB: File not found: ");
+            PutFName(filename);
+            printf("\n");
+            return -1;
+        }
+
+        // check loop termination condition
+        if (c != '/') {
+            done = 1;
+        }
+        else {
+            fname += len;
+            // transfer results from File into Directory
+            directory->FirstBlock = file->FirstBlock;
+            directory->Size = file->Size;
+            file->Size = 0;
+            file->FirstBlock = 0;
+        }
+    }
+    return 0;
+}
+
+INT16 UsbDevice::ReadFileLow(LPCHAR /* filename */,
+                             FilePtr file,
+                             uint8 __far * buffer) __far
+{
+    uint32 bytesread = 0;
+    uint8 __far * destination = buffer;
+    uint32 currentcluster = file->FirstBlock;
+
+    while (bytesread < file->Size) {
+        // read the current cluster
+        if (currentcluster == BadClusterMarker) {
+            printf("USB: Bad Cluster encountered\n");
+            return -1;
+        }
+        ReadCluster(currentcluster, destination);
+        currentcluster = CalcNextCluster(currentcluster);
+        bytesread += BytesPerClus;
+        destination = (uint8 __far *) _MK_FP(_FP_SEG(destination), (_FP_OFF(destination)+BytesPerClus));
+    }
+    return 0;
+}
+
+uint32 UsbDevice::ReadFileHigh(
+                               LPCHAR /* filename */,
+                               FilePtr file,
+                               uint32 destinationAddress,
+                               uint32 /* cbDestinationAddress */
+                              ) __far
+{
+    uint32 bytesread = 0;
+    uint32 nextdestination = destinationAddress;
+    uint32 currentcluster = file->FirstBlock;
+    uint32 sector;
+
+    uint32 bufferaddress = PointerToUint32(FileBuffer);
+
+    while (bytesread < file->Size) {
+        // ensure cluster is valid
+        if (currentcluster == BadClusterMarker) {
+            printf("USB: Bad Cluster encountered\n");
+            return bytesread;
+        }
+
+        // calc true sector for this cluster
+        sector = ((currentcluster-2) * SecsPerClus)+FirstDataSec;
+
+        // read one cluster
+        BiosDiskReadCHS(FileBuffer, sector, BootDrive, SecsPerClus, SecsPerTrack, NumHeads);
+
+        // move the data into extended memory
+        PModeTransfer(bufferaddress, nextdestination, BytesPerClus);
+
+        // get next cluster number
+        currentcluster = CalcNextCluster(currentcluster);
+
+        // update the count of bytes read
+        bytesread += BytesPerClus;
+
+        // and update the destination address
+        nextdestination += BytesPerClus;
+    }
+
+    // since we read full sectors at the bios level, we should
+    // trim our count back down a bit here
+    if (bytesread>file->Size) {
+        bytesread = file->Size;
+    }
+    return bytesread;
+}
diff --git a/base/boot/Singldr/usbdevice.h b/base/boot/Singldr/usbdevice.h
new file mode 100644
index 0000000..3ed1c21
--- /dev/null
+++ b/base/boot/Singldr/usbdevice.h
@@ -0,0 +1,123 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  usbdevice.h - implementation of BootDevice class for Usb Fat16 volumes
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+// NB - this is very similar to the Fat code (it started with copy/paste)
+//      However, since Fat32 and Partitions are completely unsupported,
+//      and since Int13 extensions are not supported, this differs enough
+//      to warrant its own implementation, even if the two implementations
+//      are quite similar.
+
+#ifndef __USBDEVICE_H__
+#define __USBDEVICE_H__
+
+#include "singldr.h"
+#include "bootdevice.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Linked-in Functions (not declared in any headers)
+
+// from singldr0.asm
+extern "C" uint16 __cdecl BiosDiskReadCHS(uint8 __far * addr, uint32 diskblock, uint16 driveid, uint16 sectors, uint16 secpertrack, uint16 numheads);
+extern "C" uint16 __cdecl PModeTransfer(uint32 StartAddress, uint32 DestinationAddress, uint32 bytes);
+
+// from fatdevice.cpp
+int FatShortNameMatch(uint8 __far * buffer, LPCHAR filename);
+int FatLongNamePartialMatch(uint8 __far * buffer, LPCHAR filename, uint8 signature, uint8 checksum);
+uint8 FatChecksum(uint8 __far * buffer);
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Declaration for class UsbDevice
+
+#pragma pack(4)
+struct __near UsbDevice : BootDevice
+{
+private:
+    // disk characteristics
+    uint8   BootDrive;
+
+    // Fat characteristics (read from boot sector)
+    uint16  BytesPerSec;
+    uint8   SecsPerClus;
+    uint16  SecsPerTrack;
+    uint16  NumHeads;
+    uint16  RsvdSecs;
+    uint8   NumFats;
+    uint16  RootDirEntries;
+    uint32  HiddenSecs;
+    uint32  TotalSecs;
+    uint32  NumFatSecs;
+
+    // Fat characteristics (computed)
+    uint16  RootDirSecs;
+    uint32  TotalDataSecs;
+    uint32  ClusterCount;
+    uint8   FatType;
+    uint32  RootStartSec;
+    uint32  FirstDataSec;
+    uint32  BytesPerClus;
+    uint32  DirEntriesPerClus;
+    uint32  EndOfClusterMarker;
+    uint32  BadClusterMarker;
+    uint8   FatOffsetMultiplier;
+
+    // data buffers -- these are reused frequently.  Be careful
+    //                 about what you assume is in them.
+    uint8 __far * BootSectorBuffer;
+    uint8 __far * FatBuffer;
+    uint8 __far * FileBuffer;
+
+    // Search the Fat for the cluster that follows the current one
+    uint32 __near CalcNextCluster(uint32 currentCluster) __far;
+
+    // read a cluster into a buffer
+    void __near ReadCluster(uint32 ClusterNum, uint8 __far * buffer) __far;
+
+    // Directory Lookup
+    int __near DirLookup(LPCHAR filename,
+                         uint8 len,
+                         FilePtr Directory,
+                         FilePtr File,
+                         int Fat16RootDir) __far;
+
+public:
+    // constructor -- Hack alert - the complier claims that:
+    //   "2 overloads have similar conversions" when the second
+    // parameter isn't given.
+    UsbDevice(uint8 driveId, uint8 /* nullParam */) __far{
+
+        // set private fields based on params
+        this->BootDrive = driveId;
+
+        // since this is global, define it as part of constructing the object
+        // for maximum compatibility, we just allocate it and leave it
+        // null (alloc zeros it)
+        this->CmdLine = (uint16 __far *)alloc(2048, 2);
+    }
+
+    // implement the virtual functions from the base class
+    int __near OpenDevice() __far;
+
+    int __near CloseDevice() __far;
+
+    int __near GetFileProperties(LPCHAR  filename,
+                                 FilePtr file,
+                                 FilePtr directory) __far;
+
+    INT16 __near ReadFileLow(LPCHAR        filename,
+                             FilePtr       file,
+                             uint8 __far * buffer) __far;
+
+    UINT32 __near ReadFileHigh(LPCHAR  filename,
+                               FilePtr file,
+                               uint32  buffer,
+                               uint32  cbBuffer) __far;
+};
+
+#pragma pack()
+#endif
diff --git a/base/boot/empty.iso b/base/boot/empty.iso
new file mode 100644
index 0000000..3f87c45
Binary files /dev/null and b/base/boot/empty.iso differ
diff --git a/base/boot/include/Minidump.h b/base/boot/include/Minidump.h
new file mode 100644
index 0000000..e28a55e
--- /dev/null
+++ b/base/boot/include/Minidump.h
@@ -0,0 +1,592 @@
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    minidump.x
+
+Abstract:
+
+    Public header file for minidumps.
+
+
+    Matthew D Hendel (math) 28-Apr-1999
+
+Revision History:
+
+--*/
+
+// HEXTRACT: hide_line begin_dbghelp begin_imagehlp
+
+#pragma pack(push,4)
+
+#if defined(_MSC_VER)
+#if _MSC_VER >= 800
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4200)    /* Zero length array */
+#pragma warning(disable:4201)    /* Nameless struct/union */
+#endif
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+#define MINIDUMP_SIGNATURE ('PMDM')
+#define MINIDUMP_VERSION   (42899)
+typedef UINT32 RVA;
+typedef UINT64 RVA64;
+
+typedef struct _MINIDUMP_LOCATION_DESCRIPTOR {
+    UINT32 DataSize;
+    RVA Rva;
+} MINIDUMP_LOCATION_DESCRIPTOR;
+
+typedef struct _MINIDUMP_LOCATION_DESCRIPTOR64 {
+    UINT64 DataSize;
+    RVA64 Rva;
+} MINIDUMP_LOCATION_DESCRIPTOR64;
+
+
+typedef struct _MINIDUMP_MEMORY_DESCRIPTOR {
+    UINT64 StartOfMemoryRange;
+    MINIDUMP_LOCATION_DESCRIPTOR Memory;
+} MINIDUMP_MEMORY_DESCRIPTOR, *PMINIDUMP_MEMORY_DESCRIPTOR;
+
+// DESCRIPTOR64 is used for full-memory minidumps where
+// all of the raw memory is laid out sequentially at the
+// end of the dump.  There is no need for individual RVAs
+// as the RVA is the base RVA plus the sum of the preceding
+// data blocks.
+typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 {
+    UINT64 StartOfMemoryRange;
+    UINT64 DataSize;
+} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64;
+
+
+typedef struct _MINIDUMP_HEADER {
+    UINT32 Signature;
+    UINT32 Version;
+    UINT32 NumberOfStreams;
+    RVA StreamDirectoryRva;
+    UINT32 CheckSum;
+    union {
+        UINT32 Reserved;
+        UINT32 TimeDateStamp;
+    };
+    UINT64 Flags;
+} MINIDUMP_HEADER, *PMINIDUMP_HEADER;
+
+//
+// The MINIDUMP_HEADER field StreamDirectoryRva points to
+// an array of MINIDUMP_DIRECTORY structures.
+//
+
+typedef struct _MINIDUMP_DIRECTORY {
+    UINT32 StreamType;
+    MINIDUMP_LOCATION_DESCRIPTOR Location;
+} MINIDUMP_DIRECTORY, *PMINIDUMP_DIRECTORY;
+
+
+typedef struct _MINIDUMP_STRING {
+    UINT32 Length;         // Length in bytes of the string
+    WCHAR   Buffer [0];     // Variable size buffer
+} MINIDUMP_STRING, *PMINIDUMP_STRING;
+
+
+
+//
+// The MINIDUMP_DIRECTORY field StreamType may be one of the following types.
+// Types will be added in the future, so if a program reading the minidump
+// header encounters a stream type it does not understand it should ignore
+// the data altogether. Any tag above LastReservedStream will not be used by
+// the system and is reserved for program-specific information.
+//
+
+typedef enum _MINIDUMP_STREAM_TYPE {
+
+    UnusedStream                = 0,
+    ReservedStream0             = 1,
+    ReservedStream1             = 2,
+    ThreadListStream            = 3,
+    ModuleListStream            = 4,
+    MemoryListStream            = 5,
+    ExceptionStream             = 6,
+    SystemInfoStream            = 7,
+    ThreadExListStream          = 8,
+    Memory64ListStream          = 9,
+    CommentStreamA              = 10,
+    CommentStreamW              = 11,
+    HandleDataStream            = 12,
+    FunctionTableStream         = 13,
+    UnloadedModuleListStream    = 14,
+    MiscInfoStream              = 15,
+
+    LastReservedStream          = 0xffff
+
+} MINIDUMP_STREAM_TYPE;
+
+
+//
+// The minidump system information contains processor and
+// Operating System specific information.
+//
+
+//
+// CPU information is obtained from one of two places.
+//
+//  1) On x86 computers, CPU_INFORMATION is obtained from the CPUID
+//     instruction. You must use the X86 portion of the union for X86
+//     computers.
+//
+//  2) On non-x86 architectures, CPU_INFORMATION is obtained by calling
+//     IsProcessorFeatureSupported().
+//
+
+typedef union _CPU_INFORMATION {
+
+    //
+    // X86 platforms use CPUID function to obtain processor information.
+    //
+
+    struct {
+
+        //
+        // CPUID Subfunction 0, register EAX (VendorId [0]),
+        // EBX (VendorId [1]) and ECX (VendorId [2]).
+        //
+
+        UINT32 VendorId [ 3 ];
+
+        //
+        // CPUID Subfunction 1, register EAX
+        //
+
+        UINT32 VersionInformation;
+
+        //
+        // CPUID Subfunction 1, register EDX
+        //
+
+        UINT32 FeatureInformation;
+
+
+        //
+        // CPUID, Subfunction 80000001, register EBX. This will only
+        // be obtained if the vendor id is "AuthenticAMD".
+        //
+
+        UINT32 AMDExtendedCpuFeatures;
+
+    } X86CpuInfo;
+
+    //
+    // Non-x86 platforms use processor feature flags.
+    //
+
+    struct {
+
+        UINT64 ProcessorFeatures [ 2 ];
+
+    } OtherCpuInfo;
+
+} CPU_INFORMATION, *PCPU_INFORMATION;
+
+typedef struct _MINIDUMP_SYSTEM_INFO {
+
+    //
+    // ProcessorArchitecture, ProcessorLevel and ProcessorRevision are all
+    // taken from the SYSTEM_INFO structure obtained by GetSystemInfo( ).
+    //
+
+    UINT16 ProcessorArchitecture;
+    UINT16 ProcessorLevel;
+    UINT16 ProcessorRevision;
+
+    union {
+        UINT16 Reserved0;
+        struct {
+            UCHAR NumberOfProcessors;
+            UCHAR ProductType;
+        };
+    };
+
+    //
+    // MajorVersion, MinorVersion, BuildNumber, PlatformId and
+    // CSDVersion are all taken from the OSVERSIONINFO structure
+    // returned by GetVersionEx( ).
+    //
+
+    UINT32 MajorVersion;
+    UINT32 MinorVersion;
+    UINT32 BuildNumber;
+    UINT32 PlatformId;
+
+    //
+    // RVA to a CSDVersion string in the string table.
+    //
+
+    RVA CSDVersionRva;
+
+    union {
+        UINT32 Reserved1;
+        struct {
+            UINT16 SuiteMask;
+            UINT16 Reserved2;
+        };
+    };
+
+    CPU_INFORMATION Cpu;
+
+} MINIDUMP_SYSTEM_INFO, *PMINIDUMP_SYSTEM_INFO;
+
+
+//
+// The minidump thread contains standard thread
+// information plus an RVA to the memory for this
+// thread and an RVA to the CONTEXT structure for
+// this thread.
+//
+
+
+//
+// ThreadId must be 4 bytes on all architectures.
+//
+
+typedef struct _MINIDUMP_THREAD {
+    UINT32 ThreadId;
+    UINT32 SuspendCount;
+    UINT32 PriorityClass;
+    UINT32 Priority;
+    UINT64 Teb;
+    MINIDUMP_MEMORY_DESCRIPTOR Stack;
+    MINIDUMP_LOCATION_DESCRIPTOR ThreadContext;
+} MINIDUMP_THREAD, *PMINIDUMP_THREAD;
+
+//
+// The thread list is a container of threads.
+//
+
+typedef struct _MINIDUMP_THREAD_LIST {
+    UINT32 NumberOfThreads;
+    MINIDUMP_THREAD Threads [0];
+} MINIDUMP_THREAD_LIST, *PMINIDUMP_THREAD_LIST;
+
+
+typedef struct _MINIDUMP_THREAD_EX {
+    UINT32 ThreadId;
+    UINT32 SuspendCount;
+    UINT32 PriorityClass;
+    UINT32 Priority;
+    UINT64 Teb;
+    MINIDUMP_MEMORY_DESCRIPTOR Stack;
+    MINIDUMP_LOCATION_DESCRIPTOR ThreadContext;
+    MINIDUMP_MEMORY_DESCRIPTOR BackingStore;
+} MINIDUMP_THREAD_EX, *PMINIDUMP_THREAD_EX;
+
+//
+// The thread list is a container of threads.
+//
+
+typedef struct _MINIDUMP_THREAD_EX_LIST {
+    UINT32 NumberOfThreads;
+    MINIDUMP_THREAD_EX Threads [0];
+} MINIDUMP_THREAD_EX_LIST, *PMINIDUMP_THREAD_EX_LIST;
+
+
+//
+// The MINIDUMP_EXCEPTION is the same as EXCEPTION on Win64.
+//
+
+typedef struct _MINIDUMP_EXCEPTION  {
+    UINT32 ExceptionCode;
+    UINT32 ExceptionFlags;
+    UINT64 ExceptionRecord;
+    UINT64 ExceptionAddress;
+    UINT32 NumberParameters;
+    UINT32 __unusedAlignment;
+    UINT64 ExceptionInformation [ EXCEPTION_MAXIMUM_PARAMETERS ];
+} MINIDUMP_EXCEPTION, *PMINIDUMP_EXCEPTION;
+
+
+//
+// The exception information stream contains the id of the thread that caused
+// the exception (ThreadId), the exception record for the exception
+// (ExceptionRecord) and an RVA to the thread context where the exception
+// occurred.
+//
+
+typedef struct MINIDUMP_EXCEPTION_STREAM {
+    UINT32 ThreadId;
+    UINT32  __alignment;
+    MINIDUMP_EXCEPTION ExceptionRecord;
+    MINIDUMP_LOCATION_DESCRIPTOR ThreadContext;
+} MINIDUMP_EXCEPTION_STREAM, *PMINIDUMP_EXCEPTION_STREAM;
+
+
+//
+// The MINIDUMP_MODULE contains information about a
+// a specific module. It includes the CheckSum and
+// the TimeDateStamp for the module so the module
+// can be reloaded during the analysis phase.
+//
+
+typedef struct _MINIDUMP_MODULE {
+    UINT64 BaseOfImage;
+    UINT32 SizeOfImage;
+    UINT32 CheckSum;
+    UINT32 TimeDateStamp;
+    RVA ModuleNameRva;
+    VS_FIXEDFILEINFO VersionInfo;
+    MINIDUMP_LOCATION_DESCRIPTOR CvRecord;
+    MINIDUMP_LOCATION_DESCRIPTOR MiscRecord;
+    UINT64 Reserved0;                          // Reserved for future use.
+    UINT64 Reserved1;                          // Reserved for future use.
+} MINIDUMP_MODULE, *PMINIDUMP_MODULE;
+
+
+//
+// The minidump module list is a container for modules.
+//
+
+typedef struct _MINIDUMP_MODULE_LIST {
+    UINT32 NumberOfModules;
+    MINIDUMP_MODULE Modules [ 0 ];
+} MINIDUMP_MODULE_LIST, *PMINIDUMP_MODULE_LIST;
+
+
+//
+// Memory Ranges
+//
+
+typedef struct _MINIDUMP_MEMORY_LIST {
+    UINT32 NumberOfMemoryRanges;
+    MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges [0];
+} MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST;
+
+typedef struct _MINIDUMP_MEMORY64_LIST {
+    UINT64 NumberOfMemoryRanges;
+    RVA64 BaseRva;
+    MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges [0];
+} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST;
+
+
+//
+// Support for user supplied exception information.
+//
+
+typedef struct _MINIDUMP_EXCEPTION_INFORMATION {
+    UINT32 ThreadId;
+    PEXCEPTION_POINTERS ExceptionPointers;
+    BOOL ClientPointers;
+} MINIDUMP_EXCEPTION_INFORMATION, *PMINIDUMP_EXCEPTION_INFORMATION;
+
+typedef struct _MINIDUMP_EXCEPTION_INFORMATION64 {
+    UINT32 ThreadId;
+    UINT64 ExceptionRecord;
+    UINT64 ContextRecord;
+    BOOL ClientPointers;
+} MINIDUMP_EXCEPTION_INFORMATION64, *PMINIDUMP_EXCEPTION_INFORMATION64;
+
+
+//
+// Support for capturing system handle state at the time of the dump.
+//
+
+typedef struct _MINIDUMP_HANDLE_DESCRIPTOR {
+    UINT64 Handle;
+    RVA TypeNameRva;
+    RVA ObjectNameRva;
+    UINT32 Attributes;
+    UINT32 GrantedAccess;
+    UINT32 HandleCount;
+    UINT32 PointerCount;
+} MINIDUMP_HANDLE_DESCRIPTOR, *PMINIDUMP_HANDLE_DESCRIPTOR;
+
+typedef struct _MINIDUMP_HANDLE_DATA_STREAM {
+    UINT32 SizeOfHeader;
+    UINT32 SizeOfDescriptor;
+    UINT32 NumberOfDescriptors;
+    UINT32 Reserved;
+} MINIDUMP_HANDLE_DATA_STREAM, *PMINIDUMP_HANDLE_DATA_STREAM;
+
+
+//
+// Support for capturing dynamic function table state at the time of the dump.
+//
+
+typedef struct _MINIDUMP_FUNCTION_TABLE_DESCRIPTOR {
+    UINT64 MinimumAddress;
+    UINT64 MaximumAddress;
+    UINT64 BaseAddress;
+    UINT32 EntryCount;
+    UINT32 SizeOfAlignPad;
+} MINIDUMP_FUNCTION_TABLE_DESCRIPTOR, *PMINIDUMP_FUNCTION_TABLE_DESCRIPTOR;
+
+typedef struct _MINIDUMP_FUNCTION_TABLE_STREAM {
+    UINT32 SizeOfHeader;
+    UINT32 SizeOfDescriptor;
+    UINT32 SizeOfNativeDescriptor;
+    UINT32 SizeOfFunctionEntry;
+    UINT32 NumberOfDescriptors;
+    UINT32 SizeOfAlignPad;
+} MINIDUMP_FUNCTION_TABLE_STREAM, *PMINIDUMP_FUNCTION_TABLE_STREAM;
+
+
+//
+// The MINIDUMP_UNLOADED_MODULE contains information about a
+// a specific module that was previously loaded but no
+// longer is.  This can help with diagnosing problems where
+// callers attempt to call code that is no longer loaded.
+//
+
+typedef struct _MINIDUMP_UNLOADED_MODULE {
+    UINT64 BaseOfImage;
+    UINT32 SizeOfImage;
+    UINT32 CheckSum;
+    UINT32 TimeDateStamp;
+    RVA ModuleNameRva;
+} MINIDUMP_UNLOADED_MODULE, *PMINIDUMP_UNLOADED_MODULE;
+
+
+//
+// The minidump unloaded module list is a container for unloaded modules.
+//
+
+typedef struct _MINIDUMP_UNLOADED_MODULE_LIST {
+    UINT32 SizeOfHeader;
+    UINT32 SizeOfEntry;
+    UINT32 NumberOfEntries;
+} MINIDUMP_UNLOADED_MODULE_LIST, *PMINIDUMP_UNLOADED_MODULE_LIST;
+
+
+//
+// The miscellaneous information stream contains a variety
+// of small pieces of information.  A member is valid if
+// it's within the available size and its corresponding
+// bit is set.
+//
+
+#define MINIDUMP_MISC1_PROCESS_ID    0x00000001
+#define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002
+
+typedef struct _MINIDUMP_MISC_INFO {
+    UINT32 SizeOfInfo;
+    UINT32 Flags1;
+    UINT32 ProcessId;
+    UINT32 ProcessCreateTime;
+    UINT32 ProcessUserTime;
+    UINT32 ProcessKernelTime;
+} MINIDUMP_MISC_INFO, *PMINIDUMP_MISC_INFO;
+
+
+//
+// Support for arbitrary user-defined information.
+//
+
+typedef struct _MINIDUMP_USER_RECORD {
+    UINT32 Type;
+    MINIDUMP_LOCATION_DESCRIPTOR Memory;
+} MINIDUMP_USER_RECORD, *PMINIDUMP_USER_RECORD;
+
+
+typedef struct _MINIDUMP_USER_STREAM {
+    UINT32 Type;
+    UINT32 BufferSize;
+    PVOID Buffer;
+
+} MINIDUMP_USER_STREAM, *PMINIDUMP_USER_STREAM;
+
+
+typedef struct _MINIDUMP_USER_STREAM_INFORMATION {
+    UINT32 UserStreamCount;
+    PMINIDUMP_USER_STREAM UserStreamArray;
+} MINIDUMP_USER_STREAM_INFORMATION, *PMINIDUMP_USER_STREAM_INFORMATION;
+
+//
+// A normal minidump contains just the information
+// necessary to capture stack traces for all of the
+// existing threads in a process.
+//
+// A minidump with data segments includes all of the data
+// sections from loaded modules in order to capture
+// global variable contents.  This can make the dump much
+// larger if many modules have global data.
+//
+// A minidump with full memory includes all of the accessible
+// memory in the process and can be very large.  A minidump
+// with full memory always has the raw memory data at the end
+// of the dump so that the initial structures in the dump can
+// be mapped directly without having to include the raw
+// memory information.
+//
+// Stack and backing store memory can be filtered to remove
+// data unnecessary for stack walking.  This can improve
+// compression of stacks and also deletes data that may
+// be private and should not be stored in a dump.
+// Memory can also be scanned to see what modules are
+// referenced by stack and backing store memory to allow
+// omission of other modules to reduce dump size.
+// In either of these modes the ModuleReferencedByMemory flag
+// is set for all modules referenced before the base
+// module callbacks occur.
+//
+// On some operating systems a list of modules that were
+// recently unloaded is kept in addition to the currently
+// loaded module list.  This information can be saved in
+// the dump if desired.
+//
+// Stack and backing store memory can be scanned for referenced
+// pages in order to pick up data referenced by locals or other
+// stack memory.  This can increase the size of a dump significantly.
+//
+// Module paths may contain undesired information such as user names
+// or other important directory names so they can be stripped.  This
+// option reduces the ability to locate the proper image later
+// and should only be used in certain situations.
+//
+// Complete operating system per-process and per-thread information can
+// be gathered and stored in the dump.
+//
+// The virtual address space can be scanned for various types
+// of memory to be included in the dump.
+//
+// Code which is concerned with potentially private information
+// getting into the minidump can set a flag that automatically
+// modifies all existing and future flags to avoid placing
+// unnecessary data in the dump.  Basic data, such as stack
+// information, will still be included but optional data, such
+// as indirect memory, will not.
+//
+
+typedef enum _MINIDUMP_TYPE {
+    MiniDumpNormal                         = 0x0000,
+    MiniDumpWithDataSegs                   = 0x0001,
+    MiniDumpWithFullMemory                 = 0x0002,
+    MiniDumpWithHandleData                 = 0x0004,
+    MiniDumpFilterMemory                   = 0x0008,
+    MiniDumpScanMemory                     = 0x0010,
+    MiniDumpWithUnloadedModules            = 0x0020,
+    MiniDumpWithIndirectlyReferencedMemory = 0x0040,
+    MiniDumpFilterModulePaths              = 0x0080,
+    MiniDumpWithProcessThreadData          = 0x0100,
+    MiniDumpWithPrivateReadWriteMemory     = 0x0200,
+    MiniDumpWithoutOptionalData            = 0x0400,
+} MINIDUMP_TYPE;
+
+#if defined(_MSC_VER)
+#if _MSC_VER >= 800
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4200)    /* Zero length array */
+#pragma warning(default:4201)    /* Nameless struct/union */
+#endif
+#endif
+#endif
+
+#pragma pack(pop)
+
+// HEXTRACT: end_dbghelp hide_line end_imagehlp
diff --git a/base/boot/include/printf.cpp b/base/boot/include/printf.cpp
new file mode 100644
index 0000000..e17c688
--- /dev/null
+++ b/base/boot/include/printf.cpp
@@ -0,0 +1,440 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+///////////////////////////////////////////////////////////////////// VPrintf.
+//
+// Completely side-effect free printf replacement.
+//
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+#if !USE_64
+#ifndef _VA_LIST_DEFINED
+typedef char *va_list;
+#define _VA_LIST_DEFINED
+
+#define _INTSIZEOF(n)    ( (sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1) )
+#define va_start(ap,v) ap = (va_list)&v + _INTSIZEOF(v)
+#define va_arg(ap,t) ( *(t *)((ap += _INTSIZEOF(t)) - _INTSIZEOF(t)) )
+#define va_end(ap) ap = (va_list)0
+#endif
+
+#else  // 64-bit 
+// the following extern "C" code is needed to ensure the 
+// compiler intrinsic IV_VA_START is invoked. 
+extern "C" {
+typedef char *  va_list;
+extern void __cdecl __va_start(va_list *, ...);
+#define _crt_va_start(ap, x) ( __va_start(&ap, x) )
+#define _crt_va_arg(ap, t)   \
+    ( ( sizeof(t) > sizeof(__int64) || ( sizeof(t) & (sizeof(t) - 1) ) != 0 ) \
+        ? **(t **)( ( ap += sizeof(__int64) ) - sizeof(__int64) ) \
+        :  *(t  *)( ( ap += sizeof(__int64) ) - sizeof(__int64) ) )
+#define _crt_va_end(ap)      ( ap = (va_list)0 )
+}
+
+#ifndef _VA_LIST_DEFINED
+typedef char *va_list;
+#define _VA_LIST_DEFINED
+extern void __cdecl __va_start(va_list *, ...);
+#define va_dcl          va_list va_alist;
+#define va_start(ap,x)   ( __va_start(&ap, x) )
+#define va_arg(ap, t)   \
+    ( ( sizeof(t) > sizeof(__int64) || ( sizeof(t) & (sizeof(t) - 1) ) != 0 ) \
+        ? **(t **)( ( ap += sizeof(__int64) ) - sizeof(__int64) ) \
+        :  *(t  *)( ( ap += sizeof(__int64) ) - sizeof(__int64) ) )
+#define va_end(ap)      ( ap = (va_list)0 )
+#endif
+#endif 
+
+/*
+ * define a macro to compute the size of a type, variable or expression,
+ * rounded up to the nearest multiple of sizeof(int). This number is its
+ * size as function argument (Intel architecture). Note that the macro
+ * depends on sizeof(int) being a power of 2!
+ */
+
+
+#pragma optimize ("", off)
+
+static char *do_base(char * pszOut, ULARGEST nValue, UINT nBase, char * pszDigits)
+{
+    char szTmp[96];
+    int nDigit = sizeof(szTmp)-2;
+    for (; nDigit >= 0; nDigit--) {
+        szTmp[nDigit] = pszDigits[nValue % nBase];
+        nValue /= nBase;
+    }
+    for (nDigit = 0; nDigit < sizeof(szTmp) - 2 && szTmp[nDigit] == '0'; nDigit++) {
+        // skip leading zeros.
+    }
+    for (; nDigit < sizeof(szTmp) - 1; nDigit++) {
+        *pszOut++ = szTmp[nDigit];
+    }
+    *pszOut = '\0';
+    return pszOut;
+}
+
+#pragma optimize ("", on)
+
+static char * do_str(char * pszOut, char * pszIn)
+{
+    while (*pszIn) {
+        *pszOut++ = *pszIn++;
+    }
+    *pszOut = '\0';
+    return pszOut;
+}
+
+static char * do_wstr(char * pszOut, short * pszIn)
+{
+    while (*pszIn) {
+        *pszOut++ = (char)*pszIn++;
+    }
+    *pszOut = '\0';
+    return pszOut;
+}
+
+static int do_out(void (*pfOutput)(void *pContext, char c), void *pContext, char *pszIn)
+{
+    int nOut = 0;
+
+    while (*pszIn) {
+        pfOutput(pContext, *pszIn++);
+        nOut++;
+    }
+    return nOut;
+}
+
+int strformat(void (*pfOutput)(void *pContext, char c), void *pContext,
+              const char * pszFmt, va_list args)
+{
+    int nOut = 0;
+
+    while (*pszFmt) {
+        if (*pszFmt == '%') {
+            char szTemp[128];
+            char szHead[4] = "";
+            int nLen;
+            int nWidth = 0;
+            int nPrecision = 0;
+            int fLeft = 0;
+            int fPositive = 0;
+            int fPound = 0;
+            int fBlank = 0;
+            int fZero = 0;
+            int fDigit = 0;
+            int fSmall = 0;
+            int fLarge = 0;
+            int fString = 0;
+            const char * pszArg = pszFmt;
+
+            pszFmt++;
+
+            for (; (*pszFmt == '-' ||
+                    *pszFmt == '+' ||
+                    *pszFmt == '#' ||
+                    *pszFmt == ' ' ||
+                    *pszFmt == '0'); pszFmt++) {
+                switch (*pszFmt) {
+                  case '-': fLeft = 1; break;
+                  case '+': fPositive = 1; break;
+                  case '#': fPound = 1; break;
+                  case ' ': fBlank = 1; break;
+                  case '0': fZero = 1; break;
+                }
+            }
+
+            if (*pszFmt == '*') {
+                nWidth = va_arg(args, int);
+                pszFmt++;
+            }
+            else {
+                while (*pszFmt >= '0' && *pszFmt <= '9') {
+                    nWidth = nWidth * 10 + (*pszFmt++ - '0');
+                }
+            }
+            if (*pszFmt == '.') {
+                pszFmt++;
+                fDigit = 1;
+                if (*pszFmt == '*') {
+                    nPrecision = va_arg(args, int);
+                    pszFmt++;
+                }
+                else {
+                    while (*pszFmt >= '0' && *pszFmt <= '9') {
+                        nPrecision = nPrecision * 10 + (*pszFmt++ - '0');
+                    }
+                }
+            }
+
+            if (*pszFmt == 'h') {
+                fSmall = 1;
+                pszFmt++;
+            }
+            else if (*pszFmt == 'l' || *pszFmt == 'L') {
+                fLarge = 1;
+                pszFmt++;
+            }
+
+            if (*pszFmt == 's' || *pszFmt == 'S' ||
+                *pszFmt == 'c' || *pszFmt == 'C') {
+                if (*pszFmt == 's' || *pszFmt == 'S') {
+                    char * pszDst = szTemp;
+                    void * pvData = va_arg(args, void *);
+
+                    if (*pszFmt == 'S') {
+                        fLarge = 1;
+                    }
+                    pszFmt++;
+
+                    fString = 1;
+                    if (fSmall) {
+                        fLarge = 0;
+                    }
+
+                    if (!pvData) {
+                        pszDst = do_str(pszDst, "<NULL>");
+                    }
+                    else if (fLarge) {
+                        pszDst = do_wstr(pszDst, (short *)pvData);
+                    }
+                    else {
+                        pszDst = do_str(pszDst, (char *)pvData);
+                    }
+                    nLen = (int) (pszDst - szTemp);
+                }
+                else if (*pszFmt == 'c' || *pszFmt == 'C') {
+                    if (*pszFmt == 'S') {
+                        fLarge = 1;
+                    }
+                    pszFmt++;
+
+                    fString = 1;
+
+                    szTemp[0] = (char)va_arg(args, int);
+                    szTemp[1] = '\0';
+                    nLen = 1;
+                }
+
+                if (nPrecision && nLen > nPrecision) {
+                    nLen = nPrecision;
+                    szTemp[nLen] = '\0';
+                }
+
+                if (fLeft) {
+                    nOut += do_out(pfOutput, pContext, szTemp);
+                    for (; nLen < nWidth; nLen++) {
+                        pfOutput(pContext, ' ');
+                        nOut++;
+                    }
+                }
+                else {
+                    for (; nLen < nWidth; nLen++) {
+                        pfOutput(pContext, ' ');
+                        nOut++;
+                    }
+                    nOut = do_out(pfOutput, pContext, szTemp);
+                }
+            }
+            else if (*pszFmt == 'p' || *pszFmt == 'u' ||
+                     *pszFmt == 'd' || *pszFmt == 'i' || *pszFmt == 'o' ||
+                     *pszFmt == 'x' || *pszFmt == 'X' || *pszFmt == 'b') {
+
+                ULARGEST value;
+                if (fLarge) {
+                    value = va_arg(args, ULARGEST);
+                }
+                else {
+                    value = va_arg(args, unsigned int);
+                }
+
+                if (*pszFmt == 'p') {
+                    if (nWidth == 0) {
+                        nWidth = fLarge ? 2 * sizeof(ULARGEST) : 2 * sizeof(unsigned int);
+                        fZero = 1;
+                    }
+                    pszFmt++;
+                    nLen = (int) (do_base(szTemp, value, 16, "0123456789abcdef") - szTemp);
+                    if (fPound && value) {
+                        do_str(szHead, "0x");
+                    }
+                }
+                else if (*pszFmt == 'x' || *pszFmt == 'p') {
+                    pszFmt++;
+                    nLen = (int) (do_base(szTemp, value, 16, "0123456789abcdef") - szTemp);
+                    if (fPound && value) {
+                        do_str(szHead, "0x");
+                    }
+                }
+                else if (*pszFmt == 'X') {
+                    pszFmt++;
+                    nLen = (int) (do_base(szTemp, value, 16, "0123456789ABCDEF") - szTemp);
+                    if (fPound && value) {
+                        do_str(szHead, "0X");
+                    }
+                }
+                else if (*pszFmt == 'd') {
+                    pszFmt++;
+                    if ((LARGEST)value < 0) {
+                        value = -(LARGEST)value;
+                        do_str(szHead, "-");
+                    }
+                    else if (fPositive) {
+                        if (value > 0) {
+                            do_str(szHead, "+");
+                        }
+                    }
+                    else if (fBlank) {
+                        if (value > 0) {
+                            do_str(szHead, " ");
+                        }
+                    }
+                    nLen = (int) (do_base(szTemp, value, 10, "0123456789") - szTemp);
+                    nPrecision = 0;
+                }
+                else if (*pszFmt == 'u') {
+                    pszFmt++;
+                    nLen = (int) (do_base(szTemp, value, 10, "0123456789") - szTemp);
+                    nPrecision = 0;
+                }
+                else if (*pszFmt == 'o') {
+                    pszFmt++;
+                    nLen = (int) (do_base(szTemp, value, 8, "01234567") - szTemp);
+                    nPrecision = 0;
+
+                    if (fPound && value) {
+                        do_str(szHead, "0");
+                    }
+                }
+                else if (*pszFmt == 'b') {
+                    pszFmt++;
+                    nLen = (int) (do_base(szTemp, value, 2, "01") - szTemp);
+                    nPrecision = 0;
+
+                    if (fPound && value) {
+                        do_str(szHead, "0b");
+                    }
+                }
+
+                int nHead = 0;
+                for (; szHead[nHead]; nHead++) {
+                    // Count characters in head string.
+                }
+
+                if (fLeft) {
+                    if (nHead) {
+                        nOut += do_out(pfOutput, pContext, szHead);
+                        nLen += nHead;
+                    }
+                    nOut += do_out(pfOutput, pContext, szTemp);
+                    for (; nLen < nWidth; nLen++) {
+                        pfOutput(pContext, ' ');
+                        nOut++;
+                    }
+                }
+                else if (fZero) {
+                    if (nHead) {
+                        nOut += do_out(pfOutput, pContext, szHead);
+                        nLen += nHead;
+                    }
+                    for (; nLen < nWidth; nLen++) {
+                        pfOutput(pContext, '0');
+                        nOut++;
+                    }
+                    nOut += do_out(pfOutput, pContext, szTemp);
+                }
+                else {
+                    if (nHead) {
+                        nLen += nHead;
+                    }
+                    for (; nLen < nWidth; nLen++) {
+                        pfOutput(pContext, ' ');
+                        nOut++;
+                    }
+                    if (nHead) {
+                        nOut += do_out(pfOutput, pContext, szHead);
+                    }
+                    nOut += do_out(pfOutput, pContext, szTemp);
+                }
+            }
+            else {
+                pszFmt++;
+                while (pszArg < pszFmt) {
+                    pfOutput(pContext, *pszArg++);
+                    nOut++;
+                }
+            }
+        }
+        else {
+            pfOutput(pContext, *pszFmt++);
+            nOut++;
+        }
+    }
+    return nOut;
+}
+
+////////////////////////////////////////////////// Publicly Visible Interface.
+//
+
+void __cdecl PutChar(char cOut);
+
+static void printfout(void * /* pContext */, char c)
+{
+    PutChar(c);
+}
+
+int printf(const char *pszFmt, ...)
+{
+    int nOut;
+    va_list args;
+
+    va_start(args, pszFmt);
+    nOut = strformat(printfout, 0, pszFmt, args);
+    va_end(args);
+
+    return nOut;
+}
+
+int vprintf(const char *pszFmt, va_list args)
+{
+    int nOut;
+
+    nOut = strformat(printfout, 0, pszFmt, args);
+
+    return nOut;
+}
+
+static void sprintfout(void *pContext, char c)
+{
+    char **ppszOut = (char **)pContext;
+
+    *(*ppszOut)++ = c;
+}
+
+int sprintf(char *pszOut, const char *pszFmt, ...)
+{
+    int nOut;
+    va_list args;
+
+    va_start(args, pszFmt);
+    nOut = strformat(sprintfout, &pszOut, pszFmt, args);
+    va_end(args);
+
+    *pszOut = '\0';
+
+    return nOut;
+}
+
+int svprintf(char *pszOut, const char *pszFmt, va_list args)
+{
+    int nOut;
+
+    nOut = strformat(sprintfout, &pszOut, pszFmt, args);
+    *pszOut = '\0';
+
+    return nOut;
+}
diff --git a/base/boot/include/winctx.h b/base/boot/include/winctx.h
new file mode 100644
index 0000000..79a8192
--- /dev/null
+++ b/base/boot/include/winctx.h
@@ -0,0 +1,408 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Microsoft Research Singularity
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:   winctx.h
+//
+//  Note:   Context structures required by Windows Minidumps.
+//
+
+#pragma pack(push,4)
+
+#if defined(_MSC_VER)
+#if _MSC_VER >= 800
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4200)    /* Zero length array */
+#pragma warning(disable:4201)    /* Nameless struct/union */
+#endif
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+
+//-----> From winver.h#132
+
+typedef struct tagVS_FIXEDFILEINFO
+{
+    UINT32   dwSignature;            /* e.g. 0xfeef04bd */
+    UINT32   dwStrucVersion;         /* e.g. 0x00000042 = "0.42" */
+    UINT32   dwFileVersionMS;        /* e.g. 0x00030075 = "3.75" */
+    UINT32   dwFileVersionLS;        /* e.g. 0x00000031 = "0.31" */
+    UINT32   dwProductVersionMS;     /* e.g. 0x00030010 = "3.10" */
+    UINT32   dwProductVersionLS;     /* e.g. 0x00000031 = "0.31" */
+    UINT32   dwFileFlagsMask;        /* = 0x3F for version "0.42" */
+    UINT32   dwFileFlags;            /* e.g. VFF_DEBUG | VFF_PRERELEASE */
+    UINT32   dwFileOS;               /* e.g. VOS_DOS_WINDOWS16 */
+    UINT32   dwFileType;             /* e.g. VFT_DRIVER */
+    UINT32   dwFileSubtype;          /* e.g. VFT2_DRV_KEYBOARD */
+    UINT32   dwFileDateMS;           /* e.g. 0 */
+    UINT32   dwFileDateLS;           /* e.g. 0 */
+} VS_FIXEDFILEINFO;
+
+//-----> From winnt.h#2175
+#if defined(AMD64)
+//
+// Define initial MxCsr and FpCsr control.
+//
+
+#define INITIAL_MXCSR 0x1f80            // initial MXCSR value
+#define INITIAL_FPCSR 0x027f            // initial FPCSR value
+
+//
+// Define 128-bit 16-byte aligned xmm register type.
+
+typedef struct __declspec(align(16))  _M128A {
+    ULONGLONG Low;
+    LONGLONG High;
+} M128A, *PM128A;
+
+//
+// Format of data for 32-bit fxsave/fxrstor instructions.
+//
+
+typedef struct _XMM_SAVE_AREA32 {
+    WORD   ControlWord;
+    WORD   StatusWord;
+    BYTE  TagWord;
+    BYTE  Reserved1;
+    WORD   ErrorOpcode;
+    DWORD ErrorOffset;
+    WORD   ErrorSelector;
+    WORD   Reserved2;
+    DWORD DataOffset;
+    WORD   DataSelector;
+    WORD   Reserved3;
+    DWORD MxCsr;
+    DWORD MxCsr_Mask;
+    M128A FloatRegisters[8];
+    M128A XmmRegisters[16];
+    BYTE  Reserved4[96];
+} XMM_SAVE_AREA32, *PXMM_SAVE_AREA32;
+
+#define LEGACY_SAVE_AREA_LENGTH sizeof(XMM_SAVE_AREA32)
+
+//
+// Context Frame
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) is is used to construct a call frame for APC delivery,
+//  and 3) it is used in the user level thread creation routines.
+//
+//
+// The flags field within this record controls the contents of a CONTEXT
+// record.
+//
+// If the context record is used as an input parameter, then for each
+// portion of the context record controlled by a flag whose value is
+// set, it is assumed that that portion of the context record contains
+// valid context. If the context record is being used to modify a threads
+// context, then only that portion of the threads context is modified.
+//
+// If the context record is used as an output parameter to capture the
+// context of a thread, then only those portions of the thread's context
+// corresponding to set flags will be returned.
+//
+// CONTEXT_CONTROL specifies SegSs, Rsp, SegCs, Rip, and EFlags.
+//
+// CONTEXT_INTEGER specifies Rax, Rcx, Rdx, Rbx, Rbp, Rsi, Rdi, and R8-R15.
+//
+// CONTEXT_SEGMENTS specifies SegDs, SegEs, SegFs, and SegGs.
+//
+// CONTEXT_DEBUG_REGISTERS specifies Dr0-Dr3 and Dr6-Dr7.
+//
+// CONTEXT_MMX_REGISTERS specifies the floating point and extended registers
+//     Mm0/St0-Mm7/St7 and Xmm0-Xmm15).
+//
+
+typedef struct __declspec(align(16))  _CONTEXT {
+
+    //
+    // Register parameter home addresses.
+    //
+    // N.B. These fields are for convenience - they could be used to extend the
+    //      context record in the future.
+    //
+
+    DWORD64 P1Home;
+    DWORD64 P2Home;
+    DWORD64 P3Home;
+    DWORD64 P4Home;
+    DWORD64 P5Home;
+    DWORD64 P6Home;
+
+    //
+    // Control flags.
+    //
+
+    DWORD ContextFlags;
+    DWORD MxCsr;
+
+    //
+    // Segment Registers and processor flags.
+    //
+
+    WORD   SegCs;
+    WORD   SegDs;
+    WORD   SegEs;
+    WORD   SegFs;
+    WORD   SegGs;
+    WORD   SegSs;
+    DWORD EFlags;
+
+    //
+    // Debug registers
+    //
+
+    DWORD64 Dr0;
+    DWORD64 Dr1;
+    DWORD64 Dr2;
+    DWORD64 Dr3;
+    DWORD64 Dr6;
+    DWORD64 Dr7;
+
+    //
+    // Integer registers.
+    //
+
+    DWORD64 Rax;
+    DWORD64 Rcx;
+    DWORD64 Rdx;
+    DWORD64 Rbx;
+    DWORD64 Rsp;
+    DWORD64 Rbp;
+    DWORD64 Rsi;
+    DWORD64 Rdi;
+    DWORD64 R8;
+    DWORD64 R9;
+    DWORD64 R10;
+    DWORD64 R11;
+    DWORD64 R12;
+    DWORD64 R13;
+    DWORD64 R14;
+    DWORD64 R15;
+
+    //
+    // Program counter.
+    //
+
+    DWORD64 Rip;
+
+    //
+    // Floating point state.
+    //
+
+    union {
+        XMM_SAVE_AREA32 FltSave;
+        struct {
+            M128A Header[2];
+            M128A Legacy[8];
+            M128A Xmm0;
+            M128A Xmm1;
+            M128A Xmm2;
+            M128A Xmm3;
+            M128A Xmm4;
+            M128A Xmm5;
+            M128A Xmm6;
+            M128A Xmm7;
+            M128A Xmm8;
+            M128A Xmm9;
+            M128A Xmm10;
+            M128A Xmm11;
+            M128A Xmm12;
+            M128A Xmm13;
+            M128A Xmm14;
+            M128A Xmm15;
+        };
+    };
+
+    //
+    // Vector registers.
+    //
+
+    M128A VectorRegister[26];
+    DWORD64 VectorControl;
+
+    //
+    // Special debug control registers.
+    //
+
+    DWORD64 DebugControl;
+    DWORD64 LastBranchToRip;
+    DWORD64 LastBranchFromRip;
+    DWORD64 LastExceptionToRip;
+    DWORD64 LastExceptionFromRip;
+} CONTEXT, *PCONTEXT;
+#else  //_AMD64_
+#define SIZE_OF_80387_REGISTERS      80
+#define MAXIMUM_SUPPORTED_EXTENSION     512
+
+typedef struct _FLOATING_SAVE_AREA {
+    UINT32   ControlWord;
+    UINT32   StatusWord;
+    UINT32   TagWord;
+    UINT32   ErrorOffset;
+    UINT32   ErrorSelector;
+    UINT32   DataOffset;
+    UINT32   DataSelector;
+    UINT8    RegisterArea[SIZE_OF_80387_REGISTERS];
+    UINT32   Cr0NpxState;
+} FLOATING_SAVE_AREA;
+
+typedef FLOATING_SAVE_AREA *PFLOATING_SAVE_AREA;
+
+//
+// Context Frame
+//
+//  This frame has a several purposes: 1) it is used as an argument to
+//  NtContinue, 2) is is used to construct a call frame for APC delivery,
+//  and 3) it is used in the user level thread creation routines.
+//
+//  The layout of the record conforms to a standard call frame.
+//
+
+typedef struct _CONTEXT {
+
+    //
+    // The flags values within this flag control the contents of
+    // a CONTEXT record.
+    //
+    // If the context record is used as an input parameter, then
+    // for each portion of the context record controlled by a flag
+    // whose value is set, it is assumed that that portion of the
+    // context record contains valid context. If the context record
+    // is being used to modify a threads context, then only that
+    // portion of the threads context will be modified.
+    //
+    // If the context record is used as an IN OUT parameter to capture
+    // the context of a thread, then only those portions of the thread's
+    // context corresponding to set flags will be returned.
+    //
+    // The context record is never used as an OUT only parameter.
+    //
+
+    UINT32 ContextFlags;
+
+    //
+    // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is
+    // set in ContextFlags.  Note that CONTEXT_DEBUG_REGISTERS is NOT
+    // included in CONTEXT_FULL.
+    //
+
+    UINT32   Dr0;
+    UINT32   Dr1;
+    UINT32   Dr2;
+    UINT32   Dr3;
+    UINT32   Dr6;
+    UINT32   Dr7;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contains the flag CONTEXT_FLOATING_POINT.
+    //
+
+    FLOATING_SAVE_AREA FloatSave;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contains the flag CONTEXT_SEGMENTS.
+    //
+
+    UINT32   SegGs;
+    UINT32   SegFs;
+    UINT32   SegEs;
+    UINT32   SegDs;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contains the flag CONTEXT_INTEGER.
+    //
+
+    UINT32   Edi;
+    UINT32   Esi;
+    UINT32   Ebx;
+    UINT32   Edx;
+    UINT32   Ecx;
+    UINT32   Eax;
+
+    //
+    // This section is specified/returned if the
+    // ContextFlags word contains the flag CONTEXT_CONTROL.
+    //
+
+    UINT32   Ebp;
+    UINT32   Eip;
+    UINT32   SegCs;              // MUST BE SANITIZED
+    UINT32   EFlags;             // MUST BE SANITIZED
+    UINT32   Esp;
+    UINT32   SegSs;
+
+    //
+    // This section is specified/returned if the ContextFlags word
+    // contains the flag CONTEXT_EXTENDED_REGISTERS.
+    // The format and contexts are processor specific
+    //
+
+    UINT8    ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
+
+} CONTEXT;
+#endif // _AMD64_ 
+
+
+typedef CONTEXT *PCONTEXT;
+
+//-----> From winnt.h#3526
+#define EXCEPTION_MAXIMUM_PARAMETERS 15 // maximum number of exception parameters
+
+//-----> From winnt.h#3566
+
+//
+// Exception record definition.
+//
+
+typedef struct _EXCEPTION_RECORD {
+    UINT32    ExceptionCode;
+    UINT32 ExceptionFlags;
+    struct _EXCEPTION_RECORD *ExceptionRecord;
+    PVOID ExceptionAddress;
+    UINT32 NumberParameters;
+    ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+    } EXCEPTION_RECORD;
+
+typedef EXCEPTION_RECORD *PEXCEPTION_RECORD;
+
+typedef struct _EXCEPTION_RECORD32 {
+    UINT32    ExceptionCode;
+    UINT32 ExceptionFlags;
+    UINT32 ExceptionRecord;
+    UINT32 ExceptionAddress;
+    UINT32 NumberParameters;
+    UINT32 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+} EXCEPTION_RECORD32, *PEXCEPTION_RECORD32;
+
+typedef struct _EXCEPTION_RECORD64 {
+    UINT32    ExceptionCode;
+    UINT32 ExceptionFlags;
+    UINT64 ExceptionRecord;
+    UINT64 ExceptionAddress;
+    UINT32 NumberParameters;
+    UINT32 __unusedAlignment;
+    UINT64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
+} EXCEPTION_RECORD64, *PEXCEPTION_RECORD64;
+
+//
+// Typedef for pointer returned by exception_info()
+//
+
+typedef struct _EXCEPTION_POINTERS {
+    PEXCEPTION_RECORD ExceptionRecord;
+    PCONTEXT ContextRecord;
+} EXCEPTION_POINTERS, *PEXCEPTION_POINTERS;
+
+#pragma pack(pop)
+
+//
+//////////////////////////////////////////////////////////////////////////////
diff --git a/base/boot/pxe.vmc b/base/boot/pxe.vmc
new file mode 100644
index 0000000..8588f7c
Binary files /dev/null and b/base/boot/pxe.vmc differ
diff --git a/base/boot/pxeboot.vfd b/base/boot/pxeboot.vfd
new file mode 100644
index 0000000..d841ace
Binary files /dev/null and b/base/boot/pxeboot.vfd differ
diff --git a/base/boot/win98boot.vfd b/base/boot/win98boot.vfd
new file mode 100644
index 0000000..590e48f
Binary files /dev/null and b/base/boot/win98boot.vfd differ
diff --git a/base/build/1033/clui.dll b/base/build/1033/clui.dll
new file mode 100644
index 0000000..7375397
Binary files /dev/null and b/base/build/1033/clui.dll differ
diff --git a/base/build/1033/cvtresui.dll b/base/build/1033/cvtresui.dll
new file mode 100644
index 0000000..92061f0
Binary files /dev/null and b/base/build/1033/cvtresui.dll differ
diff --git a/base/build/1033/linkui.dll b/base/build/1033/linkui.dll
new file mode 100644
index 0000000..470a638
Binary files /dev/null and b/base/build/1033/linkui.dll differ
diff --git a/base/build/1033/nmakeui.dll b/base/build/1033/nmakeui.dll
new file mode 100644
index 0000000..bb5ab8f
Binary files /dev/null and b/base/build/1033/nmakeui.dll differ
diff --git a/base/build/BuildKey.proj b/base/build/BuildKey.proj
new file mode 100644
index 0000000..a613e4a
--- /dev/null
+++ b/base/build/BuildKey.proj
@@ -0,0 +1,54 @@
+<!--
+##############################################################################
+
+Microsoft Research Singularity
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+File:   Build\BuildKey.proj
+
+Note:   Builds the strong name key for all of the signed Singularity assemblies.
+
+In order for parallel builds to work correctly, no two projects should try to
+write to the same file at the same time.  Previously, strong name key files
+had been emitted by SingSharp.targets, InterfaceAssembly.targets, etc.
+But this breaks parallel builds.  So now all of those projects just build this
+project, which generates the key once, then copies the public.snk file to the
+various places in the output tree where it is needed.  I'm not crazy about this,
+but it solves the problem and should be reliable.
+
+##############################################################################
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="..\Paths.targets"/>
+
+  <ItemGroup>
+    <OutputDir Include="$(APPSDIR)"/>
+    <OutputDir Include="$(ILLSDIR)"/>
+    <OutputDir Include="$(KERNEL_IL_DIR)"/>
+    <OutputDir Include="$(APPRUNTIMEDIR)"/>
+    <OutputDir Include="$(LIBSDIR)"/>
+    <OutputDir Include="$(DRIVDIR)"/>
+  </ItemGroup>
+
+  <Target Name="CreateStrongName"
+          Inputs="$(BUILDDIR)\BuildKey.snk"
+          Outputs="$(SINGULARITY_OBJROOT)\public.snk">
+    <MakeDir Directories="$(SINGULARITY_OBJROOT)"/>
+    <Exec Command="$(BUILDDIR)\sn -q -p $(BUILDDIR)\BuildKey.snk $(SINGULARITY_OBJROOT)\public.snk"/>
+  </Target>
+
+  <Target Name="CopyToOutputDirs"
+          Inputs="$(SINGULARITY_OBJROOT)\public.snk"
+          Outputs="@(OutputDir->'%(identity)\public.snk')"
+          DependsOnTargets="CreateStrongName">
+    <MakeDir Directories="@(OutputDir)"/>
+    <Copy SourceFiles="$(SINGULARITY_OBJROOT)\public.snk" DestinationFiles="%(OutputDir.identity)\public.snk" SkipUnchangedFiles="true"/>
+  </Target>
+  
+
+  <Target Name="Build" DependsOnTargets="CreateStrongName;CopyToOutputDirs">
+  </Target>
+
+</Project>
diff --git a/base/build/BuildKey.snk b/base/build/BuildKey.snk
new file mode 100644
index 0000000..8fc7950
Binary files /dev/null and b/base/build/BuildKey.snk differ
diff --git a/base/build/DistroBuilder.exe b/base/build/DistroBuilder.exe
new file mode 100644
index 0000000..8e48185
Binary files /dev/null and b/base/build/DistroBuilder.exe differ
diff --git a/base/build/DistroBuilder.pdb b/base/build/DistroBuilder.pdb
new file mode 100644
index 0000000..399abb6
Binary files /dev/null and b/base/build/DistroBuilder.pdb differ
diff --git a/base/build/Microsoft.VC80.CRT.manifest b/base/build/Microsoft.VC80.CRT.manifest
new file mode 100644
index 0000000..217731f
--- /dev/null
+++ b/base/build/Microsoft.VC80.CRT.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.VC80.CRT" 
+        version="8.0.50608.0" 
+        processorArchitecture="x86" 
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80.dll"/>
+    <file name="msvcp80.dll"/>
+    <file name="msvcm80.dll"/>
+</assembly>
diff --git a/base/build/Microsoft.VC80.DebugCRT.manifest b/base/build/Microsoft.VC80.DebugCRT.manifest
new file mode 100644
index 0000000..ff6f51b
--- /dev/null
+++ b/base/build/Microsoft.VC80.DebugCRT.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.VC80.DebugCRT" 
+        version="8.0.50608.0"
+        processorArchitecture="x86" 
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80d.dll"/>
+    <file name="msvcp80d.dll"/>
+    <file name="msvcm80d.dll"/>
+</assembly>
diff --git a/base/build/MpSyscallBuilder.exe b/base/build/MpSyscallBuilder.exe
new file mode 100644
index 0000000..56783d2
Binary files /dev/null and b/base/build/MpSyscallBuilder.exe differ
diff --git a/base/build/MpSyscallBuilder.pdb b/base/build/MpSyscallBuilder.pdb
new file mode 100644
index 0000000..9234c74
Binary files /dev/null and b/base/build/MpSyscallBuilder.pdb differ
diff --git a/base/build/MsilReader.dll b/base/build/MsilReader.dll
new file mode 100644
index 0000000..2e7def6
Binary files /dev/null and b/base/build/MsilReader.dll differ
diff --git a/base/build/MsilReader.pdb b/base/build/MsilReader.pdb
new file mode 100644
index 0000000..916084e
Binary files /dev/null and b/base/build/MsilReader.pdb differ
diff --git a/base/build/NVidia/NVidiaDrivers.dll b/base/build/NVidia/NVidiaDrivers.dll
new file mode 100644
index 0000000..a11b7ee
Binary files /dev/null and b/base/build/NVidia/NVidiaDrivers.dll differ
diff --git a/base/build/NVidia/nvmac.exe b/base/build/NVidia/nvmac.exe
new file mode 100644
index 0000000..b063691
Binary files /dev/null and b/base/build/NVidia/nvmac.exe differ
diff --git a/base/build/README.TXT b/base/build/README.TXT
new file mode 100644
index 0000000..c471a23
--- /dev/null
+++ b/base/build/README.TXT
@@ -0,0 +1,49 @@
+32-bit C++ Tools:
+=================
+The LKG9 drop of the VC++ toolset came from the official drop point:
+    \\douglasfir\vcdrop\DFTools\LKG9
+
+It included the following files:
+    cvtres.exe
+    cvtres.pdb
+    dumpbin.exe
+    dumpbin.pdb
+    editbin.exe
+    editbin.pdb
+    lib.exe
+    lib.pdb
+    link.exe
+    link.pdb
+    Microsoft.VC80.CRT.manifest
+    ml.exe
+    msdis150.dll
+    msdis150.pdb
+    msobj80.dll
+    msobj80.pdb
+    mspdb80.dll
+    mspdb80.pdb
+    mspft80.dll
+    mspft80.pdb
+    msvcp80.dll
+    msvcp80.pdb
+    msvcp80d.dll
+    msvcr80.dll
+    msvcr80.pdb
+    msvcr80d.dll
+    nmake.exe
+    nmake.pdb
+    pgodb80.dll
+    pgodb80.pdb
+    undname.exe
+    undname.pdb
+    1033\cvtresui.dll
+    1033\linkui.dll
+    1033\nmakeui.dll
+
+16-bit C++ Tools:
+=================
+The 16-bit tools came from Visual C++ 1.52.
+    \\products\public\boneyard\us\rellang\vc152\msvc15
+
+Document on the 16-bit C++ compiler is at:
+    \\products\public\boneyard\us\rellang\vc152\msvc15\help
diff --git a/base/build/SyscallBuilder.exe b/base/build/SyscallBuilder.exe
new file mode 100644
index 0000000..f96aac0
Binary files /dev/null and b/base/build/SyscallBuilder.exe differ
diff --git a/base/build/SyscallBuilder.pdb b/base/build/SyscallBuilder.pdb
new file mode 100644
index 0000000..194453e
Binary files /dev/null and b/base/build/SyscallBuilder.pdb differ
diff --git a/base/build/Templates/ProjectItems/file.sg b/base/build/Templates/ProjectItems/file.sg
new file mode 100644
index 0000000..49440d6
--- /dev/null
+++ b/base/build/Templates/ProjectItems/file.sg
@@ -0,0 +1,10 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+/////////////////////////////////////////////////////////////////////////////////
+// start your Sing#
+/////////////////////////////////////////////////////////////////////////////////
diff --git a/base/build/Templates/Projects/AssemblyInfo.sg b/base/build/Templates/Projects/AssemblyInfo.sg
new file mode 100644
index 0000000..a3788ed
--- /dev/null
+++ b/base/build/Templates/Projects/AssemblyInfo.sg
@@ -0,0 +1,58 @@
+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("")]
+//[assembly: AssemblyDescription("")]
+//[assembly: AssemblyConfiguration("")]
+//[assembly: AssemblyCompany("")]
+//[assembly: AssemblyProduct("")]
+//[assembly: AssemblyCopyright("")]
+//[assembly: AssemblyTrademark("")]
+//[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+//[assembly: AssemblyKeyName("")]
diff --git a/base/build/Templates/Projects/Class1.sg b/base/build/Templates/Projects/Class1.sg
new file mode 100644
index 0000000..2004eeb
--- /dev/null
+++ b/base/build/Templates/Projects/Class1.sg
@@ -0,0 +1,16 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+namespace ClassLibrary1
+{
+    public class Class1
+    {
+        public Class1()
+        {
+        }
+    }
+}
diff --git a/base/build/Templates/Projects/Form.sg b/base/build/Templates/Projects/Form.sg
new file mode 100644
index 0000000..9d8bb12
--- /dev/null
+++ b/base/build/Templates/Projects/Form.sg
@@ -0,0 +1,12 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+using System.Windows.Forms;
+
+public class SingSharpForm : Form{
+  static void Main(){
+  }
+}
diff --git a/base/build/Templates/Projects/main.sg b/base/build/Templates/Projects/main.sg
new file mode 100644
index 0000000..791a37d
--- /dev/null
+++ b/base/build/Templates/Projects/main.sg
@@ -0,0 +1,12 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+
+using System;
+
+public class Test{
+  static void Main(){
+    Console.WriteLine("Sing# says hello!");
+  }
+}
diff --git a/base/build/bartok.exe b/base/build/bartok.exe
new file mode 100644
index 0000000..35435ed
Binary files /dev/null and b/base/build/bartok.exe differ
diff --git a/base/build/bartok.exe.config b/base/build/bartok.exe.config
new file mode 100644
index 0000000..663b750
--- /dev/null
+++ b/base/build/bartok.exe.config
@@ -0,0 +1,11 @@
+<!-- $Id: bartok.exe.config#2 2007/05/17 17:05:05 REDMOND\\ohodson $ -->
+<configuration>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="bartok"/>
+      </assemblyBinding>
+   </runtime>
+   <system.diagnostics>
+          <trace autoflush="true" indentsize="0"></trace>
+   </system.diagnostics>
+</configuration>
diff --git a/base/build/bartok.pdb b/base/build/bartok.pdb
new file mode 100644
index 0000000..fc59846
Binary files /dev/null and b/base/build/bartok.pdb differ
diff --git a/base/build/bartok.sln b/base/build/bartok.sln
new file mode 100644
index 0000000..202246f
--- /dev/null
+++ b/base/build/bartok.sln
@@ -0,0 +1,15 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB9-8B4A-11D0-8D11-00A0C91BC942}") = "bartok.exe", "bartok.exe", "{102DA25D-AD54-4914-BD07-E5C22B525351}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Default = Debug|Default
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{102DA25D-AD54-4914-BD07-E5C22B525351}.Debug|Default.ActiveCfg = Debug
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/base/build/bartok/Bartok.Encode.dll b/base/build/bartok/Bartok.Encode.dll
new file mode 100644
index 0000000..092f67e
Binary files /dev/null and b/base/build/bartok/Bartok.Encode.dll differ
diff --git a/base/build/bartok/Bartok.Encode.pdb b/base/build/bartok/Bartok.Encode.pdb
new file mode 100644
index 0000000..4bce481
Binary files /dev/null and b/base/build/bartok/Bartok.Encode.pdb differ
diff --git a/base/build/bartok/Bartok.SystemExtension.dll b/base/build/bartok/Bartok.SystemExtension.dll
new file mode 100644
index 0000000..d2dd355
Binary files /dev/null and b/base/build/bartok/Bartok.SystemExtension.dll differ
diff --git a/base/build/bartok/Bartok.SystemExtension.pdb b/base/build/bartok/Bartok.SystemExtension.pdb
new file mode 100644
index 0000000..423a60d
Binary files /dev/null and b/base/build/bartok/Bartok.SystemExtension.pdb differ
diff --git a/base/build/bartok/bartok.Analysis.dll b/base/build/bartok/bartok.Analysis.dll
new file mode 100644
index 0000000..3e3e52b
Binary files /dev/null and b/base/build/bartok/bartok.Analysis.dll differ
diff --git a/base/build/bartok/bartok.Analysis.pdb b/base/build/bartok/bartok.Analysis.pdb
new file mode 100644
index 0000000..a6bb542
Binary files /dev/null and b/base/build/bartok/bartok.Analysis.pdb differ
diff --git a/base/build/bartok/bartok.Backend.dll b/base/build/bartok/bartok.Backend.dll
new file mode 100644
index 0000000..3792a98
Binary files /dev/null and b/base/build/bartok/bartok.Backend.dll differ
diff --git a/base/build/bartok/bartok.Backend.pdb b/base/build/bartok/bartok.Backend.pdb
new file mode 100644
index 0000000..d4c1be6
Binary files /dev/null and b/base/build/bartok/bartok.Backend.pdb differ
diff --git a/base/build/bartok/bartok.CfgUtil.dll b/base/build/bartok/bartok.CfgUtil.dll
new file mode 100644
index 0000000..f6ae61c
Binary files /dev/null and b/base/build/bartok/bartok.CfgUtil.dll differ
diff --git a/base/build/bartok/bartok.CfgUtil.pdb b/base/build/bartok/bartok.CfgUtil.pdb
new file mode 100644
index 0000000..bcfc13b
Binary files /dev/null and b/base/build/bartok/bartok.CfgUtil.pdb differ
diff --git a/base/build/bartok/bartok.Coff.dll b/base/build/bartok/bartok.Coff.dll
new file mode 100644
index 0000000..3797589
Binary files /dev/null and b/base/build/bartok/bartok.Coff.dll differ
diff --git a/base/build/bartok/bartok.Coff.pdb b/base/build/bartok/bartok.Coff.pdb
new file mode 100644
index 0000000..3866c40
Binary files /dev/null and b/base/build/bartok/bartok.Coff.pdb differ
diff --git a/base/build/bartok/bartok.Convert.dll b/base/build/bartok/bartok.Convert.dll
new file mode 100644
index 0000000..33cdc63
Binary files /dev/null and b/base/build/bartok/bartok.Convert.dll differ
diff --git a/base/build/bartok/bartok.Convert.pdb b/base/build/bartok/bartok.Convert.pdb
new file mode 100644
index 0000000..092027d
Binary files /dev/null and b/base/build/bartok/bartok.Convert.pdb differ
diff --git a/base/build/bartok/bartok.Datatype.dll b/base/build/bartok/bartok.Datatype.dll
new file mode 100644
index 0000000..2f561e1
Binary files /dev/null and b/base/build/bartok/bartok.Datatype.dll differ
diff --git a/base/build/bartok/bartok.Datatype.pdb b/base/build/bartok/bartok.Datatype.pdb
new file mode 100644
index 0000000..d4f4dae
Binary files /dev/null and b/base/build/bartok/bartok.Datatype.pdb differ
diff --git a/base/build/bartok/bartok.DebugInfo.dll b/base/build/bartok/bartok.DebugInfo.dll
new file mode 100644
index 0000000..95007db
Binary files /dev/null and b/base/build/bartok/bartok.DebugInfo.dll differ
diff --git a/base/build/bartok/bartok.DebugInfo.pdb b/base/build/bartok/bartok.DebugInfo.pdb
new file mode 100644
index 0000000..f663de2
Binary files /dev/null and b/base/build/bartok/bartok.DebugInfo.pdb differ
diff --git a/base/build/bartok/bartok.Ir.dll b/base/build/bartok/bartok.Ir.dll
new file mode 100644
index 0000000..ffb7dbf
Binary files /dev/null and b/base/build/bartok/bartok.Ir.dll differ
diff --git a/base/build/bartok/bartok.Ir.pdb b/base/build/bartok/bartok.Ir.pdb
new file mode 100644
index 0000000..bd94cca
Binary files /dev/null and b/base/build/bartok/bartok.Ir.pdb differ
diff --git a/base/build/bartok/bartok.Lir.dll b/base/build/bartok/bartok.Lir.dll
new file mode 100644
index 0000000..9e98abd
Binary files /dev/null and b/base/build/bartok/bartok.Lir.dll differ
diff --git a/base/build/bartok/bartok.Lir.pdb b/base/build/bartok/bartok.Lir.pdb
new file mode 100644
index 0000000..cf3405a
Binary files /dev/null and b/base/build/bartok/bartok.Lir.pdb differ
diff --git a/base/build/bartok/bartok.MSIL.dll b/base/build/bartok/bartok.MSIL.dll
new file mode 100644
index 0000000..5e4ce8b
Binary files /dev/null and b/base/build/bartok/bartok.MSIL.dll differ
diff --git a/base/build/bartok/bartok.MSIL.pdb b/base/build/bartok/bartok.MSIL.pdb
new file mode 100644
index 0000000..9465c76
Binary files /dev/null and b/base/build/bartok/bartok.MSIL.pdb differ
diff --git a/base/build/bartok/bartok.Mangle.dll b/base/build/bartok/bartok.Mangle.dll
new file mode 100644
index 0000000..ce9b9a1
Binary files /dev/null and b/base/build/bartok/bartok.Mangle.dll differ
diff --git a/base/build/bartok/bartok.Mangle.pdb b/base/build/bartok/bartok.Mangle.pdb
new file mode 100644
index 0000000..8e0ff80
Binary files /dev/null and b/base/build/bartok/bartok.Mangle.pdb differ
diff --git a/base/build/bartok/bartok.Opt.dll b/base/build/bartok/bartok.Opt.dll
new file mode 100644
index 0000000..96a80ce
Binary files /dev/null and b/base/build/bartok/bartok.Opt.dll differ
diff --git a/base/build/bartok/bartok.Opt.pdb b/base/build/bartok/bartok.Opt.pdb
new file mode 100644
index 0000000..e93441a
Binary files /dev/null and b/base/build/bartok/bartok.Opt.pdb differ
diff --git a/base/build/bartok/bartok.Profile.dll b/base/build/bartok/bartok.Profile.dll
new file mode 100644
index 0000000..33c3128
Binary files /dev/null and b/base/build/bartok/bartok.Profile.dll differ
diff --git a/base/build/bartok/bartok.Profile.pdb b/base/build/bartok/bartok.Profile.pdb
new file mode 100644
index 0000000..67b5383
Binary files /dev/null and b/base/build/bartok/bartok.Profile.pdb differ
diff --git a/base/build/bartok/bartok.Regalloc.dll b/base/build/bartok/bartok.Regalloc.dll
new file mode 100644
index 0000000..cf5adab
Binary files /dev/null and b/base/build/bartok/bartok.Regalloc.dll differ
diff --git a/base/build/bartok/bartok.Regalloc.pdb b/base/build/bartok/bartok.Regalloc.pdb
new file mode 100644
index 0000000..5a1098a
Binary files /dev/null and b/base/build/bartok/bartok.Regalloc.pdb differ
diff --git a/base/build/bartok/bartok.Tables.dll b/base/build/bartok/bartok.Tables.dll
new file mode 100644
index 0000000..18aa17e
Binary files /dev/null and b/base/build/bartok/bartok.Tables.dll differ
diff --git a/base/build/bartok/bartok.Tables.pdb b/base/build/bartok/bartok.Tables.pdb
new file mode 100644
index 0000000..d8a6053
Binary files /dev/null and b/base/build/bartok/bartok.Tables.pdb differ
diff --git a/base/build/bartok/bartok.Utility.dll b/base/build/bartok/bartok.Utility.dll
new file mode 100644
index 0000000..db09dce
Binary files /dev/null and b/base/build/bartok/bartok.Utility.dll differ
diff --git a/base/build/bartok/bartok.Utility.pdb b/base/build/bartok/bartok.Utility.pdb
new file mode 100644
index 0000000..08dbcc9
Binary files /dev/null and b/base/build/bartok/bartok.Utility.pdb differ
diff --git a/base/build/bartok/pdbloader.dll b/base/build/bartok/pdbloader.dll
new file mode 100644
index 0000000..b0748b9
Binary files /dev/null and b/base/build/bartok/pdbloader.dll differ
diff --git a/base/build/bartok/pdbloader.pdb b/base/build/bartok/pdbloader.pdb
new file mode 100644
index 0000000..0fd0c1a
Binary files /dev/null and b/base/build/bartok/pdbloader.pdb differ
diff --git a/base/build/bootd.exe b/base/build/bootd.exe
new file mode 100644
index 0000000..2cdfc7c
Binary files /dev/null and b/base/build/bootd.exe differ
diff --git a/base/build/bootd.pdb b/base/build/bootd.pdb
new file mode 100644
index 0000000..7abf39a
Binary files /dev/null and b/base/build/bootd.pdb differ
diff --git a/base/build/boothw.cmd b/base/build/boothw.cmd
new file mode 100644
index 0000000..c975a41
--- /dev/null
+++ b/base/build/boothw.cmd
@@ -0,0 +1,20 @@
+@echo off
+
+setlocal enableextensions
+setlocal enabledelayedexpansion
+setlocal
+
+if not exist "%SINGULARITY_ROOT%\buildcfg.cmd" (
+    echo Build configuration settings file not found.  Has a distribution been built?
+    exit /b 1
+)
+
+call "%SINGULARITY_ROOT%\buildcfg.cmd" >nul
+
+set MacAddress=00-00-00-00-00-00-00
+set MacAddress=00-08-02-01-b8-a1
+set MacAddress=00-0c-76-4e-ee-37
+
+echo Boot serving host with MAC address: !MacAddress!
+
+start bootd.exe /dhcp /b:SINGLDR /m:!MacAddress! /tftp /e %_BOOTD_TFTP_DIR% %*
diff --git a/base/build/boottest.cmd b/base/build/boottest.cmd
new file mode 100644
index 0000000..6b6b169
--- /dev/null
+++ b/base/build/boottest.cmd
@@ -0,0 +1,178 @@
+@echo off
+
+setlocal enableextensions enabledelayedexpansion
+
+set StartVpcFlags=
+set DefaultBootType=CD
+
+:parse
+if /I .%1==./wait (
+    set StartVpcFlags=/wait !StartVpcFlags!
+    shift
+    goto :parse
+)
+
+if /I .%1==./cd (
+    set BootType=cd
+    shift
+    goto :parse
+)
+
+if /I .%1==./net (
+    set BootType=net
+    shift
+    goto :parse
+)
+
+if not defined BootType (
+    set BootType=%DefaultBootType%
+)
+
+@rem --------------------------------------------------------------------------
+@rem Stage 1 : Check VPC configuration file exists
+
+if "%1"=="" (
+    call :Usage "%0"
+    exit /b 1
+)
+
+if "%~x1" == ".vmc" (
+    set VpcConfig=%~1
+) else (
+    set VpcConfig=%~1.vmc
+)
+shift
+
+if not exist "%VpcConfig%" (
+    echo.Specified Virtual PC image not found:
+    echo.  %VpcConfig%
+    exit /b 1
+)
+
+if not exist "%SINGULARITY_ROOT%\buildcfg.cmd" (
+    echo Build configuration settings file not found.  Has a distribution been built?
+    exit /b 1
+)
+
+call "%SINGULARITY_ROOT%\buildcfg.cmd" >nul
+
+if /i "%BootType%" == "net" (
+    call :NetworkBoot "%VpcConfig%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+    exit /b %ErrorLevel%
+) else if /i "%BootType%" == "cd" (
+    call :CdBoot "%VpcConfig%"
+    exit /b %ErrorLevel%
+) else (
+    echo No boot type selected.
+    exit /b 1
+)
+
+rem ---------------------------------------------------------------------------
+rem NetworkBoot <vpc image file> [<bootd args...>]
+:NetworkBoot
+
+set MacAddress=00-00-00-00-00-00
+set MacCount=0
+for /F "usebackq skip=1 tokens=4 delims=<> " %%m in (`find "ethernet_card_address" "%VpcConfig%"`) do (
+    if !MacCount! EQU 0 (
+        set s=%%m
+        set MacAddress=!s:~0,2!-!s:~2,2!-!s:~4,2!-!s:~6,2!-!s:~8,2!-!s:~10,2!
+    )
+    set /a MacCount=!MacCount!+1
+)
+
+if !MacCount! EQU 0 (
+    echo.Found !MacCount! Mac addresses in %VpcConfig%, but expected 1.
+    exit /b 1
+) else if !MacCount! GEQ 2 (
+    echo.*** Warning found multiple MAC addresses in %VpcConfig%.
+    echo.*** Passing !MacAddress! onto to bootd.
+)
+
+@rem A cursory glance that the loopback adapter is installed.
+ipconfig | find /i "loopback"
+if ErrorLevel 1 (
+    echo Warning: Loopback adapter does not appear to be installed.
+    echo See RDK instructions for details on installing the loopback adapter.
+)
+
+call :SubstituteIsoInConfigFile "%VpcConfig%" "%SINGULARITY_ROOT%\build\empty.iso"
+if ErrorLevel 1 (
+    exit /b 1
+)
+
+start bootd.exe /dhcp /b:SINGLDR /m:!MacAddress!,10.99.99.2 /tftp /e %_BOOTD_TFTP_DIR% %*
+call :StartVpc "!VpcConfig!" !StartVpcFlags!
+exit /b %ErrorLevel%
+
+rem ---------------------------------------------------------------------------
+rem StartVpc <vpc image file> <startArgs>
+:StartVpc
+
+rem VPC has daft command line options. If started once with -startvm
+rem it registers the VM and then launches it.  If the hapless user tries
+rem to invoke the same command, VPC complains that the VM is already
+rem registered.
+rem
+rem So this scripts checks the location where VPC stores links to
+rem known VMC files to see if the VM already exists.  This is annoyingly
+rem stupid and fragile, ie if a user creates to .vmc files with the same
+rem name.  Details, details, details.
+
+set VpcExe=%ProgramFiles(x86)%\Microsoft Virtual PC\Virtual PC.exe
+if not exist "%VpcExe%" (
+    set VpcExe=%ProgramFiles%\Microsoft Virtual PC\Virtual PC.exe
+)
+
+if exist "%AppData%\Microsoft\Virtual PC\Virtual Machines\%~n1.lnk" (
+    rem User has registered VM already.
+    start "" %2 %3 %4 %5 "%VpcExe%" -quiet -singlepc -pc "%~n1" -launch
+) else (
+    rem A new VM to be started and registered.
+    start "" %2 %3 %4 %5 "%VpcExe%" -quiet -singlepc -startvm "%~f1"
+)
+
+exit /b 0
+
+rem ---------------------------------------------------------------------------
+rem CdBoot <vpc image file>
+:CdBoot
+
+call :SubstituteIsoInConfigFile "%~1" "%_BOOT_CD%"
+if ErrorLevel 1 (
+    exit /b 1
+)
+
+call :StartVpc "%~1"
+exit /b %ErrorLevel%
+
+rem ---------------------------------------------------------------------------
+rem :SubstituteIsoInConfigFile <ConfigFile> <IsoImage>
+:SubstituteIsoInConfigFile
+
+set TmpImage=%TEMP%\%~n1
+substitute ">[^>]*[.iso]</" ">%~2</" "%~1" "%TmpImage%"
+if ErrorLevel 1 (
+    echo Failed to set CD image in vpc configuration file: "%~1"
+    exit /b 1
+)
+
+copy /y "%TmpImage%" "%~1" 1>nul
+if ErrorLevel 1 (
+    echo Failed to copy back updated VMC image.
+    exit /b 1
+)
+
+exit /b 0
+
+rem ---------------------------------------------------------------------------
+rem :Usage <script name>
+:Usage
+   echo The purpose of this script is to launch Virtual PC and boot it in
+   echo the specified manner (network boot or CD).
+   echo.
+   echo Usage:
+   echo.    %~n0 ^<bootType^> ^<VPC Image^> ^[ options ^]
+   echo.
+   echo where ^<boottype^> is either /CD or /Net (case-insensitive)
+   echo and options exist only for network boot.
diff --git a/base/build/bvt.cmd b/base/build/bvt.cmd
new file mode 100644
index 0000000..6e28861
--- /dev/null
+++ b/base/build/bvt.cmd
@@ -0,0 +1,36 @@
+@echo off
+
+if "%1" == "" (
+    goto :usage
+)
+
+call %SINGULARITY_ROOT%\buildcfg.cmd
+
+echo Logging results to %SINGULARITY_ROOT%\bvt.log
+
+call boottest.cmd %1 /dhcp /c:bvt
+start /wait "Singularity BVT Logger" kd.exe -logo %SINGULARITY_ROOT%\bvt.log -k com:pipe,port=\\.\pipe\kd,resets=0,reconnect
+
+taskkill /IM kd.exe 2>&1 1>nul
+findstr /c:"Power-off via APM." %SINGULARITY_ROOT%\bvt.log
+@if not ErrorLevel 1 (
+@echo ERRORLEVEL=%ERRORLEVEL%
+@echo.
+@echo.
+@echo BVT Succeeded.
+@echo.
+exit /b 0
+) ELSE (
+@echo ERRORLEVEL=%ERRORLEVEL%
+@echo.
+@echo.
+@echo BVT Failed.
+@echo.
+exit /b 1
+)
+
+:usage
+echo.Usage: %0 ^<VmcFile^>
+echo.
+echo.Run BVT using specified Virtual PC image file.
+exit /b 1
diff --git a/base/build/c1.dll b/base/build/c1.dll
new file mode 100644
index 0000000..b38ca7e
Binary files /dev/null and b/base/build/c1.dll differ
diff --git a/base/build/c1.err b/base/build/c1.err
new file mode 100644
index 0000000..4c67d98
--- /dev/null
+++ b/base/build/c1.err
@@ -0,0 +1,1091 @@
+
+
+
+
+						
+
+4001	"nonstandard extension 'single line comment' was used"
+4002	"too many actual parameters for macro '%s'"
+4003	"not enough actual parameters for macro '%s'"
+4004	"incorrect construction after 'defined'"
+4005	"'%Fs' : macro redefinition"
+4006	"#undef expected an identifier"
+4007	"'%Fs' : must be '%Fs'"
+4008	"'%Fs' : '%Fs' attribute ignored"
+4009	"string too big; trailing characters truncated"
+4010	"single-line comment contains line-continuation character"
+4011	"'%Fs' : identifier was truncated to '%d' characters"
+4012	"float constant in a cross compilation" 
+4013	"'%Fs' undefined; assuming extern returning int"
+4014	"concatenating mismatched wide strings"
+4015	"'%Fs' : type of bit field must be integral"
+4016	"'%s' : no function return type; using 'int' as default" 
+4017	"cast of 'int' expression to far pointer"
+4018	"'%Fs' : signed/unsigned mismatch"
+4019	"empty statement at global scope"
+4020	"'%Fs' : too many actual parameters"
+4021	"'%Fs' : too few actual parameters"
+4022	"'%Fs' : pointer mismatch for actual parameter %d"
+4023	"'%Fs' : based pointer passed to unprototyped function : parameter %d"
+4024	"'%Fs' : different types for formal and actual parameter %d"
+4025	"'%Fs' : based pointer passed to function with variable arguments: parameter %d"
+4026	"function declared with formal parameter list"
+4027	"function declared without formal parameter list"
+4028	"formal parameter %d different from declaration"
+4029	"declared formal parameter list different from definition"
+4030	"first formal parameter list longer than the second list"
+4031	"second formal parameter list longer than the first list"
+4032	"formal parameter %d has different type when promoted"
+4033	"'%Fs' must return a value"
+4034	"sizeof returns 0"
+4035	"'%Fs' : no return value"
+4036	"unnamed %Fs as actual parameter"
+4037	"conflicting ambient class modifiers"
+4038	"'%Fs' : illegal ambient class modifier"
+4039	"ambient class modifier on reference ignored"
+4040	"memory attribute on '%Fs' ignored"
+4041	"compiler limit : terminating browser output"
+4042	"'%Fs' : has bad storage class"
+4043	"function specifier used more than once"
+4044	"specifier __huge on '%Fs' ignored; can only be applied to array"
+4045	"'%Fs' : array bounds overflow"
+4046	"'%Fs' : unsized array treated as %Fs"
+4047	"'%Fs' : different levels of indirection"
+4048	"different declared array subscripts"
+4049	"'%Fs' : indirection to different types"
+4050	"'%Fs' : different code attributes"
+4051	"type conversion; possible loss of data"
+4052	"function declarations different; one contains variable arguments"
+4053	"one void operand for '?:'"
+4054	"'%Fs' : from function pointer '%Fs' to data pointer '%Fs'"
+4055	"'%Fs' : from data pointer '%Fs' to function pointer '%Fs'"
+4056	"overflow in floating-point constant arithmetic"
+4057	"'%Fs' : indirection to slightly different base types"
+4058	"unions are now aligned on alignment requirement, not size"
+4059	"pascal string too big, length byte is length % 256"
+
+4060	"switch statement contains no 'case' or 'default' labels"
+4061	"enumerate '%Fs' in switch of enum '%Fs' is not explicitly handled by a case label"
+4062	"enumerate '%Fs' in switch of enum '%Fs' is not handled"
+4063	"case '%ld' is not a valid value for switch of enum '%Fs'"
+4064	"switch of incomplete enum '%Fs'"
+4065	"switch statement contains 'default' but no 'case' labels"
+
+4067	"unexpected characters following '%Fs' directive - newline expected"
+4068	"unknown pragma"
+4069	"long double is the same precision as double"
+4070	"return of a 'void' expression"
+4071	"'%Fs' : no function prototype given"
+4072	"'%Fs' : no function prototype on __fastcall function"
+4073	"initializers put in library initialization area"
+4074	"initializers put in compiler reserved initialization area"
+4075	"initializers put in unrecognized initialization area"
+4076	"'%Fs' : can be used on integral types only"
+4077	"unknown check_stack option"
+4078	"case constant '%ld' too big for the type of the switch expression"
+4079	"unexpected token '%Fs'"
+4080	"expected identifier for segment name; found '%Fs'"
+4081	"expected a comma; found '%Fs'"
+4082	"expected an identifier; found '%Fs'"
+4083	"expected '('; found '%Fs'"
+4084	"expected a pragma directive; found '%Fs'"
+4085	"expected pragma parameter to be 'on' or 'off'"
+4086	"expected pragma parameter to be '1', '2', '4', '8', or '16'"
+4087	"'%Fs' : declared with 'void' parameter list"
+4088	"'%Fs' : pointer mismatch in actual parameter %d, formal parameter %d"
+4089	"'%Fs' : different types in actual parameter %d, formal parameter %d"
+4090	"'%Fs' : different const or volatile qualifiers"
+4091	"no symbols were declared"
+4092	"sizeof returns 'unsigned long'"
+4093	"unescaped newline in character constant in inactive code"
+4094	"untagged '%Fs' declared no symbols"
+4095	"expected ')'; found '%Fs'"
+4096	"'%Fs' must be used with '%Fs'"
+4097	"nonstandard extension : typedef-name '%Fs' used as synonym for class-name '%Fs'"
+4098	"'%Fs' : 'void' function returning a value"
+4099	"'%Fs' : type name first seen using '%Fs' now seen using '%Fs'"
+4100	"'%Fs' : unreferenced formal parameter"
+4101	"'%Fs' : unreferenced local variable"
+4102	"'%Fs' : unreferenced label"
+4103	"'%Fs' : used #pragma pack to change alignment"
+4104	"'%Fs' : near data in same_seg pragma; ignored"
+4105	"'%Fs' : code modifiers only on function or pointer to function"
+4106	"pragma requires an integer between 1 and 127"
+4107	"pragma requires an integer between 15 and 255"
+4108	"pragma requires an integer between 79 and 132"
+4109	"unexpected identifier '%Fs'"
+4110	"unexpected token 'number'"
+4111	"unexpected token 'string'"
+4112	"#line requires an integer between 1 and 32767"
+4113	"function parameter lists differed"
+4114	"same type qualifier used more than once"
+4115	"'%Fs' : named type definition in parentheses"
+4116	"unnamed type definition in parentheses"
+4117	"macro name '%Fs' is reserved, '%Fs' ignored"
+4118	"pragma not supported during fast compile"
+4119	"different bases '%Fs' and '%Fs' specified"
+4120	"based/unbased mismatch"
+4121	"'%Fs' : alignment of a member was sensitive to packing"
+4122	"'%Fs' : alloc_text applicable only to functions with C linkage"
+4123	"different base expressions specified"
+4124	"__fastcall with stack checking is inefficient"
+4125	"decimal digit terminates octal escape sequence"
+4126	"'%c' : unknown memory-model command-line option"
+4127	"conditional expression is constant"
+4128	"storage-class specifier after type"
+4129	"'%c' : unrecognized character escape sequence"
+4130	"'%Fs' : logical operation on address of string constant"
+4131	"'%Fs' : uses old-style declarator"
+4132	"'%Fs' : const object should be initialized"
+4133	"'%Fs' : incompatible types - pointer to 'void' combined with pointer to type"
+4134	"conversion between pointers to members of same class"
+4135	"conversion between different integral types"
+4136	"conversion between different floating-point types"
+4137	"'%Fs' : no return value from floating-point function"
+4138	"'*/' found outside of comment"
+4139	"'0x%lx' : hex escape sequence is out of range"
+4140	"'%Fs' : redefined, preceding references may be invalid"  
+4141	"'%Fs' : used more than once"
+4142	"benign redefinition of type"
+4143	"pragma 'same_seg' not supported; use __based allocation"
+4144	"'%Fs' : relational expression as switch expression"
+4145	"'%Fs' : relational expression as switch expression; possible confusion with '%Fs'"
+4146	"unary minus operator applied to unsigned type, result still unsigned"
+4147	"'%Fs' : '%Fs' ignored on pointer and reference declarations"
+4148	"'%Fs' : DS != SS for '__near' '%Fs'"
+4149	"'%Fs' : different ambient model than base class '%Fs'"
+4150	"deletion of pointer to incomplete type '%Fs'; no destructor called"
+4151	"'%Fs' : operator should be explicitly '%Fs'"
+4152	"nonstandard extension, function/data pointer conversion in expression"
+4153	"function/data pointer conversion in expression"
+4154	"deletion of an array expression; conversion to pointer supplied"
+4155	"deletion of an array expression without using the array form of 'delete'"
+4156	"deletion of an array expression without using the array form of 'delete'; array form substituted"
+4157	"pragma was ignored by C compiler"
+4158	"assuming #pragma pointers_to_members(full_generality, %Fs_inheritance)"
+
+4184	"near call to thunk for '%Fs' in a different segment"
+
+4200	"nonstandard extension used : zero-sized array in struct/union"
+4201	"nonstandard extension used : nameless struct/union"
+4202	"nonstandard extension used : '...': prototype parameter in name list illegal"
+4203	"nonstandard extension used : union with static member variable"
+4204	"nonstandard extension used : non-constant aggregate initializer"
+4205	"nonstandard extension used : static function declaration in function scope"
+4206	"nonstandard extension used : translation unit is empty"
+4207	"nonstandard extension used : extended initializer form"
+4208	"nonstandard extension used : delete [exp] - exp evaluated but ignored"
+4209	"nonstandard extension used : benign typedef redefinition"
+4210	"nonstandard extension used : function given file scope"
+4211	"nonstandard extension used : redefined extern to static"
+4212	"nonstandard extension used : function declaration used ellipsis"
+4213	"nonstandard extension used : cast on l-value"
+4214	"nonstandard extension used : bit field types other than int"
+4215	"nonstandard extension used : long float"
+4216	"nonstandard extension used : float long"
+4217	"nonstandard extension used : function declaration from a previous block"
+4218	"nonstandard extension used : must specify at least a storage class or a type"
+4219	"nonstandard extension used : trailing ',' used for variable argument list"
+4220	"varargs matches remaining parameters"
+4221	"nonstandard extension used : '%Fs' : cannot be initialized using address of automatic variable '%Fs'"
+4222	"nonstandard extension used : '%Fs' : 'static' should not be used on member functions defined at file scope"
+4223	"nonstandard extension used : non-lvalue array converted to pointer"
+
+4241	"'%Fs' : member access is restricted"
+
+4243	"%Fs conversion from '%Fs' to '%Fs' exists, but is inaccessible"
+
+4245	"'friend' specified for nonexistent function '%Fs'"
+
+4247	"'%Fs' not accessible because '%Fs' uses '%Fs' to inherit from '%Fs'"
+4248	"'%Fs' : cannot access %Fs %Fs declared in class '%Fs'"
+4249	"'%Fs' : no path to %Fs %Fs declared in virtual base '%Fs'"
+4250	"'%Fs' : inherits '%Fs::%Fs' via dominance"
+4251	"'%Fs' : base type '%Fs' should be exported to export %Fs '%Fs'"
+4252	"'%Fs' is not defined; cannot specify CodeView information"
+
+4260	"no override, '%Fs::%Fs' has %Fs 'this' memory model whereas '%Fs::%Fs' has %Fs 'this' memory model"
+4261	"no override, '%Fs::%Fs' has %Fs calling convention whereas '%Fs::%Fs' has %Fs calling convention"
+4262	"no override, '%Fs::%Fs' has %Fs 'this' whereas '%Fs::%Fs' has %Fs 'this'"
+
+4270	"'%Fs' : do not initialize a non-const '%Fs' with a non-lvalue '%Fs' function return"
+
+4300	"conversion of pointer to nonintegral type"
+
+4305	"'%Fs' : truncation from '%Fs' to '%Fs'"
+4306	"'%Fs' : conversion from '%Fs' to '%Fs' of greater size"
+4307	"'%Fs' : integral constant overflow"
+4308	"negative integral constant converted to unsigned type"
+4309	"'%Fs' : truncation of constant value"
+
+4341	"'%Fs' : signed value is out of range for enum constant"
+4342	"precision lost in initialization of enum constant"
+
+4354	"'%Fs' : initialization of reference to member requires a temporary variable"
+4355	"'this' : used in base member initializer list"
+
+4385	"%Fs the '%Fs' in base '%Fs'"
+4386	"%Fs to the '%Fs' in base '%Fs'"
+4387	"'%Fs' : was considered"
+
+4401	"'%Fs' : member is bit field"
+4402	"must use PTR operator"
+4403	"illegal PTR operator"
+4404	"period on directive ignored"
+4405	"'%Fs' : identifier is reserved word"
+4406	"operand on directive ignored"
+
+4409	"illegal instruction size"
+4410	"illegal size for operand"
+4411	"'%Fs' : symbol resolves to displacement register"
+
+4414	"'%Fs' : short jump to function converted to near"
+
+4500	"'%Fs' : class has private/protected data members; user-defined constructor advised"
+4501	"'%Fs' : use of '::' unnecessary here"
+4502	"'linkage' requires use of keyword 'extern'"
+
+4504	"type still ambiguous after parsing %d tokens, assuming declaration"
+4505	"'%Fs' : unreferenced local function has been removed"
+4506	"no definition for inline function '%Fs'"
+4507	"explicit linkage specified after default linkage was used"
+4508	"'%Fs' : function should return a value; 'void' return type assumed"
+
+4510	"'%Fs' : default constructor could not be generated"
+4511	"'%Fs' : copy constructor could not be generated"
+4512	"'%Fs' : assignment operator could not be generated"
+4513	"'%Fs' : destructor could not be generated"
+
+4520	"'%Fs' : multiple default constructors specified"
+4521	"'%Fs' : multiple copy constructors specified"
+4522	"'%Fs' : multiple assignment operators specified"
+4523	"'%Fs' : multiple destructors specified"
+4524	"'%Fs' : redundant use of 'friend' on destructor"
+4525	"'%Fs' : redundant use of 'friend' on constructor"
+
+4527	"instances of %Fs '%Fs' can never be destroyed - user-defined destructor required"
+4528	"illegal 'pure' syntax, must be '= 0'"
+
+4607	"'%Fs' : must be initialized in constructor base/member initializer list"
+
+4610	"%Fs '%Fs' can never be instantiated - user defined constructor required"
+
+4612	"bad #pragma syntax, pragma ignored"
+4613	"'%Fs' : class of segment cannot be changed"
+4614	"'%Fs' : varargs parameters with this type were promoted"	
+4615	"#pragma warning : unknown user warning type"
+4616	"#pragma warning : warning number '%d' out of range, must be between '%d' and '%d'"
+4617	"#pragma warning : invalid warning number"
+
+4620	"no postfix form of 'operator ++' found for type '%Fs', using prefix form"
+4621	"no postfix form of 'operator --' found for type '%Fs', using prefix form"
+4622	"overwriting debug information formed during creation of the precompiled header in object file: '%s'"
+
+4630	"'%Fs' : '%Fs' storage-class specifier illegal on member definition"
+
+4650	"debugging information not in precompiled header; only global symbols from the header will be available"
+4651	"'/D%s' specified for precompiled header but not for current compile"
+4652	"command-line option '%Fs' inconsistent with precompiled header; precompiled header option ignored"
+
+4699	"Note: %Fs"
+
+4706	"assignment within conditional expression" 
+
+4710	"'%Fs' : function not expanded" 
+
+4726	"'%c' : unknown memory model command-line option"
+4727	"conditional expression is constant"
+
+4741	"/Oq option ignored for __fastcall function '%Fs'"
+
+4746	"'%Fs' : unsized array given size %Fs"
+
+4756	"overflow in constant arithmetic"	
+
+4758	"address of automatic (local) variable taken, DS != SS" 
+4759	"segment lost in conversion"	
+4760	"'%Fs' : segment lost in initialization"	
+
+4761	"integral size mismatch in argument : conversion supplied"	
+4762	"near/far mismatch in argument : conversion supplied"	
+
+4769	"conversion of near pointer to long integer"	
+
+4785	"near call to '%Fs' in different segment" 
+
+4788	"'%Fs' : identifier was truncated to '%d' characters"
+
+4793	"native code generated for p-code function '%Fs' with inline assembly"
+
+4900	"intermediate language mismatch between '%s' version '%ld' and '%s' version '%ld'"
+
+4000	"UNKNOWN WARNING\n\t\tContact Microsoft Product Support Services"
+						
+
+2001	"newline in constant"
+2002	"invalid wide-character constant"
+2003	"expected 'defined id'"
+2004	"expected 'defined(id)'"
+2005	"#line expected a line number, found '%Fs'"
+2006	"#include expected a filename, found '%Fs'"
+2007	"#define syntax"
+2008	"'%c' : unexpected in macro definition"
+2009	"reuse of macro formal '%Fs'"
+2010	"'%c' : unexpected in macro formal parameter list"
+2011	"'%Fs' : '%Fs' type redefinition"
+2012	"missing name following '<'"
+2013	"missing '>'"
+2014	"preprocessor command must start as first nonwhite space"
+2015	"too many characters in constant"
+2016	"no closing single quotation mark"
+2017	"illegal escape sequence"
+2018	"unknown character '0x%x'"
+2019	"expected preprocessor directive, found '%c'"
+2020	"'%Fs' : '%Fs' member redefinition"
+2021	"expected exponent value, not '%c'"
+2022	"'%ld' : too big for character"
+2023	"divide by 0"
+2024	"mod by 0"
+2025	"'%s' : enum/struct/union type redefinition"		
+2026	"string too big, trailing characters truncated"
+2027	"use of undefined type '%Fs'"
+2028	"struct/union member must be inside a struct/union"
+2029	"left of '%s' specifies undefined class/struct/union '%Fs'"
+2030	"'%Fs' : struct/union member redefinition"		
+2031	"'%Fs' : function cannot be struct/union member"	
+2032	"'%Fs' : function cannot be member of %Fs '%Fs'"
+2033	"'%Fs' : bit field cannot have indirection"
+2034	"'%Fs' : type of bit field too small for number of bits"
+2035	"struct/union '%Fs' : unknown size"			
+2036	"'%Fs' : unknown size"
+2037	"left of '%s' specifies undefined struct/union '%Fs'"
+2038	"'%s' : not struct/union member"			
+2039	"'%Fs' : is not a member of '%Fs'"
+2040	"'%Fs' : different levels of indirection"
+2041	"illegal digit '%c' for base '%d'"
+2042	"signed/unsigned keywords mutually exclusive"
+2043	"illegal break"
+2044	"illegal continue"
+2045	"'%Fs' : label redefined"
+2046	"illegal case"
+2047	"illegal default"
+2048	"more than one default"
+2049	"case value '%ld' already used"
+2050	"switch expression not integral"
+2051	"case expression not constant"
+2052	"case expression not integral"
+2053	"'%Fs' : wide string mismatch"
+2054	"expected '(' to follow '%Fs'"
+2055	"expected formal parameter list, not a type list"
+2056	"illegal expression"
+2057	"expected constant expression"
+2058	"constant expression is not integral"
+2059	"syntax error : '%Fs'"
+2060	"syntax error : end of file found"
+2061	"syntax error : identifier '%Fs'"
+2062	"type '%Fs' unexpected"
+2063	"'%Fs' : not a function"
+2064	"term does not evaluate to a function"
+2065	"'%Fs' : undeclared identifier"
+2066	"cast to function type is illegal"
+2067	"cast to array type is illegal"
+2068	"illegal cast from '%Fs' to '%Fs'"
+2069	"cast of 'void' term to non-'void'"
+2070	"illegal sizeof operand"
+2071	"'%Fs' : illegal storage class"
+2072	"'%Fs' : initialization of a function"
+2073	"'%Fs' : partially initialized array requires a default constructor"
+2074	"'%Fs' : '%Fs' initialization needs curly braces"
+2075	"'%Fs' : array initialization needs curly braces"
+2076	"'%Fs' : struct/union initialization needs curly braces" 
+2077	"nonscalar field initializer '%Fs'"
+2078	"too many initializers"
+2079	"'%Fs' uses undefined class/struct/union '%Fs'"
+2080	"illegal __far __fastcall function or __saveregs function"
+2081	"'%Fs' : name in formal parameter list illegal"
+2082	"redefinition of formal parameter '%Fs'"
+2083	"%Fs comparison illegal"
+2084	"function '%Fs' already has a body"
+2085	"'%Fs' : not in formal parameter list"
+2086	"'%Fs' : redefinition"
+2087	"'%Fs' : missing subscript"
+2088	"'%Fs' : illegal for %Fs"
+2089	"'%Fs' : '%Fs' too large"
+2090	"function returns array"
+2091	"function returns function"
+2092	"array element type cannot be function"
+2093	"'%Fs' : cannot be initialized using address of automatic variable '%Fs'"
+2094	"label '%Fs' was undefined"
+2095	"'%Fs' : actual parameter has type 'void' : parameter %d"
+2096	"struct/union comparison illegal"		
+2097	"illegal initialization"
+2098	"expression is not an address"
+2099	"initializer is not a constant"
+2100	"illegal indirection"
+2101	"'%Fs' on constant"
+2102	"'%Fs' requires l-value"
+2103	"'%Fs' on register variable"
+2104	"'%Fs' on bit field ignored"
+2105	"'%Fs' needs l-value"
+2106	"'%Fs' : left operand must be l-value"
+2107	"illegal index, indirection not allowed"
+2108	"subscript is not of integral type"
+2109	"subscript requires array or pointer type"
+2110	"cannot add two pointers"
+2111	"pointer addition requires integral operand"
+2112	"pointer subtraction requires integral or pointer operand"
+2113	"pointer can only be subtracted from another pointer"
+2114	"'%Fs' : pointer on left; needs integral value on right"
+2115	"'%Fs' : incompatible types"
+2116	"function parameter lists differed"
+2117	"'%Fs' : array bounds overflow"
+2118	"negative subscript"
+2119	"typedef types both define indirection"
+2120	"'void' illegal with all types"
+2121	"'%Fs' : bad %Fs operand"
+2122	"'%Fs' : prototype parameter in name list illegal"
+2123	"'%Fs' : cannot call __fastcall function '%Fs' from p-code"
+2124	"divide or mod by zero"
+2125	"'%Fs' : allocation exceeds 64K"	
+2126	"'%Fs' : incorrect operand"
+2127	"parameter allocation exceeds 32K"	
+2128	"'%Fs' : alloc_text/same_seg applicable only to functions with C linkage"
+2129	"static function '%Fs' declared but not defined"
+2130	"#line expected a string containing the filename, found '%Fs'"
+2131	"more than one memory attribute"
+2132	"syntax error : unexpected identifier"
+2133	"'%Fs' : unknown size"
+2134	"'%Fs' : struct/union too large"	
+2135	"'%Fs' : illegal bit field operation"
+2136	"'%Fs' : prototype must have parameter types"
+2137	"empty character constant"
+2138	"illegal to define an enumeration without any members"
+2139	"type following '%s' is illegal"
+2140	"parameter cannot be function type"
+2141	"value out of range for enum constant"
+2142	"function declarations differ, variable parameters specified only in one of them"
+2143	"syntax error : missing '%Fs' before '%Fs'"
+2144	"syntax error : missing '%Fs' before type '%Fs'"
+2145	"syntax error : missing '%Fs' before identifier"
+2146	"syntax error : missing '%Fs' before identifier '%Fs'"
+2147	"'%Fs' : const array must be fully initialized"
+2148	"array too large"
+2149	"'%Fs' : named bit field cannot have zero width"
+2150	"'%Fs' : bit field must have type 'int', 'signed int', or 'unsigned int'"
+2151	"more than one language attribute"
+2152	"'%Fs' : pointers to functions with different attributes"
+2153	"hex constants must have at least one hex digit"
+2154	"'%Fs' : does not refer to a segment name"
+2155	"'?' : invalid left operand, expected arithmetic or pointer type"
+2156	"pragma must be outside function"
+2157	"'%Fs' : must be declared before use in pragma list"
+2158	"'%Fs' : is a function"
+2159	"more than one storage class specified"
+2160	"'##' cannot occur at the beginning of a macro definition"
+2161	"'##' cannot occur at the end of a macro definition"
+2162	"expected macro formal parameter"
+2163	"'%Fs' : not available as an intrinsic function"
+2164	"'%Fs' : intrinsic function not declared"
+2165	"'%Fs' : cannot modify pointers to data"
+2166	"l-value specifies const object"
+2167	"'%Fs' : too many actual parameters for intrinsic function"
+2168	"'%Fs' : too few actual parameters for intrinsic function"
+2169	"'%Fs' : intrinsic function, cannot be defined"
+2170	"'%Fs' : not declared as a function, cannot be intrinsic"
+2171	"'%Fs' : illegal operand"
+2172	"'%Fs' : actual parameter is not a pointer : parameter %d"
+2173	"'%Fs' : actual parameter is not a pointer : parameter %d, parameter list %d"
+2174	"'%Fs' : actual parameter has type 'void' : parameter %d, parameter list %d"
+2175	"'%Fs' : invalid locale"
+2176	"static huge data not supported by '%Fs'"	 
+2177	"constant too big"
+2178	"'%Fs' : storage class for same_seg variables must be extern"
+2179	"'%Fs' : was used in same_seg, but storage class is no longer extern"
+2180	"controlling expression has type 'void'"
+2181	"illegal else without matching if"
+2182	"'%Fs' : has type 'void'"
+2183	"syntax error: translation unit is empty"
+2184	"illegal return of a 'void' value"
+2185	"'%Fs' : illegal based allocation"
+2186	"'%Fs' : illegal operand of type 'void'"
+2187	"cast of near function pointer to far function pointer"
+2188	"'%ld' : too big for wide character"
+2189	"#error : %Fs"
+2190	"first parameter list longer than second"
+2191	"second parameter list longer than first"
+2192	"parameter '%d' declaration different"
+2193	"'%Fs' : already in a segment"
+2194	"'%Fs' : is a text segment"
+2195	"'%Fs' : is a data segment"
+2197	"'%Fs' : too many actual parameters"
+2198	"'%Fs' : too few actual parameters"
+2199	"syntax error : found '%Fs (' at global scope (was a declaration intended?)"
+2200	"'%Fs' : function has already been defined"
+2201	"'%Fs' : cannot export static declarations"
+2202	"'%Fs' : not all control paths return a value"
+2203	"delete operator cannot specify bounds for an array"
+2204	"'%Fs' : type definition found within parentheses"
+2205	"'%Fs' : cannot initialize extern variables with block scope"
+2206	"'%Fs' : typedef cannot be used for function definition"
+2207	"'%Fs' in struct/union '%Fs' has a zero-sized array"	
+2208	"'%Fs' : no members defined using this type"
+2209	"type cast in __based construct must be (__segment)"
+2210	"'%Fs' : must be near/far data pointer"
+2211	"(__segment) applied to function identifier '%Fs'"
+2212	"'%Fs' : __based not available for pointers to functions"
+2213	"'%Fs' : illegal argument to __based"
+2214	"pointers based on 'void' require the use of :>"
+2215	"':>' operator only for objects based on 'void'"
+2216	"'%Fs' cannot be used with '%Fs'"
+2217	"'%Fs' must be used with '%Fs'"
+2218	"type in __based construct must be 'void'"
+2219	"syntax error : type qualifier must be after '*'"
+2220	"warning treated as error - no object file generated"
+2221	"'.' : left operand points to class/struct/union, use '->'" 
+2222	"'->' : left operand has struct/union type, use '.'"	
+2223	"left of '->%Fs' must point to class/struct/union"
+2224	"left of '.%Fs' must have class/struct/union type"
+2225    "'%Fs' : function allocation must be in a named segment"
+2226	"syntax error : unexpected type '%Fs'"
+2227	"left of '->%Fs' must point to class/struct/union"
+2228	"left of '.%Fs' must have class/struct/union type"
+2229	"%Fs '%Fs' has an illegal zero-sized array"
+2230	"'%Fs' : indirection to different types"
+2231	"'.' : left operand points to '%Fs', use '->'"
+2232	"'->' : left operand has '%Fs' type, use '.'"
+2233	"'%Fs' : arrays of objects containing zero-size arrays are illegal"
+2234	"arrays of references are illegal"
+2235	"';' in formal parameter list"
+2236	"unexpected '%Fs' '%Fs'"
+2237	"unexpected %Fs '%Fs'"
+2238	"unexpected token[s] preceding '%s'"
+2239	"unexpected token '%Fs' following declaration of '%Fs'"
+2240	"unexpected '%Fs' following formal list (only modifiers are allowed)"
+2241	"'%Fs' : member access is restricted"
+2242	"typedef name cannot follow class/struct/union"
+2243	"%Fs conversion from '%Fs' to '%Fs' exists, but is inaccessible"
+2244	"'%Fs' : unable to resolve function overload"
+2245	"nonexistent function '%Fs' specified as friend"
+2246	"'%Fs' : illegal static data member in locally defined class"
+2247	"'%Fs' not accessible because '%Fs' uses '%Fs' to inherit from '%Fs'"
+2248	"'%Fs' : cannot access %Fs %Fs declared in class '%Fs'"
+2249	"'%Fs' : no accessible path to %Fs %Fs declared in virtual base '%Fs'"
+2250	"'%Fs' : ambiguous inheritance of '%Fs::%Fs'"
+2251	"'%Fs' : defined but not declared"
+2252	"'%Fs' : pure specifier can only be specified for functions"
+2253	"'%Fs' : pure specifier only applies to virtual function - specifier ignored"
+2254	"'%Fs' : pure specifier not allowed on friend functions"
+2255	"'%Fs' : a friend function can only be declared in a class"
+2256	"illegal use of friend specifier on '%Fs'"
+2257	"p-code generation pragma not allowed without /Oq"
+2258	"illegal pure syntax, must be '= 0'"
+2259	"'%Fs' : illegal attempt to instantiate abstract class"
+2260	"function pointer cast to a data pointer"
+2261	"data pointer cast to a function pointer"
+2262	"'%Fs' : cannot be destroyed"
+2263	"function returns pointer based on __self"
+2264	"'%Fs' : error in function definition or declaration; function not called"
+2265	"'%Fs' : reference to a zero-sized array is illegal"
+2266	"'%Fs' : reference to a nonconstant bounded array is illegal"
+2267	"'%Fs' : static functions with block scope are illegal"
+2268	"'%Fs' : different const or volatile qualifiers"
+2269	"'%Fs' : different ambient model than base class '%Fs'"
+2270	"'%Fs' : modifiers not allowed on nonmember functions"
+2271	"'%Fs' : new/delete cannot have formal list modifiers"
+2272	"'%Fs' : modifiers not allowed on static member functions"
+2273	"'%Fs' : illegal as right side of '->' operator"
+2274	"'%Fs' : illegal as right side of '.' operator"
+2275	"'%Fs' : illegal use of this type as an expression"
+2276	"'%Fs' : illegal operation on bound member function expression"
+2277	"'%Fs' : cannot take the address of a constructor"
+2278	"'%Fs' : no function with C linkage found"
+2279	"cannot use braces to initialize default arguments"
+2280	"missing '{' before identifier '%Fs'?"
+2281	"'%Fs' : is not a function, but contains <function returning>; '%Fs' is unexpected"
+2282	"'%Fs' is followed by '%Fs' (missing ','?)"
+2283	"'%Fs' : pure specifier not allowed on unnamed %Fs"
+2284	"unbalanced parenthesis found while processing a member function"
+2285	"pointers to members representation has already been determined - pragma ignored"
+2286	"pointers to members of '%Fs' representation is already set to %s inheritance - declaration ignored"
+2287	"'%Fs': inheritance representation: '%Fs' is less general than the required '%Fs'"
+2288	"typedef has a trailing __based which cannot be applied to the symbol's indirection"
+2289	"same type qualifier used more than once"
+2290	"C++ '%Fs' syntax is reserved for future use"
+2291	"'%Fs' : illegal modifier '%Fs' for 'this' pointer"
+2292	"'%Fs': best case inheritance representation: '%Fs' declared but '%Fs' required"
+2293	"'%Fs': illegal to have a non-static member variable as a __based specifier"
+
+2300	"'%Fs' : class does not have a destructor called '~%Fs'"
+2301	"left of '->~%Fs' must point to class/struct/union"
+2302	"left of '.~%Fs' must have class/struct/union type"
+
+2350	"'%Fs' is not a static member"
+2351	"obsolete C++ constructor initialization syntax"
+2352	"'%Fs::%Fs' : illegal call of nonstatic member function"
+2353	"'%Fs' : improper use of constructor initializers"
+2354	"'%Fs' : initialization of reference member requires a temporary variable"
+2355	"'this' : can only be referenced inside nonstatic member functions"
+2356	"initialization segment must not change during translation unit"
+
+2360	"initialization of '%Fs' is skipped by 'case' label"
+2361	"initialization of '%Fs' is skipped by 'default' label"
+2362	"initialization of '%Fs' is skipped by 'goto %Fs'"
+
+2369	"'%Fs' : redefinition; different subscripts"
+2370	"'%Fs' : redefinition; different storage class"
+2371	"'%Fs' : redefinition; different basic types"
+2372	"'%Fs' : redefinition; different types of indirection"
+2373	"'%Fs' : redefinition; different type modifiers"
+2374	"'%Fs' : redefinition; multiple initialization"
+2375	"'%Fs' : redefinition; different linkage"
+2376	"'%Fs' : redefinition; different based allocation"
+2377	"'%Fs' : redefinition; typedef cannot be overloaded with any other symbol"
+2378	"'%Fs' : redefinition; symbol cannot be overloaded with a typedef"
+2379	"formal parameter %d has different type when promoted"
+2380	"type[s] preceding '%Fs' (constructor with return type, or illegal redefinition of current class-name?)"
+
+2385	"'%Fs::%Fs' is ambiguous"
+2386	"ambiguous conversion from '%Fs*' to '%Fs*'"
+2387	"ambiguous conversion from '%Fs&' to '%Fs&'"
+
+2390	"'%Fs' : incorrect storage class '%Fs'"
+2391	"'%Fs' : 'friend' cannot be used during type definition"
+
+2400	"inline syntax error in '%Fs'; found '%Fs'"
+2401	"'%Fs' : register must be base in '%Fs'"
+2402	"'%Fs' : register must be index in '%Fs'"
+2403	"'%Fs' : register must be base/index in '%Fs'"
+2404	"'%Fs' : illegal register in '%Fs'"
+2405	"illegal short forward reference with offset"
+2406	"'%Fs' : name undefined in '%Fs'"
+2407	"illegal 'float' register in '%Fs'"
+2408	"illegal type on PTR operator in '%Fs'"
+2409	"illegal type used as operator in '%s'"
+2410	"'%Fs' : ambiguous member name in '%Fs'"
+2411	"'%Fs' : illegal struct/union member in '%Fs'"
+2412	"'%Fs' : case-insensitive label redefined"
+2413	"'%Fs' : illegal align size"
+2414	"illegal number of operands"
+2415	"improper operand type"
+2416	"'%Fs' : illegal opcode for processor"
+2417	"divide by zero in '%Fs'"
+2418	"'%Fs' : not in a register"
+2419	"mod by zero in '%Fs'"
+2420	"'%Fs' : illegal symbol in %Fs"
+2421	"PTR operator used with register in '%Fs'"
+2422	"illegal segment override in '%Fs'"
+2423	"'%ld' : illegal scale"
+2424	"'%Fs' : improper expression in '%Fs'"
+2425	"'%Fs' : nonconstant expression in '%Fs'"
+2426	"'%Fs' : illegal operator in '%Fs'"
+2427	"'%Fs' : jump referencing label is out of range"	
+
+2429	"'%Fs' : illegal far label reference"
+2430	"more than one index register in '%Fs'"
+2431	"illegal index register in '%Fs'"
+2432	"illegal reference to 16-bit data in '%Fs'"
+2433	"'%Fs' : '%Fs' not permitted on data declarations"
+2434	"'%Fs' : cannot convert default argument from '%Fs' to '%Fs'"
+2435	"'%Fs' : function called before default arguments were resolved"
+2436	"'%Fs' : cannot initialize member functions"
+2437	"'%Fs' : already initialized"
+2438	"'%Fs' : cannot initialize static class data via constructor"
+2439	"'%Fs' : member could not be initialized"
+2440	"'%Fs' : cannot convert from '%Fs' to '%Fs'"
+2441	"function call through pointer before default arguments were resolved"
+2442	"p-code expression too complex for setjmp or Catch"
+2443	"operand size conflict"
+
+2446	"'%Fs' : no conversion from '%Fs' to '%Fs'"
+2447	"missing function header (old-style formal list?)"
+2448	"'%Fs' : function-style initializer appears to be a function definition"
+2449	"found '{' at file scope (missing function header?)"
+2450	"switch expression of type '%Fs' is illegal"
+2451	"conditional expression of type '%Fs' is illegal"
+2452	"array bound expression of type '%Fs' is illegal"
+2453	"array bound expression uses function name"
+
+2458	"'%Fs' : redefinition within definition"
+2459	"'%Fs' : is being defined; cannot add as an anonymous member"
+2460	"'%Fs' : uses '%Fs', which is being defined"
+2461	"'%Fs' : constructor syntax missing formal parameters"
+2462	"'%Fs' : cannot define a type in a 'new-expression'"
+2463	"cannot define an anonymous type in a 'new-expression'"
+2464	"'%Fs' : cannot use 'new' to allocate a reference"
+2465	"cannot define an anonymous type inside parentheses"
+2466	"cannot allocate an array of constant size 0"
+2467	"illegal declaration of anonymous '%Fs'"
+2468	"'new' : cannot allocate 'const'/'volatile' objects (type is '%Fs')"
+2470	"cannot open database '%Fs'"
+2471	"cannot update database '%Fs'"
+
+2500	"'%Fs' : '%Fs' is already a direct base class"
+2501	"'%Fs' : missing decl-specifiers"
+2502	"'%Fs' : too many access modifiers on the base class"
+2503	"'%Fs' : base classes cannot contain zero-sized arrays"
+2504	"'%Fs' : base class undefined"
+2505	"'%Fs' : is not a legal base class"
+2506	"'%Fs' : ambiguous"
+2507	"'%Fs' : too many virtual modifiers on the base class"
+2508	"'%Fs' : access denied"
+2509	"'%Fs' : member function not declared in '%Fs'"
+2510	"'%Fs' : left of '::' must be a class/struct/union"
+2511	"'%Fs' : overloaded member function not found in '%Fs'"
+2512	"'%Fs' : no appropriate default constructor available"
+2513	"'%Fs' : decl-specifier is missing a declarator before '='"
+2514	"'%Fs' : class has no constructors"
+2515	"'%Fs' : not in class '%Fs'"
+
+2517	"'%Fs' : right of '::' is undefined"
+
+2519	"cannot convert '%Fs *' to '%Fs *'"
+
+2523	"'%Fs::~%Fs' : destructor tag mismatch"
+2524	"'%Fs' : destructors must have a 'void' formal parameter list"
+2525	"'%Fs' : explicit destructor is named but not called"
+
+2527	"'%Fs' : array of references must be fully initialized"
+2528	"illegal pointer to reference"
+2529	"illegal reference to a reference"
+2530	"'%Fs' : references must be initialized"
+2531	"'%Fs' : reference to a bit field illegal"
+2532	"'%s' : cannot modify references"
+2533	"'%Fs' : constructors not allowed a return type"
+2534	"'%Fs' : constructor cannot return a value"
+2535	"'%Fs' : member function already defined or declared"
+2536	"'%Fs::%Fs' : cannot specify explicit initializer for arrays"
+2537	"'%Fs' : illegal linkage specification"
+2538	"new : cannot specify initializer for arrays"
+2539	"new : '%Fs' no default constructor to initialize arrays of objects"
+2540	"nonconstant expression as array bound"
+2541	"delete : cannot delete objects that are not pointers"
+2542	"'%Fs' : class object has no constructor for initialization"
+2543	"expected ']' for operator '[]'"
+2544	"expected ')' for operator '()'"
+2545	"'%Fs' : unable to find overloaded operator"
+2546	"'%Fs' : illegal mix of 'void' pointer with pointer to type"
+2547	"illegal cast of overloaded function"
+2548	"'%Fs' : missing default parameter for parameter %s"
+2549	"user-defined conversion cannot specify a return type"
+2550	"'%Fs' : constructor initializer lists are only allowed on constructor definitions"
+2551	"'void *' type needs explicit cast"
+2552	"'%Fs' : nonaggregates cannot be initialized with initializer list"
+2553	"no legal conversion of return value to return type '%Fs'"
+2555	"'%Fs::%Fs' : overriding virtual function differs from '%Fs::%Fs' only by return type"
+2556	"'%Fs' : overloaded functions only differ by return type"
+2557	"'%Fs' : private and protected members cannot be initialized without a constructor"
+2558	"'%Fs' : no copy constructor available"
+2559	"'%Fs' : no match for specified operator"
+2560	"'%Fs' : overloaded function differs only by calling convention/memory model"
+2561	"'%Fs' : function must return a value"
+2562	"'%Fs' : 'void' function returning a value"
+2563	"mismatch in formal parameter list"
+2564	"formal/actual parameters mismatch in call through pointer to function"
+2565	"'::%Fs' was previously declared as a global function"
+2566	"overloaded function in conditional expression"
+2567	"'%Fs' : intrinsic function must have prototypes when using C++"
+2568	"'%Fs' : unable to resolve function overload '%Fs'"
+2569	"'%Fs' : union cannot be used as a base class"
+2570	"'%Fs' : union cannot have base classes"
+2571	"'%Fs' : union cannot have virtual function '%Fs'"
+2572	"'%Fs' : redefinition of default parameter : parameter %s"
+2573	"'%Fs' : simple type cast must have exactly one expression"
+2574	"'%Fs' : illegal static destructor declaration"
+2575	"'%Fs' : only member functions and bases can be virtual"
+2576	"'%Fs' : virtual used for static member function"
+2577	"'%Fs' : destructor cannot return a value"
+
+2579	"'%Fs::%Fs(%s)' : parameter list not sufficiently different to '%Fs::%Fs(%s)'"
+2580	"redefinition of class name '%Fs'"
+2581	"'%Fs' : static 'operator =' function is illegal"
+2582	"'%Fs' : 'operator =' function is unavailable"
+2583	"'%Fs' : illegal const/volatile 'this' pointer used for constructors/destructors"
+2584	"'%Fs' : direct base '%Fs' is inaccessible; already a base of '%Fs'"
+2585	"explicit conversion to '%Fs' is ambiguous"
+2586	"incorrect user-defined conversion syntax : illegal indirections"
+2587	"'%Fs' : illegal use of local variable as default parameter"
+2588	"'::~%Fs' : illegal global destructor"
+2589	"'%Fs' : illegal token on right side of '::'"
+2590	"'%Fs' : ambiguous user-defined conversions in switch expression"
+2591	"'%Fs' : ambiguous user-defined conversions in conditional expression"
+2592	"no legal conversion of initialization expression to type '%Fs'"
+2593	"'operator %Fs' is ambiguous"
+2594	"'%Fs' : ambiguous conversions from '%Fs' to '%Fs'"
+2595	"'%Fs' : qualified name already has a constructor"
+2596	"'%Fs' : qualified name already has a destructor"
+2597	"'%Fs' : does not specify an object"
+2598	"linkage specification must be at global scope"
+2599	"'%Fs' : local functions are not supported"
+2601	"functions cannot be defined in local classes"
+2602	"'%Fs::%Fs' is not a member of a base of '%Fs'"
+2603	"illegal access declaration: '%Fs' is not a direct base of '%Fs'"
+2604	"cannot declare %Fs access to %Fs member '%Fs::%Fs'"
+2605	"overloaded functions '%Fs::%Fs' do not have same access"
+2606	"'%Fs::%Fs': illegal private access declaration"
+2607	"'%Fs' : cannot implicitly convert a '%Fs' to a '%Fs' that is not const"
+2608	"illegal reference cast - operand not an l-value"
+2609	"'%Fs' : cannot implicitly convert a non-lvalue '%Fs' function return to a '%Fs' that is not const"
+2610	"%Fs '%Fs' can never be instantiated; user-defined constructor is required"
+2611	"'%Fs' : illegal following '~' (expected identifier)"
+2612	"trailing '%Fs' illegal in base/member initializer list"
+2613	"trailing '%Fs' illegal in base class list"
+2614	"'%Fs' : illegal member initialization: '%Fs' is not a base or member"
+2615	"memory attribute must appear before class name in pointer to member"
+2617	"'%Fs' : inconsistent return statement"
+2618	"'%Fs' : inconsistent return statement"
+2619	"union '%Fs' : cannot have static member variable '%Fs'"
+2620	"union '%Fs' : member '%Fs' has default constructor"
+2621	"union '%Fs' : member '%Fs' has copy constructor"
+2622	"union '%Fs' : member '%Fs' has assignment operator"
+2623	"union '%Fs' : member '%Fs' has destructor"
+2624	"'%Fs' : references to 'void' are illegal"
+2625	"anonymous union did not declare any data members"
+2626	"anonymous union defines %Fs member '%Fs'"
+2627	"member function defined in unnamed class"
+2628	"'%Fs' followed by '%Fs' is illegal (did you forget a ';'?)"
+2629	"unexpected '%s ('"
+2630	"'%Fs' found in what should be a comma-separated list"
+2631	"'%Fs' : destructors not allowed a return type"
+2632	"'%Fs' followed by '%Fs' is illegal"
+2633	"'%Fs' : 'inline' is the only legal storage class for constructors"
+2634	"'&%Fs::%Fs' : pointer to reference member is illegal"
+2635	"cannot convert a '%Fs*' to a '%Fs*'; conversion from a virtual base class is implied"
+2636	"pointer to reference member is illegal"
+2637	"'%s' : cannot modify pointers to data members"
+2638	"'%Fs' : memory model modifier illegal on pointer to data member"
+2639	"compiler generated %Fs required by unnamed class"
+
+2641	"illegal pointer to member cast across virtual inheritance path"
+2642	"cast to pointer to member must be from related pointer to member"
+2643	"illegal cast from pointer to member"
+2644	"basis class '%Fs' for pointer to member has not been defined"
+2645	"no qualified name for pointer to member (found ':: *')"
+2646	"global anonymous unions must be declared static"
+2647	"'%Fs' : cannot dereference a '%Fs' on a '%Fs'"
+2648	"'%Fs' : use of member as default parameter requires static member"
+2649	"'%Fs' : is not a '%Fs'"
+2650	"'%Fs' : cannot be a virtual function"
+
+2652	"'%Fs' : illegal copy constructor: first parameter must not be a '%Fs'"
+2653	"'%Fs' : is not a class name"
+2654	"'%Fs' : attempt to access member outside a member function"
+2655	"'%Fs' : definition or redeclaration illegal in current scope"
+2656	"'%Fs' : function not allowed as a bit field"
+2657	"'%Fs::*' found at the start of a statement (did you forget to specify a type?)"
+2658	"multiple conversions : %Fs(%Fs) and %Fs::operator %Fs()"
+2659	"'%Fs' : overloaded function as left operand"
+2660	"'%Fs' : function does not take %d parameters"
+2661	"'%Fs' : no overloaded function takes %d parameters"
+2662	"'%Fs' : cannot convert 'this' pointer from '%Fs' to '%Fs'"
+2663	"'%Fs' : %d overloads have no legal conversion for 'this' pointer"
+2664	"'%Fs' : cannot convert parameter %d from '%Fs' to '%Fs'"
+2665	"'%Fs' : %d overloads have no legal conversion for parameter %d"
+2666	"'%Fs' : %d overloads have similar conversions"
+2667	"'%Fs' : none of %d overload have a best conversion"
+2668	"'%Fs' : ambiguous call to overloaded function"
+
+2671	"'%Fs' : static member functions do not have 'this' pointers"
+2672	"'%Fs' : new/delete member functions do not have 'this' pointers"
+2673	"'%Fs' : global functions do not have 'this' pointers"
+2674	"'%Fs' : no acceptable conversions from '%Fs' to '%Fs'"
+2675	"unary '%Fs' : '%Fs' does not define this operator or a conversion to a type acceptable to the predefined operator"
+2676	"binary '%Fs' : '%Fs' does not define this operator or a conversion to a type acceptable to the predefined operator"
+2677	"binary '%Fs' : no global operator defined which takes type '%Fs' (or there is no acceptable conversion)"
+
+2701	"'%Fs' : __oldcall function defined with varargs"	
+2702	" __try may not appear in termination block"	
+2703	"illegal __leave statement"
+2704	"'%Fs' : __va_start intrinsic only allowed in varargs"	
+2705	"'%Fs' : illegal jump into __try scope"	
+
+2707	"'%Fs' : bad context for intrinsic function"	
+2708	"'%Fs' : actual parameters length in bytes differs from previous call or reference"
+2709	"'%Fs' : formal parameters length in bytes differs from previous declaration"
+2710	"cannot delete a pointer to a const object"
+2711	"cannot delete a pointer to a function"
+
+2720	"'%Fs' : '%Fs' storage-class specifier illegal on members"
+2721	"'%Fs' : storage-class specifier illegal between operator keyword and type"
+2722	"'::%Fs' : illegal following operator command; use 'operator %Fs'"
+2723	"'%Fs' : '%Fs' storage-class specifier illegal on function definition"
+2724	"'%Fs' : 'static' should not be used on member functions defined at file scope"
+
+2730	"'%Fs' : cannot be a base class of itself"
+2731	"'%Fs' : function cannot be overloaded"
+2732	"linkage specification contradicts earlier specification for %Fs"
+2733	"second C linkage of overloaded function '%Fs' not allowed"
+2734	"'%Fs' : const object must be initialized if not extern"
+2735	"'%Fs' keyword is not permitted in formal parameter type specifier"
+2736	"'%Fs' keyword is not permitted in cast"
+2737	"'%Fs' : base class '%Fs' must be exported"
+
+2750	"'%Fs' : 'const T' to 'T' : '%Fs' to '%Fs'"
+2751	"'%Fs' : 'volatile T' to 'T' : '%Fs' to '%Fs'"
+2752	"'%Fs' : 'const T *' to 'T *' : '%Fs' to '%Fs'"
+2753	"'%Fs' : 'volatile T *' to 'T *' : '%Fs' to '%Fs'"
+2754	"'%Fs' : 'const T **' to 'T **' : '%Fs' to '%Fs'"
+2755	"'%Fs' : 'volatile T **' to 'T **' : '%Fs' to '%Fs'"
+2756	"'%Fs' : 'memory model mismatch' : '%Fs' to '%Fs'"
+2757	"'%Fs' : 'language modifier mismatch: '%Fs' to '%Fs'"
+2758	"'%Fs' : must be initialized in constructor base/member initializer list"
+
+2800	"'operator %Fs' cannot be overloaded"
+2801	"'operator %Fs' must be a %Fs member"
+2802	"static member 'operator %Fs' has no formal parameters"
+2803	"'operator %Fs' must have at least one formal parameter of class type"
+2804	"binary 'operator %Fs' has too many parameters"
+2805	"binary 'operator %Fs' has too few parameters"
+2806	"'operator %Fs' has too many formal parameters"
+2807	"the second formal parameter to postfix 'operator %Fs' must be 'int'"
+2808	"unary 'operator %Fs' has too many formal parameters"
+2809	"'operator %Fs' has no formal parameters"
+2810	"second formal parameter for 'operator delete' must be 'unsigned int'"
+2811	"too many formal parameters for based form of 'operator delete'"
+2812	"second formal parameter required for based form of 'operator delete'"
+2813	"too many formal parameters for 'operator delete'"
+2814	"second actual parameter for based form of 'operator delete' must be '__based(void)*'"
+2815	"first actual parameter for based form of 'operator delete' must be '__segment'"
+2816	"alternative form of 'operator delete' must be a member"
+2817	"return type for 'operator delete' must be 'void'"
+2818	"incorrect return type for 'operator ->'"
+2819	"recursive return type for 'operator ->'"
+2820	"second formal parameter required for based form of 'operator new'"
+2821	"first formal parameter to 'operator new' must be 'unsigned int'"
+2822	"second formal parameter for huge form of 'operator new' must be 'unsigned int'"
+2823	"return type for based form of 'operator new' must be 'void __based(void)*'"
+2824	"return type for 'operator new' must be 'void *'"
+2825	"first formal parameter for huge form of 'operator new' must be 'unsigned long'"
+2826	"second formal parameter required for huge form of 'operator new'"
+2827	"'operator %s' cannot be globally overridden with unary form"
+2828	"'operator %s' cannot be globally overridden with binary form"
+2829	"'operator %Fs' cannot have a variable parameter list"
+2830	"only placement parameters to 'operator new' can have default values"
+2831	"'operator %Fs' cannot have default parameters"
+2832	"'%Fs' form of 'operator %Fs' cannot be a member"
+2833	"'operator %Fs' is not a recognized operator or type"
+2834	"'operator %Fs' must be globally qualified"
+2835	"user-defined conversion '%Fs' takes no formal parameters"
+2836	"cannot export '%Fs': a previous declaration did not export it"
+2837	"'%Fs' : illegal local static variable in exported inline function"
+2838	"illegal qualified name in member declaration"
+
+2850	"#pragma hdrstop cannot be nested in a function or definition"
+2851	"#pragma hdrstop required for /Yu command-line option without filename"
+2852	"'%Fs' is not a valid precompiled header file"
+2853	"'%Fs' is not a precompiled header file created with this compiler"
+2854	"syntax error in #pragma hdrstop"
+2855	"command-line option '%Fs' inconsistent with precompiled header"
+2856	"#pragma hdrstop cannot be inside an #if block"
+2857	"'#include' statement specified with the /Yc%Fs command-line option was not found in the source file"
+
+2900	"'%Fs' : huge array cannot be aligned to segment boundary"
+
+2910	"cannot call function from p-code with more than 255 bytes of arguments"
+2911	"cannot define p-code function with more than 255 bytes of parameters"
+
+2000	"UNKNOWN ERROR\n\t\tContact Microsoft Product Support Services"
+
+		
+
+1001	"internal compiler error\n\t\t(compiler file '%s', line %d)"
+
+1003	"error count exceeds %d; stopping compilation"
+1004	"unexpected end of file found"
+1005	"string too big for buffer"
+1006	"write error on compiler-generated file"
+1007	"unrecognized flag '%Fs' in '%Fs'"
+1008	"no input file specified"
+1009	"compiler limit : macros nested too deeply"
+1010	"unexpected end of file while looking for precompiled header directive"
+1011	"compiler limit : '%Fs' : macro definition too big"
+1012	"unmatched parenthesis : missing '%c'"
+1013	"compiler limit : too many open parentheses"
+1014	"too many include files : depth = %d"
+1015	"compiler limit : too many segments"
+1016	"#if[n]def expected an identifier"
+1017	"invalid integer constant expression"
+1018	"unexpected #elif"
+1019	"unexpected #else"
+1020	"unexpected #endif"
+1021	"invalid preprocessor command '%Fs'"
+1022	"expected #endif"
+1023	"cannot open source file '%Fs'"
+1024	"cannot open include file '%Fs'"
+1025	"compiler terminated by user"	
+1026	"parser stack overflow, program too complex"
+1027	"DGROUP data allocation exceeds 64K"	
+1028	"'%s' : segment allocation exceeds 64K" 
+1029	"there are more than 512 bytes of arguments"
+1030	"there are more than 512 bytes of local variables"
+1031	"compiler limit : function calls nested too deeply"	
+1032	"cannot open object code listing file '%s'"	
+
+1034	"%Fs: no include path set"
+1035	"expression too complex; simplify expression"	
+
+1037	"cannot open object file '%s'"	
+1038	"compiler limit : '%Fs' : control flow state too complex; simplify function"
+
+1041	"cannot open compiler intermediate file - no more files"
+1042	"cannot open compiler intermediate file - no such file or directory"
+1043	"cannot open compiler intermediate file"
+1044	"out of disk space for compiler intermediate file"
+1045	"compiler limit : linkage specifications nested too deeply"
+1046	"compiler limit : %Fs nested too deeply"
+1047	"limit of %Fs exceeded at '%Fs'"
+1048	"unknown option '%c' in '%s'"
+1049	"invalid numerical argument '%s'"
+1050	"'%Fs' : code segment too large"
+
+1052	"compiler limit : #if or #ifdef blocks nested too deeply"
+1053	"compiler limit : struct/union nested too deeply"	
+1054	"compiler limit : initializers nested too deeply"
+1055	"compiler limit : out of keys"
+1056	"compiler limit : out of macro expansion space"
+1057	"unexpected end of file in macro expansion"
+1058	"compiler limit : too many formal arguments"
+1059	"compiler is out of near heap space"
+1060	"compiler is out of far heap space"
+1061	"compiler limit : blocks nested too deeply"	
+1062	"error while writing to preprocessor output file"
+1063	"compiler limit : compiler stack overflow"
+1064	"compiler limit : token overflowed internal buffer"
+1065	"compiler limit : out of tags"
+1066	"compiler limit : decorated name length exceeded"
+
+1068	"cannot open file '%Fs'"
+1069	"write error on file '%s'"	
+1070	"mismatched #if/#endif pair in file '%Fs'"
+1071	"unexpected end of file found in comment"
+1072	"'%Fs' : cannot read file"
+
+1082	"Cannot close %Fs file: '%Fs': %Fs (%Fs:%ld)"
+1083	"Cannot open %Fs file: '%Fs': %Fs"
+1084	"Cannot read %Fs file: '%Fs': %Fs"
+1085	"Cannot write %Fs file: '%Fs': %Fs (%Fs:%ld)"
+1086	"Cannot seek %Fs file: '%Fs': %Fs (%Fs:%ld)"
+1087	"Cannot tell %Fs file: '%Fs': %Fs (%Fs:%ld)"
+1088	"Cannot flush %Fs file: '%Fs': %Fs (%Fs:%ld)"
+
+1090	"data allocation exceeds 64K"		
+
+1126	"'%Fs' : automatic allocation exceeds %s" 
+1127	"'%Fs' : segment redefinition"
+
+1500	"'%Fs' : cannot open inline function definition file"
+1501	"compiler limit : too many temporary variables"
+1502	"inline member-function definition missing '}'"
+1503	"default parameter definition missing ',' or ')'"
+1504	"type still ambiguous after parsing %d tokens, unable to recover"
+1505	"unrecoverable parser look-ahead error"
+1506	"unrecoverable block scoping error"
+1507	"previous user errors and subsequent error recovery halt further compilation"
+
+1700	"%Fs compiler is out of far heap space" 
+
+1852	"'%Fs' is not a valid precompiled header file"
+1853	"'%Fs' is not a precompiled header file created with this compiler"
+1855	 "command-line option '%Fs' inconsistent with precompiled header"
+
+1900	"Il mismatch between '%s' version '%ld' and '%s' version '%ld'"
+1000	"UNKNOWN FATAL ERROR\n\t\tContact Microsoft Product Support Services"
diff --git a/base/build/c13216.exe b/base/build/c13216.exe
new file mode 100644
index 0000000..6d1080b
Binary files /dev/null and b/base/build/c13216.exe differ
diff --git a/base/build/c1ast.dll b/base/build/c1ast.dll
new file mode 100644
index 0000000..223f0ca
Binary files /dev/null and b/base/build/c1ast.dll differ
diff --git a/base/build/c1xx.dll b/base/build/c1xx.dll
new file mode 100644
index 0000000..18683fc
Binary files /dev/null and b/base/build/c1xx.dll differ
diff --git a/base/build/c1xx3216.exe b/base/build/c1xx3216.exe
new file mode 100644
index 0000000..41558bb
Binary files /dev/null and b/base/build/c1xx3216.exe differ
diff --git a/base/build/c1xxast.dll b/base/build/c1xxast.dll
new file mode 100644
index 0000000..2c7871b
Binary files /dev/null and b/base/build/c1xxast.dll differ
diff --git a/base/build/c2.dll b/base/build/c2.dll
new file mode 100644
index 0000000..830bfee
Binary files /dev/null and b/base/build/c2.dll differ
diff --git a/base/build/c23.err b/base/build/c23.err
new file mode 100644
index 0000000..8975439
--- /dev/null
+++ b/base/build/c23.err
@@ -0,0 +1,102 @@
+
+
+
+						
+
+1001	"internal compiler error\n\t\t(compiler file '%s', line %d)"
+1002	"compiler is out of heap space in pass 2"
+1003	"error count exceeds %d; stopping compilation"
+1004	"unexpected end-of-file found"
+1005	"string too big for buffer"
+1006	"write error on compiler intermediate file"
+1007	"unrecognized flag '%s' in '%s'"
+1013	"cannot open source file '%s'"
+1015	"compiler limit : too many segments"
+1027	"DGROUP data allocation exceeds 64K"
+1029	"there are > 512 bytes of arguments"
+1030	"there are > 512 bytes of local variables"
+1032	"cannot open object listing file '%s'"
+1033	"cannot open assembly language output file '%s'"
+1035	"expression too complex, please simplify"
+1036	"cannot open source listing file '%s'"
+1037	"cannot open object file '%s'"
+1039	"unrecoverable heap overflow in pass 3"
+1040	"unexpected end-of-file in source file '%s'"
+1041	"cannot open compiler intermediate file - no more files"
+1042	"cannot open compiler intermediate file - no such file or directory"
+1043	"cannot open compiler intermediate file"
+1044	"out of disk space for compiler intermediate file"
+1045	"floating-point overflow"
+1048	"unknown option '%c' in '%s'"
+1049	"invalid numerical argument '%s'"
+1050	"'%s' : code segment too large"
+
+1055	"compiler limit : out of keys"
+1067	"intrinsic not implemented"
+1073	"bad '%s' flag, would overwrite '%s' with '%s'"
+1074	"too many '%s' flags, '%s'"
+1083	"Cannot open %Fs file: '%Fs': %Fs"
+1084	"Cannot read %Fs file: '%Fs': %Fs"
+1085	"Cannot write %Fs file: '%Fs': %Fs"
+1090	"'%s' data allocation exceeds 64K"
+1126	"'%s' : automatic allocation exceeds %s"
+1127	"'%s' : segment redefinition"
+1900	"Il mismatch between '%s' version '%ld' and '%s' version '%ld'"
+1000	"UNKNOWN FATAL ERROR\n\t\tContact Microsoft Product Support Services"
+
+						
+	
+2125	"'%s' : allocation exceeds 64K"
+2127	"parameter allocation exceeds 32K"
+2129	"static function '%s' not found"
+2220	"warning treated as error - no object file generated"
+2374    "'%s' redefinition; multiple initialization"
+2418	"'%s' : not in a register"
+2427	"'%s' : jump referencing label is out of range"
+2900	"'%s' : huge array cannot be aligned to segment boundary"
+2000	"UNKNOWN ERROR\n\t\tContact Microsoft Product Support Services"
+
+						
+	
+4700	"local variable '%s' used without having been initialized"
+4701	"local variable '%s' may be used without having been initialized"
+4702	"unreachable code"
+4703	"'%s' : function too large for global optimizations"
+4704	"'%s' : in-line assembler precludes global optimizations"
+4705	"statement has no effect"
+4706	"assignment within conditional expression"
+4707	"'%s' : function too large for global optimizations (%s)"  
+4708	"ran out of heap at: %s"  
+4709	"comma operator within array index expression"
+4710	"function '%s' not expanded"
+4711	"function '%s' selected for automatic inline expansion"
+4712	"'%s' : used as register - loss of debugging information"
+4713	"%s: internal compiler error; restarting\n\t\t(compiler file '%s', line %d)"
+4723	"potential divide by 0"
+4724	"potential mod by 0"
+4726	"'%c' : unknown memory-model command-line option"
+4727	"conditional expression is constant"
+4746	"'%s' : unsized array treated as '%s'"
+4756	"overflow in constant arithmetic"
+4757	"overflow in constant multiplication"
+4758	"address of automatic (local) variable taken, DS != SS"
+4759	"segment lost in conversion"
+4760	"'%Fs' : segment lost in initialization"
+4761	"integral size mismatch in argument; conversion supplied"
+4762	"near/far mismatch in argument : conversion supplied"
+4763	"'%s' : function too large for post-optimizer"
+4765	"recoverable heap overflow in post-optimizer - some optimizations may be missed"
+4766	"local symbol table overflow - some local symbols may be missing in listings"
+4769	"conversion of near pointer to long integer"
+4772	"'%s' : too many debug entry points, maximum %d"
+4773	"scoping too deep, deepest scoping merged when debugging"
+4785	"near call to '%s' in different segment"
+4786	"string too long - truncated to %d characters"
+4787	"unprototyped function '%s' called in exception"
+4788	"'%Fs' : identifier was truncated to '%d' characters"
+4790	"insufficient memory to process debugging information"
+4791	"loss of debugging information caused by optimization"
+4792	"long double type not supported by alternate math library"
+4900	"Il mismatch between '%s' version '%ld' and '%s' version '%ld'"
+
+4000	"UNKNOWN WARNING\n\t\tContact Microsoft Product Support Services"
diff --git a/base/build/c23216.exe b/base/build/c23216.exe
new file mode 100644
index 0000000..5551a57
Binary files /dev/null and b/base/build/c23216.exe differ
diff --git a/base/build/c33216.exe b/base/build/c33216.exe
new file mode 100644
index 0000000..c8cc88b
Binary files /dev/null and b/base/build/c33216.exe differ
diff --git a/base/build/cdimage.exe b/base/build/cdimage.exe
new file mode 100644
index 0000000..e35b447
Binary files /dev/null and b/base/build/cdimage.exe differ
diff --git a/base/build/cdimage.pdb b/base/build/cdimage.pdb
new file mode 100644
index 0000000..a411860
Binary files /dev/null and b/base/build/cdimage.pdb differ
diff --git a/base/build/cl.err b/base/build/cl.err
new file mode 100644
index 0000000..08866d1
--- /dev/null
+++ b/base/build/cl.err
@@ -0,0 +1,46 @@
+
+
+
+				
+
+2001	"too many symbols predefined with /D"
+2002    "memory-model conflict"
+2003    "missing source filename"
+2005    "%s requires /vmg"
+2008	"limit of %s exceeded at '%s'"
+2011	"only one floating-point option allowed"
+2012	"too many linker arguments"
+2013    "incomplete model specification"
+2016    "%s and %s command-line options are incompatible"
+2018	"cannot create linker response file"
+2019	"cannot overwrite source or object file '%s'"
+2020	"%s option requires extended keywords to be enabled (/Ze)"
+2021	"invalid numeric argument '%s'"
+2022	"cannot open '%s'"
+2023    "invalid model specification - flat model only"
+2027	"cannot execute '%s'"
+2028    "too many open files; cannot redirect '%s'"
+2030	"internal compiler error in '%s'"
+2031    "too many command-line options"
+2000	"unknown command-line error"
+
+				
+
+4001	"listing overrides assembly output"
+4002	"ignoring unknown option '%s'"
+4003	"processor-option conflict"
+4004	"/G3 only available in optimizing compiler; assuming /G2"
+4005	"cannot find '%s';\nPlease enter new filename (full path) or CTRL+C to quit: "
+4007	"'%s' requires '%s'; option ignored"
+4009	"threshold only for far or huge data; ignored"
+4011	"preprocessing overrides source listing"
+4012	"function declarations override source listing"
+4013	"combined listing overrides object listing"
+4014	"invalid value '%d' for '%s'; assuming '%d'"
+4018	".DEF files supported for segmented executable files only"
+4019	"string too long; truncated to %d characters"
+4020    "'%s' : missing argument; option ignored"
+4021    "no action performed"
+4022	"option '%s' invalid for %d-bit target"
+4023	"option '%s' forces use of optimizing compiler"
+4000	"unknown command-line warning"
diff --git a/base/build/cl.exe b/base/build/cl.exe
new file mode 100644
index 0000000..d8d2ef7
Binary files /dev/null and b/base/build/cl.exe differ
diff --git a/base/build/cl.exe.config b/base/build/cl.exe.config
new file mode 100644
index 0000000..7dc078e
--- /dev/null
+++ b/base/build/cl.exe.config
@@ -0,0 +1,10 @@
+<configuration>
+	<startup>
+		<requiredRuntime safemode="true" imageVersion="v2.0.50727"/>
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<publisherPolicy apply="no" />
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/base/build/cl.msg b/base/build/cl.msg
new file mode 100644
index 0000000..55b5874
--- /dev/null
+++ b/base/build/cl.msg
@@ -0,0 +1,139 @@
+C COMPILER OPTIONS
+-MEMORY MODEL-
+/AS small model (default)
+/AC compact model
+/AM medium model
+/AL large model
+/AH huge model
+/AT tiny model (.COM files)
+/A<string> (custom memory model)
+-OPTIMIZATION-
+/O enable optimization (same as /Ot)
+/O1 minimize space
+/O2 maximize speed
+/Oa assume no aliasing
+/Ob<n> inline expansion (default n=0)
+/Oc local common subexpression opt.
+/Od disable optimization (default)
+/Oe enable registers allocation
+/Of[-] toggle p-code quoting
+/Og global common subexpression opt.
+/Oi enable intrinsic functions
+/Ol enable loop optimizations
+/On disable "unsafe" optimizations
+/Oo[-] toggle post code-gen. opt.
+/Op[-] improve floating-pt consistency
+/Oq enable maximum p-code optimization
+/Or gen. common exit code (CodeView)
+/Os favor code size
+/Ot favor code speed
+/Ov[-] toggle p-code frame sorting
+/OV<n> control inlining by func. size
+/Ow assume cross-function aliasing
+/Ox maximum opts. (/Ob1cegilnot /Gs)
+/Oz enable "unsafe" optimizations
+-CODE GENERATION-
+/G0 8086 instructions (default)
+/G1  186 instructions
+/G2  286 instructions
+/G3  386 instructions
+/GA protected-mode Win entry/exit code
+/GD protected-mode Win entry/exit code
+/GE<x> customize Windows entry/exit
+/Gq backwards compatibility with v. 6
+/Gc Pascal style calling conventions
+/Gd C style calling conventions
+/Ge use stack-check calls
+/Gf enable string pooling
+/Gs remove stack-check calls
+/Gn remove p-code native entry points
+/Gp<num> specify p-code entry tables
+/Gr _fastcall style calling convention
+/Gt[num] data size threshold
+/GW real-mode Windows entry/exit code
+/Gw real-mode Windows entry/exit code
+/Gx assume that data is near
+/Gx- assume that data is far
+/Gy separate functions for linker
+/Zr check null pointers (/f only)
+-OUTPUT FILES-
+/Fa[file] name assembly listing file
+/Fc[file] name source/object listing
+/Fd[file] name .PDB filename
+/Fe<file> name executable filename
+/Fl[file] name object listing filename
+/Fm[file] name map filename
+/Fo<file> name object filename
+/Fr[file] name .SBR filename
+/Fp<file> name .PCH filename
+/FR[file] name extended .SBR filename
+/Fs[file] name source listing filename
+-PREPROCESSOR-
+/C don't strip comments
+/D<name>[=|#text] define macro
+/E preprocess to stdout
+/EP same as /E but no #line
+/I<directory> add #include path
+/P preprocess to file
+/U<name> remove predefined macro
+/u remove all defined macros
+/X ignore "standard places"
+-LANGUAGE-
+/vd{0|1} disable/enable vtordisp
+/vm<x> type of pointers to members
+/Z7 C 7 style CodeView information
+/Za disable extensions (implies /Op)
+/Zd line number information
+/Ze enable extensions (default)
+/Zg generate function prototypes
+/Zi prepare for debugging (CodeView)
+/Zl omit default library name in .OBJ
+/Zp[n] pack structs on n-byte boundary
+/Zs check syntax only
+-FLOATING POINT-
+/FPa calls with altmath
+/FPc calls with emulator
+/FPc87 calls with 8087 library
+/FPi inline with emulator (default)
+/FPi87 inline with 8087
+-SOURCE LISTING-
+/Sl<columns> set line width
+/Sp<lines> set page length
+/St<string> set title string
+/Ss<string> set subtitle string
+-MISCELLANEOUS-
+/batch specify batch mode compilation
+/Bm<num> set compiler's available mem.
+/c compile only, no link
+/H<num> external name length
+/J default char type is unsigned
+/f select fast compiler (default)
+/f- select optimizing compiler
+/Yc create .PCH file
+/Yd put debug info in .PCH file
+/Yu use .PCH file
+/YX automatic precompiled header
+/nologo suppress copyright message
+/Mq compile for QuickWin
+/ND<name> name data segment
+/NM<name> name code segment
+/NQ<name> combine p-code temp segments
+/NT<name> name code segment
+/NV<name> name far v-table segment
+/Tc<file> compile file without .c
+/Tp<file> compile file without .cpp
+/V<string> set version string
+/W<n> warning level (default n=1)
+/w disable all warnings
+/WX treat all warnings as errors
+/Zn turn off SBRPACK for .SBR files
+-MASM SUPPORT-
+/MA<MASM switch>
+/Ta<file> assemble file without .asm
+-LINKING-
+/F <hex_num> stack size (hex. bytes)
+/Lr append 'r' to default lib in .OBJ
+/link [lib] give lib name to linker
+/Ln do not link CRT.LIB
+/Ld select dynamically-linked library
+/Lw select statically-linked library
diff --git a/base/build/cl16.exe b/base/build/cl16.exe
new file mode 100644
index 0000000..98c1f7c
Binary files /dev/null and b/base/build/cl16.exe differ
diff --git a/base/build/cps6311.exe b/base/build/cps6311.exe
new file mode 100644
index 0000000..a70bc92
Binary files /dev/null and b/base/build/cps6311.exe differ
diff --git a/base/build/csc.exe b/base/build/csc.exe
new file mode 100644
index 0000000..0395cd1
Binary files /dev/null and b/base/build/csc.exe differ
diff --git a/base/build/csc.exe.config b/base/build/csc.exe.config
new file mode 100644
index 0000000..6102f8c
--- /dev/null
+++ b/base/build/csc.exe.config
@@ -0,0 +1,6 @@
+<configuration>
+    <startup>
+        <supportedRuntime version="v1.1.4322"/>
+        <requiredRuntime version="v1.1.4322"/>
+    </startup>
+</configuration>
diff --git a/base/build/cscomp.dll b/base/build/cscomp.dll
new file mode 100644
index 0000000..8a1b812
Binary files /dev/null and b/base/build/cscomp.dll differ
diff --git a/base/build/cscompui.dll b/base/build/cscompui.dll
new file mode 100644
index 0000000..13cdbf5
Binary files /dev/null and b/base/build/cscompui.dll differ
diff --git a/base/build/csic.exe b/base/build/csic.exe
new file mode 100644
index 0000000..9a16fb6
Binary files /dev/null and b/base/build/csic.exe differ
diff --git a/base/build/csic.exe.config b/base/build/csic.exe.config
new file mode 100644
index 0000000..648fd42
--- /dev/null
+++ b/base/build/csic.exe.config
@@ -0,0 +1,11 @@
+<!-- $Id: csic.exe.config#2 2007/05/17 17:05:05 REDMOND\\ohodson $ -->
+<configuration>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="csic;obj"/>
+      </assemblyBinding>
+   </runtime>
+   <system.diagnostics>
+          <trace autoflush="true" indentsize="0"></trace>
+   </system.diagnostics>
+</configuration>
diff --git a/base/build/csic.pdb b/base/build/csic.pdb
new file mode 100644
index 0000000..65d6f71
Binary files /dev/null and b/base/build/csic.pdb differ
diff --git a/base/build/csic/Bartok.Datatype.dll b/base/build/csic/Bartok.Datatype.dll
new file mode 100644
index 0000000..0fe046c
Binary files /dev/null and b/base/build/csic/Bartok.Datatype.dll differ
diff --git a/base/build/csic/Bartok.DebugInfo.dll b/base/build/csic/Bartok.DebugInfo.dll
new file mode 100644
index 0000000..e9aaa19
Binary files /dev/null and b/base/build/csic/Bartok.DebugInfo.dll differ
diff --git a/base/build/csic/Bartok.MSIL.dll b/base/build/csic/Bartok.MSIL.dll
new file mode 100644
index 0000000..3eecf0b
Binary files /dev/null and b/base/build/csic/Bartok.MSIL.dll differ
diff --git a/base/build/csic/Bartok.Utility.dll b/base/build/csic/Bartok.Utility.dll
new file mode 100644
index 0000000..34cceec
Binary files /dev/null and b/base/build/csic/Bartok.Utility.dll differ
diff --git a/base/build/csic/Compiler.dll b/base/build/csic/Compiler.dll
new file mode 100644
index 0000000..05e94be
Binary files /dev/null and b/base/build/csic/Compiler.dll differ
diff --git a/base/build/csic/Compiler.pdb b/base/build/csic/Compiler.pdb
new file mode 100644
index 0000000..9bbd184
Binary files /dev/null and b/base/build/csic/Compiler.pdb differ
diff --git a/base/build/csic/base.dll b/base/build/csic/base.dll
new file mode 100644
index 0000000..48078e7
Binary files /dev/null and b/base/build/csic/base.dll differ
diff --git a/base/build/csic/base.pdb b/base/build/csic/base.pdb
new file mode 100644
index 0000000..21acfc0
Binary files /dev/null and b/base/build/csic/base.pdb differ
diff --git a/base/build/csic/bind.dll b/base/build/csic/bind.dll
new file mode 100644
index 0000000..6585b26
Binary files /dev/null and b/base/build/csic/bind.dll differ
diff --git a/base/build/csic/bind.pdb b/base/build/csic/bind.pdb
new file mode 100644
index 0000000..1011167
Binary files /dev/null and b/base/build/csic/bind.pdb differ
diff --git a/base/build/csic/emit.dll b/base/build/csic/emit.dll
new file mode 100644
index 0000000..97279e1
Binary files /dev/null and b/base/build/csic/emit.dll differ
diff --git a/base/build/csic/emit.pdb b/base/build/csic/emit.pdb
new file mode 100644
index 0000000..0cef1e5
Binary files /dev/null and b/base/build/csic/emit.pdb differ
diff --git a/base/build/csic/ilgen.dll b/base/build/csic/ilgen.dll
new file mode 100644
index 0000000..bb0ba0f
Binary files /dev/null and b/base/build/csic/ilgen.dll differ
diff --git a/base/build/csic/ilgen.pdb b/base/build/csic/ilgen.pdb
new file mode 100644
index 0000000..6e6bf11
Binary files /dev/null and b/base/build/csic/ilgen.pdb differ
diff --git a/base/build/csic/parser.dll b/base/build/csic/parser.dll
new file mode 100644
index 0000000..23ce8c4
Binary files /dev/null and b/base/build/csic/parser.dll differ
diff --git a/base/build/csic/parser.pdb b/base/build/csic/parser.pdb
new file mode 100644
index 0000000..1eb6d9c
Binary files /dev/null and b/base/build/csic/parser.pdb differ
diff --git a/base/build/csic/source.dll b/base/build/csic/source.dll
new file mode 100644
index 0000000..21af0c1
Binary files /dev/null and b/base/build/csic/source.dll differ
diff --git a/base/build/csic/source.pdb b/base/build/csic/source.pdb
new file mode 100644
index 0000000..6d50266
Binary files /dev/null and b/base/build/csic/source.pdb differ
diff --git a/base/build/csic/typecheck.dll b/base/build/csic/typecheck.dll
new file mode 100644
index 0000000..519063a
Binary files /dev/null and b/base/build/csic/typecheck.dll differ
diff --git a/base/build/csic/typecheck.pdb b/base/build/csic/typecheck.pdb
new file mode 100644
index 0000000..c264a4e
Binary files /dev/null and b/base/build/csic/typecheck.pdb differ
diff --git a/base/build/cvtres.exe b/base/build/cvtres.exe
new file mode 100644
index 0000000..0bd24b7
Binary files /dev/null and b/base/build/cvtres.exe differ
diff --git a/base/build/dbg.cmd b/base/build/dbg.cmd
new file mode 100644
index 0000000..bfcda0d
--- /dev/null
+++ b/base/build/dbg.cmd
@@ -0,0 +1,47 @@
+@echo off
+
+setlocal
+
+:parse
+
+if /I .%1==./1394 (
+    set ConnectArgs=1394:channel=0
+    shift
+    goto :parse
+) else if /I .%1==./com1 (
+    set ConnectArgs=com:port=\\.\com1,baud=115200
+    shift
+    goto :parse
+) else if /I .%1==./com2 (
+    set ConnectArgs=com:port=\\.\com2,baud=115200
+    shift
+    goto :parse
+) else if /I .%1==./pipe (
+    set ConnectArgs=com:pipe,port=\\.\pipe\kd,resets=0,reconnect
+    shift
+    goto :parse
+)
+
+if not defined ConnectArgs (
+    call :Usage %0
+    exit /b 1
+)
+
+@rem Read object file paths generated by build process
+call %SINGULARITY_ROOT%\buildcfg.cmd
+if ErrorLevel 1 (
+    echo %SINGULARITY_ROOT%\buildcfg.cmd failed.
+    exit /b 1
+)
+
+start windbg.exe -k %ConnectArgs% -WX -W %SINGULARITY_ROOT%:%BUILDTYPE% -d -c "g" %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+exit /b 0
+
+:Usage
+
+echo.Usage:
+echo.    %~nx1 ^<connectionType^>
+echo.
+echo.where ^<connectionType^> is one of:
+echo.    /1394 ^| /com1 ^| /com2 ^| /pipe
diff --git a/base/build/dbghelp.dll b/base/build/dbghelp.dll
new file mode 100644
index 0000000..cce64dd
Binary files /dev/null and b/base/build/dbghelp.dll differ
diff --git a/base/build/depviewer.exe.config b/base/build/depviewer.exe.config
new file mode 100644
index 0000000..115a73b
--- /dev/null
+++ b/base/build/depviewer.exe.config
@@ -0,0 +1,11 @@
+<!-- ssc.exe.config -->
+<configuration>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="DepViewer"/>
+      </assemblyBinding>
+   </runtime>
+   <system.diagnostics>
+          <trace autoflush="true" indentsize="0"></trace>
+   </system.diagnostics>
+</configuration>
diff --git a/base/build/dumpbin.exe b/base/build/dumpbin.exe
new file mode 100644
index 0000000..d928d35
Binary files /dev/null and b/base/build/dumpbin.exe differ
diff --git a/base/build/editbin.exe b/base/build/editbin.exe
new file mode 100644
index 0000000..7fa7bbc
Binary files /dev/null and b/base/build/editbin.exe differ
diff --git a/base/build/grabsector.exe b/base/build/grabsector.exe
new file mode 100644
index 0000000..87f4d1c
Binary files /dev/null and b/base/build/grabsector.exe differ
diff --git a/base/build/grabsector.pdb b/base/build/grabsector.pdb
new file mode 100644
index 0000000..d9078f5
Binary files /dev/null and b/base/build/grabsector.pdb differ
diff --git a/base/build/ilasm.exe b/base/build/ilasm.exe
new file mode 100644
index 0000000..184d2db
Binary files /dev/null and b/base/build/ilasm.exe differ
diff --git a/base/build/ilasm.exe.config b/base/build/ilasm.exe.config
new file mode 100644
index 0000000..9482b17
--- /dev/null
+++ b/base/build/ilasm.exe.config
@@ -0,0 +1,11 @@
+<?xml version ="1.0"?>
+<configuration>
+    <startup>
+        <requiredRuntime  safemode="true"  imageVersion="v1.1.4322" version="v1.1.4322"  />
+    </startup>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <publisherPolicy apply="no"/>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/base/build/ildasm.exe b/base/build/ildasm.exe
new file mode 100644
index 0000000..31ef7b7
Binary files /dev/null and b/base/build/ildasm.exe differ
diff --git a/base/build/ildasm.exe.config b/base/build/ildasm.exe.config
new file mode 100644
index 0000000..8f82556
--- /dev/null
+++ b/base/build/ildasm.exe.config
@@ -0,0 +1,6 @@
+<?xml version ="1.0"?>
+<configuration>
+    <startup>
+        <requiredRuntime version="v1.1.4322"  />
+    </startup>
+</configuration>
diff --git a/base/build/lib.exe b/base/build/lib.exe
new file mode 100644
index 0000000..708da25
Binary files /dev/null and b/base/build/lib.exe differ
diff --git a/base/build/link.exe b/base/build/link.exe
new file mode 100644
index 0000000..be7c88d
Binary files /dev/null and b/base/build/link.exe differ
diff --git a/base/build/link.exe.config b/base/build/link.exe.config
new file mode 100644
index 0000000..7dc078e
--- /dev/null
+++ b/base/build/link.exe.config
@@ -0,0 +1,10 @@
+<configuration>
+	<startup>
+		<requiredRuntime safemode="true" imageVersion="v2.0.50727"/>
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<publisherPolicy apply="no" />
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/base/build/link16.exe b/base/build/link16.exe
new file mode 100644
index 0000000..65f2e43
Binary files /dev/null and b/base/build/link16.exe differ
diff --git a/base/build/mag_ets.exe b/base/build/mag_ets.exe
new file mode 100644
index 0000000..d32d0e8
Binary files /dev/null and b/base/build/mag_ets.exe differ
diff --git a/base/build/magpyvis.exe b/base/build/magpyvis.exe
new file mode 100644
index 0000000..e38244f
Binary files /dev/null and b/base/build/magpyvis.exe differ
diff --git a/base/build/mkasm.exe b/base/build/mkasm.exe
new file mode 100644
index 0000000..83c5660
Binary files /dev/null and b/base/build/mkasm.exe differ
diff --git a/base/build/mkcontagmap.exe b/base/build/mkcontagmap.exe
new file mode 100644
index 0000000..0d648f4
Binary files /dev/null and b/base/build/mkcontagmap.exe differ
diff --git a/base/build/mkcontagmap.pdb b/base/build/mkcontagmap.pdb
new file mode 100644
index 0000000..9093f2c
Binary files /dev/null and b/base/build/mkcontagmap.pdb differ
diff --git a/base/build/mkcore.exe b/base/build/mkcore.exe
new file mode 100644
index 0000000..d069328
Binary files /dev/null and b/base/build/mkcore.exe differ
diff --git a/base/build/mkmani.exe b/base/build/mkmani.exe
new file mode 100644
index 0000000..008f4ae
Binary files /dev/null and b/base/build/mkmani.exe differ
diff --git a/base/build/mkmani.pdb b/base/build/mkmani.pdb
new file mode 100644
index 0000000..9905249
Binary files /dev/null and b/base/build/mkmani.pdb differ
diff --git a/base/build/mkname.exe b/base/build/mkname.exe
new file mode 100644
index 0000000..fbaf1fd
Binary files /dev/null and b/base/build/mkname.exe differ
diff --git a/base/build/mkpxecom.exe b/base/build/mkpxecom.exe
new file mode 100644
index 0000000..9bc75be
Binary files /dev/null and b/base/build/mkpxecom.exe differ
diff --git a/base/build/mktests.exe b/base/build/mktests.exe
new file mode 100644
index 0000000..33f0c2d
Binary files /dev/null and b/base/build/mktests.exe differ
diff --git a/base/build/mktests.pdb b/base/build/mktests.pdb
new file mode 100644
index 0000000..f5f6f48
Binary files /dev/null and b/base/build/mktests.pdb differ
diff --git a/base/build/ml.exe b/base/build/ml.exe
new file mode 100644
index 0000000..9c04cef
Binary files /dev/null and b/base/build/ml.exe differ
diff --git a/base/build/msb.cmd b/base/build/msb.cmd
new file mode 100644
index 0000000..b25bf29
--- /dev/null
+++ b/base/build/msb.cmd
@@ -0,0 +1,97 @@
+@echo off
+rem This script is a wrapper around invoking MSBuild.  It causes MSBuild to record
+rem a log file under %SINGULARITY_OBJROOT%.obj\MSBuildLogs.
+
+if /i "%ScriptDebug%" == "Yes" (
+   @echo on
+)
+
+setlocal ENABLEDELAYEDEXPANSION
+
+@rem Some of the old 16-bit tools do not deal well with long paths.
+@rem Trim our path while building to the bare essentials.  The
+@rem setlocal above will prevent this from affecting the shell that
+@rem invoked msb.cmd.
+path %SystemRoot%;%SystemRoot%\System32;%SystemRoot%\System32\Wbem;%SINGULARITY_ROOT%\Build
+
+set _msbuild=%SystemRoot%\Microsoft.NET\Framework\v2.0.50727\msbuild.exe
+
+if not exist "%_msbuild%" (
+    echo %_msbuild% is not found.
+    echo Please install the .Net Framework 2.0.
+    goto :eof
+)
+
+rem -XXX- This assumes US locale date format.
+rem                  01234567890123
+rem %DATE% gives us "Fri 03/30/2007"
+rem %TIME% gives us "15:49:15.24"
+set _date=%DATE%
+set _time=%TIME%
+
+rem We want to build a log file name, based on the current date and time.
+rem We can't use %DATE% and %TIME% directly, because they contain characters
+rem that we don't want in filenames, and because the sort order of those strings
+rem does not match time order.  So we swap things around a bit.  We intentionally
+rem leave out the usual time/date separators, because we're using YYYYMMDD format,
+rem not the usual US format.
+
+set _logfile=msbuild-%COMPUTERNAME%-%_date:~10,4%%_date:~4,2%%_date:~7,2%-%_time:~0,2%%_time:~3,2%%_time:~6,2%.log
+set _logfile=%_logfile: =0%
+set _logfile=%_logfile::=_%
+set _logfile=%_logfile:/=_%
+set _logfile=%_logfile:\=_%
+
+if not "!SINGULARITY_ROOT!" == "" (
+    if "!SINGULARITY_OBJROOT!" == "" set SINGULARITY_OBJROOT=!SINGULARITY_ROOT!.obj
+)
+
+if not "!SINGULARITY_OBJROOT!" == "" set _logdir=!SINGULARITY_OBJROOT!\MSBuildLogs
+
+if not "!_logdir" == "" (
+    if not exist "!_logdir!" (
+        echo creating log dir - !_logdir!
+        mkdir "!_logdir!"
+    )
+)
+
+if not "!_logdir!" == "" set _logfile=%_logdir%\%_logfile%
+
+set _logargs=/logger:FileLogger,Microsoft.Build.Engine;LogFile="!_logfile!";Verbosity=Normal;PerformanceSummary
+rem
+
+rem echo %_msbuild% /nologo /v:m %* !_logargs!
+
+rem Do not put any statements between the invocation
+rem of msbuild and the capture of its exit code.
+%_msbuild% /nologo /v:m %* !_logargs!
+set exitCode=%ErrorLevel%
+
+(
+echo.
+echo SINGULARITY_ROOT:     %SINGULARITY_ROOT%
+echo Current directory:    %CD%
+echo MSBuild args:         %*
+echo Invoking user:        %USERNAME%
+echo Computer:             %COMPUTERNAME%
+echo Date and time:        %_date% %_time%
+echo MSBuild Result:       ERRORLEVEL = %ERRORLEVEL%
+echo.
+echo Configuration:        %Configuration%
+echo Platform:             %Platform%
+echo Paging:               %PAGING%
+echo App collector:        %COLLECTOR_APP%
+echo Kernel collector:     %COLLECTOR_KERNEL%
+) >> "%_logfile%"
+
+echo Log file: %_logfile%
+
+if %ExitCode% == 0 (
+    echo Build Succeeded.
+) else (
+    echo Build Failed.
+)
+
+rem Automated build scripts depend on the exit code
+rem in order to detect successful or error hampered execution of MSBuild.
+exit /b %exitCode%
diff --git a/base/build/msdia20.dll b/base/build/msdia20.dll
new file mode 100644
index 0000000..7b73957
Binary files /dev/null and b/base/build/msdia20.dll differ
diff --git a/base/build/msdis150.dll b/base/build/msdis150.dll
new file mode 100644
index 0000000..d8aaf02
Binary files /dev/null and b/base/build/msdis150.dll differ
diff --git a/base/build/msobj80.dll b/base/build/msobj80.dll
new file mode 100644
index 0000000..4146d95
Binary files /dev/null and b/base/build/msobj80.dll differ
diff --git a/base/build/mspdb80.dll b/base/build/mspdb80.dll
new file mode 100644
index 0000000..9ba8cb9
Binary files /dev/null and b/base/build/mspdb80.dll differ
diff --git a/base/build/mspdbcore.dll b/base/build/mspdbcore.dll
new file mode 100644
index 0000000..7783c41
Binary files /dev/null and b/base/build/mspdbcore.dll differ
diff --git a/base/build/mspdbsrv.exe b/base/build/mspdbsrv.exe
new file mode 100644
index 0000000..074c74c
Binary files /dev/null and b/base/build/mspdbsrv.exe differ
diff --git a/base/build/mspft80.dll b/base/build/mspft80.dll
new file mode 100644
index 0000000..f54abde
Binary files /dev/null and b/base/build/mspft80.dll differ
diff --git a/base/build/msvcm80.dll b/base/build/msvcm80.dll
new file mode 100644
index 0000000..4bff9aa
Binary files /dev/null and b/base/build/msvcm80.dll differ
diff --git a/base/build/msvcp71.dll b/base/build/msvcp71.dll
new file mode 100644
index 0000000..9ed0d17
Binary files /dev/null and b/base/build/msvcp71.dll differ
diff --git a/base/build/msvcp71d.dll b/base/build/msvcp71d.dll
new file mode 100644
index 0000000..da3a5d6
Binary files /dev/null and b/base/build/msvcp71d.dll differ
diff --git a/base/build/msvcp80.dll b/base/build/msvcp80.dll
new file mode 100644
index 0000000..cc13b93
Binary files /dev/null and b/base/build/msvcp80.dll differ
diff --git a/base/build/msvcp80d.dll b/base/build/msvcp80d.dll
new file mode 100644
index 0000000..3736b00
Binary files /dev/null and b/base/build/msvcp80d.dll differ
diff --git a/base/build/msvcr71.dll b/base/build/msvcr71.dll
new file mode 100644
index 0000000..9d9e028
Binary files /dev/null and b/base/build/msvcr71.dll differ
diff --git a/base/build/msvcr71d.dll b/base/build/msvcr71d.dll
new file mode 100644
index 0000000..afcb618
Binary files /dev/null and b/base/build/msvcr71d.dll differ
diff --git a/base/build/msvcr80.dll b/base/build/msvcr80.dll
new file mode 100644
index 0000000..3d9561a
Binary files /dev/null and b/base/build/msvcr80.dll differ
diff --git a/base/build/msvcr80d.dll b/base/build/msvcr80d.dll
new file mode 100644
index 0000000..666589b
Binary files /dev/null and b/base/build/msvcr80d.dll differ
diff --git a/base/build/nib.exe b/base/build/nib.exe
new file mode 100644
index 0000000..da33c29
Binary files /dev/null and b/base/build/nib.exe differ
diff --git a/base/build/nib.pdb b/base/build/nib.pdb
new file mode 100644
index 0000000..b28df7f
Binary files /dev/null and b/base/build/nib.pdb differ
diff --git a/base/build/nmake.exe b/base/build/nmake.exe
new file mode 100644
index 0000000..21f6ef1
Binary files /dev/null and b/base/build/nmake.exe differ
diff --git a/base/build/nmake_dirs.exe b/base/build/nmake_dirs.exe
new file mode 100644
index 0000000..7de2541
Binary files /dev/null and b/base/build/nmake_dirs.exe differ
diff --git a/base/build/nmake_dirs.pdb b/base/build/nmake_dirs.pdb
new file mode 100644
index 0000000..7fe78a0
Binary files /dev/null and b/base/build/nmake_dirs.pdb differ
diff --git a/base/build/passive.dbg b/base/build/passive.dbg
new file mode 100644
index 0000000..37b481e
--- /dev/null
+++ b/base/build/passive.dbg
@@ -0,0 +1,15 @@
+* This script contains commands that can be executed in
+* automated bvts when the debugger halts for user input during
+* automated tests.
+lsa @eip
+r
+rF
+.lines -e
+kp
+.frame 0
+dv
+.frame 1
+dv
+.frame 2
+dv
+q
diff --git a/base/build/pdbstr.exe b/base/build/pdbstr.exe
new file mode 100644
index 0000000..2dbabc9
Binary files /dev/null and b/base/build/pdbstr.exe differ
diff --git a/base/build/pgodb80.dll b/base/build/pgodb80.dll
new file mode 100644
index 0000000..e64719f
Binary files /dev/null and b/base/build/pgodb80.dll differ
diff --git a/base/build/rc.exe b/base/build/rc.exe
new file mode 100644
index 0000000..40423c2
Binary files /dev/null and b/base/build/rc.exe differ
diff --git a/base/build/rc.hlp b/base/build/rc.hlp
new file mode 100644
index 0000000..7386e72
Binary files /dev/null and b/base/build/rc.hlp differ
diff --git a/base/build/rcdll.dll b/base/build/rcdll.dll
new file mode 100644
index 0000000..961b7cc
Binary files /dev/null and b/base/build/rcdll.dll differ
diff --git a/base/build/refgraph.exe b/base/build/refgraph.exe
new file mode 100644
index 0000000..1327c6a
Binary files /dev/null and b/base/build/refgraph.exe differ
diff --git a/base/build/refgraph.exe.config b/base/build/refgraph.exe.config
new file mode 100644
index 0000000..609243b
--- /dev/null
+++ b/base/build/refgraph.exe.config
@@ -0,0 +1,11 @@
+<!-- ssc.exe.config -->
+<configuration>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="sgc"/>
+      </assemblyBinding>
+   </runtime>
+   <system.diagnostics>
+          <trace autoflush="true" indentsize="0"></trace>
+   </system.diagnostics>
+</configuration>
diff --git a/base/build/refgraph.pdb b/base/build/refgraph.pdb
new file mode 100644
index 0000000..fc44040
Binary files /dev/null and b/base/build/refgraph.pdb differ
diff --git a/base/build/setvhdboot.exe b/base/build/setvhdboot.exe
new file mode 100644
index 0000000..1dd89b2
Binary files /dev/null and b/base/build/setvhdboot.exe differ
diff --git a/base/build/setvhdboot.pdb b/base/build/setvhdboot.pdb
new file mode 100644
index 0000000..c6b8425
Binary files /dev/null and b/base/build/setvhdboot.pdb differ
diff --git a/base/build/sgc.exe b/base/build/sgc.exe
new file mode 100644
index 0000000..b7efcc3
Binary files /dev/null and b/base/build/sgc.exe differ
diff --git a/base/build/sgc.exe.config b/base/build/sgc.exe.config
new file mode 100644
index 0000000..609243b
--- /dev/null
+++ b/base/build/sgc.exe.config
@@ -0,0 +1,11 @@
+<!-- ssc.exe.config -->
+<configuration>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="sgc"/>
+      </assemblyBinding>
+   </runtime>
+   <system.diagnostics>
+          <trace autoflush="true" indentsize="0"></trace>
+   </system.diagnostics>
+</configuration>
diff --git a/base/build/sgc.pdb b/base/build/sgc.pdb
new file mode 100644
index 0000000..62291f0
Binary files /dev/null and b/base/build/sgc.pdb differ
diff --git a/base/build/sgc/ContractsPropertyPane.dll b/base/build/sgc/ContractsPropertyPane.dll
new file mode 100644
index 0000000..0fe4553
Binary files /dev/null and b/base/build/sgc/ContractsPropertyPane.dll differ
diff --git a/base/build/sgc/IPropertyPane.dll b/base/build/sgc/IPropertyPane.dll
new file mode 100644
index 0000000..29aaaf2
Binary files /dev/null and b/base/build/sgc/IPropertyPane.dll differ
diff --git a/base/build/sgc/ITaskManager.dll b/base/build/sgc/ITaskManager.dll
new file mode 100644
index 0000000..fe0d21a
Binary files /dev/null and b/base/build/sgc/ITaskManager.dll differ
diff --git a/base/build/sgc/ITaskManager.pdb b/base/build/sgc/ITaskManager.pdb
new file mode 100644
index 0000000..8342f1d
Binary files /dev/null and b/base/build/sgc/ITaskManager.pdb differ
diff --git a/base/build/sgc/Microsoft.SingSharp.Resources.dll b/base/build/sgc/Microsoft.SingSharp.Resources.dll
new file mode 100644
index 0000000..c21cbb6
Binary files /dev/null and b/base/build/sgc/Microsoft.SingSharp.Resources.dll differ
diff --git a/base/build/sgc/Microsoft.SingSharp.Runtime.dll b/base/build/sgc/Microsoft.SingSharp.Runtime.dll
new file mode 100644
index 0000000..62399f9
Binary files /dev/null and b/base/build/sgc/Microsoft.SingSharp.Runtime.dll differ
diff --git a/base/build/sgc/Microsoft.SingSharp.Runtime.pdb b/base/build/sgc/Microsoft.SingSharp.Runtime.pdb
new file mode 100644
index 0000000..b42f44d
Binary files /dev/null and b/base/build/sgc/Microsoft.SingSharp.Runtime.pdb differ
diff --git a/base/build/sgc/Microsoft.SingSharp.dll b/base/build/sgc/Microsoft.SingSharp.dll
new file mode 100644
index 0000000..cdfc159
Binary files /dev/null and b/base/build/sgc/Microsoft.SingSharp.dll differ
diff --git a/base/build/sgc/Microsoft.SingSharp.pdb b/base/build/sgc/Microsoft.SingSharp.pdb
new file mode 100644
index 0000000..8c2a155
Binary files /dev/null and b/base/build/sgc/Microsoft.SingSharp.pdb differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.Designer.Interfaces.dll b/base/build/sgc/Microsoft.VisualStudio.Designer.Interfaces.dll
new file mode 100644
index 0000000..42cd22b
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.Designer.Interfaces.dll differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.IntegrationHelper.dll b/base/build/sgc/Microsoft.VisualStudio.IntegrationHelper.dll
new file mode 100644
index 0000000..4d61d98
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.IntegrationHelper.dll differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.IntegrationHelper.pdb b/base/build/sgc/Microsoft.VisualStudio.IntegrationHelper.pdb
new file mode 100644
index 0000000..63fc11b
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.IntegrationHelper.pdb differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.OLE.Interop.dll b/base/build/sgc/Microsoft.VisualStudio.OLE.Interop.dll
new file mode 100644
index 0000000..bcdd96d
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.OLE.Interop.dll differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.Package.dll b/base/build/sgc/Microsoft.VisualStudio.Package.dll
new file mode 100644
index 0000000..8f8af64
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.Package.dll differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.Package.pdb b/base/build/sgc/Microsoft.VisualStudio.Package.pdb
new file mode 100644
index 0000000..72b42f0
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.Package.pdb differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.Shell.Interop.dll b/base/build/sgc/Microsoft.VisualStudio.Shell.Interop.dll
new file mode 100644
index 0000000..a4b7afe
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.Shell.Interop.dll differ
diff --git a/base/build/sgc/Microsoft.VisualStudio.TextManager.Interop.dll b/base/build/sgc/Microsoft.VisualStudio.TextManager.Interop.dll
new file mode 100644
index 0000000..553e141
Binary files /dev/null and b/base/build/sgc/Microsoft.VisualStudio.TextManager.Interop.dll differ
diff --git a/base/build/sgc/Mscorlib.Contracts.dll b/base/build/sgc/Mscorlib.Contracts.dll
new file mode 100644
index 0000000..535d055
Binary files /dev/null and b/base/build/sgc/Mscorlib.Contracts.dll differ
diff --git a/base/build/sgc/Mscorlib.Contracts.pdb b/base/build/sgc/Mscorlib.Contracts.pdb
new file mode 100644
index 0000000..40dd182
Binary files /dev/null and b/base/build/sgc/Mscorlib.Contracts.pdb differ
diff --git a/base/build/sgc/PropertyPage.dll b/base/build/sgc/PropertyPage.dll
new file mode 100644
index 0000000..03f40b5
Binary files /dev/null and b/base/build/sgc/PropertyPage.dll differ
diff --git a/base/build/sgc/PropertyPageUI.dll b/base/build/sgc/PropertyPageUI.dll
new file mode 100644
index 0000000..cf91afc
Binary files /dev/null and b/base/build/sgc/PropertyPageUI.dll differ
diff --git a/base/build/sgc/System.Compiler.Contracts.dll b/base/build/sgc/System.Compiler.Contracts.dll
new file mode 100644
index 0000000..d9df0ad
Binary files /dev/null and b/base/build/sgc/System.Compiler.Contracts.dll differ
diff --git a/base/build/sgc/System.Compiler.Contracts.pdb b/base/build/sgc/System.Compiler.Contracts.pdb
new file mode 100644
index 0000000..3c7223c
Binary files /dev/null and b/base/build/sgc/System.Compiler.Contracts.pdb differ
diff --git a/base/build/sgc/System.Compiler.DebugTools.dll b/base/build/sgc/System.Compiler.DebugTools.dll
new file mode 100644
index 0000000..e0837eb
Binary files /dev/null and b/base/build/sgc/System.Compiler.DebugTools.dll differ
diff --git a/base/build/sgc/System.Compiler.Framework.Contracts.dll b/base/build/sgc/System.Compiler.Framework.Contracts.dll
new file mode 100644
index 0000000..3bba0d0
Binary files /dev/null and b/base/build/sgc/System.Compiler.Framework.Contracts.dll differ
diff --git a/base/build/sgc/System.Compiler.Framework.Contracts.pdb b/base/build/sgc/System.Compiler.Framework.Contracts.pdb
new file mode 100644
index 0000000..657a35e
Binary files /dev/null and b/base/build/sgc/System.Compiler.Framework.Contracts.pdb differ
diff --git a/base/build/sgc/System.Compiler.Framework.dll b/base/build/sgc/System.Compiler.Framework.dll
new file mode 100644
index 0000000..137ca12
Binary files /dev/null and b/base/build/sgc/System.Compiler.Framework.dll differ
diff --git a/base/build/sgc/System.Compiler.Framework.pdb b/base/build/sgc/System.Compiler.Framework.pdb
new file mode 100644
index 0000000..e33a676
Binary files /dev/null and b/base/build/sgc/System.Compiler.Framework.pdb differ
diff --git a/base/build/sgc/System.Compiler.Framework.xml b/base/build/sgc/System.Compiler.Framework.xml
new file mode 100644
index 0000000..815f9e7
--- /dev/null
+++ b/base/build/sgc/System.Compiler.Framework.xml
@@ -0,0 +1,5239 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>System.Compiler.Framework</name>
+    </assembly>
+    <members>
+        <member name="T:System.Compiler.Optimizer">
+            <summary>
+            Runs after Normalizer and Analyzer. Performs rewrites that we don't want the analyzer to see, e.g., removes
+            calls to conditional methods.
+            It can also take advantage of invariants learned during the Analyzer phase.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.WPurity.PointsToAndWriteEffects">
+            <summary>
+            Represents the pointsTo and the write effects of the current block.
+            That is, PtWe = &lt; PtGraph , WriteEffects , NonAnalyzableCalls &gt;. 
+            It is a semilattice (bottom , &lt;=).
+            </summary>
+        </member>
+        <member name="T:System.Compiler.MathematicalLattice.Element">
+            <summary>
+             An element of the lattice.  This class should be derived from in any
+             implementation of MathematicalLattice.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.MathematicalLattice.AtMost(System.Compiler.MathematicalLattice.Element,System.Compiler.MathematicalLattice.Element)">
+            <summary>
+            Returns true if a &lt;= this.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.MathematicalLattice.Element">
+            <summary>
+             An element of the lattice.  This class should be derived from in any
+             implementation of MathematicalLattice.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.WPurity.PointsToAndWriteEffects.pointsToGraph">
+            <summary>
+            This is the semilattice: a PointsToGraph, the WriteEffects, and the non-analyzed calls.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.WPurity.PointsToAndWriteEffects.methodAssumptions">
+            <summary>
+             Assumptions made when analyzing virtual calls
+            </summary>
+        </member>
+        <member name="F:System.Compiler.WPurity.PointsToAndWriteEffects.method">
+            <summary>
+            Method under analysis 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.Join(System.Compiler.WPurity.PointsToAndWriteEffects)">
+            <summary>
+             Join two PointsToAndWriteEffects
+            </summary>
+            <param name="ptgWe"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.Includes(System.Compiler.WPurity.PointsToAndWriteEffects)">
+            <summary>
+             Inclusion check for two PointsToAndWriteEffects
+            </summary>
+            <param name="ptgWe"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.InitMethod(System.Compiler.Method,System.Collections.IEnumerable,System.Compiler.Label)">
+            <summary>
+            Transfer function for the Method Header
+            </summary>
+            <param name="method"></param>
+            <param name="parameters"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyAssignNull(System.Compiler.Variable)">
+            <summary>
+            f(v1 = null, ptwe), operation only over the pointsToGraph 
+            </summary>
+            <param name="v1"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ForgetVariable(System.Compiler.Variable)">
+            <summary>
+            Represent when the value of a variable is not longer valid
+            This means losing information about which nodes v1 points to
+            </summary>
+            <param name="v1"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.CopyLocVar(System.Compiler.Variable,System.Compiler.Variable)">
+            <summary>
+            A more complex copy operation
+            f(v1 = v2), operation only over the pointsToGraph
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.CopyLocVar(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(v1 = v2), operation only over the pointsToGraph
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyNewStatement(System.Compiler.Variable,System.Compiler.Label,System.Compiler.TypeNode)">
+            <summary>
+            f(new Type, ptwe) , operation only over the pointsToGraph
+            </summary>
+            <param name="v"></param>
+            <param name="lb"></param>
+            <param name="type"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyStoreField(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(v1.f = v2), operates over the pointsToGraph and register the writeEffect
+            </summary>
+            <param name="v1"></param>
+            <param name="f"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyStoreElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(v1[.] = v2), operates over the pointsToGraph and register the writeEffect
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyStaticStore(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+            f(C.f = v2), operates over the pointsToGraph and register the writeEffect
+            </summary>
+            <param name="v2"></param>
+            <param name="f"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadField(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+            f(v1 = v2.f), operates over the pointsToGraph and register the read effect
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="f"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(v1 = v2[.]), operates over the pointsToGraph and register the read effect 
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadStatic(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+            f(v1 = C.f), operates over the pointsToGraph 
+            </summary>
+            <param name="v1"></param>
+            <param name="f"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+             f(v1 = &amp;v2)
+            </summary>
+            <param name="dest"></param>
+            <param name="src"></param>
+            <param name="lb"></param>
+            
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(v1 = *v2), operation only over the pointsToGraph
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyStoreIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            A more complex copy operation
+            f(*v1 = v2, operation only over the pointsToGraph
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadFieldAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+             f(v1 = &amp; v2.f)
+            </summary>
+            <param name="dest"></param>
+            <param name="src"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyLoadStaticFieldAddress(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+             f(v1 = &amp; C.f).  
+            </summary>
+            <param name="dest"></param>
+            <param name="src"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyNonAnalyzableCall(System.Compiler.Variable,System.Compiler.Method,System.Compiler.Variable,System.Compiler.ExpressionList,System.Compiler.Label)">
+            <summary>
+            Register effect of the non-analyzable call in the pointsToGraph inferring the information from the callee annotations
+            </summary>
+            <param name="vr"></param>
+            <param name="callee"></param>
+            <param name="receiver"></param>
+            <param name="arguments"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyAnalyzableCall(System.Compiler.Variable,System.Compiler.Method,System.Compiler.Variable,System.Compiler.ExpressionList,System.Compiler.WPurity.PointsToAndWriteEffects,System.Compiler.Label)">
+            <summary>
+            Apply the interprocedural analysis, binding information from caller and callee
+            </summary>
+            <param name="vr"></param>
+            <param name="callee"></param>
+            <param name="receiver"></param>
+            <param name="arguments"></param>
+            <param name="calleePTWE"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ApplyReturn(System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(return v, ptwe), only has effect in the pointsToGraph
+            </summary>
+            <param name="v"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.RegisterWriteEffect(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+            Register the write effect in all nodes pointed by v
+            </summary>
+            <param name="v"></param>
+            <param name="f"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.RegisterReadFields(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+            Register the write effect in all nodes pointed by v
+            </summary>
+            <param name="v"></param>
+            <param name="f"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ComputeEffects(System.Compiler.WPurity.AbstractEffects)">
+            <summary>
+            Given a Set of effects over abstract heap locations,
+            computes a set of effects over the method parameters
+            or in the global scope
+            </summary>
+            <param name="Effects"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ComputeOneEffectPath(System.Compiler.AField,System.Collections.Generic.List{System.Compiler.Edge},System.Compiler.Variable)">
+            <summary>
+            Compute one Effects using one path from a variable an effect in 
+            an abstract heap location
+            </summary>
+            <param name="af"></param>
+            <param name="currentPath"></param>
+            <param name="v"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.IsReadOnly(System.Compiler.Parameter)">
+            <summary>
+            Verify is the parameter is read-only. That means it cannot reach a modified node.
+            </summary>
+            <param name="p"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.ComputePurityWarnings">
+            <summary>
+            Generate the set with all the non-purity warnings using writeEffects and call information.
+            This set is used to send information to the compiler about the non-purity warnings.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.VerifyPurity">
+            <summary>
+            Check whether a method is pure or not by analyzing the pointsTo and writeEffects info.
+            To be pure, the parameters (or locations reachable from them) cannot be modified 
+            or accessed via escaping locations, and it cannot call non-analyzable methods.
+            </summary>
+            <param name="ptwe"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffects.Dump">
+            <summary>
+            Display the ptwe
+            </summary>
+        </member>
+        <member name="T:System.Compiler.WPurity.AbstractEffects">
+            <summary>
+            Effects: Represent the semilattice of read/write effects
+            It is a Set of &lt; PTAnalysisNode, Field &gt; Elements
+            with Join and Include functions.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.WPurity.VariableEffect">
+            <summary>
+            VariableEffect: Represent a Read/Write effects over a variable
+            That is, the variable and a chain of fields until the 
+            (read) written field
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.VariableEffect.ApplyFieldName(System.String,System.Compiler.Field)">
+            <summary>
+            Used to give format to a field dereference (.f, [.], *)
+            </summary>
+            <param name="pathString"></param>
+            <param name="f"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.WPurity.PointsToAndWriteEffectsInferer">
+            <summary>
+            The dataflow analysis for the method under analysis 
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ForwardDataFlowAnalysis">
+            <summary>
+            Implements a pretty standard data flow analysis with merging of data flow states at join
+            points. 
+            
+            Details:
+            
+            At each block, we maintain two data flow states, pending, and done. Done represents the 
+            dataflow state under which the block has already been analyzed, whereas Pending represent
+            the state under which the block still needs to be analyzed.
+            
+            When a block is reached with a state, it is merged into the pending state. This merge can
+            either be precise, or with weakening (includes now more possibilities than the two states
+            that were merged).
+            
+            Once a block is dequeued for analysis, we compute the new done state, which is the merge
+            of the pending state with the	old done state. There are 3 possible outcomes:
+            1. The old done state completely supersedes the new pending state: no reanalysis is necessary
+            2. The merge is precise, then the block needs to be analyzed only with the pending state 
+               (no need to redo all cases in the done state). 
+            3. The merge is imprecise (contains more possibilities than in either the pending or the old 
+               done state), then we need to analyze the block using this merged state in order to account
+               for these new possibilities.
+              
+            Another imprecision arises from the merge of pending states. This merge could be imprecise, and
+            therefore at the next analysis, we could be analyzing the block under extra cases. Buckets could
+            be used to avoid this. Buckets just increase the language of formulas for expressing fixpoints to
+            a finite disjunction.
+            
+            Each block can be in one of 3 states:
+            a) unenabled (block needs to be reached by more edges before we run it)
+            b) enabled and in work queue (needs to be rescheduled)
+            c) enabled but has been processed with latest incoming states.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.PopPendingState(System.Compiler.CfgBlock)">
+            <summary>
+            Like PendingState returns the pending state for the given block, but
+            it also sets the pending state for this block to null.
+            </summary>
+            <returns>old pending state</returns>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.JoinWithPendingState(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Merge the new pending state with the old pending states.
+            </summary>
+            <returns>merged pending state</returns>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.StateToReanalyzeBlock(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState,System.Boolean@)">
+            <summary>
+            Checks if a block needs to be reanalyzed and under what state.
+            
+            Updates the doneState of this block to reflect the pending state
+            </summary>
+            <returns>null if no reanalysis necessary, the DFS state if the merge is precise,
+            the merged state if the merge is imprecise
+            </returns>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.Run(System.Compiler.ControlFlowGraph,System.Compiler.IDataFlowState)">
+            <summary>
+            Starts the analysis from the entry block of the CFG
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.Run(System.Compiler.ControlFlowGraph,System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Starts the analysis at the first instruction of the given block
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.PushExceptionState(System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Push the given state onto the handler of the block.
+            This causes call-backs to SplitException in order to correctly distribute
+            the exception state among different nested handlers.
+            </summary>
+            <param name="currentBlock">Block from which exception escapes</param>
+            <param name="state">state on exception flow</param>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.PushState(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Add the given state to the pending states of the target block. If 
+            the block is enabled (by the pending edge count optimization), add the
+            block to the worklist.
+            
+            Inv: DoneState => PendingState /\ PendingState != null => InQueue
+            
+            Cases:
+              1. Done => new, nothing to do
+              2. Done |_| new is precise.  Pend' = Pend |_| new,  Done' = Done |_| new
+              3. Done |_| new is imprecise.  Pend' = Done |_| new,  Done' = Done |_| new
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.VisitBlock(System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Default per block visitor. Called from Run.
+            
+            It calls VisitStatement on each statement in a block. 
+            
+            The result of this method is used as the state for all normal control flow successors.
+            To push state onto an exception handler, use the PushExceptionState method. Furthermore, for
+            conditional branches, different states can be pushed onto the true and false branches directly
+            by calling PushPending. In that case, null should be returned from the method in order to avoid pushing
+            the returned state onto both true and false targets again.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.VisitStatement(System.Compiler.CfgBlock,System.Compiler.Statement,System.Compiler.IDataFlowState)">
+            <summary>
+            Default per statement visitor called from the default VisitBlock.
+            Does identity transformation. Subclasses either override this method
+            if the default block handling is sufficient, or they override the Visit method for blocks.
+            
+            The result of this method is used as the state for all normal control flow successors.
+            To push state onto an exception handler, use the PushExceptionState method. Furthermore, for
+            conditional branches, different states can be pushed onto the true and false branches directly
+            by calling PushPending. In that case, null should be returned from the method in order to avoid pushing
+            the returned state onto both true and false targets again.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.Merge(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState,System.Compiler.IDataFlowState,System.Boolean@,System.Boolean@)">
+            <summary>
+            Compute the join of two data flow states at the given block.
+            </summary>
+            <param name="previous">Predecessor block for this new state</param>
+            <param name="joinPoint">Block at which join is computed</param>
+            <param name="atMerge">Old state at this block. Can be null, in which case the incoming state
+            is the first non-bottom state. In this case, the method must set changed
+             <c>resultDiffersFromPreviousMerge</c> to true.</param>
+            <param name="incoming">New data flow state flowing to this block.</param>
+            <param name="resultDiffersFromPreviousMerge">Boolean for fix point. If the state after
+            the merge is equal to the old <c>atMerge</c> state, set to false, otherwise set to true.</param>
+            <param name="mergeIsPrecise">can be set to true if the merged result state strictly contains only
+            information representing either the atMerge or the incoming state, but no extra approximation. If
+            this information cannot be determined by the merge, it must return false. True can only be returned
+            if result is truly precise.</param>
+            <returns>The new merged state.</returns>
+        </member>
+        <member name="M:System.Compiler.ForwardDataFlowAnalysis.SplitExceptions(System.Compiler.CfgBlock,System.Compiler.IDataFlowState@,System.Compiler.IDataFlowState@)">
+            <summary>
+            Splits the exceptions into the ones that this handler will handle and the ones that should
+            <code>currentHandlerState</code> and <code>nextHandlerState</code> cannot both be null.
+            On exit, if <code>currentHandlerState</code> is null, <code>handler</code> handles no exceptions,
+            and if <code>nextHandlerState</code> is null, <code>handler</code> handles all the exceptions in
+            the initial exception set of <code>currentHandlerState</code>.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ForwardDataFlowAnalysis.WorkQueue">
+            <summary>
+            Elements can only be once on this queue. Duplicates are removed.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PriorityQueue">
+            <summary>
+            Implements a work list as a priority queue
+            </summary>
+        </member>
+        <member name="F:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.pointsToWEAnalysis">
+            <summary>
+            A reference to the Main Analysis class
+            To get information about other methods under analysis
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.#ctor(System.Compiler.TypeSystem,System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="t"></param>
+            <param name="pta"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.ComputePointsToAndWriteEffectsFor(System.Compiler.Method)">
+            <summary>
+            Compute the Dataflow analysis for the given method
+            Returns true if the method is pure
+            </summary>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.VerifyPurity">
+            <summary>
+            Verify Purity in the Final State
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.VisitStatement(System.Compiler.CfgBlock,System.Compiler.Statement,System.Compiler.IDataFlowState)">
+            <summary>
+            Visit the statement. It call the instruction visitor to perform the transfer function
+            </summary>
+            <param name="block"></param>
+            <param name="statement"></param>
+            <param name="dfstate"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.Merge(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState,System.Compiler.IDataFlowState,System.Boolean@,System.Boolean@)">
+            <summary>
+            Merge two PtWe
+            </summary>
+            <param name="previous"></param>
+            <param name="joinPoint"></param>
+            <param name="atMerge"></param>
+            <param name="incoming"></param>
+            <param name="resultDiffersFromPreviousMerge"></param>
+            <param name="mergeIsPrecise"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.SplitExceptions(System.Compiler.CfgBlock,System.Compiler.IDataFlowState@,System.Compiler.IDataFlowState@)">
+            <summary>
+            Exception management
+            Need Checking!
+            </summary>
+            <param name="handler"></param>
+            <param name="currentHandlerState"></param>
+            <param name="nextHandlerState"></param>
+        </member>
+        <member name="P:System.Compiler.WPurity.PointsToAndWriteEffectsInferer.PointsToWE">
+            <summary>
+            Return the results of the analysis en the exit of the CFG
+            </summary>
+        </member>
+        <member name="T:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor">
+            <summary>
+            Instruction visitor. Implement the transfer function of the dataflow analysis
+            </summary>
+        </member>
+        <member name="T:System.Compiler.InstructionVisitor">
+            <summary>
+            Decoder for CCI statements after normalization and code flattening. Provides a view of
+            instructions close to CIL (.NET CLR Partition 3 document).
+            The Visit method recognizes the CCI encodings for each instruction and calls
+            the appropriate Visit* method.  Subclassing <c>InstructionVisitor</c> allows writing
+            visitors that deal directly with only a small set of distinct instructions and without
+            recursive expressions, since arguments to all instructions are variables.
+            <p/>
+            To make decoding simple, some MSIL instructions are split, such as ldtoken, which was
+            split into three cases: LDTYPETOKEN, LDFIELDTOKEN, LDMETHODTOKEN.
+            <p/>
+            On the other hand, some instructions are distinguished by <c>null</c> tests; the MSIL instructions
+            "ldfld" (load object field) and "ldsfld" (load static field) are modeled by the same visitor
+            LDFIELD "dest := source.field" with source being <c>null</c> for a static field. Similarly, an unconditional
+            branch instruction is modelled as an BRANCH with a <c>null</c> condition.
+            <p/>
+            The envisioned use of this class is as follows:  subclass <c>InstructionVisitor</c> and override
+            each Visit* method
+            (VisitCopy, VisitLoadConstant etc.) to specify the processing that you want for each instruction.
+            Given a Cci statement (normalized and flattened) stat, do the appropriate processing for it by calling 
+            Visit(stat, some_arg).
+            <p/>
+            Visit acts as a dispatcher: it recognizes the instruction encoded by stat and calls the
+            appropriate Visit* method with the right arguments.  Visit stands for a top-level transfer function:
+            its second argument is the argument passed to the appropriate transfer function; its result is the
+            result of that transfer function.
+            <p/>
+            NOTE: With generics, we would have defined InstructionVisitor as Visitor&lt;A,B&gt;, where A and B
+            are the argument type, respectively the result type of each transfer function.  If your transfer
+            functions don't take any argument, you can pass <c>null</c>.
+            Similarly, if they don't return anything, you can return <c>null</c>.
+            <p/>
+            See the documentation of each of the Visit* methods for more info on the format of each instruction.
+            Also see the <c>SampleInstructionVisitor</c> for a full example.
+            <p>
+            The following conventions apply for each Visit* method:</p>
+            
+            <ol>
+            <li>The last two arguments are the original Cci statement and the argument passed to
+            Visit(Statement stat, object arg) 
+            </li>
+            Having the original statements allows you to attach information to it (in some hashtable) or, in rare
+            cases, to look for features that are not exposed.
+            <li>Each method returns an object. This is conceptually the result of the transfer function associated with
+            that instruction.</li>
+            <li>Each such method is called by the dispatcher Visit(Statement stat, object arg) with all arguments
+            non-null, unless specified otherwise in the documentation for Visit*.</li>
+            </ol>
+            
+            <p>
+            By default, each Visit* method calls the abstract method <c>DefaultVisit</c>.</p>
+            
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.Visit(System.Compiler.Statement,System.Object)">
+            <summary>
+            Decodes the statement and dispatches to one of the Visit methods below.
+            </summary>
+            <param name="stat">Visited statement.</param>
+            <param name="arg">Argument for the transfer function.</param>
+            <returns>Result of the appropriate transfer function.</returns>
+            
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitNop(System.Compiler.Statement,System.Object)">
+            <summary>
+            nop -- no operation
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitMethodEntry(System.Compiler.Method,System.Collections.IEnumerable,System.Compiler.Statement,System.Object)">
+            <summary>
+            method entry -- a pseudo instruction that marks the beginning of a method.
+            </summary>
+            <param name="method">Method that starts with this instruction.</param>
+            <param name="parameters">All parameters of this method, including <c>this</c> (order is important).</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitUnwind(System.Compiler.Statement,System.Object)">
+            <summary>
+            unwind -- a pseudo instruction that marks the exceptional exit of a method. 
+            <p>
+            Description:
+            <br/>
+            This is the point where the currently thrown exception leaves the method.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitBranch(System.Compiler.Variable,System.Compiler.Block,System.Compiler.Statement,System.Object)">
+            <summary>
+            branch cond,target -- branch on condition.
+            <p>
+            Description:
+            <br/>
+            Branch to target block if condition is true.
+            </p>
+            </summary>
+            <param name="cond">Condition of the branch statement; <c>null</c> for an unconditional jump.</param>
+            <param name="target">Target of the branching instruction.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitSwitch(System.Compiler.Variable,System.Compiler.BlockList,System.Compiler.Statement,System.Object)">
+            <summary>
+            switch selector,targets -- branch to target block indexed by selector
+            <p>
+            Description:
+            <br/>
+            if <c>selector</c> is between <c>0</c> and <c>targets.Length-1</c>c>
+            then branch to targets[selector]. Otherwise, fall though.
+            </p>
+            </summary>
+            <param name="selector">Selector variable.</param>
+            <param name="targets">List of targets.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitSwitchCaseBottom(System.Compiler.Statement,System.Object)">
+            <summary>
+            switchcasebottom -- a pseudo instruction equal to nop. Marks the end of a switch case when introduced by
+            the language parser. Allows checking for fall through from one case to another.
+            </summary>
+            <param name="stat">The source context should point at the case.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitReturn(System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            return -- return from the method
+            <p>
+            Description:
+            <br/>
+            Return the value in var from the method.
+            </p>
+            </summary>
+            <param name="var">Variable that holds the returned value. <c>null</c> if the method return type
+            is <c>void</c>.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitThrow(System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            throw -- throw the exception
+            </summary>
+            <param name="var">Variable that holds the thrown value (never <c>null</c>).</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitRethrow(System.Compiler.Statement,System.Object)">
+            <summary>
+            rethrow -- rethrow the currently handled exception
+            <p>
+            Description:
+            <br/>
+            Only appears within handlers. Its semantics is to rethrow the exception that the handler
+            is currently processing.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitCatch(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            var = catch(type) -- catch exception matching type and store in var
+            <p>
+            Description:
+            <br/>
+            Starts an exception handler and acts as the test whether the handler applies to the caught 
+            exception given the type. If the exception does not apply, then control goes to the handler
+            of the current block. Otherwise, control goes to the next instruction.
+            </p>
+            
+            </summary>
+            <param name="var">Variable that holds the caught exception.</param>
+            <param name="type">Type of the exceptions that are caught here.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitFilter(System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := filter -- pseudo instruction marking the beginning of a filter handler.
+            <p>
+            Description:
+            <br/>
+            Semantics: assigns the exception being filtered to the <c>dest</c> variable.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitEndFilter(System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            endfilter code -- marks the end of the filter section of a filter handler. 
+            <p>
+            Description:
+            <br/>
+            tests the code at the end of the filter section of a filter handler. If code is 0, handler
+            does not apply, and the next handler should be tried. If 1, hander applies and the next instruction
+            is executed.
+            
+            In our encoding, if the instruction falls through, it must push the implicit exception being 
+            handled onto the stack, since the next instruction is a catch of the actual handler.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadNull(System.Compiler.Variable,System.Compiler.Literal,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := null -- ldnull instruction, assigns null to destination.
+            </summary>
+            <param name="source">The <c>null</c> literal. Passed here for source context.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadConstant(System.Compiler.Variable,System.Compiler.Literal,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := ldc c -- store the constant c in dest
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitArgumentList(System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := arglist -- (corresponds to the MSIL instruction OxFE00 arglist).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitSizeOf(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := sizeof(T) -- store the runtime size of type T in dest
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitConstrainedCall(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Method,System.Compiler.ExpressionList,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := Constraint(T).receiver.callee(arguments) -- invoke virtual method with Constrain prefix.
+            </summary>
+            <param name="dest">Variable that stores the result of the call. <c>null</c> if the called method
+            return type is <c>void</c> or ignored.</param>
+            <param name="receiver">Receiver of the virtual call. Note that the behavior of this instruction depends on the
+            type of the receiver in the generic instance:
+            The receiver must have a reference type ref P. If the instance of P is a struct type, then the code becomes
+              st0 = box(receiver, T);
+              st0.callee(arguments);
+              
+            If the instance of P is a reference type (class or interface), then we simply load the indirect pointer contents:
+              st0 = *receiver;
+              st0.callee(arguments);
+            <br/>
+            </param>
+            <param name="callee">Compile-time called method; the method that is actually invoked might be different
+            in the case of a dynamically dispatched call.</param>
+            <param name="arguments">Call arguments; does not include the value for the "this" argument; that value is
+            the given by the receiver (if any). All elements of this list are Variables.</param>
+            <param name="constraint">The type constraint of the receiver</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitCopy(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := source -- variable to variable assignment
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitNewObject(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := new T -- allocate a new object of type T. DOES NOT INCLUDE .CTOR CALL, see below.
+            
+            Called for a new expression. Note that MSIL newobj instructions are broken into 3 steps:
+            1. A separate allocation (this method)
+            2. A separate constructor call (normal call)
+            3. A separate assignment of the newly allocated object to the intended target variable.
+            
+            </summary>
+            <param name="dest">Temporary to hold raw allocation result</param>
+            <param name="type">Object type to be allocated</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitNewArray(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := new T[size] -- allocate a new array of the given size and type
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitCall(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Method,System.Compiler.ExpressionList,System.Boolean,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := receiver.callee(arguments) -- invoke method 
+            </summary>
+            <param name="dest">Variable that stores the result of the call. <c>null</c> if the called method
+            return type is <c>void</c>.</param>
+            <param name="receiver">Receiver for virtual calls. <c>null</c> in the case of a static call
+            (warning: static call and call to a static method different things: you can call a virtual method
+            without using dynamic dyspatch).
+            <br/>
+            If the <c>callee</c> is a member of a value type T, <c>receiver</c> is of type T&amp; (reference to T).
+            </param>
+            <param name="callee">Compile-time called method; the method that is actually invoked might be different
+            in the case of a dynamically dispatched call.</param>
+            <param name="arguments">Call arguments; does not include the value for the "this" argument; that value is
+            the given by the receiver (if any). All elements of this list are Variables.</param>
+            <param name="virtcall">Indicates whether this is a dynamically dispatched call or not.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitCallIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable[],System.Compiler.FunctionPointer,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := (*callee)([receiver], arguments) -- call indirect function pointer.
+            </summary>
+            <param name="dest">Variable that stores the result of the call. <c>null</c> if the called method
+            return type is <c>void</c>.</param>
+            <param name="callee">Function pointer value.</param>
+            <param name="receiver">Receiver for virtual calls. <c>null</c> in the case of a static call
+            (warning: static call and call to a static method are different things: you can call a virtual method
+            without using dynamic dispatch).</param>
+            <param name="arguments">Call arguments; does not include the value for the "this" argument; that value is
+            the given by the receiver (if any). All elements of this list are Variables.</param>
+            <param name="fp">Function pointer signature.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitBinaryOperator(System.Compiler.NodeType,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := operand1 op operand2 -- assign result of binary operation to dest
+            </summary>
+            <param name="op">Binary operator (e.g. NodeType.Add).</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitUnaryOperator(System.Compiler.NodeType,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := op operand -- assign result of unary operation to dest.
+            </summary>
+            <param name="op">Unary operator.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitCastClass(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := (T)source -- cast object source to type T and assign result to dest.
+            <p>
+            Description:
+            <br/>
+            if type of source is a subtype of <c>type</c>, then assign source to dest;
+            otherwise throw a <c>System.InvalidCastException</c>.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitIsInstance(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := source as T -- istest instruction.
+            <p>
+            Description:
+            <br/>
+            If type of source is a subtype of T, assign source to dest; otherwise assign <c>null</c> to dest.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitBox(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := box(T) source -- box source object of type T.
+            <p>
+            Description:
+            <br/>
+            If boxable (T is a value type or type parameter), boxes the source value int a fresh object and assigns
+            result to dest. If T is an object type, it acts as a no-op.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitUnbox(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := unbox(T) source -- convert boxed value type to its raw (value) form
+            <p>
+            Description:
+            <br/>
+            The instruction first checks that source is not null, otherwise throws NullReferenceException. Then it checks
+            that the boxed value actually contains a value of type T, otherwise InvalidCastException is thrown.
+            Finally, it copies a pointer of type T&amp; (reference to value type) into dest that points at the box 
+            contents.
+            </p>
+            </summary>
+            <param name="type">Value type of the contents expected in the boxed value.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitUnboxAny(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := unbox.any(T) source -- convert object to type T.
+            <p>
+            Description:
+            <br/>
+            <ul>
+            <li>
+            If <c>T</c> is a value type, extracts the value from the boxed object <c>source</c> and assigns it to <c>dest</c>. 
+            In this case, the instruction acts like <c>unbox</c> followed by <c>ldobj</c>.
+            </li>
+            <li>
+            If <c>T</c> is an object type, the instruction acts like castclass.
+            </li>
+            <li>
+            If <c>T</c> is a type parameter, the instruction behaves dependent on the actual runtime type bound to T. 
+            </li>
+            </ul>
+            </p>
+            </summary>
+            <param name="source">Object to unbox</param>
+            <param name="type">Target type of the unbox.any.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadField(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := source.field -- load field and assign to destination.
+            <p>
+            Description
+            <br/>
+            This instruction covers the cases of instance AND static field read instructions. If source is null, the field
+            is static, otherwise it is an instance field.
+            
+            In the case where the field is a member of a value type T, then source is of type T&amp; (reference to T).
+            </p>
+            </summary>
+            <param name="source">Variable that points to the object whose field we read.
+            <c>null</c> if <c>field</c> is static.</param>
+            <param name="field">Loaded field (can be a static one).</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitStoreField(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest.field := source -- store source into field.
+            <p>
+            Description:
+            <br/>
+            This instruction covers the cases of instance AND static field store instructions. If dest is null, the field
+            is static, otherwise it is an instance field.
+            
+            In the case where the field is a member of a value type T, then dest is of type T&amp; (reference to T).
+            </p>
+            </summary>
+            <param name="dest">Variable that points to the object whose field we write. <c>null</c> if
+            <c>field</c> is static.</param>
+            <param name="field">Written field.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := source[index] -- load element from array
+            </summary>
+            <param name="source">Variable that points to the array whose element we read.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitStoreElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest[index] := source -- store array element
+            </summary>
+            <param name="dest">Variable that points to the array whose element we write.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := &amp; source -- load address of local variable and store into dest.
+            </summary>
+            <param name="source">Variable whose address is taken.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadFieldAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := &amp; source.field -- load address of field and store into dest.
+            <p>
+            Description:
+            <br/>
+            The instruction covers both instance and static fields. For static fields, source is null.
+            
+            For fields of reference type T, source is of type T&amp; (reference to T).
+            </p>
+            </summary>
+            <param name="source">Variable pointing to the object that contains <c>field</c>; may be
+            <c>null</c> is <c>field</c> is static.</param>
+            <param name="field">Field whose address we load (may be static).</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadElementAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := &amp; array[index] -- load address of array element and store into dest.
+            <p>
+            Description:
+            <br/>
+            Takes the address of the array element indexed and stores it into dest.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := *((type *) pointer) -- load value stored at pointer and assign to dest
+            <p>
+            MSIL instructions: ldind.T, ldobj
+            <br/>
+            </p>
+            </summary>
+            <param name="type">Type of the loaded value.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitStoreIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            *((type *) pointer) := source -- store value at pointer
+            <p>
+            MSIL instructions: stind.T, stobj
+            </p>
+            </summary>
+            <param name="type">Type of the stored value.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadFunction(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Method,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := &amp;source.method -- load method pointer and store into dest.
+            <p>
+            Description:
+            <br/>
+            loads the address where a method code starts. This instruction covers both
+            ldftn and ldvirtftn: for ldvirtftn, the dynamic dispatch algorithm is used to find
+            the appropriate method.
+            
+            For static functions, source is null.
+            </p>
+            </summary>
+            <param name="source">Address of the object whose dynamically-dispatched method we are
+            interested in.</param>
+            <param name="method">If <c>source</c> is <c>null</c>, then the address of this method is loaded,
+            otherwise, we load the address of the method that is invoked by a call to source.method.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitLoadToken(System.Compiler.Variable,System.Object,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := ldtoken token -- load meta data token (type, method, or field) and store into dest.
+            </summary>
+            <param name="token">TypeNode / Field / Method whose metadata token is assigned to <c>dest</c>.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitCopyBlock(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            memcpy(destaddr, srcaddr, size) -- cpblk instruction, copies data from memory to memory
+            </summary>
+            <param name="destaddr">Variable that stores the start address of the destination memory area.</param>
+            <param name="srcaddrs">Variable that stores the start address of the source memory area.</param>
+            <param name="size">Variable that stores the number of bytes to copy.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitInitializeBlock(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            initblk addr, value, size -- initblk instruction, initializes memory to a value
+            </summary>
+            <param name="addr">Variable that stores the start address of the memory area to be initialized.</param>
+            <param name="val">Variable that stores the "unsigned int8" value that will be stored in each
+            memory byte.</param>
+            <param name="size">Variable that stores the number of bytes to initialize.</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitInitObj(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            *dest := initobj T -- initobj instruction, assigns a default value to dest.
+            <p>
+            Description:
+            <br/>
+            dest is managed or unmanaged pointer to T. If T is a value type, this instruction initializes each field of T
+            to its default value or zero for primitive types.
+            If T is an object type, this instruction has the same effect as <c>ldnull</c> followed by <c>stind</c>.
+            </p>
+            </summary>
+            <param name="addr">The pointer to the value type to be initialized. Is either Struct or EnumNode</param>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitBreak(System.Compiler.Statement,System.Object)">
+            <summary>
+            break -- debugger break instruction, causes the execution to transfer control to a debugger.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitMakeRefAny(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := mkrefany source,type -- assign typed reference to dest 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitRefAnyValue(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := refanyval source,type -- load the address out of a typed reference
+            <p>
+            Description:
+            <br/>
+            Throws <c>InvalidCastException</c> if typed reference isn't of type <c>type</c>. If it is
+            extracts the object reference and stores it in dest.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.VisitRefAnyType(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := refanytype source --- extracts the type from a typed reference and assigns it to dest.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.DefaultVisit(System.Compiler.Statement,System.Object)">
+            <summary>
+            Default visitor called by each non-overridden visitor above.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InstructionVisitor.GetReceiverAndCallee(System.Compiler.MethodCall,System.Compiler.Variable@,System.Compiler.Method@,System.Compiler.FunctionPointer@)">
+            <summary>
+            Unscrambles a method target. 
+            </summary>
+            <param name="call">The method call node to unscramble</param>
+            <param name="receiver">Returns the receiver expression. Maybe null.</param>
+            <param name="callee">Returns the method, if target is a method, otherwise null.</param>
+            <param name="fpointer">Returns the function pointer if target is a function pointer, otherwise null.</param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.#ctor(System.Compiler.WPurity.PointsToAndWriteEffectsInferer)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="pta"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitCallIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable[],System.Compiler.FunctionPointer,System.Compiler.Statement,System.Object)">
+            <summary>
+            We treat this kind of call as non analyzable
+            Not support for Function Pointers Yet
+            </summary>
+            <param name="dest"></param>
+            <param name="callee"></param>
+            <param name="receiver"></param>
+            <param name="arguments"></param>
+            <param name="fp"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitCall(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Method,System.Compiler.ExpressionList,System.Boolean,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visit a call statement. 
+            It also wraps  set_item (a[i]=...) and get_item (dest = a[i])
+            </summary>
+            <param name="dest"></param>
+            <param name="receiver"></param>
+            <param name="callee"></param>
+            <param name="arguments"></param>
+            <param name="virtcall"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitConstrainedCall(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Method,System.Compiler.ExpressionList,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            The treat VisitConstrainedCall as a Std call
+            Can be improved...
+            </summary>
+            <param name="dest"></param>
+            <param name="receiver"></param>
+            <param name="callee"></param>
+            <param name="arguments"></param>
+            <param name="constraint"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.TryAnalyzeCallee(System.Compiler.WPurity.PointsToAndWriteEffects,System.Compiler.Variable,System.Compiler.Method,System.Compiler.Method,System.Boolean,System.Compiler.Label,System.Compiler.WPurity.PointsToAndWriteEffects@)">
+            <summary>
+            Determine if the callee method is analyzable
+            or pure and gets or compute the callee dataflow information 
+            </summary>
+            <param name="callerPTWe"></param>
+            <param name="receiver"></param>
+            <param name="callee"></param>
+            <param name="caller"></param>
+            <param name="isVirtualCall"></param>
+            <param name="lb"></param>
+            <param name="calleePtWe"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitCopy(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for copy statements dest = source
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadField(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for load field, it computes different values for static and instance fields
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="field"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitStoreField(System.Compiler.Variable,System.Compiler.Field,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for store field, it computes different values for static and instance fields
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="field"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for dest = source[index]. 
+            In this case very similar to load field
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="index"></param>
+            <param name="elementType"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitStoreElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for dest[index] = source.
+            In this case, very similar to store field.
+            </summary>
+            <param name="dest"></param>
+            <param name="index"></param>
+            <param name="source"></param>
+            <param name="elementType"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitNewObject(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for dest = new type
+            </summary>
+            <param name="dest"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitNewArray(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for dest = new type[]
+            </summary>
+            <param name="dest"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitInitObj(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Visitor for init *addr
+            </summary>
+            <param name="dest"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadConstant(System.Compiler.Variable,System.Compiler.Literal,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = conts. dest doesn't point to an object.
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitBinaryOperator(System.Compiler.NodeType,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = op1 op op2.  dest doesn't point to an object.
+            </summary>
+            <param name="op"></param>
+            <param name="dest"></param>
+            <param name="operand1"></param>
+            <param name="operand2"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitMethodEntry(System.Compiler.Method,System.Collections.IEnumerable,System.Compiler.Statement,System.Object)">
+            <summary>
+            We record the method entry
+            </summary>
+            <param name="method"></param>
+            <param name="parameters"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitUnwind(System.Compiler.Statement,System.Object)">
+            <summary>
+            Unwind. No action performed. IT IS OK??
+            </summary>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitUnaryOperator(System.Compiler.NodeType,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = op op1.  dest doesn't point to an object.
+            </summary>
+            <param name="op"></param>
+            <param name="dest"></param>
+            <param name="operand1"></param>
+            <param name="operand2"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitSizeOf(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = sizeof type.  dest doesn't point to an object.
+            </summary>
+            <param name="op"></param>
+            <param name="dest"></param>
+            <param name="operand1"></param>
+            <param name="operand2"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitIsInstance(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := source as T. We assume it as a copy
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitCastClass(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = (type) source. Assumed as a copy
+            Have to deal with Exception???
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitBox(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Box We assume it as a copy
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitUnbox(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Box We assume it as a copy
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitRefAnyType(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := refanytype source --- extracts the type from a typed reference and assigns it to dest.
+            A type is not a reference, so we forget dest
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitMakeRefAny(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest := refanyval source,type -- load the address out of a typed reference
+            Assumed as Copy.
+            HAVE TO DEAL with exceptions
+            <p>
+            Description:
+            <br/>
+            Throws <c>InvalidCastException</c> if typed reference isn't of type <c>type</c>. If it is
+            extracts the object reference and stores it in dest.
+            </p>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadFunction(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Method,System.Compiler.Statement,System.Object)">
+            <summary>
+            We assumed the function as something we don't track
+            We forget the value of dest
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="method"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitCatch(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            var = catch(type) -- catch exception matching type and store in var
+            <p>
+            Description:
+            <br/>
+            Starts an exception handler and acts as the test whether the handler applies to the caught 
+            exception given the type. If the exception does not apply, then control goes to the handler
+            of the current block. Otherwise, control goes to the next instruction.
+            </p>
+            We forget the value of var
+            SHOULD DO SOMETHING WITH THIS!
+            </summary>
+            <param name="var">Variable that holds the caught exception.</param>
+            <param name="type">Type of the exceptions that are caught here.</param>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitThrow(System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            CHECK
+            </summary>
+            <param name="var"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitRethrow(System.Compiler.Statement,System.Object)">
+            <summary>
+            CHECK
+            </summary>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            I take it as dest = * pointer
+            </summary>
+            <param name="dest"></param>
+            <param name="pointer"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitStoreIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            If take it as *pointer = source
+            </summary>
+            <param name="pointer"></param>
+            <param name="source"></param>
+            <param name="type"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = &amp; source. 
+            In most cases the analysis consider this a std copy
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadFieldAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = &amp;(source.field). Assumed as std LoadField
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="field"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.PointsToAndWriteEffectsInstructionVisitor.VisitLoadElementAddress(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            dest = &amp;array[index]). Assumed as std LoadElement
+            </summary>
+            <param name="dest"></param>
+            <param name="array"></param>
+            <param name="index"></param>
+            <param name="elementType"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis">
+            <summary>
+            The main analysis class. Entry point to analyze a method, an assembly or 
+            a compilation unit.
+            At construction time, you can define if the analysis is interprocedural or only
+            intraprocedural. If you choose interprocedural, you can decide for a fixpoint 
+            based approach, using a backward traversal over a partial call graph, or an inlining
+            simulation (when you can decide the maximum call stack depth).
+            The analysis has 2 modes of operation. StandAlone or assuming that is using inside CCI or Boogie.
+            The main difference is that in the standalone it tries to analyze all methods it finds in the assembly
+            and in the other case it only analyzes methods annotated as [pure] or [confined]. 
+            The purpose of the StandAlone mode is the INFERENCE, and of the other mode is VERIFICATION.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.#ctor(System.Compiler.TypeSystem,System.Compiler.Node)">
+            <summary>
+            Constructor with a given Node. 
+            We used to compute the set of nodes in this node and (optionally) bound the set of 
+            analyzable methods in the interprocedural analysis.
+            </summary>
+            <param name="t"></param>
+            <param name="node"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.#ctor(System.Compiler.Analyzer,System.Compiler.TypeSystem,System.Compiler.Node)">
+            <summary>
+            Same constructor but with the analyzer
+            </summary>
+            <param name="analyzer"></param>
+            <param name="t"></param>
+            <param name="node"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.VisitTypeNode(System.Compiler.TypeNode)">
+            <summary>
+            We can filter a Node if we don't want to analyze it. 
+            For the stand alone application...
+            </summary>
+            <param name="typeNode"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.VisitClass(System.Compiler.Class)">
+            <summary>
+            Idem previous
+            </summary>
+            <param name="c"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.AnalysisForMethod(System.Compiler.Method)">
+            <summary>
+            Entry point to analyze a given method. 
+            Depending of the type of analysis a call to this method
+            can lead to a fixpoint computation, the use of a precomputed
+            intraprocedural analysis or performing the intraprocedural 
+            analysis for the first time
+            </summary>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.FixPoint">
+            <summary>
+            Perform a fixpoint computation over a set of methods (in general a strongly connected component).
+            It perform the interprocedural analysis for each method, reanalysing any callers that require updating. 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.AnalysisResultsChanges(System.Compiler.Method,System.Compiler.WPurity.PointsToAndWriteEffects)">
+            <summary>
+            Check whether dataflow analysis changes or not
+            </summary>
+            <param name="m"></param>
+            <param name="newResult"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.AnalyzeMethod(System.Compiler.Method)">
+            <summary>
+            Analyze a given method.
+            That is, perform the intraprocedural dataflow analysis.
+            </summary>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.ComputeOnlyPurity(System.Compiler.Method)">
+            <summary>
+            Check if we already computed the purity of the method under analysis.
+            If not, the method purity is computed and saved.
+            </summary>
+            <param name="m"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.WasAnalyzed(System.Compiler.Method)">
+            <summary>
+            Determines if the method was analyzed 
+            </summary>
+            <param name="m"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.IsAssumedPureMethod(System.Compiler.Method)">
+            <summary>
+            Determine if a method has to be assumed as Pure.
+            That is because it is annotated as pure or confined
+            Or belong to a set of well know methods (that should be annotated in the future)
+            </summary>
+            <param name="m"></param>
+            <returns></returns>
+            
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.IsAnalyzable(System.Compiler.Method)">
+            <summary>
+            Determines whether  the method if analyzable or not
+            for interProc call. That is, if we can get the method body 
+            (not abstract, not interface, under our desired analysis scope).
+            </summary>
+            <param name="m"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.solveMethodTemplate(System.Compiler.Method)">
+            <summary>
+            Get the method's template if it has it
+            </summary>
+            <param name="callee"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.ProcessResultsMethod(System.Compiler.Method)">
+            <summary>
+            Show Detailed information about the results for the method
+            
+            </summary>
+            <param name="m"></param>
+        </member>
+        <member name="M:System.Compiler.WPurity.WeakPurityAndWriteEffectsAnalysis.printStatements(System.Compiler.Method)">
+            <summary>
+            Used for test purposes
+            </summary>
+            <param name="m"></param>
+        </member>
+        <member name="F:System.Compiler.LanguageService.currentSymbolTable">
+            <summary>Tracks the symbol table (Module) associated with the current editor window</summary>
+        </member>
+        <member name="F:System.Compiler.LanguageService.EnableDropDownCombos">
+            <summary>Set this to True if you want drop downs showing types and members</summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringScope.GetDeclarations(System.Int32,System.Int32,System.Compiler.ParseReason)">
+            <summary>
+            Called for completions.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringScope.GetGenericMethods(System.Int32,System.Int32,System.Compiler.Expression)">
+            <summary>
+            Called for parameter help.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringScope.GetMethods(System.Int32,System.Int32,System.Compiler.Expression)">
+            <summary>
+            Called for parameter help.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringScope.GetTypes(System.Int32,System.Int32,System.Compiler.Expression)">
+            <summary>
+            Called for parameter help.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.MatchPair(System.Compiler.SourceContext,System.Compiler.SourceContext)">
+            <summary>
+            Whenever a matching pair is parsed, e.g. '{' and '}', this method is called
+            with the text span of both the left and right item. The
+            information is used when a user types "ctrl-]" in VS
+            to find a matching brace and when auto-highlight matching
+            braces is enabled.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.MatchTriple(System.Compiler.SourceContext,System.Compiler.SourceContext,System.Compiler.SourceContext)">
+            <summary>
+            Matching triples are used to highlight in bold a completed statement.  For example
+            when you type the closing brace on a foreach statement VS highlights in bold the statement
+            that was closed.  The first two source contexts are the beginning and ending of the statement that
+            opens the block (for example, the span of the "foreach(...){" and the third source context
+            is the closing brace for the block (e.g., the "}").
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.StartName(System.Compiler.Expression)">
+            <summary>
+            In support of Member Selection, CompleteWord, QuickInfo, 
+            MethodTip, and Autos, the StartName and QualifyName methods
+            are called.
+            StartName is called for each identifier that is parsed (e.g. "Console")
+            Its type is Expression since it can be this/base etc
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.QualifyName(System.Compiler.SourceContext,System.Compiler.Expression)">
+            <summary>
+            QualifyName is called for each qualification with both
+            the text span of the selector (e.g. ".")  and the text span 
+            of the name ("WriteLine").
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.AutoExpression(System.Compiler.SourceContext)">
+            <summary>
+            AutoExpression is in support of IVsLanguageDebugInfo.GetProximityExpressions.
+            It is called for each expression that might be interesting for
+            a user in the "Auto Debugging" window. All names that are
+            set using StartName and QualifyName are already automatically
+            added to the "Auto" window! This means that AutoExpression
+            is rarely used.
+            </summary>   
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.CodeSpan(System.Compiler.SourceContext)">
+            <summary>
+            CodeSpan is in support of IVsLanguageDebugInfo.ValidateBreakpointLocation.
+            It is called for each region that contains "executable" code.
+            This is used to validate breakpoints. Comments are
+            automatically taken care of based on TokenInfo returned from scanner. 
+            Normally this method is called when a procedure is started/ended.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.StartParameters(System.Compiler.SourceContext)">
+            <summary>
+            The StartParameters, Parameter and EndParameter methods are
+            called in support of method tip Intellisense (ECMD_PARAMINFO).
+            [StartParameters] is called when the parameters of a method
+            are started, i.e. "(".
+            [NextParameter] is called on the start of a new parameter, i.e. ",".
+            [EndParameter] is called on the end of the parameters, i.e. ")".
+            REVIEW: perhaps this entire scheme should go away
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.NextParameter(System.Compiler.SourceContext)">
+            <summary>
+            NextParameter is called after StartParameters on the start of each new parameter, i.e. ",".
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.EndParameters(System.Compiler.SourceContext)">
+            <summary>
+            EndParameter is called on the end of the parameters, i.e. ")".
+            </summary>
+        </member>
+        <member name="M:System.Compiler.AuthoringSink.AddError(System.Compiler.ErrorNode)">
+            <summary>
+            Send a message to the development environment. The kind of message
+            is specified through the given severity. 
+            </summary>
+        </member>
+        <member name="T:System.Compiler.TypeAndMemberDropdownBars">
+            <summary>
+            Represents the two drop down bars on the top of a text editor window that allow types and type members to be selected by name.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.TypeAndMemberDropdownBars.languageService">
+            <summary>The language service object that created this object and calls its SynchronizeDropdowns method</summary>
+        </member>
+        <member name="F:System.Compiler.TypeAndMemberDropdownBars.sortedDropDownTypes">
+            <summary>The list of types that appear in the type drop down list. Sorted by full type name.</summary>
+        </member>
+        <member name="F:System.Compiler.TypeAndMemberDropdownBars.dropDownTypes">
+            <summary>The list of types that appear in the type drop down list. Textual order.</summary>
+        </member>
+        <member name="F:System.Compiler.TypeAndMemberDropdownBars.dropDownMembers">
+            <summary>The list of members that appear in the member drop down list. Sorted by name.</summary>
+        </member>
+        <member name="F:System.Compiler.TypeAndMemberDropdownBars.sortedDropDownMembers">
+            <summary>The list of members that appear in the member drop down list. Textual order.</summary>
+        </member>
+        <member name="M:System.Compiler.TypeAndMemberDropdownBars.SynchronizeDropdowns(System.String,System.Int32,System.Int32)">
+            <summary>
+            Updates the state of the drop down bars to match the current contents of the text editor window. Call this initially and every time
+            the cursor position changes.
+            </summary>
+            <param name="textView">The editor window</param>
+            <param name="line">The line on which the cursor is now positioned</param>
+            <param name="col">The column on which the cursor is now position</param>
+        </member>
+        <member name="T:System.Compiler.PTAnalysisNode">
+            <summary>
+            PtAnalysisNode: Is the base class for all nodes in the pointsToGraph
+            It has a Label representing its position in code and the Type of the heap
+            location it represents
+            </summary>
+        </member>
+        <member name="T:System.Compiler.GNode">
+            <summary>
+            GNode: Represents Global (static) nodes
+            It has neither Label nor Type
+            </summary>
+        </member>
+        <member name="T:System.Compiler.InsideNode">
+            INode: Represents objects created by the method under analysis 
+        </member>
+        <member name="T:System.Compiler.RNode">
+            <summary>
+             An Inside Node representing the returned expression 
+            </summary>
+        </member>
+        <member name="T:System.Compiler.StructNode">
+            <summary>
+             An Inside Node representing a struct  
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PNode">
+            <summary>
+            PNode: Represents objects pointed by a parameter
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PRefNode">
+            <summary>
+            PRefNode: Represents a parameter passed by Reference
+            </summary>
+        </member>
+        <member name="T:System.Compiler.POutNode">
+            <summary>
+            POutNode: Represents an out  parameter
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PByValueNode">
+            <summary>
+            PByValueNode: Represents a parameter passed by Value
+            </summary>
+        </member>
+        <member name="T:System.Compiler.LNode">
+            <summary>
+            LNode: Represents a placeholder  for an unknown node(s) read by the instruction
+            Typically from instructions like a = b.f with b escaping
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Nodes">
+            <summary>
+            Set of nodes
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Edge">
+            <summary>
+            Edge: An edge in the pointsTo graph
+            </summary>
+        </member>
+        <member name="T:System.Compiler.IEdge">
+            <summary>
+            IEdge: An internal edge. Represents a reference created by the analyzed method (writes)
+            </summary>
+        </member>
+        <member name="T:System.Compiler.OEdge">
+            <summary>
+            OEdge: An outside edge. Represents a reference to a node outside the analyzed method (reads) 
+            </summary>
+        </member>
+        <member name="T:System.Compiler.StructEdge">
+            <summary>
+            StructEdge: An edge that connects an Struct Type with another element. 
+            It is used to know which elements has to be copied from a struct 
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Edges">
+            <summary>
+            Set of edges
+            </summary>
+        </member>
+        <member name="T:System.Compiler.LocVar">
+            <summary>
+            LocVar: A mapping between variables a nodes it may point
+            This mapping is used to record points to information
+            </summary>
+        </member>
+        <member name="T:System.Compiler.AField">
+            <summary>
+            AField: A field update. An element of a write effect
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PTGraph">
+            <summary>
+            A points-to Graph. Is the structure that represents the points-to information for a program point.
+            The model supports Reference types (object subclasses) and struct types. 
+            Every program variable has a related node that represents its address. 
+            An address node can point to one of several locations (the object/s in the heap). 
+            We say that the value/s of an Address are the heap locations that the variable (or address)
+            can point to.
+            That means, given a = Addr(v), *a represent the actual object abstraction in the heap.
+            For struct types Addr(v) directly contains the struct element
+            For fields the reasoning is the same. A heap location represent an object (or several) that
+            can have several attributes (fields). If the field type is a reference type, it will have
+            an address, and the address will point to the heap location representing the field dereference.
+            Example: <c>v.f = *((*Addr(v)).f)</c> for v and v.f being reference types. 
+            For struct type the reasoning is similar as the addr/value mentioned before. 
+            A pointsToGraph G = &lt; I &#44; O &#44; LV &#44; E &gt;
+            I = set of inside edges: references generated by the method under analysis
+            O = set of outside edges: read refences to elements not known if that program points to
+            LV = a mapping from variables to the heap locations it may point to (in particular 
+            it is a one to one mapping between variables and their addresses or associated structs)
+            
+            There are different kind of nodes. 
+            AddrNodes: An address of a variable or field
+            LAddrNode: An address node created to reflex a loaded (and unknown) address 
+            LNode: A node that represent a loaded (and unknown) object. There are subclasses
+            to represent if the unknown is a value (content of an address) like LValueNode 
+            (and PLNode for parameters values) or a field value (content of a field dereference 
+            address) like LFNode
+            PNode: A node that represent the address of a parameter. There subclasses to represent 
+            the parameter passing style (PByValue, PByRef, POut)
+            InsideNode: A newly created object 
+            StructNode: A node that represent a struct value type
+            
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.allFields">
+            <summary>
+            Special fields used for array indexing and pointer 
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.parameterNodes">
+            <summary>
+             The set of parameter nodes
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.m">
+            <summary>
+            The method under analysis
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.vRet">
+            <summary>
+            The return value of the method
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.GlobalScope">
+            <summary>
+            This variable represent a global variable 
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.thisParameterNode">
+            <summary>
+            Represent the location pointed by this 
+            </summary>
+        </member>
+        <member name="F:System.Compiler.PTGraph.parameterMap">
+            <summary>
+            A mapping to access the parameter nodes using parameters
+            </summary>
+        </member>
+        <member name="M:System.Compiler.PTGraph.Parameter(System.Compiler.PNode)">
+            <summary>
+            Get the parameter represented by a PNode
+            </summary>
+            <param name="pn"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.#ctor(System.Compiler.Method)">
+            <summary>
+            Construct an empty pointsToGraph for the method
+            </summary>
+            <param name="m"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.InitParams(System.Compiler.Method,System.Compiler.Label)">
+            <summary>
+            Create the parameter nodes for each method's parameter
+            It consider the type of parameter passing (value, out, or ref)
+            </summary>
+            <param name="m"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.#ctor(System.Compiler.PTGraph)">
+            <summary>
+            Copy Constructor
+            </summary>
+            <param name="ptg"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.AtMost(System.Compiler.PTGraph,System.Compiler.PTGraph)">
+            <summary>
+             Inclusion test
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.Join(System.Compiler.PTGraph)">
+            <summary>
+            Join to PointsTo Graphs
+            </summary>
+            <param name="ptG2"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.InitMethod(System.Compiler.Method,System.Collections.IEnumerable,System.Compiler.Label)">
+            <summary>
+            f(methodHeader)
+            </summary>
+            <param name="method"></param>
+            <param name="parameters"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.NodesBackwardReachableFrom(System.Compiler.PTAnalysisNode)">
+            <summary>
+            Compute the set of backward reachable nodes from n(forward or backward) using I and O edges
+            </summary>
+            <param name="n"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.NodesForwardReachableFrom(System.Compiler.PTAnalysisNode)">
+            <summary>
+            Compute the set of forward reachable nodes from n(forward or backward) using I and O edges
+            </summary>
+            <param name="n"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.NodesForwardReachableFromVariable(System.Compiler.Variable,System.Boolean)">
+            <summary>
+            Used to get only the nodes reachable using owned fields.
+            The problem is that it is not working because of the "allField" 
+            special field.
+            </summary>
+            <param name="v"></param>
+            <param name="onlyOwned"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.NodesForwardReachableFromOnlyOEgdes(System.Compiler.PTAnalysisNode)">
+            <summary>
+            Compute the set of forward reachable nodes from n(forward or backward) using O edges
+            </summary>
+            <param name="n"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.NodesReachableFrom(System.Compiler.PTAnalysisNode,System.Boolean,System.Boolean,System.Boolean)">
+            <summary>
+            Compute the set of reachable nodes using a set of starting nodes
+            </summary>
+            <param name="n"></param>
+            <param name="forward"></param>
+            <param name="useIEdges"></param>
+            <param name="useOEgdes"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.DFSPathFrom(System.Compiler.PTAnalysisNode,System.Boolean,System.Boolean,System.Boolean)">
+            <summary>
+            Compute the set of maximal paths from n
+            </summary>
+            <param name="n"></param>
+            <param name="forward"></param>
+            <param name="useIEdges"></param>
+            <param name="useOEgdes"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.DFSPathFrom(System.Compiler.PTAnalysisNode,System.Compiler.Field,System.Boolean,System.Boolean,System.Boolean,System.Compiler.Nodes,System.Collections.Generic.Set{System.Collections.Generic.List{System.Compiler.Edge}},System.Collections.Generic.List{System.Compiler.Edge})">
+            <summary>
+            The actual computation of the path
+            </summary>
+            <param name="n"></param>
+            <param name="f"></param>
+            <param name="forward"></param>
+            <param name="useIEdges"></param>
+            <param name="useOEgdes"></param>
+            <param name="visited"></param>
+            <param name="res"></param>
+            <param name="current"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.GetLoadNodes(System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Field,System.Compiler.Label)">
+            <summary>
+            </summary>
+            <param name="v1Type"></param>
+            <param name="v2"></param>
+            <param name="f"></param>
+            <param name="lb"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.CopyStruct(System.Compiler.PTAnalysisNode,System.Compiler.PTAnalysisNode)">
+            <summary>
+            Copy contents of Struct srcSn in Struct destSn
+            </summary>
+            <param name="destSn"></param>
+            <param name="srcSn"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.CopyStructForEdges(System.Compiler.PTAnalysisNode,System.Compiler.PTAnalysisNode,System.Compiler.Edges,System.Compiler.Nodes)">
+            <summary>
+            Copy the contents pointed by a set of edges
+            </summary>
+            <param name="destSn"></param>
+            <param name="srcSn"></param>
+            <param name="edges"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.ApplyAssignNull(System.Compiler.Variable)">
+            <summary>
+            f(v1 = null). v1 points to nothing (is deleted from LV)
+            </summary>
+            <param name="v1"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.CopyLocVar(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Label)">
+            <summary>
+            f(v1 = v2) or f(v1 = *v2) or f(v1= &amp;v2) 
+            or copy of struct type
+            It is an strong update
+            </summary>
+            <param name="v1"></param>
+            <param name="v2"></param>
+            <param name="lb"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.ForgetVariable(System.Compiler.Variable)">
+            <summary>
+            Make p1 points to nothing
+            </summary>
+            <param name="v1"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.RemoveValues(System.Compiler.Variable)">
+            <summary>
+            Remove the values assigned to a variable
+            </summary>
+            <param name="v1"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.RemoveValues(System.Compiler.PTAnalysisNode)">
+            <summary>
+            Remove the values assigned to an addr
+            </summary>
+            <param name="addr"></param>
+        </member>
+        <member name="M:System.Compiler.PTGraph.ApplyAnalyzableCall(System.Compiler.Variable,System.Compiler.Method,System.Compiler.Variable,System.Compiler.ExpressionList,System.Compiler.PTGraph,System.Compiler.Label,System.Compiler.InterProcMapping@)">
+            <summary>
+            Bind pointsTo graph of the caller with the pointsTo graph of the callee.
+            This is the most expensive operation.
+            Can be skipped assuming that all calls are nonanalyzable.
+            </summary>
+            <param name="vr"></param>
+            <param name="callee"></param>
+            <param name="receiver"></param>
+            <param name="arguments"></param>
+            <param name="calleePTGraph"></param>
+            <param name="lb"></param>
+            <param name="imp"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.PTGraph.BindNonAnalyzedCall(System.Compiler.Variable,System.Compiler.Method,System.Compiler.Variable,System.Compiler.ExpressionList,System.Compiler.Label,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Collections.Generic.Set{System.Compiler.Parameter},System.Collections.Generic.Set{System.Compiler.Parameter},System.Collections.Generic.Set{System.Compiler.Parameter})">
+            <summary>
+            Updates the caller points to graph to reflect the effect of a call
+            to the non-analyzable callee. It generates different values
+            for the return value and out parameters and also parameter 
+            and global aliasing as parameter escaping
+            To drive the effect it has parameters that inform 
+            about freshness of return value and out parameters, 
+            which parameters escape and whether and how the callee access 
+            to global variables and callee purity.
+            </summary>
+            <param name="vr"></param>
+            <param name="callee"></param>
+            <param name="receiver"></param>
+            <param name="arguments"></param>
+            <param name="lb"></param>
+            <param name="isPure"></param>
+            <param name="isReturnFresh"></param>
+            <param name="modifiesGlobal"></param>
+            <param name="readsGlobal"></param>
+            <param name="escapingParameters"></param>
+            <param name="freshParameters"></param>
+        </member>
+        <member name="T:System.Compiler.Pair`2">
+            <summary>
+            A Generic Pair
+            </summary>
+            <typeparam name="T1"></typeparam>
+            <typeparam name="T2"></typeparam>
+        </member>
+        <member name="T:System.Compiler.InterProcMapping">
+            <summary>
+            Computes the mapping that binds caller's nodes with the callee parameters
+            It helps computes the pointsToGraph after the call 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.Relate(System.Compiler.PTAnalysisNode,System.Compiler.PTAnalysisNode)">
+            <summary>
+            node2 \in mapping[node1]
+            </summary>
+            <param name="node1"></param>
+            <param name="node2"></param>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.Relate(System.Compiler.PTAnalysisNode,System.Compiler.Nodes)">
+            <summary>
+            sNodes \in mapping[node1]
+            </summary>
+            <param name="node1"></param>
+            <param name="node2"></param>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.RelateNodeWithCallerVar(System.Compiler.Variable,System.Compiler.Expression)">
+            <summary>
+            LV[args] \in mapping[n]
+            </summary>
+            <param name="n"></param>
+            <param name="arg"></param>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.Related(System.Compiler.PTAnalysisNode)">
+            <summary>
+            return mapping[n]
+            </summary>
+            <param name="n"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.RelatedExtended(System.Compiler.PTAnalysisNode)">
+            <summary>
+            return mapping[n] U ({n} - PNode)
+            </summary>
+            <param name="n"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.RelateParams">
+            <summary>
+            Step 1: bind parameters and arguments
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.MatchOutsideEgdes">
+            <summary>
+            Step 2
+            Match outsides edges from the callee (reads) with inside edges from the caller (writes).
+            Handle cases when callee read data is created by the caller.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.MatchOutsideWithInsideInCalle">
+            <summary>
+            Step 3: Match outside edges with insides edges in callee using resolved aliasing from calling context.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.ComputeInterMapping(System.Compiler.PTGraph,System.Compiler.PTGraph,System.Compiler.Variable,System.Compiler.ExpressionList,System.Compiler.Variable)">
+            <summary>
+            Compute the interProc mapping between callee and caller.
+            This is a fixpoint of steps 1,2 and 3.
+            </summary>
+            <param name="caller"></param>
+            <param name="callee"></param>
+            <param name="thisRef"></param>
+            <param name="arguments"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.ComputeInterProgGraph(System.Compiler.PTGraph,System.Compiler.PTGraph,System.Compiler.Variable,System.Compiler.ExpressionList,System.Compiler.Variable,System.Compiler.Label,System.Compiler.InterProcMapping@)">
+            <summary>
+            Computes the PTGraph that binds caller with callee
+            </summary>
+            <param name="caller"></param>
+            <param name="callee"></param>
+            <param name="thisRef"></param>
+            <param name="arguments"></param>
+            <param name="vr"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.bindCallerWithCalleePTG(System.Compiler.PTGraph,System.Compiler.PTGraph,System.Compiler.Variable)">
+            <summary>
+            Bind the caller with the callee and simplify the resulting pointsToGraph
+            by removing the load nodes that has been resolved (captured objects)
+            </summary>
+            <param name="callerPTG"></param>
+            <param name="calleePTG"></param>
+            <param name="vr"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.InterProcMapping.bindRefOrOutParameter(System.Compiler.PTGraph,System.Compiler.PTGraph,System.Compiler.Variable,System.Compiler.Variable)">
+            <summary>
+            Bind an output or ref result with the argument
+            </summary>
+            <param name="calleePTG"></param>
+            <param name="vr"></param>
+            <param name="outParameter"></param>
+            <param name="ipm"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.Analysis.AnalyzableMethodFinder">
+            <summary>
+            This class is used to compute the set of potentially analyzable methods
+            I used to filter out the methods in order to limit the interprocedural 
+            analysis scope
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Analysis.MyCGGenerator">
+            <summary>
+            Instruction visitor used to build the partial call graph
+            Every method call is registered 
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Analysis.CGGenerator">
+            <summary>
+            Small dataflow traversal. Just for building the 
+            partial call graph.
+            Not exception support
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Analysis.CGGenerator.VisitStatement(System.Compiler.CfgBlock,System.Compiler.Statement,System.Compiler.IDataFlowState)">
+            <summary>
+            Visit the statement. It call the instruction visitor to perform the transfer function
+            </summary>
+            <param name="block"></param>
+            <param name="statement"></param>
+            <param name="dfstate"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.UnknownInstructionException">
+            <summary>
+            Exception thrown when an unknown quad is encountered.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.SampleInstructionVisitor">
+            <summary>
+             Example use of <c>QuadVisitor</c>.  Generates an appropriate string representation
+             for each quad.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.SampleInstructionVisitor.GetStringDesc(System.Compiler.Statement)">
+            <summary>
+            Returns a string representation for each quad.  Throws an exception when encountering
+            an unknown quad or an unknown CciHelper pattern.
+            </summary>
+            <param name="stat"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.ArrayEnumerator">
+            <summary>
+            Enumerator over a prefix of an array (System.Array.GetEnumerator returns
+            an enumerator over ALL the elements of the array).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ArrayEnumerator.#ctor(System.Object[],System.Int32)">
+            <summary>
+            Constructs an enumerator  over the first <c>size</c> elements of <c>array</c>.
+            NOTE: I couldn't find any way of detecting comodification errors ...
+            </summary>
+        </member>
+        <member name="T:System.Compiler.DataStructUtil">
+            <summary>
+            Summary description for DataStructsUtil.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.DataStructUtil.IEnum2String(System.Collections.IEnumerable,System.Compiler.DObj2String)">
+            <summary>
+            Produces a string representation of an <c>IEnumerable</c> object,
+            using <c>o2s</c> to produce the string representation of each
+            element.
+            </summary>
+            <param name="eable"></param>
+            <param name="o2s"></param>
+            <returns></returns>
+            
+        </member>
+        <member name="T:System.Compiler.DObj2String">
+            <summary>
+            Conversion object -> string. Useful for classes for which we cannot
+            modify / override the <c>ToString</c> method. A <c>null</c> value
+            should be interpreted as the classic <c>ToString</c> method.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ICopyable">
+            <summary>
+            Represents an object that can be copied deeply, as opposed to the shallow ICloneable.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ISet.Contains(System.Object)">
+            <summary>
+            Checks whether a given element is part of <c>this</c> set.
+            </summary>
+            <param name="elem">element searched into the set</param>
+            <returns><c>true</c> if <c>elem</c> is in the set, <c>false</c> otherwise</returns>
+        </member>
+        <member name="T:System.Compiler.Datatype">
+            <summary>
+            An attempt to make coding with datatypes more pleasant in C#
+            </summary>
+            <remarks>
+            Use <c>Datatype</c> as a base class on each of your abstract data type base classes. When doing
+            case analysis on such a value, use the method <c>Tag</c> to get a String representation of the 
+            dynamic class name. This can be matched in the <c>case</c> branches of a switch. 
+            <p>
+            For pairwise matching, use <c>x.Tag + y.Tag</c> and <c>case "Foo"+"Bar"</c>.
+            </p>
+            Can be extended to compute the set of tags of each abstract datatype instance and utility methods.
+            </remarks>
+        </member>
+        <member name="T:System.Compiler.FList">
+            <summary>
+            Functional lists. null represents the empty list.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.FList.Intersect(System.Compiler.FList,System.Compiler.FList)">
+            <summary>
+            Given two sorted lists, compute their intersection
+            </summary>
+            <param name="l1">sorted list</param>
+            <param name="l2">sorted list</param>
+            <returns>sorted intersection</returns>
+        </member>
+        <member name="T:System.Compiler.IMap">
+            <summary>
+            An abstraction for maps
+            </summary>
+        </member>
+        <member name="T:System.Compiler.HashedMap">
+            <summary>
+            A Map based on a hashtable.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.HashedMap.Copy">
+            <summary>
+            Deep copy. Checks if values implement ICopyable. If so, copies them too.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ListMap">
+            <summary>
+            A Map based on a ListDictionary
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ListMap.Copy">
+            <summary>
+            Deep copy. Checks if values implement ICopyable. If so, copies them too.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.IMutableSet">
+            <summary>
+            Interface for the set abstraction: collection of distinct elements.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IMutableSet.Add(System.Object)">
+            <summary>
+            Adds an element to <c>this</c> set.
+            </summary>
+            <param name="elem">element to add</param>
+            <returns><c>true</c> if <c>this</c> set was modified as a result of this operation</returns>
+            
+        </member>
+        <member name="M:System.Compiler.IMutableSet.Remove(System.Object)">
+            <summary>
+            Removes an element from <c>this</c> set. 
+            </summary>
+            <param name="elem"></param>
+            <returns><c>true</c> if <c>this</c> set was modified as a result of this operation</returns>
+        </member>
+        <member name="M:System.Compiler.IMutableSet.AddAll(System.Collections.IEnumerable)">
+            <summary>
+            Adds several elements from <c>this</c> set.
+            </summary>
+            <param name="eable"><c>IEnumerable</c> that contains the elements to be added</param>
+            <returns><c>true</c> if <c>this</c> set was modified as a result of this operation</returns>
+        </member>
+        <member name="M:System.Compiler.IMutableSet.RemoveAll(System.Collections.IEnumerable)">
+            <summary>
+            Removes several elements from <c>this</c> set.
+            </summary>
+            <param name="eable"><c>IEnumerable</c> containing the elements to be removed</param>
+            <returns><c>true</c> if <c>this</c> set was modified as a result of this operation</returns>
+        </member>
+        <member name="M:System.Compiler.IMutableSet.Clear">
+            <summary>
+            Deletes all the elements of <c>this</c> set. As a result the <c>Count</c> property will be <c>0</c>.
+            </summary>
+            <returns><c>true</c> if <c>this</c> set was modified as a result of this operation</returns>
+        </member>
+        <member name="M:System.Compiler.Set.NonSubsetWitness(System.Compiler.ISet,System.Compiler.ISet)">
+            <summary>
+            Returns null if A included in B. Otherwise, returns an element in
+            A that is not in B.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.NodeSet">
+            <summary>
+            uses trivial hashtable as its set implementation
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NodeSet.GetEnumerator">
+            <summary>
+            Has to clean out the ArrayList, since it may contain stale keys.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.HashSet">
+             <summary>
+             Full implementation of the <c>ISet</c> interface, backed by a <c>Hashtable</c>.
+             </summary>
+             <remarks>
+             As each <c>HashSet</c> is backed by a
+             <see cref="T:System.Collections.Hashtable">Hashtable</see>, all requirements that
+             apply for the <c>Hashtable</c> keys apply for the elements of a <c>HashSet</c>
+             as well.
+            
+             <p>The <c>HashSet</c> class overrides the methods
+             <see cref="M:System.Compiler.HashSet.GetHashCode">GetHashCode</see> and <see cref="M:System.Object.Equals(System.Object)">Equals</see>
+             (inherited from <see cref="T:System.Object">Object</see>) in order to provide
+             structural equality:
+             two sets are equal iff they contain the same elements (where the semantics of "same"
+             is defined by the <c>Equals</c> method of those objects).  You can put HashSets into
+             HashSets; however, to avoid infinite loops, you should never insert a <c>HashSet</c>
+             into itself.
+             The hashcode of a <c>HashSet</c> is defined as the "xor" of the hashcodes of the set
+             elements. 
+             </p>
+             
+             <p>
+             The <c>GetHashCode</c> function of a <c>HashSet</c> executes in <c>O(1)</c> time:
+             the hashcode is dynamically updated after each operation that modifies the set.
+             If the hashcode functions used for all the other involved objects is good and
+             is computed in <c>O(1)</c> time, one element addition and removal execute in
+             <c>O(1)</c> time; <c>Equals</c> works in time linear to the number of elements of
+             <c>this</c> set.
+             </p> 
+             </remarks>
+        </member>
+        <member name="M:System.Compiler.HashSet.#ctor">
+            <summary>
+            Constructs an empty <c>HashSet</c>.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.HashSet.#ctor(System.Collections.IEnumerable)">
+            <summary>
+            Constructs a <c>HashSet</c> initialized to contain all
+            elements from an <c>IEnumerable</c>.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IMutableRelation.AddRelation(System.Compiler.IRelation)">
+            <summary>
+            Adds an entire relation to <d>this</d> relation.
+            </summary>
+            <param name="relation">Relation that is unioned with this relation.</param>
+            <returns><c>true</c> iff <c>this</c> relation changed.</returns>
+        </member>
+        <member name="T:System.Compiler.Relation">
+            <summary>
+            Full <c>IMutableRelation</c> implementation.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Relation.#ctor(System.Compiler.DDictionaryFactory,System.Compiler.DSetFactory)">
+            <summary>
+            Full power relation constructor that allows you to finely tune the memory consumption.
+            Internally, a relation is a dictionary that assigns to each key the set of values that are
+            in relation with it.  This constructor allows you to specify the dictionary and the set
+            factory.
+            </summary>
+            <param name="dict_fact">Dictionary factory used to construct the underlying dictionary.</param>
+            <param name="set_fact">Set factory used to construct the set that will store the values
+            associated with each key.</param>
+        </member>
+        <member name="M:System.Compiler.Relation.#ctor">
+            <summary>
+            Default constructor.  Uses the default factory for dictionaries (i.e., equiv. to new Hashtable())
+            and sets (i.e., equiv. to new HashSet()).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Relation.Clone">
+            <summary>
+            "Shallow" copy of a relation.  Produces an independent copy of <c>this</c> <c>Relation</c>.
+            The keys and values are not duplicated.  Operations on the
+            resulting <c>Relation</c> and on <c>this</c> <c>Relation</c> don't interact.
+            </summary>
+            <returns>An independent copy of <c>this</c> Relation.</returns>
+        </member>
+        <member name="M:System.Compiler.Relation.Copy">
+            <summary>
+            Deep copy of a relation.  Produces an independent copy of <c>this</c> <c>Relation</c>,
+            in which even the keys and values are duplicated (using deep copy) if they implement
+            the ICopyable interface.  Operations on the resulting <c>Relation</c> and on <c>this</c>
+            <c>Relation</c> don't interact.
+            </summary>
+            <returns>A really deep copy of <c>this</c> <c>Relation</c>.</returns>
+        </member>
+        <member name="T:System.Compiler.EnumeratorFilter">
+            <summary>
+            Returns null if object should not be returned, otherwise, returns object.
+            Can thus change objects.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.CompoundEnumerable">
+            <summary>
+            "Glues" together two <c>IEnumerable</c> objects in a single view.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CompoundEnumerable.#ctor(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Compiler.EnumeratorFilter,System.Object)">
+            <summary>
+            Construct an enumerable that enumerators over ieable1, then ieable2. Each element
+            is passed to the filter which can decide if the element should be returned by
+            the enumerator or not. The filter can also change the element (map).
+            </summary>
+            <param name="filter">can be null</param>
+            <param name="context">passed to filter</param>
+        </member>
+        <member name="T:System.Compiler.MultiEnumerator">
+            <summary>
+            Serial composition of two enumerators.  Enumerating with a
+            multi-enumerator is equivalent to enumerating with the first enumerator,
+            and next with the second one.  Implements the full <c>IEnumerable</c>
+            interface.  Aliases to the enumerators are sequentially composed are
+            internally stored and used by the encapsulating multi-enumerator.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.MultiEnumerator.#ctor(System.Collections.IEnumerator,System.Collections.IEnumerator,System.Compiler.EnumeratorFilter,System.Object)">
+            <summary>
+            Creates a <c>MultiEnumerator</c> that serially chains the two
+            enumerators passed as arguments.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.UnionEnumerable">
+            <summary>
+            Union enumerator over two <c>IEnumerable</c> objects. Each key is visited only once
+            </summary>
+        </member>
+        <member name="T:System.Compiler.UnionEnumerator">
+            <summary>
+            Union composition of two enumerators.  Enumerating with a
+            multi-enumerator is equivalent to enumerating over the union of the elements in
+            the first and second enumerator.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.UnionEnumerator.#ctor(System.Collections.IEnumerable)">
+            <summary>
+            Creates a <c>UnionEnumerator</c> over both given enumerators.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.WorkStack">
+            <summary>
+            Stack-based implementation of IWorkList.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.WorkList">
+            <summary>
+            Queue-based implementation of IWorkList.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Compare">
+            <summary>
+            Returns 0 if x and y are equal, less than 0 if x is less than y and greater than 0 if x is greater than y
+            </summary>
+        </member>
+        <member name="T:System.Compiler.IGraphNavigator">
+            <summary>
+            Interface for navigating into a graph.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IGraphNavigator.NextNodes(System.Object)">
+            <summary>
+            Returns the nodes that can be reached from <c>node</c> by
+            navigating one level along the graph edges.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IGraphNavigator.PreviousNodes(System.Object)">
+            <summary>
+            Returns the nodes that can be reached from <c>node</c> by
+            navigating one level AGAINST the graph edges (i.e., from edge
+            target to the edge source).
+            </summary>
+        </member>
+        <member name="T:System.Compiler.UnionGraphNavigator">
+            <summary>
+            Navigator for the graph obtained by unioning two graphs.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.UnionGraphNavigator.#ctor(System.Compiler.IGraphNavigator,System.Compiler.IGraphNavigator)">
+            <summary>
+            Constructs a navigator into a graph which is the union of two graphs
+            (where the graphs are seen as edge sets).
+            </summary>
+            <param name="nav1">Navigator for the first graph.</param>
+            <param name="nav2">Navigator for the second graph.</param>
+        </member>
+        <member name="M:System.Compiler.UnionGraphNavigator.NextNodes(System.Object)">
+            <summary>
+            In a union graph, the list of successors of a node includes its successors in
+            the first graph followed by its successors in the second graph.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.UnionGraphNavigator.PreviousNodes(System.Object)">
+            <summary>
+            In a union graph, the list of predecessors of a node includes the its predecessors in
+            the first graph followed by its predecessors in the second graph.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.BackwardGraphNavigator">
+            <summary>
+            Navigator for an inverse graph.  The successors (i.e., <c>NextNodes</c>)
+            of a node are the predecessors of the node in the original graph.  Analogously
+            for the predecessors.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.BackwardGraphNavigator.#ctor(System.Compiler.IGraphNavigator)">
+            <summary>
+            Constructs a <c>BackwardGraphNavigator</c> that reverses an
+            <c>IGraphNavigator</c>.
+            </summary>
+            <param name="navigator">The navigator that is reversed.</param>
+        </member>
+        <member name="M:System.Compiler.FilteredGraphNavigator.#ctor(System.Compiler.ISet,System.Compiler.IGraphNavigator)">
+            <summary>
+            Only nodes in given set are considered part of the graph.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.SccNavigator">
+            <summary>
+            Navigator in a component graph (an acyclic graph of ISCCs).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.GraphUtil.TopologicallySortGraph(System.Compiler.DSetFactory,System.Collections.IEnumerable,System.Compiler.IGraphNavigator)">
+            <summary>
+            Topologically sorts the graph rooted in <c>roots</c> and described by
+            <c>nav</c>. Throws a <c>CyclicGraphException</c> if the graph contains
+            a cycle. Otherwise, returns a topologically sorted list of the graph nodes. 
+            The returned list is in ascending order: it starts with the nodes that don't
+            have any out-arc (i.e., arcs going out of them) and ends with the nodes
+            that don't have any in-arcs (i.e., arcs going into them).  If the navigator
+            works in constant time, the topological sort works in time linear with the
+            number of nodes plus the number of edges. 
+            
+            </summary>
+        </member>
+        <member name="M:System.Compiler.GraphUtil.TopologicallySortComponentGraph(System.Compiler.DSetFactory,System.Collections.IEnumerable)">
+            <summary>
+            Topologically sorts a component graph: a graph whose nodes are the
+            strongly connected components of the original graph (such a graph is
+            clearly acyclic). Calls the full-fledged TopSortComponentGraph with
+            the standard <c>ISCCNavigator</c>.
+            
+            </summary>
+            <param name="roots">The set of the root SCCs, only the SCCs reachable
+            from these roots will be considered by the topological sort.</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.GraphUtil.SearchDepthFirst(System.Collections.IEnumerable,System.Compiler.IGraphNavigator,System.Compiler.DNodePredicate,System.Compiler.DNodeVisitor,System.Compiler.DNodeVisitor,System.Compiler.DNodeVisitor)">
+            <summary>
+            DFS traversal of the (sub)graph rooted in a set of nodes.
+            </summary>
+            <param name="roots">Roots of the traversed subgraph. The subgraph
+            rooted in the first root will be traversed in DFS order; next, if
+            the second root wasn't reached yet, the subgraph rooted in it will
+            be traversed in DFS order and so on. The order of
+            the roots is given by the corresponding <c>IEnumerator</c>.</param>
+            <param name="navigator">Navigator that describes the graph structure.</param>
+            <param name="avoid">Encountered nodes that satisfy this predicate will be
+            ignored by the DFS traversal (together with their attached arcs). <c>null</c>
+            corresponds to the predicate that is always false (i.e., no encountered node
+            will be ignored).</param>
+            <param name="new_subgraph_visitor">Visitor for the root node of each
+            new subgraph: the roots (see the roots parameter)
+            are explored in order; if a root node has not been already reached
+            by the DFS traversal of the previous roots, <c>new_subgraph_visitor</c>
+            will be called on it, and next the subgraph rooted in it will be DFS
+            traversed.</param>
+            <param name="begin_visitor">Node visitor to be called when a node is reached
+            for the first time by the DFS traversal. <c>null</c> corresponds to no
+            visitor.</param>
+            <param name="end_visitor">Node visitor to be called when the exploration of
+            a node has finished. <c>null</c> corresponds to no visitor.</param>
+        </member>
+        <member name="M:System.Compiler.GraphUtil.dfs(System.Collections.IEnumerable,System.Compiler.IGraphNavigator,System.Compiler.DNodePredicate,System.Compiler.DNodeVisitor,System.Compiler.DNodeVisitor)">
+            <summary>
+            Convenient <c>dfs</c> function.  Call the full <c>dfs</c> function
+            with new_subgraph_visitor set to <c>null</c>.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.GraphUtil.bfs(System.Collections.IEnumerable,System.Compiler.IGraphNavigator,System.Compiler.DNodePredicate,System.Compiler.DNodeVisitor,System.Compiler.DEdgeVisitor)">
+            <summary>
+            Does a breadth first traversal of the given graph
+            </summary>
+            <param name="roots">The roots of the traversal.</param>
+            <param name="avoid">If not null, is a predicate to avoid certain nodes</param>
+            <param name="visitRoot">If not null, called for each root that is not avoided.</param>
+            <param name="visitEdge">Called for each edges in the bf traversal, i.e., only for edges going to unvisited nodes.</param>
+        </member>
+        <member name="T:System.Compiler.Verifier">
+            <summary>
+            Walks an IR looking for preconditions that have not been satisfied
+            </summary>
+        </member>
+        <member name="T:System.Compiler.CodeDomTranslator">
+            <summary>
+            Walks a System.CodeDom.CodeCompileUnit and produces a corresponding CompilationUnit.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeDomTranslator.Translate(System.Compiler.Compiler,System.CodeDom.CodeCompileUnit,System.Compiler.Module,System.Compiler.ErrorNodeList)">
+            <summary>
+            Walks the supplied System.CodeDom.CodeCompileUnit and produces a corresponding CompilationUnit.
+            Enters declarations into the supplied Module and errors into the supplied ErrorNodeList. 
+            Calls back to the supplied compiler to resolve assembly references and to create appropriate documents for code snippets.
+            </summary>
+            <param name="compiler">Called upon to resolve assembly references and to create Documents for snippets.</param>
+            <param name="compilationUnit">The root of the CodeDOM tree to be translated into an IR CompileUnit.</param>
+            <param name="targetModule">The module or assembly to which the compilation unit will be compiled.</param>
+            <param name="errorNodes">Errors in the CodeDOM tree that are found during translation are added to this list.</param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.ContractSerializer">
+            <summary>
+            ContractSerializer is used to write a serialized form of method and type contracts
+            into custom attributes. Currently, it just creates the serialized form as a string
+            which must be retrieved externally and stored in a custom attribute.
+            Note that the serialization should happen before the contracts are normalized.
+            Eventually, I suppose this should be called in a separate pass before Normalizer
+            is called. Currently, Checker serializes each contract (and stores it in a custom
+            attribute).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ContractSerializer.VisitField(System.Compiler.Field)">
+            <summary>
+            Used to print the field name from a member binding, nothing more
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ContractSerializer.VisitMethod(System.Compiler.Method)">
+            <summary>
+            Used to print the method name, nothing more
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Scanner">
+            <summary>
+            Scans individual source lines and provides coloring and trigger information about tokens.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.IScanner">
+            <summary>
+            Scans individual source lines and provides coloring and trigger information about tokens.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IScanner.SetSource(System.String,System.Int32)">
+            <summary>
+            Used to cheaply (re)initialize the scanner before scanning a small portion of text, such as single source line for syntax coloring purposes
+            </summary>
+            <param name="source">The source text portion to be scanned. May not be null.</param>
+            <param name="offset">The index of the first character to be scanned. Must be a valid index into source.</param>
+        </member>
+        <member name="M:System.Compiler.IScanner.ScanTokenAndProvideInfoAboutIt(System.Compiler.TokenInfo,System.Int32@)">
+            <summary>
+            Scan the next token and fill in syntax coloring details about it in tokenInfo.
+            </summary>
+            <param name="tokenInfo">Keeps information about token.</param>
+            <param name="state">Keeps track of scanner state. In: state after last token. Out: state after current token.</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.Scanner.SetSource(System.String,System.Int32)">
+            <summary>
+            Used to cheaply (re)initialize the scanner before scanning a small portion of text, such as single source line for syntax coloring purposes
+            </summary>
+            <param name="source">The source text portion to be scanned. May not be null.</param>
+            <param name="offset">The index of the first character to be scanned. Must be a valid index into source.</param>
+        </member>
+        <member name="M:System.Compiler.Scanner.ScanTokenAndProvideInfoAboutIt(System.Compiler.TokenInfo,System.Int32@)">
+            <summary>
+            Scan the next token and fill in syntax coloring details about it in tokenInfo.
+            </summary>
+            <param name="tokenInfo">Keeps information about token.</param>
+            <param name="state">Keeps track of scanner state. In: state after last token. Out: state after current token.</param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.TokenInfo">
+            <summary>
+            Records the source position of a token, along with information about the syntactic significance of the token.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.TokenTrigger">
+            <summary>
+              If token has one or more triggers associated with it, it may  fire one of the following actions when it is typed in a smart editor:
+                MemberSelect - a member selection tip window
+                TriggerMatchBraces - highlight matching braces
+                TriggerMethodTip - a method tip window
+            
+              The triggers exist for speed reasons: the fast scanner determines when the slow parser might be needed. 
+              The MethodTip trigger is subdivided in four other triggers. It is the best to be as specific as possible;
+              it is better to return ParamStart than just Param (or just MethodTip) 
+              </summary>*
+        </member>
+        <member name="F:System.Compiler.TokenTrigger.None">
+            <summary>No editor action when this token is encountered.</summary>
+        </member>
+        <member name="F:System.Compiler.TokenTrigger.MemberSelect">
+            <summary>Display a member selection list</summary>
+        </member>
+        <member name="F:System.Compiler.TokenTrigger.MatchBraces">
+            <summary>Highlight a matching pair of braces or similar delimiter pairs</summary>
+        </member>
+        <member name="F:System.Compiler.TokenTrigger.MethodTip">
+            <summary>Display semantic information when the pointer hovers over this token</summary>
+        </member>
+        <member name="F:System.Compiler.TokenTrigger.ParamNext">
+            <summary>Display information about the method parameter corresponding to the call argument following this token</summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.TryLookup(System.Compiler.IUniqueKey,System.Compiler.ISymValue[])">
+            <summary>
+            returns sv, such that sv == function(args), or null if not mapped
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.AssumeEqual(System.Compiler.ISymValue,System.Compiler.ISymValue)">
+            <summary>
+            Assumes v1 == v2
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.IsEqual(System.Compiler.ISymValue,System.Compiler.ISymValue)">
+            <summary>
+            Returns true if v1 == v2
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.Eliminate(System.Compiler.IUniqueKey,System.Compiler.ISymValue[])">
+            <summary>
+            Removes the mapping from the egraph. Semantically equivalent to setting 
+            the corresponding term to a Fresh symbolic value.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.EliminateAll(System.Compiler.ISymValue)">
+            <summary>
+            Removes all mappings from the egraph of the form g(from).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.Join(System.Compiler.IEGraph,System.Compiler.CfgBlock,System.Boolean@)">
+            <summary>
+            Merge two EGraphs. Result is null if result is no different than this.
+            </summary>
+            <param name="isIsomorphicToThis">true, if result is isomorphic to this graph</param>
+        </member>
+        <member name="M:System.Compiler.IEGraph.Join(System.Compiler.IEGraph,System.Compiler.CfgBlock,System.Compiler.IMergeInfo@)">
+            <summary>
+            Merge two EGraphs. Result is null if result is no different than this.
+            MergeInfo provides the mapping of symbolic values in the result to values in the
+            two incoming branches.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IEGraph.Functions(System.Compiler.ISymValue)">
+            <summary>
+            return the set of unary function symbols f, such that f(symval) = sv' exists in
+            the egraph.
+            </summary>
+            <param name="symval"></param>
+        </member>
+        <member name="M:System.Compiler.IEGraph.EqTerms(System.Compiler.ISymValue)">
+            <summary>
+            Return set of equivalent terms to this symbolic value
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IEGraph.Item(System.Compiler.IUniqueKey,System.Compiler.ISymValue[])">
+            <summary>
+            getter returns sv, such that sv == function(args)
+            
+            setter sets function(args) == value, is equivalent to Eliminate(f, args), followed by
+            assume (f(args) == value)
+            </summary>
+            <param name="function"></param>
+            <param name="args"></param>
+        </member>
+        <member name="P:System.Compiler.IEGraph.Item(System.Compiler.ISymValue)">
+            <summary>
+            Associates symval with an abstract value.
+            
+            getter returns current association or Top
+            setter sets current association (forgetting old association)
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IEGraph.Constants">
+            <summary>
+            return the set of constant function symbols in this egraph
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IEGraph.SymbolicValues">
+            <summary>
+            Returns the set of defined symbolic values in the egraph that have outgoing edges.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IMergeInfo.Changed">
+            <summary>
+            Returns true if result is different from G1
+            </summary>
+        </member>
+        <member name="F:System.Compiler.EGraph.forwMap">
+            <summary>
+            Used to represent equalities among symbolic values
+            </summary>
+        </member>
+        <member name="M:System.Compiler.EGraph.#ctor(System.Compiler.EGraph,System.Compiler.CfgBlock)">
+            <summary>
+            Copy constructor
+            </summary>
+            <param name="from"></param>
+        </member>
+        <member name="M:System.Compiler.EGraph.Update.Replay(System.Compiler.EGraph.MergeState)">
+            <summary>
+            Replay update on merge state
+            </summary>
+        </member>
+        <member name="T:System.Compiler.DGetStatInfo">
+            <summary>
+            Prints some information attached to a statement.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.DGetBlockInfo">
+            <summary>
+            Prints some information attached to a block.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.CodePrinter">
+            <summary>
+            Helper class for printing an ASCII representation of the representation
+            produced by CciHelper.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.b2s(System.Compiler.Block)">
+            <summary>
+            Convenient version of <c>b2s</c>: <c>b2id</c> is null.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodePrinter.BlockShortPrinter">
+            <summary>
+            Convenient wrapping of <c>CodePrinter.b2s</c>; used in conjunction with
+            <c>DataStructUtil.IEnum2String</c> for printing collections of blocks.
+            It would have been some much easier to have a nice Block.ToString() method ...
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.b2s(System.Compiler.Block,System.Collections.Hashtable)">
+            <summary>
+            Returns a string id for "block" based on the integer identified b2id[block].
+            If <c>b2id</c> is null, then the block hashcode is used as the block identifier.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.PrintMethod(System.IO.TextWriter,System.Compiler.Method)">
+            <summary>
+            Method pretty-printer.  Note: the method blocks are identified by their 0-based index in the
+            method list of blocks.
+            </summary>
+            <param name="tw">Where to print.</param>
+            <param name="method">The method to be printed</param>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.MethodSignature(System.Compiler.Method)">
+            <summary>
+            Returns a string describing the signature of <c>method</c>: return type, method name, 
+            argument types and names (param names are not really part of the method signature, but
+            it's nice to know them anyway). 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.FullName(System.Compiler.Method)">
+            <summary>
+            Fully qualified name of <c>method</c>: fullname(declaring_class).method_name
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.PrintBlock(System.IO.TextWriter,System.Compiler.Block,System.Compiler.DGetStatInfo,System.Collections.Hashtable)">
+            <summary>
+            Block pretty-printer.
+            </summary>
+            <param name="tw">Where to print.</param>
+            <param name="block">What to print</param>
+            <param name="get_stat_info">Provider of statement specific information;
+            if non-null, it will be called after printing each statement, and its result
+            printed too.</param>
+            <param name="b2id">Map block -&gt; int identifier; if <c>null</c>, then the block
+            UniqueKey is used as block id.</param>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.PrintBlock(System.IO.TextWriter,System.Compiler.Block)">
+            <summary>
+            Convenient version of the block pretty-printer, with no statement
+            specific information and block.UniqueKey used as block id.
+            </summary>
+            <param name="tw">Where to print.</param>
+            <param name="block">What to print.</param>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.StatementToString(System.Compiler.Statement)">
+            <summary>
+            Convenient statement pretty-printer; the <c>b2id</c> map is <c>null</c>.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.SourceContextToString(System.Compiler.Statement)">
+            <summary>
+            Returns a textual representation of the source context info attached to statement <c>stat</c>.
+            </summary>
+            <param name="stat">Statement whose source we're interested in.</param>
+            <returns>Textual representation of the source context info for <c>stat</c>.</returns>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.StatementToString(System.Compiler.Statement,System.Collections.Hashtable)">
+            <summary>
+            Statement pretty-printer.
+            </summary>
+            <param name="stat">Statement to print</param>
+            <param name="b2id">Map block -> integer id; if <c>null</c>, the block UniqueKey will be used instead.</param>
+            <returns>String representation of the statement argument.</returns>
+        </member>
+        <member name="M:System.Compiler.CodePrinter.ExpressionToString(System.Compiler.Expression)">
+            <summary>
+            Expression pretty-printer.
+            </summary>
+            <param name="expr">Expression to print.</param>
+            <returns>String representation of the expression argument.</returns>
+        </member>
+        <member name="M:System.Compiler.PreOrder.Compute(System.Compiler.ControlFlowGraph)">
+            <summary>
+            Compute a pre order (ignoring back edges) of the CFG reachable from the entry node
+            
+            As a side effect, assigns each block its DF finishing number.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Normalizer">
+            <summary>
+            Walks an IR, mutating it into a form that can be serialized to IL+MD by Writer
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Normalizer.NormalizeToPointerCoercion(System.Compiler.BinaryExpression)">
+            <summary>
+            Hook for other languages to do something different. Normal C# and Spec# don't emit any particular coercion to pointer types.
+            </summary>
+            <param name="binaryExpr">NodeType.Castclass, Type is Pointer</param>
+        </member>
+        <member name="M:System.Compiler.Normalizer.CreateTryCatchBlock(System.Compiler.Method,System.Compiler.Block,System.Compiler.Block,System.Compiler.Local)">
+            <summary>
+            Creates a block containing the given tryBlock and catchBlocks and
+            returns it. The method is modified by having new ExceptionHandlers
+            added to it which points to the right places in the blocks.
+            The type of exception caught by each catch block should be the type
+            of the corresponding local l.
+            </summary>
+            <param name="m">The method in which the try-catch block will be
+            inserted into.</param>
+            <param name="tryBody">A block of statements that will be the body
+            of the try-catch statement.</param>
+            <param name="catchBodies">A sequence of blocks; each one contains the
+            statements that will be the body of a catch clause on the try-catch statement.
+            </param>
+            <param name="l">The local into which the exception will be
+            assigned. Presumably, the body of the catch clause does something
+            with this local.</param>
+            <returns>A single block which must be inserted into m by the client.
+            </returns>
+        </member>
+        <member name="M:System.Compiler.Normalizer.MarkAsInstrumentationCode(System.Compiler.Statement)">
+            <summary>
+            Generates a pre-normalized contract marker block.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.StackDepthVisitor">
+            <summary>
+            This class is meant to be used only by the StackDepthAnalysis and the
+            StackRemovalTransformation: given a stack depth right before a statement,
+            it walks over the statement, update the depth and calls some code transformers
+            to modify the code (by default, they don't do anything, StackRemoval overrides
+            them.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ProperOrderVisitor">
+            <summary>
+            Subclass of the CCI <c>StandardVisitor</c> that visits the fields of statements in
+            the same order that is used by the Reader.  This is important if you want to (abstractly)
+            interpret some code.  Sub-expressions have side effects, hence, the order they are
+            visited IS important.  Unfortunately, this cannot be part of the CCI because many projects
+            rely on the semantics (if any) of the current visitor.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackDepthVisitor.PopTransformer(System.Compiler.Expression,System.Int32)">
+            <summary>
+            Override this if you want to replace a Pop expression with some other expression.
+            </summary>
+            <param name="expression">Expression to replace; must have type NodeType.Pop.</param>
+            <param name="depth">Stack Depth right before evaluating the pop.</param>
+            <returns>Any valid expression; by default, it returns the argument, unchanged.</returns>
+        </member>
+        <member name="M:System.Compiler.StackDepthVisitor.DupTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Override this if you want to replace a Dup statement with some other expression.
+            </summary>
+            <param name="statement">Statement to replace; must be an ExpressionStatement with the type
+            of the expression equal to NodeType.Dup.</param>
+            <param name="depth">Stack depth right before executing the dup.</param>
+            <returns>Any valid statement; by default, it returns the argument, unchanged.</returns>
+        </member>
+        <member name="M:System.Compiler.StackDepthVisitor.PopExprTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Override this if you want to replace a Call(...); Pop sequence (which is modeled
+            by CCI as a unary expression with operator Pop and a MethodCall as its only operand).
+            </summary>
+            <param name="expr_stat">ExpressionStatement to replace.</param>
+            <param name="depth">Stack depth right before the push;</param>
+            <returns>Any valid statement; by default, it returns the argument, unchanged.</returns>
+        </member>
+        <member name="M:System.Compiler.StackDepthVisitor.PushExprTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Override this if you want to replace an [implicit] Push expression expression statement
+            with something else.
+            </summary>
+            <param name="expr_stat">Expression to replace.</param>
+            <param name="depth">Stack depth right before the expression statement.</param>
+            <returns>Any valid expression; by default, it returns the argument, unchanged.</returns>
+        </member>
+        <member name="M:System.Compiler.StackDepthVisitor.PopStatTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Override this if you want to replace a Pop statement with something else.
+            </summary>
+            <param name="expr_stat">Expression to replace.</param>
+            <param name="depth">Stack depth right before the Pop statement.</param>
+            <returns>Any valid expression; by default, it returns the argument, unchanged.</returns>
+        </member>
+        <member name="T:System.Compiler.StackRemovalTransformation">
+            <summary>
+            Computes stack depth for each basic block and whether it is reachable from the entry.
+            
+            Also changes all pop, dup and push instructions into corresponding actions on stack temporary locals.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackRemovalTransformation.Process(System.Compiler.ControlFlowGraph)">
+            <summary>
+            Examines a CFG and removes the stack manipulating instructions by introducing
+            some explicit variables for stack locations.  After this transformation, no more
+            Pop, Dup etc.
+            </summary>
+            <param name="cfg">Control Flow Graph that is modified by the transformation.
+            This argument WILL be mutated.</param>
+            <returns>A map that assigns to each block from <c>cfg</c> the stack depth at its
+            beginning.  Useful as a pseudo-liveness information.</returns>
+        </member>
+        <member name="M:System.Compiler.StackRemovalTransformation.StackRemovalVisitor.PopTransformer(System.Compiler.Expression,System.Int32)">
+            <summary>
+            Replace a pop expression with the appropriate stack variable.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackRemovalTransformation.StackRemovalVisitor.DupTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Replace a dup expression with the appropriate stack variable.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackRemovalTransformation.StackRemovalVisitor.PopExprTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Remove the Pop from a CciHelper statement "sequence" of the form "Pop expr".
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackRemovalTransformation.StackRemovalVisitor.PushExprTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Replace an implicit Push with an assignment to the appropriate stack variable.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackRemovalTransformation.StackRemovalVisitor.PopStatTransformer(System.Compiler.ExpressionStatement,System.Int32)">
+            <summary>
+            Replace an explicit Pop statement with a nop: stack is modeled by stack vars now.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.IDelayInfo">
+            <summary>
+            Exposes computed existential delay information for a method
+            </summary>
+            
+        </member>
+        <member name="T:System.Compiler.InitializedVariables">
+            <summary>
+            Encapsulation for the variables initialization states.
+            The state is an equality graph between locations (for tracking refs) and
+            each location is mapped to a two point lattice (top unassigned) (bot assigned).
+              
+            For References, we keep track of the assignment status of the contents of the location
+            by mapping terms of the form
+            
+               ValueOf(s) to assignment lattice elements as well.
+               
+            For structs, we additionally keep track of field individual assignment status by tracking
+            
+               Field(Value(s))
+               
+            In addition, we keep a single set (not program point specific) of
+            variables that were assigned, and one set of variables that were 
+            referenced. If we find variables at the end that were assigned, but not
+            referenced, we issue the C# warning.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.Canonical(System.Compiler.TypeNode)">
+            <summary>
+            Due to generics, we see different fields for the same field
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.#ctor(System.Compiler.InitializedVariables)">
+            <summary>
+            Copy Constructor
+            </summary>
+            <param name="old"></param>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.IsAssigned(System.Compiler.ISymValue)">
+            <summary>
+            Use only for non-struct values.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.IsAssigned(System.Compiler.ISymValue,System.Compiler.Struct)">
+            <summary>
+            Returns null if all fields of the struct are fully assigned, otherwise the field that is not.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.IsAssignedRef(System.Compiler.Variable,System.Compiler.Struct)">
+            <summary>
+            </summary>
+            <param name="structType">null if no struct type</param>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.NonAssignedRefField(System.Compiler.Variable,System.Compiler.Struct)">
+            <summary>
+            Like IsAssignedRef, but returns null if true, and a witness field if false.
+            </summary>
+            <param name="structType">Non-null struct type of variable</param>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.CanAssumeDelayed(System.Compiler.Variable)">
+            <summary>
+            Check that value in v is (universally) delayed (and if bottom, make it delayed)
+            </summary>
+            <param name="v"> </param>
+            <returns>true if value is delayed from here on.</returns>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.CanAssumeNotDelayed(System.Compiler.Variable)">
+            <summary>
+            Check that value in v is NOT delayed (and if bottom, make it not delayed)
+            </summary>
+            <param name="v"></param>
+            <returns>true if value is not delayed from here on.</returns>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.ElementType(System.Compiler.TypeNode)">
+            <summary>
+            Returns element type of reference or pointer, otherwise null
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.GetLocalMappingToLoc(System.Compiler.ISymValue)">
+            <summary>
+            Must follow field edges of value types backwards as well
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.#ctor(System.Compiler.Analyzer)">
+            <summary>
+            Constructor
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.Dump">
+            <summary>
+            Required by IDataFlowAnalysis interface.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.InitializedVariables.FilterStackAndTemporaryLocals(System.Int32)">
+            <summary>
+            Called when a merge point is first encountered. Provides the ability to remove dead variables from
+            the state to keep its size down.
+            </summary>
+            <param name="stackdepth">depth of stack at the beginning of the block</param>
+        </member>
+        <member name="P:System.Compiler.InitializedVariables.Variables">
+            <summary>
+            Returns a canonically sorted list of non-temp variables.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.DefAssignLattice">
+             <summary>
+             Definite assignment and usage analysis.
+             
+             Definite assignment is about locations, not values. Thus, we use egraph as follows:
+             
+             Variables represent locations, thus the symbolic values in the egraph represent location addresses.
+             
+             We track the status of these locations (assigned, referenced)
+             
+             To track pointers to locations, we also keep track of terms of the form Value(loc), representing
+             the value stored in the location loc.
+             
+             Thus, an assignment x = y is represented as Value(sym(x)) := Value(sym(y))
+             
+             
+             DELAYED REFERENCES
+            
+             In order to allow static checking of initialization of circular structures, we introduce the
+             notion of a delayed reference. A delayed reference D(T) is a pointer whose type invariants may
+             not be valid (and thus observed) until time T. The CLR already has such a notion in the fact that
+             "this" is delayed in constructors until the base call.
+             We add to this "universally quantified" delays for "This" and other parameters. We track that
+             no reads are performed on universally delayed references and that they are stored only in other
+             universally delayed references.
+             
+             Reference types T<amp/> that may point to fields of delayed objects are treated specially. Intuitively,
+             these references would have to have the same delay as the pointed to object field.
+             Within a method, that is the case. However, the common cases of ref and out parameters that create
+             such pointers in regular C#/Spec# code can be handled slightly better.
+             Essentially, a delayed reference or a pointer to a field of a delayed reference should never be passed as
+             a ref parameter, since it cannot be read prior to initialization.
+             On the other hand, passing such pointers as Out parameters seems valid and desirable and in fact does
+             not require the parameter to be marked [Delayed], since the out aspect already guarantees initialization
+             prior to use. This assumes that the type of the out parameter captures all the invariants that the 
+             field should ultimately possess.
+             </summary>
+        </member>
+        <member name="T:System.Compiler.DefAssignLattice.AVal">
+            <summary>
+            Ordering:
+            
+              A lt B   iff
+              
+              !A.Assigned implies !B.Assigned
+              and 
+              !A.Unassigned implies !B.Unassigned
+            </summary>
+        </member>
+        <member name="M:System.Compiler.DefAssignLattice.AVal.ForJoin(System.Boolean,System.Boolean,System.Compiler.DefAssignLattice.Delay)">
+            <summary>
+            Can round up value.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.DefAssignLattice.AVal.ForMeet(System.Boolean,System.Boolean,System.Compiler.DefAssignLattice.Delay)">
+            <summary>
+            Can round down value.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.MethodDefiniteAssignmentChecker">
+             <summary>
+             Definite assignment checker.
+            
+             This checker also makes sure that all non-null fields are properly initialized prior to any possible read accesses.
+             There are two cases: 
+              1) if the constructor is non-delayed (i.e., the this parameter is not delayed), then the fields must be initialized prior to the 
+                 base .ctor call
+              2) if the constructor is delayed (guaranteeing that during the constructor execution, no fields of this are ever consulted), then
+                 the fields must be initialized by the end of the constructor.
+             </summary>
+        </member>
+        <member name="F:System.Compiler.MethodDefiniteAssignmentChecker.iVisitor">
+            <summary>
+            Current instruction visitor.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodDefiniteAssignmentChecker.currBlock">
+            <summary>
+            Current Block under analysis.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodDefiniteAssignmentChecker.typeSystem">
+            <summary>
+            typeSystem. Only used to file errors and warnings.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodDefiniteAssignmentChecker.currentMethod">
+            <summary>
+            Current method being analyzed.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodDefiniteAssignmentChecker.reportedErrors">
+            <summary>
+            This is a repository that stores errors that has been reported.
+            
+            It is used basically as a set. Only used in DefiniteAssignmentInstructorVisitor.check. 
+            If the invariant that all variables have their source context holds, then the key in this set 
+            could be individual variables. 
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodDefiniteAssignmentChecker.exitState">
+            <summary>
+            The exit state. Used to check assigned but not referenced variables.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.MethodDefiniteAssignmentChecker.Check(System.Compiler.TypeSystem,System.Compiler.Method,System.Compiler.Analyzer)">
+            <summary>
+            Entry point of the check. 
+            
+            It create a new instance of the checker, and run the checker on the given method.
+            </summary>
+            <param name="t"></param>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.MethodDefiniteAssignmentChecker.SplitExceptions(System.Compiler.CfgBlock,System.Compiler.IDataFlowState@,System.Compiler.IDataFlowState@)">
+            <summary>
+            Since we push the state from each block to the exception handler, we don't need to chain them here.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.DefiniteAssignmentInstructionVisitor.MethodCallDelayInstance(System.Compiler.InitializedVariables,System.Compiler.Variable,System.Compiler.Method,System.Compiler.ExpressionList,System.Compiler.Node,System.Int32@)">
+            <summary>
+            Figure out how to instantiate the quantified delay of the method parameters (if any).
+            We assume that each method has the form \forall T. where T is a delay. Parameters with the "Delayed" attribute
+            are assumed to have type Delay(T). 
+            Given the concrete arguments, this method determines if any parameter whose formal is delayed is actually delayed.
+            [existential delay change]
+            In addition, put the checking of existential delayed actuals here
+            For error diagnostics purpose, we also note the position of the first delay-matched argument
+            </summary>
+            <param name="receiver"></param>
+            <param name="callee"></param>
+            <param name="arguments"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.DefiniteAssignmentInstructionVisitor.CheckParameterDelay(System.Compiler.InitializedVariables,System.Compiler.Variable,System.Compiler.Method,System.Compiler.Parameter,System.Boolean,System.Compiler.Node,System.Int32,System.Int32)">
+            <summary>
+            The instantiated formal type is non-delayed unless the parameter is marked delayed and "delayedInstance" is true.
+            [Existential Delay Change] When there is only one delayed argument, we allow it to be existential delayed
+            This is done by keeping track of the number of possible delay matches. 
+            if actual/formal is universal/universal, then this number (possibleDelayMatch) is not changed, we allow it only when
+                 the number is not zero (the only way it can be zero at this point (delayinstance is true) is because
+                 an existential/universal delay match happened.
+            if actual/formal is existential/universal, then match happens only when the number is 1
+                 number is changed to zero to disallow future existential/universal match
+            Delay match error will reported as delay not compatible with the witness. If the witness does not have an appropriate delay
+            we do not report an error, which will be safe (see comments below).
+            </summary>
+        </member>
+        <member name="T:System.Compiler.CodeFlattener">
+            <summary>
+            Transforms the nested CCI representation into a flat one.
+            
+            More precisely it does 3 things
+            - It turns nested block structures into a 2 level structure, the method body is a block consisting of blocks. These
+              2nd level blocks only contain statements, not nested blocks. All branch targets are to a block in the 2nd level.
+              
+            - All statements are simplified to three address codes, by splitting complicated expressions so that they push their
+              result onto the stack, whereas the continuation pops it off the stack.
+              
+            - Produces only CfgBlocks
+            
+            In order to correctly deal with nested dup expressions which appear when the input is not read in
+            from an external DLL, but is the output of the compiler, we need to use an explicit stack model.
+            Consider the following problem:
+            
+               Construct(Delegate, [ local0, BinaryExpr(ldvirtfn, dup, Test.M) ]
+               
+            The dup instruction acts on the local0, which is the first argument to the constructor. Previously,
+            we would try to use this local0 directly, without stacking it. Now we have to stack everything.
+            
+            Stacking everything has the undesirable side effect that data flow analyses that do branch refinement have
+            a hard time updating information about tests, since the tests always involve stack variables.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.EmptyVisitor">
+            <summary>
+            Visitor that doesn't implement any Visit method
+            (throws new ApplicationException("unimplemented") instead.)
+            Good if all you want to do is dispatch some specific processing for each node type,
+            without going deep into the recursive data structure.  Throwing an exception for
+            unimplemented things is also useful for catching the untreated cases.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.expandAllocations">
+            <summary>
+            When true, an allocation is split into a separate memory alloc, followed by an explicit constructor call.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.performConstantFoldingOnBranchConditions">
+            <summary>
+            When true, use branch conditions that are literals to prune infeasible execution paths.
+            In general, we always want this to be done. But if it is done for the code that
+            does the runtime checking of contracts, that would influence whether the "regular"
+            code downstream of the branch is represented in the CFG or not.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.orig2Copy">
+            <summary>
+            Contains mappings from original ExpressionStatement to new ExpressionStatement
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.MakeFlat(System.Compiler.Method,System.Boolean,System.Compiler.CodeMap@)">
+            <summary>
+            Flattens the code of the method <c>method</c>.  Leaves the CCI representation of <c>method</c> intact.
+            
+            Returns a mutated copy.
+            
+            Important! don't forget to adjust handler block boundaries as well
+            </summary>
+            <param name="expandAllocations">When true, then Construct expressions are expanded
+            into a separate allocation and separate constructor call.</param>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.MakeFlat(System.Compiler.Method,System.Boolean,System.Boolean,System.Compiler.CodeMap@)">
+            <summary>
+            Flattens the code of the method <c>method</c>.  Leaves the CCI representation of <c>method</c> intact.
+            
+            Returns a mutated copy.
+            
+            Important! don't forget to adjust handler block boundaries as well
+            </summary>
+            <param name="expandAllocations">When true, then Construct expressions are expanded into a separate allocation and separate
+            constructor call.</param>
+            <param name="constantFoldEvenInContracts">When <c>true</c>, use constant folding 
+            to prune infeasible branches.</param>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.orig2newBlocks">
+            <summary>
+            Maintains the mapping from original blocks to new blocks so we can adjust branch targets
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.branchInstructions">
+            <summary>
+            Used to build up a list of all branch statements, so that in a post pass we can adjust their targets
+            using the orig2newBlocks mapping
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.switchInstructions">
+            <summary>
+            Used to build up a list of all switch statements, so that in a post pass we can adjust their targets
+            using the orig2newBlocks mapping
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.new_stats">
+            <summary>
+            To accumulate statements from a block. The transformed statements
+            go onto this list.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.new_blocks">
+            <summary>
+            Accumulates the newly created blocks.
+            
+            </summary>
+        </member>
+        <member name="F:System.Compiler.CodeFlattener.current_oldBlock">
+            <summary>
+            Holds either null, or the current old block that must be mapped to the
+            next dynamically created new block in the map.
+            
+            Note: Because a nested block can appear as the first statement of
+            a block, we have to be careful. There can be multiple outstanding oldBlocks
+            that need to be mapped to the first generated block.
+            
+            We do this by the following invariant:
+            Every block expansion starts with a call to FlattenBlock
+             The FlattenBlock stack activation frame keeps track of the prior current_oldBlock 
+             and stores the new current oldBlock.
+             At the end of FlattenBlock, the prior_oldBlock is mapped to the same new block
+             as the oldBlock on which FlattenBlock was called.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.EndStatementList">
+            <summary>
+            Invariant: whenever during the traversal, we find that we need to start a new block
+            (because we reach a block that could be the target of a branch),
+            we have to take the new_stats StatementList and if non-empty, create a new block from it
+            and put it onto the new_blocks list. new_stats is then initialized with a new empty list.
+            
+            We also have to update the orig2newblock map, using the current_oldBlock as the key and the
+            newly created block as the target. If we update the map, we null out the current_oldBlock.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.UpdateBlockMap(System.Compiler.Block@,System.Compiler.Block)">
+            <summary>
+            if oldBlock != null, then we need to update the blockMap to map oldBlock to newBlock
+            and set oldBlock to null.
+            
+            POST: oldBlock == null
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.FlattenBlock(System.Compiler.Block)">
+            <summary>
+            Can be called to recursively flatten a block from the following places:
+            1. From within a block on a nested block
+            2. From within a BlockExpression
+            3. From the top-level method body block
+            
+            Because of 2 and 3, we may have a pending list of statements in new_stats that belong
+            to the previous block. Thus we first need to end that block, then start the new one.
+            
+            Furthermore, since the old block could be a branch target, we also must update the 
+            orig2newBlock map once we generated the first block within this flattening.
+            
+            Every block expansion starts with a call to FlattenBlock
+             The FlattenBlock stack activation frame keeps track of the prior current_oldBlock 
+             and stores the new current oldBlock.
+             At the end of FlattenBlock, the prior_oldBlock is mapped to the same new block
+             as the oldBlock on which FlattenBlock was called.
+             
+             POST: this.current_oldBlock == null.
+            </summary>
+            <param name="block"></param>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.AdjustBranches">
+            <summary>
+            Called once after we handled all blocks (by MakeFlat)
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.simplify_addressof_operand(System.Compiler.Expression)">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitThis(System.Compiler.This)">
+            <summary>
+            Unify all occurrences of This
+            </summary>
+            <param name="This"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitBase(System.Compiler.Base)">
+            <summary>
+            BIG FIXME for CCI. Base should not occur here, since it just means "this" after
+            normalization.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitConstruct(System.Compiler.Construct)">
+            <summary>
+            </summary>
+            <param name="cons">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitConstructArray(System.Compiler.ConstructArray)">
+            <summary>
+            </summary>
+            <param name="consArr">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitExpressionStatement(System.Compiler.ExpressionStatement)">
+            <summary>
+            </summary>
+            <param name="expr_stat">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitExpressionList(System.Compiler.ExpressionList)">
+            <summary>
+            </summary>
+            <param name="expressions">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitIndexer(System.Compiler.Indexer)">
+            <summary>
+            </summary>
+            <param name="indexer">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitMemberBinding(System.Compiler.MemberBinding)">
+            <summary>
+            </summary>
+            <param name="memberBinding">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitMethodCall(System.Compiler.MethodCall)">
+            <summary>
+            
+            </summary>
+            <param name="call">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitReturn(System.Compiler.Return)">
+            <summary>
+            
+            </summary>
+            <param name="Return">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitSwitchInstruction(System.Compiler.SwitchInstruction)">
+            <summary>
+            
+            </summary>
+            <param name="switchInstruction">Cloned</param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitThrow(System.Compiler.Throw)">
+            <param name="Throw">Cloned</param>
+        </member>
+        <member name="M:System.Compiler.CodeFlattener.VisitUnaryExpression(System.Compiler.UnaryExpression)">
+            <summary>
+            </summary>
+            <param name="expression">Cloned</param>
+        </member>
+        <member name="T:System.Compiler.StackVariable">
+            <summary>
+            Class for the stack variables introduced by the stack removal transformation.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackVariable.#ctor(System.Int32,System.Compiler.TypeNode)">
+            <summary>
+            Create a stack variable for a given stack depth and a specific type.
+            </summary>
+            <param name="depth"></param>
+            <param name="type"></param>
+        </member>
+        <member name="M:System.Compiler.StackVariable.NEWTemp(System.Compiler.TypeNode)">
+            <summary>
+            Bogus stack variable useful for desugaring of NEWwithCONSTRUCT.
+            We hope we'll never go beyond 50000 stack vars.  Actually, it would be great if we could analyze
+            method with >50000 stack variables !
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StackVariable.NEWValueTemp(System.Compiler.TypeNode)">
+            <summary>
+            Bogus stack variable useful for desugaring of NEWwithCONSTRUCT for Value types.
+            This variable represents the contents of the newly created value object, which does not
+            get allocated in the heap.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.FlattenerTest">
+            <summary>
+            To test the code flattener, this visitor takes a method and expands the body expressions to 
+            add a nested BlockExpression around every sub expression it encounters.
+            
+            It also adds a nested block for the first statement in each block.
+            
+            The idea is that we can then undo this expansion with the CodeFlattener.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CciHelper.IsVirtual(System.Compiler.MethodCall)">
+            <summary>
+            Predicate determines if a particular call is virtual or non virtual
+            </summary>
+            <param name="call">The call to test</param>
+            <returns>true if virtual.</returns>
+        </member>
+        <member name="M:System.Compiler.CciHelper.IsOut(System.Compiler.Parameter)">
+            <summary>
+            Checks whether a specific parameter is an "out" parameter.
+            </summary>
+            <param name="parameter">Parameter to test.</param>
+            <returns>True if "out" parameter.</returns>
+        </member>
+        <member name="M:System.Compiler.CciHelper.IsPopStatement(System.Compiler.Statement)">
+            <summary>
+            Checks whether a given CciHelper statement encodes an MSIL Pop instruction.
+            The correctness of this method depends heavily on what Herman does in the CciHelper reader ...
+            </summary>
+            <param name="stat">Statement to check.</param>
+            <returns><c>true</c> iff <c>stat</c> encodes an MSIL Pop instruction.</returns>
+        </member>
+        <member name="M:System.Compiler.CciHelper.GetThis(System.Compiler.Method)">
+            <summary>
+            Find the This node in the method body if method is an instance method.
+            </summary>
+            <param name="method">Method for which we find the This node</param>
+            <returns>The This node or null if method is not instance.</returns>
+        </member>
+        <member name="T:System.Compiler.Declarer">
+            <summary>
+            Walks the statement list of a Block gathering information from declarations for use by forward references. Does not recurse into nested blocks.
+            This visitor is instantiated and called by Looker.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Declarer.scope">
+            <summary>Maps identifiers to Metadata nodes (e.g. varDecl.Name -> field).</summary>
+        </member>
+        <member name="F:System.Compiler.Declarer.targetFor">
+            <summary>Maps labels (Identifiers) to the corresponding labeled blocks (single statements are promoted to blocks for this purpose).
+            Needed to keep local variable and labels in separate namespaces.</summary>
+        </member>
+        <member name="F:System.Compiler.Declarer.localLabels">
+            <summary>A subset of targetFor that maps only labels (Identifiers) declared in the current block. Needed to check for duplicates.</summary>
+        </member>
+        <member name="F:System.Compiler.Declarer.labelList">
+            <summary>A list of all the labels encountered by Declarer.</summary>
+        </member>
+        <member name="M:System.Compiler.Declarer.VisitBlock(System.Compiler.Block,System.Compiler.Class,System.Compiler.TrivialHashtable,System.Compiler.IdentifierList)">
+            <summary>
+            Walks the statement list of the given block gathering information from declarations for use by forward references. Does not recurse into nested blocks.
+            </summary>
+            <param name="block">The block whose declarations are to be processed</param>
+            <param name="scope">Maps identifiers to Metadata nodes (e.g. Fields).</param>
+            <param name="targetFor">Maps labels (Identifiers) to the corresponding labeled blocks (single statements are promoted to blocks for this purpose).</param>
+            <param name="labelList">A list of all the labels encountered by Declarer.</param>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.IsBetterMatch(System.Compiler.TypeNode,System.Compiler.TypeNode,System.Compiler.TypeNode)">
+            <summary>
+            Returns true if conversion from t3 to t1 exists and is better (closer) than the conversion from t3 to t2
+            Call this only if both conversions exist.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.IsBetterMatch(System.Compiler.TypeNode,System.Compiler.TypeNode,System.Compiler.TypeNode,System.Compiler.TypeViewer)">
+            <summary>
+            Returns true if conversion from t3 to t1 exists and is better (closer) than the conversion from t3 to t2
+            Call this only if both conversions exist.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.UnifiedType(System.Compiler.TypeNodeList,System.Compiler.TypeViewer)">
+            <summary>
+            Computes an upper bound in the type hierarchy for the set of argument types.
+            This upper bound is a type that all types in the list are assignable to.
+            If the types are all classes, then *the* least-upper-bound in the class
+            hierarchy is returned.
+            If the types contain at least one interface, then *a* deepest upper-bound
+            is found from the intersection of the upward closure of each type.
+            Note that if one of the types is System.Object, then that is immediately
+            returned as the unified type without further examination of the list.
+            </summary>
+            <param name="ts">A list containing the set of types from which to compute the unified type.</param>
+            <returns>The type corresponding to the least-upper-bound.</returns>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.FieldReadAsNonNull(System.Compiler.CompilerOptions,System.Compiler.Field)">
+            <summary>
+            Hook for overriding current policy of considering field reads to return non-null values
+            </summary>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.IsCompatibleWithNull(System.Compiler.TypeNode)">
+            <summary>
+            Should return false if null cannot be converted to targetType.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.ExplicitNonNullCoercion(System.Compiler.Expression,System.Compiler.TypeNode)">
+            <summary>
+            This method only handles the coercion from possibly null to non-null. It does not do any Class-Type coercions!
+            </summary>
+        </member>
+        <member name="M:System.Compiler.TypeSystem.ImplicitNonNullCoercion(System.Compiler.ErrorHandler,System.Compiler.Expression,System.Compiler.TypeNode)">
+            <summary>
+            This method only performs the non-null coercion, no other type coercions
+            </summary>
+        </member>
+        <member name="T:System.Compiler.AnalysisException">
+            <summary>
+            This is for general errors happened in the control flow graph analysis.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.compilation">
+            <summary>
+            Current compilation being analyzed.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.typeSystem">
+            <summary>
+            Type system for the compilation unit.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.debug">
+            <summary>
+            Turn the debug information on
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.debugDFA">
+            <summary>
+            Turn the detailed DFA debug information on
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.stats">
+            <summary>
+            Turn on statistics
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.analyzerDebugSymbol">
+            <summary>
+            Debugging switch.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.PreprocessorDefinedSymbols">
+            <summary>
+            Command line switches.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.NonNullChecking">
+            <summary>
+            Implications from command line switches (with defaults)
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Analyzer.cfgRepository">
+            <summary>
+            Repository that stores the CFGs that have been built.
+            
+            Since building Control Flow Graph is destructive, we need to keep it for later use.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Analyzer.GetCFG(System.Compiler.Method)">
+            <summary>
+            Get the correct CFG for the method.
+            </summary>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.Analyzer.ErrorSeverity(System.Compiler.ErrorNodeList)">
+            <summary>
+            return the level of the most severe error. 
+            </summary>
+            <param name="errors"></param>
+            <returns></returns>
+        </member>
+        <member name="F:System.Compiler.Analyzer.CodeIsWellFormed">
+            <summary>
+            True if compilation had no errors so far, meaning the trees are well formed and we 
+            can build CFGs.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Analyzer.#ctor(System.Compiler.TypeSystem,System.Compiler.Compilation)">
+            <summary>
+            Constructor.
+            </summary>
+            <param name="t">The type system for the compilation.</param>
+            <param name="c">The complication being analyzed.</param>
+        </member>
+        <member name="M:System.Compiler.Analyzer.Analyze(System.Compiler.Method)">
+            <summary>
+            Analyze the given method.
+            </summary>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.Analyzer.LanguageSpecificAnalysis(System.Compiler.Method)">
+            <summary>
+            Language specific flow analysis.
+            </summary>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.Analyzer.GeneralAnalysis(System.Compiler.Method)">
+            <summary>
+            Put general analysis targeting to general IL properties.
+            </summary>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.Analyzer.VisitMethod(System.Compiler.Method)">
+            <summary>
+            Visit each method, start the analysis.  
+            </summary>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.Passer">
+            <summary>
+            A passer is used to pass through nodes without acting on them.  All callback will
+            be called for each child node of the passed-through node.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Evaluator">
+            <summary>
+            Executes an IR, typically an expression tree, resulting in a literal node representing the computed value of the IR.
+            This class is intended for use by a debugger expression evaluator, as well as partial evaluation (constant folding) during compilation.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Environment">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PureEvaluator">
+            <summary>
+            Has no side effects on any Cci structures, just evaluates a single node if possible.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.PureEvaluator.EvalBinaryExpression(System.Compiler.Literal,System.Compiler.Literal,System.Compiler.BinaryExpression,System.Compiler.TypeSystem)">
+            <summary>
+            Tries to return the literal obtained from constant folding the binary expression whose literal arguments are given
+            by opnd1 and opnd2. If any of these are null, the result is null. If the binary expression cannot be constant folded
+            the result is also null.
+            </summary>
+            <param name="opnd1">null or literal corresponding to binary expression's 1st constant folded argument</param>
+            <param name="opnd2">null or literal corresponding to binary expression's 2nd constant folded argument</param>
+            <param name="binaryExpression">the original binary expression</param>
+            <returns>null, or constant folded literal</returns>
+        </member>
+        <member name="T:System.Compiler.Checker">
+            <summary>
+            Walk IR checking for semantic errors and repairing it so that subsequent walks need not do error checking
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Checker.AutoDereferenceCoercion(System.Compiler.Expression)">
+            <summary>
+            Can be called after VisitExpression to have expressions of type "reference"
+            be automatically dereferenced
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Checker.VisitEnsuresList(System.Compiler.EnsuresList)">
+            <summary>
+            Need to have this override so that inherited postconditions are not
+            checked again. 
+            </summary>
+            <param name="Ensures"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.Checker.CheckContractInheritance(System.Compiler.TypeNode)">
+            <summary>
+            This method checks all of the methods in a class or structure to make sure that
+            if the method implements an interface method (either explicitly or implicitly),
+            then the contract inheritance rules are not violated.
+            
+            It also introduces the default expose block around the body of whichever methods
+            should get the default.
+            </summary>
+            <param name="type">The type that will have all of its methods checked.</param>
+        </member>
+        <member name="M:System.Compiler.Checker.VisitRequiresList(System.Compiler.RequiresList)">
+            <summary>
+            Need to have this override so that inherited preconditions are not
+            checked again. 
+            </summary>
+            <param name="Requires"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.Checker.CreateProxy(System.Compiler.TypeNode,System.Compiler.Method,System.Compiler.Method)">
+            <summary>
+            Create a proxy method implementing the abstractMethod and which calls the implementingMethod.
+            This is needed when the implementingMethod is supposed to be used for the implementation
+            of the abstractMethod, but cannot be because it lives in another assembly or isn't virtual
+            or the abstractMethod has an out-of-band contract and the implementingMethod must have
+            an identical type signature (i.e., no optional type modifiers for the non-null types).
+            </summary>
+            <param name="type">The type containing the implementingMethod and to which the
+            proxy will be added as a member.</param>
+            <param name="abstractMethod">The abstract method that the proxy is an implementation of.</param>
+            <param name="implementingMethod">The implementing method that is supposed to implement
+            the abstractMethod, but is unable to for various reasons.</param>
+            <returns>The newly created proxy method.</returns>
+        </member>
+        <member name="M:System.Compiler.Checker.CheckForInterfaceImplementationsOfOutOfBandContractedMethods(System.Compiler.TypeNode)">
+            <summary>
+            If type has an explicit or implicit implementation of a method that has an out-of-band contract,
+            then need to create a proxy that has the same signature as the "real" interface
+            method and have it call the one the programmer wrote.
+            </summary>
+            <param name="type">The type whose members should be checked to find such methods.</param>
+        </member>
+        <member name="M:System.Compiler.Checker.MakeMethodVirtualIfThatWouldMakeItImplementAnInterfaceMethod(System.Compiler.Method)">
+             <summary>
+            The hidden base method may still end up implementing an interface explicitly implemented by this.currentType.
+            Prevent that by marking meth as virtual (and newslot) if that means it gets to implement a local interface method
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Checker.IsLessAccessible(System.Compiler.TypeNode,System.Compiler.TypeNode)">
+            <summary>
+            returns true if t1 is less accessible than t2
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Scoper">
+            <summary>
+            Walks a CompilationUnit and creates a scope for each namespace and each type.
+            The scopes are attached to the corresponding instances via the ScopeFor hash table.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Looker">
+            <summary>
+            Walks an IR, mutating it by replacing identifier nodes with NameBinding/Block nodes representing the
+            members/labels the identifiers resolve to, and replacing type expressions with the types they refer to.
+            Most of the logic here deals with maintaining and querying the scope chain.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Looker.scopeFor">
+            <summary>
+            Used to track the appropriate scope for each type
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Looker.VisitBaseClassReference(System.Compiler.Class,System.Boolean)">
+            <summary>
+            Turns ClassExpression Class.BaseClass into a real class, with substitution of template parameters.
+            Returns false if the ClassExpression does not bind to a class. 
+            Passing false for interfaceIsError will suppress the generation of an error message.
+            This can be used to check if the first expression in an interface list is a base class.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.IStronglyConnectedComponent">
+            <summary>
+            Interface for Strongly Connected Methods.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.IStronglyConnectedComponent.FullToString">
+            <summary>
+            Detailed text representation of <c>this</c> StronglyConnectedComponent.
+            <c>ToString</c> will return just a unique text id of the StronglyConnectedComponent,
+            while the detailed text representation will be produced by
+            <c>FullToString</c>
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:System.Compiler.IStronglyConnectedComponent.Nodes">
+            <summary>
+            Returns the nodes contained into <c>this</c> StronglyConnectedComponent.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IStronglyConnectedComponent.Size">
+            <summary>
+            Returns the number of nodes in <c>this</c> StronglyConnectedComponent.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:System.Compiler.IStronglyConnectedComponent.NextComponents">
+            <summary>
+            Returns the SCCs that are end points of the arcs that starts in
+            <c>this</c> StronglyConnectedComponent, i.e., the successors of <c>this</c> StronglyConnectedComponent in the
+            component graph. Does not contain <c>this</c> StronglyConnectedComponent.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IStronglyConnectedComponent.PreviousComponents">
+            <summary>
+            Returns the SCCs that are starting points for arcs that end
+            in <c>this</c> StronglyConnectedComponent, i.e., the predecessors of <c>this</c> StronglyConnectedComponent
+            in the component graph. Does not contain <c>this</c> StronglyConnectedComponent.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.IStronglyConnectedComponent.ContainsCycle">
+            <summary>
+            Checks whether <c>this</c> StronglyConnectedComponent is a cycle, i.e., if it has more than
+            one node or it has a single node which points to itself.  The only
+            StronglyConnectedComponent that does not contain a cycle is a StronglyConnectedComponent composed of a single node
+            which doesn't point to itself.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.StronglyConnectedComponent">
+            <summary>
+            StronglyConnectedComponent is a full implementation of the interface <c>ISCC</c>.
+            It comes with a producer static method that constructs the
+            component graph for a given graph. 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.StronglyConnectedComponent.FullToString">
+            <summary>
+            Detailed text representation of <c>this</c> StronglyConnectedComponent.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.StronglyConnectedComponent.ToString">
+            <summary>
+            Simplified text representation for debug purposes: "StronglyConnectedComponent" + numeric id.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.StronglyConnectedComponent.ConstructSCCs(System.Collections.IEnumerable,System.Compiler.IGraphNavigator)">
+            <summary>
+            Use the <c>nav</c> navigator to explore the graph rooted in the
+            objects from the <c>roots</c> set, decomposes it into strongly
+            connected components. Returns the set of strongly connected components.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Compiler">
+            <summary>
+            This class provides compilation services for various clients such as command line compilers,
+            in memory compilers hosted by some application such as Visual Studio, and CodeDom clients such
+            as ASP .NET. 
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Compiler.ConstructSymbolTable(System.Compiler.Compilation,System.Compiler.ErrorNodeList)">
+            <summary>
+            Parses all of the CompilationUnitSnippets in the given compilation, ignoring method bodies. Then resolves all type expressions.
+            The resulting types can be retrieved from the module in compilation.TargetModule. The base types, interfaces and 
+            member signatures will all be resolved and on an equal footing with imported, already compiled modules and assemblies.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Compiler.ResolveSymbolTable(System.Compiler.Compilation,System.Compiler.ErrorNodeList)">
+            <summary>
+            Resolves all type expressions in the given (already parsed) compilation.
+            The base types, interfaces and member signatures will all be on an equal footing with signatures from imported, 
+            already compiled modules and assemblies.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Compiler.UpdateSymbolTable(System.Compiler.Compilation,System.Compiler.Document,System.Compiler.Document,System.Compiler.SourceChangeList,System.Compiler.ErrorNodeList)">
+            <summary>
+            Updates the specified symbol table, substituting changedDocument for originalDocument.
+            Fires the OnSymbolTableUpdate event before returning (provided that changes occurred to member signatures).
+            </summary>
+            <param name="symbolTable">The symbol table to update or replace.</param>
+            <param name="originalDocument">The document of a CompilationUnit instance in compilation.</param>
+            <param name="changedDocument">A new version of originalDocument.</param>
+            <param name="changes">A list of the changes made to orignalDocument in order to derive changedDocument.</param>
+            <param name="errors">A list to which errors detected during the update must be added.</param>
+            <returns>The given symbol table instance, suitably updated, or a new symbol table that replaces the given table.</returns>
+        </member>
+        <member name="M:System.Compiler.Compiler.UpdateSymbolTable(System.Compiler.Compilation,System.Compiler.Compilation,System.Compiler.Compilation,System.Compiler.MemberList,System.Compiler.ErrorNodeList)">
+            <summary>
+            Updates the specified symbol table, given a list of changed members from another Compilation instance
+            on which it has a dependency. Does nothing if the symbol table does not refer to any of the changed members.
+            Fires the OnSymbolTableUpdate event before returning (provided that changes occurred to member signatures).
+            </summary>
+            <param name="symbolTable">The symbol table to update or replace.</param>
+            <param name="originalReference">The compilation instance to which the given symbol table currently refers.</param>
+            <param name="changedReference">The compilation instance to which the updated symbol table must refer to instead of to originalReference.</param>
+            <param name="changedMembers">A list of the members defined in originalReference that have changed.</param>
+            <param name="errors">A list to which errors detected during the update must be added.</param>
+            <returns>The given symbol table instance, suitably updated, or a new symbol table that replaces the given table.</returns>
+        </member>
+        <member name="M:System.Compiler.Compiler.ApplyDefaultContractAssemblies(System.Compiler.Module)">
+            <summary>
+            For each referenced assembly Xyz, looks for a contract assembly named Xyz.Contracts.dll in our installation directory.
+            Also looks in the same directory as Xyz (just like the xml and pdb files are looked for automatically)
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Compiler.SaveCompilation(System.Compiler.Compilation,System.Compiler.Module,System.CodeDom.Compiler.CompilerParameters,System.CodeDom.Compiler.CompilerResults)">
+            <summary>
+            Provides a hook to save things other than just the module.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Compiler.CompileParseTree(System.Compiler.Compilation,System.Compiler.ErrorNodeList)">
+            <summary>
+            Translates the given parse tree into a normalized form that is suitable for writing out as CLI IL.
+            This translation process is normally accomplished
+            by a series of visitors that are language specific derivations of base class visitors provided by
+            the Cci code generation framework. The base Compiler class does not call the visitors directly, in
+            order to provide language implementations with the opportunity to add or replace visitors.
+            </summary>
+            <param name="compilation">An IR tree that represents the parse tree for the entire compilation.</param>
+            <param name="errorNodes">Errors encountered during the compilation are appended to this list.</param>
+        </member>
+        <member name="M:System.Compiler.Compiler.CompileParseTree(System.Compiler.Node,System.Compiler.Scope,System.Compiler.Module,System.Compiler.ErrorNodeList)">
+            <summary>
+            Translates the given parse tree node into a corresponding normalized node.
+            If the node is a type node or contains type nodes, the normalized versions of the type nodes
+            are added to the target module. Expected to be mainly useful for compiling expressions. 
+            </summary>
+            <param name="node">An IR tree that represents a parse tree</param>
+            <param name="scope">A symbol table for resolving free variables in the parse tree</param>
+            <param name="targetModule">A module to which types found in the IR tree are added</param>
+            <param name="errorNodes">Errors encountered during the compilation should be appended to this list</param>
+        </member>
+        <member name="E:System.Compiler.Compiler.OnSymbolTableUpdate">
+            <summary>
+            This event happens just before UpdateSymbolTable returns, provided that UpdateSymbolTable made any changes.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Compiler.SymbolTableUpdateEventHandler">
+            <summary>
+            Called when a symbol table has been updated. The updateSpecification argument specifies how
+            the original Compilation instance (symbol table) differs from the updated symbol table. The changedMembers argument
+            provides a list of all member signatures that have changed as a result of the recompilation.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ExposureState">
+            <summary>
+            Exposure states for variables and Objects.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureState.AssignAVal(System.Compiler.Variable,System.Compiler.ExposureState.Lattice.AVal)">
+            <summary>
+            Set v to a new value that is abstracted by av
+            </summary>
+            <param name="v"></param>
+            <param name="av"></param>
+        </member>
+        <member name="M:System.Compiler.ExposureState.AssumeExposed(System.Compiler.ISymValue)">
+            <summary>
+            Adds assumption that sv is exposed
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureState.AssumeNotExposed(System.Compiler.ISymValue)">
+            <summary>
+            Adds assumption that sv is not exposed
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureState.HavocHeap">
+            <summary>
+            Assume all accessible locations in the heap are modified.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureState.Join(System.Compiler.ExposureState,System.Compiler.ExposureState,System.Compiler.CfgBlock)">
+            <summary>
+            Returns null, if result of Join is the same as atMerge.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureState.AssumeFalse(System.Compiler.ISymValue,System.Compiler.ExposureState@)">
+            <summary>
+            Refines the given state according to the knowledge stored in the egraph about sv
+            
+            In addition, the state can be null when the knowledge is inconsistent.
+            </summary>
+            <param name="cv">symbolic value we assume to be false</param>
+        </member>
+        <member name="M:System.Compiler.ExposureState.AssumeTrue(System.Compiler.ISymValue,System.Compiler.ExposureState@)">
+            <summary>
+            Refines the given state according to the knowledge stored in the egraph about sv
+            
+            In addition, the state can be null when the knowledge is inconsistent.
+            </summary>
+            <param name="cv">symbolic value we assume to be non-null (true)</param>
+            <param name="state">state if sv is non-null (true)</param>
+        </member>
+        <member name="T:System.Compiler.ExposureState.Lattice.AVal">
+            <summary>
+            Ordering:
+            
+                         Top
+                        /    \
+                       /      \
+                      /        \
+                  IsExposed IsNotExposed
+                      \        /
+                       \      /
+                        \    /
+                        Bottom
+            
+            IsExposed lt Top
+            IsNotExposed lt Top
+            Bottom lt IsExposed
+            Bottom lt IsNotExposed
+            
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ExposureChecker">
+            <summary>
+            The main class for NonNull checking.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.ExposureChecker.iVisitor">
+            <summary>
+            Current Exposure checking visitor
+            </summary>
+        </member>
+        <member name="F:System.Compiler.ExposureChecker.currBlock">
+            <summary>
+            Current block being analyzed.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureChecker.Check(System.Compiler.TypeSystem,System.Compiler.Method,System.Compiler.Analyzer)">
+            <summary>
+            Entry point to check a method.
+            </summary>
+            <param name="t"></param>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.ExposureChecker.#ctor(System.Compiler.TypeSystem,System.Compiler.Method)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="t"></param>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.ExposureChecker.Merge(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState,System.Compiler.IDataFlowState,System.Boolean@,System.Boolean@)">
+            <summary>
+            Merge the two states for current block.
+            </summary>
+            <param name="previous"></param>
+            <param name="joinPoint"></param>
+            <param name="atMerge"></param>
+            <param name="incoming"></param>
+            <param name="resultDiffersFromPreviousMerge"></param>
+            <param name="mergeIsPrecise"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ExposureChecker.VisitBlock(System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Implementation of visit Block. It is called from run.
+            
+            It calls VisitStatement.
+            </summary>
+            <param name="block"></param>
+            <param name="stateOnEntry"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ExposureChecker.VisitStatement(System.Compiler.CfgBlock,System.Compiler.Statement,System.Compiler.IDataFlowState)">
+            <summary>
+            It visits an individual statement. It is called from VisitBlock.
+            
+            It calls NonNullInstructionVisitor
+            </summary>
+            <param name="block"></param>
+            <param name="statement"></param>
+            <param name="dfstate"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ExposureChecker.SplitExceptions(System.Compiler.CfgBlock,System.Compiler.IDataFlowState@,System.Compiler.IDataFlowState@)">
+            <summary>
+            It split exceptions for current handler and the next chained handler.
+            
+            It will:
+            
+              If the exception is completely intercepted by current handler, the
+              exception will be consumed.
+              
+              If the exception caught but not completely, both current handler and 
+              the next handler will take the states.
+              
+              If the exception is irrelevant to current caught, the next handler 
+              will take over the state. Current handler is then bypassed.
+            </summary>
+            <param name="handler"></param>
+            <param name="currentHandlerState"></param>
+            <param name="nextHandlerState"></param>
+        </member>
+        <member name="T:System.Compiler.ExposureInstructionVisitor">
+            <summary>
+            Visit each instruction, check whether the modification is authorized.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.ExposureInstructionVisitor.ExposureChecker">
+            <summary>
+            Current ExposureChecker
+            </summary>
+        </member>
+        <member name="F:System.Compiler.ExposureInstructionVisitor.reportedErrors">
+            <summary>
+            Used to avoid repeated error/warning report for the same Node.
+            
+            Important: This is absolutely necessary, since we are doing fix-point
+            Analysis. Bypass this sometimes means hundred's of the same error messages.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.HandleError(System.Compiler.Statement,System.Compiler.Node,System.Compiler.Error,System.String[])">
+            <summary>
+            Error handler. Only file an error if it has not been filed yet. 
+            
+            Requires: the node has proper source context. Otherwise, it does not help.
+            </summary>
+            <param name="stat"></param>
+            <param name="node"></param>
+            <param name="error"></param>
+            <param name="m"></param>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.CheckReceiver(System.Compiler.Statement,System.Compiler.Variable,System.Compiler.ExposureState)">
+            <summary>
+            For the possible receiver v, check if it is nonnull. if no, file an proper
+            error/warning.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.DefaultVisit(System.Compiler.Statement,System.Object)">
+            <summary>
+            A lot of the pointers are not supported.
+            </summary>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.VisitMethodEntry(System.Compiler.Method,System.Collections.IEnumerable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Method entry. Need to add This pointer. 
+            
+            Does not have to deal with parameters.
+            </summary>
+            <param name="method"></param>
+            <param name="parameters"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.VisitCopy(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Copy the source to dest.
+            
+            If source is nonnull, no problem.
+            If source is null and dest is nonnulltype, Error
+            If source is possible null and dest is nonnulltype, warning.
+            Else, nothing.
+            
+            Need to maintain proper heap transformation.
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.VisitCastClass(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Note: casts don't require a non-null argument. null value casts always succeed.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.VisitStoreElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Perform 2 checks
+            1) array is non-null
+            2) if array element type is non-null type, then the new value written must be too.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ExposureInstructionVisitor.VisitSwitchCaseBottom(System.Compiler.Statement,System.Object)">
+            <summary>
+            Shouldn't reach this point. The error is handled by the definite assignment analysis. So
+            here we treat it as assume(false)
+            </summary>
+        </member>
+        <member name="T:System.Compiler.PathWrapper">
+            <summary>
+            A version of System.IO.Path that does not throw exceptions.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Partitioner">
+            <summary>
+            Partitions IR into separate composition regions
+            Composers are compiler extensions that are given responsibility for individual regions
+            </summary>
+        </member>
+        <member name="M:System.Compiler.INonNullState.IsNull(System.Compiler.Variable)">
+            <summary>
+            If variable is not a reference type, the nullness applies to the variable itself.
+            If it is a Reference type however, the nullness applies to the contents of the reference.
+            </summary>
+            <param name="v"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.INonNullState.IsNonNull(System.Compiler.Variable)">
+            <summary>
+            If variable is not a reference type, the nullness applies to the variable itself.
+            If it is a Reference type however, the nullness applies to the contents of the reference.
+            </summary>
+            <param name="v"></param>
+            <returns></returns>
+        </member>
+        <member name="T:System.Compiler.INonNullInformation">
+            <summary>
+            Exposes computed non-null information for a method
+            </summary>
+        </member>
+        <member name="M:System.Compiler.INonNullInformation.OnEdge(System.Compiler.CfgBlock,System.Compiler.CfgBlock)">
+            <summary>
+            Provides the non-null information for the state on edge (from, to)
+            </summary>
+        </member>
+        <member name="T:System.Compiler.NonNullState">
+            <summary>
+            NonNull states for variables and Objects.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.TryValueValue(System.Compiler.Variable)">
+            <summary>
+            For indirect pointers (refs)
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.NullVariableSet(System.Compiler.IFunctionalSet@)">
+            <summary>
+            Returns a set of definitely null variables and a set of definitely non-null variables
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.AssignAVal(System.Compiler.Variable,System.Compiler.NonNullState.Lattice.AVal)">
+            <summary>
+            Set v to a new value that is abstracted by av
+            </summary>
+            <param name="v"></param>
+            <param name="av"></param>
+        </member>
+        <member name="M:System.Compiler.NonNullState.AssumeNull(System.Compiler.ISymValue)">
+            <summary>
+            Adds assumption that sv == null
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.AssumeNull(System.Compiler.Variable)">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.AssumeNonNull(System.Compiler.Variable)">
+            <summary>
+            Adds assumption that v != null
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.IsNonNullType(System.Compiler.TypeNode)">
+            <summary>
+            Check whether a given object is of nonnull type. It will check:
+            Variable, Field, return type of Method.
+            </summary>
+            <param name="t"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullState.HavocHeap">
+            <summary>
+            Assume all accessible locations in the heap are modified.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.Join(System.Compiler.NonNullState,System.Compiler.NonNullState,System.Compiler.CfgBlock)">
+            <summary>
+            Returns null, if result of Join is the same as atMerge.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullState.AssumeFalse(System.Compiler.ISymValue,System.Compiler.NonNullState@)">
+            <summary>
+            Refines the given state according to the knowledge stored in the egraph about sv
+            
+            In addition, the state can be null when the knowledge is inconsistent.
+            </summary>
+            <param name="cv">symbolic value we assume to be null (false)</param>
+        </member>
+        <member name="M:System.Compiler.NonNullState.AssumeTrue(System.Compiler.ISymValue,System.Compiler.NonNullState@)">
+            <summary>
+            Refines the given state according to the knowledge stored in the egraph about sv
+            
+            In addition, the state can be null when the knowledge is inconsistent.
+            </summary>
+            <param name="cv">symbolic value we assume to be non-null (true)</param>
+            <param name="state">state if sv is non-null (true)</param>
+        </member>
+        <member name="M:System.Compiler.NonNullState.HavocIndirect(System.Compiler.Variable,System.Compiler.Reference)">
+            <summary>
+            Havoc the contents of the pointed to locations, but 
+            if non-null, reestablish that invariant.
+            </summary>
+            <param name="pointer"></param>
+            <param name="type"></param>
+        </member>
+        <member name="T:System.Compiler.NonNullState.Lattice.AVal">
+            <summary>
+            Ordering:
+            
+              A lt B   iff
+              
+              !A.NonNull implies !B.NonNull
+              
+            </summary>
+        </member>
+        <member name="T:System.Compiler.NonNullChecker">
+            <summary>
+            The main class for NonNull checking.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.NonNullChecker.iVisitor">
+            <summary>
+            Current NonNull checking visitor
+            </summary>
+        </member>
+        <member name="F:System.Compiler.NonNullChecker.currBlock">
+            <summary>
+            Current block being analyzed.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.NonNullChecker.reportedErrors">
+            <summary>
+            Used to avoid repeated error/warning report for the same Node.
+            
+            Important: This is absolutely necessary, since we are doing fix-point
+            Analysis. Bypass this sometimes means hundred's of the same error messages.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.HandleError(System.Compiler.Statement,System.Compiler.Node,System.Compiler.Error,System.String[])">
+            <summary>
+            Error handler. Only file an error if it has not been filed yet. 
+            
+            Requires: the node has proper source context. Otherwise, it does not help.
+            </summary>
+            <param name="stat"></param>
+            <param name="node"></param>
+            <param name="error"></param>
+            <param name="m"></param>
+        </member>
+        <member name="F:System.Compiler.NonNullChecker.eliminateCheck">
+            <summary>
+            This map keeps track of which expression statements representing a non null assertion check can
+            be eliminated. Statements not in the map cannot be eliminated, others according to the stored value.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.Check(System.Compiler.TypeSystem,System.Compiler.Method,System.Compiler.Analyzer)">
+            <summary>
+            Entry point to check a method.
+            </summary>
+            <param name="t"></param>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.#ctor(System.Compiler.TypeSystem,System.Compiler.Method,System.Compiler.Analyzer)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="t"></param>
+            <param name="method"></param>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.Merge(System.Compiler.CfgBlock,System.Compiler.CfgBlock,System.Compiler.IDataFlowState,System.Compiler.IDataFlowState,System.Boolean@,System.Boolean@)">
+            <summary>
+            Merge the two states for current block.
+            </summary>
+            <param name="previous"></param>
+            <param name="joinPoint"></param>
+            <param name="atMerge"></param>
+            <param name="incoming"></param>
+            <param name="resultDiffersFromPreviousMerge"></param>
+            <param name="mergeIsPrecise"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.VisitBlock(System.Compiler.CfgBlock,System.Compiler.IDataFlowState)">
+            <summary>
+            Implementation of visit Block. It is called from run.
+            
+            It calls VisitStatement.
+            </summary>
+            <param name="block"></param>
+            <param name="stateOnEntry"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.VisitStatement(System.Compiler.CfgBlock,System.Compiler.Statement,System.Compiler.IDataFlowState)">
+            <summary>
+            It visit individual statement. It is called from VisitBlock.
+            
+            It will call NonNullInstructionVisitor
+            </summary>
+            <param name="block"></param>
+            <param name="statement"></param>
+            <param name="dfstate"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullChecker.SplitExceptions(System.Compiler.CfgBlock,System.Compiler.IDataFlowState@,System.Compiler.IDataFlowState@)">
+            <summary>
+            It split exceptions for current handler and the next chained handler.
+            
+            It will:
+            
+              If the exception is completely intercepted by current handler, the
+              exception will be consumed.
+              
+              If the exception caught but not completely, both current handler and 
+              the next handler will take the states.
+              
+              If the exception is irrelevant to current caught, the next handler 
+              will take over the state. Current handler is then bypassed.
+            </summary>
+            <param name="handler"></param>
+            <param name="currentHandlerState"></param>
+            <param name="nextHandlerState"></param>
+        </member>
+        <member name="T:System.Compiler.NonNullInstructionVisitor">
+            <summary>
+            Visit each instruction, check whether the modification is authorized.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.NonNullInstructionVisitor.NNChecker">
+            <summary>
+            Current NonNullChecker
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.CheckReceiver(System.Compiler.Statement,System.Compiler.Variable,System.Compiler.NonNullState)">
+            <summary>
+            For the possible receiver v, check if it is nonnull. if no, file an proper
+            error/warning.
+            </summary>
+            
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.#ctor(System.Compiler.NonNullChecker)">
+            <summary>
+            Constructor.
+            </summary>
+            <param name="c"></param>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.DefaultVisit(System.Compiler.Statement,System.Object)">
+            <summary>
+            A lot of the pointers are not supported.
+            </summary>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.VisitMethodEntry(System.Compiler.Method,System.Collections.IEnumerable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Method entry. Need to add This pointer. 
+            
+            Does not have to deal with parameters.
+            </summary>
+            <param name="method"></param>
+            <param name="parameters"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.VisitCopy(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Copy the source to dest.
+            
+            If source is nonnull, no problem.
+            If source is null and dest is nonnulltype, Error
+            If source is possible null and dest is nonnulltype, warning.
+            Else, nothing.
+            
+            Need to maintain proper heap transformation.
+            </summary>
+            <param name="dest"></param>
+            <param name="source"></param>
+            <param name="stat"></param>
+            <param name="arg"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.VisitCastClass(System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Variable,System.Compiler.Statement,System.Object)">
+            <summary>
+            Note: casts don't require a non-null argument. null value casts always succeed.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.IsAssertionMethodThatDoesNotReturn(System.Compiler.Method)">
+            <summary>
+            The checker assumes that all methods in AssertHelpers that have a boolean as their
+            first argument are assertions that are called with false and will not return.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.VisitStoreElement(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Perform 2 checks
+            1) array is non-null
+            2) if array element type is non-null type, then the new value written must be too.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.VisitSwitchCaseBottom(System.Compiler.Statement,System.Object)">
+            <summary>
+            Shouldn't reach this point. The error is handled by the definite assignment analysis. So
+            here we treat it as assume(false)
+            </summary>
+        </member>
+        <member name="M:System.Compiler.NonNullInstructionVisitor.VisitLoadIndirect(System.Compiler.Variable,System.Compiler.Variable,System.Compiler.TypeNode,System.Compiler.Statement,System.Object)">
+            <summary>
+            Note that the type argument is the element type, or the type of the result of the load.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Resolver">
+            <summary>
+            Walks an IR, mutating it by resolving overloads and inferring expression result types
+            Following this, all Indexers, NameBindings, QualifiedIdentifiers and non built-in operators have been replaced by MemberBindings or MethodCalls 
+            and every expression has its Type field filled in.
+            (Exception 1: Indexers whose objects are tuples or single dimensional zero based arrays are not replaced.)
+            (Exception 2: When resolution fails the NameBindings and QualifiedIdentifiers are not replaced. Checker uses them to generate appropriate errors.)
+            </summary>
+        </member>
+        <member name="F:System.Compiler.Resolver.insideAssertion">
+            <summary>
+            Are we inside an assert statement, assume statement, loop invariant, requires clause, or ensures clause, but not in an object invariant?
+            </summary>
+        </member>
+        <member name="M:System.Compiler.Resolver.InferMethodTemplateArguments(System.Compiler.TypeNode,System.Compiler.MemberBinding,System.Compiler.TypeNode,System.Compiler.TrivialHashtable)">
+            <summary>
+            We pass the argument expression in case we are dealing with an implicit delegate construction
+            </summary>
+            <param name="argExpr">This is the actual argument expression</param>
+        </member>
+        <member name="M:System.Compiler.Resolver.GetBestMatch(System.Compiler.MemberList,System.Compiler.ExpressionList,System.Compiler.TypeNode[],System.Compiler.TypeNodeList,System.Compiler.Member,System.Compiler.TypeNode@)">
+            <summary>
+            Go through eligible members (+ bestSoFar) returning the one with the best match to argTypes.
+            Returns null if there is no single best match. Sets bestParamTypes to a signature
+            that any other member (from a base class) has to equal or better to best overall.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.CfgBlock">
+            <summary>
+            A refinement of blocks that the code flattener produces (single entry, single exit at end)
+            
+            The block also serves to cache various information once we build the CFG.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CfgBlock.HandlersMatching(System.Compiler.TypeNode)">
+            <summary>
+            Returns a list of CfgBlock that are handlers of the current block, handling an exception
+            of the given type, or a subtype thereof.
+            </summary>
+            <param name="exception">Type of exception thrown. It is assumed that any actual subtype could be thrown</param>
+            <returns>All handlers that could apply directly to this exception.
+             In addition, if the method might not handle it, then the ExceptionExit block is
+            part of this list.</returns>
+        </member>
+        <member name="M:System.Compiler.CfgBlock.BeginSourceContext">
+            <summary>
+            Returns best effort node with source context for the beginning of the block
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CfgBlock.EndSourceContext">
+            <summary>
+            Returns best effort node with source context for the beginning of the block
+            </summary>
+        </member>
+        <member name="P:System.Compiler.CfgBlock.Index">
+            <summary>
+            Returns an index of 0..n of this block within the CFG it is part of.
+            
+            Allows using arrays as tables indexed by blocks.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.CfgBlock.StackDepth">
+            <summary>
+            Returns the stack depth at the beginning of the block
+            </summary>
+        </member>
+        <member name="P:System.Compiler.CfgBlock.Item(System.Int32)">
+            <summary>
+            Return statement in block.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.CfgBlock.Length">
+            <summary>
+            Returns number of statements in block
+            </summary>
+        </member>
+        <member name="T:System.Compiler.CfgCachingFactory">
+            <summary>
+            <c>ICFGFactory</c> with caching.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.CfgCachingFactory.ComputeControlFlowGraph(System.Compiler.Method)">
+            <summary>
+            Get the CFG for a method.  Results are cached, so getting the CFG for the same
+            method twice will return the same CFG object.
+            </summary>
+            <param name="method">Method whose CFG we want to get.</param>
+            <returns>CFG for <c>method</c>; cached.</returns>
+        </member>
+        <member name="M:System.Compiler.CfgCachingFactory.Flush(System.Compiler.Method)">
+            <summary>
+            Flushes the CFG for <c>method</c> from the internal cache.
+            </summary>
+            <param name="method">Method whose CFG we want to flush from the cache.</param>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph">
+            <summary>
+            	/// Control Flow Graph (CFG) for a method.  The CFG is an extra layer on top of
+            the CCI representation; all the CFG related information (flow edges) is maintained into
+            the CFG object.  Both the normal and the exceptional flows are modeled by the CFG.
+            
+            <p>THE UNDERLYING CCI REPRESENTATION IS MUTATED *A LOT* BY THE "FINALLY" BLOCK DUPLICATION
+            AND THE STACK REMOVAL TRANSFORMATION.  YOU SHOULD MANUALLY CLONE IT BEFORE CONSTRUCTING
+            THE CFG IF YOU NEED IT; E.G, IF YOU NEED TO WRITE THE CODE BACK TO DISK.  CFG IS USED FOR
+            PROGRAM ANALYSIS ONLY, NOT FOR CODE GENERATION.</p>
+            
+            <p>A Control Flow Graph is basically an oriented graph whose nodes are the
+            basic blocks from the method body; the edges reflect the normal and the exceptional flow
+            of control (the exceptional flow is the flow that occurs when an exception is raised).
+            In addition to the basic blocks of the original method, three more blocks are added:</p>
+            
+            <ul>
+            <li>a special <c>CFG.NormalExitBlock</c> that is a successor for all the basic block
+            terminated in a return instruction; it is a merge point for all the
+            paths on the normal (intra-procedural) control flow.</li>
+            <li>a special <c>CFG.ExcpExitBlock</c> that is the default handler for all the uncaught
+            exceptions; it is a merge point for all the paths on the intra-procedural execution
+            paths that may terminate with an uncaught exception.</li>
+            <li>a special <c>CFG.ExitBlock</c> that is the only successor of the aforementioned
+            normal and the exception exit.  Its only normal flow predecessor is the special block
+            for the normal exit and its only exceptional flow predecessor is the special block
+            for the exceptional exit. </li>
+            </ul>
+            
+            <p>
+            If you are given a block and want to know if it's the [normal/excp] exit of its
+            method, all you have to do is use the appropriate "is" test
+            (e.g. "block is CFG.NormalExitBlock"). If you have the CFG, and want to know its
+            [normal/excp] exit, you just have to query the appropriate method.</p>
+            
+            <p>
+            NOTE:
+            If an analysis is interested in the result for the normal flow, then it can retrieve
+            the result of the dataflow equations for the normal exit point. Similarly, if an analysis
+            is interested in the result for the exceptional flow, then it can retrieve the result
+            of the dataflow equations for the exceptional exit point.  Finally, if the distinction between
+            normal/exceptional flow is not important, the "unified" exit point can be used instead.</p>
+            
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.#ctor(System.Compiler.Method,System.Boolean,System.Boolean,System.Boolean)">
+            <summary>
+            Constructs the Control Flow Graph for <c>method</c>.
+            If the code for <c>method</c> is unavailable, throw an <c>UnavailableCodeException</c>
+            (a constructor cannot return an error code).  If the code for <c>method</c> is empty
+            (abstract method), thrown a <c>NoCodeException</c>.  Otherwise, examine the CciHelper
+            representation of the method code and construct the CFG.
+            </summary>
+            <param name="method">Method whose CFG will be constructed.</param>
+            <param name="duplicateFinallyBlocks">If <c>true</c>, the finally blocks will be duplicated and you'll obtain a real
+            CFG.  Otherwise, you'll have to manually deal with the finally blocks that are traversed by each
+            "leave" instruction.  HIGHLY RECOMMENDED!</param>
+            <param name="eliminateEvaluationStack">If <c>true</c>, <c>StackRemovalTransf.Process</c> will be called
+            to remove the stack manipulating operations. See more commends in the class
+            <c>StackRemovalTransf</c>. RECOMMENDED!</param>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.#ctor(System.Compiler.Method,System.Boolean,System.Boolean,System.Boolean,System.Boolean)">
+            <summary>
+            Constructs the Control Flow Graph for <c>method</c>.
+            If the code for <c>method</c> is unavailable, throw an <c>UnavailableCodeException</c>
+            (a constructor cannot return an error code).  If the code for <c>method</c> is empty
+            (abstract method), thrown a <c>NoCodeException</c>.  Otherwise, examine the CciHelper
+            representation of the method code and construct the CFG.
+            </summary>
+            <param name="method">Method whose CFG will be constructed.</param>
+            <param name="duplicateFinallyBlocks">If <c>true</c>, the finally blocks will be duplicated and you'll obtain a real
+            CFG.  Otherwise, you'll have to manually deal with the finally blocks that are traversed by each
+            "leave" instruction.  HIGHLY RECOMMENDED!</param>
+            <param name="eliminateEvaluationStack">If <c>true</c>, <c>StackRemovalTransf.Process</c> will be called
+            to remove the stack manipulating operations. See more commends in the class
+            <c>StackRemovalTransf</c>. RECOMMENDED!</param>
+            <param name="constantFoldBranches">When <c>true</c>, use constant folding 
+            to prune infeasible branches.</param>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.#ctor(System.Compiler.Method)">
+            <summary>
+            Convenient CFG constructor: by default, the finally blocks are duplicated to obtain
+            a real CFG, the stack removal transformation is applied, and constant-folding for
+            branches is done.
+            </summary>
+            <param name="method">Method whose CFG is produced.</param>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.#ctor(System.Compiler.Method,System.Boolean)">
+            <summary>
+            Convenient CFG constructor: by default, the finally blocks are duplicated to obtain
+            a real CFG and the stack removal transformation is applied.
+            </summary>
+            <param name="method">Method whose CFG is produced.</param>
+            <param name="constantFoldBranches">When true, prune infeasible paths
+            due to branch conditions that are constants.</param>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.AddCatchStatements(System.Collections.IEnumerable,System.Collections.IList)">
+            <summary>
+            Add explicit Catch statements at beginning of each catch handler.
+            If a Catch handler has a next handler that differs from the ExceptionHandler enclosing the handler block, then we split 
+            the Catch statement into a separate block.
+            
+            Special case for Finally handlers that have been turned into catch handlers by the finally-elimination:
+            - Move the special instruction FINALLYVARPREFIX&lt;n&gt; = pop() to the header.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.BuildContinuationMap(System.Compiler.CfgBlock[])">
+            <summary>
+            Construct a continuation description for each block
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.examine_real_excp_flow(System.Compiler.Method,System.Compiler.ExceptionHandlerList,System.Compiler.StatementList,System.Collections.IList@)">
+            <summary>
+            Computes the ExceptionHandler for each block and the chaining of exception handlers.
+            Note: 
+              Filter handlers are currently treated as starting at the filter expression
+              and the endfilter is like a fall through into the actual handler.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.Blocks">
+            <summary>
+            Returns an array containing all the blocks from this CFG.
+            You should never mutate this array.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.ContainingBlock(System.Compiler.Statement)">
+            <summary>
+            If statement is part of this CFG, returns the containing block, otherwise null
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.SortedSCCs">
+            <summary>
+            Returns the topologically sorted list of the strongly connected components of blocks
+            (according to the control flow).  The first SCC in the returned list is the one that
+            contains the method entry block.
+            </summary>
+            <returns>Top-sort list of SCCs of blocks from <c>this</c> CFG (method entry first).</returns>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.Succ(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the successors of <c>block</c> on both normal and exceptional flow.
+            Iterating over the returned <c>IEnumerable</c> is equivalent to iterating first
+            over the normal successors and next over the exception flow successors.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.NormalSucc(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the normal successors of <c>block</c>.
+            You should never mutate this array.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.ExceptionHandler(System.Compiler.Block)">
+            <summary>
+            Returns the closest enclosing handler of a particular block
+            where control goes if an exception is raised inside <c>block</c>.  
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.Pred(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the predecessors of <c>block</c> on both normal and exceptional flow.
+            Iterating over the returned <c>IEnumerable</c> is equivalent to iterating first
+            over the normal predecessors and next over the exception flow predecessors.
+            </summary>
+            <param name="block"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.NormalPred(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the normal predecessors of <c>block</c>.
+            You should never mutate the returned array.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.ExcpPred(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the predecessors of <c>block</c> on the exceptional flow of control.
+            In C# terms, if <c>block</c> is the beginning of an exception handler, these are
+            the blocks protected by that exception handler.  Otherwise, this array has
+            length 0.
+            You should never mutate the returned array.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.ExcpSucc(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the successor of <c>block</c> on the exceptional flow of control.
+            You should never mutate the returned array.
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.HandlerThatStartsAtBlock(System.Compiler.Block)">
+            <summary>
+            Returns the ExceptionHandler that starts at <c>block</c>, if any; null otherwise.
+            This is useful when trying to see what kind of exceptions can arrive in <c>block</c>
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.HandlerContainingBlock(System.Compiler.CfgBlock)">
+            <summary>
+            Useful for finding which handler a block belongs to. This may be needed for
+            determining rethrow information.
+            </summary>
+            <remarks>This is NOT the handler protecting the block!</remarks>
+            <param name="block"></param>
+            <returns>Start block of handler containing the given block. Otherwise null,
+            if given block is not part of any handler.</returns>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.FinallyCloningChain(System.Compiler.CfgBlock)">
+             <summary>
+             FOR DEBUG ONLY:
+             <p>
+             Returns the list of "leave" instructions whose processing created a specific block.
+             Returns an empty <c>IEnumerable</c> if an original block (not a clone) is sent as
+             argument.  In the enumeration, the innermost leave instructions come first.</p>
+            
+             Returns <c>null</c> if block is not a clone.
+             
+             NOTE: as we don't have source context info for branching instructions, we manipulate
+             the blocks of the leave's instead of the leave instructions themselves.
+             </summary>
+             <param name="block"></param>
+             <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.OrigBlock(System.Compiler.CfgBlock)">
+            <summary>
+            FOR DEBUG ONLY:
+            <p/>
+            Returns the original block that, possibly through some cloning, produced a specific block.
+            Transitively walks over the copy2orig map until the original block is found.  Acts as an
+            identity function for an original block.
+            </summary>
+            <param name="block"></param>
+            <returns></returns>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.IsDead(System.Compiler.CfgBlock)">
+            <summary>
+            Block is unreachable from entry
+            </summary>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.StackDepth(System.Compiler.CfgBlock)">
+            <summary>
+            Returns the stack depth at the beginning of block <c>block</c>.
+            </summary>
+            <param name="block">Block that we are interested in.</param>
+            <returns>Stack depth at the beginning of <c>block</c>.</returns>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.Display(System.IO.TextWriter)">
+            <summary>
+            Simplified CFG pretty printer: all the info printers are set to null.
+            </summary>
+            <param name="tw"></param>
+        </member>
+        <member name="M:System.Compiler.ControlFlowGraph.Display(System.IO.TextWriter,System.Compiler.CfgBlock[],System.Compiler.DGetBlockInfo,System.Compiler.DGetBlockInfo,System.Compiler.DGetStatInfo)">
+            <summary>
+            CFG pretty-printer.  For each block, this method
+            calls <c>pre_printer</c>c(if non-null),
+            prints the normal/excp. successors,
+            the code of the block, the normal/excp. predecessors and finally calls
+            <c>post_printer</c>.  A useful use of the pre and post printers is the
+            debugging of a flow-sensitive analysis.
+            </summary>
+            <param name="tw">Where to print.</param>
+        </member>
+        <member name="P:System.Compiler.ControlFlowGraph.Entry">
+            <summary>
+            Return the entry point of this CFG.  This is the point where the execution
+            of the underlying method starts.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.ControlFlowGraph.Exit">
+            <summary>
+            Return the special block for the exit point of this CFG.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.ControlFlowGraph.NormalExit">
+            <summary>
+            Return the special block for the normal exit of this CFG.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.ControlFlowGraph.ExceptionExit">
+            <summary>
+            Return the special block for the exceptional exit of this CFG.
+            </summary>
+        </member>
+        <member name="P:System.Compiler.ControlFlowGraph.BlockCount">
+            <summary>
+            Return the total number of blocks in this CFG
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph.UnavailableCodeException">
+            <summary>
+            Exception thrown when trying to construct the CFG
+            of a method whose code is unavailable.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph.UnsupportedCodeException">
+            <summary>
+            Exception thrown when trying to construct the CFG
+            of a method whose code contains some unsupported features,
+            e.g. Filter exception handlers.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph.NoCodeException">
+            <summary>
+            Exception thrown when trying to construct the CFG
+            of a method without code (e.g., abstract methods).
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph.FinallyBlockDuplicator.SpecialBranch">
+            <summary>
+            When we duplicate a finally body and graft it into the normal path,
+            the jump that goes to this new code must remain a 'leave' rather
+            than a 'branch', because we must retain the semantics that 'leave'
+            clears the evaluation stack before jumping. However, to correctly
+            do recursive copies (i.e. try/finally inside a finally), we need
+            to remember that these leaves are not actual leaves. To mark them,
+            we derive a new class from Branch and use an 'is' test to look for 
+            this class.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph.ISpecialBlock">
+            <summary>
+            "Marker" interface: only the three artificial blocks introduced by the CFG implement it.
+            You should not try to implement it in any of your classes.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.ControlFlowGraph.Continuation">
+            <summary>
+            Captures how a block continues. Currently only for normal control flow.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.MethodHeader">
+            <summary>
+            Special statement to identify the starting point of a method.
+            This is the definition point for all the method parameters. (this way, each variable is
+            defined by one or more statements).
+            </summary>
+        </member>
+        <member name="M:System.Compiler.MethodHeader.#ctor(System.Compiler.Method)">
+            <summary>
+            Creates the MethodHeader statement for <c>method</c>.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodHeader.parameters">
+            <summary>
+            List of method parameters, including This if the method is non-static.
+            This is grabbed from the method code. If it's not found there but the method is non-static,
+            we create one to enforce the invariant that each non-static method has a This parameter.
+            </summary>
+        </member>
+        <member name="F:System.Compiler.MethodHeader.method">
+            <summary>
+            Method that <c>this</c> MethodHeader belongs to; useful in case you want to grab more information.
+            </summary>
+        </member>
+        <member name="T:System.Compiler.Unwind">
+            <summary>
+            Special statement to identify the exception exit point of a method.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/base/build/sgc/System.Compiler.Runtime.dll b/base/build/sgc/System.Compiler.Runtime.dll
new file mode 100644
index 0000000..50ef297
Binary files /dev/null and b/base/build/sgc/System.Compiler.Runtime.dll differ
diff --git a/base/build/sgc/System.Compiler.Runtime.pdb b/base/build/sgc/System.Compiler.Runtime.pdb
new file mode 100644
index 0000000..10e65b2
Binary files /dev/null and b/base/build/sgc/System.Compiler.Runtime.pdb differ
diff --git a/base/build/sgc/System.Compiler.dll b/base/build/sgc/System.Compiler.dll
new file mode 100644
index 0000000..84d6c73
Binary files /dev/null and b/base/build/sgc/System.Compiler.dll differ
diff --git a/base/build/sgc/System.Compiler.pdb b/base/build/sgc/System.Compiler.pdb
new file mode 100644
index 0000000..a9610b4
Binary files /dev/null and b/base/build/sgc/System.Compiler.pdb differ
diff --git a/base/build/sgc/System.Contracts.dll b/base/build/sgc/System.Contracts.dll
new file mode 100644
index 0000000..2866669
Binary files /dev/null and b/base/build/sgc/System.Contracts.dll differ
diff --git a/base/build/sgc/System.Contracts.pdb b/base/build/sgc/System.Contracts.pdb
new file mode 100644
index 0000000..6411df6
Binary files /dev/null and b/base/build/sgc/System.Contracts.pdb differ
diff --git a/base/build/sgc/TaskManager.dll b/base/build/sgc/TaskManager.dll
new file mode 100644
index 0000000..12cd0ca
Binary files /dev/null and b/base/build/sgc/TaskManager.dll differ
diff --git a/base/build/sgc/TaskManagerUI.dll b/base/build/sgc/TaskManagerUI.dll
new file mode 100644
index 0000000..8701f81
Binary files /dev/null and b/base/build/sgc/TaskManagerUI.dll differ
diff --git a/base/build/sgc/msenv.dll b/base/build/sgc/msenv.dll
new file mode 100644
index 0000000..8ef87bf
Binary files /dev/null and b/base/build/sgc/msenv.dll differ
diff --git a/base/build/singver.exe b/base/build/singver.exe
new file mode 100644
index 0000000..41193ef
Binary files /dev/null and b/base/build/singver.exe differ
diff --git a/base/build/singver.exe.config b/base/build/singver.exe.config
new file mode 100644
index 0000000..4d5ba49
--- /dev/null
+++ b/base/build/singver.exe.config
@@ -0,0 +1,11 @@
+<!-- singver.exe.config -->
+<configuration>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="fsc"/>
+      </assemblyBinding>
+   </runtime>
+   <system.diagnostics>
+          <trace autoflush="true" indentsize="0"></trace>
+   </system.diagnostics>
+</configuration>
diff --git a/base/build/singx86.dll b/base/build/singx86.dll
new file mode 100644
index 0000000..deb415f
Binary files /dev/null and b/base/build/singx86.dll differ
diff --git a/base/build/singx86.pdb b/base/build/singx86.pdb
new file mode 100644
index 0000000..ef79005
Binary files /dev/null and b/base/build/singx86.pdb differ
diff --git a/base/build/sn.exe b/base/build/sn.exe
new file mode 100644
index 0000000..c41647c
Binary files /dev/null and b/base/build/sn.exe differ
diff --git a/base/build/spg.exe b/base/build/spg.exe
new file mode 100644
index 0000000..d5aacda
Binary files /dev/null and b/base/build/spg.exe differ
diff --git a/base/build/spg.pdb b/base/build/spg.pdb
new file mode 100644
index 0000000..6b61818
Binary files /dev/null and b/base/build/spg.pdb differ
diff --git a/base/build/srctool.exe b/base/build/srctool.exe
new file mode 100644
index 0000000..59287b9
Binary files /dev/null and b/base/build/srctool.exe differ
diff --git a/base/build/substitute.exe b/base/build/substitute.exe
new file mode 100644
index 0000000..bcb61ee
Binary files /dev/null and b/base/build/substitute.exe differ
diff --git a/base/build/substitute.pdb b/base/build/substitute.pdb
new file mode 100644
index 0000000..6d09a80
Binary files /dev/null and b/base/build/substitute.pdb differ
diff --git a/base/build/timerun.exe b/base/build/timerun.exe
new file mode 100644
index 0000000..dd869b5
Binary files /dev/null and b/base/build/timerun.exe differ
diff --git a/base/build/timerun.pdb b/base/build/timerun.pdb
new file mode 100644
index 0000000..a4bfb9a
Binary files /dev/null and b/base/build/timerun.pdb differ
diff --git a/base/build/undname.exe b/base/build/undname.exe
new file mode 100644
index 0000000..20577e2
Binary files /dev/null and b/base/build/undname.exe differ
diff --git a/base/setenv.cmd b/base/setenv.cmd
new file mode 100644
index 0000000..da03485
--- /dev/null
+++ b/base/setenv.cmd
@@ -0,0 +1,399 @@
+@echo off
+
+@rem @setlocal enableextensions
+
+rem This needs to be defined before invoking goto usage.
+set _EXIT_CMD=exit /b
+
+if .==.%1 goto good
+if ".%1"=="./?" goto usage
+
+:good
+rem Save path when first run.
+if not defined SAVED_PATH (
+    set "SAVED_PATH=%PATH%"
+)
+
+rem ###### Remember the current directory ######
+set SINGULARITY_ROOT=%~ds0%~ps0%
+set CLEAN_SINGULARITY_ROOT=%~d0%~p0%
+if .%SINGULARITY_ROOT:~-1%==.\ (
+   set "SINGULARITY_ROOT=%SINGULARITY_ROOT:~0,-1%"
+)
+
+rem Clear no defaults variable.  Needs to be reset after missing default
+rem causes an error.
+set NO_SINGULARITY_DEFAULTS=
+
+:parse
+
+if /I .%1==./release (
+  set BUILDTYPE=Release
+  shift /1
+  goto parse
+)
+
+if /I .%1==./debug (
+  set BUILDTYPE=Debug
+  shift /1
+  goto parse
+)
+
+if /I .%1==./terminate (
+  set _EXIT_CMD=exit
+  shift /1
+  goto parse
+)
+
+if /I .%1==./prototype (
+  set BUILDTYPE=Prototype
+  shift /1
+  goto parse
+)
+
+if /I .%1==./apic (
+  set PLATFORM=ApicPC
+  shift /1
+  goto parse
+)
+
+if /I .%1==./legacy (
+  set PLATFORM=LegacyPC
+  shift /1
+  goto parse
+)
+
+if /I .%1==./mp (
+  set PLATFORM=ApicMP
+  shift /1
+  goto parse
+)
+
+if /I .%1==./enlightened (
+  set PLATFORM=EnlightenedPC
+  shift /1
+  goto parse
+)
+
+if /I .%1==./kms (
+  set COLLECTOR_KERNEL=MarkSweep
+  shift /1
+  goto parse
+)
+
+if /I .%1==./kcc (
+  set COLLECTOR_KERNEL=Concurrent
+  shift /1
+  goto parse
+)
+
+if /I .%1==./kss (
+  set COLLECTOR_KERNEL=Semispace
+  shift /1
+  goto parse
+)
+
+if /I .%1==./noi (
+  set SINGULARITY_INTERNAL=No
+  shift /1
+  goto parse
+)
+
+if /I .%1==./pms (
+  set COLLECTOR_APP=MarkSweep
+  shift /1
+  goto parse
+)
+
+if /I .%1==./pcc (
+  set COLLECTOR_APP=Concurrent
+  shift /1
+  goto parse
+)
+
+if /I .%1==./pss (
+  set COLLECTOR_APP=Semispace
+  shift /1
+  goto parse
+)
+
+if /I .%1==./paging (
+  set PAGING=On
+  shift /1
+  goto parse
+)
+
+if /I .%1==./nopaging (
+  set PAGING=Off
+  shift /1
+  goto parse
+)
+
+if /I .%1==./abishim (
+  set GENERATE_ABI_SHIM=On
+  shift /1
+  goto parse
+)
+
+if /I .%1==./noabishim (
+  set GENERATE_ABI_SHIM=Off
+  shift /1
+  goto parse
+)
+
+if /I .%1==./clean (
+  set SINGULARITY_ROOT=
+  set SINGULARITY_INTERNAL=
+  set BUILDTYPE=
+  set PLATFORM=
+  set COLLECTOR_KERNEL=
+  set COLLECTOR_APP=
+  set CONFIGURATION=
+  set "PATH=%SAVED_PATH%"
+  set SAVED_PATH=
+  set PAGING=
+  set GENERATE_ABI_SHIM=
+  echo.Environment cleaned.
+  %_EXIT_CMD% 0
+)
+
+if /I .%1==./nodefaults (
+  set GENERATE_ABI_SHIM=Off
+  set NO_SINGULARITY_DEFAULTS=Yes
+  shift /1
+  goto parse
+)
+
+if /I .%1==./notitle (
+  set NO_SINGULARITY_WINDOW_TITLE=Yes
+  shift /1
+  goto parse
+)
+
+setlocal
+set ARG=.%1
+if %ARG:~0,2%==./ (
+  echo.Unrecognized option "%1"
+  %_EXIT_CMD% 2
+)
+endlocal
+
+:finished
+
+if .%BUILDTYPE%==.Release (
+  rem
+) else if .%BUILDTYPE%==.Debug (
+  rem
+) else if .%BUILDTYPE%==.Prototype (
+  rem
+) else (
+  if .%NO_SINGULARITY_DEFAULTS%==.Yes (
+    echo.Missing or invalid BUILDTYPE value: "%BUILDTYPE%"
+    %_EXIT_CMD% 1
+  )
+  set BUILDTYPE=Prototype
+)
+
+if .%PLATFORM%==.ApicPC (
+  rem
+) else if .%PLATFORM%==.ApicMP (
+  rem
+) else if .%PLATFORM%==.LegacyPC (
+  rem
+) else if .%PLATFORM%==.EnlightenedPC (
+  rem
+) else (
+  if .%NO_SINGULARITY_DEFAULTS%==.Yes (
+    echo.Missing or invalid PLATFORM value: "%PLATFORM%"
+    %_EXIT_CMD% 1
+  )
+  set PLATFORM=LegacyPC
+)
+
+if .%COLLECTOR_KERNEL%==.MarkSweep (
+  rem
+) else if .%COLLECTOR_KERNEL%==.Concurrent (
+  rem
+) else if .%COLLECTOR_KERNEL%==.Semispace (
+  rem
+) else (
+  if .%NO_SINGULARITY_DEFAULTS%==.Yes (
+    echo.Missing or invalid COLLECTOR_KERNEL value: "%COLLECTOR_KERNEL"
+    %_EXIT_CMD% 1
+  )
+  set COLLECTOR_KERNEL=MarkSweep
+)
+
+if .%COLLECTOR_APP%==.MarkSweep (
+  rem
+) else if .%COLLECTOR_APP%==.Concurrent (
+  rem
+) else if .%COLLECTOR_APP%==.Semispace (
+  rem
+) else (
+  if .%NO_SINGULARITY_DEFAULTS%==.Yes (
+    echo.Missing or invalid COLLECTOR_APP value: "%COLLECTOR_APP%"
+    %_EXIT_CMD% 1
+  )
+  set COLLECTOR_APP=MarkSweep
+)
+
+if .%PAGING%==.On (
+  set PAGING_FLAG=.Paging
+) else if .%PAGING%==.Off (
+  set PAGING_FLAG=
+) else (
+  if .%NO_SINGULARITY_DEFAULTS%==.Yes (
+    echo.Missing or invalid PAGING value: "%PAGING%"
+    %_EXIT_CMD% 1
+  )
+  set PAGING=Off
+  set PAGING_FLAG=
+)
+
+if .%GENERATE_ABI_SHIM%==.On (
+  rem
+) else if .%GENERATE_ABI_SHIM%==.Off (
+  rem
+) else (
+  if .%NO_SINGULARITY_DEFAULTS%==.Yes (
+    echo.Missing or invalid GENERATE_ABI_SHIM value: "%GENERATE_ABI_SHIM%"
+    %_EXIT_CMD% 1
+  )
+  set GENERATE_ABI_SHIM=Off
+)
+
+goto :finale
+
+:usage
+echo.Usage:
+echo.    setenv.cmd [options]
+echo.
+echo.Summary:
+echo.    Configure environment variables for building Singularity.
+echo.
+echo.Options:
+echo.    /prototype     Prototype build (no optimization w/ debug asserts).[default]
+echo.    /debug         Debug build (full optimization w/ debug asserts).
+echo.    /release       Release build (full optimization w/o debug asserts).
+echo.
+echo.    /legacy        Legacy PC (Virtual PC).                            [default]
+echo.    /apic          Single-core nForce4 PC.
+echo.    /mp            Multi-core nForce4 PC.
+echo.    /enlightened   Only executes on Viridian hypervisor.
+echo.
+echo.    /kms           Kernel Mark Sweep Collector.                       [default]
+echo.    /kcc           Kernel Concurrent Collector.
+echo.    /kss           Kernel Semispace Collector.
+echo.
+echo.    /pms           Process Mark Sweep Collector.                      [default]
+echo.    /pcc           Process Concurrent Collector.
+echo.    /pss           Process Semispace Collector.
+echo.
+echo.    /nopaging      Page translation off.                              [default]
+echo.    /paging        Page translation on.
+echo.
+echo.    /clean         Remove Singularity build variables from environment.
+echo.
+echo.    /nodefaults    Do not use defaults, underspecification is an error.
+echo.    /noi           Force no internal tools directory (otherwise autodetected).
+echo.    /notitle       Do not change the window title.
+echo.
+
+%_EXIT_CMD% 1
+
+:BinaryIsInPath
+    if "%~$PATH:1" == "" (
+        exit /b 1
+    ) else (
+        exit /b 0
+    )
+
+:finale
+
+if not defined SINGULARITY_INTERNAL (
+    if exist "%SINGULARITY_ROOT%\build\internal%SINGULARITY_NOINTERNAL%" (
+        set SINGULARITY_INTERNAL=Yes
+    ) else (
+        set SINGULARITY_INTERNAL=No
+    )
+)
+
+if %SINGULARITY_INTERNAL%==Yes (
+    set "SINGULARITY_PATH=%SINGULARITY_ROOT%;%SINGULARITY_ROOT%\build;%SINGULARITY_ROOT%\build\internal"
+) else (
+    set "SINGULARITY_PATH=%SINGULARITY_ROOT%;%SINGULARITY_ROOT%\build"
+)
+
+call :BinaryIsInPath windbg.exe
+if ErrorLevel 1 (
+    if exist "c:\debuggers\windbg.exe" (
+        @rem The standard MS installed location
+        set _DEBUGGER_PATH=c:\debuggers
+    ) else if exist "%ProgramFiles%\Debugging Tools for Windows\windbg.exe" (
+        @rem The likely user installed location
+        set _DEBUGGER_PATH=%ProgramFiles%\Debugging Tools for Windows
+    ) else (
+        echo Warning - Debugging Tools for Windows does not appear to be installed.
+        echo Visit http://www.microsoft.com/whdc/devtools/debugging/default.mspx.
+        echo.
+        @rem Or update this script to know about where it is installed.
+    )
+)
+
+if defined _DEBUGGER_PATH (
+    set "PATH=%SINGULARITY_PATH%;%SAVED_PATH%;%_DEBUGGER_PATH%"
+) else (
+    set "PATH=%SINGULARITY_PATH%;%SAVED_PATH%"
+)
+
+set _DEBUGGER_PATH=
+set INCLUDE=
+set LIB=
+rem set "INCLUDE=%SINGULARITY_ROOT%\Windows\inc"
+rem set "LIB=%SINGULARITY_ROOT%\Windows\lib"
+
+if not defined NO_SINGULARITY_WINDOW_TITLE (
+  if .%PAGING%==.On (
+    title %BUILDTYPE% %PLATFORM% Paging [%SINGULARITY_ROOT%]
+  ) else if .%COLLECTOR_APP%==.Semispace (
+    title %BUILDTYPE% %PLATFORM% %COLLECTOR_APP% [%SINGULARITY_ROOT%]
+  ) else (
+    title %BUILDTYPE% %PLATFORM% [%SINGULARITY_ROOT%]
+  )
+)
+
+set NO_SINGULARITY_WINDOW_TITLE=
+set NO_SINGULARITY_DEFAULTS=
+
+@rem In the transition to MSBuild the former BUILDTYPE variable became
+@rem CONFIGURATION in the MSBuild scripts...
+set Configuration=%BuildType%
+
+echo ** Singularity Build Environment:
+echo **   Base Directory:     %SINGULARITY_ROOT%
+echo **   Build Type:         %BUILDTYPE%
+echo **   Target Platform:    %PLATFORM%
+echo **   Kernel Collector:   %COLLECTOR_KERNEL%
+echo **   Process Collector:  %COLLECTOR_APP%
+echo **   Page Translation:   %PAGING%
+echo **   Generate ABI Shim:  %GENERATE_ABI_SHIM%
+cd /d "%CLEAN_SINGULARITY_ROOT%"
+
+@rem
+@rem *IMPORTANT* This script is used by the
+@rem automated build system and users within command-line sessions.
+@rem The final invocation of user supplied command happens at the end
+@rem of this script because C#\'s Process class code only gets the exit
+@rem code this way or via exit, exit /b does not work.  Exit without
+@rem arguments terminates the interpreter.  Exit /b terminates the current
+@rem batch script.  The former is not acceptable for general purpose
+@rem and the latter stops the automated build system from detecting
+@rem errors.
+@rem
+@rem Using 'shift' on command line arguments
+@rem does not affect $* expand arguments thy self.
+@rem
+if not "%1" == "" call %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+
diff --git a/configure.cmd b/configure.cmd
new file mode 100644
index 0000000..274c93a
--- /dev/null
+++ b/configure.cmd
@@ -0,0 +1,5 @@
+@echo off
+
+set MYPATH=%~dp0%
+
+cscript "%MYPATH%\configure.vbs" "%MYPATH%"
\ No newline at end of file
diff --git a/configure.vbs b/configure.vbs
new file mode 100644
index 0000000..693202b
--- /dev/null
+++ b/configure.vbs
@@ -0,0 +1,92 @@
+'-----------------------------------------------------------------------
+' Singularity RDK configuration tool
+' (c) 2008 - Microsoft Corporation
+'-----------------------------------------------------------------------
+
+
+'-----------------------------------------------------------------------
+' Splash
+
+WScript.Echo "------------------------------------------------------------------"
+WScript.Echo "-                                                                -"
+WScript.Echo "-          S   I   N   G   U   L   A   R   I   T   Y             -"
+WScript.Echo "-                                                                -"
+WScript.Echo "-                          RDK 1.1                               -"
+WScript.Echo "-                                                                -"
+WScript.Echo "------------------------------------------------------------------"
+WScript.Echo
+WScript.Echo
+WScript.Echo "This script will configure Singularity RDK build to the"
+WScript.Echo "following location:"
+WScript.Echo
+
+
+'-----------------------------------------------------------------------
+' Objects
+
+set WshShell = WScript.CreateObject("WScript.Shell")
+Set objShell = CreateObject("Shell.Application")
+
+
+'-----------------------------------------------------------------------
+' Running from this location
+
+If WScript.Arguments.Count = 1 Then
+	runningFrom = WScript.Arguments(0)
+Else
+	runningFrom = WshShell.CurrentDirectory
+End If
+
+WScript.Echo chr(9) & runningFrom
+
+
+'-----------------------------------------------------------------------
+' Wait for input
+
+WScript.Echo
+WScript.Echo "Press ENTER to start..."
+WScript.StdIn.Read(1)
+
+
+
+'-----------------------------------------------------------------------
+WScript.Echo
+WScript.Echo
+
+'-----------------------------------------------------------------------
+' Determine desktop location
+
+Set objFolder = objShell.Namespace(&H19)
+Set objFolderItem = objFolder.Self
+desktop = objFolderItem.Path
+CreateIcon desktop
+
+Set objFolder = objShell.Namespace(&H17)
+Set objFolderItem = objFolder.Self
+programs = objFolderItem.Path
+CreateIcon programs
+
+
+
+Sub CreateIcon(base)
+	On Error Resume Next
+	'-----------------------------------------------------------------------
+	' Add build icon to desktop
+	set oShellLink = WshShell.CreateShortcut(base & "\Singularity RDK 1.1.lnk")
+	'Define where you would like the shortcut to point to. This can be a program, Web site, etc.
+	oShellLink.TargetPath = "%windir%\system32\cmd.exe"
+	oShellLink.Arguments = "/k " & runningFrom & "\base\setenv.cmd"
+	oShellLink.WindowStyle = 1
+	'Define what icon the shortcut should use. Here we use the explorer.exe icon.
+	oShellLink.IconLocation = runningFrom & "\singularity.ico"
+	oShellLink.Description = "Singularity environment build window"
+	oShellLink.WorkingDirectory = runningFrom
+	oShellLink.Save
+
+	If Err <> 0 Then
+		WScript.Echo
+		WScript.Echo "*** ERROR: A problem occurred while creating the shortcut."
+		WScript.Echo chr(9) & "Please make sure you ran this program with administrator privileges."
+		WScript.Echo
+	End If	
+End Sub
\ No newline at end of file
diff --git a/docs/Design Notes/SDN0 Design Motivation.pdf b/docs/Design Notes/SDN0 Design Motivation.pdf
new file mode 100644
index 0000000..7eba7d4
Binary files /dev/null and b/docs/Design Notes/SDN0 Design Motivation.pdf differ
diff --git a/docs/Design Notes/SDN0 Singularity Design Motivation.pdf b/docs/Design Notes/SDN0 Singularity Design Motivation.pdf
new file mode 100644
index 0000000..3c2b666
Binary files /dev/null and b/docs/Design Notes/SDN0 Singularity Design Motivation.pdf differ
diff --git a/docs/Design Notes/SDN10 Resource Management and Scheduling.pdf b/docs/Design Notes/SDN10 Resource Management and Scheduling.pdf
new file mode 100644
index 0000000..1850d5c
Binary files /dev/null and b/docs/Design Notes/SDN10 Resource Management and Scheduling.pdf differ
diff --git a/docs/Design Notes/SDN11 Name Server.pdf b/docs/Design Notes/SDN11 Name Server.pdf
new file mode 100644
index 0000000..72e304e
Binary files /dev/null and b/docs/Design Notes/SDN11 Name Server.pdf differ
diff --git a/docs/Design Notes/SDN12 The Application Manifest.pdf b/docs/Design Notes/SDN12 The Application Manifest.pdf
new file mode 100644
index 0000000..a7ca5e2
Binary files /dev/null and b/docs/Design Notes/SDN12 The Application Manifest.pdf differ
diff --git a/docs/Design Notes/SDN14 Tracing.pdf b/docs/Design Notes/SDN14 Tracing.pdf
new file mode 100644
index 0000000..0dca5c0
Binary files /dev/null and b/docs/Design Notes/SDN14 Tracing.pdf differ
diff --git a/docs/Design Notes/SDN15 Testing.pdf b/docs/Design Notes/SDN15 Testing.pdf
new file mode 100644
index 0000000..51bfbf6
Binary files /dev/null and b/docs/Design Notes/SDN15 Testing.pdf differ
diff --git a/docs/Design Notes/SDN16 First Application Deployment.pdf b/docs/Design Notes/SDN16 First Application Deployment.pdf
new file mode 100644
index 0000000..b5a7af1
Binary files /dev/null and b/docs/Design Notes/SDN16 First Application Deployment.pdf differ
diff --git a/docs/Design Notes/SDN17 SingSharp Guide.pdf b/docs/Design Notes/SDN17 SingSharp Guide.pdf
new file mode 100644
index 0000000..269b816
Binary files /dev/null and b/docs/Design Notes/SDN17 SingSharp Guide.pdf differ
diff --git a/docs/Design Notes/SDN18 IO Subsystem Fundamentals.pdf b/docs/Design Notes/SDN18 IO Subsystem Fundamentals.pdf
new file mode 100644
index 0000000..51b2f88
Binary files /dev/null and b/docs/Design Notes/SDN18 IO Subsystem Fundamentals.pdf differ
diff --git a/docs/Design Notes/SDN2 Architectural Abstractions.pdf b/docs/Design Notes/SDN2 Architectural Abstractions.pdf
new file mode 100644
index 0000000..e0356b5
Binary files /dev/null and b/docs/Design Notes/SDN2 Architectural Abstractions.pdf differ
diff --git a/docs/Design Notes/SDN20 Application Binary Interface.pdf b/docs/Design Notes/SDN20 Application Binary Interface.pdf
new file mode 100644
index 0000000..8ef3796
Binary files /dev/null and b/docs/Design Notes/SDN20 Application Binary Interface.pdf differ
diff --git a/docs/Design Notes/SDN21 Extensibility Features for SingSharp.pdf b/docs/Design Notes/SDN21 Extensibility Features for SingSharp.pdf
new file mode 100644
index 0000000..f106736
Binary files /dev/null and b/docs/Design Notes/SDN21 Extensibility Features for SingSharp.pdf differ
diff --git a/docs/Design Notes/SDN22 Compile Time Reflection.pdf b/docs/Design Notes/SDN22 Compile Time Reflection.pdf
new file mode 100644
index 0000000..0843e97
Binary files /dev/null and b/docs/Design Notes/SDN22 Compile Time Reflection.pdf differ
diff --git a/docs/Design Notes/SDN23 SingSharp Implementation.pdf b/docs/Design Notes/SDN23 SingSharp Implementation.pdf
new file mode 100644
index 0000000..1d1a7fd
Binary files /dev/null and b/docs/Design Notes/SDN23 SingSharp Implementation.pdf differ
diff --git a/docs/Design Notes/SDN24 Self Describing Boot.pdf b/docs/Design Notes/SDN24 Self Describing Boot.pdf
new file mode 100644
index 0000000..350bf71
Binary files /dev/null and b/docs/Design Notes/SDN24 Self Describing Boot.pdf differ
diff --git a/docs/Design Notes/SDN25 Bytecode Verifier.pdf b/docs/Design Notes/SDN25 Bytecode Verifier.pdf
new file mode 100644
index 0000000..71b6e2a
Binary files /dev/null and b/docs/Design Notes/SDN25 Bytecode Verifier.pdf differ
diff --git a/docs/Design Notes/SDN26 Permissions.pdf b/docs/Design Notes/SDN26 Permissions.pdf
new file mode 100644
index 0000000..a95a72c
Binary files /dev/null and b/docs/Design Notes/SDN26 Permissions.pdf differ
diff --git a/docs/Design Notes/SDN27 Singularity Directory Service.pdf b/docs/Design Notes/SDN27 Singularity Directory Service.pdf
new file mode 100644
index 0000000..a7902c3
Binary files /dev/null and b/docs/Design Notes/SDN27 Singularity Directory Service.pdf differ
diff --git a/docs/Design Notes/SDN29 Hardware Process Isolation.pdf b/docs/Design Notes/SDN29 Hardware Process Isolation.pdf
new file mode 100644
index 0000000..bab98bb
Binary files /dev/null and b/docs/Design Notes/SDN29 Hardware Process Isolation.pdf differ
diff --git a/docs/Design Notes/SDN3 Design Groups.pdf b/docs/Design Notes/SDN3 Design Groups.pdf
new file mode 100644
index 0000000..2ff120a
Binary files /dev/null and b/docs/Design Notes/SDN3 Design Groups.pdf differ
diff --git a/docs/Design Notes/SDN30 Multicore Singularity.pdf b/docs/Design Notes/SDN30 Multicore Singularity.pdf
new file mode 100644
index 0000000..b79cfcb
Binary files /dev/null and b/docs/Design Notes/SDN30 Multicore Singularity.pdf differ
diff --git a/docs/Design Notes/SDN32 SingSharp Compile Time Reflection.pdf b/docs/Design Notes/SDN32 SingSharp Compile Time Reflection.pdf
new file mode 100644
index 0000000..caecff8
Binary files /dev/null and b/docs/Design Notes/SDN32 SingSharp Compile Time Reflection.pdf differ
diff --git a/docs/Design Notes/SDN33 Event Tracing for Singularity (ETS).pdf b/docs/Design Notes/SDN33 Event Tracing for Singularity (ETS).pdf
new file mode 100644
index 0000000..e587a8e
Binary files /dev/null and b/docs/Design Notes/SDN33 Event Tracing for Singularity (ETS).pdf differ
diff --git a/docs/Design Notes/SDN35 Security API.pdf b/docs/Design Notes/SDN35 Security API.pdf
new file mode 100644
index 0000000..e50b687
Binary files /dev/null and b/docs/Design Notes/SDN35 Security API.pdf differ
diff --git a/docs/Design Notes/SDN36 Service Management Service.pdf b/docs/Design Notes/SDN36 Service Management Service.pdf
new file mode 100644
index 0000000..7963f3a
Binary files /dev/null and b/docs/Design Notes/SDN36 Service Management Service.pdf differ
diff --git a/docs/Design Notes/SDN37 Singularity ASMP.pdf b/docs/Design Notes/SDN37 Singularity ASMP.pdf
new file mode 100644
index 0000000..fb1cce2
Binary files /dev/null and b/docs/Design Notes/SDN37 Singularity ASMP.pdf differ
diff --git a/docs/Design Notes/SDN38 TPM Support in Singularity.pdf b/docs/Design Notes/SDN38 TPM Support in Singularity.pdf
new file mode 100644
index 0000000..d488c84
Binary files /dev/null and b/docs/Design Notes/SDN38 TPM Support in Singularity.pdf differ
diff --git a/docs/Design Notes/SDN39 Credentials Manager.pdf b/docs/Design Notes/SDN39 Credentials Manager.pdf
new file mode 100644
index 0000000..101470f
Binary files /dev/null and b/docs/Design Notes/SDN39 Credentials Manager.pdf differ
diff --git a/docs/Design Notes/SDN4 Process Model.pdf b/docs/Design Notes/SDN4 Process Model.pdf
new file mode 100644
index 0000000..625f1d6
Binary files /dev/null and b/docs/Design Notes/SDN4 Process Model.pdf differ
diff --git a/docs/Design Notes/SDN5 Channel Contracts.pdf b/docs/Design Notes/SDN5 Channel Contracts.pdf
new file mode 100644
index 0000000..fae673b
Binary files /dev/null and b/docs/Design Notes/SDN5 Channel Contracts.pdf differ
diff --git a/docs/Design Notes/SDN6 Exchangeable Types.pdf b/docs/Design Notes/SDN6 Exchangeable Types.pdf
new file mode 100644
index 0000000..3385ed7
Binary files /dev/null and b/docs/Design Notes/SDN6 Exchangeable Types.pdf differ
diff --git a/docs/Design Notes/SDN7 Software Development Standards.pdf b/docs/Design Notes/SDN7 Software Development Standards.pdf
new file mode 100644
index 0000000..fb98fce
Binary files /dev/null and b/docs/Design Notes/SDN7 Software Development Standards.pdf differ
diff --git a/docs/Design Notes/SDN8 Target Application Environment.pdf b/docs/Design Notes/SDN8 Target Application Environment.pdf
new file mode 100644
index 0000000..6d1cd0e
Binary files /dev/null and b/docs/Design Notes/SDN8 Target Application Environment.pdf differ
diff --git a/docs/Design Notes/SDN9 Security Model.pdf b/docs/Design Notes/SDN9 Security Model.pdf
new file mode 100644
index 0000000..d9e06f5
Binary files /dev/null and b/docs/Design Notes/SDN9 Security Model.pdf differ
diff --git a/docs/Design Notes/SDN9a Updated Security Model.pdf b/docs/Design Notes/SDN9a Updated Security Model.pdf
new file mode 100644
index 0000000..6cf2e7a
Binary files /dev/null and b/docs/Design Notes/SDN9a Updated Security Model.pdf differ
diff --git a/docs/Getting Started/An OS Research Agenda.ppt b/docs/Getting Started/An OS Research Agenda.ppt
new file mode 100644
index 0000000..fabf4d8
Binary files /dev/null and b/docs/Getting Started/An OS Research Agenda.ppt differ
diff --git a/docs/Getting Started/Building and Running Singularity RDK 1.1.pdf b/docs/Getting Started/Building and Running Singularity RDK 1.1.pdf
new file mode 100644
index 0000000..a25dc83
Binary files /dev/null and b/docs/Getting Started/Building and Running Singularity RDK 1.1.pdf differ
diff --git a/docs/Getting Started/Demo Deck.ppt b/docs/Getting Started/Demo Deck.ppt
new file mode 100644
index 0000000..d9e3149
Binary files /dev/null and b/docs/Getting Started/Demo Deck.ppt differ
diff --git a/docs/Getting Started/Exploring new OS Research through Singularity.ppt b/docs/Getting Started/Exploring new OS Research through Singularity.ppt
new file mode 100644
index 0000000..b5bf1e5
Binary files /dev/null and b/docs/Getting Started/Exploring new OS Research through Singularity.ppt differ
diff --git a/docs/Presentations/Singularity Overview.ppt b/docs/Presentations/Singularity Overview.ppt
new file mode 100644
index 0000000..4fb6f33
Binary files /dev/null and b/docs/Presentations/Singularity Overview.ppt differ
diff --git a/singularity.ico b/singularity.ico
new file mode 100644
index 0000000..74c9591
Binary files /dev/null and b/singularity.ico differ